diff --git a/.gitignore b/.gitignore
index 71bb7c06d4..15eaa4b6ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,32 @@
-
-#ignore thumbnails created by windows
+# Ignore image thumbnail files created by windows
 Thumbs.db
-#Ignore files built by Visual Studio
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-obj/
-[Rr]elease*/
-_ReSharper*/
-[Tt]est[Rr]esult*
-Binary
-Source/Core/Common/Src/scmrev.h
+# Ignore Finder view option files created by OS X
+.DS_Store
+# Ignore autogenerated source files
+Source/Core/Common/scmrev.h
+# Ignore files output by build
+/[Bb]uild*/
+/[Bb]inary/
+/obj/
+# Android cmake builds to here then copies to Source/Android.
+/libs/
+# Ignore various files created by visual studio/msbuild
+*.ipch
 *.opensdf
 *.sdf
-[Bb]uild
-*.ipch
-.sconsign.dblite
-Externals/scons-local/*
-.DS_Store
+*.suo
+*.vcxproj.user
+*.obj
+*.tlog
+# Ignore build info file created by QtCreator
+CMakeLists.txt.user
+# Ignore files created by posix people
 *~
-#Ignore transifix configuration directory
+# Ignore vim swapfiles
+*.swp
+# Ignore transifex configuration directory
 .tx
+# Ignore kdevelop files/dirs
+*.kdev4
+# Ignore IDEA/Clion files/dirs
+/.idea/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..7d8b9393f8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "Externals/Qt"]
+	path = Externals/Qt
+	url = https://github.com/dolphin-emu/ext-win-qt.git
+	branch = master
diff --git a/.hgeol b/.hgeol
deleted file mode 100644
index d6ac94569e..0000000000
--- a/.hgeol
+++ /dev/null
@@ -1,3 +0,0 @@
-[patterns]
-Data/User/Wii/**.* = BIN
-** = native
\ No newline at end of file
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index e8da105116..0000000000
--- a/.hgignore
+++ /dev/null
@@ -1,25 +0,0 @@
-syntax:glob
-Binary
-*.obj
-*.pdb
-*.idb
-*.ilk
-*.pch
-*.sdf
-*.suo
-*.vcxproj.*.user
-*/Win32/Release
-*/Win32/DebugFast
-*/Win32/Debug
-*/x64/Release
-*/x64/DebugFast
-*/x64/Debug
-Source/ipch
-BuildLog.htm
-Source/Core/Common/Src/svnrev.h
-Externals/wxWidgets/build/msw/*/Release
-Externals/wxWidgets/build/msw/*/DebugFast
-Externals/wxWidgets/build/msw/*/Debug
-*.svn*
-Data/User/GameConfig
-Data/User/Shaders
\ No newline at end of file
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..5a39dd5b93
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,54 @@
+# This file exists to enable "git shortlog -s" to group by person.
+Andrew de los Reyes <adlr@gmail.com> <adlr@chromium.org>
+Augustin Cavalier <waddlesplash@gmail.com> <ajcsweb@gmail.com>
+Benjamin Przybocki <buddybenj@gmail.com>
+Dolphin Bots <noreply@dolphin-emu.org> <dolphin-emu-bot@users.noreply.github.com>
+Dolphin Bots <noreply@dolphin-emu.org> <contact+i18n@dolphin-emu.org>
+Dolphin Bots <noreply@dolphin-emu.org> <buildbot@ubuntu.ubuntu.dolphin-emu.org>
+Grant Paul <git@grantpaul.com> <chpwn@chpwn.com>
+Henrik Rydgård <hrydgard@gmail.com>
+Jack Frost <bhaal@0x1337.org> <j4ck.fr0st@gmail.com>
+James Dunne <james.jdunne@gmail.com>
+John Chadwick <johnwchadwick@gmail.com> <johnwchadwick>
+John Peterson <john.s.peterson@live.com>
+John Peterson <john.s.peterson@live.com> <jpeterson57@gmail.com>
+Jordan Cristiano <jordan.cristi@gmail.com> <jordan.cristi AT [Google mail]>
+Jordan Cristiano <jordan.cristi@gmail.com> <jordan.cristi [AT] gmail.com>
+Jordan Woyak <jordan.woyak@gmail.com> <jordan@bill-laptop.lan>
+Jordan Woyak <jordan.woyak@gmail.com> <Billiard26@gmail.com>
+Jules Blok <jules.blok@gmail.com> Armada <jules.blok@gmail.com>
+Lioncash <mathew1800@gmail.com>
+Lioncash <mathew1800@gmail.com> Lioncash <nope>
+Lioncash <mathew1800@gmail.com> <mathew1900@hotmail.com>
+Maarten ter Huurne <maarten@treewalker.org> <mth@lexx-9122.trinair2002>
+Marcos Vitali <marcosvitali@gmail.com>
+Markus Wick <markus+github@selfnet.de> <wickmarkus@web.de>
+Matthew Parlane <parlane@gmail.com>
+Matthew Parlane <parlane@gmail.com> <matthew@phantuntu.(none)>
+Oussama Danba <Shadoxfix@gmail.com>
+Pascal Jouy <pascal.jouy@hotmail.fr>
+Pierre <pierre@pirsoft.de>
+Pierre Bourdon <delroth@gmail.com> <delroth@lse.epita.fr>
+Rodolfo Bogado <rodolfoosvaldobogado@gmail.com>
+Rog <rdragoon@optonline.net>
+RolandMunsil <roland@munsil.com> <RolandMunsil@users.noreply.github.com>
+Runo <i.am.runo@hotmail.com>
+Ryan Houdek <sonicadvance1@gmail.com>
+Ryan Houdek <sonicadvance1@gmail.com> <Sonicadvance1@gmail.com>
+Ryan Houdek <sonicadvance1@gmail.com> <ryan.houdek@codethink.co.uk>
+Ryan Houdek <sonicadvance1@gmail.com> <sonicadvance1@Ryan-Desktop.(none)>
+Sacha <xsacha@gmail.com>
+Sean Maas <seanmaas27@gmail.com>
+Shawn Hoffman <godisgovernment@gmail.com>
+Steven V. <Stevoisiak@gmail.com>
+Steven V. <Stevoisiak@gmail.com> <S.Vascellaro@gmail.com>
+Tony Wasserka <neobrainx@gmail.com> <NeoBrainX@googlemail.com>
+Tony Wasserka <neobrainx@gmail.com> <NeoBrainX@gmail.com>
+TotalNerd <xtrafear@gmail.com>
+booto <remornicus@gmail.com> <booto+dolphin@justanothercoder.com>
+i418c <starfield94@aol.com> <i418c@users.noreply.github.com>
+luisr142004 <luisr142004@gmail.com> <luisr142004@yahoo.com>
+magumagu <magumagu9@gmail.com>
+masken <masken3@gmail.com> <masken@emulation64.com>
+nitsuja <nitsuja-@hotmail.com>
+skidau <skidau@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96685e68d9..91071aefdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,43 +1,62 @@
 ########################################
 # General setup
 #
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.8)
+project(dolphin-emu)
 
-option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
-option(USE_X11 "Enables X11 Support" ON)
-option(USE_WAYLAND "Enables Wayland Support" OFF)
-option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
-option(USE_GLES3 "Enables GLES3 and EGL" OFF)
+option(TRY_X11 "Enables X11 Support" ON)
+option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
 option(USE_UPNP "Enables UPnP port mapping support" ON)
-option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
+option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
+option(ENABLE_QT "Enable Qt (use the experimental Qt interface)" OFF)
+option(ENABLE_PCH "Use PCH to speed up compilation" ON)
+option(ENABLE_PIE "Build a Position-Independent Executable (PIE)" ON)
+option(ENABLE_LTO "Enables Link Time Optimization" OFF)
+option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
+if(APPLE)
+	option(OSX_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
+endif()
+
+option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
 option(FASTLOG "Enable all logs" OFF)
 option(OPROFILING "Enable profiling" OFF)
-option(OPENMP "Enable OpenMP parallelization" ON)
-option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
+option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	option(VTUNE "Enable Intel VTune integration for JIT symbols." OFF)
+endif()
+
+if(APPLE)
+	option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
+endif()
 ########################################
 # Optional Targets
-# TODO: Add DSPSpy and TestSuite.
+# TODO: Add DSPSpy
 option(DSPTOOL "Build dsptool" OFF)
-option(UNITTESTS "Build unitests" OFF)
 
 # Update compiler before calling project()
 if (APPLE)
 	# Use clang compiler
-	set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang")
-	set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++")
-	if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
-		set(CMAKE_C_COMPILER "clang")
-		set(CMAKE_CXX_COMPILER "clang++")
+	if (NOT DEFINED CMAKE_CXX_COMPILER)
+		set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++")
+		if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
+			set(CMAKE_CXX_COMPILER "clang++")
+		endif()
+	endif()
+	if (NOT DEFINED CMAKE_C_COMPILER)
+		set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang")
+		if (NOT EXISTS "${CMAKE_C_COMPILER}")
+			set(CMAKE_C_COMPILER "clang")
+		endif()
 	endif()
 endif()
-project(dolphin-emu)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
-set(DOLPHIN_IS_STABLE TRUE)
+# Libraries to link
+set(LIBS)
 
 # Set up paths
-if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+if(APPLE)
 	# The gettext module will install the translations unconditionally.
 	# Redirect the installation to a build directory where it does no harm.
 	set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install-dummy)
@@ -106,35 +125,55 @@ endif()
 # version number
 set(DOLPHIN_VERSION_MAJOR "4")
 set(DOLPHIN_VERSION_MINOR "0")
-if(DOLPHIN_IS_STABLE)
+if(DOLPHIN_WC_BRANCH STREQUAL "stable")
 	set(DOLPHIN_VERSION_PATCH "0")
 else()
 	set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 endif()
+
+# Architecture detection and arch specific settings
 message(${CMAKE_SYSTEM_PROCESSOR})
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
-	set(_M_GENERIC 1)
-	set(_M_ARM 1)
-	add_definitions(-marm -march=armv7-a)
-	add_definitions(-D_M_ARM=1)
-	add_definitions(-D_M_GENERIC=1)
-	# Set generic options so you don't have to pass anything to cmake to build ARM
-	set(USE_GLES 1)
+
+# Detect 64bit or 32bit
+# CMake doesn't provide a simple way to determine 32bit or 64bit
+# If we ever support a architecture that is 64bit with 32bit pointers then this'll break
+# Of course the chances of that are slim(x32?) so who cares
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(_ARCH_64 1)
+	add_definitions(-D_ARCH_64=1)
+else()
+	set(_ARCH_32 1)
+	add_definitions(-D_ARCH_32=1)
 endif()
 
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
-	set(_M_GENERIC 1)
-	set(_M_MIPS 1)
-	add_definitions(-D_M_MIPS=1)
-	add_definitions(-D_M_GENERIC=1)
+if(NOT ENABLE_GENERIC)
+	if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR
+	   ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86" OR
+	   APPLE)
+		if(_ARCH_64)
+			set(_M_X86 1)
+			set(_M_X86_64 1)
+			add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
+		else()
+			message(FATAL_ERROR "x86_32 is an unsupported platform. Enable generic build if you really want a JIT-less binary.")
+		endif()
+	elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
+		message(FATAL_ERROR "ARMv7 is an unsupported platform. Enable generic build if you really want a JIT-less binary.")
+	elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+		# This option only applies to 64bit ARM
+		set(_M_ARM 1)
+		set(_M_ARM_64 1)
+		add_definitions(-D_M_ARM=1 -D_M_ARM_64=1)
+		add_definitions(-march=armv8-a+crc)
+	else()
+		set(ENABLE_GENERIC 1)
+	endif()
 endif()
 
-# Set these next two lines to test generic
-#set(_M_GENERIC 1)
-#add_definitions(-D_M_GENERIC=1)
-# Various compile flags
-if(NOT _M_GENERIC)
-	add_definitions(-msse2)
+if(ENABLE_GENERIC)
+	message("Warning! Building generic build!")
+	set(_M_GENERIC 1)
+	add_definitions(-D_M_GENERIC=1)
 endif()
 
 include(CheckCXXCompilerFlag)
@@ -163,6 +202,8 @@ if(NOT MSVC)
 	check_and_add_flag(LOGICAL_OP -Wlogical-op)
 	check_and_add_flag(SHADOW -Wshadow)
 	check_and_add_flag(INIT_SELF -Winit-self)
+	check_and_add_flag(MISSING_DECLARATIONS -Wmissing-declarations)
+	check_and_add_flag(MISSING_VARIABLE_DECLARATIONS -Wmissing-variable-declarations)
 endif(NOT MSVC)
 
 # gcc uses some optimizations which might break stuff without this flag
@@ -174,17 +215,32 @@ if(UNIX AND NOT APPLE)
 	check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden)
 endif()
 
-if(APPLE)
-	# Ignore MacPorts and Fink and any other locally installed packages that
-	# might prevent building a distributable binary.
-	set(CMAKE_SYSTEM_PREFIX_PATH /usr)
-	set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
+if(ENABLE_PIE)
+	add_definitions(-fPIE)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+endif()
 
-	# Some of our code contains Objective C constructs.
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++ -stdlib=libc++")
-	# Avoid mistaking an object file for a source file on the link command line.
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
+if(ENABLE_LTO)
+	check_and_add_flag(LTO -flto)
+	if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+		set(CMAKE_AR gcc-ar)
+		set(CMAKE_RANLIB gcc-ranlib)
+	endif()
+endif()
+
+if(APPLE)
+	if(NOT OSX_USE_DEFAULT_SEARCH_PATH)
+		# Hack up the path to prioritize the path to built-in OS libraries to
+		# increase the chance of not depending on a bunch of copies of them
+		# installed by MacPorts, Fink, Homebrew, etc, and ending up copying
+		# them into the bundle.  Since we optionally depend on libraries which
+		# are not part of OS X (ffmpeg, libusb, etc.), however, don't remove
+		# the default path entirely as was done in a previous version of this
+		# file.  This is still kinda evil, since it defeats the user's path
+		# settings...
+		# See http://www.cmake.org/cmake/help/v3.0/command/find_program.html
+		set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};/usr")
+	endif()
 
 	# Identify the target system:
 	# Ask for 64-bit binary.
@@ -193,10 +249,10 @@ if(APPLE)
 	# This is inserted into the Info.plist as well.
 	# Note that the SDK determines the maximum version of which optional
 	# features can be used, not the minimum required version to run.
-	set(OSX_MIN_VERSION "10.7")
+	set(OSX_MIN_VERSION "10.9")
 	set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
-	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.7.sdk")
-	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
+	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.9.sdk")
+	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
 	if(EXISTS "${SYSROOT_PATH}/")
 		set(TARGET_SYSROOT ${SYSROOT_PATH})
 	elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
@@ -225,10 +281,6 @@ if(APPLE)
 	# page on x86_64 is 4GB in size.
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
 
-	if(NOT DISABLE_WX)
-		add_definitions(-DUSE_WX -DHAVE_WX)
-		set(USE_WX TRUE)
-	endif()
 	find_library(APPKIT_LIBRARY AppKit)
 	find_library(APPSERV_LIBRARY ApplicationServices)
 	find_library(ATB_LIBRARY AudioToolbox)
@@ -238,10 +290,13 @@ if(APPLE)
 	find_library(COREAUDIO_LIBRARY CoreAudio)
 	find_library(COREFUND_LIBRARY CoreFoundation)
 	find_library(CORESERV_LIBRARY CoreServices)
+	find_library(FOUNDATION_LIBRARY foundation)
 	find_library(IOB_LIBRARY IOBluetooth)
 	find_library(IOK_LIBRARY IOKit)
 	find_library(QUICKTIME_LIBRARY QuickTime)
 	find_library(WEBKIT_LIBRARY WebKit)
+	find_library(FORCEFEEDBACK ForceFeedback)
+	find_library(OPENGL_LIBRARY OpenGL)
 endif()
 
 if(WIN32)
@@ -275,51 +330,36 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()
 
-option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
 if(GDBSTUB)
 	add_definitions(-DUSE_GDBSTUB)
 endif(GDBSTUB)
 
+if(VTUNE)
+	if(EXISTS "$ENV{VTUNE_AMPLIFIER_XE_2015_DIR}")
+		set(VTUNE_DIR "$ENV{VTUNE_AMPLIFIER_XE_2015_DIR}")
+	elseif(EXISTS "$ENV{VTUNE_AMPLIFIER_XE_2013_DIR}")
+		set(VTUNE_DIR "$ENV{VTUNE_AMPLIFIER_XE_2013_DIR}")
+	else()
+		message(ERROR "Could find neither VTUNE_AMPLIFIER_XE_2015_DIR nor VTUNE_AMPLIFIER_XE_2013_DIR.")
+	endif()
+	add_definitions(-DUSE_VTUNE)
+	include_directories("${VTUNE_DIR}/include")
+	set(VTUNE_LIBRARIES
+		"${VTUNE_DIR}/lib64/libjitprofiling.a"
+		"${VTUNE_DIR}/lib64/libittnotify.a"
+	)
+endif(VTUNE)
+
 if(ANDROID)
 	message("Building for Android")
 	add_definitions(-DANDROID)
 	set(USE_X11 0)
-	set(USE_WAYLAND 0)
 	set(USE_UPNP 0)
-	set(USE_GLES3 1)
-endif()
-
-# For now GLES and EGL are tied to each other.
-# Enabling GLES also disables the OpenGL plugin.
-if(USE_GLES3)
-	message("GLES3 rendering enabled")
-	add_definitions(-DUSE_GLES=1 -DUSE_EGL=1 -DUSE_GLES3=1)
-	include_directories(Externals/GLES3)
-	set(USE_EGL True)
-	set(USE_GLES True)
-else()
-	if(USE_GLES)
-		message("GLES2 rendering enabled. OpenGL disabled")
-		add_definitions(-DUSE_GLES=1)
-		add_definitions(-DUSE_EGL=1)
-		set(USE_EGL True)
-	endif()
-endif()
-# For now Wayland and EGL are tied to each other.
-# The alternative would be an shm path
-if(USE_WAYLAND)
-	add_definitions(-DUSE_EGL)
 	set(USE_EGL 1)
 endif()
 
-if(USE_EGL)
-	message("EGL OpenGL interface enabled")
-	add_definitions(-DUSE_EGL=1)
-else()
-	# Using GLX
-	set(USE_X11 1)
-	set(USE_WAYLAND 0)
-endif()
+include_directories(Externals/GL)
+
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
 ########################################
@@ -330,26 +370,11 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 # externals.
 include(CheckLib)
 include(CheckCXXSourceRuns)
+
 if(NOT ANDROID)
 
 	include(FindOpenGL)
 	include_directories(${OPENGL_INCLUDE_DIR})
-	if(NOT OPENGL_GLU_FOUND)
-		message(FATAL_ERROR "GLU is required but not found")
-	endif()
-
-	if(OPENMP)
-		include(FindOpenMP OPTIONAL)
-		if(OPENMP_FOUND)
-			message("OpenMP parallelization enabled")
-			add_definitions("${OpenMP_CXX_FLAGS}")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
-		endif()
-	endif()
-	if(NOT OPENMP_FOUND)
-		add_definitions(-Wno-unknown-pragmas)
-		message("OpenMP parallelization disabled")
-	endif()
 
 	include(FindALSA OPTIONAL)
 	if(ALSA_FOUND)
@@ -360,7 +385,7 @@ if(NOT ANDROID)
 		message("ALSA NOT found, disabling ALSA sound backend")
 	endif(ALSA_FOUND)
 
-	check_lib(AO ao QUIET)
+	check_lib(AO ao ao QUIET)
 	if(AO_FOUND)
 		add_definitions(-DHAVE_AO=1)
 		message("ao found, enabling ao sound backend")
@@ -369,7 +394,7 @@ if(NOT ANDROID)
 		message("ao NOT found, disabling ao sound backend")
 	endif(AO_FOUND)
 
-	check_lib(BLUEZ bluez QUIET)
+	check_lib(BLUEZ bluez bluez QUIET)
 	if(BLUEZ_FOUND)
 		add_definitions(-DHAVE_BLUEZ=1)
 		message("bluez found, enabling bluetooth support")
@@ -378,7 +403,7 @@ if(NOT ANDROID)
 		message("bluez NOT found, disabling bluetooth support")
 	endif(BLUEZ_FOUND)
 
-	check_lib(PULSEAUDIO libpulse-simple QUIET)
+	check_lib(PULSEAUDIO libpulse pulse QUIET)
 	if(PULSEAUDIO_FOUND)
 		add_definitions(-DHAVE_PULSEAUDIO=1)
 		message("PulseAudio found, enabling PulseAudio sound backend")
@@ -397,27 +422,22 @@ if(NOT ANDROID)
 		message("OpenAL NOT found, disabling OpenAL sound backend")
 	endif(OPENAL_FOUND)
 
-	if(UNIX AND NOT APPLE)
-		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
-		# This is where we detect platforms and set the variables accordingly.
-		pkg_check_modules(WAYLAND wayland-egl wayland-client wayland-cursor)
-		if(USE_WAYLAND AND WAYLAND_FOUND)
-			pkg_check_modules(XKBCOMMON xkbcommon)
-			if(XKBCOMMON_FOUND)
-				set(USE_WAYLAND 1)
-				add_definitions(-DHAVE_WAYLAND)
-				include_directories(${WAYLAND_INCLUDE_DIR})
-				message("Wayland support enabled")
-			endif(XKBCOMMON_FOUND)
-		else()
-			set(USE_WAYLAND 0)
-			message("Wayland support disabled")
-			add_definitions(-DHAVE_WAYLAND=0)
-		endif(USE_WAYLAND AND WAYLAND_FOUND)
+	include(FindLLVM OPTIONAL)
+	if (LLVM_FOUND)
+		add_definitions(-DHAS_LLVM=1)
+		set(HAS_LLVM 1)
 
-		# Note: We do not need to explicitly check for X11 as it is done in the cmake
-		# FindOpenGL module on linux.
-		if(USE_X11 AND X11_FOUND)
+		include_directories(${LLVM_INCLUDE_DIRS})
+		list(APPEND LIBS ${LLVM_LIBRARIES})
+
+		message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+	endif()
+
+	set(USE_X11 0)
+
+	if(UNIX AND NOT APPLE)
+		include(FindX11)
+		if(TRY_X11 AND X11_FOUND)
 			set(USE_X11 1)
 			add_definitions(-DHAVE_X11=1)
 			include_directories(${X11_INCLUDE_DIR})
@@ -427,17 +447,17 @@ if(NOT ANDROID)
 			SET(X11_FOUND "")
 			message("X11 support disabled")
 			add_definitions(-DHAVE_X11=0)
-		endif(USE_X11 AND X11_FOUND)
+		endif(TRY_X11 AND X11_FOUND)
 
-		if (NOT USE_WAYLAND AND NOT USE_X11)
+		if (NOT USE_X11)
 			message(FATAL_ERROR "\n"
 				"No suitable display platform found\n"
-				"Requires wayland or x11 to run")
+				"Requires x11 to run")
 		endif()
 	endif()
 
 	if(USE_X11)
-		check_lib(XRANDR Xrandr)
+		check_lib(XRANDR xrandr Xrandr)
 		if(XRANDR_FOUND)
 			add_definitions(-DHAVE_XRANDR=1)
 		else()
@@ -453,6 +473,10 @@ if(NOT ANDROID)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
+		if(LIBAV_FOUND)
+			LIST(APPEND LIBS ${LIBAV_LIBRARIES})
+		endif()
+
 	endif()
 
 	set(CMAKE_REQUIRED_LIBRARIES portaudio)
@@ -461,6 +485,7 @@ if(NOT ANDROID)
 		int main(int argc, char **argv)
 		{ if(Pa_GetVersion() >= 1890) return 0; else return 1; }"
 		PORTAUDIO)
+	unset(CMAKE_REQUIRED_LIBRARIES)
 	if(PORTAUDIO)
 		message("PortAudio found, enabling mic support")
 		add_definitions(-DHAVE_PORTAUDIO=1)
@@ -472,8 +497,8 @@ if(NOT ANDROID)
 	endif(PORTAUDIO)
 
 	if(OPROFILING)
-		check_lib(OPROFILE opagent opagent.h)
-		check_lib(BFD bfd bfd.h)
+		check_lib(OPROFILE "(no .pc for opagent)" opagent opagent.h)
+		check_lib(BFD "(no .pc for bfd)" bfd bfd.h)
 		if(OPROFILE_FOUND AND BFD_FOUND)
 			message("oprofile found, enabling profiling support")
 			add_definitions(-DUSE_OPROFILE=1)
@@ -483,19 +508,15 @@ if(NOT ANDROID)
 	endif()
 endif()
 
+if(USE_EGL)
+	message("EGL OpenGL interface enabled")
+	add_definitions(-DUSE_EGL=1)
+endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
-include_directories(Source/Core/AudioCommon/Src)
-include_directories(Source/Core/Common/Src)
-include_directories(Source/Core/Core/Src)
-include_directories(Source/Core/DebuggerUICommon/Src)
-include_directories(Source/Core/DebuggerWX/Src)
-include_directories(Source/Core/DiscIO/Src)
-include_directories(Source/Core/DolphinWX/Src)
-include_directories(Source/Core/InputCommon/Src)
-include_directories(Source/Core/VideoCommon/Src)
-include_directories(Source/Core/VideoUICommon/Src)
+include_directories(Source/Core)
 
 ########################################
 # Process externals and setup their include directories
@@ -505,126 +526,45 @@ include_directories(Source/Core/VideoUICommon/Src)
 #   - make sure to tell cmake to link them statically or dynamically (most
 #     should be linked statically)
 #   - place the CMakeLists.txt in the first-level subdirectory, e.g.
-#     Externals/CLRun/CMakeLists.txt (that is: NOT in some Src/ subdirectory)
+#     Externals/zlib/CMakeLists.txt (that is: NOT in some Src/ subdirectory)
 #
 add_subdirectory(Externals/Bochs_disasm)
 include_directories(Externals/Bochs_disasm)
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
-endif()
-if(LZO_FOUND)
-	message("Using shared lzo")
-else()
-	message("Using static lzo from Externals")
-	add_subdirectory(Externals/LZO)
-	include_directories(Externals/LZO)
-	set(LZO lzo2)
-endif()
-
-if(ANDROID)
-	message("Using static libpng from Externals")
-	add_subdirectory(Externals/libpng)
-	include_directories(Externals/libpng)
-	set(PNG libpng)
-endif()
-
-if(OPENAL_FOUND)
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET)
-	endif()
-	if (SOUNDTOUCH_FOUND)
-		message("Using shared soundtouch")
-	else()
-		message("Using static soundtouch from Externals")
-		add_subdirectory(Externals/soundtouch)
-		include_directories(Externals)
-	endif()
-endif()
-
-if(NOT ANDROID)
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		include(FindSDL2 OPTIONAL)
-	endif()
-	if(SDL2_FOUND)
-		message("Using shared SDL2")
-		include_directories(${SDL2_INCLUDE_DIR})
-	else(SDL2_FOUND)
-		# SDL2 not found, try SDL
-		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			include(FindSDL OPTIONAL)
+if(NOT ANDROID AND USE_SHARED_ENET)
+	check_lib(ENET libenet enet enet/enet.h QUIET)
+	include(CheckSymbolExists)
+	if (ENET_FOUND)
+		set(CMAKE_REQUIRED_INCLUDES ${ENET_INCLUDE_DIRS})
+		# hack: LDFLAGS already contains -lenet but all flags but the first are
+		# dropped; ugh, cmake
+		set(CMAKE_REQUIRED_FLAGS ${ENET_LDFLAGS})
+		set(CMAKE_REQUIRED_LIBRARIES ${ENET_LIBRARIES})
+		CHECK_SYMBOL_EXISTS(enet_socket_get_address enet/enet.h ENET_HAVE_SGA)
+		set(CMAKE_REQUIRED_INCLUDES)
+		set(CMAKE_REQUIRED_FLAGS)
+		set(CMAKE_REQUIRED_LIBRARIES)
+		if (NOT ENET_HAVE_SGA)
+			# enet is too old
+			set(ENET_FOUND FALSE)
 		endif()
-		if(SDL_FOUND)
-			message("Using shared SDL")
-			include_directories(${SDL_INCLUDE_DIR})
-		else(SDL_FOUND)
-			# TODO: Use the prebuilt one on Windows
-			message("Using static SDL from Externals")
-			include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
-			add_subdirectory(Externals/SDL)
-		endif(SDL_FOUND)
-	endif(SDL2_FOUND)
-endif()
-
-include(FindLibUSB OPTIONAL)
-if(LIBUSB_FOUND)
-	message("Using shared LibUSB")
-	add_definitions(-D__LIBUSB__)
-	include_directories(${LIBUSB_INCLUDE_DIR})
-endif(LIBUSB_FOUND)
-
-set(SFML_FIND_VERSION TRUE)
-set(SFML_FIND_VERSION_MAJOR 1)
-set(SFML_FIND_VERSION_MINOR 5)
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	include(FindSFML OPTIONAL)
-endif()
-if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
-	message("Using shared SFML")
-else()
-	message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
-	add_subdirectory(Externals/SFML)
-	include_directories(Externals/SFML/include)
-endif()
-
-if(USE_UPNP)
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-		include(FindMiniupnpc)
 	endif()
-	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-		message("Using shared miniupnpc")
-		include_directories(${MINIUPNP_INCLUDE_DIR})
-	else()
-		message("Using static miniupnpc from Externals")
-		add_subdirectory(Externals/miniupnpc)
-		include_directories(Externals/miniupnpc/src)
-	endif()
-	add_definitions(-DUSE_UPNP)
 endif()
-
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	include(FindPolarSSL)
-endif()
-if(POLARSSL_FOUND AND POLARSSL_WORKS)
-	message("Using shared PolarSSL")
-	include_directories(${POLARSSL_INCLUDE_DIR})
+if (ENET_FOUND)
+	message("Using shared enet")
 else()
-	message("Using PolarSSL from Externals")
-	set(POLARSSL_LIBRARY polarssl)
-	add_subdirectory(Externals/polarssl/)
-	include_directories(Externals/polarssl/include)
+	message("Using static enet from Externals")
+	include_directories(Externals/enet/include)
+	add_subdirectory(Externals/enet)
 endif()
+LIST(APPEND LIBS enet)
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
-endif()
-if(SOIL_FOUND)
-	message("Using shared SOIL")
-else()
-	message("Using static SOIL from Externals")
-	add_subdirectory(Externals/SOIL)
-	include_directories(Externals/SOIL)
+if(NOT XXHASH_FOUND)
+	message("Using static xxhash from Externals")
+	add_subdirectory(Externals/xxhash)
+	include_directories(Externals/xxhash)
 endif()
+LIST(APPEND LIBS xxhash)
 
 # If zlib has already been found on a previous run of cmake don't check again
 # as the check seems to take a long time.
@@ -641,34 +581,143 @@ else(ZLIB_FOUND)
 	include_directories(Externals/zlib)
 endif(ZLIB_FOUND)
 
-if(WIN32)
-	find_library(GLEW glew32s PATHS Externals/GLew)
-	include_directories(Externals/GLew/include)
+if(NOT APPLE AND NOT ANDROID)
+	check_lib(LZO "(no .pc for lzo2)" lzo2 lzo/lzo1x.h QUIET)
+endif()
+if(LZO_FOUND)
+	message("Using shared lzo")
 else()
-	if(NOT USE_GLES3)
-		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			include(FindGLEW)
-		endif()
-		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS)
-			message("Using static GLEW from Externals")
-			add_subdirectory(Externals/GLew)
-			include_directories(Externals/GLew/include)
-		endif()
+	message("Using static lzo from Externals")
+	add_subdirectory(Externals/LZO)
+	include_directories(Externals/LZO)
+	set(LZO lzo2)
+endif()
+list(APPEND LIBS ${LZO})
+
+if(NOT APPLE AND NOT ANDROID)
+	check_lib(PNG libpng png png.h QUIET)
+endif()
+if (PNG_FOUND)
+	message("Using shared libpng")
+else()
+	message("Using static libpng from Externals")
+	add_subdirectory(Externals/libpng)
+	include_directories(Externals/libpng)
+	set(PNG png)
+endif()
+
+if(OPENAL_FOUND)
+	if(NOT APPLE)
+		check_lib(SOUNDTOUCH soundtouch SoundTouch soundtouch/SoundTouch.h QUIET)
 	endif()
+	if (SOUNDTOUCH_FOUND)
+		message("Using shared soundtouch")
+	else()
+		message("Using static soundtouch from Externals")
+		add_subdirectory(Externals/soundtouch)
+		include_directories(Externals)
+	endif()
+endif()
+
+if(NOT ANDROID)
+	if(NOT APPLE)
+		include(FindSDL2 OPTIONAL)
+	endif()
+	if(SDL2_FOUND)
+		message("Using shared SDL2")
+		add_definitions(-DHAVE_SDL=1)
+		include_directories(${SDL2_INCLUDE_DIR})
+	else(SDL2_FOUND)
+		# SDL2 not found, try SDL
+		if(NOT APPLE)
+			include(FindSDL OPTIONAL)
+		endif()
+		if(SDL_FOUND)
+			message("Using shared SDL")
+			add_definitions(-DHAVE_SDL=1)
+			include_directories(${SDL_INCLUDE_DIR})
+		else(SDL_FOUND)
+			message("SDL NOT found, disabling SDL input")
+			add_definitions(-DHAVE_SDL=0)
+		endif(SDL_FOUND)
+	endif(SDL2_FOUND)
+endif()
+
+include(FindLibUSB OPTIONAL)
+if(LIBUSB_FOUND)
+	message("Using shared LibUSB")
+	add_definitions(-D__LIBUSB__)
+	include_directories(${LIBUSB_INCLUDE_DIR})
+endif(LIBUSB_FOUND)
+
+set(SFML_REQD_VERSION 2.1)
+if(NOT APPLE AND NOT ANDROID)
+	find_package(SFML ${SFML_REQD_VERSION} COMPONENTS network system)
+endif()
+if(SFML_FOUND)
+	message("Using shared SFML")
+else()
+	message("Using static SFML ${SFML_REQD_VERSION} from Externals")
+	add_definitions(-DSFML_STATIC)
+	add_subdirectory(Externals/SFML)
+	include_directories(BEFORE Externals/SFML/include)
+endif()
+
+if(USE_UPNP)
+	if(NOT APPLE AND NOT ANDROID)
+		include(FindMiniupnpc)
+	endif()
+	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
+		message("Using shared miniupnpc")
+		include_directories(${MINIUPNP_INCLUDE_DIR})
+	else()
+		message("Using static miniupnpc from Externals")
+		add_subdirectory(Externals/miniupnpc)
+		include_directories(Externals/miniupnpc/src)
+	endif()
+	add_definitions(-DUSE_UPNP)
+	list(APPEND LIBS miniupnpc)
+endif()
+
+if(NOT APPLE AND NOT ANDROID)
+	include(FindPolarSSL)
+endif()
+if(POLARSSL_FOUND AND POLARSSL_WORKS)
+	message("Using shared PolarSSL")
+	include_directories(${POLARSSL_INCLUDE_DIR})
+else()
+	message("Using PolarSSL from Externals")
+	set(POLARSSL_LIBRARY polarssl)
+	add_subdirectory(Externals/polarssl/)
+	include_directories(Externals/polarssl/include)
+endif()
+
+if(NOT APPLE AND NOT ANDROID)
+	check_lib(SOIL "(no .pc for SOIL)" SOIL SOIL/SOIL.h QUIET)
+endif()
+if(SOIL_FOUND)
+	message("Using shared SOIL")
+else()
+	message("Using static SOIL from Externals")
+	add_subdirectory(Externals/SOIL)
+	include_directories(Externals/SOIL)
 endif()
 
 if (ANDROID)
 	message("Using static iconv from Externals")
 	include_directories(Externals/libiconv-1.14/include)
 	add_subdirectory(Externals/libiconv-1.14)
+	list(APPEND LIBS iconv)
+else()
+	find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+	find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+	list(APPEND LIBS ${ICONV_LIBRARIES})
+	mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	find_library(CL OpenCL)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
-else()
-	include_directories(Externals/CLRun/include)
-	add_subdirectory(Externals/CLRun)
+if(ENABLE_QT)
+	find_package(Qt5Widgets REQUIRED)
+	message("Found Qt version ${Qt5Core_VERSION}, enabling the Qt backend")
 endif()
 
 if(NOT DISABLE_WX AND NOT ANDROID)
@@ -684,11 +733,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 			ERROR_QUIET
 			)
 		message("Found wxWidgets version ${wxWidgets_VERSION}")
-		if(UNIX AND NOT APPLE)
-			set(wxMIN_VERSION "2.9.3")
-		else()
-			set(wxMIN_VERSION "2.9.4")
-		endif()
+		set(wxMIN_VERSION "3.0.1")
 		if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION})
 			message("At least ${wxMIN_VERSION} is required; ignoring found version")
 			unset(wxWidgets_FOUND)
@@ -707,11 +752,14 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
 				VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
-			check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+			check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h REQUIRED)
 		else()
 			include(FindGTK2)
 			if(GTK2_FOUND)
 				include_directories(${GTK2_INCLUDE_DIRS})
+				list(APPEND LIBS ${GTK2_LIBRARIES})
+			else()
+				message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.")
 			endif()
 		endif()
 	endif()
@@ -724,15 +772,15 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 
 		# These definitions and includes are used when building dolphin against wx,
 		# not when building wx itself (see wxw3 CMakeLists.txt for that)
-		if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		if(APPLE)
 			add_definitions(-D__WXOSX_COCOA__)
-		elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+		elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 			add_definitions(-D__WXGTK__)
 
 			# Check for required libs
-			check_lib(GTHREAD2 gthread-2.0 glib/gthread.h REQUIRED)
-			check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED)
-		elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+			check_lib(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED)
+			check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED)
+		elseif(WIN32)
 			add_definitions(-D__WXMSW__)
 		else()
 			message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
@@ -748,46 +796,86 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	add_definitions(-DHAVE_WX=1)
 endif(NOT DISABLE_WX AND NOT ANDROID)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
+	set(LIBS ${LIBS} usbhid)
+endif()
+
+if(APPLE)
+	# Link against OS X system frameworks.
+	list(APPEND LIBS
+		${APPKIT_LIBRARY}
+		${AU_LIBRARY}
+		${COREAUDIO_LIBRARY}
+		${COREFUND_LIBRARY}
+		${CORESERV_LIBRARY}
+		${IOK_LIBRARY}
+		${FORCEFEEDBACK}
+		)
+endif()
 
 ########################################
 # Pre-build events: Define configuration variables and write SCM info header
 #
-if(DOLPHIN_WC_BRANCH STREQUAL "master")
-	set(DOLPHIN_WC_IS_MASTER "1")
+if(DOLPHIN_WC_BRANCH STREQUAL "master" OR DOLPHIN_WC_BRANCH STREQUAL "stable")
+	set(DOLPHIN_WC_IS_STABLE "1")
 else()
-	set(DOLPHIN_WC_IS_MASTER "0")
+	set(DOLPHIN_WC_IS_STABLE "0")
 endif()
 
-file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h
+file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
 	"#define SCM_REV_STR \"" ${DOLPHIN_WC_REVISION} "\"\n"
 	"#define SCM_DESC_STR \"" ${DOLPHIN_WC_DESCRIBE} "\"\n"
 	"#define SCM_BRANCH_STR \"" ${DOLPHIN_WC_BRANCH} "\"\n"
-	"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_MASTER} "\n"
+	"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
 	)
-include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
+include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")
+
+########################################
+# Unit testing.
+#
+include_directories(Externals/gtest/include)
+add_subdirectory(Externals/gtest)
+
+enable_testing()
+add_custom_target(unittests)
+add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
 
 
 ########################################
 # Start compiling our code
 #
 add_definitions(-std=gnu++0x)
+
+# These aren't actually needed for C11/C++11
+# but some dependencies require them (LLVM, libav).
+add_definitions(-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
+
+# Do this at the last minute because try_compile ignores linker flags.  Yay...
+if(APPLE)
+	# Some of our code contains Objective C constructs.
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++ -stdlib=libc++")
+	# Avoid mistaking an object file for a source file on the link command line.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
+endif()
+
 add_subdirectory(Source)
 
 
 ########################################
 # Install shared data files
 #
-if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+if(NOT APPLE)
 	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
 endif()
-if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	# Install the application icon and menu item
-	install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm)
-	install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop
+	install(FILES Installer/dolphin-emu.xpm
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+	install(FILES Installer/dolphin-emu.desktop
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
 endif()
 
@@ -798,7 +886,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH})
 set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Gamecube, Wii and Triforce emulator")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A GameCube, Wii and Triforce emulator")
 
 set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other)
 set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0)
diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake
index 7b2525adae..caa0d621cd 100644
--- a/CMakeTests/CheckLib.cmake
+++ b/CMakeTests/CheckLib.cmake
@@ -6,7 +6,7 @@ macro(_internal_message msg)
 	endif()
 endmacro()
 
-macro(check_lib var lib)
+macro(check_lib var pc lib)
 	set(_is_required 0)
 	set(_is_quiet 0)
 	set(_arg_list ${ARGN})
@@ -22,8 +22,7 @@ macro(check_lib var lib)
 	endforeach()
 
 	if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
-		string(TOLOWER ${lib} lower_lib)
-		pkg_search_module(${var} QUIET ${lower_lib})
+		pkg_search_module(${var} QUIET ${pc})
 	endif()
 
 	if(${var}_FOUND)
@@ -55,17 +54,17 @@ endmacro()
 
 macro(check_libav)
 	if(PKG_CONFIG_FOUND)
-		pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0
-			libswscale>=2.1.0 libavutil>=51.22.1)
+		pkg_check_modules(LIBAV libavcodec>=54.35.0 libavformat>=54.20.4
+			libswscale>=2.1.1 libavutil>=52.3.0)
 	else()
-		message("pkg-config is required to check for libav")
+		message("pkg-config is required to check for libav/ffmpeg")
 	endif()
 	if(LIBAV_FOUND)
-		message("libav found, enabling AVI frame dumps")
+		message("libav/ffmpeg found, enabling AVI frame dumps")
 		add_definitions(-DHAVE_LIBAV)
 		include_directories(${LIBAV_INCLUDE_DIRS})
 	else()
-		message("libav not found, disabling AVI frame dumps")
+		message("libav/ffmpeg not found, disabling AVI frame dumps")
 	endif()
 endmacro()
 
diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake
deleted file mode 100644
index 4861292558..0000000000
--- a/CMakeTests/FindGLEW.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-include(FindPkgConfig OPTIONAL)
-
-# This is a hack to deal with Ubuntu's mess.
-# Ubuntu's version of glew is 1.8, but they have patched in most of glew 1.9.
-# So Ubuntu's version works for dolphin.
-macro(test_glew)
-	set(CMAKE_REQUIRED_INCLUDES ${GLEW_INCLUDE_DIRS})
-	set(CMAKE_REQUIRED_LIBRARIES GLEW)
-	check_cxx_source_runs("
-	#include <GL/glew.h>
-	int main()
-	{
-	#ifdef GLEW_ARB_shader_image_load_store
-	return 0;
-	#else
-	return 1;
-	#endif
-	}"
-	GLEW_HAS_1_9_METHODS)
-endmacro()
-
-if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
-	pkg_search_module(GLEW glew>=1.8)
-endif()
-
-if(GLEW_FOUND)
-	test_glew()
-	if (GLEW_HAS_1_9_METHODS)
-		include_directories(${GLEW_INCLUDE_DIRS})
-		message("GLEW found")
-	endif()
-endif()
diff --git a/CMakeTests/FindLLVM.cmake b/CMakeTests/FindLLVM.cmake
new file mode 100644
index 0000000000..7fe664f6ef
--- /dev/null
+++ b/CMakeTests/FindLLVM.cmake
@@ -0,0 +1,23 @@
+# This file only exists because LLVM's cmake files are broken.
+# This affects both LLVM 3.4 and 3.5.
+# Hopefully when they fix their cmake system we don't need this garbage.
+list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config")
+list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.5")
+list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4")
+
+foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES})
+	find_program(LLVM_CONFIG_EXE NAMES ${LLVM_CONFIG_NAME})
+	if (LLVM_CONFIG_EXE)
+		execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_PACKAGE_VERSION
+			OUTPUT_STRIP_TRAILING_WHITESPACE )
+		if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3")
+			set(LLVM_FOUND 1)
+			execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+				OUTPUT_STRIP_TRAILING_WHITESPACE )
+			execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS
+				OUTPUT_STRIP_TRAILING_WHITESPACE )
+			set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
+			break()
+		endif()
+	endif()
+endforeach()
diff --git a/CMakeTests/FindMiniupnpc.cmake b/CMakeTests/FindMiniupnpc.cmake
index 8f919cacb3..bb1048ccf7 100644
--- a/CMakeTests/FindMiniupnpc.cmake
+++ b/CMakeTests/FindMiniupnpc.cmake
@@ -128,7 +128,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
 	   static struct IGDdatas data;
 	   int main()
 	   {
-	   char externalIP[16]     = "";
+	   char externalIP[16]     = \"\";
 	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
 
 	   return 0;
@@ -148,7 +148,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
 		static struct IGDdatas data;
 		int main()
 		{
-		char externalIP[16]     = "";
+		char externalIP[16]     = \"\";
 		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
 
 		return 0;
diff --git a/CMakeTests/FindPolarSSL.cmake b/CMakeTests/FindPolarSSL.cmake
index be67c5613a..32302a9780 100644
--- a/CMakeTests/FindPolarSSL.cmake
+++ b/CMakeTests/FindPolarSSL.cmake
@@ -6,14 +6,20 @@
 #  POLARSSL_WORKS, this is true if polarssl is found and contains the methods
 #  needed by dolphin-emu
 
-if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
-	# Already in cache, be silent
+# validate cached values (but use them as hints)
+set(POLARSSL_INCLUDE_DIR_HINT POLARSSL_INCLUDE_DIR)
+set(POLARSSL_LIBRARY_HINT POLARSSL_LIBRARY)
+unset(POLARSSL_INCLUDE_DIR CACHE)
+unset(POLARSSL_LIBRARY CACHE)
+find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h HINTS ${POLARSSL_INCLUDE_DIR_HINT})
+find_library(POLARSSL_LIBRARY polarssl HINTS ${POLARSSL_LIBRARY_HINT})
+
+if(POLARSSL_INCLUDE_DIR STREQUAL POLARSSL_INCLUDE_DIR_HINT AND
+   POLARSSL_LIBRARY     STREQUAL POLARSSL_LIBRARY_HINT)
+	# using cached values, be silent
 	set(POLARSSL_FIND_QUIETLY TRUE)
 endif()
 
-find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h)
-find_library(POLARSSL_LIBRARY polarssl)
-
 if (POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
 	set (POLARSSL_FOUND TRUE)
 endif ()
@@ -24,36 +30,53 @@ if (POLARSSL_FOUND)
 		message (STATUS "Found the polarssl headers at ${POLARSSL_INCLUDE_DIR}")
 	endif (NOT POLARSSL_FIND_QUIETLY)
 
-	message(STATUS "Checking to see if system version contains necessary methods")
-
 	set(CMAKE_REQUIRED_INCLUDES ${POLARSSL_INCLUDE_DIR})
 	set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
+	unset(POLARSSL_WORKS CACHE)
 	check_cxx_source_compiles("
+	#include <polarssl/ctr_drbg.h>
+	#include <polarssl/entropy.h>
 	#include <polarssl/net.h>
 	#include <polarssl/ssl.h>
-	#include <polarssl/havege.h>
+	#include <polarssl/version.h>
+
+	#if POLARSSL_VERSION_NUMBER < 0x01030000
+	#error \"Shared PolarSSL version is too old\"
+	#endif
+
 	int main()
 	{
-	ssl_context ctx;
-	ssl_session session;
-	havege_state hs;
+		ssl_context ctx;
+		ssl_session session;
+		entropy_context entropy;
+		ctr_drbg_context ctr_drbg;
+		x509_crt cacert;
+		x509_crt clicert;
+		pk_context pk;
 
-	ssl_init(&ctx);
-	havege_init(&hs);
-	ssl_set_rng(&ctx, havege_random, &hs);
-	ssl_set_session(&ctx, &session);
+		ssl_init(&ctx);
+		entropy_init(&entropy);
 
-	ssl_close_notify(&ctx);
-	ssl_session_free(&session);
-	ssl_free(&ctx);
+		const char* pers = \"dolphin-emu\";
+		ctr_drbg_init(&ctr_drbg, entropy_func,
+		                    &entropy,
+		                    (const unsigned char*)pers,
+		                    strlen(pers));
+	
+		ssl_set_rng(&ctx, ctr_drbg_random, &ctr_drbg);
+		ssl_set_session(&ctx, &session);
 
-	return 0;
+		ssl_close_notify(&ctx);
+		ssl_session_free(&session);
+		ssl_free(&ctx);
+		entropy_free(&entropy);
+
+		return 0;
 	}"
 	POLARSSL_WORKS)
-
 else ()
 	message (STATUS "Could not find polarssl")
 endif ()
 
-MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+mark_as_advanced(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
 
diff --git a/CMakeTests/FindSFML.cmake b/CMakeTests/FindSFML.cmake
index fd5f5fff48..b99e137881 100644
--- a/CMakeTests/FindSFML.cmake
+++ b/CMakeTests/FindSFML.cmake
@@ -1,20 +1,59 @@
-# Locate the SFML library
+# This script locates the SFML library
+# ------------------------------------
 #
-# This module defines the following variables:
-# - For each module XXX (SYSTEM, WINDOW, GRAPHICS, NETWORK, AUDIO, MAIN):
-#   - SFML_XXX_LIBRARY_DEBUG, the name of the debug library of the xxx module (set to SFML_XXX_LIBRARY_RELEASE is no debug version is found)
-#   - SFML_XXX_LIBRARY_RELEASE, the name of the release library of the xxx module (set to SFML_XXX_LIBRARY_DEBUG is no release version is found)
-#   - SFML_XXX_LIBRARY, the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
-#   - SFML_XXX_FOUND, true if either the debug or release library of the xxx module is found
-# - SFML_LIBRARIES, the list of all libraries corresponding to the required modules
-# - SFML_FOUND, true if all the required modules are found
-# - SFML_INCLUDE_DIR, the path where SFML headers are located (the directory containing the SFML/Config.hpp file)
+# Usage
+# -----
+#
+# When you try to locate the SFML libraries, you must specify which modules you want to use (system, window, graphics, network, audio, main).
+# If none is given, the SFML_LIBRARIES variable will be empty and you'll end up linking to nothing.
+# example:
+#   find_package(SFML COMPONENTS graphics window system) // find the graphics, window and system modules
+#
+# You can enforce a specific version, either MAJOR.MINOR or only MAJOR.
+# If nothing is specified, the version won't be checked (ie. any version will be accepted).
+# example:
+#   find_package(SFML COMPONENTS ...)     // no specific version required
+#   find_package(SFML 2 COMPONENTS ...)   // any 2.x version
+#   find_package(SFML 2.4 COMPONENTS ...) // version 2.4 or greater
 #
 # By default, the dynamic libraries of SFML will be found. To find the static ones instead,
 # you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).
+# In case of static linking, the SFML_STATIC macro will also be defined by this script.
+# example:
+#   set(SFML_STATIC_LIBRARIES TRUE)
+#   find_package(SFML 2 COMPONENTS network system)
 #
-# If SFML is not installed in a standard path, you can use the SFMLDIR CMake variable or environment variable
+# On Mac OS X if SFML_STATIC_LIBRARIES is not set to TRUE then by default CMake will search for frameworks unless
+# CMAKE_FIND_FRAMEWORK is set to "NEVER" for example. Please refer to CMake documentation for more details.
+# Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which
+# are available for both release and debug modes.
+#
+# If SFML is not installed in a standard path, you can use the SFML_ROOT CMake (or environment) variable
 # to tell CMake where SFML is.
+#
+# Output
+# ------
+#
+# This script defines the following variables:
+# - For each specified module XXX (system, window, graphics, network, audio, main):
+#   - SFML_XXX_LIBRARY_DEBUG:   the name of the debug library of the xxx module (set to SFML_XXX_LIBRARY_RELEASE is no debug version is found)
+#   - SFML_XXX_LIBRARY_RELEASE: the name of the release library of the xxx module (set to SFML_XXX_LIBRARY_DEBUG is no release version is found)
+#   - SFML_XXX_LIBRARY:         the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
+#   - SFML_XXX_FOUND:           true if either the debug or release library of the xxx module is found
+# - SFML_LIBRARIES:   the list of all libraries corresponding to the required modules
+# - SFML_FOUND:       true if all the required modules are found
+# - SFML_INCLUDE_DIR: the path where SFML headers are located (the directory containing the SFML/Config.hpp file)
+#
+# example:
+#   find_package(SFML 2 COMPONENTS system window graphics audio REQUIRED)
+#   include_directories(${SFML_INCLUDE_DIR})
+#   add_executable(myapp ...)
+#   target_link_libraries(myapp ${SFML_LIBRARIES})
+
+# define the SFML_STATIC macro if static build was chosen
+if(SFML_STATIC_LIBRARIES)
+    add_definitions(-DSFML_STATIC)
+endif()
 
 # deduce the libraries suffix from the options
 set(FIND_SFML_LIB_SUFFIX "")
@@ -26,6 +65,8 @@ endif()
 find_path(SFML_INCLUDE_DIR SFML/Config.hpp
           PATH_SUFFIXES include
           PATHS
+          ${SFML_ROOT}
+          $ENV{SFML_ROOT}
           ~/Library/Frameworks
           /Library/Frameworks
           /usr/local/
@@ -33,19 +74,19 @@ find_path(SFML_INCLUDE_DIR SFML/Config.hpp
           /sw          # Fink
           /opt/local/  # DarwinPorts
           /opt/csw/    # Blastwave
-          /opt/
-          ${SFMLDIR}
-          $ENV{SFMLDIR})
-
-
-# will be set to false if one of the required modules is not found
-set(SFML_FOUND TRUE)
-set(SFML_VERSION_OK TRUE)
+          /opt/)
 
 # check the version number
-if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR AND NOT (SFML_INCLUDE_DIR STREQUAL "SFML_INCLUDE_DIR-NOTFOUND"))
+set(SFML_VERSION_OK TRUE)
+if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
     # extract the major and minor version numbers from SFML/Config.hpp
-    FILE(READ "${SFML_INCLUDE_DIR}/SFML/Config.hpp" SFML_CONFIG_HPP_CONTENTS)
+    # we have to handle framework a little bit differently :
+    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+    else()
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+    endif()
+    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
     STRING(REGEX MATCH ".*#define SFML_VERSION_MAJOR ([0-9]+).*#define SFML_VERSION_MINOR ([0-9]+).*" SFML_CONFIG_HPP_CONTENTS "${SFML_CONFIG_HPP_CONTENTS}")
     STRING(REGEX REPLACE ".*#define SFML_VERSION_MAJOR ([0-9]+).*" "\\1" SFML_VERSION_MAJOR "${SFML_CONFIG_HPP_CONTENTS}")
     STRING(REGEX REPLACE ".*#define SFML_VERSION_MINOR ([0-9]+).*" "\\1" SFML_VERSION_MINOR "${SFML_CONFIG_HPP_CONTENTS}")
@@ -68,22 +109,21 @@ if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR AND NOT (SFML_INCLUDE_DIR STREQUAL "SF
             set(SFML_VERSION_MINOR x)
         endif()
     endif()
-elseif(SFML_INCLUDE_DIR STREQUAL "SFML_INCLUDE_DIR-NOTFOUND")
-    set(SFML_FOUND FALSE)
-    set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_INCLUDE_DIR")
 endif()
 
 # find the requested modules
-set(FIND_SFML_LIB_PATHS ~/Library/Frameworks
-                        /Library/Frameworks
-                        /usr/local
-                        /usr
-                        /sw
-                        /opt/local
-                        /opt/csw
-                        /opt
-                        ${SFMLDIR}
-                        $ENV{SFMLDIR})
+set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
+set(FIND_SFML_LIB_PATHS
+    ${SFML_ROOT}
+    $ENV{SFML_ROOT}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local
+    /usr
+    /sw
+    /opt/local
+    /opt/csw
+    /opt)
 foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
     string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
     string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
@@ -109,7 +149,7 @@ foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
     if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
         # library found
         set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
-        
+
         # if both are found, set SFML_XXX_LIBRARY to contain both
         if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
             set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
@@ -165,5 +205,5 @@ endif()
 
 # handle success
 if(SFML_FOUND)
-    message("Found SFML: ${SFML_INCLUDE_DIR}")
+    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
 endif()
diff --git a/Contributing.md b/Contributing.md
new file mode 100644
index 0000000000..6c25c0d5ba
--- /dev/null
+++ b/Contributing.md
@@ -0,0 +1,231 @@
+# Dolphin Coding Style & Licensing
+
+If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
+
+## Coding Style
+
+- [Introduction] (#introduction)
+- [Styling and formatting] (#styling-and-formatting)
+  - [General] (#general)
+  - [Naming] (#naming)
+  - [Conditionals] (#conditionals)
+  - [Classes and Structs] (#classes-and-structs)
+- [Code specific] (#code-specific)
+  - [General] (#general-1)
+  - [Headers] (#headers)
+  - [Loops] (#loops)
+  - [Functions] (#functions)
+  - [Classes and Structs] (#classes-and-structs-1)
+
+
+## Introduction
+
+This guide is for developers who wish to contribute to the Dolphin codebase. It will detail how to properly style and format code to fit this project. This guide also offers suggestions on specific functions and other varia that may be used in code.
+
+Following this guide and formatting your code as detailed will likely get your pull request merged much faster than if you don't (assuming the written code has no mistakes in itself).
+
+## Styling and formatting
+
+### General
+- Try to limit lines of code to a maximum of 100 characters.
+    - Note that this does not mean you should try and use all 100 characters every time you have the chance. Typically with well formatted code, you normally shouldn't hit a line count of anything over 80 or 90 characters.
+- The indentation style we use is tabs for initial indentation and then, if vertical alignment is needed, spaces are to be used.
+- The opening brace for namespaces, classes, functions, enums, structs, unions, conditionals, and loops go on the next line.
+  - With array initializer lists and lambda expressions it is OK to keep the brace on the same line.
+- References and pointers have the ampersand or asterisk against the type name, not the variable name. Example: `int* var`, not `int *var`.
+- Don't use multi-line comments (`/* Comment text */`), use single-line comments (`// Comment text`) instead.
+- Don't collapse single line conditional or loop bodies onto the same line as its header. Put it on the next line.
+  - Yes:
+
+    ```c++
+    if (condition)
+        return 0;
+
+    while (var != 0)
+        var--;
+    ```
+  - No:
+
+    ```c++
+    if (condition) return 0;
+
+    while (var != 0) var--;
+    ```
+
+### Naming
+- All class, enum, function, and struct names should be in upper CamelCase. If the name contains an abbreviation uppercase it.
+  - `class SomeClassName`
+  - `enum IPCCommandType`
+- All compile time constants should be fully uppercased. With constants that have more than one word in them, use an underscore to separate them.
+  - `const double PI = 3.14159;`
+  - `const int MAX_PATH = 260;`
+- All variables should be lowercase with underscores separating the individual words in the name.
+  - `int this_variable_name;`
+- Please do not use [Hungarian notation](http://en.wikipedia.org/wiki/Hungarian_notation) prefixes with variables. The only exceptions to this are the variable prefixes below.
+  - Global variables – `g_`
+  - Class variables – `m_`
+  - Static variables – `s_`
+
+### Conditionals
+- Do not leave `else` or `else if` conditions dangling unless the `if` condition lacks braces.
+  - Yes:
+
+    ```c++
+    if (condition)
+    {
+        // code
+    }
+    else
+    {
+        // code
+    }
+    ```
+  - Acceptable:
+
+    ```c++
+    if (condition)
+        // code line
+    else
+        // code line
+    ```
+  - No:
+
+    ```c++
+    if (condition)
+    {
+        // code
+    }
+    else
+        // code line
+    ```
+
+
+### Classes and Structs
+- If making a [POD](http://en.wikipedia.org/wiki/Plain_Old_Data_Structures) type, use a `struct` for this. Use a `class` otherwise.
+- Class layout should be in the order, `public`, `protected`, and then `private`.
+  - If one or more of these sections are not needed, then simply don't include them.
+- For each of the above specified access levels, the contents of each should follow this given order: constructor, destructor, operator overloads, functions, then variables.
+- When defining the variables, define `static` variables before the non-static ones.
+
+```c++
+class ExampleClass : public SomeParent
+{
+public:
+    ExampleClass(int x, int y);
+
+    int GetX() const;
+    int GetY() const;
+
+protected:
+    virtual void SomeProtectedFunction() = 0;
+    static float s_some_variable;
+
+private:
+    int m_x;
+    int m_y;
+};
+```
+
+## Code Specific
+
+### General
+- Using C++11 features is OK and recommended.
+- Use the [nullptr](http://en.cppreference.com/w/cpp/language/nullptr) type over the macro `NULL`.
+- If a [range-based for loop](http://en.cppreference.com/w/cpp/language/range-for) can be used instead of container iterators, use it.
+- Obviously, try not to use `goto` unless you have a *really* good reason for it.
+- If a compiler warning is found, please try and fix it.
+- Try to avoid using raw pointers (pointers allocated with `new`) as much as possible. There are cases where using a raw pointer is unavoidable, and in these situations it is OK to use them. An example of this is functions from a C library that require them. In cases where it is avoidable, the STL usually has a means to solve this (`vector`, `unique_ptr`, etc).
+- Do not use the `auto` keyword everywhere. While it's nice that the type can be determined by the compiler, it cannot be resolved at 'readtime' by the developer as easily. Use auto only in cases where it is obvious what the type being assigned is (note: 'obvious' means not having to open other files or reading the header file). Some situations where it is appropriate to use `auto` is when iterating over a `std::map` container in a foreach loop, or to shorten the length of container iterator variable declarations.
+- Do not use `using namespace [x];` in headers. Try not to use it at all if you can.
+- The preferred form of the increment and decrement operator in for-loops is prefix-form (e.g. `++var`).
+
+### Headers
+- If a header is not necessary in a certain source file, remove them.
+- If you find duplicate includes of a certain header, remove it.
+- When declaring includes in a source file, make sure they follow the given pattern:
+  - Standard library headers
+  - System-specific headers (these should also likely be in an `#ifdef` block unless the source file itself is system-specific).
+  - Dolphin source file headers
+- Each of the above header sections should also be in alphabetical order
+- Project source file headers should be included in a way that is relative to the `[Dolphin Root]/Source/Core` directory.
+- This project uses `#pragma once` as header guards.
+
+### Loops
+- If an infinite loop is required, do not use `for (;;)`, use `while (true)`.
+- Empty-bodied loops should use braces after their header, not a semicolon.
+  - Yes: `while (condition) {}`
+  - No: `while (condition);`
+- For do-while loops, place 'while' on the same line as the closing brackets
+
+  ```c++
+  do
+  {
+  } while (false);
+  ```
+
+### Functions
+- If a function parameter is a pointer or reference and its value or data isn't intended to be changed, please mark that parameter as `const`.
+- Functions that specifically modify their parameters should have the respective parameter(s) marked as a pointer so that the variables being modified are syntaxically obvious.
+  - What not to do:
+
+    ```c++
+    template<class T>
+    inline void Clamp(T& val, const T& min, const T& max)
+    {
+        if (val < min)
+            val = min;
+        else if (val > max)
+            val = max;
+    }
+    ```
+
+    Example call: `Clamp(var, 1000, 5000);`
+
+  - What to do:
+
+    ```c++
+    template<class T>
+    inline void Clamp(T* val, const T& min, const T& max)
+    {
+        if (*val < min)
+            *val = min;
+        else if (*val > max)
+            *val = max;
+    }
+    ```
+
+    Example call: `Clamp(&var, 1000, 5000);`
+
+- Class member functions that you do not want to be overridden in inheriting classes should be marked with the `final` specifier.
+
+  ```c++
+  class ClassName : ParentClass
+  {
+  public:
+      void Update() final;
+  };
+  ```
+
+- Overridden member functions that can also be inherited should be marked with the `override` specifier to make it easier to see which functions belong to the parent class.
+
+  ```c++
+  class ClassName : ParentClass
+  {
+  public:
+      void Update() override;
+  };
+  ```
+
+### Classes and Structs
+- Classes and structs that are not intended to be extended through inheritance should be marked with the `final` specifier.
+
+  ```c++
+  class ClassName final : ParentClass
+  {
+      // Class definitions
+  };
+  ```
+
+## Java
+
+The Android project is currently written in Java. If you are using Android Studio to contribute, you can import the project's code style from `code-style-java.jar`, located in `[Dolphin Root]/Source/Android`. Please organize imports before committing.
\ No newline at end of file
diff --git a/Data/Sys/GC/font-licenses.txt b/Data/Sys/GC/font-licenses.txt
new file mode 100644
index 0000000000..9c33438ead
--- /dev/null
+++ b/Data/Sys/GC/font-licenses.txt
@@ -0,0 +1,212 @@
+The two fonts in this directory (font_ansi.bin and font_sjis.bin) were
+generated using gc-font-tool which can be found in the docs/ directory in the
+dolphin source code.
+
+Both fonts are based on Droid Sans
+
+Copyright 2006-2014, Google Corporation
+Licensed under the Apache License 2.0
+
+====
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Data/Sys/GC/font_ansi.bin b/Data/Sys/GC/font_ansi.bin
index 33b20041cc..863f877e9f 100644
Binary files a/Data/Sys/GC/font_ansi.bin and b/Data/Sys/GC/font_ansi.bin differ
diff --git a/Data/Sys/GC/font_sjis.bin b/Data/Sys/GC/font_sjis.bin
index c8d25fdcd0..132dbfc2c3 100644
Binary files a/Data/Sys/GC/font_sjis.bin and b/Data/Sys/GC/font_sjis.bin differ
diff --git a/Data/Sys/GameSettings/010.ini b/Data/Sys/GameSettings/010.ini
new file mode 100644
index 0000000000..bdac6665af
--- /dev/null
+++ b/Data/Sys/GameSettings/010.ini
@@ -0,0 +1,22 @@
+# 010E01 - Wii Backup Disc v1.31
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/301.ini b/Data/Sys/GameSettings/301.ini
new file mode 100644
index 0000000000..140d8a293c
--- /dev/null
+++ b/Data/Sys/GameSettings/301.ini
@@ -0,0 +1,20 @@
+# 301E01 - GameCube Service Disc
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Certain tests may soft-lock
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
diff --git a/Data/Sys/GameSettings/C94.ini b/Data/Sys/GameSettings/C94.ini
new file mode 100644
index 0000000000..4674413253
--- /dev/null
+++ b/Data/Sys/GameSettings/C94.ini
@@ -0,0 +1,23 @@
+# C94EGX - Tower Toppler
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/C96.ini b/Data/Sys/GameSettings/C96.ini
new file mode 100644
index 0000000000..b87791d42f
--- /dev/null
+++ b/Data/Sys/GameSettings/C96.ini
@@ -0,0 +1,23 @@
+# C96EGX - Summer Games II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/C97.ini b/Data/Sys/GameSettings/C97.ini
new file mode 100644
index 0000000000..4730659a81
--- /dev/null
+++ b/Data/Sys/GameSettings/C97.ini
@@ -0,0 +1,23 @@
+# C97EGX - California Games
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/C9M.ini b/Data/Sys/GameSettings/C9M.ini
new file mode 100644
index 0000000000..646809de75
--- /dev/null
+++ b/Data/Sys/GameSettings/C9M.ini
@@ -0,0 +1,23 @@
+# C9MEGX - Pitstop II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/C9X.ini b/Data/Sys/GameSettings/C9X.ini
new file mode 100644
index 0000000000..6c15a04499
--- /dev/null
+++ b/Data/Sys/GameSettings/C9X.ini
@@ -0,0 +1,23 @@
+# C9XEGX - The Last Ninja
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/D43.ini b/Data/Sys/GameSettings/D43.ini
new file mode 100644
index 0000000000..1b16be811b
--- /dev/null
+++ b/Data/Sys/GameSettings/D43.ini
@@ -0,0 +1,22 @@
+# D43E01, D43J01, D43P01, D43U01 - ZELDA OCARINA MULTI PACK
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/D43E01.ini b/Data/Sys/GameSettings/D43E01.ini
index f90d827925..6fb32ca1b2 100644
--- a/Data/Sys/GameSettings/D43E01.ini
+++ b/Data/Sys/GameSettings/D43E01.ini
@@ -1,12 +1,4 @@
-# D43E01 - ZELDA OCARINA MULTI PACK
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Minor video glitches when pausing
+# D43E01 - Legend of Zelda, The - Ocarina of Time - Master Quest
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,12 +8,98 @@ EmulationIssues = Minor video glitches when pausing
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
+$Max Hearts
+02BE1816 00000140
+$Infinite Hearts
+02BE1818 00000140
+$Infinite Magic
+08BE1821 00000008
+00BE1890 00000007
+00BE1822 00000001
+00BE1824 00000001
+00BE181B 00000060
+$Infinite Hover When Moving
+12132F1A 00000000
+02CA2AB2 0000000F
+$Infinite Rupees
+02BE181C 000003E7
+$Swords/Shields/boots/tunics
+02BE1884 00007777
+$Have Quiver (Adult)
+00BE1889 00000001
+$Golden Gauntlets (Adult)
+00BE188B 000000C0
+$All Quest Items
+04BE188C 30FFFFFF
+$Biggoron's Sword
+00BE1826 00000001
+$999 Gold Skulltulas
+02BE18B8 000003E7
+$Have Deku Stick
+00BE185C 00000000
+$Infinite Deku Sticks
+00BE1874 00000009
+$Flaming Deku Stick
+02CA2A80 000000C4
+$Have Deku Nuts
+00BE185D 00000001
+$Infinite Deku Nuts
+00BE1875 0000000A
+$Have Bombs
+00BE185E 00000002
+$Infinite Bombs
+00BE1876 00000009
+$Have Fairy Slingshot
+00BE1862 00000006
+$Infinite Slingshot Ammo
+00BE187A 00000009
+$Have Fairy Ocarina (Not Time)
+00BE1863 00000007
+$Have Ocarina Of Time (Not Fairy)
+00BE1863 00000008
+$Have Bombchu
+00BE1864 00000009
+$Infinite Bombchu's
+00BE187C 00000009
+$Have Boomerang
+00BE1868 0000000E
+$Have Lens Of Truth
+00BE1869 0000000F
+$Have Magic Beans
+00BE186A 00000010
+$Infinite Magic Beans
+00BE1882 00000009
+$Have Fairy Bow
+00BE185F 00000003
+$Infinite Arrows
+00BE1877 00000009
+$Have Fire Arrow (MP2)
+00BE1860 00000004
+$Have Ice Arrow (MP2)
+00BE1866 0000000C
+$Light Arrow (MP4)
+00BE186C 00000012
+$Have Hookshot (Not Longshot)
+00BE1865 0000000A
+$Have Longshot (Not Hookshot)
+00BE1865 0000000B
+$Have Megaton Hammer
+00BE186B 00000011
+$Have Din's Fire (MP6)
+00BE1861 00000005
+$Have Fairie's Wind (MP6)
+00BE1867 0000000D
+$Have Nayru's Love (MP12)
+00BE186D 00000013
+$Have Empty Bottle 1
+08BE186E 000000FF
+00BE188E 00000014
+$Have Empty Bottle 2
+08BE186F 000000FF
+00BE186F 00000014
+$Have Empty Bottle 3
+08BE1870 000000FF
+00BE1870 00000014
+$Have Empty Bottle 4
+08BE1871 000000FF
+00BE1871 00000014
diff --git a/Data/Sys/GameSettings/D43J01.ini b/Data/Sys/GameSettings/D43J01.ini
index 6db05bda2d..347e49b949 100644
--- a/Data/Sys/GameSettings/D43J01.ini
+++ b/Data/Sys/GameSettings/D43J01.ini
@@ -1,13 +1,5 @@
 # D43J01 - ZELDA OCARINA MULTI PACK
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,4 +10,3 @@ $loophack
 
 [ActionReplay]
 # Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/D43P01.ini b/Data/Sys/GameSettings/D43P01.ini
deleted file mode 100644
index 045d7a86bd..0000000000
--- a/Data/Sys/GameSettings/D43P01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# D43P01 - The Legend of Zelda: Ocarina of Time
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Dolphin doesn't support soft reset"
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/D43U01.ini b/Data/Sys/GameSettings/D43U01.ini
deleted file mode 100644
index a7055cf4a3..0000000000
--- a/Data/Sys/GameSettings/D43U01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# D43U01 - ZELDA OCARINA MULTI PACK
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/D85.ini b/Data/Sys/GameSettings/D85.ini
new file mode 100644
index 0000000000..0c7f47d6d0
--- /dev/null
+++ b/Data/Sys/GameSettings/D85.ini
@@ -0,0 +1,23 @@
+# D85E01 - Multi Game Demo Disk 12
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos run at low FPS
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/DD2.ini b/Data/Sys/GameSettings/DD2.ini
new file mode 100644
index 0000000000..95c3b1bc87
--- /dev/null
+++ b/Data/Sys/GameSettings/DD2.ini
@@ -0,0 +1,34 @@
+# DD2P41 - Just Dance 2 (Demo)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/DLS.ini b/Data/Sys/GameSettings/DLS.ini
new file mode 100644
index 0000000000..a09d5bb36e
--- /dev/null
+++ b/Data/Sys/GameSettings/DLS.ini
@@ -0,0 +1,28 @@
+# DLSE64, DLSP64 - Star Wars: Rogue Squadron III: Rebel Strike: Limited Edition Bonus Disc (Demo)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/DTL.ini b/Data/Sys/GameSettings/DTL.ini
new file mode 100644
index 0000000000..45697783b0
--- /dev/null
+++ b/Data/Sys/GameSettings/DTL.ini
@@ -0,0 +1,19 @@
+# DTLX01 - ACTION REPLAY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/DTLX01.ini b/Data/Sys/GameSettings/DTLX01.ini
deleted file mode 100644
index 828e55ad6f..0000000000
--- a/Data/Sys/GameSettings/DTLX01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# DTLX01 - ACTION REPLAY
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/DVDXDV.ini b/Data/Sys/GameSettings/DVDXDV.ini
deleted file mode 100644
index 3495ea4509..0000000000
--- a/Data/Sys/GameSettings/DVDXDV.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# DVDXDV - Unknown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/FA6.ini b/Data/Sys/GameSettings/FA6.ini
new file mode 100644
index 0000000000..dd29d0f7a2
--- /dev/null
+++ b/Data/Sys/GameSettings/FA6.ini
@@ -0,0 +1,32 @@
+# FA6E01, FA6P01 - Donkey Kong Jr. Math
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA7.ini b/Data/Sys/GameSettings/FA7.ini
new file mode 100644
index 0000000000..7efad7ea9c
--- /dev/null
+++ b/Data/Sys/GameSettings/FA7.ini
@@ -0,0 +1,32 @@
+# FA7E01, FA7P01 - Yoshi
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA8.ini b/Data/Sys/GameSettings/FA8.ini
new file mode 100644
index 0000000000..d338d77549
--- /dev/null
+++ b/Data/Sys/GameSettings/FA8.ini
@@ -0,0 +1,32 @@
+# FA8E01, FA8F01, FA8P01 - Kirby's Adventure [NES]
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FA9.ini b/Data/Sys/GameSettings/FA9.ini
new file mode 100644
index 0000000000..34abeaf5f8
--- /dev/null
+++ b/Data/Sys/GameSettings/FA9.ini
@@ -0,0 +1,32 @@
+# FA9E01, FA9P01 - Zelda II: The Adventure of Link
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAA.ini b/Data/Sys/GameSettings/FAA.ini
new file mode 100644
index 0000000000..83a2043105
--- /dev/null
+++ b/Data/Sys/GameSettings/FAA.ini
@@ -0,0 +1,29 @@
+# FAAE01, FAAP01 - Donkey Kong
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAB.ini b/Data/Sys/GameSettings/FAB.ini
new file mode 100644
index 0000000000..34b7ba9160
--- /dev/null
+++ b/Data/Sys/GameSettings/FAB.ini
@@ -0,0 +1,29 @@
+# FABE01, FABP01 - Donkey Kong Jr.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FABP01.ini b/Data/Sys/GameSettings/FABP01.ini
deleted file mode 100644
index ae55208bba..0000000000
--- a/Data/Sys/GameSettings/FABP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# FABP01 - Zelda: Link to Past
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/FAG.ini b/Data/Sys/GameSettings/FAG.ini
new file mode 100644
index 0000000000..5a0107ad3a
--- /dev/null
+++ b/Data/Sys/GameSettings/FAG.ini
@@ -0,0 +1,29 @@
+# FAGE01, FAGP01 - Super Mario Bros.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAH.ini b/Data/Sys/GameSettings/FAH.ini
new file mode 100644
index 0000000000..5db554b30a
--- /dev/null
+++ b/Data/Sys/GameSettings/FAH.ini
@@ -0,0 +1,29 @@
+# FAHE01, FAHP01 - Tennis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAK.ini b/Data/Sys/GameSettings/FAK.ini
new file mode 100644
index 0000000000..eb71b5f8b7
--- /dev/null
+++ b/Data/Sys/GameSettings/FAK.ini
@@ -0,0 +1,29 @@
+# FAKE01, FAKP01 - The Legend of Zelda
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAL.ini b/Data/Sys/GameSettings/FAL.ini
new file mode 100644
index 0000000000..4ae05980e8
--- /dev/null
+++ b/Data/Sys/GameSettings/FAL.ini
@@ -0,0 +1,29 @@
+# FALE01, FALP01 - Baseball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAN.ini b/Data/Sys/GameSettings/FAN.ini
new file mode 100644
index 0000000000..279a6667a5
--- /dev/null
+++ b/Data/Sys/GameSettings/FAN.ini
@@ -0,0 +1,29 @@
+# FANE01, FANP01 - Urban Champion
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAO.ini b/Data/Sys/GameSettings/FAO.ini
new file mode 100644
index 0000000000..6743df26da
--- /dev/null
+++ b/Data/Sys/GameSettings/FAO.ini
@@ -0,0 +1,29 @@
+# FAOE01, FAOP01 - Solomon's Key
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAP.ini b/Data/Sys/GameSettings/FAP.ini
new file mode 100644
index 0000000000..0bfc44a98f
--- /dev/null
+++ b/Data/Sys/GameSettings/FAP.ini
@@ -0,0 +1,32 @@
+# FAPE01, FAPP01 - NES Open Tour. Golf
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAQ.ini b/Data/Sys/GameSettings/FAQ.ini
new file mode 100644
index 0000000000..bc617f6750
--- /dev/null
+++ b/Data/Sys/GameSettings/FAQ.ini
@@ -0,0 +1,32 @@
+# FAQL01, FAQN01 - Ninja JaJaMaru-kun
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAS.ini b/Data/Sys/GameSettings/FAS.ini
new file mode 100644
index 0000000000..b0b1d92d61
--- /dev/null
+++ b/Data/Sys/GameSettings/FAS.ini
@@ -0,0 +1,29 @@
+# FASE01, FASP01 - Xevious
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAT.ini b/Data/Sys/GameSettings/FAT.ini
new file mode 100644
index 0000000000..67753e424d
--- /dev/null
+++ b/Data/Sys/GameSettings/FAT.ini
@@ -0,0 +1,32 @@
+# FATE01 - THE LEGEND OF KAGE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAV.ini b/Data/Sys/GameSettings/FAV.ini
new file mode 100644
index 0000000000..adb18db6c6
--- /dev/null
+++ b/Data/Sys/GameSettings/FAV.ini
@@ -0,0 +1,32 @@
+# FAVE01 - TECMO BOWL
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAW.ini b/Data/Sys/GameSettings/FAW.ini
new file mode 100644
index 0000000000..329343f11c
--- /dev/null
+++ b/Data/Sys/GameSettings/FAW.ini
@@ -0,0 +1,32 @@
+# FAWE01 - ELEVATOR ACTION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FAX.ini b/Data/Sys/GameSettings/FAX.ini
new file mode 100644
index 0000000000..d5d9f37c1c
--- /dev/null
+++ b/Data/Sys/GameSettings/FAX.ini
@@ -0,0 +1,32 @@
+# FAXE01, FAXP01 - Pac-Man
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FB4.ini b/Data/Sys/GameSettings/FB4.ini
new file mode 100644
index 0000000000..60b5ec49ac
--- /dev/null
+++ b/Data/Sys/GameSettings/FB4.ini
@@ -0,0 +1,32 @@
+# FB4E01, FB4P01 - Lunar Pool
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FB5.ini b/Data/Sys/GameSettings/FB5.ini
new file mode 100644
index 0000000000..6af1d03a0a
--- /dev/null
+++ b/Data/Sys/GameSettings/FB5.ini
@@ -0,0 +1,32 @@
+# FB5E01 - ZANAC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBB.ini b/Data/Sys/GameSettings/FBB.ini
new file mode 100644
index 0000000000..bedaf998fe
--- /dev/null
+++ b/Data/Sys/GameSettings/FBB.ini
@@ -0,0 +1,32 @@
+# FBBE01, FBBP01 - Mach Rider
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBC.ini b/Data/Sys/GameSettings/FBC.ini
new file mode 100644
index 0000000000..4b051e55b9
--- /dev/null
+++ b/Data/Sys/GameSettings/FBC.ini
@@ -0,0 +1,32 @@
+# FBCE01, FBCP01 - Excitebike
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBD.ini b/Data/Sys/GameSettings/FBD.ini
new file mode 100644
index 0000000000..8d94b58032
--- /dev/null
+++ b/Data/Sys/GameSettings/FBD.ini
@@ -0,0 +1,32 @@
+# FBDE01, FBDP01 - Kid Icarus
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBE.ini b/Data/Sys/GameSettings/FBE.ini
new file mode 100644
index 0000000000..f1b7ca9399
--- /dev/null
+++ b/Data/Sys/GameSettings/FBE.ini
@@ -0,0 +1,32 @@
+# FBEE01, FBEP01 - Ice Climber
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBH.ini b/Data/Sys/GameSettings/FBH.ini
new file mode 100644
index 0000000000..babebb053a
--- /dev/null
+++ b/Data/Sys/GameSettings/FBH.ini
@@ -0,0 +1,32 @@
+# FBHE01, FBHJ01, FBHP01 - Castlevania
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBI.ini b/Data/Sys/GameSettings/FBI.ini
new file mode 100644
index 0000000000..3dcd5fcb1f
--- /dev/null
+++ b/Data/Sys/GameSettings/FBI.ini
@@ -0,0 +1,32 @@
+# FBIE01, FBIP01 - Punch-Out!!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBJ.ini b/Data/Sys/GameSettings/FBJ.ini
new file mode 100644
index 0000000000..b2b5f27b8b
--- /dev/null
+++ b/Data/Sys/GameSettings/FBJ.ini
@@ -0,0 +1,32 @@
+# FBJE01, FBJP01 - Mighty Bomb Jack
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBL.ini b/Data/Sys/GameSettings/FBL.ini
new file mode 100644
index 0000000000..df1743fc95
--- /dev/null
+++ b/Data/Sys/GameSettings/FBL.ini
@@ -0,0 +1,32 @@
+# FBLE01, FBLM01 - Lode Runner
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBN.ini b/Data/Sys/GameSettings/FBN.ini
new file mode 100644
index 0000000000..12dde56c1f
--- /dev/null
+++ b/Data/Sys/GameSettings/FBN.ini
@@ -0,0 +1,32 @@
+# FBNE01, FBNM01 - Ninja Gaiden
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBR.ini b/Data/Sys/GameSettings/FBR.ini
new file mode 100644
index 0000000000..a187c58f7f
--- /dev/null
+++ b/Data/Sys/GameSettings/FBR.ini
@@ -0,0 +1,32 @@
+# FBRE01, FBRJ01, FBRP01 - Galaga
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBS.ini b/Data/Sys/GameSettings/FBS.ini
new file mode 100644
index 0000000000..26ad9f62d9
--- /dev/null
+++ b/Data/Sys/GameSettings/FBS.ini
@@ -0,0 +1,32 @@
+# FBSE01, FBSM01 - Milon's Secret Castle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBU.ini b/Data/Sys/GameSettings/FBU.ini
new file mode 100644
index 0000000000..3494f81bbb
--- /dev/null
+++ b/Data/Sys/GameSettings/FBU.ini
@@ -0,0 +1,32 @@
+# FBUE01, FBUP01 - Adventures of Lolo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBY.ini b/Data/Sys/GameSettings/FBY.ini
new file mode 100644
index 0000000000..964fac7a31
--- /dev/null
+++ b/Data/Sys/GameSettings/FBY.ini
@@ -0,0 +1,32 @@
+# FBYE01, FBYP01 - Super Mario Bros. 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FBYE01.ini b/Data/Sys/GameSettings/FBYE01.ini
deleted file mode 100644
index fc16165b8a..0000000000
--- a/Data/Sys/GameSettings/FBYE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# FBYE01 - Super Mario Bros. 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Can't see graphics
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/FBZ.ini b/Data/Sys/GameSettings/FBZ.ini
new file mode 100644
index 0000000000..13d8a87d36
--- /dev/null
+++ b/Data/Sys/GameSettings/FBZ.ini
@@ -0,0 +1,32 @@
+# FBZE01, FBZP01 - Metroid
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC3.ini b/Data/Sys/GameSettings/FC3.ini
new file mode 100644
index 0000000000..b93395b83f
--- /dev/null
+++ b/Data/Sys/GameSettings/FC3.ini
@@ -0,0 +1,32 @@
+# FC3E01, FC3P01 - Bubble Bobble
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC6.ini b/Data/Sys/GameSettings/FC6.ini
new file mode 100644
index 0000000000..2e66c8eacb
--- /dev/null
+++ b/Data/Sys/GameSettings/FC6.ini
@@ -0,0 +1,32 @@
+# FC6E01, FC6P01 - StarTropics
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC7.ini b/Data/Sys/GameSettings/FC7.ini
new file mode 100644
index 0000000000..0affbd0ead
--- /dev/null
+++ b/Data/Sys/GameSettings/FC7.ini
@@ -0,0 +1,32 @@
+# FC7E01 - Play Action Football
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FC8.ini b/Data/Sys/GameSettings/FC8.ini
new file mode 100644
index 0000000000..1093f2bae3
--- /dev/null
+++ b/Data/Sys/GameSettings/FC8.ini
@@ -0,0 +1,32 @@
+# FC8E01, FC8J01, FC8P01 - Castlevania II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCA.ini b/Data/Sys/GameSettings/FCA.ini
new file mode 100644
index 0000000000..04ae869b91
--- /dev/null
+++ b/Data/Sys/GameSettings/FCA.ini
@@ -0,0 +1,32 @@
+# FCAE01 - Star Soldier
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCP.ini b/Data/Sys/GameSettings/FCP.ini
new file mode 100644
index 0000000000..808d4ff043
--- /dev/null
+++ b/Data/Sys/GameSettings/FCP.ini
@@ -0,0 +1,32 @@
+# FCPE01, FCPP01 - Balloon Fight
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCQ.ini b/Data/Sys/GameSettings/FCQ.ini
new file mode 100644
index 0000000000..e3beddc565
--- /dev/null
+++ b/Data/Sys/GameSettings/FCQ.ini
@@ -0,0 +1,32 @@
+# FCQE01 - Ninja Gaiden II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCR.ini b/Data/Sys/GameSettings/FCR.ini
new file mode 100644
index 0000000000..0c0cb962ea
--- /dev/null
+++ b/Data/Sys/GameSettings/FCR.ini
@@ -0,0 +1,32 @@
+# FCRE01, FCRP01 - Adventure Island
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCS.ini b/Data/Sys/GameSettings/FCS.ini
new file mode 100644
index 0000000000..c9a38d4021
--- /dev/null
+++ b/Data/Sys/GameSettings/FCS.ini
@@ -0,0 +1,32 @@
+# FCSE01, FCSP01 - Super C
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCT.ini b/Data/Sys/GameSettings/FCT.ini
new file mode 100644
index 0000000000..fa26b01121
--- /dev/null
+++ b/Data/Sys/GameSettings/FCT.ini
@@ -0,0 +1,32 @@
+# FCTE01, FCTJ01, FCTP01 - Mega Man
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCU.ini b/Data/Sys/GameSettings/FCU.ini
new file mode 100644
index 0000000000..a20dacdf2b
--- /dev/null
+++ b/Data/Sys/GameSettings/FCU.ini
@@ -0,0 +1,32 @@
+# FCUE01, FCUP01 - Volleyball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCV.ini b/Data/Sys/GameSettings/FCV.ini
new file mode 100644
index 0000000000..d119cd6d09
--- /dev/null
+++ b/Data/Sys/GameSettings/FCV.ini
@@ -0,0 +1,32 @@
+# FCVE01, FCVP01 - Wrecking Crew
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCW.ini b/Data/Sys/GameSettings/FCW.ini
new file mode 100644
index 0000000000..f2baaa2920
--- /dev/null
+++ b/Data/Sys/GameSettings/FCW.ini
@@ -0,0 +1,32 @@
+# FCWE01, FCWP01 - Super Mario Bros. 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCY.ini b/Data/Sys/GameSettings/FCY.ini
new file mode 100644
index 0000000000..ad695b36c4
--- /dev/null
+++ b/Data/Sys/GameSettings/FCY.ini
@@ -0,0 +1,32 @@
+# FCYE01, FCYP01 - Yoshi's Cookie
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FCZ.ini b/Data/Sys/GameSettings/FCZ.ini
new file mode 100644
index 0000000000..04ab996209
--- /dev/null
+++ b/Data/Sys/GameSettings/FCZ.ini
@@ -0,0 +1,32 @@
+# FCZE01 - KING'S KNIGHT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD2.ini b/Data/Sys/GameSettings/FD2.ini
new file mode 100644
index 0000000000..0c5e070bc8
--- /dev/null
+++ b/Data/Sys/GameSettings/FD2.ini
@@ -0,0 +1,32 @@
+# FD2E01, FD2P01 - Double Dragon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD6.ini b/Data/Sys/GameSettings/FD6.ini
new file mode 100644
index 0000000000..c48ef1fe11
--- /dev/null
+++ b/Data/Sys/GameSettings/FD6.ini
@@ -0,0 +1,32 @@
+# FD6E01, FD6P01 - ADVENTURES OF LOLO 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FD7.ini b/Data/Sys/GameSettings/FD7.ini
new file mode 100644
index 0000000000..4ce842e272
--- /dev/null
+++ b/Data/Sys/GameSettings/FD7.ini
@@ -0,0 +1,32 @@
+# FD7E01, FD7J01, FD7P01 - Mega Man 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDA.ini b/Data/Sys/GameSettings/FDA.ini
new file mode 100644
index 0000000000..5eebc6f84c
--- /dev/null
+++ b/Data/Sys/GameSettings/FDA.ini
@@ -0,0 +1,32 @@
+# FDAE01, FDAM01 - Spelunker
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDF.ini b/Data/Sys/GameSettings/FDF.ini
new file mode 100644
index 0000000000..fe1aca1e1e
--- /dev/null
+++ b/Data/Sys/GameSettings/FDF.ini
@@ -0,0 +1,32 @@
+# FDFE01 - Bases Loaded
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDG.ini b/Data/Sys/GameSettings/FDG.ini
new file mode 100644
index 0000000000..e545030038
--- /dev/null
+++ b/Data/Sys/GameSettings/FDG.ini
@@ -0,0 +1,32 @@
+# FDGE01, FDGP01 - Ghosts'n Goblins
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDL.ini b/Data/Sys/GameSettings/FDL.ini
new file mode 100644
index 0000000000..532a5b14f6
--- /dev/null
+++ b/Data/Sys/GameSettings/FDL.ini
@@ -0,0 +1,32 @@
+# FDLE01 - Ninja Gaiden III: The Ancient Ship of Doom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDN.ini b/Data/Sys/GameSettings/FDN.ini
new file mode 100644
index 0000000000..e36edbcb42
--- /dev/null
+++ b/Data/Sys/GameSettings/FDN.ini
@@ -0,0 +1,32 @@
+# FDNE01, FDNP01, FDNJ01 - Mega Man 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDO.ini b/Data/Sys/GameSettings/FDO.ini
new file mode 100644
index 0000000000..60452205d8
--- /dev/null
+++ b/Data/Sys/GameSettings/FDO.ini
@@ -0,0 +1,32 @@
+# FDOE01, FDOP01 - OPERATION WOLF
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDP.ini b/Data/Sys/GameSettings/FDP.ini
new file mode 100644
index 0000000000..cc15ce31cf
--- /dev/null
+++ b/Data/Sys/GameSettings/FDP.ini
@@ -0,0 +1,32 @@
+# FDPE01, FDPP01 - Blades of Steel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDQ.ini b/Data/Sys/GameSettings/FDQ.ini
new file mode 100644
index 0000000000..593679269f
--- /dev/null
+++ b/Data/Sys/GameSettings/FDQ.ini
@@ -0,0 +1,32 @@
+# FDQE01, FDQP01 - DOUBLE DRIBBLE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDT.ini b/Data/Sys/GameSettings/FDT.ini
new file mode 100644
index 0000000000..fd374f5d76
--- /dev/null
+++ b/Data/Sys/GameSettings/FDT.ini
@@ -0,0 +1,32 @@
+# FDTE01 - Renegade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDU.ini b/Data/Sys/GameSettings/FDU.ini
new file mode 100644
index 0000000000..063dc2e9ff
--- /dev/null
+++ b/Data/Sys/GameSettings/FDU.ini
@@ -0,0 +1,32 @@
+# FDUE01 - Super Dodge Ball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FDV.ini b/Data/Sys/GameSettings/FDV.ini
new file mode 100644
index 0000000000..b65d754a71
--- /dev/null
+++ b/Data/Sys/GameSettings/FDV.ini
@@ -0,0 +1,32 @@
+# FDVE01, FDVP01 - River City Ransom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEC.ini b/Data/Sys/GameSettings/FEC.ini
new file mode 100644
index 0000000000..52c88df3cd
--- /dev/null
+++ b/Data/Sys/GameSettings/FEC.ini
@@ -0,0 +1,32 @@
+# FECE01 - Skykid
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FED.ini b/Data/Sys/GameSettings/FED.ini
new file mode 100644
index 0000000000..734c1883c2
--- /dev/null
+++ b/Data/Sys/GameSettings/FED.ini
@@ -0,0 +1,32 @@
+# FEDL01, FEDN01 - DIG DUG
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEI.ini b/Data/Sys/GameSettings/FEI.ini
new file mode 100644
index 0000000000..ddf08c9d02
--- /dev/null
+++ b/Data/Sys/GameSettings/FEI.ini
@@ -0,0 +1,32 @@
+# FEIE01, FEIP01 - City Connection
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEM.ini b/Data/Sys/GameSettings/FEM.ini
new file mode 100644
index 0000000000..ac21326a5a
--- /dev/null
+++ b/Data/Sys/GameSettings/FEM.ini
@@ -0,0 +1,32 @@
+# FEML01, FEMN01 - BOKUTTE UPA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEN.ini b/Data/Sys/GameSettings/FEN.ini
new file mode 100644
index 0000000000..d518344b78
--- /dev/null
+++ b/Data/Sys/GameSettings/FEN.ini
@@ -0,0 +1,32 @@
+# FENE01 - Life Force
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEQ.ini b/Data/Sys/GameSettings/FEQ.ini
new file mode 100644
index 0000000000..fc4354d10b
--- /dev/null
+++ b/Data/Sys/GameSettings/FEQ.ini
@@ -0,0 +1,32 @@
+# FEQE01, FEQJ01, FEQP01 - Castlevania III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 4096
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FER.ini b/Data/Sys/GameSettings/FER.ini
new file mode 100644
index 0000000000..e2275c5994
--- /dev/null
+++ b/Data/Sys/GameSettings/FER.ini
@@ -0,0 +1,32 @@
+# FERE01, FERM01 - StarTropics II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FES.ini b/Data/Sys/GameSettings/FES.ini
new file mode 100644
index 0000000000..34267fb140
--- /dev/null
+++ b/Data/Sys/GameSettings/FES.ini
@@ -0,0 +1,32 @@
+# FESE01, FESP01 - Clu Clu Land
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FEU.ini b/Data/Sys/GameSettings/FEU.ini
new file mode 100644
index 0000000000..324881d013
--- /dev/null
+++ b/Data/Sys/GameSettings/FEU.ini
@@ -0,0 +1,32 @@
+# FEUE01, FEUP01 - Donkey Kong 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFA.ini b/Data/Sys/GameSettings/FFA.ini
new file mode 100644
index 0000000000..1f2d18c71f
--- /dev/null
+++ b/Data/Sys/GameSettings/FFA.ini
@@ -0,0 +1,32 @@
+# FFAE01, FFAM01 - Final Fantasy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFD.ini b/Data/Sys/GameSettings/FFD.ini
new file mode 100644
index 0000000000..37367fab67
--- /dev/null
+++ b/Data/Sys/GameSettings/FFD.ini
@@ -0,0 +1,32 @@
+# FFDE01 - Crash 'N The Boys
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFE.ini b/Data/Sys/GameSettings/FFE.ini
new file mode 100644
index 0000000000..c03c1445cc
--- /dev/null
+++ b/Data/Sys/GameSettings/FFE.ini
@@ -0,0 +1,32 @@
+# FFEE01, FFEP01 - A Boy and His Blob
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFL.ini b/Data/Sys/GameSettings/FFL.ini
new file mode 100644
index 0000000000..3287a6d18c
--- /dev/null
+++ b/Data/Sys/GameSettings/FFL.ini
@@ -0,0 +1,32 @@
+# FFLE01 - Princess Tomato
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFM.ini b/Data/Sys/GameSettings/FFM.ini
new file mode 100644
index 0000000000..b3b0136ccb
--- /dev/null
+++ b/Data/Sys/GameSettings/FFM.ini
@@ -0,0 +1,32 @@
+# FFME01, FFMP01 - Blaster Master
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFN.ini b/Data/Sys/GameSettings/FFN.ini
new file mode 100644
index 0000000000..44730f7118
--- /dev/null
+++ b/Data/Sys/GameSettings/FFN.ini
@@ -0,0 +1,32 @@
+# FFNE01, FFNJ01, FFNP01 - Mega Man 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/FFQ.ini b/Data/Sys/GameSettings/FFQ.ini
new file mode 100644
index 0000000000..2536fbfe9e
--- /dev/null
+++ b/Data/Sys/GameSettings/FFQ.ini
@@ -0,0 +1,32 @@
+# FFQE01, FFQM01 - Shadow of the Ninja
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Texture filtering will cause glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/G2B.ini b/Data/Sys/GameSettings/G2B.ini
new file mode 100644
index 0000000000..e5dc267528
--- /dev/null
+++ b/Data/Sys/GameSettings/G2B.ini
@@ -0,0 +1,30 @@
+# G2BE5G, G2BP7D - Black & Bruised
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini
deleted file mode 100644
index 3427b9e659..0000000000
--- a/Data/Sys/GameSettings/G2BE5G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G2BE5G - Black & Bruised
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini
deleted file mode 100644
index 740e665b2e..0000000000
--- a/Data/Sys/GameSettings/G2BP7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G2BP7D - Black & Bruised
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G2C.ini b/Data/Sys/GameSettings/G2C.ini
new file mode 100644
index 0000000000..f2c7b78bc0
--- /dev/null
+++ b/Data/Sys/GameSettings/G2C.ini
@@ -0,0 +1,19 @@
+# G2CE52 - TC2 US
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G2CE52.ini b/Data/Sys/GameSettings/G2CE52.ini
deleted file mode 100644
index da898547ea..0000000000
--- a/Data/Sys/GameSettings/G2CE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G2CE52 - TC2 US
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G2F.ini b/Data/Sys/GameSettings/G2F.ini
new file mode 100644
index 0000000000..2bb18872b8
--- /dev/null
+++ b/Data/Sys/GameSettings/G2F.ini
@@ -0,0 +1,17 @@
+# G2FE78 - Tak 2: The Staff of Dreams
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/G2FE78.ini b/Data/Sys/GameSettings/G2FE78.ini
index 5ccb4f19e8..f091a99fcf 100644
--- a/Data/Sys/GameSettings/G2FE78.ini
+++ b/Data/Sys/GameSettings/G2FE78.ini
@@ -1,13 +1,5 @@
 # G2FE78 - Tak 2: The Staff of Dreams
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -27,4 +19,3 @@ $Max JuJu Elements
 $Have All Cards/All Cards Mixable
 00000000 8439A5E0
 00000001 001E000A
-
diff --git a/Data/Sys/GameSettings/G2G.ini b/Data/Sys/GameSettings/G2G.ini
new file mode 100644
index 0000000000..b691657d68
--- /dev/null
+++ b/Data/Sys/GameSettings/G2G.ini
@@ -0,0 +1,18 @@
+# G2GJB2 - MOBILE SUIT GUNDAM GUNDAMvs.ZGUNDAM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G2GJB2.ini b/Data/Sys/GameSettings/G2GJB2.ini
deleted file mode 100644
index 0c1fbc90ae..0000000000
--- a/Data/Sys/GameSettings/G2GJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G2GJB2 - MOBILE SUIT GUNDAM GUNDAMvs.ZGUNDAM
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G2M.ini b/Data/Sys/GameSettings/G2M.ini
new file mode 100644
index 0000000000..56be67d1de
--- /dev/null
+++ b/Data/Sys/GameSettings/G2M.ini
@@ -0,0 +1,32 @@
+# G2ME01, G2MJ01, G2MP01 - Metroid Prime 2: Echoes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini
index eec49ceb49..b237846525 100644
--- a/Data/Sys/GameSettings/G2ME01.ini
+++ b/Data/Sys/GameSettings/G2ME01.ini
@@ -1,12 +1,4 @@
-# G2ME01 - Metroid Prime 2 Echoes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
+# G2ME01 - Metroid Prime 2: Echoes
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -146,22 +138,3 @@ $Full Logbook
 04002F3C 9BE50004
 04002F40 88050004
 04002F44 4820E72C
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Speedhacks]
-0x803758bc=400
-
diff --git a/Data/Sys/GameSettings/G2MEAB.ini b/Data/Sys/GameSettings/G2MEAB.ini
new file mode 100644
index 0000000000..24aae2977f
--- /dev/null
+++ b/Data/Sys/GameSettings/G2MEAB.ini
@@ -0,0 +1,19 @@
+# G2MEAB - Metroid Prime 3 E3 Beta
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = REALRAM_SIZE must be set to 0x8000000
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini
index 8ad2c86871..587323fc1c 100644
--- a/Data/Sys/GameSettings/G2MP01.ini
+++ b/Data/Sys/GameSettings/G2MP01.ini
@@ -1,12 +1,4 @@
-# G2MP01 - Metroid Prime 2 Echoes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
+# G2MP01 - Metroid Prime 2: Echoes
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -145,22 +137,3 @@ $Full Logbook
 04002F3C 9BE50004
 04002F40 88050004
 04002F44 4820EA34
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Speedhacks]
-0x80375c68=400
-
diff --git a/Data/Sys/GameSettings/G2O.ini b/Data/Sys/GameSettings/G2O.ini
new file mode 100644
index 0000000000..de2a9b211a
--- /dev/null
+++ b/Data/Sys/GameSettings/G2O.ini
@@ -0,0 +1,30 @@
+# G2OE41, G2OP41 - PoP:WW
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G2OE41.ini b/Data/Sys/GameSettings/G2OE41.ini
deleted file mode 100644
index 23f8b4175b..0000000000
--- a/Data/Sys/GameSettings/G2OE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G2OE41 - PoP:WW
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G2OP41.ini b/Data/Sys/GameSettings/G2OP41.ini
deleted file mode 100644
index a5b618344d..0000000000
--- a/Data/Sys/GameSettings/G2OP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G2OP41 - PoP:WW
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G2R.ini b/Data/Sys/GameSettings/G2R.ini
new file mode 100644
index 0000000000..62d18fb189
--- /dev/null
+++ b/Data/Sys/GameSettings/G2R.ini
@@ -0,0 +1,24 @@
+# G2RE52 - Shrek SuperSlam
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/G2RE52.ini b/Data/Sys/GameSettings/G2RE52.ini
deleted file mode 100644
index da8b61de02..0000000000
--- a/Data/Sys/GameSettings/G2RE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G2RE52 - Shrek SuperSlam
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G2T.ini b/Data/Sys/GameSettings/G2T.ini
new file mode 100644
index 0000000000..c60207756a
--- /dev/null
+++ b/Data/Sys/GameSettings/G2T.ini
@@ -0,0 +1,27 @@
+# G2TE52, G2TP52 - Tony Hawk's Underground 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G2TE52.ini b/Data/Sys/GameSettings/G2TE52.ini
deleted file mode 100644
index 4609b11c46..0000000000
--- a/Data/Sys/GameSettings/G2TE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G2TE52 - Tony Hawk's Underground 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G2V.ini b/Data/Sys/GameSettings/G2V.ini
new file mode 100644
index 0000000000..fcf2fa2a5d
--- /dev/null
+++ b/Data/Sys/GameSettings/G2V.ini
@@ -0,0 +1,31 @@
+# G2VE08, G2VP08 - Viewtiful Joe 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs xfb real for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/G2VE08.ini b/Data/Sys/GameSettings/G2VE08.ini
deleted file mode 100644
index edc895001e..0000000000
--- a/Data/Sys/GameSettings/G2VE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G2VE08 - Viewtiful Joe 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs xfb real for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/G2VP08.ini b/Data/Sys/GameSettings/G2VP08.ini
deleted file mode 100644
index ebe59cdf0a..0000000000
--- a/Data/Sys/GameSettings/G2VP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G2VP08 - Viewtiful Joe 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs xfb real for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/G2X.ini b/Data/Sys/GameSettings/G2X.ini
new file mode 100644
index 0000000000..04be9b97de
--- /dev/null
+++ b/Data/Sys/GameSettings/G2X.ini
@@ -0,0 +1,32 @@
+# G2XE8P, G2XP8P - SONIC GEMS COLLECTION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Everything playable with minor glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/G2XE8P.ini b/Data/Sys/GameSettings/G2XE8P.ini
deleted file mode 100644
index 2ed164ba3e..0000000000
--- a/Data/Sys/GameSettings/G2XE8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# G2XE8P - SONIC GEMS COLLECTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini
deleted file mode 100644
index e735673169..0000000000
--- a/Data/Sys/GameSettings/G2XP8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# G2XP8P - SONIC GEMS COLLECTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G3A.ini b/Data/Sys/GameSettings/G3A.ini
new file mode 100644
index 0000000000..25b7c021c0
--- /dev/null
+++ b/Data/Sys/GameSettings/G3A.ini
@@ -0,0 +1,30 @@
+# G3AD69, G3AE69, G3AF69, G3AP69 - The Lord of the Rings, The Third Age
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/G3AD69.ini b/Data/Sys/GameSettings/G3AD69.ini
deleted file mode 100644
index a258d48a2b..0000000000
--- a/Data/Sys/GameSettings/G3AD69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3AD69 - The Lord of the Rings, The Third Age
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G3AE69.ini b/Data/Sys/GameSettings/G3AE69.ini
deleted file mode 100644
index a2efff091e..0000000000
--- a/Data/Sys/GameSettings/G3AE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3AE69 - The Lord of the Rings, The Third Age
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G3AF69.ini b/Data/Sys/GameSettings/G3AF69.ini
deleted file mode 100644
index a2cbb927b0..0000000000
--- a/Data/Sys/GameSettings/G3AF69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3AF69 - The Lord of the Rings, The Third Age
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G3AP69.ini b/Data/Sys/GameSettings/G3AP69.ini
deleted file mode 100644
index 8a425af64c..0000000000
--- a/Data/Sys/GameSettings/G3AP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3AP69 - The Lord of the Rings, The Third Age
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G3B.ini b/Data/Sys/GameSettings/G3B.ini
new file mode 100644
index 0000000000..df2adbee5a
--- /dev/null
+++ b/Data/Sys/GameSettings/G3B.ini
@@ -0,0 +1,29 @@
+# G3BE9G, G3BP54, G3BP9G - Serious Sam: Next Encounter
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram for transition scenes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G3D.ini b/Data/Sys/GameSettings/G3D.ini
new file mode 100644
index 0000000000..999c02aabe
--- /dev/null
+++ b/Data/Sys/GameSettings/G3D.ini
@@ -0,0 +1,19 @@
+# G3DE6L, G3DX6L - Carmen Sandiego
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G3DE6L.ini b/Data/Sys/GameSettings/G3DE6L.ini
deleted file mode 100644
index 724b3dcee9..0000000000
--- a/Data/Sys/GameSettings/G3DE6L.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G3DE6L - Carmen Sandiego
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G3E.ini b/Data/Sys/GameSettings/G3E.ini
new file mode 100644
index 0000000000..6ebe33fc6d
--- /dev/null
+++ b/Data/Sys/GameSettings/G3E.ini
@@ -0,0 +1,22 @@
+# G3EE51 - Extreme G3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/G3EE51.ini b/Data/Sys/GameSettings/G3EE51.ini
deleted file mode 100644
index 35bfeae250..0000000000
--- a/Data/Sys/GameSettings/G3EE51.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G3EE51 - Extreme G3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G3F.ini b/Data/Sys/GameSettings/G3F.ini
new file mode 100644
index 0000000000..2931e69968
--- /dev/null
+++ b/Data/Sys/GameSettings/G3F.ini
@@ -0,0 +1,23 @@
+# G3FE69, G3FP69, G3FF69 - TimeSplitters Future Perfect
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+PerfQueriesEnable = True
+
diff --git a/Data/Sys/GameSettings/G3FE69.ini b/Data/Sys/GameSettings/G3FE69.ini
deleted file mode 100644
index fab54bcc27..0000000000
--- a/Data/Sys/GameSettings/G3FE69.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# G3FE69 - TimeSplitters Future Perfect
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs mmu to run, and it runs very slow because of it (r6436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G3FF69.ini b/Data/Sys/GameSettings/G3FF69.ini
deleted file mode 100644
index 706f27fdb4..0000000000
--- a/Data/Sys/GameSettings/G3FF69.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# G3FF69 - TimeSplitters Future Perfect
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs mmu to run, and it runs very slow because of it (r6436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini
deleted file mode 100644
index 18a50599bd..0000000000
--- a/Data/Sys/GameSettings/G3FP69.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# G3FP69 - TimeSplitters Future Perfect
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs mmu to run, and it runs very slow because of it (r6436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G3J.ini b/Data/Sys/GameSettings/G3J.ini
new file mode 100644
index 0000000000..78b6b58679
--- /dev/null
+++ b/Data/Sys/GameSettings/G3J.ini
@@ -0,0 +1,19 @@
+# G3JEAF - CuriousGeorge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G3JEAF.ini b/Data/Sys/GameSettings/G3JEAF.ini
deleted file mode 100644
index 180cf640cc..0000000000
--- a/Data/Sys/GameSettings/G3JEAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G3JEAF - CuriousGeorge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Stuck at memcard check
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G3L.ini b/Data/Sys/GameSettings/G3L.ini
new file mode 100644
index 0000000000..ec19fc5734
--- /dev/null
+++ b/Data/Sys/GameSettings/G3L.ini
@@ -0,0 +1,27 @@
+# G3LE8P - Super Monkey Ball Adventures (TM)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G3LE8P.ini b/Data/Sys/GameSettings/G3LE8P.ini
deleted file mode 100644
index eed964f1ff..0000000000
--- a/Data/Sys/GameSettings/G3LE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G3LE8P - Super Monkey Ball Adventures (TM)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G3N.ini b/Data/Sys/GameSettings/G3N.ini
new file mode 100644
index 0000000000..005ac3acce
--- /dev/null
+++ b/Data/Sys/GameSettings/G3N.ini
@@ -0,0 +1,18 @@
+# G3NJDA - NARUTO3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G3NJDA.ini b/Data/Sys/GameSettings/G3NJDA.ini
deleted file mode 100644
index c6d38e134d..0000000000
--- a/Data/Sys/GameSettings/G3NJDA.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G3NJDA - NARUTO3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G3Q.ini b/Data/Sys/GameSettings/G3Q.ini
new file mode 100644
index 0000000000..2589b08b14
--- /dev/null
+++ b/Data/Sys/GameSettings/G3Q.ini
@@ -0,0 +1,30 @@
+# G3QEA4 - TMNT3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G3QEA4.ini b/Data/Sys/GameSettings/G3QEA4.ini
deleted file mode 100644
index cd71ef72ef..0000000000
--- a/Data/Sys/GameSettings/G3QEA4.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3QEA4 - TMNT3
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G3R.ini b/Data/Sys/GameSettings/G3R.ini
new file mode 100644
index 0000000000..95026cfb2b
--- /dev/null
+++ b/Data/Sys/GameSettings/G3R.ini
@@ -0,0 +1,29 @@
+# G3RD52, G3RE52, G3RF52, G3RP52 - Shrek 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G3RD52.ini b/Data/Sys/GameSettings/G3RD52.ini
deleted file mode 100644
index 2e41000378..0000000000
--- a/Data/Sys/GameSettings/G3RD52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G3RD52 - Shrek 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/G3RE52.ini b/Data/Sys/GameSettings/G3RE52.ini
deleted file mode 100644
index ee31713e62..0000000000
--- a/Data/Sys/GameSettings/G3RE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G3RE52 - Shrek 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/G3RF52.ini b/Data/Sys/GameSettings/G3RF52.ini
deleted file mode 100644
index c1da8b1690..0000000000
--- a/Data/Sys/GameSettings/G3RF52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G3RF52 - Shrek 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/G3RP52.ini b/Data/Sys/GameSettings/G3RP52.ini
deleted file mode 100644
index 64782dcdb7..0000000000
--- a/Data/Sys/GameSettings/G3RP52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G3RP52 - Shrek 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/G3S.ini b/Data/Sys/GameSettings/G3S.ini
new file mode 100644
index 0000000000..003f8671b5
--- /dev/null
+++ b/Data/Sys/GameSettings/G3S.ini
@@ -0,0 +1,22 @@
+# G3SE41 - BUST A MOVE 3000
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/G3SE41.ini b/Data/Sys/GameSettings/G3SE41.ini
deleted file mode 100644
index 184a1b5d32..0000000000
--- a/Data/Sys/GameSettings/G3SE41.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G3SE41 - BUST A MOVE 3000
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G3V.ini b/Data/Sys/GameSettings/G3V.ini
new file mode 100644
index 0000000000..83299f642a
--- /dev/null
+++ b/Data/Sys/GameSettings/G3V.ini
@@ -0,0 +1,19 @@
+# G3VE69, G3VP69 - NBA STREET V3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini
deleted file mode 100644
index 2706350566..0000000000
--- a/Data/Sys/GameSettings/G3VE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G3VE69 - NBA STREET V3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G3X.ini b/Data/Sys/GameSettings/G3X.ini
new file mode 100644
index 0000000000..eb0b2d69e6
--- /dev/null
+++ b/Data/Sys/GameSettings/G3X.ini
@@ -0,0 +1,31 @@
+# G3XE52, G3XP52 - X-Men: The Official Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G3XE52.ini b/Data/Sys/GameSettings/G3XE52.ini
deleted file mode 100644
index 958b1767e8..0000000000
--- a/Data/Sys/GameSettings/G3XE52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3XE52 - X-Men: The Official Game
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G3XP52.ini b/Data/Sys/GameSettings/G3XP52.ini
deleted file mode 100644
index 3d901f6846..0000000000
--- a/Data/Sys/GameSettings/G3XP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G3XP52 - X-Men: The Official Game
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G4A.ini b/Data/Sys/GameSettings/G4A.ini
new file mode 100644
index 0000000000..04a6ead21d
--- /dev/null
+++ b/Data/Sys/GameSettings/G4A.ini
@@ -0,0 +1,32 @@
+# G4AEE9 - HARVEST MOON - Magical Melody -
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+# !!!WARNING!!!
+# Time Does NOT flow with current Release.
+# !!!WARNING!!!
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/G4AEE9.ini b/Data/Sys/GameSettings/G4AEE9.ini
deleted file mode 100644
index 7f447f0a7a..0000000000
--- a/Data/Sys/GameSettings/G4AEE9.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# G4AEE9 - HARVEST MOON - Magical Melody -
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-# !!!WARNING!!!
-# Time Does NOT flow with current Release.
-# !!!WARNING!!!
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/G4B.ini b/Data/Sys/GameSettings/G4B.ini
new file mode 100644
index 0000000000..0ece90dc14
--- /dev/null
+++ b/Data/Sys/GameSettings/G4B.ini
@@ -0,0 +1,22 @@
+# G4BE08, G4BP08 - resident evil 4 game disc 1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/G4BE08.ini b/Data/Sys/GameSettings/G4BE08.ini
deleted file mode 100644
index cd4bf707e4..0000000000
--- a/Data/Sys/GameSettings/G4BE08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G4BE08 - resident evil 4 game disc 1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G4BP08.ini b/Data/Sys/GameSettings/G4BP08.ini
deleted file mode 100644
index 235331f535..0000000000
--- a/Data/Sys/GameSettings/G4BP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G4BP08 - resident evil 4 game disc 1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G4C.ini b/Data/Sys/GameSettings/G4C.ini
new file mode 100644
index 0000000000..586343f201
--- /dev/null
+++ b/Data/Sys/GameSettings/G4C.ini
@@ -0,0 +1,22 @@
+# G4CE54, G4CP54 - Charlie and The Chocolate Factory
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/G4CE54.ini b/Data/Sys/GameSettings/G4CE54.ini
deleted file mode 100644
index 5f70401b87..0000000000
--- a/Data/Sys/GameSettings/G4CE54.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# G4CE54 - Charlie and The Chocolate Factory
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-UseDualCore = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Don't try DC because high LOAD CPU!!! and with Optimize Quantizers crash"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G4F.ini b/Data/Sys/GameSettings/G4F.ini
new file mode 100644
index 0000000000..d3ce290c8b
--- /dev/null
+++ b/Data/Sys/GameSettings/G4F.ini
@@ -0,0 +1,27 @@
+# G4FD69, G4FE69, G4FF69, G4FE69 - FIFA 07
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G4FD69.ini b/Data/Sys/GameSettings/G4FD69.ini
deleted file mode 100644
index 8c57dc3882..0000000000
--- a/Data/Sys/GameSettings/G4FD69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G4FD69 - FIFA 07
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G4FE69.ini b/Data/Sys/GameSettings/G4FE69.ini
deleted file mode 100644
index 485caa7141..0000000000
--- a/Data/Sys/GameSettings/G4FE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G4FE69 - FIFA 07
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G4FF69.ini b/Data/Sys/GameSettings/G4FF69.ini
deleted file mode 100644
index e6afd2c27c..0000000000
--- a/Data/Sys/GameSettings/G4FF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G4FF69 - FIFA 07
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G4FP69.ini b/Data/Sys/GameSettings/G4FP69.ini
deleted file mode 100644
index 485caa7141..0000000000
--- a/Data/Sys/GameSettings/G4FP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G4FE69 - FIFA 07
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G4G.ini b/Data/Sys/GameSettings/G4G.ini
new file mode 100644
index 0000000000..6debca3d84
--- /dev/null
+++ b/Data/Sys/GameSettings/G4G.ini
@@ -0,0 +1,17 @@
+# G4GEE9 - Harvest Moon: Another Wonderful Life
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/G4GEE9.ini b/Data/Sys/GameSettings/G4GEE9.ini
index 04b14b73da..b639676da1 100644
--- a/Data/Sys/GameSettings/G4GEE9.ini
+++ b/Data/Sys/GameSettings/G4GEE9.ini
@@ -1,11 +1,4 @@
-# G4GEE9 - Harvest Moon: Another Wonderful Life - NTSC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
+# G4GEE9 - Harvest Moon: Another Wonderful Life
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -66,4 +59,3 @@ $Reset Time Speed (D Pad Right)
 06C2E570 08000000
 0A3434E6 00000002
 04012458 38080014
-
diff --git a/Data/Sys/GameSettings/G4M.ini b/Data/Sys/GameSettings/G4M.ini
new file mode 100644
index 0000000000..0d94815543
--- /dev/null
+++ b/Data/Sys/GameSettings/G4M.ini
@@ -0,0 +1,30 @@
+# G4ME69, G4MP69 - The Sims: Bustin Out GameCube
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G4ME69.ini b/Data/Sys/GameSettings/G4ME69.ini
deleted file mode 100644
index 357dbb7ca2..0000000000
--- a/Data/Sys/GameSettings/G4ME69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G4ME69 - The Sims: Bustin Out GameCube
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G4MP69.ini b/Data/Sys/GameSettings/G4MP69.ini
deleted file mode 100644
index 05cce1ef8b..0000000000
--- a/Data/Sys/GameSettings/G4MP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G4MP69 - The Sims: Bustin Out GameCube
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G4N.ini b/Data/Sys/GameSettings/G4N.ini
new file mode 100644
index 0000000000..7b000af21f
--- /dev/null
+++ b/Data/Sys/GameSettings/G4N.ini
@@ -0,0 +1,17 @@
+# G4NJDA - NARUTO Gekitou Ninja Taisen! 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/G4NJDA.ini b/Data/Sys/GameSettings/G4NJDA.ini
index 09858cb884..f200c5b36c 100644
--- a/Data/Sys/GameSettings/G4NJDA.ini
+++ b/Data/Sys/GameSettings/G4NJDA.ini
@@ -1,12 +1,5 @@
 # G4NJDA - NARUTO Gekitou Ninja Taisen! 4
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,4 +11,3 @@ EmulationStateId = 4
 $Everything unlocked
 042232F0 00FFFFFF
 002232FC 00002FFF
-
diff --git a/Data/Sys/GameSettings/G4O.ini b/Data/Sys/GameSettings/G4O.ini
new file mode 100644
index 0000000000..1b1d0518d0
--- /dev/null
+++ b/Data/Sys/GameSettings/G4O.ini
@@ -0,0 +1,19 @@
+# G4OE69, G4OP69 - The Sims 2 Pets
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G4Q.ini b/Data/Sys/GameSettings/G4Q.ini
new file mode 100644
index 0000000000..83fa2a82e0
--- /dev/null
+++ b/Data/Sys/GameSettings/G4Q.ini
@@ -0,0 +1,21 @@
+# G4QE01, G4QJ01, G4QP01 - Super Mario Strikers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
diff --git a/Data/Sys/GameSettings/G4QE01.ini b/Data/Sys/GameSettings/G4QE01.ini
index 99183174ce..1f1226eb69 100644
--- a/Data/Sys/GameSettings/G4QE01.ini
+++ b/Data/Sys/GameSettings/G4QE01.ini
@@ -1,14 +1,5 @@
 # G4QE01 - Mario Soccer
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -37,7 +28,3 @@ $Have All Milestone Trophies
 03535D54 0000012C
 03535D56 000003E8
 03535D4E 00000064
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G4QP01.ini b/Data/Sys/GameSettings/G4QP01.ini
deleted file mode 100644
index d99f6c466a..0000000000
--- a/Data/Sys/GameSettings/G4QP01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# G4QP01 - Mario Smash Football
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs TLB Hack
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G4S.ini b/Data/Sys/GameSettings/G4S.ini
new file mode 100644
index 0000000000..b3526fbe18
--- /dev/null
+++ b/Data/Sys/GameSettings/G4S.ini
@@ -0,0 +1,30 @@
+# G4SE01, G4SP01 - The Legend of Zelda: Four Swords
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G4SE01.ini b/Data/Sys/GameSettings/G4SE01.ini
deleted file mode 100644
index ddd5f8b23d..0000000000
--- a/Data/Sys/GameSettings/G4SE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# G4SE01 - The Legend of Zelda: Four Swords FOR NINTENDO GAMECUBE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G4SP01.ini b/Data/Sys/GameSettings/G4SP01.ini
index 0969b3e4cc..584d3987ad 100644
--- a/Data/Sys/GameSettings/G4SP01.ini
+++ b/Data/Sys/GameSettings/G4SP01.ini
@@ -1,12 +1,4 @@
-# G4SP01 - The Legend of Zelda: Four Swords FOR NINTENDO GAMECUBE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
+# G4SP01 - The Legend of Zelda: Four Swords
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -104,10 +96,3 @@ $Have Blue Bracelet
 $Have Power Bracelet
 0658E22B 14710FC0
 0A54BD94 60000000
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G4Z.ini b/Data/Sys/GameSettings/G4Z.ini
new file mode 100644
index 0000000000..8d66b7abbb
--- /dev/null
+++ b/Data/Sys/GameSettings/G4Z.ini
@@ -0,0 +1,19 @@
+# G4ZE69, G4ZP69 - The Sims 2 GameCube
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/Sys/GameSettings/G4ZE69.ini b/Data/Sys/GameSettings/G4ZE69.ini
deleted file mode 100644
index 5bc646db5b..0000000000
--- a/Data/Sys/GameSettings/G4ZE69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G4ZE69 - The Sims 2 GameCube
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/G4ZP69.ini b/Data/Sys/GameSettings/G4ZP69.ini
deleted file mode 100644
index 43b31ae338..0000000000
--- a/Data/Sys/GameSettings/G4ZP69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G4ZP69 - The Sims 2 GameCube
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/G5D.ini b/Data/Sys/GameSettings/G5D.ini
new file mode 100644
index 0000000000..6911cf1906
--- /dev/null
+++ b/Data/Sys/GameSettings/G5D.ini
@@ -0,0 +1,27 @@
+# G5DE78, G5DP78 - Scooby-Doo! Unmasked
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G5DE78.ini b/Data/Sys/GameSettings/G5DE78.ini
deleted file mode 100644
index fc2fb3104b..0000000000
--- a/Data/Sys/GameSettings/G5DE78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G5DE78 - Scooby-Doo! Unmasked
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G5DP78.ini b/Data/Sys/GameSettings/G5DP78.ini
deleted file mode 100644
index d348a374d7..0000000000
--- a/Data/Sys/GameSettings/G5DP78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G5DP78 - Scooby-Doo! Unmasked
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G5N.ini b/Data/Sys/GameSettings/G5N.ini
new file mode 100644
index 0000000000..4b419efaa7
--- /dev/null
+++ b/Data/Sys/GameSettings/G5N.ini
@@ -0,0 +1,31 @@
+# G5NEAF, G5NP69 - Namco Museum 50th Anniversary
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/G5S.ini b/Data/Sys/GameSettings/G5S.ini
new file mode 100644
index 0000000000..5e4dba55fe
--- /dev/null
+++ b/Data/Sys/GameSettings/G5S.ini
@@ -0,0 +1,30 @@
+# G5SE7D, G5SP7D - Spyro
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs efb to Ram for proper lighting.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/G5SE7D.ini b/Data/Sys/GameSettings/G5SE7D.ini
deleted file mode 100644
index bf87146c77..0000000000
--- a/Data/Sys/GameSettings/G5SE7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G5SE7D - Spyro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs efb to Ram for proper lighting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G5SP7D.ini b/Data/Sys/GameSettings/G5SP7D.ini
deleted file mode 100644
index b2f061548e..0000000000
--- a/Data/Sys/GameSettings/G5SP7D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G5SP7D - Spyro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs efb to Ram for proper lighting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G5T.ini b/Data/Sys/GameSettings/G5T.ini
new file mode 100644
index 0000000000..b30f613bfe
--- /dev/null
+++ b/Data/Sys/GameSettings/G5T.ini
@@ -0,0 +1,29 @@
+# G5TE69, G5TP69 - Tiger Woods PGA TOUR 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/G63.ini b/Data/Sys/GameSettings/G63.ini
new file mode 100644
index 0000000000..136c6d0a35
--- /dev/null
+++ b/Data/Sys/GameSettings/G63.ini
@@ -0,0 +1,19 @@
+# G63E41, G63P41 - Rainbow Six 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G63E41.ini b/Data/Sys/GameSettings/G63E41.ini
deleted file mode 100644
index 13843921ed..0000000000
--- a/Data/Sys/GameSettings/G63E41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G63E41 - RainbowSix3
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G63P41.ini b/Data/Sys/GameSettings/G63P41.ini
deleted file mode 100644
index df073745af..0000000000
--- a/Data/Sys/GameSettings/G63P41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G63P41 - RainbowSix3
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-Issues="Needs Projection Hack R844 and Copy EFB to GL texture"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G6F.ini b/Data/Sys/GameSettings/G6F.ini
new file mode 100644
index 0000000000..7f0dea8a02
--- /dev/null
+++ b/Data/Sys/GameSettings/G6F.ini
@@ -0,0 +1,18 @@
+# G6FD69, G6FE69, G6FF69, G6FP69 - 2006 FIFA World Cup
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/G6FE69.ini b/Data/Sys/GameSettings/G6FE69.ini
deleted file mode 100644
index 8c75fea958..0000000000
--- a/Data/Sys/GameSettings/G6FE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G6FE69 - 2006 FIFA World Cup
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound missing in menus game can crash randomly
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G6M.ini b/Data/Sys/GameSettings/G6M.ini
new file mode 100644
index 0000000000..7cf073d45d
--- /dev/null
+++ b/Data/Sys/GameSettings/G6M.ini
@@ -0,0 +1,20 @@
+# G6ME69, G6MP69 - Madden NFL 06
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for a couple of videos with logos during intro.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
diff --git a/Data/Sys/GameSettings/G6N.ini b/Data/Sys/GameSettings/G6N.ini
new file mode 100644
index 0000000000..e34022e380
--- /dev/null
+++ b/Data/Sys/GameSettings/G6N.ini
@@ -0,0 +1,27 @@
+# G6NE69, G6NP69 - NBA LIVE 06
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G6NE69.ini b/Data/Sys/GameSettings/G6NE69.ini
deleted file mode 100644
index eb190f5af5..0000000000
--- a/Data/Sys/GameSettings/G6NE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G6NE69 - NBA LIVE 06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G6NP69.ini b/Data/Sys/GameSettings/G6NP69.ini
deleted file mode 100644
index 629b841f10..0000000000
--- a/Data/Sys/GameSettings/G6NP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# G6NP69 - NBA LIVE 06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G6Q.ini b/Data/Sys/GameSettings/G6Q.ini
new file mode 100644
index 0000000000..c23423982d
--- /dev/null
+++ b/Data/Sys/GameSettings/G6Q.ini
@@ -0,0 +1,22 @@
+# G6QE08 - Mega Man Anniversary Collection
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/G6QE08.ini b/Data/Sys/GameSettings/G6QE08.ini
deleted file mode 100644
index b4f5e9ae29..0000000000
--- a/Data/Sys/GameSettings/G6QE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G6QE08 - Megaman Collection
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G6T.ini b/Data/Sys/GameSettings/G6T.ini
new file mode 100644
index 0000000000..81e1cab53f
--- /dev/null
+++ b/Data/Sys/GameSettings/G6T.ini
@@ -0,0 +1,30 @@
+# G6TE5G, G6TP5G - Teen Titans
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/G6TE5G.ini b/Data/Sys/GameSettings/G6TE5G.ini
deleted file mode 100644
index 97ececc19a..0000000000
--- a/Data/Sys/GameSettings/G6TE5G.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G6TE5G - Teen Titans
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G6TP5G.ini b/Data/Sys/GameSettings/G6TP5G.ini
deleted file mode 100644
index 3d55fc3f7e..0000000000
--- a/Data/Sys/GameSettings/G6TP5G.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G6TP5G - Teen Titans
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/G6W.ini b/Data/Sys/GameSettings/G6W.ini
new file mode 100644
index 0000000000..70d6afbb74
--- /dev/null
+++ b/Data/Sys/GameSettings/G6W.ini
@@ -0,0 +1,29 @@
+# G6WE69, G6WP69 - Tiger Woods PGA TOUR 06
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/G89.ini b/Data/Sys/GameSettings/G89.ini
new file mode 100644
index 0000000000..fefd6bb68b
--- /dev/null
+++ b/Data/Sys/GameSettings/G89.ini
@@ -0,0 +1,18 @@
+# G89EAF - Pac-Man World Rally
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G89EAF.ini b/Data/Sys/GameSettings/G89EAF.ini
deleted file mode 100644
index f5bc6babc5..0000000000
--- a/Data/Sys/GameSettings/G89EAF.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G89EAF - Pac-Man World Rally
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G8F.ini b/Data/Sys/GameSettings/G8F.ini
new file mode 100644
index 0000000000..f9dfc17b1f
--- /dev/null
+++ b/Data/Sys/GameSettings/G8F.ini
@@ -0,0 +1,27 @@
+# G8FE8P - VIRTUA QUEST
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/G8FE8P.ini b/Data/Sys/GameSettings/G8FE8P.ini
deleted file mode 100644
index 6f703b6c84..0000000000
--- a/Data/Sys/GameSettings/G8FE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G8FE8P - VIRTUA QUEST
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/G8M.ini b/Data/Sys/GameSettings/G8M.ini
new file mode 100644
index 0000000000..1c07b83be4
--- /dev/null
+++ b/Data/Sys/GameSettings/G8M.ini
@@ -0,0 +1,23 @@
+# G8ME01, G8MJ01, G8MP01 - Paper Mario
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
+BBoxEnable = True
+
diff --git a/Data/Sys/GameSettings/G8ME01.ini b/Data/Sys/GameSettings/G8ME01.ini
index d768792efe..7778f12eef 100644
--- a/Data/Sys/GameSettings/G8ME01.ini
+++ b/Data/Sys/GameSettings/G8ME01.ini
@@ -1,13 +1,5 @@
 # G8ME01 - Paper Mario
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -46,21 +38,5 @@ $Max Gold
 $Max Shop Points
 026EE7F0 000003E7
 
-[Video]
-UseBBox = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
 [Speedhacks]
 0x8029ccf4=600
-# Values set here will override the main dolphin settings.
-
diff --git a/Data/Sys/GameSettings/G8MJ01.ini b/Data/Sys/GameSettings/G8MJ01.ini
deleted file mode 100644
index 38d28b756b..0000000000
--- a/Data/Sys/GameSettings/G8MJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G8MJ01 - Paper Mario
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G8MP01.ini b/Data/Sys/GameSettings/G8MP01.ini
deleted file mode 100644
index 9c5730b053..0000000000
--- a/Data/Sys/GameSettings/G8MP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# G8MP01 - Paper Mario
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/G8O.ini b/Data/Sys/GameSettings/G8O.ini
new file mode 100644
index 0000000000..fa8d508ee1
--- /dev/null
+++ b/Data/Sys/GameSettings/G8O.ini
@@ -0,0 +1,19 @@
+# G8OJ18 - bobobo-bo bo-bobo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G8OJ18.ini b/Data/Sys/GameSettings/G8OJ18.ini
deleted file mode 100644
index 2e40d587e2..0000000000
--- a/Data/Sys/GameSettings/G8OJ18.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# G8OJ18 - bobobo-bo bo-bobo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Bad Sound, Needs to disable or downlevel"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G8S.ini b/Data/Sys/GameSettings/G8S.ini
new file mode 100644
index 0000000000..8fc97f3b3c
--- /dev/null
+++ b/Data/Sys/GameSettings/G8S.ini
@@ -0,0 +1,18 @@
+# G8SJAF - battleGC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G8SJAF.ini b/Data/Sys/GameSettings/G8SJAF.ini
deleted file mode 100644
index c6d471d69b..0000000000
--- a/Data/Sys/GameSettings/G8SJAF.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G8SJAF - battleGC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G8W.ini b/Data/Sys/GameSettings/G8W.ini
new file mode 100644
index 0000000000..ba7ba51d5a
--- /dev/null
+++ b/Data/Sys/GameSettings/G8W.ini
@@ -0,0 +1,20 @@
+# G8WE01, G8WP01 - Battalion Wars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G8WE01.ini b/Data/Sys/GameSettings/G8WE01.ini
deleted file mode 100644
index 5c001e2c52..0000000000
--- a/Data/Sys/GameSettings/G8WE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# G8WE01 - Battalion Wars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/G8WP01.ini b/Data/Sys/GameSettings/G8WP01.ini
index f870aa3b52..3e5cd8aae4 100644
--- a/Data/Sys/GameSettings/G8WP01.ini
+++ b/Data/Sys/GameSettings/G8WP01.ini
@@ -1,12 +1,5 @@
 # G8WP01 - Battalion Wars
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -20,4 +13,3 @@ $Invincible
 04338650 00000001
 $Infinite Time
 0752E978 08000000
-
diff --git a/Data/Sys/GameSettings/G9B.ini b/Data/Sys/GameSettings/G9B.ini
new file mode 100644
index 0000000000..063b9a4eda
--- /dev/null
+++ b/Data/Sys/GameSettings/G9B.ini
@@ -0,0 +1,18 @@
+# G9BEE9 - Mark Davis Pro Bass Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G9BEE9.ini b/Data/Sys/GameSettings/G9BEE9.ini
deleted file mode 100644
index 89a684475d..0000000000
--- a/Data/Sys/GameSettings/G9BEE9.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# G9BEE9 - Mark Davis Pro Bass Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G9R.ini b/Data/Sys/GameSettings/G9R.ini
new file mode 100644
index 0000000000..98ba156d16
--- /dev/null
+++ b/Data/Sys/GameSettings/G9R.ini
@@ -0,0 +1,20 @@
+# G9RD7D, G9RE7D, G9RF7D, G9RP7D - Crash Tag Team Racing
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/G9RE7D.ini b/Data/Sys/GameSettings/G9RE7D.ini
deleted file mode 100644
index 9fd41734bd..0000000000
--- a/Data/Sys/GameSettings/G9RE7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# G9RE7D - Crash Tag Team Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = May be slow
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G9S.ini b/Data/Sys/GameSettings/G9S.ini
new file mode 100644
index 0000000000..43d92014f5
--- /dev/null
+++ b/Data/Sys/GameSettings/G9S.ini
@@ -0,0 +1,31 @@
+# G9SE8P, G9SJ8P, G9SP8P - SONIC HEROES
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
diff --git a/Data/Sys/GameSettings/G9SE8P.ini b/Data/Sys/GameSettings/G9SE8P.ini
deleted file mode 100644
index a31485b3aa..0000000000
--- a/Data/Sys/GameSettings/G9SE8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9SE8P - SONIC HEROES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/G9SJ8P.ini b/Data/Sys/GameSettings/G9SJ8P.ini
deleted file mode 100644
index 959ed384d9..0000000000
--- a/Data/Sys/GameSettings/G9SJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9SJ8P - SONIC HEROES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/G9SP8P.ini b/Data/Sys/GameSettings/G9SP8P.ini
deleted file mode 100644
index dcadf7dda5..0000000000
--- a/Data/Sys/GameSettings/G9SP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9SP8P - SONIC HEROES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/G9T.ini b/Data/Sys/GameSettings/G9T.ini
new file mode 100644
index 0000000000..8dc96c81cb
--- /dev/null
+++ b/Data/Sys/GameSettings/G9T.ini
@@ -0,0 +1,30 @@
+# G9TD52, G9TE52, G9TF52, G9TI52, G9TP52 - Shark Tale
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/G9TD52.ini b/Data/Sys/GameSettings/G9TD52.ini
deleted file mode 100644
index 8d3ab2e14b..0000000000
--- a/Data/Sys/GameSettings/G9TD52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9TD52 - Shark Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G9TE52.ini b/Data/Sys/GameSettings/G9TE52.ini
deleted file mode 100644
index 564f0b58cb..0000000000
--- a/Data/Sys/GameSettings/G9TE52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9TE52 - Shark Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G9TF52.ini b/Data/Sys/GameSettings/G9TF52.ini
deleted file mode 100644
index f998ecad7d..0000000000
--- a/Data/Sys/GameSettings/G9TF52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9TF52 - Shark Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G9TI52.ini b/Data/Sys/GameSettings/G9TI52.ini
deleted file mode 100644
index 8cf8f84c3e..0000000000
--- a/Data/Sys/GameSettings/G9TI52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9TI52 - Shark Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/G9TP52.ini b/Data/Sys/GameSettings/G9TP52.ini
deleted file mode 100644
index c6c6c561ea..0000000000
--- a/Data/Sys/GameSettings/G9TP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# G9TP52 - Shark Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GA2.ini b/Data/Sys/GameSettings/GA2.ini
new file mode 100644
index 0000000000..5573a0ef4e
--- /dev/null
+++ b/Data/Sys/GameSettings/GA2.ini
@@ -0,0 +1,19 @@
+# GA2E51 - All-Star Baseball 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Black screen
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GA2E51.ini b/Data/Sys/GameSettings/GA2E51.ini
deleted file mode 100644
index 3318d43533..0000000000
--- a/Data/Sys/GameSettings/GA2E51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GA2E51 - All-Star Baseball 2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GA3.ini b/Data/Sys/GameSettings/GA3.ini
new file mode 100644
index 0000000000..6b8ca0d096
--- /dev/null
+++ b/Data/Sys/GameSettings/GA3.ini
@@ -0,0 +1,19 @@
+# GA3E51 - All-Star Baseball 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Black screen
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GA3E51.ini b/Data/Sys/GameSettings/GA3E51.ini
deleted file mode 100644
index 68bcf0c442..0000000000
--- a/Data/Sys/GameSettings/GA3E51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GA3E51 - All-Star Baseball 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Black screen
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GA4.ini b/Data/Sys/GameSettings/GA4.ini
new file mode 100644
index 0000000000..d3b4c6a3a4
--- /dev/null
+++ b/Data/Sys/GameSettings/GA4.ini
@@ -0,0 +1,19 @@
+# GA4E51 - ASB2004
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GA4E51.ini b/Data/Sys/GameSettings/GA4E51.ini
deleted file mode 100644
index 0f5614c79d..0000000000
--- a/Data/Sys/GameSettings/GA4E51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GA4E51 - ASB2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GA7.ini b/Data/Sys/GameSettings/GA7.ini
new file mode 100644
index 0000000000..aff2cabff6
--- /dev/null
+++ b/Data/Sys/GameSettings/GA7.ini
@@ -0,0 +1,19 @@
+# GA7E70 - BysBase07
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GA7E70.ini b/Data/Sys/GameSettings/GA7E70.ini
deleted file mode 100644
index 01bf9f2ba3..0000000000
--- a/Data/Sys/GameSettings/GA7E70.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GA7E70 - BysBase07
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAB.ini b/Data/Sys/GameSettings/GAB.ini
new file mode 100644
index 0000000000..2fe797a571
--- /dev/null
+++ b/Data/Sys/GameSettings/GAB.ini
@@ -0,0 +1,19 @@
+# GABEAF - Zatch Bell!: Mamodo Fury
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Need Projection Before R945
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GABEAF.ini b/Data/Sys/GameSettings/GABEAF.ini
deleted file mode 100644
index ae2b5c6cdd..0000000000
--- a/Data/Sys/GameSettings/GABEAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GABEAF - Zatch Bell!: Mamodo Fury
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAC.ini b/Data/Sys/GameSettings/GAC.ini
new file mode 100644
index 0000000000..8d8f467164
--- /dev/null
+++ b/Data/Sys/GameSettings/GAC.ini
@@ -0,0 +1,22 @@
+# GACE5H - Army Men Air Combat
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GACE5H.ini b/Data/Sys/GameSettings/GACE5H.ini
deleted file mode 100644
index 4046dfdcc9..0000000000
--- a/Data/Sys/GameSettings/GACE5H.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GACE5H - Army Men Air Combat
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAF.ini b/Data/Sys/GameSettings/GAF.ini
new file mode 100644
index 0000000000..5886c26ab7
--- /dev/null
+++ b/Data/Sys/GameSettings/GAF.ini
@@ -0,0 +1,30 @@
+# GAFJ01, GAFP01, GAFU01 - Doubutsu no Mori Plus
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GAFE01.ini b/Data/Sys/GameSettings/GAFE01.ini
index 36556e79d4..069b9b3e83 100644
--- a/Data/Sys/GameSettings/GAFE01.ini
+++ b/Data/Sys/GameSettings/GAFE01.ini
@@ -1,12 +1,4 @@
-# GAFE01 - Animal Crossing NTSC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+# GAFE01 - Animal Crossing
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -316,15 +308,3 @@ $NES Super Mario Bros. - Freeze Timer (donny2112)
 $NES Wario's Woods - Infinite Credits (donny2112)
 01523E93 08000000
 0165E60B 00000009
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAFJ01.ini b/Data/Sys/GameSettings/GAFJ01.ini
deleted file mode 100644
index dff5e663b7..0000000000
--- a/Data/Sys/GameSettings/GAFJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GAFJ01 - Doubutsu no Mori Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAFP01.ini b/Data/Sys/GameSettings/GAFP01.ini
deleted file mode 100644
index 5870da1fa6..0000000000
--- a/Data/Sys/GameSettings/GAFP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GAFP01 - Animal Crossing
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAFU01.ini b/Data/Sys/GameSettings/GAFU01.ini
deleted file mode 100644
index 71c16b8b6d..0000000000
--- a/Data/Sys/GameSettings/GAFU01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GAFU01 - Animal Crossing
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAG.ini b/Data/Sys/GameSettings/GAG.ini
new file mode 100644
index 0000000000..dc6f3b6fa1
--- /dev/null
+++ b/Data/Sys/GameSettings/GAG.ini
@@ -0,0 +1,19 @@
+# GAGP70 - Asterix & Obelix XXL
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GAGP70.ini b/Data/Sys/GameSettings/GAGP70.ini
deleted file mode 100644
index c2bf3afd94..0000000000
--- a/Data/Sys/GameSettings/GAGP70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GAGP70 - Asterix & Obelix XXL
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAH.ini b/Data/Sys/GameSettings/GAH.ini
new file mode 100644
index 0000000000..e75f26ff3b
--- /dev/null
+++ b/Data/Sys/GameSettings/GAH.ini
@@ -0,0 +1,27 @@
+# GAHEGG - Alien Hominid
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GAHEGG.ini b/Data/Sys/GameSettings/GAHEGG.ini
deleted file mode 100644
index d9a68ec612..0000000000
--- a/Data/Sys/GameSettings/GAHEGG.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GAHEGG - Alien Hominid
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct3d11 or opengl (r7473).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAK.ini b/Data/Sys/GameSettings/GAK.ini
new file mode 100644
index 0000000000..c81e7f129d
--- /dev/null
+++ b/Data/Sys/GameSettings/GAK.ini
@@ -0,0 +1,22 @@
+# GAKE5D - Midway Arcade Treasures
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GAL.ini b/Data/Sys/GameSettings/GAL.ini
new file mode 100644
index 0000000000..155018c565
--- /dev/null
+++ b/Data/Sys/GameSettings/GAL.ini
@@ -0,0 +1,30 @@
+# GALE01, GALJ01, GALP01 - Super Smash Bros Melee
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
diff --git a/Data/Sys/GameSettings/GALE01.ini b/Data/Sys/GameSettings/GALE01.ini
deleted file mode 100644
index 6125386d86..0000000000
--- a/Data/Sys/GameSettings/GALE01.ini
+++ /dev/null
@@ -1,228 +0,0 @@
-# GALE01 - Super Smash Bros Melee
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-$All 293 trophies
-00087EF5 08000000
-0245A3C8 00000125
-0245A3CD 01266363
-$All Special Messages
-00083FC6 08000000
-0045A238 000018FF
-$All Bonuses
-00086982 08000000
-0045A380 00001FFF
-$All Characters and Stages
-00081A8F 08000000
-04459F58 FFFFFFFF
-04459F60 FFFFFFFF
-$Infinite Time
-000844D0 08000000
-04469702 00000075
-$Infinite Ray Gun
-00082184 08000000
-0428D1F0 60000000
-$Infinite Lip's Stick
-00081EA3 08000000
-042941A0 60000000
-$Infinite Star Rod
-000810A1 08000000
-04290DE8 60000000
-$Infinite Super Scope
-00084C86 08000000
-042909F0 60000000
-$Infinite Fire Flower
-00083969 08000000
-0429198C 60000000
-$Infinite Lotto Coins
-00081594 08000000
-0245A142 00002706
-$Over 1 Million Vs. Matches
-000805A3 08000000
-0245A110 00000010
-$Maximize Statistics
-0008064F 08000000
-0245A61C 0B00FFFF
-$One Hit Kills
-00086370 08000000
-044D60E0 40100000
-$Mega Jumps
-00084DC5 08000000
-044D6D3C 40000000
-$Items Never Disappear
-0008084C 08000000
-0C268318 D01F0D44
-04268318 60000000
-$Flashing Items
-00081359 08000000
-042682A0 60000000
-$Unrestricted Pause Camera
-000837F2 08000000
-04450F94 42000000
-04450F98 42000000
-04450F9C 42000000
-04450FA0 40200000
-04450FA4 47000000
-$Forces pose from animations
-000868C1 08000000
-044D60F8 00000000
-$Forces char to always face forward
-00084E77 08000000
-044D60F0 00000000
-$P1 - Instant Fully Charged Smash Attack
-00084DE4 08000000
-42451170 10BC4270
-$P1 - Infinite Shields
-00083C52 08000000
-42451170 0CFC4270
-$P1 - Superman
-00086E24 08000000
-044D60E0 40100000
-04451118 00000000
-04451120 00000000
-$P1 - Invincible
-00084E6C 08000000
-04451118 00000000
-04451120 00000000
-$P1 - Play As Master Hand (1P HRC & All Modes In Vs Mode)
-00081698 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001A
-$P1 - Play As Boy Wireframe (1P HRC & All Modes In Vs Mode)
-00085326 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001B
-$P1 - Play As Girl Wireframe (1P HRC & All Modes In Vs Mode)
-00087852 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001C
-$P1 - Play As Giga Bowser (1P HRC & All Modes In Vs Mode)
-000830EA 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001D
-$P1 - Play As Crazy Hand (1P HRC & All Modes In Vs Mode)
-0008635F 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001E
-$P1 - Play As Sandbag (1P HRC & All Modes In Vs Mode)
-000813CA 08000000
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001F
-$P1 - Play As Dark Link (1P HRC & All Modes In Vs Mode)
-00081CD5 08000000
-0047E858 00000006
-0047E85F 00000003
-$P1 - 5x size
-00086E5C 08000000
-0447E730 409FFFFB
-$P1 - 2x size
-00082E62 08000000
-0447E730 40000002
-$P1 - one-half size
-00082F14 08000000
-0447E730 3F000002
-$P1 - one-tenth size
-0008134F 08000000
-0447E730 3DCCCCDF
-$GAME MODIFIER
-00084E56 08000000
-557E0000 60000000
-00000000 857E0000
-60000000 00400001
-057E0004 38BCFFF8
-057E002C 4A8381F4
-0401821C 497C7DE8
-057E0030 90010004
-057E00FC 4A98DC34
-0416DD2C 49672304
-$P1 Remove Skirt-Zelda - GAME MODIFIER MUST BE ON
-0A4510C6 00000012
-40451170 000657FF
-$P1 Remove Skirt-Peach - GAME MODIFIER MUST BE ON
-0A4510C6 0000000C
-40451170 000659FF
-$P2 Remove Skirt - Zelda - GAME MODIFIER MUST BE ON
-0A451F56 00000012
-40452000 000657FF
-$P2 Remove Skirt - Peach - GAME MODIFIER MUST BE ON
-0A451F56 0000000C
-40452000 000659FF
-$P3 Remove Skirt - Zelda - GAME MODIFIER MUST BE ON
-0A452DE6 00000013
-40452E90 000657FF
-$P3 Remove Skirt - Peach - GAME MODIFIER MUST BE ON
-0A452DE6 0000000C
-40452E90 000659FF
-$P4 Remove Skirt - Zelda - GAME MODIFIER MUST BE ON
-0A453C76 00000013
-40453D20 000657FF
-$P4 Remove Skirt - Peach - GAME MODIFIER MUST BE ON
-0A453C76 0000000C
-40453D20 000659FF
-$AI clone, Don't use in story modes or with zelda/sheik. (CPU level
-04031BCC 4BFD134C
-04002F18 907E00B0
-04002F1C 88810028
-04002F20 1C840004
-04002F24 3CA08000
-04002F28 60A52F00
-04002F2C 7F65202E
-04002F30 2C1B0000
-04002F34 41820024
-04002F38 38600080
-04002F3C 9861002A
-04002F40 38610024
-04002F44 48065F41
-04002F48 907E00B4
-04002F4C 3B7BFFFF
-04002F50 2C1B0000
-04002F54 4181FFEC
-04002F58 4802EC78
-$Player 1 gets one AI clone.
-04002F00 00000001
-$player 2 gets one AI clone.
-04002F04 00000001
-$player 3 gets one AI clone.
-04002F08 00000001
-$player 4 gets one AI clone.
-04002F0C 00000001
-$Player 1 gets two AI clones.
-04002F00 00000002
-$player 2 gets two AI clones.
-04002F04 00000002
-$player 3 gets two AI clones.
-04002F08 00000002
-$player 4 gets two AI clones.
-04002F0C 00000002
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/GALE01r0.ini b/Data/Sys/GameSettings/GALE01r0.ini
new file mode 100644
index 0000000000..68c453a52e
--- /dev/null
+++ b/Data/Sys/GameSettings/GALE01r0.ini
@@ -0,0 +1,458 @@
+# GALE01 - Super Smash Bros. Melee
+
+[ActionReplay]
+# Add action replay cheats here.
+$All 293 trophies
+0245A3C8 00000125
+0245A3CD 01266363
+
+$All Special Messages
+0045A238 000018FF
+
+$All Bonuses
+0045A380 00001FFF
+
+$All Characters and Stages
+04459F58 FFFFFFFF
+04459F60 FFFFFFFF
+
+$Infinite Time
+04469702 00000075
+
+$Infinite Ray Gun
+0428D1F0 60000000
+
+$Infinite Lip's Stick
+042941A0 60000000
+
+$Infinite Star Rod
+04290DE8 60000000
+
+$Infinite Super Scope
+042909F0 60000000
+
+$Infinite Fire Flower
+0429198C 60000000
+
+$Infinite Lotto Coins
+0245A142 00002706
+
+$Over 1 Million Vs. Matches
+0245A110 00000010
+
+$One Hit Kills
+044D60E0 40100000
+
+$Mega Jumps
+044D6D3C 40000000
+
+$Items Never Disappear
+0C268318 D01F0D44
+04268318 60000000
+
+$Flashing Items
+042682A0 60000000
+
+$Unrestricted Pause Camera
+04450F94 42000000
+04450F98 42000000
+04450F9C 42000000
+04450FA0 40200000
+04450FA4 47000000
+
+$Forces pose from animations
+044D60F8 00000000
+
+$Forces char to always face forward
+044D60F0 00000000
+
+$P1 - Instant Fully Charged Smash Attack
+42451170 10BC4270
+
+$P1 - Infinite Shields
+42451170 0CFC4270
+
+$P1 - Superman
+044D60E0 40100000
+04451118 00000000
+04451120 00000000
+
+$P1 - Invincible
+04451118 00000000
+04451120 00000000
+
+$P1 - Play As Master Hand (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001A
+
+$P1 - Play As Boy Wireframe (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001B
+
+$P1 - Play As Girl Wireframe (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001C
+
+$P1 - Play As Giga Bowser (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001D
+
+$P1 - Play As Crazy Hand (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001E
+
+$P1 - Play As Sandbag (1P HRC & All Modes In Vs Mode)
+0847E864 00000040
+0047E864 00000000
+0047E858 0000001F
+
+$P1 - Play As Dark Link (1P HRC & All Modes In Vs Mode)
+0047E858 00000006
+0047E85F 00000003
+
+$P1 - 5x size
+0447E730 409FFFFB
+
+$P1 - 2x size
+0447E730 40000002
+
+$P1 - one-half size
+0447E730 3F000002
+
+$P1 - one-tenth size
+0447E730 3DCCCCDF
+
+$GAME MODIFIER
+557E0000 60000000
+00000000 857E0000
+60000000 00400001
+057E0004 38BCFFF8
+057E002C 4A8381F4
+0401821C 497C7DE8
+057E0030 90010004
+057E00FC 4A98DC34
+0416DD2C 49672304
+
+$P1 Remove Skirt-Zelda
+*Game Modifier must be enabled
+0A4510C6 00000012
+40451170 000657FF
+
+$P1 Remove Skirt-Peach
+*Game Modifier must be enabled
+0A4510C6 0000000C
+40451170 000659FF
+
+$P2 Remove Skirt - Zelda
+*Game Modifier must be enabled
+0A451F56 00000012
+40452000 000657FF
+
+$P2 Remove Skirt - Peach
+*Game Modifier must be enabled
+0A451F56 0000000C
+40452000 000659FF
+
+$P3 Remove Skirt - Zelda
+*Game Modifier must be enabled
+0A452DE6 00000013
+40452E90 000657FF
+
+$P3 Remove Skirt - Peach
+*Game Modifier must be enabled
+0A452DE6 0000000C
+40452E90 000659FF
+
+$P4 Remove Skirt - Zelda
+*Game Modifier must be enabled
+0A453C76 00000013
+40453D20 000657FF
+
+$P4 Remove Skirt - Peach
+*Game Modifier must be enabled
+0A453C76 0000000C
+40453D20 000659FF
+
+$Each player gets a CPU clone that fights for them
+*Don't use in story modes or with Zelda/Sheik.
+04031B4C 4BFD13CC
+04002F18 907E00B0
+04002F1C 88810028
+04002F20 1C840004
+04002F24 3CA08000
+04002F28 60A52F00
+04002F2C 7F65202E
+04002F30 2C1B0000
+04002F34 41820024
+04002F38 38600080
+04002F3C 9861002A
+04002F40 38610024
+04002F44 48065E31
+04002F48 907E00B4
+04002F4C 3B7BFFFF
+04002F50 2C1B0000
+04002F54 4181FFEC
+04002F58 4802EBF8
+
+$Player 1 gets one clone
+04002F00 00000001
+
+$Player 2 gets one clone
+04002F04 00000001
+
+$Player 3 gets one clone
+04002F08 00000001
+
+$Player 4 gets one clone
+04002F0C 00000001
+
+$Player 1 gets two clones
+04002F00 00000002
+
+$Player 2 gets two clones
+04002F04 00000002
+
+$Player 3 gets two clones
+04002F08 00000002
+
+$Player 4 gets two clones
+04002F0C 00000002
+
+[Gecko]
+# General Codes
+$Unlock All Characters and Stages [Datel]
+*Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
+04459F58 FFFFFFFF
+04459F60 FFFFFFFF
+
+$Unlock All 293 Trophies [Datel]
+0245A3C8 00000125
+0245A3CD 01266363
+
+$Default Tournament Settings [Magus, et all]
+*4 stock, 8 min, items off, tourney legal stages, 
+*friendly fire on, rumble off for all players, sfx>music, deflicker off
+043D2B90 00340102
+043D2B94 04000A00
+043D2B98 08010100
+043D2BA8 FF000000
+043D2BB8 00000000
+043D2BBC 3C000000
+043D2BC2 E70000B0
+
+$Boot to Character Select Screen [Dan Salvato, Achilles]
+*Memory card data is loaded.
+041BEBB4 38600002
+
+$Debug Menu Replaces Tournament Mode [Magus, donny2112]
+0422C340 38000006
+
+$Disable Name Tag Reset After Closing Character Port [Ato]
+04260810 60000000
+04260824 60000000
+
+$Spoof Controller Plugins (P1) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04374D20 38000000
+
+$Spoof Controller Plugins (P2) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04374D28 38000000
+
+$Spoof Controller Plugins (P3) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04374D3C 380000D8
+
+$Spoof Controller Plugins (P4) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04374D50 38000001
+
+$Stage Striking [Sham Rock]
+**Stage striking now works like it does in Project M 
+**X = ban currently selected stage 
+**Y = ban all stages that aren´t allowed in random, unban all that are allowed 
+**Z = unban all 
+**Banned stages can´t be selected anymore, however 
+*they can still be selected when someone chooses "Random".
+C225910C 00000025
+39E00001 3E008046
+62109134 1E2F000C
+7E31802E 5630014B
+4182000C 3A200001
+48000020 56300109
+4182000C 3A200002
+48000010 563002D7
+418200DC 3A200003
+3EA0803E 62B5E840
+3EC0804D 62D64B2E
+3A800000 3A600000
+3A400000 2C110001
+40820014 8A560000
+2C12001C 418100A8
+48000050 2C110003
+40820010 3A80003F
+3A600002 4800003C
+1E12001C 7E10AA14
+8AF0000A 3E008045
+6210A3C0 82100000
+7E10BC30 561007FF
+41820010 3A600002
+3A80003F 4800000C
+3A600000 3A800000
+1E12001C 7E10A82E
+2C120016 41800008
+82100010 82100018
+82100004 82100008
+8210001C 82100008
+9A900024 1E12001C
+3A100008 7E70A9AE
+3A00001E 9A160000
+2C110001 41820010
+3A520001 2C12001D
+41A0FF4C 39EF0001
+2C0F0005 41A0FEE8
+C022C9E8 00000000
+
+# Gameplay Codes
+$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+0416AB64 60000000
+
+$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+*Does not work with Nana
+0406AD38 38000000
+04030024 38000000
+
+$Skip Result Screen & KO Star Count Equals Placement [Sham Rock]
+**KO Star Count displays player placement from the previous match 
+**1st Place = 1 Star 
+**2nd Place = 2 Stars 
+**etc.
+C21A3414 0000000D
+3803FFFF 2C000004
+40820060 2C0B0020
+41820058 3A400000
+3E808047 62947D90
+3EA0804D 62B545AF
+8E1400A8 8A340001
+2C10004E 4080000C
+9E350001 4800000C
+3A310001 9E350001
+3A520001 2C120004
+41A0FFD8 3A000000
+3A200000 3A800000
+3AA00000 38000000
+60000000 00000000
+
+$Hold A+B for Salty Runback [Dan Salvato, Sham Rock]
+*Hold A+B at the end of a match or during a ragequit 
+*and the match will be immediately restarted on the same stage
+C21A3418 00000008
+39C00000 3DE08046
+61EF9140 820F0000
+5611018D 41820010
+561101CF 41820008
+38000002 39CE0001
+2C0E0004 4080000C
+39EF000C 4BFFFFD8
+981F0003 00000000
+
+$Change Rumble Settings from CSS - Color Mod [Sham Rock]
+*Pressing Up/Down on the D-Pad while at the CSS in versus mode 
+*will set the Rumble settings for that slot to On/Off 
+*Colored CSP background is modified; 
+*White = Rumble On, Grey = Rumble Off
+C2261D40 0000001F
+8803000E 3DC08045
+61CEA3B8 3DE08046
+61EF9134 3A800000
+860F000C 56110319
+41820010 3A200001
+9A2E0000 48000014
+5611035B 4182000C
+3A200000 9A2E0000
+3A940001 39CE0001
+2C140004 41A0FFCC
+39CEFFFB 3E401919
+62521900 3E00804C
+2C140004 40820008
+62100390 2C140005
+40820008 621002FC
+2C140006 40820008
+621003FC 2C140007
+40820008 62100368
+2C140005 41810008
+82100000 82100000
+82100000 82100008
+82100018 82100008
+8210001C 82100004
+82100008 8E2E0001
+2C110001 40820010
+3E20EEEE 6231EE00
+4800000C 3E205555
+62315500 92300000
+92500004 3A940001
+2C140008 41A0FF70
+60000000 00000000
+
+$Costume Dependent Marth Sword Swing Colors [Achilles]
+*Color 1 of Marth's sword swing is changed on a per costume basis 
+**Blue costume [default] = Default swing color (teal) 
+**Red costume = Red swing color 
+**Green costume = Green swing color 
+**White costume = Light purple swing color 
+**Black costume = Gold swing color
+C2135E98 0000000F
+3DC0FF00 61CEFFFF
+7C007000 40820060
+39E5E181 89EF0000
+2C0F0001 40820010
+3C60FF00 6063BE0C
+3C001900 2C0F0002
+40820010 3C60FF00
+60638DD5 3C002E00
+2C0F0003 40820010
+3C60FF00 6063F7E1
+3C008300 2C0F0004
+40820010 3C60FF00
+60637D77 3C00C800
+6000FFFF 94650008
+60000000 00000000
+
+$Rolling Results in Immediate Death [Dan Salvato, standardtoaster]
+04098F98 4803A879
+
+$Enable Taunt Cancelling [Dan Salvato]
+040DEA24 4BFA55B5
+040CA114 40820058
+
+# Other Codes
+$Proper 16:9 Widescreen Support [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C23685F4 00000007
+C03F0034 2C0E0001
+41820024 3C004260
+90010030 3C00421C
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
+
+$Properly Display in 4:3 [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C23685F4 00000007
+C03F0034 2C0E0001
+41820024 3C004160
+90010030 3C004150
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
diff --git a/Data/Sys/GameSettings/GALE01r1.ini b/Data/Sys/GameSettings/GALE01r1.ini
new file mode 100644
index 0000000000..723d0eaed3
--- /dev/null
+++ b/Data/Sys/GameSettings/GALE01r1.ini
@@ -0,0 +1,54 @@
+[Gecko]
+# General Codes
+$Unlock All Characters and Stages [Datel]
+*Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
+0445B240 FFFFFFFF
+0445B248 FFFFFFFF
+
+$Unlock All 293 Trophies [Datel]
+0245B6B0 00000125
+0245B6B5 01266363
+
+$Default Tournament Settings [Magus, et all]
+*4 stock, 8 min, items off, tourney legal stages, 
+*friendly fire on, rumble off for all players, sfx>music, deflicker off
+043D3D68 00340102
+043D3D6C 04000A00
+043D3D70 08010100
+043D3D80 FF000000
+043D3D90 00000000
+043D3D94 3C000000
+043D3D98 E70000B0
+
+$Debug Menu Replaces Tournament Mode [Magus, donny2112]
+0422CEB0 38000006
+
+$Disable Name Tag Reset After Closing Character Port [Ato]
+04261380 60000000
+04261394 60000000
+
+$Spoof Controller Plugins (P1) [Achilles]
+04375EF4 38000000
+
+$Spoof Controller Plugins (P2) [Achilles]
+04375EFC 38000000
+
+$Spoof Controller Plugins (P3) [Achilles]
+04375F10 380000D8
+
+$Spoof Controller Plugins (P4) [Achilles]
+04375F24 38000001
+
+# Gameplay Codes
+$Normal C-Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
+0416B18C 60000000
+
+$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+*Does not work with Nana
+0406AE48 38000000
+040300A4 38000000
+
+$Enable Taunt Cancelling [Dan Salvato]
+040DEBFC 4BFA54C5
+040CA258 40820058
+
diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini
new file mode 100644
index 0000000000..1aaa9c3ce2
--- /dev/null
+++ b/Data/Sys/GameSettings/GALE01r2.ini
@@ -0,0 +1,935 @@
+# GALE01 - Super Smash Bros. Melee
+
+[ActionReplay]
+$Global Melee Netplay Settings
+0445BF28 FFFFFFFF
+0445BF2C FFFFFFFF
+0045C370 000000FF
+0045BF12 00000001
+0045BF18 00000008
+0045BF14 00000004
+0045BF18 00000008
+041A45A0 3C000202
+041A45A4 901E0000
+0422D638 38000006
+0416B480 60000000
+0445C388 470000B0
+0445C20C 39400000
+0245C390 00030000
+0445C0D4 01010100
+0045C110 00000001
+0445C230 10000000
+0045C114 00000027
+0445C228 80000000
+0045C22C 00001111
+
+$Items Off
+0045C370 000000FF
+
+$Game Mode Stock
+0045BF12 00000001
+
+$4 Stocks
+0045BF14 00000004
+
+$Stock Match Time Limit 8 Mins
+0045BF18 00000008
+
+$Boot to Character Select [Dan Salvato]
+041A45A0 3C000202
+041A45A4 901E0000
+
+$Debug Menu
+0422D638 38000006
+
+$C-Stick in Single Player [Zauron]
+0416B480 60000000
+
+$Disable Peach's Castle Bullets [Zauron]
+041CD8A8 4E800020
+
+$Disable Brinstar's Rising Lava [Zauron]
+041D99E0 4E800020
+
+$Disable Dreamland's Wind [Zauron]
+04211444 60000000
+
+$Disable Platforms on FoD [Zauron]
+041CC8AC FC000028
+041CC8B4 4800013C
+
+$Disable Corneria's Arwings [Zauron]
+041DDA48 60000000
+
+$No Great Fox Guns [Zauron]
+041E1390 40800430
+
+$Disable Green Greens Blocks [Zauron]
+042146EC 60000000
+04216B24 60000000
+
+$Disable Green Greens Tree Stuff [Zauron]
+04213C10 4E800020
+
+$Disable Pokemon Stadium Transformations [Zauron]
+041D1548 60000000
+
+$Disable Yoshi's Story Shyguys [Zauron]
+041E3348 60000000
+
+$Disable Special Messages [NMN]
+04173EEC 4E800020
+0415D8E0 4E800020
+04005778 4E800020
+0415D934 38000000
+0415D9BC 38600000
+04005780 48000014
+042FE918 4E800020
+
+$Flash on L Cancel [Dan Salvato]
+0408D6A0 48519A60
+045A7100 C00600E8
+045A7104 39E000D4
+045A7108 99E30564
+045A710C 4BAE6598
+040C0148 484E6FC8
+045A7110 387F0488
+045A7114 89FE0564
+045A7118 2C0F00D4
+045A711C 41820008
+045A7120 4BB1902C
+045A7124 39E00091
+045A7128 99FE0564
+045A712C 3DE0C200
+045A7130 91FE0518
+045A7134 91FE051C
+045A7138 91FE0520
+045A713C 91FE0524
+045A7140 3DE0C280
+045A7144 91FE0534
+045A7148 4BB19008
+
+$Input Delay Tester [Dan Salvato]
+3C608047 60639C3C
+80630000 3C80805A
+60847D00 3CA080BD
+60A5A4A0 80050000
+2C000000 418200DC
+80A50000 546007BD
+408200B4 54600739
+408200B8 80040000
+2C000000 418200BC
+38C00000 90C50564
+80E40004 2C070000
+41820054 48000004
+5460077B 40820008
+48000024 7CE83B78
+2C080014 41800008
+39000000 3CC08045
+60C630E0 B1060000
+48000004 38E70001
+2C07001E 4080000C
+90E40004 48000064
+38E00000 90E40004
+48000058 3CC0437F
+90C50518 90C50524
+38C00000 90C5051C
+90C50520 90C50528
+90C5052C 90C50530
+90C50534 3CC08000
+60C60091 90C50564
+4BFFFF80 38000001
+90040000 4BFFFF5C
+38000000 90040000
+90040004 48000004
+7C0802A6 00000000
+
+$Widescreen Support v1.2 [Dan Salvato]
+04BDC5E4 3FCFC217
+
+$Netplay Safe Kill Music [JMC47]
+024D3886 00000000
+
+$Tournament Stages Only for Random
+0445C388 47000090
+
+$Tournament Stages Only for Random Full
+0445C388 47000030
+
+$True Special Message Delete [JMC47]
+0445C20C 39400000
+0245C390 00030000
+0445C0D4 01010100
+0045C110 00000001
+0445C230 10000000
+0045C114 00000027
+0445C228 80000000
+0045C22C 00001111
+
+[Gecko]
+# General Codes
+$Unlock All Characters and Stages [Datel]
+*Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
+0445BF28 FFFFFFFF
+0445BF2C FFFFFFFF
+
+$Unlock All 293 Trophies [Datel]
+0245C390 00000125
+0245C395 01266363
+
+$Default Tournament Settings [Magus, et all]
+*4 stock, 8 min, items off, tourney legal stages, 
+*friendly fire on, rumble off for all players, sfx>music, deflicker off
+043D4A48 00340102
+043D4A4C 04000A00
+043D4A50 08010100
+043D4A60 FF000000
+043D4A70 00000000
+043D4A74 3C000000
+043D4A78 E70000B0
+
+$Boot to Character Select Screen [Dan Salvato, Achilles]
+*Memory card data is loaded.
+041BFA20 38600002
+
+$Debug Menu Replaces Tournament Mode [Magus, donny2112]
+0422D638 38000006
+
+$Disable Name Tag Reset After Closing Character Port [Ato]
+04261B1C 60000000
+04261B30 60000000
+
+$Disable Name Tag Reset After Exiting Character Select Screen [Todd Bonney]
+041A55EC 4E800020
+
+$Zelda is Permanently Sheik at CSS [Achilles]
+*Selecting Zelda will have the player start the match as Sheik.
+043F0CC8 12130200
+
+$Spoof Controller Plugins (P1) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376BD4 38000000
+
+$Spoof Controller Plugins (P2) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376BDC 38000000
+
+$Spoof Controller Plugins (P3) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376BF0 380000D8
+
+$Spoof Controller Plugins (P4) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376C04 38000001
+
+$Stage Striking [Sham Rock]
+**Stage striking now works like it does in Project M 
+**X = ban currently selected stage 
+**Y = ban all stages that aren´t allowed in random, unban all that are allowed 
+**Z = unban all 
+**Banned stages can´t be selected anymore, however they can still be selected when someone chooses "Random".
+C225A3BC 00000025
+39E00001 3E008046
+6210B0FC 1E2F000C
+7E31802E 5630014B
+4182000C 3A200001
+48000020 56300109
+4182000C 3A200002
+48000010 563002D7
+418200DC 3A200003
+3EA0803F 62B506D0
+3EC0804D 62D66CAE
+3A800000 3A600000
+3A400000 2C110001
+40820014 8A560000
+2C12001C 418100A8
+48000050 2C110003
+40820010 3A80003F
+3A600002 4800003C
+1E12001C 7E10AA14
+8AF0000A 3E008045
+6210C388 82100000
+7E10BC30 561007FF
+41820010 3A600002
+3A80003F 4800000C
+3A600000 3A800000
+1E12001C 7E10A82E
+2C120016 41800008
+82100010 82100018
+82100004 82100008
+8210001C 82100008
+9A900024 1E12001C
+3A100008 7E70A9AE
+3A00001E 9A160000
+2C110001 41820010
+3A520001 2C12001D
+41A0FF4C 39EF0001
+2C0F0005 41A0FEE8
+C022C9E8 00000000
+
+$"RANDOM" is Default Highlighted on Stage Select Screen [Jorgasms]
+*As if you had already dragged the cursor over top of "Random" stage select.
+0425AA10 38E0001D
+
+$CSS Player Hands Default to HMN Button [Achilles]
+044DC47C C0200000
+
+$Hold Z While Selecting an Alphabet Character to Force Lowercase [Achilles]
+C223C28C 0000000B
+3E608046 6273B0FD
+3A200000 3A310001
+8E93000C 2C140010
+4082002C 8AA40000
+2C150082 40820028
+8AA40001 2C150060
+4180001C 2C15007A
+40800014 3AB50021
+9AA30001 2C110004
+41A0FFC4 4E800020
+60000000 00000000
+
+$Extended Name Entry [Dan Salvato]
+*English alphabet name tags can be up to 8 characters in length. 
+*Press X Button to shift between upper and lowercase.
+224D4CAC 20000000
+044D4CAC 20000000
+064D4D90 000000B4
+4A000000 54000000
+39000000 2E000000
+49000000 53000000
+38000000 81900000
+48000000 52000000
+37000000 81950000
+47000000 51000000
+36000000 81930000
+46000000 50000000
+5A000000 35000000
+81970000 45000000
+4F000000 59000000
+34000000 81480000
+44000000 4E000000
+58000000 33000000
+81490000 43000000
+4D000000 57000000
+32000000 81810000
+42000000 4C000000
+56000000 31000000
+817B0000 41000000
+4B000000 55000000
+30000000 817C0000
+E2000001 00000000
+C223C718 00000004
+1CC30003 7CC6F214
+88060001 2C000000
+7C601B78 41820008
+38030001 00000000
+C223C270 00000003
+88C30000 2C060000
+41820008 38630001
+98030000 00000000
+C223C710 00000005
+28030003 4180001C
+1CC30003 7CC6F214
+88060001 2C000000
+40820008 38600002
+28030003 00000000
+0423CDD4 7C7E032E
+0423CDB0 B0040000
+C223C5A0 0000000F
+5460056B 41820068
+88BC0050 28050002
+4082005C 3CA0804D
+60A54D90 38C00000
+2C0600B4 41810038
+7CE628AE 2C070041
+41800024 2C07007A
+4181001C 2C070061
+4180000C 38E7FFE0
+48000008 38E70020
+7CE629AE 38C60004
+4BFFFFC8 3D808023
+618CC7EC 7D8903A6
+4E800420 546005AD
+60000000 00000000
+
+# Gameplay Codes
+$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+0416B480 60000000
+
+$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+*Does not work with Nana
+0406AE90 38000000
+040300A4 38000000
+
+$Skip Results Screen & Normal KO Star Count [Sham Rock, Achilles]
+**Results Screen is skipped entirely 
+**KO Star Count functions normally
+C21A415C 0000000E
+3803FFFF 2C0B0020
+41820064 2C000004
+4082005C 3AC00000
+3E608045 6273226F
+3E40804D 6252672F
+8E320001 8E930E84
+7E31A214 8E930004
+7E31A214 8E930004
+7E31A214 8E930004
+7E31A214 2C1100FF
+41800008 3A2000FF
+9A320000 3AD60001
+2C160004 41A0FFC4
+38000000 00000000
+
+$Skip Results Screen & KO Stars Equals Games Won [Sham Rock, Achilles] (1.02)
+*Quitting will not earn any stars
+C21A415C 00000011
+3803FFFF 2C0B0020
+41820078 2C000004
+40820070 3E208047
+6231A1EC 7C088800
+4082005C 3E00804D
+3A9065A7 6210672F
+3E208043 62312087
+3A400000 3A520001
+3A940001 3A100001
+1E720008 7E738A14
+8A730000 2C130021
+4182001C 8AB40000
+2C150000 40820010
+8AB00000 3AB50001
+9AB00000 2C120004
+41A0FFC4 38000000
+60000000 00000000
+
+$Skip Result Screen & KO Star Count Equals Placement [Sham Rock]
+**KO Star Count displays player placement from the previous match 
+**1st Place = 1 Star 
+**2nd Place = 2 Stars 
+**etc.
+C21A415C 0000000E
+3803FFFF 2C000004
+40820060 2C0B0020
+41820058 3A400000
+3E808047 62949D58
+3EA0804D 62B5672F
+8E1400A8 8A340001
+2C10004E 4080000C
+9E350001 4800000C
+3A310001 9E350001
+3A520001 2C120004
+41A0FFD8 3A000000
+3A200000 3A800000
+3AA00000 38000000
+60000000 00000000
+
+$Hold A+B for Salty Runback [Dan Salvato]
+*Hold A+B at the end of a match or during a ragequit 
+*and the match will be immediately restarted on the same stage
+C21A4160 00000008
+39C00000 3DE08046
+61EFB108 820F0000
+5611018D 41820010
+561101CF 41820008
+38000002 39CE0001
+2C0E0004 4080000C
+39EF000C 4BFFFFD8
+981F0003 00000000
+
+$Change Rumble Settings from CSS - Color Mod [Sham Rock]
+*Pressing Up/Down on the D-Pad while at the CSS in versus mode 
+*will set the Rumble settings for that slot to On/Off 
+*Colored CSP background is modified; 
+*White = Rumble On, Grey = Rumble Off
+C226304C 0000001F
+8803000E 3DC08045
+61CEC380 3DE08046
+61EFB0FC 3A800000
+860F000C 56110319
+41820010 3A200001
+9A2E0000 48000014
+5611035B 4182000C
+3A200000 9A2E0000
+3A940001 39CE0001
+2C140004 41A0FFCC
+39CEFFFB 3E401919
+62521900 3E00804C
+2C140004 40820008
+621024EC 2C140005
+40820008 62102458
+2C140006 40820008
+62102558 2C140007
+40820008 621024C4
+2C140005 41810008
+82100000 82100000
+82100000 82100008
+82100018 82100008
+8210001C 82100004
+82100008 8E2E0001
+2C110001 40820010
+3E20EEEE 6231EE00
+4800000C 3E205555
+62315500 92300000
+92500004 3A940001
+2C140008 41A0FF70
+60000000 00000000
+
+$L-Cancel Training Wheels [Dan Salvato]
+*This code automatically L-cancels all aerials, 
+*but your character will flash white if your input was correct. 
+*This allows players to practice L-canceling 
+*but suffer no penalty if the L-cancel is missed, 
+*allowing the player to practice combos and mental game 
+*even without yet having mastered L-canceling.
+C208D69C 00000002
+4080000C 39E000D4
+99E30564 00000000
+C20C0148 0000000C
+387F0488 89FE0564
+2C0F00D4 41820008
+48000048 39E00091
+99FE0564 3DE0C200
+91FE0518 91FE051C
+91FE0520 91FE0524
+3DE00000 91FE0528
+91FE052C 91FE0530
+3DE0C280 91FE0534
+3DE0800C 61EF0150
+7DE903A6 4E800420
+60000000 00000000
+
+$Aerials are Automatically L-Cancelled [Dan Salvato]
+0406B620 60000000
+
+$Flash White on Successful L-Cancel [Dan Salvato]
+*Do not use with "Flash Red on Unsuccessful L-Cancel"
+C208D6A0 00000002
+C00600E8 39E000D4
+99E30564 00000000
+C20C0148 0000000C
+387F0488 89FE0564
+2C0F00D4 41820008
+48000048 39E00091
+99FE0564 3DE0C200
+91FE0518 91FE051C
+91FE0520 91FE0524
+3DE00000 91FE0528
+91FE052C 91FE0530
+3DE0C280 91FE0534
+3DE0800C 61EF0150
+7DE903A6 4E800420
+60000000 00000000
+
+$Flash Red on Unsuccessful L-Cancel [Achilles,Dan Salvato]
+*Do not use with "Flash White on Successful L-Cancel"
+C208D690 00000003
+88A5067F 2C050007
+4180000C 39E000D4
+99E30564 00000000
+C20C0148 0000000C
+387F0488 89FE0564
+2C0F00D4 41820008
+4800004C 39E00091
+99FE0564 3DE0437F
+91FE0518 3DE0C200
+91FE0524 3DE00000
+91FE051C 91FE0520
+91FE0528 91FE052C
+91FE0530 3DE0C280
+91FE0534 3DE0800C
+61EF0150 7DE903A6
+4E800420 00000000
+
+$Disable Tap Jump [Achilles]
+*Affects all players
+C20CBBC0 00000003
+89FD06BE 2C0F0004
+40800008 4E800020
+7C0802A6 00000000
+C20CB4E0 00000003
+2C040001 40820008
+4E800020 7C0802A6
+60000000 00000000
+
+$Costume Dependent Marth Sword Swing Colors [Achilles]
+*Color 1 of Marth's sword swing is changed on a per costume basis 
+**Blue costume [default] = Default swing color (teal) 
+**Red costume = Red swing color 
+**Green costume = Green swing color 
+**White costume = Light purple swing color 
+**Black costume = Gold swing color
+C2136510 0000000F
+3DC0FF00 61CEFFFF
+7C007000 40820060
+39E5E181 89EF0000
+2C0F0001 40820010
+3C60FF00 6063BE0C
+3C001900 2C0F0002
+40820010 3C60FF00
+60638DD5 3C002E00
+2C0F0003 40820010
+3C60FF00 6063F7E1
+3C008300 2C0F0004
+40820010 3C60FF00
+60637D77 3C00C800
+6000FFFF 94650008
+60000000 00000000
+
+$D-Pad Controls Damage [Dan Salvato]
+C206D1EC 0000001E
+3DE08047 61EF9C3F
+8A0F0000 2C100000
+41A200D8 3E60805A
+62737000 3A400000
+2C100001 4082000C
+3E40FFFF 3E80BF80
+2C100002 4082000C
+3E400001 3E803F80
+2C100004 4082000C
+3E40FFF6 3E80C120
+2C100008 4082000C
+3E40000A 3E804120
+92530000 92930008
+3E000000 9A0F0000
+3E200000 3DE08045
+61EF30E0 820F0000
+7E109214 2C100000
+40800008 3A000000
+920F0000 39EF0E90
+3A310001 2C110004
+4180FFDC 3DE080BD
+61EFA4A0 81EF0000
+3E000000 C0130008
+C02F1890 EC21002A
+C0130004 FC010000
+4080000C D00F1890
+48000008 D02F1890
+81EF0008 2C0F0000
+41820008 4BFFFFCC
+7C0802A6 00000000
+
+$Turn White During Shield Stun [Dan Salvato]
+C206B80C 00000009
+7F03C378 81C30070
+2C0E00B5 40820034
+3DC0C200 91C30518
+91C3051C 91C30520
+91C30524 39E00000
+91E30528 91E3052C
+91E30530 91E30534
+39E00091 99E30564
+8001007C 00000000
+
+$Rolling Results in Immediate Death [Dan Salvato]
+04099244 4803A985
+
+$Enable Taunt Cancelling [Dan Salvato]
+*Do not use with Taunt Battle
+040DEE70 4BFA5411
+040CA4CC 40820058
+
+# Game Modes
+$Stock Control/Crew Battle [Jorgasms]
+**Essentially, the hack gets rid of damage modifier for handicap 
+*and replaces it with controllable stocks so that one player can 
+*spawn with say 6 stocks and another can spawn with 4. 
+**When handicap is set to "ON" you can set custom stocks 
+*per player (1 stock - 9 stocks). 
+**When handicap is set to "AUTO" you can set custom stocks 
+*per player (1 stock - 9 stocks) just like when handicap is "ON." 
+*However, upon re-entering the character select screen, 
+*your handicap will be set to the amount of stocks you had at the end of the game. 
+*If you had zero stocks (as in you lost), the game will set your stock 
+*to the current stock setting (any stock amount higher than nine will be set nine). 
+*This allows for easy crew battles. 
+*You can still change the stocks manually if needed (rage quits etc.)
+04036bb4 60000000
+C2266678 00000015
+3DC0803F 61CEA3E6
+89CE0000 2C0E0000
+4182008C 3DC08045
+39CE310E 3DE08048
+39EF0828 3E008045
+6210BF14 8A100000
+2C100009 40810008
+3A000009 8A2E0000
+2C110000 4182000C
+9A2F0000 48000008
+9A0F0000 8A2E0E90
+2C110000 4182000C
+9A2F0024 48000008
+9A0F0024 8A2E1D20
+2C110000 4182000C
+9A2F0048 48000008
+9A0F0048 8A2E2BB0
+2C110000 4182000C
+9A2F006C 48000008
+9A0F006C 3803FFFF
+60000000 00000000
+C21A57DC 00000005
+3E008048 621006E0
+3A200009 9A300000
+9A300024 9A300048
+9A30006C 38BEFFF8
+60000000 00000000
+C2230D54 00000006
+88030005 3DC0803F
+61CEA3E6 3DE08045
+61EFBF15 3A000001
+89CE0000 2C0E00FF
+4082000C 9A0F0000
+38000001 00000000
+C222F76C 00000008
+881C0004 3DC0803F
+61CEA3E6 3E008045
+6210BF15 8A300000
+2C110001 40820014
+38000002 39E000FF
+99EE0000 4800000C
+39E00000 99EE0000
+60000000 00000000
+C222F6BC 00000008
+881C0004 3DC0803F
+61CEA3E6 3E008045
+6210BF15 8A300000
+2C110001 40820014
+38000002 39E000FF
+99EE0000 4800000C
+39E00000 99EE0000
+60000000 00000000
+C2033CC4 0000000A
+3DC08045 61CEBF15
+89CE0000 2C0E0002
+40820038 3DC08045
+39CE310E 3DE08048
+39EF0828 8A4F0000
+9A4E0000 8A4F0024
+9A4E0E90 8A4F0048
+9A4E1D20 8A4F006C
+9A4E2BB0 48000008
+98A3008E 00000000
+
+$Taunt Battle (r2) [Dan Salvato]
+C2261BE0 00000005
+3E208045 6231BF12
+8A310000 2C110003
+40820010 2C040001
+40820008 38840001
+9899000A 00000000
+C22617CC 00000005
+3E208045 6231BF12
+8A310000 2C110003
+4082000C 38000001
+48000008 540007FE
+60000000 00000000
+C2167C08 00000005
+3E208045 6231BF12
+8A310000 2C110003
+4082000C 38000000
+48000008 881E0002
+60000000 00000000
+C2167F70 00000005
+3E208045 6231BF12
+8A310000 2C110003
+4082000C 38000001
+48000008 881E000B
+60000000 00000000
+C2167F7C 00000005
+3E208045 6231BF12
+8A310000 2C110003
+4082000C 38000000
+48000008 881E0002
+60000000 00000000
+C20DED14 0000000D
+3E208045 6231BF12
+8A310000 2C110003
+40820050 887E067B
+809E008C 80BE0020
+7C042800 40820008
+48000018 2C030000
+4082000C 38600002
+48000008 38600000
+3CC0803C 60C66630
+2C030000 41820008
+38C60004 80E60000
+38E70001 90E60000
+7FE3FB78 00000000
+C20DEBD0 00000003
+8063008C 907E0020
+7FC3F378 7C0802A6
+60000000 00000000
+C2165A64 0000000E
+3E208045 6231BF12
+8A310000 2C110003
+40820054 3E20803C
+62316630 3E4080BD
+6252A4A0 82520000
+7F53D378 2C130000
+41820010 3A73FFFF
+82520008 4BFFFFF0
+8A72067B 2C130000
+41820008 3A310004
+80110000 3E208016
+62315AA4 7E2903A6
+4E800420 7C0601D6
+60000000 00000000
+C2036D70 00000003
+3BE00000 3C60803C
+60636630 93E30000
+93E30004 00000000
+C20DED40 00000013
+7C7F1B78 3E208045
+6231BF12 8A310000
+2C110003 4082007C
+887F067B 809F008C
+80BF0020 7C042800
+40820008 48000018
+2C030000 4082000C
+38600001 48000008
+38600000 2C030002
+40820008 38600001
+5463103A 38630518
+38800000 909F0518
+909F051C 909F0520
+909F0528 909F052C
+909F0530 909F0534
+3C804344 909F0524
+38800091 989F0564
+3C80437F 7C9F192E
+7FE3FB78 00000000
+C20D50CC 00000005
+3E208045 6231BF12
+8A310000 2C110003
+4082000C 38000096
+48000008 800505D0
+60000000 00000000
+C216C348 00000008
+3FC08045 63DEBF14
+881E0000 3FE0803C
+63FF6630 83BF0000
+7C1D0000 40800018
+83BF0004 7C1D0000
+4080000C 38600000
+48000008 38600002
+BB610024 00000000
+2845bf12 00FF0300
+004807c8 00000001
+
+# Other Codes
+
+$Target Test Never Ends [donny2112]
+*Match does not end after all the targets have been hit.
+041C4344 38030000
+
+$Input Delay Tester [Dan Salvato]
+* This code tests the input delay of your setup. 
+* Plug into P1 and start a match. Press D-pad Right 
+* to enable and D-pad Up to disable. While enabled, 
+* your character will flash red at a rate of 120bpm. 
+* Tap D-pad Down at the exact moment your character flashes red. 
+* Each time you do so, your character's percent damage 
+* will change to reveal the number of frames between the 
+* red flash and your input. This is the approximate number 
+* of frames of input delay your TV has. Note that your human 
+* timing has a margin of error, so this will only give a rough 
+* estimate of your TV's input delay.
+C2390CFC 00000021
+3C608047 60639C3C
+80630000 3C80805A
+60847D00 3CA080BD
+60A5A4A0 80050000
+2C000000 418200DC
+80A50000 546007BD
+408200B4 54600739
+408200B8 80040000
+2C000000 418200BC
+38C00000 90C50564
+80E40004 2C070000
+41820054 48000004
+5460077B 40820008
+48000024 7CE83B78
+2C080014 41800008
+39000000 3CC08045
+60C630E0 B1060000
+48000004 38E70001
+2C07001E 4080000C
+90E40004 48000064
+38E00000 90E40004
+48000058 3CC0437F
+90C50518 90C50524
+38C00000 90C5051C
+90C50520 90C50528
+90C5052C 90C50530
+90C50534 3CC08000
+60C60091 90C50564
+4BFFFF80 38000001
+90040000 4BFFFF5C
+38000000 90040000
+90040004 48000004
+7C0802A6 00000000
+
+$Proper 16:9 Widescreen Support [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C236A4A8 00000007
+C03F0034 2C0E0001
+41820024 3C004260
+90010030 3C00421C
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
+
+$Properly Display in 4:3 [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C236A4A8 00000007
+C03F0034 2C0E0001
+41820024 3C004160
+90010030 3C004150
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
+
+$PAL Stock Icons [Achilles]
+*Use the smaller PAL stock icons
+C22F9A28 00000004
+3C003F59 6000999A
+901D002C 901D0030
+3C00C1B0 60000000
+60000000 00000000
+
+$L Cancel % in Results Screen [Wooggle]
+C208D600 00000009
+8A830678 3DC08000
+61CE45D4 1EB40008
+7DCEAA14 81EE0000
+39EF0001 91EE0000
+3A0EFFFC 82300000
+7E717BD6 3E408045
+62523DA4 1EB40E90
+7E52AA14 92720000
+3880FFFF 00000000
+C208D6A4 00000009
+8A830678 3DC08000
+61CE45D4 1EB40008
+7DCEAA14 81EE0000
+3A0EFFFC 82300000
+3A310064 92300000
+7E717BD6 3E408045
+62523DA4 1EB40E90
+7E52AA14 92720000
+EC010024 00000000
+04040BBC 60000000
+20C61DB8 16200D20
+06C61DB8 00000014
+1620151A 200C2024
+20312026 2028202F
+1A210300 00000000
+020045D0 000F0000
+E2000001 00000000
+
+$Disable Rumble
+043D4A70 00000000
diff --git a/Data/Sys/GameSettings/GALJ01.ini b/Data/Sys/GameSettings/GALJ01.ini
deleted file mode 100644
index 9767faf6fe..0000000000
--- a/Data/Sys/GameSettings/GALJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GALJ01 - Super Smash Bros Melee
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/GALP01.ini b/Data/Sys/GameSettings/GALP01.ini
index cced99ea57..cdc9003d71 100644
--- a/Data/Sys/GameSettings/GALP01.ini
+++ b/Data/Sys/GameSettings/GALP01.ini
@@ -1,12 +1,4 @@
-# GALP01 - SUPER SMASH BROS. Melee
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
+# GALP01 - Super Smash Bros. Melee
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,96 +10,347 @@ EmulationIssues =
 # Add action replay cheats here.
 $P1 - No Damage
 04443E80 00000000
+
 $P2 - No Damage
 04444D20 00000000
+
 $P3 - No Damage
 04445BC0 00000000
+
 $P4 - No Damage
 04446A60 00000000
+
 $Infinite Lives
 00443EAE 00000009
+
 $One Hit Kills
 044C9578 40100000
+
 $Infinite Jumps
 040CC114 60000000
+
 $Infinite Retries
 0246A8C2 000005FA
+
 $Infinite Time
 0245C4D2 00000075
+
 $Open All Characters
 0444CD30 FFFFFFFF
+
 $Infinite lottery coins
 0444CF10 0000270F
+
 $All 292 Trophies
 0244D198 00000124
 0244D19C 0125FFFF
+
 $L+R+Y sets time to 10:00.00
 0A45BF10 00000860
 0445C4D0 00000258
+
 $L+R+X sets time to 00:10.00
 0A45BF10 00000460
 0445C4D0 0000000A
+
 $All Event matches open and complete
 0444CF34 FFFFFFFF
+
 $Bouncy pickups
 044C8DE0 40100000
+
 $Big jumps
 044CA1DC 3FC00000
+
 $Mega jumps
 044CA1DC 40000000
+
 $Move 2 x faster
 044CA19C 40000000
+
 $Move 4 x faster
 044CA19C 40800000
+
 $Stamina mode codes
 003C28CB 15018000
+
 $All start with 50%
 04034B74 38A00032
+
 $All start with 100%
 04034B74 38A00064
+
 $All start with 200%
 04034B74 38A000C8
+
 $All start with 300%
 04034B74 38A0012C
+
 $All start with 400%
 04034B74 38A00190
+
 $All start with 500%
 04034B74 38A001F4
+
 $All start with 600%
 04034B74 38A00258
+
 $All start with 700%
 04034B74 38A002BC
+
 $All start with 800%
 04034B74 38A00320
+
 $All start with 900%
 04034B74 38A00384
+
 $All start with 999%
 04034B74 38A003E7
+
 $Metroidy level
 044C7FC4 00000D02
+
 $City rooftops level
 044C7FC4 00000F02
+
 $During F-Zero race
 044C7FC4 00001102
+
 $Ontop of giant pokemon
 044C7FC4 00001302
+
 $Mario Bros style level
 044C7FC4 00001502
+
 $Game and Watch level
 044C7FC4 00001702
+
 $Platforms in starfield 1 level
 044C7FC4 00001802
+
 $Platforms in starfield 2 level
 044C7FC4 00001902
+
 $Level with 'windy' tree
 044C7FC4 00001A02
+
 $Yoshi's story level
 044C7FC4 00001B02
+
 $Dusk jungle level
 044C7FC4 00001C02
+
 $Debug Menu
 024C7BC4 00000602
 
+[Gecko]
+# General Codes
+$Unlock All Characters and Stages [Datel]
+0444CD28 FFFFFFFF
+0444CD30 FFFFFFFF
+
+$Boot to Character Select Screen [Dan Salvato, Achilles]
+*Memory card data is loaded.
+041C1580 38600002
+
+$Debug Menu Replaces Tournament Mode [Magus, donny2112]
+0422F4A4 38000006
+
+$Disable Name Tag Reset After Closing Character Port [Ato]
+042622C8 60000000
+042622DC 60000000
+
+$Spoof Controller Plugins (P1) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376AD8 38000000
+
+$Spoof Controller Plugins (P2) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376AE0 38000000
+
+$Spoof Controller Plugins (P3) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376AF4 380000D8
+
+$Spoof Controller Plugins (P4) [Achilles]
+*Makes the game think there is a controller plugged into a specific slot
+04376B08 38000001
+
+$Stage Striking [Sham Rock]
+**Stage striking now works like it does in Project M 
+**X = ban currently selected stage 
+**Y = ban all stages that aren´t allowed in random, unban all that are allowed 
+**Z = unban all 
+**Banned stages can´t be selected anymore, however they can still be selected when someone chooses "Random".
+C225AEF4 00000025
+39E00001 3E008045
+6210BF04 1E2F000C
+7E31802E 5630014B
+4182000C 3A200001
+48000020 56300109
+4182000C 3A200002
+48000010 563002D7
+418200DC 3A200003
+3EA0803F 62B51550
+3EC0804C 62D67FC6
+3A800000 3A600000
+3A400000 2C110001
+40820014 8A560000
+2C12001C 418100A8
+48000050 2C110003
+40820010 3A80003F
+3A600002 4800003C
+1E12001C 7E10AA14
+8AF0000A 3E008044
+6210D190 82100000
+7E10BC30 561007FF
+41820010 3A600002
+3A80003F 4800000C
+3A600000 3A800000
+1E12001C 7E10A82E
+2C120016 41800008
+82100010 82100018
+82100004 82100008
+8210001C 82100008
+9A900024 1E12001C
+3A100008 7E70A9AE
+3A00001E 9A160000
+2C110001 41820010
+3A520001 2C12001D
+41A0FF4C 39EF0001
+2C0F0005 41A0FEE8
+C022CA40 00000000
+
+# Gameplay Codes
+$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+0416BE50 60000000
+
+$Skip Result Screen & KO Star Count Equals Placement [Sham Rock]
+**KO Star Count displays player placement from the previous match 
+**1st Place = 1 Star 
+**2nd Place = 2 Stars 
+**etc.
+C21A4CE0 0000000D
+3803FFFF 2C000004
+40820060 2C0B0020
+41820058 3A400000
+3E808046 6294AB60
+3EA0804C 62B579EF
+8E1400A8 8A340001
+2C10004E 4080000C
+9E350001 4800000C
+3A310001 9E350001
+3A520001 2C120004
+41A0FFD8 3A000000
+3A200000 3A800000
+3AA00000 38000000
+60000000 00000000
+
+$Hold A+B for Salty Runback [Dan Salvato, Sham Rock]
+* Hold A+B at the end of a match or during a ragequit
+* and the match will be immediately restarted on the same stage
+C21A4CE4 00000008
+39C00000 3DE08045
+61EFBF10 820F0000
+5611018D 41820010
+561101CF 41820008
+38000002 39CE0001
+2C0E0004 4080000C
+39EF000C 4BFFFFD8
+981F0003 00000000
+
+$Change Rumble Settings from CSS - Color Mod [Sham Rock]
+*Pressing Up/Down on the D-Pad while at the CSS in versus mode 
+*will set the Rumble settings for that slot to On/Off 
+*Colored CSP background is modified; 
+*White = Rumble On, Grey = Rumble Off
+C22637F8 0000001E
+8803000E 3DC08044
+61CED188 3DE08045
+61EFBF04 3A800000
+860F000C 56110319
+41820010 3A200001
+9A2E0000 48000014
+5611035B 4182000C
+3A200000 9A2E0000
+3A940001 39CE0001
+2C140004 41A0FFCC
+39CEFFFB 3E401919
+62521900 3E00804B
+2C140004 40820008
+6210354C 2C140005
+40820008 621034B8
+2C140006 40820008
+621035B8 2C140007
+40820008 62103524
+82100000 82100000
+82100000 82100008
+82100018 82100008
+8210001C 82100004
+82100008 8E2E0001
+2C110001 40820010
+3E20EEEE 6231EE00
+4800000C 3E205555
+62315500 92300000
+92500004 3A940001
+2C140008 41A0FF78
+60000000 00000000
+
+$Costume Dependent Marth Sword Swing Colors [Achilles]
+*Color 1 of Marth's sword swing is changed on a per costume basis 
+**Blue costume [default] = Default swing color (teal) 
+**Red costume = Red swing color 
+**Green costume = Green swing color 
+**White costume = Light purple swing color 
+**Black costume = Gold swing color
+C2136CB4 0000000F
+3DC0FF00 61CEFFFF
+7C007000 40820060
+39E5E181 89EF0000
+2C0F0001 40820010
+3C60FF00 6063BE0C
+3C001900 2C0F0002
+40820010 3C60FF00
+60638DD5 3C002E00
+2C0F0003 40820010
+3C60FF00 6063F7E1
+3C008300 2C0F0004
+40820010 3C60FF00
+60637D77 3C00C800
+6000FFFF 94650008
+60000000 00000000
+
+$Enable Taunt Cancelling [Dan Salvato]
+040CAC70 40820058
+040DF624 4BFA52D9
+
+# Other Codes
+$Proper 16:9 Widescreen Support [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C236A3AC 00000007
+C03F0034 2C0E0001
+41820024 3C004260
+90010030 3C00421C
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
+
+$Properly Display in 4:3 [Dan Salvato, mirrorbender]
+C2021ABC 00000002
+39C00001 38600006
+60000000 00000000
+C236A3AC 00000007
+C03F0034 2C0E0001
+41820024 3C004160
+90010030 3C004150
+90010034 C0010030
+EC210032 C0010034
+EC210024 39C00000
+281E0000 00000000
+
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -118,4 +361,3 @@ PH_ZFar =
 
 [Video_Settings]
 EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/GAM.ini b/Data/Sys/GameSettings/GAM.ini
new file mode 100644
index 0000000000..faa1b66fd2
--- /dev/null
+++ b/Data/Sys/GameSettings/GAM.ini
@@ -0,0 +1,19 @@
+# GAME5H - Army Men Sarge's War
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GAME5H.ini b/Data/Sys/GameSettings/GAME5H.ini
deleted file mode 100644
index 6682988aa1..0000000000
--- a/Data/Sys/GameSettings/GAME5H.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GAME5H - Army Men Sarge's War
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAN.ini b/Data/Sys/GameSettings/GAN.ini
new file mode 100644
index 0000000000..98b251765e
--- /dev/null
+++ b/Data/Sys/GameSettings/GAN.ini
@@ -0,0 +1,19 @@
+# GANE7U - Animaniacs
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GANE7U.ini b/Data/Sys/GameSettings/GANE7U.ini
deleted file mode 100644
index 7d4162f6cf..0000000000
--- a/Data/Sys/GameSettings/GANE7U.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GANE7U - Animaniacs
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="TLB Error"
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAP.ini b/Data/Sys/GameSettings/GAP.ini
new file mode 100644
index 0000000000..65b1084a22
--- /dev/null
+++ b/Data/Sys/GameSettings/GAP.ini
@@ -0,0 +1,22 @@
+# GAPE52 - American Chopper 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GAPE52.ini b/Data/Sys/GameSettings/GAPE52.ini
deleted file mode 100644
index 335256cdb8..0000000000
--- a/Data/Sys/GameSettings/GAPE52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GAPE52 - American Chopper 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Graphics Glitches"
-EmulationIssues = Stuck at loading screen
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAQ.ini b/Data/Sys/GameSettings/GAQ.ini
new file mode 100644
index 0000000000..0471645e79
--- /dev/null
+++ b/Data/Sys/GameSettings/GAQ.ini
@@ -0,0 +1,18 @@
+# GAQE6S - Aquaman: Battle for Atlantis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GAQE6S.ini b/Data/Sys/GameSettings/GAQE6S.ini
deleted file mode 100644
index 33c8817111..0000000000
--- a/Data/Sys/GameSettings/GAQE6S.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GAQE6S - Aquaman: Battle for Atlantis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAR.ini b/Data/Sys/GameSettings/GAR.ini
new file mode 100644
index 0000000000..8d3fb8682b
--- /dev/null
+++ b/Data/Sys/GameSettings/GAR.ini
@@ -0,0 +1,22 @@
+# GARE5H - Army Men : RTS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GARE5H.ini b/Data/Sys/GameSettings/GARE5H.ini
deleted file mode 100644
index 221b7f25b3..0000000000
--- a/Data/Sys/GameSettings/GARE5H.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GARE5H - Army Men : RTS
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GAT.ini b/Data/Sys/GameSettings/GAT.ini
new file mode 100644
index 0000000000..5b6b0bbedf
--- /dev/null
+++ b/Data/Sys/GameSettings/GAT.ini
@@ -0,0 +1,19 @@
+# GATE51, GATP51 - ATV: Quad Power Racing 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Bad sound in some areas
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GATE51.ini b/Data/Sys/GameSettings/GATE51.ini
deleted file mode 100644
index 15b3859501..0000000000
--- a/Data/Sys/GameSettings/GATE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GATE51 - ATV: Quad Power Racing 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad sound in some areas
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GATP51.ini b/Data/Sys/GameSettings/GATP51.ini
deleted file mode 100644
index 413a02f9f8..0000000000
--- a/Data/Sys/GameSettings/GATP51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GATP51 - ATV: Quad Power Racing 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GAU.ini b/Data/Sys/GameSettings/GAU.ini
new file mode 100644
index 0000000000..7821c71eab
--- /dev/null
+++ b/Data/Sys/GameSettings/GAU.ini
@@ -0,0 +1,31 @@
+# GAUE08, GAUJ08 - auto modellista
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GAUE08.ini b/Data/Sys/GameSettings/GAUE08.ini
index fa93556804..4e0bed3aad 100644
--- a/Data/Sys/GameSettings/GAUE08.ini
+++ b/Data/Sys/GameSettings/GAUE08.ini
@@ -1,13 +1,5 @@
 # GAUE08 - auto modellista
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -64,16 +56,3 @@ $C-Stick Sends All Car Back To Start
 7A1EA826 00000080
 00000000 80206704
 00000000 00070B60
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GAUJ08.ini b/Data/Sys/GameSettings/GAUJ08.ini
deleted file mode 100644
index b47a266889..0000000000
--- a/Data/Sys/GameSettings/GAUJ08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GAUJ08 - auto modellista
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GAV.ini b/Data/Sys/GameSettings/GAV.ini
new file mode 100644
index 0000000000..5b8c8f49f6
--- /dev/null
+++ b/Data/Sys/GameSettings/GAV.ini
@@ -0,0 +1,30 @@
+# GAVE78, GAVP78, GAVY78 - Avatar: The Legend of Aang
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GAVE78.ini b/Data/Sys/GameSettings/GAVE78.ini
deleted file mode 100644
index 1b4d29a215..0000000000
--- a/Data/Sys/GameSettings/GAVE78.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GAVE78 - Avatar 06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAVP78.ini b/Data/Sys/GameSettings/GAVP78.ini
deleted file mode 100644
index cc6301916d..0000000000
--- a/Data/Sys/GameSettings/GAVP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GAVP78 - Avatar: The Legend of Aang
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAVY78.ini b/Data/Sys/GameSettings/GAVY78.ini
deleted file mode 100644
index e40222d155..0000000000
--- a/Data/Sys/GameSettings/GAVY78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GAVE78 - Avatar: The Legend of Aang
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GAX.ini b/Data/Sys/GameSettings/GAX.ini
new file mode 100644
index 0000000000..8d75a1b784
--- /dev/null
+++ b/Data/Sys/GameSettings/GAX.ini
@@ -0,0 +1,27 @@
+# GAXE5D - The Ant Bully
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GAXE5D.ini b/Data/Sys/GameSettings/GAXE5D.ini
deleted file mode 100644
index a6f4dbb44c..0000000000
--- a/Data/Sys/GameSettings/GAXE5D.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAXE5D - The Ant Bully
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAY.ini b/Data/Sys/GameSettings/GAY.ini
new file mode 100644
index 0000000000..4188b18c99
--- /dev/null
+++ b/Data/Sys/GameSettings/GAY.ini
@@ -0,0 +1,23 @@
+# GAYE5D - Midway Arcade Treasures 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GAZ.ini b/Data/Sys/GameSettings/GAZ.ini
new file mode 100644
index 0000000000..95464036f3
--- /dev/null
+++ b/Data/Sys/GameSettings/GAZ.ini
@@ -0,0 +1,27 @@
+# GAZD69, GAZE69, GAZF69, GAZH69, GAZI69, GAZJ69, GAZM69, GAZP69, GAZS69 - Harry Potter : POA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GAZD69.ini b/Data/Sys/GameSettings/GAZD69.ini
deleted file mode 100644
index a36543dd5e..0000000000
--- a/Data/Sys/GameSettings/GAZD69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZD69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZE69.ini b/Data/Sys/GameSettings/GAZE69.ini
deleted file mode 100644
index a9d537207d..0000000000
--- a/Data/Sys/GameSettings/GAZE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZE69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZF69.ini b/Data/Sys/GameSettings/GAZF69.ini
deleted file mode 100644
index 1b4d42b5ff..0000000000
--- a/Data/Sys/GameSettings/GAZF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZF69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZH69.ini b/Data/Sys/GameSettings/GAZH69.ini
deleted file mode 100644
index e2dc3beebe..0000000000
--- a/Data/Sys/GameSettings/GAZH69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZH69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZI69.ini b/Data/Sys/GameSettings/GAZI69.ini
deleted file mode 100644
index b6867cfdd4..0000000000
--- a/Data/Sys/GameSettings/GAZI69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZI69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZJ69.ini b/Data/Sys/GameSettings/GAZJ69.ini
deleted file mode 100644
index 57980290a4..0000000000
--- a/Data/Sys/GameSettings/GAZJ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZJ69 - Harry Potter to Azkaban no Shuujin
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZM69.ini b/Data/Sys/GameSettings/GAZM69.ini
deleted file mode 100644
index e74366de95..0000000000
--- a/Data/Sys/GameSettings/GAZM69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZM69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZP69.ini b/Data/Sys/GameSettings/GAZP69.ini
deleted file mode 100644
index 83ffb21413..0000000000
--- a/Data/Sys/GameSettings/GAZP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZP69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GAZS69.ini b/Data/Sys/GameSettings/GAZS69.ini
deleted file mode 100644
index bc1146c09a..0000000000
--- a/Data/Sys/GameSettings/GAZS69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GAZS69 - Harry Potter : POA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GB3.ini b/Data/Sys/GameSettings/GB3.ini
new file mode 100644
index 0000000000..8336dfd953
--- /dev/null
+++ b/Data/Sys/GameSettings/GB3.ini
@@ -0,0 +1,22 @@
+# GB3E51, GB3P51 - BMX XXX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GB3E51.ini b/Data/Sys/GameSettings/GB3E51.ini
deleted file mode 100644
index e31331af7e..0000000000
--- a/Data/Sys/GameSettings/GB3E51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GB3E51 - BMX XXX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GB4.ini b/Data/Sys/GameSettings/GB4.ini
new file mode 100644
index 0000000000..78bb72360c
--- /dev/null
+++ b/Data/Sys/GameSettings/GB4.ini
@@ -0,0 +1,22 @@
+# GB4E51, GB4P51 - Burnout 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GB4E51.ini b/Data/Sys/GameSettings/GB4E51.ini
index 945e1708ca..748deeb45a 100644
--- a/Data/Sys/GameSettings/GB4E51.ini
+++ b/Data/Sys/GameSettings/GB4E51.ini
@@ -1,13 +1,5 @@
 # GB4E51 - Burnout 2
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -64,7 +56,3 @@ $Unlock Custom Muscle
 041EDB88 00000000
 $Unlock Custom SUV
 041EDB8C 00000000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GB4P51.ini b/Data/Sys/GameSettings/GB4P51.ini
deleted file mode 100644
index b432e7c436..0000000000
--- a/Data/Sys/GameSettings/GB4P51.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GB4P51 - Burnout 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GBD.ini b/Data/Sys/GameSettings/GBD.ini
new file mode 100644
index 0000000000..d2ac57570b
--- /dev/null
+++ b/Data/Sys/GameSettings/GBD.ini
@@ -0,0 +1,19 @@
+# GBDE5G, GBDS7D - BloodRayne
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBDE5G.ini b/Data/Sys/GameSettings/GBDE5G.ini
deleted file mode 100644
index f79647e4c6..0000000000
--- a/Data/Sys/GameSettings/GBDE5G.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBDE5G - BloodRayne
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sometimes slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBDS7D.ini b/Data/Sys/GameSettings/GBDS7D.ini
deleted file mode 100644
index ed913f9981..0000000000
--- a/Data/Sys/GameSettings/GBDS7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBDS7D - BloodRayne
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Graphics glitches"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBF.ini b/Data/Sys/GameSettings/GBF.ini
new file mode 100644
index 0000000000..b847200f00
--- /dev/null
+++ b/Data/Sys/GameSettings/GBF.ini
@@ -0,0 +1,19 @@
+# GBFE70 - Backyard Football
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound don't work
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBFE70.ini b/Data/Sys/GameSettings/GBFE70.ini
deleted file mode 100644
index b733ec54d7..0000000000
--- a/Data/Sys/GameSettings/GBFE70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBFE70 - Backyard Football
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound don't work
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBG.ini b/Data/Sys/GameSettings/GBG.ini
new file mode 100644
index 0000000000..6fe2dfc837
--- /dev/null
+++ b/Data/Sys/GameSettings/GBG.ini
@@ -0,0 +1,22 @@
+# GBGE5G, GBGP7D - Bomberman Generation
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GBGE5G.ini b/Data/Sys/GameSettings/GBGE5G.ini
deleted file mode 100644
index 092c310836..0000000000
--- a/Data/Sys/GameSettings/GBGE5G.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GBGE5G - Bomberman Generation
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GBGP7D.ini b/Data/Sys/GameSettings/GBGP7D.ini
deleted file mode 100644
index 6d315ae7ea..0000000000
--- a/Data/Sys/GameSettings/GBGP7D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GBGP7D - Bomberman Generation
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GBH.ini b/Data/Sys/GameSettings/GBH.ini
new file mode 100644
index 0000000000..c387e8ea5b
--- /dev/null
+++ b/Data/Sys/GameSettings/GBH.ini
@@ -0,0 +1,31 @@
+# GBHDC8, GBHFC8, GBHPC8 - Mystic Heroes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GBHDC8.ini b/Data/Sys/GameSettings/GBHDC8.ini
deleted file mode 100644
index 95458c33de..0000000000
--- a/Data/Sys/GameSettings/GBHDC8.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBHDC8 - Mystic Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBHEC8.ini b/Data/Sys/GameSettings/GBHEC8.ini
index e45dcac726..2ceadae4ba 100644
--- a/Data/Sys/GameSettings/GBHEC8.ini
+++ b/Data/Sys/GameSettings/GBHEC8.ini
@@ -1,13 +1,5 @@
 # GBHEC8 - Mystic Heroes
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to display.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -114,16 +106,3 @@ $Start On Level 8-3
 0226475A 00000803
 $Start On Level 8-4
 01180C57 08000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBHFC8.ini b/Data/Sys/GameSettings/GBHFC8.ini
deleted file mode 100644
index b7da5c8cc9..0000000000
--- a/Data/Sys/GameSettings/GBHFC8.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBHFC8 - Mystic Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBHPC8.ini b/Data/Sys/GameSettings/GBHPC8.ini
deleted file mode 100644
index fa41fa473b..0000000000
--- a/Data/Sys/GameSettings/GBHPC8.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBHPC8 - Mystic Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBI.ini b/Data/Sys/GameSettings/GBI.ini
new file mode 100644
index 0000000000..540cd09c29
--- /dev/null
+++ b/Data/Sys/GameSettings/GBI.ini
@@ -0,0 +1,29 @@
+# GBIE08, GBIP08 - Resident Evil
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/GBIE08.ini b/Data/Sys/GameSettings/GBIE08.ini
deleted file mode 100644
index 423f113b97..0000000000
--- a/Data/Sys/GameSettings/GBIE08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GBIE08 - Resident Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GBIP08.ini b/Data/Sys/GameSettings/GBIP08.ini
deleted file mode 100644
index 81994ceb7f..0000000000
--- a/Data/Sys/GameSettings/GBIP08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GBIP08 - Resident Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GBK.ini b/Data/Sys/GameSettings/GBK.ini
new file mode 100644
index 0000000000..8cec408b2c
--- /dev/null
+++ b/Data/Sys/GameSettings/GBK.ini
@@ -0,0 +1,19 @@
+# GBKE70 - Backyard Baseball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Crappy sound
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBKE70.ini b/Data/Sys/GameSettings/GBKE70.ini
deleted file mode 100644
index 649da77c49..0000000000
--- a/Data/Sys/GameSettings/GBKE70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBKE70 - Backyard Baseball
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Crappy sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBL.ini b/Data/Sys/GameSettings/GBL.ini
new file mode 100644
index 0000000000..0d25084e8d
--- /dev/null
+++ b/Data/Sys/GameSettings/GBL.ini
@@ -0,0 +1,31 @@
+# GBLE52, GBLP52 - BLOODY ROAR(R): PRIMAL FURY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GBLE52.ini b/Data/Sys/GameSettings/GBLE52.ini
deleted file mode 100644
index 03f1df8809..0000000000
--- a/Data/Sys/GameSettings/GBLE52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBLE52 - BLOODY ROAR(R): PRIMAL FURY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for videos to display.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBLP52.ini b/Data/Sys/GameSettings/GBLP52.ini
deleted file mode 100644
index 1d2149350a..0000000000
--- a/Data/Sys/GameSettings/GBLP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBLP52 - BLOODY ROAR(R): PRIMAL FURY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for videos to display.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBLPGL.ini b/Data/Sys/GameSettings/GBLPGL.ini
index 3d287e9b9e..8cf7f983e9 100644
--- a/Data/Sys/GameSettings/GBLPGL.ini
+++ b/Data/Sys/GameSettings/GBLPGL.ini
@@ -1,11 +1,13 @@
 # GBLPGL - GAMECUBE "EL TORITO" BOOTLOADER
+# Because this title has a weird ID, properties are inherited from GBL.ini (Bloody Roar: Primal Fury)!
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
diff --git a/Data/Sys/GameSettings/GBM.ini b/Data/Sys/GameSettings/GBM.ini
new file mode 100644
index 0000000000..4b7065bb2a
--- /dev/null
+++ b/Data/Sys/GameSettings/GBM.ini
@@ -0,0 +1,30 @@
+# GBME7F, GBMJ28, GBMP7F - BATMAN: DARK TOMORROW
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GBME7F.ini b/Data/Sys/GameSettings/GBME7F.ini
deleted file mode 100644
index 77aa5998d6..0000000000
--- a/Data/Sys/GameSettings/GBME7F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBME7F - BATMAN: DARK TOMORROW
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBMP7F.ini b/Data/Sys/GameSettings/GBMP7F.ini
deleted file mode 100644
index e2eb90fe8d..0000000000
--- a/Data/Sys/GameSettings/GBMP7F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBMP7F - BATMAN: DARK TOMORROW
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBO.ini b/Data/Sys/GameSettings/GBO.ini
new file mode 100644
index 0000000000..7d8ab72415
--- /dev/null
+++ b/Data/Sys/GameSettings/GBO.ini
@@ -0,0 +1,22 @@
+# GBOP51 - Burnout
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GBOP51.ini b/Data/Sys/GameSettings/GBOP51.ini
index 7e9f0e43ae..e1c08232dd 100644
--- a/Data/Sys/GameSettings/GBOP51.ini
+++ b/Data/Sys/GameSettings/GBOP51.ini
@@ -1,13 +1,5 @@
 # GBOP51 - Burnout
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -39,7 +31,3 @@ $Survival Mode Unlocked
 $On 3rd Lap (Hold L+R)
 3A58BF20 00000060
 0225B4F2 00000003
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GBQ.ini b/Data/Sys/GameSettings/GBQ.ini
new file mode 100644
index 0000000000..af4be7073d
--- /dev/null
+++ b/Data/Sys/GameSettings/GBQ.ini
@@ -0,0 +1,19 @@
+# GBQE78 - Rocket Power: Beach Bandits
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBQE78.ini b/Data/Sys/GameSettings/GBQE78.ini
deleted file mode 100644
index 0e4b03f01a..0000000000
--- a/Data/Sys/GameSettings/GBQE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBQE78 - Rocket Power: Beach Bandits
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBS.ini b/Data/Sys/GameSettings/GBS.ini
new file mode 100644
index 0000000000..faad80dda1
--- /dev/null
+++ b/Data/Sys/GameSettings/GBS.ini
@@ -0,0 +1,31 @@
+# GBSE8P, GBSP8P - BEACH SPIKERS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+FastDepthCalc = False
+
diff --git a/Data/Sys/GameSettings/GBSE8P.ini b/Data/Sys/GameSettings/GBSE8P.ini
deleted file mode 100644
index 340e6837af..0000000000
--- a/Data/Sys/GameSettings/GBSE8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBSE8P - BEACH SPIKERS
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini
deleted file mode 100644
index 3200c4715d..0000000000
--- a/Data/Sys/GameSettings/GBSP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBSP8P - BEACH SPIKERS
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/GBT.ini b/Data/Sys/GameSettings/GBT.ini
new file mode 100644
index 0000000000..5bb9370a71
--- /dev/null
+++ b/Data/Sys/GameSettings/GBT.ini
@@ -0,0 +1,19 @@
+# GBTE70 - Beyblade Super Tournament Battle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Somethimes bad sound
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBTE70.ini b/Data/Sys/GameSettings/GBTE70.ini
deleted file mode 100644
index 558b420af8..0000000000
--- a/Data/Sys/GameSettings/GBTE70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBTE70 - Beyblade Super Tournament Battle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Somethimes bad sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBV.ini b/Data/Sys/GameSettings/GBV.ini
new file mode 100644
index 0000000000..84e038f1fc
--- /dev/null
+++ b/Data/Sys/GameSettings/GBV.ini
@@ -0,0 +1,35 @@
+# GBVE41, GBVP41 - Batman: Vengeance
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+[DSP]
+EnableJIT = True
+
diff --git a/Data/Sys/GameSettings/GBVE41.ini b/Data/Sys/GameSettings/GBVE41.ini
deleted file mode 100644
index c66ca642cc..0000000000
--- a/Data/Sys/GameSettings/GBVE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBVE41 - Batman: Vengeance
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to show up.(r7459)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBVP41.ini b/Data/Sys/GameSettings/GBVP41.ini
deleted file mode 100644
index 6eb1e339e7..0000000000
--- a/Data/Sys/GameSettings/GBVP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GBVP41 - Batman Vengeance
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to show up.(r7459)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBW.ini b/Data/Sys/GameSettings/GBW.ini
new file mode 100644
index 0000000000..bb1996915d
--- /dev/null
+++ b/Data/Sys/GameSettings/GBW.ini
@@ -0,0 +1,31 @@
+# GBWD64, GBWE64, GBWF64, GBWP64 - Star Wars Bounty Hunter
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GBWD64.ini b/Data/Sys/GameSettings/GBWD64.ini
deleted file mode 100644
index 93799fca4d..0000000000
--- a/Data/Sys/GameSettings/GBWD64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GBWD64 - Star Wars Bounty Hunter
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBWE64.ini b/Data/Sys/GameSettings/GBWE64.ini
deleted file mode 100644
index a953eefe8d..0000000000
--- a/Data/Sys/GameSettings/GBWE64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GBWE64 - Star Wars Bounty Hunter
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBWF64.ini b/Data/Sys/GameSettings/GBWF64.ini
deleted file mode 100644
index c033ebe96c..0000000000
--- a/Data/Sys/GameSettings/GBWF64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GBWF64 - Star Wars Bounty Hunter
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBWP64.ini b/Data/Sys/GameSettings/GBWP64.ini
deleted file mode 100644
index 8e9753602c..0000000000
--- a/Data/Sys/GameSettings/GBWP64.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GBWP64 - Star Wars Bounty Hunter
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GBX.ini b/Data/Sys/GameSettings/GBX.ini
new file mode 100644
index 0000000000..468af38620
--- /dev/null
+++ b/Data/Sys/GameSettings/GBX.ini
@@ -0,0 +1,23 @@
+# GBXE51, GBXP51 - Dave Mirra Freestyle Bmx2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
+
diff --git a/Data/Sys/GameSettings/GBXE51.ini b/Data/Sys/GameSettings/GBXE51.ini
deleted file mode 100644
index f409411c72..0000000000
--- a/Data/Sys/GameSettings/GBXE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GBXE51 - Dave Mirra Freestyle Bmx2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBY.ini b/Data/Sys/GameSettings/GBY.ini
new file mode 100644
index 0000000000..a19676a74a
--- /dev/null
+++ b/Data/Sys/GameSettings/GBY.ini
@@ -0,0 +1,18 @@
+# GBYE0A - Super Bubble Pop
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GBYE0A.ini b/Data/Sys/GameSettings/GBYE0A.ini
deleted file mode 100644
index 88d687fa0b..0000000000
--- a/Data/Sys/GameSettings/GBYE0A.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GBYE0A - Super Bubble Pop
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GBZ.ini b/Data/Sys/GameSettings/GBZ.ini
new file mode 100644
index 0000000000..a75c8306c3
--- /dev/null
+++ b/Data/Sys/GameSettings/GBZ.ini
@@ -0,0 +1,22 @@
+# GBZE08, GBZP08 - Resident Evil 0
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GBZE08.ini b/Data/Sys/GameSettings/GBZE08.ini
deleted file mode 100644
index d57888957c..0000000000
--- a/Data/Sys/GameSettings/GBZE08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GBZE08 - Resident Evil 0
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GBZP08.ini b/Data/Sys/GameSettings/GBZP08.ini
index 8f5de24865..574bed495a 100644
--- a/Data/Sys/GameSettings/GBZP08.ini
+++ b/Data/Sys/GameSettings/GBZP08.ini
@@ -1,13 +1,5 @@
 # GBZP08 - Resident Evil 0
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -77,7 +69,3 @@ $Infinite Ammo [All Slots] (B)
 0232731E 00000063
 $Slot 4: Moltov cocktails (B)
 02327214 0000000E
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GC2.ini b/Data/Sys/GameSettings/GC2.ini
new file mode 100644
index 0000000000..91009a77ab
--- /dev/null
+++ b/Data/Sys/GameSettings/GC2.ini
@@ -0,0 +1,19 @@
+# GC2E9G - Conflict: Desert Storm II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos not seen
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GC2E9G.ini b/Data/Sys/GameSettings/GC2E9G.ini
deleted file mode 100644
index 2a8612ac16..0000000000
--- a/Data/Sys/GameSettings/GC2E9G.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GC2E9G - Conflict: Desert Storm II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos not seen
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GC3.ini b/Data/Sys/GameSettings/GC3.ini
new file mode 100644
index 0000000000..c2e66343b8
--- /dev/null
+++ b/Data/Sys/GameSettings/GC3.ini
@@ -0,0 +1,27 @@
+# GC3D78, GC3E78, GC3F78, GC3P78 - Scooby-Doo!(tm) Mystery Mayhem
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GC3D78.ini b/Data/Sys/GameSettings/GC3D78.ini
deleted file mode 100644
index a3471aa0f4..0000000000
--- a/Data/Sys/GameSettings/GC3D78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GC3D78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GC3E78.ini b/Data/Sys/GameSettings/GC3E78.ini
deleted file mode 100644
index 7fb5b5d7e7..0000000000
--- a/Data/Sys/GameSettings/GC3E78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GC3E78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GC3F78.ini b/Data/Sys/GameSettings/GC3F78.ini
deleted file mode 100644
index f06f594fd8..0000000000
--- a/Data/Sys/GameSettings/GC3F78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GC3F78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GC3P78.ini b/Data/Sys/GameSettings/GC3P78.ini
deleted file mode 100644
index c903ddfbda..0000000000
--- a/Data/Sys/GameSettings/GC3P78.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GC3P78 - Scooby-Doo!(tm) Mystery Mayhem
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GC4.ini b/Data/Sys/GameSettings/GC4.ini
new file mode 100644
index 0000000000..2d0ca7f90a
--- /dev/null
+++ b/Data/Sys/GameSettings/GC4.ini
@@ -0,0 +1,19 @@
+# GC4JBN - Cyber Formula -Road To The EVOLUTION-
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound Glitches
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GC4JBN.ini b/Data/Sys/GameSettings/GC4JBN.ini
deleted file mode 100644
index a073823849..0000000000
--- a/Data/Sys/GameSettings/GC4JBN.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GC4JBN - Cyber Formula -Road To The EVOLUTION-
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound Glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GC5.ini b/Data/Sys/GameSettings/GC5.ini
new file mode 100644
index 0000000000..efced9c61c
--- /dev/null
+++ b/Data/Sys/GameSettings/GC5.ini
@@ -0,0 +1,18 @@
+# GC5PNK - COCOTO Kart Racer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GC5PNK.ini b/Data/Sys/GameSettings/GC5PNK.ini
deleted file mode 100644
index a53f7641b0..0000000000
--- a/Data/Sys/GameSettings/GC5PNK.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GC5PNK - COCOTO Kart Racer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GC6.ini b/Data/Sys/GameSettings/GC6.ini
new file mode 100644
index 0000000000..1602c8f22f
--- /dev/null
+++ b/Data/Sys/GameSettings/GC6.ini
@@ -0,0 +1,32 @@
+# GC6E01, GC6P01 - Pokemon Colosseum
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = If EFB scale is not integral, serious texture glitches occur.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GC6E01.ini b/Data/Sys/GameSettings/GC6E01.ini
deleted file mode 100644
index 9509c45611..0000000000
--- a/Data/Sys/GameSettings/GC6E01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GC6E01 - Pokemon Colosseum
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = If EFB scale is not integral, serious texture glitches occur.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini
deleted file mode 100644
index d1d9e30759..0000000000
--- a/Data/Sys/GameSettings/GC6P01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GC6P01 - Pokemon Colosseum
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = If EFB scale is not integral, serious texture glitches occur.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GC7.ini b/Data/Sys/GameSettings/GC7.ini
new file mode 100644
index 0000000000..c9b47b6e5e
--- /dev/null
+++ b/Data/Sys/GameSettings/GC7.ini
@@ -0,0 +1,19 @@
+# GC7PNK - COCOTO Platform Jumper
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GC7PNK.ini b/Data/Sys/GameSettings/GC7PNK.ini
deleted file mode 100644
index 237c3e4363..0000000000
--- a/Data/Sys/GameSettings/GC7PNK.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GC7PNK - COCOTO Platform Jumper
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GC9.ini b/Data/Sys/GameSettings/GC9.ini
new file mode 100644
index 0000000000..c3c72a7244
--- /dev/null
+++ b/Data/Sys/GameSettings/GC9.ini
@@ -0,0 +1,22 @@
+# GC9P6S - Conan disc0
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GC9P6S.ini b/Data/Sys/GameSettings/GC9P6S.ini
deleted file mode 100644
index 0d4dcb1ef5..0000000000
--- a/Data/Sys/GameSettings/GC9P6S.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GC9P6S - Conan disc0
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GCA.ini b/Data/Sys/GameSettings/GCA.ini
new file mode 100644
index 0000000000..4bd47284e5
--- /dev/null
+++ b/Data/Sys/GameSettings/GCA.ini
@@ -0,0 +1,19 @@
+# GCAE5H - Cubix Showdown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Bad sound
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCAE5H.ini b/Data/Sys/GameSettings/GCAE5H.ini
deleted file mode 100644
index b384790e46..0000000000
--- a/Data/Sys/GameSettings/GCAE5H.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCAE5H - Cubix Showdown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Bad sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCB.ini b/Data/Sys/GameSettings/GCB.ini
new file mode 100644
index 0000000000..d6833eb8ff
--- /dev/null
+++ b/Data/Sys/GameSettings/GCB.ini
@@ -0,0 +1,18 @@
+# GCBE7D, GCBP7D - Crash Bandicoot: The Wrath of Cortex
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCBE7D.ini b/Data/Sys/GameSettings/GCBE7D.ini
deleted file mode 100644
index cf44141fa5..0000000000
--- a/Data/Sys/GameSettings/GCBE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCBE7D - Crash Bandicoot:The Wrath of Cortex
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = May be slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCBP7D.ini b/Data/Sys/GameSettings/GCBP7D.ini
deleted file mode 100644
index c11ea1e3d9..0000000000
--- a/Data/Sys/GameSettings/GCBP7D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCBP7D - Crash Bandicoot:The Wrath of Cortex
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCC.ini b/Data/Sys/GameSettings/GCC.ini
new file mode 100644
index 0000000000..fbb4eed2cf
--- /dev/null
+++ b/Data/Sys/GameSettings/GCC.ini
@@ -0,0 +1,33 @@
+# GCCE01, GCCJ01, GCCJGC, GCCP01 - FINAL FANTASY Crystal Chronicles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/GCCE01.ini b/Data/Sys/GameSettings/GCCE01.ini
index 44397d229a..97cf1d7fab 100644
--- a/Data/Sys/GameSettings/GCCE01.ini
+++ b/Data/Sys/GameSettings/GCCE01.ini
@@ -1,13 +1,5 @@
 # GCCE01 - FINAL FANTASY Crystal Chronicles
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -296,18 +288,3 @@ $Single Player ITEM SLOT 4 CONTAINS Taterskin Coat
 $Single Player ITEM SLOT 4 CONTAINS Coat
 04EC5A36 08000000
 0221F32C 00000056
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GCCP01.ini b/Data/Sys/GameSettings/GCCP01.ini
deleted file mode 100644
index fde6040740..0000000000
--- a/Data/Sys/GameSettings/GCCP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GCCP01 - FINAL FANTASY Crystal Chronicles
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GCD.ini b/Data/Sys/GameSettings/GCD.ini
new file mode 100644
index 0000000000..fe1ca5677b
--- /dev/null
+++ b/Data/Sys/GameSettings/GCD.ini
@@ -0,0 +1,25 @@
+# GCDE08, GCDJ08, GCDP08 - RESIDENT EVIL CVX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Per pixel lighting creates some lighting issues.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EnablePixelLighting = False
diff --git a/Data/Sys/GameSettings/GCDE08.ini b/Data/Sys/GameSettings/GCDE08.ini
deleted file mode 100644
index 1ea9ba9209..0000000000
--- a/Data/Sys/GameSettings/GCDE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCDE08 - RESIDENT EVIL CVX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCDP08.ini b/Data/Sys/GameSettings/GCDP08.ini
deleted file mode 100644
index 19004249fc..0000000000
--- a/Data/Sys/GameSettings/GCDP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCDP08 - RESIDENT EVIL CVX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCE.ini b/Data/Sys/GameSettings/GCE.ini
new file mode 100644
index 0000000000..c082da6352
--- /dev/null
+++ b/Data/Sys/GameSettings/GCE.ini
@@ -0,0 +1,17 @@
+# GCEE41, GCEP41 - Tom Clancy's Splinter Cell
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GCEE41.ini b/Data/Sys/GameSettings/GCEE41.ini
deleted file mode 100644
index 37e171c52a..0000000000
--- a/Data/Sys/GameSettings/GCEE41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCEE41 - Tom Clancy's Splinter Cell
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GCEP41.ini b/Data/Sys/GameSettings/GCEP41.ini
deleted file mode 100644
index e049fe69ba..0000000000
--- a/Data/Sys/GameSettings/GCEP41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCEP41 - Tom Clancy's Splinter Cell
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GCF.ini b/Data/Sys/GameSettings/GCF.ini
new file mode 100644
index 0000000000..68e90e0711
--- /dev/null
+++ b/Data/Sys/GameSettings/GCF.ini
@@ -0,0 +1,18 @@
+# GCFE9G - Conflict: Desert Storm
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCFE9G.ini b/Data/Sys/GameSettings/GCFE9G.ini
deleted file mode 100644
index b41d3d2501..0000000000
--- a/Data/Sys/GameSettings/GCFE9G.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCFE9G - Conflict: Desert Storm
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCG.ini b/Data/Sys/GameSettings/GCG.ini
new file mode 100644
index 0000000000..f1aa952052
--- /dev/null
+++ b/Data/Sys/GameSettings/GCG.ini
@@ -0,0 +1,19 @@
+# GCGE41 - CHARLIE'S ANGELS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCGE41.ini b/Data/Sys/GameSettings/GCGE41.ini
deleted file mode 100644
index 8827a07603..0000000000
--- a/Data/Sys/GameSettings/GCGE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCGE41 - CHARLIE'S ANGELS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCH.ini b/Data/Sys/GameSettings/GCH.ini
new file mode 100644
index 0000000000..145a24adbf
--- /dev/null
+++ b/Data/Sys/GameSettings/GCH.ini
@@ -0,0 +1,19 @@
+# GCHE78 - WWE CrushHour
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Bad Graphics
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCHE78.ini b/Data/Sys/GameSettings/GCHE78.ini
deleted file mode 100644
index 64f0adc777..0000000000
--- a/Data/Sys/GameSettings/GCHE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCHE78 - WWE CrushHour
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad Graphics
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCI.ini b/Data/Sys/GameSettings/GCI.ini
new file mode 100644
index 0000000000..1c715ddb5c
--- /dev/null
+++ b/Data/Sys/GameSettings/GCI.ini
@@ -0,0 +1,17 @@
+# GCIE69, GCIP69 - The Sims
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GCIE69.ini b/Data/Sys/GameSettings/GCIE69.ini
deleted file mode 100644
index f2ac2b7cfc..0000000000
--- a/Data/Sys/GameSettings/GCIE69.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# GCIE69 - The Sims
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GCIP69.ini b/Data/Sys/GameSettings/GCIP69.ini
deleted file mode 100644
index 0f69c3638e..0000000000
--- a/Data/Sys/GameSettings/GCIP69.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# GCIP69 - The Sims
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GCJ.ini b/Data/Sys/GameSettings/GCJ.ini
new file mode 100644
index 0000000000..3ab624e794
--- /dev/null
+++ b/Data/Sys/GameSettings/GCJ.ini
@@ -0,0 +1,15 @@
+# GCJE41, GCJP41 - Tom Clancy's Splinter Cell Chaos Theory
+[Core]
+[EmuState]
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/GCJE41.ini b/Data/Sys/GameSettings/GCJE41.ini
deleted file mode 100644
index 84e8556ec4..0000000000
--- a/Data/Sys/GameSettings/GCJE41.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GCJE41 - Tom Clancy's Splinter Cell Chaos Theory
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
diff --git a/Data/Sys/GameSettings/GCJP41.ini b/Data/Sys/GameSettings/GCJP41.ini
deleted file mode 100644
index 6926eb6e9a..0000000000
--- a/Data/Sys/GameSettings/GCJP41.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GCJP41 - Tom Clancy's Splinter Cell Chaos Theory
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-
diff --git a/Data/Sys/GameSettings/GCL.ini b/Data/Sys/GameSettings/GCL.ini
new file mode 100644
index 0000000000..5c8880dc85
--- /dev/null
+++ b/Data/Sys/GameSettings/GCL.ini
@@ -0,0 +1,19 @@
+# GCLP69 - Cel Damage
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCLP69.ini b/Data/Sys/GameSettings/GCLP69.ini
deleted file mode 100644
index 8c8807751e..0000000000
--- a/Data/Sys/GameSettings/GCLP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCLP69 - Cel Damage
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-Issues="Graphics Errors... Not Playable"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCN.ini b/Data/Sys/GameSettings/GCN.ini
new file mode 100644
index 0000000000..fd74f0c097
--- /dev/null
+++ b/Data/Sys/GameSettings/GCN.ini
@@ -0,0 +1,30 @@
+# GCNE7D, GCNP7D - Crash Nitro Kart
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GCNE7D.ini b/Data/Sys/GameSettings/GCNE7D.ini
deleted file mode 100644
index 0b88602854..0000000000
--- a/Data/Sys/GameSettings/GCNE7D.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GCNE7D - Crash Nitro Kart
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues =
-EmulationIssues = Disable "Panic Handlers". Needs "Real Xfb" to display videos.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GCNP7D.ini b/Data/Sys/GameSettings/GCNP7D.ini
deleted file mode 100644
index 9432054d25..0000000000
--- a/Data/Sys/GameSettings/GCNP7D.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GCNP7D - Crash Nitro Kart
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-Patch Region = 0x7e000000
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GCO.ini b/Data/Sys/GameSettings/GCO.ini
new file mode 100644
index 0000000000..3d5301f1e0
--- /dev/null
+++ b/Data/Sys/GameSettings/GCO.ini
@@ -0,0 +1,19 @@
+# GCOE52 - Call of Duty
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCOE52.ini b/Data/Sys/GameSettings/GCOE52.ini
deleted file mode 100644
index 9ed4538792..0000000000
--- a/Data/Sys/GameSettings/GCOE52.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GCOE52 - Call of Duty
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-Patch region = 0x7e000004
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Slowwwwwwww and desync but playable"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCOPDV.ini b/Data/Sys/GameSettings/GCOPDV.ini
index 0ee25eba63..92c0533201 100644
--- a/Data/Sys/GameSettings/GCOPDV.ini
+++ b/Data/Sys/GameSettings/GCOPDV.ini
@@ -1,7 +1,8 @@
 # GCOPDV - GCOS MultiGame DVD (C) GCOS TEAM
+# Because this title has a weird ID, properties are inherited from GCO.ini (Call of Duty)!
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GCP.ini b/Data/Sys/GameSettings/GCP.ini
new file mode 100644
index 0000000000..522dfabbfe
--- /dev/null
+++ b/Data/Sys/GameSettings/GCP.ini
@@ -0,0 +1,33 @@
+# GCPE6S, GCPP6S - CASPER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to appear.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/GCPE6S.ini b/Data/Sys/GameSettings/GCPE6S.ini
deleted file mode 100644
index 287f339de0..0000000000
--- a/Data/Sys/GameSettings/GCPE6S.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GCPE6S - CASPER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to appear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini
deleted file mode 100644
index 50c527c0f9..0000000000
--- a/Data/Sys/GameSettings/GCPP6S.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GCPP6S - Casper Spirit Dimensions
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to appear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GCQ.ini b/Data/Sys/GameSettings/GCQ.ini
new file mode 100644
index 0000000000..58e51cd52b
--- /dev/null
+++ b/Data/Sys/GameSettings/GCQ.ini
@@ -0,0 +1,19 @@
+# GCQE7D, GCQP7D - Buffy: Chaos Bleeds
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCQE7D.ini b/Data/Sys/GameSettings/GCQE7D.ini
deleted file mode 100644
index 1f35d92307..0000000000
--- a/Data/Sys/GameSettings/GCQE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GCQE7D - Buffy: Chaos Bleeds
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCQP7D.ini b/Data/Sys/GameSettings/GCQP7D.ini
deleted file mode 100644
index 069cb59637..0000000000
--- a/Data/Sys/GameSettings/GCQP7D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCQP7D - Buffy: Chaos Bleeds
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCS.ini b/Data/Sys/GameSettings/GCS.ini
new file mode 100644
index 0000000000..6f5cb7b919
--- /dev/null
+++ b/Data/Sys/GameSettings/GCS.ini
@@ -0,0 +1,18 @@
+# GCSEAF - Street Racing Syndicate
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCSEAF.ini b/Data/Sys/GameSettings/GCSEAF.ini
deleted file mode 100644
index 774cdb447d..0000000000
--- a/Data/Sys/GameSettings/GCSEAF.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCSEAF - Street Racing Syndicate
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCT.ini b/Data/Sys/GameSettings/GCT.ini
new file mode 100644
index 0000000000..45f7d118c6
--- /dev/null
+++ b/Data/Sys/GameSettings/GCT.ini
@@ -0,0 +1,18 @@
+# GCTE51, GCTP51 - Crazy Taxi
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GCTE51.ini b/Data/Sys/GameSettings/GCTE51.ini
deleted file mode 100644
index 8a0591560e..0000000000
--- a/Data/Sys/GameSettings/GCTE51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCTE51 - Crazy Taxi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCTP51.ini b/Data/Sys/GameSettings/GCTP51.ini
deleted file mode 100644
index 0fc382cada..0000000000
--- a/Data/Sys/GameSettings/GCTP51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GCTP51 - Crazy Taxi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GCV.ini b/Data/Sys/GameSettings/GCV.ini
new file mode 100644
index 0000000000..7069e0faa3
--- /dev/null
+++ b/Data/Sys/GameSettings/GCV.ini
@@ -0,0 +1,22 @@
+# GCVEEB - Cubivore
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GCVEEB.ini b/Data/Sys/GameSettings/GCVEEB.ini
index 8ed0d6b0e6..f6c3cd60bb 100644
--- a/Data/Sys/GameSettings/GCVEEB.ini
+++ b/Data/Sys/GameSettings/GCVEEB.ini
@@ -1,13 +1,5 @@
 # GCVEEB - Cubivore
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -23,7 +15,3 @@ $Max Lovebits
 $Full Health
 010C0B95 08000000
 043C83F0 3F800000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GCZ.ini b/Data/Sys/GameSettings/GCZ.ini
new file mode 100644
index 0000000000..156677d63b
--- /dev/null
+++ b/Data/Sys/GameSettings/GCZ.ini
@@ -0,0 +1,30 @@
+# GCZE69, GCZP69 - CATWOMAN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GCZE69.ini b/Data/Sys/GameSettings/GCZE69.ini
deleted file mode 100644
index a989cf655a..0000000000
--- a/Data/Sys/GameSettings/GCZE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GCZE69 - CATWOMAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GCZP69.ini b/Data/Sys/GameSettings/GCZP69.ini
deleted file mode 100644
index 861d0ecf80..0000000000
--- a/Data/Sys/GameSettings/GCZP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GCZP69 - CATWOMAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GD4.ini b/Data/Sys/GameSettings/GD4.ini
new file mode 100644
index 0000000000..099a705b35
--- /dev/null
+++ b/Data/Sys/GameSettings/GD4.ini
@@ -0,0 +1,19 @@
+# GD4E6S - Dinotopia: The Sunstone Odyssey
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GD4E6S.ini b/Data/Sys/GameSettings/GD4E6S.ini
deleted file mode 100644
index 54d2d1f979..0000000000
--- a/Data/Sys/GameSettings/GD4E6S.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD4E6S - Dinotopia: The Sunstone Odyssey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GD6.ini b/Data/Sys/GameSettings/GD6.ini
new file mode 100644
index 0000000000..986efb5183
--- /dev/null
+++ b/Data/Sys/GameSettings/GD6.ini
@@ -0,0 +1,19 @@
+# GD6EB2, GD6P70 - Digimon Rumble Arena 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Some bad GFX
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GD6EB2.ini b/Data/Sys/GameSettings/GD6EB2.ini
deleted file mode 100644
index 610aef6791..0000000000
--- a/Data/Sys/GameSettings/GD6EB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD6EB2 - Digimon Rumble Arena 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some bad GFX
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GD6P70.ini b/Data/Sys/GameSettings/GD6P70.ini
deleted file mode 100644
index c3e2f09ca3..0000000000
--- a/Data/Sys/GameSettings/GD6P70.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GD6P70 - Digimon Rumble Arena 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GD7.ini b/Data/Sys/GameSettings/GD7.ini
new file mode 100644
index 0000000000..b2f7e49bb6
--- /dev/null
+++ b/Data/Sys/GameSettings/GD7.ini
@@ -0,0 +1,19 @@
+# GD7PB2 - Dragon Ball Z Budokai
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound glitches
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GD7PB2.ini b/Data/Sys/GameSettings/GD7PB2.ini
deleted file mode 100644
index 08029b4ba3..0000000000
--- a/Data/Sys/GameSettings/GD7PB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD7PB2 - Dragon Ball Z Budokai
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GD9.ini b/Data/Sys/GameSettings/GD9.ini
new file mode 100644
index 0000000000..a5492df48a
--- /dev/null
+++ b/Data/Sys/GameSettings/GD9.ini
@@ -0,0 +1,19 @@
+# GD9E69, GD9P69 - Drome Racers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GD9E69.ini b/Data/Sys/GameSettings/GD9E69.ini
deleted file mode 100644
index f88b436560..0000000000
--- a/Data/Sys/GameSettings/GD9E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD9E69 - Drome Racers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = May be slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GD9P69.ini b/Data/Sys/GameSettings/GD9P69.ini
deleted file mode 100644
index f274cdfeb0..0000000000
--- a/Data/Sys/GameSettings/GD9P69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GD9P69 - Drome Racers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDD.ini b/Data/Sys/GameSettings/GDD.ini
new file mode 100644
index 0000000000..7c2ff71444
--- /dev/null
+++ b/Data/Sys/GameSettings/GDD.ini
@@ -0,0 +1,28 @@
+# GDDE41 - Disney's Donald Duck Goin' Quackers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE. Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[DSP]
+EnableJIT = True
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GDDE41.ini b/Data/Sys/GameSettings/GDDE41.ini
index 8241b0aa9c..92a7014de8 100644
--- a/Data/Sys/GameSettings/GDDE41.ini
+++ b/Data/Sys/GameSettings/GDDE41.ini
@@ -1,13 +1,5 @@
 # GDDE41 - Disney's Donald Duck Goin' Quackers
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -29,7 +21,3 @@ $Never Have More Than 3 Lives
 $Never Have More Than 1 Cog
 34765070 00000001
 04765070 00000001
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GDE.ini b/Data/Sys/GameSettings/GDE.ini
new file mode 100644
index 0000000000..3eaee55ab4
--- /dev/null
+++ b/Data/Sys/GameSettings/GDE.ini
@@ -0,0 +1,22 @@
+# GDEE71 - Baldur's Gate: Dark Alliance
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GDEE71.ini b/Data/Sys/GameSettings/GDEE71.ini
index 6844643184..84426f19c4 100644
--- a/Data/Sys/GameSettings/GDEE71.ini
+++ b/Data/Sys/GameSettings/GDEE71.ini
@@ -1,15 +1,5 @@
 # GDEE71 - Baldur's Gate: Dark Alliance
 
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,15 +8,26 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
+$Max/Infinite Health
+0452FBF4 447A0000
+0452FBF8 447A0000
+$Max/Infinite Energy
+0452FC0C 447A0000
+0452FC10 447A0000
+$Max Base Attack
+0452FC18 05F5E0FF
+$Infinite Money
+0452FC2C 0098967F
+$Infinite Upgrade Points
+0452FC30 000001F4
+$Low Weight Carried
+0452FC74 3F800000
+$Press L To Grow
+0A3D54C0 00000040
+84661668 FFFFC000
+$Press R To Shrink
+0A3D54C0 00000020
+84661668 00004000
+$Play As Drizzt
+0452FB9C 00000003
+0452FBA0 00000003
diff --git a/Data/Sys/GameSettings/GDF.ini b/Data/Sys/GameSettings/GDF.ini
new file mode 100644
index 0000000000..b4f051954b
--- /dev/null
+++ b/Data/Sys/GameSettings/GDF.ini
@@ -0,0 +1,19 @@
+# GDFE5D, GDFP5D - Defender
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = A lot of graphics glitches
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDFE5D.ini b/Data/Sys/GameSettings/GDFE5D.ini
deleted file mode 100644
index e95b3c4ca3..0000000000
--- a/Data/Sys/GameSettings/GDFE5D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDFE5D - Defender
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Alot GFX Glitches/Bugs
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDFP5D.ini b/Data/Sys/GameSettings/GDFP5D.ini
deleted file mode 100644
index b2a93e6d1d..0000000000
--- a/Data/Sys/GameSettings/GDFP5D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GDFP5D - Defender
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDG.ini b/Data/Sys/GameSettings/GDG.ini
new file mode 100644
index 0000000000..aeec0f6894
--- /dev/null
+++ b/Data/Sys/GameSettings/GDG.ini
@@ -0,0 +1,31 @@
+# GDGE7H, GDGP78 - Dragon's Lair 3D
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GDGE7H.ini b/Data/Sys/GameSettings/GDGE7H.ini
deleted file mode 100644
index a2afd7f21a..0000000000
--- a/Data/Sys/GameSettings/GDGE7H.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GDGE7H - Dragon's Lair 3D
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GDGP78.ini b/Data/Sys/GameSettings/GDGP78.ini
deleted file mode 100644
index 28bcdb31cf..0000000000
--- a/Data/Sys/GameSettings/GDGP78.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GDGP78 - Dragon's Lair 3D
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GDI.ini b/Data/Sys/GameSettings/GDI.ini
new file mode 100644
index 0000000000..f89c2059b3
--- /dev/null
+++ b/Data/Sys/GameSettings/GDI.ini
@@ -0,0 +1,19 @@
+# GDIE7D, GDIP7D - Die Hard Vendetta
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDIE7D.ini b/Data/Sys/GameSettings/GDIE7D.ini
deleted file mode 100644
index ec7059a0bd..0000000000
--- a/Data/Sys/GameSettings/GDIE7D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GDIE7D - Die Hard Vendetta
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GDIP7D.ini b/Data/Sys/GameSettings/GDIP7D.ini
deleted file mode 100644
index 8bf3c76095..0000000000
--- a/Data/Sys/GameSettings/GDIP7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDIP7D - Die Hard Vendetta
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDJ.ini b/Data/Sys/GameSettings/GDJ.ini
new file mode 100644
index 0000000000..ab4146c3e7
--- /dev/null
+++ b/Data/Sys/GameSettings/GDJ.ini
@@ -0,0 +1,22 @@
+# GDJEB2 - Digimon World 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Screen Blinking unless you enable use real efb
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GDJEB2.ini b/Data/Sys/GameSettings/GDJEB2.ini
index b150d9eaea..cabff1a102 100644
--- a/Data/Sys/GameSettings/GDJEB2.ini
+++ b/Data/Sys/GameSettings/GDJEB2.ini
@@ -1,13 +1,5 @@
 # GDJEB2 - Digimon World 4
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Screen Blinking unless you enable use real efb
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -23,7 +15,3 @@ $Buy Something For Infinite Money
 0439777C 800D0044
 043A365C 800D0044
 04564F44 000F423F
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GDK.ini b/Data/Sys/GameSettings/GDK.ini
new file mode 100644
index 0000000000..7f4eaf83f3
--- /dev/null
+++ b/Data/Sys/GameSettings/GDK.ini
@@ -0,0 +1,22 @@
+# GDKEA4, GDKJA4, GDKEA4 - Disney Sports: Soccer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+# This game does not work properly with large memorycards, use a 251 block card
+# see http://www.nintendo.com/consumer/memorycard1019.jsp
+MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Need Projection Before R945
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDKEA4.ini b/Data/Sys/GameSettings/GDKEA4.ini
deleted file mode 100644
index 0302e8b8c3..0000000000
--- a/Data/Sys/GameSettings/GDKEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDKEA4 - Disney Sports: Soccer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDL.ini b/Data/Sys/GameSettings/GDL.ini
new file mode 100644
index 0000000000..24e63fff12
--- /dev/null
+++ b/Data/Sys/GameSettings/GDL.ini
@@ -0,0 +1,19 @@
+# GDLEA4 - Disney Sports: Basketball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDLEA4.ini b/Data/Sys/GameSettings/GDLEA4.ini
deleted file mode 100644
index a3fe01811c..0000000000
--- a/Data/Sys/GameSettings/GDLEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDLEA4 - Disney Sports: Basketball
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDM.ini b/Data/Sys/GameSettings/GDM.ini
new file mode 100644
index 0000000000..5445559bd5
--- /dev/null
+++ b/Data/Sys/GameSettings/GDM.ini
@@ -0,0 +1,21 @@
+# GDME01, GDMJ01, GDMP01 - Disney's Magical Mirror starring Mickey Mouse
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+BBoxEnable = True
diff --git a/Data/Sys/GameSettings/GDME01.ini b/Data/Sys/GameSettings/GDME01.ini
deleted file mode 100644
index df46e9ea4c..0000000000
--- a/Data/Sys/GameSettings/GDME01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDME01 - Disney's Magical Mirror starring Mickey Mouse
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDQ.ini b/Data/Sys/GameSettings/GDQ.ini
new file mode 100644
index 0000000000..d1ce015b48
--- /dev/null
+++ b/Data/Sys/GameSettings/GDQ.ini
@@ -0,0 +1,21 @@
+# GDQE6S, GDQP6S - Darkened Skye
+
+[Core]
+# Values set here will override the main Dolphin settings.
+# This game does not work properly with large memorycards, use a 251 block card
+# see http://www.nintendo.com/consumer/memorycard1019.jsp
+MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDQP6S.ini b/Data/Sys/GameSettings/GDQP6S.ini
deleted file mode 100644
index d406e1deee..0000000000
--- a/Data/Sys/GameSettings/GDQP6S.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GDQP6S - Darkened Skye
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDR.ini b/Data/Sys/GameSettings/GDR.ini
new file mode 100644
index 0000000000..179406fa54
--- /dev/null
+++ b/Data/Sys/GameSettings/GDR.ini
@@ -0,0 +1,19 @@
+# GDREAF - DEAD TO RIGHTS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDREAF.ini b/Data/Sys/GameSettings/GDREAF.ini
deleted file mode 100644
index d2ae0c6804..0000000000
--- a/Data/Sys/GameSettings/GDREAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDREAF - DEAD TO RIGHTS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDS.ini b/Data/Sys/GameSettings/GDS.ini
new file mode 100644
index 0000000000..3143c1e6e5
--- /dev/null
+++ b/Data/Sys/GameSettings/GDS.ini
@@ -0,0 +1,31 @@
+# GDSE78, GDSP78 - Dark Summit
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GDSE78.ini b/Data/Sys/GameSettings/GDSE78.ini
deleted file mode 100644
index d9428bf5d5..0000000000
--- a/Data/Sys/GameSettings/GDSE78.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GDSE78 - Dark Summit
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GDSP78.ini b/Data/Sys/GameSettings/GDSP78.ini
deleted file mode 100644
index b71f598b90..0000000000
--- a/Data/Sys/GameSettings/GDSP78.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GDSP78 - Dark Summit
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GDT.ini b/Data/Sys/GameSettings/GDT.ini
new file mode 100644
index 0000000000..53139ac043
--- /dev/null
+++ b/Data/Sys/GameSettings/GDT.ini
@@ -0,0 +1,22 @@
+# GDTE69, GDTP69 - Def Jam VENDETTA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GDTE69.ini b/Data/Sys/GameSettings/GDTE69.ini
index 0d6bb107f1..1d50912e1c 100644
--- a/Data/Sys/GameSettings/GDTE69.ini
+++ b/Data/Sys/GameSettings/GDTE69.ini
@@ -1,13 +1,5 @@
 # GDTE69 - Def Jam VENDETTA
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -245,4 +237,3 @@ $PROOF - Max Charisma
 041B4298 00000008
 $SPIDER - Max Power
 041B42DC 00000011
-
diff --git a/Data/Sys/GameSettings/GDV.ini b/Data/Sys/GameSettings/GDV.ini
new file mode 100644
index 0000000000..e98fe13c2e
--- /dev/null
+++ b/Data/Sys/GameSettings/GDV.ini
@@ -0,0 +1,20 @@
+# GDVE6L, GDVP6L - Driven
+
+[Core]
+# Values set here will override the main Dolphin settings.
+UseDualCore = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Grapics Glitches
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDVE6L.ini b/Data/Sys/GameSettings/GDVE6L.ini
deleted file mode 100644
index 292392d5a2..0000000000
--- a/Data/Sys/GameSettings/GDVE6L.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDVE6L - Driven
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Can crash
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDVP6L.ini b/Data/Sys/GameSettings/GDVP6L.ini
deleted file mode 100644
index ca75f8c5a3..0000000000
--- a/Data/Sys/GameSettings/GDVP6L.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GDVP6L - Driven
-
-[Core]
-# Values set here will override the main dolphin settings.
-UseDualCore = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Grapics Glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDW.ini b/Data/Sys/GameSettings/GDW.ini
new file mode 100644
index 0000000000..a6e7cfd6d6
--- /dev/null
+++ b/Data/Sys/GameSettings/GDW.ini
@@ -0,0 +1,19 @@
+# GDWEA4 - Disney Sports: Football
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Need Projetion Before R945
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GDWEA4.ini b/Data/Sys/GameSettings/GDWEA4.ini
deleted file mode 100644
index 4c0e7059d6..0000000000
--- a/Data/Sys/GameSettings/GDWEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GDWEA4 - Disney Sports: Football
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projetion Before R945
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GDX.ini b/Data/Sys/GameSettings/GDX.ini
new file mode 100644
index 0000000000..cfa4b12e8d
--- /dev/null
+++ b/Data/Sys/GameSettings/GDX.ini
@@ -0,0 +1,10 @@
+# GDXEA4, GDXJA4, GDXPA4 - Disney Sports Skateboarding
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues = This game does not work properly with large memorycards, use a 251 block card. See http://www.nintendo.com/consumer/memorycard1019.jsp
diff --git a/Data/Sys/GameSettings/GE3.ini b/Data/Sys/GameSettings/GE3.ini
new file mode 100644
index 0000000000..489785ee58
--- /dev/null
+++ b/Data/Sys/GameSettings/GE3.ini
@@ -0,0 +1,31 @@
+# GE3E5D - Midway Arcade Treasures 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GE4.ini b/Data/Sys/GameSettings/GE4.ini
new file mode 100644
index 0000000000..1a9eb68393
--- /dev/null
+++ b/Data/Sys/GameSettings/GE4.ini
@@ -0,0 +1,22 @@
+# GE4E7D - 4x4 Evolution 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+
+
diff --git a/Data/Sys/GameSettings/GE4E7D.ini b/Data/Sys/GameSettings/GE4E7D.ini
deleted file mode 100644
index d4e98d6d9f..0000000000
--- a/Data/Sys/GameSettings/GE4E7D.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GE4E7D - 4x4 Evolution 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GE5.ini b/Data/Sys/GameSettings/GE5.ini
new file mode 100644
index 0000000000..0777586fdb
--- /dev/null
+++ b/Data/Sys/GameSettings/GE5.ini
@@ -0,0 +1,22 @@
+# GE5EA4 - TMNT:Mutant Melee
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GE5EA4.ini b/Data/Sys/GameSettings/GE5EA4.ini
index 56e0f2778d..0dfee05162 100644
--- a/Data/Sys/GameSettings/GE5EA4.ini
+++ b/Data/Sys/GameSettings/GE5EA4.ini
@@ -1,13 +1,5 @@
 # GE5EA4 - TMNT:Mutant Melee
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -31,4 +23,3 @@ $All Melee Levels Unlocked
 02280D2C 00100000
 $Library Complete
 02280BE8 0021FFFF
-
diff --git a/Data/Sys/GameSettings/GE9.ini b/Data/Sys/GameSettings/GE9.ini
new file mode 100644
index 0000000000..db6f4fab33
--- /dev/null
+++ b/Data/Sys/GameSettings/GE9.ini
@@ -0,0 +1,22 @@
+# GE9E5D - Ed, Edd n Eddy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GE9E5D.ini b/Data/Sys/GameSettings/GE9E5D.ini
deleted file mode 100644
index 82a11b476d..0000000000
--- a/Data/Sys/GameSettings/GE9E5D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GE9E5D - Ed, Edd n Eddy
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GEA.ini b/Data/Sys/GameSettings/GEA.ini
new file mode 100644
index 0000000000..da76be067e
--- /dev/null
+++ b/Data/Sys/GameSettings/GEA.ini
@@ -0,0 +1,33 @@
+# GEAE8P, GEAP8P - Skies of Arcadia Legends
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GEAE8P.ini b/Data/Sys/GameSettings/GEAE8P.ini
deleted file mode 100644
index d8dc51fb1a..0000000000
--- a/Data/Sys/GameSettings/GEAE8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GEAE8P - Skies of Arcadia Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Gfx glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 1.99998
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GEAP8P.ini b/Data/Sys/GameSettings/GEAP8P.ini
deleted file mode 100644
index cb8347ffd4..0000000000
--- a/Data/Sys/GameSettings/GEAP8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GEAP8P - Skies of Arcadia Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Gfx glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 1.99998
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GEB.ini b/Data/Sys/GameSettings/GEB.ini
new file mode 100644
index 0000000000..9b20bc39fb
--- /dev/null
+++ b/Data/Sys/GameSettings/GEB.ini
@@ -0,0 +1,19 @@
+# GEBEA4 - EVOLUTION SNOWBOARDING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GEBEA4.ini b/Data/Sys/GameSettings/GEBEA4.ini
deleted file mode 100644
index 2132126957..0000000000
--- a/Data/Sys/GameSettings/GEBEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GEBEA4 - EVOLUTION SNOWBOARDING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GED.ini b/Data/Sys/GameSettings/GED.ini
new file mode 100644
index 0000000000..cd0b7ff757
--- /dev/null
+++ b/Data/Sys/GameSettings/GED.ini
@@ -0,0 +1,30 @@
+# GEDE01, GEDP01 - Eternal Darkness
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GEDE01.ini b/Data/Sys/GameSettings/GEDE01.ini
deleted file mode 100644
index a5282053cd..0000000000
--- a/Data/Sys/GameSettings/GEDE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEDE01 - Eternal Darkness
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 5
-PH_ZFar = 0.15
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEDP01.ini b/Data/Sys/GameSettings/GEDP01.ini
deleted file mode 100644
index caad9d1df8..0000000000
--- a/Data/Sys/GameSettings/GEDP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEDP01 - Eternal Darkness
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 5
-PH_ZFar = 0.15
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEM.ini b/Data/Sys/GameSettings/GEM.ini
new file mode 100644
index 0000000000..d139c2d2ec
--- /dev/null
+++ b/Data/Sys/GameSettings/GEM.ini
@@ -0,0 +1,19 @@
+# GEME7F - Egg Mania
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GEME7F.ini b/Data/Sys/GameSettings/GEME7F.ini
deleted file mode 100644
index c082463de6..0000000000
--- a/Data/Sys/GameSettings/GEME7F.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GEME7F - Egg Mania
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GEN.ini b/Data/Sys/GameSettings/GEN.ini
new file mode 100644
index 0000000000..489e2467b4
--- /dev/null
+++ b/Data/Sys/GameSettings/GEN.ini
@@ -0,0 +1,30 @@
+# GEND69, GENE69, GENP69, GENS69 - 007: Everything or Nothing
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GEND69.ini b/Data/Sys/GameSettings/GEND69.ini
deleted file mode 100644
index dd139b7bb6..0000000000
--- a/Data/Sys/GameSettings/GEND69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GEND69 - 007: Everything or Nothing
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENE69.ini b/Data/Sys/GameSettings/GENE69.ini
deleted file mode 100644
index e48c83d296..0000000000
--- a/Data/Sys/GameSettings/GENE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GENE69 - 007: Everything or Nothing
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENP69.ini b/Data/Sys/GameSettings/GENP69.ini
deleted file mode 100644
index 6e920419f9..0000000000
--- a/Data/Sys/GameSettings/GENP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GENP69 - 007: Everything or Nothing
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GENS69.ini b/Data/Sys/GameSettings/GENS69.ini
deleted file mode 100644
index ef548ccd26..0000000000
--- a/Data/Sys/GameSettings/GENS69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GENS69 - 007: Everything or Nothing
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEO.ini b/Data/Sys/GameSettings/GEO.ini
new file mode 100644
index 0000000000..282f543244
--- /dev/null
+++ b/Data/Sys/GameSettings/GEO.ini
@@ -0,0 +1,32 @@
+# GEOE08, GEOP08 - CAPCOM VS. SNK 2  EO
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
+EFBScale = -1
diff --git a/Data/Sys/GameSettings/GEOE08.ini b/Data/Sys/GameSettings/GEOE08.ini
deleted file mode 100644
index a34035caf9..0000000000
--- a/Data/Sys/GameSettings/GEOE08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GEOE08 - CAPCOM VS. SNK 2  EO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = GFX glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 512
-EFBScale = 0
-
diff --git a/Data/Sys/GameSettings/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini
deleted file mode 100644
index 00a1a50089..0000000000
--- a/Data/Sys/GameSettings/GEOP08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GEOP08 - CAPCOM VS. SNK 2  EO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = GFX glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 512
-EFBScale = 0
-
diff --git a/Data/Sys/GameSettings/GES.ini b/Data/Sys/GameSettings/GES.ini
new file mode 100644
index 0000000000..c8c852b57e
--- /dev/null
+++ b/Data/Sys/GameSettings/GES.ini
@@ -0,0 +1,19 @@
+# GESEA4 - Evolution Skateboarding
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Can't past konami logo
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GESEA4.ini b/Data/Sys/GameSettings/GESEA4.ini
deleted file mode 100644
index c3b9037d7e..0000000000
--- a/Data/Sys/GameSettings/GESEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GESEA4 - Evolution Skateboarding
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Can't past konami logo
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GEW.ini b/Data/Sys/GameSettings/GEW.ini
new file mode 100644
index 0000000000..4a9064ea8d
--- /dev/null
+++ b/Data/Sys/GameSettings/GEW.ini
@@ -0,0 +1,19 @@
+# GEWE41 - EVOLUTION WORLDS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GEWE41.ini b/Data/Sys/GameSettings/GEWE41.ini
deleted file mode 100644
index 3ef729bc21..0000000000
--- a/Data/Sys/GameSettings/GEWE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GEWE41 - EVOLUTION WORLDS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GEX.ini b/Data/Sys/GameSettings/GEX.ini
new file mode 100644
index 0000000000..84f47a2137
--- /dev/null
+++ b/Data/Sys/GameSettings/GEX.ini
@@ -0,0 +1,19 @@
+# GEXE52 - Disney's Extreme Skate Adventure
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GEXE52.ini b/Data/Sys/GameSettings/GEXE52.ini
deleted file mode 100644
index ba554969a8..0000000000
--- a/Data/Sys/GameSettings/GEXE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GEXE52 - Disney's Extreme Skate Adventure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GEY.ini b/Data/Sys/GameSettings/GEY.ini
new file mode 100644
index 0000000000..cb949a3e48
--- /dev/null
+++ b/Data/Sys/GameSettings/GEY.ini
@@ -0,0 +1,27 @@
+# GEYE69 - EA SPORTS(TM) Fight Night Round 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GEYE69.ini b/Data/Sys/GameSettings/GEYE69.ini
deleted file mode 100644
index bdab7a8e95..0000000000
--- a/Data/Sys/GameSettings/GEYE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GEYE69 - EA SPORTS(TM) Fight Night Round 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GEZ.ini b/Data/Sys/GameSettings/GEZ.ini
new file mode 100644
index 0000000000..cbe0e7ccb0
--- /dev/null
+++ b/Data/Sys/GameSettings/GEZ.ini
@@ -0,0 +1,30 @@
+# GEZE8P, GEZP8P - BillyHatcher
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GEZE8P.ini b/Data/Sys/GameSettings/GEZE8P.ini
deleted file mode 100644
index dd4a2cacfd..0000000000
--- a/Data/Sys/GameSettings/GEZE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEZE8P - BillyHatcher
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GEZP8P.ini b/Data/Sys/GameSettings/GEZP8P.ini
deleted file mode 100644
index 579f691298..0000000000
--- a/Data/Sys/GameSettings/GEZP8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GEZP8P - BillyHatcher
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GF2.ini b/Data/Sys/GameSettings/GF2.ini
new file mode 100644
index 0000000000..ebeb728a1f
--- /dev/null
+++ b/Data/Sys/GameSettings/GF2.ini
@@ -0,0 +1,19 @@
+# GF2E69 - EA F12002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GF2E69.ini b/Data/Sys/GameSettings/GF2E69.ini
deleted file mode 100644
index 619816dc6b..0000000000
--- a/Data/Sys/GameSettings/GF2E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GF2E69 - EA F12002
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GF4.ini b/Data/Sys/GameSettings/GF4.ini
new file mode 100644
index 0000000000..86e93e0647
--- /dev/null
+++ b/Data/Sys/GameSettings/GF4.ini
@@ -0,0 +1,31 @@
+# GF4E52, GF4F52, GF4P52 - Fantastic Four
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GF4E52.ini b/Data/Sys/GameSettings/GF4E52.ini
deleted file mode 100644
index 551b8680cd..0000000000
--- a/Data/Sys/GameSettings/GF4E52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GF4E52 - Fantastic Four
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GF4F52.ini b/Data/Sys/GameSettings/GF4F52.ini
deleted file mode 100644
index 99bd791d0c..0000000000
--- a/Data/Sys/GameSettings/GF4F52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GF4F52 - Fantastic Four
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GF4P52.ini b/Data/Sys/GameSettings/GF4P52.ini
deleted file mode 100644
index 3a5e17d7bc..0000000000
--- a/Data/Sys/GameSettings/GF4P52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GF4P52 - Fantastic Four
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GF5.ini b/Data/Sys/GameSettings/GF5.ini
new file mode 100644
index 0000000000..308d03a27f
--- /dev/null
+++ b/Data/Sys/GameSettings/GF5.ini
@@ -0,0 +1,27 @@
+# GF5E69 - FIFA Soccer 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GF5E69.ini b/Data/Sys/GameSettings/GF5E69.ini
deleted file mode 100644
index e99d7090cd..0000000000
--- a/Data/Sys/GameSettings/GF5E69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GF5E69 - FIFA Soccer 2005
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GF6.ini b/Data/Sys/GameSettings/GF6.ini
new file mode 100644
index 0000000000..e2c9997e23
--- /dev/null
+++ b/Data/Sys/GameSettings/GF6.ini
@@ -0,0 +1,27 @@
+# GF6E69, GF6F69 - FIFA 06
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GF6E69.ini b/Data/Sys/GameSettings/GF6E69.ini
deleted file mode 100644
index dd10e80d67..0000000000
--- a/Data/Sys/GameSettings/GF6E69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GF6E69 - FIFA 06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GF6F69.ini b/Data/Sys/GameSettings/GF6F69.ini
deleted file mode 100644
index bdce28bba3..0000000000
--- a/Data/Sys/GameSettings/GF6F69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GF6F69 - FIFA 06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GF7.ini b/Data/Sys/GameSettings/GF7.ini
new file mode 100644
index 0000000000..5d7ab14aea
--- /dev/null
+++ b/Data/Sys/GameSettings/GF7.ini
@@ -0,0 +1,36 @@
+# GF7E01, GF7P01 - STARFOX ASSAULT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GF7E01.ini b/Data/Sys/GameSettings/GF7E01.ini
index b2cb1b820c..2444d2dc98 100644
--- a/Data/Sys/GameSettings/GF7E01.ini
+++ b/Data/Sys/GameSettings/GF7E01.ini
@@ -1,13 +1,5 @@
 # GF7E01 - STARFOX ASSAULT
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -77,21 +69,3 @@ $All Multiplayer Maps
 0229E518 00000101
 $Unlock Lots of Stuff In VS Mode By Completing A Match
 0429E538 0000FFFF
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GF7P01.ini b/Data/Sys/GameSettings/GF7P01.ini
index edf4831056..c892821c7c 100644
--- a/Data/Sys/GameSettings/GF7P01.ini
+++ b/Data/Sys/GameSettings/GF7P01.ini
@@ -1,13 +1,5 @@
 # GF7P01 - STARFOX ASSAULT
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -73,21 +65,3 @@ $Unlock Star Wolf
 $Bonus: Unlock Xevious
 06A0E45C 18000000
 002B88E6 00000001
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GF8.ini b/Data/Sys/GameSettings/GF8.ini
new file mode 100644
index 0000000000..a26d1ad035
--- /dev/null
+++ b/Data/Sys/GameSettings/GF8.ini
@@ -0,0 +1,27 @@
+# GF8E69, GF8P69 - FIFA Street
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GF8E69.ini b/Data/Sys/GameSettings/GF8E69.ini
index 210015e19e..0fb8d150a1 100644
--- a/Data/Sys/GameSettings/GF8E69.ini
+++ b/Data/Sys/GameSettings/GF8E69.ini
@@ -1,14 +1,5 @@
 # GF8E69 - FIFA Street
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = The videos are messed up, skip them.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -47,12 +38,3 @@ $Away Team Starts With 10
 00416F8C 0000000A
 $Away Team Never Scores
 00416F8C 00000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GF8P69.ini b/Data/Sys/GameSettings/GF8P69.ini
deleted file mode 100644
index f2e61d3ea6..0000000000
--- a/Data/Sys/GameSettings/GF8P69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GF8P69 - FIFA Street
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = The videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GFA.ini b/Data/Sys/GameSettings/GFA.ini
new file mode 100644
index 0000000000..f81b7852a1
--- /dev/null
+++ b/Data/Sys/GameSettings/GFA.ini
@@ -0,0 +1,27 @@
+# GFAD69, GFAE69, GFAP69, GFAS69 - FIFA 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GFAD69.ini b/Data/Sys/GameSettings/GFAD69.ini
deleted file mode 100644
index 396ee6bc0d..0000000000
--- a/Data/Sys/GameSettings/GFAD69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GFAD69 - FIFA 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GFAE69.ini b/Data/Sys/GameSettings/GFAE69.ini
deleted file mode 100644
index 3142b1173a..0000000000
--- a/Data/Sys/GameSettings/GFAE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GFAE69 - FIFA 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GFAP69.ini b/Data/Sys/GameSettings/GFAP69.ini
deleted file mode 100644
index 0be09b3dbb..0000000000
--- a/Data/Sys/GameSettings/GFAP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GFAP69 - FIFA 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GFAS69.ini b/Data/Sys/GameSettings/GFAS69.ini
deleted file mode 100644
index bfcfa85ce5..0000000000
--- a/Data/Sys/GameSettings/GFAS69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GFAS69 - FIFA 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GFB.ini b/Data/Sys/GameSettings/GFB.ini
new file mode 100644
index 0000000000..89c572bf60
--- /dev/null
+++ b/Data/Sys/GameSettings/GFB.ini
@@ -0,0 +1,22 @@
+# GFBE5D - FireBlade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = True
+
diff --git a/Data/Sys/GameSettings/GFBE5D.ini b/Data/Sys/GameSettings/GFBE5D.ini
deleted file mode 100644
index 75d267246f..0000000000
--- a/Data/Sys/GameSettings/GFBE5D.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GFBE5D - FireBlade
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = True
-
diff --git a/Data/Sys/GameSettings/GFC.ini b/Data/Sys/GameSettings/GFC.ini
new file mode 100644
index 0000000000..f9d74b0618
--- /dev/null
+++ b/Data/Sys/GameSettings/GFC.ini
@@ -0,0 +1,19 @@
+# GFCP69 - F1 Career Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = A bit Slow and crash randomly
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFCP69.ini b/Data/Sys/GameSettings/GFCP69.ini
deleted file mode 100644
index 054a6068f4..0000000000
--- a/Data/Sys/GameSettings/GFCP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GFCP69 - F1 Career Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = A bit Slow and crash randomly
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFD.ini b/Data/Sys/GameSettings/GFD.ini
new file mode 100644
index 0000000000..2a699dee57
--- /dev/null
+++ b/Data/Sys/GameSettings/GFD.ini
@@ -0,0 +1,31 @@
+# GFDD69, GFDE69 - Freedom Fighters
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GFDD69.ini b/Data/Sys/GameSettings/GFDD69.ini
deleted file mode 100644
index d1ef0be94a..0000000000
--- a/Data/Sys/GameSettings/GFDD69.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GFDD69 - Freedom Fighters
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GFDE69.ini b/Data/Sys/GameSettings/GFDE69.ini
deleted file mode 100644
index 720b43b522..0000000000
--- a/Data/Sys/GameSettings/GFDE69.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GFDE69 - Freedom Fighters
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GFE.ini b/Data/Sys/GameSettings/GFE.ini
new file mode 100644
index 0000000000..c1c4ed04da
--- /dev/null
+++ b/Data/Sys/GameSettings/GFE.ini
@@ -0,0 +1,20 @@
+# GFEE01, GFEJ01, GFEP01 - FIRE EMBLEM GC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+
diff --git a/Data/Sys/GameSettings/GFEE01.ini b/Data/Sys/GameSettings/GFEE01.ini
index 3a42b7af5d..46947325b3 100644
--- a/Data/Sys/GameSettings/GFEE01.ini
+++ b/Data/Sys/GameSettings/GFEE01.ini
@@ -1,12 +1,4 @@
-# GFEE01 - FIRE EMBLEM GC US
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+# GFEE01 - Fire Emblem: Path of Radiance GC US
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,6 +8,8 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
+$Infinite Money
+04330720 0098967F
 $Max/Infinite Health(IKE)
 002B168C 00000028
 002B168F 00000015
@@ -37,10 +31,27 @@ $Max Resistance(IKE)
 002B1696 00000014
 $Max Movement(IKE)
 002B168E 00000014
-
-[Video]
-ProjectionHack = 0
+$Max/Infinite Health(TATANIA)
+002B1E0C 0000003C
+002B1E0F 0000001B
+$Quick Level Up(TATANIA)
+002B1DFF 00000063
+$Max Strength(TATANIA)
+002B1E10 00000063
+$Max Magic(TATANIA)
+002B1E11 00000063
+$Max Skill(TATANIA)
+002B1E12 00000063
+$Max Speed(TATANIA)
+002B1E13 00000063
+$Max Luck(TATANIA)
+002B1E14 00000063
+$Max Defense(TATANIA)
+002B1E15 00000063
+$Max Resistance(TATANIA)
+002B1E16 00000063
+$Max Movement(TATANIA)
+002B1E0E 00000063
 
 [Speedhacks]
 0x8020a51c=500
-
diff --git a/Data/Sys/GameSettings/GFEJ01.ini b/Data/Sys/GameSettings/GFEJ01.ini
index d8dec58b5e..2cb001a685 100644
--- a/Data/Sys/GameSettings/GFEJ01.ini
+++ b/Data/Sys/GameSettings/GFEJ01.ini
@@ -1,12 +1,4 @@
-# GFEJ01 - FIRE EMBLEM GC JAP
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+# GFEJ01 - Fire Emblem: Souen no Kiseki GC JAP
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,7 +8,90 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
+$Bonus EXP 9999
+0232E7A6 0000270F
+$Gold held 99999999G
+0432E7A0 05F5E0FF
+$skills can be equipped with no capacity limit
+0410345C 38600000
+$Infinite action
+04028084 60000000
+$Infinite weapons training
+0032E7D9 00000000
+$Infinite Usage of items
+0401BCD0 38000032
+$All the item largest use several 50 time conversions.
+00000000 80932F88
+00000032 00BB0048
+$In Landing Ship Division item all the 187 types
+00000000 8231E16C
+00008093 00BB0004
+00000000 8231E16E
+00002F70 48BB0004
+00000000 8231E170
+00003200 00BB0004
+$=========Scenario change==========
+00003200 00BB0004
+$Prologue: Mercenaries
+0032E798 00000001
+$Chapter 1: The Battle Begins
+0032E798 00000002
+$Chapter 2: Rescue
+0032E798 00000003
+$Chapter 3: Pirates Aground
+0032E798 00000004
+$Chapter 4: Roadside Battle
+0032E798 00000005
+$Chapter 5: Flight!
+0032E798 00000006
+$Chapter 6: A Brief Diversion
+0032E798 00000007
+$Chapter 7: Shades of Evil
+0032E798 00000008
+$Chapter 8: Despair and Hope
+0032E798 00000009
+$Chapter 9: Gallia
+0032E798 0000000A
+$Chapter 10: Prisoner Release
+0032E798 0000000B
+$Chapter 11: Blood Runs Red
+0032E798 0000000C
+$Chapter 12: A Strange Land
+0032E798 0000000D 
+$Chapter 13: A Guiding Wind
+0032E798 0000000E
+$Chapter 14: Training
+0032E798 0000000F
+$Chapter 15: The Feral Frontier
+0032E798 00000010
+$Chapter 16: The Atonement
+0032E798 00000011
+$Chapter 17: Day Breaks
+0032E798 00000012
+$Chapter 18: Crimea Marches
+0032E798 00000013
+$Chapter 19: Entrusted
+0032E798 00000014
+$Chapter 20: Defending Talrega
+0032E798 00000015
+$Chapter 21: Without a King
+0032E798 00000016
+$Chapter 22: Solo
+0032E798 00000017
+$Chapter 23: The Great Bridge
+0032E798 00000018
+$Chapter 24: Battle Reunion
+0032E798 00000019
+$Chapter 25: Strange Lands
+0032E798 0000001A
+$Chapter 26: Clash!
+0032E798 0000001B
+$Chapter 27: Moment of Fate
+0032E798 0000001C
+$Chapter 28: Twisted Tower
+0032E798 0000001E
+$Endgame: Repatriation
+0032E798 0000001F
 
 [Speedhacks]
 0x80204ce8=500
-
diff --git a/Data/Sys/GameSettings/GFEP01.ini b/Data/Sys/GameSettings/GFEP01.ini
deleted file mode 100644
index 77a8de00d0..0000000000
--- a/Data/Sys/GameSettings/GFEP01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GFEE01 - FIRE EMBLEM GC EU
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Speedhacks]
-0x80213278=500
-
diff --git a/Data/Sys/GameSettings/GFF.ini b/Data/Sys/GameSettings/GFF.ini
new file mode 100644
index 0000000000..35ab188bfd
--- /dev/null
+++ b/Data/Sys/GameSettings/GFF.ini
@@ -0,0 +1,31 @@
+# GFFE5D - Freaky Flyers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GFFE5D.ini b/Data/Sys/GameSettings/GFFE5D.ini
deleted file mode 100644
index 7558326aa6..0000000000
--- a/Data/Sys/GameSettings/GFFE5D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GFFE5D - Freaky Flyers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up (r7422)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GFG.ini b/Data/Sys/GameSettings/GFG.ini
new file mode 100644
index 0000000000..0f8a20c08d
--- /dev/null
+++ b/Data/Sys/GameSettings/GFG.ini
@@ -0,0 +1,26 @@
+# GFGEA4, GFGPA4 - Frogger Beyond
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GFGEA4.ini b/Data/Sys/GameSettings/GFGEA4.ini
deleted file mode 100644
index 6563b22652..0000000000
--- a/Data/Sys/GameSettings/GFGEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GFGEA4 - Frogger Beyond
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some GFX glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFH.ini b/Data/Sys/GameSettings/GFH.ini
new file mode 100644
index 0000000000..ca4c46f4da
--- /dev/null
+++ b/Data/Sys/GameSettings/GFH.ini
@@ -0,0 +1,23 @@
+# GFHP6V - Neighbours From Hell
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GFHP6V.ini b/Data/Sys/GameSettings/GFHP6V.ini
deleted file mode 100644
index 2658c253e0..0000000000
--- a/Data/Sys/GameSettings/GFHP6V.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GFHP6V - Neighbours From Hell
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GFK.ini b/Data/Sys/GameSettings/GFK.ini
new file mode 100644
index 0000000000..fd3acebd15
--- /dev/null
+++ b/Data/Sys/GameSettings/GFK.ini
@@ -0,0 +1,19 @@
+# GFKE69 - Freekstyle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFKE69.ini b/Data/Sys/GameSettings/GFKE69.ini
deleted file mode 100644
index 09ab7ab49d..0000000000
--- a/Data/Sys/GameSettings/GFKE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GFKE69 - Freekstyle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFO.ini b/Data/Sys/GameSettings/GFO.ini
new file mode 100644
index 0000000000..a079bdc637
--- /dev/null
+++ b/Data/Sys/GameSettings/GFO.ini
@@ -0,0 +1,24 @@
+# GFOE78 - The Fairly OddParents: Shadow Showdown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GFP.ini b/Data/Sys/GameSettings/GFP.ini
new file mode 100644
index 0000000000..b926dc8d1a
--- /dev/null
+++ b/Data/Sys/GameSettings/GFP.ini
@@ -0,0 +1,19 @@
+# GFPEA4 - Frogger Ancient Shadow
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Some overlay bug in textures
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFPEA4.ini b/Data/Sys/GameSettings/GFPEA4.ini
deleted file mode 100644
index 3414c1fb4b..0000000000
--- a/Data/Sys/GameSettings/GFPEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GFPEA4 - Frogger Ancient Shadow
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some overlay bug in textures
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFQ.ini b/Data/Sys/GameSettings/GFQ.ini
new file mode 100644
index 0000000000..b3cf331ffb
--- /dev/null
+++ b/Data/Sys/GameSettings/GFQ.ini
@@ -0,0 +1,19 @@
+# GFQEA4 - Frogger's Adventures The Rescue
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFQEA4.ini b/Data/Sys/GameSettings/GFQEA4.ini
deleted file mode 100644
index a1afa9ade1..0000000000
--- a/Data/Sys/GameSettings/GFQEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GFQEA4 - Frogger's Adventures The Rescue
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFT.ini b/Data/Sys/GameSettings/GFT.ini
new file mode 100644
index 0000000000..176b38fc58
--- /dev/null
+++ b/Data/Sys/GameSettings/GFT.ini
@@ -0,0 +1,21 @@
+# GFTE01, GFTP01 - Mario Golf Toadstool Tour
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
diff --git a/Data/Sys/GameSettings/GFTE01.ini b/Data/Sys/GameSettings/GFTE01.ini
deleted file mode 100644
index f712b0e9d1..0000000000
--- a/Data/Sys/GameSettings/GFTE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GFTE01 - MarioGolf Toadstool Tour
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GFTP01.ini b/Data/Sys/GameSettings/GFTP01.ini
deleted file mode 100644
index ab864bbc51..0000000000
--- a/Data/Sys/GameSettings/GFTP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GFTP01 - MarioGolf Toadstool Tour
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Graphical glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GFU.ini b/Data/Sys/GameSettings/GFU.ini
new file mode 100644
index 0000000000..8270fb75a2
--- /dev/null
+++ b/Data/Sys/GameSettings/GFU.ini
@@ -0,0 +1,19 @@
+# GFUE4Z, GFUP6V - FutureTactics
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFUE4Z.ini b/Data/Sys/GameSettings/GFUE4Z.ini
deleted file mode 100644
index 1b18a7eb4f..0000000000
--- a/Data/Sys/GameSettings/GFUE4Z.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GFUE4Z - FutureTactics
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Corrupt Graphics"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GFX.ini b/Data/Sys/GameSettings/GFX.ini
new file mode 100644
index 0000000000..078ec28dae
--- /dev/null
+++ b/Data/Sys/GameSettings/GFX.ini
@@ -0,0 +1,18 @@
+# GFXE5D - Freestyle Metal X
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GFY.ini b/Data/Sys/GameSettings/GFY.ini
new file mode 100644
index 0000000000..ef91e0507f
--- /dev/null
+++ b/Data/Sys/GameSettings/GFY.ini
@@ -0,0 +1,25 @@
+# GFYE69, GFYP69 - FIFA Street 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GFYE69.ini b/Data/Sys/GameSettings/GFYE69.ini
index 53e0fd761c..2a883a103f 100644
--- a/Data/Sys/GameSettings/GFYE69.ini
+++ b/Data/Sys/GameSettings/GFYE69.ini
@@ -1,14 +1,5 @@
 # GFYE69 - FIFA Street 2
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -41,15 +32,3 @@ $Away Team Quick Trick Points
 044349E8 000F423F
 $Away Team Low Trick Points
 044349E8 00000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GFYP69.ini b/Data/Sys/GameSettings/GFYP69.ini
deleted file mode 100644
index 4eb254e580..0000000000
--- a/Data/Sys/GameSettings/GFYP69.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GFYP69 - FIFA Street 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GFZ.ini b/Data/Sys/GameSettings/GFZ.ini
new file mode 100644
index 0000000000..2c00255e87
--- /dev/null
+++ b/Data/Sys/GameSettings/GFZ.ini
@@ -0,0 +1,29 @@
+# GFZE01, GFZJ01, GFZP01 - F-Zero GX
+# GFZJ8P - F-Zero AX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Synchronize GPU thread for stability.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/GFZE01.ini b/Data/Sys/GameSettings/GFZE01.ini
index eb92d8aa74..603900eb67 100644
--- a/Data/Sys/GameSettings/GFZE01.ini
+++ b/Data/Sys/GameSettings/GFZE01.ini
@@ -1,14 +1,4 @@
-# GFZE01 - F-ZERO GX (US Version)
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronize GPU thread for stability.
+# GFZE01 - F-Zero GX
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -41,12 +31,3 @@ $All Vehicles Unlocked
 420030C8 0002FFFF
 420030C8 0003FFFF
 840030C8 FFDC6F00
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.7555555
-
diff --git a/Data/Sys/GameSettings/GFZJ01.ini b/Data/Sys/GameSettings/GFZJ01.ini
index eae0416fb7..8a94057d4f 100644
--- a/Data/Sys/GameSettings/GFZJ01.ini
+++ b/Data/Sys/GameSettings/GFZJ01.ini
@@ -1,14 +1,4 @@
-# GFZJ01 - F-ZERO GX
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronize GPU thread for stability.
+# GFZJ01 - F-Zero GX
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -25,12 +15,3 @@ $Make Save Copyable
 04C31104 981C0034
 04C31108 38000000
 04C3110C 4B400410
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.7555555
-
diff --git a/Data/Sys/GameSettings/GFZJ8P.ini b/Data/Sys/GameSettings/GFZJ8P.ini
new file mode 100644
index 0000000000..65334618c9
--- /dev/null
+++ b/Data/Sys/GameSettings/GFZJ8P.ini
@@ -0,0 +1,29 @@
+# GFZJ8P - F-Zero AX
+# Because Triforce games have weird IDs, properties are inherited from GFZ.ini (F-Zero GX)!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/GFZP01.ini b/Data/Sys/GameSettings/GFZP01.ini
index 08ad0e44e6..47197de8d2 100644
--- a/Data/Sys/GameSettings/GFZP01.ini
+++ b/Data/Sys/GameSettings/GFZP01.ini
@@ -1,14 +1,4 @@
-# GFZP01 - F-ZERO GX (PAL)
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronize GPU thread for stability.
+# GFZP01 - F-Zero GX
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -25,12 +15,3 @@ $Make Save Copyable
 04C31104 981C0034
 04C31108 38000000
 04C3110C 4B400410
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.7555555
-
diff --git a/Data/Sys/GameSettings/GG4.ini b/Data/Sys/GameSettings/GG4.ini
new file mode 100644
index 0000000000..0a20ab5aa1
--- /dev/null
+++ b/Data/Sys/GameSettings/GG4.ini
@@ -0,0 +1,19 @@
+# GG4E08, GG4P08 - GOTCHA FORCE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GG4E08.ini b/Data/Sys/GameSettings/GG4E08.ini
deleted file mode 100644
index d0d9fb673d..0000000000
--- a/Data/Sys/GameSettings/GG4E08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GG4E08 - GotchaForceUsa
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GG4P08.ini b/Data/Sys/GameSettings/GG4P08.ini
index 2f421e8659..9a399720f5 100644
--- a/Data/Sys/GameSettings/GG4P08.ini
+++ b/Data/Sys/GameSettings/GG4P08.ini
@@ -1,13 +1,5 @@
 # GG4P08 - GOTCHA FORCE
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -19,4 +11,3 @@ EmulationIssues =
 
 [Speedhacks]
 0x802087c8=200
-
diff --git a/Data/Sys/GameSettings/GG5.ini b/Data/Sys/GameSettings/GG5.ini
new file mode 100644
index 0000000000..1d2bc98be1
--- /dev/null
+++ b/Data/Sys/GameSettings/GG5.ini
@@ -0,0 +1,27 @@
+# GG5E52 - Cabela's(R) BGH 2005 Adv.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GG5E52.ini b/Data/Sys/GameSettings/GG5E52.ini
deleted file mode 100644
index d99aec6f1a..0000000000
--- a/Data/Sys/GameSettings/GG5E52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GG5E52 - Cabela's(R) BGH 2005 Adv.
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GGA.ini b/Data/Sys/GameSettings/GGA.ini
new file mode 100644
index 0000000000..4b1f291726
--- /dev/null
+++ b/Data/Sys/GameSettings/GGA.ini
@@ -0,0 +1,18 @@
+# GGAJB2 - GUNDAM1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GGAJB2.ini b/Data/Sys/GameSettings/GGAJB2.ini
deleted file mode 100644
index ab491d0377..0000000000
--- a/Data/Sys/GameSettings/GGAJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGAJB2 - GUNDAM1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GGC.ini b/Data/Sys/GameSettings/GGC.ini
new file mode 100644
index 0000000000..4998bda03c
--- /dev/null
+++ b/Data/Sys/GameSettings/GGC.ini
@@ -0,0 +1,18 @@
+# GGCE0A - Goblin Commander
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GGCE0A.ini b/Data/Sys/GameSettings/GGCE0A.ini
deleted file mode 100644
index ff4a5dfd01..0000000000
--- a/Data/Sys/GameSettings/GGCE0A.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGCE0A - Goblin Commander
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GGCOSD.ini b/Data/Sys/GameSettings/GGCOSD.ini
index a0dc9be610..4a2da9355f 100644
--- a/Data/Sys/GameSettings/GGCOSD.ini
+++ b/Data/Sys/GameSettings/GGCOSD.ini
@@ -1,7 +1,8 @@
 # GGCOSD - GCOS MultiGame DVD (C) GCOS TEAM
+# Because this title has a weird ID, properties are inherited from GGC.ini (Goblin Commander)!
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GGE.ini b/Data/Sys/GameSettings/GGE.ini
new file mode 100644
index 0000000000..4a8c0ea025
--- /dev/null
+++ b/Data/Sys/GameSettings/GGE.ini
@@ -0,0 +1,34 @@
+# GGEE41, GGEP41, GGEY41 - Beyond Good and Evil
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBAccessEnable = True
+
diff --git a/Data/Sys/GameSettings/GGEE41.ini b/Data/Sys/GameSettings/GGEE41.ini
deleted file mode 100644
index 4f3fe0e90a..0000000000
--- a/Data/Sys/GameSettings/GGEE41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGEE41 - Beyond Good and Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-VSync = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini
deleted file mode 100644
index c00f5cc92a..0000000000
--- a/Data/Sys/GameSettings/GGEP41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGEP41 - Beyond Good and Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-VSync = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini
deleted file mode 100644
index 550c18e832..0000000000
--- a/Data/Sys/GameSettings/GGEY41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGEY41 - Beyond Good and Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-VSync = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GGM.ini b/Data/Sys/GameSettings/GGM.ini
new file mode 100644
index 0000000000..ed2e5a967c
--- /dev/null
+++ b/Data/Sys/GameSettings/GGM.ini
@@ -0,0 +1,18 @@
+# GGME00 - Sega Genesis Mega Drive Emulator
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GGME00.ini b/Data/Sys/GameSettings/GGME00.ini
deleted file mode 100644
index d53875a5e7..0000000000
--- a/Data/Sys/GameSettings/GGME00.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGME00 - Sega Genesis Mega Drive Emulator
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GGN.ini b/Data/Sys/GameSettings/GGN.ini
new file mode 100644
index 0000000000..49e55bb371
--- /dev/null
+++ b/Data/Sys/GameSettings/GGN.ini
@@ -0,0 +1,25 @@
+# GGNE5D - The Grim Adventures of Billy & Mandy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGP.ini b/Data/Sys/GameSettings/GGP.ini
new file mode 100644
index 0000000000..8fb6e806b2
--- /dev/null
+++ b/Data/Sys/GameSettings/GGP.ini
@@ -0,0 +1,18 @@
+# GGPJB2 - SD Gundam Gashapon Wars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GGPE01.ini b/Data/Sys/GameSettings/GGPE01.ini
new file mode 100644
index 0000000000..ae3e71abaa
--- /dev/null
+++ b/Data/Sys/GameSettings/GGPE01.ini
@@ -0,0 +1,25 @@
+# GGPE01 - Mario Kart GP
+# Because Triforce games have weird IDs, properties are inherited from GGP.ini (SD Gundam Gashapon Wars)!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GGPE02.ini b/Data/Sys/GameSettings/GGPE02.ini
new file mode 100644
index 0000000000..6d4cd0b177
--- /dev/null
+++ b/Data/Sys/GameSettings/GGPE02.ini
@@ -0,0 +1,25 @@
+# GGPE02 - Mario Kart GP 2
+# Because Triforce games have weird IDs, properties are inherited from GGP.ini (SD Gundam Gashapon Wars)!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GGPJB2.ini b/Data/Sys/GameSettings/GGPJB2.ini
deleted file mode 100644
index 97e5d77a35..0000000000
--- a/Data/Sys/GameSettings/GGPJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGPJB2 - SD GUNDAM1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GGR.ini b/Data/Sys/GameSettings/GGR.ini
new file mode 100644
index 0000000000..a6c955cea3
--- /dev/null
+++ b/Data/Sys/GameSettings/GGR.ini
@@ -0,0 +1,31 @@
+# GGRE41 - TOM CLANCY'S GHOST RECON
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs Real Xfb to show videos. Graphic glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GGRE41.ini b/Data/Sys/GameSettings/GGRE41.ini
deleted file mode 100644
index 1950d1a29a..0000000000
--- a/Data/Sys/GameSettings/GGRE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GGRE41 - TOM CLANCY'S GHOST RECON
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real Xfb to show videos. Graphic glitches (r6945)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GGS.ini b/Data/Sys/GameSettings/GGS.ini
new file mode 100644
index 0000000000..68f177d3d4
--- /dev/null
+++ b/Data/Sys/GameSettings/GGS.ini
@@ -0,0 +1,30 @@
+# GGSEA4, GGSJA4, GGSPA4 - METAL GEAR SOLID THE TWIN SNAKES
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GGSEA4.ini b/Data/Sys/GameSettings/GGSEA4.ini
index 48284ccdc2..b03e918a4e 100644
--- a/Data/Sys/GameSettings/GGSEA4.ini
+++ b/Data/Sys/GameSettings/GGSEA4.ini
@@ -1,13 +1,4 @@
-# GGSEA4 - METAL GEAR SOLID THE TWIN SNAKES
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+# GGSEA4 - Metal Gear Solid The Twin Snakes
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,15 +8,114 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
+$Infinite Oxygen
+025A1A1A 00000DAC
+$Infinite Grip
+4255780C 00AC1518
+$Max Grip Level
+025A1A4C 0000012C
+$No Reload
+32580936 0000000F
+0258093A 00000019
+2A580936 00000010
+0258093A 0000000F
+$Keep Radar In Alert Mode
+041FE000 3C603800
+041FE004 38630000
+041FE008 3C807F17
+041FE00C 38841820
+041FE010 90640000
+041FE014 4E800020
+040051C4 481F8E3C
+$Have Infinite Rations
+025A1C5E 00000005
+$Have Infinite Medicine
+025A1C62 00000001
+$Have Infinite Bandages
+025A1C64 0000000A
+$Have Infinite Pentazem
+025A1C66 0000000A
+$Have Body Armor
+025A1C6A 00000001
+$Have Mine Detector
+025A1C6E 00000001
+$Have RP Sensor
+025A1C8E 00000001
+$Have Gas Mask
+025A1C72 00000001
+$Have Night Vision Goggles
+025A1C74 00000001
+$Have Thermal Goggles
+025A1C76 00000001
+$Have Scope
+025A1C78 00000001
+$Have Digital Camera
+025A1C7A 00000001
+$Have Rope
+025A1C84 00000001
+$Have Handkerchief
+025A1CAE 00000001
+$Have Box 1
+025A1C7C 00000001
+$Have Box 2
+025A1C88 00000001
+$Have Box 3
+025A1C8A 00000001
+$Have Ketchup
+025A1C8C 00000001
+$Have SOCOM Suppressor
+025A1C96 00000001
+$Have MO Disc
+025A1CA0 00000001
+$Have Level 99 Keycard
+025A1C80 00000063
+$Have Bandana
+025A1C9C 00000001
+$Have Stealth Suit
+025A1C6C 00000001
+$Have M9 ($Infinite Ammo)
+025A1BCE 0000002E
+$Have SOCOM ($Infinite Ammo)
+025A1BD2 0000003D
+$Have PSG1 ($Infinite Ammo)
+025A1BD4 0000003D
+$Have Nikita ($Infinite Ammo)
+025A1BD8 00000028
+$Have Stinger ($Infinite Ammo)
+025A1BDA 00000028
+$Have Claymore ($Infinite Ammo)
+025A1BDC 00000010
+$Have C4 ($Infinite Ammo)
+025A1BDE 00000010
+$Have Chaff Grenade ($Infinite Ammo)
+025A1BE0 00000014
+$Have Stun Grenade ($Infinite Ammo)
+025A1BE2 00000014
+$Have Grenade ($Infinite Ammo)
+025A1BEE 00000014
+$Have FAMAS ($Infinite Ammo)
+025A1BF0 000000D3
+$Have PSG1-T ($Infinite Ammo)
+025A1BF2 0000003D
+$Have Book ($Infinite Ammo)
+025A1BF6 00000005
+$Have Magazine ($Infinite Ammo)
+025A1BEC 00000064
+$Have No PAL Key
+025A1CB0 00000000
+$Have Warm (Yellow) PAL Key
+025A1CB0 00000001
+$Have Cold (Blue) PAL Key
+025A1CB0 00000002
+$Have Hot (Red) PAL Key
+025A1CB0 00000003
+$Low Total Game Time
+045A1A58 000000A0
+$Saved 0 Times
+025A1A56 00000000
+$Continued 0 Times
+025A1A50 00000000
+$999 Kills
+025A1A64 000003E7
+$0 Rations Used
+025A2EB0 00000000
diff --git a/Data/Sys/GameSettings/GGSJA4.ini b/Data/Sys/GameSettings/GGSJA4.ini
deleted file mode 100644
index 809e65aecd..0000000000
--- a/Data/Sys/GameSettings/GGSJA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GGSJA4 - METAL GEAR SOLID THE TWIN SNAKES
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGSPA4.ini b/Data/Sys/GameSettings/GGSPA4.ini
index 2bbeaf9302..c66e319277 100644
--- a/Data/Sys/GameSettings/GGSPA4.ini
+++ b/Data/Sys/GameSettings/GGSPA4.ini
@@ -1,15 +1,5 @@
 # GGSPA4 - METAL GEAR SOLID THE TWIN SNAKES
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -124,10 +114,3 @@ $999 Kills
 02566700 000003E7
 $0 Rations Used
 02567B4C 00000000
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGT.ini b/Data/Sys/GameSettings/GGT.ini
new file mode 100644
index 0000000000..330293a804
--- /dev/null
+++ b/Data/Sys/GameSettings/GGT.ini
@@ -0,0 +1,18 @@
+# GGTE01, GGTP01 - ChibiRobo!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GGTE01.ini b/Data/Sys/GameSettings/GGTE01.ini
index 8ce2514dd0..e8b8cefb11 100644
--- a/Data/Sys/GameSettings/GGTE01.ini
+++ b/Data/Sys/GameSettings/GGTE01.ini
@@ -1,12 +1,5 @@
 # GGTE01 - ChibiRobo!
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -27,4 +20,3 @@ $Max/Infinite Money
 $Max Happy Points
 0728E81C 08000000
 0438F73C 0001869F
-
diff --git a/Data/Sys/GameSettings/GGTP01.ini b/Data/Sys/GameSettings/GGTP01.ini
deleted file mode 100644
index b9c70301a4..0000000000
--- a/Data/Sys/GameSettings/GGTP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGTP01 - ChibiRobo!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GGV.ini b/Data/Sys/GameSettings/GGV.ini
new file mode 100644
index 0000000000..1e4da96fdc
--- /dev/null
+++ b/Data/Sys/GameSettings/GGV.ini
@@ -0,0 +1,18 @@
+# GGVD78, GGVE78, GGVP78, GGVX78 - The SpongeBob SquarePants Movie
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVD78.ini b/Data/Sys/GameSettings/GGVD78.ini
deleted file mode 100644
index afa39b5ff4..0000000000
--- a/Data/Sys/GameSettings/GGVD78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVD78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVE78.ini b/Data/Sys/GameSettings/GGVE78.ini
deleted file mode 100644
index 116dd30fe5..0000000000
--- a/Data/Sys/GameSettings/GGVE78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVE78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVP78.ini b/Data/Sys/GameSettings/GGVP78.ini
deleted file mode 100644
index 13b6e320c6..0000000000
--- a/Data/Sys/GameSettings/GGVP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVP78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGVX78.ini b/Data/Sys/GameSettings/GGVX78.ini
deleted file mode 100644
index 0c04afc3ac..0000000000
--- a/Data/Sys/GameSettings/GGVX78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GGVX78 - The SpongeBob SquarePants Movie
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GGY.ini b/Data/Sys/GameSettings/GGY.ini
new file mode 100644
index 0000000000..34d37fc278
--- /dev/null
+++ b/Data/Sys/GameSettings/GGY.ini
@@ -0,0 +1,33 @@
+# GGYE41, GGYP41 - GR2GC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs Real XFB for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GGYE41.ini b/Data/Sys/GameSettings/GGYE41.ini
deleted file mode 100644
index fef384af58..0000000000
--- a/Data/Sys/GameSettings/GGYE41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGYE41 - GR2GC
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real XFB for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGYP41.ini b/Data/Sys/GameSettings/GGYP41.ini
deleted file mode 100644
index 8102c0775c..0000000000
--- a/Data/Sys/GameSettings/GGYP41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GGYP41 - GR2GC
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real XFB for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GGZ.ini b/Data/Sys/GameSettings/GGZ.ini
new file mode 100644
index 0000000000..c9d4db2948
--- /dev/null
+++ b/Data/Sys/GameSettings/GGZ.ini
@@ -0,0 +1,30 @@
+# GGZE52, GGZX52 - Madagascar
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = GFX glitches.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GGZE52.ini b/Data/Sys/GameSettings/GGZE52.ini
deleted file mode 100644
index 4bcb93b6e1..0000000000
--- a/Data/Sys/GameSettings/GGZE52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GGZE52 - Madagascar
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = GFX glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GGZX52.ini b/Data/Sys/GameSettings/GGZX52.ini
deleted file mode 100644
index cd73478023..0000000000
--- a/Data/Sys/GameSettings/GGZX52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GGZX52 - Madagascar
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = GFX glitches.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GH2.ini b/Data/Sys/GameSettings/GH2.ini
new file mode 100644
index 0000000000..2c61bfe561
--- /dev/null
+++ b/Data/Sys/GameSettings/GH2.ini
@@ -0,0 +1,31 @@
+# GH2E69, GH2P69 - NFS: HP2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = The game is slow.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GH2E69.ini b/Data/Sys/GameSettings/GH2E69.ini
deleted file mode 100644
index 2691e0f2ed..0000000000
--- a/Data/Sys/GameSettings/GH2E69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GH2E69 - NFS: HP2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Intro videos are messed up, skip them. The game is slow.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GH2P69.ini b/Data/Sys/GameSettings/GH2P69.ini
deleted file mode 100644
index a488d25885..0000000000
--- a/Data/Sys/GameSettings/GH2P69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GH2P69 - NFS: HP2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Intro videos are messed up, skip them. The game is slow.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GH4.ini b/Data/Sys/GameSettings/GH4.ini
new file mode 100644
index 0000000000..c40b9b4287
--- /dev/null
+++ b/Data/Sys/GameSettings/GH4.ini
@@ -0,0 +1,27 @@
+# GH4D69, GH4E69, GH4F69, GH4H69, GH4I69, GH4J69, GH4M69, GH4P69, GH4S69 - Harry Potter and the Goblet of Fire
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GH4D69.ini b/Data/Sys/GameSettings/GH4D69.ini
deleted file mode 100644
index 659b162438..0000000000
--- a/Data/Sys/GameSettings/GH4D69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4D69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4E69.ini b/Data/Sys/GameSettings/GH4E69.ini
deleted file mode 100644
index 368ed4d07c..0000000000
--- a/Data/Sys/GameSettings/GH4E69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4E69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4F69.ini b/Data/Sys/GameSettings/GH4F69.ini
deleted file mode 100644
index 63372f6e12..0000000000
--- a/Data/Sys/GameSettings/GH4F69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4F69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4H69.ini b/Data/Sys/GameSettings/GH4H69.ini
deleted file mode 100644
index 38a4e9f256..0000000000
--- a/Data/Sys/GameSettings/GH4H69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4H69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4I69.ini b/Data/Sys/GameSettings/GH4I69.ini
deleted file mode 100644
index aeaf414dc4..0000000000
--- a/Data/Sys/GameSettings/GH4I69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4I69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4J69.ini b/Data/Sys/GameSettings/GH4J69.ini
deleted file mode 100644
index 94224f8d3a..0000000000
--- a/Data/Sys/GameSettings/GH4J69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4J69 - Harry Potter to Honoo no Goblet
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4M69.ini b/Data/Sys/GameSettings/GH4M69.ini
deleted file mode 100644
index d30655cbd3..0000000000
--- a/Data/Sys/GameSettings/GH4M69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4M69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4P69.ini b/Data/Sys/GameSettings/GH4P69.ini
deleted file mode 100644
index f7a9600eee..0000000000
--- a/Data/Sys/GameSettings/GH4P69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4P69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH4S69.ini b/Data/Sys/GameSettings/GH4S69.ini
deleted file mode 100644
index 90e2049562..0000000000
--- a/Data/Sys/GameSettings/GH4S69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GH4S69 - Harry Potter and the Goblet of Fire
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GH5.ini b/Data/Sys/GameSettings/GH5.ini
new file mode 100644
index 0000000000..3d6c846cd7
--- /dev/null
+++ b/Data/Sys/GameSettings/GH5.ini
@@ -0,0 +1,18 @@
+# GH5D52, GH5E52, GH5F52, GH5P52 - Over The Hedge
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH5D52.ini b/Data/Sys/GameSettings/GH5D52.ini
deleted file mode 100644
index 040418b60f..0000000000
--- a/Data/Sys/GameSettings/GH5D52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GH5D52 - Over The Hedge
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH5E52.ini b/Data/Sys/GameSettings/GH5E52.ini
deleted file mode 100644
index 8cecf42e83..0000000000
--- a/Data/Sys/GameSettings/GH5E52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GH5E52 - Over The Hedge
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH5F52.ini b/Data/Sys/GameSettings/GH5F52.ini
deleted file mode 100644
index e7ccf2c149..0000000000
--- a/Data/Sys/GameSettings/GH5F52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GH5F52 - Over The Hedge
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH5P52.ini b/Data/Sys/GameSettings/GH5P52.ini
deleted file mode 100644
index 0bf2929baa..0000000000
--- a/Data/Sys/GameSettings/GH5P52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GH5P52 - Over The Hedge
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GH6.ini b/Data/Sys/GameSettings/GH6.ini
new file mode 100644
index 0000000000..49ba951c1a
--- /dev/null
+++ b/Data/Sys/GameSettings/GH6.ini
@@ -0,0 +1,19 @@
+# GH6EAF - Hello Kitty Roller Rescue
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 2
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GH6EAF.ini b/Data/Sys/GameSettings/GH6EAF.ini
deleted file mode 100644
index 20f6a5cda6..0000000000
--- a/Data/Sys/GameSettings/GH6EAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GH6EAF - Hello Kitty Roller Rescue
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 2
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GH7.ini b/Data/Sys/GameSettings/GH7.ini
new file mode 100644
index 0000000000..45897c1107
--- /dev/null
+++ b/Data/Sys/GameSettings/GH7.ini
@@ -0,0 +1,30 @@
+# GH7E5D - Happy Feet
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GH7E5D.ini b/Data/Sys/GameSettings/GH7E5D.ini
deleted file mode 100644
index 3ddfcbfbb2..0000000000
--- a/Data/Sys/GameSettings/GH7E5D.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GH7E5D - Happy Feet
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GHA.ini b/Data/Sys/GameSettings/GHA.ini
new file mode 100644
index 0000000000..7471621953
--- /dev/null
+++ b/Data/Sys/GameSettings/GHA.ini
@@ -0,0 +1,18 @@
+# GHAE08, GHAP08 - Resident Evil 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GHAE08.ini b/Data/Sys/GameSettings/GHAE08.ini
deleted file mode 100644
index 813a623c32..0000000000
--- a/Data/Sys/GameSettings/GHAE08.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GHAE08 - RESIDENT EVIL2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHAP08.ini b/Data/Sys/GameSettings/GHAP08.ini
deleted file mode 100644
index 55a4532ee5..0000000000
--- a/Data/Sys/GameSettings/GHAP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GHAP08 - Resident Evil 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHB.ini b/Data/Sys/GameSettings/GHB.ini
new file mode 100644
index 0000000000..1711879d8f
--- /dev/null
+++ b/Data/Sys/GameSettings/GHB.ini
@@ -0,0 +1,27 @@
+# GHBE7D, GHBP7D - The Hobbit
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GHBE7D.ini b/Data/Sys/GameSettings/GHBE7D.ini
deleted file mode 100644
index 2367ab0a95..0000000000
--- a/Data/Sys/GameSettings/GHBE7D.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHBE7D - The Hobbit
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHBP7D.ini b/Data/Sys/GameSettings/GHBP7D.ini
deleted file mode 100644
index a21bd11db4..0000000000
--- a/Data/Sys/GameSettings/GHBP7D.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHBP7D - The Hobbit
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHC.ini b/Data/Sys/GameSettings/GHC.ini
new file mode 100644
index 0000000000..4a0eafee5a
--- /dev/null
+++ b/Data/Sys/GameSettings/GHC.ini
@@ -0,0 +1,27 @@
+# GHCE4Q, GHCF4Q - Chicken Little
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GHCE4Q.ini b/Data/Sys/GameSettings/GHCE4Q.ini
deleted file mode 100644
index 0648e82ef5..0000000000
--- a/Data/Sys/GameSettings/GHCE4Q.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHCE4Q - Chicken Little
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHCF4Q.ini b/Data/Sys/GameSettings/GHCF4Q.ini
deleted file mode 100644
index 68ba12a43c..0000000000
--- a/Data/Sys/GameSettings/GHCF4Q.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHCF4Q - Chicken Little
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHG.ini b/Data/Sys/GameSettings/GHG.ini
new file mode 100644
index 0000000000..e032647c73
--- /dev/null
+++ b/Data/Sys/GameSettings/GHG.ini
@@ -0,0 +1,19 @@
+# GHGEEB - Go! Go! Hypergrind
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Slow
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GHGEEB.ini b/Data/Sys/GameSettings/GHGEEB.ini
deleted file mode 100644
index 8092c01296..0000000000
--- a/Data/Sys/GameSettings/GHGEEB.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHGEEB - Go! Go! Hypergrind
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHK.ini b/Data/Sys/GameSettings/GHK.ini
new file mode 100644
index 0000000000..d080170051
--- /dev/null
+++ b/Data/Sys/GameSettings/GHK.ini
@@ -0,0 +1,19 @@
+# GHKD7D, GHKE7D, GHKF7D, GHKP7D, GHKS7D - The Hulk
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Gecko]
diff --git a/Data/Sys/GameSettings/GHKE7D.ini b/Data/Sys/GameSettings/GHKE7D.ini
deleted file mode 100644
index e8b1d1c632..0000000000
--- a/Data/Sys/GameSettings/GHKE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHKE7D - The Hulk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Slow and GFX Glitches/Bugs
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHL.ini b/Data/Sys/GameSettings/GHL.ini
new file mode 100644
index 0000000000..4d6e558b53
--- /dev/null
+++ b/Data/Sys/GameSettings/GHL.ini
@@ -0,0 +1,27 @@
+# GHLE69, GHLJ69, GHLP69, GHLX69, GHLY69, GHLZ69 - Harry Potter and the Sorcerer's Stone
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GHLE69.ini b/Data/Sys/GameSettings/GHLE69.ini
deleted file mode 100644
index f64469b700..0000000000
--- a/Data/Sys/GameSettings/GHLE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLE69 - Harry Potter and the Sorcerer's Stone
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHLJ69.ini b/Data/Sys/GameSettings/GHLJ69.ini
deleted file mode 100644
index b74ef9db02..0000000000
--- a/Data/Sys/GameSettings/GHLJ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLJ69 - Harry Potter to Kenja no Ishi
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHLP69.ini b/Data/Sys/GameSettings/GHLP69.ini
deleted file mode 100644
index 9dd6640474..0000000000
--- a/Data/Sys/GameSettings/GHLP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLP69 - Harry Potter and the Philosopher's Stone
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHLX69.ini b/Data/Sys/GameSettings/GHLX69.ini
deleted file mode 100644
index 9f033af91a..0000000000
--- a/Data/Sys/GameSettings/GHLX69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLX69 - Harry Potter and the Sorcerer's Stone
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHLY69.ini b/Data/Sys/GameSettings/GHLY69.ini
deleted file mode 100644
index 441ad422f7..0000000000
--- a/Data/Sys/GameSettings/GHLY69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLY69 - Harry Potter and the Sorcerer's Stone
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHLZ69.ini b/Data/Sys/GameSettings/GHLZ69.ini
deleted file mode 100644
index 7c5fa31990..0000000000
--- a/Data/Sys/GameSettings/GHLZ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHLZ69 - Harry Potter and the Sorcerer's Stone
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHM.ini b/Data/Sys/GameSettings/GHM.ini
new file mode 100644
index 0000000000..ab87a88e08
--- /dev/null
+++ b/Data/Sys/GameSettings/GHM.ini
@@ -0,0 +1,27 @@
+# GHMD4F, GHME4F, GHMF4F, GHMP4F - Hitman 2: Silent Assassin
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GHMD4F.ini b/Data/Sys/GameSettings/GHMD4F.ini
deleted file mode 100644
index 3ec1f1e3ca..0000000000
--- a/Data/Sys/GameSettings/GHMD4F.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHMD4F - Hitman 2: Silent Assassin
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHME4F.ini b/Data/Sys/GameSettings/GHME4F.ini
index 459ea6dcc0..fde3306726 100644
--- a/Data/Sys/GameSettings/GHME4F.ini
+++ b/Data/Sys/GameSettings/GHME4F.ini
@@ -1,14 +1,5 @@
 # GHME4F - Hitman 2: Silent Assassin
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -39,12 +30,3 @@ $Press Left + Y For Nailgun
 52889D30 00000801
 0406D250 418201BC
 0406D288 408000C4
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHMF4F.ini b/Data/Sys/GameSettings/GHMF4F.ini
deleted file mode 100644
index b000de7938..0000000000
--- a/Data/Sys/GameSettings/GHMF4F.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHMF4F - Hitman 2: Silent Assassin
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHMP4F.ini b/Data/Sys/GameSettings/GHMP4F.ini
deleted file mode 100644
index 4e1069d512..0000000000
--- a/Data/Sys/GameSettings/GHMP4F.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GHMP4F - Hitman 2: Silent Assassin
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GHN.ini b/Data/Sys/GameSettings/GHN.ini
new file mode 100644
index 0000000000..3ea3566e47
--- /dev/null
+++ b/Data/Sys/GameSettings/GHN.ini
@@ -0,0 +1,22 @@
+# GHNE71, GHNX71 - Hunter: The Reckoning
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GHNE71.ini b/Data/Sys/GameSettings/GHNE71.ini
deleted file mode 100644
index 1901f25d2c..0000000000
--- a/Data/Sys/GameSettings/GHNE71.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHNE71 - Hunter: The Reckoning
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow and cutscenes are black
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHQ.ini b/Data/Sys/GameSettings/GHQ.ini
new file mode 100644
index 0000000000..bc19913cbb
--- /dev/null
+++ b/Data/Sys/GameSettings/GHQ.ini
@@ -0,0 +1,31 @@
+# GHQE7D, GHQP7D - The Simpsons Hit & Run
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GHQE7D.ini b/Data/Sys/GameSettings/GHQE7D.ini
deleted file mode 100644
index 2a40af8a70..0000000000
--- a/Data/Sys/GameSettings/GHQE7D.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GHQE7D - The Simpsons Hit & Run
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GHQP7D.ini b/Data/Sys/GameSettings/GHQP7D.ini
deleted file mode 100644
index 34464cf34d..0000000000
--- a/Data/Sys/GameSettings/GHQP7D.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GHQP7D - The Simpsons Hit & Run
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GHR.ini b/Data/Sys/GameSettings/GHR.ini
new file mode 100644
index 0000000000..7eff256525
--- /dev/null
+++ b/Data/Sys/GameSettings/GHR.ini
@@ -0,0 +1,20 @@
+# GHRE78 - Hot Wheels World Race
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GHRE78.ini b/Data/Sys/GameSettings/GHRE78.ini
index fc34a55172..5691a8329f 100644
--- a/Data/Sys/GameSettings/GHRE78.ini
+++ b/Data/Sys/GameSettings/GHRE78.ini
@@ -1,11 +1,4 @@
-# GHRE78 - Hot Wheels World Race NTSC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
+# GHRE78 - Hot Wheels World Race
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,4 +11,3 @@ EmulationStateId = 5
 $Infinite Continues
 0554D8EF 08000000
 040BF890 39200009
-
diff --git a/Data/Sys/GameSettings/GHS.ini b/Data/Sys/GameSettings/GHS.ini
new file mode 100644
index 0000000000..c2bc799d69
--- /dev/null
+++ b/Data/Sys/GameSettings/GHS.ini
@@ -0,0 +1,31 @@
+# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter COS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GHSE69.ini b/Data/Sys/GameSettings/GHSE69.ini
deleted file mode 100644
index 98fca29d18..0000000000
--- a/Data/Sys/GameSettings/GHSE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSE69 - Harry Potter COS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHSJ69.ini b/Data/Sys/GameSettings/GHSJ69.ini
deleted file mode 100644
index a1691782a9..0000000000
--- a/Data/Sys/GameSettings/GHSJ69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSJ69 - Harry Potter to Himitsu no Heya
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHSP69.ini b/Data/Sys/GameSettings/GHSP69.ini
deleted file mode 100644
index 9b81e723ce..0000000000
--- a/Data/Sys/GameSettings/GHSP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSP69 - Harry Potter: Chamber Of Secrets
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHSX69.ini b/Data/Sys/GameSettings/GHSX69.ini
deleted file mode 100644
index fd8578f1dc..0000000000
--- a/Data/Sys/GameSettings/GHSX69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSX69 - Harry Potter: Chamber Of Secrets
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHSY69.ini b/Data/Sys/GameSettings/GHSY69.ini
deleted file mode 100644
index c2d54fd34b..0000000000
--- a/Data/Sys/GameSettings/GHSY69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GHSY69 - Harry Potter COS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHU.ini b/Data/Sys/GameSettings/GHU.ini
new file mode 100644
index 0000000000..79d45bbaef
--- /dev/null
+++ b/Data/Sys/GameSettings/GHU.ini
@@ -0,0 +1,20 @@
+# GHUE7D, GHUF7D, GHUP7D - The Incredible Hulk:Ultimate Destruction
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GHUE7D.ini b/Data/Sys/GameSettings/GHUE7D.ini
deleted file mode 100644
index c592871f43..0000000000
--- a/Data/Sys/GameSettings/GHUE7D.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GHUE7D - The Incredible Hulk:Ultimate Destruction
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="dcbtst Not Implemented"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHV.ini b/Data/Sys/GameSettings/GHV.ini
new file mode 100644
index 0000000000..4acedba8a0
--- /dev/null
+++ b/Data/Sys/GameSettings/GHV.ini
@@ -0,0 +1,21 @@
+# GHVE08, GHVP08 - Disney's Hide & Sneak
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+BBoxEnable = True
diff --git a/Data/Sys/GameSettings/GHVE08.ini b/Data/Sys/GameSettings/GHVE08.ini
deleted file mode 100644
index 2f93d12041..0000000000
--- a/Data/Sys/GameSettings/GHVE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHVE08 - Disney's Hide & Sneak
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = bad GFX
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHW.ini b/Data/Sys/GameSettings/GHW.ini
new file mode 100644
index 0000000000..f9c8903459
--- /dev/null
+++ b/Data/Sys/GameSettings/GHW.ini
@@ -0,0 +1,19 @@
+# GHWE78 - Hot Wheels Velocity X
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Bad sound sometimes
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GHWE78.ini b/Data/Sys/GameSettings/GHWE78.ini
deleted file mode 100644
index 9271b7750a..0000000000
--- a/Data/Sys/GameSettings/GHWE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GHWE78 - Hot Wheels Velocity X
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad sound sometimes
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GHY.ini b/Data/Sys/GameSettings/GHY.ini
new file mode 100644
index 0000000000..6cee997020
--- /dev/null
+++ b/Data/Sys/GameSettings/GHY.ini
@@ -0,0 +1,31 @@
+# GHYE6S - HauntedMansion
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs Real Xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GHYE6S.ini b/Data/Sys/GameSettings/GHYE6S.ini
deleted file mode 100644
index 642480448e..0000000000
--- a/Data/Sys/GameSettings/GHYE6S.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GHYE6S - HauntedMansion
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GHZ.ini b/Data/Sys/GameSettings/GHZ.ini
new file mode 100644
index 0000000000..835f2d0018
--- /dev/null
+++ b/Data/Sys/GameSettings/GHZ.ini
@@ -0,0 +1,18 @@
+# GHZE5D - NHL Hitz Pro
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIA.ini b/Data/Sys/GameSettings/GIA.ini
new file mode 100644
index 0000000000..567ef4654d
--- /dev/null
+++ b/Data/Sys/GameSettings/GIA.ini
@@ -0,0 +1,21 @@
+# GIAE7D, GIAP7D - Ice Age 2 The Meltdown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GIAE7D.ini b/Data/Sys/GameSettings/GIAE7D.ini
deleted file mode 100644
index 1670fc2d1b..0000000000
--- a/Data/Sys/GameSettings/GIAE7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GIAE7D - Ice Age 2 The Meltdown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Little shadow bug
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIB.ini b/Data/Sys/GameSettings/GIB.ini
new file mode 100644
index 0000000000..1f0539a224
--- /dev/null
+++ b/Data/Sys/GameSettings/GIB.ini
@@ -0,0 +1,18 @@
+# GIBE4F - The Italian Job
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIBE4F.ini b/Data/Sys/GameSettings/GIBE4F.ini
deleted file mode 100644
index 180a6cdd0b..0000000000
--- a/Data/Sys/GameSettings/GIBE4F.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GIBE4F - The Italian Job
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIC.ini b/Data/Sys/GameSettings/GIC.ini
new file mode 100644
index 0000000000..b16e6525a3
--- /dev/null
+++ b/Data/Sys/GameSettings/GIC.ini
@@ -0,0 +1,20 @@
+# GICD78, GICE78, GICF78, GICH78, GICJG9, GICP78 - The Incredibles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GICE78.ini b/Data/Sys/GameSettings/GICE78.ini
index 664aa5edee..2996aac00c 100644
--- a/Data/Sys/GameSettings/GICE78.ini
+++ b/Data/Sys/GameSettings/GICE78.ini
@@ -1,13 +1,5 @@
 # GICE78 - The Incredibles
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,4 +10,3 @@ EmulationIssues =
 # Add action replay cheats here.
 $Infinite Health
 04097DB8 38000064
-
diff --git a/Data/Sys/GameSettings/GIG.ini b/Data/Sys/GameSettings/GIG.ini
new file mode 100644
index 0000000000..1b4cc769ab
--- /dev/null
+++ b/Data/Sys/GameSettings/GIG.ini
@@ -0,0 +1,18 @@
+# GIGJ8P - BLEACH for GC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIGJ8P.ini b/Data/Sys/GameSettings/GIGJ8P.ini
index 4826c37326..648020e744 100644
--- a/Data/Sys/GameSettings/GIGJ8P.ini
+++ b/Data/Sys/GameSettings/GIGJ8P.ini
@@ -1,11 +1,4 @@
-# GIGJ8P - BLEACH for GC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
+# GIGJ8P - Bleach: Tasogare Ni Mamieru Shinigami for GC
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -15,4 +8,14 @@ EmulationStateId = 4
 
 [ActionReplay]
 # Add action replay cheats here.
-
+$All Characters
+0440575C FFFFFFFF
+$Player 1 HP Max
+023711D2 0000012C
+023711D6 0000012C
+$Player 1 reiatu Max
+023711DA 0000012C
+$Secret All Open
+0040576B 00000003
+04405770 FFFFFFFF
+0040577B 00000001
diff --git a/Data/Sys/GameSettings/GIK.ini b/Data/Sys/GameSettings/GIK.ini
new file mode 100644
index 0000000000..382f160702
--- /dev/null
+++ b/Data/Sys/GameSettings/GIK.ini
@@ -0,0 +1,18 @@
+# GIKE70, GIKP70 - IKARUGA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIKE70.ini b/Data/Sys/GameSettings/GIKE70.ini
deleted file mode 100644
index f149fe5cc2..0000000000
--- a/Data/Sys/GameSettings/GIKE70.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GIKE70 - IKARUGA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GIKP70.ini b/Data/Sys/GameSettings/GIKP70.ini
deleted file mode 100644
index 63fbc94fc8..0000000000
--- a/Data/Sys/GameSettings/GIKP70.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GIKP70 - IKARUGA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIL.ini b/Data/Sys/GameSettings/GIL.ini
new file mode 100644
index 0000000000..8ae3dac59d
--- /dev/null
+++ b/Data/Sys/GameSettings/GIL.ini
@@ -0,0 +1,33 @@
+# GILE51, GILP51 - Aggressive Inline
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GILE51.ini b/Data/Sys/GameSettings/GILE51.ini
deleted file mode 100644
index 37e9ad3422..0000000000
--- a/Data/Sys/GameSettings/GILE51.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GILE51 - Aggressive Inline
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GILP51.ini b/Data/Sys/GameSettings/GILP51.ini
deleted file mode 100644
index c3bb7d8be2..0000000000
--- a/Data/Sys/GameSettings/GILP51.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GILP51 - Aggressive Inline
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GIN.ini b/Data/Sys/GameSettings/GIN.ini
new file mode 100644
index 0000000000..303ae4fdc0
--- /dev/null
+++ b/Data/Sys/GameSettings/GIN.ini
@@ -0,0 +1,19 @@
+# GINE69, GINX69 - Batman
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = FPS drops to 20 in some areas (don't know if this is normal)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GINE69.ini b/Data/Sys/GameSettings/GINE69.ini
index f7cf2fd778..3f95f313cd 100644
--- a/Data/Sys/GameSettings/GINE69.ini
+++ b/Data/Sys/GameSettings/GINE69.ini
@@ -1,14 +1,5 @@
 # GINE69 - Batman
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = FPS drops to 20 in some areas(don't know if this is normal)
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -29,4 +20,3 @@ $BatMobile = Infinite Armor
 0411D364 60000000
 $BatMobile = Infinite Boost
 0411E754 60000000
-
diff --git a/Data/Sys/GameSettings/GINX69.ini b/Data/Sys/GameSettings/GINX69.ini
deleted file mode 100644
index 29113828ca..0000000000
--- a/Data/Sys/GameSettings/GINX69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GINX69 - Batman
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIP.ini b/Data/Sys/GameSettings/GIP.ini
new file mode 100644
index 0000000000..1c80c5fd43
--- /dev/null
+++ b/Data/Sys/GameSettings/GIP.ini
@@ -0,0 +1,19 @@
+# GIPEAF - One Piece Pirates Carnival (us)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIPEAF.ini b/Data/Sys/GameSettings/GIPEAF.ini
deleted file mode 100644
index 0300fb801f..0000000000
--- a/Data/Sys/GameSettings/GIPEAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GIPEAF - One Piece Pirates Carnival (us)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIQ.ini b/Data/Sys/GameSettings/GIQ.ini
new file mode 100644
index 0000000000..f4b5524b5c
--- /dev/null
+++ b/Data/Sys/GameSettings/GIQ.ini
@@ -0,0 +1,31 @@
+# GIQE78 - The Incredibles 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real XFB for videos to show up.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GIQE78.ini b/Data/Sys/GameSettings/GIQE78.ini
index a058886d59..b68c6ceeb7 100644
--- a/Data/Sys/GameSettings/GIQE78.ini
+++ b/Data/Sys/GameSettings/GIQE78.ini
@@ -1,13 +1,5 @@
 # GIQE78 - The Incredibles 2
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real XFB for videos to show up.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -27,16 +19,3 @@ $All Upgrades
 00000002 00050001
 00000000 843BECEC
 00000002 00050001
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GIS.ini b/Data/Sys/GameSettings/GIS.ini
new file mode 100644
index 0000000000..bbf01c22d2
--- /dev/null
+++ b/Data/Sys/GameSettings/GIS.ini
@@ -0,0 +1,23 @@
+# GISE36, GISP36 - Second Sight
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GISE36.ini b/Data/Sys/GameSettings/GISE36.ini
deleted file mode 100644
index e8fe98fb89..0000000000
--- a/Data/Sys/GameSettings/GISE36.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GISE36 - Second Sight
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GISP36.ini b/Data/Sys/GameSettings/GISP36.ini
deleted file mode 100644
index a2da382622..0000000000
--- a/Data/Sys/GameSettings/GISP36.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GISP36 - Second Sight
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GIT.ini b/Data/Sys/GameSettings/GIT.ini
new file mode 100644
index 0000000000..e00a4785d4
--- /dev/null
+++ b/Data/Sys/GameSettings/GIT.ini
@@ -0,0 +1,27 @@
+# GITE01, GITP01 - Geist
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GITE01.ini b/Data/Sys/GameSettings/GITE01.ini
deleted file mode 100644
index 40a3b50dd4..0000000000
--- a/Data/Sys/GameSettings/GITE01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GITE01 - Geist
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GITP01.ini b/Data/Sys/GameSettings/GITP01.ini
deleted file mode 100644
index 06ad0a2552..0000000000
--- a/Data/Sys/GameSettings/GITP01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GITP01 - Geist
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GIV.ini b/Data/Sys/GameSettings/GIV.ini
new file mode 100644
index 0000000000..21fdcdf60c
--- /dev/null
+++ b/Data/Sys/GameSettings/GIV.ini
@@ -0,0 +1,19 @@
+# GIVE4Z - Intellivision Lives!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GIVE4Z.ini b/Data/Sys/GameSettings/GIVE4Z.ini
deleted file mode 100644
index 619c43b2ff..0000000000
--- a/Data/Sys/GameSettings/GIVE4Z.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GIVE4Z - Intellivision Lives!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GIZ.ini b/Data/Sys/GameSettings/GIZ.ini
new file mode 100644
index 0000000000..33b2329807
--- /dev/null
+++ b/Data/Sys/GameSettings/GIZ.ini
@@ -0,0 +1,24 @@
+# GIZE52 - TY the Tasmanian Tiger 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GIZE52.ini b/Data/Sys/GameSettings/GIZE52.ini
deleted file mode 100644
index 8b576eb9bf..0000000000
--- a/Data/Sys/GameSettings/GIZE52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GIZE52 - Ty3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GJ3.ini b/Data/Sys/GameSettings/GJ3.ini
new file mode 100644
index 0000000000..87da916dc1
--- /dev/null
+++ b/Data/Sys/GameSettings/GJ3.ini
@@ -0,0 +1,27 @@
+# GJ3PA4 - International Superstar Soccer 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Need a Projection Hack Bloom and Safe Texture cache
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar = 0.1
+
diff --git a/Data/Sys/GameSettings/GJ3PA4.ini b/Data/Sys/GameSettings/GJ3PA4.ini
deleted file mode 100644
index 903d310707..0000000000
--- a/Data/Sys/GameSettings/GJ3PA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GJ3PA4 - International Superstar Soccer 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need a Projection Hack Bloom and Safe Texture cache
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/GJB.ini b/Data/Sys/GameSettings/GJB.ini
new file mode 100644
index 0000000000..8a8822b2bb
--- /dev/null
+++ b/Data/Sys/GameSettings/GJB.ini
@@ -0,0 +1,32 @@
+# GJBE5G - Bomberman Jetters
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Videos need Real XFB to show up. Graphic glitches / unstable during videos.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GJBE5G.ini b/Data/Sys/GameSettings/GJBE5G.ini
deleted file mode 100644
index 74773458de..0000000000
--- a/Data/Sys/GameSettings/GJBE5G.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GJBE5G - Bomberman Jetters
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Use D3D9 for less problems. Videos need Real XFB to show up. Graphic glitches / unstable during videos.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GJC.ini b/Data/Sys/GameSettings/GJC.ini
new file mode 100644
index 0000000000..93805dd271
--- /dev/null
+++ b/Data/Sys/GameSettings/GJC.ini
@@ -0,0 +1,17 @@
+# GJCE8P - jack
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GJCE8P.ini b/Data/Sys/GameSettings/GJCE8P.ini
index 7fbdb49c60..941d5cdd56 100644
--- a/Data/Sys/GameSettings/GJCE8P.ini
+++ b/Data/Sys/GameSettings/GJCE8P.ini
@@ -1,12 +1,5 @@
 # GJCE8P - jack
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -45,4 +38,3 @@ $All Level Stats Maxed And Viewable
 054D0938 00000001
 00000000 854D0938
 00000001 00140001
-
diff --git a/Data/Sys/GameSettings/GJD.ini b/Data/Sys/GameSettings/GJD.ini
new file mode 100644
index 0000000000..a391e8ea66
--- /dev/null
+++ b/Data/Sys/GameSettings/GJD.ini
@@ -0,0 +1,19 @@
+# GJDE5S - Dredd 2004-02-26 NTSC RC5
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Cutscenes are black
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GJDE5S.ini b/Data/Sys/GameSettings/GJDE5S.ini
deleted file mode 100644
index 4e2526b824..0000000000
--- a/Data/Sys/GameSettings/GJDE5S.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GJDE5S - Dredd 2004-02-26 NTSC RC5
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Cutscenes are black
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GJK.ini b/Data/Sys/GameSettings/GJK.ini
new file mode 100644
index 0000000000..bd53d1bccb
--- /dev/null
+++ b/Data/Sys/GameSettings/GJK.ini
@@ -0,0 +1,20 @@
+# GJKD52, GJKE52, GJKF52, GJKP52 - Jedi Knight II: Jedi Outcast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GJKE52.ini b/Data/Sys/GameSettings/GJKE52.ini
deleted file mode 100644
index 38599b2f3c..0000000000
--- a/Data/Sys/GameSettings/GJKE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GJKE52 - Jedi Knight II: Jedi Outcast
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Darkening"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GJN.ini b/Data/Sys/GameSettings/GJN.ini
new file mode 100644
index 0000000000..122aed90ea
--- /dev/null
+++ b/Data/Sys/GameSettings/GJN.ini
@@ -0,0 +1,22 @@
+# GJNE78 - Jimmy Neutron Boy Genius
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GJNE78.ini b/Data/Sys/GameSettings/GJNE78.ini
deleted file mode 100644
index 6e6a401ded..0000000000
--- a/Data/Sys/GameSettings/GJNE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GJNE78 - Jimmy Neutron Boy Genius
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GJS.ini b/Data/Sys/GameSettings/GJS.ini
new file mode 100644
index 0000000000..2ee74a353d
--- /dev/null
+++ b/Data/Sys/GameSettings/GJS.ini
@@ -0,0 +1,19 @@
+# GJSJ18 - STAR SOLDIER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GJSJ18.ini b/Data/Sys/GameSettings/GJSJ18.ini
deleted file mode 100644
index bfc2673e72..0000000000
--- a/Data/Sys/GameSettings/GJSJ18.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GJSJ18 - STAR SOLDIER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GJU.ini b/Data/Sys/GameSettings/GJU.ini
new file mode 100644
index 0000000000..d29926ae51
--- /dev/null
+++ b/Data/Sys/GameSettings/GJU.ini
@@ -0,0 +1,22 @@
+# GJUD78, GJUF78 - Tak and the Power of Juju
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GJUD78.ini b/Data/Sys/GameSettings/GJUD78.ini
deleted file mode 100644
index 71c381085a..0000000000
--- a/Data/Sys/GameSettings/GJUD78.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GJUD78 - Tak and the Power of Juju
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GJUE78.ini b/Data/Sys/GameSettings/GJUE78.ini
index 6137cedc34..0c86a0b1eb 100644
--- a/Data/Sys/GameSettings/GJUE78.ini
+++ b/Data/Sys/GameSettings/GJUE78.ini
@@ -1,14 +1,5 @@
 # GJUE78 - Tak and the Power of Juju
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -32,7 +23,3 @@ $Press Z+A For Super Jump
 52327A2C 00000110
 04026894 D0030068
 04026C1C D0050008
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GJUF78.ini b/Data/Sys/GameSettings/GJUF78.ini
deleted file mode 100644
index 449145b2ae..0000000000
--- a/Data/Sys/GameSettings/GJUF78.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GJUF78 - Tak and the Power of Juju
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GJW.ini b/Data/Sys/GameSettings/GJW.ini
new file mode 100644
index 0000000000..959513bd9f
--- /dev/null
+++ b/Data/Sys/GameSettings/GJW.ini
@@ -0,0 +1,27 @@
+# GJWE78 - Tak: The Great Juju Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GJWE78.ini b/Data/Sys/GameSettings/GJWE78.ini
index 3834e9da42..027910f7dc 100644
--- a/Data/Sys/GameSettings/GJWE78.ini
+++ b/Data/Sys/GameSettings/GJWE78.ini
@@ -1,14 +1,5 @@
 # GJWE78 - Tak: The Great Juju Challenge
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -33,12 +24,3 @@ $Infinite Red Crystals
 0444C428 4479C000
 $Infinite Green Fruit
 0444C434 4479C000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GJX.ini b/Data/Sys/GameSettings/GJX.ini
new file mode 100644
index 0000000000..b98857d1e3
--- /dev/null
+++ b/Data/Sys/GameSettings/GJX.ini
@@ -0,0 +1,27 @@
+# GJXE51, GJXP51 - Vexx
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GJXE51.ini b/Data/Sys/GameSettings/GJXE51.ini
deleted file mode 100644
index 82ad2a5029..0000000000
--- a/Data/Sys/GameSettings/GJXE51.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GJXE51 - Vexx
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GJXP51.ini b/Data/Sys/GameSettings/GJXP51.ini
deleted file mode 100644
index 64b225c996..0000000000
--- a/Data/Sys/GameSettings/GJXP51.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GJXP51 - Vexx
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GJZ.ini b/Data/Sys/GameSettings/GJZ.ini
new file mode 100644
index 0000000000..9bf659b632
--- /dev/null
+++ b/Data/Sys/GameSettings/GJZ.ini
@@ -0,0 +1,27 @@
+# GJZE52 - Shamu's Deep Sea Adventures
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GJZE52.ini b/Data/Sys/GameSettings/GJZE52.ini
deleted file mode 100644
index 36c54c3165..0000000000
--- a/Data/Sys/GameSettings/GJZE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GJZE52 - Shamu's Deep Sea Adventures
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GK2.ini b/Data/Sys/GameSettings/GK2.ini
new file mode 100644
index 0000000000..43d3817579
--- /dev/null
+++ b/Data/Sys/GameSettings/GK2.ini
@@ -0,0 +1,23 @@
+# GK2D52, GK2E52, GK2F52, GK2I52, GK2P52 - Spider-Man 2
+
+[Core]
+MMU = 1
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini
deleted file mode 100644
index d8267fbc92..0000000000
--- a/Data/Sys/GameSettings/GK2D52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK2D52 - Spider-Man 2
-[Core]
-MMU = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini
deleted file mode 100644
index 23d53c182b..0000000000
--- a/Data/Sys/GameSettings/GK2E52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK2E52 - Spider-Man 2
-[Core]
-MMU = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2F52.ini b/Data/Sys/GameSettings/GK2F52.ini
deleted file mode 100644
index 0b05c6d201..0000000000
--- a/Data/Sys/GameSettings/GK2F52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK2F52 - Spider-Man 2
-[Core]
-MMU = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini
deleted file mode 100644
index 0f733aac78..0000000000
--- a/Data/Sys/GameSettings/GK2I52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK2I52 - Spider-Man 2
-[Core]
-MMU = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini
deleted file mode 100644
index 32d0de3b03..0000000000
--- a/Data/Sys/GameSettings/GK2P52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK2P52 - Spider-Man 2
-[Core]
-MMU = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Slow because it needs mmu to run.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GK4.ini b/Data/Sys/GameSettings/GK4.ini
new file mode 100644
index 0000000000..e2e89f6c3f
--- /dev/null
+++ b/Data/Sys/GameSettings/GK4.ini
@@ -0,0 +1,34 @@
+# GK4E01, GK4J01 - Baten Kaitos Origins
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GK4E01.ini b/Data/Sys/GameSettings/GK4E01.ini
index f9b290a937..f3ae0b0999 100644
--- a/Data/Sys/GameSettings/GK4E01.ini
+++ b/Data/Sys/GameSettings/GK4E01.ini
@@ -1,13 +1,5 @@
 # GK4E01 - Baten Kaitos Origins
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -55,16 +47,3 @@ $MILLIARDE Infinite HP In Battle
 $MILLIARDE Quick Level Up
 0768EA6B 08000000
 042D55E0 000F423F
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GK5.ini b/Data/Sys/GameSettings/GK5.ini
new file mode 100644
index 0000000000..d9b0160555
--- /dev/null
+++ b/Data/Sys/GameSettings/GK5.ini
@@ -0,0 +1,30 @@
+# GK5E78, GK5X78 - Monster House
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GK5E78.ini b/Data/Sys/GameSettings/GK5E78.ini
deleted file mode 100644
index c2d58b834b..0000000000
--- a/Data/Sys/GameSettings/GK5E78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GK5E78 - Monster House
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GK5X78.ini b/Data/Sys/GameSettings/GK5X78.ini
deleted file mode 100644
index bab043c207..0000000000
--- a/Data/Sys/GameSettings/GK5X78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GK5X78 - Monster House
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GK6.ini b/Data/Sys/GameSettings/GK6.ini
new file mode 100644
index 0000000000..2c92626dd2
--- /dev/null
+++ b/Data/Sys/GameSettings/GK6.ini
@@ -0,0 +1,18 @@
+# GK6JA4 - Croket
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GK6JA4.ini b/Data/Sys/GameSettings/GK6JA4.ini
deleted file mode 100644
index 1b69c6954c..0000000000
--- a/Data/Sys/GameSettings/GK6JA4.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GK6JA4 - Croket
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GK7.ini b/Data/Sys/GameSettings/GK7.ini
new file mode 100644
index 0000000000..f42bd2b5c8
--- /dev/null
+++ b/Data/Sys/GameSettings/GK7.ini
@@ -0,0 +1,30 @@
+# GK7E08, GK7P08 - Killer7 Disk1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
+
diff --git a/Data/Sys/GameSettings/GK7E08.ini b/Data/Sys/GameSettings/GK7E08.ini
deleted file mode 100644
index ea2a96fe7c..0000000000
--- a/Data/Sys/GameSettings/GK7E08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GK7E08 - Killer7 Disk1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Tested with (r6801)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GK7P08.ini b/Data/Sys/GameSettings/GK7P08.ini
deleted file mode 100644
index afed097df4..0000000000
--- a/Data/Sys/GameSettings/GK7P08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GK7P08 - Killer7 Disk1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Tested with (r6801)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/GK9.ini b/Data/Sys/GameSettings/GK9.ini
new file mode 100644
index 0000000000..b8f47aec65
--- /dev/null
+++ b/Data/Sys/GameSettings/GK9.ini
@@ -0,0 +1,27 @@
+# GK9EA4 - Karaoke Revolution Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Microphone set in a gamecube pad slot to play this game.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GK9EA4.ini b/Data/Sys/GameSettings/GK9EA4.ini
deleted file mode 100644
index 9cc9343f63..0000000000
--- a/Data/Sys/GameSettings/GK9EA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GK9EA4 - Karaoke Revolution Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Microphone set in a gamecube pad slot to play this game.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GKA.ini b/Data/Sys/GameSettings/GKA.ini
new file mode 100644
index 0000000000..98a9004277
--- /dev/null
+++ b/Data/Sys/GameSettings/GKA.ini
@@ -0,0 +1,19 @@
+# GKAE8P - Amazing Island
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKAE8P.ini b/Data/Sys/GameSettings/GKAE8P.ini
deleted file mode 100644
index 4c9fbe6405..0000000000
--- a/Data/Sys/GameSettings/GKAE8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GKAE8P - Amazing Island
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKB.ini b/Data/Sys/GameSettings/GKB.ini
new file mode 100644
index 0000000000..436c00b284
--- /dev/null
+++ b/Data/Sys/GameSettings/GKB.ini
@@ -0,0 +1,35 @@
+# GKBEAF, GKBJAF, GKBPAF - Baten Kaitos Eternal Wings and the Lost Ocean
+
+[Core]
+# Values set here will override the main Dolphin settings.
+CPUThread = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = False
+EFBToTextureEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GKBEAF.ini b/Data/Sys/GameSettings/GKBEAF.ini
deleted file mode 100644
index ecf0d100e7..0000000000
--- a/Data/Sys/GameSettings/GKBEAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GKBEAF - Baten Kaitos
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GKBPAF.ini b/Data/Sys/GameSettings/GKBPAF.ini
deleted file mode 100644
index 69ede962ce..0000000000
--- a/Data/Sys/GameSettings/GKBPAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GKBPAF - Baten Kaitos
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GKD.ini b/Data/Sys/GameSettings/GKD.ini
new file mode 100644
index 0000000000..77cab2980f
--- /dev/null
+++ b/Data/Sys/GameSettings/GKD.ini
@@ -0,0 +1,19 @@
+# GKDP01 - Doshin the Giant
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKDP01.ini b/Data/Sys/GameSettings/GKDP01.ini
deleted file mode 100644
index e238972eaf..0000000000
--- a/Data/Sys/GameSettings/GKDP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GKDP01 - Doshin the Giant
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKF.ini b/Data/Sys/GameSettings/GKF.ini
new file mode 100644
index 0000000000..7411505251
--- /dev/null
+++ b/Data/Sys/GameSettings/GKF.ini
@@ -0,0 +1,18 @@
+# GKFEGG - CHAOSFIELD EXPANDED
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKFEGG.ini b/Data/Sys/GameSettings/GKFEGG.ini
deleted file mode 100644
index c3b5136cea..0000000000
--- a/Data/Sys/GameSettings/GKFEGG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GKFEGG - CHAOSFIELD EXPANDED
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKG.ini b/Data/Sys/GameSettings/GKG.ini
new file mode 100644
index 0000000000..44ce1288d4
--- /dev/null
+++ b/Data/Sys/GameSettings/GKG.ini
@@ -0,0 +1,18 @@
+# GKGE01 - DONKEY KONGA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GKGE01.ini b/Data/Sys/GameSettings/GKGE01.ini
deleted file mode 100644
index 6d8e262b8a..0000000000
--- a/Data/Sys/GameSettings/GKGE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GKGE01 - DONKEY KONGA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKH.ini b/Data/Sys/GameSettings/GKH.ini
new file mode 100644
index 0000000000..2b6b9db60d
--- /dev/null
+++ b/Data/Sys/GameSettings/GKH.ini
@@ -0,0 +1,24 @@
+# GKHEA4, GKHPA4 - King Arthur
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GKHEA4.ini b/Data/Sys/GameSettings/GKHEA4.ini
deleted file mode 100644
index 7f95539557..0000000000
--- a/Data/Sys/GameSettings/GKHEA4.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GKHEA4 - King Arthur
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GKHPA4.ini b/Data/Sys/GameSettings/GKHPA4.ini
deleted file mode 100644
index f3ffd090fd..0000000000
--- a/Data/Sys/GameSettings/GKHPA4.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GKHPA4 - King Arthur
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GKJ.ini b/Data/Sys/GameSettings/GKJ.ini
new file mode 100644
index 0000000000..ef09df5190
--- /dev/null
+++ b/Data/Sys/GameSettings/GKJ.ini
@@ -0,0 +1,19 @@
+# GKJE78 - Cars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKJE78.ini b/Data/Sys/GameSettings/GKJE78.ini
deleted file mode 100644
index 6a215a950c..0000000000
--- a/Data/Sys/GameSettings/GKJE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GKJE78 - Cars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKK.ini b/Data/Sys/GameSettings/GKK.ini
new file mode 100644
index 0000000000..8821daf178
--- /dev/null
+++ b/Data/Sys/GameSettings/GKK.ini
@@ -0,0 +1,19 @@
+# GKKE69 - Knockout Kings 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Little shadow bug
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKKE69.ini b/Data/Sys/GameSettings/GKKE69.ini
deleted file mode 100644
index f9dcd571fd..0000000000
--- a/Data/Sys/GameSettings/GKKE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GKKE69 - Knockout Kings 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Little shadow bug
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKL.ini b/Data/Sys/GameSettings/GKL.ini
new file mode 100644
index 0000000000..aa6fcce365
--- /dev/null
+++ b/Data/Sys/GameSettings/GKL.ini
@@ -0,0 +1,30 @@
+# GKLD69, GKLE69, GKLF69, GKLI69, GKLJ69, GKLP69, GKLS69 - The Lord of the Rings; The Return of the King
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GKLD69.ini b/Data/Sys/GameSettings/GKLD69.ini
deleted file mode 100644
index 63196bd83d..0000000000
--- a/Data/Sys/GameSettings/GKLD69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLD69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLE69.ini b/Data/Sys/GameSettings/GKLE69.ini
deleted file mode 100644
index 22a83209dd..0000000000
--- a/Data/Sys/GameSettings/GKLE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLE69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLF69.ini b/Data/Sys/GameSettings/GKLF69.ini
deleted file mode 100644
index 1c88cc94a4..0000000000
--- a/Data/Sys/GameSettings/GKLF69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLF69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLI69.ini b/Data/Sys/GameSettings/GKLI69.ini
deleted file mode 100644
index 4a80f7e92e..0000000000
--- a/Data/Sys/GameSettings/GKLI69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLI69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLJ69.ini b/Data/Sys/GameSettings/GKLJ69.ini
deleted file mode 100644
index c3e7ed0e00..0000000000
--- a/Data/Sys/GameSettings/GKLJ69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLJ69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLP69.ini b/Data/Sys/GameSettings/GKLP69.ini
deleted file mode 100644
index b651afca9f..0000000000
--- a/Data/Sys/GameSettings/GKLP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLP69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKLS69.ini b/Data/Sys/GameSettings/GKLS69.ini
deleted file mode 100644
index 5cd1a0d265..0000000000
--- a/Data/Sys/GameSettings/GKLS69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKLS69 - The Lord of the Rings; The Return of the King
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKM.ini b/Data/Sys/GameSettings/GKM.ini
new file mode 100644
index 0000000000..77956b2c9f
--- /dev/null
+++ b/Data/Sys/GameSettings/GKM.ini
@@ -0,0 +1,25 @@
+# GKME41, GKMP41 - Prince of Persia The Two Thrones
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GKME41.ini b/Data/Sys/GameSettings/GKME41.ini
deleted file mode 100644
index ff089f23b2..0000000000
--- a/Data/Sys/GameSettings/GKME41.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GKME41 - Prince of Persia The Two Thrones
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKMP41.ini b/Data/Sys/GameSettings/GKMP41.ini
deleted file mode 100644
index 206e62faae..0000000000
--- a/Data/Sys/GameSettings/GKMP41.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GKMP41 - Prince of Persia The Two Thrones
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKN.ini b/Data/Sys/GameSettings/GKN.ini
new file mode 100644
index 0000000000..1dd6e3aa26
--- /dev/null
+++ b/Data/Sys/GameSettings/GKN.ini
@@ -0,0 +1,18 @@
+# GKNEB2 - Ultimate Muscle: Legends VS. New Generation
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId =
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GKNEB2.ini b/Data/Sys/GameSettings/GKNEB2.ini
index 0c6156d707..560914866a 100644
--- a/Data/Sys/GameSettings/GKNEB2.ini
+++ b/Data/Sys/GameSettings/GKNEB2.ini
@@ -1,12 +1,5 @@
 # GKNEB2 - Ultimate Muscle: Legends VS. New Generation
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -158,4 +151,3 @@ $VS. Mode (Lower Right Wrestler) = Always Level 1 Special
 0232E43A 00000300
 $VS. Mode (Lower Right Wrestler) = No Special
 0232E43A 00000000
-
diff --git a/Data/Sys/GameSettings/GKO.ini b/Data/Sys/GameSettings/GKO.ini
new file mode 100644
index 0000000000..ac6d785c1f
--- /dev/null
+++ b/Data/Sys/GameSettings/GKO.ini
@@ -0,0 +1,25 @@
+# GKOE70, GKOP6V, GKOP70 - Kao the kangaroo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GKOE70.ini b/Data/Sys/GameSettings/GKOE70.ini
deleted file mode 100644
index 4e8928856f..0000000000
--- a/Data/Sys/GameSettings/GKOE70.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GKOE70 - Kao the kangaroo
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKOP6V.ini b/Data/Sys/GameSettings/GKOP6V.ini
deleted file mode 100644
index 3153a11572..0000000000
--- a/Data/Sys/GameSettings/GKOP6V.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GKOP6V - Kao the kangaroo
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKOP70.ini b/Data/Sys/GameSettings/GKOP70.ini
deleted file mode 100644
index 82079f27c8..0000000000
--- a/Data/Sys/GameSettings/GKOP70.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GKOP70 - Kao the kangaroo
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKQ.ini b/Data/Sys/GameSettings/GKQ.ini
new file mode 100644
index 0000000000..c9e855268e
--- /dev/null
+++ b/Data/Sys/GameSettings/GKQ.ini
@@ -0,0 +1,22 @@
+# GKQJ01 - kururin3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GKQJ01.ini b/Data/Sys/GameSettings/GKQJ01.ini
deleted file mode 100644
index ea0b000d3c..0000000000
--- a/Data/Sys/GameSettings/GKQJ01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GKQJ01 - kururin3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GKS.ini b/Data/Sys/GameSettings/GKS.ini
new file mode 100644
index 0000000000..3a795191fb
--- /dev/null
+++ b/Data/Sys/GameSettings/GKS.ini
@@ -0,0 +1,22 @@
+# GKSE52, GKSP52, GKSX52 - Kelly Slater's Pro Surfer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to work.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GKSE52.ini b/Data/Sys/GameSettings/GKSE52.ini
deleted file mode 100644
index bbf45ff183..0000000000
--- a/Data/Sys/GameSettings/GKSE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GKSE52 - Kelly Slater's Pro Surfer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Can't see cutscenes
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKT.ini b/Data/Sys/GameSettings/GKT.ini
new file mode 100644
index 0000000000..365175789b
--- /dev/null
+++ b/Data/Sys/GameSettings/GKT.ini
@@ -0,0 +1,19 @@
+# GKTJA4 - CaptainTUBASAGC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GKTJA4.ini b/Data/Sys/GameSettings/GKTJA4.ini
deleted file mode 100644
index c0c4923a06..0000000000
--- a/Data/Sys/GameSettings/GKTJA4.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GKTJA4 - CaptainTUBASAGC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GKU.ini b/Data/Sys/GameSettings/GKU.ini
new file mode 100644
index 0000000000..295bb7d21e
--- /dev/null
+++ b/Data/Sys/GameSettings/GKU.ini
@@ -0,0 +1,30 @@
+# GKUE9G - Scaler
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GKUE9G.ini b/Data/Sys/GameSettings/GKUE9G.ini
deleted file mode 100644
index 861b38c56e..0000000000
--- a/Data/Sys/GameSettings/GKUE9G.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GKUE9G - Scaler
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GKY.ini b/Data/Sys/GameSettings/GKY.ini
new file mode 100644
index 0000000000..27cb88b819
--- /dev/null
+++ b/Data/Sys/GameSettings/GKY.ini
@@ -0,0 +1,30 @@
+# GKYE01, GKYJ01, GKYP01 - Kirby Air Ride
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/GKYE01.ini b/Data/Sys/GameSettings/GKYE01.ini
deleted file mode 100644
index 107c8c7bd2..0000000000
--- a/Data/Sys/GameSettings/GKYE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKYE01 - Kirby Air Ride
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GKYJ01.ini b/Data/Sys/GameSettings/GKYJ01.ini
deleted file mode 100644
index a69ec033ad..0000000000
--- a/Data/Sys/GameSettings/GKYJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKYJ01 - Kirby Air Ride
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GKYP01.ini b/Data/Sys/GameSettings/GKYP01.ini
deleted file mode 100644
index 6b385b18df..0000000000
--- a/Data/Sys/GameSettings/GKYP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GKYP01 - Kirby Air Ride
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GKZ.ini b/Data/Sys/GameSettings/GKZ.ini
new file mode 100644
index 0000000000..eb607d56a7
--- /dev/null
+++ b/Data/Sys/GameSettings/GKZ.ini
@@ -0,0 +1,22 @@
+# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to work.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GKZE9G.ini b/Data/Sys/GameSettings/GKZE9G.ini
deleted file mode 100644
index 8fbe142b99..0000000000
--- a/Data/Sys/GameSettings/GKZE9G.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GKZE9G - Codename: Kids Next Door
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Cutscenes not working
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GL5.ini b/Data/Sys/GameSettings/GL5.ini
new file mode 100644
index 0000000000..4d89f6955b
--- /dev/null
+++ b/Data/Sys/GameSettings/GL5.ini
@@ -0,0 +1,19 @@
+# GL5E4F - Lego GameCube
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GL5E4F.ini b/Data/Sys/GameSettings/GL5E4F.ini
deleted file mode 100644
index 5a31b3ed91..0000000000
--- a/Data/Sys/GameSettings/GL5E4F.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GL5E4F - Lego GameCube
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GL7.ini b/Data/Sys/GameSettings/GL7.ini
new file mode 100644
index 0000000000..d34fe6b2e6
--- /dev/null
+++ b/Data/Sys/GameSettings/GL7.ini
@@ -0,0 +1,19 @@
+# GL7E64, GL7P64 - StarWars Lego 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GL7E64.ini b/Data/Sys/GameSettings/GL7E64.ini
deleted file mode 100644
index 426b08d039..0000000000
--- a/Data/Sys/GameSettings/GL7E64.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GL7E64 - StarWars Lego 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GL7P64.ini b/Data/Sys/GameSettings/GL7P64.ini
deleted file mode 100644
index cd71aaaf5e..0000000000
--- a/Data/Sys/GameSettings/GL7P64.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GL7P64 - StarWars Lego 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GL8.ini b/Data/Sys/GameSettings/GL8.ini
new file mode 100644
index 0000000000..477f313191
--- /dev/null
+++ b/Data/Sys/GameSettings/GL8.ini
@@ -0,0 +1,27 @@
+# GL8E4F, GL8F4F - Tomb Raider: Legend
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound little crappy
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GL8E4F.ini b/Data/Sys/GameSettings/GL8E4F.ini
deleted file mode 100644
index 454cf4142d..0000000000
--- a/Data/Sys/GameSettings/GL8E4F.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GL8E4F - Tomb Raider: Legend
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound little crappy
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GL8F4F.ini b/Data/Sys/GameSettings/GL8F4F.ini
deleted file mode 100644
index 577f43dc20..0000000000
--- a/Data/Sys/GameSettings/GL8F4F.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GL8F4F - Tomb Raider: Legend
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound little crappy
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GLB.ini b/Data/Sys/GameSettings/GLB.ini
new file mode 100644
index 0000000000..1e48fe8dde
--- /dev/null
+++ b/Data/Sys/GameSettings/GLB.ini
@@ -0,0 +1,19 @@
+# GLBE8P - HomeRunKING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Black screen
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLBE8P.ini b/Data/Sys/GameSettings/GLBE8P.ini
deleted file mode 100644
index 42a2003793..0000000000
--- a/Data/Sys/GameSettings/GLBE8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLBE8P - HomeRunKING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLC.ini b/Data/Sys/GameSettings/GLC.ini
new file mode 100644
index 0000000000..005f0a8b4a
--- /dev/null
+++ b/Data/Sys/GameSettings/GLC.ini
@@ -0,0 +1,36 @@
+# GLCE52, GLCF52 - Lemony Snicket
+
+[Core]
+# Values set here will override the main Dolphin settings.
+CPUThread = 1
+SkipIdle = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Still encountering slowdowns, but no major issues so far.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+DstAlphaPass = True
+
+[Video_Hacks]
+EFBToTextureEnable = True
+
diff --git a/Data/Sys/GameSettings/GLCE52.ini b/Data/Sys/GameSettings/GLCE52.ini
deleted file mode 100644
index bb5a3ecf50..0000000000
--- a/Data/Sys/GameSettings/GLCE52.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-# GLCE52 - Lemony Snicket
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 1
-SkipIdle = 1
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Still encountering slowdowns, but no major issues so far.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-DstAlphaPass = True
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = True
-
diff --git a/Data/Sys/GameSettings/GLCF52.ini b/Data/Sys/GameSettings/GLCF52.ini
deleted file mode 100644
index 1e63ba6e22..0000000000
--- a/Data/Sys/GameSettings/GLCF52.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-# GLCF52 - Lemony Snicket
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 1
-SkipIdle = 1
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Still encountering slowdowns, but no major issues so far.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-DstAlphaPass = True
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = True
-
diff --git a/Data/Sys/GameSettings/GLE.ini b/Data/Sys/GameSettings/GLE.ini
new file mode 100644
index 0000000000..4e46abfbaa
--- /dev/null
+++ b/Data/Sys/GameSettings/GLE.ini
@@ -0,0 +1,18 @@
+# GLEE08, GLEP08 - Resident Evil 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLEE08.ini b/Data/Sys/GameSettings/GLEE08.ini
deleted file mode 100644
index ff7cd32d8f..0000000000
--- a/Data/Sys/GameSettings/GLEE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLEE08 - Resident Evil 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLEP08.ini b/Data/Sys/GameSettings/GLEP08.ini
deleted file mode 100644
index 2bbc01969d..0000000000
--- a/Data/Sys/GameSettings/GLEP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GLEP08 - Resident Evil 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLL.ini b/Data/Sys/GameSettings/GLL.ini
new file mode 100644
index 0000000000..2d2b6a065a
--- /dev/null
+++ b/Data/Sys/GameSettings/GLL.ini
@@ -0,0 +1,19 @@
+# GLLE78 - Ratatouille
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLLE78.ini b/Data/Sys/GameSettings/GLLE78.ini
deleted file mode 100644
index 7c3e5b445e..0000000000
--- a/Data/Sys/GameSettings/GLLE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLLE78 - Ratatouille
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLM.ini b/Data/Sys/GameSettings/GLM.ini
new file mode 100644
index 0000000000..a16a4bfb83
--- /dev/null
+++ b/Data/Sys/GameSettings/GLM.ini
@@ -0,0 +1,24 @@
+# GLME01, GLMJ01, GLMJ01 - LUIGI'S MANSION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Stereoscopy]
+StereoEFBMonoDepth = True
diff --git a/Data/Sys/GameSettings/GLME01.ini b/Data/Sys/GameSettings/GLME01.ini
index 5a5173604d..b867fb1df6 100644
--- a/Data/Sys/GameSettings/GLME01.ini
+++ b/Data/Sys/GameSettings/GLME01.ini
@@ -1,13 +1,5 @@
 # GLME01 - Luigi's Mansion
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Some controls may not work correctly"
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -30,5 +22,3 @@ $99 of some treasures
 040AE528 3F000063
 040AE52C 3F000063
 040AE530 3F000063
-$End Boss Has No HP
-
diff --git a/Data/Sys/GameSettings/GLMP01.ini b/Data/Sys/GameSettings/GLMP01.ini
index 97858d7fb9..98a46c7254 100644
--- a/Data/Sys/GameSettings/GLMP01.ini
+++ b/Data/Sys/GameSettings/GLMP01.ini
@@ -1,13 +1,5 @@
 # GLMP01 - LUIGI'S MANSION
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -42,7 +34,3 @@ $Ceiling Walk (D-Up & B = ON / D-Down & B = OFF)
 $End Boss Has No HP
 0072047A 18000000
 8012A314 3C000000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GLN.ini b/Data/Sys/GameSettings/GLN.ini
new file mode 100644
index 0000000000..f681707284
--- /dev/null
+++ b/Data/Sys/GameSettings/GLN.ini
@@ -0,0 +1,27 @@
+# GLNE69, GLNP69 - Looney Tunes Back In Action
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GLNE69.ini b/Data/Sys/GameSettings/GLNE69.ini
index b0d943387e..1c895618f1 100644
--- a/Data/Sys/GameSettings/GLNE69.ini
+++ b/Data/Sys/GameSettings/GLNE69.ini
@@ -1,14 +1,5 @@
 # GLNE69 - Looney Tunes Back In Action
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -34,7 +25,3 @@ $Unlock Hen Grenades
 0425809C 00000001
 $Unlock ACME Shrink-Ray
 042580C0 00000001
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GLNP69.ini b/Data/Sys/GameSettings/GLNP69.ini
deleted file mode 100644
index 134b724a4e..0000000000
--- a/Data/Sys/GameSettings/GLNP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GLNP69 - Looney Tunes Back In Action
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GLO.ini b/Data/Sys/GameSettings/GLO.ini
new file mode 100644
index 0000000000..ae75f1be9b
--- /dev/null
+++ b/Data/Sys/GameSettings/GLO.ini
@@ -0,0 +1,18 @@
+# GLOE69, GLOP69 - The Two Towers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLOE69.ini b/Data/Sys/GameSettings/GLOE69.ini
deleted file mode 100644
index d8f0e95a4f..0000000000
--- a/Data/Sys/GameSettings/GLOE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GLOE69 - The Two Towers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLOP69.ini b/Data/Sys/GameSettings/GLOP69.ini
deleted file mode 100644
index beb2da0c45..0000000000
--- a/Data/Sys/GameSettings/GLOP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GLOP69 - The Two Towers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GLQ.ini b/Data/Sys/GameSettings/GLQ.ini
new file mode 100644
index 0000000000..3edaa0cad3
--- /dev/null
+++ b/Data/Sys/GameSettings/GLQ.ini
@@ -0,0 +1,18 @@
+# GLQE41 - Tom Clancy's Rainbow Six Lockdown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLQE41.ini b/Data/Sys/GameSettings/GLQE41.ini
deleted file mode 100644
index 802992c303..0000000000
--- a/Data/Sys/GameSettings/GLQE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GLQE41 - Tom Clancy's Rainbow Six Lockdown
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLR.ini b/Data/Sys/GameSettings/GLR.ini
new file mode 100644
index 0000000000..59774dc677
--- /dev/null
+++ b/Data/Sys/GameSettings/GLR.ini
@@ -0,0 +1,28 @@
+# GLRD64, GLRE64, GLRF64, GLRJ13, GLRP64 - Star Wars - Rogue Squadron III - Rebel Strike
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs LLE audio for proper sound.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GLRE64.ini b/Data/Sys/GameSettings/GLRE64.ini
deleted file mode 100644
index b0f4def03e..0000000000
--- a/Data/Sys/GameSettings/GLRE64.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GLRE64 - Star Wars - Rogue Squadron III - Rebel Strike
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Does not boot
-EmulationStateId = 1
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GLS.ini b/Data/Sys/GameSettings/GLS.ini
new file mode 100644
index 0000000000..3ec892dd6f
--- /dev/null
+++ b/Data/Sys/GameSettings/GLS.ini
@@ -0,0 +1,32 @@
+# GLSD64, GLSE64, GLSF64, GLSP64 - LucasArts Gladius
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncGPU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GLSD64.ini b/Data/Sys/GameSettings/GLSD64.ini
deleted file mode 100644
index 63e77b0c1f..0000000000
--- a/Data/Sys/GameSettings/GLSD64.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GLSD64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini
deleted file mode 100644
index f9dabd5c4c..0000000000
--- a/Data/Sys/GameSettings/GLSE64.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GLSE64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini
deleted file mode 100644
index c9a0db669e..0000000000
--- a/Data/Sys/GameSettings/GLSF64.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GLSF64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini
deleted file mode 100644
index c78a2dd0a0..0000000000
--- a/Data/Sys/GameSettings/GLSP64.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GLSP64 - LucasArts Gladius
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GLU.ini b/Data/Sys/GameSettings/GLU.ini
new file mode 100644
index 0000000000..74971dedbf
--- /dev/null
+++ b/Data/Sys/GameSettings/GLU.ini
@@ -0,0 +1,18 @@
+# GLUE7U - Lotus Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLUE7U.ini b/Data/Sys/GameSettings/GLUE7U.ini
deleted file mode 100644
index e72a80323f..0000000000
--- a/Data/Sys/GameSettings/GLUE7U.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GLUE7U - Lotus Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLW.ini b/Data/Sys/GameSettings/GLW.ini
new file mode 100644
index 0000000000..cf544bb0f2
--- /dev/null
+++ b/Data/Sys/GameSettings/GLW.ini
@@ -0,0 +1,22 @@
+# GLWE51 - Legends of Wrestling
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GLWE51.ini b/Data/Sys/GameSettings/GLWE51.ini
deleted file mode 100644
index a20368d450..0000000000
--- a/Data/Sys/GameSettings/GLWE51.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GLWE51 - Legends of Wrestling
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GLY.ini b/Data/Sys/GameSettings/GLY.ini
new file mode 100644
index 0000000000..600af1a931
--- /dev/null
+++ b/Data/Sys/GameSettings/GLY.ini
@@ -0,0 +1,27 @@
+# GLYE69, GLYP69 - NBA LIVE 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GLYE69.ini b/Data/Sys/GameSettings/GLYE69.ini
deleted file mode 100644
index 8593f2a619..0000000000
--- a/Data/Sys/GameSettings/GLYE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GLYE69 - NBA LIVE 2005
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GLYP69.ini b/Data/Sys/GameSettings/GLYP69.ini
deleted file mode 100644
index d76e524e07..0000000000
--- a/Data/Sys/GameSettings/GLYP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GLYP69 - NBA LIVE 2005
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GLZ.ini b/Data/Sys/GameSettings/GLZ.ini
new file mode 100644
index 0000000000..e51462cdce
--- /dev/null
+++ b/Data/Sys/GameSettings/GLZ.ini
@@ -0,0 +1,19 @@
+# GLZE69, GLZF69 - 007 From Russia With Love
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GLZE69.ini b/Data/Sys/GameSettings/GLZE69.ini
deleted file mode 100644
index 8502c361f2..0000000000
--- a/Data/Sys/GameSettings/GLZE69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GLZE69 - 007 From Russia With Love
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GLZF69.ini b/Data/Sys/GameSettings/GLZF69.ini
deleted file mode 100644
index a15f4b58ce..0000000000
--- a/Data/Sys/GameSettings/GLZF69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GLZF69 - 007 From Russia With Love
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GM2.ini b/Data/Sys/GameSettings/GM2.ini
new file mode 100644
index 0000000000..c6810bd7c9
--- /dev/null
+++ b/Data/Sys/GameSettings/GM2.ini
@@ -0,0 +1,30 @@
+# GM2E8P, GM2J8P, GM2P8P - SUPER MONKEY BALL 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Shadows need fast depth enabled.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+FastDepthCalc = True
diff --git a/Data/Sys/GameSettings/GM2E8P.ini b/Data/Sys/GameSettings/GM2E8P.ini
deleted file mode 100644
index 67db02875d..0000000000
--- a/Data/Sys/GameSettings/GM2E8P.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GM2E8P - SUPER MONKEY BALL 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound issues (that can't be fixed by lle audio).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini
deleted file mode 100644
index e2d07f7bba..0000000000
--- a/Data/Sys/GameSettings/GM2P8P.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GM2P8P - SUPER MONKEY BALL 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound issues (that can't be fixed by lle audio).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GM3.ini b/Data/Sys/GameSettings/GM3.ini
new file mode 100644
index 0000000000..2828527275
--- /dev/null
+++ b/Data/Sys/GameSettings/GM3.ini
@@ -0,0 +1,23 @@
+# GM3E69, GM3P69 - Madden NFL 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GM3E69.ini b/Data/Sys/GameSettings/GM3E69.ini
deleted file mode 100644
index 9bedf1af5f..0000000000
--- a/Data/Sys/GameSettings/GM3E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GM3E69 - Madden NFL 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Music is broken menu gfx glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GM4.ini b/Data/Sys/GameSettings/GM4.ini
new file mode 100644
index 0000000000..256797036b
--- /dev/null
+++ b/Data/Sys/GameSettings/GM4.ini
@@ -0,0 +1,26 @@
+# GM4E01, GM4J01, GM4P01 - Mario Kart: Double Dash!!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/GM4E01.ini b/Data/Sys/GameSettings/GM4E01.ini
index 01f46994b5..e7ffeadd1c 100644
--- a/Data/Sys/GameSettings/GM4E01.ini
+++ b/Data/Sys/GameSettings/GM4E01.ini
@@ -1,13 +1,5 @@
 # GM4E01 - Mario Kart: Double Dash!!
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -130,12 +122,3 @@ $Reduced Nintendo Blur
 022B3382 000000E8
 $Increased Nintendo Blur
 022B3382 000000CC
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GM4J01.ini b/Data/Sys/GameSettings/GM4J01.ini
deleted file mode 100644
index c34d916d90..0000000000
--- a/Data/Sys/GameSettings/GM4J01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GM4J01 - Mario Kart: Double Dash!!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GM4P01.ini b/Data/Sys/GameSettings/GM4P01.ini
index 639879b279..c3e24b8234 100644
--- a/Data/Sys/GameSettings/GM4P01.ini
+++ b/Data/Sys/GameSettings/GM4P01.ini
@@ -1,13 +1,5 @@
 # GM4P01 - Mario Kart: Double Dash!!
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -147,7 +139,3 @@ $Increased Nintendo Blur
 $Goraud Shading
 044CC633 18000000
 040A9714 4E800020
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GM5.ini b/Data/Sys/GameSettings/GM5.ini
new file mode 100644
index 0000000000..febe8e117c
--- /dev/null
+++ b/Data/Sys/GameSettings/GM5.ini
@@ -0,0 +1,30 @@
+# GM5E7D, GM5F7D, GM5P7D - Metal Arms: Glitch in the System
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GM5E7D.ini b/Data/Sys/GameSettings/GM5E7D.ini
deleted file mode 100644
index bb9b0213c2..0000000000
--- a/Data/Sys/GameSettings/GM5E7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5E7D - Metal Arms: Glitch in the System
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GM5F7D.ini b/Data/Sys/GameSettings/GM5F7D.ini
deleted file mode 100644
index e0d32653a6..0000000000
--- a/Data/Sys/GameSettings/GM5F7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5F7D - Metal Arms: Glitch in the System
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GM5P7D.ini b/Data/Sys/GameSettings/GM5P7D.ini
deleted file mode 100644
index 7b54fa13c5..0000000000
--- a/Data/Sys/GameSettings/GM5P7D.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GM5P7D - Metal Arms: Glitch in the System
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GM6.ini b/Data/Sys/GameSettings/GM6.ini
new file mode 100644
index 0000000000..87aaf0ac04
--- /dev/null
+++ b/Data/Sys/GameSettings/GM6.ini
@@ -0,0 +1,29 @@
+# GM6EE9, GM6PE9 - Medabots Infinity 4th Submission
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GM6EE9.ini b/Data/Sys/GameSettings/GM6EE9.ini
deleted file mode 100644
index 64ab1259f9..0000000000
--- a/Data/Sys/GameSettings/GM6EE9.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GM6EE9 - Medabots Infinity 4th Submission
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = MMU speed hack is needed for balloon bombs or the game crashes.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GM6PE9.ini b/Data/Sys/GameSettings/GM6PE9.ini
deleted file mode 100644
index 8ee6da0334..0000000000
--- a/Data/Sys/GameSettings/GM6PE9.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GM6PE9 - Medabots Infinity 4th Submission
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = MMU speed hack is needed for balloon bombs or the game crashes.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GM8.ini b/Data/Sys/GameSettings/GM8.ini
new file mode 100644
index 0000000000..6b77f49f4e
--- /dev/null
+++ b/Data/Sys/GameSettings/GM8.ini
@@ -0,0 +1,32 @@
+# GM8E01, GM8J01, GM8P01 - Metroid Prime
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GM8E01.ini b/Data/Sys/GameSettings/GM8E01.ini
index 8b26df7c14..849fec7e6a 100644
--- a/Data/Sys/GameSettings/GM8E01.ini
+++ b/Data/Sys/GameSettings/GM8E01.ini
@@ -1,14 +1,5 @@
 # GM8E01 - Metroid Prime
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -93,22 +84,3 @@ $Have Beam Combo B
 4200183C 00430001
 $Have Beam Combo C
 4200183C 004F0001
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Speedhacks]
-0x80384b1c=400
-
diff --git a/Data/Sys/GameSettings/GM8J01.ini b/Data/Sys/GameSettings/GM8J01.ini
deleted file mode 100644
index 6999338dc5..0000000000
--- a/Data/Sys/GameSettings/GM8J01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# GM8E01 - Metroid Prime
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues="Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Speedhacks]
-0x803708f8=400
-
diff --git a/Data/Sys/GameSettings/GM8P01.ini b/Data/Sys/GameSettings/GM8P01.ini
deleted file mode 100644
index faa5855be3..0000000000
--- a/Data/Sys/GameSettings/GM8P01.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GM8P01 - Metroid Prime
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
-[Speedhacks]
-0x8036eba0=400
-
diff --git a/Data/Sys/GameSettings/GMB.ini b/Data/Sys/GameSettings/GMB.ini
new file mode 100644
index 0000000000..ff9c84e0c1
--- /dev/null
+++ b/Data/Sys/GameSettings/GMB.ini
@@ -0,0 +1,23 @@
+# GMBE8P, GMBJ8P, GMBP8P - Super Monkey Ball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini
deleted file mode 100644
index c9c0ce1ea5..0000000000
--- a/Data/Sys/GameSettings/GMBE8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GMBE8P - Super Monkey Ball (U)
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GMBP8P.ini b/Data/Sys/GameSettings/GMBP8P.ini
deleted file mode 100644
index f528896d77..0000000000
--- a/Data/Sys/GameSettings/GMBP8P.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GMBP8P - Super Monkey Ball (PAL)
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GMD.ini b/Data/Sys/GameSettings/GMD.ini
new file mode 100644
index 0000000000..c5b53f55a0
--- /dev/null
+++ b/Data/Sys/GameSettings/GMD.ini
@@ -0,0 +1,23 @@
+# GMDE69 - Madden NFL 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GMF.ini b/Data/Sys/GameSettings/GMF.ini
new file mode 100644
index 0000000000..94683d829b
--- /dev/null
+++ b/Data/Sys/GameSettings/GMF.ini
@@ -0,0 +1,18 @@
+# GMFS69 - Medal of Honor Frontline
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GMFS69.ini b/Data/Sys/GameSettings/GMFS69.ini
deleted file mode 100644
index df3367edb7..0000000000
--- a/Data/Sys/GameSettings/GMFS69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GMFS69 - Medal of Honor Frontline
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GMH.ini b/Data/Sys/GameSettings/GMH.ini
new file mode 100644
index 0000000000..18519f9782
--- /dev/null
+++ b/Data/Sys/GameSettings/GMH.ini
@@ -0,0 +1,31 @@
+# GMHE52, GMHF52, GMHP52 - Mat Hoffman's Pro BMX 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GMHE52.ini b/Data/Sys/GameSettings/GMHE52.ini
deleted file mode 100644
index ae7a157833..0000000000
--- a/Data/Sys/GameSettings/GMHE52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMHE52 - Mat Hoffman's Pro BMX 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to show up (r6945)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GMHF52.ini b/Data/Sys/GameSettings/GMHF52.ini
deleted file mode 100644
index 310520006a..0000000000
--- a/Data/Sys/GameSettings/GMHF52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMHF52 - Mat Hoffman's Pro BMX 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to show up (r6945)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GMHP52.ini b/Data/Sys/GameSettings/GMHP52.ini
deleted file mode 100644
index b362a4fc89..0000000000
--- a/Data/Sys/GameSettings/GMHP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMHP52 - Mat Hoffman's Pro BMX 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to show up (r6945)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GMI.ini b/Data/Sys/GameSettings/GMI.ini
new file mode 100644
index 0000000000..c1694fea1d
--- /dev/null
+++ b/Data/Sys/GameSettings/GMI.ini
@@ -0,0 +1,31 @@
+# GMIE70, GMIP70 - Mission: Impossible Operation Surma
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GMIE70.ini b/Data/Sys/GameSettings/GMIE70.ini
deleted file mode 100644
index ae5ab821b6..0000000000
--- a/Data/Sys/GameSettings/GMIE70.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GMIE70 - Mission: Impossible Operation Surma
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GMIP70.ini b/Data/Sys/GameSettings/GMIP70.ini
deleted file mode 100644
index 1eaf7ae713..0000000000
--- a/Data/Sys/GameSettings/GMIP70.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GMIP70 - Mission: Impossible Operation Surma
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GMK.ini b/Data/Sys/GameSettings/GMK.ini
new file mode 100644
index 0000000000..270ef66047
--- /dev/null
+++ b/Data/Sys/GameSettings/GMK.ini
@@ -0,0 +1,18 @@
+# GMKD5D, GMKE5D, GMKP5D - Mortal Kombat: Deadly Alliance
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GMKD5D.ini b/Data/Sys/GameSettings/GMKD5D.ini
deleted file mode 100644
index 74febe93d6..0000000000
--- a/Data/Sys/GameSettings/GMKD5D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GMKD5D - Mortal Kombat Deadly Alliance
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GML.ini b/Data/Sys/GameSettings/GML.ini
new file mode 100644
index 0000000000..7d6dca726f
--- /dev/null
+++ b/Data/Sys/GameSettings/GML.ini
@@ -0,0 +1,19 @@
+# GMLEA4 - ESPN MLS ExtraTime 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = EXTREME SLOW AND BAD SOUND
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GMLEA4.ini b/Data/Sys/GameSettings/GMLEA4.ini
deleted file mode 100644
index 0af493dea0..0000000000
--- a/Data/Sys/GameSettings/GMLEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GMLEA4 - ESPN MLS ExtraTime 2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = EXTREME SLOW AND BAD SOUND
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GMN.ini b/Data/Sys/GameSettings/GMN.ini
new file mode 100644
index 0000000000..45b2920ddc
--- /dev/null
+++ b/Data/Sys/GameSettings/GMN.ini
@@ -0,0 +1,34 @@
+# GMNE78, GMNP78 - Monsters, Inc. Scream Arena
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos require real XFB, slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GMNE78.ini b/Data/Sys/GameSettings/GMNE78.ini
deleted file mode 100644
index 77f81a4407..0000000000
--- a/Data/Sys/GameSettings/GMNE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GMNE78 - Scream Arena
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos require real XFB, HLE sound is weird
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GMP.ini b/Data/Sys/GameSettings/GMP.ini
new file mode 100644
index 0000000000..be747f4171
--- /dev/null
+++ b/Data/Sys/GameSettings/GMP.ini
@@ -0,0 +1,21 @@
+# GMPE01, GMPJ01, GMPP01 - Mario Party 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
diff --git a/Data/Sys/GameSettings/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini
index cfe334dd34..a991718af1 100644
--- a/Data/Sys/GameSettings/GMPE01.ini
+++ b/Data/Sys/GameSettings/GMPE01.ini
@@ -1,13 +1,5 @@
 # GMPE01 - Mario Party 4
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="The bubbles in into scene when starting a game are not shaded right?"
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -111,4 +103,3 @@ $Press Z+R To Be On Turn 20
 $Press Z+L To Be On Turn 1
 0A1E67F0 00000050
 0018FCFC 00000001
-
diff --git a/Data/Sys/GameSettings/GMPP01.ini b/Data/Sys/GameSettings/GMPP01.ini
deleted file mode 100644
index f37169fd18..0000000000
--- a/Data/Sys/GameSettings/GMPP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GMPP01 - Mario Party 4
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GMS.ini b/Data/Sys/GameSettings/GMS.ini
new file mode 100644
index 0000000000..2cd2562dae
--- /dev/null
+++ b/Data/Sys/GameSettings/GMS.ini
@@ -0,0 +1,34 @@
+# GMSE01, GMSJ01, GMSP01 - Super Mario Sunshine
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram and no texture filtering for the goo.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+PerfQueriesEnable = True
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini
index 1442509fc2..1b126de8bc 100644
--- a/Data/Sys/GameSettings/GMSE01.ini
+++ b/Data/Sys/GameSettings/GMSE01.ini
@@ -1,13 +1,5 @@
 # GMSE01 - Super Mario Sunshine
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = needs EFB to Ram
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -16,10 +8,6 @@ EmulationIssues = needs EFB to Ram
 
 [ActionReplay]
 # Add action replay cheats here.
-$All Shines (not working)
-045708E8 FFFFFFFF
-045708EC FFFFFFFF
-045708F0 FFFFFFFF
 $Open all levels and nozzles (not working?)
 04570958 FFFFFFFF
 0457095C FFFFFFFF
@@ -144,22 +132,8 @@ $D-Pad Left For Normal Mario
 4240E12C 4DE63F80
 4240E12C 4DE83F80
 00000000 40000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-PerfQueriesEnable = True
-
-[Video_Settings]
-wideScreenHack = False
-UseNativeMips = True
-AspectRatio = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
+$Widescreen Heat Wave Fix [YoshiOG1]
+043AA050 3F2AAAAB
+043AA05C BF2AAAAB
+043AA060 3F2AAAAB
+043AA070 3FAAAAAB
diff --git a/Data/Sys/GameSettings/GMSJ01.ini b/Data/Sys/GameSettings/GMSJ01.ini
deleted file mode 100644
index d5ab074e47..0000000000
--- a/Data/Sys/GameSettings/GMSJ01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# GMSJ01 - Super Mario Sunshine
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = needs EFB to Ram
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-PerfQueriesEnable = True
-
-[Video_Settings]
-wideScreenHack = False
-UseNativeMips = True
-AspectRatio = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GMSP01.ini b/Data/Sys/GameSettings/GMSP01.ini
index b44c75d55a..1758b1e47b 100644
--- a/Data/Sys/GameSettings/GMSP01.ini
+++ b/Data/Sys/GameSettings/GMSP01.ini
@@ -1,13 +1,5 @@
 # GMSP01 - Super Mario Sunshine
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = needs EFB to Ram
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -66,22 +58,6 @@ $Any Fruit Opens Yoshi Eggs
 $Yoshi Loves Water
 00E66B5C 18000000
 0426837C 4E800020
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-PerfQueriesEnable = True
-
-[Video_Settings]
-wideScreenHack = False
-UseNativeMips = True
-AspectRatio = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
+$Widescreen Heat Wave Fix
+F0N5-B36H-HZDVX
+6GRT-TJHW-8MR45
diff --git a/Data/Sys/GameSettings/GMT.ini b/Data/Sys/GameSettings/GMT.ini
new file mode 100644
index 0000000000..8c5534812a
--- /dev/null
+++ b/Data/Sys/GameSettings/GMT.ini
@@ -0,0 +1,19 @@
+# GMTP69 - Disney's PARTY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GMTP69.ini b/Data/Sys/GameSettings/GMTP69.ini
deleted file mode 100644
index 155ea67f85..0000000000
--- a/Data/Sys/GameSettings/GMTP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GMTP69 - Disney's PARTY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Needs Projectin Before R945"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GMU.ini b/Data/Sys/GameSettings/GMU.ini
new file mode 100644
index 0000000000..c1da98bdfe
--- /dev/null
+++ b/Data/Sys/GameSettings/GMU.ini
@@ -0,0 +1,19 @@
+# GMUE5D - Dr. Muto
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = crash
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GMUE5D.ini b/Data/Sys/GameSettings/GMUE5D.ini
deleted file mode 100644
index 445d651b44..0000000000
--- a/Data/Sys/GameSettings/GMUE5D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GMUE5D - Dr. Muto
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = crash
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GMX.ini b/Data/Sys/GameSettings/GMX.ini
new file mode 100644
index 0000000000..1d355ce8c6
--- /dev/null
+++ b/Data/Sys/GameSettings/GMX.ini
@@ -0,0 +1,28 @@
+# GMXE70, GMXJB2, GMXP70 - Enter The Matrix
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GMXE70.ini b/Data/Sys/GameSettings/GMXE70.ini
index 214760e887..826e757c5d 100644
--- a/Data/Sys/GameSettings/GMXE70.ini
+++ b/Data/Sys/GameSettings/GMXE70.ini
@@ -1,14 +1,5 @@
 # GMXE70 - Enter The Matrix
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -40,7 +31,3 @@ $Enable Multiplayer fighting levels(Save Game In Hacking Menu To Enable)
 04950504 00000280
 $Have Test And Multiplayer Fighting Levels(Save Game In Hacking Menu To Enable)
 04950504 00002280
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GN4.ini b/Data/Sys/GameSettings/GN4.ini
new file mode 100644
index 0000000000..a0eda2eaa3
--- /dev/null
+++ b/Data/Sys/GameSettings/GN4.ini
@@ -0,0 +1,30 @@
+# GN4E69 - NASCAR 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GN5.ini b/Data/Sys/GameSettings/GN5.ini
new file mode 100644
index 0000000000..da07dc9d21
--- /dev/null
+++ b/Data/Sys/GameSettings/GN5.ini
@@ -0,0 +1,26 @@
+# GN5E69, GN5P69 - NHL 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/GN6.ini b/Data/Sys/GameSettings/GN6.ini
new file mode 100644
index 0000000000..9797ae3ed3
--- /dev/null
+++ b/Data/Sys/GameSettings/GN6.ini
@@ -0,0 +1,27 @@
+# GN6E69, GN6P69 - NHL06
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GN6E69.ini b/Data/Sys/GameSettings/GN6E69.ini
deleted file mode 100644
index a74f874d57..0000000000
--- a/Data/Sys/GameSettings/GN6E69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GN6E69 - NHL06
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GN7.ini b/Data/Sys/GameSettings/GN7.ini
new file mode 100644
index 0000000000..77b593397b
--- /dev/null
+++ b/Data/Sys/GameSettings/GN7.ini
@@ -0,0 +1,22 @@
+# GN7E69, GN7P69 - NFL STREET 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GN8.ini b/Data/Sys/GameSettings/GN8.ini
new file mode 100644
index 0000000000..7829453c17
--- /dev/null
+++ b/Data/Sys/GameSettings/GN8.ini
@@ -0,0 +1,27 @@
+# GN8E69, GN8P69 - NBA LIVE 2004
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GN8E69.ini b/Data/Sys/GameSettings/GN8E69.ini
deleted file mode 100644
index 8a555fd89d..0000000000
--- a/Data/Sys/GameSettings/GN8E69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GN8E69 - NBA LIVE 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GN8P69.ini b/Data/Sys/GameSettings/GN8P69.ini
deleted file mode 100644
index 8ad59e2b41..0000000000
--- a/Data/Sys/GameSettings/GN8P69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GN8P69 - NBA LIVE 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GNC.ini b/Data/Sys/GameSettings/GNC.ini
new file mode 100644
index 0000000000..d45006d38c
--- /dev/null
+++ b/Data/Sys/GameSettings/GNC.ini
@@ -0,0 +1,22 @@
+# GNCE69 - NASCAR Thunder 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GND.ini b/Data/Sys/GameSettings/GND.ini
new file mode 100644
index 0000000000..e7a4f2e576
--- /dev/null
+++ b/Data/Sys/GameSettings/GND.ini
@@ -0,0 +1,18 @@
+# GNDE69 - NFS Underground
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GNDE69.ini b/Data/Sys/GameSettings/GNDE69.ini
deleted file mode 100644
index 23f5c8b7aa..0000000000
--- a/Data/Sys/GameSettings/GNDE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GNDE69 - NFS Underground
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GNE.ini b/Data/Sys/GameSettings/GNE.ini
new file mode 100644
index 0000000000..b52b2a132a
--- /dev/null
+++ b/Data/Sys/GameSettings/GNE.ini
@@ -0,0 +1,22 @@
+# GNED78, GNEE78, GNEF78, GNEP78, GNES78 - Finding Nemo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNH.ini b/Data/Sys/GameSettings/GNH.ini
new file mode 100644
index 0000000000..9745b87892
--- /dev/null
+++ b/Data/Sys/GameSettings/GNH.ini
@@ -0,0 +1,25 @@
+# GNHE5D, GNHP5D - NHL HITZ 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GNHE5d.ini b/Data/Sys/GameSettings/GNHE5d.ini
index 8c54af0a1e..9329d6c298 100644
--- a/Data/Sys/GameSettings/GNHE5d.ini
+++ b/Data/Sys/GameSettings/GNHE5d.ini
@@ -1,12 +1,4 @@
-# GNHE5d - NHL HITZ 20-02
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable the GameCube BIOS to allow the game to boot.
+# GNHE5d - NHL HITZ 2002
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,7 +10,3 @@ $Nop Hack
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GNI.ini b/Data/Sys/GameSettings/GNI.ini
new file mode 100644
index 0000000000..dd21acd0db
--- /dev/null
+++ b/Data/Sys/GameSettings/GNI.ini
@@ -0,0 +1,15 @@
+# GNIEA4, GNIPA4 - TMNT2
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/Sys/GameSettings/GNIEA4.ini b/Data/Sys/GameSettings/GNIEA4.ini
deleted file mode 100644
index bb20d2ad9e..0000000000
--- a/Data/Sys/GameSettings/GNIEA4.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GNIEA4 - TMNT2
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GNIPA4.ini b/Data/Sys/GameSettings/GNIPA4.ini
deleted file mode 100644
index 38808a2ee6..0000000000
--- a/Data/Sys/GameSettings/GNIPA4.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GNIPA4 - TMNT2
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GNJ.ini b/Data/Sys/GameSettings/GNJ.ini
new file mode 100644
index 0000000000..8fe4e92886
--- /dev/null
+++ b/Data/Sys/GameSettings/GNJ.ini
@@ -0,0 +1,31 @@
+# GNJEAF - I-Ninja
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GNJEAF.ini b/Data/Sys/GameSettings/GNJEAF.ini
deleted file mode 100644
index a22a2bdbca..0000000000
--- a/Data/Sys/GameSettings/GNJEAF.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GNJEAF - I-Ninja
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GNL.ini b/Data/Sys/GameSettings/GNL.ini
new file mode 100644
index 0000000000..0e78b51f5f
--- /dev/null
+++ b/Data/Sys/GameSettings/GNL.ini
@@ -0,0 +1,27 @@
+# GNLE69 - NBA Live 2003
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GNLE69.ini b/Data/Sys/GameSettings/GNLE69.ini
deleted file mode 100644
index 304c9bc4ea..0000000000
--- a/Data/Sys/GameSettings/GNLE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GNLE69 - NBA Live 2003
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GNM.ini b/Data/Sys/GameSettings/GNM.ini
new file mode 100644
index 0000000000..91198d264e
--- /dev/null
+++ b/Data/Sys/GameSettings/GNM.ini
@@ -0,0 +1,30 @@
+# GNMEAF - NAMCO MUSEUM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GNN.ini b/Data/Sys/GameSettings/GNN.ini
new file mode 100644
index 0000000000..f0a1a1eda0
--- /dev/null
+++ b/Data/Sys/GameSettings/GNN.ini
@@ -0,0 +1,26 @@
+# GNNE69, GNNP69 - NFL Street
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNNE69.ini b/Data/Sys/GameSettings/GNNE69.ini
deleted file mode 100644
index 67477fc26c..0000000000
--- a/Data/Sys/GameSettings/GNNE69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# GNNE69 - NFL Street
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GNO.ini b/Data/Sys/GameSettings/GNO.ini
new file mode 100644
index 0000000000..7ed3b69631
--- /dev/null
+++ b/Data/Sys/GameSettings/GNO.ini
@@ -0,0 +1,30 @@
+# GNOE78 - Nicktoons Unite!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 1
+PH_SZNear = 0
+PH_SZFar = 1
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar = 0.000153
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GNOE78.ini b/Data/Sys/GameSettings/GNOE78.ini
deleted file mode 100644
index 02a6570373..0000000000
--- a/Data/Sys/GameSettings/GNOE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GNOE78 - Nicktoons Unite!
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.000153
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GNQ.ini b/Data/Sys/GameSettings/GNQ.ini
new file mode 100644
index 0000000000..61a6c543ad
--- /dev/null
+++ b/Data/Sys/GameSettings/GNQ.ini
@@ -0,0 +1,19 @@
+# GNQE69 - Madden NFL 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GNQE69.ini b/Data/Sys/GameSettings/GNQE69.ini
deleted file mode 100644
index 8c4b1f0885..0000000000
--- a/Data/Sys/GameSettings/GNQE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GNQE69 - Madden NFL 2005
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Music is broken menu gfx glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GNR.ini b/Data/Sys/GameSettings/GNR.ini
new file mode 100644
index 0000000000..5dbbd5927d
--- /dev/null
+++ b/Data/Sys/GameSettings/GNR.ini
@@ -0,0 +1,18 @@
+# GNRJDA - naruto gekitou ninja taisen
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GNRJDA.ini b/Data/Sys/GameSettings/GNRJDA.ini
deleted file mode 100644
index fd5d2435f9..0000000000
--- a/Data/Sys/GameSettings/GNRJDA.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GNRJDA - naruto gekitou ninja taisen
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GNU.ini b/Data/Sys/GameSettings/GNU.ini
new file mode 100644
index 0000000000..8d37b9bc58
--- /dev/null
+++ b/Data/Sys/GameSettings/GNU.ini
@@ -0,0 +1,22 @@
+# GNUEDA - NARUTO2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GNUEDA.ini b/Data/Sys/GameSettings/GNUEDA.ini
deleted file mode 100644
index 9ad7f5ecb1..0000000000
--- a/Data/Sys/GameSettings/GNUEDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GNUEDA - NARUTO2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GNW.ini b/Data/Sys/GameSettings/GNW.ini
new file mode 100644
index 0000000000..7be4be90f6
--- /dev/null
+++ b/Data/Sys/GameSettings/GNW.ini
@@ -0,0 +1,27 @@
+# GNWE69, GNWP69 - Def Jam Fight For NY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GNWE69.ini b/Data/Sys/GameSettings/GNWE69.ini
index 58387cea88..70fd9328ef 100644
--- a/Data/Sys/GameSettings/GNWE69.ini
+++ b/Data/Sys/GameSettings/GNWE69.ini
@@ -1,15 +1,8 @@
 # GNWE69 - Def Jam Fight For NY
 
 [Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
 Patch Region = 0x7e000000
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -83,7 +76,3 @@ $Player 4 Max Score
 043F4EAC 05F5E0FF
 $Player 4 Low Score
 043F4EAC 00000000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GNWP69.ini b/Data/Sys/GameSettings/GNWP69.ini
deleted file mode 100644
index 4275ee8c89..0000000000
--- a/Data/Sys/GameSettings/GNWP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GNWP69 - Def Jam Fight For NY
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GNZ.ini b/Data/Sys/GameSettings/GNZ.ini
new file mode 100644
index 0000000000..c60b52bdda
--- /dev/null
+++ b/Data/Sys/GameSettings/GNZ.ini
@@ -0,0 +1,20 @@
+# GNZE69, GNZP69 - NBA STREET Vol.2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
diff --git a/Data/Sys/GameSettings/GO2.ini b/Data/Sys/GameSettings/GO2.ini
new file mode 100644
index 0000000000..5ee098ab53
--- /dev/null
+++ b/Data/Sys/GameSettings/GO2.ini
@@ -0,0 +1,24 @@
+# GO2D4F, GO2E4F, GO2F4F, GO2P4F - Blood Omen 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GO2E4F.ini b/Data/Sys/GameSettings/GO2E4F.ini
index 3d3fb6194b..f989c1eb81 100644
--- a/Data/Sys/GameSettings/GO2E4F.ini
+++ b/Data/Sys/GameSettings/GO2E4F.ini
@@ -1,12 +1,4 @@
-# GO2E4F - Blood Omen 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
+# GO2E4F - Legacy Of Kain: Blood Omen 2
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,4 +8,8 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
+$Infinite Health
+04214F28 EC000828
+04214F70 EC000828
+$Super Quick Level Up
+04214660 EC00083A
diff --git a/Data/Sys/GameSettings/GO7.ini b/Data/Sys/GameSettings/GO7.ini
new file mode 100644
index 0000000000..22d2651f55
--- /dev/null
+++ b/Data/Sys/GameSettings/GO7.ini
@@ -0,0 +1,18 @@
+# GO7E69, GO7F69, GO7P69 - James Bond 007(tm): NightFire(tm)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GO7E69.ini b/Data/Sys/GameSettings/GO7E69.ini
index e293f3e4ad..41d4218cec 100644
--- a/Data/Sys/GameSettings/GO7E69.ini
+++ b/Data/Sys/GameSettings/GO7E69.ini
@@ -1,13 +1,5 @@
 # GO7E69 - James Bond 007(tm): NightFire(tm)
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Levels involving vehicles crash the emulator.
-EmulationStateId = 3
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -30,4 +22,3 @@ $Infinite Helicopter Rockets and Bullets
 014CDE09 000003E7
 014CE551 000003E7
 014CE1AD 000003E7
-
diff --git a/Data/Sys/GameSettings/GO7F69.ini b/Data/Sys/GameSettings/GO7F69.ini
index fdac6d9f33..dd13c23a65 100644
--- a/Data/Sys/GameSettings/GO7F69.ini
+++ b/Data/Sys/GameSettings/GO7F69.ini
@@ -1,13 +1,5 @@
 # GO7F69 - James Bond 007(tm): NightFire(tm)
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = needs optimize quantizers off
-EmulationStateId = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -38,7 +30,3 @@ $Unlock all Levels
 4A0901CE 00000004
 00000000 80207C94
 00000001 000A0018
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GO7P69.ini b/Data/Sys/GameSettings/GO7P69.ini
index 796d7590e5..7e31a0f0d3 100644
--- a/Data/Sys/GameSettings/GO7P69.ini
+++ b/Data/Sys/GameSettings/GO7P69.ini
@@ -1,12 +1,5 @@
 # GO7P69 - James Bond 007(tm): NightFire(tm)
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues=
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -46,4 +39,3 @@ $Unlock Levels
 4A0901CE 00000004
 00000000 80207C94
 00000001 000A0018
-
diff --git a/Data/Sys/GameSettings/GOA.ini b/Data/Sys/GameSettings/GOA.ini
new file mode 100644
index 0000000000..06a8f58705
--- /dev/null
+++ b/Data/Sys/GameSettings/GOA.ini
@@ -0,0 +1,27 @@
+# GOAE52 - Cabela's Outdoor Adventures
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GOAE52.ini b/Data/Sys/GameSettings/GOAE52.ini
deleted file mode 100644
index c9c1d074b7..0000000000
--- a/Data/Sys/GameSettings/GOAE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOAE52 - Cabela's Outdoor Adventures
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOB.ini b/Data/Sys/GameSettings/GOB.ini
new file mode 100644
index 0000000000..884d708529
--- /dev/null
+++ b/Data/Sys/GameSettings/GOB.ini
@@ -0,0 +1,22 @@
+# GOBE4Z, GOBP7N - Bad Boys Miami Takedown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GOBE4Z.ini b/Data/Sys/GameSettings/GOBE4Z.ini
deleted file mode 100644
index 8a083deb0c..0000000000
--- a/Data/Sys/GameSettings/GOBE4Z.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GOBE4Z - Bad Boys Miami Takedown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad voice sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOC.ini b/Data/Sys/GameSettings/GOC.ini
new file mode 100644
index 0000000000..4f1de0aa28
--- /dev/null
+++ b/Data/Sys/GameSettings/GOC.ini
@@ -0,0 +1,18 @@
+# GOCE5D - RoadKill
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GOCE5D.ini b/Data/Sys/GameSettings/GOCE5D.ini
deleted file mode 100644
index 84691ea171..0000000000
--- a/Data/Sys/GameSettings/GOCE5D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GOCE5D - RoadKill
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOG.ini b/Data/Sys/GameSettings/GOG.ini
new file mode 100644
index 0000000000..e2d54341fc
--- /dev/null
+++ b/Data/Sys/GameSettings/GOG.ini
@@ -0,0 +1,18 @@
+# GOGJB2 - ONE PIECE GRANDBATTLE3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GOGJB2.ini b/Data/Sys/GameSettings/GOGJB2.ini
deleted file mode 100644
index 88263a6ef0..0000000000
--- a/Data/Sys/GameSettings/GOGJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GOGJB2 - ONE PIECE GRANDBATTLE3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOM.ini b/Data/Sys/GameSettings/GOM.ini
new file mode 100644
index 0000000000..8d8f5b4b4e
--- /dev/null
+++ b/Data/Sys/GameSettings/GOM.ini
@@ -0,0 +1,21 @@
+# GOMJ01, GOMP01 - Mario Tennis GC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = STC is needed for the goo in the Delfino Plaza court.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GOME01.ini b/Data/Sys/GameSettings/GOME01.ini
index fb47874bfa..92e74d9c44 100644
--- a/Data/Sys/GameSettings/GOME01.ini
+++ b/Data/Sys/GameSettings/GOME01.ini
@@ -1,12 +1,4 @@
-# GOME01 - MarioPowerTennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Bad Graphics
+# GOME01 - Mario Power Tennis
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -28,7 +20,3 @@ $All Minigames Unlocked
 022B3738 0011FFFF
 $All Characters Unlocked
 042B3728 FFFFFFFF
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GOMP01.ini b/Data/Sys/GameSettings/GOMP01.ini
deleted file mode 100644
index 0736324419..0000000000
--- a/Data/Sys/GameSettings/GOMP01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GOMP01 - MarioPowerTennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Lots of Graphical Issues
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GON.ini b/Data/Sys/GameSettings/GON.ini
new file mode 100644
index 0000000000..4a52928c49
--- /dev/null
+++ b/Data/Sys/GameSettings/GON.ini
@@ -0,0 +1,18 @@
+# GONE69 - Medal of Honor European Assault
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GONE69.ini b/Data/Sys/GameSettings/GONE69.ini
deleted file mode 100644
index eb3e35301b..0000000000
--- a/Data/Sys/GameSettings/GONE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GONE69 - Medal of Honor European Assault
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOO.ini b/Data/Sys/GameSettings/GOO.ini
new file mode 100644
index 0000000000..36e25e1b73
--- /dev/null
+++ b/Data/Sys/GameSettings/GOO.ini
@@ -0,0 +1,22 @@
+# GOOE01 - Odama US ver
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GOOE01.ini b/Data/Sys/GameSettings/GOOE01.ini
deleted file mode 100644
index 5d6717b5c5..0000000000
--- a/Data/Sys/GameSettings/GOOE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GOOE01 - Odama US ver
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GOP.ini b/Data/Sys/GameSettings/GOP.ini
new file mode 100644
index 0000000000..d07e1e2496
--- /dev/null
+++ b/Data/Sys/GameSettings/GOP.ini
@@ -0,0 +1,18 @@
+# GOPEB2, GOPJB2 - ONE PIECE GRAND BATTLE RUSH
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GOPEB2.ini b/Data/Sys/GameSettings/GOPEB2.ini
deleted file mode 100644
index d965f88649..0000000000
--- a/Data/Sys/GameSettings/GOPEB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GOPEB2 - ONE PIECE GRAND BATTLE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOPJB2.ini b/Data/Sys/GameSettings/GOPJB2.ini
deleted file mode 100644
index f09531025b..0000000000
--- a/Data/Sys/GameSettings/GOPJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GOPJB2 - ONE PIECE GRAND BATTLE RUSH
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOQ.ini b/Data/Sys/GameSettings/GOQ.ini
new file mode 100644
index 0000000000..28922cfa7b
--- /dev/null
+++ b/Data/Sys/GameSettings/GOQ.ini
@@ -0,0 +1,19 @@
+# GOQEAF - ONE PIECE: GRAND ADVENTURE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GOQEAF.ini b/Data/Sys/GameSettings/GOQEAF.ini
deleted file mode 100644
index f69223c109..0000000000
--- a/Data/Sys/GameSettings/GOQEAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GOQEAF - ONE PIECE: GRAND ADVENTURE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GOS.ini b/Data/Sys/GameSettings/GOS.ini
new file mode 100644
index 0000000000..ae59186f4b
--- /dev/null
+++ b/Data/Sys/GameSettings/GOS.ini
@@ -0,0 +1,28 @@
+# GOSE41, GOSP41, GOSX41 - Open Season
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GOSE41.ini b/Data/Sys/GameSettings/GOSE41.ini
deleted file mode 100644
index 759e6f9c3f..0000000000
--- a/Data/Sys/GameSettings/GOSE41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GOSE41 - Open Season
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs MMU (Slow).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOSP41.ini b/Data/Sys/GameSettings/GOSP41.ini
deleted file mode 100644
index 95e162c52c..0000000000
--- a/Data/Sys/GameSettings/GOSP41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GOSP41 - Open Season
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs MMU (Slow).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOSX41.ini b/Data/Sys/GameSettings/GOSX41.ini
deleted file mode 100644
index 415d1be644..0000000000
--- a/Data/Sys/GameSettings/GOSX41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GOSX41 - Open Season
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs MMU (Slow).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOW.ini b/Data/Sys/GameSettings/GOW.ini
new file mode 100644
index 0000000000..7fb3ce8aab
--- /dev/null
+++ b/Data/Sys/GameSettings/GOW.ini
@@ -0,0 +1,28 @@
+# GOWD69, GOWE69, GOWF69, GOWJ69, GOWP69 - NFS Most Wanted
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini
deleted file mode 100644
index 0fe5d09147..0000000000
--- a/Data/Sys/GameSettings/GOWD69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWD69 - NFS Most Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini
deleted file mode 100644
index ee6b3d1f58..0000000000
--- a/Data/Sys/GameSettings/GOWE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWE69 - NFS Most Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini
deleted file mode 100644
index d3490c4e03..0000000000
--- a/Data/Sys/GameSettings/GOWF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWF69 - NFS Most Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini
deleted file mode 100644
index cf0624b56f..0000000000
--- a/Data/Sys/GameSettings/GOWJ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWJ69 - NFS Most Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini
deleted file mode 100644
index 343106e213..0000000000
--- a/Data/Sys/GameSettings/GOWP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GOWP69 - NFS Most Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GOY.ini b/Data/Sys/GameSettings/GOY.ini
new file mode 100644
index 0000000000..d33c45d35e
--- /dev/null
+++ b/Data/Sys/GameSettings/GOY.ini
@@ -0,0 +1,30 @@
+# GOYD69, GOYF69, GOYP69, GOYS69 - GoldenEye Rogue Agent
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GOYD69.ini b/Data/Sys/GameSettings/GOYD69.ini
deleted file mode 100644
index d48fed607c..0000000000
--- a/Data/Sys/GameSettings/GOYD69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GOYD69 - GoldenEye Rogue Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYE69.ini b/Data/Sys/GameSettings/GOYE69.ini
index b9592ef12c..1796d77a10 100644
--- a/Data/Sys/GameSettings/GOYE69.ini
+++ b/Data/Sys/GameSettings/GOYE69.ini
@@ -1,14 +1,5 @@
 # GOYE69 - GoldenEye Rogue Agent
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -39,15 +30,3 @@ $Slow Enemies (Use On A Empty Profile)
 044F7FFC 3D000000
 $Disable Shadows (Use On A Empty Profile)
 044FA2A4 00000001
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYF69.ini b/Data/Sys/GameSettings/GOYF69.ini
deleted file mode 100644
index 95e1b3b25f..0000000000
--- a/Data/Sys/GameSettings/GOYF69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GOYF69 - GoldenEye Rogue Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYP69.ini b/Data/Sys/GameSettings/GOYP69.ini
deleted file mode 100644
index 3128181698..0000000000
--- a/Data/Sys/GameSettings/GOYP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GOYP69 - GoldenEye Rogue Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GOYS69.ini b/Data/Sys/GameSettings/GOYS69.ini
deleted file mode 100644
index 0c54f77e43..0000000000
--- a/Data/Sys/GameSettings/GOYS69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GOYS69 - GoldenEye Rogue Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up, skip them.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GP2.ini b/Data/Sys/GameSettings/GP2.ini
new file mode 100644
index 0000000000..20f683f6ab
--- /dev/null
+++ b/Data/Sys/GameSettings/GP2.ini
@@ -0,0 +1,31 @@
+# GP2E82, GP2EAF - Pac-Man World 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GP2E82.ini b/Data/Sys/GameSettings/GP2E82.ini
deleted file mode 100644
index 55980e4579..0000000000
--- a/Data/Sys/GameSettings/GP2E82.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GP2E82 - Pac-Man World 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to show up(r6651)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GP2EAF.ini b/Data/Sys/GameSettings/GP2EAF.ini
deleted file mode 100644
index d6877bdea3..0000000000
--- a/Data/Sys/GameSettings/GP2EAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GP2EAF - Pac-Man World 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real xfb for the videos to show up(r6651)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GP4.ini b/Data/Sys/GameSettings/GP4.ini
new file mode 100644
index 0000000000..cb1d7f944c
--- /dev/null
+++ b/Data/Sys/GameSettings/GP4.ini
@@ -0,0 +1,19 @@
+# GP4J18 - pc genjin
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GP4J18.ini b/Data/Sys/GameSettings/GP4J18.ini
deleted file mode 100644
index bfe4972a0b..0000000000
--- a/Data/Sys/GameSettings/GP4J18.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GP4J18 - pc genjin
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GP5.ini b/Data/Sys/GameSettings/GP5.ini
new file mode 100644
index 0000000000..f68a0813c6
--- /dev/null
+++ b/Data/Sys/GameSettings/GP5.ini
@@ -0,0 +1,30 @@
+# GP5E01, GP5J01, GP5P01 - Mario Party 5
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini
index 643bbf3977..0b99f12fb3 100644
--- a/Data/Sys/GameSettings/GP5E01.ini
+++ b/Data/Sys/GameSettings/GP5E01.ini
@@ -1,13 +1,5 @@
 # GP5E01 - Mario Party 5
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -386,16 +378,3 @@ $Press L+X: Player Stops Moving
 0022A28A 00000001
 0022A392 00000001
 00000000 40000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GP5J01.ini b/Data/Sys/GameSettings/GP5J01.ini
deleted file mode 100644
index a85f6b1f37..0000000000
--- a/Data/Sys/GameSettings/GP5J01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GP5J01 - Mario Party 5
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GP5P01.ini b/Data/Sys/GameSettings/GP5P01.ini
deleted file mode 100644
index 5340f6097e..0000000000
--- a/Data/Sys/GameSettings/GP5P01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GP5P01 - Mario Party 5
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/GP6.ini b/Data/Sys/GameSettings/GP6.ini
new file mode 100644
index 0000000000..9809b3bb57
--- /dev/null
+++ b/Data/Sys/GameSettings/GP6.ini
@@ -0,0 +1,30 @@
+# GP6E01, GP6J01, GP6P01 - Mario Party 6
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini
deleted file mode 100644
index 51c566f38d..0000000000
--- a/Data/Sys/GameSettings/GP6E01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP6E01 - Mario Party 6
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GP6J01.ini b/Data/Sys/GameSettings/GP6J01.ini
deleted file mode 100644
index 31ba302fc2..0000000000
--- a/Data/Sys/GameSettings/GP6J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP6J01 - Mario Party 6
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GP6P01.ini b/Data/Sys/GameSettings/GP6P01.ini
deleted file mode 100644
index 3a5837a6c7..0000000000
--- a/Data/Sys/GameSettings/GP6P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP6P01 - Mario Party 6
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Mini games tour bus needs emulate format changes to preview the mini games.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GP7.ini b/Data/Sys/GameSettings/GP7.ini
new file mode 100644
index 0000000000..b437062113
--- /dev/null
+++ b/Data/Sys/GameSettings/GP7.ini
@@ -0,0 +1,29 @@
+# GP7E01, GP7J01, GP7P01 - Mario Party 7
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/GP7E01.ini b/Data/Sys/GameSettings/GP7E01.ini
index 7d3ac3d768..0e723d163e 100644
--- a/Data/Sys/GameSettings/GP7E01.ini
+++ b/Data/Sys/GameSettings/GP7E01.ini
@@ -1,13 +1,5 @@
 # GP7E01 - Mario Party 7
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -25,15 +17,3 @@ $Unlock all Souvieners
 002922FD 000002FF
 $Unlock All Sounds
 002922FA 000001FF
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GP7J01.ini b/Data/Sys/GameSettings/GP7J01.ini
deleted file mode 100644
index 3687a26fb8..0000000000
--- a/Data/Sys/GameSettings/GP7J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP7J01 - Mario Party 7
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GP7P01.ini b/Data/Sys/GameSettings/GP7P01.ini
deleted file mode 100644
index e6356b445e..0000000000
--- a/Data/Sys/GameSettings/GP7P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GP7P01 - Mario Party 7
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GP8.ini b/Data/Sys/GameSettings/GP8.ini
new file mode 100644
index 0000000000..1c4d92c7dc
--- /dev/null
+++ b/Data/Sys/GameSettings/GP8.ini
@@ -0,0 +1,30 @@
+# GP8EAF - Pac-Man World 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GP8EAF.ini b/Data/Sys/GameSettings/GP8EAF.ini
deleted file mode 100644
index d90c1041d8..0000000000
--- a/Data/Sys/GameSettings/GP8EAF.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GP8EAF - Pac-Man World 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GPA.ini b/Data/Sys/GameSettings/GPA.ini
new file mode 100644
index 0000000000..8edee37b38
--- /dev/null
+++ b/Data/Sys/GameSettings/GPA.ini
@@ -0,0 +1,30 @@
+# GPAE01, GPAJ01, GPAP01, GPAU01 - PokemonChannelMainDisk
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb to Ram for painting.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GPAE01.ini b/Data/Sys/GameSettings/GPAE01.ini
deleted file mode 100644
index cb44815498..0000000000
--- a/Data/Sys/GameSettings/GPAE01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAE01 - PokemonChannelMainDisk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for painting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPAJ01.ini b/Data/Sys/GameSettings/GPAJ01.ini
deleted file mode 100644
index 93f929b070..0000000000
--- a/Data/Sys/GameSettings/GPAJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAJ01 - PokemonChannelMainDisk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for painting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPAP01.ini b/Data/Sys/GameSettings/GPAP01.ini
deleted file mode 100644
index 7cd8c88357..0000000000
--- a/Data/Sys/GameSettings/GPAP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAP01 - PokemonChannelMainDisk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for painting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPAU01.ini b/Data/Sys/GameSettings/GPAU01.ini
deleted file mode 100644
index f7b8fa23be..0000000000
--- a/Data/Sys/GameSettings/GPAU01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPAU01 - PokemonChannelMainDisk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for painting.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GPD.ini b/Data/Sys/GameSettings/GPD.ini
new file mode 100644
index 0000000000..596bcfa8d0
--- /dev/null
+++ b/Data/Sys/GameSettings/GPD.ini
@@ -0,0 +1,19 @@
+# GPDE51 - Dakar 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GPDE51.ini b/Data/Sys/GameSettings/GPDE51.ini
deleted file mode 100644
index 5392a55f4f..0000000000
--- a/Data/Sys/GameSettings/GPDE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GPDE51 - Dakar 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GPE.ini b/Data/Sys/GameSettings/GPE.ini
new file mode 100644
index 0000000000..d4aaa89733
--- /dev/null
+++ b/Data/Sys/GameSettings/GPE.ini
@@ -0,0 +1,19 @@
+# GPEJ2Q - PoolEdge for JPN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GPEJ2Q.ini b/Data/Sys/GameSettings/GPEJ2Q.ini
deleted file mode 100644
index 4c9df4d06d..0000000000
--- a/Data/Sys/GameSettings/GPEJ2Q.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GPEJ2Q - PoolEdge for JPN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GPH.ini b/Data/Sys/GameSettings/GPH.ini
new file mode 100644
index 0000000000..7cba5c5e2f
--- /dev/null
+++ b/Data/Sys/GameSettings/GPH.ini
@@ -0,0 +1,25 @@
+# GPHD52, GPHE52, GPHP52 - Pitfall: The Lost Expedition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GPHD52.ini b/Data/Sys/GameSettings/GPHD52.ini
deleted file mode 100644
index a9f0bc49ef..0000000000
--- a/Data/Sys/GameSettings/GPHD52.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GPHD52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPHE52.ini b/Data/Sys/GameSettings/GPHE52.ini
deleted file mode 100644
index 128bd5819b..0000000000
--- a/Data/Sys/GameSettings/GPHE52.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GPHE52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPHP52.ini b/Data/Sys/GameSettings/GPHP52.ini
deleted file mode 100644
index 8e7fb659f0..0000000000
--- a/Data/Sys/GameSettings/GPHP52.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GPHP52 - Pitfall: The Lost Expedition
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPI.ini b/Data/Sys/GameSettings/GPI.ini
new file mode 100644
index 0000000000..bf309a8450
--- /dev/null
+++ b/Data/Sys/GameSettings/GPI.ini
@@ -0,0 +1,21 @@
+# GPIE01, GPIJ01, GPIP01 - Pikmin
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
diff --git a/Data/Sys/GameSettings/GPIE01.ini b/Data/Sys/GameSettings/GPIE01.ini
index d62466cfc7..a6d2f15f20 100644
--- a/Data/Sys/GameSettings/GPIE01.ini
+++ b/Data/Sys/GameSettings/GPIE01.ini
@@ -1,13 +1,5 @@
 # GPIE01 - Pikmin v1.1 NTSC
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -161,9 +153,6 @@ $Random Colors-Every Blue Pikmin
 803D1E18 00000001
 803D1E19 FFFFFFFF
 803D1E1A 0000007F
-
-[Video]
-ProjectionHack = 0
 $Stop Time From Advancing (Story Mode) [Link Master]
 040518DC 60000000
 $Stop/Return Flow of Time (L+D-pad Left/Right) (Story Mode) [Link Master]
@@ -173,4 +162,3 @@ E2000001 80008000
 2839D400 00000042
 040518DC D0030014
 E2000001 80008000
-
diff --git a/Data/Sys/GameSettings/GPIP01.ini b/Data/Sys/GameSettings/GPIP01.ini
index 3cb5a2eb2e..8635a30399 100644
--- a/Data/Sys/GameSettings/GPIP01.ini
+++ b/Data/Sys/GameSettings/GPIP01.ini
@@ -1,13 +1,5 @@
 # GPIP01 - Pikmin PAL
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = sound is sometimes glitchy though
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -92,7 +84,3 @@ $D-pad up for map debug on
 0039D73C 00000001
 $Gfx Debug
 0039D724 00000001
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GPK.ini b/Data/Sys/GameSettings/GPK.ini
new file mode 100644
index 0000000000..3b6ea884dc
--- /dev/null
+++ b/Data/Sys/GameSettings/GPK.ini
@@ -0,0 +1,31 @@
+# GPKE41 - DISNEY'S PK: OUT OF THE SHADOWS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GPKE41.ini b/Data/Sys/GameSettings/GPKE41.ini
deleted file mode 100644
index aef0026171..0000000000
--- a/Data/Sys/GameSettings/GPKE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GPKE41 - DISNEY'S PK: OUT OF THE SHADOWS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GPN.ini b/Data/Sys/GameSettings/GPN.ini
new file mode 100644
index 0000000000..fc4d3694f3
--- /dev/null
+++ b/Data/Sys/GameSettings/GPN.ini
@@ -0,0 +1,18 @@
+# GPNE08, GPNP08 - P.N.03
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GPNE08.ini b/Data/Sys/GameSettings/GPNE08.ini
deleted file mode 100644
index 7bfbca1a30..0000000000
--- a/Data/Sys/GameSettings/GPNE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GPNE08 - P.N.03
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GPNP08.ini b/Data/Sys/GameSettings/GPNP08.ini
index 36bd0af9f2..271e575ef3 100644
--- a/Data/Sys/GameSettings/GPNP08.ini
+++ b/Data/Sys/GameSettings/GPNP08.ini
@@ -1,12 +1,5 @@
 # GPNP08 - P.N.03 PAL
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -120,4 +113,3 @@ $Max Combo's
 $Super Vanessa
 03E0095A 18000000
 041637A0 3FE00000
-
diff --git a/Data/Sys/GameSettings/GPO.ini b/Data/Sys/GameSettings/GPO.ini
new file mode 100644
index 0000000000..dea4c1d680
--- /dev/null
+++ b/Data/Sys/GameSettings/GPO.ini
@@ -0,0 +1,30 @@
+# GPOE8P, GPOJ8P, GPOP8P - PHANTASY STAR ONLINE EPISODE I&II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GPOE8P.ini b/Data/Sys/GameSettings/GPOE8P.ini
index e78f472ec1..296e9bda01 100644
--- a/Data/Sys/GameSettings/GPOE8P.ini
+++ b/Data/Sys/GameSettings/GPOE8P.ini
@@ -1,13 +1,5 @@
 # GPOE8P - PHANTASY STAR ONLINE EPISODE I&II
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -47,15 +39,3 @@ $Make Save Copyable NTSC Port  - 1.0/1.1
 04002F24 981C0034
 04002F28 38000000
 04002F2C 4838030C
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPOP8P.ini b/Data/Sys/GameSettings/GPOP8P.ini
index 144a5a0749..7a4a88dcd1 100644
--- a/Data/Sys/GameSettings/GPOP8P.ini
+++ b/Data/Sys/GameSettings/GPOP8P.ini
@@ -1,12 +1,4 @@
-# GPOP8P - PSO EPISODE I&II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = needs texture cache
+# GPOP8P - PHANTASY STAR ONLINE EPISODE I&II
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -65,15 +57,3 @@ $Game Save copyable
 04002F24 981C0034
 04002F28 38000000
 04002F2C 4838253C
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPS.ini b/Data/Sys/GameSettings/GPS.ini
new file mode 100644
index 0000000000..365447d01a
--- /dev/null
+++ b/Data/Sys/GameSettings/GPS.ini
@@ -0,0 +1,32 @@
+# GPSE8P, GPSP8P - PHANTASY STAR ONLINE EPISODE III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display. D3D11 has issues.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GPSE8P.ini b/Data/Sys/GameSettings/GPSE8P.ini
deleted file mode 100644
index cb14858c2f..0000000000
--- a/Data/Sys/GameSettings/GPSE8P.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GPSE8P - PSO CARD BATTLE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display. D3D11 has issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GPSP8P.ini b/Data/Sys/GameSettings/GPSP8P.ini
index 003ea256e8..c5f89991cb 100644
--- a/Data/Sys/GameSettings/GPSP8P.ini
+++ b/Data/Sys/GameSettings/GPSP8P.ini
@@ -1,13 +1,5 @@
 # GPSP8P - PHANTASY STAR ONLINE EPISODE III
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = needs texture cache
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -62,17 +54,5 @@ $Make Saved data copyable
 04000098 38000000
 0400009C 4833056C
 
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
 [Speedhacks]
 0x8036eba0=400
-
diff --git a/Data/Sys/GameSettings/GPT.ini b/Data/Sys/GameSettings/GPT.ini
new file mode 100644
index 0000000000..4d3dddb1a6
--- /dev/null
+++ b/Data/Sys/GameSettings/GPT.ini
@@ -0,0 +1,31 @@
+# GPTE41, GPTP41 - Prince of Persia : The Sands of Time
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GPTE41.ini b/Data/Sys/GameSettings/GPTE41.ini
deleted file mode 100644
index ded5a5bdbc..0000000000
--- a/Data/Sys/GameSettings/GPTE41.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GPTE41 - Prince of Persia : The Sands of Time
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to show up(r6898)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GPTP41.ini b/Data/Sys/GameSettings/GPTP41.ini
deleted file mode 100644
index 41b2190405..0000000000
--- a/Data/Sys/GameSettings/GPTP41.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GPTP41 - Prince of Persia : The Sands of Time
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to show up(r6898)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GPV.ini b/Data/Sys/GameSettings/GPV.ini
new file mode 100644
index 0000000000..12876d52a3
--- /dev/null
+++ b/Data/Sys/GameSettings/GPV.ini
@@ -0,0 +1,26 @@
+# GPVE01, GPVJ01, GPVP01 - PIKMIN2 for GAMECUBE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/GPVE01.ini b/Data/Sys/GameSettings/GPVE01.ini
index 4480c1a5c8..55314a62fd 100644
--- a/Data/Sys/GameSettings/GPVE01.ini
+++ b/Data/Sys/GameSettings/GPVE01.ini
@@ -1,12 +1,5 @@
 # GPVE01 - PIKMIN 2 NTSC
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -91,4 +84,3 @@ $999 White Flower Pikmin
 05B4DC5F 046E2D40
 0292F9AC 00030000
 0492F9B4 000003E7
-
diff --git a/Data/Sys/GameSettings/GPVP01.ini b/Data/Sys/GameSettings/GPVP01.ini
deleted file mode 100644
index 1c30d85597..0000000000
--- a/Data/Sys/GameSettings/GPVP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GPVP01 - PIKMIN2 for GAMECUBE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GPX.ini b/Data/Sys/GameSettings/GPX.ini
new file mode 100644
index 0000000000..47ff58901a
--- /dev/null
+++ b/Data/Sys/GameSettings/GPX.ini
@@ -0,0 +1,19 @@
+# GPXE01, GPXJ01, GPXP01 - POKeMON BOX RUBY&SAPPHIRE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini
deleted file mode 100644
index e66ab1cbd0..0000000000
--- a/Data/Sys/GameSettings/GPXP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GPXP01 - POKeMON BOX RUBY&SAPPHIRE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GPZ.ini b/Data/Sys/GameSettings/GPZ.ini
new file mode 100644
index 0000000000..8571097f5f
--- /dev/null
+++ b/Data/Sys/GameSettings/GPZ.ini
@@ -0,0 +1,22 @@
+# GPZJ01 - NINTENDO PUZZLE COLLECTION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GPZJ01.ini b/Data/Sys/GameSettings/GPZJ01.ini
deleted file mode 100644
index 35e1e94f66..0000000000
--- a/Data/Sys/GameSettings/GPZJ01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GPZJ01 - NINTENDO PUZZLE COLLECTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GQ8.ini b/Data/Sys/GameSettings/GQ8.ini
new file mode 100644
index 0000000000..0f3b9b4efd
--- /dev/null
+++ b/Data/Sys/GameSettings/GQ8.ini
@@ -0,0 +1,18 @@
+# GQ8E69 - Madden NFL 08
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GQ8E69.ini b/Data/Sys/GameSettings/GQ8E69.ini
deleted file mode 100644
index 9eb5ede26a..0000000000
--- a/Data/Sys/GameSettings/GQ8E69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GQ8E69 - Madden NFL 08
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GQC.ini b/Data/Sys/GameSettings/GQC.ini
new file mode 100644
index 0000000000..d5f804f1a2
--- /dev/null
+++ b/Data/Sys/GameSettings/GQC.ini
@@ -0,0 +1,19 @@
+# GQCD52, GQCE52, GQCF52, GQCI52, GQCP52, GQCS52 - Call of Duty 2: Big Red One
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Slow because it needs mmu to run.
+EmulationStateId = 4
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQCD52.ini b/Data/Sys/GameSettings/GQCD52.ini
deleted file mode 100644
index e69adf6d19..0000000000
--- a/Data/Sys/GameSettings/GQCD52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCD52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQCE52.ini b/Data/Sys/GameSettings/GQCE52.ini
deleted file mode 100644
index 8f3452a597..0000000000
--- a/Data/Sys/GameSettings/GQCE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCE52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQCF52.ini b/Data/Sys/GameSettings/GQCF52.ini
deleted file mode 100644
index da55f72b96..0000000000
--- a/Data/Sys/GameSettings/GQCF52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCF52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQCI52.ini b/Data/Sys/GameSettings/GQCI52.ini
deleted file mode 100644
index 5c4a86a220..0000000000
--- a/Data/Sys/GameSettings/GQCI52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GQCI52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Geck
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/GQCP52.ini b/Data/Sys/GameSettings/GQCP52.ini
deleted file mode 100644
index 6c8850c4f1..0000000000
--- a/Data/Sys/GameSettings/GQCP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCP52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQCS52.ini b/Data/Sys/GameSettings/GQCS52.ini
deleted file mode 100644
index 1da24daea4..0000000000
--- a/Data/Sys/GameSettings/GQCS52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQCS52 - Call of Duty 2: Big Red One
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Slow because it needs mmu to run.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GQL.ini b/Data/Sys/GameSettings/GQL.ini
new file mode 100644
index 0000000000..7ab38b94f1
--- /dev/null
+++ b/Data/Sys/GameSettings/GQL.ini
@@ -0,0 +1,19 @@
+# GQLE9G - DoraTheExplorerJourneyToThePurplePlanet
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GQLE9G.ini b/Data/Sys/GameSettings/GQLE9G.ini
deleted file mode 100644
index 86f7464605..0000000000
--- a/Data/Sys/GameSettings/GQLE9G.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQLE9G - DoraTheExplorerJourneyToThePurplePlanet
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GQN.ini b/Data/Sys/GameSettings/GQN.ini
new file mode 100644
index 0000000000..b8e8b227b1
--- /dev/null
+++ b/Data/Sys/GameSettings/GQN.ini
@@ -0,0 +1,18 @@
+# GQNE5D, GQNP5D - Mortal Kombat: Deception
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GQNE5D.ini b/Data/Sys/GameSettings/GQNE5D.ini
deleted file mode 100644
index 9208cbc2f4..0000000000
--- a/Data/Sys/GameSettings/GQNE5D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GQNE5D - Mortal Kombat Deception
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GQQ.ini b/Data/Sys/GameSettings/GQQ.ini
new file mode 100644
index 0000000000..a9d3e09279
--- /dev/null
+++ b/Data/Sys/GameSettings/GQQ.ini
@@ -0,0 +1,15 @@
+# GQQD78, GQQE78, GQQF78, GQQH78, GQQP78 - SpongeBob Lights, Camera, PANTS
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/Sys/GameSettings/GQQD78.ini b/Data/Sys/GameSettings/GQQD78.ini
deleted file mode 100644
index e786ce46f8..0000000000
--- a/Data/Sys/GameSettings/GQQD78.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GQQD78 - SpongeBob Lights, Camera, PANTS
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQE78.ini b/Data/Sys/GameSettings/GQQE78.ini
deleted file mode 100644
index 442c5ad1d4..0000000000
--- a/Data/Sys/GameSettings/GQQE78.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GQQE78 - SpongeBob Lights, Camera, PANTS
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQF78.ini b/Data/Sys/GameSettings/GQQF78.ini
deleted file mode 100644
index c4297e90ea..0000000000
--- a/Data/Sys/GameSettings/GQQF78.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GQQF78 - SpongeBob Lights, Camera, PANTS
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQH78.ini b/Data/Sys/GameSettings/GQQH78.ini
deleted file mode 100644
index c725e3fd79..0000000000
--- a/Data/Sys/GameSettings/GQQH78.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GQQH78 - SpongeBob Lights, Camera, PANTS
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQQP78.ini b/Data/Sys/GameSettings/GQQP78.ini
deleted file mode 100644
index 88a0e6c1a7..0000000000
--- a/Data/Sys/GameSettings/GQQP78.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GQQP78 - SpongeBob Lights, Camera, PANTS
-[Core]
-TLBHack = 1
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/Sys/GameSettings/GQS.ini b/Data/Sys/GameSettings/GQS.ini
new file mode 100644
index 0000000000..e8920e387b
--- /dev/null
+++ b/Data/Sys/GameSettings/GQS.ini
@@ -0,0 +1,32 @@
+# GQSDAF, GQSEAF, GQSFAF, GQSPAF - TALES OF SYMPHONIA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 0.5
+PH_ZFar = 1
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/GQSDAF.ini b/Data/Sys/GameSettings/GQSDAF.ini
deleted file mode 100644
index d5a88fd3c5..0000000000
--- a/Data/Sys/GameSettings/GQSDAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GQSDAF - TALES OF SYMPHONIA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GQSEAF.ini b/Data/Sys/GameSettings/GQSEAF.ini
index 2f9393b87d..0910a55b34 100644
--- a/Data/Sys/GameSettings/GQSEAF.ini
+++ b/Data/Sys/GameSettings/GQSEAF.ini
@@ -1,11 +1,5 @@
 # GQSEAF - TALES OF SYMPHONIA 1
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
 # Action Replay Notes
 
 # * * * * * NOTES ON EQUIPMENT MODIFIERS BEFORE USING THOSE CODES * * * *
@@ -427,7 +421,6 @@ EmulationStateId = 4
 # Max Affection codes
 # use only one of these codes at a time for your
 # favorite character to have max affection.
-EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -783,18 +776,3 @@ $REGAL Super Quick Level Up
 $Kratos Affection to Lloyd - max is 0000270F
 05A040B8 08000000
 025B7492 0000270F
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini
deleted file mode 100644
index 211493d604..0000000000
--- a/Data/Sys/GameSettings/GQSFAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GQSFAF - TALES OF SYMPHONIA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini
deleted file mode 100644
index a7e8da41e6..0000000000
--- a/Data/Sys/GameSettings/GQSPAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GQSPAF - TALES OF SYMPHONIA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GQT.ini b/Data/Sys/GameSettings/GQT.ini
new file mode 100644
index 0000000000..f3b019a33c
--- /dev/null
+++ b/Data/Sys/GameSettings/GQT.ini
@@ -0,0 +1,27 @@
+# GQTE4Q - Meet the Robinsons
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GQTE4Q.ini b/Data/Sys/GameSettings/GQTE4Q.ini
deleted file mode 100644
index e749242e28..0000000000
--- a/Data/Sys/GameSettings/GQTE4Q.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GQTE4Q - Meet the Robinsons
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GQW.ini b/Data/Sys/GameSettings/GQW.ini
new file mode 100644
index 0000000000..597d1269b2
--- /dev/null
+++ b/Data/Sys/GameSettings/GQW.ini
@@ -0,0 +1,27 @@
+# GQWE69, GQWJ69, GQWP69, GQWX69 - Quidditch World Cup
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GQWE69.ini b/Data/Sys/GameSettings/GQWE69.ini
deleted file mode 100644
index 3bc4400802..0000000000
--- a/Data/Sys/GameSettings/GQWE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GQWE69 - Quidditch World Cup
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GQWJ69.ini b/Data/Sys/GameSettings/GQWJ69.ini
deleted file mode 100644
index cd705100a2..0000000000
--- a/Data/Sys/GameSettings/GQWJ69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GQWJ69 - Quidditch World Cup
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GQWP69.ini b/Data/Sys/GameSettings/GQWP69.ini
deleted file mode 100644
index 66db264771..0000000000
--- a/Data/Sys/GameSettings/GQWP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GQWP69 - Quidditch World Cup
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GQWX69.ini b/Data/Sys/GameSettings/GQWX69.ini
deleted file mode 100644
index d4d0ce53b0..0000000000
--- a/Data/Sys/GameSettings/GQWX69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GQWX69 - Quidditch World Cup
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GQX.ini b/Data/Sys/GameSettings/GQX.ini
new file mode 100644
index 0000000000..7b3270098a
--- /dev/null
+++ b/Data/Sys/GameSettings/GQX.ini
@@ -0,0 +1,23 @@
+# GQXE69, GQXP69 - Madden NFL 2004
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GQXE69.ini b/Data/Sys/GameSettings/GQXE69.ini
deleted file mode 100644
index ec70686492..0000000000
--- a/Data/Sys/GameSettings/GQXE69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GQXE69 - Madden NFL 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Music is broken menu gfx glitches
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GR2.ini b/Data/Sys/GameSettings/GR2.ini
new file mode 100644
index 0000000000..a2d6d6a0eb
--- /dev/null
+++ b/Data/Sys/GameSettings/GR2.ini
@@ -0,0 +1,18 @@
+# GR2E52 - LOST KINGDOMS II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GR2E52.ini b/Data/Sys/GameSettings/GR2E52.ini
deleted file mode 100644
index 2fda9a331c..0000000000
--- a/Data/Sys/GameSettings/GR2E52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GR2E52 - LOST KINGDOMS II
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GR6.ini b/Data/Sys/GameSettings/GR6.ini
new file mode 100644
index 0000000000..da4cfe6357
--- /dev/null
+++ b/Data/Sys/GameSettings/GR6.ini
@@ -0,0 +1,19 @@
+# GR6E78 - Bratz: Rock Angelz
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GR6E78.ini b/Data/Sys/GameSettings/GR6E78.ini
deleted file mode 100644
index 6f547bde1d..0000000000
--- a/Data/Sys/GameSettings/GR6E78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR6E78 - Bratz: Rock Angelz
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GR8.ini b/Data/Sys/GameSettings/GR8.ini
new file mode 100644
index 0000000000..5e078bb010
--- /dev/null
+++ b/Data/Sys/GameSettings/GR8.ini
@@ -0,0 +1,18 @@
+# GR8D69, GR8E69, GR8F69, GR8J69, GR8P69 - Medal of Honor Rising Sun
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8D69.ini b/Data/Sys/GameSettings/GR8D69.ini
deleted file mode 100644
index 9137bd8be8..0000000000
--- a/Data/Sys/GameSettings/GR8D69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR8D69 - Medal of Honor Rising Sun
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8E69.ini b/Data/Sys/GameSettings/GR8E69.ini
deleted file mode 100644
index 616f8db8c0..0000000000
--- a/Data/Sys/GameSettings/GR8E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR8E69 - Medal of Honor Rising Sun
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8F69.ini b/Data/Sys/GameSettings/GR8F69.ini
deleted file mode 100644
index 738cd33de7..0000000000
--- a/Data/Sys/GameSettings/GR8F69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR8F69 - Medal of Honor Rising Sun
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8J69.ini b/Data/Sys/GameSettings/GR8J69.ini
deleted file mode 100644
index c66e915d6f..0000000000
--- a/Data/Sys/GameSettings/GR8J69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR8J69 - Medal of Honor Rising Sun
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GR8P69.ini b/Data/Sys/GameSettings/GR8P69.ini
deleted file mode 100644
index f9845f3af2..0000000000
--- a/Data/Sys/GameSettings/GR8P69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GR8P69 - Medal of Honor Rising Sun
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GRA.ini b/Data/Sys/GameSettings/GRA.ini
new file mode 100644
index 0000000000..15b7ee72a2
--- /dev/null
+++ b/Data/Sys/GameSettings/GRA.ini
@@ -0,0 +1,18 @@
+# GRAE5Z - Rally Championship
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GRAE5Z.ini b/Data/Sys/GameSettings/GRAE5Z.ini
deleted file mode 100644
index d7a71ff8b7..0000000000
--- a/Data/Sys/GameSettings/GRAE5Z.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GRAE5Z - Rally Championship
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GRB.ini b/Data/Sys/GameSettings/GRB.ini
new file mode 100644
index 0000000000..ca8705e695
--- /dev/null
+++ b/Data/Sys/GameSettings/GRB.ini
@@ -0,0 +1,31 @@
+# GRBE6S, GRBP6S - Robotech: Battlecry
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GRBE6S.ini b/Data/Sys/GameSettings/GRBE6S.ini
deleted file mode 100644
index 047f42a1e9..0000000000
--- a/Data/Sys/GameSettings/GRBE6S.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRBE6S - Robotech: Battlecry
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GRBP6S.ini b/Data/Sys/GameSettings/GRBP6S.ini
deleted file mode 100644
index aa2904c6e5..0000000000
--- a/Data/Sys/GameSettings/GRBP6S.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRBP6S - Robotech: Battlecry
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GRE.ini b/Data/Sys/GameSettings/GRE.ini
new file mode 100644
index 0000000000..c8cb753d53
--- /dev/null
+++ b/Data/Sys/GameSettings/GRE.ini
@@ -0,0 +1,22 @@
+# GREE08, GREP08 - MEGAMAN NETWORK TRANSMISSION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GREE08.ini b/Data/Sys/GameSettings/GREE08.ini
index ce8f2cabe2..d35f9812e6 100644
--- a/Data/Sys/GameSettings/GREE08.ini
+++ b/Data/Sys/GameSettings/GREE08.ini
@@ -1,13 +1,5 @@
 # GREE08 - Mega Man Network Transmission
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -54,4 +46,3 @@ $Max Rapid
 $Max Charge
 03582790 08000000
 404FFC30 0000B404
-
diff --git a/Data/Sys/GameSettings/GREP08.ini b/Data/Sys/GameSettings/GREP08.ini
deleted file mode 100644
index 83f669465e..0000000000
--- a/Data/Sys/GameSettings/GREP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GREP08 - MEGAMAN NETWORK TRANSMISSION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GRF.ini b/Data/Sys/GameSettings/GRF.ini
new file mode 100644
index 0000000000..8420f7287e
--- /dev/null
+++ b/Data/Sys/GameSettings/GRF.ini
@@ -0,0 +1,19 @@
+# GRFE78 - Red Faction II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GRFE78.ini b/Data/Sys/GameSettings/GRFE78.ini
deleted file mode 100644
index 8bf1905e11..0000000000
--- a/Data/Sys/GameSettings/GRFE78.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GRFE78 - Red Faction II
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Graphics Errors"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GRH.ini b/Data/Sys/GameSettings/GRH.ini
new file mode 100644
index 0000000000..c9836ace6c
--- /dev/null
+++ b/Data/Sys/GameSettings/GRH.ini
@@ -0,0 +1,30 @@
+# GRHE41, GRHP41 - RAYMAN 3 HOODLUM HAVOC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/GRHE41.ini b/Data/Sys/GameSettings/GRHE41.ini
deleted file mode 100644
index 12a276a16b..0000000000
--- a/Data/Sys/GameSettings/GRHE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRHE41 - RAYMAN 3 HOODLUM HAVOC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GRHP41.ini b/Data/Sys/GameSettings/GRHP41.ini
deleted file mode 100644
index 238f5b95f6..0000000000
--- a/Data/Sys/GameSettings/GRHP41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GRHP41 - RAYMAN 3 HOODLUM HAVOC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/GRJ.ini b/Data/Sys/GameSettings/GRJ.ini
new file mode 100644
index 0000000000..c033e16919
--- /dev/null
+++ b/Data/Sys/GameSettings/GRJ.ini
@@ -0,0 +1,24 @@
+# GRJEAF, GRJJAF, GRJP69 - R:RACING EVOLUTION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Efb to Ram is needed for video cutscenes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GRJEAF.ini b/Data/Sys/GameSettings/GRJEAF.ini
deleted file mode 100644
index 40fbae18b9..0000000000
--- a/Data/Sys/GameSettings/GRJEAF.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GRJEAF - R:RACING EVOLUTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-Hack = 4
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GRK.ini b/Data/Sys/GameSettings/GRK.ini
new file mode 100644
index 0000000000..fd9f6f9c54
--- /dev/null
+++ b/Data/Sys/GameSettings/GRK.ini
@@ -0,0 +1,32 @@
+# GRKE41, GRKP7G - Rocky
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GRKE41.ini b/Data/Sys/GameSettings/GRKE41.ini
deleted file mode 100644
index 8bd0cc95a3..0000000000
--- a/Data/Sys/GameSettings/GRKE41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GRKE41 - Rocky
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Directx11 plugin (r6651)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GRKP7G.ini b/Data/Sys/GameSettings/GRKP7G.ini
deleted file mode 100644
index 512f479e37..0000000000
--- a/Data/Sys/GameSettings/GRKP7G.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GRKP7G - Rocky
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Directx11 plugin (r6651)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GRL.ini b/Data/Sys/GameSettings/GRL.ini
new file mode 100644
index 0000000000..9448fd75cc
--- /dev/null
+++ b/Data/Sys/GameSettings/GRL.ini
@@ -0,0 +1,18 @@
+# GRLE41 - Pro Rally
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GRLE41.ini b/Data/Sys/GameSettings/GRLE41.ini
deleted file mode 100644
index 6d42391d0e..0000000000
--- a/Data/Sys/GameSettings/GRLE41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GRLE41 - Pro Rally
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GRN.ini b/Data/Sys/GameSettings/GRN.ini
new file mode 100644
index 0000000000..d010fc8036
--- /dev/null
+++ b/Data/Sys/GameSettings/GRN.ini
@@ -0,0 +1,18 @@
+# GRNE52 - LOST KINGDOMS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GRNE52.ini b/Data/Sys/GameSettings/GRNE52.ini
index d27c2acb35..87fc961913 100644
--- a/Data/Sys/GameSettings/GRNE52.ini
+++ b/Data/Sys/GameSettings/GRNE52.ini
@@ -1,13 +1,5 @@
 # GRNE52 - LOST KINGDOMS
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -25,4 +17,3 @@ $Always 10 magic stones
 $Have lots of cash
 0026005D 08000000
 04139804 0000270F
-
diff --git a/Data/Sys/GameSettings/GRO.ini b/Data/Sys/GameSettings/GRO.ini
new file mode 100644
index 0000000000..b092275a06
--- /dev/null
+++ b/Data/Sys/GameSettings/GRO.ini
@@ -0,0 +1,19 @@
+# GROP7J - Gadget Racers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GROP7J.ini b/Data/Sys/GameSettings/GROP7J.ini
deleted file mode 100644
index a9a9de37d9..0000000000
--- a/Data/Sys/GameSettings/GROP7J.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GROP7J - Gadget Racers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Needs Projection Before R945, crappy sound"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GRQ.ini b/Data/Sys/GameSettings/GRQ.ini
new file mode 100644
index 0000000000..f1ae00c8ff
--- /dev/null
+++ b/Data/Sys/GameSettings/GRQ.ini
@@ -0,0 +1,31 @@
+# GRQE41 - CITY RACER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs real XFB for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GRQE41.ini b/Data/Sys/GameSettings/GRQE41.ini
deleted file mode 100644
index 37500163d9..0000000000
--- a/Data/Sys/GameSettings/GRQE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRQE41 - CITY RACER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real XFB for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GRS.ini b/Data/Sys/GameSettings/GRS.ini
new file mode 100644
index 0000000000..1129a69747
--- /dev/null
+++ b/Data/Sys/GameSettings/GRS.ini
@@ -0,0 +1,31 @@
+# GRSEAF, GRSPAF - SOULCALIBUR2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GRSEAF.ini b/Data/Sys/GameSettings/GRSEAF.ini
deleted file mode 100644
index 0454ea9eb9..0000000000
--- a/Data/Sys/GameSettings/GRSEAF.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GRSEAF - SOULCALIBUR2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GRSPAF.ini b/Data/Sys/GameSettings/GRSPAF.ini
index 11ededecf5..f9bc61e1c2 100644
--- a/Data/Sys/GameSettings/GRSPAF.ini
+++ b/Data/Sys/GameSettings/GRSPAF.ini
@@ -1,13 +1,5 @@
 # GRSPAF - SOULCALIBUR2
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -555,18 +547,3 @@ $Unlock Korefuji (Mitsurugi)
 $Unlock Two-Handed Sword (Mitsurugi)
 03EC2C89 18000000
 00416261 00000003
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GRU.ini b/Data/Sys/GameSettings/GRU.ini
new file mode 100644
index 0000000000..6a1700e8c7
--- /dev/null
+++ b/Data/Sys/GameSettings/GRU.ini
@@ -0,0 +1,31 @@
+# GRUE78 - Power Rangers Dino Thunder
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs Real XFB to display videos.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GRUE78.ini b/Data/Sys/GameSettings/GRUE78.ini
index 4a0fe20877..12231cca7b 100644
--- a/Data/Sys/GameSettings/GRUE78.ini
+++ b/Data/Sys/GameSettings/GRUE78.ini
@@ -1,13 +1,5 @@
 # GRUE78 - Power Rangers Dino Thunder
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs Real XFB to display videos.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -26,16 +18,3 @@ $Max Turbo Charges
 00318047 00000063
 $Infinite Health
 04069830 38000004
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GRV.ini b/Data/Sys/GameSettings/GRV.ini
new file mode 100644
index 0000000000..c8392b824b
--- /dev/null
+++ b/Data/Sys/GameSettings/GRV.ini
@@ -0,0 +1,18 @@
+# GRVEA4, GRVJA4 - RAVE MASTER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GRVEA4.ini b/Data/Sys/GameSettings/GRVEA4.ini
deleted file mode 100644
index fe8a448e49..0000000000
--- a/Data/Sys/GameSettings/GRVEA4.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GRVEA4 - RAVE MASTER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GRY.ini b/Data/Sys/GameSettings/GRY.ini
new file mode 100644
index 0000000000..fdf13ae4ed
--- /dev/null
+++ b/Data/Sys/GameSettings/GRY.ini
@@ -0,0 +1,31 @@
+# GRYE41 - RAYMAN ARENA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GRYE41.ini b/Data/Sys/GameSettings/GRYE41.ini
deleted file mode 100644
index 233d69a3de..0000000000
--- a/Data/Sys/GameSettings/GRYE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GRYE41 - RAYMAN ARENA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GS2.ini b/Data/Sys/GameSettings/GS2.ini
new file mode 100644
index 0000000000..b69f12bbb8
--- /dev/null
+++ b/Data/Sys/GameSettings/GS2.ini
@@ -0,0 +1,31 @@
+# GS2D78, GS2E78, GS2F78, GS2P78 - Summoner 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GS2D78.ini b/Data/Sys/GameSettings/GS2D78.ini
deleted file mode 100644
index 0a61f6ab17..0000000000
--- a/Data/Sys/GameSettings/GS2D78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2D78 - Summoner 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GS2E78.ini b/Data/Sys/GameSettings/GS2E78.ini
index 92e103e91c..21a54ac67a 100644
--- a/Data/Sys/GameSettings/GS2E78.ini
+++ b/Data/Sys/GameSettings/GS2E78.ini
@@ -1,13 +1,5 @@
 # GS2E78 - Summoner 2
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -16,16 +8,57 @@ EmulationIssues = Needs real xfb for the videos to display.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
+$Max Health
+42474BA0 0239270F
+$Infinite Health
+42474BA0 023D270F
+$Max MP
+42474BA0 023E270F
+$Infinite MP
+42474BA0 0240270F
+$Level 20
+42474BA0 02410014
+$Level 50
+42474BA0 02410032
+$Max Stamina
+42474BA0 025900C8
+$Max Intelligence
+42474BA0 025C00C8
+$Max Speed
+42474BA0 025800C8
+$Max Strength
+42474BA0 025600C8
+$Max Defense
+42474BA0 025700C8
+$Max Magic Power
+42474BA0 025A00C8
+$Max Magic Defense
+42474BA0 025B00C8
+$Max Ice Resistance
+42474BA0 04BC00C8
+$Max Fire Resistance
+42474BA0 04BD00C8
+$Max Energy Resistance
+42474BA0 04BE00C8
+$Max Slashing Resistance
+42474BA0 04BF00C8
+$Max Piercing Resistance
+42474BA0 04C000C8
+$Max Blunt Resistance
+42474BA0 04C100C8
+$Infinite Skill Points
+022F5636 00000064
+$Max Ice Resistance
+42474BA0 025D00C8
+$Max Fire Resistance
+42474BA0 025E00C8
+$Max Energy Resistance
+42474BA0 025F00C8
+$Max Slashing Resistance
+42474BA0 026000C8
+$Max Piercing Resistance
+42474BA0 026100C8
+$Max Blunt Resistance
+42474BA0 026200C8
+$Infinite Skill Points
+022F5666 00000064
diff --git a/Data/Sys/GameSettings/GS2F78.ini b/Data/Sys/GameSettings/GS2F78.ini
deleted file mode 100644
index 12482fd18e..0000000000
--- a/Data/Sys/GameSettings/GS2F78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2F78 - Summoner 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GS2P78.ini b/Data/Sys/GameSettings/GS2P78.ini
deleted file mode 100644
index 90e9fe37bb..0000000000
--- a/Data/Sys/GameSettings/GS2P78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GS2P78 - Summoner 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GS8.ini b/Data/Sys/GameSettings/GS8.ini
new file mode 100644
index 0000000000..2207c1fcfe
--- /dev/null
+++ b/Data/Sys/GameSettings/GS8.ini
@@ -0,0 +1,18 @@
+# GS8P7D - Spyro: Enter the Dragonfly
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GS8P7D.ini b/Data/Sys/GameSettings/GS8P7D.ini
deleted file mode 100644
index bea158ac55..0000000000
--- a/Data/Sys/GameSettings/GS8P7D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GS8P7D - Spyro: Enter the Dragonfly
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSA.ini b/Data/Sys/GameSettings/GSA.ini
new file mode 100644
index 0000000000..040a85b779
--- /dev/null
+++ b/Data/Sys/GameSettings/GSA.ini
@@ -0,0 +1,27 @@
+# GSAE01, GSAJ01 - Star Fox Adventures
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GSAE01.ini b/Data/Sys/GameSettings/GSAE01.ini
deleted file mode 100644
index 03e40f9c66..0000000000
--- a/Data/Sys/GameSettings/GSAE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GSAE01 - Star Fox Adventures
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Use dx11 plugin(r6477)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GSAP01.ini b/Data/Sys/GameSettings/GSAP01.ini
index 8c29e47619..f595b0675b 100644
--- a/Data/Sys/GameSettings/GSAP01.ini
+++ b/Data/Sys/GameSettings/GSAP01.ini
@@ -1,13 +1,5 @@
 # GSAP01 - Star Fox Adventures
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -59,7 +51,3 @@ $Moon Jump (Hold B)
 017E10A1 18000000
 0A33B052 00000200
 423A5ABC 00143FFF
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GSB.ini b/Data/Sys/GameSettings/GSB.ini
new file mode 100644
index 0000000000..e0569090b5
--- /dev/null
+++ b/Data/Sys/GameSettings/GSB.ini
@@ -0,0 +1,18 @@
+# GSBJ8P - Sonic Adventure 2 Battle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/GSC.ini b/Data/Sys/GameSettings/GSC.ini
new file mode 100644
index 0000000000..e0afb95c72
--- /dev/null
+++ b/Data/Sys/GameSettings/GSC.ini
@@ -0,0 +1,19 @@
+# GSCE51 - Jeremy McGrath SuperCross World
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Slow
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GSCE51.ini b/Data/Sys/GameSettings/GSCE51.ini
deleted file mode 100644
index 3e6af74646..0000000000
--- a/Data/Sys/GameSettings/GSCE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GSCE51 - Jeremy McGrath SuperCross World
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSE.ini b/Data/Sys/GameSettings/GSE.ini
new file mode 100644
index 0000000000..bf93a0574e
--- /dev/null
+++ b/Data/Sys/GameSettings/GSE.ini
@@ -0,0 +1,18 @@
+# GSEJB2 - ShamanKing SoulFight
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GSEJB2.ini b/Data/Sys/GameSettings/GSEJB2.ini
deleted file mode 100644
index 23307b5b5f..0000000000
--- a/Data/Sys/GameSettings/GSEJB2.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSEJB2 - ShamanKing SoulFight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSM.ini b/Data/Sys/GameSettings/GSM.ini
new file mode 100644
index 0000000000..3b317e640b
--- /dev/null
+++ b/Data/Sys/GameSettings/GSM.ini
@@ -0,0 +1,24 @@
+# GSMD52, GSME52, GSMF52, GSMP52 - Spider-Man
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSMP52.ini b/Data/Sys/GameSettings/GSMP52.ini
deleted file mode 100644
index 26322e8618..0000000000
--- a/Data/Sys/GameSettings/GSMP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GSMP52 - Spider-Man (TM)
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSN.ini b/Data/Sys/GameSettings/GSN.ini
new file mode 100644
index 0000000000..144e30dc1c
--- /dev/null
+++ b/Data/Sys/GameSettings/GSN.ini
@@ -0,0 +1,18 @@
+# GSNE8P, GSNP8P - Sonic Adventure 2 Battle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GSNE8P.ini b/Data/Sys/GameSettings/GSNE8P.ini
index 227e34e4e5..669ecdf1cd 100644
--- a/Data/Sys/GameSettings/GSNE8P.ini
+++ b/Data/Sys/GameSettings/GSNE8P.ini
@@ -1,13 +1,5 @@
 # GSNE8P - Sonic Adventure 2 Battle
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -24,4 +16,3 @@ $Infinite Lives
 001B3DEF 00000063
 001CC1CD 00000063
 001E5319 00000063
-
diff --git a/Data/Sys/GameSettings/GSNP8P.ini b/Data/Sys/GameSettings/GSNP8P.ini
index c83a83889c..eeec98be75 100644
--- a/Data/Sys/GameSettings/GSNP8P.ini
+++ b/Data/Sys/GameSettings/GSNP8P.ini
@@ -1,13 +1,5 @@
 # GSNP8P - SONIC ADVENTURE 2 BATTLE
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -124,7 +116,3 @@ $Route 101
 $Route 280
 041F54EC 05050505
 041F54F0 05050505
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GSO.ini b/Data/Sys/GameSettings/GSO.ini
new file mode 100644
index 0000000000..20860111d0
--- /dev/null
+++ b/Data/Sys/GameSettings/GSO.ini
@@ -0,0 +1,32 @@
+# GSOE8P, GSOJ8P, GSOP8P - Sonic Mega Collection (US)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GSOE8P.ini b/Data/Sys/GameSettings/GSOE8P.ini
deleted file mode 100644
index bbcfd76fbf..0000000000
--- a/Data/Sys/GameSettings/GSOE8P.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GSOE8P - Sonic Mega Collection (US)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GSOP8P.ini b/Data/Sys/GameSettings/GSOP8P.ini
deleted file mode 100644
index 92aa4c0e02..0000000000
--- a/Data/Sys/GameSettings/GSOP8P.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GSOP8P - Sonic Mega Collection (EU)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GSP.ini b/Data/Sys/GameSettings/GSP.ini
new file mode 100644
index 0000000000..08fe9791ba
--- /dev/null
+++ b/Data/Sys/GameSettings/GSP.ini
@@ -0,0 +1,18 @@
+# GSPE69 - The Simpsons Road Rage
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GSPE69.ini b/Data/Sys/GameSettings/GSPE69.ini
deleted file mode 100644
index 3cc8c24c40..0000000000
--- a/Data/Sys/GameSettings/GSPE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSPE69 - The Simpsons Road Rage
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSQ.ini b/Data/Sys/GameSettings/GSQ.ini
new file mode 100644
index 0000000000..aead7ac81e
--- /dev/null
+++ b/Data/Sys/GameSettings/GSQ.ini
@@ -0,0 +1,18 @@
+# GSQE78, GSQP78 - SpongeBob SquarePants ROTFD
+[Core]
+[EmuState]
+EmulationStateId = 3
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSQE78.ini b/Data/Sys/GameSettings/GSQE78.ini
deleted file mode 100644
index 69c2a8722c..0000000000
--- a/Data/Sys/GameSettings/GSQE78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSQE78 - SpongeBob SquarePants ROTFD
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSQP78.ini b/Data/Sys/GameSettings/GSQP78.ini
deleted file mode 100644
index cc74ae9793..0000000000
--- a/Data/Sys/GameSettings/GSQP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSQP78 - SpongeBob SquarePants ROTFD
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GSS.ini b/Data/Sys/GameSettings/GSS.ini
new file mode 100644
index 0000000000..b00595bff8
--- /dev/null
+++ b/Data/Sys/GameSettings/GSS.ini
@@ -0,0 +1,31 @@
+# GSSE8P, GSSJ8P, GSSP70, GSSP8P - Sega Soccer Slam
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GSSE8P.ini b/Data/Sys/GameSettings/GSSE8P.ini
index a3061e58c3..cc9e03d017 100644
--- a/Data/Sys/GameSettings/GSSE8P.ini
+++ b/Data/Sys/GameSettings/GSSE8P.ini
@@ -1,13 +1,5 @@
 # GSSE8P - Sega Soccer Slam
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display.
-EmulationStateId = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -28,16 +20,3 @@ $SubZero Have Tons Of Cash
 0423C204 05F5E0FF
 $Volta Have Tons Of Cash
 0423CEA8 05F5E0FF
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GSSJ8P.ini b/Data/Sys/GameSettings/GSSJ8P.ini
deleted file mode 100644
index f03370e8b5..0000000000
--- a/Data/Sys/GameSettings/GSSJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSSJ8P - Sega Soccer Slam
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GSSP70.ini b/Data/Sys/GameSettings/GSSP70.ini
deleted file mode 100644
index e3cf8194f4..0000000000
--- a/Data/Sys/GameSettings/GSSP70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSSP70 - Sega Soccer Slam
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GSSP8P.ini b/Data/Sys/GameSettings/GSSP8P.ini
deleted file mode 100644
index 9f198332a2..0000000000
--- a/Data/Sys/GameSettings/GSSP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GSSP8P - Sega Soccer Slam
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GST.ini b/Data/Sys/GameSettings/GST.ini
new file mode 100644
index 0000000000..ead5fbc0bd
--- /dev/null
+++ b/Data/Sys/GameSettings/GST.ini
@@ -0,0 +1,18 @@
+# GSTE69, GSTP69 - SSX Tricky
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GSTE69.ini b/Data/Sys/GameSettings/GSTE69.ini
deleted file mode 100644
index 2a14d28c11..0000000000
--- a/Data/Sys/GameSettings/GSTE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GSTE69 - SSX Tricky
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GSTP69.ini b/Data/Sys/GameSettings/GSTP69.ini
deleted file mode 100644
index 1ba6dc6ebe..0000000000
--- a/Data/Sys/GameSettings/GSTP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GSTP69 - SSX Tricky
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GSW.ini b/Data/Sys/GameSettings/GSW.ini
new file mode 100644
index 0000000000..b0409f9bc9
--- /dev/null
+++ b/Data/Sys/GameSettings/GSW.ini
@@ -0,0 +1,29 @@
+# GSWD64, GSWE64, GSWF64, GSWI64, GSWJ64, GSWP64, GSWS64 - Star Wars: Rogue Leader
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs LLE audio for proper sound.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini
deleted file mode 100644
index 59418ec3f3..0000000000
--- a/Data/Sys/GameSettings/GSWE64.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# GSWE64 - Star Wars: Rogue Leader
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-FastDiscSpeed = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GSWI64.ini b/Data/Sys/GameSettings/GSWI64.ini
deleted file mode 100644
index 23f04559af..0000000000
--- a/Data/Sys/GameSettings/GSWI64.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GSWI64 - Star Wars: Rogue Leader
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-FastDiscSpeed = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini
deleted file mode 100644
index 27ac0fb2b1..0000000000
--- a/Data/Sys/GameSettings/GSWP64.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GSWP64 - Star Wars: Rogue Leader
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-FastDiscSpeed = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini
deleted file mode 100644
index a820aec1bd..0000000000
--- a/Data/Sys/GameSettings/GSWS64.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# GSWS64 - Star Wars: Rogue Leader
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-FastDiscSpeed = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/GSZ.ini b/Data/Sys/GameSettings/GSZ.ini
new file mode 100644
index 0000000000..d87d2d594c
--- /dev/null
+++ b/Data/Sys/GameSettings/GSZ.ini
@@ -0,0 +1,30 @@
+# GSZP41 - SPEED CHALLENGE - Jacques Villeneuve's Racing Vision
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncGPU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+BBoxEnable = True
diff --git a/Data/Sys/GameSettings/GSZP41.ini b/Data/Sys/GameSettings/GSZP41.ini
deleted file mode 100644
index c6e746bafa..0000000000
--- a/Data/Sys/GameSettings/GSZP41.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GSZP41 - SPEED CHALLENGE - Jacques Villeneuve's Racing Vision
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-UseBBox = 1
-
diff --git a/Data/Sys/GameSettings/GT3.ini b/Data/Sys/GameSettings/GT3.ini
new file mode 100644
index 0000000000..87eb3bef3f
--- /dev/null
+++ b/Data/Sys/GameSettings/GT3.ini
@@ -0,0 +1,24 @@
+# GT3D52, GT3E52, GT3J52 - Tony Hawk's Pro Skater 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GT3D52.ini b/Data/Sys/GameSettings/GT3D52.ini
deleted file mode 100644
index 906554193b..0000000000
--- a/Data/Sys/GameSettings/GT3D52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GT3D52 - Tony Hawk's Pro Skater 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GT3E52.ini b/Data/Sys/GameSettings/GT3E52.ini
deleted file mode 100644
index c002087035..0000000000
--- a/Data/Sys/GameSettings/GT3E52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GT3E52 - Tony Hawk's Pro Skater 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GT3F52.ini b/Data/Sys/GameSettings/GT3F52.ini
deleted file mode 100644
index 7ea73148e6..0000000000
--- a/Data/Sys/GameSettings/GT3F52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GT3F52 - Tony Hawk's Pro Skater 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GT3P52.ini b/Data/Sys/GameSettings/GT3P52.ini
deleted file mode 100644
index c2d4525c27..0000000000
--- a/Data/Sys/GameSettings/GT3P52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GT3P52 - Tony Hawk's Pro Skater 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GT4.ini b/Data/Sys/GameSettings/GT4.ini
new file mode 100644
index 0000000000..f68afee36b
--- /dev/null
+++ b/Data/Sys/GameSettings/GT4.ini
@@ -0,0 +1,18 @@
+# GT4D52, GT4E52, GT4F52, GT4P52 - Tony Hawk's Pro Skater 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GT6.ini b/Data/Sys/GameSettings/GT6.ini
new file mode 100644
index 0000000000..0c61f21f4e
--- /dev/null
+++ b/Data/Sys/GameSettings/GT6.ini
@@ -0,0 +1,34 @@
+# GT6E70 - Terminator 3: The Redemption
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBAccessEnable = False
+
diff --git a/Data/Sys/GameSettings/GT6E70.ini b/Data/Sys/GameSettings/GT6E70.ini
index 4a491424c8..9104d6bfe8 100644
--- a/Data/Sys/GameSettings/GT6E70.ini
+++ b/Data/Sys/GameSettings/GT6E70.ini
@@ -1,14 +1,5 @@
 # GT6E70 - Terminator 3: The Redemption
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -49,21 +40,3 @@ $Death Stare
 00445DB8 00000001
 $Permavision
 00445DD0 00000001
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/GT7.ini b/Data/Sys/GameSettings/GT7.ini
new file mode 100644
index 0000000000..baed4dd39e
--- /dev/null
+++ b/Data/Sys/GameSettings/GT7.ini
@@ -0,0 +1,33 @@
+# GT7E41, GT7P41, GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GT7E41.ini b/Data/Sys/GameSettings/GT7E41.ini
deleted file mode 100644
index 50c3c9161c..0000000000
--- a/Data/Sys/GameSettings/GT7E41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GT7E41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GT7P41.ini b/Data/Sys/GameSettings/GT7P41.ini
deleted file mode 100644
index ff5e550b5b..0000000000
--- a/Data/Sys/GameSettings/GT7P41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GT7P41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GT7X41.ini b/Data/Sys/GameSettings/GT7X41.ini
deleted file mode 100644
index b06b4b1544..0000000000
--- a/Data/Sys/GameSettings/GT7X41.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos need real XFB to show up and loading screens show garbage.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GT8.ini b/Data/Sys/GameSettings/GT8.ini
new file mode 100644
index 0000000000..3785fca66c
--- /dev/null
+++ b/Data/Sys/GameSettings/GT8.ini
@@ -0,0 +1,19 @@
+# GT8E78 - Big Mutha Truckers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GT8E78.ini b/Data/Sys/GameSettings/GT8E78.ini
deleted file mode 100644
index 18ec9d24b0..0000000000
--- a/Data/Sys/GameSettings/GT8E78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GT8E78 - Big Mutha Truckers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GTC.ini b/Data/Sys/GameSettings/GTC.ini
new file mode 100644
index 0000000000..42bb227d68
--- /dev/null
+++ b/Data/Sys/GameSettings/GTC.ini
@@ -0,0 +1,18 @@
+# GTCJBL - GTCUBE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GTCJBL.ini b/Data/Sys/GameSettings/GTCJBL.ini
deleted file mode 100644
index 743ef3417b..0000000000
--- a/Data/Sys/GameSettings/GTCJBL.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GTCJBL - GTCUBE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GTE.ini b/Data/Sys/GameSettings/GTE.ini
new file mode 100644
index 0000000000..c739a17c09
--- /dev/null
+++ b/Data/Sys/GameSettings/GTE.ini
@@ -0,0 +1,20 @@
+# GTEE01, GTEP01 - 1080: Avalanche
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/GTEE01.ini b/Data/Sys/GameSettings/GTEE01.ini
index 1216ed5187..1c82760f5c 100644
--- a/Data/Sys/GameSettings/GTEE01.ini
+++ b/Data/Sys/GameSettings/GTEE01.ini
@@ -1,13 +1,5 @@
 # GTEE01 - 1080: Avalanche
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -56,15 +48,3 @@ $All Time Trials Complete
 $Moon Jump (Press Z)
 3A2342E8 00000010
 042723E4 43000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GTEP01.ini b/Data/Sys/GameSettings/GTEP01.ini
index c83d02503e..cc382ffa94 100644
--- a/Data/Sys/GameSettings/GTEP01.ini
+++ b/Data/Sys/GameSettings/GTEP01.ini
@@ -1,12 +1,5 @@
 # GTEP01 - 1080: Avalanche
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -32,7 +25,3 @@ XCV7-0RNZ-8ZPV6
 $Time Trial: Found 5 Coin Pieces
 GZ5T-HADH-NGPBM
 BAF8-QT5K-5N9WC
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/GTF.ini b/Data/Sys/GameSettings/GTF.ini
new file mode 100644
index 0000000000..c54bbb3328
--- /dev/null
+++ b/Data/Sys/GameSettings/GTF.ini
@@ -0,0 +1,27 @@
+# GTFEA4 - Teenage Mutant Ninja Turtles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GTFEA4.ini b/Data/Sys/GameSettings/GTFEA4.ini
deleted file mode 100644
index b221f73fd6..0000000000
--- a/Data/Sys/GameSettings/GTFEA4.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GTFEA4 - Teenage Mutant Ninja Turtles
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GTK.ini b/Data/Sys/GameSettings/GTK.ini
new file mode 100644
index 0000000000..64acd2b8c4
--- /dev/null
+++ b/Data/Sys/GameSettings/GTK.ini
@@ -0,0 +1,30 @@
+# GTKE51, GTKP51 - Turok: Evolution
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GTKE51.ini b/Data/Sys/GameSettings/GTKE51.ini
index 306b80ff67..c22d3d5043 100644
--- a/Data/Sys/GameSettings/GTKE51.ini
+++ b/Data/Sys/GameSettings/GTKE51.ini
@@ -1,14 +1,5 @@
 # GTKE51 - Turok: Evolution
 
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -17,15 +8,29 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
+$Level Select
+04F3699A 3A1DCC92
+7D767326 5B157214
+$Unlock All Weapons Cheat
+057ECE27 73925CC1
+24CDA364 13ED616D
+$Unlock Unlimited Ammo Cheat
+06C51517 035D1270
+161DD23D 2AD175EA
+$Unlock Invincible Cheat
+06ABEF0E 578334AE
+6E3AC430 D24AECC7
+$Unlock Invisible Cheat
+0FFC915F CAFF7B30
+85434F8E 263796ED
+$Unlock Big Head Cheat
+01D5F2E8 3670A7E8
+E2C6549F 18DDEF42
+$Debug Or Demo Cheat
+0EEA36BE 423E8B7A
+$Demo Mode - Cheat Menu
+02220246 70F73F6E
+D2A8F35F 4A172F97
+$Debug Level - Cheat Menu
+0ECF64CF 1B031CD3
+33D95864 C3CEA43D
diff --git a/Data/Sys/GameSettings/GTKP51.ini b/Data/Sys/GameSettings/GTKP51.ini
deleted file mode 100644
index e1b04aba18..0000000000
--- a/Data/Sys/GameSettings/GTKP51.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTKP51 - Turok: Evolution
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GTL.ini b/Data/Sys/GameSettings/GTL.ini
new file mode 100644
index 0000000000..2fb1c4291c
--- /dev/null
+++ b/Data/Sys/GameSettings/GTL.ini
@@ -0,0 +1,27 @@
+# GTLE52, GTLP52, GTLX52 - True Crime
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/GTLE52.ini b/Data/Sys/GameSettings/GTLE52.ini
deleted file mode 100644
index 5b8060066d..0000000000
--- a/Data/Sys/GameSettings/GTLE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GTLE52 - True Crime
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Menus require projection hack, minor glitches ingame
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/GTLP52.ini b/Data/Sys/GameSettings/GTLP52.ini
deleted file mode 100644
index cc8c40c526..0000000000
--- a/Data/Sys/GameSettings/GTLP52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GTLP52 - True Crime
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Menus require projection hack, minor glitches ingame
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/GTLX52.ini b/Data/Sys/GameSettings/GTLX52.ini
deleted file mode 100644
index 797e1988b6..0000000000
--- a/Data/Sys/GameSettings/GTLX52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GTLX52 - True Crime
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Menus require projection hack, minor glitches ingame
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/GTO.ini b/Data/Sys/GameSettings/GTO.ini
new file mode 100644
index 0000000000..b46799eeb5
--- /dev/null
+++ b/Data/Sys/GameSettings/GTO.ini
@@ -0,0 +1,31 @@
+# GTOJAF - TALES OF SYMPHONIA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 0.5
+PH_ZFar = 1
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
diff --git a/Data/Sys/GameSettings/GTR.ini b/Data/Sys/GameSettings/GTR.ini
new file mode 100644
index 0000000000..bfbaa47e63
--- /dev/null
+++ b/Data/Sys/GameSettings/GTR.ini
@@ -0,0 +1,18 @@
+# GTRE78, GTRP78 - Tetris Worlds
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+[Gecko]
diff --git a/Data/Sys/GameSettings/GTRE78.ini b/Data/Sys/GameSettings/GTRE78.ini
deleted file mode 100644
index e9b1cb2591..0000000000
--- a/Data/Sys/GameSettings/GTRE78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GTRE78 - Tetris Worlds
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-[Gecko]
diff --git a/Data/Sys/GameSettings/GTRP78.ini b/Data/Sys/GameSettings/GTRP78.ini
deleted file mode 100644
index 1722710375..0000000000
--- a/Data/Sys/GameSettings/GTRP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GTRP78 - Tetris Worlds
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-[Gecko]
diff --git a/Data/Sys/GameSettings/GTS.ini b/Data/Sys/GameSettings/GTS.ini
new file mode 100644
index 0000000000..c9e7253d52
--- /dev/null
+++ b/Data/Sys/GameSettings/GTS.ini
@@ -0,0 +1,27 @@
+# GTSE4F, GTSP4F - TimeSplitters 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Can Crash on some systems (unknown)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GTSE4F.ini b/Data/Sys/GameSettings/GTSE4F.ini
index fcb033813e..05e8c0c75f 100644
--- a/Data/Sys/GameSettings/GTSE4F.ini
+++ b/Data/Sys/GameSettings/GTSE4F.ini
@@ -1,13 +1,5 @@
 # GTSE4F - TimeSplitters 2 NTSC
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = can crash on some systems(unknown)
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -231,7 +223,3 @@ $13th Loaded Player Size Modifier (Twilight Spectre)
 $14th Loaded Player Size Modifier (Twilight Spectre)
 404013FC 00129F10
 424013FC 0000099C
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GTSP4F.ini b/Data/Sys/GameSettings/GTSP4F.ini
deleted file mode 100644
index e121c7f8f0..0000000000
--- a/Data/Sys/GameSettings/GTSP4F.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTSP4F - TimeSplitters 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Can Crash on some systems (unknown)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GTU.ini b/Data/Sys/GameSettings/GTU.ini
new file mode 100644
index 0000000000..39487b019f
--- /dev/null
+++ b/Data/Sys/GameSettings/GTU.ini
@@ -0,0 +1,18 @@
+# GTUE8G - TUBE SLIDER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GTUE8G.ini b/Data/Sys/GameSettings/GTUE8G.ini
deleted file mode 100644
index 054f0bde17..0000000000
--- a/Data/Sys/GameSettings/GTUE8G.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GTUE8G - TUBE SLIDER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GTW.ini b/Data/Sys/GameSettings/GTW.ini
new file mode 100644
index 0000000000..376038c57b
--- /dev/null
+++ b/Data/Sys/GameSettings/GTW.ini
@@ -0,0 +1,31 @@
+# GTWE70, GTWP70 - Taz Wanted
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GTWE70.ini b/Data/Sys/GameSettings/GTWE70.ini
deleted file mode 100644
index 30f0b4503d..0000000000
--- a/Data/Sys/GameSettings/GTWE70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTWE70 - Taz Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GTWP70.ini b/Data/Sys/GameSettings/GTWP70.ini
deleted file mode 100644
index df15619aad..0000000000
--- a/Data/Sys/GameSettings/GTWP70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTWP70 - Taz Wanted
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GTY.ini b/Data/Sys/GameSettings/GTY.ini
new file mode 100644
index 0000000000..845502533a
--- /dev/null
+++ b/Data/Sys/GameSettings/GTY.ini
@@ -0,0 +1,27 @@
+# GTYE69, GTYP69 - TY the Tasmanian Tiger
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GTYE69.ini b/Data/Sys/GameSettings/GTYE69.ini
deleted file mode 100644
index ec3e2e3155..0000000000
--- a/Data/Sys/GameSettings/GTYE69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTYE69 - TY the Tasmanian Tiger
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GTYP69.ini b/Data/Sys/GameSettings/GTYP69.ini
deleted file mode 100644
index 641b5a47d9..0000000000
--- a/Data/Sys/GameSettings/GTYP69.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GTYP69 - TY the Tasmanian Tiger
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GTZ.ini b/Data/Sys/GameSettings/GTZ.ini
new file mode 100644
index 0000000000..84c0f1f339
--- /dev/null
+++ b/Data/Sys/GameSettings/GTZ.ini
@@ -0,0 +1,31 @@
+# GTZE41, GTZP41 - DISNEY'S TARZAN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GTZE41.ini b/Data/Sys/GameSettings/GTZE41.ini
deleted file mode 100644
index 27c823c9eb..0000000000
--- a/Data/Sys/GameSettings/GTZE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTZE41 - DISNEY'S TARZAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GTZP41.ini b/Data/Sys/GameSettings/GTZP41.ini
deleted file mode 100644
index f4076e1607..0000000000
--- a/Data/Sys/GameSettings/GTZP41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GTZP41 - DISNEY'S TARZAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GUB.ini b/Data/Sys/GameSettings/GUB.ini
new file mode 100644
index 0000000000..5397d73361
--- /dev/null
+++ b/Data/Sys/GameSettings/GUB.ini
@@ -0,0 +1,30 @@
+# GUBE69, GUBP69 - The Urbz GameCube
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GUBE69.ini b/Data/Sys/GameSettings/GUBE69.ini
deleted file mode 100644
index 8bb501b2d4..0000000000
--- a/Data/Sys/GameSettings/GUBE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUBE69 - The Urbz GameCube
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GUBP69.ini b/Data/Sys/GameSettings/GUBP69.ini
deleted file mode 100644
index b2ac9f7af8..0000000000
--- a/Data/Sys/GameSettings/GUBP69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUBP69 - The Urbz GameCube
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GUC.ini b/Data/Sys/GameSettings/GUC.ini
new file mode 100644
index 0000000000..97f38aae66
--- /dev/null
+++ b/Data/Sys/GameSettings/GUC.ini
@@ -0,0 +1,18 @@
+# GUCP69 - UEFA Champions League 2004 - 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GUCP69.ini b/Data/Sys/GameSettings/GUCP69.ini
deleted file mode 100644
index 7fb5e0a9ec..0000000000
--- a/Data/Sys/GameSettings/GUCP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GUCP69 - UEFA Champions League 2004 - 2005
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GUF.ini b/Data/Sys/GameSettings/GUF.ini
new file mode 100644
index 0000000000..d470422dd2
--- /dev/null
+++ b/Data/Sys/GameSettings/GUF.ini
@@ -0,0 +1,18 @@
+# GUFE4Z - UFC Throwdown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GUFE4Z.ini b/Data/Sys/GameSettings/GUFE4Z.ini
deleted file mode 100644
index aa3ed248f1..0000000000
--- a/Data/Sys/GameSettings/GUFE4Z.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GUFE4Z - UFC Throwdown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GUG.ini b/Data/Sys/GameSettings/GUG.ini
new file mode 100644
index 0000000000..b9e428d363
--- /dev/null
+++ b/Data/Sys/GameSettings/GUG.ini
@@ -0,0 +1,18 @@
+# GUGE69 - Need for Speed(TM) Underground 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GUGE69.ini b/Data/Sys/GameSettings/GUGE69.ini
deleted file mode 100644
index 5e47b254b8..0000000000
--- a/Data/Sys/GameSettings/GUGE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GUGE69 - Need for Speed(TM) Underground 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GUM.ini b/Data/Sys/GameSettings/GUM.ini
new file mode 100644
index 0000000000..4956cacd52
--- /dev/null
+++ b/Data/Sys/GameSettings/GUM.ini
@@ -0,0 +1,28 @@
+# GUME52, GUMP52 - Gun
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GUME52.ini b/Data/Sys/GameSettings/GUME52.ini
deleted file mode 100644
index 17c99367b0..0000000000
--- a/Data/Sys/GameSettings/GUME52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GUME52 - Gun
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU to run, and it runs slow.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GUMP52.ini b/Data/Sys/GameSettings/GUMP52.ini
deleted file mode 100644
index 16f53f3a01..0000000000
--- a/Data/Sys/GameSettings/GUMP52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GUMP52 - Gun
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU to run, and it runs slow.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GUN.ini b/Data/Sys/GameSettings/GUN.ini
new file mode 100644
index 0000000000..0e32c17ae4
--- /dev/null
+++ b/Data/Sys/GameSettings/GUN.ini
@@ -0,0 +1,24 @@
+# GUNE5D, GUNP5D - Gauntlet - Dark Legacy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs safe texture cache for videos.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GUNE5D.ini b/Data/Sys/GameSettings/GUNE5D.ini
index 78fdd3ea26..9885143a4f 100644
--- a/Data/Sys/GameSettings/GUNE5D.ini
+++ b/Data/Sys/GameSettings/GUNE5D.ini
@@ -1,13 +1,5 @@
 # GUNE5D - Gauntlet - Dark Legacy
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -49,7 +41,3 @@ $Player 4 health 9999
 $Player 4 infinite keys
 00200054 08000000
 04280D8C 00000063
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GUP.ini b/Data/Sys/GameSettings/GUP.ini
new file mode 100644
index 0000000000..3718c665fd
--- /dev/null
+++ b/Data/Sys/GameSettings/GUP.ini
@@ -0,0 +1,24 @@
+# GUPE8P, GUPJ8P, GUPP8P - SHADOW THE HEDGEHOG
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 2P mode is playable only with EFB to RAM.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini
deleted file mode 100644
index 2158c181d7..0000000000
--- a/Data/Sys/GameSettings/GUPE8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GUPE8P - SHADOW THE HEDGEHOG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GUPP8P.ini b/Data/Sys/GameSettings/GUPP8P.ini
deleted file mode 100644
index 681d40341c..0000000000
--- a/Data/Sys/GameSettings/GUPP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GUPP8P - SHADOW THE HEDGEHOG
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GUT.ini b/Data/Sys/GameSettings/GUT.ini
new file mode 100644
index 0000000000..dd543d618a
--- /dev/null
+++ b/Data/Sys/GameSettings/GUT.ini
@@ -0,0 +1,31 @@
+# GUTD52, GUTE52, GUTF52, GUTI52, GUTJC0, GUTP52, GUTS52 - Ultimate Spider-Man
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTD52.ini b/Data/Sys/GameSettings/GUTD52.ini
deleted file mode 100644
index 3f5dedc272..0000000000
--- a/Data/Sys/GameSettings/GUTD52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTD52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTE52.ini b/Data/Sys/GameSettings/GUTE52.ini
deleted file mode 100644
index 685738f72e..0000000000
--- a/Data/Sys/GameSettings/GUTE52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GUTE52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GUTF52.ini b/Data/Sys/GameSettings/GUTF52.ini
deleted file mode 100644
index 360b02e515..0000000000
--- a/Data/Sys/GameSettings/GUTF52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTF52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTI52.ini b/Data/Sys/GameSettings/GUTI52.ini
deleted file mode 100644
index db1860968f..0000000000
--- a/Data/Sys/GameSettings/GUTI52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTI52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTJC0.ini b/Data/Sys/GameSettings/GUTJC0.ini
deleted file mode 100644
index c863b6928a..0000000000
--- a/Data/Sys/GameSettings/GUTJC0.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTJC0 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTP52.ini b/Data/Sys/GameSettings/GUTP52.ini
deleted file mode 100644
index b4fc80fc0f..0000000000
--- a/Data/Sys/GameSettings/GUTP52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTP52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUTS52.ini b/Data/Sys/GameSettings/GUTS52.ini
deleted file mode 100644
index ee3bcdab69..0000000000
--- a/Data/Sys/GameSettings/GUTS52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GUTS52 - Ultimate Spider-Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUV.ini b/Data/Sys/GameSettings/GUV.ini
new file mode 100644
index 0000000000..6ba9908491
--- /dev/null
+++ b/Data/Sys/GameSettings/GUV.ini
@@ -0,0 +1,19 @@
+# GUVE51 - Freestyle Street Soccer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GUVE51.ini b/Data/Sys/GameSettings/GUVE51.ini
deleted file mode 100644
index 60660b4822..0000000000
--- a/Data/Sys/GameSettings/GUVE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GUVE51 - Freestyle Street Soccer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Corrupt Graphics"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GUZ.ini b/Data/Sys/GameSettings/GUZ.ini
new file mode 100644
index 0000000000..d27207888d
--- /dev/null
+++ b/Data/Sys/GameSettings/GUZ.ini
@@ -0,0 +1,31 @@
+# GUZE41, GUZP41 - Batman: Rise of Sin Tzu
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real XFB for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseRealXFB = True
+UseXFB = True
+
diff --git a/Data/Sys/GameSettings/GUZE41.ini b/Data/Sys/GameSettings/GUZE41.ini
deleted file mode 100644
index 4157609518..0000000000
--- a/Data/Sys/GameSettings/GUZE41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GUZE41 - Batman: Rise of Sin Tzu
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="TLB Error"
-EmulationIssues = Needs real XFB for videos to show up.(r6898)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseRealXFB = True
-UseXFB = True
-
diff --git a/Data/Sys/GameSettings/GUZP41.ini b/Data/Sys/GameSettings/GUZP41.ini
deleted file mode 100644
index 29c3a1cad9..0000000000
--- a/Data/Sys/GameSettings/GUZP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GUZP41 - Batman: Rise of Sin Tzu
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="TLB Error"
-EmulationIssues = Needs real XFB for videos to show up.(r6898)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseRealXFB = True
-UseXFB = True
-
diff --git a/Data/Sys/GameSettings/GV3.ini b/Data/Sys/GameSettings/GV3.ini
new file mode 100644
index 0000000000..5ea36416af
--- /dev/null
+++ b/Data/Sys/GameSettings/GV3.ini
@@ -0,0 +1,19 @@
+# GV3E70, GV3P70 - V-Rally 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GV3E70.ini b/Data/Sys/GameSettings/GV3E70.ini
deleted file mode 100644
index 6b66b560a5..0000000000
--- a/Data/Sys/GameSettings/GV3E70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GV3E70 - V-Rally 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GV3P70.ini b/Data/Sys/GameSettings/GV3P70.ini
deleted file mode 100644
index 3fccc0f304..0000000000
--- a/Data/Sys/GameSettings/GV3P70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GV3P70 - V-Rally 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GV4.ini b/Data/Sys/GameSettings/GV4.ini
new file mode 100644
index 0000000000..c8b91d857d
--- /dev/null
+++ b/Data/Sys/GameSettings/GV4.ini
@@ -0,0 +1,27 @@
+# GV4E69 - MVP Baseball 2005
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 2d graphics are messed up.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GVC.ini b/Data/Sys/GameSettings/GVC.ini
new file mode 100644
index 0000000000..db5122c651
--- /dev/null
+++ b/Data/Sys/GameSettings/GVC.ini
@@ -0,0 +1,31 @@
+# GVCE08, GVCP08 - Viewtiful Joe Red Hot Rumble
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GVCE08.ini b/Data/Sys/GameSettings/GVCE08.ini
deleted file mode 100644
index 9c3d05e574..0000000000
--- a/Data/Sys/GameSettings/GVCE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVCE08 - Viewtiful Joe Red Hot Rumble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVCP08.ini b/Data/Sys/GameSettings/GVCP08.ini
deleted file mode 100644
index a19c671f61..0000000000
--- a/Data/Sys/GameSettings/GVCP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVCP08 - Viewtiful Joe Red Hot Rumble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVD.ini b/Data/Sys/GameSettings/GVD.ini
new file mode 100644
index 0000000000..49512fc4e2
--- /dev/null
+++ b/Data/Sys/GameSettings/GVD.ini
@@ -0,0 +1,19 @@
+# GVDE78 - Bratz: Forever Diamondz
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GVDE78.ini b/Data/Sys/GameSettings/GVDE78.ini
deleted file mode 100644
index 22da0ec285..0000000000
--- a/Data/Sys/GameSettings/GVDE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GVDE78 - Bratz: Forever Diamondz
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GVH.ini b/Data/Sys/GameSettings/GVH.ini
new file mode 100644
index 0000000000..6c21148d39
--- /dev/null
+++ b/Data/Sys/GameSettings/GVH.ini
@@ -0,0 +1,19 @@
+# GVHE4F - BIONICLE Heroes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GVHE4F.ini b/Data/Sys/GameSettings/GVHE4F.ini
deleted file mode 100644
index 6a2cc402bf..0000000000
--- a/Data/Sys/GameSettings/GVHE4F.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GVHE4F - BIONICLE Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GVJ.ini b/Data/Sys/GameSettings/GVJ.ini
new file mode 100644
index 0000000000..5cc2ff91de
--- /dev/null
+++ b/Data/Sys/GameSettings/GVJ.ini
@@ -0,0 +1,31 @@
+# GVJE08, GVJJ08, GVJP08 - VIEWTIFUL JOE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GVJE08.ini b/Data/Sys/GameSettings/GVJE08.ini
deleted file mode 100644
index b89ac5f959..0000000000
--- a/Data/Sys/GameSettings/GVJE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVJE08 - VIEWTIFUL JOE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVJJ08.ini b/Data/Sys/GameSettings/GVJJ08.ini
deleted file mode 100644
index 983f0009ba..0000000000
--- a/Data/Sys/GameSettings/GVJJ08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVJJ08 - VIEWTIFUL JOE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVJP08.ini b/Data/Sys/GameSettings/GVJP08.ini
deleted file mode 100644
index 8d7898fe90..0000000000
--- a/Data/Sys/GameSettings/GVJP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GVJP08 - VIEWTIFUL JOE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GVK.ini b/Data/Sys/GameSettings/GVK.ini
new file mode 100644
index 0000000000..266f4957e8
--- /dev/null
+++ b/Data/Sys/GameSettings/GVK.ini
@@ -0,0 +1,27 @@
+# GVKE52 - Cabela's Dangerous Hunts 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GVKE52.ini b/Data/Sys/GameSettings/GVKE52.ini
deleted file mode 100644
index 0748b3e6fa..0000000000
--- a/Data/Sys/GameSettings/GVKE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GVKE52 - Cabela's Dangerous Hunts 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GVL.ini b/Data/Sys/GameSettings/GVL.ini
new file mode 100644
index 0000000000..cc32e3d7bc
--- /dev/null
+++ b/Data/Sys/GameSettings/GVL.ini
@@ -0,0 +1,20 @@
+# GVLD69, GVLE69, GVLF69, GVLE69 - Marvel Nemesis: Rise of the Imperfects
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GVLD69.ini b/Data/Sys/GameSettings/GVLD69.ini
deleted file mode 100644
index 12655316c5..0000000000
--- a/Data/Sys/GameSettings/GVLD69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GVLD69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GVLE69.ini b/Data/Sys/GameSettings/GVLE69.ini
deleted file mode 100644
index 100404be34..0000000000
--- a/Data/Sys/GameSettings/GVLE69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GVLE69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GVLF69.ini b/Data/Sys/GameSettings/GVLF69.ini
deleted file mode 100644
index 6c4d665c3e..0000000000
--- a/Data/Sys/GameSettings/GVLF69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GVLF69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GVLP69.ini b/Data/Sys/GameSettings/GVLP69.ini
deleted file mode 100644
index 100404be34..0000000000
--- a/Data/Sys/GameSettings/GVLP69.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# GVLE69 - Marvel Nemesis: Rise of the Imperfects
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GVO.ini b/Data/Sys/GameSettings/GVO.ini
new file mode 100644
index 0000000000..238bee4036
--- /dev/null
+++ b/Data/Sys/GameSettings/GVO.ini
@@ -0,0 +1,30 @@
+# GVOE69, GVOP69 - BIONICLE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GVR.ini b/Data/Sys/GameSettings/GVR.ini
new file mode 100644
index 0000000000..4a25c8fcdd
--- /dev/null
+++ b/Data/Sys/GameSettings/GVR.ini
@@ -0,0 +1,19 @@
+# GVRE7H - GrooveRider
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GVRE7H.ini b/Data/Sys/GameSettings/GVRE7H.ini
deleted file mode 100644
index 9a3c40bef9..0000000000
--- a/Data/Sys/GameSettings/GVRE7H.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GVRE7H - GrooveRider
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GVS.ini b/Data/Sys/GameSettings/GVS.ini
new file mode 100644
index 0000000000..f474836a55
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS.ini
@@ -0,0 +1,19 @@
+# GVSE8P, GVSP8P - Virtua Striker 3 ver. 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini
new file mode 100644
index 0000000000..91ab0b23ef
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46E.ini
@@ -0,0 +1,26 @@
+# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
+# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.ini
new file mode 100644
index 0000000000..91ab0b23ef
--- /dev/null
+++ b/Data/Sys/GameSettings/GVS46J.ini
@@ -0,0 +1,26 @@
+# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
+# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes on startup (Triforce game)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/GVSE8P.ini b/Data/Sys/GameSettings/GVSE8P.ini
deleted file mode 100644
index d21cb22d02..0000000000
--- a/Data/Sys/GameSettings/GVSE8P.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GVSE8P - Virtua Striker 2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Ocassional Fifo crashes (r6477)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GVSP8P.ini b/Data/Sys/GameSettings/GVSP8P.ini
deleted file mode 100644
index a3c7f7a794..0000000000
--- a/Data/Sys/GameSettings/GVSP8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GVSP8P - Virtua Striker 3 ver.2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GW2.ini b/Data/Sys/GameSettings/GW2.ini
new file mode 100644
index 0000000000..66dcaf05a1
--- /dev/null
+++ b/Data/Sys/GameSettings/GW2.ini
@@ -0,0 +1,30 @@
+# GW2E78, GW2P78 - WWE Day of Reckoning 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb to Ram for created fighters.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GW2E78.ini b/Data/Sys/GameSettings/GW2E78.ini
deleted file mode 100644
index 69950343ad..0000000000
--- a/Data/Sys/GameSettings/GW2E78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GW2E78 - WWE Day of Reckoning 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for created fighters.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GW2P78.ini b/Data/Sys/GameSettings/GW2P78.ini
deleted file mode 100644
index 4face38d65..0000000000
--- a/Data/Sys/GameSettings/GW2P78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GW2P78 - WWE Day of Reckoning 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for created fighters.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GW3.ini b/Data/Sys/GameSettings/GW3.ini
new file mode 100644
index 0000000000..d0e8adfb6e
--- /dev/null
+++ b/Data/Sys/GameSettings/GW3.ini
@@ -0,0 +1,19 @@
+# GW3E78, GW3P78 - WRESTLE MANIA X8
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GW3E78.ini b/Data/Sys/GameSettings/GW3E78.ini
deleted file mode 100644
index 26a355a201..0000000000
--- a/Data/Sys/GameSettings/GW3E78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW3E78 - WRESTLE MANIA X8
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GW3P78.ini b/Data/Sys/GameSettings/GW3P78.ini
deleted file mode 100644
index c273f4a88d..0000000000
--- a/Data/Sys/GameSettings/GW3P78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW3P78 - WRESTLE MANIA X8
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GW5.ini b/Data/Sys/GameSettings/GW5.ini
new file mode 100644
index 0000000000..e6d24bb214
--- /dev/null
+++ b/Data/Sys/GameSettings/GW5.ini
@@ -0,0 +1,19 @@
+# GW5D69, GW5E69, GW5F69, GW5P69 - Need For Speed Carbon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GW5E69.ini b/Data/Sys/GameSettings/GW5E69.ini
deleted file mode 100644
index d580b9791a..0000000000
--- a/Data/Sys/GameSettings/GW5E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW5E69 - Need For Speed Carbon
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GW7.ini b/Data/Sys/GameSettings/GW7.ini
new file mode 100644
index 0000000000..7ef464aae4
--- /dev/null
+++ b/Data/Sys/GameSettings/GW7.ini
@@ -0,0 +1,25 @@
+# GW7D69, GW7E69, GW7F69, GW7P69 - 007: Agent Under Fire (tm)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini
deleted file mode 100644
index 54f88d956a..0000000000
--- a/Data/Sys/GameSettings/GW7E69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GW7E69 - 007: Agent Under Fire (tm)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Intro videos are messed up, skip them (r6651)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini
deleted file mode 100644
index d062875728..0000000000
--- a/Data/Sys/GameSettings/GW7P69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GW7P69 - one inch punch
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GW8.ini b/Data/Sys/GameSettings/GW8.ini
new file mode 100644
index 0000000000..5daa031a75
--- /dev/null
+++ b/Data/Sys/GameSettings/GW8.ini
@@ -0,0 +1,27 @@
+# GW8E52 - World Series of Poker
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GW8E52.ini b/Data/Sys/GameSettings/GW8E52.ini
deleted file mode 100644
index def47d9646..0000000000
--- a/Data/Sys/GameSettings/GW8E52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GW8E52 - World Series of Poker
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GW9.ini b/Data/Sys/GameSettings/GW9.ini
new file mode 100644
index 0000000000..03ddd9d2d8
--- /dev/null
+++ b/Data/Sys/GameSettings/GW9.ini
@@ -0,0 +1,19 @@
+# GW9E78 - WRESTLEMANIA XIX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GW9E78.ini b/Data/Sys/GameSettings/GW9E78.ini
deleted file mode 100644
index 2373876b79..0000000000
--- a/Data/Sys/GameSettings/GW9E78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GW9E78 - WRESTLEMANIA XIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWA.ini b/Data/Sys/GameSettings/GWA.ini
new file mode 100644
index 0000000000..bef328ffc2
--- /dev/null
+++ b/Data/Sys/GameSettings/GWA.ini
@@ -0,0 +1,27 @@
+# GWAE8P, GWAF8P, GWAP8P - Spartan: Total Warrior
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GWAE8P.ini b/Data/Sys/GameSettings/GWAE8P.ini
deleted file mode 100644
index 3849803f6a..0000000000
--- a/Data/Sys/GameSettings/GWAE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAE8P - Spartan: Total Warrior
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWAF8P.ini b/Data/Sys/GameSettings/GWAF8P.ini
deleted file mode 100644
index 0540f6a10e..0000000000
--- a/Data/Sys/GameSettings/GWAF8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAF8P - Spartan: Total Warrior
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWAP8P.ini b/Data/Sys/GameSettings/GWAP8P.ini
deleted file mode 100644
index 534bd98e3e..0000000000
--- a/Data/Sys/GameSettings/GWAP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWAP8P - Spartan : Total  Warrior (TM)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWB.ini b/Data/Sys/GameSettings/GWB.ini
new file mode 100644
index 0000000000..b9c92e0aef
--- /dev/null
+++ b/Data/Sys/GameSettings/GWB.ini
@@ -0,0 +1,22 @@
+# GWBP41 - Worms Blast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GWBP41.ini b/Data/Sys/GameSettings/GWBP41.ini
deleted file mode 100644
index 8f3dba3749..0000000000
--- a/Data/Sys/GameSettings/GWBP41.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWBP41 - Worms Blast
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWE.ini b/Data/Sys/GameSettings/GWE.ini
new file mode 100644
index 0000000000..4ac03531f4
--- /dev/null
+++ b/Data/Sys/GameSettings/GWE.ini
@@ -0,0 +1,19 @@
+# GWEE51, GWEJB0, GWEP8P - 18 Wheeler
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Bad sound
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWEE51.ini b/Data/Sys/GameSettings/GWEE51.ini
deleted file mode 100644
index 718d310be3..0000000000
--- a/Data/Sys/GameSettings/GWEE51.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWEE51 - 18 Wheeler
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWEJB0.ini b/Data/Sys/GameSettings/GWEJB0.ini
deleted file mode 100644
index b0e1804572..0000000000
--- a/Data/Sys/GameSettings/GWEJB0.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWEJB0 - 18 Wheeler
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Bad sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWEP8P.ini b/Data/Sys/GameSettings/GWEP8P.ini
deleted file mode 100644
index 4a1ad80595..0000000000
--- a/Data/Sys/GameSettings/GWEP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWEP8P - 18 Wheeler
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWG.ini b/Data/Sys/GameSettings/GWG.ini
new file mode 100644
index 0000000000..54719f4317
--- /dev/null
+++ b/Data/Sys/GameSettings/GWG.ini
@@ -0,0 +1,18 @@
+# GWGP4F - Ace Golf
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWGP4F.ini b/Data/Sys/GameSettings/GWGP4F.ini
deleted file mode 100644
index f66a69f5c9..0000000000
--- a/Data/Sys/GameSettings/GWGP4F.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWGP4F - Ace Golf
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWJ.ini b/Data/Sys/GameSettings/GWJ.ini
new file mode 100644
index 0000000000..f74717a654
--- /dev/null
+++ b/Data/Sys/GameSettings/GWJ.ini
@@ -0,0 +1,25 @@
+# GWJE52 - Tony Hawk's American Wasteland
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GWJE52.ini b/Data/Sys/GameSettings/GWJE52.ini
deleted file mode 100644
index a00c124b47..0000000000
--- a/Data/Sys/GameSettings/GWJE52.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GWJE52 - Tony Hawk's American Wasteland
-[Core]
-# Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-Issues="Error to compile...DC error?"
-EmulationIssues = Slow because it needs mmu to run.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/GWK.ini b/Data/Sys/GameSettings/GWK.ini
new file mode 100644
index 0000000000..e39d65787b
--- /dev/null
+++ b/Data/Sys/GameSettings/GWK.ini
@@ -0,0 +1,19 @@
+# GWKE41, GWKP41 - King Kong
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWKE41.ini b/Data/Sys/GameSettings/GWKE41.ini
deleted file mode 100644
index 42bdb5ed38..0000000000
--- a/Data/Sys/GameSettings/GWKE41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GWKE41 - King Kong
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWKP41.ini b/Data/Sys/GameSettings/GWKP41.ini
deleted file mode 100644
index 79e1a972d1..0000000000
--- a/Data/Sys/GameSettings/GWKP41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GWKP41 - King Kong
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack=1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Very Very Darkening"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWL.ini b/Data/Sys/GameSettings/GWL.ini
new file mode 100644
index 0000000000..dd2b278f48
--- /dev/null
+++ b/Data/Sys/GameSettings/GWL.ini
@@ -0,0 +1,21 @@
+# GWLE6L, GWLX6L - Project Zoo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Bypass FIFO reset
+0x8028EE80:dword:0x48000638
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini
deleted file mode 100644
index 1c0d8321e2..0000000000
--- a/Data/Sys/GameSettings/GWLE6L.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GWLE6L - Project Zoo
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$Bypass FIFO reset
-0x8028EF00:dword:0x48000638
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWLX6L.ini b/Data/Sys/GameSettings/GWLX6L.ini
deleted file mode 100644
index 45f0910d95..0000000000
--- a/Data/Sys/GameSettings/GWLX6L.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWLX6L - Project Zoo
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$Bypass FIFO reset
-0x8028EE80:dword:0x48000638
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWM.ini b/Data/Sys/GameSettings/GWM.ini
new file mode 100644
index 0000000000..e4069b7ef9
--- /dev/null
+++ b/Data/Sys/GameSettings/GWM.ini
@@ -0,0 +1,18 @@
+# GWME51 - Worms 3D
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWME51.ini b/Data/Sys/GameSettings/GWME51.ini
deleted file mode 100644
index 0e82f99adc..0000000000
--- a/Data/Sys/GameSettings/GWME51.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWME51 - Worms 3D
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWO.ini b/Data/Sys/GameSettings/GWO.ini
new file mode 100644
index 0000000000..6003129694
--- /dev/null
+++ b/Data/Sys/GameSettings/GWO.ini
@@ -0,0 +1,30 @@
+# GWOE5G - Blowout
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = 1
+
diff --git a/Data/Sys/GameSettings/GWOE5G.ini b/Data/Sys/GameSettings/GWOE5G.ini
deleted file mode 100644
index b13e235ff6..0000000000
--- a/Data/Sys/GameSettings/GWOE5G.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GWOE5G - Blowout
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = 1
-
diff --git a/Data/Sys/GameSettings/GWP.ini b/Data/Sys/GameSettings/GWP.ini
new file mode 100644
index 0000000000..8e31e91588
--- /dev/null
+++ b/Data/Sys/GameSettings/GWP.ini
@@ -0,0 +1,30 @@
+# GWPE78, GWPJG2, GWPP78 - WWE Day of Reckoning
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb to Ram for created fighters.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GWPE78.ini b/Data/Sys/GameSettings/GWPE78.ini
deleted file mode 100644
index 97fcb54d0f..0000000000
--- a/Data/Sys/GameSettings/GWPE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPE78 - WWE Day of Reckoning
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for created fighters.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWPJG2.ini b/Data/Sys/GameSettings/GWPJG2.ini
deleted file mode 100644
index 766630e610..0000000000
--- a/Data/Sys/GameSettings/GWPJG2.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPJG2 - WWE Day of Reckoning
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for created fighters.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWPP78.ini b/Data/Sys/GameSettings/GWPP78.ini
deleted file mode 100644
index 9e437ee488..0000000000
--- a/Data/Sys/GameSettings/GWPP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GWPP78 - WWE Day of Reckoning
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Efb to Ram for created fighters.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/GWQ.ini b/Data/Sys/GameSettings/GWQ.ini
new file mode 100644
index 0000000000..c0fce9d3a8
--- /dev/null
+++ b/Data/Sys/GameSettings/GWQ.ini
@@ -0,0 +1,22 @@
+# GWQE52 - WRECKLESS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GWQE52.ini b/Data/Sys/GameSettings/GWQE52.ini
index 7f419c7409..c2a377b641 100644
--- a/Data/Sys/GameSettings/GWQE52.ini
+++ b/Data/Sys/GameSettings/GWQE52.ini
@@ -1,13 +1,5 @@
 # GWQE52 - WRECKLESS
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -210,7 +202,3 @@ $B6 Hard Unlocked (Spy Story)
 000F5753 00000000
 $B6 Bonus Unlocked (Spy Story)
 000F5773 00000000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWR.ini b/Data/Sys/GameSettings/GWR.ini
new file mode 100644
index 0000000000..54a767ec99
--- /dev/null
+++ b/Data/Sys/GameSettings/GWR.ini
@@ -0,0 +1,27 @@
+# GWRE01, GWRP01 - WAVE RACE / BLUE STORM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.ini
index 2b62d176db..e88519e438 100644
--- a/Data/Sys/GameSettings/GWRE01.ini
+++ b/Data/Sys/GameSettings/GWRE01.ini
@@ -1,7 +1,7 @@
 # GWRE01 - WAVE RACE / BLUE STORM
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -20,7 +20,7 @@ $Always 0 missed Buoys
 046199F4 00000000
 $Always turbo
 04620FDC 0000004B
-$Never 'out of bounds' - can not finish race
+$Never 'out of bounds' - cannot finish race
 04619BD4 00000000
 $Stunt mode: Massive score
 0461B2B8 05F5E0FF
diff --git a/Data/Sys/GameSettings/GWRP01.ini b/Data/Sys/GameSettings/GWRP01.ini
index 919ae3036b..dea98e29b8 100644
--- a/Data/Sys/GameSettings/GWRP01.ini
+++ b/Data/Sys/GameSettings/GWRP01.ini
@@ -1,13 +1,5 @@
 # GWRP01 - WAVE RACE / BLUE STORM
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -38,7 +30,3 @@ $All Championships/Tracks Open
 $All Weather Options Available
 040AA930 38000001
 040A5FE8 38000001
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWS.ini b/Data/Sys/GameSettings/GWS.ini
new file mode 100644
index 0000000000..fbe93e145c
--- /dev/null
+++ b/Data/Sys/GameSettings/GWS.ini
@@ -0,0 +1,19 @@
+# GWSEA4 - ESPN International Winter Sports 2002
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = can't see anything in menus or in-game
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWSEA4.ini b/Data/Sys/GameSettings/GWSEA4.ini
deleted file mode 100644
index 5d3c81b310..0000000000
--- a/Data/Sys/GameSettings/GWSEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWSEA4 - ESPN International Winter Sports 2002
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = can't see anything in menus or in-game
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWT.ini b/Data/Sys/GameSettings/GWT.ini
new file mode 100644
index 0000000000..6fa6a8d9b9
--- /dev/null
+++ b/Data/Sys/GameSettings/GWT.ini
@@ -0,0 +1,21 @@
+# GWTEA4, GWTJA4, GWTPA4 - WTA Tour Tennis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+# This game does not work properly with large memorycards, use a 251 block card
+# see http://www.nintendo.com/consumer/memorycard1019.jsp
+MemoryCard251 = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWTEA4.ini b/Data/Sys/GameSettings/GWTEA4.ini
deleted file mode 100644
index 2e68a39ff3..0000000000
--- a/Data/Sys/GameSettings/GWTEA4.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWTEA4 - WTA Tour Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWV.ini b/Data/Sys/GameSettings/GWV.ini
new file mode 100644
index 0000000000..26704f05af
--- /dev/null
+++ b/Data/Sys/GameSettings/GWV.ini
@@ -0,0 +1,22 @@
+# GWVE52, GWVP52, GWVX52 - X2 Wolverine's Revenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GWVE52.ini b/Data/Sys/GameSettings/GWVE52.ini
deleted file mode 100644
index 6ab1de75c2..0000000000
--- a/Data/Sys/GameSettings/GWVE52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWVE52 - X2 Wolverine's Revenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GWW.ini b/Data/Sys/GameSettings/GWW.ini
new file mode 100644
index 0000000000..03b3a94282
--- /dev/null
+++ b/Data/Sys/GameSettings/GWW.ini
@@ -0,0 +1,27 @@
+# GWWE01, GWWP01 - WARIO WORLD
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GWWE01.ini b/Data/Sys/GameSettings/GWWE01.ini
deleted file mode 100644
index 7452028914..0000000000
--- a/Data/Sys/GameSettings/GWWE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GWWE01 - WARIO WORLD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GWWP01.ini b/Data/Sys/GameSettings/GWWP01.ini
index 1f39c03385..1f9297af92 100644
--- a/Data/Sys/GameSettings/GWWP01.ini
+++ b/Data/Sys/GameSettings/GWWP01.ini
@@ -1,13 +1,5 @@
 # GWWP01 - WARIO WORLD
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -55,4 +47,3 @@ $All levels open and complete GBA games
 041D8C94 FFFFFFFF
 041D8C98 FFFFFFFF
 021D8C9C 0000FFFF
-
diff --git a/Data/Sys/GameSettings/GWY.ini b/Data/Sys/GameSettings/GWY.ini
new file mode 100644
index 0000000000..435a09bb36
--- /dev/null
+++ b/Data/Sys/GameSettings/GWY.ini
@@ -0,0 +1,29 @@
+# GWYE41, GWYX41 - Tom Clancy's Splinter Cell Double Agent
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos require real XFB.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GWYE41.ini b/Data/Sys/GameSettings/GWYE41.ini
deleted file mode 100644
index fdb3ae53bd..0000000000
--- a/Data/Sys/GameSettings/GWYE41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GWYE41 - Tom Clancy's Splinter Cell Double Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Requires MMUSH and ATC. Videos require real XFB.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GWYX41.ini b/Data/Sys/GameSettings/GWYX41.ini
deleted file mode 100644
index f41edab4c6..0000000000
--- a/Data/Sys/GameSettings/GWYX41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GWYX41 - Tom Clancy's Splinter Cell Double Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Requires MMUSH and ATC. Videos require real XFB.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GWZ.ini b/Data/Sys/GameSettings/GWZ.ini
new file mode 100644
index 0000000000..1ec16599b0
--- /dev/null
+++ b/Data/Sys/GameSettings/GWZ.ini
@@ -0,0 +1,18 @@
+# GWZE01, GWZP01 - Dance Dance Revolution: Mario Mix
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GWZE01.ini b/Data/Sys/GameSettings/GWZE01.ini
deleted file mode 100644
index 336bd80bd0..0000000000
--- a/Data/Sys/GameSettings/GWZE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GWZE01 - Dance Dance Revolution: Mario Mix for US
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GWZP01.ini b/Data/Sys/GameSettings/GWZP01.ini
deleted file mode 100644
index 62dada6357..0000000000
--- a/Data/Sys/GameSettings/GWZP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GWZP01 - Dancing Stage: Mario Mix for EU
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GX2.ini b/Data/Sys/GameSettings/GX2.ini
new file mode 100644
index 0000000000..249eb7157b
--- /dev/null
+++ b/Data/Sys/GameSettings/GX2.ini
@@ -0,0 +1,27 @@
+# GX2E52, GX2P52 - X-Men Legends 2: Rise of Apocalypse
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GX2E52.ini b/Data/Sys/GameSettings/GX2E52.ini
deleted file mode 100644
index 13fd103fab..0000000000
--- a/Data/Sys/GameSettings/GX2E52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GX2E52 - X-Men Legends 2: Rise of Apocalypse
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GX2P52.ini b/Data/Sys/GameSettings/GX2P52.ini
deleted file mode 100644
index 7de07bf21c..0000000000
--- a/Data/Sys/GameSettings/GX2P52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GX2P52 - X-Men Legends 2: Rise of Apocalypse
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GX3.ini b/Data/Sys/GameSettings/GX3.ini
new file mode 100644
index 0000000000..59e544ce1d
--- /dev/null
+++ b/Data/Sys/GameSettings/GX3.ini
@@ -0,0 +1,31 @@
+# GX3E41, GX3P41, GX3X41 - XIII
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Needs real xfb for the videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/GX3E41.ini b/Data/Sys/GameSettings/GX3E41.ini
deleted file mode 100644
index 3f0b9acfda..0000000000
--- a/Data/Sys/GameSettings/GX3E41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GX3E41 - XIII
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to show up (r6906)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GX3P41.ini b/Data/Sys/GameSettings/GX3P41.ini
deleted file mode 100644
index e67c22d58c..0000000000
--- a/Data/Sys/GameSettings/GX3P41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GX3P41 - XIII
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GX3X41.ini b/Data/Sys/GameSettings/GX3X41.ini
deleted file mode 100644
index 8361387dc1..0000000000
--- a/Data/Sys/GameSettings/GX3X41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GX3X41 - XIII
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-MMU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs real xfb for the videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GXB.ini b/Data/Sys/GameSettings/GXB.ini
new file mode 100644
index 0000000000..f5807b6285
--- /dev/null
+++ b/Data/Sys/GameSettings/GXB.ini
@@ -0,0 +1,30 @@
+# GXBE69, GXBP69 - SSX3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = False
+
diff --git a/Data/Sys/GameSettings/GXBE69.ini b/Data/Sys/GameSettings/GXBE69.ini
deleted file mode 100644
index 1a13241edc..0000000000
--- a/Data/Sys/GameSettings/GXBE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXBE69 - SSX3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Has problematic intro videos(skip them).
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/GXBP69.ini b/Data/Sys/GameSettings/GXBP69.ini
deleted file mode 100644
index d14ca0a178..0000000000
--- a/Data/Sys/GameSettings/GXBP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GXBP69 - SSX3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Has problematic intro videos(skip them).
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/GXC.ini b/Data/Sys/GameSettings/GXC.ini
new file mode 100644
index 0000000000..6aec5b953d
--- /dev/null
+++ b/Data/Sys/GameSettings/GXC.ini
@@ -0,0 +1,27 @@
+# GXCE01, GXCJ01 - CustomRobo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GXCE01.ini b/Data/Sys/GameSettings/GXCE01.ini
deleted file mode 100644
index f2e7de7645..0000000000
--- a/Data/Sys/GameSettings/GXCE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GXCE01 - CustomRobo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct 3d 11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXE.ini b/Data/Sys/GameSettings/GXE.ini
new file mode 100644
index 0000000000..84c522725b
--- /dev/null
+++ b/Data/Sys/GameSettings/GXE.ini
@@ -0,0 +1,18 @@
+# GXEE8P, GXEJ8P, GXEP8P - Sonic Riders
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini
deleted file mode 100644
index 3c61da3c81..0000000000
--- a/Data/Sys/GameSettings/GXEE8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GXEE8P - SonicRiders
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GXEP8P.ini b/Data/Sys/GameSettings/GXEP8P.ini
deleted file mode 100644
index f7cd7b2174..0000000000
--- a/Data/Sys/GameSettings/GXEP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GXEP8P - SonicRiders
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GXF.ini b/Data/Sys/GameSettings/GXF.ini
new file mode 100644
index 0000000000..46fd84ddab
--- /dev/null
+++ b/Data/Sys/GameSettings/GXF.ini
@@ -0,0 +1,27 @@
+# GXFE69, GXFF69, GXFP69 - FIFA Soccer 2004
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GXFE69.ini b/Data/Sys/GameSettings/GXFE69.ini
deleted file mode 100644
index 5133631855..0000000000
--- a/Data/Sys/GameSettings/GXFE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXFE69 - FIFA Soccer 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXFF69.ini b/Data/Sys/GameSettings/GXFF69.ini
deleted file mode 100644
index 9147ce7a81..0000000000
--- a/Data/Sys/GameSettings/GXFF69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXFF69 - FIFA Soccer 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXFP69.ini b/Data/Sys/GameSettings/GXFP69.ini
deleted file mode 100644
index 295d5a8154..0000000000
--- a/Data/Sys/GameSettings/GXFP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXFP69 - FIFA Soccer 2004
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXG.ini b/Data/Sys/GameSettings/GXG.ini
new file mode 100644
index 0000000000..01e00c74c8
--- /dev/null
+++ b/Data/Sys/GameSettings/GXG.ini
@@ -0,0 +1,20 @@
+# GXGE08 - MEGAMAN X COLLECTION
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GXGE08.ini b/Data/Sys/GameSettings/GXGE08.ini
deleted file mode 100644
index b5d46d19f4..0000000000
--- a/Data/Sys/GameSettings/GXGE08.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GXGE08 - MEGAMAN X COLLECTION
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/GXL.ini b/Data/Sys/GameSettings/GXL.ini
new file mode 100644
index 0000000000..bef676d95d
--- /dev/null
+++ b/Data/Sys/GameSettings/GXL.ini
@@ -0,0 +1,22 @@
+# GXLE52, GXLP52 - X-Men: Legends
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GXLE52.ini b/Data/Sys/GameSettings/GXLE52.ini
deleted file mode 100644
index 2f9bbf3380..0000000000
--- a/Data/Sys/GameSettings/GXLE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXLE52 - X-Men: Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXLP52.ini b/Data/Sys/GameSettings/GXLP52.ini
deleted file mode 100644
index 1cc038f17b..0000000000
--- a/Data/Sys/GameSettings/GXLP52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GXLP52 - X-Men: Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GXM.ini b/Data/Sys/GameSettings/GXM.ini
new file mode 100644
index 0000000000..fc8544e32e
--- /dev/null
+++ b/Data/Sys/GameSettings/GXM.ini
@@ -0,0 +1,30 @@
+# GXME52, GXMF52, GXMP52 - X-Men Next Dimension
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GXME52.ini b/Data/Sys/GameSettings/GXME52.ini
deleted file mode 100644
index 9a2b0d3620..0000000000
--- a/Data/Sys/GameSettings/GXME52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GXME52 - X-Men3 V6
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GXN.ini b/Data/Sys/GameSettings/GXN.ini
new file mode 100644
index 0000000000..c83dea615c
--- /dev/null
+++ b/Data/Sys/GameSettings/GXN.ini
@@ -0,0 +1,25 @@
+# GXNE5D - Rampage: Total Destruction
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GXNE5D.ini b/Data/Sys/GameSettings/GXNE5D.ini
deleted file mode 100644
index b0c9ea290f..0000000000
--- a/Data/Sys/GameSettings/GXNE5D.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# GXNE5D - Rampage: Total Destruction
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GXO.ini b/Data/Sys/GameSettings/GXO.ini
new file mode 100644
index 0000000000..422dbce8d5
--- /dev/null
+++ b/Data/Sys/GameSettings/GXO.ini
@@ -0,0 +1,27 @@
+# GXOE69, GXOX69 - SSX On Tour
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GXOE69.ini b/Data/Sys/GameSettings/GXOE69.ini
deleted file mode 100644
index a9a1fee2f6..0000000000
--- a/Data/Sys/GameSettings/GXOE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXOE69 - SSX On Tour
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Has problematic intro videos (skip them).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXOX69.ini b/Data/Sys/GameSettings/GXOX69.ini
deleted file mode 100644
index 1593adb0e5..0000000000
--- a/Data/Sys/GameSettings/GXOX69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# GXOX69 - SSX On Tour
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Has problematic intro videos (skip them).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GXR.ini b/Data/Sys/GameSettings/GXR.ini
new file mode 100644
index 0000000000..39df1f44f0
--- /dev/null
+++ b/Data/Sys/GameSettings/GXR.ini
@@ -0,0 +1,19 @@
+# GXRE08 - MEGA MAN X COMMAND MISSION
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GXRE08.ini b/Data/Sys/GameSettings/GXRE08.ini
deleted file mode 100644
index d4446d89cc..0000000000
--- a/Data/Sys/GameSettings/GXRE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GXRE08 - MEGA MAN X COMMAND MISSION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GXS.ini b/Data/Sys/GameSettings/GXS.ini
new file mode 100644
index 0000000000..51f5a1937c
--- /dev/null
+++ b/Data/Sys/GameSettings/GXS.ini
@@ -0,0 +1,24 @@
+# GXSE8P, GXSP6W, GXSP8P - Sonic Adventure DX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GXSE8P.ini b/Data/Sys/GameSettings/GXSE8P.ini
deleted file mode 100644
index 3be2500a01..0000000000
--- a/Data/Sys/GameSettings/GXSE8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GXSE8P - SonicAdventureDX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GXSP8P.ini b/Data/Sys/GameSettings/GXSP8P.ini
index 7293efdff4..7f101b8e55 100644
--- a/Data/Sys/GameSettings/GXSP8P.ini
+++ b/Data/Sys/GameSettings/GXSP8P.ini
@@ -1,11 +1,4 @@
-# GXSP8P - SonicAdventureDX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
+# GXSP8P - Sonic Adventure DX
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -47,4 +40,3 @@ $Gouraud Shading
 $All Emblems
 038C294C 18000000
 043594E8 388000FF
-
diff --git a/Data/Sys/GameSettings/GXX.ini b/Data/Sys/GameSettings/GXX.ini
new file mode 100644
index 0000000000..8bb0228d0d
--- /dev/null
+++ b/Data/Sys/GameSettings/GXX.ini
@@ -0,0 +1,32 @@
+# GXXE01, GXXP01 - POKeMON XD
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = HLE music fades in and out. If EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/GXXE01.ini b/Data/Sys/GameSettings/GXXE01.ini
deleted file mode 100644
index 258d114a9b..0000000000
--- a/Data/Sys/GameSettings/GXXE01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GXXE01 - POKeMON XD
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = HLE music fades in and out. If EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini
deleted file mode 100644
index 047d81dca2..0000000000
--- a/Data/Sys/GameSettings/GXXP01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# GXXP01 - POKeMON XD
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = HLE music fades in and out. If EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/GY2.ini b/Data/Sys/GameSettings/GY2.ini
new file mode 100644
index 0000000000..3f0e357921
--- /dev/null
+++ b/Data/Sys/GameSettings/GY2.ini
@@ -0,0 +1,19 @@
+# GY2E01 - Donkey Konga 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GY2E01.ini b/Data/Sys/GameSettings/GY2E01.ini
deleted file mode 100644
index d869f382d8..0000000000
--- a/Data/Sys/GameSettings/GY2E01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GY2E01 - Donkey Konga 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GYA.ini b/Data/Sys/GameSettings/GYA.ini
new file mode 100644
index 0000000000..2144c2e23d
--- /dev/null
+++ b/Data/Sys/GameSettings/GYA.ini
@@ -0,0 +1,19 @@
+# GYAE78 - Barnyard
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Bad texture problem, not playable!
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GYAE78.ini b/Data/Sys/GameSettings/GYAE78.ini
deleted file mode 100644
index e5fb9a87b8..0000000000
--- a/Data/Sys/GameSettings/GYAE78.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GYAE78 - Barnyard
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Bad texture problem, not playable!
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GYB.ini b/Data/Sys/GameSettings/GYB.ini
new file mode 100644
index 0000000000..3f54fc04ea
--- /dev/null
+++ b/Data/Sys/GameSettings/GYB.ini
@@ -0,0 +1,18 @@
+# GYBP01 - DONKEY KONG JUNGLE BEAT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GYBP01.ini b/Data/Sys/GameSettings/GYBP01.ini
deleted file mode 100644
index 61c5026345..0000000000
--- a/Data/Sys/GameSettings/GYBP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GYBP01 - DONKEY KONG JUNGLE BEAT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GYF.ini b/Data/Sys/GameSettings/GYF.ini
new file mode 100644
index 0000000000..e8836c969b
--- /dev/null
+++ b/Data/Sys/GameSettings/GYF.ini
@@ -0,0 +1,22 @@
+# GYFEA4 - Yu-Gi-Oh! The Falsebound Kingdom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GYFEA4.ini b/Data/Sys/GameSettings/GYFEA4.ini
deleted file mode 100644
index 4a53107b4a..0000000000
--- a/Data/Sys/GameSettings/GYFEA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GYFEA4 - Yu-Gi-Oh! The Falsebound Kingdom
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GYK.ini b/Data/Sys/GameSettings/GYK.ini
new file mode 100644
index 0000000000..cdda032a20
--- /dev/null
+++ b/Data/Sys/GameSettings/GYK.ini
@@ -0,0 +1,22 @@
+# GYKEB2 - Zatch Bell! Mamodo Battles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/GYKEB2.ini b/Data/Sys/GameSettings/GYKEB2.ini
deleted file mode 100644
index 183fd403f8..0000000000
--- a/Data/Sys/GameSettings/GYKEB2.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# GYKEB2 - Zatch Bell! Mamodo Battles
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GYQ.ini b/Data/Sys/GameSettings/GYQ.ini
new file mode 100644
index 0000000000..0e14c536ad
--- /dev/null
+++ b/Data/Sys/GameSettings/GYQ.ini
@@ -0,0 +1,20 @@
+# GYQE01, GYQJ01, GYQP01 - Mario Superstar Baseball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
diff --git a/Data/Sys/GameSettings/GYQP01.ini b/Data/Sys/GameSettings/GYQP01.ini
deleted file mode 100644
index 89f76c202c..0000000000
--- a/Data/Sys/GameSettings/GYQP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GYQP01 - MARIO SUPERSTAR BASEBALL
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GYR.ini b/Data/Sys/GameSettings/GYR.ini
new file mode 100644
index 0000000000..9a91550fd2
--- /dev/null
+++ b/Data/Sys/GameSettings/GYR.ini
@@ -0,0 +1,19 @@
+# GYRE41 - TMNT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GYRE41.ini b/Data/Sys/GameSettings/GYRE41.ini
deleted file mode 100644
index 23227a05e6..0000000000
--- a/Data/Sys/GameSettings/GYRE41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# GYRE41 - TMNT
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GYT.ini b/Data/Sys/GameSettings/GYT.ini
new file mode 100644
index 0000000000..63e73f944e
--- /dev/null
+++ b/Data/Sys/GameSettings/GYT.ini
@@ -0,0 +1,27 @@
+# GYTE69, GYTP69 - TY the Tasmanian Tiger 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/GYW.ini b/Data/Sys/GameSettings/GYW.ini
new file mode 100644
index 0000000000..776f4bde36
--- /dev/null
+++ b/Data/Sys/GameSettings/GYW.ini
@@ -0,0 +1,27 @@
+# GYWD41, GYWEE9, GYWP41 - Harvest Moon: A Wonderful Life
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/GYWD41.ini b/Data/Sys/GameSettings/GYWD41.ini
deleted file mode 100644
index b6d17de522..0000000000
--- a/Data/Sys/GameSettings/GYWD41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWD41 - Harvest Moon: A Wonderful Life
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GYWEE9.ini b/Data/Sys/GameSettings/GYWEE9.ini
deleted file mode 100644
index 7c1b84e345..0000000000
--- a/Data/Sys/GameSettings/GYWEE9.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWEE9 - Harvest Moon: A Wonderful Life
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GYWP41.ini b/Data/Sys/GameSettings/GYWP41.ini
deleted file mode 100644
index f95bd02d48..0000000000
--- a/Data/Sys/GameSettings/GYWP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# GYWP41 - Harvest Moon: A Wonderful Life
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/GZ2.ini b/Data/Sys/GameSettings/GZ2.ini
new file mode 100644
index 0000000000..8cd97f9b1a
--- /dev/null
+++ b/Data/Sys/GameSettings/GZ2.ini
@@ -0,0 +1,26 @@
+# GZ2E01, GZ2J01, GZ2P01 - The Legend of Zelda: Twilight Princess [GC]
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini
index 0362ac0a33..85063fa4ec 100644
--- a/Data/Sys/GameSettings/GZ2E01.ini
+++ b/Data/Sys/GameSettings/GZ2E01.ini
@@ -1,19 +1,46 @@
-# GZ2E01 - The Legend of Zelda: Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
+# GZ2E01 - The Legend of Zelda: Twilight Princess [GC]
 
 [EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="low FPS in big areas"
-EmulationIssues =
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x8003D50C:dword:0x60000000
+0x8003D528:dword:0x60000000
+0x8003D540:dword:0x60000000
+0x8003D55C:dword:0x60000000
+
+0x8003D55C:dword:0x60000000
+0x8003D560:dword:0x60000000
+0x8003D564:dword:0x60000000
+0x8003D568:dword:0x60000000
+0x8003D56C:dword:0x60000000
+0x8003D570:dword:0x60000000
+0x8003D574:dword:0x60000000
+0x8003D578:dword:0x60000000
+0x8003D57C:dword:0x60000000
+0x8003D580:dword:0x60000000
+0x8003D584:dword:0x60000000
+0x8003D588:dword:0x60000000
+0x8003D58C:dword:0x60000000
+0x8003D590:dword:0x60000000
+0x8003D594:dword:0x60000000
+0x8003D598:dword:0x60000000
+0x8003D59C:dword:0x60000000
+0x8003D5A0:dword:0x60000000
+0x8003D5A4:dword:0x60000000
+0x8003D5A8:dword:0x60000000
+0x8003D5AC:dword:0x60000000
+0x8003D5B0:dword:0x60000000
+
+0x8003D5B8:dword:0x60000000
+0x8003D5D4:dword:0x60000000
+0x8003D5EC:dword:0x60000000
+0x8003D608:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
@@ -1484,21 +1511,3 @@ $Item Slots 17-20 (Twilight Spectre)
 0440626C 00000000
 $Item Slots 21-24 (Twilight Spectre)
 04406270 00000000
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini
deleted file mode 100644
index a3df9a2634..0000000000
--- a/Data/Sys/GameSettings/GZ2J01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# GZ2J01 - The Legend of Zelda: Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="low FPS in big areas"
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini
index 61aa9ffc2a..781b9071e0 100644
--- a/Data/Sys/GameSettings/GZ2P01.ini
+++ b/Data/Sys/GameSettings/GZ2P01.ini
@@ -1,18 +1,46 @@
-# GZ2P01 - The Legend of Zelda Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
+# GZ2P01 - The Legend of Zelda: Twilight Princess [GC]
 
 [EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x8003d63c:dword:0x60000000
+0x8003d658:dword:0x60000000
+0x8003d670:dword:0x60000000
+0x8003d68c:dword:0x60000000
+
+0x8003d690:dword:0x60000000
+0x8003d694:dword:0x60000000
+0x8003d698:dword:0x60000000
+0x8003d69c:dword:0x60000000
+0x8003d6a0:dword:0x60000000
+0x8003d6a4:dword:0x60000000
+0x8003d6a8:dword:0x60000000
+0x8003d6ac:dword:0x60000000
+0x8003d6b0:dword:0x60000000
+0x8003d6b4:dword:0x60000000
+0x8003d6b8:dword:0x60000000
+0x8003d6bc:dword:0x60000000
+0x8003d6c0:dword:0x60000000
+0x8003d6c4:dword:0x60000000
+0x8003d6c8:dword:0x60000000
+0x8003d6cc:dword:0x60000000
+0x8003d6d0:dword:0x60000000
+0x8003d6d4:dword:0x60000000
+0x8003d6d8:dword:0x60000000
+0x8003d6dc:dword:0x60000000
+0x8003d6e0:dword:0x60000000
+0x8003d6e4:dword:0x60000000
+
+0x8003d6e8:dword:0x60000000
+0x8003d704:dword:0x60000000
+0x8003d71c:dword:0x60000000
+0x8003d738:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
@@ -79,24 +107,3 @@ $One Tear Fills 3rd Vessel of Light
 D776EB56 1475A9C0
 28408276 0000000F
 00408276 0000000F
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
-[Speedhacks]
-0x803420bc=200
-
diff --git a/Data/Sys/GameSettings/GZ3.ini b/Data/Sys/GameSettings/GZ3.ini
new file mode 100644
index 0000000000..52cfe9c7cd
--- /dev/null
+++ b/Data/Sys/GameSettings/GZ3.ini
@@ -0,0 +1,19 @@
+# GZ3EB2, GZ3PB2 - Dragon Ball Z Budokai 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GZ3E70.ini b/Data/Sys/GameSettings/GZ3E70.ini
index 90f9c3405a..2b1cae7be0 100644
--- a/Data/Sys/GameSettings/GZ3E70.ini
+++ b/Data/Sys/GameSettings/GZ3E70.ini
@@ -1,13 +1,5 @@
 # GZ3E70 - Dragon Ball Z 2
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -50,4 +42,3 @@ $Have All Capsules! (Edit A Skill and Save To Activate)
 005447E9 00000009
 005447F4 00000009
 005447FF 00000009
-
diff --git a/Data/Sys/GameSettings/GZ3PB2.ini b/Data/Sys/GameSettings/GZ3PB2.ini
deleted file mode 100644
index df82fcb61a..0000000000
--- a/Data/Sys/GameSettings/GZ3PB2.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GZ3PB2 - Dragon Ball Z Budokai 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="FullSpeed ingame But half Screen view...Bug?"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GZD.ini b/Data/Sys/GameSettings/GZD.ini
new file mode 100644
index 0000000000..dcdec75c24
--- /dev/null
+++ b/Data/Sys/GameSettings/GZD.ini
@@ -0,0 +1,17 @@
+# GZDE70, GZDJ70, GZDP70 - Godzilla
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/GZE.ini b/Data/Sys/GameSettings/GZE.ini
new file mode 100644
index 0000000000..90fbe9adc2
--- /dev/null
+++ b/Data/Sys/GameSettings/GZE.ini
@@ -0,0 +1,30 @@
+# GZEE70 - Dragon Ball Z Sagas
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/GZEE70.ini b/Data/Sys/GameSettings/GZEE70.ini
deleted file mode 100644
index 38b27d1312..0000000000
--- a/Data/Sys/GameSettings/GZEE70.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# GZEE70 - Dragon Ball Z Sagas
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-Issues="Playable,but sometimes slowdown FPS maybe is patched"
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GZL.ini b/Data/Sys/GameSettings/GZL.ini
new file mode 100644
index 0000000000..eb1a128f1f
--- /dev/null
+++ b/Data/Sys/GameSettings/GZL.ini
@@ -0,0 +1,36 @@
+# GZLE01, GZLJ01, GZLP01 - The Legend of Zelda The Wind Waker
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+FastDepthCalc = False
+
+[Video_Stereoscopy]
+StereoConvergenceMinimum = 115
diff --git a/Data/Sys/GameSettings/GZLE01.ini b/Data/Sys/GameSettings/GZLE01.ini
index f871a46a5f..4c3ed71e85 100644
--- a/Data/Sys/GameSettings/GZLE01.ini
+++ b/Data/Sys/GameSettings/GZLE01.ini
@@ -1,22 +1,10 @@
 # GZLE01 - The Legend of Zelda The Wind Waker
 
-[Core]
-# Values set here will override the main dolphin settings.
-DSPThread = False
-DSPHLE = False
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-$Fix item hang
-0x802904B4:dword:0x4E800020
 $Max health
 0x803C4C09:byte:0x00000050
 $Current health
@@ -356,19 +344,3 @@ $Test room 14 - Hold (L + R+ B)
 $Unrestricted Camera
 04356D34 45000000
 04356D48 42B00000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GZLJ01.ini b/Data/Sys/GameSettings/GZLJ01.ini
index c1c0ccccb1..3fa0053b3e 100644
--- a/Data/Sys/GameSettings/GZLJ01.ini
+++ b/Data/Sys/GameSettings/GZLJ01.ini
@@ -1,22 +1,10 @@
 # GZLJ01 - The Legend of Zelda The Wind Waker
 
-[Core]
-# Values set here will override the main dolphin settings.
-DSPThread = False
-DSPHLE = False
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-$Fix item hang
-0x802904B4:dword:0x4E800020
 $Max health
 0x803C4C09:byte:0x00000050
 $Current health
@@ -32,19 +20,3 @@ $Snow test room
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GZLP01.ini b/Data/Sys/GameSettings/GZLP01.ini
index ff5edfa24f..122cfecf59 100644
--- a/Data/Sys/GameSettings/GZLP01.ini
+++ b/Data/Sys/GameSettings/GZLP01.ini
@@ -1,22 +1,10 @@
 # GZLP01 - The Legend of Zelda The Wind Waker
 
-[Core]
-# Values set here will override the main dolphin settings.
-DSPThread = False
-DSPHLE = False
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-$Fix item hang
-0x80295654:dword:0x4E800020
 $Max health
 0x803C4C09:byte:0x00000050
 $Current health
@@ -235,19 +223,3 @@ $Test Room 14 (Hold L+R+B)
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746500
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GZM.ini b/Data/Sys/GameSettings/GZM.ini
new file mode 100644
index 0000000000..3b01d40451
--- /dev/null
+++ b/Data/Sys/GameSettings/GZM.ini
@@ -0,0 +1,19 @@
+# GZMP7D - Butt Ugly Martians Zoom or Doom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GZMP7D.ini b/Data/Sys/GameSettings/GZMP7D.ini
deleted file mode 100644
index 0eaeede32a..0000000000
--- a/Data/Sys/GameSettings/GZMP7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GZMP7D - Butt Ugly Martians Zoom or Doom
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GZP.ini b/Data/Sys/GameSettings/GZP.ini
new file mode 100644
index 0000000000..5be247b1e2
--- /dev/null
+++ b/Data/Sys/GameSettings/GZP.ini
@@ -0,0 +1,34 @@
+# GZPE70, GZPP70- Zapper
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DSPHLE = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
+[DSP]
+EnableJIT = True
diff --git a/Data/Sys/GameSettings/GZPE70.ini b/Data/Sys/GameSettings/GZPE70.ini
deleted file mode 100644
index 6ad606417c..0000000000
--- a/Data/Sys/GameSettings/GZPE70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GZPE70 - Zapper
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GZPP70.ini b/Data/Sys/GameSettings/GZPP70.ini
deleted file mode 100644
index f430f558c0..0000000000
--- a/Data/Sys/GameSettings/GZPP70.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# GZPP70 - Zapper
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/GZS.ini b/Data/Sys/GameSettings/GZS.ini
new file mode 100644
index 0000000000..0bf5075145
--- /dev/null
+++ b/Data/Sys/GameSettings/GZS.ini
@@ -0,0 +1,19 @@
+# GZSE70 - Zoids: Battle Legends
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GZSE70.ini b/Data/Sys/GameSettings/GZSE70.ini
deleted file mode 100644
index 3780da4f1b..0000000000
--- a/Data/Sys/GameSettings/GZSE70.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# GZSE70 - Zoids: Battle Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Bad sound, Repeat constantly"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GZW.ini b/Data/Sys/GameSettings/GZW.ini
new file mode 100644
index 0000000000..0ffeec5e7a
--- /dev/null
+++ b/Data/Sys/GameSettings/GZW.ini
@@ -0,0 +1,33 @@
+# GZWE01, GZWJ01, GZWP01 - WarioWare, Inc. Mega Party Games
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+EFBScale = -1
+
+[Video_Enhancements]
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/GZWE01.ini b/Data/Sys/GameSettings/GZWE01.ini
deleted file mode 100644
index ebcffa0557..0000000000
--- a/Data/Sys/GameSettings/GZWE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GZWE01 - WarioWare, Inc. Mega Party Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Need Save texture cache,graphic glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/GZWP01.ini b/Data/Sys/GameSettings/GZWP01.ini
deleted file mode 100644
index fce84240a5..0000000000
--- a/Data/Sys/GameSettings/GZWP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# GZWP01 - WarioWare, Inc. Mega Party Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Need Save texture cache,graphic glitches
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/HAA.ini b/Data/Sys/GameSettings/HAA.ini
new file mode 100644
index 0000000000..163dbc57a4
--- /dev/null
+++ b/Data/Sys/GameSettings/HAA.ini
@@ -0,0 +1,22 @@
+# HAAA01 - Photo Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/HAAA01.ini b/Data/Sys/GameSettings/HAAA01.ini
deleted file mode 100644
index 218fde7e39..0000000000
--- a/Data/Sys/GameSettings/HAAA01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HAAA01 - Photo Channel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HAB.ini b/Data/Sys/GameSettings/HAB.ini
new file mode 100644
index 0000000000..1ee9ac0455
--- /dev/null
+++ b/Data/Sys/GameSettings/HAB.ini
@@ -0,0 +1,22 @@
+# HABA01, HABK01 - Wii Shop Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Will not connect. Uses WiiConnect24.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HAC.ini b/Data/Sys/GameSettings/HAC.ini
new file mode 100644
index 0000000000..7f76cfb257
--- /dev/null
+++ b/Data/Sys/GameSettings/HAC.ini
@@ -0,0 +1,25 @@
+# HACA01 - Mii Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/HACA01.ini b/Data/Sys/GameSettings/HACA01.ini
deleted file mode 100644
index 8d7201cf8a..0000000000
--- a/Data/Sys/GameSettings/HACA01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# HACA01 - Mii Channel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/HAD.ini b/Data/Sys/GameSettings/HAD.ini
new file mode 100644
index 0000000000..3a50c805f5
--- /dev/null
+++ b/Data/Sys/GameSettings/HAD.ini
@@ -0,0 +1,23 @@
+# HADE01, HADJ01, HADP01 - Internet Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = If using a hard drive, low FPS on first run while save data is created
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HADE01.ini b/Data/Sys/GameSettings/HADE01.ini
deleted file mode 100644
index 07ae1c7654..0000000000
--- a/Data/Sys/GameSettings/HADE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HADE01 - Internet Channel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HAT.ini b/Data/Sys/GameSettings/HAT.ini
new file mode 100644
index 0000000000..4ff45b44fc
--- /dev/null
+++ b/Data/Sys/GameSettings/HAT.ini
@@ -0,0 +1,24 @@
+# HATE01 - Nintendo Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/HAW.ini b/Data/Sys/GameSettings/HAW.ini
new file mode 100644
index 0000000000..9c85ba9292
--- /dev/null
+++ b/Data/Sys/GameSettings/HAW.ini
@@ -0,0 +1,22 @@
+# HAWE01 - Metroid Prime 3 Preview Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Uses WiiConnect24
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/HAX.ini b/Data/Sys/GameSettings/HAX.ini
new file mode 100644
index 0000000000..6f98eb5361
--- /dev/null
+++ b/Data/Sys/GameSettings/HAX.ini
@@ -0,0 +1,22 @@
+# HAXXHB - HomeBrew Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/HAXXHB.ini b/Data/Sys/GameSettings/HAXXHB.ini
deleted file mode 100644
index 5581ffd2c9..0000000000
--- a/Data/Sys/GameSettings/HAXXHB.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HAXXHB - HomeBrew Channel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HAY.ini b/Data/Sys/GameSettings/HAY.ini
new file mode 100644
index 0000000000..0f424fc6b8
--- /dev/null
+++ b/Data/Sys/GameSettings/HAY.ini
@@ -0,0 +1,23 @@
+# HAYA01 - Photo Channel 1.1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+Hack = 0
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/HAYA01.ini b/Data/Sys/GameSettings/HAYA01.ini
deleted file mode 100644
index 21ad9d1c2d..0000000000
--- a/Data/Sys/GameSettings/HAYA01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# HAYA01 - Photo Channel 1.1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-Hack = 0
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HCD.ini b/Data/Sys/GameSettings/HCD.ini
new file mode 100644
index 0000000000..864a137085
--- /dev/null
+++ b/Data/Sys/GameSettings/HCD.ini
@@ -0,0 +1,22 @@
+# HCDJ01 - Digicam Print Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCF.ini b/Data/Sys/GameSettings/HCF.ini
new file mode 100644
index 0000000000..46b362eeba
--- /dev/null
+++ b/Data/Sys/GameSettings/HCF.ini
@@ -0,0 +1,18 @@
+# HCFE01, HCFP01 - Wii Speak Channel
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = No support for Wii Speak Microphone
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/HCFE01.ini b/Data/Sys/GameSettings/HCFE01.ini
deleted file mode 100644
index e41bdb51fc..0000000000
--- a/Data/Sys/GameSettings/HCFE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# HCFE01 - Wii Speak Channel
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Not WiiConnect24
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/HCL.ini b/Data/Sys/GameSettings/HCL.ini
new file mode 100644
index 0000000000..5fd4966ef5
--- /dev/null
+++ b/Data/Sys/GameSettings/HCL.ini
@@ -0,0 +1,25 @@
+# HCLEXN - Netflix
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/HCQ.ini b/Data/Sys/GameSettings/HCQ.ini
new file mode 100644
index 0000000000..cc5d380d3a
--- /dev/null
+++ b/Data/Sys/GameSettings/HCQ.ini
@@ -0,0 +1,22 @@
+# HCQEXB - Hulu Plus
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Unable to connect to internet
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/HCS.ini b/Data/Sys/GameSettings/HCS.ini
new file mode 100644
index 0000000000..556f55760a
--- /dev/null
+++ b/Data/Sys/GameSettings/HCS.ini
@@ -0,0 +1,24 @@
+# HCSE01 - Wii U Transfer Tool
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/JA4.ini b/Data/Sys/GameSettings/JA4.ini
new file mode 100644
index 0000000000..ad480e8d6a
--- /dev/null
+++ b/Data/Sys/GameSettings/JA4.ini
@@ -0,0 +1,25 @@
+# JA4E01 - Super Ghouls 'n Ghosts
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JA6.ini b/Data/Sys/GameSettings/JA6.ini
new file mode 100644
index 0000000000..14902c8a4a
--- /dev/null
+++ b/Data/Sys/GameSettings/JA6.ini
@@ -0,0 +1,25 @@
+# JA6E01 - Zombies Ate My Neighbors
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JA7.ini b/Data/Sys/GameSettings/JA7.ini
new file mode 100644
index 0000000000..c0143ce6b1
--- /dev/null
+++ b/Data/Sys/GameSettings/JA7.ini
@@ -0,0 +1,25 @@
+# JA7E01 - ActRaiser
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JA8.ini b/Data/Sys/GameSettings/JA8.ini
new file mode 100644
index 0000000000..5d58c0905f
--- /dev/null
+++ b/Data/Sys/GameSettings/JA8.ini
@@ -0,0 +1,25 @@
+# JA8E01 - Final Fight
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAA.ini b/Data/Sys/GameSettings/JAA.ini
new file mode 100644
index 0000000000..7a041ea78a
--- /dev/null
+++ b/Data/Sys/GameSettings/JAA.ini
@@ -0,0 +1,25 @@
+# JAAE01 - Super Mario World
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAAE01.ini b/Data/Sys/GameSettings/JAAE01.ini
deleted file mode 100644
index 29bf6b926c..0000000000
--- a/Data/Sys/GameSettings/JAAE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# JAAE01 - Super Mario World
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/JAC.ini b/Data/Sys/GameSettings/JAC.ini
new file mode 100644
index 0000000000..f60ffcb1ba
--- /dev/null
+++ b/Data/Sys/GameSettings/JAC.ini
@@ -0,0 +1,26 @@
+# JACE01, JACP01 - F-Zero
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/JACP01.ini b/Data/Sys/GameSettings/JACP01.ini
deleted file mode 100644
index a7b52cb5b7..0000000000
--- a/Data/Sys/GameSettings/JACP01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# JACP01 - F-Zero
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/JAD.ini b/Data/Sys/GameSettings/JAD.ini
new file mode 100644
index 0000000000..128f2b847c
--- /dev/null
+++ b/Data/Sys/GameSettings/JAD.ini
@@ -0,0 +1,25 @@
+# JADE01 - The Legend of Zelda A Link to the Past
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JADE01.ini b/Data/Sys/GameSettings/JADE01.ini
deleted file mode 100644
index 0725e57fe3..0000000000
--- a/Data/Sys/GameSettings/JADE01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# JADE01 - The Legend of Zelda A Link to the Past
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable progressive scan for proper speed.
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAE.ini b/Data/Sys/GameSettings/JAE.ini
new file mode 100644
index 0000000000..599c13901d
--- /dev/null
+++ b/Data/Sys/GameSettings/JAE.ini
@@ -0,0 +1,25 @@
+# JAEE01 - Donkey Kong Country
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JAEE01.ini b/Data/Sys/GameSettings/JAEE01.ini
deleted file mode 100644
index 405011ff35..0000000000
--- a/Data/Sys/GameSettings/JAEE01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# JAEE01 - Donkey Kong Country
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs progressive scan for proper speed.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JAF.ini b/Data/Sys/GameSettings/JAF.ini
new file mode 100644
index 0000000000..3bd18c34b3
--- /dev/null
+++ b/Data/Sys/GameSettings/JAF.ini
@@ -0,0 +1,25 @@
+# JAFE01 - Sim City
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAH.ini b/Data/Sys/GameSettings/JAH.ini
new file mode 100644
index 0000000000..d0d55f369a
--- /dev/null
+++ b/Data/Sys/GameSettings/JAH.ini
@@ -0,0 +1,25 @@
+# JAHE01 - R-Type III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAHE01.ini b/Data/Sys/GameSettings/JAHE01.ini
deleted file mode 100644
index 17347ff4fa..0000000000
--- a/Data/Sys/GameSettings/JAHE01.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# JAHE01 - R･TYPE Ⅲ
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs progressive scan for proper speed.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-[Gecko]
diff --git a/Data/Sys/GameSettings/JAI.ini b/Data/Sys/GameSettings/JAI.ini
new file mode 100644
index 0000000000..7fabd6a130
--- /dev/null
+++ b/Data/Sys/GameSettings/JAI.ini
@@ -0,0 +1,25 @@
+# JAIE01 - Super Castlevania IV
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAJ.ini b/Data/Sys/GameSettings/JAJ.ini
new file mode 100644
index 0000000000..3ca02b682a
--- /dev/null
+++ b/Data/Sys/GameSettings/JAJ.ini
@@ -0,0 +1,25 @@
+# JAJE01 - Street Fighter II The World Warrior
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAL.ini b/Data/Sys/GameSettings/JAL.ini
new file mode 100644
index 0000000000..ba2e5729b5
--- /dev/null
+++ b/Data/Sys/GameSettings/JAL.ini
@@ -0,0 +1,25 @@
+# JALE01 - Contra III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JAM.ini b/Data/Sys/GameSettings/JAM.ini
new file mode 100644
index 0000000000..c25a94fbea
--- /dev/null
+++ b/Data/Sys/GameSettings/JAM.ini
@@ -0,0 +1,25 @@
+# JAME01 - Gradius III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAV.ini b/Data/Sys/GameSettings/JAV.ini
new file mode 100644
index 0000000000..ffa867c874
--- /dev/null
+++ b/Data/Sys/GameSettings/JAV.ini
@@ -0,0 +1,25 @@
+# JAVE01 - Super Metroid
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAW.ini b/Data/Sys/GameSettings/JAW.ini
new file mode 100644
index 0000000000..09d798b0ec
--- /dev/null
+++ b/Data/Sys/GameSettings/JAW.ini
@@ -0,0 +1,25 @@
+# JAWE01 - Romance of the Three Kingdoms IV: Wall of Fire
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JAZ.ini b/Data/Sys/GameSettings/JAZ.ini
new file mode 100644
index 0000000000..06dab55267
--- /dev/null
+++ b/Data/Sys/GameSettings/JAZ.ini
@@ -0,0 +1,25 @@
+# JAZE01 - The Legend of the Mystical Ninja
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JB3.ini b/Data/Sys/GameSettings/JB3.ini
new file mode 100644
index 0000000000..6ef521b408
--- /dev/null
+++ b/Data/Sys/GameSettings/JB3.ini
@@ -0,0 +1,25 @@
+# JB3E01 - Harvest Moon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBA.ini b/Data/Sys/GameSettings/JBA.ini
new file mode 100644
index 0000000000..eb8e465db3
--- /dev/null
+++ b/Data/Sys/GameSettings/JBA.ini
@@ -0,0 +1,25 @@
+# JBAE01 - Metal Marines
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JBB.ini b/Data/Sys/GameSettings/JBB.ini
new file mode 100644
index 0000000000..e886351555
--- /dev/null
+++ b/Data/Sys/GameSettings/JBB.ini
@@ -0,0 +1,25 @@
+# JBBE01 - Super SF II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBC.ini b/Data/Sys/GameSettings/JBC.ini
new file mode 100644
index 0000000000..bff9ee4b37
--- /dev/null
+++ b/Data/Sys/GameSettings/JBC.ini
@@ -0,0 +1,26 @@
+# JBCE01 - Kirby's Dream Course
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JBD.ini b/Data/Sys/GameSettings/JBD.ini
new file mode 100644
index 0000000000..e39bf073d0
--- /dev/null
+++ b/Data/Sys/GameSettings/JBD.ini
@@ -0,0 +1,25 @@
+# JBDE01 - Donkey Kong Country 2: Diddy's Kong Quest
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBI.ini b/Data/Sys/GameSettings/JBI.ini
new file mode 100644
index 0000000000..586b89ab97
--- /dev/null
+++ b/Data/Sys/GameSettings/JBI.ini
@@ -0,0 +1,25 @@
+# JBIE01 - Street Fighter II Turbo: Hyper Fighting
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBK.ini b/Data/Sys/GameSettings/JBK.ini
new file mode 100644
index 0000000000..efca5b1707
--- /dev/null
+++ b/Data/Sys/GameSettings/JBK.ini
@@ -0,0 +1,26 @@
+# JBKE01, JBKP01 - Breath of Fire II
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JBKE01.ini b/Data/Sys/GameSettings/JBKE01.ini
deleted file mode 100644
index 17841b583d..0000000000
--- a/Data/Sys/GameSettings/JBKE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# JBKE01 - Breath of Fire II
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs progressive scan for proper speed.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/JBKP01.ini b/Data/Sys/GameSettings/JBKP01.ini
deleted file mode 100644
index a2cb04bad0..0000000000
--- a/Data/Sys/GameSettings/JBKP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# JBKP01 -
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/JBL.ini b/Data/Sys/GameSettings/JBL.ini
new file mode 100644
index 0000000000..5f649503e6
--- /dev/null
+++ b/Data/Sys/GameSettings/JBL.ini
@@ -0,0 +1,25 @@
+# JBLE01 - Pac-Attack
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBP.ini b/Data/Sys/GameSettings/JBP.ini
new file mode 100644
index 0000000000..c173816a8c
--- /dev/null
+++ b/Data/Sys/GameSettings/JBP.ini
@@ -0,0 +1,25 @@
+# JBPE01 - Donkey Kong Country 3: Dixie Kong's Double Trouble!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBQ.ini b/Data/Sys/GameSettings/JBQ.ini
new file mode 100644
index 0000000000..d768630a0a
--- /dev/null
+++ b/Data/Sys/GameSettings/JBQ.ini
@@ -0,0 +1,25 @@
+# JBQE01 - Kirby's Avalanche
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JBR.ini b/Data/Sys/GameSettings/JBR.ini
new file mode 100644
index 0000000000..621051e236
--- /dev/null
+++ b/Data/Sys/GameSettings/JBR.ini
@@ -0,0 +1,25 @@
+# JBRE01 - Vegas Stakes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBS.ini b/Data/Sys/GameSettings/JBS.ini
new file mode 100644
index 0000000000..4faf390dba
--- /dev/null
+++ b/Data/Sys/GameSettings/JBS.ini
@@ -0,0 +1,25 @@
+# JBSE01 - AXELAY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JBT.ini b/Data/Sys/GameSettings/JBT.ini
new file mode 100644
index 0000000000..1d0e5a7a7d
--- /dev/null
+++ b/Data/Sys/GameSettings/JBT.ini
@@ -0,0 +1,25 @@
+# JBTE01 - Super Turrican
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBU.ini b/Data/Sys/GameSettings/JBU.ini
new file mode 100644
index 0000000000..690f9a31a9
--- /dev/null
+++ b/Data/Sys/GameSettings/JBU.ini
@@ -0,0 +1,25 @@
+# JBUE01 - Super Turrican 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JBW.ini b/Data/Sys/GameSettings/JBW.ini
new file mode 100644
index 0000000000..eeb67f9bac
--- /dev/null
+++ b/Data/Sys/GameSettings/JBW.ini
@@ -0,0 +1,25 @@
+# JBWE01 - Cybernator
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JBY.ini b/Data/Sys/GameSettings/JBY.ini
new file mode 100644
index 0000000000..6f66e49849
--- /dev/null
+++ b/Data/Sys/GameSettings/JBY.ini
@@ -0,0 +1,25 @@
+# JBYE01 - SUPER R-TYPE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JC4.ini b/Data/Sys/GameSettings/JC4.ini
new file mode 100644
index 0000000000..a5af2f1892
--- /dev/null
+++ b/Data/Sys/GameSettings/JC4.ini
@@ -0,0 +1,25 @@
+# JC4E01 - Indiana Jones' GA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JC7.ini b/Data/Sys/GameSettings/JC7.ini
new file mode 100644
index 0000000000..6ed6b31b80
--- /dev/null
+++ b/Data/Sys/GameSettings/JC7.ini
@@ -0,0 +1,25 @@
+# JC7E01 - The Combatribes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JC8.ini b/Data/Sys/GameSettings/JC8.ini
new file mode 100644
index 0000000000..60fe5c583d
--- /dev/null
+++ b/Data/Sys/GameSettings/JC8.ini
@@ -0,0 +1,26 @@
+# JC8E01 - FINAL FANTASY II
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JCA.ini b/Data/Sys/GameSettings/JCA.ini
new file mode 100644
index 0000000000..3e3349887f
--- /dev/null
+++ b/Data/Sys/GameSettings/JCA.ini
@@ -0,0 +1,25 @@
+# JCAN01 - DoReMi Fantasy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCB.ini b/Data/Sys/GameSettings/JCB.ini
new file mode 100644
index 0000000000..7a7475658c
--- /dev/null
+++ b/Data/Sys/GameSettings/JCB.ini
@@ -0,0 +1,25 @@
+# JCBE01 - Super Mario RPG
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCBE01.ini b/Data/Sys/GameSettings/JCBE01.ini
deleted file mode 100644
index fefd63b950..0000000000
--- a/Data/Sys/GameSettings/JCBE01.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# JCBE01 - Super Mario RPG
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Needs progressive scan for proper speed.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JCC.ini b/Data/Sys/GameSettings/JCC.ini
new file mode 100644
index 0000000000..5af741a834
--- /dev/null
+++ b/Data/Sys/GameSettings/JCC.ini
@@ -0,0 +1,25 @@
+# JCCE01 - Kirby Super Star
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCD.ini b/Data/Sys/GameSettings/JCD.ini
new file mode 100644
index 0000000000..0060b220e8
--- /dev/null
+++ b/Data/Sys/GameSettings/JCD.ini
@@ -0,0 +1,25 @@
+# JCDE01 - Kirby's Dream Land 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JCJ.ini b/Data/Sys/GameSettings/JCJ.ini
new file mode 100644
index 0000000000..9949a16e0e
--- /dev/null
+++ b/Data/Sys/GameSettings/JCJ.ini
@@ -0,0 +1,25 @@
+# JCJE01 - Super Punch-Out!!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCK.ini b/Data/Sys/GameSettings/JCK.ini
new file mode 100644
index 0000000000..a642e622fa
--- /dev/null
+++ b/Data/Sys/GameSettings/JCK.ini
@@ -0,0 +1,25 @@
+# JCKE01 - Space Invaders The Original Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCL.ini b/Data/Sys/GameSettings/JCL.ini
new file mode 100644
index 0000000000..d7aa418543
--- /dev/null
+++ b/Data/Sys/GameSettings/JCL.ini
@@ -0,0 +1,26 @@
+# JCLE01 - SECRET OF MANA
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JCN.ini b/Data/Sys/GameSettings/JCN.ini
new file mode 100644
index 0000000000..848f12890e
--- /dev/null
+++ b/Data/Sys/GameSettings/JCN.ini
@@ -0,0 +1,25 @@
+# JCNE01 - Prince of Persia
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCT.ini b/Data/Sys/GameSettings/JCT.ini
new file mode 100644
index 0000000000..0abbd1583c
--- /dev/null
+++ b/Data/Sys/GameSettings/JCT.ini
@@ -0,0 +1,26 @@
+# JCTE01 - Ogre Battle MBQ
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JCV.ini b/Data/Sys/GameSettings/JCV.ini
new file mode 100644
index 0000000000..2c8708fa80
--- /dev/null
+++ b/Data/Sys/GameSettings/JCV.ini
@@ -0,0 +1,25 @@
+# JCVE01 - PilotWings
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCW.ini b/Data/Sys/GameSettings/JCW.ini
new file mode 100644
index 0000000000..10b03f8a4b
--- /dev/null
+++ b/Data/Sys/GameSettings/JCW.ini
@@ -0,0 +1,25 @@
+# JCWE01 - Super Mario Kart
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JCWE01.ini b/Data/Sys/GameSettings/JCWE01.ini
deleted file mode 100644
index cf0410c0be..0000000000
--- a/Data/Sys/GameSettings/JCWE01.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# JCWE01 - Super Mario Kart
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan for proper speed.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/JCX.ini b/Data/Sys/GameSettings/JCX.ini
new file mode 100644
index 0000000000..5ac3403503
--- /dev/null
+++ b/Data/Sys/GameSettings/JCX.ini
@@ -0,0 +1,25 @@
+# JCXE01 - Nobunaga's Ambition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/JCY.ini b/Data/Sys/GameSettings/JCY.ini
new file mode 100644
index 0000000000..dbe816d5f1
--- /dev/null
+++ b/Data/Sys/GameSettings/JCY.ini
@@ -0,0 +1,26 @@
+# JCYE01 - Uncharted Waters New Horizons
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues =
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JCZ.ini b/Data/Sys/GameSettings/JCZ.ini
new file mode 100644
index 0000000000..7d3b2b0201
--- /dev/null
+++ b/Data/Sys/GameSettings/JCZ.ini
@@ -0,0 +1,25 @@
+# JCZE01 - Genghis Khan II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDA.ini b/Data/Sys/GameSettings/JDA.ini
new file mode 100644
index 0000000000..798084b26c
--- /dev/null
+++ b/Data/Sys/GameSettings/JDA.ini
@@ -0,0 +1,26 @@
+# JDAE01 - FINAL FANTASY III
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JDC.ini b/Data/Sys/GameSettings/JDC.ini
new file mode 100644
index 0000000000..981df90624
--- /dev/null
+++ b/Data/Sys/GameSettings/JDC.ini
@@ -0,0 +1,25 @@
+# JDCE01 - Street Fighter Alpha 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDD.ini b/Data/Sys/GameSettings/JDD.ini
new file mode 100644
index 0000000000..013cdc1802
--- /dev/null
+++ b/Data/Sys/GameSettings/JDD.ini
@@ -0,0 +1,25 @@
+# JDDE01 - Final Fight 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDE.ini b/Data/Sys/GameSettings/JDE.ini
new file mode 100644
index 0000000000..a1425702cb
--- /dev/null
+++ b/Data/Sys/GameSettings/JDE.ini
@@ -0,0 +1,25 @@
+# JDEE01 - Final Fight 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDI.ini b/Data/Sys/GameSettings/JDI.ini
new file mode 100644
index 0000000000..954ff2d017
--- /dev/null
+++ b/Data/Sys/GameSettings/JDI.ini
@@ -0,0 +1,25 @@
+# JDIE01 - Super Star Wars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDJ.ini b/Data/Sys/GameSettings/JDJ.ini
new file mode 100644
index 0000000000..50ebde0a0a
--- /dev/null
+++ b/Data/Sys/GameSettings/JDJ.ini
@@ -0,0 +1,25 @@
+# JDJE01 - Super Star Wars: ESB
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDL.ini b/Data/Sys/GameSettings/JDL.ini
new file mode 100644
index 0000000000..2d5baf84b0
--- /dev/null
+++ b/Data/Sys/GameSettings/JDL.ini
@@ -0,0 +1,25 @@
+# JDLE01 - Super Star Wars: ROJ
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDN.ini b/Data/Sys/GameSettings/JDN.ini
new file mode 100644
index 0000000000..00aa198f1b
--- /dev/null
+++ b/Data/Sys/GameSettings/JDN.ini
@@ -0,0 +1,25 @@
+# JDNE01 - Ghoul Patrol
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDV.ini b/Data/Sys/GameSettings/JDV.ini
new file mode 100644
index 0000000000..3a6e9df0ba
--- /dev/null
+++ b/Data/Sys/GameSettings/JDV.ini
@@ -0,0 +1,26 @@
+# JDVE01 - Wild Guns
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Needs progressive scan for proper speed.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JDW.ini b/Data/Sys/GameSettings/JDW.ini
new file mode 100644
index 0000000000..0edc412c66
--- /dev/null
+++ b/Data/Sys/GameSettings/JDW.ini
@@ -0,0 +1,25 @@
+# JDWE01 - AERO THE ACROBAT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDX.ini b/Data/Sys/GameSettings/JDX.ini
new file mode 100644
index 0000000000..82bc50f986
--- /dev/null
+++ b/Data/Sys/GameSettings/JDX.ini
@@ -0,0 +1,25 @@
+# JDXE01 - AERO THE ACROBAT 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JDZ.ini b/Data/Sys/GameSettings/JDZ.ini
new file mode 100644
index 0000000000..496842bef5
--- /dev/null
+++ b/Data/Sys/GameSettings/JDZ.ini
@@ -0,0 +1,25 @@
+# JDZE01 - Final Fantasy Mystic Quest
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JEB.ini b/Data/Sys/GameSettings/JEB.ini
new file mode 100644
index 0000000000..9105c353e9
--- /dev/null
+++ b/Data/Sys/GameSettings/JEB.ini
@@ -0,0 +1,25 @@
+# JEBE01 - Mega Man X
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JEC.ini b/Data/Sys/GameSettings/JEC.ini
new file mode 100644
index 0000000000..23628c4c49
--- /dev/null
+++ b/Data/Sys/GameSettings/JEC.ini
@@ -0,0 +1,26 @@
+# JECE01 - CHRONO TRIGGER
+
+[Core]
+ProgressiveScan = True
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues =
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/JEH.ini b/Data/Sys/GameSettings/JEH.ini
new file mode 100644
index 0000000000..8750fde6bb
--- /dev/null
+++ b/Data/Sys/GameSettings/JEH.ini
@@ -0,0 +1,25 @@
+# JEHE01 - MEGA MAN X2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/JOD.ini b/Data/Sys/GameSettings/JOD.ini
new file mode 100644
index 0000000000..f0681f7793
--- /dev/null
+++ b/Data/Sys/GameSettings/JOD.ini
@@ -0,0 +1,19 @@
+# JODIHB - Unknown
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 1
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/JODIHB.ini b/Data/Sys/GameSettings/JODIHB.ini
deleted file mode 100644
index d51796dc13..0000000000
--- a/Data/Sys/GameSettings/JODIHB.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# JODIHB - Unknown
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 1
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/LAB.ini b/Data/Sys/GameSettings/LAB.ini
new file mode 100644
index 0000000000..e92efc671a
--- /dev/null
+++ b/Data/Sys/GameSettings/LAB.ini
@@ -0,0 +1,24 @@
+# LABE8P, LABP8P - Fantasy Zone
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAC.ini b/Data/Sys/GameSettings/LAC.ini
new file mode 100644
index 0000000000..d4ec99a6cc
--- /dev/null
+++ b/Data/Sys/GameSettings/LAC.ini
@@ -0,0 +1,24 @@
+# LACE8P, LACJ8P, LACP8P - Wonder Boy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAD.ini b/Data/Sys/GameSettings/LAD.ini
new file mode 100644
index 0000000000..aa84e61f95
--- /dev/null
+++ b/Data/Sys/GameSettings/LAD.ini
@@ -0,0 +1,26 @@
+# LADE8P, LADJ8P, LADP8P - Phantasy Star
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAE.ini b/Data/Sys/GameSettings/LAE.ini
new file mode 100644
index 0000000000..d488ad9f26
--- /dev/null
+++ b/Data/Sys/GameSettings/LAE.ini
@@ -0,0 +1,24 @@
+# LAEE8P, LAEP8P - Alex Kidd
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAF.ini b/Data/Sys/GameSettings/LAF.ini
new file mode 100644
index 0000000000..6b813b3c02
--- /dev/null
+++ b/Data/Sys/GameSettings/LAF.ini
@@ -0,0 +1,26 @@
+# LAFN8P, LAFP8P - Secret Command
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAG.ini b/Data/Sys/GameSettings/LAG.ini
new file mode 100644
index 0000000000..9e8e558c2d
--- /dev/null
+++ b/Data/Sys/GameSettings/LAG.ini
@@ -0,0 +1,24 @@
+# LAGE8P, LAGJ8P, LAGP8P - Sonic The Hedgehog
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAI.ini b/Data/Sys/GameSettings/LAI.ini
new file mode 100644
index 0000000000..e02af20c37
--- /dev/null
+++ b/Data/Sys/GameSettings/LAI.ini
@@ -0,0 +1,24 @@
+# LAIE8P, LAIP8P - Enduro Racer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAJ.ini b/Data/Sys/GameSettings/LAJ.ini
new file mode 100644
index 0000000000..d59c6775eb
--- /dev/null
+++ b/Data/Sys/GameSettings/LAJ.ini
@@ -0,0 +1,24 @@
+# LAJE8P, LAJJ8P, LAJP8P - Sonic The Hedgehog 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAK.ini b/Data/Sys/GameSettings/LAK.ini
new file mode 100644
index 0000000000..81968bd58e
--- /dev/null
+++ b/Data/Sys/GameSettings/LAK.ini
@@ -0,0 +1,26 @@
+# LAKE8P, LAKJ8P, LAKP8P - Wonder Boy II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAL.ini b/Data/Sys/GameSettings/LAL.ini
new file mode 100644
index 0000000000..6472f3bc2b
--- /dev/null
+++ b/Data/Sys/GameSettings/LAL.ini
@@ -0,0 +1,26 @@
+# LALE8P, LALP8P - Fantasy Zone II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAM.ini b/Data/Sys/GameSettings/LAM.ini
new file mode 100644
index 0000000000..344c6d5e1c
--- /dev/null
+++ b/Data/Sys/GameSettings/LAM.ini
@@ -0,0 +1,24 @@
+# LAME8P, LAMJ8P, LAMP8P - Sonic Chaos
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/LAN.ini b/Data/Sys/GameSettings/LAN.ini
new file mode 100644
index 0000000000..3cf2d15962
--- /dev/null
+++ b/Data/Sys/GameSettings/LAN.ini
@@ -0,0 +1,26 @@
+# LANE8P, LANP8P - Alex Kidd: TLS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAO.ini b/Data/Sys/GameSettings/LAO.ini
new file mode 100644
index 0000000000..053cefbb16
--- /dev/null
+++ b/Data/Sys/GameSettings/LAO.ini
@@ -0,0 +1,26 @@
+# LAOE8P, LAOP8P - R-TYPE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAP.ini b/Data/Sys/GameSettings/LAP.ini
new file mode 100644
index 0000000000..7875b8442c
--- /dev/null
+++ b/Data/Sys/GameSettings/LAP.ini
@@ -0,0 +1,26 @@
+# LAPE8P, LAPP8P - Wonder Boy III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/LAQ.ini b/Data/Sys/GameSettings/LAQ.ini
new file mode 100644
index 0000000000..6f40ffc72b
--- /dev/null
+++ b/Data/Sys/GameSettings/LAQ.ini
@@ -0,0 +1,26 @@
+# LAQE8P, LAQP8P - Alex Kidd in SW
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/MA3.ini b/Data/Sys/GameSettings/MA3.ini
new file mode 100644
index 0000000000..3ae85ab4cb
--- /dev/null
+++ b/Data/Sys/GameSettings/MA3.ini
@@ -0,0 +1,25 @@
+# MA3E8P - Puyo Puyo 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MA6.ini b/Data/Sys/GameSettings/MA6.ini
new file mode 100644
index 0000000000..356117790b
--- /dev/null
+++ b/Data/Sys/GameSettings/MA6.ini
@@ -0,0 +1,25 @@
+# MA6E8P, MA6P8P - Streets of Rage 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MA7.ini b/Data/Sys/GameSettings/MA7.ini
new file mode 100644
index 0000000000..0d0a60fb16
--- /dev/null
+++ b/Data/Sys/GameSettings/MA7.ini
@@ -0,0 +1,25 @@
+# MA7E8P, MA7P8P - Shining Darkness
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MA8.ini b/Data/Sys/GameSettings/MA8.ini
new file mode 100644
index 0000000000..9c45b1d7b4
--- /dev/null
+++ b/Data/Sys/GameSettings/MA8.ini
@@ -0,0 +1,25 @@
+# MA8E8P, MA8P8P - Ecco the Dolphin 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAA.ini b/Data/Sys/GameSettings/MAA.ini
new file mode 100644
index 0000000000..4fcb9124b4
--- /dev/null
+++ b/Data/Sys/GameSettings/MAA.ini
@@ -0,0 +1,25 @@
+# MAAE8P, MAAP8P - Altered Beast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAB.ini b/Data/Sys/GameSettings/MAB.ini
new file mode 100644
index 0000000000..4addbb5169
--- /dev/null
+++ b/Data/Sys/GameSettings/MAB.ini
@@ -0,0 +1,25 @@
+# MABE8P, MABP8P - Columns
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAC.ini b/Data/Sys/GameSettings/MAC.ini
new file mode 100644
index 0000000000..1bf1bdd449
--- /dev/null
+++ b/Data/Sys/GameSettings/MAC.ini
@@ -0,0 +1,25 @@
+# MACE8P, MACP8P - Dr. Robotnik
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAD.ini b/Data/Sys/GameSettings/MAD.ini
new file mode 100644
index 0000000000..d29687d119
--- /dev/null
+++ b/Data/Sys/GameSettings/MAD.ini
@@ -0,0 +1,24 @@
+# MADE8P, MADP8P - Ecco the Dolphin
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAE.ini b/Data/Sys/GameSettings/MAE.ini
new file mode 100644
index 0000000000..e1577a7dd8
--- /dev/null
+++ b/Data/Sys/GameSettings/MAE.ini
@@ -0,0 +1,24 @@
+# MAEE8P, MAEP8P - Golden Axe
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAF.ini b/Data/Sys/GameSettings/MAF.ini
new file mode 100644
index 0000000000..1e1eb0fd54
--- /dev/null
+++ b/Data/Sys/GameSettings/MAF.ini
@@ -0,0 +1,25 @@
+# MAFE8P, MAFP8P - Gunstar Heroes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAG.ini b/Data/Sys/GameSettings/MAG.ini
new file mode 100644
index 0000000000..d813c5e047
--- /dev/null
+++ b/Data/Sys/GameSettings/MAG.ini
@@ -0,0 +1,25 @@
+# MAGE8P, MAGP8P - Ristar
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAH.ini b/Data/Sys/GameSettings/MAH.ini
new file mode 100644
index 0000000000..cbc52f6df7
--- /dev/null
+++ b/Data/Sys/GameSettings/MAH.ini
@@ -0,0 +1,25 @@
+# MAHE8P, MAHP8P - Sonic the Hedgehog
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAI.ini b/Data/Sys/GameSettings/MAI.ini
new file mode 100644
index 0000000000..031e11b63c
--- /dev/null
+++ b/Data/Sys/GameSettings/MAI.ini
@@ -0,0 +1,25 @@
+# MAIE8P, MAIP8P - Space Harrier II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAJ.ini b/Data/Sys/GameSettings/MAJ.ini
new file mode 100644
index 0000000000..a5975472b5
--- /dev/null
+++ b/Data/Sys/GameSettings/MAJ.ini
@@ -0,0 +1,25 @@
+# MAJE8P, MAJP8P - ToeJam & Earl
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAL.ini b/Data/Sys/GameSettings/MAL.ini
new file mode 100644
index 0000000000..3f09e97b1b
--- /dev/null
+++ b/Data/Sys/GameSettings/MAL.ini
@@ -0,0 +1,24 @@
+# MALE8P, MALP8P - Bonanza Bros.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAM.ini b/Data/Sys/GameSettings/MAM.ini
new file mode 100644
index 0000000000..0bbf68478f
--- /dev/null
+++ b/Data/Sys/GameSettings/MAM.ini
@@ -0,0 +1,25 @@
+# MAME8P, MAMP8P - Sword of Vermilion
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAN.ini b/Data/Sys/GameSettings/MAN.ini
new file mode 100644
index 0000000000..5ab2e08e24
--- /dev/null
+++ b/Data/Sys/GameSettings/MAN.ini
@@ -0,0 +1,25 @@
+# MANE8P, MANP8P - Gain Ground
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAO.ini b/Data/Sys/GameSettings/MAO.ini
new file mode 100644
index 0000000000..6bc7f609c1
--- /dev/null
+++ b/Data/Sys/GameSettings/MAO.ini
@@ -0,0 +1,25 @@
+# MAOE8P, MAOP8P - Bio-Hazard Battle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAP.ini b/Data/Sys/GameSettings/MAP.ini
new file mode 100644
index 0000000000..1202bffd06
--- /dev/null
+++ b/Data/Sys/GameSettings/MAP.ini
@@ -0,0 +1,25 @@
+# MAPE8P, MAPP8P - Comix Zone
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAQ.ini b/Data/Sys/GameSettings/MAQ.ini
new file mode 100644
index 0000000000..b06a20a7ef
--- /dev/null
+++ b/Data/Sys/GameSettings/MAQ.ini
@@ -0,0 +1,25 @@
+# MAQE8P, MAQP8P - Streets of Rage
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAR.ini b/Data/Sys/GameSettings/MAR.ini
new file mode 100644
index 0000000000..e77c0921a0
--- /dev/null
+++ b/Data/Sys/GameSettings/MAR.ini
@@ -0,0 +1,25 @@
+# MARE8P, MARP8P - Beyond Oasis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAS.ini b/Data/Sys/GameSettings/MAS.ini
new file mode 100644
index 0000000000..821a2e04f7
--- /dev/null
+++ b/Data/Sys/GameSettings/MAS.ini
@@ -0,0 +1,25 @@
+# MASE8P, MASP8P - Vectorman
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAT.ini b/Data/Sys/GameSettings/MAT.ini
new file mode 100644
index 0000000000..dc3fb1f737
--- /dev/null
+++ b/Data/Sys/GameSettings/MAT.ini
@@ -0,0 +1,25 @@
+# MATE8P, MATP8P - Sonic Spinball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAV.ini b/Data/Sys/GameSettings/MAV.ini
new file mode 100644
index 0000000000..2836c2bcef
--- /dev/null
+++ b/Data/Sys/GameSettings/MAV.ini
@@ -0,0 +1,24 @@
+# MAVE8P, MAVP8P - Wonder Boy in MW
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAW.ini b/Data/Sys/GameSettings/MAW.ini
new file mode 100644
index 0000000000..d0b0173633
--- /dev/null
+++ b/Data/Sys/GameSettings/MAW.ini
@@ -0,0 +1,25 @@
+# MAWE8P, MAWP8P - Virtua Fighter 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAX.ini b/Data/Sys/GameSettings/MAX.ini
new file mode 100644
index 0000000000..e1bfe76465
--- /dev/null
+++ b/Data/Sys/GameSettings/MAX.ini
@@ -0,0 +1,25 @@
+# MAXE8P, MAXP8P - Alex Kidd
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAY.ini b/Data/Sys/GameSettings/MAY.ini
new file mode 100644
index 0000000000..157b591018
--- /dev/null
+++ b/Data/Sys/GameSettings/MAY.ini
@@ -0,0 +1,25 @@
+# MAYE8P, MAYP8P - Alien Storm
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MAZ.ini b/Data/Sys/GameSettings/MAZ.ini
new file mode 100644
index 0000000000..429cabafbb
--- /dev/null
+++ b/Data/Sys/GameSettings/MAZ.ini
@@ -0,0 +1,25 @@
+# MAZE8P, MAZP8P - ToeJam & Earl 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MB6.ini b/Data/Sys/GameSettings/MB6.ini
new file mode 100644
index 0000000000..da31b933b9
--- /dev/null
+++ b/Data/Sys/GameSettings/MB6.ini
@@ -0,0 +1,25 @@
+# MB6E8P - Shining Force II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MB7.ini b/Data/Sys/GameSettings/MB7.ini
new file mode 100644
index 0000000000..712a2f6908
--- /dev/null
+++ b/Data/Sys/GameSettings/MB7.ini
@@ -0,0 +1,25 @@
+# MB7E8P - Mega Turrican
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MB8.ini b/Data/Sys/GameSettings/MB8.ini
new file mode 100644
index 0000000000..c33ca49be1
--- /dev/null
+++ b/Data/Sys/GameSettings/MB8.ini
@@ -0,0 +1,25 @@
+# MB8E8P, MB8P8P - Phantasy Star II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBB.ini b/Data/Sys/GameSettings/MBB.ini
new file mode 100644
index 0000000000..1367b62106
--- /dev/null
+++ b/Data/Sys/GameSettings/MBB.ini
@@ -0,0 +1,25 @@
+# MBBE8P, MBBP8P - Sonic the Hedgehog 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBC.ini b/Data/Sys/GameSettings/MBC.ini
new file mode 100644
index 0000000000..ab4e96751b
--- /dev/null
+++ b/Data/Sys/GameSettings/MBC.ini
@@ -0,0 +1,25 @@
+# MBCE8P, MBCP8P - Kid Chameleon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBD.ini b/Data/Sys/GameSettings/MBD.ini
new file mode 100644
index 0000000000..57536519b1
--- /dev/null
+++ b/Data/Sys/GameSettings/MBD.ini
@@ -0,0 +1,25 @@
+# MBDE8P, MBDP8P - Golden Axe II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBE.ini b/Data/Sys/GameSettings/MBE.ini
new file mode 100644
index 0000000000..c3743808a7
--- /dev/null
+++ b/Data/Sys/GameSettings/MBE.ini
@@ -0,0 +1,25 @@
+# MBEE8P, MBEP8P - Shining Force
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBF.ini b/Data/Sys/GameSettings/MBF.ini
new file mode 100644
index 0000000000..7bef9aed65
--- /dev/null
+++ b/Data/Sys/GameSettings/MBF.ini
@@ -0,0 +1,25 @@
+# MBFE8P, MBFP8P - Shinobi III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBG.ini b/Data/Sys/GameSettings/MBG.ini
new file mode 100644
index 0000000000..4fa6ba82bc
--- /dev/null
+++ b/Data/Sys/GameSettings/MBG.ini
@@ -0,0 +1,25 @@
+# MBGE8P, MBGP8P - Dynamite Headdy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBI.ini b/Data/Sys/GameSettings/MBI.ini
new file mode 100644
index 0000000000..79d6e211b2
--- /dev/null
+++ b/Data/Sys/GameSettings/MBI.ini
@@ -0,0 +1,25 @@
+# MBIE8P, MBIP8P - Landstalker
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBJ.ini b/Data/Sys/GameSettings/MBJ.ini
new file mode 100644
index 0000000000..bbc644882d
--- /dev/null
+++ b/Data/Sys/GameSettings/MBJ.ini
@@ -0,0 +1,25 @@
+# MBJE8P, MBJP8P - Ghouls 'n Ghosts
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBK.ini b/Data/Sys/GameSettings/MBK.ini
new file mode 100644
index 0000000000..0e171ba02a
--- /dev/null
+++ b/Data/Sys/GameSettings/MBK.ini
@@ -0,0 +1,25 @@
+# MBKP8P - Crack Down
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBL.ini b/Data/Sys/GameSettings/MBL.ini
new file mode 100644
index 0000000000..09a6f85462
--- /dev/null
+++ b/Data/Sys/GameSettings/MBL.ini
@@ -0,0 +1,25 @@
+# MBLP8P - ESWAT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBM.ini b/Data/Sys/GameSettings/MBM.ini
new file mode 100644
index 0000000000..787ac44d29
--- /dev/null
+++ b/Data/Sys/GameSettings/MBM.ini
@@ -0,0 +1,25 @@
+# MBME8P, MBMP8P - Sonic the Hedgehog 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBO.ini b/Data/Sys/GameSettings/MBO.ini
new file mode 100644
index 0000000000..3b667d30d8
--- /dev/null
+++ b/Data/Sys/GameSettings/MBO.ini
@@ -0,0 +1,25 @@
+# MBOE8P, MBOP8P - Golden Axe III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBP.ini b/Data/Sys/GameSettings/MBP.ini
new file mode 100644
index 0000000000..cb025973ab
--- /dev/null
+++ b/Data/Sys/GameSettings/MBP.ini
@@ -0,0 +1,25 @@
+# MBPE8P, MBPP8P - Super Thunder Blade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBQ.ini b/Data/Sys/GameSettings/MBQ.ini
new file mode 100644
index 0000000000..06ee801411
--- /dev/null
+++ b/Data/Sys/GameSettings/MBQ.ini
@@ -0,0 +1,25 @@
+# MBQE8P, MBQP8P - Streets of Rage 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBR.ini b/Data/Sys/GameSettings/MBR.ini
new file mode 100644
index 0000000000..c6d8db3c42
--- /dev/null
+++ b/Data/Sys/GameSettings/MBR.ini
@@ -0,0 +1,25 @@
+# MBRE8P, MBRP8P - Rolling Thunder 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBT.ini b/Data/Sys/GameSettings/MBT.ini
new file mode 100644
index 0000000000..93858a8e77
--- /dev/null
+++ b/Data/Sys/GameSettings/MBT.ini
@@ -0,0 +1,25 @@
+# MBTE8P, MBTP8P - Alien Soldier
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBU.ini b/Data/Sys/GameSettings/MBU.ini
new file mode 100644
index 0000000000..c3d8267b88
--- /dev/null
+++ b/Data/Sys/GameSettings/MBU.ini
@@ -0,0 +1,25 @@
+# MBUE8P, MBUP8P - Sonic 3D Blast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBW.ini b/Data/Sys/GameSettings/MBW.ini
new file mode 100644
index 0000000000..006ebccbd8
--- /dev/null
+++ b/Data/Sys/GameSettings/MBW.ini
@@ -0,0 +1,25 @@
+# MBWE8P - Columns III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBX.ini b/Data/Sys/GameSettings/MBX.ini
new file mode 100644
index 0000000000..f46c76aadd
--- /dev/null
+++ b/Data/Sys/GameSettings/MBX.ini
@@ -0,0 +1,25 @@
+# MBXE8P - Ecco Jr.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBY.ini b/Data/Sys/GameSettings/MBY.ini
new file mode 100644
index 0000000000..d602b71aad
--- /dev/null
+++ b/Data/Sys/GameSettings/MBY.ini
@@ -0,0 +1,25 @@
+# MBYE8P - Light Crusader
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MBZ.ini b/Data/Sys/GameSettings/MBZ.ini
new file mode 100644
index 0000000000..347bdbd3f2
--- /dev/null
+++ b/Data/Sys/GameSettings/MBZ.ini
@@ -0,0 +1,25 @@
+# MBZE8P - Eternal Champions
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCA.ini b/Data/Sys/GameSettings/MCA.ini
new file mode 100644
index 0000000000..8a61f7041a
--- /dev/null
+++ b/Data/Sys/GameSettings/MCA.ini
@@ -0,0 +1,25 @@
+# MCAN8P - Gley Lancer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCB.ini b/Data/Sys/GameSettings/MCB.ini
new file mode 100644
index 0000000000..05fc56190b
--- /dev/null
+++ b/Data/Sys/GameSettings/MCB.ini
@@ -0,0 +1,25 @@
+# MCBE8P - POWERBALL 
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCC.ini b/Data/Sys/GameSettings/MCC.ini
new file mode 100644
index 0000000000..e826116475
--- /dev/null
+++ b/Data/Sys/GameSettings/MCC.ini
@@ -0,0 +1,25 @@
+# MCCE8P - Phantasy Star III
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCD.ini b/Data/Sys/GameSettings/MCD.ini
new file mode 100644
index 0000000000..cc93bf9033
--- /dev/null
+++ b/Data/Sys/GameSettings/MCD.ini
@@ -0,0 +1,27 @@
+# MCDE8P - Sonic & Knuckles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/MCE.ini b/Data/Sys/GameSettings/MCE.ini
new file mode 100644
index 0000000000..4ae59d328e
--- /dev/null
+++ b/Data/Sys/GameSettings/MCE.ini
@@ -0,0 +1,25 @@
+# MCEN8P - Super Fantasy Zone
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCG.ini b/Data/Sys/GameSettings/MCG.ini
new file mode 100644
index 0000000000..27334bbf93
--- /dev/null
+++ b/Data/Sys/GameSettings/MCG.ini
@@ -0,0 +1,25 @@
+# MCGE8P - FORGOTTEN WORLDS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCH.ini b/Data/Sys/GameSettings/MCH.ini
new file mode 100644
index 0000000000..553f3db180
--- /dev/null
+++ b/Data/Sys/GameSettings/MCH.ini
@@ -0,0 +1,25 @@
+# MCHE8P - MUSHA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCJ.ini b/Data/Sys/GameSettings/MCJ.ini
new file mode 100644
index 0000000000..9a79e8ab3f
--- /dev/null
+++ b/Data/Sys/GameSettings/MCJ.ini
@@ -0,0 +1,25 @@
+# MCJE8P - Splatterhouse 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCK.ini b/Data/Sys/GameSettings/MCK.ini
new file mode 100644
index 0000000000..40a05d91cd
--- /dev/null
+++ b/Data/Sys/GameSettings/MCK.ini
@@ -0,0 +1,25 @@
+# MCKE8P - Phantasy Star IV
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCL.ini b/Data/Sys/GameSettings/MCL.ini
new file mode 100644
index 0000000000..8a2bf46872
--- /dev/null
+++ b/Data/Sys/GameSettings/MCL.ini
@@ -0,0 +1,25 @@
+# MCLE8P - Street Fighter II': Special Champion Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCP.ini b/Data/Sys/GameSettings/MCP.ini
new file mode 100644
index 0000000000..d5cc6d7e0c
--- /dev/null
+++ b/Data/Sys/GameSettings/MCP.ini
@@ -0,0 +1,25 @@
+# MCPE8P - Earthworm Jim
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCQ.ini b/Data/Sys/GameSettings/MCQ.ini
new file mode 100644
index 0000000000..99251a38b8
--- /dev/null
+++ b/Data/Sys/GameSettings/MCQ.ini
@@ -0,0 +1,25 @@
+# MCQE8P - Boogerman
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/MCR.ini b/Data/Sys/GameSettings/MCR.ini
new file mode 100644
index 0000000000..21e1ed0d4b
--- /dev/null
+++ b/Data/Sys/GameSettings/MCR.ini
@@ -0,0 +1,25 @@
+# MCRE8P - WotB: MERCS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/NAA.ini b/Data/Sys/GameSettings/NAA.ini
new file mode 100644
index 0000000000..c143afb676
--- /dev/null
+++ b/Data/Sys/GameSettings/NAA.ini
@@ -0,0 +1,19 @@
+# NAAE01, NAAP01 - Super Mario 64
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/NAAE01.ini b/Data/Sys/GameSettings/NAAE01.ini
deleted file mode 100644
index 9e8f4f0e9e..0000000000
--- a/Data/Sys/GameSettings/NAAE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# NAAE01 - Super Mario 64
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/NAAP01.ini b/Data/Sys/GameSettings/NAAP01.ini
deleted file mode 100644
index f06df82356..0000000000
--- a/Data/Sys/GameSettings/NAAP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# NAAP01 - Super Mario 64
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Slow and no sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/NAB.ini b/Data/Sys/GameSettings/NAB.ini
new file mode 100644
index 0000000000..4a84d7804b
--- /dev/null
+++ b/Data/Sys/GameSettings/NAB.ini
@@ -0,0 +1,21 @@
+# NABE01 - Mario Kart 64
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+Hack = -1
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/NABE01.ini b/Data/Sys/GameSettings/NABE01.ini
deleted file mode 100644
index 400b022798..0000000000
--- a/Data/Sys/GameSettings/NABE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# NABE01 - Mario Kart 64
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
-EmulationStateId = 4
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-Hack = -1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/NAC.ini b/Data/Sys/GameSettings/NAC.ini
new file mode 100644
index 0000000000..1b39e3c67b
--- /dev/null
+++ b/Data/Sys/GameSettings/NAC.ini
@@ -0,0 +1,22 @@
+# NACE01 - Zelda: Ocarina
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/NACE01.ini b/Data/Sys/GameSettings/NACE01.ini
deleted file mode 100644
index a0dbd59a3e..0000000000
--- a/Data/Sys/GameSettings/NACE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# NACE01 - Zelda: Ocarina
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/NAE.ini b/Data/Sys/GameSettings/NAE.ini
new file mode 100644
index 0000000000..2584880544
--- /dev/null
+++ b/Data/Sys/GameSettings/NAE.ini
@@ -0,0 +1,33 @@
+# NAEE01 - Paper Mario
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+FastDepthCalc = True
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/NAEE01.ini b/Data/Sys/GameSettings/NAEE01.ini
deleted file mode 100644
index 75a172b709..0000000000
--- a/Data/Sys/GameSettings/NAEE01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# NAEE01 - Paper Mario
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-FastDepthCalc = True
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/NAF.ini b/Data/Sys/GameSettings/NAF.ini
new file mode 100644
index 0000000000..a9718b8b8a
--- /dev/null
+++ b/Data/Sys/GameSettings/NAF.ini
@@ -0,0 +1,24 @@
+# NAFE01, NAFP01 - F-Zero X
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram to fix a bar of stretched pixels at the bottom of the screen.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/NAFP01.ini b/Data/Sys/GameSettings/NAFP01.ini
deleted file mode 100644
index 68ff2b5746..0000000000
--- a/Data/Sys/GameSettings/NAFP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# NAFP01 - F-Zero X
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/NAH.ini b/Data/Sys/GameSettings/NAH.ini
new file mode 100644
index 0000000000..2c995f6930
--- /dev/null
+++ b/Data/Sys/GameSettings/NAH.ini
@@ -0,0 +1,17 @@
+# NAHE01, NAHP01 - Yoshi's Story
+
+[Core]
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/NAHE01.ini b/Data/Sys/GameSettings/NAHE01.ini
deleted file mode 100644
index cb50d481dd..0000000000
--- a/Data/Sys/GameSettings/NAHE01.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# NAHE01 - Yoshi's Story
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/NAK.ini b/Data/Sys/GameSettings/NAK.ini
new file mode 100644
index 0000000000..35215e4334
--- /dev/null
+++ b/Data/Sys/GameSettings/NAK.ini
@@ -0,0 +1,21 @@
+# NAKE01, NAKP01 - Pokemon Snap
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/NAKE01.ini b/Data/Sys/GameSettings/NAKE01.ini
deleted file mode 100644
index 7ce4540355..0000000000
--- a/Data/Sys/GameSettings/NAKE01.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# NAKE01 - Pokémon Snap
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/NAKP01.ini b/Data/Sys/GameSettings/NAKP01.ini
deleted file mode 100644
index ca7be8edea..0000000000
--- a/Data/Sys/GameSettings/NAKP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# NAKP01 - Pokémon Snap
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Controlls won't work in-game
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/NAN.ini b/Data/Sys/GameSettings/NAN.ini
new file mode 100644
index 0000000000..1e097f53b9
--- /dev/null
+++ b/Data/Sys/GameSettings/NAN.ini
@@ -0,0 +1,18 @@
+# NANE01 - Pokémon Puzzle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Timer bug
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/NANE01.ini b/Data/Sys/GameSettings/NANE01.ini
deleted file mode 100644
index e56182dc67..0000000000
--- a/Data/Sys/GameSettings/NANE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# NANE01 - Pokémon Puzzle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Timer bug
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/NAR.ini b/Data/Sys/GameSettings/NAR.ini
new file mode 100644
index 0000000000..6fbcedaeee
--- /dev/null
+++ b/Data/Sys/GameSettings/NAR.ini
@@ -0,0 +1,19 @@
+# NARP01 - Zelda: Majora's Mask
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Very buggy
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/NARP01.ini b/Data/Sys/GameSettings/NARP01.ini
deleted file mode 100644
index 1f5b6fdeb0..0000000000
--- a/Data/Sys/GameSettings/NARP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# NARP01 - Zelda: Majora's Mask
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Very buggy
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/PA6.ini b/Data/Sys/GameSettings/PA6.ini
new file mode 100644
index 0000000000..aef542e6dc
--- /dev/null
+++ b/Data/Sys/GameSettings/PA6.ini
@@ -0,0 +1,23 @@
+# PA6E18, PA6P18 - Bloody Wolf
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA7.ini b/Data/Sys/GameSettings/PA7.ini
new file mode 100644
index 0000000000..273db10629
--- /dev/null
+++ b/Data/Sys/GameSettings/PA7.ini
@@ -0,0 +1,24 @@
+# PA7E18, PA7P18 - Alien Crush
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA8.ini b/Data/Sys/GameSettings/PA8.ini
new file mode 100644
index 0000000000..1998f38667
--- /dev/null
+++ b/Data/Sys/GameSettings/PA8.ini
@@ -0,0 +1,23 @@
+# PA8E18 - ORDYNE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PA9.ini b/Data/Sys/GameSettings/PA9.ini
new file mode 100644
index 0000000000..ac0e1025a5
--- /dev/null
+++ b/Data/Sys/GameSettings/PA9.ini
@@ -0,0 +1,23 @@
+# PA9E18, PA9P18 - SPLATTERHOUSE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAA.ini b/Data/Sys/GameSettings/PAA.ini
new file mode 100644
index 0000000000..4249e2ca06
--- /dev/null
+++ b/Data/Sys/GameSettings/PAA.ini
@@ -0,0 +1,24 @@
+# PAAE18, PAAP18 - Bomberman'93
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAB.ini b/Data/Sys/GameSettings/PAB.ini
new file mode 100644
index 0000000000..f77fe531cf
--- /dev/null
+++ b/Data/Sys/GameSettings/PAB.ini
@@ -0,0 +1,24 @@
+# PABE18, PABP18 - Bonk's Adventure
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAC.ini b/Data/Sys/GameSettings/PAC.ini
new file mode 100644
index 0000000000..6bb0fde4a2
--- /dev/null
+++ b/Data/Sys/GameSettings/PAC.ini
@@ -0,0 +1,24 @@
+# PACE18, PACP18 - Dungeon Explorer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAD.ini b/Data/Sys/GameSettings/PAD.ini
new file mode 100644
index 0000000000..29513f67eb
--- /dev/null
+++ b/Data/Sys/GameSettings/PAD.ini
@@ -0,0 +1,24 @@
+# PADE18, PADP18 - R-TYPE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAE.ini b/Data/Sys/GameSettings/PAE.ini
new file mode 100644
index 0000000000..65ddb041c0
--- /dev/null
+++ b/Data/Sys/GameSettings/PAE.ini
@@ -0,0 +1,24 @@
+# PAEE18, PAEP18 - Super Star Soldier
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAF.ini b/Data/Sys/GameSettings/PAF.ini
new file mode 100644
index 0000000000..eb76df8863
--- /dev/null
+++ b/Data/Sys/GameSettings/PAF.ini
@@ -0,0 +1,24 @@
+# PAFE18, PAFP18 - Victory Run
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAG.ini b/Data/Sys/GameSettings/PAG.ini
new file mode 100644
index 0000000000..39172f72bb
--- /dev/null
+++ b/Data/Sys/GameSettings/PAG.ini
@@ -0,0 +1,24 @@
+# PAGL18, PAGN18 - Bomberman'94
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAH.ini b/Data/Sys/GameSettings/PAH.ini
new file mode 100644
index 0000000000..7783c11fb1
--- /dev/null
+++ b/Data/Sys/GameSettings/PAH.ini
@@ -0,0 +1,24 @@
+# PAHE18, PAHP18 - BATTLE LODE RUNNER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAI.ini b/Data/Sys/GameSettings/PAI.ini
new file mode 100644
index 0000000000..fa472f7bcf
--- /dev/null
+++ b/Data/Sys/GameSettings/PAI.ini
@@ -0,0 +1,24 @@
+# PAIE18, PAIP18 - New Adventure Island
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAK.ini b/Data/Sys/GameSettings/PAK.ini
new file mode 100644
index 0000000000..20f47742d9
--- /dev/null
+++ b/Data/Sys/GameSettings/PAK.ini
@@ -0,0 +1,24 @@
+# PAKE18, PAKP18 - Dragon's Curse
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAL.ini b/Data/Sys/GameSettings/PAL.ini
new file mode 100644
index 0000000000..622c4cdc00
--- /dev/null
+++ b/Data/Sys/GameSettings/PAL.ini
@@ -0,0 +1,24 @@
+# PALE18, PALP18 - Soldier Blade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAM.ini b/Data/Sys/GameSettings/PAM.ini
new file mode 100644
index 0000000000..9b53a7e5ba
--- /dev/null
+++ b/Data/Sys/GameSettings/PAM.ini
@@ -0,0 +1,24 @@
+# PAME18, PAMP18 - Neutopia
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAN.ini b/Data/Sys/GameSettings/PAN.ini
new file mode 100644
index 0000000000..350c21c506
--- /dev/null
+++ b/Data/Sys/GameSettings/PAN.ini
@@ -0,0 +1,24 @@
+# PANE18, PANP18 - Military Madness
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAO.ini b/Data/Sys/GameSettings/PAO.ini
new file mode 100644
index 0000000000..e7ae31466e
--- /dev/null
+++ b/Data/Sys/GameSettings/PAO.ini
@@ -0,0 +1,24 @@
+# PAOL18, PAON18 - Final Soldier
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAR.ini b/Data/Sys/GameSettings/PAR.ini
new file mode 100644
index 0000000000..e5357f0fe2
--- /dev/null
+++ b/Data/Sys/GameSettings/PAR.ini
@@ -0,0 +1,24 @@
+# PARL18, PARN18 - DETANA TWIN BEE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAV.ini b/Data/Sys/GameSettings/PAV.ini
new file mode 100644
index 0000000000..7c0c1a33f5
--- /dev/null
+++ b/Data/Sys/GameSettings/PAV.ini
@@ -0,0 +1,24 @@
+# PAVE18, PAVP18 - VIGILANTE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PAW.ini b/Data/Sys/GameSettings/PAW.ini
new file mode 100644
index 0000000000..7232148836
--- /dev/null
+++ b/Data/Sys/GameSettings/PAW.ini
@@ -0,0 +1,24 @@
+# PAWE18, PAWP18 - GALAGA '90
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB2.ini b/Data/Sys/GameSettings/PB2.ini
new file mode 100644
index 0000000000..9ac6746bdb
--- /dev/null
+++ b/Data/Sys/GameSettings/PB2.ini
@@ -0,0 +1,24 @@
+# PB2E18, PB2P18 - Neutopia II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB3.ini b/Data/Sys/GameSettings/PB3.ini
new file mode 100644
index 0000000000..818ee3cfcd
--- /dev/null
+++ b/Data/Sys/GameSettings/PB3.ini
@@ -0,0 +1,24 @@
+# PB3E18, PB3P18 - Devil's Crush
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB6.ini b/Data/Sys/GameSettings/PB6.ini
new file mode 100644
index 0000000000..3cb89a64c7
--- /dev/null
+++ b/Data/Sys/GameSettings/PB6.ini
@@ -0,0 +1,24 @@
+# PB6E18, PB6P18 - Cratermaze
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB8.ini b/Data/Sys/GameSettings/PB8.ini
new file mode 100644
index 0000000000..0a8d04172f
--- /dev/null
+++ b/Data/Sys/GameSettings/PB8.ini
@@ -0,0 +1,24 @@
+# PB8E18, PB8P18 - Blazing Lazers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PB9.ini b/Data/Sys/GameSettings/PB9.ini
new file mode 100644
index 0000000000..c71d629cc4
--- /dev/null
+++ b/Data/Sys/GameSettings/PB9.ini
@@ -0,0 +1,24 @@
+# PB9E18, PB9P18 - W.S.C.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBA.ini b/Data/Sys/GameSettings/PBA.ini
new file mode 100644
index 0000000000..6857914f27
--- /dev/null
+++ b/Data/Sys/GameSettings/PBA.ini
@@ -0,0 +1,24 @@
+# PBAE18, PBAP18 - DRAGON SPIRIT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBD.ini b/Data/Sys/GameSettings/PBD.ini
new file mode 100644
index 0000000000..dfe0c9b41f
--- /dev/null
+++ b/Data/Sys/GameSettings/PBD.ini
@@ -0,0 +1,24 @@
+# PBDE18, PBDP18 - Double Dungeons
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBE.ini b/Data/Sys/GameSettings/PBE.ini
new file mode 100644
index 0000000000..e83e4fde5b
--- /dev/null
+++ b/Data/Sys/GameSettings/PBE.ini
@@ -0,0 +1,24 @@
+# PBEE18, PBEP18 - Motoroader
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBH.ini b/Data/Sys/GameSettings/PBH.ini
new file mode 100644
index 0000000000..7a786440d0
--- /dev/null
+++ b/Data/Sys/GameSettings/PBH.ini
@@ -0,0 +1,24 @@
+# PBHE18, PBHP18 - Bonk's Revenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBI.ini b/Data/Sys/GameSettings/PBI.ini
new file mode 100644
index 0000000000..532bf52096
--- /dev/null
+++ b/Data/Sys/GameSettings/PBI.ini
@@ -0,0 +1,24 @@
+# PBIE18, PBIP18 - Bonk 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBJ.ini b/Data/Sys/GameSettings/PBJ.ini
new file mode 100644
index 0000000000..f4c65a76af
--- /dev/null
+++ b/Data/Sys/GameSettings/PBJ.ini
@@ -0,0 +1,24 @@
+# PBJE18, PBJP18 - SAMURAI-GHOST
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBM.ini b/Data/Sys/GameSettings/PBM.ini
new file mode 100644
index 0000000000..6a9985678a
--- /dev/null
+++ b/Data/Sys/GameSettings/PBM.ini
@@ -0,0 +1,24 @@
+# PBME18, PBMP18 - LEGEND OF HERO TONMA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBN.ini b/Data/Sys/GameSettings/PBN.ini
new file mode 100644
index 0000000000..5474ae3fdb
--- /dev/null
+++ b/Data/Sys/GameSettings/PBN.ini
@@ -0,0 +1,24 @@
+# PBNE18, PBNP18 - Ninja Spirit
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBS.ini b/Data/Sys/GameSettings/PBS.ini
new file mode 100644
index 0000000000..17211cf65b
--- /dev/null
+++ b/Data/Sys/GameSettings/PBS.ini
@@ -0,0 +1,24 @@
+# PBSE18, PBSP18 - Chew Man Fu
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBT.ini b/Data/Sys/GameSettings/PBT.ini
new file mode 100644
index 0000000000..eba7bc1200
--- /dev/null
+++ b/Data/Sys/GameSettings/PBT.ini
@@ -0,0 +1,24 @@
+# PBTE18, PBTP18 - China Warrior
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBU.ini b/Data/Sys/GameSettings/PBU.ini
new file mode 100644
index 0000000000..d7e8957a36
--- /dev/null
+++ b/Data/Sys/GameSettings/PBU.ini
@@ -0,0 +1,23 @@
+# PBUE18 - BRAVOMAN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBW.ini b/Data/Sys/GameSettings/PBW.ini
new file mode 100644
index 0000000000..7d56cf9e76
--- /dev/null
+++ b/Data/Sys/GameSettings/PBW.ini
@@ -0,0 +1,24 @@
+# PBWE18, PBWP18 - Air "Zonk"
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBX.ini b/Data/Sys/GameSettings/PBX.ini
new file mode 100644
index 0000000000..2902542abf
--- /dev/null
+++ b/Data/Sys/GameSettings/PBX.ini
@@ -0,0 +1,24 @@
+# PBXE18, PBXP18 - Shockman
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PBZ.ini b/Data/Sys/GameSettings/PBZ.ini
new file mode 100644
index 0000000000..b0deb287eb
--- /dev/null
+++ b/Data/Sys/GameSettings/PBZ.ini
@@ -0,0 +1,24 @@
+# PBZE18, PBZP18 - J.J. & JEFF
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PC2.ini b/Data/Sys/GameSettings/PC2.ini
new file mode 100644
index 0000000000..d3060117ec
--- /dev/null
+++ b/Data/Sys/GameSettings/PC2.ini
@@ -0,0 +1,24 @@
+# PC2E18, PC2P18 - Chase H.Q.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PC6.ini b/Data/Sys/GameSettings/PC6.ini
new file mode 100644
index 0000000000..d451b8f55d
--- /dev/null
+++ b/Data/Sys/GameSettings/PC6.ini
@@ -0,0 +1,27 @@
+# PC6E01 - Pokemon Colosseum Bonus Disc
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Menu works but videos do not play, and GCN/GBA emulation is too slow for Jirachi transfer.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/PC6E01.ini b/Data/Sys/GameSettings/PC6E01.ini
deleted file mode 100644
index 0ef4a3682d..0000000000
--- a/Data/Sys/GameSettings/PC6E01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# PC6E01 - Pokemon Colosseum Bonus Disc
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Menu works but videos do not play, and GCN/GBA emulation is too slow for Jirachi transfer.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/PCA.ini b/Data/Sys/GameSettings/PCA.ini
new file mode 100644
index 0000000000..b6c8742a92
--- /dev/null
+++ b/Data/Sys/GameSettings/PCA.ini
@@ -0,0 +1,24 @@
+# PCAE18, PCAP18 - Silent Debuggers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCB.ini b/Data/Sys/GameSettings/PCB.ini
new file mode 100644
index 0000000000..cc3bdcbbda
--- /dev/null
+++ b/Data/Sys/GameSettings/PCB.ini
@@ -0,0 +1,24 @@
+# PCBE18, PCBP18 - Dead Moon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCE.ini b/Data/Sys/GameSettings/PCE.ini
new file mode 100644
index 0000000000..8c7ad174bc
--- /dev/null
+++ b/Data/Sys/GameSettings/PCE.ini
@@ -0,0 +1,24 @@
+# PCEE18, PCEP18 - Power Golf
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCH.ini b/Data/Sys/GameSettings/PCH.ini
new file mode 100644
index 0000000000..9f6338ceb1
--- /dev/null
+++ b/Data/Sys/GameSettings/PCH.ini
@@ -0,0 +1,24 @@
+# PCHE18, PCHP18 - Drop Off
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCO.ini b/Data/Sys/GameSettings/PCO.ini
new file mode 100644
index 0000000000..eaf8047e58
--- /dev/null
+++ b/Data/Sys/GameSettings/PCO.ini
@@ -0,0 +1,24 @@
+# PCOE18, PCOP18 - Psychosis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCR.ini b/Data/Sys/GameSettings/PCR.ini
new file mode 100644
index 0000000000..c5f31f0136
--- /dev/null
+++ b/Data/Sys/GameSettings/PCR.ini
@@ -0,0 +1,24 @@
+# PCRL18, PCRN18 - Break In
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCS.ini b/Data/Sys/GameSettings/PCS.ini
new file mode 100644
index 0000000000..d1a1694ce9
--- /dev/null
+++ b/Data/Sys/GameSettings/PCS.ini
@@ -0,0 +1,24 @@
+# PCSL18, PCSN18 - Digital Champ
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PCV.ini b/Data/Sys/GameSettings/PCV.ini
new file mode 100644
index 0000000000..887142d8ef
--- /dev/null
+++ b/Data/Sys/GameSettings/PCV.ini
@@ -0,0 +1,24 @@
+# PCVE18, PCVP18 - World Class Baseball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PDJ.ini b/Data/Sys/GameSettings/PDJ.ini
new file mode 100644
index 0000000000..107d54b302
--- /dev/null
+++ b/Data/Sys/GameSettings/PDJ.ini
@@ -0,0 +1,24 @@
+# PDJL18, PDJN18 - Street Fighter II - Champion Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/PH_PRESETS.ini b/Data/Sys/GameSettings/PH_PRESETS.ini
deleted file mode 100644
index f5e7a4aacf..0000000000
--- a/Data/Sys/GameSettings/PH_PRESETS.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-# ORTHO PROJECTION HACK - PRESETS
-
-# IMPORTANT: Incremental Sections only are allowed and without jumps.
-# IMPORTANT: Each Section REQUIRES "Title" entry existing. Other entries are optionals.
-
-# ENTRIES LIST: Title, PH_SZNear, PH_ZNear, PH_ZSFar, PH_ZFar, PH_ExtraParam
-
-[0]
-Title = Zelda Twilight Princess (Bloom hack)
-PH_SZNear = 1
-PH_ZFar = 0.1
-
-[1]
-Title = Sonic and the Black Knight
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
-[2]
-Title = Bleach Versus Crusade
-PH_SZFar = 1
-PH_ZFar = 0.5
-
-[3]
-Title = Skies of Arcadia
-PH_SZFar = 1
-PH_ZFar = 0.4
-
-[4]
-Title = Metroid: Other M
-PH_ExtraParam = 1
-
-[5]
-Title = Tales of Symphonia GC
-PH_ZNear = 0.00026
-
-
-# ---------------------------------------------------
-
-# Unused - kept for reference
-
-# case HACK_FINAL_FANTASY_CC_ECHO_OF_TIME:
-# PH_SZNear = 1
-# PH_ZNear = 0.8
-# PH_SZFar = 1
-# PH_ZFar = 1.2
-
-# case HACK_HARVESTMOON_MM:
-# PH_SZNear = 1
-# PH_ZNear = 0.0075
-	
-# case HACK_BATEN_KAITOS:
-# PH_SZNear = 1
-# PH_ZNear = 0.0026
-# PH_SZFar = 1
-# PH_ZFar = 1.8974
-
-# case PROJECTION_HACK_BATEN_KAITOS_ORIGIN:
-# PH_SZNear = 1
-# PH_ZNear = 0.0012
-# PH_SZFar = 1
-# PH_ZFar = 1.8988
diff --git a/Data/Sys/GameSettings/PM4.ini b/Data/Sys/GameSettings/PM4.ini
new file mode 100644
index 0000000000..607da4535a
--- /dev/null
+++ b/Data/Sys/GameSettings/PM4.ini
@@ -0,0 +1,27 @@
+# PM4E01 - Mario Kart: Double Dash!! Bonus Disc
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/PM4E01.ini b/Data/Sys/GameSettings/PM4E01.ini
deleted file mode 100644
index 06ff31f732..0000000000
--- a/Data/Sys/GameSettings/PM4E01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# PM4E01 - Mario Kart: Double Dash!! Bonus Disc
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Everything works with minor glitches, except Star Wars Rogue Squadron III
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/PRJ.ini b/Data/Sys/GameSettings/PRJ.ini
new file mode 100644
index 0000000000..69bebb5ccf
--- /dev/null
+++ b/Data/Sys/GameSettings/PRJ.ini
@@ -0,0 +1,19 @@
+# PRJE01 - PAC-MAN vs.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/PRJE01.ini b/Data/Sys/GameSettings/PRJE01.ini
deleted file mode 100644
index 1f4994a71a..0000000000
--- a/Data/Sys/GameSettings/PRJE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# PRJE01 - PAC-MAN vs.
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-Issues="Needs GameBoy controller on slot 4"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/PZL.ini b/Data/Sys/GameSettings/PZL.ini
new file mode 100644
index 0000000000..b29302d5dd
--- /dev/null
+++ b/Data/Sys/GameSettings/PZL.ini
@@ -0,0 +1,31 @@
+# PZLE01, PZLJ01, PZLP01 - The Legend of Zelda: Collector's Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Hold B while booting the game to enable Progressive Scan for NES games.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/PZLE01.ini b/Data/Sys/GameSettings/PZLE01.ini
index 8ef8fba0b5..f1adfacf9f 100644
--- a/Data/Sys/GameSettings/PZLE01.ini
+++ b/Data/Sys/GameSettings/PZLE01.ini
@@ -1,13 +1,5 @@
 # PZLE01 - The Legend of Zelda: Collector's Edition
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Minor video glitches when pausing
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -16,12 +8,636 @@ EmulationIssues = Minor video glitches when pausing
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
+$==========The Legend of Zelda==========
+001D73B0 000000FB
+$Max/Infinte Health
+001D73AF 000000FF
+001D73B0 000000FB
+$Max/Infinite Rupees
+001D73AD 000000FF
+$Have Infinite Bombs
+001D7398 00000063
+$Have Infinite Keys
+001D73AE 00000063
+$Have No Sword
+001D7217 00000000
+$Have Wooden Sword
+001D7217 00000001
+$Have White Sword
+001D7217 00000002
+$Have Master Sword
+001D7217 00000003
+$Have Big Shield
+001D73B6 00000001
+$Have Blue Boomerang
+021D73B4 00000101
+$Have Bow
+001D739A 00000001
+$Have Silver Arrows
+001D7699 00000002
+$Have Red Candle
+001D739B 00000002
+$Have Recorder
+001D739C 00000001
+$Have Meat
+001D739D 00000001
+$Have Red Potion
+001D739E 00000002
+$Have Magic Wand
+001D739F 00000001
+$Have Raft
+001D73A0 00000001
+$Have Book of Magic
+001D73A1 00000001
+$Have Red Ring
+001D73A2 00000002
+$Have Ladder
+001D73A3 00000001
+$Have Master Key
+001D73A4 00000001
+$Have Power Bracelet
+001D73A5 00000001
+$Have Dungeon Map
+001D73A8 000000FF
+$Triforce Complete
+001D73B1 000000FF
+$Press R To Freeze Enemies
+0A091BFA 00000020
+001D73AC 00000001
+$==========Legend of Zelda 2, The - The Adventures of Link==========
+02BE1816 00000140
+$Infinite Health
+001F6A05 0000007F
+001F6C14 0000007F
+$Infinite Magic
+001F6A04 0000007F
+001F6C13 0000007F
+$Infinite Lives
+001F6BA0 0000000A
+$Press R To Level Up
+3A0B1AFA 00000020
+021F6C15 00002328
+$Invincible
+001F69B8 00000004
+$Super Jump
+3A0B1AFA 00000100
+001F6A1D 000000FD
+$Infinite Keys
+001F6C33 00000009
+$Super Speed
+B01F6597 00000000
+081F6510 00000018
+001F6510 0000001A
+081F6510 000000E8
+001F6510 000000E6
+00000000 40000000
+$Max Life
+001F6D79 00000008
+$Max Magic
+001F6C19 00000008
+$Max Attack
+001F6D77 00000008
+$Have Shield Spell
+001F6ED7 00000001
+$Have Jump Spell
+001F6EDC 00000001
+$Have Life Spell
+001F6C1D 00000001
+$Have Fairy Spell
+001F6C1E 00000001
+$Have Fire Spell
+001F6C1F 00000001
+$Have Reflect Spell
+001F6C20 00000001
+$Have Spell Spell
+001F6C21 00000001
+$Have Thunder Spell
+001F6C22 00000001
+$Have Candle
+001F6C25 00000001
+$Have Power Glove
+001F6C26 00000001
+$Have Raft
+001F6C27 00000001
+$Have Boots
+001F6C28 00000001
+$Have Flute
+001F6C29 00000001
+$Have Cross
+001F6C2A 00000001
+$Have Hammer
+001F6C2B 00000001
+$Have Master Key
+001F6C2C 00000001
+$All Spells Active (Not Fairy)
+001F6C0F 00000073
+$Never Slowed Down(World Map)
+001F6A03 00000005
+$Random Enemies Disappear Immediately
+001F69B2 00000300
+$==========Legend of Zelda, The - Ocarina of Time==========
+02BE1816 00000140
+$Japanese Text
+02C28CE0 00000000
+$English Text
+02C28CE0 00000001
+$Max Hearts
+02C27906 00000140
+$Infinite Hearts
+02C27908 00000140
+$Infinite Magic
+08C27911 00000008
+00C27980 00000007
+00C27912 00000001
+00C27914 00000001
+00C2790B 00000060
+$Infinite Rupees
+02C2790C 000003E7
+$All Swords/Shields/Boots/Tunics
+02C27974 00007777
+$Have Quiver (Adult)
+00C27979 00000001
+$Have Golden Gauntlets (Adult)
+00C2797B 000000C0
+$Have All Quest Items
+04C2797C 30FFFFFF
+$999 Gold Skulltulas
+02C279A8 000003E7
+$Have Deku Stick
+00C2794C 00000000
+$Infinite Deku Sticks
+00C27964 00000009
+$Always Flaming Deku Stick
+02CE8B80 000000C4
+$Have Deku Nuts
+00C2794D 00000001
+$Infinite Deku Nuts
+00C27965 0000000A
+$Have Bombs
+00C2794E 00000002
+$Infinite Bombs
+00C27966 00000009
+$Have Fairy Slingshot
+00C27952 00000006
+$Infinite Slingshot Ammo
+00C2796A 00000009
+$Have Fairy Ocarina (Not Time)
+00C27953 00000007
+$Have Ocarina Of Time (Not Fairy)
+00C27953 00000008
+$Have Bombchu
+00C27954 00000009
+$Infinite Bombchu's
+00C2796C 00000009
+$Have Boomerang
+00C27958 0000000E
+$Have Lens of Truth
+00C27959 0000000F
+$Have Magic Beans
+00C2795A 00000010
+$Infinite Magic Beans
+00C27972 00000009
+$Have Fairy Bow
+00C2794F 00000003
+$Infinite Arrows
+00C27967 00000009
+$Have Fire Arrow(MP2)
+00C27950 00000004
+$Have Ice Arrow(MP2)
+00C27956 0000000C
+$Light Arrow(MP4)
+00C2795C 00000012
+$Have Hookshot (Not Longshot)
+00C27955 0000000A
+$Have Longshot (Not Hookshot)
+00C27955 0000000B
+$Have Megaton Hammer
+00C2795B 00000011
+$Have Din's Fire(MP6)
+00C27951 00000005
+$Have Fairie's Wind(MP6)
+00C27957 0000000D
+$Have Nayru's Love(MP12)
+00C2795D 00000013
+$Have Empty Bottle 1
+08C2795E 000000FF
+00C2795E 00000014
+$Have Empty Bottle 2
+08C2795F 000000FF
+00C2795F 00000014
+$Have Empty Bottle 3
+08C27960 000000FF
+00C27960 00000014
+$Have Empty Bottle 4
+08C27961 000000FF
+00C27961 00000014
+$==========$Have BOSS KEY, COMPASS & MAP:==========
+02BE1816 00000140
+$Deku Tree
+00C27980 00000007
+$Dodongo's Cavern
+00C27981 00000007
+$Jabu's Belly
+00C27982 00000007
+$Forest Temple
+00C27983 00000007
+$Fire Temple
+00C27984 00000007
+$Water Temple
+00C27985 00000007
+$Ice Cavern
+00C27989 00000007
+$Spirit Temple
+00C27986 00000007
+$Shadow Temple
+00C27987 00000007
+$Bottom Of Well
+00C27988 00000007
+$Gannon's Castle
+00C2798A 00000007
+$Have All Boss Maps and Keys
+00C27980 00000A07
+$==========EMPTY BOTTLE 1 CONTAINS:==========
+02BE1816 00000140
+$Red Potion
+08C2795E 00000014
+00C2795E 00000015
+$Green Potion
+08C2795E 00000014
+00C2795E 00000016
+$Blue Potion
+08C2795E 00000014
+00C2795E 00000017
+$Bottled Fairy
+08C2795E 00000014
+00C2795E 00000018
+$Fish
+08C2795E 00000014
+00C2795E 00000019
+$Lon Lon Milk (1/2 Full)
+08C2795E 00000014
+00C2795E 0000001F
+$Lon Lon Milk
+08C2795E 00000014
+00C2795E 0000001A
+$Letter
+08C2795E 00000014
+00C2795E 0000001B
+$Blue Fire
+08C2795E 00000014
+00C2795E 0000001C
+$Bug
+08C2795E 00000014
+00C2795E 0000001D
+$Poe
+08C2795E 00000014
+00C2795E 00000020
+$Big Poe
+08C2795E 00000014
+00C2795E 0000001E
+$==========EMPTY BOTTLE 2 CONTAINS:==========
+02BE1816 00000140
+$Red Potion
+08C2795F 00000014
+00C2795F 00000015
+$Green Potion
+08C2795F 00000014
+00C2795F 00000016
+$Blue Potion
+08C2795F 00000014
+00C2795F 00000017
+$Bottled Fairy
+08C2795F 00000014
+00C2795F 00000018
+$Fish
+08C2795F 00000014
+00C2795F 00000019
+$Lon Lon Milk (1/2 Full)
+08C2795F 00000014
+00C2795F 0000001F
+$Lon Lon Milk
+08C2795F 00000014
+00C2795F 0000001A
+$Letter
+08C2795F 00000014
+00C2795F 0000001B
+$Blue Fire
+08C2795F 00000014
+00C2795F 0000001C
+$Bug
+08C2795F 00000014
+00C2795F 0000001D
+$Poe
+08C2795F 00000014
+00C2795F 00000020
+$Big Poe
+08C2795F 00000014
+00C2795F 0000001E
+$==========EMPTY BOTTLE 3 CONTAINS:==========
+02BE1816 00000140
+$Red Potion
+08C27960 00000014
+00C27960 00000015
+$Green Potion
+08C27960 00000014
+00C27960 00000016
+$Blue Potion
+08C27960 00000014
+00C27960 00000017
+$Bottled Fairy
+08C27960 00000014
+00C27960 00000018
+$Fish
+08C27960 00000014
+00C27960 00000019
+$Lon Lon Milk (1/2 Full)
+08C27960 00000014
+00C27960 0000001F
+$Lon Lon Milk
+08C27960 00000014
+00C27960 0000001A
+$Letter
+08C27960 00000014
+00C27960 0000001B
+$Blue Fire
+08C27960 00000014
+00C27960 0000001C
+$Bug
+08C27960 00000014
+00C27960 0000001D
+$Poe
+08C27960 00000014
+00C27960 00000020
+$Big Poe
+08C27960 00000014
+00C27960 0000001E
+$==========EMPTY BOTTLE 4 CONTAINS:==========
+02BE1816 00000140
+$Red Potion
+08C27961 00000014
+00C27961 00000015
+$Green Potion
+08C27961 00000014
+00C27961 00000016
+$Blue Potion
+08C27961 00000014
+00C27961 00000017
+$==========Legend of Zelda, The - Majora's Mask==========
+02BE1816 00000140
+$Can Use Fiery Diety Mask Anywhere
+04C22A54 2401FFFF
+$Max Health
+02CB2B74 00000140
+$Infinite Health
+02CB2B76 00000140
+$Infinite Magic
+00CB2B79 00000030
+$Infinite Rupees
+02CB2B7A 000003E7
+$Have All Quest Items
+04CB2BFC 0005F7CF
+$Have All Masks
+04CB2BC8 3E384745
+04CB2BCC 40323A46
+04CB2BD0 39424833
+04CB2BD4 3C3D373F
+04CB2BD8 36344341
+04CB2BDC 3B444935
+$Have Ocarina Of Time
+00CB2BB0 00000000
+$Have Hero's Bow
+00CB2BB1 00000001
+$Have Fire Arrow (MP2)
+00CB2BB2 00000002
+$Have Ice Arrow (MP2)
+00CB2BB3 00000003
+$Have Light Arrow (MP4)
+00CB2BB4 00000004
+$Have Bomb
+00CB2BB6 00000006
+$Have Bombchu
+00CB2BB7 00000007
+$Have Deku Stick
+00CB2BB8 00000008
+$Have Deku Nut
+00CB2BB9 00000009
+$Have Magic Beans
+00CB2BBA 0000000A
+$Have Powder Keg
+00CB2BBC 0000000C
+$Have Pictograph Box
+00CB2BBD 0000000D
+$Have Lens Of Truth
+00CB2BBE 0000000E
+$Have Hookshot
+00CB2BBF 0000000F
+$Have Great Fairy's Sword
+00CB2BC0 00000010
+$Infinite Arrows
+00CB2BE1 00000009
+$Infinite Bombs
+00CB2BE6 00000009
+$Infinite Bombachus
+00CB2BE7 00000009
+$Infinite Deku Sticks
+00CB2BE8 00000009
+$Infinite Deku Nuts
+00CB2BE9 00000009
+$Infinite Magic Beans
+00CB2BEA 00000009
+$Infinite Powder Keg
+00CB2BEC 00000009
+$Have Map/Compass/Big Key
+04CB2C00 07070707
+$Infinite Small Keys
+04CB2C0A 00000309
+$Have All Stray Fairies
+04CB2C14 0F0F0F0F
+$Use Any Item As Any Character
+04CB6A58 00000000
+$Press R - Time Advances
+0A12CDD8 00000020
+84CB2B4C 00010000
+$Press L - Time Rewinds
+0A12CDD8 00000040
+84CB2B4C FFFE0000
+$Always Day 1
+00CB2B5B 00000001
+$Always Day 2
+00CB2B5B 00000002
+$Always Day 3
+00CB2B5B 00000003
+$==========EVENT ITEM 1 IS:==========
+02BE1816 00000140
+$Moon's Tear
+00CB2BB5 00000028
+$Land Title Deed
+00CB2BB5 00000029
+$Swap Title Deed
+00CB2BB5 0000002A
+$Mountain Title Deed
+00CB2BB5 0000002B
+$Ocean Title Deed
+00CB2BB5 0000002C
+$Room Key
+00CB2BB5 0000002D
+$Special Delivery To Mama
+00CB2BB5 0000002E
+$Letter To Kafei
+00CB2BB5 0000002F
+$Pendant Of Memories
+00CB2BB5 00000030
+$==========EVENT ITEM 2 IS:==========
+02BE1816 00000140
+$Moon's Tear
+00CB2BBB 00000028
+$Land Title Deed
+00CB2BBB 00000029
+$Swap Title Deed
+00CB2BBB 0000002A
+$Mountain Title Deed
+00CB2BBB 0000002B
+$Ocean Title Deed
+00CB2BBB 0000002C
+$Room Key
+00CB2BBB 0000002D
+$Special Delivery To Mama
+00CB2BBB 0000002E
+$Letter To Kafei
+00CB2BBB 0000002F
+$Pendant Of Memories
+00CB2BBB 00000030
+$==========EVENT ITEM 3 IS:==========
+02BE1816 00000140
+$Moon's Tear
+00CB2BC1 00000028
+$Land Title Deed
+00CB2BC1 00000029
+$Swap Title Deed
+00CB2BC1 0000002A
+$Mountain Title Deed
+00CB2BC1 0000002B
+$Ocean Title Deed
+00CB2BC1 0000002C
+$Room Key
+00CB2BC1 0000002D
+$Special Delivery To Mama
+00CB2BC1 0000002E
+$Letter To Kafei
+00CB2BC1 0000002F
+$Pendant Of Memories
+00CB2BC1 00000030
+$==========Have BOTTLE 1/BOTTLE 1 CONTAINS:=========
+02BE1816 00000140
+$Empty Bottle
+00CB2BC2 00000012
+$Red Potion
+00CB2BC2 00000013
+$Green Potion
+00CB2BC2 00000014
+$Blue Potion
+00CB2BC2 00000015
+$Fairy
+00CB2BC2 00000016
+$Deku Princess
+00CB2BC2 00000017
+$Milk
+00CB2BC2 00000018
+$Milk (1/2)
+00CB2BC2 00000019
+$Fish
+00CB2BC2 0000001A
+$Bug
+00CB2BC2 0000001B
+$Blue Fire
+00CB2BC2 0000001C
+$Poe
+00CB2BC2 0000001D
+$Big Poe
+00CB2BC2 0000001E
+$Spring Water
+00CB2BC2 0000001F
+$Hot Spring Water
+00CB2BC2 00000020
+$Zora Egg
+00CB2BC2 00000021
+$Gold Dust
+00CB2BC2 00000022
+$Magical Mushroom
+00CB2BC2 00000023
+$Sea Horse
+00CB2BC2 00000024
+$Chateau Romani
+00CB2BC2 00000025
+$=========Have BOTTLE 2/BOTTLE 2 CONTAINS:==========
+02BE1816 00000140
+$Empty Bottle
+00CB2BC3 00000012
+$Red Potion
+00CB2BC3 00000013
+$Green Potion
+00CB2BC3 00000014
+$Blue Potion
+00CB2BC3 00000015
+$Fairy
+00CB2BC3 00000016
+$Deku Princess
+00CB2BC3 00000017
+$Milk
+00CB2BC3 00000018
+$Milk (1/2)
+00CB2BC3 00000019
+$Fish
+00CB2BC3 0000001A
+$==========Legend of Zelda, The - The Wind Waker Demo==========
+02BE1816 00000140
+$Maximum Health
+003CB8D1 00000050
+$Can Carry 5000 Rupees
+003CB8E2 00000002
+$Supersprint Link (Hold R)
+0A3F43B8 00000020
+423D10D8 1ADE4281
+$Moon Jump (Hold DPad Down)
+0A3F43B8 00000004
+423D10D8 01124204
+$Massive Link
+423D10D8 010A4080
+423D10D8 010C4080
+423D10D8 010E4080
+$Tiny Link
+423D10D8 010A3E80
+423D10D8 010C3E80
+423D10D8 010E3E80
+$Have Mirror Shield
+003CB8DF 0000003C
+003CB985 00000002
+$Have Power Bracelets
+003CB8E0 00000028
+003CB986 00000002
+$Have Telescope
+003CB90C 00000020
+$Have Sail
+003CB90D 00000078
+$Have Wind Waker
+003CB90E 00000022
+$Have Grappling Hook
+003CB90F 00000025
+$Have Deku Leaf
+003CB912 00000034
+$Have Tingle Tuner
+003CB913 00000021
+$Have Deluxe Picto Box
+003CB914 00000026
+$Have Iron Boots
+003CB915 00000029
+$Have Magic Armour
+003CB916 0000002A
+$Have Bow & Arrow
+003CB918 00000036
+$Have Skull Hammer
+003CB920 00000033
+$Maximum Magic
+003CB8E3 00000020
+$All Melodies
+003CB98D 0000003F
diff --git a/Data/Sys/GameSettings/PZLJ01.ini b/Data/Sys/GameSettings/PZLJ01.ini
deleted file mode 100644
index d0e2dd71ae..0000000000
--- a/Data/Sys/GameSettings/PZLJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# PZLJ01 - The Legend of Zelda: Collector's Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Minor video glitches when pausing
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/PZLP01.ini b/Data/Sys/GameSettings/PZLP01.ini
deleted file mode 100644
index 86db204c9a..0000000000
--- a/Data/Sys/GameSettings/PZLP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# PZLP01 - The Legend of Zelda: Collector's Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Minor video glitches when pausing
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/QA3.ini b/Data/Sys/GameSettings/QA3.ini
new file mode 100644
index 0000000000..2a0703980f
--- /dev/null
+++ b/Data/Sys/GameSettings/QA3.ini
@@ -0,0 +1,23 @@
+# QA3E18 - SimEarth
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAA.ini b/Data/Sys/GameSettings/QAA.ini
new file mode 100644
index 0000000000..46ef58a261
--- /dev/null
+++ b/Data/Sys/GameSettings/QAA.ini
@@ -0,0 +1,24 @@
+# QAAE18, QAAP18 - Super Air Zonk
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAB.ini b/Data/Sys/GameSettings/QAB.ini
new file mode 100644
index 0000000000..e4be804fa1
--- /dev/null
+++ b/Data/Sys/GameSettings/QAB.ini
@@ -0,0 +1,24 @@
+# QABE18, QABP18 - Ys Book I & II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAC.ini b/Data/Sys/GameSettings/QAC.ini
new file mode 100644
index 0000000000..0e6cd40cd9
--- /dev/null
+++ b/Data/Sys/GameSettings/QAC.ini
@@ -0,0 +1,24 @@
+# QACL18, QACN18 - Cho Aniki
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAD.ini b/Data/Sys/GameSettings/QAD.ini
new file mode 100644
index 0000000000..e0ab873f79
--- /dev/null
+++ b/Data/Sys/GameSettings/QAD.ini
@@ -0,0 +1,24 @@
+# QADL18, QADN18 - GRADIUS II
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAF.ini b/Data/Sys/GameSettings/QAF.ini
new file mode 100644
index 0000000000..751774e61d
--- /dev/null
+++ b/Data/Sys/GameSettings/QAF.ini
@@ -0,0 +1,24 @@
+# QAFE18, QAFP18 - The Dynastic Hero
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAFP18.ini b/Data/Sys/GameSettings/QAFP18.ini
deleted file mode 100644
index 7d800f89ff..0000000000
--- a/Data/Sys/GameSettings/QAFP18.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# QAFP18 - The Dynastic Hero
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAG.ini b/Data/Sys/GameSettings/QAG.ini
new file mode 100644
index 0000000000..2964971d0d
--- /dev/null
+++ b/Data/Sys/GameSettings/QAG.ini
@@ -0,0 +1,24 @@
+# QAGE18, QAGP18 - Gate of Thunder
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAP.ini b/Data/Sys/GameSettings/QAP.ini
new file mode 100644
index 0000000000..191050f420
--- /dev/null
+++ b/Data/Sys/GameSettings/QAP.ini
@@ -0,0 +1,24 @@
+# QAPL18, QAPN18 - CASTLEVANIA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAS.ini b/Data/Sys/GameSettings/QAS.ini
new file mode 100644
index 0000000000..75cae08565
--- /dev/null
+++ b/Data/Sys/GameSettings/QAS.ini
@@ -0,0 +1,24 @@
+# QASE18, QASP18 - Lords of Thunder
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAT.ini b/Data/Sys/GameSettings/QAT.ini
new file mode 100644
index 0000000000..0e7deacf26
--- /dev/null
+++ b/Data/Sys/GameSettings/QAT.ini
@@ -0,0 +1,24 @@
+# QATE18, QATP18 - Riot Zone
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAU.ini b/Data/Sys/GameSettings/QAU.ini
new file mode 100644
index 0000000000..e046e1c61c
--- /dev/null
+++ b/Data/Sys/GameSettings/QAU.ini
@@ -0,0 +1,23 @@
+# QAUE18 - Monster Lair
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QAW.ini b/Data/Sys/GameSettings/QAW.ini
new file mode 100644
index 0000000000..50b457de0c
--- /dev/null
+++ b/Data/Sys/GameSettings/QAW.ini
@@ -0,0 +1,24 @@
+# QAWL18, QAWN18 - Star Parodier
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/QBB.ini b/Data/Sys/GameSettings/QBB.ini
new file mode 100644
index 0000000000..62c3da0e43
--- /dev/null
+++ b/Data/Sys/GameSettings/QBB.ini
@@ -0,0 +1,24 @@
+# QBBE18, QBBP18 - Fighting Street
+
+[Core]
+# Values set here will override the main Dolphin settings.
+ProgressiveScan = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/R22.ini b/Data/Sys/GameSettings/R22.ini
new file mode 100644
index 0000000000..345610472d
--- /dev/null
+++ b/Data/Sys/GameSettings/R22.ini
@@ -0,0 +1,33 @@
+# R22E01, R22J01, R22P01 - FlingSmash
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real wiimote and motion plus.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/R22E01.ini b/Data/Sys/GameSettings/R22E01.ini
deleted file mode 100644
index 7fb6869086..0000000000
--- a/Data/Sys/GameSettings/R22E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R22E01 - FlingSmash
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R22J01.ini b/Data/Sys/GameSettings/R22J01.ini
deleted file mode 100644
index 14463c5666..0000000000
--- a/Data/Sys/GameSettings/R22J01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R22J01 - Tataite Hazumu: Super Smash Ball Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R22P01.ini b/Data/Sys/GameSettings/R22P01.ini
deleted file mode 100644
index 5d61aff337..0000000000
--- a/Data/Sys/GameSettings/R22P01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R22P01 - FlingSmash
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R29.ini b/Data/Sys/GameSettings/R29.ini
new file mode 100644
index 0000000000..2f5883d86f
--- /dev/null
+++ b/Data/Sys/GameSettings/R29.ini
@@ -0,0 +1,18 @@
+# R29P52 - Millennium Series Championship Paintball 2009
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R29P52.ini b/Data/Sys/GameSettings/R29P52.ini
deleted file mode 100644
index 6074a49161..0000000000
--- a/Data/Sys/GameSettings/R29P52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# R29P52 - Millennium Series Championship Paintball 2009
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R2D.ini b/Data/Sys/GameSettings/R2D.ini
new file mode 100644
index 0000000000..166a18c306
--- /dev/null
+++ b/Data/Sys/GameSettings/R2D.ini
@@ -0,0 +1,26 @@
+# R2DEEB - Dokapon Kingdom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+
+[Video_Hacks]
+
+[Video_Enhancements]
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/R2G.ini b/Data/Sys/GameSettings/R2G.ini
new file mode 100644
index 0000000000..ec2041aff4
--- /dev/null
+++ b/Data/Sys/GameSettings/R2G.ini
@@ -0,0 +1,34 @@
+# R2GEXJ, R2GJAF, R2GP99 - FRAGILE DREAMS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Minimap needs emulate format changes to work.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini
deleted file mode 100644
index 2d04ace8b2..0000000000
--- a/Data/Sys/GameSettings/R2GEXJ.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# R2GEXJ - FRAGILE DREAMS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Minimap needs emulate format changes to work.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R2GJAF.ini b/Data/Sys/GameSettings/R2GJAF.ini
deleted file mode 100644
index 030dce8cfb..0000000000
--- a/Data/Sys/GameSettings/R2GJAF.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# R2GJAF - FRAGILE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Minimap needs emulate format changes to work.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini
deleted file mode 100644
index a8163c4389..0000000000
--- a/Data/Sys/GameSettings/R2GP99.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# R2GP99 - FRAGILE DREAMS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Minimap needs emulate format changes to work.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R2J.ini b/Data/Sys/GameSettings/R2J.ini
new file mode 100644
index 0000000000..6598f271b0
--- /dev/null
+++ b/Data/Sys/GameSettings/R2J.ini
@@ -0,0 +1,19 @@
+# R2JJAF - TAIKO Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R2JJAF.ini b/Data/Sys/GameSettings/R2JJAF.ini
deleted file mode 100644
index 1b06ec0475..0000000000
--- a/Data/Sys/GameSettings/R2JJAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R2JJAF - TAIKO Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R2K.ini b/Data/Sys/GameSettings/R2K.ini
new file mode 100644
index 0000000000..6dceea330b
--- /dev/null
+++ b/Data/Sys/GameSettings/R2K.ini
@@ -0,0 +1,27 @@
+# R2KP54 - DON KING BOXING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar = 0.1
+
diff --git a/Data/Sys/GameSettings/R2KP54.ini b/Data/Sys/GameSettings/R2KP54.ini
deleted file mode 100644
index 25fc319487..0000000000
--- a/Data/Sys/GameSettings/R2KP54.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R2KP54 - DON KING BOXING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/R2T.ini b/Data/Sys/GameSettings/R2T.ini
new file mode 100644
index 0000000000..bb2d681bba
--- /dev/null
+++ b/Data/Sys/GameSettings/R2T.ini
@@ -0,0 +1,19 @@
+# R2TE41 - TMNT: Smash-Up Cowabunga!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R2TE41.ini b/Data/Sys/GameSettings/R2TE41.ini
deleted file mode 100644
index 3c1eb73ce1..0000000000
--- a/Data/Sys/GameSettings/R2TE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R2TE41 - TMNT: Smash-Up Cowabunga!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R2U.ini b/Data/Sys/GameSettings/R2U.ini
new file mode 100644
index 0000000000..e0fefe638a
--- /dev/null
+++ b/Data/Sys/GameSettings/R2U.ini
@@ -0,0 +1,22 @@
+# R2UE8P - Let'sTAP
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/R2UE8P.ini b/Data/Sys/GameSettings/R2UE8P.ini
deleted file mode 100644
index 98a163bd42..0000000000
--- a/Data/Sys/GameSettings/R2UE8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R2UE8P - Let'sTAP
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R2V.ini b/Data/Sys/GameSettings/R2V.ini
new file mode 100644
index 0000000000..f1d669c60d
--- /dev/null
+++ b/Data/Sys/GameSettings/R2V.ini
@@ -0,0 +1,19 @@
+# R2VJ01, R2VP01 - Sin and Punishment 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R2VJ01.ini b/Data/Sys/GameSettings/R2VJ01.ini
deleted file mode 100644
index 702c39e86f..0000000000
--- a/Data/Sys/GameSettings/R2VJ01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R2VJ01 - Sin and Punishment 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R2VP01.ini b/Data/Sys/GameSettings/R2VP01.ini
deleted file mode 100644
index c708e83d9f..0000000000
--- a/Data/Sys/GameSettings/R2VP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R2VP01 - Sin and Punishment 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R3B.ini b/Data/Sys/GameSettings/R3B.ini
new file mode 100644
index 0000000000..1029fd3d91
--- /dev/null
+++ b/Data/Sys/GameSettings/R3B.ini
@@ -0,0 +1,31 @@
+# R3BE8P, R3BJ8P, R3BP8P - SambaDeAmigo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/R3BE8P.ini b/Data/Sys/GameSettings/R3BE8P.ini
deleted file mode 100644
index e1c4357439..0000000000
--- a/Data/Sys/GameSettings/R3BE8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3BE8P - SambaDeAmigo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct x 11 plugin (r6898).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R3BJ8P.ini b/Data/Sys/GameSettings/R3BJ8P.ini
deleted file mode 100644
index 25feaf3cc0..0000000000
--- a/Data/Sys/GameSettings/R3BJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3BJ8P - SambaDeAmigo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct x 11 plugin (r6898).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R3BP8P.ini b/Data/Sys/GameSettings/R3BP8P.ini
deleted file mode 100644
index 462fee827a..0000000000
--- a/Data/Sys/GameSettings/R3BP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3BP8P - SambaDeAmigo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct x 11 plugin (r6898).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R3C.ini b/Data/Sys/GameSettings/R3C.ini
new file mode 100644
index 0000000000..21ccfa7841
--- /dev/null
+++ b/Data/Sys/GameSettings/R3C.ini
@@ -0,0 +1,18 @@
+# R3CE20 - Chrysler Classic Racing
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R3CE20.ini b/Data/Sys/GameSettings/R3CE20.ini
deleted file mode 100644
index 8d6a9d007a..0000000000
--- a/Data/Sys/GameSettings/R3CE20.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# R3CE20 - Chrysler Classic Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R3D.ini b/Data/Sys/GameSettings/R3D.ini
new file mode 100644
index 0000000000..477ecb4985
--- /dev/null
+++ b/Data/Sys/GameSettings/R3D.ini
@@ -0,0 +1,31 @@
+# R3DES5, R3DPS5 - Dream Pinball 3d
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Automatic framelimit is problematic.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/R3DES5.ini b/Data/Sys/GameSettings/R3DES5.ini
deleted file mode 100644
index 7f795a06d8..0000000000
--- a/Data/Sys/GameSettings/R3DES5.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3DES5 - Dream Pinball 3d
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Automatic framelimit is problematic.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/R3DPS5.ini b/Data/Sys/GameSettings/R3DPS5.ini
deleted file mode 100644
index f562dd4512..0000000000
--- a/Data/Sys/GameSettings/R3DPS5.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3DPS5 - Dream Pinball 3d
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Automatic framelimit is problematic.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/R3G.ini b/Data/Sys/GameSettings/R3G.ini
new file mode 100644
index 0000000000..d53c684e5d
--- /dev/null
+++ b/Data/Sys/GameSettings/R3G.ini
@@ -0,0 +1,18 @@
+# R3GXUG - Crazy Mini Golf
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R3GXUG.ini b/Data/Sys/GameSettings/R3GXUG.ini
deleted file mode 100644
index 2c4796c10e..0000000000
--- a/Data/Sys/GameSettings/R3GXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# R3GXUG - Crazy Mini Golf
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R3M.ini b/Data/Sys/GameSettings/R3M.ini
new file mode 100644
index 0000000000..9082f82104
--- /dev/null
+++ b/Data/Sys/GameSettings/R3M.ini
@@ -0,0 +1,30 @@
+# R3ME01, R3MP01 - Metroid Prime Trilogy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Disable PAL60 (EuRGB60) to avoid a black bar appearing.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/R3ME01.ini b/Data/Sys/GameSettings/R3ME01.ini
deleted file mode 100644
index b7e4af0f4d..0000000000
--- a/Data/Sys/GameSettings/R3ME01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3ME01 - Metroid Prime Trilogy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini
deleted file mode 100644
index df74eae201..0000000000
--- a/Data/Sys/GameSettings/R3MP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R3MP01 - Metroid Prime Trilogy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R3N.ini b/Data/Sys/GameSettings/R3N.ini
new file mode 100644
index 0000000000..e49a16d003
--- /dev/null
+++ b/Data/Sys/GameSettings/R3N.ini
@@ -0,0 +1,25 @@
+# R3NEXS, R3NPH3 - Guilty Gear XX AC Plus
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/R3NEXS.ini b/Data/Sys/GameSettings/R3NEXS.ini
deleted file mode 100644
index 73752c2338..0000000000
--- a/Data/Sys/GameSettings/R3NEXS.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R3NEXS - Guilty Gear XX AC Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R3NPH3.ini b/Data/Sys/GameSettings/R3NPH3.ini
deleted file mode 100644
index 969a58dd82..0000000000
--- a/Data/Sys/GameSettings/R3NPH3.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R3NPH3 - Guilty Gear XX AC Plus
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R3O.ini b/Data/Sys/GameSettings/R3O.ini
new file mode 100644
index 0000000000..8d12d8d84e
--- /dev/null
+++ b/Data/Sys/GameSettings/R3O.ini
@@ -0,0 +1,32 @@
+# R3OE01, R3OJ01, R3OP01 - Metroid: Other M
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 1
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/R3OE01.ini b/Data/Sys/GameSettings/R3OE01.ini
deleted file mode 100644
index 935f38795a..0000000000
--- a/Data/Sys/GameSettings/R3OE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R3OE01 - Metroid: Other M
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 1
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R3OJ01.ini b/Data/Sys/GameSettings/R3OJ01.ini
deleted file mode 100644
index 27e0275b2b..0000000000
--- a/Data/Sys/GameSettings/R3OJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R3OJ01 - Metroid: Other M
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 1
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R3OP01.ini b/Data/Sys/GameSettings/R3OP01.ini
deleted file mode 100644
index 7d2d9995f1..0000000000
--- a/Data/Sys/GameSettings/R3OP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R3OP01 - Metroid: Other M
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 1
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R3R.ini b/Data/Sys/GameSettings/R3R.ini
new file mode 100644
index 0000000000..a895b54de5
--- /dev/null
+++ b/Data/Sys/GameSettings/R3R.ini
@@ -0,0 +1,20 @@
+# R3RE8P, R3RP8P - Sonic & Sega All-Stars Racing
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Use direct 3d 11 for less graphic glitches.
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/R3RE8P.ini b/Data/Sys/GameSettings/R3RE8P.ini
deleted file mode 100644
index 422735babf..0000000000
--- a/Data/Sys/GameSettings/R3RE8P.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# R3RE8P - Sonic & Sega All-Stars Racing
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct 3d 11 for less graphic glitches.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/R3RP8P.ini b/Data/Sys/GameSettings/R3RP8P.ini
deleted file mode 100644
index b49762b0f4..0000000000
--- a/Data/Sys/GameSettings/R3RP8P.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# R3RP8P - Sonic & Sega All-Stars Racing
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct 3d 11 for less graphic glitches.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/R3S.ini b/Data/Sys/GameSettings/R3S.ini
new file mode 100644
index 0000000000..a17a820802
--- /dev/null
+++ b/Data/Sys/GameSettings/R3S.ini
@@ -0,0 +1,19 @@
+# R3SP52 - Spider Man: Web Of Shadows
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R3SP52.ini b/Data/Sys/GameSettings/R3SP52.ini
deleted file mode 100644
index e233f0cce3..0000000000
--- a/Data/Sys/GameSettings/R3SP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R3SP52 - Spider Man: Web Of Shadows
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R3T.ini b/Data/Sys/GameSettings/R3T.ini
new file mode 100644
index 0000000000..9e556219d4
--- /dev/null
+++ b/Data/Sys/GameSettings/R3T.ini
@@ -0,0 +1,27 @@
+# R3TP54 - TOPSPIN 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar = 0.1
+
diff --git a/Data/Sys/GameSettings/R3TP54.ini b/Data/Sys/GameSettings/R3TP54.ini
deleted file mode 100644
index ea70513b36..0000000000
--- a/Data/Sys/GameSettings/R3TP54.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R3TP54 - TOPSPIN 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/R44.ini b/Data/Sys/GameSettings/R44.ini
new file mode 100644
index 0000000000..b8df1e137b
--- /dev/null
+++ b/Data/Sys/GameSettings/R44.ini
@@ -0,0 +1,24 @@
+# R44J8P - Suzumiya Haruhi no Heiretsu
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/R46.ini b/Data/Sys/GameSettings/R46.ini
new file mode 100644
index 0000000000..3512e4e1bd
--- /dev/null
+++ b/Data/Sys/GameSettings/R46.ini
@@ -0,0 +1,22 @@
+# R46ENS - PHANTOM BRAVE Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/R46ENS.ini b/Data/Sys/GameSettings/R46ENS.ini
deleted file mode 100644
index d631495b0e..0000000000
--- a/Data/Sys/GameSettings/R46ENS.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R46ENS - PHANTOM BRAVE Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R49.ini b/Data/Sys/GameSettings/R49.ini
new file mode 100644
index 0000000000..0e42098d7f
--- /dev/null
+++ b/Data/Sys/GameSettings/R49.ini
@@ -0,0 +1,22 @@
+# R49P01 - DONKEY KONG JUNGLE BEAT WII
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/R49P01.ini b/Data/Sys/GameSettings/R49P01.ini
deleted file mode 100644
index bfb327a7f1..0000000000
--- a/Data/Sys/GameSettings/R49P01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R49P01 - DONKEY KONG JUNGLE BEAT WII
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R4B.ini b/Data/Sys/GameSettings/R4B.ini
new file mode 100644
index 0000000000..1f61c7fa4d
--- /dev/null
+++ b/Data/Sys/GameSettings/R4B.ini
@@ -0,0 +1,18 @@
+# R4BPGT - table football
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R4BPGT.ini b/Data/Sys/GameSettings/R4BPGT.ini
deleted file mode 100644
index b69b0ec9a2..0000000000
--- a/Data/Sys/GameSettings/R4BPGT.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# R4BPGT - table football
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R4E.ini b/Data/Sys/GameSettings/R4E.ini
new file mode 100644
index 0000000000..9aaeb38c7b
--- /dev/null
+++ b/Data/Sys/GameSettings/R4E.ini
@@ -0,0 +1,30 @@
+# R4EE01, R4EJ01, R4EP01 - Endless Ocean Blue World
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/R4EE01.ini b/Data/Sys/GameSettings/R4EE01.ini
deleted file mode 100644
index e570295507..0000000000
--- a/Data/Sys/GameSettings/R4EE01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R4EE01 - Endless Ocean Blue World
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R4EJ01.ini b/Data/Sys/GameSettings/R4EJ01.ini
deleted file mode 100644
index fc1158f709..0000000000
--- a/Data/Sys/GameSettings/R4EJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R4EJ01 - FOREVER BLUE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R4EP01.ini b/Data/Sys/GameSettings/R4EP01.ini
deleted file mode 100644
index f2458cf1c8..0000000000
--- a/Data/Sys/GameSettings/R4EP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R4EP01 - Endless Ocean 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R4Q.ini b/Data/Sys/GameSettings/R4Q.ini
new file mode 100644
index 0000000000..a6c04bd882
--- /dev/null
+++ b/Data/Sys/GameSettings/R4Q.ini
@@ -0,0 +1,29 @@
+# R4QE01, R4QJ01, R4QK01, R4QP01 - Mario Strikers Charged
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini
deleted file mode 100644
index fe9e62a6ed..0000000000
--- a/Data/Sys/GameSettings/R4QE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R4QE01 - Mario Strikers Charged
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R4QJ01.ini b/Data/Sys/GameSettings/R4QJ01.ini
deleted file mode 100644
index 6fdfe5aefd..0000000000
--- a/Data/Sys/GameSettings/R4QJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R4QJ01 - Mario Strikers Charged
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R4QK01.ini b/Data/Sys/GameSettings/R4QK01.ini
deleted file mode 100644
index 724fdb6a3d..0000000000
--- a/Data/Sys/GameSettings/R4QK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R4QK01 - Mario Power Soccer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R4QP01.ini b/Data/Sys/GameSettings/R4QP01.ini
deleted file mode 100644
index 7989f34c4b..0000000000
--- a/Data/Sys/GameSettings/R4QP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R4QP01 - Mario Strikers Charged
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R4R.ini b/Data/Sys/GameSettings/R4R.ini
new file mode 100644
index 0000000000..1919934a95
--- /dev/null
+++ b/Data/Sys/GameSettings/R4R.ini
@@ -0,0 +1,22 @@
+# R4RP69 - FIFA 10
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/R4RP69.ini b/Data/Sys/GameSettings/R4RP69.ini
deleted file mode 100644
index 3462298333..0000000000
--- a/Data/Sys/GameSettings/R4RP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R4RP69 - FIFA 10
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R4Z.ini b/Data/Sys/GameSettings/R4Z.ini
new file mode 100644
index 0000000000..00b9e5cf15
--- /dev/null
+++ b/Data/Sys/GameSettings/R4Z.ini
@@ -0,0 +1,34 @@
+# R4ZJ01 - Fatal Frame IV: Mask of the Lunar Eclipse
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Anti-aliasing causes control issues with the piano mini-game.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+MSAA = 0
diff --git a/Data/Sys/GameSettings/R4ZJ01.ini b/Data/Sys/GameSettings/R4ZJ01.ini
deleted file mode 100644
index 78ba97cb8a..0000000000
--- a/Data/Sys/GameSettings/R4ZJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R4ZJ01 - Zero4
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/R5D.ini b/Data/Sys/GameSettings/R5D.ini
new file mode 100644
index 0000000000..9f3b16626a
--- /dev/null
+++ b/Data/Sys/GameSettings/R5D.ini
@@ -0,0 +1,19 @@
+# R5DE5G - Flip's Twisted World
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/R5DE5G.ini b/Data/Sys/GameSettings/R5DE5G.ini
deleted file mode 100644
index de6618040c..0000000000
--- a/Data/Sys/GameSettings/R5DE5G.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R5DE5G - Flip's Twisted World
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idle skipping causes speed issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R5I.ini b/Data/Sys/GameSettings/R5I.ini
new file mode 100644
index 0000000000..f60e762929
--- /dev/null
+++ b/Data/Sys/GameSettings/R5I.ini
@@ -0,0 +1,33 @@
+# R5IE4Q, R5IP4Q, R5IX4Q - Toy Story Mania!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+ForceFiltering = False
+
diff --git a/Data/Sys/GameSettings/R5IE4Q.ini b/Data/Sys/GameSettings/R5IE4Q.ini
deleted file mode 100644
index f9cc87dee4..0000000000
--- a/Data/Sys/GameSettings/R5IE4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R5IE4Q - Toy Story Mania!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/R5IP4Q.ini b/Data/Sys/GameSettings/R5IP4Q.ini
deleted file mode 100644
index 5a7152b841..0000000000
--- a/Data/Sys/GameSettings/R5IP4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R5IP4Q - Toy Story Mania!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/R5IX4Q.ini b/Data/Sys/GameSettings/R5IX4Q.ini
deleted file mode 100644
index cb4375ece3..0000000000
--- a/Data/Sys/GameSettings/R5IX4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# R5IX4Q - Toy Story Mania!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/R5V.ini b/Data/Sys/GameSettings/R5V.ini
new file mode 100644
index 0000000000..4065358e33
--- /dev/null
+++ b/Data/Sys/GameSettings/R5V.ini
@@ -0,0 +1,29 @@
+# R5VE41, R5VP41, R5VE41 - James Cameron's AVATAR
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/R5VE41.ini b/Data/Sys/GameSettings/R5VE41.ini
deleted file mode 100644
index ffc33ffbe0..0000000000
--- a/Data/Sys/GameSettings/R5VE41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5VE41 - James Cameron's AVATAR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R5VP41.ini b/Data/Sys/GameSettings/R5VP41.ini
deleted file mode 100644
index 1624995a79..0000000000
--- a/Data/Sys/GameSettings/R5VP41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5VP41 - James Cameron's AVATAR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini
deleted file mode 100644
index ffc33ffbe0..0000000000
--- a/Data/Sys/GameSettings/R5VX41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5VE41 - James Cameron's AVATAR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R5W.ini b/Data/Sys/GameSettings/R5W.ini
new file mode 100644
index 0000000000..90461e9993
--- /dev/null
+++ b/Data/Sys/GameSettings/R5W.ini
@@ -0,0 +1,30 @@
+# R5WEA4, R5WJA4 - Silent Hill: Shattered Memories
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Flashlight glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/R5WEA4.ini b/Data/Sys/GameSettings/R5WEA4.ini
deleted file mode 100644
index 57979f80ed..0000000000
--- a/Data/Sys/GameSettings/R5WEA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5WEA4 - Silent Hill: Shattered Memories
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Flashlight glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R5WJA4.ini b/Data/Sys/GameSettings/R5WJA4.ini
deleted file mode 100644
index f714736ff6..0000000000
--- a/Data/Sys/GameSettings/R5WJA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R5WJA4 - Silent Hill: Shattered Memories
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Flashlight glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R64.ini b/Data/Sys/GameSettings/R64.ini
new file mode 100644
index 0000000000..52ad3409be
--- /dev/null
+++ b/Data/Sys/GameSettings/R64.ini
@@ -0,0 +1,30 @@
+# R64E01, R64J01, R64K01, R64P01 - RVL Wii Music
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/R64E01.ini b/Data/Sys/GameSettings/R64E01.ini
deleted file mode 100644
index d9cfe8f54c..0000000000
--- a/Data/Sys/GameSettings/R64E01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R64E01 - RVL Wii Music
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R64J01.ini b/Data/Sys/GameSettings/R64J01.ini
deleted file mode 100644
index cff783884b..0000000000
--- a/Data/Sys/GameSettings/R64J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R64J01 - RVL Wii Music
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R64K01.ini b/Data/Sys/GameSettings/R64K01.ini
deleted file mode 100644
index 3f913f80ea..0000000000
--- a/Data/Sys/GameSettings/R64K01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R64K01 - RVL Wii Music
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R64P01.ini b/Data/Sys/GameSettings/R64P01.ini
deleted file mode 100644
index fe5d4f09c4..0000000000
--- a/Data/Sys/GameSettings/R64P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R64P01 - RVL Wii Music
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/R69.ini b/Data/Sys/GameSettings/R69.ini
new file mode 100644
index 0000000000..ca8f5065b1
--- /dev/null
+++ b/Data/Sys/GameSettings/R69.ini
@@ -0,0 +1,19 @@
+# R69E36 - Dirt 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R69E36.ini b/Data/Sys/GameSettings/R69E36.ini
deleted file mode 100644
index 69b0aebf11..0000000000
--- a/Data/Sys/GameSettings/R69E36.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R69E36 - Dirt 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R6B.ini b/Data/Sys/GameSettings/R6B.ini
new file mode 100644
index 0000000000..cb0bbdd78c
--- /dev/null
+++ b/Data/Sys/GameSettings/R6B.ini
@@ -0,0 +1,33 @@
+# R6BE78, R6BJ78, R6BK78, R6BP78, R6BX78 - de Blob
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Enhancements]
+ForceFiltering = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/R6BE78.ini b/Data/Sys/GameSettings/R6BE78.ini
deleted file mode 100644
index 93d3ecd1af..0000000000
--- a/Data/Sys/GameSettings/R6BE78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BE78 - de Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BJ78.ini b/Data/Sys/GameSettings/R6BJ78.ini
deleted file mode 100644
index ca9fee658f..0000000000
--- a/Data/Sys/GameSettings/R6BJ78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BJ78 - Blob Colorful Na Kibou
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BK78.ini b/Data/Sys/GameSettings/R6BK78.ini
deleted file mode 100644
index daae7f6b76..0000000000
--- a/Data/Sys/GameSettings/R6BK78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BK78 - de Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BP78.ini b/Data/Sys/GameSettings/R6BP78.ini
deleted file mode 100644
index 6e349f9ffa..0000000000
--- a/Data/Sys/GameSettings/R6BP78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BP78 - de Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6BX78.ini b/Data/Sys/GameSettings/R6BX78.ini
deleted file mode 100644
index b9d49a71dd..0000000000
--- a/Data/Sys/GameSettings/R6BX78.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R6BX78 - de Blob
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R6N.ini b/Data/Sys/GameSettings/R6N.ini
new file mode 100644
index 0000000000..75d3ddb004
--- /dev/null
+++ b/Data/Sys/GameSettings/R6N.ini
@@ -0,0 +1,19 @@
+# R6NY41 - Shaun White Snowboarding: World Stage
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R6NY41.ini b/Data/Sys/GameSettings/R6NY41.ini
deleted file mode 100644
index d4a90fd1eb..0000000000
--- a/Data/Sys/GameSettings/R6NY41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R6NY41 - Shaun White Snowboarding: World Stage
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R6Q.ini b/Data/Sys/GameSettings/R6Q.ini
new file mode 100644
index 0000000000..63a16e90e5
--- /dev/null
+++ b/Data/Sys/GameSettings/R6Q.ini
@@ -0,0 +1,24 @@
+# R6QE69 - MySims Agents
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 4096
diff --git a/Data/Sys/GameSettings/R6T.ini b/Data/Sys/GameSettings/R6T.ini
new file mode 100644
index 0000000000..16c1d6cb94
--- /dev/null
+++ b/Data/Sys/GameSettings/R6T.ini
@@ -0,0 +1,24 @@
+# R6TEA4, R6TPA4 - Tornado Outbreak
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Ending credits and images need normal safe texture cache setting.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/R6TEA4.ini b/Data/Sys/GameSettings/R6TEA4.ini
deleted file mode 100644
index 7246ef8437..0000000000
--- a/Data/Sys/GameSettings/R6TEA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# R6TEA4 - Tornado Outbreak
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R6Y.ini b/Data/Sys/GameSettings/R6Y.ini
new file mode 100644
index 0000000000..44ebde2307
--- /dev/null
+++ b/Data/Sys/GameSettings/R6Y.ini
@@ -0,0 +1,25 @@
+# R6YEXS, R6YPH3 - Squeeballs Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/R6YEXS.ini b/Data/Sys/GameSettings/R6YEXS.ini
deleted file mode 100644
index 6001933724..0000000000
--- a/Data/Sys/GameSettings/R6YEXS.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R6YEXS - Squeeballs Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R6YPH3.ini b/Data/Sys/GameSettings/R6YPH3.ini
deleted file mode 100644
index fa5bc550a3..0000000000
--- a/Data/Sys/GameSettings/R6YPH3.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# R6YPH3 - Squeeballs Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 0
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/R7E.ini b/Data/Sys/GameSettings/R7E.ini
new file mode 100644
index 0000000000..411e80ad5a
--- /dev/null
+++ b/Data/Sys/GameSettings/R7E.ini
@@ -0,0 +1,30 @@
+# R7EE8P, R7EJ8P, R7EP8P - NiGHTS: Journey of Dreams
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/R7EE8P.ini b/Data/Sys/GameSettings/R7EE8P.ini
deleted file mode 100644
index af2e35a5e2..0000000000
--- a/Data/Sys/GameSettings/R7EE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7EE8P - NiGHTS: Journey of Dreams
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R7EJ8P.ini b/Data/Sys/GameSettings/R7EJ8P.ini
deleted file mode 100644
index f7ee320eb5..0000000000
--- a/Data/Sys/GameSettings/R7EJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7EJ8P - NiGHTS: Journey of Dreams
-
-[Core]
-# Values set here will override the main dolphin settings.
-BAT = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R7EP8P.ini b/Data/Sys/GameSettings/R7EP8P.ini
deleted file mode 100644
index 04ee74ddea..0000000000
--- a/Data/Sys/GameSettings/R7EP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7EP8P - NiGHTS: Journey of Dreams
-
-[Core]
-# Values set here will override the main dolphin settings.
-BAT = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R7F.ini b/Data/Sys/GameSettings/R7F.ini
new file mode 100644
index 0000000000..5676ad1fff
--- /dev/null
+++ b/Data/Sys/GameSettings/R7F.ini
@@ -0,0 +1,27 @@
+# R7FEGD, R7FJGD, R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/R7FEGD.ini b/Data/Sys/GameSettings/R7FEGD.ini
deleted file mode 100644
index 051abc228e..0000000000
--- a/Data/Sys/GameSettings/R7FEGD.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7FEGD - FINAL FANTASY FABLES: Chocobo's Dungeon
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EnablePerPixelDepth = False
-
diff --git a/Data/Sys/GameSettings/R7FJGD.ini b/Data/Sys/GameSettings/R7FJGD.ini
deleted file mode 100644
index b59657c327..0000000000
--- a/Data/Sys/GameSettings/R7FJGD.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7FJGD - FINAL FANTASY FABLES: Chocobo's Dungeon
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EnablePerPixelDepth = False
-
diff --git a/Data/Sys/GameSettings/R7FPGD.ini b/Data/Sys/GameSettings/R7FPGD.ini
deleted file mode 100644
index 889862ae41..0000000000
--- a/Data/Sys/GameSettings/R7FPGD.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R7FPGD - FINAL FANTASY FABLES: Chocobo's Dungeon
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EnablePerPixelDepth = False
-
diff --git a/Data/Sys/GameSettings/R7G.ini b/Data/Sys/GameSettings/R7G.ini
new file mode 100644
index 0000000000..c999355755
--- /dev/null
+++ b/Data/Sys/GameSettings/R7G.ini
@@ -0,0 +1,32 @@
+# R7GEAF, R7GJAF, R7GPAF - DragonBall
+
+[Core]
+# Values set here will override the main Dolphin settings.
+AccurateNaNs = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/R7GEAF.ini b/Data/Sys/GameSettings/R7GEAF.ini
deleted file mode 100644
index 78d169b45e..0000000000
--- a/Data/Sys/GameSettings/R7GEAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7GEAF - DragonBall
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R7GJAF.ini b/Data/Sys/GameSettings/R7GJAF.ini
deleted file mode 100644
index 500472ac21..0000000000
--- a/Data/Sys/GameSettings/R7GJAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7GJAF - Dragon Ball Tenkaichi Daibouken
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R7GPAF.ini b/Data/Sys/GameSettings/R7GPAF.ini
deleted file mode 100644
index b838ed2d70..0000000000
--- a/Data/Sys/GameSettings/R7GPAF.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R7GPAF - DragonBall
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = For a real wiimote to work you need to disable the gamecube controller in the settings.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/R7P.ini b/Data/Sys/GameSettings/R7P.ini
new file mode 100644
index 0000000000..0b14211021
--- /dev/null
+++ b/Data/Sys/GameSettings/R7P.ini
@@ -0,0 +1,24 @@
+# R7PP01 - Punch Out
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/R7PE01.ini b/Data/Sys/GameSettings/R7PE01.ini
index 55e049a612..1597289e5c 100644
--- a/Data/Sys/GameSettings/R7PE01.ini
+++ b/Data/Sys/GameSettings/R7PE01.ini
@@ -1,12 +1,7 @@
 # R7PE01 - Punch Out
 
-[Core]
-# Values set here will override the main dolphin settings.
-
 [EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
+EmulationIssues = Disable "Use PAL60 (EuRGB60) mode" in the wii configuration tab for the game to run
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,12 +13,3 @@ $Patch
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R7PP01.ini b/Data/Sys/GameSettings/R7PP01.ini
index ee000f624d..44c898de48 100644
--- a/Data/Sys/GameSettings/R7PP01.ini
+++ b/Data/Sys/GameSettings/R7PP01.ini
@@ -1,13 +1,5 @@
 # R7PP01 - Punch Out
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,7 +10,3 @@ $Patch
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/R7X.ini b/Data/Sys/GameSettings/R7X.ini
new file mode 100644
index 0000000000..561e91216d
--- /dev/null
+++ b/Data/Sys/GameSettings/R7X.ini
@@ -0,0 +1,33 @@
+# R7XE69, R7XJ13, R7XP69 - Need for Speed: Nitro
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/R7XE69.ini b/Data/Sys/GameSettings/R7XE69.ini
deleted file mode 100644
index 2716340dc0..0000000000
--- a/Data/Sys/GameSettings/R7XE69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R7XE69 - Need for Speed: Nitro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R7XJ13.ini b/Data/Sys/GameSettings/R7XJ13.ini
deleted file mode 100644
index 2157886322..0000000000
--- a/Data/Sys/GameSettings/R7XJ13.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R7XJ13 - Need for Speed: Nitro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R7XP69.ini b/Data/Sys/GameSettings/R7XP69.ini
deleted file mode 100644
index 87ac033d71..0000000000
--- a/Data/Sys/GameSettings/R7XP69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R7XP69 - Need for Speed: Nitro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Videos are messed up, skip them.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R84.ini b/Data/Sys/GameSettings/R84.ini
new file mode 100644
index 0000000000..c5eb25680b
--- /dev/null
+++ b/Data/Sys/GameSettings/R84.ini
@@ -0,0 +1,30 @@
+# R84EE9, R84J99, R84P99 - Harvest Moon Tree Of Tranquility
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/R84EE9.ini b/Data/Sys/GameSettings/R84EE9.ini
deleted file mode 100644
index f58ab6d2fc..0000000000
--- a/Data/Sys/GameSettings/R84EE9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R84EE9 - Harvest Moon Tree Of Tranquility
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R84J99.ini b/Data/Sys/GameSettings/R84J99.ini
deleted file mode 100644
index 37e755acd9..0000000000
--- a/Data/Sys/GameSettings/R84J99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R84J99 - Bokujo for Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R84P99.ini b/Data/Sys/GameSettings/R84P99.ini
deleted file mode 100644
index 7586c1cfc0..0000000000
--- a/Data/Sys/GameSettings/R84P99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R84P99 - Harvest Moon Tree Of Tranquility
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/R8A.ini b/Data/Sys/GameSettings/R8A.ini
new file mode 100644
index 0000000000..ba11692ae3
--- /dev/null
+++ b/Data/Sys/GameSettings/R8A.ini
@@ -0,0 +1,33 @@
+# R8AE01, R8AJ01, R8AP01 - PokéPark Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/R8AE01.ini b/Data/Sys/GameSettings/R8AE01.ini
deleted file mode 100644
index 0946f768d0..0000000000
--- a/Data/Sys/GameSettings/R8AE01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R8AE01 - Pokepark Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8AJ01.ini b/Data/Sys/GameSettings/R8AJ01.ini
deleted file mode 100644
index 60e4c61b11..0000000000
--- a/Data/Sys/GameSettings/R8AJ01.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# R8AJ01 - Pokepark Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8AP01.ini b/Data/Sys/GameSettings/R8AP01.ini
deleted file mode 100644
index 6f0c34374f..0000000000
--- a/Data/Sys/GameSettings/R8AP01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# R8AP01 - PokePark Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8D.ini b/Data/Sys/GameSettings/R8D.ini
new file mode 100644
index 0000000000..2c4bfc6a2b
--- /dev/null
+++ b/Data/Sys/GameSettings/R8D.ini
@@ -0,0 +1,27 @@
+# R8DEA4, R8DJA4, R8DPA4 - Yu-Gi-Oh! 5D's: Duel Transer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/R8DEA4.ini b/Data/Sys/GameSettings/R8DEA4.ini
deleted file mode 100644
index dee7ceb6c8..0000000000
--- a/Data/Sys/GameSettings/R8DEA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DEA4 - Yu-Gi-Oh! 5D's: Duel Transer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R8DJA4.ini b/Data/Sys/GameSettings/R8DJA4.ini
deleted file mode 100644
index 607a8ad615..0000000000
--- a/Data/Sys/GameSettings/R8DJA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DJA4 - Yu-Gi-Oh! 5D's: Duel Transer
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R8DPA4.ini b/Data/Sys/GameSettings/R8DPA4.ini
deleted file mode 100644
index e877e7061a..0000000000
--- a/Data/Sys/GameSettings/R8DPA4.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8DPA4 - Yugioh Sim EU
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R8J.ini b/Data/Sys/GameSettings/R8J.ini
new file mode 100644
index 0000000000..910b4b6046
--- /dev/null
+++ b/Data/Sys/GameSettings/R8J.ini
@@ -0,0 +1,19 @@
+# R8JEWR, R8JPWR - Lord of the Rings: Aragorn's Quest
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini
deleted file mode 100644
index 22821c3bf6..0000000000
--- a/Data/Sys/GameSettings/R8JEWR.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R8JEWR - Lord of the Rings: Aragorn's Quest
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R8JPWR.ini b/Data/Sys/GameSettings/R8JPWR.ini
deleted file mode 100644
index 23acf7690d..0000000000
--- a/Data/Sys/GameSettings/R8JPWR.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# R8JPWR - Lord of the Rings: Aragorn's Quest
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/R8L.ini b/Data/Sys/GameSettings/R8L.ini
new file mode 100644
index 0000000000..46973a85f5
--- /dev/null
+++ b/Data/Sys/GameSettings/R8L.ini
@@ -0,0 +1,31 @@
+# R8LE20, R8LP7J - Chicken Blaster
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real XFB in order to be playable.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/R8LE20.ini b/Data/Sys/GameSettings/R8LE20.ini
deleted file mode 100644
index 9a872909ec..0000000000
--- a/Data/Sys/GameSettings/R8LE20.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R8LE20 - Chicken Blaster
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real XFB in order to be playable.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/R8LP7J.ini b/Data/Sys/GameSettings/R8LP7J.ini
deleted file mode 100644
index 4ebae4ce08..0000000000
--- a/Data/Sys/GameSettings/R8LP7J.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# R8LP7J - Chicken Blaster
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real XFB in order to be playable.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/R8P.ini b/Data/Sys/GameSettings/R8P.ini
new file mode 100644
index 0000000000..8cc62012b6
--- /dev/null
+++ b/Data/Sys/GameSettings/R8P.ini
@@ -0,0 +1,27 @@
+# R8PE01, R8PJ01, R8PK01, R8PP01 - SUPER PAPER MARIO
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Hacks]
+BBoxEnable = True
diff --git a/Data/Sys/GameSettings/R8PE01.ini b/Data/Sys/GameSettings/R8PE01.ini
deleted file mode 100644
index 8b7c4a006b..0000000000
--- a/Data/Sys/GameSettings/R8PE01.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# R8PE01 - SUPER PAPER MARIO
-
-[Core]
-# Values set here will override the main dolphin settings.
-AccurateFCMP = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-ProjectionHack = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8PJ01.ini b/Data/Sys/GameSettings/R8PJ01.ini
deleted file mode 100644
index d80dcb1ffc..0000000000
--- a/Data/Sys/GameSettings/R8PJ01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# R8PJ01 - SUPER PAPER MARIO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-ProjectionHack = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8PK01.ini b/Data/Sys/GameSettings/R8PK01.ini
deleted file mode 100644
index 6a72f77920..0000000000
--- a/Data/Sys/GameSettings/R8PK01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# R8PK01 - SUPER PAPER MARIO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-ProjectionHack = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8PP01.ini b/Data/Sys/GameSettings/R8PP01.ini
deleted file mode 100644
index b511c67c18..0000000000
--- a/Data/Sys/GameSettings/R8PP01.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# R8PP01 - SUPER PAPER MARIO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-UseBBox = True
-ProjectionHack = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/R8X.ini b/Data/Sys/GameSettings/R8X.ini
new file mode 100644
index 0000000000..8be8be46f4
--- /dev/null
+++ b/Data/Sys/GameSettings/R8X.ini
@@ -0,0 +1,27 @@
+# R8XE52 - Jurassic: The Hunted
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/R8XE52.ini b/Data/Sys/GameSettings/R8XE52.ini
deleted file mode 100644
index 0bcfc49571..0000000000
--- a/Data/Sys/GameSettings/R8XE52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R8XE52 - Jurassic: The Hunted
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R96.ini b/Data/Sys/GameSettings/R96.ini
new file mode 100644
index 0000000000..76c30532fe
--- /dev/null
+++ b/Data/Sys/GameSettings/R96.ini
@@ -0,0 +1,27 @@
+# R96EAF - KLONOA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Disable PAL60 (EuRGB60) mode in general settings-> wii tab for the game to run.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/R96EAF.ini b/Data/Sys/GameSettings/R96EAF.ini
deleted file mode 100644
index 8afd1bab3f..0000000000
--- a/Data/Sys/GameSettings/R96EAF.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R96EAF - KLONOA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Disable use EuRGB60 mode in general settings-> wii tab for the game to run (r7446)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/R9F.ini b/Data/Sys/GameSettings/R9F.ini
new file mode 100644
index 0000000000..0bcfc2cb52
--- /dev/null
+++ b/Data/Sys/GameSettings/R9F.ini
@@ -0,0 +1,19 @@
+# R9FP36 - F1 2009
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/R9FP36.ini b/Data/Sys/GameSettings/R9FP36.ini
deleted file mode 100644
index e5f408a36a..0000000000
--- a/Data/Sys/GameSettings/R9FP36.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# R9FP36 - F1 2009
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/R9I.ini b/Data/Sys/GameSettings/R9I.ini
new file mode 100644
index 0000000000..be4aa4e716
--- /dev/null
+++ b/Data/Sys/GameSettings/R9I.ini
@@ -0,0 +1,27 @@
+# R9IE01 - PIKMIN1 for Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/R9IE01.ini b/Data/Sys/GameSettings/R9IE01.ini
deleted file mode 100644
index f193f3632a..0000000000
--- a/Data/Sys/GameSettings/R9IE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# R9IE01 - PIKMIN1 for Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RB4.ini b/Data/Sys/GameSettings/RB4.ini
new file mode 100644
index 0000000000..a2a387f938
--- /dev/null
+++ b/Data/Sys/GameSettings/RB4.ini
@@ -0,0 +1,19 @@
+# RB4E08, RB4P08 - resident evil 4 Wii edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RB4E08.ini b/Data/Sys/GameSettings/RB4E08.ini
deleted file mode 100644
index 622ac46b6e..0000000000
--- a/Data/Sys/GameSettings/RB4E08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RB4E08 - resident evil 4 Wii edition (E)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = To avoid some texture errors, use the Opengl plugin(r6436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RB4P08.ini b/Data/Sys/GameSettings/RB4P08.ini
deleted file mode 100644
index c588dd9135..0000000000
--- a/Data/Sys/GameSettings/RB4P08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RB4P08 - resident evil 4 Wii edition (P)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RB7.ini b/Data/Sys/GameSettings/RB7.ini
new file mode 100644
index 0000000000..c667812250
--- /dev/null
+++ b/Data/Sys/GameSettings/RB7.ini
@@ -0,0 +1,19 @@
+# RB7E54, RB7P54 - Bully: Scholarship Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FastDiscSpeed = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RBB.ini b/Data/Sys/GameSettings/RBB.ini
new file mode 100644
index 0000000000..c6ea0e932d
--- /dev/null
+++ b/Data/Sys/GameSettings/RBB.ini
@@ -0,0 +1,33 @@
+# RBBE18, RBBJ18, RBBP99 - Bomberman Land
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RBBE18.ini b/Data/Sys/GameSettings/RBBE18.ini
deleted file mode 100644
index df8293a3a4..0000000000
--- a/Data/Sys/GameSettings/RBBE18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBBE18 - Bomberman Land
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RBBJ18.ini b/Data/Sys/GameSettings/RBBJ18.ini
deleted file mode 100644
index 1116862b8a..0000000000
--- a/Data/Sys/GameSettings/RBBJ18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBBJ18 - Bomberman Land
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RBBP99.ini b/Data/Sys/GameSettings/RBBP99.ini
deleted file mode 100644
index 147f51ae95..0000000000
--- a/Data/Sys/GameSettings/RBBP99.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBBP99 - Bomberman Land
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RBH.ini b/Data/Sys/GameSettings/RBH.ini
new file mode 100644
index 0000000000..5fc0d699ba
--- /dev/null
+++ b/Data/Sys/GameSettings/RBH.ini
@@ -0,0 +1,24 @@
+# RBHE08, RBHJ08, RBHP08 - Resident Evil Archives: Resident Evil Zero
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs efb from cpu access for proper lighting.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini
deleted file mode 100644
index f77361be1a..0000000000
--- a/Data/Sys/GameSettings/RBHE08.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBHE08 - Resident Evil Archives: Resident Evil Zero
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBHJ08.ini b/Data/Sys/GameSettings/RBHJ08.ini
deleted file mode 100644
index 6daba6c41f..0000000000
--- a/Data/Sys/GameSettings/RBHJ08.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBHJ08 - Biohazard 0
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini
deleted file mode 100644
index a91968a64d..0000000000
--- a/Data/Sys/GameSettings/RBHP08.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RBHP08 - Resident Evil Archives: Resident Evil Zero
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBI.ini b/Data/Sys/GameSettings/RBI.ini
new file mode 100644
index 0000000000..96369695df
--- /dev/null
+++ b/Data/Sys/GameSettings/RBI.ini
@@ -0,0 +1,29 @@
+# RBIEE9, RBIJ99, RBIP99 - Harvest Moon: Animal Parade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini
deleted file mode 100644
index 4200dfd2dd..0000000000
--- a/Data/Sys/GameSettings/RBIEE9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBIEE9 - Harvest Moon: Animal Parade
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini
deleted file mode 100644
index 419688b25d..0000000000
--- a/Data/Sys/GameSettings/RBIJ99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBIJ99 - Bokujou Monogatari Waku Waku Animal March
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini
deleted file mode 100644
index e3e567b157..0000000000
--- a/Data/Sys/GameSettings/RBIP99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RBIP99 - Harvest Moon: Animal Parade
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RBK.ini b/Data/Sys/GameSettings/RBK.ini
new file mode 100644
index 0000000000..04102c77d8
--- /dev/null
+++ b/Data/Sys/GameSettings/RBK.ini
@@ -0,0 +1,18 @@
+# RBKE69 - Boom Blox
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RBKE69.ini b/Data/Sys/GameSettings/RBKE69.ini
deleted file mode 100644
index 53fc92886e..0000000000
--- a/Data/Sys/GameSettings/RBKE69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RBKE69 - Boom Blox
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RBM.ini b/Data/Sys/GameSettings/RBM.ini
new file mode 100644
index 0000000000..b8453eafee
--- /dev/null
+++ b/Data/Sys/GameSettings/RBM.ini
@@ -0,0 +1,27 @@
+# RBME5G - Bust-a-Move BASH!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RBME5G.ini b/Data/Sys/GameSettings/RBME5G.ini
deleted file mode 100644
index 865a98716e..0000000000
--- a/Data/Sys/GameSettings/RBME5G.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBME5G - Bust-a-Move BASH!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBQ.ini b/Data/Sys/GameSettings/RBQ.ini
new file mode 100644
index 0000000000..f5b5167303
--- /dev/null
+++ b/Data/Sys/GameSettings/RBQ.ini
@@ -0,0 +1,18 @@
+# RBQPUG - Classic British Racing
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RBQPUG.ini b/Data/Sys/GameSettings/RBQPUG.ini
deleted file mode 100644
index e76526102b..0000000000
--- a/Data/Sys/GameSettings/RBQPUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RBQPUG - Classic British Racing
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RBR.ini b/Data/Sys/GameSettings/RBR.ini
new file mode 100644
index 0000000000..a68a212c24
--- /dev/null
+++ b/Data/Sys/GameSettings/RBR.ini
@@ -0,0 +1,30 @@
+# RBRE5G, RBRP5G, RBRX5G - Blast Works Build, Trade, Destroy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RBT.ini b/Data/Sys/GameSettings/RBT.ini
new file mode 100644
index 0000000000..cbdfbbb3a8
--- /dev/null
+++ b/Data/Sys/GameSettings/RBT.ini
@@ -0,0 +1,19 @@
+# RBTP8P - SEGA BASS FISHING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RBTP8P.ini b/Data/Sys/GameSettings/RBTP8P.ini
deleted file mode 100644
index 12b63f20e0..0000000000
--- a/Data/Sys/GameSettings/RBTP8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RBTP8P - SEGA BASS FISHING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Works Fine and with sound, but graphics glitches.Does not playable"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RBU.ini b/Data/Sys/GameSettings/RBU.ini
new file mode 100644
index 0000000000..fcc507a320
--- /dev/null
+++ b/Data/Sys/GameSettings/RBU.ini
@@ -0,0 +1,27 @@
+# RBUE08, RBUP08 - Resident Evil The Umbrella Chronicles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RBUE08.ini b/Data/Sys/GameSettings/RBUE08.ini
deleted file mode 100644
index 71056bb08f..0000000000
--- a/Data/Sys/GameSettings/RBUE08.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBUE08 - Resident Evil The Umbrella Chronicles
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBUP08.ini b/Data/Sys/GameSettings/RBUP08.ini
deleted file mode 100644
index 99d9507061..0000000000
--- a/Data/Sys/GameSettings/RBUP08.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBUP08 - Resident Evil The Umbrella Chronicles
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/RBW.ini b/Data/Sys/GameSettings/RBW.ini
new file mode 100644
index 0000000000..208bd1031a
--- /dev/null
+++ b/Data/Sys/GameSettings/RBW.ini
@@ -0,0 +1,19 @@
+# RBWE01, RBWJ01, RBWP01 - Battalion Wars 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RBWE01.ini b/Data/Sys/GameSettings/RBWE01.ini
deleted file mode 100644
index e39aab676c..0000000000
--- a/Data/Sys/GameSettings/RBWE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBWE01 - Battalion Wars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBWJ01.ini b/Data/Sys/GameSettings/RBWJ01.ini
deleted file mode 100644
index 6c916e617a..0000000000
--- a/Data/Sys/GameSettings/RBWJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBWJ01 - Totsugeki Famicom Wars vs.
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBWP01.ini b/Data/Sys/GameSettings/RBWP01.ini
deleted file mode 100644
index 9544d9869d..0000000000
--- a/Data/Sys/GameSettings/RBWP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RBWP01 - Battalion Wars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RBX.ini b/Data/Sys/GameSettings/RBX.ini
new file mode 100644
index 0000000000..b9a41c156a
--- /dev/null
+++ b/Data/Sys/GameSettings/RBX.ini
@@ -0,0 +1,18 @@
+# RBXJ8P - BLEACH VERSUS CRUSADE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RBXJ8P.ini b/Data/Sys/GameSettings/RBXJ8P.ini
deleted file mode 100644
index c934bf4204..0000000000
--- a/Data/Sys/GameSettings/RBXJ8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RBXJ8P - BLEACH VERSUS CRUSADE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RBZ.ini b/Data/Sys/GameSettings/RBZ.ini
new file mode 100644
index 0000000000..4488542913
--- /dev/null
+++ b/Data/Sys/GameSettings/RBZ.ini
@@ -0,0 +1,18 @@
+# RBZXUG - Billy the Wizard
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RBZXUG.ini b/Data/Sys/GameSettings/RBZXUG.ini
deleted file mode 100644
index a90c7ac936..0000000000
--- a/Data/Sys/GameSettings/RBZXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RBZXUG - Billy the Wizard
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RCJ.ini b/Data/Sys/GameSettings/RCJ.ini
new file mode 100644
index 0000000000..9ceae57878
--- /dev/null
+++ b/Data/Sys/GameSettings/RCJ.ini
@@ -0,0 +1,32 @@
+# RCJE8P, RCJP8P - The Conduit
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Enhancements]
+ForceFiltering = False
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RCJE8P.ini b/Data/Sys/GameSettings/RCJE8P.ini
index a3797f1b57..a3f61c506d 100644
--- a/Data/Sys/GameSettings/RCJE8P.ini
+++ b/Data/Sys/GameSettings/RCJE8P.ini
@@ -1,14 +1,5 @@
 # RCJE8P - The Conduit
 
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,23 +9,8 @@ EmulationStateId = 4
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
 [Speedhacks]
 0x80199d08=700
 0x8038b814=700
 0x80144be0=700
 0x80117934=700
-
diff --git a/Data/Sys/GameSettings/RCJP8P.ini b/Data/Sys/GameSettings/RCJP8P.ini
deleted file mode 100644
index 6f0db6cc30..0000000000
--- a/Data/Sys/GameSettings/RCJP8P.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RCJP8P - The Conduit
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RCK.ini b/Data/Sys/GameSettings/RCK.ini
new file mode 100644
index 0000000000..a3ac1989f4
--- /dev/null
+++ b/Data/Sys/GameSettings/RCK.ini
@@ -0,0 +1,19 @@
+# RCKPGN - Alan Hansen's Sports Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RCKPGN.ini b/Data/Sys/GameSettings/RCKPGN.ini
deleted file mode 100644
index 03354b7c8f..0000000000
--- a/Data/Sys/GameSettings/RCKPGN.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RCKPGN - Alan Hansen's Sports Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RCL.ini b/Data/Sys/GameSettings/RCL.ini
new file mode 100644
index 0000000000..fd3fbdb77f
--- /dev/null
+++ b/Data/Sys/GameSettings/RCL.ini
@@ -0,0 +1,25 @@
+# RCLE4Q, RCLP4Q - Chicken Little: Ace In Action
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/RCP.ini b/Data/Sys/GameSettings/RCP.ini
new file mode 100644
index 0000000000..c3effbc94f
--- /dev/null
+++ b/Data/Sys/GameSettings/RCP.ini
@@ -0,0 +1,19 @@
+# RCPE18 - KORORINPA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RCPE18.ini b/Data/Sys/GameSettings/RCPE18.ini
deleted file mode 100644
index b416f52a57..0000000000
--- a/Data/Sys/GameSettings/RCPE18.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RCPE18 - KORORINPA
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs TLBHack On
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RD2.ini b/Data/Sys/GameSettings/RD2.ini
new file mode 100644
index 0000000000..a0ce81c4a6
--- /dev/null
+++ b/Data/Sys/GameSettings/RD2.ini
@@ -0,0 +1,27 @@
+# RD2E41, RD2J41, RD2K41, RD2P41, RD2X41 - Red Steel 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs real wiimote and motion plus.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RD2E41.ini b/Data/Sys/GameSettings/RD2E41.ini
deleted file mode 100644
index 15f526fbf8..0000000000
--- a/Data/Sys/GameSettings/RD2E41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2E41 - Red Steel 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RD2J41.ini b/Data/Sys/GameSettings/RD2J41.ini
deleted file mode 100644
index cb9acb0333..0000000000
--- a/Data/Sys/GameSettings/RD2J41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2J41 - Red Steel 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RD2K41.ini b/Data/Sys/GameSettings/RD2K41.ini
deleted file mode 100644
index 14bec203fb..0000000000
--- a/Data/Sys/GameSettings/RD2K41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2K41 - Red Steel 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RD2P41.ini b/Data/Sys/GameSettings/RD2P41.ini
deleted file mode 100644
index 16d6f8d778..0000000000
--- a/Data/Sys/GameSettings/RD2P41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2P41 - Red Steel 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RD2X41.ini b/Data/Sys/GameSettings/RD2X41.ini
deleted file mode 100644
index 0a69b78eae..0000000000
--- a/Data/Sys/GameSettings/RD2X41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RD2X41 - Red Steel 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RDB.ini b/Data/Sys/GameSettings/RDB.ini
new file mode 100644
index 0000000000..6bfab2baad
--- /dev/null
+++ b/Data/Sys/GameSettings/RDB.ini
@@ -0,0 +1,30 @@
+# RDBPAF - Dragon Ball Z Budokai Tenkaichi 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RDBPAF.ini b/Data/Sys/GameSettings/RDBPAF.ini
deleted file mode 100644
index 82b5033e0e..0000000000
--- a/Data/Sys/GameSettings/RDBPAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RDBPAF - Dragon Ball Z Budokai Tenkaichi 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RDF.ini b/Data/Sys/GameSettings/RDF.ini
new file mode 100644
index 0000000000..677cf455b1
--- /dev/null
+++ b/Data/Sys/GameSettings/RDF.ini
@@ -0,0 +1,20 @@
+# RDFE41, RDFP41 - Shaun White Snowboarding: Road Trip
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RDFP41.ini b/Data/Sys/GameSettings/RDFP41.ini
deleted file mode 100644
index 94b21ba568..0000000000
--- a/Data/Sys/GameSettings/RDFP41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RDFP41 - Shaun White Snowboarding: Road Trip
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="It's Playable. But few problems in graphics and control.Full Sound"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDG.ini b/Data/Sys/GameSettings/RDG.ini
new file mode 100644
index 0000000000..d3459b31e8
--- /dev/null
+++ b/Data/Sys/GameSettings/RDG.ini
@@ -0,0 +1,19 @@
+# RDGPA4 - Castlevania Judgment
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RDGPA4.ini b/Data/Sys/GameSettings/RDGPA4.ini
deleted file mode 100644
index 93d24067ca..0000000000
--- a/Data/Sys/GameSettings/RDGPA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RDGPA4 - Castlevania Judgment
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDH.ini b/Data/Sys/GameSettings/RDH.ini
new file mode 100644
index 0000000000..5e2b9846d9
--- /dev/null
+++ b/Data/Sys/GameSettings/RDH.ini
@@ -0,0 +1,19 @@
+# RDHP78 - Destroy All Humans: Big Willy Unleashed
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RDHP78.ini b/Data/Sys/GameSettings/RDHP78.ini
deleted file mode 100644
index 5df20c4c18..0000000000
--- a/Data/Sys/GameSettings/RDHP78.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RDHP78 - Destroy All Humans: Big Willy Unleashed
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDI.ini b/Data/Sys/GameSettings/RDI.ini
new file mode 100644
index 0000000000..f4e60f7486
--- /dev/null
+++ b/Data/Sys/GameSettings/RDI.ini
@@ -0,0 +1,22 @@
+# RDIE41 - THE DOG ISLAND
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RDIE41.ini b/Data/Sys/GameSettings/RDIE41.ini
deleted file mode 100644
index fcbc94f693..0000000000
--- a/Data/Sys/GameSettings/RDIE41.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RDIE41 - THE DOG ISLAND
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RDK.ini b/Data/Sys/GameSettings/RDK.ini
new file mode 100644
index 0000000000..c68cf35c71
--- /dev/null
+++ b/Data/Sys/GameSettings/RDK.ini
@@ -0,0 +1,19 @@
+# RDKE01 - Donkey Kong: Barrel Blast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Bad sound
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RDKE01.ini b/Data/Sys/GameSettings/RDKE01.ini
deleted file mode 100644
index 1245c9c088..0000000000
--- a/Data/Sys/GameSettings/RDKE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RDKE01 - Donkey Kong: Barrel Blast
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Bad sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDQ.ini b/Data/Sys/GameSettings/RDQ.ini
new file mode 100644
index 0000000000..bea0d8ef0b
--- /dev/null
+++ b/Data/Sys/GameSettings/RDQ.ini
@@ -0,0 +1,26 @@
+# RDQEGD, RDQJGD - DRAGON QUEST SWORDS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/RDQEGD.ini b/Data/Sys/GameSettings/RDQEGD.ini
deleted file mode 100644
index 6b7916e78d..0000000000
--- a/Data/Sys/GameSettings/RDQEGD.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RDQEGD - DRAGON QUEST SWORDS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RDS.ini b/Data/Sys/GameSettings/RDS.ini
new file mode 100644
index 0000000000..fcf178613e
--- /dev/null
+++ b/Data/Sys/GameSettings/RDS.ini
@@ -0,0 +1,25 @@
+# RDSEAF, RDSJAF, RDSPAF - Dragon Ball Z Budokai Tenkaichi 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RDSE70.ini b/Data/Sys/GameSettings/RDSE70.ini
deleted file mode 100644
index 753702b3a4..0000000000
--- a/Data/Sys/GameSettings/RDSE70.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RDSE70 - Dragon Ball Z Budokai Tenkaichi 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RDSJAF.ini b/Data/Sys/GameSettings/RDSJAF.ini
deleted file mode 100644
index 4c96fd2539..0000000000
--- a/Data/Sys/GameSettings/RDSJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RDSJAF - Dragon Ball Z Sparking METEOR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RDSPAF.ini b/Data/Sys/GameSettings/RDSPAF.ini
deleted file mode 100644
index 426a3eb15f..0000000000
--- a/Data/Sys/GameSettings/RDSPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RDSPAF - Dragon Ball Z Budokai Tenkaichi 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RDV.ini b/Data/Sys/GameSettings/RDV.ini
new file mode 100644
index 0000000000..b805af29ce
--- /dev/null
+++ b/Data/Sys/GameSettings/RDV.ini
@@ -0,0 +1,19 @@
+# RDVE41 - Driver Parallel Lines
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = May be slow.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RDVE41.ini b/Data/Sys/GameSettings/RDVE41.ini
deleted file mode 100644
index 6f8626258b..0000000000
--- a/Data/Sys/GameSettings/RDVE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RDVE41 - Driver Parallel Lines
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = May be slow.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDX.ini b/Data/Sys/GameSettings/RDX.ini
new file mode 100644
index 0000000000..ab59f3f3c7
--- /dev/null
+++ b/Data/Sys/GameSettings/RDX.ini
@@ -0,0 +1,18 @@
+# RDXP18 - SPORTS ISLAND
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RDXP18.ini b/Data/Sys/GameSettings/RDXP18.ini
deleted file mode 100644
index 98e56140a3..0000000000
--- a/Data/Sys/GameSettings/RDXP18.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RDXP18 - SPORTS ISLAND
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RDZ.ini b/Data/Sys/GameSettings/RDZ.ini
new file mode 100644
index 0000000000..9210fd028f
--- /dev/null
+++ b/Data/Sys/GameSettings/RDZ.ini
@@ -0,0 +1,29 @@
+# RDZJ01, RDZP01 - Disaster
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RDZJ01.ini b/Data/Sys/GameSettings/RDZJ01.ini
deleted file mode 100644
index deb2063226..0000000000
--- a/Data/Sys/GameSettings/RDZJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RDZJ01 - Disaster
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RDZP01.ini b/Data/Sys/GameSettings/RDZP01.ini
deleted file mode 100644
index 8b94a717fe..0000000000
--- a/Data/Sys/GameSettings/RDZP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RDZP01 - Disaster
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RE4.ini b/Data/Sys/GameSettings/RE4.ini
new file mode 100644
index 0000000000..58d80ede8e
--- /dev/null
+++ b/Data/Sys/GameSettings/RE4.ini
@@ -0,0 +1,29 @@
+# RE4E08, RE4J08, RE4P08 - Resident Evil
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini
deleted file mode 100644
index 4e040299e7..0000000000
--- a/Data/Sys/GameSettings/RE4E08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RE4E08 - Resident Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini
deleted file mode 100644
index b707b54abb..0000000000
--- a/Data/Sys/GameSettings/RE4J08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RE4J08 - Biohazard
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini
deleted file mode 100644
index 7eeb359861..0000000000
--- a/Data/Sys/GameSettings/RE4P08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RE4P08 - Resident Evil
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RED.ini b/Data/Sys/GameSettings/RED.ini
new file mode 100644
index 0000000000..ccfe5adae6
--- /dev/null
+++ b/Data/Sys/GameSettings/RED.ini
@@ -0,0 +1,27 @@
+# REDE41, REDJ41, REDP41 - RedSteel NTSC
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Nunchuk doesn't work (both real and emulated).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/REDE41.ini b/Data/Sys/GameSettings/REDE41.ini
deleted file mode 100644
index 8f5399fc2d..0000000000
--- a/Data/Sys/GameSettings/REDE41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# REDE41 - RedSteel NTSC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Nunchuck doesn't work (both real and emulated).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/REDJ41.ini b/Data/Sys/GameSettings/REDJ41.ini
deleted file mode 100644
index 9916386167..0000000000
--- a/Data/Sys/GameSettings/REDJ41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# REDJ41 - RedSteel NTSC
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Nunchuck doesn't work (both real and emulated).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/REDP41.ini b/Data/Sys/GameSettings/REDP41.ini
deleted file mode 100644
index 65d5271d87..0000000000
--- a/Data/Sys/GameSettings/REDP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# REDP41 - RedSteel PAL
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Nunchuck doesn't work (both real and emulated).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RELJAB.ini b/Data/Sys/GameSettings/RELJAB.ini
index 08e0560eb5..2105748dc5 100644
--- a/Data/Sys/GameSettings/RELJAB.ini
+++ b/Data/Sys/GameSettings/RELJAB.ini
@@ -1,7 +1,7 @@
 # RELJAB - SegaBoot
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/RELS01.ini b/Data/Sys/GameSettings/RELS01.ini
deleted file mode 100644
index 32d3a27c07..0000000000
--- a/Data/Sys/GameSettings/RELS01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RELS01 - The Legend of Zelda: Collector's Edition(Majora's Mask)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Boots then hangs, stuck on nop opcode?"
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$loophack_ZOOT
-0x80683804:word:0x60000000
-$loophack_ZMM
-0x8068C324:word:0x60000000
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/REN.ini b/Data/Sys/GameSettings/REN.ini
new file mode 100644
index 0000000000..c6d31f78ed
--- /dev/null
+++ b/Data/Sys/GameSettings/REN.ini
@@ -0,0 +1,27 @@
+# RENE8P, RENJ8P, RENP8P - Sonic and the Black Knight
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/RENE8P.ini b/Data/Sys/GameSettings/RENE8P.ini
deleted file mode 100644
index 35086950ad..0000000000
--- a/Data/Sys/GameSettings/RENE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RENE8P - Sonic and the Black Knight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/RENJ8P.ini b/Data/Sys/GameSettings/RENJ8P.ini
deleted file mode 100644
index 4c51634ee0..0000000000
--- a/Data/Sys/GameSettings/RENJ8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RENJ8P - Sonic and the Black Knight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/RENP8P.ini b/Data/Sys/GameSettings/RENP8P.ini
deleted file mode 100644
index 7f92fa8505..0000000000
--- a/Data/Sys/GameSettings/RENP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RENP8P - Sonic and the Black Knight
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Very Darkness ingame
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.1
-
diff --git a/Data/Sys/GameSettings/REX.ini b/Data/Sys/GameSettings/REX.ini
new file mode 100644
index 0000000000..c530e4f854
--- /dev/null
+++ b/Data/Sys/GameSettings/REX.ini
@@ -0,0 +1,18 @@
+# REXP01 - Excite Truck
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/REXP01.ini b/Data/Sys/GameSettings/REXP01.ini
deleted file mode 100644
index 01db38c373..0000000000
--- a/Data/Sys/GameSettings/REXP01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# REXP01 - Excite Truck
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RF4.ini b/Data/Sys/GameSettings/RF4.ini
new file mode 100644
index 0000000000..13360f5eab
--- /dev/null
+++ b/Data/Sys/GameSettings/RF4.ini
@@ -0,0 +1,18 @@
+# RF4P6M - Super Fruitfall
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RF4P6M.ini b/Data/Sys/GameSettings/RF4P6M.ini
deleted file mode 100644
index bb6dea551a..0000000000
--- a/Data/Sys/GameSettings/RF4P6M.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RF4P6M - Super Fruitfall
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RF7.ini b/Data/Sys/GameSettings/RF7.ini
new file mode 100644
index 0000000000..1a4231b830
--- /dev/null
+++ b/Data/Sys/GameSettings/RF7.ini
@@ -0,0 +1,22 @@
+# RF7J08 - TATSUNOKO VS. CAPCOM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RF7J08.ini b/Data/Sys/GameSettings/RF7J08.ini
deleted file mode 100644
index 0e23a0ed09..0000000000
--- a/Data/Sys/GameSettings/RF7J08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RF7J08 - TATSUNOKO VS. CAPCOM
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RFB.ini b/Data/Sys/GameSettings/RFB.ini
new file mode 100644
index 0000000000..9843f142c3
--- /dev/null
+++ b/Data/Sys/GameSettings/RFB.ini
@@ -0,0 +1,30 @@
+# RFBE01, RFBJ01, RFBP01 - ENDLESS OCEAN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs efb to ram for photos to be developed.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/RFBE01.ini b/Data/Sys/GameSettings/RFBE01.ini
deleted file mode 100644
index a27bb18f4a..0000000000
--- a/Data/Sys/GameSettings/RFBE01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# RFBE01 - ENDLESS OCEAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs efb to ram for photos to be developed.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini
deleted file mode 100644
index 17df52e9bd..0000000000
--- a/Data/Sys/GameSettings/RFBJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# RFBJ01 - Forever Blue
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs efb to ram for photos to be developed.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini
deleted file mode 100644
index 097140e075..0000000000
--- a/Data/Sys/GameSettings/RFBP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# RFBP01 - ENDLESS OCEAN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs efb to ram for photos to be developed.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RFC.ini b/Data/Sys/GameSettings/RFC.ini
new file mode 100644
index 0000000000..f88e007af5
--- /dev/null
+++ b/Data/Sys/GameSettings/RFC.ini
@@ -0,0 +1,25 @@
+# RFCEGD, RFCJGD, RFCPGD - FFCC THE CRYSTAL BEARERS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Turn off "use panic handlers". Water glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RFCEGD.ini b/Data/Sys/GameSettings/RFCEGD.ini
deleted file mode 100644
index 85763baee1..0000000000
--- a/Data/Sys/GameSettings/RFCEGD.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RFCEGD - FFCC THE CRYSTAL BEARERS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFCJGD.ini b/Data/Sys/GameSettings/RFCJGD.ini
deleted file mode 100644
index 6d42d954a5..0000000000
--- a/Data/Sys/GameSettings/RFCJGD.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RFCJGD - FFCC THE CRYSTAL BEARERS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFCPGD.ini b/Data/Sys/GameSettings/RFCPGD.ini
deleted file mode 100644
index 39598d6f26..0000000000
--- a/Data/Sys/GameSettings/RFCPGD.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RFCPGD - FFCC THE CRYSTAL BEARERS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFE.ini b/Data/Sys/GameSettings/RFE.ini
new file mode 100644
index 0000000000..b36ea462c4
--- /dev/null
+++ b/Data/Sys/GameSettings/RFE.ini
@@ -0,0 +1,27 @@
+# RFEE01, RFEJ01, RFEP01 - FIRE EMBLEM 10
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RFEE01.ini b/Data/Sys/GameSettings/RFEE01.ini
deleted file mode 100644
index 088b09e10c..0000000000
--- a/Data/Sys/GameSettings/RFEE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RFEE01 - FIRE EMBLEM 10 USA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RFEJ01.ini b/Data/Sys/GameSettings/RFEJ01.ini
deleted file mode 100644
index db81c6cfa4..0000000000
--- a/Data/Sys/GameSettings/RFEJ01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RFEJ01 - Fire Emblem Akatsuki No Megami
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RFEP01.ini b/Data/Sys/GameSettings/RFEP01.ini
deleted file mode 100644
index c4e34f4c93..0000000000
--- a/Data/Sys/GameSettings/RFEP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RFEP01 - FIRE EMBLEM 10 EUR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Speedhacks]
-0x80006e00=800
-
diff --git a/Data/Sys/GameSettings/RFF.ini b/Data/Sys/GameSettings/RFF.ini
new file mode 100644
index 0000000000..a87d9e109e
--- /dev/null
+++ b/Data/Sys/GameSettings/RFF.ini
@@ -0,0 +1,31 @@
+# RFFEGD, RFFJGD, RFFPGD - FFCC EOT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs integral scaling for the black lines to disappear.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RFFEGD.ini b/Data/Sys/GameSettings/RFFEGD.ini
deleted file mode 100644
index 1a01e6afce..0000000000
--- a/Data/Sys/GameSettings/RFFEGD.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFFEGD - FFCC EOT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs integral scaling for the black lines to disappear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFFJGD.ini b/Data/Sys/GameSettings/RFFJGD.ini
deleted file mode 100644
index 76c522738f..0000000000
--- a/Data/Sys/GameSettings/RFFJGD.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFFJGD - FFCC EOT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs integral scaling for the black lines to disappear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFFPGD.ini b/Data/Sys/GameSettings/RFFPGD.ini
deleted file mode 100644
index 1227196af0..0000000000
--- a/Data/Sys/GameSettings/RFFPGD.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RFFPGD - FFCC EOT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs integral scaling for the black lines to disappear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFQ.ini b/Data/Sys/GameSettings/RFQ.ini
new file mode 100644
index 0000000000..c8f4c8692a
--- /dev/null
+++ b/Data/Sys/GameSettings/RFQ.ini
@@ -0,0 +1,25 @@
+# RFQP69 - FaceBreaker K.O. Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+Hack = 3
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RFQP69.ini b/Data/Sys/GameSettings/RFQP69.ini
deleted file mode 100644
index 3c56b49840..0000000000
--- a/Data/Sys/GameSettings/RFQP69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RFQP69 - FaceBreaker K.O. Party™
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-Hack = 3
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RFS.ini b/Data/Sys/GameSettings/RFS.ini
new file mode 100644
index 0000000000..e3e4e69f6c
--- /dev/null
+++ b/Data/Sys/GameSettings/RFS.ini
@@ -0,0 +1,27 @@
+# RFSEEB, RFSJ8P - Shiren The Wanderer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RFSEEB.ini b/Data/Sys/GameSettings/RFSEEB.ini
deleted file mode 100644
index 92c1f70a2a..0000000000
--- a/Data/Sys/GameSettings/RFSEEB.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RFSEEB - Shiren The Wanderer
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RFSJ8P.ini b/Data/Sys/GameSettings/RFSJ8P.ini
deleted file mode 100644
index 14c8dc811a..0000000000
--- a/Data/Sys/GameSettings/RFSJ8P.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# RFSJ8P - Fushigi No Dungeon: Furai No Shiren 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RG5.ini b/Data/Sys/GameSettings/RG5.ini
new file mode 100644
index 0000000000..ed0f1abdbc
--- /dev/null
+++ b/Data/Sys/GameSettings/RG5.ini
@@ -0,0 +1,19 @@
+# RG5PWR - Guinness World Records: The Video Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RG5PWR.ini b/Data/Sys/GameSettings/RG5PWR.ini
deleted file mode 100644
index be25d1340a..0000000000
--- a/Data/Sys/GameSettings/RG5PWR.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RG5PWR - Guinness World Records: The Video Game
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Need Projection before 945 - be activated"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RGA.ini b/Data/Sys/GameSettings/RGA.ini
new file mode 100644
index 0000000000..7475a44f85
--- /dev/null
+++ b/Data/Sys/GameSettings/RGA.ini
@@ -0,0 +1,19 @@
+# RGAE8P - Planet 51 Pyro
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RGAE8P.ini b/Data/Sys/GameSettings/RGAE8P.ini
deleted file mode 100644
index e2864bc07a..0000000000
--- a/Data/Sys/GameSettings/RGAE8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RGAE8P - Planet 51 Pyro
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RGH.ini b/Data/Sys/GameSettings/RGH.ini
new file mode 100644
index 0000000000..3a44383f6f
--- /dev/null
+++ b/Data/Sys/GameSettings/RGH.ini
@@ -0,0 +1,27 @@
+# RGHE52 - Guitar Hero III: Legends of Rock
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RGHE52.ini b/Data/Sys/GameSettings/RGHE52.ini
deleted file mode 100644
index a7883192a1..0000000000
--- a/Data/Sys/GameSettings/RGHE52.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RGHE52 - Sample Game Name
-
-[Core]
-# Values set here will override the main dolphin settings.
-FastDiscSpeed = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RGL.ini b/Data/Sys/GameSettings/RGL.ini
new file mode 100644
index 0000000000..c243b38cfa
--- /dev/null
+++ b/Data/Sys/GameSettings/RGL.ini
@@ -0,0 +1,22 @@
+# RGLE7D - gwgalaxieswii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RGLE7D.ini b/Data/Sys/GameSettings/RGLE7D.ini
deleted file mode 100644
index 74dc026536..0000000000
--- a/Data/Sys/GameSettings/RGLE7D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RGLE7D - gwgalaxieswii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RGQ.ini b/Data/Sys/GameSettings/RGQ.ini
new file mode 100644
index 0000000000..b7bab31ab3
--- /dev/null
+++ b/Data/Sys/GameSettings/RGQ.ini
@@ -0,0 +1,25 @@
+# RGQE70 - Ghostbusters
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 0
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Enhancements]
+ForceFiltering = False
+
diff --git a/Data/Sys/GameSettings/RGQE70.ini b/Data/Sys/GameSettings/RGQE70.ini
index 15954f207f..fcd04fb22b 100644
--- a/Data/Sys/GameSettings/RGQE70.ini
+++ b/Data/Sys/GameSettings/RGQE70.ini
@@ -1,13 +1,5 @@
 # RGQE70 - Ghostbusters
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,10 +10,3 @@ $crashfix
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/RGV.ini b/Data/Sys/GameSettings/RGV.ini
new file mode 100644
index 0000000000..e4c75033ad
--- /dev/null
+++ b/Data/Sys/GameSettings/RGV.ini
@@ -0,0 +1,22 @@
+# RGVP52 - Guitar Hero: Aerosmith
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RGVP52.ini b/Data/Sys/GameSettings/RGVP52.ini
deleted file mode 100644
index 8cd9ad8b8c..0000000000
--- a/Data/Sys/GameSettings/RGVP52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RGVP52 - Guitar Hero: Aerosmith
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RGW.ini b/Data/Sys/GameSettings/RGW.ini
new file mode 100644
index 0000000000..9ddb02d1e2
--- /dev/null
+++ b/Data/Sys/GameSettings/RGW.ini
@@ -0,0 +1,23 @@
+# RGWE41, RGWJ41, RGWP41, RGWX41 - Rabbids Go Home
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Efb to ram is needed for certain ingame functions but it will give a big speed hit.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RH2.ini b/Data/Sys/GameSettings/RH2.ini
new file mode 100644
index 0000000000..007a9e5275
--- /dev/null
+++ b/Data/Sys/GameSettings/RH2.ini
@@ -0,0 +1,19 @@
+# RH2P41 - Hell's Kicthen
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RH2P41.ini b/Data/Sys/GameSettings/RH2P41.ini
deleted file mode 100644
index ad1ff1c09d..0000000000
--- a/Data/Sys/GameSettings/RH2P41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RH2P41 - Hell's Kicthen
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RH8.ini b/Data/Sys/GameSettings/RH8.ini
new file mode 100644
index 0000000000..e7bcd1367d
--- /dev/null
+++ b/Data/Sys/GameSettings/RH8.ini
@@ -0,0 +1,31 @@
+# RH8E4F, RH8JEL, RH8P4F, RH8X4F - Tomb Raider Underworld
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/RH8E4F.ini b/Data/Sys/GameSettings/RH8E4F.ini
deleted file mode 100644
index 972bdb721a..0000000000
--- a/Data/Sys/GameSettings/RH8E4F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8E4F - Tomb Raider Underworld
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/RH8JEL.ini b/Data/Sys/GameSettings/RH8JEL.ini
deleted file mode 100644
index 9fd16df9b6..0000000000
--- a/Data/Sys/GameSettings/RH8JEL.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8JEL - Tomb Raider Underworld
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/RH8P4F.ini b/Data/Sys/GameSettings/RH8P4F.ini
deleted file mode 100644
index 1e8b87c2e5..0000000000
--- a/Data/Sys/GameSettings/RH8P4F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8P4F - Tomb Raider Underworld
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/RH8X4F.ini b/Data/Sys/GameSettings/RH8X4F.ini
deleted file mode 100644
index ea5f006619..0000000000
--- a/Data/Sys/GameSettings/RH8X4F.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RH8X4F - Tomb Raider Underworld
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real Xfb for the videos to display.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/RHA.ini b/Data/Sys/GameSettings/RHA.ini
new file mode 100644
index 0000000000..c8e6201149
--- /dev/null
+++ b/Data/Sys/GameSettings/RHA.ini
@@ -0,0 +1,29 @@
+# RHAE01, RHAJ01, RHAK01, RHAP01, RHAW01 - Wii Play
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini
deleted file mode 100644
index 7d5bf8ccc7..0000000000
--- a/Data/Sys/GameSettings/RHAE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHAE01 - Wii Play
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini
deleted file mode 100644
index 33cf231885..0000000000
--- a/Data/Sys/GameSettings/RHAJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHAJ01 - Hajimete No Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini
deleted file mode 100644
index 26f966d304..0000000000
--- a/Data/Sys/GameSettings/RHAK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHAK01 - Wii Play
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini
deleted file mode 100644
index 2cde1b1023..0000000000
--- a/Data/Sys/GameSettings/RHAP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHAP01 - PARTY PACK for REVOLUTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini
deleted file mode 100644
index d3b0e5b970..0000000000
--- a/Data/Sys/GameSettings/RHAW01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHAW01 - Wii Play
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHD.ini b/Data/Sys/GameSettings/RHD.ini
new file mode 100644
index 0000000000..6806679b0f
--- /dev/null
+++ b/Data/Sys/GameSettings/RHD.ini
@@ -0,0 +1,27 @@
+# RHDE8P, RHDJ8P, RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RHDE8P.ini b/Data/Sys/GameSettings/RHDE8P.ini
deleted file mode 100644
index 93ea608c9d..0000000000
--- a/Data/Sys/GameSettings/RHDE8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RHDJ8P.ini b/Data/Sys/GameSettings/RHDJ8P.ini
deleted file mode 100644
index ef3806f6d5..0000000000
--- a/Data/Sys/GameSettings/RHDJ8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RHDP8P.ini b/Data/Sys/GameSettings/RHDP8P.ini
deleted file mode 100644
index 4c94223003..0000000000
--- a/Data/Sys/GameSettings/RHDP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RHM.ini b/Data/Sys/GameSettings/RHM.ini
new file mode 100644
index 0000000000..9b3452f8ad
--- /dev/null
+++ b/Data/Sys/GameSettings/RHM.ini
@@ -0,0 +1,29 @@
+# RHMEE9, RHMP99 - Harvest Moon: Magical Melody
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini
deleted file mode 100644
index 71cb3e898d..0000000000
--- a/Data/Sys/GameSettings/RHMEE9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHMEE9 - Harvest Moon: Magical Melody
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini
deleted file mode 100644
index d278ff1ffc..0000000000
--- a/Data/Sys/GameSettings/RHMP99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RHMP99 - Harvest Moon: Magical Melody
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RHO.ini b/Data/Sys/GameSettings/RHO.ini
new file mode 100644
index 0000000000..f80e937c69
--- /dev/null
+++ b/Data/Sys/GameSettings/RHO.ini
@@ -0,0 +1,20 @@
+# RHOE8P, RHOJ8P, RHOP8P - House Of The Dead: OVERKILL
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RHOE8P.ini b/Data/Sys/GameSettings/RHOE8P.ini
deleted file mode 100644
index 8d8190877a..0000000000
--- a/Data/Sys/GameSettings/RHOE8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RHOE8P - House Of The Dead: OVERKILL
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RHOJ8P.ini b/Data/Sys/GameSettings/RHOJ8P.ini
deleted file mode 100644
index bdef300ddf..0000000000
--- a/Data/Sys/GameSettings/RHOJ8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RHOJ8P - House Of The Dead: OVERKILL
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RHOP8P.ini b/Data/Sys/GameSettings/RHOP8P.ini
deleted file mode 100644
index fa314e84e4..0000000000
--- a/Data/Sys/GameSettings/RHOP8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RHOP8P - House Of The Dead: OVERKILL
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RHT.ini b/Data/Sys/GameSettings/RHT.ini
new file mode 100644
index 0000000000..19277e75d4
--- /dev/null
+++ b/Data/Sys/GameSettings/RHT.ini
@@ -0,0 +1,22 @@
+# RHTP54 - Manhunt 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RHTP54.ini b/Data/Sys/GameSettings/RHTP54.ini
deleted file mode 100644
index ecee73786b..0000000000
--- a/Data/Sys/GameSettings/RHTP54.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RHTP54 - Manhunt 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RHU.ini b/Data/Sys/GameSettings/RHU.ini
new file mode 100644
index 0000000000..d0da318de6
--- /dev/null
+++ b/Data/Sys/GameSettings/RHU.ini
@@ -0,0 +1,19 @@
+# RHUP7J - Skate City Heroes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RHUP7J.ini b/Data/Sys/GameSettings/RHUP7J.ini
deleted file mode 100644
index 47ab87d7af..0000000000
--- a/Data/Sys/GameSettings/RHUP7J.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RHUP7J - Skate City Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RIB.ini b/Data/Sys/GameSettings/RIB.ini
new file mode 100644
index 0000000000..48c6ebfcb8
--- /dev/null
+++ b/Data/Sys/GameSettings/RIB.ini
@@ -0,0 +1,18 @@
+# RIBPKM - Igor:The Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RIBPKM.ini b/Data/Sys/GameSettings/RIBPKM.ini
deleted file mode 100644
index 2d11397269..0000000000
--- a/Data/Sys/GameSettings/RIBPKM.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RIBPKM - Igor:The Game
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RIH.ini b/Data/Sys/GameSettings/RIH.ini
new file mode 100644
index 0000000000..68eaf60403
--- /dev/null
+++ b/Data/Sys/GameSettings/RIH.ini
@@ -0,0 +1,19 @@
+# RIHP8P - TheIncredibleHulk
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RIHP8P.ini b/Data/Sys/GameSettings/RIHP8P.ini
deleted file mode 100644
index 9d3ea7e16f..0000000000
--- a/Data/Sys/GameSettings/RIHP8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RIHP8P - TheIncredibleHulk
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RIJ.ini b/Data/Sys/GameSettings/RIJ.ini
new file mode 100644
index 0000000000..77cd40dc68
--- /dev/null
+++ b/Data/Sys/GameSettings/RIJ.ini
@@ -0,0 +1,22 @@
+# RIJE69 - GIJoe
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RIJE69.ini b/Data/Sys/GameSettings/RIJE69.ini
deleted file mode 100644
index 9750bc4d1c..0000000000
--- a/Data/Sys/GameSettings/RIJE69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RIJE69 - GIJoe
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RIN.ini b/Data/Sys/GameSettings/RIN.ini
new file mode 100644
index 0000000000..df6254834d
--- /dev/null
+++ b/Data/Sys/GameSettings/RIN.ini
@@ -0,0 +1,19 @@
+# RINE08, RINP08 - DEADRISING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RINE08.ini b/Data/Sys/GameSettings/RINE08.ini
deleted file mode 100644
index e6bf0a9c95..0000000000
--- a/Data/Sys/GameSettings/RINE08.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RINE08 - DEADRISING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RINP08.ini b/Data/Sys/GameSettings/RINP08.ini
deleted file mode 100644
index 9ce49b6a67..0000000000
--- a/Data/Sys/GameSettings/RINP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RINP08 - DEADRISING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Can't load saves
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RIP.ini b/Data/Sys/GameSettings/RIP.ini
new file mode 100644
index 0000000000..1f1844279c
--- /dev/null
+++ b/Data/Sys/GameSettings/RIP.ini
@@ -0,0 +1,25 @@
+# RIPEAF, RIPJAF, RIPPAF - ONEPIECE UNLIMITED ADVENTURE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RIPEAF.ini b/Data/Sys/GameSettings/RIPEAF.ini
deleted file mode 100644
index 94542525e5..0000000000
--- a/Data/Sys/GameSettings/RIPEAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPEAF - ONEPIECE UNLIMITED ADVENTURE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIPJAF.ini b/Data/Sys/GameSettings/RIPJAF.ini
deleted file mode 100644
index 166bbb7195..0000000000
--- a/Data/Sys/GameSettings/RIPJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPJAF - ONEPIECE UNLIMITED ADVENTURE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIPPAF.ini b/Data/Sys/GameSettings/RIPPAF.ini
deleted file mode 100644
index f03e75294a..0000000000
--- a/Data/Sys/GameSettings/RIPPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIPPAF - ONEPIECE UNLIMITED ADVENTURE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIU.ini b/Data/Sys/GameSettings/RIU.ini
new file mode 100644
index 0000000000..b5efbb7fed
--- /dev/null
+++ b/Data/Sys/GameSettings/RIU.ini
@@ -0,0 +1,25 @@
+# RIUJAF, RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RIUJAF.ini b/Data/Sys/GameSettings/RIUJAF.ini
deleted file mode 100644
index 2d2b657b0c..0000000000
--- a/Data/Sys/GameSettings/RIUJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIUPAF.ini b/Data/Sys/GameSettings/RIUPAF.ini
deleted file mode 100644
index d963186f73..0000000000
--- a/Data/Sys/GameSettings/RIUPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RIUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RIV.ini b/Data/Sys/GameSettings/RIV.ini
new file mode 100644
index 0000000000..77b609a7c5
--- /dev/null
+++ b/Data/Sys/GameSettings/RIV.ini
@@ -0,0 +1,22 @@
+# RIVEXJ - Kiwi
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RIVEXJ.ini b/Data/Sys/GameSettings/RIVEXJ.ini
deleted file mode 100644
index bb327a0e3a..0000000000
--- a/Data/Sys/GameSettings/RIVEXJ.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RIVEXJ - Kiwi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RJ3.ini b/Data/Sys/GameSettings/RJ3.ini
new file mode 100644
index 0000000000..e41ed2b158
--- /dev/null
+++ b/Data/Sys/GameSettings/RJ3.ini
@@ -0,0 +1,18 @@
+# RJ3P7J - Jeep Thrills
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RJ3P7J.ini b/Data/Sys/GameSettings/RJ3P7J.ini
deleted file mode 100644
index 76c6f853c1..0000000000
--- a/Data/Sys/GameSettings/RJ3P7J.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RJ3P7J - JeepŽ Thrills
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RJA.ini b/Data/Sys/GameSettings/RJA.ini
new file mode 100644
index 0000000000..323595db15
--- /dev/null
+++ b/Data/Sys/GameSettings/RJA.ini
@@ -0,0 +1,19 @@
+# RJAP52 - cod5wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RJAP52.ini b/Data/Sys/GameSettings/RJAP52.ini
deleted file mode 100644
index a834e44a17..0000000000
--- a/Data/Sys/GameSettings/RJAP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RJAP52 - cod5wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RJC.ini b/Data/Sys/GameSettings/RJC.ini
new file mode 100644
index 0000000000..c45a9023b6
--- /dev/null
+++ b/Data/Sys/GameSettings/RJC.ini
@@ -0,0 +1,19 @@
+# RJCP52 - World Championship Offroad Racing (Baja 1000)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+Issues="Darkening sometimes, but playable.Buggy and maybe Slowly on not faster machines"
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RJCP52.ini b/Data/Sys/GameSettings/RJCP52.ini
deleted file mode 100644
index a40f4a69a1..0000000000
--- a/Data/Sys/GameSettings/RJCP52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RJCP52 - World Championship Offroad Racing (Baja 1000)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Darkening sometimes, but playable.Buggy and maybe Slowly on not faster machines"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RJS.ini b/Data/Sys/GameSettings/RJS.ini
new file mode 100644
index 0000000000..cc88d59fb5
--- /dev/null
+++ b/Data/Sys/GameSettings/RJS.ini
@@ -0,0 +1,18 @@
+# RJSXUG - Kawasaki Jet Ski
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RJSXUG.ini b/Data/Sys/GameSettings/RJSXUG.ini
deleted file mode 100644
index 29a819a419..0000000000
--- a/Data/Sys/GameSettings/RJSXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RJSXUG - Kawasaki Jet Ski
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RK2.ini b/Data/Sys/GameSettings/RK2.ini
new file mode 100644
index 0000000000..af37944665
--- /dev/null
+++ b/Data/Sys/GameSettings/RK2.ini
@@ -0,0 +1,25 @@
+# RK2EEB, RK2JEB, RK2P01 - TRAUMA CENTER NEW BLOOD
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RK2EEB.ini b/Data/Sys/GameSettings/RK2EEB.ini
deleted file mode 100644
index d5cea3b078..0000000000
--- a/Data/Sys/GameSettings/RK2EEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RK2EEB - TRAUMA CENTER NEW BLOOD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RK2JEB.ini b/Data/Sys/GameSettings/RK2JEB.ini
deleted file mode 100644
index 43838bb93d..0000000000
--- a/Data/Sys/GameSettings/RK2JEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RK2JEB - TRAUMA CENTER NEW BLOOD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RK2P01.ini b/Data/Sys/GameSettings/RK2P01.ini
deleted file mode 100644
index 00d58611c0..0000000000
--- a/Data/Sys/GameSettings/RK2P01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RK2P01 - TRAUMA CENTER NEW BLOOD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RK5.ini b/Data/Sys/GameSettings/RK5.ini
new file mode 100644
index 0000000000..397eab7351
--- /dev/null
+++ b/Data/Sys/GameSettings/RK5.ini
@@ -0,0 +1,27 @@
+# RK5E01 - fluff
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RK5E01.ini b/Data/Sys/GameSettings/RK5E01.ini
deleted file mode 100644
index 94af6cb290..0000000000
--- a/Data/Sys/GameSettings/RK5E01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RK5E01 - fluff
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RKD.ini b/Data/Sys/GameSettings/RKD.ini
new file mode 100644
index 0000000000..8d3937173b
--- /dev/null
+++ b/Data/Sys/GameSettings/RKD.ini
@@ -0,0 +1,25 @@
+# RKDEEB, RKDJEB, RKDP01, RKDPEB - Trauma Center SO
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RKDEEB.ini b/Data/Sys/GameSettings/RKDEEB.ini
deleted file mode 100644
index 9bf02681ec..0000000000
--- a/Data/Sys/GameSettings/RKDEEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RKDEEB - Trauma Center SO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RKDJEB.ini b/Data/Sys/GameSettings/RKDJEB.ini
deleted file mode 100644
index 7d30b0cb9f..0000000000
--- a/Data/Sys/GameSettings/RKDJEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RKDJEB - Trauma Center SO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RKDP01.ini b/Data/Sys/GameSettings/RKDP01.ini
deleted file mode 100644
index 072d9ac478..0000000000
--- a/Data/Sys/GameSettings/RKDP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RKDP01 - Caduceus Z
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RKDPEB.ini b/Data/Sys/GameSettings/RKDPEB.ini
deleted file mode 100644
index d2fae09fb2..0000000000
--- a/Data/Sys/GameSettings/RKDPEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RKDPEB - Trauma Center SO
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RKI.ini b/Data/Sys/GameSettings/RKI.ini
new file mode 100644
index 0000000000..24ae734e74
--- /dev/null
+++ b/Data/Sys/GameSettings/RKI.ini
@@ -0,0 +1,18 @@
+# RKIPUG - Kidz Sports Icehockey
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RKIPUG.ini b/Data/Sys/GameSettings/RKIPUG.ini
deleted file mode 100644
index 69a9e42681..0000000000
--- a/Data/Sys/GameSettings/RKIPUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RKIPUG - Kidz Sports Icehockey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RKM.ini b/Data/Sys/GameSettings/RKM.ini
new file mode 100644
index 0000000000..931d684b3a
--- /dev/null
+++ b/Data/Sys/GameSettings/RKM.ini
@@ -0,0 +1,18 @@
+# RKME5D, RKMP5D - Mortal Kombat: Armageddon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RKMP5D.ini b/Data/Sys/GameSettings/RKMP5D.ini
deleted file mode 100644
index 61c98d3934..0000000000
--- a/Data/Sys/GameSettings/RKMP5D.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RKMP5D - Armageddon
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RKS.ini b/Data/Sys/GameSettings/RKS.ini
new file mode 100644
index 0000000000..385d2f7f6c
--- /dev/null
+++ b/Data/Sys/GameSettings/RKS.ini
@@ -0,0 +1,18 @@
+# RKSPUG - Kidz Sports Basketball
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RKSPUG.ini b/Data/Sys/GameSettings/RKSPUG.ini
deleted file mode 100644
index f81f42e769..0000000000
--- a/Data/Sys/GameSettings/RKSPUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RKSPUG - Kidz Sports Basketball
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RLB.ini b/Data/Sys/GameSettings/RLB.ini
new file mode 100644
index 0000000000..eebe0e8af5
--- /dev/null
+++ b/Data/Sys/GameSettings/RLB.ini
@@ -0,0 +1,27 @@
+# RLBEWR - LEGO Batman
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RLBEWR.ini b/Data/Sys/GameSettings/RLBEWR.ini
deleted file mode 100644
index fa3f2351e9..0000000000
--- a/Data/Sys/GameSettings/RLBEWR.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLBEWR - LEGO Batman
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RLE.ini b/Data/Sys/GameSettings/RLE.ini
new file mode 100644
index 0000000000..866625c997
--- /dev/null
+++ b/Data/Sys/GameSettings/RLE.ini
@@ -0,0 +1,19 @@
+# RLEEFS - Ten Pin Alley 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RLEEFS.ini b/Data/Sys/GameSettings/RLEEFS.ini
deleted file mode 100644
index d4a47a0068..0000000000
--- a/Data/Sys/GameSettings/RLEEFS.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RLEEFS - Ten Pin Alley 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-Issues="Needs Projection Before to 945 to see graphics.Slow but Fully playable!"
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RLG.ini b/Data/Sys/GameSettings/RLG.ini
new file mode 100644
index 0000000000..100515dbfa
--- /dev/null
+++ b/Data/Sys/GameSettings/RLG.ini
@@ -0,0 +1,27 @@
+# RLGE64, RLGJ52, RLGP64 - LEGO Star Wars The Complete Saga
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RLGE64.ini b/Data/Sys/GameSettings/RLGE64.ini
deleted file mode 100644
index 897b993ee6..0000000000
--- a/Data/Sys/GameSettings/RLGE64.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGE64 - LEGO Star Wars The Complete Saga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RLGJ52.ini b/Data/Sys/GameSettings/RLGJ52.ini
deleted file mode 100644
index 5eb7a5744c..0000000000
--- a/Data/Sys/GameSettings/RLGJ52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGJ52 - LEGO Star Wars The Complete Saga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RLGP64.ini b/Data/Sys/GameSettings/RLGP64.ini
deleted file mode 100644
index a0c73dfd03..0000000000
--- a/Data/Sys/GameSettings/RLGP64.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RLGP64 - LEGO Star Wars The Complete Saga
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RLJ.ini b/Data/Sys/GameSettings/RLJ.ini
new file mode 100644
index 0000000000..220ff28fc0
--- /dev/null
+++ b/Data/Sys/GameSettings/RLJ.ini
@@ -0,0 +1,22 @@
+# RLJPKM - Line Rider Freestyle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RLJPKM.ini b/Data/Sys/GameSettings/RLJPKM.ini
deleted file mode 100644
index 81beded41b..0000000000
--- a/Data/Sys/GameSettings/RLJPKM.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RLJPKM - Line Rider Freestyle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RLS.ini b/Data/Sys/GameSettings/RLS.ini
new file mode 100644
index 0000000000..d66ffe4512
--- /dev/null
+++ b/Data/Sys/GameSettings/RLS.ini
@@ -0,0 +1,27 @@
+# RLSE8P - Alien Syndrome
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RLX.ini b/Data/Sys/GameSettings/RLX.ini
new file mode 100644
index 0000000000..95a8f1332b
--- /dev/null
+++ b/Data/Sys/GameSettings/RLX.ini
@@ -0,0 +1,19 @@
+# RLXEMJ - LUXOR: Pharaoh's Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RLXEMJ.ini b/Data/Sys/GameSettings/RLXEMJ.ini
deleted file mode 100644
index fbfeda997a..0000000000
--- a/Data/Sys/GameSettings/RLXEMJ.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RLXEMJ - LUXOR: Pharaoh's Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RM2.ini b/Data/Sys/GameSettings/RM2.ini
new file mode 100644
index 0000000000..9ff08220ed
--- /dev/null
+++ b/Data/Sys/GameSettings/RM2.ini
@@ -0,0 +1,19 @@
+# RM2E69 - Medal of Honor Heroes 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Freeze on wiimote screen
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RM2E69.ini b/Data/Sys/GameSettings/RM2E69.ini
deleted file mode 100644
index 7aa1fad958..0000000000
--- a/Data/Sys/GameSettings/RM2E69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RM2E69 - Medal of Honor Heroes™ 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Freeze on wiimote screen
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RM3.ini b/Data/Sys/GameSettings/RM3.ini
new file mode 100644
index 0000000000..a33b6a9c22
--- /dev/null
+++ b/Data/Sys/GameSettings/RM3.ini
@@ -0,0 +1,32 @@
+# RM3E01, RM3J01, RM3P01 - Metroid Prime 3: Corruption
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RM3E01.ini b/Data/Sys/GameSettings/RM3E01.ini
deleted file mode 100644
index c95b3d00d4..0000000000
--- a/Data/Sys/GameSettings/RM3E01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM3E01 - Metroid Prime 3: Corruption
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RM3J01.ini b/Data/Sys/GameSettings/RM3J01.ini
deleted file mode 100644
index 2e06a5b0bf..0000000000
--- a/Data/Sys/GameSettings/RM3J01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RM3J01 - Metroid Prime 3: Corruption
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RM3P01.ini b/Data/Sys/GameSettings/RM3P01.ini
index bcee374ed1..f710d4c024 100644
--- a/Data/Sys/GameSettings/RM3P01.ini
+++ b/Data/Sys/GameSettings/RM3P01.ini
@@ -1,27 +1,13 @@
 # RM3P01 - Metroid Prime 3: Corruption
 
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
+
 [OnFrame]
+# Add memory patches to be applied every frame here.
+
 [ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
+# Add action replay cheats here.
+
 [Speedhacks]
 0x804e8b20=600
-
diff --git a/Data/Sys/GameSettings/RM6.ini b/Data/Sys/GameSettings/RM6.ini
new file mode 100644
index 0000000000..c011c13edd
--- /dev/null
+++ b/Data/Sys/GameSettings/RM6.ini
@@ -0,0 +1,27 @@
+# RM6EEB - BAROQUE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RM6EEB.ini b/Data/Sys/GameSettings/RM6EEB.ini
deleted file mode 100644
index 60933c75ec..0000000000
--- a/Data/Sys/GameSettings/RM6EEB.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RM6EEB - BAROQUE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RM8.ini b/Data/Sys/GameSettings/RM8.ini
new file mode 100644
index 0000000000..81a9280b7d
--- /dev/null
+++ b/Data/Sys/GameSettings/RM8.ini
@@ -0,0 +1,22 @@
+# RM8E01, RM8J01, RM8K01, RM8P01 - Mario Party 8
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Enhancements]
+ForceFiltering = False
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini
deleted file mode 100644
index 608c88ae1d..0000000000
--- a/Data/Sys/GameSettings/RM8E01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RM8E01 - Mario Party 8
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Direct 3d9 has issues with paint minigames.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
diff --git a/Data/Sys/GameSettings/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini
deleted file mode 100644
index 3c0fc16378..0000000000
--- a/Data/Sys/GameSettings/RM8J01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RM8J01 - Mario Party 8
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Direct 3d9 has issues with paint minigames.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
diff --git a/Data/Sys/GameSettings/RM8K01.ini b/Data/Sys/GameSettings/RM8K01.ini
deleted file mode 100644
index eca45bf7b7..0000000000
--- a/Data/Sys/GameSettings/RM8K01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RM8K01 - Mario Party 8
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Direct 3d9 has issues with paint minigames.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
diff --git a/Data/Sys/GameSettings/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini
deleted file mode 100644
index 1d2ecd582c..0000000000
--- a/Data/Sys/GameSettings/RM8P01.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# RM8P01 - Mario Party 8
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Direct 3d9 has issues with paint minigames.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-ForceFiltering = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-DlistCachingEnable = False
diff --git a/Data/Sys/GameSettings/RMA.ini b/Data/Sys/GameSettings/RMA.ini
new file mode 100644
index 0000000000..603bd3560a
--- /dev/null
+++ b/Data/Sys/GameSettings/RMA.ini
@@ -0,0 +1,19 @@
+# RMAE01, RMAP01 - MarioTennisGC(Wii Version)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Starts in tournament mode
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RMAE01.ini b/Data/Sys/GameSettings/RMAE01.ini
deleted file mode 100644
index b92661c17a..0000000000
--- a/Data/Sys/GameSettings/RMAE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RMAE01 - MarioTennisGC(Wii Version)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Starts in tournament mode
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RMAP01.ini b/Data/Sys/GameSettings/RMAP01.ini
deleted file mode 100644
index b16d110eab..0000000000
--- a/Data/Sys/GameSettings/RMAP01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RMAP01 - MarioTennisGC(Wii Version)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Starts in tournament mode
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RMC.ini b/Data/Sys/GameSettings/RMC.ini
new file mode 100644
index 0000000000..6049587f4e
--- /dev/null
+++ b/Data/Sys/GameSettings/RMC.ini
@@ -0,0 +1,30 @@
+# RMCE01, RMCJ01, RMCK01, RMCP01 - Mario Kart Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RMCE01.ini b/Data/Sys/GameSettings/RMCE01.ini
deleted file mode 100644
index 282bb9385e..0000000000
--- a/Data/Sys/GameSettings/RMCE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCE01 - Mario Kart Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCJ01.ini b/Data/Sys/GameSettings/RMCJ01.ini
deleted file mode 100644
index d16270c912..0000000000
--- a/Data/Sys/GameSettings/RMCJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCJ01 - Mario Kart Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCK01.ini b/Data/Sys/GameSettings/RMCK01.ini
deleted file mode 100644
index a3395b206a..0000000000
--- a/Data/Sys/GameSettings/RMCK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCK01 - Mario Kart Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMCP01.ini b/Data/Sys/GameSettings/RMCP01.ini
deleted file mode 100644
index c2240f996b..0000000000
--- a/Data/Sys/GameSettings/RMCP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMCP01 - Mario Kart Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RMG.ini b/Data/Sys/GameSettings/RMG.ini
new file mode 100644
index 0000000000..58554d6d9d
--- /dev/null
+++ b/Data/Sys/GameSettings/RMG.ini
@@ -0,0 +1,29 @@
+# RMGE01, RMGJ01, RMGK01, RMGP01 - SUPER MARIO GALAXY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb Access from CPU.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RMGE01.ini b/Data/Sys/GameSettings/RMGE01.ini
deleted file mode 100644
index 005c621813..0000000000
--- a/Data/Sys/GameSettings/RMGE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMGE01 - SUPER MARIO GALAXY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RMGJ01.ini b/Data/Sys/GameSettings/RMGJ01.ini
deleted file mode 100644
index c4338d5ceb..0000000000
--- a/Data/Sys/GameSettings/RMGJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMGJ01 - SUPER MARIO GALAXY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RMGK01.ini b/Data/Sys/GameSettings/RMGK01.ini
deleted file mode 100644
index b52f198eb3..0000000000
--- a/Data/Sys/GameSettings/RMGK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMGK01 - SUPER MARIO GALAXY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RMGP01.ini b/Data/Sys/GameSettings/RMGP01.ini
deleted file mode 100644
index a06d1c4f77..0000000000
--- a/Data/Sys/GameSettings/RMGP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RMGP01 - SUPER MARIO GALAXY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RMH.ini b/Data/Sys/GameSettings/RMH.ini
new file mode 100644
index 0000000000..2859552741
--- /dev/null
+++ b/Data/Sys/GameSettings/RMH.ini
@@ -0,0 +1,35 @@
+# RMHE08, RMHJ08, RMHP08 - Monster Hunter Tri
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d to have playable speeds.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBAccessEnable = False
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/RMHE08.ini b/Data/Sys/GameSettings/RMHE08.ini
index e968f2045d..4e5fd02c12 100644
--- a/Data/Sys/GameSettings/RMHE08.ini
+++ b/Data/Sys/GameSettings/RMHE08.ini
@@ -1,14 +1,5 @@
 # RMHE08 - Monster Hunter Tri
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -20,22 +11,3 @@ $Bloom OFF
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RMHJ08.ini b/Data/Sys/GameSettings/RMHJ08.ini
index f3ac91846e..f908a55785 100644
--- a/Data/Sys/GameSettings/RMHJ08.ini
+++ b/Data/Sys/GameSettings/RMHJ08.ini
@@ -1,41 +1,14 @@
 # RMHJ08 - MONSTER HUNTER 3
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Bloom OFF
 0x805DD6D4:dword:0x60000000
 0x805DD6D8:dword:0x60000000
 0x805DD6DC:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RMHP08.ini b/Data/Sys/GameSettings/RMHP08.ini
index d8952d1742..248792da39 100644
--- a/Data/Sys/GameSettings/RMHP08.ini
+++ b/Data/Sys/GameSettings/RMHP08.ini
@@ -1,33 +1,13 @@
 # RMHP08 - Monster Hunter Tri
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Bloom OFF
+0x00057058:dword:0xC022FFE4
+0x0079FF44:dword:0x3F800000
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = False
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RMK.ini b/Data/Sys/GameSettings/RMK.ini
new file mode 100644
index 0000000000..da30ad8a61
--- /dev/null
+++ b/Data/Sys/GameSettings/RMK.ini
@@ -0,0 +1,24 @@
+# RMKE01, RMKJ01, RMKP01 - MARIO SPORTS MIX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RMKE01.ini b/Data/Sys/GameSettings/RMKE01.ini
deleted file mode 100644
index 4b26f6dbc3..0000000000
--- a/Data/Sys/GameSettings/RMKE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RMKE01 - MARIO SPORTS MIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3D11 plugin for less glitches (r6932)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RMKJ01.ini b/Data/Sys/GameSettings/RMKJ01.ini
deleted file mode 100644
index ff7399298a..0000000000
--- a/Data/Sys/GameSettings/RMKJ01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RMKJ01 - MARIO SPORTS MIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3D11 plugin for less glitches (r6932)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RMKP01.ini b/Data/Sys/GameSettings/RMKP01.ini
deleted file mode 100644
index d153ea1f57..0000000000
--- a/Data/Sys/GameSettings/RMKP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RMKP01 - MARIO SPORTS MIX
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3D11 plugin for less glitches (r6932)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RML.ini b/Data/Sys/GameSettings/RML.ini
new file mode 100644
index 0000000000..715f12da3d
--- /dev/null
+++ b/Data/Sys/GameSettings/RML.ini
@@ -0,0 +1,30 @@
+# RMLEH4, RMLJH4, RMLK52, RMLP7U, RMLJH4 - METAL SLUG Anthology
+
+[Core]
+# Values set here will override the main Dolphin settings.
+CPUThread = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Dual core causes random texture corruption.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RMLEH4.ini b/Data/Sys/GameSettings/RMLEH4.ini
deleted file mode 100644
index 6a55d81189..0000000000
--- a/Data/Sys/GameSettings/RMLEH4.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RMLEH4 - METAL SLUG Anthology
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMLJH4.ini b/Data/Sys/GameSettings/RMLJH4.ini
deleted file mode 100644
index 28872e8709..0000000000
--- a/Data/Sys/GameSettings/RMLJH4.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RMLJH4 - Metal Slug Complete
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMLK52.ini b/Data/Sys/GameSettings/RMLK52.ini
deleted file mode 100644
index aaff54530e..0000000000
--- a/Data/Sys/GameSettings/RMLK52.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RMLK52 - Metal Slug Complete
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMLP7U.ini b/Data/Sys/GameSettings/RMLP7U.ini
deleted file mode 100644
index 91503b5230..0000000000
--- a/Data/Sys/GameSettings/RMLP7U.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RMLP7U - METAL SLUG Anthology
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMLPH4.ini b/Data/Sys/GameSettings/RMLPH4.ini
deleted file mode 100644
index 634e4ff86b..0000000000
--- a/Data/Sys/GameSettings/RMLPH4.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RMLPH4 - METAL SLUG Anthology
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RMS.ini b/Data/Sys/GameSettings/RMS.ini
new file mode 100644
index 0000000000..454ddbe3d6
--- /dev/null
+++ b/Data/Sys/GameSettings/RMS.ini
@@ -0,0 +1,19 @@
+# RMSE52 - Marvel Ultimate Alliance 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RMSE52.ini b/Data/Sys/GameSettings/RMSE52.ini
deleted file mode 100644
index 0925e2522a..0000000000
--- a/Data/Sys/GameSettings/RMSE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RMSE52 - Marvel Ultimate Alliance 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RNE.ini b/Data/Sys/GameSettings/RNE.ini
new file mode 100644
index 0000000000..516c216216
--- /dev/null
+++ b/Data/Sys/GameSettings/RNE.ini
@@ -0,0 +1,22 @@
+# RNEEDA, RNEJDA, RNEPDA - NARUTO: Clash of Ninja Revolution 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RNEEDA.ini b/Data/Sys/GameSettings/RNEEDA.ini
deleted file mode 100644
index 002db3888a..0000000000
--- a/Data/Sys/GameSettings/RNEEDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RNEEDA - NARUTO: Clash of Ninja Revolution 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RNEJDA.ini b/Data/Sys/GameSettings/RNEJDA.ini
deleted file mode 100644
index 84cbb82fde..0000000000
--- a/Data/Sys/GameSettings/RNEJDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RNEJDA - NARUTO GEKITOHNINJATAISEN EX3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RNEPDA.ini b/Data/Sys/GameSettings/RNEPDA.ini
deleted file mode 100644
index 22869e6df4..0000000000
--- a/Data/Sys/GameSettings/RNEPDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RNEPDA - NARUTO: Clash of Ninja Revolution 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RNH.ini b/Data/Sys/GameSettings/RNH.ini
new file mode 100644
index 0000000000..366bcda834
--- /dev/null
+++ b/Data/Sys/GameSettings/RNH.ini
@@ -0,0 +1,18 @@
+# RNHE41, RNHP99 - NO MORE HEROES
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Small graphical glitch with light saber (light stays at the same place for a second when you move)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RNHE41.ini b/Data/Sys/GameSettings/RNHE41.ini
index 8c90e68c9a..e7cabdb611 100644
--- a/Data/Sys/GameSettings/RNHE41.ini
+++ b/Data/Sys/GameSettings/RNHE41.ini
@@ -1,13 +1,5 @@
 # RNHE41 - NO MORE HEROES
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Small graphical glitch with light saber (light stays at the same place for a second when you move)
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -17,14 +9,5 @@ EmulationIssues = Small graphical glitch with light saber (light stays at the sa
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
 [Speedhacks]
 0x8035bc9c=700
-
diff --git a/Data/Sys/GameSettings/RNJ.ini b/Data/Sys/GameSettings/RNJ.ini
new file mode 100644
index 0000000000..22e9646750
--- /dev/null
+++ b/Data/Sys/GameSettings/RNJ.ini
@@ -0,0 +1,21 @@
+# RNJE4F, RNJP4F - Mini Ninjas
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/RNM.ini b/Data/Sys/GameSettings/RNM.ini
new file mode 100644
index 0000000000..df5f07fac2
--- /dev/null
+++ b/Data/Sys/GameSettings/RNM.ini
@@ -0,0 +1,18 @@
+# RNMXUG - NinjaBread Man
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RNMXUG.ini b/Data/Sys/GameSettings/RNMXUG.ini
deleted file mode 100644
index c6725db3ae..0000000000
--- a/Data/Sys/GameSettings/RNMXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RNMXUG - NinjaBread Man
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RNO.ini b/Data/Sys/GameSettings/RNO.ini
new file mode 100644
index 0000000000..1aea66e6e8
--- /dev/null
+++ b/Data/Sys/GameSettings/RNO.ini
@@ -0,0 +1,34 @@
+# RNOJ01, RNOP01 - Another Code R Kioku no Tobira
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Efb to Ram is needed for proper scene transition effect.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/RNOJ01.ini b/Data/Sys/GameSettings/RNOJ01.ini
deleted file mode 100644
index 7db84b83e5..0000000000
--- a/Data/Sys/GameSettings/RNOJ01.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# RNOJ01 - Another Code R Kioku no Tobira
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Efb to Ram is needed for proper scene transition effect.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RNOP01.ini b/Data/Sys/GameSettings/RNOP01.ini
deleted file mode 100644
index 99cd73ec1b..0000000000
--- a/Data/Sys/GameSettings/RNOP01.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# RNOP01 - Another Code:R
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Efb to Ram is needed for proper scene transition effect.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RO2.ini b/Data/Sys/GameSettings/RO2.ini
new file mode 100644
index 0000000000..8305526b99
--- /dev/null
+++ b/Data/Sys/GameSettings/RO2.ini
@@ -0,0 +1,19 @@
+# RO2P7N - OFF ROAD
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RO2P7N.ini b/Data/Sys/GameSettings/RO2P7N.ini
index 2f26d6a6e3..b50875b06c 100644
--- a/Data/Sys/GameSettings/RO2P7N.ini
+++ b/Data/Sys/GameSettings/RO2P7N.ini
@@ -1,13 +1,5 @@
 # RO2P7N - OFF ROAD
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -20,4 +12,3 @@ $Hangfix
 
 [ActionReplay]
 # Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RO3.ini b/Data/Sys/GameSettings/RO3.ini
new file mode 100644
index 0000000000..bcfb308841
--- /dev/null
+++ b/Data/Sys/GameSettings/RO3.ini
@@ -0,0 +1,26 @@
+# RO3EXJ, RO3J99, RO3P99 - Little King's Story
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/RO3EXJ.ini b/Data/Sys/GameSettings/RO3EXJ.ini
deleted file mode 100644
index 36c1342331..0000000000
--- a/Data/Sys/GameSettings/RO3EXJ.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO3EXJ - Little King's Story
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RO3J99.ini b/Data/Sys/GameSettings/RO3J99.ini
deleted file mode 100644
index 9834676c7c..0000000000
--- a/Data/Sys/GameSettings/RO3J99.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RO3J99 - Little King's Story
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RO3P99.ini b/Data/Sys/GameSettings/RO3P99.ini
deleted file mode 100644
index 67e93793e7..0000000000
--- a/Data/Sys/GameSettings/RO3P99.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# RO3P99 - Little King's Story
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RO7.ini b/Data/Sys/GameSettings/RO7.ini
new file mode 100644
index 0000000000..660d815cd6
--- /dev/null
+++ b/Data/Sys/GameSettings/RO7.ini
@@ -0,0 +1,18 @@
+# RO7P7D - Spyro: Eternal Night
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RO7P7D.ini b/Data/Sys/GameSettings/RO7P7D.ini
deleted file mode 100644
index c0b4091178..0000000000
--- a/Data/Sys/GameSettings/RO7P7D.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RO7P7D - Spyro: Eternal Night
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RO8.ini b/Data/Sys/GameSettings/RO8.ini
new file mode 100644
index 0000000000..965cd7d325
--- /dev/null
+++ b/Data/Sys/GameSettings/RO8.ini
@@ -0,0 +1,19 @@
+# RO8E7D - SPYRO08
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RO8E7D.ini b/Data/Sys/GameSettings/RO8E7D.ini
deleted file mode 100644
index d2714552ce..0000000000
--- a/Data/Sys/GameSettings/RO8E7D.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RO8E7D - SPYRO08
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RO9.ini b/Data/Sys/GameSettings/RO9.ini
new file mode 100644
index 0000000000..17e195b9b0
--- /dev/null
+++ b/Data/Sys/GameSettings/RO9.ini
@@ -0,0 +1,31 @@
+# RO9EFS, RO9PNK - Aqua Panic
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/RO9EFS.ini b/Data/Sys/GameSettings/RO9EFS.ini
deleted file mode 100644
index 1f7363765c..0000000000
--- a/Data/Sys/GameSettings/RO9EFS.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO9EFS - Aqua Panic
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RO9PNK.ini b/Data/Sys/GameSettings/RO9PNK.ini
deleted file mode 100644
index 4300ade714..0000000000
--- a/Data/Sys/GameSettings/RO9PNK.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RO9PNK - Aqua Panic
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/ROA.ini b/Data/Sys/GameSettings/ROA.ini
new file mode 100644
index 0000000000..be3afd4b55
--- /dev/null
+++ b/Data/Sys/GameSettings/ROA.ini
@@ -0,0 +1,30 @@
+# ROAE36, ROAP36 - Overlord: Dark Legend
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Accessing the map will crash the game (see issue 3953).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/ROAE36.ini b/Data/Sys/GameSettings/ROAE36.ini
deleted file mode 100644
index 6e7278c5d5..0000000000
--- a/Data/Sys/GameSettings/ROAE36.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROAE36 - Overlord: Dark Legend
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Accessing the map will crash the game (see issue 3953).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROAP36.ini b/Data/Sys/GameSettings/ROAP36.ini
deleted file mode 100644
index 2960d51fba..0000000000
--- a/Data/Sys/GameSettings/ROAP36.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROAP36 - Overlord: Dark Legend
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Accessing the map will crash the game (see issue 3953).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROC.ini b/Data/Sys/GameSettings/ROC.ini
new file mode 100644
index 0000000000..215c1fcc34
--- /dev/null
+++ b/Data/Sys/GameSettings/ROC.ini
@@ -0,0 +1,18 @@
+# ROCPNK - COCOTO KART WII EUR
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/ROCPNK.ini b/Data/Sys/GameSettings/ROCPNK.ini
deleted file mode 100644
index 92ed00f5c7..0000000000
--- a/Data/Sys/GameSettings/ROCPNK.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# ROCPNK - COCOTO KART WII EUR
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/ROD.ini b/Data/Sys/GameSettings/ROD.ini
new file mode 100644
index 0000000000..53e73e3c7d
--- /dev/null
+++ b/Data/Sys/GameSettings/ROD.ini
@@ -0,0 +1,29 @@
+# RODE01, RODJ01, RODK01, RODP01 - WarioWare: Smooth Moves
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = This game doesn't support widescreen
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RODE01.ini b/Data/Sys/GameSettings/RODE01.ini
deleted file mode 100644
index cbcb993212..0000000000
--- a/Data/Sys/GameSettings/RODE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODE01 - WarioWare: Smooth Moves
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODJ01.ini b/Data/Sys/GameSettings/RODJ01.ini
deleted file mode 100644
index 0502597308..0000000000
--- a/Data/Sys/GameSettings/RODJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODJ01 - WarioWare: Smooth Moves
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODK01.ini b/Data/Sys/GameSettings/RODK01.ini
deleted file mode 100644
index e12d378e00..0000000000
--- a/Data/Sys/GameSettings/RODK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODK01 - WarioWare: Smooth Moves
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RODP01.ini b/Data/Sys/GameSettings/RODP01.ini
deleted file mode 100644
index 963f91bf98..0000000000
--- a/Data/Sys/GameSettings/RODP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RODP01 - WarioWare: Smooth Moves
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/ROL.ini b/Data/Sys/GameSettings/ROL.ini
new file mode 100644
index 0000000000..f531e28bb4
--- /dev/null
+++ b/Data/Sys/GameSettings/ROL.ini
@@ -0,0 +1,30 @@
+# ROLE8P, ROLJ01, ROLK01, ROLP8P - Mario & Sonic at the Olympic Winter Games
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/ROLE8P.ini b/Data/Sys/GameSettings/ROLE8P.ini
deleted file mode 100644
index 48870b45a4..0000000000
--- a/Data/Sys/GameSettings/ROLE8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLE8P - Mario & Sonic at the Olympic Winter Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROLJ01.ini b/Data/Sys/GameSettings/ROLJ01.ini
deleted file mode 100644
index 3a287f4bee..0000000000
--- a/Data/Sys/GameSettings/ROLJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLJ01 - Mario & Sonic at the Olympic Winter Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROLK01.ini b/Data/Sys/GameSettings/ROLK01.ini
deleted file mode 100644
index 595e3bbdfe..0000000000
--- a/Data/Sys/GameSettings/ROLK01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLK01 - Mario & Sonic at the Olympic Winter Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROLP8P.ini b/Data/Sys/GameSettings/ROLP8P.ini
deleted file mode 100644
index 1d715901d0..0000000000
--- a/Data/Sys/GameSettings/ROLP8P.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# ROLP8P - Mario & Sonic at the Olympic Winter Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RON.ini b/Data/Sys/GameSettings/RON.ini
new file mode 100644
index 0000000000..66e91d3684
--- /dev/null
+++ b/Data/Sys/GameSettings/RON.ini
@@ -0,0 +1,30 @@
+# RONEG9, RONJG9, RONPG9 - Onechanbara: Bikini Zombie Slayers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RONEG9.ini b/Data/Sys/GameSettings/RONEG9.ini
deleted file mode 100644
index 084aa1bef0..0000000000
--- a/Data/Sys/GameSettings/RONEG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONEG9 - Onechanbara: Bikini Zombie Slayers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RONJG9.ini b/Data/Sys/GameSettings/RONJG9.ini
deleted file mode 100644
index 495f7ef305..0000000000
--- a/Data/Sys/GameSettings/RONJG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONJG9 - Onechanbara Revolution
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RONPG9.ini b/Data/Sys/GameSettings/RONPG9.ini
deleted file mode 100644
index 957cc0ce92..0000000000
--- a/Data/Sys/GameSettings/RONPG9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RONPG9 - Onechanbara: Bikini Zombie Slayers
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/ROU.ini b/Data/Sys/GameSettings/ROU.ini
new file mode 100644
index 0000000000..ee902db11b
--- /dev/null
+++ b/Data/Sys/GameSettings/ROU.ini
@@ -0,0 +1,25 @@
+# ROUJAF, ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/ROUJAF.ini b/Data/Sys/GameSettings/ROUJAF.ini
deleted file mode 100644
index 05fb7caa6b..0000000000
--- a/Data/Sys/GameSettings/ROUJAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# ROUJAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROUPAF.ini b/Data/Sys/GameSettings/ROUPAF.ini
deleted file mode 100644
index 668ee3e375..0000000000
--- a/Data/Sys/GameSettings/ROUPAF.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# ROUPAF - ONEPIECE UNLIMITED CRUISE EPISODE 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/ROW.ini b/Data/Sys/GameSettings/ROW.ini
new file mode 100644
index 0000000000..c8ca8226cc
--- /dev/null
+++ b/Data/Sys/GameSettings/ROW.ini
@@ -0,0 +1,32 @@
+# ROWE08, ROWP08, ROWJ08 - Okami
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/ROWE08.ini b/Data/Sys/GameSettings/ROWE08.ini
deleted file mode 100644
index 950dbb40df..0000000000
--- a/Data/Sys/GameSettings/ROWE08.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# ROWE08 - Okami
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/ROWJ08.ini b/Data/Sys/GameSettings/ROWJ08.ini
deleted file mode 100644
index 51d1e488ba..0000000000
--- a/Data/Sys/GameSettings/ROWJ08.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# ROWJ08 - Okami
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/ROWP08.ini b/Data/Sys/GameSettings/ROWP08.ini
deleted file mode 100644
index a0412f1c4a..0000000000
--- a/Data/Sys/GameSettings/ROWP08.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# ROWP08 - Okami
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RP7.ini b/Data/Sys/GameSettings/RP7.ini
new file mode 100644
index 0000000000..4293c0f2ab
--- /dev/null
+++ b/Data/Sys/GameSettings/RP7.ini
@@ -0,0 +1,19 @@
+# RP7P52 - Pirates: Hunt for Black Beard's Booty
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RP7P52.ini b/Data/Sys/GameSettings/RP7P52.ini
deleted file mode 100644
index 0cf53a3d30..0000000000
--- a/Data/Sys/GameSettings/RP7P52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RP7P52 - Pirates: Hunt for Black Beard's Booty
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RPB.ini b/Data/Sys/GameSettings/RPB.ini
new file mode 100644
index 0000000000..4a3bcb79ae
--- /dev/null
+++ b/Data/Sys/GameSettings/RPB.ini
@@ -0,0 +1,30 @@
+# RPBE01, RPBJ01, RPBP01 - Pokemon Battle Revolution
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/RPBE01.ini b/Data/Sys/GameSettings/RPBE01.ini
deleted file mode 100644
index eb8b54de0c..0000000000
--- a/Data/Sys/GameSettings/RPBE01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPBE01 - Pokemon Battle Revolution
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs texture cache set to "Safe"(r6906).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/RPBJ01.ini b/Data/Sys/GameSettings/RPBJ01.ini
deleted file mode 100644
index cc365fa653..0000000000
--- a/Data/Sys/GameSettings/RPBJ01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPBJ01 - Pokemon Battle Revolution
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs texture cache set to "Safe"(r6906).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini
deleted file mode 100644
index a3194cd9ea..0000000000
--- a/Data/Sys/GameSettings/RPBP01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RPBP01 - Pokemon Battle Revolution
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs texture cache set to "Safe"(r6906).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/RPD.ini b/Data/Sys/GameSettings/RPD.ini
new file mode 100644
index 0000000000..143274eb65
--- /dev/null
+++ b/Data/Sys/GameSettings/RPD.ini
@@ -0,0 +1,18 @@
+# RPDPGN - PDC WORLD CHAMPIONSHIP DARTS 2008
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RPDPGN.ini b/Data/Sys/GameSettings/RPDPGN.ini
deleted file mode 100644
index bd082a742a..0000000000
--- a/Data/Sys/GameSettings/RPDPGN.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RPDPGN - PDC WORLD CHAMPIONSHIP DARTS 2008
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RPJ.ini b/Data/Sys/GameSettings/RPJ.ini
new file mode 100644
index 0000000000..8100204151
--- /dev/null
+++ b/Data/Sys/GameSettings/RPJ.ini
@@ -0,0 +1,22 @@
+# RPJE7U, RPJJ99 - ARC RISE FANTASIA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FastDiscSpeed = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RPJE7U.ini b/Data/Sys/GameSettings/RPJE7U.ini
deleted file mode 100644
index 37cedbc157..0000000000
--- a/Data/Sys/GameSettings/RPJE7U.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RPJE7U - ARC RISE FANTASIA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini
deleted file mode 100644
index 8bd66b52ef..0000000000
--- a/Data/Sys/GameSettings/RPJJ99.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RPJJ99 - ARC RISE FANTASIA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RPO.ini b/Data/Sys/GameSettings/RPO.ini
new file mode 100644
index 0000000000..4afebb1009
--- /dev/null
+++ b/Data/Sys/GameSettings/RPO.ini
@@ -0,0 +1,30 @@
+# RPOEC8, RPOJC8, RPOPC8 - Opoona
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Jerky videos need safe cache.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RPP.ini b/Data/Sys/GameSettings/RPP.ini
new file mode 100644
index 0000000000..58ae66e59b
--- /dev/null
+++ b/Data/Sys/GameSettings/RPP.ini
@@ -0,0 +1,19 @@
+# RPPE41 - PRINCE OF PERSIA RIVAL SWORDS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RPPE41.ini b/Data/Sys/GameSettings/RPPE41.ini
deleted file mode 100644
index 56525476c2..0000000000
--- a/Data/Sys/GameSettings/RPPE41.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RPPE41 - PRINCE OF PERSIA RIVAL SWORDS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RPW.ini b/Data/Sys/GameSettings/RPW.ini
new file mode 100644
index 0000000000..a156e65fd0
--- /dev/null
+++ b/Data/Sys/GameSettings/RPW.ini
@@ -0,0 +1,20 @@
+# RPWX41, RPWZ41 - Prince of Persia Forgotten Sands
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
diff --git a/Data/Sys/GameSettings/RPWZ41.ini b/Data/Sys/GameSettings/RPWZ41.ini
deleted file mode 100644
index c2d628bd49..0000000000
--- a/Data/Sys/GameSettings/RPWZ41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RPWZ41 - Prince of Persia Forgotten Sands
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RPY.ini b/Data/Sys/GameSettings/RPY.ini
new file mode 100644
index 0000000000..838ac7a91b
--- /dev/null
+++ b/Data/Sys/GameSettings/RPY.ini
@@ -0,0 +1,19 @@
+# RPYP9B - Pangya! Golf with Style
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RPYP9B.ini b/Data/Sys/GameSettings/RPYP9B.ini
deleted file mode 100644
index 3b66045aa6..0000000000
--- a/Data/Sys/GameSettings/RPYP9B.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RPYP9B - Pangya! Golf with Style
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RQ6.ini b/Data/Sys/GameSettings/RQ6.ini
new file mode 100644
index 0000000000..ac9debce39
--- /dev/null
+++ b/Data/Sys/GameSettings/RQ6.ini
@@ -0,0 +1,30 @@
+# RQ6EJJ, RQ6PKM, RQ6XKM - Cursed Mountain
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Use direct 3d 11 for less glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+
diff --git a/Data/Sys/GameSettings/RQ6EJJ.ini b/Data/Sys/GameSettings/RQ6EJJ.ini
deleted file mode 100644
index 8b57337eef..0000000000
--- a/Data/Sys/GameSettings/RQ6EJJ.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RQ6EJJ - Cursed Mountain
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use direct 3d 11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/RQ6PKM.ini b/Data/Sys/GameSettings/RQ6PKM.ini
deleted file mode 100644
index 6ece888372..0000000000
--- a/Data/Sys/GameSettings/RQ6PKM.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RQ6PKM - Cursed Mountain
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use direct 3d 11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/RQ6XKM.ini b/Data/Sys/GameSettings/RQ6XKM.ini
deleted file mode 100644
index 154861057c..0000000000
--- a/Data/Sys/GameSettings/RQ6XKM.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RQ6XKM - Cursed Mountain
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use direct 3d 11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/RQB.ini b/Data/Sys/GameSettings/RQB.ini
new file mode 100644
index 0000000000..74c5c77927
--- /dev/null
+++ b/Data/Sys/GameSettings/RQB.ini
@@ -0,0 +1,18 @@
+# RQBENR - Kawasaki Quad Bikes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RQBENR.ini b/Data/Sys/GameSettings/RQBENR.ini
deleted file mode 100644
index af6670829e..0000000000
--- a/Data/Sys/GameSettings/RQBENR.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RQBENR - Kawasaki Quad Bikes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RQL.ini b/Data/Sys/GameSettings/RQL.ini
new file mode 100644
index 0000000000..4bb6e2f4a5
--- /dev/null
+++ b/Data/Sys/GameSettings/RQL.ini
@@ -0,0 +1,22 @@
+# RQLE64 - Clone Wars Republic Heroes
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RQLE64.ini b/Data/Sys/GameSettings/RQLE64.ini
deleted file mode 100644
index 5b80a2f7e8..0000000000
--- a/Data/Sys/GameSettings/RQLE64.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RQLE64 - Clone Wars Republic Heroes
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RQO.ini b/Data/Sys/GameSettings/RQO.ini
new file mode 100644
index 0000000000..1c217da4ab
--- /dev/null
+++ b/Data/Sys/GameSettings/RQO.ini
@@ -0,0 +1,22 @@
+# RQOP69 - Spore Hero
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RQOP69.ini b/Data/Sys/GameSettings/RQOP69.ini
deleted file mode 100644
index 4e635a2276..0000000000
--- a/Data/Sys/GameSettings/RQOP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RQOP69 - Spore Hero
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RQR.ini b/Data/Sys/GameSettings/RQR.ini
new file mode 100644
index 0000000000..e71e5ba052
--- /dev/null
+++ b/Data/Sys/GameSettings/RQR.ini
@@ -0,0 +1,28 @@
+# RQREXJ, RQRJAF, RQRPAF - The Sky Crawlers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+CPUThread = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs single core to run properly.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RQREXJ.ini b/Data/Sys/GameSettings/RQREXJ.ini
deleted file mode 100644
index f2a575cafd..0000000000
--- a/Data/Sys/GameSettings/RQREXJ.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RQREXJ - The Sky Crawlers
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs single core to run properly(r7436).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RQRJAF.ini b/Data/Sys/GameSettings/RQRJAF.ini
deleted file mode 100644
index fe37b3a663..0000000000
--- a/Data/Sys/GameSettings/RQRJAF.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RQRJAF - The Sky Crawlers
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs single core to run properly(r7436).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RQRPAF.ini b/Data/Sys/GameSettings/RQRPAF.ini
deleted file mode 100644
index 1daed0c83b..0000000000
--- a/Data/Sys/GameSettings/RQRPAF.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RQRPAF - The Sky Crawlers
-
-[Core]
-# Values set here will override the main dolphin settings.
-CPUThread = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs single core to run properly(r7436).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RQW.ini b/Data/Sys/GameSettings/RQW.ini
new file mode 100644
index 0000000000..7a55cee9e8
--- /dev/null
+++ b/Data/Sys/GameSettings/RQW.ini
@@ -0,0 +1,18 @@
+# RQWEG9, RQWPG9 - Puzzle Quest: Challenge of the Warlords
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RR2.ini b/Data/Sys/GameSettings/RR2.ini
new file mode 100644
index 0000000000..f03be3ce61
--- /dev/null
+++ b/Data/Sys/GameSettings/RR2.ini
@@ -0,0 +1,18 @@
+# RR2PUG - Rig Racer 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RR2PUG.ini b/Data/Sys/GameSettings/RR2PUG.ini
deleted file mode 100644
index e23c795ea0..0000000000
--- a/Data/Sys/GameSettings/RR2PUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RR2PUG - Rig Racer 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RR5.ini b/Data/Sys/GameSettings/RR5.ini
new file mode 100644
index 0000000000..ff21007779
--- /dev/null
+++ b/Data/Sys/GameSettings/RR5.ini
@@ -0,0 +1,18 @@
+# RR5P70 - Ready2Rumble
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RR5P70.ini b/Data/Sys/GameSettings/RR5P70.ini
deleted file mode 100644
index fd439fcf8f..0000000000
--- a/Data/Sys/GameSettings/RR5P70.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RR5P70 - Ready2Rumble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RRA.ini b/Data/Sys/GameSettings/RRA.ini
new file mode 100644
index 0000000000..be64b45504
--- /dev/null
+++ b/Data/Sys/GameSettings/RRA.ini
@@ -0,0 +1,18 @@
+# RRAXUG - Rock'n'Roll Adventures
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RRAXUG.ini b/Data/Sys/GameSettings/RRAXUG.ini
deleted file mode 100644
index 7c5b5a9f82..0000000000
--- a/Data/Sys/GameSettings/RRAXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RRAXUG - Rock'n'Roll Adventures
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RRB.ini b/Data/Sys/GameSettings/RRB.ini
new file mode 100644
index 0000000000..ecccc54329
--- /dev/null
+++ b/Data/Sys/GameSettings/RRB.ini
@@ -0,0 +1,28 @@
+# RRBE41, RRBJ41, RRBP41 - Rayman Raving Rabbids
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncGPU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RRBE41.ini b/Data/Sys/GameSettings/RRBE41.ini
deleted file mode 100644
index 99902d304b..0000000000
--- a/Data/Sys/GameSettings/RRBE41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RRBE41 - Rayman Raving Rabbids
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RRBJ41.ini b/Data/Sys/GameSettings/RRBJ41.ini
deleted file mode 100644
index e25ffcfb13..0000000000
--- a/Data/Sys/GameSettings/RRBJ41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RRBJ41 - Rayman Raving Rabbids
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RRBP41.ini b/Data/Sys/GameSettings/RRBP41.ini
deleted file mode 100644
index 01f06122dd..0000000000
--- a/Data/Sys/GameSettings/RRBP41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RRBP41 - Rayman Raving Rabbids
-
-[Core]
-# Values set here will override the main dolphin settings.
-SyncGPU = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RRK.ini b/Data/Sys/GameSettings/RRK.ini
new file mode 100644
index 0000000000..4b87143e6d
--- /dev/null
+++ b/Data/Sys/GameSettings/RRK.ini
@@ -0,0 +1,33 @@
+# RRKE70, RRKP70 - Alone In The Dark
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RRKE70.ini b/Data/Sys/GameSettings/RRKE70.ini
deleted file mode 100644
index 64b63f4aa0..0000000000
--- a/Data/Sys/GameSettings/RRKE70.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RRKE70 - Alone In The Dark
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RRKP70.ini b/Data/Sys/GameSettings/RRKP70.ini
deleted file mode 100644
index 5f38e5fca7..0000000000
--- a/Data/Sys/GameSettings/RRKP70.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# RRKP70 - Alone In The Dark
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RRM.ini b/Data/Sys/GameSettings/RRM.ini
new file mode 100644
index 0000000000..4586c9b9ea
--- /dev/null
+++ b/Data/Sys/GameSettings/RRM.ini
@@ -0,0 +1,18 @@
+# RRMX69 - Family Game Night
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RRMX69.ini b/Data/Sys/GameSettings/RRMX69.ini
deleted file mode 100644
index 3a245527d2..0000000000
--- a/Data/Sys/GameSettings/RRMX69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RRMX69 - Family Game Night
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RRX.ini b/Data/Sys/GameSettings/RRX.ini
new file mode 100644
index 0000000000..b26f4e3a08
--- /dev/null
+++ b/Data/Sys/GameSettings/RRX.ini
@@ -0,0 +1,18 @@
+# RRXXUG - Monster Trux Arenas
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RRXXUG.ini b/Data/Sys/GameSettings/RRXXUG.ini
deleted file mode 100644
index 86de13d448..0000000000
--- a/Data/Sys/GameSettings/RRXXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RRXXUG - Monster Trux Arenas
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RRY.ini b/Data/Sys/GameSettings/RRY.ini
new file mode 100644
index 0000000000..efc4ed8da0
--- /dev/null
+++ b/Data/Sys/GameSettings/RRY.ini
@@ -0,0 +1,22 @@
+# RRYPHY - Rogue Trooper
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RRYPHY.ini b/Data/Sys/GameSettings/RRYPHY.ini
deleted file mode 100644
index 265145311d..0000000000
--- a/Data/Sys/GameSettings/RRYPHY.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RRYPHY - Rogue Trooper
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RRZ.ini b/Data/Sys/GameSettings/RRZ.ini
new file mode 100644
index 0000000000..b27585a6a4
--- /dev/null
+++ b/Data/Sys/GameSettings/RRZ.ini
@@ -0,0 +1,31 @@
+# RRZEGY, RRZPGY - Rubik's Puzzle World
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/RRZEGY.ini b/Data/Sys/GameSettings/RRZEGY.ini
deleted file mode 100644
index 9fcc05b9ad..0000000000
--- a/Data/Sys/GameSettings/RRZEGY.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RRZEGY - Rubik's Puzzle World
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RRZPGY.ini b/Data/Sys/GameSettings/RRZPGY.ini
deleted file mode 100644
index 613eeb106f..0000000000
--- a/Data/Sys/GameSettings/RRZPGY.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RRZPGY - Rubik's Puzzle World
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RS5.ini b/Data/Sys/GameSettings/RS5.ini
new file mode 100644
index 0000000000..2404bc0cbf
--- /dev/null
+++ b/Data/Sys/GameSettings/RS5.ini
@@ -0,0 +1,30 @@
+# RS5EC8, RS5JC8, RS5PC8 - SAMURAI WARRIORS KATANA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RS5EC8.ini b/Data/Sys/GameSettings/RS5EC8.ini
deleted file mode 100644
index a8c73b7487..0000000000
--- a/Data/Sys/GameSettings/RS5EC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5EC8 - SAMURAI WARRIORS KATANA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS5JC8.ini b/Data/Sys/GameSettings/RS5JC8.ini
deleted file mode 100644
index c6069b95f1..0000000000
--- a/Data/Sys/GameSettings/RS5JC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5JC8 - Sengoku Musou KATANA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS5PC8.ini b/Data/Sys/GameSettings/RS5PC8.ini
deleted file mode 100644
index 23872b8d5c..0000000000
--- a/Data/Sys/GameSettings/RS5PC8.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RS5PC8 - SAMURAI WARRIORS KATANA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RS8.ini b/Data/Sys/GameSettings/RS8.ini
new file mode 100644
index 0000000000..81838e5a65
--- /dev/null
+++ b/Data/Sys/GameSettings/RS8.ini
@@ -0,0 +1,27 @@
+# RS8J8N - SHANGHAI
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RS8J8N.ini b/Data/Sys/GameSettings/RS8J8N.ini
deleted file mode 100644
index 0f0712d348..0000000000
--- a/Data/Sys/GameSettings/RS8J8N.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RS8J8N - SHANGHAI
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RS9.ini b/Data/Sys/GameSettings/RS9.ini
new file mode 100644
index 0000000000..22ad8f89aa
--- /dev/null
+++ b/Data/Sys/GameSettings/RS9.ini
@@ -0,0 +1,19 @@
+# RS9E8P, RS9P8P - SONIC RIDERS ZERO GRAVITY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RS9E8P.ini b/Data/Sys/GameSettings/RS9E8P.ini
deleted file mode 100644
index 5cbe571485..0000000000
--- a/Data/Sys/GameSettings/RS9E8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RS9E8P - SONIC RIDERS ZERO GRAVITY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RS9P8P.ini b/Data/Sys/GameSettings/RS9P8P.ini
deleted file mode 100644
index cb6a3afecd..0000000000
--- a/Data/Sys/GameSettings/RS9P8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RS9P8P - SONIC RIDERS ZERO GRAVITY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSB.ini b/Data/Sys/GameSettings/RSB.ini
new file mode 100644
index 0000000000..be0a7d8d02
--- /dev/null
+++ b/Data/Sys/GameSettings/RSB.ini
@@ -0,0 +1,18 @@
+# RSBE01, RSBJ01, RSBK01 - Super Smash Bros. Brawl
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Classic mode score report needs real xfb. Nes masterpieces and ingame screnshots need efb to ram, STC is needed too for masterpieces.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RSBE01.ini b/Data/Sys/GameSettings/RSBE01.ini
index fbd5d7bb9c..45f99c18bd 100644
--- a/Data/Sys/GameSettings/RSBE01.ini
+++ b/Data/Sys/GameSettings/RSBE01.ini
@@ -1,27 +1,135 @@
 # RSBE01 - Super Smash Bros. Brawl
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Classic mode score report needs real xfb to appear properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
+[Gecko]
+# Standardized Tournament Settings for ease of use with Netplay
+# Unlocks all characters & stages without notifications, 
+# Applies 3 stock, 8 minutes, items off by default, disables tripping & controller input lag, 
+# Adds ZSS & Sheik to CSS, sets random stage set to FD/BF/SV/Lylat/Yoshi's
+$Global Brawl Netplay Settings
+0404FAE4 38000FFF
+0404E818 38600001
+0404E83C 38600001
+046AB860 38000FFF
+046AB8DC 38000FFF
+42000000 90000000
+0417B640 000001FF
+E0000000 80008000
+42000000 90000000
+0817CB68 02020202
+201F0004 00000000
+E0000000 80008000
+0489E910 FFE0F090
+C202AD8C 00000002
+7C630214 3863FBFC
+60000000 00000000
+24494A98 80000000
+20523300 00000000
+04523300 DEADBEEF
+42000000 90000000
+0017BE50 00000000
+0417BE58 000E0000
+0417BE5C 00000000
+0417BE74 04005003
+0417BE70 00000000
+0417F360 00000108
+0417F364 03000A00
+0417F368 08010000
+0417F36C 01000000
+E0000000 80008000
+0668310C 00000030
+387E006C 3B600000
+3C808068 38840DE0
+7CBB20AE 7CA50775
+41800014 94A30004
+3B7B0001 2C1B0032
+4180FFE8 48000038
+04690338 48000068
+066900d8 00000008
+2c170028 41820168
+02680DE0 0022FFFF
+06680DE0 0000002F
+00010203 06070811
+12091A0E 17161320
+21260D05 14101F25
+1B0B270C 15242218
+0A231929 0F045D5E
+5C4A4E40 464c5500
+06685824 0000000C
+3C608068 7C630214
+88630E80 00000000
+046857F0 3AE00028
+06680E80 00000028
+00090D0C 0515011A
+0A071325 1002240E
+0F140616 1F170304
+0B190823 201B5D5E
+5C112118 22122627
+04693D50 38800004
+06693D6C 00000008
+38000000 3880000F
+046900E8 60000000
+04697F58 60000000
+04697EEC 60000000
+046900E8 60000000
+C2684940 00000002
+9BB400B8 57BD06BE
+2C1D001B 00000000
+040AF8D4 546025B6
+040AF964 546025B6
+040AF830 546025B6
+040AF528 546025B6
+040AF810 546025B6
+040AF880 546025B6
+040AF848 546025B6
+0668310C 00000030
+387E006C 3B600000
+3C808068 38840DE0
+7CBB20AE 7CA50775
+41800014 94A30004
+3B7B0001 2C1B0032
+4180FFE8 48000038
+04690338 48000068
+066900d8 00000008
+2c170028 41820168
+02680DE0 0022FFFF
+06680DE0 00000029
+00090D0C 0515011A
+0A071325 1002240E
+0F140616 1F172903
+040B1908 23201B5D
+5E5C1121 18221226
+27000000 00000000
+046B8F5C 7C802378
+046B8F64 7C6300AE
+040AF618 5460083C
+040AF68C 38840002
+040AF6AC 5463083C
+040AF6C0 88030001
+040AF6E8 3860FFFF
+040AF59C 3860000C
+060B91C8 00000018
+BFA10014 7CDF3378
+7CBE2B78 7C7D1B78
+2D05FFFF 418A0014
+006B929C 0000001F
+066B99D8 0000001F
+00010203 04050709
+080A0B0C 0D0E0F10
+11141516 1A191217
+2A18131D 1E1B1C00
+006B92A4 0000000A
+066B9A58 0000000A
+1F202122 25242326
+27280000 00000000
+06407AAC 00000058
+01010202 03030404
+05050606 37640808
+0909330A 0B0B0C0C
+0D0D0E0E 130F1410
+15111612 17131814
+19151C16 1D171E18
+1F19201A 211B221C
+231D241E 251F2932
+2A332B34 2C352D36
+2F373038 3139323A
+2E3B0064 07070000
diff --git a/Data/Sys/GameSettings/RSBJ01.ini b/Data/Sys/GameSettings/RSBJ01.ini
deleted file mode 100644
index 2a0bbe87a3..0000000000
--- a/Data/Sys/GameSettings/RSBJ01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RSBJ01 - Super Smash Bros. Brawl
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Classic mode score report needs real xfb to appear properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSBP01.ini b/Data/Sys/GameSettings/RSBP01.ini
index 9cf87645bb..6117291821 100644
--- a/Data/Sys/GameSettings/RSBP01.ini
+++ b/Data/Sys/GameSettings/RSBP01.ini
@@ -1,13 +1,5 @@
 # RSBP01 - Super Smash Bros. Brawl
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Classic mode score report needs real xfb to appear properly.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -25,7 +17,3 @@ $Can start match with only 1 player
 04684C44 2C060001
 $All players can be on the same team
 04684D5C 38600000
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSF.ini b/Data/Sys/GameSettings/RSF.ini
new file mode 100644
index 0000000000..3a08e8c902
--- /dev/null
+++ b/Data/Sys/GameSettings/RSF.ini
@@ -0,0 +1,30 @@
+# RSFE7U, RSFJ99, RSFP99 - MURAMASA: THE DEMON BLADE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
diff --git a/Data/Sys/GameSettings/RSFE7U.ini b/Data/Sys/GameSettings/RSFE7U.ini
deleted file mode 100644
index 8e7f0ce4bc..0000000000
--- a/Data/Sys/GameSettings/RSFE7U.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSFE7U - MURAMASA: THE DEMON BLADE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/RSFJ99.ini b/Data/Sys/GameSettings/RSFJ99.ini
deleted file mode 100644
index 2aed6ff93d..0000000000
--- a/Data/Sys/GameSettings/RSFJ99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSFJ99 - Oboro Muramasa
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/RSFP99.ini b/Data/Sys/GameSettings/RSFP99.ini
deleted file mode 100644
index ac3998b8e9..0000000000
--- a/Data/Sys/GameSettings/RSFP99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSFP99 - MURAMASA: THE DEMON BLADE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/RSH.ini b/Data/Sys/GameSettings/RSH.ini
new file mode 100644
index 0000000000..3579c79105
--- /dev/null
+++ b/Data/Sys/GameSettings/RSH.ini
@@ -0,0 +1,24 @@
+# RSHE69, RSHJ13, RSHK69, RSHP69 - MySims Kingdom
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 3072
diff --git a/Data/Sys/GameSettings/RSI.ini b/Data/Sys/GameSettings/RSI.ini
new file mode 100644
index 0000000000..22670d7c4b
--- /dev/null
+++ b/Data/Sys/GameSettings/RSI.ini
@@ -0,0 +1,33 @@
+# RSIE69, RSIJ13, RSIP69 - MySims
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/RSIE69.ini b/Data/Sys/GameSettings/RSIE69.ini
deleted file mode 100644
index 28ad5e7d6e..0000000000
--- a/Data/Sys/GameSettings/RSIE69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSIE69 - MySims
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RSIJ13.ini b/Data/Sys/GameSettings/RSIJ13.ini
deleted file mode 100644
index 70868f1339..0000000000
--- a/Data/Sys/GameSettings/RSIJ13.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSIJ13 - Boku To Sim No Machi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RSIP69.ini b/Data/Sys/GameSettings/RSIP69.ini
deleted file mode 100644
index f9599be638..0000000000
--- a/Data/Sys/GameSettings/RSIP69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSIP69 - MySims
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/RSL.ini b/Data/Sys/GameSettings/RSL.ini
new file mode 100644
index 0000000000..591ac6d681
--- /dev/null
+++ b/Data/Sys/GameSettings/RSL.ini
@@ -0,0 +1,30 @@
+# RSLEAF, RSLJAF, RSLKAF, RSLPAF - SOULCALIBUR Legends
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RSLEAF.ini b/Data/Sys/GameSettings/RSLEAF.ini
deleted file mode 100644
index ab426968f3..0000000000
--- a/Data/Sys/GameSettings/RSLEAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLEAF - SOULCALIBUR Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLJAF.ini b/Data/Sys/GameSettings/RSLJAF.ini
deleted file mode 100644
index 95876f5e69..0000000000
--- a/Data/Sys/GameSettings/RSLJAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLJAF - SOULCALIBUR Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLKAF.ini b/Data/Sys/GameSettings/RSLKAF.ini
deleted file mode 100644
index 59dd26bc8d..0000000000
--- a/Data/Sys/GameSettings/RSLKAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLKAF - SOULCALIBUR Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSLPAF.ini b/Data/Sys/GameSettings/RSLPAF.ini
deleted file mode 100644
index 2b01a5c4d2..0000000000
--- a/Data/Sys/GameSettings/RSLPAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RSLPAF - SOULCALIBUR Legends
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RSM.ini b/Data/Sys/GameSettings/RSM.ini
new file mode 100644
index 0000000000..bc6b5445d1
--- /dev/null
+++ b/Data/Sys/GameSettings/RSM.ini
@@ -0,0 +1,20 @@
+# RSME8P, RSMJ8P, RSMP8P - SUPER MONKEY BALL BANANA BLITZ
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini
deleted file mode 100644
index 4c64924d85..0000000000
--- a/Data/Sys/GameSettings/RSME8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RSME8P - SUPER MONKEY BALL BANANA BLITZ
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSMP8P.ini b/Data/Sys/GameSettings/RSMP8P.ini
deleted file mode 100644
index e9f29a4667..0000000000
--- a/Data/Sys/GameSettings/RSMP8P.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# RSMP8P - SUPER MONKEY BALL BANANA BLITZ
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF = True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSN.ini b/Data/Sys/GameSettings/RSN.ini
new file mode 100644
index 0000000000..226dedeffb
--- /dev/null
+++ b/Data/Sys/GameSettings/RSN.ini
@@ -0,0 +1,25 @@
+# RSND69, RSNE69, RSNF69, RSNP69, RSNX69 - The Simpsons Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Unstable with graphical glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RSP.ini b/Data/Sys/GameSettings/RSP.ini
new file mode 100644
index 0000000000..760142a3a8
--- /dev/null
+++ b/Data/Sys/GameSettings/RSP.ini
@@ -0,0 +1,22 @@
+# RSPE01, RSPJ01, RSPP01 - Wii Sports
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RSPE01.ini b/Data/Sys/GameSettings/RSPE01.ini
deleted file mode 100644
index 87ee60228c..0000000000
--- a/Data/Sys/GameSettings/RSPE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSPE01 - Wii Sports
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSPP01.ini b/Data/Sys/GameSettings/RSPP01.ini
deleted file mode 100644
index 78d5c78d25..0000000000
--- a/Data/Sys/GameSettings/RSPP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSPP01 - SPORTS PACK for REVOLUTION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSR.ini b/Data/Sys/GameSettings/RSR.ini
new file mode 100644
index 0000000000..429c00f7b1
--- /dev/null
+++ b/Data/Sys/GameSettings/RSR.ini
@@ -0,0 +1,18 @@
+# RSRE8P, RSRP8P - SONIC AND THE SECRET RINGS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RSRE8P.ini b/Data/Sys/GameSettings/RSRE8P.ini
deleted file mode 100644
index cc8911678a..0000000000
--- a/Data/Sys/GameSettings/RSRE8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RSRE8P - SONIC AND THE SECRET RINGS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSRP8P.ini b/Data/Sys/GameSettings/RSRP8P.ini
deleted file mode 100644
index 1f4d85608c..0000000000
--- a/Data/Sys/GameSettings/RSRP8P.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSRP8P - SONIC AND THE SECRET RINGS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RST.ini b/Data/Sys/GameSettings/RST.ini
new file mode 100644
index 0000000000..6da1879bba
--- /dev/null
+++ b/Data/Sys/GameSettings/RST.ini
@@ -0,0 +1,18 @@
+# RSTP64 - Star Wars:  The Force Unleashed
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RSTP64.ini b/Data/Sys/GameSettings/RSTP64.ini
deleted file mode 100644
index 06cd348b22..0000000000
--- a/Data/Sys/GameSettings/RSTP64.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSTP64 - Star Wars:  The Force Unleashed
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSU.ini b/Data/Sys/GameSettings/RSU.ini
new file mode 100644
index 0000000000..19d9549a7c
--- /dev/null
+++ b/Data/Sys/GameSettings/RSU.ini
@@ -0,0 +1,18 @@
+# RSUP41 - Sports Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RSUP41.ini b/Data/Sys/GameSettings/RSUP41.ini
deleted file mode 100644
index 2a07993bd4..0000000000
--- a/Data/Sys/GameSettings/RSUP41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSUP41 - Sports Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSV.ini b/Data/Sys/GameSettings/RSV.ini
new file mode 100644
index 0000000000..57a3bc1038
--- /dev/null
+++ b/Data/Sys/GameSettings/RSV.ini
@@ -0,0 +1,22 @@
+# RSVE8P, RSVJ8P, RSVP8P - Sonic Unleashed
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RSVE8P.ini b/Data/Sys/GameSettings/RSVE8P.ini
deleted file mode 100644
index f6bfeb9758..0000000000
--- a/Data/Sys/GameSettings/RSVE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RSVE8P - Sonic Unleashed
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3d 11 or Opengl backends. Direct 3d9 needs "Sonic and the Black Knight" projection hack (r7379)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 1
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear = 20
-PH_ZFar = 1.99998
-
diff --git a/Data/Sys/GameSettings/RSVJ8P.ini b/Data/Sys/GameSettings/RSVJ8P.ini
deleted file mode 100644
index 4afaf675b7..0000000000
--- a/Data/Sys/GameSettings/RSVJ8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSVJ8P - Sonic World Adventure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3d 11 or Opengl backends. Direct 3d9 needs "Sonic and the Black Knight" projection hack (r7379)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSVP8P.ini b/Data/Sys/GameSettings/RSVP8P.ini
deleted file mode 100644
index 93526470ac..0000000000
--- a/Data/Sys/GameSettings/RSVP8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSVP8P - Sonic Unleashed
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use Direct3d 11 or Opengl backends. Direct 3d9 needs "Sonic and the Black Knight" projection hack (r7379)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSW.ini b/Data/Sys/GameSettings/RSW.ini
new file mode 100644
index 0000000000..c38d8f2db1
--- /dev/null
+++ b/Data/Sys/GameSettings/RSW.ini
@@ -0,0 +1,22 @@
+# RSWP08 - Spyborgs
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RSWP08.ini b/Data/Sys/GameSettings/RSWP08.ini
deleted file mode 100644
index 72b63e6f44..0000000000
--- a/Data/Sys/GameSettings/RSWP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RSWP08 - Spyborgs
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RSX.ini b/Data/Sys/GameSettings/RSX.ini
new file mode 100644
index 0000000000..07a7995b83
--- /dev/null
+++ b/Data/Sys/GameSettings/RSX.ini
@@ -0,0 +1,34 @@
+# RSXE69, RSXJ13, RSXK69, RSXP69 - SSX Blur
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBAccessEnable = True
+
diff --git a/Data/Sys/GameSettings/RSXE69.ini b/Data/Sys/GameSettings/RSXE69.ini
deleted file mode 100644
index e4b6061b6b..0000000000
--- a/Data/Sys/GameSettings/RSXE69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXE69 - SSX Blur
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSXJ13.ini b/Data/Sys/GameSettings/RSXJ13.ini
deleted file mode 100644
index 11ed8e40ea..0000000000
--- a/Data/Sys/GameSettings/RSXJ13.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXJ13 - SSX Blur
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSXK69.ini b/Data/Sys/GameSettings/RSXK69.ini
deleted file mode 100644
index de43814a21..0000000000
--- a/Data/Sys/GameSettings/RSXK69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXK69 - SSX Blur
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSXP69.ini b/Data/Sys/GameSettings/RSXP69.ini
deleted file mode 100644
index 84904587b3..0000000000
--- a/Data/Sys/GameSettings/RSXP69.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RSXP69 - SSX Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/RSZ.ini b/Data/Sys/GameSettings/RSZ.ini
new file mode 100644
index 0000000000..537d054edd
--- /dev/null
+++ b/Data/Sys/GameSettings/RSZ.ini
@@ -0,0 +1,18 @@
+# RSZPGT - LEGEND OF SAYUKI 20080625V006
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RSZPGT.ini b/Data/Sys/GameSettings/RSZPGT.ini
deleted file mode 100644
index 0dae2a2e0b..0000000000
--- a/Data/Sys/GameSettings/RSZPGT.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RSZPGT - LEGEND OF SAYUKI 20080625V006
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RT3.ini b/Data/Sys/GameSettings/RT3.ini
new file mode 100644
index 0000000000..9f87dbdd75
--- /dev/null
+++ b/Data/Sys/GameSettings/RT3.ini
@@ -0,0 +1,17 @@
+# RT3E54, RT3JEL, RT3P54 - Rockstar Games presents Table Tennis
+[Core]
+[EmuState]
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RT3E54.ini b/Data/Sys/GameSettings/RT3E54.ini
deleted file mode 100644
index 8311ae7234..0000000000
--- a/Data/Sys/GameSettings/RT3E54.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RT3E54 - Rockstar Games presents Table Tennis
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RT3JEL.ini b/Data/Sys/GameSettings/RT3JEL.ini
deleted file mode 100644
index 63007e740a..0000000000
--- a/Data/Sys/GameSettings/RT3JEL.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RT3JEL - Rockstar Games presents Table Tennis
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RT3P54.ini b/Data/Sys/GameSettings/RT3P54.ini
deleted file mode 100644
index 9a4a5c9402..0000000000
--- a/Data/Sys/GameSettings/RT3P54.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RT3P54 - Rockstar Games presents Table Tennis
-[Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/RT4.ini b/Data/Sys/GameSettings/RT4.ini
new file mode 100644
index 0000000000..b2c0cb18a6
--- /dev/null
+++ b/Data/Sys/GameSettings/RT4.ini
@@ -0,0 +1,30 @@
+# RT4EAF, RT4JAF, RT4PAF - Tales of Symphonia -Dawn of the new world-
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RT4EAF.ini b/Data/Sys/GameSettings/RT4EAF.ini
deleted file mode 100644
index d127022079..0000000000
--- a/Data/Sys/GameSettings/RT4EAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RT4EAF - Tales of Symphonia -Dawn of the new world-
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs emulating format changes (r6871)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RT4JAF.ini b/Data/Sys/GameSettings/RT4JAF.ini
deleted file mode 100644
index 40836caa13..0000000000
--- a/Data/Sys/GameSettings/RT4JAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RT4JAF - Tales Of Symphonia Ratatosk no Kishi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs emulating format changes (r6871)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RT4PAF.ini b/Data/Sys/GameSettings/RT4PAF.ini
deleted file mode 100644
index cba434f490..0000000000
--- a/Data/Sys/GameSettings/RT4PAF.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RT4PAF - Tales of Symphonia -Dawn of the new world-
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs emulating format changes (r6871)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RT5.ini b/Data/Sys/GameSettings/RT5.ini
new file mode 100644
index 0000000000..cf15ac4561
--- /dev/null
+++ b/Data/Sys/GameSettings/RT5.ini
@@ -0,0 +1,19 @@
+# RT5E8P, RT5P8P - Sega Superstar Tennis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RT5E8P.ini b/Data/Sys/GameSettings/RT5E8P.ini
deleted file mode 100644
index d7180cb8bc..0000000000
--- a/Data/Sys/GameSettings/RT5E8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RT5E8P - Sega Superstar Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RT5P8P.ini b/Data/Sys/GameSettings/RT5P8P.ini
deleted file mode 100644
index d06f80beb7..0000000000
--- a/Data/Sys/GameSettings/RT5P8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RT5P8P - Sega Superstar Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RT9.ini b/Data/Sys/GameSettings/RT9.ini
new file mode 100644
index 0000000000..ce9e1cf4df
--- /dev/null
+++ b/Data/Sys/GameSettings/RT9.ini
@@ -0,0 +1,19 @@
+# RT9E52 - Tony Hawk's Proving Ground
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Can't see cutscene/movies and slow
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RT9E52.ini b/Data/Sys/GameSettings/RT9E52.ini
deleted file mode 100644
index c5ba3beda7..0000000000
--- a/Data/Sys/GameSettings/RT9E52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RT9E52 - Tony Hawk's Proving Ground
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Can't see cutscene/movies and slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RTB.ini b/Data/Sys/GameSettings/RTB.ini
new file mode 100644
index 0000000000..3eba53e562
--- /dev/null
+++ b/Data/Sys/GameSettings/RTB.ini
@@ -0,0 +1,18 @@
+# RTBP52 - Rapala Fishing Frenzy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RTBP52.ini b/Data/Sys/GameSettings/RTBP52.ini
deleted file mode 100644
index ae0f7ee361..0000000000
--- a/Data/Sys/GameSettings/RTBP52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RTBP52 - Rapala Fishing Frenzy
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RTC.ini b/Data/Sys/GameSettings/RTC.ini
new file mode 100644
index 0000000000..78bff82300
--- /dev/null
+++ b/Data/Sys/GameSettings/RTC.ini
@@ -0,0 +1,18 @@
+# RTCP41 - Tom Clancy's Splinter Cell Double Agent
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RTCP41.ini b/Data/Sys/GameSettings/RTCP41.ini
deleted file mode 100644
index c71e42c0da..0000000000
--- a/Data/Sys/GameSettings/RTCP41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RTCP41 - Tom Clancy's Splinter Cell Double Agent
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RTH.ini b/Data/Sys/GameSettings/RTH.ini
new file mode 100644
index 0000000000..15f5bf8249
--- /dev/null
+++ b/Data/Sys/GameSettings/RTH.ini
@@ -0,0 +1,19 @@
+# RTHE52 - Tony Hawk's Downhill Jam
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Can't see cutscenes/movies little slow trickname/booster meter missing
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RTHE52.ini b/Data/Sys/GameSettings/RTHE52.ini
deleted file mode 100644
index aa827c2da5..0000000000
--- a/Data/Sys/GameSettings/RTHE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RTHE52 - Tony Hawk's Downhill Jam
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Can't see cutscenes/movies little slow trickname/booster meter missing
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RTM.ini b/Data/Sys/GameSettings/RTM.ini
new file mode 100644
index 0000000000..a77d54f308
--- /dev/null
+++ b/Data/Sys/GameSettings/RTM.ini
@@ -0,0 +1,30 @@
+# RTME41, RTMP41 - TMNT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Fog emulation creates problems with the game (see issue 4922).
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+DisableFog = True
+
diff --git a/Data/Sys/GameSettings/RTME41.ini b/Data/Sys/GameSettings/RTME41.ini
deleted file mode 100644
index d844520c77..0000000000
--- a/Data/Sys/GameSettings/RTME41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RTME41 - TMNT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Fog emulation creates problems with the game (see issue 4922).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-DisableFog = True
-
diff --git a/Data/Sys/GameSettings/RTMP41.ini b/Data/Sys/GameSettings/RTMP41.ini
deleted file mode 100644
index da324711b0..0000000000
--- a/Data/Sys/GameSettings/RTMP41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RTMP41 - TMNT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Fog emulation creates problems with the game (see issue 4922).
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-DisableFog = True
-
diff --git a/Data/Sys/GameSettings/RTN.ini b/Data/Sys/GameSettings/RTN.ini
new file mode 100644
index 0000000000..404a53d6ed
--- /dev/null
+++ b/Data/Sys/GameSettings/RTN.ini
@@ -0,0 +1,27 @@
+# RTNE41, RTNJCQ, RTNP41 - Tenchu
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RTNE41.ini b/Data/Sys/GameSettings/RTNE41.ini
deleted file mode 100644
index 4761013981..0000000000
--- a/Data/Sys/GameSettings/RTNE41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RTNE41 - Tenchu
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RTNJCQ.ini b/Data/Sys/GameSettings/RTNJCQ.ini
deleted file mode 100644
index 9bdf589f47..0000000000
--- a/Data/Sys/GameSettings/RTNJCQ.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RTNJCQ - Tenchu 4
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RTNP41.ini b/Data/Sys/GameSettings/RTNP41.ini
deleted file mode 100644
index c07955ee6b..0000000000
--- a/Data/Sys/GameSettings/RTNP41.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# RTNP41 - Tenchu
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RTU.ini b/Data/Sys/GameSettings/RTU.ini
new file mode 100644
index 0000000000..a01df17f35
--- /dev/null
+++ b/Data/Sys/GameSettings/RTU.ini
@@ -0,0 +1,24 @@
+# RTUEJJ, RTUFKM, RTUPKM - Secret Files Tunguska
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb Access from CPU for gamesave pics, efb to ram prevents glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBAccessEnable = True
+EFBToTextureEnable = False
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RTZ.ini b/Data/Sys/GameSettings/RTZ.ini
new file mode 100644
index 0000000000..b4f6fce6d5
--- /dev/null
+++ b/Data/Sys/GameSettings/RTZ.ini
@@ -0,0 +1,31 @@
+# RTZE08, RTZJ08, RTZK08, RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/RTZE08.ini b/Data/Sys/GameSettings/RTZE08.ini
deleted file mode 100644
index 3f2d1662d6..0000000000
--- a/Data/Sys/GameSettings/RTZE08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RTZJ08.ini b/Data/Sys/GameSettings/RTZJ08.ini
deleted file mode 100644
index 1878932462..0000000000
--- a/Data/Sys/GameSettings/RTZJ08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RTZK08.ini b/Data/Sys/GameSettings/RTZK08.ini
deleted file mode 100644
index e4b9ba2889..0000000000
--- a/Data/Sys/GameSettings/RTZK08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RTZP08.ini b/Data/Sys/GameSettings/RTZP08.ini
deleted file mode 100644
index d32451f265..0000000000
--- a/Data/Sys/GameSettings/RTZP08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/RUC.ini b/Data/Sys/GameSettings/RUC.ini
new file mode 100644
index 0000000000..f7d111daba
--- /dev/null
+++ b/Data/Sys/GameSettings/RUC.ini
@@ -0,0 +1,18 @@
+# RUCXRT - RTL Winter Sports 2008
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RUCXRT.ini b/Data/Sys/GameSettings/RUCXRT.ini
deleted file mode 100644
index eafb46b055..0000000000
--- a/Data/Sys/GameSettings/RUCXRT.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RUCXRT - RTL Winter Sports 2008
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RUU.ini b/Data/Sys/GameSettings/RUU.ini
new file mode 100644
index 0000000000..2712b7088d
--- /dev/null
+++ b/Data/Sys/GameSettings/RUU.ini
@@ -0,0 +1,20 @@
+# RUUE01, RUUJ01, RUUK01, RUUP01 - Animal Crossing Wii
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RUUE01.ini b/Data/Sys/GameSettings/RUUE01.ini
deleted file mode 100644
index 1625ea981e..0000000000
--- a/Data/Sys/GameSettings/RUUE01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUE01 - Animal Crossing Wii
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUUJ01.ini b/Data/Sys/GameSettings/RUUJ01.ini
deleted file mode 100644
index 294412f3d2..0000000000
--- a/Data/Sys/GameSettings/RUUJ01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUJ01 - Animal Crossing Wii
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUUK01.ini b/Data/Sys/GameSettings/RUUK01.ini
deleted file mode 100644
index b12b52cfd2..0000000000
--- a/Data/Sys/GameSettings/RUUK01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUK01 - Animal Crossing Wii
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUUP01.ini b/Data/Sys/GameSettings/RUUP01.ini
deleted file mode 100644
index b1c4cb4cde..0000000000
--- a/Data/Sys/GameSettings/RUUP01.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# RUUP01 - Animal Crossing Wii
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/RUY.ini b/Data/Sys/GameSettings/RUY.ini
new file mode 100644
index 0000000000..f596287c4d
--- /dev/null
+++ b/Data/Sys/GameSettings/RUY.ini
@@ -0,0 +1,27 @@
+# RUYE41 - No More Heroes 2: Desperate Struggle
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Small graphical glitch with light saber (light stays at the same place for a second when you move)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RUYE41.ini b/Data/Sys/GameSettings/RUYE41.ini
deleted file mode 100644
index 725ed71410..0000000000
--- a/Data/Sys/GameSettings/RUYE41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RUYE41 - No More Heroes 2: Desperate Struggle
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Small graphical glitch with light saber (light stays at the same place for a second when you move)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RVK.ini b/Data/Sys/GameSettings/RVK.ini
new file mode 100644
index 0000000000..fc7cea08ef
--- /dev/null
+++ b/Data/Sys/GameSettings/RVK.ini
@@ -0,0 +1,22 @@
+# RVKEXJ, RVKP99 - VALHALLA KNIGHTS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RVKEXJ.ini b/Data/Sys/GameSettings/RVKEXJ.ini
deleted file mode 100644
index ffe181bffd..0000000000
--- a/Data/Sys/GameSettings/RVKEXJ.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RVKEXJ - VALHALLA KNIGHTS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RVKP99.ini b/Data/Sys/GameSettings/RVKP99.ini
deleted file mode 100644
index c7b63afcbc..0000000000
--- a/Data/Sys/GameSettings/RVKP99.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RVKP99 - ELDAR SAGA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RVO.ini b/Data/Sys/GameSettings/RVO.ini
new file mode 100644
index 0000000000..43490b30eb
--- /dev/null
+++ b/Data/Sys/GameSettings/RVO.ini
@@ -0,0 +1,19 @@
+# RVOPPL - Vertigo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RVOPPL.ini b/Data/Sys/GameSettings/RVOPPL.ini
deleted file mode 100644
index 748d6638c5..0000000000
--- a/Data/Sys/GameSettings/RVOPPL.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RVOPPL - Vertigo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RVQ.ini b/Data/Sys/GameSettings/RVQ.ini
new file mode 100644
index 0000000000..d21b5b991f
--- /dev/null
+++ b/Data/Sys/GameSettings/RVQ.ini
@@ -0,0 +1,18 @@
+# RVQP41 - Movie Studios Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RVQP41.ini b/Data/Sys/GameSettings/RVQP41.ini
deleted file mode 100644
index 1dedcb3322..0000000000
--- a/Data/Sys/GameSettings/RVQP41.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RVQP41 - Movie Studios Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RVS.ini b/Data/Sys/GameSettings/RVS.ini
new file mode 100644
index 0000000000..2d98e4aa09
--- /dev/null
+++ b/Data/Sys/GameSettings/RVS.ini
@@ -0,0 +1,19 @@
+# RVSE69, RVSP69 - Skate It
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RVSE69.ini b/Data/Sys/GameSettings/RVSE69.ini
deleted file mode 100644
index f20cf162f6..0000000000
--- a/Data/Sys/GameSettings/RVSE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RVSE69 - Skate It
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Very slow
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RVSP69.ini b/Data/Sys/GameSettings/RVSP69.ini
deleted file mode 100644
index 3e19b96ff1..0000000000
--- a/Data/Sys/GameSettings/RVSP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RVSP69 - Skate It
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RVU.ini b/Data/Sys/GameSettings/RVU.ini
new file mode 100644
index 0000000000..749b6d90ad
--- /dev/null
+++ b/Data/Sys/GameSettings/RVU.ini
@@ -0,0 +1,22 @@
+# RVUP8P - Virtua Tennis 2009
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RVUP8P.ini b/Data/Sys/GameSettings/RVUP8P.ini
deleted file mode 100644
index db016abe1c..0000000000
--- a/Data/Sys/GameSettings/RVUP8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RVUP8P - Virtua Tennis 2009
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RVV.ini b/Data/Sys/GameSettings/RVV.ini
new file mode 100644
index 0000000000..48aef9478a
--- /dev/null
+++ b/Data/Sys/GameSettings/RVV.ini
@@ -0,0 +1,18 @@
+# RVVP78 - THQ Big Beach Sports
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RVVP78.ini b/Data/Sys/GameSettings/RVVP78.ini
deleted file mode 100644
index 77e29a12b5..0000000000
--- a/Data/Sys/GameSettings/RVVP78.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RVVP78 - THQ Big Beach Sports
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RVZ.ini b/Data/Sys/GameSettings/RVZ.ini
new file mode 100644
index 0000000000..14e4c3d623
--- /dev/null
+++ b/Data/Sys/GameSettings/RVZ.ini
@@ -0,0 +1,18 @@
+# RVZP52 - Monsters VS Aliens
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RVZP52.ini b/Data/Sys/GameSettings/RVZP52.ini
deleted file mode 100644
index 90f63795a7..0000000000
--- a/Data/Sys/GameSettings/RVZP52.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RVZP52 - Monsters VS Aliens
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RW9.ini b/Data/Sys/GameSettings/RW9.ini
new file mode 100644
index 0000000000..be300ad2be
--- /dev/null
+++ b/Data/Sys/GameSettings/RW9.ini
@@ -0,0 +1,22 @@
+# RW9X78 - WWE Smackdown! vs. RAW 2009
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RW9X78.ini b/Data/Sys/GameSettings/RW9X78.ini
deleted file mode 100644
index f04cd3fd76..0000000000
--- a/Data/Sys/GameSettings/RW9X78.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RW9X78 - WWE Smackdown! vs. RAW 2009
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RWB.ini b/Data/Sys/GameSettings/RWB.ini
new file mode 100644
index 0000000000..2dacc54d30
--- /dev/null
+++ b/Data/Sys/GameSettings/RWB.ini
@@ -0,0 +1,18 @@
+# RWBXUG - Kawasaki Snowmobiles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RWBXUG.ini b/Data/Sys/GameSettings/RWBXUG.ini
deleted file mode 100644
index ba24048e87..0000000000
--- a/Data/Sys/GameSettings/RWBXUG.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RWBXUG - Kawasaki Snowmobiles
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RWE.ini b/Data/Sys/GameSettings/RWE.ini
new file mode 100644
index 0000000000..1d528df088
--- /dev/null
+++ b/Data/Sys/GameSettings/RWE.ini
@@ -0,0 +1,19 @@
+# RWEPA4 - Pro Evolution Soccer 2008
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RWEPA4.ini b/Data/Sys/GameSettings/RWEPA4.ini
deleted file mode 100644
index 7f73e18629..0000000000
--- a/Data/Sys/GameSettings/RWEPA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RWEPA4 - Pro Evolution Soccer 2008
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RWL.ini b/Data/Sys/GameSettings/RWL.ini
new file mode 100644
index 0000000000..51fbdbe78d
--- /dev/null
+++ b/Data/Sys/GameSettings/RWL.ini
@@ -0,0 +1,27 @@
+# RWLE01 - Wario Land Shake It!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RWLE01.ini b/Data/Sys/GameSettings/RWLE01.ini
deleted file mode 100644
index a24a490c3c..0000000000
--- a/Data/Sys/GameSettings/RWLE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RWLE01 - Wario Land Shake It!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RWR.ini b/Data/Sys/GameSettings/RWR.ini
new file mode 100644
index 0000000000..d10e9f77db
--- /dev/null
+++ b/Data/Sys/GameSettings/RWR.ini
@@ -0,0 +1,29 @@
+# RWRE4F, RWRP4F - Wacky Races: Crash & Dash
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini
deleted file mode 100644
index d1caebd716..0000000000
--- a/Data/Sys/GameSettings/RWRE4F.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWRE4F - Wacky Races: Crash & Dash
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini
deleted file mode 100644
index 35eac83354..0000000000
--- a/Data/Sys/GameSettings/RWRP4F.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# RWRP4F - Wacky Races: Crash & Dash
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/RWS.ini b/Data/Sys/GameSettings/RWS.ini
new file mode 100644
index 0000000000..abf31fd62f
--- /dev/null
+++ b/Data/Sys/GameSettings/RWS.ini
@@ -0,0 +1,30 @@
+# RWSE8P, RWSJ01, RWSK01, RWSP8P - MARIO & SONIC At The OlympicGames
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RWSE8P.ini b/Data/Sys/GameSettings/RWSE8P.ini
deleted file mode 100644
index 131d8f35cc..0000000000
--- a/Data/Sys/GameSettings/RWSE8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RWSE8P - MARIO & SONIC At The OlympicGames
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSJ01.ini b/Data/Sys/GameSettings/RWSJ01.ini
deleted file mode 100644
index 9598402e36..0000000000
--- a/Data/Sys/GameSettings/RWSJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RWSJ01 - MARIO & SONIC At The OlympicGames
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSK01.ini b/Data/Sys/GameSettings/RWSK01.ini
deleted file mode 100644
index c07d22f3de..0000000000
--- a/Data/Sys/GameSettings/RWSK01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RWSK01 - MARIO & SONIC At The OlympicGames
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWSP8P.ini b/Data/Sys/GameSettings/RWSP8P.ini
deleted file mode 100644
index e46655156f..0000000000
--- a/Data/Sys/GameSettings/RWSP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RWSP8P - MARIO & SONIC At The OlympicGames
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs emulating format changes (r6871)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RWU.ini b/Data/Sys/GameSettings/RWU.ini
new file mode 100644
index 0000000000..560e06580d
--- /dev/null
+++ b/Data/Sys/GameSettings/RWU.ini
@@ -0,0 +1,22 @@
+# RWUX52 - Xmen Origins: Wolverine
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RWUX52.ini b/Data/Sys/GameSettings/RWUX52.ini
deleted file mode 100644
index 88c4470774..0000000000
--- a/Data/Sys/GameSettings/RWUX52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RWUX52 - Xmen Origins: Wolverine
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RX3.ini b/Data/Sys/GameSettings/RX3.ini
new file mode 100644
index 0000000000..0aa162958f
--- /dev/null
+++ b/Data/Sys/GameSettings/RX3.ini
@@ -0,0 +1,25 @@
+# RX3E01 - ExciteBots
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Tested with (r6521)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RX3E01.ini b/Data/Sys/GameSettings/RX3E01.ini
deleted file mode 100644
index ff32cce62e..0000000000
--- a/Data/Sys/GameSettings/RX3E01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# RX3E01 - ExciteBots
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Tested with (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RX9.ini b/Data/Sys/GameSettings/RX9.ini
new file mode 100644
index 0000000000..0abfed7191
--- /dev/null
+++ b/Data/Sys/GameSettings/RX9.ini
@@ -0,0 +1,18 @@
+# RX9P69, RX9Y69 - Need for Speed(tm) Undercover
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RX9P69.ini b/Data/Sys/GameSettings/RX9P69.ini
deleted file mode 100644
index 982d65ad4d..0000000000
--- a/Data/Sys/GameSettings/RX9P69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RX9P69 - Need for Speed(tm) Undercover
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RX9Y69.ini b/Data/Sys/GameSettings/RX9Y69.ini
deleted file mode 100644
index 3344899a68..0000000000
--- a/Data/Sys/GameSettings/RX9Y69.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RX9Y69 - Need for Speed(tm) Undercover
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RXX.ini b/Data/Sys/GameSettings/RXX.ini
new file mode 100644
index 0000000000..0510c136d5
--- /dev/null
+++ b/Data/Sys/GameSettings/RXX.ini
@@ -0,0 +1,34 @@
+# RXXE4Q, RXXJ4Q, RXXP4Q - Spectrobes Origins
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/RXXE4Q.ini b/Data/Sys/GameSettings/RXXE4Q.ini
deleted file mode 100644
index 7a910902aa..0000000000
--- a/Data/Sys/GameSettings/RXXE4Q.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RXXE4Q - Spectrobes Origins
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RXXJ4Q.ini b/Data/Sys/GameSettings/RXXJ4Q.ini
deleted file mode 100644
index 32cbc8a69a..0000000000
--- a/Data/Sys/GameSettings/RXXJ4Q.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RXXJ4Q - Spectrobes Origins
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RXXP4Q.ini b/Data/Sys/GameSettings/RXXP4Q.ini
deleted file mode 100644
index e04bea6662..0000000000
--- a/Data/Sys/GameSettings/RXXP4Q.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# RXXP4Q - Spectrobes Origins
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/RYB.ini b/Data/Sys/GameSettings/RYB.ini
new file mode 100644
index 0000000000..dd68e4063d
--- /dev/null
+++ b/Data/Sys/GameSettings/RYB.ini
@@ -0,0 +1,19 @@
+# RYBE69 - BOOM BLOX Bash Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RYBE69.ini b/Data/Sys/GameSettings/RYBE69.ini
deleted file mode 100644
index 62fced03d9..0000000000
--- a/Data/Sys/GameSettings/RYBE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RYBE69 - BOOM BLOX Bash Party
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RYO.ini b/Data/Sys/GameSettings/RYO.ini
new file mode 100644
index 0000000000..5f5f148a6a
--- /dev/null
+++ b/Data/Sys/GameSettings/RYO.ini
@@ -0,0 +1,19 @@
+# RYOEA4 - Yugioh WB US
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RYOEA4.ini b/Data/Sys/GameSettings/RYOEA4.ini
deleted file mode 100644
index 23bb83293b..0000000000
--- a/Data/Sys/GameSettings/RYOEA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RYOEA4 - Yugioh WB US
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RYQ.ini b/Data/Sys/GameSettings/RYQ.ini
new file mode 100644
index 0000000000..9c13f3329a
--- /dev/null
+++ b/Data/Sys/GameSettings/RYQ.ini
@@ -0,0 +1,19 @@
+# RYQP69 - Trivial Pursuit
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RYQP69.ini b/Data/Sys/GameSettings/RYQP69.ini
deleted file mode 100644
index b4aa58213d..0000000000
--- a/Data/Sys/GameSettings/RYQP69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# RYQP69 - Trivial Pursuit
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RYX.ini b/Data/Sys/GameSettings/RYX.ini
new file mode 100644
index 0000000000..88aff96a9f
--- /dev/null
+++ b/Data/Sys/GameSettings/RYX.ini
@@ -0,0 +1,22 @@
+# RYXP7J - Yamaha Supercross
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RYXP7J.ini b/Data/Sys/GameSettings/RYXP7J.ini
deleted file mode 100644
index 3d03e89369..0000000000
--- a/Data/Sys/GameSettings/RYXP7J.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RYXP7J - Yamaha Supercross
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RZ9.ini b/Data/Sys/GameSettings/RZ9.ini
new file mode 100644
index 0000000000..7ac5977dd4
--- /dev/null
+++ b/Data/Sys/GameSettings/RZ9.ini
@@ -0,0 +1,18 @@
+# RZ9PG9 - Family Party: 30 Great Games
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/RZ9PG9.ini b/Data/Sys/GameSettings/RZ9PG9.ini
deleted file mode 100644
index bccdb8551e..0000000000
--- a/Data/Sys/GameSettings/RZ9PG9.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RZ9PG9 - Family Party: 30 Great Games
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RZD.ini b/Data/Sys/GameSettings/RZD.ini
new file mode 100644
index 0000000000..6c7ebd8ad0
--- /dev/null
+++ b/Data/Sys/GameSettings/RZD.ini
@@ -0,0 +1,29 @@
+# RZDE01, RZDJ01, RZDK01, RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RZDE01.ini b/Data/Sys/GameSettings/RZDE01.ini
deleted file mode 100644
index f4648ff55a..0000000000
--- a/Data/Sys/GameSettings/RZDE01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# RZDE01 - The Legend of Zelda: Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RZDE01r0.ini b/Data/Sys/GameSettings/RZDE01r0.ini
new file mode 100644
index 0000000000..7b31eead41
--- /dev/null
+++ b/Data/Sys/GameSettings/RZDE01r0.ini
@@ -0,0 +1,42 @@
+# RZDE01 - The Legend of Zelda: Twilight Princess [Wii]
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x80040C38:dword:0x60000000
+0x80040C54:dword:0x60000000
+0x80040C6C:dword:0x60000000
+0x80040C88:dword:0x60000000
+
+0x80040C88:dword:0x60000000
+0x80040C8C:dword:0x60000000
+0x80040C90:dword:0x60000000
+0x80040C94:dword:0x60000000
+0x80040C98:dword:0x60000000
+0x80040C9C:dword:0x60000000
+0x80040CA0:dword:0x60000000
+0x80040CA4:dword:0x60000000
+0x80040CA8:dword:0x60000000
+0x80040CAC:dword:0x60000000
+0x80040CB0:dword:0x60000000
+0x80040CB4:dword:0x60000000
+0x80040CB8:dword:0x60000000
+0x80040CBC:dword:0x60000000
+0x80040CC0:dword:0x60000000
+0x80040CC4:dword:0x60000000
+0x80040CC8:dword:0x60000000
+0x80040CCC:dword:0x60000000
+0x80040CD0:dword:0x60000000
+0x80040CD4:dword:0x60000000
+0x80040CD8:dword:0x60000000
+
+0x80040CE0:dword:0x60000000
+0x80040CFC:dword:0x60000000
+0x80040D14:dword:0x60000000
+0x80040D30:dword:0x60000000
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RZDE01r2.ini b/Data/Sys/GameSettings/RZDE01r2.ini
new file mode 100644
index 0000000000..7e68304fbc
--- /dev/null
+++ b/Data/Sys/GameSettings/RZDE01r2.ini
@@ -0,0 +1,45 @@
+# RZDE01 - The Legend of Zelda: Twilight Princess [Wii]
+
+[EmuState]
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x80040DE8:dword:0x60000000
+0x80040E04:dword:0x60000000
+0x80040E1C:dword:0x60000000
+0x80040E38:dword:0x60000000
+
+0x80040E3C:dword:0x60000000
+0x80040E40:dword:0x60000000
+0x80040E44:dword:0x60000000
+0x80040E48:dword:0x60000000
+0x80040E4C:dword:0x60000000
+0x80040E50:dword:0x60000000
+0x80040E54:dword:0x60000000
+0x80040E58:dword:0x60000000
+0x80040E5C:dword:0x60000000
+0x80040E60:dword:0x60000000
+0x80040E64:dword:0x60000000
+0x80040E68:dword:0x60000000
+0x80040E6C:dword:0x60000000
+0x80040E70:dword:0x60000000
+0x80040E74:dword:0x60000000
+0x80040E78:dword:0x60000000
+0x80040E7C:dword:0x60000000
+0x80040E80:dword:0x60000000
+0x80040E84:dword:0x60000000
+0x80040E88:dword:0x60000000
+0x80040E8C:dword:0x60000000
+
+0x80040E90:dword:0x60000000
+0x80040EAC:dword:0x60000000
+0x80040EC4:dword:0x60000000
+0x80040EE0:dword:0x60000000
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini
index 02ddc95f30..85e112a102 100644
--- a/Data/Sys/GameSettings/RZDJ01.ini
+++ b/Data/Sys/GameSettings/RZDJ01.ini
@@ -1,37 +1,44 @@
-# RZDJ01 - The Legend of Zelda: Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
+# RZDJ01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x80040D64:dword:0x60000000
+0x80040D80:dword:0x60000000
+0x80040D98:dword:0x60000000
+0x80040DB4:dword:0x60000000
+
+0x80040DB8:dword:0x60000000
+0x80040DBC:dword:0x60000000
+0x80040DC0:dword:0x60000000
+0x80040DC4:dword:0x60000000
+0x80040DC8:dword:0x60000000
+0x80040DCC:dword:0x60000000
+0x80040DD0:dword:0x60000000
+0x80040DD4:dword:0x60000000
+0x80040DD8:dword:0x60000000
+0x80040DDC:dword:0x60000000
+0x80040DE0:dword:0x60000000
+0x80040DE4:dword:0x60000000
+0x80040DE8:dword:0x60000000
+0x80040DEC:dword:0x60000000
+0x80040DF0:dword:0x60000000
+0x80040DF4:dword:0x60000000
+0x80040DF8:dword:0x60000000
+0x80040DFC:dword:0x60000000
+0x80040E00:dword:0x60000000
+0x80040E04:dword:0x60000000
+
+0x80040E0C:dword:0x60000000
+0x80040E28:dword:0x60000000
+0x80040E40:dword:0x60000000
+0x80040E5C:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RZDK01.ini b/Data/Sys/GameSettings/RZDK01.ini
deleted file mode 100644
index ffacaf28d4..0000000000
--- a/Data/Sys/GameSettings/RZDK01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# RZDK01 - The Legend of Zelda: Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RZDP01.ini b/Data/Sys/GameSettings/RZDP01.ini
index 23c141d6ef..52a6c105ec 100644
--- a/Data/Sys/GameSettings/RZDP01.ini
+++ b/Data/Sys/GameSettings/RZDP01.ini
@@ -1,37 +1,45 @@
-# RZDP01 - The Legend of Zelda Twilight Princess
-
-[Core]
-# Values set here will override the main dolphin settings.
+# RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
 
 [EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in iso properties for a speed boost.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Hyrule Field Speed Hack
+0x80040eb4:dword:0x60000000
+0x80040ed0:dword:0x60000000
+0x80040ee8:dword:0x60000000
+0x80040f04:dword:0x60000000
+
+0x80040f08:dword:0x60000000
+0x80040f0c:dword:0x60000000
+0x80040f10:dword:0x60000000
+0x80040f14:dword:0x60000000
+0x80040f18:dword:0x60000000
+0x80040f1c:dword:0x60000000
+0x80040f20:dword:0x60000000
+0x80040f24:dword:0x60000000
+0x80040f28:dword:0x60000000
+0x80040f2c:dword:0x60000000
+0x80040f30:dword:0x60000000
+0x80040f34:dword:0x60000000
+0x80040f38:dword:0x60000000
+0x80040f3c:dword:0x60000000
+0x80040f40:dword:0x60000000
+0x80040f44:dword:0x60000000
+0x80040f48:dword:0x60000000
+0x80040f4c:dword:0x60000000
+0x80040f50:dword:0x60000000
+0x80040f54:dword:0x60000000
+0x80040f58:dword:0x60000000
+
+0x80040f5c:dword:0x60000000
+0x80040f78:dword:0x60000000
+0x80040f90:dword:0x60000000
+0x80040fac:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ZTPSpeedupHack = 1
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBAccessEnable = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/RZF.ini b/Data/Sys/GameSettings/RZF.ini
new file mode 100644
index 0000000000..e0fadfce33
--- /dev/null
+++ b/Data/Sys/GameSettings/RZF.ini
@@ -0,0 +1,23 @@
+# RZFPKM - Secret Files 2 Puritas Cordis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb Access from CPU for gamesave pics.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/RZJ.ini b/Data/Sys/GameSettings/RZJ.ini
new file mode 100644
index 0000000000..5364732843
--- /dev/null
+++ b/Data/Sys/GameSettings/RZJ.ini
@@ -0,0 +1,30 @@
+# RZJD69, RZJE69, RZJJ13, RZJP69 - DeadSpace
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/RZJD69.ini b/Data/Sys/GameSettings/RZJD69.ini
deleted file mode 100644
index 913a7ddb32..0000000000
--- a/Data/Sys/GameSettings/RZJD69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RZJD69 - DeadSpace
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RZJE69.ini b/Data/Sys/GameSettings/RZJE69.ini
deleted file mode 100644
index 459abd0b26..0000000000
--- a/Data/Sys/GameSettings/RZJE69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RZJE69 - DeadSpace
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RZJJ13.ini b/Data/Sys/GameSettings/RZJJ13.ini
deleted file mode 100644
index 05d56e1cde..0000000000
--- a/Data/Sys/GameSettings/RZJJ13.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# RZJJ13 - DeadSpace
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RZJP69.ini b/Data/Sys/GameSettings/RZJP69.ini
index 302e84cebf..12a60c0ff3 100644
--- a/Data/Sys/GameSettings/RZJP69.ini
+++ b/Data/Sys/GameSettings/RZJP69.ini
@@ -1,14 +1,5 @@
 # RZJP69 - DeadSpace
 
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -31,15 +22,3 @@ $Infinite Ammo [TNTkryzt]
 0421AA54 3BC00000
 $Rapid Fire [TNTkryzt]
 0423A4DC 60000000
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/RZO.ini b/Data/Sys/GameSettings/RZO.ini
new file mode 100644
index 0000000000..ac918bfea0
--- /dev/null
+++ b/Data/Sys/GameSettings/RZO.ini
@@ -0,0 +1,31 @@
+# RZOE78, RZOP78 - World Of Zoo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/RZP.ini b/Data/Sys/GameSettings/RZP.ini
new file mode 100644
index 0000000000..6fd3f74435
--- /dev/null
+++ b/Data/Sys/GameSettings/RZP.ini
@@ -0,0 +1,22 @@
+# RZPE01, RZPJ01 - LINKS CROSSBOW TRAINING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/RZPE01.ini b/Data/Sys/GameSettings/RZPE01.ini
deleted file mode 100644
index f457f9a5e5..0000000000
--- a/Data/Sys/GameSettings/RZPE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# RZPE01 - LINKS CROSSBOW TRAINING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/RZT.ini b/Data/Sys/GameSettings/RZT.ini
new file mode 100644
index 0000000000..2837d4dc06
--- /dev/null
+++ b/Data/Sys/GameSettings/RZT.ini
@@ -0,0 +1,20 @@
+# RZTE01, RZTJ01, RZTK01, RZTP01, RZTW01 - Wii Sports Resort
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real wiimote and motion plus.
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTE01.ini b/Data/Sys/GameSettings/RZTE01.ini
deleted file mode 100644
index 195c944cf4..0000000000
--- a/Data/Sys/GameSettings/RZTE01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTE01 - Wii Sports Resort
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTJ01.ini b/Data/Sys/GameSettings/RZTJ01.ini
deleted file mode 100644
index 5ac0a14309..0000000000
--- a/Data/Sys/GameSettings/RZTJ01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTJ01 - Wii Sports Resort
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTK01.ini b/Data/Sys/GameSettings/RZTK01.ini
deleted file mode 100644
index 3a0d0e664f..0000000000
--- a/Data/Sys/GameSettings/RZTK01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTK01 - Wii Sports Resort
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTP01.ini b/Data/Sys/GameSettings/RZTP01.ini
deleted file mode 100644
index 461edb24e7..0000000000
--- a/Data/Sys/GameSettings/RZTP01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTP01 - Wii Sports Resort
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZTW01.ini b/Data/Sys/GameSettings/RZTW01.ini
deleted file mode 100644
index d62c8f1919..0000000000
--- a/Data/Sys/GameSettings/RZTW01.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RZTW01 - Wii Sports Resort
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/RZY.ini b/Data/Sys/GameSettings/RZY.ini
new file mode 100644
index 0000000000..eb016c22a0
--- /dev/null
+++ b/Data/Sys/GameSettings/RZY.ini
@@ -0,0 +1,21 @@
+# RZYE41 - My Word Coach
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/RZZ.ini b/Data/Sys/GameSettings/RZZ.ini
new file mode 100644
index 0000000000..bfc3d72e71
--- /dev/null
+++ b/Data/Sys/GameSettings/RZZ.ini
@@ -0,0 +1,27 @@
+# RZZE8P, RZZJEL, RZZP8P - MADWORLD
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/RZZE8P.ini b/Data/Sys/GameSettings/RZZE8P.ini
deleted file mode 100644
index 9ed6cb8f8a..0000000000
--- a/Data/Sys/GameSettings/RZZE8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZE8P - MADWORLD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RZZJEL.ini b/Data/Sys/GameSettings/RZZJEL.ini
deleted file mode 100644
index af90b9e607..0000000000
--- a/Data/Sys/GameSettings/RZZJEL.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZJEL - MADWORLD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/RZZP8P.ini b/Data/Sys/GameSettings/RZZP8P.ini
deleted file mode 100644
index a07ab2ab71..0000000000
--- a/Data/Sys/GameSettings/RZZP8P.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# RZZP8P - MADWORLD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/S2E.ini b/Data/Sys/GameSettings/S2E.ini
new file mode 100644
index 0000000000..b086522082
--- /dev/null
+++ b/Data/Sys/GameSettings/S2E.ini
@@ -0,0 +1,33 @@
+# S2EE41, S2EP41 - ABBA: You Can Dance
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = USB Microphone not emulated
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/S2I.ini b/Data/Sys/GameSettings/S2I.ini
new file mode 100644
index 0000000000..c0040151a5
--- /dev/null
+++ b/Data/Sys/GameSettings/S2I.ini
@@ -0,0 +1,19 @@
+# S2IP8P - Iron Man 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/S2IP8P.ini b/Data/Sys/GameSettings/S2IP8P.ini
deleted file mode 100644
index a48fd75030..0000000000
--- a/Data/Sys/GameSettings/S2IP8P.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# S2IP8P - Iron Man™ 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/S2L.ini b/Data/Sys/GameSettings/S2L.ini
new file mode 100644
index 0000000000..d5be70d06f
--- /dev/null
+++ b/Data/Sys/GameSettings/S2L.ini
@@ -0,0 +1,29 @@
+# S2LE01, S2LJ01, S2LP01 - PokePark Wii2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram to display photographs.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/S2LE01.ini b/Data/Sys/GameSettings/S2LE01.ini
deleted file mode 100644
index 1ae3eb6118..0000000000
--- a/Data/Sys/GameSettings/S2LE01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# S2LE01 - PokePark Wii2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs EFB to Ram to display photographs.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/S2LJ01.ini b/Data/Sys/GameSettings/S2LJ01.ini
deleted file mode 100644
index 772d1b2bff..0000000000
--- a/Data/Sys/GameSettings/S2LJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# S2LJ01 - PokePark Wii2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs EFB to Ram to display photographs.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/S2LP01.ini b/Data/Sys/GameSettings/S2LP01.ini
deleted file mode 100644
index 52a1dbbfb4..0000000000
--- a/Data/Sys/GameSettings/S2LP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# S2LP01 - PokePark Wii2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs EFB to Ram to display photographs.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/S2T.ini b/Data/Sys/GameSettings/S2T.ini
new file mode 100644
index 0000000000..e29f7d249b
--- /dev/null
+++ b/Data/Sys/GameSettings/S2T.ini
@@ -0,0 +1,19 @@
+# S2TJAF - TAIKO WII2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/S2TJAF.ini b/Data/Sys/GameSettings/S2TJAF.ini
deleted file mode 100644
index b8f9ec1534..0000000000
--- a/Data/Sys/GameSettings/S2TJAF.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# S2TJAF - TAIKO WII2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/S2W.ini b/Data/Sys/GameSettings/S2W.ini
new file mode 100644
index 0000000000..253b65a433
--- /dev/null
+++ b/Data/Sys/GameSettings/S2W.ini
@@ -0,0 +1,33 @@
+# S2WE78, S2WP78 - WWE All Stars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Use direct3d for less glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+
diff --git a/Data/Sys/GameSettings/S2WE78.ini b/Data/Sys/GameSettings/S2WE78.ini
deleted file mode 100644
index 5ec119c8da..0000000000
--- a/Data/Sys/GameSettings/S2WE78.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S2WE78 - WWE All Stars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct 3d 11 for less glitches(r7436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/S2WP78.ini b/Data/Sys/GameSettings/S2WP78.ini
deleted file mode 100644
index 78a763b4a3..0000000000
--- a/Data/Sys/GameSettings/S2WP78.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S2WP78 - WWE All Stars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use direct 3d 11 for less glitches(r7436)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/S3B.ini b/Data/Sys/GameSettings/S3B.ini
new file mode 100644
index 0000000000..14b9401045
--- /dev/null
+++ b/Data/Sys/GameSettings/S3B.ini
@@ -0,0 +1,32 @@
+# S3BEWR, S3BPWR - Batman: The Brave and the Bold
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/S3BEWR.ini b/Data/Sys/GameSettings/S3BEWR.ini
deleted file mode 100644
index 75b983fc0f..0000000000
--- a/Data/Sys/GameSettings/S3BEWR.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S3BEWR - Batman: The Brave and the Bold
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini
deleted file mode 100644
index 4b479e2c42..0000000000
--- a/Data/Sys/GameSettings/S3BPWR.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S3BPWR - Batman: The Brave and the Bold
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/S59.ini b/Data/Sys/GameSettings/S59.ini
new file mode 100644
index 0000000000..3a49b6cffb
--- /dev/null
+++ b/Data/Sys/GameSettings/S59.ini
@@ -0,0 +1,26 @@
+# S59E01, S59JC8, S59P01 - SAMURAI WARRIORS 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+FastDepthCalc = False
+
diff --git a/Data/Sys/GameSettings/S59E01.ini b/Data/Sys/GameSettings/S59E01.ini
deleted file mode 100644
index 1ac5ee0870..0000000000
--- a/Data/Sys/GameSettings/S59E01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# S59E01 - SAMURAI WARRIORS 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/S59JC8.ini b/Data/Sys/GameSettings/S59JC8.ini
deleted file mode 100644
index 07c251a79e..0000000000
--- a/Data/Sys/GameSettings/S59JC8.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# S59JC8 - Sengoku Musou 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 3
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/S59P01.ini b/Data/Sys/GameSettings/S59P01.ini
deleted file mode 100644
index 59abc778bf..0000000000
--- a/Data/Sys/GameSettings/S59P01.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# S59P01 - SAMURAI WARRIORS 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/S72.ini b/Data/Sys/GameSettings/S72.ini
new file mode 100644
index 0000000000..1f522662be
--- /dev/null
+++ b/Data/Sys/GameSettings/S72.ini
@@ -0,0 +1,35 @@
+# S72E01, S72J01 - Kirby's Dream Collection Special Edition
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 0
+EFBScale = -1
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/S72E01.ini b/Data/Sys/GameSettings/S72E01.ini
deleted file mode 100644
index 00a5d355c4..0000000000
--- a/Data/Sys/GameSettings/S72E01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S72E01 - Kirby's Dream Collection Special Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Kirby's Adventure (Nes classic) has severe graphic glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/S72J01.ini b/Data/Sys/GameSettings/S72J01.ini
deleted file mode 100644
index 3175bbc192..0000000000
--- a/Data/Sys/GameSettings/S72J01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# S72J01 - Hoshi No Kirby: 20th Anniversary Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Kirby's Adventure (Nes classic) has severe graphic glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/S75.ini b/Data/Sys/GameSettings/S75.ini
new file mode 100644
index 0000000000..17195c1c55
--- /dev/null
+++ b/Data/Sys/GameSettings/S75.ini
@@ -0,0 +1,31 @@
+# S75E69, S75P69 - Monopoly Streets
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Skip any errors at startup and use integral efb scale.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/S75E69.ini b/Data/Sys/GameSettings/S75E69.ini
deleted file mode 100644
index 0d08e7075a..0000000000
--- a/Data/Sys/GameSettings/S75E69.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# S75E69 - Monopoly Streets
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip any errors at startup and use integral efb scale (r6682)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/S75P69.ini b/Data/Sys/GameSettings/S75P69.ini
deleted file mode 100644
index ca758a4f81..0000000000
--- a/Data/Sys/GameSettings/S75P69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# S75P69 - Monopoly Streets
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Skip any errors at startup and use integral efb scale (r6682)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
diff --git a/Data/Sys/GameSettings/SAK.ini b/Data/Sys/GameSettings/SAK.ini
new file mode 100644
index 0000000000..b01bad6231
--- /dev/null
+++ b/Data/Sys/GameSettings/SAK.ini
@@ -0,0 +1,27 @@
+# SAKENS, SAKPNS - Sakura Wars: So Long, My Love
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SAKENS.ini b/Data/Sys/GameSettings/SAKENS.ini
deleted file mode 100644
index 03cd0c2fa4..0000000000
--- a/Data/Sys/GameSettings/SAKENS.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SAKENS - Sakura Wars: So Long, My Love
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SAKPNS.ini b/Data/Sys/GameSettings/SAKPNS.ini
deleted file mode 100644
index f1a089de5b..0000000000
--- a/Data/Sys/GameSettings/SAKPNS.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SAKPNS - Sakura Wars: So Long, My Love
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SAW.ini b/Data/Sys/GameSettings/SAW.ini
new file mode 100644
index 0000000000..57817481ae
--- /dev/null
+++ b/Data/Sys/GameSettings/SAW.ini
@@ -0,0 +1,21 @@
+# SAWE52 - Angry Birds Trilogy
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/SB3.ini b/Data/Sys/GameSettings/SB3.ini
new file mode 100644
index 0000000000..58c309f12c
--- /dev/null
+++ b/Data/Sys/GameSettings/SB3.ini
@@ -0,0 +1,30 @@
+# SB3E08, SB3J08, SB3P08 - Sengoku BASARA
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SB3E08.ini b/Data/Sys/GameSettings/SB3E08.ini
deleted file mode 100644
index 97d608bc45..0000000000
--- a/Data/Sys/GameSettings/SB3E08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SB3E08 - BASARA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SB3J08.ini b/Data/Sys/GameSettings/SB3J08.ini
deleted file mode 100644
index 9ac6d03cc4..0000000000
--- a/Data/Sys/GameSettings/SB3J08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SB3J08 - BASARA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SB3P08.ini b/Data/Sys/GameSettings/SB3P08.ini
deleted file mode 100644
index 7eaadfdb03..0000000000
--- a/Data/Sys/GameSettings/SB3P08.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SB3P08 - BASARA
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SB4.ini b/Data/Sys/GameSettings/SB4.ini
new file mode 100644
index 0000000000..89d870fd0b
--- /dev/null
+++ b/Data/Sys/GameSettings/SB4.ini
@@ -0,0 +1,29 @@
+# SB4E01, SB4J01, SB4P01 - SUPER MARIO GALAXY 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Efb Access from CPU.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SB4E01.ini b/Data/Sys/GameSettings/SB4E01.ini
deleted file mode 100644
index 8781b39f12..0000000000
--- a/Data/Sys/GameSettings/SB4E01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SB4E01 - SUPER MARIO GALAXY MORE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable audio or use the LLE plugin instead in levels with Grand Stars to avoid black screen. Needs "Enable CPU Access".(r6584)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/SB4J01.ini b/Data/Sys/GameSettings/SB4J01.ini
deleted file mode 100644
index 6dfe8c6d6b..0000000000
--- a/Data/Sys/GameSettings/SB4J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SB4J01 - SUPER MARIO GALAXY MORE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable audio or use the LLE plugin instead in levels with Grand Stars to avoid black screen. Needs "Enable CPU Access".(r6584)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/SB4P01.ini b/Data/Sys/GameSettings/SB4P01.ini
deleted file mode 100644
index bb48a270ab..0000000000
--- a/Data/Sys/GameSettings/SB4P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SB4P01 - SUPER MARIO GALAXY MORE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable audio or use the LLE plugin instead in levels with Grand Stars to avoid black screen. Needs "Enable CPU Access".(r6584)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBAccessEnable = True
-
diff --git a/Data/Sys/GameSettings/SBD.ini b/Data/Sys/GameSettings/SBD.ini
new file mode 100644
index 0000000000..ed5fe5ad89
--- /dev/null
+++ b/Data/Sys/GameSettings/SBD.ini
@@ -0,0 +1,33 @@
+# SBDE08, SBDJ08, SBDK08, SBDP08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini
deleted file mode 100644
index 42ee97c2a8..0000000000
--- a/Data/Sys/GameSettings/SBDE08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SBDE08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.5
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SBDJ08.ini b/Data/Sys/GameSettings/SBDJ08.ini
deleted file mode 100644
index e78ea3b084..0000000000
--- a/Data/Sys/GameSettings/SBDJ08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SBDJ08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.5
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SBDK08.ini b/Data/Sys/GameSettings/SBDK08.ini
deleted file mode 100644
index 7c163e4bd5..0000000000
--- a/Data/Sys/GameSettings/SBDK08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SBDK08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.5
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SBDP08.ini b/Data/Sys/GameSettings/SBDP08.ini
deleted file mode 100644
index ed7588029c..0000000000
--- a/Data/Sys/GameSettings/SBDP08.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SBDP08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 1
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.5
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SBL.ini b/Data/Sys/GameSettings/SBL.ini
new file mode 100644
index 0000000000..b15cf50698
--- /dev/null
+++ b/Data/Sys/GameSettings/SBL.ini
@@ -0,0 +1,27 @@
+# SBLE5G - Sample Game Name
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SBLE5G.ini b/Data/Sys/GameSettings/SBLE5G.ini
deleted file mode 100644
index a1a77e0344..0000000000
--- a/Data/Sys/GameSettings/SBLE5G.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SBLE5G - Sample Game Name
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SBN.ini b/Data/Sys/GameSettings/SBN.ini
new file mode 100644
index 0000000000..b0451d5173
--- /dev/null
+++ b/Data/Sys/GameSettings/SBN.ini
@@ -0,0 +1,19 @@
+# SBNEG9 - Ben 10 Alien Force: Vilgax Attacks
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SBNEG9.ini b/Data/Sys/GameSettings/SBNEG9.ini
deleted file mode 100644
index ba6dde36c2..0000000000
--- a/Data/Sys/GameSettings/SBNEG9.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SBNEG9 - Ben 10 Alien Force: Vilgax Attacks
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SBV.ini b/Data/Sys/GameSettings/SBV.ini
new file mode 100644
index 0000000000..d28ca02b06
--- /dev/null
+++ b/Data/Sys/GameSettings/SBV.ini
@@ -0,0 +1,19 @@
+# SBVE78 - SpongeBob's Boating Bash
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SBVE78.ini b/Data/Sys/GameSettings/SBVE78.ini
deleted file mode 100644
index d5e9ed3e5d..0000000000
--- a/Data/Sys/GameSettings/SBVE78.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SBVE78 - SpongeBob's Boating Bash
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SBX.ini b/Data/Sys/GameSettings/SBX.ini
new file mode 100644
index 0000000000..2091f4b1a4
--- /dev/null
+++ b/Data/Sys/GameSettings/SBX.ini
@@ -0,0 +1,24 @@
+# SBXEWR - The Bachelor the Video Game
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Wiimote cursor misaligned
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SC2.ini b/Data/Sys/GameSettings/SC2.ini
new file mode 100644
index 0000000000..cff85fc8fc
--- /dev/null
+++ b/Data/Sys/GameSettings/SC2.ini
@@ -0,0 +1,29 @@
+# SC2E8P, SC2P8P - Conduit 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SC2E8P.ini b/Data/Sys/GameSettings/SC2E8P.ini
index e714e16ad1..aae6e5787e 100644
--- a/Data/Sys/GameSettings/SC2E8P.ini
+++ b/Data/Sys/GameSettings/SC2E8P.ini
@@ -1,13 +1,4 @@
-# SC2E8P - Conduit 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
+# SC2P8P - Conduit 2
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,15 +8,52 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
+$Undead Invincibility Mode [Bully@Wiiplaza]
+F6000001 80008100
+8001002C 90180000
+D200000C 00000006
+2C110035 40820020
+2C0800F4 40820018
+2C0300A0 40820010
+3C007FFF 6000FFFF
+90040000 80040000
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+**You are completely untouchable*
+*Picture -&gt; http://imageshack.us/photo/my-images/684/sc2p8p008.png/
+$Inf. Ammo [Bully@Wiiplaza]
+F6000001 80008100
+80640000 80050000
+D2000008 00000003
+2C110021 4082000C
+38600000 7C030050
+60000000 00000000
+E0000000 80008000
+**Offline Only*
+$No Flashwhite [Bully@Wiiplaza]
+F6000001 80008100
+EC210032 93C10008
+14000114 60000000
+E0000000 80008000
+$Inf. Money [Bully@Wiiplaza]
+F6000001 80008100
+7C003A14 38E70001
+D2000010 00000004
+2C11002F 40820014
+2C0401A8 4082000C
+3D807FFF 7D84012E
+7C04002E 00000000
+E0000000 80008000
+$Profile One Name Changer Jedi Hack & [Mitch]
+0487E2D4 XXXXXXXX
+0487E2D8 XXXXXXXX
+0487E2DC XXXXXXXX
+$Profile Two Name Changer Jedi Hack & [Mitch]
+0487E320 0000XXXX
+0487E324 XXXXXXXX
+0487E328 XXXXXXXX
+0487E32C XXXX0000
+$Profile Three Name Changer Jedi Hack & [Mitch]
+0487E370 XXXXXXXX
+0487E374 XXXXXXXX
diff --git a/Data/Sys/GameSettings/SC2P8P.ini b/Data/Sys/GameSettings/SC2P8P.ini
deleted file mode 100644
index ccb5cd12e7..0000000000
--- a/Data/Sys/GameSettings/SC2P8P.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-# SC2P8P - Conduit 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-$Undead Invincibility Mode [Bully@Wiiplaza]
-F6000001 80008100
-8001002C 90180000
-D200000C 00000006
-2C110035 40820020
-2C0800F4 40820018
-2C0300A0 40820010
-3C007FFF 6000FFFF
-90040000 80040000
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-**You are completely untouchable*
-*Picture -&gt; http://imageshack.us/photo/my-images/684/sc2p8p008.png/
-$Inf. Ammo [Bully@Wiiplaza]
-F6000001 80008100
-80640000 80050000
-D2000008 00000003
-2C110021 4082000C
-38600000 7C030050
-60000000 00000000
-E0000000 80008000
-**Offline Only*
-$No Flashwhite [Bully@Wiiplaza]
-F6000001 80008100
-EC210032 93C10008
-14000114 60000000
-E0000000 80008000
-$Inf. Money [Bully@Wiiplaza]
-F6000001 80008100
-7C003A14 38E70001
-D2000010 00000004
-2C11002F 40820014
-2C0401A8 4082000C
-3D807FFF 7D84012E
-7C04002E 00000000
-E0000000 80008000
-$Profile One Name Changer Jedi Hack & [Mitch]
-0487E2D4 XXXXXXXX
-0487E2D8 XXXXXXXX
-0487E2DC XXXXXXXX
-$Profile Two Name Changer Jedi Hack & [Mitch]
-0487E320 0000XXXX
-0487E324 XXXXXXXX
-0487E328 XXXXXXXX
-0487E32C XXXX0000
-$Profile Three Name Changer Jedi Hack & [Mitch]
-0487E370 XXXXXXXX
-0487E374 XXXXXXXX
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SC4.ini b/Data/Sys/GameSettings/SC4.ini
new file mode 100644
index 0000000000..7c3fefbd7e
--- /dev/null
+++ b/Data/Sys/GameSettings/SC4.ini
@@ -0,0 +1,29 @@
+# SC4E64, SC4P64 - LEGO Star Wars III: The Clone Wars
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini
deleted file mode 100644
index c4017d8d58..0000000000
--- a/Data/Sys/GameSettings/SC4E64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC4E64 - LEGO Star Wars III: The Clone Wars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini
deleted file mode 100644
index c7e7320572..0000000000
--- a/Data/Sys/GameSettings/SC4P64.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC4P64 - LEGO Star Wars III: The Clone Wars
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SC7.ini b/Data/Sys/GameSettings/SC7.ini
new file mode 100644
index 0000000000..a19238f6b3
--- /dev/null
+++ b/Data/Sys/GameSettings/SC7.ini
@@ -0,0 +1,29 @@
+# SC7D52, SC7E52, SC7F52, SC7I52, SC7P52, SC7S52 - Call of Duty: Black Ops
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar =
+
+[Video_Enhancements]
+MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SC7D52.ini b/Data/Sys/GameSettings/SC7D52.ini
deleted file mode 100644
index 0950049491..0000000000
--- a/Data/Sys/GameSettings/SC7D52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7D52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7E52.ini b/Data/Sys/GameSettings/SC7E52.ini
deleted file mode 100644
index a7dba018dc..0000000000
--- a/Data/Sys/GameSettings/SC7E52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7E52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7F52.ini b/Data/Sys/GameSettings/SC7F52.ini
deleted file mode 100644
index 0b05a4af42..0000000000
--- a/Data/Sys/GameSettings/SC7F52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7F52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7I52.ini b/Data/Sys/GameSettings/SC7I52.ini
deleted file mode 100644
index 3179aebde4..0000000000
--- a/Data/Sys/GameSettings/SC7I52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7I52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7P52.ini b/Data/Sys/GameSettings/SC7P52.ini
deleted file mode 100644
index 2f126dc40f..0000000000
--- a/Data/Sys/GameSettings/SC7P52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7P52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC7S52.ini b/Data/Sys/GameSettings/SC7S52.ini
deleted file mode 100644
index b12713dd8e..0000000000
--- a/Data/Sys/GameSettings/SC7S52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SC7S52 - Call of Duty: Black Ops
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0. 01
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SC8.ini b/Data/Sys/GameSettings/SC8.ini
new file mode 100644
index 0000000000..094be8c56a
--- /dev/null
+++ b/Data/Sys/GameSettings/SC8.ini
@@ -0,0 +1,27 @@
+# SC8E01, SC8J01, SC8P01 - Wii Play: Motion
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real wiimote and motion plus.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SC8E01.ini b/Data/Sys/GameSettings/SC8E01.ini
deleted file mode 100644
index b54fef2319..0000000000
--- a/Data/Sys/GameSettings/SC8E01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SC8E01 - Wii Play: Motion
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SC8J01.ini b/Data/Sys/GameSettings/SC8J01.ini
deleted file mode 100644
index ce965c2650..0000000000
--- a/Data/Sys/GameSettings/SC8J01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SC8J01 - Wii Play: Motion
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SC8P01.ini b/Data/Sys/GameSettings/SC8P01.ini
deleted file mode 100644
index cad529e227..0000000000
--- a/Data/Sys/GameSettings/SC8P01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SC8P01 - Wii Play: Motion
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SCA.ini b/Data/Sys/GameSettings/SCA.ini
new file mode 100644
index 0000000000..10b6595583
--- /dev/null
+++ b/Data/Sys/GameSettings/SCA.ini
@@ -0,0 +1,33 @@
+# SCAE18, SCAJ18, SCAP18 - CALLING
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+
diff --git a/Data/Sys/GameSettings/SCAE18.ini b/Data/Sys/GameSettings/SCAE18.ini
deleted file mode 100644
index 453a754042..0000000000
--- a/Data/Sys/GameSettings/SCAE18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAE18 - CALLING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SCAJ18.ini b/Data/Sys/GameSettings/SCAJ18.ini
deleted file mode 100644
index e00617c60e..0000000000
--- a/Data/Sys/GameSettings/SCAJ18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAJ18 - CALLING Kuroki Chakushin
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SCAP18.ini b/Data/Sys/GameSettings/SCAP18.ini
deleted file mode 100644
index a176ce7627..0000000000
--- a/Data/Sys/GameSettings/SCAP18.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SCAP18 - CALLING
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SCY.ini b/Data/Sys/GameSettings/SCY.ini
new file mode 100644
index 0000000000..514858afea
--- /dev/null
+++ b/Data/Sys/GameSettings/SCY.ini
@@ -0,0 +1,27 @@
+# SCYE4Q, SCYP4Q, SCYX4Q, SCYY4Q, SCYZ4Q - Cars 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SCYE4Q.ini b/Data/Sys/GameSettings/SCYE4Q.ini
deleted file mode 100644
index d1a6e36bb3..0000000000
--- a/Data/Sys/GameSettings/SCYE4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYE4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SCYP4Q.ini b/Data/Sys/GameSettings/SCYP4Q.ini
deleted file mode 100644
index 217d7da1d1..0000000000
--- a/Data/Sys/GameSettings/SCYP4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYP4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SCYX4Q.ini b/Data/Sys/GameSettings/SCYX4Q.ini
deleted file mode 100644
index 956afc5a82..0000000000
--- a/Data/Sys/GameSettings/SCYX4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYX4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SCYY4Q.ini b/Data/Sys/GameSettings/SCYY4Q.ini
deleted file mode 100644
index 17f535a077..0000000000
--- a/Data/Sys/GameSettings/SCYY4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYY4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SCYZ4Q.ini b/Data/Sys/GameSettings/SCYZ4Q.ini
deleted file mode 100644
index 29018bdd1a..0000000000
--- a/Data/Sys/GameSettings/SCYZ4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SCYZ4Q - Cars 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SD2.ini b/Data/Sys/GameSettings/SD2.ini
new file mode 100644
index 0000000000..f257d444d6
--- /dev/null
+++ b/Data/Sys/GameSettings/SD2.ini
@@ -0,0 +1,34 @@
+# SD2E41, SD2K41, SD2P41, SD2Y41 - Just Dance 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SD2E41.ini b/Data/Sys/GameSettings/SD2E41.ini
deleted file mode 100644
index aebd761b81..0000000000
--- a/Data/Sys/GameSettings/SD2E41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2E41 - Just Dance 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SD2J01.ini b/Data/Sys/GameSettings/SD2J01.ini
index d131b44b30..8228106709 100644
--- a/Data/Sys/GameSettings/SD2J01.ini
+++ b/Data/Sys/GameSettings/SD2J01.ini
@@ -1,7 +1,10 @@
-# SD2J01 - Just Dance 2
+# SD2J01 - Just Dance Wii
+
+# Although they share the same game ID, Just Dance 2 (SD2.ini)
+# and Just Dance Wii (SD2J01.ini) are completely different games. 
 
 [Core]
-# Values set here will override the main dolphin settings.
+# Values set here will override the main Dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -26,8 +29,9 @@ PH_ZNear =
 PH_ZFar =
 
 [Video_Settings]
+EFBScale = -1
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
 MaxAnisotropy = 0
-
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SD2P41.ini b/Data/Sys/GameSettings/SD2P41.ini
deleted file mode 100644
index 990ff3fbb0..0000000000
--- a/Data/Sys/GameSettings/SD2P41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2P41 - Just Dance 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SD2Y41.ini b/Data/Sys/GameSettings/SD2Y41.ini
deleted file mode 100644
index 76d7038c9f..0000000000
--- a/Data/Sys/GameSettings/SD2Y41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SD2Y41 - Just Dance 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SDA.ini b/Data/Sys/GameSettings/SDA.ini
new file mode 100644
index 0000000000..d880439a76
--- /dev/null
+++ b/Data/Sys/GameSettings/SDA.ini
@@ -0,0 +1,23 @@
+# WSDAE5G - Daring Game for Girls
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/SDB.ini b/Data/Sys/GameSettings/SDB.ini
new file mode 100644
index 0000000000..bd2781047f
--- /dev/null
+++ b/Data/Sys/GameSettings/SDB.ini
@@ -0,0 +1,30 @@
+# SDBE78, SDBP78 - de Blob 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SDBE78.ini b/Data/Sys/GameSettings/SDBE78.ini
deleted file mode 100644
index df471f4d0a..0000000000
--- a/Data/Sys/GameSettings/SDBE78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDBE78 - de Blob 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SDBP78.ini b/Data/Sys/GameSettings/SDBP78.ini
deleted file mode 100644
index 01cfa04645..0000000000
--- a/Data/Sys/GameSettings/SDBP78.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDBP78 - de Blob 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SDF.ini b/Data/Sys/GameSettings/SDF.ini
new file mode 100644
index 0000000000..e8ca259d70
--- /dev/null
+++ b/Data/Sys/GameSettings/SDF.ini
@@ -0,0 +1,27 @@
+# SDFE4Q - Disney Sing It: Family Hits
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SDFE4Q.ini b/Data/Sys/GameSettings/SDFE4Q.ini
deleted file mode 100644
index e875d4da0a..0000000000
--- a/Data/Sys/GameSettings/SDFE4Q.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SDFE4Q - Disney Sing It: Family Hits
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SDM.ini b/Data/Sys/GameSettings/SDM.ini
new file mode 100644
index 0000000000..955916ba1e
--- /dev/null
+++ b/Data/Sys/GameSettings/SDM.ini
@@ -0,0 +1,33 @@
+# SDMEG9, SDMPAF - Despicable Me
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SDN.ini b/Data/Sys/GameSettings/SDN.ini
new file mode 100644
index 0000000000..35baf28652
--- /dev/null
+++ b/Data/Sys/GameSettings/SDN.ini
@@ -0,0 +1,33 @@
+# SDNE41, SDNP41 - Just Dance
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SDNE41.ini b/Data/Sys/GameSettings/SDNE41.ini
deleted file mode 100644
index 500f76a985..0000000000
--- a/Data/Sys/GameSettings/SDNE41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SDNE41 - Just Dance
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SDNP41.ini b/Data/Sys/GameSettings/SDNP41.ini
deleted file mode 100644
index 8d143dc9c8..0000000000
--- a/Data/Sys/GameSettings/SDNP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SDNP41 - Just Dance
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SDW.ini b/Data/Sys/GameSettings/SDW.ini
new file mode 100644
index 0000000000..79fa1ce844
--- /dev/null
+++ b/Data/Sys/GameSettings/SDW.ini
@@ -0,0 +1,30 @@
+# SDWE18, SDWJ18, SDWP18 - A Shadow's Tale
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs efb to ram for proper shadows.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SDWE18.ini b/Data/Sys/GameSettings/SDWE18.ini
deleted file mode 100644
index e93421b866..0000000000
--- a/Data/Sys/GameSettings/SDWE18.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDWE18 - A Shadow's Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs efb to ram for proper shadows.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SDWJ18.ini b/Data/Sys/GameSettings/SDWJ18.ini
deleted file mode 100644
index 6702f2355c..0000000000
--- a/Data/Sys/GameSettings/SDWJ18.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDWJ18 - Kage no Tou
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs efb to ram for proper shadows.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SDWP18.ini b/Data/Sys/GameSettings/SDWP18.ini
deleted file mode 100644
index ed3c2ecbcf..0000000000
--- a/Data/Sys/GameSettings/SDWP18.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDWP18 - A Shadow's Tale
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs efb to ram for proper shadows.
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SE2.ini b/Data/Sys/GameSettings/SE2.ini
new file mode 100644
index 0000000000..8ccb245995
--- /dev/null
+++ b/Data/Sys/GameSettings/SE2.ini
@@ -0,0 +1,28 @@
+# SE2P69 - EA Sports Active 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+ForceFiltering = False
+
diff --git a/Data/Sys/GameSettings/SE2P69.ini b/Data/Sys/GameSettings/SE2P69.ini
deleted file mode 100644
index 50ac7050a1..0000000000
--- a/Data/Sys/GameSettings/SE2P69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SE2P69 - EA Sports Active 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SE3.ini b/Data/Sys/GameSettings/SE3.ini
new file mode 100644
index 0000000000..2016edb73f
--- /dev/null
+++ b/Data/Sys/GameSettings/SE3.ini
@@ -0,0 +1,29 @@
+# SE3E41, SE3P41 - Just Dance 2015
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Freezes at boot, refer issue 6701
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SEA.ini b/Data/Sys/GameSettings/SEA.ini
new file mode 100644
index 0000000000..8e2599858c
--- /dev/null
+++ b/Data/Sys/GameSettings/SEA.ini
@@ -0,0 +1,28 @@
+# SEAE69, SEAJ13, SEAP69 - EA Sports Active: More Workouts
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+ForceFiltering = False
+
diff --git a/Data/Sys/GameSettings/SEAE69.ini b/Data/Sys/GameSettings/SEAE69.ini
deleted file mode 100644
index e8ec4c4a39..0000000000
--- a/Data/Sys/GameSettings/SEAE69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SEAE69 - EA Sports Active: More Workouts
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SEAJ13.ini b/Data/Sys/GameSettings/SEAJ13.ini
deleted file mode 100644
index b38274c168..0000000000
--- a/Data/Sys/GameSettings/SEAJ13.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SEAJ13 - EA Sports Active: More Workouts
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SEAP69.ini b/Data/Sys/GameSettings/SEAP69.ini
deleted file mode 100644
index 918b2cd492..0000000000
--- a/Data/Sys/GameSettings/SEAP69.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-# SEAP69 - EA Sports Active: More Workouts
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SEM.ini b/Data/Sys/GameSettings/SEM.ini
new file mode 100644
index 0000000000..56136a4a05
--- /dev/null
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -0,0 +1,36 @@
+# SEME4Q, SEMJ01, SEMP4Q, SEMX4Q, SEMY4Q, SEMZ4Q - Disney Epic Mickey
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Enable progressive scan if the game has boot issues.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 0
+
+[Video_Enhancements]
+ForceFiltering = False
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini
deleted file mode 100644
index 487e5571df..0000000000
--- a/Data/Sys/GameSettings/SEME4Q.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEME4Q - Disney Epic Mickey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini
deleted file mode 100644
index 73106463f3..0000000000
--- a/Data/Sys/GameSettings/SEMJ01.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEMJ01 - Disney Epic Mickey: Mickey Mouse and the Magic Brush
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SEMP4Q.ini b/Data/Sys/GameSettings/SEMP4Q.ini
deleted file mode 100644
index 3eef876fda..0000000000
--- a/Data/Sys/GameSettings/SEMP4Q.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEMP4Q - Disney Epic Mickey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini
deleted file mode 100644
index 1efd288b23..0000000000
--- a/Data/Sys/GameSettings/SEMX4Q.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEMX4Q - Disney Epic Mickey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini
deleted file mode 100644
index 5234e9cc99..0000000000
--- a/Data/Sys/GameSettings/SEMY4Q.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEMY4Q - Disney Epic Mickey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini
deleted file mode 100644
index bbcf9b1db1..0000000000
--- a/Data/Sys/GameSettings/SEMZ4Q.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# SEMZ4Q - Disney Epic Mickey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
-[Video_Enhancements]
-ForceFiltering = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SER.ini b/Data/Sys/GameSettings/SER.ini
new file mode 100644
index 0000000000..fc3fe07dcb
--- /dev/null
+++ b/Data/Sys/GameSettings/SER.ini
@@ -0,0 +1,31 @@
+# SERE4Q, SERF4Q, SERP4Q - Disney Epic Mickey 2: The Power of 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Enable progressive scan if the game has boot issues.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/SERE4Q.ini b/Data/Sys/GameSettings/SERE4Q.ini
deleted file mode 100644
index 527c7f4e46..0000000000
--- a/Data/Sys/GameSettings/SERE4Q.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SERE4Q - Disney Epic Mickey 2: The Power of 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SERF4Q.ini b/Data/Sys/GameSettings/SERF4Q.ini
deleted file mode 100644
index 35aecc502f..0000000000
--- a/Data/Sys/GameSettings/SERF4Q.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SERF4Q - Disney Epic Mickey 2: The Power of 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SERP4Q.ini b/Data/Sys/GameSettings/SERP4Q.ini
deleted file mode 100644
index 9cf8859ec3..0000000000
--- a/Data/Sys/GameSettings/SERP4Q.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SERP4Q - Disney Epic Mickey 2: The Power of 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Enable progressive scan if the game has boot issues.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EFBScale = -1
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SF8.ini b/Data/Sys/GameSettings/SF8.ini
new file mode 100644
index 0000000000..d02fe5eab8
--- /dev/null
+++ b/Data/Sys/GameSettings/SF8.ini
@@ -0,0 +1,30 @@
+# SF8E01, SF8J01, SF8P01 - Donkey Kong Country Returns
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Sound crackling can be fixed by lle audio.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SF8E01.ini b/Data/Sys/GameSettings/SF8E01.ini
deleted file mode 100644
index ca73bdf14d..0000000000
--- a/Data/Sys/GameSettings/SF8E01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SF8E01 - Donkey Kong Country Returns
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound crackling can be fixed by lle audio.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SF8J01.ini b/Data/Sys/GameSettings/SF8J01.ini
deleted file mode 100644
index cb0c63a438..0000000000
--- a/Data/Sys/GameSettings/SF8J01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SF8J01 - Donkey Kong Country Returns
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound crackling can be fixed by lle audio.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SF8P01.ini b/Data/Sys/GameSettings/SF8P01.ini
deleted file mode 100644
index c9cc83b421..0000000000
--- a/Data/Sys/GameSettings/SF8P01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SF8P01 - Donkey Kong Country Returns
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Sound crackling can be fixed by lle audio.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SFI.ini b/Data/Sys/GameSettings/SFI.ini
new file mode 100644
index 0000000000..18b398ef4e
--- /dev/null
+++ b/Data/Sys/GameSettings/SFI.ini
@@ -0,0 +1,32 @@
+# SFIE01, SFIP01 - Mystery Case Files: The Malgrave Incident
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/SFIE01.ini b/Data/Sys/GameSettings/SFIE01.ini
deleted file mode 100644
index 9b4220c76a..0000000000
--- a/Data/Sys/GameSettings/SFIE01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SFIE01 - Mystery Case Files: The Malgrave Incident
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SFIP01.ini b/Data/Sys/GameSettings/SFIP01.ini
deleted file mode 100644
index 201278d20e..0000000000
--- a/Data/Sys/GameSettings/SFIP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SFIP01 - Mystery Case Files: The Malgrave Incident
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SFW.ini b/Data/Sys/GameSettings/SFW.ini
new file mode 100644
index 0000000000..67885ea72f
--- /dev/null
+++ b/Data/Sys/GameSettings/SFW.ini
@@ -0,0 +1,19 @@
+# SFWE69, SFWP69 - World Cup 2010
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SFWE69.ini b/Data/Sys/GameSettings/SFWE69.ini
deleted file mode 100644
index 7a267d9e8b..0000000000
--- a/Data/Sys/GameSettings/SFWE69.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SFWE69 - World Cup 2010
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SFWP69.ini b/Data/Sys/GameSettings/SFWP69.ini
deleted file mode 100644
index 87d012c580..0000000000
--- a/Data/Sys/GameSettings/SFWP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SFWP69 - World Cup 2010
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Lacks HLE Sound
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SG8.ini b/Data/Sys/GameSettings/SG8.ini
new file mode 100644
index 0000000000..0012f7c475
--- /dev/null
+++ b/Data/Sys/GameSettings/SG8.ini
@@ -0,0 +1,33 @@
+# SG8EG9, SG8PAF - Yogi Bear
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SGA.ini b/Data/Sys/GameSettings/SGA.ini
new file mode 100644
index 0000000000..91c1808ef0
--- /dev/null
+++ b/Data/Sys/GameSettings/SGA.ini
@@ -0,0 +1,22 @@
+# SGAP8P - Tournament of Legends
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/SGAP8P.ini b/Data/Sys/GameSettings/SGAP8P.ini
deleted file mode 100644
index 856382a74f..0000000000
--- a/Data/Sys/GameSettings/SGAP8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SGAP8P - Tournament of Legends™
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SH6.ini b/Data/Sys/GameSettings/SH6.ini
new file mode 100644
index 0000000000..69169c4c54
--- /dev/null
+++ b/Data/Sys/GameSettings/SH6.ini
@@ -0,0 +1,30 @@
+# SH6E52 - Cabela's Big Game Hunter 2012
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SH6E52.ini b/Data/Sys/GameSettings/SH6E52.ini
deleted file mode 100644
index 569b66f94c..0000000000
--- a/Data/Sys/GameSettings/SH6E52.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SH6E52 - Cabela's Big Game Hunter 2012
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = MMU hack is needed or the game crashes during loading. EFB to RAM prevents glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SHD.ini b/Data/Sys/GameSettings/SHD.ini
new file mode 100644
index 0000000000..2572913377
--- /dev/null
+++ b/Data/Sys/GameSettings/SHD.ini
@@ -0,0 +1,19 @@
+# SHDE52 - How to Train Your Dragon
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SHDE52.ini b/Data/Sys/GameSettings/SHDE52.ini
deleted file mode 100644
index b0a49feed4..0000000000
--- a/Data/Sys/GameSettings/SHDE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SHDE52 - How to Train Your Dragon
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SHL.ini b/Data/Sys/GameSettings/SHL.ini
new file mode 100644
index 0000000000..6314d5b18e
--- /dev/null
+++ b/Data/Sys/GameSettings/SHL.ini
@@ -0,0 +1,30 @@
+# SHLPA4 - Silent Hill: Shattered Memories
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Flashlight glitches (r6521)
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SHLPA4.ini b/Data/Sys/GameSettings/SHLPA4.ini
deleted file mode 100644
index 09af51039e..0000000000
--- a/Data/Sys/GameSettings/SHLPA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SHLPA4 - Silent Hill: Shattered Memories
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Flashlight glitches (r6521)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SIL.ini b/Data/Sys/GameSettings/SIL.ini
new file mode 100644
index 0000000000..f9ccb4a646
--- /dev/null
+++ b/Data/Sys/GameSettings/SIL.ini
@@ -0,0 +1,23 @@
+# SILE78, SILP78 - Worms Battle Islands
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SILE78.ini b/Data/Sys/GameSettings/SILE78.ini
deleted file mode 100644
index cd240e8ce5..0000000000
--- a/Data/Sys/GameSettings/SILE78.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SILE78 - Worms Battle Islands
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SILP78.ini b/Data/Sys/GameSettings/SILP78.ini
deleted file mode 100644
index beece386c1..0000000000
--- a/Data/Sys/GameSettings/SILP78.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SILP78 - Worms Battle Islands
-
-[Core]
-# Values set here will override the main dolphin settings.
-TLBHack = 1
-SkipIdle = 0
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idleskipping causes speed issues(menus,etc.)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SJB.ini b/Data/Sys/GameSettings/SJB.ini
new file mode 100644
index 0000000000..fd49928d89
--- /dev/null
+++ b/Data/Sys/GameSettings/SJB.ini
@@ -0,0 +1,30 @@
+# SJBE52, SJBJ01, SJBP52 - GoldenEye007
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SJBE52.ini b/Data/Sys/GameSettings/SJBE52.ini
deleted file mode 100644
index ce124b2e96..0000000000
--- a/Data/Sys/GameSettings/SJBE52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SJBE52 - BondX
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts (r6480)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini
deleted file mode 100644
index 426fc4a0e9..0000000000
--- a/Data/Sys/GameSettings/SJBP52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SJBP52 - BondX
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable the gamecube controller or the wiimote to not have conflicts (r6480)
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/SJD.ini b/Data/Sys/GameSettings/SJD.ini
new file mode 100644
index 0000000000..fa439c1a74
--- /dev/null
+++ b/Data/Sys/GameSettings/SJD.ini
@@ -0,0 +1,34 @@
+# SJDE41, SJDP41, SJDX41, SJDY41, SJDZ41 - Just Dance 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SJDE41.ini b/Data/Sys/GameSettings/SJDE41.ini
deleted file mode 100644
index 569690830e..0000000000
--- a/Data/Sys/GameSettings/SJDE41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJDE41 - Just Dance 3
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJDJ01.ini b/Data/Sys/GameSettings/SJDJ01.ini
new file mode 100644
index 0000000000..2dcf93efb4
--- /dev/null
+++ b/Data/Sys/GameSettings/SJDJ01.ini
@@ -0,0 +1,37 @@
+# SJDJ01 - Just Dance Wii 2
+
+# Although they share the same game ID, Just Dance 3 (SJD.ini) and
+# Just Dance Wii 2 (SJDJ01.ini) are completely different games. 
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+SafeTextureCacheColorSamples = 512
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SJDP41.ini b/Data/Sys/GameSettings/SJDP41.ini
deleted file mode 100644
index cfe8d58c98..0000000000
--- a/Data/Sys/GameSettings/SJDP41.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# SJDP41 - Just Dance 3
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
-
diff --git a/Data/Sys/GameSettings/SJDY41.ini b/Data/Sys/GameSettings/SJDY41.ini
deleted file mode 100644
index df5b7b8fc4..0000000000
--- a/Data/Sys/GameSettings/SJDY41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJDY41 - Just Dance 3
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJDZ41.ini b/Data/Sys/GameSettings/SJDZ41.ini
deleted file mode 100644
index 2c36d68645..0000000000
--- a/Data/Sys/GameSettings/SJDZ41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJDP41 - Just Dance 3
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJE.ini b/Data/Sys/GameSettings/SJE.ini
new file mode 100644
index 0000000000..e0a0572621
--- /dev/null
+++ b/Data/Sys/GameSettings/SJE.ini
@@ -0,0 +1,25 @@
+# SJEEPK - Jumpstart Escape from Adventure Island
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SJO.ini b/Data/Sys/GameSettings/SJO.ini
new file mode 100644
index 0000000000..373ee9ed58
--- /dev/null
+++ b/Data/Sys/GameSettings/SJO.ini
@@ -0,0 +1,29 @@
+# SJOE41, SJOP41 - Just Dance 2014
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Freezes at boot, refer issue 6701
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SJX.ini b/Data/Sys/GameSettings/SJX.ini
new file mode 100644
index 0000000000..ff990a09ba
--- /dev/null
+++ b/Data/Sys/GameSettings/SJX.ini
@@ -0,0 +1,33 @@
+# SJXD41, SJXE41, SJXP41 - Just Dance 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SJXD41.ini b/Data/Sys/GameSettings/SJXD41.ini
deleted file mode 100644
index 31586b5e5d..0000000000
--- a/Data/Sys/GameSettings/SJXD41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJXD41 - Just Dance 4
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJXE41.ini b/Data/Sys/GameSettings/SJXE41.ini
deleted file mode 100644
index 5834e3e951..0000000000
--- a/Data/Sys/GameSettings/SJXE41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJXE41 - Just Dance 4
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SJXP41.ini b/Data/Sys/GameSettings/SJXP41.ini
deleted file mode 100644
index abf0264ef6..0000000000
--- a/Data/Sys/GameSettings/SJXP41.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SJXP41 - Just Dance 4
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Enhancements]
-MaxAnisotropy = 0
diff --git a/Data/Sys/GameSettings/SK3.ini b/Data/Sys/GameSettings/SK3.ini
new file mode 100644
index 0000000000..514a85e8f4
--- /dev/null
+++ b/Data/Sys/GameSettings/SK3.ini
@@ -0,0 +1,30 @@
+# SK3EEB - TRAUMA TEAM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SK3EEB.ini b/Data/Sys/GameSettings/SK3EEB.ini
deleted file mode 100644
index 522c022948..0000000000
--- a/Data/Sys/GameSettings/SK3EEB.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SK3EEB - TRAUMA TEAM
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SK4.ini b/Data/Sys/GameSettings/SK4.ini
new file mode 100644
index 0000000000..a33d0588e6
--- /dev/null
+++ b/Data/Sys/GameSettings/SK4.ini
@@ -0,0 +1,19 @@
+# SK4E52 - Shrek Forever After
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SK4E52.ini b/Data/Sys/GameSettings/SK4E52.ini
deleted file mode 100644
index f492e8a814..0000000000
--- a/Data/Sys/GameSettings/SK4E52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SK4E52 - Shrek Forever After
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SKC.ini b/Data/Sys/GameSettings/SKC.ini
new file mode 100644
index 0000000000..56828ac2c6
--- /dev/null
+++ b/Data/Sys/GameSettings/SKC.ini
@@ -0,0 +1,24 @@
+# SKCE20 - Bigfoot - King of Crush
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SKJ.ini b/Data/Sys/GameSettings/SKJ.ini
new file mode 100644
index 0000000000..4c767bb645
--- /dev/null
+++ b/Data/Sys/GameSettings/SKJ.ini
@@ -0,0 +1,33 @@
+# SKJE78 - You Don't Know Jack
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/SKJE78.ini b/Data/Sys/GameSettings/SKJE78.ini
deleted file mode 100644
index af151003cb..0000000000
--- a/Data/Sys/GameSettings/SKJE78.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SKJE78 - You Don't Know Jack
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SKV.ini b/Data/Sys/GameSettings/SKV.ini
new file mode 100644
index 0000000000..68ac56f047
--- /dev/null
+++ b/Data/Sys/GameSettings/SKV.ini
@@ -0,0 +1,31 @@
+# SKVE20 - Kevin VanDam's Big Bass Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/SKVE20.ini b/Data/Sys/GameSettings/SKVE20.ini
deleted file mode 100644
index c9a3bef254..0000000000
--- a/Data/Sys/GameSettings/SKVE20.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SKVE20 - Kevin VanDam's Big Bass Challenge
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SL2.ini b/Data/Sys/GameSettings/SL2.ini
new file mode 100644
index 0000000000..3f72894016
--- /dev/null
+++ b/Data/Sys/GameSettings/SL2.ini
@@ -0,0 +1,28 @@
+# SL2J01, SL2P01 - Project Zero 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Gecko]
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SLS.ini b/Data/Sys/GameSettings/SLS.ini
new file mode 100644
index 0000000000..98d8aa9a36
--- /dev/null
+++ b/Data/Sys/GameSettings/SLS.ini
@@ -0,0 +1,32 @@
+# SLSEXJ, SLSJ01, SLSP01 - THE LAST STORY
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SLSEXJ.ini b/Data/Sys/GameSettings/SLSEXJ.ini
deleted file mode 100644
index b5ecb2a061..0000000000
--- a/Data/Sys/GameSettings/SLSEXJ.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SLSEXJ - THE LAST STORY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SLSJ01.ini b/Data/Sys/GameSettings/SLSJ01.ini
deleted file mode 100644
index fe44bde494..0000000000
--- a/Data/Sys/GameSettings/SLSJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SLSJ01 - THE LAST STORY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SLSP01.ini b/Data/Sys/GameSettings/SLSP01.ini
deleted file mode 100644
index 4a143a76f8..0000000000
--- a/Data/Sys/GameSettings/SLSP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SLSP01 - THE LAST STORY
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SLW.ini b/Data/Sys/GameSettings/SLW.ini
new file mode 100644
index 0000000000..d1f98bd89b
--- /dev/null
+++ b/Data/Sys/GameSettings/SLW.ini
@@ -0,0 +1,31 @@
+# SLWE41 - Where's Waldo? The Fantastic Journey
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the pointer to appear.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/SLWE41.ini b/Data/Sys/GameSettings/SLWE41.ini
deleted file mode 100644
index b1e14d18b6..0000000000
--- a/Data/Sys/GameSettings/SLWE41.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SLWE41 - Where's Waldo? The Fantastic Journey
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the pointer to appear.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SMB.ini b/Data/Sys/GameSettings/SMB.ini
new file mode 100644
index 0000000000..c5023d0ffc
--- /dev/null
+++ b/Data/Sys/GameSettings/SMB.ini
@@ -0,0 +1,20 @@
+# SMBE8P, SMBP8P - SUPER MONKEY BALL STEP AND ROLL
+
+[Core]
+# Values set here will override the main Dolphin settings.
+FPRF = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = disable dualcore, if there are (fifo) problems
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SMBE8P.ini b/Data/Sys/GameSettings/SMBE8P.ini
deleted file mode 100644
index 13701d64b5..0000000000
--- a/Data/Sys/GameSettings/SMBE8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SMBE8P - SUPER MONKEY BALL STEP AND ROLL
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = disable dualcore, if there are (fifo) problems
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini
deleted file mode 100644
index 2ce0ed56f8..0000000000
--- a/Data/Sys/GameSettings/SMBP8P.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SMBP8P - SUPER MONKEY BALL STEP AND ROLL
-
-[Core]
-# Values set here will override the main dolphin settings.
-EnableFPRF=True
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = disable dualcore, if there are (fifo) problems
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SMF.ini b/Data/Sys/GameSettings/SMF.ini
new file mode 100644
index 0000000000..81b771b19b
--- /dev/null
+++ b/Data/Sys/GameSettings/SMF.ini
@@ -0,0 +1,33 @@
+# SMFE4Q, SMFP4Q - Phineas and Ferb Across the 2nd Dimension
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+UseXFB = True
+UseRealXFB = False
+
+
diff --git a/Data/Sys/GameSettings/SMFE4Q.ini b/Data/Sys/GameSettings/SMFE4Q.ini
deleted file mode 100644
index 69e1270a0e..0000000000
--- a/Data/Sys/GameSettings/SMFE4Q.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMFE4Q - Phineas and Ferb Across the 2nd Dimension
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
-
-
diff --git a/Data/Sys/GameSettings/SMFP4Q.ini b/Data/Sys/GameSettings/SMFP4Q.ini
deleted file mode 100644
index cc350b1440..0000000000
--- a/Data/Sys/GameSettings/SMFP4Q.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SMFP4Q - Phineas and Ferb Across the 2nd Dimension
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SMN.ini b/Data/Sys/GameSettings/SMN.ini
new file mode 100644
index 0000000000..82c32666e7
--- /dev/null
+++ b/Data/Sys/GameSettings/SMN.ini
@@ -0,0 +1,32 @@
+# SMNE01, SMNJ01, SMNK01, SMNP01, SMNW01 - New SUPER MARIO BROS. Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SMNE01.ini b/Data/Sys/GameSettings/SMNE01.ini
index ebc073f6e8..e9db06832f 100644
--- a/Data/Sys/GameSettings/SMNE01.ini
+++ b/Data/Sys/GameSettings/SMNE01.ini
@@ -1,13 +1,5 @@
 # SMNE01 - New SUPER MARIO BROS. Wii
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -40,18 +32,3 @@ $Infinite Mini Mushrooms
 $Infinite Stars
 00C7FE6F 00000063
 015DBB8F 00000063
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SMNJ01.ini b/Data/Sys/GameSettings/SMNJ01.ini
deleted file mode 100644
index 278408d9fe..0000000000
--- a/Data/Sys/GameSettings/SMNJ01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMNJ01 - New SUPER MARIO BROS. Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini
deleted file mode 100644
index e30d833226..0000000000
--- a/Data/Sys/GameSettings/SMNK01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMNK01 - New SUPER MARIO BROS. Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SMNP01.ini b/Data/Sys/GameSettings/SMNP01.ini
index fa82d55841..46437dbcf9 100644
--- a/Data/Sys/GameSettings/SMNP01.ini
+++ b/Data/Sys/GameSettings/SMNP01.ini
@@ -1,13 +1,5 @@
 # SMNP01 - New SUPER MARIO BROS. Wii
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -25,18 +17,3 @@ $99 lives (Mario, no hat)
 04355190 00000062
 $Freeze timer
 040E3AB8 3C0001F4
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SMNW01.ini b/Data/Sys/GameSettings/SMNW01.ini
deleted file mode 100644
index a7ce8bcacc..0000000000
--- a/Data/Sys/GameSettings/SMNW01.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMNW01 - New SUPER MARIO BROS. Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown).
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SMO.ini b/Data/Sys/GameSettings/SMO.ini
new file mode 100644
index 0000000000..d55de177fb
--- /dev/null
+++ b/Data/Sys/GameSettings/SMO.ini
@@ -0,0 +1,33 @@
+# SMOE41, SMOJ41, SMOP41, SMOX41 - Michael Jackson: The Experience
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+EFBScale = -1
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False
diff --git a/Data/Sys/GameSettings/SMOE41.ini b/Data/Sys/GameSettings/SMOE41.ini
deleted file mode 100644
index 3b988c5521..0000000000
--- a/Data/Sys/GameSettings/SMOE41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SMOP41.ini b/Data/Sys/GameSettings/SMOP41.ini
deleted file mode 100644
index 08f3925042..0000000000
--- a/Data/Sys/GameSettings/SMOP41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SMOX41.ini b/Data/Sys/GameSettings/SMOX41.ini
deleted file mode 100644
index 65fc196129..0000000000
--- a/Data/Sys/GameSettings/SMOX41.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SMOX41 - Michael Jackson The Experience: Walmart Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SN4.ini b/Data/Sys/GameSettings/SN4.ini
new file mode 100644
index 0000000000..a8fec8d473
--- /dev/null
+++ b/Data/Sys/GameSettings/SN4.ini
@@ -0,0 +1,22 @@
+# SN4EDA, SN4JDA, SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/SN4EDA.ini b/Data/Sys/GameSettings/SN4EDA.ini
deleted file mode 100644
index 387881d417..0000000000
--- a/Data/Sys/GameSettings/SN4EDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4EDA - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SN4JDA.ini b/Data/Sys/GameSettings/SN4JDA.ini
deleted file mode 100644
index 0392eb86ce..0000000000
--- a/Data/Sys/GameSettings/SN4JDA.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4JDA - Naruto Shippuuden Ryujinki
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SN4XGT.ini b/Data/Sys/GameSettings/SN4XGT.ini
deleted file mode 100644
index 26708bc8dd..0000000000
--- a/Data/Sys/GameSettings/SN4XGT.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SN4XGT - NARUTO SHIPPUDEN DRAGON BLADE CHRONICLES
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SNC.ini b/Data/Sys/GameSettings/SNC.ini
new file mode 100644
index 0000000000..e5a1af2324
--- /dev/null
+++ b/Data/Sys/GameSettings/SNC.ini
@@ -0,0 +1,33 @@
+# SNCE8P, SNCJ8P, SNCP8P - SONIC COLOURS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+EFBScale = -1
+
+[Video_Hacks]
+EFBAccessEnable = False
+
diff --git a/Data/Sys/GameSettings/SNCE8P.ini b/Data/Sys/GameSettings/SNCE8P.ini
deleted file mode 100644
index a37dd6c71f..0000000000
--- a/Data/Sys/GameSettings/SNCE8P.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SNCE8P - Sonic2010
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-EFBScale = -1
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini
deleted file mode 100644
index 2ace912eb4..0000000000
--- a/Data/Sys/GameSettings/SNCJ8P.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SNCJ8P - Sonic2010
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-EFBScale = -1
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini
deleted file mode 100644
index 3997bf19ce..0000000000
--- a/Data/Sys/GameSettings/SNCP8P.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# SNCP8P - Sonic2010
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level.
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar = 0.01
-
-[Video_Settings]
-EFBScale = -1
-
-[Video_Hacks]
-EFBAccessEnable = False
-
diff --git a/Data/Sys/GameSettings/SND.ini b/Data/Sys/GameSettings/SND.ini
new file mode 100644
index 0000000000..6753c339fd
--- /dev/null
+++ b/Data/Sys/GameSettings/SND.ini
@@ -0,0 +1,30 @@
+# SNDE20 - Deal or No Deal
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SNDE20.ini b/Data/Sys/GameSettings/SNDE20.ini
deleted file mode 100644
index facfbccb54..0000000000
--- a/Data/Sys/GameSettings/SNDE20.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SNDE20 - Deal or No Deal
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SNJ.ini b/Data/Sys/GameSettings/SNJ.ini
new file mode 100644
index 0000000000..55570f564b
--- /dev/null
+++ b/Data/Sys/GameSettings/SNJ.ini
@@ -0,0 +1,25 @@
+# SNJE69, SNJP69 - NBA JAM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SNJE69.ini b/Data/Sys/GameSettings/SNJE69.ini
index c496950b46..47969cf9fd 100644
--- a/Data/Sys/GameSettings/SNJE69.ini
+++ b/Data/Sys/GameSettings/SNJE69.ini
@@ -1,13 +1,5 @@
 # SNJE69 - NBA JAM
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -16,14 +8,6 @@ EmulationStateId = 4
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
 $Score 999-000 ( 1 and B Button ) [ZiT]
 281ADCC0 00000600
 42000000 92000000
@@ -41,7 +25,3 @@ $Time Stop ( - and B Button on/off ) [ZiT]
 04521C84 60000000
 CC000000 00000000
 04521C84 D01D0040
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SNJP69.ini b/Data/Sys/GameSettings/SNJP69.ini
deleted file mode 100644
index 39078c74be..0000000000
--- a/Data/Sys/GameSettings/SNJP69.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SNJP69 - NBA JAM
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SNY.ini b/Data/Sys/GameSettings/SNY.ini
new file mode 100644
index 0000000000..951ba5b9e0
--- /dev/null
+++ b/Data/Sys/GameSettings/SNY.ini
@@ -0,0 +1,17 @@
+# SNYEVZ, SNYPVZ - Monster High: 13 Wishes
+
+[Core]
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SO3.ini b/Data/Sys/GameSettings/SO3.ini
new file mode 100644
index 0000000000..4915e25c7a
--- /dev/null
+++ b/Data/Sys/GameSettings/SO3.ini
@@ -0,0 +1,29 @@
+# SO3EE9, SO3J99 - Rune Factory: Tides of Destiny
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SO3EE9.ini b/Data/Sys/GameSettings/SO3EE9.ini
deleted file mode 100644
index dfedc63ea2..0000000000
--- a/Data/Sys/GameSettings/SO3EE9.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SO3EE9 - Rune Factory: Tides of Destiny
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Direct 3d 11 fixes some texture glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SO3J99.ini b/Data/Sys/GameSettings/SO3J99.ini
deleted file mode 100644
index a35dbc93da..0000000000
--- a/Data/Sys/GameSettings/SO3J99.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SO3J99 - Rune Factory Oceans
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Direct 3d 11 fixes some texture glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SOJ.ini b/Data/Sys/GameSettings/SOJ.ini
new file mode 100644
index 0000000000..07e9acd445
--- /dev/null
+++ b/Data/Sys/GameSettings/SOJ.ini
@@ -0,0 +1,27 @@
+# SOJE41, SOJP41 - Rayman Origins
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
diff --git a/Data/Sys/GameSettings/SOJE41.ini b/Data/Sys/GameSettings/SOJE41.ini
deleted file mode 100644
index 2d382d8cbe..0000000000
--- a/Data/Sys/GameSettings/SOJE41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOJE41 - Rayman Origins
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SOJP41.ini b/Data/Sys/GameSettings/SOJP41.ini
deleted file mode 100644
index def064a140..0000000000
--- a/Data/Sys/GameSettings/SOJP41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOJP41 - Rayman Origins
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 1
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SOM.ini b/Data/Sys/GameSettings/SOM.ini
new file mode 100644
index 0000000000..2a8389d073
--- /dev/null
+++ b/Data/Sys/GameSettings/SOM.ini
@@ -0,0 +1,26 @@
+# SOME01 - Rhythm Heaven Fever
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+
+[Video_Hacks]
+
+[Video_Enhancements]
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/SOS.ini b/Data/Sys/GameSettings/SOS.ini
new file mode 100644
index 0000000000..e960e3bd14
--- /dev/null
+++ b/Data/Sys/GameSettings/SOS.ini
@@ -0,0 +1,24 @@
+# SOSEG9, SOSPAF - Turbo: Super Stunt Squad
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SOU.ini b/Data/Sys/GameSettings/SOU.ini
new file mode 100644
index 0000000000..a19e7953c5
--- /dev/null
+++ b/Data/Sys/GameSettings/SOU.ini
@@ -0,0 +1,31 @@
+# SOUE01, SOUJ01, SOUK01, SOUP01 - The Legend of Zelda Skyward Sword
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real wiimote and motion plus. Time stone transition needs Fast Depth off. 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Hacks]
+EFBAccessEnable = True
+EFBEmulateFormatChanges = True
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini
deleted file mode 100644
index 21b2932d3e..0000000000
--- a/Data/Sys/GameSettings/SOUE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SOUE01 - The Legend of Zelda Skyward Sword
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus. 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBAccessEnable = True
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini
deleted file mode 100644
index cda850cfb3..0000000000
--- a/Data/Sys/GameSettings/SOUJ01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOUJ01 - The Legend of Zelda Skyward Sword
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus. 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBAccessEnable = True
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini
deleted file mode 100644
index ddaf1883a9..0000000000
--- a/Data/Sys/GameSettings/SOUK01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOUK01 - The Legend of Zelda Skyward Sword
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus. 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBAccessEnable = True
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini
deleted file mode 100644
index bc3ade6a7b..0000000000
--- a/Data/Sys/GameSettings/SOUP01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOUP01 - The Legend of Zelda Skyward Sword
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus. 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBAccessEnable = True
-DlistCachingEnable = False
-EFBEmulateFormatChanges = True
-
diff --git a/Data/Sys/GameSettings/SPD.ini b/Data/Sys/GameSettings/SPD.ini
new file mode 100644
index 0000000000..4df39ba0b9
--- /dev/null
+++ b/Data/Sys/GameSettings/SPD.ini
@@ -0,0 +1,33 @@
+# SPDE52, SPDP52 - Spider-Man: Shattered Dimensions
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Graphic glitches.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 1
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 0.5
+PH_ZFar = 0.5
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SPDE52.ini b/Data/Sys/GameSettings/SPDE52.ini
deleted file mode 100644
index bb6d18c468..0000000000
--- a/Data/Sys/GameSettings/SPDE52.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDE52 - Spider-Man™: SD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Graphic glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 0.5
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SPDP52.ini b/Data/Sys/GameSettings/SPDP52.ini
deleted file mode 100644
index bc7e3480e3..0000000000
--- a/Data/Sys/GameSettings/SPDP52.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDP52 - Spider-Man™: SD
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Graphic glitches.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 1
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 0.5
-PH_ZFar = 0.5
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SPP.ini b/Data/Sys/GameSettings/SPP.ini
new file mode 100644
index 0000000000..cc359b835d
--- /dev/null
+++ b/Data/Sys/GameSettings/SPP.ini
@@ -0,0 +1,19 @@
+# SPPEFS - Power Punch
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SPPEFS.ini b/Data/Sys/GameSettings/SPPEFS.ini
deleted file mode 100644
index a6f666804d..0000000000
--- a/Data/Sys/GameSettings/SPPEFS.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPPEFS - Power Punch
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SPT.ini b/Data/Sys/GameSettings/SPT.ini
new file mode 100644
index 0000000000..6a2c37b5e5
--- /dev/null
+++ b/Data/Sys/GameSettings/SPT.ini
@@ -0,0 +1,25 @@
+# SPTJEB - Hospital. 6 nin no Ishi
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SPTJEB.ini b/Data/Sys/GameSettings/SPTJEB.ini
deleted file mode 100644
index 6cc7760b3c..0000000000
--- a/Data/Sys/GameSettings/SPTJEB.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPTJEB - Hospital. 6 nin no Ishi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SPV.ini b/Data/Sys/GameSettings/SPV.ini
new file mode 100644
index 0000000000..befacbeafb
--- /dev/null
+++ b/Data/Sys/GameSettings/SPV.ini
@@ -0,0 +1,30 @@
+# SPVEA4, SPVPA4, SPVXA4, SPVYA4 - Pro Evolution Soccer 2011
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SPVEA4.ini b/Data/Sys/GameSettings/SPVEA4.ini
deleted file mode 100644
index d8962fe126..0000000000
--- a/Data/Sys/GameSettings/SPVEA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVEA4 - Pro Evolution Soccer 2011
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SPVPA4.ini b/Data/Sys/GameSettings/SPVPA4.ini
deleted file mode 100644
index 5c46af099d..0000000000
--- a/Data/Sys/GameSettings/SPVPA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVPA4 - Pro Evolution Soccer 2011
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SPVXA4.ini b/Data/Sys/GameSettings/SPVXA4.ini
deleted file mode 100644
index 8a7c373c9a..0000000000
--- a/Data/Sys/GameSettings/SPVXA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVXA4 - Pro Evolution Soccer 2011
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SPVYA4.ini b/Data/Sys/GameSettings/SPVYA4.ini
deleted file mode 100644
index 76c289de22..0000000000
--- a/Data/Sys/GameSettings/SPVYA4.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPVYA4 - Pro Evolution Soccer 2011
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SQM.ini b/Data/Sys/GameSettings/SQM.ini
new file mode 100644
index 0000000000..bad4cce231
--- /dev/null
+++ b/Data/Sys/GameSettings/SQM.ini
@@ -0,0 +1,27 @@
+# SQME52, SQMP52 - Spider-Man: Edge of Time
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SQME52.ini b/Data/Sys/GameSettings/SQME52.ini
deleted file mode 100644
index b56c096765..0000000000
--- a/Data/Sys/GameSettings/SQME52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SQME52 - Spider-Man: Edge of Time
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SQMP52.ini b/Data/Sys/GameSettings/SQMP52.ini
deleted file mode 100644
index 4883db1e38..0000000000
--- a/Data/Sys/GameSettings/SQMP52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SQMP52 - Spider-Man: Edge of Time
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SR5.ini b/Data/Sys/GameSettings/SR5.ini
new file mode 100644
index 0000000000..8205918c40
--- /dev/null
+++ b/Data/Sys/GameSettings/SR5.ini
@@ -0,0 +1,27 @@
+# SR5E41 - RRRT - SU
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SR5E41.ini b/Data/Sys/GameSettings/SR5E41.ini
deleted file mode 100644
index 9f286c6868..0000000000
--- a/Data/Sys/GameSettings/SR5E41.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SR5E41 - RRRT - SU
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SRQ.ini b/Data/Sys/GameSettings/SRQ.ini
new file mode 100644
index 0000000000..f252932d9f
--- /dev/null
+++ b/Data/Sys/GameSettings/SRQ.ini
@@ -0,0 +1,29 @@
+# SRQE41, SRQP41 - Racquet Sports
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini
deleted file mode 100644
index bdf53c6c47..0000000000
--- a/Data/Sys/GameSettings/SRQE41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SRQE41 - Racquet Sports
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini
deleted file mode 100644
index 9106f0539a..0000000000
--- a/Data/Sys/GameSettings/SRQP41.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SRQP41 - Racquet Sports
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SS3.ini b/Data/Sys/GameSettings/SS3.ini
new file mode 100644
index 0000000000..0da7c92f5f
--- /dev/null
+++ b/Data/Sys/GameSettings/SS3.ini
@@ -0,0 +1,27 @@
+# SS3EWR - Elmo's A to Zoo Adventure
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SS3EWR.ini b/Data/Sys/GameSettings/SS3EWR.ini
deleted file mode 100644
index cf68da8a67..0000000000
--- a/Data/Sys/GameSettings/SS3EWR.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SS3EWR - Elmo's A to Zoo Adventure
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SSQ.ini b/Data/Sys/GameSettings/SSQ.ini
new file mode 100644
index 0000000000..0e33282c77
--- /dev/null
+++ b/Data/Sys/GameSettings/SSQ.ini
@@ -0,0 +1,30 @@
+# SSQE01, SSQJ01, SSQP01 - Mario Party 9
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SSQE01.ini b/Data/Sys/GameSettings/SSQE01.ini
deleted file mode 100644
index 1bed0c2745..0000000000
--- a/Data/Sys/GameSettings/SSQE01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SSQE01 - Mario Party 9
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SSQJ01.ini b/Data/Sys/GameSettings/SSQJ01.ini
deleted file mode 100644
index 1ee225bba3..0000000000
--- a/Data/Sys/GameSettings/SSQJ01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SSQJ01 - Mario Party 9
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SSQP01.ini b/Data/Sys/GameSettings/SSQP01.ini
deleted file mode 100644
index 5cccdff3c4..0000000000
--- a/Data/Sys/GameSettings/SSQP01.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SSQP01 - Mario Party 9
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Flinger Painting minigame needs EFB to RAM to function properly.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-EFBCopyCacheEnable = True
-
diff --git a/Data/Sys/GameSettings/SSR.ini b/Data/Sys/GameSettings/SSR.ini
new file mode 100644
index 0000000000..b46e3505d7
--- /dev/null
+++ b/Data/Sys/GameSettings/SSR.ini
@@ -0,0 +1,31 @@
+# SSRE20, SSRPXT - Wild West Shootout
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/SSRE20.ini b/Data/Sys/GameSettings/SSRE20.ini
deleted file mode 100644
index 5b449ff17d..0000000000
--- a/Data/Sys/GameSettings/SSRE20.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSRE20 - Wild West Shootout
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SSRPXT.ini b/Data/Sys/GameSettings/SSRPXT.ini
deleted file mode 100644
index b5d2828d52..0000000000
--- a/Data/Sys/GameSettings/SSRPXT.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSRPXT - Wild West Shootout
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/SST.ini b/Data/Sys/GameSettings/SST.ini
new file mode 100644
index 0000000000..b151d4df37
--- /dev/null
+++ b/Data/Sys/GameSettings/SST.ini
@@ -0,0 +1,24 @@
+# SSTEG9, SSTPY5 - Kid Adventures Sky Captain
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SSZ.ini b/Data/Sys/GameSettings/SSZ.ini
new file mode 100644
index 0000000000..56446306df
--- /dev/null
+++ b/Data/Sys/GameSettings/SSZ.ini
@@ -0,0 +1,31 @@
+# SSZE5G - Swords
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/SSZE5G.ini b/Data/Sys/GameSettings/SSZE5G.ini
deleted file mode 100644
index 503a63907c..0000000000
--- a/Data/Sys/GameSettings/SSZE5G.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SSZE5G - Swords
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/STE.ini b/Data/Sys/GameSettings/STE.ini
new file mode 100644
index 0000000000..5fc0c8bc2d
--- /dev/null
+++ b/Data/Sys/GameSettings/STE.ini
@@ -0,0 +1,27 @@
+# STEETR - Tetris Party Deluxe
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/STEETR.ini b/Data/Sys/GameSettings/STEETR.ini
deleted file mode 100644
index 9b881a6b61..0000000000
--- a/Data/Sys/GameSettings/STEETR.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# STEETR - Tetris Party Deluxe
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/STH.ini b/Data/Sys/GameSettings/STH.ini
new file mode 100644
index 0000000000..e819ae46d6
--- /dev/null
+++ b/Data/Sys/GameSettings/STH.ini
@@ -0,0 +1,29 @@
+# STHP8P - Thor: God of Thunder
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+
diff --git a/Data/Sys/GameSettings/STHP8P.ini b/Data/Sys/GameSettings/STHP8P.ini
deleted file mode 100644
index cc147492eb..0000000000
--- a/Data/Sys/GameSettings/STHP8P.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# STHP8P - Thor: God of Thunder
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/STK.ini b/Data/Sys/GameSettings/STK.ini
new file mode 100644
index 0000000000..9719680fc0
--- /dev/null
+++ b/Data/Sys/GameSettings/STK.ini
@@ -0,0 +1,22 @@
+# STKE08, STKJ08, STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Disable GC controllers if you want to use a wiimote instead.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/STKE08.ini b/Data/Sys/GameSettings/STKE08.ini
deleted file mode 100644
index e7932aeabe..0000000000
--- a/Data/Sys/GameSettings/STKE08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# STKE08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable GC controllers if you want to use wiimote(r6590)
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/STKJ08.ini b/Data/Sys/GameSettings/STKJ08.ini
deleted file mode 100644
index 215a6747f1..0000000000
--- a/Data/Sys/GameSettings/STKJ08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# STKJ08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable GC controllers if you want to use wiimote(r6590)
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/STKP08.ini b/Data/Sys/GameSettings/STKP08.ini
deleted file mode 100644
index d9f4046740..0000000000
--- a/Data/Sys/GameSettings/STKP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# STKP08 - TATSUNOKO VS. CAPCOM ULTIMATE ALL-STARS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable GC controllers if you want to use wiimote(r6590)
-EmulationStateId = 5
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/STS.ini b/Data/Sys/GameSettings/STS.ini
new file mode 100644
index 0000000000..9ca18c810b
--- /dev/null
+++ b/Data/Sys/GameSettings/STS.ini
@@ -0,0 +1,24 @@
+# STSE4Q, STSP4Q, STSX4Q, STSY4Q, STSZ4Q - Toy Story 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+MMU = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 3
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SU7.ini b/Data/Sys/GameSettings/SU7.ini
new file mode 100644
index 0000000000..9cb04614fd
--- /dev/null
+++ b/Data/Sys/GameSettings/SU7.ini
@@ -0,0 +1,17 @@
+# SU7EG9, SU7PAF - RISE OF THE GUARDIANS
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SUK.ini b/Data/Sys/GameSettings/SUK.ini
new file mode 100644
index 0000000000..98ed527732
--- /dev/null
+++ b/Data/Sys/GameSettings/SUK.ini
@@ -0,0 +1,31 @@
+# SUKE01, SUKJ01, SUKP01 - Kirby Wii
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Some minigames need XFB to work.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
diff --git a/Data/Sys/GameSettings/SUKE01.ini b/Data/Sys/GameSettings/SUKE01.ini
deleted file mode 100644
index a49d252c1d..0000000000
--- a/Data/Sys/GameSettings/SUKE01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SUKE01 - Kirby Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some minigames need XFB to work.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SUKJ01.ini b/Data/Sys/GameSettings/SUKJ01.ini
deleted file mode 100644
index bd2a758de2..0000000000
--- a/Data/Sys/GameSettings/SUKJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SUKJ01 - Hoshi no Kirby Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some minigames need XFB to work.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SUKP01.ini b/Data/Sys/GameSettings/SUKP01.ini
deleted file mode 100644
index 4f935e0803..0000000000
--- a/Data/Sys/GameSettings/SUKP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SUKP01 - Kirby's Adventure Wii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Some minigames need XFB to work.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
diff --git a/Data/Sys/GameSettings/SVB.ini b/Data/Sys/GameSettings/SVB.ini
new file mode 100644
index 0000000000..e5ba4eac16
--- /dev/null
+++ b/Data/Sys/GameSettings/SVB.ini
@@ -0,0 +1,30 @@
+# SVBE52, SVBP52 - Battleship
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/SVBE52.ini b/Data/Sys/GameSettings/SVBE52.ini
deleted file mode 100644
index c06b73169f..0000000000
--- a/Data/Sys/GameSettings/SVBE52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVBE52 - Battleship
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SVBP52.ini b/Data/Sys/GameSettings/SVBP52.ini
deleted file mode 100644
index d95eee7ab1..0000000000
--- a/Data/Sys/GameSettings/SVBP52.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SVBP52 - Battleship
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SVM.ini b/Data/Sys/GameSettings/SVM.ini
new file mode 100644
index 0000000000..950c24098a
--- /dev/null
+++ b/Data/Sys/GameSettings/SVM.ini
@@ -0,0 +1,30 @@
+# SVME01, SVMJ01, SVMP01 - super mario collection
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/SVME01.ini b/Data/Sys/GameSettings/SVME01.ini
deleted file mode 100644
index 24a4977588..0000000000
--- a/Data/Sys/GameSettings/SVME01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVME01 - super mario collection
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVMJ01.ini b/Data/Sys/GameSettings/SVMJ01.ini
deleted file mode 100644
index 9dbc817aff..0000000000
--- a/Data/Sys/GameSettings/SVMJ01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVMJ01 - super mario collection
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVMP01.ini b/Data/Sys/GameSettings/SVMP01.ini
deleted file mode 100644
index 0d13c23359..0000000000
--- a/Data/Sys/GameSettings/SVMP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# SVMP01 - Super Mario All-Stars : 25th Anniversary Edition
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/SVT.ini b/Data/Sys/GameSettings/SVT.ini
new file mode 100644
index 0000000000..cad379795f
--- /dev/null
+++ b/Data/Sys/GameSettings/SVT.ini
@@ -0,0 +1,18 @@
+# SVTEXS, SVTP99 - BIT.TRIP Complete
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/SVV.ini b/Data/Sys/GameSettings/SVV.ini
new file mode 100644
index 0000000000..23a98c6736
--- /dev/null
+++ b/Data/Sys/GameSettings/SVV.ini
@@ -0,0 +1,30 @@
+# SVVEG9, SVVPAF - The Croods Prehistoric Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SVX.ini b/Data/Sys/GameSettings/SVX.ini
new file mode 100644
index 0000000000..23d1817628
--- /dev/null
+++ b/Data/Sys/GameSettings/SVX.ini
@@ -0,0 +1,29 @@
+# SVXE52, SVXF52, SVXI52, SVXP52, SVXY52 - Skylanders: Swap Force
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SVZ.ini b/Data/Sys/GameSettings/SVZ.ini
new file mode 100644
index 0000000000..542009dde9
--- /dev/null
+++ b/Data/Sys/GameSettings/SVZ.ini
@@ -0,0 +1,22 @@
+# SVZEVZ, SVZPVZ - How to Train Your Dragon 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/SWA.ini b/Data/Sys/GameSettings/SWA.ini
new file mode 100644
index 0000000000..b9aa113be4
--- /dev/null
+++ b/Data/Sys/GameSettings/SWA.ini
@@ -0,0 +1,19 @@
+# SWAE52 - DJHero
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SWAE52.ini b/Data/Sys/GameSettings/SWAE52.ini
deleted file mode 100644
index cb2b3746b5..0000000000
--- a/Data/Sys/GameSettings/SWAE52.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# SWAE52 - DJHero
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SX3.ini b/Data/Sys/GameSettings/SX3.ini
new file mode 100644
index 0000000000..91d25a790d
--- /dev/null
+++ b/Data/Sys/GameSettings/SX3.ini
@@ -0,0 +1,30 @@
+# SX3J01, SX3P01 - Pandora s Tower
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/SX3J01.ini b/Data/Sys/GameSettings/SX3J01.ini
deleted file mode 100644
index 9cf7a276e6..0000000000
--- a/Data/Sys/GameSettings/SX3J01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SX3J01 - Pandora s Tower
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SX3P01.ini b/Data/Sys/GameSettings/SX3P01.ini
deleted file mode 100644
index df783f97ea..0000000000
--- a/Data/Sys/GameSettings/SX3P01.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SX3P01 - Pandora s Tower
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SX4.ini b/Data/Sys/GameSettings/SX4.ini
new file mode 100644
index 0000000000..69b66fed2f
--- /dev/null
+++ b/Data/Sys/GameSettings/SX4.ini
@@ -0,0 +1,28 @@
+# SX4E01, SX4J01, SX4P01 - Xenoblade Chronicles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = The game randomly freezes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
diff --git a/Data/Sys/GameSettings/SX4J01.ini b/Data/Sys/GameSettings/SX4J01.ini
deleted file mode 100644
index 271b8e8585..0000000000
--- a/Data/Sys/GameSettings/SX4J01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SX4J01 - Xenoblade
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = The game randomly freezes. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EnablePixelLighting = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SX4P01.ini b/Data/Sys/GameSettings/SX4P01.ini
deleted file mode 100644
index b0de31d8ad..0000000000
--- a/Data/Sys/GameSettings/SX4P01.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# SX4P01 - Xenoblade Chronicles
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = The game randomly freezes. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-EnablePixelLighting = False
-
-[Video_Hacks]
-DlistCachingEnable = False
-
diff --git a/Data/Sys/GameSettings/SX7.ini b/Data/Sys/GameSettings/SX7.ini
new file mode 100644
index 0000000000..1dea6c236a
--- /dev/null
+++ b/Data/Sys/GameSettings/SX7.ini
@@ -0,0 +1,25 @@
+# SX7E52, SX7P52 - Teenage Mutant Ninja Turtles
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Sound issues.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SX8.ini b/Data/Sys/GameSettings/SX8.ini
new file mode 100644
index 0000000000..8652398ad5
--- /dev/null
+++ b/Data/Sys/GameSettings/SX8.ini
@@ -0,0 +1,23 @@
+# SX8E52 - X-Men Destiny
+
+[Core]
+# Values set here will override the main Dolphin settings.
+SyncOnSkipIdle = False
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/Sys/GameSettings/SX8E52.ini b/Data/Sys/GameSettings/SX8E52.ini
deleted file mode 100644
index 47526ee4ad..0000000000
--- a/Data/Sys/GameSettings/SX8E52.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-# SX8E52 - X-Men Destiny
-
-[Core]
-# Values set here will override the main dolphin settings.
-SkipIdle = 0
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Idle skipping causes drop in performance.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-
diff --git a/Data/Sys/GameSettings/SXB.ini b/Data/Sys/GameSettings/SXB.ini
new file mode 100644
index 0000000000..d3261db0b7
--- /dev/null
+++ b/Data/Sys/GameSettings/SXB.ini
@@ -0,0 +1,22 @@
+# SXBP52 - Guitar Hero Metallica
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/SXBP52.ini b/Data/Sys/GameSettings/SXBP52.ini
deleted file mode 100644
index a80f827067..0000000000
--- a/Data/Sys/GameSettings/SXBP52.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SXBP52 - Guitar Hero Metallica
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SXC.ini b/Data/Sys/GameSettings/SXC.ini
new file mode 100644
index 0000000000..03bb9d154e
--- /dev/null
+++ b/Data/Sys/GameSettings/SXC.ini
@@ -0,0 +1,25 @@
+# SXCE52, SXCP52 - Guitar Hero Smash Hits
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Create a guitar profile and use that instead of wiimote controls.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/SXCE52.ini b/Data/Sys/GameSettings/SXCE52.ini
deleted file mode 100644
index 1e4f1bd79d..0000000000
--- a/Data/Sys/GameSettings/SXCE52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SXCE52 - Guitar Hero Smash Hits
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Create a quitar profile and use that for controls instead of wiimote controls(r6575)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SXCP52.ini b/Data/Sys/GameSettings/SXCP52.ini
deleted file mode 100644
index 052a5bdd97..0000000000
--- a/Data/Sys/GameSettings/SXCP52.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# SXCP52 - Guitar Hero Smash Hits
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Create a quitar profile and use that for controls instead of wiimote controls(r6575)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/SXD.ini b/Data/Sys/GameSettings/SXD.ini
new file mode 100644
index 0000000000..a0e23177b4
--- /dev/null
+++ b/Data/Sys/GameSettings/SXD.ini
@@ -0,0 +1,27 @@
+# SXDE52 - Guitar Hero Van Halen
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Plays awfully if emu doesn't run at 100%
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/SXDE52.ini b/Data/Sys/GameSettings/SXDE52.ini
deleted file mode 100644
index dcd02e054d..0000000000
--- a/Data/Sys/GameSettings/SXDE52.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# SXDE52 - Guitar Hero Van Halen
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Plays awfully if emu doesn't run at 100%
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/SXE.ini b/Data/Sys/GameSettings/SXE.ini
new file mode 100644
index 0000000000..b57cb392f2
--- /dev/null
+++ b/Data/Sys/GameSettings/SXE.ini
@@ -0,0 +1,19 @@
+# SXEE52 - Sample Game Name
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/SXEE52.ini b/Data/Sys/GameSettings/SXEE52.ini
index 05445fa6d8..16e9b786ae 100644
--- a/Data/Sys/GameSettings/SXEE52.ini
+++ b/Data/Sys/GameSettings/SXEE52.ini
@@ -1,13 +1,5 @@
 # SXEE52 - Sample Game Name
 
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 
@@ -18,4 +10,3 @@ $Get ingame
 
 [ActionReplay]
 # Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/SZA.ini b/Data/Sys/GameSettings/SZA.ini
new file mode 100644
index 0000000000..0279bed2e1
--- /dev/null
+++ b/Data/Sys/GameSettings/SZA.ini
@@ -0,0 +1,22 @@
+# SZAE69, SZAP69 - Rock Band 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Create a guitar profile and use that instead of wiimote controls.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/SZAE69.ini b/Data/Sys/GameSettings/SZAE69.ini
deleted file mode 100644
index 680a8cf260..0000000000
--- a/Data/Sys/GameSettings/SZAE69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SZAE69 - Rock Band 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Config and use the quitar and drums, wiimote asks for a microphone otherwise.(r6575)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SZAP69.ini b/Data/Sys/GameSettings/SZAP69.ini
deleted file mode 100644
index 91c013755a..0000000000
--- a/Data/Sys/GameSettings/SZAP69.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# SZAP69 - Rock Band 2
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Config and use the quitar and drums, wiimote asks for a microphone otherwise.(r6575)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/SZB.ini b/Data/Sys/GameSettings/SZB.ini
new file mode 100644
index 0000000000..98ecb6e541
--- /dev/null
+++ b/Data/Sys/GameSettings/SZB.ini
@@ -0,0 +1,30 @@
+# SZBE69, SZBP69 - Rock Band 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = If emu is running less than 100% it's EXTREMELY hard to hit notes. No mic, keyboard, or Pro instrument support yet.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Enhancements]
+ForceFiltering = False
+
diff --git a/Data/Sys/GameSettings/SZBE69.ini b/Data/Sys/GameSettings/SZBE69.ini
deleted file mode 100644
index bb9e1efc46..0000000000
--- a/Data/Sys/GameSettings/SZBE69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SZBE69 - Rock Band 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = If emu is running less than 100% it's EXTREMELY hard to hit notes. No mic, keyboard, or Pro instrument support yet.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/SZBP69.ini b/Data/Sys/GameSettings/SZBP69.ini
deleted file mode 100644
index c712984785..0000000000
--- a/Data/Sys/GameSettings/SZBP69.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# SZBP69 - Rock Band 3
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = If emu is running less than 100% it's EXTREMELY hard to hit notes. No mic, keyboard, or Pro instrument support yet.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Enhancements]
-ForceFiltering = False
-
diff --git a/Data/Sys/GameSettings/UGP.ini b/Data/Sys/GameSettings/UGP.ini
new file mode 100644
index 0000000000..40b450f48d
--- /dev/null
+++ b/Data/Sys/GameSettings/UGP.ini
@@ -0,0 +1,27 @@
+# UGPE01, UGPP01 - Game Boy Player Start-up Disc for US
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues = No GameBoy Player Device.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/UGPE01.ini b/Data/Sys/GameSettings/UGPE01.ini
deleted file mode 100644
index 95dcd43c14..0000000000
--- a/Data/Sys/GameSettings/UGPE01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# UGPE01 - Game Boy Player Start-up Disc for US
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = No GameBoy Player Device (r7574)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/UGPP01.ini b/Data/Sys/GameSettings/UGPP01.ini
deleted file mode 100644
index f5ec6ffb87..0000000000
--- a/Data/Sys/GameSettings/UGPP01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# UGPP01 - GAME BOY PLAYER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = No GameBoy Player Device (r7574)
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/W24.ini b/Data/Sys/GameSettings/W24.ini
new file mode 100644
index 0000000000..d648d098d1
--- /dev/null
+++ b/Data/Sys/GameSettings/W24.ini
@@ -0,0 +1,21 @@
+# W24EQU - 2 Fast 4 Gnomz
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
diff --git a/Data/Sys/GameSettings/W2G.ini b/Data/Sys/GameSettings/W2G.ini
new file mode 100644
index 0000000000..df0b62cafb
--- /dev/null
+++ b/Data/Sys/GameSettings/W2G.ini
@@ -0,0 +1,18 @@
+# W2GE08, W2GP08 - Phoenix Wright Ace Attorney Justice For All
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W2GE08.ini b/Data/Sys/GameSettings/W2GE08.ini
deleted file mode 100644
index 0e5cae1f0d..0000000000
--- a/Data/Sys/GameSettings/W2GE08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W2GE08 - Phoenix Wright Ace Attorney Justice For All
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W2GP08.ini b/Data/Sys/GameSettings/W2GP08.ini
deleted file mode 100644
index 56990dee85..0000000000
--- a/Data/Sys/GameSettings/W2GP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W2GP08 - Phoenix Wright Ace Attorney Justice For All
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W2M.ini b/Data/Sys/GameSettings/W2M.ini
new file mode 100644
index 0000000000..85ea27266b
--- /dev/null
+++ b/Data/Sys/GameSettings/W2M.ini
@@ -0,0 +1,22 @@
+# W2MEBB - BLASTER MASTER OVERDRIVE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/W2MEBB.ini b/Data/Sys/GameSettings/W2MEBB.ini
deleted file mode 100644
index 3a9b6b2e89..0000000000
--- a/Data/Sys/GameSettings/W2MEBB.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# W2MEBB - BLASTER MASTER OVERDRIVE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/W3G.ini b/Data/Sys/GameSettings/W3G.ini
new file mode 100644
index 0000000000..11b1590fa0
--- /dev/null
+++ b/Data/Sys/GameSettings/W3G.ini
@@ -0,0 +1,18 @@
+# W3GE08, W3GP08 - Phoenix Wright Ace Attorney Trials and Tribulations
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W3GE08.ini b/Data/Sys/GameSettings/W3GE08.ini
deleted file mode 100644
index 24dc6f7548..0000000000
--- a/Data/Sys/GameSettings/W3GE08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W3GE08 - Phoenix Wright Ace Attorney Trials and Tribulations
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W3GP08.ini b/Data/Sys/GameSettings/W3GP08.ini
deleted file mode 100644
index 72b60de292..0000000000
--- a/Data/Sys/GameSettings/W3GP08.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# W3GP08 - Phoenix Wright Ace Attorney Trials and Tribulations
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/W3M.ini b/Data/Sys/GameSettings/W3M.ini
new file mode 100644
index 0000000000..6c38776402
--- /dev/null
+++ b/Data/Sys/GameSettings/W3M.ini
@@ -0,0 +1,22 @@
+# W3MELJ - The Three Musketeers
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/W8C.ini b/Data/Sys/GameSettings/W8C.ini
new file mode 100644
index 0000000000..5991c51eb0
--- /dev/null
+++ b/Data/Sys/GameSettings/W8C.ini
@@ -0,0 +1,19 @@
+# W8CEXS, W8CPXS - BIT.TRIP CORE
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/W8CEXS.ini b/Data/Sys/GameSettings/W8CEXS.ini
deleted file mode 100644
index aded4dfc56..0000000000
--- a/Data/Sys/GameSettings/W8CEXS.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# W8CEXS - BIT.TRIP CORE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/W8CPXS.ini b/Data/Sys/GameSettings/W8CPXS.ini
deleted file mode 100644
index 8867f8459b..0000000000
--- a/Data/Sys/GameSettings/W8CPXS.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# W8CPXS - BIT.TRIP CORE
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WA2.ini b/Data/Sys/GameSettings/WA2.ini
new file mode 100644
index 0000000000..1576c436db
--- /dev/null
+++ b/Data/Sys/GameSettings/WA2.ini
@@ -0,0 +1,22 @@
+# WA2E01 - Magnetica Twist
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WA4.ini b/Data/Sys/GameSettings/WA4.ini
new file mode 100644
index 0000000000..3661fe86c9
--- /dev/null
+++ b/Data/Sys/GameSettings/WA4.ini
@@ -0,0 +1,19 @@
+# WA4P01 - WarioWare: DIY (Wii)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WA4P01.ini b/Data/Sys/GameSettings/WA4P01.ini
deleted file mode 100644
index 79e652994b..0000000000
--- a/Data/Sys/GameSettings/WA4P01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WA4P01 - WarioWare: DIY (Wii)
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WAI.ini b/Data/Sys/GameSettings/WAI.ini
new file mode 100644
index 0000000000..8c9ae20dcc
--- /dev/null
+++ b/Data/Sys/GameSettings/WAI.ini
@@ -0,0 +1,23 @@
+# WAIEHZ - 101-in-1 Explosive Megamix
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
+
diff --git a/Data/Sys/GameSettings/WAL.ini b/Data/Sys/GameSettings/WAL.ini
new file mode 100644
index 0000000000..08e9c936f1
--- /dev/null
+++ b/Data/Sys/GameSettings/WAL.ini
@@ -0,0 +1,22 @@
+# WALE01 - light trax Art Style Series
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WALE01.ini b/Data/Sys/GameSettings/WALE01.ini
deleted file mode 100644
index b1954f6c72..0000000000
--- a/Data/Sys/GameSettings/WALE01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WALE01 - light trax Art Style Series
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WAY.ini b/Data/Sys/GameSettings/WAY.ini
new file mode 100644
index 0000000000..daf11d0da7
--- /dev/null
+++ b/Data/Sys/GameSettings/WAY.ini
@@ -0,0 +1,22 @@
+# WAYETJ - And Yet It Moves
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WAYETJ.ini b/Data/Sys/GameSettings/WAYETJ.ini
deleted file mode 100644
index dd1250608d..0000000000
--- a/Data/Sys/GameSettings/WAYETJ.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WAYETJ - And Yet It Moves
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WB2ETL.ini b/Data/Sys/GameSettings/WB2.ini
similarity index 100%
rename from Data/Sys/GameSettings/WB2ETL.ini
rename to Data/Sys/GameSettings/WB2.ini
diff --git a/Data/Sys/GameSettings/WB3ETL.ini b/Data/Sys/GameSettings/WB3.ini
similarity index 100%
rename from Data/Sys/GameSettings/WB3ETL.ini
rename to Data/Sys/GameSettings/WB3.ini
diff --git a/Data/Sys/GameSettings/WB4.ini b/Data/Sys/GameSettings/WB4.ini
new file mode 100644
index 0000000000..3354016bb5
--- /dev/null
+++ b/Data/Sys/GameSettings/WB4.ini
@@ -0,0 +1,17 @@
+# WB4EGL - Wild West Guns
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/WB6.ini b/Data/Sys/GameSettings/WB6.ini
new file mode 100644
index 0000000000..4335d0e3d1
--- /dev/null
+++ b/Data/Sys/GameSettings/WB6.ini
@@ -0,0 +1,17 @@
+# WB6EGL - TV Show King
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WB6EGL.ini b/Data/Sys/GameSettings/WB6EGL.ini
deleted file mode 100644
index 1af5dfc320..0000000000
--- a/Data/Sys/GameSettings/WB6EGL.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# WB6EGL - TV Show King
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WB7.ini b/Data/Sys/GameSettings/WB7.ini
new file mode 100644
index 0000000000..c9cd6b3135
--- /dev/null
+++ b/Data/Sys/GameSettings/WB7.ini
@@ -0,0 +1,22 @@
+# WB7EGL - Midnight Pool
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WBL.ini b/Data/Sys/GameSettings/WBL.ini
new file mode 100644
index 0000000000..913153041a
--- /dev/null
+++ b/Data/Sys/GameSettings/WBL.ini
@@ -0,0 +1,22 @@
+# WBLPGD -  BUBBLE BOBBLE Plus!
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WBLPGD.ini b/Data/Sys/GameSettings/WBLPGD.ini
deleted file mode 100644
index a6326c0286..0000000000
--- a/Data/Sys/GameSettings/WBLPGD.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WBLPGD -  BUBBLE BOBBLE Plus!
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WBM.ini b/Data/Sys/GameSettings/WBM.ini
new file mode 100644
index 0000000000..03c5c151a2
--- /dev/null
+++ b/Data/Sys/GameSettings/WBM.ini
@@ -0,0 +1,26 @@
+# WBME01 - My Pokémon Ranch
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
diff --git a/Data/Sys/GameSettings/WBME01.ini b/Data/Sys/GameSettings/WBME01.ini
deleted file mode 100644
index a8aa512eb9..0000000000
--- a/Data/Sys/GameSettings/WBME01.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# WBME01 - My Pokémon Ranch
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/WBQ.ini b/Data/Sys/GameSettings/WBQ.ini
new file mode 100644
index 0000000000..a662090342
--- /dev/null
+++ b/Data/Sys/GameSettings/WBQ.ini
@@ -0,0 +1,22 @@
+# WBQE18 - Star Soldier R
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WBQE18.ini b/Data/Sys/GameSettings/WBQE18.ini
deleted file mode 100644
index 62e113eb4a..0000000000
--- a/Data/Sys/GameSettings/WBQE18.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WBQE18 - Star Soldier R
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WBXETL.ini b/Data/Sys/GameSettings/WBX.ini
similarity index 100%
rename from Data/Sys/GameSettings/WBXETL.ini
rename to Data/Sys/GameSettings/WBX.ini
diff --git a/Data/Sys/GameSettings/WBYETL.ini b/Data/Sys/GameSettings/WBY.ini
similarity index 100%
rename from Data/Sys/GameSettings/WBYETL.ini
rename to Data/Sys/GameSettings/WBY.ini
diff --git a/Data/Sys/GameSettings/WBZETL.ini b/Data/Sys/GameSettings/WBZ.ini
similarity index 100%
rename from Data/Sys/GameSettings/WBZETL.ini
rename to Data/Sys/GameSettings/WBZ.ini
diff --git a/Data/Sys/GameSettings/WC6.ini b/Data/Sys/GameSettings/WC6.ini
new file mode 100644
index 0000000000..18db800e65
--- /dev/null
+++ b/Data/Sys/GameSettings/WC6.ini
@@ -0,0 +1,28 @@
+# WC6EUP - Chronos Twins DX
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Disable PAL60 (EuRGB60) mode
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WC6EUP.ini b/Data/Sys/GameSettings/WC6EUP.ini
deleted file mode 100644
index 62567fa8d1..0000000000
--- a/Data/Sys/GameSettings/WC6EUP.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# WC6EUP - Chronos Twins DX
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable EuRGB60 mode
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WCH.ini b/Data/Sys/GameSettings/WCH.ini
new file mode 100644
index 0000000000..2ebd7dfe19
--- /dev/null
+++ b/Data/Sys/GameSettings/WCH.ini
@@ -0,0 +1,27 @@
+# WCHEJS - Chess Challenge!
+
+[Core]
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WCHEJS.ini b/Data/Sys/GameSettings/WCHEJS.ini
deleted file mode 100644
index 2d36a7ca61..0000000000
--- a/Data/Sys/GameSettings/WCHEJS.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# WCHEJS - Chess Challenge!
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-EFBToTextureEnable = False
-EFBCopyEnable = True
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WCV.ini b/Data/Sys/GameSettings/WCV.ini
new file mode 100644
index 0000000000..2d14338482
--- /dev/null
+++ b/Data/Sys/GameSettings/WCV.ini
@@ -0,0 +1,22 @@
+# WCVENV - Cave Story
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WCVENV.ini b/Data/Sys/GameSettings/WCVENV.ini
deleted file mode 100644
index 41ca0d115e..0000000000
--- a/Data/Sys/GameSettings/WCVENV.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WCVENV - Cave Story
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WCZ.ini b/Data/Sys/GameSettings/WCZ.ini
new file mode 100644
index 0000000000..73ccd76bbd
--- /dev/null
+++ b/Data/Sys/GameSettings/WCZ.ini
@@ -0,0 +1,22 @@
+# WCZEXK - ColorZ
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Wiimote cursor misaligned
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/WD9.ini b/Data/Sys/GameSettings/WD9.ini
new file mode 100644
index 0000000000..f8c24784a6
--- /dev/null
+++ b/Data/Sys/GameSettings/WD9.ini
@@ -0,0 +1,19 @@
+# WD9EA4 - Castlevania ReBirth
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WD9EA4.ini b/Data/Sys/GameSettings/WD9EA4.ini
deleted file mode 100644
index 0a22077436..0000000000
--- a/Data/Sys/GameSettings/WD9EA4.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WD9EA4 - Castlevania ReBirth
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WDM.ini b/Data/Sys/GameSettings/WDM.ini
new file mode 100644
index 0000000000..c7b7bff754
--- /dev/null
+++ b/Data/Sys/GameSettings/WDM.ini
@@ -0,0 +1,22 @@
+# WDME01, WDMP01 - Dr. Mario Online Rx
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WDME01.ini b/Data/Sys/GameSettings/WDME01.ini
deleted file mode 100644
index badf4ea31d..0000000000
--- a/Data/Sys/GameSettings/WDME01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WDME01 - Dr. Mario Online Rx
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WDMP01.ini b/Data/Sys/GameSettings/WDMP01.ini
deleted file mode 100644
index 78588cb780..0000000000
--- a/Data/Sys/GameSettings/WDMP01.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WDMP01 - Dr. Mario & Germ Buster
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WDO.ini b/Data/Sys/GameSettings/WDO.ini
new file mode 100644
index 0000000000..52b66c0987
--- /dev/null
+++ b/Data/Sys/GameSettings/WDO.ini
@@ -0,0 +1,22 @@
+# WDOEA4 - Driift Mania
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WER.ini b/Data/Sys/GameSettings/WER.ini
new file mode 100644
index 0000000000..4378032131
--- /dev/null
+++ b/Data/Sys/GameSettings/WER.ini
@@ -0,0 +1,22 @@
+# WERP18 - My Aquarium
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WERP18.ini b/Data/Sys/GameSettings/WERP18.ini
deleted file mode 100644
index 62dc91427c..0000000000
--- a/Data/Sys/GameSettings/WERP18.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WERP18 - My Aquarium
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WF4.ini b/Data/Sys/GameSettings/WF4.ini
new file mode 100644
index 0000000000..ab3fbcd0de
--- /dev/null
+++ b/Data/Sys/GameSettings/WF4.ini
@@ -0,0 +1,25 @@
+# WF4EGD - FINAL FANTASY IV THE AFTER YEARS
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/WF4EGD.ini b/Data/Sys/GameSettings/WF4EGD.ini
deleted file mode 100644
index 5d79f469b0..0000000000
--- a/Data/Sys/GameSettings/WF4EGD.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# WF4EGD - FINAL FANTASY IV THE AFTER YEARS
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/WFH.ini b/Data/Sys/GameSettings/WFH.ini
new file mode 100644
index 0000000000..b4dc6da328
--- /dev/null
+++ b/Data/Sys/GameSettings/WFH.ini
@@ -0,0 +1,22 @@
+# WFHEPT - Flight Control
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WFL.ini b/Data/Sys/GameSettings/WFL.ini
new file mode 100644
index 0000000000..c392bfbfc6
--- /dev/null
+++ b/Data/Sys/GameSettings/WFL.ini
@@ -0,0 +1,22 @@
+# WFLE01 - Fluidity
+
+[Core]
+
+[EmuState]
+EmulationStateId = 5
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WFLE01.ini b/Data/Sys/GameSettings/WFLE01.ini
deleted file mode 100644
index b5e7489086..0000000000
--- a/Data/Sys/GameSettings/WFLE01.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# WFLE01 - Fluidity
-[Core]
-[EmuState]
-EmulationStateId = 5
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WFUEQQ.ini b/Data/Sys/GameSettings/WFU.ini
similarity index 100%
rename from Data/Sys/GameSettings/WFUEQQ.ini
rename to Data/Sys/GameSettings/WFU.ini
diff --git a/Data/Sys/GameSettings/WGD.ini b/Data/Sys/GameSettings/WGD.ini
new file mode 100644
index 0000000000..67b0701bd6
--- /dev/null
+++ b/Data/Sys/GameSettings/WGD.ini
@@ -0,0 +1,22 @@
+# WGDEA4, WGDPA4 - GRADIUS REBIRTH
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WGDEA4.ini b/Data/Sys/GameSettings/WGDEA4.ini
deleted file mode 100644
index 8ab3ece63f..0000000000
--- a/Data/Sys/GameSettings/WGDEA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGDEA4 - GRADIUS REBIRTH
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WGDPA4.ini b/Data/Sys/GameSettings/WGDPA4.ini
deleted file mode 100644
index b4bbf2f909..0000000000
--- a/Data/Sys/GameSettings/WGDPA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGDPA4 - GRADIUS REBIRTH
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WGG.ini b/Data/Sys/GameSettings/WGG.ini
new file mode 100644
index 0000000000..4b41cbfa90
--- /dev/null
+++ b/Data/Sys/GameSettings/WGG.ini
@@ -0,0 +1,22 @@
+# WGGEE9 - Gabrielle's Ghostly
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WGL.ini b/Data/Sys/GameSettings/WGL.ini
new file mode 100644
index 0000000000..f75d30a080
--- /dev/null
+++ b/Data/Sys/GameSettings/WGL.ini
@@ -0,0 +1,22 @@
+# WGLEVX - Gene Labs
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/WGO.ini b/Data/Sys/GameSettings/WGO.ini
new file mode 100644
index 0000000000..bc65f7ccc8
--- /dev/null
+++ b/Data/Sys/GameSettings/WGO.ini
@@ -0,0 +1,22 @@
+# WGOEWG, WGOPWG - World of Goo
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WGOEWG.ini b/Data/Sys/GameSettings/WGOEWG.ini
deleted file mode 100644
index 91e3c1cc2f..0000000000
--- a/Data/Sys/GameSettings/WGOEWG.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGOEWG - World of Goo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WGOPWG.ini b/Data/Sys/GameSettings/WGOPWG.ini
deleted file mode 100644
index d7a1f3d9b9..0000000000
--- a/Data/Sys/GameSettings/WGOPWG.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGOPWG - World of Goo
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WGS.ini b/Data/Sys/GameSettings/WGS.ini
new file mode 100644
index 0000000000..ac93b25fc3
--- /dev/null
+++ b/Data/Sys/GameSettings/WGS.ini
@@ -0,0 +1,22 @@
+# WGSE08, WGSP08 - PWAA Ace Attorney
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Hacks]
+EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WGSE08.ini b/Data/Sys/GameSettings/WGSE08.ini
deleted file mode 100644
index e6e02e3c44..0000000000
--- a/Data/Sys/GameSettings/WGSE08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGSE08 - PWAA Ace Attorney
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WGSP08.ini b/Data/Sys/GameSettings/WGSP08.ini
deleted file mode 100644
index 8bf5201a6b..0000000000
--- a/Data/Sys/GameSettings/WGSP08.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WGSP08 - PWAA Ace Attorney
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WGY.ini b/Data/Sys/GameSettings/WGY.ini
new file mode 100644
index 0000000000..b140fc6d8e
--- /dev/null
+++ b/Data/Sys/GameSettings/WGY.ini
@@ -0,0 +1,23 @@
+# WGYEHN - Gyrostarr
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+Hack = -1
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WGYEHN.ini b/Data/Sys/GameSettings/WGYEHN.ini
deleted file mode 100644
index 6d34fe2c3c..0000000000
--- a/Data/Sys/GameSettings/WGYEHN.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# WGYEHN - Gyrostarr
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-Hack = -1
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WHF.ini b/Data/Sys/GameSettings/WHF.ini
new file mode 100644
index 0000000000..343a4680fd
--- /dev/null
+++ b/Data/Sys/GameSettings/WHF.ini
@@ -0,0 +1,25 @@
+# WHFETY - Heavy Fire Special Operations
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WHFETY.ini b/Data/Sys/GameSettings/WHFETY.ini
deleted file mode 100644
index 242d398951..0000000000
--- a/Data/Sys/GameSettings/WHFETY.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WHFETY - Heavy Fire Special Operations
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WHP.ini b/Data/Sys/GameSettings/WHP.ini
new file mode 100644
index 0000000000..cc5503335b
--- /dev/null
+++ b/Data/Sys/GameSettings/WHP.ini
@@ -0,0 +1,25 @@
+# WHPEGL - Sexy Poker
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WHU.ini b/Data/Sys/GameSettings/WHU.ini
new file mode 100644
index 0000000000..64ab08d7b0
--- /dev/null
+++ b/Data/Sys/GameSettings/WHU.ini
@@ -0,0 +1,30 @@
+# WHUEGL - Ghost Mansion Party
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WHW.ini b/Data/Sys/GameSettings/WHW.ini
new file mode 100644
index 0000000000..10bf7a470e
--- /dev/null
+++ b/Data/Sys/GameSettings/WHW.ini
@@ -0,0 +1,18 @@
+# WHWEFJ, WHWPFJ - HoopWorld
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WHWEFJ.ini b/Data/Sys/GameSettings/WHWEFJ.ini
deleted file mode 100644
index f281b7133f..0000000000
--- a/Data/Sys/GameSettings/WHWEFJ.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WHWEFJ - HoopWorld
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WHWPFJ.ini b/Data/Sys/GameSettings/WHWPFJ.ini
deleted file mode 100644
index afaf2267c4..0000000000
--- a/Data/Sys/GameSettings/WHWPFJ.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WHWPFJ - HoopWorld
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WIB.ini b/Data/Sys/GameSettings/WIB.ini
new file mode 100644
index 0000000000..721747ff28
--- /dev/null
+++ b/Data/Sys/GameSettings/WIB.ini
@@ -0,0 +1,24 @@
+# WIBEQK - bittos+
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 2
+EmulationIssues = Low FPS with OpenGL, crashes with Direct3D
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WIC.ini b/Data/Sys/GameSettings/WIC.ini
new file mode 100644
index 0000000000..be15201905
--- /dev/null
+++ b/Data/Sys/GameSettings/WIC.ini
@@ -0,0 +1,22 @@
+# WICPKQ - NyxQuest
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WICPKQ.ini b/Data/Sys/GameSettings/WICPKQ.ini
deleted file mode 100644
index a2fde07351..0000000000
--- a/Data/Sys/GameSettings/WICPKQ.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WICPKQ - NyxQuest
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WID.ini b/Data/Sys/GameSettings/WID.ini
new file mode 100644
index 0000000000..1e971fd089
--- /dev/null
+++ b/Data/Sys/GameSettings/WID.ini
@@ -0,0 +1,22 @@
+# WIDEUN - Dracula Undead Awakening
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WIDEUN.ini b/Data/Sys/GameSettings/WIDEUN.ini
deleted file mode 100644
index a77a20c5f5..0000000000
--- a/Data/Sys/GameSettings/WIDEUN.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WIDEUN - Dracula Undead Awakening
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WIL.ini b/Data/Sys/GameSettings/WIL.ini
new file mode 100644
index 0000000000..05aaf2d454
--- /dev/null
+++ b/Data/Sys/GameSettings/WIL.ini
@@ -0,0 +1,27 @@
+# WILETL - Screaming Narwhal Monkey Island Chap 1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
diff --git a/Data/Sys/GameSettings/WILETL.ini b/Data/Sys/GameSettings/WILETL.ini
deleted file mode 100644
index cb123eda87..0000000000
--- a/Data/Sys/GameSettings/WILETL.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# WILETL - Screaming Narwhal Monkey Island Chap 1
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/WIY.ini b/Data/Sys/GameSettings/WIY.ini
new file mode 100644
index 0000000000..c9cb799f1b
--- /dev/null
+++ b/Data/Sys/GameSettings/WIY.ini
@@ -0,0 +1,22 @@
+# WIYETL - Trial of Guybrush Monkey Island Chap 4
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WIYETL.ini b/Data/Sys/GameSettings/WIYETL.ini
deleted file mode 100644
index 9d0a6a4e5e..0000000000
--- a/Data/Sys/GameSettings/WIYETL.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WIYETL - Trial of Guybrush Monkey Island Chap 4
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WJA.ini b/Data/Sys/GameSettings/WJA.ini
new file mode 100644
index 0000000000..1a2e059f5f
--- /dev/null
+++ b/Data/Sys/GameSettings/WJA.ini
@@ -0,0 +1,22 @@
+# WJAEYJ - Jam City Rollergirls
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WJE.ini b/Data/Sys/GameSettings/WJE.ini
new file mode 100644
index 0000000000..46bdd7e274
--- /dev/null
+++ b/Data/Sys/GameSettings/WJE.ini
@@ -0,0 +1,22 @@
+# WJEEJX - Jett Rocket
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WJEEJX.ini b/Data/Sys/GameSettings/WJEEJX.ini
deleted file mode 100644
index 77ee2335f7..0000000000
--- a/Data/Sys/GameSettings/WJEEJX.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WJEEJX - Jett Rocket
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WKD.ini b/Data/Sys/GameSettings/WKD.ini
new file mode 100644
index 0000000000..a6c0211681
--- /dev/null
+++ b/Data/Sys/GameSettings/WKD.ini
@@ -0,0 +1,25 @@
+# WKDEGN - Pirates
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WKT.ini b/Data/Sys/GameSettings/WKT.ini
new file mode 100644
index 0000000000..a5754a4386
--- /dev/null
+++ b/Data/Sys/GameSettings/WKT.ini
@@ -0,0 +1,22 @@
+# WKTJA4, WKTPA4 - CONTRA REBIRTH
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WKTJA4.ini b/Data/Sys/GameSettings/WKTJA4.ini
deleted file mode 100644
index cead9f6586..0000000000
--- a/Data/Sys/GameSettings/WKTJA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WKTJA4 - CONTRA REBIRTH
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WKTPA4.ini b/Data/Sys/GameSettings/WKTPA4.ini
deleted file mode 100644
index f2efe775a0..0000000000
--- a/Data/Sys/GameSettings/WKTPA4.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WKTPA4 - Contra ReBirth
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WLE.ini b/Data/Sys/GameSettings/WLE.ini
new file mode 100644
index 0000000000..283245cc70
--- /dev/null
+++ b/Data/Sys/GameSettings/WLE.ini
@@ -0,0 +1,23 @@
+# WLEELU - PooYoos Episode 1
+
+[Core]
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WLEELU.ini b/Data/Sys/GameSettings/WLEELU.ini
deleted file mode 100644
index b09fbbb3bf..0000000000
--- a/Data/Sys/GameSettings/WLEELU.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# WLEELU - PooYoos Episode 1
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WLN.ini b/Data/Sys/GameSettings/WLN.ini
new file mode 100644
index 0000000000..7b4f945b07
--- /dev/null
+++ b/Data/Sys/GameSettings/WLN.ini
@@ -0,0 +1,23 @@
+# WLNELU - PooYoos Episode 2
+
+[Core]
+
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnFrame]
+
+[ActionReplay]
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WLNELU.ini b/Data/Sys/GameSettings/WLNELU.ini
deleted file mode 100644
index dc755d3671..0000000000
--- a/Data/Sys/GameSettings/WLNELU.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# WLNELU - PooYoos Episode 2
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WLO.ini b/Data/Sys/GameSettings/WLO.ini
new file mode 100644
index 0000000000..a4dcd5feda
--- /dev/null
+++ b/Data/Sys/GameSettings/WLO.ini
@@ -0,0 +1,25 @@
+# WLOEHL - LostWinds WotM
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/WLOEHL.ini b/Data/Sys/GameSettings/WLOEHL.ini
deleted file mode 100644
index d8406f3efa..0000000000
--- a/Data/Sys/GameSettings/WLOEHL.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-# WLOEHL - LostWinds WotM
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-
diff --git a/Data/Sys/GameSettings/WLW.ini b/Data/Sys/GameSettings/WLW.ini
new file mode 100644
index 0000000000..8af7ed36a4
--- /dev/null
+++ b/Data/Sys/GameSettings/WLW.ini
@@ -0,0 +1,22 @@
+# WLWEHL - LostWinds
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WLWEHL.ini b/Data/Sys/GameSettings/WLWEHL.ini
deleted file mode 100644
index 3f9978cf5d..0000000000
--- a/Data/Sys/GameSettings/WLWEHL.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# WLWEHL - LostWinds
-
-[Core]
-# Values set here will override the main dolphin settings.
-BlockMerging = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WLZ.ini b/Data/Sys/GameSettings/WLZ.ini
new file mode 100644
index 0000000000..309997c141
--- /dev/null
+++ b/Data/Sys/GameSettings/WLZ.ini
@@ -0,0 +1,22 @@
+# WLZEXY - lilt line
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/WM8.ini b/Data/Sys/GameSettings/WM8.ini
new file mode 100644
index 0000000000..81f96ff262
--- /dev/null
+++ b/Data/Sys/GameSettings/WM8.ini
@@ -0,0 +1,22 @@
+# WM8E18 - Bomberman Blast
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WM8E18.ini b/Data/Sys/GameSettings/WM8E18.ini
deleted file mode 100644
index 3e4313f9e5..0000000000
--- a/Data/Sys/GameSettings/WM8E18.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WM8E18 - Bomberman Blast
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WMA.ini b/Data/Sys/GameSettings/WMA.ini
new file mode 100644
index 0000000000..5eeb33f4b9
--- /dev/null
+++ b/Data/Sys/GameSettings/WMA.ini
@@ -0,0 +1,22 @@
+# WMAEYS - Magnetis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WMB.ini b/Data/Sys/GameSettings/WMB.ini
new file mode 100644
index 0000000000..0e6b178aff
--- /dev/null
+++ b/Data/Sys/GameSettings/WMB.ini
@@ -0,0 +1,31 @@
+# WMBE01, WMBP01 - Maboshi's Arcade
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Use OpenGL and Real XFB
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+
diff --git a/Data/Sys/GameSettings/WMBP01.ini b/Data/Sys/GameSettings/WMBP01.ini
deleted file mode 100644
index 0bcfc00bca..0000000000
--- a/Data/Sys/GameSettings/WMBP01.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# WMBP01 - MaBoShi
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Use OpenGL and Real XFB
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
-
diff --git a/Data/Sys/GameSettings/WMG.ini b/Data/Sys/GameSettings/WMG.ini
new file mode 100644
index 0000000000..ec5ef25405
--- /dev/null
+++ b/Data/Sys/GameSettings/WMG.ini
@@ -0,0 +1,22 @@
+# WMGEKH - Mart Racer
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WMJ.ini b/Data/Sys/GameSettings/WMJ.ini
new file mode 100644
index 0000000000..d79de217ca
--- /dev/null
+++ b/Data/Sys/GameSettings/WMJ.ini
@@ -0,0 +1,21 @@
+# WMJESJ - Dive
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Glitches in the game menu with fast depth enabled.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/WMM.ini b/Data/Sys/GameSettings/WMM.ini
new file mode 100644
index 0000000000..569b01e00a
--- /dev/null
+++ b/Data/Sys/GameSettings/WMM.ini
@@ -0,0 +1,22 @@
+# WMMEAF - MUSCLE MARCH
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WMMEAF.ini b/Data/Sys/GameSettings/WMMEAF.ini
deleted file mode 100644
index a44986d31c..0000000000
--- a/Data/Sys/GameSettings/WMMEAF.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WMMEAF - MUSCLE MARCH
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WOT.ini b/Data/Sys/GameSettings/WOT.ini
new file mode 100644
index 0000000000..b2fab05d52
--- /dev/null
+++ b/Data/Sys/GameSettings/WOT.ini
@@ -0,0 +1,22 @@
+# WOTEM0 - OVERTURN
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WOTEM0.ini b/Data/Sys/GameSettings/WOTEM0.ini
deleted file mode 100644
index e2ef5204dc..0000000000
--- a/Data/Sys/GameSettings/WOTEM0.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WOTEM0 - OVERTURN
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WOY.ini b/Data/Sys/GameSettings/WOY.ini
new file mode 100644
index 0000000000..a47a61a5fa
--- /dev/null
+++ b/Data/Sys/GameSettings/WOY.ini
@@ -0,0 +1,18 @@
+# WOYEPS - Bit Boy!!
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WP4.ini b/Data/Sys/GameSettings/WP4.ini
new file mode 100644
index 0000000000..9091743774
--- /dev/null
+++ b/Data/Sys/GameSettings/WP4.ini
@@ -0,0 +1,22 @@
+# WP4ELU - PooYoos - Episode 3
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WPC.ini b/Data/Sys/GameSettings/WPC.ini
new file mode 100644
index 0000000000..2e2d73981b
--- /dev/null
+++ b/Data/Sys/GameSettings/WPC.ini
@@ -0,0 +1,18 @@
+# WPCE01 - Doc's Punch-Out!!
+[Core]
+# Values set here will override the main Dolphin settings.
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Disable PAL60 (EuRGB60) mode
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
diff --git a/Data/Sys/GameSettings/WPCE01.ini b/Data/Sys/GameSettings/WPCE01.ini
deleted file mode 100644
index 632a6849a1..0000000000
--- a/Data/Sys/GameSettings/WPCE01.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# WPCE01 - Doc's Punch-Out!!
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Disable EuRGB60 mode
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
diff --git a/Data/Sys/GameSettings/WPJEJW.ini b/Data/Sys/GameSettings/WPJ.ini
similarity index 100%
rename from Data/Sys/GameSettings/WPJEJW.ini
rename to Data/Sys/GameSettings/WPJ.ini
diff --git a/Data/Sys/GameSettings/WPP.ini b/Data/Sys/GameSettings/WPP.ini
new file mode 100644
index 0000000000..e9e23ec8cc
--- /dev/null
+++ b/Data/Sys/GameSettings/WPP.ini
@@ -0,0 +1,22 @@
+# WPPEXS - Family Table Tennis
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WPPEXS.ini b/Data/Sys/GameSettings/WPPEXS.ini
deleted file mode 100644
index aec1e70fbf..0000000000
--- a/Data/Sys/GameSettings/WPPEXS.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WPPEXS - Family Table Tennis
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WPPJJF.ini b/Data/Sys/GameSettings/WPPJJF.ini
deleted file mode 100644
index f96286a43f..0000000000
--- a/Data/Sys/GameSettings/WPPJJF.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# WPPJJF - JM‰OÔóÝóWii
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
diff --git a/Data/Sys/GameSettings/WPS.ini b/Data/Sys/GameSettings/WPS.ini
new file mode 100644
index 0000000000..ef44e2b672
--- /dev/null
+++ b/Data/Sys/GameSettings/WPS.ini
@@ -0,0 +1,19 @@
+# WPSE01 - Pokémon Rumble
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WPSE01.ini b/Data/Sys/GameSettings/WPSE01.ini
deleted file mode 100644
index 5f341e4df2..0000000000
--- a/Data/Sys/GameSettings/WPSE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WPSE01 - Pokémon Rumble
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WPU.ini b/Data/Sys/GameSettings/WPU.ini
new file mode 100644
index 0000000000..8848528a5e
--- /dev/null
+++ b/Data/Sys/GameSettings/WPU.ini
@@ -0,0 +1,18 @@
+# WPUEGD - Bust A Move Plus
+[Core]
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WPUEGD.ini b/Data/Sys/GameSettings/WPUEGD.ini
deleted file mode 100644
index 4b14ae7d37..0000000000
--- a/Data/Sys/GameSettings/WPUEGD.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# WPUEGD - Bust A Move Plus
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WPY.ini b/Data/Sys/GameSettings/WPY.ini
new file mode 100644
index 0000000000..02138cdd3f
--- /dev/null
+++ b/Data/Sys/GameSettings/WPY.ini
@@ -0,0 +1,19 @@
+# WPYPPY - Pallurikio
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WPYPPY.ini b/Data/Sys/GameSettings/WPYPPY.ini
deleted file mode 100644
index b7139e00e6..0000000000
--- a/Data/Sys/GameSettings/WPYPPY.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WPYPPY - Pallurikio
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WR5.ini b/Data/Sys/GameSettings/WR5.ini
new file mode 100644
index 0000000000..7f30b44e09
--- /dev/null
+++ b/Data/Sys/GameSettings/WR5.ini
@@ -0,0 +1,23 @@
+# WR5EEY - Retro City Rampage
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WR9.ini b/Data/Sys/GameSettings/WR9.ini
new file mode 100644
index 0000000000..295bdf4ca3
--- /dev/null
+++ b/Data/Sys/GameSettings/WR9.ini
@@ -0,0 +1,34 @@
+# WR9E08, WR9P08 - MEGA MAN 9
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+EFBScale = 2
+
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/Sys/GameSettings/WR9E08.ini b/Data/Sys/GameSettings/WR9E08.ini
deleted file mode 100644
index 9779b2c2a1..0000000000
--- a/Data/Sys/GameSettings/WR9E08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# WR9E08 - MEGA MAN 9
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-EFBScale = 2
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/WR9P08.ini b/Data/Sys/GameSettings/WR9P08.ini
deleted file mode 100644
index d6f7b292f0..0000000000
--- a/Data/Sys/GameSettings/WR9P08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# WR9P08 - MEGA MAN 9
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-EFBScale = 2
-
-SafeTextureCacheColorSamples = 512
-
diff --git a/Data/Sys/GameSettings/WRG.ini b/Data/Sys/GameSettings/WRG.ini
new file mode 100644
index 0000000000..aa98c24f88
--- /dev/null
+++ b/Data/Sys/GameSettings/WRG.ini
@@ -0,0 +1,22 @@
+# WRGEHU - Gladiator
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WRGEHU.ini b/Data/Sys/GameSettings/WRGEHU.ini
deleted file mode 100644
index 1e5dc7ec44..0000000000
--- a/Data/Sys/GameSettings/WRGEHU.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WRGEHU - Gladiator
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WRI.ini b/Data/Sys/GameSettings/WRI.ini
new file mode 100644
index 0000000000..4dc04070f2
--- /dev/null
+++ b/Data/Sys/GameSettings/WRI.ini
@@ -0,0 +1,24 @@
+# WRIEGD, WRIPGD - RAINBOW ISLANDS T.A.
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WRIEGD.ini b/Data/Sys/GameSettings/WRIEGD.ini
deleted file mode 100644
index 58b8b25bfd..0000000000
--- a/Data/Sys/GameSettings/WRIEGD.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# WRIEGD - RAINBOW ISLANDS T.A.
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WRIPGD.ini b/Data/Sys/GameSettings/WRIPGD.ini
deleted file mode 100644
index 932e440ba4..0000000000
--- a/Data/Sys/GameSettings/WRIPGD.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# WRIPGD - RAINBOW ISLANDS T.A.
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WRU.ini b/Data/Sys/GameSettings/WRU.ini
new file mode 100644
index 0000000000..efffa13ab4
--- /dev/null
+++ b/Data/Sys/GameSettings/WRU.ini
@@ -0,0 +1,19 @@
+# WRUPXS - BIT.TRIP RUNNER
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WRUPXS.ini b/Data/Sys/GameSettings/WRUPXS.ini
deleted file mode 100644
index dc542d51b1..0000000000
--- a/Data/Sys/GameSettings/WRUPXS.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WRUPXS - BIT.TRIP RUNNER
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WRX.ini b/Data/Sys/GameSettings/WRX.ini
new file mode 100644
index 0000000000..5f6c5de319
--- /dev/null
+++ b/Data/Sys/GameSettings/WRX.ini
@@ -0,0 +1,34 @@
+# WRXE08 - MEGA MAN 10
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+SafeTextureCacheColorSamples = 512
+EFBScale = 2
+
diff --git a/Data/Sys/GameSettings/WRXE08.ini b/Data/Sys/GameSettings/WRXE08.ini
deleted file mode 100644
index bbc6b1e67f..0000000000
--- a/Data/Sys/GameSettings/WRXE08.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# WRXE08 - MEGA MAN 10
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear =
-PH_ZFar =
-
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-
-SafeTextureCacheColorSamples = 512
-EFBScale = 2
-
diff --git a/Data/Sys/GameSettings/WSL.ini b/Data/Sys/GameSettings/WSL.ini
new file mode 100644
index 0000000000..494947e958
--- /dev/null
+++ b/Data/Sys/GameSettings/WSL.ini
@@ -0,0 +1,23 @@
+# WSLEE6 - The Magic Obelisk
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs efb to ram otherwise character is invincible in the light.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WSN.ini b/Data/Sys/GameSettings/WSN.ini
new file mode 100644
index 0000000000..9751d8a0c6
--- /dev/null
+++ b/Data/Sys/GameSettings/WSN.ini
@@ -0,0 +1,22 @@
+# WSNE8P - Sonic 4 Episode I
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WSNE8P.ini b/Data/Sys/GameSettings/WSNE8P.ini
deleted file mode 100644
index ddfc5ddbcb..0000000000
--- a/Data/Sys/GameSettings/WSNE8P.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WSNE8P - Sonic 4 Episode I
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WSR.ini b/Data/Sys/GameSettings/WSR.ini
new file mode 100644
index 0000000000..8162ab0bf9
--- /dev/null
+++ b/Data/Sys/GameSettings/WSR.ini
@@ -0,0 +1,22 @@
+# WSREQT - Space Trek
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WTE.ini b/Data/Sys/GameSettings/WTE.ini
new file mode 100644
index 0000000000..3086b26fb0
--- /dev/null
+++ b/Data/Sys/GameSettings/WTE.ini
@@ -0,0 +1,33 @@
+# WTEELU - Tales of Elastic Boy Mission 1
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WTEELU.ini b/Data/Sys/GameSettings/WTEELU.ini
deleted file mode 100644
index 289c72bd9d..0000000000
--- a/Data/Sys/GameSettings/WTEELU.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# WTEELU - Tales of Elastic Boy Mission 1
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-EFBToTextureEnable = False
-EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/WTK.ini b/Data/Sys/GameSettings/WTK.ini
new file mode 100644
index 0000000000..390a30cc38
--- /dev/null
+++ b/Data/Sys/GameSettings/WTK.ini
@@ -0,0 +1,29 @@
+# WTKEGL - TV Show King 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WTKEGL.ini b/Data/Sys/GameSettings/WTKEGL.ini
deleted file mode 100644
index fffe3a11c2..0000000000
--- a/Data/Sys/GameSettings/WTKEGL.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# WTKEGL - TV Show King 2
-[Core]
-# Values set here will override the main dolphin settings.
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/WTR.ini b/Data/Sys/GameSettings/WTR.ini
new file mode 100644
index 0000000000..0a111833a6
--- /dev/null
+++ b/Data/Sys/GameSettings/WTR.ini
@@ -0,0 +1,22 @@
+# WTRPXS - BIT.TRIP BEAT
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WTRPXS.ini b/Data/Sys/GameSettings/WTRPXS.ini
deleted file mode 100644
index 05dbc501cd..0000000000
--- a/Data/Sys/GameSettings/WTRPXS.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WTRPXS - BIT.TRIP BEAT
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WTT.ini b/Data/Sys/GameSettings/WTT.ini
new file mode 100644
index 0000000000..1974222029
--- /dev/null
+++ b/Data/Sys/GameSettings/WTT.ini
@@ -0,0 +1,22 @@
+# WTTPTW - Toki Tori
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WTTPTW.ini b/Data/Sys/GameSettings/WTTPTW.ini
deleted file mode 100644
index f09b30c946..0000000000
--- a/Data/Sys/GameSettings/WTTPTW.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# WTTPTW - Toki Tori
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WTU.ini b/Data/Sys/GameSettings/WTU.ini
new file mode 100644
index 0000000000..cbc6150422
--- /dev/null
+++ b/Data/Sys/GameSettings/WTU.ini
@@ -0,0 +1,22 @@
+# WTUEKN - Tumblebugs 2
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues =
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WTX.ini b/Data/Sys/GameSettings/WTX.ini
new file mode 100644
index 0000000000..5bf69fc01b
--- /dev/null
+++ b/Data/Sys/GameSettings/WTX.ini
@@ -0,0 +1,23 @@
+# WTXPJS - Texas Hold'em Tournament
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+Hack = -1
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WTXPJS.ini b/Data/Sys/GameSettings/WTXPJS.ini
deleted file mode 100644
index 70fb7a24f0..0000000000
--- a/Data/Sys/GameSettings/WTXPJS.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# WTXPJS - Texas Hold'em Tournament
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-Hack = -1
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WWA.ini b/Data/Sys/GameSettings/WWA.ini
new file mode 100644
index 0000000000..c3640aeae1
--- /dev/null
+++ b/Data/Sys/GameSettings/WWA.ini
@@ -0,0 +1,22 @@
+# WWAEQT - WarMen Tactics
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WWR.ini b/Data/Sys/GameSettings/WWR.ini
new file mode 100644
index 0000000000..293e0c2c87
--- /dev/null
+++ b/Data/Sys/GameSettings/WWR.ini
@@ -0,0 +1,19 @@
+# WWRE01 - EXCITEBIKE World Rally
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WWRE01.ini b/Data/Sys/GameSettings/WWRE01.ini
deleted file mode 100644
index 0a4147279d..0000000000
--- a/Data/Sys/GameSettings/WWRE01.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WWRE01 - EXCITEBIKE World Rally
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/WXB.ini b/Data/Sys/GameSettings/WXB.ini
new file mode 100644
index 0000000000..33781d4162
--- /dev/null
+++ b/Data/Sys/GameSettings/WXB.ini
@@ -0,0 +1,28 @@
+# WXBEA4 - Ben 10 Alien Force
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WXBEA4.ini b/Data/Sys/GameSettings/WXBEA4.ini
deleted file mode 100644
index 6db7604fba..0000000000
--- a/Data/Sys/GameSettings/WXBEA4.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# WXBEA4 - Ben 10 Alien Force
-[Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-[OnFrame]
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Video_Settings]
-SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WXP.ini b/Data/Sys/GameSettings/WXP.ini
new file mode 100644
index 0000000000..244d97ebc3
--- /dev/null
+++ b/Data/Sys/GameSettings/WXP.ini
@@ -0,0 +1,21 @@
+# WXPEYV - Paint Splash
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WXR.ini b/Data/Sys/GameSettings/WXR.ini
new file mode 100644
index 0000000000..9888fef19d
--- /dev/null
+++ b/Data/Sys/GameSettings/WXR.ini
@@ -0,0 +1,23 @@
+# WXREE9 - RF Ocean Challenge
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/WYM.ini b/Data/Sys/GameSettings/WYM.ini
new file mode 100644
index 0000000000..d2ff1a8597
--- /dev/null
+++ b/Data/Sys/GameSettings/WYM.ini
@@ -0,0 +1,25 @@
+# WYMEFJ - Yummy Yummy Cooking Jam
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 1
+EmulationIssues = Crashes after warning screen
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
diff --git a/Data/Sys/GameSettings/WZI.ini b/Data/Sys/GameSettings/WZI.ini
new file mode 100644
index 0000000000..96ee29f0af
--- /dev/null
+++ b/Data/Sys/GameSettings/WZI.ini
@@ -0,0 +1,23 @@
+# WZIPTW - Rubik's: Rush
+
+[Core]
+# Values set here will override the main Dolphin settings.
+DCBZ = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Requires data cache emulation
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
diff --git a/Data/Sys/GameSettings/WZIPTW.ini b/Data/Sys/GameSettings/WZIPTW.ini
deleted file mode 100644
index b789cdcb81..0000000000
--- a/Data/Sys/GameSettings/WZIPTW.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# WZIPTW - Rubik's: Rush
-
-[Core]
-# Values set here will override the main dolphin settings.
-DCBZ = 1
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Requires data cache emulation
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/WZP.ini b/Data/Sys/GameSettings/WZP.ini
new file mode 100644
index 0000000000..720a19148d
--- /dev/null
+++ b/Data/Sys/GameSettings/WZP.ini
@@ -0,0 +1,19 @@
+# WZPPRZ - Zombie Panic in Wonderland
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/WZPPRZ.ini b/Data/Sys/GameSettings/WZPPRZ.ini
deleted file mode 100644
index 66d8467a32..0000000000
--- a/Data/Sys/GameSettings/WZPPRZ.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# WZPPRZ - Zombie Panic in Wonderland
-
-[Core]
-# Values set here will override the main dolphin settings.
-
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/OpenCL/TextureDecoder.cl b/Data/Sys/OpenCL/TextureDecoder.cl
deleted file mode 100644
index bc7be0a92a..0000000000
--- a/Data/Sys/OpenCL/TextureDecoder.cl
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-kernel void DecodeI4(global uchar *dst,
-                     const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 8;
-    int srcOffset = x + y * width / 8;
-    for (int iy = 0; iy < 8; iy++)
-    {
-        uchar4 val = vload4(srcOffset, src);
-        uchar8 res;
-        res.even = (val >> (uchar4)4) & (uchar4)0x0F;
-        res.odd = val & (uchar4)0x0F;
-        res |= res << (uchar8)4;
-        vstore8(res, 0, dst + ((y + iy)*width + x));
-        srcOffset++;
-    }
-}
-
-kernel void DecodeI4_RGBA(global uint *dst,
-                          const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 8;
-    int srcOffset = x + y * width / 8;
-    for (int iy = 0; iy < 8; iy++)
-    {
-        uchar4 val = vload4(srcOffset, src);
-        uchar8 res;
-        res.even = (val >> (uchar4)4) & (uchar4)0x0F;
-        res.odd = val & (uchar4)0x0F;
-        res |= res << (uchar8)4;
-        vstore8(upsample(upsample(res,res),upsample(res,res)), 0, dst + ((y + iy)*width + x));
-        srcOffset++;
-    }
-}
-
-kernel void DecodeI8(global uchar *dst,
-                     const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 8;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        vstore8(vload8(srcOffset++, src),
-                0, dst + ((y + iy)*width + x));
-    }
-}
-
-kernel void DecodeI8_RGBA(global uint *dst,
-                          const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 8;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        uchar8 val = vload8(srcOffset++, src);
-        vstore8(upsample(upsample(val,val),upsample(val,val)),
-                0, dst + ((y + iy)*width + x));
-    }
-}
-
-kernel void DecodeIA8(global ushort *dst,
-                      const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 4;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        uchar8 val = vload8(srcOffset++, src);
-        vstore4(upsample(val.even, val.odd), 0, dst + ((y + iy)*width + x));
-    }
-}
-
-kernel void DecodeIA8_RGBA(global uint *dst,
-                           const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 4;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        uchar8 val = vload8(srcOffset++, src);
-        vstore4(upsample(upsample(val.even,val.odd),upsample(val.odd, val.odd)), 0, dst + ((y + iy)*width + x));
-    }
-}
-
-kernel void DecodeIA4(global ushort *dst,
-                      const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 8;
-    uchar8 val;
-    ushort8 res;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        val = vload8(srcOffset++, src);
-        res = upsample(val >> (uchar8)4, val & (uchar8)0xF);
-        res |= res << (ushort8)4; 
-        vstore8(res, 0, dst + y*width + x);
-        dst+=width;
-    }
-}
-
-kernel void DecodeIA4_RGBA(global uint *dst,
-                           const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 4;
-    int srcOffset = ((x * 4) + (y * width)) / 8;
-    uchar8 val;
-    uint8 res;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        val = vload8(srcOffset++, src);
-        uchar8 a = val >> (uchar8)4;
-        uchar8 l = val & (uchar8)0xF;
-        res = upsample(upsample(a, l), upsample(l,l));
-        res |= res << (uint8)4;
-        vstore8(res, 0, dst + y*width + x);
-        dst+=width;
-    }
-}
-
-kernel void DecodeRGBA8(global ushort *dst,
-                      const global ushort *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = (x * 2) + (y * width) / 2;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        ushort8 val = (ushort8)(vload4(srcOffset, src), vload4(srcOffset + 4, src));
-        ushort8 temp = rotate(val, (ushort8)4);
-        ushort8 bgra = rotate(temp, (ushort8)4).s40516273;
-        vstore8(bgra, 0, dst + ((y + iy)*width + x) * 2);
-        srcOffset++;
-    }
-}
-
-kernel void DecodeRGBA8_RGBA(global uchar *dst,
-                             const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = (x * 2) + (y * width) / 2;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        uchar8 ar = vload8(srcOffset, src);
-        uchar8 gb = vload8(srcOffset + 4, src);
-        uchar16 res;
-        res.even.even = ar.odd;
-        res.even.odd = gb.odd;
-        res.odd.even = gb.even;
-        res.odd.odd = ar.even;
-        vstore16(res, 0, dst + ((y + iy)*width + x) * 4);
-        srcOffset++;
-    }
-}
-
-kernel void DecodeRGB565(global ushort *dst,
-                         const global ushort *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = x + (y * width) / 4;
-    dst += width*y + x;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        ushort4 val = rotate(vload4(srcOffset++, src),(ushort4)4);
-        vstore4(rotate(val,(ushort4)4), 0, dst + iy*width);
-    }
-}
-
-kernel void DecodeRGB565_RGBA(global uchar *dst,
-                              const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = x + (y * width) / 4;
-    for (int iy = 0; iy < 4; iy++)
-    {
-        uchar8 val = vload8(srcOffset++, src);
-
-        uchar16 res;
-        res.even.even = bitselect(val.even, val.even >> (uchar4)5, (uchar4)7);
-        res.odd.even = bitselect((val.odd >> (uchar4)3) | (val.even << (uchar4)5), val.even >> (uchar4)1, (uchar4)3);
-        res.even.odd = bitselect(val.odd << (uchar4)3, val.odd >> (uchar4)2, (uchar4)7);
-        res.odd.odd = (uchar4)0xFF;
-     
-        vstore16(res, 0, dst + ((y + iy)*width + x) * 4);
-    }
-}
-
-kernel void DecodeRGB5A3(global uchar *dst,
-                         const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = x + (y * width) / 4;
-    uchar8 val;
-    uchar16 resNoAlpha, resAlpha, choice;
-    #define iterateRGB5A3() \
-    val = vload8(srcOffset++, src); \
-    resNoAlpha.s26AE = val.even << (uchar4)1; \
-    resNoAlpha.s159D = val.even << (uchar4)6 | val.odd >> (uchar4)2; \
-    resNoAlpha.s048C = val.odd << (uchar4)3; \
-    resNoAlpha = bitselect(resNoAlpha, resNoAlpha >> (uchar16)5, (uchar16)0x3); \
-    resNoAlpha.s37BF = (uchar4)(0xFF); \
-    resAlpha.s26AE = bitselect(val.even << (uchar4)4, val.even, (uchar4)0xF); \
-    resAlpha.s159D = bitselect(val.odd, val.odd >> (uchar4)4,   (uchar4)0xF); \
-    resAlpha.s048C = bitselect(val.odd << (uchar4)4, val.odd,   (uchar4)0xF); \
-    resAlpha.s37BF = bitselect(val.even << (uchar4)1, val.even >> (uchar4)2, (uchar4)0x1C); \
-    resAlpha.s37BF = bitselect(resAlpha.s37BF, val.even >> (uchar4)5, (uchar4)0x3); \
-    choice = (uchar16)((uchar4)(val.even.s0), \
-                       (uchar4)(val.even.s1), \
-                       (uchar4)(val.even.s2), \
-                       (uchar4)(val.even.s3)); \
-    vstore16(select(resAlpha, resNoAlpha, choice), 0, dst + (y * width + x) * 4);
-    iterateRGB5A3(); dst += width*4;
-    iterateRGB5A3(); dst += width*4;
-    iterateRGB5A3(); dst += width*4;
-    iterateRGB5A3();
-}
-
-kernel void DecodeRGB5A3_RGBA(global uchar *dst,
-                              const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    int srcOffset = x + (y * width) / 4;
-    uchar8 val;
-    uchar16 resNoAlpha, resAlpha, choice;
-    #define iterateRGB5A3_RGBA() \
-    val = vload8(srcOffset++, src); \
-    resNoAlpha.s048C = val.even << (uchar4)1; \
-    resNoAlpha.s159D = val.even << (uchar4)6 | val.odd >> (uchar4)2; \
-    resNoAlpha.s26AE = val.odd << (uchar4)3; \
-    resNoAlpha = bitselect(resNoAlpha, resNoAlpha >> (uchar16)5, (uchar16)0x3); \
-    resNoAlpha.s37BF = (uchar4)(0xFF); \
-    resAlpha.s048C = bitselect(val.even << (uchar4)4, val.even, (uchar4)0xF); \
-    resAlpha.s159D = bitselect(val.odd, val.odd >> (uchar4)4,   (uchar4)0xF); \
-    resAlpha.s26AE = bitselect(val.odd << (uchar4)4, val.odd,   (uchar4)0xF); \
-    resAlpha.s37BF = bitselect(val.even << (uchar4)1, val.even >> (uchar4)2, (uchar4)0x1C); \
-    resAlpha.s37BF = bitselect(resAlpha.s37BF, val.even >> (uchar4)5, (uchar4)0x3); \
-    choice = (uchar16)((uchar4)(val.even.s0), \
-                       (uchar4)(val.even.s1), \
-                       (uchar4)(val.even.s2), \
-                       (uchar4)(val.even.s3)); \
-    vstore16(select(resAlpha, resNoAlpha, choice), 0, dst + (y * width + x) * 4);
-    iterateRGB5A3_RGBA(); dst += width*4;
-    iterateRGB5A3_RGBA(); dst += width*4;
-    iterateRGB5A3_RGBA(); dst += width*4;
-    iterateRGB5A3_RGBA();
-}
-
-uint16 unpack(uchar b)
-{
-    return (uint16)((uint4)(b >> 3 & 0x18),
-                    (uint4)(b >> 1 & 0x18),
-                    (uint4)(b << 1 & 0x18),
-                    (uint4)(b << 3 & 0x18));
-}
-
-kernel void decodeCMPRBlock(global uchar *dst,
-                      const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    uchar8 val = vload8(0, src);
-
-    uchar2 colora565 = (uchar2)(val.s1, val.s3);
-    uchar2 colorb565 = (uchar2)(val.s0, val.s2);
-    uchar8 color32 = (uchar8)(bitselect(colora565 << (uchar2)3, colora565 >> (uchar2)2, (uchar2)7),
-                              bitselect((colora565 >> (uchar2)3) | (colorb565 << (uchar2)5), colorb565 >> (uchar2)1, (uchar2)3),
-                              bitselect(colorb565, colorb565 >> (uchar2)5, (uchar2)7),
-                              (uchar2)0xFF);
-
-    ushort4 frac2 = convert_ushort4(color32.even) - convert_ushort4(color32.odd);
-    uchar4 frac = convert_uchar4((frac2 * (ushort4)3) / (ushort4)8);
-    
-    ushort4 colorAlpha =   upsample((uchar4)(color32.even.s0,color32.even.s1,color32.even.s2,0),
-                                    rhadd(color32.odd, color32.even));
-    colorAlpha.s3 = 0xFF;
-    ushort4 colorNoAlpha = upsample(color32.odd + frac, color32.even - frac);
-
-    uint4 colors = upsample((upsample(val.s0,val.s1) > upsample(val.s2,val.s3))?colorNoAlpha:colorAlpha,
-                            upsample(color32.odd, color32.even));
-
-    uint16 colorsFull = (uint16)(colors, colors, colors, colors);
-
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s4)), 0, dst);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s5)), 0, dst+=width*4);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s6)), 0, dst+=width*4);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s7)), 0, dst+=width*4);
-}
-
-kernel void DecodeCMPR(global uchar *dst,
-                      const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 8;
-    
-    src += x * 4 + (y * width) / 2;
-    dst += (y * width + x) * 4;
-    
-    decodeCMPRBlock(dst, src, width);              src += 8;
-    decodeCMPRBlock(dst + 16, src, width);         src += 8;
-    decodeCMPRBlock(dst + 16 * width, src, width); src += 8;
-    decodeCMPRBlock(dst + 16 * (width + 1), src, width);
-}
-
-kernel void decodeCMPRBlock_RGBA(global uchar *dst,
-                                 const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 4, y = get_global_id(1) * 4;
-    uchar8 val = vload8(0, src);
-
-    uchar2 colora565 = (uchar2)(val.s1, val.s3);
-    uchar2 colorb565 = (uchar2)(val.s0, val.s2);
-    uchar8 color32 = (uchar8)(bitselect(colorb565, colorb565 >> (uchar2)5, (uchar2)7),
-                              bitselect((colora565 >> (uchar2)3) | (colorb565 << (uchar2)5), colorb565 >> (uchar2)1, (uchar2)3),
-                              bitselect(colora565 << (uchar2)3, colora565 >> (uchar2)2, (uchar2)7),
-                              (uchar2)0xFF);
-
-    ushort4 frac2 = convert_ushort4(color32.even) - convert_ushort4(color32.odd);
-    uchar4 frac = convert_uchar4((frac2 * (ushort4)3) / (ushort4)8);
-    
-    ushort4 colorAlpha =   upsample((uchar4)(color32.even.s0,color32.even.s1,color32.even.s2,0),
-                                    rhadd(color32.odd, color32.even));
-    colorAlpha.s3 = 0xFF;
-    ushort4 colorNoAlpha = upsample(color32.odd + frac, color32.even - frac);
-
-    uint4 colors = upsample((upsample(val.s0,val.s1) > upsample(val.s2,val.s3))?colorNoAlpha:colorAlpha,
-                            upsample(color32.odd, color32.even));
-
-    uint16 colorsFull = (uint16)(colors, colors, colors, colors);
-
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s4)), 0, dst);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s5)), 0, dst+=width*4);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s6)), 0, dst+=width*4);
-    vstore16(convert_uchar16(colorsFull >> unpack(val.s7)), 0, dst+=width*4);
-}
-
-kernel void DecodeCMPR_RGBA(global uchar *dst,
-                            const global uchar *src, int width)
-{
-    int x = get_global_id(0) * 8, y = get_global_id(1) * 8;
-    
-    src += x * 4 + (y * width) / 2;
-    dst += (y * width + x) * 4;
-    
-    decodeCMPRBlock_RGBA(dst, src, width);              src += 8;
-    decodeCMPRBlock_RGBA(dst + 16, src, width);         src += 8;
-    decodeCMPRBlock_RGBA(dst + 16 * width, src, width); src += 8;
-    decodeCMPRBlock_RGBA(dst + 16 * (width + 1), src, width);
-}
diff --git a/Source/Core/DolphinWX/resources/Dolphin.png b/Data/Sys/Resources/Dolphin.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/Dolphin.png
rename to Data/Sys/Resources/Dolphin.png
diff --git a/Data/Sys/Resources/Flag_Australia.png b/Data/Sys/Resources/Flag_Australia.png
new file mode 100644
index 0000000000..aed07e509f
Binary files /dev/null and b/Data/Sys/Resources/Flag_Australia.png differ
diff --git a/Data/Sys/Resources/Flag_Europe.png b/Data/Sys/Resources/Flag_Europe.png
new file mode 100644
index 0000000000..e1b4dbba5a
Binary files /dev/null and b/Data/Sys/Resources/Flag_Europe.png differ
diff --git a/Data/Sys/Resources/Flag_France.png b/Data/Sys/Resources/Flag_France.png
new file mode 100644
index 0000000000..e04c5d2114
Binary files /dev/null and b/Data/Sys/Resources/Flag_France.png differ
diff --git a/Data/Sys/Resources/Flag_Germany.png b/Data/Sys/Resources/Flag_Germany.png
new file mode 100644
index 0000000000..7ae9671399
Binary files /dev/null and b/Data/Sys/Resources/Flag_Germany.png differ
diff --git a/Data/Sys/Resources/Flag_Italy.png b/Data/Sys/Resources/Flag_Italy.png
new file mode 100644
index 0000000000..9e87c615bf
Binary files /dev/null and b/Data/Sys/Resources/Flag_Italy.png differ
diff --git a/Data/Sys/Resources/Flag_Japan.png b/Data/Sys/Resources/Flag_Japan.png
new file mode 100644
index 0000000000..e25cd10948
Binary files /dev/null and b/Data/Sys/Resources/Flag_Japan.png differ
diff --git a/Data/Sys/Resources/Flag_Korea.png b/Data/Sys/Resources/Flag_Korea.png
new file mode 100644
index 0000000000..d1ae515358
Binary files /dev/null and b/Data/Sys/Resources/Flag_Korea.png differ
diff --git a/Data/Sys/Resources/Flag_Netherlands.png b/Data/Sys/Resources/Flag_Netherlands.png
new file mode 100644
index 0000000000..4f5cd1ab16
Binary files /dev/null and b/Data/Sys/Resources/Flag_Netherlands.png differ
diff --git a/Data/Sys/Resources/Flag_Russia.png b/Data/Sys/Resources/Flag_Russia.png
new file mode 100644
index 0000000000..b6e926a982
Binary files /dev/null and b/Data/Sys/Resources/Flag_Russia.png differ
diff --git a/Data/Sys/Resources/Flag_Spain.png b/Data/Sys/Resources/Flag_Spain.png
new file mode 100644
index 0000000000..1a89e7a198
Binary files /dev/null and b/Data/Sys/Resources/Flag_Spain.png differ
diff --git a/Data/Sys/Resources/Flag_Taiwan.png b/Data/Sys/Resources/Flag_Taiwan.png
new file mode 100644
index 0000000000..f9a5dffa28
Binary files /dev/null and b/Data/Sys/Resources/Flag_Taiwan.png differ
diff --git a/Data/Sys/Resources/Flag_USA.png b/Data/Sys/Resources/Flag_USA.png
new file mode 100644
index 0000000000..6e438c4b02
Binary files /dev/null and b/Data/Sys/Resources/Flag_USA.png differ
diff --git a/Data/Sys/Resources/Flag_Unknown.png b/Data/Sys/Resources/Flag_Unknown.png
new file mode 100644
index 0000000000..9177a7416c
Binary files /dev/null and b/Data/Sys/Resources/Flag_Unknown.png differ
diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.png b/Data/Sys/Resources/Platform_Gamecube.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/Platform_Gamecube.png
rename to Data/Sys/Resources/Platform_Gamecube.png
diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.png b/Data/Sys/Resources/Platform_Wad.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/Platform_Wad.png
rename to Data/Sys/Resources/Platform_Wad.png
diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.png b/Data/Sys/Resources/Platform_Wii.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/Platform_Wii.png
rename to Data/Sys/Resources/Platform_Wii.png
diff --git a/Data/Sys/Resources/dolphin_logo.png b/Data/Sys/Resources/dolphin_logo.png
new file mode 100644
index 0000000000..14cc995dcc
Binary files /dev/null and b/Data/Sys/Resources/dolphin_logo.png differ
diff --git a/Data/Sys/Resources/dolphin_logo@2x.png b/Data/Sys/Resources/dolphin_logo@2x.png
new file mode 100644
index 0000000000..64f7c53a80
Binary files /dev/null and b/Data/Sys/Resources/dolphin_logo@2x.png differ
diff --git a/Source/Core/DolphinWX/resources/rating0.png b/Data/Sys/Resources/rating0.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating0.png
rename to Data/Sys/Resources/rating0.png
diff --git a/Source/Core/DolphinWX/resources/rating1.png b/Data/Sys/Resources/rating1.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating1.png
rename to Data/Sys/Resources/rating1.png
diff --git a/Source/Core/DolphinWX/resources/rating2.png b/Data/Sys/Resources/rating2.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating2.png
rename to Data/Sys/Resources/rating2.png
diff --git a/Source/Core/DolphinWX/resources/rating3.png b/Data/Sys/Resources/rating3.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating3.png
rename to Data/Sys/Resources/rating3.png
diff --git a/Source/Core/DolphinWX/resources/rating4.png b/Data/Sys/Resources/rating4.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating4.png
rename to Data/Sys/Resources/rating4.png
diff --git a/Source/Core/DolphinWX/resources/rating5.png b/Data/Sys/Resources/rating5.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/rating5.png
rename to Data/Sys/Resources/rating5.png
diff --git a/Data/Sys/Shaders/16bit.glsl b/Data/Sys/Shaders/16bit.glsl
index 82a00d3d58..fd13d3469e 100644
--- a/Data/Sys/Shaders/16bit.glsl
+++ b/Data/Sys/Shaders/16bit.glsl
@@ -1,61 +1,54 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  //Change this number to increase the pixel size.
-  float pixelSize = 3;
+	//Change this number to increase the pixel size.
+	float pixelSize = 3.0;
 
-  float red   = 0.0;
-  float green = 0.0;
-  float blue  = 0.0;
-  
-  vec2 pos = floor(uv0 * resolution.xy / pixelSize) * pixelSize * resolution.zw;
-  
-  vec4 c0 = texture(samp9, pos);
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
 
-  if (c0.r < 0.1)
-    red = 0.1;
-  else if (c0.r < 0.20)
-    red = 0.20;
-  else if (c0.r < 0.40)
-    red = 0.40;
-  else if (c0.r < 0.60)
-    red = 0.60;
-  else if (c0.r < 0.80)
-    red = 0.80;
-  else
-    red = 1.0;
+	float2 pos = floor(GetCoordinates() * GetResolution() / pixelSize) * pixelSize * GetInvResolution();
 
-  if (c0.b < 0.1)
-    blue = 0.1;
-  else if (c0.b < 0.20)
-    blue = 0.20;
-  else if (c0.b < 0.40)
-    blue = 0.40;
-  else if (c0.b < 0.60)
-    blue = 0.60;
-  else if (c0.b < 0.80)
-    blue = 0.80;
-  else
-    blue = 1.0;
+	float4 c0 = SampleLocation(pos);
 
-  if (c0.g < 0.1)
-    green = 0.1;
-  else if (c0.g < 0.20)
-    green = 0.20;
-  else if (c0.g < 0.40)
-    green = 0.40;
-  else if (c0.g < 0.60)
-    green = 0.60;
-  else if (c0.g < 0.80)
-    green = 0.80;
-  else
-    green = 1.0;
-  
-  ocol0 = vec4(red, green, blue, c0.a);
-}
\ No newline at end of file
+	if (c0.r < 0.1)
+		red = 0.1;
+	else if (c0.r < 0.20)
+		red = 0.20;
+	else if (c0.r < 0.40)
+		red = 0.40;
+	else if (c0.r < 0.60)
+		red = 0.60;
+	else if (c0.r < 0.80)
+		red = 0.80;
+	else
+		red = 1.0;
+
+	if (c0.b < 0.1)
+		blue = 0.1;
+	else if (c0.b < 0.20)
+		blue = 0.20;
+	else if (c0.b < 0.40)
+		blue = 0.40;
+	else if (c0.b < 0.60)
+		blue = 0.60;
+	else if (c0.b < 0.80)
+		blue = 0.80;
+	else
+		blue = 1.0;
+
+	if (c0.g < 0.1)
+		green = 0.1;
+	else if (c0.g < 0.20)
+		green = 0.20;
+	else if (c0.g < 0.40)
+		green = 0.40;
+	else if (c0.g < 0.60)
+		green = 0.60;
+	else if (c0.g < 0.80)
+		green = 0.80;
+	else
+		green = 1.0;
+
+	SetOutput(float4(red, green, blue, c0.a));
+}
diff --git a/Data/Sys/Shaders/32bit.glsl b/Data/Sys/Shaders/32bit.glsl
index 859371171b..d0e43db2ce 100644
--- a/Data/Sys/Shaders/32bit.glsl
+++ b/Data/Sys/Shaders/32bit.glsl
@@ -1,86 +1,79 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  //Change this number to increase the pixel size.
-  float pixelSize = 2;
+	//Change this number to increase the pixel size.
+	float pixelSize = 2.0;
 
-  float red   = 0.0;
-  float green = 0.0;
-  float blue  = 0.0;
-  
-  vec2 pos = floor(uv0 * resolution.xy / pixelSize) * pixelSize * resolution.zw;
-  
-  vec4 c0 = texture(samp9, pos);
-  
-  if (c0.r < 0.06)
-    red = 0.06;
-  else if (c0.r < 0.13)
-    red = 0.13;
-  else if (c0.r < 0.26)
-    red = 0.26;
-  else if (c0.r < 0.33)
-    red = 0.33;
-  else if (c0.r < 0.46)
-    red = 0.46;
-  else if (c0.r < 0.60)
-    red = 0.60;
-  else if (c0.r < 0.73)
-    red = 0.73;
-  else if (c0.r < 0.80)
-    red = 0.80;
-  else if (c0.r < 0.93)
-    red = 0.93;
-  else
-    red = 1.0;
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
 
-  if (c0.b < 0.06)
-    blue = 0.06;
-  else if (c0.b < 0.13)
-    blue = 0.13;
-  else if (c0.b < 0.26)
-    blue = 0.26;
-  else if (c0.b < 0.33)
-    blue = 0.33;
-  else if (c0.b < 0.46)
-    blue = 0.46;
-  else if (c0.b < 0.60)
-    blue = 0.60;
-  else if (c0.b < 0.73)
-    blue = 0.73;
-  else if (c0.b < 0.80)
-    blue = 0.80;
-  else if( c0.b < 0.93)
-    blue = 0.93;
-  else
-    blue = 1.0;
+	float2 pos = floor(GetCoordinates() * GetResolution() / pixelSize) * pixelSize * GetInvResolution();
+
+	float4 c0 = SampleLocation(pos);
+
+	if (c0.r < 0.06)
+		red = 0.06;
+	else if (c0.r < 0.13)
+		red = 0.13;
+	else if (c0.r < 0.26)
+		red = 0.26;
+	else if (c0.r < 0.33)
+		red = 0.33;
+	else if (c0.r < 0.46)
+		red = 0.46;
+	else if (c0.r < 0.60)
+		red = 0.60;
+	else if (c0.r < 0.73)
+		red = 0.73;
+	else if (c0.r < 0.80)
+		red = 0.80;
+	else if (c0.r < 0.93)
+		red = 0.93;
+	else
+		red = 1.0;
+
+	if (c0.b < 0.06)
+		blue = 0.06;
+	else if (c0.b < 0.13)
+		blue = 0.13;
+	else if (c0.b < 0.26)
+		blue = 0.26;
+	else if (c0.b < 0.33)
+		blue = 0.33;
+	else if (c0.b < 0.46)
+		blue = 0.46;
+	else if (c0.b < 0.60)
+		blue = 0.60;
+	else if (c0.b < 0.73)
+		blue = 0.73;
+	else if (c0.b < 0.80)
+		blue = 0.80;
+	else if( c0.b < 0.93)
+		blue = 0.93;
+	else
+		blue = 1.0;
 
 
-  if (c0.g < 0.06)
-    green = 0.06;
-  else if (c0.g < 0.13)
-    green = 0.13;
-  else if (c0.g < 0.26)
-    green = 0.26;
-  else if (c0.g < 0.33)
-    green = 0.33;
-  else if (c0.g < 0.46)
-    green = 0.46;
-  else if (c0.g < 0.60)
-    green = 0.60;
-  else if (c0.g < 0.73)
-    green = 0.73;
-  else if (c0.g < 0.80)
-    green = 0.80;
-  else if( c0.g < 0.93)
-    green = 0.93;
-  else
-    green = 1.0;
+	if (c0.g < 0.06)
+		green = 0.06;
+	else if (c0.g < 0.13)
+		green = 0.13;
+	else if (c0.g < 0.26)
+		green = 0.26;
+	else if (c0.g < 0.33)
+		green = 0.33;
+	else if (c0.g < 0.46)
+		green = 0.46;
+	else if (c0.g < 0.60)
+		green = 0.60;
+	else if (c0.g < 0.73)
+		green = 0.73;
+	else if (c0.g < 0.80)
+		green = 0.80;
+	else if( c0.g < 0.93)
+		green = 0.93;
+	else
+		green = 1.0;
 
-  ocol0 = vec4(red, green, blue, c0.a);
-}
\ No newline at end of file
+	SetOutput(float4(red, green, blue, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/dubois-LCD-Amber-Blue.glsl b/Data/Sys/Shaders/Anaglyph/dubois-LCD-Amber-Blue.glsl
new file mode 100644
index 0000000000..315cfb95ad
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/dubois-LCD-Amber-Blue.glsl
@@ -0,0 +1,17 @@
+// Anaglyph Amber-Blue shader based on Dubois algorithm
+// Constants taken from the screenshot:
+// "https://www.flickr.com/photos/e_dubois/5230654930/"
+// Eric Dubois
+
+void main()
+{
+	float4 c0 = SampleLayer(0);
+	float4 c1 = SampleLayer(1);
+	mat3 l = mat3( 1.062,-0.205, 0.299,
+	              -0.026, 0.908, 0.068,
+	              -0.038,-0.173, 0.022);
+	mat3 r = mat3(-0.016,-0.123,-0.017,
+	               0.006, 0.062, 0.017,
+	              -0.094,-0.185, 0.991);
+	SetOutput(float4(c0.rgb * l + c1.rgb * r, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/dubois-LCD-Green-Magenta.glsl b/Data/Sys/Shaders/Anaglyph/dubois-LCD-Green-Magenta.glsl
new file mode 100644
index 0000000000..4c80813894
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/dubois-LCD-Green-Magenta.glsl
@@ -0,0 +1,17 @@
+// Anaglyph Green-Magenta shader based on Dubois algorithm
+// Constants taken from the screenshot:
+// "https://www.flickr.com/photos/e_dubois/5132528166/"
+// Eric Dubois
+
+void main()
+{
+	float4 c0 = SampleLayer(0);
+	float4 c1 = SampleLayer(1);
+	mat3 l = mat3(-0.062,-0.158,-0.039,
+	               0.284, 0.668, 0.143,
+	              -0.015,-0.027, 0.021);
+	mat3 r = mat3( 0.529, 0.705, 0.024,
+	              -0.016,-0.015, 0.065,
+	               0.009, 0.075, 0.937);
+	SetOutput(float4(c0.rgb * l + c1.rgb * r, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/dubois.glsl b/Data/Sys/Shaders/Anaglyph/dubois.glsl
new file mode 100644
index 0000000000..66f9e8382f
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/dubois.glsl
@@ -0,0 +1,18 @@
+// Anaglyph Red-Cyan shader based on Dubois algorithm
+// Constants taken from the paper:
+// "Conversion of a Stereo Pair to Anaglyph with
+// the Least-Squares Projection Method"
+// Eric Dubois, March 2009
+
+void main()
+{
+	float4 c0 = SampleLayer(0);
+	float4 c1 = SampleLayer(1);
+	mat3 l = mat3( 0.437, 0.449, 0.164,
+	              -0.062,-0.062,-0.024,
+	              -0.048,-0.050,-0.017);
+	mat3 r = mat3(-0.011,-0.032,-0.007,
+	               0.377, 0.761, 0.009,
+	              -0.026,-0.093, 1.234);
+	SetOutput(float4(c0.rgb * l + c1.rgb * r, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/fullcolor.glsl b/Data/Sys/Shaders/Anaglyph/fullcolor.glsl
new file mode 100644
index 0000000000..8f033aedf1
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/fullcolor.glsl
@@ -0,0 +1,8 @@
+// Anaglyph Red-Cyan shader without compensation
+
+void main()
+{
+	float4 c0 = SampleLayer(0);
+	float4 c1 = SampleLayer(1);
+	SetOutput(float4(c0.r, c1.gb, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/grayscale.glsl b/Data/Sys/Shaders/Anaglyph/grayscale.glsl
new file mode 100644
index 0000000000..a1be73da28
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/grayscale.glsl
@@ -0,0 +1,10 @@
+// Anaglyph Red-Cyan grayscale shader
+
+void main()
+{
+	float4 c0 = SampleLayer(0);
+	float avg0 = (c0.r + c0.g + c0.b) / 3.0;
+	float4 c1 = SampleLayer(1);
+	float avg1 = (c1.r + c1.g + c1.b) / 3.0;
+	SetOutput(float4(avg0, avg1, avg1, c0.a));
+}
diff --git a/Data/Sys/Shaders/Anaglyph/grayscale2.glsl b/Data/Sys/Shaders/Anaglyph/grayscale2.glsl
new file mode 100644
index 0000000000..1746396fd8
--- /dev/null
+++ b/Data/Sys/Shaders/Anaglyph/grayscale2.glsl
@@ -0,0 +1,12 @@
+// Anaglyph Red-Cyan luma grayscale shader
+// Info: http://www.oreillynet.com/cs/user/view/cs_msg/8691
+
+void main()
+{
+	float3 luma = float3(0.222, 0.707, 0.071);
+	float4 c0 = SampleLayer(0);
+	float avg0 = dot(c0.rgb, luma);
+	float4 c1 = SampleLayer(1);
+	float avg1 = dot(c1.rgb, luma);
+	SetOutput(float4(avg0, avg1, avg1, c0.a));
+}
diff --git a/Data/Sys/Shaders/FXAA.glsl b/Data/Sys/Shaders/FXAA.glsl
new file mode 100644
index 0000000000..897bd30e62
--- /dev/null
+++ b/Data/Sys/Shaders/FXAA.glsl
@@ -0,0 +1,67 @@
+//			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+//					Version 2, December 2004
+
+// Copyright (C) 2013 mudlord
+
+// Everyone is permitted to copy and distribute verbatim or modified
+// copies of this license document, and changing it is allowed as long
+// as the name is changed.
+
+//			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+//	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+// 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+#define FXAA_REDUCE_MIN		(1.0/ 128.0)
+#define FXAA_REDUCE_MUL		(1.0 / 8.0)
+#define FXAA_SPAN_MAX		8.0
+
+float4 applyFXAA(float2 fragCoord)
+{
+	float4 color;
+	float2 inverseVP = GetInvResolution();
+	float3 rgbNW = SampleLocation((fragCoord + float2(-1.0, -1.0)) * inverseVP).xyz;
+	float3 rgbNE = SampleLocation((fragCoord + float2(1.0, -1.0)) * inverseVP).xyz;
+	float3 rgbSW = SampleLocation((fragCoord + float2(-1.0, 1.0)) * inverseVP).xyz;
+	float3 rgbSE = SampleLocation((fragCoord + float2(1.0, 1.0)) * inverseVP).xyz;
+	float3 rgbM  = SampleLocation(fragCoord  * inverseVP).xyz;
+	float3 luma = float3(0.299, 0.587, 0.114);
+	float lumaNW = dot(rgbNW, luma);
+	float lumaNE = dot(rgbNE, luma);
+	float lumaSW = dot(rgbSW, luma);
+	float lumaSE = dot(rgbSE, luma);
+	float lumaM  = dot(rgbM,  luma);
+	float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+	float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+
+	float2 dir;
+	dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+	dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+
+	float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
+						(0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
+
+	float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
+	dir = min(float2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
+			max(float2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
+			dir * rcpDirMin)) * inverseVP;
+
+	float3 rgbA = 0.5 * (
+		SampleLocation(fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz +
+		SampleLocation(fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);
+	float3 rgbB = rgbA * 0.5 + 0.25 * (
+		SampleLocation(fragCoord * inverseVP + dir * -0.5).xyz +
+		SampleLocation(fragCoord * inverseVP + dir * 0.5).xyz);
+
+	float lumaB = dot(rgbB, luma);
+	if ((lumaB < lumaMin) || (lumaB > lumaMax))
+		color = float4(rgbA, 1.0);
+	else
+		color = float4(rgbB, 1.0);
+	return color;
+}
+
+void main()
+{
+	SetOutput(applyFXAA(GetCoordinates() * GetResolution()));
+}
diff --git a/Data/Sys/Shaders/README.txt b/Data/Sys/Shaders/README.txt
deleted file mode 100644
index 6913f9d099..0000000000
--- a/Data/Sys/Shaders/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-//dummy shader:
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-void main()
-{
-  ocol0 = texture(samp9, uv0);
-}
-
-/*
-And now that's over with, the contents of this readme file!
-For best results, turn Wordwrap formatting on...
-The shaders shown in the dropdown box in the video plugin configuration window are kept in the directory named User/Data/Shaders. They are linked in to the dolphin source from the repository at <http://dolphin-shaders-database.googlecode.com/svn/trunk/>. See <http://code.google.com/p/dolphin-shaders-database/wiki/Documentation> for more details on the way shaders work.
-
-This file will hopefully hold more content in future...
-*/
\ No newline at end of file
diff --git a/Data/Sys/Shaders/acidmetal.glsl b/Data/Sys/Shaders/acidmetal.glsl
index d52efb35a2..6ea8891f6a 100644
--- a/Data/Sys/Shaders/acidmetal.glsl
+++ b/Data/Sys/Shaders/acidmetal.glsl
@@ -1,13 +1,8 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	float red   = 0.0;
-	float blue  = 0.0;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float blue	= 0.0;
 
 	if (c0.r > 0.15 && c0.b > 0.15)
 	{
@@ -17,5 +12,5 @@ void main()
 
 	float green = max(c0.r + c0.b, c0.g);
 
-	ocol0 = vec4(red, green, blue, 1.0);
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/acidtrip.glsl b/Data/Sys/Shaders/acidtrip.glsl
index f92c85444e..8722e621f1 100644
--- a/Data/Sys/Shaders/acidtrip.glsl
+++ b/Data/Sys/Shaders/acidtrip.glsl
@@ -1,11 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  ocol0 = (texture(samp9, uv0+resolution.zw) - texture(samp9, uv0-resolution.zw))*8;
+	SetOutput((SampleOffset(int2(1, 1)) - SampleOffset(int2(-1, -1))) * 8.0);
 }
diff --git a/Data/Sys/Shaders/acidtrip2.glsl b/Data/Sys/Shaders/acidtrip2.glsl
index d3de926ff9..054fe17173 100644
--- a/Data/Sys/Shaders/acidtrip2.glsl
+++ b/Data/Sys/Shaders/acidtrip2.glsl
@@ -1,13 +1,6 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  vec4 a = texture(samp9, uv0+resolution.zw);
-  vec4 b = texture(samp9, uv0-resolution.zw);
-  ocol0 = ( a*a*1.3 - b )*8;
+	float4 a = SampleOffset(int2( 1,  1));
+	float4 b = SampleOffset(int2(-1, -1));
+	SetOutput(( a*a*1.3 - b ) * 8.0);
 }
diff --git a/Data/Sys/Shaders/asciiart.glsl b/Data/Sys/Shaders/asciiart.glsl
index 3f9ff03966..52fec3da6d 100644
--- a/Data/Sys/Shaders/asciiart.glsl
+++ b/Data/Sys/Shaders/asciiart.glsl
@@ -1,95 +1,91 @@
-uniform sampler2D samp8; // textures
-uniform sampler2D samp9;
-
 const int char_width = 8;
 const int char_height = 13;
 const int char_count = 95;
 const int char_pixels = char_width*char_height;
-const vec2 char_dim = vec2(char_width, char_height);
-const vec2 font_scale = vec2(1.0/char_width/char_count, 1.0/char_height);
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
+const float2 char_dim = float2(char_width, char_height);
+const float2 font_scale = float2(1.0/float(char_width)/float(char_count), 1.0/float(char_height));
 
 void main()
 {
-  vec2 char_pos = floor(uv0*resolution.xy/char_dim);
-  vec2 pixel_offset = floor(uv0*resolution.xy) - char_pos*char_dim;
+	float2 char_pos = floor(GetCoordinates()*GetResolution()/char_dim);
+	float2 pixel_offset = floor(GetCoordinates()*GetResolution()) - char_pos*char_dim;
 
-  float mindiff = char_width*char_height*100; // just a big number
-  float minc = 0.0;
-  vec4 mina = vec4(0.0, 0.0, 0.0, 0.0);
-  vec4 minb = vec4(0.0, 0.0, 0.0, 0.0);
-  
-  for(int i=0; i<char_count; i++) {
-    vec4 ff = vec4(0.0, 0.0, 0.0, 0.0);
-    vec4 f = vec4(0.0, 0.0, 0.0, 0.0);
-    vec4 ft = vec4(0.0, 0.0, 0.0, 0.0);
-    vec4 t = vec4(0.0, 0.0, 0.0, 0.0);
-    vec4 tt = vec4(0.0, 0.0, 0.0, 0.0);
-    
-    for(int x=0; x<char_width; x++) {
-      for(int y=0; y<char_height; y++) {
-      
-	vec2 tex_pos = char_pos*char_dim + vec2(x,y) + 0.5;
-	vec4 tex = texture(samp9, tex_pos * resolution.zw);
-      
-	vec2 font_pos = vec2(x+i*char_width, y) + 0.5;
-	vec4 font = texture(samp8, font_pos * font_scale);
-	
-	// generates sum of texture and font and their squares
-	ff += font*font;
-	f += font;
-	ft += font*tex;
-	t += tex;
-	tt += tex*tex;
-      }
-    }
-    
-    /*
-      The next lines are a bit harder, hf :-)
-      
-      The idea is to find the perfect char with the perfect background color and the perfect font color.
-      As this is an equation with three unknowns, we can't just try all chars and color combinations.
-      
-      As criterion how "perfect" the selection is, we compare the "mean squared error" of the resulted colors of all chars.
-      So, now the big issue: how to calculate the MSE without knowing the two colors ...
-      
-      In the next steps, "a" is the font color, "b" is the background color, "f" is the font value at this pixel, "t" is the texture value
-      
-      So the square error of one pixel is: 
-        e = ( t - a⋅f - b⋅(1-f) ) ^ 2
-        
-      In longer:
-        e = a^2⋅f^2 - 2⋅a⋅b⋅f^2 + 2⋅a⋅b⋅f - 2⋅a⋅f⋅t + b^2⋅f^2 - 2⋅b^2⋅f + b^2 + 2⋅b⋅f⋅t - 2⋅b⋅t + t^2
-        
-      The sum of all errors is: (as shortcut, ff,f,ft,t,tt are now the sums like declared above, sum(1) is the count of pixels)
-        sum(e) = a^2⋅ff - 2⋅a^2⋅ff + 2⋅a⋅b⋅f - 2⋅a⋅ft + b^2⋅ff - 2⋅b^2⋅f + b^2⋅sum(1) + 2⋅b⋅ft - 2⋅b⋅t + tt
-        
-      To find the minimum, we have to derive this by "a" and "b":
-        d/da sum(e) = 2⋅a⋅ff + 2⋅b⋅f - 2⋅b⋅ff - 2⋅ft
-        d/db sum(e) = 2⋅a⋅f - 2⋅a⋅ff - 4⋅b⋅f + 2⋅b⋅ff + 2⋅b⋅sum(1) + 2⋅ft - 2⋅t
-      
-      So, both equations must be zero at minimum and there is only one solution.
-    */
-    vec4 a = (f*ft - ff*t + f*t - ft*char_pixels) / (f*f  - ff*char_pixels);
-    vec4 b = (f*ft - ff*t)                        / (f*f  - ff*char_pixels);
-    
-    vec4 diff = a*a*ff + 2.0*a*b*f - 2.0*a*b*ff - 2.0*a*ft + b*b *(-2.0*f + ff + char_pixels) + 2.0*b*ft - 2.0*b*t + tt;
-    float diff_f = dot(diff, vec4(1.0, 1.0, 1.0, 1.0));
-    
-    if(diff_f < mindiff) {
-      mindiff = diff_f;
-      minc = i;
-      mina = a;
-      minb = b;
-    }
-  }
-  
-  vec2 font_pos_res = vec2(minc*char_width, 0) + pixel_offset + 0.5;
+	// just a big number
+	float mindiff = float(char_width*char_height) * 100.0;
 
-  vec4 col = texture(samp8, font_pos_res * font_scale);
-  ocol0 = mina * col + minb * (vec4(1.0,1.0,1.0,1.0) - col);
-}
\ No newline at end of file
+	float minc = 0.0;
+	float4 mina = float4(0.0, 0.0, 0.0, 0.0);
+	float4 minb = float4(0.0, 0.0, 0.0, 0.0);
+
+	for (int i=0; i<char_count; i++)
+	{
+		float4 ff = float4(0.0, 0.0, 0.0, 0.0);
+		float4 f = float4(0.0, 0.0, 0.0, 0.0);
+		float4 ft = float4(0.0, 0.0, 0.0, 0.0);
+		float4 t = float4(0.0, 0.0, 0.0, 0.0);
+		float4 tt = float4(0.0, 0.0, 0.0, 0.0);
+
+		for (int x=0; x<char_width; x++)
+		{
+			for (int y=0; y<char_height; y++)
+			{
+				float2 tex_pos = char_pos*char_dim + float2(x,y) + 0.5;
+				float4 tex = SampleLocation(tex_pos * GetInvResolution());
+
+				float2 font_pos = float2(x+i*char_width, y) + 0.5;
+				float4 font = SampleFontLocation(font_pos * font_scale);
+
+				// generates sum of texture and font and their squares
+				ff += font*font;
+				f += font;
+				ft += font*tex;
+				t += tex;
+				tt += tex*tex;
+			}
+		}
+
+		// The next lines are a bit harder, hf :-)
+
+		// The idea is to find the perfect char with the perfect background color and the perfect font color.
+		// As this is an equation with three unknowns, we can't just try all chars and color combinations.
+
+		// As criterion how "perfect" the selection is, we compare the "mean squared error" of the resulted colors of all chars.
+		// So, now the big issue: how to calculate the MSE without knowing the two colors ...
+
+		// In the next steps, "a" is the font color, "b" is the background color, "f" is the font value at this pixel, "t" is the texture value
+
+		// So the square error of one pixel is:
+		// e = ( t - a⋅f - b⋅(1-f) ) ^ 2
+
+		// In longer:
+		// e = a^2⋅f^2 - 2⋅a⋅b⋅f^2 + 2⋅a⋅b⋅f - 2⋅a⋅f⋅t + b^2⋅f^2 - 2⋅b^2⋅f + b^2 + 2⋅b⋅f⋅t - 2⋅b⋅t + t^2
+
+		// The sum of all errors is: (as shortcut, ff,f,ft,t,tt are now the sums like declared above, sum(1) is the count of pixels)
+		// sum(e) = a^2⋅ff - 2⋅a^2⋅ff + 2⋅a⋅b⋅f - 2⋅a⋅ft + b^2⋅ff - 2⋅b^2⋅f + b^2⋅sum(1) + 2⋅b⋅ft - 2⋅b⋅t + tt
+
+		// To find the minimum, we have to derive this by "a" and "b":
+		// d/da sum(e) = 2⋅a⋅ff + 2⋅b⋅f - 2⋅b⋅ff - 2⋅ft
+		// d/db sum(e) = 2⋅a⋅f - 2⋅a⋅ff - 4⋅b⋅f + 2⋅b⋅ff + 2⋅b⋅sum(1) + 2⋅ft - 2⋅t
+
+		// So, both equations must be zero at minimum and there is only one solution.
+
+		float4 a = (f*ft - ff*t + f*t - ft*float(char_pixels)) / (f*f  - ff*float(char_pixels));
+		float4 b = (f*ft - ff*t) / (f*f  - ff*float(char_pixels));
+
+		float4 diff = a*a*ff + 2.0*a*b*f - 2.0*a*b*ff - 2.0*a*ft + b*b *(-2.0*f + ff + float(char_pixels)) + 2.0*b*ft - 2.0*b*t + tt;
+		float diff_f = dot(diff, float4(1.0, 1.0, 1.0, 1.0));
+
+		if (diff_f < mindiff)
+		{
+			mindiff = diff_f;
+			minc = float(i);
+			mina = a;
+			minb = b;
+		}
+	}
+
+	float2 font_pos_res = float2(minc * float(char_width), 0.0) + pixel_offset + 0.5;
+
+	float4 col = SampleFontLocation(font_pos_res * font_scale);
+	SetOutput(mina * col + minb * (float4(1.0,1.0,1.0,1.0) - col));
+}
diff --git a/Data/Sys/Shaders/auto_toon.glsl b/Data/Sys/Shaders/auto_toon.glsl
index a3c46730cc..d4fd1a0bcf 100644
--- a/Data/Sys/Shaders/auto_toon.glsl
+++ b/Data/Sys/Shaders/auto_toon.glsl
@@ -1,22 +1,15 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  vec4 to_gray = vec4(0.3,0.59,0.11,0);
-  
-  float x1 = dot(to_gray, texture(samp9, uv0+vec2(1,1)*resolution.zw));
-  float x0 = dot(to_gray, texture(samp9, uv0+vec2(-1,-1)*resolution.zw));
-  float x3 = dot(to_gray, texture(samp9, uv0+vec2(1,-1)*resolution.zw));
-  float x2 = dot(to_gray, texture(samp9, uv0+vec2(-1,1)*resolution.zw));
-  
-  float edge = (x1 - x0) * (x1 - x0) + (x3 - x2) * (x3 - x2);
-  
-  float4 color = texture(samp9, uv0).rgba;
+	float4 to_gray = float4(0.3,0.59,0.11,0);
 
-  ocol0 = color - vec4(edge, edge, edge, edge) * 12.0;
+	float x1 = dot(to_gray, SampleOffset(int2( 1, 1)));
+	float x0 = dot(to_gray, SampleOffset(int2(-1,-1)));
+	float x3 = dot(to_gray, SampleOffset(int2( 1,-1)));
+	float x2 = dot(to_gray, SampleOffset(int2(-1, 1)));
+
+	float edge = (x1 - x0) * (x1 - x0) + (x3 - x2) * (x3 - x2);
+
+	float4 color = Sample();
+
+	SetOutput(color - float4(edge, edge, edge, edge) * 12.0);
 }
diff --git a/Data/Sys/Shaders/auto_toon2.glsl b/Data/Sys/Shaders/auto_toon2.glsl
index d548e70a04..5f12ec1559 100644
--- a/Data/Sys/Shaders/auto_toon2.glsl
+++ b/Data/Sys/Shaders/auto_toon2.glsl
@@ -1,45 +1,38 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
- //Changethis to increase the number of colors.
-  int numColors =8;
+	//Changethis to increase the number of colors.
+	int numColors =8;
 
-  float4 to_gray = float4(0.3,0.59,0.11,0);
-  float x1 = dot(to_gray, texture(samp9, uv0+vec2(1,1)*resolution.zw));
-  float x0 = dot(to_gray, texture(samp9, uv0+vec2(-1,-1)*resolution.zw));
-  float x3 = dot(to_gray, texture(samp9, uv0+vec2(1,-1)*resolution.zw));
-  float x2 = dot(to_gray, texture(samp9, uv0+vec2(-1,1)*resolution.zw));
-  float edge = (x1 - x0) * (x1 - x0) + (x3 - x2) * (x3 - x2);
-  float4 color = texture(samp9, uv0).rgba;
+	float4 to_gray = float4(0.3,0.59,0.11,0);
+	float x1 = dot(to_gray, SampleOffset(int2( 1, 1)));
+	float x0 = dot(to_gray, SampleOffset(int2(-1,-1)));
+	float x3 = dot(to_gray, SampleOffset(int2( 1,-1)));
+	float x2 = dot(to_gray, SampleOffset(int2(-1, 1)));
+	float edge = (x1 - x0) * (x1 - x0) + (x3 - x2) * (x3 - x2);
+	float4 color = Sample();
 
-  float4 c0 = color - float4(edge, edge, edge, edge) * 12;
+	float4 c0 = color - float4(edge, edge, edge, edge) * 12.0;
 
- 
+	float red   = 0.0;
+	float green = 0.0;
+	float blue  = 0.0;
+	bool rr = false;
+	bool bb = false;
+	bool gg = false;
+	int count = 1;
 
-  float red   = 0.0;
-  float green = 0.0;
-  float blue  = 0.0;
-  bool rr = false;
-  bool bb = false;
-  bool gg = false;
-  int count = 1;
-  
-  float colorN = 0.0;
-  float colorB = 0.0;
+	float colorN = 0.0;
+	float colorB = 0.0;
 
-	 
-	 for(count = 1; count <= numColors ; count++){
-		 colorN = count / numColors;
-		 
-		 if ( c0.r <= colorN && c0.r >= colorB && rr == false ){
-			if (count == 1){
-				if(colorN >= 0.1)
+	for (count = 1; count <= numColors; count++)
+	{
+		colorN = float(count / numColors);
+
+		if ( c0.r <= colorN && c0.r >= colorB && rr == false )
+		{
+			if (count == 1)
+			{
+				if (colorN >= 0.1)
 					red = 0.01;
 				else
 					red = colorN;
@@ -47,14 +40,16 @@ void main()
 			else if (count == numColors)
 				red = 0.95;
 			else
-				red = colorN ;
-			
+				red = colorN;
+
 			 rr = true;
 		}
 
-		 if (c0.b <= colorN && c0.b >= colorB && bb == false){
-			if (count == 1){
-				if(colorN >= 0.1)
+		 if (c0.b <= colorN && c0.b >= colorB && bb == false)
+		 {
+			if (count == 1)
+			{
+				if (colorN >= 0.1)
 					blue = 0.01;
 				else
 					blue = colorN;
@@ -63,30 +58,31 @@ void main()
 				blue = 0.95;
 			else
 				blue = colorN ;
-			
-			 bb = true;
+
+			bb = true;
 		}
 
-		 if (c0.g <= colorN && c0.g >= colorB && gg == false){
-			if (count == 1){
-				if(colorN >= 0.1)
+		if (c0.g <= colorN && c0.g >= colorB && gg == false)
+		{
+			if (count == 1)
+			{
+				if (colorN >= 0.1)
 					green = 0.01;
 				else
 					green = colorN;
 			}
 			else if (count == numColors)
-				green = 0.95 ;
+				green = 0.95;
 			else
-			green = colorN ;
-			 gg = true;
+				green = colorN;
+			gg = true;
 		}
-			
-		colorB = count / numColors;
-		if(rr == true && bb == true && gg == true)
+
+		colorB = float(count / numColors);
+
+		if (rr == true && bb == true && gg == true)
 			break;
 	}
 
-
-  
-  ocol0 = float4(red, green, blue, c0.a);
-}
\ No newline at end of file
+	SetOutput(float4(red, green, blue, c0.a));
+}
diff --git a/Data/Sys/Shaders/bad_bloom.glsl b/Data/Sys/Shaders/bad_bloom.glsl
index 79a0b46e4f..f39e6fcdfe 100644
--- a/Data/Sys/Shaders/bad_bloom.glsl
+++ b/Data/Sys/Shaders/bad_bloom.glsl
@@ -1,43 +1,36 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c_center = texture(samp9, uv0);
+	float4 c_center = Sample();
 
-  float4 bloom_sum = float4(0.0, 0.0, 0.0, 0.0);
-  vec2 pos = uv0 + float2(0.3, 0.3) * resolution.zw;
-  float2 radius1 = 1.3 * resolution.zw;
-  bloom_sum += texture(samp9, pos + float2(-1.5, -1.5) * radius1);
-  bloom_sum += texture(samp9, pos + float2(-2.5, 0)  * radius1);
-  bloom_sum += texture(samp9, pos + float2(-1.5, 1.5) * radius1);
-  bloom_sum += texture(samp9, pos + float2(0, 2.5) * radius1);
-  bloom_sum += texture(samp9, pos + float2(1.5, 1.5) * radius1);
-  bloom_sum += texture(samp9, pos + float2(2.5, 0) * radius1);
-  bloom_sum += texture(samp9, pos + float2(1.5, -1.5) * radius1);
-  bloom_sum += texture(samp9, pos + float2(0, -2.5) * radius1);
+	float4 bloom_sum = float4(0.0, 0.0, 0.0, 0.0);
+	float2 pos = GetCoordinates() + float2(0.3, 0.3) * GetInvResolution();
+	float2 radius1 = 1.3 * GetInvResolution();
+	bloom_sum += SampleLocation(pos + float2(-1.5, -1.5) * radius1);
+	bloom_sum += SampleLocation(pos + float2(-2.5, 0.0)  * radius1);
+	bloom_sum += SampleLocation(pos + float2(-1.5, 1.5) * radius1);
+	bloom_sum += SampleLocation(pos + float2(0.0, 2.5) * radius1);
+	bloom_sum += SampleLocation(pos + float2(1.5, 1.5) * radius1);
+	bloom_sum += SampleLocation(pos + float2(2.5, 0.0) * radius1);
+	bloom_sum += SampleLocation(pos + float2(1.5, -1.5) * radius1);
+	bloom_sum += SampleLocation(pos + float2(0.0, -2.5) * radius1);
 
-  float2 radius2 = 4.6 * resolution.zw;
-  bloom_sum += texture(samp9, pos + float2(-1.5, -1.5) * radius2);
-  bloom_sum += texture(samp9, pos + float2(-2.5, 0)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(-1.5, 1.5)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(0, 2.5)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(1.5, 1.5)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(2.5, 0)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(1.5, -1.5)  * radius2);
-  bloom_sum += texture(samp9, pos + float2(0, -2.5)  * radius2);
+	float2 radius2 = 4.6 * GetInvResolution();
+	bloom_sum += SampleLocation(pos + float2(-1.5, -1.5) * radius2);
+	bloom_sum += SampleLocation(pos + float2(-2.5, 0.0)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(-1.5, 1.5)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(0.0, 2.5)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(1.5, 1.5)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(2.5, 0.0)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(1.5, -1.5)  * radius2);
+	bloom_sum += SampleLocation(pos + float2(0.0, -2.5)  * radius2);
 
-  bloom_sum *= 0.07;
-  bloom_sum -= float4(0.3, 0.3, 0.3, 0.3);
-  bloom_sum = max(bloom_sum, float4(0,0,0,0));
+	bloom_sum *= 0.07;
+	bloom_sum -= float4(0.3, 0.3, 0.3, 0.3);
+	bloom_sum = max(bloom_sum, float4(0.0, 0.0, 0.0, 0.0));
 
-  float2 vpos = (uv0 - float2(.5, .5)) * 2;
-  float dist = (dot(vpos, vpos));
-  dist = 1 - 0.4*dist;
+	float2 vpos = (GetCoordinates() - float2(0.5, 0.5)) * 2.0;
+	float dist = (dot(vpos, vpos));
+	dist = 1.0 - 0.4*dist;
 
-  ocol0 = (c_center * 0.7 + bloom_sum) * dist;
+	SetOutput((c_center * 0.7 + bloom_sum) * dist);
 }
diff --git a/Data/Sys/Shaders/brighten.glsl b/Data/Sys/Shaders/brighten.glsl
index 120d633f83..b1cdf24806 100644
--- a/Data/Sys/Shaders/brighten.glsl
+++ b/Data/Sys/Shaders/brighten.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0) * 3;
+	SetOutput(Sample()* 3.0);
 }
diff --git a/Data/Sys/Shaders/chrismas.glsl b/Data/Sys/Shaders/chrismas.glsl
index 3ae8ba56b3..7862d26e0e 100644
--- a/Data/Sys/Shaders/chrismas.glsl
+++ b/Data/Sys/Shaders/chrismas.glsl
@@ -1,17 +1,13 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	float red   = 0.0;
-	float green = 0.0;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float green	= 0.0;
 
 	if (c0.r < 0.35 || c0.b > 0.35)
-		green = c0.g + (c0.b / 2);
+		green = c0.g + (c0.b / 2.0);
 	else
 		red = c0.r + 0.4;
-	ocol0 = vec4(red, green, 0.0, 1.0);
+
+	SetOutput(float4(red, green, 0.0, 1.0));
 }
diff --git a/Data/Sys/Shaders/cool1.glsl b/Data/Sys/Shaders/cool1.glsl
index 22086fe13c..b10779c4c9 100644
--- a/Data/Sys/Shaders/cool1.glsl
+++ b/Data/Sys/Shaders/cool1.glsl
@@ -1,14 +1,9 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	float red   = 0.0;
-	float green = 0.0;
-	float blue  = 0.0;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
 
 	if (c0.r < 0.50 || c0.b > 0.5)
 	{
@@ -20,5 +15,6 @@ void main()
 		blue = c0.r;
 		green = c0.r;
 	}
-	ocol0 = vec4(red, green, blue, 1.0);
+
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/darkerbrighter.glsl b/Data/Sys/Shaders/darkerbrighter.glsl
index 60acbe0a28..99b1f4073c 100644
--- a/Data/Sys/Shaders/darkerbrighter.glsl
+++ b/Data/Sys/Shaders/darkerbrighter.glsl
@@ -1,41 +1,33 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0);
-  float4 c1 = texture(samp9, uv0 - float2(1, 0)*resolution.zw);
-  float4 c2 = texture(samp9, uv0 - float2(0, 1)*resolution.zw);
-  float4 c3 = texture(samp9, uv0 + float2(1, 0)*resolution.zw);
-  float4 c4 = texture(samp9, uv0 + float2(0, 1)*resolution.zw);
+	float4 c0 = Sample();
+	float4 c1 = SampleOffset(int2(-1,  0));
+	float4 c2 = SampleOffset(int2( 0, -1));
+	float4 c3 = SampleOffset(int2( 1,  0));
+	float4 c4 = SampleOffset(int2( 0,  1));
 
-  float red = c0.r;
-  float blue = c0.b;
-  float green = c0.g;
+	float red = c0.r;
+	float blue = c0.b;
+	float green = c0.g;
 
-  float red2 = (c1.r + c2.r + c3.r + c4.r) / 4;
-  float blue2 = (c1.b + c2.b + c3.b + c4.b) / 4;
-  float green2 = (c1.g + c2.g + c3.g + c4.g) / 4;
+	float red2 = (c1.r + c2.r + c3.r + c4.r) / 4.0;
+	float blue2 = (c1.b + c2.b + c3.b + c4.b) / 4.0;
+	float green2 = (c1.g + c2.g + c3.g + c4.g) / 4.0;
 
- 	if(red2 > 0.3)
-		red = c0.r + c0.r /  2 ;
-	 else
-		red = c0.r - c0.r /  2 ;
+	if (red2 > 0.3)
+		red = c0.r + c0.r / 2.0;
+	else
+		red = c0.r - c0.r / 2.0;
 
-	if(green2 >  0.3)
-		green = c0.g+ c0.g / 2;
-	 else
-		green = c0.g - c0.g / 2;
-	
-		
-	if(blue2  >  0.3)
-		blue = c0.b+ c0.b / 2 ;
-	  else
-		blue = c0.b - c0.b / 2 ;
-	
-  ocol0 = float4(red, green, blue, c0.a);
-}
\ No newline at end of file
+	if (green2 > 0.3)
+		green = c0.g+ c0.g / 2.0;
+	else
+		green = c0.g - c0.g / 2.0;
+
+	if (blue2  > 0.3)
+		blue = c0.b+ c0.b / 2.0;
+	else
+		blue = c0.b - c0.b / 2.0;
+
+	SetOutput(float4(red, green, blue, c0.a));
+}
diff --git a/Data/Sys/Shaders/emboss.glsl b/Data/Sys/Shaders/emboss.glsl
index cdf3c3c200..0cd3200303 100644
--- a/Data/Sys/Shaders/emboss.glsl
+++ b/Data/Sys/Shaders/emboss.glsl
@@ -1,24 +1,17 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0).rgba;
-  float4 c1 = texture(samp9, uv0 + float2(5,5)*resolution.zw).rgba;
-  float y = (0.222 * c1.r) + (0.707 * c1.g) + (0.071 * c1.b);
-  float y2 = ((0.222 * c0.r) + (0.707 * c0.g) + (0.071 * c0.b)) / 3;
-  float red   = c0.r;
-  float green = c0.g;
-  float blue  = c0.b;
-  float alpha = c0.a;
-  
-  red   = y2 + (1 - y);
-  green = y2 + (1 - y);
-  blue  = y2 + (1 - y);
+	float4 c0   = Sample();
+	float4 c1   = SampleOffset(int2(5, 5));
+	float y     = (0.222 * c1.r) + (0.707 * c1.g) + (0.071 * c1.b);
+	float y2    = ((0.222 * c0.r) + (0.707 * c0.g) + (0.071 * c0.b)) / 3.0;
+	float red   = c0.r;
+	float green = c0.g;
+	float blue  = c0.b;
+	float alpha = c0.a;
 
-  ocol0 = float4(red, green, blue, alpha);
-}
\ No newline at end of file
+	red	= y2 + (1.0 - y);
+	green	= y2 + (1.0 - y);
+	blue	= y2 + (1.0 - y);
+
+	SetOutput(float4(red, green, blue, alpha));
+}
diff --git a/Data/Sys/Shaders/fire.glsl b/Data/Sys/Shaders/fire.glsl
index 93bc4ec9db..7ca4075a49 100644
--- a/Data/Sys/Shaders/fire.glsl
+++ b/Data/Sys/Shaders/fire.glsl
@@ -1,36 +1,29 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	float red   = 0.0;
-	float green = 0.0;
-	float blue  = 0.0;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
 
 	red = c0.r;
 
-
-	if (c0.r > 0.0)
-	if (c0.g > c0.r)
-		green = (c0.g - (c0.g - c0.r)) / 3;
+	if (c0.r > 0.0 && c0.g > c0.r)
+		green = (c0.g - (c0.g - c0.r)) / 3.0;
 
 	if (c0.b > 0.0 && c0.r < 0.25)
 	{
 		red = c0.b;
-		green = c0.b / 3;
+		green = c0.b / 3.0;
 	}
 
 	if (c0.g > 0.0 && c0.r < 0.25)
 	{
 		red = c0.g;
-		green = c0.g / 3;
+		green = c0.g / 3.0;
 	}
 
-	if (((c0.r + c0.g + c0.b) / 3) > 0.9)
-		green = c0.r / 3;
+	if (((c0.r + c0.g + c0.b) / 3.0) > 0.9)
+		green = c0.r / 3.0;
 
-	ocol0 = vec4(red, green, blue, 1.0);
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/fire2.glsl b/Data/Sys/Shaders/fire2.glsl
index a6fe76015c..4b116f9871 100644
--- a/Data/Sys/Shaders/fire2.glsl
+++ b/Data/Sys/Shaders/fire2.glsl
@@ -1,18 +1,13 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	float red   = 0.0;
-	float green = 0.0;
-	float blue  = 0.0;
-	float avg = (c0.r + c0.g + c0.b) / 3;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
+	float avg = (c0.r + c0.g + c0.b) / 3.0;
 
-	red = c0.r + (c0.g / 2) + (c0.b / 3);
-	green = c0.r / 3;
+	red = c0.r + (c0.g / 2.0) + (c0.b / 3.0);
+	green = c0.r / 3.0;
 
-	ocol0 = vec4(red, green, blue, 1.0);
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/firewater.glsl b/Data/Sys/Shaders/firewater.glsl
index add2d54e72..32b9be3d5d 100644
--- a/Data/Sys/Shaders/firewater.glsl
+++ b/Data/Sys/Shaders/firewater.glsl
@@ -1,22 +1,15 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0);
-  float4 c1 = texture(samp9, uv0 + float2(1,1)*resolution.zw);
-  float4 c2 = texture(samp9, uv0 + float2(-1,-1)*resolution.zw);
-  float red   = c0.r;
-  float green = c0.g;
-  float blue  = c0.b;
-  float alpha = c0.a;
-  
-  red = c0.r - c1.b;
-  blue = c0.b - c2.r + (c0.g - c0.r);
+	float4 c0 = Sample();
+	float4 c1 = SampleOffset(int2( 1,  1));
+	float4 c2 = SampleOffset(int2(-1, -1));
+	float red	= c0.r;
+	float green	= c0.g;
+	float blue	= c0.b;
+	float alpha	= c0.a;
 
-  ocol0 = float4(red, 0.0, blue, alpha);
-}
\ No newline at end of file
+	red = c0.r - c1.b;
+	blue = c0.b - c2.r + (c0.g - c0.r);
+
+	SetOutput(float4(red, 0.0, blue, alpha));
+}
diff --git a/Data/Sys/Shaders/grayscale.glsl b/Data/Sys/Shaders/grayscale.glsl
index 7a828f0a11..a7a211ce4a 100644
--- a/Data/Sys/Shaders/grayscale.glsl
+++ b/Data/Sys/Shaders/grayscale.glsl
@@ -1,11 +1,6 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	float avg = (c0.r + c0.g + c0.b) / 3.0;
-	ocol0 = vec4(avg, avg, avg, c0.a);
+	SetOutput(float4(avg, avg, avg, c0.a));
 }
diff --git a/Data/Sys/Shaders/grayscale2.glsl b/Data/Sys/Shaders/grayscale2.glsl
index d9ef25a416..98cb1f8838 100644
--- a/Data/Sys/Shaders/grayscale2.glsl
+++ b/Data/Sys/Shaders/grayscale2.glsl
@@ -1,12 +1,7 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	// Info: http://www.oreillynet.com/cs/user/view/cs_msg/8691
 	float avg = (0.222 * c0.r) + (0.707 * c0.g) + (0.071 * c0.b);
-	ocol0 = vec4(avg, avg, avg, c0.a);
+	SetOutput(float4(avg, avg, avg, c0.a));
 }
diff --git a/Data/Sys/Shaders/invert.glsl b/Data/Sys/Shaders/invert.glsl
index 67c5dee997..46cf142c84 100644
--- a/Data/Sys/Shaders/invert.glsl
+++ b/Data/Sys/Shaders/invert.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = vec4(1.0, 1.0, 1.0, 1.0) - texture(samp9, uv0);
+	SetOutput(float4(1.0, 1.0, 1.0, 1.0) - Sample());
 }
diff --git a/Data/Sys/Shaders/invert_blue.glsl b/Data/Sys/Shaders/invert_blue.glsl
index aa4eeea43a..75602ea2a6 100644
--- a/Data/Sys/Shaders/invert_blue.glsl
+++ b/Data/Sys/Shaders/invert_blue.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = vec4(0.0, 0.0, 0.7, 1.0) - texture(samp9, uv0);
+	SetOutput(float4(0.0, 0.0, 0.7, 1.0) - Sample());
 }
diff --git a/Data/Sys/Shaders/invertedoutline.glsl b/Data/Sys/Shaders/invertedoutline.glsl
index 66d24fb5ca..fa1cb0f9bd 100644
--- a/Data/Sys/Shaders/invertedoutline.glsl
+++ b/Data/Sys/Shaders/invertedoutline.glsl
@@ -1,14 +1,7 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0);
-  float4 c1 = texture(samp9, uv0 + float2(5,5)*resolution.zw);
+	float4 c0 = Sample();
+	float4 c1 = SampleOffset(int2(5, 5));
 
-  ocol0 = c0 - c1;
-}
\ No newline at end of file
+	SetOutput(c0 - c1);
+}
diff --git a/Data/Sys/Shaders/mad_world.glsl b/Data/Sys/Shaders/mad_world.glsl
index 2e627abb57..8d596541a1 100644
--- a/Data/Sys/Shaders/mad_world.glsl
+++ b/Data/Sys/Shaders/mad_world.glsl
@@ -1,22 +1,19 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 emboss = (texture(samp9, uv0+resolution.zw) - texture(samp9, uv0-resolution.zw))*2.0;
-  emboss -= (texture(samp9, uv0+float2(1,-1)*resolution.zw).rgba - texture(samp9, uv0+float2(-1,1)*resolution.zw).rgba);
-  float4 color = texture(samp9, uv0).rgba;
-  if (color.r > 0.8 && color.b + color.b < 0.2)
-    ocol0 = float4(1,0,0,0);
-  else {
-    color += emboss;
-    if (dot(color.rgb, float3(0.3, 0.5, 0.2)) > 0.5)
-      ocol0 = float4(1,1,1,1);
-    else
-      ocol0 = float4(0,0,0,0);
-  }
-}
\ No newline at end of file
+	float4 emboss = (SampleLocation(GetCoordinates()+GetInvResolution()) - SampleLocation(GetCoordinates()-GetInvResolution()))*2.0;
+	emboss -= (SampleLocation(GetCoordinates()+float2(1,-1)*GetInvResolution()).rgba - SampleLocation(GetCoordinates()+float2(-1,1)*GetInvResolution()).rgba);
+	float4 color = Sample();
+
+	if (color.r > 0.8 && color.b + color.b < 0.2)
+	{
+		SetOutput(float4(1,0,0,0));
+	}
+	else
+	{
+		color += emboss;
+		if (dot(color.rgb, float3(0.3, 0.5, 0.2)) > 0.5)
+			SetOutput(float4(1,1,1,1));
+		else
+			SetOutput(float4(0,0,0,0));
+	}
+}
diff --git a/Data/Sys/Shaders/nightvision.glsl b/Data/Sys/Shaders/nightvision.glsl
index ff98cb03b9..9039b4bbdb 100644
--- a/Data/Sys/Shaders/nightvision.glsl
+++ b/Data/Sys/Shaders/nightvision.glsl
@@ -1,17 +1,10 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0).rgba;
-  float green = c0.g;
+	float4 c0 = Sample();
+	float green = c0.g;
 
-  if (c0.g < 0.50)
-  {
-    green = c0.r + c0.b;
-  }
+	if (c0.g < 0.50)
+		green = c0.r + c0.b;
 
-  ocol0 = float4(0.0, green, 0.0, 1.0);
-}
\ No newline at end of file
+	SetOutput(float4(0.0, green, 0.0, 1.0));
+}
diff --git a/Data/Sys/Shaders/nightvision2.glsl b/Data/Sys/Shaders/nightvision2.glsl
index 4ed61e16a9..c3e6a25462 100644
--- a/Data/Sys/Shaders/nightvision2.glsl
+++ b/Data/Sys/Shaders/nightvision2.glsl
@@ -1,56 +1,62 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  //variables
-  int internalresolution = 1278;
-  float4 c0 = texture(samp9, uv0).rgba;
-  //blur
-  float4 blurtotal = float4(0, 0, 0, 0);
-  float blursize = 1.5;
-  blurtotal += texture(samp9, uv0 + float2(-blursize, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2(-blursize,  blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize,  blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2(-blursize,  0)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize,  0)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( 0, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( 0,  blursize)*resolution.zw);
-  blurtotal *= 0.125;
-  c0 = blurtotal;
-  //greyscale
-  float grey = ((0.3 * c0.r) + (0.4 * c0.g) + (0.3 * c0.b));
-  // brighten
-  grey = grey * 0.5 + 0.7;
-  // darken edges
-  float x = uv0.x * resolution.x;
-  float y = uv0.y * resolution.y;
-  if (x > internalresolution/2) x = internalresolution-x;
-  if (y > internalresolution/2) y = internalresolution-y;
-  if (x > internalresolution/2*0.95) x = internalresolution/2*0.95;
-  if (y > internalresolution/2*0.95) y = internalresolution/2*0.95;
-  x = -x+641;
-  y = -y+641;
-  /*****inline square root routines*****/
-  // bit of a performance bottleneck.
-  // neccessary to make the darkened area rounded
-  // instead of rhombus-shaped.
-  float sqrt=x/10;
-  while((sqrt*sqrt) < x) sqrt+=0.1;
-  x = sqrt;
-  sqrt=y/10;
-  while((sqrt*sqrt) < y) sqrt+=0.1;
-  y = sqrt;
-  /*****end of inline square root routines*****/
-  x *= 2;
-  y *= 2;
-  grey -= x/200;
-  grey -= y/200;
-  // output
-  ocol0 = float4(0, grey, 0, 1.0);
-}
\ No newline at end of file
+	//variables
+	float internalresolution = 1278.0;
+	float4 c0 = Sample();
+
+	//blur
+	float4 blurtotal = float4(0.0, 0.0, 0.0, 0.0);
+	float blursize = 1.5;
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize, -blursize) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize, blursize) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize, -blursize) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize, blursize) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize, 0.0) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize, 0.0) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( 0.0, -blursize) * GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( 0.0, blursize) * GetInvResolution());
+	blurtotal *= 0.125;
+	c0 = blurtotal;
+
+	//greyscale
+	float grey = ((0.3 * c0.r) + (0.4 * c0.g) + (0.3 * c0.b));
+
+	// brighten
+	grey = grey * 0.5 + 0.7;
+
+	// darken edges
+	float x = GetCoordinates().x * GetResolution().x;
+	float y = GetCoordinates().y * GetResolution().y;
+	if (x > internalresolution/2.0)
+		x = internalresolution-x;
+	if (y > internalresolution/2.0)
+		y = internalresolution-y;
+	if (x > internalresolution/2.0*0.95)
+		x = internalresolution/2.0*0.95;
+	if (y > internalresolution/2.0*0.95)
+		y = internalresolution/2.0*0.95;
+	x = -x+641.0;
+	y = -y+641.0;
+
+	/*****inline square root routines*****/
+	// bit of a performance bottleneck.
+	// neccessary to make the darkened area rounded
+	// instead of rhombus-shaped.
+	float sqrt = x / 10.0;
+
+	while ((sqrt*sqrt) < x)
+		sqrt+=0.1;
+	x = sqrt;
+	sqrt = y / 10.0;
+	while ((sqrt*sqrt) < y)
+		sqrt+=0.1;
+	y = sqrt;
+
+	x *= 2.0;
+	y *= 2.0;
+	grey -= x / 200.0;
+	grey -= y / 200.0;
+
+	// output
+	SetOutput(float4(0.0, grey, 0.0, 1.0));
+}
diff --git a/Data/Sys/Shaders/nightvision2scanlines.glsl b/Data/Sys/Shaders/nightvision2scanlines.glsl
index df98629443..d2f7eda2ea 100644
--- a/Data/Sys/Shaders/nightvision2scanlines.glsl
+++ b/Data/Sys/Shaders/nightvision2scanlines.glsl
@@ -1,61 +1,71 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  //variables
-  int internalresolution = 1278;
-  float4 c0 = texture(samp9, uv0).rgba;
-  //blur
-  float4 blurtotal = float4(0, 0, 0, 0);
-  float blursize = 1.5;
-  blurtotal += texture(samp9, uv0 + float2(-blursize, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2(-blursize,  blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize,  blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2(-blursize,  0)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( blursize,  0)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( 0, -blursize)*resolution.zw);
-  blurtotal += texture(samp9, uv0 + float2( 0,  blursize)*resolution.zw);
-  blurtotal *= 0.125;
-  c0 = blurtotal;
-  //greyscale
-  float grey = ((0.3 * c0.r) + (0.4 * c0.g) + (0.3 * c0.b));
-  // brighten and apply horizontal scanlines
-  // This would have been much simpler if I could get the stupid modulo (%) to work
-  // If anyone who is more well versed in Cg knows how to do this it'd be slightly more efficient
-  // float lineIntensity = ((uv0[1] % 9) - 4) / 40;
-  float vPos = uv0.y*resolution.y / 9;
-  float lineIntensity = (((vPos - floor(vPos)) * 9) - 4) / 40;
-  grey = grey * 0.5 + 0.7 + lineIntensity;
-  // darken edges
-  float x = uv0.x * resolution.x;
-  float y = uv0.y * resolution.y;
-  if (x > internalresolution/2) x = internalresolution-x;
-  if (y > internalresolution/2) y = internalresolution-y;
-  if (x > internalresolution/2*0.95) x = internalresolution/2*0.95;
-  if (y > internalresolution/2*0.95) y = internalresolution/2*0.95;
-  x = -x+641;
-  y = -y+641;
-  /*****inline square root routines*****/
-  // bit of a performance bottleneck.
-  // neccessary to make the darkened area rounded
-  // instead of rhombus-shaped.
-  float sqrt=x/10;
-  while((sqrt*sqrt) < x) sqrt+=0.1;
-  x = sqrt;
-  sqrt=y/10;
-  while((sqrt*sqrt) < y) sqrt+=0.1;
-  y = sqrt;
-  /*****end of inline square root routines*****/
-  x *= 2;
-  y *= 2;
-  grey -= x/200;
-  grey -= y/200;
-  // output
-  ocol0 = float4(0, grey, 0, 1.0);
-}
\ No newline at end of file
+	//variables
+	float internalresolution = 1278.0;
+	float4 c0 = Sample();
+
+	//blur
+	float4 blurtotal = float4(0.0, 0.0, 0.0, 0.0);
+	float blursize = 1.5;
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize, -blursize)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize,  blursize)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize, -blursize)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize,  blursize)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2(-blursize,  0.0)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( blursize,  0.0)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( 0.0, -blursize)*GetInvResolution());
+	blurtotal += SampleLocation(GetCoordinates() + float2( 0.0,  blursize)*GetInvResolution());
+	blurtotal *= 0.125;
+	c0 = blurtotal;
+
+	//greyscale
+	float grey = ((0.3 * c0.r) + (0.4 * c0.g) + (0.3 * c0.b));
+
+	// brighten and apply horizontal scanlines
+	// This would have been much simpler if I could get the stupid modulo (%) to work
+	// If anyone who is more well versed in Cg knows how to do this it'd be slightly more efficient
+	// float lineIntensity = ((GetCoordinates()[1] % 9) - 4) / 40;
+	float vPos = GetCoordinates().y*GetResolution().y / 9.0;
+	float lineIntensity = (((vPos - floor(vPos)) * 9.0) - 4.0) / 40.0;
+	grey = grey * 0.5 + 0.7 + lineIntensity;
+
+	// darken edges
+	float x = GetCoordinates().x * GetResolution().x;
+	float y = GetCoordinates().y * GetResolution().y;
+
+	if (x > internalresolution/2.0)
+		x = internalresolution-x;
+
+	if (y > internalresolution/2.0)
+		y = internalresolution-y;
+
+	if (x > internalresolution/2.0*0.95)
+		x = internalresolution/2.0*0.95;
+
+	if (y > internalresolution/2.0*0.95)
+		y = internalresolution/2.0*0.95;
+
+	x = -x + 641.0;
+	y = -y + 641.0;
+
+	//****inline square root routines*****/
+	// bit of a performance bottleneck.
+	// neccessary to make the darkened area rounded
+	// instead of rhombus-shaped.
+	float sqrt = x / 10.0;
+	while ((sqrt*sqrt) < x)
+		sqrt+=0.1;
+	x = sqrt;
+	sqrt = y / 10.0;
+	while ((sqrt*sqrt) < y)
+		sqrt+=0.1;
+	y = sqrt;
+
+	x *= 2.0;
+	y *= 2.0;
+	grey -= x / 200.0;
+	grey -= y / 200.0;
+
+	// output
+	SetOutput(float4(0.0, grey, 0.0, 1.0));
+}
diff --git a/Data/Sys/Shaders/posterize.glsl b/Data/Sys/Shaders/posterize.glsl
index 602a412929..dba7e59ee3 100644
--- a/Data/Sys/Shaders/posterize.glsl
+++ b/Data/Sys/Shaders/posterize.glsl
@@ -1,29 +1,18 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0).rgba;
-  float red   = 0.0;
-  float green = 0.0;
-  float blue  = 0.0;
+	float4 c0 = Sample();
+	float red	= 0.0;
+	float green	= 0.0;
+	float blue	= 0.0;
 
-  if (c0.r > 0.25)
-  {
-    red = c0.r;
-  }
+	if (c0.r > 0.25)
+		red = c0.r;
 
-  if (c0.g > 0.25)
-  {
-    green = c0.g;
-  }
+	if (c0.g > 0.25)
+		green = c0.g;
 
-  if (c0.b > 0.25)
-  {
-    blue = c0.b;
-  }
+	if (c0.b > 0.25)
+		blue = c0.b;
 
-  ocol0 = float4(red, green, blue, 1.0);
-}
\ No newline at end of file
+	SetOutput(float4(red, green, blue, 1.0));
+}
diff --git a/Data/Sys/Shaders/posterize2.glsl b/Data/Sys/Shaders/posterize2.glsl
index fc6c2ef5c9..2000b0f726 100644
--- a/Data/Sys/Shaders/posterize2.glsl
+++ b/Data/Sys/Shaders/posterize2.glsl
@@ -1,24 +1,18 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 float bound(float color)
 {
-  if (color < 0.35)
-  {
-	if (color < 0.25)
+	if (color < 0.35)
 	{
-		return color;
+		if (color < 0.25)
+			return color;
+
+		return 0.5;
 	}
-	return 0.5;
-  }
-return 1.0;
+
+	return 1.0;
 }
 
 void main()
 {
-  float4 c0 = texture(samp9, uv0);
-  ocol0 = float4(bound(c0.r), bound(c0.g), bound(c0.b), c0.a);
+	float4 c0 = Sample();
+	SetOutput(float4(bound(c0.r), bound(c0.g), bound(c0.b), c0.a));
 }
-
diff --git a/Data/Sys/Shaders/primarycolors.glsl b/Data/Sys/Shaders/primarycolors.glsl
index c54eda5cd4..fb82fd4236 100644
--- a/Data/Sys/Shaders/primarycolors.glsl
+++ b/Data/Sys/Shaders/primarycolors.glsl
@@ -1,70 +1,77 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	float red = c0.r;
 	float blue = c0.b;
 	float green = c0.g;
-	float factor = 2;
+	float factor = 2.0;
 	float max = 0.8;
 	float min = 0.3;
 
-	if(c0.r > c0.g && c0.b > c0.g){
-		if(c0.r < c0.b + 0.05 && c0.b < c0.r + 0.05){
+	if (c0.r > c0.g && c0.b > c0.g)
+	{
+		if (c0.r < c0.b + 0.05 && c0.b < c0.r + 0.05)
+		{
 			red = 0.7;
 			blue = 0.7;
 			green = 0.05;
 		}
-		else if(c0.r > c0.b + 0.05){
+		else if (c0.r > c0.b + 0.05)
+		{
 			red = 0.7;
 			blue = 0.05;
 			green = 0.05;
 		}
-		else if (c0.b > c0.r + 0.05){
+		else if (c0.b > c0.r + 0.05)
+		{
 			red = 0.05;
 			blue = 0.7;
 			green = 0.05;
 		}
 	}
 
-	if(c0.r > c0.b && c0.g > c0.b){
-		if(c0.r < c0.g + 0.05 && c0.g < c0.r + 0.05){
+	if (c0.r > c0.b && c0.g > c0.b)
+	{
+		if (c0.r < c0.g + 0.05 && c0.g < c0.r + 0.05)
+		{
 			red = 0.7;
 			blue = 0.05;
 			green = 0.7;
 		}
-		else if(c0.r > c0.g + 0.05){
+		else if (c0.r > c0.g + 0.05)
+		{
 			red = 0.7;
 			blue = 0.05;
 			green = 0.05;
 		}
-		else if (c0.g > c0.r + 0.05){
+		else if (c0.g > c0.r + 0.05)
+		{
 			red = 0.05;
 			blue = 0.05;
 			green = 0.7;
 		}
 	}
 
-	if(c0.g > c0.r && c0.b > c0.r){
-		if(c0.g < c0.b + 0.05 && c0.b < c0.g + 0.05){
+	if (c0.g > c0.r && c0.b > c0.r)
+	{
+		if (c0.g < c0.b + 0.05 && c0.b < c0.g + 0.05)
+		{
 			red = 0.05;
 			blue = 0.7;
 			green = 0.7;
 		}
-		else if(c0.g > c0.b + 0.05){
+		else if (c0.g > c0.b + 0.05)
+		{
 			red = 0.05;
 			blue = 0.05;
 			green = 0.7;
 		}
-		else if (c0.b > c0.g + 0.05){
+		else if (c0.b > c0.g + 0.05)
+		{
 			red = 0.05;
 			blue = 0.7;
 			green = 0.05;
 		}
 	}
-	ocol0 = vec4(red, green, blue, c0.a);
+	SetOutput(float4(red, green, blue, c0.a));
 }
diff --git a/Data/Sys/Shaders/sepia.glsl b/Data/Sys/Shaders/sepia.glsl
index 88f5c15de7..55985553f6 100644
--- a/Data/Sys/Shaders/sepia.glsl
+++ b/Data/Sys/Shaders/sepia.glsl
@@ -1,16 +1,13 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
+
 	// Same coefficients as grayscale2 at this point
 	float avg = (0.222 * c0.r) + (0.707 * c0.g) + (0.071 * c0.b);
 	float red=avg;
+
 	// Not sure about these coefficients, they just seem to produce the proper yellow
 	float green=avg*.75;
 	float blue=avg*.5;
-	ocol0 = vec4(red, green, blue, c0.a);
+	SetOutput(float4(red, green, blue, c0.a));
 }
diff --git a/Data/Sys/Shaders/sketchy.glsl b/Data/Sys/Shaders/sketchy.glsl
index 27cadd3f85..fd6f5832bd 100644
--- a/Data/Sys/Shaders/sketchy.glsl
+++ b/Data/Sys/Shaders/sketchy.glsl
@@ -1,22 +1,17 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
 void main()
 {
-  float4 c0 = texture(samp9, uv0).rgba;
-  float4 tmp = float4(0, 0, 0, 0);
-  tmp += c0 - texture(samp9, uv0 + float2(2, 2)*resolution.zw).rgba;
-  tmp += c0 - texture(samp9, uv0 - float2(2, 2)*resolution.zw).rgba;
-  tmp += c0 - texture(samp9, uv0 + float2(2, -2)*resolution.zw).rgba;
-  tmp += c0 - texture(samp9, uv0 - float2(2, -2)*resolution.zw).rgba;
-  float grey = ((0.222 * tmp.r) + (0.707 * tmp.g) + (0.071 * tmp.b));
-  // get rid of the bottom line, as it is incorrect.
-  if (uv0.y*resolution.y < 163)
-    tmp = float4(1.0, 1.0, 1.0, 1.0);
-  c0 = c0+1-grey*7.0;
-  ocol0 = float4(c0.r, c0.g, c0.b, 1);
-}
\ No newline at end of file
+	float4 c0 = Sample();
+	float4 tmp = float4(0.0, 0.0, 0.0, 0.0);
+	tmp += c0 - SampleOffset(int2( 2,  2));
+	tmp += c0 - SampleOffset(int2(-2, -2));
+	tmp += c0 - SampleOffset(int2( 2, -2));
+	tmp += c0 - SampleOffset(int2(-2,  2));
+	float grey = ((0.222 * tmp.r) + (0.707 * tmp.g) + (0.071 * tmp.b));
+
+	// get rid of the bottom line, as it is incorrect.
+	if (GetCoordinates().y*GetResolution().y < 163.0)
+		tmp = float4(1.0, 1.0, 1.0, 1.0);
+
+	c0 = c0 + 1.0 - grey * 7.0;
+	SetOutput(float4(c0.r, c0.g, c0.b, 1.0));
+}
diff --git a/Data/Sys/Shaders/spookey1.glsl b/Data/Sys/Shaders/spookey1.glsl
index 6a25d57e5e..9801dcf965 100644
--- a/Data/Sys/Shaders/spookey1.glsl
+++ b/Data/Sys/Shaders/spookey1.glsl
@@ -1,11 +1,6 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	float red   = 0.0;
 	float blue  = 0.0;
 
@@ -19,5 +14,5 @@ void main()
 		blue = c0.r + c0.b;
 	}
 
-	ocol0 = vec4(red, 0.0, blue, 1.0);
+	SetOutput(float4(red, 0.0, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/spookey2.glsl b/Data/Sys/Shaders/spookey2.glsl
index 9a56bd21a1..77a68ff168 100644
--- a/Data/Sys/Shaders/spookey2.glsl
+++ b/Data/Sys/Shaders/spookey2.glsl
@@ -1,11 +1,6 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	float red   = 0.0;
 	float green = 0.0;
 	float blue  = 0.0;
@@ -21,5 +16,5 @@ void main()
 		green = c0.r + c0.b;
 	}
 
-	ocol0 = vec4(red, green, blue, 1.0);
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Shaders/stereoscopic.glsl b/Data/Sys/Shaders/stereoscopic.glsl
deleted file mode 100644
index 3bd6021f39..0000000000
--- a/Data/Sys/Shaders/stereoscopic.glsl
+++ /dev/null
@@ -1,32 +0,0 @@
-// Omega's 3D Stereoscopic filtering
-// TODO: Need depth info!
-
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
-void main()
-{
-  float4 c0 = texture(samp9, uv0).rgba; // Source Color
-  float sep = 5;
-  float red   = c0.r;
-  float green = c0.g;
-  float blue  = c0.b;
- 
-  
-  // Left Eye (Red)
-  float4 c1 = texture(samp9, uv0 + float2(sep,0)*resolution.zw).rgba;
-  red = max(c0.r, c1.r);
-
-  // Right Eye (Cyan)
-  float4 c2 = texture(samp9, uv0 + float2(-sep,0)*resolution.zw).rgba;
-  float cyan = (c2.g + c2.b) / 2;
-  green = max(c0.g, cyan);
-  blue = max(c0.b, cyan);
-
-  
-  ocol0 = float4(red, green, blue, c0.a);
-}
\ No newline at end of file
diff --git a/Data/Sys/Shaders/stereoscopic2.glsl b/Data/Sys/Shaders/stereoscopic2.glsl
deleted file mode 100644
index 2407b03832..0000000000
--- a/Data/Sys/Shaders/stereoscopic2.glsl
+++ /dev/null
@@ -1,32 +0,0 @@
-// Omega's 3D Stereoscopic filtering (Amber/Blue)
-// TODO: Need depth info!
-
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
-uniform vec4 resolution;
-
-void main()
-{
-  float4 c0 = texture(samp9, uv0).rgba; // Source Color
-  float sep = 5;
-  float red   = c0.r;
-  float green = c0.g;
-  float blue  = c0.b;
-
-  
-  // Left Eye (Amber)
-  float4 c2 = texture(samp9, uv0 + float2(sep,0)*resolution.zw).rgba;
-  float amber = (c2.r + c2.g) / 2;
-  red = max(c0.r, amber);
-  green = max(c0.g, amber);
-
-  // Right Eye (Blue)
-  float4 c1 = texture(samp9, uv0 + float2(-sep,0)*resolution.zw).rgba;
-  blue = max(c0.b, c1.b);
-
-  
-  ocol0 = float4(red, green, blue, c0.a);
-}
\ No newline at end of file
diff --git a/Data/Sys/Shaders/sunset.glsl b/Data/Sys/Shaders/sunset.glsl
index 4a1eae5a4b..000d32f7c6 100644
--- a/Data/Sys/Shaders/sunset.glsl
+++ b/Data/Sys/Shaders/sunset.glsl
@@ -1,10 +1,5 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
-	ocol0 = vec4(c0.r * 1.5, c0.g * 1, c0.b * 0.5, c0.a);
+	float4 c0 = Sample();
+	SetOutput(float4(c0.r * 1.5, c0.g, c0.b * 0.5, c0.a));
 }
diff --git a/Data/Sys/Shaders/swap_RGB_BGR.glsl b/Data/Sys/Shaders/swap_RGB_BGR.glsl
index 011411700a..c71292f9e3 100644
--- a/Data/Sys/Shaders/swap_RGB_BGR.glsl
+++ b/Data/Sys/Shaders/swap_RGB_BGR.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0).bgra;
+	SetOutput(Sample().bgra);
 }
diff --git a/Data/Sys/Shaders/swap_RGB_BRG.glsl b/Data/Sys/Shaders/swap_RGB_BRG.glsl
index 82fe665b12..3b2738423f 100644
--- a/Data/Sys/Shaders/swap_RGB_BRG.glsl
+++ b/Data/Sys/Shaders/swap_RGB_BRG.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0).brga;
+	SetOutput(Sample().brga);
 }
diff --git a/Data/Sys/Shaders/swap_RGB_GBR.glsl b/Data/Sys/Shaders/swap_RGB_GBR.glsl
index 5884ccd0ab..5dc1951a6d 100644
--- a/Data/Sys/Shaders/swap_RGB_GBR.glsl
+++ b/Data/Sys/Shaders/swap_RGB_GBR.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0).gbra;
+	SetOutput(Sample());
 }
diff --git a/Data/Sys/Shaders/swap_RGB_GRB.glsl b/Data/Sys/Shaders/swap_RGB_GRB.glsl
index 26a4c14f8d..5dc1951a6d 100644
--- a/Data/Sys/Shaders/swap_RGB_GRB.glsl
+++ b/Data/Sys/Shaders/swap_RGB_GRB.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0).grba;
+	SetOutput(Sample());
 }
diff --git a/Data/Sys/Shaders/swap_RGB_RBG.glsl b/Data/Sys/Shaders/swap_RGB_RBG.glsl
index 8e735a7337..77cc11e0c6 100644
--- a/Data/Sys/Shaders/swap_RGB_RBG.glsl
+++ b/Data/Sys/Shaders/swap_RGB_RBG.glsl
@@ -1,9 +1,4 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	ocol0 = texture(samp9, uv0).rbga;
+	SetOutput(Sample().rbga);
 }
diff --git a/Data/Sys/Shaders/toxic.glsl b/Data/Sys/Shaders/toxic.glsl
index 38017c400d..1aa38c5e07 100644
--- a/Data/Sys/Shaders/toxic.glsl
+++ b/Data/Sys/Shaders/toxic.glsl
@@ -1,11 +1,6 @@
-uniform sampler2D samp9;
-
-out vec4 ocol0;
-in vec2 uv0;
-
 void main()
 {
-	vec4 c0 = texture(samp9, uv0);
+	float4 c0 = Sample();
 	float red   = 0.0;
 	float green = 0.0;
 	float blue  = 0.0;
@@ -13,7 +8,7 @@ void main()
 	if (c0.r < 0.3 || c0.b > 0.5)
 	{
 		blue = c0.r + c0.b;
-		red = c0.g + c0.b / 2;
+		red = c0.g + c0.b / 2.0;
 	}
 	else
 	{
@@ -21,5 +16,5 @@ void main()
 		green = c0.r + c0.b;
 	}
 
-	ocol0 = vec4(red, green, blue, 1.0);
+	SetOutput(float4(red, green, blue, 1.0));
 }
diff --git a/Data/Sys/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/audio.png
similarity index 100%
rename from Data/Sys/Themes/Boomy/dsp.png
rename to Data/Sys/Themes/Boomy/audio.png
diff --git a/Data/Sys/Themes/Boomy/classic.png b/Data/Sys/Themes/Boomy/classic.png
new file mode 100644
index 0000000000..56cd87337a
Binary files /dev/null and b/Data/Sys/Themes/Boomy/classic.png differ
diff --git a/Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png b/Data/Sys/Themes/Boomy/toolbar_add_breakpoint.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png
rename to Data/Sys/Themes/Boomy/toolbar_add_breakpoint.png
diff --git a/Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png b/Data/Sys/Themes/Boomy/toolbar_add_memorycheck.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png
rename to Data/Sys/Themes/Boomy/toolbar_add_memorycheck.png
diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_delete.png b/Data/Sys/Themes/Boomy/toolbar_debugger_delete.png
similarity index 100%
rename from Source/Core/DolphinWX/resources/toolbar_debugger_delete.png
rename to Data/Sys/Themes/Boomy/toolbar_debugger_delete.png
diff --git a/Data/Sys/Themes/Clean Blue/audio.png b/Data/Sys/Themes/Clean Blue/audio.png
new file mode 100644
index 0000000000..91ef63ccc0
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/audio.png differ
diff --git a/Data/Sys/Themes/Clean Blue/audio@2x.png b/Data/Sys/Themes/Clean Blue/audio@2x.png
new file mode 100644
index 0000000000..0da09dba1c
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/audio@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/browse.png b/Data/Sys/Themes/Clean Blue/browse.png
index 2a56c14340..e219da672a 100644
Binary files a/Data/Sys/Themes/Clean Blue/browse.png and b/Data/Sys/Themes/Clean Blue/browse.png differ
diff --git a/Data/Sys/Themes/Clean Blue/browse@2x.png b/Data/Sys/Themes/Clean Blue/browse@2x.png
new file mode 100644
index 0000000000..974d646611
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/browse@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/classic.png b/Data/Sys/Themes/Clean Blue/classic.png
new file mode 100644
index 0000000000..5c7a5a8f1b
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/classic.png differ
diff --git a/Data/Sys/Themes/Clean Blue/classic@2x.png b/Data/Sys/Themes/Clean Blue/classic@2x.png
new file mode 100644
index 0000000000..c738c9c17e
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/classic@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/config.png b/Data/Sys/Themes/Clean Blue/config.png
index 487d479e08..9d8ce4c7ad 100644
Binary files a/Data/Sys/Themes/Clean Blue/config.png and b/Data/Sys/Themes/Clean Blue/config.png differ
diff --git a/Data/Sys/Themes/Clean Blue/config@2x.png b/Data/Sys/Themes/Clean Blue/config@2x.png
new file mode 100644
index 0000000000..1dc38dca04
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/config@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/dsp.png b/Data/Sys/Themes/Clean Blue/dsp.png
deleted file mode 100644
index 7dd741e2ab..0000000000
Binary files a/Data/Sys/Themes/Clean Blue/dsp.png and /dev/null differ
diff --git a/Data/Sys/Themes/Clean Blue/fullscreen.png b/Data/Sys/Themes/Clean Blue/fullscreen.png
index 841066905e..317869ca40 100644
Binary files a/Data/Sys/Themes/Clean Blue/fullscreen.png and b/Data/Sys/Themes/Clean Blue/fullscreen.png differ
diff --git a/Data/Sys/Themes/Clean Blue/fullscreen@2x.png b/Data/Sys/Themes/Clean Blue/fullscreen@2x.png
new file mode 100644
index 0000000000..785b339af0
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/fullscreen@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/gcpad.png b/Data/Sys/Themes/Clean Blue/gcpad.png
index 5df7494c6a..364a4e57bc 100644
Binary files a/Data/Sys/Themes/Clean Blue/gcpad.png and b/Data/Sys/Themes/Clean Blue/gcpad.png differ
diff --git a/Data/Sys/Themes/Clean Blue/gcpad@2x.png b/Data/Sys/Themes/Clean Blue/gcpad@2x.png
new file mode 100644
index 0000000000..7a49f7bcad
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/gcpad@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/graphics.png b/Data/Sys/Themes/Clean Blue/graphics.png
index f0b30dbccf..06e853dcd9 100644
Binary files a/Data/Sys/Themes/Clean Blue/graphics.png and b/Data/Sys/Themes/Clean Blue/graphics.png differ
diff --git a/Data/Sys/Themes/Clean Blue/graphics@2x.png b/Data/Sys/Themes/Clean Blue/graphics@2x.png
new file mode 100644
index 0000000000..2e15606b9b
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/graphics@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/nobanner@2x.png b/Data/Sys/Themes/Clean Blue/nobanner@2x.png
new file mode 100644
index 0000000000..8ad3b2c843
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/nobanner@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/open.png b/Data/Sys/Themes/Clean Blue/open.png
index c541bf50d3..64cd258057 100644
Binary files a/Data/Sys/Themes/Clean Blue/open.png and b/Data/Sys/Themes/Clean Blue/open.png differ
diff --git a/Data/Sys/Themes/Clean Blue/open@2x.png b/Data/Sys/Themes/Clean Blue/open@2x.png
new file mode 100644
index 0000000000..dc011252b8
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/open@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/pause.png b/Data/Sys/Themes/Clean Blue/pause.png
index 49d7a76347..721398b623 100644
Binary files a/Data/Sys/Themes/Clean Blue/pause.png and b/Data/Sys/Themes/Clean Blue/pause.png differ
diff --git a/Data/Sys/Themes/Clean Blue/pause@2x.png b/Data/Sys/Themes/Clean Blue/pause@2x.png
new file mode 100644
index 0000000000..9bb81441bf
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/pause@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/play.png b/Data/Sys/Themes/Clean Blue/play.png
index 1291f9a100..b94001a1dc 100644
Binary files a/Data/Sys/Themes/Clean Blue/play.png and b/Data/Sys/Themes/Clean Blue/play.png differ
diff --git a/Data/Sys/Themes/Clean Blue/play@2x.png b/Data/Sys/Themes/Clean Blue/play@2x.png
new file mode 100644
index 0000000000..2c428b02a0
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/play@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/refresh.png b/Data/Sys/Themes/Clean Blue/refresh.png
index da87dba760..1d98030714 100644
Binary files a/Data/Sys/Themes/Clean Blue/refresh.png and b/Data/Sys/Themes/Clean Blue/refresh.png differ
diff --git a/Data/Sys/Themes/Clean Blue/refresh@2x.png b/Data/Sys/Themes/Clean Blue/refresh@2x.png
new file mode 100644
index 0000000000..6ae9974e22
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/refresh@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/screenshot.png b/Data/Sys/Themes/Clean Blue/screenshot.png
index 82c7599c1f..5a49c4fe57 100644
Binary files a/Data/Sys/Themes/Clean Blue/screenshot.png and b/Data/Sys/Themes/Clean Blue/screenshot.png differ
diff --git a/Data/Sys/Themes/Clean Blue/screenshot@2x.png b/Data/Sys/Themes/Clean Blue/screenshot@2x.png
new file mode 100644
index 0000000000..56bdda4857
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/screenshot@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/stop.png b/Data/Sys/Themes/Clean Blue/stop.png
index a95666b191..3256bc6e47 100644
Binary files a/Data/Sys/Themes/Clean Blue/stop.png and b/Data/Sys/Themes/Clean Blue/stop.png differ
diff --git a/Data/Sys/Themes/Clean Blue/stop@2x.png b/Data/Sys/Themes/Clean Blue/stop@2x.png
new file mode 100644
index 0000000000..0e92419b3d
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/stop@2x.png differ
diff --git a/Data/Sys/Themes/Clean Blue/wiimote.png b/Data/Sys/Themes/Clean Blue/wiimote.png
index fcc6106425..ac25036227 100644
Binary files a/Data/Sys/Themes/Clean Blue/wiimote.png and b/Data/Sys/Themes/Clean Blue/wiimote.png differ
diff --git a/Data/Sys/Themes/Clean Blue/wiimote@2x.png b/Data/Sys/Themes/Clean Blue/wiimote@2x.png
new file mode 100644
index 0000000000..3fcd862203
Binary files /dev/null and b/Data/Sys/Themes/Clean Blue/wiimote@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/audio.png b/Data/Sys/Themes/Clean Lite/audio.png
new file mode 100644
index 0000000000..b961039ba4
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/audio.png differ
diff --git a/Data/Sys/Themes/Clean Lite/audio@2x.png b/Data/Sys/Themes/Clean Lite/audio@2x.png
new file mode 100644
index 0000000000..8bd6acf759
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/audio@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/browse.png b/Data/Sys/Themes/Clean Lite/browse.png
index 1d47b81cff..489a6d9039 100644
Binary files a/Data/Sys/Themes/Clean Lite/browse.png and b/Data/Sys/Themes/Clean Lite/browse.png differ
diff --git a/Data/Sys/Themes/Clean Lite/browse@2x.png b/Data/Sys/Themes/Clean Lite/browse@2x.png
new file mode 100644
index 0000000000..64a7a4f479
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/browse@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/classic.png b/Data/Sys/Themes/Clean Lite/classic.png
new file mode 100644
index 0000000000..7cc53dd7e4
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/classic.png differ
diff --git a/Data/Sys/Themes/Clean Lite/classic@2x.png b/Data/Sys/Themes/Clean Lite/classic@2x.png
new file mode 100644
index 0000000000..ca754acd05
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/classic@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/config.png b/Data/Sys/Themes/Clean Lite/config.png
index 3bb655cb1c..4902d2f7af 100644
Binary files a/Data/Sys/Themes/Clean Lite/config.png and b/Data/Sys/Themes/Clean Lite/config.png differ
diff --git a/Data/Sys/Themes/Clean Lite/config@2x.png b/Data/Sys/Themes/Clean Lite/config@2x.png
new file mode 100644
index 0000000000..7ee08d6454
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/config@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/dsp.png b/Data/Sys/Themes/Clean Lite/dsp.png
deleted file mode 100644
index 4685ab5e93..0000000000
Binary files a/Data/Sys/Themes/Clean Lite/dsp.png and /dev/null differ
diff --git a/Data/Sys/Themes/Clean Lite/fullscreen.png b/Data/Sys/Themes/Clean Lite/fullscreen.png
index 071ae37073..662db88152 100644
Binary files a/Data/Sys/Themes/Clean Lite/fullscreen.png and b/Data/Sys/Themes/Clean Lite/fullscreen.png differ
diff --git a/Data/Sys/Themes/Clean Lite/fullscreen@2x.png b/Data/Sys/Themes/Clean Lite/fullscreen@2x.png
new file mode 100644
index 0000000000..fa7e90e298
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/fullscreen@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/gcpad.png b/Data/Sys/Themes/Clean Lite/gcpad.png
index 03066ac511..4311b23745 100644
Binary files a/Data/Sys/Themes/Clean Lite/gcpad.png and b/Data/Sys/Themes/Clean Lite/gcpad.png differ
diff --git a/Data/Sys/Themes/Clean Lite/gcpad@2x.png b/Data/Sys/Themes/Clean Lite/gcpad@2x.png
new file mode 100644
index 0000000000..7ff54a1a42
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/gcpad@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/graphics.png b/Data/Sys/Themes/Clean Lite/graphics.png
index 7b7b42573c..e619591224 100644
Binary files a/Data/Sys/Themes/Clean Lite/graphics.png and b/Data/Sys/Themes/Clean Lite/graphics.png differ
diff --git a/Data/Sys/Themes/Clean Lite/graphics@2x.png b/Data/Sys/Themes/Clean Lite/graphics@2x.png
new file mode 100644
index 0000000000..9d31bf029f
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/graphics@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/nobanner@2x.png b/Data/Sys/Themes/Clean Lite/nobanner@2x.png
new file mode 100644
index 0000000000..8ad3b2c843
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/nobanner@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/open.png b/Data/Sys/Themes/Clean Lite/open.png
index dd4cdb576d..29164301ce 100644
Binary files a/Data/Sys/Themes/Clean Lite/open.png and b/Data/Sys/Themes/Clean Lite/open.png differ
diff --git a/Data/Sys/Themes/Clean Lite/open@2x.png b/Data/Sys/Themes/Clean Lite/open@2x.png
new file mode 100644
index 0000000000..07c7f85bee
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/open@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/pause.png b/Data/Sys/Themes/Clean Lite/pause.png
index 5e69f38f28..8db4e71fe1 100644
Binary files a/Data/Sys/Themes/Clean Lite/pause.png and b/Data/Sys/Themes/Clean Lite/pause.png differ
diff --git a/Data/Sys/Themes/Clean Lite/pause@2x.png b/Data/Sys/Themes/Clean Lite/pause@2x.png
new file mode 100644
index 0000000000..be4c92f5f8
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/pause@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/play.png b/Data/Sys/Themes/Clean Lite/play.png
index afb0702c9d..3f593def63 100644
Binary files a/Data/Sys/Themes/Clean Lite/play.png and b/Data/Sys/Themes/Clean Lite/play.png differ
diff --git a/Data/Sys/Themes/Clean Lite/play@2x.png b/Data/Sys/Themes/Clean Lite/play@2x.png
new file mode 100644
index 0000000000..053eb45449
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/play@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/refresh.png b/Data/Sys/Themes/Clean Lite/refresh.png
index 995326f4bd..5522e93b1b 100644
Binary files a/Data/Sys/Themes/Clean Lite/refresh.png and b/Data/Sys/Themes/Clean Lite/refresh.png differ
diff --git a/Data/Sys/Themes/Clean Lite/refresh@2x.png b/Data/Sys/Themes/Clean Lite/refresh@2x.png
new file mode 100644
index 0000000000..c182e2b791
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/refresh@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/screenshot.png b/Data/Sys/Themes/Clean Lite/screenshot.png
index 5198a8d5dc..220985d435 100644
Binary files a/Data/Sys/Themes/Clean Lite/screenshot.png and b/Data/Sys/Themes/Clean Lite/screenshot.png differ
diff --git a/Data/Sys/Themes/Clean Lite/screenshot@2x.png b/Data/Sys/Themes/Clean Lite/screenshot@2x.png
new file mode 100644
index 0000000000..e12189079b
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/screenshot@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/stop.png b/Data/Sys/Themes/Clean Lite/stop.png
index 8ae7b8443d..d03fe2c459 100644
Binary files a/Data/Sys/Themes/Clean Lite/stop.png and b/Data/Sys/Themes/Clean Lite/stop.png differ
diff --git a/Data/Sys/Themes/Clean Lite/stop@2x.png b/Data/Sys/Themes/Clean Lite/stop@2x.png
new file mode 100644
index 0000000000..63332dfb7f
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/stop@2x.png differ
diff --git a/Data/Sys/Themes/Clean Lite/wiimote.png b/Data/Sys/Themes/Clean Lite/wiimote.png
index 5aa75d1d25..0c2e948586 100644
Binary files a/Data/Sys/Themes/Clean Lite/wiimote.png and b/Data/Sys/Themes/Clean Lite/wiimote.png differ
diff --git a/Data/Sys/Themes/Clean Lite/wiimote@2x.png b/Data/Sys/Themes/Clean Lite/wiimote@2x.png
new file mode 100644
index 0000000000..4cd75336c0
Binary files /dev/null and b/Data/Sys/Themes/Clean Lite/wiimote@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/audio.png b/Data/Sys/Themes/Clean Pink/audio.png
new file mode 100644
index 0000000000..ad669c8c71
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/audio.png differ
diff --git a/Data/Sys/Themes/Clean Pink/audio@2x.png b/Data/Sys/Themes/Clean Pink/audio@2x.png
new file mode 100644
index 0000000000..3daee4b555
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/audio@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/browse.png b/Data/Sys/Themes/Clean Pink/browse.png
index 64c4546127..20b357c71d 100644
Binary files a/Data/Sys/Themes/Clean Pink/browse.png and b/Data/Sys/Themes/Clean Pink/browse.png differ
diff --git a/Data/Sys/Themes/Clean Pink/browse@2x.png b/Data/Sys/Themes/Clean Pink/browse@2x.png
new file mode 100644
index 0000000000..2475825213
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/browse@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/classic.png b/Data/Sys/Themes/Clean Pink/classic.png
new file mode 100644
index 0000000000..8dcaa06e33
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/classic.png differ
diff --git a/Data/Sys/Themes/Clean Pink/classic@2x.png b/Data/Sys/Themes/Clean Pink/classic@2x.png
new file mode 100644
index 0000000000..0f438da43d
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/classic@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/config.png b/Data/Sys/Themes/Clean Pink/config.png
index 380640ab27..af3e705e78 100644
Binary files a/Data/Sys/Themes/Clean Pink/config.png and b/Data/Sys/Themes/Clean Pink/config.png differ
diff --git a/Data/Sys/Themes/Clean Pink/config@2x.png b/Data/Sys/Themes/Clean Pink/config@2x.png
new file mode 100644
index 0000000000..1a4c336449
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/config@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/dsp.png b/Data/Sys/Themes/Clean Pink/dsp.png
deleted file mode 100644
index 85a20e332f..0000000000
Binary files a/Data/Sys/Themes/Clean Pink/dsp.png and /dev/null differ
diff --git a/Data/Sys/Themes/Clean Pink/fullscreen.png b/Data/Sys/Themes/Clean Pink/fullscreen.png
index 97e8af4425..235a956325 100644
Binary files a/Data/Sys/Themes/Clean Pink/fullscreen.png and b/Data/Sys/Themes/Clean Pink/fullscreen.png differ
diff --git a/Data/Sys/Themes/Clean Pink/fullscreen@2x.png b/Data/Sys/Themes/Clean Pink/fullscreen@2x.png
new file mode 100644
index 0000000000..c038744e8a
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/fullscreen@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/gcpad.png b/Data/Sys/Themes/Clean Pink/gcpad.png
index 98697446a5..4257ea059a 100644
Binary files a/Data/Sys/Themes/Clean Pink/gcpad.png and b/Data/Sys/Themes/Clean Pink/gcpad.png differ
diff --git a/Data/Sys/Themes/Clean Pink/gcpad@2x.png b/Data/Sys/Themes/Clean Pink/gcpad@2x.png
new file mode 100644
index 0000000000..7d9f405341
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/gcpad@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/graphics.png b/Data/Sys/Themes/Clean Pink/graphics.png
index a82403b952..ecd3758106 100644
Binary files a/Data/Sys/Themes/Clean Pink/graphics.png and b/Data/Sys/Themes/Clean Pink/graphics.png differ
diff --git a/Data/Sys/Themes/Clean Pink/graphics@2x.png b/Data/Sys/Themes/Clean Pink/graphics@2x.png
new file mode 100644
index 0000000000..2cb9592463
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/graphics@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/nobanner@2x.png b/Data/Sys/Themes/Clean Pink/nobanner@2x.png
new file mode 100644
index 0000000000..8ad3b2c843
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/nobanner@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/open.png b/Data/Sys/Themes/Clean Pink/open.png
index cc26643975..ffeb733509 100644
Binary files a/Data/Sys/Themes/Clean Pink/open.png and b/Data/Sys/Themes/Clean Pink/open.png differ
diff --git a/Data/Sys/Themes/Clean Pink/open@2x.png b/Data/Sys/Themes/Clean Pink/open@2x.png
new file mode 100644
index 0000000000..d7e6763e75
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/open@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/pause.png b/Data/Sys/Themes/Clean Pink/pause.png
index 8849bc81ee..7742b6d88c 100644
Binary files a/Data/Sys/Themes/Clean Pink/pause.png and b/Data/Sys/Themes/Clean Pink/pause.png differ
diff --git a/Data/Sys/Themes/Clean Pink/pause@2x.png b/Data/Sys/Themes/Clean Pink/pause@2x.png
new file mode 100644
index 0000000000..125e176026
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/pause@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/play.png b/Data/Sys/Themes/Clean Pink/play.png
index 29f858118b..88530f58b9 100644
Binary files a/Data/Sys/Themes/Clean Pink/play.png and b/Data/Sys/Themes/Clean Pink/play.png differ
diff --git a/Data/Sys/Themes/Clean Pink/play@2x.png b/Data/Sys/Themes/Clean Pink/play@2x.png
new file mode 100644
index 0000000000..7662e3fc68
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/play@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/refresh.png b/Data/Sys/Themes/Clean Pink/refresh.png
index 1f8b6a8b52..ea636952e3 100644
Binary files a/Data/Sys/Themes/Clean Pink/refresh.png and b/Data/Sys/Themes/Clean Pink/refresh.png differ
diff --git a/Data/Sys/Themes/Clean Pink/refresh@2x.png b/Data/Sys/Themes/Clean Pink/refresh@2x.png
new file mode 100644
index 0000000000..788d9e92e1
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/refresh@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/screenshot.png b/Data/Sys/Themes/Clean Pink/screenshot.png
index 46a8b6056b..01ad34fb0e 100644
Binary files a/Data/Sys/Themes/Clean Pink/screenshot.png and b/Data/Sys/Themes/Clean Pink/screenshot.png differ
diff --git a/Data/Sys/Themes/Clean Pink/screenshot@2x.png b/Data/Sys/Themes/Clean Pink/screenshot@2x.png
new file mode 100644
index 0000000000..18a5ee4c34
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/screenshot@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/stop.png b/Data/Sys/Themes/Clean Pink/stop.png
index 9c142fb36d..f5c9e296e0 100644
Binary files a/Data/Sys/Themes/Clean Pink/stop.png and b/Data/Sys/Themes/Clean Pink/stop.png differ
diff --git a/Data/Sys/Themes/Clean Pink/stop@2x.png b/Data/Sys/Themes/Clean Pink/stop@2x.png
new file mode 100644
index 0000000000..ecf1e70b30
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/stop@2x.png differ
diff --git a/Data/Sys/Themes/Clean Pink/wiimote.png b/Data/Sys/Themes/Clean Pink/wiimote.png
index 2f07897e60..38c0f83c8c 100644
Binary files a/Data/Sys/Themes/Clean Pink/wiimote.png and b/Data/Sys/Themes/Clean Pink/wiimote.png differ
diff --git a/Data/Sys/Themes/Clean Pink/wiimote@2x.png b/Data/Sys/Themes/Clean Pink/wiimote@2x.png
new file mode 100644
index 0000000000..ee855b1900
Binary files /dev/null and b/Data/Sys/Themes/Clean Pink/wiimote@2x.png differ
diff --git a/Data/Sys/Themes/Clean/audio.png b/Data/Sys/Themes/Clean/audio.png
new file mode 100644
index 0000000000..53d4413cb8
Binary files /dev/null and b/Data/Sys/Themes/Clean/audio.png differ
diff --git a/Data/Sys/Themes/Clean/audio@2x.png b/Data/Sys/Themes/Clean/audio@2x.png
new file mode 100644
index 0000000000..f83e43ff80
Binary files /dev/null and b/Data/Sys/Themes/Clean/audio@2x.png differ
diff --git a/Data/Sys/Themes/Clean/browse.png b/Data/Sys/Themes/Clean/browse.png
index fb88269afe..414b494aaa 100644
Binary files a/Data/Sys/Themes/Clean/browse.png and b/Data/Sys/Themes/Clean/browse.png differ
diff --git a/Data/Sys/Themes/Clean/browse@2x.png b/Data/Sys/Themes/Clean/browse@2x.png
new file mode 100644
index 0000000000..fb6b21ad83
Binary files /dev/null and b/Data/Sys/Themes/Clean/browse@2x.png differ
diff --git a/Data/Sys/Themes/Clean/classic.png b/Data/Sys/Themes/Clean/classic.png
new file mode 100644
index 0000000000..fc3105c48d
Binary files /dev/null and b/Data/Sys/Themes/Clean/classic.png differ
diff --git a/Data/Sys/Themes/Clean/classic@2x.png b/Data/Sys/Themes/Clean/classic@2x.png
new file mode 100644
index 0000000000..f25885b8a3
Binary files /dev/null and b/Data/Sys/Themes/Clean/classic@2x.png differ
diff --git a/Data/Sys/Themes/Clean/config.png b/Data/Sys/Themes/Clean/config.png
index b412f7184b..af7adc78cc 100644
Binary files a/Data/Sys/Themes/Clean/config.png and b/Data/Sys/Themes/Clean/config.png differ
diff --git a/Data/Sys/Themes/Clean/config@2x.png b/Data/Sys/Themes/Clean/config@2x.png
new file mode 100644
index 0000000000..49924d3d89
Binary files /dev/null and b/Data/Sys/Themes/Clean/config@2x.png differ
diff --git a/Data/Sys/Themes/Clean/dsp.png b/Data/Sys/Themes/Clean/dsp.png
deleted file mode 100644
index 5da533c5b0..0000000000
Binary files a/Data/Sys/Themes/Clean/dsp.png and /dev/null differ
diff --git a/Data/Sys/Themes/Clean/fullscreen.png b/Data/Sys/Themes/Clean/fullscreen.png
index f7d469cf55..7ef304efbb 100644
Binary files a/Data/Sys/Themes/Clean/fullscreen.png and b/Data/Sys/Themes/Clean/fullscreen.png differ
diff --git a/Data/Sys/Themes/Clean/fullscreen@2x.png b/Data/Sys/Themes/Clean/fullscreen@2x.png
new file mode 100644
index 0000000000..f683685708
Binary files /dev/null and b/Data/Sys/Themes/Clean/fullscreen@2x.png differ
diff --git a/Data/Sys/Themes/Clean/gcpad.png b/Data/Sys/Themes/Clean/gcpad.png
index cbe6c95856..1b3d20f802 100644
Binary files a/Data/Sys/Themes/Clean/gcpad.png and b/Data/Sys/Themes/Clean/gcpad.png differ
diff --git a/Data/Sys/Themes/Clean/gcpad@2x.png b/Data/Sys/Themes/Clean/gcpad@2x.png
new file mode 100644
index 0000000000..2a44b46647
Binary files /dev/null and b/Data/Sys/Themes/Clean/gcpad@2x.png differ
diff --git a/Data/Sys/Themes/Clean/graphics.png b/Data/Sys/Themes/Clean/graphics.png
index 59e419de40..9b335dc40e 100644
Binary files a/Data/Sys/Themes/Clean/graphics.png and b/Data/Sys/Themes/Clean/graphics.png differ
diff --git a/Data/Sys/Themes/Clean/graphics@2x.png b/Data/Sys/Themes/Clean/graphics@2x.png
new file mode 100644
index 0000000000..c47e4e1c1e
Binary files /dev/null and b/Data/Sys/Themes/Clean/graphics@2x.png differ
diff --git a/Data/Sys/Themes/Clean/nobanner@2x.png b/Data/Sys/Themes/Clean/nobanner@2x.png
new file mode 100644
index 0000000000..8ad3b2c843
Binary files /dev/null and b/Data/Sys/Themes/Clean/nobanner@2x.png differ
diff --git a/Data/Sys/Themes/Clean/open.png b/Data/Sys/Themes/Clean/open.png
index f8acbcefaa..d4c6e3bc0e 100644
Binary files a/Data/Sys/Themes/Clean/open.png and b/Data/Sys/Themes/Clean/open.png differ
diff --git a/Data/Sys/Themes/Clean/open@2x.png b/Data/Sys/Themes/Clean/open@2x.png
new file mode 100644
index 0000000000..8d5975cbac
Binary files /dev/null and b/Data/Sys/Themes/Clean/open@2x.png differ
diff --git a/Data/Sys/Themes/Clean/pause.png b/Data/Sys/Themes/Clean/pause.png
index 1eeda4f5c5..acca6344ff 100644
Binary files a/Data/Sys/Themes/Clean/pause.png and b/Data/Sys/Themes/Clean/pause.png differ
diff --git a/Data/Sys/Themes/Clean/pause@2x.png b/Data/Sys/Themes/Clean/pause@2x.png
new file mode 100644
index 0000000000..969cd7e80a
Binary files /dev/null and b/Data/Sys/Themes/Clean/pause@2x.png differ
diff --git a/Data/Sys/Themes/Clean/play.png b/Data/Sys/Themes/Clean/play.png
index 0fb30540dc..6ba5353b6c 100644
Binary files a/Data/Sys/Themes/Clean/play.png and b/Data/Sys/Themes/Clean/play.png differ
diff --git a/Data/Sys/Themes/Clean/play@2x.png b/Data/Sys/Themes/Clean/play@2x.png
new file mode 100644
index 0000000000..38dcc9ee7a
Binary files /dev/null and b/Data/Sys/Themes/Clean/play@2x.png differ
diff --git a/Data/Sys/Themes/Clean/refresh.png b/Data/Sys/Themes/Clean/refresh.png
index 068d4976f0..80bab38520 100644
Binary files a/Data/Sys/Themes/Clean/refresh.png and b/Data/Sys/Themes/Clean/refresh.png differ
diff --git a/Data/Sys/Themes/Clean/refresh@2x.png b/Data/Sys/Themes/Clean/refresh@2x.png
new file mode 100644
index 0000000000..d5889b075c
Binary files /dev/null and b/Data/Sys/Themes/Clean/refresh@2x.png differ
diff --git a/Data/Sys/Themes/Clean/screenshot.png b/Data/Sys/Themes/Clean/screenshot.png
index e02153f366..bf1f6a296c 100644
Binary files a/Data/Sys/Themes/Clean/screenshot.png and b/Data/Sys/Themes/Clean/screenshot.png differ
diff --git a/Data/Sys/Themes/Clean/screenshot@2x.png b/Data/Sys/Themes/Clean/screenshot@2x.png
new file mode 100644
index 0000000000..77a2983f6e
Binary files /dev/null and b/Data/Sys/Themes/Clean/screenshot@2x.png differ
diff --git a/Data/Sys/Themes/Clean/stop.png b/Data/Sys/Themes/Clean/stop.png
index 4a640260d6..32a2e71150 100644
Binary files a/Data/Sys/Themes/Clean/stop.png and b/Data/Sys/Themes/Clean/stop.png differ
diff --git a/Data/Sys/Themes/Clean/stop@2x.png b/Data/Sys/Themes/Clean/stop@2x.png
new file mode 100644
index 0000000000..9acd326c0b
Binary files /dev/null and b/Data/Sys/Themes/Clean/stop@2x.png differ
diff --git a/Data/Sys/Themes/Clean/wiimote.png b/Data/Sys/Themes/Clean/wiimote.png
index 07d63ab841..f4da3eec0d 100644
Binary files a/Data/Sys/Themes/Clean/wiimote.png and b/Data/Sys/Themes/Clean/wiimote.png differ
diff --git a/Data/Sys/Themes/Clean/wiimote@2x.png b/Data/Sys/Themes/Clean/wiimote@2x.png
new file mode 100644
index 0000000000..f938d874a6
Binary files /dev/null and b/Data/Sys/Themes/Clean/wiimote@2x.png differ
diff --git a/Data/cpack_package_description.txt b/Data/cpack_package_description.txt
index 318774314d..9db61bc885 100644
--- a/Data/cpack_package_description.txt
+++ b/Data/cpack_package_description.txt
@@ -1 +1 @@
-Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on the Gamecube) emulator which supports many extra features and abilities not present on the original consoles. Gamecube and Wii compatibility is good - one can expect "mainstream" titles to run; lesser known titles can be hit or miss. Triforce compatibility is currently limited to a couple of games - others require more of the Triforce-specific peripheral devices to be emulated.
+Dolphin is a GameCube, Wii and Triforce (the arcade machine based on the GameCube) emulator which supports many extra features and abilities not present on the original consoles. GameCube and Wii compatibility is good - one can expect "mainstream" titles to run; lesser known titles can be hit or miss. Triforce compatibility is currently limited to a couple of games - others require more of the Triforce-specific peripheral devices to be emulated.
diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj
index 50f62f70f6..e1eb8d1949 100644
--- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj
+++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj
@@ -1,157 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}</ProjectGuid>
-    <RootNamespace>Bochs_disasm</RootNamespace>
+    <ProjectGuid>{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="config.h" />
     <ClInclude Include="disasm.h" />
     <ClInclude Include="dis_tables.h" />
-    <ClInclude Include="PowerPCDisasm.h" />
-    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dis_decode.cpp" />
-    <ClCompile Include="dis_groups.cpp" />
-    <ClCompile Include="PowerPCDisasm.cpp" />
-    <ClCompile Include="resolve.cpp" />
-    <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="syntax.cpp" />
+    <ClCompile Include="dis_decode.cc" />
+    <ClCompile Include="dis_groups.cc" />
+    <ClCompile Include="resolve.cc" />
+    <ClCompile Include="syntax.cc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="dis_tables.inl" />
-    <None Include="opcodes.inl" />
+    <None Include="opcodes.inc" />
+    <None Include="dis_tables.inc" />
+    <None Include="dis_tables_avx.inc" />
+    <None Include="dis_tables_sse.inc" />
+    <None Include="dis_tables_x87.inc" />
+    <None Include="dis_tables_xop.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Externals/Bochs_disasm/CMakeLists.txt b/Externals/Bochs_disasm/CMakeLists.txt
index 93a73f9392..3d93e7e6e9 100644
--- a/Externals/Bochs_disasm/CMakeLists.txt
+++ b/Externals/Bochs_disasm/CMakeLists.txt
@@ -1,11 +1,10 @@
-set(SRCS	dis_decode.cpp
-			dis_groups.cpp
-			resolve.cpp
-			syntax.cpp
-			PowerPCDisasm.cpp)
+set(SRCS dis_decode.cc
+         dis_groups.cc
+         resolve.cc
+         syntax.cc)
 
 if(WIN32)
-	set(SRCS ${SRCS} stdafx.cpp)
+    set(SRCS ${SRCS} stdafx.cpp)
 endif(WIN32)
 
 add_library(bdisasm STATIC ${SRCS})
diff --git a/Externals/Bochs_disasm/Makefile.in b/Externals/Bochs_disasm/Makefile.in
new file mode 100644
index 0000000000..e7a5276624
--- /dev/null
+++ b/Externals/Bochs_disasm/Makefile.in
@@ -0,0 +1,82 @@
+# Copyright (C) 2001  The Bochs Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+@SUFFIX_LINE@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+top_builddir    = ..
+top_srcdir      = @top_srcdir@
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+RANLIB = @RANLIB@
+
+
+# ===========================================================
+# end of configurable options
+# ===========================================================
+
+
+BX_OBJS = \
+  dis_decode.o \
+  dis_groups.o \
+  resolve.o    \
+  syntax.o
+
+BX_INCLUDES = disasm.h
+
+BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
+
+all: libdisasm.a
+
+.@CPP_SUFFIX@.o:
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+
+
+
+libdisasm.a: $(BX_OBJS)
+	@RMCOMMAND@ libdisasm.a
+	@MAKELIB@ $(BX_OBJS)
+	$(RANLIB) libdisasm.a
+
+$(BX_OBJS): $(BX_INCLUDES)
+
+
+clean:
+	@RMCOMMAND@ *.o
+	@RMCOMMAND@ *.a
+
+dist-clean: clean
+	@RMCOMMAND@ Makefile
+
+###########################################
+# dependencies generated by
+#  gcc -MM -I.. -I../instrument/stubs *.cc | sed 's/\.cc/.@CPP_SUFFIX@/g'
+###########################################
+dis_decode.o: dis_decode.@CPP_SUFFIX@ disasm.h ../config.h dis_tables.h opcodes.inc \
+              dis_tables.inc dis_tables_x87.inc dis_tables_sse.inc dis_tables_avx.inc dis_tables_xop.inc
+dis_groups.o: dis_groups.@CPP_SUFFIX@ disasm.h ../config.h
+resolve.o: resolve.@CPP_SUFFIX@ disasm.h ../config.h
+syntax.o: syntax.@CPP_SUFFIX@ disasm.h ../config.h
diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp b/Externals/Bochs_disasm/PowerPCDisasm.cpp
deleted file mode 100644
index f6de85d845..0000000000
--- a/Externals/Bochs_disasm/PowerPCDisasm.cpp
+++ /dev/null
@@ -1,2285 +0,0 @@
-/* $VER: ppc_disasm.c V1.1 (19.02.2000)
-*
-* Disassembler module for the PowerPC microprocessor family
-* Copyright (c) 1998-2000  Frank Wille
-*
-* ppc_disasm.c is freeware and may be freely redistributed as long as
-* no modifications are made and nothing is charged for it.
-* Non-commercial usage is allowed without any restrictions.
-* EVERY PRODUCT OR PROGRAM DERIVED DIRECTLY FROM MY SOURCE MAY NOT BE
-* SOLD COMMERCIALLY WITHOUT PERMISSION FROM THE AUTHOR.
-*
-*
-* v1.2  (31.07.2003) org
-*       modified for IBM PowerPC Gekko.
-* v1.1  (19.02.2000) phx
-*       fabs wasn't recognized.
-* v1.0  (30.01.2000) phx
-*       stfsx, stfdx, lfsx, lfdx, stfsux, stfdux, lfsux, lfdux, etc.
-*       printed "rd,ra,rb" as operands instead "fd,ra,rb".
-* v0.4  (01.06.1999) phx
-*       'stwm' shoud have been 'stmw'.
-* v0.3  (17.11.1998) phx
-*       The OE-types (e.g. addo, subfeo, etc.) didn't work for all
-*       instructions.
-*       AA-form branches have an absolute destination.
-*       addze and subfze must not have a third operand.
-*       sc was not recognized.
-* v0.2  (29.05.1998) phx
-*       Sign error. SUBI got negative immediate values.
-* v0.1  (23.05.1998) phx
-*       First version, which implements all PowerPC instructions.
-* v0.0  (09.05.1998) phx
-*       File created.
-*/
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "PowerPCDisasm.h"
-
-namespace PPCDisasm
-{
-
-/* version/revision */
-#define PPCDISASM_VER 1
-#define PPCDISASM_REV 1
-
-
-/* typedefs */
-typedef unsigned int ppc_word;
-
-#undef BIGENDIAN
-#undef LITTTLEENDIAN
-/* endianess */
-#define LITTLEENDIAN 0
-
-
-/* general defines */
-#define PPCIDXMASK      0xfc000000
-#define PPCIDX2MASK     0x000007fe
-#define PPCDMASK        0x03e00000
-#define PPCAMASK        0x001f0000
-#define PPCBMASK        0x0000f800
-#define PPCCMASK        0x000007c0
-#define PPCMMASK        0x0000003e
-#define PPCCRDMASK      0x03800000
-#define PPCCRAMASK      0x001c0000
-#define PPCLMASK        0x00600000
-#define PPCOE           0x00000400
-
-#define PPCIDXSH        26
-#define PPCDSH          21
-#define PPCASH          16
-#define PPCBSH          11
-#define PPCCSH          6
-#define PPCMSH          1
-#define PPCCRDSH        23
-#define PPCCRASH        18
-#define PPCLSH          21
-#define PPCIDX2SH       1
-
-#define PPCGETIDX(x)    (((x)&PPCIDXMASK)>>PPCIDXSH)
-#define PPCGETD(x)      (((x)&PPCDMASK)>>PPCDSH)
-#define PPCGETA(x)      (((x)&PPCAMASK)>>PPCASH)
-#define PPCGETB(x)      (((x)&PPCBMASK)>>PPCBSH)
-#define PPCGETC(x)      (((x)&PPCCMASK)>>PPCCSH)
-#define PPCGETM(x)      (((x)&PPCMMASK)>>PPCMSH)
-#define PPCGETCRD(x)    (((x)&PPCCRDMASK)>>PPCCRDSH)
-#define PPCGETCRA(x)    (((x)&PPCCRAMASK)>>PPCCRASH)
-#define PPCGETL(x)      (((x)&PPCLMASK)>>PPCLSH)
-#define PPCGETIDX2(x)   (((x)&PPCIDX2MASK)>>PPCIDX2SH)
-
-
-	/* Disassembler structure, the interface to the application */
-
-	struct DisasmPara_PPC {
-		ppc_word *instr;              /* pointer to instruction to disassemble */
-		ppc_word *iaddr;              /* instr.addr., usually the same as instr */
-		char *opcode;                 /* buffer for opcode, min. 10 chars. */
-		char *operands;               /* operand buffer, min. 24 chars. */
-		/* changed by disassembler: */
-		unsigned char type;           /* type of instruction, see below */
-		unsigned char flags;          /* additional flags */
-		unsigned short sreg;          /* register in load/store instructions */
-		ppc_word displacement;        /* branch- or load/store displacement */
-	};
-
-#define PPCINSTR_OTHER      0   /* no additional info for other instr. */
-#define PPCINSTR_BRANCH     1   /* branch dest. = PC+displacement */
-#define PPCINSTR_LDST       2   /* load/store instruction: displ(sreg) */
-#define PPCINSTR_IMM        3   /* 16-bit immediate val. in displacement */
-
-#define PPCF_ILLEGAL   (1<<0)   /* illegal PowerPC instruction */
-#define PPCF_UNSIGNED  (1<<1)   /* unsigned immediate instruction */
-#define PPCF_SUPER     (1<<2)   /* supervisor level instruction */
-#define PPCF_64        (1<<3)   /* 64-bit only instruction */
-
-
-	/* ppc_disasm.o prototypes */
-#ifndef PPC_DISASM_C
-	extern ppc_word *PPC_Disassemble(struct DisasmPara_PPC *);
-#endif
-
-
-	static const char *trap_condition[32] = {
-		NULL,"lgt","llt",NULL,"eq","lge","lle",NULL,
-		"gt",NULL,NULL,NULL,"ge",NULL,NULL,NULL,
-		"lt",NULL,NULL,NULL,"le",NULL,NULL,NULL,
-		"ne",NULL,NULL,NULL,NULL,NULL,NULL,NULL
-	};
-
-	static const char *cmpname[4] = {
-		"cmpw","cmpd","cmplw","cmpld"
-	};
-
-	static const char *b_ext[4] = {
-		"","l","a","la"
-	};
-
-	static const char *b_condition[8] = {
-		"ge","le","ne","ns","lt","gt","eq","so"
-	};
-
-	static const char *b_decr[16] = {
-		"nzf","zf",NULL,NULL,"nzt","zt",NULL,NULL,
-		"nz","z",NULL,NULL,"nz","z",NULL,NULL
-	};
-
-	static const char *regsel[2] = {
-		"","r"
-	};
-
-	static const char *oesel[2] = {
-		"","o"
-	};
-
-	static const char *rcsel[2] = {
-		"","."
-	};
-
-	static const char *ldstnames[] = {
-		"lwz","lwzu","lbz","lbzu","stw","stwu","stb","stbu","lhz","lhzu",
-		"lha","lhau","sth","sthu","lmw","stmw","lfs","lfsu","lfd","lfdu",
-		"stfs","stfsu","stfd","stfdu"
-	};
-
-	static const char *regnames[] = {
-		"r0", "sp", "rtoc", "r3", "r4", "r5", "r6", "r7", 
-		"r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", 
-		"r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", 
-		"r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"
-	};
-
-	static const char *spr_name(int i)
-	{
-		static char def[8];
-
-		switch (i)
-		{
-		case 1: return "XER";
-		case 8: return "LR";
-		case 9: return "CTR";
-		case 18: return "DSIR";
-		case 19: return "DAR";
-		case 22: return "DEC";
-		case 25: return "SDR1";
-		case 26: return "SRR0";
-		case 27: return "SRR1";
-		case 272: return "SPRG0";
-		case 273: return "SPRG1";
-		case 274: return "SPRG2";
-		case 275: return "SPRG3";
-		case 282: return "EAR";
-		case 287: return "PVR";
-		case 528: return "IBAT0U";
-		case 529: return "IBAT0L";
-		case 530: return "IBAT1U";
-		case 531: return "IBAT1L";
-		case 532: return "IBAT2U";
-		case 533: return "IBAT2L";
-		case 534: return "IBAT3U";
-		case 535: return "IBAT3L";
-		case 536: return "DBAT0U";
-		case 537: return "DBAT0L";
-		case 538: return "DBAT1U";
-		case 539: return "DBAT1L";
-		case 540: return "DBAT2U";
-		case 541: return "DBAT2L";
-		case 542: return "DBAT3U";
-		case 543: return "DBAT3L";
-		case 912: return "GQR0";
-		case 913: return "GQR1";
-		case 914: return "GQR2";
-		case 915: return "GQR3";
-		case 916: return "GQR4";
-		case 917: return "GQR5";
-		case 918: return "GQR6";
-		case 919: return "GQR7";
-		case 920: return "HID2";
-		case 921: return "WPAR";
-		case 922: return "DMA_U";
-		case 923: return "DMA_L";
-		case 924: return "ECID_U";
-		case 925: return "ECID_M";
-		case 926: return "ECID_L";
-		case 936: return "UMMCR0";
-		case 937: return "UPMC1";
-		case 938: return "UPMC2";
-		case 939: return "USIA";
-		case 940: return "UMMCR1";
-		case 941: return "UPMC3";
-		case 942: return "UPMC4";
-		case 943: return "USDA";
-		case 952: return "MMCR0";
-		case 953: return "PMC1";
-		case 954: return "PMC2";
-		case 955: return "SIA";
-		case 956: return "MMCR1";
-		case 957: return "PMC3";
-		case 958: return "PMC4";
-		case 959: return "SDA";
-		case 1008: return "HID0";
-		case 1009: return "HID1";
-		case 1010: return "IABR";
-		case 1011: return "HID4";
-		case 1013: return "DABR";
-		case 1017: return "L2CR";
-		case 1019: return "ICTC";
-		case 1020: return "THRM1";
-		case 1021: return "THRM2";
-		case 1022: return "THRM3";
-		}
-
-		sprintf(def, "%i", i);
-		return def;
-	}
-
-	static void ierror(const char *errtxt,...)
-		/* display internal error and quit program */
-	{
-		va_list vl;
-
-		fprintf(stderr,"\nINTERNAL ERROR (PPC disassembler): ");
-		va_start(vl,errtxt);
-		vfprintf(stderr,errtxt,vl);
-		va_end(vl);
-		fprintf(stderr,".\nAborting.\n");
-		exit(1);
-	}
-
-
-	static ppc_word swapda(ppc_word w)
-	{
-		return ((w&0xfc00ffff)|((w&PPCAMASK)<<5)|((w&PPCDMASK)>>5));
-	}
-
-
-	static ppc_word swapab(ppc_word w)
-	{
-		return ((w&0xffe007ff)|((w&PPCBMASK)<<5)|((w&PPCAMASK)>>5));
-	}
-
-
-	static void ill(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		if (in == 0) {
-			strcpy(dp->opcode, "");
-			strcpy(dp->operands, "---");
-		} else {
-			strcpy(dp->opcode, "( ill )");
-			sprintf(dp->operands, "%08x", in);
-		}
-
-		dp->flags |= PPCF_ILLEGAL;
-	}
-
-
-	static void imm(struct DisasmPara_PPC *dp,ppc_word in,int uimm,int type,int hex)
-		/* Generate immediate instruction operand. */
-		/* type 0: D-mode, D,A,imm */
-		/* type 1: S-mode, A,S,imm */
-		/* type 2: S/D register is ignored (trap,cmpi) */
-		/* type 3: A register is ignored (li) */
-	{
-		int i = (int)(in & 0xffff);
-
-		dp->type = PPCINSTR_IMM;
-		if (!uimm) {
-			if (i > 0x7fff)
-				i -= 0x10000;
-		}
-		else
-			dp->flags |= PPCF_UNSIGNED;
-		dp->displacement = i;
-
-		switch (type) {
-	case 0:
-		sprintf(dp->operands,"%s, %s, %d",regnames[(int)PPCGETD(in)],regnames[(int)PPCGETA(in)],i);
-		break;
-	case 1:
-		if (hex)
-			sprintf(dp->operands,"%s, %s, 0x%.4X",regnames[(int)PPCGETA(in)],regnames[(int)PPCGETD(in)],i);
-		else
-			sprintf(dp->operands,"%s, %s, %d",regnames[(int)PPCGETA(in)],regnames[(int)PPCGETD(in)],i);
-		break;
-	case 2:
-		sprintf(dp->operands,"%s, %d",regnames[(int)PPCGETA(in)],i);
-		break;
-	case 3:
-		if (hex)
-			sprintf(dp->operands,"%s, 0x%.4X",regnames[(int)PPCGETD(in)],i);
-		else
-			sprintf(dp->operands,"%s, %d",regnames[(int)PPCGETD(in)],i);
-		break;
-	default:
-		ierror("imm(): Wrong type");
-		break;
-		}
-	}
-
-
-	static void ra_rb(char *s,ppc_word in)
-	{
-		sprintf(s,"%s, %s",regnames[(int)PPCGETA(in)],regnames[(int)PPCGETB(in)]);
-	}
-
-
-	static char *rd_ra_rb(char *s,ppc_word in,int mask)
-	{
-		static const char *fmt = "%s, ";
-
-		if (mask) {
-			if (mask & 4)
-				s += sprintf(s,fmt,regnames[(int)PPCGETD(in)]);
-			if (mask & 2)
-				s += sprintf(s,fmt,regnames[(int)PPCGETA(in)]);
-			if (mask & 1)
-				s += sprintf(s,fmt,regnames[(int)PPCGETB(in)]);
-			*--s = '\0';
-			*--s = '\0';
-		}
-		else
-			*s = '\0';
-		return (s);
-	}
-
-
-	static char *fd_ra_rb(char *s,ppc_word in,int mask)
-	{
-		static const char *ffmt = "f%d,";
-		static const char *rfmt = "%s,";
-
-		if (mask) {
-			if (mask & 4)
-				s += sprintf(s,ffmt,(int)PPCGETD(in));
-			if (mask & 2)
-				s += sprintf(s,rfmt,regnames[(int)PPCGETA(in)]);
-			if (mask & 1)
-				s += sprintf(s,rfmt,regnames[(int)PPCGETB(in)]);
-			*--s = '\0';
-		}
-		else
-			*s = '\0';
-		return (s);
-	}
-
-
-	static void trapi(struct DisasmPara_PPC *dp,ppc_word in,unsigned char dmode)
-	{
-		const char *cnd;
-
-		if ((cnd = trap_condition[PPCGETD(in)]) != NULL) {
-			dp->flags |= dmode;
-			sprintf(dp->opcode,"t%c%s",dmode?'d':'w',cnd);
-			imm(dp,in,0,2,0);
-		}
-		else
-			ill(dp,in);
-	}
-
-
-	static void cmpi(struct DisasmPara_PPC *dp,ppc_word in,int uimm)
-	{
-		char *oper = dp->operands;
-		int i = (int)PPCGETL(in);
-
-		if (i < 2) {
-			if (i)
-				dp->flags |= PPCF_64;
-			sprintf(dp->opcode,"%si",cmpname[uimm*2+i]);
-			if ((i = (int)PPCGETCRD(in))) {
-				sprintf(oper,"cr%c,",'0'+i);
-				dp->operands += 4;
-			}
-			imm(dp,in,uimm,2,0);
-			dp->operands = oper;
-		}
-		else
-			ill(dp,in);
-	}
-
-
-	static void addi(struct DisasmPara_PPC *dp,ppc_word in,const char *ext)
-	{
-		if ((in&0x08000000) && !PPCGETA(in)) {
-			sprintf(dp->opcode,"l%s",ext);  /* li, lis */
-			if (!strcmp(ext, "i"))
-				imm(dp,in,0,3,0);
-			else
-				imm(dp,in,1,3,1);
-		}
-		else {
-			sprintf(dp->opcode,"%s%s",(in&0x8000)?"sub":"add",ext);
-			if (in & 0x8000)
-				in = (in^0xffff) + 1;
-			imm(dp,in,1,0,0);
-		}
-	}
-
-
-	static int branch(struct DisasmPara_PPC *dp,ppc_word in, const char *bname,int aform,int bdisp)
-		/* build a branch instr. and return number of chars written to operand */
-	{
-		int bo = (int)PPCGETD(in);
-		int bi = (int)PPCGETA(in);
-		char y = (char)(bo & 1);
-		int opercnt = 0;
-		const 	char *ext = b_ext[aform*2+(int)(in&1)];
-
-		if (bdisp < 0)
-			y ^= 1;
-		y = y ? '+':'-';
-
-		if (bo & 4) {
-			/* standard case - no decrement */
-			if (bo & 16) {
-				/* branch always */
-				if (PPCGETIDX(in) != 16) {
-					sprintf(dp->opcode,"b%s%s",bname,ext);
-				}
-				else {
-					sprintf(dp->opcode,"bc%s",ext);
-					opercnt = sprintf(dp->operands,"%d, %d",bo,bi);
-				}
-			}
-			else {
-				/* branch conditional */
-				sprintf(dp->opcode,"b%s%s%s%c",b_condition[((bo&8)>>1)+(bi&3)],
-					bname,ext,y);
-				if (bi >= 4)
-					opercnt = sprintf(dp->operands,"cr%d",bi>>2);
-			}
-		}
-
-		else {
-			/* CTR is decremented and checked */
-			sprintf(dp->opcode,"bd%s%s%s%c",b_decr[bo>>1],bname,ext,y);
-			if (!(bo & 16))
-				opercnt = sprintf(dp->operands,"%d",bi);
-		}
-
-		return (opercnt);
-	}
-
-
-	static void bc(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		unsigned int d = (int)(in & 0xfffc);
-		int offs;
-		char *oper = dp->operands;
-
-		if (d & 0x8000) d |= 0xffff0000;
-
-		if ((offs = branch(dp,in,"",(in&2)?1:0,d))) {
-			oper += offs;
-			*oper++ = ',';
-		}
-		if (in & 2)  /* AA ? */
-			sprintf(dp->operands,"->0x%.8X",(unsigned int)d);
-		else
-			sprintf(oper,"->0x%.8X",(unsigned int)(*dp->iaddr) + d);
-		dp->type = PPCINSTR_BRANCH;
-		dp->displacement = (ppc_word)d;
-	}
-
-
-	static void bli(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		unsigned int d = (unsigned int)(in & 0x3fffffc);
-
-		if (d & 0x02000000) d |= 0xfc000000;
-
-		sprintf(dp->opcode,"b%s",b_ext[in&3]);
-		if (in & 2)  /* AA ? */
-			sprintf(dp->operands,"->0x%.8X",(unsigned int)d);
-		else
-			sprintf(dp->operands,"->0x%.8X",(unsigned int)(*dp->iaddr) + d);
-		dp->type = PPCINSTR_BRANCH;
-		dp->displacement = (ppc_word)d;
-	}
-
-
-	static void mcrf(struct DisasmPara_PPC *dp,ppc_word in,char c)
-	{
-		if (!(in & 0x0063f801)) {
-			sprintf(dp->opcode,"mcrf%c",c);
-			sprintf(dp->operands,"cr%d, cr%d",(int)PPCGETCRD(in),(int)PPCGETCRA(in));
-		}
-		else
-			ill(dp,in);
-	}
-
-
-	static void crop(struct DisasmPara_PPC *dp,ppc_word in,const char *n1,const char *n2)
-	{
-		int crd = (int)PPCGETD(in);
-		int cra = (int)PPCGETA(in);
-		int crb = (int)PPCGETB(in);
-
-		if (!(in & 1)) {
-			sprintf(dp->opcode,"cr%s",(cra==crb && n2)?n2:n1);
-			if (cra == crb && n2)
-				sprintf(dp->operands,"%d, %d",crd,cra);
-			else
-				sprintf(dp->operands,"%d, %d, %d",crd,cra,crb);
-		}
-		else
-			ill(dp,in);
-	}
-
-
-	static void nooper(struct DisasmPara_PPC *dp,ppc_word in,const char *name,
-		unsigned char dmode)
-	{
-		if (in & (PPCDMASK|PPCAMASK|PPCBMASK|1)) {
-			ill(dp,in);
-		}
-		else {
-			dp->flags |= dmode;
-			strcpy(dp->opcode,name);
-		}
-	}
-
-
-	static unsigned int Helper_Rotate_Mask(int r, int mb, int me)
-	{
-		//first make 001111111111111 part
-		unsigned int begin = 0xFFFFFFFF >> mb;
-		//then make 000000000001111 part, which is used to flip the bits of the first one
-		unsigned int end = me < 31 ? (0xFFFFFFFF >> (me + 1)) : 0;
-		//do the bitflip
-		unsigned int mask = begin ^ end;
-		//and invert if backwards
-		if (me < mb) 
-			mask = ~mask;
-		//rotate the mask so it can be applied to source reg
-		//return _rotl(mask, 32 - r);
-		return (mask << (32 - r)) | (mask >> r);
-	}
-
-
-	static void rlw(struct DisasmPara_PPC *dp,ppc_word in,const char *name,int i)
-	{
-		int s = (int)PPCGETD(in);
-		int a = (int)PPCGETA(in);
-		int bsh = (int)PPCGETB(in);
-		int mb = (int)PPCGETC(in);
-		int me = (int)PPCGETM(in);
-		sprintf(dp->opcode,"rlw%s%c",name,in&1?'.':'\0');
-		sprintf(dp->operands,"%s, %s, %s%d, %d, %d (%08x)",regnames[a],regnames[s],regsel[i],bsh,mb,me,Helper_Rotate_Mask(bsh, mb, me));
-	}
-
-
-	static void ori(struct DisasmPara_PPC *dp,ppc_word in,const char *name)
-	{
-		strcpy(dp->opcode,name);
-		imm(dp,in,1,1,1);
-	}
-
-
-	static void rld(struct DisasmPara_PPC *dp,ppc_word in,const char *name,int i)
-	{
-		int s = (int)PPCGETD(in);
-		int a = (int)PPCGETA(in);
-		int bsh = i ? (int)PPCGETB(in) : (int)(((in&2)<<4)+PPCGETB(in));
-		int m = (int)(in&0x7e0)>>5;
-
-		dp->flags |= PPCF_64;
-		sprintf(dp->opcode,"rld%s%c",name,in&1?'.':'\0');
-		sprintf(dp->operands,"%s, %s, %s%d, %d",regnames[a],regnames[s],regsel[i],bsh,m);
-	}
-
-
-	static void cmp(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		char *oper = dp->operands;
-		int i = (int)PPCGETL(in);
-
-		if (i < 2) {
-			if (i)
-				dp->flags |= PPCF_64;
-			strcpy(dp->opcode,cmpname[((in&PPCIDX2MASK)?2:0)+i]);
-			if ((i = (int)PPCGETCRD(in)))
-				oper += sprintf(oper,"cr%c,",'0'+i);
-			ra_rb(oper,in);
-		}
-		else
-			ill(dp,in);
-	}
-
-
-	static void trap(struct DisasmPara_PPC *dp,ppc_word in,unsigned char dmode)
-	{
-		const char *cnd;
-		int to = (int)PPCGETD(in);
-
-		if ((cnd = trap_condition[to])) {
-			dp->flags |= dmode;
-			sprintf(dp->opcode,"t%c%s",dmode?'d':'w',cnd);
-			ra_rb(dp->operands,in);
-		}
-		else {
-			if (to == 31) {
-				if (dmode) {
-					dp->flags |= dmode;
-					strcpy(dp->opcode,"td");
-					strcpy(dp->operands,"31,0,0");
-				}
-				else
-					strcpy(dp->opcode,"trap");
-			}
-			else
-				ill(dp,in);
-		}
-	}
-
-
-	static void dab(struct DisasmPara_PPC *dp,ppc_word in,const char *name,int mask,
-		int smode,int chkoe,int chkrc,unsigned char dmode)
-		/* standard instruction: xxxx rD,rA,rB */
-	{
-		if (chkrc>=0 && ((in&1)!=(unsigned)chkrc)) {
-			ill(dp,in);
-		}
-		else {
-			dp->flags |= dmode;
-			if (smode)
-				in = swapda(in);  /* rA,rS,rB */
-			sprintf(dp->opcode,"%s%s%s",name,
-				oesel[chkoe&&(in&PPCOE)],rcsel[(chkrc<0)&&(in&1)]);
-			rd_ra_rb(dp->operands,in,mask);
-		}
-	}
-
-
-	static void rrn(struct DisasmPara_PPC *dp,ppc_word in,const char *name,
-		int smode,int chkoe,int chkrc,unsigned char dmode)
-		/* Last operand is no register: xxxx rD,rA,NB */
-	{
-		char *s;
-
-		if (chkrc>=0 && ((in&1)!=(unsigned)chkrc)) {
-			ill(dp,in);
-		}
-		else {
-			dp->flags |= dmode;
-			if (smode)
-				in = swapda(in);  /* rA,rS,NB */
-			sprintf(dp->opcode,"%s%s%s",name,
-				oesel[chkoe&&(in&PPCOE)],rcsel[(chkrc<0)&&(in&1)]);
-			s = rd_ra_rb(dp->operands,in,6);
-			sprintf(s,",%d",(int)PPCGETB(in));
-		}
-	}
-
-
-	static void mtcr(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		int s = (int)PPCGETD(in);
-		int crm = (int)(in&0x000ff000)>>12;
-		char *oper = dp->operands;
-
-		if (in & 0x00100801) {
-			ill(dp,in);
-		}
-		else {
-			sprintf(dp->opcode,"mtcr%c",crm==0xff?'\0':'f');
-			if (crm != 0xff)
-				oper += sprintf(oper,"0x%02x,",crm);
-			sprintf(oper,"%s",regnames[s]);
-		}
-	}
-
-
-	static void msr(struct DisasmPara_PPC *dp,ppc_word in,int smode)
-	{
-		int s = (int)PPCGETD(in);
-		int sr = (int)(in&0x000f0000)>>16;
-
-		if (in & 0x0010f801) {
-			ill(dp,in);
-		}
-		else {
-			dp->flags |= PPCF_SUPER;
-			sprintf(dp->opcode,"m%csr",smode?'t':'f');
-			if (smode)
-				sprintf(dp->operands,"%d, %s",sr,regnames[s]);
-			else
-				sprintf(dp->operands,"%s, %d",regnames[s],sr);
-		}
-	}
-
-
-	static void mspr(struct DisasmPara_PPC *dp,ppc_word in,int smode)
-	{
-		int d = (int)PPCGETD(in);
-		int spr = (int)((PPCGETB(in)<<5)+PPCGETA(in));
-		int fmt = 0;
-		const char *x;
-
-		if (in & 1) {
-			ill(dp,in);
-		}
-
-		else {
-			if (spr!=1 && spr!=8 && spr!=9)
-				dp->flags |= PPCF_SUPER;
-			switch (spr) {
-			case 1:
-				x = "xer";
-				break;
-			case 8:
-				x = "lr";
-				break;
-			case 9:
-				x = "ctr";
-				break;
-			default:
-				x = "spr";
-				fmt = 1;
-				break;
-			}
-
-			sprintf(dp->opcode,"m%c%s",smode?'t':'f',x);
-			if (fmt) {
-				if (smode)
-					sprintf(dp->operands,"%s, %s",spr_name(spr),regnames[d]);
-				else
-					sprintf(dp->operands,"%s, %s",regnames[d],spr_name(spr));
-			}
-			else
-				sprintf(dp->operands,"%s",regnames[d]);
-		}
-	}
-
-
-	static void mtb(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		int d = (int)PPCGETD(in);
-		int tbr = (int)((PPCGETB(in)<<5)+PPCGETA(in));
-		char *s = dp->operands;
-		char x;
-
-		if (in & 1) {
-			ill(dp,in);
-		}
-
-		else {
-			s += sprintf(s,"%s",regnames[d]);
-			switch (tbr) {
-	case 268:
-		x = 'l';
-		break;
-	case 269:
-		x = 'u';
-		break;
-	default:
-		x = '\0';
-		dp->flags |= PPCF_SUPER;
-		sprintf(s,",%d",tbr);
-		break;
-			}
-			sprintf(dp->opcode,"mftb%c",x);
-		}
-	}
-
-
-	static void sradi(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		int s = (int)PPCGETD(in);
-		int a = (int)PPCGETA(in);
-		int bsh = (int)(((in&2)<<4)+PPCGETB(in));
-
-		dp->flags |= PPCF_64;
-		sprintf(dp->opcode,"sradi%c",in&1?'.':'\0');
-		sprintf(dp->operands,"%s, %s, %d",regnames[a],regnames[s],bsh);
-	}
-
-	static const char *ldst_offs(unsigned int val)
-	{
-		static char buf[8];
-
-		if (val == 0)
-		{
-			return "0";
-		}
-		else
-		{
-			if (val & 0x8000)
-			{
-				sprintf(buf, "-0x%.4X", ((~val) & 0xffff) + 1);
-			}
-			else
-			{
-				sprintf(buf, "0x%.4X", val);
-			}
-
-			return buf;
-		}
-	}
-
-	static void ldst(struct DisasmPara_PPC *dp,ppc_word in,const char *name,
-		char reg,unsigned char dmode)
-	{
-		int s = (int)PPCGETD(in);
-		int a = (int)PPCGETA(in);
-		int d = (ppc_word)(in & 0xffff);
-
-		dp->type = PPCINSTR_LDST;
-		dp->flags |= dmode;
-		dp->sreg = (short)a;
-		//  if (d >= 0x8000)
-		//    d -= 0x10000;
-		dp->displacement = (ppc_word)d;
-		strcpy(dp->opcode,name);
-		if (reg == 'r')
-		{
-			sprintf(dp->operands,"%s, %s (%s)", regnames[s], ldst_offs(d), regnames[a]);
-		}
-		else
-		{
-			sprintf(dp->operands,"%c%d, %s (%s)",reg,s, ldst_offs(d), regnames[a]);
-		}
-	}
-
-
-	static void fdabc(struct DisasmPara_PPC *dp,ppc_word in, const char *name,
-		int mask,unsigned char dmode)
-		/* standard floating point instruction: xxxx fD,fA,fC,fB */
-	{
-		static const char *fmt = "f%d,";
-		char *s = dp->operands;
-		int err = 0;
-
-		dp->flags |= dmode;
-		sprintf(dp->opcode,"f%s%s",name,rcsel[in&1]);
-		s += sprintf(s,fmt,(int)PPCGETD(in));
-		if (mask & 4)
-			s += sprintf(s,fmt,(int)PPCGETA(in));
-		else
-			err |= (int)PPCGETA(in);
-		if (mask & 2)
-			s += sprintf(s,fmt,(int)PPCGETC(in));
-		else if (PPCGETC(in))
-			err |= (int)PPCGETC(in);
-		if (mask & 1)
-			s += sprintf(s,fmt,(int)PPCGETB(in));
-		else if (!(mask&8))
-			err |= (int)PPCGETB(in);
-		*(s-1) = '\0';
-		if (err)
-			ill(dp,in);
-	}
-
-	static void fmr(struct DisasmPara_PPC *dp,ppc_word in)
-	{
-		sprintf(dp->opcode, "fmr%s", rcsel[in&1]);
-		sprintf(dp->operands, "f%d, f%d", (int)PPCGETD(in), (int)PPCGETB(in));
-	}
-
-	static void fdab(struct DisasmPara_PPC *dp,ppc_word in,const char *name,int mask)
-		/* indexed float instruction: xxxx fD,rA,rB */
-	{
-		strcpy(dp->opcode,name);
-		fd_ra_rb(dp->operands,in,mask);
-	}
-
-
-	static void fcmp(struct DisasmPara_PPC *dp,ppc_word in,char c)
-	{
-		if (in & 0x00600001) {
-			ill(dp,in);
-		}
-		else {
-			sprintf(dp->opcode,"fcmp%c",c);
-			sprintf(dp->operands,"cr%d,f%d,f%d",(int)PPCGETCRD(in),
-				(int)PPCGETA(in),(int)PPCGETB(in));
-		}
-	}
-
-
-	static void mtfsb(struct DisasmPara_PPC *dp,ppc_word in,int n)
-	{
-		if (in & (PPCAMASK|PPCBMASK)) {
-			ill(dp,in);
-		}
-		else {
-			sprintf(dp->opcode,"mtfsb%d%s",n,rcsel[in&1]);
-			sprintf(dp->operands,"%d",(int)PPCGETD(in));
-		}
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////////////
-	//PAIRED
-	//////////////////////////////////////////////////////////////////////////////////
-
-	/*
-	sprintf(buf, "psq_lx", FD);
-	sprintf(buf, "psq_stx", FD);
-	sprintf(buf, "psq_lux", FD);
-	sprintf(buf, "psq_stux", FD);
-	*/
-#define RA ((inst >> 16) & 0x1f)
-#define RB ((inst >> 11) & 0x1f)
-#define RC ((inst >> 6) & 0x1f)
-#define RD ((inst >> 21) & 0x1f)
-#define RS ((inst >> 21) & 0x1f)
-#define FA ((inst >> 16) & 0x1f)
-#define FB ((inst >> 11) & 0x1f)
-#define FC ((inst >> 6) & 0x1f)
-#define FD ((inst >> 21) & 0x1f)
-#define FS ((inst >> 21) & 0x1f)
-#define IMM (inst & 0xffff)
-#define UIMM (inst & 0xffff)
-#define OFS (inst & 0xffff)
-#define OPCD ((inst >> 26) & 0x3f)
-#define XO_10 ((inst >> 1) & 0x3ff)
-#define XO_9 ((inst >> 1) & 0x1ff)
-#define XO_5 ((inst >> 1) & 0x1f)
-#define Rc (inst & 1)
-#define SH ((inst >> 11) & 0x1f)
-#define MB ((inst >> 6) & 0x1f)
-#define ME ((inst >> 1) & 0x1f)
-#define OE ((inst >> 10) & 1)
-#define TO ((inst >> 21) & 0x1f)
-#define CRFD ((inst >> 23) & 0x7)
-#define CRFS ((inst >> 18) & 0x7)
-#define CRBD ((inst >> 21) & 0x1f)
-#define CRBA ((inst >> 16) & 0x1f)
-#define CRBB ((inst >> 11) & 0x1f)
-#define L ((inst >> 21) & 1)
-#define NB ((inst >> 11) & 0x1f)
-#define AA ((inst >> 1) & 1)
-#define LK (inst & 1)
-#define LI ((inst >> 2) & 0xffffff)
-#define BO ((inst >> 21) & 0x1f)
-#define BI ((inst >> 16) & 0x1f)
-#define BD ((inst >> 2) & 0x3fff)
-
-#define MTFSFI_IMM ((inst >> 12) & 0xf)
-#define FM ((inst >> 17) & 0xff)
-#define SR ((inst >> 16) & 0xf)
-#define SPR ((inst >> 11) & 0x3ff)
-#define TBR ((inst >> 11) & 0x3ff)
-#define CRM ((inst >> 12) & 0xff)
-
-	inline int SEX12(unsigned int x)
-	{
-		return x & 0x800 ? (x|0xFFFFF000) : x;
-	} 
-
-	static void ps(struct DisasmPara_PPC *dp,ppc_word inst)
-	{
-		char *op = dp->opcode;
-		char *pr = dp->operands;
-		switch ((inst>>1)&0x1F) 
-		{
-		case 6:
-			strcpy(op, "ps_lux");
-			sprintf(pr, "p%u, (r%u + r%u)", FD, RA, RB);
-			return;
-
-		case 18:
-			strcpy(op, "ps_div");
-			sprintf(pr, "p%u, p%u/p%u", FD, FA, FB);
-			return;
-		case 20:
-			strcpy(op, "ps_sub");
-			sprintf(pr, "p%u, p%u-p%u", FD, FA, FB);
-			return;
-		case 21:
-			strcpy(op, "ps_add");
-			sprintf(pr, "p%u, p%u+p%u", FD, FA, FB);
-			return;
-		case 23:
-			strcpy(op, "ps_sel");
-			sprintf(pr, "p%u>=0?p%u:p%u", FD, FA, FC);
-			return;
-		case 24:
-			strcpy(op, "ps_res");
-			sprintf(pr, "p%u, (1/p%u)", FD, FB);
-			return;
-
-		case 25:
-			strcpy(op, "ps_mul");
-			sprintf(pr, "p%u, p%u*p%u", FD, FA, FC);
-			return;
-
-		case 26: //rsqrte
-			strcpy(op, "ps_rsqrte");
-			sprintf(pr, "p%u, p%u", FD, FB);
-			return;
-		case 28: //msub
-			strcpy(op, "ps_msub");
-			sprintf(pr, "p%u, p%u*p%u-p%u", FD, FA, FC, FB);
-			return;
-		case 29: //madd
-			strcpy(op, "ps_madd");
-			sprintf(pr, "p%u, p%u*p%u+p%u", FD, FA, FC, FB);
-			return;
-		case 30: //nmsub
-			strcpy(op, "ps_nmsub");
-			sprintf(pr, "p%u, -(p%u*p%u-p%u)", FD, FA, FC, FB);
-			return;
-		case 31: //nmadd
-			strcpy(op, "ps_nmadd");
-			sprintf(pr, "p%u, -(p%u*p%u+p%u)", FD, FA, FC, FB);
-			return;
-		case 10:
-			strcpy(op, "ps_sum0");
-			sprintf(pr, "p%u, 0=p%u+p%u, 1=p%u", FD, FA, FB, FC);
-			return;
-		case 11:
-			strcpy(op, "ps_sum1");
-			sprintf(pr, "p%u, 0=p%u, 1=p%u+p%u", FD, FC, FA, FB);
-			return;
-		case 12:
-			strcpy(op, "ps_muls0");
-			sprintf(pr, "p%u, p%u*p%u[0]", FD, FA, FC);
-			return;
-		case 13:
-			strcpy(op, "ps_muls1");
-			sprintf(pr, "p%u, p%u*p%u[1]", FD, FA, FC);
-			return;
-		case 14:
-			strcpy(op, "ps_madds0");
-			sprintf(pr, "p%u, p%u*p%u[0]+p%u", FD, FA, FC, FB);
-			return;
-		case 15:
-			strcpy(op, "ps_madds1");
-			sprintf(pr, "p%u, p%u*p%u[1]+p%u", FD, FA, FC, FB);
-			return;
-		}
-
-		switch ((inst>>1)&0x3FF) 
-		{
-			//10-bit suckers  (?)
-		case 40: //nmadd
-			strcpy(op, "ps_neg");
-			sprintf(pr, "p%u, -p%u", FD, FB);
-			return;
-		case 72: //nmadd
-			strcpy(op, "ps_mr");
-			sprintf(pr, "p%u, p%u", FD, FB);
-			return;
-		case 136:
-			strcpy(op, "ps_nabs");
-			sprintf(pr, "p%u, -|p%u|", FD, FB);
-			return;
-		case 264:
-			strcpy(op, "ps_abs");
-			sprintf(pr, "p%u, |p%u|", FD, FB);
-			return;
-		case 0:
-			strcpy(op, "ps_cmpu0");
-			sprintf(pr, "ps_cmpu0");
-			return;
-		case 32:
-			strcpy(op,"ps_cmpq0");
-			sprintf(pr, "ps_cmpo0");
-			return;
-		case 64:
-			strcpy(op,"ps_cmpu1");
-			sprintf(pr, "ps_cmpu1");
-			return;
-		case 96:
-			strcpy(op,"ps_cmpo1");
-			sprintf(pr, "ps_cmpo1");
-			return;
-		case 528:
-			strcpy(op,"ps_merge00");
-			sprintf(pr, "p%u, p%u[0],p%u[0]", FD, FA, FB);
-			return;
-		case 560:
-			strcpy(op,"ps_merge01");
-			sprintf(pr, "p%u, p%u[0],p%u[1]", FD, FA, FB);
-			return;
-		case 592:
-			strcpy(op,"ps_merge10");
-			sprintf(pr, "p%u, p%u[1],p%u[0]", FD, FA, FB);
-			return;
-		case 624:
-			strcpy(op,"ps_merge11");
-			sprintf(pr, "p%u, p%u[1],p%u[1]", FD, FA, FB);
-			return;
-		case 1014:
-			strcpy(op,"dcbz_l");
-			*pr = '\0';
-			return;
-		}
-
-		//	default:
-		sprintf(op, "ps_%i",((inst>>1)&0x1f));
-		strcpy(pr,"---");
-		return;
-	}
-
-	static void ps_mem(struct DisasmPara_PPC *dp,ppc_word inst)
-	{
-		char *op = dp->opcode;
-		char *pr = dp->operands;
-		switch (PPCGETIDX(inst)) 
-		{
-		case 56:
-			strcpy(op,"psq_l");
-			sprintf(pr, "p%u, %i(r%u)", RS, SEX12(inst&0xFFF), RA);
-			break;
-		case 57:
-			strcpy(op,"psq_lu");
-			*pr = '\0';
-			break;
-		case 60:
-			strcpy(op,"psq_st");
-			sprintf(pr, "%i(r%u), p%u", SEX12(inst&0xFFF), RA, RS);
-			break;
-		case 61:
-			strcpy(op,"psq_stu");
-			sprintf(pr, "r%u, p%u ?", RA, RS);
-			break;
-		}
-	}
-
-
-	ppc_word *PPC_Disassemble(struct DisasmPara_PPC *dp)
-		/* Disassemble PPC instruction and return a pointer to the next */
-		/* instruction, or NULL if an error occured. */
-	{
-		ppc_word in = *(dp->instr);
-		if (!dp->opcode || !dp->operands)
-			return NULL;  /* no buffers */
-
-	#if LITTLEENDIAN
-		in = (in & 0xff)<<24 | (in & 0xff00)<<8 | (in & 0xff0000)>>8 |
-			(in & 0xff000000)>>24;
-	#endif
-		dp->type = PPCINSTR_OTHER;
-		dp->flags = 0;
-		*(dp->operands) = 0;
-
-		switch (PPCGETIDX(in)) 
-		{
-		case 0:
-			{
-				int block = in & 0x3FFFFFF;
-				if (block) {
-					sprintf(dp->opcode, "JITblock");
-					sprintf(dp->operands, "%i", block);
-				} else {
-					strcpy(dp->opcode, "");
-					strcpy(dp->operands, "---");
-				}
-			}
-			break;
-		case 1:
-			sprintf(dp->opcode,"HLE");
-			//HLE call
-			break;
-		case 2:
-			trapi(dp,in,PPCF_64);  /* tdi */
-			break;
-
-		case 3:
-			trapi(dp,in,0);  /* twi */
-			break;
-		case 4:
-			ps(dp,in);
-			break;
-		case 56:
-		case 57:
-		case 60:
-		case 61:
-			ps_mem(dp,in);
-			break;
-
-
-		case 7: 
-			strcpy(dp->opcode,"mulli");
-			imm(dp,in,0,0,0);
-			break;
-
-		case 8:
-			strcpy(dp->opcode,"subfic");
-			imm(dp,in,0,0,0);
-			break;
-
-		case 10:
-			cmpi(dp,in,1);  /* cmpli */
-			break;
-
-		case 11:
-			cmpi(dp,in,0);  /* cmpi */
-			break;
-
-		case 12:
-			addi(dp,in,"ic");  /* addic */
-			break;
-
-		case 13:
-			addi(dp,in,"ic.");  /* addic. */
-			break;
-
-		case 14:
-			addi(dp,in,"i");  /* addi */
-			break;
-
-		case 15:
-			addi(dp,in,"is");  /* addis */
-			break;
-
-		case 16:
-			bc(dp,in);
-			break;
-
-		case 17:
-			if ((in & ~PPCIDXMASK) == 2)
-				strcpy(dp->opcode,"sc");
-			else
-				ill(dp,in);
-			break;
-
-		case 18:
-			bli(dp,in);
-			break;
-
-		case 19:
-			switch (PPCGETIDX2(in)) {
-			case 0:
-				mcrf(dp,in,'\0');  /* mcrf */
-				break;
-
-			case 16:
-				branch(dp,in,"lr",0,0);  /* bclr */
-				break;
-
-			case 33:
-				crop(dp,in,"nor","not");  /* crnor */
-				break;
-
-			case 50:
-				nooper(dp,in,"rfi",PPCF_SUPER);
-				break;
-
-			case 129:
-				crop(dp,in,"andc",NULL);  /* crandc */
-				break;
-
-			case 150:
-				nooper(dp,in,"isync",0);
-				break;
-
-			case 193:
-				crop(dp,in,"xor","clr");  /* crxor */
-				break;
-
-			case 225:
-				crop(dp,in,"nand",NULL);  /* crnand */
-				break;
-
-			case 257:
-				crop(dp,in,"and",NULL);  /* crand */
-				break;
-
-			case 289:
-				crop(dp,in,"eqv","set");  /* creqv */
-				break;
-
-			case 417:
-				crop(dp,in,"orc",NULL);  /* crorc */
-				break;
-
-			case 449:
-				crop(dp,in,"or","move");  /* cror */
-				break;
-
-			case 528:
-				branch(dp,in,"ctr",0,0);  /* bcctr */
-				break;
-
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 20:
-			rlw(dp,in,"imi",0);  /* rlwimi */
-			break;
-
-		case 21:
-			rlw(dp,in,"inm",0);  /* rlwinm */
-			break;
-
-		case 23:
-			rlw(dp,in,"nm",1);  /* rlwnm */
-			break;
-
-		case 24:
-			if (in & ~PPCIDXMASK)
-				ori(dp,in,"ori");
-			else
-				strcpy(dp->opcode,"nop");
-			break;
-
-		case 25:
-			ori(dp,in,"oris");
-			break;
-
-		case 26:
-			ori(dp,in,"xori");
-			break;
-
-		case 27:
-			ori(dp,in,"xoris");
-			break;
-
-		case 28:
-			ori(dp,in,"andi.");
-			break;
-
-		case 29:
-			ori(dp,in,"andis.");
-			break;
-
-		case 30:
-			switch (in & 0x1c) {
-			case 0:
-				rld(dp,in,"icl",0);  /* rldicl */
-				break;
-			case 1:
-				rld(dp,in,"icr",0);  /* rldicr */
-				break;
-			case 2:
-				rld(dp,in,"ic",0);   /* rldic */
-				break;
-			case 3:
-				rld(dp,in,"imi",0);  /* rldimi */
-				break;
-			case 4:
-				rld(dp,in,in&2?"cl":"cr",1);  /* rldcl, rldcr */
-				break;
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 31:
-			switch (PPCGETIDX2(in)) {
-			case 0:
-			case 32:
-				if (in & 1)
-					ill(dp,in);
-				else
-					cmp(dp,in);  /* cmp, cmpl */
-				break;
-
-			case 4:
-				if (in & 1)
-					ill(dp,in);
-				else
-					trap(dp,in,0);  /* tw */
-				break;
-
-			case 8:
-			case (PPCOE>>1)+8:
-				dab(dp,swapab(in),"subc",7,0,1,-1,0);
-				break;
-
-			case 9:
-				dab(dp,in,"mulhdu",7,0,0,-1,PPCF_64);
-				break;
-
-			case 10:
-			case (PPCOE>>1)+10:
-				dab(dp,in,"addc",7,0,1,-1,0);
-				break;
-
-			case 11:
-				dab(dp,in,"mulhwu",7,0,0,-1,0);
-				break;
-
-			case 19:
-				if (in & (PPCAMASK|PPCBMASK))
-					ill(dp,in);
-				else
-					dab(dp,in,"mfcr",4,0,0,0,0);
-				break;
-
-			case 20:
-				dab(dp,in,"lwarx",7,0,0,0,0);
-				break;
-
-			case 21:
-				dab(dp,in,"ldx",7,0,0,0,PPCF_64);
-				break;
-
-			case 23:
-				dab(dp,in,"lwzx",7,0,0,0,0);
-				break;
-
-			case 24:
-				dab(dp,in,"slw",7,1,0,-1,0);
-				break;
-
-			case 26:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"cntlzw",6,1,0,-1,0);
-				break;
-
-			case 27:
-				dab(dp,in,"sld",7,1,0,-1,PPCF_64);
-				break;
-
-			case 28:
-				dab(dp,in,"and",7,1,0,-1,0);
-				break;
-
-			case 40:
-			case (PPCOE>>1)+40:
-				dab(dp,swapab(in),"sub",7,0,1,-1,0);
-				break;
-
-			case 53:
-				dab(dp,in,"ldux",7,0,0,0,PPCF_64);
-				break;
-
-			case 54:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbst",3,0,0,0,0);
-				break;
-
-			case 55:
-				dab(dp,in,"lwzux",7,0,0,0,0);
-				break;
-
-			case 58:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"cntlzd",6,1,0,-1,PPCF_64);
-				break;
-
-			case 60:
-				dab(dp,in,"andc",7,1,0,-1,0);
-				break;
-
-			case 68:
-				trap(dp,in,PPCF_64);  /* td */
-				break;
-
-			case 73:
-				dab(dp,in,"mulhd",7,0,0,-1,PPCF_64);
-				break;
-
-			case 75:
-				dab(dp,in,"mulhw",7,0,0,-1,0);
-				break;
-
-			case 83:
-				if (in & (PPCAMASK|PPCBMASK))
-					ill(dp,in);
-				else
-					dab(dp,in,"mfmsr",4,0,0,0,PPCF_SUPER);
-				break;
-
-			case 84:
-				dab(dp,in,"ldarx",7,0,0,0,PPCF_64);
-				break;
-
-			case 86:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbf",3,0,0,0,0);
-				break;
-
-			case 87:
-				dab(dp,in,"lbzx",7,0,0,0,0);
-				break;
-
-			case 104:
-			case (PPCOE>>1)+104:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"neg",6,0,1,-1,0);
-				break;
-
-			case 119:
-				dab(dp,in,"lbzux",7,0,0,0,0);
-				break;
-
-			case 124:
-				if (PPCGETD(in) == PPCGETB(in))
-					dab(dp,in,"not",6,1,0,-1,0);
-				else
-					dab(dp,in,"nor",7,1,0,-1,0);
-				break;
-
-			case 136:
-			case (PPCOE>>1)+136:
-				dab(dp,in,"subfe",7,0,1,-1,0);
-				break;
-
-			case 138:
-			case (PPCOE>>1)+138:
-				dab(dp,in,"adde",7,0,1,-1,0);
-				break;
-
-			case 144:
-				mtcr(dp,in);
-				break;
-
-			case 146:
-				if (in & (PPCAMASK|PPCBMASK))
-					ill(dp,in);
-				else
-					dab(dp,in,"mtmsr",4,0,0,0,PPCF_SUPER);
-				break;
-
-			case 149:
-				dab(dp,in,"stdx",7,0,0,0,PPCF_64);
-				break;
-
-			case 150:
-				dab(dp,in,"stwcx.",7,0,0,1,0);
-				break;
-
-			case 151:
-				dab(dp,in,"stwx",7,0,0,0,0);
-				break;
-
-			case 181:
-				dab(dp,in,"stdux",7,0,0,0,PPCF_64);
-				break;
-
-			case 183:
-				dab(dp,in,"stwux",7,0,0,0,0);
-				break;
-
-			case 200:
-			case (PPCOE>>1)+200:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"subfze",6,0,1,-1,0);
-				break;
-
-			case 202:
-			case (PPCOE>>1)+202:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"addze",6,0,1,-1,0);
-				break;
-
-			case 210:
-				msr(dp,in,1);  /* mfsr */
-				break;
-
-			case 214:
-				dab(dp,in,"stdcx.",7,0,0,1,PPCF_64);
-				break;
-
-			case 215:
-				dab(dp,in,"stbx",7,0,0,0,0);
-				break;
-
-			case 232:
-			case (PPCOE>>1)+232:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"subfme",6,0,1,-1,0);
-				break;
-
-			case 233:
-			case (PPCOE>>1)+233:
-				dab(dp,in,"mulld",7,0,1,-1,PPCF_64);
-				break;
-
-			case 234:
-			case (PPCOE>>1)+234:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"addme",6,0,1,-1,0);
-				break;
-
-			case 235:
-			case (PPCOE>>1)+235:
-				dab(dp,in,"mullw",7,0,1,-1,0);
-				break;
-
-			case 242:
-				if (in & PPCAMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"mtsrin",5,0,0,0,PPCF_SUPER);
-				break;
-
-			case 246:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbtst",3,0,0,0,0);
-				break;
-
-			case 247:
-				dab(dp,in,"stbux",7,0,0,0,0);
-				break;
-
-			case 266:
-			case (PPCOE>>1)+266:
-				dab(dp,in,"add",7,0,1,-1,0);
-				break;
-
-			case 278:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbt",3,0,0,0,0);
-				break;
-
-			case 279:
-				dab(dp,in,"lhzx",7,0,0,0,0);
-				break;
-
-			case 284:
-				dab(dp,in,"eqv",7,1,0,-1,0);
-				break;
-
-			case 306:
-				if (in & (PPCDMASK|PPCAMASK))
-					ill(dp,in);
-				else
-					dab(dp,in,"tlbie",1,0,0,0,PPCF_SUPER);
-				break;
-
-			case 310:
-				dab(dp,in,"eciwx",7,0,0,0,0);
-				break;
-
-			case 311:
-				dab(dp,in,"lhzux",7,0,0,0,0);
-				break;
-
-			case 316:
-				dab(dp,in,"xor",7,1,0,-1,0);
-				break;
-
-			case 339:
-				mspr(dp,in,0);  /* mfspr */
-				break;
-
-			case 341:
-				dab(dp,in,"lwax",7,0,0,0,PPCF_64);
-				break;
-
-			case 343:
-				dab(dp,in,"lhax",7,0,0,0,0);
-				break;
-
-			case 370:
-				nooper(dp,in,"tlbia",PPCF_SUPER);
-				break;
-
-			case 371:
-				mtb(dp,in);  /* mftb */
-				break;
-
-			case 373:
-				dab(dp,in,"lwaux",7,0,0,0,PPCF_64);
-				break;
-
-			case 375:
-				dab(dp,in,"lhaux",7,0,0,0,0);
-				break;
-
-			case 407:
-				dab(dp,in,"sthx",7,0,0,0,0);
-				break;
-
-			case 412:
-				dab(dp,in,"orc",7,1,0,-1,0);
-				break;
-
-			case 413:
-				sradi(dp,in);  /* sradi */
-				break;
-
-			case 434:
-				if (in & (PPCDMASK|PPCAMASK))
-					ill(dp,in);
-				else
-					dab(dp,in,"slbie",1,0,0,0,PPCF_SUPER|PPCF_64);
-				break;
-
-			case 438:
-				dab(dp,in,"ecowx",7,0,0,0,0);
-				break;
-
-			case 439:
-				dab(dp,in,"sthux",7,0,0,0,0);
-				break;
-
-			case 444:
-				if (PPCGETD(in) == PPCGETB(in))
-					dab(dp,in,"mr",6,1,0,-1,0);
-				else
-					dab(dp,in,"or",7,1,0,-1,0);
-				break;
-
-			case 457:
-			case (PPCOE>>1)+457:
-				dab(dp,in,"divdu",7,0,1,-1,PPCF_64);
-				break;
-
-			case 459:
-			case (PPCOE>>1)+459:
-				dab(dp,in,"divwu",7,0,1,-1,0);
-				break;
-
-			case 467:
-				mspr(dp,in,1);  /* mtspr */
-				break;
-
-			case 470:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbi",3,0,0,0,0);
-				break;
-
-			case 476:
-				dab(dp,in,"nand",7,1,0,-1,0);
-				break;
-
-			case 489:
-			case (PPCOE>>1)+489:
-				dab(dp,in,"divd",7,0,1,-1,PPCF_64);
-				break;
-
-			case 491:
-			case (PPCOE>>1)+491:
-				dab(dp,in,"divw",7,0,1,-1,0);
-				break;
-
-			case 498:
-				nooper(dp,in,"slbia",PPCF_SUPER|PPCF_64);
-				break;
-
-			case 512:
-				if (in & 0x007ff801)
-					ill(dp,in);
-				else {
-					strcpy(dp->opcode,"mcrxr");
-					sprintf(dp->operands,"cr%d",(int)PPCGETCRD(in));
-				}
-				break;
-
-			case 533:
-				dab(dp,in,"lswx",7,0,0,0,0);
-				break;
-
-			case 534:
-				dab(dp,in,"lwbrx",7,0,0,0,0);
-				break;
-
-			case 535:
-				fdab(dp,in,"lfsx",7);
-				break;
-
-			case 536:
-				dab(dp,in,"srw",7,1,0,-1,0);
-				break;
-
-			case 539:
-				dab(dp,in,"srd",7,1,0,-1,PPCF_64);
-				break;
-
-			case 566:
-				nooper(dp,in,"tlbsync",PPCF_SUPER);
-				break;
-
-			case 567:
-				fdab(dp,in,"lfsux",7);
-				break;
-
-			case 595:
-				msr(dp,in,0);  /* mfsr */
-				break;
-
-			case 597:
-				rrn(dp,in,"lswi",0,0,0,0);
-				break;
-
-			case 598:
-				nooper(dp,in,"sync",PPCF_SUPER);
-				break;
-
-			case 599:
-				fdab(dp,in,"lfdx",7);
-				break;
-
-			case 631:
-				fdab(dp,in,"lfdux",7);
-				break;
-
-			case 659:
-				if (in & PPCAMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"mfsrin",5,0,0,0,PPCF_SUPER);
-				break;
-
-			case 661:
-				dab(dp,in,"stswx",7,0,0,0,0);
-				break;
-
-			case 662:
-				dab(dp,in,"stwbrx",7,0,0,0,0);
-				break;
-
-			case 663:
-				fdab(dp,in,"stfsx",7);
-				break;
-
-			case 695:
-				fdab(dp,in,"stfsux",7);
-				break;
-
-			case 725:
-				rrn(dp,in,"stswi",0,0,0,0);
-				break;
-
-			case 727:
-				fdab(dp,in,"stfdx",7);
-				break;
-
-			case 759:
-				fdab(dp,in,"stfdux",7);
-				break;
-
-			case 790:
-				dab(dp,in,"lhbrx",7,0,0,0,0);
-				break;
-
-			case 792:
-				dab(dp,in,"sraw",7,1,0,-1,0);
-				break;
-
-			case 794:
-				dab(dp,in,"srad",7,1,0,-1,PPCF_64);
-				break;
-
-			case 824:
-				rrn(dp,in,"srawi",1,0,-1,0);
-				break;
-
-			case 854:
-				nooper(dp,in,"eieio",PPCF_SUPER);
-				break;
-
-			case 918:
-				dab(dp,in,"sthbrx",7,0,0,0,0);
-				break;
-
-			case 922:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"extsh",6,1,0,-1,0);
-				break;
-
-			case 954:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"extsb",6,1,0,-1,0);
-				break;
-
-			case 982:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"icbi",3,0,0,0,0);
-				break;
-
-			case 983:
-				fdab(dp,in,"stfiwx",7);
-				break;
-
-			case 986:
-				if (in & PPCBMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"extsw",6,1,0,-1,PPCF_64);
-				break;
-
-			case 1014:
-				if (in & PPCDMASK)
-					ill(dp,in);
-				else
-					dab(dp,in,"dcbz",3,0,0,0,0);
-				break;
-
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 32:
-		case 33:
-		case 34:
-		case 35:
-		case 36:
-		case 37:
-		case 38:
-		case 39:
-		case 40:
-		case 41:
-		case 42:
-		case 43:
-		case 44:
-		case 45:
-		case 46:
-		case 47:
-			ldst(dp,in,ldstnames[PPCGETIDX(in)-32],'r',0);
-			break;
-
-		case 48:
-		case 49:
-		case 50:
-		case 51:
-		case 52:
-		case 53:
-		case 54:
-		case 55:
-			ldst(dp,in,ldstnames[PPCGETIDX(in)-32],'f',0);
-			break;
-
-		case 58:
-			switch (in & 3) {
-			case 0:
-				ldst(dp,in&~3,"ld",'r',PPCF_64);
-				break;
-			case 1:
-				ldst(dp,in&~3,"ldu",'r',PPCF_64);
-				break;
-			case 2:
-				ldst(dp,in&~3,"lwa",'r',PPCF_64);
-				break;
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 59:
-			switch (in & 0x3e) {
-			case 36:
-				fdabc(dp,in,"divs",5,0);
-				break;
-
-			case 40:
-				fdabc(dp,in,"subs",5,0);
-				break;
-
-			case 42:
-				fdabc(dp,in,"adds",5,0);
-				break;
-
-			case 44:
-				fdabc(dp,in,"sqrts",2,0);
-				break; 
-
-			case 48:
-				fdabc(dp,in,"res",2,0);
-				break;
-
-			case 50:
-				fdabc(dp,in,"muls",6,0);
-				break;
-
-			case 56:
-				fdabc(dp,in,"msubs",7,0);
-				break;
-
-			case 58:
-				fdabc(dp,in,"madds",7,0);
-				break;
-
-			case 60:
-				fdabc(dp,in,"nmsubs",7,0);
-				break;
-
-			case 62:
-				fdabc(dp,in,"nmadds",7,0);
-				break;
-
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 62:
-			switch (in & 3) {
-			case 0:
-				ldst(dp,in&~3,"std",'r',PPCF_64);
-				break;
-			case 1:
-				ldst(dp,in&~3,"stdu",'r',PPCF_64);
-				break;
-			default:
-				ill(dp,in);
-				break;
-			}
-			break;
-
-		case 63:
-			if (in & 32) {
-				switch (in & 0x1e) {
-				case 4:
-					fdabc(dp,in,"div",5,0);
-					break;
-
-				case 8:
-					fdabc(dp,in,"sub",5,0);
-					break;
-
-				case 10:
-					fdabc(dp,in,"add",5,0);
-					break;
-
-				case 12:
-					fdabc(dp,in,"sqrt",2,0);
-					break;
-
-				case 14:
-					fdabc(dp,in,"sel",7,0);
-					break;
-
-				case 18:
-					fdabc(dp,in,"mul",6,0);
-					break;
-
-				case 20:
-					fdabc(dp,in,"rsqrte",1,0);
-					break;
-
-				case 24:
-					fdabc(dp,in,"msub",7,0);
-					break;
-
-				case 26:
-					fdabc(dp,in,"madd",7,0);
-					break;
-
-				case 28:
-					fdabc(dp,in,"nmsub",7,0);
-					break;
-
-				case 30:
-					fdabc(dp,in,"nmadd",7,0);
-					break;
-
-				case 52:
-					sprintf(dp->opcode, "XXX dp 52");
-					break;
-
-				default:
-					ill(dp,in);
-					break;
-				}
-			}
-			else {
-				switch (PPCGETIDX2(in)) {
-				case 0:
-					fcmp(dp,in,'u');
-					break;
-
-				case 12:
-					fdabc(dp,in,"rsp",1,0);  // 10
-					break;
-
-				case 14:
-					fdabc(dp,in,"ctiw",1,0);  // 10
-					break;
-
-				case 15:
-					fdabc(dp,in,"ctiwz",1,0); // 10
-					break;
-
-				case 32:
-					fcmp(dp,in,'o');
-					break;
-
-				case 38:
-					mtfsb(dp,in,1);
-					break;
-
-				case 40:
-					fdabc(dp,in,"neg",10,0);
-					break;
-
-				case 64:
-					mcrf(dp,in,'s');  /* mcrfs */
-					break;
-
-				case 70:
-					mtfsb(dp,in,0);
-					break;
-
-				case 72:
-					fmr(dp,in);
-					break;
-
-				case 134:
-					if (!(in & 0x006f0800)) {
-						sprintf(dp->opcode,"mtfsfi%s",rcsel[in&1]);
-						sprintf(dp->operands,"cr%d,%d",(int)PPCGETCRD(in),
-							(int)(in & 0xf000)>>12);
-					}
-					else
-						ill(dp,in);
-					break;
-
-				case 136:
-					fdabc(dp,in,"nabs",10,0);
-					break;
-
-				case 264:
-					fdabc(dp,in,"abs",10,0);
-					break;
-
-				case 583:
-					if (in & (PPCAMASK|PPCBMASK))
-						ill(dp,in);
-					else
-						dab(dp,in,"mffs",4,0,0,-1,0);
-					break;
-
-				case 711:
-					if (!(in & 0x02010000)) {
-						sprintf(dp->opcode,"mtfsf%s",rcsel[in&1]);
-						sprintf(dp->operands,"0x%x,%d",
-							(unsigned)(in & 0x01fe)>>17,(int)PPCGETB(in));
-					}
-					else
-						ill(dp,in);
-					break;
-
-				case 814:
-					fdabc(dp,in,"fctid",10,PPCF_64);
-					break;
-
-				case 815:
-					fdabc(dp,in,"fctidz",10,PPCF_64);
-					break;
-
-				case 846:
-					fdabc(dp,in,"fcfid",10,PPCF_64);
-					break;
-
-				default:
-					ill(dp,in);
-					break;
-				}
-			}
-			break;
-
-		default:
-			ill(dp,in);
-			break;
-		}
-		return (dp->instr + 1);
-	}
-
-}  // namespace
-
-// What were MS thinking?
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
-// simplified interface
-void DisassembleGekko(unsigned int opcode, unsigned int curInstAddr, char *dest, int max_size)
-{
-	char opcodeStr[64], operandStr[64];
-	PPCDisasm::DisasmPara_PPC dp;
-	unsigned int opc, adr;
-
-	opc = opcode;
-	adr = curInstAddr;
-
-	dp.opcode = opcodeStr;
-	dp.operands = operandStr;
-	dp.instr = (PPCDisasm::ppc_word *)&opc;
-	dp.iaddr = (PPCDisasm::ppc_word *)&adr;
-
-	PPCDisasm::PPC_Disassemble(&dp);
-
-	snprintf(dest, max_size, "%s\t%s", opcodeStr, operandStr);
-}
-
-
-static const char *gprnames[] = 
-{
-    " r0", " r1", " r2", " r3", " r4", " r5", " r6", " r7",
-    " r8", " r9", "r10", "r11", "r12", "r13", "r14", "r15",
-    "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-    "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"
-};
-
-const char *GetGPRName(unsigned int index)
-{
-    if (index < 32)
-        return gprnames[index];
-    return 0;
-}
-
-
-static const char *fprnames[] = 
-{
-    " f0", " f1", " f2", " f3", " f4", " f5", " f6", " f7",
-    " f8", " f9", "f10", "f11", "f12", "f13", "f14", "f15",
-    "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
-    "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31"
-};
-
-const char *GetFPRName(unsigned int index)
-{
-    if (index < 32)
-        return fprnames[index];
-    return 0;
-}
diff --git a/Externals/Bochs_disasm/PowerPCDisasm.h b/Externals/Bochs_disasm/PowerPCDisasm.h
deleted file mode 100644
index 539f171079..0000000000
--- a/Externals/Bochs_disasm/PowerPCDisasm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $VER: ppc_disasm V0.1 (23.05.1998)
- *
- * Disassembler module for the PowerPC microprocessor family
- * Copyright (c) 1998-2000  Frank Wille
- *
- * ppc_disasm.c is freeware and may be freely redistributed as long as
- * no modifications are made and nothing is charged for it.
- * Non-commercial usage is allowed without any restrictions.
- * EVERY PRODUCT OR PROGRAM DERIVED DIRECTLY FROM MY SOURCE MAY NOT BE
- * SOLD COMMERCIALLY WITHOUT PERMISSION FROM THE AUTHOR.
- *
- *
- * v0.1  (23.05.1998) phx
- *       First version, which implements all PowerPC instructions.
- * v0.0  (09.05.1998) phx
- *       File created.
- */
-
-
-// Yeah, this does not really belong in bochs_disasm, but hey, it's a disasm and it needed a common location...
-
-#ifndef _POWERPC_DISASM
-#define _POWERPC_DISASM
-
-void DisassembleGekko(unsigned int opcode, unsigned int curInstAddr, char *dest, int max_size);
-const char *GetGRPName(unsigned int index);
-
-#endif
diff --git a/Externals/Bochs_disasm/config.h b/Externals/Bochs_disasm/config.h
index abfc45cc6e..9329ac725b 100644
--- a/Externals/Bochs_disasm/config.h
+++ b/Externals/Bochs_disasm/config.h
@@ -38,4 +38,8 @@ typedef Bit64u bx_address;
 
 #endif
 
+#define BX_CONST64(x)  (x##LL)
+#define GET32L(val64) ((Bit32u)(((Bit64u)(val64)) & 0xFFFFFFFF))
+#define GET32H(val64) ((Bit32u)(((Bit64u)(val64)) >> 32))
+
 #endif
diff --git a/Externals/Bochs_disasm/dis_decode.cc b/Externals/Bochs_disasm/dis_decode.cc
new file mode 100644
index 0000000000..77974af4a6
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_decode.cc
@@ -0,0 +1,557 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_decode.cc 11873 2013-10-10 21:00:26Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2012 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "disasm.h"
+#include "dis_tables.h"
+
+#define OPCODE(entry) ((BxDisasmOpcodeInfo_t*) entry->OpcodeInfo)
+#define OPCODE_TABLE(entry) ((BxDisasmOpcodeTable_t*) entry->OpcodeInfo)
+
+static const unsigned char instruction_has_modrm[512] = {
+  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f          */
+  /*       -------------------------------          */
+  /* 00 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0,
+  /* 10 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0,
+  /* 20 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0,
+  /* 30 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0,
+  /* 40 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* 50 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* 60 */ 0,0,1,1,0,0,0,0,0,1,0,1,0,0,0,0,
+  /* 70 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* 80 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  /* 90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* A0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* B0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* C0 */ 1,1,0,0,1,1,1,1,0,0,0,0,0,0,0,0,
+  /* D0 */ 1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,
+  /* E0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  /* F0 */ 0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,
+  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f           */
+  /*       -------------------------------           */
+           1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0F 00 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 10 */
+           1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 0F 20 */
+           0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 0F 30 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 40 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 50 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 60 */
+           1,1,1,1,1,1,1,0,1,1,0,0,1,1,1,1, /* 0F 70 */
+           0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0F 80 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 90 */
+           0,0,0,1,1,1,0,0,0,0,0,1,1,1,1,1, /* 0F A0 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F B0 */
+           1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0, /* 0F C0 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F D0 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F E0 */
+           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0  /* 0F F0 */
+  /*       -------------------------------           */
+  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f           */
+};
+
+unsigned disassembler::disasm(bx_bool is_32, bx_bool is_64, bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+{
+  x86_insn insn = decode(is_32, is_64, cs_base, ip, instr, disbuf);
+  return insn.ilen;
+}
+
+x86_insn disassembler::decode(bx_bool is_32, bx_bool is_64, bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+{
+  if (is_64) is_32 = 1;
+  x86_insn insn(is_32, is_64);
+  const Bit8u *instruction_begin = instruction = instr;
+  resolve_modrm = NULL;
+
+  db_eip = ip;
+  db_cs_base = cs_base; // cs linear base (cs_base for PM & cs<<4 for RM & VM)
+
+  disbufptr = disbuf; // start sprintf()'ing into beginning of buffer
+
+#define SSE_PREFIX_NONE 0
+#define SSE_PREFIX_66   1
+#define SSE_PREFIX_F3   2
+#define SSE_PREFIX_F2   3      /* only one SSE prefix could be used */
+  unsigned sse_prefix = SSE_PREFIX_NONE, sse_opcode = 0;
+  unsigned rex_prefix = 0, prefixes = 0;
+
+  for(;;)
+  {
+    insn.b1 = fetch_byte();
+    prefixes++;
+
+    switch(insn.b1) {
+      case 0x40:     // rex
+      case 0x41:
+      case 0x42:
+      case 0x43:
+      case 0x44:
+      case 0x45:
+      case 0x46:
+      case 0x47:
+      case 0x48:
+      case 0x49:
+      case 0x4A:
+      case 0x4B:
+      case 0x4C:
+      case 0x4D:
+      case 0x4E:
+      case 0x4F:
+        if (! is_64) break;
+        rex_prefix = insn.b1;
+        continue;
+
+      case 0x26:     // ES:
+      case 0x2e:     // CS:
+      case 0x36:     // SS:
+      case 0x3e:     // DS:
+        if (! is_64) insn.seg_override = (insn.b1 >> 3) & 3;
+        rex_prefix = 0;
+        continue;
+
+      case 0x64:     // FS:
+      case 0x65:     // GS:
+        insn.seg_override = insn.b1 & 0xf;
+        rex_prefix = 0;
+        continue;
+
+      case 0x66:     // operand size override
+        if (!insn.os_64) insn.os_32 = !is_32;
+        if (!sse_prefix) sse_prefix = SSE_PREFIX_66;
+        rex_prefix = 0;
+        continue;
+
+      case 0x67:     // address size override
+        if (!is_64) insn.as_32 = !is_32;
+        insn.as_64 = 0;
+        rex_prefix = 0;
+        continue;
+
+      case 0xf0:     // lock
+        rex_prefix = 0;
+        continue;
+
+      case 0xf2:     // repne
+      case 0xf3:     // rep
+        sse_prefix = (insn.b1 & 0xf) ^ 1;
+        rex_prefix = 0;
+        continue;
+
+      // no more prefixes
+      default:
+        break;
+    }
+
+    break;
+  }
+
+  if (insn.b1 == 0x0f)
+  {
+    insn.b1 = 0x100 | fetch_byte();
+  }
+
+  if (rex_prefix) {
+    insn.extend8b = 1;
+    if (rex_prefix & 0x8) {
+      insn.os_64 = 1;
+      insn.os_32 = 1;
+    }
+    if (rex_prefix & 0x4) insn.rex_r = 8;
+    if (rex_prefix & 0x2) insn.rex_x = 8;
+    if (rex_prefix & 0x1) insn.rex_b = 8;
+  }
+
+  const BxDisasmOpcodeTable_t *opcode_table, *entry;
+
+  if (is_64) {
+    if (insn.os_64)
+      opcode_table = BxDisasmOpcodes64q;
+    else if (insn.os_32)
+      opcode_table = BxDisasmOpcodes64d;
+    else
+      opcode_table = BxDisasmOpcodes64w;
+  } else {
+    if (insn.os_32)
+      opcode_table = BxDisasmOpcodes32;
+    else
+      opcode_table = BxDisasmOpcodes16;
+  }
+
+  entry = opcode_table + insn.b1;
+
+  if ((insn.b1 & ~1) == 0xc4 && (is_64 || (peek_byte() & 0xc0) == 0xc0))
+  {
+    if (sse_prefix)
+      dis_sprintf("(bad vex+rex prefix) ");
+    if (rex_prefix)
+      dis_sprintf("(bad vex+sse prefix) ");
+
+    // decode 0xC4 or 0xC5 VEX prefix
+    sse_prefix = decode_vex(&insn);
+    if (insn.b1 < 256 || insn.b1 >= 1024)
+      entry = &BxDisasmGroupSSE_ERR[0];
+    else
+      entry = BxDisasmOpcodesAVX + (insn.b1 - 256);
+  }
+/*
+  if (insn.b1== 0x62 && (is_64 || (peek_byte() & 0xc0) == 0xc0))
+  {
+    if (sse_prefix)
+      dis_sprintf("(bad evex+rex prefix) ");
+    if (rex_prefix)
+      dis_sprintf("(bad evex+sse prefix) ");
+
+    // decode 0x62 EVEX prefix
+    sse_prefix = decode_evex(&insn);
+    if (insn.b1 < 256 || insn.b1 >= 1024)
+      entry = &BxDisasmGroupSSE_ERR[0];
+//  else
+//    entry = BxDisasmOpcodesEVEX + (insn.b1 - 256);
+  }
+*/
+  else if (insn.b1 == 0x8f && (is_64 || (peek_byte() & 0xc0) == 0xc0) && (peek_byte() & 0x8) == 0x8)
+  {
+    if (sse_prefix)
+      dis_sprintf("(bad xop+rex prefix) ");
+    if (rex_prefix)
+      dis_sprintf("(bad xop+sse prefix) ");
+    
+    // decode 0x8F XOP prefix
+    sse_prefix = decode_xop(&insn);
+    if (insn.b1 >= 768 || sse_prefix != 0)
+      entry = &BxDisasmGroupSSE_ERR[0];
+    else
+      entry = BxDisasmOpcodesXOP + insn.b1;
+  }
+
+  if (insn.b1 >= 512 || instruction_has_modrm[insn.b1] || insn.is_xop > 0)
+  {
+    // take 3rd byte for 3-byte opcode
+    if (entry->Attr == _GRP3BOP) {
+      entry = &(OPCODE_TABLE(entry)[fetch_byte()]);
+    }
+
+    decode_modrm(&insn);
+  }
+
+  int attr = entry->Attr;
+  while(attr)
+  {
+    switch(attr) {
+       case _GROUPN:
+         entry = &(OPCODE_TABLE(entry)[insn.nnn & 7]);
+         break;
+
+       case _GRPSSE66:
+         /* SSE opcode group with only prefix 0x66 allowed */
+         sse_opcode = 1;
+         if (sse_prefix != SSE_PREFIX_66)
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
+
+       case _GRPSSEF2:
+         /* SSE opcode group with only prefix 0xF2 allowed */
+         sse_opcode = 1;
+         if (sse_prefix != SSE_PREFIX_F2)
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
+
+       case _GRPSSEF3:
+         /* SSE opcode group with only prefix 0xF3 allowed */
+         sse_opcode = 1;
+         if (sse_prefix != SSE_PREFIX_F3)
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
+
+       case _GRPSSENONE:
+         /* SSE opcode group with no prefix only allowed */
+         sse_opcode = 1;
+         if (sse_prefix != SSE_PREFIX_NONE)
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
+
+       case _GRPSSE:
+         sse_opcode = 1;
+         /* For SSE opcodes, look into another 4 entries table
+            with the opcode prefixes (NONE, 0x66, 0xF2, 0xF3) */
+         entry = &(OPCODE_TABLE(entry)[sse_prefix]);
+         break;
+
+       case _GRPSSE2:
+         sse_opcode = 1;
+         /* For SSE opcodes, look into another 2 entries table
+            with the opcode prefixes (NONE, 0x66)
+            SSE prefixes 0xF2 and 0xF3 are not allowed */
+         if (sse_prefix > SSE_PREFIX_66)
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         else
+             entry = &(OPCODE_TABLE(entry)[sse_prefix]);
+         break;
+
+       case _SPLIT11B:
+         entry = &(OPCODE_TABLE(entry)[insn.mod != 3]); /* REG/MEM */
+         break;
+
+       case _GRPRM:
+         entry = &(OPCODE_TABLE(entry)[insn.rm & 7]);
+         break;
+
+       case _GRPFP:
+         if(insn.mod != 3)
+         {
+             entry = &(OPCODE_TABLE(entry)[insn.nnn & 7]);
+         } else {
+             int index = (insn.b1-0xD8)*64 + (insn.modrm & 0x3f);
+             entry = &(BxDisasmOpcodeInfoFP[index]);
+         }
+         break;
+
+       case _GRP3DNOW:
+         entry = &(BxDisasm3DNowGroup[fetch_byte()]);
+         break;
+
+       case _GRP64B:
+         entry = &(OPCODE_TABLE(entry)[insn.os_64 ? 2 : insn.os_32]);
+         if (sse_prefix == SSE_PREFIX_66)
+             sse_prefix = 0;
+         break;
+
+       case _GRPVEXW:
+         entry = &(OPCODE_TABLE(entry)[insn.vex_w]);
+         break;
+
+       default:
+         printf("Internal disassembler error - unknown attribute !\n");
+         return x86_insn(is_32, is_64);
+    }
+
+    /* get additional attributes from group table */
+    attr = entry->Attr;
+  }
+
+#define BRANCH_NOT_TAKEN 0x2E
+#define BRANCH_TAKEN     0x3E
+
+  unsigned branch_hint = 0;
+
+  // print prefixes
+  for(unsigned i=0;i<prefixes;i++)
+  {
+    Bit8u prefix_byte = *(instr+i);
+
+    if (prefix_byte == 0xF0) dis_sprintf("lock ");
+
+    if (! insn.is_xop && ! insn.is_vex) {
+      if (insn.b1 == 0x90 && !insn.rex_b && prefix_byte == 0xF3)
+        continue;
+
+      if (prefix_byte == 0xF3 || prefix_byte == 0xF2) {
+        if (! sse_opcode) {
+          const BxDisasmOpcodeTable_t *prefix = &(opcode_table[prefix_byte]);
+          dis_sprintf("%s ", OPCODE(prefix)->IntelOpcode);
+        }
+      }
+
+      // branch hint for jcc instructions
+      if ((insn.b1 >= 0x070 && insn.b1 <= 0x07F) ||
+          (insn.b1 >= 0x180 && insn.b1 <= 0x18F))
+      {
+        if (prefix_byte == BRANCH_NOT_TAKEN || prefix_byte == BRANCH_TAKEN)
+          branch_hint = prefix_byte;
+      }
+    }
+  }
+
+  const BxDisasmOpcodeInfo_t *opcode = OPCODE(entry);
+
+  if (! insn.is_xop && ! insn.is_vex) {
+    // patch jecx opcode
+    if (insn.b1 == 0xE3 && insn.as_32 && !insn.as_64)
+      opcode = &Ia_jecxz_Jb;
+
+    // fix nop opcode
+    if (insn.b1 == 0x90) {
+      if (sse_prefix == SSE_PREFIX_F3)
+        opcode = &Ia_pause;
+      else if (!insn.rex_b)
+        opcode = &Ia_nop;
+    }
+  }
+
+  // print instruction disassembly
+  if (intel_mode)
+    print_disassembly_intel(&insn, opcode);
+  else
+    print_disassembly_att  (&insn, opcode);
+
+  if (branch_hint == BRANCH_NOT_TAKEN)
+  {
+    dis_sprintf(", not taken");
+  }
+  else if (branch_hint == BRANCH_TAKEN)
+  {
+    dis_sprintf(", taken");
+  }
+
+  if (insn.is_vex < 0)
+    dis_sprintf(" (bad vex)");
+  else if (insn.is_evex < 0)
+    dis_sprintf(" (bad evex)");
+  else if (insn.is_xop < 0)
+    dis_sprintf(" (bad xop)");
+
+  insn.ilen = (unsigned)(instruction - instruction_begin);
+
+  return insn;
+}
+
+unsigned disassembler::decode_vex(x86_insn *insn)
+{
+  insn->is_vex = 1;
+
+  unsigned b2 = fetch_byte(), vex_opcode_extension = 1;
+
+  insn->rex_r = (b2 & 0x80) ? 0 : 0x8;
+
+  if (insn->b1 == 0xc4) {
+    // decode 3-byte VEX prefix
+    insn->rex_x = (b2 & 0x40) ? 0 : 0x8;
+    if (insn->is_64)
+      insn->rex_b = (b2 & 0x20) ? 0 : 0x8;
+
+    vex_opcode_extension = b2 & 0x1f;
+    if (! vex_opcode_extension || vex_opcode_extension > 3)
+      insn->is_vex = -1;
+
+    b2 = fetch_byte(); // fetch VEX3 byte
+    if (b2 & 0x80) {
+      insn->os_64 = 1;
+      insn->os_32 = 1;
+      insn->vex_w = 1;
+    }
+  }
+
+  insn->vex_vvv = 15 - ((b2 >> 3) & 0xf);
+  if (! insn->is_64) insn->vex_vvv &= 7;
+  insn->vex_l = (b2 >> 2) & 0x1;
+  insn->b1 = fetch_byte() + 256 * vex_opcode_extension;
+  return b2 & 0x3;
+}
+
+unsigned disassembler::decode_evex(x86_insn *insn)
+{
+  insn->is_evex = 1;
+
+  Bit32u evex = fetch_dword();
+
+  // check for reserved EVEX bits
+  if ((evex & 0x0c) != 0 || (evex & 0x400) == 0) {
+    insn->is_evex = -1;
+  }
+
+  unsigned evex_opcext = evex & 0x3;
+  if (evex_opcext == 0) {
+    insn->is_evex = -1;
+  }
+    
+  if (insn->is_64) {
+    insn->rex_r = ((evex >> 4) & 0x8) ^ 0x8;
+    insn->rex_r |= (evex & 0x10) ^ 0x10;
+    insn->rex_x = ((evex >> 3) & 0x8) ^ 0x8;
+    insn->rex_b = ((evex >> 2) & 0x8) ^ 0x8;
+    insn->rex_b |= (insn->rex_x << 1);
+  }
+
+  unsigned sse_prefix = (evex >> 8) & 0x3;
+
+  insn->vex_vvv = 15 - ((evex >> 11) & 0xf);
+  unsigned evex_v = ((evex >> 15) & 0x10) ^ 0x10;
+  insn->vex_vvv |= evex_v;
+  if (! insn->is_64) insn->vex_vvv &= 7;
+
+  insn->vex_w = (evex >> 15) & 0x1;
+  if (insn->vex_w) {
+    insn->os_64 = 1;
+    insn->os_32 = 1;
+  }
+
+  insn->evex_b = (evex >> 20) & 0x1;
+  insn->evex_ll_rc = (evex >> 21) & 0x3;
+  insn->evex_z = (evex >> 23) & 0x1;
+  
+  insn->b1 = (evex >> 24);
+  insn->b1 += 256 * (evex_opcext-1);
+
+  return sse_prefix;
+}
+
+unsigned disassembler::decode_xop(x86_insn *insn)
+{
+  insn->is_xop = 1;
+
+  unsigned b2 = fetch_byte();
+
+  insn->rex_r = (b2 & 0x80) ? 0 : 0x8;
+  insn->rex_x = (b2 & 0x40) ? 0 : 0x8;
+  if (insn->is_64)
+    insn->rex_b = (b2 & 0x20) ? 0 : 0x8;
+
+  unsigned xop_opcode_extension = (b2 & 0x1f) - 8;
+  if (xop_opcode_extension >= 3)
+    insn->is_xop = -1;
+
+  b2 = fetch_byte(); // fetch VEX3 byte
+  if (b2 & 0x80) {
+    insn->os_64 = 1;
+    insn->os_32 = 1;
+    insn->vex_w = 1;
+  }
+
+  insn->vex_vvv = 15 - ((b2 >> 3) & 0xf);
+  if (! insn->is_64) insn->vex_vvv &= 7;
+  insn->vex_l = (b2 >> 2) & 0x1;
+  insn->b1 = fetch_byte() + 256 * xop_opcode_extension;
+
+  return b2 & 0x3;
+}
+
+void disassembler::dis_sprintf(const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  vsprintf(disbufptr, fmt, ap);
+  va_end(ap);
+
+  disbufptr += strlen(disbufptr);
+}
+
+void disassembler::dis_putc(char symbol)
+{
+  *disbufptr++ = symbol;
+  *disbufptr = 0;
+}
diff --git a/Externals/Bochs_disasm/dis_decode.cpp b/Externals/Bochs_disasm/dis_decode.cpp
deleted file mode 100644
index 3734578658..0000000000
--- a/Externals/Bochs_disasm/dis_decode.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// $Id: dis_decode.cc,v 1.32 2006/05/12 17:04:19 sshwarts Exp $
-/////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "disasm.h"
-#include "dis_tables.h"
-
-#define OPCODE(entry) ((BxDisasmOpcodeInfo_t*) entry->OpcodeInfo)
-#define OPCODE_TABLE(entry) ((BxDisasmOpcodeTable_t*) entry->OpcodeInfo)
-
-#ifndef NULL
-#define NULL 0
-#endif 
-
-
-static const unsigned char instruction_has_modrm[512] = {
-  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f          */
-  /*       -------------------------------          */
-  /* 00 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0, 
-  /* 10 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0, 
-  /* 20 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0, 
-  /* 30 */ 1,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0, 
-  /* 40 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* 50 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* 60 */ 0,0,1,1,0,0,0,0,0,1,0,1,0,0,0,0, 
-  /* 70 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* 80 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 
-  /* 90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* A0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* B0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* C0 */ 1,1,0,0,1,1,1,1,0,0,0,0,0,0,0,0, 
-  /* D0 */ 1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1, 
-  /* E0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 
-  /* F0 */ 0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,
-  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f           */
-  /*       -------------------------------           */
-           1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0F 00 */
-           1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, /* 0F 10 */
-           1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 0F 20 */
-           0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 0F 30 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 40 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 50 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 60 */
-           1,1,1,1,1,1,1,0,0,0,0,0,1,1,1,1, /* 0F 70 */
-           0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0F 80 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F 90 */
-           0,0,0,1,1,1,0,0,0,0,0,1,1,1,1,1, /* 0F A0 */
-           1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1, /* 0F B0 */
-           1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0, /* 0F C0 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F D0 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0F E0 */
-           1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0  /* 0F F0 */
-  /*       -------------------------------           */
-  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f           */
-};
-
-unsigned disassembler::disasm(bx_bool is_32, bx_bool is_64, bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-{
-  x86_insn insn = decode(is_32, is_64, base, ip, instr, disbuf);
-  return insn.ilen;
-}
-
-x86_insn disassembler::decode(bx_bool is_32, bx_bool is_64, bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-{
-  x86_insn insn(is_32, is_64);
-  const Bit8u *instruction_begin = instruction = instr;
-  resolve_modrm = NULL;
-  unsigned b3 = 0;
-
-  db_eip = ip;
-  db_base = base; // cs linear base (base for PM & cs<<4 for RM & VM)
-
-  disbufptr = disbuf; // start sprintf()'ing into beginning of buffer
-
-#define SSE_PREFIX_NONE 0
-#define SSE_PREFIX_66   1
-#define SSE_PREFIX_F2   2
-#define SSE_PREFIX_F3   3      /* only one SSE prefix could be used */
-  unsigned sse_prefix = SSE_PREFIX_NONE;
-
-  for(;;)
-  {
-    insn.b1 = fetch_byte();
-    insn.prefixes++;
-
-    switch(insn.b1) {
-      case 0x40:     // rex
-      case 0x41:
-      case 0x42:
-      case 0x43:
-      case 0x44:
-      case 0x45:
-      case 0x46:
-      case 0x47:
-      case 0x48:
-      case 0x49:
-      case 0x4A:
-      case 0x4B:
-      case 0x4C:
-      case 0x4D:
-      case 0x4E:
-      case 0x4F:
-        if (! is_64) break;
-        insn.extend8b = 1;
-        if (insn.b1 & 0x8) {
-          insn.os_64 = 1;
-          insn.os_32 = 1;
-        }
-        if (insn.b1 & 0x4) insn.rex_r = 8;
-        if (insn.b1 & 0x2) insn.rex_x = 8;
-        if (insn.b1 & 0x1) insn.rex_b = 8;
-        continue;
-
-      case 0x26:     // ES:
-        if (! is_64) insn.seg_override = ES_REG;
-        continue;
-
-      case 0x2e:     // CS:
-        if (! is_64) insn.seg_override = CS_REG;
-        continue;
-
-      case 0x36:     // SS:
-        if (! is_64) insn.seg_override = SS_REG;
-        continue;
-
-      case 0x3e:     // DS:
-        if (! is_64) insn.seg_override = DS_REG;
-        continue;
-
-      case 0x64:     // FS:
-        insn.seg_override = FS_REG;
-        continue;
-
-      case 0x65:     // GS:
-        insn.seg_override = GS_REG;
-        continue;
-
-      case 0x66:     // operand size override
-        if (!insn.os_64) insn.os_32 = !is_32;
-        if (!sse_prefix) sse_prefix = SSE_PREFIX_66;
-        continue;
-
-      case 0x67:     // address size override
-        if (!is_64) insn.as_32 = !is_32;
-        insn.as_64 = 0;
-        continue;
-
-      case 0xf0:     // lock
-        continue;
-
-      case 0xf2:     // repne
-        if (!sse_prefix) sse_prefix = SSE_PREFIX_F2;
-        continue;
-
-      case 0xf3:     // rep
-        if (!sse_prefix) sse_prefix = SSE_PREFIX_F3;
-        continue;
-
-      // no more prefixes
-      default:
-        break;
-    }
-
-    insn.prefixes--;
-    break;
-  }
-
-  if (insn.b1 == 0x0f)
-  {
-    insn.b1 = 0x100 | fetch_byte();
-  }
-
-  const BxDisasmOpcodeTable_t *opcode_table, *entry;
-
-  if (is_64) {
-    if (insn.os_64)
-      opcode_table = BxDisasmOpcodes64q;
-    else if (insn.os_32)
-      opcode_table = BxDisasmOpcodes64d;
-    else
-      opcode_table = BxDisasmOpcodes64w;
-  } else {
-    if (insn.os_32)
-      opcode_table = BxDisasmOpcodes32;
-    else
-      opcode_table = BxDisasmOpcodes16;
-  }
-
-  entry = opcode_table + insn.b1;
-
-  // will require 3rd byte for 3-byte opcode
-  if (entry->Attr & _GRP3BTAB) b3 = fetch_byte();
-
-  if (instruction_has_modrm[insn.b1])
-  {
-    decode_modrm(&insn);
-  }
-
-  int attr = entry->Attr;
-  while(attr) 
-  {
-    switch(attr) {
-       case _GROUPN:
-         entry = &(OPCODE_TABLE(entry)[insn.nnn]);
-         break;
-
-       case _GRPSSE:
-         if(sse_prefix) insn.prefixes--;
-         /* For SSE opcodes, look into another 4 entries table 
-            with the opcode prefixes (NONE, 0x66, 0xF2, 0xF3) */
-         entry = &(OPCODE_TABLE(entry)[sse_prefix]);
-         break;
-
-       case _SPLIT11B:
-         entry = &(OPCODE_TABLE(entry)[insn.mod != 3]); /* REG/MEM */
-         break;
-
-       case _GRPRM:
-         entry = &(OPCODE_TABLE(entry)[insn.rm]);
-         break;
-
-       case _GRPFP:
-         if(insn.mod != 3)
-         {
-             entry = &(OPCODE_TABLE(entry)[insn.nnn]);
-         } else {
-             int index = (insn.b1-0xD8)*64 + (insn.modrm & 0x3f);
-             entry = &(BxDisasmOpcodeInfoFP[index]);
-         }
-         break;
-
-       case _GRP3DNOW:
-         entry = &(BxDisasm3DNowGroup[peek_byte()]);
-         break;
-
-       case _GRP3BTAB:
-         entry = &(OPCODE_TABLE(entry)[b3 >> 4]);
-         break;
-
-       case _GRP3BOP:
-         entry = &(OPCODE_TABLE(entry)[b3 & 15]);
-         break;
-
-       default:
-         printf("Internal disassembler error - unknown attribute !\n");
-         return x86_insn(is_32, is_64);
-    }
-
-    /* get additional attributes from group table */
-    attr = entry->Attr;
-  }
-
-#define BRANCH_NOT_TAKEN 0x2E
-#define BRANCH_TAKEN     0x3E
-
-  unsigned branch_hint = 0;
-
-  // print prefixes
-  for(unsigned i=0;i<insn.prefixes;i++)
-  {
-    Bit8u prefix_byte = *(instr+i);
-
-    if (prefix_byte == 0xF3 || prefix_byte == 0xF2 || prefix_byte == 0xF0) 
-    {
-      const BxDisasmOpcodeTable_t *prefix = &(opcode_table[prefix_byte]);
-      dis_sprintf("%s ", OPCODE(prefix)->IntelOpcode);
-    }
-
-    // branch hint for jcc instructions
-    if ((insn.b1 >= 0x070 && insn.b1 <= 0x07F) ||
-        (insn.b1 >= 0x180 && insn.b1 <= 0x18F))
-    {
-      if (prefix_byte == BRANCH_NOT_TAKEN || prefix_byte == BRANCH_TAKEN) 
-        branch_hint = prefix_byte;
-    }
-  }
-
-  const BxDisasmOpcodeInfo_t *opcode = OPCODE(entry);
-
-  // patch jecx opcode
-  if (insn.b1 == 0xE3 && insn.as_32 && !insn.as_64)
-    opcode = &Ia_jecxz_Jb;
-
-  // fix nop opcode
-  if (insn.b1 == 0x90 && !insn.rex_b) {
-    opcode = &Ia_nop;
-  }
-
-  // print instruction disassembly
-  if (intel_mode)
-    print_disassembly_intel(&insn, opcode);
-  else
-    print_disassembly_att  (&insn, opcode);
-
-  if (branch_hint == BRANCH_NOT_TAKEN)
-  {
-    dis_sprintf(", not taken");
-  }
-  else if (branch_hint == BRANCH_TAKEN)
-  {
-    dis_sprintf(", taken");
-  }
- 
-  insn.ilen = (unsigned)(instruction - instruction_begin);
-
-  return insn;
-}
-
-void disassembler::dis_sprintf(const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start(ap, fmt);
-  vsprintf(disbufptr, fmt, ap);
-  va_end(ap);
-
-  disbufptr += strlen(disbufptr);
-}
-
-void disassembler::dis_putc(char symbol)
-{
-  *disbufptr++ = symbol;
-  *disbufptr = 0;
-}
diff --git a/Externals/Bochs_disasm/dis_groups.cc b/Externals/Bochs_disasm/dis_groups.cc
new file mode 100644
index 0000000000..0712fa344e
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_groups.cc
@@ -0,0 +1,755 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_groups.cc 11885 2013-10-15 17:19:18Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2011 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+#include <stdio.h>
+#include <assert.h>
+#include "disasm.h"
+
+/*
+#if BX_DEBUGGER
+#include "../bx_debug/debug.h"
+#endif
+*/
+
+void disassembler::Apw(const x86_insn *insn)
+{
+  Bit16u imm16 = fetch_word();
+  Bit16u cs_selector = fetch_word();
+  dis_sprintf("0x%04x:%04x", (unsigned) cs_selector, (unsigned) imm16);
+}
+
+void disassembler::Apd(const x86_insn *insn)
+{
+  Bit32u imm32 = fetch_dword();
+  Bit16u cs_selector = fetch_word();
+  dis_sprintf("0x%04x:%08x", (unsigned) cs_selector, (unsigned) imm32);
+}
+
+// 8-bit general purpose registers
+void disassembler::AL_Reg(const x86_insn *insn) { dis_sprintf("%s", general_8bit_regname[rAX_REG]); }
+void disassembler::CL_Reg(const x86_insn *insn) { dis_sprintf("%s", general_8bit_regname[rCX_REG]); }
+
+// 16-bit general purpose registers
+void disassembler::AX_Reg(const x86_insn *insn) {
+  dis_sprintf("%s", general_16bit_regname[rAX_REG]);
+}
+
+void disassembler::DX_Reg(const x86_insn *insn) {
+  dis_sprintf("%s", general_16bit_regname[rDX_REG]);
+}
+
+// 32-bit general purpose registers
+void disassembler::EAX_Reg(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_32bit_regname[rAX_REG]);
+}
+
+// 64-bit general purpose registers
+void disassembler::RAX_Reg(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_64bit_regname[rAX_REG]);
+}
+
+void disassembler::RCX_Reg(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_64bit_regname[rCX_REG]);
+}
+
+// segment registers
+void disassembler::CS(const x86_insn *insn) { dis_sprintf("%s", segment_name[CS_REG]); }
+void disassembler::DS(const x86_insn *insn) { dis_sprintf("%s", segment_name[DS_REG]); }
+void disassembler::ES(const x86_insn *insn) { dis_sprintf("%s", segment_name[ES_REG]); }
+void disassembler::SS(const x86_insn *insn) { dis_sprintf("%s", segment_name[SS_REG]); }
+void disassembler::FS(const x86_insn *insn) { dis_sprintf("%s", segment_name[FS_REG]); }
+void disassembler::GS(const x86_insn *insn) { dis_sprintf("%s", segment_name[GS_REG]); }
+
+void disassembler::Sw(const x86_insn *insn) { dis_sprintf("%s", segment_name[insn->nnn]); }
+
+// control register
+void disassembler::Cd(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("cr%d", insn->nnn);
+  else
+    dis_sprintf("%%cr%d", insn->nnn);
+}
+
+void disassembler::Cq(const x86_insn *insn) { Cd(insn); }
+
+// debug register
+void disassembler::Dd(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("dr%d", insn->nnn);
+  else
+    dis_sprintf("%%dr%d", insn->nnn);
+}
+
+void disassembler::Dq(const x86_insn *insn) { Dd(insn); }
+
+// 8-bit general purpose register
+void disassembler::Reg8(const x86_insn *insn)
+{
+  unsigned reg = (insn->b1 & 7) | insn->rex_b;
+
+  if (reg < 4 || insn->extend8b)
+    dis_sprintf("%s", general_8bit_regname_rex[reg]);
+  else
+    dis_sprintf("%s", general_8bit_regname[reg]);
+}
+
+// 16-bit general purpose register
+void disassembler::RX(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_16bit_regname[(insn->b1 & 7) | insn->rex_b]);
+}
+
+// 32-bit general purpose register
+void disassembler::ERX(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_32bit_regname[(insn->b1 & 7) | insn->rex_b]);
+}
+
+// 64-bit general purpose register
+void disassembler::RRX(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_64bit_regname[(insn->b1 & 7) | insn->rex_b]);
+}
+
+// general purpose register or memory operand
+void disassembler::Eb(const x86_insn *insn)
+{
+  if (insn->mod == 3) {
+    if (insn->rm < 4 || insn->extend8b)
+      dis_sprintf("%s", general_8bit_regname_rex[insn->rm]);
+    else
+      dis_sprintf("%s", general_8bit_regname[insn->rm]);
+  }
+  else
+    (this->*resolve_modrm)(insn, B_SIZE);
+}
+
+void disassembler::Ew(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+    dis_sprintf("%s", general_16bit_regname[insn->rm]);
+  else
+    (this->*resolve_modrm)(insn, W_SIZE);
+}
+
+void disassembler::Ed(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+    dis_sprintf("%s", general_32bit_regname[insn->rm]);
+  else
+    (this->*resolve_modrm)(insn, D_SIZE);
+}
+
+void disassembler::Eq(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+    dis_sprintf("%s", general_64bit_regname[insn->rm]);
+  else
+    (this->*resolve_modrm)(insn, Q_SIZE);
+}
+
+void disassembler::Ey(const x86_insn *insn)
+{
+  if (insn->os_64) Eq(insn);
+  else Ed(insn);
+}
+
+void disassembler::Ebd(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+    dis_sprintf("%s", general_32bit_regname[insn->rm]);
+  else
+    (this->*resolve_modrm)(insn, B_SIZE);
+}
+
+void disassembler::Ewd(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+    dis_sprintf("%s", general_32bit_regname[insn->rm]);
+  else
+    (this->*resolve_modrm)(insn, W_SIZE);
+}
+
+// general purpose register
+void disassembler::Gb(const x86_insn *insn)
+{
+  if (insn->nnn < 4 || insn->extend8b)
+    dis_sprintf("%s", general_8bit_regname_rex[insn->nnn]);
+  else
+    dis_sprintf("%s", general_8bit_regname[insn->nnn]);
+}
+
+void disassembler::Gw(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_16bit_regname[insn->nnn]);
+}
+
+void disassembler::Gd(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_32bit_regname[insn->nnn]);
+}
+
+void disassembler::Gq(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_64bit_regname[insn->nnn]);
+}
+
+void disassembler::Gy(const x86_insn *insn)
+{
+  if (insn->os_64) Gq(insn);
+  else Gd(insn);
+}
+
+// vex encoded general purpose register
+void disassembler::By(const x86_insn *insn)
+{
+  if (insn->os_64) 
+    dis_sprintf("%s", general_64bit_regname[insn->vex_vvv]);
+  else
+    dis_sprintf("%s", general_32bit_regname[insn->vex_vvv]);
+}
+
+// immediate
+void disassembler::I1(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  dis_putc ('1');
+}
+
+void disassembler::Ib(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  dis_sprintf("0x%02x", (unsigned) fetch_byte());
+}
+
+void disassembler::Iw(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  dis_sprintf("0x%04x", (unsigned) fetch_word());
+}
+
+void disassembler::IbIb(const x86_insn *insn)
+{
+  Bit8u ib1 = fetch_byte();
+  Bit8u ib2 = fetch_byte();
+
+  if (intel_mode) {
+     dis_sprintf("0x%02x, 0x%02x", ib1, ib2);
+  }
+  else {
+     dis_sprintf("$0x%02x, $0x%02x", ib2, ib1);
+  }
+}
+
+void disassembler::IwIb(const x86_insn *insn)
+{
+  Bit16u iw = fetch_word();
+  Bit8u  ib = fetch_byte();
+
+  if (intel_mode) {
+     dis_sprintf("0x%04x, 0x%02x", iw, ib);
+  }
+  else {
+     dis_sprintf("$0x%02x, $0x%04x", ib, iw);
+  }
+}
+
+void disassembler::Id(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  dis_sprintf("0x%08x", (unsigned) fetch_dword());
+}
+
+void disassembler::Iq(const x86_insn *insn)
+{
+  Bit64u value = fetch_qword();
+
+  if (! intel_mode) dis_putc('$');
+  dis_sprintf("0x%08x%08x", GET32H(value), GET32L(value));
+}
+
+// sign extended immediate
+void disassembler::sIbw(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  Bit16u imm16 = (Bit8s) fetch_byte();
+  dis_sprintf("0x%04x", (unsigned) imm16);
+}
+
+// sign extended immediate
+void disassembler::sIbd(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  Bit32u imm32 = (Bit8s) fetch_byte();
+  dis_sprintf ("0x%08x", (unsigned) imm32);
+}
+
+// sign extended immediate
+void disassembler::sIbq(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  Bit64u imm64 = (Bit8s) fetch_byte();
+  dis_sprintf ("0x%08x%08x", GET32H(imm64), GET32L(imm64));
+}
+
+// sign extended immediate
+void disassembler::sIdq(const x86_insn *insn)
+{
+  if (! intel_mode) dis_putc('$');
+  Bit64u imm64 = (Bit32s) fetch_dword();
+  dis_sprintf ("0x%08x%08x", GET32H(imm64), GET32L(imm64));
+}
+
+// floating point
+void disassembler::ST0(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("st(0)");
+  else
+    dis_sprintf("%%st(0)");
+}
+
+void disassembler::STi(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("st(%d)", insn->rm & 7);
+  else
+    dis_sprintf("%%st(%d)", insn->rm & 7);
+}
+
+// 16-bit general purpose register
+void disassembler::Rw(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_16bit_regname[insn->rm]);
+}
+
+// 32-bit general purpose register
+void disassembler::Rd(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_32bit_regname[insn->rm]);
+}
+
+// 64-bit general purpose register
+void disassembler::Rq(const x86_insn *insn)
+{
+  dis_sprintf("%s", general_64bit_regname[insn->rm]);
+}
+
+void disassembler::Ry(const x86_insn *insn)
+{
+  if (insn->os_64) Rq(insn);
+  else Rd(insn);
+}
+
+// mmx register
+void disassembler::Pq(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("mm%d", insn->nnn & 0x7);
+  else
+    dis_sprintf("%%mm%d", insn->nnn & 0x7);
+}
+
+void disassembler::Nq(const x86_insn *insn)
+{
+  if (intel_mode)
+    dis_sprintf  ("mm%d", insn->rm & 0x7);
+  else
+    dis_sprintf("%%mm%d", insn->rm & 0x7);
+}
+
+void disassembler::Qd(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+  {
+    if (intel_mode)
+      dis_sprintf  ("mm%d", insn->rm & 0x7);
+    else
+      dis_sprintf("%%mm%d", insn->rm & 0x7);
+  }
+  else
+    (this->*resolve_modrm)(insn, D_SIZE);
+}
+
+void disassembler::Qq(const x86_insn *insn)
+{
+  if (insn->mod == 3)
+  {
+    if (intel_mode)
+      dis_sprintf  ("mm%d", insn->rm & 0x7);
+    else
+      dis_sprintf("%%mm%d", insn->rm & 0x7);
+  }
+  else
+    (this->*resolve_modrm)(insn, Q_SIZE);
+}
+
+// xmm/ymm register
+void disassembler::Udq(const x86_insn *insn)
+{
+  dis_sprintf("%s%d", vector_reg_name[insn->vex_l], insn->rm);
+}
+
+void disassembler::Ups(const x86_insn *insn) { Udq(insn); }
+void disassembler::Upd(const x86_insn *insn) { Udq(insn); }
+void disassembler::Uq(const x86_insn *insn) { Udq(insn); }
+
+void disassembler::Vq(const x86_insn *insn)
+{
+  dis_sprintf("%s%d", vector_reg_name[insn->vex_l], insn->nnn);
+}
+
+void disassembler::Vdq(const x86_insn *insn) { Vq(insn); }
+void disassembler::Vss(const x86_insn *insn) { Vq(insn); }
+void disassembler::Vsd(const x86_insn *insn) { Vq(insn); }
+void disassembler::Vps(const x86_insn *insn) { Vq(insn); }
+void disassembler::Vpd(const x86_insn *insn) { Vq(insn); }
+
+void disassembler::VIb(const x86_insn *insn)
+{
+  unsigned vreg = fetch_byte() >> 4;
+  if (! insn->is_64) vreg &= 7;
+  dis_sprintf("%s%d", vector_reg_name[insn->vex_l], vreg);
+}
+
+void disassembler::Hdq(const x86_insn *insn)
+{
+  dis_sprintf("%s%d", vector_reg_name[insn->vex_l], insn->vex_vvv);
+}
+
+void disassembler::Hps(const x86_insn *insn) { Hdq(insn); }
+void disassembler::Hpd(const x86_insn *insn) { Hdq(insn); }
+void disassembler::Hss(const x86_insn *insn) { Hdq(insn); }
+void disassembler::Hsd(const x86_insn *insn) { Hdq(insn); }
+
+void disassembler::Wb(const x86_insn *insn)
+{
+  if (insn->mod == 3) Udq(insn);
+  else
+    (this->*resolve_modrm)(insn, B_SIZE);
+}
+
+void disassembler::Ww(const x86_insn *insn)
+{
+  if (insn->mod == 3) Udq(insn);
+  else
+    (this->*resolve_modrm)(insn, W_SIZE);
+}
+
+void disassembler::Wd(const x86_insn *insn)
+{
+  if (insn->mod == 3) Udq(insn);
+  else
+    (this->*resolve_modrm)(insn, D_SIZE);
+}
+
+void disassembler::Wq(const x86_insn *insn)
+{
+  if (insn->mod == 3) Udq(insn);
+  else
+    (this->*resolve_modrm)(insn, Q_SIZE);
+}
+
+void disassembler::Wdq(const x86_insn *insn)
+{
+  if (insn->mod == 3) Udq(insn);
+  else
+    (this->*resolve_modrm)(insn, XMM_SIZE + insn->vex_l);
+}
+
+void disassembler::Wsd(const x86_insn *insn) { Wq(insn); }
+void disassembler::Wss(const x86_insn *insn) { Wd(insn); }
+void disassembler::Wpd(const x86_insn *insn) { Wdq(insn); }
+void disassembler::Wps(const x86_insn *insn) { Wdq(insn); }
+
+// direct memory access
+void disassembler::OP_O(const x86_insn *insn, unsigned size)
+{
+  const char *seg;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = segment_name[DS_REG];
+
+  print_datasize(size);
+
+  if (insn->as_64) {
+    Bit64u imm64 = fetch_qword();
+    dis_sprintf("%s:0x%08x%08x", seg, GET32H(imm64), GET32L(imm64));
+  }
+  else if (insn->as_32) {
+    Bit32u imm32 = fetch_dword();
+    dis_sprintf("%s:0x%08x", seg, (unsigned) imm32);
+  }
+  else {
+    Bit16u imm16 = fetch_word();
+    dis_sprintf("%s:0x%04x", seg, (unsigned) imm16);
+  }
+}
+
+void disassembler::Ob(const x86_insn *insn) { OP_O(insn, B_SIZE); }
+void disassembler::Ow(const x86_insn *insn) { OP_O(insn, W_SIZE); }
+void disassembler::Od(const x86_insn *insn) { OP_O(insn, D_SIZE); }
+void disassembler::Oq(const x86_insn *insn) { OP_O(insn, Q_SIZE); }
+
+// memory operand
+void disassembler::OP_M(const x86_insn *insn, unsigned size)
+{
+  if(insn->mod == 3)
+    dis_sprintf("(bad)");
+  else
+    (this->*resolve_modrm)(insn, size);
+}
+
+void disassembler::Ma(const x86_insn *insn) { OP_M(insn, X_SIZE); }
+void disassembler::Mp(const x86_insn *insn) { OP_M(insn, X_SIZE); }
+void disassembler::Ms(const x86_insn *insn) { OP_M(insn, X_SIZE); }
+void disassembler::Mx(const x86_insn *insn) { OP_M(insn, X_SIZE); }
+
+void disassembler::Mb(const x86_insn *insn) { OP_M(insn, B_SIZE); }
+void disassembler::Mw(const x86_insn *insn) { OP_M(insn, W_SIZE); }
+void disassembler::Md(const x86_insn *insn) { OP_M(insn, D_SIZE); }
+void disassembler::Mq(const x86_insn *insn) { OP_M(insn, Q_SIZE); }
+void disassembler::Mt(const x86_insn *insn) { OP_M(insn, T_SIZE); }
+
+void disassembler::Mdq(const x86_insn *insn) { OP_M(insn, XMM_SIZE + insn->vex_l); }
+void disassembler::Mps(const x86_insn *insn) { OP_M(insn, XMM_SIZE + insn->vex_l); }
+void disassembler::Mpd(const x86_insn *insn) { OP_M(insn, XMM_SIZE + insn->vex_l); }
+void disassembler::Mss(const x86_insn *insn) { OP_M(insn, D_SIZE); }
+void disassembler::Msd(const x86_insn *insn) { OP_M(insn, Q_SIZE); }
+
+// gather VSib
+void disassembler::VSib(const x86_insn *insn)
+{
+  if(insn->mod == 3)
+    dis_sprintf("(bad)");
+  else
+    (this->*resolve_modrm)(insn, (XMM_SIZE + insn->vex_l) | VSIB_Index);
+}
+
+// string instructions
+void disassembler::OP_X(const x86_insn *insn, unsigned size)
+{
+  const char *rsi, *seg;
+
+  if (insn->as_64) {
+    rsi = general_64bit_regname[rSI_REG];
+  }
+  else {
+    if (insn->as_32)
+      rsi = general_32bit_regname[rSI_REG];
+    else
+      rsi = general_16bit_regname[rSI_REG];
+  }
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = segment_name[DS_REG];
+
+  print_datasize(size);
+
+  if (intel_mode)
+    dis_sprintf("%s:[%s]", seg, rsi);
+  else
+    dis_sprintf("%s:(%s)", seg, rsi);
+}
+
+void disassembler::Xb(const x86_insn *insn) { OP_X(insn, B_SIZE); }
+void disassembler::Xw(const x86_insn *insn) { OP_X(insn, W_SIZE); }
+void disassembler::Xd(const x86_insn *insn) { OP_X(insn, D_SIZE); }
+void disassembler::Xq(const x86_insn *insn) { OP_X(insn, Q_SIZE); }
+
+void disassembler::OP_Y(const x86_insn *insn, unsigned size)
+{
+  const char *rdi;
+
+  if (insn->as_64) {
+    rdi = general_64bit_regname[rDI_REG];
+  }
+  else {
+    if (insn->as_32)
+      rdi = general_32bit_regname[rDI_REG];
+    else
+      rdi = general_16bit_regname[rDI_REG];
+  }
+
+  print_datasize(size);
+
+  if (intel_mode)
+    dis_sprintf("%s:[%s]", segment_name[ES_REG], rdi);
+  else
+    dis_sprintf("%s:(%s)", segment_name[ES_REG], rdi);
+}
+
+void disassembler::Yb(const x86_insn *insn) { OP_Y(insn, B_SIZE); }
+void disassembler::Yw(const x86_insn *insn) { OP_Y(insn, W_SIZE); }
+void disassembler::Yd(const x86_insn *insn) { OP_Y(insn, D_SIZE); }
+void disassembler::Yq(const x86_insn *insn) { OP_Y(insn, Q_SIZE); }
+
+void disassembler::OP_sY(const x86_insn *insn, unsigned size)
+{
+  const char *rdi, *seg;
+
+  if (insn->as_64) {
+    rdi = general_64bit_regname[rDI_REG];
+  }
+  else {
+    if (insn->as_32)
+      rdi = general_32bit_regname[rDI_REG];
+    else
+      rdi = general_16bit_regname[rDI_REG];
+  }
+
+  print_datasize(size);
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = segment_name[DS_REG];
+
+  if (intel_mode)
+    dis_sprintf("%s:[%s]", seg, rdi);
+  else
+    dis_sprintf("%s:(%s)", seg, rdi);
+}
+
+void disassembler::sYq(const x86_insn *insn) { OP_sY(insn, Q_SIZE); }
+void disassembler::sYdq(const x86_insn *insn) { OP_sY(insn, XMM_SIZE + insn->vex_l); }
+
+#define BX_JUMP_TARGET_NOT_REQ ((bx_address)(-1))
+
+// jump offset
+void disassembler::Jb(const x86_insn *insn)
+{
+  Bit8s imm8 = (Bit8s) fetch_byte();
+
+  if (insn->is_64) {
+    Bit64u imm64 = (Bit8s) imm8;
+
+    if (offset_mode_hex) {
+      dis_sprintf(".+0x%08x%08x", GET32H(imm64), GET32L(imm64));
+    }
+    else {
+      dis_sprintf(".%+d", (int) imm8);
+    }
+
+    if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+      Bit64u target = db_eip + imm64;
+      target += db_cs_base;
+      dis_sprintf(" (0x%08x%08x)", GET32H(target), GET32L(target));
+    }
+
+    return;
+  }
+
+  if (insn->os_32) {
+    Bit32u imm32 = (Bit8s) imm8;
+
+    if (offset_mode_hex) {
+      dis_sprintf(".+0x%08x", (unsigned) imm32);
+    }
+    else {
+      dis_sprintf(".%+d", (int) imm8);
+    }
+
+    if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+      Bit32u target = (Bit32u)(db_cs_base + db_eip + (Bit32s) imm32);
+      dis_sprintf(" (0x%08x)", target);
+    }
+  }
+  else {
+    Bit16u imm16 = (Bit8s) imm8;
+
+    if (offset_mode_hex) {
+      dis_sprintf(".+0x%04x", (unsigned) imm16);
+    }
+    else {
+      dis_sprintf(".%+d", (int) imm8);
+    }
+
+    if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+      Bit16u target = (Bit16u)((db_eip + (Bit16s) imm16) & 0xffff);
+      dis_sprintf(" (0x%08x)", target + db_cs_base);
+    }
+  }
+}
+
+void disassembler::Jw(const x86_insn *insn)
+{
+  // Jw supported in 16-bit mode only
+  assert(! insn->is_64);
+
+  Bit16s imm16 = (Bit16s) fetch_word();
+
+  if (offset_mode_hex) {
+    dis_sprintf(".+0x%04x", (unsigned) (Bit16u) imm16);
+  }
+  else {
+    dis_sprintf(".%+d", (int) imm16);
+  }
+
+  if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+    Bit16u target = (db_eip + imm16) & 0xffff;
+    dis_sprintf(" (0x%08x)", target + db_cs_base);
+  }
+}
+
+void disassembler::Jd(const x86_insn *insn)
+{
+  Bit32s imm32 = (Bit32s) fetch_dword();
+
+  if (insn->is_64) {
+    Bit64u imm64 = (Bit32s) imm32;
+
+    if (offset_mode_hex) {
+      dis_sprintf(".+0x%08x%08x", GET32H(imm64), GET32L(imm64));
+    }
+    else {
+      dis_sprintf(".%+d", (int) imm32);
+    }
+
+    if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+      Bit64u target = db_cs_base + db_eip + (Bit64s) imm64;
+      dis_sprintf(" (0x%08x%08x)", GET32H(target), GET32L(target));
+    }
+
+    return;
+  }
+
+  if (offset_mode_hex) {
+    dis_sprintf(".+0x%08x", (unsigned) imm32);
+  }
+  else {
+    dis_sprintf(".%+d", (int) imm32);
+  }
+
+  if (db_cs_base != BX_JUMP_TARGET_NOT_REQ) {
+    Bit32u target = (Bit32u)(db_cs_base + db_eip + (Bit32s) imm32);
+    dis_sprintf(" (0x%08x)", target);
+  }
+}
diff --git a/Externals/Bochs_disasm/dis_groups.cpp b/Externals/Bochs_disasm/dis_groups.cpp
deleted file mode 100644
index 9e55323523..0000000000
--- a/Externals/Bochs_disasm/dis_groups.cpp
+++ /dev/null
@@ -1,607 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// $Id: dis_groups.cc,v 1.33 2006/08/13 09:40:07 sshwarts Exp $
-/////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <assert.h>
-#include "disasm.h"
-
-/*
-#if BX_DEBUGGER
-#include "../bx_debug/debug.h"
-#endif
-*/
-
-void disassembler::Apw(const x86_insn *insn)
-{
-  Bit16u imm16 = fetch_word();
-  Bit16u cs_selector = fetch_word();
-  dis_sprintf("%04x:%04x", (unsigned) cs_selector, (unsigned) imm16);
-}
-
-void disassembler::Apd(const x86_insn *insn)
-{
-  Bit32u imm32 = fetch_dword();
-  Bit16u cs_selector = fetch_word();
-  dis_sprintf("%04x:%08x", (unsigned) cs_selector, (unsigned) imm32);
-}
-
-// 8-bit general purpose registers
-void disassembler::AL(const x86_insn *insn) { dis_sprintf("%s", general_8bit_regname[rAX_REG]); }
-void disassembler::CL(const x86_insn *insn) { dis_sprintf("%s", general_8bit_regname[rCX_REG]); }
-
-// 16-bit general purpose registers
-void disassembler::AX(const x86_insn *insn) {
-  dis_sprintf("%s", general_16bit_regname[rAX_REG]);
-}
-
-void disassembler::DX(const x86_insn *insn) {
-  dis_sprintf("%s", general_16bit_regname[rDX_REG]);
-}
-
-// 32-bit general purpose registers
-void disassembler::EAX(const x86_insn *insn)
-{
-  dis_sprintf("%s", general_32bit_regname[rAX_REG]);
-}
-
-// 64-bit general purpose registers
-void disassembler::RAX(const x86_insn *insn)
-{
-  dis_sprintf("%s", general_64bit_regname[rAX_REG]);
-}
-
-// segment registers
-void disassembler::CS(const x86_insn *insn) { dis_sprintf("%s", segment_name[CS_REG]); }
-void disassembler::DS(const x86_insn *insn) { dis_sprintf("%s", segment_name[DS_REG]); }
-void disassembler::ES(const x86_insn *insn) { dis_sprintf("%s", segment_name[ES_REG]); }
-void disassembler::SS(const x86_insn *insn) { dis_sprintf("%s", segment_name[SS_REG]); }
-void disassembler::FS(const x86_insn *insn) { dis_sprintf("%s", segment_name[FS_REG]); }
-void disassembler::GS(const x86_insn *insn) { dis_sprintf("%s", segment_name[GS_REG]); }
-
-void disassembler::Sw(const x86_insn *insn) { dis_sprintf("%s", segment_name[insn->nnn]); }
-
-// test registers
-void disassembler::Td(const x86_insn *insn)
-{
-  if (intel_mode)
-    dis_sprintf  ("tr%d", insn->nnn);
-  else
-    dis_sprintf("%%tr%d", insn->nnn);
-}
-
-// control register
-void disassembler::Cd(const x86_insn *insn) 
-{ 
-  if (intel_mode)
-    dis_sprintf  ("cr%d", insn->nnn);
-  else
-    dis_sprintf("%%cr%d", insn->nnn);
-}
-
-void disassembler::Cq(const x86_insn *insn) { Cd(insn); }
-
-// debug register
-void disassembler::Dd(const x86_insn *insn) 
-{
-  if (intel_mode)
-    dis_sprintf  ("db%d", insn->nnn);
-  else
-    dis_sprintf("%%db%d", insn->nnn);
-}
-
-void disassembler::Dq(const x86_insn *insn) { Dd(insn); }
-
-// 8-bit general purpose register
-void disassembler::R8(const x86_insn *insn)
-{ 
-  unsigned reg = (insn->b1 & 7) | insn->rex_b;
- 
-  if (reg < 4 || insn->extend8b)
-    dis_sprintf("%s", general_8bit_regname_rex[reg]);
-  else
-    dis_sprintf("%s", general_8bit_regname[reg]);
-}
-
-// 16-bit general purpose register
-void disassembler::RX(const x86_insn *insn)
-{ 
-  dis_sprintf("%s", general_16bit_regname[(insn->b1 & 7) | insn->rex_b]);
-}
-
-// 32-bit general purpose register
-void disassembler::ERX(const x86_insn *insn)
-{ 
-  dis_sprintf("%s", general_32bit_regname[(insn->b1 & 7) | insn->rex_b]);
-}
-
-// 64-bit general purpose register
-void disassembler::RRX(const x86_insn *insn)
-{ 
-  dis_sprintf("%s", general_64bit_regname[(insn->b1 & 7) | insn->rex_b]);
-}
-
-// general purpose register or memory operand
-void disassembler::Eb(const x86_insn *insn) 
-{
-  if (insn->mod == 3) {
-    if (insn->rm < 4 || insn->extend8b)
-      dis_sprintf("%s", general_8bit_regname_rex[insn->rm]);
-    else
-      dis_sprintf("%s", general_8bit_regname[insn->rm]);
-  }
-  else
-    (this->*resolve_modrm)(insn, B_SIZE);
-}
-
-void disassembler::Ew(const x86_insn *insn) 
-{
-  if (insn->mod == 3)
-    dis_sprintf("%s", general_16bit_regname[insn->rm]);
-  else
-    (this->*resolve_modrm)(insn, W_SIZE);
-}
-
-void disassembler::Ed(const x86_insn *insn) 
-{
-  if (insn->mod == 3)
-    dis_sprintf("%s", general_32bit_regname[insn->rm]);
-  else
-    (this->*resolve_modrm)(insn, D_SIZE);
-}
-
-void disassembler::Eq(const x86_insn *insn) 
-{
-  if (insn->mod == 3)
-    dis_sprintf("%s", general_64bit_regname[insn->rm]);
-  else
-    (this->*resolve_modrm)(insn, Q_SIZE);
-}
-
-// general purpose register
-void disassembler::Gb(const x86_insn *insn) 
-{
-  if (insn->nnn < 4 || insn->extend8b)
-    dis_sprintf("%s", general_8bit_regname_rex[insn->nnn]);
-  else
-    dis_sprintf("%s", general_8bit_regname[insn->nnn]);
-}
-
-void disassembler::Gw(const x86_insn *insn) 
-{
-  dis_sprintf("%s", general_16bit_regname[insn->nnn]);
-}
-
-void disassembler::Gd(const x86_insn *insn) 
-{
-  dis_sprintf("%s", general_32bit_regname[insn->nnn]);
-}
-
-void disassembler::Gq(const x86_insn *insn) 
-{
-  dis_sprintf("%s", general_64bit_regname[insn->nnn]);
-}
-
-// immediate
-void disassembler::I1(const x86_insn *insn) 
-{ 
-  if (! intel_mode) dis_putc('$');
-  dis_putc ('1');
-}
-
-void disassembler::Ib(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  dis_sprintf("0x%02x", (unsigned) fetch_byte());
-}
-
-void disassembler::Iw(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  dis_sprintf("0x%04x", (unsigned) fetch_word());
-}
-
-void disassembler::IwIb(const x86_insn *insn) 
-{
-  Bit16u iw = fetch_word();
-  Bit8u  ib = fetch_byte();
-
-  if (intel_mode) {
-     dis_sprintf("0x%04x, 0x%02x", iw, ib);
-  }
-  else {
-     dis_sprintf("$0x%02x, $0x%04x", ib, iw);
-  }
-}
-
-void disassembler::Id(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  dis_sprintf("0x%08x", (unsigned) fetch_dword());
-}
-
-void disassembler::Iq(const x86_insn *insn) 
-{
-  Bit64u value = fetch_qword();
-
-  if (! intel_mode) dis_putc('$');
-  dis_sprintf("0x%08x%08x", 
-      (unsigned)(value>>32), (unsigned)(value & 0xffffffff));
-}
-
-// sign extended immediate
-void disassembler::sIbw(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  Bit16u imm16 = (Bit8s) fetch_byte();
-  dis_sprintf("0x%04x", (unsigned) imm16);
-}
-
-// sign extended immediate
-void disassembler::sIbd(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  Bit32u imm32 = (Bit8s) fetch_byte();
-  dis_sprintf ("0x%08x", (unsigned) imm32);
-}
-
-// sign extended immediate
-void disassembler::sIbq(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  Bit64u imm64 = (Bit8s) fetch_byte();
-  dis_sprintf ("0x%08x%08x",
-      (unsigned)(imm64>>32), (unsigned)(imm64 & 0xffffffff));
-}
-
-// sign extended immediate
-void disassembler::sIdq(const x86_insn *insn) 
-{
-  if (! intel_mode) dis_putc('$');
-  Bit64u imm64 = (Bit32s) fetch_dword();
-  dis_sprintf ("0x%08x%08x",
-      (unsigned)(imm64>>32), (unsigned)(imm64 & 0xffffffff));
-}
-
-// floating point
-void disassembler::ST0(const x86_insn *insn)
-{ 
-  if (intel_mode)
-    dis_sprintf  ("st(0)");
-  else
-    dis_sprintf("%%st(0)");
-}
-
-void disassembler::STi(const x86_insn *insn) 
-{ 
-  if (intel_mode)
-    dis_sprintf  ("st(%d)", insn->rm);
-  else
-    dis_sprintf("%%st(%d)", insn->rm);
-}
-
-// 16-bit general purpose register
-void disassembler::Rw(const x86_insn *insn)
-{
-  dis_sprintf("%s", general_16bit_regname[insn->rm]);
-}
-
-// 32-bit general purpose register
-void disassembler::Rd(const x86_insn *insn)
-{
-  dis_sprintf("%s", general_32bit_regname[insn->rm]);
-}
-
-// 64-bit general purpose register
-void disassembler::Rq(const x86_insn *insn)
-{
-  dis_sprintf("%s", general_64bit_regname[insn->rm]);
-}
-
-// mmx register
-void disassembler::Pq(const x86_insn *insn)
-{
-  if (intel_mode)
-    dis_sprintf  ("mm%d", insn->nnn);
-  else
-    dis_sprintf("%%mm%d", insn->nnn);
-}
-
-void disassembler::Nq(const x86_insn *insn)
-{
-  if (intel_mode)
-    dis_sprintf  ("mm%d", insn->rm);
-  else
-    dis_sprintf("%%mm%d", insn->rm);
-}
-
-void disassembler::Qd(const x86_insn *insn)
-{
-  if (insn->mod == 3)
-  {
-    if (intel_mode)
-      dis_sprintf  ("mm%d", insn->rm);
-    else
-      dis_sprintf("%%mm%d", insn->rm);
-  }
-  else
-    (this->*resolve_modrm)(insn, D_SIZE);
-}
-
-void disassembler::Qq(const x86_insn *insn)
-{
-  if (insn->mod == 3)
-  {
-    if (intel_mode)
-      dis_sprintf  ("mm%d", insn->rm);
-    else
-      dis_sprintf("%%mm%d", insn->rm);
-  }
-  else
-    (this->*resolve_modrm)(insn, Q_SIZE);
-}
-
-// xmm register
-void disassembler::Udq(const x86_insn *insn)
-{
-  if (intel_mode)
-    dis_sprintf  ("xmm%d", insn->rm);
-  else
-    dis_sprintf("%%xmm%d", insn->rm);
-}
-
-void disassembler::Vq(const x86_insn *insn)
-{
-  if (intel_mode)
-    dis_sprintf  ("xmm%d", insn->nnn);
-  else
-    dis_sprintf("%%xmm%d", insn->nnn);
-}
-
-void disassembler::Vdq(const x86_insn *insn) { Vq(insn); }
-void disassembler::Vss(const x86_insn *insn) { Vq(insn); }
-void disassembler::Vsd(const x86_insn *insn) { Vq(insn); }
-void disassembler::Vps(const x86_insn *insn) { Vq(insn); }
-void disassembler::Vpd(const x86_insn *insn) { Vq(insn); }
-
-void disassembler::Wq(const x86_insn *insn)
-{
-  if (insn->mod == 3)
-  {
-    if (intel_mode)
-      dis_sprintf  ("xmm%d", insn->rm);
-    else
-      dis_sprintf("%%xmm%d", insn->rm);
-  }
-  else
-    (this->*resolve_modrm)(insn, Q_SIZE);
-}
-
-void disassembler::Wdq(const x86_insn *insn)
-{
-  if (insn->mod == 3)
-  {
-    if (intel_mode)
-      dis_sprintf  ("xmm%d", insn->rm);
-    else
-      dis_sprintf("%%xmm%d", insn->rm);
-  }
-  else
-    (this->*resolve_modrm)(insn, O_SIZE);
-}
-
-void disassembler::Wsd(const x86_insn *insn) { Wq(insn); }
-
-void disassembler::Wss(const x86_insn *insn)
-{ 
-  if (insn->mod == 3)
-  {
-    if (intel_mode)
-      dis_sprintf  ("xmm%d", insn->rm);
-    else
-      dis_sprintf("%%xmm%d", insn->rm);
-  }
-  else
-    (this->*resolve_modrm)(insn, D_SIZE);
-}
-
-void disassembler::Wpd(const x86_insn *insn) { Wdq(insn); }
-void disassembler::Wps(const x86_insn *insn) { Wdq(insn); }
-
-// direct memory access
-void disassembler::OP_O(const x86_insn *insn, unsigned size)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = segment_name[DS_REG];
-
-  print_datasize(size);
-
-  if (insn->as_64) {
-    Bit64u imm64 = fetch_qword();
-    dis_sprintf("%s:0x%08x%08x", seg,
-        (unsigned)(imm64>>32), (unsigned)(imm64 & 0xffffffff));
-  }
-  else if (insn->as_32) {
-    Bit32u imm32 = fetch_dword();
-    dis_sprintf("%s:0x%x", seg, (unsigned) imm32);
-  }
-  else {
-    Bit16u imm16 = fetch_word();
-    dis_sprintf("%s:0x%x", seg, (unsigned) imm16);
-  }
-}
-
-void disassembler::Ob(const x86_insn *insn) { OP_O(insn, B_SIZE); }
-void disassembler::Ow(const x86_insn *insn) { OP_O(insn, W_SIZE); }
-void disassembler::Od(const x86_insn *insn) { OP_O(insn, D_SIZE); }
-void disassembler::Oq(const x86_insn *insn) { OP_O(insn, Q_SIZE); }
-
-// memory operand
-void disassembler::OP_M(const x86_insn *insn, unsigned size)
-{
-  if(insn->mod == 3)
-    dis_sprintf("(bad)");
-  else
-    (this->*resolve_modrm)(insn, size);
-}
-
-void disassembler::Ma(const x86_insn *insn) { OP_M(insn, X_SIZE); }
-void disassembler::Mp(const x86_insn *insn) { OP_M(insn, X_SIZE); }
-void disassembler::Ms(const x86_insn *insn) { OP_M(insn, X_SIZE); }
-void disassembler::Mx(const x86_insn *insn) { OP_M(insn, X_SIZE); }
-
-void disassembler::Mb(const x86_insn *insn) { OP_M(insn, B_SIZE); }
-void disassembler::Mw(const x86_insn *insn) { OP_M(insn, W_SIZE); }
-void disassembler::Md(const x86_insn *insn) { OP_M(insn, D_SIZE); }
-void disassembler::Mq(const x86_insn *insn) { OP_M(insn, Q_SIZE); }
-void disassembler::Mt(const x86_insn *insn) { OP_M(insn, T_SIZE); }
-
-void disassembler::Mdq(const x86_insn *insn) { OP_M(insn, O_SIZE); }
-void disassembler::Mps(const x86_insn *insn) { OP_M(insn, O_SIZE); }
-void disassembler::Mpd(const x86_insn *insn) { OP_M(insn, O_SIZE); }
-
-// string instructions
-void disassembler::OP_X(const x86_insn *insn, unsigned size)
-{
-  const char *rsi, *seg;
-
-  if (insn->as_64) {
-    rsi = general_64bit_regname[rSI_REG];
-  }
-  else {
-    if (insn->as_32)
-      rsi = general_32bit_regname[rSI_REG];
-    else
-      rsi = general_16bit_regname[rSI_REG];
-  }
-  
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = segment_name[DS_REG];
-
-  print_datasize(size);
-
-  if (intel_mode)
-    dis_sprintf("%s:[%s]", seg, rsi);
-  else
-    dis_sprintf("%s:(%s)", seg, rsi);
-}
-
-void disassembler::Xb(const x86_insn *insn) { OP_X(insn, B_SIZE); }
-void disassembler::Xw(const x86_insn *insn) { OP_X(insn, W_SIZE); }
-void disassembler::Xd(const x86_insn *insn) { OP_X(insn, D_SIZE); }
-void disassembler::Xq(const x86_insn *insn) { OP_X(insn, Q_SIZE); }
-
-void disassembler::OP_Y(const x86_insn *insn, unsigned size)
-{
-  const char *rdi;
-
-  if (insn->as_64) {
-    rdi = general_64bit_regname[rDI_REG];
-  }
-  else {
-    if (insn->as_32)
-      rdi = general_32bit_regname[rDI_REG];
-    else
-      rdi = general_16bit_regname[rDI_REG];
-  }
-  
-  print_datasize(size);
-
-  if (intel_mode)
-    dis_sprintf("%s:[%s]", segment_name[ES_REG], rdi);
-  else
-    dis_sprintf("%s:(%s)", segment_name[ES_REG], rdi);
-}
-
-void disassembler::Yb(const x86_insn *insn) { OP_Y(insn, B_SIZE); }
-void disassembler::Yw(const x86_insn *insn) { OP_Y(insn, W_SIZE); }
-void disassembler::Yd(const x86_insn *insn) { OP_Y(insn, D_SIZE); }
-void disassembler::Yq(const x86_insn *insn) { OP_Y(insn, Q_SIZE); }
-
-#define BX_JUMP_TARGET_NOT_REQ ((bx_address)(-1))
-
-// jump offset
-void disassembler::Jb(const x86_insn *insn)
-{
-  Bit8s imm8 = (Bit8s) fetch_byte();
-
-  if (insn->is_64) {
-    Bit64u imm64 = (Bit64s) imm8;
-    dis_sprintf(".+0x%08x%08x", 
-        (unsigned)(imm64>>32), (unsigned)(imm64 & 0xffffffff));
-
-    if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-      Bit64u target = db_eip + (Bit64s) imm64; target += db_base;
-      dis_sprintf(" (0x%08x%08x)", 
-        (unsigned)(target>>32), (unsigned)(target & 0xffffffff));
-    }
-
-    return;
-  }
-
-  if (insn->os_32) {
-    Bit32u imm32 = (Bit32s) imm8;
-    dis_sprintf(".+0x%08x", (unsigned) imm32);
-
-    if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-      Bit32u target = (Bit32u)(db_eip + (Bit32s) imm32); target += (Bit32u)db_base;
-      dis_sprintf(" (0x%08x)", target);
-    }
-  }
-  else {
-    Bit16u imm16 = (Bit16s) imm8;
-    dis_sprintf(".+0x%04x", (unsigned) imm16);
-
-    if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-      Bit16u target = (Bit32u)(db_eip + (Bit16s) imm16) & 0xffff;
-      dis_sprintf(" (0x%08x)", target + db_base);
-    }
-  }
-}
-
-void disassembler::Jw(const x86_insn *insn)
-{
-  // Jw supported in 16-bit mode only
-  assert(! insn->is_64);
-  assert(! insn->is_32);
-
-  Bit16u imm16 = (Bit16s) fetch_word();
-  dis_sprintf(".+0x%04x", (unsigned) imm16);
-
-  if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-    Bit16u target = (Bit32u)(db_eip + (Bit16s) imm16) & 0xffff;
-    dis_sprintf(" (0x%08x)", target + db_base);
-  }
-}
-
-void disassembler::Jd(const x86_insn *insn)
-{
-  Bit32s imm32 = (Bit32s) fetch_dword();
-
-  if (insn->is_64) {
-    Bit64u imm64 = (Bit64s) imm32;
-    dis_sprintf(".+0x%08x%08x", 
-        (unsigned)(imm64>>32), (unsigned)(imm64 & 0xffffffff));
-
-    if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-      Bit64u target = db_eip + (Bit64s) imm64; target += db_base;
-      dis_sprintf(" (0x%08x%08x)", 
-        (unsigned)(target>>32), (unsigned)(target & 0xffffffff));
-    }
-
-    return;
-  }
-
-  dis_sprintf(".+0x%08x", (unsigned) imm32);
-
-  if (db_base != BX_JUMP_TARGET_NOT_REQ) {
-    Bit32u target = (Bit32u)(db_eip + (Bit32s) imm32); target += (Bit32u)db_base;
-    dis_sprintf(" (0x%08x)", target);
-  }
-}
diff --git a/Externals/Bochs_disasm/dis_tables.h b/Externals/Bochs_disasm/dis_tables.h
index f7291e0541..9fe9701c05 100644
--- a/Externals/Bochs_disasm/dis_tables.h
+++ b/Externals/Bochs_disasm/dis_tables.h
@@ -1,6 +1,23 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: dis_tables.h,v 1.29 2006/04/27 15:11:45 sshwarts Exp $
+// $Id: dis_tables.h 11878 2013-10-11 20:09:51Z sshwarts $
 /////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2012 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 #ifndef _BX_DISASM_TABLES_
 #define _BX_DISASM_TABLES_
@@ -11,70 +28,93 @@
 #define _GRPFP         3
 #define _GRP3DNOW      4
 #define _GRPSSE        5
-#define _GRPRM         6
-#define _GRP3BOP       7
-#define _GRP3BTAB      8
+#define _GRPSSE66      6
+#define _GRPSSEF2      7
+#define _GRPSSEF3      8
+#define _GRPSSENONE    9
+#define _GRPSSE2       10
+#define _GRPRM         11
+#define _GRP3BOP       12
+#define _GRP64B        13
+#define _GRPVEXW       14
 
 /* ************************************************************************ */
 #define GRPSSE(n)       _GRPSSE,   BxDisasmGroupSSE_##n
+#define GRPSSE2(n)      _GRPSSE2,  BxDisasmGroupSSE_##n
+#define GRPAVX(n)       _GRPSSE,   BxDisasmGroupAVX_##n
+#define GRPAVX2(n)      _GRPSSE2,  BxDisasmGroupAVX_##n
 #define GRPN(n)         _GROUPN,   BxDisasmGroup##n
 #define GRPRM(n)        _GRPRM,    BxDisasmGroupRm##n
 #define GRPMOD(n)       _SPLIT11B, BxDisasmGroupMod##n
 #define GRPFP(n)        _GRPFP,    BxDisasmFPGroup##n
 #define GRP3DNOW        _GRP3DNOW, BxDisasm3DNowGroup
-#define GR3BOP(n)       _GRP3BOP,  BxDisasm3ByteOp##n
-#define GR3BTAB(n)      _GRP3BTAB, BxDisasm3ByteTable##n
+#define GR3BTAB(n)      _GRP3BOP,  BxDisasm3ByteOpTable##n
+#define GR64BIT(n)      _GRP64B,   BxDisasmGrpOs64B_##n
+#define GRPVEXW(n)      _GRPVEXW,  BxDisasmGrpVexW_##n
+/* ************************************************************************ */
+
+/* ************************************************************************ */
+#define GRPSSE66(n)     _GRPSSE66,   &n
+#define GRPSSEF2(n)     _GRPSSEF2,   &n
+#define GRPSSEF3(n)     _GRPSSEF3,   &n
+#define GRPSSENONE(n)   _GRPSSENONE, &n
 /* ************************************************************************ */
 
 #define Apw &disassembler::Apw
 #define Apd &disassembler::Apd
 
-#define  AL &disassembler::AL
-#define  CL &disassembler::CL
-#define  AX &disassembler::AX
-#define  DX &disassembler::DX
+#define AL_Reg &disassembler::AL_Reg
+#define CL_Reg &disassembler::CL_Reg
+#define AX_Reg &disassembler::AX_Reg
+#define DX_Reg &disassembler::DX_Reg
 
-#define EAX &disassembler::EAX
-#define RAX &disassembler::RAX
+#define EAX_Reg &disassembler::EAX_Reg
+#define RAX_Reg &disassembler::RAX_Reg
+#define RCX_Reg &disassembler::RCX_Reg
 
-#define  CS &disassembler::CS
-#define  DS &disassembler::DS
-#define  ES &disassembler::ES
-#define  SS &disassembler::SS
-#define  FS &disassembler::FS
-#define  GS &disassembler::GS
+#define CS &disassembler::CS
+#define DS &disassembler::DS
+#define ES &disassembler::ES
+#define SS &disassembler::SS
+#define FS &disassembler::FS
+#define GS &disassembler::GS
 
-#define  Sw &disassembler::Sw
+#define Sw &disassembler::Sw
 
-#define  Td &disassembler::Td
+#define Cd &disassembler::Cd
+#define Cq &disassembler::Cq
 
-#define  Cd &disassembler::Cd
-#define  Cq &disassembler::Cq
+#define Dd &disassembler::Dd
+#define Dq &disassembler::Dq
 
-#define  Dd &disassembler::Dd
-#define  Dq &disassembler::Dq
+#define Reg8 &disassembler::Reg8
+#define   RX &disassembler::RX
+#define  ERX &disassembler::ERX
+#define  RRX &disassembler::RRX
 
-#define  R8 &disassembler::R8
-#define  RX &disassembler::RX
-#define ERX &disassembler::ERX
-#define RRX &disassembler::RRX
+#define Eb  &disassembler::Eb
+#define Ew  &disassembler::Ew
+#define Ed  &disassembler::Ed
+#define Eq  &disassembler::Eq
+#define Ey  &disassembler::Ey
+#define Ebd &disassembler::Ebd
+#define Ewd &disassembler::Ewd
 
-#define  Eb &disassembler::Eb
-#define  Ew &disassembler::Ew
-#define  Ed &disassembler::Ed
-#define  Eq &disassembler::Eq
+#define Gb &disassembler::Gb
+#define Gw &disassembler::Gw
+#define Gd &disassembler::Gd
+#define Gq &disassembler::Gq
+#define Gy &disassembler::Gy
 
-#define  Gb &disassembler::Gb
-#define  Gw &disassembler::Gw
-#define  Gd &disassembler::Gd
-#define  Gq &disassembler::Gq
+#define By &disassembler::By
 
-#define  I1 &disassembler::I1
-#define  Ib &disassembler::Ib
-#define  Iw &disassembler::Iw
-#define  Id &disassembler::Id
-#define  Iq &disassembler::Iq
+#define I1 &disassembler::I1
+#define Ib &disassembler::Ib
+#define Iw &disassembler::Iw
+#define Id &disassembler::Id
+#define Iq &disassembler::Iq
 
+#define IbIb &disassembler::IbIb
 #define IwIb &disassembler::IwIb
 
 #define sIbw &disassembler::sIbw
@@ -85,14 +125,15 @@
 #define ST0 &disassembler::ST0
 #define STi &disassembler::STi
 
-#define  Rw &disassembler::Rw
-#define  Rd &disassembler::Rd
-#define  Rq &disassembler::Rq
+#define Rw &disassembler::Rw
+#define Rd &disassembler::Rd
+#define Rq &disassembler::Rq
+#define Ry &disassembler::Ry
 
-#define  Pq &disassembler::Pq
-#define  Qd &disassembler::Qd
-#define  Qq &disassembler::Qq
-#define  Nq &disassembler::Nq
+#define Pq &disassembler::Pq
+#define Qd &disassembler::Qd
+#define Qq &disassembler::Qq
+#define Nq &disassembler::Nq
 
 #define  Vq &disassembler::Vq
 #define Vdq &disassembler::Vdq
@@ -100,8 +141,16 @@
 #define Vsd &disassembler::Vsd
 #define Vps &disassembler::Vps
 #define Vpd &disassembler::Vpd
-#define Udq &disassembler::Udq
+#define VIb &disassembler::VIb
 
+#define Ups &disassembler::Ups
+#define Upd &disassembler::Upd
+#define Udq &disassembler::Udq
+#define Uq  &disassembler::Uq
+
+#define  Wb &disassembler::Wb
+#define  Ww &disassembler::Ww
+#define  Wd &disassembler::Wd
 #define  Wq &disassembler::Wq
 #define Wdq &disassembler::Wdq
 #define Wss &disassembler::Wss
@@ -109,10 +158,16 @@
 #define Wps &disassembler::Wps
 #define Wpd &disassembler::Wpd
 
-#define Ob  &disassembler::Ob
-#define Ow  &disassembler::Ow
-#define Od  &disassembler::Od
-#define Oq  &disassembler::Oq
+#define Hdq &disassembler::Hdq
+#define Hps &disassembler::Hps
+#define Hpd &disassembler::Hpd
+#define Hss &disassembler::Hss
+#define Hsd &disassembler::Hsd
+
+#define Ob &disassembler::Ob
+#define Ow &disassembler::Ow
+#define Od &disassembler::Od
+#define Oq &disassembler::Oq
 
 #define  Ma &disassembler::Ma
 #define  Mp &disassembler::Mp
@@ -126,26 +181,37 @@
 #define Mdq &disassembler::Mdq
 #define Mps &disassembler::Mps
 #define Mpd &disassembler::Mpd
+#define Mss &disassembler::Mss
+#define Msd &disassembler::Msd
 
-#define  Xb &disassembler::Xb
-#define  Xw &disassembler::Xw
-#define  Xd &disassembler::Xd
-#define  Xq &disassembler::Xq
+#define VSib &disassembler::VSib
 
-#define  Yb &disassembler::Yb
-#define  Yw &disassembler::Yw
-#define  Yd &disassembler::Yd
-#define  Yq &disassembler::Yq
+#define Xb &disassembler::Xb
+#define Xw &disassembler::Xw
+#define Xd &disassembler::Xd
+#define Xq &disassembler::Xq
 
-#define  Jb &disassembler::Jb
-#define  Jw &disassembler::Jw
-#define  Jd &disassembler::Jd
+#define Yb &disassembler::Yb
+#define Yw &disassembler::Yw
+#define Yd &disassembler::Yd
+#define Yq &disassembler::Yq
 
-#define  XX 0
+#define sYq  &disassembler::sYq
+#define sYdq &disassembler::sYdq
+
+#define Jb &disassembler::Jb
+#define Jw &disassembler::Jw
+#define Jd &disassembler::Jd
+
+#define XX 0
 
 const struct BxDisasmOpcodeInfo_t
-#include "opcodes.inl"
-#include "dis_tables.inl"
+#include "opcodes.inc"
+#include "dis_tables_x87.inc"
+#include "dis_tables_sse.inc"
+#include "dis_tables_avx.inc"
+#include "dis_tables_xop.inc"
+#include "dis_tables.inc"
 
 #undef XX
 
diff --git a/Externals/Bochs_disasm/dis_tables.inc b/Externals/Bochs_disasm/dis_tables.inc
new file mode 100644
index 0000000000..6a80fbfd70
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_tables.inc
@@ -0,0 +1,3282 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_tables.inc 12247 2014-03-17 20:29:44Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2013 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************ */
+/* Opcode GroupN */
+
+/* Group1 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EbIb[8] = {
+  /* 0 */ { 0, &Ia_addb_Eb_Ib },
+  /* 1 */ { 0, &Ia_orb_Eb_Ib  },
+  /* 2 */ { 0, &Ia_adcb_Eb_Ib },
+  /* 3 */ { 0, &Ia_sbbb_Eb_Ib },
+  /* 4 */ { 0, &Ia_andb_Eb_Ib },
+  /* 5 */ { 0, &Ia_subb_Eb_Ib },
+  /* 6 */ { 0, &Ia_xorb_Eb_Ib },
+  /* 7 */ { 0, &Ia_cmpb_Eb_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EwIw[8] = {
+  /* 0 */ { 0, &Ia_addw_Ew_Iw },
+  /* 1 */ { 0, &Ia_orw_Ew_Iw  },
+  /* 2 */ { 0, &Ia_adcw_Ew_Iw },
+  /* 3 */ { 0, &Ia_sbbw_Ew_Iw },
+  /* 4 */ { 0, &Ia_andw_Ew_Iw },
+  /* 5 */ { 0, &Ia_subw_Ew_Iw },
+  /* 6 */ { 0, &Ia_xorw_Ew_Iw },
+  /* 7 */ { 0, &Ia_cmpw_Ew_Iw }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EdId[8] = {
+  /* 0 */ { 0, &Ia_addl_Ed_Id },
+  /* 1 */ { 0, &Ia_orl_Ed_Id  },
+  /* 2 */ { 0, &Ia_adcl_Ed_Id },
+  /* 3 */ { 0, &Ia_sbbl_Ed_Id },
+  /* 4 */ { 0, &Ia_andl_Ed_Id },
+  /* 5 */ { 0, &Ia_subl_Ed_Id },
+  /* 6 */ { 0, &Ia_xorl_Ed_Id },
+  /* 7 */ { 0, &Ia_cmpl_Ed_Id }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EqId[8] = {
+  /* 0 */ { 0, &Ia_addq_Eq_sId },
+  /* 1 */ { 0, &Ia_orq_Eq_sId  },
+  /* 2 */ { 0, &Ia_adcq_Eq_sId },
+  /* 3 */ { 0, &Ia_sbbq_Eq_sId },
+  /* 4 */ { 0, &Ia_andq_Eq_sId },
+  /* 5 */ { 0, &Ia_subq_Eq_sId },
+  /* 6 */ { 0, &Ia_xorq_Eq_sId },
+  /* 7 */ { 0, &Ia_cmpq_Eq_sId }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EwIb[8] = {
+  /* 0 */ { 0, &Ia_addw_Ew_sIb },	// sign-extend byte
+  /* 1 */ { 0, &Ia_orw_Ew_sIb  },
+  /* 2 */ { 0, &Ia_adcw_Ew_sIb },
+  /* 3 */ { 0, &Ia_sbbw_Ew_sIb },
+  /* 4 */ { 0, &Ia_andw_Ew_sIb },
+  /* 5 */ { 0, &Ia_subw_Ew_sIb },
+  /* 6 */ { 0, &Ia_xorw_Ew_sIb },
+  /* 7 */ { 0, &Ia_cmpw_Ew_sIb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EdIb[8] = {
+  /* 0 */ { 0, &Ia_addl_Ed_sIb },	// sign-extend byte
+  /* 1 */ { 0, &Ia_orl_Ed_sIb  },
+  /* 2 */ { 0, &Ia_adcl_Ed_sIb },
+  /* 3 */ { 0, &Ia_sbbl_Ed_sIb },
+  /* 4 */ { 0, &Ia_andl_Ed_sIb },
+  /* 5 */ { 0, &Ia_subl_Ed_sIb },
+  /* 6 */ { 0, &Ia_xorl_Ed_sIb },
+  /* 7 */ { 0, &Ia_cmpl_Ed_sIb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG1EqIb[8] = {
+  /* 0 */ { 0, &Ia_addq_Eq_sIb },	// sign-extend byte
+  /* 1 */ { 0, &Ia_orq_Eq_sIb  },
+  /* 2 */ { 0, &Ia_adcq_Eq_sIb },
+  /* 3 */ { 0, &Ia_sbbq_Eq_sIb },
+  /* 4 */ { 0, &Ia_andq_Eq_sIb },
+  /* 5 */ { 0, &Ia_subq_Eq_sIb },
+  /* 6 */ { 0, &Ia_xorq_Eq_sIb },
+  /* 7 */ { 0, &Ia_cmpq_Eq_sIb }
+};
+
+/* Group2 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG2Eb[8] = {
+  /* 0 */ { 0, &Ia_rolb_Eb_Ib },
+  /* 1 */ { 0, &Ia_rorb_Eb_Ib },
+  /* 2 */ { 0, &Ia_rclb_Eb_Ib },
+  /* 3 */ { 0, &Ia_rcrb_Eb_Ib },
+  /* 4 */ { 0, &Ia_shlb_Eb_Ib },
+  /* 5 */ { 0, &Ia_shrb_Eb_Ib },
+  /* 6 */ { 0, &Ia_shlb_Eb_Ib },
+  /* 7 */ { 0, &Ia_sarb_Eb_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EbI1[8] = {
+  /* 0 */ { 0, &Ia_rolb_Eb_I1 },
+  /* 1 */ { 0, &Ia_rorb_Eb_I1 },
+  /* 2 */ { 0, &Ia_rclb_Eb_I1 },
+  /* 3 */ { 0, &Ia_rcrb_Eb_I1 },
+  /* 4 */ { 0, &Ia_shlb_Eb_I1 },
+  /* 5 */ { 0, &Ia_shrb_Eb_I1 },
+  /* 6 */ { 0, &Ia_shlb_Eb_I1 },
+  /* 7 */ { 0, &Ia_sarb_Eb_I1 }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EbCL[8] = {
+  /* 0 */ { 0, &Ia_rolb_Eb_CL },
+  /* 1 */ { 0, &Ia_rorb_Eb_CL },
+  /* 2 */ { 0, &Ia_rclb_Eb_CL },
+  /* 3 */ { 0, &Ia_rcrb_Eb_CL },
+  /* 4 */ { 0, &Ia_shlb_Eb_CL },
+  /* 5 */ { 0, &Ia_shrb_Eb_CL },
+  /* 6 */ { 0, &Ia_shlb_Eb_CL },
+  /* 7 */ { 0, &Ia_sarb_Eb_CL }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2Ew[8] = {
+  /* 0 */ { 0, &Ia_rolw_Ew_Ib },
+  /* 1 */ { 0, &Ia_rorw_Ew_Ib },
+  /* 2 */ { 0, &Ia_rclw_Ew_Ib },
+  /* 3 */ { 0, &Ia_rcrw_Ew_Ib },
+  /* 4 */ { 0, &Ia_shlw_Ew_Ib },
+  /* 5 */ { 0, &Ia_shrw_Ew_Ib },
+  /* 6 */ { 0, &Ia_shlw_Ew_Ib },
+  /* 7 */ { 0, &Ia_sarw_Ew_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2Ed[8] = {
+  /* 0 */ { 0, &Ia_roll_Ed_Ib },
+  /* 1 */ { 0, &Ia_rorl_Ed_Ib },
+  /* 2 */ { 0, &Ia_rcll_Ed_Ib },
+  /* 3 */ { 0, &Ia_rcrl_Ed_Ib },
+  /* 4 */ { 0, &Ia_shll_Ed_Ib },
+  /* 5 */ { 0, &Ia_shrl_Ed_Ib },
+  /* 6 */ { 0, &Ia_shll_Ed_Ib },
+  /* 7 */ { 0, &Ia_sarl_Ed_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2Eq[8] = {
+  /* 0 */ { 0, &Ia_rolq_Eq_Ib },
+  /* 1 */ { 0, &Ia_rorq_Eq_Ib },
+  /* 2 */ { 0, &Ia_rclq_Eq_Ib },
+  /* 3 */ { 0, &Ia_rcrq_Eq_Ib },
+  /* 4 */ { 0, &Ia_shlq_Eq_Ib },
+  /* 5 */ { 0, &Ia_shrq_Eq_Ib },
+  /* 6 */ { 0, &Ia_shlq_Eq_Ib },
+  /* 7 */ { 0, &Ia_sarq_Eq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EwI1[8] = {
+  /* 0 */ { 0, &Ia_rolw_Ew_I1 },
+  /* 1 */ { 0, &Ia_rorw_Ew_I1 },
+  /* 2 */ { 0, &Ia_rclw_Ew_I1 },
+  /* 3 */ { 0, &Ia_rcrw_Ew_I1 },
+  /* 4 */ { 0, &Ia_shlw_Ew_I1 },
+  /* 5 */ { 0, &Ia_shrw_Ew_I1 },
+  /* 6 */ { 0, &Ia_shlw_Ew_I1 },
+  /* 7 */ { 0, &Ia_sarw_Ew_I1 }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EdI1[8] = {
+  /* 0 */ { 0, &Ia_roll_Ed_I1 },
+  /* 1 */ { 0, &Ia_rorl_Ed_I1 },
+  /* 2 */ { 0, &Ia_rcll_Ed_I1 },
+  /* 3 */ { 0, &Ia_rcrl_Ed_I1 },
+  /* 4 */ { 0, &Ia_shll_Ed_I1 },
+  /* 5 */ { 0, &Ia_shrl_Ed_I1 },
+  /* 6 */ { 0, &Ia_shll_Ed_I1 },
+  /* 7 */ { 0, &Ia_sarl_Ed_I1 }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EqI1[8] = {
+  /* 0 */ { 0, &Ia_rolq_Eq_I1 },
+  /* 1 */ { 0, &Ia_rorq_Eq_I1 },
+  /* 2 */ { 0, &Ia_rclq_Eq_I1 },
+  /* 3 */ { 0, &Ia_rcrq_Eq_I1 },
+  /* 4 */ { 0, &Ia_shlq_Eq_I1 },
+  /* 5 */ { 0, &Ia_shrq_Eq_I1 },
+  /* 6 */ { 0, &Ia_shlq_Eq_I1 },
+  /* 7 */ { 0, &Ia_sarq_Eq_I1 }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EwCL[8] = {
+  /* 0 */ { 0, &Ia_rolw_Ew_CL },
+  /* 1 */ { 0, &Ia_rorw_Ew_CL },
+  /* 2 */ { 0, &Ia_rclw_Ew_CL },
+  /* 3 */ { 0, &Ia_rcrw_Ew_CL },
+  /* 4 */ { 0, &Ia_shlw_Ew_CL },
+  /* 5 */ { 0, &Ia_shrw_Ew_CL },
+  /* 6 */ { 0, &Ia_shlw_Ew_CL },
+  /* 7 */ { 0, &Ia_sarw_Ew_CL }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EdCL[8] = {
+  /* 0 */ { 0, &Ia_roll_Ed_CL },
+  /* 1 */ { 0, &Ia_rorl_Ed_CL },
+  /* 2 */ { 0, &Ia_rcll_Ed_CL },
+  /* 3 */ { 0, &Ia_rcrl_Ed_CL },
+  /* 4 */ { 0, &Ia_shll_Ed_CL },
+  /* 5 */ { 0, &Ia_shrl_Ed_CL },
+  /* 6 */ { 0, &Ia_shll_Ed_CL },
+  /* 7 */ { 0, &Ia_sarl_Ed_CL }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG2EqCL[8] = {
+  /* 0 */ { 0, &Ia_rolq_Eq_CL },
+  /* 1 */ { 0, &Ia_rorq_Eq_CL },
+  /* 2 */ { 0, &Ia_rclq_Eq_CL },
+  /* 3 */ { 0, &Ia_rcrq_Eq_CL },
+  /* 4 */ { 0, &Ia_shlq_Eq_CL },
+  /* 5 */ { 0, &Ia_shrq_Eq_CL },
+  /* 6 */ { 0, &Ia_shlq_Eq_CL },
+  /* 7 */ { 0, &Ia_sarq_Eq_CL }
+};
+
+/* Group3 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG3Eb[8] = {
+  /* 0 */ { 0, &Ia_testb_Eb_Ib },
+  /* 1 */ { 0, &Ia_testb_Eb_Ib },
+  /* 2 */ { 0, &Ia_notb_Eb     },
+  /* 3 */ { 0, &Ia_negb_Eb     },
+  /* 4 */ { 0, &Ia_mulb_AL_Eb  },
+  /* 5 */ { 0, &Ia_imulb_AL_Eb },
+  /* 6 */ { 0, &Ia_divb_AL_Eb  },
+  /* 7 */ { 0, &Ia_idivb_AL_Eb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG3Ew[8] = {
+  /* 0 */ { 0, &Ia_testw_Ew_Iw },
+  /* 1 */ { 0, &Ia_testw_Ew_Iw },
+  /* 2 */ { 0, &Ia_notw_Ew     },
+  /* 3 */ { 0, &Ia_negw_Ew     },
+  /* 4 */ { 0, &Ia_mulw_AX_Ew  },
+  /* 5 */ { 0, &Ia_imulw_AX_Ew },
+  /* 6 */ { 0, &Ia_divw_AX_Ew  },
+  /* 7 */ { 0, &Ia_idivw_AX_Ew }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG3Ed[8] = {
+  /* 0 */ { 0, &Ia_testl_Ed_Id  },
+  /* 1 */ { 0, &Ia_testl_Ed_Id  },
+  /* 2 */ { 0, &Ia_notl_Ed      },
+  /* 3 */ { 0, &Ia_negl_Ed      },
+  /* 4 */ { 0, &Ia_mull_EAX_Ed  },
+  /* 5 */ { 0, &Ia_imull_EAX_Ed },
+  /* 6 */ { 0, &Ia_divl_EAX_Ed  },
+  /* 7 */ { 0, &Ia_idivl_EAX_Ed }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG3Eq[8] = {
+  /* 0 */ { 0, &Ia_testq_Eq_sId },
+  /* 1 */ { 0, &Ia_testq_Eq_sId },
+  /* 2 */ { 0, &Ia_notq_Eq      },
+  /* 3 */ { 0, &Ia_negq_Eq      },
+  /* 4 */ { 0, &Ia_mulq_RAX_Eq  },
+  /* 5 */ { 0, &Ia_imulq_RAX_Eq },
+  /* 6 */ { 0, &Ia_divq_RAX_Eq  },
+  /* 7 */ { 0, &Ia_idivq_RAX_Eq }
+};
+
+/* Group4 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG4[8] = {
+  /* 0 */ { 0, &Ia_incb_Eb },
+  /* 1 */ { 0, &Ia_decb_Eb },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group5 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG5w[8] = {
+  /* 0 */ { 0, &Ia_incw_Ew  },
+  /* 1 */ { 0, &Ia_decw_Ew  },
+  /* 2 */ { 0, &Ia_call_Ew  },
+  /* 3 */ { 0, &Ia_lcall_Mp },
+  /* 4 */ { 0, &Ia_jmp_Ew   },
+  /* 5 */ { 0, &Ia_ljmp_Mp  },
+  /* 6 */ { 0, &Ia_pushw_Ew },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG5d[8] = {
+  /* 0 */ { 0, &Ia_incl_Ed  },
+  /* 1 */ { 0, &Ia_decl_Ed  },
+  /* 2 */ { 0, &Ia_call_Ed  },
+  /* 3 */ { 0, &Ia_lcall_Mp },
+  /* 4 */ { 0, &Ia_jmp_Ed   },
+  /* 5 */ { 0, &Ia_ljmp_Mp  },
+  /* 6 */ { 0, &Ia_pushl_Ed },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroup64G5w[8] = {
+  /* 0 */ { 0, &Ia_incw_Ew  },
+  /* 1 */ { 0, &Ia_decw_Ew  },
+  /* 2 */ { 0, &Ia_call_Eq  },
+  /* 3 */ { 0, &Ia_lcall_Mp },
+  /* 4 */ { 0, &Ia_jmp_Eq   },
+  /* 5 */ { 0, &Ia_ljmp_Mp  },
+  /* 6 */ { 0, &Ia_pushw_Ew },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroup64G5d[8] = {
+  /* 0 */ { 0, &Ia_incl_Ed  },
+  /* 1 */ { 0, &Ia_decl_Ed  },
+  /* 2 */ { 0, &Ia_call_Eq  },
+  /* 3 */ { 0, &Ia_lcall_Mp },
+  /* 4 */ { 0, &Ia_jmp_Eq   },
+  /* 5 */ { 0, &Ia_ljmp_Mp  },
+  /* 6 */ { 0, &Ia_pushq_Eq },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroup64G5q[8] = {
+  /* 0 */ { 0, &Ia_incq_Eq  },
+  /* 1 */ { 0, &Ia_decq_Eq  },
+  /* 2 */ { 0, &Ia_call_Eq  },
+  /* 3 */ { 0, &Ia_lcall_Mp },
+  /* 4 */ { 0, &Ia_jmp_Eq   },
+  /* 5 */ { 0, &Ia_ljmp_Mp  },
+  /* 6 */ { 0, &Ia_pushq_Eq },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+/* Group6 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG6[8] = {
+  /* 0 */ { 0, &Ia_sldt    },
+  /* 1 */ { 0, &Ia_str     },
+  /* 2 */ { 0, &Ia_lldt    },
+  /* 3 */ { 0, &Ia_ltr     },
+  /* 4 */ { 0, &Ia_verr    },
+  /* 5 */ { 0, &Ia_verw    },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group7 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG7M[8] = {
+  /* 0 */ { 0, &Ia_sgdt    },
+  /* 2 */ { 0, &Ia_sidt    },
+  /* 2 */ { 0, &Ia_lgdt    },
+  /* 3 */ { 0, &Ia_lidt    },
+  /* 4 */ { 0, &Ia_smsw_Ew },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_lmsw_Ew },
+  /* 7 */ { 0, &Ia_invlpg  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupRmINVLPG[8] = {
+  /* 0 */ { 0, &Ia_swapgs  },
+  /* 1 */ { 0, &Ia_rdtscp  },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* VMX */
+static BxDisasmOpcodeTable_t BxDisasmGroupRmG7VMX[8] = {
+  /* 0 */ { 0, &Ia_Invalid  },
+  /* 1 */ { GRPSSENONE(Ia_vmcall) },
+  /* 2 */ { GRPSSENONE(Ia_vmlaunch) },
+  /* 3 */ { GRPSSENONE(Ia_vmresume) },
+  /* 4 */ { GRPSSENONE(Ia_vmxoff) },
+  /* 5 */ { 0, &Ia_Invalid  },
+  /* 6 */ { 0, &Ia_Invalid  },
+  /* 7 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupRmMONITOR[8] = {
+  /* 0 */ { GRPSSENONE(Ia_monitor) },
+  /* 1 */ { GRPSSENONE(Ia_mwait) },
+  /* 2 */ { 0, &Ia_clac },
+  /* 3 */ { 0, &Ia_stac },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupRmXSETGET[8] = {
+  /* 0 */ { GRPSSENONE(Ia_xgetbv) },
+  /* 1 */ { GRPSSENONE(Ia_xsetbv) },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { GRPSSENONE(Ia_vmfunc) },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupRmG7SVM[8] = {
+  /* 0 */ { 0, &Ia_vmrun },
+  /* 1 */ { 0, &Ia_vmmcall },
+  /* 2 */ { 0, &Ia_vmload },
+  /* 3 */ { 0, &Ia_vmsave },
+  /* 4 */ { 0, &Ia_stgi },
+  /* 5 */ { 0, &Ia_clgi },
+  /* 6 */ { 0, &Ia_skinit },
+  /* 7 */ { 0, &Ia_invlpga }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG7R[8] = {
+  /* 0 */ { GRPRM(G7VMX)   }, // VMX
+  /* 1 */ { GRPRM(MONITOR) },
+  /* 2 */ { GRPRM(XSETGET) },
+  /* 3 */ { GRPRM(G7SVM)   }, // SVM
+  /* 4 */ { 0, &Ia_smsw_Ew },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_lmsw_Ew },
+  /* 7 */ { GRPRM(INVLPG)  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModG7[2] = {
+  /* R */ { GRPN(G7R) },
+  /* M */ { GRPN(G7M) }
+};
+
+/* Group8 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG8EwIb[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_btw_Ew_Ib  },
+  /* 5 */ { 0, &Ia_btsw_Ew_Ib },
+  /* 6 */ { 0, &Ia_btrw_Ew_Ib },
+  /* 7 */ { 0, &Ia_btcw_Ew_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG8EdIb[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_btl_Ed_Ib  },
+  /* 5 */ { 0, &Ia_btsl_Ed_Ib },
+  /* 6 */ { 0, &Ia_btrl_Ed_Ib },
+  /* 7 */ { 0, &Ia_btcl_Ed_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG8EqIb[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_btq_Eq_Ib  },
+  /* 5 */ { 0, &Ia_btsq_Eq_Ib },
+  /* 6 */ { 0, &Ia_btrq_Eq_Ib },
+  /* 7 */ { 0, &Ia_btcq_Eq_Ib }
+};
+
+/* ****** */
+/* Group9 */
+/* ****** */
+
+/* VMX */
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G9VMX6[4] = {
+  /* -- */ { 0, &Ia_vmptrld_Mq },
+  /* 66 */ { 0, &Ia_vmclear_Mq },
+  /* F3 */ { 0, &Ia_vmxon_Mq },
+  /* F2 */ { 0, &Ia_Invalid  }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG9M[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_cmpxchg8b_Mq },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_xsavec },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE(G9VMX6) },
+  /* 7 */ { GRPSSENONE(Ia_vmptrst_Mq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG9Mq[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_cmpxchg16b_Mdq },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_xsavec },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE(G9VMX6) },
+  /* 7 */ { GRPSSENONE(Ia_vmptrst_Mq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG9Rw[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSENONE(Ia_rdrand_Ew) },
+  /* 7 */ { GRPSSENONE(Ia_rdseed_Ew) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG9Rd[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSENONE(Ia_rdrand_Ed) },
+  /* 7 */ { GRPSSENONE(Ia_rdseed_Ed) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG9Rq[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSENONE(Ia_rdrand_Eq) },
+  /* 7 */ { GRPSSENONE(Ia_rdseed_Eq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModG9w[2] = {
+  /* R */ { GRPN(G9Rw) },
+  /* M */ { GRPN(G9M) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModG9d[2] = {
+  /* R */ { GRPN(G9Rd) },
+  /* M */ { GRPN(G9M) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModG9q[2] = {
+  /* R */ { GRPN(G9Rq) },
+  /* M */ { GRPN(G9Mq) }
+};
+
+/* Group11 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG11Eb[8] = {
+  /* 0 */ { 0, &Ia_movb_Eb_Ib },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG11Ew[8] = {
+  /* 0 */ { 0, &Ia_movw_Ew_Iw },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG11Ed[8] = {
+  /* 0 */ { 0, &Ia_movl_Ed_Id },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG11Eq[8] = {
+  /* 0 */ { 0, &Ia_movq_Eq_sId },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group12 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG12[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE2(G1202) },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { GRPSSE2(G1204) },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE2(G1206) },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group13 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG13[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE2(G1302) },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { GRPSSE2(G1304) },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE2(G1306) },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group14 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG14[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE2(G1402) },
+  /* 3 */ { GRPSSE66(Ia_psrldq_Udq_Ib) },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE2(G1406) },
+  /* 7 */ { GRPSSE66(Ia_pslldq_Udq_Ib) }
+};
+
+/* Group15 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG15M[8] = {
+  /* 0 */ { 0, &Ia_fxsave },
+  /* 1 */ { 0, &Ia_fxrstor },
+  /* 2 */ { 0, &Ia_ldmxcsr },
+  /* 3 */ { 0, &Ia_stmxcsr },
+  /* 4 */ { 0, &Ia_xsave },
+  /* 5 */ { 0, &Ia_xrstor },
+  /* 6 */ { 0, &Ia_xsaveopt },
+  /* 7 */ { 0, &Ia_clflush }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupG15R[8] = {
+  /* 0 */ { GRPSSEF3(Ia_rdfsbase_Ry) },
+  /* 1 */ { GRPSSEF3(Ia_rdgsbase_Ry) },
+  /* 2 */ { GRPSSEF3(Ia_wrfsbase_Ry) },
+  /* 3 */ { GRPSSEF3(Ia_wrgsbase_Ry) },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_lfence },
+  /* 6 */ { 0, &Ia_mfence },
+  /* 6 */ { 0, &Ia_sfence },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModG15[2] = {
+  /* R */ { GRPN(G15R) },
+  /* M */ { GRPN(G15M) }
+};
+
+/* Group16 */
+static BxDisasmOpcodeTable_t BxDisasmGroupG16[8] =
+{
+  /* 0 */ { 0, &Ia_prefetchnta },
+  /* 1 */ { 0, &Ia_prefetcht0 },
+  /* 2 */ { 0, &Ia_prefetcht1 },
+  /* 3 */ { 0, &Ia_prefetcht2 },
+  /* 4 */ { 0, &Ia_prefetch_hint },
+  /* 5 */ { 0, &Ia_prefetch_hint },
+  /* 6 */ { 0, &Ia_prefetch_hint },
+  /* 7 */ { 0, &Ia_prefetch_hint }
+};
+
+/* ************************************************************************ */
+/* 16-bit operand size */
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodes16[256*2] = {
+  // 256 entries for single byte opcodes
+  /* 00 */ { 0, &Ia_addb_Eb_Gb },
+  /* 01 */ { 0, &Ia_addw_Ew_Gw },
+  /* 02 */ { 0, &Ia_addb_Gb_Eb },
+  /* 03 */ { 0, &Ia_addw_Gw_Ew },
+  /* 04 */ { 0, &Ia_addb_AL_Ib },
+  /* 05 */ { 0, &Ia_addw_AX_Iw },
+  /* 06 */ { 0, &Ia_pushw_ES   },
+  /* 07 */ { 0, &Ia_popw_ES    },
+  /* 08 */ { 0, &Ia_orb_Eb_Gb  },
+  /* 09 */ { 0, &Ia_orw_Ew_Gw  },
+  /* 0A */ { 0, &Ia_orb_Gb_Eb  },
+  /* 0B */ { 0, &Ia_orw_Gw_Ew  },
+  /* 0C */ { 0, &Ia_orb_AL_Ib  },
+  /* 0D */ { 0, &Ia_orw_AX_Iw  },
+  /* 0E */ { 0, &Ia_pushw_CS   },
+  /* 0F */ { 0, &Ia_error      },   // 2 byte escape
+  /* 10 */ { 0, &Ia_adcb_Eb_Gb },
+  /* 11 */ { 0, &Ia_adcw_Ew_Gw },
+  /* 12 */ { 0, &Ia_adcb_Gb_Eb },
+  /* 13 */ { 0, &Ia_adcw_Gw_Ew },
+  /* 14 */ { 0, &Ia_adcb_AL_Ib },
+  /* 15 */ { 0, &Ia_adcw_AX_Iw },
+  /* 16 */ { 0, &Ia_pushw_SS   },
+  /* 17 */ { 0, &Ia_popw_SS    },
+  /* 18 */ { 0, &Ia_sbbb_Eb_Gb },
+  /* 19 */ { 0, &Ia_sbbw_Ew_Gw },
+  /* 1A */ { 0, &Ia_sbbb_Gb_Eb },
+  /* 1B */ { 0, &Ia_sbbw_Gw_Ew },
+  /* 1C */ { 0, &Ia_sbbb_AL_Ib },
+  /* 1D */ { 0, &Ia_sbbw_AX_Iw },
+  /* 1E */ { 0, &Ia_pushw_DS   },
+  /* 1F */ { 0, &Ia_popw_DS    },
+  /* 20 */ { 0, &Ia_andb_Eb_Gb },
+  /* 21 */ { 0, &Ia_andw_Ew_Gw },
+  /* 22 */ { 0, &Ia_andb_Gb_Eb },
+  /* 23 */ { 0, &Ia_andw_Gw_Ew },
+  /* 24 */ { 0, &Ia_andb_AL_Ib },
+  /* 25 */ { 0, &Ia_andw_AX_Iw },
+  /* 26 */ { 0, &Ia_prefix_es  },   // ES:
+  /* 27 */ { 0, &Ia_daa        },
+  /* 28 */ { 0, &Ia_subb_Eb_Gb },
+  /* 29 */ { 0, &Ia_subw_Ew_Gw },
+  /* 2A */ { 0, &Ia_subb_Gb_Eb },
+  /* 2B */ { 0, &Ia_subw_Gw_Ew },
+  /* 2C */ { 0, &Ia_subb_AL_Ib },
+  /* 2D */ { 0, &Ia_subw_AX_Iw },
+  /* 2E */ { 0, &Ia_prefix_cs  },   // CS:
+  /* 2F */ { 0, &Ia_das        },
+  /* 30 */ { 0, &Ia_xorb_Eb_Gb },
+  /* 31 */ { 0, &Ia_xorw_Ew_Gw },
+  /* 32 */ { 0, &Ia_xorb_Gb_Eb },
+  /* 33 */ { 0, &Ia_xorw_Gw_Ew },
+  /* 34 */ { 0, &Ia_xorb_AL_Ib },
+  /* 35 */ { 0, &Ia_xorw_AX_Iw },
+  /* 36 */ { 0, &Ia_prefix_ss  },   // SS:
+  /* 37 */ { 0, &Ia_aaa        },
+  /* 38 */ { 0, &Ia_cmpb_Eb_Gb },
+  /* 39 */ { 0, &Ia_cmpw_Ew_Gw },
+  /* 3A */ { 0, &Ia_cmpb_Gb_Eb },
+  /* 3B */ { 0, &Ia_cmpw_Gw_Ew },
+  /* 3C */ { 0, &Ia_cmpb_AL_Ib },
+  /* 3D */ { 0, &Ia_cmpw_AX_Iw },
+  /* 3E */ { 0, &Ia_prefix_ds  },   // DS:
+  /* 3F */ { 0, &Ia_aas        },
+  /* 40 */ { 0, &Ia_incw_RX    },
+  /* 41 */ { 0, &Ia_incw_RX    },
+  /* 42 */ { 0, &Ia_incw_RX    },
+  /* 43 */ { 0, &Ia_incw_RX    },
+  /* 44 */ { 0, &Ia_incw_RX    },
+  /* 45 */ { 0, &Ia_incw_RX    },
+  /* 46 */ { 0, &Ia_incw_RX    },
+  /* 47 */ { 0, &Ia_incw_RX    },
+  /* 48 */ { 0, &Ia_decw_RX    },
+  /* 49 */ { 0, &Ia_decw_RX    },
+  /* 4A */ { 0, &Ia_decw_RX    },
+  /* 4B */ { 0, &Ia_decw_RX    },
+  /* 4C */ { 0, &Ia_decw_RX    },
+  /* 4D */ { 0, &Ia_decw_RX    },
+  /* 4E */ { 0, &Ia_decw_RX    },
+  /* 4F */ { 0, &Ia_decw_RX    },
+  /* 50 */ { 0, &Ia_pushw_RX   },
+  /* 51 */ { 0, &Ia_pushw_RX   },
+  /* 52 */ { 0, &Ia_pushw_RX   },
+  /* 53 */ { 0, &Ia_pushw_RX   },
+  /* 54 */ { 0, &Ia_pushw_RX   },
+  /* 55 */ { 0, &Ia_pushw_RX   },
+  /* 56 */ { 0, &Ia_pushw_RX   },
+  /* 57 */ { 0, &Ia_pushw_RX   },
+  /* 58 */ { 0, &Ia_popw_RX    },
+  /* 59 */ { 0, &Ia_popw_RX    },
+  /* 5A */ { 0, &Ia_popw_RX    },
+  /* 5B */ { 0, &Ia_popw_RX    },
+  /* 5C */ { 0, &Ia_popw_RX    },
+  /* 5D */ { 0, &Ia_popw_RX    },
+  /* 5E */ { 0, &Ia_popw_RX    },
+  /* 5F */ { 0, &Ia_popw_RX    },
+  /* 60 */ { 0, &Ia_pushaw     },
+  /* 61 */ { 0, &Ia_popaw      },
+  /* 62 */ { 0, &Ia_boundw_Gw_Ma },
+  /* 63 */ { 0, &Ia_arpl_Ew_Gw },
+  /* 64 */ { 0, &Ia_prefix_fs  },   // FS:
+  /* 65 */ { 0, &Ia_prefix_gs  },   // GS:
+  /* 66 */ { 0, &Ia_prefix_osize }, // OSIZE:
+  /* 67 */ { 0, &Ia_prefix_asize }, // ASIZE:
+  /* 68 */ { 0, &Ia_pushw_Iw   },
+  /* 69 */ { 0, &Ia_imulw_Gw_Ew_Iw  },
+  /* 6A */ { 0, &Ia_pushw_sIb   },
+  /* 6B */ { 0, &Ia_imulw_Gw_Ew_sIb },
+  /* 6C */ { 0, &Ia_insb_Yb_DX  },
+  /* 6D */ { 0, &Ia_insw_Yw_DX  },
+  /* 6E */ { 0, &Ia_outsb_DX_Xb },
+  /* 6F */ { 0, &Ia_outsw_DX_Xw },
+  /* 70 */ { 0, &Ia_jo_Jb       },
+  /* 71 */ { 0, &Ia_jno_Jb      },
+  /* 72 */ { 0, &Ia_jb_Jb       },
+  /* 73 */ { 0, &Ia_jnb_Jb      },
+  /* 74 */ { 0, &Ia_jz_Jb       },
+  /* 75 */ { 0, &Ia_jnz_Jb      },
+  /* 76 */ { 0, &Ia_jbe_Jb      },
+  /* 77 */ { 0, &Ia_jnbe_Jb     },
+  /* 78 */ { 0, &Ia_js_Jb       },
+  /* 79 */ { 0, &Ia_jns_Jb      },
+  /* 7A */ { 0, &Ia_jp_Jb       },
+  /* 7B */ { 0, &Ia_jnp_Jb      },
+  /* 7C */ { 0, &Ia_jl_Jb       },
+  /* 7D */ { 0, &Ia_jnl_Jb      },
+  /* 7E */ { 0, &Ia_jle_Jb      },
+  /* 7F */ { 0, &Ia_jnle_Jb     },
+  /* 80 */ { GRPN(G1EbIb)       },
+  /* 81 */ { GRPN(G1EwIw)       },
+  /* 82 */ { GRPN(G1EbIb)       },
+  /* 83 */ { GRPN(G1EwIb)       },
+  /* 84 */ { 0, &Ia_testb_Eb_Gb },
+  /* 85 */ { 0, &Ia_testw_Ew_Gw },
+  /* 86 */ { 0, &Ia_xchgb_Eb_Gb },
+  /* 87 */ { 0, &Ia_xchgw_Ew_Gw },
+  /* 88 */ { 0, &Ia_movb_Eb_Gb  },
+  /* 89 */ { 0, &Ia_movw_Ew_Gw  },
+  /* 8A */ { 0, &Ia_movb_Gb_Eb  },
+  /* 8B */ { 0, &Ia_movw_Gw_Ew  },
+  /* 8C */ { 0, &Ia_movw_Ew_Sw  },
+  /* 8D */ { 0, &Ia_leaw_Gw_Mw  },
+  /* 8E */ { 0, &Ia_movw_Sw_Ew  },
+  /* 8F */ { 0, &Ia_popw_Ew     },
+  /* 90 */ { 0, &Ia_nop         },
+  /* 91 */ { 0, &Ia_xchgw_RX_AX },
+  /* 92 */ { 0, &Ia_xchgw_RX_AX },
+  /* 93 */ { 0, &Ia_xchgw_RX_AX },
+  /* 94 */ { 0, &Ia_xchgw_RX_AX },
+  /* 95 */ { 0, &Ia_xchgw_RX_AX },
+  /* 96 */ { 0, &Ia_xchgw_RX_AX },
+  /* 97 */ { 0, &Ia_xchgw_RX_AX },
+  /* 98 */ { 0, &Ia_cbw         },
+  /* 99 */ { 0, &Ia_cwd         },
+  /* 9A */ { 0, &Ia_lcall_Apw   },
+  /* 9B */ { 0, &Ia_fwait       },
+  /* 9C */ { 0, &Ia_pushfw      },
+  /* 9D */ { 0, &Ia_popfw       },
+  /* 9E */ { 0, &Ia_sahf        },
+  /* 9F */ { 0, &Ia_lahf        },
+  /* A0 */ { 0, &Ia_movb_AL_Ob  },
+  /* A1 */ { 0, &Ia_movw_AX_Ow  },
+  /* A0 */ { 0, &Ia_movb_Ob_AL  },
+  /* A1 */ { 0, &Ia_movw_Ow_AX  },
+  /* A4 */ { 0, &Ia_movsb_Yb_Xb },
+  /* A5 */ { 0, &Ia_movsw_Yw_Xw },
+  /* A6 */ { 0, &Ia_cmpsb_Xb_Yb },
+  /* A7 */ { 0, &Ia_cmpsw_Xw_Yw },
+  /* A8 */ { 0, &Ia_testb_AL_Ib },
+  /* A9 */ { 0, &Ia_testw_AX_Iw },
+  /* AA */ { 0, &Ia_stosb_Yb_AL },
+  /* AB */ { 0, &Ia_stosw_Yw_AX },
+  /* AC */ { 0, &Ia_lodsb_AL_Xb },
+  /* AD */ { 0, &Ia_lodsw_AX_Xw },
+  /* AE */ { 0, &Ia_scasb_AL_Yb },
+  /* AF */ { 0, &Ia_scasw_AX_Yw },
+  /* B0 */ { 0, &Ia_movb_R8_Ib  },
+  /* B1 */ { 0, &Ia_movb_R8_Ib  },
+  /* B2 */ { 0, &Ia_movb_R8_Ib  },
+  /* B3 */ { 0, &Ia_movb_R8_Ib  },
+  /* B4 */ { 0, &Ia_movb_R8_Ib  },
+  /* B5 */ { 0, &Ia_movb_R8_Ib  },
+  /* B6 */ { 0, &Ia_movb_R8_Ib  },
+  /* B7 */ { 0, &Ia_movb_R8_Ib  },
+  /* B8 */ { 0, &Ia_movw_RX_Iw  },
+  /* B9 */ { 0, &Ia_movw_RX_Iw  },
+  /* BA */ { 0, &Ia_movw_RX_Iw  },
+  /* BB */ { 0, &Ia_movw_RX_Iw  },
+  /* BC */ { 0, &Ia_movw_RX_Iw  },
+  /* BD */ { 0, &Ia_movw_RX_Iw  },
+  /* BE */ { 0, &Ia_movw_RX_Iw  },
+  /* BF */ { 0, &Ia_movw_RX_Iw  },
+  /* C0 */ { GRPN(G2Eb)         },
+  /* C1 */ { GRPN(G2Ew)         },
+  /* C2 */ { 0, &Ia_ret_Iw      },
+  /* C3 */ { 0, &Ia_ret         },
+  /* C4 */ { 0, &Ia_lesw_Gw_Mp  },
+  /* C5 */ { 0, &Ia_ldsw_Gw_Mp  },
+  /* C6 */ { GRPN(G11Eb)        },
+  /* C7 */ { GRPN(G11Ew)        },
+  /* C8 */ { 0, &Ia_enter       },
+  /* C9 */ { 0, &Ia_leave       },
+  /* CA */ { 0, &Ia_lret_Iw     },
+  /* CB */ { 0, &Ia_lret        },
+  /* CC */ { 0, &Ia_int3        },
+  /* CD */ { 0, &Ia_int_Ib      },
+  /* CE */ { 0, &Ia_into        },
+  /* CF */ { 0, &Ia_iretw       },
+  /* D0 */ { GRPN(G2EbI1)       },
+  /* D1 */ { GRPN(G2EwI1)       },
+  /* D2 */ { GRPN(G2EbCL)       },
+  /* D3 */ { GRPN(G2EwCL)       },
+  /* D4 */ { 0, &Ia_aam         },
+  /* D5 */ { 0, &Ia_aad         },
+  /* D6 */ { 0, &Ia_salc        },
+  /* D7 */ { 0, &Ia_xlat        },
+  /* D8 */ { GRPFP(D8)          },
+  /* D9 */ { GRPFP(D9)          },
+  /* DA */ { GRPFP(DA)          },
+  /* DB */ { GRPFP(DB)          },
+  /* DC */ { GRPFP(DC)          },
+  /* DD */ { GRPFP(DD)          },
+  /* DE */ { GRPFP(DE)          },
+  /* DF */ { GRPFP(DF)          },
+  /* E0 */ { 0, &Ia_loopne_Jb   },
+  /* E1 */ { 0, &Ia_loope_Jb    },
+  /* E2 */ { 0, &Ia_loop_Jb     },
+  /* E3 */ { 0, &Ia_jcxz_Jb     },
+  /* E4 */ { 0, &Ia_inb_AL_Ib   },
+  /* E5 */ { 0, &Ia_inw_AX_Ib   },
+  /* E6 */ { 0, &Ia_outb_Ib_AL  },
+  /* E7 */ { 0, &Ia_outw_Ib_AX  },
+  /* E8 */ { 0, &Ia_call_Jw     },
+  /* E9 */ { 0, &Ia_jmp_Jw      },
+  /* EA */ { 0, &Ia_ljmp_Apw    },
+  /* EB */ { 0, &Ia_jmp_Jb      },
+  /* EC */ { 0, &Ia_inb_AL_DX   },
+  /* ED */ { 0, &Ia_inw_AX_DX   },
+  /* EE */ { 0, &Ia_outb_DX_AL  },
+  /* EF */ { 0, &Ia_outw_DX_AX  },
+  /* F0 */ { 0, &Ia_prefix_lock },   // LOCK:
+  /* F1 */ { 0, &Ia_int1        },
+  /* F2 */ { 0, &Ia_prefix_repne },  // REPNE:
+  /* F3 */ { 0, &Ia_prefix_rep  },   // REP:
+  /* F4 */ { 0, &Ia_hlt         },
+  /* F5 */ { 0, &Ia_cmc         },
+  /* F6 */ { GRPN(G3Eb)         },
+  /* F7 */ { GRPN(G3Ew)         },
+  /* F8 */ { 0, &Ia_clc         },
+  /* F9 */ { 0, &Ia_stc         },
+  /* FA */ { 0, &Ia_cli         },
+  /* FB */ { 0, &Ia_sti         },
+  /* FC */ { 0, &Ia_cld         },
+  /* FD */ { 0, &Ia_std         },
+  /* FE */ { GRPN(G4)           },
+  /* FF */ { GRPN(G5w)          },
+
+  // 256 entries for two byte opcodes
+  /* 0F 00 */ { GRPN(G6)          },
+  /* 0F 01 */ { GRPMOD(G7)        },
+  /* 0F 02 */ { 0, &Ia_larw_Gw_Ew },
+  /* 0F 03 */ { 0, &Ia_lslw_Gw_Ew },
+  /* 0F 04 */ { 0, &Ia_Invalid    },
+  /* 0F 05 */ { 0, &Ia_syscall    },
+  /* 0F 06 */ { 0, &Ia_clts       },
+  /* 0F 07 */ { 0, &Ia_sysret     },
+  /* 0F 08 */ { 0, &Ia_invd       },
+  /* 0F 09 */ { 0, &Ia_wbinvd     },
+  /* 0F 0A */ { 0, &Ia_Invalid    },
+  /* 0F 0B */ { 0, &Ia_ud2a       },
+  /* 0F 0C */ { 0, &Ia_Invalid    },
+  /* 0F 0D */ { 0, &Ia_prefetchw  },   // 3DNow!
+  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
+  /* 0F 0F */ { GRP3DNOW          },
+  /* 0F 10 */ { GRPSSE(0f10)      },
+  /* 0F 11 */ { GRPSSE(0f11)      },
+  /* 0F 12 */ { GRPSSE(0f12)      },
+  /* 0F 13 */ { GRPSSE2(0f13)     },
+  /* 0F 14 */ { GRPSSE2(0f14)     },
+  /* 0F 15 */ { GRPSSE2(0f15)     },
+  /* 0F 16 */ { GRPSSE(0f16)      },
+  /* 0F 17 */ { GRPSSE2(0f17)     },
+  /* 0F 18 */ { GRPN(G16)         },
+  /* 0F 19 */ { 0, &Ia_multibyte_nop },
+  /* 0F 1A */ { 0, &Ia_multibyte_nop },
+  /* 0F 1B */ { 0, &Ia_multibyte_nop },
+  /* 0F 1C */ { 0, &Ia_multibyte_nop },
+  /* 0F 1D */ { 0, &Ia_multibyte_nop },
+  /* 0F 1E */ { 0, &Ia_multibyte_nop },
+  /* 0F 1F */ { 0, &Ia_multibyte_nop },
+  /* 0F 20 */ { 0, &Ia_movl_Rd_Cd },
+  /* 0F 21 */ { 0, &Ia_movl_Rd_Dd },
+  /* 0F 22 */ { 0, &Ia_movl_Cd_Rd },
+  /* 0F 23 */ { 0, &Ia_movl_Dd_Rd },
+  /* 0F 24 */ { 0, &Ia_Invalid },
+  /* 0F 25 */ { 0, &Ia_Invalid },
+  /* 0F 26 */ { 0, &Ia_Invalid },
+  /* 0F 27 */ { 0, &Ia_Invalid },
+  /* 0F 28 */ { GRPSSE2(0f28) },
+  /* 0F 29 */ { GRPSSE2(0f29) },
+  /* 0F 2A */ { GRPSSE(0f2a) },
+  /* 0F 2B */ { GRPSSE(0f2b) },
+  /* 0F 2C */ { GRPSSE(0f2c) },
+  /* 0F 2D */ { GRPSSE(0f2d) },
+  /* 0F 2E */ { GRPSSE2(0f2e) },
+  /* 0F 2F */ { GRPSSE2(0f2f) },
+  /* 0F 30 */ { 0, &Ia_wrmsr },
+  /* 0F 31 */ { 0, &Ia_rdtsc },
+  /* 0F 32 */ { 0, &Ia_rdmsr },
+  /* 0F 33 */ { 0, &Ia_rdpmc },
+  /* 0F 34 */ { 0, &Ia_sysenter },
+  /* 0F 35 */ { 0, &Ia_sysexit },
+  /* 0F 36 */ { 0, &Ia_Invalid },
+  /* 0F 37 */ { 0, &Ia_getsec },
+  /* 0F 38 */ { GR3BTAB(0f38) },
+  /* 0F 39 */ { 0, &Ia_Invalid  },
+  /* 0F 3A */ { GR3BTAB(0f3a) },
+  /* 0F 3B */ { 0, &Ia_Invalid },
+  /* 0F 3C */ { 0, &Ia_Invalid },
+  /* 0F 3D */ { 0, &Ia_Invalid },
+  /* 0F 3E */ { 0, &Ia_Invalid },
+  /* 0F 3F */ { 0, &Ia_Invalid },
+  /* 0F 40 */ { 0, &Ia_cmovow_Gw_Ew  },
+  /* 0F 41 */ { 0, &Ia_cmovnow_Gw_Ew },
+  /* 0F 42 */ { 0, &Ia_cmovbw_Gw_Ew  },
+  /* 0F 43 */ { 0, &Ia_cmovnbw_Gw_Ew },
+  /* 0F 44 */ { 0, &Ia_cmovzw_Gw_Ew  },
+  /* 0F 45 */ { 0, &Ia_cmovnzw_Gw_Ew },
+  /* 0F 46 */ { 0, &Ia_cmovbew_Gw_Ew },
+  /* 0F 47 */ { 0, &Ia_cmovnbew_Gw_Ew  },
+  /* 0F 48 */ { 0, &Ia_cmovsw_Gw_Ew  },
+  /* 0F 49 */ { 0, &Ia_cmovnsw_Gw_Ew },
+  /* 0F 4A */ { 0, &Ia_cmovpw_Gw_Ew  },
+  /* 0F 4B */ { 0, &Ia_cmovnpw_Gw_Ew },
+  /* 0F 4C */ { 0, &Ia_cmovlw_Gw_Ew  },
+  /* 0F 4D */ { 0, &Ia_cmovnlw_Gw_Ew },
+  /* 0F 4E */ { 0, &Ia_cmovlew_Gw_Ew },
+  /* 0F 4F */ { 0, &Ia_cmovnlew_Gw_Ew  },
+  /* 0F 50 */ { GRPSSE2(0f50) },
+  /* 0F 51 */ { GRPSSE(0f51) },
+  /* 0F 52 */ { GRPSSE(0f52) },
+  /* 0F 53 */ { GRPSSE(0f53) },
+  /* 0F 54 */ { GRPSSE2(0f54) },
+  /* 0F 55 */ { GRPSSE2(0f55) },
+  /* 0F 56 */ { GRPSSE2(0f56) },
+  /* 0F 57 */ { GRPSSE2(0f57) },
+  /* 0F 58 */ { GRPSSE(0f58) },
+  /* 0F 59 */ { GRPSSE(0f59) },
+  /* 0F 5A */ { GRPSSE(0f5a) },
+  /* 0F 5B */ { GRPSSE(0f5b) },
+  /* 0F 5C */ { GRPSSE(0f5c) },
+  /* 0F 5D */ { GRPSSE(0f5d) },
+  /* 0F 5E */ { GRPSSE(0f5e) },
+  /* 0F 5F */ { GRPSSE(0f5f) },
+  /* 0F 60 */ { GRPSSE2(0f60) },
+  /* 0F 61 */ { GRPSSE2(0f61) },
+  /* 0F 62 */ { GRPSSE2(0f62) },
+  /* 0F 63 */ { GRPSSE2(0f63) },
+  /* 0F 64 */ { GRPSSE2(0f64) },
+  /* 0F 65 */ { GRPSSE2(0f65) },
+  /* 0F 66 */ { GRPSSE2(0f66) },
+  /* 0F 67 */ { GRPSSE2(0f67) },
+  /* 0F 68 */ { GRPSSE2(0f68) },
+  /* 0F 69 */ { GRPSSE2(0f69) },
+  /* 0F 6A */ { GRPSSE2(0f6a) },
+  /* 0F 6B */ { GRPSSE2(0f6b) },
+  /* 0F 6C */ { GRPSSE66(Ia_punpcklqdq_Vdq_Wdq) },
+  /* 0F 6D */ { GRPSSE66(Ia_punpckhqdq_Vdq_Wdq) },
+  /* 0F 6E */ { GRPSSE2(0f6e) },
+  /* 0F 6F */ { GRPSSE(0f6f) },
+  /* 0F 70 */ { GRPSSE(0f70) },
+  /* 0F 71 */ { GRPN(G12) },
+  /* 0F 72 */ { GRPN(G13) },
+  /* 0F 73 */ { GRPN(G14) },
+  /* 0F 74 */ { GRPSSE2(0f74) },
+  /* 0F 75 */ { GRPSSE2(0f75) },
+  /* 0F 76 */ { GRPSSE2(0f76) },
+  /* 0F 77 */ { 0, &Ia_emms  },
+  /* 0F 78 */ { GRPSSE(0f78) }, // VMX
+  /* 0F 79 */ { GRPSSE(0f79) }, // VMX
+  /* 0F 7A */ { 0, &Ia_Invalid },
+  /* 0F 7B */ { 0, &Ia_Invalid },
+  /* 0F 7C */ { GRPSSE(0f7c) },
+  /* 0F 7D */ { GRPSSE(0f7d) },
+  /* 0F 7E */ { GRPSSE(0f7e) },
+  /* 0F 7F */ { GRPSSE(0f7f) },
+  /* 0F 80 */ { 0, &Ia_jo_Jw     },
+  /* 0F 81 */ { 0, &Ia_jno_Jw    },
+  /* 0F 82 */ { 0, &Ia_jb_Jw     },
+  /* 0F 83 */ { 0, &Ia_jnb_Jw    },
+  /* 0F 84 */ { 0, &Ia_jz_Jw     },
+  /* 0F 85 */ { 0, &Ia_jnz_Jw    },
+  /* 0F 86 */ { 0, &Ia_jbe_Jw    },
+  /* 0F 87 */ { 0, &Ia_jnbe_Jw   },
+  /* 0F 88 */ { 0, &Ia_js_Jw     },
+  /* 0F 89 */ { 0, &Ia_jns_Jw    },
+  /* 0F 8A */ { 0, &Ia_jp_Jw     },
+  /* 0F 8B */ { 0, &Ia_jnp_Jw    },
+  /* 0F 8C */ { 0, &Ia_jl_Jw     },
+  /* 0F 8D */ { 0, &Ia_jnl_Jw    },
+  /* 0F 8E */ { 0, &Ia_jle_Jw    },
+  /* 0F 8F */ { 0, &Ia_jnle_Jw   },
+  /* 0F 90 */ { 0, &Ia_seto_Eb   },
+  /* 0F 91 */ { 0, &Ia_setno_Eb  },
+  /* 0F 92 */ { 0, &Ia_setb_Eb   },
+  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
+  /* 0F 94 */ { 0, &Ia_setz_Eb   },
+  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
+  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
+  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
+  /* 0F 98 */ { 0, &Ia_sets_Eb   },
+  /* 0F 99 */ { 0, &Ia_setns_Eb  },
+  /* 0F 9A */ { 0, &Ia_setp_Eb   },
+  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
+  /* 0F 9C */ { 0, &Ia_setl_Eb   },
+  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
+  /* 0F 9E */ { 0, &Ia_setle_Eb  },
+  /* 0F 9F */ { 0, &Ia_setnle_Eb },
+  /* 0F A0 */ { 0, &Ia_pushw_FS  },
+  /* 0F A1 */ { 0, &Ia_popw_FS   },
+  /* 0F A2 */ { 0, &Ia_cpuid     },
+  /* 0F A3 */ { 0, &Ia_btw_Ew_Gw },
+  /* 0F A4 */ { 0, &Ia_shldw_Ew_Gw_Ib },
+  /* 0F A5 */ { 0, &Ia_shldw_Ew_Gw_CL },
+  /* 0F A6 */ { 0, &Ia_Invalid        },
+  /* 0F A7 */ { 0, &Ia_Invalid        },
+  /* 0F A8 */ { 0, &Ia_pushw_GS       },
+  /* 0F A9 */ { 0, &Ia_popw_GS        },
+  /* 0F AA */ { 0, &Ia_rsm            },
+  /* 0F AB */ { 0, &Ia_btsw_Ew_Gw     },
+  /* 0F AC */ { 0, &Ia_shrdw_Ew_Gw_Ib },
+  /* 0F AD */ { 0, &Ia_shrdw_Ew_Gw_CL },
+  /* 0F AE */ { GRPMOD(G15)           },
+  /* 0F AF */ { 0, &Ia_imulw_Gw_Ew    },
+  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
+  /* 0F B1 */ { 0, &Ia_cmpxchgw_Ew_Gw },
+  /* 0F B2 */ { 0, &Ia_lssw_Gw_Mp   },
+  /* 0F B3 */ { 0, &Ia_btrw_Ew_Gw   },
+  /* 0F B4 */ { 0, &Ia_lfsw_Gw_Mp   },
+  /* 0F B5 */ { 0, &Ia_lgsw_Gw_Mp   },
+  /* 0F B6 */ { 0, &Ia_movzbw_Gw_Eb },
+  /* 0F B7 */ { 0, &Ia_movw_Gw_Ew   },
+  /* 0F B8 */ { GRPSSEF3(Ia_popcnt_Gw_Ew) },
+  /* 0F B9 */ { 0, &Ia_ud2b         },
+  /* 0F BA */ { GRPN(G8EwIb)        },
+  /* 0F BB */ { 0, &Ia_btcw_Ew_Gw   },
+  /* 0F BC */ { GRPSSE(0fbcw) },
+  /* 0F BD */ { GRPSSE(0fbdw) },
+  /* 0F BE */ { 0, &Ia_movsbw_Gw_Eb },
+  /* 0F BF */ { 0, &Ia_movw_Gw_Ew   },
+  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
+  /* 0F C0 */ { 0, &Ia_xaddw_Ew_Gw  },
+  /* 0F C2 */ { GRPSSE(0fc2) },
+  /* 0F C3 */ { GRPSSENONE(Ia_movnti_Md_Gd) },
+  /* 0F C4 */ { GRPSSE2(0fc4) },
+  /* 0F C5 */ { GRPSSE2(0fc5) },
+  /* 0F C6 */ { GRPSSE2(0fc6) },
+  /* 0F C7 */ { GRPMOD(G9w) },
+  /* 0F C8 */ { 0, &Ia_bswapw_RX },
+  /* 0F C9 */ { 0, &Ia_bswapw_RX },
+  /* 0F CA */ { 0, &Ia_bswapw_RX },
+  /* 0F CB */ { 0, &Ia_bswapw_RX },
+  /* 0F CC */ { 0, &Ia_bswapw_RX },
+  /* 0F CD */ { 0, &Ia_bswapw_RX },
+  /* 0F CE */ { 0, &Ia_bswapw_RX },
+  /* 0F CF */ { 0, &Ia_bswapw_RX },
+  /* 0F D0 */ { GRPSSE(0fd0) },
+  /* 0F D1 */ { GRPSSE2(0fd1) },
+  /* 0F D2 */ { GRPSSE2(0fd2) },
+  /* 0F D3 */ { GRPSSE2(0fd3) },
+  /* 0F D4 */ { GRPSSE2(0fd4) },
+  /* 0F D5 */ { GRPSSE2(0fd5) },
+  /* 0F D6 */ { GRPSSE(0fd6) },
+  /* 0F D7 */ { GRPSSE2(0fd7) },
+  /* 0F D8 */ { GRPSSE2(0fd8) },
+  /* 0F D9 */ { GRPSSE2(0fd9) },
+  /* 0F DA */ { GRPSSE2(0fda) },
+  /* 0F DB */ { GRPSSE2(0fdb) },
+  /* 0F DC */ { GRPSSE2(0fdc) },
+  /* 0F DD */ { GRPSSE2(0fdd) },
+  /* 0F DE */ { GRPSSE2(0fde) },
+  /* 0F DF */ { GRPSSE2(0fdf) },
+  /* 0F E0 */ { GRPSSE2(0fe0) },
+  /* 0F E1 */ { GRPSSE2(0fe1) },
+  /* 0F E2 */ { GRPSSE2(0fe2) },
+  /* 0F E3 */ { GRPSSE2(0fe3) },
+  /* 0F E4 */ { GRPSSE2(0fe4) },
+  /* 0F E5 */ { GRPSSE2(0fe5) },
+  /* 0F E6 */ { GRPSSE(0fe6) },
+  /* 0F E7 */ { GRPSSE2(0fe7) },
+  /* 0F E8 */ { GRPSSE2(0fe8) },
+  /* 0F E9 */ { GRPSSE2(0fe9) },
+  /* 0F EA */ { GRPSSE2(0fea) },
+  /* 0F EB */ { GRPSSE2(0feb) },
+  /* 0F EC */ { GRPSSE2(0fec) },
+  /* 0F ED */ { GRPSSE2(0fed) },
+  /* 0F EE */ { GRPSSE2(0fee) },
+  /* 0F EF */ { GRPSSE2(0fef) },
+  /* 0F F0 */ { GRPSSEF2(Ia_lddqu_Vdq_Mdq) },
+  /* 0F F1 */ { GRPSSE2(0ff1) },
+  /* 0F F2 */ { GRPSSE2(0ff2) },
+  /* 0F F3 */ { GRPSSE2(0ff3) },
+  /* 0F F4 */ { GRPSSE2(0ff4) },
+  /* 0F F5 */ { GRPSSE2(0ff5) },
+  /* 0F F6 */ { GRPSSE2(0ff6) },
+  /* 0F F7 */ { GRPSSE2(0ff7) },
+  /* 0F F8 */ { GRPSSE2(0ff8) },
+  /* 0F F9 */ { GRPSSE2(0ff9) },
+  /* 0F FA */ { GRPSSE2(0ffa) },
+  /* 0F FB */ { GRPSSE2(0ffb) },
+  /* 0F FC */ { GRPSSE2(0ffc) },
+  /* 0F FD */ { GRPSSE2(0ffd) },
+  /* 0F FE */ { GRPSSE2(0ffe) },
+  /* 0F FF */ { 0, &Ia_Invalid }
+};
+
+/* ************************************************************************ */
+/* 32-bit operand size */
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodes32[256*2] = {
+  // 256 entries for single byte opcodes
+  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
+  /* 01 */ { 0, &Ia_addl_Ed_Gd    },
+  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
+  /* 03 */ { 0, &Ia_addl_Gd_Ed    },
+  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
+  /* 05 */ { 0, &Ia_addl_EAX_Id,  },
+  /* 06 */ { 0, &Ia_pushl_ES      },
+  /* 07 */ { 0, &Ia_popl_ES       },
+  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
+  /* 09 */ { 0, &Ia_orl_Ed_Gd     },
+  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
+  /* 0B */ { 0, &Ia_orl_Gd_Ed     },
+  /* 0C */ { 0, &Ia_orb_AL_Ib     },
+  /* 0D */ { 0, &Ia_orl_EAX_Id    },
+  /* 0E */ { 0, &Ia_pushl_CS      },
+  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
+  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
+  /* 11 */ { 0, &Ia_adcl_Ed_Gd    },
+  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
+  /* 13 */ { 0, &Ia_adcl_Gd_Ed    },
+  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
+  /* 15 */ { 0, &Ia_adcl_EAX_Id   },
+  /* 16 */ { 0, &Ia_pushl_SS      },
+  /* 17 */ { 0, &Ia_popl_SS       },
+  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
+  /* 19 */ { 0, &Ia_sbbl_Ed_Gd    },
+  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
+  /* 1B */ { 0, &Ia_sbbl_Gd_Ed    },
+  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
+  /* 1D */ { 0, &Ia_sbbl_EAX_Id   },
+  /* 1E */ { 0, &Ia_pushl_DS      },
+  /* 1F */ { 0, &Ia_popl_DS       },
+  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
+  /* 21 */ { 0, &Ia_andl_Ed_Gd    },
+  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
+  /* 23 */ { 0, &Ia_andl_Gd_Ed    },
+  /* 24 */ { 0, &Ia_andb_AL_Ib    },
+  /* 25 */ { 0, &Ia_andl_EAX_Id   },
+  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
+  /* 27 */ { 0, &Ia_daa           },
+  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
+  /* 29 */ { 0, &Ia_subl_Ed_Gd    },
+  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
+  /* 2B */ { 0, &Ia_subl_Gd_Ed    },
+  /* 2C */ { 0, &Ia_subb_AL_Ib    },
+  /* 2D */ { 0, &Ia_subl_EAX_Id   },
+  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
+  /* 2F */ { 0, &Ia_das           },
+  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
+  /* 31 */ { 0, &Ia_xorl_Ed_Gd    },
+  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
+  /* 33 */ { 0, &Ia_xorl_Gd_Ed    },
+  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
+  /* 35 */ { 0, &Ia_xorl_EAX_Id   },
+  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
+  /* 37 */ { 0, &Ia_aaa           },
+  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
+  /* 39 */ { 0, &Ia_cmpl_Ed_Gd    },
+  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
+  /* 3B */ { 0, &Ia_cmpl_Gd_Ed    },
+  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
+  /* 3D */ { 0, &Ia_cmpl_EAX_Id   },
+  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
+  /* 3F */ { 0, &Ia_aas           },
+  /* 40 */ { 0, &Ia_incl_ERX      },
+  /* 41 */ { 0, &Ia_incl_ERX      },
+  /* 42 */ { 0, &Ia_incl_ERX      },
+  /* 43 */ { 0, &Ia_incl_ERX      },
+  /* 44 */ { 0, &Ia_incl_ERX      },
+  /* 45 */ { 0, &Ia_incl_ERX      },
+  /* 46 */ { 0, &Ia_incl_ERX      },
+  /* 47 */ { 0, &Ia_incl_ERX      },
+  /* 48 */ { 0, &Ia_decl_ERX      },
+  /* 49 */ { 0, &Ia_decl_ERX      },
+  /* 4A */ { 0, &Ia_decl_ERX      },
+  /* 4B */ { 0, &Ia_decl_ERX      },
+  /* 4C */ { 0, &Ia_decl_ERX      },
+  /* 4D */ { 0, &Ia_decl_ERX      },
+  /* 4E */ { 0, &Ia_decl_ERX      },
+  /* 4F */ { 0, &Ia_decl_ERX      },
+  /* 50 */ { 0, &Ia_pushl_ERX     },
+  /* 51 */ { 0, &Ia_pushl_ERX     },
+  /* 52 */ { 0, &Ia_pushl_ERX     },
+  /* 53 */ { 0, &Ia_pushl_ERX     },
+  /* 54 */ { 0, &Ia_pushl_ERX     },
+  /* 55 */ { 0, &Ia_pushl_ERX     },
+  /* 56 */ { 0, &Ia_pushl_ERX     },
+  /* 57 */ { 0, &Ia_pushl_ERX     },
+  /* 58 */ { 0, &Ia_popl_ERX      },
+  /* 59 */ { 0, &Ia_popl_ERX      },
+  /* 5A */ { 0, &Ia_popl_ERX      },
+  /* 5B */ { 0, &Ia_popl_ERX      },
+  /* 5C */ { 0, &Ia_popl_ERX      },
+  /* 5D */ { 0, &Ia_popl_ERX      },
+  /* 5E */ { 0, &Ia_popl_ERX      },
+  /* 5F */ { 0, &Ia_popl_ERX      },
+  /* 60 */ { 0, &Ia_pushal        },
+  /* 61 */ { 0, &Ia_popal         },
+  /* 62 */ { 0, &Ia_boundl_Gd_Ma  },
+  /* 63 */ { 0, &Ia_arpl_Ew_Gw    },
+  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
+  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
+  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
+  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
+  /* 68 */ { 0, &Ia_pushl_Id      },
+  /* 69 */ { 0, &Ia_imull_Gd_Ed_Id  },
+  /* 6A */ { 0, &Ia_pushl_sIb     },
+  /* 6B */ { 0, &Ia_imull_Gd_Ed_sIb },
+  /* 6C */ { 0, &Ia_insb_Yb_DX    },
+  /* 6D */ { 0, &Ia_insl_Yd_DX    },
+  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
+  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
+  /* 70 */ { 0, &Ia_jo_Jb         },
+  /* 71 */ { 0, &Ia_jno_Jb        },
+  /* 72 */ { 0, &Ia_jb_Jb         },
+  /* 73 */ { 0, &Ia_jnb_Jb        },
+  /* 74 */ { 0, &Ia_jz_Jb         },
+  /* 75 */ { 0, &Ia_jnz_Jb        },
+  /* 76 */ { 0, &Ia_jbe_Jb        },
+  /* 77 */ { 0, &Ia_jnbe_Jb       },
+  /* 78 */ { 0, &Ia_js_Jb         },
+  /* 79 */ { 0, &Ia_jns_Jb        },
+  /* 7A */ { 0, &Ia_jp_Jb         },
+  /* 7B */ { 0, &Ia_jnp_Jb        },
+  /* 7C */ { 0, &Ia_jl_Jb         },
+  /* 7D */ { 0, &Ia_jnl_Jb        },
+  /* 7E */ { 0, &Ia_jle_Jb        },
+  /* 7F */ { 0, &Ia_jnle_Jb       },
+  /* 80 */ { GRPN(G1EbIb)         },
+  /* 81 */ { GRPN(G1EdId)         },
+  /* 82 */ { GRPN(G1EbIb)         },
+  /* 83 */ { GRPN(G1EdIb)         },
+  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
+  /* 85 */ { 0, &Ia_testl_Ed_Gd   },
+  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
+  /* 87 */ { 0, &Ia_xchgl_Ed_Gd   },
+  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
+  /* 89 */ { 0, &Ia_movl_Ed_Gd    },
+  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
+  /* 8B */ { 0, &Ia_movl_Gd_Ed    },
+  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
+  /* 8D */ { 0, &Ia_leal_Gd_Md    },
+  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
+  /* 8F */ { 0, &Ia_popl_Ed       },
+  /* 90 */ { 0, &Ia_nop           },
+  /* 91 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 92 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 93 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 94 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 95 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 96 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 97 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 98 */ { 0, &Ia_cwde          },
+  /* 99 */ { 0, &Ia_cdq           },
+  /* 9A */ { 0, &Ia_lcall_Apd     },
+  /* 9B */ { 0, &Ia_fwait         },
+  /* 9C */ { 0, &Ia_pushfl        },
+  /* 9D */ { 0, &Ia_popfl         },
+  /* 9E */ { 0, &Ia_sahf          },
+  /* 9F */ { 0, &Ia_lahf          },
+  /* A0 */ { 0, &Ia_movb_AL_Ob    },
+  /* A1 */ { 0, &Ia_movl_EAX_Od   },
+  /* A0 */ { 0, &Ia_movb_Ob_AL    },
+  /* A1 */ { 0, &Ia_movl_Od_EAX   },
+  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
+  /* A5 */ { 0, &Ia_movsl_Yd_Xd   },
+  /* A6 */ { 0, &Ia_cmpsb_Xb_Yb   },
+  /* A7 */ { 0, &Ia_cmpsl_Xd_Yd   },
+  /* A8 */ { 0, &Ia_testb_AL_Ib   },
+  /* A9 */ { 0, &Ia_testl_EAX_Id  },
+  /* AA */ { 0, &Ia_stosb_Yb_AL   },
+  /* AB */ { 0, &Ia_stosl_Yd_EAX  },
+  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
+  /* AD */ { 0, &Ia_lodsl_EAX_Xd  },
+  /* AE */ { 0, &Ia_scasb_AL_Yb   },
+  /* AF */ { 0, &Ia_scasl_EAX_Yd  },
+  /* B0 */ { 0, &Ia_movb_R8_Ib    },
+  /* B1 */ { 0, &Ia_movb_R8_Ib    },
+  /* B2 */ { 0, &Ia_movb_R8_Ib    },
+  /* B3 */ { 0, &Ia_movb_R8_Ib    },
+  /* B4 */ { 0, &Ia_movb_R8_Ib    },
+  /* B5 */ { 0, &Ia_movb_R8_Ib    },
+  /* B6 */ { 0, &Ia_movb_R8_Ib    },
+  /* B7 */ { 0, &Ia_movb_R8_Ib    },
+  /* B8 */ { 0, &Ia_movl_ERX_Id   },
+  /* B9 */ { 0, &Ia_movl_ERX_Id   },
+  /* BA */ { 0, &Ia_movl_ERX_Id   },
+  /* BB */ { 0, &Ia_movl_ERX_Id   },
+  /* BC */ { 0, &Ia_movl_ERX_Id   },
+  /* BD */ { 0, &Ia_movl_ERX_Id   },
+  /* BE */ { 0, &Ia_movl_ERX_Id   },
+  /* BF */ { 0, &Ia_movl_ERX_Id   },
+  /* C0 */ { GRPN(G2Eb)           },
+  /* C1 */ { GRPN(G2Ed)           },
+  /* C2 */ { 0, &Ia_ret_Iw        },
+  /* C3 */ { 0, &Ia_ret           },
+  /* C4 */ { 0, &Ia_lesl_Gd_Mp    },
+  /* C5 */ { 0, &Ia_ldsl_Gd_Mp    },
+  /* C6 */ { GRPN(G11Eb)          },
+  /* C7 */ { GRPN(G11Ed)          },
+  /* C8 */ { 0, &Ia_enter         },
+  /* C9 */ { 0, &Ia_leave         },
+  /* CA */ { 0, &Ia_lret_Iw       },
+  /* CB */ { 0, &Ia_lret          },
+  /* CC */ { 0, &Ia_int3          },
+  /* CD */ { 0, &Ia_int_Ib        },
+  /* CE */ { 0, &Ia_into          },
+  /* CF */ { 0, &Ia_iretl         },
+  /* D0 */ { GRPN(G2EbI1)         },
+  /* D1 */ { GRPN(G2EdI1)         },
+  /* D2 */ { GRPN(G2EbCL)         },
+  /* D3 */ { GRPN(G2EdCL)         },
+  /* D4 */ { 0, &Ia_aam           },
+  /* D5 */ { 0, &Ia_aad           },
+  /* D6 */ { 0, &Ia_salc          },
+  /* D7 */ { 0, &Ia_xlat          },
+  /* D8 */ { GRPFP(D8)            },
+  /* D9 */ { GRPFP(D9)            },
+  /* DA */ { GRPFP(DA)            },
+  /* DB */ { GRPFP(DB)            },
+  /* DC */ { GRPFP(DC)            },
+  /* DD */ { GRPFP(DD)            },
+  /* DE */ { GRPFP(DE)            },
+  /* DF */ { GRPFP(DF)            },
+  /* E0 */ { 0, &Ia_loopne_Jb     },
+  /* E1 */ { 0, &Ia_loope_Jb      },
+  /* E2 */ { 0, &Ia_loop_Jb       },
+  /* E3 */ { 0, &Ia_jcxz_Jb       },
+  /* E4 */ { 0, &Ia_inb_AL_Ib     },
+  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
+  /* E6 */ { 0, &Ia_outb_Ib_AL    },
+  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
+  /* E8 */ { 0, &Ia_call_Jd       },
+  /* E9 */ { 0, &Ia_jmp_Jd        },
+  /* EA */ { 0, &Ia_ljmp_Apd      },
+  /* EB */ { 0, &Ia_jmp_Jb        },
+  /* EC */ { 0, &Ia_inb_AL_DX     },
+  /* ED */ { 0, &Ia_inl_EAX_DX    },
+  /* EE */ { 0, &Ia_outb_DX_AL    },
+  /* EF */ { 0, &Ia_outl_DX_EAX   },
+  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
+  /* F1 */ { 0, &Ia_int1          },
+  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
+  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
+  /* F4 */ { 0, &Ia_hlt           },
+  /* F5 */ { 0, &Ia_cmc           },
+  /* F6 */ { GRPN(G3Eb)           },
+  /* F7 */ { GRPN(G3Ed)           },
+  /* F8 */ { 0, &Ia_clc           },
+  /* F9 */ { 0, &Ia_stc           },
+  /* FA */ { 0, &Ia_cli           },
+  /* FB */ { 0, &Ia_sti           },
+  /* FC */ { 0, &Ia_cld           },
+  /* FD */ { 0, &Ia_std           },
+  /* FE */ { GRPN(G4)             },
+  /* FF */ { GRPN(G5d)            },
+
+  // 256 entries for two byte opcodes
+  /* 0F 00 */ { GRPN(G6)          },
+  /* 0F 01 */ { GRPMOD(G7)        },
+  /* 0F 02 */ { 0, &Ia_larl_Gd_Ew },
+  /* 0F 03 */ { 0, &Ia_lsll_Gd_Ew },
+  /* 0F 04 */ { 0, &Ia_Invalid    },
+  /* 0F 05 */ { 0, &Ia_syscall    },
+  /* 0F 06 */ { 0, &Ia_clts       },
+  /* 0F 07 */ { 0, &Ia_sysret     },
+  /* 0F 08 */ { 0, &Ia_invd       },
+  /* 0F 09 */ { 0, &Ia_wbinvd     },
+  /* 0F 0A */ { 0, &Ia_Invalid    },
+  /* 0F 0B */ { 0, &Ia_ud2a       },
+  /* 0F 0C */ { 0, &Ia_Invalid    },
+  /* 0F 0D */ { 0, &Ia_prefetchw  },   // 3DNow!
+  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
+  /* 0F 0F */ { GRP3DNOW          },
+  /* 0F 10 */ { GRPSSE(0f10)      },
+  /* 0F 11 */ { GRPSSE(0f11)      },
+  /* 0F 12 */ { GRPSSE(0f12)      },
+  /* 0F 13 */ { GRPSSE2(0f13)     },
+  /* 0F 14 */ { GRPSSE2(0f14)     },
+  /* 0F 15 */ { GRPSSE2(0f15)     },
+  /* 0F 16 */ { GRPSSE(0f16)      },
+  /* 0F 17 */ { GRPSSE2(0f17)     },
+  /* 0F 18 */ { GRPN(G16)         },
+  /* 0F 19 */ { 0, &Ia_multibyte_nop },
+  /* 0F 1A */ { 0, &Ia_multibyte_nop },
+  /* 0F 1B */ { 0, &Ia_multibyte_nop },
+  /* 0F 1C */ { 0, &Ia_multibyte_nop },
+  /* 0F 1D */ { 0, &Ia_multibyte_nop },
+  /* 0F 1E */ { 0, &Ia_multibyte_nop },
+  /* 0F 1F */ { 0, &Ia_multibyte_nop },
+  /* 0F 20 */ { 0, &Ia_movl_Rd_Cd },
+  /* 0F 21 */ { 0, &Ia_movl_Rd_Dd },
+  /* 0F 22 */ { 0, &Ia_movl_Cd_Rd },
+  /* 0F 23 */ { 0, &Ia_movl_Dd_Rd },
+  /* 0F 24 */ { 0, &Ia_Invalid },
+  /* 0F 25 */ { 0, &Ia_Invalid },
+  /* 0F 26 */ { 0, &Ia_Invalid },
+  /* 0F 27 */ { 0, &Ia_Invalid },
+  /* 0F 28 */ { GRPSSE2(0f28) },
+  /* 0F 29 */ { GRPSSE2(0f29) },
+  /* 0F 2A */ { GRPSSE(0f2a) },
+  /* 0F 2B */ { GRPSSE(0f2b) },
+  /* 0F 2C */ { GRPSSE(0f2c) },
+  /* 0F 2D */ { GRPSSE(0f2d) },
+  /* 0F 2E */ { GRPSSE2(0f2e) },
+  /* 0F 2F */ { GRPSSE2(0f2f) },
+  /* 0F 30 */ { 0, &Ia_wrmsr },
+  /* 0F 31 */ { 0, &Ia_rdtsc },
+  /* 0F 32 */ { 0, &Ia_rdmsr },
+  /* 0F 33 */ { 0, &Ia_rdpmc },
+  /* 0F 34 */ { 0, &Ia_sysenter },
+  /* 0F 35 */ { 0, &Ia_sysexit },
+  /* 0F 36 */ { 0, &Ia_Invalid },
+  /* 0F 37 */ { 0, &Ia_getsec },
+  /* 0F 38 */ { GR3BTAB(0f38) },
+  /* 0F 39 */ { 0, &Ia_Invalid  },
+  /* 0F 3A */ { GR3BTAB(0f3a) },
+  /* 0F 3B */ { 0, &Ia_Invalid },
+  /* 0F 3C */ { 0, &Ia_Invalid },
+  /* 0F 3D */ { 0, &Ia_Invalid },
+  /* 0F 3E */ { 0, &Ia_Invalid },
+  /* 0F 3F */ { 0, &Ia_Invalid },
+  /* 0F 40 */ { 0, &Ia_cmovol_Gd_Ed  },
+  /* 0F 41 */ { 0, &Ia_cmovnol_Gd_Ed },
+  /* 0F 42 */ { 0, &Ia_cmovbl_Gd_Ed  },
+  /* 0F 43 */ { 0, &Ia_cmovnbl_Gd_Ed },
+  /* 0F 44 */ { 0, &Ia_cmovzl_Gd_Ed  },
+  /* 0F 45 */ { 0, &Ia_cmovnzl_Gd_Ed },
+  /* 0F 46 */ { 0, &Ia_cmovbel_Gd_Ed },
+  /* 0F 47 */ { 0, &Ia_cmovnbel_Gd_Ed  },
+  /* 0F 48 */ { 0, &Ia_cmovsl_Gd_Ed  },
+  /* 0F 49 */ { 0, &Ia_cmovnsl_Gd_Ed },
+  /* 0F 4A */ { 0, &Ia_cmovpl_Gd_Ed  },
+  /* 0F 4B */ { 0, &Ia_cmovnpl_Gd_Ed },
+  /* 0F 4C */ { 0, &Ia_cmovll_Gd_Ed  },
+  /* 0F 4D */ { 0, &Ia_cmovnll_Gd_Ed },
+  /* 0F 4E */ { 0, &Ia_cmovlel_Gd_Ed },
+  /* 0F 4F */ { 0, &Ia_cmovnlel_Gd_Ed  },
+  /* 0F 50 */ { GRPSSE2(0f50) },
+  /* 0F 51 */ { GRPSSE(0f51) },
+  /* 0F 52 */ { GRPSSE(0f52) },
+  /* 0F 53 */ { GRPSSE(0f53) },
+  /* 0F 54 */ { GRPSSE2(0f54) },
+  /* 0F 55 */ { GRPSSE2(0f55) },
+  /* 0F 56 */ { GRPSSE2(0f56) },
+  /* 0F 57 */ { GRPSSE2(0f57) },
+  /* 0F 58 */ { GRPSSE(0f58) },
+  /* 0F 59 */ { GRPSSE(0f59) },
+  /* 0F 5A */ { GRPSSE(0f5a) },
+  /* 0F 5B */ { GRPSSE(0f5b) },
+  /* 0F 5C */ { GRPSSE(0f5c) },
+  /* 0F 5D */ { GRPSSE(0f5d) },
+  /* 0F 5E */ { GRPSSE(0f5e) },
+  /* 0F 5F */ { GRPSSE(0f5f) },
+  /* 0F 60 */ { GRPSSE2(0f60) },
+  /* 0F 61 */ { GRPSSE2(0f61) },
+  /* 0F 62 */ { GRPSSE2(0f62) },
+  /* 0F 63 */ { GRPSSE2(0f63) },
+  /* 0F 64 */ { GRPSSE2(0f64) },
+  /* 0F 65 */ { GRPSSE2(0f65) },
+  /* 0F 66 */ { GRPSSE2(0f66) },
+  /* 0F 67 */ { GRPSSE2(0f67) },
+  /* 0F 68 */ { GRPSSE2(0f68) },
+  /* 0F 69 */ { GRPSSE2(0f69) },
+  /* 0F 6A */ { GRPSSE2(0f6a) },
+  /* 0F 6B */ { GRPSSE2(0f6b) },
+  /* 0F 6C */ { GRPSSE66(Ia_punpcklqdq_Vdq_Wdq) },
+  /* 0F 6D */ { GRPSSE66(Ia_punpckhqdq_Vdq_Wdq) },
+  /* 0F 6E */ { GRPSSE2(0f6e) },
+  /* 0F 6F */ { GRPSSE(0f6f) },
+  /* 0F 70 */ { GRPSSE(0f70) },
+  /* 0F 71 */ { GRPN(G12) },
+  /* 0F 72 */ { GRPN(G13) },
+  /* 0F 73 */ { GRPN(G14) },
+  /* 0F 74 */ { GRPSSE2(0f74) },
+  /* 0F 75 */ { GRPSSE2(0f75) },
+  /* 0F 76 */ { GRPSSE2(0f76) },
+  /* 0F 77 */ { 0, &Ia_emms  },
+  /* 0F 78 */ { GRPSSE(0f78) }, // VMX
+  /* 0F 79 */ { GRPSSE(0f79) }, // VMX
+  /* 0F 7A */ { 0, &Ia_Invalid },
+  /* 0F 7B */ { 0, &Ia_Invalid },
+  /* 0F 7C */ { GRPSSE(0f7c) },
+  /* 0F 7D */ { GRPSSE(0f7d) },
+  /* 0F 7E */ { GRPSSE(0f7e) },
+  /* 0F 7F */ { GRPSSE(0f7f) },
+  /* 0F 80 */ { 0, &Ia_jo_Jd     },
+  /* 0F 81 */ { 0, &Ia_jno_Jd    },
+  /* 0F 82 */ { 0, &Ia_jb_Jd     },
+  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
+  /* 0F 84 */ { 0, &Ia_jz_Jd     },
+  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
+  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
+  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
+  /* 0F 88 */ { 0, &Ia_js_Jd     },
+  /* 0F 89 */ { 0, &Ia_jns_Jd    },
+  /* 0F 8A */ { 0, &Ia_jp_Jd     },
+  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
+  /* 0F 8C */ { 0, &Ia_jl_Jd     },
+  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
+  /* 0F 8E */ { 0, &Ia_jle_Jd    },
+  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
+  /* 0F 90 */ { 0, &Ia_seto_Eb   },
+  /* 0F 91 */ { 0, &Ia_setno_Eb  },
+  /* 0F 92 */ { 0, &Ia_setb_Eb   },
+  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
+  /* 0F 94 */ { 0, &Ia_setz_Eb   },
+  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
+  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
+  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
+  /* 0F 98 */ { 0, &Ia_sets_Eb   },
+  /* 0F 99 */ { 0, &Ia_setns_Eb  },
+  /* 0F 9A */ { 0, &Ia_setp_Eb   },
+  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
+  /* 0F 9C */ { 0, &Ia_setl_Eb   },
+  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
+  /* 0F 9E */ { 0, &Ia_setle_Eb  },
+  /* 0F 9F */ { 0, &Ia_setnle_Eb },
+  /* 0F A0 */ { 0, &Ia_pushl_FS  },
+  /* 0F A1 */ { 0, &Ia_popl_FS   },
+  /* 0F A2 */ { 0, &Ia_cpuid     },
+  /* 0F A3 */ { 0, &Ia_btl_Ed_Gd },
+  /* 0F A4 */ { 0, &Ia_shldl_Ed_Gd_Ib },
+  /* 0F A5 */ { 0, &Ia_shldl_Ed_Gd_CL },
+  /* 0F A6 */ { 0, &Ia_Invalid    },
+  /* 0F A7 */ { 0, &Ia_Invalid    },
+  /* 0F A8 */ { 0, &Ia_pushl_GS   },
+  /* 0F A9 */ { 0, &Ia_popl_GS    },
+  /* 0F AA */ { 0, &Ia_rsm        },
+  /* 0F AB */ { 0, &Ia_btsl_Ed_Gd },
+  /* 0F AC */ { 0, &Ia_shrdl_Ed_Gd_Ib },
+  /* 0F AD */ { 0, &Ia_shrdl_Ed_Gd_CL },
+  /* 0F AE */ { GRPMOD(G15)           },
+  /* 0F AF */ { 0, &Ia_imull_Gd_Ed    },
+  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
+  /* 0F B1 */ { 0, &Ia_cmpxchgl_Ed_Gd },
+  /* 0F B2 */ { 0, &Ia_lssl_Gd_Mp   },
+  /* 0F B3 */ { 0, &Ia_btrl_Ed_Gd   },
+  /* 0F B4 */ { 0, &Ia_lfsl_Gd_Mp   },
+  /* 0F B5 */ { 0, &Ia_lgsl_Gd_Mp   },
+  /* 0F B6 */ { 0, &Ia_movzbl_Gd_Eb },
+  /* 0F B7 */ { 0, &Ia_movzwl_Gd_Ew },
+  /* 0F B8 */ { GRPSSEF3(Ia_popcnt_Gd_Ed) },
+  /* 0F B9 */ { 0, &Ia_ud2b         },
+  /* 0F BA */ { GRPN(G8EdIb)        },
+  /* 0F BB */ { 0, &Ia_btcl_Ed_Gd   },
+  /* 0F BC */ { GRPSSE(0fbcd) },
+  /* 0F BD */ { GRPSSE(0fbdd) },
+  /* 0F BE */ { 0, &Ia_movsbl_Gd_Eb },
+  /* 0F BF */ { 0, &Ia_movswl_Gd_Ew },
+  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
+  /* 0F C0 */ { 0, &Ia_xaddl_Ed_Gd  },
+  /* 0F C2 */ { GRPSSE(0fc2) },
+  /* 0F C3 */ { GRPSSENONE(Ia_movnti_Md_Gd) },
+  /* 0F C4 */ { GRPSSE2(0fc4) },
+  /* 0F C5 */ { GRPSSE2(0fc5) },
+  /* 0F C6 */ { GRPSSE2(0fc6) },
+  /* 0F C7 */ { GRPMOD(G9d) },
+  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
+  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
+  /* 0F CA */ { 0, &Ia_bswapl_ERX },
+  /* 0F CB */ { 0, &Ia_bswapl_ERX },
+  /* 0F CC */ { 0, &Ia_bswapl_ERX },
+  /* 0F CD */ { 0, &Ia_bswapl_ERX },
+  /* 0F CE */ { 0, &Ia_bswapl_ERX },
+  /* 0F CF */ { 0, &Ia_bswapl_ERX },
+  /* 0F D0 */ { GRPSSE(0fd0) },
+  /* 0F D1 */ { GRPSSE2(0fd1) },
+  /* 0F D2 */ { GRPSSE2(0fd2) },
+  /* 0F D3 */ { GRPSSE2(0fd3) },
+  /* 0F D4 */ { GRPSSE2(0fd4) },
+  /* 0F D5 */ { GRPSSE2(0fd5) },
+  /* 0F D6 */ { GRPSSE(0fd6) },
+  /* 0F D7 */ { GRPSSE2(0fd7) },
+  /* 0F D8 */ { GRPSSE2(0fd8) },
+  /* 0F D9 */ { GRPSSE2(0fd9) },
+  /* 0F DA */ { GRPSSE2(0fda) },
+  /* 0F DB */ { GRPSSE2(0fdb) },
+  /* 0F DC */ { GRPSSE2(0fdc) },
+  /* 0F DD */ { GRPSSE2(0fdd) },
+  /* 0F DE */ { GRPSSE2(0fde) },
+  /* 0F DF */ { GRPSSE2(0fdf) },
+  /* 0F E0 */ { GRPSSE2(0fe0) },
+  /* 0F E1 */ { GRPSSE2(0fe1) },
+  /* 0F E2 */ { GRPSSE2(0fe2) },
+  /* 0F E3 */ { GRPSSE2(0fe3) },
+  /* 0F E4 */ { GRPSSE2(0fe4) },
+  /* 0F E5 */ { GRPSSE2(0fe5) },
+  /* 0F E6 */ { GRPSSE(0fe6) },
+  /* 0F E7 */ { GRPSSE2(0fe7) },
+  /* 0F E8 */ { GRPSSE2(0fe8) },
+  /* 0F E9 */ { GRPSSE2(0fe9) },
+  /* 0F EA */ { GRPSSE2(0fea) },
+  /* 0F EB */ { GRPSSE2(0feb) },
+  /* 0F EC */ { GRPSSE2(0fec) },
+  /* 0F ED */ { GRPSSE2(0fed) },
+  /* 0F EE */ { GRPSSE2(0fee) },
+  /* 0F EF */ { GRPSSE2(0fef) },
+  /* 0F F0 */ { GRPSSEF2(Ia_lddqu_Vdq_Mdq) },
+  /* 0F F1 */ { GRPSSE2(0ff1) },
+  /* 0F F2 */ { GRPSSE2(0ff2) },
+  /* 0F F3 */ { GRPSSE2(0ff3) },
+  /* 0F F4 */ { GRPSSE2(0ff4) },
+  /* 0F F5 */ { GRPSSE2(0ff5) },
+  /* 0F F6 */ { GRPSSE2(0ff6) },
+  /* 0F F7 */ { GRPSSE2(0ff7) },
+  /* 0F F8 */ { GRPSSE2(0ff8) },
+  /* 0F F9 */ { GRPSSE2(0ff9) },
+  /* 0F FA */ { GRPSSE2(0ffa) },
+  /* 0F FB */ { GRPSSE2(0ffb) },
+  /* 0F FC */ { GRPSSE2(0ffc) },
+  /* 0F FD */ { GRPSSE2(0ffd) },
+  /* 0F FE */ { GRPSSE2(0ffe) },
+  /* 0F FF */ { 0, &Ia_Invalid }
+};
+
+/* ************************************************************************ */
+/* Long mode */
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodes64w[256*2] = {
+  // 256 entries for single byte opcodes
+  /* 00 */ { 0, &Ia_addb_Eb_Gb },
+  /* 01 */ { 0, &Ia_addw_Ew_Gw },
+  /* 02 */ { 0, &Ia_addb_Gb_Eb },
+  /* 03 */ { 0, &Ia_addw_Gw_Ew },
+  /* 04 */ { 0, &Ia_addb_AL_Ib },
+  /* 05 */ { 0, &Ia_addw_AX_Iw },
+  /* 06 */ { 0, &Ia_Invalid    },
+  /* 07 */ { 0, &Ia_Invalid    },
+  /* 08 */ { 0, &Ia_orb_Eb_Gb  },
+  /* 09 */ { 0, &Ia_orw_Ew_Gw  },
+  /* 0A */ { 0, &Ia_orb_Gb_Eb  },
+  /* 0B */ { 0, &Ia_orw_Gw_Ew  },
+  /* 0C */ { 0, &Ia_orb_AL_Ib  },
+  /* 0D */ { 0, &Ia_orw_AX_Iw  },
+  /* 0E */ { 0, &Ia_Invalid    },
+  /* 0F */ { 0, &Ia_error      },   // 2 byte escape
+  /* 10 */ { 0, &Ia_adcb_Eb_Gb },
+  /* 11 */ { 0, &Ia_adcw_Ew_Gw },
+  /* 12 */ { 0, &Ia_adcb_Gb_Eb },
+  /* 13 */ { 0, &Ia_adcw_Gw_Ew },
+  /* 14 */ { 0, &Ia_adcb_AL_Ib },
+  /* 15 */ { 0, &Ia_adcw_AX_Iw },
+  /* 16 */ { 0, &Ia_Invalid    },
+  /* 17 */ { 0, &Ia_Invalid    },
+  /* 18 */ { 0, &Ia_sbbb_Eb_Gb },
+  /* 19 */ { 0, &Ia_sbbw_Ew_Gw },
+  /* 1A */ { 0, &Ia_sbbb_Gb_Eb },
+  /* 1B */ { 0, &Ia_sbbw_Gw_Ew },
+  /* 1C */ { 0, &Ia_sbbb_AL_Ib },
+  /* 1D */ { 0, &Ia_sbbw_AX_Iw },
+  /* 1E */ { 0, &Ia_Invalid    },
+  /* 1F */ { 0, &Ia_Invalid    },
+  /* 20 */ { 0, &Ia_andb_Eb_Gb },
+  /* 21 */ { 0, &Ia_andw_Ew_Gw },
+  /* 22 */ { 0, &Ia_andb_Gb_Eb },
+  /* 23 */ { 0, &Ia_andw_Gw_Ew },
+  /* 24 */ { 0, &Ia_andb_AL_Ib },
+  /* 25 */ { 0, &Ia_andw_AX_Iw },
+  /* 26 */ { 0, &Ia_prefix_es  },   // ES:
+  /* 27 */ { 0, &Ia_Invalid    },
+  /* 28 */ { 0, &Ia_subb_Eb_Gb },
+  /* 29 */ { 0, &Ia_subw_Ew_Gw },
+  /* 2A */ { 0, &Ia_subb_Gb_Eb },
+  /* 2B */ { 0, &Ia_subw_Gw_Ew },
+  /* 2C */ { 0, &Ia_subb_AL_Ib },
+  /* 2D */ { 0, &Ia_subw_AX_Iw },
+  /* 2E */ { 0, &Ia_prefix_cs  },   // CS:
+  /* 2F */ { 0, &Ia_Invalid    },
+  /* 30 */ { 0, &Ia_xorb_Eb_Gb },
+  /* 31 */ { 0, &Ia_xorw_Ew_Gw },
+  /* 32 */ { 0, &Ia_xorb_Gb_Eb },
+  /* 33 */ { 0, &Ia_xorw_Gw_Ew },
+  /* 34 */ { 0, &Ia_xorb_AL_Ib },
+  /* 35 */ { 0, &Ia_xorw_AX_Iw },
+  /* 36 */ { 0, &Ia_prefix_ss  },   // SS:
+  /* 37 */ { 0, &Ia_Invalid    },
+  /* 38 */ { 0, &Ia_cmpb_Eb_Gb },
+  /* 39 */ { 0, &Ia_cmpw_Ew_Gw },
+  /* 3A */ { 0, &Ia_cmpb_Gb_Eb },
+  /* 3B */ { 0, &Ia_cmpw_Gw_Ew },
+  /* 3C */ { 0, &Ia_cmpb_AL_Ib },
+  /* 3D */ { 0, &Ia_cmpw_AX_Iw },
+  /* 3E */ { 0, &Ia_prefix_ds  },   // DS:
+  /* 3F */ { 0, &Ia_Invalid    },
+  /* 40 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 41 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 42 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 43 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 44 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 45 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 46 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 47 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 48 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 49 */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4A */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4B */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4C */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4D */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4E */ { 0, &Ia_prefix_rex },   // REX:
+  /* 4F */ { 0, &Ia_prefix_rex },   // REX:
+  /* 50 */ { 0, &Ia_pushw_RX   },
+  /* 51 */ { 0, &Ia_pushw_RX   },
+  /* 52 */ { 0, &Ia_pushw_RX   },
+  /* 53 */ { 0, &Ia_pushw_RX   },
+  /* 54 */ { 0, &Ia_pushw_RX   },
+  /* 55 */ { 0, &Ia_pushw_RX   },
+  /* 56 */ { 0, &Ia_pushw_RX   },
+  /* 57 */ { 0, &Ia_pushw_RX   },
+  /* 58 */ { 0, &Ia_popw_RX    },
+  /* 59 */ { 0, &Ia_popw_RX    },
+  /* 5A */ { 0, &Ia_popw_RX    },
+  /* 5B */ { 0, &Ia_popw_RX    },
+  /* 5C */ { 0, &Ia_popw_RX    },
+  /* 5D */ { 0, &Ia_popw_RX    },
+  /* 5E */ { 0, &Ia_popw_RX    },
+  /* 5F */ { 0, &Ia_popw_RX    },
+  /* 60 */ { 0, &Ia_Invalid    },
+  /* 61 */ { 0, &Ia_Invalid    },
+  /* 62 */ { 0, &Ia_Invalid    },
+  /* 63 */ { 0, &Ia_movw_Gw_Ew },
+  /* 64 */ { 0, &Ia_prefix_fs  },   // FS:
+  /* 65 */ { 0, &Ia_prefix_gs  },   // GS:
+  /* 66 */ { 0, &Ia_prefix_osize }, // OSIZE:
+  /* 67 */ { 0, &Ia_prefix_asize }, // ASIZE:
+  /* 68 */ { 0, &Ia_pushw_Iw    },
+  /* 69 */ { 0, &Ia_imulw_Gw_Ew_Iw  },
+  /* 6A */ { 0, &Ia_pushw_sIb   },
+  /* 6B */ { 0, &Ia_imulw_Gw_Ew_sIb },
+  /* 6C */ { 0, &Ia_insb_Yb_DX  },
+  /* 6D */ { 0, &Ia_insw_Yw_DX  },
+  /* 6E */ { 0, &Ia_outsb_DX_Xb },
+  /* 6F */ { 0, &Ia_outsw_DX_Xw },
+  /* 70 */ { 0, &Ia_jo_Jb       },
+  /* 71 */ { 0, &Ia_jno_Jb      },
+  /* 72 */ { 0, &Ia_jb_Jb       },
+  /* 73 */ { 0, &Ia_jnb_Jb      },
+  /* 74 */ { 0, &Ia_jz_Jb       },
+  /* 75 */ { 0, &Ia_jnz_Jb      },
+  /* 76 */ { 0, &Ia_jbe_Jb      },
+  /* 77 */ { 0, &Ia_jnbe_Jb     },
+  /* 78 */ { 0, &Ia_js_Jb       },
+  /* 79 */ { 0, &Ia_jns_Jb      },
+  /* 7A */ { 0, &Ia_jp_Jb       },
+  /* 7B */ { 0, &Ia_jnp_Jb      },
+  /* 7C */ { 0, &Ia_jl_Jb       },
+  /* 7D */ { 0, &Ia_jnl_Jb      },
+  /* 7E */ { 0, &Ia_jle_Jb      },
+  /* 7F */ { 0, &Ia_jnle_Jb     },
+  /* 80 */ { GRPN(G1EbIb)       },
+  /* 81 */ { GRPN(G1EwIw)       },
+  /* 82 */ { 9, &Ia_Invalid     },
+  /* 83 */ { GRPN(G1EwIb)       },
+  /* 84 */ { 0, &Ia_testb_Eb_Gb },
+  /* 85 */ { 0, &Ia_testw_Ew_Gw },
+  /* 86 */ { 0, &Ia_xchgb_Eb_Gb },
+  /* 87 */ { 0, &Ia_xchgw_Ew_Gw },
+  /* 88 */ { 0, &Ia_movb_Eb_Gb  },
+  /* 89 */ { 0, &Ia_movw_Ew_Gw  },
+  /* 8A */ { 0, &Ia_movb_Gb_Eb  },
+  /* 8B */ { 0, &Ia_movw_Gw_Ew  },
+  /* 8C */ { 0, &Ia_movw_Ew_Sw  },
+  /* 8D */ { 0, &Ia_leaw_Gw_Mw  },
+  /* 8E */ { 0, &Ia_movw_Sw_Ew  },
+  /* 8F */ { 0, &Ia_popw_Ew     },
+  /* 90 */ { 0, &Ia_xchgw_RX_AX }, // handle XCHG R8w, AX
+  /* 91 */ { 0, &Ia_xchgw_RX_AX },
+  /* 92 */ { 0, &Ia_xchgw_RX_AX },
+  /* 93 */ { 0, &Ia_xchgw_RX_AX },
+  /* 94 */ { 0, &Ia_xchgw_RX_AX },
+  /* 95 */ { 0, &Ia_xchgw_RX_AX },
+  /* 96 */ { 0, &Ia_xchgw_RX_AX },
+  /* 97 */ { 0, &Ia_xchgw_RX_AX },
+  /* 98 */ { 0, &Ia_cbw         },
+  /* 99 */ { 0, &Ia_cwd         },
+  /* 9A */ { 0, &Ia_Invalid     },
+  /* 9B */ { 0, &Ia_fwait       },
+  /* 9C */ { 0, &Ia_pushfw      },
+  /* 9D */ { 0, &Ia_popfw       },
+  /* 9E */ { 0, &Ia_sahf        },
+  /* 9F */ { 0, &Ia_lahf        },
+  /* A0 */ { 0, &Ia_movb_AL_Ob  },
+  /* A1 */ { 0, &Ia_movw_AX_Ow  },
+  /* A0 */ { 0, &Ia_movb_Ob_AL  },
+  /* A1 */ { 0, &Ia_movw_Ow_AX  },
+  /* A4 */ { 0, &Ia_movsb_Yb_Xb },
+  /* A5 */ { 0, &Ia_movsw_Yw_Xw },
+  /* A6 */ { 0, &Ia_cmpsb_Xb_Yb },
+  /* A7 */ { 0, &Ia_cmpsw_Xw_Yw },
+  /* A8 */ { 0, &Ia_testb_AL_Ib },
+  /* A9 */ { 0, &Ia_testw_AX_Iw },
+  /* AA */ { 0, &Ia_stosb_Yb_AL },
+  /* AB */ { 0, &Ia_stosw_Yw_AX },
+  /* AC */ { 0, &Ia_lodsb_AL_Xb },
+  /* AD */ { 0, &Ia_lodsw_AX_Xw },
+  /* AE */ { 0, &Ia_scasb_AL_Yb },
+  /* AF */ { 0, &Ia_scasw_AX_Yw },
+  /* B0 */ { 0, &Ia_movb_R8_Ib  },
+  /* B1 */ { 0, &Ia_movb_R8_Ib  },
+  /* B2 */ { 0, &Ia_movb_R8_Ib  },
+  /* B3 */ { 0, &Ia_movb_R8_Ib  },
+  /* B4 */ { 0, &Ia_movb_R8_Ib  },
+  /* B5 */ { 0, &Ia_movb_R8_Ib  },
+  /* B6 */ { 0, &Ia_movb_R8_Ib  },
+  /* B7 */ { 0, &Ia_movb_R8_Ib  },
+  /* B8 */ { 0, &Ia_movw_RX_Iw  },
+  /* B9 */ { 0, &Ia_movw_RX_Iw  },
+  /* BA */ { 0, &Ia_movw_RX_Iw  },
+  /* BB */ { 0, &Ia_movw_RX_Iw  },
+  /* BC */ { 0, &Ia_movw_RX_Iw  },
+  /* BD */ { 0, &Ia_movw_RX_Iw  },
+  /* BE */ { 0, &Ia_movw_RX_Iw  },
+  /* BF */ { 0, &Ia_movw_RX_Iw  },
+  /* C0 */ { GRPN(G2Eb)         },
+  /* C1 */ { GRPN(G2Ew)         },
+  /* C2 */ { 0, &Ia_ret_Iw      },
+  /* C3 */ { 0, &Ia_ret         },
+  /* C4 */ { 0, &Ia_Invalid     },
+  /* C5 */ { 0, &Ia_Invalid     },
+  /* C6 */ { GRPN(G11Eb)        },
+  /* C7 */ { GRPN(G11Ew)        },
+  /* C8 */ { 0, &Ia_enter       },
+  /* C9 */ { 0, &Ia_leave       },
+  /* CA */ { 0, &Ia_lret_Iw     },
+  /* CB */ { 0, &Ia_lret        },
+  /* CC */ { 0, &Ia_int3        },
+  /* CD */ { 0, &Ia_int_Ib      },
+  /* CE */ { 0, &Ia_Invalid     },
+  /* CF */ { 0, &Ia_iretw       },
+  /* D0 */ { GRPN(G2EbI1)       },
+  /* D1 */ { GRPN(G2EwI1)       },
+  /* D2 */ { GRPN(G2EbCL)       },
+  /* D3 */ { GRPN(G2EwCL)       },
+  /* D4 */ { 0, &Ia_Invalid     },
+  /* D5 */ { 0, &Ia_Invalid     },
+  /* D6 */ { 0, &Ia_Invalid     },
+  /* D7 */ { 0, &Ia_xlat        },
+  /* D8 */ { GRPFP(D8)          },
+  /* D9 */ { GRPFP(D9)          },
+  /* DA */ { GRPFP(DA)          },
+  /* DB */ { GRPFP(DB)          },
+  /* DC */ { GRPFP(DC)          },
+  /* DD */ { GRPFP(DD)          },
+  /* DE */ { GRPFP(DE)          },
+  /* DF */ { GRPFP(DF)          },
+  /* E0 */ { 0, &Ia_loopne_Jb   },
+  /* E1 */ { 0, &Ia_loope_Jb    },
+  /* E2 */ { 0, &Ia_loop_Jb     },
+  /* E3 */ { 0, &Ia_jrcxz_Jb    },
+  /* E4 */ { 0, &Ia_inb_AL_Ib   },
+  /* E5 */ { 0, &Ia_inw_AX_Ib   },
+  /* E6 */ { 0, &Ia_outb_Ib_AL  },
+  /* E7 */ { 0, &Ia_outw_Ib_AX  },
+  /* E8 */ { 0, &Ia_call_Jd     },
+  /* E9 */ { 0, &Ia_jmp_Jd      },
+  /* EA */ { 0, &Ia_Invalid     },
+  /* EB */ { 0, &Ia_jmp_Jb      },
+  /* EC */ { 0, &Ia_inb_AL_DX   },
+  /* ED */ { 0, &Ia_inw_AX_DX   },
+  /* EE */ { 0, &Ia_outb_DX_AL  },
+  /* EF */ { 0, &Ia_outw_DX_AX  },
+  /* F0 */ { 0, &Ia_prefix_lock },   // LOCK:
+  /* F1 */ { 0, &Ia_int1        },
+  /* F2 */ { 0, &Ia_prefix_repne },  // REPNE:
+  /* F3 */ { 0, &Ia_prefix_rep  },   // REP:
+  /* F4 */ { 0, &Ia_hlt         },
+  /* F5 */ { 0, &Ia_cmc         },
+  /* F6 */ { GRPN(G3Eb)         },
+  /* F7 */ { GRPN(G3Ew)         },
+  /* F8 */ { 0, &Ia_clc         },
+  /* F9 */ { 0, &Ia_stc         },
+  /* FA */ { 0, &Ia_cli         },
+  /* FB */ { 0, &Ia_sti         },
+  /* FC */ { 0, &Ia_cld         },
+  /* FD */ { 0, &Ia_std         },
+  /* FE */ { GRPN(G4)           },
+  /* FF */ { GRPN(64G5w)        },
+
+  // 256 entries for two byte opcodes
+  /* 0F 00 */ { GRPN(G6)          },
+  /* 0F 01 */ { GRPMOD(G7)        },
+  /* 0F 02 */ { 0, &Ia_larw_Gw_Ew },
+  /* 0F 03 */ { 0, &Ia_lslw_Gw_Ew },
+  /* 0F 04 */ { 0, &Ia_Invalid    },
+  /* 0F 05 */ { 0, &Ia_syscall    },
+  /* 0F 06 */ { 0, &Ia_clts       },
+  /* 0F 07 */ { 0, &Ia_sysret     },
+  /* 0F 08 */ { 0, &Ia_invd       },
+  /* 0F 09 */ { 0, &Ia_wbinvd     },
+  /* 0F 0A */ { 0, &Ia_Invalid    },
+  /* 0F 0B */ { 0, &Ia_ud2a       },
+  /* 0F 0C */ { 0, &Ia_Invalid    },
+  /* 0F 0D */ { 0, &Ia_prefetchw  },   // 3DNow!
+  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
+  /* 0F 0F */ { GRP3DNOW          },
+  /* 0F 10 */ { GRPSSE(0f10)      },
+  /* 0F 11 */ { GRPSSE(0f11)      },
+  /* 0F 12 */ { GRPSSE(0f12)      },
+  /* 0F 13 */ { GRPSSE2(0f13)     },
+  /* 0F 14 */ { GRPSSE2(0f14)     },
+  /* 0F 15 */ { GRPSSE2(0f15)     },
+  /* 0F 16 */ { GRPSSE(0f16)      },
+  /* 0F 17 */ { GRPSSE2(0f17)     },
+  /* 0F 18 */ { GRPN(G16)         },
+  /* 0F 19 */ { 0, &Ia_multibyte_nop },
+  /* 0F 1A */ { 0, &Ia_multibyte_nop },
+  /* 0F 1B */ { 0, &Ia_multibyte_nop },
+  /* 0F 1C */ { 0, &Ia_multibyte_nop },
+  /* 0F 1D */ { 0, &Ia_multibyte_nop },
+  /* 0F 1E */ { 0, &Ia_multibyte_nop },
+  /* 0F 1F */ { 0, &Ia_multibyte_nop },
+  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
+  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
+  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
+  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
+  /* 0F 24 */ { 0, &Ia_Invalid    },
+  /* 0F 25 */ { 0, &Ia_Invalid    },
+  /* 0F 26 */ { 0, &Ia_Invalid    },
+  /* 0F 27 */ { 0, &Ia_Invalid    },
+  /* 0F 28 */ { GRPSSE2(0f28) },
+  /* 0F 29 */ { GRPSSE2(0f29) },
+  /* 0F 2A */ { GRPSSE(0f2a) },
+  /* 0F 2B */ { GRPSSE(0f2b) },
+  /* 0F 2C */ { GRPSSE(0f2c) },
+  /* 0F 2D */ { GRPSSE(0f2d) },
+  /* 0F 2E */ { GRPSSE2(0f2e) },
+  /* 0F 2F */ { GRPSSE2(0f2f) },
+  /* 0F 30 */ { 0, &Ia_wrmsr },
+  /* 0F 31 */ { 0, &Ia_rdtsc },
+  /* 0F 32 */ { 0, &Ia_rdmsr },
+  /* 0F 33 */ { 0, &Ia_rdpmc },
+  /* 0F 34 */ { 0, &Ia_sysenter },
+  /* 0F 35 */ { 0, &Ia_sysexit },
+  /* 0F 36 */ { 0, &Ia_Invalid },
+  /* 0F 37 */ { 0, &Ia_getsec },
+  /* 0F 38 */ { GR3BTAB(0f38) },
+  /* 0F 39 */ { 0, &Ia_Invalid  },
+  /* 0F 3A */ { GR3BTAB(0f3a) },
+  /* 0F 3B */ { 0, &Ia_Invalid },
+  /* 0F 3C */ { 0, &Ia_Invalid },
+  /* 0F 3D */ { 0, &Ia_Invalid },
+  /* 0F 3E */ { 0, &Ia_Invalid },
+  /* 0F 3F */ { 0, &Ia_Invalid },
+  /* 0F 40 */ { 0, &Ia_cmovow_Gw_Ew  },
+  /* 0F 41 */ { 0, &Ia_cmovnow_Gw_Ew },
+  /* 0F 42 */ { 0, &Ia_cmovbw_Gw_Ew  },
+  /* 0F 43 */ { 0, &Ia_cmovnbw_Gw_Ew },
+  /* 0F 44 */ { 0, &Ia_cmovzw_Gw_Ew  },
+  /* 0F 45 */ { 0, &Ia_cmovnzw_Gw_Ew },
+  /* 0F 46 */ { 0, &Ia_cmovbew_Gw_Ew },
+  /* 0F 47 */ { 0, &Ia_cmovnbew_Gw_Ew  },
+  /* 0F 48 */ { 0, &Ia_cmovsw_Gw_Ew  },
+  /* 0F 49 */ { 0, &Ia_cmovnsw_Gw_Ew },
+  /* 0F 4A */ { 0, &Ia_cmovpw_Gw_Ew  },
+  /* 0F 4B */ { 0, &Ia_cmovnpw_Gw_Ew },
+  /* 0F 4C */ { 0, &Ia_cmovlw_Gw_Ew  },
+  /* 0F 4D */ { 0, &Ia_cmovnlw_Gw_Ew },
+  /* 0F 4E */ { 0, &Ia_cmovlew_Gw_Ew },
+  /* 0F 4F */ { 0, &Ia_cmovnlew_Gw_Ew  },
+  /* 0F 50 */ { GRPSSE2(0f50) },
+  /* 0F 51 */ { GRPSSE(0f51) },
+  /* 0F 52 */ { GRPSSE(0f52) },
+  /* 0F 53 */ { GRPSSE(0f53) },
+  /* 0F 54 */ { GRPSSE2(0f54) },
+  /* 0F 55 */ { GRPSSE2(0f55) },
+  /* 0F 56 */ { GRPSSE2(0f56) },
+  /* 0F 57 */ { GRPSSE2(0f57) },
+  /* 0F 58 */ { GRPSSE(0f58) },
+  /* 0F 59 */ { GRPSSE(0f59) },
+  /* 0F 5A */ { GRPSSE(0f5a) },
+  /* 0F 5B */ { GRPSSE(0f5b) },
+  /* 0F 5C */ { GRPSSE(0f5c) },
+  /* 0F 5D */ { GRPSSE(0f5d) },
+  /* 0F 5E */ { GRPSSE(0f5e) },
+  /* 0F 5F */ { GRPSSE(0f5f) },
+  /* 0F 60 */ { GRPSSE2(0f60) },
+  /* 0F 61 */ { GRPSSE2(0f61) },
+  /* 0F 62 */ { GRPSSE2(0f62) },
+  /* 0F 63 */ { GRPSSE2(0f63) },
+  /* 0F 64 */ { GRPSSE2(0f64) },
+  /* 0F 65 */ { GRPSSE2(0f65) },
+  /* 0F 66 */ { GRPSSE2(0f66) },
+  /* 0F 67 */ { GRPSSE2(0f67) },
+  /* 0F 68 */ { GRPSSE2(0f68) },
+  /* 0F 69 */ { GRPSSE2(0f69) },
+  /* 0F 6A */ { GRPSSE2(0f6a) },
+  /* 0F 6B */ { GRPSSE2(0f6b) },
+  /* 0F 6C */ { GRPSSE66(Ia_punpcklqdq_Vdq_Wdq) },
+  /* 0F 6D */ { GRPSSE66(Ia_punpckhqdq_Vdq_Wdq) },
+  /* 0F 6E */ { GRPSSE2(0f6e) },
+  /* 0F 6F */ { GRPSSE(0f6f) },
+  /* 0F 70 */ { GRPSSE(0f70) },
+  /* 0F 71 */ { GRPN(G12) },
+  /* 0F 72 */ { GRPN(G13) },
+  /* 0F 73 */ { GRPN(G14) },
+  /* 0F 74 */ { GRPSSE2(0f74) },
+  /* 0F 75 */ { GRPSSE2(0f75) },
+  /* 0F 76 */ { GRPSSE2(0f76) },
+  /* 0F 77 */ { 0, &Ia_emms  },
+  /* 0F 78 */ { GRPSSE(0f78Q) }, // VMX
+  /* 0F 79 */ { GRPSSE(0f79Q) }, // VMX
+  /* 0F 7A */ { 0, &Ia_Invalid },
+  /* 0F 7B */ { 0, &Ia_Invalid },
+  /* 0F 7C */ { GRPSSE(0f7c) },
+  /* 0F 7D */ { GRPSSE(0f7d) },
+  /* 0F 7E */ { GRPSSE(0f7e) },
+  /* 0F 7F */ { GRPSSE(0f7f) },
+  /* 0F 80 */ { 0, &Ia_jo_Jd     },
+  /* 0F 81 */ { 0, &Ia_jno_Jd    },
+  /* 0F 82 */ { 0, &Ia_jb_Jd     },
+  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
+  /* 0F 84 */ { 0, &Ia_jz_Jd     },
+  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
+  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
+  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
+  /* 0F 88 */ { 0, &Ia_js_Jd     },
+  /* 0F 89 */ { 0, &Ia_jns_Jd    },
+  /* 0F 8A */ { 0, &Ia_jp_Jd     },
+  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
+  /* 0F 8C */ { 0, &Ia_jl_Jd     },
+  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
+  /* 0F 8E */ { 0, &Ia_jle_Jd    },
+  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
+  /* 0F 90 */ { 0, &Ia_seto_Eb   },
+  /* 0F 91 */ { 0, &Ia_setno_Eb  },
+  /* 0F 92 */ { 0, &Ia_setb_Eb   },
+  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
+  /* 0F 94 */ { 0, &Ia_setz_Eb   },
+  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
+  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
+  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
+  /* 0F 98 */ { 0, &Ia_sets_Eb   },
+  /* 0F 99 */ { 0, &Ia_setns_Eb  },
+  /* 0F 9A */ { 0, &Ia_setp_Eb   },
+  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
+  /* 0F 9C */ { 0, &Ia_setl_Eb   },
+  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
+  /* 0F 9E */ { 0, &Ia_setle_Eb  },
+  /* 0F 9F */ { 0, &Ia_setnle_Eb },
+  /* 0F A0 */ { 0, &Ia_pushw_FS  },
+  /* 0F A1 */ { 0, &Ia_popw_FS   },
+  /* 0F A2 */ { 0, &Ia_cpuid     },
+  /* 0F A3 */ { 0, &Ia_btw_Ew_Gw },
+  /* 0F A4 */ { 0, &Ia_shldw_Ew_Gw_Ib },
+  /* 0F A5 */ { 0, &Ia_shldw_Ew_Gw_CL },
+  /* 0F A6 */ { 0, &Ia_Invalid        },
+  /* 0F A7 */ { 0, &Ia_Invalid        },
+  /* 0F A8 */ { 0, &Ia_pushw_GS       },
+  /* 0F A9 */ { 0, &Ia_popw_GS        },
+  /* 0F AA */ { 0, &Ia_rsm            },
+  /* 0F AB */ { 0, &Ia_btsw_Ew_Gw     },
+  /* 0F AC */ { 0, &Ia_shrdw_Ew_Gw_Ib },
+  /* 0F AD */ { 0, &Ia_shrdw_Ew_Gw_CL },
+  /* 0F AE */ { GRPMOD(G15)           },
+  /* 0F AF */ { 0, &Ia_imulw_Gw_Ew    },
+  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
+  /* 0F B1 */ { 0, &Ia_cmpxchgw_Ew_Gw },
+  /* 0F B2 */ { 0, &Ia_lssw_Gw_Mp   },
+  /* 0F B3 */ { 0, &Ia_btrw_Ew_Gw   },
+  /* 0F B4 */ { 0, &Ia_lfsw_Gw_Mp   },
+  /* 0F B5 */ { 0, &Ia_lgsw_Gw_Mp   },
+  /* 0F B6 */ { 0, &Ia_movzbw_Gw_Eb },
+  /* 0F B7 */ { 0, &Ia_movw_Gw_Ew   },
+  /* 0F B8 */ { GRPSSEF3(Ia_popcnt_Gw_Ew) },
+  /* 0F B9 */ { 0, &Ia_ud2b         },
+  /* 0F BA */ { GRPN(G8EwIb)        },
+  /* 0F BB */ { 0, &Ia_btcw_Ew_Gw   },
+  /* 0F BC */ { GRPSSE(0fbcw) },
+  /* 0F BD */ { GRPSSE(0fbdw) },
+  /* 0F BE */ { 0, &Ia_movsbw_Gw_Eb },
+  /* 0F BF */ { 0, &Ia_movw_Gw_Ew   },
+  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
+  /* 0F C0 */ { 0, &Ia_xaddw_Ew_Gw  },
+  /* 0F C2 */ { GRPSSE(0fc2) },
+  /* 0F C3 */ { GRPSSENONE(Ia_movnti_Md_Gd) },
+  /* 0F C4 */ { GRPSSE2(0fc4) },
+  /* 0F C5 */ { GRPSSE2(0fc5) },
+  /* 0F C6 */ { GRPSSE2(0fc6) },
+  /* 0F C7 */ { GRPMOD(G9w) },
+  /* 0F C8 */ { 0, &Ia_bswapw_RX },
+  /* 0F C9 */ { 0, &Ia_bswapw_RX },
+  /* 0F CA */ { 0, &Ia_bswapw_RX },
+  /* 0F CB */ { 0, &Ia_bswapw_RX },
+  /* 0F CC */ { 0, &Ia_bswapw_RX },
+  /* 0F CD */ { 0, &Ia_bswapw_RX },
+  /* 0F CE */ { 0, &Ia_bswapw_RX },
+  /* 0F CF */ { 0, &Ia_bswapw_RX },
+  /* 0F D0 */ { GRPSSE(0fd0) },
+  /* 0F D1 */ { GRPSSE2(0fd1) },
+  /* 0F D2 */ { GRPSSE2(0fd2) },
+  /* 0F D3 */ { GRPSSE2(0fd3) },
+  /* 0F D4 */ { GRPSSE2(0fd4) },
+  /* 0F D5 */ { GRPSSE2(0fd5) },
+  /* 0F D6 */ { GRPSSE(0fd6) },
+  /* 0F D7 */ { GRPSSE2(0fd7) },
+  /* 0F D8 */ { GRPSSE2(0fd8) },
+  /* 0F D9 */ { GRPSSE2(0fd9) },
+  /* 0F DA */ { GRPSSE2(0fda) },
+  /* 0F DB */ { GRPSSE2(0fdb) },
+  /* 0F DC */ { GRPSSE2(0fdc) },
+  /* 0F DD */ { GRPSSE2(0fdd) },
+  /* 0F DE */ { GRPSSE2(0fde) },
+  /* 0F DF */ { GRPSSE2(0fdf) },
+  /* 0F E0 */ { GRPSSE2(0fe0) },
+  /* 0F E1 */ { GRPSSE2(0fe1) },
+  /* 0F E2 */ { GRPSSE2(0fe2) },
+  /* 0F E3 */ { GRPSSE2(0fe3) },
+  /* 0F E4 */ { GRPSSE2(0fe4) },
+  /* 0F E5 */ { GRPSSE2(0fe5) },
+  /* 0F E6 */ { GRPSSE(0fe6) },
+  /* 0F E7 */ { GRPSSE2(0fe7) },
+  /* 0F E8 */ { GRPSSE2(0fe8) },
+  /* 0F E9 */ { GRPSSE2(0fe9) },
+  /* 0F EA */ { GRPSSE2(0fea) },
+  /* 0F EB */ { GRPSSE2(0feb) },
+  /* 0F EC */ { GRPSSE2(0fec) },
+  /* 0F ED */ { GRPSSE2(0fed) },
+  /* 0F EE */ { GRPSSE2(0fee) },
+  /* 0F EF */ { GRPSSE2(0fef) },
+  /* 0F F0 */ { GRPSSEF2(Ia_lddqu_Vdq_Mdq) },
+  /* 0F F1 */ { GRPSSE2(0ff1) },
+  /* 0F F2 */ { GRPSSE2(0ff2) },
+  /* 0F F3 */ { GRPSSE2(0ff3) },
+  /* 0F F4 */ { GRPSSE2(0ff4) },
+  /* 0F F5 */ { GRPSSE2(0ff5) },
+  /* 0F F6 */ { GRPSSE2(0ff6) },
+  /* 0F F7 */ { GRPSSE2(0ff7) },
+  /* 0F F8 */ { GRPSSE2(0ff8) },
+  /* 0F F9 */ { GRPSSE2(0ff9) },
+  /* 0F FA */ { GRPSSE2(0ffa) },
+  /* 0F FB */ { GRPSSE2(0ffb) },
+  /* 0F FC */ { GRPSSE2(0ffc) },
+  /* 0F FD */ { GRPSSE2(0ffd) },
+  /* 0F FE */ { GRPSSE2(0ffe) },
+  /* 0F FF */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodes64d[256*2] = {
+  // 256 entries for single byte opcodes
+  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
+  /* 01 */ { 0, &Ia_addl_Ed_Gd    },
+  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
+  /* 03 */ { 0, &Ia_addl_Gd_Ed    },
+  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
+  /* 05 */ { 0, &Ia_addl_EAX_Id,  },
+  /* 06 */ { 0, &Ia_Invalid       },
+  /* 07 */ { 0, &Ia_Invalid       },
+  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
+  /* 09 */ { 0, &Ia_orl_Ed_Gd     },
+  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
+  /* 0B */ { 0, &Ia_orl_Gd_Ed     },
+  /* 0C */ { 0, &Ia_orb_AL_Ib     },
+  /* 0D */ { 0, &Ia_orl_EAX_Id    },
+  /* 0E */ { 0, &Ia_Invalid       },
+  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
+  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
+  /* 11 */ { 0, &Ia_adcl_Ed_Gd    },
+  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
+  /* 13 */ { 0, &Ia_adcl_Gd_Ed    },
+  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
+  /* 15 */ { 0, &Ia_adcl_EAX_Id   },
+  /* 16 */ { 0, &Ia_Invalid       },
+  /* 17 */ { 0, &Ia_Invalid       },
+  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
+  /* 19 */ { 0, &Ia_sbbl_Ed_Gd    },
+  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
+  /* 1B */ { 0, &Ia_sbbl_Gd_Ed    },
+  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
+  /* 1D */ { 0, &Ia_sbbl_EAX_Id   },
+  /* 1E */ { 0, &Ia_Invalid       },
+  /* 1F */ { 0, &Ia_Invalid       },
+  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
+  /* 21 */ { 0, &Ia_andl_Ed_Gd    },
+  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
+  /* 23 */ { 0, &Ia_andl_Gd_Ed    },
+  /* 24 */ { 0, &Ia_andb_AL_Ib    },
+  /* 25 */ { 0, &Ia_andl_EAX_Id   },
+  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
+  /* 27 */ { 0, &Ia_Invalid       },
+  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
+  /* 29 */ { 0, &Ia_subl_Ed_Gd    },
+  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
+  /* 2B */ { 0, &Ia_subl_Gd_Ed    },
+  /* 2C */ { 0, &Ia_subb_AL_Ib    },
+  /* 2D */ { 0, &Ia_subl_EAX_Id   },
+  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
+  /* 2F */ { 0, &Ia_Invalid       },
+  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
+  /* 31 */ { 0, &Ia_xorl_Ed_Gd    },
+  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
+  /* 33 */ { 0, &Ia_xorl_Gd_Ed    },
+  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
+  /* 35 */ { 0, &Ia_xorl_EAX_Id   },
+  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
+  /* 37 */ { 0, &Ia_Invalid       },
+  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
+  /* 39 */ { 0, &Ia_cmpl_Ed_Gd    },
+  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
+  /* 3B */ { 0, &Ia_cmpl_Gd_Ed    },
+  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
+  /* 3D */ { 0, &Ia_cmpl_EAX_Id   },
+  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
+  /* 3F */ { 0, &Ia_Invalid       },
+  /* 40 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 41 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 42 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 43 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 44 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 45 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 46 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 47 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 48 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 49 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4A */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4B */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4C */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4D */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4E */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4F */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 50 */ { 0, &Ia_pushq_RRX     },
+  /* 51 */ { 0, &Ia_pushq_RRX     },
+  /* 52 */ { 0, &Ia_pushq_RRX     },
+  /* 53 */ { 0, &Ia_pushq_RRX     },
+  /* 54 */ { 0, &Ia_pushq_RRX     },
+  /* 55 */ { 0, &Ia_pushq_RRX     },
+  /* 56 */ { 0, &Ia_pushq_RRX     },
+  /* 57 */ { 0, &Ia_pushq_RRX     },
+  /* 58 */ { 0, &Ia_popq_RRX      },
+  /* 59 */ { 0, &Ia_popq_RRX      },
+  /* 5A */ { 0, &Ia_popq_RRX      },
+  /* 5B */ { 0, &Ia_popq_RRX      },
+  /* 5C */ { 0, &Ia_popq_RRX      },
+  /* 5D */ { 0, &Ia_popq_RRX      },
+  /* 5E */ { 0, &Ia_popq_RRX      },
+  /* 5F */ { 0, &Ia_popq_RRX      },
+  /* 60 */ { 0, &Ia_Invalid       },
+  /* 61 */ { 0, &Ia_Invalid       },
+  /* 62 */ { 0, &Ia_Invalid       },
+  /* 63 */ { 0, &Ia_movl_Gd_Ed    },
+  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
+  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
+  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
+  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
+  /* 68 */ { 0, &Ia_pushq_sId     },
+  /* 69 */ { 0, &Ia_imull_Gd_Ed_Id  },
+  /* 6A */ { 0, &Ia_pushq_sIb     },
+  /* 6B */ { 0, &Ia_imull_Gd_Ed_sIb },
+  /* 6C */ { 0, &Ia_insb_Yb_DX    },
+  /* 6D */ { 0, &Ia_insl_Yd_DX    },
+  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
+  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
+  /* 70 */ { 0, &Ia_jo_Jb         },
+  /* 71 */ { 0, &Ia_jno_Jb        },
+  /* 72 */ { 0, &Ia_jb_Jb         },
+  /* 73 */ { 0, &Ia_jnb_Jb        },
+  /* 74 */ { 0, &Ia_jz_Jb         },
+  /* 75 */ { 0, &Ia_jnz_Jb        },
+  /* 76 */ { 0, &Ia_jbe_Jb        },
+  /* 77 */ { 0, &Ia_jnbe_Jb       },
+  /* 78 */ { 0, &Ia_js_Jb         },
+  /* 79 */ { 0, &Ia_jns_Jb        },
+  /* 7A */ { 0, &Ia_jp_Jb         },
+  /* 7B */ { 0, &Ia_jnp_Jb        },
+  /* 7C */ { 0, &Ia_jl_Jb         },
+  /* 7D */ { 0, &Ia_jnl_Jb        },
+  /* 7E */ { 0, &Ia_jle_Jb        },
+  /* 7F */ { 0, &Ia_jnle_Jb       },
+  /* 80 */ { GRPN(G1EbIb)         },
+  /* 81 */ { GRPN(G1EdId)         },
+  /* 82 */ { 0, &Ia_Invalid       },
+  /* 83 */ { GRPN(G1EdIb)         },
+  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
+  /* 85 */ { 0, &Ia_testl_Ed_Gd   },
+  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
+  /* 87 */ { 0, &Ia_xchgl_Ed_Gd   },
+  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
+  /* 89 */ { 0, &Ia_movl_Ed_Gd    },
+  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
+  /* 8B */ { 0, &Ia_movl_Gd_Ed    },
+  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
+  /* 8D */ { 0, &Ia_leal_Gd_Md    },
+  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
+  /* 8F */ { 0, &Ia_popq_Eq       },
+  /* 90 */ { 0, &Ia_xchgl_ERX_EAX }, // handle XCHG R8d, EAX
+  /* 91 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 92 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 93 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 94 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 95 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 96 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 97 */ { 0, &Ia_xchgl_ERX_EAX },
+  /* 98 */ { 0, &Ia_cwde          },
+  /* 99 */ { 0, &Ia_cdq           },
+  /* 9A */ { 0, &Ia_Invalid       },
+  /* 9B */ { 0, &Ia_fwait         },
+  /* 9C */ { 0, &Ia_pushfq        },
+  /* 9D */ { 0, &Ia_popfq         },
+  /* 9E */ { 0, &Ia_sahf          },
+  /* 9F */ { 0, &Ia_lahf          },
+  /* A0 */ { 0, &Ia_movb_AL_Ob    },
+  /* A1 */ { 0, &Ia_movl_EAX_Od   },
+  /* A0 */ { 0, &Ia_movb_Ob_AL    },
+  /* A1 */ { 0, &Ia_movl_Od_EAX   },
+  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
+  /* A5 */ { 0, &Ia_movsl_Yd_Xd   },
+  /* A6 */ { 0, &Ia_cmpsb_Xb_Yb   },
+  /* A7 */ { 0, &Ia_cmpsl_Xd_Yd   },
+  /* A8 */ { 0, &Ia_testb_AL_Ib   },
+  /* A9 */ { 0, &Ia_testl_EAX_Id  },
+  /* AA */ { 0, &Ia_stosb_Yb_AL   },
+  /* AB */ { 0, &Ia_stosl_Yd_EAX  },
+  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
+  /* AD */ { 0, &Ia_lodsl_EAX_Xd  },
+  /* AE */ { 0, &Ia_scasb_AL_Yb   },
+  /* AF */ { 0, &Ia_scasl_EAX_Yd  },
+  /* B0 */ { 0, &Ia_movb_R8_Ib    },
+  /* B1 */ { 0, &Ia_movb_R8_Ib    },
+  /* B2 */ { 0, &Ia_movb_R8_Ib    },
+  /* B3 */ { 0, &Ia_movb_R8_Ib    },
+  /* B4 */ { 0, &Ia_movb_R8_Ib    },
+  /* B5 */ { 0, &Ia_movb_R8_Ib    },
+  /* B6 */ { 0, &Ia_movb_R8_Ib    },
+  /* B7 */ { 0, &Ia_movb_R8_Ib    },
+  /* B8 */ { 0, &Ia_movl_ERX_Id   },
+  /* B9 */ { 0, &Ia_movl_ERX_Id   },
+  /* BA */ { 0, &Ia_movl_ERX_Id   },
+  /* BB */ { 0, &Ia_movl_ERX_Id   },
+  /* BC */ { 0, &Ia_movl_ERX_Id   },
+  /* BD */ { 0, &Ia_movl_ERX_Id   },
+  /* BE */ { 0, &Ia_movl_ERX_Id   },
+  /* BF */ { 0, &Ia_movl_ERX_Id   },
+  /* C0 */ { GRPN(G2Eb)           },
+  /* C1 */ { GRPN(G2Ed)           },
+  /* C2 */ { 0, &Ia_ret_Iw        },
+  /* C3 */ { 0, &Ia_ret           },
+  /* C4 */ { 0, &Ia_Invalid       },
+  /* C5 */ { 0, &Ia_Invalid       },
+  /* C6 */ { GRPN(G11Eb)          },
+  /* C7 */ { GRPN(G11Ed)          },
+  /* C8 */ { 0, &Ia_enter         },
+  /* C9 */ { 0, &Ia_leave         },
+  /* CA */ { 0, &Ia_lret_Iw       },
+  /* CB */ { 0, &Ia_lret          },
+  /* CC */ { 0, &Ia_int3          },
+  /* CD */ { 0, &Ia_int_Ib        },
+  /* CE */ { 0, &Ia_Invalid       },
+  /* CF */ { 0, &Ia_iretl         },
+  /* D0 */ { GRPN(G2EbI1)         },
+  /* D1 */ { GRPN(G2EdI1)         },
+  /* D2 */ { GRPN(G2EbCL)         },
+  /* D3 */ { GRPN(G2EdCL)         },
+  /* D4 */ { 0, &Ia_Invalid       },
+  /* D5 */ { 0, &Ia_Invalid       },
+  /* D6 */ { 0, &Ia_Invalid       },
+  /* D7 */ { 0, &Ia_xlat          },
+  /* D8 */ { GRPFP(D8)            },
+  /* D9 */ { GRPFP(D9)            },
+  /* DA */ { GRPFP(DA)            },
+  /* DB */ { GRPFP(DB)            },
+  /* DC */ { GRPFP(DC)            },
+  /* DD */ { GRPFP(DD)            },
+  /* DE */ { GRPFP(DE)            },
+  /* DF */ { GRPFP(DF)            },
+  /* E0 */ { 0, &Ia_loopne_Jb     },
+  /* E1 */ { 0, &Ia_loope_Jb      },
+  /* E2 */ { 0, &Ia_loop_Jb       },
+  /* E3 */ { 0, &Ia_jrcxz_Jb      },
+  /* E4 */ { 0, &Ia_inb_AL_Ib     },
+  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
+  /* E6 */ { 0, &Ia_outb_Ib_AL    },
+  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
+  /* E8 */ { 0, &Ia_call_Jd       },
+  /* E9 */ { 0, &Ia_jmp_Jd        },
+  /* EA */ { 0, &Ia_Invalid       },
+  /* EB */ { 0, &Ia_jmp_Jb        },
+  /* EC */ { 0, &Ia_inb_AL_DX     },
+  /* ED */ { 0, &Ia_inl_EAX_DX    },
+  /* EE */ { 0, &Ia_outb_DX_AL    },
+  /* EF */ { 0, &Ia_outl_DX_EAX   },
+  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
+  /* F1 */ { 0, &Ia_int1          },
+  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
+  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
+  /* F4 */ { 0, &Ia_hlt           },
+  /* F5 */ { 0, &Ia_cmc           },
+  /* F6 */ { GRPN(G3Eb)           },
+  /* F7 */ { GRPN(G3Ed)           },
+  /* F8 */ { 0, &Ia_clc           },
+  /* F9 */ { 0, &Ia_stc           },
+  /* FA */ { 0, &Ia_cli           },
+  /* FB */ { 0, &Ia_sti           },
+  /* FC */ { 0, &Ia_cld           },
+  /* FD */ { 0, &Ia_std           },
+  /* FE */ { GRPN(G4)             },
+  /* FF */ { GRPN(64G5d)          },
+
+  // 256 entries for two byte opcodes
+  /* 0F 00 */ { GRPN(G6)          },
+  /* 0F 01 */ { GRPMOD(G7)        },
+  /* 0F 02 */ { 0, &Ia_larl_Gd_Ew },
+  /* 0F 03 */ { 0, &Ia_lsll_Gd_Ew },
+  /* 0F 04 */ { 0, &Ia_Invalid    },
+  /* 0F 05 */ { 0, &Ia_syscall    },
+  /* 0F 06 */ { 0, &Ia_clts       },
+  /* 0F 07 */ { 0, &Ia_sysret     },
+  /* 0F 08 */ { 0, &Ia_invd       },
+  /* 0F 09 */ { 0, &Ia_wbinvd     },
+  /* 0F 0A */ { 0, &Ia_Invalid    },
+  /* 0F 0B */ { 0, &Ia_ud2a       },
+  /* 0F 0C */ { 0, &Ia_Invalid    },
+  /* 0F 0D */ { 0, &Ia_prefetchw  },   // 3DNow!
+  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
+  /* 0F 0F */ { GRP3DNOW          },
+  /* 0F 10 */ { GRPSSE(0f10)      },
+  /* 0F 11 */ { GRPSSE(0f11)      },
+  /* 0F 12 */ { GRPSSE(0f12)      },
+  /* 0F 13 */ { GRPSSE2(0f13)     },
+  /* 0F 14 */ { GRPSSE2(0f14)     },
+  /* 0F 15 */ { GRPSSE2(0f15)     },
+  /* 0F 16 */ { GRPSSE(0f16)      },
+  /* 0F 17 */ { GRPSSE2(0f17)     },
+  /* 0F 18 */ { GRPN(G16)         },
+  /* 0F 19 */ { 0, &Ia_multibyte_nop },
+  /* 0F 1A */ { 0, &Ia_multibyte_nop },
+  /* 0F 1B */ { 0, &Ia_multibyte_nop },
+  /* 0F 1C */ { 0, &Ia_multibyte_nop },
+  /* 0F 1D */ { 0, &Ia_multibyte_nop },
+  /* 0F 1E */ { 0, &Ia_multibyte_nop },
+  /* 0F 1F */ { 0, &Ia_multibyte_nop },
+  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
+  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
+  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
+  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
+  /* 0F 24 */ { 0, &Ia_Invalid    },
+  /* 0F 25 */ { 0, &Ia_Invalid    },
+  /* 0F 26 */ { 0, &Ia_Invalid    },
+  /* 0F 27 */ { 0, &Ia_Invalid    },
+  /* 0F 28 */ { GRPSSE2(0f28) },
+  /* 0F 29 */ { GRPSSE2(0f29) },
+  /* 0F 2A */ { GRPSSE(0f2a) },
+  /* 0F 2B */ { GRPSSE(0f2b) },
+  /* 0F 2C */ { GRPSSE(0f2c) },
+  /* 0F 2D */ { GRPSSE(0f2d) },
+  /* 0F 2E */ { GRPSSE2(0f2e) },
+  /* 0F 2F */ { GRPSSE2(0f2f) },
+  /* 0F 30 */ { 0, &Ia_wrmsr },
+  /* 0F 31 */ { 0, &Ia_rdtsc },
+  /* 0F 32 */ { 0, &Ia_rdmsr },
+  /* 0F 33 */ { 0, &Ia_rdpmc },
+  /* 0F 34 */ { 0, &Ia_sysenter },
+  /* 0F 35 */ { 0, &Ia_sysexit },
+  /* 0F 36 */ { 0, &Ia_Invalid },
+  /* 0F 37 */ { 0, &Ia_getsec },
+  /* 0F 38 */ { GR3BTAB(0f38) },
+  /* 0F 39 */ { 0, &Ia_Invalid  },
+  /* 0F 3A */ { GR3BTAB(0f3a) },
+  /* 0F 3B */ { 0, &Ia_Invalid },
+  /* 0F 3C */ { 0, &Ia_Invalid },
+  /* 0F 3D */ { 0, &Ia_Invalid },
+  /* 0F 3E */ { 0, &Ia_Invalid },
+  /* 0F 3F */ { 0, &Ia_Invalid },
+  /* 0F 40 */ { 0, &Ia_cmovol_Gd_Ed  },
+  /* 0F 41 */ { 0, &Ia_cmovnol_Gd_Ed },
+  /* 0F 42 */ { 0, &Ia_cmovbl_Gd_Ed  },
+  /* 0F 43 */ { 0, &Ia_cmovnbl_Gd_Ed },
+  /* 0F 44 */ { 0, &Ia_cmovzl_Gd_Ed  },
+  /* 0F 45 */ { 0, &Ia_cmovnzl_Gd_Ed },
+  /* 0F 46 */ { 0, &Ia_cmovbel_Gd_Ed },
+  /* 0F 47 */ { 0, &Ia_cmovnbel_Gd_Ed  },
+  /* 0F 48 */ { 0, &Ia_cmovsl_Gd_Ed  },
+  /* 0F 49 */ { 0, &Ia_cmovnsl_Gd_Ed },
+  /* 0F 4A */ { 0, &Ia_cmovpl_Gd_Ed  },
+  /* 0F 4B */ { 0, &Ia_cmovnpl_Gd_Ed },
+  /* 0F 4C */ { 0, &Ia_cmovll_Gd_Ed  },
+  /* 0F 4D */ { 0, &Ia_cmovnll_Gd_Ed },
+  /* 0F 4E */ { 0, &Ia_cmovlel_Gd_Ed },
+  /* 0F 4F */ { 0, &Ia_cmovnlel_Gd_Ed  },
+  /* 0F 50 */ { GRPSSE2(0f50) },
+  /* 0F 51 */ { GRPSSE(0f51) },
+  /* 0F 52 */ { GRPSSE(0f52) },
+  /* 0F 53 */ { GRPSSE(0f53) },
+  /* 0F 54 */ { GRPSSE2(0f54) },
+  /* 0F 55 */ { GRPSSE2(0f55) },
+  /* 0F 56 */ { GRPSSE2(0f56) },
+  /* 0F 57 */ { GRPSSE2(0f57) },
+  /* 0F 58 */ { GRPSSE(0f58) },
+  /* 0F 59 */ { GRPSSE(0f59) },
+  /* 0F 5A */ { GRPSSE(0f5a) },
+  /* 0F 5B */ { GRPSSE(0f5b) },
+  /* 0F 5C */ { GRPSSE(0f5c) },
+  /* 0F 5D */ { GRPSSE(0f5d) },
+  /* 0F 5E */ { GRPSSE(0f5e) },
+  /* 0F 5F */ { GRPSSE(0f5f) },
+  /* 0F 60 */ { GRPSSE2(0f60) },
+  /* 0F 61 */ { GRPSSE2(0f61) },
+  /* 0F 62 */ { GRPSSE2(0f62) },
+  /* 0F 63 */ { GRPSSE2(0f63) },
+  /* 0F 64 */ { GRPSSE2(0f64) },
+  /* 0F 65 */ { GRPSSE2(0f65) },
+  /* 0F 66 */ { GRPSSE2(0f66) },
+  /* 0F 67 */ { GRPSSE2(0f67) },
+  /* 0F 68 */ { GRPSSE2(0f68) },
+  /* 0F 69 */ { GRPSSE2(0f69) },
+  /* 0F 6A */ { GRPSSE2(0f6a) },
+  /* 0F 6B */ { GRPSSE2(0f6b) },
+  /* 0F 6C */ { GRPSSE66(Ia_punpcklqdq_Vdq_Wdq) },
+  /* 0F 6D */ { GRPSSE66(Ia_punpckhqdq_Vdq_Wdq) },
+  /* 0F 6E */ { GRPSSE2(0f6e) },
+  /* 0F 6F */ { GRPSSE(0f6f) },
+  /* 0F 70 */ { GRPSSE(0f70) },
+  /* 0F 71 */ { GRPN(G12) },
+  /* 0F 72 */ { GRPN(G13) },
+  /* 0F 73 */ { GRPN(G14) },
+  /* 0F 74 */ { GRPSSE2(0f74) },
+  /* 0F 75 */ { GRPSSE2(0f75) },
+  /* 0F 76 */ { GRPSSE2(0f76) },
+  /* 0F 77 */ { 0, &Ia_emms  },
+  /* 0F 78 */ { GRPSSE(0f78Q) }, // VMX
+  /* 0F 79 */ { GRPSSE(0f79Q) }, // VMX
+  /* 0F 7A */ { 0, &Ia_Invalid },
+  /* 0F 7B */ { 0, &Ia_Invalid },
+  /* 0F 7C */ { GRPSSE(0f7c) },
+  /* 0F 7D */ { GRPSSE(0f7d) },
+  /* 0F 7E */ { GRPSSE(0f7e) },
+  /* 0F 7F */ { GRPSSE(0f7f) },
+  /* 0F 80 */ { 0, &Ia_jo_Jd     },
+  /* 0F 81 */ { 0, &Ia_jno_Jd    },
+  /* 0F 82 */ { 0, &Ia_jb_Jd     },
+  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
+  /* 0F 84 */ { 0, &Ia_jz_Jd     },
+  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
+  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
+  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
+  /* 0F 88 */ { 0, &Ia_js_Jd     },
+  /* 0F 89 */ { 0, &Ia_jns_Jd    },
+  /* 0F 8A */ { 0, &Ia_jp_Jd     },
+  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
+  /* 0F 8C */ { 0, &Ia_jl_Jd     },
+  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
+  /* 0F 8E */ { 0, &Ia_jle_Jd    },
+  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
+  /* 0F 90 */ { 0, &Ia_seto_Eb   },
+  /* 0F 91 */ { 0, &Ia_setno_Eb  },
+  /* 0F 92 */ { 0, &Ia_setb_Eb   },
+  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
+  /* 0F 94 */ { 0, &Ia_setz_Eb   },
+  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
+  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
+  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
+  /* 0F 98 */ { 0, &Ia_sets_Eb   },
+  /* 0F 99 */ { 0, &Ia_setns_Eb  },
+  /* 0F 9A */ { 0, &Ia_setp_Eb   },
+  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
+  /* 0F 9C */ { 0, &Ia_setl_Eb   },
+  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
+  /* 0F 9E */ { 0, &Ia_setle_Eb  },
+  /* 0F 9F */ { 0, &Ia_setnle_Eb },
+  /* 0F A0 */ { 0, &Ia_pushq_FS  },
+  /* 0F A1 */ { 0, &Ia_popq_FS   },
+  /* 0F A2 */ { 0, &Ia_cpuid     },
+  /* 0F A3 */ { 0, &Ia_btl_Ed_Gd },
+  /* 0F A4 */ { 0, &Ia_shldl_Ed_Gd_Ib },
+  /* 0F A5 */ { 0, &Ia_shldl_Ed_Gd_CL },
+  /* 0F A6 */ { 0, &Ia_Invalid    },
+  /* 0F A7 */ { 0, &Ia_Invalid    },
+  /* 0F A8 */ { 0, &Ia_pushq_GS   },
+  /* 0F A9 */ { 0, &Ia_popq_GS    },
+  /* 0F AA */ { 0, &Ia_rsm        },
+  /* 0F AB */ { 0, &Ia_btsl_Ed_Gd },
+  /* 0F AC */ { 0, &Ia_shrdl_Ed_Gd_Ib },
+  /* 0F AD */ { 0, &Ia_shrdl_Ed_Gd_CL },
+  /* 0F AE */ { GRPMOD(G15)           },
+  /* 0F AF */ { 0, &Ia_imull_Gd_Ed    },
+  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
+  /* 0F B1 */ { 0, &Ia_cmpxchgl_Ed_Gd },
+  /* 0F B2 */ { 0, &Ia_lssl_Gd_Mp   },
+  /* 0F B3 */ { 0, &Ia_btrl_Ed_Gd   },
+  /* 0F B4 */ { 0, &Ia_lfsl_Gd_Mp   },
+  /* 0F B5 */ { 0, &Ia_lgsl_Gd_Mp   },
+  /* 0F B6 */ { 0, &Ia_movzbl_Gd_Eb },
+  /* 0F B7 */ { 0, &Ia_movzwl_Gd_Ew },
+  /* 0F B8 */ { GRPSSEF3(Ia_popcnt_Gd_Ed) },
+  /* 0F B9 */ { 0, &Ia_ud2b         },
+  /* 0F BA */ { GRPN(G8EdIb)        },
+  /* 0F BB */ { 0, &Ia_btcl_Ed_Gd   },
+  /* 0F BC */ { GRPSSE(0fbcd) },
+  /* 0F BD */ { GRPSSE(0fbdd) },
+  /* 0F BE */ { 0, &Ia_movsbl_Gd_Eb },
+  /* 0F BF */ { 0, &Ia_movswl_Gd_Ew },
+  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
+  /* 0F C0 */ { 0, &Ia_xaddl_Ed_Gd  },
+  /* 0F C2 */ { GRPSSE(0fc2) },
+  /* 0F C3 */ { GRPSSENONE(Ia_movnti_Md_Gd) },
+  /* 0F C4 */ { GRPSSE2(0fc4) },
+  /* 0F C5 */ { GRPSSE2(0fc5) },
+  /* 0F C6 */ { GRPSSE2(0fc6) },
+  /* 0F C7 */ { GRPMOD(G9d) },
+  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
+  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
+  /* 0F CA */ { 0, &Ia_bswapl_ERX },
+  /* 0F CB */ { 0, &Ia_bswapl_ERX },
+  /* 0F CC */ { 0, &Ia_bswapl_ERX },
+  /* 0F CD */ { 0, &Ia_bswapl_ERX },
+  /* 0F CE */ { 0, &Ia_bswapl_ERX },
+  /* 0F CF */ { 0, &Ia_bswapl_ERX },
+  /* 0F D0 */ { GRPSSE(0fd0) },
+  /* 0F D1 */ { GRPSSE2(0fd1) },
+  /* 0F D2 */ { GRPSSE2(0fd2) },
+  /* 0F D3 */ { GRPSSE2(0fd3) },
+  /* 0F D4 */ { GRPSSE2(0fd4) },
+  /* 0F D5 */ { GRPSSE2(0fd5) },
+  /* 0F D6 */ { GRPSSE(0fd6) },
+  /* 0F D7 */ { GRPSSE2(0fd7) },
+  /* 0F D8 */ { GRPSSE2(0fd8) },
+  /* 0F D9 */ { GRPSSE2(0fd9) },
+  /* 0F DA */ { GRPSSE2(0fda) },
+  /* 0F DB */ { GRPSSE2(0fdb) },
+  /* 0F DC */ { GRPSSE2(0fdc) },
+  /* 0F DD */ { GRPSSE2(0fdd) },
+  /* 0F DE */ { GRPSSE2(0fde) },
+  /* 0F DF */ { GRPSSE2(0fdf) },
+  /* 0F E0 */ { GRPSSE2(0fe0) },
+  /* 0F E1 */ { GRPSSE2(0fe1) },
+  /* 0F E2 */ { GRPSSE2(0fe2) },
+  /* 0F E3 */ { GRPSSE2(0fe3) },
+  /* 0F E4 */ { GRPSSE2(0fe4) },
+  /* 0F E5 */ { GRPSSE2(0fe5) },
+  /* 0F E6 */ { GRPSSE(0fe6) },
+  /* 0F E7 */ { GRPSSE2(0fe7) },
+  /* 0F E8 */ { GRPSSE2(0fe8) },
+  /* 0F E9 */ { GRPSSE2(0fe9) },
+  /* 0F EA */ { GRPSSE2(0fea) },
+  /* 0F EB */ { GRPSSE2(0feb) },
+  /* 0F EC */ { GRPSSE2(0fec) },
+  /* 0F ED */ { GRPSSE2(0fed) },
+  /* 0F EE */ { GRPSSE2(0fee) },
+  /* 0F EF */ { GRPSSE2(0fef) },
+  /* 0F F0 */ { GRPSSEF2(Ia_lddqu_Vdq_Mdq) },
+  /* 0F F1 */ { GRPSSE2(0ff1) },
+  /* 0F F2 */ { GRPSSE2(0ff2) },
+  /* 0F F3 */ { GRPSSE2(0ff3) },
+  /* 0F F4 */ { GRPSSE2(0ff4) },
+  /* 0F F5 */ { GRPSSE2(0ff5) },
+  /* 0F F6 */ { GRPSSE2(0ff6) },
+  /* 0F F7 */ { GRPSSE2(0ff7) },
+  /* 0F F8 */ { GRPSSE2(0ff8) },
+  /* 0F F9 */ { GRPSSE2(0ff9) },
+  /* 0F FA */ { GRPSSE2(0ffa) },
+  /* 0F FB */ { GRPSSE2(0ffb) },
+  /* 0F FC */ { GRPSSE2(0ffc) },
+  /* 0F FD */ { GRPSSE2(0ffd) },
+  /* 0F FE */ { GRPSSE2(0ffe) },
+  /* 0F FF */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodes64q[256*2] = {
+  // 256 entries for single byte opcodes
+  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
+  /* 01 */ { 0, &Ia_addq_Eq_Gq    },
+  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
+  /* 03 */ { 0, &Ia_addq_Gq_Eq    },
+  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
+  /* 05 */ { 0, &Ia_addq_RAX_sId  },
+  /* 06 */ { 0, &Ia_Invalid       },
+  /* 07 */ { 0, &Ia_Invalid       },
+  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
+  /* 09 */ { 0, &Ia_orq_Eq_Gq     },
+  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
+  /* 0B */ { 0, &Ia_orq_Gq_Eq     },
+  /* 0C */ { 0, &Ia_orb_AL_Ib     },
+  /* 0D */ { 0, &Ia_orq_RAX_sId   },
+  /* 0E */ { 0, &Ia_Invalid       },
+  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
+  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
+  /* 11 */ { 0, &Ia_adcq_Eq_Gq    },
+  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
+  /* 13 */ { 0, &Ia_adcq_Gq_Eq    },
+  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
+  /* 15 */ { 0, &Ia_adcq_RAX_sId  },
+  /* 16 */ { 0, &Ia_Invalid       },
+  /* 17 */ { 0, &Ia_Invalid       },
+  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
+  /* 19 */ { 0, &Ia_sbbq_Eq_Gq    },
+  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
+  /* 1B */ { 0, &Ia_sbbq_Gq_Eq    },
+  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
+  /* 1D */ { 0, &Ia_sbbq_RAX_sId  },
+  /* 1E */ { 0, &Ia_Invalid       },
+  /* 1F */ { 0, &Ia_Invalid       },
+  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
+  /* 21 */ { 0, &Ia_andq_Eq_Gq    },
+  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
+  /* 23 */ { 0, &Ia_andq_Gq_Eq    },
+  /* 24 */ { 0, &Ia_andb_AL_Ib    },
+  /* 25 */ { 0, &Ia_andq_RAX_sId  },
+  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
+  /* 27 */ { 0, &Ia_Invalid       },
+  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
+  /* 29 */ { 0, &Ia_subq_Eq_Gq    },
+  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
+  /* 2B */ { 0, &Ia_subq_Gq_Eq    },
+  /* 2C */ { 0, &Ia_subb_AL_Ib    },
+  /* 2D */ { 0, &Ia_subq_RAX_sId  },
+  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
+  /* 2F */ { 0, &Ia_Invalid       },
+  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
+  /* 31 */ { 0, &Ia_xorq_Eq_Gq    },
+  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
+  /* 33 */ { 0, &Ia_xorq_Gq_Eq    },
+  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
+  /* 35 */ { 0, &Ia_xorq_RAX_sId  },
+  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
+  /* 37 */ { 0, &Ia_Invalid       },
+  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
+  /* 39 */ { 0, &Ia_cmpq_Eq_Gq    },
+  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
+  /* 3B */ { 0, &Ia_cmpq_Gq_Eq    },
+  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
+  /* 3D */ { 0, &Ia_cmpq_RAX_sId  },
+  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
+  /* 3F */ { 0, &Ia_Invalid       },
+  /* 40 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 41 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 42 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 43 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 44 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 45 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 46 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 47 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 48 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 49 */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4A */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4B */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4C */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4D */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4E */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 4F */ { 0, &Ia_prefix_rex    },   // REX:
+  /* 50 */ { 0, &Ia_pushq_RRX     },
+  /* 51 */ { 0, &Ia_pushq_RRX     },
+  /* 52 */ { 0, &Ia_pushq_RRX     },
+  /* 53 */ { 0, &Ia_pushq_RRX     },
+  /* 54 */ { 0, &Ia_pushq_RRX     },
+  /* 55 */ { 0, &Ia_pushq_RRX     },
+  /* 56 */ { 0, &Ia_pushq_RRX     },
+  /* 57 */ { 0, &Ia_pushq_RRX     },
+  /* 58 */ { 0, &Ia_popq_RRX      },
+  /* 59 */ { 0, &Ia_popq_RRX      },
+  /* 5A */ { 0, &Ia_popq_RRX      },
+  /* 5B */ { 0, &Ia_popq_RRX      },
+  /* 5C */ { 0, &Ia_popq_RRX      },
+  /* 5D */ { 0, &Ia_popq_RRX      },
+  /* 5E */ { 0, &Ia_popq_RRX      },
+  /* 5F */ { 0, &Ia_popq_RRX      },
+  /* 60 */ { 0, &Ia_Invalid       },
+  /* 61 */ { 0, &Ia_Invalid       },
+  /* 62 */ { 0, &Ia_Invalid       },
+  /* 63 */ { 0, &Ia_movslq_Gq_Ed  },
+  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
+  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
+  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
+  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
+  /* 68 */ { 0, &Ia_pushq_sId     },
+  /* 69 */ { 0, &Ia_imulq_Gq_Eq_sId },
+  /* 6A */ { 0, &Ia_pushq_sIb     },
+  /* 6B */ { 0, &Ia_imulq_Gq_Eq_sIb },
+  /* 6C */ { 0, &Ia_insb_Yb_DX    },
+  /* 6D */ { 0, &Ia_insl_Yd_DX    },
+  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
+  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
+  /* 70 */ { 0, &Ia_jo_Jb         },
+  /* 71 */ { 0, &Ia_jno_Jb        },
+  /* 72 */ { 0, &Ia_jb_Jb         },
+  /* 73 */ { 0, &Ia_jnb_Jb        },
+  /* 74 */ { 0, &Ia_jz_Jb         },
+  /* 75 */ { 0, &Ia_jnz_Jb        },
+  /* 76 */ { 0, &Ia_jbe_Jb        },
+  /* 77 */ { 0, &Ia_jnbe_Jb       },
+  /* 78 */ { 0, &Ia_js_Jb         },
+  /* 79 */ { 0, &Ia_jns_Jb        },
+  /* 7A */ { 0, &Ia_jp_Jb         },
+  /* 7B */ { 0, &Ia_jnp_Jb        },
+  /* 7C */ { 0, &Ia_jl_Jb         },
+  /* 7D */ { 0, &Ia_jnl_Jb        },
+  /* 7E */ { 0, &Ia_jle_Jb        },
+  /* 7F */ { 0, &Ia_jnle_Jb       },
+  /* 80 */ { GRPN(G1EbIb)         },
+  /* 81 */ { GRPN(G1EqId)         },
+  /* 82 */ { 0, &Ia_Invalid       },
+  /* 83 */ { GRPN(G1EqIb)         },
+  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
+  /* 85 */ { 0, &Ia_testq_Eq_Gq   },
+  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
+  /* 87 */ { 0, &Ia_xchgq_Eq_Gq   },
+  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
+  /* 89 */ { 0, &Ia_movq_Eq_Gq    },
+  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
+  /* 8B */ { 0, &Ia_movq_Gq_Eq    },
+  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
+  /* 8D */ { 0, &Ia_leaq_Gq_Mq    },
+  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
+  /* 8F */ { 0, &Ia_popq_Eq       },
+  /* 90 */ { 0, &Ia_xchgq_RRX_RAX }, // handle XCHG R8, RAX
+  /* 91 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 92 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 93 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 94 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 95 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 96 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 97 */ { 0, &Ia_xchgq_RRX_RAX },
+  /* 98 */ { 0, &Ia_cdqe          },
+  /* 99 */ { 0, &Ia_cqo           },
+  /* 9A */ { 0, &Ia_Invalid       },
+  /* 9B */ { 0, &Ia_fwait         },
+  /* 9C */ { 0, &Ia_pushfq        },
+  /* 9D */ { 0, &Ia_popfq         },
+  /* 9E */ { 0, &Ia_sahf          },
+  /* 9F */ { 0, &Ia_lahf          },
+  /* A0 */ { 0, &Ia_movb_AL_Ob    },
+  /* A1 */ { 0, &Ia_movq_RAX_Oq   },
+  /* A0 */ { 0, &Ia_movb_Ob_AL    },
+  /* A1 */ { 0, &Ia_movq_Oq_RAX   },
+  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
+  /* A5 */ { 0, &Ia_movsq_Yq_Xq   },
+  /* A6 */ { 0, &Ia_cmpsb_Xb_Yb   },
+  /* A7 */ { 0, &Ia_cmpsq_Xq_Yq   },
+  /* A8 */ { 0, &Ia_testb_AL_Ib   },
+  /* A9 */ { 0, &Ia_testq_RAX_sId },
+  /* AA */ { 0, &Ia_stosb_Yb_AL   },
+  /* AB */ { 0, &Ia_stosq_Yq_RAX  },
+  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
+  /* AD */ { 0, &Ia_lodsq_RAX_Xq  },
+  /* AE */ { 0, &Ia_scasb_AL_Yb   },
+  /* AF */ { 0, &Ia_scasq_RAX_Yq  },
+  /* B0 */ { 0, &Ia_movb_R8_Ib    },
+  /* B1 */ { 0, &Ia_movb_R8_Ib    },
+  /* B2 */ { 0, &Ia_movb_R8_Ib    },
+  /* B3 */ { 0, &Ia_movb_R8_Ib    },
+  /* B4 */ { 0, &Ia_movb_R8_Ib    },
+  /* B5 */ { 0, &Ia_movb_R8_Ib    },
+  /* B6 */ { 0, &Ia_movb_R8_Ib    },
+  /* B7 */ { 0, &Ia_movb_R8_Ib    },
+  /* B8 */ { 0, &Ia_movq_RRX_Iq   },
+  /* B9 */ { 0, &Ia_movq_RRX_Iq   },
+  /* BA */ { 0, &Ia_movq_RRX_Iq   },
+  /* BB */ { 0, &Ia_movq_RRX_Iq   },
+  /* BC */ { 0, &Ia_movq_RRX_Iq   },
+  /* BD */ { 0, &Ia_movq_RRX_Iq   },
+  /* BE */ { 0, &Ia_movq_RRX_Iq   },
+  /* BF */ { 0, &Ia_movq_RRX_Iq   },
+  /* C0 */ { GRPN(G2Eb)           },
+  /* C1 */ { GRPN(G2Eq)           },
+  /* C2 */ { 0, &Ia_ret_Iw        },
+  /* C3 */ { 0, &Ia_ret           },
+  /* C4 */ { 0, &Ia_Invalid       },
+  /* C5 */ { 0, &Ia_Invalid       },
+  /* C6 */ { GRPN(G11Eb)          },
+  /* C7 */ { GRPN(G11Eq)          },
+  /* C8 */ { 0, &Ia_enter         },
+  /* C9 */ { 0, &Ia_leave         },
+  /* CA */ { 0, &Ia_lret_Iw       },
+  /* CB */ { 0, &Ia_lret          },
+  /* CC */ { 0, &Ia_int3          },
+  /* CD */ { 0, &Ia_int_Ib        },
+  /* CE */ { 0, &Ia_Invalid       },
+  /* CF */ { 0, &Ia_iretq         },
+  /* D0 */ { GRPN(G2EbI1)         },
+  /* D1 */ { GRPN(G2EqI1)         },
+  /* D2 */ { GRPN(G2EbCL)         },
+  /* D3 */ { GRPN(G2EqCL)         },
+  /* D4 */ { 0, &Ia_Invalid       },
+  /* D5 */ { 0, &Ia_Invalid       },
+  /* D6 */ { 0, &Ia_Invalid       },
+  /* D7 */ { 0, &Ia_xlat          },
+  /* D8 */ { GRPFP(D8)            },
+  /* D9 */ { GRPFP(D9)            },
+  /* DA */ { GRPFP(DA)            },
+  /* DB */ { GRPFP(DB)            },
+  /* DC */ { GRPFP(DC)            },
+  /* DD */ { GRPFP(DD)            },
+  /* DE */ { GRPFP(DE)            },
+  /* DF */ { GRPFP(DF)            },
+  /* E0 */ { 0, &Ia_loopne_Jb     },
+  /* E1 */ { 0, &Ia_loope_Jb      },
+  /* E2 */ { 0, &Ia_loop_Jb       },
+  /* E3 */ { 0, &Ia_jrcxz_Jb      },
+  /* E4 */ { 0, &Ia_inb_AL_Ib     },
+  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
+  /* E6 */ { 0, &Ia_outb_Ib_AL    },
+  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
+  /* E8 */ { 0, &Ia_call_Jd       },
+  /* E9 */ { 0, &Ia_jmp_Jd        },
+  /* EA */ { 0, &Ia_Invalid       },
+  /* EB */ { 0, &Ia_jmp_Jb        },
+  /* EC */ { 0, &Ia_inb_AL_DX     },
+  /* ED */ { 0, &Ia_inl_EAX_DX    },
+  /* EE */ { 0, &Ia_outb_DX_AL    },
+  /* EF */ { 0, &Ia_outl_DX_EAX   },
+  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
+  /* F1 */ { 0, &Ia_int1          },
+  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
+  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
+  /* F4 */ { 0, &Ia_hlt           },
+  /* F5 */ { 0, &Ia_cmc           },
+  /* F6 */ { GRPN(G3Eb)           },
+  /* F7 */ { GRPN(G3Eq)           },
+  /* F8 */ { 0, &Ia_clc           },
+  /* F9 */ { 0, &Ia_stc           },
+  /* FA */ { 0, &Ia_cli           },
+  /* FB */ { 0, &Ia_sti           },
+  /* FC */ { 0, &Ia_cld           },
+  /* FD */ { 0, &Ia_std           },
+  /* FE */ { GRPN(G4)             },
+  /* FF */ { GRPN(64G5q)          },
+
+  // 256 entries for two byte opcodes
+  /* 0F 00 */ { GRPN(G6)          },
+  /* 0F 01 */ { GRPMOD(G7)        },
+  /* 0F 02 */ { 0, &Ia_larq_Gq_Ew },
+  /* 0F 03 */ { 0, &Ia_lslq_Gq_Ew },
+  /* 0F 04 */ { 0, &Ia_Invalid    },
+  /* 0F 05 */ { 0, &Ia_syscall    },
+  /* 0F 06 */ { 0, &Ia_clts       },
+  /* 0F 07 */ { 0, &Ia_sysret     },
+  /* 0F 08 */ { 0, &Ia_invd       },
+  /* 0F 09 */ { 0, &Ia_wbinvd     },
+  /* 0F 0A */ { 0, &Ia_Invalid    },
+  /* 0F 0B */ { 0, &Ia_ud2a       },
+  /* 0F 0C */ { 0, &Ia_Invalid    },
+  /* 0F 0D */ { 0, &Ia_prefetchw  },   // 3DNow!
+  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
+  /* 0F 0F */ { GRP3DNOW          },
+  /* 0F 10 */ { GRPSSE(0f10)      },
+  /* 0F 11 */ { GRPSSE(0f11)      },
+  /* 0F 12 */ { GRPSSE(0f12)      },
+  /* 0F 13 */ { GRPSSE2(0f13)     },
+  /* 0F 14 */ { GRPSSE2(0f14)     },
+  /* 0F 15 */ { GRPSSE2(0f15)     },
+  /* 0F 16 */ { GRPSSE(0f16)      },
+  /* 0F 17 */ { GRPSSE2(0f17)     },
+  /* 0F 18 */ { GRPN(G16)         },
+  /* 0F 19 */ { 0, &Ia_multibyte_nop },
+  /* 0F 1A */ { 0, &Ia_multibyte_nop },
+  /* 0F 1B */ { 0, &Ia_multibyte_nop },
+  /* 0F 1C */ { 0, &Ia_multibyte_nop },
+  /* 0F 1D */ { 0, &Ia_multibyte_nop },
+  /* 0F 1E */ { 0, &Ia_multibyte_nop },
+  /* 0F 1F */ { 0, &Ia_multibyte_nop },
+  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
+  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
+  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
+  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
+  /* 0F 24 */ { 0, &Ia_Invalid    },
+  /* 0F 25 */ { 0, &Ia_Invalid    },
+  /* 0F 26 */ { 0, &Ia_Invalid    },
+  /* 0F 27 */ { 0, &Ia_Invalid    },
+  /* 0F 28 */ { GRPSSE2(0f28) },
+  /* 0F 29 */ { GRPSSE2(0f29) },
+  /* 0F 2A */ { GRPSSE(0f2a) },
+  /* 0F 2B */ { GRPSSE(0f2b) },
+  /* 0F 2C */ { GRPSSE(0f2c) },
+  /* 0F 2D */ { GRPSSE(0f2d) },
+  /* 0F 2E */ { GRPSSE2(0f2e) },
+  /* 0F 2F */ { GRPSSE2(0f2f) },
+  /* 0F 30 */ { 0, &Ia_wrmsr },
+  /* 0F 31 */ { 0, &Ia_rdtsc },
+  /* 0F 32 */ { 0, &Ia_rdmsr },
+  /* 0F 33 */ { 0, &Ia_rdpmc },
+  /* 0F 34 */ { 0, &Ia_sysenter },
+  /* 0F 35 */ { 0, &Ia_sysexit },
+  /* 0F 36 */ { 0, &Ia_Invalid },
+  /* 0F 37 */ { 0, &Ia_getsec },
+  /* 0F 38 */ { GR3BTAB(0f38) },
+  /* 0F 39 */ { 0, &Ia_Invalid  },
+  /* 0F 3A */ { GR3BTAB(0f3a) },
+  /* 0F 3B */ { 0, &Ia_Invalid },
+  /* 0F 3C */ { 0, &Ia_Invalid },
+  /* 0F 3D */ { 0, &Ia_Invalid },
+  /* 0F 3E */ { 0, &Ia_Invalid },
+  /* 0F 3F */ { 0, &Ia_Invalid },
+  /* 0F 40 */ { 0, &Ia_cmovoq_Gq_Eq  },
+  /* 0F 41 */ { 0, &Ia_cmovnoq_Gq_Eq },
+  /* 0F 42 */ { 0, &Ia_cmovbq_Gq_Eq  },
+  /* 0F 43 */ { 0, &Ia_cmovnbq_Gq_Eq },
+  /* 0F 44 */ { 0, &Ia_cmovzq_Gq_Eq  },
+  /* 0F 45 */ { 0, &Ia_cmovnzq_Gq_Eq },
+  /* 0F 46 */ { 0, &Ia_cmovbeq_Gq_Eq },
+  /* 0F 47 */ { 0, &Ia_cmovnbeq_Gq_Eq  },
+  /* 0F 48 */ { 0, &Ia_cmovsq_Gq_Eq  },
+  /* 0F 49 */ { 0, &Ia_cmovnsq_Gq_Eq },
+  /* 0F 4A */ { 0, &Ia_cmovpq_Gq_Eq  },
+  /* 0F 4B */ { 0, &Ia_cmovnpq_Gq_Eq },
+  /* 0F 4C */ { 0, &Ia_cmovlq_Gq_Eq  },
+  /* 0F 4D */ { 0, &Ia_cmovnlq_Gq_Eq },
+  /* 0F 4E */ { 0, &Ia_cmovleq_Gq_Eq },
+  /* 0F 4F */ { 0, &Ia_cmovnleq_Gq_Eq  },
+  /* 0F 50 */ { GRPSSE2(0f50) },
+  /* 0F 51 */ { GRPSSE(0f51) },
+  /* 0F 52 */ { GRPSSE(0f52) },
+  /* 0F 53 */ { GRPSSE(0f53) },
+  /* 0F 54 */ { GRPSSE2(0f54) },
+  /* 0F 55 */ { GRPSSE2(0f55) },
+  /* 0F 56 */ { GRPSSE2(0f56) },
+  /* 0F 57 */ { GRPSSE2(0f57) },
+  /* 0F 58 */ { GRPSSE(0f58) },
+  /* 0F 59 */ { GRPSSE(0f59) },
+  /* 0F 5A */ { GRPSSE(0f5a) },
+  /* 0F 5B */ { GRPSSE(0f5b) },
+  /* 0F 5C */ { GRPSSE(0f5c) },
+  /* 0F 5D */ { GRPSSE(0f5d) },
+  /* 0F 5E */ { GRPSSE(0f5e) },
+  /* 0F 5F */ { GRPSSE(0f5f) },
+  /* 0F 60 */ { GRPSSE2(0f60) },
+  /* 0F 61 */ { GRPSSE2(0f61) },
+  /* 0F 62 */ { GRPSSE2(0f62) },
+  /* 0F 63 */ { GRPSSE2(0f63) },
+  /* 0F 64 */ { GRPSSE2(0f64) },
+  /* 0F 65 */ { GRPSSE2(0f65) },
+  /* 0F 66 */ { GRPSSE2(0f66) },
+  /* 0F 67 */ { GRPSSE2(0f67) },
+  /* 0F 68 */ { GRPSSE2(0f68) },
+  /* 0F 69 */ { GRPSSE2(0f69) },
+  /* 0F 6A */ { GRPSSE2(0f6a) },
+  /* 0F 6B */ { GRPSSE2(0f6b) },
+  /* 0F 6C */ { GRPSSE66(Ia_punpcklqdq_Vdq_Wdq) },
+  /* 0F 6D */ { GRPSSE66(Ia_punpckhqdq_Vdq_Wdq) },
+  /* 0F 6E */ { GRPSSE2(0f6eQ) },
+  /* 0F 6F */ { GRPSSE(0f6f) },
+  /* 0F 70 */ { GRPSSE(0f70) },
+  /* 0F 71 */ { GRPN(G12) },
+  /* 0F 72 */ { GRPN(G13) },
+  /* 0F 73 */ { GRPN(G14) },
+  /* 0F 74 */ { GRPSSE2(0f74) },
+  /* 0F 75 */ { GRPSSE2(0f75) },
+  /* 0F 76 */ { GRPSSE2(0f76) },
+  /* 0F 77 */ { 0, &Ia_emms  },
+  /* 0F 78 */ { GRPSSE(0f78Q) }, // VMX
+  /* 0F 79 */ { GRPSSE(0f79Q) }, // VMX
+  /* 0F 7A */ { 0, &Ia_Invalid },
+  /* 0F 7B */ { 0, &Ia_Invalid },
+  /* 0F 7C */ { GRPSSE(0f7c) },
+  /* 0F 7D */ { GRPSSE(0f7d) },
+  /* 0F 7E */ { GRPSSE(0f7eQ) },
+  /* 0F 7F */ { GRPSSE(0f7f) },
+  /* 0F 80 */ { 0, &Ia_jo_Jd     },
+  /* 0F 81 */ { 0, &Ia_jno_Jd    },
+  /* 0F 82 */ { 0, &Ia_jb_Jd     },
+  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
+  /* 0F 84 */ { 0, &Ia_jz_Jd     },
+  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
+  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
+  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
+  /* 0F 88 */ { 0, &Ia_js_Jd     },
+  /* 0F 89 */ { 0, &Ia_jns_Jd    },
+  /* 0F 8A */ { 0, &Ia_jp_Jd     },
+  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
+  /* 0F 8C */ { 0, &Ia_jl_Jd     },
+  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
+  /* 0F 8E */ { 0, &Ia_jle_Jd    },
+  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
+  /* 0F 90 */ { 0, &Ia_seto_Eb   },
+  /* 0F 91 */ { 0, &Ia_setno_Eb  },
+  /* 0F 92 */ { 0, &Ia_setb_Eb   },
+  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
+  /* 0F 94 */ { 0, &Ia_setz_Eb   },
+  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
+  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
+  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
+  /* 0F 98 */ { 0, &Ia_sets_Eb   },
+  /* 0F 99 */ { 0, &Ia_setns_Eb  },
+  /* 0F 9A */ { 0, &Ia_setp_Eb   },
+  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
+  /* 0F 9C */ { 0, &Ia_setl_Eb   },
+  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
+  /* 0F 9E */ { 0, &Ia_setle_Eb  },
+  /* 0F 9F */ { 0, &Ia_setnle_Eb },
+  /* 0F A0 */ { 0, &Ia_pushq_FS  },
+  /* 0F A1 */ { 0, &Ia_popq_FS   },
+  /* 0F A2 */ { 0, &Ia_cpuid     },
+  /* 0F A3 */ { 0, &Ia_btq_Eq_Gq },
+  /* 0F A4 */ { 0, &Ia_shldq_Eq_Gq_Ib },
+  /* 0F A5 */ { 0, &Ia_shldq_Eq_Gq_CL },
+  /* 0F A6 */ { 0, &Ia_Invalid    },
+  /* 0F A7 */ { 0, &Ia_Invalid    },
+  /* 0F A8 */ { 0, &Ia_pushq_GS   },
+  /* 0F A9 */ { 0, &Ia_popq_GS    },
+  /* 0F AA */ { 0, &Ia_rsm        },
+  /* 0F AB */ { 0, &Ia_btsq_Eq_Gq },
+  /* 0F AC */ { 0, &Ia_shrdq_Eq_Gq_Ib },
+  /* 0F AD */ { 0, &Ia_shrdq_Eq_Gq_CL },
+  /* 0F AE */ { GRPMOD(G15)           },
+  /* 0F AF */ { 0, &Ia_imulq_Gq_Eq    },
+  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
+  /* 0F B1 */ { 0, &Ia_cmpxchgq_Eq_Gq },
+  /* 0F B2 */ { 0, &Ia_lssq_Gq_Mp   },
+  /* 0F B3 */ { 0, &Ia_btrq_Eq_Gq   },
+  /* 0F B4 */ { 0, &Ia_lfsq_Gq_Mp   },
+  /* 0F B5 */ { 0, &Ia_lgsq_Gq_Mp   },
+  /* 0F B6 */ { 0, &Ia_movzbq_Gq_Eb },
+  /* 0F B7 */ { 0, &Ia_movzwq_Gq_Ew },
+  /* 0F B8 */ { GRPSSEF3(Ia_popcnt_Gq_Eq) },
+  /* 0F B9 */ { 0, &Ia_ud2b         },
+  /* 0F BA */ { GRPN(G8EqIb)        },
+  /* 0F BB */ { 0, &Ia_btcq_Eq_Gq   },
+  /* 0F BC */ { GRPSSE(0fbcq) },
+  /* 0F BD */ { GRPSSE(0fbdq) },
+  /* 0F BE */ { 0, &Ia_movsbq_Gq_Eb },
+  /* 0F BF */ { 0, &Ia_movswq_Gq_Ew },
+  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
+  /* 0F C0 */ { 0, &Ia_xaddq_Eq_Gq  },
+  /* 0F C2 */ { GRPSSE(0fc2) },
+  /* 0F C3 */ { GRPSSENONE(Ia_movntiq_Mq_Gq) },
+  /* 0F C4 */ { GRPSSE2(0fc4) },
+  /* 0F C5 */ { GRPSSE2(0fc5) },
+  /* 0F C6 */ { GRPSSE2(0fc6) },
+  /* 0F C7 */ { GRPMOD(G9q) },
+  /* 0F C8 */ { 0, &Ia_bswapq_RRX },
+  /* 0F C9 */ { 0, &Ia_bswapq_RRX },
+  /* 0F CA */ { 0, &Ia_bswapq_RRX },
+  /* 0F CB */ { 0, &Ia_bswapq_RRX },
+  /* 0F CC */ { 0, &Ia_bswapq_RRX },
+  /* 0F CD */ { 0, &Ia_bswapq_RRX },
+  /* 0F CE */ { 0, &Ia_bswapq_RRX },
+  /* 0F CF */ { 0, &Ia_bswapq_RRX },
+  /* 0F D0 */ { GRPSSE(0fd0) },
+  /* 0F D1 */ { GRPSSE2(0fd1) },
+  /* 0F D2 */ { GRPSSE2(0fd2) },
+  /* 0F D3 */ { GRPSSE2(0fd3) },
+  /* 0F D4 */ { GRPSSE2(0fd4) },
+  /* 0F D5 */ { GRPSSE2(0fd5) },
+  /* 0F D6 */ { GRPSSE(0fd6) },
+  /* 0F D7 */ { GRPSSE2(0fd7) },
+  /* 0F D8 */ { GRPSSE2(0fd8) },
+  /* 0F D9 */ { GRPSSE2(0fd9) },
+  /* 0F DA */ { GRPSSE2(0fda) },
+  /* 0F DB */ { GRPSSE2(0fdb) },
+  /* 0F DC */ { GRPSSE2(0fdc) },
+  /* 0F DD */ { GRPSSE2(0fdd) },
+  /* 0F DE */ { GRPSSE2(0fde) },
+  /* 0F DF */ { GRPSSE2(0fdf) },
+  /* 0F E0 */ { GRPSSE2(0fe0) },
+  /* 0F E1 */ { GRPSSE2(0fe1) },
+  /* 0F E2 */ { GRPSSE2(0fe2) },
+  /* 0F E3 */ { GRPSSE2(0fe3) },
+  /* 0F E4 */ { GRPSSE2(0fe4) },
+  /* 0F E5 */ { GRPSSE2(0fe5) },
+  /* 0F E6 */ { GRPSSE(0fe6) },
+  /* 0F E7 */ { GRPSSE2(0fe7) },
+  /* 0F E8 */ { GRPSSE2(0fe8) },
+  /* 0F E9 */ { GRPSSE2(0fe9) },
+  /* 0F EA */ { GRPSSE2(0fea) },
+  /* 0F EB */ { GRPSSE2(0feb) },
+  /* 0F EC */ { GRPSSE2(0fec) },
+  /* 0F ED */ { GRPSSE2(0fed) },
+  /* 0F EE */ { GRPSSE2(0fee) },
+  /* 0F EF */ { GRPSSE2(0fef) },
+  /* 0F F0 */ { GRPSSEF2(Ia_lddqu_Vdq_Mdq) },
+  /* 0F F1 */ { GRPSSE2(0ff1) },
+  /* 0F F2 */ { GRPSSE2(0ff2) },
+  /* 0F F3 */ { GRPSSE2(0ff3) },
+  /* 0F F4 */ { GRPSSE2(0ff4) },
+  /* 0F F5 */ { GRPSSE2(0ff5) },
+  /* 0F F6 */ { GRPSSE2(0ff6) },
+  /* 0F F7 */ { GRPSSE2(0ff7) },
+  /* 0F F8 */ { GRPSSE2(0ff8) },
+  /* 0F F9 */ { GRPSSE2(0ff9) },
+  /* 0F FA */ { GRPSSE2(0ffa) },
+  /* 0F FB */ { GRPSSE2(0ffb) },
+  /* 0F FC */ { GRPSSE2(0ffc) },
+  /* 0F FD */ { GRPSSE2(0ffd) },
+  /* 0F FE */ { GRPSSE2(0ffe) },
+  /* 0F FF */ { 0, &Ia_Invalid }
+};
diff --git a/Externals/Bochs_disasm/dis_tables.inl b/Externals/Bochs_disasm/dis_tables.inl
deleted file mode 100644
index 26e9fefe6a..0000000000
--- a/Externals/Bochs_disasm/dis_tables.inl
+++ /dev/null
@@ -1,5081 +0,0 @@
-/* ************************************************************************ */
-/* SSE opcodes */
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f10[4] = {
-  /* -- */ { 0, &Ia_movups_Vps_Wps },
-  /* 66 */ { 0, &Ia_movupd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_movsd_Vsd_Wsd  },
-  /* F3 */ { 0, &Ia_movss_Vss_Wss  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f11[4] = {
-  /* -- */ { 0, &Ia_movups_Wps_Vps },
-  /* 66 */ { 0, &Ia_movupd_Wpd_Vpd },
-  /* F2 */ { 0, &Ia_movsd_Wsd_Vsd  },
-  /* F3 */ { 0, &Ia_movss_Wss_Vss  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModMOVHLPS[2] = {
-  /* R */ { 0, &Ia_movhlps_Vps_Uq },
-  /* M */ { 0, &Ia_movlps_Vps_Mq  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModMOVHLPD[2] = {
-  /* R */ { 0, &Ia_movhlpd_Vpd_Uq },
-  /* M */ { 0, &Ia_movlpd_Vpd_Mq  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f12[4] = {
-  /* -- */ { GRPMOD(MOVHLPS) },
-  /* 66 */ { GRPMOD(MOVHLPD) },
-  /* F2 */ { 0, &Ia_movddup_Vdq_Wq   },
-  /* F3 */ { 0, &Ia_movsldup_Vdq_Wdq }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f13[4] = {
-  /* -- */ { 0, &Ia_movlps_Mq_Vps },
-  /* 66 */ { 0, &Ia_movlpd_Mq_Vpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};                        
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f14[4] = {
-  /* -- */ { 0, &Ia_unpcklps_Vps_Wq },
-  /* 66 */ { 0, &Ia_unpcklpd_Vpd_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f15[4] = {
-  /* -- */ { 0, &Ia_unpckhps_Vps_Wdq },
-  /* 66 */ { 0, &Ia_unpckhpd_Vpd_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModMOVLHPS[2] = {
-  /* R */ { 0, &Ia_movlhps_Vps_Uq },
-  /* M */ { 0, &Ia_movhps_Vps_Mq  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModMOVLHPD[2] = {
-  /* R */ { 0, &Ia_movlhpd_Vpd_Uq },
-  /* M */ { 0, &Ia_movhpd_Vpd_Mq  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f16[4] = {
-  /* -- */ { GRPMOD(MOVLHPS) },
-  /* 66 */ { GRPMOD(MOVLHPD) },
-  /* F2 */ { 0, &Ia_Invalid  },
-  /* F3 */ { 0, &Ia_movshdup_Vdq_Wdq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f17[4] = {
-  /* -- */ { 0, &Ia_movhps_Mq_Vps },
-  /* 66 */ { 0, &Ia_movhpd_Mq_Vpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f28[4] = {
-  /* -- */ { 0, &Ia_movaps_Vps_Wps },
-  /* 66 */ { 0, &Ia_movapd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f29[4] = {
-  /* -- */ { 0, &Ia_movaps_Wps_Vps },
-  /* 66 */ { 0, &Ia_movapd_Wpd_Vpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2a[4] = {
-  /* -- */ { 0, &Ia_cvtpi2ps_Vps_Qq },
-  /* 66 */ { 0, &Ia_cvtpi2pd_Vpd_Qq },
-  /* F2 */ { 0, &Ia_cvtsi2sd_Vsd_Ed },
-  /* F3 */ { 0, &Ia_cvtsi2ss_Vss_Ed }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_640f2a[4] = {
-  /* -- */ { 0, &Ia_cvtpi2ps_Vps_Qq },
-  /* 66 */ { 0, &Ia_cvtpi2pd_Vpd_Qq },
-  /* F2 */ { 0, &Ia_cvtsi2sd_Vsd_Eq },
-  /* F3 */ { 0, &Ia_cvtsi2ss_Vss_Eq }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2b[4] = {
-  /* -- */ { 0, &Ia_movntps_Mps_Vps },
-  /* 66 */ { 0, &Ia_movntpd_Mpd_Vpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2c[4] = {
-  /* -- */ { 0, &Ia_cvttps2pi_Pq_Wps },
-  /* 66 */ { 0, &Ia_cvttpd2pi_Pq_Wpd },
-  /* F2 */ { 0, &Ia_cvttsd2si_Gd_Wsd },
-  /* F3 */ { 0, &Ia_cvttss2si_Gd_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2cQ[4] = {
-  /* -- */ { 0, &Ia_cvttps2pi_Pq_Wps },
-  /* 66 */ { 0, &Ia_cvttpd2pi_Pq_Wpd },
-  /* F2 */ { 0, &Ia_cvttsd2si_Gq_Wsd },
-  /* F3 */ { 0, &Ia_cvttss2si_Gq_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2d[4] = {
-  /* -- */ { 0, &Ia_cvtps2pi_Pq_Wps },
-  /* 66 */ { 0, &Ia_cvtpd2pi_Pq_Wpd },
-  /* F2 */ { 0, &Ia_cvtsd2si_Gd_Wsd },
-  /* F3 */ { 0, &Ia_cvtss2si_Gd_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2dQ[4] = {
-  /* -- */ { 0, &Ia_cvtps2pi_Pq_Wps },
-  /* 66 */ { 0, &Ia_cvtpd2pi_Pq_Wpd },
-  /* F2 */ { 0, &Ia_cvtsd2si_Gq_Wsd },
-  /* F3 */ { 0, &Ia_cvtss2si_Gq_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2e[4] = {
-  /* -- */ { 0, &Ia_ucomiss_Vss_Wss },
-  /* 66 */ { 0, &Ia_ucomisd_Vsd_Wss },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2f[4] = {
-  /* -- */ { 0, &Ia_comiss_Vss_Wss },
-  /* 66 */ { 0, &Ia_comisd_Vsd_Wsd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3800[4] = {
-  /* -- */ { 0, &Ia_pshufb_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_pshufb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3801[4] = {
-  /* -- */ { 0, &Ia_phaddw_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_phaddw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3802[4] = {
-  /* -- */ { 0, &Ia_phaddd_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_phaddd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3803[4] = {
-  /* -- */ { 0, &Ia_phaddsw_Pq_Qq },    // SSE4
-  /* 66 */ { 0, &Ia_phaddsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3804[4] = {
-  /* -- */ { 0, &Ia_pmaddubsw_Pq_Qq },  // SSE4
-  /* 66 */ { 0, &Ia_pmaddubsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3805[4] = {
-  /* -- */ { 0, &Ia_phsubw_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_phsubw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3806[4] = {
-  /* -- */ { 0, &Ia_phsubd_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_phsubd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3807[4] = {
-  /* -- */ { 0, &Ia_phsubsw_Pq_Qq },    // SSE4
-  /* 66 */ { 0, &Ia_phsubsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3808[4] = {
-  /* -- */ { 0, &Ia_psignb_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_psignb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3809[4] = {
-  /* -- */ { 0, &Ia_psignw_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_psignw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f380a[4] = {
-  /* -- */ { 0, &Ia_psignd_Pq_Qq },     // SSE4
-  /* 66 */ { 0, &Ia_psignd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f380b[4] = {
-  /* -- */ { 0, &Ia_pmulhrsw_Pq_Qq },   // SSE4
-  /* 66 */ { 0, &Ia_pmulhrsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381c[4] = {
-  /* -- */ { 0, &Ia_pabsb_Pq_Qq },      // SSE4
-  /* 66 */ { 0, &Ia_pabsb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381d[4] = {
-  /* -- */ { 0, &Ia_pabsw_Pq_Qq },      // SSE4
-  /* 66 */ { 0, &Ia_pabsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381e[4] = {
-  /* -- */ { 0, &Ia_pabsd_Pq_Qq },      // SSE4
-  /* 66 */ { 0, &Ia_pabsd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3a0f[4] = {
-  /* -- */ { 0, &Ia_palignr_Pq_Qq_Ib }, // SSE4
-  /* 66 */ { 0, &Ia_palignr_Vdq_Wdq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f50[4] = {
-  /* -- */ { 0, &Ia_movmskps_Gd_Vps },
-  /* 66 */ { 0, &Ia_movmskpd_Gd_Vpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f51[4] = {
-  /* -- */ { 0, &Ia_sqrtps_Vps_Wps },
-  /* 66 */ { 0, &Ia_sqrtpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_sqrtsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_sqrtss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f52[4] = {
-  /* -- */ { 0, &Ia_rsqrtps_Vps_Wps },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_rsqrtss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f53[4] = {
-  /* -- */ { 0, &Ia_rcpps_Vps_Wps },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_rcpss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f54[4] = {
-  /* -- */ { 0, &Ia_andps_Vps_Wps },
-  /* 66 */ { 0, &Ia_andpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f55[4] = {
-  /* -- */ { 0, &Ia_andnps_Vps_Wps },
-  /* 66 */ { 0, &Ia_andnpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f56[4] = {
-  /* -- */ { 0, &Ia_orps_Vps_Wps },
-  /* 66 */ { 0, &Ia_orpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f57[4] = {
-  /* -- */ { 0, &Ia_xorps_Vps_Wps },
-  /* 66 */ { 0, &Ia_xorpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f58[4] = {
-  /* -- */ { 0, &Ia_addps_Vps_Wps },
-  /* 66 */ { 0, &Ia_addpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_addsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_addss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f59[4] = {
-  /* -- */ { 0, &Ia_mulps_Vps_Wps },
-  /* 66 */ { 0, &Ia_mulpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_mulsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_mulss_Vss_Wss }
-};                   
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5a[4] = {
-  /* -- */ { 0, &Ia_cvtps2pd_Vpd_Wps },
-  /* 66 */ { 0, &Ia_cvtpd2ps_Vps_Wpd },
-  /* F2 */ { 0, &Ia_cvtsd2ss_Vss_Wsd },
-  /* F3 */ { 0, &Ia_cvtss2sd_Vsd_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5b[4] = {
-  /* -- */ { 0, &Ia_cvtdq2ps_Vps_Wdq  },
-  /* 66 */ { 0, &Ia_cvtps2dq_Vdq_Wps  },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_cvttps2dq_Vdq_Wps }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5c[4] = {
-  /* -- */ { 0, &Ia_subps_Vps_Wps },
-  /* 66 */ { 0, &Ia_subpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_subsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_subss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5d[4] = {
-  /* -- */ { 0, &Ia_minps_Vps_Wps },
-  /* 66 */ { 0, &Ia_minpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_minsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_minss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5e[4] = {
-  /* -- */ { 0, &Ia_divps_Vps_Wps },
-  /* 66 */ { 0, &Ia_divpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_divsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_divss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5f[4] = {
-  /* -- */ { 0, &Ia_maxps_Vps_Wps },
-  /* 66 */ { 0, &Ia_maxpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_maxsd_Vsd_Wsd },
-  /* F3 */ { 0, &Ia_maxss_Vss_Wss }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f60[4] = {
-  /* -- */ { 0, &Ia_punpcklbw_Pq_Qd },
-  /* 66 */ { 0, &Ia_punpcklbw_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f61[4] = {
-  /* -- */ { 0, &Ia_punpcklwd_Pq_Qd  },
-  /* 66 */ { 0, &Ia_punpcklwd_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f62[4] = {
-  /* -- */ { 0, &Ia_punpckldq_Pq_Qd  },
-  /* 66 */ { 0, &Ia_punpckldq_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f63[4] = {
-  /* -- */ { 0, &Ia_packsswb_Pq_Qq  },
-  /* 66 */ { 0, &Ia_packsswb_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f64[4] = {
-  /* -- */ { 0, &Ia_pcmpgtb_Pq_Qq  },
-  /* 66 */ { 0, &Ia_pcmpgtb_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f65[4] = {
-  /* -- */ { 0, &Ia_pcmpgtw_Pq_Qq  },
-  /* 66 */ { 0, &Ia_pcmpgtw_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f66[4] = {
-  /* -- */ { 0, &Ia_pcmpgtd_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pcmpgtd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f67[4] = {
-  /* -- */ { 0, &Ia_packuswb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_packuswb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f68[4] = {
-  /* -- */ { 0, &Ia_punpckhbw_Pq_Qq  },
-  /* 66 */ { 0, &Ia_punpckhbw_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f69[4] = {
-  /* -- */ { 0, &Ia_punpckhwd_Pq_Qq  },
-  /* 66 */ { 0, &Ia_punpckhwd_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6a[4] = {
-  /* -- */ { 0, &Ia_punpckhdq_Pq_Qq  },
-  /* 66 */ { 0, &Ia_punpckhdq_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6b[4] = {
-  /* -- */ { 0, &Ia_packssdw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_packssdw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6c[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_punpcklqdq_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6d[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_punpckhqdq_Vdq_Wq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6e[4] = {
-  /* -- */ { 0, &Ia_movd_Pq_Ed  },
-  /* 66 */ { 0, &Ia_movd_Vdq_Ed },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6eQ[4] = {
-  /* -- */ { 0, &Ia_movq_Pq_Eq  },
-  /* 66 */ { 0, &Ia_movq_Vdq_Eq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6f[4] = {
-  /* -- */ { 0, &Ia_movq_Pq_Qq     },
-  /* 66 */ { 0, &Ia_movdqa_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_movdqu_Vdq_Wdq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f70[4] = {
-  /* -- */ { 0, &Ia_pshufw_Pq_Qq_Ib   },
-  /* 66 */ { 0, &Ia_pshufd_Vdq_Wdq_Ib },
-  /* F2 */ { 0, &Ia_pshufhw_Vq_Wq_Ib  },
-  /* F3 */ { 0, &Ia_pshuflw_Vq_Wq_Ib  }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f74[4] = {
-  /* -- */ { 0, &Ia_pcmpeqb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pcmpeqb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f75[4] = {
-  /* -- */ { 0, &Ia_pcmpeqw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pcmpeqw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f76[4] = {
-  /* -- */ { 0, &Ia_pcmpeqd_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pcmpeqd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7c[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_haddpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_haddps_Vps_Wps },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7d[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_hsubpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_hsubps_Vps_Wps },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7e[4] = {
-  /* -- */ { 0, &Ia_movd_Ed_Pq },
-  /* 66 */ { 0, &Ia_movd_Ed_Vd },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_movq_Vq_Wq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7eQ[4] = {
-  /* -- */ { 0, &Ia_movq_Eq_Pq },
-  /* 66 */ { 0, &Ia_movq_Eq_Vq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_movq_Vq_Wq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7f[4] = {
-  /* -- */ { 0, &Ia_movq_Qq_Pq     },
-  /* 66 */ { 0, &Ia_movdqa_Wdq_Vdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_movdqu_Wdq_Vdq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc2[4] = {
-  /* -- */ { 0, &Ia_cmpps_Vps_Wps_Ib },
-  /* 66 */ { 0, &Ia_cmppd_Vpd_Wpd_Ib },
-  /* F2 */ { 0, &Ia_cmpsd_Vsd_Wsd_Ib },
-  /* F3 */ { 0, &Ia_cmpss_Vss_Wss_Ib }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc3[4] = {
-  /* -- */ { 0, &Ia_movnti_Md_Gd },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_640fc3[4] = {
-  /* -- */ { 0, &Ia_movntiq_Mq_Gq },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc4[4] = {
-  /* -- */ { 0, &Ia_pinsrw_Pq_Ed_Ib  },
-  /* 66 */ { 0, &Ia_pinsrw_Vdq_Ed_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc5[4] = {
-  /* -- */ { 0, &Ia_pextrw_Gd_Nq_Ib  },
-  /* 66 */ { 0, &Ia_pextrw_Gd_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc6[4] = {
-  /* -- */ { 0, &Ia_shufps_Vps_Wps_Ib },
-  /* 66 */ { 0, &Ia_shufpd_Vpd_Wpd_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd0[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_addsubpd_Vpd_Wpd },
-  /* F2 */ { 0, &Ia_addsubps_Vps_Wps },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd1[4] = {
-  /* -- */ { 0, &Ia_psrlw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psrlw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd2[4] = {
-  /* -- */ { 0, &Ia_psrld_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psrld_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd3[4] = {
-  /* -- */ { 0, &Ia_psrlq_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psrlq_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd4[4] = {
-  /* -- */ { 0, &Ia_paddq_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddq_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd5[4] = {
-  /* -- */ { 0, &Ia_pmullw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmullw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd6[4] = {
-  /* -- */ { 0, &Ia_Invalid        },
-  /* 66 */ { 0, &Ia_movq_Wq_Vq     },
-  /* F2 */ { 0, &Ia_movdq2q_Pq_Vq  },
-  /* F3 */ { 0, &Ia_movq2dq_Vdq_Qq },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd7[4] = {
-  /* -- */ { 0, &Ia_pmovmskb_Gd_Nq  },
-  /* 66 */ { 0, &Ia_pmovmskb_Gd_Udq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd8[4] = {
-  /* -- */ { 0, &Ia_psubusb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubusb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd9[4] = {
-  /* -- */ { 0, &Ia_psubusw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubusw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fda[4] = {
-  /* -- */ { 0, &Ia_pminub_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pminub_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdb[4] = {
-  /* -- */ { 0, &Ia_pand_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pand_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdc[4] = {
-  /* -- */ { 0, &Ia_paddusb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddusb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdd[4] = {
-  /* -- */ { 0, &Ia_paddusw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddusw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fde[4] = {
-  /* -- */ { 0, &Ia_pmaxub_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmaxub_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdf[4] = {
-  /* -- */ { 0, &Ia_pandn_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pandn_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe0[4] = {
-  /* -- */ { 0, &Ia_pavgb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pavgb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe1[4] = {
-  /* -- */ { 0, &Ia_psraw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psraw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe2[4] = {
-  /* -- */ { 0, &Ia_psrad_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psrad_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe3[4] = {
-  /* -- */ { 0, &Ia_pavgw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pavgw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe4[4] = {
-  /* -- */ { 0, &Ia_pmulhuw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmulhuw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe5[4] = {
-  /* -- */ { 0, &Ia_pmulhw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmulhw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe6[4] = {
-  /* -- */ { 0, &Ia_Invalid           },
-  /* 66 */ { 0, &Ia_cvttpd2dq_Vq_Wpd },
-  /* F2 */ { 0, &Ia_cvtpd2dq_Vq_Wpd   },
-  /* F3 */ { 0, &Ia_cvtdq2pd_Vpd_Wq   }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe7[4] = {
-  /* -- */ { 0, &Ia_movntq_Mq_Pq    },
-  /* 66 */ { 0, &Ia_movntdq_Mdq_Vdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe8[4] = {
-  /* -- */ { 0, &Ia_psubsb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubsb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe9[4] = {
-  /* -- */ { 0, &Ia_psubsw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fea[4] = {
-  /* -- */ { 0, &Ia_pminsw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pminsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0feb[4] = {
-  /* -- */ { 0, &Ia_por_Pq_Qq   },
-  /* 66 */ { 0, &Ia_por_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fec[4] = {
-  /* -- */ { 0, &Ia_paddsb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddsb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fed[4] = {
-  /* -- */ { 0, &Ia_paddsw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddsw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fee[4] = {
-  /* -- */ { 0, &Ia_pmaxuw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmaxuw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fef[4] = {
-  /* -- */ { 0, &Ia_pxor_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pxor_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff0[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_lddqu_Vdq_Mdq },
-  /* F3 */ { 0, &Ia_Invalid }
-};                        
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff1[4] = {
-  /* -- */ { 0, &Ia_psllw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psllw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff2[4] = {
-  /* -- */ { 0, &Ia_pslld_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pslld_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff3[4] = {
-  /* -- */ { 0, &Ia_psllq_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psllq_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff4[4] = {
-  /* -- */ { 0, &Ia_pmuludq_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmuludq_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff5[4] = {
-  /* -- */ { 0, &Ia_pmaddwd_Pq_Qq   },
-  /* 66 */ { 0, &Ia_pmaddwd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff6[4] = {
-  /* -- */ { 0, &Ia_psadbw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psadbw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff7[4] = {
-  /* -- */ { 0, &Ia_maskmovq_Pq_Nq     },
-  /* 66 */ { 0, &Ia_maskmovdqu_Vdq_Udq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff8[4] = {
-  /* -- */ { 0, &Ia_psubb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff9[4] = {
-  /* -- */ { 0, &Ia_psubw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffa[4] = {
-  /* -- */ { 0, &Ia_psubd_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffb[4] = {
-  /* -- */ { 0, &Ia_psubq_Pq_Qq   },
-  /* 66 */ { 0, &Ia_psubq_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffc[4] = {
-  /* -- */ { 0, &Ia_paddb_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddb_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffd[4] = {
-  /* -- */ { 0, &Ia_paddw_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddw_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffe[4] = {
-  /* -- */ { 0, &Ia_paddd_Pq_Qq   },
-  /* 66 */ { 0, &Ia_paddd_Vdq_Wdq },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1202[4] = {
-  /* -- */ { 0, &Ia_psrlw_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psrlw_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1204[4] = {
-  /* -- */ { 0, &Ia_psraw_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psraw_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1206[4] = {
-  /* -- */ { 0, &Ia_psllw_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psllw_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1302[4] = {
-  /* -- */ { 0, &Ia_psrld_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psrld_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1304[4] = {
-  /* -- */ { 0, &Ia_psrad_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psrad_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1306[4] = {
-  /* -- */ { 0, &Ia_pslld_Nq_Ib  },
-  /* 66 */ { 0, &Ia_pslld_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1402[4] = {
-  /* -- */ { 0, &Ia_psrlq_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psrlq_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1403[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_psrldq_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1406[4] = {
-  /* -- */ { 0, &Ia_psllq_Nq_Ib  },
-  /* 66 */ { 0, &Ia_psllq_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1407[4] = {
-  /* -- */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_pslldq_Udq_Ib },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid }
-};
-
-
-/* ************************************************************************ */
-/* Opcode GroupN */
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EbIb[8] = {
-  /* 0 */ { 0, &Ia_addb_Eb_Ib },
-  /* 1 */ { 0, &Ia_orb_Eb_Ib  },
-  /* 2 */ { 0, &Ia_adcb_Eb_Ib },
-  /* 3 */ { 0, &Ia_sbbb_Eb_Ib },
-  /* 4 */ { 0, &Ia_andb_Eb_Ib },
-  /* 5 */ { 0, &Ia_subb_Eb_Ib },
-  /* 6 */ { 0, &Ia_xorb_Eb_Ib },
-  /* 7 */ { 0, &Ia_cmpb_Eb_Ib }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EwIw[8] = {
-  /* 0 */ { 0, &Ia_addw_Ew_Iw },
-  /* 1 */ { 0, &Ia_orw_Ew_Iw  },
-  /* 2 */ { 0, &Ia_adcw_Ew_Iw },
-  /* 3 */ { 0, &Ia_sbbw_Ew_Iw },
-  /* 4 */ { 0, &Ia_andw_Ew_Iw },
-  /* 5 */ { 0, &Ia_subw_Ew_Iw },
-  /* 6 */ { 0, &Ia_xorw_Ew_Iw },
-  /* 7 */ { 0, &Ia_cmpw_Ew_Iw }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EdId[8] = {
-  /* 0 */ { 0, &Ia_addl_Ed_Id },
-  /* 1 */ { 0, &Ia_orl_Ed_Id  },
-  /* 2 */ { 0, &Ia_adcl_Ed_Id },
-  /* 3 */ { 0, &Ia_sbbl_Ed_Id },
-  /* 4 */ { 0, &Ia_andl_Ed_Id },
-  /* 5 */ { 0, &Ia_subl_Ed_Id },
-  /* 6 */ { 0, &Ia_xorl_Ed_Id },
-  /* 7 */ { 0, &Ia_cmpl_Ed_Id }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EqId[8] = {
-  /* 0 */ { 0, &Ia_addq_Eq_sId },
-  /* 1 */ { 0, &Ia_orq_Eq_sId  },
-  /* 2 */ { 0, &Ia_adcq_Eq_sId },
-  /* 3 */ { 0, &Ia_sbbq_Eq_sId },
-  /* 4 */ { 0, &Ia_andq_Eq_sId },
-  /* 5 */ { 0, &Ia_subq_Eq_sId },
-  /* 6 */ { 0, &Ia_xorq_Eq_sId },
-  /* 7 */ { 0, &Ia_cmpq_Eq_sId }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EwIb[8] = {
-  /* 0 */ { 0, &Ia_addw_Ew_sIb },	// sign-extend byte 
-  /* 1 */ { 0, &Ia_orw_Ew_sIb  },
-  /* 2 */ { 0, &Ia_adcw_Ew_sIb },
-  /* 3 */ { 0, &Ia_sbbw_Ew_sIb },
-  /* 4 */ { 0, &Ia_andw_Ew_sIb },
-  /* 5 */ { 0, &Ia_subw_Ew_sIb },
-  /* 6 */ { 0, &Ia_xorw_Ew_sIb },
-  /* 7 */ { 0, &Ia_cmpw_Ew_sIb }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EdIb[8] = {
-  /* 0 */ { 0, &Ia_addl_Ed_sIb },	// sign-extend byte 
-  /* 1 */ { 0, &Ia_orl_Ed_sIb  },
-  /* 2 */ { 0, &Ia_adcl_Ed_sIb },
-  /* 3 */ { 0, &Ia_sbbl_Ed_sIb },
-  /* 4 */ { 0, &Ia_andl_Ed_sIb },
-  /* 5 */ { 0, &Ia_subl_Ed_sIb },
-  /* 6 */ { 0, &Ia_xorl_Ed_sIb },
-  /* 7 */ { 0, &Ia_cmpl_Ed_sIb }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG1EqIb[8] = {
-  /* 0 */ { 0, &Ia_addq_Eq_sIb },	// sign-extend byte 
-  /* 1 */ { 0, &Ia_orq_Eq_sIb  },
-  /* 2 */ { 0, &Ia_adcq_Eq_sIb },
-  /* 3 */ { 0, &Ia_sbbq_Eq_sIb },
-  /* 4 */ { 0, &Ia_andq_Eq_sIb },
-  /* 5 */ { 0, &Ia_subq_Eq_sIb },
-  /* 6 */ { 0, &Ia_xorq_Eq_sIb },
-  /* 7 */ { 0, &Ia_cmpq_Eq_sIb }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2Eb[8] = {
-  /* 0 */ { 0, &Ia_rolb_Eb_Ib },
-  /* 1 */ { 0, &Ia_rorb_Eb_Ib },
-  /* 2 */ { 0, &Ia_rclb_Eb_Ib },
-  /* 3 */ { 0, &Ia_rcrb_Eb_Ib },
-  /* 4 */ { 0, &Ia_shlb_Eb_Ib },
-  /* 5 */ { 0, &Ia_shrb_Eb_Ib },
-  /* 6 */ { 0, &Ia_shlb_Eb_Ib },
-  /* 7 */ { 0, &Ia_sarb_Eb_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EbI1[8] = {
-  /* 0 */ { 0, &Ia_rolb_Eb_I1 },
-  /* 1 */ { 0, &Ia_rorb_Eb_I1 },
-  /* 2 */ { 0, &Ia_rclb_Eb_I1 },
-  /* 3 */ { 0, &Ia_rcrb_Eb_I1 },
-  /* 4 */ { 0, &Ia_shlb_Eb_I1 },
-  /* 5 */ { 0, &Ia_shrb_Eb_I1 },
-  /* 6 */ { 0, &Ia_shlb_Eb_I1 },
-  /* 7 */ { 0, &Ia_sarb_Eb_I1 }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EbCL[8] = {
-  /* 0 */ { 0, &Ia_rolb_Eb_CL },
-  /* 1 */ { 0, &Ia_rorb_Eb_CL },
-  /* 2 */ { 0, &Ia_rclb_Eb_CL },
-  /* 3 */ { 0, &Ia_rcrb_Eb_CL },
-  /* 4 */ { 0, &Ia_shlb_Eb_CL },
-  /* 5 */ { 0, &Ia_shrb_Eb_CL },
-  /* 6 */ { 0, &Ia_shlb_Eb_CL },
-  /* 7 */ { 0, &Ia_sarb_Eb_CL }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2Ew[8] = {
-  /* 0 */ { 0, &Ia_rolw_Ew_Ib },
-  /* 1 */ { 0, &Ia_rorw_Ew_Ib },
-  /* 2 */ { 0, &Ia_rclw_Ew_Ib },
-  /* 3 */ { 0, &Ia_rcrw_Ew_Ib },
-  /* 4 */ { 0, &Ia_shlw_Ew_Ib },
-  /* 5 */ { 0, &Ia_shrw_Ew_Ib },
-  /* 6 */ { 0, &Ia_shlw_Ew_Ib },
-  /* 7 */ { 0, &Ia_sarw_Ew_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2Ed[8] = {
-  /* 0 */ { 0, &Ia_roll_Ed_Ib },
-  /* 1 */ { 0, &Ia_rorl_Ed_Ib },
-  /* 2 */ { 0, &Ia_rcll_Ed_Ib },
-  /* 3 */ { 0, &Ia_rcrl_Ed_Ib },
-  /* 4 */ { 0, &Ia_shll_Ed_Ib },
-  /* 5 */ { 0, &Ia_shrl_Ed_Ib },
-  /* 6 */ { 0, &Ia_shll_Ed_Ib },
-  /* 7 */ { 0, &Ia_sarl_Ed_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2Eq[8] = {
-  /* 0 */ { 0, &Ia_rolq_Eq_Ib },
-  /* 1 */ { 0, &Ia_rorq_Eq_Ib },
-  /* 2 */ { 0, &Ia_rclq_Eq_Ib },
-  /* 3 */ { 0, &Ia_rcrq_Eq_Ib },
-  /* 4 */ { 0, &Ia_shlq_Eq_Ib },
-  /* 5 */ { 0, &Ia_shrq_Eq_Ib },
-  /* 6 */ { 0, &Ia_shlq_Eq_Ib },
-  /* 7 */ { 0, &Ia_sarq_Eq_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EwI1[8] = {
-  /* 0 */ { 0, &Ia_rolw_Ew_I1 },
-  /* 1 */ { 0, &Ia_rorw_Ew_I1 },
-  /* 2 */ { 0, &Ia_rclw_Ew_I1 },
-  /* 3 */ { 0, &Ia_rcrw_Ew_I1 },
-  /* 4 */ { 0, &Ia_shlw_Ew_I1 },
-  /* 5 */ { 0, &Ia_shrw_Ew_I1 },
-  /* 6 */ { 0, &Ia_shlw_Ew_I1 },
-  /* 7 */ { 0, &Ia_sarw_Ew_I1 }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EdI1[8] = {
-  /* 0 */ { 0, &Ia_roll_Ed_I1 },
-  /* 1 */ { 0, &Ia_rorl_Ed_I1 },
-  /* 2 */ { 0, &Ia_rcll_Ed_I1 },
-  /* 3 */ { 0, &Ia_rcrl_Ed_I1 },
-  /* 4 */ { 0, &Ia_shll_Ed_I1 },
-  /* 5 */ { 0, &Ia_shrl_Ed_I1 },
-  /* 6 */ { 0, &Ia_shll_Ed_I1 },
-  /* 7 */ { 0, &Ia_sarl_Ed_I1 }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EqI1[8] = {
-  /* 0 */ { 0, &Ia_rolq_Eq_I1 },
-  /* 1 */ { 0, &Ia_rorq_Eq_I1 },
-  /* 2 */ { 0, &Ia_rclq_Eq_I1 },
-  /* 3 */ { 0, &Ia_rcrq_Eq_I1 },
-  /* 4 */ { 0, &Ia_shlq_Eq_I1 },
-  /* 5 */ { 0, &Ia_shrq_Eq_I1 },
-  /* 6 */ { 0, &Ia_shlq_Eq_I1 },
-  /* 7 */ { 0, &Ia_sarq_Eq_I1 }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EwCL[8] = {
-  /* 0 */ { 0, &Ia_rolw_Ew_CL },
-  /* 1 */ { 0, &Ia_rorw_Ew_CL },
-  /* 2 */ { 0, &Ia_rclw_Ew_CL },
-  /* 3 */ { 0, &Ia_rcrw_Ew_CL },
-  /* 4 */ { 0, &Ia_shlw_Ew_CL },
-  /* 5 */ { 0, &Ia_shrw_Ew_CL },
-  /* 6 */ { 0, &Ia_shlw_Ew_CL },
-  /* 7 */ { 0, &Ia_sarw_Ew_CL }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EdCL[8] = {
-  /* 0 */ { 0, &Ia_roll_Ed_CL },
-  /* 1 */ { 0, &Ia_rorl_Ed_CL },
-  /* 2 */ { 0, &Ia_rcll_Ed_CL },
-  /* 3 */ { 0, &Ia_rcrl_Ed_CL },
-  /* 4 */ { 0, &Ia_shll_Ed_CL },
-  /* 5 */ { 0, &Ia_shrl_Ed_CL },
-  /* 6 */ { 0, &Ia_shll_Ed_CL },
-  /* 7 */ { 0, &Ia_sarl_Ed_CL }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG2EqCL[8] = {
-  /* 0 */ { 0, &Ia_rolq_Eq_CL },
-  /* 1 */ { 0, &Ia_rorq_Eq_CL },
-  /* 2 */ { 0, &Ia_rclq_Eq_CL },
-  /* 3 */ { 0, &Ia_rcrq_Eq_CL },
-  /* 4 */ { 0, &Ia_shlq_Eq_CL },
-  /* 5 */ { 0, &Ia_shrq_Eq_CL },
-  /* 6 */ { 0, &Ia_shlq_Eq_CL },
-  /* 7 */ { 0, &Ia_sarq_Eq_CL }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG3Eb[8] = {
-  /* 0 */ { 0, &Ia_testb_Eb_Ib },
-  /* 1 */ { 0, &Ia_testb_Eb_Ib },
-  /* 2 */ { 0, &Ia_notb_Eb     },
-  /* 3 */ { 0, &Ia_negb_Eb     },
-  /* 4 */ { 0, &Ia_mulb_AL_Eb  },
-  /* 5 */ { 0, &Ia_imulb_AL_Eb },
-  /* 6 */ { 0, &Ia_divb_AL_Eb  },
-  /* 7 */ { 0, &Ia_idivb_AL_Eb }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG3Ew[8] = {
-  /* 0 */ { 0, &Ia_testw_Ew_Iw },
-  /* 1 */ { 0, &Ia_testw_Ew_Iw },
-  /* 2 */ { 0, &Ia_notw_Ew     },
-  /* 3 */ { 0, &Ia_negw_Ew     },
-  /* 4 */ { 0, &Ia_mulw_AX_Ew  },
-  /* 5 */ { 0, &Ia_imulw_AX_Ew },
-  /* 6 */ { 0, &Ia_divw_AX_Ew  },
-  /* 7 */ { 0, &Ia_idivw_AX_Ew }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG3Ed[8] = {
-  /* 0 */ { 0, &Ia_testl_Ed_Id  },
-  /* 1 */ { 0, &Ia_testl_Ed_Id  },
-  /* 2 */ { 0, &Ia_notl_Ed      },
-  /* 3 */ { 0, &Ia_negl_Ed      },
-  /* 4 */ { 0, &Ia_mull_EAX_Ed  },
-  /* 5 */ { 0, &Ia_imull_EAX_Ed },
-  /* 6 */ { 0, &Ia_divl_EAX_Ed  },
-  /* 7 */ { 0, &Ia_idivl_EAX_Ed }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG3Eq[8] = {
-  /* 0 */ { 0, &Ia_testq_Eq_sId },
-  /* 1 */ { 0, &Ia_testq_Eq_sId },
-  /* 2 */ { 0, &Ia_notq_Eq      },
-  /* 3 */ { 0, &Ia_negq_Eq      },
-  /* 4 */ { 0, &Ia_mulq_RAX_Eq  },
-  /* 5 */ { 0, &Ia_imulq_RAX_Eq },
-  /* 6 */ { 0, &Ia_divq_RAX_Eq  },
-  /* 7 */ { 0, &Ia_idivq_RAX_Eq }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG4[8] = {
-  /* 0 */ { 0, &Ia_incb_Eb },
-  /* 1 */ { 0, &Ia_decb_Eb },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG5w[8] = {
-  /* 0 */ { 0, &Ia_incw_Ew  },
-  /* 1 */ { 0, &Ia_decw_Ew  },
-  /* 2 */ { 0, &Ia_call_Ew  },
-  /* 3 */ { 0, &Ia_lcall_Mp },
-  /* 4 */ { 0, &Ia_jmp_Ew   },
-  /* 5 */ { 0, &Ia_ljmp_Mp  },
-  /* 6 */ { 0, &Ia_pushw_Ew },
-  /* 7 */ { 0, &Ia_Invalid  }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG5d[8] = {
-  /* 0 */ { 0, &Ia_incl_Ed  },
-  /* 1 */ { 0, &Ia_decl_Ed  },
-  /* 2 */ { 0, &Ia_call_Ed  },
-  /* 3 */ { 0, &Ia_lcall_Mp },
-  /* 4 */ { 0, &Ia_jmp_Ed   },
-  /* 5 */ { 0, &Ia_ljmp_Mp  },
-  /* 6 */ { 0, &Ia_pushl_Ed },
-  /* 7 */ { 0, &Ia_Invalid  }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroup64G5d[8] = {
-  /* 0 */ { 0, &Ia_incl_Ed  },
-  /* 1 */ { 0, &Ia_decl_Ed  },
-  /* 2 */ { 0, &Ia_call_Eq  },
-  /* 3 */ { 0, &Ia_lcall_Mp },
-  /* 4 */ { 0, &Ia_jmp_Eq   },
-  /* 5 */ { 0, &Ia_ljmp_Mp  },
-  /* 6 */ { 0, &Ia_pushq_Eq },
-  /* 7 */ { 0, &Ia_Invalid  }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroup64G5q[8] = {
-  /* 0 */ { 0, &Ia_incq_Eq  },
-  /* 1 */ { 0, &Ia_decq_Eq  },
-  /* 2 */ { 0, &Ia_call_Eq  },
-  /* 3 */ { 0, &Ia_lcall_Mp },
-  /* 4 */ { 0, &Ia_jmp_Eq   },
-  /* 5 */ { 0, &Ia_ljmp_Mp  },
-  /* 6 */ { 0, &Ia_pushq_Eq },
-  /* 7 */ { 0, &Ia_Invalid  }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG6[8] = {
-  /* 0 */ { 0, &Ia_sldt    },
-  /* 1 */ { 0, &Ia_str     },
-  /* 2 */ { 0, &Ia_lldt    },
-  /* 3 */ { 0, &Ia_ltr     },
-  /* 4 */ { 0, &Ia_verr    },
-  /* 5 */ { 0, &Ia_verw    },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupRmINVLPG[8] = {
-  /* 0 */ { 0, &Ia_swapgs  },
-  /* 1 */ { 0, &Ia_rdtscp  },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModINVLPG[2] = {
-  /* R */ { GRPRM(INVLPG) },
-  /* M */ { 0, &Ia_invlpg }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupRmSIDT[8] = {
-  /* 0 */ { 0, &Ia_monitor },
-  /* 1 */ { 0, &Ia_mwait   },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid },
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModSIDT[2] = {
-  /* R */ { GRPRM(SIDT)   },
-  /* M */ { 0, &Ia_sidt   }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG7[8] = {
-  /* 0 */ { 0, &Ia_sgdt    },
-  /* 1 */ { GRPMOD(SIDT)   },
-  /* 2 */ { 0, &Ia_lgdt    },
-  /* 3 */ { 0, &Ia_lidt    },
-  /* 4 */ { 0, &Ia_smsw_Ew },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_lmsw_Ew },
-  /* 7 */ { GRPMOD(INVLPG) },
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG8EwIb[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_btw_Ew_Ib  },
-  /* 5 */ { 0, &Ia_btsw_Ew_Ib },
-  /* 6 */ { 0, &Ia_btrw_Ew_Ib },
-  /* 7 */ { 0, &Ia_btcw_Ew_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG8EdIb[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_btl_Ed_Ib  },
-  /* 5 */ { 0, &Ia_btsl_Ed_Ib },
-  /* 6 */ { 0, &Ia_btrl_Ed_Ib },
-  /* 7 */ { 0, &Ia_btcl_Ed_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG8EqIb[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_btq_Eq_Ib  },
-  /* 5 */ { 0, &Ia_btsq_Eq_Ib },
-  /* 6 */ { 0, &Ia_btrq_Eq_Ib },
-  /* 7 */ { 0, &Ia_btcq_Eq_Ib }
-}; 
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG9[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_cmpxchg8b },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG9q[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_cmpxchg16b },
-  /* 2 */ { 0, &Ia_Invalid },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG12[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { GRPSSE(G1202)  },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { GRPSSE(G1204)  },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { GRPSSE(G1206)  },
-  /* 7 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG13[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { GRPSSE(G1302)  },
-  /* 3 */ { 0, &Ia_Invalid },
-  /* 4 */ { GRPSSE(G1304)  },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { GRPSSE(G1306)  },
-  /* 7 */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG14[8] = {
-  /* 0 */ { 0, &Ia_Invalid },
-  /* 1 */ { 0, &Ia_Invalid },
-  /* 2 */ { GRPSSE(G1402)  },
-  /* 3 */ { GRPSSE(G1403)  },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { GRPSSE(G1406)  },
-  /* 7 */ { GRPSSE(G1407)  } 
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupModCFLUSH[2] = {
-  /* R */ { 0, &Ia_sfence }, 
-  /* M */ { 0, &Ia_cflush }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG15[8] = {
-  /* 0 */ { 0, &Ia_fxsave  },
-  /* 1 */ { 0, &Ia_fxrstor },
-  /* 2 */ { 0, &Ia_ldmxcsr },
-  /* 3 */ { 0, &Ia_stmxcsr },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_lfence  },
-  /* 6 */ { 0, &Ia_mfence  },
-  /* 7 */ { GRPMOD(CFLUSH) }       /* SFENCE/CFLUSH */
-};
-
-static BxDisasmOpcodeTable_t BxDisasmGroupG16[8] =
-{
-  /* 0 */ { 0, &Ia_prefetchnta },
-  /* 1 */ { 0, &Ia_prefetcht0  },
-  /* 2 */ { 0, &Ia_prefetcht1  },
-  /* 3 */ { 0, &Ia_prefetcht2  },
-  /* 4 */ { 0, &Ia_Invalid },
-  /* 5 */ { 0, &Ia_Invalid },
-  /* 6 */ { 0, &Ia_Invalid },
-  /* 7 */ { 0, &Ia_Invalid }
-};
-
-/* ************************************************************************ */
-/* 3DNow! opcodes */
-
-static BxDisasmOpcodeTable_t BxDisasm3DNowGroup[256] = {
-  // 256 entries for 3DNow opcodes_by suffix
-  /* 00 */ { 0, &Ia_Invalid },
-  /* 01 */ { 0, &Ia_Invalid },
-  /* 02 */ { 0, &Ia_Invalid },
-  /* 03 */ { 0, &Ia_Invalid },
-  /* 04 */ { 0, &Ia_Invalid },
-  /* 05 */ { 0, &Ia_Invalid },
-  /* 06 */ { 0, &Ia_Invalid },
-  /* 07 */ { 0, &Ia_Invalid },
-  /* 08 */ { 0, &Ia_Invalid },
-  /* 09 */ { 0, &Ia_Invalid },
-  /* 0A */ { 0, &Ia_Invalid },
-  /* 0B */ { 0, &Ia_Invalid },
-  /* 0C */ { 0, &Ia_pi2fw_Pq_Qq },
-  /* 0D */ { 0, &Ia_pi2fd_Pq_Qq },
-  /* 0E */ { 0, &Ia_Invalid },
-  /* 0F */ { 0, &Ia_Invalid },
-  /* 10 */ { 0, &Ia_Invalid },
-  /* 11 */ { 0, &Ia_Invalid },
-  /* 12 */ { 0, &Ia_Invalid },
-  /* 13 */ { 0, &Ia_Invalid },
-  /* 14 */ { 0, &Ia_Invalid },
-  /* 15 */ { 0, &Ia_Invalid },
-  /* 16 */ { 0, &Ia_Invalid },
-  /* 17 */ { 0, &Ia_Invalid },
-  /* 18 */ { 0, &Ia_Invalid },
-  /* 19 */ { 0, &Ia_Invalid },
-  /* 1A */ { 0, &Ia_Invalid },
-  /* 1B */ { 0, &Ia_Invalid },
-  /* 1C */ { 0, &Ia_pf2iw_Pq_Qq },
-  /* 1D */ { 0, &Ia_pf2id_Pq_Qq },
-  /* 1E */ { 0, &Ia_Invalid },
-  /* 1F */ { 0, &Ia_Invalid },
-  /* 20 */ { 0, &Ia_Invalid },
-  /* 21 */ { 0, &Ia_Invalid },
-  /* 22 */ { 0, &Ia_Invalid },
-  /* 23 */ { 0, &Ia_Invalid },
-  /* 24 */ { 0, &Ia_Invalid },
-  /* 25 */ { 0, &Ia_Invalid },
-  /* 26 */ { 0, &Ia_Invalid },
-  /* 27 */ { 0, &Ia_Invalid },
-  /* 28 */ { 0, &Ia_Invalid },
-  /* 29 */ { 0, &Ia_Invalid },
-  /* 2A */ { 0, &Ia_Invalid },
-  /* 2B */ { 0, &Ia_Invalid },
-  /* 2C */ { 0, &Ia_Invalid },
-  /* 2D */ { 0, &Ia_Invalid },
-  /* 2E */ { 0, &Ia_Invalid },
-  /* 2F */ { 0, &Ia_Invalid },
-  /* 30 */ { 0, &Ia_Invalid },
-  /* 31 */ { 0, &Ia_Invalid },
-  /* 32 */ { 0, &Ia_Invalid },
-  /* 33 */ { 0, &Ia_Invalid },
-  /* 34 */ { 0, &Ia_Invalid },
-  /* 35 */ { 0, &Ia_Invalid },
-  /* 36 */ { 0, &Ia_Invalid },
-  /* 37 */ { 0, &Ia_Invalid },
-  /* 38 */ { 0, &Ia_Invalid },
-  /* 39 */ { 0, &Ia_Invalid },
-  /* 3A */ { 0, &Ia_Invalid },
-  /* 3B */ { 0, &Ia_Invalid },
-  /* 3C */ { 0, &Ia_Invalid },
-  /* 3D */ { 0, &Ia_Invalid },
-  /* 3E */ { 0, &Ia_Invalid },
-  /* 3F */ { 0, &Ia_Invalid },
-  /* 40 */ { 0, &Ia_Invalid },
-  /* 41 */ { 0, &Ia_Invalid },
-  /* 42 */ { 0, &Ia_Invalid },
-  /* 43 */ { 0, &Ia_Invalid },
-  /* 44 */ { 0, &Ia_Invalid },
-  /* 45 */ { 0, &Ia_Invalid },
-  /* 46 */ { 0, &Ia_Invalid },
-  /* 47 */ { 0, &Ia_Invalid },
-  /* 48 */ { 0, &Ia_Invalid },
-  /* 49 */ { 0, &Ia_Invalid },
-  /* 4A */ { 0, &Ia_Invalid },
-  /* 4B */ { 0, &Ia_Invalid },
-  /* 4C */ { 0, &Ia_Invalid },
-  /* 4D */ { 0, &Ia_Invalid },
-  /* 4E */ { 0, &Ia_Invalid },
-  /* 4F */ { 0, &Ia_Invalid },
-  /* 50 */ { 0, &Ia_Invalid },
-  /* 51 */ { 0, &Ia_Invalid },
-  /* 52 */ { 0, &Ia_Invalid },
-  /* 53 */ { 0, &Ia_Invalid },
-  /* 54 */ { 0, &Ia_Invalid },
-  /* 55 */ { 0, &Ia_Invalid },
-  /* 56 */ { 0, &Ia_Invalid },
-  /* 57 */ { 0, &Ia_Invalid },
-  /* 58 */ { 0, &Ia_Invalid },
-  /* 59 */ { 0, &Ia_Invalid },
-  /* 5A */ { 0, &Ia_Invalid },
-  /* 5B */ { 0, &Ia_Invalid },
-  /* 5C */ { 0, &Ia_Invalid },
-  /* 5D */ { 0, &Ia_Invalid },
-  /* 5E */ { 0, &Ia_Invalid },
-  /* 5F */ { 0, &Ia_Invalid },
-  /* 60 */ { 0, &Ia_Invalid },
-  /* 61 */ { 0, &Ia_Invalid },
-  /* 62 */ { 0, &Ia_Invalid },
-  /* 63 */ { 0, &Ia_Invalid },
-  /* 64 */ { 0, &Ia_Invalid },
-  /* 65 */ { 0, &Ia_Invalid },
-  /* 66 */ { 0, &Ia_Invalid },
-  /* 67 */ { 0, &Ia_Invalid },
-  /* 68 */ { 0, &Ia_Invalid },
-  /* 69 */ { 0, &Ia_Invalid },
-  /* 6A */ { 0, &Ia_Invalid },
-  /* 6B */ { 0, &Ia_Invalid },
-  /* 6C */ { 0, &Ia_Invalid },
-  /* 6D */ { 0, &Ia_Invalid },
-  /* 6E */ { 0, &Ia_Invalid },
-  /* 6F */ { 0, &Ia_Invalid },
-  /* 70 */ { 0, &Ia_Invalid },
-  /* 71 */ { 0, &Ia_Invalid },
-  /* 72 */ { 0, &Ia_Invalid },
-  /* 73 */ { 0, &Ia_Invalid },
-  /* 74 */ { 0, &Ia_Invalid },
-  /* 75 */ { 0, &Ia_Invalid },
-  /* 76 */ { 0, &Ia_Invalid },
-  /* 77 */ { 0, &Ia_Invalid },
-  /* 78 */ { 0, &Ia_Invalid },
-  /* 79 */ { 0, &Ia_Invalid },
-  /* 7A */ { 0, &Ia_Invalid },
-  /* 7B */ { 0, &Ia_Invalid },
-  /* 7C */ { 0, &Ia_Invalid },
-  /* 7D */ { 0, &Ia_Invalid },
-  /* 7E */ { 0, &Ia_Invalid },
-  /* 7F */ { 0, &Ia_Invalid },
-  /* 80 */ { 0, &Ia_Invalid },
-  /* 81 */ { 0, &Ia_Invalid },
-  /* 82 */ { 0, &Ia_Invalid },
-  /* 83 */ { 0, &Ia_Invalid },
-  /* 84 */ { 0, &Ia_Invalid },
-  /* 85 */ { 0, &Ia_Invalid },
-  /* 86 */ { 0, &Ia_Invalid },
-  /* 87 */ { 0, &Ia_Invalid },
-  /* 88 */ { 0, &Ia_Invalid },
-  /* 89 */ { 0, &Ia_Invalid },
-  /* 8A */ { 0, &Ia_pfnacc_Pq_Qq },
-  /* 8B */ { 0, &Ia_Invalid },
-  /* 8C */ { 0, &Ia_Invalid },
-  /* 8D */ { 0, &Ia_Invalid },
-  /* 8E */ { 0, &Ia_pfpnacc_Pq_Qq },
-  /* 8F */ { 0, &Ia_Invalid },
-  /* 90 */ { 0, &Ia_pfcmpge_Pq_Qq },
-  /* 91 */ { 0, &Ia_Invalid },
-  /* 92 */ { 0, &Ia_Invalid },
-  /* 93 */ { 0, &Ia_Invalid },
-  /* 94 */ { 0, &Ia_pfmin_Pq_Qq },
-  /* 95 */ { 0, &Ia_Invalid },
-  /* 96 */ { 0, &Ia_pfrcp_Pq_Qq },
-  /* 97 */ { 0, &Ia_pfrsqrt_Pq_Qq },
-  /* 98 */ { 0, &Ia_Invalid },
-  /* 99 */ { 0, &Ia_Invalid },
-  /* 9A */ { 0, &Ia_pfsub_Pq_Qq },
-  /* 9B */ { 0, &Ia_Invalid },
-  /* 9C */ { 0, &Ia_Invalid },
-  /* 9D */ { 0, &Ia_Invalid },
-  /* 9E */ { 0, &Ia_pfadd_Pq_Qq },
-  /* 9F */ { 0, &Ia_Invalid },
-  /* A0 */ { 0, &Ia_pfcmpgt_Pq_Qq },
-  /* A1 */ { 0, &Ia_Invalid },
-  /* A2 */ { 0, &Ia_Invalid },
-  /* A3 */ { 0, &Ia_Invalid },
-  /* A4 */ { 0, &Ia_pfmax_Pq_Qq },
-  /* A5 */ { 0, &Ia_Invalid },
-  /* A6 */ { 0, &Ia_pfrcpit1_Pq_Qq },
-  /* A7 */ { 0, &Ia_pfrsqit1_Pq_Qq },
-  /* A8 */ { 0, &Ia_Invalid },
-  /* A9 */ { 0, &Ia_Invalid },
-  /* AA */ { 0, &Ia_pfsubr_Pq_Qq },
-  /* AB */ { 0, &Ia_Invalid },
-  /* AC */ { 0, &Ia_Invalid },
-  /* AD */ { 0, &Ia_Invalid },
-  /* AE */ { 0, &Ia_pfacc_Pq_Qq },
-  /* AF */ { 0, &Ia_Invalid },
-  /* B0 */ { 0, &Ia_pfcmpeq_Pq_Qq },
-  /* B1 */ { 0, &Ia_Invalid },
-  /* B2 */ { 0, &Ia_Invalid },
-  /* B3 */ { 0, &Ia_Invalid },
-  /* B4 */ { 0, &Ia_pfmul_Pq_Qq },
-  /* B5 */ { 0, &Ia_Invalid },
-  /* B6 */ { 0, &Ia_pfrcpit2_Pq_Qq },
-  /* B7 */ { 0, &Ia_pmulhrw_Pq_Qq },
-  /* B8 */ { 0, &Ia_Invalid },
-  /* B9 */ { 0, &Ia_Invalid },
-  /* BA */ { 0, &Ia_Invalid },
-  /* BB */ { 0, &Ia_pswapd_Pq_Qq },
-  /* BC */ { 0, &Ia_Invalid },
-  /* BD */ { 0, &Ia_Invalid },
-  /* BE */ { 0, &Ia_Invalid },
-  /* BF */ { 0, &Ia_pavgb_Pq_Qq },
-  /* C0 */ { 0, &Ia_Invalid },
-  /* C1 */ { 0, &Ia_Invalid },
-  /* C2 */ { 0, &Ia_Invalid },
-  /* C3 */ { 0, &Ia_Invalid },
-  /* C4 */ { 0, &Ia_Invalid },
-  /* C5 */ { 0, &Ia_Invalid },
-  /* C6 */ { 0, &Ia_Invalid },
-  /* C7 */ { 0, &Ia_Invalid },
-  /* C8 */ { 0, &Ia_Invalid },
-  /* C9 */ { 0, &Ia_Invalid },
-  /* CA */ { 0, &Ia_Invalid },
-  /* CB */ { 0, &Ia_Invalid },
-  /* CC */ { 0, &Ia_Invalid },
-  /* CD */ { 0, &Ia_Invalid },
-  /* CE */ { 0, &Ia_Invalid },
-  /* CF */ { 0, &Ia_Invalid },
-  /* D0 */ { 0, &Ia_Invalid },
-  /* D1 */ { 0, &Ia_Invalid },
-  /* D2 */ { 0, &Ia_Invalid },
-  /* D3 */ { 0, &Ia_Invalid },
-  /* D4 */ { 0, &Ia_Invalid },
-  /* D5 */ { 0, &Ia_Invalid },
-  /* D6 */ { 0, &Ia_Invalid },
-  /* D7 */ { 0, &Ia_Invalid },
-  /* D8 */ { 0, &Ia_Invalid },
-  /* D9 */ { 0, &Ia_Invalid },
-  /* DA */ { 0, &Ia_Invalid },
-  /* DB */ { 0, &Ia_Invalid },
-  /* DC */ { 0, &Ia_Invalid },
-  /* DD */ { 0, &Ia_Invalid },
-  /* DE */ { 0, &Ia_Invalid },
-  /* DF */ { 0, &Ia_Invalid },
-  /* E0 */ { 0, &Ia_Invalid },
-  /* E1 */ { 0, &Ia_Invalid },
-  /* E2 */ { 0, &Ia_Invalid },
-  /* E3 */ { 0, &Ia_Invalid },
-  /* E4 */ { 0, &Ia_Invalid },
-  /* E5 */ { 0, &Ia_Invalid },
-  /* E6 */ { 0, &Ia_Invalid },
-  /* E7 */ { 0, &Ia_Invalid },
-  /* E8 */ { 0, &Ia_Invalid },
-  /* E9 */ { 0, &Ia_Invalid },
-  /* EA */ { 0, &Ia_Invalid },
-  /* EB */ { 0, &Ia_Invalid },
-  /* EC */ { 0, &Ia_Invalid },
-  /* ED */ { 0, &Ia_Invalid },
-  /* EE */ { 0, &Ia_Invalid },
-  /* EF */ { 0, &Ia_Invalid },
-  /* F0 */ { 0, &Ia_Invalid },
-  /* F1 */ { 0, &Ia_Invalid },
-  /* F2 */ { 0, &Ia_Invalid },
-  /* F3 */ { 0, &Ia_Invalid },
-  /* F4 */ { 0, &Ia_Invalid },
-  /* F5 */ { 0, &Ia_Invalid },
-  /* F6 */ { 0, &Ia_Invalid },
-  /* F7 */ { 0, &Ia_Invalid },
-  /* F8 */ { 0, &Ia_Invalid },
-  /* F9 */ { 0, &Ia_Invalid },
-  /* FA */ { 0, &Ia_Invalid },
-  /* FB */ { 0, &Ia_Invalid },
-  /* FC */ { 0, &Ia_Invalid },
-  /* FD */ { 0, &Ia_Invalid },
-  /* FE */ { 0, &Ia_Invalid },
-  /* FF */ { 0, &Ia_Invalid }
-};                                
-
-/* ************************************************************************ */
-/* FPU Opcodes */
-
-// floating point instructions when mod!=11b.
-// the following tables will be accessed like groups using the nnn (reg) field of
-// the modrm byte. (the first byte is D8-DF)
-
-  // D8 (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupD8[8] = { 
-  /* 0 */ { 0, &Ia_fadds_Md  },
-  /* 1 */ { 0, &Ia_fmuls_Md  },
-  /* 2 */ { 0, &Ia_fcoms_Md  },
-  /* 3 */ { 0, &Ia_fcomps_Md },
-  /* 4 */ { 0, &Ia_fsubs_Md  },
-  /* 5 */ { 0, &Ia_fsubrs_Md },
-  /* 6 */ { 0, &Ia_fdivs_Md  },
-  /* 7 */ { 0, &Ia_fdivrs_Md }
-};
-
-  // D9 (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupD9[8] = { 
-  /* 0 */ { 0, &Ia_flds_Md   },
-  /* 1 */ { 0, &Ia_Invalid   },
-  /* 2 */ { 0, &Ia_fsts_Md   },
-  /* 3 */ { 0, &Ia_fstps_Md  },
-  /* 4 */ { 0, &Ia_fldenv    },
-  /* 5 */ { 0, &Ia_fldcw     },
-  /* 6 */ { 0, &Ia_fnstenv   },
-  /* 7 */ { 0, &Ia_fnstcw    }
-};
-
-  // DA (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDA[8] = { 
-  /* 0 */ { 0, &Ia_fiaddl_Md  },
-  /* 1 */ { 0, &Ia_fimull_Md  },
-  /* 2 */ { 0, &Ia_ficoml_Md  },
-  /* 3 */ { 0, &Ia_ficompl_Md },
-  /* 4 */ { 0, &Ia_fisubl_Md  },
-  /* 5 */ { 0, &Ia_fisubrl_Md },
-  /* 6 */ { 0, &Ia_fidivl_Md  },
-  /* 7 */ { 0, &Ia_fidivrl_Md }
-};
-
-  // DB (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDB[8] = { 
-  /* 0 */ { 0, &Ia_fildl_Md   },
-  /* 1 */ { 0, &Ia_fisttpl_Md },
-  /* 2 */ { 0, &Ia_fistl_Md   },
-  /* 3 */ { 0, &Ia_fistpl_Md  },
-  /* 4 */ { 0, &Ia_Invalid    },
-  /* 5 */ { 0, &Ia_fldt_Mt    },
-  /* 6 */ { 0, &Ia_Invalid    },
-  /* 7 */ { 0, &Ia_fstpt_Mt   }
-};
-
-  // DC (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDC[8] = { 
-  /* 0 */ { 0, &Ia_faddl_Mq  },
-  /* 1 */ { 0, &Ia_fmull_Mq  },
-  /* 2 */ { 0, &Ia_fcoml_Mq  },
-  /* 3 */ { 0, &Ia_fcompl_Mq },
-  /* 4 */ { 0, &Ia_fsubl_Mq  },
-  /* 5 */ { 0, &Ia_fsubrl_Mq },
-  /* 6 */ { 0, &Ia_fdivl_Mq  },
-  /* 7 */ { 0, &Ia_fdivrl_Mq }
-};
-
-  // DD (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDD[8] = { 
-  /* 0 */ { 0, &Ia_fldl_Mq    },
-  /* 1 */ { 0, &Ia_fisttpq_Mq },
-  /* 2 */ { 0, &Ia_fstl_Mq    },
-  /* 3 */ { 0, &Ia_fstpl_Mq   },
-  /* 4 */ { 0, &Ia_frstor     },
-  /* 5 */ { 0, &Ia_Invalid    },
-  /* 6 */ { 0, &Ia_fnsave     },
-  /* 7 */ { 0, &Ia_fnstsw     }
-};
-
-  // DE (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDE[8] = { 
-  /* 0 */ { 0, &Ia_fiadds_Mw  },
-  /* 1 */ { 0, &Ia_fimuls_Mw  },
-  /* 2 */ { 0, &Ia_ficoms_Mw  },
-  /* 3 */ { 0, &Ia_ficomps_Mw },
-  /* 4 */ { 0, &Ia_fisubs_Mw  },
-  /* 5 */ { 0, &Ia_fisubrs_Mw },
-  /* 6 */ { 0, &Ia_fidivs_Mw  },
-  /* 7 */ { 0, &Ia_fidivrs_Mw }
-};
-
-  // DF (modrm is outside 00h - BFh) (mod != 11)
-static BxDisasmOpcodeTable_t BxDisasmFPGroupDF[8] = { 
-  /* 0 */ { 0, &Ia_filds_Mw   },
-  /* 1 */ { 0, &Ia_fisttps_Mw },
-  /* 2 */ { 0, &Ia_fists_Mw   },
-  /* 3 */ { 0, &Ia_fistps_Mw  },
-  /* 4 */ { 0, &Ia_fbldt_Mt   },
-  /* 5 */ { 0, &Ia_fildq_Mq   },
-  /* 6 */ { 0, &Ia_fbstpt_Mt  },
-  /* 7 */ { 0, &Ia_fistpq_Mq  }
-};
-
-// 512 entries for second byte of floating point instructions. (when mod==11b) 
-static BxDisasmOpcodeTable_t BxDisasmOpcodeInfoFP[512] = { 
-  // D8 (modrm is outside 00h - BFh) (mod == 11)
-  /* D8 C0 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C1 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C2 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C3 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C4 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C5 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C6 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C7 */ { 0, &Ia_fadd_ST0_STi  },
-  /* D8 C8 */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 C9 */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CA */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CB */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CC */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CD */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CE */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 CF */ { 0, &Ia_fmul_ST0_STi  },
-  /* D8 D0 */ { 0, &Ia_fcom_STi      },
-  /* D8 D1 */ { 0, &Ia_fcom_STi      },
-  /* D8 D2 */ { 0, &Ia_fcom_STi      },
-  /* D8 D3 */ { 0, &Ia_fcom_STi      },
-  /* D8 D4 */ { 0, &Ia_fcom_STi      },
-  /* D8 D5 */ { 0, &Ia_fcom_STi      },
-  /* D8 D6 */ { 0, &Ia_fcom_STi      },
-  /* D8 D7 */ { 0, &Ia_fcom_STi      },
-  /* D8 D8 */ { 0, &Ia_fcomp_STi     },
-  /* D8 D9 */ { 0, &Ia_fcomp_STi     },
-  /* D8 DA */ { 0, &Ia_fcomp_STi     },
-  /* D8 DB */ { 0, &Ia_fcomp_STi     },
-  /* D8 DC */ { 0, &Ia_fcomp_STi     },
-  /* D8 DD */ { 0, &Ia_fcomp_STi     },
-  /* D8 DE */ { 0, &Ia_fcomp_STi     },
-  /* D8 DF */ { 0, &Ia_fcomp_STi     },
-  /* D8 E0 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E1 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E2 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E3 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E4 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E5 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E6 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E7 */ { 0, &Ia_fsub_ST0_STi  },
-  /* D8 E8 */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 E9 */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 EA */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 EB */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 EC */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 ED */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 EE */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 EF */ { 0, &Ia_fsubr_ST0_STi },
-  /* D8 F0 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F1 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F2 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F3 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F4 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F5 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F6 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F7 */ { 0, &Ia_fdiv_ST0_STi  },
-  /* D8 F8 */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 F9 */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FA */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FB */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FC */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FD */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FE */ { 0, &Ia_fdivr_ST0_STi },
-  /* D8 FF */ { 0, &Ia_fdivr_ST0_STi },
-  
-  // D9 (modrm is outside 00h - BFh) (mod == 11)
-  /* D9 C0 */ { 0, &Ia_fld_STi },
-  /* D9 C1 */ { 0, &Ia_fld_STi },
-  /* D9 C2 */ { 0, &Ia_fld_STi },
-  /* D9 C3 */ { 0, &Ia_fld_STi },
-  /* D9 C4 */ { 0, &Ia_fld_STi },
-  /* D9 C5 */ { 0, &Ia_fld_STi },
-  /* D9 C6 */ { 0, &Ia_fld_STi },
-  /* D9 C7 */ { 0, &Ia_fld_STi },
-  /* D9 C8 */ { 0, &Ia_fxch    },
-  /* D9 C9 */ { 0, &Ia_fxch    },
-  /* D9 CA */ { 0, &Ia_fxch    },
-  /* D9 CB */ { 0, &Ia_fxch    },
-  /* D9 CC */ { 0, &Ia_fxch    },
-  /* D9 CD */ { 0, &Ia_fxch    },
-  /* D9 CE */ { 0, &Ia_fxch    },
-  /* D9 CF */ { 0, &Ia_fxch    },
-  /* D9 D0 */ { 0, &Ia_fnop    },
-  /* D9 D1 */ { 0, &Ia_Invalid },
-  /* D9 D2 */ { 0, &Ia_Invalid },
-  /* D9 D3 */ { 0, &Ia_Invalid },
-  /* D9 D4 */ { 0, &Ia_Invalid },
-  /* D9 D5 */ { 0, &Ia_Invalid },
-  /* D9 D6 */ { 0, &Ia_Invalid },
-  /* D9 D7 */ { 0, &Ia_Invalid },
-  /* D9 D8 */ { 0, &Ia_Invalid },
-  /* D9 D9 */ { 0, &Ia_Invalid },
-  /* D9 DA */ { 0, &Ia_Invalid },
-  /* D9 DB */ { 0, &Ia_Invalid },
-  /* D9 DC */ { 0, &Ia_Invalid },
-  /* D9 DD */ { 0, &Ia_Invalid },
-  /* D9 DE */ { 0, &Ia_Invalid },
-  /* D9 DF */ { 0, &Ia_Invalid },
-  /* D9 E0 */ { 0, &Ia_fchs    },
-  /* D9 E1 */ { 0, &Ia_fabs    },
-  /* D9 E2 */ { 0, &Ia_Invalid },
-  /* D9 E3 */ { 0, &Ia_Invalid },
-  /* D9 E4 */ { 0, &Ia_ftst    },
-  /* D9 E5 */ { 0, &Ia_fxam    },
-  /* D9 E6 */ { 0, &Ia_Invalid },
-  /* D9 E7 */ { 0, &Ia_Invalid },
-  /* D9 E8 */ { 0, &Ia_fld1    },
-  /* D9 E9 */ { 0, &Ia_fldl2t  },
-  /* D9 EA */ { 0, &Ia_fldl2e  },
-  /* D9 EB */ { 0, &Ia_fldpi   },
-  /* D9 EC */ { 0, &Ia_fldlg2  },
-  /* D9 ED */ { 0, &Ia_fldln2  },
-  /* D9 EE */ { 0, &Ia_fldz    },
-  /* D9 EF */ { 0, &Ia_Invalid },
-  /* D9 F0 */ { 0, &Ia_f2xm1   },
-  /* D9 F1 */ { 0, &Ia_fyl2x   },
-  /* D9 F2 */ { 0, &Ia_fptan   },
-  /* D9 F3 */ { 0, &Ia_fpatan  },
-  /* D9 F4 */ { 0, &Ia_fxtract },
-  /* D9 F5 */ { 0, &Ia_fprem1  },
-  /* D9 F6 */ { 0, &Ia_fdecstp },
-  /* D9 F7 */ { 0, &Ia_fincstp },
-  /* D9 F8 */ { 0, &Ia_fprem   },
-  /* D9 F9 */ { 0, &Ia_fyl2xp1 },
-  /* D9 FA */ { 0, &Ia_fsqrt   },
-  /* D9 FB */ { 0, &Ia_fsincos },
-  /* D9 FC */ { 0, &Ia_frndint },
-  /* D9 FD */ { 0, &Ia_fscale  },
-  /* D9 FE */ { 0, &Ia_fsin    },
-  /* D9 FF */ { 0, &Ia_fcos    },
-                                  
-  // DA (modrm is outside 00h - BFh) (mod == 11)
-  /* DA C0 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C1 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C2 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C3 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C4 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C5 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C6 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C7 */ { 0, &Ia_fcmovb_ST0_STi  },
-  /* DA C8 */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA C9 */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CA */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CB */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CC */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CD */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CE */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA CF */ { 0, &Ia_fcmove_ST0_STi  },
-  /* DA D0 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D1 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D2 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D3 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D4 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D5 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D6 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D7 */ { 0, &Ia_fcmovbe_ST0_STi },
-  /* DA D8 */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA D9 */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DA */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DB */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DC */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DD */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DE */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA DF */ { 0, &Ia_fcmovu_ST0_STi  },
-  /* DA E0 */ { 0, &Ia_Invalid },
-  /* DA E1 */ { 0, &Ia_Invalid },
-  /* DA E2 */ { 0, &Ia_Invalid },
-  /* DA E3 */ { 0, &Ia_Invalid },
-  /* DA E4 */ { 0, &Ia_Invalid },
-  /* DA E5 */ { 0, &Ia_Invalid },
-  /* DA E6 */ { 0, &Ia_Invalid },
-  /* DA E7 */ { 0, &Ia_Invalid },
-  /* DA E8 */ { 0, &Ia_Invalid },
-  /* DA E9 */ { 0, &Ia_fucompp },
-  /* DA EA */ { 0, &Ia_Invalid },
-  /* DA EB */ { 0, &Ia_Invalid },
-  /* DA EC */ { 0, &Ia_Invalid },
-  /* DA ED */ { 0, &Ia_Invalid },
-  /* DA EE */ { 0, &Ia_Invalid },
-  /* DA EF */ { 0, &Ia_Invalid },
-  /* DA F0 */ { 0, &Ia_Invalid },
-  /* DA F1 */ { 0, &Ia_Invalid },
-  /* DA F2 */ { 0, &Ia_Invalid },
-  /* DA F3 */ { 0, &Ia_Invalid },
-  /* DA F4 */ { 0, &Ia_Invalid },
-  /* DA F5 */ { 0, &Ia_Invalid },
-  /* DA F6 */ { 0, &Ia_Invalid },
-  /* DA F7 */ { 0, &Ia_Invalid },
-  /* DA F8 */ { 0, &Ia_Invalid },
-  /* DA F9 */ { 0, &Ia_Invalid },
-  /* DA FA */ { 0, &Ia_Invalid },
-  /* DA FB */ { 0, &Ia_Invalid },
-  /* DA FC */ { 0, &Ia_Invalid },
-  /* DA FD */ { 0, &Ia_Invalid },
-  /* DA FE */ { 0, &Ia_Invalid },
-  /* DA FF */ { 0, &Ia_Invalid },
-
-  // DB (modrm is outside 00h - BFh) (mod == 11)
-  /* DB C0 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C1 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C2 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C3 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C4 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C5 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C6 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C7 */ { 0, &Ia_fcmovnb_ST0_STi  },
-  /* DB C8 */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB C9 */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CA */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CB */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CC */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CD */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CE */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB CF */ { 0, &Ia_fcmovne_ST0_STi  },
-  /* DB D0 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D1 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D2 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D3 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D4 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D5 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D6 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D7 */ { 0, &Ia_fcmovnbe_ST0_STi },
-  /* DB D8 */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB D9 */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DA */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DB */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DC */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DD */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DE */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB DF */ { 0, &Ia_fcmovnu_ST0_STi  },
-  /* DB E0 */ { 0, &Ia_feni    },
-  /* DB E1 */ { 0, &Ia_fdisi   },
-  /* DB E2 */ { 0, &Ia_fnclex  },
-  /* DB E3 */ { 0, &Ia_fninit  },
-  /* DB E4 */ { 0, &Ia_fsetpm  },
-  /* DB E5 */ { 0, &Ia_Invalid },
-  /* DB E6 */ { 0, &Ia_Invalid },
-  /* DB E7 */ { 0, &Ia_Invalid },
-  /* DB E8 */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB E9 */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB EA */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB EB */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB EC */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB ED */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB EE */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB EF */ { 0, &Ia_fucomi_ST0_STi },
-  /* DB F0 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F1 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F2 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F3 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F4 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F5 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F6 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F7 */ { 0, &Ia_fcomi_ST0_STi  },
-  /* DB F8 */ { 0, &Ia_Invalid },
-  /* DB F9 */ { 0, &Ia_Invalid },
-  /* DB FA */ { 0, &Ia_Invalid },
-  /* DB FB */ { 0, &Ia_Invalid },
-  /* DB FC */ { 0, &Ia_Invalid },
-  /* DB FD */ { 0, &Ia_Invalid },
-  /* DB FE */ { 0, &Ia_Invalid },
-  /* DB FF */ { 0, &Ia_Invalid },
-
-  // DC (modrm is outside 00h - BFh) (mod == 11)
-  /* DC C0 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C1 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C2 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C3 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C4 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C5 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C6 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C7 */ { 0, &Ia_fadd_STi_ST0 },
-  /* DC C8 */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC C9 */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CA */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CB */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CC */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CD */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CE */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC CF */ { 0, &Ia_fmul_STi_ST0 },
-  /* DC D0 */ { 0, &Ia_Invalid },
-  /* DC D1 */ { 0, &Ia_Invalid },
-  /* DC D2 */ { 0, &Ia_Invalid },
-  /* DC D3 */ { 0, &Ia_Invalid },
-  /* DC D4 */ { 0, &Ia_Invalid },
-  /* DC D5 */ { 0, &Ia_Invalid },
-  /* DC D6 */ { 0, &Ia_Invalid },
-  /* DC D7 */ { 0, &Ia_Invalid },
-  /* DC D8 */ { 0, &Ia_Invalid },
-  /* DC D9 */ { 0, &Ia_Invalid },
-  /* DC DA */ { 0, &Ia_Invalid },
-  /* DC DB */ { 0, &Ia_Invalid },
-  /* DC DC */ { 0, &Ia_Invalid },
-  /* DC DD */ { 0, &Ia_Invalid },
-  /* DC DE */ { 0, &Ia_Invalid },
-  /* DC DF */ { 0, &Ia_Invalid },
-  /* DC E0 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E1 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E2 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E3 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E4 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E5 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E6 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E7 */ { 0, &Ia_fsubr_STi_ST0 },
-  /* DC E8 */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC E9 */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC EA */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC EB */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC EC */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC ED */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC EE */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC EF */ { 0, &Ia_fsub_STi_ST0  },
-  /* DC F0 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F1 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F2 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F3 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F4 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F5 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F6 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F7 */ { 0, &Ia_fdivr_STi_ST0 },
-  /* DC F8 */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC F9 */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FA */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FB */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FC */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FD */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FE */ { 0, &Ia_fdiv_STi_ST0  },
-  /* DC FF */ { 0, &Ia_fdiv_STi_ST0  },
-
-  // DD (modrm is outside 00h - BFh) (mod == 11)
-  /* DD C0 */ { 0, &Ia_ffree_STi  },
-  /* DD C1 */ { 0, &Ia_ffree_STi  },
-  /* DD C2 */ { 0, &Ia_ffree_STi  },
-  /* DD C3 */ { 0, &Ia_ffree_STi  },
-  /* DD C4 */ { 0, &Ia_ffree_STi  },
-  /* DD C5 */ { 0, &Ia_ffree_STi  },
-  /* DD C6 */ { 0, &Ia_ffree_STi  },
-  /* DD C7 */ { 0, &Ia_ffree_STi  },
-  /* DD C8 */ { 0, &Ia_Invalid    },
-  /* DD C9 */ { 0, &Ia_Invalid    },
-  /* DD CA */ { 0, &Ia_Invalid    },
-  /* DD CB */ { 0, &Ia_Invalid    },
-  /* DD CC */ { 0, &Ia_Invalid    },
-  /* DD CD */ { 0, &Ia_Invalid    },
-  /* DD CE */ { 0, &Ia_Invalid    },
-  /* DD CF */ { 0, &Ia_Invalid    },
-  /* DD D0 */ { 0, &Ia_fst_STi    },
-  /* DD D1 */ { 0, &Ia_fst_STi    },
-  /* DD D2 */ { 0, &Ia_fst_STi    },
-  /* DD D3 */ { 0, &Ia_fst_STi    },
-  /* DD D4 */ { 0, &Ia_fst_STi    },
-  /* DD D5 */ { 0, &Ia_fst_STi    },
-  /* DD D6 */ { 0, &Ia_fst_STi    },
-  /* DD D7 */ { 0, &Ia_fst_STi    },
-  /* DD D8 */ { 0, &Ia_fstp_STi   },
-  /* DD D9 */ { 0, &Ia_fstp_STi   },
-  /* DD DA */ { 0, &Ia_fstp_STi   },
-  /* DD DB */ { 0, &Ia_fstp_STi   },
-  /* DD DC */ { 0, &Ia_fstp_STi   },
-  /* DD DD */ { 0, &Ia_fstp_STi   },
-  /* DD DE */ { 0, &Ia_fstp_STi   },
-  /* DD DF */ { 0, &Ia_fstp_STi   },
-  /* DD E0 */ { 0, &Ia_fucom_STi  },
-  /* DD E1 */ { 0, &Ia_fucom_STi  },
-  /* DD E2 */ { 0, &Ia_fucom_STi  },
-  /* DD E3 */ { 0, &Ia_fucom_STi  },
-  /* DD E4 */ { 0, &Ia_fucom_STi  },
-  /* DD E5 */ { 0, &Ia_fucom_STi  },
-  /* DD E6 */ { 0, &Ia_fucom_STi  },
-  /* DD E7 */ { 0, &Ia_fucom_STi  },
-  /* DD E8 */ { 0, &Ia_fucomp_STi },
-  /* DD E9 */ { 0, &Ia_fucomp_STi },
-  /* DD EA */ { 0, &Ia_fucomp_STi },
-  /* DD EB */ { 0, &Ia_fucomp_STi },
-  /* DD EC */ { 0, &Ia_fucomp_STi },
-  /* DD ED */ { 0, &Ia_fucomp_STi },
-  /* DD EE */ { 0, &Ia_fucomp_STi },
-  /* DD EF */ { 0, &Ia_fucomp_STi },
-  /* DD F0 */ { 0, &Ia_Invalid },
-  /* DD F1 */ { 0, &Ia_Invalid },
-  /* DD F2 */ { 0, &Ia_Invalid },
-  /* DD F3 */ { 0, &Ia_Invalid },
-  /* DD F4 */ { 0, &Ia_Invalid },
-  /* DD F5 */ { 0, &Ia_Invalid },
-  /* DD F6 */ { 0, &Ia_Invalid },
-  /* DD F7 */ { 0, &Ia_Invalid },
-  /* DD F8 */ { 0, &Ia_Invalid },
-  /* DD F9 */ { 0, &Ia_Invalid },
-  /* DD FA */ { 0, &Ia_Invalid },
-  /* DD FB */ { 0, &Ia_Invalid },
-  /* DD FC */ { 0, &Ia_Invalid },
-  /* DD FD */ { 0, &Ia_Invalid },
-  /* DD FE */ { 0, &Ia_Invalid },
-  /* DD FF */ { 0, &Ia_Invalid },
-
-  // DE (modrm is outside 00h - BFh) (mod == 11)
-  /* DE C0 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C1 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C2 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C3 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C4 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C5 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C6 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C7 */ { 0, &Ia_faddp_STi_ST0 },
-  /* DE C8 */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE C9 */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CA */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CB */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CC */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CD */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CE */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE CF */ { 0, &Ia_fmulp_STi_ST0 },
-  /* DE D0 */ { 0, &Ia_Invalid },
-  /* DE D1 */ { 0, &Ia_Invalid },
-  /* DE D2 */ { 0, &Ia_Invalid },
-  /* DE D3 */ { 0, &Ia_Invalid },
-  /* DE D4 */ { 0, &Ia_Invalid },
-  /* DE D5 */ { 0, &Ia_Invalid },
-  /* DE D6 */ { 0, &Ia_Invalid },
-  /* DE D7 */ { 0, &Ia_Invalid },
-  /* DE D8 */ { 0, &Ia_Invalid },
-  /* DE D9 */ { 0, &Ia_fcompp  },
-  /* DE DA */ { 0, &Ia_Invalid },
-  /* DE DB */ { 0, &Ia_Invalid },
-  /* DE DC */ { 0, &Ia_Invalid },
-  /* DE DD */ { 0, &Ia_Invalid },
-  /* DE DE */ { 0, &Ia_Invalid },
-  /* DE DF */ { 0, &Ia_Invalid },
-  /* DE E0 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E1 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E2 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E3 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E4 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E5 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E6 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E7 */ { 0, &Ia_fsubrp_STi_ST0 },
-  /* DE E8 */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE E9 */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE EA */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE EB */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE EC */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE ED */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE EE */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE EF */ { 0, &Ia_fsubp_STi_ST0  },
-  /* DE F0 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F1 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F2 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F3 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F4 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F5 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F6 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F7 */ { 0, &Ia_fdivrp_STi_ST0 },
-  /* DE F8 */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE F9 */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FA */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FB */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FC */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FD */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FE */ { 0, &Ia_fdivp_STi_ST0  },
-  /* DE FF */ { 0, &Ia_fdivp_STi_ST0  },
-
-  // DF (modrm is outside 00h - BFh) (mod == 11)
-  /* DF C0 */ { 0, &Ia_ffreep_STi }, // 287 compatibility opcode
-  /* DF C1 */ { 0, &Ia_ffreep_STi },
-  /* DF C2 */ { 0, &Ia_ffreep_STi },
-  /* DF C3 */ { 0, &Ia_ffreep_STi },
-  /* DF C4 */ { 0, &Ia_ffreep_STi },
-  /* DF C5 */ { 0, &Ia_ffreep_STi },
-  /* DF C6 */ { 0, &Ia_ffreep_STi },
-  /* DF C7 */ { 0, &Ia_ffreep_STi },
-  /* DF C8 */ { 0, &Ia_Invalid },
-  /* DF C9 */ { 0, &Ia_Invalid },
-  /* DF CA */ { 0, &Ia_Invalid },
-  /* DF CB */ { 0, &Ia_Invalid },
-  /* DF CC */ { 0, &Ia_Invalid },
-  /* DF CD */ { 0, &Ia_Invalid },
-  /* DF CE */ { 0, &Ia_Invalid },
-  /* DF CF */ { 0, &Ia_Invalid },
-  /* DF D0 */ { 0, &Ia_Invalid },
-  /* DF D1 */ { 0, &Ia_Invalid },
-  /* DF D2 */ { 0, &Ia_Invalid },
-  /* DF D3 */ { 0, &Ia_Invalid },
-  /* DF D4 */ { 0, &Ia_Invalid },
-  /* DF D5 */ { 0, &Ia_Invalid },
-  /* DF D6 */ { 0, &Ia_Invalid },
-  /* DF D7 */ { 0, &Ia_Invalid },
-  /* DF D8 */ { 0, &Ia_Invalid },
-  /* DF D9 */ { 0, &Ia_Invalid },
-  /* DF DA */ { 0, &Ia_Invalid },
-  /* DF DB */ { 0, &Ia_Invalid },
-  /* DF DC */ { 0, &Ia_Invalid },
-  /* DF DD */ { 0, &Ia_Invalid },
-  /* DF DE */ { 0, &Ia_Invalid },
-  /* DF DF */ { 0, &Ia_Invalid },
-  /* DF E0 */ { 0, &Ia_fnstsw_AX },
-  /* DF E1 */ { 0, &Ia_Invalid },
-  /* DF E2 */ { 0, &Ia_Invalid },
-  /* DF E3 */ { 0, &Ia_Invalid },
-  /* DF E4 */ { 0, &Ia_Invalid },
-  /* DF E5 */ { 0, &Ia_Invalid },
-  /* DF E6 */ { 0, &Ia_Invalid },
-  /* DF E7 */ { 0, &Ia_Invalid },
-  /* DF E8 */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF E9 */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF EA */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF EB */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF EC */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF ED */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF EE */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF EF */ { 0, &Ia_fucomip_ST0_STi },
-  /* DF F0 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F1 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F2 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F3 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F4 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F5 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F6 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F7 */ { 0, &Ia_fcomip_ST0_STi  },
-  /* DF F8 */ { 0, &Ia_Invalid },
-  /* DF F9 */ { 0, &Ia_Invalid },
-  /* DF FA */ { 0, &Ia_Invalid },
-  /* DF FB */ { 0, &Ia_Invalid },
-  /* DF FC */ { 0, &Ia_Invalid },
-  /* DF FD */ { 0, &Ia_Invalid },
-  /* DF FE */ { 0, &Ia_Invalid },
-  /* DF FF */ { 0, &Ia_Invalid },
-};
-
-/* ************************************************************************ */
-/* 3-byte opcode table (Table A-4, 0F 38) */
-
-static BxDisasmOpcodeTable_t BxDisasm3ByteOp0f380x[16] = {
-  /* 00 */ { GRPSSE(0f3800) },
-  /* 01 */ { GRPSSE(0f3801) },
-  /* 02 */ { GRPSSE(0f3802) },
-  /* 03 */ { GRPSSE(0f3803) },
-  /* 04 */ { GRPSSE(0f3804) },
-  /* 05 */ { GRPSSE(0f3805) },
-  /* 06 */ { GRPSSE(0f3806) },
-  /* 07 */ { GRPSSE(0f3807) },
-  /* 08 */ { GRPSSE(0f3808) },
-  /* 09 */ { GRPSSE(0f3809) },
-  /* 0A */ { GRPSSE(0f380a) },
-  /* 0B */ { GRPSSE(0f380b) },
-  /* 0C */ { 0, &Ia_Invalid },
-  /* 0D */ { 0, &Ia_Invalid },
-  /* 0E */ { 0, &Ia_Invalid },
-  /* 0F */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasm3ByteOp0f381x[16] = {
-  /* 00 */ { 0, &Ia_Invalid },
-  /* 01 */ { 0, &Ia_Invalid },
-  /* 02 */ { 0, &Ia_Invalid },
-  /* 03 */ { 0, &Ia_Invalid },
-  /* 04 */ { 0, &Ia_Invalid },
-  /* 05 */ { 0, &Ia_Invalid },
-  /* 06 */ { 0, &Ia_Invalid },
-  /* 07 */ { 0, &Ia_Invalid },
-  /* 08 */ { 0, &Ia_Invalid },
-  /* 09 */ { 0, &Ia_Invalid },
-  /* 0A */ { 0, &Ia_Invalid },
-  /* 0B */ { 0, &Ia_Invalid },
-  /* 0C */ { GRPSSE(0f381c) },
-  /* 0D */ { GRPSSE(0f381d) },
-  /* 0E */ { GRPSSE(0f381e) },
-  /* 0F */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasm3ByteTableA4[16] = {
-  /* 00 */ { GR3BOP(0f380x) },
-  /* 01 */ { GR3BOP(0f381x) },
-  /* 02 */ { 0, &Ia_Invalid },
-  /* 03 */ { 0, &Ia_Invalid },
-  /* 04 */ { 0, &Ia_Invalid },
-  /* 05 */ { 0, &Ia_Invalid },
-  /* 06 */ { 0, &Ia_Invalid },
-  /* 07 */ { 0, &Ia_Invalid },
-  /* 08 */ { 0, &Ia_Invalid },
-  /* 09 */ { 0, &Ia_Invalid },
-  /* 0A */ { 0, &Ia_Invalid },
-  /* 0B */ { 0, &Ia_Invalid },
-  /* 0C */ { 0, &Ia_Invalid },
-  /* 0D */ { 0, &Ia_Invalid },
-  /* 0E */ { 0, &Ia_Invalid },
-  /* 0F */ { 0, &Ia_Invalid }
-};
-
-/* ************************************************************************ */
-/* 3-byte opcode table (Table A-5, 0F 3A) */
-
-static BxDisasmOpcodeTable_t BxDisasm3ByteOp0f3a0x[16] = {
-  /* 00 */ { 0, &Ia_Invalid },
-  /* 01 */ { 0, &Ia_Invalid },
-  /* 02 */ { 0, &Ia_Invalid },
-  /* 03 */ { 0, &Ia_Invalid },
-  /* 04 */ { 0, &Ia_Invalid },
-  /* 05 */ { 0, &Ia_Invalid },
-  /* 06 */ { 0, &Ia_Invalid },
-  /* 07 */ { 0, &Ia_Invalid },
-  /* 08 */ { 0, &Ia_Invalid },
-  /* 09 */ { 0, &Ia_Invalid },
-  /* 0A */ { 0, &Ia_Invalid },
-  /* 0B */ { 0, &Ia_Invalid },
-  /* 0C */ { 0, &Ia_Invalid },
-  /* 0D */ { 0, &Ia_Invalid },
-  /* 0E */ { 0, &Ia_Invalid },
-  /* 0F */ { GRPSSE(0f3a0f) }
-};
-
-static BxDisasmOpcodeTable_t BxDisasm3ByteTableA5[16] = {
-  /* 00 */ { GR3BOP(0f3a0x) },
-  /* 01 */ { 0, &Ia_Invalid },
-  /* 02 */ { 0, &Ia_Invalid },
-  /* 03 */ { 0, &Ia_Invalid },
-  /* 04 */ { 0, &Ia_Invalid },
-  /* 05 */ { 0, &Ia_Invalid },
-  /* 06 */ { 0, &Ia_Invalid },
-  /* 07 */ { 0, &Ia_Invalid },
-  /* 08 */ { 0, &Ia_Invalid },
-  /* 09 */ { 0, &Ia_Invalid },
-  /* 0A */ { 0, &Ia_Invalid },
-  /* 0B */ { 0, &Ia_Invalid },
-  /* 0C */ { 0, &Ia_Invalid },
-  /* 0D */ { 0, &Ia_Invalid },
-  /* 0E */ { 0, &Ia_Invalid },
-  /* 0F */ { 0, &Ia_Invalid }
-};
-
-/* ************************************************************************ */
-/* 16-bit operand size */
-
-static BxDisasmOpcodeTable_t BxDisasmOpcodes16[256*2] = {
-  // 256 entries for single byte opcodes
-  /* 00 */ { 0, &Ia_addb_Eb_Gb },
-  /* 01 */ { 0, &Ia_addw_Ew_Gw },
-  /* 02 */ { 0, &Ia_addb_Gb_Eb },
-  /* 03 */ { 0, &Ia_addw_Gw_Ew },
-  /* 04 */ { 0, &Ia_addb_AL_Ib },
-  /* 05 */ { 0, &Ia_addw_AX_Iw },
-  /* 06 */ { 0, &Ia_pushw_ES   },
-  /* 07 */ { 0, &Ia_popw_ES    },
-  /* 08 */ { 0, &Ia_orb_Eb_Gb  },
-  /* 09 */ { 0, &Ia_orw_Ew_Gw  },
-  /* 0A */ { 0, &Ia_orb_Gb_Eb  },
-  /* 0B */ { 0, &Ia_orw_Gw_Ew  },
-  /* 0C */ { 0, &Ia_orb_AL_Ib  },
-  /* 0D */ { 0, &Ia_orw_AX_Iw  },
-  /* 0E */ { 0, &Ia_pushw_CS   },
-  /* 0F */ { 0, &Ia_error      },   // 2 byte escape
-  /* 10 */ { 0, &Ia_adcb_Eb_Gb },
-  /* 11 */ { 0, &Ia_adcw_Ew_Gw },
-  /* 12 */ { 0, &Ia_adcb_Gb_Eb },
-  /* 13 */ { 0, &Ia_adcw_Gw_Ew },
-  /* 14 */ { 0, &Ia_adcb_AL_Ib },
-  /* 15 */ { 0, &Ia_adcw_AX_Iw },
-  /* 16 */ { 0, &Ia_pushw_SS   },
-  /* 17 */ { 0, &Ia_popw_SS    },
-  /* 18 */ { 0, &Ia_sbbb_Eb_Gb },
-  /* 19 */ { 0, &Ia_sbbw_Ew_Gw },
-  /* 1A */ { 0, &Ia_sbbb_Gb_Eb },
-  /* 1B */ { 0, &Ia_sbbw_Gw_Ew },
-  /* 1C */ { 0, &Ia_sbbb_AL_Ib },
-  /* 1D */ { 0, &Ia_sbbw_AX_Iw },
-  /* 1E */ { 0, &Ia_pushw_DS   },
-  /* 1F */ { 0, &Ia_popw_DS    },
-  /* 20 */ { 0, &Ia_andb_Eb_Gb },
-  /* 21 */ { 0, &Ia_andw_Ew_Gw },
-  /* 22 */ { 0, &Ia_andb_Gb_Eb },
-  /* 23 */ { 0, &Ia_andw_Gw_Ew },
-  /* 24 */ { 0, &Ia_andb_AL_Ib },
-  /* 25 */ { 0, &Ia_andw_AX_Iw },
-  /* 26 */ { 0, &Ia_prefix_es  },   // ES:
-  /* 27 */ { 0, &Ia_daa        },
-  /* 28 */ { 0, &Ia_subb_Eb_Gb },
-  /* 29 */ { 0, &Ia_subw_Ew_Gw },
-  /* 2A */ { 0, &Ia_subb_Gb_Eb },
-  /* 2B */ { 0, &Ia_subw_Gw_Ew },
-  /* 2C */ { 0, &Ia_subb_AL_Ib },
-  /* 2D */ { 0, &Ia_subw_AX_Iw },
-  /* 2E */ { 0, &Ia_prefix_cs  },   // CS:
-  /* 2F */ { 0, &Ia_das        },
-  /* 30 */ { 0, &Ia_xorb_Eb_Gb },
-  /* 31 */ { 0, &Ia_xorw_Ew_Gw },
-  /* 32 */ { 0, &Ia_xorb_Gb_Eb },
-  /* 33 */ { 0, &Ia_xorw_Gw_Ew },
-  /* 34 */ { 0, &Ia_xorb_AL_Ib },
-  /* 35 */ { 0, &Ia_xorw_AX_Iw },
-  /* 36 */ { 0, &Ia_prefix_ss  },   // SS:
-  /* 37 */ { 0, &Ia_aaa        },
-  /* 38 */ { 0, &Ia_cmpb_Eb_Gb },
-  /* 39 */ { 0, &Ia_cmpw_Ew_Gw },
-  /* 3A */ { 0, &Ia_cmpb_Gb_Eb },
-  /* 3B */ { 0, &Ia_cmpw_Gw_Ew },
-  /* 3C */ { 0, &Ia_cmpb_AL_Ib },
-  /* 3D */ { 0, &Ia_cmpw_AX_Iw },
-  /* 3E */ { 0, &Ia_prefix_ds  },   // DS:
-  /* 3F */ { 0, &Ia_aas        },
-  /* 40 */ { 0, &Ia_incw_RX    },
-  /* 41 */ { 0, &Ia_incw_RX    },
-  /* 42 */ { 0, &Ia_incw_RX    },
-  /* 43 */ { 0, &Ia_incw_RX    },
-  /* 44 */ { 0, &Ia_incw_RX    },
-  /* 45 */ { 0, &Ia_incw_RX    },
-  /* 46 */ { 0, &Ia_incw_RX    },
-  /* 47 */ { 0, &Ia_incw_RX    },
-  /* 48 */ { 0, &Ia_decw_RX    },
-  /* 49 */ { 0, &Ia_decw_RX    },
-  /* 4A */ { 0, &Ia_decw_RX    },
-  /* 4B */ { 0, &Ia_decw_RX    },
-  /* 4C */ { 0, &Ia_decw_RX    },
-  /* 4D */ { 0, &Ia_decw_RX    },
-  /* 4E */ { 0, &Ia_decw_RX    },
-  /* 4F */ { 0, &Ia_decw_RX    },
-  /* 50 */ { 0, &Ia_pushw_RX   },
-  /* 51 */ { 0, &Ia_pushw_RX   },
-  /* 52 */ { 0, &Ia_pushw_RX   },
-  /* 53 */ { 0, &Ia_pushw_RX   },
-  /* 54 */ { 0, &Ia_pushw_RX   },
-  /* 55 */ { 0, &Ia_pushw_RX   },
-  /* 56 */ { 0, &Ia_pushw_RX   },
-  /* 57 */ { 0, &Ia_pushw_RX   },
-  /* 58 */ { 0, &Ia_popw_RX    },
-  /* 59 */ { 0, &Ia_popw_RX    },
-  /* 5A */ { 0, &Ia_popw_RX    },
-  /* 5B */ { 0, &Ia_popw_RX    },
-  /* 5C */ { 0, &Ia_popw_RX    },
-  /* 5D */ { 0, &Ia_popw_RX    },
-  /* 5E */ { 0, &Ia_popw_RX    },
-  /* 5F */ { 0, &Ia_popw_RX    },
-  /* 60 */ { 0, &Ia_pushaw     },
-  /* 61 */ { 0, &Ia_popaw      },
-  /* 62 */ { 0, &Ia_boundw_Gw_Ma },
-  /* 63 */ { 0, &Ia_arpl_Ew_Rw },
-  /* 64 */ { 0, &Ia_prefix_fs  },   // FS:
-  /* 65 */ { 0, &Ia_prefix_gs  },   // GS:
-  /* 66 */ { 0, &Ia_prefix_osize }, // OSIZE:
-  /* 67 */ { 0, &Ia_prefix_asize }, // ASIZE:
-  /* 68 */ { 0, &Ia_pushw_Iw   },
-  /* 69 */ { 0, &Ia_imulw_Gw_Ew_Iw  },
-  /* 6A */ { 0, &Ia_pushw_sIb   },
-  /* 6B */ { 0, &Ia_imulw_Gw_Ew_sIb },
-  /* 6C */ { 0, &Ia_insb_Yb_DX  },
-  /* 6D */ { 0, &Ia_insw_Yw_DX  },
-  /* 6E */ { 0, &Ia_outsb_DX_Xb },
-  /* 6F */ { 0, &Ia_outsw_DX_Xw },
-  /* 70 */ { 0, &Ia_jo_Jb       },
-  /* 71 */ { 0, &Ia_jno_Jb      },
-  /* 72 */ { 0, &Ia_jb_Jb       },
-  /* 73 */ { 0, &Ia_jnb_Jb      },
-  /* 74 */ { 0, &Ia_jz_Jb       },
-  /* 75 */ { 0, &Ia_jnz_Jb      },
-  /* 76 */ { 0, &Ia_jbe_Jb      },
-  /* 77 */ { 0, &Ia_jnbe_Jb     },
-  /* 78 */ { 0, &Ia_js_Jb       },
-  /* 79 */ { 0, &Ia_jns_Jb      },
-  /* 7A */ { 0, &Ia_jp_Jb       },
-  /* 7B */ { 0, &Ia_jnp_Jb      },
-  /* 7C */ { 0, &Ia_jl_Jb       },
-  /* 7D */ { 0, &Ia_jnl_Jb      },
-  /* 7E */ { 0, &Ia_jle_Jb      },
-  /* 7F */ { 0, &Ia_jnle_Jb     },
-  /* 80 */ { GRPN(G1EbIb)       },
-  /* 81 */ { GRPN(G1EwIw)       },
-  /* 82 */ { GRPN(G1EbIb)       },
-  /* 83 */ { GRPN(G1EwIb)       },
-  /* 84 */ { 0, &Ia_testb_Eb_Gb },
-  /* 85 */ { 0, &Ia_testw_Ew_Gw },
-  /* 86 */ { 0, &Ia_xchgb_Eb_Gb },
-  /* 87 */ { 0, &Ia_xchgw_Ew_Gw },
-  /* 88 */ { 0, &Ia_movb_Eb_Gb  },
-  /* 89 */ { 0, &Ia_movw_Ew_Gw  },
-  /* 8A */ { 0, &Ia_movb_Gb_Eb  },
-  /* 8B */ { 0, &Ia_movw_Gw_Ew  },
-  /* 8C */ { 0, &Ia_movw_Ew_Sw  },
-  /* 8D */ { 0, &Ia_leaw_Gw_Mw  },
-  /* 8E */ { 0, &Ia_movw_Sw_Ew  },
-  /* 8F */ { 0, &Ia_popw_Ew     },
-  /* 90 */ { 0, &Ia_nop         },
-  /* 91 */ { 0, &Ia_xchgw_RX_AX },
-  /* 92 */ { 0, &Ia_xchgw_RX_AX },
-  /* 93 */ { 0, &Ia_xchgw_RX_AX },
-  /* 94 */ { 0, &Ia_xchgw_RX_AX },
-  /* 95 */ { 0, &Ia_xchgw_RX_AX },
-  /* 96 */ { 0, &Ia_xchgw_RX_AX },
-  /* 97 */ { 0, &Ia_xchgw_RX_AX },
-  /* 98 */ { 0, &Ia_cbw         },
-  /* 99 */ { 0, &Ia_cwd         },
-  /* 9A */ { 0, &Ia_lcall_Apw   },
-  /* 9B */ { 0, &Ia_fwait       },
-  /* 9C */ { 0, &Ia_pushfw      },
-  /* 9D */ { 0, &Ia_popfw       },
-  /* 9E */ { 0, &Ia_sahf        },
-  /* 9F */ { 0, &Ia_lahf        },
-  /* A0 */ { 0, &Ia_movb_AL_Ob  },
-  /* A1 */ { 0, &Ia_movw_AX_Ow  },
-  /* A0 */ { 0, &Ia_movb_Ob_AL  },
-  /* A1 */ { 0, &Ia_movw_Ow_AX  },
-  /* A4 */ { 0, &Ia_movsb_Yb_Xb },
-  /* A5 */ { 0, &Ia_movsw_Yw_Xw },
-  /* A6 */ { 0, &Ia_cmpsb_Yb_Xb },
-  /* A7 */ { 0, &Ia_cmpsw_Yw_Xw },
-  /* A8 */ { 0, &Ia_testb_AL_Ib },
-  /* A9 */ { 0, &Ia_testw_AX_Iw },
-  /* AA */ { 0, &Ia_stosb_Yb_AL },
-  /* AB */ { 0, &Ia_stosw_Yw_AX },
-  /* AC */ { 0, &Ia_lodsb_AL_Xb },
-  /* AD */ { 0, &Ia_lodsw_AX_Xw },
-  /* AE */ { 0, &Ia_scasb_Yb_AL },
-  /* AF */ { 0, &Ia_scasw_Yw_AX },
-  /* B0 */ { 0, &Ia_movb_R8_Ib  },
-  /* B1 */ { 0, &Ia_movb_R8_Ib  },
-  /* B2 */ { 0, &Ia_movb_R8_Ib  },
-  /* B3 */ { 0, &Ia_movb_R8_Ib  },
-  /* B4 */ { 0, &Ia_movb_R8_Ib  },
-  /* B5 */ { 0, &Ia_movb_R8_Ib  },
-  /* B6 */ { 0, &Ia_movb_R8_Ib  },
-  /* B7 */ { 0, &Ia_movb_R8_Ib  },
-  /* B8 */ { 0, &Ia_movw_RX_Iw  },
-  /* B9 */ { 0, &Ia_movw_RX_Iw  },
-  /* BA */ { 0, &Ia_movw_RX_Iw  },
-  /* BB */ { 0, &Ia_movw_RX_Iw  },
-  /* BC */ { 0, &Ia_movw_RX_Iw  },
-  /* BD */ { 0, &Ia_movw_RX_Iw  },
-  /* BE */ { 0, &Ia_movw_RX_Iw  },
-  /* BF */ { 0, &Ia_movw_RX_Iw  },
-  /* C0 */ { GRPN(G2Eb)         },
-  /* C1 */ { GRPN(G2Ew)         },
-  /* C2 */ { 0, &Ia_ret_Iw      },
-  /* C3 */ { 0, &Ia_ret         },
-  /* C4 */ { 0, &Ia_lesw_Gw_Mp  },
-  /* C5 */ { 0, &Ia_ldsw_Gw_Mp  },
-  /* C6 */ { 0, &Ia_movb_Eb_Ib  },
-  /* C7 */ { 0, &Ia_movw_Ew_Iw  },
-  /* C8 */ { 0, &Ia_enter       },
-  /* C9 */ { 0, &Ia_leave       },
-  /* CA */ { 0, &Ia_lret_Iw     },
-  /* CB */ { 0, &Ia_lret        },
-  /* CC */ { 0, &Ia_int3        },
-  /* CD */ { 0, &Ia_int_Ib      },
-  /* CE */ { 0, &Ia_into        },
-  /* CF */ { 0, &Ia_iretw       },
-  /* D0 */ { GRPN(G2EbI1)       },
-  /* D1 */ { GRPN(G2EwI1)       },
-  /* D2 */ { GRPN(G2EbCL)       },
-  /* D3 */ { GRPN(G2EwCL)       },
-  /* D4 */ { 0, &Ia_aam         },
-  /* D5 */ { 0, &Ia_aad         },
-  /* D6 */ { 0, &Ia_salc        },
-  /* D7 */ { 0, &Ia_xlat        },
-  /* D8 */ { GRPFP(D8)          },
-  /* D9 */ { GRPFP(D9)          },
-  /* DA */ { GRPFP(DA)          },
-  /* DB */ { GRPFP(DB)          },
-  /* DC */ { GRPFP(DC)          },
-  /* DD */ { GRPFP(DD)          },
-  /* DE */ { GRPFP(DE)          },
-  /* DF */ { GRPFP(DF)          },
-  /* E0 */ { 0, &Ia_loopne_Jb   },
-  /* E1 */ { 0, &Ia_loope_Jb    },
-  /* E2 */ { 0, &Ia_loop_Jb     },
-  /* E3 */ { 0, &Ia_jcxz_Jb     },
-  /* E4 */ { 0, &Ia_inb_AL_Ib   },
-  /* E5 */ { 0, &Ia_inw_AX_Ib   },
-  /* E6 */ { 0, &Ia_outb_Ib_AL  },
-  /* E7 */ { 0, &Ia_outw_Ib_AX  },
-  /* E8 */ { 0, &Ia_call_Jw     },
-  /* E9 */ { 0, &Ia_jmp_Jw      },
-  /* EA */ { 0, &Ia_ljmp_Apw    },
-  /* EB */ { 0, &Ia_jmp_Jb      },
-  /* EC */ { 0, &Ia_inb_AL_DX   },
-  /* ED */ { 0, &Ia_inw_AX_DX   },
-  /* EE */ { 0, &Ia_outb_DX_AL  },
-  /* EF */ { 0, &Ia_outw_DX_AX  },
-  /* F0 */ { 0, &Ia_prefix_lock },   // LOCK:
-  /* F1 */ { 0, &Ia_int1        },
-  /* F2 */ { 0, &Ia_prefix_repne },  // REPNE:
-  /* F3 */ { 0, &Ia_prefix_rep  },   // REP:
-  /* F4 */ { 0, &Ia_hlt         },
-  /* F5 */ { 0, &Ia_cmc         },
-  /* F6 */ { GRPN(G3Eb)         },
-  /* F7 */ { GRPN(G3Ew)         },
-  /* F8 */ { 0, &Ia_clc         },
-  /* F9 */ { 0, &Ia_stc         },
-  /* FA */ { 0, &Ia_cli         },
-  /* FB */ { 0, &Ia_sti         },
-  /* FC */ { 0, &Ia_cld         },
-  /* FD */ { 0, &Ia_std         },
-  /* FE */ { GRPN(G4)           },
-  /* FF */ { GRPN(G5w)          },
-
-  // 256 entries for two byte opcodes
-  /* 0F 00 */ { GRPN(G6)          },
-  /* 0F 01 */ { GRPN(G7)          },
-  /* 0F 02 */ { 0, &Ia_larw_Gw_Ew },
-  /* 0F 03 */ { 0, &Ia_lslw_Gw_Ew },
-  /* 0F 04 */ { 0, &Ia_Invalid    },
-  /* 0F 05 */ { 0, &Ia_syscall    },
-  /* 0F 06 */ { 0, &Ia_clts       },
-  /* 0F 07 */ { 0, &Ia_sysret     },
-  /* 0F 08 */ { 0, &Ia_invd       },
-  /* 0F 09 */ { 0, &Ia_wbinvd     },
-  /* 0F 0A */ { 0, &Ia_Invalid    },
-  /* 0F 0B */ { 0, &Ia_ud2a       },
-  /* 0F 0C */ { 0, &Ia_Invalid    },
-  /* 0F 0D */ { 0, &Ia_prefetch   },   // 3DNow!
-  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
-  /* 0F 0F */ { GRP3DNOW          },
-  /* 0F 10 */ { GRPSSE(0f10)      },
-  /* 0F 11 */ { GRPSSE(0f11)      },
-  /* 0F 12 */ { GRPSSE(0f12)      },
-  /* 0F 13 */ { GRPSSE(0f13)      },
-  /* 0F 14 */ { GRPSSE(0f14)      },
-  /* 0F 15 */ { GRPSSE(0f15)      },
-  /* 0F 16 */ { GRPSSE(0f16)      },
-  /* 0F 17 */ { GRPSSE(0f17)      },
-  /* 0F 18 */ { GRPN(G16)         },
-  /* 0F 19 */ { 0, &Ia_Invalid    },
-  /* 0F 1A */ { 0, &Ia_Invalid    },
-  /* 0F 1B */ { 0, &Ia_Invalid    },
-  /* 0F 1C */ { 0, &Ia_Invalid    },
-  /* 0F 1D */ { 0, &Ia_Invalid    },
-  /* 0F 1E */ { 0, &Ia_Invalid    },
-  /* 0F 1F */ { 0, &Ia_multibyte_nop },
-  /* 0F 20 */ { 0, &Ia_movl_Rd_Cd },
-  /* 0F 21 */ { 0, &Ia_movl_Rd_Dd },
-  /* 0F 22 */ { 0, &Ia_movl_Cd_Rd },
-  /* 0F 23 */ { 0, &Ia_movl_Dd_Rd },
-  /* 0F 24 */ { 0, &Ia_movl_Rd_Td },
-  /* 0F 25 */ { 0, &Ia_Invalid    },
-  /* 0F 26 */ { 0, &Ia_movl_Td_Rd },
-  /* 0F 27 */ { 0, &Ia_Invalid    },
-  /* 0F 28 */ { GRPSSE(0f28) },
-  /* 0F 29 */ { GRPSSE(0f29) },
-  /* 0F 2A */ { GRPSSE(0f2a) },
-  /* 0F 2B */ { GRPSSE(0f2b) },
-  /* 0F 2C */ { GRPSSE(0f2c) },
-  /* 0F 2D */ { GRPSSE(0f2d) },
-  /* 0F 2E */ { GRPSSE(0f2e) },
-  /* 0F 2F */ { GRPSSE(0f2f) },
-  /* 0F 30 */ { 0, &Ia_wrmsr },
-  /* 0F 31 */ { 0, &Ia_rdtsc },
-  /* 0F 32 */ { 0, &Ia_rdmsr },
-  /* 0F 33 */ { 0, &Ia_rdpmc },
-  /* 0F 34 */ { 0, &Ia_sysenter },
-  /* 0F 35 */ { 0, &Ia_sysexit  },
-  /* 0F 36 */ { 0, &Ia_Invalid  },
-  /* 0F 37 */ { 0, &Ia_Invalid  },
-  /* 0F 38 */ { GR3BTAB(A4) },
-  /* 0F 39 */ { 0, &Ia_Invalid  },
-  /* 0F 3A */ { GR3BTAB(A5) },
-  /* 0F 3B */ { 0, &Ia_Invalid  },
-  /* 0F 3C */ { 0, &Ia_Invalid  },
-  /* 0F 3D */ { 0, &Ia_Invalid  },
-  /* 0F 3E */ { 0, &Ia_Invalid  },
-  /* 0F 3F */ { 0, &Ia_Invalid  },
-  /* 0F 40 */ { 0, &Ia_cmovow_Gw_Ew  },
-  /* 0F 41 */ { 0, &Ia_cmovnow_Gw_Ew },
-  /* 0F 42 */ { 0, &Ia_cmovcw_Gw_Ew  },
-  /* 0F 43 */ { 0, &Ia_cmovncw_Gw_Ew },
-  /* 0F 44 */ { 0, &Ia_cmovzw_Gw_Ew  },
-  /* 0F 45 */ { 0, &Ia_cmovnzw_Gw_Ew },
-  /* 0F 46 */ { 0, &Ia_cmovnaw_Gw_Ew },
-  /* 0F 47 */ { 0, &Ia_cmovaw_Gw_Ew  },
-  /* 0F 48 */ { 0, &Ia_cmovsw_Gw_Ew  },
-  /* 0F 49 */ { 0, &Ia_cmovnsw_Gw_Ew },
-  /* 0F 4A */ { 0, &Ia_cmovpw_Gw_Ew  },
-  /* 0F 4B */ { 0, &Ia_cmovnpw_Gw_Ew },
-  /* 0F 4C */ { 0, &Ia_cmovlw_Gw_Ew  },
-  /* 0F 4D */ { 0, &Ia_cmovnlw_Gw_Ew },
-  /* 0F 4E */ { 0, &Ia_cmovngw_Gw_Ew },
-  /* 0F 4F */ { 0, &Ia_cmovgw_Gw_Ew  },
-  /* 0F 50 */ { GRPSSE(0f50) },
-  /* 0F 51 */ { GRPSSE(0f51) },
-  /* 0F 52 */ { GRPSSE(0f52) },
-  /* 0F 53 */ { GRPSSE(0f53) },
-  /* 0F 54 */ { GRPSSE(0f54) },
-  /* 0F 55 */ { GRPSSE(0f55) },
-  /* 0F 56 */ { GRPSSE(0f56) },
-  /* 0F 57 */ { GRPSSE(0f57) },
-  /* 0F 58 */ { GRPSSE(0f58) },
-  /* 0F 59 */ { GRPSSE(0f59) },
-  /* 0F 5A */ { GRPSSE(0f5a) },
-  /* 0F 5B */ { GRPSSE(0f5b) },
-  /* 0F 5C */ { GRPSSE(0f5c) },
-  /* 0F 5D */ { GRPSSE(0f5d) },
-  /* 0F 5E */ { GRPSSE(0f5e) },
-  /* 0F 5F */ { GRPSSE(0f5f) },
-  /* 0F 60 */ { GRPSSE(0f60) },
-  /* 0F 61 */ { GRPSSE(0f61) },
-  /* 0F 62 */ { GRPSSE(0f62) },
-  /* 0F 63 */ { GRPSSE(0f63) },
-  /* 0F 64 */ { GRPSSE(0f64) },
-  /* 0F 65 */ { GRPSSE(0f65) },
-  /* 0F 66 */ { GRPSSE(0f66) },
-  /* 0F 67 */ { GRPSSE(0f67) },
-  /* 0F 68 */ { GRPSSE(0f68) },
-  /* 0F 69 */ { GRPSSE(0f69) },
-  /* 0F 6A */ { GRPSSE(0f6a) },
-  /* 0F 6B */ { GRPSSE(0f6b) },
-  /* 0F 6C */ { GRPSSE(0f6c) },
-  /* 0F 6D */ { GRPSSE(0f6d) },
-  /* 0F 6E */ { GRPSSE(0f6e) },
-  /* 0F 6F */ { GRPSSE(0f6f) },
-  /* 0F 70 */ { GRPSSE(0f70) },
-  /* 0F 71 */ { GRPN(G12)    },
-  /* 0F 72 */ { GRPN(G13)    },
-  /* 0F 73 */ { GRPN(G14)    },
-  /* 0F 74 */ { GRPSSE(0f74) },
-  /* 0F 75 */ { GRPSSE(0f75) },
-  /* 0F 76 */ { GRPSSE(0f76) },
-  /* 0F 77 */ { 0, &Ia_emms  },
-  /* 0F 78 */ { 0, &Ia_Invalid },
-  /* 0F 79 */ { 0, &Ia_Invalid },
-  /* 0F 7A */ { 0, &Ia_Invalid },
-  /* 0F 7B */ { 0, &Ia_Invalid },
-  /* 0F 7C */ { GRPSSE(0f7c) },
-  /* 0F 7D */ { GRPSSE(0f7d) },
-  /* 0F 7E */ { GRPSSE(0f7e) },
-  /* 0F 7F */ { GRPSSE(0f7f) },
-  /* 0F 80 */ { 0, &Ia_jo_Jw     },
-  /* 0F 81 */ { 0, &Ia_jno_Jw    },
-  /* 0F 82 */ { 0, &Ia_jb_Jw     },
-  /* 0F 83 */ { 0, &Ia_jnb_Jw    },
-  /* 0F 84 */ { 0, &Ia_jz_Jw     },
-  /* 0F 85 */ { 0, &Ia_jnz_Jw    },
-  /* 0F 86 */ { 0, &Ia_jbe_Jw    },
-  /* 0F 87 */ { 0, &Ia_jnbe_Jw   },
-  /* 0F 88 */ { 0, &Ia_js_Jw     },
-  /* 0F 89 */ { 0, &Ia_jns_Jw    },
-  /* 0F 8A */ { 0, &Ia_jp_Jw     },
-  /* 0F 8B */ { 0, &Ia_jnp_Jw    },
-  /* 0F 8C */ { 0, &Ia_jl_Jw     },
-  /* 0F 8D */ { 0, &Ia_jnl_Jw    },
-  /* 0F 8E */ { 0, &Ia_jle_Jw    },
-  /* 0F 8F */ { 0, &Ia_jnle_Jw   },
-  /* 0F 90 */ { 0, &Ia_seto_Eb   },
-  /* 0F 91 */ { 0, &Ia_setno_Eb  },
-  /* 0F 92 */ { 0, &Ia_setb_Eb   },
-  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
-  /* 0F 94 */ { 0, &Ia_setz_Eb   },
-  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
-  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
-  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
-  /* 0F 98 */ { 0, &Ia_sets_Eb   },
-  /* 0F 99 */ { 0, &Ia_setns_Eb  },
-  /* 0F 9A */ { 0, &Ia_setp_Eb   },
-  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
-  /* 0F 9C */ { 0, &Ia_setl_Eb   },
-  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
-  /* 0F 9E */ { 0, &Ia_setle_Eb  },
-  /* 0F 9F */ { 0, &Ia_setnle_Eb },
-  /* 0F A0 */ { 0, &Ia_pushw_FS  },
-  /* 0F A1 */ { 0, &Ia_popw_FS   },
-  /* 0F A2 */ { 0, &Ia_cpuid     },
-  /* 0F A3 */ { 0, &Ia_btw_Ew_Gw },
-  /* 0F A4 */ { 0, &Ia_shldw_Ew_Gw_Ib },
-  /* 0F A5 */ { 0, &Ia_shldw_Ew_Gw_CL },
-  /* 0F A6 */ { 0, &Ia_Invalid        },
-  /* 0F A7 */ { 0, &Ia_Invalid        },
-  /* 0F A8 */ { 0, &Ia_pushw_GS       },
-  /* 0F A9 */ { 0, &Ia_popw_GS        },
-  /* 0F AA */ { 0, &Ia_rsm            },
-  /* 0F AB */ { 0, &Ia_btsw_Ew_Gw     },
-  /* 0F AC */ { 0, &Ia_shrdw_Ew_Gw_Ib },
-  /* 0F AD */ { 0, &Ia_shrdw_Ew_Gw_CL },
-  /* 0F AE */ { GRPN(G15)             },
-  /* 0F AF */ { 0, &Ia_imulw_Gw_Ew    },
-  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
-  /* 0F B1 */ { 0, &Ia_cmpxchgw_Ew_Gw },
-  /* 0F B2 */ { 0, &Ia_lssw_Gw_Mp     },
-  /* 0F B3 */ { 0, &Ia_btrw_Ew_Gw     },
-  /* 0F B4 */ { 0, &Ia_lfsw_Gw_Mp     },
-  /* 0F B5 */ { 0, &Ia_lgsw_Gw_Mp     },
-  /* 0F B6 */ { 0, &Ia_movzbw_Gw_Eb   },
-  /* 0F B7 */ { 0, &Ia_movw_Gw_Ew     },
-  /* 0F B8 */ { 0, &Ia_Invalid        },
-  /* 0F B9 */ { 0, &Ia_ud2b           },
-  /* 0F BA */ { GRPN(G8EwIb)          },
-  /* 0F BB */ { 0, &Ia_btcw_Ew_Gw     },
-  /* 0F BC */ { 0, &Ia_bsfw_Gw_Ew     },
-  /* 0F BD */ { 0, &Ia_bsrw_Gw_Ew     },
-  /* 0F BE */ { 0, &Ia_movsbw_Gw_Eb   },
-  /* 0F BF */ { 0, &Ia_movw_Gw_Ew     },
-  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb    },
-  /* 0F C0 */ { 0, &Ia_xaddw_Ew_Gw    },
-  /* 0F C2 */ { GRPSSE(0fc2) },
-  /* 0F C3 */ { GRPSSE(0fc3) },
-  /* 0F C4 */ { GRPSSE(0fc4) },
-  /* 0F C5 */ { GRPSSE(0fc5) },
-  /* 0F C6 */ { GRPSSE(0fc6) },
-  /* 0F C7 */ { GRPN(G9)     },
-  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
-  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
-  /* 0F CA */ { 0, &Ia_bswapl_ERX },
-  /* 0F CB */ { 0, &Ia_bswapl_ERX },
-  /* 0F CC */ { 0, &Ia_bswapl_ERX },
-  /* 0F CD */ { 0, &Ia_bswapl_ERX },
-  /* 0F CE */ { 0, &Ia_bswapl_ERX },
-  /* 0F CF */ { 0, &Ia_bswapl_ERX },
-  /* 0F D0 */ { GRPSSE(0fd0) },
-  /* 0F D1 */ { GRPSSE(0fd1) },
-  /* 0F D2 */ { GRPSSE(0fd2) },
-  /* 0F D3 */ { GRPSSE(0fd3) },
-  /* 0F D4 */ { GRPSSE(0fd4) },
-  /* 0F D5 */ { GRPSSE(0fd5) },
-  /* 0F D6 */ { GRPSSE(0fd6) },
-  /* 0F D7 */ { GRPSSE(0fd7) },
-  /* 0F D8 */ { GRPSSE(0fd8) },
-  /* 0F D9 */ { GRPSSE(0fd9) },
-  /* 0F DA */ { GRPSSE(0fda) },
-  /* 0F DB */ { GRPSSE(0fdb) },
-  /* 0F DC */ { GRPSSE(0fdc) },
-  /* 0F DD */ { GRPSSE(0fdd) },
-  /* 0F DE */ { GRPSSE(0fde) },
-  /* 0F DF */ { GRPSSE(0fdf) },
-  /* 0F E0 */ { GRPSSE(0fe0) },
-  /* 0F E1 */ { GRPSSE(0fe1) },
-  /* 0F E2 */ { GRPSSE(0fe2) },
-  /* 0F E3 */ { GRPSSE(0fe3) },
-  /* 0F E4 */ { GRPSSE(0fe4) },
-  /* 0F E5 */ { GRPSSE(0fe5) },
-  /* 0F E6 */ { GRPSSE(0fe6) },
-  /* 0F E7 */ { GRPSSE(0fe7) },
-  /* 0F E8 */ { GRPSSE(0fe8) },
-  /* 0F E9 */ { GRPSSE(0fe9) },
-  /* 0F EA */ { GRPSSE(0fea) },
-  /* 0F EB */ { GRPSSE(0feb) },
-  /* 0F EC */ { GRPSSE(0fec) },
-  /* 0F ED */ { GRPSSE(0fed) },
-  /* 0F EE */ { GRPSSE(0fee) },
-  /* 0F EF */ { GRPSSE(0fef) },
-  /* 0F F0 */ { GRPSSE(0ff0) },
-  /* 0F F1 */ { GRPSSE(0ff1) },
-  /* 0F F2 */ { GRPSSE(0ff2) },
-  /* 0F F3 */ { GRPSSE(0ff3) },
-  /* 0F F4 */ { GRPSSE(0ff4) },
-  /* 0F F5 */ { GRPSSE(0ff5) },
-  /* 0F F6 */ { GRPSSE(0ff6) },
-  /* 0F F7 */ { GRPSSE(0ff7) },
-  /* 0F F8 */ { GRPSSE(0ff8) },
-  /* 0F F9 */ { GRPSSE(0ff9) },
-  /* 0F FA */ { GRPSSE(0ffa) },
-  /* 0F FB */ { GRPSSE(0ffb) },
-  /* 0F FC */ { GRPSSE(0ffc) },
-  /* 0F FD */ { GRPSSE(0ffd) },
-  /* 0F FE */ { GRPSSE(0ffe) },
-  /* 0F FF */ { 0, &Ia_Invalid }
-};
-
-/* ************************************************************************ */
-/* 32-bit operand size */
-
-static BxDisasmOpcodeTable_t BxDisasmOpcodes32[256*2] = {
-  // 256 entries for single byte opcodes
-  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
-  /* 01 */ { 0, &Ia_addl_Ed_Gd    },
-  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
-  /* 03 */ { 0, &Ia_addl_Gd_Ed    },
-  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
-  /* 05 */ { 0, &Ia_addl_EAX_Id,  },
-  /* 06 */ { 0, &Ia_pushl_ES      },
-  /* 07 */ { 0, &Ia_popl_ES       },
-  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
-  /* 09 */ { 0, &Ia_orl_Ed_Gd     },
-  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
-  /* 0B */ { 0, &Ia_orl_Gd_Ed     },
-  /* 0C */ { 0, &Ia_orb_AL_Ib     },
-  /* 0D */ { 0, &Ia_orl_EAX_Id    },
-  /* 0E */ { 0, &Ia_pushl_CS      },
-  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
-  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
-  /* 11 */ { 0, &Ia_adcl_Ed_Gd    },
-  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
-  /* 13 */ { 0, &Ia_adcl_Gd_Ed    },
-  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
-  /* 15 */ { 0, &Ia_adcl_EAX_Id   },
-  /* 16 */ { 0, &Ia_pushl_SS      },
-  /* 17 */ { 0, &Ia_popl_SS       },
-  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
-  /* 19 */ { 0, &Ia_sbbl_Ed_Gd    },
-  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
-  /* 1B */ { 0, &Ia_sbbl_Gd_Ed    },
-  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
-  /* 1D */ { 0, &Ia_sbbl_EAX_Id   },
-  /* 1E */ { 0, &Ia_pushl_DS      },
-  /* 1F */ { 0, &Ia_popl_DS       },
-  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
-  /* 21 */ { 0, &Ia_andl_Ed_Gd    },
-  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
-  /* 23 */ { 0, &Ia_andl_Gd_Ed    },
-  /* 24 */ { 0, &Ia_andb_AL_Ib    },
-  /* 25 */ { 0, &Ia_andl_EAX_Id   },
-  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
-  /* 27 */ { 0, &Ia_daa           },
-  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
-  /* 29 */ { 0, &Ia_subl_Ed_Gd    },
-  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
-  /* 2B */ { 0, &Ia_subl_Gd_Ed    },
-  /* 2C */ { 0, &Ia_subb_AL_Ib    },
-  /* 2D */ { 0, &Ia_subl_EAX_Id   },
-  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
-  /* 2F */ { 0, &Ia_das           },
-  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
-  /* 31 */ { 0, &Ia_xorl_Ed_Gd    },
-  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
-  /* 33 */ { 0, &Ia_xorl_Gd_Ed    },
-  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
-  /* 35 */ { 0, &Ia_xorl_EAX_Id   },
-  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
-  /* 37 */ { 0, &Ia_aaa           },
-  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
-  /* 39 */ { 0, &Ia_cmpl_Ed_Gd    },
-  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
-  /* 3B */ { 0, &Ia_cmpl_Gd_Ed    },
-  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
-  /* 3D */ { 0, &Ia_cmpl_EAX_Id   },
-  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
-  /* 3F */ { 0, &Ia_aas           },
-  /* 40 */ { 0, &Ia_incl_ERX      },
-  /* 41 */ { 0, &Ia_incl_ERX      },
-  /* 42 */ { 0, &Ia_incl_ERX      },
-  /* 43 */ { 0, &Ia_incl_ERX      },
-  /* 44 */ { 0, &Ia_incl_ERX      },
-  /* 45 */ { 0, &Ia_incl_ERX      },
-  /* 46 */ { 0, &Ia_incl_ERX      },
-  /* 47 */ { 0, &Ia_incl_ERX      },
-  /* 48 */ { 0, &Ia_decl_ERX      },
-  /* 49 */ { 0, &Ia_decl_ERX      },
-  /* 4A */ { 0, &Ia_decl_ERX      },
-  /* 4B */ { 0, &Ia_decl_ERX      },
-  /* 4C */ { 0, &Ia_decl_ERX      },
-  /* 4D */ { 0, &Ia_decl_ERX      },
-  /* 4E */ { 0, &Ia_decl_ERX      },
-  /* 4F */ { 0, &Ia_decl_ERX      },
-  /* 50 */ { 0, &Ia_pushl_ERX     },
-  /* 51 */ { 0, &Ia_pushl_ERX     },
-  /* 52 */ { 0, &Ia_pushl_ERX     },
-  /* 53 */ { 0, &Ia_pushl_ERX     },
-  /* 54 */ { 0, &Ia_pushl_ERX     },
-  /* 55 */ { 0, &Ia_pushl_ERX     },
-  /* 56 */ { 0, &Ia_pushl_ERX     },
-  /* 57 */ { 0, &Ia_pushl_ERX     },
-  /* 58 */ { 0, &Ia_popl_ERX      },
-  /* 59 */ { 0, &Ia_popl_ERX      },
-  /* 5A */ { 0, &Ia_popl_ERX      },
-  /* 5B */ { 0, &Ia_popl_ERX      },
-  /* 5C */ { 0, &Ia_popl_ERX      },
-  /* 5D */ { 0, &Ia_popl_ERX      },
-  /* 5E */ { 0, &Ia_popl_ERX      },
-  /* 5F */ { 0, &Ia_popl_ERX      },
-  /* 60 */ { 0, &Ia_pushal        },
-  /* 61 */ { 0, &Ia_popal         },
-  /* 62 */ { 0, &Ia_boundl_Gd_Ma  },
-  /* 63 */ { 0, &Ia_arpl_Ew_Rw    },
-  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
-  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
-  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
-  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
-  /* 68 */ { 0, &Ia_pushl_Id      },
-  /* 69 */ { 0, &Ia_imull_Gd_Ed_Id  },
-  /* 6A */ { 0, &Ia_pushl_sIb     },
-  /* 6B */ { 0, &Ia_imull_Gd_Ed_sIb },
-  /* 6C */ { 0, &Ia_insb_Yb_DX    },
-  /* 6D */ { 0, &Ia_insl_Yd_DX    },
-  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
-  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
-  /* 70 */ { 0, &Ia_jo_Jb         },
-  /* 71 */ { 0, &Ia_jno_Jb        },
-  /* 72 */ { 0, &Ia_jb_Jb         },
-  /* 73 */ { 0, &Ia_jnb_Jb        },
-  /* 74 */ { 0, &Ia_jz_Jb         },
-  /* 75 */ { 0, &Ia_jnz_Jb        },
-  /* 76 */ { 0, &Ia_jbe_Jb        },
-  /* 77 */ { 0, &Ia_jnbe_Jb       },
-  /* 78 */ { 0, &Ia_js_Jb         },
-  /* 79 */ { 0, &Ia_jns_Jb        },
-  /* 7A */ { 0, &Ia_jp_Jb         },
-  /* 7B */ { 0, &Ia_jnp_Jb        },
-  /* 7C */ { 0, &Ia_jl_Jb         },
-  /* 7D */ { 0, &Ia_jnl_Jb        },
-  /* 7E */ { 0, &Ia_jle_Jb        },
-  /* 7F */ { 0, &Ia_jnle_Jb       },
-  /* 80 */ { GRPN(G1EbIb)         },
-  /* 81 */ { GRPN(G1EdId)         },
-  /* 82 */ { GRPN(G1EbIb)         },
-  /* 83 */ { GRPN(G1EdIb)         },
-  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
-  /* 85 */ { 0, &Ia_testl_Ed_Gd   },
-  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
-  /* 87 */ { 0, &Ia_xchgl_Ed_Gd   },
-  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
-  /* 89 */ { 0, &Ia_movl_Ed_Gd    },
-  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
-  /* 8B */ { 0, &Ia_movl_Gd_Ed    },
-  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
-  /* 8D */ { 0, &Ia_leal_Gd_Md    },
-  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
-  /* 8F */ { 0, &Ia_popl_Ed       },
-  /* 90 */ { 0, &Ia_nop           },
-  /* 91 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 92 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 93 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 94 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 95 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 96 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 97 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 98 */ { 0, &Ia_cwde          },
-  /* 99 */ { 0, &Ia_cdq           },
-  /* 9A */ { 0, &Ia_lcall_Apd     },
-  /* 9B */ { 0, &Ia_fwait         },
-  /* 9C */ { 0, &Ia_pushfl        },
-  /* 9D */ { 0, &Ia_popfl         },
-  /* 9E */ { 0, &Ia_sahf          },
-  /* 9F */ { 0, &Ia_lahf          },
-  /* A0 */ { 0, &Ia_movb_AL_Ob    },
-  /* A1 */ { 0, &Ia_movl_EAX_Od   },
-  /* A0 */ { 0, &Ia_movb_Ob_AL    },
-  /* A1 */ { 0, &Ia_movl_Od_EAX   },
-  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
-  /* A5 */ { 0, &Ia_movsl_Yd_Xd   },
-  /* A6 */ { 0, &Ia_cmpsb_Yb_Xb   },
-  /* A7 */ { 0, &Ia_cmpsl_Yd_Xd   },
-  /* A8 */ { 0, &Ia_testb_AL_Ib   },
-  /* A9 */ { 0, &Ia_testl_EAX_Id  },
-  /* AA */ { 0, &Ia_stosb_Yb_AL   },
-  /* AB */ { 0, &Ia_stosl_Yd_EAX  },
-  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
-  /* AD */ { 0, &Ia_lodsl_EAX_Xd  },
-  /* AE */ { 0, &Ia_scasb_Yb_AL   },
-  /* AF */ { 0, &Ia_scasl_Yd_EAX  },
-  /* B0 */ { 0, &Ia_movb_R8_Ib    },
-  /* B1 */ { 0, &Ia_movb_R8_Ib    },
-  /* B2 */ { 0, &Ia_movb_R8_Ib    },
-  /* B3 */ { 0, &Ia_movb_R8_Ib    },
-  /* B4 */ { 0, &Ia_movb_R8_Ib    },
-  /* B5 */ { 0, &Ia_movb_R8_Ib    },
-  /* B6 */ { 0, &Ia_movb_R8_Ib    },
-  /* B7 */ { 0, &Ia_movb_R8_Ib    },
-  /* B8 */ { 0, &Ia_movl_ERX_Id   },
-  /* B9 */ { 0, &Ia_movl_ERX_Id   },
-  /* BA */ { 0, &Ia_movl_ERX_Id   },
-  /* BB */ { 0, &Ia_movl_ERX_Id   },
-  /* BC */ { 0, &Ia_movl_ERX_Id   },
-  /* BD */ { 0, &Ia_movl_ERX_Id   },
-  /* BE */ { 0, &Ia_movl_ERX_Id   },
-  /* BF */ { 0, &Ia_movl_ERX_Id   },
-  /* C0 */ { GRPN(G2Eb)           },
-  /* C1 */ { GRPN(G2Ed)           },
-  /* C2 */ { 0, &Ia_ret_Iw        },
-  /* C3 */ { 0, &Ia_ret           },
-  /* C4 */ { 0, &Ia_lesl_Gd_Mp    },
-  /* C5 */ { 0, &Ia_ldsl_Gd_Mp    },
-  /* C6 */ { 0, &Ia_movb_Eb_Ib    },
-  /* C7 */ { 0, &Ia_movl_Ed_Id    },
-  /* C8 */ { 0, &Ia_enter         },
-  /* C9 */ { 0, &Ia_leave         },
-  /* CA */ { 0, &Ia_lret_Iw       },
-  /* CB */ { 0, &Ia_lret          },
-  /* CC */ { 0, &Ia_int3          },
-  /* CD */ { 0, &Ia_int_Ib        },
-  /* CE */ { 0, &Ia_into          },
-  /* CF */ { 0, &Ia_iretl         },
-  /* D0 */ { GRPN(G2EbI1)         },
-  /* D1 */ { GRPN(G2EdI1)         },
-  /* D2 */ { GRPN(G2EbCL)         },
-  /* D3 */ { GRPN(G2EdCL)         },
-  /* D4 */ { 0, &Ia_aam           },
-  /* D5 */ { 0, &Ia_aad           },
-  /* D6 */ { 0, &Ia_salc          },
-  /* D7 */ { 0, &Ia_xlat          },
-  /* D8 */ { GRPFP(D8)            },
-  /* D9 */ { GRPFP(D9)            },
-  /* DA */ { GRPFP(DA)            },
-  /* DB */ { GRPFP(DB)            },
-  /* DC */ { GRPFP(DC)            },
-  /* DD */ { GRPFP(DD)            },
-  /* DE */ { GRPFP(DE)            },
-  /* DF */ { GRPFP(DF)            },
-  /* E0 */ { 0, &Ia_loopne_Jb     },
-  /* E1 */ { 0, &Ia_loope_Jb      },
-  /* E2 */ { 0, &Ia_loop_Jb       },
-  /* E3 */ { 0, &Ia_jcxz_Jb       },
-  /* E4 */ { 0, &Ia_inb_AL_Ib     },
-  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
-  /* E6 */ { 0, &Ia_outb_Ib_AL    },
-  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
-  /* E8 */ { 0, &Ia_call_Jd       },
-  /* E9 */ { 0, &Ia_jmp_Jd        },
-  /* EA */ { 0, &Ia_ljmp_Apd      },
-  /* EB */ { 0, &Ia_jmp_Jb        },
-  /* EC */ { 0, &Ia_inb_AL_DX     },
-  /* ED */ { 0, &Ia_inl_EAX_DX    },
-  /* EE */ { 0, &Ia_outb_DX_AL    },
-  /* EF */ { 0, &Ia_outl_DX_EAX   },
-  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
-  /* F1 */ { 0, &Ia_int1          },
-  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
-  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
-  /* F4 */ { 0, &Ia_hlt           },
-  /* F5 */ { 0, &Ia_cmc           },
-  /* F6 */ { GRPN(G3Eb)           },
-  /* F7 */ { GRPN(G3Ed)           },
-  /* F8 */ { 0, &Ia_clc           },
-  /* F9 */ { 0, &Ia_stc           },
-  /* FA */ { 0, &Ia_cli           },
-  /* FB */ { 0, &Ia_sti           },
-  /* FC */ { 0, &Ia_cld           },
-  /* FD */ { 0, &Ia_std           },
-  /* FE */ { GRPN(G4)             },
-  /* FF */ { GRPN(G5d)            },
-
-  // 256 entries for two byte opcodes
-  /* 0F 00 */ { GRPN(G6)          },
-  /* 0F 01 */ { GRPN(G7)          },
-  /* 0F 02 */ { 0, &Ia_larl_Gd_Ew },
-  /* 0F 03 */ { 0, &Ia_lsll_Gd_Ew },
-  /* 0F 04 */ { 0, &Ia_Invalid    },
-  /* 0F 05 */ { 0, &Ia_syscall    },
-  /* 0F 06 */ { 0, &Ia_clts       },
-  /* 0F 07 */ { 0, &Ia_sysret     },
-  /* 0F 08 */ { 0, &Ia_invd       },
-  /* 0F 09 */ { 0, &Ia_wbinvd     },
-  /* 0F 0A */ { 0, &Ia_Invalid    },
-  /* 0F 0B */ { 0, &Ia_ud2a       },
-  /* 0F 0C */ { 0, &Ia_Invalid    },
-  /* 0F 0D */ { 0, &Ia_prefetch   },   // 3DNow!
-  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
-  /* 0F 0F */ { GRP3DNOW          },
-  /* 0F 10 */ { GRPSSE(0f10)      },
-  /* 0F 11 */ { GRPSSE(0f11)      },
-  /* 0F 12 */ { GRPSSE(0f12)      },
-  /* 0F 13 */ { GRPSSE(0f13)      },
-  /* 0F 14 */ { GRPSSE(0f14)      },
-  /* 0F 15 */ { GRPSSE(0f15)      },
-  /* 0F 16 */ { GRPSSE(0f16)      },
-  /* 0F 17 */ { GRPSSE(0f17)      },
-  /* 0F 18 */ { GRPN(G16)         },
-  /* 0F 19 */ { 0, &Ia_Invalid    },
-  /* 0F 1A */ { 0, &Ia_Invalid    },
-  /* 0F 1B */ { 0, &Ia_Invalid    },
-  /* 0F 1C */ { 0, &Ia_Invalid    },
-  /* 0F 1D */ { 0, &Ia_Invalid    },
-  /* 0F 1E */ { 0, &Ia_Invalid    },
-  /* 0F 1F */ { 0, &Ia_multibyte_nop },
-  /* 0F 20 */ { 0, &Ia_movl_Rd_Cd },
-  /* 0F 21 */ { 0, &Ia_movl_Rd_Dd },
-  /* 0F 22 */ { 0, &Ia_movl_Cd_Rd },
-  /* 0F 23 */ { 0, &Ia_movl_Dd_Rd },
-  /* 0F 24 */ { 0, &Ia_movl_Rd_Td },
-  /* 0F 25 */ { 0, &Ia_Invalid    },
-  /* 0F 26 */ { 0, &Ia_movl_Td_Rd },
-  /* 0F 27 */ { 0, &Ia_Invalid    },
-  /* 0F 28 */ { GRPSSE(0f28) },
-  /* 0F 29 */ { GRPSSE(0f29) },
-  /* 0F 2A */ { GRPSSE(0f2a) },
-  /* 0F 2B */ { GRPSSE(0f2b) },
-  /* 0F 2C */ { GRPSSE(0f2c) },
-  /* 0F 2D */ { GRPSSE(0f2d) },
-  /* 0F 2E */ { GRPSSE(0f2e) },
-  /* 0F 2F */ { GRPSSE(0f2f) },
-  /* 0F 30 */ { 0, &Ia_wrmsr },
-  /* 0F 31 */ { 0, &Ia_rdtsc },
-  /* 0F 32 */ { 0, &Ia_rdmsr },
-  /* 0F 33 */ { 0, &Ia_rdpmc },
-  /* 0F 34 */ { 0, &Ia_sysenter },
-  /* 0F 35 */ { 0, &Ia_sysexit  },
-  /* 0F 36 */ { 0, &Ia_Invalid  },
-  /* 0F 37 */ { 0, &Ia_Invalid  },
-  /* 0F 38 */ { GR3BTAB(A4) },
-  /* 0F 39 */ { 0, &Ia_Invalid  },
-  /* 0F 3A */ { GR3BTAB(A5) },
-  /* 0F 3B */ { 0, &Ia_Invalid  },
-  /* 0F 3C */ { 0, &Ia_Invalid  },
-  /* 0F 3D */ { 0, &Ia_Invalid  },
-  /* 0F 3E */ { 0, &Ia_Invalid  },
-  /* 0F 3F */ { 0, &Ia_Invalid  },
-  /* 0F 40 */ { 0, &Ia_cmovol_Gd_Ed  },
-  /* 0F 41 */ { 0, &Ia_cmovnol_Gd_Ed },
-  /* 0F 42 */ { 0, &Ia_cmovcl_Gd_Ed  },
-  /* 0F 43 */ { 0, &Ia_cmovncl_Gd_Ed },
-  /* 0F 44 */ { 0, &Ia_cmovzl_Gd_Ed  },
-  /* 0F 45 */ { 0, &Ia_cmovnzl_Gd_Ed },
-  /* 0F 46 */ { 0, &Ia_cmovnal_Gd_Ed },
-  /* 0F 47 */ { 0, &Ia_cmoval_Gd_Ed  },
-  /* 0F 48 */ { 0, &Ia_cmovsl_Gd_Ed  },
-  /* 0F 49 */ { 0, &Ia_cmovnsl_Gd_Ed },
-  /* 0F 4A */ { 0, &Ia_cmovpl_Gd_Ed  },
-  /* 0F 4B */ { 0, &Ia_cmovnpl_Gd_Ed },
-  /* 0F 4C */ { 0, &Ia_cmovll_Gd_Ed  },
-  /* 0F 4D */ { 0, &Ia_cmovnll_Gd_Ed },
-  /* 0F 4E */ { 0, &Ia_cmovngl_Gd_Ed },
-  /* 0F 4F */ { 0, &Ia_cmovgl_Gd_Ed  },
-  /* 0F 50 */ { GRPSSE(0f50) },
-  /* 0F 51 */ { GRPSSE(0f51) },
-  /* 0F 52 */ { GRPSSE(0f52) },
-  /* 0F 53 */ { GRPSSE(0f53) },
-  /* 0F 54 */ { GRPSSE(0f54) },
-  /* 0F 55 */ { GRPSSE(0f55) },
-  /* 0F 56 */ { GRPSSE(0f56) },
-  /* 0F 57 */ { GRPSSE(0f57) },
-  /* 0F 58 */ { GRPSSE(0f58) },
-  /* 0F 59 */ { GRPSSE(0f59) },
-  /* 0F 5A */ { GRPSSE(0f5a) },
-  /* 0F 5B */ { GRPSSE(0f5b) },
-  /* 0F 5C */ { GRPSSE(0f5c) },
-  /* 0F 5D */ { GRPSSE(0f5d) },
-  /* 0F 5E */ { GRPSSE(0f5e) },
-  /* 0F 5F */ { GRPSSE(0f5f) },
-  /* 0F 60 */ { GRPSSE(0f60) },
-  /* 0F 61 */ { GRPSSE(0f61) },
-  /* 0F 62 */ { GRPSSE(0f62) },
-  /* 0F 63 */ { GRPSSE(0f63) },
-  /* 0F 64 */ { GRPSSE(0f64) },
-  /* 0F 65 */ { GRPSSE(0f65) },
-  /* 0F 66 */ { GRPSSE(0f66) },
-  /* 0F 67 */ { GRPSSE(0f67) },
-  /* 0F 68 */ { GRPSSE(0f68) },
-  /* 0F 69 */ { GRPSSE(0f69) },
-  /* 0F 6A */ { GRPSSE(0f6a) },
-  /* 0F 6B */ { GRPSSE(0f6b) },
-  /* 0F 6C */ { GRPSSE(0f6c) },
-  /* 0F 6D */ { GRPSSE(0f6d) },
-  /* 0F 6E */ { GRPSSE(0f6e) },
-  /* 0F 6F */ { GRPSSE(0f6f) },
-  /* 0F 70 */ { GRPSSE(0f70) },
-  /* 0F 71 */ { GRPN(G12)    },
-  /* 0F 72 */ { GRPN(G13)    },
-  /* 0F 73 */ { GRPN(G14)    },
-  /* 0F 74 */ { GRPSSE(0f74) },
-  /* 0F 75 */ { GRPSSE(0f75) },
-  /* 0F 76 */ { GRPSSE(0f76) },
-  /* 0F 77 */ { 0, &Ia_emms  },
-  /* 0F 78 */ { 0, &Ia_Invalid },
-  /* 0F 79 */ { 0, &Ia_Invalid },
-  /* 0F 7A */ { 0, &Ia_Invalid },
-  /* 0F 7B */ { 0, &Ia_Invalid },
-  /* 0F 7C */ { GRPSSE(0f7c) },
-  /* 0F 7D */ { GRPSSE(0f7d) },
-  /* 0F 7E */ { GRPSSE(0f7e) },
-  /* 0F 7F */ { GRPSSE(0f7f) },
-  /* 0F 80 */ { 0, &Ia_jo_Jd     },
-  /* 0F 81 */ { 0, &Ia_jno_Jd    },
-  /* 0F 82 */ { 0, &Ia_jb_Jd     },
-  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
-  /* 0F 84 */ { 0, &Ia_jz_Jd     },
-  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
-  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
-  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
-  /* 0F 88 */ { 0, &Ia_js_Jd     },
-  /* 0F 89 */ { 0, &Ia_jns_Jd    },
-  /* 0F 8A */ { 0, &Ia_jp_Jd     },
-  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
-  /* 0F 8C */ { 0, &Ia_jl_Jd     },
-  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
-  /* 0F 8E */ { 0, &Ia_jle_Jd    },
-  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
-  /* 0F 90 */ { 0, &Ia_seto_Eb   },
-  /* 0F 91 */ { 0, &Ia_setno_Eb  },
-  /* 0F 92 */ { 0, &Ia_setb_Eb   },
-  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
-  /* 0F 94 */ { 0, &Ia_setz_Eb   },
-  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
-  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
-  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
-  /* 0F 98 */ { 0, &Ia_sets_Eb   },
-  /* 0F 99 */ { 0, &Ia_setns_Eb  },
-  /* 0F 9A */ { 0, &Ia_setp_Eb   },
-  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
-  /* 0F 9C */ { 0, &Ia_setl_Eb   },
-  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
-  /* 0F 9E */ { 0, &Ia_setle_Eb  },
-  /* 0F 9F */ { 0, &Ia_setnle_Eb },
-  /* 0F A0 */ { 0, &Ia_pushl_FS  },
-  /* 0F A1 */ { 0, &Ia_popl_FS   },
-  /* 0F A2 */ { 0, &Ia_cpuid     },
-  /* 0F A3 */ { 0, &Ia_btl_Ed_Gd },
-  /* 0F A4 */ { 0, &Ia_shldl_Ed_Gd_Ib },
-  /* 0F A5 */ { 0, &Ia_shldl_Ed_Gd_CL },
-  /* 0F A6 */ { 0, &Ia_Invalid    },
-  /* 0F A7 */ { 0, &Ia_Invalid    },
-  /* 0F A8 */ { 0, &Ia_pushl_GS   },
-  /* 0F A9 */ { 0, &Ia_popl_GS    },
-  /* 0F AA */ { 0, &Ia_rsm        },
-  /* 0F AB */ { 0, &Ia_btsl_Ed_Gd },
-  /* 0F AC */ { 0, &Ia_shrdl_Ed_Gd_Ib },
-  /* 0F AD */ { 0, &Ia_shrdl_Ed_Gd_CL },
-  /* 0F AE */ { GRPN(G15)         },
-  /* 0F AF */ { 0, &Ia_imull_Gd_Ed    },
-  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
-  /* 0F B1 */ { 0, &Ia_cmpxchgl_Ed_Gd },
-  /* 0F B2 */ { 0, &Ia_lssl_Gd_Mp   },
-  /* 0F B3 */ { 0, &Ia_btrl_Ed_Gd   },
-  /* 0F B4 */ { 0, &Ia_lfsl_Gd_Mp   },
-  /* 0F B5 */ { 0, &Ia_lgsl_Gd_Mp   },
-  /* 0F B6 */ { 0, &Ia_movzbl_Gd_Eb },
-  /* 0F B7 */ { 0, &Ia_movzwl_Gd_Ew },
-  /* 0F B8 */ { 0, &Ia_Invalid      },
-  /* 0F B9 */ { 0, &Ia_ud2b         },
-  /* 0F BA */ { GRPN(G8EdIb)        },
-  /* 0F BB */ { 0, &Ia_btcl_Ed_Gd   },
-  /* 0F BC */ { 0, &Ia_bsfl_Gd_Ed   },
-  /* 0F BD */ { 0, &Ia_bsrl_Gd_Ed   },
-  /* 0F BE */ { 0, &Ia_movsbl_Gd_Eb },
-  /* 0F BF */ { 0, &Ia_movswl_Gd_Ew },
-  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
-  /* 0F C0 */ { 0, &Ia_xaddl_Ed_Gd  },
-  /* 0F C2 */ { GRPSSE(0fc2)      },
-  /* 0F C3 */ { GRPSSE(0fc3)      },
-  /* 0F C4 */ { GRPSSE(0fc4)      },
-  /* 0F C5 */ { GRPSSE(0fc5)      },
-  /* 0F C6 */ { GRPSSE(0fc6)      },
-  /* 0F C7 */ { GRPN(G9)          },
-  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
-  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
-  /* 0F CA */ { 0, &Ia_bswapl_ERX },
-  /* 0F CB */ { 0, &Ia_bswapl_ERX },
-  /* 0F CC */ { 0, &Ia_bswapl_ERX },
-  /* 0F CD */ { 0, &Ia_bswapl_ERX },
-  /* 0F CE */ { 0, &Ia_bswapl_ERX },
-  /* 0F CF */ { 0, &Ia_bswapl_ERX },
-  /* 0F D0 */ { GRPSSE(0fd0) },
-  /* 0F D1 */ { GRPSSE(0fd1) },
-  /* 0F D2 */ { GRPSSE(0fd2) },
-  /* 0F D3 */ { GRPSSE(0fd3) },
-  /* 0F D4 */ { GRPSSE(0fd4) },
-  /* 0F D5 */ { GRPSSE(0fd5) },
-  /* 0F D6 */ { GRPSSE(0fd6) },
-  /* 0F D7 */ { GRPSSE(0fd7) },
-  /* 0F D8 */ { GRPSSE(0fd8) },
-  /* 0F D9 */ { GRPSSE(0fd9) },
-  /* 0F DA */ { GRPSSE(0fda) },
-  /* 0F DB */ { GRPSSE(0fdb) },
-  /* 0F DC */ { GRPSSE(0fdc) },
-  /* 0F DD */ { GRPSSE(0fdd) },
-  /* 0F DE */ { GRPSSE(0fde) },
-  /* 0F DF */ { GRPSSE(0fdf) },
-  /* 0F E0 */ { GRPSSE(0fe0) },
-  /* 0F E1 */ { GRPSSE(0fe1) },
-  /* 0F E2 */ { GRPSSE(0fe2) },
-  /* 0F E3 */ { GRPSSE(0fe3) },
-  /* 0F E4 */ { GRPSSE(0fe4) },
-  /* 0F E5 */ { GRPSSE(0fe5) },
-  /* 0F E6 */ { GRPSSE(0fe6) },
-  /* 0F E7 */ { GRPSSE(0fe7) },
-  /* 0F E8 */ { GRPSSE(0fe8) },
-  /* 0F E9 */ { GRPSSE(0fe9) },
-  /* 0F EA */ { GRPSSE(0fea) },
-  /* 0F EB */ { GRPSSE(0feb) },
-  /* 0F EC */ { GRPSSE(0fec) },
-  /* 0F ED */ { GRPSSE(0fed) },
-  /* 0F EE */ { GRPSSE(0fee) },
-  /* 0F EF */ { GRPSSE(0fef) },
-  /* 0F F0 */ { GRPSSE(0ff0) },
-  /* 0F F1 */ { GRPSSE(0ff1) },
-  /* 0F F2 */ { GRPSSE(0ff2) },
-  /* 0F F3 */ { GRPSSE(0ff3) },
-  /* 0F F4 */ { GRPSSE(0ff4) },
-  /* 0F F5 */ { GRPSSE(0ff5) },
-  /* 0F F6 */ { GRPSSE(0ff6) },
-  /* 0F F7 */ { GRPSSE(0ff7) },
-  /* 0F F8 */ { GRPSSE(0ff8) },
-  /* 0F F9 */ { GRPSSE(0ff9) },
-  /* 0F FA */ { GRPSSE(0ffa) },
-  /* 0F FB */ { GRPSSE(0ffb) },
-  /* 0F FC */ { GRPSSE(0ffc) },
-  /* 0F FD */ { GRPSSE(0ffd) },
-  /* 0F FE */ { GRPSSE(0ffe) },
-  /* 0F FF */ { 0, &Ia_Invalid }
-};
-
-/* ************************************************************************ */
-/* Long mode */
-
-static BxDisasmOpcodeTable_t BxDisasmOpcodes64w[256*2] = {
-  // 256 entries for single byte opcodes
-  /* 00 */ { 0, &Ia_addb_Eb_Gb },
-  /* 01 */ { 0, &Ia_addw_Ew_Gw },
-  /* 02 */ { 0, &Ia_addb_Gb_Eb },
-  /* 03 */ { 0, &Ia_addw_Gw_Ew },
-  /* 04 */ { 0, &Ia_addb_AL_Ib },
-  /* 05 */ { 0, &Ia_addw_AX_Iw },
-  /* 06 */ { 0, &Ia_Invalid    },
-  /* 07 */ { 0, &Ia_Invalid    },
-  /* 08 */ { 0, &Ia_orb_Eb_Gb  },
-  /* 09 */ { 0, &Ia_orw_Ew_Gw  },
-  /* 0A */ { 0, &Ia_orb_Gb_Eb  },
-  /* 0B */ { 0, &Ia_orw_Gw_Ew  },
-  /* 0C */ { 0, &Ia_orb_AL_Ib  },
-  /* 0D */ { 0, &Ia_orw_AX_Iw  },
-  /* 0E */ { 0, &Ia_Invalid    },
-  /* 0F */ { 0, &Ia_error      },   // 2 byte escape
-  /* 10 */ { 0, &Ia_adcb_Eb_Gb },
-  /* 11 */ { 0, &Ia_adcw_Ew_Gw },
-  /* 12 */ { 0, &Ia_adcb_Gb_Eb },
-  /* 13 */ { 0, &Ia_adcw_Gw_Ew },
-  /* 14 */ { 0, &Ia_adcb_AL_Ib },
-  /* 15 */ { 0, &Ia_adcw_AX_Iw },
-  /* 16 */ { 0, &Ia_Invalid    },
-  /* 17 */ { 0, &Ia_Invalid    },
-  /* 18 */ { 0, &Ia_sbbb_Eb_Gb },
-  /* 19 */ { 0, &Ia_sbbw_Ew_Gw },
-  /* 1A */ { 0, &Ia_sbbb_Gb_Eb },
-  /* 1B */ { 0, &Ia_sbbw_Gw_Ew },
-  /* 1C */ { 0, &Ia_sbbb_AL_Ib },
-  /* 1D */ { 0, &Ia_sbbw_AX_Iw },
-  /* 1E */ { 0, &Ia_Invalid    },
-  /* 1F */ { 0, &Ia_Invalid    },
-  /* 20 */ { 0, &Ia_andb_Eb_Gb },
-  /* 21 */ { 0, &Ia_andw_Ew_Gw },
-  /* 22 */ { 0, &Ia_andb_Gb_Eb },
-  /* 23 */ { 0, &Ia_andw_Gw_Ew },
-  /* 24 */ { 0, &Ia_andb_AL_Ib },
-  /* 25 */ { 0, &Ia_andw_AX_Iw },
-  /* 26 */ { 0, &Ia_prefix_es  },   // ES:
-  /* 27 */ { 0, &Ia_Invalid    },
-  /* 28 */ { 0, &Ia_subb_Eb_Gb },
-  /* 29 */ { 0, &Ia_subw_Ew_Gw },
-  /* 2A */ { 0, &Ia_subb_Gb_Eb },
-  /* 2B */ { 0, &Ia_subw_Gw_Ew },
-  /* 2C */ { 0, &Ia_subb_AL_Ib },
-  /* 2D */ { 0, &Ia_subw_AX_Iw },
-  /* 2E */ { 0, &Ia_prefix_cs  },   // CS:
-  /* 2F */ { 0, &Ia_Invalid    },
-  /* 30 */ { 0, &Ia_xorb_Eb_Gb },
-  /* 31 */ { 0, &Ia_xorw_Ew_Gw },
-  /* 32 */ { 0, &Ia_xorb_Gb_Eb },
-  /* 33 */ { 0, &Ia_xorw_Gw_Ew },
-  /* 34 */ { 0, &Ia_xorb_AL_Ib },
-  /* 35 */ { 0, &Ia_xorw_AX_Iw },
-  /* 36 */ { 0, &Ia_prefix_ss  },   // SS:
-  /* 37 */ { 0, &Ia_Invalid    },
-  /* 38 */ { 0, &Ia_cmpb_Eb_Gb },
-  /* 39 */ { 0, &Ia_cmpw_Ew_Gw },
-  /* 3A */ { 0, &Ia_cmpb_Gb_Eb },
-  /* 3B */ { 0, &Ia_cmpw_Gw_Ew },
-  /* 3C */ { 0, &Ia_cmpb_AL_Ib },
-  /* 3D */ { 0, &Ia_cmpw_AX_Iw },
-  /* 3E */ { 0, &Ia_prefix_ds  },   // DS:
-  /* 3F */ { 0, &Ia_Invalid    },
-  /* 40 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 41 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 42 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 43 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 44 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 45 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 46 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 47 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 48 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 49 */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4A */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4B */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4C */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4D */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4E */ { 0, &Ia_prefix_rex },   // REX:
-  /* 4F */ { 0, &Ia_prefix_rex },   // REX:
-  /* 50 */ { 0, &Ia_pushw_RX   },
-  /* 51 */ { 0, &Ia_pushw_RX   },
-  /* 52 */ { 0, &Ia_pushw_RX   },
-  /* 53 */ { 0, &Ia_pushw_RX   },
-  /* 54 */ { 0, &Ia_pushw_RX   },
-  /* 55 */ { 0, &Ia_pushw_RX   },
-  /* 56 */ { 0, &Ia_pushw_RX   },
-  /* 57 */ { 0, &Ia_pushw_RX   },
-  /* 58 */ { 0, &Ia_popw_RX    },
-  /* 59 */ { 0, &Ia_popw_RX    },
-  /* 5A */ { 0, &Ia_popw_RX    },
-  /* 5B */ { 0, &Ia_popw_RX    },
-  /* 5C */ { 0, &Ia_popw_RX    },
-  /* 5D */ { 0, &Ia_popw_RX    },
-  /* 5E */ { 0, &Ia_popw_RX    },
-  /* 5F */ { 0, &Ia_popw_RX    },
-  /* 60 */ { 0, &Ia_Invalid    },
-  /* 61 */ { 0, &Ia_Invalid    },
-  /* 62 */ { 0, &Ia_Invalid    },
-  /* 63 */ { 0, &Ia_movw_Gw_Ew },
-  /* 64 */ { 0, &Ia_prefix_fs  },   // FS:
-  /* 65 */ { 0, &Ia_prefix_gs  },   // GS:
-  /* 66 */ { 0, &Ia_prefix_osize }, // OSIZE:
-  /* 67 */ { 0, &Ia_prefix_asize }, // ASIZE:
-  /* 68 */ { 0, &Ia_pushw_Iw    },
-  /* 69 */ { 0, &Ia_imulw_Gw_Ew_Iw  },
-  /* 6A */ { 0, &Ia_pushw_sIb   },
-  /* 6B */ { 0, &Ia_imulw_Gw_Ew_sIb },
-  /* 6C */ { 0, &Ia_insb_Yb_DX  },
-  /* 6D */ { 0, &Ia_insw_Yw_DX  },
-  /* 6E */ { 0, &Ia_outsb_DX_Xb },
-  /* 6F */ { 0, &Ia_outsw_DX_Xw },
-  /* 70 */ { 0, &Ia_jo_Jb       },
-  /* 71 */ { 0, &Ia_jno_Jb      },
-  /* 72 */ { 0, &Ia_jb_Jb       },
-  /* 73 */ { 0, &Ia_jnb_Jb      },
-  /* 74 */ { 0, &Ia_jz_Jb       },
-  /* 75 */ { 0, &Ia_jnz_Jb      },
-  /* 76 */ { 0, &Ia_jbe_Jb      },
-  /* 77 */ { 0, &Ia_jnbe_Jb     },
-  /* 78 */ { 0, &Ia_js_Jb       },
-  /* 79 */ { 0, &Ia_jns_Jb      },
-  /* 7A */ { 0, &Ia_jp_Jb       },
-  /* 7B */ { 0, &Ia_jnp_Jb      },
-  /* 7C */ { 0, &Ia_jl_Jb       },
-  /* 7D */ { 0, &Ia_jnl_Jb      },
-  /* 7E */ { 0, &Ia_jle_Jb      },
-  /* 7F */ { 0, &Ia_jnle_Jb     },
-  /* 80 */ { GRPN(G1EbIb)       },
-  /* 81 */ { GRPN(G1EwIw)       },
-  /* 82 */ { 9, &Ia_Invalid     },
-  /* 83 */ { GRPN(G1EwIb)       },
-  /* 84 */ { 0, &Ia_testb_Eb_Gb },
-  /* 85 */ { 0, &Ia_testw_Ew_Gw },
-  /* 86 */ { 0, &Ia_xchgb_Eb_Gb },
-  /* 87 */ { 0, &Ia_xchgw_Ew_Gw },
-  /* 88 */ { 0, &Ia_movb_Eb_Gb  },
-  /* 89 */ { 0, &Ia_movw_Ew_Gw  },
-  /* 8A */ { 0, &Ia_movb_Gb_Eb  },
-  /* 8B */ { 0, &Ia_movw_Gw_Ew  },
-  /* 8C */ { 0, &Ia_movw_Ew_Sw  },
-  /* 8D */ { 0, &Ia_leaw_Gw_Mw  },
-  /* 8E */ { 0, &Ia_movw_Sw_Ew  },
-  /* 8F */ { 0, &Ia_popw_Ew     },
-  /* 90 */ { 0, &Ia_xchgw_RX_AX }, // handle XCHG R8w, AX
-  /* 91 */ { 0, &Ia_xchgw_RX_AX },
-  /* 92 */ { 0, &Ia_xchgw_RX_AX },
-  /* 93 */ { 0, &Ia_xchgw_RX_AX },
-  /* 94 */ { 0, &Ia_xchgw_RX_AX },
-  /* 95 */ { 0, &Ia_xchgw_RX_AX },
-  /* 96 */ { 0, &Ia_xchgw_RX_AX },
-  /* 97 */ { 0, &Ia_xchgw_RX_AX },
-  /* 98 */ { 0, &Ia_cbw         },
-  /* 99 */ { 0, &Ia_cwd         },
-  /* 9A */ { 0, &Ia_Invalid     },
-  /* 9B */ { 0, &Ia_fwait       },
-  /* 9C */ { 0, &Ia_pushfw      },
-  /* 9D */ { 0, &Ia_popfw       },
-  /* 9E */ { 0, &Ia_sahf        },
-  /* 9F */ { 0, &Ia_lahf        },
-  /* A0 */ { 0, &Ia_movb_AL_Ob  },
-  /* A1 */ { 0, &Ia_movw_AX_Ow  },
-  /* A0 */ { 0, &Ia_movb_Ob_AL  },
-  /* A1 */ { 0, &Ia_movw_Ow_AX  },
-  /* A4 */ { 0, &Ia_movsb_Yb_Xb },
-  /* A5 */ { 0, &Ia_movsw_Yw_Xw },
-  /* A6 */ { 0, &Ia_cmpsb_Yb_Xb },
-  /* A7 */ { 0, &Ia_cmpsw_Yw_Xw },
-  /* A8 */ { 0, &Ia_testb_AL_Ib },
-  /* A9 */ { 0, &Ia_testw_AX_Iw },
-  /* AA */ { 0, &Ia_stosb_Yb_AL },
-  /* AB */ { 0, &Ia_stosw_Yw_AX },
-  /* AC */ { 0, &Ia_lodsb_AL_Xb },
-  /* AD */ { 0, &Ia_lodsw_AX_Xw },
-  /* AE */ { 0, &Ia_scasb_Yb_AL },
-  /* AF */ { 0, &Ia_scasw_Yw_AX },
-  /* B0 */ { 0, &Ia_movb_R8_Ib  },
-  /* B1 */ { 0, &Ia_movb_R8_Ib  },
-  /* B2 */ { 0, &Ia_movb_R8_Ib  },
-  /* B3 */ { 0, &Ia_movb_R8_Ib  },
-  /* B4 */ { 0, &Ia_movb_R8_Ib  },
-  /* B5 */ { 0, &Ia_movb_R8_Ib  },
-  /* B6 */ { 0, &Ia_movb_R8_Ib  },
-  /* B7 */ { 0, &Ia_movb_R8_Ib  },
-  /* B8 */ { 0, &Ia_movw_RX_Iw  },
-  /* B9 */ { 0, &Ia_movw_RX_Iw  },
-  /* BA */ { 0, &Ia_movw_RX_Iw  },
-  /* BB */ { 0, &Ia_movw_RX_Iw  },
-  /* BC */ { 0, &Ia_movw_RX_Iw  },
-  /* BD */ { 0, &Ia_movw_RX_Iw  },
-  /* BE */ { 0, &Ia_movw_RX_Iw  },
-  /* BF */ { 0, &Ia_movw_RX_Iw  },
-  /* C0 */ { GRPN(G2Eb)         },
-  /* C1 */ { GRPN(G2Ew)         },
-  /* C2 */ { 0, &Ia_ret_Iw      },
-  /* C3 */ { 0, &Ia_ret         },
-  /* C4 */ { 0, &Ia_Invalid     },
-  /* C5 */ { 0, &Ia_Invalid     },
-  /* C6 */ { 0, &Ia_movb_Eb_Ib  },
-  /* C7 */ { 0, &Ia_movw_Ew_Iw  },
-  /* C8 */ { 0, &Ia_enter       },
-  /* C9 */ { 0, &Ia_leave       },
-  /* CA */ { 0, &Ia_lret_Iw     },
-  /* CB */ { 0, &Ia_lret        },
-  /* CC */ { 0, &Ia_int3        },
-  /* CD */ { 0, &Ia_int_Ib      },
-  /* CE */ { 0, &Ia_Invalid     },
-  /* CF */ { 0, &Ia_iretw       },
-  /* D0 */ { GRPN(G2EbI1)       },
-  /* D1 */ { GRPN(G2EwI1)       },
-  /* D2 */ { GRPN(G2EbCL)       },
-  /* D3 */ { GRPN(G2EwCL)       },
-  /* D4 */ { 0, &Ia_Invalid     },
-  /* D5 */ { 0, &Ia_Invalid     },
-  /* D6 */ { 0, &Ia_Invalid     },
-  /* D7 */ { 0, &Ia_xlat        },
-  /* D8 */ { GRPFP(D8)          },
-  /* D9 */ { GRPFP(D9)          },
-  /* DA */ { GRPFP(DA)          },
-  /* DB */ { GRPFP(DB)          },
-  /* DC */ { GRPFP(DC)          },
-  /* DD */ { GRPFP(DD)          },
-  /* DE */ { GRPFP(DE)          },
-  /* DF */ { GRPFP(DF)          },
-  /* E0 */ { 0, &Ia_loopne_Jb   },
-  /* E1 */ { 0, &Ia_loope_Jb    },
-  /* E2 */ { 0, &Ia_loop_Jb     },
-  /* E3 */ { 0, &Ia_jrcxz_Jb    },
-  /* E4 */ { 0, &Ia_inb_AL_Ib   },
-  /* E5 */ { 0, &Ia_inw_AX_Ib   },
-  /* E6 */ { 0, &Ia_outb_Ib_AL  },
-  /* E7 */ { 0, &Ia_outw_Ib_AX  },
-  /* E8 */ { 0, &Ia_call_Jd     },
-  /* E9 */ { 0, &Ia_jmp_Jd      },
-  /* EA */ { 0, &Ia_Invalid     },
-  /* EB */ { 0, &Ia_jmp_Jb      },
-  /* EC */ { 0, &Ia_inb_AL_DX   },
-  /* ED */ { 0, &Ia_inw_AX_DX   },
-  /* EE */ { 0, &Ia_outb_DX_AL  },
-  /* EF */ { 0, &Ia_outw_DX_AX  },
-  /* F0 */ { 0, &Ia_prefix_lock },   // LOCK:
-  /* F1 */ { 0, &Ia_int1        },
-  /* F2 */ { 0, &Ia_prefix_repne },  // REPNE:
-  /* F3 */ { 0, &Ia_prefix_rep  },   // REP:
-  /* F4 */ { 0, &Ia_hlt         },
-  /* F5 */ { 0, &Ia_cmc         },
-  /* F6 */ { GRPN(G3Eb)         },
-  /* F7 */ { GRPN(G3Ew)         },
-  /* F8 */ { 0, &Ia_clc         },
-  /* F9 */ { 0, &Ia_stc         },
-  /* FA */ { 0, &Ia_cli         },
-  /* FB */ { 0, &Ia_sti         },
-  /* FC */ { 0, &Ia_cld         },
-  /* FD */ { 0, &Ia_std         },
-  /* FE */ { GRPN(G4)           },
-  /* FF */ { GRPN(G5w)          },
-
-  // 256 entries for two byte opcodes
-  /* 0F 00 */ { GRPN(G6)          },
-  /* 0F 01 */ { GRPN(G7)          },
-  /* 0F 02 */ { 0, &Ia_larw_Gw_Ew },
-  /* 0F 03 */ { 0, &Ia_lslw_Gw_Ew },
-  /* 0F 04 */ { 0, &Ia_Invalid    },
-  /* 0F 05 */ { 0, &Ia_syscall    },
-  /* 0F 06 */ { 0, &Ia_clts       },
-  /* 0F 07 */ { 0, &Ia_sysret     },
-  /* 0F 08 */ { 0, &Ia_invd       },
-  /* 0F 09 */ { 0, &Ia_wbinvd     },
-  /* 0F 0A */ { 0, &Ia_Invalid    },
-  /* 0F 0B */ { 0, &Ia_ud2a       },
-  /* 0F 0C */ { 0, &Ia_Invalid    },
-  /* 0F 0D */ { 0, &Ia_prefetch   },   // 3DNow!
-  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
-  /* 0F 0F */ { GRP3DNOW          },
-  /* 0F 10 */ { GRPSSE(0f10)      },
-  /* 0F 11 */ { GRPSSE(0f11)      },
-  /* 0F 12 */ { GRPSSE(0f12)      },
-  /* 0F 13 */ { GRPSSE(0f13)      },
-  /* 0F 14 */ { GRPSSE(0f14)      },
-  /* 0F 15 */ { GRPSSE(0f15)      },
-  /* 0F 16 */ { GRPSSE(0f16)      },
-  /* 0F 17 */ { GRPSSE(0f17)      },
-  /* 0F 18 */ { GRPN(G16)         },
-  /* 0F 19 */ { 0, &Ia_Invalid    },
-  /* 0F 1A */ { 0, &Ia_Invalid    },
-  /* 0F 1B */ { 0, &Ia_Invalid    },
-  /* 0F 1C */ { 0, &Ia_Invalid    },
-  /* 0F 1D */ { 0, &Ia_Invalid    },
-  /* 0F 1E */ { 0, &Ia_Invalid    },
-  /* 0F 1F */ { 0, &Ia_multibyte_nop },
-  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
-  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
-  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
-  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
-  /* 0F 24 */ { 0, &Ia_Invalid    },
-  /* 0F 25 */ { 0, &Ia_Invalid    },
-  /* 0F 26 */ { 0, &Ia_Invalid    },
-  /* 0F 27 */ { 0, &Ia_Invalid    },
-  /* 0F 28 */ { GRPSSE(0f28) },
-  /* 0F 29 */ { GRPSSE(0f29) },
-  /* 0F 2A */ { GRPSSE(0f2a) },
-  /* 0F 2B */ { GRPSSE(0f2b) },
-  /* 0F 2C */ { GRPSSE(0f2c) },
-  /* 0F 2D */ { GRPSSE(0f2d) },
-  /* 0F 2E */ { GRPSSE(0f2e) },
-  /* 0F 2F */ { GRPSSE(0f2f) },
-  /* 0F 30 */ { 0, &Ia_wrmsr },
-  /* 0F 31 */ { 0, &Ia_rdtsc },
-  /* 0F 32 */ { 0, &Ia_rdmsr },
-  /* 0F 33 */ { 0, &Ia_rdpmc },
-  /* 0F 34 */ { 0, &Ia_sysenter },
-  /* 0F 35 */ { 0, &Ia_sysexit  },
-  /* 0F 36 */ { 0, &Ia_Invalid  },
-  /* 0F 37 */ { 0, &Ia_Invalid  },
-  /* 0F 38 */ { GR3BTAB(A4) },
-  /* 0F 39 */ { 0, &Ia_Invalid  },
-  /* 0F 3A */ { GR3BTAB(A5) },
-  /* 0F 3B */ { 0, &Ia_Invalid  },
-  /* 0F 3C */ { 0, &Ia_Invalid  },
-  /* 0F 3D */ { 0, &Ia_Invalid  },
-  /* 0F 3E */ { 0, &Ia_Invalid  },
-  /* 0F 3F */ { 0, &Ia_Invalid  },
-  /* 0F 40 */ { 0, &Ia_cmovow_Gw_Ew  },
-  /* 0F 41 */ { 0, &Ia_cmovnow_Gw_Ew },
-  /* 0F 42 */ { 0, &Ia_cmovcw_Gw_Ew  },
-  /* 0F 43 */ { 0, &Ia_cmovncw_Gw_Ew },
-  /* 0F 44 */ { 0, &Ia_cmovzw_Gw_Ew  },
-  /* 0F 45 */ { 0, &Ia_cmovnzw_Gw_Ew },
-  /* 0F 46 */ { 0, &Ia_cmovnaw_Gw_Ew },
-  /* 0F 47 */ { 0, &Ia_cmovaw_Gw_Ew  },
-  /* 0F 48 */ { 0, &Ia_cmovsw_Gw_Ew  },
-  /* 0F 49 */ { 0, &Ia_cmovnsw_Gw_Ew },
-  /* 0F 4A */ { 0, &Ia_cmovpw_Gw_Ew  },
-  /* 0F 4B */ { 0, &Ia_cmovnpw_Gw_Ew },
-  /* 0F 4C */ { 0, &Ia_cmovlw_Gw_Ew  },
-  /* 0F 4D */ { 0, &Ia_cmovnlw_Gw_Ew },
-  /* 0F 4E */ { 0, &Ia_cmovngw_Gw_Ew },
-  /* 0F 4F */ { 0, &Ia_cmovgw_Gw_Ew  },
-  /* 0F 50 */ { GRPSSE(0f50) },
-  /* 0F 51 */ { GRPSSE(0f51) },
-  /* 0F 52 */ { GRPSSE(0f52) },
-  /* 0F 53 */ { GRPSSE(0f53) },
-  /* 0F 54 */ { GRPSSE(0f54) },
-  /* 0F 55 */ { GRPSSE(0f55) },
-  /* 0F 56 */ { GRPSSE(0f56) },
-  /* 0F 57 */ { GRPSSE(0f57) },
-  /* 0F 58 */ { GRPSSE(0f58) },
-  /* 0F 59 */ { GRPSSE(0f59) },
-  /* 0F 5A */ { GRPSSE(0f5a) },
-  /* 0F 5B */ { GRPSSE(0f5b) },
-  /* 0F 5C */ { GRPSSE(0f5c) },
-  /* 0F 5D */ { GRPSSE(0f5d) },
-  /* 0F 5E */ { GRPSSE(0f5e) },
-  /* 0F 5F */ { GRPSSE(0f5f) },
-  /* 0F 60 */ { GRPSSE(0f60) },
-  /* 0F 61 */ { GRPSSE(0f61) },
-  /* 0F 62 */ { GRPSSE(0f62) },
-  /* 0F 63 */ { GRPSSE(0f63) },
-  /* 0F 64 */ { GRPSSE(0f64) },
-  /* 0F 65 */ { GRPSSE(0f65) },
-  /* 0F 66 */ { GRPSSE(0f66) },
-  /* 0F 67 */ { GRPSSE(0f67) },
-  /* 0F 68 */ { GRPSSE(0f68) },
-  /* 0F 69 */ { GRPSSE(0f69) },
-  /* 0F 6A */ { GRPSSE(0f6a) },
-  /* 0F 6B */ { GRPSSE(0f6b) },
-  /* 0F 6C */ { GRPSSE(0f6c) },
-  /* 0F 6D */ { GRPSSE(0f6d) },
-  /* 0F 6E */ { GRPSSE(0f6e) },
-  /* 0F 6F */ { GRPSSE(0f6f) },
-  /* 0F 70 */ { GRPSSE(0f70) },
-  /* 0F 71 */ { GRPN(G12)    },
-  /* 0F 72 */ { GRPN(G13)    },
-  /* 0F 73 */ { GRPN(G14)    },
-  /* 0F 74 */ { GRPSSE(0f74) },
-  /* 0F 75 */ { GRPSSE(0f75) },
-  /* 0F 76 */ { GRPSSE(0f76) },
-  /* 0F 77 */ { 0, &Ia_emms  },
-  /* 0F 78 */ { 0, &Ia_Invalid },
-  /* 0F 79 */ { 0, &Ia_Invalid },
-  /* 0F 7A */ { 0, &Ia_Invalid },
-  /* 0F 7B */ { 0, &Ia_Invalid },
-  /* 0F 7C */ { GRPSSE(0f7c) },
-  /* 0F 7D */ { GRPSSE(0f7d) },
-  /* 0F 7E */ { GRPSSE(0f7e) },
-  /* 0F 7F */ { GRPSSE(0f7f) },
-  /* 0F 80 */ { 0, &Ia_jo_Jd     },
-  /* 0F 81 */ { 0, &Ia_jno_Jd    },
-  /* 0F 82 */ { 0, &Ia_jb_Jd     },
-  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
-  /* 0F 84 */ { 0, &Ia_jz_Jd     },
-  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
-  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
-  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
-  /* 0F 88 */ { 0, &Ia_js_Jd     },
-  /* 0F 89 */ { 0, &Ia_jns_Jd    },
-  /* 0F 8A */ { 0, &Ia_jp_Jd     },
-  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
-  /* 0F 8C */ { 0, &Ia_jl_Jd     },
-  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
-  /* 0F 8E */ { 0, &Ia_jle_Jd    },
-  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
-  /* 0F 90 */ { 0, &Ia_seto_Eb   },
-  /* 0F 91 */ { 0, &Ia_setno_Eb  },
-  /* 0F 92 */ { 0, &Ia_setb_Eb   },
-  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
-  /* 0F 94 */ { 0, &Ia_setz_Eb   },
-  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
-  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
-  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
-  /* 0F 98 */ { 0, &Ia_sets_Eb   },
-  /* 0F 99 */ { 0, &Ia_setns_Eb  },
-  /* 0F 9A */ { 0, &Ia_setp_Eb   },
-  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
-  /* 0F 9C */ { 0, &Ia_setl_Eb   },
-  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
-  /* 0F 9E */ { 0, &Ia_setle_Eb  },
-  /* 0F 9F */ { 0, &Ia_setnle_Eb },
-  /* 0F A0 */ { 0, &Ia_pushw_FS  },
-  /* 0F A1 */ { 0, &Ia_popw_FS   },
-  /* 0F A2 */ { 0, &Ia_cpuid     },
-  /* 0F A3 */ { 0, &Ia_btw_Ew_Gw },
-  /* 0F A4 */ { 0, &Ia_shldw_Ew_Gw_Ib },
-  /* 0F A5 */ { 0, &Ia_shldw_Ew_Gw_CL },
-  /* 0F A6 */ { 0, &Ia_Invalid        },
-  /* 0F A7 */ { 0, &Ia_Invalid        },
-  /* 0F A8 */ { 0, &Ia_pushw_GS       },
-  /* 0F A9 */ { 0, &Ia_popw_GS        },
-  /* 0F AA */ { 0, &Ia_rsm            },
-  /* 0F AB */ { 0, &Ia_btsw_Ew_Gw     },
-  /* 0F AC */ { 0, &Ia_shrdw_Ew_Gw_Ib },
-  /* 0F AD */ { 0, &Ia_shrdw_Ew_Gw_CL },
-  /* 0F AE */ { GRPN(G15)             },
-  /* 0F AF */ { 0, &Ia_imulw_Gw_Ew    },
-  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
-  /* 0F B1 */ { 0, &Ia_cmpxchgw_Ew_Gw },
-  /* 0F B2 */ { 0, &Ia_lssw_Gw_Mp     },
-  /* 0F B3 */ { 0, &Ia_btrw_Ew_Gw     },
-  /* 0F B4 */ { 0, &Ia_lfsw_Gw_Mp     },
-  /* 0F B5 */ { 0, &Ia_lgsw_Gw_Mp     },
-  /* 0F B6 */ { 0, &Ia_movzbw_Gw_Eb   },
-  /* 0F B7 */ { 0, &Ia_movw_Gw_Ew     },
-  /* 0F B8 */ { 0, &Ia_Invalid        },
-  /* 0F B9 */ { 0, &Ia_ud2b           },
-  /* 0F BA */ { GRPN(G8EwIb)          },
-  /* 0F BB */ { 0, &Ia_btcw_Ew_Gw     },
-  /* 0F BC */ { 0, &Ia_bsfw_Gw_Ew     },
-  /* 0F BD */ { 0, &Ia_bsrw_Gw_Ew     },
-  /* 0F BE */ { 0, &Ia_movsbw_Gw_Eb   },
-  /* 0F BF */ { 0, &Ia_movw_Gw_Ew     },
-  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb    },
-  /* 0F C0 */ { 0, &Ia_xaddw_Ew_Gw    },
-  /* 0F C2 */ { GRPSSE(0fc2) },
-  /* 0F C3 */ { GRPSSE(0fc3) },
-  /* 0F C4 */ { GRPSSE(0fc4) },
-  /* 0F C5 */ { GRPSSE(0fc5) },
-  /* 0F C6 */ { GRPSSE(0fc6) },
-  /* 0F C7 */ { GRPN(G9)     },
-  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
-  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
-  /* 0F CA */ { 0, &Ia_bswapl_ERX },
-  /* 0F CB */ { 0, &Ia_bswapl_ERX },
-  /* 0F CC */ { 0, &Ia_bswapl_ERX },
-  /* 0F CD */ { 0, &Ia_bswapl_ERX },
-  /* 0F CE */ { 0, &Ia_bswapl_ERX },
-  /* 0F CF */ { 0, &Ia_bswapl_ERX },
-  /* 0F D0 */ { GRPSSE(0fd0) },
-  /* 0F D1 */ { GRPSSE(0fd1) },
-  /* 0F D2 */ { GRPSSE(0fd2) },
-  /* 0F D3 */ { GRPSSE(0fd3) },
-  /* 0F D4 */ { GRPSSE(0fd4) },
-  /* 0F D5 */ { GRPSSE(0fd5) },
-  /* 0F D6 */ { GRPSSE(0fd6) },
-  /* 0F D7 */ { GRPSSE(0fd7) },
-  /* 0F D8 */ { GRPSSE(0fd8) },
-  /* 0F D9 */ { GRPSSE(0fd9) },
-  /* 0F DA */ { GRPSSE(0fda) },
-  /* 0F DB */ { GRPSSE(0fdb) },
-  /* 0F DC */ { GRPSSE(0fdc) },
-  /* 0F DD */ { GRPSSE(0fdd) },
-  /* 0F DE */ { GRPSSE(0fde) },
-  /* 0F DF */ { GRPSSE(0fdf) },
-  /* 0F E0 */ { GRPSSE(0fe0) },
-  /* 0F E1 */ { GRPSSE(0fe1) },
-  /* 0F E2 */ { GRPSSE(0fe2) },
-  /* 0F E3 */ { GRPSSE(0fe3) },
-  /* 0F E4 */ { GRPSSE(0fe4) },
-  /* 0F E5 */ { GRPSSE(0fe5) },
-  /* 0F E6 */ { GRPSSE(0fe6) },
-  /* 0F E7 */ { GRPSSE(0fe7) },
-  /* 0F E8 */ { GRPSSE(0fe8) },
-  /* 0F E9 */ { GRPSSE(0fe9) },
-  /* 0F EA */ { GRPSSE(0fea) },
-  /* 0F EB */ { GRPSSE(0feb) },
-  /* 0F EC */ { GRPSSE(0fec) },
-  /* 0F ED */ { GRPSSE(0fed) },
-  /* 0F EE */ { GRPSSE(0fee) },
-  /* 0F EF */ { GRPSSE(0fef) },
-  /* 0F F0 */ { GRPSSE(0ff0) },
-  /* 0F F1 */ { GRPSSE(0ff1) },
-  /* 0F F2 */ { GRPSSE(0ff2) },
-  /* 0F F3 */ { GRPSSE(0ff3) },
-  /* 0F F4 */ { GRPSSE(0ff4) },
-  /* 0F F5 */ { GRPSSE(0ff5) },
-  /* 0F F6 */ { GRPSSE(0ff6) },
-  /* 0F F7 */ { GRPSSE(0ff7) },
-  /* 0F F8 */ { GRPSSE(0ff8) },
-  /* 0F F9 */ { GRPSSE(0ff9) },
-  /* 0F FA */ { GRPSSE(0ffa) },
-  /* 0F FB */ { GRPSSE(0ffb) },
-  /* 0F FC */ { GRPSSE(0ffc) },
-  /* 0F FD */ { GRPSSE(0ffd) },
-  /* 0F FE */ { GRPSSE(0ffe) },
-  /* 0F FF */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmOpcodes64d[256*2] = {
-  // 256 entries for single byte opcodes
-  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
-  /* 01 */ { 0, &Ia_addl_Ed_Gd    },
-  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
-  /* 03 */ { 0, &Ia_addl_Gd_Ed    },
-  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
-  /* 05 */ { 0, &Ia_addl_EAX_Id,  },
-  /* 06 */ { 0, &Ia_Invalid       },
-  /* 07 */ { 0, &Ia_Invalid       },
-  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
-  /* 09 */ { 0, &Ia_orl_Ed_Gd     },
-  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
-  /* 0B */ { 0, &Ia_orl_Gd_Ed     },
-  /* 0C */ { 0, &Ia_orb_AL_Ib     },
-  /* 0D */ { 0, &Ia_orl_EAX_Id    },
-  /* 0E */ { 0, &Ia_Invalid       },
-  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
-  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
-  /* 11 */ { 0, &Ia_adcl_Ed_Gd    },
-  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
-  /* 13 */ { 0, &Ia_adcl_Gd_Ed    },
-  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
-  /* 15 */ { 0, &Ia_adcl_EAX_Id   },
-  /* 16 */ { 0, &Ia_Invalid       },
-  /* 17 */ { 0, &Ia_Invalid       },
-  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
-  /* 19 */ { 0, &Ia_sbbl_Ed_Gd    },
-  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
-  /* 1B */ { 0, &Ia_sbbl_Gd_Ed    },
-  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
-  /* 1D */ { 0, &Ia_sbbl_EAX_Id   },
-  /* 1E */ { 0, &Ia_Invalid       },
-  /* 1F */ { 0, &Ia_Invalid       },
-  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
-  /* 21 */ { 0, &Ia_andl_Ed_Gd    },
-  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
-  /* 23 */ { 0, &Ia_andl_Gd_Ed    },
-  /* 24 */ { 0, &Ia_andb_AL_Ib    },
-  /* 25 */ { 0, &Ia_andl_EAX_Id   },
-  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
-  /* 27 */ { 0, &Ia_Invalid       },
-  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
-  /* 29 */ { 0, &Ia_subl_Ed_Gd    },
-  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
-  /* 2B */ { 0, &Ia_subl_Gd_Ed    },
-  /* 2C */ { 0, &Ia_subb_AL_Ib    },
-  /* 2D */ { 0, &Ia_subl_EAX_Id   },
-  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
-  /* 2F */ { 0, &Ia_Invalid       },
-  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
-  /* 31 */ { 0, &Ia_xorl_Ed_Gd    },
-  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
-  /* 33 */ { 0, &Ia_xorl_Gd_Ed    },
-  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
-  /* 35 */ { 0, &Ia_xorl_EAX_Id   },
-  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
-  /* 37 */ { 0, &Ia_Invalid       },
-  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
-  /* 39 */ { 0, &Ia_cmpl_Ed_Gd    },
-  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
-  /* 3B */ { 0, &Ia_cmpl_Gd_Ed    },
-  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
-  /* 3D */ { 0, &Ia_cmpl_EAX_Id   },
-  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
-  /* 3F */ { 0, &Ia_Invalid       },
-  /* 40 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 41 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 42 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 43 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 44 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 45 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 46 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 47 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 48 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 49 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4A */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4B */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4C */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4D */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4E */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4F */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 50 */ { 0, &Ia_pushq_RRX     },
-  /* 51 */ { 0, &Ia_pushq_RRX     },
-  /* 52 */ { 0, &Ia_pushq_RRX     },
-  /* 53 */ { 0, &Ia_pushq_RRX     },
-  /* 54 */ { 0, &Ia_pushq_RRX     },
-  /* 55 */ { 0, &Ia_pushq_RRX     },
-  /* 56 */ { 0, &Ia_pushq_RRX     },
-  /* 57 */ { 0, &Ia_pushq_RRX     },
-  /* 58 */ { 0, &Ia_popq_RRX      },
-  /* 59 */ { 0, &Ia_popq_RRX      },
-  /* 5A */ { 0, &Ia_popq_RRX      },
-  /* 5B */ { 0, &Ia_popq_RRX      },
-  /* 5C */ { 0, &Ia_popq_RRX      },
-  /* 5D */ { 0, &Ia_popq_RRX      },
-  /* 5E */ { 0, &Ia_popq_RRX      },
-  /* 5F */ { 0, &Ia_popq_RRX      },
-  /* 60 */ { 0, &Ia_Invalid       },
-  /* 61 */ { 0, &Ia_Invalid       },
-  /* 62 */ { 0, &Ia_Invalid       },
-  /* 63 */ { 0, &Ia_movl_Gd_Ed    },
-  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
-  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
-  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
-  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
-  /* 68 */ { 0, &Ia_pushq_sId     },
-  /* 69 */ { 0, &Ia_imull_Gd_Ed_Id  },
-  /* 6A */ { 0, &Ia_pushq_sIb     },
-  /* 6B */ { 0, &Ia_imull_Gd_Ed_sIb },
-  /* 6C */ { 0, &Ia_insb_Yb_DX    },
-  /* 6D */ { 0, &Ia_insl_Yd_DX    },
-  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
-  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
-  /* 70 */ { 0, &Ia_jo_Jb         },
-  /* 71 */ { 0, &Ia_jno_Jb        },
-  /* 72 */ { 0, &Ia_jb_Jb         },
-  /* 73 */ { 0, &Ia_jnb_Jb        },
-  /* 74 */ { 0, &Ia_jz_Jb         },
-  /* 75 */ { 0, &Ia_jnz_Jb        },
-  /* 76 */ { 0, &Ia_jbe_Jb        },
-  /* 77 */ { 0, &Ia_jnbe_Jb       },
-  /* 78 */ { 0, &Ia_js_Jb         },
-  /* 79 */ { 0, &Ia_jns_Jb        },
-  /* 7A */ { 0, &Ia_jp_Jb         },
-  /* 7B */ { 0, &Ia_jnp_Jb        },
-  /* 7C */ { 0, &Ia_jl_Jb         },
-  /* 7D */ { 0, &Ia_jnl_Jb        },
-  /* 7E */ { 0, &Ia_jle_Jb        },
-  /* 7F */ { 0, &Ia_jnle_Jb       },
-  /* 80 */ { GRPN(G1EbIb)         },
-  /* 81 */ { GRPN(G1EdId)         },
-  /* 82 */ { 0, &Ia_Invalid       },
-  /* 83 */ { GRPN(G1EdIb)         },
-  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
-  /* 85 */ { 0, &Ia_testl_Ed_Gd   },
-  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
-  /* 87 */ { 0, &Ia_xchgl_Ed_Gd   },
-  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
-  /* 89 */ { 0, &Ia_movl_Ed_Gd    },
-  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
-  /* 8B */ { 0, &Ia_movl_Gd_Ed    },
-  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
-  /* 8D */ { 0, &Ia_leal_Gd_Md    },
-  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
-  /* 8F */ { 0, &Ia_popq_Eq       },
-  /* 90 */ { 0, &Ia_xchgl_ERX_EAX }, // handle XCHG R8d, EAX
-  /* 91 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 92 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 93 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 94 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 95 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 96 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 97 */ { 0, &Ia_xchgl_ERX_EAX },
-  /* 98 */ { 0, &Ia_cwde          },
-  /* 99 */ { 0, &Ia_cdq           },
-  /* 9A */ { 0, &Ia_Invalid       },
-  /* 9B */ { 0, &Ia_fwait         },
-  /* 9C */ { 0, &Ia_pushfq        },
-  /* 9D */ { 0, &Ia_popfq         },
-  /* 9E */ { 0, &Ia_sahf          },
-  /* 9F */ { 0, &Ia_lahf          },
-  /* A0 */ { 0, &Ia_movb_AL_Ob    },
-  /* A1 */ { 0, &Ia_movl_EAX_Od   },
-  /* A0 */ { 0, &Ia_movb_Ob_AL    },
-  /* A1 */ { 0, &Ia_movl_Od_EAX   },
-  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
-  /* A5 */ { 0, &Ia_movsl_Yd_Xd   },
-  /* A6 */ { 0, &Ia_cmpsb_Yb_Xb   },
-  /* A7 */ { 0, &Ia_cmpsl_Yd_Xd   },
-  /* A8 */ { 0, &Ia_testb_AL_Ib   },
-  /* A9 */ { 0, &Ia_testl_EAX_Id  },
-  /* AA */ { 0, &Ia_stosb_Yb_AL   },
-  /* AB */ { 0, &Ia_stosl_Yd_EAX  },
-  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
-  /* AD */ { 0, &Ia_lodsl_EAX_Xd  },
-  /* AE */ { 0, &Ia_scasb_Yb_AL   },
-  /* AF */ { 0, &Ia_scasl_Yd_EAX  },
-  /* B0 */ { 0, &Ia_movb_R8_Ib    },
-  /* B1 */ { 0, &Ia_movb_R8_Ib    },
-  /* B2 */ { 0, &Ia_movb_R8_Ib    },
-  /* B3 */ { 0, &Ia_movb_R8_Ib    },
-  /* B4 */ { 0, &Ia_movb_R8_Ib    },
-  /* B5 */ { 0, &Ia_movb_R8_Ib    },
-  /* B6 */ { 0, &Ia_movb_R8_Ib    },
-  /* B7 */ { 0, &Ia_movb_R8_Ib    },
-  /* B8 */ { 0, &Ia_movl_ERX_Id   },
-  /* B9 */ { 0, &Ia_movl_ERX_Id   },
-  /* BA */ { 0, &Ia_movl_ERX_Id   },
-  /* BB */ { 0, &Ia_movl_ERX_Id   },
-  /* BC */ { 0, &Ia_movl_ERX_Id   },
-  /* BD */ { 0, &Ia_movl_ERX_Id   },
-  /* BE */ { 0, &Ia_movl_ERX_Id   },
-  /* BF */ { 0, &Ia_movl_ERX_Id   },
-  /* C0 */ { GRPN(G2Eb)           },
-  /* C1 */ { GRPN(G2Ed)           },
-  /* C2 */ { 0, &Ia_ret_Iw        },
-  /* C3 */ { 0, &Ia_ret           },
-  /* C4 */ { 0, &Ia_Invalid       },
-  /* C5 */ { 0, &Ia_Invalid       },
-  /* C6 */ { 0, &Ia_movb_Eb_Ib    },
-  /* C7 */ { 0, &Ia_movl_Ed_Id    },
-  /* C8 */ { 0, &Ia_enter         },
-  /* C9 */ { 0, &Ia_leave         },
-  /* CA */ { 0, &Ia_lret_Iw       },
-  /* CB */ { 0, &Ia_lret          },
-  /* CC */ { 0, &Ia_int3          },
-  /* CD */ { 0, &Ia_int_Ib        },
-  /* CE */ { 0, &Ia_Invalid       },
-  /* CF */ { 0, &Ia_iretl         },
-  /* D0 */ { GRPN(G2EbI1)         },
-  /* D1 */ { GRPN(G2EdI1)         },
-  /* D2 */ { GRPN(G2EbCL)         },
-  /* D3 */ { GRPN(G2EdCL)         },
-  /* D4 */ { 0, &Ia_Invalid       },
-  /* D5 */ { 0, &Ia_Invalid       },
-  /* D6 */ { 0, &Ia_Invalid       },
-  /* D7 */ { 0, &Ia_xlat          },
-  /* D8 */ { GRPFP(D8)            },
-  /* D9 */ { GRPFP(D9)            },
-  /* DA */ { GRPFP(DA)            },
-  /* DB */ { GRPFP(DB)            },
-  /* DC */ { GRPFP(DC)            },
-  /* DD */ { GRPFP(DD)            },
-  /* DE */ { GRPFP(DE)            },
-  /* DF */ { GRPFP(DF)            },
-  /* E0 */ { 0, &Ia_loopne_Jb     },
-  /* E1 */ { 0, &Ia_loope_Jb      },
-  /* E2 */ { 0, &Ia_loop_Jb       },
-  /* E3 */ { 0, &Ia_jrcxz_Jb      },
-  /* E4 */ { 0, &Ia_inb_AL_Ib     },
-  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
-  /* E6 */ { 0, &Ia_outb_Ib_AL    },
-  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
-  /* E8 */ { 0, &Ia_call_Jd       },
-  /* E9 */ { 0, &Ia_jmp_Jd        },
-  /* EA */ { 0, &Ia_Invalid       },
-  /* EB */ { 0, &Ia_jmp_Jb        },
-  /* EC */ { 0, &Ia_inb_AL_DX     },
-  /* ED */ { 0, &Ia_inl_EAX_DX    },
-  /* EE */ { 0, &Ia_outb_DX_AL    },
-  /* EF */ { 0, &Ia_outl_DX_EAX   },
-  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
-  /* F1 */ { 0, &Ia_int1          },
-  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
-  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
-  /* F4 */ { 0, &Ia_hlt           },
-  /* F5 */ { 0, &Ia_cmc           },
-  /* F6 */ { GRPN(G3Eb)           },
-  /* F7 */ { GRPN(G3Ed)           },
-  /* F8 */ { 0, &Ia_clc           },
-  /* F9 */ { 0, &Ia_stc           },
-  /* FA */ { 0, &Ia_cli           },
-  /* FB */ { 0, &Ia_sti           },
-  /* FC */ { 0, &Ia_cld           },
-  /* FD */ { 0, &Ia_std           },
-  /* FE */ { GRPN(G4)             },
-  /* FF */ { GRPN(64G5d)          },
-
-  // 256 entries for two byte opcodes
-  /* 0F 00 */ { GRPN(G6)          },
-  /* 0F 01 */ { GRPN(G7)          },
-  /* 0F 02 */ { 0, &Ia_larl_Gd_Ew },
-  /* 0F 03 */ { 0, &Ia_lsll_Gd_Ew },
-  /* 0F 04 */ { 0, &Ia_Invalid    },
-  /* 0F 05 */ { 0, &Ia_syscall    },
-  /* 0F 06 */ { 0, &Ia_clts       },
-  /* 0F 07 */ { 0, &Ia_sysret     },
-  /* 0F 08 */ { 0, &Ia_invd       },
-  /* 0F 09 */ { 0, &Ia_wbinvd     },
-  /* 0F 0A */ { 0, &Ia_Invalid    },
-  /* 0F 0B */ { 0, &Ia_ud2a       },
-  /* 0F 0C */ { 0, &Ia_Invalid    },
-  /* 0F 0D */ { 0, &Ia_prefetch   },   // 3DNow!
-  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
-  /* 0F 0F */ { GRP3DNOW          },
-  /* 0F 10 */ { GRPSSE(0f10)      },
-  /* 0F 11 */ { GRPSSE(0f11)      },
-  /* 0F 12 */ { GRPSSE(0f12)      },
-  /* 0F 13 */ { GRPSSE(0f13)      },
-  /* 0F 14 */ { GRPSSE(0f14)      },
-  /* 0F 15 */ { GRPSSE(0f15)      },
-  /* 0F 16 */ { GRPSSE(0f16)      },
-  /* 0F 17 */ { GRPSSE(0f17)      },
-  /* 0F 18 */ { GRPN(G16)         },
-  /* 0F 19 */ { 0, &Ia_Invalid    },
-  /* 0F 1A */ { 0, &Ia_Invalid    },
-  /* 0F 1B */ { 0, &Ia_Invalid    },
-  /* 0F 1C */ { 0, &Ia_Invalid    },
-  /* 0F 1D */ { 0, &Ia_Invalid    },
-  /* 0F 1E */ { 0, &Ia_Invalid    },
-  /* 0F 1F */ { 0, &Ia_multibyte_nop },
-  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
-  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
-  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
-  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
-  /* 0F 24 */ { 0, &Ia_Invalid    },
-  /* 0F 25 */ { 0, &Ia_Invalid    },
-  /* 0F 26 */ { 0, &Ia_Invalid    },
-  /* 0F 27 */ { 0, &Ia_Invalid    },
-  /* 0F 28 */ { GRPSSE(0f28) },
-  /* 0F 29 */ { GRPSSE(0f29) },
-  /* 0F 2A */ { GRPSSE(0f2a) },
-  /* 0F 2B */ { GRPSSE(0f2b) },
-  /* 0F 2C */ { GRPSSE(0f2c) },
-  /* 0F 2D */ { GRPSSE(0f2d) },
-  /* 0F 2E */ { GRPSSE(0f2e) },
-  /* 0F 2F */ { GRPSSE(0f2f) },
-  /* 0F 30 */ { 0, &Ia_wrmsr },
-  /* 0F 31 */ { 0, &Ia_rdtsc },
-  /* 0F 32 */ { 0, &Ia_rdmsr },
-  /* 0F 33 */ { 0, &Ia_rdpmc },
-  /* 0F 34 */ { 0, &Ia_sysenter },
-  /* 0F 35 */ { 0, &Ia_sysexit  },
-  /* 0F 36 */ { 0, &Ia_Invalid  },
-  /* 0F 37 */ { 0, &Ia_Invalid  },
-  /* 0F 38 */ { GR3BTAB(A4) },
-  /* 0F 39 */ { 0, &Ia_Invalid  },
-  /* 0F 3A */ { GR3BTAB(A5) },
-  /* 0F 3B */ { 0, &Ia_Invalid  },
-  /* 0F 3C */ { 0, &Ia_Invalid  },
-  /* 0F 3D */ { 0, &Ia_Invalid  },
-  /* 0F 3E */ { 0, &Ia_Invalid  },
-  /* 0F 3F */ { 0, &Ia_Invalid  },
-  /* 0F 40 */ { 0, &Ia_cmovol_Gd_Ed  },
-  /* 0F 41 */ { 0, &Ia_cmovnol_Gd_Ed },
-  /* 0F 42 */ { 0, &Ia_cmovcl_Gd_Ed  },
-  /* 0F 43 */ { 0, &Ia_cmovncl_Gd_Ed },
-  /* 0F 44 */ { 0, &Ia_cmovzl_Gd_Ed  },
-  /* 0F 45 */ { 0, &Ia_cmovnzl_Gd_Ed },
-  /* 0F 46 */ { 0, &Ia_cmovnal_Gd_Ed },
-  /* 0F 47 */ { 0, &Ia_cmoval_Gd_Ed  },
-  /* 0F 48 */ { 0, &Ia_cmovsl_Gd_Ed  },
-  /* 0F 49 */ { 0, &Ia_cmovnsl_Gd_Ed },
-  /* 0F 4A */ { 0, &Ia_cmovpl_Gd_Ed  },
-  /* 0F 4B */ { 0, &Ia_cmovnpl_Gd_Ed },
-  /* 0F 4C */ { 0, &Ia_cmovll_Gd_Ed  },
-  /* 0F 4D */ { 0, &Ia_cmovnll_Gd_Ed },
-  /* 0F 4E */ { 0, &Ia_cmovngl_Gd_Ed },
-  /* 0F 4F */ { 0, &Ia_cmovgl_Gd_Ed  },
-  /* 0F 50 */ { GRPSSE(0f50) },
-  /* 0F 51 */ { GRPSSE(0f51) },
-  /* 0F 52 */ { GRPSSE(0f52) },
-  /* 0F 53 */ { GRPSSE(0f53) },
-  /* 0F 54 */ { GRPSSE(0f54) },
-  /* 0F 55 */ { GRPSSE(0f55) },
-  /* 0F 56 */ { GRPSSE(0f56) },
-  /* 0F 57 */ { GRPSSE(0f57) },
-  /* 0F 58 */ { GRPSSE(0f58) },
-  /* 0F 59 */ { GRPSSE(0f59) },
-  /* 0F 5A */ { GRPSSE(0f5a) },
-  /* 0F 5B */ { GRPSSE(0f5b) },
-  /* 0F 5C */ { GRPSSE(0f5c) },
-  /* 0F 5D */ { GRPSSE(0f5d) },
-  /* 0F 5E */ { GRPSSE(0f5e) },
-  /* 0F 5F */ { GRPSSE(0f5f) },
-  /* 0F 60 */ { GRPSSE(0f60) },
-  /* 0F 61 */ { GRPSSE(0f61) },
-  /* 0F 62 */ { GRPSSE(0f62) },
-  /* 0F 63 */ { GRPSSE(0f63) },
-  /* 0F 64 */ { GRPSSE(0f64) },
-  /* 0F 65 */ { GRPSSE(0f65) },
-  /* 0F 66 */ { GRPSSE(0f66) },
-  /* 0F 67 */ { GRPSSE(0f67) },
-  /* 0F 68 */ { GRPSSE(0f68) },
-  /* 0F 69 */ { GRPSSE(0f69) },
-  /* 0F 6A */ { GRPSSE(0f6a) },
-  /* 0F 6B */ { GRPSSE(0f6b) },
-  /* 0F 6C */ { GRPSSE(0f6c) },
-  /* 0F 6D */ { GRPSSE(0f6d) },
-  /* 0F 6E */ { GRPSSE(0f6e) },
-  /* 0F 6F */ { GRPSSE(0f6f) },
-  /* 0F 70 */ { GRPSSE(0f70) },
-  /* 0F 71 */ { GRPN(G12)    },
-  /* 0F 72 */ { GRPN(G13)    },
-  /* 0F 73 */ { GRPN(G14)    },
-  /* 0F 74 */ { GRPSSE(0f74) },
-  /* 0F 75 */ { GRPSSE(0f75) },
-  /* 0F 76 */ { GRPSSE(0f76) },
-  /* 0F 77 */ { 0, &Ia_emms  },
-  /* 0F 78 */ { 0, &Ia_Invalid },
-  /* 0F 79 */ { 0, &Ia_Invalid },
-  /* 0F 7A */ { 0, &Ia_Invalid },
-  /* 0F 7B */ { 0, &Ia_Invalid },
-  /* 0F 7C */ { GRPSSE(0f7c) },
-  /* 0F 7D */ { GRPSSE(0f7d) },
-  /* 0F 7E */ { GRPSSE(0f7e) },
-  /* 0F 7F */ { GRPSSE(0f7f) },
-  /* 0F 80 */ { 0, &Ia_jo_Jd     },
-  /* 0F 81 */ { 0, &Ia_jno_Jd    },
-  /* 0F 82 */ { 0, &Ia_jb_Jd     },
-  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
-  /* 0F 84 */ { 0, &Ia_jz_Jd     },
-  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
-  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
-  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
-  /* 0F 88 */ { 0, &Ia_js_Jd     },
-  /* 0F 89 */ { 0, &Ia_jns_Jd    },
-  /* 0F 8A */ { 0, &Ia_jp_Jd     },
-  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
-  /* 0F 8C */ { 0, &Ia_jl_Jd     },
-  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
-  /* 0F 8E */ { 0, &Ia_jle_Jd    },
-  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
-  /* 0F 90 */ { 0, &Ia_seto_Eb   },
-  /* 0F 91 */ { 0, &Ia_setno_Eb  },
-  /* 0F 92 */ { 0, &Ia_setb_Eb   },
-  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
-  /* 0F 94 */ { 0, &Ia_setz_Eb   },
-  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
-  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
-  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
-  /* 0F 98 */ { 0, &Ia_sets_Eb   },
-  /* 0F 99 */ { 0, &Ia_setns_Eb  },
-  /* 0F 9A */ { 0, &Ia_setp_Eb   },
-  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
-  /* 0F 9C */ { 0, &Ia_setl_Eb   },
-  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
-  /* 0F 9E */ { 0, &Ia_setle_Eb  },
-  /* 0F 9F */ { 0, &Ia_setnle_Eb },
-  /* 0F A0 */ { 0, &Ia_pushq_FS  },
-  /* 0F A1 */ { 0, &Ia_popq_FS   },
-  /* 0F A2 */ { 0, &Ia_cpuid     },
-  /* 0F A3 */ { 0, &Ia_btl_Ed_Gd },
-  /* 0F A4 */ { 0, &Ia_shldl_Ed_Gd_Ib },
-  /* 0F A5 */ { 0, &Ia_shldl_Ed_Gd_CL },
-  /* 0F A6 */ { 0, &Ia_Invalid    },
-  /* 0F A7 */ { 0, &Ia_Invalid    },
-  /* 0F A8 */ { 0, &Ia_pushq_GS   },
-  /* 0F A9 */ { 0, &Ia_popq_GS    },
-  /* 0F AA */ { 0, &Ia_rsm        },
-  /* 0F AB */ { 0, &Ia_btsl_Ed_Gd },
-  /* 0F AC */ { 0, &Ia_shrdl_Ed_Gd_Ib },
-  /* 0F AD */ { 0, &Ia_shrdl_Ed_Gd_CL },
-  /* 0F AE */ { GRPN(G15)         },
-  /* 0F AF */ { 0, &Ia_imull_Gd_Ed    },
-  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
-  /* 0F B1 */ { 0, &Ia_cmpxchgl_Ed_Gd },
-  /* 0F B2 */ { 0, &Ia_lssl_Gd_Mp   },
-  /* 0F B3 */ { 0, &Ia_btrl_Ed_Gd   },
-  /* 0F B4 */ { 0, &Ia_lfsl_Gd_Mp   },
-  /* 0F B5 */ { 0, &Ia_lgsl_Gd_Mp   },
-  /* 0F B6 */ { 0, &Ia_movzbl_Gd_Eb },
-  /* 0F B7 */ { 0, &Ia_movzwl_Gd_Ew },
-  /* 0F B8 */ { 0, &Ia_Invalid      },
-  /* 0F B9 */ { 0, &Ia_ud2b         },
-  /* 0F BA */ { GRPN(G8EdIb)        },
-  /* 0F BB */ { 0, &Ia_btcl_Ed_Gd   },
-  /* 0F BC */ { 0, &Ia_bsfl_Gd_Ed   },
-  /* 0F BD */ { 0, &Ia_bsrl_Gd_Ed   },
-  /* 0F BE */ { 0, &Ia_movsbl_Gd_Eb },
-  /* 0F BF */ { 0, &Ia_movswl_Gd_Ew },
-  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
-  /* 0F C0 */ { 0, &Ia_xaddl_Ed_Gd  },
-  /* 0F C2 */ { GRPSSE(0fc2)      },
-  /* 0F C3 */ { GRPSSE(0fc3)      },
-  /* 0F C4 */ { GRPSSE(0fc4)      },
-  /* 0F C5 */ { GRPSSE(0fc5)      },
-  /* 0F C6 */ { GRPSSE(0fc6)      },
-  /* 0F C7 */ { GRPN(G9)          },
-  /* 0F C8 */ { 0, &Ia_bswapl_ERX },
-  /* 0F C9 */ { 0, &Ia_bswapl_ERX },
-  /* 0F CA */ { 0, &Ia_bswapl_ERX },
-  /* 0F CB */ { 0, &Ia_bswapl_ERX },
-  /* 0F CC */ { 0, &Ia_bswapl_ERX },
-  /* 0F CD */ { 0, &Ia_bswapl_ERX },
-  /* 0F CE */ { 0, &Ia_bswapl_ERX },
-  /* 0F CF */ { 0, &Ia_bswapl_ERX },
-  /* 0F D0 */ { GRPSSE(0fd0) },
-  /* 0F D1 */ { GRPSSE(0fd1) },
-  /* 0F D2 */ { GRPSSE(0fd2) },
-  /* 0F D3 */ { GRPSSE(0fd3) },
-  /* 0F D4 */ { GRPSSE(0fd4) },
-  /* 0F D5 */ { GRPSSE(0fd5) },
-  /* 0F D6 */ { GRPSSE(0fd6) },
-  /* 0F D7 */ { GRPSSE(0fd7) },
-  /* 0F D8 */ { GRPSSE(0fd8) },
-  /* 0F D9 */ { GRPSSE(0fd9) },
-  /* 0F DA */ { GRPSSE(0fda) },
-  /* 0F DB */ { GRPSSE(0fdb) },
-  /* 0F DC */ { GRPSSE(0fdc) },
-  /* 0F DD */ { GRPSSE(0fdd) },
-  /* 0F DE */ { GRPSSE(0fde) },
-  /* 0F DF */ { GRPSSE(0fdf) },
-  /* 0F E0 */ { GRPSSE(0fe0) },
-  /* 0F E1 */ { GRPSSE(0fe1) },
-  /* 0F E2 */ { GRPSSE(0fe2) },
-  /* 0F E3 */ { GRPSSE(0fe3) },
-  /* 0F E4 */ { GRPSSE(0fe4) },
-  /* 0F E5 */ { GRPSSE(0fe5) },
-  /* 0F E6 */ { GRPSSE(0fe6) },
-  /* 0F E7 */ { GRPSSE(0fe7) },
-  /* 0F E8 */ { GRPSSE(0fe8) },
-  /* 0F E9 */ { GRPSSE(0fe9) },
-  /* 0F EA */ { GRPSSE(0fea) },
-  /* 0F EB */ { GRPSSE(0feb) },
-  /* 0F EC */ { GRPSSE(0fec) },
-  /* 0F ED */ { GRPSSE(0fed) },
-  /* 0F EE */ { GRPSSE(0fee) },
-  /* 0F EF */ { GRPSSE(0fef) },
-  /* 0F F0 */ { GRPSSE(0ff0) },
-  /* 0F F1 */ { GRPSSE(0ff1) },
-  /* 0F F2 */ { GRPSSE(0ff2) },
-  /* 0F F3 */ { GRPSSE(0ff3) },
-  /* 0F F4 */ { GRPSSE(0ff4) },
-  /* 0F F5 */ { GRPSSE(0ff5) },
-  /* 0F F6 */ { GRPSSE(0ff6) },
-  /* 0F F7 */ { GRPSSE(0ff7) },
-  /* 0F F8 */ { GRPSSE(0ff8) },
-  /* 0F F9 */ { GRPSSE(0ff9) },
-  /* 0F FA */ { GRPSSE(0ffa) },
-  /* 0F FB */ { GRPSSE(0ffb) },
-  /* 0F FC */ { GRPSSE(0ffc) },
-  /* 0F FD */ { GRPSSE(0ffd) },
-  /* 0F FE */ { GRPSSE(0ffe) },
-  /* 0F FF */ { 0, &Ia_Invalid }
-};
-
-static BxDisasmOpcodeTable_t BxDisasmOpcodes64q[256*2] = {
-  // 256 entries for single byte opcodes
-  /* 00 */ { 0, &Ia_addb_Eb_Gb    },
-  /* 01 */ { 0, &Ia_addq_Eq_Gq    },
-  /* 02 */ { 0, &Ia_addb_Gb_Eb    },
-  /* 03 */ { 0, &Ia_addq_Gq_Eq    },
-  /* 04 */ { 0, &Ia_addb_AL_Ib,   },
-  /* 05 */ { 0, &Ia_addq_RAX_sId  },
-  /* 06 */ { 0, &Ia_Invalid       },
-  /* 07 */ { 0, &Ia_Invalid       },
-  /* 08 */ { 0, &Ia_orb_Eb_Gb     },
-  /* 09 */ { 0, &Ia_orq_Eq_Gq     },
-  /* 0A */ { 0, &Ia_orb_Gb_Eb     },
-  /* 0B */ { 0, &Ia_orq_Gq_Eq     },
-  /* 0C */ { 0, &Ia_orb_AL_Ib     },
-  /* 0D */ { 0, &Ia_orq_RAX_sId   },
-  /* 0E */ { 0, &Ia_Invalid       },
-  /* 0F */ { 0, &Ia_error         },   // 2 byte escape
-  /* 10 */ { 0, &Ia_adcb_Eb_Gb    },
-  /* 11 */ { 0, &Ia_adcq_Eq_Gq    },
-  /* 12 */ { 0, &Ia_adcb_Gb_Eb    },
-  /* 13 */ { 0, &Ia_adcq_Gq_Eq    },
-  /* 14 */ { 0, &Ia_adcb_AL_Ib    },
-  /* 15 */ { 0, &Ia_adcq_RAX_sId  },
-  /* 16 */ { 0, &Ia_Invalid       },
-  /* 17 */ { 0, &Ia_Invalid       },
-  /* 18 */ { 0, &Ia_sbbb_Eb_Gb    },
-  /* 19 */ { 0, &Ia_sbbq_Eq_Gq    },
-  /* 1A */ { 0, &Ia_sbbb_Gb_Eb    },
-  /* 1B */ { 0, &Ia_sbbq_Gq_Eq    },
-  /* 1C */ { 0, &Ia_sbbb_AL_Ib    },
-  /* 1D */ { 0, &Ia_sbbq_RAX_sId  },
-  /* 1E */ { 0, &Ia_Invalid       },
-  /* 1F */ { 0, &Ia_Invalid       },
-  /* 20 */ { 0, &Ia_andb_Eb_Gb    },
-  /* 21 */ { 0, &Ia_andq_Eq_Gq    },
-  /* 22 */ { 0, &Ia_andb_Gb_Eb    },
-  /* 23 */ { 0, &Ia_andq_Gq_Eq    },
-  /* 24 */ { 0, &Ia_andb_AL_Ib    },
-  /* 25 */ { 0, &Ia_andq_RAX_sId  },
-  /* 26 */ { 0, &Ia_prefix_es     },   // ES:
-  /* 27 */ { 0, &Ia_Invalid       },
-  /* 28 */ { 0, &Ia_subb_Eb_Gb    },
-  /* 29 */ { 0, &Ia_subq_Eq_Gq    },
-  /* 2A */ { 0, &Ia_subb_Gb_Eb    },
-  /* 2B */ { 0, &Ia_subq_Gq_Eq    },
-  /* 2C */ { 0, &Ia_subb_AL_Ib    },
-  /* 2D */ { 0, &Ia_subq_RAX_sId  },
-  /* 2E */ { 0, &Ia_prefix_cs     },   // CS:
-  /* 2F */ { 0, &Ia_Invalid       },
-  /* 30 */ { 0, &Ia_xorb_Eb_Gb    },
-  /* 31 */ { 0, &Ia_xorq_Eq_Gq    },
-  /* 32 */ { 0, &Ia_xorb_Gb_Eb    },
-  /* 33 */ { 0, &Ia_xorq_Gq_Eq    },
-  /* 34 */ { 0, &Ia_xorb_AL_Ib    },
-  /* 35 */ { 0, &Ia_xorq_RAX_sId  },
-  /* 36 */ { 0, &Ia_prefix_ss     },   // SS:
-  /* 37 */ { 0, &Ia_Invalid       },
-  /* 38 */ { 0, &Ia_cmpb_Eb_Gb    },
-  /* 39 */ { 0, &Ia_cmpq_Eq_Gq    },
-  /* 3A */ { 0, &Ia_cmpb_Gb_Eb    },
-  /* 3B */ { 0, &Ia_cmpq_Gq_Eq    },
-  /* 3C */ { 0, &Ia_cmpb_AL_Ib    },
-  /* 3D */ { 0, &Ia_cmpq_RAX_sId  },
-  /* 3E */ { 0, &Ia_prefix_ds     },   // DS:
-  /* 3F */ { 0, &Ia_Invalid       },
-  /* 40 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 41 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 42 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 43 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 44 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 45 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 46 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 47 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 48 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 49 */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4A */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4B */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4C */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4D */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4E */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 4F */ { 0, &Ia_prefix_rex    },   // REX:
-  /* 50 */ { 0, &Ia_pushq_RRX     },
-  /* 51 */ { 0, &Ia_pushq_RRX     },
-  /* 52 */ { 0, &Ia_pushq_RRX     },
-  /* 53 */ { 0, &Ia_pushq_RRX     },
-  /* 54 */ { 0, &Ia_pushq_RRX     },
-  /* 55 */ { 0, &Ia_pushq_RRX     },
-  /* 56 */ { 0, &Ia_pushq_RRX     },
-  /* 57 */ { 0, &Ia_pushq_RRX     },
-  /* 58 */ { 0, &Ia_popq_RRX      },
-  /* 59 */ { 0, &Ia_popq_RRX      },
-  /* 5A */ { 0, &Ia_popq_RRX      },
-  /* 5B */ { 0, &Ia_popq_RRX      },
-  /* 5C */ { 0, &Ia_popq_RRX      },
-  /* 5D */ { 0, &Ia_popq_RRX      },
-  /* 5E */ { 0, &Ia_popq_RRX      },
-  /* 5F */ { 0, &Ia_popq_RRX      },
-  /* 60 */ { 0, &Ia_Invalid       },
-  /* 61 */ { 0, &Ia_Invalid       },
-  /* 62 */ { 0, &Ia_Invalid       },
-  /* 63 */ { 0, &Ia_movslq_Gq_Ed  },
-  /* 64 */ { 0, &Ia_prefix_fs     },   // FS:
-  /* 65 */ { 0, &Ia_prefix_gs     },   // GS:
-  /* 66 */ { 0, &Ia_prefix_osize  },   // OSIZE:
-  /* 67 */ { 0, &Ia_prefix_asize  },   // ASIZE:
-  /* 68 */ { 0, &Ia_pushq_sId     },
-  /* 69 */ { 0, &Ia_imulq_Gq_Eq_sId },
-  /* 6A */ { 0, &Ia_pushq_sIb     },
-  /* 6B */ { 0, &Ia_imulq_Gq_Eq_sIb },
-  /* 6C */ { 0, &Ia_insb_Yb_DX    },
-  /* 6D */ { 0, &Ia_insl_Yd_DX    },
-  /* 6E */ { 0, &Ia_outsb_DX_Xb   },
-  /* 6F */ { 0, &Ia_outsl_DX_Xd   },
-  /* 70 */ { 0, &Ia_jo_Jb         },
-  /* 71 */ { 0, &Ia_jno_Jb        },
-  /* 72 */ { 0, &Ia_jb_Jb         },
-  /* 73 */ { 0, &Ia_jnb_Jb        },
-  /* 74 */ { 0, &Ia_jz_Jb         },
-  /* 75 */ { 0, &Ia_jnz_Jb        },
-  /* 76 */ { 0, &Ia_jbe_Jb        },
-  /* 77 */ { 0, &Ia_jnbe_Jb       },
-  /* 78 */ { 0, &Ia_js_Jb         },
-  /* 79 */ { 0, &Ia_jns_Jb        },
-  /* 7A */ { 0, &Ia_jp_Jb         },
-  /* 7B */ { 0, &Ia_jnp_Jb        },
-  /* 7C */ { 0, &Ia_jl_Jb         },
-  /* 7D */ { 0, &Ia_jnl_Jb        },
-  /* 7E */ { 0, &Ia_jle_Jb        },
-  /* 7F */ { 0, &Ia_jnle_Jb       },
-  /* 80 */ { GRPN(G1EbIb)         },
-  /* 81 */ { GRPN(G1EqId)         },
-  /* 82 */ { 0, &Ia_Invalid       },
-  /* 83 */ { GRPN(G1EqIb)         },
-  /* 84 */ { 0, &Ia_testb_Eb_Gb   },
-  /* 85 */ { 0, &Ia_testq_Eq_Gq   },
-  /* 86 */ { 0, &Ia_xchgb_Eb_Gb   },
-  /* 87 */ { 0, &Ia_xchgq_Eq_Gq   },
-  /* 88 */ { 0, &Ia_movb_Eb_Gb    },
-  /* 89 */ { 0, &Ia_movq_Eq_Gq    },
-  /* 8A */ { 0, &Ia_movb_Gb_Eb    },
-  /* 8B */ { 0, &Ia_movq_Gq_Eq    },
-  /* 8C */ { 0, &Ia_movw_Ew_Sw    },
-  /* 8D */ { 0, &Ia_leaq_Gq_Mq    },
-  /* 8E */ { 0, &Ia_movw_Sw_Ew    },
-  /* 8F */ { 0, &Ia_popq_Eq       },
-  /* 90 */ { 0, &Ia_xchgq_RRX_RAX }, // handle XCHG R8, RAX
-  /* 91 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 92 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 93 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 94 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 95 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 96 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 97 */ { 0, &Ia_xchgq_RRX_RAX },
-  /* 98 */ { 0, &Ia_cdqe          },
-  /* 99 */ { 0, &Ia_cqo           },
-  /* 9A */ { 0, &Ia_Invalid       },
-  /* 9B */ { 0, &Ia_fwait         },
-  /* 9C */ { 0, &Ia_pushfq        },
-  /* 9D */ { 0, &Ia_popfq         },
-  /* 9E */ { 0, &Ia_sahf          },
-  /* 9F */ { 0, &Ia_lahf          },
-  /* A0 */ { 0, &Ia_movb_AL_Ob    },
-  /* A1 */ { 0, &Ia_movq_RAX_Oq   },
-  /* A0 */ { 0, &Ia_movb_Ob_AL    },
-  /* A1 */ { 0, &Ia_movq_Oq_RAX   },
-  /* A4 */ { 0, &Ia_movsb_Yb_Xb   },
-  /* A5 */ { 0, &Ia_movsq_Yq_Xq   },
-  /* A6 */ { 0, &Ia_cmpsb_Yb_Xb   },
-  /* A7 */ { 0, &Ia_cmpsq_Yq_Xq   },
-  /* A8 */ { 0, &Ia_testb_AL_Ib   },
-  /* A9 */ { 0, &Ia_testq_RAX_sId },
-  /* AA */ { 0, &Ia_stosb_Yb_AL   },
-  /* AB */ { 0, &Ia_stosq_Yq_RAX  },
-  /* AC */ { 0, &Ia_lodsb_AL_Xb   },
-  /* AD */ { 0, &Ia_lodsq_RAX_Xq  },
-  /* AE */ { 0, &Ia_scasb_Yb_AL   },
-  /* AF */ { 0, &Ia_scasq_Yq_RAX  },
-  /* B0 */ { 0, &Ia_movb_R8_Ib    },
-  /* B1 */ { 0, &Ia_movb_R8_Ib    },
-  /* B2 */ { 0, &Ia_movb_R8_Ib    },
-  /* B3 */ { 0, &Ia_movb_R8_Ib    },
-  /* B4 */ { 0, &Ia_movb_R8_Ib    },
-  /* B5 */ { 0, &Ia_movb_R8_Ib    },
-  /* B6 */ { 0, &Ia_movb_R8_Ib    },
-  /* B7 */ { 0, &Ia_movb_R8_Ib    },
-  /* B8 */ { 0, &Ia_movq_RRX_Iq   },
-  /* B9 */ { 0, &Ia_movq_RRX_Iq   },
-  /* BA */ { 0, &Ia_movq_RRX_Iq   },
-  /* BB */ { 0, &Ia_movq_RRX_Iq   },
-  /* BC */ { 0, &Ia_movq_RRX_Iq   },
-  /* BD */ { 0, &Ia_movq_RRX_Iq   },
-  /* BE */ { 0, &Ia_movq_RRX_Iq   },
-  /* BF */ { 0, &Ia_movq_RRX_Iq   },
-  /* C0 */ { GRPN(G2Eb)           },
-  /* C1 */ { GRPN(G2Eq)           },
-  /* C2 */ { 0, &Ia_ret_Iw        },
-  /* C3 */ { 0, &Ia_ret           },
-  /* C4 */ { 0, &Ia_Invalid       },
-  /* C5 */ { 0, &Ia_Invalid       },
-  /* C6 */ { 0, &Ia_movb_Eb_Ib    },
-  /* C7 */ { 0, &Ia_movq_Eq_sId   },
-  /* C8 */ { 0, &Ia_enter         },
-  /* C9 */ { 0, &Ia_leave         },
-  /* CA */ { 0, &Ia_lret_Iw       },
-  /* CB */ { 0, &Ia_lret          },
-  /* CC */ { 0, &Ia_int3          },
-  /* CD */ { 0, &Ia_int_Ib        },
-  /* CE */ { 0, &Ia_Invalid       },
-  /* CF */ { 0, &Ia_iretq         },
-  /* D0 */ { GRPN(G2EbI1)         },
-  /* D1 */ { GRPN(G2EqI1)         },
-  /* D2 */ { GRPN(G2EbCL)         },
-  /* D3 */ { GRPN(G2EqCL)         },
-  /* D4 */ { 0, &Ia_Invalid       },
-  /* D5 */ { 0, &Ia_Invalid       },
-  /* D6 */ { 0, &Ia_Invalid       },
-  /* D7 */ { 0, &Ia_xlat          },
-  /* D8 */ { GRPFP(D8)            },
-  /* D9 */ { GRPFP(D9)            },
-  /* DA */ { GRPFP(DA)            },
-  /* DB */ { GRPFP(DB)            },
-  /* DC */ { GRPFP(DC)            },
-  /* DD */ { GRPFP(DD)            },
-  /* DE */ { GRPFP(DE)            },
-  /* DF */ { GRPFP(DF)            },
-  /* E0 */ { 0, &Ia_loopne_Jb     },
-  /* E1 */ { 0, &Ia_loope_Jb      },
-  /* E2 */ { 0, &Ia_loop_Jb       },
-  /* E3 */ { 0, &Ia_jrcxz_Jb      },
-  /* E4 */ { 0, &Ia_inb_AL_Ib     },
-  /* E5 */ { 0, &Ia_inl_EAX_Ib    },
-  /* E6 */ { 0, &Ia_outb_Ib_AL    },
-  /* E7 */ { 0, &Ia_outl_Ib_EAX   },
-  /* E8 */ { 0, &Ia_call_Jd       },
-  /* E9 */ { 0, &Ia_jmp_Jd        },
-  /* EA */ { 0, &Ia_Invalid       },
-  /* EB */ { 0, &Ia_jmp_Jb        },
-  /* EC */ { 0, &Ia_inb_AL_DX     },
-  /* ED */ { 0, &Ia_inl_EAX_DX    },
-  /* EE */ { 0, &Ia_outb_DX_AL    },
-  /* EF */ { 0, &Ia_outl_DX_EAX   },
-  /* F0 */ { 0, &Ia_prefix_lock   },   // LOCK:
-  /* F1 */ { 0, &Ia_int1          },
-  /* F2 */ { 0, &Ia_prefix_repne  },   // REPNE:
-  /* F3 */ { 0, &Ia_prefix_rep    },   // REP:
-  /* F4 */ { 0, &Ia_hlt           },
-  /* F5 */ { 0, &Ia_cmc           },
-  /* F6 */ { GRPN(G3Eb)           },
-  /* F7 */ { GRPN(G3Eq)           },
-  /* F8 */ { 0, &Ia_clc           },
-  /* F9 */ { 0, &Ia_stc           },
-  /* FA */ { 0, &Ia_cli           },
-  /* FB */ { 0, &Ia_sti           },
-  /* FC */ { 0, &Ia_cld           },
-  /* FD */ { 0, &Ia_std           },
-  /* FE */ { GRPN(G4)             },
-  /* FF */ { GRPN(64G5q)          },
-
-  // 256 entries for two byte opcodes
-  /* 0F 00 */ { GRPN(G6)          },
-  /* 0F 01 */ { GRPN(G7)          },
-  /* 0F 02 */ { 0, &Ia_larq_Gq_Ew },
-  /* 0F 03 */ { 0, &Ia_lslq_Gq_Ew },
-  /* 0F 04 */ { 0, &Ia_Invalid    },
-  /* 0F 05 */ { 0, &Ia_syscall    },
-  /* 0F 06 */ { 0, &Ia_clts       },
-  /* 0F 07 */ { 0, &Ia_sysret     },
-  /* 0F 08 */ { 0, &Ia_invd       },
-  /* 0F 09 */ { 0, &Ia_wbinvd     },
-  /* 0F 0A */ { 0, &Ia_Invalid    },
-  /* 0F 0B */ { 0, &Ia_ud2a       },
-  /* 0F 0C */ { 0, &Ia_Invalid    },
-  /* 0F 0D */ { 0, &Ia_prefetch   },   // 3DNow!
-  /* 0F 0E */ { 0, &Ia_femms      },   // 3DNow!
-  /* 0F 0F */ { GRP3DNOW          },
-  /* 0F 10 */ { GRPSSE(0f10)      },
-  /* 0F 11 */ { GRPSSE(0f11)      },
-  /* 0F 12 */ { GRPSSE(0f12)      },
-  /* 0F 13 */ { GRPSSE(0f13)      },
-  /* 0F 14 */ { GRPSSE(0f14)      },
-  /* 0F 15 */ { GRPSSE(0f15)      },
-  /* 0F 16 */ { GRPSSE(0f16)      },
-  /* 0F 17 */ { GRPSSE(0f17)      },
-  /* 0F 18 */ { GRPN(G16)         },
-  /* 0F 19 */ { 0, &Ia_Invalid    },
-  /* 0F 1A */ { 0, &Ia_Invalid    },
-  /* 0F 1B */ { 0, &Ia_Invalid    },
-  /* 0F 1C */ { 0, &Ia_Invalid    },
-  /* 0F 1D */ { 0, &Ia_Invalid    },
-  /* 0F 1E */ { 0, &Ia_Invalid    },
-  /* 0F 1F */ { 0, &Ia_multibyte_nop },
-  /* 0F 20 */ { 0, &Ia_movq_Rq_Cq },
-  /* 0F 21 */ { 0, &Ia_movq_Rq_Dq },
-  /* 0F 22 */ { 0, &Ia_movq_Cq_Rq },
-  /* 0F 23 */ { 0, &Ia_movq_Dq_Rq },
-  /* 0F 24 */ { 0, &Ia_Invalid    },
-  /* 0F 25 */ { 0, &Ia_Invalid    },
-  /* 0F 26 */ { 0, &Ia_Invalid    },
-  /* 0F 27 */ { 0, &Ia_Invalid    },
-  /* 0F 28 */ { GRPSSE(0f28) },
-  /* 0F 29 */ { GRPSSE(0f29) },
-  /* 0F 2A */ { GRPSSE(640f2a) },
-  /* 0F 2B */ { GRPSSE(0f2b) },
-  /* 0F 2C */ { GRPSSE(0f2cQ) },
-  /* 0F 2D */ { GRPSSE(0f2dQ) },
-  /* 0F 2E */ { GRPSSE(0f2e) },
-  /* 0F 2F */ { GRPSSE(0f2f) },
-  /* 0F 30 */ { 0, &Ia_wrmsr },
-  /* 0F 31 */ { 0, &Ia_rdtsc },
-  /* 0F 32 */ { 0, &Ia_rdmsr },
-  /* 0F 33 */ { 0, &Ia_rdpmc },
-  /* 0F 34 */ { 0, &Ia_sysenter },
-  /* 0F 35 */ { 0, &Ia_sysexit  },
-  /* 0F 36 */ { 0, &Ia_Invalid  },
-  /* 0F 37 */ { 0, &Ia_Invalid  },
-  /* 0F 38 */ { GR3BTAB(A4) },
-  /* 0F 39 */ { 0, &Ia_Invalid  },
-  /* 0F 3A */ { GR3BTAB(A5) },
-  /* 0F 3B */ { 0, &Ia_Invalid  },
-  /* 0F 3C */ { 0, &Ia_Invalid  },
-  /* 0F 3D */ { 0, &Ia_Invalid  },
-  /* 0F 3E */ { 0, &Ia_Invalid  },
-  /* 0F 3F */ { 0, &Ia_Invalid  },
-  /* 0F 40 */ { 0, &Ia_cmovoq_Gq_Eq  },
-  /* 0F 41 */ { 0, &Ia_cmovnoq_Gq_Eq },
-  /* 0F 42 */ { 0, &Ia_cmovcq_Gq_Eq  },
-  /* 0F 43 */ { 0, &Ia_cmovncq_Gq_Eq },
-  /* 0F 44 */ { 0, &Ia_cmovzq_Gq_Eq  },
-  /* 0F 45 */ { 0, &Ia_cmovnzq_Gq_Eq },
-  /* 0F 46 */ { 0, &Ia_cmovnaq_Gq_Eq },
-  /* 0F 47 */ { 0, &Ia_cmovaq_Gq_Eq  },
-  /* 0F 48 */ { 0, &Ia_cmovsq_Gq_Eq  },
-  /* 0F 49 */ { 0, &Ia_cmovnsq_Gq_Eq },
-  /* 0F 4A */ { 0, &Ia_cmovpq_Gq_Eq  },
-  /* 0F 4B */ { 0, &Ia_cmovnpq_Gq_Eq },
-  /* 0F 4C */ { 0, &Ia_cmovlq_Gq_Eq  },
-  /* 0F 4D */ { 0, &Ia_cmovnlq_Gq_Eq },
-  /* 0F 4E */ { 0, &Ia_cmovngq_Gq_Eq },
-  /* 0F 4F */ { 0, &Ia_cmovgq_Gq_Eq  },
-  /* 0F 50 */ { GRPSSE(0f50) },
-  /* 0F 51 */ { GRPSSE(0f51) },
-  /* 0F 52 */ { GRPSSE(0f52) },
-  /* 0F 53 */ { GRPSSE(0f53) },
-  /* 0F 54 */ { GRPSSE(0f54) },
-  /* 0F 55 */ { GRPSSE(0f55) },
-  /* 0F 56 */ { GRPSSE(0f56) },
-  /* 0F 57 */ { GRPSSE(0f57) },
-  /* 0F 58 */ { GRPSSE(0f58) },
-  /* 0F 59 */ { GRPSSE(0f59) },
-  /* 0F 5A */ { GRPSSE(0f5a) },
-  /* 0F 5B */ { GRPSSE(0f5b) },
-  /* 0F 5C */ { GRPSSE(0f5c) },
-  /* 0F 5D */ { GRPSSE(0f5d) },
-  /* 0F 5E */ { GRPSSE(0f5e) },
-  /* 0F 5F */ { GRPSSE(0f5f) },
-  /* 0F 60 */ { GRPSSE(0f60) },
-  /* 0F 61 */ { GRPSSE(0f61) },
-  /* 0F 62 */ { GRPSSE(0f62) },
-  /* 0F 63 */ { GRPSSE(0f63) },
-  /* 0F 64 */ { GRPSSE(0f64) },
-  /* 0F 65 */ { GRPSSE(0f65) },
-  /* 0F 66 */ { GRPSSE(0f66) },
-  /* 0F 67 */ { GRPSSE(0f67) },
-  /* 0F 68 */ { GRPSSE(0f68) },
-  /* 0F 69 */ { GRPSSE(0f69) },
-  /* 0F 6A */ { GRPSSE(0f6a) },
-  /* 0F 6B */ { GRPSSE(0f6b) },
-  /* 0F 6C */ { GRPSSE(0f6c) },
-  /* 0F 6D */ { GRPSSE(0f6d) },
-  /* 0F 6E */ { GRPSSE(0f6eQ) },
-  /* 0F 6F */ { GRPSSE(0f6f) },
-  /* 0F 70 */ { GRPSSE(0f70) },
-  /* 0F 71 */ { GRPN(G12)    },
-  /* 0F 72 */ { GRPN(G13)    },
-  /* 0F 73 */ { GRPN(G14)    },
-  /* 0F 74 */ { GRPSSE(0f74) },
-  /* 0F 75 */ { GRPSSE(0f75) },
-  /* 0F 76 */ { GRPSSE(0f76) },
-  /* 0F 77 */ { 0, &Ia_emms  },
-  /* 0F 78 */ { 0, &Ia_Invalid },
-  /* 0F 79 */ { 0, &Ia_Invalid },
-  /* 0F 7A */ { 0, &Ia_Invalid },
-  /* 0F 7B */ { 0, &Ia_Invalid },
-  /* 0F 7C */ { GRPSSE(0f7c) },
-  /* 0F 7D */ { GRPSSE(0f7d) },
-  /* 0F 7E */ { GRPSSE(0f7eQ) },
-  /* 0F 7F */ { GRPSSE(0f7f) },
-  /* 0F 80 */ { 0, &Ia_jo_Jd     },
-  /* 0F 81 */ { 0, &Ia_jno_Jd    },
-  /* 0F 82 */ { 0, &Ia_jb_Jd     },
-  /* 0F 83 */ { 0, &Ia_jnb_Jd    },
-  /* 0F 84 */ { 0, &Ia_jz_Jd     },
-  /* 0F 85 */ { 0, &Ia_jnz_Jd    },
-  /* 0F 86 */ { 0, &Ia_jbe_Jd    },
-  /* 0F 87 */ { 0, &Ia_jnbe_Jd   },
-  /* 0F 88 */ { 0, &Ia_js_Jd     },
-  /* 0F 89 */ { 0, &Ia_jns_Jd    },
-  /* 0F 8A */ { 0, &Ia_jp_Jd     },
-  /* 0F 8B */ { 0, &Ia_jnp_Jd    },
-  /* 0F 8C */ { 0, &Ia_jl_Jd     },
-  /* 0F 8D */ { 0, &Ia_jnl_Jd    },
-  /* 0F 8E */ { 0, &Ia_jle_Jd    },
-  /* 0F 8F */ { 0, &Ia_jnle_Jd   },
-  /* 0F 90 */ { 0, &Ia_seto_Eb   },
-  /* 0F 91 */ { 0, &Ia_setno_Eb  },
-  /* 0F 92 */ { 0, &Ia_setb_Eb   },
-  /* 0F 93 */ { 0, &Ia_setnb_Eb  },
-  /* 0F 94 */ { 0, &Ia_setz_Eb   },
-  /* 0F 95 */ { 0, &Ia_setnz_Eb  },
-  /* 0F 96 */ { 0, &Ia_setbe_Eb  },
-  /* 0F 97 */ { 0, &Ia_setnbe_Eb },
-  /* 0F 98 */ { 0, &Ia_sets_Eb   },
-  /* 0F 99 */ { 0, &Ia_setns_Eb  },
-  /* 0F 9A */ { 0, &Ia_setp_Eb   },
-  /* 0F 9B */ { 0, &Ia_setnp_Eb  },
-  /* 0F 9C */ { 0, &Ia_setl_Eb   },
-  /* 0F 9D */ { 0, &Ia_setnl_Eb  },
-  /* 0F 9E */ { 0, &Ia_setle_Eb  },
-  /* 0F 9F */ { 0, &Ia_setnle_Eb },
-  /* 0F A0 */ { 0, &Ia_pushq_FS  },
-  /* 0F A1 */ { 0, &Ia_popq_FS   },
-  /* 0F A2 */ { 0, &Ia_cpuid     },
-  /* 0F A3 */ { 0, &Ia_btq_Eq_Gq },
-  /* 0F A4 */ { 0, &Ia_shldq_Eq_Gq_Ib },
-  /* 0F A5 */ { 0, &Ia_shldq_Eq_Gq_CL },
-  /* 0F A6 */ { 0, &Ia_Invalid    },
-  /* 0F A7 */ { 0, &Ia_Invalid    },
-  /* 0F A8 */ { 0, &Ia_pushq_GS   },
-  /* 0F A9 */ { 0, &Ia_popq_GS    },
-  /* 0F AA */ { 0, &Ia_rsm        },
-  /* 0F AB */ { 0, &Ia_btsq_Eq_Gq },
-  /* 0F AC */ { 0, &Ia_shrdq_Eq_Gq_Ib },
-  /* 0F AD */ { 0, &Ia_shrdq_Eq_Gq_CL },
-  /* 0F AE */ { GRPN(G15)         },
-  /* 0F AF */ { 0, &Ia_imulq_Gq_Eq    },
-  /* 0F B0 */ { 0, &Ia_cmpxchgb_Eb_Gb },
-  /* 0F B1 */ { 0, &Ia_cmpxchgq_Eq_Gq },
-  /* 0F B2 */ { 0, &Ia_lssq_Gq_Mp   },
-  /* 0F B3 */ { 0, &Ia_btrq_Eq_Gq   },
-  /* 0F B4 */ { 0, &Ia_lfsq_Gq_Mp   },
-  /* 0F B5 */ { 0, &Ia_lgsq_Gq_Mp   },
-  /* 0F B6 */ { 0, &Ia_movzbq_Gq_Eb },
-  /* 0F B7 */ { 0, &Ia_movzwq_Gq_Ew },
-  /* 0F B8 */ { 0, &Ia_Invalid      },
-  /* 0F B9 */ { 0, &Ia_ud2b         },
-  /* 0F BA */ { GRPN(G8EqIb)        },
-  /* 0F BB */ { 0, &Ia_btcq_Eq_Gq   },
-  /* 0F BC */ { 0, &Ia_bsfq_Gq_Eq   },
-  /* 0F BD */ { 0, &Ia_bsrq_Gq_Eq   },
-  /* 0F BE */ { 0, &Ia_movsbq_Gq_Eb },
-  /* 0F BF */ { 0, &Ia_movswq_Gq_Ew },
-  /* 0F C0 */ { 0, &Ia_xaddb_Eb_Gb  },
-  /* 0F C0 */ { 0, &Ia_xaddq_Eq_Gq  },
-  /* 0F C2 */ { GRPSSE(0fc2)      },
-  /* 0F C3 */ { GRPSSE(640fc3)    },
-  /* 0F C4 */ { GRPSSE(0fc4)      },
-  /* 0F C5 */ { GRPSSE(0fc5)      },
-  /* 0F C6 */ { GRPSSE(0fc6)      },
-  /* 0F C7 */ { GRPN(G9q)         },
-  /* 0F C8 */ { 0, &Ia_bswapq_RRX },
-  /* 0F C9 */ { 0, &Ia_bswapq_RRX },
-  /* 0F CA */ { 0, &Ia_bswapq_RRX },
-  /* 0F CB */ { 0, &Ia_bswapq_RRX },
-  /* 0F CC */ { 0, &Ia_bswapq_RRX },
-  /* 0F CD */ { 0, &Ia_bswapq_RRX },
-  /* 0F CE */ { 0, &Ia_bswapq_RRX },
-  /* 0F CF */ { 0, &Ia_bswapq_RRX },
-  /* 0F D0 */ { GRPSSE(0fd0) },
-  /* 0F D1 */ { GRPSSE(0fd1) },
-  /* 0F D2 */ { GRPSSE(0fd2) },
-  /* 0F D3 */ { GRPSSE(0fd3) },
-  /* 0F D4 */ { GRPSSE(0fd4) },
-  /* 0F D5 */ { GRPSSE(0fd5) },
-  /* 0F D6 */ { GRPSSE(0fd6) },
-  /* 0F D7 */ { GRPSSE(0fd7) },
-  /* 0F D8 */ { GRPSSE(0fd8) },
-  /* 0F D9 */ { GRPSSE(0fd9) },
-  /* 0F DA */ { GRPSSE(0fda) },
-  /* 0F DB */ { GRPSSE(0fdb) },
-  /* 0F DC */ { GRPSSE(0fdc) },
-  /* 0F DD */ { GRPSSE(0fdd) },
-  /* 0F DE */ { GRPSSE(0fde) },
-  /* 0F DF */ { GRPSSE(0fdf) },
-  /* 0F E0 */ { GRPSSE(0fe0) },
-  /* 0F E1 */ { GRPSSE(0fe1) },
-  /* 0F E2 */ { GRPSSE(0fe2) },
-  /* 0F E3 */ { GRPSSE(0fe3) },
-  /* 0F E4 */ { GRPSSE(0fe4) },
-  /* 0F E5 */ { GRPSSE(0fe5) },
-  /* 0F E6 */ { GRPSSE(0fe6) },
-  /* 0F E7 */ { GRPSSE(0fe7) },
-  /* 0F E8 */ { GRPSSE(0fe8) },
-  /* 0F E9 */ { GRPSSE(0fe9) },
-  /* 0F EA */ { GRPSSE(0fea) },
-  /* 0F EB */ { GRPSSE(0feb) },
-  /* 0F EC */ { GRPSSE(0fec) },
-  /* 0F ED */ { GRPSSE(0fed) },
-  /* 0F EE */ { GRPSSE(0fee) },
-  /* 0F EF */ { GRPSSE(0fef) },
-  /* 0F F0 */ { GRPSSE(0ff0) },
-  /* 0F F1 */ { GRPSSE(0ff1) },
-  /* 0F F2 */ { GRPSSE(0ff2) },
-  /* 0F F3 */ { GRPSSE(0ff3) },
-  /* 0F F4 */ { GRPSSE(0ff4) },
-  /* 0F F5 */ { GRPSSE(0ff5) },
-  /* 0F F6 */ { GRPSSE(0ff6) },
-  /* 0F F7 */ { GRPSSE(0ff7) },
-  /* 0F F8 */ { GRPSSE(0ff8) },
-  /* 0F F9 */ { GRPSSE(0ff9) },
-  /* 0F FA */ { GRPSSE(0ffa) },
-  /* 0F FB */ { GRPSSE(0ffb) },
-  /* 0F FC */ { GRPSSE(0ffc) },
-  /* 0F FD */ { GRPSSE(0ffd) },
-  /* 0F FE */ { GRPSSE(0ffe) },
-  /* 0F FF */ { 0, &Ia_Invalid }
-};
diff --git a/Externals/Bochs_disasm/dis_tables_avx.inc b/Externals/Bochs_disasm/dis_tables_avx.inc
new file mode 100644
index 0000000000..86bb55d14c
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_tables_avx.inc
@@ -0,0 +1,1478 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_tables_avx.inc 11878 2013-10-11 20:09:51Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2011 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************ */
+/* AVX VEX-encoded 0x0F, 0x0F 0x38 and 0x0F 0x3A opcodes */
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f10[4] = {
+  /* -- */ { 0, &Ia_vmovups_Vps_Wps },
+  /* 66 */ { 0, &Ia_vmovupd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_vmovss_Vss_Wss },
+  /* F2 */ { 0, &Ia_vmovsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f11[4] = {
+  /* -- */ { 0, &Ia_vmovups_Wps_Vps },
+  /* 66 */ { 0, &Ia_vmovupd_Wpd_Vpd },
+  /* F3 */ { 0, &Ia_vmovss_Wss_Vss },
+  /* F2 */ { 0, &Ia_vmovsd_Wsd_Vsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModVMOVHLPS[2] = {
+  /* R */ { 0, &Ia_vmovhlps_Vps_Hdq_Udq },
+  /* M */ { 0, &Ia_vmovlps_Vps_Hdq_Mq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f12[4] = {
+  /* -- */ { GRPMOD(VMOVHLPS) },
+  /* 66 */ { 0, &Ia_vmovlpd_Vpd_Hdq_Mq },
+  /* F3 */ { 0, &Ia_vmovsldup_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_vmovddup_Vdq_Wq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f13[2] = {
+  /* -- */ { 0, &Ia_vmovlps_Mq_Vps },
+  /* 66 */ { 0, &Ia_vmovlpd_Mq_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f14[2] = {
+  /* -- */ { 0, &Ia_vunpcklps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vunpcklpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f15[2] = {
+  /* -- */ { 0, &Ia_vunpckhps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vunpckhpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModVMOVLHPS[2] = {
+  /* R */ { 0, &Ia_vmovlhps_Vps_Hdq_Udq },
+  /* M */ { 0, &Ia_vmovhps_Vps_Hdq_Mq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f16[4] = {
+  /* -- */ { GRPMOD(VMOVLHPS) },
+  /* 66 */ { 0, &Ia_vmovhpd_Vpd_Hdq_Mq },
+  /* F3 */ { 0, &Ia_vmovshdup_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f17[2] = {
+  /* -- */ { 0, &Ia_vmovhps_Mq_Vps },
+  /* 66 */ { 0, &Ia_vmovhpd_Mq_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f28[2] = {
+  /* -- */ { 0, &Ia_vmovaps_Vps_Wps },
+  /* 66 */ { 0, &Ia_vmovapd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f29[2] = {
+  /* -- */ { 0, &Ia_vmovaps_Wps_Vps },
+  /* 66 */ { 0, &Ia_vmovapd_Wpd_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2a[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_vcvtsi2ss_Vss_Hps_Ey },
+  /* F2 */ { 0, &Ia_vcvtsi2sd_Vsd_Hpd_Ey }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2b[2] = {
+  /* -- */ { 0, &Ia_vmovntps_Mps_Vps },
+  /* 66 */ { 0, &Ia_vmovntpd_Mpd_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2c[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_vcvttss2si_Gy_Wss },
+  /* F2 */ { 0, &Ia_vcvttsd2si_Gy_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2d[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_vcvtss2si_Gy_Wss },
+  /* F2 */ { 0, &Ia_vcvtsd2si_Gy_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2e[2] = {
+  /* -- */ { 0, &Ia_vucomiss_Vss_Wss },
+  /* 66 */ { 0, &Ia_vucomisd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f2f[2] = {
+  /* -- */ { 0, &Ia_vcomiss_Vss_Wss },
+  /* 66 */ { 0, &Ia_vcomisd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f50[2] = {
+  /* -- */ { 0, &Ia_vmovmskps_Gd_Ups },
+  /* 66 */ { 0, &Ia_vmovmskpd_Gd_Upd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f51[4] = {
+  /* -- */ { 0, &Ia_vsqrtps_Vps_Wps },
+  /* 66 */ { 0, &Ia_vsqrtpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_vsqrtss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vsqrtsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f52[4] = {
+  /* -- */ { 0, &Ia_vrsqrtps_Vps_Wps },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_vrsqrtss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f53[4] = {
+  /* -- */ { 0, &Ia_vrcpps_Vps_Wps },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_vrcpss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f54[2] = {
+  /* -- */ { 0, &Ia_vandps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vandpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f55[2] = {
+  /* -- */ { 0, &Ia_vandnps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vandnpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f56[2] = {
+  /* -- */ { 0, &Ia_vorps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vorpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f57[2] = {
+  /* -- */ { 0, &Ia_vxorps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vxorpd_Vpd_Hpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f58[4] = {
+  /* -- */ { 0, &Ia_vaddps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vaddpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vaddss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vaddsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f59[4] = {
+  /* -- */ { 0, &Ia_vmulps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vmulpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vmulss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vmulsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5a[4] = {
+  /* -- */ { 0, &Ia_vcvtps2pd_Vpd_Wps },
+  /* 66 */ { 0, &Ia_vcvtpd2ps_Vps_Wpd },
+  /* F3 */ { 0, &Ia_vcvtss2sd_Vsd_Hpd_Wss },
+  /* F2 */ { 0, &Ia_vcvtsd2ss_Vss_Hps_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5b[4] = {
+  /* -- */ { 0, &Ia_vcvtdq2ps_Vps_Wdq },
+  /* 66 */ { 0, &Ia_vcvtps2dq_Vdq_Wps },
+  /* F3 */ { 0, &Ia_vcvttps2dq_Vdq_Wps },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5c[4] = {
+  /* -- */ { 0, &Ia_vsubps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vsubpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vsubss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vsubsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5d[4] = {
+  /* -- */ { 0, &Ia_vminps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vminpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vminss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vminsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5e[4] = {
+  /* -- */ { 0, &Ia_vdivps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vdivpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vdivss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vdivsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f5f[4] = {
+  /* -- */ { 0, &Ia_vmaxps_Vps_Hps_Wps },
+  /* 66 */ { 0, &Ia_vmaxpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_vmaxss_Vss_Hps_Wss },
+  /* F2 */ { 0, &Ia_vmaxsd_Vsd_Hpd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_AVX0f6e[3] = {
+  /* 0 */ { GRPSSE66(Ia_vmovd_Vdq_Ed) },
+  /* 1 */ { GRPSSE66(Ia_vmovq_Vdq_Eq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f6f[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vmovdqa_Vdq_Wdq },
+  /* F3 */ { 0, &Ia_vmovdqu_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f70[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vpshufd_Vdq_Hdq_Wdq_Ib },
+  /* F3 */ { 0, &Ia_vpshufhw_Vdq_Hdq_Wdq_Ib },
+  /* F2 */ { 0, &Ia_vpshuflw_Vdq_Hdq_Wdq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f7c[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vhaddpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_vhaddps_Vps_Hps_Wps }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f7d[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vhsubpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_vhsubps_Vps_Hps_Wps }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_AVX660f7e[3] = {
+  /* 0 */ { 0, &Ia_vmovd_Ed_Vd },
+  /* 1 */ { 0, &Ia_vmovq_Eq_Vq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f7e[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { GRPVEXW(AVX660f7e) },
+  /* F3 */ { 0, &Ia_vmovq_Vq_Wq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f7f[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vmovdqa_Wdq_Vdq },
+  /* F3 */ { 0, &Ia_vmovdqu_Wdq_Vdq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0fc2[4] = {
+  /* -- */ { 0, &Ia_vcmpps_Vps_Hps_Wps_Ib },
+  /* 66 */ { 0, &Ia_vcmppd_Vpd_Hpd_Wpd_Ib },
+  /* F3 */ { 0, &Ia_vcmpss_Vss_Hps_Wss_Ib },
+  /* F2 */ { 0, &Ia_vcmpsd_Vsd_Hpd_Wsd_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0fc6[2] = {
+  /* -- */ { 0, &Ia_vshufps_Vps_Hps_Wps_Ib },
+  /* 66 */ { 0, &Ia_vshufpd_Vpd_Hpd_Wpd_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0fd0[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vaddsubpd_Vpd_Hpd_Wpd },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_vaddsubps_Vps_Hps_Wps }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0fe6[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_vcvttpd2dq_Vq_Wpd },
+  /* F3 */ { 0, &Ia_vcvtdq2pd_Vpd_Wq },
+  /* F2 */ { 0, &Ia_vcvtpd2dq_Vq_Wpd }
+};
+
+/* Group12 */
+static BxDisasmOpcodeTable_t BxDisasmGroupAVXG12[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE66(Ia_vpsrlw_Hdq_Udq_Ib) },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { GRPSSE66(Ia_vpsraw_Hdq_Udq_Ib) },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE66(Ia_vpsllw_Hdq_Udq_Ib) },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group13 */
+static BxDisasmOpcodeTable_t BxDisasmGroupAVXG13[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE66(Ia_vpsrld_Hdq_Udq_Ib) },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { GRPSSE66(Ia_vpsrad_Hdq_Udq_Ib) },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE66(Ia_vpslld_Hdq_Udq_Ib) },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+/* Group14 */
+static BxDisasmOpcodeTable_t BxDisasmGroupAVXG14[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { GRPSSE66(Ia_vpsrlq_Hdq_Udq_Ib) },
+  /* 3 */ { GRPSSE66(Ia_vpsrldq_Hdq_Udq_Ib) },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { GRPSSE66(Ia_vpsllq_Hdq_Udq_Ib) },
+  /* 7 */ { GRPSSE66(Ia_vpslldq_Hdq_Udq_Ib) }
+};
+
+/* Group15 */
+static BxDisasmOpcodeTable_t BxDisasmGroupAVXG15M[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_vldmxcsr },
+  /* 3 */ { 0, &Ia_vstmxcsr },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModAVXG15[2] = {
+  /* R */ { 0, &Ia_Invalid },
+  /* M */ { GRPN(AVXG15M) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a16[2] = {
+  /* 0 */ { GRPSSE66(Ia_vpextrd_Ed_Vdq_Ib) },
+  /* 1 */ { GRPSSE66(Ia_vpextrq_Eq_Vdq_Ib) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a22[2] = {
+  /* 0 */ { GRPSSE66(Ia_vpinsrd_Vdq_Hdq_Ed_Ib) },
+  /* 1 */ { GRPSSE66(Ia_vpinsrq_Vdq_Hdq_Eq_Ib) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a00[2] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { GRPSSE66(Ia_vpermq_Vdq_Wdq_Ib) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a01[2] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { GRPSSE66(Ia_vpermpd_Vpd_Wpd_Ib) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3845[2] = {
+  /* 0 */ { GRPSSE66(Ia_vpsrlvd_Vdq_Hdq_Wdq) },
+  /* 1 */ { GRPSSE66(Ia_vpsrlvq_Vdq_Hdq_Wdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3847[2] = {
+  /* 0 */ { GRPSSE66(Ia_vpsllvd_Vdq_Hdq_Wdq) },
+  /* 1 */ { GRPSSE66(Ia_vpsllvq_Vdq_Hdq_Wdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f388c[2] = {
+  /* 0 */ { GRPSSE66(Ia_vmaskmovd_Vdq_Hdq_Mdq) },
+  /* 1 */ { GRPSSE66(Ia_vmaskmovq_Vdq_Hdq_Mdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f388e[2] = {
+  /* 0 */ { GRPSSE66(Ia_vmaskmovd_Mdq_Hdq_Vdq) },
+  /* 1 */ { GRPSSE66(Ia_vmaskmovq_Mdq_Hdq_Vdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3890[2] = {
+  /* 0 */ { GRPSSE66(Ia_vgatherdd_Vdq_VSib_Hdq) },
+  /* 1 */ { GRPSSE66(Ia_vgatherdq_Vdq_VSib_Hdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3891[2] = {
+  /* 0 */ { GRPSSE66(Ia_vgatherqd_Vdq_VSib_Hdq) },
+  /* 1 */ { GRPSSE66(Ia_vgatherqq_Vdq_VSib_Hdq) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3892[2] = {
+  /* 0 */ { GRPSSE66(Ia_vgatherdps_Vps_VSib_Hps) },
+  /* 1 */ { GRPSSE66(Ia_vgatherdpd_Vpd_VSib_Hpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3893[2] = {
+  /* 0 */ { GRPSSE66(Ia_vgatherqps_Vps_VSib_Hps) },
+  /* 1 */ { GRPSSE66(Ia_vgatherqpd_Vpd_VSib_Hpd) }
+};
+
+// FMA
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3896[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsub132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsub132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3897[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubadd132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubadd132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3898[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3899[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd132ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd132sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389a[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389b[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub132ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub132sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389c[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389d[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd132ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd132sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389e[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub132ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub132pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f389f[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub132ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub132sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38a6[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsub213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsub213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38a7[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubadd213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubadd213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38a8[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38a9[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd213ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd213sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38aa[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38ab[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub213ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub213sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38ac[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38ad[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd213ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd213sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38ae[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub213ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub213pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38af[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub213ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub213sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38b6[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsub231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsub231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38b7[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubadd231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubadd231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38b8[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38b9[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmadd231ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmadd231sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38ba[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38bb[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsub231ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfmsub231sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38bc[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38bd[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmadd231ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmadd231sd_Vpd_Hsd_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38be[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub231ps_Vps_Hps_Wps) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub231pd_Vpd_Hpd_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f38bf[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsub231ss_Vps_Hss_Wss) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsub231sd_Vpd_Hsd_Wsd) }
+};
+// FMA
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f38f5[4] = {
+  /* -- */ { 0, &Ia_bzhi_Gy_Ey_By },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_pext_Gy_By_Ey },
+  /* F2 */ { 0, &Ia_pdep_Gy_By_Ey }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupAVX_0f38f7[4] = {
+  /* -- */ { 0, &Ia_bextr_Gy_Ey_By },
+  /* 66 */ { 0, &Ia_shlx_Gy_Ey_By },
+  /* F3 */ { 0, &Ia_sarx_Gy_Ey_By },
+  /* F2 */ { 0, &Ia_shrx_Gy_Ey_By }
+};
+
+/* Group17 */
+static BxDisasmOpcodeTable_t BxDisasmGroupAVXG17[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_blsr_By_Ey },
+  /* 2 */ { 0, &Ia_blsmsk_By_Ey },
+  /* 3 */ { 0, &Ia_blsi_By_Ey },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+// FMA4 (AMD)
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a5c[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsubps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsubps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a5d[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsubpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsubpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a5e[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubaddps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubaddps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a5f[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubaddpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubaddpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a68[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a69[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6a[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddss_Vss_Hss_Wss_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddss_Vss_Hss_VIb_Wss) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6b[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmaddsd_Vsd_Hsd_Wsd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmaddsd_Vsd_Hsd_VIb_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6c[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6d[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6e[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubss_Vss_Hss_Wss_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubss_Vss_Hss_VIb_Wss) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a6f[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfmsubsd_Vsd_Hsd_Wsd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfmsubsd_Vsd_Hsd_VIb_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a78[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmaddps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmaddps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a79[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmaddpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmaddpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7a[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmaddss_Vss_Hss_Wss_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmaddss_Vss_Hss_VIb_Wss) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7b[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmaddsd_Vsd_Hsd_Wsd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmaddsd_Vsd_Hsd_VIb_Wsd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7c[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsubps_Vps_Hps_Wps_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsubps_Vps_Hps_VIb_Wps) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7d[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsubpd_Vpd_Hpd_Wpd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsubpd_Vpd_Hpd_VIb_Wpd) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7e[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsubss_Vss_Hss_Wss_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsubss_Vss_Hss_VIb_Wss) }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_0f3a7f[2] = {
+  /* 0 */ { GRPSSE66(Ia_vfnmsubsd_Vsd_Hsd_Wsd_VIb) },
+  /* 1 */ { GRPSSE66(Ia_vfnmsubsd_Vsd_Hsd_VIb_Wsd) }
+};
+// FMA4 (AMD)
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodesAVX[256*3] = {
+  // 256 entries for VEX-encoded 0x0F opcodes
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { 0, &Ia_Invalid },
+  /* 02 */ { 0, &Ia_Invalid },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { 0, &Ia_Invalid },
+  /* 09 */ { 0, &Ia_Invalid },
+  /* 0A */ { 0, &Ia_Invalid },
+  /* 0B */ { 0, &Ia_Invalid },
+  /* 0C */ { 0, &Ia_Invalid },
+  /* 0D */ { 0, &Ia_Invalid },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { GRPAVX(0f10) },
+  /* 11 */ { GRPAVX(0f11) },
+  /* 12 */ { GRPAVX(0f12) },
+  /* 13 */ { GRPAVX2(0f13) },
+  /* 14 */ { GRPAVX2(0f14) },
+  /* 15 */ { GRPAVX2(0f15) },
+  /* 16 */ { GRPAVX(0f16) },
+  /* 17 */ { GRPAVX2(0f17) },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { 0, &Ia_Invalid },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { 0, &Ia_Invalid },
+  /* 21 */ { 0, &Ia_Invalid },
+  /* 22 */ { 0, &Ia_Invalid },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { GRPAVX2(0f28) },
+  /* 29 */ { GRPAVX2(0f29) },
+  /* 2A */ { GRPAVX(0f2a) },
+  /* 2B */ { GRPAVX2(0f2b) },
+  /* 2C */ { GRPAVX(0f2c) },
+  /* 2C */ { GRPAVX(0f2d) },
+  /* 2E */ { GRPAVX2(0f2e) },
+  /* 2F */ { GRPAVX2(0f2f) },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { 0, &Ia_Invalid },
+  /* 41 */ { 0, &Ia_Invalid },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { GRPAVX2(0f50) },
+  /* 51 */ { GRPAVX(0f51) },
+  /* 52 */ { GRPAVX(0f52) },
+  /* 53 */ { GRPAVX(0f53) },
+  /* 54 */ { GRPAVX2(0f54) },
+  /* 55 */ { GRPAVX2(0f55) },
+  /* 56 */ { GRPAVX2(0f56) },
+  /* 57 */ { GRPAVX2(0f57) },
+  /* 58 */ { GRPAVX(0f58) },
+  /* 59 */ { GRPAVX(0f59) },
+  /* 5A */ { GRPAVX(0f5a) },
+  /* 5B */ { GRPAVX(0f5b) },
+  /* 5C */ { GRPAVX(0f5c) },
+  /* 5D */ { GRPAVX(0f5d) },
+  /* 5E */ { GRPAVX(0f5e) },
+  /* 5F */ { GRPAVX(0f5f) },
+  /* 60 */ { GRPSSE66(Ia_vpunpcklbw_Vdq_Hdq_Wdq) },
+  /* 61 */ { GRPSSE66(Ia_vpunpcklwd_Vdq_Hdq_Wdq) },
+  /* 62 */ { GRPSSE66(Ia_vpunpckldq_Vdq_Hdq_Wdq) },
+  /* 63 */ { GRPSSE66(Ia_vpacksswb_Vdq_Hdq_Wdq) },
+  /* 64 */ { GRPSSE66(Ia_vpcmpgtb_Vdq_Hdq_Wdq) },
+  /* 65 */ { GRPSSE66(Ia_vpcmpgtw_Vdq_Hdq_Wdq) },
+  /* 66 */ { GRPSSE66(Ia_vpcmpgtd_Vdq_Hdq_Wdq) },
+  /* 67 */ { GRPSSE66(Ia_vpackuswb_Vdq_Hdq_Wdq) },
+  /* 68 */ { GRPSSE66(Ia_vpunpckhbw_Vdq_Hdq_Wdq) },
+  /* 69 */ { GRPSSE66(Ia_vpunpckhwd_Vdq_Hdq_Wdq) },
+  /* 6A */ { GRPSSE66(Ia_vpunpckhdq_Vdq_Hdq_Wdq) },
+  /* 6B */ { GRPSSE66(Ia_vpackssdw_Vdq_Hdq_Wdq) },
+  /* 6C */ { GRPSSE66(Ia_vpunpcklqdq_Vdq_Hdq_Wdq) },
+  /* 6D */ { GRPSSE66(Ia_vpunpckhqdq_Vdq_Hdq_Wdq) },
+  /* 6E */ { GRPVEXW(AVX0f6e) },
+  /* 6F */ { GRPAVX(0f6f) },
+  /* 70 */ { GRPAVX(0f70) },
+  /* 71 */ { GRPN(AVXG12) },
+  /* 72 */ { GRPN(AVXG13) },
+  /* 73 */ { GRPN(AVXG14) },
+  /* 74 */ { GRPSSE66(Ia_vpcmpeqb_Vdq_Hdq_Wdq) },
+  /* 75 */ { GRPSSE66(Ia_vpcmpeqw_Vdq_Hdq_Wdq) },
+  /* 76 */ { GRPSSE66(Ia_vpcmpeqd_Vdq_Hdq_Wdq) },
+  /* 77 */ { GRPSSENONE(Ia_vzeroupper) },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { GRPAVX(0f7c) },
+  /* 7D */ { GRPAVX(0f7d) },
+  /* 7E */ { GRPAVX(0f7e) },
+  /* 7F */ { GRPAVX(0f7f) },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_Invalid },
+  /* 97 */ { 0, &Ia_Invalid },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { GRPMOD(AVXG15) },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { GRPAVX(0fc2) },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { GRPSSE66(Ia_vpinsrw_Vdq_Hdq_Ew_Ib) },
+  /* C5 */ { GRPSSE66(Ia_vpextrw_Gd_Udq_Ib) },
+  /* C6 */ { GRPAVX2(0fc6) },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { GRPAVX(0fd0) },
+  /* D1 */ { GRPSSE66(Ia_vpsrlw_Vdq_Hdq_Wdq) },
+  /* D2 */ { GRPSSE66(Ia_vpsrld_Vdq_Hdq_Wdq) },
+  /* D3 */ { GRPSSE66(Ia_vpsrlq_Vdq_Hdq_Wdq) },
+  /* D4 */ { GRPSSE66(Ia_vpaddq_Vdq_Hdq_Wdq) },
+  /* D5 */ { GRPSSE66(Ia_vpmullw_Vdq_Hdq_Wdq) },
+  /* D6 */ { GRPSSE66(Ia_vmovq_Wq_Vq) },
+  /* D7 */ { GRPSSE66(Ia_vpmovmskb_Gd_Udq) },
+  /* D8 */ { GRPSSE66(Ia_vpsubusb_Vdq_Hdq_Wdq) },
+  /* D9 */ { GRPSSE66(Ia_vpsubusw_Vdq_Hdq_Wdq) },
+  /* DA */ { GRPSSE66(Ia_vpminub_Vdq_Hdq_Wdq) },
+  /* DB */ { GRPSSE66(Ia_vpand_Vdq_Hdq_Wdq) },
+  /* DC */ { GRPSSE66(Ia_vpaddusb_Vdq_Hdq_Wdq) },
+  /* DD */ { GRPSSE66(Ia_vpaddusw_Vdq_Hdq_Wdq) },
+  /* DE */ { GRPSSE66(Ia_vpmaxub_Vdq_Hdq_Wdq) },
+  /* DF */ { GRPSSE66(Ia_vpandn_Vdq_Hdq_Wdq) },
+  /* E0 */ { GRPSSE66(Ia_vpavgb_Vdq_Hdq_Wdq) },
+  /* E1 */ { GRPSSE66(Ia_vpsraw_Vdq_Hdq_Wdq) },
+  /* E2 */ { GRPSSE66(Ia_vpsrad_Vdq_Hdq_Wdq) },
+  /* E3 */ { GRPSSE66(Ia_vpavgw_Vdq_Hdq_Wdq) },
+  /* E4 */ { GRPSSE66(Ia_vpmulhuw_Vdq_Hdq_Wdq) },
+  /* E5 */ { GRPSSE66(Ia_vpmulhw_Vdq_Hdq_Wdq) },
+  /* E6 */ { GRPAVX(0fe6) },
+  /* E7 */ { GRPSSE66(Ia_vmovntdq_Mdq_Vdq) },
+  /* E8 */ { GRPSSE66(Ia_vpsubsb_Vdq_Hdq_Wdq) },
+  /* E9 */ { GRPSSE66(Ia_vpsubsw_Vdq_Hdq_Wdq) },
+  /* EA */ { GRPSSE66(Ia_vpminsw_Vdq_Hdq_Wdq) },
+  /* EB */ { GRPSSE66(Ia_vpor_Vdq_Hdq_Wdq) },
+  /* EC */ { GRPSSE66(Ia_vpaddsb_Vdq_Hdq_Wdq) },
+  /* ED */ { GRPSSE66(Ia_vpaddsw_Vdq_Hdq_Wdq) },
+  /* EE */ { GRPSSE66(Ia_vpmaxsw_Vdq_Hdq_Wdq) },
+  /* EF */ { GRPSSE66(Ia_vpxor_Vdq_Hdq_Wdq) },
+  /* F0 */ { GRPSSEF2(Ia_vlddqu_Vdq_Mdq) },
+  /* F1 */ { GRPSSE66(Ia_vpsllw_Vdq_Hdq_Wdq) },
+  /* F2 */ { GRPSSE66(Ia_vpslld_Vdq_Hdq_Wdq) },
+  /* F3 */ { GRPSSE66(Ia_vpsllq_Vdq_Hdq_Wdq) },
+  /* F4 */ { GRPSSE66(Ia_vpmuludq_Vdq_Hdq_Wdq) },
+  /* F5 */ { GRPSSE66(Ia_vpmaddwd_Vdq_Hdq_Wdq) },
+  /* F6 */ { GRPSSE66(Ia_vpsadbw_Vdq_Hdq_Wdq) },
+  /* F7 */ { GRPSSE66(Ia_vmaskmovdqu_Vdq_Udq) },
+  /* F8 */ { GRPSSE66(Ia_vpsubb_Vdq_Hdq_Wdq) },
+  /* F9 */ { GRPSSE66(Ia_vpsubw_Vdq_Hdq_Wdq) },
+  /* FA */ { GRPSSE66(Ia_vpsubd_Vdq_Hdq_Wdq) },
+  /* FB */ { GRPSSE66(Ia_vpsubq_Vdq_Hdq_Wdq) },
+  /* FC */ { GRPSSE66(Ia_vpaddb_Vdq_Hdq_Wdq) },
+  /* FD */ { GRPSSE66(Ia_vpaddw_Vdq_Hdq_Wdq) },
+  /* FE */ { GRPSSE66(Ia_vpaddd_Vdq_Hdq_Wdq) },
+  /* FF */ { 0, &Ia_Invalid },
+
+  // 256 entries for VEX-encoded 0x0F 0x38 opcodes
+  /* 00 */ { GRPSSE66(Ia_vpshufb_Vdq_Hdq_Wdq) },
+  /* 01 */ { GRPSSE66(Ia_vphaddw_Vdq_Hdq_Wdq) },
+  /* 02 */ { GRPSSE66(Ia_vphaddd_Vdq_Hdq_Wdq) },
+  /* 03 */ { GRPSSE66(Ia_vphaddsw_Vdq_Hdq_Wdq) },
+  /* 04 */ { GRPSSE66(Ia_vpmaddubsw_Vdq_Hdq_Wdq) },
+  /* 05 */ { GRPSSE66(Ia_vphsubw_Vdq_Hdq_Wdq) },
+  /* 06 */ { GRPSSE66(Ia_vphsubd_Vdq_Hdq_Wdq) },
+  /* 07 */ { GRPSSE66(Ia_vphsubsw_Vdq_Hdq_Wdq) },
+  /* 08 */ { GRPSSE66(Ia_vpsignb_Vdq_Hdq_Wdq) },
+  /* 09 */ { GRPSSE66(Ia_vpsignw_Vdq_Hdq_Wdq) },
+  /* 0A */ { GRPSSE66(Ia_vpsignd_Vdq_Hdq_Wdq) },
+  /* 0B */ { GRPSSE66(Ia_vpmulhrsw_Vdq_Hdq_Wdq) },
+  /* 0C */ { GRPSSE66(Ia_vpermilps_Vps_Hps_Wps) },
+  /* 0D */ { GRPSSE66(Ia_vpermilpd_Vpd_Hpd_Wpd) },
+  /* 0E */ { GRPSSE66(Ia_vtestps_Vps_Wps) },
+  /* 0F */ { GRPSSE66(Ia_vtestpd_Vpd_Wpd) },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { GRPSSE66(Ia_vcvtph2ps_Vps_Wq) },
+  /* 14 */ { 0, &Ia_Invalid },
+  /* 15 */ { 0, &Ia_Invalid },
+  /* 16 */ { GRPSSE66(Ia_vpermps_Vps_Hps_Wps) },
+  /* 17 */ { GRPSSE66(Ia_vptest_Vdq_Wdq) },
+  /* 18 */ { GRPSSE66(Ia_vbroadcastss_Vps_Wss) },
+  /* 19 */ { GRPSSE66(Ia_vbroadcastsd_Vpd_Wsd) },
+  /* 1A */ { GRPSSE66(Ia_vbroadcastf128_Vdq_Mdq) },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { GRPSSE66(Ia_vpabsb_Vdq_Hdq_Wdq) },
+  /* 1D */ { GRPSSE66(Ia_vpabsw_Vdq_Hdq_Wdq) },
+  /* 1E */ { GRPSSE66(Ia_vpabsd_Vdq_Hdq_Wdq) },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { GRPSSE66(Ia_vpmovsxbw_Vdq_Wq) },
+  /* 21 */ { GRPSSE66(Ia_vpmovsxbd_Vdq_Wd) },
+  /* 22 */ { GRPSSE66(Ia_vpmovsxbq_Vdq_Ww) },
+  /* 23 */ { GRPSSE66(Ia_vpmovsxwd_Vdq_Wq) },
+  /* 24 */ { GRPSSE66(Ia_vpmovsxwq_Vdq_Wd) },
+  /* 25 */ { GRPSSE66(Ia_vpmovsxdq_Vdq_Wq) },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { GRPSSE66(Ia_vpmuldq_Vdq_Hdq_Wdq) },
+  /* 29 */ { GRPSSE66(Ia_vpcmpeqq_Vdq_Hdq_Wdq) },
+  /* 2A */ { GRPSSE66(Ia_vmovntdqa_Vdq_Mdq) },
+  /* 2B */ { GRPSSE66(Ia_vpackusdw_Vdq_Hdq_Wdq) },
+  /* 2C */ { GRPSSE66(Ia_vmaskmovps_Vps_Hps_Mps) },
+  /* 2D */ { GRPSSE66(Ia_vmaskmovpd_Vpd_Hpd_Mpd) },
+  /* 2E */ { GRPSSE66(Ia_vmaskmovps_Mps_Hps_Vps) },
+  /* 2F */ { GRPSSE66(Ia_vmaskmovpd_Mpd_Hpd_Vpd) },
+  /* 30 */ { GRPSSE66(Ia_vpmovzxbw_Vdq_Wq) },
+  /* 31 */ { GRPSSE66(Ia_vpmovzxbd_Vdq_Wd) },
+  /* 32 */ { GRPSSE66(Ia_vpmovzxbq_Vdq_Ww) },
+  /* 33 */ { GRPSSE66(Ia_vpmovzxwd_Vdq_Wq) },
+  /* 34 */ { GRPSSE66(Ia_vpmovzxwq_Vdq_Wd) },
+  /* 35 */ { GRPSSE66(Ia_vpmovzxdq_Vdq_Wq) },
+  /* 36 */ { GRPSSE66(Ia_vpermd_Vdq_Hdq_Wdq) },
+  /* 37 */ { GRPSSE66(Ia_vpcmpgtq_Vdq_Hdq_Wdq) },
+  /* 38 */ { GRPSSE66(Ia_vpminsb_Vdq_Hdq_Wdq) },
+  /* 39 */ { GRPSSE66(Ia_vpminsd_Vdq_Hdq_Wdq) },
+  /* 3A */ { GRPSSE66(Ia_vpminuw_Vdq_Hdq_Wdq) },
+  /* 3B */ { GRPSSE66(Ia_vpminud_Vdq_Hdq_Wdq) },
+  /* 3C */ { GRPSSE66(Ia_vpmaxsb_Vdq_Hdq_Wdq) },
+  /* 3D */ { GRPSSE66(Ia_vpmaxsd_Vdq_Hdq_Wdq) },
+  /* 3E */ { GRPSSE66(Ia_vpmaxuw_Vdq_Hdq_Wdq) },
+  /* 3F */ { GRPSSE66(Ia_vpmaxud_Vdq_Hdq_Wdq) },
+  /* 40 */ { GRPSSE66(Ia_vpmulld_Vdq_Hdq_Wdq) },
+  /* 41 */ { GRPSSE66(Ia_vphminposuw_Vdq_Wdq) },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { GRPVEXW(0f3845) },
+  /* 46 */ { GRPSSE66(Ia_vpsravd_Vdq_Hdq_Wdq) },
+  /* 47 */ { GRPVEXW(0f3847) },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { GRPSSE66(Ia_vpbroadcastd_Vdq_Wd) },
+  /* 59 */ { GRPSSE66(Ia_vpbroadcastq_Vdq_Wq) },
+  /* 5A */ { GRPSSE66(Ia_vbroadcasti128_Vdq_Mdq) },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { GRPSSE66(Ia_vpbroadcastb_Vdq_Wb) },
+  /* 79 */ { GRPSSE66(Ia_vpbroadcastw_Vdq_Ww) },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { GRPVEXW(0f388c) },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { GRPVEXW(0f388e) },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { GRPVEXW(0f3890) },
+  /* 91 */ { GRPVEXW(0f3891) },
+  /* 92 */ { GRPVEXW(0f3892) },
+  /* 93 */ { GRPVEXW(0f3893) },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { GRPVEXW(0f3896) },
+  /* 97 */ { GRPVEXW(0f3897) },
+  /* 98 */ { GRPVEXW(0f3898) },
+  /* 99 */ { GRPVEXW(0f3899) },
+  /* 9A */ { GRPVEXW(0f389a) },
+  /* 9B */ { GRPVEXW(0f389b) },
+  /* 9C */ { GRPVEXW(0f389c) },
+  /* 9D */ { GRPVEXW(0f389d) },
+  /* 9E */ { GRPVEXW(0f389e) },
+  /* 9F */ { GRPVEXW(0f389f) },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { GRPVEXW(0f38a6) },
+  /* A7 */ { GRPVEXW(0f38a7) },
+  /* A8 */ { GRPVEXW(0f38a8) },
+  /* A9 */ { GRPVEXW(0f38a9) },
+  /* AA */ { GRPVEXW(0f38aa) },
+  /* AB */ { GRPVEXW(0f38ab) },
+  /* AC */ { GRPVEXW(0f38ac) },
+  /* AD */ { GRPVEXW(0f38ad) },
+  /* AE */ { GRPVEXW(0f38ae) },
+  /* AF */ { GRPVEXW(0f38af) },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { GRPVEXW(0f38b6) },
+  /* B7 */ { GRPVEXW(0f38b7) },
+  /* B8 */ { GRPVEXW(0f38b8) },
+  /* B9 */ { GRPVEXW(0f38b9) },
+  /* BA */ { GRPVEXW(0f38ba) },
+  /* BB */ { GRPVEXW(0f38bb) },
+  /* BC */ { GRPVEXW(0f38bc) },
+  /* BD */ { GRPVEXW(0f38bd) },
+  /* BE */ { GRPVEXW(0f38be) },
+  /* BF */ { GRPVEXW(0f38bf) },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { GRPSSE66(Ia_vaesimc_Vdq_Wdq) },
+  /* DC */ { GRPSSE66(Ia_vaesenc_Vdq_Hdq_Wdq) },
+  /* DD */ { GRPSSE66(Ia_vaesenclast_Vdq_Hdq_Wdq) },
+  /* DE */ { GRPSSE66(Ia_vaesdec_Vdq_Hdq_Wdq) },
+  /* DF */ { GRPSSE66(Ia_vaesdeclast_Vdq_Hdq_Wdq) },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_andn_Gy_By_Ey },
+  /* F3 */ { GRPN(AVXG17) },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { GRPAVX(0f38f5) },
+  /* F6 */ { GRPSSEF2(Ia_mulx_By_Gy_Ey) },
+  /* F7 */ { GRPAVX(0f38f7) },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid },
+
+  // 256 entries for VEX-encoded 0x0F 0x3A opcodes
+  /* 00 */ { GRPVEXW(0f3a00) },
+  /* 01 */ { GRPVEXW(0f3a01) },
+  /* 02 */ { GRPSSE66(Ia_vpblendd_Vdq_Hdq_Wdq_Ib) },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { GRPSSE66(Ia_vpermilps_Vps_Wps_Ib) },
+  /* 05 */ { GRPSSE66(Ia_vpermilpd_Vpd_Wpd_Ib) },
+  /* 06 */ { GRPSSE66(Ia_vperm2f128_Vdq_Hdq_Wdq_Ib) },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { GRPSSE66(Ia_vroundps_Vps_Wps_Ib) },
+  /* 09 */ { GRPSSE66(Ia_vroundpd_Vpd_Wpd_Ib) },
+  /* 0A */ { GRPSSE66(Ia_vroundss_Vss_Hps_Wss_Ib) },
+  /* 0B */ { GRPSSE66(Ia_vroundsd_Vsd_Hpd_Wsd_Ib) },
+  /* 0C */ { GRPSSE66(Ia_vblendps_Vps_Hps_Wps_Ib) },
+  /* 0D */ { GRPSSE66(Ia_vblendpd_Vpd_Hpd_Wpd_Ib) },
+  /* 0E */ { GRPSSE66(Ia_vpblendw_Vdq_Hdq_Wdq_Ib) },
+  /* 0F */ { GRPSSE66(Ia_vpalignr_Vdq_Hdq_Wdq_Ib) },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { GRPSSE66(Ia_vpextrb_Ebd_Vdq_Ib) },
+  /* 15 */ { GRPSSE66(Ia_vpextrw_Ewd_Vdq_Ib) },
+  /* 16 */ { GRPVEXW(0f3a16) },
+  /* 17 */ { GRPSSE66(Ia_vextractps_Ed_Vdq_Ib) },
+  /* 18 */ { GRPSSE66(Ia_vinsertf128_Vdq_Hdq_Wdq_Ib) },
+  /* 19 */ { GRPSSE66(Ia_vextractf128_Wdq_Vdq_Ib) },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { GRPSSE66(Ia_vcvtps2ph_Wq_Vps_Ib) },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { GRPSSE66(Ia_vpinsrb_Vdq_Hdq_Ew_Ib) },
+  /* 21 */ { GRPSSE66(Ia_vinsertps_Vps_Hps_Wss_Ib) },
+  /* 22 */ { GRPVEXW(0f3a22) },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { GRPSSE66(Ia_vinserti128_Vdq_Hdq_Wdq_Ib) },
+  /* 39 */ { GRPSSE66(Ia_vextracti128_Wdq_Vdq_Ib) },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { GRPSSE66(Ia_vdpps_Vps_Hps_Wps_Ib) },
+  /* 41 */ { GRPSSE66(Ia_vdppd_Vpd_Hpd_Wpd_Ib) },
+  /* 42 */ { GRPSSE66(Ia_vmpsadbw_Vdq_Hdq_Wdq_Ib) },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { GRPSSE66(Ia_vpclmulqdq_Vdq_Hdq_Wdq_Ib) },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { GRPSSE66(Ia_vperm2i128_Vdq_Hdq_Wdq_Ib) },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { GRPSSE66(Ia_vblendvps_Vps_Hps_Wps_Ib) },
+  /* 4B */ { GRPSSE66(Ia_vblendvpd_Vpd_Hpd_Wpd_Ib) },
+  /* 4C */ { GRPSSE66(Ia_vpblendvb_Vdq_Hdq_Wdq_Ib) },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { GRPVEXW(0f3a5c) },
+  /* 5D */ { GRPVEXW(0f3a5d) },
+  /* 5E */ { GRPVEXW(0f3a5e) },
+  /* 5F */ { GRPVEXW(0f3a5f) },
+  /* 60 */ { GRPSSE66(Ia_vpcmpestrm_Vdq_Wdq_Ib) },
+  /* 61 */ { GRPSSE66(Ia_vpcmpestri_Vdq_Wdq_Ib) },
+  /* 62 */ { GRPSSE66(Ia_vpcmpistrm_Vdq_Wdq_Ib) },
+  /* 63 */ { GRPSSE66(Ia_vpcmpistri_Vdq_Wdq_Ib) },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { GRPVEXW(0f3a68) },
+  /* 69 */ { GRPVEXW(0f3a69) },
+  /* 6A */ { GRPVEXW(0f3a6a) },
+  /* 6B */ { GRPVEXW(0f3a6b) },
+  /* 6C */ { GRPVEXW(0f3a6c) },
+  /* 6D */ { GRPVEXW(0f3a6d) },
+  /* 6E */ { GRPVEXW(0f3a6e) },
+  /* 6F */ { GRPVEXW(0f3a6f) },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { GRPVEXW(0f3a78) },
+  /* 79 */ { GRPVEXW(0f3a79) },
+  /* 7A */ { GRPVEXW(0f3a7a) },
+  /* 7B */ { GRPVEXW(0f3a7b) },
+  /* 7C */ { GRPVEXW(0f3a7c) },
+  /* 7D */ { GRPVEXW(0f3a7d) },
+  /* 7E */ { GRPVEXW(0f3a7e) },
+  /* 7F */ { GRPVEXW(0f3a7f) },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_Invalid },
+  /* 97 */ { 0, &Ia_Invalid },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_Invalid },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { GRPSSE66(Ia_vaeskeygenassist_Vdq_Wdq_Ib) },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_rorx_Gy_Ey_Ib },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid }
+};
diff --git a/Externals/Bochs_disasm/dis_tables_sse.inc b/Externals/Bochs_disasm/dis_tables_sse.inc
new file mode 100644
index 0000000000..e31fdec200
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_tables_sse.inc
@@ -0,0 +1,1452 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_tables_sse.inc 11878 2013-10-11 20:09:51Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2013 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************ */
+/* SSE opcodes */
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_ERR[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f10[4] = {
+  /* -- */ { 0, &Ia_movups_Vps_Wps },
+  /* 66 */ { 0, &Ia_movupd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_movss_Vss_Wss },
+  /* F2 */ { 0, &Ia_movsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f11[4] = {
+  /* -- */ { 0, &Ia_movups_Wps_Vps },
+  /* 66 */ { 0, &Ia_movupd_Wpd_Vpd },
+  /* F3 */ { 0, &Ia_movss_Wss_Vss },
+  /* F2 */ { 0, &Ia_movsd_Wsd_Vsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModMOVHLPS[2] = {
+  /* R */ { 0, &Ia_movhlps_Vps_Udq },
+  /* M */ { 0, &Ia_movlps_Vps_Mq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f12[4] = {
+  /* -- */ { GRPMOD(MOVHLPS) },
+  /* 66 */ { 0, &Ia_movlpd_Vpd_Mq },
+  /* F3 */ { 0, &Ia_movsldup_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_movddup_Vdq_Wq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f13[2] = {
+  /* -- */ { 0, &Ia_movlps_Mq_Vps },
+  /* 66 */ { 0, &Ia_movlpd_Mq_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f14[2] = {
+  /* -- */ { 0, &Ia_unpcklps_Vps_Wps },
+  /* 66 */ { 0, &Ia_unpcklpd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f15[2] = {
+  /* -- */ { 0, &Ia_unpckhps_Vps_Wps },
+  /* 66 */ { 0, &Ia_unpckhpd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupModMOVLHPS[2] = {
+  /* R */ { 0, &Ia_movlhps_Vps_Udq },
+  /* M */ { 0, &Ia_movhps_Vps_Mq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f16[4] = {
+  /* -- */ { GRPMOD(MOVLHPS) },
+  /* 66 */ { 0, &Ia_movhpd_Vpd_Mq },
+  /* F3 */ { 0, &Ia_movshdup_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f17[2] = {
+  /* -- */ { 0, &Ia_movhps_Mq_Vps },
+  /* 66 */ { 0, &Ia_movhpd_Mq_Vpd },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f28[2] = {
+  /* -- */ { 0, &Ia_movaps_Vps_Wps },
+  /* 66 */ { 0, &Ia_movapd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f29[2] = {
+  /* -- */ { 0, &Ia_movaps_Wps_Vps },
+  /* 66 */ { 0, &Ia_movapd_Wpd_Vpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2a[4] = {
+  /* -- */ { 0, &Ia_cvtpi2ps_Vps_Qq },
+  /* 66 */ { 0, &Ia_cvtpi2pd_Vpd_Qq },
+  /* F3 */ { 0, &Ia_cvtsi2ss_Vss_Ey },
+  /* F2 */ { 0, &Ia_cvtsi2sd_Vsd_Ey }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2b[4] = {
+  /* -- */ { 0, &Ia_movntps_Mps_Vps },
+  /* 66 */ { 0, &Ia_movntpd_Mpd_Vpd },
+  /* F3 */ { 0, &Ia_movntss_Mss_Vss }, // SSE4A
+  /* F2 */ { 0, &Ia_movntsd_Msd_Vsd }  // SSE4A
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2c[4] = {
+  /* -- */ { 0, &Ia_cvttps2pi_Pq_Wps },
+  /* 66 */ { 0, &Ia_cvttpd2pi_Pq_Wpd },
+  /* F3 */ { 0, &Ia_cvttss2si_Gy_Wss },
+  /* F2 */ { 0, &Ia_cvttsd2si_Gy_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2d[4] = {
+  /* -- */ { 0, &Ia_cvtps2pi_Pq_Wps },
+  /* 66 */ { 0, &Ia_cvtpd2pi_Pq_Wpd },
+  /* F3 */ { 0, &Ia_cvtss2si_Gy_Wss },
+  /* F2 */ { 0, &Ia_cvtsd2si_Gy_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2e[2] = {
+  /* -- */ { 0, &Ia_ucomiss_Vss_Wss },
+  /* 66 */ { 0, &Ia_ucomisd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f2f[2] = {
+  /* -- */ { 0, &Ia_comiss_Vss_Wss },
+  /* 66 */ { 0, &Ia_comisd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f50[2] = {
+  /* -- */ { 0, &Ia_movmskps_Gd_Ups },
+  /* 66 */ { 0, &Ia_movmskpd_Gd_Upd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f51[4] = {
+  /* -- */ { 0, &Ia_sqrtps_Vps_Wps },
+  /* 66 */ { 0, &Ia_sqrtpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_sqrtss_Vss_Wss },
+  /* F2 */ { 0, &Ia_sqrtsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f52[4] = {
+  /* -- */ { 0, &Ia_rsqrtps_Vps_Wps },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_rsqrtss_Vss_Wss },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f53[4] = {
+  /* -- */ { 0, &Ia_rcpps_Vps_Wps },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_rcpss_Vss_Wss },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f54[2] = {
+  /* -- */ { 0, &Ia_andps_Vps_Wps },
+  /* 66 */ { 0, &Ia_andpd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f55[2] = {
+  /* -- */ { 0, &Ia_andnps_Vps_Wps },
+  /* 66 */ { 0, &Ia_andnpd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f56[2] = {
+  /* -- */ { 0, &Ia_orps_Vps_Wps },
+  /* 66 */ { 0, &Ia_orpd_Vpd_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f57[2] = {
+  /* -- */ { 0, &Ia_xorps_Vps_Wps },
+  /* 66 */ { 0, &Ia_xorpd_Vpd_Wpd },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f58[4] = {
+  /* -- */ { 0, &Ia_addps_Vps_Wps },
+  /* 66 */ { 0, &Ia_addpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_addss_Vss_Wss },
+  /* F2 */ { 0, &Ia_addsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f59[4] = {
+  /* -- */ { 0, &Ia_mulps_Vps_Wps },
+  /* 66 */ { 0, &Ia_mulpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_mulss_Vss_Wss },
+  /* F2 */ { 0, &Ia_mulsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5a[4] = {
+  /* -- */ { 0, &Ia_cvtps2pd_Vpd_Wps },
+  /* 66 */ { 0, &Ia_cvtpd2ps_Vps_Wpd },
+  /* F3 */ { 0, &Ia_cvtss2sd_Vsd_Wss },
+  /* F2 */ { 0, &Ia_cvtsd2ss_Vss_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5b[4] = {
+  /* -- */ { 0, &Ia_cvtdq2ps_Vps_Wdq },
+  /* 66 */ { 0, &Ia_cvtps2dq_Vdq_Wps },
+  /* F3 */ { 0, &Ia_cvttps2dq_Vdq_Wps },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5c[4] = {
+  /* -- */ { 0, &Ia_subps_Vps_Wps },
+  /* 66 */ { 0, &Ia_subpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_subss_Vss_Wss },
+  /* F2 */ { 0, &Ia_subsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5d[4] = {
+  /* -- */ { 0, &Ia_minps_Vps_Wps },
+  /* 66 */ { 0, &Ia_minpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_minss_Vss_Wss },
+  /* F2 */ { 0, &Ia_minsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5e[4] = {
+  /* -- */ { 0, &Ia_divps_Vps_Wps },
+  /* 66 */ { 0, &Ia_divpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_divss_Vss_Wss },
+  /* F2 */ { 0, &Ia_divsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f5f[4] = {
+  /* -- */ { 0, &Ia_maxps_Vps_Wps },
+  /* 66 */ { 0, &Ia_maxpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_maxss_Vss_Wss },
+  /* F2 */ { 0, &Ia_maxsd_Vsd_Wsd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f60[2] = {
+  /* -- */ { 0, &Ia_punpcklbw_Pq_Qd },
+  /* 66 */ { 0, &Ia_punpcklbw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f61[2] = {
+  /* -- */ { 0, &Ia_punpcklwd_Pq_Qd },
+  /* 66 */ { 0, &Ia_punpcklwd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f62[2] = {
+  /* -- */ { 0, &Ia_punpckldq_Pq_Qd },
+  /* 66 */ { 0, &Ia_punpckldq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f63[2] = {
+  /* -- */ { 0, &Ia_packsswb_Pq_Qq },
+  /* 66 */ { 0, &Ia_packsswb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f64[2] = {
+  /* -- */ { 0, &Ia_pcmpgtb_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpgtb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f65[2] = {
+  /* -- */ { 0, &Ia_pcmpgtw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpgtw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f66[2] = {
+  /* -- */ { 0, &Ia_pcmpgtd_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpgtd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f67[2] = {
+  /* -- */ { 0, &Ia_packuswb_Pq_Qq },
+  /* 66 */ { 0, &Ia_packuswb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f68[2] = {
+  /* -- */ { 0, &Ia_punpckhbw_Pq_Qq },
+  /* 66 */ { 0, &Ia_punpckhbw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f69[2] = {
+  /* -- */ { 0, &Ia_punpckhwd_Pq_Qq },
+  /* 66 */ { 0, &Ia_punpckhwd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6a[2] = {
+  /* -- */ { 0, &Ia_punpckhdq_Pq_Qq },
+  /* 66 */ { 0, &Ia_punpckhdq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6b[2] = {
+  /* -- */ { 0, &Ia_packssdw_Pq_Qq },
+  /* 66 */ { 0, &Ia_packssdw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6e[2] = {
+  /* -- */ { 0, &Ia_movd_Pq_Ed },
+  /* 66 */ { 0, &Ia_movd_Vdq_Ed }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6eQ[2] = {
+  /* -- */ { 0, &Ia_movq_Pq_Eq },
+  /* 66 */ { 0, &Ia_movq_Vdq_Eq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f6f[4] = {
+  /* -- */ { 0, &Ia_movq_Pq_Qq },
+  /* 66 */ { 0, &Ia_movdqa_Vdq_Wdq },
+  /* F3 */ { 0, &Ia_movdqu_Vdq_Wdq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f70[4] = {
+  /* -- */ { 0, &Ia_pshufw_Pq_Qq_Ib },
+  /* 66 */ { 0, &Ia_pshufd_Vdq_Wdq_Ib  },
+  /* F3 */ { 0, &Ia_pshufhw_Vdq_Wdq_Ib },
+  /* F2 */ { 0, &Ia_pshuflw_Vdq_Wdq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f74[2] = {
+  /* -- */ { 0, &Ia_pcmpeqb_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpeqb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f75[2] = {
+  /* -- */ { 0, &Ia_pcmpeqw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpeqw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f76[2] = {
+  /* -- */ { 0, &Ia_pcmpeqd_Pq_Qq },
+  /* 66 */ { 0, &Ia_pcmpeqd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE4A_G17[8] = {
+  /* 0 */ { 0, &Ia_extrq_Udq_Ib_Ib },       // SSE4A
+  /* 1 */ { 0, &Ia_Invalid },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_Invalid },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f78[4] = {
+  /* -- */ { 0, &Ia_vmread_Ed_Gd },         // VMX
+  /* 66 */ { GRPN(SSE4A_G17) },             // SSE4A
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_insertq_Vdq_Uq_Ib_Ib }  // SSE4A
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f78Q[4] = {
+  /* -- */ { 0, &Ia_vmread_Eq_Gq },         // VMX
+  /* 66 */ { GRPN(SSE4A_G17) },             // SSE4A
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_insertq_Vdq_Uq_Ib_Ib }  // SSE4A
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f79[4] = {
+  /* -- */ { 0, &Ia_vmwrite_Gd_Ed },        // VMX
+  /* 66 */ { 0, &Ia_extrq_Vdq_Uq },         // SSE4A
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_insertq_Vdq_Udq }       // SSE4A
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f79Q[4] = {
+  /* -- */ { 0, &Ia_vmwrite_Gq_Eq },        // VMX
+  /* 66 */ { 0, &Ia_extrq_Vdq_Uq },         // SSE4A
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_insertq_Vdq_Udq }       // SSE4A
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7c[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_haddpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_haddps_Vps_Wps }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7d[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_hsubpd_Vpd_Wpd },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_hsubps_Vps_Wps }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7e[4] = {
+  /* -- */ { 0, &Ia_movd_Ed_Pq },
+  /* 66 */ { 0, &Ia_movd_Ed_Vd },
+  /* F3 */ { 0, &Ia_movq_Vq_Wq },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7eQ[4] = {
+  /* -- */ { 0, &Ia_movq_Eq_Pq },
+  /* 66 */ { 0, &Ia_movq_Eq_Vq },
+  /* F2 */ { 0, &Ia_movq_Vq_Wq },
+  /* F3 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f7f[4] = {
+  /* -- */ { 0, &Ia_movq_Qq_Pq },
+  /* 66 */ { 0, &Ia_movdqa_Wdq_Vdq },
+  /* F2 */ { 0, &Ia_movdqu_Wdq_Vdq },
+  /* F3 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc2[4] = {
+  /* -- */ { 0, &Ia_cmpps_Vps_Wps_Ib },
+  /* 66 */ { 0, &Ia_cmppd_Vpd_Wpd_Ib },
+  /* F3 */ { 0, &Ia_cmpss_Vss_Wss_Ib },
+  /* F2 */ { 0, &Ia_cmpsd_Vsd_Wsd_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc4[2] = {
+  /* -- */ { 0, &Ia_pinsrw_Pq_Ew_Ib },
+  /* 66 */ { 0, &Ia_pinsrw_Vdq_Ew_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc5[2] = {
+  /* -- */ { 0, &Ia_pextrw_Gd_Nq_Ib },
+  /* 66 */ { 0, &Ia_pextrw_Gd_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fc6[2] = {
+  /* -- */ { 0, &Ia_shufps_Vps_Wps_Ib },
+  /* 66 */ { 0, &Ia_shufpd_Vpd_Wpd_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd0[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_addsubpd_Vpd_Wpd },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_addsubps_Vps_Wps },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd1[2] = {
+  /* -- */ { 0, &Ia_psrlw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psrlw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd2[2] = {
+  /* -- */ { 0, &Ia_psrld_Pq_Qq },
+  /* 66 */ { 0, &Ia_psrld_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd3[2] = {
+  /* -- */ { 0, &Ia_psrlq_Pq_Qq },
+  /* 66 */ { 0, &Ia_psrlq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd4[2] = {
+  /* -- */ { 0, &Ia_paddq_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd5[2] = {
+  /* -- */ { 0, &Ia_pmullw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmullw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd6[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_movq_Wq_Vq },
+  /* F3 */ { 0, &Ia_movq2dq_Vdq_Qq },
+  /* F2 */ { 0, &Ia_movdq2q_Pq_Udq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd7[2] = {
+  /* -- */ { 0, &Ia_pmovmskb_Gd_Nq },
+  /* 66 */ { 0, &Ia_pmovmskb_Gd_Udq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd8[2] = {
+  /* -- */ { 0, &Ia_psubusb_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubusb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fd9[2] = {
+  /* -- */ { 0, &Ia_psubusw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubusw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fda[2] = {
+  /* -- */ { 0, &Ia_pminub_Pq_Qq },
+  /* 66 */ { 0, &Ia_pminub_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdb[2] = {
+  /* -- */ { 0, &Ia_pand_Pq_Qq },
+  /* 66 */ { 0, &Ia_pand_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdc[2] = {
+  /* -- */ { 0, &Ia_paddusb_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddusb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdd[2] = {
+  /* -- */ { 0, &Ia_paddusw_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddusw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fde[2] = {
+  /* -- */ { 0, &Ia_pmaxub_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmaxub_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fdf[2] = {
+  /* -- */ { 0, &Ia_pandn_Pq_Qq },
+  /* 66 */ { 0, &Ia_pandn_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe0[2] = {
+  /* -- */ { 0, &Ia_pavgb_Pq_Qq },
+  /* 66 */ { 0, &Ia_pavgb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe1[2] = {
+  /* -- */ { 0, &Ia_psraw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psraw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe2[2] = {
+  /* -- */ { 0, &Ia_psrad_Pq_Qq },
+  /* 66 */ { 0, &Ia_psrad_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe3[2] = {
+  /* -- */ { 0, &Ia_pavgw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pavgw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe4[2] = {
+  /* -- */ { 0, &Ia_pmulhuw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmulhuw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe5[2] = {
+  /* -- */ { 0, &Ia_pmulhw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmulhw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe6[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_cvttpd2dq_Vq_Wpd },
+  /* F3 */ { 0, &Ia_cvtdq2pd_Vpd_Wq },
+  /* F2 */ { 0, &Ia_cvtpd2dq_Vq_Wpd }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe7[2] = {
+  /* -- */ { 0, &Ia_movntq_Mq_Pq },
+  /* 66 */ { 0, &Ia_movntdq_Mdq_Vdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe8[2] = {
+  /* -- */ { 0, &Ia_psubsb_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubsb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fe9[2] = {
+  /* -- */ { 0, &Ia_psubsw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fea[2] = {
+  /* -- */ { 0, &Ia_pminsw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pminsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0feb[2] = {
+  /* -- */ { 0, &Ia_por_Pq_Qq },
+  /* 66 */ { 0, &Ia_por_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fec[2] = {
+  /* -- */ { 0, &Ia_paddsb_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddsb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fed[2] = {
+  /* -- */ { 0, &Ia_paddsw_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fee[2] = {
+  /* -- */ { 0, &Ia_pmaxsw_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmaxsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fef[2] = {
+  /* -- */ { 0, &Ia_pxor_Pq_Qq },
+  /* 66 */ { 0, &Ia_pxor_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff1[2] = {
+  /* -- */ { 0, &Ia_psllw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psllw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff2[2] = {
+  /* -- */ { 0, &Ia_pslld_Pq_Qq },
+  /* 66 */ { 0, &Ia_pslld_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff3[2] = {
+  /* -- */ { 0, &Ia_psllq_Pq_Qq },
+  /* 66 */ { 0, &Ia_psllq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff4[2] = {
+  /* -- */ { 0, &Ia_pmuludq_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmuludq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff5[2] = {
+  /* -- */ { 0, &Ia_pmaddwd_Pq_Qq },
+  /* 66 */ { 0, &Ia_pmaddwd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff6[2] = {
+  /* -- */ { 0, &Ia_psadbw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psadbw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff7[2] = {
+  /* -- */ { 0, &Ia_maskmovq_Pq_Nq },
+  /* 66 */ { 0, &Ia_maskmovdqu_Vdq_Udq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff8[2] = {
+  /* -- */ { 0, &Ia_psubb_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ff9[2] = {
+  /* -- */ { 0, &Ia_psubw_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffa[2] = {
+  /* -- */ { 0, &Ia_psubd_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffb[2] = {
+  /* -- */ { 0, &Ia_psubq_Pq_Qq },
+  /* 66 */ { 0, &Ia_psubq_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffc[2] = {
+  /* -- */ { 0, &Ia_paddb_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffd[2] = {
+  /* -- */ { 0, &Ia_paddw_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0ffe[2] = {
+  /* -- */ { 0, &Ia_paddd_Pq_Qq },
+  /* 66 */ { 0, &Ia_paddd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1202[2] = {
+  /* -- */ { 0, &Ia_psrlw_Nq_Ib },
+  /* 66 */ { 0, &Ia_psrlw_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1204[2] = {
+  /* -- */ { 0, &Ia_psraw_Nq_Ib },
+  /* 66 */ { 0, &Ia_psraw_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1206[2] = {
+  /* -- */ { 0, &Ia_psllw_Nq_Ib },
+  /* 66 */ { 0, &Ia_psllw_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1302[2] = {
+  /* -- */ { 0, &Ia_psrld_Nq_Ib },
+  /* 66 */ { 0, &Ia_psrld_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1304[2] = {
+  /* -- */ { 0, &Ia_psrad_Nq_Ib },
+  /* 66 */ { 0, &Ia_psrad_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1306[2] = {
+  /* -- */ { 0, &Ia_pslld_Nq_Ib },
+  /* 66 */ { 0, &Ia_pslld_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1402[2] = {
+  /* -- */ { 0, &Ia_psrlq_Nq_Ib },
+  /* 66 */ { 0, &Ia_psrlq_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_G1406[2] = {
+  /* -- */ { 0, &Ia_psllq_Nq_Ib },
+  /* 66 */ { 0, &Ia_psllq_Udq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3800[2] = {
+  /* -- */ { 0, &Ia_pshufb_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_pshufb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3801[2] = {
+  /* -- */ { 0, &Ia_phaddw_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_phaddw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3802[2] = {
+  /* -- */ { 0, &Ia_phaddd_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_phaddd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3803[2] = {
+  /* -- */ { 0, &Ia_phaddsw_Pq_Qq },    // SSSE3
+  /* 66 */ { 0, &Ia_phaddsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3804[2] = {
+  /* -- */ { 0, &Ia_pmaddubsw_Pq_Qq },  // SSSE3
+  /* 66 */ { 0, &Ia_pmaddubsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3805[2] = {
+  /* -- */ { 0, &Ia_phsubw_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_phsubw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3806[2] = {
+  /* -- */ { 0, &Ia_phsubd_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_phsubd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3807[2] = {
+  /* -- */ { 0, &Ia_phsubsw_Pq_Qq },    // SSSE3
+  /* 66 */ { 0, &Ia_phsubsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3808[2] = {
+  /* -- */ { 0, &Ia_psignb_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_psignb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3809[2] = {
+  /* -- */ { 0, &Ia_psignw_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_psignw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f380a[2] = {
+  /* -- */ { 0, &Ia_psignd_Pq_Qq },     // SSSE3
+  /* 66 */ { 0, &Ia_psignd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f380b[2] = {
+  /* -- */ { 0, &Ia_pmulhrsw_Pq_Qq },   // SSSE3
+  /* 66 */ { 0, &Ia_pmulhrsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381c[2] = {
+  /* -- */ { 0, &Ia_pabsb_Pq_Qq },      // SSSE3
+  /* 66 */ { 0, &Ia_pabsb_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381d[2] = {
+  /* -- */ { 0, &Ia_pabsw_Pq_Qq },      // SSSE3
+  /* 66 */ { 0, &Ia_pabsw_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f381e[2] = {
+  /* -- */ { 0, &Ia_pabsd_Pq_Qq },      // SSSE3
+  /* 66 */ { 0, &Ia_pabsd_Vdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f0w[4] = {
+  /* -- */ { 0, &Ia_movbe_Gw_Mw },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Eb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f0d[4] = {
+  /* -- */ { 0, &Ia_movbe_Gd_Md },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Eb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f0q[4] = {
+  /* -- */ { 0, &Ia_movbe_Gq_Mq },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Eb }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_0f38f0[3] = {
+  /* 16 */ { GRPSSE(0f38f0w) },
+  /* 32 */ { GRPSSE(0f38f0d) },
+  /* 64 */ { GRPSSE(0f38f0q) },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f1w[4] = {
+  /* -- */ { 0, &Ia_movbe_Mw_Gw },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Ew }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f1d[4] = {
+  /* -- */ { 0, &Ia_movbe_Md_Gd },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Ed }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f1q[4] = {
+  /* -- */ { 0, &Ia_movbe_Mq_Gq },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_crc32_Gd_Eq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_0f38f1[3] = {
+  /* 16 */ { GRPSSE(0f38f1w) },
+  /* 32 */ { GRPSSE(0f38f1d) },
+  /* 64 */ { GRPSSE(0f38f1q) },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_adcx[3] = {
+  /* 16 */ { 0, &Ia_adcx_Gd_Ed },
+  /* 32 */ { 0, &Ia_adcx_Gd_Ed },
+  /* 64 */ { 0, &Ia_adcx_Gq_Eq },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_adox[3] = {
+  /* 16 */ { 0, &Ia_adox_Gd_Ed },
+  /* 32 */ { 0, &Ia_adox_Gd_Ed },
+  /* 64 */ { 0, &Ia_adox_Gq_Eq },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f38f6[4] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { GR64BIT(adcx) },
+  /* F3 */ { GR64BIT(adox) },
+  /* F2 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3a0f[2] = {
+  /* -- */ { 0, &Ia_palignr_Pq_Qq_Ib }, // SSSE3
+  /* 66 */ { 0, &Ia_palignr_Vdq_Wdq_Ib }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_pextr[3] = {
+  /* 16 */ { 0, &Ia_pextrd_Ed_Vdq_Ib },
+  /* 32 */ { 0, &Ia_pextrd_Ed_Vdq_Ib },
+  /* 64 */ { 0, &Ia_pextrq_Eq_Vdq_Ib },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3a16[2] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { GR64BIT(pextr) }          // SSE4
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpOs64B_pinsr[3] = {
+  /* 16 */ { 0, &Ia_pinsrd_Vdq_Ed_Ib },
+  /* 32 */ { 0, &Ia_pinsrd_Vdq_Ed_Ib },
+  /* 64 */ { 0, &Ia_pinsrq_Vdq_Eq_Ib },
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0f3a22[2] = {
+  /* -- */ { 0, &Ia_Invalid },
+  /* 66 */ { GR64BIT(pinsr) }          // SSE4
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbcw[4] = {
+  /* -- */ { 0, &Ia_bsfw_Gw_Ew },
+  /* 66 */ { 0, &Ia_bsfw_Gw_Ew },
+  /* F3 */ { 0, &Ia_tzcntw_Gw_Ew },
+  /* F2 */ { 0, &Ia_bsfw_Gw_Ew }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbcd[4] = {
+  /* -- */ { 0, &Ia_bsfl_Gd_Ed },
+  /* 66 */ { 0, &Ia_bsfl_Gd_Ed },
+  /* F3 */ { 0, &Ia_tzcntl_Gd_Ed },
+  /* F2 */ { 0, &Ia_bsfl_Gd_Ed }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbcq[4] = {
+  /* -- */ { 0, &Ia_bsfq_Gq_Eq },
+  /* 66 */ { 0, &Ia_bsfq_Gq_Eq },
+  /* F3 */ { 0, &Ia_tzcntq_Gq_Eq },
+  /* F2 */ { 0, &Ia_bsfq_Gq_Eq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbdw[4] = {
+  /* -- */ { 0, &Ia_bsrw_Gw_Ew },
+  /* 66 */ { 0, &Ia_bsrw_Gw_Ew },
+  /* F3 */ { 0, &Ia_lzcntw_Gw_Ew },
+  /* F2 */ { 0, &Ia_bsrw_Gw_Ew }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbdd[4] = {
+  /* -- */ { 0, &Ia_bsrl_Gd_Ed },
+  /* 66 */ { 0, &Ia_bsrl_Gd_Ed },
+  /* F3 */ { 0, &Ia_lzcntl_Gd_Ed },
+  /* F2 */ { 0, &Ia_bsrl_Gd_Ed }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupSSE_0fbdq[4] = {
+  /* -- */ { 0, &Ia_bsrq_Gq_Eq },
+  /* 66 */ { 0, &Ia_bsrq_Gq_Eq },
+  /* F3 */ { 0, &Ia_lzcntq_Gq_Eq },
+  /* F2 */ { 0, &Ia_bsrq_Gq_Eq }
+};
+
+/* ************************************************************************ */
+/* 3-byte opcode table (Table A-4, 0F 38) */
+
+static BxDisasmOpcodeTable_t BxDisasm3ByteOpTable0f38[256] = {
+  /* 00 */ { GRPSSE2(0f3800) },
+  /* 01 */ { GRPSSE2(0f3801) },
+  /* 02 */ { GRPSSE2(0f3802) },
+  /* 03 */ { GRPSSE2(0f3803) },
+  /* 04 */ { GRPSSE2(0f3804) },
+  /* 05 */ { GRPSSE2(0f3805) },
+  /* 06 */ { GRPSSE2(0f3806) },
+  /* 07 */ { GRPSSE2(0f3807) },
+  /* 08 */ { GRPSSE2(0f3808) },
+  /* 09 */ { GRPSSE2(0f3809) },
+  /* 0A */ { GRPSSE2(0f380a) },
+  /* 0B */ { GRPSSE2(0f380b) },
+  /* 0C */ { 0, &Ia_Invalid },
+  /* 0D */ { 0, &Ia_Invalid },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { GRPSSE66(Ia_pblendvb_Vdq_Wdq) },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { GRPSSE66(Ia_blendvps_Vps_Wps) },
+  /* 15 */ { GRPSSE66(Ia_blendvpd_Vpd_Wpd) },
+  /* 16 */ { 0, &Ia_Invalid },
+  /* 17 */ { GRPSSE66(Ia_ptest_Vdq_Wdq) },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { GRPSSE2(0f381c) },
+  /* 1D */ { GRPSSE2(0f381d) },
+  /* 1E */ { GRPSSE2(0f381e) },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { GRPSSE66(Ia_pmovsxbw_Vdq_Wq) },
+  /* 21 */ { GRPSSE66(Ia_pmovsxbd_Vdq_Wd) },
+  /* 22 */ { GRPSSE66(Ia_pmovsxbq_Vdq_Ww) },
+  /* 23 */ { GRPSSE66(Ia_pmovsxwd_Vdq_Wq) },
+  /* 24 */ { GRPSSE66(Ia_pmovsxwq_Vdq_Wd) },
+  /* 25 */ { GRPSSE66(Ia_pmovsxdq_Vdq_Wq) },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { GRPSSE66(Ia_pmuldq_Vdq_Wdq) },
+  /* 29 */ { GRPSSE66(Ia_pcmpeqq_Vdq_Wdq) },
+  /* 2A */ { GRPSSE66(Ia_movntdqa_Vdq_Mdq) },
+  /* 2B */ { GRPSSE66(Ia_packusdw_Vdq_Wdq) },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { GRPSSE66(Ia_pmovzxbw_Vdq_Wq) },
+  /* 31 */ { GRPSSE66(Ia_pmovzxbd_Vdq_Wd) },
+  /* 32 */ { GRPSSE66(Ia_pmovzxbq_Vdq_Ww) },
+  /* 33 */ { GRPSSE66(Ia_pmovzxwd_Vdq_Wq) },
+  /* 34 */ { GRPSSE66(Ia_pmovzxwq_Vdq_Wd) },
+  /* 35 */ { GRPSSE66(Ia_pmovzxdq_Vdq_Wq) },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { GRPSSE66(Ia_pcmpgtq_Vdq_Wdq) },
+  /* 38 */ { GRPSSE66(Ia_pminsb_Vdq_Wdq) },
+  /* 39 */ { GRPSSE66(Ia_pminsd_Vdq_Wdq) },
+  /* 3A */ { GRPSSE66(Ia_pminuw_Vdq_Wdq) },
+  /* 3B */ { GRPSSE66(Ia_pminud_Vdq_Wdq) },
+  /* 3C */ { GRPSSE66(Ia_pmaxsb_Vdq_Wdq) },
+  /* 3D */ { GRPSSE66(Ia_pmaxsd_Vdq_Wdq) },
+  /* 3E */ { GRPSSE66(Ia_pmaxuw_Vdq_Wdq) },
+  /* 3F */ { GRPSSE66(Ia_pmaxud_Vdq_Wdq) },
+  /* 40 */ { GRPSSE66(Ia_pmulld_Vdq_Wdq) },
+  /* 41 */ { GRPSSE66(Ia_phminposuw_Vdq_Wdq) },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { GRPSSE66(Ia_invept_Gy_Mdq) },
+  /* 81 */ { GRPSSE66(Ia_invvpid_Gy_Mdq) },
+  /* 82 */ { GRPSSE66(Ia_invpcid_Gy_Mdq) },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_Invalid },
+  /* 97 */ { 0, &Ia_Invalid },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { GRPSSENONE(Ia_sha1nexte_Vdq_Wdq) },
+  /* C9 */ { GRPSSENONE(Ia_sha1msg1_Vdq_Wdq) },
+  /* CA */ { GRPSSENONE(Ia_sha1msg2_Vdq_Wdq) },
+  /* CB */ { GRPSSENONE(Ia_sha256rnds2_Vdq_Wdq) },
+  /* CC */ { GRPSSENONE(Ia_sha256msg1_Vdq_Wdq) },
+  /* CD */ { GRPSSENONE(Ia_sha256msg2_Vdq_Wdq) },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { GRPSSE66(Ia_aesimc_Vdq_Wdq) },
+  /* DC */ { GRPSSE66(Ia_aesenc_Vdq_Wdq) },
+  /* DD */ { GRPSSE66(Ia_aesenclast_Vdq_Wdq) },
+  /* DE */ { GRPSSE66(Ia_aesdec_Vdq_Wdq) },
+  /* DF */ { GRPSSE66(Ia_aesdeclast_Vdq_Wdq) },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { GR64BIT(0f38f0) },
+  /* F1 */ { GR64BIT(0f38f1) },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { GRPSSE(0f38f6) },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid }
+};
+
+/* ************************************************************************ */
+/* 3-byte opcode table (Table A-5, 0F 3A) */
+
+static BxDisasmOpcodeTable_t BxDisasm3ByteOpTable0f3a[256] = {
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { 0, &Ia_Invalid },
+  /* 02 */ { 0, &Ia_Invalid },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { GRPSSE66(Ia_roundps_Vps_Wps_Ib) },
+  /* 09 */ { GRPSSE66(Ia_roundpd_Vpd_Wpd_Ib) },
+  /* 0A */ { GRPSSE66(Ia_roundss_Vss_Wss_Ib) },
+  /* 0B */ { GRPSSE66(Ia_roundsd_Vsd_Wsd_Ib) },
+  /* 0C */ { GRPSSE66(Ia_blendps_Vps_Wps_Ib) },
+  /* 0D */ { GRPSSE66(Ia_blendpd_Vpd_Wpd_Ib) },
+  /* 0E */ { GRPSSE66(Ia_pblendw_Vdq_Wdq_Ib) },
+  /* 0F */ { GRPSSE2(0f3a0f) },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { GRPSSE66(Ia_pextrb_Ebd_Vdq_Ib) },
+  /* 15 */ { GRPSSE66(Ia_pextrw_Ewd_Vdq_Ib) },
+  /* 16 */ { GRPSSE2(0f3a16) },
+  /* 17 */ { GRPSSE66(Ia_extractps_Ed_Vdq_Ib) },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { 0, &Ia_Invalid },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { GRPSSE66(Ia_pinsrb_Vdq_Ew_Ib) },
+  /* 21 */ { GRPSSE66(Ia_insertps_Vps_Wss_Ib) },
+  /* 22 */ { GRPSSE2(0f3a22) },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { GRPSSE66(Ia_dpps_Vps_Wps_Ib) },
+  /* 41 */ { GRPSSE66(Ia_dppd_Vpd_Wpd_Ib) },
+  /* 42 */ { GRPSSE66(Ia_mpsadbw_Vdq_Wdq_Ib) },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { GRPSSE66(Ia_pclmulqdq_Vdq_Wdq_Ib) },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { GRPSSE66(Ia_pcmpestrm_Vdq_Wdq_Ib) },
+  /* 61 */ { GRPSSE66(Ia_pcmpestri_Vdq_Wdq_Ib) },
+  /* 62 */ { GRPSSE66(Ia_pcmpistrm_Vdq_Wdq_Ib) },
+  /* 63 */ { GRPSSE66(Ia_pcmpistri_Vdq_Wdq_Ib) },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_Invalid },
+  /* 97 */ { 0, &Ia_Invalid },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { GRPSSENONE(Ia_sha1rnds4_Vdq_Wdq_Ib) },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_Invalid },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { GRPSSE66(Ia_aeskeygenassist_Vdq_Wdq_Ib) },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid }
+};
diff --git a/Externals/Bochs_disasm/dis_tables_x87.inc b/Externals/Bochs_disasm/dis_tables_x87.inc
new file mode 100644
index 0000000000..230110e6bd
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_tables_x87.inc
@@ -0,0 +1,919 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_tables_x87.inc 10298 2011-04-03 10:29:19Z vruppert $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2010 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************ */
+/* 3DNow! opcodes */
+
+static BxDisasmOpcodeTable_t BxDisasm3DNowGroup[256] = {
+  // 256 entries for 3DNow opcodes_by suffix
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { 0, &Ia_Invalid },
+  /* 02 */ { 0, &Ia_Invalid },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { 0, &Ia_Invalid },
+  /* 09 */ { 0, &Ia_Invalid },
+  /* 0A */ { 0, &Ia_Invalid },
+  /* 0B */ { 0, &Ia_Invalid },
+  /* 0C */ { 0, &Ia_pi2fw_Pq_Qq },
+  /* 0D */ { 0, &Ia_pi2fd_Pq_Qq },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { 0, &Ia_Invalid },
+  /* 15 */ { 0, &Ia_Invalid },
+  /* 16 */ { 0, &Ia_Invalid },
+  /* 17 */ { 0, &Ia_Invalid },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_pf2iw_Pq_Qq },
+  /* 1D */ { 0, &Ia_pf2id_Pq_Qq },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { 0, &Ia_Invalid },
+  /* 21 */ { 0, &Ia_Invalid },
+  /* 22 */ { 0, &Ia_Invalid },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { 0, &Ia_Invalid },
+  /* 41 */ { 0, &Ia_Invalid },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_pfnacc_Pq_Qq },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_pfpnacc_Pq_Qq },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_pfcmpge_Pq_Qq },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_pfmin_Pq_Qq },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_pfrcp_Pq_Qq },
+  /* 97 */ { 0, &Ia_pfrsqrt_Pq_Qq },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_pfsub_Pq_Qq },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_pfadd_Pq_Qq },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_pfcmpgt_Pq_Qq },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_pfmax_Pq_Qq },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_pfrcpit1_Pq_Qq },
+  /* A7 */ { 0, &Ia_pfrsqit1_Pq_Qq },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_pfsubr_Pq_Qq },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_pfacc_Pq_Qq },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_pfcmpeq_Pq_Qq },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_pfmul_Pq_Qq },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_pfrcpit2_Pq_Qq },
+  /* B7 */ { 0, &Ia_pmulhrw_Pq_Qq },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_pswapd_Pq_Qq },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_pavgb_Pq_Qq },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_Invalid },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { 0, &Ia_Invalid },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid }
+};
+
+/* ************************************************************************ */
+/* FPU Opcodes */
+
+// floating point instructions when mod!=11b.
+// the following tables will be accessed like groups using the nnn (reg) field of
+// the modrm byte. (the first byte is D8-DF)
+
+  // D8 (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupD8[8] = {
+  /* 0 */ { 0, &Ia_fadds_Md  },
+  /* 1 */ { 0, &Ia_fmuls_Md  },
+  /* 2 */ { 0, &Ia_fcoms_Md  },
+  /* 3 */ { 0, &Ia_fcomps_Md },
+  /* 4 */ { 0, &Ia_fsubs_Md  },
+  /* 5 */ { 0, &Ia_fsubrs_Md },
+  /* 6 */ { 0, &Ia_fdivs_Md  },
+  /* 7 */ { 0, &Ia_fdivrs_Md }
+};
+
+  // D9 (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupD9[8] = {
+  /* 0 */ { 0, &Ia_flds_Md   },
+  /* 1 */ { 0, &Ia_Invalid   },
+  /* 2 */ { 0, &Ia_fsts_Md   },
+  /* 3 */ { 0, &Ia_fstps_Md  },
+  /* 4 */ { 0, &Ia_fldenv    },
+  /* 5 */ { 0, &Ia_fldcw     },
+  /* 6 */ { 0, &Ia_fnstenv   },
+  /* 7 */ { 0, &Ia_fnstcw    }
+};
+
+  // DA (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDA[8] = {
+  /* 0 */ { 0, &Ia_fiaddl_Md  },
+  /* 1 */ { 0, &Ia_fimull_Md  },
+  /* 2 */ { 0, &Ia_ficoml_Md  },
+  /* 3 */ { 0, &Ia_ficompl_Md },
+  /* 4 */ { 0, &Ia_fisubl_Md  },
+  /* 5 */ { 0, &Ia_fisubrl_Md },
+  /* 6 */ { 0, &Ia_fidivl_Md  },
+  /* 7 */ { 0, &Ia_fidivrl_Md }
+};
+
+  // DB (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDB[8] = {
+  /* 0 */ { 0, &Ia_fildl_Md   },
+  /* 1 */ { 0, &Ia_fisttpl_Md },
+  /* 2 */ { 0, &Ia_fistl_Md   },
+  /* 3 */ { 0, &Ia_fistpl_Md  },
+  /* 4 */ { 0, &Ia_Invalid    },
+  /* 5 */ { 0, &Ia_fldt_Mt    },
+  /* 6 */ { 0, &Ia_Invalid    },
+  /* 7 */ { 0, &Ia_fstpt_Mt   }
+};
+
+  // DC (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDC[8] = {
+  /* 0 */ { 0, &Ia_faddl_Mq  },
+  /* 1 */ { 0, &Ia_fmull_Mq  },
+  /* 2 */ { 0, &Ia_fcoml_Mq  },
+  /* 3 */ { 0, &Ia_fcompl_Mq },
+  /* 4 */ { 0, &Ia_fsubl_Mq  },
+  /* 5 */ { 0, &Ia_fsubrl_Mq },
+  /* 6 */ { 0, &Ia_fdivl_Mq  },
+  /* 7 */ { 0, &Ia_fdivrl_Mq }
+};
+
+  // DD (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDD[8] = {
+  /* 0 */ { 0, &Ia_fldl_Mq    },
+  /* 1 */ { 0, &Ia_fisttpq_Mq },
+  /* 2 */ { 0, &Ia_fstl_Mq    },
+  /* 3 */ { 0, &Ia_fstpl_Mq   },
+  /* 4 */ { 0, &Ia_frstor     },
+  /* 5 */ { 0, &Ia_Invalid    },
+  /* 6 */ { 0, &Ia_fnsave     },
+  /* 7 */ { 0, &Ia_fnstsw     }
+};
+
+  // DE (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDE[8] = {
+  /* 0 */ { 0, &Ia_fiadds_Mw  },
+  /* 1 */ { 0, &Ia_fimuls_Mw  },
+  /* 2 */ { 0, &Ia_ficoms_Mw  },
+  /* 3 */ { 0, &Ia_ficomps_Mw },
+  /* 4 */ { 0, &Ia_fisubs_Mw  },
+  /* 5 */ { 0, &Ia_fisubrs_Mw },
+  /* 6 */ { 0, &Ia_fidivs_Mw  },
+  /* 7 */ { 0, &Ia_fidivrs_Mw }
+};
+
+  // DF (modrm is outside 00h - BFh) (mod != 11)
+static BxDisasmOpcodeTable_t BxDisasmFPGroupDF[8] = {
+  /* 0 */ { 0, &Ia_filds_Mw   },
+  /* 1 */ { 0, &Ia_fisttps_Mw },
+  /* 2 */ { 0, &Ia_fists_Mw   },
+  /* 3 */ { 0, &Ia_fistps_Mw  },
+  /* 4 */ { 0, &Ia_fbldt_Mt   },
+  /* 5 */ { 0, &Ia_fildq_Mq   },
+  /* 6 */ { 0, &Ia_fbstpt_Mt  },
+  /* 7 */ { 0, &Ia_fistpq_Mq  }
+};
+
+// 512 entries for second byte of floating point instructions. (when mod==11b)
+static BxDisasmOpcodeTable_t BxDisasmOpcodeInfoFP[512] = {
+  // D8 (modrm is outside 00h - BFh) (mod == 11)
+  /* D8 C0 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C1 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C2 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C3 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C4 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C5 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C6 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C7 */ { 0, &Ia_fadd_ST0_STi  },
+  /* D8 C8 */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 C9 */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CA */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CB */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CC */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CD */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CE */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 CF */ { 0, &Ia_fmul_ST0_STi  },
+  /* D8 D0 */ { 0, &Ia_fcom_STi      },
+  /* D8 D1 */ { 0, &Ia_fcom_STi      },
+  /* D8 D2 */ { 0, &Ia_fcom_STi      },
+  /* D8 D3 */ { 0, &Ia_fcom_STi      },
+  /* D8 D4 */ { 0, &Ia_fcom_STi      },
+  /* D8 D5 */ { 0, &Ia_fcom_STi      },
+  /* D8 D6 */ { 0, &Ia_fcom_STi      },
+  /* D8 D7 */ { 0, &Ia_fcom_STi      },
+  /* D8 D8 */ { 0, &Ia_fcomp_STi     },
+  /* D8 D9 */ { 0, &Ia_fcomp_STi     },
+  /* D8 DA */ { 0, &Ia_fcomp_STi     },
+  /* D8 DB */ { 0, &Ia_fcomp_STi     },
+  /* D8 DC */ { 0, &Ia_fcomp_STi     },
+  /* D8 DD */ { 0, &Ia_fcomp_STi     },
+  /* D8 DE */ { 0, &Ia_fcomp_STi     },
+  /* D8 DF */ { 0, &Ia_fcomp_STi     },
+  /* D8 E0 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E1 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E2 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E3 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E4 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E5 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E6 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E7 */ { 0, &Ia_fsub_ST0_STi  },
+  /* D8 E8 */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 E9 */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 EA */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 EB */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 EC */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 ED */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 EE */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 EF */ { 0, &Ia_fsubr_ST0_STi },
+  /* D8 F0 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F1 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F2 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F3 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F4 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F5 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F6 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F7 */ { 0, &Ia_fdiv_ST0_STi  },
+  /* D8 F8 */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 F9 */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FA */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FB */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FC */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FD */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FE */ { 0, &Ia_fdivr_ST0_STi },
+  /* D8 FF */ { 0, &Ia_fdivr_ST0_STi },
+
+  // D9 (modrm is outside 00h - BFh) (mod == 11)
+  /* D9 C0 */ { 0, &Ia_fld_STi },
+  /* D9 C1 */ { 0, &Ia_fld_STi },
+  /* D9 C2 */ { 0, &Ia_fld_STi },
+  /* D9 C3 */ { 0, &Ia_fld_STi },
+  /* D9 C4 */ { 0, &Ia_fld_STi },
+  /* D9 C5 */ { 0, &Ia_fld_STi },
+  /* D9 C6 */ { 0, &Ia_fld_STi },
+  /* D9 C7 */ { 0, &Ia_fld_STi },
+  /* D9 C8 */ { 0, &Ia_fxch    },
+  /* D9 C9 */ { 0, &Ia_fxch    },
+  /* D9 CA */ { 0, &Ia_fxch    },
+  /* D9 CB */ { 0, &Ia_fxch    },
+  /* D9 CC */ { 0, &Ia_fxch    },
+  /* D9 CD */ { 0, &Ia_fxch    },
+  /* D9 CE */ { 0, &Ia_fxch    },
+  /* D9 CF */ { 0, &Ia_fxch    },
+  /* D9 D0 */ { 0, &Ia_fnop    },
+  /* D9 D1 */ { 0, &Ia_Invalid },
+  /* D9 D2 */ { 0, &Ia_Invalid },
+  /* D9 D3 */ { 0, &Ia_Invalid },
+  /* D9 D4 */ { 0, &Ia_Invalid },
+  /* D9 D5 */ { 0, &Ia_Invalid },
+  /* D9 D6 */ { 0, &Ia_Invalid },
+  /* D9 D7 */ { 0, &Ia_Invalid },
+  /* D9 D8 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 D9 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DA */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DB */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DC */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DD */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DE */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 DF */ { 0, &Ia_fstp_STi }, // undocumented
+  /* D9 E0 */ { 0, &Ia_fchs    },
+  /* D9 E1 */ { 0, &Ia_fabs    },
+  /* D9 E2 */ { 0, &Ia_Invalid },
+  /* D9 E3 */ { 0, &Ia_Invalid },
+  /* D9 E4 */ { 0, &Ia_ftst    },
+  /* D9 E5 */ { 0, &Ia_fxam    },
+  /* D9 E6 */ { 0, &Ia_Invalid },
+  /* D9 E7 */ { 0, &Ia_Invalid },
+  /* D9 E8 */ { 0, &Ia_fld1    },
+  /* D9 E9 */ { 0, &Ia_fldl2t  },
+  /* D9 EA */ { 0, &Ia_fldl2e  },
+  /* D9 EB */ { 0, &Ia_fldpi   },
+  /* D9 EC */ { 0, &Ia_fldlg2  },
+  /* D9 ED */ { 0, &Ia_fldln2  },
+  /* D9 EE */ { 0, &Ia_fldz    },
+  /* D9 EF */ { 0, &Ia_Invalid },
+  /* D9 F0 */ { 0, &Ia_f2xm1   },
+  /* D9 F1 */ { 0, &Ia_fyl2x   },
+  /* D9 F2 */ { 0, &Ia_fptan   },
+  /* D9 F3 */ { 0, &Ia_fpatan  },
+  /* D9 F4 */ { 0, &Ia_fxtract },
+  /* D9 F5 */ { 0, &Ia_fprem1  },
+  /* D9 F6 */ { 0, &Ia_fdecstp },
+  /* D9 F7 */ { 0, &Ia_fincstp },
+  /* D9 F8 */ { 0, &Ia_fprem   },
+  /* D9 F9 */ { 0, &Ia_fyl2xp1 },
+  /* D9 FA */ { 0, &Ia_fsqrt   },
+  /* D9 FB */ { 0, &Ia_fsincos },
+  /* D9 FC */ { 0, &Ia_frndint },
+  /* D9 FD */ { 0, &Ia_fscale  },
+  /* D9 FE */ { 0, &Ia_fsin    },
+  /* D9 FF */ { 0, &Ia_fcos    },
+
+  // DA (modrm is outside 00h - BFh) (mod == 11)
+  /* DA C0 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C1 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C2 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C3 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C4 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C5 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C6 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C7 */ { 0, &Ia_fcmovb_ST0_STi  },
+  /* DA C8 */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA C9 */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CA */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CB */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CC */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CD */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CE */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA CF */ { 0, &Ia_fcmove_ST0_STi  },
+  /* DA D0 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D1 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D2 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D3 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D4 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D5 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D6 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D7 */ { 0, &Ia_fcmovbe_ST0_STi },
+  /* DA D8 */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA D9 */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DA */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DB */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DC */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DD */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DE */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA DF */ { 0, &Ia_fcmovu_ST0_STi  },
+  /* DA E0 */ { 0, &Ia_Invalid },
+  /* DA E1 */ { 0, &Ia_Invalid },
+  /* DA E2 */ { 0, &Ia_Invalid },
+  /* DA E3 */ { 0, &Ia_Invalid },
+  /* DA E4 */ { 0, &Ia_Invalid },
+  /* DA E5 */ { 0, &Ia_Invalid },
+  /* DA E6 */ { 0, &Ia_Invalid },
+  /* DA E7 */ { 0, &Ia_Invalid },
+  /* DA E8 */ { 0, &Ia_Invalid },
+  /* DA E9 */ { 0, &Ia_fucompp },
+  /* DA EA */ { 0, &Ia_Invalid },
+  /* DA EB */ { 0, &Ia_Invalid },
+  /* DA EC */ { 0, &Ia_Invalid },
+  /* DA ED */ { 0, &Ia_Invalid },
+  /* DA EE */ { 0, &Ia_Invalid },
+  /* DA EF */ { 0, &Ia_Invalid },
+  /* DA F0 */ { 0, &Ia_Invalid },
+  /* DA F1 */ { 0, &Ia_Invalid },
+  /* DA F2 */ { 0, &Ia_Invalid },
+  /* DA F3 */ { 0, &Ia_Invalid },
+  /* DA F4 */ { 0, &Ia_Invalid },
+  /* DA F5 */ { 0, &Ia_Invalid },
+  /* DA F6 */ { 0, &Ia_Invalid },
+  /* DA F7 */ { 0, &Ia_Invalid },
+  /* DA F8 */ { 0, &Ia_Invalid },
+  /* DA F9 */ { 0, &Ia_Invalid },
+  /* DA FA */ { 0, &Ia_Invalid },
+  /* DA FB */ { 0, &Ia_Invalid },
+  /* DA FC */ { 0, &Ia_Invalid },
+  /* DA FD */ { 0, &Ia_Invalid },
+  /* DA FE */ { 0, &Ia_Invalid },
+  /* DA FF */ { 0, &Ia_Invalid },
+
+  // DB (modrm is outside 00h - BFh) (mod == 11)
+  /* DB C0 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C1 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C2 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C3 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C4 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C5 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C6 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C7 */ { 0, &Ia_fcmovnb_ST0_STi  },
+  /* DB C8 */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB C9 */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CA */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CB */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CC */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CD */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CE */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB CF */ { 0, &Ia_fcmovne_ST0_STi  },
+  /* DB D0 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D1 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D2 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D3 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D4 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D5 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D6 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D7 */ { 0, &Ia_fcmovnbe_ST0_STi },
+  /* DB D8 */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB D9 */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DA */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DB */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DC */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DD */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DE */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB DF */ { 0, &Ia_fcmovnu_ST0_STi  },
+  /* DB E0 */ { 0, &Ia_feni    },
+  /* DB E1 */ { 0, &Ia_fdisi   },
+  /* DB E2 */ { 0, &Ia_fnclex  },
+  /* DB E3 */ { 0, &Ia_fninit  },
+  /* DB E4 */ { 0, &Ia_fsetpm  },
+  /* DB E5 */ { 0, &Ia_Invalid },
+  /* DB E6 */ { 0, &Ia_Invalid },
+  /* DB E7 */ { 0, &Ia_Invalid },
+  /* DB E8 */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB E9 */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB EA */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB EB */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB EC */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB ED */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB EE */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB EF */ { 0, &Ia_fucomi_ST0_STi },
+  /* DB F0 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F1 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F2 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F3 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F4 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F5 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F6 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F7 */ { 0, &Ia_fcomi_ST0_STi  },
+  /* DB F8 */ { 0, &Ia_Invalid },
+  /* DB F9 */ { 0, &Ia_Invalid },
+  /* DB FA */ { 0, &Ia_Invalid },
+  /* DB FB */ { 0, &Ia_Invalid },
+  /* DB FC */ { 0, &Ia_Invalid },
+  /* DB FD */ { 0, &Ia_Invalid },
+  /* DB FE */ { 0, &Ia_Invalid },
+  /* DB FF */ { 0, &Ia_Invalid },
+
+  // DC (modrm is outside 00h - BFh) (mod == 11)
+  /* DC C0 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C1 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C2 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C3 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C4 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C5 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C6 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C7 */ { 0, &Ia_fadd_STi_ST0 },
+  /* DC C8 */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC C9 */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CA */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CB */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CC */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CD */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CE */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC CF */ { 0, &Ia_fmul_STi_ST0 },
+  /* DC D0 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D1 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D2 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D3 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D4 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D5 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D6 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D7 */ { 0, &Ia_fcom_STi     }, // undocumented
+  /* DC D8 */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC D9 */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DA */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DB */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DC */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DD */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DE */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC DF */ { 0, &Ia_fcomp_STi    }, // undocumented
+  /* DC E0 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E1 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E2 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E3 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E4 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E5 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E6 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E7 */ { 0, &Ia_fsubr_STi_ST0 },
+  /* DC E8 */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC E9 */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC EA */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC EB */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC EC */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC ED */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC EE */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC EF */ { 0, &Ia_fsub_STi_ST0  },
+  /* DC F0 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F1 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F2 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F3 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F4 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F5 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F6 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F7 */ { 0, &Ia_fdivr_STi_ST0 },
+  /* DC F8 */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC F9 */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FA */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FB */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FC */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FD */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FE */ { 0, &Ia_fdiv_STi_ST0  },
+  /* DC FF */ { 0, &Ia_fdiv_STi_ST0  },
+
+  // DD (modrm is outside 00h - BFh) (mod == 11)
+  /* DD C0 */ { 0, &Ia_ffree_STi },
+  /* DD C1 */ { 0, &Ia_ffree_STi },
+  /* DD C2 */ { 0, &Ia_ffree_STi },
+  /* DD C3 */ { 0, &Ia_ffree_STi },
+  /* DD C4 */ { 0, &Ia_ffree_STi },
+  /* DD C5 */ { 0, &Ia_ffree_STi },
+  /* DD C6 */ { 0, &Ia_ffree_STi },
+  /* DD C7 */ { 0, &Ia_ffree_STi },
+  /* DD C8 */ { 0, &Ia_fxch      }, // undocumented
+  /* DD C9 */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CA */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CB */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CC */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CD */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CE */ { 0, &Ia_fxch      }, // undocumented
+  /* DD CF */ { 0, &Ia_fxch      }, // undocumented
+  /* DD D0 */ { 0, &Ia_fst_STi   },
+  /* DD D1 */ { 0, &Ia_fst_STi   },
+  /* DD D2 */ { 0, &Ia_fst_STi   },
+  /* DD D3 */ { 0, &Ia_fst_STi   },
+  /* DD D4 */ { 0, &Ia_fst_STi   },
+  /* DD D5 */ { 0, &Ia_fst_STi   },
+  /* DD D6 */ { 0, &Ia_fst_STi   },
+  /* DD D7 */ { 0, &Ia_fst_STi   },
+  /* DD D8 */ { 0, &Ia_fstp_STi  },
+  /* DD D9 */ { 0, &Ia_fstp_STi  },
+  /* DD DA */ { 0, &Ia_fstp_STi  },
+  /* DD DB */ { 0, &Ia_fstp_STi  },
+  /* DD DC */ { 0, &Ia_fstp_STi  },
+  /* DD DD */ { 0, &Ia_fstp_STi  },
+  /* DD DE */ { 0, &Ia_fstp_STi  },
+  /* DD DF */ { 0, &Ia_fstp_STi  },
+  /* DD E0 */ { 0, &Ia_fucom_STi },
+  /* DD E1 */ { 0, &Ia_fucom_STi },
+  /* DD E2 */ { 0, &Ia_fucom_STi },
+  /* DD E3 */ { 0, &Ia_fucom_STi },
+  /* DD E4 */ { 0, &Ia_fucom_STi },
+  /* DD E5 */ { 0, &Ia_fucom_STi },
+  /* DD E6 */ { 0, &Ia_fucom_STi },
+  /* DD E7 */ { 0, &Ia_fucom_STi },
+  /* DD E8 */ { 0, &Ia_fucomp_STi },
+  /* DD E9 */ { 0, &Ia_fucomp_STi },
+  /* DD EA */ { 0, &Ia_fucomp_STi },
+  /* DD EB */ { 0, &Ia_fucomp_STi },
+  /* DD EC */ { 0, &Ia_fucomp_STi },
+  /* DD ED */ { 0, &Ia_fucomp_STi },
+  /* DD EE */ { 0, &Ia_fucomp_STi },
+  /* DD EF */ { 0, &Ia_fucomp_STi },
+  /* DD F0 */ { 0, &Ia_Invalid },
+  /* DD F1 */ { 0, &Ia_Invalid },
+  /* DD F2 */ { 0, &Ia_Invalid },
+  /* DD F3 */ { 0, &Ia_Invalid },
+  /* DD F4 */ { 0, &Ia_Invalid },
+  /* DD F5 */ { 0, &Ia_Invalid },
+  /* DD F6 */ { 0, &Ia_Invalid },
+  /* DD F7 */ { 0, &Ia_Invalid },
+  /* DD F8 */ { 0, &Ia_Invalid },
+  /* DD F9 */ { 0, &Ia_Invalid },
+  /* DD FA */ { 0, &Ia_Invalid },
+  /* DD FB */ { 0, &Ia_Invalid },
+  /* DD FC */ { 0, &Ia_Invalid },
+  /* DD FD */ { 0, &Ia_Invalid },
+  /* DD FE */ { 0, &Ia_Invalid },
+  /* DD FF */ { 0, &Ia_Invalid },
+
+  // DE (modrm is outside 00h - BFh) (mod == 11)
+  /* DE C0 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C1 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C2 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C3 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C4 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C5 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C6 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C7 */ { 0, &Ia_faddp_STi_ST0 },
+  /* DE C8 */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE C9 */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CA */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CB */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CC */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CD */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CE */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE CF */ { 0, &Ia_fmulp_STi_ST0 },
+  /* DE D0 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D1 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D2 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D3 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D4 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D5 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D6 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D7 */ { 0, &Ia_fcomp_STi }, // undocumented
+  /* DE D8 */ { 0, &Ia_Invalid },
+  /* DE D9 */ { 0, &Ia_fcompp  },
+  /* DE DA */ { 0, &Ia_Invalid },
+  /* DE DB */ { 0, &Ia_Invalid },
+  /* DE DC */ { 0, &Ia_Invalid },
+  /* DE DD */ { 0, &Ia_Invalid },
+  /* DE DE */ { 0, &Ia_Invalid },
+  /* DE DF */ { 0, &Ia_Invalid },
+  /* DE E0 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E1 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E2 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E3 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E4 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E5 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E6 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E7 */ { 0, &Ia_fsubrp_STi_ST0 },
+  /* DE E8 */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE E9 */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE EA */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE EB */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE EC */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE ED */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE EE */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE EF */ { 0, &Ia_fsubp_STi_ST0  },
+  /* DE F0 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F1 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F2 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F3 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F4 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F5 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F6 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F7 */ { 0, &Ia_fdivrp_STi_ST0 },
+  /* DE F8 */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE F9 */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FA */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FB */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FC */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FD */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FE */ { 0, &Ia_fdivp_STi_ST0  },
+  /* DE FF */ { 0, &Ia_fdivp_STi_ST0  },
+
+  // DF (modrm is outside 00h - BFh) (mod == 11)
+  /* DF C0 */ { 0, &Ia_ffreep_STi }, // 287 compatibility opcode
+  /* DF C1 */ { 0, &Ia_ffreep_STi },
+  /* DF C2 */ { 0, &Ia_ffreep_STi },
+  /* DF C3 */ { 0, &Ia_ffreep_STi },
+  /* DF C4 */ { 0, &Ia_ffreep_STi },
+  /* DF C5 */ { 0, &Ia_ffreep_STi },
+  /* DF C6 */ { 0, &Ia_ffreep_STi },
+  /* DF C7 */ { 0, &Ia_ffreep_STi },
+  /* DF C8 */ { 0, &Ia_fxch     }, // undocumented
+  /* DF C9 */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CA */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CB */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CC */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CD */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CE */ { 0, &Ia_fxch     }, // undocumented
+  /* DF CF */ { 0, &Ia_fxch     }, // undocumented
+  /* DF D0 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D1 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D2 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D3 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D4 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D5 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D6 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D7 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D8 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF D9 */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DA */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DB */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DC */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DD */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DE */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF DF */ { 0, &Ia_fstp_STi }, // undocumented
+  /* DF E0 */ { 0, &Ia_fnstsw_AX },
+  /* DF E1 */ { 0, &Ia_Invalid },
+  /* DF E2 */ { 0, &Ia_Invalid },
+  /* DF E3 */ { 0, &Ia_Invalid },
+  /* DF E4 */ { 0, &Ia_Invalid },
+  /* DF E5 */ { 0, &Ia_Invalid },
+  /* DF E6 */ { 0, &Ia_Invalid },
+  /* DF E7 */ { 0, &Ia_Invalid },
+  /* DF E8 */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF E9 */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF EA */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF EB */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF EC */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF ED */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF EE */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF EF */ { 0, &Ia_fucomip_ST0_STi },
+  /* DF F0 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F1 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F2 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F3 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F4 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F5 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F6 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F7 */ { 0, &Ia_fcomip_ST0_STi  },
+  /* DF F8 */ { 0, &Ia_Invalid },
+  /* DF F9 */ { 0, &Ia_Invalid },
+  /* DF FA */ { 0, &Ia_Invalid },
+  /* DF FB */ { 0, &Ia_Invalid },
+  /* DF FC */ { 0, &Ia_Invalid },
+  /* DF FD */ { 0, &Ia_Invalid },
+  /* DF FE */ { 0, &Ia_Invalid },
+  /* DF FF */ { 0, &Ia_Invalid },
+};
diff --git a/Externals/Bochs_disasm/dis_tables_xop.inc b/Externals/Bochs_disasm/dis_tables_xop.inc
new file mode 100644
index 0000000000..82ce2bca8c
--- /dev/null
+++ b/Externals/Bochs_disasm/dis_tables_xop.inc
@@ -0,0 +1,890 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: dis_tables_xop.inc 11863 2013-10-07 19:23:19Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2011-2013 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+static BxDisasmOpcodeTable_t BxDisasmGroupXOP_G1[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_blcfill_By_Ey },
+  /* 2 */ { 0, &Ia_blsfill_By_Ey },
+  /* 3 */ { 0, &Ia_blcs_By_Ey },
+  /* 4 */ { 0, &Ia_tzmsk_By_Ey },
+  /* 5 */ { 0, &Ia_blcic_By_Ey },
+  /* 6 */ { 0, &Ia_blsic_By_Ey },
+  /* 7 */ { 0, &Ia_t1mskc_By_Ey }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGroupXOP_G2[8] = {
+  /* 0 */ { 0, &Ia_Invalid },
+  /* 1 */ { 0, &Ia_blcmsk_By_Ey },
+  /* 2 */ { 0, &Ia_Invalid },
+  /* 3 */ { 0, &Ia_Invalid },
+  /* 4 */ { 0, &Ia_Invalid },
+  /* 5 */ { 0, &Ia_Invalid },
+  /* 6 */ { 0, &Ia_blci_By_Ey },
+  /* 7 */ { 0, &Ia_Invalid }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop8_a2[2] = {
+  /* 0 */ { 0, &Ia_vpcmov_Vdq_Hdq_Wdq_VIb },
+  /* 1 */ { 0, &Ia_vpcmov_Vdq_Hdq_VIb_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop8_a3[2] = {
+  /* 0 */ { 0, &Ia_vpperm_Vdq_Hdq_Wdq_VIb },
+  /* 1 */ { 0, &Ia_vpperm_Vdq_Hdq_VIb_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_88[2] = {
+  /* 0 */ { 0, &Ia_vpshab_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshab_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_89[2] = {
+  /* 0 */ { 0, &Ia_vpshaw_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshaw_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_8a[2] = {
+  /* 0 */ { 0, &Ia_vpshad_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshad_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_8b[2] = {
+  /* 0 */ { 0, &Ia_vpshaq_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshaq_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_90[2] = {
+  /* 0 */ { 0, &Ia_vprotb_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vprotb_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_91[2] = {
+  /* 0 */ { 0, &Ia_vprotw_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vprotw_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_92[2] = {
+  /* 0 */ { 0, &Ia_vprotd_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vprotd_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_93[2] = {
+  /* 0 */ { 0, &Ia_vprotq_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vprotq_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_94[2] = {
+  /* 0 */ { 0, &Ia_vpshlb_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshlb_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_95[2] = {
+  /* 0 */ { 0, &Ia_vpshlw_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshlw_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_96[2] = {
+  /* 0 */ { 0, &Ia_vpshld_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshld_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmGrpVexW_xop9_97[2] = {
+  /* 0 */ { 0, &Ia_vpshlq_Vdq_Wdq_Hdq },
+  /* 1 */ { 0, &Ia_vpshlq_Vdq_Hdq_Wdq }
+};
+
+static BxDisasmOpcodeTable_t BxDisasmOpcodesXOP[256*3] = {
+  // 256 entries for XOP map 0x8 opcodes
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { GRPN(XOP_G1) },
+  /* 02 */ { GRPN(XOP_G2) },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { 0, &Ia_Invalid },
+  /* 09 */ { 0, &Ia_Invalid },
+  /* 0A */ { 0, &Ia_Invalid },
+  /* 0B */ { 0, &Ia_Invalid },
+  /* 0C */ { 0, &Ia_Invalid },
+  /* 0D */ { 0, &Ia_Invalid },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { 0, &Ia_Invalid },
+  /* 15 */ { 0, &Ia_Invalid },
+  /* 16 */ { 0, &Ia_Invalid },
+  /* 17 */ { 0, &Ia_Invalid },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { 0, &Ia_Invalid },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { 0, &Ia_Invalid },
+  /* 21 */ { 0, &Ia_Invalid },
+  /* 22 */ { 0, &Ia_Invalid },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { 0, &Ia_Invalid },
+  /* 41 */ { 0, &Ia_Invalid },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_vpmacssww_Vdq_Hdq_Wdq_VIb },
+  /* 86 */ { 0, &Ia_vpmacsswd_Vdq_Hdq_Wdq_VIb },
+  /* 87 */ { 0, &Ia_vpmacssdql_Vdq_Hdq_Wdq_VIb },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_vpmacssdd_Vdq_Hdq_Wdq_VIb },
+  /* 8F */ { 0, &Ia_vpmacssdqh_Vdq_Hdq_Wdq_VIb },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_vpmacsww_Vdq_Hdq_Wdq_VIb },
+  /* 96 */ { 0, &Ia_vpmacswd_Vdq_Hdq_Wdq_VIb },
+  /* 97 */ { 0, &Ia_vpmacsdql_Vdq_Hdq_Wdq_VIb },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_vpmacsdd_Vdq_Hdq_Wdq_VIb },
+  /* 9F */ { 0, &Ia_vpmacsdqh_Vdq_Hdq_Wdq_VIb },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { GRPVEXW(xop8_a2) },
+  /* A3 */ { GRPVEXW(xop8_a3) },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_vpmadcsswd_Vdq_Hdq_Wdq_VIb },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_vpmadcswd_Vdq_Hdq_Wdq_VIb },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_vprotb_Vdq_Wdq_Ib },
+  /* C1 */ { 0, &Ia_vprotw_Vdq_Wdq_Ib },
+  /* C2 */ { 0, &Ia_vprotd_Vdq_Wdq_Ib },
+  /* C3 */ { 0, &Ia_vprotq_Vdq_Wdq_Ib },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_vpcomb_Vdq_Hdq_Wdq_Ib },
+  /* CD */ { 0, &Ia_vpcomw_Vdq_Hdq_Wdq_Ib },
+  /* CE */ { 0, &Ia_vpcomd_Vdq_Hdq_Wdq_Ib },
+  /* CF */ { 0, &Ia_vpcomq_Vdq_Hdq_Wdq_Ib },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_Invalid },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { 0, &Ia_Invalid },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_vpcomub_Vdq_Hdq_Wdq_Ib },
+  /* ED */ { 0, &Ia_vpcomuw_Vdq_Hdq_Wdq_Ib },
+  /* EE */ { 0, &Ia_vpcomud_Vdq_Hdq_Wdq_Ib },
+  /* EF */ { 0, &Ia_vpcomuq_Vdq_Hdq_Wdq_Ib },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid },
+
+  // 256 entries for XOP map 0x9 opcodes
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { 0, &Ia_Invalid },
+  /* 02 */ { 0, &Ia_Invalid },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { 0, &Ia_Invalid },
+  /* 09 */ { 0, &Ia_Invalid },
+  /* 0A */ { 0, &Ia_Invalid },
+  /* 0B */ { 0, &Ia_Invalid },
+  /* 0C */ { 0, &Ia_Invalid },
+  /* 0D */ { 0, &Ia_Invalid },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { 0, &Ia_Invalid },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { 0, &Ia_Invalid },
+  /* 15 */ { 0, &Ia_Invalid },
+  /* 16 */ { 0, &Ia_Invalid },
+  /* 17 */ { 0, &Ia_Invalid },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { 0, &Ia_Invalid },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { 0, &Ia_Invalid },
+  /* 21 */ { 0, &Ia_Invalid },
+  /* 22 */ { 0, &Ia_Invalid },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { 0, &Ia_Invalid },
+  /* 41 */ { 0, &Ia_Invalid },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_frczps_Vps_Wps },
+  /* 81 */ { 0, &Ia_frczpd_Vpd_Wpd },
+  /* 82 */ { 0, &Ia_frczss_Vss_Wss },
+  /* 83 */ { 0, &Ia_frczsd_Vsd_Wsd },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { GRPVEXW(xop9_88) },
+  /* 89 */ { GRPVEXW(xop9_89) },
+  /* 8A */ { GRPVEXW(xop9_8a) },
+  /* 8B */ { GRPVEXW(xop9_8b) },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { GRPVEXW(xop9_90) },
+  /* 91 */ { GRPVEXW(xop9_91) },
+  /* 92 */ { GRPVEXW(xop9_92) },
+  /* 93 */ { GRPVEXW(xop9_93) },
+  /* 94 */ { GRPVEXW(xop9_94) },
+  /* 95 */ { GRPVEXW(xop9_95) },
+  /* 96 */ { GRPVEXW(xop9_96) },
+  /* 97 */ { GRPVEXW(xop9_97) },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_vphaddbw_Vdq_Wdq },
+  /* C2 */ { 0, &Ia_vphaddbd_Vdq_Wdq },
+  /* C3 */ { 0, &Ia_vphaddbq_Vdq_Wdq },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_vphaddwd_Vdq_Wdq },
+  /* C7 */ { 0, &Ia_vphaddwq_Vdq_Wdq },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_vphadddq_Vdq_Wdq },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_vphaddubw_Vdq_Wdq },
+  /* D2 */ { 0, &Ia_vphaddubd_Vdq_Wdq },
+  /* D3 */ { 0, &Ia_vphaddubq_Vdq_Wdq },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_vphadduwd_Vdq_Wdq },
+  /* D7 */ { 0, &Ia_vphadduwq_Vdq_Wdq },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_vphaddudq_Vdq_Wdq },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { 0, &Ia_Invalid },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_vphsubbw_Vdq_Wdq },
+  /* E2 */ { 0, &Ia_vphsubwd_Vdq_Wdq },
+  /* E3 */ { 0, &Ia_vphsubdq_Vdq_Wdq },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid },
+
+  // 256 entries for XOP map 0xA opcodes
+  /* 00 */ { 0, &Ia_Invalid },
+  /* 01 */ { 0, &Ia_Invalid },
+  /* 02 */ { 0, &Ia_Invalid },
+  /* 03 */ { 0, &Ia_Invalid },
+  /* 04 */ { 0, &Ia_Invalid },
+  /* 05 */ { 0, &Ia_Invalid },
+  /* 06 */ { 0, &Ia_Invalid },
+  /* 07 */ { 0, &Ia_Invalid },
+  /* 08 */ { 0, &Ia_Invalid },
+  /* 09 */ { 0, &Ia_Invalid },
+  /* 0A */ { 0, &Ia_Invalid },
+  /* 0B */ { 0, &Ia_Invalid },
+  /* 0C */ { 0, &Ia_Invalid },
+  /* 0D */ { 0, &Ia_Invalid },
+  /* 0E */ { 0, &Ia_Invalid },
+  /* 0F */ { 0, &Ia_Invalid },
+  /* 10 */ { 0, &Ia_bextr_Gy_Ey_Id },
+  /* 11 */ { 0, &Ia_Invalid },
+  /* 12 */ { 0, &Ia_Invalid },
+  /* 13 */ { 0, &Ia_Invalid },
+  /* 14 */ { 0, &Ia_Invalid },
+  /* 15 */ { 0, &Ia_Invalid },
+  /* 16 */ { 0, &Ia_Invalid },
+  /* 17 */ { 0, &Ia_Invalid },
+  /* 18 */ { 0, &Ia_Invalid },
+  /* 19 */ { 0, &Ia_Invalid },
+  /* 1A */ { 0, &Ia_Invalid },
+  /* 1B */ { 0, &Ia_Invalid },
+  /* 1C */ { 0, &Ia_Invalid },
+  /* 1D */ { 0, &Ia_Invalid },
+  /* 1E */ { 0, &Ia_Invalid },
+  /* 1F */ { 0, &Ia_Invalid },
+  /* 20 */ { 0, &Ia_Invalid },
+  /* 21 */ { 0, &Ia_Invalid },
+  /* 22 */ { 0, &Ia_Invalid },
+  /* 23 */ { 0, &Ia_Invalid },
+  /* 24 */ { 0, &Ia_Invalid },
+  /* 25 */ { 0, &Ia_Invalid },
+  /* 26 */ { 0, &Ia_Invalid },
+  /* 27 */ { 0, &Ia_Invalid },
+  /* 28 */ { 0, &Ia_Invalid },
+  /* 29 */ { 0, &Ia_Invalid },
+  /* 2A */ { 0, &Ia_Invalid },
+  /* 2B */ { 0, &Ia_Invalid },
+  /* 2C */ { 0, &Ia_Invalid },
+  /* 2D */ { 0, &Ia_Invalid },
+  /* 2E */ { 0, &Ia_Invalid },
+  /* 2F */ { 0, &Ia_Invalid },
+  /* 30 */ { 0, &Ia_Invalid },
+  /* 31 */ { 0, &Ia_Invalid },
+  /* 32 */ { 0, &Ia_Invalid },
+  /* 33 */ { 0, &Ia_Invalid },
+  /* 34 */ { 0, &Ia_Invalid },
+  /* 35 */ { 0, &Ia_Invalid },
+  /* 36 */ { 0, &Ia_Invalid },
+  /* 37 */ { 0, &Ia_Invalid },
+  /* 38 */ { 0, &Ia_Invalid },
+  /* 39 */ { 0, &Ia_Invalid },
+  /* 3A */ { 0, &Ia_Invalid },
+  /* 3B */ { 0, &Ia_Invalid },
+  /* 3C */ { 0, &Ia_Invalid },
+  /* 3D */ { 0, &Ia_Invalid },
+  /* 3E */ { 0, &Ia_Invalid },
+  /* 3F */ { 0, &Ia_Invalid },
+  /* 40 */ { 0, &Ia_Invalid },
+  /* 41 */ { 0, &Ia_Invalid },
+  /* 42 */ { 0, &Ia_Invalid },
+  /* 43 */ { 0, &Ia_Invalid },
+  /* 44 */ { 0, &Ia_Invalid },
+  /* 45 */ { 0, &Ia_Invalid },
+  /* 46 */ { 0, &Ia_Invalid },
+  /* 47 */ { 0, &Ia_Invalid },
+  /* 48 */ { 0, &Ia_Invalid },
+  /* 49 */ { 0, &Ia_Invalid },
+  /* 4A */ { 0, &Ia_Invalid },
+  /* 4B */ { 0, &Ia_Invalid },
+  /* 4C */ { 0, &Ia_Invalid },
+  /* 4D */ { 0, &Ia_Invalid },
+  /* 4E */ { 0, &Ia_Invalid },
+  /* 4F */ { 0, &Ia_Invalid },
+  /* 50 */ { 0, &Ia_Invalid },
+  /* 51 */ { 0, &Ia_Invalid },
+  /* 52 */ { 0, &Ia_Invalid },
+  /* 53 */ { 0, &Ia_Invalid },
+  /* 54 */ { 0, &Ia_Invalid },
+  /* 55 */ { 0, &Ia_Invalid },
+  /* 56 */ { 0, &Ia_Invalid },
+  /* 57 */ { 0, &Ia_Invalid },
+  /* 58 */ { 0, &Ia_Invalid },
+  /* 59 */ { 0, &Ia_Invalid },
+  /* 5A */ { 0, &Ia_Invalid },
+  /* 5B */ { 0, &Ia_Invalid },
+  /* 5C */ { 0, &Ia_Invalid },
+  /* 5D */ { 0, &Ia_Invalid },
+  /* 5E */ { 0, &Ia_Invalid },
+  /* 5F */ { 0, &Ia_Invalid },
+  /* 60 */ { 0, &Ia_Invalid },
+  /* 61 */ { 0, &Ia_Invalid },
+  /* 62 */ { 0, &Ia_Invalid },
+  /* 63 */ { 0, &Ia_Invalid },
+  /* 64 */ { 0, &Ia_Invalid },
+  /* 65 */ { 0, &Ia_Invalid },
+  /* 66 */ { 0, &Ia_Invalid },
+  /* 67 */ { 0, &Ia_Invalid },
+  /* 68 */ { 0, &Ia_Invalid },
+  /* 69 */ { 0, &Ia_Invalid },
+  /* 6A */ { 0, &Ia_Invalid },
+  /* 6B */ { 0, &Ia_Invalid },
+  /* 6C */ { 0, &Ia_Invalid },
+  /* 6D */ { 0, &Ia_Invalid },
+  /* 6E */ { 0, &Ia_Invalid },
+  /* 6F */ { 0, &Ia_Invalid },
+  /* 70 */ { 0, &Ia_Invalid },
+  /* 71 */ { 0, &Ia_Invalid },
+  /* 72 */ { 0, &Ia_Invalid },
+  /* 73 */ { 0, &Ia_Invalid },
+  /* 74 */ { 0, &Ia_Invalid },
+  /* 75 */ { 0, &Ia_Invalid },
+  /* 76 */ { 0, &Ia_Invalid },
+  /* 77 */ { 0, &Ia_Invalid },
+  /* 78 */ { 0, &Ia_Invalid },
+  /* 79 */ { 0, &Ia_Invalid },
+  /* 7A */ { 0, &Ia_Invalid },
+  /* 7B */ { 0, &Ia_Invalid },
+  /* 7C */ { 0, &Ia_Invalid },
+  /* 7D */ { 0, &Ia_Invalid },
+  /* 7E */ { 0, &Ia_Invalid },
+  /* 7F */ { 0, &Ia_Invalid },
+  /* 80 */ { 0, &Ia_Invalid },
+  /* 81 */ { 0, &Ia_Invalid },
+  /* 82 */ { 0, &Ia_Invalid },
+  /* 83 */ { 0, &Ia_Invalid },
+  /* 84 */ { 0, &Ia_Invalid },
+  /* 85 */ { 0, &Ia_Invalid },
+  /* 86 */ { 0, &Ia_Invalid },
+  /* 87 */ { 0, &Ia_Invalid },
+  /* 88 */ { 0, &Ia_Invalid },
+  /* 89 */ { 0, &Ia_Invalid },
+  /* 8A */ { 0, &Ia_Invalid },
+  /* 8B */ { 0, &Ia_Invalid },
+  /* 8C */ { 0, &Ia_Invalid },
+  /* 8D */ { 0, &Ia_Invalid },
+  /* 8E */ { 0, &Ia_Invalid },
+  /* 8F */ { 0, &Ia_Invalid },
+  /* 90 */ { 0, &Ia_Invalid },
+  /* 91 */ { 0, &Ia_Invalid },
+  /* 92 */ { 0, &Ia_Invalid },
+  /* 93 */ { 0, &Ia_Invalid },
+  /* 94 */ { 0, &Ia_Invalid },
+  /* 95 */ { 0, &Ia_Invalid },
+  /* 96 */ { 0, &Ia_Invalid },
+  /* 97 */ { 0, &Ia_Invalid },
+  /* 98 */ { 0, &Ia_Invalid },
+  /* 99 */ { 0, &Ia_Invalid },
+  /* 9A */ { 0, &Ia_Invalid },
+  /* 9B */ { 0, &Ia_Invalid },
+  /* 9C */ { 0, &Ia_Invalid },
+  /* 9D */ { 0, &Ia_Invalid },
+  /* 9E */ { 0, &Ia_Invalid },
+  /* 9F */ { 0, &Ia_Invalid },
+  /* A0 */ { 0, &Ia_Invalid },
+  /* A1 */ { 0, &Ia_Invalid },
+  /* A2 */ { 0, &Ia_Invalid },
+  /* A3 */ { 0, &Ia_Invalid },
+  /* A4 */ { 0, &Ia_Invalid },
+  /* A5 */ { 0, &Ia_Invalid },
+  /* A6 */ { 0, &Ia_Invalid },
+  /* A7 */ { 0, &Ia_Invalid },
+  /* A8 */ { 0, &Ia_Invalid },
+  /* A9 */ { 0, &Ia_Invalid },
+  /* AA */ { 0, &Ia_Invalid },
+  /* AB */ { 0, &Ia_Invalid },
+  /* AC */ { 0, &Ia_Invalid },
+  /* AD */ { 0, &Ia_Invalid },
+  /* AE */ { 0, &Ia_Invalid },
+  /* AF */ { 0, &Ia_Invalid },
+  /* B0 */ { 0, &Ia_Invalid },
+  /* B1 */ { 0, &Ia_Invalid },
+  /* B2 */ { 0, &Ia_Invalid },
+  /* B3 */ { 0, &Ia_Invalid },
+  /* B4 */ { 0, &Ia_Invalid },
+  /* B5 */ { 0, &Ia_Invalid },
+  /* B6 */ { 0, &Ia_Invalid },
+  /* B7 */ { 0, &Ia_Invalid },
+  /* B8 */ { 0, &Ia_Invalid },
+  /* B9 */ { 0, &Ia_Invalid },
+  /* BA */ { 0, &Ia_Invalid },
+  /* BB */ { 0, &Ia_Invalid },
+  /* BC */ { 0, &Ia_Invalid },
+  /* BD */ { 0, &Ia_Invalid },
+  /* BE */ { 0, &Ia_Invalid },
+  /* BF */ { 0, &Ia_Invalid },
+  /* C0 */ { 0, &Ia_Invalid },
+  /* C1 */ { 0, &Ia_Invalid },
+  /* C2 */ { 0, &Ia_Invalid },
+  /* C3 */ { 0, &Ia_Invalid },
+  /* C4 */ { 0, &Ia_Invalid },
+  /* C5 */ { 0, &Ia_Invalid },
+  /* C6 */ { 0, &Ia_Invalid },
+  /* C7 */ { 0, &Ia_Invalid },
+  /* C8 */ { 0, &Ia_Invalid },
+  /* C9 */ { 0, &Ia_Invalid },
+  /* CA */ { 0, &Ia_Invalid },
+  /* CB */ { 0, &Ia_Invalid },
+  /* CC */ { 0, &Ia_Invalid },
+  /* CD */ { 0, &Ia_Invalid },
+  /* CE */ { 0, &Ia_Invalid },
+  /* CF */ { 0, &Ia_Invalid },
+  /* D0 */ { 0, &Ia_Invalid },
+  /* D1 */ { 0, &Ia_Invalid },
+  /* D2 */ { 0, &Ia_Invalid },
+  /* D3 */ { 0, &Ia_Invalid },
+  /* D4 */ { 0, &Ia_Invalid },
+  /* D5 */ { 0, &Ia_Invalid },
+  /* D6 */ { 0, &Ia_Invalid },
+  /* D7 */ { 0, &Ia_Invalid },
+  /* D8 */ { 0, &Ia_Invalid },
+  /* D9 */ { 0, &Ia_Invalid },
+  /* DA */ { 0, &Ia_Invalid },
+  /* DB */ { 0, &Ia_Invalid },
+  /* DC */ { 0, &Ia_Invalid },
+  /* DD */ { 0, &Ia_Invalid },
+  /* DE */ { 0, &Ia_Invalid },
+  /* DF */ { 0, &Ia_Invalid },
+  /* E0 */ { 0, &Ia_Invalid },
+  /* E1 */ { 0, &Ia_Invalid },
+  /* E2 */ { 0, &Ia_Invalid },
+  /* E3 */ { 0, &Ia_Invalid },
+  /* E4 */ { 0, &Ia_Invalid },
+  /* E5 */ { 0, &Ia_Invalid },
+  /* E6 */ { 0, &Ia_Invalid },
+  /* E7 */ { 0, &Ia_Invalid },
+  /* E8 */ { 0, &Ia_Invalid },
+  /* E9 */ { 0, &Ia_Invalid },
+  /* EA */ { 0, &Ia_Invalid },
+  /* EB */ { 0, &Ia_Invalid },
+  /* EC */ { 0, &Ia_Invalid },
+  /* ED */ { 0, &Ia_Invalid },
+  /* EE */ { 0, &Ia_Invalid },
+  /* EF */ { 0, &Ia_Invalid },
+  /* F0 */ { 0, &Ia_Invalid },
+  /* F1 */ { 0, &Ia_Invalid },
+  /* F2 */ { 0, &Ia_Invalid },
+  /* F3 */ { 0, &Ia_Invalid },
+  /* F4 */ { 0, &Ia_Invalid },
+  /* F5 */ { 0, &Ia_Invalid },
+  /* F6 */ { 0, &Ia_Invalid },
+  /* F7 */ { 0, &Ia_Invalid },
+  /* F8 */ { 0, &Ia_Invalid },
+  /* F9 */ { 0, &Ia_Invalid },
+  /* FA */ { 0, &Ia_Invalid },
+  /* FB */ { 0, &Ia_Invalid },
+  /* FC */ { 0, &Ia_Invalid },
+  /* FD */ { 0, &Ia_Invalid },
+  /* FE */ { 0, &Ia_Invalid },
+  /* FF */ { 0, &Ia_Invalid }
+};
diff --git a/Externals/Bochs_disasm/disasm.h b/Externals/Bochs_disasm/disasm.h
index 0bf21e8cfb..8b15003880 100644
--- a/Externals/Bochs_disasm/disasm.h
+++ b/Externals/Bochs_disasm/disasm.h
@@ -1,3 +1,26 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: disasm.h 12420 2014-07-18 11:14:25Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2014 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
 #ifndef _BX_DISASM_H_
 #define _BX_DISASM_H_
 
@@ -15,23 +38,61 @@
   base  =  sib_byte & 0x07;        \
 }
 
-// will be used in future
-#define IA_286        0x00000001        /* 286+ instruction */
-#define IA_386        0x00000002        /* 386+ instruction */
-#define IA_486        0x00000004        /* 486+ instruction */
-#define IA_PENTIUM    0x00000008        /* Pentium+ instruction */
-#define IA_P6         0x00000010        /* P6 new instruction */
-#define IA_SYSTEM     0x00000020        /* system instruction (require CPL=0) */
-#define IA_LEGACY     0x00000040        /* legacy instruction */
-#define IA_X87        0x00000080        /* FPU (X87) instruction */
-#define IA_MMX        0x00000100        /* MMX instruction */
-#define IA_3DNOW      0x00000200        /* 3DNow! instruction */
-#define IA_PREFETCH   0x00000400        /* Prefetch instruction */
-#define IA_SSE        0x00000800        /* SSE  instruction */
-#define IA_SSE2       0x00001000        /* SSE2 instruction */
-#define IA_SSE3       0x00002000        /* SSE3 instruction */
-#define IA_SSE4       0x00004000        /* SSE4 instruction */
-#define IA_X86_64     0x00008000        /* x86-64 instruction */
+/* Instruction set attributes (duplicated in cpu.h) */
+#define IA_X87              (BX_CONST64(1) << 0)   /* FPU (X87) instruction */
+#define IA_486              (BX_CONST64(1) << 1)   /* 486 new instruction */
+#define IA_PENTIUM          (BX_CONST64(1) << 2)   /* Pentium new instruction */
+#define IA_P6               (BX_CONST64(1) << 3)   /* P6 new instruction */
+#define IA_MMX              (BX_CONST64(1) << 4)   /* MMX instruction */
+#define IA_3DNOW            (BX_CONST64(1) << 5)   /* 3DNow! instruction (AMD) */
+#define IA_SYSCALL_SYSRET   (BX_CONST64(1) << 6)   /* SYSCALL/SYSRET in legacy mode (AMD) */
+#define IA_SYSENTER_SYSEXIT (BX_CONST64(1) << 7)   /* SYSENTER/SYSEXIT instruction */
+#define IA_CLFLUSH          (BX_CONST64(1) << 8)   /* CLFLUSH instruction */
+#define IA_SSE              (BX_CONST64(1) << 9)   /* SSE  instruction */
+#define IA_SSE2             (BX_CONST64(1) << 10)  /* SSE2 instruction */
+#define IA_SSE3             (BX_CONST64(1) << 11)  /* SSE3 instruction */
+#define IA_SSSE3            (BX_CONST64(1) << 12)  /* SSSE3 instruction */
+#define IA_SSE4_1           (BX_CONST64(1) << 13)  /* SSE4_1 instruction */
+#define IA_SSE4_2           (BX_CONST64(1) << 14)  /* SSE4_2 instruction */
+#define IA_POPCNT           (BX_CONST64(1) << 15)  /* POPCNT instruction */
+#define IA_MONITOR_MWAIT    (BX_CONST64(1) << 16)  /* MONITOR/MWAIT instruction */
+#define IA_VMX              (BX_CONST64(1) << 17)  /* VMX instruction */
+#define IA_SMX              (BX_CONST64(1) << 18)  /* SMX instruction */
+#define IA_LM_LAHF_SAHF     (BX_CONST64(1) << 19)  /* Long Mode LAHF/SAHF instruction */
+#define IA_CMPXCHG16B       (BX_CONST64(1) << 20)  /* CMPXCHG16B instruction */
+#define IA_RDTSCP           (BX_CONST64(1) << 21)  /* RDTSCP instruction */
+#define IA_XSAVE            (BX_CONST64(1) << 22)  /* XSAVE/XRSTOR extensions instruction */
+#define IA_XSAVEOPT         (BX_CONST64(1) << 23)  /* XSAVEOPT instruction */
+#define IA_AES_PCLMULQDQ    (BX_CONST64(1) << 24)  /* AES+PCLMULQDQ instruction */
+#define IA_MOVBE            (BX_CONST64(1) << 25)  /* MOVBE Intel Atom(R) instruction */
+#define IA_FSGSBASE         (BX_CONST64(1) << 26)  /* FS/GS BASE access instruction */
+#define IA_INVPCID          (BX_CONST64(1) << 27)  /* INVPCID instruction */
+#define IA_AVX              (BX_CONST64(1) << 28)  /* AVX instruction */
+#define IA_AVX2             (BX_CONST64(1) << 29)  /* AVX2 instruction */
+#define IA_AVX_F16C         (BX_CONST64(1) << 30)  /* AVX F16 convert instruction */
+#define IA_AVX_FMA          (BX_CONST64(1) << 31)  /* AVX FMA instruction */
+#define IA_SSE4A            (BX_CONST64(1) << 32)  /* SSE4A instruction (AMD) */
+#define IA_LZCNT            (BX_CONST64(1) << 33)  /* LZCNT instruction */
+#define IA_BMI1             (BX_CONST64(1) << 34)  /* BMI1 instruction */
+#define IA_BMI2             (BX_CONST64(1) << 35)  /* BMI2 instruction */
+#define IA_FMA4             (BX_CONST64(1) << 36)  /* FMA4 instruction (AMD) */
+#define IA_XOP              (BX_CONST64(1) << 37)  /* XOP instruction (AMD) */
+#define IA_TBM              (BX_CONST64(1) << 38)  /* TBM instruction (AMD) */
+#define IA_SVM              (BX_CONST64(1) << 39)  /* SVM instruction (AMD) */
+#define IA_RDRAND           (BX_CONST64(1) << 40)  /* RDRAND instruction */
+#define IA_ADX              (BX_CONST64(1) << 41)  /* ADCX/ADOX instruction */
+#define IA_SMAP             (BX_CONST64(1) << 42)  /* SMAP support */
+#define IA_RDSEED           (BX_CONST64(1) << 43)  /* RDSEED instruction */
+#define IA_SHA              (BX_CONST64(1) << 44)  /* SHA instruction */
+#define IA_AVX512           (BX_CONST64(1) << 45)  /* AVX-512 instruction */
+#define IA_AVX512_CD        (BX_CONST64(1) << 46)  /* AVX-512 Conflict Detection instruction */
+#define IA_AVX512_PF        (BX_CONST64(1) << 47)  /* AVX-512 Sparse Prefetch instruction */
+#define IA_AVX512_ER        (BX_CONST64(1) << 48)  /* AVX-512 Exponential/Reciprocal instruction */
+#define IA_AVX512_DQ        (BX_CONST64(1) << 49)  /* AVX-512DQ instruction */
+#define IA_AVX512_BW        (BX_CONST64(1) << 50)  /* AVX-512 Byte/Word instruction */
+#define IA_CLFLUSHOPT       (BX_CONST64(1) << 51)  /* CLFLUSHOPT instruction */
+#define IA_XSAVEC           (BX_CONST64(1) << 52)  /* XSAVEC instruction */
+#define IA_XSAVES           (BX_CONST64(1) << 53)  /* XSAVES instruction */
 
 /* general purpose bit register */
 enum {
@@ -70,6 +131,8 @@ struct BxDisasmOpcodeInfo_t
     BxDisasmPtr_t Operand1;
     BxDisasmPtr_t Operand2;
     BxDisasmPtr_t Operand3;
+    BxDisasmPtr_t Operand4;
+    Bit64u Feature;
 };
 
 struct BxDisasmOpcodeTable_t
@@ -82,26 +145,27 @@ struct BxDisasmOpcodeTable_t
 #define NO_SEG_OVERRIDE 0xFF
 
 // datasize attributes
-#define X_SIZE      0x0000
-#define B_SIZE      0x0100
-#define W_SIZE      0x0200
-#define D_SIZE      0x0300
-#define Q_SIZE      0x0400
-#define Z_SIZE      0x0500
-#define V_SIZE      0x0600
-#define O_SIZE      0x0700
-#define T_SIZE      0x0800
-#define P_SIZE      0x0900
+#define   X_SIZE      0x00 /* no size */
+#define   B_SIZE      0x01 /* byte */
+#define   W_SIZE      0x02 /* word */
+#define   D_SIZE      0x03 /* double word */
+#define   Q_SIZE      0x04 /* quad word */
+#define   Z_SIZE      0x05 /* double word in 32-bit mode, quad word in 64-bit mode */
+#define   T_SIZE      0x06 /* 10-byte x87 floating point */
+#define XMM_SIZE      0x07 /* double quad word (XMM) */
+#define YMM_SIZE      0x08 /* quadruple quad word (YMM) */
+
+#define VSIB_Index    0x80
 
 // branch hint attribute
 #define BRANCH_HINT 0x1000
 
-struct x86_insn 
+struct x86_insn
 {
 public:
   x86_insn(bx_bool is32, bx_bool is64);
 
-  bx_bool is_seg_override() const { 
+  bx_bool is_seg_override() const {
      return (seg_override != NO_SEG_OVERRIDE);
  }
 
@@ -113,15 +177,25 @@ public:
   Bit8u extend8b;
   Bit8u rex_r, rex_x, rex_b;
   Bit8u seg_override;
-  unsigned b1, prefixes;
+  unsigned b1;
   unsigned ilen;
 
+#define BX_AVX_VL128 0
+#define BX_AVX_VL256 1
+  Bit8u vex_vvv, vex_l, vex_w;
+  int is_vex; // 0 - no VEX used, 1 - VEX is used, -1 - invalid VEX
+  int is_evex; // 0 - no EVEX used, 1 - EVEX is used, -1 - invalid EVEX
+  int is_xop; // 0 - no XOP used, 1 - XOP is used, -1 - invalid XOP
   Bit8u modrm, mod, nnn, rm;
   Bit8u sib, scale, index, base;
   union {
      Bit16u displ16;
      Bit32u displ32;
   } displacement;
+
+  bx_bool evex_b;
+  bx_bool evex_z;
+  unsigned evex_ll_rc; 
 };
 
 BX_CPP_INLINE x86_insn::x86_insn(bx_bool is32, bx_bool is64)
@@ -145,48 +219,60 @@ BX_CPP_INLINE x86_insn::x86_insn(bx_bool is32, bx_bool is64)
   extend8b = 0;
   rex_r = rex_b = rex_x = 0;
   seg_override = NO_SEG_OVERRIDE;
-  prefixes = 0;
   ilen = 0;
   b1 = 0;
 
+  is_vex = 0;
+  is_evex = 0;
+  is_xop = 0;
+  vex_vvv = 0;
+  vex_l = BX_AVX_VL128;
+  vex_w = 0;
   modrm = mod = nnn = rm = 0;
   sib = scale = index = base = 0;
   displacement.displ32 = 0;
+
+  evex_b = 0;
+  evex_ll_rc = 0;
+  evex_z = 0;
 }
 
 class disassembler {
 public:
-  disassembler() { set_syntax_intel(); }
+  disassembler(): offset_mode_hex(0), print_mem_datasize(1) { set_syntax_intel(); }
 
-  unsigned disasm(bx_bool is_32, bx_bool is_64, bx_address base, bx_address ip, const Bit8u *instr, char *disbuf);
+  unsigned disasm(bx_bool is_32, bx_bool is_64, bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf);
 
-  unsigned disasm16(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return disasm(0, 0, base, ip, instr, disbuf); }
+  unsigned disasm16(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return disasm(0, 0, cs_base, ip, instr, disbuf); }
 
-  unsigned disasm32(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return disasm(1, 0, base, ip, instr, disbuf); }
+  unsigned disasm32(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return disasm(1, 0, cs_base, ip, instr, disbuf); }
 
-  unsigned disasm64(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return disasm(1, 1, base, ip, instr, disbuf); }
+  unsigned disasm64(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return disasm(1, 1, cs_base, ip, instr, disbuf); }
 
-  x86_insn decode(bx_bool is_32, bx_bool is_64, bx_address base, bx_address ip, const Bit8u *instr, char *disbuf);
+  x86_insn decode(bx_bool is_32, bx_bool is_64, bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf);
 
-  x86_insn decode16(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return decode(0, 0, base, ip, instr, disbuf); }
+  x86_insn decode16(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return decode(0, 0, cs_base, ip, instr, disbuf); }
 
-  x86_insn decode32(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return decode(1, 0, base, ip, instr, disbuf); }
+  x86_insn decode32(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return decode(1, 0, cs_base, ip, instr, disbuf); }
 
-  x86_insn decode64(bx_address base, bx_address ip, const Bit8u *instr, char *disbuf)
-    { return decode(1, 1, base, ip, instr, disbuf); }
+  x86_insn decode64(bx_address cs_base, bx_address ip, const Bit8u *instr, char *disbuf)
+    { return decode(1, 1, cs_base, ip, instr, disbuf); }
 
   void set_syntax_intel();
-  void set_syntax_att  ();
+  void set_syntax_att();
+
+  void set_offset_mode_hex(bx_bool mode) { offset_mode_hex = mode; }
+  void set_mem_datasize_print(bx_bool mode) { print_mem_datasize = mode; }
 
   void toggle_syntax_mode();
 
 private:
-  bx_bool intel_mode;
+  bx_bool intel_mode, offset_mode_hex, print_mem_datasize;
 
   const char **general_16bit_regname;
   const char **general_8bit_regname;
@@ -196,16 +282,16 @@ private:
 
   const char **segment_name;
   const char **index16;
+  const char **vector_reg_name;
 
-  const char *sreg_mod01or10_rm32[8];
-  const char *sreg_mod00_base32[8];
-  const char *sreg_mod01or10_base32[8];
+  const char *sreg_mod00_base32[16];
+  const char *sreg_mod01or10_base32[16];
   const char *sreg_mod00_rm16[8];
   const char *sreg_mod01or10_rm16[8];
 
 private:
 
-  bx_address db_eip, db_base;
+  bx_address db_eip, db_cs_base;
 
   const Bit8u *instruction;        // for fetching of next byte of instruction
 
@@ -250,6 +336,9 @@ private:
   void dis_putc(char symbol);
   void dis_sprintf(const char *fmt, ...);
   void decode_modrm(x86_insn *insn);
+  unsigned decode_vex(x86_insn *insn);
+  unsigned decode_evex(x86_insn *insn);
+  unsigned decode_xop(x86_insn *insn);
 
   void resolve16_mod0   (const x86_insn *insn, unsigned mode);
   void resolve16_mod1or2(const x86_insn *insn, unsigned mode);
@@ -268,85 +357,88 @@ private:
 
   void initialize_modrm_segregs();
 
-  void print_datasize (unsigned mode);
+  void print_datasize(unsigned mode);
 
   void print_memory_access16(int datasize,
           const char *seg, const char *index, Bit16u disp);
-  void print_memory_access  (int datasize,
-          const char *seg, const char *base, const char *index, int scale, Bit32u disp);
+  void print_memory_access32(int datasize,
+          const char *seg, const char *base, const char *index, int scale, Bit32s disp);
+  void print_memory_access64(int datasize,
+          const char *seg, const char *base, const char *index, int scale, Bit32s disp);
 
   void print_disassembly_intel(const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry);
   void print_disassembly_att  (const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry);
 
 public:
 
-/* 
+/*
  * Codes for Addressing Method:
  * ---------------------------
- * A  - Direct address. The instruction has no ModR/M byte; the address 
- *      of the operand is encoded in the instruction; and no base register, 
+ * A  - Direct address. The instruction has no ModR/M byte; the address
+ *      of the operand is encoded in the instruction; and no base register,
  *      index register, or scaling factor can be applied.
  * C  - The reg field of the ModR/M byte selects a control register.
  * D  - The reg field of the ModR/M byte selects a debug register.
- * E  - A ModR/M byte follows the opcode and specifies the operand. The 
- *      operand is either a general-purpose register or a memory address. 
- *      If it is a memory address, the address is computed from a segment 
- *      register and any of the following values: a base register, an
- *      index register, a scaling factor, a displacement.
+ * E  - A ModR/M byte follows the opcode and specifies the operand. The
+ *      operand is either a general-purpose register or a memory address.
+ *      In case of the register operand, the R/M field of the ModR/M byte
+ *      selects a general register.
  * F  - Flags Register.
  * G  - The reg field of the ModR/M byte selects a general register.
- * I  - Immediate data. The operand value is encoded in subsequent bytes of 
+ * I  - Immediate data. The operand value is encoded in subsequent bytes of
  *      the instruction.
- * J  - The instruction contains a relative offset to be added to the 
+ * J  - The instruction contains a relative offset to be added to the
  *      instruction pointer register.
  * M  - The ModR/M byte may refer only to memory.
- * N  - The R/M field of the ModR/M byte selects a packed-quadword  MMX 
+ * N  - The R/M field of the ModR/M byte selects a packed-quadword  MMX
         technology register.
- * O  - The instruction has no ModR/M byte; the offset of the operand is 
- *      coded as a word or double word (depending on address size attribute) 
- *      in the instruction. No base register, index register, or scaling 
+ * O  - The instruction has no ModR/M byte; the offset of the operand is
+ *      coded as a word or double word (depending on address size attribute)
+ *      in the instruction. No base register, index register, or scaling
  *      factor can be applied.
- * P  - The reg field of the ModR/M byte selects a packed quadword MMX 
+ * P  - The reg field of the ModR/M byte selects a packed quadword MMX
  *      technology register.
- * Q  - A ModR/M byte follows the opcode and specifies the operand. The 
- *      operand is either an MMX technology register or a memory address. 
- *      If it is a memory address, the address is computed from a segment 
- *      register and any of the following values: a base register, an 
+ * Q  - A ModR/M byte follows the opcode and specifies the operand. The
+ *      operand is either an MMX technology register or a memory address.
+ *      If it is a memory address, the address is computed from a segment
+ *      register and any of the following values: a base register, an
  *      index register, a scaling factor, and a displacement.
  * R  - The mod field of the ModR/M byte may refer only to a general register.
  * S  - The reg field of the ModR/M byte selects a segment register.
- * U  - The R/M field of the ModR/M byte selects a 128-bit XMM register.
  * T  - The reg field of the ModR/M byte selects a test register.
- * V  - The reg field of the ModR/M byte selects a 128-bit XMM register.
- * W  - A ModR/M byte follows the opcode and specifies the operand. The 
- *      operand is either a 128-bit XMM register or a memory address. If 
- *      it is a memory address, the address is computed from a segment 
+ * U  - The R/M field of the ModR/M byte selects a 128-bit XMM/256-bit YMM register.
+ * V  - The reg field of the ModR/M byte selects a 128-bit XMM/256-bit YMM register.
+ * W  - A ModR/M byte follows the opcode and specifies the operand. The
+ *      operand is either a 128-bit XMM/256-bit YMM register or a memory address.
+ *      If it is a memory address, the address is computed from a segment
  *      register and any of the following values: a base register, an
  *      index register, a scaling factor, and a displacement.
  * X  - Memory addressed by the DS:rSI register pair.
  * Y  - Memory addressed by the ES:rDI register pair.
- */   
+ */
 
-/* 
+/*
  * Codes for Operand Type:
  * ----------------------
- * a  - Two one-word operands in memory or two double-word operands in 
+ * a  - Two one-word operands in memory or two double-word operands in
  *      memory, depending on operand-size attribute (used only by the BOUND
  *      instruction).
  * b  - Byte, regardless of operand-size attribute.
  * d  - Doubleword, regardless of operand-size attribute.
  * dq - Double-quadword, regardless of operand-size attribute.
  * p  - 32-bit or 48-bit pointer, depending on operand-size attribute.
- * pd - 128-bit packed double-precision floating-point data.
+ * pd - 128-bit/256-bit packed double-precision floating-point data.
  * pi - Quadword MMX technology register (packed integer)
- * ps - 128-bit packed single-precision floating-point data.
+ * ps - 128-bit/256-bit packed single-precision floating-point data.
  * q  - Quadword, regardless of operand-size attribute.
  * s  - 6-byte or 10-byte pseudo-descriptor.
  * si - Doubleword integer register (scalar integer)
- * ss - Scalar element of a 128-bit packed single-precision floating data.
- * sd - Scalar element of a 128-bit packed double-precision floating data.
+ * ss - Scalar element of a packed single-precision floating data.
+ * sd - Scalar element of a packed double-precision floating data.
  * v  - Word, doubleword or quadword, depending on operand-size attribute.
  * w  - Word, regardless of operand-size attr.
+ * y  - Doubleword or quadword (in 64-bit mode) depending on 32/64 bit
+ *      operand size.
  */
 
   // far call/jmp
@@ -354,18 +446,19 @@ public:
   void Apd(const x86_insn *insn);
 
   // 8-bit general purpose registers
-  void AL(const x86_insn *insn);
-  void CL(const x86_insn *insn);
+  void AL_Reg(const x86_insn *insn);
+  void CL_Reg(const x86_insn *insn);
 
   // 16-bit general purpose registers
-  void AX(const x86_insn *insn);
-  void DX(const x86_insn *insn);
+  void AX_Reg(const x86_insn *insn);
+  void DX_Reg(const x86_insn *insn);
 
   // 32-bit general purpose registers
-  void EAX(const x86_insn *insn);
+  void EAX_Reg(const x86_insn *insn);
 
   // 64-bit general purpose registers
-  void RAX(const x86_insn *insn);
+  void RAX_Reg(const x86_insn *insn);
+  void RCX_Reg(const x86_insn *insn);
 
   // segment registers
   void CS(const x86_insn *insn);
@@ -378,9 +471,6 @@ public:
   // segment registers
   void Sw(const x86_insn *insn);
 
-  // test registers
-  void Td(const x86_insn *insn);
-
   // control register
   void Cd(const x86_insn *insn);
   void Cq(const x86_insn *insn);
@@ -390,7 +480,7 @@ public:
   void Dq(const x86_insn *insn);
 
   //  8-bit general purpose register
-  void R8(const x86_insn *insn);
+  void Reg8(const x86_insn *insn);
 
   // 16-bit general purpose register
   void RX(const x86_insn *insn);
@@ -406,12 +496,20 @@ public:
   void Ew(const x86_insn *insn);
   void Ed(const x86_insn *insn);
   void Eq(const x86_insn *insn);
+  void Ey(const x86_insn *insn);
+  void Ebd(const x86_insn *insn);
+  void Ewd(const x86_insn *insn);
+  void Edq(const x86_insn *insn);
 
   // general purpose register
   void Gb(const x86_insn *insn);
   void Gw(const x86_insn *insn);
   void Gd(const x86_insn *insn);
   void Gq(const x86_insn *insn);
+  void Gy(const x86_insn *insn);
+
+  // vex encoded general purpose register
+  void By(const x86_insn *insn);
 
   // immediate
   void I1(const x86_insn *insn);
@@ -420,7 +518,8 @@ public:
   void Id(const x86_insn *insn);
   void Iq(const x86_insn *insn);
 
-  // two immediates Iw/Ib
+  // double immediate
+  void IbIb(const x86_insn *insn);
   void IwIb(const x86_insn *insn);
 
   // sign extended immediate
@@ -437,6 +536,7 @@ public:
   void Rw(const x86_insn *insn);
   void Rd(const x86_insn *insn);
   void Rq(const x86_insn *insn);
+  void Ry(const x86_insn *insn);
 
   // mmx register
   void Pq(const x86_insn *insn);
@@ -447,22 +547,39 @@ public:
   void Vq(const x86_insn *insn);
   void Nq(const x86_insn *insn);
 
-  // xmm register
+  // xmm/ymm register
+  void Ups(const x86_insn *insn);
+  void Upd(const x86_insn *insn);
   void Udq(const x86_insn *insn);
+  void Uq(const x86_insn *insn);
+
   void Vdq(const x86_insn *insn);
   void Vss(const x86_insn *insn);
   void Vsd(const x86_insn *insn);
   void Vps(const x86_insn *insn);
   void Vpd(const x86_insn *insn);
+  // xmm/ymm register through imm byte
+  void VIb(const x86_insn *insn);
 
-  // xmm register or memory operand
+  // xmm/ymm register or memory operand
+  void Wb(const x86_insn *insn);
+  void Ww(const x86_insn *insn);
+  void Wd(const x86_insn *insn);
   void Wq(const x86_insn *insn);
+
   void Wdq(const x86_insn *insn);
   void Wss(const x86_insn *insn);
   void Wsd(const x86_insn *insn);
   void Wps(const x86_insn *insn);
   void Wpd(const x86_insn *insn);
 
+  // vex encoded xmm/ymm register
+  void Hdq(const x86_insn *insn);
+  void Hps(const x86_insn *insn);
+  void Hpd(const x86_insn *insn);
+  void Hss(const x86_insn *insn);
+  void Hsd(const x86_insn *insn);
+
   // direct memory access
   void OP_O(const x86_insn *insn, unsigned size);
   void Ob(const x86_insn *insn);
@@ -484,6 +601,11 @@ public:
   void Mdq(const x86_insn *insn);
   void Mps(const x86_insn *insn);
   void Mpd(const x86_insn *insn);
+  void Mss(const x86_insn *insn);
+  void Msd(const x86_insn *insn);
+
+  // gather VSib
+  void VSib(const x86_insn *insn);
 
   // string instructions
   void OP_X(const x86_insn *insn, unsigned size);
@@ -499,6 +621,11 @@ public:
   void Yd(const x86_insn *insn);
   void Yq(const x86_insn *insn);
 
+  // maskmovdq/maskmovdqu
+  void OP_sY(const x86_insn *insn, unsigned size);
+  void sYq(const x86_insn *insn);
+  void sYdq(const x86_insn *insn);
+
   // jump offset
   void Jb(const x86_insn *insn);
   void Jw(const x86_insn *insn);
diff --git a/Externals/Bochs_disasm/opcodes.inc b/Externals/Bochs_disasm/opcodes.inc
new file mode 100644
index 0000000000..371e14c300
--- /dev/null
+++ b/Externals/Bochs_disasm/opcodes.inc
@@ -0,0 +1,1903 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: opcodes.inc 12247 2014-03-17 20:29:44Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2013 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+Ia_aaa = { "aaa", "aaa", XX, XX, XX, XX, 0 },
+Ia_aad = { "aad", "aad", Ib, XX, XX, XX, 0 },
+Ia_aam = { "aam", "aam", Ib, XX, XX, XX, 0 },
+Ia_aas = { "aas", "aas", XX, XX, XX, XX, 0 },
+Ia_adcb_AL_Ib = { "adc", "adcb", AL_Reg, Ib, XX, XX, 0 },
+Ia_adcb_Eb_Gb = { "adc", "adcb", Eb, Gb, XX, XX, 0 },
+Ia_adcb_Eb_Ib = { "adc", "adcb", Eb, Ib, XX, XX, 0 },
+Ia_adcb_Gb_Eb = { "adc", "adcb", Gb, Eb, XX, XX, 0 },
+Ia_adcl_EAX_Id = { "adc", "adcl", EAX_Reg, Id, XX, XX, 0 },
+Ia_adcl_Ed_Gd = { "adc", "adcl", Ed, Gd, XX, XX, 0 },
+Ia_adcl_Ed_Id = { "adc", "adcl", Ed, Id, XX, XX, 0 },
+Ia_adcl_Ed_sIb = { "adc", "adcl", Ed, sIbd, XX, XX, 0 },
+Ia_adcl_Gd_Ed = { "adc", "adcl", Gd, Ed, XX, XX, 0 },
+Ia_adcq_Eq_Gq = { "adc", "adcq", Eq, Gq, XX, XX, 0 },
+Ia_adcq_Eq_sIb = { "adc", "adcq", Eq, sIbq, XX, XX, 0 },
+Ia_adcq_Eq_sId = { "adc", "adcq", Eq, sIdq, XX, XX, 0 },
+Ia_adcq_Gq_Eq = { "adc", "adcq", Gq, Eq, XX, XX, 0 },
+Ia_adcq_RAX_sId = { "adc", "adcq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_adcw_AX_Iw = { "adc", "adcw", AX_Reg, Iw, XX, XX, 0 },
+Ia_adcw_Ew_Gw = { "adc", "adcw", Ew, Gw, XX, XX, 0 },
+Ia_adcw_Ew_Iw = { "adc", "adcw", Ew, Iw, XX, XX, 0 },
+Ia_adcw_Ew_sIb = { "adc", "adcw", Ew, sIbw, XX, XX, 0 },
+Ia_adcw_Gw_Ew = { "adc", "adcw", Gw, Ew, XX, XX, 0 },
+Ia_adcx_Gd_Ed = { "adcx", "adcxd", Gd, Ed, XX, XX, IA_ADX },
+Ia_adcx_Gq_Eq = { "adcx", "adcxq", Gq, Eq, XX, XX, IA_ADX },
+Ia_addb_AL_Ib = { "add", "addb", AL_Reg, Ib, XX, XX, 0 },
+Ia_addb_Eb_Gb = { "add", "addb", Eb, Gb, XX, XX, 0 },
+Ia_addb_Eb_Ib = { "add", "addb", Eb, Ib, XX, XX, 0 },
+Ia_addb_Gb_Eb = { "add", "addb", Gb, Eb, XX, XX, 0 },
+Ia_addl_EAX_Id = { "add", "addl", EAX_Reg, Id, XX, XX, 0 },
+Ia_addl_Ed_Gd = { "add", "addl", Ed, Gd, XX, XX, 0 },
+Ia_addl_Ed_Id = { "add", "addl", Ed, Id, XX, XX, 0 },
+Ia_addl_Ed_sIb = { "add", "addl", Ed, sIbd, XX, XX, 0 },
+Ia_addl_Gd_Ed = { "add", "addl", Gd, Ed, XX, XX, 0 },
+Ia_addpd_Vpd_Wpd = { "addpd", "addpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_addps_Vps_Wps = { "addps", "addps", Vps, Wps, XX, XX, IA_SSE },
+Ia_addq_Eq_Gq = { "add", "addq", Eq, Gq, XX, XX, 0 },
+Ia_addq_Eq_sIb = { "add", "addq", Eq, sIbq, XX, XX, 0 },
+Ia_addq_Eq_sId = { "add", "addq", Eq, sIdq, XX, XX, 0 },
+Ia_addq_Gq_Eq = { "add", "addq", Gq, Eq, XX, XX, 0 },
+Ia_addq_RAX_sId = { "add", "addq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_addsd_Vsd_Wsd = { "addsd", "addsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_addss_Vss_Wss = { "addss", "addss", Vss, Wss, XX, XX, IA_SSE },
+Ia_addsubpd_Vpd_Wpd = { "addsubpd", "addsubpd", Vpd, Wpd, XX, XX, IA_SSE3 },
+Ia_addsubps_Vps_Wps = { "addsubps", "addsubps", Vps, Wps, XX, XX, IA_SSE3 },
+Ia_addw_AX_Iw = { "add", "addw", AX_Reg, Iw, XX, XX, 0 },
+Ia_addw_Ew_Gw = { "add", "addw", Ew, Gw, XX, XX, 0 },
+Ia_addw_Ew_Iw = { "add", "addw", Ew, Iw, XX, XX, 0 },
+Ia_addw_Ew_sIb = { "add", "addw", Ew, sIbw, XX, XX, 0 },
+Ia_addw_Gw_Ew = { "add", "addw", Gw, Ew, XX, XX, 0 },
+Ia_adox_Gd_Ed = { "adox", "adoxd", Gd, Ed, XX, XX, IA_ADX },
+Ia_adox_Gq_Eq = { "adox", "adoxq", Gq, Eq, XX, XX, IA_ADX },
+Ia_aesdec_Vdq_Wdq = { "aesdec", "aesdec", Vdq, Wdq, XX, XX, IA_AES_PCLMULQDQ },
+Ia_aesdeclast_Vdq_Wdq = { "aesdeclast", "aesdeclast", Vdq, Wdq, XX, XX, IA_AES_PCLMULQDQ },
+Ia_aesenc_Vdq_Wdq = { "aesenc", "aesenc", Vdq, Wdq, XX, XX, IA_AES_PCLMULQDQ },
+Ia_aesenclast_Vdq_Wdq = { "aesenclast", "aesenclast", Vdq, Wdq, XX, XX, IA_AES_PCLMULQDQ },
+Ia_aesimc_Vdq_Wdq = { "aesimc", "aesimc", Vdq, Wdq, XX, XX, IA_AES_PCLMULQDQ },
+Ia_aeskeygenassist_Vdq_Wdq_Ib = { "aeskeygenassist", "aeskeygenassist", Vdq, Wdq, Ib, XX, IA_AES_PCLMULQDQ },
+Ia_andb_AL_Ib = { "and", "andb", AL_Reg, Ib, XX, XX, 0 },
+Ia_andb_Eb_Gb = { "and", "andb", Eb, Gb, XX, XX, 0 },
+Ia_andb_Eb_Ib = { "and", "andb", Eb, Ib, XX, XX, 0 },
+Ia_andb_Gb_Eb = { "and", "andb", Gb, Eb, XX, XX, 0 },
+Ia_andl_EAX_Id = { "and", "andl", EAX_Reg, Id, XX, XX, 0 },
+Ia_andl_Ed_Gd = { "and", "andl", Ed, Gd, XX, XX, 0 },
+Ia_andl_Ed_Id = { "and", "andl", Ed, Id, XX, XX, 0 },
+Ia_andl_Ed_sIb = { "and", "andl", Ed, sIbd, XX, XX, 0 },
+Ia_andl_Gd_Ed = { "and", "andl", Gd, Ed, XX, XX, 0 },
+Ia_andn_Gy_By_Ey = { "andn", "andn", Gy, By, Ey, XX, IA_BMI1 },
+Ia_andnpd_Vpd_Wpd = { "andnpd", "andnpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_andnps_Vps_Wps = { "andnps", "andnps", Vps, Wps, XX, XX, IA_SSE },
+Ia_andpd_Vpd_Wpd = { "andpd", "andpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_andps_Vps_Wps = { "andps", "andps", Vps, Wps, XX, XX, IA_SSE },
+Ia_andq_Eq_Gq = { "and", "andq", Eq, Gq, XX, XX, 0 },
+Ia_andq_Eq_sIb = { "and", "andq", Eq, sIbq, XX, XX, 0 },
+Ia_andq_Eq_sId = { "and", "andq", Eq, sIdq, XX, XX, 0 },
+Ia_andq_Gq_Eq = { "and", "andq", Gq, Eq, XX, XX, 0 },
+Ia_andq_RAX_sId = { "and", "andq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_andw_AX_Iw = { "and", "andw", AX_Reg, Iw, XX, XX, 0 },
+Ia_andw_Ew_Gw = { "and", "andw", Ew, Gw, XX, XX, 0 },
+Ia_andw_Ew_Iw = { "and", "andw", Ew, Iw, XX, XX, 0 },
+Ia_andw_Ew_sIb = { "and", "andw", Ew, sIbw, XX, XX, 0 },
+Ia_andw_Gw_Ew = { "and", "andw", Gw, Ew, XX, XX, 0 },
+Ia_arpl_Ew_Gw = { "arpl", "arpl", Ew, Gw, XX, XX, 0 },
+Ia_bextr_Gy_Ey_By = { "bextr", "bextr", Gy, Ey, By, XX, IA_BMI1 },
+Ia_bextr_Gy_Ey_Id = { "bextr", "bextr", Gy, Ey, Id, XX, IA_TBM },
+Ia_blcfill_By_Ey = { "blcfill", "blcfill", Gy, By, Ey, XX, IA_TBM },
+Ia_blci_By_Ey = { "blci", "blci", Gy, By, Ey, XX, IA_TBM },
+Ia_blcic_By_Ey = { "blcic", "blcic", Gy, By, Ey, XX, IA_TBM },
+Ia_blcmsk_By_Ey = { "blcmsk", "blcmsk", Gy, By, Ey, XX, IA_TBM },
+Ia_blcs_By_Ey = { "blcs", "blcs", Gy, By, Ey, XX, IA_TBM },
+Ia_blendpd_Vpd_Wpd_Ib = { "blendpd", "blendpd", Vpd, Wpd, Ib, XX, IA_SSE4_1 },
+Ia_blendps_Vps_Wps_Ib = { "blendps", "blendps", Vps, Wps, Ib, XX, IA_SSE4_1 },
+Ia_blendvpd_Vpd_Wpd = { "blendvpd", "blendvpd", Vpd, Wpd, XX, XX, IA_SSE4_1 },
+Ia_blendvps_Vps_Wps = { "blendvps", "blendvps", Vps, Wps, XX, XX, IA_SSE4_1 },
+Ia_blsfill_By_Ey = { "blsfill", "blsfill", Gy, By, Ey, XX, IA_TBM },
+Ia_blsi_By_Ey = { "blsi", "blsi", By, Ey, XX, XX, IA_BMI1 },
+Ia_blsic_By_Ey = { "blsic", "blsic", Gy, By, Ey, XX, IA_TBM },
+Ia_blsmsk_By_Ey = { "blsmsk", "blsmsk", By, Ey, XX, XX, IA_BMI1 },
+Ia_blsr_By_Ey = { "blsr", "blsr", By, Ey, XX, XX, IA_BMI1 },
+Ia_boundl_Gd_Ma = { "bound", "boundl", Gd, Ma, XX, XX, 0 },
+Ia_boundw_Gw_Ma = { "bound", "boundw", Gw, Ma, XX, XX, 0 },
+Ia_bsfl_Gd_Ed = { "bsf", "bsfl", Gd, Ed, XX, XX, 0 },
+Ia_bsfq_Gq_Eq = { "bsf", "bsfq", Gq, Eq, XX, XX, 0 },
+Ia_bsfw_Gw_Ew = { "bsf", "bsfw", Gw, Ew, XX, XX, 0 },
+Ia_bsrl_Gd_Ed = { "bsr", "bsrl", Gd, Ed, XX, XX, 0 },
+Ia_bsrq_Gq_Eq = { "bsr", "bsrq", Gq, Eq, XX, XX, 0 },
+Ia_bsrw_Gw_Ew = { "bsr", "bsrw", Gw, Ew, XX, XX, 0 },
+Ia_bswapw_RX = { "bswap", "bswapw", RX, XX, XX, XX, IA_486 },
+Ia_bswapl_ERX = { "bswap", "bswapl", ERX, XX, XX, XX, IA_486 },
+Ia_bswapq_RRX = { "bswap", "bswapq", RRX, XX, XX, XX, 0 },
+Ia_btcl_Ed_Gd = { "btc", "btcl", Ed, Gd, XX, XX, 0 },
+Ia_btcl_Ed_Ib = { "btc", "btcl", Ed, Ib, XX, XX, 0 },
+Ia_btcq_Eq_Gq = { "btc", "btcq", Eq, Gq, XX, XX, 0 },
+Ia_btcq_Eq_Ib = { "btc", "btcq", Eq, Ib, XX, XX, 0 },
+Ia_btcw_Ew_Gw = { "btc", "btcw", Ew, Gw, XX, XX, 0 },
+Ia_btcw_Ew_Ib = { "btc", "btcw", Ew, Ib, XX, XX, 0 },
+Ia_btl_Ed_Gd = { "bt", "btl", Ed, Gd, XX, XX, 0 },
+Ia_btl_Ed_Ib = { "bt", "btl", Ed, Ib, XX, XX, 0 },
+Ia_btq_Eq_Gq = { "bt", "btq", Eq, Gq, XX, XX, 0 },
+Ia_btq_Eq_Ib = { "bt", "btq", Eq, Ib, XX, XX, 0 },
+Ia_btrl_Ed_Gd = { "btr", "btrl", Ed, Gd, XX, XX, 0 },
+Ia_btrl_Ed_Ib = { "btr", "btrl", Ed, Ib, XX, XX, 0 },
+Ia_btrq_Eq_Gq = { "btr", "btrq", Eq, Gq, XX, XX, 0 },
+Ia_btrq_Eq_Ib = { "btr", "btrq", Eq, Ib, XX, XX, 0 },
+Ia_btrw_Ew_Gw = { "btr", "btrw", Ew, Gw, XX, XX, 0 },
+Ia_btrw_Ew_Ib = { "btr", "btrw", Ew, Ib, XX, XX, 0 },
+Ia_btsl_Ed_Gd = { "bts", "btsl", Ed, Gd, XX, XX, 0 },
+Ia_btsl_Ed_Ib = { "bts", "btsl", Ed, Ib, XX, XX, 0 },
+Ia_btsq_Eq_Gq = { "bts", "btsq", Eq, Gq, XX, XX, 0 },
+Ia_btsq_Eq_Ib = { "bts", "btsq", Eq, Ib, XX, XX, 0 },
+Ia_btsw_Ew_Gw = { "bts", "btsw", Ew, Gw, XX, XX, 0 },
+Ia_btsw_Ew_Ib = { "bts", "btsw", Ew, Ib, XX, XX, 0 },
+Ia_btw_Ew_Gw = { "bt", "btw", Ew, Gw, XX, XX, 0 },
+Ia_btw_Ew_Ib = { "bt", "btw", Ew, Ib, XX, XX, 0 },
+Ia_bzhi_Gy_Ey_By = { "bzhi", "bzhi", Gy, Ey, By, XX, IA_BMI2 },
+Ia_call_Ed = { "call", "call", Ed, XX, XX, XX, 0 },
+Ia_call_Eq = { "call", "call", Eq, XX, XX, XX, 0 },
+Ia_call_Ew = { "call", "call", Ew, XX, XX, XX, 0 },
+Ia_call_Jd = { "call", "call", Jd, XX, XX, XX, 0 },
+Ia_call_Jw = { "call", "call", Jw, XX, XX, XX, 0 },
+Ia_cbw = { "cbw", "cbtw", XX, XX, XX, XX, 0 },
+Ia_cdq = { "cdq", "cltd", XX, XX, XX, XX, 0 },
+Ia_cdqe = { "cdqe", "cltq", XX, XX, XX, XX, 0 },
+Ia_clflush = { "clflush", "clflush", Mb, XX, XX, XX, IA_CLFLUSH },
+Ia_clac = { "clac", "clac", XX, XX, XX, XX, IA_SMAP },
+Ia_clc = { "clc", "clc", XX, XX, XX, XX, 0 },
+Ia_cld = { "cld", "cld", XX, XX, XX, XX, 0 },
+Ia_clgi = { "clgi", "clgi", XX, XX, XX, XX, IA_SVM },
+Ia_cli = { "cli", "cli", XX, XX, XX, XX, 0 },
+Ia_clts = { "clts", "clts", XX, XX, XX, XX, 0 },
+Ia_cmc = { "cmc", "cmc", XX, XX, XX, XX, 0 },
+Ia_cmovnbel_Gd_Ed = { "cmovnbe", "cmovnbel", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnbeq_Gq_Eq = { "cmovnbe", "cmovnbeq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnbew_Gw_Ew = { "cmovnbe", "cmovnbew", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovbl_Gd_Ed = { "cmovb", "cmovbl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovbq_Gq_Eq = { "cmovb", "cmovbq", Gq, Eq, XX, XX, 0 },
+Ia_cmovbw_Gw_Ew = { "cmovb", "cmovbw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnlel_Gd_Ed = { "cmovnle", "cmovnlel", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnleq_Gq_Eq = { "cmovnle", "cmovnleq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnlew_Gw_Ew = { "cmovnle", "cmovnlew", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovll_Gd_Ed = { "cmovl", "cmovll", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovlq_Gq_Eq = { "cmovl", "cmovlq", Gq, Eq, XX, XX, 0 },
+Ia_cmovlw_Gw_Ew = { "cmovl", "cmovlw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovbel_Gd_Ed = { "cmovbe", "cmovbel", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovbeq_Gq_Eq = { "cmovbe", "cmovbeq", Gq, Eq, XX, XX, 0 },
+Ia_cmovbew_Gw_Ew = { "cmovbe", "cmovbew", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnbl_Gd_Ed = { "cmovnb", "cmovnbl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnbq_Gq_Eq = { "cmovnb", "cmovnbq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnbw_Gw_Ew = { "cmovnb", "cmovnbw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovlel_Gd_Ed = { "cmovle", "cmovlel", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovleq_Gq_Eq = { "cmovle", "cmovleq", Gq, Eq, XX, XX, 0 },
+Ia_cmovlew_Gw_Ew = { "cmovle", "cmovlew", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnll_Gd_Ed = { "cmovnl", "cmovnll", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnlq_Gq_Eq = { "cmovnl", "cmovnlq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnlw_Gw_Ew = { "cmovnl", "cmovnlw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnol_Gd_Ed = { "cmovno", "cmovnol", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnoq_Gq_Eq = { "cmovno", "cmovnoq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnow_Gw_Ew = { "cmovno", "cmovnow", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnpl_Gd_Ed = { "cmovnp", "cmovnpl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnpq_Gq_Eq = { "cmovnp", "cmovnpq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnpw_Gw_Ew = { "cmovnp", "cmovnpw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnsl_Gd_Ed = { "cmovns", "cmovnsl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnsq_Gq_Eq = { "cmovns", "cmovnsq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnsw_Gw_Ew = { "cmovns", "cmovnsw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovnzl_Gd_Ed = { "cmovnz", "cmovnzl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovnzq_Gq_Eq = { "cmovnz", "cmovnzq", Gq, Eq, XX, XX, 0 },
+Ia_cmovnzw_Gw_Ew = { "cmovnz", "cmovnzw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovol_Gd_Ed = { "cmovo", "cmovol", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovoq_Gq_Eq = { "cmovo", "cmovoq", Gq, Eq, XX, XX, 0 },
+Ia_cmovow_Gw_Ew = { "cmovo", "cmovow", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovpl_Gd_Ed = { "cmovp", "cmovpl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovpq_Gq_Eq = { "cmovp", "cmovpq", Gq, Eq, XX, XX, 0 },
+Ia_cmovpw_Gw_Ew = { "cmovp", "cmovpw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovsl_Gd_Ed = { "cmovs", "cmovsl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovsq_Gq_Eq = { "cmovs", "cmovsq", Gq, Eq, XX, XX, 0 },
+Ia_cmovsw_Gw_Ew = { "cmovs", "cmovsw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmovzl_Gd_Ed = { "cmovz", "cmovzl", Gd, Ed, XX, XX, IA_P6 },
+Ia_cmovzq_Gq_Eq = { "cmovz", "cmovzq", Gq, Eq, XX, XX, 0 },
+Ia_cmovzw_Gw_Ew = { "cmovz", "cmovzw", Gw, Ew, XX, XX, IA_P6 },
+Ia_cmpb_AL_Ib = { "cmp", "cmpb", AL_Reg, Ib, XX, XX, 0 },
+Ia_cmpb_Eb_Gb = { "cmp", "cmpb", Eb, Gb, XX, XX, 0 },
+Ia_cmpb_Eb_Ib = { "cmp", "cmpb", Eb, Ib, XX, XX, 0 },
+Ia_cmpb_Gb_Eb = { "cmp", "cmpb", Gb, Eb, XX, XX, 0 },
+Ia_cmpl_EAX_Id = { "cmp", "cmpl", EAX_Reg, Id, XX, XX, 0 },
+Ia_cmpl_Ed_Gd = { "cmp", "cmpl", Ed, Gd, XX, XX, 0 },
+Ia_cmpl_Ed_Id = { "cmp", "cmpl", Ed, Id, XX, XX, 0 },
+Ia_cmpl_Ed_sIb = { "cmp", "cmpl", Ed, sIbd, XX, XX, 0 },
+Ia_cmpl_Gd_Ed = { "cmp", "cmpl", Gd, Ed, XX, XX, 0 },
+Ia_cmppd_Vpd_Wpd_Ib = { "cmppd", "cmppd", Vpd, Wpd, Ib, XX, IA_SSE2 },
+Ia_cmpps_Vps_Wps_Ib = { "cmpps", "cmpps", Vps, Wps, Ib, XX, IA_SSE },
+Ia_cmpq_Eq_Gq = { "cmp", "cmpq", Eq, Gq, XX, XX, 0 },
+Ia_cmpq_Eq_sIb = { "cmp", "cmpq", Eq, sIbq, XX, XX, 0 },
+Ia_cmpq_Eq_sId = { "cmp", "cmpq", Eq, sIdq, XX, XX, 0 },
+Ia_cmpq_Gq_Eq = { "cmp", "cmpq", Gq, Eq, XX, XX, 0 },
+Ia_cmpq_RAX_sId = { "cmp", "cmpq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_cmpsb_Xb_Yb = { "cmpsb", "cmpsb", Xb, Yb, XX, XX, 0 },
+Ia_cmpsd_Vsd_Wsd_Ib = { "cmpsd", "cmpsd", Vsd, Wsd, Ib, XX, IA_SSE2 },
+Ia_cmpsl_Xd_Yd = { "cmpsd", "cmpsl", Xd, Yd, XX, XX, 0 },
+Ia_cmpsq_Xq_Yq = { "cmpsq", "cmpsq", Xq, Yq, XX, XX, 0 },
+Ia_cmpss_Vss_Wss_Ib = { "cmpss", "cmpss", Vss, Wss, Ib, XX, IA_SSE },
+Ia_cmpsw_Xw_Yw = { "cmpsw", "cmpsw", Xw, Yw, XX, XX, 0 },
+Ia_cmpw_AX_Iw = { "cmp", "cmpw", AX_Reg, Iw, XX, XX, 0 },
+Ia_cmpw_Ew_Gw = { "cmp", "cmpw", Ew, Gw, XX, XX, 0 },
+Ia_cmpw_Ew_Iw = { "cmp", "cmpw", Ew, Iw, XX, XX, 0 },
+Ia_cmpw_Ew_sIb = { "cmp", "cmpw", Ew, sIbw, XX, XX, 0 },
+Ia_cmpw_Gw_Ew = { "cmp", "cmpw", Gw, Ew, XX, XX, 0 },
+Ia_cmpxchg16b_Mdq = { "cmpxchg16b", "cmpxchg16b", Mdq, XX, XX, XX, IA_CMPXCHG16B },
+Ia_cmpxchg8b_Mq = { "cmpxchg8b", "cmpxchg8b", Mq, XX, XX, XX, IA_PENTIUM },
+Ia_cmpxchgb_Eb_Gb = { "cmpxchg", "cmpxchgb", Eb, Gb, XX, XX, IA_486 },
+Ia_cmpxchgl_Ed_Gd = { "cmpxchg", "cmpxchgl", Ed, Gd, XX, XX, IA_486 },
+Ia_cmpxchgq_Eq_Gq = { "cmpxchg", "cmpxchgq", Eq, Gq, XX, XX, 0 },
+Ia_cmpxchgw_Ew_Gw = { "cmpxchg", "cmpxchgw", Ew, Gw, XX, XX, IA_486 },
+Ia_comisd_Vsd_Wsd = { "comisd", "comisd", Vsd, Wsd, XX, XX, 0 },
+Ia_comiss_Vss_Wss = { "comiss", "comiss", Vss, Wss, XX, XX, 0 },
+Ia_cpuid = { "cpuid", "cpuid", XX, XX, XX, XX, IA_486 },
+Ia_cqo = { "cqo", "cqto", XX, XX, XX, XX, 0 },
+Ia_crc32_Gd_Eb = { "crc32", "crc32", Gd, Eb, XX, XX, IA_SSE4_2 },
+Ia_crc32_Gd_Ed = { "crc32", "crc32", Gd, Ed, XX, XX, IA_SSE4_2 },
+Ia_crc32_Gd_Eq = { "crc32", "crc32", Gd, Eq, XX, XX, IA_SSE4_2 },
+Ia_crc32_Gd_Ew = { "crc32", "crc32", Gd, Ew, XX, XX, IA_SSE4_2 },
+Ia_cvtdq2pd_Vpd_Wq = { "cvtdq2pd", "cvtdq2pd", Vpd, Wq, XX, XX, IA_SSE2 },
+Ia_cvtdq2ps_Vps_Wdq = { "cvtdq2ps", "cvtdq2ps", Vps, Wdq, XX, XX, IA_SSE2 },
+Ia_cvtpd2dq_Vq_Wpd = { "cvtpd2dq", "cvtpd2dq", Vq, Wpd, XX, XX, IA_SSE2 },
+Ia_cvtpd2pi_Pq_Wpd = { "cvtpd2pi", "cvtpd2pi", Pq, Wpd, XX, XX, IA_SSE2 },
+Ia_cvtpd2ps_Vps_Wpd = { "cvtpd2ps", "cvtpd2ps", Vps, Wpd, XX, XX, IA_SSE2 },
+Ia_cvtpi2pd_Vpd_Qq = { "cvtpi2pd", "cvtpi2pd", Vpd, Qq, XX, XX, IA_SSE2 },
+Ia_cvtpi2ps_Vps_Qq = { "cvtpi2ps", "cvtpi2ps", Vps, Qq, XX, XX, IA_SSE },
+Ia_cvtps2dq_Vdq_Wps = { "cvtps2dq", "cvtps2dq", Vdq, Wps, XX, XX, IA_SSE2 },
+Ia_cvtps2pd_Vpd_Wps = { "cvtps2pd", "cvtps2pd", Vpd, Wps, XX, XX, IA_SSE2 },
+Ia_cvtps2pi_Pq_Wps = { "cvtps2pi", "cvtps2pi", Pq, Wps, XX, XX, IA_SSE },
+Ia_cvtsd2si_Gy_Wsd = { "cvtsd2si", "cvtsd2si", Gy, Wsd, XX, XX, IA_SSE2 },
+Ia_cvtsd2ss_Vss_Wsd = { "cvtsd2ss", "cvtsd2ss", Vss, Wsd, XX, XX, IA_SSE2 },
+Ia_cvtsi2sd_Vsd_Ey = { "cvtsi2sd", "cvtsi2sd", Vsd, Ey, XX, XX, IA_SSE2 },
+Ia_cvtsi2ss_Vss_Ey = { "cvtsi2ss", "cvtsi2ss", Vss, Ey, XX, XX, IA_SSE },
+Ia_cvtss2sd_Vsd_Wss = { "cvtss2sd", "cvtss2sd", Vsd, Wss, XX, XX, IA_SSE2 },
+Ia_cvtss2si_Gy_Wss = { "cvtss2si", "cvtss2si", Gy, Wss, XX, XX, IA_SSE },
+Ia_cvttpd2dq_Vq_Wpd = { "cvttpd2dq", "cvttpd2dq", Vq, Wpd, XX, XX, IA_SSE2 },
+Ia_cvttpd2pi_Pq_Wpd = { "cvttpd2pi", "cvttpd2pi", Pq, Wpd, XX, XX, IA_SSE2 },
+Ia_cvttps2dq_Vdq_Wps = { "cvttps2dq", "cvttps2dq", Vdq, Wps, XX, XX, IA_SSE2 },
+Ia_cvttps2pi_Pq_Wps = { "cvttps2pi", "cvttps2pi", Pq, Wps, XX, XX, IA_SSE },
+Ia_cvttsd2si_Gy_Wsd = { "cvttsd2si", "cvttsd2si", Gy, Wsd, XX, XX, IA_SSE2 },
+Ia_cvttss2si_Gy_Wss = { "cvttss2si", "cvttss2si", Gy, Wss, XX, XX, IA_SSE },
+Ia_cwd = { "cwd", "cwtd", XX, XX, XX, XX, 0 },
+Ia_cwde = { "cwde", "cwtl", XX, XX, XX, XX, 0 },
+Ia_daa = { "daa", "daa", XX, XX, XX, XX, 0 },
+Ia_das = { "das", "das", XX, XX, XX, XX, 0 },
+Ia_decb_Eb = { "dec", "decb", Eb, XX, XX, XX, 0 },
+Ia_decl_Ed = { "dec", "decl", Ed, XX, XX, XX, 0 },
+Ia_decl_ERX = { "dec", "decl", ERX, XX, XX, XX, 0 },
+Ia_decq_Eq = { "dec", "decq", Eq, XX, XX, XX, 0 },
+Ia_decw_Ew = { "dec", "decw", Ew, XX, XX, XX, 0 },
+Ia_decw_RX = { "dec", "decw", RX, XX, XX, XX, 0 },
+Ia_divb_AL_Eb = { "div", "divb", AL_Reg, Eb, XX, XX, 0 },
+Ia_divl_EAX_Ed = { "div", "divl", EAX_Reg, Ed, XX, XX, 0 },
+Ia_divpd_Vpd_Wpd = { "divpd", "divpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_divps_Vps_Wps = { "divps", "divps", Vps, Wps, XX, XX, IA_SSE },
+Ia_divq_RAX_Eq = { "div", "divq", RAX_Reg, Eq, XX, XX, 0 },
+Ia_divsd_Vsd_Wsd = { "divsd", "divsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_divss_Vss_Wss = { "divss", "divss", Vss, Wss, XX, XX, IA_SSE },
+Ia_divw_AX_Ew = { "div", "divw", AX_Reg, Ew, XX, XX, 0 },
+Ia_dppd_Vpd_Wpd_Ib = { "dppd", "dppd", Vpd, Wpd, Ib, XX, IA_SSE4_1 },
+Ia_dpps_Vps_Wps_Ib = { "dpps", "dpps", Vps, Wps, Ib, XX, IA_SSE4_1 },
+Ia_emms = { "emms", "emms", XX, XX, XX, XX, IA_MMX },
+Ia_enter = { "enter", "enter", IwIb, XX, XX, XX, 0 },
+Ia_error = { "(error)", "(error)", XX, XX, XX, XX, 0 },
+Ia_extractps_Ed_Vdq_Ib = { "extractps", "extractps", Ed, Vdq, Ib, XX, IA_SSE4_1 },
+Ia_extrq_Udq_Ib_Ib = { "extrq", "extrq", Udq, Ib, Ib, XX, IA_SSE4A },
+Ia_extrq_Vdq_Uq = { "extrq", "extrq", Vdq, Uq, XX, XX, IA_SSE4A },
+Ia_f2xm1 = { "f2xm1", "f2xm1", XX, XX, XX, XX, IA_X87 },
+Ia_fabs = { "fabs", "fabs", XX, XX, XX, XX, IA_X87 },
+Ia_fadd_ST0_STi = { "fadd", "fadd", ST0, STi, XX, XX, IA_X87 },
+Ia_fadd_STi_ST0 = { "fadd", "fadd", STi, ST0, XX, XX, IA_X87 },
+Ia_faddl_Mq = { "fadd", "faddl", Mq, XX, XX, XX, IA_X87 },
+Ia_faddp_STi_ST0 = { "faddp", "faddp", STi, ST0, XX, XX, IA_X87 },
+Ia_fadds_Md = { "fadd", "fadds", Md, XX, XX, XX, IA_X87 },
+Ia_fbldt_Mt = { "fbld", "fbldt", Mt, XX, XX, XX, IA_X87 },
+Ia_fbstpt_Mt = { "fbstp", "fbstpt", Mt, XX, XX, XX, IA_X87 },
+Ia_fchs = { "fchs", "fchs", XX, XX, XX, XX, IA_X87 },
+Ia_fcmovb_ST0_STi = { "fcmovb", "fcmovb", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovbe_ST0_STi = { "fcmovbe", "fcmovbe", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmove_ST0_STi = { "fcmove", "fcmove", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovnb_ST0_STi = { "fcmovnb", "fcmovnb", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovnbe_ST0_STi = { "fcmovnbe", "fcmovnbe", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovne_ST0_STi = { "fcmovne", "fcmovne", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovnu_ST0_STi = { "fcmovnu", "fcmovnu", ST0, STi, XX, XX, IA_P6 },
+Ia_fcmovu_ST0_STi = { "fcmovu", "fcmovu", ST0, STi, XX, XX, IA_P6 },
+Ia_fcom_STi = { "fcom", "fcom", STi, XX, XX, XX, IA_X87 },
+Ia_fcomi_ST0_STi = { "fcomi", "fcomi", ST0, STi, XX, XX, IA_P6 },
+Ia_fcomip_ST0_STi = { "fcomip", "fcomip", ST0, STi, XX, XX, IA_X87 },
+Ia_fcoml_Mq = { "fcom", "fcoml", Mq, XX, XX, XX, IA_X87 },
+Ia_fcomp_STi = { "fcomp", "fcomp", STi, XX, XX, XX, IA_X87 },
+Ia_fcompl_Mq = { "fcomp", "fcompl", Mq, XX, XX, XX, IA_X87 },
+Ia_fcompp = { "fcompp", "fcompp", XX, XX, XX, XX, IA_X87 },
+Ia_fcomps_Md = { "fcomp", "fcomps", Md, XX, XX, XX, IA_X87 },
+Ia_fcoms_Md = { "fcom", "fcoms", Md, XX, XX, XX, IA_X87 },
+Ia_fcos = { "fcos", "fcos", XX, XX, XX, XX, IA_X87 },
+Ia_fdecstp = { "fdecstp", "fdecstp", XX, XX, XX, XX, IA_X87 },
+Ia_fdisi = { "fdisi (287 legacy)", "fdisi (287 legacy)", XX, XX, XX, XX, IA_X87 },
+Ia_fdiv_ST0_STi = { "fdiv", "fdiv", ST0, STi, XX, XX, IA_X87 },
+Ia_fdiv_STi_ST0 = { "fdiv", "fdiv", STi, ST0, XX, XX, IA_X87 },
+Ia_fdivl_Mq = { "fdiv", "fdivl", Mq, XX, XX, XX, IA_X87 },
+Ia_fdivp_STi_ST0 = { "fdivp", "fdivp", STi, ST0, XX, XX, IA_X87 },
+Ia_fdivr_ST0_STi = { "fdivr", "fdivr", ST0, STi, XX, XX, IA_X87 },
+Ia_fdivr_STi_ST0 = { "fdivr", "fdivr", STi, ST0, XX, XX, IA_X87 },
+Ia_fdivrl_Mq = { "fdivr", "fdivrl", Mq, XX, XX, XX, IA_X87 },
+Ia_fdivrp_STi_ST0 = { "fdivrp", "fdivrp", STi, ST0, XX, XX, IA_X87 },
+Ia_fdivrs_Md = { "fdivr", "fdivrs", Md, XX, XX, XX, IA_X87 },
+Ia_fdivs_Md = { "fdiv", "fdivs", Md, XX, XX, XX, IA_X87 },
+Ia_femms = { "femms", "femms", XX, XX, XX, XX, IA_3DNOW },
+Ia_feni = { "feni (287 legacy)", "feni(287 legacy)", XX, XX, XX, XX, IA_X87 },
+Ia_ffree_STi = { "ffree", "ffree", STi, XX, XX, XX, IA_X87 },
+Ia_ffreep_STi = { "ffreep", "ffreep", STi, XX, XX, XX, IA_X87 },
+Ia_fiaddl_Md = { "fiadd", "fiaddl", Md, XX, XX, XX, IA_X87 },
+Ia_fiadds_Mw = { "fiadd", "fiadds", Mw, XX, XX, XX, IA_X87 },
+Ia_ficoml_Md = { "ficom", "ficoml", Md, XX, XX, XX, IA_X87 },
+Ia_ficompl_Md = { "ficomp", "ficompl", Md, XX, XX, XX, IA_X87 },
+Ia_ficomps_Mw = { "ficomp", "ficomps", Mw, XX, XX, XX, IA_X87 },
+Ia_ficoms_Mw = { "ficom", "ficoms", Mw, XX, XX, XX, IA_X87 },
+Ia_fidivl_Md = { "fidiv", "fidivl", Md, XX, XX, XX, IA_X87 },
+Ia_fidivrl_Md = { "fidivr", "fidivrl", Md, XX, XX, XX, IA_X87 },
+Ia_fidivrs_Mw = { "fidivr", "fidivrs", Mw, XX, XX, XX, IA_X87 },
+Ia_fidivs_Mw = { "fidiv", "fidivs", Mw, XX, XX, XX, IA_X87 },
+Ia_fildl_Md = { "fild", "fildl", Md, XX, XX, XX, IA_X87 },
+Ia_fildq_Mq = { "fild", "fildq", Mq, XX, XX, XX, IA_X87 },
+Ia_filds_Mw = { "fild", "filds", Mw, XX, XX, XX, IA_X87 },
+Ia_fimull_Md = { "fimul", "fimull", Md, XX, XX, XX, IA_X87 },
+Ia_fimuls_Mw = { "fimul", "fimuls", Mw, XX, XX, XX, IA_X87 },
+Ia_fincstp = { "fincstp", "fincstp", XX, XX, XX, XX, IA_X87 },
+Ia_fistl_Md = { "fist", "fistl", Md, XX, XX, XX, IA_X87 },
+Ia_fistpl_Md = { "fistp", "fistpl", Md, XX, XX, XX, IA_X87 },
+Ia_fistpq_Mq = { "fistp", "fistpq", Mq, XX, XX, XX, IA_X87 },
+Ia_fistps_Mw = { "fistp", "fistps", Mw, XX, XX, XX, IA_X87 },
+Ia_fists_Mw = { "fist", "fists", Mw, XX, XX, XX, IA_X87 },
+Ia_fisttpl_Md = { "fisttp", "fisttpl", Md, XX, XX, XX, IA_SSE3 },
+Ia_fisttpq_Mq = { "fisttp", "fisttpq", Mq, XX, XX, XX, IA_SSE3 },
+Ia_fisttps_Mw = { "fisttp", "fisttps", Mw, XX, XX, XX, IA_SSE3 },
+Ia_fisubl_Md = { "fisub", "fisubl", Md, XX, XX, XX, IA_X87 },
+Ia_fisubrl_Md = { "fisubr", "fisubrl", Md, XX, XX, XX, IA_X87 },
+Ia_fisubrs_Mw = { "fisubr", "fisubrs", Mw, XX, XX, XX, IA_X87 },
+Ia_fisubs_Mw = { "fisub", "fisubs", Mw, XX, XX, XX, IA_X87 },
+Ia_fld_STi = { "fld", "fld", STi, XX, XX, XX, IA_X87 },
+Ia_fld1 = { "fld1", "fld1", XX, XX, XX, XX, IA_X87 },
+Ia_fldcw = { "fldcw", "fldcw", Ew, XX, XX, XX, IA_X87 },
+Ia_fldenv = { "fldenv", "fldenv", Mx, XX, XX, XX, IA_X87 },
+Ia_fldl_Mq = { "fld", "fldl", Mq, XX, XX, XX, IA_X87 },
+Ia_fldl2e = { "fldl2e", "fldl2e", XX, XX, XX, XX, IA_X87 },
+Ia_fldl2t = { "fldl2t", "fldl2t", XX, XX, XX, XX, IA_X87 },
+Ia_fldlg2 = { "fldlg2", "fldlg2", XX, XX, XX, XX, IA_X87 },
+Ia_fldln2 = { "fldln2", "fldln2", XX, XX, XX, XX, IA_X87 },
+Ia_fldpi = { "fldpi", "fldpi", XX, XX, XX, XX, IA_X87 },
+Ia_flds_Md = { "fld", "flds", Md, XX, XX, XX, IA_X87 },
+Ia_fldt_Mt = { "fld", "fldt", Mt, XX, XX, XX, IA_X87 },
+Ia_fldz = { "fldz", "fldz", XX, XX, XX, XX, IA_X87 },
+Ia_fmul_ST0_STi = { "fmul", "fmul", ST0, STi, XX, XX, IA_X87 },
+Ia_fmul_STi_ST0 = { "fmul", "fmul", STi, ST0, XX, XX, IA_X87 },
+Ia_fmull_Mq = { "fmul", "fmull", Mq, XX, XX, XX, IA_X87 },
+Ia_fmulp_STi_ST0 = { "fmulp", "fmulp", STi, ST0, XX, XX, IA_X87 },
+Ia_fmuls_Md = { "fmul", "fmuls", Md, XX, XX, XX, IA_X87 },
+Ia_fnclex = { "fnclex", "fnclex", XX, XX, XX, XX, IA_X87 },
+Ia_fninit = { "fninit", "fninit", XX, XX, XX, XX, IA_X87 },
+Ia_fnop = { "fnop", "fnop", XX, XX, XX, XX, IA_X87 },
+Ia_fnsave = { "fnsave", "fnsave", Mx, XX, XX, XX, IA_X87 },
+Ia_fnstcw = { "fnstcw", "fnstcw", Mw, XX, XX, XX, IA_X87 },
+Ia_fnstenv = { "fnstenv", "fnstenv", Mx, XX, XX, XX, IA_X87 },
+Ia_fnstsw = { "fnstsw", "fnstsw", Mw, XX, XX, XX, IA_X87 },
+Ia_fnstsw_AX = { "fnstsw", "fnstsw", AX_Reg, XX, XX, XX, IA_X87 },
+Ia_fpatan = { "fpatan", "fpatan", XX, XX, XX, XX, IA_X87 },
+Ia_fprem = { "fprem", "fprem", XX, XX, XX, XX, IA_X87 },
+Ia_fprem1 = { "fprem1", "fprem1", XX, XX, XX, XX, IA_X87 },
+Ia_fptan = { "fptan", "fptan", XX, XX, XX, XX, IA_X87 },
+Ia_frczpd_Vpd_Wpd = { "frczpd", "frczpd", Vpd, Wpd, XX, XX, IA_XOP },
+Ia_frczps_Vps_Wps = { "frczps", "frczps", Vps, Wps, XX, XX, IA_XOP },
+Ia_frczsd_Vsd_Wsd = { "frczsd", "frczsd", Vsd, Wsd, XX, XX, IA_XOP },
+Ia_frczss_Vss_Wss = { "frczss", "frczss", Vss, Wss, XX, XX, IA_XOP },
+Ia_frndint = { "frndint", "frndint", XX, XX, XX, XX, IA_X87 },
+Ia_frstor = { "frstor", "frstor", Mx, XX, XX, XX, IA_X87 },
+Ia_fscale = { "fscale", "fscale", XX, XX, XX, XX, IA_X87 },
+Ia_fsetpm = { "fsetpm (287 legacy)", "fsetpm (287 legacy)", XX, XX, XX, XX, IA_X87 },
+Ia_fsin = { "fsin", "fsin", XX, XX, XX, XX, IA_X87 },
+Ia_fsincos = { "fsincos", "fsincos", XX, XX, XX, XX, IA_X87 },
+Ia_fsqrt = { "fsqrt", "fsqrt", XX, XX, XX, XX, IA_X87 },
+Ia_fst_STi = { "fst", "fst", STi, XX, XX, XX, IA_X87 },
+Ia_fstl_Mq = { "fst", "fstl", Mq, XX, XX, XX, IA_X87 },
+Ia_fstp_STi = { "fstp", "fstp", STi, XX, XX, XX, IA_X87 },
+Ia_fstpl_Mq = { "fstp", "fstpl", Mq, XX, XX, XX, IA_X87 },
+Ia_fstps_Md = { "fstp", "fstps", Md, XX, XX, XX, IA_X87 },
+Ia_fstpt_Mt = { "fstp", "fstpt", Mt, XX, XX, XX, IA_X87 },
+Ia_fsts_Md = { "fst", "fsts", Md, XX, XX, XX, IA_X87 },
+Ia_fsub_ST0_STi = { "fsub", "fsub", ST0, STi, XX, XX, IA_X87 },
+Ia_fsub_STi_ST0 = { "fsub", "fsub", STi, ST0, XX, XX, IA_X87 },
+Ia_fsubl_Mq = { "fsub", "fsubl", Mq, XX, XX, XX, IA_X87 },
+Ia_fsubp_STi_ST0 = { "fsubp", "fsubp", STi, ST0, XX, XX, IA_X87 },
+Ia_fsubr_ST0_STi = { "fsubr", "fsubr", ST0, STi, XX, XX, IA_X87 },
+Ia_fsubr_STi_ST0 = { "fsubr", "fsubr", STi, ST0, XX, XX, IA_X87 },
+Ia_fsubrl_Mq = { "fsubr", "fsubrl", Mq, XX, XX, XX, IA_X87 },
+Ia_fsubrp_STi_ST0 = { "fsubrp", "fsubrp", STi, ST0, XX, XX, IA_X87 },
+Ia_fsubrs_Md = { "fsubr", "fsubrs", Md, XX, XX, XX, IA_X87 },
+Ia_fsubs_Md = { "fsub", "fsubs", Md, XX, XX, XX, IA_X87 },
+Ia_ftst = { "ftst", "ftst", XX, XX, XX, XX, IA_X87 },
+Ia_fucom_STi = { "fucom", "fucom", STi, XX, XX, XX, IA_X87 },
+Ia_fucomi_ST0_STi = { "fucomi", "fucomi", ST0, STi, XX, XX, IA_P6 },
+Ia_fucomip_ST0_STi = { "fucomip", "fucomip", ST0, STi, XX, XX, IA_P6 },
+Ia_fucomp_STi = { "fucomp", "fucomp", STi, XX, XX, XX, IA_X87 },
+Ia_fucompp = { "fucompp", "fucompp", XX, XX, XX, XX, IA_X87 },
+Ia_fwait = { "fwait", "fwait", XX, XX, XX, XX, IA_X87 },
+Ia_fxam = { "fxam", "fxam", XX, XX, XX, XX, IA_X87 },
+Ia_fxch = { "fxch", "fxch", STi, XX, XX, XX, IA_X87 },
+Ia_fxrstor = { "fxrstor", "fxrstor", Mx, XX, XX, XX, IA_SSE },
+Ia_fxsave = { "fxsave", "fxsave", Mx, XX, XX, XX, IA_SSE },
+Ia_fxtract = { "fxtract", "fxtract", XX, XX, XX, XX, IA_X87 },
+Ia_fyl2x = { "fyl2x", "fyl2x", XX, XX, XX, XX, IA_X87 },
+Ia_fyl2xp1 = { "fyl2xp1", "fyl2xp1", XX, XX, XX, XX, IA_X87 },
+Ia_getsec = { "getsec", "getsec", XX, XX, XX, XX, IA_SMX },
+Ia_haddpd_Vpd_Wpd = { "haddpd", "haddpd", Vpd, Wpd, XX, XX, IA_SSE3 },
+Ia_haddps_Vps_Wps = { "haddps", "haddps", Vps, Wps, XX, XX, IA_SSE3 },
+Ia_hlt = { "hlt", "hlt", XX, XX, XX, XX, 0 },
+Ia_hsubpd_Vpd_Wpd = { "hsubpd", "hsubpd", Vpd, Wpd, XX, XX, IA_SSE3 },
+Ia_hsubps_Vps_Wps = { "hsubps", "hsubps", Vps, Wps, XX, XX, IA_SSE3 },
+Ia_idivb_AL_Eb = { "idiv", "idivb", AL_Reg, Eb, XX, XX, 0 },
+Ia_idivl_EAX_Ed = { "idiv", "idivl", EAX_Reg, Ed, XX, XX, 0 },
+Ia_idivq_RAX_Eq = { "idiv", "idivq", RAX_Reg, Eq, XX, XX, 0 },
+Ia_idivw_AX_Ew = { "idiv", "idivw", AX_Reg, Ew, XX, XX, 0 },
+Ia_imulb_AL_Eb = { "imul", "imulb", AL_Reg, Eb, XX, XX, 0 },
+Ia_imull_EAX_Ed = { "imul", "imull", EAX_Reg, Ed, XX, XX, 0 },
+Ia_imull_Gd_Ed = { "imul", "imull", Gd, Ed, XX, XX, 0 },
+Ia_imull_Gd_Ed_Id = { "imul", "imull", Gd, Ed, Id, XX, 0 },
+Ia_imull_Gd_Ed_sIb = { "imul", "imull", Gd, Ed, sIbd, XX, 0 },
+Ia_imulq_Gq_Eq = { "imul", "imulq", Gq, Eq, XX, XX, 0 },
+Ia_imulq_Gq_Eq_sIb = { "imul", "imulq", Gq, Eq, sIbq, XX, 0 },
+Ia_imulq_Gq_Eq_sId = { "imul", "imulq", Gq, Eq, sIdq, XX, 0 },
+Ia_imulq_RAX_Eq = { "imul", "imulq", RAX_Reg, Eq, XX, XX, 0 },
+Ia_imulw_AX_Ew = { "imul", "imulw", AX_Reg, Ew, XX, XX, 0 },
+Ia_imulw_Gw_Ew = { "imul", "imulw", Gw, Ew, XX, XX, 0 },
+Ia_imulw_Gw_Ew_Iw = { "imul", "imulw", Gw, Ew, Iw, XX, 0 },
+Ia_imulw_Gw_Ew_sIb = { "imul", "imulw", Gw, Ew, sIbw, XX, 0 },
+Ia_inb_AL_DX = { "in", "inb", AL_Reg, DX_Reg, XX, XX, 0 },
+Ia_inb_AL_Ib = { "in", "inb", AL_Reg, Ib, XX, XX, 0 },
+Ia_incb_Eb = { "inc", "incb", Eb, XX, XX, XX, 0 },
+Ia_incl_Ed = { "inc", "incl", Ed, XX, XX, XX, 0 },
+Ia_incl_ERX = { "inc", "incl", ERX, XX, XX, XX, 0 },
+Ia_incq_Eq = { "inc", "incq", Eq, XX, XX, XX, 0 },
+Ia_incw_Ew = { "inc", "incw", Ew, XX, XX, XX, 0 },
+Ia_incw_RX = { "inc", "incw", RX, XX, XX, XX, 0 },
+Ia_inl_EAX_DX = { "in", "inl", EAX_Reg, DX_Reg, XX, XX, 0 },
+Ia_inl_EAX_Ib = { "in", "inl", EAX_Reg, Ib, XX, XX, 0 },
+Ia_insb_Yb_DX = { "insb", "insb", Yb, DX_Reg, XX, XX, 0 },
+Ia_insertps_Vps_Wss_Ib = { "insertps", "insertps", Vps, Wss, Ib, XX, IA_SSE4_1 },
+Ia_insertq_Vdq_Udq = { "insertq", "insertq", Vdq, Udq, XX, XX, IA_SSE4A },
+Ia_insertq_Vdq_Uq_Ib_Ib = { "insertq", "insertq", Vdq, Uq, Ib, Ib, IA_SSE4A },
+Ia_insl_Yd_DX = { "insd", "insl", Yd, DX_Reg, XX, XX, 0 },
+Ia_insw_Yw_DX = { "insw", "insw", Yw, DX_Reg, XX, XX, 0 },
+Ia_int_Ib = { "int", "int", Ib, XX, XX, XX, 0 },
+Ia_int1 = { "int1", "int1", XX, XX, XX, XX, 0 },
+Ia_int3 = { "int3", "int3", XX, XX, XX, XX, 0 },
+Ia_into = { "into", "into", XX, XX, XX, XX, 0 },
+Ia_Invalid = { "(invalid)", "(invalid)", XX, XX, XX, XX, 0 },
+Ia_invd = { "invd", "invd", XX, XX, XX, XX, IA_486 },
+Ia_invept_Gy_Mdq = { "invept", "invept", Gy, Mdq, XX, XX, IA_VMX },
+Ia_invlpg = { "invlpg", "invlpg", Mx, XX, XX, XX, IA_486 },
+Ia_invlpga  = { "invlpga", "invlpga", RAX_Reg, RCX_Reg, XX, XX, IA_SVM },
+Ia_invpcid_Gy_Mdq = { "invpcid", "invpcid", Gy, Mdq, XX, XX, IA_INVPCID },
+Ia_invvpid_Gy_Mdq = { "invvpid", "invvpid", Gy, Mdq, XX, XX, IA_VMX },
+Ia_inw_AX_DX = { "in", "inw", AX_Reg, DX_Reg, XX, XX, 0 },
+Ia_inw_AX_Ib = { "in", "inw", AX_Reg, Ib, XX, XX, 0 },
+Ia_iretl = { "iret", "iretd", XX, XX, XX, XX, 0 },
+Ia_iretq = { "iret", "iretq", XX, XX, XX, XX, 0 },
+Ia_iretw = { "iret", "iretw", XX, XX, XX, XX, 0 },
+Ia_jb_Jb = { "jb", "jb", Jb, XX, XX, XX, 0 },
+Ia_jb_Jd = { "jb", "jb", Jd, XX, XX, XX, 0 },
+Ia_jb_Jw = { "jb", "jb", Jw, XX, XX, XX, 0 },
+Ia_jbe_Jb = { "jbe", "jbe", Jb, XX, XX, XX, 0 },
+Ia_jbe_Jd = { "jbe", "jbe", Jd, XX, XX, XX, 0 },
+Ia_jbe_Jw = { "jbe", "jbe", Jw, XX, XX, XX, 0 },
+Ia_jcxz_Jb = { "jcxz", "jcxz", Jb, XX, XX, XX, 0 },
+Ia_jecxz_Jb = { "jecxz", "jecxz", Jb, XX, XX, XX, 0 },
+Ia_jl_Jb = { "jl", "jl", Jb, XX, XX, XX, 0 },
+Ia_jl_Jd = { "jl", "jl", Jd, XX, XX, XX, 0 },
+Ia_jl_Jw = { "jl", "jl", Jw, XX, XX, XX, 0 },
+Ia_jle_Jb = { "jle", "jle", Jb, XX, XX, XX, 0 },
+Ia_jle_Jd = { "jle", "jle", Jd, XX, XX, XX, 0 },
+Ia_jle_Jw = { "jle", "jle", Jw, XX, XX, XX, 0 },
+Ia_jmp_Ed = { "jmp", "jmp", Ed, XX, XX, XX, 0 },
+Ia_jmp_Eq = { "jmp", "jmp", Eq, XX, XX, XX, 0 },
+Ia_jmp_Ew = { "jmp", "jmp", Ew, XX, XX, XX, 0 },
+Ia_jmp_Jb = { "jmp", "jmp", Jb, XX, XX, XX, 0 },
+Ia_jmp_Jd = { "jmp", "jmp", Jd, XX, XX, XX, 0 },
+Ia_jmp_Jw = { "jmp", "jmp", Jw, XX, XX, XX, 0 },
+Ia_jnb_Jb = { "jnb", "jnb", Jb, XX, XX, XX, 0 },
+Ia_jnb_Jd = { "jnb", "jnb", Jd, XX, XX, XX, 0 },
+Ia_jnb_Jw = { "jnb", "jnb", Jw, XX, XX, XX, 0 },
+Ia_jnbe_Jb = { "jnbe", "jnbe", Jb, XX, XX, XX, 0 },
+Ia_jnbe_Jd = { "jnbe", "jnbe", Jd, XX, XX, XX, 0 },
+Ia_jnbe_Jw = { "jnbe", "jnbe", Jw, XX, XX, XX, 0 },
+Ia_jnl_Jb = { "jnl", "jnl", Jb, XX, XX, XX, 0 },
+Ia_jnl_Jd = { "jnl", "jnl", Jd, XX, XX, XX, 0 },
+Ia_jnl_Jw = { "jnl", "jnl", Jw, XX, XX, XX, 0 },
+Ia_jnle_Jb = { "jnle", "jnle", Jb, XX, XX, XX, 0 },
+Ia_jnle_Jd = { "jnle", "jnle", Jd, XX, XX, XX, 0 },
+Ia_jnle_Jw = { "jnle", "jnle", Jw, XX, XX, XX, 0 },
+Ia_jno_Jb = { "jno", "jno", Jb, XX, XX, XX, 0 },
+Ia_jno_Jd = { "jno", "jno", Jd, XX, XX, XX, 0 },
+Ia_jno_Jw = { "jno", "jno", Jw, XX, XX, XX, 0 },
+Ia_jnp_Jb = { "jnp", "jnp", Jb, XX, XX, XX, 0 },
+Ia_jnp_Jd = { "jnp", "jnp", Jd, XX, XX, XX, 0 },
+Ia_jnp_Jw = { "jnp", "jnp", Jw, XX, XX, XX, 0 },
+Ia_jns_Jb = { "jns", "jns", Jb, XX, XX, XX, 0 },
+Ia_jns_Jd = { "jns", "jns", Jd, XX, XX, XX, 0 },
+Ia_jns_Jw = { "jns", "jns", Jw, XX, XX, XX, 0 },
+Ia_jnz_Jb = { "jnz", "jnz", Jb, XX, XX, XX, 0 },
+Ia_jnz_Jd = { "jnz", "jnz", Jd, XX, XX, XX, 0 },
+Ia_jnz_Jw = { "jnz", "jnz", Jw, XX, XX, XX, 0 },
+Ia_jo_Jb = { "jo", "jo", Jb, XX, XX, XX, 0 },
+Ia_jo_Jd = { "jo", "jo", Jd, XX, XX, XX, 0 },
+Ia_jo_Jw = { "jo", "jo", Jw, XX, XX, XX, 0 },
+Ia_jp_Jb = { "jp", "jp", Jb, XX, XX, XX, 0 },
+Ia_jp_Jd = { "jp", "jp", Jd, XX, XX, XX, 0 },
+Ia_jp_Jw = { "jp", "jp", Jw, XX, XX, XX, 0 },
+Ia_jrcxz_Jb = { "jrcxz", "jrcxz", Jb, XX, XX, XX, 0 },
+Ia_js_Jb = { "js", "js", Jb, XX, XX, XX, 0 },
+Ia_js_Jd = { "js", "js", Jd, XX, XX, XX, 0 },
+Ia_js_Jw = { "js", "js", Jw, XX, XX, XX, 0 },
+Ia_jz_Jb = { "jz", "jz", Jb, XX, XX, XX, 0 },
+Ia_jz_Jd = { "jz", "jz", Jd, XX, XX, XX, 0 },
+Ia_jz_Jw = { "jz", "jz", Jw, XX, XX, XX, 0 },
+Ia_lahf = { "lahf", "lahf", XX, XX, XX, XX, 0 },
+Ia_larl_Gd_Ew = { "lar", "larl", Gd, Ew, XX, XX, 0 },
+Ia_larq_Gq_Ew = { "lar", "larq", Gq, Ew, XX, XX, 0 },
+Ia_larw_Gw_Ew = { "lar", "larw", Gw, Ew, XX, XX, 0 },
+Ia_lcall_Apd = { "callf", "lcall", Apd, XX, XX, XX, 0 },
+Ia_lcall_Apw = { "callf", "lcall", Apw, XX, XX, XX, 0 },
+Ia_lcall_Mp = { "callf", "lcall", Mp, XX, XX, XX, 0 },
+Ia_lddqu_Vdq_Mdq = { "lddqu", "lddqu", Vdq, Mdq, XX, XX, IA_SSE3 },
+Ia_ldmxcsr = { "ldmxcsr", "ldmxcsr", Md, XX, XX, XX, IA_SSE },
+Ia_ldsl_Gd_Mp = { "lds", "ldsl", Gd, Mp, XX, XX, 0 },
+Ia_ldsw_Gw_Mp = { "lds", "ldsw", Gw, Mp, XX, XX, 0 },
+Ia_leal_Gd_Md = { "lea", "leal", Gd, Md, XX, XX, 0 },
+Ia_leaq_Gq_Mq = { "lea", "leaq", Gq, Mq, XX, XX, 0 },
+Ia_leave = { "leave", "leave", XX, XX, XX, XX, 0 },
+Ia_leaw_Gw_Mw = { "lea", "leaw", Gw, Mw, XX, XX, 0 },
+Ia_lesl_Gd_Mp = { "les", "lesl", Gd, Mp, XX, XX, 0 },
+Ia_lesw_Gw_Mp = { "les", "lesw", Gw, Mp, XX, XX, 0 },
+Ia_lfence = { "lfence", "lfence", XX, XX, XX, XX, IA_SSE2 },
+Ia_lfsl_Gd_Mp = { "lfs", "lfsl", Gd, Mp, XX, XX, 0 },
+Ia_lfsq_Gq_Mp = { "lfs", "lfsq", Gq, Mp, XX, XX, 0 },
+Ia_lfsw_Gw_Mp = { "lfs", "lfsw", Gw, Mp, XX, XX, 0 },
+Ia_lgdt = { "lgdt", "lgdt", Ms, XX, XX, XX, 0 },
+Ia_lgsl_Gd_Mp = { "lgs", "lgsl", Gd, Mp, XX, XX, 0 },
+Ia_lgsq_Gq_Mp = { "lgs", "lgsq", Gq, Mp, XX, XX, 0 },
+Ia_lgsw_Gw_Mp = { "lgs", "lgsw", Gw, Mp, XX, XX, 0 },
+Ia_lidt = { "lidt", "lidt", Ms, XX, XX, XX, 0 },
+Ia_ljmp_Apd = { "jmpf", "ljmp", Apd, XX, XX, XX, 0 },
+Ia_ljmp_Apw = { "jmpf", "ljmp", Apw, XX, XX, XX, 0 },
+Ia_ljmp_Mp = { "jmpf", "ljmp", Mp, XX, XX, XX, 0 },
+Ia_lldt = { "lldt", "lldt", Ew, XX, XX, XX, 0 },
+Ia_lmsw_Ew = { "lmsw", "lmsw", Ew, XX, XX, XX, 0 },
+Ia_lodsb_AL_Xb = { "lodsb", "lodsb", AL_Reg, Xb, XX, XX, 0 },
+Ia_lodsl_EAX_Xd = { "lodsd", "lodsl", EAX_Reg, Xd, XX, XX, 0 },
+Ia_lodsq_RAX_Xq = { "lodsq", "lodsq", RAX_Reg, Xq, XX, XX, 0 },
+Ia_lodsw_AX_Xw = { "lodsw", "lodsw", AX_Reg, Xw, XX, XX, 0 },
+Ia_loop_Jb = { "loop", "loop", Jb, XX, XX, XX, 0 },
+Ia_loope_Jb = { "loope", "loope", Jb, XX, XX, XX, 0 },
+Ia_loopne_Jb = { "loopne", "loopne", Jb, XX, XX, XX, 0 },
+Ia_lret = { "retf", "lret", XX, XX, XX, XX, 0 },
+Ia_lret_Iw = { "retf", "lret", Iw, XX, XX, XX, 0 },
+Ia_lsll_Gd_Ew = { "lsl", "lsll", Gd, Ew, XX, XX, 0 },
+Ia_lslq_Gq_Ew = { "lsl", "lslq", Gq, Ew, XX, XX, 0 },
+Ia_lslw_Gw_Ew = { "lsl", "lslw", Gw, Ew, XX, XX, 0 },
+Ia_lssl_Gd_Mp = { "lss", "lssl", Gd, Mp, XX, XX, 0 },
+Ia_lssq_Gq_Mp = { "lss", "lssq", Gq, Mp, XX, XX, 0 },
+Ia_lssw_Gw_Mp = { "lss", "lssw", Gw, Mp, XX, XX, 0 },
+Ia_ltr = { "ltr", "ltr", Ew, XX, XX, XX, 0 },
+Ia_lzcntl_Gd_Ed = { "lzcnt", "lzcntl", Gd, Ed, XX, XX, IA_LZCNT },
+Ia_lzcntq_Gq_Eq = { "lzcnt", "lzcntq", Gq, Eq, XX, XX, IA_LZCNT },
+Ia_lzcntw_Gw_Ew = { "lzcnt", "lzcntw", Gw, Ew, XX, XX, IA_LZCNT },
+Ia_maskmovdqu_Vdq_Udq = { "maskmovdqu", "maskmovdqu", Vdq, Udq, sYdq, XX, IA_SSE2 },
+Ia_maskmovq_Pq_Nq = { "maskmovq", "maskmovq", Pq, Nq, sYq, XX, IA_3DNOW | IA_SSE },
+Ia_maxpd_Vpd_Wpd = { "maxpd", "maxpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_maxps_Vps_Wps = { "maxps", "maxps", Vps, Wps, XX, XX, IA_SSE },
+Ia_maxsd_Vsd_Wsd = { "maxsd", "maxsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_maxss_Vss_Wss = { "maxss", "maxss", Vss, Wss, XX, XX, IA_SSE },
+Ia_mfence = { "mfence", "mfence", XX, XX, XX, XX, IA_SSE2 },
+Ia_minpd_Vpd_Wpd = { "minpd", "minpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_minps_Vps_Wps = { "minps", "minps", Vps, Wps, XX, XX, IA_SSE },
+Ia_minsd_Vsd_Wsd = { "minsd", "minsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_minss_Vss_Wss = { "minss", "minss", Vss, Wss, XX, XX, IA_SSE },
+Ia_monitor = { "monitor", "monitor", XX, XX, XX, XX, IA_MONITOR_MWAIT },
+Ia_movapd_Vpd_Wpd = { "movapd", "movapd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_movapd_Wpd_Vpd = { "movapd", "movapd", Wpd, Vpd, XX, XX, IA_SSE2 },
+Ia_movaps_Vps_Wps = { "movaps", "movaps", Vps, Wps, XX, XX, IA_SSE },
+Ia_movaps_Wps_Vps = { "movaps", "movaps", Wps, Vps, XX, XX, IA_SSE },
+Ia_movb_AL_Ob = { "mov", "movb", AL_Reg, Ob, XX, XX, 0 },
+Ia_movb_Eb_Gb = { "mov", "movb", Eb, Gb, XX, XX, 0 },
+Ia_movb_Eb_Ib = { "mov", "movb", Eb, Ib, XX, XX, 0 },
+Ia_movb_Gb_Eb = { "mov", "movb", Gb, Eb, XX, XX, 0 },
+Ia_movb_Ob_AL = { "mov", "movb", Ob, AL_Reg, XX, XX, 0 },
+Ia_movb_R8_Ib = { "mov", "movb", Reg8, Ib, XX, XX, 0 },
+Ia_movbe_Gd_Md = { "movbe", "movbel", Gd, Md, XX, XX, IA_MOVBE },
+Ia_movbe_Gq_Mq = { "movbe", "movbeq", Gq, Mq, XX, XX, IA_MOVBE },
+Ia_movbe_Gw_Mw = { "movbe", "movbew", Gw, Mw, XX, XX, IA_MOVBE },
+Ia_movbe_Md_Gd = { "movbe", "movbel", Md, Gd, XX, XX, IA_MOVBE },
+Ia_movbe_Mq_Gq = { "movbe", "movbeq", Mq, Gq, XX, XX, IA_MOVBE },
+Ia_movbe_Mw_Gw = { "movbe", "movbew", Mw, Gw, XX, XX, IA_MOVBE },
+Ia_movd_Ed_Pq = { "movd", "movd", Ed, Pq, XX, XX, IA_MMX },
+Ia_movd_Ed_Vd = { "movd", "movd", Ed, Vdq, XX, XX, IA_SSE2 },
+Ia_movd_Pq_Ed = { "movd", "movd", Pq, Ed, XX, XX, IA_MMX },
+Ia_movd_Vdq_Ed = { "movd", "movd", Vdq, Ed, XX, XX, IA_SSE2 },
+Ia_movddup_Vdq_Wq = { "movddup", "movddup", Vdq, Wq, XX, XX, IA_SSE3 },
+Ia_movdq2q_Pq_Udq = { "movdq2q", "movdq2q", Pq, Udq, XX, XX, IA_SSE2 },
+Ia_movdqa_Vdq_Wdq = { "movdqa", "movdqa", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_movdqa_Wdq_Vdq = { "movdqa", "movdqa", Wdq, Vdq, XX, XX, IA_SSE2 },
+Ia_movdqu_Vdq_Wdq = { "movdqu", "movdqu", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_movdqu_Wdq_Vdq = { "movdqu", "movdqu", Wdq, Vdq, XX, XX, IA_SSE2 },
+Ia_movhlpd_Vpd_Udq = { "movhlpd", "movhlpd", Vpd, Udq, XX, XX, IA_SSE2 },
+Ia_movhlps_Vps_Udq = { "movhlps", "movhlps", Vps, Udq, XX, XX, IA_SSE },
+Ia_movhpd_Mq_Vpd = { "movhpd", "movhpd", Mq, Vpd, XX, XX, IA_SSE2 },
+Ia_movhpd_Vpd_Mq = { "movhpd", "movhpd", Vpd, Mq, XX, XX, IA_SSE2 },
+Ia_movhps_Mq_Vps = { "movhps", "movhps", Mq, Vps, XX, XX, IA_SSE },
+Ia_movhps_Vps_Mq = { "movhps", "movhps", Vps, Mq, XX, XX, IA_SSE },
+Ia_movl_Cd_Rd = { "mov", "movl", Cd, Rd, XX, XX, 0 },
+Ia_movl_Dd_Rd = { "mov", "movl", Dd, Rd, XX, XX, 0 },
+Ia_movl_EAX_Od = { "mov", "movl", EAX_Reg, Od, XX, XX, 0 },
+Ia_movl_Ed_Gd = { "mov", "movl", Ed, Gd, XX, XX, 0 },
+Ia_movl_Ed_Id = { "mov", "movl", Ed, Id, XX, XX, 0 },
+Ia_movl_ERX_Id = { "mov", "movl", ERX, Id, XX, XX, 0 },
+Ia_movl_Gd_Ed = { "mov", "movl", Gd, Ed, XX, XX, 0 },
+Ia_movl_Od_EAX = { "mov", "movl", Od, EAX_Reg, XX, XX, 0 },
+Ia_movl_Rd_Cd = { "mov", "movl", Rd, Cd, XX, XX, 0 },
+Ia_movl_Rd_Dd = { "mov", "movl", Rd, Dd, XX, XX, 0 },
+Ia_movlhpd_Vpd_Udq = { "movlhpd", "movlhpd", Vpd, Udq, XX, XX, IA_SSE2 },
+Ia_movlhps_Vps_Udq = { "movlhps", "movlhps", Vps, Udq, XX, XX, IA_SSE },
+Ia_movlpd_Mq_Vpd = { "movlpd", "movlpd", Mq, Vpd, XX, XX, IA_SSE2 },
+Ia_movlpd_Vpd_Mq = { "movlpd", "movlpd", Vpd, Mq, XX, XX, IA_SSE2 },
+Ia_movlps_Mq_Vps = { "movlps", "movlps", Mq, Vps, XX, XX, IA_SSE },
+Ia_movlps_Vps_Mq = { "movlps", "movlps", Vps, Mq, XX, XX, IA_SSE },
+Ia_movmskpd_Gd_Upd = { "movmskpd", "movmskpd", Gd, Upd, XX, XX, IA_SSE2 },
+Ia_movmskps_Gd_Ups = { "movmskps", "movmskps", Gd, Ups, XX, XX, IA_SSE },
+Ia_movntdq_Mdq_Vdq = { "movntdq", "movntdq", Mdq, Vdq, XX, XX, IA_SSE2 },
+Ia_movntdqa_Vdq_Mdq = { "movntdqa", "movntdqa", Vdq, Mdq, XX, XX, IA_SSE4_1 },
+Ia_movnti_Md_Gd = { "movnti", "movnti", Md, Gd, XX, XX, IA_SSE2 },
+Ia_movntiq_Mq_Gq = { "movnti", "movntiq", Mq, Gq, XX, XX, 0 },
+Ia_movntpd_Mpd_Vpd = { "movntpd", "movntpd", Mpd, Vpd, XX, XX, IA_SSE2 },
+Ia_movntps_Mps_Vps = { "movntps", "movntps", Mps, Vps, XX, XX, IA_SSE },
+Ia_movntq_Mq_Pq = { "movntq", "movntq", Mq, Pq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_movntsd_Msd_Vsd = { "movntsd", "movntsd", Msd, Vsd, XX, XX, IA_SSE4A },
+Ia_movntss_Mss_Vss = { "movntss", "movntss", Mss, Vss, XX, XX, IA_SSE4A },
+Ia_movq_Cq_Rq = { "mov", "movq", Cq, Rq, XX, XX, 0 },
+Ia_movq_Dq_Rq = { "mov", "movq", Dq, Rq, XX, XX, 0 },
+Ia_movq_Eq_Gq = { "mov", "movq", Eq, Gq, XX, XX, 0 },
+Ia_movq_Eq_Pq = { "movq", "movq", Eq, Pq, XX, XX, 0 },
+Ia_movq_Eq_sId = { "mov", "movq", Eq, sIdq, XX, XX, 0 },
+Ia_movq_Eq_Vq = { "movq", "movq", Eq, Vq, XX, XX, 0 },
+Ia_movq_Gq_Eq = { "mov", "movq", Gq, Eq, XX, XX, 0 },
+Ia_movq_Oq_RAX = { "mov", "movq", Oq, RAX_Reg, XX, XX, 0 },
+Ia_movq_Pq_Eq = { "movq", "movq", Pq, Eq, XX, XX, 0 },
+Ia_movq_Pq_Qq = { "movq", "movq", Pq, Qq, XX, XX, IA_MMX },
+Ia_movq_Qq_Pq = { "movq", "movq", Qq, Pq, XX, XX, IA_MMX },
+Ia_movq_RAX_Oq = { "mov", "movq", RAX_Reg, Oq, XX, XX, 0 },
+Ia_movq_Rq_Cq = { "mov", "movq", Rq, Cq, XX, XX, 0 },
+Ia_movq_Rq_Dq = { "mov", "movq", Rq, Dq, XX, XX, 0 },
+Ia_movq_RRX_Iq = { "mov", "movq", RRX, Iq, XX, XX, 0 },
+Ia_movq_Vdq_Eq = { "movq", "movq", Vdq, Eq, XX, XX, 0 },
+Ia_movq_Vq_Wq = { "movq", "movq", Vq, Wq, XX, XX, IA_SSE2 },
+Ia_movq_Wq_Vq = { "movq", "movq", Wq, Vq, XX, XX, IA_SSE2 },
+Ia_movq2dq_Vdq_Qq = { "movq2dq", "movq2dq", Vdq, Qq, XX, XX, IA_SSE2 },
+Ia_movsb_Yb_Xb = { "movsb", "movsb", Yb, Xb, XX, XX, 0 },
+Ia_movsbl_Gd_Eb = { "movsx", "movsbl", Gd, Eb, XX, XX, 0 },
+Ia_movsbq_Gq_Eb = { "movsx", "movsbq", Gq, Eb, XX, XX, 0 },
+Ia_movsbw_Gw_Eb = { "movsx", "movsbw", Gw, Eb, XX, XX, 0 },
+Ia_movsd_Vsd_Wsd = { "movsd", "movsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_movsd_Wsd_Vsd = { "movsd", "movsd", Wsd, Vsd, XX, XX, IA_SSE2 },
+Ia_movshdup_Vdq_Wdq = { "movshdup", "movshdup", Vdq, Wdq, XX, XX, IA_SSE3 },
+Ia_movsl_Yd_Xd = { "movsd", "movsl", Yd, Xd, XX, XX, 0 },
+Ia_movsldup_Vdq_Wdq = { "movsldup", "movsldup", Vdq, Wdq, XX, XX, IA_SSE3 },
+Ia_movslq_Gq_Ed = { "movsxd", "movslq", Gq, Ed, XX, XX, 0 },
+Ia_movsq_Yq_Xq = { "movsq", "movsq", Yq, Xq, XX, XX, 0 },
+Ia_movss_Vss_Wss = { "movss", "movss", Vss, Wss, XX, XX, IA_SSE },
+Ia_movss_Wss_Vss = { "movss", "movss", Wss, Vss, XX, XX, IA_SSE },
+Ia_movsw_Yw_Xw = { "movsw", "movsw", Yw, Xw, XX, XX, 0 },
+Ia_movswl_Gd_Ew = { "movsx", "movswl", Gd, Ew, XX, XX, 0 },
+Ia_movswq_Gq_Ew = { "movsx", "movswq", Gq, Ew, XX, XX, 0 },
+Ia_movupd_Vpd_Wpd = { "movupd", "movupd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_movupd_Wpd_Vpd = { "movupd", "movupd", Wpd, Vpd, XX, XX, IA_SSE2 },
+Ia_movups_Vps_Wps = { "movups", "movups", Vps, Wps, XX, XX, IA_SSE },
+Ia_movups_Wps_Vps = { "movups", "movups", Wps, Vps, XX, XX, IA_SSE },
+Ia_movw_AX_Ow = { "mov", "movw", AX_Reg, Ow, XX, XX, 0 },
+Ia_movw_Ew_Gw = { "mov", "movw", Ew, Gw, XX, XX, 0 },
+Ia_movw_Ew_Iw = { "mov", "movw", Ew, Iw, XX, XX, 0 },
+Ia_movw_Ew_Sw = { "mov", "movw", Ew, Sw, XX, XX, 0 },
+Ia_movw_Gw_Ew = { "mov", "movw", Gw, Ew, XX, XX, 0 },
+Ia_movw_Ow_AX = { "mov", "movw", Ow, AX_Reg, XX, XX, 0 },
+Ia_movw_RX_Iw = { "mov", "movw", RX, Iw, XX, XX, 0 },
+Ia_movw_Sw_Ew = { "mov", "movw", Sw, Ew, XX, XX, 0 },
+Ia_movzbl_Gd_Eb = { "movzx", "movzbl", Gd, Eb, XX, XX, 0 },
+Ia_movzbq_Gq_Eb = { "movzx", "movzbq", Gq, Eb, XX, XX, 0 },
+Ia_movzbw_Gw_Eb = { "movzx", "movzbw", Gw, Eb, XX, XX, 0 },
+Ia_movzwl_Gd_Ew = { "movzx", "movzwl", Gd, Ew, XX, XX, 0 },
+Ia_movzwq_Gq_Ew = { "movzx", "movzwq", Gq, Ew, XX, XX, 0 },
+Ia_mpsadbw_Vdq_Wdq_Ib = { "mpsadbw", "mpsadbw", Vdq, Wdq, Ib, XX, IA_SSE4_1 },
+Ia_mulb_AL_Eb = { "mul", "mulb", AL_Reg, Eb, XX, XX, 0 },
+Ia_mull_EAX_Ed = { "mul", "mull", EAX_Reg, Ed, XX, XX, 0 },
+Ia_mulpd_Vpd_Wpd = { "mulpd", "mulpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_mulps_Vps_Wps = { "mulps", "mulps", Vps, Wps, XX, XX, IA_SSE },
+Ia_mulq_RAX_Eq = { "mul", "mulq", RAX_Reg, Eq, XX, XX, 0 },
+Ia_mulsd_Vsd_Wsd = { "mulsd", "mulsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_mulss_Vss_Wss = { "mulss", "mulss", Vss, Wss, XX, XX, IA_SSE },
+Ia_multibyte_nop = { "multibyte nop", "multibyte nop", XX, XX, XX, XX, 0 },
+Ia_mulw_AX_Ew = { "mul", "mulw", AX_Reg, Ew, XX, XX, 0 },
+Ia_mulx_By_Gy_Ey = { "mulx", "mulx", By, Gy, Ey, XX, IA_BMI2 },
+Ia_mwait = { "mwait", "mwait", XX, XX, XX, XX, IA_MONITOR_MWAIT },
+Ia_negb_Eb = { "neg", "negb", Eb, XX, XX, XX, 0 },
+Ia_negl_Ed = { "neg", "negl", Ed, XX, XX, XX, 0 },
+Ia_negq_Eq = { "neg", "negq", Eq, XX, XX, XX, 0 },
+Ia_negw_Ew = { "neg", "negw", Ew, XX, XX, XX, 0 },
+Ia_nop = { "nop", "nop", XX, XX, XX, XX, 0 },
+Ia_notb_Eb = { "not", "notb", Eb, XX, XX, XX, 0 },
+Ia_notl_Ed = { "not", "notl", Ed, XX, XX, XX, 0 },
+Ia_notq_Eq = { "not", "notq", Eq, XX, XX, XX, 0 },
+Ia_notw_Ew = { "not", "notw", Ew, XX, XX, XX, 0 },
+Ia_orb_AL_Ib = { "or", "orb", AL_Reg, Ib, XX, XX, 0 },
+Ia_orb_Eb_Gb = { "or", "orb", Eb, Gb, XX, XX, 0 },
+Ia_orb_Eb_Ib = { "or", "orb", Eb, Ib, XX, XX, 0 },
+Ia_orb_Gb_Eb = { "or", "orb", Gb, Eb, XX, XX, 0 },
+Ia_orl_EAX_Id = { "or", "orl", EAX_Reg, Id, XX, XX, 0 },
+Ia_orl_Ed_Gd = { "or", "orl", Ed, Gd, XX, XX, 0 },
+Ia_orl_Ed_Id = { "or", "orl", Ed, Id, XX, XX, 0 },
+Ia_orl_Ed_sIb = { "or", "orl", Ed, sIbd, XX, XX, 0 },
+Ia_orl_Gd_Ed = { "or", "orl", Gd, Ed, XX, XX, 0 },
+Ia_orpd_Vpd_Wpd = { "orpd", "orpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_orps_Vps_Wps = { "orps", "orps", Vps, Wps, XX, XX, IA_SSE },
+Ia_orq_Eq_Gq = { "or", "orq", Eq, Gq, XX, XX, 0 },
+Ia_orq_Eq_sIb = { "or", "orq", Eq, sIbq, XX, XX, 0 },
+Ia_orq_Eq_sId = { "or", "orq", Eq, sIdq, XX, XX, 0 },
+Ia_orq_Gq_Eq = { "or", "orq", Gq, Eq, XX, XX, 0 },
+Ia_orq_RAX_sId = { "or", "orq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_orw_AX_Iw = { "or", "orw", AX_Reg, Iw, XX, XX, 0 },
+Ia_orw_Ew_Gw = { "or", "orw", Ew, Gw, XX, XX, 0 },
+Ia_orw_Ew_Iw = { "or", "orw", Ew, Iw, XX, XX, 0 },
+Ia_orw_Ew_sIb = { "or", "orw", Ew, sIbw, XX, XX, 0 },
+Ia_orw_Gw_Ew = { "or", "orw", Gw, Ew, XX, XX, 0 },
+Ia_outb_DX_AL = { "out", "outb", DX_Reg, AL_Reg, XX, XX, 0 },
+Ia_outb_Ib_AL = { "out", "outb", Ib, AL_Reg, XX, XX, 0 },
+Ia_outl_DX_EAX = { "out", "outl", DX_Reg, EAX_Reg, XX, XX, 0 },
+Ia_outl_Ib_EAX = { "out", "outl", Ib, EAX_Reg, XX, XX, 0 },
+Ia_outsb_DX_Xb = { "outsb", "outsb", DX_Reg, Xb, XX, XX, 0 },
+Ia_outsl_DX_Xd = { "outsd", "outsl", DX_Reg, Xd, XX, XX, 0 },
+Ia_outsw_DX_Xw = { "outsw", "outsw", DX_Reg, Xw, XX, XX, 0 },
+Ia_outw_DX_AX = { "out", "outw", DX_Reg, AX_Reg, XX, XX, 0 },
+Ia_outw_Ib_AX = { "out", "outw", Ib, AX_Reg, XX, XX, 0 },
+Ia_pabsb_Pq_Qq = { "pabsb", "pabsb", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pabsb_Vdq_Wdq = { "pabsb", "pabsb", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pabsd_Pq_Qq = { "pabsd", "pabsd", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pabsd_Vdq_Wdq = { "pabsd", "pabsd", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pabsw_Pq_Qq = { "pabsw", "pabsw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pabsw_Vdq_Wdq = { "pabsw", "pabsw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_packssdw_Pq_Qq = { "packssdw", "packssdw", Pq, Qq, XX, XX, IA_MMX },
+Ia_packssdw_Vdq_Wdq = { "packssdw", "packssdw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_packsswb_Pq_Qq = { "packsswb", "packsswb", Pq, Qq, XX, XX, IA_MMX },
+Ia_packsswb_Vdq_Wdq = { "packsswb", "packsswb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_packusdw_Vdq_Wdq = { "packusdw", "packusdw", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_packuswb_Pq_Qq = { "packuswb", "packuswb", Pq, Qq, XX, XX, IA_MMX },
+Ia_packuswb_Vdq_Wdq = { "packuswb", "packuswb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddb_Pq_Qq = { "paddb", "paddb", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddb_Vdq_Wdq = { "paddb", "paddb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddd_Pq_Qq = { "paddd", "paddd", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddd_Vdq_Wdq = { "paddd", "paddd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddq_Pq_Qq = { "paddq", "paddq", Pq, Qq, XX, XX, IA_SSE2 },
+Ia_paddq_Vdq_Wdq = { "paddq", "paddq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddsb_Pq_Qq = { "paddsb", "paddsb", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddsb_Vdq_Wdq = { "paddsb", "paddsb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddsw_Pq_Qq = { "paddsw", "paddsw", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddsw_Vdq_Wdq = { "paddsw", "paddsw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddusb_Pq_Qq = { "paddusb", "paddusb", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddusb_Vdq_Wdq = { "paddusb", "paddusb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddusw_Pq_Qq = { "paddusw", "paddusw", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddusw_Vdq_Wdq = { "paddusw", "paddusw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_paddw_Pq_Qq = { "paddw", "paddw", Pq, Qq, XX, XX, IA_MMX },
+Ia_paddw_Vdq_Wdq = { "paddw", "paddw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_palignr_Pq_Qq_Ib = { "palignr", "palignr", Pq, Qq, Ib, XX, IA_SSSE3 },
+Ia_palignr_Vdq_Wdq_Ib = { "palignr", "palignr", Vdq, Wdq, Ib, XX, IA_SSSE3 },
+Ia_pand_Pq_Qq = { "pand", "pand", Pq, Qq, XX, XX, IA_MMX },
+Ia_pand_Vdq_Wdq = { "pand", "pand", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pandn_Pq_Qq = { "pandn", "pandn", Pq, Qq, XX, XX, IA_MMX },
+Ia_pandn_Vdq_Wdq = { "pandn", "pandn", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pause = { "pause", "pause", XX, XX, XX, XX, 0 },
+Ia_pavgb_Pq_Qq = { "pavgb", "pavgb", Pq, Qq, XX, XX, IA_MMX },
+Ia_pavgb_Vdq_Wdq = { "pavgb", "pavgb", Vdq, Wdq, XX, XX, IA_SSE },
+Ia_pavgw_Pq_Qq = { "pavgw", "pavgw", Pq, Qq, XX, XX, IA_MMX },
+Ia_pavgw_Vdq_Wdq = { "pavgw", "pavgw", Vdq, Wdq, XX, XX, IA_SSE },
+Ia_pblendvb_Vdq_Wdq = { "pblendvb", "pblendvb", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pblendw_Vdq_Wdq_Ib = { "pblendw", "pblendw", Vdq, Wdq, Ib, XX, IA_SSE4_1 },
+Ia_pclmulqdq_Vdq_Wdq_Ib = { "pclmulqdq", "pclmulqdq", Vdq, Wdq, Ib, XX, IA_AES_PCLMULQDQ },
+Ia_pcmpeqb_Pq_Qq = { "pcmpeqb", "pcmpeqb", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpeqb_Vdq_Wdq = { "pcmpeqb", "pcmpeqb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpeqd_Pq_Qq = { "pcmpeqd", "pcmpeqd", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpeqd_Vdq_Wdq = { "pcmpeqd", "pcmpeqd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpeqq_Vdq_Wdq = { "pcmpeqq", "pcmpeqq", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pcmpeqw_Pq_Qq = { "pcmpeqw", "pcmpeqw", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpeqw_Vdq_Wdq = { "pcmpeqw", "pcmpeqw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpestri_Vdq_Wdq_Ib = { "pcmpestri", "pcmpestri", Vdq, Wdq, Ib, XX, IA_SSE4_2 },
+Ia_pcmpestrm_Vdq_Wdq_Ib = { "pcmpestrm", "pcmpestrm", Vdq, Wdq, Ib, XX, IA_SSE4_2 },
+Ia_pcmpgtb_Pq_Qq = { "pcmpgtb", "pcmpgtb", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpgtb_Vdq_Wdq = { "pcmpgtb", "pcmpgtb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpgtd_Pq_Qq = { "pcmpgtd", "pcmpgtd", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpgtd_Vdq_Wdq = { "pcmpgtd", "pcmpgtd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpgtq_Vdq_Wdq = { "pcmpgtq", "pcmpgtq", Vdq, Wdq, XX, XX, IA_SSE4_2 },
+Ia_pcmpgtw_Pq_Qq = { "pcmpgtw", "pcmpgtw", Pq, Qq, XX, XX, IA_MMX },
+Ia_pcmpgtw_Vdq_Wdq = { "pcmpgtw", "pcmpgtw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pcmpistri_Vdq_Wdq_Ib = { "pcmpistri", "pcmpistri", Vdq, Wdq, Ib, XX, IA_SSE4_2 },
+Ia_pcmpistrm_Vdq_Wdq_Ib = { "pcmpistrm", "pcmpistrm", Vdq, Wdq, Ib, XX, IA_SSE4_2 },
+Ia_pdep_Gy_By_Ey = { "pdep", "pdep", Gy, By, Ey, XX, IA_BMI2 },
+Ia_pext_Gy_By_Ey = { "pext", "pext", Gy, By, Ey, XX, IA_BMI2 },
+Ia_pextrb_Ebd_Vdq_Ib = { "pextrb", "pextrb", Ebd, Vdq, Ib, XX, IA_SSE4_1 },
+Ia_pextrd_Ed_Vdq_Ib = { "pextrd", "pextrd", Ed, Vdq, Ib, XX, IA_SSE4_1 },
+Ia_pextrq_Eq_Vdq_Ib = { "pextrq", "pextrq", Eq, Vdq, Ib, XX, IA_SSE4_1 },
+Ia_pextrw_Ewd_Vdq_Ib = { "pextrw", "pextrw", Ewd, Vdq, Ib, XX, IA_SSE4_1 },
+Ia_pextrw_Gd_Nq_Ib = { "pextrw", "pextrw", Gd, Nq, Ib, XX, IA_3DNOW | IA_SSE },
+Ia_pextrw_Gd_Udq_Ib = { "pextrw", "pextrw", Gd, Udq, Ib, XX, IA_SSE2 },
+Ia_pf2id_Pq_Qq = { "pf2id", "pf2id", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pf2iw_Pq_Qq = { "pf2iw", "pf2iw", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfacc_Pq_Qq = { "pfacc", "pfacc", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfadd_Pq_Qq = { "pfadd", "pfadd", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfcmpeq_Pq_Qq = { "pfcmpeq", "pfcmpeq", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfcmpge_Pq_Qq = { "pfcmpge", "pfcmpge", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfcmpgt_Pq_Qq = { "pfcmpgt", "pfcmpgt", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfmax_Pq_Qq = { "pfmax", "pfmax", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfmin_Pq_Qq = { "pfmin", "pfmin", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfmul_Pq_Qq = { "pfmul", "pfmul", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfnacc_Pq_Qq = { "pfnacc", "pfnacc", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfpnacc_Pq_Qq = { "pfpnacc", "pfpnacc", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfrcp_Pq_Qq = { "pfrcp", "pfrcp", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfrcpit1_Pq_Qq = { "pfrcpit1", "pfrcpit1", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfrcpit2_Pq_Qq = { "pfrcpit2", "pfrcpit2", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfrsqit1_Pq_Qq = { "pfrsqit1", "pfrsqit1", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfrsqrt_Pq_Qq = { "pfrsqrt", "pfrsqrt", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfsub_Pq_Qq = { "pfsub", "pfsub", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pfsubr_Pq_Qq = { "pfsubr", "pfsubr", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_phaddd_Pq_Qq = { "phaddd", "phaddd", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phaddd_Vdq_Wdq = { "phaddd", "phaddd", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_phaddsw_Pq_Qq = { "phaddsw", "phaddsw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phaddsw_Vdq_Wdq = { "phaddsw", "phaddsw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_phaddw_Pq_Qq = { "phaddw", "phaddw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phaddw_Vdq_Wdq = { "phaddw", "phaddw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_phminposuw_Vdq_Wdq = { "phminposuw", "phminposuw", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_phsubd_Pq_Qq = { "phsubd", "phsubd", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phsubd_Vdq_Wdq = { "phsubd", "phsubd", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_phsubsw_Pq_Qq = { "phsubsw", "phsubsw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phsubsw_Vdq_Wdq = { "phsubsw", "phsubsw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_phsubw_Pq_Qq = { "phsubw", "phsubw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_phsubw_Vdq_Wdq = { "phsubw", "phsubw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pi2fd_Pq_Qq = { "pi2fd", "pi2fd", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pi2fw_Pq_Qq = { "pi2fw", "pi2fw", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pinsrb_Vdq_Ew_Ib = { "pinsrb", "pinsrb", Vdq, Ew, Ib, XX, IA_SSE4_1 },
+Ia_pinsrd_Vdq_Ed_Ib = { "pinsrd", "pinsrd", Vdq, Ed, Ib, XX, IA_SSE4_1 },
+Ia_pinsrq_Vdq_Eq_Ib = { "pinsrq", "pinsrq", Vdq, Eq, Ib, XX, IA_SSE4_1 },
+Ia_pinsrw_Pq_Ew_Ib = { "pinsrw", "pinsrw", Pq, Ew, Ib, XX, IA_3DNOW | IA_SSE },
+Ia_pinsrw_Vdq_Ew_Ib = { "pinsrw", "pinsrw", Vdq, Ew, Ib, XX, IA_SSE2 },
+Ia_pmaddubsw_Pq_Qq = { "pmaddubsw", "pmaddubsw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pmaddubsw_Vdq_Wdq = { "pmaddubsw", "pmaddubsw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pmaddwd_Pq_Qq = { "pmaddwd", "pmaddwd", Pq, Qq, XX, XX, IA_MMX },
+Ia_pmaddwd_Vdq_Wdq = { "pmaddwd", "pmaddwd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pmaxsb_Vdq_Wdq = { "pmaxsb", "pmaxsb", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmaxsd_Vdq_Wdq = { "pmaxsd", "pmaxsd", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmaxsw_Pq_Qq = { "pmaxsw", "pmaxsw", Pq, Qq, XX, XX, 0 },
+Ia_pmaxsw_Vdq_Wdq = { "pmaxsw", "pmaxsw", Vdq, Wdq, XX, XX, 0 },
+Ia_pmaxub_Pq_Qq = { "pmaxub", "pmaxub", Pq, Qq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_pmaxub_Vdq_Wdq = { "pmaxub", "pmaxub", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pmaxud_Vdq_Wdq = { "pmaxud", "pmaxud", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmaxuw_Vdq_Wdq = { "pmaxuw", "pmaxuw", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pminsb_Vdq_Wdq = { "pminsb", "pminsb", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pminsd_Vdq_Wdq = { "pminsd", "pminsd", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pminsw_Pq_Qq = { "pminsw", "pminsw", Pq, Qq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_pminsw_Vdq_Wdq = { "pminsw", "pminsw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pminub_Pq_Qq = { "pminub", "pminub", Pq, Qq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_pminub_Vdq_Wdq = { "pminub", "pminub", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pminud_Vdq_Wdq = { "pminud", "pminud", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pminuw_Vdq_Wdq = { "pminuw", "pminuw", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmovmskb_Gd_Nq = { "pmovmskb", "pmovmskb", Gd, Nq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_pmovmskb_Gd_Udq = { "pmovmskb", "pmovmskb", Gd, Udq, XX, XX, IA_SSE2 },
+Ia_pmovsxbd_Vdq_Wd = { "pmovsxbd", "pmovsxbd", Vdq, Wd, XX, XX, IA_SSE4_1 },
+Ia_pmovsxbq_Vdq_Ww = { "pmovsxbq", "pmovsxbq", Vdq, Ww, XX, XX, IA_SSE4_1 },
+Ia_pmovsxbw_Vdq_Wq = { "pmovsxbw", "pmovsxbw", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovsxdq_Vdq_Wq = { "pmovsxdq", "pmovsxdq", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovsxwd_Vdq_Wq = { "pmovsxwd", "pmovsxwd", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovsxwq_Vdq_Wd = { "pmovsxwq", "pmovsxwq", Vdq, Wd, XX, XX, IA_SSE4_1 },
+Ia_pmovzxbd_Vdq_Wd = { "pmovzxbd", "pmovzxbd", Vdq, Wd, XX, XX, IA_SSE4_1 },
+Ia_pmovzxbq_Vdq_Ww = { "pmovzxbq", "pmovzxbq", Vdq, Ww, XX, XX, IA_SSE4_1 },
+Ia_pmovzxbw_Vdq_Wq = { "pmovzxbw", "pmovzxbw", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovzxdq_Vdq_Wq = { "pmovzxdq", "pmovzxdq", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovzxwd_Vdq_Wq = { "pmovzxwd", "pmovzxwd", Vdq, Wq, XX, XX, IA_SSE4_1 },
+Ia_pmovzxwq_Vdq_Wd = { "pmovzxwq", "pmovzxwq", Vdq, Wd, XX, XX, IA_SSE4_1 },
+Ia_pmuldq_Vdq_Wdq = { "pmuldq", "pmuldq", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmulhrsw_Pq_Qq = { "pmulhrsw", "pmulhrsw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pmulhrsw_Vdq_Wdq = { "pmulhrsw", "pmulhrsw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pmulhrw_Pq_Qq = { "pmulhrw", "pmulhrw", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_pmulhuw_Pq_Qq = { "pmulhuw", "pmulhuw", Pq, Qq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_pmulhuw_Vdq_Wdq = { "pmulhuw", "pmulhuw", Vdq, Wdq, XX, XX, IA_SSE },
+Ia_pmulhw_Pq_Qq = { "pmulhw", "pmulhw", Pq, Qq, XX, XX, IA_MMX },
+Ia_pmulhw_Vdq_Wdq = { "pmulhw", "pmulhw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pmulld_Vdq_Wdq = { "pmulld", "pmulld", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_pmullw_Pq_Qq = { "pmullw", "pmullw", Pq, Qq, XX, XX, IA_MMX },
+Ia_pmullw_Vdq_Wdq = { "pmullw", "pmullw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pmuludq_Pq_Qq = { "pmuludq", "pmuludq", Pq, Qq, XX, XX, IA_SSE2 },
+Ia_pmuludq_Vdq_Wdq = { "pmuludq", "pmuludq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_popal = { "popa", "popal", XX, XX, XX, XX, 0 },
+Ia_popaw = { "popa", "popa", XX, XX, XX, XX, 0 },
+Ia_popcnt_Gd_Ed = { "popcnt", "popcnt", Gd, Ed, XX, XX, IA_POPCNT },
+Ia_popcnt_Gq_Eq = { "popcnt", "popcnt", Gq, Eq, XX, XX, IA_POPCNT },
+Ia_popcnt_Gw_Ew = { "popcnt", "popcnt", Gw, Ew, XX, XX, IA_POPCNT },
+Ia_popfl = { "popf", "popfl", XX, XX, XX, XX, 0 },
+Ia_popfq = { "popf", "popfq", XX, XX, XX, XX, 0 },
+Ia_popfw = { "popf", "popf", XX, XX, XX, XX, 0 },
+Ia_popl_DS = { "pop", "popl", DS, XX, XX, XX, 0 },
+Ia_popl_Ed = { "pop", "popl", Ed, XX, XX, XX, 0 },
+Ia_popl_ERX = { "pop", "popl", ERX, XX, XX, XX, 0 },
+Ia_popl_ES = { "pop", "popl", ES, XX, XX, XX, 0 },
+Ia_popl_FS = { "pop", "popl", FS, XX, XX, XX, 0 },
+Ia_popl_GS = { "pop", "popl", GS, XX, XX, XX, 0 },
+Ia_popl_SS = { "pop", "popl", SS, XX, XX, XX, 0 },
+Ia_popq_Eq = { "pop", "popq", Eq, XX, XX, XX, 0 },
+Ia_popq_FS = { "pop", "popq", FS, XX, XX, XX, 0 },
+Ia_popq_GS = { "pop", "popq", GS, XX, XX, XX, 0 },
+Ia_popq_RRX = { "pop", "popq", RRX, XX, XX, XX, 0 },
+Ia_popw_DS = { "pop", "popw", DS, XX, XX, XX, 0 },
+Ia_popw_ES = { "pop", "popw", ES, XX, XX, XX, 0 },
+Ia_popw_Ew = { "pop", "popw", Ew, XX, XX, XX, 0 },
+Ia_popw_FS = { "pop", "popw", FS, XX, XX, XX, 0 },
+Ia_popw_GS = { "pop", "popw", GS, XX, XX, XX, 0 },
+Ia_popw_RX = { "pop", "popw", RX, XX, XX, XX, 0 },
+Ia_popw_SS = { "pop", "popw", SS, XX, XX, XX, 0 },
+Ia_por_Pq_Qq = { "por", "por", Pq, Qq, XX, XX, IA_MMX },
+Ia_por_Vdq_Wdq = { "por", "por", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_prefetch_hint = { "prefetch_hint", "prefetch_hint", Mb, XX, XX, XX, IA_SSE },
+Ia_prefetchnta = { "prefetchnta", "prefetchnta", Mb, XX, XX, XX, IA_SSE },
+Ia_prefetcht0 = { "prefetcht0", "prefetcht0", Mb, XX, XX, XX, IA_SSE },
+Ia_prefetcht1 = { "prefetcht1", "prefetcht1", Mb, XX, XX, XX, IA_SSE },
+Ia_prefetcht2 = { "prefetcht2", "prefetcht2", Mb, XX, XX, XX, IA_SSE },
+Ia_prefetchw = { "prefetchw", "prefetchw", Mb, XX, XX, XX, 0 },
+Ia_prefix_asize = { "asize", "asize", XX, XX, XX, XX, 0 },
+Ia_prefix_cs = { "cs", "cs", XX, XX, XX, XX, 0 },
+Ia_prefix_ds = { "ds", "ds", XX, XX, XX, XX, 0 },
+Ia_prefix_es = { "es", "es", XX, XX, XX, XX, 0 },
+Ia_prefix_fs = { "fs", "fs", XX, XX, XX, XX, 0 },
+Ia_prefix_gs = { "gs", "gs", XX, XX, XX, XX, 0 },
+Ia_prefix_lock = { "lock", "lock", XX, XX, XX, XX, 0 },
+Ia_prefix_osize = { "osize", "osize", XX, XX, XX, XX, 0 },
+Ia_prefix_rep = { "rep", "rep", XX, XX, XX, XX, 0 },
+Ia_prefix_repne = { "repne", "repne", XX, XX, XX, XX, 0 },
+Ia_prefix_rex = { "rex", "rex", XX, XX, XX, XX, 0 },
+Ia_prefix_ss = { "ss", "ss", XX, XX, XX, XX, 0 },
+Ia_psadbw_Pq_Qq = { "psadbw", "psadbw", Pq, Qq, XX, XX, IA_3DNOW | IA_SSE },
+Ia_psadbw_Vdq_Wdq = { "psadbw", "psadbw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pshufb_Pq_Qq = { "pshufb", "pshufb", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_pshufb_Vdq_Wdq = { "pshufb", "pshufb", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pshufd_Vdq_Wdq_Ib = { "pshufd", "pshufd", Vdq, Wdq, Ib, XX, IA_SSE2 },
+Ia_pshufhw_Vdq_Wdq_Ib = { "pshufhw", "pshufhw", Vdq, Wdq, Ib, XX, IA_SSE2 },
+Ia_pshuflw_Vdq_Wdq_Ib = { "pshuflw", "pshuflw", Vdq, Wdq, Ib, XX, IA_SSE2 },
+Ia_pshufw_Pq_Qq_Ib = { "pshufw", "pshufw", Pq, Qq, Ib, XX, IA_3DNOW | IA_SSE },
+Ia_psignb_Pq_Qq = { "psignb", "psignb", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_psignb_Vdq_Wdq = { "psignb", "psignb", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_psignd_Pq_Qq = { "psignd", "psignd", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_psignd_Vdq_Wdq = { "psignd", "psignd", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_psignw_Pq_Qq = { "psignw", "psignw", Pq, Qq, XX, XX, IA_SSSE3 },
+Ia_psignw_Vdq_Wdq = { "psignw", "psignw", Vdq, Wdq, XX, XX, IA_SSSE3 },
+Ia_pslld_Nq_Ib = { "pslld", "pslld", Nq, Ib, XX, XX, IA_MMX },
+Ia_pslld_Pq_Qq = { "pslld", "pslld", Pq, Qq, XX, XX, IA_MMX },
+Ia_pslld_Udq_Ib = { "pslld", "pslld", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_pslld_Vdq_Wdq = { "pslld", "pslld", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pslldq_Udq_Ib = { "pslldq", "pslldq", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psllq_Nq_Ib = { "psllq", "psllq", Nq, Ib, XX, XX, IA_MMX },
+Ia_psllq_Pq_Qq = { "psllq", "psllq", Pq, Qq, XX, XX, IA_MMX },
+Ia_psllq_Udq_Ib = { "psllq", "psllq", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psllq_Vdq_Wdq = { "psllq", "psllq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psllw_Nq_Ib = { "psllw", "psllw", Nq, Ib, XX, XX, IA_MMX },
+Ia_psllw_Pq_Qq = { "psllw", "psllw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psllw_Udq_Ib = { "psllw", "psllw", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psllw_Vdq_Wdq = { "psllw", "psllw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psrad_Nq_Ib = { "psrad", "psrad", Nq, Ib, XX, XX, IA_MMX },
+Ia_psrad_Pq_Qq = { "psrad", "psrad", Pq, Qq, XX, XX, IA_MMX },
+Ia_psrad_Udq_Ib = { "psrad", "psrad", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psrad_Vdq_Wdq = { "psrad", "psrad", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psraw_Nq_Ib = { "psraw", "psraw", Nq, Ib, XX, XX, IA_MMX },
+Ia_psraw_Pq_Qq = { "psraw", "psraw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psraw_Udq_Ib = { "psraw", "psraw", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psraw_Vdq_Wdq = { "psraw", "psraw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psrld_Nq_Ib = { "psrld", "psrld", Nq, Ib, XX, XX, IA_MMX },
+Ia_psrld_Pq_Qq = { "psrld", "psrld", Pq, Qq, XX, XX, IA_MMX },
+Ia_psrld_Udq_Ib = { "psrld", "psrld", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psrld_Vdq_Wdq = { "psrld", "psrld", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psrldq_Udq_Ib = { "psrldq", "psrldq", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psrlq_Nq_Ib = { "psrlq", "psrlq", Nq, Ib, XX, XX, IA_MMX },
+Ia_psrlq_Pq_Qq = { "psrlq", "psrlq", Pq, Qq, XX, XX, IA_MMX },
+Ia_psrlq_Udq_Ib = { "psrlq", "psrlq", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psrlq_Vdq_Wdq = { "psrlq", "psrlq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psrlw_Nq_Ib = { "psrlw", "psrlw", Nq, Ib, XX, XX, IA_MMX },
+Ia_psrlw_Pq_Qq = { "psrlw", "psrlw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psrlw_Udq_Ib = { "psrlw", "psrlw", Udq, Ib, XX, XX, IA_SSE2 },
+Ia_psrlw_Vdq_Wdq = { "psrlw", "psrlw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubb_Pq_Qq = { "psubb", "psubb", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubb_Vdq_Wdq = { "psubb", "psubb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubd_Pq_Qq = { "psubd", "psubd", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubd_Vdq_Wdq = { "psubd", "psubd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubq_Pq_Qq = { "psubq", "psubq", Pq, Qq, XX, XX, IA_SSE2 },
+Ia_psubq_Vdq_Wdq = { "psubq", "psubq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubsb_Pq_Qq = { "psubsb", "psubsb", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubsb_Vdq_Wdq = { "psubsb", "psubsb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubsw_Pq_Qq = { "psubsw", "psubsw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubsw_Vdq_Wdq = { "psubsw", "psubsw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubusb_Pq_Qq = { "psubusb", "psubusb", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubusb_Vdq_Wdq = { "psubusb", "psubusb", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubusw_Pq_Qq = { "psubusw", "psubusw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubusw_Vdq_Wdq = { "psubusw", "psubusw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_psubw_Pq_Qq = { "psubw", "psubw", Pq, Qq, XX, XX, IA_MMX },
+Ia_psubw_Vdq_Wdq = { "psubw", "psubw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pswapd_Pq_Qq = { "pswapd", "pswapd", Pq, Qq, XX, XX, IA_3DNOW },
+Ia_ptest_Vdq_Wdq = { "ptest", "ptest", Vdq, Wdq, XX, XX, IA_SSE4_1 },
+Ia_punpckhbw_Pq_Qq = { "punpckhbw", "punpckhbw", Pq, Qq, XX, XX, IA_MMX },
+Ia_punpckhbw_Vdq_Wdq = { "punpckhbw", "punpckhbw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpckhdq_Pq_Qq = { "punpckhdq", "punpckhdq", Pq, Qq, XX, XX, IA_MMX },
+Ia_punpckhdq_Vdq_Wdq = { "punpckhdq", "punpckhdq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpckhqdq_Vdq_Wdq = { "punpckhqdq", "punpckhqdq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpckhwd_Pq_Qq = { "punpckhwd", "punpckhwd", Pq, Qq, XX, XX, IA_MMX },
+Ia_punpckhwd_Vdq_Wdq = { "punpckhwd", "punpckhwd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpcklbw_Pq_Qd = { "punpcklbw", "punpcklbw", Pq, Qd, XX, XX, IA_MMX },
+Ia_punpcklbw_Vdq_Wdq = { "punpcklbw", "punpcklbw", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpckldq_Pq_Qd = { "punpckldq", "punpckldq", Pq, Qd, XX, XX, IA_MMX },
+Ia_punpckldq_Vdq_Wdq = { "punpckldq", "punpckldq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpcklqdq_Vdq_Wdq = { "punpcklqdq", "punpcklqdq", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_punpcklwd_Pq_Qd = { "punpcklwd", "punpcklwd", Pq, Qd, XX, XX, IA_MMX },
+Ia_punpcklwd_Vdq_Wdq = { "punpcklwd", "punpcklwd", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_pushal = { "pusha", "pushal", XX, XX, XX, XX, 0 },
+Ia_pushaw = { "pusha", "pusha", XX, XX, XX, XX, 0 },
+Ia_pushfl = { "pushf", "pushfl", XX, XX, XX, XX, 0 },
+Ia_pushfq = { "pushf", "pushfq", XX, XX, XX, XX, 0 },
+Ia_pushfw = { "pushf", "pushf", XX, XX, XX, XX, 0 },
+Ia_pushl_CS = { "push", "pushl", CS, XX, XX, XX, 0 },
+Ia_pushl_DS = { "push", "pushl", DS, XX, XX, XX, 0 },
+Ia_pushl_Ed = { "push", "pushl", Ed, XX, XX, XX, 0 },
+Ia_pushl_ERX = { "push", "pushl", ERX, XX, XX, XX, 0 },
+Ia_pushl_ES = { "push", "pushl", ES, XX, XX, XX, 0 },
+Ia_pushl_FS = { "push", "pushl", FS, XX, XX, XX, 0 },
+Ia_pushl_GS = { "push", "pushl", GS, XX, XX, XX, 0 },
+Ia_pushl_Id = { "push", "pushl", Id, XX, XX, XX, 0 },
+Ia_pushl_sIb = { "push", "pushl", sIbd, XX, XX, XX, 0 },
+Ia_pushl_SS = { "push", "pushl", SS, XX, XX, XX, 0 },
+Ia_pushq_Eq = { "push", "pushq", Eq, XX, XX, XX, 0 },
+Ia_pushq_FS = { "push", "pushq", FS, XX, XX, XX, 0 },
+Ia_pushq_GS = { "push", "pushq", GS, XX, XX, XX, 0 },
+Ia_pushq_RRX = { "push", "pushq", RRX, XX, XX, XX, 0 },
+Ia_pushq_sIb = { "push", "pushq", sIbq, XX, XX, XX, 0 },
+Ia_pushq_sId = { "push", "pushq", sIdq, XX, XX, XX, 0 },
+Ia_pushw_CS = { "push", "pushw", CS, XX, XX, XX, 0 },
+Ia_pushw_DS = { "push", "pushw", DS, XX, XX, XX, 0 },
+Ia_pushw_ES = { "push", "pushw", ES, XX, XX, XX, 0 },
+Ia_pushw_Ew = { "push", "pushw", Ew, XX, XX, XX, 0 },
+Ia_pushw_FS = { "push", "pushw", FS, XX, XX, XX, 0 },
+Ia_pushw_GS = { "push", "pushw", GS, XX, XX, XX, 0 },
+Ia_pushw_Iw = { "push", "pushw", Iw, XX, XX, XX, 0 },
+Ia_pushw_RX = { "push", "pushw", RX, XX, XX, XX, 0 },
+Ia_pushw_sIb = { "push", "pushw", sIbw, XX, XX, XX, 0 },
+Ia_pushw_SS = { "push", "pushw", SS, XX, XX, XX, 0 },
+Ia_pxor_Pq_Qq = { "pxor", "pxor", Pq, Qq, XX, XX, IA_MMX },
+Ia_pxor_Vdq_Wdq = { "pxor", "pxor", Vdq, Wdq, XX, XX, IA_SSE2 },
+Ia_rclb_Eb_CL = { "rcl", "rclb", Eb, CL_Reg, XX, XX, 0 },
+Ia_rclb_Eb_I1 = { "rcl", "rclb", Eb, I1, XX, XX, 0 },
+Ia_rclb_Eb_Ib = { "rcl", "rclb", Eb, Ib, XX, XX, 0 },
+Ia_rcll_Ed_CL = { "rcl", "rcll", Ed, CL_Reg, XX, XX, 0 },
+Ia_rcll_Ed_I1 = { "rcl", "rcll", Ed, I1, XX, XX, 0 },
+Ia_rcll_Ed_Ib = { "rcl", "rcll", Ed, Ib, XX, XX, 0 },
+Ia_rclq_Eq_CL = { "rcl", "rclq", Eq, CL_Reg, XX, XX, 0 },
+Ia_rclq_Eq_I1 = { "rcl", "rclq", Eq, I1, XX, XX, 0 },
+Ia_rclq_Eq_Ib = { "rcl", "rclq", Eq, Ib, XX, XX, 0 },
+Ia_rclw_Ew_CL = { "rcl", "rclw", Ew, CL_Reg, XX, XX, 0 },
+Ia_rclw_Ew_I1 = { "rcl", "rclw", Ew, I1, XX, XX, 0 },
+Ia_rclw_Ew_Ib = { "rcl", "rclw", Ew, Ib, XX, XX, 0 },
+Ia_rcpps_Vps_Wps = { "rcpps", "rcpps", Vps, Wps, XX, XX, IA_SSE },
+Ia_rcpss_Vss_Wss = { "rcpss", "rcpss", Vss, Wss, XX, XX, IA_SSE },
+Ia_rcrb_Eb_CL = { "rcr", "rcrb", Eb, CL_Reg, XX, XX, 0 },
+Ia_rcrb_Eb_I1 = { "rcr", "rcrb", Eb, I1, XX, XX, 0 },
+Ia_rcrb_Eb_Ib = { "rcr", "rcrb", Eb, Ib, XX, XX, 0 },
+Ia_rcrl_Ed_CL = { "rcr", "rcrl", Ed, CL_Reg, XX, XX, 0 },
+Ia_rcrl_Ed_I1 = { "rcr", "rcrl", Ed, I1, XX, XX, 0 },
+Ia_rcrl_Ed_Ib = { "rcr", "rcrl", Ed, Ib, XX, XX, 0 },
+Ia_rcrq_Eq_CL = { "rcr", "rcrq", Eq, CL_Reg, XX, XX, 0 },
+Ia_rcrq_Eq_I1 = { "rcr", "rcrq", Eq, I1, XX, XX, 0 },
+Ia_rcrq_Eq_Ib = { "rcr", "rcrq", Eq, Ib, XX, XX, 0 },
+Ia_rcrw_Ew_CL = { "rcr", "rcrw", Ew, CL_Reg, XX, XX, 0 },
+Ia_rcrw_Ew_I1 = { "rcr", "rcrw", Ew, I1, XX, XX, 0 },
+Ia_rcrw_Ew_Ib = { "rcr", "rcrw", Ew, Ib, XX, XX, 0 },
+Ia_rdfsbase_Ry = { "rdfsbase", "rdfsbase", Ry, XX, XX, XX, IA_FSGSBASE },
+Ia_rdgsbase_Ry = { "rdgsbase", "rdgsbase", Ry, XX, XX, XX, IA_FSGSBASE },
+Ia_rdmsr = { "rdmsr", "rdmsr", XX, XX, XX, XX, IA_PENTIUM },
+Ia_rdpmc = { "rdpmc", "rdpmc", XX, XX, XX, XX, IA_P6 },
+Ia_rdrand_Ed = { "rdrand", "rdrandd", Ed, XX, XX, XX, IA_RDRAND },
+Ia_rdrand_Eq = { "rdrand", "rdrandq", Eq, XX, XX, XX, IA_RDRAND },
+Ia_rdrand_Ew = { "rdrand", "rdrandw", Ew, XX, XX, XX, IA_RDRAND },
+Ia_rdseed_Ed = { "rdseed", "rdseedd", Ed, XX, XX, XX, IA_RDSEED },
+Ia_rdseed_Eq = { "rdseed", "rdseedq", Eq, XX, XX, XX, IA_RDSEED },
+Ia_rdseed_Ew = { "rdseed", "rdseedw", Ew, XX, XX, XX, IA_RDSEED },
+Ia_rdtsc = { "rdtsc", "rdtsc", XX, XX, XX, XX, IA_PENTIUM },
+Ia_rdtscp = { "rdtscp", "rdtscp", XX, XX, XX, XX, IA_RDTSCP },
+Ia_ret = { "ret", "ret", XX, XX, XX, XX, 0 },
+Ia_ret_Iw = { "ret", "ret", Iw, XX, XX, XX, 0 },
+Ia_rolb_Eb_CL = { "rol", "rolb", Eb, CL_Reg, XX, XX, 0 },
+Ia_rolb_Eb_I1 = { "rol", "rolb", Eb, I1, XX, XX, 0 },
+Ia_rolb_Eb_Ib = { "rol", "rolb", Eb, Ib, XX, XX, 0 },
+Ia_roll_Ed_CL = { "rol", "roll", Ed, CL_Reg, XX, XX, 0 },
+Ia_roll_Ed_I1 = { "rol", "roll", Ed, I1, XX, XX, 0 },
+Ia_roll_Ed_Ib = { "rol", "roll", Ed, Ib, XX, XX, 0 },
+Ia_rolq_Eq_CL = { "rol", "rolq", Eq, CL_Reg, XX, XX, 0 },
+Ia_rolq_Eq_I1 = { "rol", "rolq", Eq, I1, XX, XX, 0 },
+Ia_rolq_Eq_Ib = { "rol", "rolq", Eq, Ib, XX, XX, 0 },
+Ia_rolw_Ew_CL = { "rol", "rolw", Ew, CL_Reg, XX, XX, 0 },
+Ia_rolw_Ew_I1 = { "rol", "rolw", Ew, I1, XX, XX, 0 },
+Ia_rolw_Ew_Ib = { "rol", "rolw", Ew, Ib, XX, XX, 0 },
+Ia_rorb_Eb_CL = { "ror", "rorb", Eb, CL_Reg, XX, XX, 0 },
+Ia_rorb_Eb_I1 = { "ror", "rorb", Eb, I1, XX, XX, 0 },
+Ia_rorb_Eb_Ib = { "ror", "rorb", Eb, Ib, XX, XX, 0 },
+Ia_rorl_Ed_CL = { "ror", "rorl", Ed, CL_Reg, XX, XX, 0 },
+Ia_rorl_Ed_I1 = { "ror", "rorl", Ed, I1, XX, XX, 0 },
+Ia_rorl_Ed_Ib = { "ror", "rorl", Ed, Ib, XX, XX, 0 },
+Ia_rorq_Eq_CL = { "ror", "rorq", Eq, CL_Reg, XX, XX, 0 },
+Ia_rorq_Eq_I1 = { "ror", "rorq", Eq, I1, XX, XX, 0 },
+Ia_rorq_Eq_Ib = { "ror", "rorq", Eq, Ib, XX, XX, 0 },
+Ia_rorw_Ew_CL = { "ror", "rorw", Ew, CL_Reg, XX, XX, 0 },
+Ia_rorw_Ew_I1 = { "ror", "rorw", Ew, I1, XX, XX, 0 },
+Ia_rorw_Ew_Ib = { "ror", "rorw", Ew, Ib, XX, XX, 0 },
+Ia_rorx_Gy_Ey_Ib = { "rorx", "rorx", Gy, Ey, Ib, XX, IA_BMI2 },
+Ia_roundpd_Vpd_Wpd_Ib = { "roundpd", "roundpd", Vpd, Wpd, Ib, XX, IA_SSE4_1 },
+Ia_roundps_Vps_Wps_Ib = { "roundps", "roundps", Vps, Wps, Ib, XX, IA_SSE4_1 },
+Ia_roundsd_Vsd_Wsd_Ib = { "roundsd", "roundsd", Vsd, Wsd, Ib, XX, IA_SSE4_1 },
+Ia_roundss_Vss_Wss_Ib = { "roundss", "roundss", Vss, Wss, Ib, XX, IA_SSE4_1 },
+Ia_rsm = { "rsm", "rsm", XX, XX, XX, XX, 0 },
+Ia_rsqrtps_Vps_Wps = { "rsqrtps", "rsqrtps", Vps, Wps, XX, XX, IA_SSE },
+Ia_rsqrtss_Vss_Wss = { "rsqrtss", "rsqrtss", Vss, Wss, XX, XX, IA_SSE },
+Ia_sahf = { "sahf", "sahf", XX, XX, XX, XX, 0 },
+Ia_salc = { "salc", "salc", XX, XX, XX, XX, 0 },
+Ia_sarb_Eb_CL = { "sar", "sarb", Eb, CL_Reg, XX, XX, 0 },
+Ia_sarb_Eb_I1 = { "sar", "sarb", Eb, I1, XX, XX, 0 },
+Ia_sarb_Eb_Ib = { "sar", "sarb", Eb, Ib, XX, XX, 0 },
+Ia_sarl_Ed_CL = { "sar", "sarl", Ed, CL_Reg, XX, XX, 0 },
+Ia_sarl_Ed_I1 = { "sar", "sarl", Ed, I1, XX, XX, 0 },
+Ia_sarl_Ed_Ib = { "sar", "sarl", Ed, Ib, XX, XX, 0 },
+Ia_sarq_Eq_CL = { "sar", "sarq", Eq, CL_Reg, XX, XX, 0 },
+Ia_sarq_Eq_I1 = { "sar", "sarq", Eq, I1, XX, XX, 0 },
+Ia_sarq_Eq_Ib = { "sar", "sarq", Eq, Ib, XX, XX, 0 },
+Ia_sarw_Ew_CL = { "sar", "sarw", Ew, CL_Reg, XX, XX, 0 },
+Ia_sarw_Ew_I1 = { "sar", "sarw", Ew, I1, XX, XX, 0 },
+Ia_sarw_Ew_Ib = { "sar", "sarw", Ew, Ib, XX, XX, 0 },
+Ia_sarx_Gy_Ey_By = { "sarx", "sarx", Gy, Ey, By, XX, IA_BMI2 },
+Ia_sbbb_AL_Ib = { "sbb", "sbbb", AL_Reg, Ib, XX, XX, 0 },
+Ia_sbbb_Eb_Gb = { "sbb", "sbbb", Eb, Gb, XX, XX, 0 },
+Ia_sbbb_Eb_Ib = { "sbb", "sbbb", Eb, Ib, XX, XX, 0 },
+Ia_sbbb_Gb_Eb = { "sbb", "sbbb", Gb, Eb, XX, XX, 0 },
+Ia_sbbl_EAX_Id = { "sbb", "sbbl", EAX_Reg, Id, XX, XX, 0 },
+Ia_sbbl_Ed_Gd = { "sbb", "sbbl", Ed, Gd, XX, XX, 0 },
+Ia_sbbl_Ed_Id = { "sbb", "sbbl", Ed, Id, XX, XX, 0 },
+Ia_sbbl_Ed_sIb = { "sbb", "sbbl", Ed, sIbd, XX, XX, 0 },
+Ia_sbbl_Gd_Ed = { "sbb", "sbbl", Gd, Ed, XX, XX, 0 },
+Ia_sbbq_Eq_Gq = { "sbb", "sbbq", Eq, Gq, XX, XX, 0 },
+Ia_sbbq_Eq_sIb = { "sbb", "sbbq", Eq, sIbq, XX, XX, 0 },
+Ia_sbbq_Eq_sId = { "sbb", "sbbq", Eq, sIdq, XX, XX, 0 },
+Ia_sbbq_Gq_Eq = { "sbb", "sbbq", Gq, Eq, XX, XX, 0 },
+Ia_sbbq_RAX_sId = { "sbb", "sbbq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_sbbw_AX_Iw = { "sbb", "sbbw", AX_Reg, Iw, XX, XX, 0 },
+Ia_sbbw_Ew_Gw = { "sbb", "sbbw", Ew, Gw, XX, XX, 0 },
+Ia_sbbw_Ew_Iw = { "sbb", "sbbw", Ew, Iw, XX, XX, 0 },
+Ia_sbbw_Ew_sIb = { "sbb", "sbbw", Ew, sIbw, XX, XX, 0 },
+Ia_sbbw_Gw_Ew = { "sbb", "sbbw", Gw, Ew, XX, XX, 0 },
+Ia_scasb_AL_Yb = { "scasb", "scasb", AL_Reg, Yb, XX, XX, 0 },
+Ia_scasl_EAX_Yd = { "scasd", "scasl", EAX_Reg, Yd, XX, XX, 0 },
+Ia_scasq_RAX_Yq = { "scasq", "scasq", RAX_Reg, Yq, XX, XX, 0 },
+Ia_scasw_AX_Yw = { "scasw", "scasw", AX_Reg, Yw, XX, XX, 0 },
+Ia_setb_Eb = { "setb", "setb", Eb, XX, XX, XX, 0 },
+Ia_setbe_Eb = { "setbe", "setbe", Eb, XX, XX, XX, 0 },
+Ia_setl_Eb = { "setl", "setl", Eb, XX, XX, XX, 0 },
+Ia_setle_Eb = { "setle", "setle", Eb, XX, XX, XX, 0 },
+Ia_setnb_Eb = { "setnb", "setnb", Eb, XX, XX, XX, 0 },
+Ia_setnbe_Eb = { "setnbe", "setnbe", Eb, XX, XX, XX, 0 },
+Ia_setnl_Eb = { "setnl", "setnl", Eb, XX, XX, XX, 0 },
+Ia_setnle_Eb = { "setnle", "setnle", Eb, XX, XX, XX, 0 },
+Ia_setno_Eb = { "setno", "setno", Eb, XX, XX, XX, 0 },
+Ia_setnp_Eb = { "setnp", "setnp", Eb, XX, XX, XX, 0 },
+Ia_setns_Eb = { "setns", "setns", Eb, XX, XX, XX, 0 },
+Ia_setnz_Eb = { "setnz", "setnz", Eb, XX, XX, XX, 0 },
+Ia_seto_Eb = { "seto", "seto", Eb, XX, XX, XX, 0 },
+Ia_setp_Eb = { "setp", "setp", Eb, XX, XX, XX, 0 },
+Ia_sets_Eb = { "sets", "sets", Eb, XX, XX, XX, 0 },
+Ia_setz_Eb = { "setz", "setz", Eb, XX, XX, XX, 0 },
+Ia_sfence = { "sfence", "sfence", XX, XX, XX, XX, IA_SSE },
+Ia_sgdt = { "sgdt", "sgdt", Ms, XX, XX, XX, 0 },
+Ia_sha1msg1_Vdq_Wdq = { "sha1msg1", "sha1msg1", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_sha1msg2_Vdq_Wdq = { "sha1msg2", "sha1msg2", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_sha1nexte_Vdq_Wdq = { "sha1nexte", "sha1nexte", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_sha1rnds4_Vdq_Wdq_Ib = { "sha1rnds4", "sha1rnds4", Vdq, Wdq, Ib, XX, IA_SHA },
+Ia_sha256msg1_Vdq_Wdq = { "sha256msg1", "sha256msg1", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_sha256msg2_Vdq_Wdq = { "sha256msg2", "sha256msg2", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_sha256rnds2_Vdq_Wdq = { "sha256rnds2", "sha256rnds2", Vdq, Wdq, XX, XX, IA_SHA },
+Ia_shlb_Eb_CL = { "shl", "shlb", Eb, CL_Reg, XX, XX, 0 },
+Ia_shlb_Eb_I1 = { "shl", "shlb", Eb, I1, XX, XX, 0 },
+Ia_shlb_Eb_Ib = { "shl", "shlb", Eb, Ib, XX, XX, 0 },
+Ia_shldl_Ed_Gd_CL = { "shld", "shldl", Ed, Gd, CL_Reg, XX, 0 },
+Ia_shldl_Ed_Gd_Ib = { "shld", "shldl", Ed, Gd, Ib, XX, 0 },
+Ia_shldq_Eq_Gq_CL = { "shld", "shldq", Eq, Gq, CL_Reg, XX, 0 },
+Ia_shldq_Eq_Gq_Ib = { "shld", "shldq", Eq, Gq, Ib, XX, 0 },
+Ia_shldw_Ew_Gw_CL = { "shld", "shldw", Ew, Gw, CL_Reg, XX, 0 },
+Ia_shldw_Ew_Gw_Ib = { "shld", "shldw", Ew, Gw, Ib, XX, 0 },
+Ia_shll_Ed_CL = { "shl", "shll", Ed, CL_Reg, XX, XX, 0 },
+Ia_shll_Ed_I1 = { "shl", "shll", Ed, I1, XX, XX, 0 },
+Ia_shll_Ed_Ib = { "shl", "shll", Ed, Ib, XX, XX, 0 },
+Ia_shlq_Eq_CL = { "shl", "shlq", Eq, CL_Reg, XX, XX, 0 },
+Ia_shlq_Eq_I1 = { "shl", "shlq", Eq, I1, XX, XX, 0 },
+Ia_shlq_Eq_Ib = { "shl", "shlq", Eq, Ib, XX, XX, 0 },
+Ia_shlw_Ew_CL = { "shl", "shlw", Ew, CL_Reg, XX, XX, 0 },
+Ia_shlw_Ew_I1 = { "shl", "shlw", Ew, I1, XX, XX, 0 },
+Ia_shlw_Ew_Ib = { "shl", "shlw", Ew, Ib, XX, XX, 0 },
+Ia_shlx_Gy_Ey_By = { "shlx", "shlx", Gy, Ey, By, XX, IA_BMI2 },
+Ia_shrb_Eb_CL = { "shr", "shrb", Eb, CL_Reg, XX, XX, 0 },
+Ia_shrb_Eb_I1 = { "shr", "shrb", Eb, I1, XX, XX, 0 },
+Ia_shrb_Eb_Ib = { "shr", "shrb", Eb, Ib, XX, XX, 0 },
+Ia_shrdl_Ed_Gd_CL = { "shrd", "shrdl", Ed, Gd, CL_Reg, XX, 0 },
+Ia_shrdl_Ed_Gd_Ib = { "shrd", "shrdl", Ed, Gd, Ib, XX, 0 },
+Ia_shrdq_Eq_Gq_CL = { "shrd", "shrdq", Eq, Gq, CL_Reg, XX, 0 },
+Ia_shrdq_Eq_Gq_Ib = { "shrd", "shrdq", Eq, Gq, Ib, XX, 0 },
+Ia_shrdw_Ew_Gw_CL = { "shrd", "shrdw", Ew, Gw, CL_Reg, XX, 0 },
+Ia_shrdw_Ew_Gw_Ib = { "shrd", "shrdw", Ew, Gw, Ib, XX, 0 },
+Ia_shrl_Ed_CL = { "shr", "shrl", Ed, CL_Reg, XX, XX, 0 },
+Ia_shrl_Ed_I1 = { "shr", "shrl", Ed, I1, XX, XX, 0 },
+Ia_shrl_Ed_Ib = { "shr", "shrl", Ed, Ib, XX, XX, 0 },
+Ia_shrq_Eq_CL = { "shr", "shrq", Eq, CL_Reg, XX, XX, 0 },
+Ia_shrq_Eq_I1 = { "shr", "shrq", Eq, I1, XX, XX, 0 },
+Ia_shrq_Eq_Ib = { "shr", "shrq", Eq, Ib, XX, XX, 0 },
+Ia_shrw_Ew_CL = { "shr", "shrw", Ew, CL_Reg, XX, XX, 0 },
+Ia_shrw_Ew_I1 = { "shr", "shrw", Ew, I1, XX, XX, 0 },
+Ia_shrw_Ew_Ib = { "shr", "shrw", Ew, Ib, XX, XX, 0 },
+Ia_shrx_Gy_Ey_By = { "shrx", "shrx", Gy, Ey, By, XX, IA_BMI2 },
+Ia_shufpd_Vpd_Wpd_Ib = { "shufpd", "shufpd", Vpd, Wpd, Ib, XX, IA_SSE2 },
+Ia_shufps_Vps_Wps_Ib = { "shufps", "shufps", Vps, Wps, Ib, XX, IA_SSE },
+Ia_sidt = { "sidt", "sidt", Ms, XX, XX, XX, 0 },
+Ia_skinit = { "skinit", "skinit", RAX_Reg, XX, XX, XX, IA_SVM },
+Ia_sldt = { "sldt", "sldt", Ew, XX, XX, XX, 0 },
+Ia_smsw_Ew = { "smsw", "smsw", Ew, XX, XX, XX, 0 },
+Ia_sqrtpd_Vpd_Wpd = { "sqrtpd", "sqrtpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_sqrtps_Vps_Wps = { "sqrtps", "sqrtps", Vps, Wps, XX, XX, IA_SSE },
+Ia_sqrtsd_Vsd_Wsd = { "sqrtsd", "sqrtsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_sqrtss_Vss_Wss = { "sqrtss", "sqrtss", Vss, Wss, XX, XX, IA_SSE },
+Ia_stac = { "stac", "stac", XX, XX, XX, XX, IA_SMAP },
+Ia_stc = { "stc", "stc", XX, XX, XX, XX, 0 },
+Ia_std = { "std", "std", XX, XX, XX, XX, 0 },
+Ia_stgi = { "stgi", "stgi", XX, XX, XX, XX, IA_SVM },
+Ia_sti = { "sti", "sti", XX, XX, XX, XX, 0 },
+Ia_stmxcsr = { "stmxcsr", "stmxcsr", Md, XX, XX, XX, IA_SSE },
+Ia_stosb_Yb_AL = { "stosb", "stosb", Yb, AL_Reg, XX, XX, 0 },
+Ia_stosl_Yd_EAX = { "stosd", "stosl", Yd, EAX_Reg, XX, XX, 0 },
+Ia_stosq_Yq_RAX = { "stosq", "stosq", Yq, RAX_Reg, XX, XX, 0 },
+Ia_stosw_Yw_AX = { "stosw", "stosw", Yw, AX_Reg, XX, XX, 0 },
+Ia_str = { "str", "str", Ew, XX, XX, XX, 0 },
+Ia_subb_AL_Ib = { "sub", "subb", AL_Reg, Ib, XX, XX, 0 },
+Ia_subb_Eb_Gb = { "sub", "subb", Eb, Gb, XX, XX, 0 },
+Ia_subb_Eb_Ib = { "sub", "subb", Eb, Ib, XX, XX, 0 },
+Ia_subb_Gb_Eb = { "sub", "subb", Gb, Eb, XX, XX, 0 },
+Ia_subl_EAX_Id = { "sub", "subl", EAX_Reg, Id, XX, XX, 0 },
+Ia_subl_Ed_Gd = { "sub", "subl", Ed, Gd, XX, XX, 0 },
+Ia_subl_Ed_Id = { "sub", "subl", Ed, Id, XX, XX, 0 },
+Ia_subl_Ed_sIb = { "sub", "subl", Ed, sIbd, XX, XX, 0 },
+Ia_subl_Gd_Ed = { "sub", "subl", Gd, Ed, XX, XX, 0 },
+Ia_subpd_Vpd_Wpd = { "subpd", "subpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_subps_Vps_Wps = { "subps", "subps", Vps, Wps, XX, XX, IA_SSE },
+Ia_subq_Eq_Gq = { "sub", "subq", Eq, Gq, XX, XX, 0 },
+Ia_subq_Eq_sIb = { "sub", "subq", Eq, sIbq, XX, XX, 0 },
+Ia_subq_Eq_sId = { "sub", "subq", Eq, sIdq, XX, XX, 0 },
+Ia_subq_Gq_Eq = { "sub", "subq", Gq, Eq, XX, XX, 0 },
+Ia_subq_RAX_sId = { "sub", "subq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_subsd_Vsd_Wsd = { "subsd", "subsd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_subss_Vss_Wss = { "subss", "subss", Vss, Wss, XX, XX, IA_SSE },
+Ia_subw_AX_Iw = { "sub", "subw", AX_Reg, Iw, XX, XX, 0 },
+Ia_subw_Ew_Gw = { "sub", "subw", Ew, Gw, XX, XX, 0 },
+Ia_subw_Ew_Iw = { "sub", "subw", Ew, Iw, XX, XX, 0 },
+Ia_subw_Ew_sIb = { "sub", "subw", Ew, sIbw, XX, XX, 0 },
+Ia_subw_Gw_Ew = { "sub", "subw", Gw, Ew, XX, XX, 0 },
+Ia_swapgs = { "swapgs", "swapgs", XX, XX, XX, XX, 0 },
+Ia_syscall = { "syscall", "syscall", XX, XX, XX, XX, 0 },
+Ia_sysenter = { "sysenter", "sysenter", XX, XX, XX, XX, IA_SYSENTER_SYSEXIT },
+Ia_sysexit = { "sysexit", "sysexit", XX, XX, XX, XX, IA_SYSENTER_SYSEXIT },
+Ia_sysret = { "sysret", "sysret", XX, XX, XX, XX, 0 },
+Ia_t1mskc_By_Ey = { "t1mskc", "t1mskc", Gy, By, Ey, XX, IA_TBM },
+Ia_testb_AL_Ib = { "test", "testb", AL_Reg, Ib, XX, XX, 0 },
+Ia_testb_Eb_Gb = { "test", "testb", Eb, Gb, XX, XX, 0 },
+Ia_testb_Eb_Ib = { "test", "testb", Eb, Ib, XX, XX, 0 },
+Ia_testl_EAX_Id = { "test", "testl", EAX_Reg, Id, XX, XX, 0 },
+Ia_testl_Ed_Gd = { "test", "testl", Ed, Gd, XX, XX, 0 },
+Ia_testl_Ed_Id = { "test", "testl", Ed, Id, XX, XX, 0 },
+Ia_testq_Eq_Gq = { "test", "testq", Eq, Gq, XX, XX, 0 },
+Ia_testq_Eq_sId = { "test", "testq", Eq, sIdq, XX, XX, 0 },
+Ia_testq_RAX_sId = { "test", "testq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_testw_AX_Iw = { "test", "testw", AX_Reg, Iw, XX, XX, 0 },
+Ia_testw_Ew_Gw = { "test", "testw", Ew, Gw, XX, XX, 0 },
+Ia_testw_Ew_Iw = { "test", "testw", Ew, Iw, XX, XX, 0 },
+Ia_tzcntl_Gd_Ed = { "tzcnt", "tzcntl", Gd, Ed, XX, XX, IA_BMI1 },
+Ia_tzcntq_Gq_Eq = { "tzcnt", "tzcntq", Gq, Eq, XX, XX, IA_BMI1 },
+Ia_tzcntw_Gw_Ew = { "tzcnt", "tzcntw", Gw, Ew, XX, XX, IA_BMI1 },
+Ia_tzmsk_By_Ey = { "tzmsk", "tzmsk", Gy, By, Ey, XX, IA_TBM },
+Ia_ucomisd_Vsd_Wsd = { "ucomisd", "ucomisd", Vsd, Wsd, XX, XX, IA_SSE2 },
+Ia_ucomiss_Vss_Wss = { "ucomiss", "ucomiss", Vss, Wss, XX, XX, IA_SSE },
+Ia_ud2a = { "ud2a", "ud2a", XX, XX, XX, XX, 0 },
+Ia_ud2b = { "ud2b", "ud2b", XX, XX, XX, XX, 0 },
+Ia_unpckhpd_Vpd_Wpd = { "unpckhpd", "unpckhpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_unpckhps_Vps_Wps = { "unpckhps", "unpckhps", Vps, Wps, XX, XX, IA_SSE },
+Ia_unpcklpd_Vpd_Wpd = { "unpcklpd", "unpcklpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_unpcklps_Vps_Wps = { "unpcklps", "unpcklps", Vps, Wps, XX, XX, IA_SSE },
+Ia_vaddpd_Vpd_Hpd_Wpd = { "vaddpd", "vaddpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vaddps_Vps_Hps_Wps = { "vaddps", "vaddps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vaddsd_Vsd_Hpd_Wsd = { "vaddsd", "vaddsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vaddss_Vss_Hps_Wss = { "vaddss", "vaddss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vaddsubpd_Vpd_Hpd_Wpd = { "vaddsubpd", "vaddsubpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vaddsubps_Vps_Hps_Wps = { "vaddsubps", "vaddsubps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vaesdec_Vdq_Hdq_Wdq = { "vaesdec", "vaesdec", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vaesdeclast_Vdq_Hdq_Wdq = { "vaesdeclast", "vaesdeclast", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vaesenc_Vdq_Hdq_Wdq = { "vaesenc", "vaesenc", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vaesenclast_Vdq_Hdq_Wdq = { "vaesenclast", "vaesenclast", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vaesimc_Vdq_Wdq = { "vaesimc", "vaesimc", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vaeskeygenassist_Vdq_Wdq_Ib = { "vaeskeygenassist", "vaeskeygenassist", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vandnpd_Vpd_Hpd_Wpd = { "vandnpd", "vandnpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vandnps_Vps_Hps_Wps = { "vandnps", "vandnps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vandpd_Vpd_Hpd_Wpd = { "vandpd", "vandpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vandps_Vps_Hps_Wps = { "vandps", "vandps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vblendpd_Vpd_Hpd_Wpd_Ib = { "vblendpd", "vblendpd", Vpd, Hpd, Wpd, Ib, IA_AVX },
+Ia_vblendps_Vps_Hps_Wps_Ib = { "vblendps", "vblendps", Vps, Hps, Wps, Ib, IA_AVX },
+Ia_vblendvpd_Vpd_Hpd_Wpd_Ib = { "vblendvpd", "vblendvpd", Vpd, Hpd, Wpd, VIb, IA_AVX },
+Ia_vblendvps_Vps_Hps_Wps_Ib = { "vblendvps", "vblendvps", Vps, Hps, Wps, VIb, IA_AVX },
+Ia_vbroadcastf128_Vdq_Mdq = { "vbroadcastf128", "vbroadcastf128", Vdq, Mdq, XX, XX, IA_AVX },
+Ia_vbroadcasti128_Vdq_Mdq = { "vbroadcasti128", "vbroadcasti128", Vdq, Mdq, XX, XX, IA_AVX2 },
+Ia_vbroadcastsd_Vpd_Wsd = { "vbroadcastsd", "vbroadcastsd", Vpd, Wsd, XX, XX, IA_AVX },
+Ia_vbroadcastss_Vps_Wss = { "vbroadcastss", "vbroadcastss", Vps, Wss, XX, XX, IA_AVX },
+Ia_vcmppd_Vpd_Hpd_Wpd_Ib = { "vcmppd", "vcmppd", Vpd, Hpd, Wpd, Ib, IA_AVX },
+Ia_vcmpps_Vps_Hps_Wps_Ib = { "vcmpps", "vcmpps", Vps, Hps, Wps, Ib, IA_AVX },
+Ia_vcmpsd_Vsd_Hpd_Wsd_Ib = { "vcmpsd", "vcmpsd", Vsd, Hpd, Wsd, Ib, IA_AVX },
+Ia_vcmpss_Vss_Hps_Wss_Ib = { "vcmpss", "vcmpss", Vss, Hps, Wss, Ib, IA_AVX },
+Ia_vcomisd_Vsd_Wsd = { "vcomisd", "vcomisd", Vsd, Wsd, XX, XX, IA_AVX },
+Ia_vcomiss_Vss_Wss = { "vcomiss", "vcomiss", Vss, Wss, XX, XX, IA_AVX },
+Ia_vcvtdq2pd_Vpd_Wq = { "vcvtdq2pd", "vcvtdq2pd", Vpd, Wq, XX, XX, IA_AVX },
+Ia_vcvtdq2ps_Vps_Wdq = { "vcvtdq2ps", "vcvtdq2ps", Vps, Wdq, XX, XX, IA_AVX },
+Ia_vcvtpd2dq_Vq_Wpd = { "vcvtpd2dq", "vcvtpd2dq", Vq, Wpd, XX, XX, IA_AVX },
+Ia_vcvtpd2ps_Vps_Wpd = { "vcvtpd2ps", "vcvtpd2ps", Vps, Wpd, XX, XX, IA_AVX },
+Ia_vcvtph2ps_Vps_Wq = { "vcvtph2ps", "vcvtph2ps", Vps, Wq, XX, XX, IA_AVX_F16C },
+Ia_vcvtps2dq_Vdq_Wps = { "vcvtps2dq", "vcvtps2dq", Vdq, Wps, XX, XX, IA_AVX },
+Ia_vcvtps2pd_Vpd_Wps = { "vcvtps2pd", "vcvtps2pd", Vpd, Wps, XX, XX, IA_AVX },
+Ia_vcvtps2ph_Wq_Vps_Ib = { "vcvtps2ph", "vcvtps2ph", Wq, Vps, Ib, XX, IA_AVX_F16C },
+Ia_vcvtsd2si_Gy_Wsd = { "vcvtsd2si", "vcvtsd2si", Gy, Wsd, XX, XX, IA_AVX },
+Ia_vcvtsd2ss_Vss_Hps_Wsd = { "vcvtsd2ss", "vcvtsd2ss", Vss, Hps, Wsd, XX, IA_AVX },
+Ia_vcvtsi2sd_Vsd_Hpd_Ey = { "vcvtsi2sd", "vcvtsi2sd", Vsd, Hpd, Ey, XX, IA_AVX },
+Ia_vcvtsi2ss_Vss_Hps_Ey = { "vcvtsi2ss", "vcvtsi2ss", Vss, Hps, Ey, XX, IA_AVX },
+Ia_vcvtss2sd_Vsd_Hpd_Wss = { "vcvtss2sd", "vcvtss2sd", Vsd, Hpd, Wss, XX, IA_AVX },
+Ia_vcvtss2si_Gy_Wss = { "vcvtss2si", "vcvtss2si", Gy, Wss, XX, XX, IA_AVX },
+Ia_vcvttpd2dq_Vq_Wpd = { "vcvttpd2dq", "vcvttpd2dq", Vq, Wpd, XX, XX, IA_AVX },
+Ia_vcvttps2dq_Vdq_Wps = { "vcvttps2dq", "vcvttps2dq", Vdq, Wps, XX, XX, IA_AVX },
+Ia_vcvttsd2si_Gy_Wsd = { "vcvttsd2si", "vcvttsd2si", Gy, Wsd, XX, XX, IA_AVX },
+Ia_vcvttss2si_Gy_Wss = { "vcvttss2si", "vcvttss2si", Gy, Wss, XX, XX, IA_AVX },
+Ia_vdivpd_Vpd_Hpd_Wpd = { "vdivpd", "vdivpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vdivps_Vps_Hps_Wps = { "vdivps", "vdivps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vdivsd_Vsd_Hpd_Wsd = { "vdivsd", "vdivsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vdivss_Vss_Hps_Wss = { "vdivss", "vdivss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vdppd_Vpd_Hpd_Wpd_Ib = { "vdppd", "vdppd", Vpd, Hpd, Wpd, Ib, IA_AVX },
+Ia_vdpps_Vps_Hps_Wps_Ib = { "vdpps", "vdpps", Vps, Hps, Wps, Ib, IA_AVX },
+Ia_verr = { "verr", "verr", Ew, XX, XX, XX, 0 },
+Ia_verw = { "verw", "verw", Ew, XX, XX, XX, 0 },
+Ia_vextractf128_Wdq_Vdq_Ib = { "vextractf128", "vextractf128", Wdq, Vdq, Ib, XX, IA_AVX },
+Ia_vextracti128_Wdq_Vdq_Ib = { "vextracti128", "vextracti128", Wdq, Vdq, Ib, XX, IA_AVX2 },
+Ia_vextractps_Ed_Vdq_Ib = { "vextractps", "vextractps", Ed, Vdq, Ib, XX, IA_AVX },
+Ia_vfmadd132pd_Vpd_Hpd_Wpd = { "vfmadd132pd", "vfmadd132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmadd132ps_Vps_Hps_Wps = { "vfmadd132ps", "vfmadd132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmadd132sd_Vpd_Hsd_Wsd = { "vfmadd132sd", "vfmadd132sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmadd132ss_Vps_Hss_Wss = { "vfmadd132ss", "vfmadd132ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmadd213pd_Vpd_Hpd_Wpd = { "vfmadd213pd", "vfmadd213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmadd213ps_Vps_Hps_Wps = { "vfmadd213ps", "vfmadd213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmadd213sd_Vpd_Hsd_Wsd = { "vfmadd213sd", "vfmadd213sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmadd213ss_Vps_Hss_Wss = { "vfmadd213ss", "vfmadd213ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmadd231pd_Vpd_Hpd_Wpd = { "vfmadd231pd", "vfmadd231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmadd231ps_Vps_Hps_Wps = { "vfmadd231ps", "vfmadd231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmadd231sd_Vpd_Hsd_Wsd = { "vfmadd231sd", "vfmadd231sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmadd231ss_Vps_Hss_Wss = { "vfmadd231ss", "vfmadd231ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmaddpd_Vpd_Hpd_VIb_Wpd = { "vfmaddpd", "vfmaddpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfmaddpd_Vpd_Hpd_Wpd_VIb = { "vfmaddpd", "vfmaddpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfmaddps_Vps_Hps_VIb_Wps = { "vfmaddps", "vfmaddps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfmaddps_Vps_Hps_Wps_VIb = { "vfmaddps", "vfmaddps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfmaddsd_Vsd_Hsd_VIb_Wsd = { "vfmaddsd", "vfmaddsd", Vsd, Hsd, VIb, Wsd, IA_FMA4 },
+Ia_vfmaddsd_Vsd_Hsd_Wsd_VIb = { "vfmaddsd", "vfmaddsd", Vsd, Hsd, Wsd, VIb, IA_FMA4 },
+Ia_vfmaddss_Vss_Hss_VIb_Wss = { "vfmaddss", "vfmaddss", Vss, Hss, VIb, Wss, IA_FMA4 },
+Ia_vfmaddss_Vss_Hss_Wss_VIb = { "vfmaddss", "vfmaddss", Vss, Hss, Wss, VIb, IA_FMA4 },
+Ia_vfmaddsub132pd_Vpd_Hpd_Wpd = { "vfmaddsub132pd", "vfmaddsub132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmaddsub132ps_Vps_Hps_Wps = { "vfmaddsub132ps", "vfmaddsub132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmaddsub213pd_Vpd_Hpd_Wpd = { "vfmaddsub213pd", "vfmaddsub213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmaddsub213ps_Vps_Hps_Wps = { "vfmaddsub213ps", "vfmaddsub213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmaddsub231pd_Vpd_Hpd_Wpd = { "vfmaddsub231pd", "vfmaddsub231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmaddsub231ps_Vps_Hps_Wps = { "vfmaddsub231ps", "vfmaddsub231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmaddsubpd_Vpd_Hpd_VIb_Wpd = { "vfmaddsubpd", "vfmaddsubpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfmaddsubpd_Vpd_Hpd_Wpd_VIb = { "vfmaddsubpd", "vfmaddsubpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfmaddsubps_Vps_Hps_VIb_Wps = { "vfmaddsubps", "vfmaddsubps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfmaddsubps_Vps_Hps_Wps_VIb = { "vfmaddsubps", "vfmaddsubps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfmsub132pd_Vpd_Hpd_Wpd = { "vfmsub132pd", "vfmsub132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsub132ps_Vps_Hps_Wps = { "vfmsub132ps", "vfmsub132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsub132sd_Vpd_Hsd_Wsd = { "vfmsub132sd", "vfmsub132sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmsub132ss_Vps_Hss_Wss = { "vfmsub132ss", "vfmsub132ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmsub213pd_Vpd_Hpd_Wpd = { "vfmsub213pd", "vfmsub213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsub213ps_Vps_Hps_Wps = { "vfmsub213ps", "vfmsub213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsub213sd_Vpd_Hsd_Wsd = { "vfmsub213sd", "vfmsub213sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmsub213ss_Vps_Hss_Wss = { "vfmsub213ss", "vfmsub213ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmsub231pd_Vpd_Hpd_Wpd = { "vfmsub231pd", "vfmsub231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsub231ps_Vps_Hps_Wps = { "vfmsub231ps", "vfmsub231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsub231sd_Vpd_Hsd_Wsd = { "vfmsub231sd", "vfmsub231sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfmsub231ss_Vps_Hss_Wss = { "vfmsub231ss", "vfmsub231ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfmsubadd132pd_Vpd_Hpd_Wpd = { "vfmsubadd132pd", "vfmsubadd132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsubadd132ps_Vps_Hps_Wps = { "vfmsubadd132ps", "vfmsubadd132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsubadd213pd_Vpd_Hpd_Wpd = { "vfmsubadd213pd", "vfmsubadd213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsubadd213ps_Vps_Hps_Wps = { "vfmsubadd213ps", "vfmsubadd213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsubadd231pd_Vpd_Hpd_Wpd = { "vfmsubadd231pd", "vfmsubadd231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfmsubadd231ps_Vps_Hps_Wps = { "vfmsubadd231ps", "vfmsubadd231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfmsubaddpd_Vpd_Hpd_VIb_Wpd = { "vfmsubaddpd", "vfmsubaddpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfmsubaddpd_Vpd_Hpd_Wpd_VIb = { "vfmsubaddpd", "vfmsubaddpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfmsubaddps_Vps_Hps_VIb_Wps = { "vfmsubaddps", "vfmsubaddps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfmsubaddps_Vps_Hps_Wps_VIb = { "vfmsubaddps", "vfmsubaddps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfmsubpd_Vpd_Hpd_VIb_Wpd = { "vfmsubpd", "vfmsubpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfmsubpd_Vpd_Hpd_Wpd_VIb = { "vfmsubpd", "vfmsubpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfmsubps_Vps_Hps_VIb_Wps = { "vfmsubps", "vfmsubps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfmsubps_Vps_Hps_Wps_VIb = { "vfmsubps", "vfmsubps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfmsubsd_Vsd_Hsd_VIb_Wsd = { "vfmsubsd", "vfmsubsd", Vsd, Hsd, VIb, Wsd, IA_FMA4 },
+Ia_vfmsubsd_Vsd_Hsd_Wsd_VIb = { "vfmsubsd", "vfmsubsd", Vsd, Hsd, Wsd, VIb, IA_FMA4 },
+Ia_vfmsubss_Vss_Hss_VIb_Wss = { "vfmsubss", "vfmsubss", Vss, Hss, VIb, Wss, IA_FMA4 },
+Ia_vfmsubss_Vss_Hss_Wss_VIb = { "vfmsubss", "vfmsubss", Vss, Hss, Wss, VIb, IA_FMA4 },
+Ia_vfnmadd132pd_Vpd_Hpd_Wpd = { "vfnmadd132pd", "vfnmadd132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmadd132ps_Vps_Hps_Wps = { "vfnmadd132ps", "vfnmadd132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmadd132sd_Vpd_Hsd_Wsd = { "vfnmadd132sd", "vfnmadd132sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmadd132ss_Vps_Hss_Wss = { "vfnmadd132ss", "vfnmadd132ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmadd213pd_Vpd_Hpd_Wpd = { "vfnmadd213pd", "vfnmadd213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmadd213ps_Vps_Hps_Wps = { "vfnmadd213ps", "vfnmadd213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmadd213sd_Vpd_Hsd_Wsd = { "vfnmadd213sd", "vfnmadd213sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmadd213ss_Vps_Hss_Wss = { "vfnmadd213ss", "vfnmadd213ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmadd231pd_Vpd_Hpd_Wpd = { "vfnmadd231pd", "vfnmadd231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmadd231ps_Vps_Hps_Wps = { "vfnmadd231ps", "vfnmadd231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmadd231sd_Vpd_Hsd_Wsd = { "vfnmadd231sd", "vfnmadd231sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmadd231ss_Vps_Hss_Wss = { "vfnmadd231ss", "vfnmadd231ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmaddpd_Vpd_Hpd_VIb_Wpd = { "vfnmaddpd", "vfnmaddpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfnmaddpd_Vpd_Hpd_Wpd_VIb = { "vfnmaddpd", "vfnmaddpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfnmaddps_Vps_Hps_VIb_Wps = { "vfnmaddps", "vfnmaddps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfnmaddps_Vps_Hps_Wps_VIb = { "vfnmaddps", "vfnmaddps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfnmaddsd_Vsd_Hsd_VIb_Wsd = { "vfnmaddsd", "vfnmaddsd", Vsd, Hsd, VIb, Wsd, IA_FMA4 },
+Ia_vfnmaddsd_Vsd_Hsd_Wsd_VIb = { "vfnmaddsd", "vfnmaddsd", Vsd, Hsd, Wsd, VIb, IA_FMA4 },
+Ia_vfnmaddss_Vss_Hss_VIb_Wss = { "vfnmaddss", "vfnmaddss", Vss, Hss, VIb, Wss, IA_FMA4 },
+Ia_vfnmaddss_Vss_Hss_Wss_VIb = { "vfnmaddss", "vfnmaddss", Vss, Hss, Wss, VIb, IA_FMA4 },
+Ia_vfnmsub132pd_Vpd_Hpd_Wpd = { "vfnmsub132pd", "vfnmsub132pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmsub132ps_Vps_Hps_Wps = { "vfnmsub132ps", "vfnmsub132ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmsub132sd_Vpd_Hsd_Wsd = { "vfnmsub132sd", "vfnmsub132sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmsub132ss_Vps_Hss_Wss = { "vfnmsub132ss", "vfnmsub132ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmsub213pd_Vpd_Hpd_Wpd = { "vfnmsub213pd", "vfnmsub213pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmsub213ps_Vps_Hps_Wps = { "vfnmsub213ps", "vfnmsub213ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmsub213sd_Vpd_Hsd_Wsd = { "vfnmsub213sd", "vfnmsub213sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmsub213ss_Vps_Hss_Wss = { "vfnmsub213ss", "vfnmsub213ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmsub231pd_Vpd_Hpd_Wpd = { "vfnmsub231pd", "vfnmsub231pd", Vpd, Hpd, Wpd, XX, IA_AVX_FMA },
+Ia_vfnmsub231ps_Vps_Hps_Wps = { "vfnmsub231ps", "vfnmsub231ps", Vps, Hps, Wps, XX, IA_AVX_FMA },
+Ia_vfnmsub231sd_Vpd_Hsd_Wsd = { "vfnmsub231sd", "vfnmsub231sd", Vpd, Hsd, Wsd, XX, IA_AVX_FMA },
+Ia_vfnmsub231ss_Vps_Hss_Wss = { "vfnmsub231ss", "vfnmsub231ss", Vps, Hss, Wss, XX, IA_AVX_FMA },
+Ia_vfnmsubpd_Vpd_Hpd_VIb_Wpd = { "vfnmsubpd", "vfnmsubpd", Vpd, Hpd, VIb, Wpd, IA_FMA4 },
+Ia_vfnmsubpd_Vpd_Hpd_Wpd_VIb = { "vfnmsubpd", "vfnmsubpd", Vpd, Hpd, Wpd, VIb, IA_FMA4 },
+Ia_vfnmsubps_Vps_Hps_VIb_Wps = { "vfnmsubps", "vfnmsubps", Vps, Hps, VIb, Wps, IA_FMA4 },
+Ia_vfnmsubps_Vps_Hps_Wps_VIb = { "vfnmsubps", "vfnmsubps", Vps, Hps, Wps, VIb, IA_FMA4 },
+Ia_vfnmsubsd_Vsd_Hsd_VIb_Wsd = { "vfnmsubsd", "vfnmsubsd", Vsd, Hsd, VIb, Wsd, IA_FMA4 },
+Ia_vfnmsubsd_Vsd_Hsd_Wsd_VIb = { "vfnmsubsd", "vfnmsubsd", Vsd, Hsd, Wsd, VIb, IA_FMA4 },
+Ia_vfnmsubss_Vss_Hss_VIb_Wss = { "vfnmsubss", "vfnmsubss", Vss, Hss, VIb, Wss, IA_FMA4 },
+Ia_vfnmsubss_Vss_Hss_Wss_VIb = { "vfnmsubss", "vfnmsubss", Vss, Hss, Wss, VIb, IA_FMA4 },
+Ia_vgatherdd_Vdq_VSib_Hdq = { "vgatherdd", "vgatherdd", Vdq, VSib, Hdq, XX, IA_AVX2 },
+Ia_vgatherdpd_Vpd_VSib_Hpd = { "vgatherdpd", "vgatherdpd", Vpd, VSib, Hpd, XX, IA_AVX2 },
+Ia_vgatherdps_Vps_VSib_Hps = { "vgatherdps", "vgatherdps", Vps, VSib, Hps, XX, IA_AVX2 },
+Ia_vgatherdq_Vdq_VSib_Hdq = { "vgatherdq", "vgatherdq", Vdq, VSib, Hdq, XX, IA_AVX2 },
+Ia_vgatherqd_Vdq_VSib_Hdq = { "vgatherqd", "vgatherqd", Vdq, VSib, Hdq, XX, IA_AVX2 },
+Ia_vgatherqpd_Vpd_VSib_Hpd = { "vgatherqpd", "vgatherqpd", Vpd, VSib, Hpd, XX, IA_AVX2 },
+Ia_vgatherqps_Vps_VSib_Hps = { "vgatherqps", "vgatherqps", Vps, VSib, Hps, XX, IA_AVX2 },
+Ia_vgatherqq_Vdq_VSib_Hdq = { "vgatherqq", "vgatherqq", Vdq, VSib, Hdq, XX, IA_AVX2 },
+Ia_vhaddpd_Vpd_Hpd_Wpd = { "vhaddpd", "vhaddpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vhaddps_Vps_Hps_Wps = { "vhaddps", "vhaddps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vhsubpd_Vpd_Hpd_Wpd = { "vhsubpd", "vhsubpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vhsubps_Vps_Hps_Wps = { "vhsubps", "vhsubps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vinsertf128_Vdq_Hdq_Wdq_Ib = { "vinsertf128", "vinsertf128", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vinserti128_Vdq_Hdq_Wdq_Ib = { "vinserti128", "vinserti128", Vdq, Hdq, Wdq, Ib, IA_AVX2 },
+Ia_vinsertps_Vps_Hps_Wss_Ib = { "vinsertps", "vinsertps", Vps, Hps, Wss, Ib, IA_AVX },
+Ia_vlddqu_Vdq_Mdq = { "vlddqu", "vlddqu", Vdq, Mdq, XX, XX, IA_AVX },
+Ia_vldmxcsr = { "vldmxcsr", "vldmxcsr", Md, XX, XX, XX, IA_AVX },
+Ia_vmaskmovd_Mdq_Hdq_Vdq = { "vmaskmovd", "vmaskmovd", Mdq, Hdq, Vdq, XX, IA_AVX2 },
+Ia_vmaskmovd_Vdq_Hdq_Mdq = { "vmaskmovd", "vmaskmovd", Vdq, Hdq, Mdq, XX, IA_AVX2 },
+Ia_vmaskmovdqu_Vdq_Udq = { "vmaskmovdqu", "vmaskmovdqu", Vdq, Udq, XX, XX, IA_AVX },
+Ia_vmaskmovpd_Mpd_Hpd_Vpd = { "vmaskmovpd", "vmaskmovpd", Mpd, Hpd, Vpd, XX, IA_AVX },
+Ia_vmaskmovpd_Vpd_Hpd_Mpd = { "vmaskmovpd", "vmaskmovpd", Vpd, Hpd, Mpd, XX, IA_AVX },
+Ia_vmaskmovps_Mps_Hps_Vps = { "vmaskmovps", "vmaskmovps", Mps, Hps, Vps, XX, IA_AVX },
+Ia_vmaskmovps_Vps_Hps_Mps = { "vmaskmovps", "vmaskmovps", Vps, Hps, Mps, XX, IA_AVX },
+Ia_vmaskmovq_Mdq_Hdq_Vdq = { "vmaskmovq", "vmaskmovq", Mdq, Hdq, Vdq, XX, IA_AVX2 },
+Ia_vmaskmovq_Vdq_Hdq_Mdq = { "vmaskmovq", "vmaskmovq", Vdq, Hdq, Mdq, XX, IA_AVX2 },
+Ia_vmaxpd_Vpd_Hpd_Wpd = { "vmaxpd", "vmaxpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vmaxps_Vps_Hps_Wps = { "vmaxps", "vmaxps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vmaxsd_Vsd_Hpd_Wsd = { "vmaxsd", "vmaxsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vmaxss_Vss_Hps_Wss = { "vmaxss", "vmaxss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vmcall = { "vmcall", "vmcall", XX, XX, XX, XX, IA_VMX },
+Ia_vmclear_Mq = { "vmclear", "vmclear", Mq, XX, XX, XX, IA_VMX },
+Ia_vmfunc = { "vmfunc", "vmfunc", EAX_Reg, XX, XX, XX, IA_VMX },
+Ia_vminpd_Vpd_Hpd_Wpd = { "vminpd", "vminpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vminps_Vps_Hps_Wps = { "vminps", "vminps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vminsd_Vsd_Hpd_Wsd = { "vminsd", "vminsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vminss_Vss_Hps_Wss = { "vminss", "vminss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vmlaunch = { "vmlaunch", "vmlaunch", XX, XX, XX, XX, IA_VMX },
+Ia_vmload = { "vmload", "vmload", RAX_Reg, XX, XX, XX, IA_SVM },
+Ia_vmmcall = { "vmmcall", "vmmcall", XX, XX, XX, XX, IA_SVM },
+Ia_vmovapd_Vpd_Wpd = { "vmovapd", "vmovapd", Vpd, Wpd, XX, XX, IA_AVX },
+Ia_vmovapd_Wpd_Vpd = { "vmovapd", "vmovapd", Wpd, Vpd, XX, XX, IA_AVX },
+Ia_vmovaps_Vps_Wps = { "vmovaps", "vmovaps", Vps, Wps, XX, XX, IA_AVX },
+Ia_vmovaps_Wps_Vps = { "vmovaps", "vmovaps", Wps, Vps, XX, XX, IA_AVX },
+Ia_vmovd_Ed_Vd = { "vmovd", "vmovd", Ed, Vdq, XX, XX, IA_AVX },
+Ia_vmovd_Vdq_Ed = { "vmovd", "vmovd", Vdq, Ed, XX, XX, IA_AVX },
+Ia_vmovddup_Vdq_Wq = { "vmovddup", "vmovddup", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vmovdqa_Vdq_Wdq = { "vmovdqa", "vmovdqa", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vmovdqa_Wdq_Vdq = { "vmovdqa", "vmovdqa", Wdq, Vdq, XX, XX, IA_AVX },
+Ia_vmovdqu_Vdq_Wdq = { "vmovdqu", "vmovdqu", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vmovdqu_Wdq_Vdq = { "vmovdqu", "vmovdqu", Wdq, Vdq, XX, XX, IA_AVX },
+Ia_vmovhlpd_Vpd_Hdq_Udq = { "vmovhlpd", "vmovhlpd", Vpd, Hdq, Udq, XX, IA_AVX },
+Ia_vmovhlps_Vps_Hdq_Udq = { "vmovhlps", "vmovhlps", Vps, Hdq, Udq, XX, IA_AVX },
+Ia_vmovhpd_Mq_Vpd = { "vmovhpd", "vmovhpd", Mq, Vpd, XX, XX, IA_AVX },
+Ia_vmovhpd_Vpd_Hdq_Mq = { "vmovhpd", "vmovhpd", Vpd, Hdq, Mq, XX, IA_AVX },
+Ia_vmovhps_Mq_Vps = { "vmovhps", "vmovhps", Mq, Vps, XX, XX, IA_AVX },
+Ia_vmovhps_Vps_Hdq_Mq = { "vmovhps", "vmovhps", Vps, Hdq, Mq, XX, IA_AVX },
+Ia_vmovlhpd_Vpd_Hdq_Udq = { "vmovlhpd", "vmovlhpd", Vpd, Hdq, Udq, XX, IA_AVX },
+Ia_vmovlhps_Vps_Hdq_Udq = { "vmovlhps", "vmovlhps", Vps, Hdq, Udq, XX, IA_AVX },
+Ia_vmovlpd_Mq_Vpd = { "vmovlpd", "vmovlpd", Mq, Vpd, XX, XX, IA_AVX },
+Ia_vmovlpd_Vpd_Hdq_Mq = { "vmovlpd", "vmovlpd", Vpd, Hdq, Mq, XX, IA_AVX },
+Ia_vmovlps_Mq_Vps = { "vmovlps", "vmovlps", Mq, Vps, XX, XX, IA_AVX },
+Ia_vmovlps_Vps_Hdq_Mq = { "vmovlps", "vmovlps", Vps, Hdq, Mq, XX, IA_AVX },
+Ia_vmovmskpd_Gd_Upd = { "vmovmskpd", "vmovmskpd", Gd, Upd, XX, XX, IA_AVX },
+Ia_vmovmskps_Gd_Ups = { "vmovmskps", "vmovmskps", Gd, Ups, XX, XX, IA_AVX },
+Ia_vmovntdq_Mdq_Vdq = { "vmovntdq", "vmovntdq", Mdq, Vdq, XX, XX, IA_AVX },
+Ia_vmovntdqa_Vdq_Mdq = { "vmovntdqa", "vmovntdqa", Vdq, Mdq, XX, XX, IA_AVX },
+Ia_vmovntpd_Mpd_Vpd = { "vmovntpd", "vmovntpd", Mpd, Vpd, XX, XX, IA_AVX },
+Ia_vmovntps_Mps_Vps = { "vmovntps", "vmovntps", Mps, Vps, XX, XX, IA_AVX },
+Ia_vmovq_Eq_Vq = { "vmovq", "vmovq", Eq, Vq, XX, XX, IA_AVX },
+Ia_vmovq_Vdq_Eq = { "vmovq", "vmovq", Vdq, Eq, XX, XX, IA_AVX },
+Ia_vmovq_Vq_Wq = { "vmovq", "vmovq", Vq, Wq, XX, XX, IA_AVX },
+Ia_vmovq_Wq_Vq = { "vmovq", "vmovq", Wq, Vq, XX, XX, IA_AVX },
+Ia_vmovsd_Vsd_Wsd = { "vmovsd", "vmovsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vmovsd_Wsd_Vsd = { "vmovsd", "vmovsd", Wsd, Vsd, XX, XX, IA_AVX },
+Ia_vmovshdup_Vdq_Wdq = { "vmovshdup", "vmovshdup", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vmovsldup_Vdq_Wdq = { "vmovsldup", "vmovsldup", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vmovss_Vss_Wss = { "vmovss", "vmovss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vmovss_Wss_Vss = { "vmovss", "vmovss", Wss, Vss, XX, XX, IA_AVX },
+Ia_vmovupd_Vpd_Wpd = { "vmovupd", "vmovupd", Vpd, Wpd, XX, XX, IA_AVX },
+Ia_vmovupd_Wpd_Vpd = { "vmovupd", "vmovupd", Wpd, Vpd, XX, XX, IA_AVX },
+Ia_vmovups_Vps_Wps = { "vmovups", "vmovups", Vps, Wps, XX, XX, IA_AVX },
+Ia_vmovups_Wps_Vps = { "vmovups", "vmovups", Wps, Vps, XX, XX, IA_AVX },
+Ia_vmpsadbw_Vdq_Hdq_Wdq_Ib = { "vmpsadbw", "vmpsadbw", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vmptrld_Mq = { "vmptrld", "vmptrld", Mq, XX, XX, XX, IA_VMX },
+Ia_vmptrst_Mq = { "vmptrst", "vmptrst", Mq, XX, XX, XX, IA_VMX },
+Ia_vmread_Ed_Gd = { "vmread", "vmread", Ed, Gd, XX, XX, IA_VMX },
+Ia_vmread_Eq_Gq = { "vmread", "vmread", Eq, Gq, XX, XX, IA_VMX },
+Ia_vmresume = { "vmresume", "vmresume", XX, XX, XX, XX, IA_VMX },
+Ia_vmrun = { "vmrun", "vmrun", RAX_Reg, XX, XX, XX, IA_SVM },
+Ia_vmsave = { "vmsave", "vmsave", RAX_Reg, XX, XX, XX, IA_SVM },
+Ia_vmulpd_Vpd_Hpd_Wpd = { "vmulpd", "vmulpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vmulps_Vps_Hps_Wps = { "vmulps", "vmulps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vmulsd_Vsd_Hpd_Wsd = { "vmulsd", "vmulsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vmulss_Vss_Hps_Wss = { "vmulss", "vmulss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vmwrite_Gd_Ed = { "vmwrite", "vmwrite", Gd, Ed, XX, XX, IA_VMX },
+Ia_vmwrite_Gq_Eq = { "vmwrite", "vmwrite", Gq, Eq, XX, XX, IA_VMX },
+Ia_vmxoff = { "vmxoff", "vmxoff", XX, XX, XX, XX, IA_VMX },
+Ia_vmxon_Mq = { "vmxon", "vmxon", Mq, XX, XX, XX, IA_VMX },
+Ia_vorpd_Vpd_Hpd_Wpd = { "vorpd", "vorpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vorps_Vps_Hps_Wps = { "vorps", "vorps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vpabsb_Vdq_Hdq_Wdq = { "vpabsb", "vpabsb", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vpabsd_Vdq_Hdq_Wdq = { "vpabsd", "vpabsd", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vpabsw_Vdq_Hdq_Wdq = { "vpabsw", "vpabsw", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vpackssdw_Vdq_Hdq_Wdq = { "vpackssdw", "vpackssdw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpacksswb_Vdq_Hdq_Wdq = { "vpacksswb", "vpacksswb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpackusdw_Vdq_Hdq_Wdq = { "vpackusdw", "vpackusdw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpackuswb_Vdq_Hdq_Wdq = { "vpackuswb", "vpackuswb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddb_Vdq_Hdq_Wdq = { "vpaddb", "vpaddb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddd_Vdq_Hdq_Wdq = { "vpaddd", "vpaddd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddq_Vdq_Hdq_Wdq = { "vpaddq", "vpaddq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddsb_Vdq_Hdq_Wdq = { "vpaddsb", "vpaddsb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddsw_Vdq_Hdq_Wdq = { "vpaddsw", "vpaddsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddusb_Vdq_Hdq_Wdq = { "vpaddusb", "vpaddusb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddusw_Vdq_Hdq_Wdq = { "vpaddusw", "vpaddusw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpaddw_Vdq_Hdq_Wdq = { "vpaddw", "vpaddw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpalignr_Vdq_Hdq_Wdq_Ib = { "vpalignr", "vpalignr", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vpand_Vdq_Hdq_Wdq = { "vpand", "vpand", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpandn_Vdq_Hdq_Wdq = { "vpandn", "vpandn", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpavgb_Vdq_Hdq_Wdq = { "vpavgb", "vpavgb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpavgw_Vdq_Hdq_Wdq = { "vpavgw", "vpavgw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpblendd_Vdq_Hdq_Wdq_Ib = { "vpblendd", "vpblendd", Vdq, Hdq, Wdq, Ib, IA_AVX2 },
+Ia_vpblendvb_Vdq_Hdq_Wdq_Ib = { "vpblendvb", "vpblendvb", Vdq, Hdq, Wdq, VIb, IA_AVX },
+Ia_vpblendw_Vdq_Hdq_Wdq_Ib = { "vpblendw", "vpblendw", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vpbroadcastb_Vdq_Wb = { "vpbroadcastb", "vpbroadcastb", Vdq, Wb, XX, XX, IA_AVX2 },
+Ia_vpbroadcastd_Vdq_Wd = { "vpbroadcastd", "vpbroadcastd", Vdq, Wd, XX, XX, IA_AVX2 },
+Ia_vpbroadcastq_Vdq_Wq = { "vpbroadcastq", "vpbroadcastq", Vdq, Wq, XX, XX, IA_AVX2 },
+Ia_vpbroadcastw_Vdq_Ww = { "vpbroadcastw", "vpbroadcastw", Vdq, Ww, XX, XX, IA_AVX2 },
+Ia_vpclmulqdq_Vdq_Hdq_Wdq_Ib = { "vpclmulqdq", "vpclmulqdq", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vpcmov_Vdq_Hdq_VIb_Wdq = { "vpcmov", "vpcmov", Vdq, Hdq, VIb, Wdq, IA_XOP },
+Ia_vpcmov_Vdq_Hdq_Wdq_VIb = { "vpcmov", "vpcmov", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpcmpeqb_Vdq_Hdq_Wdq = { "vpcmpeqb", "vpcmpeqb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpeqd_Vdq_Hdq_Wdq = { "vpcmpeqd", "vpcmpeqd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpeqq_Vdq_Hdq_Wdq = { "vpcmpeqq", "vpcmpeqq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpeqw_Vdq_Hdq_Wdq = { "vpcmpeqw", "vpcmpeqw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpestri_Vdq_Wdq_Ib = { "vpcmpestri", "vpcmpestri", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpcmpestrm_Vdq_Wdq_Ib = { "vpcmpestrm", "vpcmpestrm", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpcmpgtb_Vdq_Hdq_Wdq = { "vpcmpgtb", "vpcmpgtb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpgtd_Vdq_Hdq_Wdq = { "vpcmpgtd", "vpcmpgtd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpgtq_Vdq_Hdq_Wdq = { "vpcmpgtq", "vpcmpgtq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpgtw_Vdq_Hdq_Wdq = { "vpcmpgtw", "vpcmpgtw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpcmpistri_Vdq_Wdq_Ib = { "vpcmpistri", "vpcmpistri", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpcmpistrm_Vdq_Wdq_Ib = { "vpcmpistrm", "vpcmpistrm", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpcomb_Vdq_Hdq_Wdq_Ib = { "vpcomb", "vpcomb", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomd_Vdq_Hdq_Wdq_Ib = { "vpcomd", "vpcomd", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomq_Vdq_Hdq_Wdq_Ib = { "vpcomq", "vpcomq", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomub_Vdq_Hdq_Wdq_Ib = { "vpcomub", "vpcomub", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomud_Vdq_Hdq_Wdq_Ib = { "vpcomud", "vpcomud", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomuq_Vdq_Hdq_Wdq_Ib = { "vpcomuq", "vpcomuq", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomuw_Vdq_Hdq_Wdq_Ib = { "vpcomuw", "vpcomuw", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vpcomw_Vdq_Hdq_Wdq_Ib = { "vpcomw", "vpcomw", Vdq, Hdq, Wdq, Ib, IA_XOP },
+Ia_vperm2f128_Vdq_Hdq_Wdq_Ib = { "vperm2f128", "vperm2f128", Vdq, Hdq, Wdq, Ib, IA_AVX },
+Ia_vperm2i128_Vdq_Hdq_Wdq_Ib = { "vperm2i128", "vperm2i128", Vdq, Hdq, Wdq, Ib, IA_AVX2 },
+Ia_vpermd_Vdq_Hdq_Wdq = { "vpermd", "vpermd", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpermilpd_Vpd_Hpd_Wpd = { "vpermilpd", "vpermilpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vpermilpd_Vpd_Wpd_Ib = { "vpermilpd", "vpermilpd", Vpd, Wpd, Ib, XX, IA_AVX },
+Ia_vpermilps_Vps_Hps_Wps = { "vpermilps", "vpermilps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vpermilps_Vps_Wps_Ib = { "vpermilps", "vpermilps", Vps, Wps, Ib, XX, IA_AVX },
+Ia_vpermpd_Vpd_Wpd_Ib = { "vpermpd", "vpermpd", Vpd, Wpd, Ib, XX, IA_AVX2 },
+Ia_vpermps_Vps_Hps_Wps = { "vpermps", "vpermps", Vps, Hps, Wps, XX, IA_AVX2 },
+Ia_vpermq_Vdq_Wdq_Ib = { "vpermq", "vpermq", Vdq, Wdq, Ib, XX, IA_AVX2 },
+Ia_vpextrb_Ebd_Vdq_Ib = { "vpextrb", "vpextrb", Ebd, Vdq, Ib, XX, IA_AVX },
+Ia_vpextrd_Ed_Vdq_Ib = { "vpextrd", "vpextrd", Ed, Vdq, Ib, XX, IA_AVX },
+Ia_vpextrq_Eq_Vdq_Ib = { "vpextrq", "vpextrq", Eq, Vdq, Ib, XX, IA_AVX },
+Ia_vpextrw_Ewd_Vdq_Ib = { "vpextrw", "vpextrw", Ewd, Vdq, Ib, XX, IA_AVX },
+Ia_vpextrw_Gd_Udq_Ib = { "vpextrw", "vpextrw", Gd, Udq, Ib, XX, IA_AVX },
+Ia_vphaddbd_Vdq_Wdq = { "vphaddbd", "vphaddbd", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddbq_Vdq_Wdq = { "vphaddbq", "vphaddbq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddbw_Vdq_Wdq = { "vphaddbw", "vphaddbw", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddd_Vdq_Hdq_Wdq = { "vphaddd", "vphaddd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphadddq_Vdq_Wdq = { "vphadddq", "vphadddq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddsw_Vdq_Hdq_Wdq = { "vphaddsw", "vphaddsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphaddubd_Vdq_Wdq = { "vphaddubd", "vphaddubd", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddubq_Vdq_Wdq = { "vphaddubq", "vphaddubq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddubw_Vdq_Wdq = { "vphaddubw", "vphaddubw", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddudq_Vdq_Wdq = { "vphaddudq", "vphaddudq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphadduwd_Vdq_Wdq = { "vphadduwd", "vphadduwd", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphadduwq_Vdq_Wdq = { "vphadduwq", "vphadduwq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddw_Vdq_Hdq_Wdq = { "vphaddw", "vphaddw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphaddwd_Vdq_Wdq = { "vphaddwd", "vphaddwd", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphaddwq_Vdq_Wdq = { "vphaddwq", "vphaddwq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphminposuw_Vdq_Wdq = { "vphminposuw", "vphminposuw", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vphsubbw_Vdq_Wdq = { "vphsubbw", "vphsubbw", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphsubd_Vdq_Hdq_Wdq = { "vphsubd", "vphsubd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphsubdq_Vdq_Wdq = { "vphsubdq", "vphsubdq", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vphsubsw_Vdq_Hdq_Wdq = { "vphsubsw", "vphsubsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphsubw_Vdq_Hdq_Wdq = { "vphsubw", "vphsubw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vphsubwd_Vdq_Wdq = { "vphsubwd", "vphsubwd", Vdq, Wdq, XX, XX, IA_XOP },
+Ia_vpinsrb_Vdq_Hdq_Ew_Ib = { "vpinsrb", "vpinsrb", Vdq, Hdq, Ew, Ib, IA_AVX },
+Ia_vpinsrd_Vdq_Hdq_Ed_Ib = { "vpinsrd", "vpinsrd", Vdq, Hdq, Ed, Ib, IA_AVX },
+Ia_vpinsrq_Vdq_Hdq_Eq_Ib = { "vpinsrq", "vpinsrq", Vdq, Hdq, Eq, Ib, IA_AVX },
+Ia_vpinsrw_Vdq_Hdq_Ew_Ib = { "vpinsrw", "vpinsrw", Vdq, Hdq, Ew, Ib, IA_AVX },
+Ia_vpmacsdd_Vdq_Hdq_Wdq_VIb = { "vpmacsdd", "vpmacsdd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacsdqh_Vdq_Hdq_Wdq_VIb = { "vpmacsdqh", "vpmacsdqh", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacsdql_Vdq_Hdq_Wdq_VIb = { "vpmacsdql", "vpmacsdql", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacssdd_Vdq_Hdq_Wdq_VIb = { "vpmacssdd", "vpmacssdd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacssdqh_Vdq_Hdq_Wdq_VIb = { "vpmacssdqh", "vpmacssdqh", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacssdql_Vdq_Hdq_Wdq_VIb = { "vpmacssdql", "vpmacssdql", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacsswd_Vdq_Hdq_Wdq_VIb = { "vpmacsswd", "vpmacsswd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacssww_Vdq_Hdq_Wdq_VIb = { "vpmacssww", "vpmacssww", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacswd_Vdq_Hdq_Wdq_VIb = { "vpmacswd", "vpmacswd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmacsww_Vdq_Hdq_Wdq_VIb = { "vpmacsww", "vpmacsww", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmadcsswd_Vdq_Hdq_Wdq_VIb = { "vpmadcsswd", "vpmadcsswd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmadcswd_Vdq_Hdq_Wdq_VIb = { "vpmadcswd", "vpmadcswd", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vpmaddubsw_Vdq_Hdq_Wdq = { "vpmaddubsw", "vpmaddubsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaddwd_Vdq_Hdq_Wdq = { "vpmaddwd", "vpmaddwd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxsb_Vdq_Hdq_Wdq = { "vpmaxsb", "vpmaxsb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxsd_Vdq_Hdq_Wdq = { "vpmaxsd", "vpmaxsd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxsw_Vdq_Hdq_Wdq = { "vpmaxsw", "vpmaxsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxub_Vdq_Hdq_Wdq = { "vpmaxub", "vpmaxub", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxud_Vdq_Hdq_Wdq = { "vpmaxud", "vpmaxud", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmaxuw_Vdq_Hdq_Wdq = { "vpmaxuw", "vpmaxuw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminsb_Vdq_Hdq_Wdq = { "vpminsb", "vpminsb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminsd_Vdq_Hdq_Wdq = { "vpminsd", "vpminsd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminsw_Vdq_Hdq_Wdq = { "vpminsw", "vpminsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminub_Vdq_Hdq_Wdq = { "vpminub", "vpminub", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminud_Vdq_Hdq_Wdq = { "vpminud", "vpminud", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpminuw_Vdq_Hdq_Wdq = { "vpminuw", "vpminuw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmovmskb_Gd_Udq = { "vpmovmskb", "vpmovmskb", Gd, Udq, XX, XX, IA_AVX },
+Ia_vpmovsxbd_Vdq_Wd = { "vpmovsxbd", "vpmovsxbd", Vdq, Wd, XX, XX, IA_AVX },
+Ia_vpmovsxbq_Vdq_Ww = { "vpmovsxbq", "vpmovsxbq", Vdq, Ww, XX, XX, IA_AVX },
+Ia_vpmovsxbw_Vdq_Wq = { "vpmovsxbw", "vpmovsxbw", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovsxdq_Vdq_Wq = { "vpmovsxdq", "vpmovsxdq", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovsxwd_Vdq_Wq = { "vpmovsxwd", "vpmovsxwd", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovsxwq_Vdq_Wd = { "vpmovsxwq", "vpmovsxwq", Vdq, Wd, XX, XX, IA_AVX },
+Ia_vpmovzxbd_Vdq_Wd = { "vpmovzxbd", "vpmovzxbd", Vdq, Wd, XX, XX, IA_AVX },
+Ia_vpmovzxbq_Vdq_Ww = { "vpmovzxbq", "vpmovzxbq", Vdq, Ww, XX, XX, IA_AVX },
+Ia_vpmovzxbw_Vdq_Wq = { "vpmovzxbw", "vpmovzxbw", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovzxdq_Vdq_Wq = { "vpmovzxdq", "vpmovzxdq", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovzxwd_Vdq_Wq = { "vpmovzxwd", "vpmovzxwd", Vdq, Wq, XX, XX, IA_AVX },
+Ia_vpmovzxwq_Vdq_Wd = { "vpmovzxwq", "vpmovzxwq", Vdq, Wd, XX, XX, IA_AVX },
+Ia_vpmuldq_Vdq_Hdq_Wdq = { "vpmuldq", "vpmuldq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmulhrsw_Vdq_Hdq_Wdq = { "vpmulhrsw", "vpmulhrsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmulhuw_Vdq_Hdq_Wdq = { "vpmulhuw", "vpmulhuw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmulhw_Vdq_Hdq_Wdq = { "vpmulhw", "vpmulhw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmulld_Vdq_Hdq_Wdq = { "vpmulld", "vpmulld", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmullw_Vdq_Hdq_Wdq = { "vpmullw", "vpmullw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpmuludq_Vdq_Hdq_Wdq = { "vpmuludq", "vpmuludq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpor_Vdq_Hdq_Wdq = { "vpor", "vpor", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpperm_Vdq_Hdq_VIb_Wdq = { "vpperm", "vpperm", Vdq, Hdq, VIb, Wdq, IA_XOP },
+Ia_vpperm_Vdq_Hdq_Wdq_VIb = { "vpperm", "vpperm", Vdq, Hdq, Wdq, VIb, IA_XOP },
+Ia_vprotb_Vdq_Hdq_Wdq = { "vprotb", "vprotb", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vprotb_Vdq_Wdq_Hdq = { "vprotb", "vprotb", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vprotb_Vdq_Wdq_Ib = { "vprotb", "vprotb", Vdq, Wdq, Ib, XX, IA_XOP },
+Ia_vprotd_Vdq_Hdq_Wdq = { "vprotd", "vprotd", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vprotd_Vdq_Wdq_Hdq = { "vprotd", "vprotd", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vprotd_Vdq_Wdq_Ib = { "vprotd", "vprotd", Vdq, Wdq, Ib, XX, IA_XOP },
+Ia_vprotq_Vdq_Hdq_Wdq = { "vprotq", "vprotq", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vprotq_Vdq_Wdq_Hdq = { "vprotq", "vprotq", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vprotq_Vdq_Wdq_Ib = { "vprotq", "vprotq", Vdq, Wdq, Ib, XX, IA_XOP },
+Ia_vprotw_Vdq_Hdq_Wdq = { "vprotw", "vprotw", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vprotw_Vdq_Wdq_Hdq = { "vprotw", "vprotw", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vprotw_Vdq_Wdq_Ib = { "vprotw", "vprotw", Vdq, Wdq, Ib, XX, IA_XOP },
+Ia_vpsadbw_Vdq_Hdq_Wdq = { "vpsadbw", "vpsadbw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpshab_Vdq_Hdq_Wdq = { "vpshab", "vpshab", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshab_Vdq_Wdq_Hdq = { "vpshab", "vpshab", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshad_Vdq_Hdq_Wdq = { "vpshad", "vpshad", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshad_Vdq_Wdq_Hdq = { "vpshad", "vpshad", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshaq_Vdq_Hdq_Wdq = { "vpshaq", "vpshaq", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshaq_Vdq_Wdq_Hdq = { "vpshaq", "vpshaq", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshaw_Vdq_Hdq_Wdq = { "vpshaw", "vpshaw", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshaw_Vdq_Wdq_Hdq = { "vpshaw", "vpshaw", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshlb_Vdq_Hdq_Wdq = { "vpshlb", "vpshlb", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshlb_Vdq_Wdq_Hdq = { "vpshlb", "vpshlb", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshld_Vdq_Hdq_Wdq = { "vpshld", "vpshld", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshld_Vdq_Wdq_Hdq = { "vpshld", "vpshld", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshlq_Vdq_Hdq_Wdq = { "vpshlq", "vpshlq", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshlq_Vdq_Wdq_Hdq = { "vpshlq", "vpshlq", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshlw_Vdq_Hdq_Wdq = { "vpshlw", "vpshlw", Vdq, Hdq, Wdq, XX, IA_XOP },
+Ia_vpshlw_Vdq_Wdq_Hdq = { "vpshlw", "vpshlw", Vdq, Wdq, Hdq, XX, IA_XOP },
+Ia_vpshufb_Vdq_Hdq_Wdq = { "vpshufb", "vpshufb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpshufd_Vdq_Hdq_Wdq_Ib = { "vpshufd", "vpshufd", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpshufhw_Vdq_Hdq_Wdq_Ib = { "vpshufhw", "vpshufhw", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpshuflw_Vdq_Hdq_Wdq_Ib = { "vpshuflw", "vpshuflw", Vdq, Wdq, Ib, XX, IA_AVX },
+Ia_vpsignb_Vdq_Hdq_Wdq = { "vpsignb", "vpsignb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsignd_Vdq_Hdq_Wdq = { "vpsignd", "vpsignd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsignw_Vdq_Hdq_Wdq = { "vpsignw", "vpsignw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpslld_Hdq_Udq_Ib = { "vpslld", "vpslld", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpslld_Vdq_Hdq_Wdq = { "vpslld", "vpslld", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpslldq_Hdq_Udq_Ib = { "vpslldq", "vpslldq", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsllq_Hdq_Udq_Ib = { "vpsllq", "vpsllq", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsllq_Vdq_Hdq_Wdq = { "vpsllq", "vpsllq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsllvd_Vdq_Hdq_Wdq = { "vpsllvd", "vpsllvd", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpsllvq_Vdq_Hdq_Wdq = { "vpsllvq", "vpsllvq", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpsllw_Hdq_Udq_Ib = { "vpsllw", "vpsllw", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsllw_Vdq_Hdq_Wdq = { "vpsllw", "vpsllw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsrad_Hdq_Udq_Ib = { "vpsrad", "vpsrad", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsrad_Vdq_Hdq_Wdq = { "vpsrad", "vpsrad", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsravd_Vdq_Hdq_Wdq = { "vpsravd", "vpsravd", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpsraw_Hdq_Udq_Ib = { "vpsraw", "vpsraw", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsraw_Vdq_Hdq_Wdq = { "vpsraw", "vpsraw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsrld_Hdq_Udq_Ib = { "vpsrld", "vpsrld", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsrld_Vdq_Hdq_Wdq = { "vpsrld", "vpsrld", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsrldq_Hdq_Udq_Ib = { "vpsrldq", "vpsrldq", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsrlq_Hdq_Udq_Ib = { "vpsrlq", "vpsrlq", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsrlq_Vdq_Hdq_Wdq = { "vpsrlq", "vpsrlq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsrlvd_Vdq_Hdq_Wdq = { "vpsrlvd", "vpsrlvd", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpsrlvq_Vdq_Hdq_Wdq = { "vpsrlvq", "vpsrlvq", Vdq, Hdq, Wdq, XX, IA_AVX2 },
+Ia_vpsrlw_Hdq_Udq_Ib = { "vpsrlw", "vpsrlw", Hdq, Udq, Ib, XX, IA_AVX },
+Ia_vpsrlw_Vdq_Hdq_Wdq = { "vpsrlw", "vpsrlw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubb_Vdq_Hdq_Wdq = { "vpsubb", "vpsubb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubd_Vdq_Hdq_Wdq = { "vpsubd", "vpsubd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubq_Vdq_Hdq_Wdq = { "vpsubq", "vpsubq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubsb_Vdq_Hdq_Wdq = { "vpsubsb", "vpsubsb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubsw_Vdq_Hdq_Wdq = { "vpsubsw", "vpsubsw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubusb_Vdq_Hdq_Wdq = { "vpsubusb", "vpsubusb", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubusw_Vdq_Hdq_Wdq = { "vpsubusw", "vpsubusw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpsubw_Vdq_Hdq_Wdq = { "vpsubw", "vpsubw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vptest_Vdq_Wdq = { "vptest", "vptest", Vdq, Wdq, XX, XX, IA_AVX },
+Ia_vpunpckhbw_Vdq_Hdq_Wdq = { "vpunpckhbw", "vpunpckhbw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpckhdq_Vdq_Hdq_Wdq = { "vpunpckhdq", "vpunpckhdq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpckhqdq_Vdq_Hdq_Wdq = { "vpunpckhqdq", "vpunpckhqdq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpckhwd_Vdq_Hdq_Wdq = { "vpunpckhwd", "vpunpckhwd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpcklbw_Vdq_Hdq_Wdq = { "vpunpcklbw", "vpunpcklbw", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpckldq_Vdq_Hdq_Wdq = { "vpunpckldq", "vpunpckldq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpcklqdq_Vdq_Hdq_Wdq = { "vpunpcklqdq", "vpunpcklqdq", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpunpcklwd_Vdq_Hdq_Wdq = { "vpunpcklwd", "vpunpcklwd", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vpxor_Vdq_Hdq_Wdq = { "vpxor", "vpxor", Vdq, Hdq, Wdq, XX, IA_AVX },
+Ia_vrcpps_Vps_Wps = { "vrcpps", "vrcpps", Vps, Wps, XX, XX, IA_AVX },
+Ia_vrcpss_Vss_Hps_Wss = { "vrcpss", "vrcpss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vroundpd_Vpd_Wpd_Ib = { "vroundpd", "vroundpd", Vpd, Wpd, Ib, XX, IA_AVX },
+Ia_vroundps_Vps_Wps_Ib = { "vroundps", "vroundps", Vps, Wps, Ib, XX, IA_AVX },
+Ia_vroundsd_Vsd_Hpd_Wsd_Ib = { "vroundsd", "vroundsd", Vsd, Hpd, Wsd, Ib, IA_AVX },
+Ia_vroundss_Vss_Hps_Wss_Ib = { "vroundss", "vroundss", Vss, Hps, Wss, Ib, IA_AVX },
+Ia_vrsqrtps_Vps_Wps = { "vrsqrtps", "vrsqrtps", Vps, Wps, XX, XX, IA_AVX },
+Ia_vrsqrtss_Vss_Hps_Wss = { "vrsqrtss", "vrsqrtss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vshufpd_Vpd_Hpd_Wpd_Ib = { "vshufpd", "vshufpd", Vpd, Hpd, Wpd, Ib, IA_AVX },
+Ia_vshufps_Vps_Hps_Wps_Ib = { "vshufps", "vshufps", Vps, Hps, Wps, Ib, IA_AVX },
+Ia_vsqrtpd_Vpd_Wpd = { "vsqrtpd", "vsqrtpd", Vpd, Wpd, XX, XX, IA_AVX },
+Ia_vsqrtps_Vps_Wps = { "vsqrtps", "vsqrtps", Vps, Wps, XX, XX, IA_AVX },
+Ia_vsqrtsd_Vsd_Hpd_Wsd = { "vsqrtsd", "vsqrtsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vsqrtss_Vss_Hps_Wss = { "vsqrtss", "vsqrtss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vstmxcsr = { "vstmxcsr", "vstmxcsr", Md, XX, XX, XX, IA_AVX },
+Ia_vsubpd_Vpd_Hpd_Wpd = { "vsubpd", "vsubpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vsubps_Vps_Hps_Wps = { "vsubps", "vsubps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vsubsd_Vsd_Hpd_Wsd = { "vsubsd", "vsubsd", Vsd, Hpd, Wsd, XX, IA_AVX },
+Ia_vsubss_Vss_Hps_Wss = { "vsubss", "vsubss", Vss, Hps, Wss, XX, IA_AVX },
+Ia_vtestpd_Vpd_Wpd = { "vtestpd", "vtestpd", Vpd, Wpd, XX, XX, IA_AVX },
+Ia_vtestps_Vps_Wps = { "vtestps", "vtestps", Vps, Wps, XX, XX, IA_AVX },
+Ia_vucomisd_Vsd_Wsd = { "vucomisd", "vucomisd", Vsd, Wsd, XX, XX, IA_AVX },
+Ia_vucomiss_Vss_Wss = { "vucomiss", "vucomiss", Vss, Wss, XX, XX, IA_AVX },
+Ia_vunpckhpd_Vpd_Hpd_Wpd = { "vunpckhpd", "vunpckhpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vunpckhps_Vps_Hps_Wps = { "vunpckhps", "vunpckhps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vunpcklpd_Vpd_Hpd_Wpd = { "vunpcklpd", "vunpcklpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vunpcklps_Vps_Hps_Wps = { "vunpcklps", "vunpcklps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vxorpd_Vpd_Hpd_Wpd = { "vxorpd", "vxorpd", Vpd, Hpd, Wpd, XX, IA_AVX },
+Ia_vxorps_Vps_Hps_Wps = { "vxorps", "vxorps", Vps, Hps, Wps, XX, IA_AVX },
+Ia_vzeroall = { "vzeroall", "vzeroall", XX, XX, XX, XX, IA_AVX },
+Ia_vzeroupper = { "vzeroupper", "vzeroupper", XX, XX, XX, XX, IA_AVX },
+Ia_wbinvd = { "wbinvd", "wbinvd", XX, XX, XX, XX, IA_486 },
+Ia_wrfsbase_Ry = { "wrfsbase", "wrfsbase", Ry, XX, XX, XX, IA_FSGSBASE },
+Ia_wrgsbase_Ry = { "wrgsbase", "wrgsbase", Ry, XX, XX, XX, IA_FSGSBASE },
+Ia_wrmsr = { "wrmsr", "wrmsr", XX, XX, XX, XX, IA_PENTIUM },
+Ia_xaddb_Eb_Gb = { "xadd", "xaddb", Eb, Gb, XX, XX, IA_486 },
+Ia_xaddl_Ed_Gd = { "xadd", "xaddl", Ed, Gd, XX, XX, IA_486 },
+Ia_xaddq_Eq_Gq = { "xadd", "xaddq", Eq, Gq, XX, XX, 0 },
+Ia_xaddw_Ew_Gw = { "xadd", "xaddw", Ew, Gw, XX, XX, IA_486 },
+Ia_xchgb_Eb_Gb = { "xchg", "xchgb", Eb, Gb, XX, XX, 0 },
+Ia_xchgl_Ed_Gd = { "xchg", "xchgl", Ed, Gd, XX, XX, 0 },
+Ia_xchgl_ERX_EAX = { "xchg", "xchgl", ERX, EAX_Reg, XX, XX, 0 },
+Ia_xchgq_Eq_Gq = { "xchg", "xchgq", Eq, Gq, XX, XX, 0 },
+Ia_xchgq_RRX_RAX = { "xchg", "xchgq", RRX, RAX_Reg, XX, XX, 0 },
+Ia_xchgw_Ew_Gw = { "xchg", "xchgw", Ew, Gw, XX, XX, 0 },
+Ia_xchgw_RX_AX = { "xchg", "xchgw", RX, AX_Reg, XX, XX, 0 },
+Ia_xgetbv = { "xgetbv", "xgetbv", XX, XX, XX, XX, IA_XSAVE },
+Ia_xlat = { "xlat", "xlat", XX, XX, XX, XX, 0 },
+Ia_xorb_AL_Ib = { "xor", "xorb", AL_Reg, Ib, XX, XX, 0 },
+Ia_xorb_Eb_Gb = { "xor", "xorb", Eb, Gb, XX, XX, 0 },
+Ia_xorb_Eb_Ib = { "xor", "xorb", Eb, Ib, XX, XX, 0 },
+Ia_xorb_Gb_Eb = { "xor", "xorb", Gb, Eb, XX, XX, 0 },
+Ia_xorl_EAX_Id = { "xor", "xorl", EAX_Reg, Id, XX, XX, 0 },
+Ia_xorl_Ed_Gd = { "xor", "xorl", Ed, Gd, XX, XX, 0 },
+Ia_xorl_Ed_Id = { "xor", "xorl", Ed, Id, XX, XX, 0 },
+Ia_xorl_Ed_sIb = { "xor", "xorl", Ed, sIbd, XX, XX, 0 },
+Ia_xorl_Gd_Ed = { "xor", "xorl", Gd, Ed, XX, XX, 0 },
+Ia_xorpd_Vpd_Wpd = { "xorpd", "xorpd", Vpd, Wpd, XX, XX, IA_SSE2 },
+Ia_xorps_Vps_Wps = { "xorps", "xorps", Vps, Wps, XX, XX, IA_SSE },
+Ia_xorq_Eq_Gq = { "xor", "xorq", Eq, Gq, XX, XX, 0 },
+Ia_xorq_Eq_sIb = { "xor", "xorq", Eq, sIbq, XX, XX, 0 },
+Ia_xorq_Eq_sId = { "xor", "xorq", Eq, sIdq, XX, XX, 0 },
+Ia_xorq_Gq_Eq = { "xor", "xorq", Gq, Eq, XX, XX, 0 },
+Ia_xorq_RAX_sId = { "xor", "xorq", RAX_Reg, sIdq, XX, XX, 0 },
+Ia_xorw_AX_Iw = { "xor", "xorw", AX_Reg, Iw, XX, XX, 0 },
+Ia_xorw_Ew_Gw = { "xor", "xorw", Ew, Gw, XX, XX, 0 },
+Ia_xorw_Ew_Iw = { "xor", "xorw", Ew, Iw, XX, XX, 0 },
+Ia_xorw_Ew_sIb = { "xor", "xorw", Ew, sIbw, XX, XX, 0 },
+Ia_xorw_Gw_Ew = { "xor", "xorw", Gw, Ew, XX, XX, 0 },
+Ia_xrstor = { "xrstor", "xrstor", Mx, XX, XX, XX, IA_XSAVE },
+Ia_xsave = { "xsave", "xsave", Mx, XX, XX, XX, IA_XSAVE },
+Ia_xsavec = { "xsavec", "xsavec", Mx, XX, XX, XX, IA_XSAVEC },
+Ia_xsaveopt = { "xsaveopt", "xsaveopt", Mx, XX, XX, XX, IA_XSAVEOPT },
+Ia_xsetbv = { "xsetbv", "xsetbv", XX, XX, XX, XX, IA_XSAVE };
diff --git a/Externals/Bochs_disasm/opcodes.inl b/Externals/Bochs_disasm/opcodes.inl
deleted file mode 100644
index fbb1b7be54..0000000000
--- a/Externals/Bochs_disasm/opcodes.inl
+++ /dev/null
@@ -1,1230 +0,0 @@
-Ia_aaa = { "aaa", "aaa", XX, XX, XX },
-Ia_aad = { "aad", "aad", Ib, XX, XX },
-Ia_aam = { "aam", "aam", Ib, XX, XX },
-Ia_aas = { "aas", "aas", XX, XX, XX },
-Ia_adcb_AL_Ib = { "adc", "adcb", AL, Ib, XX },
-Ia_adcb_Eb_Gb = { "adc", "adcb", Eb, Gb, XX },
-Ia_adcb_Eb_Ib = { "adc", "adcb", Eb, Ib, XX },
-Ia_adcb_Gb_Eb = { "adc", "adcb", Gb, Eb, XX },
-Ia_adcl_EAX_Id = { "adc", "adcl", EAX, Id, XX },
-Ia_adcl_Ed_Gd = { "adc", "adcl", Ed, Gd, XX },
-Ia_adcl_Ed_Id = { "adc", "adcl", Ed, Id, XX },
-Ia_adcl_Ed_sIb = { "adc", "adcl", Ed, sIbd, XX },
-Ia_adcl_Gd_Ed = { "adc", "adcl", Gd, Ed, XX },
-Ia_adcq_Eq_Gq = { "adc", "adcq", Eq, Gq, XX },
-Ia_adcq_Eq_sIb = { "adc", "adcq", Eq, sIbq, XX },
-Ia_adcq_Eq_sId = { "adc", "adcq", Eq, Iq, XX },
-Ia_adcq_Gq_Eq = { "adc", "adcq", Gq, Eq, XX },
-Ia_adcq_RAX_sId = { "adc", "adcq", RAX, sIdq, XX },
-Ia_adcw_AX_Iw = { "adc", "adcw", AX, Iw, XX },
-Ia_adcw_Ew_Gw = { "adc", "adcw", Ew, Gw, XX },
-Ia_adcw_Ew_Iw = { "adc", "adcw", Ew, Iw, XX },
-Ia_adcw_Ew_sIb = { "adc", "adcw", Ew, sIbw, XX },
-Ia_adcw_Gw_Ew = { "adc", "adcw", Gw, Ew, XX },
-Ia_addb_AL_Ib = { "add", "addb", AL, Ib, XX },
-Ia_addb_Eb_Gb = { "add", "addb", Eb, Gb, XX },
-Ia_addb_Eb_Ib = { "add", "addb", Eb, Ib, XX },
-Ia_addb_Gb_Eb = { "add", "addb", Gb, Eb, XX },
-Ia_addl_EAX_Id = { "add", "addl", EAX, Id, XX },
-Ia_addl_Ed_Gd = { "add", "addl", Ed, Gd, XX },
-Ia_addl_Ed_Id = { "add", "addl", Ed, Id, XX },
-Ia_addl_Ed_sIb = { "add", "addl", Ed, sIbd, XX },
-Ia_addl_Gd_Ed = { "add", "addl", Gd, Ed, XX },
-Ia_addpd_Vpd_Wpd = { "addpd", "addpd", Vpd, Wpd, XX },
-Ia_addps_Vps_Wps = { "addps", "addps", Vps, Wps, XX },
-Ia_addq_Eq_Gq = { "add", "addq", Eq, Gq, XX },
-Ia_addq_Eq_sIb = { "add", "addq", Eq, sIbq, XX },
-Ia_addq_Eq_sId = { "add", "addq", Eq, sIdq, XX },
-Ia_addq_Gq_Eq = { "add", "addq", Gq, Eq, XX },
-Ia_addq_RAX_sId = { "add", "addq", RAX, sIdq, XX },
-Ia_addsd_Vsd_Wsd = { "addsd", "addsd", Vsd, Wsd, XX },
-Ia_addss_Vss_Wss = { "addss", "addss", Vss, Wss, XX },
-Ia_addsubpd_Vpd_Wpd = { "addsubpd", "addsubpd", Vpd, Wpd, XX },
-Ia_addsubps_Vps_Wps = { "addsubps", "addsubps", Vps, Wps, XX },
-Ia_addw_AX_Iw = { "add", "addw", AX, Iw, XX },
-Ia_addw_Ew_Gw = { "add", "addw", Ew, Gw, XX },
-Ia_addw_Ew_Iw = { "add", "addw", Ew, Iw, XX },
-Ia_addw_Ew_sIb = { "add", "addw", Ew, sIbw, XX },
-Ia_addw_Gw_Ew = { "add", "addw", Gw, Ew, XX },
-Ia_andb_AL_Ib = { "and", "andb", AL, Ib, XX },
-Ia_andb_Eb_Gb = { "and", "andb", Eb, Gb, XX },
-Ia_andb_Eb_Ib = { "and", "andb", Eb, Ib, XX },
-Ia_andb_Gb_Eb = { "and", "andb", Gb, Eb, XX },
-Ia_andl_EAX_Id = { "and", "andl", EAX, Id, XX },
-Ia_andl_Ed_Gd = { "and", "andl", Ed, Gd, XX },
-Ia_andl_Ed_Id = { "and", "andl", Ed, Id, XX },
-Ia_andl_Ed_sIb = { "and", "andl", Ed, sIbd, XX },
-Ia_andl_Gd_Ed = { "and", "andl", Gd, Ed, XX },
-Ia_andnpd_Vpd_Wpd = { "andnpd", "andnpd", Vpd, Wpd, XX },
-Ia_andnps_Vps_Wps = { "andnps", "andnps", Vps, Wps, XX },
-Ia_andpd_Vpd_Wpd = { "andpd", "andpd", Vpd, Wpd, XX },
-Ia_andps_Vps_Wps = { "andps", "andps", Vps, Wps, XX },
-Ia_andq_Eq_Gq = { "and", "andq", Eq, Gq, XX },
-Ia_andq_Eq_sIb = { "and", "andq", Eq, sIbq, XX },
-Ia_andq_Eq_sId = { "and", "andq", Eq, sIdq, XX },
-Ia_andq_Gq_Eq = { "and", "andq", Gq, Eq, XX },
-Ia_andq_RAX_sId = { "and", "andq", RAX, sIdq, XX },
-Ia_andw_AX_Iw = { "and", "andw", AX, Iw, XX },
-Ia_andw_Ew_Gw = { "and", "andw", Ew, Gw, XX },
-Ia_andw_Ew_Iw = { "and", "andw", Ew, Iw, XX },
-Ia_andw_Ew_sIb = { "and", "andw", Ew, sIbw, XX },
-Ia_andw_Gw_Ew = { "and", "andw", Gw, Ew, XX },
-Ia_arpl_Ew_Rw = { "arpl", "arpl", Ew, Rw, XX },
-Ia_boundl_Gd_Ma = { "bound", "boundl", Gd, Ma, XX },
-Ia_boundw_Gw_Ma = { "bound", "boundw", Gw, Ma, XX },
-Ia_bsfl_Gd_Ed = { "bsf", "bsfl", Gd, Ed, XX },
-Ia_bsfq_Gq_Eq = { "bsf", "bsfq", Gq, Eq, XX },
-Ia_bsfw_Gw_Ew = { "bsf", "bsfw", Gw, Ew, XX },
-Ia_bsrl_Gd_Ed = { "bsr", "bsrl", Gd, Ed, XX },
-Ia_bsrq_Gq_Eq = { "bsr", "bsrq", Gq, Eq, XX },
-Ia_bsrw_Gw_Ew = { "bsr", "bsrw", Gw, Ew, XX },
-Ia_bswapl_ERX = { "bswap", "bswapl", ERX, XX, XX },
-Ia_bswapq_RRX = { "bswap", "bswapq", RRX, XX, XX },
-Ia_btcl_Ed_Gd = { "btc", "btcl", Ed, Gd, XX },
-Ia_btcl_Ed_Ib = { "btc", "btcl", Ed, Ib, XX },
-Ia_btcq_Eq_Gq = { "btc", "btcq", Eq, Gq, XX },
-Ia_btcq_Eq_Ib = { "btc", "btcq", Eq, Ib, XX },
-Ia_btcw_Ew_Gw = { "btc", "btcw", Ew, Gw, XX },
-Ia_btcw_Ew_Ib = { "btc", "btcw", Ew, Ib, XX },
-Ia_btl_Ed_Gd = { "bt", "btl", Ed, Gd, XX },
-Ia_btl_Ed_Ib = { "bt", "btl", Ed, Ib, XX },
-Ia_btq_Eq_Gq = { "bt", "btq", Eq, Gq, XX },
-Ia_btq_Eq_Ib = { "bt", "btq", Eq, Ib, XX },
-Ia_btrl_Ed_Gd = { "btr", "btrl", Ed, Gd, XX },
-Ia_btrl_Ed_Ib = { "btr", "btrl", Ed, Ib, XX },
-Ia_btrq_Eq_Gq = { "btr", "btrq", Eq, Gq, XX },
-Ia_btrq_Eq_Ib = { "btr", "btrq", Eq, Ib, XX },
-Ia_btrw_Ew_Gw = { "btr", "btrw", Ew, Gw, XX },
-Ia_btrw_Ew_Ib = { "btr", "btrw", Ew, Ib, XX },
-Ia_btsl_Ed_Gd = { "bts", "btsl", Ed, Gd, XX },
-Ia_btsl_Ed_Ib = { "bts", "btsl", Ed, Ib, XX },
-Ia_btsq_Eq_Gq = { "bts", "btsq", Eq, Gq, XX },
-Ia_btsq_Eq_Ib = { "bts", "btsq", Eq, Ib, XX },
-Ia_btsw_Ew_Gw = { "bts", "btsw", Ew, Gw, XX },
-Ia_btsw_Ew_Ib = { "bts", "btsw", Ew, Ib, XX },
-Ia_btw_Ew_Gw = { "bt", "btw", Ew, Gw, XX },
-Ia_btw_Ew_Ib = { "bt", "btw", Ew, Ib, XX },
-Ia_call_Ed = { "call", "call", Ed, XX, XX },
-Ia_call_Eq = { "call", "call", Eq, XX, XX },
-Ia_call_Ew = { "call", "call", Ew, XX, XX },
-Ia_call_Jd = { "call", "call", Jd, XX, XX },
-Ia_call_Jw = { "call", "call", Jw, XX, XX },
-Ia_cbw = { "cbw", "cbtw", XX, XX, XX },
-Ia_cdq = { "cdq", "cltd", XX, XX, XX },
-Ia_cdqe = { "cdqe", "cltq", XX, XX, XX },
-Ia_cflush = { "cflush", "cflush", Mb, XX, XX },
-Ia_clc = { "clc", "clc", XX, XX, XX },
-Ia_cld = { "cld", "cld", XX, XX, XX },
-Ia_cli = { "cli", "cli", XX, XX, XX },
-Ia_clts = { "clts", "clts", XX, XX, XX },
-Ia_cmc = { "cmc", "cmc", XX, XX, XX },
-Ia_cmoval_Gd_Ed = { "cmova", "cmoval", Gd, Ed, XX },
-Ia_cmovaq_Gq_Eq = { "cmova", "cmovaq", Gq, Eq, XX },
-Ia_cmovaw_Gw_Ew = { "cmova", "cmovaw", Gw, Ew, XX },
-Ia_cmovcl_Gd_Ed = { "cmovc", "cmovcl", Gd, Ed, XX },
-Ia_cmovcq_Gq_Eq = { "cmovc", "cmovcq", Gq, Eq, XX },
-Ia_cmovcw_Gw_Ew = { "cmovc", "cmovcw", Gw, Ew, XX },
-Ia_cmovgl_Gd_Ed = { "cmovg", "cmovgl", Gd, Ed, XX },
-Ia_cmovgq_Gq_Eq = { "cmovg", "cmovgq", Gq, Eq, XX },
-Ia_cmovgw_Gw_Ew = { "cmovg", "cmovgw", Gw, Ew, XX },
-Ia_cmovll_Gd_Ed = { "cmovl", "cmovll", Gd, Ed, XX },
-Ia_cmovlq_Gq_Eq = { "cmovl", "cmovlq", Gq, Eq, XX },
-Ia_cmovlw_Gw_Ew = { "cmovl", "cmovlw", Gw, Ew, XX },
-Ia_cmovnal_Gd_Ed = { "cmovna", "cmovnal", Gd, Ed, XX },
-Ia_cmovnaq_Gq_Eq = { "cmovna", "cmovnaq", Gq, Eq, XX },
-Ia_cmovnaw_Gw_Ew = { "cmovna", "cmovnaw", Gw, Ew, XX },
-Ia_cmovncl_Gd_Ed = { "cmovnc", "cmovncl", Gd, Ed, XX },
-Ia_cmovncq_Gq_Eq = { "cmovnc", "cmovncq", Gq, Eq, XX },
-Ia_cmovncw_Gw_Ew = { "cmovnc", "cmovncw", Gw, Ew, XX },
-Ia_cmovngl_Gd_Ed = { "cmovng", "cmovngl", Gd, Ed, XX },
-Ia_cmovngq_Gq_Eq = { "cmovng", "cmovngq", Gq, Eq, XX },
-Ia_cmovngw_Gw_Ew = { "cmovng", "cmovngw", Gw, Ew, XX },
-Ia_cmovnll_Gd_Ed = { "cmovnl", "cmovnll", Gd, Ed, XX },
-Ia_cmovnlq_Gq_Eq = { "cmovnl", "cmovnlq", Gq, Eq, XX },
-Ia_cmovnlw_Gw_Ew = { "cmovnl", "cmovnlw", Gw, Ew, XX },
-Ia_cmovnol_Gd_Ed = { "cmovno", "cmovnol", Gd, Ed, XX },
-Ia_cmovnoq_Gq_Eq = { "cmovno", "cmovnoq", Gq, Eq, XX },
-Ia_cmovnow_Gw_Ew = { "cmovno", "cmovnow", Gw, Ew, XX },
-Ia_cmovnpl_Gd_Ed = { "cmovnp", "cmovnpl", Gd, Ed, XX },
-Ia_cmovnpq_Gq_Eq = { "cmovnp", "cmovnpq", Gq, Eq, XX },
-Ia_cmovnpw_Gw_Ew = { "cmovnp", "cmovnpw", Gw, Ew, XX },
-Ia_cmovnsl_Gd_Ed = { "cmovns", "cmovnsl", Gd, Ed, XX },
-Ia_cmovnsq_Gq_Eq = { "cmovns", "cmovnsq", Gq, Eq, XX },
-Ia_cmovnsw_Gw_Ew = { "cmovns", "cmovnsw", Gw, Ew, XX },
-Ia_cmovnzl_Gd_Ed = { "cmovnz", "cmovnzl", Gd, Ed, XX },
-Ia_cmovnzq_Gq_Eq = { "cmovnz", "cmovnzq", Gq, Eq, XX },
-Ia_cmovnzw_Gw_Ew = { "cmovnz", "cmovnzw", Gw, Ew, XX },
-Ia_cmovol_Gd_Ed = { "cmovo", "cmovol", Gd, Ed, XX },
-Ia_cmovoq_Gq_Eq = { "cmovo", "cmovoq", Gq, Eq, XX },
-Ia_cmovow_Gw_Ew = { "cmovo", "cmovow", Gw, Ew, XX },
-Ia_cmovpl_Gd_Ed = { "cmovp", "cmovpl", Gd, Ed, XX },
-Ia_cmovpq_Gq_Eq = { "cmovp", "cmovpq", Gq, Eq, XX },
-Ia_cmovpw_Gw_Ew = { "cmovp", "cmovpw", Gw, Ew, XX },
-Ia_cmovsl_Gd_Ed = { "cmovs", "cmovsl", Gd, Ed, XX },
-Ia_cmovsq_Gq_Eq = { "cmovs", "cmovsq", Gq, Eq, XX },
-Ia_cmovsw_Gw_Ew = { "cmovs", "cmovsw", Gw, Ew, XX },
-Ia_cmovzl_Gd_Ed = { "cmovz", "cmovzl", Gd, Ed, XX },
-Ia_cmovzq_Gq_Eq = { "cmovz", "cmovzq", Gq, Eq, XX },
-Ia_cmovzw_Gw_Ew = { "cmovz", "cmovzw", Gw, Ew, XX },
-Ia_cmpb_AL_Ib = { "cmp", "cmpb", AL, Ib, XX },
-Ia_cmpb_Eb_Gb = { "cmp", "cmpb", Eb, Gb, XX },
-Ia_cmpb_Eb_Ib = { "cmp", "cmpb", Eb, Ib, XX },
-Ia_cmpb_Gb_Eb = { "cmp", "cmpb", Gb, Eb, XX },
-Ia_cmpl_EAX_Id = { "cmp", "cmpl", EAX, Id, XX },
-Ia_cmpl_Ed_Gd = { "cmp", "cmpl", Ed, Gd, XX },
-Ia_cmpl_Ed_Id = { "cmp", "cmpl", Ed, Id, XX },
-Ia_cmpl_Ed_sIb = { "cmp", "cmpl", Ed, sIbd, XX },
-Ia_cmpl_Gd_Ed = { "cmp", "cmpl", Gd, Ed, XX },
-Ia_cmppd_Vpd_Wpd_Ib = { "cmppd", "cmppd", Vpd, Wpd, Ib },
-Ia_cmpps_Vps_Wps_Ib = { "cmpps", "cmpps", Vps, Wps, Ib },
-Ia_cmpq_Eq_Gq = { "cmp", "cmpq", Eq, Gq, XX },
-Ia_cmpq_Eq_sIb = { "cmp", "cmpq", Eq, sIbq, XX },
-Ia_cmpq_Eq_sId = { "cmp", "cmpq", Eq, sIdq, XX },
-Ia_cmpq_Gq_Eq = { "cmp", "cmpq", Gq, Eq, XX },
-Ia_cmpq_RAX_sId = { "cmp", "cmpq", RAX, sIdq, XX },
-Ia_cmpsb_Yb_Xb = { "cmpsb", "cmpsb", Yb, Xb, XX },
-Ia_cmpsd_Vsd_Wsd_Ib = { "cmpsd", "cmpsd", Vsd, Wsd, Ib },
-Ia_cmpsl_Yd_Xd = { "cmpsd", "cmpsl", Yd, Xd, XX },
-Ia_cmpsq_Yq_Xq = { "cmpsq", "cmpsq", Yq, Xq, XX },
-Ia_cmpss_Vss_Wss_Ib = { "cmpss", "cmpss", Vss, Wss, Ib },
-Ia_cmpsw_Yw_Xw = { "cmpsw", "cmpsw", Yw, Xw, XX },
-Ia_cmpw_AX_Iw = { "cmp", "cmpw", AX, Iw, XX },
-Ia_cmpw_Ew_Gw = { "cmp", "cmpw", Ew, Gw, XX },
-Ia_cmpw_Ew_Iw = { "cmp", "cmpw", Ew, Iw, XX },
-Ia_cmpw_Ew_sIb = { "cmp", "cmpw", Ew, sIbw, XX },
-Ia_cmpw_Gw_Ew = { "cmp", "cmpw", Gw, Ew, XX },
-Ia_cmpxchg16b = { "cmpxchg16b", "cmpxchg16b", Mdq, XX, XX },
-Ia_cmpxchg8b = { "cmpxchg8b", "cmpxchg8b", Mq, XX, XX },
-Ia_cmpxchgb_Eb_Gb = { "cmpxchg", "cmpxchgb", Eb, Gb, XX },
-Ia_cmpxchgl_Ed_Gd = { "cmpxchg", "cmpxchgl", Ed, Gd, XX },
-Ia_cmpxchgq_Eq_Gq = { "cmpxchg", "cmpxchgq", Eq, Gq, XX },
-Ia_cmpxchgw_Ew_Gw = { "cmpxchg", "cmpxchgw", Ew, Gw, XX },
-Ia_comisd_Vsd_Wsd = { "comisd", "comisd", Vsd, Wsd, XX },
-Ia_comiss_Vss_Wss = { "comiss", "comiss", Vss, Wss, XX },
-Ia_cpuid = { "cpuid", "cpuid", XX, XX, XX },
-Ia_cqo = { "cqo", "cqto", XX, XX, XX },
-Ia_cvtdq2pd_Vpd_Wq = { "cvtdq2pd", "cvtdq2pd", Vpd, Wq, XX },
-Ia_cvtdq2ps_Vps_Wdq = { "cvtdq2ps", "cvtdq2ps", Vps, Wdq, XX },
-Ia_cvtpd2dq_Vq_Wpd = { "cvtpd2dq", "cvtpd2dq", Vq, Wpd, XX },
-Ia_cvtpd2pi_Pq_Wpd = { "cvtpd2pi", "cvtpd2pi", Pq, Wpd, XX },
-Ia_cvtpd2ps_Vps_Wpd = { "cvtpd2ps", "cvtpd2ps", Vps, Wpd, XX },
-Ia_cvtpi2pd_Vpd_Qq = { "cvtpi2pd", "cvtpi2pd", Vpd, Qq, XX },
-Ia_cvtpi2ps_Vps_Qq = { "cvtpi2ps", "cvtpi2ps", Vps, Qq, XX },
-Ia_cvtps2dq_Vdq_Wps = { "cvtps2dq", "cvtps2dq", Vdq, Wps, XX },
-Ia_cvtps2pd_Vpd_Wps = { "cvtps2pd", "cvtps2pd", Vpd, Wps, XX },
-Ia_cvtps2pi_Pq_Wps = { "cvtps2pi", "cvtps2pi", Pq, Wps, XX },
-Ia_cvtsd2si_Gd_Wsd = { "cvtsd2si", "cvtsd2si", Gd, Wsd, XX },
-Ia_cvtsd2si_Gq_Wsd = { "cvtsd2si", "cvtsd2si", Gq, Wsd, XX },
-Ia_cvtsd2ss_Vss_Wsd = { "cvtsd2ss", "cvtsd2ss", Vss, Wsd, XX },
-Ia_cvtsi2sd_Vsd_Ed = { "cvtsi2sd", "cvtsi2sd", Vsd, Ed, XX },
-Ia_cvtsi2sd_Vsd_Eq = { "cvtsi2sd", "cvtsi2sd", Vsd, Eq, XX },
-Ia_cvtsi2ss_Vss_Ed = { "cvtsi2ss", "cvtsi2ss", Vss, Ed, XX },
-Ia_cvtsi2ss_Vss_Eq = { "cvtsi2ss", "cvtsi2ss", Vss, Eq, XX },
-Ia_cvtss2sd_Vsd_Wss = { "cvtss2sd", "cvtss2sd", Vsd, Wss, XX },
-Ia_cvtss2si_Gd_Wss = { "cvtss2si", "cvtss2si", Gd, Wss, XX },
-Ia_cvtss2si_Gq_Wss = { "cvtss2si", "cvtss2si", Gq, Wss, XX },
-Ia_cvttpd2dq_Vq_Wpd = { "cvttpd2dq", "cvttpd2dq", Vq, Wpd, XX },
-Ia_cvttpd2pi_Pq_Wpd = { "cvttpd2pi", "cvttpd2pi", Pq, Wpd, XX },
-Ia_cvttps2dq_Vdq_Wps = { "cvttps2dq", "cvttps2dq", Vdq, Wps, XX },
-Ia_cvttps2pi_Pq_Wps = { "cvttps2pi", "cvttps2pi", Pq, Wps, XX },
-Ia_cvttsd2si_Gd_Wsd = { "cvttsd2si", "cvttsd2si", Gd, Wsd, XX },
-Ia_cvttsd2si_Gq_Wsd = { "cvttsd2si", "cvttsd2si", Gq, Wsd, XX },
-Ia_cvttss2si_Gd_Wss = { "cvttss2si", "cvttss2si", Gd, Wss, XX },
-Ia_cvttss2si_Gq_Wss = { "cvttss2si", "cvttss2si", Gq, Wss, XX },
-Ia_cwd = { "cwd", "cwtd", XX, XX, XX },
-Ia_cwde = { "cwde", "cwtl", XX, XX, XX },
-Ia_daa = { "daa", "daa", XX, XX, XX },
-Ia_das = { "das", "das", XX, XX, XX },
-Ia_decb_Eb = { "dec", "decb", Eb, XX, XX },
-Ia_decl_Ed = { "dec", "decl", Ed, XX, XX },
-Ia_decl_ERX = { "dec", "decl", ERX, XX, XX },
-Ia_decq_Eq = { "dec", "decq", Eq, XX, XX },
-Ia_decw_Ew = { "dec", "decw", Ew, XX, XX },
-Ia_decw_RX = { "dec", "decw", RX, XX, XX },
-Ia_divb_AL_Eb = { "div", "divb", AL, Eb, XX },
-Ia_divl_EAX_Ed = { "div", "divl", EAX, Ed, XX },
-Ia_divpd_Vpd_Wpd = { "divpd", "divpd", Vpd, Wpd, XX },
-Ia_divps_Vps_Wps = { "divps", "divps", Vps, Wps, XX },
-Ia_divq_RAX_Eq = { "div", "divq", RAX, Eq, XX },
-Ia_divsd_Vsd_Wsd = { "divsd", "divsd", Vsd, Wsd, XX },
-Ia_divss_Vss_Wss = { "divss", "divss", Vss, Wss, XX },
-Ia_divw_AX_Ew = { "div", "divw", AX, Ew, XX },
-Ia_emms = { "emms", "emms", XX, XX, XX },
-Ia_enter = { "enter", "enter", IwIb, XX, XX },
-Ia_error = { "(error)", "(error)", XX, XX, XX },
-Ia_f2xm1 = { "f2xm1", "f2xm1", XX, XX, XX },
-Ia_fabs = { "fabs", "fabs", XX, XX, XX },
-Ia_fadd_ST0_STi = { "fadd", "fadd", ST0, STi, XX },
-Ia_fadd_STi_ST0 = { "fadd", "fadd", STi, ST0, XX },
-Ia_faddl_Mq = { "fadd", "faddl", Mq, XX, XX },
-Ia_faddp_STi_ST0 = { "faddp", "faddp", STi, ST0, XX },
-Ia_fadds_Md = { "fadd", "fadds", Md, XX, XX },
-Ia_fbldt_Mt = { "fbld", "fbldt", Mt, XX, XX },
-Ia_fbstpt_Mt = { "fbstp", "fbstpt", Mt, XX, XX },
-Ia_fchs = { "fchs", "fchs", XX, XX, XX },
-Ia_fcmovb_ST0_STi = { "fcmovb", "fcmovb", ST0, STi, XX },
-Ia_fcmovbe_ST0_STi = { "fcmovbe", "fcmovbe", ST0, STi, XX },
-Ia_fcmove_ST0_STi = { "fcmove", "fcmove", ST0, STi, XX },
-Ia_fcmovnb_ST0_STi = { "fcmovnb", "fcmovnb", ST0, STi, XX },
-Ia_fcmovnbe_ST0_STi = { "fcmovnbe", "fcmovnbe", ST0, STi, XX },
-Ia_fcmovne_ST0_STi = { "fcmovne", "fcmovne", ST0, STi, XX },
-Ia_fcmovnu_ST0_STi = { "fcmovnu", "fcmovnu", ST0, STi, XX },
-Ia_fcmovu_ST0_STi = { "fcmovu", "fcmovu", ST0, STi, XX },
-Ia_fcom_STi = { "fcom", "fcom", STi, XX, XX },
-Ia_fcomi_ST0_STi = { "fcomi", "fcomi", ST0, STi, XX },
-Ia_fcomip_ST0_STi = { "fcomip", "fcomip", ST0, STi, XX },
-Ia_fcoml_Mq = { "fcom", "fcoml", Mq, XX, XX },
-Ia_fcomp_STi = { "fcomp", "fcomp", STi, XX, XX },
-Ia_fcompl_Mq = { "fcomp", "fcompl", Mq, XX, XX },
-Ia_fcompp = { "fcompp", "fcompp", XX, XX, XX },
-Ia_fcomps_Md = { "fcomp", "fcomps", Md, XX, XX },
-Ia_fcoms_Md = { "fcom", "fcoms", Md, XX, XX },
-Ia_fcos = { "fcos", "fcos", XX, XX, XX },
-Ia_fdecstp = { "fdecstp", "fdecstp", XX, XX, XX },
-Ia_fdisi = { "fdisi (287 legacy)", "fdisi (287 legacy)", XX, XX, XX },
-Ia_fdiv_ST0_STi = { "fdiv", "fdiv", ST0, STi, XX },
-Ia_fdiv_STi_ST0 = { "fdiv", "fdiv", STi, ST0, XX },
-Ia_fdivl_Mq = { "fdiv", "fdivl", Mq, XX, XX },
-Ia_fdivp_STi_ST0 = { "fdivp", "fdivp", STi, ST0, XX },
-Ia_fdivr_ST0_STi = { "fdivr", "fdivr", ST0, STi, XX },
-Ia_fdivr_STi_ST0 = { "fdivr", "fdivr", STi, ST0, XX },
-Ia_fdivrl_Mq = { "fdivr", "fdivrl", Mq, XX, XX },
-Ia_fdivrp_STi_ST0 = { "fdivrp", "fdivrp", STi, ST0, XX },
-Ia_fdivrs_Md = { "fdivr", "fdivrs", Md, XX, XX },
-Ia_fdivs_Md = { "fdiv", "fdivs", Md, XX, XX },
-Ia_femms = { "femms", "femms", XX, XX, XX },
-Ia_feni = { "feni (287 legacy)", "feni(287 legacy)", XX, XX, XX },
-Ia_ffree_STi = { "ffree", "ffree", STi, XX, XX },
-Ia_ffreep_STi = { "ffreep", "ffreep", STi, XX, XX },
-Ia_fiaddl_Md = { "fiadd", "fiaddl", Md, XX, XX },
-Ia_fiadds_Mw = { "fiadd", "fiadds", Mw, XX, XX },
-Ia_ficoml_Md = { "ficom", "ficoml", Md, XX, XX },
-Ia_ficompl_Md = { "ficomp", "ficompl", Md, XX, XX },
-Ia_ficomps_Mw = { "ficomp", "ficomps", Mw, XX, XX },
-Ia_ficoms_Mw = { "ficom", "ficoms", Mw, XX, XX },
-Ia_fidivl_Md = { "fidiv", "fidivl", Md, XX, XX },
-Ia_fidivrl_Md = { "fidivr", "fidivrl", Md, XX, XX },
-Ia_fidivrs_Mw = { "fidivr", "fidivrs", Mw, XX, XX },
-Ia_fidivs_Mw = { "fidiv", "fidivs", Mw, XX, XX },
-Ia_fildl_Md = { "fild", "fildl", Md, XX, XX },
-Ia_fildq_Mq = { "fild", "fildq", Mq, XX, XX },
-Ia_filds_Mw = { "fild", "filds", Mw, XX, XX },
-Ia_fimull_Md = { "fimul", "fimull", Md, XX, XX },
-Ia_fimuls_Mw = { "fimul", "fimuls", Mw, XX, XX },
-Ia_fincstp = { "fincstp", "fincstp", XX, XX, XX },
-Ia_fistl_Md = { "fist", "fistl", Md, XX, XX },
-Ia_fistpl_Md = { "fistp", "fistpl", Md, XX, XX },
-Ia_fistpq_Mq = { "fistp", "fistpq", Mq, XX, XX },
-Ia_fistps_Mw = { "fistp", "fistps", Mw, XX, XX },
-Ia_fists_Mw = { "fist", "fists", Mw, XX, XX },
-Ia_fisttpl_Md = { "fisttp", "fisttpl", Md, XX, XX },
-Ia_fisttpq_Mq = { "fisttp", "fisttpq", Mq, XX, XX },
-Ia_fisttps_Mw = { "fisttp", "fisttps", Mw, XX, XX },
-Ia_fisubl_Md = { "fisub", "fisubl", Md, XX, XX },
-Ia_fisubrl_Md = { "fisubr", "fisubrl", Md, XX, XX },
-Ia_fisubrs_Mw = { "fisubr", "fisubrs", Mw, XX, XX },
-Ia_fisubs_Mw = { "fisub", "fisubs", Mw, XX, XX },
-Ia_fld_STi = { "fld", "fld", STi, XX, XX },
-Ia_fld1 = { "fld1", "fld1", XX, XX, XX },
-Ia_fldcw = { "fldcw", "fldcw", Ew, XX, XX },
-Ia_fldenv = { "fldenv", "fldenv", Mx, XX, XX },
-Ia_fldl_Mq = { "fld", "fldl", Mq, XX, XX },
-Ia_fldl2e = { "fldl2e", "fldl2e", XX, XX, XX },
-Ia_fldl2t = { "fldl2t", "fldl2t", XX, XX, XX },
-Ia_fldlg2 = { "fldlg2", "fldlg2", XX, XX, XX },
-Ia_fldln2 = { "fldln2", "fldln2", XX, XX, XX },
-Ia_fldpi = { "fldpi", "fldpi", XX, XX, XX },
-Ia_flds_Md = { "fld", "flds", Md, XX, XX },
-Ia_fldt_Mt = { "fld", "fldt", Mt, XX, XX },
-Ia_fldz = { "fldz", "fldz", XX, XX, XX },
-Ia_fmul_ST0_STi = { "fmul", "fmul", ST0, STi, XX },
-Ia_fmul_STi_ST0 = { "fmul", "fmul", STi, ST0, XX },
-Ia_fmull_Mq = { "fmul", "fmull", Mq, XX, XX },
-Ia_fmulp_STi_ST0 = { "fmulp", "fmulp", STi, ST0, XX },
-Ia_fmuls_Md = { "fmul", "fmuls", Md, XX, XX },
-Ia_fnclex = { "fnclex", "fnclex", XX, XX, XX },
-Ia_fninit = { "fninit", "fninit", XX, XX, XX },
-Ia_fnop = { "fnop", "fnop", XX, XX, XX },
-Ia_fnsave = { "fnsave", "fnsave", Mx, XX, XX },
-Ia_fnstcw = { "fnstcw", "fnstcw", Mw, XX, XX },
-Ia_fnstenv = { "fnstenv", "fnstenv", Mx, XX, XX },
-Ia_fnstsw = { "fnstsw", "fnstsw", Mw, XX, XX },
-Ia_fnstsw_AX = { "fnstsw", "fnstsw", AX, XX, XX },
-Ia_fpatan = { "fpatan", "fpatan", XX, XX, XX },
-Ia_fprem = { "fprem", "fprem", XX, XX, XX },
-Ia_fprem1 = { "fprem1", "fprem1", XX, XX, XX },
-Ia_fptan = { "fptan", "fptan", XX, XX, XX },
-Ia_frndint = { "frndint", "frndint", XX, XX, XX },
-Ia_frstor = { "frstor", "frstor", Mx, XX, XX },
-Ia_fscale = { "fscale", "fscale", XX, XX, XX },
-Ia_fsetpm = { "fsetpm (287 legacy)", "fsetpm (287 legacy)", XX, XX, XX },
-Ia_fsin = { "fsin", "fsin", XX, XX, XX },
-Ia_fsincos = { "fsincos", "fsincos", XX, XX, XX },
-Ia_fsqrt = { "fsqrt", "fsqrt", XX, XX, XX },
-Ia_fst_STi = { "fst", "fst", STi, XX, XX },
-Ia_fstl_Mq = { "fst", "fstl", Mq, XX, XX },
-Ia_fstp_STi = { "fstp", "fstp", STi, XX, XX },
-Ia_fstpl_Mq = { "fstp", "fstpl", Mq, XX, XX },
-Ia_fstps_Md = { "fstp", "fstps", Md, XX, XX },
-Ia_fstpt_Mt = { "fstp", "fstpt", Mt, XX, XX },
-Ia_fsts_Md = { "fst", "fsts", Md, XX, XX },
-Ia_fsub_ST0_STi = { "fsub", "fsub", ST0, STi, XX },
-Ia_fsub_STi_ST0 = { "fsub", "fsub", STi, ST0, XX },
-Ia_fsubl_Mq = { "fsub", "fsubl", Mq, XX, XX },
-Ia_fsubp_STi_ST0 = { "fsubp", "fsubp", STi, ST0, XX },
-Ia_fsubr_ST0_STi = { "fsubr", "fsubr", ST0, STi, XX },
-Ia_fsubr_STi_ST0 = { "fsubr", "fsubr", STi, ST0, XX },
-Ia_fsubrl_Mq = { "fsubr", "fsubrl", Mq, XX, XX },
-Ia_fsubrp_STi_ST0 = { "fsubrp", "fsubrp", STi, ST0, XX },
-Ia_fsubrs_Md = { "fsubr", "fsubrs", Md, XX, XX },
-Ia_fsubs_Md = { "fsub", "fsubs", Md, XX, XX },
-Ia_ftst = { "ftst", "ftst", XX, XX, XX },
-Ia_fucom_STi = { "fucom", "fucom", STi, XX, XX },
-Ia_fucomi_ST0_STi = { "fucomi", "fucomi", ST0, STi, XX },
-Ia_fucomip_ST0_STi = { "fucomip", "fucomip", ST0, STi, XX },
-Ia_fucomp_STi = { "fucomp", "fucomp", STi, XX, XX },
-Ia_fucompp = { "fucompp", "fucompp", XX, XX, XX },
-Ia_fwait = { "fwait", "fwait", XX, XX, XX },
-Ia_fxam = { "fxam", "fxam", XX, XX, XX },
-Ia_fxch = { "fxch", "fxch", STi, XX, XX },
-Ia_fxrstor = { "fxrstor", "fxrstor", Mx, XX, XX },
-Ia_fxsave = { "fxsave", "fxsave", Mx, XX, XX },
-Ia_fxtract = { "fxtract", "fxtract", XX, XX, XX },
-Ia_fyl2x = { "fyl2x", "fyl2x", XX, XX, XX },
-Ia_fyl2xp1 = { "fyl2xp1", "fyl2xp1", XX, XX, XX },
-Ia_haddpd_Vpd_Wpd = { "haddpd", "haddpd", Vpd, Wpd, XX },
-Ia_haddps_Vps_Wps = { "haddps", "haddps", Vps, Wps, XX },
-Ia_hlt = { "hlt", "hlt", XX, XX, XX },
-Ia_hsubpd_Vpd_Wpd = { "hsubpd", "hsubpd", Vpd, Wpd, XX },
-Ia_hsubps_Vps_Wps = { "hsubps", "hsubps", Vps, Wps, XX },
-Ia_idivb_AL_Eb = { "idiv", "idivb", AL, Eb, XX },
-Ia_idivl_EAX_Ed = { "idiv", "idivl", EAX, Ed, XX },
-Ia_idivq_RAX_Eq = { "idiv", "idivq", RAX, Eq, XX },
-Ia_idivw_AX_Ew = { "idiv", "idivw", AX, Ew, XX },
-Ia_imulb_AL_Eb = { "imul", "imulb", AL, Eb, XX },
-Ia_imull_EAX_Ed = { "imul", "imull", EAX, Ed, XX },
-Ia_imull_Gd_Ed = { "imul", "imull", Gd, Ed, XX },
-Ia_imull_Gd_Ed_Id = { "imul", "imull", Gd, Ed, Id },
-Ia_imull_Gd_Ed_sIb = { "imul", "imull", Gd, Ed, sIbd },
-Ia_imulq_Gq_Eq = { "imul", "imulq", Gq, Eq, XX },
-Ia_imulq_Gq_Eq_sIb = { "imul", "imulq", Gq, Eq, sIbq },
-Ia_imulq_Gq_Eq_sId = { "imul", "imulq", Gq, Eq, sIdq },
-Ia_imulq_RAX_Eq = { "imul", "imulq", RAX, Eq, XX },
-Ia_imulw_AX_Ew = { "imul", "imulw", AX, Ew, XX },
-Ia_imulw_Gw_Ew = { "imul", "imulw", Gw, Ew, XX },
-Ia_imulw_Gw_Ew_Iw = { "imul", "imulw", Gw, Ew, Iw },
-Ia_imulw_Gw_Ew_sIb = { "imul", "imulw", Gw, Ew, sIbw },
-Ia_inb_AL_DX = { "in", "inb", AL, DX, XX },
-Ia_inb_AL_Ib = { "in", "inb", AL, Ib, XX },
-Ia_incb_Eb = { "inc", "incb", Eb, XX, XX },
-Ia_incl_Ed = { "inc", "incl", Ed, XX, XX },
-Ia_incl_ERX = { "inc", "incl", ERX, XX, XX },
-Ia_incq_Eq = { "inc", "incq", Eq, XX, XX },
-Ia_incw_Ew = { "inc", "incw", Ew, XX, XX },
-Ia_incw_RX = { "inc", "incw", RX, XX, XX },
-Ia_inl_EAX_DX = { "in", "inl", EAX, DX, XX },
-Ia_inl_EAX_Ib = { "in", "inl", EAX, Ib, XX },
-Ia_insb_Yb_DX = { "insb", "insb", Yb, DX, XX },
-Ia_insl_Yd_DX = { "insd", "insl", Yd, DX, XX },
-Ia_insw_Yw_DX = { "insw", "insw", Yw, DX, XX },
-Ia_int_Ib = { "int", "int", Ib, XX, XX },
-Ia_int1 = { "int1", "int1", XX, XX, XX },
-Ia_int3 = { "int3", "int3", XX, XX, XX },
-Ia_into = { "into", "into", XX, XX, XX },
-Ia_Invalid = { "(invalid)", "(invalid)", XX, XX, XX },
-Ia_invd = { "invd", "invd", XX, XX, XX },
-Ia_invlpg = { "invlpg", "invlpg", Mx, XX, XX },
-Ia_inw_AX_DX = { "in", "inw", AX, DX, XX },
-Ia_inw_AX_Ib = { "in", "inw", AX, Ib, XX },
-Ia_iretl = { "iretd", "iretd", XX, XX, XX },
-Ia_iretq = { "iretq", "iretq", XX, XX, XX },
-Ia_iretw = { "iret", "iretw", XX, XX, XX },
-Ia_jb_Jb = { "jb", "jb", Jb, XX, XX },
-Ia_jb_Jd = { "jb", "jb", Jd, XX, XX },
-Ia_jb_Jw = { "jb", "jb", Jw, XX, XX },
-Ia_jbe_Jb = { "jbe", "jbe", Jb, XX, XX },
-Ia_jbe_Jd = { "jbe", "jbe", Jd, XX, XX },
-Ia_jbe_Jw = { "jbe", "jbe", Jw, XX, XX },
-Ia_jcxz_Jb = { "jcxz", "jcxz", Jb, XX, XX },
-Ia_jecxz_Jb = { "jecxz", "jecxz", Jb, XX, XX },
-Ia_jl_Jb = { "jl", "jl", Jb, XX, XX },
-Ia_jl_Jd = { "jl", "jl", Jd, XX, XX },
-Ia_jl_Jw = { "jl", "jl", Jw, XX, XX },
-Ia_jle_Jb = { "jle", "jle", Jb, XX, XX },
-Ia_jle_Jd = { "jle", "jle", Jd, XX, XX },
-Ia_jle_Jw = { "jle", "jle", Jw, XX, XX },
-Ia_jmp_Ed = { "jmp", "jmp", Ed, XX, XX },
-Ia_jmp_Eq = { "jmp", "jmp", Eq, XX, XX },
-Ia_jmp_Ew = { "jmp", "jmp", Ew, XX, XX },
-Ia_jmp_Jb = { "jmp", "jmp", Jb, XX, XX },
-Ia_jmp_Jd = { "jmp", "jmp", Jd, XX, XX },
-Ia_jmp_Jw = { "jmp", "jmp", Jw, XX, XX },
-Ia_jnb_Jb = { "jnb", "jnb", Jb, XX, XX },
-Ia_jnb_Jd = { "jnb", "jnb", Jd, XX, XX },
-Ia_jnb_Jw = { "jnb", "jnb", Jw, XX, XX },
-Ia_jnbe_Jb = { "jnbe", "jnbe", Jb, XX, XX },
-Ia_jnbe_Jd = { "jnbe", "jnbe", Jd, XX, XX },
-Ia_jnbe_Jw = { "jnbe", "jnbe", Jw, XX, XX },
-Ia_jnl_Jb = { "jnl", "jnl", Jb, XX, XX },
-Ia_jnl_Jd = { "jnl", "jnl", Jd, XX, XX },
-Ia_jnl_Jw = { "jnl", "jnl", Jw, XX, XX },
-Ia_jnle_Jb = { "jnle", "jnle", Jb, XX, XX },
-Ia_jnle_Jd = { "jnle", "jnle", Jd, XX, XX },
-Ia_jnle_Jw = { "jnle", "jnle", Jw, XX, XX },
-Ia_jno_Jb = { "jno", "jno", Jb, XX, XX },
-Ia_jno_Jd = { "jno", "jno", Jd, XX, XX },
-Ia_jno_Jw = { "jno", "jno", Jw, XX, XX },
-Ia_jnp_Jb = { "jnp", "jnp", Jb, XX, XX },
-Ia_jnp_Jd = { "jnp", "jnp", Jd, XX, XX },
-Ia_jnp_Jw = { "jnp", "jnp", Jw, XX, XX },
-Ia_jns_Jb = { "jns", "jns", Jb, XX, XX },
-Ia_jns_Jd = { "jns", "jns", Jd, XX, XX },
-Ia_jns_Jw = { "jns", "jns", Jw, XX, XX },
-Ia_jnz_Jb = { "jnz", "jnz", Jb, XX, XX },
-Ia_jnz_Jd = { "jnz", "jnz", Jd, XX, XX },
-Ia_jnz_Jw = { "jnz", "jnz", Jw, XX, XX },
-Ia_jo_Jb = { "jo", "jo", Jb, XX, XX },
-Ia_jo_Jd = { "jo", "jo", Jd, XX, XX },
-Ia_jo_Jw = { "jo", "jo", Jw, XX, XX },
-Ia_jp_Jb = { "jp", "jp", Jb, XX, XX },
-Ia_jp_Jd = { "jp", "jp", Jd, XX, XX },
-Ia_jp_Jw = { "jp", "jp", Jw, XX, XX },
-Ia_jrcxz_Jb = { "jrcxz", "jrcxz", Jb, XX, XX },
-Ia_js_Jb = { "js", "js", Jb, XX, XX },
-Ia_js_Jd = { "js", "js", Jd, XX, XX },
-Ia_js_Jw = { "js", "js", Jw, XX, XX },
-Ia_jz_Jb = { "jz", "jz", Jb, XX, XX },
-Ia_jz_Jd = { "jz", "jz", Jd, XX, XX },
-Ia_jz_Jw = { "jz", "jz", Jw, XX, XX },
-Ia_lahf = { "lahf", "lahf", XX, XX, XX },
-Ia_larl_Gd_Ew = { "lar", "larl", Gd, Ew, XX },
-Ia_larq_Gq_Ew = { "lar", "larq", Gq, Ew, XX },
-Ia_larw_Gw_Ew = { "lar", "larw", Gw, Ew, XX },
-Ia_lcall_Apd = { "call far", "lcall", Apd, XX, XX },
-Ia_lcall_Apw = { "call far", "lcall", Apw, XX, XX },
-Ia_lcall_Mp = { "call far", "lcall", Mp, XX, XX },
-Ia_lddqu_Vdq_Mdq = { "lddqu", "lddqu", Vdq, Mdq, XX },
-Ia_ldmxcsr = { "ldmxcsr", "ldmxcsr", Md, XX, XX },
-Ia_ldsl_Gd_Mp = { "lds", "ldsl", Gd, Mp, XX },
-Ia_ldsw_Gw_Mp = { "lds", "ldsw", Gw, Mp, XX },
-Ia_leal_Gd_Md = { "lea", "leal", Gd, Md, XX },
-Ia_leaq_Gq_Mq = { "lea", "leaq", Gq, Mq, XX },
-Ia_leave = { "leave", "leave", XX, XX, XX },
-Ia_leaw_Gw_Mw = { "lea", "leaw", Gw, Mw, XX },
-Ia_lesl_Gd_Mp = { "les", "lesl", Gd, Mp, XX },
-Ia_lesw_Gw_Mp = { "les", "lesw", Gw, Mp, XX },
-Ia_lfence = { "lfence", "lfence", XX, XX, XX },
-Ia_lfsl_Gd_Mp = { "lfs", "lfsl", Gd, Mp, XX },
-Ia_lfsq_Gq_Mp = { "lfs", "lfsq", Gq, Mp, XX },
-Ia_lfsw_Gw_Mp = { "lfs", "lfsw", Gw, Mp, XX },
-Ia_lgdt = { "lgdt", "lgdt", Ms, XX, XX },
-Ia_lgsl_Gd_Mp = { "lgs", "lgsl", Gd, Mp, XX },
-Ia_lgsq_Gq_Mp = { "lgs", "lgsq", Gq, Mp, XX },
-Ia_lgsw_Gw_Mp = { "lgs", "lgsw", Gw, Mp, XX },
-Ia_lidt = { "lidt", "lidt", Ms, XX, XX },
-Ia_ljmp_Apd = { "jmp far", "ljmp", Apd, XX, XX },
-Ia_ljmp_Apw = { "jmp far", "ljmp", Apw, XX, XX },
-Ia_ljmp_Mp = { "jmp far", "ljmp", Mp, XX, XX },
-Ia_lldt = { "lldt", "lldt", Ew, XX, XX },
-Ia_lmsw_Ew = { "lmsw", "lmsw", Ew, XX, XX },
-Ia_lodsb_AL_Xb = { "lodsb", "lodsb", AL, Xb, XX },
-Ia_lodsl_EAX_Xd = { "lodsd", "lodsl", EAX, Xd, XX },
-Ia_lodsq_RAX_Xq = { "lodsq", "lodsq", RAX, Xq, XX },
-Ia_lodsw_AX_Xw = { "lodsw", "lodsw", AX, Xw, XX },
-Ia_loop_Jb = { "loop", "loop", Jb, XX, XX },
-Ia_loope_Jb = { "loope", "loope", Jb, XX, XX },
-Ia_loopne_Jb = { "loopne", "loopne", Jb, XX, XX },
-Ia_lret = { "retf", "lret", XX, XX, XX },
-Ia_lret_Iw = { "retf", "lret", Iw, XX, XX },
-Ia_lsll_Gd_Ew = { "lsl", "lsll", Gd, Ew, XX },
-Ia_lslq_Gq_Ew = { "lsl", "lslq", Gq, Ew, XX },
-Ia_lslw_Gw_Ew = { "lsl", "lslw", Gw, Ew, XX },
-Ia_lssl_Gd_Mp = { "lss", "lssl", Gd, Mp, XX },
-Ia_lssq_Gq_Mp = { "lss", "lssq", Gq, Mp, XX },
-Ia_lssw_Gw_Mp = { "lss", "lssw", Gw, Mp, XX },
-Ia_ltr = { "ltr", "ltr", Ew, XX, XX },
-Ia_maskmovdqu_Vdq_Udq = { "maskmovdqu", "maskmovdqu", Vdq, Udq, XX },
-Ia_maskmovq_Pq_Nq = { "maskmovq", "maskmovq", Pq, Nq, XX },
-Ia_maxpd_Vpd_Wpd = { "maxpd", "maxpd", Vpd, Wpd, XX },
-Ia_maxps_Vps_Wps = { "maxps", "maxps", Vps, Wps, XX },
-Ia_maxsd_Vsd_Wsd = { "maxsd", "maxsd", Vsd, Wsd, XX },
-Ia_maxss_Vss_Wss = { "maxss", "maxss", Vss, Wss, XX },
-Ia_mfence = { "mfence", "mfence", XX, XX, XX },
-Ia_minpd_Vpd_Wpd = { "minpd", "minpd", Vpd, Wpd, XX },
-Ia_minps_Vps_Wps = { "minps", "minps", Vps, Wps, XX },
-Ia_minsd_Vsd_Wsd = { "minsd", "minsd", Vsd, Wsd, XX },
-Ia_minss_Vss_Wss = { "minss", "minss", Vss, Wss, XX },
-Ia_monitor = { "monitor", "monitor", XX, XX, XX },
-Ia_movapd_Vpd_Wpd = { "movapd", "movapd", Vpd, Wpd, XX },
-Ia_movapd_Wpd_Vpd = { "movapd", "movapd", Wpd, Vpd, XX },
-Ia_movaps_Vps_Wps = { "movaps", "movaps", Vps, Wps, XX },
-Ia_movaps_Wps_Vps = { "movaps", "movaps", Wps, Vps, XX },
-Ia_movb_AL_Ob = { "mov", "movb", AL, Ob, XX },
-Ia_movb_Eb_Gb = { "mov", "movb", Eb, Gb, XX },
-Ia_movb_Eb_Ib = { "mov", "movb", Eb, Ib, XX },
-Ia_movb_Gb_Eb = { "mov", "movb", Gb, Eb, XX },
-Ia_movb_Ob_AL = { "mov", "movb", Ob, AL, XX },
-Ia_movb_R8_Ib = { "mov", "movb", R8, Ib, XX },
-Ia_movd_Ed_Pq = { "movd", "movd", Ed, Pq, XX },
-Ia_movd_Ed_Vd = { "movd", "movd", Ed, Vdq, XX },
-Ia_movd_Pq_Ed = { "movd", "movd", Pq, Ed, XX },
-Ia_movd_Vdq_Ed = { "movd", "movd", Vdq, Ed, XX },
-Ia_movddup_Vdq_Wq = { "movddup", "movddup", Vdq, Wq, XX },
-Ia_movdq2q_Pq_Vq = { "movdq2q", "movdq2q", Pq, Vq, XX },
-Ia_movdqa_Vdq_Wdq = { "movdqa", "movdqa", Vdq, Wdq, XX },
-Ia_movdqa_Wdq_Vdq = { "movdqa", "movdqa", Wdq, Vdq, XX },
-Ia_movdqu_Vdq_Wdq = { "movdqu", "movdqu", Vdq, Wdq, XX },
-Ia_movdqu_Wdq_Vdq = { "movdqu", "movdqu", Wdq, Vdq, XX },
-Ia_movhlpd_Vpd_Uq = { "movhlpd", "movhlpd", Vpd, Udq, XX },
-Ia_movhlps_Vps_Uq = { "movhlps", "movhlps", Vps, Udq, XX },
-Ia_movhpd_Mq_Vpd = { "movhpd", "movhpd", Mq, Vpd, XX },
-Ia_movhpd_Vpd_Mq = { "movhpd", "movhpd", Vpd, Mq, XX },
-Ia_movhps_Mq_Vps = { "movhps", "movhps", Mq, Vps, XX },
-Ia_movhps_Vps_Mq = { "movhps", "movhps", Vps, Mq, XX },
-Ia_movl_Cd_Rd = { "mov", "movl", Cd, Rd, XX },
-Ia_movl_Dd_Rd = { "mov", "movl", Dd, Rd, XX },
-Ia_movl_EAX_Od = { "mov", "movl", EAX, Od, XX },
-Ia_movl_Ed_Gd = { "mov", "movl", Ed, Gd, XX },
-Ia_movl_Ed_Id = { "mov", "movl", Ed, Id, XX },
-Ia_movl_ERX_Id = { "mov", "movl", ERX, Id, XX },
-Ia_movl_Gd_Ed = { "mov", "movl", Gd, Ed, XX },
-Ia_movl_Od_EAX = { "mov", "movl", Od, EAX, XX },
-Ia_movl_Rd_Cd = { "mov", "movl", Rd, Cd, XX },
-Ia_movl_Rd_Dd = { "mov", "movl", Rd, Dd, XX },
-Ia_movl_Rd_Td = { "mov", "movl", Rd, Td, XX },
-Ia_movl_Td_Rd = { "mov", "movl", Td, Rd, XX },
-Ia_movlhpd_Vpd_Uq = { "movlhpd", "movlhpd", Vpd, Udq, XX },
-Ia_movlhps_Vps_Uq = { "movlhps", "movlhps", Vps, Udq, XX },
-Ia_movlpd_Mq_Vpd = { "movlpd", "movlpd", Mq, Vpd, XX },
-Ia_movlpd_Vpd_Mq = { "movlpd", "movlpd", Vpd, Mq, XX },
-Ia_movlps_Mq_Vps = { "movlps", "movlps", Mq, Vps, XX },
-Ia_movlps_Vps_Mq = { "movlps", "movlps", Vps, Mq, XX },
-Ia_movmskpd_Gd_Vpd = { "movmskpd", "movmskpd", Gd, Vpd, XX },
-Ia_movmskps_Gd_Vps = { "movmskps", "movmskps", Gd, Vps, XX },
-Ia_movntdq_Mdq_Vdq = { "movntdq", "movntdq", Mdq, Vdq, XX },
-Ia_movnti_Md_Gd = { "movnti", "movnti", Md, Gd, XX },
-Ia_movntiq_Mq_Gq = { "movntiq", "movntiq", Mq, Gq, XX },
-Ia_movntpd_Mpd_Vpd = { "movntpd", "movntpd", Mpd, Vpd, XX },
-Ia_movntps_Mps_Vps = { "movntps", "movntps", Mps, Vps, XX },
-Ia_movntq_Mq_Pq = { "movntq", "movntq", Mq, Pq, XX },
-Ia_movq_Cq_Rq = { "mov", "movq", Cq, Rq, XX },
-Ia_movq_Dq_Rq = { "mov", "movq", Dq, Rq, XX },
-Ia_movq_Eq_Gq = { "mov", "movq", Eq, Gq, XX },
-Ia_movq_Eq_Pq = { "movq", "movq", Eq, Pq, XX },
-Ia_movq_Eq_sId = { "mov", "movq", Eq, sIdq, XX },
-Ia_movq_Eq_Vq = { "movq", "movq", Eq, Vq, XX },
-Ia_movq_Gq_Eq = { "mov", "movq", Gq, Eq, XX },
-Ia_movq_Oq_RAX = { "mov", "movq", Oq, RAX, XX },
-Ia_movq_Pq_Eq = { "movq", "movq", Pq, Eq, XX },
-Ia_movq_Pq_Qq = { "movq", "movq", Pq, Qq, XX },
-Ia_movq_Qq_Pq = { "movq", "movq", Qq, Pq, XX },
-Ia_movq_RAX_Oq = { "mov", "movq", RAX, Oq, XX },
-Ia_movq_Rq_Cq = { "mov", "movq", Rq, Cq, XX },
-Ia_movq_Rq_Dq = { "mov", "movq", Rq, Dq, XX },
-Ia_movq_RRX_Iq = { "mov", "movq", RRX, Iq, XX },
-Ia_movq_Vdq_Eq = { "movq", "movq", Vdq, Eq, XX },
-Ia_movq_Vq_Wq = { "movq", "movq", Vq, Wq, XX },
-Ia_movq_Wq_Vq = { "movq", "movq", Wq, Vq, XX },
-Ia_movq2dq_Vdq_Qq = { "movq2dq", "movq2dq", Vdq, Qq, XX },
-Ia_movsb_Yb_Xb = { "movsb", "movsb", Yb, Xb, XX },
-Ia_movsbl_Gd_Eb = { "movsx", "movsbl", Gd, Eb, XX },
-Ia_movsbq_Gq_Eb = { "movsx", "movsbq", Gq, Eb, XX },
-Ia_movsbw_Gw_Eb = { "movsx", "movsbw", Gw, Eb, XX },
-Ia_movsd_Vsd_Wsd = { "movsd", "movsd", Vsd, Wsd, XX },
-Ia_movsd_Wsd_Vsd = { "movsd", "movsd", Wsd, Vsd, XX },
-Ia_movshdup_Vdq_Wdq = { "movshdup", "movshdup", Vdq, Wdq, XX },
-Ia_movsl_Yd_Xd = { "movsd", "movsl", Yd, Xd, XX },
-Ia_movsldup_Vdq_Wdq = { "movsldup", "movsldup", Vdq, Wdq, XX },
-Ia_movslq_Gq_Ed = { "movsxd", "movslq", Gq, Ed, XX },
-Ia_movsq_Yq_Xq = { "movsq", "movsq", Yq, Xq, XX },
-Ia_movss_Vss_Wss = { "movss", "movss", Vss, Wss, XX },
-Ia_movss_Wss_Vss = { "movss", "movss", Wss, Vss, XX },
-Ia_movsw_Yw_Xw = { "movsw", "movsw", Yw, Xw, XX },
-Ia_movswl_Gd_Ew = { "movsx", "movswl", Gd, Ew, XX },
-Ia_movswq_Gq_Ew = { "movsx", "movswq", Gq, Ew, XX },
-Ia_movupd_Vpd_Wpd = { "movupd", "movupd", Vpd, Wpd, XX },
-Ia_movupd_Wpd_Vpd = { "movupd", "movupd", Wpd, Vpd, XX },
-Ia_movups_Vps_Wps = { "movups", "movups", Vps, Wps, XX },
-Ia_movups_Wps_Vps = { "movups", "movups", Wps, Vps, XX },
-Ia_movw_AX_Ow = { "mov", "movw", AX, Ow, XX },
-Ia_movw_Ew_Gw = { "mov", "movw", Ew, Gw, XX },
-Ia_movw_Ew_Iw = { "mov", "movw", Ew, Iw, XX },
-Ia_movw_Ew_Sw = { "mov", "movw", Ew, Sw, XX },
-Ia_movw_Gw_Ew = { "mov", "movw", Gw, Ew, XX },
-Ia_movw_Ow_AX = { "mov", "movw", Ow, AX, XX },
-Ia_movw_RX_Iw = { "mov", "movw", RX, Iw, XX },
-Ia_movw_Sw_Ew = { "mov", "movw", Sw, Ew, XX },
-Ia_movzbl_Gd_Eb = { "movzx", "movzbl", Gd, Eb, XX },
-Ia_movzbq_Gq_Eb = { "movzx", "movzbq", Gq, Eb, XX },
-Ia_movzbw_Gw_Eb = { "movzx", "movzbw", Gw, Eb, XX },
-Ia_movzwl_Gd_Ew = { "movzx", "movzwl", Gd, Ew, XX },
-Ia_movzwq_Gq_Ew = { "movzx", "movzwq", Gq, Ew, XX },
-Ia_mulb_AL_Eb = { "mul", "mulb", AL, Eb, XX },
-Ia_mull_EAX_Ed = { "mul", "mull", EAX, Ed, XX },
-Ia_mulpd_Vpd_Wpd = { "mulpd", "mulpd", Vpd, Wpd, XX },
-Ia_mulps_Vps_Wps = { "mulps", "mulps", Vps, Wps, XX },
-Ia_mulq_RAX_Eq = { "mul", "mulq", RAX, Eq, XX },
-Ia_mulsd_Vsd_Wsd = { "mulsd", "mulsd", Vsd, Wsd, XX },
-Ia_mulss_Vss_Wss = { "mulss", "mulss", Vss, Wss, XX },
-Ia_multibyte_nop = { "multibyte nop", "multibyte nop", XX, XX, XX },
-Ia_mulw_AX_Ew = { "mul", "mulw", AX, Ew, XX },
-Ia_mwait = { "mwait", "mwait", XX, XX, XX },
-Ia_negb_Eb = { "neg", "negb", Eb, XX, XX },
-Ia_negl_Ed = { "neg", "negl", Ed, XX, XX },
-Ia_negq_Eq = { "neg", "negq", Eq, XX, XX },
-Ia_negw_Ew = { "neg", "negw", Ew, XX, XX },
-Ia_nop = { "nop", "nop", XX, XX, XX },
-Ia_notb_Eb = { "not", "notb", Eb, XX, XX },
-Ia_notl_Ed = { "not", "notl", Ed, XX, XX },
-Ia_notq_Eq = { "not", "notq", Eq, XX, XX },
-Ia_notw_Ew = { "not", "notw", Ew, XX, XX },
-Ia_orb_AL_Ib = { "or", "orb", AL, Ib, XX },
-Ia_orb_Eb_Gb = { "or", "orb", Eb, Gb, XX },
-Ia_orb_Eb_Ib = { "or", "orb", Eb, Ib, XX },
-Ia_orb_Gb_Eb = { "or", "orb", Gb, Eb, XX },
-Ia_orl_EAX_Id = { "or", "orl", EAX, Id, XX },
-Ia_orl_Ed_Gd = { "or", "orl", Ed, Gd, XX },
-Ia_orl_Ed_Id = { "or", "orl", Ed, Id, XX },
-Ia_orl_Ed_sIb = { "or", "orl", Ed, sIbd, XX },
-Ia_orl_Gd_Ed = { "or", "orl", Gd, Ed, XX },
-Ia_orpd_Vpd_Wpd = { "orpd", "orpd", Vpd, Wpd, XX },
-Ia_orps_Vps_Wps = { "orps", "orps", Vps, Wps, XX },
-Ia_orq_Eq_Gq = { "or", "orq", Eq, Gq, XX },
-Ia_orq_Eq_sIb = { "or", "orq", Eq, sIbq, XX },
-Ia_orq_Eq_sId = { "or", "orq", Eq, sIdq, XX },
-Ia_orq_Gq_Eq = { "or", "orq", Gq, Eq, XX },
-Ia_orq_RAX_sId = { "or", "orq", RAX, sIdq, XX },
-Ia_orw_AX_Iw = { "or", "orw", AX, Iw, XX },
-Ia_orw_Ew_Gw = { "or", "orw", Ew, Gw, XX },
-Ia_orw_Ew_Iw = { "or", "orw", Ew, Iw, XX },
-Ia_orw_Ew_sIb = { "or", "orw", Ew, sIbw, XX },
-Ia_orw_Gw_Ew = { "or", "orw", Gw, Ew, XX },
-Ia_outb_DX_AL = { "out", "outb", DX, AL, XX },
-Ia_outb_Ib_AL = { "out", "outb", Ib, AL, XX },
-Ia_outl_DX_EAX = { "out", "outl", DX, EAX, XX },
-Ia_outl_Ib_EAX = { "out", "outl", Ib, EAX, XX },
-Ia_outsb_DX_Xb = { "outsb", "outsb", DX, Xb, XX },
-Ia_outsl_DX_Xd = { "outsd", "outsl", DX, Xd, XX },
-Ia_outsw_DX_Xw = { "outsw", "outsw", DX, Xw, XX },
-Ia_outw_DX_AX = { "out", "outw", DX, AX, XX },
-Ia_outw_Ib_AX = { "out", "outw", Ib, AX, XX },
-Ia_pabsb_Pq_Qq = { "pabsb", "pabsb", Pq, Qq, XX },
-Ia_pabsb_Vdq_Wdq = { "pabsb", "pabsb", Vdq, Wdq, XX },
-Ia_pabsd_Pq_Qq = { "pabsd", "pabsd", Pq, Qq, XX },
-Ia_pabsd_Vdq_Wdq = { "pabsd", "pabsd", Vdq, Wdq, XX },
-Ia_pabsw_Pq_Qq = { "pabsw", "pabsw", Pq, Qq, XX },
-Ia_pabsw_Vdq_Wdq = { "pabsw", "pabsw", Vdq, Wdq, XX },
-Ia_packssdw_Pq_Qq = { "packssdw", "packssdw", Pq, Qq, XX },
-Ia_packssdw_Vdq_Wdq = { "packssdw", "packssdw", Vdq, Wdq, XX },
-Ia_packsswb_Pq_Qq = { "packsswb", "packsswb", Pq, Qq, XX },
-Ia_packsswb_Vdq_Wq = { "packsswb", "packsswb", Vdq, Wq, XX },
-Ia_packuswb_Pq_Qq = { "packuswb", "packuswb", Pq, Qq, XX },
-Ia_packuswb_Vdq_Wdq = { "packuswb", "packuswb", Vdq, Wdq, XX },
-Ia_paddb_Pq_Qq = { "paddb", "paddb", Pq, Qq, XX },
-Ia_paddb_Vdq_Wdq = { "paddb", "paddb", Vdq, Wdq, XX },
-Ia_paddd_Pq_Qq = { "paddd", "paddd", Pq, Qq, XX },
-Ia_paddd_Vdq_Wdq = { "paddd", "paddd", Vdq, Wdq, XX },
-Ia_paddq_Pq_Qq = { "paddq", "paddq", Pq, Qq, XX },
-Ia_paddq_Vdq_Wdq = { "paddq", "paddq", Vdq, Wdq, XX },
-Ia_paddsb_Pq_Qq = { "paddsb", "paddsb", Pq, Qq, XX },
-Ia_paddsb_Vdq_Wdq = { "paddsb", "paddsb", Vdq, Wdq, XX },
-Ia_paddsw_Pq_Qq = { "paddsw", "paddsw", Pq, Qq, XX },
-Ia_paddsw_Vdq_Wdq = { "paddsw", "paddsw", Vdq, Wdq, XX },
-Ia_paddusb_Pq_Qq = { "paddusb", "paddusb", Pq, Qq, XX },
-Ia_paddusb_Vdq_Wdq = { "paddusb", "paddusb", Vdq, Wdq, XX },
-Ia_paddusw_Pq_Qq = { "paddusw", "paddusw", Pq, Qq, XX },
-Ia_paddusw_Vdq_Wdq = { "paddusw", "paddusw", Vdq, Wdq, XX },
-Ia_paddw_Pq_Qq = { "paddw", "paddw", Pq, Qq, XX },
-Ia_paddw_Vdq_Wdq = { "paddw", "paddw", Vdq, Wdq, XX },
-Ia_palignr_Pq_Qq_Ib = { "palignr", "palignr", Pq, Qq, Ib },
-Ia_palignr_Vdq_Wdq_Ib = { "palignr", "palignr", Vdq, Wdq, Ib },
-Ia_pand_Pq_Qq = { "pand", "pand", Pq, Qq, XX },
-Ia_pand_Vdq_Wdq = { "pand", "pand", Vdq, Wdq, XX },
-Ia_pandn_Pq_Qq = { "pandn", "pandn", Pq, Qq, XX },
-Ia_pandn_Vdq_Wdq = { "pandn", "pandn", Vdq, Wdq, XX },
-Ia_pause = { "pause", "pause", XX, XX, XX },
-Ia_pavgb_Pq_Qq = { "pavgb", "pavgb", Pq, Qq, XX },
-Ia_pavgb_Vdq_Wdq = { "pavgb", "pavgb", Vdq, Wdq, XX },
-Ia_pavgw_Pq_Qq = { "pavgw", "pavgw", Pq, Qq, XX },
-Ia_pavgw_Vdq_Wdq = { "pavgw", "pavgw", Vdq, Wdq, XX },
-Ia_pcmpeqb_Pq_Qq = { "pcmpeqb", "pcmpeqb", Pq, Qq, XX },
-Ia_pcmpeqb_Vdq_Wdq = { "pcmpeqb", "pcmpeqb", Vdq, Wdq, XX },
-Ia_pcmpeqd_Pq_Qq = { "pcmpeqd", "pcmpeqd", Pq, Qq, XX },
-Ia_pcmpeqd_Vdq_Wdq = { "pcmpeqd", "pcmpeqd", Vdq, Wdq, XX },
-Ia_pcmpeqw_Pq_Qq = { "pcmpeqw", "pcmpeqw", Pq, Qq, XX },
-Ia_pcmpeqw_Vdq_Wdq = { "pcmpeqw", "pcmpeqw", Vdq, Wdq, XX },
-Ia_pcmpgtb_Pq_Qq = { "pcmpgtb", "pcmpgtb", Pq, Qq, XX },
-Ia_pcmpgtb_Vdq_Wq = { "pcmpgtb", "pcmpgtb", Vdq, Wq, XX },
-Ia_pcmpgtd_Pq_Qq = { "pcmpgtd", "pcmpgtd", Pq, Qq, XX },
-Ia_pcmpgtd_Vdq_Wdq = { "pcmpgtd", "pcmpgtd", Vdq, Wdq, XX },
-Ia_pcmpgtw_Pq_Qq = { "pcmpgtw", "pcmpgtw", Pq, Qq, XX },
-Ia_pcmpgtw_Vdq_Wq = { "pcmpgtw", "pcmpgtw", Vdq, Wq, XX },
-Ia_pextrw_Gd_Nq_Ib = { "pextrw", "pextrw", Gd, Nq, Ib },
-Ia_pextrw_Gd_Udq_Ib = { "pextrw", "pextrw", Gd, Udq, Ib },
-Ia_pf2id_Pq_Qq = { "pf2id", "pf2id", Pq, Qq, XX },
-Ia_pf2iw_Pq_Qq = { "pf2iw", "pf2iw", Pq, Qq, XX },
-Ia_pfacc_Pq_Qq = { "pfacc", "pfacc", Pq, Qq, XX },
-Ia_pfadd_Pq_Qq = { "pfadd", "pfadd", Pq, Qq, XX },
-Ia_pfcmpeq_Pq_Qq = { "pfcmpeq", "pfcmpeq", Pq, Qq, XX },
-Ia_pfcmpge_Pq_Qq = { "pfcmpge", "pfcmpge", Pq, Qq, XX },
-Ia_pfcmpgt_Pq_Qq = { "pfcmpgt", "pfcmpgt", Pq, Qq, XX },
-Ia_pfmax_Pq_Qq = { "pfmax", "pfmax", Pq, Qq, XX },
-Ia_pfmin_Pq_Qq = { "pfmin", "pfmin", Pq, Qq, XX },
-Ia_pfmul_Pq_Qq = { "pfmul", "pfmul", Pq, Qq, XX },
-Ia_pfnacc_Pq_Qq = { "pfnacc", "pfnacc", Pq, Qq, XX },
-Ia_pfpnacc_Pq_Qq = { "pfpnacc", "pfpnacc", Pq, Qq, XX },
-Ia_pfrcp_Pq_Qq = { "pfrcp", "pfrcp", Pq, Qq, XX },
-Ia_pfrcpit1_Pq_Qq = { "pfrcpit1", "pfrcpit1", Pq, Qq, XX },
-Ia_pfrcpit2_Pq_Qq = { "pfrcpit2", "pfrcpit2", Pq, Qq, XX },
-Ia_pfrsqit1_Pq_Qq = { "pfrsqit1", "pfrsqit1", Pq, Qq, XX },
-Ia_pfrsqrt_Pq_Qq = { "pfrsqrt", "pfrsqrt", Pq, Qq, XX },
-Ia_pfsub_Pq_Qq = { "pfsub", "pfsub", Pq, Qq, XX },
-Ia_pfsubr_Pq_Qq = { "pfsubr", "pfsubr", Pq, Qq, XX },
-Ia_phaddd_Pq_Qq = { "phaddd", "phaddd", Pq, Qq, XX },
-Ia_phaddd_Vdq_Wdq = { "phaddd", "phaddd", Vdq, Wdq, XX },
-Ia_phaddsw_Pq_Qq = { "phaddsw", "phaddsw", Pq, Qq, XX },
-Ia_phaddsw_Vdq_Wdq = { "phaddsw", "phaddsw", Vdq, Wdq, XX },
-Ia_phaddw_Pq_Qq = { "phaddw", "phaddw", Pq, Qq, XX },
-Ia_phaddw_Vdq_Wdq = { "phaddw", "phaddw", Vdq, Wdq, XX },
-Ia_phsubd_Pq_Qq = { "phsubd", "phsubd", Pq, Qq, XX },
-Ia_phsubd_Vdq_Wdq = { "phsubd", "phsubd", Vdq, Wdq, XX },
-Ia_phsubsw_Pq_Qq = { "phsubsw", "phsubsw", Pq, Qq, XX },
-Ia_phsubsw_Vdq_Wdq = { "phsubsw", "phsubsw", Vdq, Wdq, XX },
-Ia_phsubw_Pq_Qq = { "phsubw", "phsubw", Pq, Qq, XX },
-Ia_phsubw_Vdq_Wdq = { "phsubw", "phsubw", Vdq, Wdq, XX },
-Ia_pi2fd_Pq_Qq = { "pi2fd", "pi2fd", Pq, Qq, XX },
-Ia_pi2fw_Pq_Qq = { "pi2fw", "pi2fw", Pq, Qq, XX },
-Ia_pinsrw_Pq_Ed_Ib = { "pinsrw", "pinsrw", Pq, Ed, Ib },
-Ia_pinsrw_Vdq_Ed_Ib = { "pinsrw", "pinsrw", Vdq, Ed, Ib },
-Ia_pmaddubsw_Pq_Qq = { "pmaddubsw", "pmaddubsw", Pq, Qq, XX },
-Ia_pmaddubsw_Vdq_Wdq = { "pmaddubsw", "pmaddubsw", Vdq, Wdq, XX },
-Ia_pmaddwd_Pq_Qq = { "pmaddwd", "pmaddwd", Pq, Qq, XX },
-Ia_pmaddwd_Vdq_Wdq = { "pmaddwd", "pmaddwd", Vdq, Wdq, XX },
-Ia_pmaxub_Pq_Qq = { "pmaxub", "pmaxub", Pq, Qq, XX },
-Ia_pmaxub_Vdq_Wdq = { "pmaxub", "pmaxub", Vdq, Wdq, XX },
-Ia_pmaxuw_Pq_Qq = { "pmaxuw", "pmaxuw", Pq, Qq, XX },
-Ia_pmaxuw_Vdq_Wdq = { "pmaxuw", "pmaxuw", Vdq, Wdq, XX },
-Ia_pminsw_Pq_Qq = { "pminsw", "pminsw", Pq, Qq, XX },
-Ia_pminsw_Vdq_Wdq = { "pminsw", "pminsw", Vdq, Wdq, XX },
-Ia_pminub_Pq_Qq = { "pminub", "pminub", Pq, Qq, XX },
-Ia_pminub_Vdq_Wdq = { "pminub", "pminub", Vdq, Wdq, XX },
-Ia_pmovmskb_Gd_Nq = { "pmovmskb", "pmovmskb", Gd, Nq, XX },
-Ia_pmovmskb_Gd_Udq = { "pmovmskb", "pmovmskb", Gd, Udq, XX },
-Ia_pmulhrsw_Pq_Qq = { "pmulhrsw", "pmulhrsw", Pq, Qq, XX },
-Ia_pmulhrsw_Vdq_Wdq = { "pmulhrsw", "pmulhrsw", Vdq, Wdq, XX },
-Ia_pmulhrw_Pq_Qq = { "pmulhrw", "pmulhrw", Pq, Qq, XX },
-Ia_pmulhuw_Pq_Qq = { "pmulhuw", "pmulhuw", Pq, Qq, XX },
-Ia_pmulhuw_Vdq_Wdq = { "pmulhuw", "pmulhuw", Vdq, Wdq, XX },
-Ia_pmulhw_Pq_Qq = { "pmulhw", "pmulhw", Pq, Qq, XX },
-Ia_pmulhw_Vdq_Wdq = { "pmulhw", "pmulhw", Vdq, Wdq, XX },
-Ia_pmullw_Pq_Qq = { "pmullw", "pmullw", Pq, Qq, XX },
-Ia_pmullw_Vdq_Wdq = { "pmullw", "pmullw", Vdq, Wdq, XX },
-Ia_pmuludq_Pq_Qq = { "pmuludq", "pmuludq", Pq, Qq, XX },
-Ia_pmuludq_Vdq_Wdq = { "pmuludq", "pmuludq", Vdq, Wdq, XX },
-Ia_popal = { "popad", "popal", XX, XX, XX },
-Ia_popaw = { "popa", "popa", XX, XX, XX },
-Ia_popfl = { "popfd", "popfl", XX, XX, XX },
-Ia_popfq = { "popfq", "popfq", XX, XX, XX },
-Ia_popfw = { "popf", "popf", XX, XX, XX },
-Ia_popl_DS = { "pop", "popl", DS, XX, XX },
-Ia_popl_Ed = { "pop", "popl", Ed, XX, XX },
-Ia_popl_ERX = { "pop", "popl", ERX, XX, XX },
-Ia_popl_ES = { "pop", "popl", ES, XX, XX },
-Ia_popl_FS = { "pop", "popl", FS, XX, XX },
-Ia_popl_GS = { "pop", "popl", GS, XX, XX },
-Ia_popl_SS = { "pop", "popl", SS, XX, XX },
-Ia_popq_Eq = { "pop", "popq", Eq, XX, XX },
-Ia_popq_FS = { "pop", "popq", FS, XX, XX },
-Ia_popq_GS = { "pop", "popq", GS, XX, XX },
-Ia_popq_RRX = { "pop", "popq", RRX, XX, XX },
-Ia_popw_DS = { "pop", "popw", DS, XX, XX },
-Ia_popw_ES = { "pop", "popw", ES, XX, XX },
-Ia_popw_Ew = { "pop", "popw", Ew, XX, XX },
-Ia_popw_FS = { "pop", "popw", FS, XX, XX },
-Ia_popw_GS = { "pop", "popw", GS, XX, XX },
-Ia_popw_RX = { "pop", "popw", RX, XX, XX },
-Ia_popw_SS = { "pop", "popw", SS, XX, XX },
-Ia_por_Pq_Qq = { "por", "por", Pq, Qq, XX },
-Ia_por_Vdq_Wdq = { "por", "por", Vdq, Wdq, XX },
-Ia_prefetch = { "prefetch (3dnow!)", "prefetch (3dnow!)", Mb, XX, XX },
-Ia_prefetchnta = { "prefetchnta", "prefetchnta", Mb, XX, XX },
-Ia_prefetcht0 = { "prefetcht0", "prefetcht0", Mb, XX, XX },
-Ia_prefetcht1 = { "prefetcht1", "prefetcht1", Mb, XX, XX },
-Ia_prefetcht2 = { "prefetcht2", "prefetcht2", Mb, XX, XX },
-Ia_prefix_asize = { "asize", "asize", XX, XX, XX },
-Ia_prefix_cs = { "cs", "cs", XX, XX, XX },
-Ia_prefix_ds = { "ds", "ds", XX, XX, XX },
-Ia_prefix_es = { "es", "es", XX, XX, XX },
-Ia_prefix_fs = { "fs", "fs", XX, XX, XX },
-Ia_prefix_gs = { "gs", "gs", XX, XX, XX },
-Ia_prefix_lock = { "lock", "lock", XX, XX, XX },
-Ia_prefix_osize = { "osize", "osize", XX, XX, XX },
-Ia_prefix_rep = { "rep", "rep", XX, XX, XX },
-Ia_prefix_repne = { "repne", "repne", XX, XX, XX },
-Ia_prefix_rex = { "rex", "rex", XX, XX, XX },
-Ia_prefix_ss = { "ss", "ss", XX, XX, XX },
-Ia_psadbw_Pq_Qq = { "psadbw", "psadbw", Pq, Qq, XX },
-Ia_psadbw_Vdq_Wdq = { "psadbw", "psadbw", Vdq, Wdq, XX },
-Ia_pshufb_Pq_Qq = { "pshufb", "pshufb", Pq, Qq, XX },
-Ia_pshufb_Vdq_Wdq = { "pshufb", "pshufb", Vdq, Wdq, XX },
-Ia_pshufd_Vdq_Wdq_Ib = { "pshufd", "pshufd", Vdq, Wdq, Ib },
-Ia_pshufhw_Vq_Wq_Ib = { "pshufhw", "pshufhw", Vq, Wq, Ib },
-Ia_pshuflw_Vq_Wq_Ib = { "pshuflw", "pshuflw", Vq, Wq, Ib },
-Ia_pshufw_Pq_Qq_Ib = { "pshufw", "pshufw", Pq, Qq, Ib },
-Ia_psignb_Pq_Qq = { "psignb", "psignb", Pq, Qq, XX },
-Ia_psignb_Vdq_Wdq = { "psignb", "psignb", Vdq, Wdq, XX },
-Ia_psignd_Pq_Qq = { "psignd", "psignd", Pq, Qq, XX },
-Ia_psignd_Vdq_Wdq = { "psignd", "psignd", Vdq, Wdq, XX },
-Ia_psignw_Pq_Qq = { "psignw", "psignw", Pq, Qq, XX },
-Ia_psignw_Vdq_Wdq = { "psignw", "psignw", Vdq, Wdq, XX },
-Ia_pslld_Nq_Ib = { "pslld", "pslld", Nq, Ib, XX },
-Ia_pslld_Pq_Qq = { "pslld", "pslld", Pq, Qq, XX },
-Ia_pslld_Udq_Ib = { "pslld", "pslld", Udq, Ib, XX },
-Ia_pslld_Vdq_Wdq = { "pslld", "pslld", Vdq, Wdq, XX },
-Ia_pslldq_Udq_Ib = { "pslldq", "pslldq", Udq, Ib, XX },
-Ia_psllq_Nq_Ib = { "psllq", "psllq", Nq, Ib, XX },
-Ia_psllq_Pq_Qq = { "psllq", "psllq", Pq, Qq, XX },
-Ia_psllq_Udq_Ib = { "psllq", "psllq", Udq, Ib, XX },
-Ia_psllq_Vdq_Wdq = { "psllq", "psllq", Vdq, Wdq, XX },
-Ia_psllw_Nq_Ib = { "psllw", "psllw", Nq, Ib, XX },
-Ia_psllw_Pq_Qq = { "psllw", "psllw", Pq, Qq, XX },
-Ia_psllw_Udq_Ib = { "psllw", "psllw", Udq, Ib, XX },
-Ia_psllw_Vdq_Wdq = { "psllw", "psllw", Vdq, Wdq, XX },
-Ia_psrad_Nq_Ib = { "psrad", "psrad", Nq, Ib, XX },
-Ia_psrad_Pq_Qq = { "psrad", "psrad", Pq, Qq, XX },
-Ia_psrad_Udq_Ib = { "psrad", "psrad", Udq, Ib, XX },
-Ia_psrad_Vdq_Wdq = { "psrad", "psrad", Vdq, Wdq, XX },
-Ia_psraw_Nq_Ib = { "psraw", "psraw", Nq, Ib, XX },
-Ia_psraw_Pq_Qq = { "psraw", "psraw", Pq, Qq, XX },
-Ia_psraw_Udq_Ib = { "psraw", "psraw", Udq, Ib, XX },
-Ia_psraw_Vdq_Wdq = { "psraw", "psraw", Vdq, Wdq, XX },
-Ia_psrld_Nq_Ib = { "psrld", "psrld", Nq, Ib, XX },
-Ia_psrld_Pq_Qq = { "psrld", "psrld", Pq, Qq, XX },
-Ia_psrld_Udq_Ib = { "psrld", "psrld", Udq, Ib, XX },
-Ia_psrld_Vdq_Wdq = { "psrld", "psrld", Vdq, Wdq, XX },
-Ia_psrldq_Udq_Ib = { "psrldq", "psrldq", Udq, Ib, XX },
-Ia_psrlq_Nq_Ib = { "psrlq", "psrlq", Nq, Ib, XX },
-Ia_psrlq_Pq_Qq = { "psrlq", "psrlq", Pq, Qq, XX },
-Ia_psrlq_Udq_Ib = { "psrlq", "psrlq", Udq, Ib, XX },
-Ia_psrlq_Vdq_Wdq = { "psrlq", "psrlq", Vdq, Wdq, XX },
-Ia_psrlw_Nq_Ib = { "psrlw", "psrlw", Nq, Ib, XX },
-Ia_psrlw_Pq_Qq = { "psrlw", "psrlw", Pq, Qq, XX },
-Ia_psrlw_Udq_Ib = { "psrlw", "psrlw", Udq, Ib, XX },
-Ia_psrlw_Vdq_Wdq = { "psrlw", "psrlw", Vdq, Wdq, XX },
-Ia_psubb_Pq_Qq = { "psubb", "psubb", Pq, Qq, XX },
-Ia_psubb_Vdq_Wdq = { "psubb", "psubb", Vdq, Wdq, XX },
-Ia_psubd_Pq_Qq = { "psubd", "psubd", Pq, Qq, XX },
-Ia_psubd_Vdq_Wdq = { "psubd", "psubd", Vdq, Wdq, XX },
-Ia_psubq_Pq_Qq = { "psubq", "psubq", Pq, Qq, XX },
-Ia_psubq_Vdq_Wdq = { "psubq", "psubq", Vdq, Wdq, XX },
-Ia_psubsb_Pq_Qq = { "psubsb", "psubsb", Pq, Qq, XX },
-Ia_psubsb_Vdq_Wdq = { "psubsb", "psubsb", Vdq, Wdq, XX },
-Ia_psubsw_Pq_Qq = { "psubsw", "psubsw", Pq, Qq, XX },
-Ia_psubsw_Vdq_Wdq = { "psubsw", "psubsw", Vdq, Wdq, XX },
-Ia_psubusb_Pq_Qq = { "psubusb", "psubusb", Pq, Qq, XX },
-Ia_psubusb_Vdq_Wdq = { "psubusb", "psubusb", Vdq, Wdq, XX },
-Ia_psubusw_Pq_Qq = { "psubusw", "psubusw", Pq, Qq, XX },
-Ia_psubusw_Vdq_Wdq = { "psubusw", "psubusw", Vdq, Wdq, XX },
-Ia_psubw_Pq_Qq = { "psubw", "psubw", Pq, Qq, XX },
-Ia_psubw_Vdq_Wdq = { "psubw", "psubw", Vdq, Wdq, XX },
-Ia_pswapd_Pq_Qq = { "pswapd", "pswapd", Pq, Qq, XX },
-Ia_punpckhbw_Pq_Qq = { "punpckhbw", "punpckhbw", Pq, Qq, XX },
-Ia_punpckhbw_Vdq_Wq = { "punpckhbw", "punpckhbw", Vdq, Wq, XX },
-Ia_punpckhdq_Pq_Qq = { "punpckhdq", "punpckhdq", Pq, Qq, XX },
-Ia_punpckhdq_Vdq_Wq = { "punpckhdq", "punpckhdq", Vdq, Wq, XX },
-Ia_punpckhqdq_Vdq_Wq = { "punpckhqdq", "punpckhqdq", Vdq, Wq, XX },
-Ia_punpckhwd_Pq_Qq = { "punpckhwd", "punpckhwd", Pq, Qq, XX },
-Ia_punpckhwd_Vdq_Wq = { "punpckhwd", "punpckhwd", Vdq, Wq, XX },
-Ia_punpcklbw_Pq_Qd = { "punpcklbw", "punpcklbw", Pq, Qd, XX },
-Ia_punpcklbw_Vdq_Wq = { "punpcklbw", "punpcklbw", Vdq, Wq, XX },
-Ia_punpckldq_Pq_Qd = { "punpckldq", "punpckldq", Pq, Qd, XX },
-Ia_punpckldq_Vdq_Wq = { "punpckldq", "punpckldq", Vdq, Wq, XX },
-Ia_punpcklqdq_Vdq_Wq = { "punpcklqdq", "punpcklqdq", Vdq, Wq, XX },
-Ia_punpcklwd_Pq_Qd = { "punpcklwd", "punpcklwd", Pq, Qd, XX },
-Ia_punpcklwd_Vdq_Wq = { "punpcklwd", "punpcklwd", Vdq, Wq, XX },
-Ia_pushal = { "pushad", "pushal", XX, XX, XX },
-Ia_pushaw = { "pusha", "pusha", XX, XX, XX },
-Ia_pushfl = { "pushfd", "pushfl", XX, XX, XX },
-Ia_pushfq = { "pushfq", "pushfq", XX, XX, XX },
-Ia_pushfw = { "pushf", "pushf", XX, XX, XX },
-Ia_pushl_CS = { "push", "pushl", CS, XX, XX },
-Ia_pushl_DS = { "push", "pushl", DS, XX, XX },
-Ia_pushl_Ed = { "push", "pushl", Ed, XX, XX },
-Ia_pushl_ERX = { "push", "pushl", ERX, XX, XX },
-Ia_pushl_ES = { "push", "pushl", ES, XX, XX },
-Ia_pushl_FS = { "push", "pushl", FS, XX, XX },
-Ia_pushl_GS = { "push", "pushl", GS, XX, XX },
-Ia_pushl_Id = { "push", "pushl", Id, XX, XX },
-Ia_pushl_sIb = { "push", "pushl", sIbd, XX, XX },
-Ia_pushl_SS = { "push", "pushl", SS, XX, XX },
-Ia_pushq_Eq = { "push", "pushq", Eq, XX, XX },
-Ia_pushq_FS = { "push", "pushq", FS, XX, XX },
-Ia_pushq_GS = { "push", "pushq", GS, XX, XX },
-Ia_pushq_RRX = { "push", "pushq", RRX, XX, XX },
-Ia_pushq_sIb = { "push", "pushq", sIbq, XX, XX },
-Ia_pushq_sId = { "push", "pushq", sIdq, XX, XX },
-Ia_pushw_CS = { "push", "pushw", CS, XX, XX },
-Ia_pushw_DS = { "push", "pushw", DS, XX, XX },
-Ia_pushw_ES = { "push", "pushw", ES, XX, XX },
-Ia_pushw_Ew = { "push", "pushw", Ew, XX, XX },
-Ia_pushw_FS = { "push", "pushw", FS, XX, XX },
-Ia_pushw_GS = { "push", "pushw", GS, XX, XX },
-Ia_pushw_Iw = { "push", "pushw", Iw, XX, XX },
-Ia_pushw_RX = { "push", "pushw", RX, XX, XX },
-Ia_pushw_sIb = { "push", "pushw", sIbw, XX, XX },
-Ia_pushw_SS = { "push", "pushw", SS, XX, XX },
-Ia_pxor_Pq_Qq = { "pxor", "pxor", Pq, Qq, XX },
-Ia_pxor_Vdq_Wdq = { "pxor", "pxor", Vdq, Wdq, XX },
-Ia_rclb_Eb_CL = { "rcl", "rclb", Eb, CL, XX },
-Ia_rclb_Eb_I1 = { "rcl", "rclb", Eb, I1, XX },
-Ia_rclb_Eb_Ib = { "rcl", "rclb", Eb, Ib, XX },
-Ia_rcll_Ed_CL = { "rcl", "rcll", Ed, CL, XX },
-Ia_rcll_Ed_I1 = { "rcl", "rcll", Ed, I1, XX },
-Ia_rcll_Ed_Ib = { "rcl", "rcll", Ed, Ib, XX },
-Ia_rclq_Eq_CL = { "rcl", "rclq", Eq, CL, XX },
-Ia_rclq_Eq_I1 = { "rcl", "rclq", Eq, I1, XX },
-Ia_rclq_Eq_Ib = { "rcl", "rclq", Eq, Ib, XX },
-Ia_rclw_Ew_CL = { "rcl", "rclw", Ew, CL, XX },
-Ia_rclw_Ew_I1 = { "rcl", "rclw", Ew, I1, XX },
-Ia_rclw_Ew_Ib = { "rcl", "rclw", Ew, Ib, XX },
-Ia_rcpps_Vps_Wps = { "rcpps", "rcpps", Vps, Wps, XX },
-Ia_rcpss_Vss_Wss = { "rcpss", "rcpss", Vss, Wss, XX },
-Ia_rcrb_Eb_CL = { "rcr", "rcrb", Eb, CL, XX },
-Ia_rcrb_Eb_I1 = { "rcr", "rcrb", Eb, I1, XX },
-Ia_rcrb_Eb_Ib = { "rcr", "rcrb", Eb, Ib, XX },
-Ia_rcrl_Ed_CL = { "rcr", "rcrl", Ed, CL, XX },
-Ia_rcrl_Ed_I1 = { "rcr", "rcrl", Ed, I1, XX },
-Ia_rcrl_Ed_Ib = { "rcr", "rcrl", Ed, Ib, XX },
-Ia_rcrq_Eq_CL = { "rcr", "rcrq", Eq, CL, XX },
-Ia_rcrq_Eq_I1 = { "rcr", "rcrq", Eq, I1, XX },
-Ia_rcrq_Eq_Ib = { "rcr", "rcrq", Eq, Ib, XX },
-Ia_rcrw_Ew_CL = { "rcr", "rcrw", Ew, CL, XX },
-Ia_rcrw_Ew_I1 = { "rcr", "rcrw", Ew, I1, XX },
-Ia_rcrw_Ew_Ib = { "rcr", "rcrw", Ew, Ib, XX },
-Ia_rdmsr = { "rdmsr", "rdmsr", XX, XX, XX },
-Ia_rdpmc = { "rdpmc", "rdpmc", XX, XX, XX },
-Ia_rdtsc = { "rdtsc", "rdtsc", XX, XX, XX },
-Ia_rdtscp = { "rdtscp", "rdtscp", XX, XX, XX },
-Ia_ret = { "ret", "ret", XX, XX, XX },
-Ia_ret_Iw = { "ret", "ret", Iw, XX, XX },
-Ia_rolb_Eb_CL = { "rol", "rolb", Eb, CL, XX },
-Ia_rolb_Eb_I1 = { "rol", "rolb", Eb, I1, XX },
-Ia_rolb_Eb_Ib = { "rol", "rolb", Eb, Ib, XX },
-Ia_roll_Ed_CL = { "rol", "roll", Ed, CL, XX },
-Ia_roll_Ed_I1 = { "rol", "roll", Ed, I1, XX },
-Ia_roll_Ed_Ib = { "rol", "roll", Ed, Ib, XX },
-Ia_rolq_Eq_CL = { "rol", "rolq", Eq, CL, XX },
-Ia_rolq_Eq_I1 = { "rol", "rolq", Eq, I1, XX },
-Ia_rolq_Eq_Ib = { "rol", "rolq", Eq, Ib, XX },
-Ia_rolw_Ew_CL = { "rol", "rolw", Ew, CL, XX },
-Ia_rolw_Ew_I1 = { "rol", "rolw", Ew, I1, XX },
-Ia_rolw_Ew_Ib = { "rol", "rolw", Ew, Ib, XX },
-Ia_rorb_Eb_CL = { "ror", "rorb", Eb, CL, XX },
-Ia_rorb_Eb_I1 = { "ror", "rorb", Eb, I1, XX },
-Ia_rorb_Eb_Ib = { "ror", "rorb", Eb, Ib, XX },
-Ia_rorl_Ed_CL = { "ror", "rorl", Ed, CL, XX },
-Ia_rorl_Ed_I1 = { "ror", "rorl", Ed, I1, XX },
-Ia_rorl_Ed_Ib = { "ror", "rorl", Ed, Ib, XX },
-Ia_rorq_Eq_CL = { "ror", "rorq", Eq, CL, XX },
-Ia_rorq_Eq_I1 = { "ror", "rorq", Eq, I1, XX },
-Ia_rorq_Eq_Ib = { "ror", "rorq", Eq, Ib, XX },
-Ia_rorw_Ew_CL = { "ror", "rorw", Ew, CL, XX },
-Ia_rorw_Ew_I1 = { "ror", "rorw", Ew, I1, XX },
-Ia_rorw_Ew_Ib = { "ror", "rorw", Ew, Ib, XX },
-Ia_rsm = { "rsm", "rsm", XX, XX, XX },
-Ia_rsqrtps_Vps_Wps = { "rsqrtps", "rsqrtps", Vps, Wps, XX },
-Ia_rsqrtss_Vss_Wss = { "rsqrtss", "rsqrtss", Vss, Wss, XX },
-Ia_sahf = { "sahf", "sahf", XX, XX, XX },
-Ia_salc = { "salc", "salc", XX, XX, XX },
-Ia_sarb_Eb_CL = { "sar", "sarb", Eb, CL, XX },
-Ia_sarb_Eb_I1 = { "sar", "sarb", Eb, I1, XX },
-Ia_sarb_Eb_Ib = { "sar", "sarb", Eb, Ib, XX },
-Ia_sarl_Ed_CL = { "sar", "sarl", Ed, CL, XX },
-Ia_sarl_Ed_I1 = { "sar", "sarl", Ed, I1, XX },
-Ia_sarl_Ed_Ib = { "sar", "sarl", Ed, Ib, XX },
-Ia_sarq_Eq_CL = { "sar", "sarq", Eq, CL, XX },
-Ia_sarq_Eq_I1 = { "sar", "sarq", Eq, I1, XX },
-Ia_sarq_Eq_Ib = { "sar", "sarq", Eq, Ib, XX },
-Ia_sarw_Ew_CL = { "sar", "sarw", Ew, CL, XX },
-Ia_sarw_Ew_I1 = { "sar", "sarw", Ew, I1, XX },
-Ia_sarw_Ew_Ib = { "sar", "sarw", Ew, Ib, XX },
-Ia_sbbb_AL_Ib = { "sbb", "sbbb", AL, Ib, XX },
-Ia_sbbb_Eb_Gb = { "sbb", "sbbb", Eb, Gb, XX },
-Ia_sbbb_Eb_Ib = { "sbb", "sbbb", Eb, Ib, XX },
-Ia_sbbb_Gb_Eb = { "sbb", "sbbb", Gb, Eb, XX },
-Ia_sbbl_EAX_Id = { "sbb", "sbbl", EAX, Id, XX },
-Ia_sbbl_Ed_Gd = { "sbb", "sbbl", Ed, Gd, XX },
-Ia_sbbl_Ed_Id = { "sbb", "sbbl", Ed, Id, XX },
-Ia_sbbl_Ed_sIb = { "sbb", "sbbl", Ed, sIbd, XX },
-Ia_sbbl_Gd_Ed = { "sbb", "sbbl", Gd, Ed, XX },
-Ia_sbbq_Eq_Gq = { "sbb", "sbbq", Eq, Gq, XX },
-Ia_sbbq_Eq_sIb = { "sbb", "sbbq", Eq, sIbq, XX },
-Ia_sbbq_Eq_sId = { "sbb", "sbbq", Eq, sIdq, XX },
-Ia_sbbq_Gq_Eq = { "sbb", "sbbq", Gq, Eq, XX },
-Ia_sbbq_RAX_sId = { "sbb", "sbbq", RAX, sIdq, XX },
-Ia_sbbw_AX_Iw = { "sbb", "sbbw", AX, Iw, XX },
-Ia_sbbw_Ew_Gw = { "sbb", "sbbw", Ew, Gw, XX },
-Ia_sbbw_Ew_Iw = { "sbb", "sbbw", Ew, Iw, XX },
-Ia_sbbw_Ew_sIb = { "sbb", "sbbw", Ew, sIbw, XX },
-Ia_sbbw_Gw_Ew = { "sbb", "sbbw", Gw, Ew, XX },
-Ia_scasb_Yb_AL = { "scasb", "scasb", Yb, AL, XX },
-Ia_scasl_Yd_EAX = { "scasd", "scasl", Yd, EAX, XX },
-Ia_scasq_Yq_RAX = { "scasq", "scasq", Yq, RAX, XX },
-Ia_scasw_Yw_AX = { "scasw", "scasw", Yw, AX, XX },
-Ia_setb_Eb = { "setb", "setb", Eb, XX, XX },
-Ia_setbe_Eb = { "setbe", "setbe", Eb, XX, XX },
-Ia_setl_Eb = { "setl", "setl", Eb, XX, XX },
-Ia_setle_Eb = { "setle", "setle", Eb, XX, XX },
-Ia_setnb_Eb = { "setnb", "setnb", Eb, XX, XX },
-Ia_setnbe_Eb = { "setnbe", "setnbe", Eb, XX, XX },
-Ia_setnl_Eb = { "setnl", "setnl", Eb, XX, XX },
-Ia_setnle_Eb = { "setnle", "setnle", Eb, XX, XX },
-Ia_setno_Eb = { "setno", "setno", Eb, XX, XX },
-Ia_setnp_Eb = { "setnp", "setnp", Eb, XX, XX },
-Ia_setns_Eb = { "setns", "setns", Eb, XX, XX },
-Ia_setnz_Eb = { "setnz", "setnz", Eb, XX, XX },
-Ia_seto_Eb = { "seto", "seto", Eb, XX, XX },
-Ia_setp_Eb = { "setp", "setp", Eb, XX, XX },
-Ia_sets_Eb = { "sets", "sets", Eb, XX, XX },
-Ia_setz_Eb = { "setz", "setz", Eb, XX, XX },
-Ia_sfence = { "sfence", "sfence", XX, XX, XX },
-Ia_sgdt = { "sgdt", "sgdt", Ms, XX, XX },
-Ia_shlb_Eb_CL = { "shl", "shlb", Eb, CL, XX },
-Ia_shlb_Eb_I1 = { "shl", "shlb", Eb, I1, XX },
-Ia_shlb_Eb_Ib = { "shl", "shlb", Eb, Ib, XX },
-Ia_shldl_Ed_Gd_CL = { "shld", "shldl", Ed, Gd, CL },
-Ia_shldl_Ed_Gd_Ib = { "shld", "shldl", Ed, Gd, Ib },
-Ia_shldq_Eq_Gq_CL = { "shld", "shldq", Eq, Gq, CL },
-Ia_shldq_Eq_Gq_Ib = { "shld", "shldq", Eq, Gq, Ib },
-Ia_shldw_Ew_Gw_CL = { "shld", "shldw", Ew, Gw, CL },
-Ia_shldw_Ew_Gw_Ib = { "shld", "shldw", Ew, Gw, Ib },
-Ia_shll_Ed_CL = { "shl", "shll", Ed, CL, XX },
-Ia_shll_Ed_I1 = { "shl", "shll", Ed, I1, XX },
-Ia_shll_Ed_Ib = { "shl", "shll", Ed, Ib, XX },
-Ia_shlq_Eq_CL = { "shl", "shlq", Eq, CL, XX },
-Ia_shlq_Eq_I1 = { "shl", "shlq", Eq, I1, XX },
-Ia_shlq_Eq_Ib = { "shl", "shlq", Eq, Ib, XX },
-Ia_shlw_Ew_CL = { "shl", "shlw", Ew, CL, XX },
-Ia_shlw_Ew_I1 = { "shl", "shlw", Ew, I1, XX },
-Ia_shlw_Ew_Ib = { "shl", "shlw", Ew, Ib, XX },
-Ia_shrb_Eb_CL = { "shr", "shrb", Eb, CL, XX },
-Ia_shrb_Eb_I1 = { "shr", "shrb", Eb, I1, XX },
-Ia_shrb_Eb_Ib = { "shr", "shrb", Eb, Ib, XX },
-Ia_shrdl_Ed_Gd_CL = { "shrd", "shrdl", Ed, Gd, CL },
-Ia_shrdl_Ed_Gd_Ib = { "shrd", "shrdl", Ed, Gd, Ib },
-Ia_shrdq_Eq_Gq_CL = { "shrd", "shrdq", Eq, Gq, CL },
-Ia_shrdq_Eq_Gq_Ib = { "shrd", "shrdq", Eq, Gq, Ib },
-Ia_shrdw_Ew_Gw_CL = { "shrd", "shrdw", Ew, Gw, CL },
-Ia_shrdw_Ew_Gw_Ib = { "shrd", "shrdw", Ew, Gw, Ib },
-Ia_shrl_Ed_CL = { "shr", "shrl", Ed, CL, XX },
-Ia_shrl_Ed_I1 = { "shr", "shrl", Ed, I1, XX },
-Ia_shrl_Ed_Ib = { "shr", "shrl", Ed, Ib, XX },
-Ia_shrq_Eq_CL = { "shr", "shrq", Eq, CL, XX },
-Ia_shrq_Eq_I1 = { "shr", "shrq", Eq, I1, XX },
-Ia_shrq_Eq_Ib = { "shr", "shrq", Eq, Ib, XX },
-Ia_shrw_Ew_CL = { "shr", "shrw", Ew, CL, XX },
-Ia_shrw_Ew_I1 = { "shr", "shrw", Ew, I1, XX },
-Ia_shrw_Ew_Ib = { "shr", "shrw", Ew, Ib, XX },
-Ia_shufpd_Vpd_Wpd_Ib = { "shufpd", "shufpd", Vpd, Wpd, Ib },
-Ia_shufps_Vps_Wps_Ib = { "shufps", "shufps", Vps, Wps, Ib },
-Ia_sidt = { "sidt", "sidt", Ms, XX, XX },
-Ia_sldt = { "sldt", "sldt", Ew, XX, XX },
-Ia_smsw_Ew = { "smsw", "smsw", Ew, XX, XX },
-Ia_sqrtpd_Vpd_Wpd = { "sqrtpd", "sqrtpd", Vpd, Wpd, XX },
-Ia_sqrtps_Vps_Wps = { "sqrtps", "sqrtps", Vps, Wps, XX },
-Ia_sqrtsd_Vsd_Wsd = { "sqrtsd", "sqrtsd", Vsd, Wsd, XX },
-Ia_sqrtss_Vss_Wss = { "sqrtss", "sqrtss", Vss, Wss, XX },
-Ia_stc = { "stc", "stc", XX, XX, XX },
-Ia_std = { "std", "std", XX, XX, XX },
-Ia_sti = { "sti", "sti", XX, XX, XX },
-Ia_stmxcsr = { "stmxcsr", "stmxcsr", Md, XX, XX },
-Ia_stosb_Yb_AL = { "stosb", "stosb", Yb, AL, XX },
-Ia_stosl_Yd_EAX = { "stosd", "stosl", Yd, EAX, XX },
-Ia_stosq_Yq_RAX = { "stosq", "stosq", Yq, RAX, XX },
-Ia_stosw_Yw_AX = { "stosw", "stosw", Yw, AX, XX },
-Ia_str = { "str", "str", Ew, XX, XX },
-Ia_subb_AL_Ib = { "sub", "subb", AL, Ib, XX },
-Ia_subb_Eb_Gb = { "sub", "subb", Eb, Gb, XX },
-Ia_subb_Eb_Ib = { "sub", "subb", Eb, Ib, XX },
-Ia_subb_Gb_Eb = { "sub", "subb", Gb, Eb, XX },
-Ia_subl_EAX_Id = { "sub", "subl", EAX, Id, XX },
-Ia_subl_Ed_Gd = { "sub", "subl", Ed, Gd, XX },
-Ia_subl_Ed_Id = { "sub", "subl", Ed, Id, XX },
-Ia_subl_Ed_sIb = { "sub", "subl", Ed, sIbd, XX },
-Ia_subl_Gd_Ed = { "sub", "subl", Gd, Ed, XX },
-Ia_subpd_Vpd_Wpd = { "subpd", "subpd", Vpd, Wpd, XX },
-Ia_subps_Vps_Wps = { "subps", "subps", Vps, Wps, XX },
-Ia_subq_Eq_Gq = { "sub", "subq", Eq, Gq, XX },
-Ia_subq_Eq_sIb = { "sub", "subq", Eq, sIbq, XX },
-Ia_subq_Eq_sId = { "sub", "subq", Eq, sIdq, XX },
-Ia_subq_Gq_Eq = { "sub", "subq", Gq, Eq, XX },
-Ia_subq_RAX_sId = { "sub", "subq", RAX, sIdq, XX },
-Ia_subsd_Vsd_Wsd = { "subsd", "subsd", Vsd, Wsd, XX },
-Ia_subss_Vss_Wss = { "subss", "subss", Vss, Wss, XX },
-Ia_subw_AX_Iw = { "sub", "subw", AX, Iw, XX },
-Ia_subw_Ew_Gw = { "sub", "subw", Ew, Gw, XX },
-Ia_subw_Ew_Iw = { "sub", "subw", Ew, Iw, XX },
-Ia_subw_Ew_sIb = { "sub", "subw", Ew, sIbw, XX },
-Ia_subw_Gw_Ew = { "sub", "subw", Gw, Ew, XX },
-Ia_swapgs = { "swapgs", "swapgs", XX, XX, XX },
-Ia_syscall = { "syscall", "syscall", XX, XX, XX },
-Ia_sysenter = { "sysenter", "sysenter", XX, XX, XX },
-Ia_sysexit = { "sysexit", "sysexit", XX, XX, XX },
-Ia_sysret = { "sysret", "sysret", XX, XX, XX },
-Ia_testb_AL_Ib = { "test", "testb", AL, Ib, XX },
-Ia_testb_Eb_Gb = { "test", "testb", Eb, Gb, XX },
-Ia_testb_Eb_Ib = { "test", "testb", Eb, Ib, XX },
-Ia_testl_EAX_Id = { "test", "testl", EAX, Id, XX },
-Ia_testl_Ed_Gd = { "test", "testl", Ed, Gd, XX },
-Ia_testl_Ed_Id = { "test", "testl", Ed, Id, XX },
-Ia_testq_Eq_Gq = { "test", "testq", Eq, Gq, XX },
-Ia_testq_Eq_sId = { "test", "testq", Eq, sIdq, XX },
-Ia_testq_RAX_sId = { "test", "testq", RAX, sIdq, XX },
-Ia_testw_AX_Iw = { "test", "testw", AX, Iw, XX },
-Ia_testw_Ew_Gw = { "test", "testw", Ew, Gw, XX },
-Ia_testw_Ew_Iw = { "test", "testw", Ew, Iw, XX },
-Ia_ucomisd_Vsd_Wss = { "ucomisd", "ucomisd", Vsd, Wsd, XX },
-Ia_ucomiss_Vss_Wss = { "ucomiss", "ucomiss", Vss, Wss, XX },
-Ia_ud2a = { "ud2a", "ud2a", XX, XX, XX },
-Ia_ud2b = { "ud2b", "ud2b", XX, XX, XX },
-Ia_unpckhpd_Vpd_Wdq = { "unpckhpd", "unpckhpd", Vpd, Wdq, XX },
-Ia_unpckhps_Vps_Wdq = { "unpckhps", "unpckhps", Vps, Wdq, XX },
-Ia_unpcklpd_Vpd_Wq = { "unpcklpd", "unpcklpd", Vpd, Wq, XX },
-Ia_unpcklps_Vps_Wq = { "unpcklps", "unpcklps", Vps, Wq, XX },
-Ia_verr = { "verr", "verr", Ew, XX, XX },
-Ia_verw = { "verw", "verw", Ew, XX, XX },
-Ia_wbinvd = { "wbinvd", "wbinvd", XX, XX, XX },
-Ia_wrmsr = { "wrmsr", "wrmsr", XX, XX, XX },
-Ia_xaddb_Eb_Gb = { "xadd", "xaddb", Eb, Gb, XX },
-Ia_xaddl_Ed_Gd = { "xadd", "xaddl", Ed, Gd, XX },
-Ia_xaddq_Eq_Gq = { "xadd", "xaddq", Eq, Gq, XX },
-Ia_xaddw_Ew_Gw = { "xadd", "xaddw", Ew, Gw, XX },
-Ia_xchgb_Eb_Gb = { "xchg", "xchgb", Eb, Gb, XX },
-Ia_xchgl_Ed_Gd = { "xchg", "xchgl", Ed, Gd, XX },
-Ia_xchgl_ERX_EAX = { "xchg", "xchgl", ERX, EAX, XX },
-Ia_xchgq_Eq_Gq = { "xchg", "xchgq", Eq, Gq, XX },
-Ia_xchgq_RRX_RAX = { "xchg", "xchgq", RRX, RAX, XX },
-Ia_xchgw_Ew_Gw = { "xchg", "xchgw", Ew, Gw, XX },
-Ia_xchgw_RX_AX = { "xchg", "xchgw", RX, AX, XX },
-Ia_xlat = { "xlat", "xlat", XX, XX, XX },
-Ia_xorb_AL_Ib = { "xor", "xorb", AL, Ib, XX },
-Ia_xorb_Eb_Gb = { "xor", "xorb", Eb, Gb, XX },
-Ia_xorb_Eb_Ib = { "xor", "xorb", Eb, Ib, XX },
-Ia_xorb_Gb_Eb = { "xor", "xorb", Gb, Eb, XX },
-Ia_xorl_EAX_Id = { "xor", "xorl", EAX, Id, XX },
-Ia_xorl_Ed_Gd = { "xor", "xorl", Ed, Gd, XX },
-Ia_xorl_Ed_Id = { "xor", "xorl", Ed, Id, XX },
-Ia_xorl_Ed_sIb = { "xor", "xorl", Ed, sIbd, XX },
-Ia_xorl_Gd_Ed = { "xor", "xorl", Gd, Ed, XX },
-Ia_xorpd_Vpd_Wpd = { "xorpd", "xorpd", Vpd, Wpd, XX },
-Ia_xorps_Vps_Wps = { "xorps", "xorps", Vps, Wps, XX },
-Ia_xorq_Eq_Gq = { "xor", "xorq", Eq, Gq, XX },
-Ia_xorq_Eq_sIb = { "xor", "xorq", Eq, sIbq, XX },
-Ia_xorq_Eq_sId = { "xor", "xorq", Eq, sIdq, XX },
-Ia_xorq_Gq_Eq = { "xor", "xorq", Gq, Eq, XX },
-Ia_xorq_RAX_sId = { "xor", "xorq", RAX, sIdq, XX },
-Ia_xorw_AX_Iw = { "xor", "xorw", AX, Iw, XX },
-Ia_xorw_Ew_Gw = { "xor", "xorw", Ew, Gw, XX },
-Ia_xorw_Ew_Iw = { "xor", "xorw", Ew, Iw, XX },
-Ia_xorw_Ew_sIb = { "xor", "xorw", Ew, sIbw, XX },
-Ia_xorw_Gw_Ew = { "xor", "xorw", Gw, Ew, XX };
diff --git a/Externals/Bochs_disasm/resolve.cc b/Externals/Bochs_disasm/resolve.cc
new file mode 100644
index 0000000000..e72f8d11b5
--- /dev/null
+++ b/Externals/Bochs_disasm/resolve.cc
@@ -0,0 +1,696 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: resolve.cc 11863 2013-10-07 19:23:19Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2013 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+#include <assert.h>
+#include "disasm.h"
+
+void disassembler::decode_modrm(x86_insn *insn)
+{
+  insn->modrm = fetch_byte();
+  BX_DECODE_MODRM(insn->modrm, insn->mod, insn->nnn, insn->rm);
+  // MOVs with CRx and DRx always use register ops and ignore the mod field.
+  if ((insn->b1 & ~3) == 0x120) insn->mod = 3;
+  insn->nnn |= insn->rex_r;
+  insn->rm  |= insn->rex_b;
+
+  if (insn->mod == 3) {
+    return; /* mod, reg, reg */
+  }
+
+  if (insn->as_64)
+  {
+      if ((insn->rm & 7) != 4) { /* rm != 100b, no s-i-b byte */
+        // one byte modrm
+        switch (insn->mod) {
+          case 0:
+            resolve_modrm = &disassembler::resolve64_mod0;
+            if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
+              insn->displacement.displ32 = fetch_dword();
+            break;
+          case 1:
+            /* reg, 8-bit displacement, sign extend */
+            resolve_modrm = &disassembler::resolve64_mod1or2;
+            insn->displacement.displ32 = (Bit8s) fetch_byte();
+            break;
+          case 2:
+            /* reg, 32-bit displacement */
+            resolve_modrm = &disassembler::resolve64_mod1or2;
+            insn->displacement.displ32 = fetch_dword();
+            break;
+        } /* switch (mod) */
+      } /* if (rm != 4) */
+      else { /* rm == 4, s-i-b byte follows */
+        insn->sib = fetch_byte();
+        BX_DECODE_SIB(insn->sib, insn->scale, insn->index, insn->base);
+        insn->base  |= insn->rex_b;
+        insn->index |= insn->rex_x;
+
+        switch (insn->mod) {
+          case 0:
+            resolve_modrm = &disassembler::resolve64_mod0_rm4;
+            if ((insn->base & 7) == 5)
+              insn->displacement.displ32 = fetch_dword();
+            break;
+          case 1:
+            resolve_modrm = &disassembler::resolve64_mod1or2_rm4;
+            insn->displacement.displ32 = (Bit8s) fetch_byte();
+            break;
+          case 2:
+            resolve_modrm = &disassembler::resolve64_mod1or2_rm4;
+            insn->displacement.displ32 = fetch_dword();
+            break;
+        }
+      } /* s-i-b byte follows */
+  }
+  else
+  {
+    if (insn->as_32)
+    {
+      if ((insn->rm & 7) != 4) { /* rm != 100b, no s-i-b byte */
+        // one byte modrm
+        switch (insn->mod) {
+          case 0:
+            resolve_modrm = &disassembler::resolve32_mod0;
+            if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
+              insn->displacement.displ32 = fetch_dword();
+            break;
+          case 1:
+            /* reg, 8-bit displacement, sign extend */
+            resolve_modrm = &disassembler::resolve32_mod1or2;
+            insn->displacement.displ32 = (Bit8s) fetch_byte();
+            break;
+          case 2:
+            /* reg, 32-bit displacement */
+            resolve_modrm = &disassembler::resolve32_mod1or2;
+            insn->displacement.displ32 = fetch_dword();
+            break;
+        } /* switch (mod) */
+      } /* if (rm != 4) */
+      else { /* rm == 4, s-i-b byte follows */
+        insn->sib = fetch_byte();
+        BX_DECODE_SIB(insn->sib, insn->scale, insn->index, insn->base);
+        insn->base  |= insn->rex_b;
+        insn->index |= insn->rex_x;
+
+        switch (insn->mod) {
+          case 0:
+            resolve_modrm = &disassembler::resolve32_mod0_rm4;
+            if ((insn->base & 7) == 5)
+              insn->displacement.displ32 = fetch_dword();
+            break;
+          case 1:
+            resolve_modrm = &disassembler::resolve32_mod1or2_rm4;
+            insn->displacement.displ32 = (Bit8s) fetch_byte();
+            break;
+          case 2:
+            resolve_modrm = &disassembler::resolve32_mod1or2_rm4;
+            insn->displacement.displ32 = fetch_dword();
+            break;
+        }
+      } /* s-i-b byte follows */
+    }
+    else {
+      assert(insn->rex_b == 0);
+      assert(insn->rex_x == 0);
+      assert(insn->rex_r == 0);
+      /* 16 bit addressing modes. */
+      switch (insn->mod) {
+        case 0:
+          resolve_modrm = &disassembler::resolve16_mod0;
+          if(insn->rm == 6)
+            insn->displacement.displ16 = fetch_word();
+          break;
+        case 1:
+          /* reg, 8-bit displacement, sign extend */
+          resolve_modrm = &disassembler::resolve16_mod1or2;
+          insn->displacement.displ16 = (Bit8s) fetch_byte();
+          break;
+        case 2:
+          resolve_modrm = &disassembler::resolve16_mod1or2;
+          insn->displacement.displ16 = fetch_word();
+          break;
+      } /* switch (mod) ... */
+    }
+  }
+}
+
+void disassembler::resolve16_mod0(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod00_rm16[insn->rm];
+
+  if(insn->rm == 6)
+    print_memory_access16(datasize, seg, NULL, insn->displacement.displ16);
+  else
+    print_memory_access16(datasize, seg, index16[insn->rm], 0);
+}
+
+void disassembler::resolve16_mod1or2(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod01or10_rm16[insn->rm];
+
+  print_memory_access16(datasize, seg, index16[insn->rm], insn->displacement.displ16);
+}
+
+void disassembler::resolve32_mod0(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg, *eip_regname = NULL;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = segment_name[DS_REG];
+
+  if (insn->is_64) {
+    if (intel_mode) eip_regname = "eip";
+    else eip_regname = "%eip";
+  }
+
+  if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
+    print_memory_access32(datasize, seg, eip_regname, NULL, 0, insn->displacement.displ32);
+  else
+    print_memory_access32(datasize, seg, general_32bit_regname[insn->rm], NULL, 0, 0);
+}
+
+void disassembler::resolve32_mod1or2(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod01or10_base32[insn->rm];
+
+  print_memory_access32(datasize, seg,
+      general_32bit_regname[insn->rm], NULL, 0, insn->displacement.displ32);
+}
+
+void disassembler::resolve32_mod0_rm4(const x86_insn *insn, unsigned datasize)
+{
+  char vsib_index[8];
+  const char *seg, *base = NULL, *index = NULL;
+  Bit32u disp32 = 0;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod00_base32[insn->base];
+
+  if ((insn->base & 7) != 5)
+    base = general_32bit_regname[insn->base];
+  else
+    disp32 = insn->displacement.displ32;
+
+  if (datasize & VSIB_Index) {
+    sprintf(vsib_index, "%s%d", vector_reg_name[insn->vex_l], insn->index);
+    index = vsib_index;
+  }
+  else {
+    if (insn->index != 4)
+      index = general_32bit_regname[insn->index];
+  }
+
+  print_memory_access32(datasize, seg, base, index, insn->scale, disp32);
+}
+
+void disassembler::resolve32_mod1or2_rm4(const x86_insn *insn, unsigned datasize)
+{
+  char vsib_index[8];
+  const char *seg, *index = NULL;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod01or10_base32[insn->base];
+
+  if (datasize & VSIB_Index) {
+    sprintf(vsib_index, "%s%d", vector_reg_name[insn->vex_l], insn->index);
+    index = vsib_index;
+  }
+  else {
+    if (insn->index != 4)
+      index = general_32bit_regname[insn->index];
+  }
+
+  print_memory_access32(datasize, seg,
+      general_32bit_regname[insn->base], index, insn->scale, insn->displacement.displ32);
+}
+
+void disassembler::resolve64_mod0(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg, *rip_regname;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = segment_name[DS_REG];
+
+  if (intel_mode) rip_regname = "rip";
+  else rip_regname = "%rip";
+
+  if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
+    print_memory_access64(datasize, seg, rip_regname, NULL, 0, (Bit32s) insn->displacement.displ32);
+  else
+    print_memory_access64(datasize, seg, general_64bit_regname[insn->rm], NULL, 0, 0);
+}
+
+void disassembler::resolve64_mod1or2(const x86_insn *insn, unsigned datasize)
+{
+  const char *seg;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod01or10_base32[insn->rm];
+
+  print_memory_access64(datasize, seg,
+      general_64bit_regname[insn->rm], NULL, 0, (Bit32s) insn->displacement.displ32);
+}
+
+void disassembler::resolve64_mod0_rm4(const x86_insn *insn, unsigned datasize)
+{
+  char vsib_index[8];
+  const char *seg, *base = NULL, *index = NULL;
+  Bit32s disp32 = 0;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod00_base32[insn->base];
+
+  if ((insn->base & 7) != 5)
+    base = general_64bit_regname[insn->base];
+  else
+    disp32 = (Bit32s) insn->displacement.displ32;
+
+  if (datasize & VSIB_Index) {
+    sprintf(vsib_index, "%s%d", vector_reg_name[insn->vex_l], insn->index);
+    index = vsib_index;
+  }
+  else {
+    if (insn->index != 4)
+      index = general_64bit_regname[insn->index];
+  }
+
+  print_memory_access64(datasize, seg, base, index, insn->scale, disp32);
+}
+
+void disassembler::resolve64_mod1or2_rm4(const x86_insn *insn, unsigned datasize)
+{
+  char vsib_index[8];
+  const char *seg, *index = NULL;
+
+  if (insn->is_seg_override())
+    seg = segment_name[insn->seg_override];
+  else
+    seg = sreg_mod01or10_base32[insn->base];
+
+  if (datasize & VSIB_Index) {
+    sprintf(vsib_index, "%s%d", vector_reg_name[insn->vex_l], insn->index);
+    index = vsib_index;
+  }
+  else {
+    if (insn->index != 4)
+      index = general_64bit_regname[insn->index];
+  }
+
+  print_memory_access64(datasize, seg,
+      general_64bit_regname[insn->base], index, insn->scale, (Bit32s) insn->displacement.displ32);
+}
+
+void disassembler::print_datasize(unsigned size)
+{
+  if (!intel_mode || !print_mem_datasize) return;
+
+  switch(size & 0xf)
+  {
+    case B_SIZE:
+      dis_sprintf("byte ptr ");
+      break;
+    case W_SIZE:
+      dis_sprintf("word ptr ");
+      break;
+    case D_SIZE:
+      dis_sprintf("dword ptr ");
+      break;
+    case Q_SIZE:
+      dis_sprintf("qword ptr ");
+      break;
+    case T_SIZE:
+      dis_sprintf("tbyte ptr ");
+      break;
+    case XMM_SIZE:
+      dis_sprintf("dqword ptr ");
+      break;
+    case YMM_SIZE:
+      dis_sprintf("qqword ptr ");
+      break;
+    case X_SIZE:
+      break;
+  };
+}
+
+void disassembler::print_memory_access16(int datasize,
+                const char *seg, const char *index, Bit16u disp)
+{
+  print_datasize(datasize);
+
+  dis_sprintf("%s:", seg);
+
+  if (intel_mode)
+  {
+    if (index == NULL)
+    {
+      dis_sprintf("0x%04x", (unsigned) disp);
+    }
+    else
+    {
+      if (disp != 0) {
+        if (offset_mode_hex)
+          dis_sprintf("[%s+0x%04x]", index, (unsigned) disp);
+        else
+          dis_sprintf("[%s%+d]", index, (int) (Bit16s) disp);
+      }
+      else
+        dis_sprintf("[%s]", index);
+    }
+  }
+  else
+  {
+    if (index == NULL)
+    {
+      dis_sprintf("0x%04x", (unsigned) disp);
+    }
+    else
+    {
+      if (disp != 0) {
+        if (offset_mode_hex)
+          dis_sprintf("0x%04x(%s,1)", (unsigned) disp, index);
+        else
+          dis_sprintf("%d(%s,1)", (int) (Bit16s) disp, index);
+      }
+      else
+        dis_sprintf("(%s,1)", index);
+    }
+  }
+}
+
+void disassembler::print_memory_access32(int datasize,
+        const char *seg, const char *base, const char *index, int scale, Bit32s disp)
+{
+  print_datasize(datasize);
+
+  dis_sprintf("%s:", seg);
+
+  scale = 1 << scale;
+
+  if (intel_mode)
+  {
+    if (base == NULL)
+    {
+      if (index == NULL)
+      {
+        dis_sprintf("0x%08x", (unsigned) disp);
+      }
+      else
+      {
+        if (scale != 1)
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s*%d+0x%08x]", index, scale, (unsigned) disp);
+            else
+              dis_sprintf("[%s*%d%+d]", index, scale, (int) disp);
+          }
+          else
+            dis_sprintf("[%s*%d]", index, scale);
+        }
+        else
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+0x%08x]", index, (unsigned) disp);
+            else
+              dis_sprintf("[%s%+d]", index, (int) disp);
+          }
+          else {
+            dis_sprintf("[%s]", index);
+          }
+        }
+      }
+    }
+    else
+    {
+      if (index == NULL)
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("[%s+0x%08x]", base, (unsigned) disp);
+          else
+            dis_sprintf("[%s%+d]", base, (int) disp);
+        }
+        else {
+          dis_sprintf("[%s]", base);
+        }
+      }
+      else
+      {
+        if (scale != 1)
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+%s*%d+0x%08x]", base, index, scale, (unsigned) disp);
+            else
+              dis_sprintf("[%s+%s*%d%+d]", base, index, scale, (int) disp);
+          }
+          else {
+            dis_sprintf("[%s+%s*%d]", base, index, scale);
+          }
+        }
+        else
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+%s+0x%08x]", base, index, (unsigned) disp);
+            else
+              dis_sprintf("[%s+%s%+d]", base, index, (int) disp);
+          }
+          else
+            dis_sprintf("[%s+%s]", base, index);
+        }
+      }
+    }
+  }
+  else
+  {
+    if (base == NULL)
+    {
+      if (index == NULL)
+      {
+        dis_sprintf("0x%08x", (unsigned) disp);
+      }
+      else
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x(,%s,%d)", (unsigned) disp, index, scale);
+          else
+            dis_sprintf("%d(,%s,%d)", (int) disp, index, scale);
+        }
+        else
+          dis_sprintf("(,%s,%d)", index, scale);
+      }
+    }
+    else
+    {
+      if (index == NULL)
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x(%s)", (unsigned) disp, base);
+          else
+            dis_sprintf("%d(%s)", (int) disp, base);
+        }
+        else
+          dis_sprintf("(%s)", base);
+      }
+      else
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x(%s,%s,%d)", (unsigned) disp, base, index, scale);
+          else
+            dis_sprintf("%d(%s,%s,%d)", (int) disp, base, index, scale);
+        }
+        else
+          dis_sprintf("(%s,%s,%d)", base, index, scale);
+      }
+    }
+  }
+}
+
+void disassembler::print_memory_access64(int datasize,
+        const char *seg, const char *base, const char *index, int scale, Bit32s disp)
+{
+  Bit64u disp64 = (Bit64s) disp;
+
+  print_datasize(datasize);
+
+  dis_sprintf("%s:", seg);
+
+  scale = 1 << scale;
+
+  if (intel_mode)
+  {
+    if (base == NULL)
+    {
+      if (index == NULL)
+      {
+        dis_sprintf("0x%08x%08x", GET32H(disp64), GET32L(disp64));
+      }
+      else
+      {
+        if (scale != 1)
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s*%d+0x%08x%08x]", index, scale, GET32H(disp64), GET32L(disp64));
+            else
+              dis_sprintf("[%s*%d%+d]", index, scale, (int) disp);
+          }
+          else
+            dis_sprintf("[%s*%d]", index, scale);
+        }
+        else
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+0x%08x%08x]", index, GET32H(disp64), GET32L(disp64));
+            else
+              dis_sprintf("[%s%+d]", index, (int) disp);
+          }
+          else {
+            dis_sprintf("[%s]", index);
+          }
+        }
+      }
+    }
+    else
+    {
+      if (index == NULL)
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("[%s+0x%08x%08x]", base, GET32H(disp64), GET32L(disp64));
+          else
+            dis_sprintf("[%s%+d]", base, (int) disp);
+        }
+        else {
+          dis_sprintf("[%s]", base);
+        }
+      }
+      else
+      {
+        if (scale != 1)
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+%s*%d+0x%08x%08x]", base, index, scale, GET32H(disp64), GET32L(disp64));
+            else
+              dis_sprintf("[%s+%s*%d%+d]", base, index, scale, (int) disp);
+          }
+          else {
+            dis_sprintf("[%s+%s*%d]", base, index, scale);
+          }
+        }
+        else
+        {
+          if (disp != 0) {
+            if (offset_mode_hex)
+              dis_sprintf("[%s+%s+0x%08x%08x]", base, index, GET32H(disp64), GET32L(disp64));
+            else
+              dis_sprintf("[%s+%s%+d]", base, index, (int) disp);
+          }
+          else
+            dis_sprintf("[%s+%s]", base, index);
+        }
+      }
+    }
+  }
+  else
+  {
+    if (base == NULL)
+    {
+      if (index == NULL)
+      {
+        dis_sprintf("0x%08x%08x", GET32H(disp64), GET32L(disp64));
+      }
+      else
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x%08x(,%s,%d)", GET32H(disp64), GET32L(disp64), index, scale);
+          else
+            dis_sprintf("%d(,%s,%d)", (int) disp, index, scale);
+        }
+        else
+          dis_sprintf("(,%s,%d)", index, scale);
+      }
+    }
+    else
+    {
+      if (index == NULL)
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x%08x(%s)", GET32H(disp64), GET32L(disp64), base);
+          else
+            dis_sprintf("%d(%s)", (int) disp, base);
+        }
+        else
+          dis_sprintf("(%s)", base);
+      }
+      else
+      {
+        if (disp != 0) {
+          if (offset_mode_hex)
+            dis_sprintf("0x%08x%08x(%s,%s,%d)", GET32H(disp64), GET32L(disp64), base, index, scale);
+          else
+            dis_sprintf("%d(%s,%s,%d)", (int) disp, base, index, scale);
+        }
+        else
+          dis_sprintf("(%s,%s,%d)", base, index, scale);
+      }
+    }
+  }
+}
diff --git a/Externals/Bochs_disasm/resolve.cpp b/Externals/Bochs_disasm/resolve.cpp
deleted file mode 100644
index 3bf2d344dc..0000000000
--- a/Externals/Bochs_disasm/resolve.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// $Id: resolve.cc,v 1.13 2006/08/11 17:22:43 sshwarts Exp $
-/////////////////////////////////////////////////////////////////////////
-#include <stdio.h>
-#include <assert.h>
-#include "disasm.h"
-
-void disassembler::decode_modrm(x86_insn *insn)
-{
-  insn->modrm = fetch_byte();
-  BX_DECODE_MODRM(insn->modrm, insn->mod, insn->nnn, insn->rm);
-  // MOVs with CRx and DRx always use register ops and ignore the mod field.
-  if ((insn->b1 & ~3) == 0x120) insn->mod = 3;
-  insn->nnn |= insn->rex_r;
-
-  if (insn->mod == 3) {
-    /* mod, reg, reg */
-    insn->rm |= insn->rex_b;
-    return;
-  }
-
-  if (insn->as_64)
-  {
-      if (insn->rm != 4) { /* rm != 100b, no s-i-b byte */
-        insn->rm |= insn->rex_b;
-        // one byte modrm
-        switch (insn->mod) {
-          case 0:
-            resolve_modrm = &disassembler::resolve64_mod0;
-            if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
-              insn->displacement.displ32 = fetch_dword();
-            break;
-          case 1:
-            /* reg, 8-bit displacement, sign extend */
-            resolve_modrm = &disassembler::resolve64_mod1or2;
-            insn->displacement.displ32 = (Bit8s) fetch_byte();
-            break;
-          case 2:
-            /* reg, 32-bit displacement */
-            resolve_modrm = &disassembler::resolve64_mod1or2;
-            insn->displacement.displ32 = fetch_dword();
-            break;
-        } /* switch (mod) */
-      } /* if (rm != 4) */
-      else { /* rm == 4, s-i-b byte follows */
-        insn->sib = fetch_byte();
-        BX_DECODE_SIB(insn->sib, insn->scale, insn->index, insn->base);
-        insn->base  |= insn->rex_b;
-        insn->index |= insn->rex_x;
-
-        switch (insn->mod) {
-          case 0:
-            resolve_modrm = &disassembler::resolve64_mod0_rm4;
-            if ((insn->base & 7) == 5)
-              insn->displacement.displ32 = fetch_dword();
-            break;
-          case 1:
-            resolve_modrm = &disassembler::resolve64_mod1or2_rm4;
-            insn->displacement.displ32 = (Bit8s) fetch_byte();
-            break;
-          case 2:
-            resolve_modrm = &disassembler::resolve64_mod1or2_rm4;
-            insn->displacement.displ32 = fetch_dword();
-            break;
-        }
-      } /* s-i-b byte follows */
-  }
-  else
-  {
-    if (insn->as_32)
-    {
-      if (insn->rm != 4) { /* rm != 100b, no s-i-b byte */
-        insn->rm |= insn->rex_b;
-        // one byte modrm
-        switch (insn->mod) {
-          case 0:
-            resolve_modrm = &disassembler::resolve32_mod0;
-            if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
-              insn->displacement.displ32 = fetch_dword();
-            break;
-          case 1:
-            /* reg, 8-bit displacement, sign extend */
-            resolve_modrm = &disassembler::resolve32_mod1or2;
-            insn->displacement.displ32 = (Bit8s) fetch_byte();
-            break;
-          case 2:
-            /* reg, 32-bit displacement */
-            resolve_modrm = &disassembler::resolve32_mod1or2;
-            insn->displacement.displ32 = fetch_dword();
-            break;
-        } /* switch (mod) */
-      } /* if (rm != 4) */
-      else { /* rm == 4, s-i-b byte follows */
-        insn->sib = fetch_byte();
-        BX_DECODE_SIB(insn->sib, insn->scale, insn->index, insn->base);
-        insn->base  |= insn->rex_b;
-        insn->index |= insn->rex_x;
-
-        switch (insn->mod) {
-          case 0:
-            resolve_modrm = &disassembler::resolve32_mod0_rm4;
-            if ((insn->base & 7) == 5)
-              insn->displacement.displ32 = fetch_dword();
-            break;
-          case 1:
-            resolve_modrm = &disassembler::resolve32_mod1or2_rm4;
-            insn->displacement.displ32 = (Bit8s) fetch_byte();
-            break;
-          case 2:
-            resolve_modrm = &disassembler::resolve32_mod1or2_rm4;
-            insn->displacement.displ32 = fetch_dword();
-            break;
-        }
-      } /* s-i-b byte follows */
-    }
-    else {
-      assert(insn->rex_b == 0);
-      assert(insn->rex_x == 0);
-      assert(insn->rex_r == 0);
-      /* 16 bit addressing modes. */
-      switch (insn->mod) {
-        case 0:
-          resolve_modrm = &disassembler::resolve16_mod0;
-          if(insn->rm == 6)
-            insn->displacement.displ16 = fetch_word();
-          break;
-        case 1:
-          /* reg, 8-bit displacement, sign extend */
-          resolve_modrm = &disassembler::resolve16_mod1or2;
-          insn->displacement.displ16 = (Bit8s) fetch_byte();
-          break;
-        case 2:
-          resolve_modrm = &disassembler::resolve16_mod1or2;
-          insn->displacement.displ16 = fetch_word();
-          break;
-      } /* switch (mod) ... */
-    }
-  }
-}
-
-void disassembler::resolve16_mod0(const x86_insn *insn, unsigned mode)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod00_rm16[insn->rm];
-
-  if(insn->rm == 6)
-    print_memory_access16(mode, seg, NULL, insn->displacement.displ16);
-  else
-    print_memory_access16(mode, seg, index16[insn->rm], 0);
-}
-
-void disassembler::resolve16_mod1or2(const x86_insn *insn, unsigned mode)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod01or10_rm16[insn->rm];
-
-  print_memory_access16(mode, seg, index16[insn->rm], insn->displacement.displ16);
-}
-
-void disassembler::resolve32_mod0(const x86_insn *insn, unsigned mode)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = segment_name[DS_REG];
-
-  if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
-    print_memory_access(mode, seg, NULL, NULL, 0, insn->displacement.displ32);
-  else
-    print_memory_access(mode, seg, general_32bit_regname[insn->rm], NULL, 0, 0);
-}
-
-void disassembler::resolve32_mod1or2(const x86_insn *insn, unsigned mode)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod01or10_rm32[insn->rm];
-
-  print_memory_access(mode, seg,
-      general_32bit_regname[insn->rm], NULL, 0, insn->displacement.displ32);
-}
-
-void disassembler::resolve32_mod0_rm4(const x86_insn *insn, unsigned mode)
-{
-  const char *seg, *base = NULL, *index = NULL;
-  Bit32u disp32 = 0;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod00_base32[insn->base];
-
-  if ((insn->base & 7) != 5)
-    base = general_32bit_regname[insn->base];
-  else
-    disp32 = insn->displacement.displ32;
-  
-  if (insn->index != 4)
-    index = general_32bit_regname[insn->index];
-    
-  print_memory_access(mode, seg, base, index, insn->scale, disp32);
-}
-
-void disassembler::resolve32_mod1or2_rm4(const x86_insn *insn, unsigned mode)
-{
-  const char *seg, *index = NULL;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod01or10_base32[insn->base];
-
-  if (insn->index != 4)
-    index = general_32bit_regname[insn->index];
-
-  print_memory_access(mode, seg,
-      general_32bit_regname[insn->base], index, insn->scale, insn->displacement.displ32);
-}
-
-void disassembler::resolve64_mod0(const x86_insn *insn, unsigned mode)
-{
-  const char *seg, *rip_regname;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = segment_name[DS_REG];
-
-  if (intel_mode) rip_regname = "rip";
-  else rip_regname = "%rip";
-
-  if ((insn->rm & 7) == 5) /* no reg, 32-bit displacement */
-    print_memory_access(mode, seg, rip_regname, NULL, 0, insn->displacement.displ32);
-  else
-    print_memory_access(mode, seg, general_64bit_regname[insn->rm], NULL, 0, 0);
-}
-
-void disassembler::resolve64_mod1or2(const x86_insn *insn, unsigned mode)
-{
-  const char *seg;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod01or10_rm32[insn->rm];
-
-  print_memory_access(mode, seg, 
-      general_64bit_regname[insn->rm], NULL, 0, insn->displacement.displ32);
-}
-
-void disassembler::resolve64_mod0_rm4(const x86_insn *insn, unsigned mode)
-{
-  const char *seg, *base = NULL, *index = NULL;
-  Bit32u disp32 = 0;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod00_base32[insn->base];
-
-  if ((insn->base & 7) != 5)
-    base = general_64bit_regname[insn->base];
-  else
-    disp32 = insn->displacement.displ32;
-  
-  if (insn->index != 4)
-    index = general_64bit_regname[insn->index];
-    
-  print_memory_access(mode, seg, base, index, insn->scale, disp32);
-}
-
-void disassembler::resolve64_mod1or2_rm4(const x86_insn *insn, unsigned mode)
-{
-  const char *seg, *index = NULL;
-
-  if (insn->is_seg_override())
-    seg = segment_name[insn->seg_override];
-  else
-    seg = sreg_mod01or10_base32[insn->base];
-
-  if (insn->index != 4)
-    index = general_64bit_regname[insn->index];
-
-  print_memory_access(mode, seg,
-      general_64bit_regname[insn->base], index, insn->scale, insn->displacement.displ32);
-}
-
-void disassembler::print_datasize(unsigned size)
-{
-  if (!intel_mode) return;
-
-  switch(size)
-  {
-    case B_SIZE:
-      dis_sprintf("byte ptr ");
-      break;
-    case W_SIZE:
-      dis_sprintf("word ptr ");
-      break;
-    case D_SIZE:
-      dis_sprintf("dword ptr ");
-      break;
-    case Q_SIZE:
-      dis_sprintf("qword ptr ");
-      break;
-    case O_SIZE:
-      dis_sprintf("dqword ptr ");
-      break;
-    case T_SIZE:
-      dis_sprintf("tbyte ptr ");
-      break;
-    case P_SIZE:
-      break;
-    case X_SIZE:
-      break;
-  };
-}
-
-void disassembler::print_memory_access16(int datasize, 
-                const char *seg, const char *index, Bit16u disp)
-{
-  print_datasize(datasize);
-
-  if (intel_mode)
-  {
-    if (index == NULL)
-    {
-      dis_sprintf("%s:0x%x", seg, (unsigned) disp);
-    }
-    else
-    {
-      if (disp != 0)
-        dis_sprintf("%s:[%s+0x%x]", seg, index, (unsigned) disp);
-      else
-        dis_sprintf("%s:[%s]", seg, index);
-    }
-  }
-  else
-  {
-    if (index == NULL)
-    {
-      dis_sprintf("%s:0x%x", seg, (unsigned) disp);
-    }
-    else
-    {
-      if (disp != 0)
-        dis_sprintf("%s:0x%x(%s,1)", seg, (unsigned) disp, index);
-      else
-        dis_sprintf("%s:(%s,1)", seg, index);
-    }
-  }
-}
-
-void disassembler::print_memory_access(int datasize, 
-                const char *seg, const char *base, const char *index, int scale, Bit32u disp)
-{
-  print_datasize(datasize);
-  
-  if (intel_mode)
-  {
-    if (base == NULL)
-    {
-      if (index == NULL)
-      {
-        dis_sprintf("%s:0x%x", seg, (unsigned) disp);
-      }
-      else
-      {
-        if (scale != 0)
-        {
-          if (disp != 0)
-            dis_sprintf("%s:[%s*%d+0x%x]", seg, index, 1<<scale, (unsigned) disp);
-          else
-            dis_sprintf("%s:[%s*%d]", seg, index, 1<<scale);
-        }
-        else
-        {
-          if (disp != 0)
-            dis_sprintf("%s:[%s+0x%x]", seg, index, (unsigned) disp);
-          else
-            dis_sprintf("%s:[%s]", seg, index);
-        }
-      }
-    }
-    else
-    {
-      if (index == NULL)
-      {
-        if (disp != 0)
-          dis_sprintf("%s:[%s+0x%x]", seg, base, (unsigned) disp);
-        else
-          dis_sprintf("%s:[%s]", seg, base);
-      }
-      else
-      {
-        if (scale != 0)
-        {
-          if (disp != 0)
-            dis_sprintf("%s:[%s+%s*%d+0x%x]", seg, base, index, 1<<scale, (unsigned) disp);
-          else
-            dis_sprintf("%s:[%s+%s*%d]", seg, base, index, 1<<scale);
-        }
-        else
-        {
-          if (disp != 0)
-            dis_sprintf("%s:[%s+%s+0x%x]", seg, base, index, (unsigned) disp);
-          else
-            dis_sprintf("%s:[%s+%s]", seg, base, index);
-        }
-      }
-    }
-  }
-  else
-  {
-    if (base == NULL)
-    {
-      if (index == NULL)
-      {
-        dis_sprintf("%s:0x%x", seg, (unsigned) disp);
-      }
-      else
-      {
-        if (disp != 0)
-          dis_sprintf("%s:0x%x(,%s,%d)", seg, (unsigned) disp, index, 1<<scale);
-        else
-          dis_sprintf("%s:(,%s,%d)", seg, index, 1<<scale);
-      }
-    }
-    else
-    {
-      if (index == NULL)
-      {
-        if (disp != 0)
-          dis_sprintf("%s:0x%x(%s)", seg, (unsigned) disp, base);
-        else
-          dis_sprintf("%s:(%s)", seg, base);
-      }
-      else
-      {
-        if (disp != 0)
-          dis_sprintf("%s:0x%x(%s,%s,%d)", seg, (unsigned) disp, base, index, 1<<scale);
-        else
-          dis_sprintf("%s:(%s,%s,%d)", seg, base, index, 1<<scale);
-      }
-    }
-  }
-}
diff --git a/Externals/Bochs_disasm/stdafx.cpp b/Externals/Bochs_disasm/stdafx.cc
similarity index 100%
rename from Externals/Bochs_disasm/stdafx.cpp
rename to Externals/Bochs_disasm/stdafx.cc
diff --git a/Externals/Bochs_disasm/syntax.cc b/Externals/Bochs_disasm/syntax.cc
new file mode 100644
index 0000000000..fd6109c23d
--- /dev/null
+++ b/Externals/Bochs_disasm/syntax.cc
@@ -0,0 +1,268 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id: syntax.cc 11968 2013-11-29 20:49:20Z sshwarts $
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2005-2011 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+#include "disasm.h"
+
+//////////////////
+// Intel STYLE
+//////////////////
+
+static const char *intel_general_16bit_regname[16] = {
+    "ax",  "cx",  "dx",   "bx",   "sp",   "bp",   "si",   "di",
+    "r8w", "r9w", "r10w", "r11w", "r12w", "r13w", "r14w", "r15w"
+};
+
+static const char *intel_general_32bit_regname[16] = {
+    "eax", "ecx", "edx",  "ebx",  "esp",  "ebp",  "esi",  "edi",
+    "r8d", "r9d", "r10d", "r11d", "r12d", "r13d", "r14d", "r15d"
+};
+
+static const char *intel_general_64bit_regname[16] = {
+    "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
+    "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15"
+};
+
+static const char *intel_general_8bit_regname_rex[16] = {
+    "al",  "cl",  "dl",   "bl",   "spl",  "bpl",  "sil",  "dil",
+    "r8b", "r9b", "r10b", "r11b", "r12b", "r13b", "r14b", "r15b"
+};
+
+static const char *intel_general_8bit_regname[8] = {
+    "al",  "cl",  "dl",  "bl",  "ah",  "ch",  "dh",  "bh"
+};
+
+static const char *intel_segment_name[8] = {
+    "es",  "cs",  "ss",  "ds",  "fs",  "gs",  "??",  "??"
+};
+
+static const char *intel_index16[8] = {
+    "bx+si",
+    "bx+di",
+    "bp+si",
+    "bp+di",
+    "si",
+    "di",
+    "bp",
+    "bx"
+};
+
+static const char *intel_vector_reg_name[4] = {
+    "xmm", "ymm", "???", "zmm"
+};
+
+//////////////////
+// AT&T STYLE
+//////////////////
+
+static const char *att_general_16bit_regname[16] = {
+    "%ax",  "%cx",  "%dx",   "%bx",   "%sp",   "%bp",   "%si",   "%di",
+    "%r8w", "%r9w", "%r10w", "%r11w", "%r12w", "%r13w", "%r14w", "%r15w"
+};
+
+static const char *att_general_32bit_regname[16] = {
+    "%eax", "%ecx", "%edx",  "%ebx",  "%esp",  "%ebp",  "%esi",  "%edi",
+    "%r8d", "%r9d", "%r10d", "%r11d", "%r12d", "%r13d", "%r14d", "%r15d"
+};
+
+static const char *att_general_64bit_regname[16] = {
+    "%rax", "%rcx", "%rdx", "%rbx", "%rsp", "%rbp", "%rsi", "%rdi",
+    "%r8",  "%r9",  "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
+};
+
+static const char *att_general_8bit_regname_rex[16] = {
+    "%al",  "%cl",  "%dl",   "%bl",   "%spl",  "%bpl",  "%sil",  "%dil",
+    "%r8b", "%r9b", "%r10b", "%r11b", "%r12b", "%r13b", "%r14b", "%r15b"
+};
+
+static const char *att_general_8bit_regname[8] = {
+    "%al",  "%cl",  "%dl",  "%bl",  "%ah",  "%ch",  "%dh",  "%bh"
+};
+
+static const char *att_segment_name[8] = {
+    "%es",  "%cs",  "%ss",  "%ds",  "%fs",  "%gs",  "%??",  "%??"
+};
+
+static const char *att_index16[8] = {
+    "%bx,%si",
+    "%bx,%di",
+    "%bp,%si",
+    "%bp,%di",
+    "%si",
+    "%di",
+    "%bp",
+    "%bx"
+};
+
+static const char *att_vector_reg_name[4] = {
+    "%xmm", "%ymm", "%???", "%zmm"
+};
+
+#define NULL_SEGMENT_REGISTER 7
+
+void disassembler::initialize_modrm_segregs()
+{
+  sreg_mod00_rm16[0] = segment_name[DS_REG];
+  sreg_mod00_rm16[1] = segment_name[DS_REG];
+  sreg_mod00_rm16[2] = segment_name[SS_REG];
+  sreg_mod00_rm16[3] = segment_name[SS_REG];
+  sreg_mod00_rm16[4] = segment_name[DS_REG];
+  sreg_mod00_rm16[5] = segment_name[DS_REG];
+  sreg_mod00_rm16[6] = segment_name[DS_REG];
+  sreg_mod00_rm16[7] = segment_name[DS_REG];
+
+  sreg_mod01or10_rm16[0] = segment_name[DS_REG];
+  sreg_mod01or10_rm16[1] = segment_name[DS_REG];
+  sreg_mod01or10_rm16[2] = segment_name[SS_REG];
+  sreg_mod01or10_rm16[3] = segment_name[SS_REG];
+  sreg_mod01or10_rm16[4] = segment_name[DS_REG];
+  sreg_mod01or10_rm16[5] = segment_name[DS_REG];
+  sreg_mod01or10_rm16[6] = segment_name[SS_REG];
+  sreg_mod01or10_rm16[7] = segment_name[DS_REG];
+
+  sreg_mod00_base32[0]  = segment_name[DS_REG];
+  sreg_mod00_base32[1]  = segment_name[DS_REG];
+  sreg_mod00_base32[2]  = segment_name[DS_REG];
+  sreg_mod00_base32[3]  = segment_name[DS_REG];
+  sreg_mod00_base32[4]  = segment_name[SS_REG];
+  sreg_mod00_base32[5]  = segment_name[DS_REG];
+  sreg_mod00_base32[6]  = segment_name[DS_REG];
+  sreg_mod00_base32[7]  = segment_name[DS_REG];
+  sreg_mod00_base32[8]  = segment_name[DS_REG];
+  sreg_mod00_base32[9]  = segment_name[DS_REG];
+  sreg_mod00_base32[10] = segment_name[DS_REG];
+  sreg_mod00_base32[11] = segment_name[DS_REG];
+  sreg_mod00_base32[12] = segment_name[DS_REG];
+  sreg_mod00_base32[13] = segment_name[DS_REG];
+  sreg_mod00_base32[14] = segment_name[DS_REG];
+  sreg_mod00_base32[15] = segment_name[DS_REG];
+
+  sreg_mod01or10_base32[0]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[1]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[2]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[3]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[4]  = segment_name[SS_REG];
+  sreg_mod01or10_base32[5]  = segment_name[SS_REG];
+  sreg_mod01or10_base32[6]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[7]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[8]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[9]  = segment_name[DS_REG];
+  sreg_mod01or10_base32[10] = segment_name[DS_REG];
+  sreg_mod01or10_base32[11] = segment_name[DS_REG];
+  sreg_mod01or10_base32[12] = segment_name[DS_REG];
+  sreg_mod01or10_base32[13] = segment_name[DS_REG];
+  sreg_mod01or10_base32[14] = segment_name[DS_REG];
+  sreg_mod01or10_base32[15] = segment_name[DS_REG];
+}
+
+//////////////////
+// Intel STYLE
+//////////////////
+
+void disassembler::set_syntax_intel()
+{
+  intel_mode = 1;
+
+  general_16bit_regname = intel_general_16bit_regname;
+  general_8bit_regname = intel_general_8bit_regname;
+  general_32bit_regname = intel_general_32bit_regname;
+  general_8bit_regname_rex = intel_general_8bit_regname_rex;
+  general_64bit_regname = intel_general_64bit_regname;
+
+  segment_name = intel_segment_name;
+  index16 = intel_index16;
+  vector_reg_name = intel_vector_reg_name;
+
+  initialize_modrm_segregs();
+}
+
+void disassembler::print_disassembly_intel(const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry)
+{
+  // print opcode
+  dis_sprintf("%s ", entry->IntelOpcode);
+
+  if (entry->Operand1) {
+    (this->*entry->Operand1)(insn);
+  }
+  if (entry->Operand2) {
+    dis_sprintf(", ");
+    (this->*entry->Operand2)(insn);
+  }
+  if (entry->Operand3) {
+    dis_sprintf(", ");
+    (this->*entry->Operand3)(insn);
+  }
+  if (entry->Operand4) {
+    dis_sprintf(", ");
+    (this->*entry->Operand4)(insn);
+  }
+}
+
+//////////////////
+// AT&T STYLE
+//////////////////
+
+void disassembler::set_syntax_att()
+{
+  intel_mode = 0;
+
+  general_16bit_regname = att_general_16bit_regname;
+  general_8bit_regname = att_general_8bit_regname;
+  general_32bit_regname = att_general_32bit_regname;
+  general_8bit_regname_rex = att_general_8bit_regname_rex;
+  general_64bit_regname = att_general_64bit_regname;
+
+  segment_name = att_segment_name;
+  index16 = att_index16;
+  vector_reg_name = att_vector_reg_name;
+
+  initialize_modrm_segregs();
+}
+
+void disassembler::toggle_syntax_mode()
+{
+  if (intel_mode) set_syntax_att();
+  else set_syntax_intel();
+}
+
+void disassembler::print_disassembly_att(const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry)
+{
+  // print opcode
+  dis_sprintf("%s ", entry->AttOpcode);
+
+  if (entry->Operand4) {
+    (this->*entry->Operand4)(insn);
+    dis_sprintf(", ");
+  }
+  if (entry->Operand3) {
+    (this->*entry->Operand3)(insn);
+    dis_sprintf(", ");
+  }
+  if (entry->Operand2) {
+    (this->*entry->Operand2)(insn);
+    dis_sprintf(", ");
+  }
+  if (entry->Operand1) {
+    (this->*entry->Operand1)(insn);
+  }
+}
diff --git a/Externals/Bochs_disasm/syntax.cpp b/Externals/Bochs_disasm/syntax.cpp
deleted file mode 100644
index a53eb3991e..0000000000
--- a/Externals/Bochs_disasm/syntax.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// $Id: syntax.cc,v 1.10 2006/04/27 15:11:45 sshwarts Exp $
-/////////////////////////////////////////////////////////////////////////
-#include <stdio.h>
-#include "disasm.h"
-
-//////////////////
-// Intel STYLE
-//////////////////
-
-#define BX_DISASM_SUPPORT_X86_64
-
-#ifdef BX_DISASM_SUPPORT_X86_64
-
-static const char *intel_general_16bit_regname[16] = {
-    "ax",  "cx",  "dx",   "bx",   "sp",   "bp",   "si",   "di",
-    "r8w", "r9w", "r10w", "r11w", "r12w", "r13w", "r14w", "r15w"
-};
-
-static const char *intel_general_32bit_regname[16] = {
-    "eax", "ecx", "edx",  "ebx",  "esp",  "ebp",  "esi",  "edi",
-    "r8d", "r9d", "r10d", "r11d", "r12d", "r13d", "r14d", "r15d"
-};
-
-static const char *intel_general_64bit_regname[16] = {
-    "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
-    "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15"
-};
-
-static const char *intel_general_8bit_regname_rex[16] = {
-    "al",  "cl",  "dl",   "bl",   "spl",  "bpl",  "sil",  "dil",
-    "r8b", "r9b", "r10b", "r11b", "r12b", "r13b", "r14b", "r15b"
-};
-
-#else
-
-static const char *intel_general_16bit_regname[8] = {
-    "ax",  "cx",  "dx",  "bx",  "sp",  "bp",  "si",  "di"
-};
-
-static const char *intel_general_32bit_regname[8] = {
-    "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
-};
-
-#endif
-
-static const char *intel_general_8bit_regname[8] = {
-    "al",  "cl",  "dl",  "bl",  "ah",  "ch",  "dh",  "bh"
-};
-
-static const char *intel_segment_name[8] = {
-    "es",  "cs",  "ss",  "ds",  "fs",  "gs",  "??",  "??"
-};
-
-static const char *intel_index16[8] = {
-    "bx+si", 
-    "bx+di", 
-    "bp+si", 
-    "bp+di", 
-    "si", 
-    "di", 
-    "bp", 
-    "bx"
-};
-
-
-//////////////////
-// AT&T STYLE
-//////////////////
-
-#ifdef BX_DISASM_SUPPORT_X86_64
-
-static const char *att_general_16bit_regname[16] = {
-    "%ax",  "%cx",  "%dx",   "%bx",   "%sp",   "%bp",   "%si",   "%di",
-    "%r8w", "%r9w", "%r10w", "%r11w", "%r12w", "%r13w", "%r14w", "%r15w"
-};
-
-static const char *att_general_32bit_regname[16] = {
-    "%eax", "%ecx", "%edx",  "%ebx",  "%esp",  "%ebp",  "%esi",  "%edi",
-    "%r8d", "%r9d", "%r10d", "%r11d", "%r12d", "%r13d", "%r14d", "%r15d"
-};
-
-static const char *att_general_64bit_regname[16] = {
-    "%rax", "%rcx", "%rdx", "%rbx", "%rsp", "%rbp", "%rsi", "%rdi",
-    "%r8",  "%r9",  "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
-};
-
-static const char *att_general_8bit_regname_rex[16] = {
-    "%al",  "%cl",  "%dl",   "%bl",   "%spl",  "%bpl",  "%sil",  "%dil",
-    "%r8b", "%r9b", "%r10b", "%r11b", "%r12b", "%r13b", "%r14b", "%r15b"
-};
-
-#else
-
-static const char *att_general_16bit_regname[8] = {
-    "%ax",  "%cx",  "%dx",  "%bx",  "%sp",  "%bp",  "%si",  "%di"
-};
-
-static const char *att_general_32bit_regname[8] = {
-    "%eax", "%ecx", "%edx", "%ebx", "%esp", "%ebp", "%esi", "%edi"
-};
-
-#endif
-
-static const char *att_general_8bit_regname[8] = {
-    "%al",  "%cl",  "%dl",  "%bl",  "%ah",  "%ch",  "%dh",  "%bh"
-};
-
-static const char *att_segment_name[8] = {
-    "%es",  "%cs",  "%ss",  "%ds",  "%fs",  "%gs",  "%??",  "%??"
-};
-
-static const char *att_index16[8] = {
-    "%bx, %si", 
-    "%bx, %di", 
-    "%bp, %si", 
-    "%bp, %di", 
-    "%si", 
-    "%di", 
-    "%bp", 
-    "%bx"
-};
-
-#define NULL_SEGMENT_REGISTER 7
-
-void disassembler::initialize_modrm_segregs()
-{
-  sreg_mod00_rm16[0] = segment_name[DS_REG];
-  sreg_mod00_rm16[1] = segment_name[DS_REG];
-  sreg_mod00_rm16[2] = segment_name[SS_REG];
-  sreg_mod00_rm16[3] = segment_name[SS_REG];
-  sreg_mod00_rm16[4] = segment_name[DS_REG];
-  sreg_mod00_rm16[5] = segment_name[DS_REG];
-  sreg_mod00_rm16[6] = segment_name[DS_REG];
-  sreg_mod00_rm16[7] = segment_name[DS_REG];
-
-  sreg_mod01or10_rm16[0] = segment_name[DS_REG];
-  sreg_mod01or10_rm16[1] = segment_name[DS_REG];
-  sreg_mod01or10_rm16[2] = segment_name[SS_REG];
-  sreg_mod01or10_rm16[3] = segment_name[SS_REG];
-  sreg_mod01or10_rm16[4] = segment_name[DS_REG];
-  sreg_mod01or10_rm16[5] = segment_name[DS_REG];
-  sreg_mod01or10_rm16[6] = segment_name[SS_REG];
-  sreg_mod01or10_rm16[7] = segment_name[DS_REG];
-
-  sreg_mod01or10_rm32[0] = segment_name[DS_REG];
-  sreg_mod01or10_rm32[1] = segment_name[DS_REG];
-  sreg_mod01or10_rm32[2] = segment_name[DS_REG];
-  sreg_mod01or10_rm32[3] = segment_name[DS_REG];
-  sreg_mod01or10_rm32[4] = segment_name[NULL_SEGMENT_REGISTER];
-  sreg_mod01or10_rm32[5] = segment_name[SS_REG];
-  sreg_mod01or10_rm32[6] = segment_name[DS_REG];
-  sreg_mod01or10_rm32[7] = segment_name[DS_REG];
-
-  sreg_mod00_base32[0] = segment_name[DS_REG];
-  sreg_mod00_base32[1] = segment_name[DS_REG];
-  sreg_mod00_base32[2] = segment_name[DS_REG];
-  sreg_mod00_base32[3] = segment_name[DS_REG];
-  sreg_mod00_base32[4] = segment_name[SS_REG];
-  sreg_mod00_base32[5] = segment_name[DS_REG];
-  sreg_mod00_base32[6] = segment_name[DS_REG];
-  sreg_mod00_base32[7] = segment_name[DS_REG];
-
-  sreg_mod01or10_base32[0] = segment_name[DS_REG];
-  sreg_mod01or10_base32[1] = segment_name[DS_REG];
-  sreg_mod01or10_base32[2] = segment_name[DS_REG];
-  sreg_mod01or10_base32[3] = segment_name[DS_REG];
-  sreg_mod01or10_base32[4] = segment_name[SS_REG];
-  sreg_mod01or10_base32[5] = segment_name[SS_REG];
-  sreg_mod01or10_base32[6] = segment_name[DS_REG];
-  sreg_mod01or10_base32[7] = segment_name[DS_REG];
-}
-
-//////////////////
-// Intel STYLE
-//////////////////
-
-void disassembler::set_syntax_intel()
-{
-  intel_mode = 1;
-
-  general_16bit_regname = intel_general_16bit_regname;
-  general_8bit_regname = intel_general_8bit_regname;
-  general_32bit_regname = intel_general_32bit_regname;
-  general_8bit_regname_rex = intel_general_8bit_regname_rex;
-  general_64bit_regname = intel_general_64bit_regname;
-
-  segment_name = intel_segment_name;
-  index16 = intel_index16;
-
-  initialize_modrm_segregs();
-}
-
-void disassembler::print_disassembly_intel(const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry)
-{
-  // print opcode
-  dis_sprintf("%s ", entry->IntelOpcode);
-
-  if (entry->Operand1) {
-    (this->*entry->Operand1)(insn);
-  }
-  if (entry->Operand2) {
-    dis_sprintf(", ");
-    (this->*entry->Operand2)(insn);
-  }
-  if (entry->Operand3) {
-    dis_sprintf(", ");
-    (this->*entry->Operand3)(insn);
-  }
-}
-
-//////////////////
-// AT&T STYLE
-//////////////////
- 
-void disassembler::set_syntax_att()
-{
-  intel_mode = 0;
-
-  general_16bit_regname = att_general_16bit_regname;
-  general_8bit_regname = att_general_8bit_regname;
-  general_32bit_regname = att_general_32bit_regname;
-  general_8bit_regname_rex = att_general_8bit_regname_rex;
-  general_64bit_regname = att_general_64bit_regname;
-
-  segment_name = att_segment_name;
-  index16 = att_index16;
-
-  initialize_modrm_segregs();
-}
-
-void disassembler::toggle_syntax_mode()
-{
-  if (intel_mode) set_syntax_att();
-  else set_syntax_intel();
-}
-
-void disassembler::print_disassembly_att(const x86_insn *insn, const BxDisasmOpcodeInfo_t *entry)
-{
-  // print opcode
-  dis_sprintf("%s ", entry->AttOpcode);
-
-  if (entry->Operand3) {                                         
-    (this->*entry->Operand3)(insn);
-    dis_sprintf(", ");
-  }
-  if (entry->Operand2) {
-    (this->*entry->Operand2)(insn);
-    dis_sprintf(", ");
-  }
-  if (entry->Operand1) {
-    (this->*entry->Operand1)(insn);
-  }
-}
diff --git a/Externals/CLRun/CMakeLists.txt b/Externals/CLRun/CMakeLists.txt
deleted file mode 100644
index 3a57ae4563..0000000000
--- a/Externals/CLRun/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-set(SRCS	clrun/clrun.c
-			clrun/dynamiclib.c
-			clrun/gencl.c
-			clrun/genclgl.c
-			clrun/genclext.c
-			clrun/genclglext.c
-			)
-
-add_library(clrun STATIC ${SRCS})
-target_link_libraries(clrun ${CMAKE_DL_LIBS})
diff --git a/Externals/CLRun/clrun/CLRun.vcxproj b/Externals/CLRun/clrun/CLRun.vcxproj
deleted file mode 100644
index c6a4cb2e6d..0000000000
--- a/Externals/CLRun/clrun/CLRun.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{AA862E5E-A993-497A-B6A0-0E8E94B10050}</ProjectGuid>
-    <RootNamespace>CLRun</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="clrun.c" />
-    <ClCompile Include="dynamiclib.c" />
-    <ClCompile Include="gencl.c" />
-    <ClCompile Include="genclgl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\clrun.h" />
-    <ClInclude Include="..\include\CL\cl.h" />
-    <ClInclude Include="..\include\CL\cl_gl.h" />
-    <ClInclude Include="..\include\CL\cl_platform.h" />
-    <ClInclude Include="dynamiclib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\CMakeLists.txt" />
-    <None Include="generateClRun.pl" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/CLRun/clrun/CLRun.vcxproj.filters b/Externals/CLRun/clrun/CLRun.vcxproj.filters
deleted file mode 100644
index 3f252a668b..0000000000
--- a/Externals/CLRun/clrun/CLRun.vcxproj.filters
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="genclgl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gencl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dynamiclib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="clrun.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\clrun.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dynamiclib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\CL\cl_platform.h">
-      <Filter>Header Files\OpenCL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\CL\cl.h">
-      <Filter>Header Files\OpenCL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\CL\cl_gl.h">
-      <Filter>Header Files\OpenCL</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{106ccba4-ab19-42b5-b57a-e758dc5a2ed1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{db71af5e-c0f4-4099-a280-11cd0039b790}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{a28bc4a7-a663-44a5-a120-6ca71a89b55c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\OpenCL">
-      <UniqueIdentifier>{17baf6ec-fbcb-4dfd-a963-5f9a091de41e}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\CMakeLists.txt" />
-    <None Include="generateClRun.pl">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/CLRun/clrun/Makefile b/Externals/CLRun/clrun/Makefile
deleted file mode 100644
index f4186ff741..0000000000
--- a/Externals/CLRun/clrun/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-all: compile
-
-compile: genclrun gencl.c genclgl.c
-	gcc -Wall -c gencl.c -o gencl.o
-	gcc -Wall -c genclgl.c -o genclgl.o
-	gcc -Wall -c clrun.c -o clrun.o -I../include
-	gcc -Wall --shared dynamiclib.c clrun.o gencl.o genclgl.o -o libclrun.so -ldl
-		strip libclrun.so
-
-genclrun: ../include/CL/cl.h ../include/CL/cl_gl.h
-	./generateClRun.pl ../include/CL/cl.h > gencl.c
-	./generateClRun.pl ../include/CL/cl_gl.h > genclgl.c
-	./generateClRun.pl ../include/CL/cl_ext.h > genclext.c
-	./generateClRun.pl ../include/CL/cl_gl_ext.h > genclglext.c
-	./generateClRun.pl ../include/CL/cl_d3d10.h > gencld3d10.c
-	./generateClRun.pl ../include/CL/cl_d3d11.h > gencld3d11.c
-	./generateClRun.pl ../include/CL/cl_dx9_media_sharing.h > gencldx9.c
-
-
-clean:
-	rm -rf *~ *.o
diff --git a/Externals/CLRun/clrun/clrun.c b/Externals/CLRun/clrun/clrun.c
deleted file mode 100644
index e121f80737..0000000000
--- a/Externals/CLRun/clrun/clrun.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "clrun.h"
-#include "dynamiclib.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-int isCL = 0;
-
-// 0 means no opencl, 1 means opencl
-int clrInit() {
-	int ret = 0;
-	
-#ifdef _WIN32
-	const char *libname = "OpenCL.dll";
-#else
-	const char *libname = "libOpenCL.so";
-#endif
-
-	if((ret = loadLib(libname))) {
-		if(ret == -3) // No OpenCL
-			return 0;
-		else
-			return ret;
-	}
-
-	isCL = 1;
-	
-	// TODO: optimize by loading all functions here?
-
-	return 0;
-}
-
-int clrHasOpenCL() {
-	return isCL;
-}
-
-
-// Windows-specific DLL code
-#if defined _WIN32 && defined CLRUN_DYNAMICLIB
-HINSTANCE g_hInstance;
-
-BOOL APIENTRY DllMain(HINSTANCE hinstDLL,	// DLL module handle
-					  DWORD dwReason,		// reason called
-					  LPVOID lpvReserved)	// reserved
-{
-	switch (dwReason)
-	{
-	case DLL_PROCESS_ATTACH:
-		break; 
-
-	case DLL_PROCESS_DETACH:
-		break;
-	default:
-		break;
-	}
-
-	g_hInstance = hinstDLL;
-	return TRUE;
-}
-#endif
diff --git a/Externals/CLRun/clrun/dynamiclib.c b/Externals/CLRun/clrun/dynamiclib.c
deleted file mode 100644
index 368d262ed1..0000000000
--- a/Externals/CLRun/clrun/dynamiclib.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifdef _WIN32
-#include <windows.h>
-HINSTANCE library = NULL;
-#else
-#include <dlfcn.h>
-#include <stdio.h>
-void *library = NULL;
-#endif
-#include <string.h>
-
-int loadLib(const char *filename) {
-	if (library)
-		return -1;
-
-	if (!filename || strlen(filename) == 0) 
-		return -2;
-
-#ifdef _WIN32
-	library = LoadLibraryA(filename);
-#else
-	library = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
-#endif
-
-	if (!library)
-		return -3;
-
-	return 0;
-}
-
-int unloadLib()
-{
-    int retval;
-    if (!library)
-		return -1;
-
-#ifdef _WIN32
-    retval = FreeLibrary(library);
-#else
-    retval = dlclose(library);
-#endif
-
-    library = NULL;
-    return retval;
-}
-
-void *getFunction(const char *funcname) {
-	void* retval;
-
-	if (!library) {
-		return NULL;
-	}
-
-#ifdef _WIN32
-	retval = GetProcAddress(library, funcname);
-#else
-	retval = dlsym(library, funcname);
-#endif
-
-	if (!retval) 
-		return NULL;
-
-	return retval;
-}
diff --git a/Externals/CLRun/clrun/dynamiclib.h b/Externals/CLRun/clrun/dynamiclib.h
deleted file mode 100644
index 0d62d2dcc7..0000000000
--- a/Externals/CLRun/clrun/dynamiclib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef __DYNAMIC_LIBRARY_H
-#define __DYNAMIC_LIBRARY_H
-
-int loadLib(const char *filename);
-int unloadLib();
-void *getFunction(const char *funcname);
-
-#endif
diff --git a/Externals/CLRun/clrun/gencl.c b/Externals/CLRun/clrun/gencl.c
deleted file mode 100644
index 649e3c67b7..0000000000
--- a/Externals/CLRun/clrun/gencl.c
+++ /dev/null
@@ -1,546 +0,0 @@
-// Automatically generated by generateClRun.pl
-#include "dynamiclib.h"
-#include "../include/CL/cl.h"
-
-
-static cl_int (*clGetPlatformIDs_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL;
-cl_int CL_API_CALL clGetPlatformIDs (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) {
-	if(!clGetPlatformIDs_ptr) clGetPlatformIDs_ptr = getFunction("clGetPlatformIDs");
-	return (*clGetPlatformIDs_ptr)(num_entries, platforms, num_platforms);
-}
-
-static cl_int (*clGetPlatformInfo_ptr)(cl_platform_id, cl_platform_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetPlatformInfo (cl_platform_id platform,cl_platform_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetPlatformInfo_ptr) clGetPlatformInfo_ptr = getFunction("clGetPlatformInfo");
-	return (*clGetPlatformInfo_ptr)(platform, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clGetDeviceIDs_ptr)(cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *) = NULL;
-cl_int CL_API_CALL clGetDeviceIDs (cl_platform_id platform,cl_device_type device_type,cl_uint num_entries,cl_device_id * devices,cl_uint * num_devices) {
-	if(!clGetDeviceIDs_ptr) clGetDeviceIDs_ptr = getFunction("clGetDeviceIDs");
-	return (*clGetDeviceIDs_ptr)(platform, device_type, num_entries, devices, num_devices);
-}
-
-static cl_int (*clGetDeviceInfo_ptr)(cl_device_id, cl_device_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetDeviceInfo (cl_device_id device,cl_device_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetDeviceInfo_ptr) clGetDeviceInfo_ptr = getFunction("clGetDeviceInfo");
-	return (*clGetDeviceInfo_ptr)(device, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clCreateSubDevices_ptr)(cl_device_id, const cl_device_partition_property *, cl_uint, cl_device_id *, cl_uint *) = NULL;
-cl_int CL_API_CALL clCreateSubDevices (cl_device_id in_device,const cl_device_partition_property * properties,cl_uint num_devices,cl_device_id * out_devices,cl_uint * num_devices_ret) {
-	if(!clCreateSubDevices_ptr) clCreateSubDevices_ptr = getFunction("clCreateSubDevices");
-	return (*clCreateSubDevices_ptr)(in_device, properties, num_devices, out_devices, num_devices_ret);
-}
-
-static cl_int (*clRetainDevice_ptr)(cl_device_id) = NULL;
-cl_int CL_API_CALL clRetainDevice (cl_device_id device) {
-	if(!clRetainDevice_ptr) clRetainDevice_ptr = getFunction("clRetainDevice");
-	return (*clRetainDevice_ptr)(device);
-}
-
-static cl_int (*clReleaseDevice_ptr)(cl_device_id) = NULL;
-cl_int CL_API_CALL clReleaseDevice (cl_device_id device) {
-	if(!clReleaseDevice_ptr) clReleaseDevice_ptr = getFunction("clReleaseDevice");
-	return (*clReleaseDevice_ptr)(device);
-}
-
-static cl_context (*clCreateContext_ptr)(const cl_context_properties *, cl_uint, const cl_device_id *, void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL;
-cl_context CL_API_CALL clCreateContext(const cl_context_properties * properties,
-                cl_uint                  num_devices,
-                const cl_device_id *     devices,
-                void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *),
-                void *                   user_data,
-                cl_int *                errcode_ret)  {
-	if(!clCreateContext_ptr) clCreateContext_ptr = getFunction("clCreateContext");
-	return (*clCreateContext_ptr)(properties, num_devices, devices, pfn_notify, user_data, errcode_ret);
-}
-
-static cl_context (*clCreateContextFromType_ptr)(const cl_context_properties *, cl_device_type, void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL;
-cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * properties,
-                        cl_device_type          device_type,
-                        void (CL_CALLBACK *     pfn_notify)(const char *, const void *, size_t, void *),
-                        void *                  user_data,
-                        cl_int *                errcode_ret) {
-	if(!clCreateContextFromType_ptr) clCreateContextFromType_ptr = getFunction("clCreateContextFromType");
-	return (*clCreateContextFromType_ptr)(properties, device_type, pfn_notify, user_data, errcode_ret);
-}
-
-static cl_int (*clRetainContext_ptr)(cl_context) = NULL;
-cl_int CL_API_CALL clRetainContext (cl_context context) {
-	if(!clRetainContext_ptr) clRetainContext_ptr = getFunction("clRetainContext");
-	return (*clRetainContext_ptr)(context);
-}
-
-static cl_int (*clReleaseContext_ptr)(cl_context) = NULL;
-cl_int CL_API_CALL clReleaseContext (cl_context context) {
-	if(!clReleaseContext_ptr) clReleaseContext_ptr = getFunction("clReleaseContext");
-	return (*clReleaseContext_ptr)(context);
-}
-
-static cl_int (*clGetContextInfo_ptr)(cl_context, cl_context_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetContextInfo (cl_context context,cl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetContextInfo_ptr) clGetContextInfo_ptr = getFunction("clGetContextInfo");
-	return (*clGetContextInfo_ptr)(context, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_command_queue (*clCreateCommandQueue_ptr)(cl_context, cl_device_id, cl_command_queue_properties, cl_int *) = NULL;
-cl_command_queue CL_API_CALL clCreateCommandQueue (cl_context context,cl_device_id device,cl_command_queue_properties properties,cl_int * errcode_ret) {
-	if(!clCreateCommandQueue_ptr) clCreateCommandQueue_ptr = getFunction("clCreateCommandQueue");
-	return (*clCreateCommandQueue_ptr)(context, device, properties, errcode_ret);
-}
-
-static cl_int (*clRetainCommandQueue_ptr)(cl_command_queue) = NULL;
-cl_int CL_API_CALL clRetainCommandQueue (cl_command_queue command_queue) {
-	if(!clRetainCommandQueue_ptr) clRetainCommandQueue_ptr = getFunction("clRetainCommandQueue");
-	return (*clRetainCommandQueue_ptr)(command_queue);
-}
-
-static cl_int (*clReleaseCommandQueue_ptr)(cl_command_queue) = NULL;
-cl_int CL_API_CALL clReleaseCommandQueue (cl_command_queue command_queue) {
-	if(!clReleaseCommandQueue_ptr) clReleaseCommandQueue_ptr = getFunction("clReleaseCommandQueue");
-	return (*clReleaseCommandQueue_ptr)(command_queue);
-}
-
-static cl_int (*clGetCommandQueueInfo_ptr)(cl_command_queue, cl_command_queue_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetCommandQueueInfo (cl_command_queue command_queue,cl_command_queue_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetCommandQueueInfo_ptr) clGetCommandQueueInfo_ptr = getFunction("clGetCommandQueueInfo");
-	return (*clGetCommandQueueInfo_ptr)(command_queue, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_mem (*clCreateBuffer_ptr)(cl_context, cl_mem_flags, size_t, void *, cl_int *) = NULL;
-cl_mem CL_API_CALL clCreateBuffer (cl_context context,cl_mem_flags flags,size_t size,void * host_ptr,cl_int * errcode_ret) {
-	if(!clCreateBuffer_ptr) clCreateBuffer_ptr = getFunction("clCreateBuffer");
-	return (*clCreateBuffer_ptr)(context, flags, size, host_ptr, errcode_ret);
-}
-
-static cl_mem (*clCreateSubBuffer_ptr)(cl_mem, cl_mem_flags, cl_buffer_create_type, const void *, cl_int *) = NULL;
-cl_mem CL_API_CALL clCreateSubBuffer (cl_mem buffer,cl_mem_flags flags,cl_buffer_create_type buffer_create_type,const void * buffer_create_info,cl_int * errcode_ret) {
-	if(!clCreateSubBuffer_ptr) clCreateSubBuffer_ptr = getFunction("clCreateSubBuffer");
-	return (*clCreateSubBuffer_ptr)(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret);
-}
-
-static cl_mem (*clCreateImage_ptr)(cl_context, cl_mem_flags, const cl_image_format *, const cl_image_desc *, void *, cl_int *) = NULL;
-cl_mem CL_API_CALL clCreateImage (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,const cl_image_desc * image_desc,void * host_ptr,cl_int * errcode_ret) {
-	if(!clCreateImage_ptr) clCreateImage_ptr = getFunction("clCreateImage");
-	return (*clCreateImage_ptr)(context, flags, image_format, image_desc, host_ptr, errcode_ret);
-}
-
-static cl_int (*clRetainMemObject_ptr)(cl_mem) = NULL;
-cl_int CL_API_CALL clRetainMemObject (cl_mem memobj) {
-	if(!clRetainMemObject_ptr) clRetainMemObject_ptr = getFunction("clRetainMemObject");
-	return (*clRetainMemObject_ptr)(memobj);
-}
-
-static cl_int (*clReleaseMemObject_ptr)(cl_mem) = NULL;
-cl_int CL_API_CALL clReleaseMemObject (cl_mem memobj) {
-	if(!clReleaseMemObject_ptr) clReleaseMemObject_ptr = getFunction("clReleaseMemObject");
-	return (*clReleaseMemObject_ptr)(memobj);
-}
-
-static cl_int (*clGetSupportedImageFormats_ptr)(cl_context, cl_mem_flags, cl_mem_object_type, cl_uint, cl_image_format *, cl_uint *) = NULL;
-cl_int CL_API_CALL clGetSupportedImageFormats (cl_context context,cl_mem_flags flags,cl_mem_object_type image_type,cl_uint num_entries,cl_image_format * image_formats,cl_uint * num_image_formats) {
-	if(!clGetSupportedImageFormats_ptr) clGetSupportedImageFormats_ptr = getFunction("clGetSupportedImageFormats");
-	return (*clGetSupportedImageFormats_ptr)(context, flags, image_type, num_entries, image_formats, num_image_formats);
-}
-
-static cl_int (*clGetMemObjectInfo_ptr)(cl_mem, cl_mem_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetMemObjectInfo (cl_mem memobj,cl_mem_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetMemObjectInfo_ptr) clGetMemObjectInfo_ptr = getFunction("clGetMemObjectInfo");
-	return (*clGetMemObjectInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clGetImageInfo_ptr)(cl_mem, cl_image_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetImageInfo (cl_mem image,cl_image_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetImageInfo_ptr) clGetImageInfo_ptr = getFunction("clGetImageInfo");
-	return (*clGetImageInfo_ptr)(image, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-/* Sampler APIs */
-static cl_int (*clSetMemObjectDestructorCallback_ptr)(cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data ) = NULL;
-cl_int CL_API_CALL clSetMemObjectDestructorCallback (cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data )
-{
-	if(!clSetMemObjectDestructorCallback_ptr) clSetMemObjectDestructorCallback_ptr = getFunction("clSetMemObjectDestructorCallback");
-	return (*clSetMemObjectDestructorCallback_ptr)(memobj, pfn_notify, user_data);
-}
-
-/* Sampler APIs */
-static cl_sampler (*clCreateSampler_ptr)(cl_context, cl_bool, cl_addressing_mode, cl_filter_mode, cl_int *) = NULL;
-cl_sampler CL_API_CALL clCreateSampler(cl_context context,cl_bool normalized_coords,cl_addressing_mode addressing_mode,cl_filter_mode filter_mode,cl_int * errcode_ret) {
-	if(!clCreateSampler_ptr) clCreateSampler_ptr = getFunction("clCreateSampler");
-	return (*clCreateSampler_ptr)(context, normalized_coords, addressing_mode, filter_mode, errcode_ret);
-}
-
-static cl_int (*clRetainSampler_ptr)(cl_sampler) = NULL;
-cl_int CL_API_CALL clRetainSampler (cl_sampler sampler) {
-	if(!clRetainSampler_ptr) clRetainSampler_ptr = getFunction("clRetainSampler");
-	return (*clRetainSampler_ptr)(sampler);
-}
-
-static cl_int (*clReleaseSampler_ptr)(cl_sampler) = NULL;
-cl_int CL_API_CALL clReleaseSampler (cl_sampler sampler) {
-	if(!clReleaseSampler_ptr) clReleaseSampler_ptr = getFunction("clReleaseSampler");
-	return (*clReleaseSampler_ptr)(sampler);
-}
-
-static cl_int (*clGetSamplerInfo_ptr)(cl_sampler, cl_sampler_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetSamplerInfo (cl_sampler sampler,cl_sampler_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetSamplerInfo_ptr) clGetSamplerInfo_ptr = getFunction("clGetSamplerInfo");
-	return (*clGetSamplerInfo_ptr)(sampler, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_program (*clCreateProgramWithSource_ptr)(cl_context, cl_uint, const char **, const size_t *, cl_int *) = NULL;
-cl_program CL_API_CALL clCreateProgramWithSource (cl_context context,cl_uint count,const char ** strings,const size_t * lengths,cl_int * errcode_ret) {
-	if(!clCreateProgramWithSource_ptr) clCreateProgramWithSource_ptr = getFunction("clCreateProgramWithSource");
-	return (*clCreateProgramWithSource_ptr)(context, count, strings, lengths, errcode_ret);
-}
-
-static cl_program (*clCreateProgramWithBinary_ptr)(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int *) = NULL;
-cl_program CL_API_CALL clCreateProgramWithBinary (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const size_t * lengths,const unsigned char ** binaries,cl_int * binary_status,cl_int * errcode_ret) {
-	if(!clCreateProgramWithBinary_ptr) clCreateProgramWithBinary_ptr = getFunction("clCreateProgramWithBinary");
-	return (*clCreateProgramWithBinary_ptr)(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret);
-}
-
-static cl_program (*clCreateProgramWithBuiltInKernels_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_int *) = NULL;
-cl_program CL_API_CALL clCreateProgramWithBuiltInKernels (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * kernel_names,cl_int * errcode_ret) {
-	if(!clCreateProgramWithBuiltInKernels_ptr) clCreateProgramWithBuiltInKernels_ptr = getFunction("clCreateProgramWithBuiltInKernels");
-	return (*clCreateProgramWithBuiltInKernels_ptr)(context, num_devices, device_list, kernel_names, errcode_ret);
-}
-
-static cl_int (*clRetainProgram_ptr)(cl_program) = NULL;
-cl_int CL_API_CALL clRetainProgram (cl_program program) {
-	if(!clRetainProgram_ptr) clRetainProgram_ptr = getFunction("clRetainProgram");
-	return (*clRetainProgram_ptr)(program);
-}
-
-static cl_int (*clReleaseProgram_ptr)(cl_program) = NULL;
-cl_int CL_API_CALL clReleaseProgram (cl_program program) {
-	if(!clReleaseProgram_ptr) clReleaseProgram_ptr = getFunction("clReleaseProgram");
-	return (*clReleaseProgram_ptr)(program);
-}
-
-static cl_int (*clBuildProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL;
-cl_int CL_API_CALL clBuildProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options, void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) {
-	if(!clBuildProgram_ptr) clBuildProgram_ptr = getFunction("clBuildProgram");
-	return (*clBuildProgram_ptr)(program, num_devices, device_list, options, user_data, user_data);
-}
-
-static cl_int (*clCompileProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, const char **, void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL;
-cl_int CL_API_CALL clCompileProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_headers,const cl_program * input_headers,const char ** header_include_names,void (CL_CALLBACK *  pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) {
-	if(!clCompileProgram_ptr) clCompileProgram_ptr = getFunction("clCompileProgram");
-	return (*clCompileProgram_ptr)(program, num_devices, device_list, options, num_input_headers, input_headers, header_include_names, user_data, user_data);
-}
-
-static cl_program (*clLinkProgram_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *, cl_int *) = NULL;
-cl_program CL_API_CALL clLinkProgram (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_programs,const cl_program * input_programs,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data,cl_int * errcode_ret) {
-	if(!clLinkProgram_ptr) clLinkProgram_ptr = getFunction("clLinkProgram");
-	return (*clLinkProgram_ptr)(context, num_devices, device_list, options, num_input_programs, input_programs, user_data, user_data, errcode_ret);
-}
-
-static cl_int (*clUnloadPlatformCompiler_ptr)(cl_platform_id) = NULL;
-cl_int CL_API_CALL clUnloadPlatformCompiler (cl_platform_id platform) {
-	if(!clUnloadPlatformCompiler_ptr) clUnloadPlatformCompiler_ptr = getFunction("clUnloadPlatformCompiler");
-	return (*clUnloadPlatformCompiler_ptr)(platform);
-}
-
-static cl_int (*clGetProgramInfo_ptr)(cl_program, cl_program_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetProgramInfo (cl_program program,cl_program_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetProgramInfo_ptr) clGetProgramInfo_ptr = getFunction("clGetProgramInfo");
-	return (*clGetProgramInfo_ptr)(program, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clGetProgramBuildInfo_ptr)(cl_program, cl_device_id, cl_program_build_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetProgramBuildInfo (cl_program program,cl_device_id device,cl_program_build_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetProgramBuildInfo_ptr) clGetProgramBuildInfo_ptr = getFunction("clGetProgramBuildInfo");
-	return (*clGetProgramBuildInfo_ptr)(program, device, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_kernel (*clCreateKernel_ptr)(cl_program, const char *, cl_int *) = NULL;
-cl_kernel CL_API_CALL clCreateKernel (cl_program program,const char * kernel_name,cl_int * errcode_ret) {
-	if(!clCreateKernel_ptr) clCreateKernel_ptr = getFunction("clCreateKernel");
-	return (*clCreateKernel_ptr)(program, kernel_name, errcode_ret);
-}
-
-static cl_int (*clCreateKernelsInProgram_ptr)(cl_program, cl_uint, cl_kernel *, cl_uint *) = NULL;
-cl_int CL_API_CALL clCreateKernelsInProgram (cl_program program,cl_uint num_kernels,cl_kernel * kernels,cl_uint * num_kernels_ret) {
-	if(!clCreateKernelsInProgram_ptr) clCreateKernelsInProgram_ptr = getFunction("clCreateKernelsInProgram");
-	return (*clCreateKernelsInProgram_ptr)(program, num_kernels, kernels, num_kernels_ret);
-}
-
-static cl_int (*clRetainKernel_ptr)(cl_kernel) = NULL;
-cl_int CL_API_CALL clRetainKernel (cl_kernel kernel) {
-	if(!clRetainKernel_ptr) clRetainKernel_ptr = getFunction("clRetainKernel");
-	return (*clRetainKernel_ptr)(kernel);
-}
-
-static cl_int (*clReleaseKernel_ptr)(cl_kernel) = NULL;
-cl_int CL_API_CALL clReleaseKernel (cl_kernel kernel) {
-	if(!clReleaseKernel_ptr) clReleaseKernel_ptr = getFunction("clReleaseKernel");
-	return (*clReleaseKernel_ptr)(kernel);
-}
-
-static cl_int (*clSetKernelArg_ptr)(cl_kernel, cl_uint, size_t, const void *) = NULL;
-cl_int CL_API_CALL clSetKernelArg (cl_kernel kernel,cl_uint arg_index,size_t arg_size,const void * arg_value) {
-	if(!clSetKernelArg_ptr) clSetKernelArg_ptr = getFunction("clSetKernelArg");
-	return (*clSetKernelArg_ptr)(kernel, arg_index, arg_size, arg_value);
-}
-
-static cl_int (*clGetKernelInfo_ptr)(cl_kernel, cl_kernel_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetKernelInfo (cl_kernel kernel,cl_kernel_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetKernelInfo_ptr) clGetKernelInfo_ptr = getFunction("clGetKernelInfo");
-	return (*clGetKernelInfo_ptr)(kernel, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clGetKernelArgInfo_ptr)(cl_kernel, cl_uint, cl_kernel_arg_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetKernelArgInfo (cl_kernel kernel,cl_uint arg_indx,cl_kernel_arg_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetKernelArgInfo_ptr) clGetKernelArgInfo_ptr = getFunction("clGetKernelArgInfo");
-	return (*clGetKernelArgInfo_ptr)(kernel, arg_indx, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clGetKernelWorkGroupInfo_ptr)(cl_kernel, cl_device_id, cl_kernel_work_group_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetKernelWorkGroupInfo (cl_kernel kernel,cl_device_id device,cl_kernel_work_group_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetKernelWorkGroupInfo_ptr) clGetKernelWorkGroupInfo_ptr = getFunction("clGetKernelWorkGroupInfo");
-	return (*clGetKernelWorkGroupInfo_ptr)(kernel, device, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clWaitForEvents_ptr)(cl_uint, const cl_event *) = NULL;
-cl_int CL_API_CALL clWaitForEvents (cl_uint num_events,const cl_event * event_list) {
-	if(!clWaitForEvents_ptr) clWaitForEvents_ptr = getFunction("clWaitForEvents");
-	return (*clWaitForEvents_ptr)(num_events, event_list);
-}
-
-static cl_int (*clGetEventInfo_ptr)(cl_event, cl_event_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetEventInfo (cl_event event,cl_event_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetEventInfo_ptr) clGetEventInfo_ptr = getFunction("clGetEventInfo");
-	return (*clGetEventInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_event (*clCreateUserEvent_ptr)(cl_context, cl_int *      /* errcode_ret */) = NULL;                                         
-cl_event CL_API_CALL clCreateUserEvent (cl_context context,cl_int *     errcode_ret)
-{
-	if(!clCreateUserEvent_ptr) clCreateUserEvent_ptr = getFunction("clCreateUserEvent");
-	return (*clCreateUserEvent_ptr)(context,errcode_ret);
-}             
-
-static cl_int (*clRetainEvent_ptr)(cl_event) = NULL;
-cl_int CL_API_CALL clRetainEvent(cl_event event) {
-	if(!clRetainEvent_ptr) clRetainEvent_ptr = getFunction("clRetainEvent");
-	return (*clRetainEvent_ptr)(event);
-}
-
-static cl_int (*clReleaseEvent_ptr)(cl_event) = NULL;
-cl_int CL_API_CALL clReleaseEvent (cl_event event) {
-	if(!clReleaseEvent_ptr) clReleaseEvent_ptr = getFunction("clReleaseEvent");
-	return (*clReleaseEvent_ptr)(event);
-}
-
-static cl_int (*clSetUserEventStatus_ptr)(cl_event, cl_int) = NULL;
-cl_int CL_API_CALL clSetUserEventStatus (cl_event event,cl_int execution_status) {
-	if(!clSetUserEventStatus_ptr) clSetUserEventStatus_ptr = getFunction("clSetUserEventStatus");
-	return (*clSetUserEventStatus_ptr)(event, execution_status);
-}
-
-static cl_int (*clSetEventCallback_ptr)(cl_event, cl_int, void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), void*) = NULL;
-cl_int CL_API_CALL clSetEventCallback (cl_event event,cl_int command_exec_callback_type, void (CL_CALLBACK * pfn_notify)(cl_event, cl_int, void *), void* user_data) {
-	if(!clSetEventCallback_ptr) clSetEventCallback_ptr = getFunction("clSetEventCallback");
-	return (*clSetEventCallback_ptr)(event, command_exec_callback_type, pfn_notify, user_data);
-}
-
-static cl_int (*clGetEventProfilingInfo_ptr)(cl_event, cl_profiling_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetEventProfilingInfo (cl_event event,cl_profiling_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetEventProfilingInfo_ptr) clGetEventProfilingInfo_ptr = getFunction("clGetEventProfilingInfo");
-	return (*clGetEventProfilingInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clFlush_ptr)(cl_command_queue) = NULL;
-cl_int CL_API_CALL clFlush (cl_command_queue command_queue) {
-	if(!clFlush_ptr) clFlush_ptr = getFunction("clFlush");
-	return (*clFlush_ptr)(command_queue);
-}
-
-static cl_int (*clFinish_ptr)(cl_command_queue) = NULL;
-cl_int CL_API_CALL clFinish (cl_command_queue command_queue) {
-	if(!clFinish_ptr) clFinish_ptr = getFunction("clFinish");
-	return (*clFinish_ptr)(command_queue);
-}
-
-static cl_int (*clEnqueueReadBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueReadBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,size_t offset,size_t size,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueReadBuffer_ptr) clEnqueueReadBuffer_ptr = getFunction("clEnqueueReadBuffer");
-	return (*clEnqueueReadBuffer_ptr)(command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueReadBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueReadBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueReadBufferRect_ptr) clEnqueueReadBufferRect_ptr = getFunction("clEnqueueReadBufferRect");
-	return (*clEnqueueReadBufferRect_ptr)(command_queue, buffer, blocking_read, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueWriteBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueWriteBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,size_t offset,size_t size,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueWriteBuffer_ptr) clEnqueueWriteBuffer_ptr = getFunction("clEnqueueWriteBuffer");
-	return (*clEnqueueWriteBuffer_ptr)(command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueWriteBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueWriteBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueWriteBufferRect_ptr) clEnqueueWriteBufferRect_ptr = getFunction("clEnqueueWriteBufferRect");
-	return (*clEnqueueWriteBufferRect_ptr)(command_queue, buffer, blocking_write, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueFillBuffer_ptr)(cl_command_queue, cl_mem, const void *, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueFillBuffer (cl_command_queue command_queue,cl_mem buffer,const void * pattern,size_t pattern_size,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueFillBuffer_ptr) clEnqueueFillBuffer_ptr = getFunction("clEnqueueFillBuffer");
-	return (*clEnqueueFillBuffer_ptr)(command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueCopyBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueCopyBuffer (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueCopyBuffer_ptr) clEnqueueCopyBuffer_ptr = getFunction("clEnqueueCopyBuffer");
-	return (*clEnqueueCopyBuffer_ptr)(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueCopyBufferRect_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueCopyBufferRect (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,const size_t * src_origin,const size_t * dst_origin,const size_t * region,size_t src_row_pitch,size_t src_slice_pitch,size_t dst_row_pitch,size_t dst_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueCopyBufferRect_ptr) clEnqueueCopyBufferRect_ptr = getFunction("clEnqueueCopyBufferRect");
-	return (*clEnqueueCopyBufferRect_ptr)(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueReadImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueReadImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_read,const size_t * origin,const size_t * region,size_t row_pitch,size_t slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueReadImage_ptr) clEnqueueReadImage_ptr = getFunction("clEnqueueReadImage");
-	return (*clEnqueueReadImage_ptr)(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueWriteImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueWriteImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_write,const size_t * origin,const size_t * region,size_t input_row_pitch,size_t input_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueWriteImage_ptr) clEnqueueWriteImage_ptr = getFunction("clEnqueueWriteImage");
-	return (*clEnqueueWriteImage_ptr)(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueFillImage_ptr)(cl_command_queue, cl_mem, const void *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueFillImage (cl_command_queue command_queue,cl_mem image,const void * fill_color,const size_t * origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueFillImage_ptr) clEnqueueFillImage_ptr = getFunction("clEnqueueFillImage");
-	return (*clEnqueueFillImage_ptr)(command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueCopyImage_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueCopyImage (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_image,const size_t * src_origin,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueCopyImage_ptr) clEnqueueCopyImage_ptr = getFunction("clEnqueueCopyImage");
-	return (*clEnqueueCopyImage_ptr)(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueCopyImageToBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, size_t, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueCopyImageToBuffer (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_buffer,const size_t * src_origin,const size_t * region,size_t dst_offset,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueCopyImageToBuffer_ptr) clEnqueueCopyImageToBuffer_ptr = getFunction("clEnqueueCopyImageToBuffer");
-	return (*clEnqueueCopyImageToBuffer_ptr)(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueCopyBufferToImage_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueCopyBufferToImage (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_image,size_t src_offset,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueCopyBufferToImage_ptr) clEnqueueCopyBufferToImage_ptr = getFunction("clEnqueueCopyBufferToImage");
-	return (*clEnqueueCopyBufferToImage_ptr)(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event);
-}
-
-static void * (*clEnqueueMapBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, size_t, size_t, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL;
-void * CL_API_CALL clEnqueueMapBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_map,cl_map_flags map_flags,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) {
-	if(!clEnqueueMapBuffer_ptr) clEnqueueMapBuffer_ptr = getFunction("clEnqueueMapBuffer");
-	return (*clEnqueueMapBuffer_ptr)(command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret);
-}
-
-static void * (*clEnqueueMapImage_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, const size_t *, const size_t *, size_t *, size_t *, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL;
-void * CL_API_CALL clEnqueueMapImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_map,cl_map_flags map_flags,const size_t * origin,const size_t * region,size_t * image_row_pitch,size_t * image_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) {
-	if(!clEnqueueMapImage_ptr) clEnqueueMapImage_ptr = getFunction("clEnqueueMapImage");
-	return (*clEnqueueMapImage_ptr)(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret);
-}
-
-static cl_int (*clEnqueueUnmapMemObject_ptr)(cl_command_queue, cl_mem, void *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueUnmapMemObject (cl_command_queue command_queue,cl_mem memobj,void * mapped_ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueUnmapMemObject_ptr) clEnqueueUnmapMemObject_ptr = getFunction("clEnqueueUnmapMemObject");
-	return (*clEnqueueUnmapMemObject_ptr)(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueMigrateMemObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_mem_migration_flags, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueMigrateMemObjects (cl_command_queue command_queue,cl_uint num_mem_objects,const cl_mem * mem_objects,cl_mem_migration_flags flags,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueMigrateMemObjects_ptr) clEnqueueMigrateMemObjects_ptr = getFunction("clEnqueueMigrateMemObjects");
-	return (*clEnqueueMigrateMemObjects_ptr)(command_queue, num_mem_objects, mem_objects, flags, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueNDRangeKernel_ptr)(cl_command_queue, cl_kernel, cl_uint, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueNDRangeKernel (cl_command_queue command_queue,cl_kernel kernel,cl_uint work_dim,const size_t * global_work_offset,const size_t * global_work_size,const size_t * local_work_size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueNDRangeKernel_ptr) clEnqueueNDRangeKernel_ptr = getFunction("clEnqueueNDRangeKernel");
-	return (*clEnqueueNDRangeKernel_ptr)(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueTask_ptr)(cl_command_queue, cl_kernel, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueTask (cl_command_queue command_queue,cl_kernel kernel,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueTask_ptr) clEnqueueTask_ptr = getFunction("clEnqueueTask");
-	return (*clEnqueueTask_ptr)(command_queue, kernel, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueNativeKernel_ptr)(cl_command_queue, void (CL_CALLBACK * /*user_func*/)(void *), void *, size_t, cl_uint, const cl_mem *, const void **, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueNativeKernel (cl_command_queue command_queue,void (CL_CALLBACK *user_func)(void *) ,void * args,size_t cb_args,cl_uint num_mem_objects,const cl_mem * mem_list,const void ** args_mem_loc,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueNativeKernel_ptr) clEnqueueNativeKernel_ptr = getFunction("clEnqueueNativeKernel");
-	return (*clEnqueueNativeKernel_ptr)(command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueMarkerWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueMarkerWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueMarkerWithWaitList_ptr) clEnqueueMarkerWithWaitList_ptr = getFunction("clEnqueueMarkerWithWaitList");
-	return (*clEnqueueMarkerWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueBarrierWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueBarrierWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueBarrierWithWaitList_ptr) clEnqueueBarrierWithWaitList_ptr = getFunction("clEnqueueBarrierWithWaitList");
-	return (*clEnqueueBarrierWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event);
-}
-
-static void * (*clGetExtensionFunctionAddressForPlatform_ptr)(cl_platform_id, const char *) = NULL;
-void * CL_API_CALL clGetExtensionFunctionAddressForPlatform (cl_platform_id platform,const char * func_name) {
-	if(!clGetExtensionFunctionAddressForPlatform_ptr) clGetExtensionFunctionAddressForPlatform_ptr = getFunction("clGetExtensionFunctionAddressForPlatform");
-	return (*clGetExtensionFunctionAddressForPlatform_ptr)(platform, func_name);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage2D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, void *, cl_int *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage2D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_row_pitch,void * host_ptr,cl_int * errcode_ret) {
-	if(!clCreateImage2D_ptr) clCreateImage2D_ptr = getFunction("clCreateImage2D");
-	return (*clCreateImage2D_ptr)(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage3D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, size_t, size_t, void *, cl_int *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage3D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_depth,size_t image_row_pitch,size_t image_slice_pitch,void * host_ptr,cl_int * errcode_ret) {
-	if(!clCreateImage3D_ptr) clCreateImage3D_ptr = getFunction("clCreateImage3D");
-	return (*clCreateImage3D_ptr)(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueMarker_ptr)(cl_command_queue, cl_event *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueMarker (cl_command_queue command_queue,cl_event * event) {
-	if(!clEnqueueMarker_ptr) clEnqueueMarker_ptr = getFunction("clEnqueueMarker");
-	return (*clEnqueueMarker_ptr)(command_queue, event);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueWaitForEvents_ptr)(cl_command_queue, cl_uint, const cl_event *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueWaitForEvents (cl_command_queue command_queue,cl_uint num_events,const cl_event * event_list) {
-	if(!clEnqueueWaitForEvents_ptr) clEnqueueWaitForEvents_ptr = getFunction("clEnqueueWaitForEvents");
-	return (*clEnqueueWaitForEvents_ptr)(command_queue, num_events, event_list);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueBarrier_ptr)(cl_command_queue) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueBarrier (cl_command_queue command_queue) {
-	if(!clEnqueueBarrier_ptr) clEnqueueBarrier_ptr = getFunction("clEnqueueBarrier");
-	return (*clEnqueueBarrier_ptr)(command_queue);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clUnloadCompiler_ptr)(void) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clUnloadCompiler (void) {
-	if(!clUnloadCompiler_ptr) clUnloadCompiler_ptr = getFunction("clUnloadCompiler");
-	return (*clUnloadCompiler_ptr)();
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * (*clGetExtensionFunctionAddress_ptr)(const char *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL clGetExtensionFunctionAddress (const char * func_name) {
-	if(!clGetExtensionFunctionAddress_ptr) clGetExtensionFunctionAddress_ptr = getFunction("clGetExtensionFunctionAddress");
-	return (*clGetExtensionFunctionAddress_ptr)(func_name);
-}
-
diff --git a/Externals/CLRun/clrun/genclext.c b/Externals/CLRun/clrun/genclext.c
deleted file mode 100644
index e6a73afabf..0000000000
--- a/Externals/CLRun/clrun/genclext.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// Automatically generated by generateClRun.pl
-#include "dynamiclib.h"
-#include "../include/CL/cl_ext.h"
-
-
-static cl_int (*clIcdGetPlatformIDsKHR_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL;
-cl_int CL_API_CALL clIcdGetPlatformIDsKHR (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) {
-	if(!clIcdGetPlatformIDsKHR_ptr) clIcdGetPlatformIDsKHR_ptr = getFunction("clIcdGetPlatformIDsKHR");
-	return (*clIcdGetPlatformIDsKHR_ptr)(num_entries, platforms, num_platforms);
-}
-static cl_int (*    clReleaseDeviceEXT_ptr)(cl_device_id) = NULL;
-cl_int CL_API_CALL     clReleaseDeviceEXT (cl_device_id device) {
-	if(!    clReleaseDeviceEXT_ptr)     clReleaseDeviceEXT_ptr = getFunction("    clReleaseDeviceEXT");
-	return (*    clReleaseDeviceEXT_ptr)(device);
-}
-
-static cl_int (*    clRetainDeviceEXT_ptr)(cl_device_id) = NULL;
-cl_int CL_API_CALL     clRetainDeviceEXT (cl_device_id device) {
-	if(!    clRetainDeviceEXT_ptr)     clRetainDeviceEXT_ptr = getFunction("    clRetainDeviceEXT");
-	return (*    clRetainDeviceEXT_ptr)(device);
-}
-
-static cl_int (*    clCreateSubDevicesEXT_ptr)(cl_device_id, const cl_device_partition_property_ext *, cl_uint, cl_device_id *, cl_uint *) = NULL;
-cl_int CL_API_CALL     clCreateSubDevicesEXT (cl_device_id in_device,const cl_device_partition_property_ext * properties,cl_uint num_entries,cl_device_id * out_devices,cl_uint * num_devices) {
-	if(!    clCreateSubDevicesEXT_ptr)     clCreateSubDevicesEXT_ptr = getFunction("    clCreateSubDevicesEXT");
-	return (*    clCreateSubDevicesEXT_ptr)(in_device, properties, num_entries, out_devices, num_devices);
-}
-
diff --git a/Externals/CLRun/clrun/genclgl.c b/Externals/CLRun/clrun/genclgl.c
deleted file mode 100644
index acb06a1ff7..0000000000
--- a/Externals/CLRun/clrun/genclgl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// Automatically generated by generateClRun.pl
-#include "dynamiclib.h"
-#include "../include/CL/cl_gl.h"
-
-
-static cl_mem (*clCreateFromGLBuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, int *) = NULL;
-cl_mem CL_API_CALL clCreateFromGLBuffer (cl_context context,cl_mem_flags flags,cl_GLuint bufobj,int * errcode_ret) {
-	if(!clCreateFromGLBuffer_ptr) clCreateFromGLBuffer_ptr = getFunction("clCreateFromGLBuffer");
-	return (*clCreateFromGLBuffer_ptr)(context, flags, bufobj, errcode_ret);
-}
-
-static cl_mem (*clCreateFromGLTexture_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL;
-cl_mem CL_API_CALL clCreateFromGLTexture (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) {
-	if(!clCreateFromGLTexture_ptr) clCreateFromGLTexture_ptr = getFunction("clCreateFromGLTexture");
-	return (*clCreateFromGLTexture_ptr)(context, flags, target, miplevel, texture, errcode_ret);
-}
-
-static cl_mem (*clCreateFromGLRenderbuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, cl_int *) = NULL;
-cl_mem CL_API_CALL clCreateFromGLRenderbuffer (cl_context context,cl_mem_flags flags,cl_GLuint renderbuffer,cl_int * errcode_ret) {
-	if(!clCreateFromGLRenderbuffer_ptr) clCreateFromGLRenderbuffer_ptr = getFunction("clCreateFromGLRenderbuffer");
-	return (*clCreateFromGLRenderbuffer_ptr)(context, flags, renderbuffer, errcode_ret);
-}
-
-static cl_int (*clGetGLObjectInfo_ptr)(cl_mem, cl_gl_object_type *, cl_GLuint *) = NULL;
-cl_int CL_API_CALL clGetGLObjectInfo (cl_mem memobj,cl_gl_object_type * gl_object_type,cl_GLuint * gl_object_name) {
-	if(!clGetGLObjectInfo_ptr) clGetGLObjectInfo_ptr = getFunction("clGetGLObjectInfo");
-	return (*clGetGLObjectInfo_ptr)(memobj, gl_object_type, gl_object_name);
-}
-
-static cl_int (*clGetGLTextureInfo_ptr)(cl_mem, cl_gl_texture_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetGLTextureInfo (cl_mem memobj,cl_gl_texture_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetGLTextureInfo_ptr) clGetGLTextureInfo_ptr = getFunction("clGetGLTextureInfo");
-	return (*clGetGLTextureInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret);
-}
-
-static cl_int (*clEnqueueAcquireGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueAcquireGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueAcquireGLObjects_ptr) clEnqueueAcquireGLObjects_ptr = getFunction("clEnqueueAcquireGLObjects");
-	return (*clEnqueueAcquireGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event);
-}
-
-static cl_int (*clEnqueueReleaseGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL;
-cl_int CL_API_CALL clEnqueueReleaseGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) {
-	if(!clEnqueueReleaseGLObjects_ptr) clEnqueueReleaseGLObjects_ptr = getFunction("clEnqueueReleaseGLObjects");
-	return (*clEnqueueReleaseGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture2D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture2D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) {
-	if(!clCreateFromGLTexture2D_ptr) clCreateFromGLTexture2D_ptr = getFunction("clCreateFromGLTexture2D");
-	return (*clCreateFromGLTexture2D_ptr)(context, flags, target, miplevel, texture, errcode_ret);
-}
-
-static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture3D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL;
-CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture3D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) {
-	if(!clCreateFromGLTexture3D_ptr) clCreateFromGLTexture3D_ptr = getFunction("clCreateFromGLTexture3D");
-	return (*clCreateFromGLTexture3D_ptr)(context, flags, target, miplevel, texture, errcode_ret);
-}
-
-static cl_int (*clGetGLContextInfoKHR_ptr)(const cl_context_properties *, cl_gl_context_info, size_t, void *, size_t *) = NULL;
-cl_int CL_API_CALL clGetGLContextInfoKHR (const cl_context_properties * properties,cl_gl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) {
-	if(!clGetGLContextInfoKHR_ptr) clGetGLContextInfoKHR_ptr = getFunction("clGetGLContextInfoKHR");
-	return (*clGetGLContextInfoKHR_ptr)(properties, param_name, param_value_size, param_value, param_value_size_ret);
-}
diff --git a/Externals/CLRun/clrun/genclglext.c b/Externals/CLRun/clrun/genclglext.c
deleted file mode 100644
index 333103ea85..0000000000
--- a/Externals/CLRun/clrun/genclglext.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Automatically generated by generateClRun.pl
-#include "dynamiclib.h"
-#include "../include/CL/cl_gl_ext.h"
-
-
-static cl_event (*clCreateEventFromGLsyncKHR_ptr)(cl_context, cl_GLsync, cl_int *) = NULL;
-cl_event CL_API_CALL clCreateEventFromGLsyncKHR (cl_context context,cl_GLsync cl_GLsync,cl_int * errcode_ret) {
-	if(!clCreateEventFromGLsyncKHR_ptr) clCreateEventFromGLsyncKHR_ptr = getFunction("clCreateEventFromGLsyncKHR");
-	return (*clCreateEventFromGLsyncKHR_ptr)(context, cl_GLsync, errcode_ret);
-}
-
diff --git a/Externals/CLRun/clrun/generateClRun.pl b/Externals/CLRun/clrun/generateClRun.pl
deleted file mode 100755
index e1571c2012..0000000000
--- a/Externals/CLRun/clrun/generateClRun.pl
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-sub trim($)
-{
-	my $string = shift;
-	$string =~ s/^\s+//;
-	$string =~ s/\s+$//;
-	return $string;
-}
-
-my $filename = shift;
-
-open(CL, "<$filename") or die "Can't open cl.h";
-
-my ($funcRet, $funcName, $args);
-
-print "// Automatically generated by generateClRun.pl\n";
-print "#include \"dynamiclib.h\"\n";
-print "#include \"$filename\"\n\n\n";
-
-while(<CL>) {
-	chomp;
-	next unless $_ =~ /CL_API_ENTRY\s*(.*)\s*CL_API_CALL/;
-	$funcRet = $1;
-	my $fa = "";
-        my $noArgs = 0;
-	while(<CL>) {
-		$fa .= $_;
-		last if $_ =~ /;$/;
-	}
-
-	chomp $fa;
-	$fa =~ s/\s*\).*;\s*$/\)/g; # remove api
-	$fa =~ /([^(]*)\((.*)\)/s;
- 	$funcName = $1;
-	$args = $2;
-	
-	# split params by , (ignoring function pointers)
-	(my @args) = $args =~  m/([^(,]*(?:\([^)]+\)[^(),]*)*[^),]*),?/g;
-        
-	my (@argsTypes, @argsNames);
-
-	my $funcArgSig = "";
-	my $tmp;
-	foreach my $arg (@args) {
-		
-		next if ($arg eq "");
-		my ($type, $name) = $arg =~ m|\s*(.*)\s*/\*\s*(.*)\s*\*/|s;
-               
-                # Strip []
-                if(defined $name) {
-                	$name =~ s/\[.*\]//g;
-                }
-
-		if ($arg =~ /\(.*\)/) {
-			$tmp = $type;
-			$type =~ s/\(\*.*?\)/\(\*\)/g 
-		}
-		
-		push @argsTypes, trim($type);
-		push @argsNames, trim($name);
-
-		if ($arg =~ /\(.*\)/) {
-			$funcArgSig .= "$tmp,";
-		} elsif(defined $type) {
-			$funcArgSig .= trim($type)." ".trim($name).",";
-		} else { # Functions with no arguments (i.e. "void" only)
-                	$funcArgSig = "void,";
-                        $noArgs = 1;
-                        last;
-                }
-	}
-
-	chop($funcArgSig); #last ,
-
-        my ($funcArgsNames, $funcArgsTypes);
-
-        if($noArgs eq 0) {
-          $funcArgsNames = ($#argsNames != -1)? join ', ',@argsNames : "";
-          $funcArgsTypes = ($#argsTypes != -1)? join ', ',@argsTypes : "";
-        } else {
-          $funcArgsNames = "";
-          $funcArgsTypes = "void";
-        }
-
-	my $func = "${funcName}_ptr";
-	$args =~ s$(/\*|\*/)$$g; # uncomment names
-	print "static ".trim($funcRet)." (*$func)($funcArgsTypes) = NULL;\n";
- 	print trim($funcRet)." CL_API_CALL $funcName ($funcArgSig) {\n";
-	print "\tif(!$func) $func = getFunction(\"$funcName\");\n";
-	print "\treturn (*$func)($funcArgsNames);\n";
- 	print "}\n\n";
-}
-
-close(CL);
diff --git a/Externals/CLRun/include/CL/cl.h b/Externals/CLRun/include/CL/cl.h
deleted file mode 100644
index 203c65974f..0000000000
--- a/Externals/CLRun/include/CL/cl.h
+++ /dev/null
@@ -1,1214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 - 2012 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.
- ******************************************************************************/
-
-#ifndef __OPENCL_CL_H
-#define __OPENCL_CL_H
-
-#ifdef __APPLE__
-#include <OpenCL/cl_platform.h>
-#else
-#include <CL/cl_platform.h>
-#endif	
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************/
-
-typedef struct _cl_platform_id *    cl_platform_id;
-typedef struct _cl_device_id *      cl_device_id;
-typedef struct _cl_context *        cl_context;
-typedef struct _cl_command_queue *  cl_command_queue;
-typedef struct _cl_mem *            cl_mem;
-typedef struct _cl_program *        cl_program;
-typedef struct _cl_kernel *         cl_kernel;
-typedef struct _cl_event *          cl_event;
-typedef struct _cl_sampler *        cl_sampler;
-
-typedef cl_uint             cl_bool;                     /* WARNING!  Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ 
-typedef cl_ulong            cl_bitfield;
-typedef cl_bitfield         cl_device_type;
-typedef cl_uint             cl_platform_info;
-typedef cl_uint             cl_device_info;
-typedef cl_bitfield         cl_device_fp_config;
-typedef cl_uint             cl_device_mem_cache_type;
-typedef cl_uint             cl_device_local_mem_type;
-typedef cl_bitfield         cl_device_exec_capabilities;
-typedef cl_bitfield         cl_command_queue_properties;
-typedef intptr_t            cl_device_partition_property;
-typedef cl_bitfield         cl_device_affinity_domain;
-
-typedef intptr_t            cl_context_properties;
-typedef cl_uint             cl_context_info;
-typedef cl_uint             cl_command_queue_info;
-typedef cl_uint             cl_channel_order;
-typedef cl_uint             cl_channel_type;
-typedef cl_bitfield         cl_mem_flags;
-typedef cl_uint             cl_mem_object_type;
-typedef cl_uint             cl_mem_info;
-typedef cl_bitfield         cl_mem_migration_flags;
-typedef cl_uint             cl_image_info;
-typedef cl_uint             cl_buffer_create_type;
-typedef cl_uint             cl_addressing_mode;
-typedef cl_uint             cl_filter_mode;
-typedef cl_uint             cl_sampler_info;
-typedef cl_bitfield         cl_map_flags;
-typedef cl_uint             cl_program_info;
-typedef cl_uint             cl_program_build_info;
-typedef cl_uint             cl_program_binary_type;
-typedef cl_int              cl_build_status;
-typedef cl_uint             cl_kernel_info;
-typedef cl_uint             cl_kernel_arg_info;
-typedef cl_uint             cl_kernel_arg_address_qualifier;
-typedef cl_uint             cl_kernel_arg_access_qualifier;
-typedef cl_bitfield         cl_kernel_arg_type_qualifier;
-typedef cl_uint             cl_kernel_work_group_info;
-typedef cl_uint             cl_event_info;
-typedef cl_uint             cl_command_type;
-typedef cl_uint             cl_profiling_info;
-
-
-typedef struct _cl_image_format {
-    cl_channel_order        image_channel_order;
-    cl_channel_type         image_channel_data_type;
-} cl_image_format;
-
-typedef struct _cl_image_desc {
-    cl_mem_object_type      image_type;
-    size_t                  image_width;
-    size_t                  image_height;
-    size_t                  image_depth;
-    size_t                  image_array_size;
-    size_t                  image_row_pitch;
-    size_t                  image_slice_pitch;
-    cl_uint                 num_mip_levels;
-    cl_uint                 num_samples;
-    cl_mem                  buffer;
-} cl_image_desc;
-
-typedef struct _cl_buffer_region {
-    size_t                  origin;
-    size_t                  size;
-} cl_buffer_region;
-
-
-/******************************************************************************/
-
-/* Error Codes */
-#define CL_SUCCESS                                  0
-#define CL_DEVICE_NOT_FOUND                         -1
-#define CL_DEVICE_NOT_AVAILABLE                     -2
-#define CL_COMPILER_NOT_AVAILABLE                   -3
-#define CL_MEM_OBJECT_ALLOCATION_FAILURE            -4
-#define CL_OUT_OF_RESOURCES                         -5
-#define CL_OUT_OF_HOST_MEMORY                       -6
-#define CL_PROFILING_INFO_NOT_AVAILABLE             -7
-#define CL_MEM_COPY_OVERLAP                         -8
-#define CL_IMAGE_FORMAT_MISMATCH                    -9
-#define CL_IMAGE_FORMAT_NOT_SUPPORTED               -10
-#define CL_BUILD_PROGRAM_FAILURE                    -11
-#define CL_MAP_FAILURE                              -12
-#define CL_MISALIGNED_SUB_BUFFER_OFFSET             -13
-#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14
-#define CL_COMPILE_PROGRAM_FAILURE                  -15
-#define CL_LINKER_NOT_AVAILABLE                     -16
-#define CL_LINK_PROGRAM_FAILURE                     -17
-#define CL_DEVICE_PARTITION_FAILED                  -18
-#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE            -19
-
-#define CL_INVALID_VALUE                            -30
-#define CL_INVALID_DEVICE_TYPE                      -31
-#define CL_INVALID_PLATFORM                         -32
-#define CL_INVALID_DEVICE                           -33
-#define CL_INVALID_CONTEXT                          -34
-#define CL_INVALID_QUEUE_PROPERTIES                 -35
-#define CL_INVALID_COMMAND_QUEUE                    -36
-#define CL_INVALID_HOST_PTR                         -37
-#define CL_INVALID_MEM_OBJECT                       -38
-#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR          -39
-#define CL_INVALID_IMAGE_SIZE                       -40
-#define CL_INVALID_SAMPLER                          -41
-#define CL_INVALID_BINARY                           -42
-#define CL_INVALID_BUILD_OPTIONS                    -43
-#define CL_INVALID_PROGRAM                          -44
-#define CL_INVALID_PROGRAM_EXECUTABLE               -45
-#define CL_INVALID_KERNEL_NAME                      -46
-#define CL_INVALID_KERNEL_DEFINITION                -47
-#define CL_INVALID_KERNEL                           -48
-#define CL_INVALID_ARG_INDEX                        -49
-#define CL_INVALID_ARG_VALUE                        -50
-#define CL_INVALID_ARG_SIZE                         -51
-#define CL_INVALID_KERNEL_ARGS                      -52
-#define CL_INVALID_WORK_DIMENSION                   -53
-#define CL_INVALID_WORK_GROUP_SIZE                  -54
-#define CL_INVALID_WORK_ITEM_SIZE                   -55
-#define CL_INVALID_GLOBAL_OFFSET                    -56
-#define CL_INVALID_EVENT_WAIT_LIST                  -57
-#define CL_INVALID_EVENT                            -58
-#define CL_INVALID_OPERATION                        -59
-#define CL_INVALID_GL_OBJECT                        -60
-#define CL_INVALID_BUFFER_SIZE                      -61
-#define CL_INVALID_MIP_LEVEL                        -62
-#define CL_INVALID_GLOBAL_WORK_SIZE                 -63
-#define CL_INVALID_PROPERTY                         -64
-#define CL_INVALID_IMAGE_DESCRIPTOR                 -65
-#define CL_INVALID_COMPILER_OPTIONS                 -66
-#define CL_INVALID_LINKER_OPTIONS                   -67
-#define CL_INVALID_DEVICE_PARTITION_COUNT           -68
-
-/* OpenCL Version */
-#define CL_VERSION_1_0                              1
-#define CL_VERSION_1_1                              1
-#define CL_VERSION_1_2                              1
-
-/* cl_bool */
-#define CL_FALSE                                    0
-#define CL_TRUE                                     1
-#define CL_BLOCKING                                 CL_TRUE
-#define CL_NON_BLOCKING                             CL_FALSE
-
-/* cl_platform_info */
-#define CL_PLATFORM_PROFILE                         0x0900
-#define CL_PLATFORM_VERSION                         0x0901
-#define CL_PLATFORM_NAME                            0x0902
-#define CL_PLATFORM_VENDOR                          0x0903
-#define CL_PLATFORM_EXTENSIONS                      0x0904
-
-/* cl_device_type - bitfield */
-#define CL_DEVICE_TYPE_DEFAULT                      (1 << 0)
-#define CL_DEVICE_TYPE_CPU                          (1 << 1)
-#define CL_DEVICE_TYPE_GPU                          (1 << 2)
-#define CL_DEVICE_TYPE_ACCELERATOR                  (1 << 3)
-#define CL_DEVICE_TYPE_CUSTOM                       (1 << 4)
-#define CL_DEVICE_TYPE_ALL                          0xFFFFFFFF
-
-/* cl_device_info */
-#define CL_DEVICE_TYPE                              0x1000
-#define CL_DEVICE_VENDOR_ID                         0x1001
-#define CL_DEVICE_MAX_COMPUTE_UNITS                 0x1002
-#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS          0x1003
-#define CL_DEVICE_MAX_WORK_GROUP_SIZE               0x1004
-#define CL_DEVICE_MAX_WORK_ITEM_SIZES               0x1005
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR       0x1006
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT      0x1007
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT        0x1008
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG       0x1009
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT      0x100A
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE     0x100B
-#define CL_DEVICE_MAX_CLOCK_FREQUENCY               0x100C
-#define CL_DEVICE_ADDRESS_BITS                      0x100D
-#define CL_DEVICE_MAX_READ_IMAGE_ARGS               0x100E
-#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS              0x100F
-#define CL_DEVICE_MAX_MEM_ALLOC_SIZE                0x1010
-#define CL_DEVICE_IMAGE2D_MAX_WIDTH                 0x1011
-#define CL_DEVICE_IMAGE2D_MAX_HEIGHT                0x1012
-#define CL_DEVICE_IMAGE3D_MAX_WIDTH                 0x1013
-#define CL_DEVICE_IMAGE3D_MAX_HEIGHT                0x1014
-#define CL_DEVICE_IMAGE3D_MAX_DEPTH                 0x1015
-#define CL_DEVICE_IMAGE_SUPPORT                     0x1016
-#define CL_DEVICE_MAX_PARAMETER_SIZE                0x1017
-#define CL_DEVICE_MAX_SAMPLERS                      0x1018
-#define CL_DEVICE_MEM_BASE_ADDR_ALIGN               0x1019
-#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE          0x101A
-#define CL_DEVICE_SINGLE_FP_CONFIG                  0x101B
-#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE             0x101C
-#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE         0x101D
-#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE             0x101E
-#define CL_DEVICE_GLOBAL_MEM_SIZE                   0x101F
-#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE          0x1020
-#define CL_DEVICE_MAX_CONSTANT_ARGS                 0x1021
-#define CL_DEVICE_LOCAL_MEM_TYPE                    0x1022
-#define CL_DEVICE_LOCAL_MEM_SIZE                    0x1023
-#define CL_DEVICE_ERROR_CORRECTION_SUPPORT          0x1024
-#define CL_DEVICE_PROFILING_TIMER_RESOLUTION        0x1025
-#define CL_DEVICE_ENDIAN_LITTLE                     0x1026
-#define CL_DEVICE_AVAILABLE                         0x1027
-#define CL_DEVICE_COMPILER_AVAILABLE                0x1028
-#define CL_DEVICE_EXECUTION_CAPABILITIES            0x1029
-#define CL_DEVICE_QUEUE_PROPERTIES                  0x102A
-#define CL_DEVICE_NAME                              0x102B
-#define CL_DEVICE_VENDOR                            0x102C
-#define CL_DRIVER_VERSION                           0x102D
-#define CL_DEVICE_PROFILE                           0x102E
-#define CL_DEVICE_VERSION                           0x102F
-#define CL_DEVICE_EXTENSIONS                        0x1030
-#define CL_DEVICE_PLATFORM                          0x1031
-#define CL_DEVICE_DOUBLE_FP_CONFIG                  0x1032
-/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */
-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF       0x1034
-#define CL_DEVICE_HOST_UNIFIED_MEMORY               0x1035
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR          0x1036
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT         0x1037
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT           0x1038
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG          0x1039
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT         0x103A
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE        0x103B
-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF          0x103C
-#define CL_DEVICE_OPENCL_C_VERSION                  0x103D
-#define CL_DEVICE_LINKER_AVAILABLE                  0x103E
-#define CL_DEVICE_BUILT_IN_KERNELS                  0x103F
-#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE             0x1040
-#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE              0x1041
-#define CL_DEVICE_PARENT_DEVICE                     0x1042
-#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES         0x1043
-#define CL_DEVICE_PARTITION_PROPERTIES              0x1044
-#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN         0x1045
-#define CL_DEVICE_PARTITION_TYPE                    0x1046
-#define CL_DEVICE_REFERENCE_COUNT                   0x1047
-#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC       0x1048
-#define CL_DEVICE_PRINTF_BUFFER_SIZE                0x1049
-#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT             0x104A
-#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT      0x104B
-
-/* cl_device_fp_config - bitfield */
-#define CL_FP_DENORM                                (1 << 0)
-#define CL_FP_INF_NAN                               (1 << 1)
-#define CL_FP_ROUND_TO_NEAREST                      (1 << 2)
-#define CL_FP_ROUND_TO_ZERO                         (1 << 3)
-#define CL_FP_ROUND_TO_INF                          (1 << 4)
-#define CL_FP_FMA                                   (1 << 5)
-#define CL_FP_SOFT_FLOAT                            (1 << 6)
-#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT         (1 << 7)
-
-/* cl_device_mem_cache_type */
-#define CL_NONE                                     0x0
-#define CL_READ_ONLY_CACHE                          0x1
-#define CL_READ_WRITE_CACHE                         0x2
-
-/* cl_device_local_mem_type */
-#define CL_LOCAL                                    0x1
-#define CL_GLOBAL                                   0x2
-
-/* cl_device_exec_capabilities - bitfield */
-#define CL_EXEC_KERNEL                              (1 << 0)
-#define CL_EXEC_NATIVE_KERNEL                       (1 << 1)
-
-/* cl_command_queue_properties - bitfield */
-#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE      (1 << 0)
-#define CL_QUEUE_PROFILING_ENABLE                   (1 << 1)
-
-/* cl_context_info  */
-#define CL_CONTEXT_REFERENCE_COUNT                  0x1080
-#define CL_CONTEXT_DEVICES                          0x1081
-#define CL_CONTEXT_PROPERTIES                       0x1082
-#define CL_CONTEXT_NUM_DEVICES                      0x1083
-
-/* cl_context_properties */
-#define CL_CONTEXT_PLATFORM                         0x1084
-#define CL_CONTEXT_INTEROP_USER_SYNC                0x1085
-    
-/* cl_device_partition_property */
-#define CL_DEVICE_PARTITION_EQUALLY                 0x1086
-#define CL_DEVICE_PARTITION_BY_COUNTS               0x1087
-#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END      0x0
-#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN      0x1088
-    
-/* cl_device_affinity_domain */
-#define CL_DEVICE_AFFINITY_DOMAIN_NUMA                     (1 << 0)
-#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE                 (1 << 1)
-#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE                 (1 << 2)
-#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE                 (1 << 3)
-#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE                 (1 << 4)
-#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE       (1 << 5)
-
-/* cl_command_queue_info */
-#define CL_QUEUE_CONTEXT                            0x1090
-#define CL_QUEUE_DEVICE                             0x1091
-#define CL_QUEUE_REFERENCE_COUNT                    0x1092
-#define CL_QUEUE_PROPERTIES                         0x1093
-
-/* cl_mem_flags - bitfield */
-#define CL_MEM_READ_WRITE                           (1 << 0)
-#define CL_MEM_WRITE_ONLY                           (1 << 1)
-#define CL_MEM_READ_ONLY                            (1 << 2)
-#define CL_MEM_USE_HOST_PTR                         (1 << 3)
-#define CL_MEM_ALLOC_HOST_PTR                       (1 << 4)
-#define CL_MEM_COPY_HOST_PTR                        (1 << 5)
-// reserved                                         (1 << 6)    
-#define CL_MEM_HOST_WRITE_ONLY                      (1 << 7)
-#define CL_MEM_HOST_READ_ONLY                       (1 << 8)
-#define CL_MEM_HOST_NO_ACCESS                       (1 << 9)
-
-/* cl_mem_migration_flags - bitfield */
-#define CL_MIGRATE_MEM_OBJECT_HOST                  (1 << 0)
-#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED     (1 << 1)
-
-/* cl_channel_order */
-#define CL_R                                        0x10B0
-#define CL_A                                        0x10B1
-#define CL_RG                                       0x10B2
-#define CL_RA                                       0x10B3
-#define CL_RGB                                      0x10B4
-#define CL_RGBA                                     0x10B5
-#define CL_BGRA                                     0x10B6
-#define CL_ARGB                                     0x10B7
-#define CL_INTENSITY                                0x10B8
-#define CL_LUMINANCE                                0x10B9
-#define CL_Rx                                       0x10BA
-#define CL_RGx                                      0x10BB
-#define CL_RGBx                                     0x10BC
-#define CL_DEPTH                                    0x10BD
-#define CL_DEPTH_STENCIL                            0x10BE
-
-/* cl_channel_type */
-#define CL_SNORM_INT8                               0x10D0
-#define CL_SNORM_INT16                              0x10D1
-#define CL_UNORM_INT8                               0x10D2
-#define CL_UNORM_INT16                              0x10D3
-#define CL_UNORM_SHORT_565                          0x10D4
-#define CL_UNORM_SHORT_555                          0x10D5
-#define CL_UNORM_INT_101010                         0x10D6
-#define CL_SIGNED_INT8                              0x10D7
-#define CL_SIGNED_INT16                             0x10D8
-#define CL_SIGNED_INT32                             0x10D9
-#define CL_UNSIGNED_INT8                            0x10DA
-#define CL_UNSIGNED_INT16                           0x10DB
-#define CL_UNSIGNED_INT32                           0x10DC
-#define CL_HALF_FLOAT                               0x10DD
-#define CL_FLOAT                                    0x10DE
-#define CL_UNORM_INT24                              0x10DF
-
-/* cl_mem_object_type */
-#define CL_MEM_OBJECT_BUFFER                        0x10F0
-#define CL_MEM_OBJECT_IMAGE2D                       0x10F1
-#define CL_MEM_OBJECT_IMAGE3D                       0x10F2
-#define CL_MEM_OBJECT_IMAGE2D_ARRAY                 0x10F3
-#define CL_MEM_OBJECT_IMAGE1D                       0x10F4
-#define CL_MEM_OBJECT_IMAGE1D_ARRAY                 0x10F5
-#define CL_MEM_OBJECT_IMAGE1D_BUFFER                0x10F6
-
-/* cl_mem_info */
-#define CL_MEM_TYPE                                 0x1100
-#define CL_MEM_FLAGS                                0x1101
-#define CL_MEM_SIZE                                 0x1102
-#define CL_MEM_HOST_PTR                             0x1103
-#define CL_MEM_MAP_COUNT                            0x1104
-#define CL_MEM_REFERENCE_COUNT                      0x1105
-#define CL_MEM_CONTEXT                              0x1106
-#define CL_MEM_ASSOCIATED_MEMOBJECT                 0x1107
-#define CL_MEM_OFFSET                               0x1108
-
-/* cl_image_info */
-#define CL_IMAGE_FORMAT                             0x1110
-#define CL_IMAGE_ELEMENT_SIZE                       0x1111
-#define CL_IMAGE_ROW_PITCH                          0x1112
-#define CL_IMAGE_SLICE_PITCH                        0x1113
-#define CL_IMAGE_WIDTH                              0x1114
-#define CL_IMAGE_HEIGHT                             0x1115
-#define CL_IMAGE_DEPTH                              0x1116
-#define CL_IMAGE_ARRAY_SIZE                         0x1117
-#define CL_IMAGE_BUFFER                             0x1118
-#define CL_IMAGE_NUM_MIP_LEVELS                     0x1119
-#define CL_IMAGE_NUM_SAMPLES                        0x111A
-
-/* cl_addressing_mode */
-#define CL_ADDRESS_NONE                             0x1130
-#define CL_ADDRESS_CLAMP_TO_EDGE                    0x1131
-#define CL_ADDRESS_CLAMP                            0x1132
-#define CL_ADDRESS_REPEAT                           0x1133
-#define CL_ADDRESS_MIRRORED_REPEAT                  0x1134
-
-/* cl_filter_mode */
-#define CL_FILTER_NEAREST                           0x1140
-#define CL_FILTER_LINEAR                            0x1141
-
-/* cl_sampler_info */
-#define CL_SAMPLER_REFERENCE_COUNT                  0x1150
-#define CL_SAMPLER_CONTEXT                          0x1151
-#define CL_SAMPLER_NORMALIZED_COORDS                0x1152
-#define CL_SAMPLER_ADDRESSING_MODE                  0x1153
-#define CL_SAMPLER_FILTER_MODE                      0x1154
-
-/* cl_map_flags - bitfield */
-#define CL_MAP_READ                                 (1 << 0)
-#define CL_MAP_WRITE                                (1 << 1)
-#define CL_MAP_WRITE_INVALIDATE_REGION              (1 << 2)
-
-/* cl_program_info */
-#define CL_PROGRAM_REFERENCE_COUNT                  0x1160
-#define CL_PROGRAM_CONTEXT                          0x1161
-#define CL_PROGRAM_NUM_DEVICES                      0x1162
-#define CL_PROGRAM_DEVICES                          0x1163
-#define CL_PROGRAM_SOURCE                           0x1164
-#define CL_PROGRAM_BINARY_SIZES                     0x1165
-#define CL_PROGRAM_BINARIES                         0x1166
-#define CL_PROGRAM_NUM_KERNELS                      0x1167
-#define CL_PROGRAM_KERNEL_NAMES                     0x1168
-
-/* cl_program_build_info */
-#define CL_PROGRAM_BUILD_STATUS                     0x1181
-#define CL_PROGRAM_BUILD_OPTIONS                    0x1182
-#define CL_PROGRAM_BUILD_LOG                        0x1183
-#define CL_PROGRAM_BINARY_TYPE                      0x1184
-    
-/* cl_program_binary_type */
-#define CL_PROGRAM_BINARY_TYPE_NONE                 0x0
-#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT      0x1
-#define CL_PROGRAM_BINARY_TYPE_LIBRARY              0x2
-#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE           0x4
-
-/* cl_build_status */
-#define CL_BUILD_SUCCESS                            0
-#define CL_BUILD_NONE                               -1
-#define CL_BUILD_ERROR                              -2
-#define CL_BUILD_IN_PROGRESS                        -3
-
-/* cl_kernel_info */
-#define CL_KERNEL_FUNCTION_NAME                     0x1190
-#define CL_KERNEL_NUM_ARGS                          0x1191
-#define CL_KERNEL_REFERENCE_COUNT                   0x1192
-#define CL_KERNEL_CONTEXT                           0x1193
-#define CL_KERNEL_PROGRAM                           0x1194
-#define CL_KERNEL_ATTRIBUTES                        0x1195
-
-/* cl_kernel_arg_info */
-#define CL_KERNEL_ARG_ADDRESS_QUALIFIER             0x1196
-#define CL_KERNEL_ARG_ACCESS_QUALIFIER              0x1197
-#define CL_KERNEL_ARG_TYPE_NAME                     0x1198
-#define CL_KERNEL_ARG_TYPE_QUALIFIER                0x1199
-#define CL_KERNEL_ARG_NAME                          0x119A
-
-/* cl_kernel_arg_address_qualifier */
-#define CL_KERNEL_ARG_ADDRESS_GLOBAL                0x119B
-#define CL_KERNEL_ARG_ADDRESS_LOCAL                 0x119C
-#define CL_KERNEL_ARG_ADDRESS_CONSTANT              0x119D
-#define CL_KERNEL_ARG_ADDRESS_PRIVATE               0x119E
-
-/* cl_kernel_arg_access_qualifier */
-#define CL_KERNEL_ARG_ACCESS_READ_ONLY              0x11A0
-#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY             0x11A1
-#define CL_KERNEL_ARG_ACCESS_READ_WRITE             0x11A2
-#define CL_KERNEL_ARG_ACCESS_NONE                   0x11A3
-    
-/* cl_kernel_arg_type_qualifer */
-#define CL_KERNEL_ARG_TYPE_NONE                     0
-#define CL_KERNEL_ARG_TYPE_CONST                    (1 << 0)
-#define CL_KERNEL_ARG_TYPE_RESTRICT                 (1 << 1)
-#define CL_KERNEL_ARG_TYPE_VOLATILE                 (1 << 2)
-
-/* cl_kernel_work_group_info */
-#define CL_KERNEL_WORK_GROUP_SIZE                   0x11B0
-#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE           0x11B1
-#define CL_KERNEL_LOCAL_MEM_SIZE                    0x11B2
-#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
-#define CL_KERNEL_PRIVATE_MEM_SIZE                  0x11B4
-#define CL_KERNEL_GLOBAL_WORK_SIZE                  0x11B5
-
-/* cl_event_info  */
-#define CL_EVENT_COMMAND_QUEUE                      0x11D0
-#define CL_EVENT_COMMAND_TYPE                       0x11D1
-#define CL_EVENT_REFERENCE_COUNT                    0x11D2
-#define CL_EVENT_COMMAND_EXECUTION_STATUS           0x11D3
-#define CL_EVENT_CONTEXT                            0x11D4
-
-/* cl_command_type */
-#define CL_COMMAND_NDRANGE_KERNEL                   0x11F0
-#define CL_COMMAND_TASK                             0x11F1
-#define CL_COMMAND_NATIVE_KERNEL                    0x11F2
-#define CL_COMMAND_READ_BUFFER                      0x11F3
-#define CL_COMMAND_WRITE_BUFFER                     0x11F4
-#define CL_COMMAND_COPY_BUFFER                      0x11F5
-#define CL_COMMAND_READ_IMAGE                       0x11F6
-#define CL_COMMAND_WRITE_IMAGE                      0x11F7
-#define CL_COMMAND_COPY_IMAGE                       0x11F8
-#define CL_COMMAND_COPY_IMAGE_TO_BUFFER             0x11F9
-#define CL_COMMAND_COPY_BUFFER_TO_IMAGE             0x11FA
-#define CL_COMMAND_MAP_BUFFER                       0x11FB
-#define CL_COMMAND_MAP_IMAGE                        0x11FC
-#define CL_COMMAND_UNMAP_MEM_OBJECT                 0x11FD
-#define CL_COMMAND_MARKER                           0x11FE
-#define CL_COMMAND_ACQUIRE_GL_OBJECTS               0x11FF
-#define CL_COMMAND_RELEASE_GL_OBJECTS               0x1200
-#define CL_COMMAND_READ_BUFFER_RECT                 0x1201
-#define CL_COMMAND_WRITE_BUFFER_RECT                0x1202
-#define CL_COMMAND_COPY_BUFFER_RECT                 0x1203
-#define CL_COMMAND_USER                             0x1204
-#define CL_COMMAND_BARRIER                          0x1205
-#define CL_COMMAND_MIGRATE_MEM_OBJECTS              0x1206
-#define CL_COMMAND_FILL_BUFFER                      0x1207
-#define CL_COMMAND_FILL_IMAGE                       0x1208
-
-/* command execution status */
-#define CL_COMPLETE                                 0x0
-#define CL_RUNNING                                  0x1
-#define CL_SUBMITTED                                0x2
-#define CL_QUEUED                                   0x3
-
-/* cl_buffer_create_type  */
-#define CL_BUFFER_CREATE_TYPE_REGION                0x1220
-
-/* cl_profiling_info  */
-#define CL_PROFILING_COMMAND_QUEUED                 0x1280
-#define CL_PROFILING_COMMAND_SUBMIT                 0x1281
-#define CL_PROFILING_COMMAND_START                  0x1282
-#define CL_PROFILING_COMMAND_END                    0x1283
-
-/********************************************************************************************************/
-
-/* Platform API */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetPlatformIDs(cl_uint          /* num_entries */,
-                 cl_platform_id * /* platforms */,
-                 cl_uint *        /* num_platforms */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL 
-clGetPlatformInfo(cl_platform_id   /* platform */, 
-                  cl_platform_info /* param_name */,
-                  size_t           /* param_value_size */, 
-                  void *           /* param_value */,
-                  size_t *         /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-/* Device APIs */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetDeviceIDs(cl_platform_id   /* platform */,
-               cl_device_type   /* device_type */, 
-               cl_uint          /* num_entries */, 
-               cl_device_id *   /* devices */, 
-               cl_uint *        /* num_devices */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetDeviceInfo(cl_device_id    /* device */,
-                cl_device_info  /* param_name */, 
-                size_t          /* param_value_size */, 
-                void *          /* param_value */,
-                size_t *        /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-    
-extern CL_API_ENTRY cl_int CL_API_CALL
-clCreateSubDevices(cl_device_id                         /* in_device */,
-                   const cl_device_partition_property * /* properties */,
-                   cl_uint                              /* num_devices */,
-                   cl_device_id *                       /* out_devices */,
-                   cl_uint *                            /* num_devices_ret */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
-    
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
-    
-/* Context APIs  */
-extern CL_API_ENTRY cl_context CL_API_CALL
-clCreateContext(const cl_context_properties * /* properties */,
-                cl_uint                 /* num_devices */,
-                const cl_device_id *    /* devices */,
-                void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *),
-                void *                  /* user_data */,
-                cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_context CL_API_CALL
-clCreateContextFromType(const cl_context_properties * /* properties */,
-                        cl_device_type          /* device_type */,
-                        void (CL_CALLBACK *     /* pfn_notify*/ )(const char *, const void *, size_t, void *),
-                        void *                  /* user_data */,
-                        cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetContextInfo(cl_context         /* context */, 
-                 cl_context_info    /* param_name */, 
-                 size_t             /* param_value_size */, 
-                 void *             /* param_value */, 
-                 size_t *           /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-/* Command Queue APIs */
-extern CL_API_ENTRY cl_command_queue CL_API_CALL
-clCreateCommandQueue(cl_context                     /* context */, 
-                     cl_device_id                   /* device */, 
-                     cl_command_queue_properties    /* properties */,
-                     cl_int *                       /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetCommandQueueInfo(cl_command_queue      /* command_queue */,
-                      cl_command_queue_info /* param_name */,
-                      size_t                /* param_value_size */,
-                      void *                /* param_value */,
-                      size_t *              /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-/* Memory Object APIs */
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateBuffer(cl_context   /* context */,
-               cl_mem_flags /* flags */,
-               size_t       /* size */,
-               void *       /* host_ptr */,
-               cl_int *     /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateSubBuffer(cl_mem                   /* buffer */,
-                  cl_mem_flags             /* flags */,
-                  cl_buffer_create_type    /* buffer_create_type */,
-                  const void *             /* buffer_create_info */,
-                  cl_int *                 /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
-
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateImage(cl_context              /* context */,
-              cl_mem_flags            /* flags */,
-              const cl_image_format * /* image_format */,
-              const cl_image_desc *   /* image_desc */, 
-              void *                  /* host_ptr */,
-              cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
-                        
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetSupportedImageFormats(cl_context           /* context */,
-                           cl_mem_flags         /* flags */,
-                           cl_mem_object_type   /* image_type */,
-                           cl_uint              /* num_entries */,
-                           cl_image_format *    /* image_formats */,
-                           cl_uint *            /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0;
-                                    
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetMemObjectInfo(cl_mem           /* memobj */,
-                   cl_mem_info      /* param_name */, 
-                   size_t           /* param_value_size */,
-                   void *           /* param_value */,
-                   size_t *         /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetImageInfo(cl_mem           /* image */,
-               cl_image_info    /* param_name */, 
-               size_t           /* param_value_size */,
-               void *           /* param_value */,
-               size_t *         /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clSetMemObjectDestructorCallback(  cl_mem /* memobj */, 
-                                    void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), 
-                                    void * /*user_data */ )             CL_API_SUFFIX__VERSION_1_1;  
-
-/* Sampler APIs */
-extern CL_API_ENTRY cl_sampler CL_API_CALL
-clCreateSampler(cl_context          /* context */,
-                cl_bool             /* normalized_coords */, 
-                cl_addressing_mode  /* addressing_mode */, 
-                cl_filter_mode      /* filter_mode */,
-                cl_int *            /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetSamplerInfo(cl_sampler         /* sampler */,
-                 cl_sampler_info    /* param_name */,
-                 size_t             /* param_value_size */,
-                 void *             /* param_value */,
-                 size_t *           /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-                            
-/* Program Object APIs  */
-extern CL_API_ENTRY cl_program CL_API_CALL
-clCreateProgramWithSource(cl_context        /* context */,
-                          cl_uint           /* count */,
-                          const char **     /* strings */,
-                          const size_t *    /* lengths */,
-                          cl_int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_program CL_API_CALL
-clCreateProgramWithBinary(cl_context                     /* context */,
-                          cl_uint                        /* num_devices */,
-                          const cl_device_id *           /* device_list */,
-                          const size_t *                 /* lengths */,
-                          const unsigned char **         /* binaries */,
-                          cl_int *                       /* binary_status */,
-                          cl_int *                       /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_program CL_API_CALL
-clCreateProgramWithBuiltInKernels(cl_context            /* context */,
-                                  cl_uint               /* num_devices */,
-                                  const cl_device_id *  /* device_list */,
-                                  const char *          /* kernel_names */,
-                                  cl_int *              /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clBuildProgram(cl_program           /* program */,
-               cl_uint              /* num_devices */,
-               const cl_device_id * /* device_list */,
-               const char *         /* options */, 
-               void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
-               void *               /* user_data */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clCompileProgram(cl_program           /* program */,
-                 cl_uint              /* num_devices */,
-                 const cl_device_id * /* device_list */,
-                 const char *         /* options */, 
-                 cl_uint              /* num_input_headers */,
-                 const cl_program *   /* input_headers */,
-                 const char **        /* header_include_names */,
-                 void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
-                 void *               /* user_data */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_program CL_API_CALL
-clLinkProgram(cl_context           /* context */,
-              cl_uint              /* num_devices */,
-              const cl_device_id * /* device_list */,
-              const char *         /* options */, 
-              cl_uint              /* num_input_programs */,
-              const cl_program *   /* input_programs */,
-              void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
-              void *               /* user_data */,
-              cl_int *             /* errcode_ret */ ) CL_API_SUFFIX__VERSION_1_2;
-
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clUnloadPlatformCompiler(cl_platform_id /* platform */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetProgramInfo(cl_program         /* program */,
-                 cl_program_info    /* param_name */,
-                 size_t             /* param_value_size */,
-                 void *             /* param_value */,
-                 size_t *           /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetProgramBuildInfo(cl_program            /* program */,
-                      cl_device_id          /* device */,
-                      cl_program_build_info /* param_name */,
-                      size_t                /* param_value_size */,
-                      void *                /* param_value */,
-                      size_t *              /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-                            
-/* Kernel Object APIs */
-extern CL_API_ENTRY cl_kernel CL_API_CALL
-clCreateKernel(cl_program      /* program */,
-               const char *    /* kernel_name */,
-               cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clCreateKernelsInProgram(cl_program     /* program */,
-                         cl_uint        /* num_kernels */,
-                         cl_kernel *    /* kernels */,
-                         cl_uint *      /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainKernel(cl_kernel    /* kernel */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseKernel(cl_kernel   /* kernel */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clSetKernelArg(cl_kernel    /* kernel */,
-               cl_uint      /* arg_index */,
-               size_t       /* arg_size */,
-               const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetKernelInfo(cl_kernel       /* kernel */,
-                cl_kernel_info  /* param_name */,
-                size_t          /* param_value_size */,
-                void *          /* param_value */,
-                size_t *        /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetKernelArgInfo(cl_kernel       /* kernel */,
-                   cl_uint         /* arg_indx */,
-                   cl_kernel_arg_info  /* param_name */,
-                   size_t          /* param_value_size */,
-                   void *          /* param_value */,
-                   size_t *        /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetKernelWorkGroupInfo(cl_kernel                  /* kernel */,
-                         cl_device_id               /* device */,
-                         cl_kernel_work_group_info  /* param_name */,
-                         size_t                     /* param_value_size */,
-                         void *                     /* param_value */,
-                         size_t *                   /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-/* Event Object APIs */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clWaitForEvents(cl_uint             /* num_events */,
-                const cl_event *    /* event_list */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetEventInfo(cl_event         /* event */,
-               cl_event_info    /* param_name */,
-               size_t           /* param_value_size */,
-               void *           /* param_value */,
-               size_t *         /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-                            
-extern CL_API_ENTRY cl_event CL_API_CALL
-clCreateUserEvent(cl_context    /* context */,
-                  cl_int *      /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;               
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clSetUserEventStatus(cl_event   /* event */,
-                     cl_int     /* execution_status */) CL_API_SUFFIX__VERSION_1_1;
-                     
-extern CL_API_ENTRY cl_int CL_API_CALL
-clSetEventCallback( cl_event    /* event */,
-                    cl_int      /* command_exec_callback_type */,
-                    void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *),
-                    void *      /* user_data */) CL_API_SUFFIX__VERSION_1_1;
-
-/* Profiling APIs */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetEventProfilingInfo(cl_event            /* event */,
-                        cl_profiling_info   /* param_name */,
-                        size_t              /* param_value_size */,
-                        void *              /* param_value */,
-                        size_t *            /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-                                
-/* Flush and Finish APIs */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clFlush(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clFinish(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
-
-/* Enqueued Commands APIs */
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueReadBuffer(cl_command_queue    /* command_queue */,
-                    cl_mem              /* buffer */,
-                    cl_bool             /* blocking_read */,
-                    size_t              /* offset */,
-                    size_t              /* size */, 
-                    void *              /* ptr */,
-                    cl_uint             /* num_events_in_wait_list */,
-                    const cl_event *    /* event_wait_list */,
-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueReadBufferRect(cl_command_queue    /* command_queue */,
-                        cl_mem              /* buffer */,
-                        cl_bool             /* blocking_read */,
-                        const size_t *      /* buffer_offset */,
-                        const size_t *      /* host_offset */, 
-                        const size_t *      /* region */,
-                        size_t              /* buffer_row_pitch */,
-                        size_t              /* buffer_slice_pitch */,
-                        size_t              /* host_row_pitch */,
-                        size_t              /* host_slice_pitch */,                        
-                        void *              /* ptr */,
-                        cl_uint             /* num_events_in_wait_list */,
-                        const cl_event *    /* event_wait_list */,
-                        cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueWriteBuffer(cl_command_queue   /* command_queue */, 
-                     cl_mem             /* buffer */, 
-                     cl_bool            /* blocking_write */, 
-                     size_t             /* offset */, 
-                     size_t             /* size */, 
-                     const void *       /* ptr */, 
-                     cl_uint            /* num_events_in_wait_list */, 
-                     const cl_event *   /* event_wait_list */, 
-                     cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_0;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueWriteBufferRect(cl_command_queue    /* command_queue */,
-                         cl_mem              /* buffer */,
-                         cl_bool             /* blocking_write */,
-                         const size_t *      /* buffer_offset */,
-                         const size_t *      /* host_offset */, 
-                         const size_t *      /* region */,
-                         size_t              /* buffer_row_pitch */,
-                         size_t              /* buffer_slice_pitch */,
-                         size_t              /* host_row_pitch */,
-                         size_t              /* host_slice_pitch */,                        
-                         const void *        /* ptr */,
-                         cl_uint             /* num_events_in_wait_list */,
-                         const cl_event *    /* event_wait_list */,
-                         cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueFillBuffer(cl_command_queue   /* command_queue */,
-                    cl_mem             /* buffer */, 
-                    const void *       /* pattern */, 
-                    size_t             /* pattern_size */, 
-                    size_t             /* offset */, 
-                    size_t             /* size */, 
-                    cl_uint            /* num_events_in_wait_list */, 
-                    const cl_event *   /* event_wait_list */, 
-                    cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_2;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueCopyBuffer(cl_command_queue    /* command_queue */, 
-                    cl_mem              /* src_buffer */,
-                    cl_mem              /* dst_buffer */, 
-                    size_t              /* src_offset */,
-                    size_t              /* dst_offset */,
-                    size_t              /* size */, 
-                    cl_uint             /* num_events_in_wait_list */,
-                    const cl_event *    /* event_wait_list */,
-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueCopyBufferRect(cl_command_queue    /* command_queue */, 
-                        cl_mem              /* src_buffer */,
-                        cl_mem              /* dst_buffer */, 
-                        const size_t *      /* src_origin */,
-                        const size_t *      /* dst_origin */,
-                        const size_t *      /* region */, 
-                        size_t              /* src_row_pitch */,
-                        size_t              /* src_slice_pitch */,
-                        size_t              /* dst_row_pitch */,
-                        size_t              /* dst_slice_pitch */,
-                        cl_uint             /* num_events_in_wait_list */,
-                        const cl_event *    /* event_wait_list */,
-                        cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueReadImage(cl_command_queue     /* command_queue */,
-                   cl_mem               /* image */,
-                   cl_bool              /* blocking_read */, 
-                   const size_t *       /* origin[3] */,
-                   const size_t *       /* region[3] */,
-                   size_t               /* row_pitch */,
-                   size_t               /* slice_pitch */, 
-                   void *               /* ptr */,
-                   cl_uint              /* num_events_in_wait_list */,
-                   const cl_event *     /* event_wait_list */,
-                   cl_event *           /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueWriteImage(cl_command_queue    /* command_queue */,
-                    cl_mem              /* image */,
-                    cl_bool             /* blocking_write */, 
-                    const size_t *      /* origin[3] */,
-                    const size_t *      /* region[3] */,
-                    size_t              /* input_row_pitch */,
-                    size_t              /* input_slice_pitch */, 
-                    const void *        /* ptr */,
-                    cl_uint             /* num_events_in_wait_list */,
-                    const cl_event *    /* event_wait_list */,
-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueFillImage(cl_command_queue   /* command_queue */,
-                   cl_mem             /* image */, 
-                   const void *       /* fill_color */, 
-                   const size_t *     /* origin[3] */, 
-                   const size_t *     /* region[3] */, 
-                   cl_uint            /* num_events_in_wait_list */, 
-                   const cl_event *   /* event_wait_list */, 
-                   cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_2;
-                            
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueCopyImage(cl_command_queue     /* command_queue */,
-                   cl_mem               /* src_image */,
-                   cl_mem               /* dst_image */, 
-                   const size_t *       /* src_origin[3] */,
-                   const size_t *       /* dst_origin[3] */,
-                   const size_t *       /* region[3] */, 
-                   cl_uint              /* num_events_in_wait_list */,
-                   const cl_event *     /* event_wait_list */,
-                   cl_event *           /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueCopyImageToBuffer(cl_command_queue /* command_queue */,
-                           cl_mem           /* src_image */,
-                           cl_mem           /* dst_buffer */, 
-                           const size_t *   /* src_origin[3] */,
-                           const size_t *   /* region[3] */, 
-                           size_t           /* dst_offset */,
-                           cl_uint          /* num_events_in_wait_list */,
-                           const cl_event * /* event_wait_list */,
-                           cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueCopyBufferToImage(cl_command_queue /* command_queue */,
-                           cl_mem           /* src_buffer */,
-                           cl_mem           /* dst_image */, 
-                           size_t           /* src_offset */,
-                           const size_t *   /* dst_origin[3] */,
-                           const size_t *   /* region[3] */, 
-                           cl_uint          /* num_events_in_wait_list */,
-                           const cl_event * /* event_wait_list */,
-                           cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY void * CL_API_CALL
-clEnqueueMapBuffer(cl_command_queue /* command_queue */,
-                   cl_mem           /* buffer */,
-                   cl_bool          /* blocking_map */, 
-                   cl_map_flags     /* map_flags */,
-                   size_t           /* offset */,
-                   size_t           /* size */,
-                   cl_uint          /* num_events_in_wait_list */,
-                   const cl_event * /* event_wait_list */,
-                   cl_event *       /* event */,
-                   cl_int *         /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY void * CL_API_CALL
-clEnqueueMapImage(cl_command_queue  /* command_queue */,
-                  cl_mem            /* image */, 
-                  cl_bool           /* blocking_map */, 
-                  cl_map_flags      /* map_flags */, 
-                  const size_t *    /* origin[3] */,
-                  const size_t *    /* region[3] */,
-                  size_t *          /* image_row_pitch */,
-                  size_t *          /* image_slice_pitch */,
-                  cl_uint           /* num_events_in_wait_list */,
-                  const cl_event *  /* event_wait_list */,
-                  cl_event *        /* event */,
-                  cl_int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueUnmapMemObject(cl_command_queue /* command_queue */,
-                        cl_mem           /* memobj */,
-                        void *           /* mapped_ptr */,
-                        cl_uint          /* num_events_in_wait_list */,
-                        const cl_event *  /* event_wait_list */,
-                        cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueMigrateMemObjects(cl_command_queue       /* command_queue */,
-                           cl_uint                /* num_mem_objects */,
-                           const cl_mem *         /* mem_objects */,
-                           cl_mem_migration_flags /* flags */,
-                           cl_uint                /* num_events_in_wait_list */,
-                           const cl_event *       /* event_wait_list */,
-                           cl_event *             /* event */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueNDRangeKernel(cl_command_queue /* command_queue */,
-                       cl_kernel        /* kernel */,
-                       cl_uint          /* work_dim */,
-                       const size_t *   /* global_work_offset */,
-                       const size_t *   /* global_work_size */,
-                       const size_t *   /* local_work_size */,
-                       cl_uint          /* num_events_in_wait_list */,
-                       const cl_event * /* event_wait_list */,
-                       cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueTask(cl_command_queue  /* command_queue */,
-              cl_kernel         /* kernel */,
-              cl_uint           /* num_events_in_wait_list */,
-              const cl_event *  /* event_wait_list */,
-              cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueNativeKernel(cl_command_queue  /* command_queue */,
-					  void (CL_CALLBACK * /*user_func*/)(void *), 
-                      void *            /* args */,
-                      size_t            /* cb_args */, 
-                      cl_uint           /* num_mem_objects */,
-                      const cl_mem *    /* mem_list */,
-                      const void **     /* args_mem_loc */,
-                      cl_uint           /* num_events_in_wait_list */,
-                      const cl_event *  /* event_wait_list */,
-                      cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueMarkerWithWaitList(cl_command_queue /* command_queue */,
-                            cl_uint           /* num_events_in_wait_list */,
-                            const cl_event *  /* event_wait_list */,
-                            cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_2;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueBarrierWithWaitList(cl_command_queue /* command_queue */,
-                             cl_uint           /* num_events_in_wait_list */,
-                             const cl_event *  /* event_wait_list */,
-                             cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_2;
-
-
-/* Extension function access
- *
- * Returns the extension function address for the given function name,
- * or NULL if a valid function can not be found.  The client must
- * check to make sure the address is not NULL, before using or 
- * calling the returned function address.
- */
-extern CL_API_ENTRY void * CL_API_CALL 
-clGetExtensionFunctionAddressForPlatform(cl_platform_id /* platform */,
-                                         const char *   /* func_name */) CL_API_SUFFIX__VERSION_1_2;
-    
-
-// Deprecated OpenCL 1.1 APIs
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
-clCreateImage2D(cl_context              /* context */,
-                cl_mem_flags            /* flags */,
-                const cl_image_format * /* image_format */,
-                size_t                  /* image_width */,
-                size_t                  /* image_height */,
-                size_t                  /* image_row_pitch */, 
-                void *                  /* host_ptr */,
-                cl_int *                /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
-clCreateImage3D(cl_context              /* context */,
-                cl_mem_flags            /* flags */,
-                const cl_image_format * /* image_format */,
-                size_t                  /* image_width */, 
-                size_t                  /* image_height */,
-                size_t                  /* image_depth */, 
-                size_t                  /* image_row_pitch */, 
-                size_t                  /* image_slice_pitch */, 
-                void *                  /* host_ptr */,
-                cl_int *                /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
-clEnqueueMarker(cl_command_queue    /* command_queue */,
-                cl_event *          /* event */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
-clEnqueueWaitForEvents(cl_command_queue /* command_queue */,
-                        cl_uint          /* num_events */,
-                        const cl_event * /* event_list */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
-clEnqueueBarrier(cl_command_queue /* command_queue */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
-clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
-clGetExtensionFunctionAddress(const char * /* func_name */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __OPENCL_CL_H */
-
diff --git a/Externals/CLRun/include/CL/cl_d3d10.h b/Externals/CLRun/include/CL/cl_d3d10.h
deleted file mode 100644
index 81b0d37214..0000000000
--- a/Externals/CLRun/include/CL/cl_d3d10.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008-2012 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.
- **********************************************************************************/
-
-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
-
-#ifndef __OPENCL_CL_D3D10_H
-#define __OPENCL_CL_D3D10_H
-
-#include <d3d10.h>
-#include <CL/cl.h>
-#include <CL/cl_platform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * cl_khr_d3d10_sharing                                                       */
-#define cl_khr_d3d10_sharing 1
-
-typedef cl_uint cl_d3d10_device_source_khr;
-typedef cl_uint cl_d3d10_device_set_khr;
-
-/******************************************************************************/
-
-// Error Codes
-#define CL_INVALID_D3D10_DEVICE_KHR                  -1002
-#define CL_INVALID_D3D10_RESOURCE_KHR                -1003
-#define CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR       -1004
-#define CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR           -1005
-
-// cl_d3d10_device_source_nv
-#define CL_D3D10_DEVICE_KHR                          0x4010
-#define CL_D3D10_DXGI_ADAPTER_KHR                    0x4011
-
-// cl_d3d10_device_set_nv
-#define CL_PREFERRED_DEVICES_FOR_D3D10_KHR           0x4012
-#define CL_ALL_DEVICES_FOR_D3D10_KHR                 0x4013
-
-// cl_context_info
-#define CL_CONTEXT_D3D10_DEVICE_KHR                  0x4014
-#define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C
-
-// cl_mem_info
-#define CL_MEM_D3D10_RESOURCE_KHR                    0x4015
-
-// cl_image_info
-#define CL_IMAGE_D3D10_SUBRESOURCE_KHR               0x4016
-
-// cl_command_type
-#define CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR         0x4017
-#define CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR         0x4018
-
-/******************************************************************************/
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)(
-    cl_platform_id             platform,
-    cl_d3d10_device_source_khr d3d_device_source,
-    void *                     d3d_object,
-    cl_d3d10_device_set_khr    d3d_device_set,
-    cl_uint                    num_entries,
-    cl_device_id *             devices,
-    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_0;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)(
-    cl_context     context,
-    cl_mem_flags   flags,
-    ID3D10Buffer * resource,
-    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_0;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)(
-    cl_context        context,
-    cl_mem_flags      flags,
-    ID3D10Texture2D * resource,
-    UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)(
-    cl_context        context,
-    cl_mem_flags      flags,
-    ID3D10Texture3D * resource,
-    UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // __OPENCL_CL_D3D10_H
-
diff --git a/Externals/CLRun/include/CL/cl_d3d11.h b/Externals/CLRun/include/CL/cl_d3d11.h
deleted file mode 100644
index d3c8bdc2b1..0000000000
--- a/Externals/CLRun/include/CL/cl_d3d11.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008-2012 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.
- **********************************************************************************/
-
-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
-
-#ifndef __OPENCL_CL_D3D11_H
-#define __OPENCL_CL_D3D11_H
-
-#include <d3d11.h>
-#include <CL/cl.h>
-#include <CL/cl_platform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * cl_khr_d3d11_sharing                                                       */
-#define cl_khr_d3d11_sharing 1
-
-typedef cl_uint cl_d3d11_device_source_khr;
-typedef cl_uint cl_d3d11_device_set_khr;
-
-/******************************************************************************/
-
-// Error Codes
-#define CL_INVALID_D3D11_DEVICE_KHR                  -1006
-#define CL_INVALID_D3D11_RESOURCE_KHR                -1007
-#define CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR       -1008
-#define CL_D3D11_RESOURCE_NOT_ACQUIRED_KHR           -1009
-
-// cl_d3d11_device_source
-#define CL_D3D11_DEVICE_KHR                          0x4019
-#define CL_D3D11_DXGI_ADAPTER_KHR                    0x401A
-
-// cl_d3d11_device_set
-#define CL_PREFERRED_DEVICES_FOR_D3D11_KHR           0x401B
-#define CL_ALL_DEVICES_FOR_D3D11_KHR                 0x401C
-
-// cl_context_info
-#define CL_CONTEXT_D3D11_DEVICE_KHR                  0x401D
-#define CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR 0x402D
-
-// cl_mem_info
-#define CL_MEM_D3D11_RESOURCE_KHR                    0x401E
-
-// cl_image_info
-#define CL_IMAGE_D3D11_SUBRESOURCE_KHR               0x401F
-
-// cl_command_type
-#define CL_COMMAND_ACQUIRE_D3D11_OBJECTS_KHR         0x4020
-#define CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR         0x4021
-
-/******************************************************************************/
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
-    cl_platform_id             platform,
-    cl_d3d11_device_source_khr d3d_device_source,
-    void *                     d3d_object,
-    cl_d3d11_device_set_khr    d3d_device_set,
-    cl_uint                    num_entries,
-    cl_device_id *             devices,
-    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)(
-    cl_context     context,
-    cl_mem_flags   flags,
-    ID3D11Buffer * resource,
-    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)(
-    cl_context        context,
-    cl_mem_flags      flags,
-    ID3D11Texture2D * resource,
-    UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)(
-    cl_context        context,
-    cl_mem_flags      flags,
-    ID3D11Texture3D * resource,
-    UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // __OPENCL_CL_D3D11_H
-
diff --git a/Externals/CLRun/include/CL/cl_dx9_media_sharing.h b/Externals/CLRun/include/CL/cl_dx9_media_sharing.h
deleted file mode 100644
index 1ef543a5af..0000000000
--- a/Externals/CLRun/include/CL/cl_dx9_media_sharing.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008-2012 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.
- **********************************************************************************/
-
-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
-
-#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H
-#define __OPENCL_CL_DX9_MEDIA_SHARING_H
-
-#include <CL/cl.h>
-#include <CL/cl_platform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
-/* cl_khr_dx9_media_sharing                                                   */
-#define cl_khr_dx9_media_sharing 1
-
-typedef cl_uint             cl_dx9_media_adapter_type_khr;
-typedef cl_uint             cl_dx9_media_adapter_set_khr;
-    
-#if defined(_WIN32)
-#include <d3d9.h>
-typedef struct _cl_dx9_surface_info_khr
-{
-    IDirect3DSurface9 *resource;
-    HANDLE shared_handle;
-} cl_dx9_surface_info_khr;
-#endif
-
-
-/******************************************************************************/
-
-// Error Codes
-#define CL_INVALID_DX9_MEDIA_ADAPTER_KHR                -1010
-#define CL_INVALID_DX9_MEDIA_SURFACE_KHR                -1011
-#define CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR       -1012
-#define CL_DX9_MEDIA_SURFACE_NOT_ACQUIRED_KHR           -1013
-
-// cl_media_adapter_type_khr
-#define CL_ADAPTER_D3D9_KHR                              0x2020
-#define CL_ADAPTER_D3D9EX_KHR                            0x2021
-#define CL_ADAPTER_DXVA_KHR                              0x2022
-
-// cl_media_adapter_set_khr
-#define CL_PREFERRED_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR   0x2023
-#define CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR         0x2024
-
-// cl_context_info
-#define CL_CONTEXT_ADAPTER_D3D9_KHR                      0x2025
-#define CL_CONTEXT_ADAPTER_D3D9EX_KHR                    0x2026
-#define CL_CONTEXT_ADAPTER_DXVA_KHR                      0x2027
-
-// cl_mem_info
-#define CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR                0x2028
-#define CL_MEM_DX9_MEDIA_SURFACE_INFO_KHR                0x2029
-
-// cl_image_info
-#define CL_IMAGE_DX9_MEDIA_PLANE_KHR                     0x202A
-
-// cl_command_type
-#define CL_COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR        0x202B
-#define CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR        0x202C
-
-/******************************************************************************/
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)(
-    cl_platform_id                   platform,
-    cl_uint                          num_media_adapters,
-    cl_dx9_media_adapter_type_khr *  media_adapter_type,
-    void *                           media_adapters,
-    cl_dx9_media_adapter_set_khr     media_adapter_set,
-    cl_uint                          num_entries,
-    cl_device_id *                   devices,
-    cl_uint *                        num_devices) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)(
-    cl_context                    context,
-    cl_mem_flags                  flags,
-    cl_dx9_media_adapter_type_khr adapter_type,
-    void *                        surface_info,
-    cl_uint                       plane,                                                                          
-    cl_int *                      errcode_ret) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)(
-    cl_command_queue command_queue,
-    cl_uint          num_objects,
-    const cl_mem *   mem_objects,
-    cl_uint          num_events_in_wait_list,
-    const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // __OPENCL_CL_DX9_MEDIA_SHARING_H
-
diff --git a/Externals/CLRun/include/CL/cl_ext.h b/Externals/CLRun/include/CL/cl_ext.h
deleted file mode 100644
index 632cb216b3..0000000000
--- a/Externals/CLRun/include/CL/cl_ext.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 - 2012 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.
- ******************************************************************************/
-
-/* $Revision: 11928 $ on $Date: 2010-07-13 09:04:56 -0700 (Tue, 13 Jul 2010) $ */
-
-/* cl_ext.h contains OpenCL extensions which don't have external */
-/* (OpenGL, D3D) dependencies.                                   */
-
-#ifndef __CL_EXT_H
-#define __CL_EXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __APPLE__
-	#include <OpenCL/cl.h>
-    #include <AvailabilityMacros.h>
-#else
-	#include <CL/cl.h>
-#endif
-
-/* cl_khr_fp16 extension - no extension #define since it has no functions  */
-#define CL_DEVICE_HALF_FP_CONFIG                    0x1033
-
-/* Memory object destruction
- *
- * Apple extension for use to manage externally allocated buffers used with cl_mem objects with CL_MEM_USE_HOST_PTR
- *
- * Registers a user callback function that will be called when the memory object is deleted and its resources 
- * freed. Each call to clSetMemObjectCallbackFn registers the specified user callback function on a callback 
- * stack associated with memobj. The registered user callback functions are called in the reverse order in 
- * which they were registered. The user callback functions are called and then the memory object is deleted 
- * and its resources freed. This provides a mechanism for the application (and libraries) using memobj to be 
- * notified when the memory referenced by host_ptr, specified when the memory object is created and used as 
- * the storage bits for the memory object, can be reused or freed.
- *
- * The application may not call CL api's with the cl_mem object passed to the pfn_notify.
- *
- * Please check for the "cl_APPLE_SetMemObjectDestructor" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS)
- * before using.
- */
-#define cl_APPLE_SetMemObjectDestructor 1
-cl_int	CL_API_ENTRY clSetMemObjectDestructorAPPLE(  cl_mem /* memobj */, 
-                                        void (* /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), 
-                                        void * /*user_data */ )             CL_EXT_SUFFIX__VERSION_1_0;  
-
-
-/* Context Logging Functions
- *
- * The next three convenience functions are intended to be used as the pfn_notify parameter to clCreateContext().
- * Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS)
- * before using.
- *
- * clLogMessagesToSystemLog fowards on all log messages to the Apple System Logger 
- */
-#define cl_APPLE_ContextLoggingFunctions 1
-extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE(  const char * /* errstr */, 
-                                            const void * /* private_info */, 
-                                            size_t       /* cb */, 
-                                            void *       /* user_data */ )  CL_EXT_SUFFIX__VERSION_1_0;
-
-/* clLogMessagesToStdout sends all log messages to the file descriptor stdout */
-extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE(   const char * /* errstr */, 
-                                          const void * /* private_info */, 
-                                          size_t       /* cb */, 
-                                          void *       /* user_data */ )    CL_EXT_SUFFIX__VERSION_1_0;
-
-/* clLogMessagesToStderr sends all log messages to the file descriptor stderr */
-extern void CL_API_ENTRY clLogMessagesToStderrAPPLE(   const char * /* errstr */, 
-                                          const void * /* private_info */, 
-                                          size_t       /* cb */, 
-                                          void *       /* user_data */ )    CL_EXT_SUFFIX__VERSION_1_0;
-
-
-/************************ 
-* cl_khr_icd extension *                                                  
-************************/
-#define cl_khr_icd 1
-
-/* cl_platform_info                                                        */
-#define CL_PLATFORM_ICD_SUFFIX_KHR                  0x0920
-
-/* Additional Error Codes                                                  */
-#define CL_PLATFORM_NOT_FOUND_KHR                   -1001
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clIcdGetPlatformIDsKHR(cl_uint          /* num_entries */,
-                       cl_platform_id * /* platforms */,
-                       cl_uint *        /* num_platforms */);
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(
-    cl_uint          /* num_entries */,
-    cl_platform_id * /* platforms */,
-    cl_uint *        /* num_platforms */);
-
-
-/* Extension: cl_khr_image2D_buffer
- *
- * This extension allows a 2D image to be created from a cl_mem buffer without a copy.
- * The type associated with a 2D image created from a buffer in an OpenCL program is image2d_t.
- * Both the sampler and sampler-less read_image built-in functions are supported for 2D images
- * and 2D images created from a buffer.  Similarly, the write_image built-ins are also supported
- * for 2D images created from a buffer.
- *
- * When the 2D image from buffer is created, the client must specify the width,
- * height, image format (i.e. channel order and channel data type) and optionally the row pitch
- *
- * The pitch specified must be a multiple of CL_DEVICE_IMAGE_PITCH_ALIGNMENT pixels.
- * The base address of the buffer must be aligned to CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT pixels.
- */
-    
-/*************************************
- * cl_khr_initalize_memory extension *
- *************************************/
-    
-#define CL_CONTEXT_MEMORY_INITIALIZE_KHR            0x200E
-    
-    
-/**************************************
- * cl_khr_terminate_context extension *
- **************************************/
-    
-#define CL_DEVICE_TERMINATE_CAPABILITY_KHR          0x200F
-#define CL_CONTEXT_TERMINATE_KHR                    0x2010
-
-#define cl_khr_terminate_context 1
-extern CL_API_ENTRY cl_int CL_API_CALL clTerminateContextKHR(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2;
-
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2;
-    
-    
-/*
- * Extension: cl_khr_spir
- *
- * This extension adds support to create an OpenCL program object from a 
- * Standard Portable Intermediate Representation (SPIR) instance
- */
-
-/******************************************
-* cl_nv_device_attribute_query extension *
-******************************************/
-/* cl_nv_device_attribute_query extension - no extension #define since it has no functions */
-#define CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV       0x4000
-#define CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV       0x4001
-#define CL_DEVICE_REGISTERS_PER_BLOCK_NV            0x4002
-#define CL_DEVICE_WARP_SIZE_NV                      0x4003
-#define CL_DEVICE_GPU_OVERLAP_NV                    0x4004
-#define CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV            0x4005
-#define CL_DEVICE_INTEGRATED_MEMORY_NV              0x4006
-
-
-/*********************************
-* cl_amd_device_attribute_query *
-*********************************/
-#define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD        0x4036
-
-#ifdef CL_VERSION_1_1
-   /***********************************
-    * cl_ext_device_fission extension *
-    ***********************************/
-    #define cl_ext_device_fission   1
-    
-    extern CL_API_ENTRY cl_int CL_API_CALL
-    clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; 
-    
-    typedef CL_API_ENTRY cl_int 
-    (CL_API_CALL *clReleaseDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-
-    extern CL_API_ENTRY cl_int CL_API_CALL
-    clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; 
-    
-    typedef CL_API_ENTRY cl_int 
-    (CL_API_CALL *clRetainDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-
-    typedef cl_ulong  cl_device_partition_property_ext;
-    extern CL_API_ENTRY cl_int CL_API_CALL
-    clCreateSubDevicesEXT(  cl_device_id /*in_device*/,
-                            const cl_device_partition_property_ext * /* properties */,
-                            cl_uint /*num_entries*/,
-                            cl_device_id * /*out_devices*/,
-                            cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-
-    typedef CL_API_ENTRY cl_int 
-    ( CL_API_CALL * clCreateSubDevicesEXT_fn)(  cl_device_id /*in_device*/,
-                                                const cl_device_partition_property_ext * /* properties */,
-                                                cl_uint /*num_entries*/,
-                                                cl_device_id * /*out_devices*/,
-                                                cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-
-    /* cl_device_partition_property_ext */
-    #define CL_DEVICE_PARTITION_EQUALLY_EXT             0x4050
-    #define CL_DEVICE_PARTITION_BY_COUNTS_EXT           0x4051
-    #define CL_DEVICE_PARTITION_BY_NAMES_EXT            0x4052
-    #define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT  0x4053
-    
-    /* clDeviceGetInfo selectors */
-    #define CL_DEVICE_PARENT_DEVICE_EXT                 0x4054
-    #define CL_DEVICE_PARTITION_TYPES_EXT               0x4055
-    #define CL_DEVICE_AFFINITY_DOMAINS_EXT              0x4056
-    #define CL_DEVICE_REFERENCE_COUNT_EXT               0x4057
-    #define CL_DEVICE_PARTITION_STYLE_EXT               0x4058
-    
-    /* error codes */
-    #define CL_DEVICE_PARTITION_FAILED_EXT              -1057
-    #define CL_INVALID_PARTITION_COUNT_EXT              -1058
-    #define CL_INVALID_PARTITION_NAME_EXT               -1059
-    
-    /* CL_AFFINITY_DOMAINs */
-    #define CL_AFFINITY_DOMAIN_L1_CACHE_EXT             0x1
-    #define CL_AFFINITY_DOMAIN_L2_CACHE_EXT             0x2
-    #define CL_AFFINITY_DOMAIN_L3_CACHE_EXT             0x3
-    #define CL_AFFINITY_DOMAIN_L4_CACHE_EXT             0x4
-    #define CL_AFFINITY_DOMAIN_NUMA_EXT                 0x10
-    #define CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT     0x100
-    
-    /* cl_device_partition_property_ext list terminators */
-    #define CL_PROPERTIES_LIST_END_EXT                  ((cl_device_partition_property_ext) 0)
-    #define CL_PARTITION_BY_COUNTS_LIST_END_EXT         ((cl_device_partition_property_ext) 0)
-    #define CL_PARTITION_BY_NAMES_LIST_END_EXT          ((cl_device_partition_property_ext) 0 - 1)
-
-
-
-#endif /* CL_VERSION_1_1 */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __CL_EXT_H */
diff --git a/Externals/CLRun/include/CL/cl_gl.h b/Externals/CLRun/include/CL/cl_gl.h
deleted file mode 100644
index af2036cc99..0000000000
--- a/Externals/CLRun/include/CL/cl_gl.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008 - 2012 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.
- **********************************************************************************/
-
-#ifndef __OPENCL_CL_GL_H
-#define __OPENCL_CL_GL_H
-
-#ifdef __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif	
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef cl_uint     cl_gl_object_type;
-typedef cl_uint     cl_gl_texture_info;
-typedef cl_uint     cl_gl_platform_info;
-typedef struct __GLsync *cl_GLsync;
-
-/* cl_gl_object_type = 0x2000 - 0x200F enum values are currently taken           */
-#define CL_GL_OBJECT_BUFFER                     0x2000
-#define CL_GL_OBJECT_TEXTURE2D                  0x2001
-#define CL_GL_OBJECT_TEXTURE3D                  0x2002
-#define CL_GL_OBJECT_RENDERBUFFER               0x2003
-#define CL_GL_OBJECT_TEXTURE2D_ARRAY            0x200E
-#define CL_GL_OBJECT_TEXTURE1D                  0x200F
-#define CL_GL_OBJECT_TEXTURE1D_ARRAY            0x2010
-#define CL_GL_OBJECT_TEXTURE_BUFFER             0x2011
-
-/* cl_gl_texture_info           */
-#define CL_GL_TEXTURE_TARGET                    0x2004
-#define CL_GL_MIPMAP_LEVEL                      0x2005
-#define CL_GL_NUM_SAMPLES                       0x2012
-
-
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateFromGLBuffer(cl_context     /* context */,
-                     cl_mem_flags   /* flags */,
-                     cl_GLuint      /* bufobj */,
-                     int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateFromGLTexture(cl_context      /* context */,
-                      cl_mem_flags    /* flags */,
-                      cl_GLenum       /* target */,
-                      cl_GLint        /* miplevel */,
-                      cl_GLuint       /* texture */,
-                      cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
-    
-extern CL_API_ENTRY cl_mem CL_API_CALL
-clCreateFromGLRenderbuffer(cl_context   /* context */,
-                           cl_mem_flags /* flags */,
-                           cl_GLuint    /* renderbuffer */,
-                           cl_int *     /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetGLObjectInfo(cl_mem                /* memobj */,
-                  cl_gl_object_type *   /* gl_object_type */,
-                  cl_GLuint *           /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0;
-                  
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetGLTextureInfo(cl_mem               /* memobj */,
-                   cl_gl_texture_info   /* param_name */,
-                   size_t               /* param_value_size */,
-                   void *               /* param_value */,
-                   size_t *             /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueAcquireGLObjects(cl_command_queue      /* command_queue */,
-                          cl_uint               /* num_objects */,
-                          const cl_mem *        /* mem_objects */,
-                          cl_uint               /* num_events_in_wait_list */,
-                          const cl_event *      /* event_wait_list */,
-                          cl_event *            /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-extern CL_API_ENTRY cl_int CL_API_CALL
-clEnqueueReleaseGLObjects(cl_command_queue      /* command_queue */,
-                          cl_uint               /* num_objects */,
-                          const cl_mem *        /* mem_objects */,
-                          cl_uint               /* num_events_in_wait_list */,
-                          const cl_event *      /* event_wait_list */,
-                          cl_event *            /* event */) CL_API_SUFFIX__VERSION_1_0;
-
-
-// Deprecated OpenCL 1.1 APIs
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
-clCreateFromGLTexture2D(cl_context      /* context */,
-                        cl_mem_flags    /* flags */,
-                        cl_GLenum       /* target */,
-                        cl_GLint        /* miplevel */,
-                        cl_GLuint       /* texture */,
-                        cl_int *        /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
-clCreateFromGLTexture3D(cl_context      /* context */,
-                        cl_mem_flags    /* flags */,
-                        cl_GLenum       /* target */,
-                        cl_GLint        /* miplevel */,
-                        cl_GLuint       /* texture */,
-                        cl_int *        /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
-    
-/* cl_khr_gl_sharing extension  */
-    
-#define cl_khr_gl_sharing 1
-    
-typedef cl_uint     cl_gl_context_info;
-    
-/* Additional Error Codes  */
-#define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR  -1000
-    
-/* cl_gl_context_info  */
-#define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR    0x2006
-#define CL_DEVICES_FOR_GL_CONTEXT_KHR           0x2007
-    
-/* Additional cl_context_properties  */
-#define CL_GL_CONTEXT_KHR                       0x2008
-#define CL_EGL_DISPLAY_KHR                      0x2009
-#define CL_GLX_DISPLAY_KHR                      0x200A
-#define CL_WGL_HDC_KHR                          0x200B
-#define CL_CGL_SHAREGROUP_KHR                   0x200C
-    
-extern CL_API_ENTRY cl_int CL_API_CALL
-clGetGLContextInfoKHR(const cl_context_properties * /* properties */,
-                      cl_gl_context_info            /* param_name */,
-                      size_t                        /* param_value_size */,
-                      void *                        /* param_value */,
-                      size_t *                      /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
-    
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)(
-    const cl_context_properties * properties,
-    cl_gl_context_info            param_name,
-    size_t                        param_value_size,
-    void *                        param_value,
-    size_t *                      param_value_size_ret);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __OPENCL_CL_GL_H */
diff --git a/Externals/CLRun/include/CL/cl_gl_ext.h b/Externals/CLRun/include/CL/cl_gl_ext.h
deleted file mode 100644
index 77d53536f6..0000000000
--- a/Externals/CLRun/include/CL/cl_gl_ext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008-2012 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.
- **********************************************************************************/
-
-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
-
-/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have           */
-/* OpenGL dependencies.                                                         */
-
-#ifndef __OPENCL_CL_GL_EXT_H
-#define __OPENCL_CL_GL_EXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __APPLE__
-    #include <OpenCL/cl_gl.h>
-#else
-    #include <CL/cl_gl.h>
-#endif
-
-/*
- * For each extension, follow this template
- *  cl_VEN_extname extension  */
-/* #define cl_VEN_extname 1
- * ... define new types, if any
- * ... define new tokens, if any
- * ... define new APIs, if any
- *
- *  If you need GLtypes here, mirror them with a cl_GLtype, rather than including a GL header
- *  This allows us to avoid having to decide whether to include GL headers or GLES here.
- */
-
-/* 
- *  cl_khr_gl_event  extension
- *  See section 9.9 in the OpenCL 1.1 spec for more information
- */
-#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR     0x200D
-
-extern CL_API_ENTRY cl_event CL_API_CALL
-clCreateEventFromGLsyncKHR(cl_context           /* context */,
-                           cl_GLsync            /* cl_GLsync */,
-                           cl_int *             /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* __OPENCL_CL_GL_EXT_H  */
diff --git a/Externals/CLRun/include/CL/cl_platform.h b/Externals/CLRun/include/CL/cl_platform.h
deleted file mode 100644
index cf2b7210ac..0000000000
--- a/Externals/CLRun/include/CL/cl_platform.h
+++ /dev/null
@@ -1,1254 +0,0 @@
-/**********************************************************************************
- * Copyright (c) 2008-2012 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.
- **********************************************************************************/
-
-/* $Revision: 11803 $ on $Date: 2010-06-25 10:02:12 -0700 (Fri, 25 Jun 2010) $ */
-
-#ifndef __CL_PLATFORM_H
-#define __CL_PLATFORM_H
-
-#ifdef __APPLE__
-    /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */
-    #include <AvailabilityMacros.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(_WIN32)
-    #define CL_API_ENTRY
-    #define CL_API_CALL     __stdcall
-    #define CL_CALLBACK     __stdcall
-#else
-    #define CL_API_ENTRY
-    #define CL_API_CALL
-    #define CL_CALLBACK
-#endif
-
-#ifdef __APPLE__
-    #define CL_EXTENSION_WEAK_LINK       __attribute__((weak_import))
-    #define CL_API_SUFFIX__VERSION_1_0                  AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
-    #define CL_EXT_SUFFIX__VERSION_1_0                  CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
-    #define CL_API_SUFFIX__VERSION_1_1                  AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-    #define GCL_API_SUFFIX__VERSION_1_1                 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-    #define CL_EXT_SUFFIX__VERSION_1_1                  CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-    #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED       CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7
-    
-    #ifdef AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
-        #define CL_API_SUFFIX__VERSION_1_2              AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
-        #define GCL_API_SUFFIX__VERSION_1_2             AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
-        #define CL_EXT_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
-        #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_8
-    #else
-        #warning  This path should never happen outside of internal operating system development.  AvailabilityMacros do not function correctly here!
-        #define CL_API_SUFFIX__VERSION_1_2              AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-        #define GCL_API_SUFFIX__VERSION_1_2             AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-        #define CL_EXT_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
-    #endif
-#else
-    #define CL_EXTENSION_WEAK_LINK  
-    #define CL_API_SUFFIX__VERSION_1_0
-    #define CL_EXT_SUFFIX__VERSION_1_0
-    #define CL_API_SUFFIX__VERSION_1_1
-    #define CL_EXT_SUFFIX__VERSION_1_1
-    #define CL_API_SUFFIX__VERSION_1_2
-    #define CL_EXT_SUFFIX__VERSION_1_2
-    
-    #ifdef __GNUC__
-        #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
-        #else
-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated))
-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
-        #endif
-    
-        #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED    
-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
-        #else
-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated))
-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
-        #endif
-    #elif _WIN32
-        #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED    
-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
-        #else
-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED 
-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated)     
-        #endif
-    
-        #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
-        #else
-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED 
-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated)     
-        #endif
-    #else
-        #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
-        #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
-    
-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
-        #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
-    #endif
-#endif
-
-#if (defined (_WIN32) && defined(_MSC_VER))
-
-/* scalar types  */
-typedef signed   __int8         cl_char;
-typedef unsigned __int8         cl_uchar;
-typedef signed   __int16        cl_short;
-typedef unsigned __int16        cl_ushort;
-typedef signed   __int32        cl_int;
-typedef unsigned __int32        cl_uint;
-typedef signed   __int64        cl_long;
-typedef unsigned __int64        cl_ulong;
-
-typedef unsigned __int16        cl_half;
-typedef float                   cl_float;
-typedef double                  cl_double;
-
-/* Macro names and corresponding values defined by OpenCL */
-#define CL_CHAR_BIT         8
-#define CL_SCHAR_MAX        127
-#define CL_SCHAR_MIN        (-127-1)
-#define CL_CHAR_MAX         CL_SCHAR_MAX
-#define CL_CHAR_MIN         CL_SCHAR_MIN
-#define CL_UCHAR_MAX        255
-#define CL_SHRT_MAX         32767
-#define CL_SHRT_MIN         (-32767-1)
-#define CL_USHRT_MAX        65535
-#define CL_INT_MAX          2147483647
-#define CL_INT_MIN          (-2147483647-1)
-#define CL_UINT_MAX         0xffffffffU
-#define CL_LONG_MAX         ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
-#define CL_LONG_MIN         ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
-#define CL_ULONG_MAX        ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
-
-#define CL_FLT_DIG          6
-#define CL_FLT_MANT_DIG     24
-#define CL_FLT_MAX_10_EXP   +38
-#define CL_FLT_MAX_EXP      +128
-#define CL_FLT_MIN_10_EXP   -37
-#define CL_FLT_MIN_EXP      -125
-#define CL_FLT_RADIX        2
-#define CL_FLT_MAX          340282346638528859811704183484516925440.0f
-#define CL_FLT_MIN          1.175494350822287507969e-38f
-#define CL_FLT_EPSILON      0x1.0p-23f
-
-#define CL_DBL_DIG          15
-#define CL_DBL_MANT_DIG     53
-#define CL_DBL_MAX_10_EXP   +308
-#define CL_DBL_MAX_EXP      +1024
-#define CL_DBL_MIN_10_EXP   -307
-#define CL_DBL_MIN_EXP      -1021
-#define CL_DBL_RADIX        2
-#define CL_DBL_MAX          179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
-#define CL_DBL_MIN          2.225073858507201383090e-308
-#define CL_DBL_EPSILON      2.220446049250313080847e-16
-
-#define  CL_M_E             2.718281828459045090796
-#define  CL_M_LOG2E         1.442695040888963387005
-#define  CL_M_LOG10E        0.434294481903251816668
-#define  CL_M_LN2           0.693147180559945286227
-#define  CL_M_LN10          2.302585092994045901094
-#define  CL_M_PI            3.141592653589793115998
-#define  CL_M_PI_2          1.570796326794896557999
-#define  CL_M_PI_4          0.785398163397448278999
-#define  CL_M_1_PI          0.318309886183790691216
-#define  CL_M_2_PI          0.636619772367581382433
-#define  CL_M_2_SQRTPI      1.128379167095512558561
-#define  CL_M_SQRT2         1.414213562373095145475
-#define  CL_M_SQRT1_2       0.707106781186547572737
-
-#define  CL_M_E_F           2.71828174591064f
-#define  CL_M_LOG2E_F       1.44269502162933f
-#define  CL_M_LOG10E_F      0.43429449200630f
-#define  CL_M_LN2_F         0.69314718246460f
-#define  CL_M_LN10_F        2.30258512496948f
-#define  CL_M_PI_F          3.14159274101257f
-#define  CL_M_PI_2_F        1.57079637050629f
-#define  CL_M_PI_4_F        0.78539818525314f
-#define  CL_M_1_PI_F        0.31830987334251f
-#define  CL_M_2_PI_F        0.63661974668503f
-#define  CL_M_2_SQRTPI_F    1.12837922573090f
-#define  CL_M_SQRT2_F       1.41421353816986f
-#define  CL_M_SQRT1_2_F     0.70710676908493f
-
-#define CL_NAN              (CL_INFINITY - CL_INFINITY)
-#define CL_HUGE_VALF        ((cl_float) 1e50)
-#define CL_HUGE_VAL         ((cl_double) 1e500)
-#define CL_MAXFLOAT         CL_FLT_MAX
-#define CL_INFINITY         CL_HUGE_VALF
-
-#else
-
-#include <stdint.h>
-
-/* scalar types  */
-typedef int8_t          cl_char;
-typedef uint8_t         cl_uchar;
-typedef int16_t         cl_short    __attribute__((aligned(2)));
-typedef uint16_t        cl_ushort   __attribute__((aligned(2)));
-typedef int32_t         cl_int      __attribute__((aligned(4)));
-typedef uint32_t        cl_uint     __attribute__((aligned(4)));
-typedef int64_t         cl_long     __attribute__((aligned(8)));
-typedef uint64_t        cl_ulong    __attribute__((aligned(8)));
-
-typedef uint16_t        cl_half     __attribute__((aligned(2)));
-typedef float           cl_float    __attribute__((aligned(4)));
-typedef double          cl_double   __attribute__((aligned(8)));
-
-/* Macro names and corresponding values defined by OpenCL */
-#define CL_CHAR_BIT         8
-#define CL_SCHAR_MAX        127
-#define CL_SCHAR_MIN        (-127-1)
-#define CL_CHAR_MAX         CL_SCHAR_MAX
-#define CL_CHAR_MIN         CL_SCHAR_MIN
-#define CL_UCHAR_MAX        255
-#define CL_SHRT_MAX         32767
-#define CL_SHRT_MIN         (-32767-1)
-#define CL_USHRT_MAX        65535
-#define CL_INT_MAX          2147483647
-#define CL_INT_MIN          (-2147483647-1)
-#define CL_UINT_MAX         0xffffffffU
-#define CL_LONG_MAX         ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
-#define CL_LONG_MIN         ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
-#define CL_ULONG_MAX        ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
-
-#define CL_FLT_DIG          6
-#define CL_FLT_MANT_DIG     24
-#define CL_FLT_MAX_10_EXP   +38
-#define CL_FLT_MAX_EXP      +128
-#define CL_FLT_MIN_10_EXP   -37
-#define CL_FLT_MIN_EXP      -125
-#define CL_FLT_RADIX        2
-#define CL_FLT_MAX          0x1.fffffep127f
-#define CL_FLT_MIN          0x1.0p-126f
-#define CL_FLT_EPSILON      0x1.0p-23f
-
-#define CL_DBL_DIG          15
-#define CL_DBL_MANT_DIG     53
-#define CL_DBL_MAX_10_EXP   +308
-#define CL_DBL_MAX_EXP      +1024
-#define CL_DBL_MIN_10_EXP   -307
-#define CL_DBL_MIN_EXP      -1021
-#define CL_DBL_RADIX        2
-#define CL_DBL_MAX          0x1.fffffffffffffp1023
-#define CL_DBL_MIN          0x1.0p-1022
-#define CL_DBL_EPSILON      0x1.0p-52
-
-#define  CL_M_E             2.718281828459045090796
-#define  CL_M_LOG2E         1.442695040888963387005
-#define  CL_M_LOG10E        0.434294481903251816668
-#define  CL_M_LN2           0.693147180559945286227
-#define  CL_M_LN10          2.302585092994045901094
-#define  CL_M_PI            3.141592653589793115998
-#define  CL_M_PI_2          1.570796326794896557999
-#define  CL_M_PI_4          0.785398163397448278999
-#define  CL_M_1_PI          0.318309886183790691216
-#define  CL_M_2_PI          0.636619772367581382433
-#define  CL_M_2_SQRTPI      1.128379167095512558561
-#define  CL_M_SQRT2         1.414213562373095145475
-#define  CL_M_SQRT1_2       0.707106781186547572737
-
-#define  CL_M_E_F           2.71828174591064f
-#define  CL_M_LOG2E_F       1.44269502162933f
-#define  CL_M_LOG10E_F      0.43429449200630f
-#define  CL_M_LN2_F         0.69314718246460f
-#define  CL_M_LN10_F        2.30258512496948f
-#define  CL_M_PI_F          3.14159274101257f
-#define  CL_M_PI_2_F        1.57079637050629f
-#define  CL_M_PI_4_F        0.78539818525314f
-#define  CL_M_1_PI_F        0.31830987334251f
-#define  CL_M_2_PI_F        0.63661974668503f
-#define  CL_M_2_SQRTPI_F    1.12837922573090f
-#define  CL_M_SQRT2_F       1.41421353816986f
-#define  CL_M_SQRT1_2_F     0.70710676908493f
-
-#if defined( __GNUC__ )
-   #define CL_HUGE_VALF     __builtin_huge_valf()
-   #define CL_HUGE_VAL      __builtin_huge_val()
-   #define CL_NAN           __builtin_nanf( "" )
-#else
-   #define CL_HUGE_VALF     ((cl_float) 1e50)
-   #define CL_HUGE_VAL      ((cl_double) 1e500)
-   float nanf( const char * );
-   #define CL_NAN           nanf( "" )  
-#endif
-#define CL_MAXFLOAT         CL_FLT_MAX
-#define CL_INFINITY         CL_HUGE_VALF
-
-#endif
-
-#include <stddef.h>
-
-/* Mirror types to GL types. Mirror types allow us to avoid deciding which 87s to load based on whether we are using GL or GLES here. */
-typedef unsigned int cl_GLuint;
-typedef int          cl_GLint;
-typedef unsigned int cl_GLenum;
-
-/*
- * Vector types 
- *
- *  Note:   OpenCL requires that all types be naturally aligned. 
- *          This means that vector types must be naturally aligned.
- *          For example, a vector of four floats must be aligned to
- *          a 16 byte boundary (calculated as 4 * the natural 4-byte 
- *          alignment of the float).  The alignment qualifiers here
- *          will only function properly if your compiler supports them
- *          and if you don't actively work to defeat them.  For example,
- *          in order for a cl_float4 to be 16 byte aligned in a struct,
- *          the start of the struct must itself be 16-byte aligned. 
- *
- *          Maintaining proper alignment is the user's responsibility.
- */
-
-/* Define basic vector types */
-#if defined( __VEC__ )
-   #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-   typedef vector unsigned char     __cl_uchar16;
-   typedef vector signed char       __cl_char16;
-   typedef vector unsigned short    __cl_ushort8;
-   typedef vector signed short      __cl_short8;
-   typedef vector unsigned int      __cl_uint4;
-   typedef vector signed int        __cl_int4;
-   typedef vector float             __cl_float4;
-   #define  __CL_UCHAR16__  1
-   #define  __CL_CHAR16__   1
-   #define  __CL_USHORT8__  1
-   #define  __CL_SHORT8__   1
-   #define  __CL_UINT4__    1
-   #define  __CL_INT4__     1
-   #define  __CL_FLOAT4__   1
-#endif
-
-#if defined( __SSE__ )
-    #if defined( __MINGW64__ )
-        #include <intrin.h>
-    #else
-        #include <xmmintrin.h>
-    #endif
-    #if defined( __GNUC__ )
-        typedef float __cl_float4   __attribute__((vector_size(16)));
-    #else
-        typedef __m128 __cl_float4;
-    #endif
-    #define __CL_FLOAT4__   1
-#endif
-
-#if defined( __SSE2__ )
-    #if defined( __MINGW64__ )
-        #include <intrin.h>
-    #else
-        #include <emmintrin.h>
-    #endif
-    #if defined( __GNUC__ )
-        typedef cl_uchar    __cl_uchar16    __attribute__((vector_size(16)));
-        typedef cl_char     __cl_char16     __attribute__((vector_size(16)));
-        typedef cl_ushort   __cl_ushort8    __attribute__((vector_size(16)));
-        typedef cl_short    __cl_short8     __attribute__((vector_size(16)));
-        typedef cl_uint     __cl_uint4      __attribute__((vector_size(16)));
-        typedef cl_int      __cl_int4       __attribute__((vector_size(16)));
-        typedef cl_ulong    __cl_ulong2     __attribute__((vector_size(16)));
-        typedef cl_long     __cl_long2      __attribute__((vector_size(16)));
-        typedef cl_double   __cl_double2    __attribute__((vector_size(16)));
-    #else
-        typedef __m128i __cl_uchar16;
-        typedef __m128i __cl_char16;
-        typedef __m128i __cl_ushort8;
-        typedef __m128i __cl_short8;
-        typedef __m128i __cl_uint4;
-        typedef __m128i __cl_int4;
-        typedef __m128i __cl_ulong2;
-        typedef __m128i __cl_long2;
-        typedef __m128d __cl_double2;
-    #endif
-    #define __CL_UCHAR16__  1
-    #define __CL_CHAR16__   1
-    #define __CL_USHORT8__  1
-    #define __CL_SHORT8__   1
-    #define __CL_INT4__     1
-    #define __CL_UINT4__    1
-    #define __CL_ULONG2__   1
-    #define __CL_LONG2__    1
-    #define __CL_DOUBLE2__  1
-#endif
-
-#if defined( __MMX__ )
-    #include <mmintrin.h>
-    #if defined( __GNUC__ )
-        typedef cl_uchar    __cl_uchar8     __attribute__((vector_size(8)));
-        typedef cl_char     __cl_char8      __attribute__((vector_size(8)));
-        typedef cl_ushort   __cl_ushort4    __attribute__((vector_size(8)));
-        typedef cl_short    __cl_short4     __attribute__((vector_size(8)));
-        typedef cl_uint     __cl_uint2      __attribute__((vector_size(8)));
-        typedef cl_int      __cl_int2       __attribute__((vector_size(8)));
-        typedef cl_ulong    __cl_ulong1     __attribute__((vector_size(8)));
-        typedef cl_long     __cl_long1      __attribute__((vector_size(8)));
-        typedef cl_float    __cl_float2     __attribute__((vector_size(8)));
-    #else
-        typedef __m64       __cl_uchar8;
-        typedef __m64       __cl_char8;
-        typedef __m64       __cl_ushort4;
-        typedef __m64       __cl_short4;
-        typedef __m64       __cl_uint2;
-        typedef __m64       __cl_int2;
-        typedef __m64       __cl_ulong1;
-        typedef __m64       __cl_long1;
-        typedef __m64       __cl_float2;
-    #endif
-    #define __CL_UCHAR8__   1
-    #define __CL_CHAR8__    1
-    #define __CL_USHORT4__  1
-    #define __CL_SHORT4__   1
-    #define __CL_INT2__     1
-    #define __CL_UINT2__    1
-    #define __CL_ULONG1__   1
-    #define __CL_LONG1__    1
-    #define __CL_FLOAT2__   1
-#endif
-
-#if defined( __AVX__ )
-    #if defined( __MINGW64__ )
-        #include <intrin.h>
-    #else
-        #include <immintrin.h> 
-    #endif
-    #if defined( __GNUC__ )
-        typedef cl_float    __cl_float8     __attribute__((vector_size(32)));
-        typedef cl_double   __cl_double4    __attribute__((vector_size(32)));
-    #else
-        typedef __m256      __cl_float8;
-        typedef __m256d     __cl_double4;
-    #endif
-    #define __CL_FLOAT8__   1
-    #define __CL_DOUBLE4__  1
-#endif
-
-/* Define alignment keys */
-#if defined( __GNUC__ )
-    #define CL_ALIGNED(_x)          __attribute__ ((aligned(_x)))
-#elif defined( _WIN32) && (_MSC_VER)
-    /* Alignment keys neutered on windows because MSVC can't swallow function arguments with alignment requirements     */
-    /* http://msdn.microsoft.com/en-us/library/373ak2y1%28VS.71%29.aspx                                                 */
-    /* #include <crtdefs.h>                                                                                             */
-    /* #define CL_ALIGNED(_x)          _CRT_ALIGN(_x)                                                                   */
-    #define CL_ALIGNED(_x)
-#else
-   #warning  Need to implement some method to align data here
-   #define  CL_ALIGNED(_x)
-#endif
-
-/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-    /* .xyzw and .s0123...{f|F} are supported */
-    #define CL_HAS_NAMED_VECTOR_FIELDS 1
-    /* .hi and .lo are supported */
-    #define CL_HAS_HI_LO_VECTOR_FIELDS 1
-#endif
-
-/* Define cl_vector types */
-
-/* ---- cl_charn ---- */
-typedef union
-{
-    cl_char  CL_ALIGNED(2) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_char  x, y; };
-   __extension__ struct{ cl_char  s0, s1; };
-   __extension__ struct{ cl_char  lo, hi; };
-#endif
-#if defined( __CL_CHAR2__) 
-    __cl_char2     v2;
-#endif
-}cl_char2;
-
-typedef union
-{
-    cl_char  CL_ALIGNED(4) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_char  x, y, z, w; };
-   __extension__ struct{ cl_char  s0, s1, s2, s3; };
-   __extension__ struct{ cl_char2 lo, hi; };
-#endif
-#if defined( __CL_CHAR2__) 
-    __cl_char2     v2[2];
-#endif
-#if defined( __CL_CHAR4__) 
-    __cl_char4     v4;
-#endif
-}cl_char4;
-
-/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */
-typedef  cl_char4  cl_char3;
-
-typedef union
-{
-    cl_char   CL_ALIGNED(8) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_char  x, y, z, w; };
-   __extension__ struct{ cl_char  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_char4 lo, hi; };
-#endif
-#if defined( __CL_CHAR2__) 
-    __cl_char2     v2[4];
-#endif
-#if defined( __CL_CHAR4__) 
-    __cl_char4     v4[2];
-#endif
-#if defined( __CL_CHAR8__ )
-    __cl_char8     v8;
-#endif
-}cl_char8;
-
-typedef union
-{
-    cl_char  CL_ALIGNED(16) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_char  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_char  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_char8 lo, hi; };
-#endif
-#if defined( __CL_CHAR2__) 
-    __cl_char2     v2[8];
-#endif
-#if defined( __CL_CHAR4__) 
-    __cl_char4     v4[4];
-#endif
-#if defined( __CL_CHAR8__ )
-    __cl_char8     v8[2];
-#endif
-#if defined( __CL_CHAR16__ )
-    __cl_char16    v16;
-#endif
-}cl_char16;
-
-
-/* ---- cl_ucharn ---- */
-typedef union
-{
-    cl_uchar  CL_ALIGNED(2) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uchar  x, y; };
-   __extension__ struct{ cl_uchar  s0, s1; };
-   __extension__ struct{ cl_uchar  lo, hi; };
-#endif
-#if defined( __cl_uchar2__) 
-    __cl_uchar2     v2;
-#endif
-}cl_uchar2;
-
-typedef union
-{
-    cl_uchar  CL_ALIGNED(4) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uchar  x, y, z, w; };
-   __extension__ struct{ cl_uchar  s0, s1, s2, s3; };
-   __extension__ struct{ cl_uchar2 lo, hi; };
-#endif
-#if defined( __CL_UCHAR2__) 
-    __cl_uchar2     v2[2];
-#endif
-#if defined( __CL_UCHAR4__) 
-    __cl_uchar4     v4;
-#endif
-}cl_uchar4;
-
-/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */
-typedef  cl_uchar4  cl_uchar3;
-
-typedef union
-{
-    cl_uchar   CL_ALIGNED(8) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uchar  x, y, z, w; };
-   __extension__ struct{ cl_uchar  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_uchar4 lo, hi; };
-#endif
-#if defined( __CL_UCHAR2__) 
-    __cl_uchar2     v2[4];
-#endif
-#if defined( __CL_UCHAR4__) 
-    __cl_uchar4     v4[2];
-#endif
-#if defined( __CL_UCHAR8__ )
-    __cl_uchar8     v8;
-#endif
-}cl_uchar8;
-
-typedef union
-{
-    cl_uchar  CL_ALIGNED(16) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uchar  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_uchar  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_uchar8 lo, hi; };
-#endif
-#if defined( __CL_UCHAR2__) 
-    __cl_uchar2     v2[8];
-#endif
-#if defined( __CL_UCHAR4__) 
-    __cl_uchar4     v4[4];
-#endif
-#if defined( __CL_UCHAR8__ )
-    __cl_uchar8     v8[2];
-#endif
-#if defined( __CL_UCHAR16__ )
-    __cl_uchar16    v16;
-#endif
-}cl_uchar16;
-
-
-/* ---- cl_shortn ---- */
-typedef union
-{
-    cl_short  CL_ALIGNED(4) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_short  x, y; };
-   __extension__ struct{ cl_short  s0, s1; };
-   __extension__ struct{ cl_short  lo, hi; };
-#endif
-#if defined( __CL_SHORT2__) 
-    __cl_short2     v2;
-#endif
-}cl_short2;
-
-typedef union
-{
-    cl_short  CL_ALIGNED(8) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_short  x, y, z, w; };
-   __extension__ struct{ cl_short  s0, s1, s2, s3; };
-   __extension__ struct{ cl_short2 lo, hi; };
-#endif
-#if defined( __CL_SHORT2__) 
-    __cl_short2     v2[2];
-#endif
-#if defined( __CL_SHORT4__) 
-    __cl_short4     v4;
-#endif
-}cl_short4;
-
-/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */
-typedef  cl_short4  cl_short3;
-
-typedef union
-{
-    cl_short   CL_ALIGNED(16) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_short  x, y, z, w; };
-   __extension__ struct{ cl_short  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_short4 lo, hi; };
-#endif
-#if defined( __CL_SHORT2__) 
-    __cl_short2     v2[4];
-#endif
-#if defined( __CL_SHORT4__) 
-    __cl_short4     v4[2];
-#endif
-#if defined( __CL_SHORT8__ )
-    __cl_short8     v8;
-#endif
-}cl_short8;
-
-typedef union
-{
-    cl_short  CL_ALIGNED(32) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_short  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_short  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_short8 lo, hi; };
-#endif
-#if defined( __CL_SHORT2__) 
-    __cl_short2     v2[8];
-#endif
-#if defined( __CL_SHORT4__) 
-    __cl_short4     v4[4];
-#endif
-#if defined( __CL_SHORT8__ )
-    __cl_short8     v8[2];
-#endif
-#if defined( __CL_SHORT16__ )
-    __cl_short16    v16;
-#endif
-}cl_short16;
-
-
-/* ---- cl_ushortn ---- */
-typedef union
-{
-    cl_ushort  CL_ALIGNED(4) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ushort  x, y; };
-   __extension__ struct{ cl_ushort  s0, s1; };
-   __extension__ struct{ cl_ushort  lo, hi; };
-#endif
-#if defined( __CL_USHORT2__) 
-    __cl_ushort2     v2;
-#endif
-}cl_ushort2;
-
-typedef union
-{
-    cl_ushort  CL_ALIGNED(8) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ushort  x, y, z, w; };
-   __extension__ struct{ cl_ushort  s0, s1, s2, s3; };
-   __extension__ struct{ cl_ushort2 lo, hi; };
-#endif
-#if defined( __CL_USHORT2__) 
-    __cl_ushort2     v2[2];
-#endif
-#if defined( __CL_USHORT4__) 
-    __cl_ushort4     v4;
-#endif
-}cl_ushort4;
-
-/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */
-typedef  cl_ushort4  cl_ushort3;
-
-typedef union
-{
-    cl_ushort   CL_ALIGNED(16) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ushort  x, y, z, w; };
-   __extension__ struct{ cl_ushort  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_ushort4 lo, hi; };
-#endif
-#if defined( __CL_USHORT2__) 
-    __cl_ushort2     v2[4];
-#endif
-#if defined( __CL_USHORT4__) 
-    __cl_ushort4     v4[2];
-#endif
-#if defined( __CL_USHORT8__ )
-    __cl_ushort8     v8;
-#endif
-}cl_ushort8;
-
-typedef union
-{
-    cl_ushort  CL_ALIGNED(32) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ushort  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_ushort  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_ushort8 lo, hi; };
-#endif
-#if defined( __CL_USHORT2__) 
-    __cl_ushort2     v2[8];
-#endif
-#if defined( __CL_USHORT4__) 
-    __cl_ushort4     v4[4];
-#endif
-#if defined( __CL_USHORT8__ )
-    __cl_ushort8     v8[2];
-#endif
-#if defined( __CL_USHORT16__ )
-    __cl_ushort16    v16;
-#endif
-}cl_ushort16;
-
-/* ---- cl_intn ---- */
-typedef union
-{
-    cl_int  CL_ALIGNED(8) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_int  x, y; };
-   __extension__ struct{ cl_int  s0, s1; };
-   __extension__ struct{ cl_int  lo, hi; };
-#endif
-#if defined( __CL_INT2__) 
-    __cl_int2     v2;
-#endif
-}cl_int2;
-
-typedef union
-{
-    cl_int  CL_ALIGNED(16) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_int  x, y, z, w; };
-   __extension__ struct{ cl_int  s0, s1, s2, s3; };
-   __extension__ struct{ cl_int2 lo, hi; };
-#endif
-#if defined( __CL_INT2__) 
-    __cl_int2     v2[2];
-#endif
-#if defined( __CL_INT4__) 
-    __cl_int4     v4;
-#endif
-}cl_int4;
-
-/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */
-typedef  cl_int4  cl_int3;
-
-typedef union
-{
-    cl_int   CL_ALIGNED(32) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_int  x, y, z, w; };
-   __extension__ struct{ cl_int  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_int4 lo, hi; };
-#endif
-#if defined( __CL_INT2__) 
-    __cl_int2     v2[4];
-#endif
-#if defined( __CL_INT4__) 
-    __cl_int4     v4[2];
-#endif
-#if defined( __CL_INT8__ )
-    __cl_int8     v8;
-#endif
-}cl_int8;
-
-typedef union
-{
-    cl_int  CL_ALIGNED(64) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_int  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_int  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_int8 lo, hi; };
-#endif
-#if defined( __CL_INT2__) 
-    __cl_int2     v2[8];
-#endif
-#if defined( __CL_INT4__) 
-    __cl_int4     v4[4];
-#endif
-#if defined( __CL_INT8__ )
-    __cl_int8     v8[2];
-#endif
-#if defined( __CL_INT16__ )
-    __cl_int16    v16;
-#endif
-}cl_int16;
-
-
-/* ---- cl_uintn ---- */
-typedef union
-{
-    cl_uint  CL_ALIGNED(8) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uint  x, y; };
-   __extension__ struct{ cl_uint  s0, s1; };
-   __extension__ struct{ cl_uint  lo, hi; };
-#endif
-#if defined( __CL_UINT2__) 
-    __cl_uint2     v2;
-#endif
-}cl_uint2;
-
-typedef union
-{
-    cl_uint  CL_ALIGNED(16) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uint  x, y, z, w; };
-   __extension__ struct{ cl_uint  s0, s1, s2, s3; };
-   __extension__ struct{ cl_uint2 lo, hi; };
-#endif
-#if defined( __CL_UINT2__) 
-    __cl_uint2     v2[2];
-#endif
-#if defined( __CL_UINT4__) 
-    __cl_uint4     v4;
-#endif
-}cl_uint4;
-
-/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */
-typedef  cl_uint4  cl_uint3;
-
-typedef union
-{
-    cl_uint   CL_ALIGNED(32) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uint  x, y, z, w; };
-   __extension__ struct{ cl_uint  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_uint4 lo, hi; };
-#endif
-#if defined( __CL_UINT2__) 
-    __cl_uint2     v2[4];
-#endif
-#if defined( __CL_UINT4__) 
-    __cl_uint4     v4[2];
-#endif
-#if defined( __CL_UINT8__ )
-    __cl_uint8     v8;
-#endif
-}cl_uint8;
-
-typedef union
-{
-    cl_uint  CL_ALIGNED(64) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_uint  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_uint  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_uint8 lo, hi; };
-#endif
-#if defined( __CL_UINT2__) 
-    __cl_uint2     v2[8];
-#endif
-#if defined( __CL_UINT4__) 
-    __cl_uint4     v4[4];
-#endif
-#if defined( __CL_UINT8__ )
-    __cl_uint8     v8[2];
-#endif
-#if defined( __CL_UINT16__ )
-    __cl_uint16    v16;
-#endif
-}cl_uint16;
-
-/* ---- cl_longn ---- */
-typedef union
-{
-    cl_long  CL_ALIGNED(16) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_long  x, y; };
-   __extension__ struct{ cl_long  s0, s1; };
-   __extension__ struct{ cl_long  lo, hi; };
-#endif
-#if defined( __CL_LONG2__) 
-    __cl_long2     v2;
-#endif
-}cl_long2;
-
-typedef union
-{
-    cl_long  CL_ALIGNED(32) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_long  x, y, z, w; };
-   __extension__ struct{ cl_long  s0, s1, s2, s3; };
-   __extension__ struct{ cl_long2 lo, hi; };
-#endif
-#if defined( __CL_LONG2__) 
-    __cl_long2     v2[2];
-#endif
-#if defined( __CL_LONG4__) 
-    __cl_long4     v4;
-#endif
-}cl_long4;
-
-/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */
-typedef  cl_long4  cl_long3;
-
-typedef union
-{
-    cl_long   CL_ALIGNED(64) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_long  x, y, z, w; };
-   __extension__ struct{ cl_long  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_long4 lo, hi; };
-#endif
-#if defined( __CL_LONG2__) 
-    __cl_long2     v2[4];
-#endif
-#if defined( __CL_LONG4__) 
-    __cl_long4     v4[2];
-#endif
-#if defined( __CL_LONG8__ )
-    __cl_long8     v8;
-#endif
-}cl_long8;
-
-typedef union
-{
-    cl_long  CL_ALIGNED(128) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_long  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_long  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_long8 lo, hi; };
-#endif
-#if defined( __CL_LONG2__) 
-    __cl_long2     v2[8];
-#endif
-#if defined( __CL_LONG4__) 
-    __cl_long4     v4[4];
-#endif
-#if defined( __CL_LONG8__ )
-    __cl_long8     v8[2];
-#endif
-#if defined( __CL_LONG16__ )
-    __cl_long16    v16;
-#endif
-}cl_long16;
-
-
-/* ---- cl_ulongn ---- */
-typedef union
-{
-    cl_ulong  CL_ALIGNED(16) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ulong  x, y; };
-   __extension__ struct{ cl_ulong  s0, s1; };
-   __extension__ struct{ cl_ulong  lo, hi; };
-#endif
-#if defined( __CL_ULONG2__) 
-    __cl_ulong2     v2;
-#endif
-}cl_ulong2;
-
-typedef union
-{
-    cl_ulong  CL_ALIGNED(32) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ulong  x, y, z, w; };
-   __extension__ struct{ cl_ulong  s0, s1, s2, s3; };
-   __extension__ struct{ cl_ulong2 lo, hi; };
-#endif
-#if defined( __CL_ULONG2__) 
-    __cl_ulong2     v2[2];
-#endif
-#if defined( __CL_ULONG4__) 
-    __cl_ulong4     v4;
-#endif
-}cl_ulong4;
-
-/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */
-typedef  cl_ulong4  cl_ulong3;
-
-typedef union
-{
-    cl_ulong   CL_ALIGNED(64) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ulong  x, y, z, w; };
-   __extension__ struct{ cl_ulong  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_ulong4 lo, hi; };
-#endif
-#if defined( __CL_ULONG2__) 
-    __cl_ulong2     v2[4];
-#endif
-#if defined( __CL_ULONG4__) 
-    __cl_ulong4     v4[2];
-#endif
-#if defined( __CL_ULONG8__ )
-    __cl_ulong8     v8;
-#endif
-}cl_ulong8;
-
-typedef union
-{
-    cl_ulong  CL_ALIGNED(128) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_ulong  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_ulong  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_ulong8 lo, hi; };
-#endif
-#if defined( __CL_ULONG2__) 
-    __cl_ulong2     v2[8];
-#endif
-#if defined( __CL_ULONG4__) 
-    __cl_ulong4     v4[4];
-#endif
-#if defined( __CL_ULONG8__ )
-    __cl_ulong8     v8[2];
-#endif
-#if defined( __CL_ULONG16__ )
-    __cl_ulong16    v16;
-#endif
-}cl_ulong16;
-
-
-/* --- cl_floatn ---- */
-
-typedef union
-{
-    cl_float  CL_ALIGNED(8) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_float  x, y; };
-   __extension__ struct{ cl_float  s0, s1; };
-   __extension__ struct{ cl_float  lo, hi; };
-#endif
-#if defined( __CL_FLOAT2__) 
-    __cl_float2     v2;
-#endif
-}cl_float2;
-
-typedef union
-{
-    cl_float  CL_ALIGNED(16) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_float   x, y, z, w; };
-   __extension__ struct{ cl_float   s0, s1, s2, s3; };
-   __extension__ struct{ cl_float2  lo, hi; };
-#endif
-#if defined( __CL_FLOAT2__) 
-    __cl_float2     v2[2];
-#endif
-#if defined( __CL_FLOAT4__) 
-    __cl_float4     v4;
-#endif
-}cl_float4;
-
-/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */
-typedef  cl_float4  cl_float3;
-
-typedef union
-{
-    cl_float   CL_ALIGNED(32) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_float   x, y, z, w; };
-   __extension__ struct{ cl_float   s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_float4  lo, hi; };
-#endif
-#if defined( __CL_FLOAT2__) 
-    __cl_float2     v2[4];
-#endif
-#if defined( __CL_FLOAT4__) 
-    __cl_float4     v4[2];
-#endif
-#if defined( __CL_FLOAT8__ )
-    __cl_float8     v8;
-#endif
-}cl_float8;
-
-typedef union
-{
-    cl_float  CL_ALIGNED(64) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_float  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_float  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_float8 lo, hi; };
-#endif
-#if defined( __CL_FLOAT2__) 
-    __cl_float2     v2[8];
-#endif
-#if defined( __CL_FLOAT4__) 
-    __cl_float4     v4[4];
-#endif
-#if defined( __CL_FLOAT8__ )
-    __cl_float8     v8[2];
-#endif
-#if defined( __CL_FLOAT16__ )
-    __cl_float16    v16;
-#endif
-}cl_float16;
-
-/* --- cl_doublen ---- */
-
-typedef union
-{
-    cl_double  CL_ALIGNED(16) s[2];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_double  x, y; };
-   __extension__ struct{ cl_double s0, s1; };
-   __extension__ struct{ cl_double lo, hi; };
-#endif
-#if defined( __CL_DOUBLE2__) 
-    __cl_double2     v2;
-#endif
-}cl_double2;
-
-typedef union
-{
-    cl_double  CL_ALIGNED(32) s[4];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_double  x, y, z, w; };
-   __extension__ struct{ cl_double  s0, s1, s2, s3; };
-   __extension__ struct{ cl_double2 lo, hi; };
-#endif
-#if defined( __CL_DOUBLE2__) 
-    __cl_double2     v2[2];
-#endif
-#if defined( __CL_DOUBLE4__) 
-    __cl_double4     v4;
-#endif
-}cl_double4;
-
-/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */
-typedef  cl_double4  cl_double3;
-
-typedef union
-{
-    cl_double   CL_ALIGNED(64) s[8];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_double  x, y, z, w; };
-   __extension__ struct{ cl_double  s0, s1, s2, s3, s4, s5, s6, s7; };
-   __extension__ struct{ cl_double4 lo, hi; };
-#endif
-#if defined( __CL_DOUBLE2__) 
-    __cl_double2     v2[4];
-#endif
-#if defined( __CL_DOUBLE4__) 
-    __cl_double4     v4[2];
-#endif
-#if defined( __CL_DOUBLE8__ )
-    __cl_double8     v8;
-#endif
-}cl_double8;
-
-typedef union
-{
-    cl_double  CL_ALIGNED(128) s[16];
-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
-   __extension__ struct{ cl_double  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
-   __extension__ struct{ cl_double  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
-   __extension__ struct{ cl_double8 lo, hi; };
-#endif
-#if defined( __CL_DOUBLE2__) 
-    __cl_double2     v2[8];
-#endif
-#if defined( __CL_DOUBLE4__) 
-    __cl_double4     v4[4];
-#endif
-#if defined( __CL_DOUBLE8__ )
-    __cl_double8     v8[2];
-#endif
-#if defined( __CL_DOUBLE16__ )
-    __cl_double16    v16;
-#endif
-}cl_double16;
-
-/* Macro to facilitate debugging 
- * Usage:
- *   Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. 
- *   The first line ends with:   CL_PROGRAM_STRING_DEBUG_INFO \"
- *   Each line thereafter of OpenCL C source must end with: \n\
- *   The last line ends in ";
- *
- *   Example:
- *
- *   const char *my_program = CL_PROGRAM_STRING_DEBUG_INFO "\
- *   kernel void foo( int a, float * b )             \n\
- *   {                                               \n\
- *      // my comment                                \n\
- *      *b[ get_global_id(0)] = a;                   \n\
- *   }                                               \n\
- *   ";
- *
- * This should correctly set up the line, (column) and file information for your source 
- * string so you can do source level debugging.
- */
-#define  __CL_STRINGIFY( _x )               # _x
-#define  _CL_STRINGIFY( _x )                __CL_STRINGIFY( _x )
-#define  CL_PROGRAM_STRING_DEBUG_INFO       "#line "  _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n" 
-  
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __CL_PLATFORM_H  */
diff --git a/Externals/CLRun/include/clrun.h b/Externals/CLRun/include/clrun.h
deleted file mode 100644
index 859182e891..0000000000
--- a/Externals/CLRun/include/clrun.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __CLRUN_H
-#define __CLRUN_H
-
-/*#ifdef _WIN32
-#ifdef CLRUN_COMPILE
-#define EXPORTED __declspec(dllexport)
-#else
-#define EXPORTED __declspec(dllimport)
-#endif
-#else*/
-#define EXPORTED
-//#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-extern EXPORTED int clrInit();
-extern EXPORTED int clrHasOpenCL();
-	
-#ifdef __cplusplus
-};
-#endif
-
-#endif
diff --git a/Externals/GL/GL/gl.h b/Externals/GL/GL/gl.h
new file mode 100644
index 0000000000..5c2d2f9b56
--- /dev/null
+++ b/Externals/GL/GL/gl.h
@@ -0,0 +1,2199 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  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
+ * 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 SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __gl_h_
+#define __gl_h_
+
+#if defined(USE_MGL_NAMESPACE)
+#include "gl_mangle.h"
+#endif
+
+
+/**********************************************************************
+ * Begin system-specific stuff. Do not do any of this when building
+ * for SciTech SNAP, as this is all done before this header file is
+ * included. 
+ */
+#if !defined(__SCITECH_SNAP__)
+
+#if defined(__BEOS__)
+#include <stdlib.h>     /* to get some BeOS-isms */
+#endif
+
+#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
+#define OPENSTEP
+#endif
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+#  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
+#    define GLAPIENTRY 
+#  else
+#    define GLAPIENTRY __stdcall
+#  endif
+#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
+#  define GLAPI extern
+#  define GLAPIENTRY __stdcall
+#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#  define GLAPI __attribute__((visibility("default")))
+#  define GLAPIENTRY
+#endif /* WIN32 && !CYGWIN */
+
+#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
+#  define PRAGMA_EXPORT_SUPPORTED		1
+#endif
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import on
+#endif
+
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY GLAPIENTRY
+#endif
+
+/* "P" suffix to be used for a pointer to a function */
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#ifdef CENTERLINE_CLPP
+#define signed
+#endif
+
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export on
+#endif
+
+#endif /* !__SCITECH_SNAP__ */
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define GL_VERSION_1_1   1
+#define GL_VERSION_1_2   1
+#define GL_VERSION_1_3   1
+#define GL_ARB_imaging   1
+
+
+/*
+ * Datatypes
+ */
+typedef unsigned int	GLenum;
+typedef unsigned char	GLboolean;
+typedef unsigned int	GLbitfield;
+typedef void		GLvoid;
+typedef signed char	GLbyte;		/* 1-byte signed */
+typedef short		GLshort;	/* 2-byte signed */
+typedef int		GLint;		/* 4-byte signed */
+typedef unsigned char	GLubyte;	/* 1-byte unsigned */
+typedef unsigned short	GLushort;	/* 2-byte unsigned */
+typedef unsigned int	GLuint;		/* 4-byte unsigned */
+typedef int		GLsizei;	/* 4-byte signed */
+typedef float		GLfloat;	/* single precision float */
+typedef float		GLclampf;	/* single precision float in [0,1] */
+typedef double		GLdouble;	/* double precision float */
+typedef double		GLclampd;	/* double precision float in [0,1] */
+
+
+
+/*
+ * Constants
+ */
+
+/* Boolean values */
+#define GL_FALSE				0
+#define GL_TRUE					1
+
+/* Data types */
+#define GL_BYTE					0x1400
+#define GL_UNSIGNED_BYTE			0x1401
+#define GL_SHORT				0x1402
+#define GL_UNSIGNED_SHORT			0x1403
+#define GL_INT					0x1404
+#define GL_UNSIGNED_INT				0x1405
+#define GL_FLOAT				0x1406
+#define GL_2_BYTES				0x1407
+#define GL_3_BYTES				0x1408
+#define GL_4_BYTES				0x1409
+#define GL_DOUBLE				0x140A
+
+/* Primitives */
+#define GL_POINTS				0x0000
+#define GL_LINES				0x0001
+#define GL_LINE_LOOP				0x0002
+#define GL_LINE_STRIP				0x0003
+#define GL_TRIANGLES				0x0004
+#define GL_TRIANGLE_STRIP			0x0005
+#define GL_TRIANGLE_FAN				0x0006
+#define GL_QUADS				0x0007
+#define GL_QUAD_STRIP				0x0008
+#define GL_POLYGON				0x0009
+
+/* Vertex Arrays */
+#define GL_VERTEX_ARRAY				0x8074
+#define GL_NORMAL_ARRAY				0x8075
+#define GL_COLOR_ARRAY				0x8076
+#define GL_INDEX_ARRAY				0x8077
+#define GL_TEXTURE_COORD_ARRAY			0x8078
+#define GL_EDGE_FLAG_ARRAY			0x8079
+#define GL_VERTEX_ARRAY_SIZE			0x807A
+#define GL_VERTEX_ARRAY_TYPE			0x807B
+#define GL_VERTEX_ARRAY_STRIDE			0x807C
+#define GL_NORMAL_ARRAY_TYPE			0x807E
+#define GL_NORMAL_ARRAY_STRIDE			0x807F
+#define GL_COLOR_ARRAY_SIZE			0x8081
+#define GL_COLOR_ARRAY_TYPE			0x8082
+#define GL_COLOR_ARRAY_STRIDE			0x8083
+#define GL_INDEX_ARRAY_TYPE			0x8085
+#define GL_INDEX_ARRAY_STRIDE			0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE		0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE		0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE		0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE		0x808C
+#define GL_VERTEX_ARRAY_POINTER			0x808E
+#define GL_NORMAL_ARRAY_POINTER			0x808F
+#define GL_COLOR_ARRAY_POINTER			0x8090
+#define GL_INDEX_ARRAY_POINTER			0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER		0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER		0x8093
+#define GL_V2F					0x2A20
+#define GL_V3F					0x2A21
+#define GL_C4UB_V2F				0x2A22
+#define GL_C4UB_V3F				0x2A23
+#define GL_C3F_V3F				0x2A24
+#define GL_N3F_V3F				0x2A25
+#define GL_C4F_N3F_V3F				0x2A26
+#define GL_T2F_V3F				0x2A27
+#define GL_T4F_V4F				0x2A28
+#define GL_T2F_C4UB_V3F				0x2A29
+#define GL_T2F_C3F_V3F				0x2A2A
+#define GL_T2F_N3F_V3F				0x2A2B
+#define GL_T2F_C4F_N3F_V3F			0x2A2C
+#define GL_T4F_C4F_N3F_V4F			0x2A2D
+
+/* Matrix Mode */
+#define GL_MATRIX_MODE				0x0BA0
+#define GL_MODELVIEW				0x1700
+#define GL_PROJECTION				0x1701
+#define GL_TEXTURE				0x1702
+
+/* Points */
+#define GL_POINT_SMOOTH				0x0B10
+#define GL_POINT_SIZE				0x0B11
+#define GL_POINT_SIZE_GRANULARITY 		0x0B13
+#define GL_POINT_SIZE_RANGE			0x0B12
+
+/* Lines */
+#define GL_LINE_SMOOTH				0x0B20
+#define GL_LINE_STIPPLE				0x0B24
+#define GL_LINE_STIPPLE_PATTERN			0x0B25
+#define GL_LINE_STIPPLE_REPEAT			0x0B26
+#define GL_LINE_WIDTH				0x0B21
+#define GL_LINE_WIDTH_GRANULARITY		0x0B23
+#define GL_LINE_WIDTH_RANGE			0x0B22
+
+/* Polygons */
+#define GL_POINT				0x1B00
+#define GL_LINE					0x1B01
+#define GL_FILL					0x1B02
+#define GL_CW					0x0900
+#define GL_CCW					0x0901
+#define GL_FRONT				0x0404
+#define GL_BACK					0x0405
+#define GL_POLYGON_MODE				0x0B40
+#define GL_POLYGON_SMOOTH			0x0B41
+#define GL_POLYGON_STIPPLE			0x0B42
+#define GL_EDGE_FLAG				0x0B43
+#define GL_CULL_FACE				0x0B44
+#define GL_CULL_FACE_MODE			0x0B45
+#define GL_FRONT_FACE				0x0B46
+#define GL_POLYGON_OFFSET_FACTOR		0x8038
+#define GL_POLYGON_OFFSET_UNITS			0x2A00
+#define GL_POLYGON_OFFSET_POINT			0x2A01
+#define GL_POLYGON_OFFSET_LINE			0x2A02
+#define GL_POLYGON_OFFSET_FILL			0x8037
+
+/* Display Lists */
+#define GL_COMPILE				0x1300
+#define GL_COMPILE_AND_EXECUTE			0x1301
+#define GL_LIST_BASE				0x0B32
+#define GL_LIST_INDEX				0x0B33
+#define GL_LIST_MODE				0x0B30
+
+/* Depth buffer */
+#define GL_NEVER				0x0200
+#define GL_LESS					0x0201
+#define GL_EQUAL				0x0202
+#define GL_LEQUAL				0x0203
+#define GL_GREATER				0x0204
+#define GL_NOTEQUAL				0x0205
+#define GL_GEQUAL				0x0206
+#define GL_ALWAYS				0x0207
+#define GL_DEPTH_TEST				0x0B71
+#define GL_DEPTH_BITS				0x0D56
+#define GL_DEPTH_CLEAR_VALUE			0x0B73
+#define GL_DEPTH_FUNC				0x0B74
+#define GL_DEPTH_RANGE				0x0B70
+#define GL_DEPTH_WRITEMASK			0x0B72
+#define GL_DEPTH_COMPONENT			0x1902
+
+/* Lighting */
+#define GL_LIGHTING				0x0B50
+#define GL_LIGHT0				0x4000
+#define GL_LIGHT1				0x4001
+#define GL_LIGHT2				0x4002
+#define GL_LIGHT3				0x4003
+#define GL_LIGHT4				0x4004
+#define GL_LIGHT5				0x4005
+#define GL_LIGHT6				0x4006
+#define GL_LIGHT7				0x4007
+#define GL_SPOT_EXPONENT			0x1205
+#define GL_SPOT_CUTOFF				0x1206
+#define GL_CONSTANT_ATTENUATION			0x1207
+#define GL_LINEAR_ATTENUATION			0x1208
+#define GL_QUADRATIC_ATTENUATION		0x1209
+#define GL_AMBIENT				0x1200
+#define GL_DIFFUSE				0x1201
+#define GL_SPECULAR				0x1202
+#define GL_SHININESS				0x1601
+#define GL_EMISSION				0x1600
+#define GL_POSITION				0x1203
+#define GL_SPOT_DIRECTION			0x1204
+#define GL_AMBIENT_AND_DIFFUSE			0x1602
+#define GL_COLOR_INDEXES			0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE			0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER		0x0B51
+#define GL_LIGHT_MODEL_AMBIENT			0x0B53
+#define GL_FRONT_AND_BACK			0x0408
+#define GL_SHADE_MODEL				0x0B54
+#define GL_FLAT					0x1D00
+#define GL_SMOOTH				0x1D01
+#define GL_COLOR_MATERIAL			0x0B57
+#define GL_COLOR_MATERIAL_FACE			0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER		0x0B56
+#define GL_NORMALIZE				0x0BA1
+
+/* User clipping planes */
+#define GL_CLIP_PLANE0				0x3000
+#define GL_CLIP_PLANE1				0x3001
+#define GL_CLIP_PLANE2				0x3002
+#define GL_CLIP_PLANE3				0x3003
+#define GL_CLIP_PLANE4				0x3004
+#define GL_CLIP_PLANE5				0x3005
+
+/* Accumulation buffer */
+#define GL_ACCUM_RED_BITS			0x0D58
+#define GL_ACCUM_GREEN_BITS			0x0D59
+#define GL_ACCUM_BLUE_BITS			0x0D5A
+#define GL_ACCUM_ALPHA_BITS			0x0D5B
+#define GL_ACCUM_CLEAR_VALUE			0x0B80
+#define GL_ACCUM				0x0100
+#define GL_ADD					0x0104
+#define GL_LOAD					0x0101
+#define GL_MULT					0x0103
+#define GL_RETURN				0x0102
+
+/* Alpha testing */
+#define GL_ALPHA_TEST				0x0BC0
+#define GL_ALPHA_TEST_REF			0x0BC2
+#define GL_ALPHA_TEST_FUNC			0x0BC1
+
+/* Blending */
+#define GL_BLEND				0x0BE2
+#define GL_BLEND_SRC				0x0BE1
+#define GL_BLEND_DST				0x0BE0
+#define GL_ZERO					0
+#define GL_ONE					1
+#define GL_SRC_COLOR				0x0300
+#define GL_ONE_MINUS_SRC_COLOR			0x0301
+#define GL_SRC_ALPHA				0x0302
+#define GL_ONE_MINUS_SRC_ALPHA			0x0303
+#define GL_DST_ALPHA				0x0304
+#define GL_ONE_MINUS_DST_ALPHA			0x0305
+#define GL_DST_COLOR				0x0306
+#define GL_ONE_MINUS_DST_COLOR			0x0307
+#define GL_SRC_ALPHA_SATURATE			0x0308
+
+/* Render Mode */
+#define GL_FEEDBACK				0x1C01
+#define GL_RENDER				0x1C00
+#define GL_SELECT				0x1C02
+
+/* Feedback */
+#define GL_2D					0x0600
+#define GL_3D					0x0601
+#define GL_3D_COLOR				0x0602
+#define GL_3D_COLOR_TEXTURE			0x0603
+#define GL_4D_COLOR_TEXTURE			0x0604
+#define GL_POINT_TOKEN				0x0701
+#define GL_LINE_TOKEN				0x0702
+#define GL_LINE_RESET_TOKEN			0x0707
+#define GL_POLYGON_TOKEN			0x0703
+#define GL_BITMAP_TOKEN				0x0704
+#define GL_DRAW_PIXEL_TOKEN			0x0705
+#define GL_COPY_PIXEL_TOKEN			0x0706
+#define GL_PASS_THROUGH_TOKEN			0x0700
+#define GL_FEEDBACK_BUFFER_POINTER		0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE			0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE			0x0DF2
+
+/* Selection */
+#define GL_SELECTION_BUFFER_POINTER		0x0DF3
+#define GL_SELECTION_BUFFER_SIZE		0x0DF4
+
+/* Fog */
+#define GL_FOG					0x0B60
+#define GL_FOG_MODE				0x0B65
+#define GL_FOG_DENSITY				0x0B62
+#define GL_FOG_COLOR				0x0B66
+#define GL_FOG_INDEX				0x0B61
+#define GL_FOG_START				0x0B63
+#define GL_FOG_END				0x0B64
+#define GL_LINEAR				0x2601
+#define GL_EXP					0x0800
+#define GL_EXP2					0x0801
+
+/* Logic Ops */
+#define GL_LOGIC_OP				0x0BF1
+#define GL_INDEX_LOGIC_OP			0x0BF1
+#define GL_COLOR_LOGIC_OP			0x0BF2
+#define GL_LOGIC_OP_MODE			0x0BF0
+#define GL_CLEAR				0x1500
+#define GL_SET					0x150F
+#define GL_COPY					0x1503
+#define GL_COPY_INVERTED			0x150C
+#define GL_NOOP					0x1505
+#define GL_INVERT				0x150A
+#define GL_AND					0x1501
+#define GL_NAND					0x150E
+#define GL_OR					0x1507
+#define GL_NOR					0x1508
+#define GL_XOR					0x1506
+#define GL_EQUIV				0x1509
+#define GL_AND_REVERSE				0x1502
+#define GL_AND_INVERTED				0x1504
+#define GL_OR_REVERSE				0x150B
+#define GL_OR_INVERTED				0x150D
+
+/* Stencil */
+#define GL_STENCIL_BITS				0x0D57
+#define GL_STENCIL_TEST				0x0B90
+#define GL_STENCIL_CLEAR_VALUE			0x0B91
+#define GL_STENCIL_FUNC				0x0B92
+#define GL_STENCIL_VALUE_MASK			0x0B93
+#define GL_STENCIL_FAIL				0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL		0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
+#define GL_STENCIL_REF				0x0B97
+#define GL_STENCIL_WRITEMASK			0x0B98
+#define GL_STENCIL_INDEX			0x1901
+#define GL_KEEP					0x1E00
+#define GL_REPLACE				0x1E01
+#define GL_INCR					0x1E02
+#define GL_DECR					0x1E03
+
+/* Buffers, Pixel Drawing/Reading */
+#define GL_NONE					0
+#define GL_LEFT					0x0406
+#define GL_RIGHT				0x0407
+/*GL_FRONT					0x0404 */
+/*GL_BACK					0x0405 */
+/*GL_FRONT_AND_BACK				0x0408 */
+#define GL_FRONT_LEFT				0x0400
+#define GL_FRONT_RIGHT				0x0401
+#define GL_BACK_LEFT				0x0402
+#define GL_BACK_RIGHT				0x0403
+#define GL_AUX0					0x0409
+#define GL_AUX1					0x040A
+#define GL_AUX2					0x040B
+#define GL_AUX3					0x040C
+#define GL_COLOR_INDEX				0x1900
+#define GL_RED					0x1903
+#define GL_GREEN				0x1904
+#define GL_BLUE					0x1905
+#define GL_ALPHA				0x1906
+#define GL_LUMINANCE				0x1909
+#define GL_LUMINANCE_ALPHA			0x190A
+#define GL_ALPHA_BITS				0x0D55
+#define GL_RED_BITS				0x0D52
+#define GL_GREEN_BITS				0x0D53
+#define GL_BLUE_BITS				0x0D54
+#define GL_INDEX_BITS				0x0D51
+#define GL_SUBPIXEL_BITS			0x0D50
+#define GL_AUX_BUFFERS				0x0C00
+#define GL_READ_BUFFER				0x0C02
+#define GL_DRAW_BUFFER				0x0C01
+#define GL_DOUBLEBUFFER				0x0C32
+#define GL_STEREO				0x0C33
+#define GL_BITMAP				0x1A00
+#define GL_COLOR				0x1800
+#define GL_DEPTH				0x1801
+#define GL_STENCIL				0x1802
+#define GL_DITHER				0x0BD0
+#define GL_RGB					0x1907
+#define GL_RGBA					0x1908
+
+/* Implementation limits */
+#define GL_MAX_LIST_NESTING			0x0B31
+#define GL_MAX_EVAL_ORDER			0x0D30
+#define GL_MAX_LIGHTS				0x0D31
+#define GL_MAX_CLIP_PLANES			0x0D32
+#define GL_MAX_TEXTURE_SIZE			0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE			0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
+#define GL_MAX_NAME_STACK_DEPTH			0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
+#define GL_MAX_VIEWPORT_DIMS			0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH	0x0D3B
+
+/* Gets */
+#define GL_ATTRIB_STACK_DEPTH			0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH		0x0BB1
+#define GL_COLOR_CLEAR_VALUE			0x0C22
+#define GL_COLOR_WRITEMASK			0x0C23
+#define GL_CURRENT_INDEX			0x0B01
+#define GL_CURRENT_COLOR			0x0B00
+#define GL_CURRENT_NORMAL			0x0B02
+#define GL_CURRENT_RASTER_COLOR			0x0B04
+#define GL_CURRENT_RASTER_DISTANCE		0x0B09
+#define GL_CURRENT_RASTER_INDEX			0x0B05
+#define GL_CURRENT_RASTER_POSITION		0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS	0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID	0x0B08
+#define GL_CURRENT_TEXTURE_COORDS		0x0B03
+#define GL_INDEX_CLEAR_VALUE			0x0C20
+#define GL_INDEX_MODE				0x0C30
+#define GL_INDEX_WRITEMASK			0x0C21
+#define GL_MODELVIEW_MATRIX			0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH		0x0BA3
+#define GL_NAME_STACK_DEPTH			0x0D70
+#define GL_PROJECTION_MATRIX			0x0BA7
+#define GL_PROJECTION_STACK_DEPTH		0x0BA4
+#define GL_RENDER_MODE				0x0C40
+#define GL_RGBA_MODE				0x0C31
+#define GL_TEXTURE_MATRIX			0x0BA8
+#define GL_TEXTURE_STACK_DEPTH			0x0BA5
+#define GL_VIEWPORT				0x0BA2
+
+/* Evaluators */
+#define GL_AUTO_NORMAL				0x0D80
+#define GL_MAP1_COLOR_4				0x0D90
+#define GL_MAP1_INDEX				0x0D91
+#define GL_MAP1_NORMAL				0x0D92
+#define GL_MAP1_TEXTURE_COORD_1			0x0D93
+#define GL_MAP1_TEXTURE_COORD_2			0x0D94
+#define GL_MAP1_TEXTURE_COORD_3			0x0D95
+#define GL_MAP1_TEXTURE_COORD_4			0x0D96
+#define GL_MAP1_VERTEX_3			0x0D97
+#define GL_MAP1_VERTEX_4			0x0D98
+#define GL_MAP2_COLOR_4				0x0DB0
+#define GL_MAP2_INDEX				0x0DB1
+#define GL_MAP2_NORMAL				0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1			0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2			0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3			0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4			0x0DB6
+#define GL_MAP2_VERTEX_3			0x0DB7
+#define GL_MAP2_VERTEX_4			0x0DB8
+#define GL_MAP1_GRID_DOMAIN			0x0DD0
+#define GL_MAP1_GRID_SEGMENTS			0x0DD1
+#define GL_MAP2_GRID_DOMAIN			0x0DD2
+#define GL_MAP2_GRID_SEGMENTS			0x0DD3
+#define GL_COEFF				0x0A00
+#define GL_ORDER				0x0A01
+#define GL_DOMAIN				0x0A02
+
+/* Hints */
+#define GL_PERSPECTIVE_CORRECTION_HINT		0x0C50
+#define GL_POINT_SMOOTH_HINT			0x0C51
+#define GL_LINE_SMOOTH_HINT			0x0C52
+#define GL_POLYGON_SMOOTH_HINT			0x0C53
+#define GL_FOG_HINT				0x0C54
+#define GL_DONT_CARE				0x1100
+#define GL_FASTEST				0x1101
+#define GL_NICEST				0x1102
+
+/* Scissor box */
+#define GL_SCISSOR_BOX				0x0C10
+#define GL_SCISSOR_TEST				0x0C11
+
+/* Pixel Mode / Transfer */
+#define GL_MAP_COLOR				0x0D10
+#define GL_MAP_STENCIL				0x0D11
+#define GL_INDEX_SHIFT				0x0D12
+#define GL_INDEX_OFFSET				0x0D13
+#define GL_RED_SCALE				0x0D14
+#define GL_RED_BIAS				0x0D15
+#define GL_GREEN_SCALE				0x0D18
+#define GL_GREEN_BIAS				0x0D19
+#define GL_BLUE_SCALE				0x0D1A
+#define GL_BLUE_BIAS				0x0D1B
+#define GL_ALPHA_SCALE				0x0D1C
+#define GL_ALPHA_BIAS				0x0D1D
+#define GL_DEPTH_SCALE				0x0D1E
+#define GL_DEPTH_BIAS				0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE		0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE		0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE		0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE		0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE		0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE		0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE		0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE		0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE		0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE		0x0CB9
+#define GL_PIXEL_MAP_S_TO_S			0x0C71
+#define GL_PIXEL_MAP_I_TO_I			0x0C70
+#define GL_PIXEL_MAP_I_TO_R			0x0C72
+#define GL_PIXEL_MAP_I_TO_G			0x0C73
+#define GL_PIXEL_MAP_I_TO_B			0x0C74
+#define GL_PIXEL_MAP_I_TO_A			0x0C75
+#define GL_PIXEL_MAP_R_TO_R			0x0C76
+#define GL_PIXEL_MAP_G_TO_G			0x0C77
+#define GL_PIXEL_MAP_B_TO_B			0x0C78
+#define GL_PIXEL_MAP_A_TO_A			0x0C79
+#define GL_PACK_ALIGNMENT			0x0D05
+#define GL_PACK_LSB_FIRST			0x0D01
+#define GL_PACK_ROW_LENGTH			0x0D02
+#define GL_PACK_SKIP_PIXELS			0x0D04
+#define GL_PACK_SKIP_ROWS			0x0D03
+#define GL_PACK_SWAP_BYTES			0x0D00
+#define GL_UNPACK_ALIGNMENT			0x0CF5
+#define GL_UNPACK_LSB_FIRST			0x0CF1
+#define GL_UNPACK_ROW_LENGTH			0x0CF2
+#define GL_UNPACK_SKIP_PIXELS			0x0CF4
+#define GL_UNPACK_SKIP_ROWS			0x0CF3
+#define GL_UNPACK_SWAP_BYTES			0x0CF0
+#define GL_ZOOM_X				0x0D16
+#define GL_ZOOM_Y				0x0D17
+
+/* Texture mapping */
+#define GL_TEXTURE_ENV				0x2300
+#define GL_TEXTURE_ENV_MODE			0x2200
+#define GL_TEXTURE_1D				0x0DE0
+#define GL_TEXTURE_2D				0x0DE1
+#define GL_TEXTURE_WRAP_S			0x2802
+#define GL_TEXTURE_WRAP_T			0x2803
+#define GL_TEXTURE_MAG_FILTER			0x2800
+#define GL_TEXTURE_MIN_FILTER			0x2801
+#define GL_TEXTURE_ENV_COLOR			0x2201
+#define GL_TEXTURE_GEN_S			0x0C60
+#define GL_TEXTURE_GEN_T			0x0C61
+#define GL_TEXTURE_GEN_R			0x0C62
+#define GL_TEXTURE_GEN_Q			0x0C63
+#define GL_TEXTURE_GEN_MODE			0x2500
+#define GL_TEXTURE_BORDER_COLOR			0x1004
+#define GL_TEXTURE_WIDTH			0x1000
+#define GL_TEXTURE_HEIGHT			0x1001
+#define GL_TEXTURE_BORDER			0x1005
+#define GL_TEXTURE_COMPONENTS			0x1003
+#define GL_TEXTURE_RED_SIZE			0x805C
+#define GL_TEXTURE_GREEN_SIZE			0x805D
+#define GL_TEXTURE_BLUE_SIZE			0x805E
+#define GL_TEXTURE_ALPHA_SIZE			0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE		0x8060
+#define GL_TEXTURE_INTENSITY_SIZE		0x8061
+#define GL_NEAREST_MIPMAP_NEAREST		0x2700
+#define GL_NEAREST_MIPMAP_LINEAR		0x2702
+#define GL_LINEAR_MIPMAP_NEAREST		0x2701
+#define GL_LINEAR_MIPMAP_LINEAR			0x2703
+#define GL_OBJECT_LINEAR			0x2401
+#define GL_OBJECT_PLANE				0x2501
+#define GL_EYE_LINEAR				0x2400
+#define GL_EYE_PLANE				0x2502
+#define GL_SPHERE_MAP				0x2402
+#define GL_DECAL				0x2101
+#define GL_MODULATE				0x2100
+#define GL_NEAREST				0x2600
+#define GL_REPEAT				0x2901
+#define GL_CLAMP				0x2900
+#define GL_S					0x2000
+#define GL_T					0x2001
+#define GL_R					0x2002
+#define GL_Q					0x2003
+
+/* Utility */
+#define GL_VENDOR				0x1F00
+#define GL_RENDERER				0x1F01
+#define GL_VERSION				0x1F02
+#define GL_EXTENSIONS				0x1F03
+
+/* Errors */
+#define GL_NO_ERROR 				0
+#define GL_INVALID_ENUM				0x0500
+#define GL_INVALID_VALUE			0x0501
+#define GL_INVALID_OPERATION			0x0502
+#define GL_STACK_OVERFLOW			0x0503
+#define GL_STACK_UNDERFLOW			0x0504
+#define GL_OUT_OF_MEMORY			0x0505
+
+/* glPush/PopAttrib bits */
+#define GL_CURRENT_BIT				0x00000001
+#define GL_POINT_BIT				0x00000002
+#define GL_LINE_BIT				0x00000004
+#define GL_POLYGON_BIT				0x00000008
+#define GL_POLYGON_STIPPLE_BIT			0x00000010
+#define GL_PIXEL_MODE_BIT			0x00000020
+#define GL_LIGHTING_BIT				0x00000040
+#define GL_FOG_BIT				0x00000080
+#define GL_DEPTH_BUFFER_BIT			0x00000100
+#define GL_ACCUM_BUFFER_BIT			0x00000200
+#define GL_STENCIL_BUFFER_BIT			0x00000400
+#define GL_VIEWPORT_BIT				0x00000800
+#define GL_TRANSFORM_BIT			0x00001000
+#define GL_ENABLE_BIT				0x00002000
+#define GL_COLOR_BUFFER_BIT			0x00004000
+#define GL_HINT_BIT				0x00008000
+#define GL_EVAL_BIT				0x00010000
+#define GL_LIST_BIT				0x00020000
+#define GL_TEXTURE_BIT				0x00040000
+#define GL_SCISSOR_BIT				0x00080000
+#define GL_ALL_ATTRIB_BITS			0x000FFFFF
+
+
+/* OpenGL 1.1 */
+#define GL_PROXY_TEXTURE_1D			0x8063
+#define GL_PROXY_TEXTURE_2D			0x8064
+#define GL_TEXTURE_PRIORITY			0x8066
+#define GL_TEXTURE_RESIDENT			0x8067
+#define GL_TEXTURE_BINDING_1D			0x8068
+#define GL_TEXTURE_BINDING_2D			0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT		0x1003
+#define GL_ALPHA4				0x803B
+#define GL_ALPHA8				0x803C
+#define GL_ALPHA12				0x803D
+#define GL_ALPHA16				0x803E
+#define GL_LUMINANCE4				0x803F
+#define GL_LUMINANCE8				0x8040
+#define GL_LUMINANCE12				0x8041
+#define GL_LUMINANCE16				0x8042
+#define GL_LUMINANCE4_ALPHA4			0x8043
+#define GL_LUMINANCE6_ALPHA2			0x8044
+#define GL_LUMINANCE8_ALPHA8			0x8045
+#define GL_LUMINANCE12_ALPHA4			0x8046
+#define GL_LUMINANCE12_ALPHA12			0x8047
+#define GL_LUMINANCE16_ALPHA16			0x8048
+#define GL_INTENSITY				0x8049
+#define GL_INTENSITY4				0x804A
+#define GL_INTENSITY8				0x804B
+#define GL_INTENSITY12				0x804C
+#define GL_INTENSITY16				0x804D
+#define GL_R3_G3_B2				0x2A10
+#define GL_RGB4					0x804F
+#define GL_RGB5					0x8050
+#define GL_RGB8					0x8051
+#define GL_RGB10				0x8052
+#define GL_RGB12				0x8053
+#define GL_RGB16				0x8054
+#define GL_RGBA2				0x8055
+#define GL_RGBA4				0x8056
+#define GL_RGB5_A1				0x8057
+#define GL_RGBA8				0x8058
+#define GL_RGB10_A2				0x8059
+#define GL_RGBA12				0x805A
+#define GL_RGBA16				0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT		0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT		0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 		0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 		0xFFFFFFFF
+
+#ifdef GL_GLEXT_PROTOTYPES
+
+/*
+ * Miscellaneous
+ */
+
+GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
+
+GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glClear( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
+
+GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
+
+GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
+
+GLAPI void GLAPIENTRY glCullFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glPointSize( GLfloat size );
+
+GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
+
+GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
+
+GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
+
+GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
+
+GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
+
+GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
+
+GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
+
+GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
+
+GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
+
+GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
+
+GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
+
+GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnable( GLenum cap );
+
+GLAPI void GLAPIENTRY glDisable( GLenum cap );
+
+GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
+
+
+GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
+
+
+GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
+
+GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
+
+GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glPopAttrib( void );
+
+
+GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
+
+
+GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
+
+GLAPI GLenum GLAPIENTRY glGetError( void );
+
+GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
+
+GLAPI void GLAPIENTRY glFinish( void );
+
+GLAPI void GLAPIENTRY glFlush( void );
+
+GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
+
+GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
+
+GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
+
+GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
+
+GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+GLAPI void GLAPIENTRY glPushMatrix( void );
+
+GLAPI void GLAPIENTRY glPopMatrix( void );
+
+GLAPI void GLAPIENTRY glLoadIdentity( void );
+
+GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glRotated( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
+
+GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
+
+GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
+
+GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
+
+GLAPI void GLAPIENTRY glEndList( void );
+
+GLAPI void GLAPIENTRY glCallList( GLuint list );
+
+GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+GLAPI void GLAPIENTRY glListBase( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+GLAPI void GLAPIENTRY glBegin( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnd( void );
+
+
+GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
+GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
+GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
+
+GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
+GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glIndexd( GLdouble c );
+GLAPI void GLAPIENTRY glIndexf( GLfloat c );
+GLAPI void GLAPIENTRY glIndexi( GLint c );
+GLAPI void GLAPIENTRY glIndexs( GLshort c );
+GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
+GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
+GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
+GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
+GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
+GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
+GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
+GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
+GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
+GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
+GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
+GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
+
+GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
+
+GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
+
+
+GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
+GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
+GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
+GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
+
+GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
+GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
+GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
+GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
+GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
+GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
+GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
+GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
+GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
+GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
+GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
+
+GLAPI void GLAPIENTRY glArrayElement( GLint i );
+
+GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
+
+GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
+
+GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
+                                    GLfloat *params );
+GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
+                                    GLint *params );
+
+GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
+GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
+GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
+
+GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+GLAPI void GLAPIENTRY glClearStencil( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
+GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
+                                           GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
+                                           GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
+
+GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
+
+GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
+
+GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
+
+
+GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+GLAPI void GLAPIENTRY glMap2d( GLenum target,
+		     GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+		     GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+		     const GLdouble *points );
+GLAPI void GLAPIENTRY glMap2f( GLenum target,
+		     GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+		     GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+		     const GLfloat *points );
+
+GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
+GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
+GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
+
+GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
+GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
+
+GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
+GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
+
+GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
+
+GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
+
+GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
+
+GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
+
+GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
+
+GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
+
+GLAPI void GLAPIENTRY glInitNames( void );
+
+GLAPI void GLAPIENTRY glLoadName( GLuint name );
+
+GLAPI void GLAPIENTRY glPushName( GLuint name );
+
+GLAPI void GLAPIENTRY glPopName( void );
+
+#endif
+
+
+/*
+ * OpenGL 1.2
+ */
+
+#define GL_RESCALE_NORMAL			0x803A
+#define GL_CLAMP_TO_EDGE			0x812F
+#define GL_MAX_ELEMENTS_VERTICES		0x80E8
+#define GL_MAX_ELEMENTS_INDICES			0x80E9
+#define GL_BGR					0x80E0
+#define GL_BGRA					0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2			0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV		0x8362
+#define GL_UNSIGNED_SHORT_5_6_5			0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV		0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4		0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV		0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1		0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV		0x8366
+#define GL_UNSIGNED_INT_8_8_8_8			0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV		0x8367
+#define GL_UNSIGNED_INT_10_10_10_2		0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV		0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL		0x81F8
+#define GL_SINGLE_COLOR				0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR		0x81FA
+#define GL_TEXTURE_MIN_LOD			0x813A
+#define GL_TEXTURE_MAX_LOD			0x813B
+#define GL_TEXTURE_BASE_LEVEL			0x813C
+#define GL_TEXTURE_MAX_LEVEL			0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE		0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY	0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE		0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY	0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE		0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE		0x846E
+#define GL_PACK_SKIP_IMAGES			0x806B
+#define GL_PACK_IMAGE_HEIGHT			0x806C
+#define GL_UNPACK_SKIP_IMAGES			0x806D
+#define GL_UNPACK_IMAGE_HEIGHT			0x806E
+#define GL_TEXTURE_3D				0x806F
+#define GL_PROXY_TEXTURE_3D			0x8070
+#define GL_TEXTURE_DEPTH			0x8071
+#define GL_TEXTURE_WRAP_R			0x8072
+#define GL_MAX_3D_TEXTURE_SIZE			0x8073
+#define GL_TEXTURE_BINDING_3D			0x806A
+
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+#endif
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+/*
+ * GL_ARB_imaging
+ */
+
+#define GL_CONSTANT_COLOR			0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR		0x8002
+#define GL_CONSTANT_ALPHA			0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA		0x8004
+#define GL_COLOR_TABLE				0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE		0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE	0x80D2
+#define GL_PROXY_COLOR_TABLE			0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE	0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE	0x80D5
+#define GL_COLOR_TABLE_SCALE			0x80D6
+#define GL_COLOR_TABLE_BIAS			0x80D7
+#define GL_COLOR_TABLE_FORMAT			0x80D8
+#define GL_COLOR_TABLE_WIDTH			0x80D9
+#define GL_COLOR_TABLE_RED_SIZE			0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE		0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE		0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE		0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE		0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE		0x80DF
+#define GL_CONVOLUTION_1D			0x8010
+#define GL_CONVOLUTION_2D			0x8011
+#define GL_SEPARABLE_2D				0x8012
+#define GL_CONVOLUTION_BORDER_MODE		0x8013
+#define GL_CONVOLUTION_FILTER_SCALE		0x8014
+#define GL_CONVOLUTION_FILTER_BIAS		0x8015
+#define GL_REDUCE				0x8016
+#define GL_CONVOLUTION_FORMAT			0x8017
+#define GL_CONVOLUTION_WIDTH			0x8018
+#define GL_CONVOLUTION_HEIGHT			0x8019
+#define GL_MAX_CONVOLUTION_WIDTH		0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT		0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE		0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE		0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE		0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE		0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS		0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS		0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS		0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS		0x8023
+#define GL_CONSTANT_BORDER			0x8151
+#define GL_REPLICATE_BORDER			0x8153
+#define GL_CONVOLUTION_BORDER_COLOR		0x8154
+#define GL_COLOR_MATRIX				0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH		0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH		0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE		0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE	0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE		0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE	0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS		0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS		0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS		0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS		0x80BB
+#define GL_HISTOGRAM				0x8024
+#define GL_PROXY_HISTOGRAM			0x8025
+#define GL_HISTOGRAM_WIDTH			0x8026
+#define GL_HISTOGRAM_FORMAT			0x8027
+#define GL_HISTOGRAM_RED_SIZE			0x8028
+#define GL_HISTOGRAM_GREEN_SIZE			0x8029
+#define GL_HISTOGRAM_BLUE_SIZE			0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE			0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE		0x802C
+#define GL_HISTOGRAM_SINK			0x802D
+#define GL_MINMAX				0x802E
+#define GL_MINMAX_FORMAT			0x802F
+#define GL_MINMAX_SINK				0x8030
+#define GL_TABLE_TOO_LARGE			0x8031
+#define GL_BLEND_EQUATION			0x8009
+#define GL_MIN					0x8007
+#define GL_MAX					0x8008
+#define GL_FUNC_ADD				0x8006
+#define GL_FUNC_SUBTRACT			0x800A
+#define GL_FUNC_REVERSE_SUBTRACT		0x800B
+#define GL_BLEND_COLOR				0x8005
+
+#ifdef GL_GLEXT_PROTOTYPES
+
+GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
+                                              const GLint *params);
+
+GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
+
+GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
+				   GLenum internalformat, GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
+
+GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
+				      GLenum format, GLenum type,
+				      GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
+						 GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
+						 GLint *params );
+
+GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
+				GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
+
+GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
+					      GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
+					      GLint *params );
+
+GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+	const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
+	GLfloat params );
+
+GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
+	const GLfloat *params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
+	GLint params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
+	const GLint *params );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width,
+	GLsizei height);
+
+GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *image );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
+	GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
+	GLint *params );
+
+GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *row, const GLvoid *column );
+
+GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+#endif
+
+
+/*
+ * OpenGL 1.3
+ */
+
+/* multitexture */
+#define GL_TEXTURE0				0x84C0
+#define GL_TEXTURE1				0x84C1
+#define GL_TEXTURE2				0x84C2
+#define GL_TEXTURE3				0x84C3
+#define GL_TEXTURE4				0x84C4
+#define GL_TEXTURE5				0x84C5
+#define GL_TEXTURE6				0x84C6
+#define GL_TEXTURE7				0x84C7
+#define GL_TEXTURE8				0x84C8
+#define GL_TEXTURE9				0x84C9
+#define GL_TEXTURE10				0x84CA
+#define GL_TEXTURE11				0x84CB
+#define GL_TEXTURE12				0x84CC
+#define GL_TEXTURE13				0x84CD
+#define GL_TEXTURE14				0x84CE
+#define GL_TEXTURE15				0x84CF
+#define GL_TEXTURE16				0x84D0
+#define GL_TEXTURE17				0x84D1
+#define GL_TEXTURE18				0x84D2
+#define GL_TEXTURE19				0x84D3
+#define GL_TEXTURE20				0x84D4
+#define GL_TEXTURE21				0x84D5
+#define GL_TEXTURE22				0x84D6
+#define GL_TEXTURE23				0x84D7
+#define GL_TEXTURE24				0x84D8
+#define GL_TEXTURE25				0x84D9
+#define GL_TEXTURE26				0x84DA
+#define GL_TEXTURE27				0x84DB
+#define GL_TEXTURE28				0x84DC
+#define GL_TEXTURE29				0x84DD
+#define GL_TEXTURE30				0x84DE
+#define GL_TEXTURE31				0x84DF
+#define GL_ACTIVE_TEXTURE			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE		0x84E1
+#define GL_MAX_TEXTURE_UNITS			0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP				0x8511
+#define GL_REFLECTION_MAP			0x8512
+#define GL_TEXTURE_CUBE_MAP			0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP		0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X		0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X		0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y		0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y		0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z		0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z		0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP		0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE		0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA			0x84E9
+#define GL_COMPRESSED_LUMINANCE			0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA		0x84EB
+#define GL_COMPRESSED_INTENSITY			0x84EC
+#define GL_COMPRESSED_RGB			0x84ED
+#define GL_COMPRESSED_RGBA			0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT		0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE	0x86A0
+#define GL_TEXTURE_COMPRESSED			0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS	0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS		0x86A3
+/* multisample */
+#define GL_MULTISAMPLE				0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE		0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE			0x809F
+#define GL_SAMPLE_COVERAGE			0x80A0
+#define GL_SAMPLE_BUFFERS			0x80A8
+#define GL_SAMPLES				0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE		0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT		0x80AB
+#define GL_MULTISAMPLE_BIT			0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX		0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX		0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX		0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX		0x84E6
+/* texture_env_combine */
+#define GL_COMBINE				0x8570
+#define GL_COMBINE_RGB				0x8571
+#define GL_COMBINE_ALPHA			0x8572
+#define GL_SOURCE0_RGB				0x8580
+#define GL_SOURCE1_RGB				0x8581
+#define GL_SOURCE2_RGB				0x8582
+#define GL_SOURCE0_ALPHA			0x8588
+#define GL_SOURCE1_ALPHA			0x8589
+#define GL_SOURCE2_ALPHA			0x858A
+#define GL_OPERAND0_RGB				0x8590
+#define GL_OPERAND1_RGB				0x8591
+#define GL_OPERAND2_RGB				0x8592
+#define GL_OPERAND0_ALPHA			0x8598
+#define GL_OPERAND1_ALPHA			0x8599
+#define GL_OPERAND2_ALPHA			0x859A
+#define GL_RGB_SCALE				0x8573
+#define GL_ADD_SIGNED				0x8574
+#define GL_INTERPOLATE				0x8575
+#define GL_SUBTRACT				0x84E7
+#define GL_CONSTANT				0x8576
+#define GL_PRIMARY_COLOR			0x8577
+#define GL_PREVIOUS				0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB				0x86AE
+#define GL_DOT3_RGBA				0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER			0x812D
+
+#ifdef GL_GLEXT_PROTOTYPES
+
+GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
+
+#endif
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+
+
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB				0x84C0
+#define GL_TEXTURE1_ARB				0x84C1
+#define GL_TEXTURE2_ARB				0x84C2
+#define GL_TEXTURE3_ARB				0x84C3
+#define GL_TEXTURE4_ARB				0x84C4
+#define GL_TEXTURE5_ARB				0x84C5
+#define GL_TEXTURE6_ARB				0x84C6
+#define GL_TEXTURE7_ARB				0x84C7
+#define GL_TEXTURE8_ARB				0x84C8
+#define GL_TEXTURE9_ARB				0x84C9
+#define GL_TEXTURE10_ARB			0x84CA
+#define GL_TEXTURE11_ARB			0x84CB
+#define GL_TEXTURE12_ARB			0x84CC
+#define GL_TEXTURE13_ARB			0x84CD
+#define GL_TEXTURE14_ARB			0x84CE
+#define GL_TEXTURE15_ARB			0x84CF
+#define GL_TEXTURE16_ARB			0x84D0
+#define GL_TEXTURE17_ARB			0x84D1
+#define GL_TEXTURE18_ARB			0x84D2
+#define GL_TEXTURE19_ARB			0x84D3
+#define GL_TEXTURE20_ARB			0x84D4
+#define GL_TEXTURE21_ARB			0x84D5
+#define GL_TEXTURE22_ARB			0x84D6
+#define GL_TEXTURE23_ARB			0x84D7
+#define GL_TEXTURE24_ARB			0x84D8
+#define GL_TEXTURE25_ARB			0x84D9
+#define GL_TEXTURE26_ARB			0x84DA
+#define GL_TEXTURE27_ARB			0x84DB
+#define GL_TEXTURE28_ARB			0x84DC
+#define GL_TEXTURE29_ARB			0x84DD
+#define GL_TEXTURE30_ARB			0x84DE
+#define GL_TEXTURE31_ARB			0x84DF
+#define GL_ACTIVE_TEXTURE_ARB			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+/*
+ * Define this token if you want "old-style" header file behaviour (extensions
+ * defined in gl.h).  Otherwise, extensions will be included from glext.h.
+ */
+#if defined(GL_GLEXT_LEGACY)
+
+/* All extensions that used to be here are now found in glext.h */
+
+#else  /* GL_GLEXT_LEGACY */
+
+#include <GL/glext.h>
+
+#endif  /* GL_GLEXT_LEGACY */
+
+
+
+/*
+ * ???. GL_MESA_packed_depth_stencil
+ * XXX obsolete
+ */
+#ifndef GL_MESA_packed_depth_stencil
+#define GL_MESA_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_MESA			0x8750
+#define GL_UNSIGNED_INT_24_8_MESA		0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA		0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA		0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA		0x8754
+
+#endif /* GL_MESA_packed_depth_stencil */
+
+
+#ifndef GL_MESA_texture_array
+#define GL_MESA_texture_array 1
+
+/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.
+ */
+#ifndef GL_EXT_texture_array
+
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
+    GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif /* GL_GLEXT_PROTOTYPES */
+
+#if 0
+/* (temporarily) disabled because of collision with typedef in glext.h
+ * that happens if apps include both gl.h and glext.h
+ */
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
+    GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#define GL_TEXTURE_1D_ARRAY_EXT         0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT   0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT         0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT   0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#endif
+
+#endif
+
+
+#ifndef GL_ATI_blend_equation_separate
+#define GL_ATI_blend_equation_separate 1
+
+#define GL_ALPHA_BLEND_EQUATION_ATI	        0x883D
+
+GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
+
+#endif /* GL_ATI_blend_equation_separate */
+
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+typedef void* GLeglImageOES;
+#endif
+
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
+#endif
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
+#endif
+
+
+/**
+ ** NOTE!!!!!  If you add new functions to this file, or update
+ ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
+ ** in that file for details.
+ **/
+
+
+
+/**********************************************************************
+ * Begin system-specific stuff
+ */
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export off
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import off
+#endif
+/*
+ * End system-specific stuff
+ **********************************************************************/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl_h_ */
diff --git a/Externals/GL/GL/glext.h b/Externals/GL/GL/glext.h
new file mode 100644
index 0000000000..8785b98d9a
--- /dev/null
+++ b/Externals/GL/GL/glext.h
@@ -0,0 +1,11863 @@
+#ifndef __glext_h_
+#define __glext_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2013-2014 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.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 31191 $ on $Date: 2015-05-14 03:31:39 -0700 (Thu, 14 May 2015) $
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#define GL_GLEXT_VERSION 20150514
+
+/* Generated C header for:
+ * API: gl
+ * Profile: compatibility
+ * Versions considered: .*
+ * Versions emitted: 1\.[2-9]|[234]\.[0-9]
+ * Default extensions included: gl
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_VERSION_1_2 */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, void *img);
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif
+#endif /* GL_VERSION_1_3 */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#define GL_FUNC_ADD                       0x8006
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+#endif
+#endif /* GL_VERSION_1_4 */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#include <stddef.h>
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC2_ALPHA                     0x858A
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void *APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_VERSION_1_5 */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+typedef char GLchar;
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_VERSION_2_0 */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+#endif /* GL_VERSION_2_1 */
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+typedef unsigned short GLhalf;
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_COLOR_ATTACHMENT16             0x8CF0
+#define GL_COLOR_ATTACHMENT17             0x8CF1
+#define GL_COLOR_ATTACHMENT18             0x8CF2
+#define GL_COLOR_ATTACHMENT19             0x8CF3
+#define GL_COLOR_ATTACHMENT20             0x8CF4
+#define GL_COLOR_ATTACHMENT21             0x8CF5
+#define GL_COLOR_ATTACHMENT22             0x8CF6
+#define GL_COLOR_ATTACHMENT23             0x8CF7
+#define GL_COLOR_ATTACHMENT24             0x8CF8
+#define GL_COLOR_ATTACHMENT25             0x8CF9
+#define GL_COLOR_ATTACHMENT26             0x8CFA
+#define GL_COLOR_ATTACHMENT27             0x8CFB
+#define GL_COLOR_ATTACHMENT28             0x8CFC
+#define GL_COLOR_ATTACHMENT29             0x8CFD
+#define GL_COLOR_ATTACHMENT30             0x8CFE
+#define GL_COLOR_ATTACHMENT31             0x8CFF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#define GL_HALF_FLOAT                     0x140B
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void *(APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte *APIENTRY glGetStringi (GLenum name, GLuint index);
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void *APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif
+#endif /* GL_VERSION_3_0 */
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+#endif /* GL_VERSION_3_1 */
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+typedef struct __GLsync *GLsync;
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+typedef uint64_t GLuint64;
+typedef int64_t GLint64;
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+#define GL_DEPTH_CLAMP                    0x864F
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint maskNumber, GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *data);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint maskNumber, GLbitfield mask);
+#endif
+#endif /* GL_VERSION_3_2 */
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
+#define GL_SRC1_COLOR                     0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#define GL_SAMPLER_BINDING                0x8919
+#define GL_RGB10_A2UI                     0x906F
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#define GL_INT_2_10_10_10_REV             0x8D9F
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+#endif
+#endif /* GL_VERSION_3_3 */
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+#define GL_ISOLINES                       0x8E7A
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLfloat value);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLfloat value);
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect);
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_VERSION_4_0 */
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+#define GL_FIXED                          0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+#define GL_SHADER_COMPILER                0x8DFA
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#define GL_RGB565                         0x8D62
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH          0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GL_PROGRAM_BINARY_FORMATS         0x87FF
+#define GL_VERTEX_SHADER_BIT              0x00000001
+#define GL_FRAGMENT_SHADER_BIT            0x00000002
+#define GL_GEOMETRY_SHADER_BIT            0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
+#define GL_ALL_SHADER_BITS                0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE              0x8258
+#define GL_ACTIVE_PROGRAM                 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING       0x825A
+#define GL_MAX_VIEWPORTS                  0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
+#define GL_LAYER_PROVOKING_VERTEX         0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX               0x8260
+typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
+typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar *const*strings);
+typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
+typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReleaseShaderCompiler (void);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
+GLAPI void APIENTRY glClearDepthf (GLfloat d);
+GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
+GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar *const*strings);
+GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
+GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
+GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
+GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f);
+GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
+#endif
+#endif /* GL_VERSION_4_1 */
+
+#ifndef GL_VERSION_4_2
+#define GL_VERSION_4_2 1
+#define GL_COPY_READ_BUFFER_BINDING       0x8F36
+#define GL_COPY_WRITE_BUFFER_BINDING      0x8F37
+#define GL_TRANSFORM_FEEDBACK_ACTIVE      0x8E24
+#define GL_TRANSFORM_FEEDBACK_PAUSED      0x8E23
+#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH  0x9127
+#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
+#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH  0x9129
+#define GL_UNPACK_COMPRESSED_BLOCK_SIZE   0x912A
+#define GL_PACK_COMPRESSED_BLOCK_WIDTH    0x912B
+#define GL_PACK_COMPRESSED_BLOCK_HEIGHT   0x912C
+#define GL_PACK_COMPRESSED_BLOCK_DEPTH    0x912D
+#define GL_PACK_COMPRESSED_BLOCK_SIZE     0x912E
+#define GL_NUM_SAMPLE_COUNTS              0x9380
+#define GL_MIN_MAP_BUFFER_ALIGNMENT       0x90BC
+#define GL_ATOMIC_COUNTER_BUFFER          0x92C0
+#define GL_ATOMIC_COUNTER_BUFFER_BINDING  0x92C1
+#define GL_ATOMIC_COUNTER_BUFFER_START    0x92C2
+#define GL_ATOMIC_COUNTER_BUFFER_SIZE     0x92C3
+#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
+#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
+#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
+#define GL_MAX_VERTEX_ATOMIC_COUNTERS     0x92D2
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS   0x92D5
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS   0x92D6
+#define GL_MAX_COMBINED_ATOMIC_COUNTERS   0x92D7
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
+#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS  0x92D9
+#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
+#define GL_UNSIGNED_INT_ATOMIC_COUNTER    0x92DB
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT      0x00000002
+#define GL_UNIFORM_BARRIER_BIT            0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT      0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
+#define GL_COMMAND_BARRIER_BIT            0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT       0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT     0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT      0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT        0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT     0x00001000
+#define GL_ALL_BARRIER_BITS               0xFFFFFFFF
+#define GL_MAX_IMAGE_UNITS                0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
+#define GL_IMAGE_BINDING_NAME             0x8F3A
+#define GL_IMAGE_BINDING_LEVEL            0x8F3B
+#define GL_IMAGE_BINDING_LAYERED          0x8F3C
+#define GL_IMAGE_BINDING_LAYER            0x8F3D
+#define GL_IMAGE_BINDING_ACCESS           0x8F3E
+#define GL_IMAGE_1D                       0x904C
+#define GL_IMAGE_2D                       0x904D
+#define GL_IMAGE_3D                       0x904E
+#define GL_IMAGE_2D_RECT                  0x904F
+#define GL_IMAGE_CUBE                     0x9050
+#define GL_IMAGE_BUFFER                   0x9051
+#define GL_IMAGE_1D_ARRAY                 0x9052
+#define GL_IMAGE_2D_ARRAY                 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY           0x9054
+#define GL_IMAGE_2D_MULTISAMPLE           0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY     0x9056
+#define GL_INT_IMAGE_1D                   0x9057
+#define GL_INT_IMAGE_2D                   0x9058
+#define GL_INT_IMAGE_3D                   0x9059
+#define GL_INT_IMAGE_2D_RECT              0x905A
+#define GL_INT_IMAGE_CUBE                 0x905B
+#define GL_INT_IMAGE_BUFFER               0x905C
+#define GL_INT_IMAGE_1D_ARRAY             0x905D
+#define GL_INT_IMAGE_2D_ARRAY             0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY       0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE       0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D          0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D          0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D          0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT     0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE        0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER      0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY    0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY    0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
+#define GL_MAX_IMAGE_SAMPLES              0x906D
+#define GL_IMAGE_BINDING_FORMAT           0x906E
+#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
+#define GL_MAX_VERTEX_IMAGE_UNIFORMS      0x90CA
+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS    0x90CD
+#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS    0x90CE
+#define GL_MAX_COMBINED_IMAGE_UNIFORMS    0x90CF
+#define GL_COMPRESSED_RGBA_BPTC_UNORM     0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GL_TEXTURE_IMMUTABLE_FORMAT       0x912F
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+GLAPI void APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetActiveAtomicCounterBufferiv (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glBindImageTexture (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+GLAPI void APIENTRY glMemoryBarrier (GLbitfield barriers);
+GLAPI void APIENTRY glTexStorage1D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei instancecount);
+GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#endif
+#endif /* GL_VERSION_4_2 */
+
+#ifndef GL_VERSION_4_3
+#define GL_VERSION_4_3 1
+typedef void (APIENTRY  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_NUM_SHADING_LANGUAGE_VERSIONS  0x82E9
+#define GL_VERTEX_ATTRIB_ARRAY_LONG       0x874E
+#define GL_COMPRESSED_RGB8_ETC2           0x9274
+#define GL_COMPRESSED_SRGB8_ETC2          0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC      0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
+#define GL_COMPRESSED_R11_EAC             0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC      0x9271
+#define GL_COMPRESSED_RG11_EAC            0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC     0x9273
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX  0x8D69
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
+#define GL_MAX_ELEMENT_INDEX              0x8D6B
+#define GL_COMPUTE_SHADER                 0x91B9
+#define GL_MAX_COMPUTE_UNIFORM_BLOCKS     0x91BB
+#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
+#define GL_MAX_COMPUTE_IMAGE_UNIFORMS     0x91BD
+#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
+#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
+#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
+#define GL_MAX_COMPUTE_ATOMIC_COUNTERS    0x8265
+#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
+#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
+#define GL_MAX_COMPUTE_WORK_GROUP_COUNT   0x91BE
+#define GL_MAX_COMPUTE_WORK_GROUP_SIZE    0x91BF
+#define GL_COMPUTE_WORK_GROUP_SIZE        0x8267
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
+#define GL_DISPATCH_INDIRECT_BUFFER       0x90EE
+#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
+#define GL_COMPUTE_SHADER_BIT             0x00000020
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#define GL_DEBUG_SOURCE_API               0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#define GL_BUFFER                         0x82E0
+#define GL_SHADER                         0x82E1
+#define GL_PROGRAM                        0x82E2
+#define GL_QUERY                          0x82E3
+#define GL_PROGRAM_PIPELINE               0x82E4
+#define GL_SAMPLER                        0x82E6
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#define GL_DEBUG_OUTPUT                   0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#define GL_MAX_UNIFORM_LOCATIONS          0x826E
+#define GL_FRAMEBUFFER_DEFAULT_WIDTH      0x9310
+#define GL_FRAMEBUFFER_DEFAULT_HEIGHT     0x9311
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS     0x9312
+#define GL_FRAMEBUFFER_DEFAULT_SAMPLES    0x9313
+#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
+#define GL_MAX_FRAMEBUFFER_WIDTH          0x9315
+#define GL_MAX_FRAMEBUFFER_HEIGHT         0x9316
+#define GL_MAX_FRAMEBUFFER_LAYERS         0x9317
+#define GL_MAX_FRAMEBUFFER_SAMPLES        0x9318
+#define GL_INTERNALFORMAT_SUPPORTED       0x826F
+#define GL_INTERNALFORMAT_PREFERRED       0x8270
+#define GL_INTERNALFORMAT_RED_SIZE        0x8271
+#define GL_INTERNALFORMAT_GREEN_SIZE      0x8272
+#define GL_INTERNALFORMAT_BLUE_SIZE       0x8273
+#define GL_INTERNALFORMAT_ALPHA_SIZE      0x8274
+#define GL_INTERNALFORMAT_DEPTH_SIZE      0x8275
+#define GL_INTERNALFORMAT_STENCIL_SIZE    0x8276
+#define GL_INTERNALFORMAT_SHARED_SIZE     0x8277
+#define GL_INTERNALFORMAT_RED_TYPE        0x8278
+#define GL_INTERNALFORMAT_GREEN_TYPE      0x8279
+#define GL_INTERNALFORMAT_BLUE_TYPE       0x827A
+#define GL_INTERNALFORMAT_ALPHA_TYPE      0x827B
+#define GL_INTERNALFORMAT_DEPTH_TYPE      0x827C
+#define GL_INTERNALFORMAT_STENCIL_TYPE    0x827D
+#define GL_MAX_WIDTH                      0x827E
+#define GL_MAX_HEIGHT                     0x827F
+#define GL_MAX_DEPTH                      0x8280
+#define GL_MAX_LAYERS                     0x8281
+#define GL_MAX_COMBINED_DIMENSIONS        0x8282
+#define GL_COLOR_COMPONENTS               0x8283
+#define GL_DEPTH_COMPONENTS               0x8284
+#define GL_STENCIL_COMPONENTS             0x8285
+#define GL_COLOR_RENDERABLE               0x8286
+#define GL_DEPTH_RENDERABLE               0x8287
+#define GL_STENCIL_RENDERABLE             0x8288
+#define GL_FRAMEBUFFER_RENDERABLE         0x8289
+#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
+#define GL_FRAMEBUFFER_BLEND              0x828B
+#define GL_READ_PIXELS                    0x828C
+#define GL_READ_PIXELS_FORMAT             0x828D
+#define GL_READ_PIXELS_TYPE               0x828E
+#define GL_TEXTURE_IMAGE_FORMAT           0x828F
+#define GL_TEXTURE_IMAGE_TYPE             0x8290
+#define GL_GET_TEXTURE_IMAGE_FORMAT       0x8291
+#define GL_GET_TEXTURE_IMAGE_TYPE         0x8292
+#define GL_MIPMAP                         0x8293
+#define GL_MANUAL_GENERATE_MIPMAP         0x8294
+#define GL_AUTO_GENERATE_MIPMAP           0x8295
+#define GL_COLOR_ENCODING                 0x8296
+#define GL_SRGB_READ                      0x8297
+#define GL_SRGB_WRITE                     0x8298
+#define GL_FILTER                         0x829A
+#define GL_VERTEX_TEXTURE                 0x829B
+#define GL_TESS_CONTROL_TEXTURE           0x829C
+#define GL_TESS_EVALUATION_TEXTURE        0x829D
+#define GL_GEOMETRY_TEXTURE               0x829E
+#define GL_FRAGMENT_TEXTURE               0x829F
+#define GL_COMPUTE_TEXTURE                0x82A0
+#define GL_TEXTURE_SHADOW                 0x82A1
+#define GL_TEXTURE_GATHER                 0x82A2
+#define GL_TEXTURE_GATHER_SHADOW          0x82A3
+#define GL_SHADER_IMAGE_LOAD              0x82A4
+#define GL_SHADER_IMAGE_STORE             0x82A5
+#define GL_SHADER_IMAGE_ATOMIC            0x82A6
+#define GL_IMAGE_TEXEL_SIZE               0x82A7
+#define GL_IMAGE_COMPATIBILITY_CLASS      0x82A8
+#define GL_IMAGE_PIXEL_FORMAT             0x82A9
+#define GL_IMAGE_PIXEL_TYPE               0x82AA
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
+#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
+#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
+#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE  0x82B3
+#define GL_CLEAR_BUFFER                   0x82B4
+#define GL_TEXTURE_VIEW                   0x82B5
+#define GL_VIEW_COMPATIBILITY_CLASS       0x82B6
+#define GL_FULL_SUPPORT                   0x82B7
+#define GL_CAVEAT_SUPPORT                 0x82B8
+#define GL_IMAGE_CLASS_4_X_32             0x82B9
+#define GL_IMAGE_CLASS_2_X_32             0x82BA
+#define GL_IMAGE_CLASS_1_X_32             0x82BB
+#define GL_IMAGE_CLASS_4_X_16             0x82BC
+#define GL_IMAGE_CLASS_2_X_16             0x82BD
+#define GL_IMAGE_CLASS_1_X_16             0x82BE
+#define GL_IMAGE_CLASS_4_X_8              0x82BF
+#define GL_IMAGE_CLASS_2_X_8              0x82C0
+#define GL_IMAGE_CLASS_1_X_8              0x82C1
+#define GL_IMAGE_CLASS_11_11_10           0x82C2
+#define GL_IMAGE_CLASS_10_10_10_2         0x82C3
+#define GL_VIEW_CLASS_128_BITS            0x82C4
+#define GL_VIEW_CLASS_96_BITS             0x82C5
+#define GL_VIEW_CLASS_64_BITS             0x82C6
+#define GL_VIEW_CLASS_48_BITS             0x82C7
+#define GL_VIEW_CLASS_32_BITS             0x82C8
+#define GL_VIEW_CLASS_24_BITS             0x82C9
+#define GL_VIEW_CLASS_16_BITS             0x82CA
+#define GL_VIEW_CLASS_8_BITS              0x82CB
+#define GL_VIEW_CLASS_S3TC_DXT1_RGB       0x82CC
+#define GL_VIEW_CLASS_S3TC_DXT1_RGBA      0x82CD
+#define GL_VIEW_CLASS_S3TC_DXT3_RGBA      0x82CE
+#define GL_VIEW_CLASS_S3TC_DXT5_RGBA      0x82CF
+#define GL_VIEW_CLASS_RGTC1_RED           0x82D0
+#define GL_VIEW_CLASS_RGTC2_RG            0x82D1
+#define GL_VIEW_CLASS_BPTC_UNORM          0x82D2
+#define GL_VIEW_CLASS_BPTC_FLOAT          0x82D3
+#define GL_UNIFORM                        0x92E1
+#define GL_UNIFORM_BLOCK                  0x92E2
+#define GL_PROGRAM_INPUT                  0x92E3
+#define GL_PROGRAM_OUTPUT                 0x92E4
+#define GL_BUFFER_VARIABLE                0x92E5
+#define GL_SHADER_STORAGE_BLOCK           0x92E6
+#define GL_VERTEX_SUBROUTINE              0x92E8
+#define GL_TESS_CONTROL_SUBROUTINE        0x92E9
+#define GL_TESS_EVALUATION_SUBROUTINE     0x92EA
+#define GL_GEOMETRY_SUBROUTINE            0x92EB
+#define GL_FRAGMENT_SUBROUTINE            0x92EC
+#define GL_COMPUTE_SUBROUTINE             0x92ED
+#define GL_VERTEX_SUBROUTINE_UNIFORM      0x92EE
+#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
+#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
+#define GL_GEOMETRY_SUBROUTINE_UNIFORM    0x92F1
+#define GL_FRAGMENT_SUBROUTINE_UNIFORM    0x92F2
+#define GL_COMPUTE_SUBROUTINE_UNIFORM     0x92F3
+#define GL_TRANSFORM_FEEDBACK_VARYING     0x92F4
+#define GL_ACTIVE_RESOURCES               0x92F5
+#define GL_MAX_NAME_LENGTH                0x92F6
+#define GL_MAX_NUM_ACTIVE_VARIABLES       0x92F7
+#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
+#define GL_NAME_LENGTH                    0x92F9
+#define GL_TYPE                           0x92FA
+#define GL_ARRAY_SIZE                     0x92FB
+#define GL_OFFSET                         0x92FC
+#define GL_BLOCK_INDEX                    0x92FD
+#define GL_ARRAY_STRIDE                   0x92FE
+#define GL_MATRIX_STRIDE                  0x92FF
+#define GL_IS_ROW_MAJOR                   0x9300
+#define GL_ATOMIC_COUNTER_BUFFER_INDEX    0x9301
+#define GL_BUFFER_BINDING                 0x9302
+#define GL_BUFFER_DATA_SIZE               0x9303
+#define GL_NUM_ACTIVE_VARIABLES           0x9304
+#define GL_ACTIVE_VARIABLES               0x9305
+#define GL_REFERENCED_BY_VERTEX_SHADER    0x9306
+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
+#define GL_REFERENCED_BY_GEOMETRY_SHADER  0x9309
+#define GL_REFERENCED_BY_FRAGMENT_SHADER  0x930A
+#define GL_REFERENCED_BY_COMPUTE_SHADER   0x930B
+#define GL_TOP_LEVEL_ARRAY_SIZE           0x930C
+#define GL_TOP_LEVEL_ARRAY_STRIDE         0x930D
+#define GL_LOCATION                       0x930E
+#define GL_LOCATION_INDEX                 0x930F
+#define GL_IS_PER_PATCH                   0x92E7
+#define GL_SHADER_STORAGE_BUFFER          0x90D2
+#define GL_SHADER_STORAGE_BUFFER_BINDING  0x90D3
+#define GL_SHADER_STORAGE_BUFFER_START    0x90D4
+#define GL_SHADER_STORAGE_BUFFER_SIZE     0x90D5
+#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
+#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
+#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
+#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
+#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
+#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE  0x90DE
+#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
+#define GL_SHADER_STORAGE_BARRIER_BIT     0x00002000
+#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
+#define GL_DEPTH_STENCIL_TEXTURE_MODE     0x90EA
+#define GL_TEXTURE_BUFFER_OFFSET          0x919D
+#define GL_TEXTURE_BUFFER_SIZE            0x919E
+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
+#define GL_TEXTURE_VIEW_MIN_LEVEL         0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS        0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER         0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS        0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS       0x82DF
+#define GL_VERTEX_ATTRIB_BINDING          0x82D4
+#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET  0x82D5
+#define GL_VERTEX_BINDING_DIVISOR         0x82D6
+#define GL_VERTEX_BINDING_OFFSET          0x82D7
+#define GL_VERTEX_BINDING_STRIDE          0x82D8
+#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
+#define GL_MAX_VERTEX_ATTRIB_BINDINGS     0x82DA
+#define GL_VERTEX_BINDING_BUFFER          0x8F4F
+#define GL_DISPLAY_LIST                   0x82E7
+typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+GLAPI void APIENTRY glDispatchComputeIndirect (GLintptr indirect);
+GLAPI void APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+GLAPI void APIENTRY glFramebufferParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+GLAPI void APIENTRY glInvalidateTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glInvalidateTexImage (GLuint texture, GLint level);
+GLAPI void APIENTRY glInvalidateBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glInvalidateBufferData (GLuint buffer);
+GLAPI void APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiDrawArraysIndirect (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glGetProgramInterfaceiv (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+GLAPI GLuint APIENTRY glGetProgramResourceIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+GLAPI GLint APIENTRY glGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI GLint APIENTRY glGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+GLAPI void APIENTRY glTexBufferRange (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTexStorage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexStorage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureView (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+GLAPI void APIENTRY glBindVertexBuffer (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormat (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribIFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribLFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribBinding (GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexBindingDivisor (GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GLAPI void APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GLAPI void APIENTRY glPopDebugGroup (void);
+GLAPI void APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GLAPI void APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_VERSION_4_3 */
+
+#ifndef GL_VERSION_4_4
+#define GL_VERSION_4_4 1
+#define GL_MAX_VERTEX_ATTRIB_STRIDE       0x82E5
+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221
+#define GL_TEXTURE_BUFFER_BINDING         0x8C2A
+#define GL_MAP_PERSISTENT_BIT             0x0040
+#define GL_MAP_COHERENT_BIT               0x0080
+#define GL_DYNAMIC_STORAGE_BIT            0x0100
+#define GL_CLIENT_STORAGE_BIT             0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE       0x821F
+#define GL_BUFFER_STORAGE_FLAGS           0x8220
+#define GL_CLEAR_TEXTURE                  0x9365
+#define GL_LOCATION_COMPONENT             0x934A
+#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B
+#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C
+#define GL_QUERY_BUFFER                   0x9192
+#define GL_QUERY_BUFFER_BARRIER_BIT       0x00008000
+#define GL_QUERY_BUFFER_BINDING           0x9193
+#define GL_QUERY_RESULT_NO_WAIT           0x9194
+#define GL_MIRROR_CLAMP_TO_EDGE           0x8743
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+typedef void (APIENTRYP PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint *samplers);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorage (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearTexImage (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glBindBuffersBase (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+GLAPI void APIENTRY glBindBuffersRange (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+GLAPI void APIENTRY glBindTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindSamplers (GLuint first, GLsizei count, const GLuint *samplers);
+GLAPI void APIENTRY glBindImageTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#endif
+#endif /* GL_VERSION_4_4 */
+
+#ifndef GL_VERSION_4_5
+#define GL_VERSION_4_5 1
+#define GL_CONTEXT_LOST                   0x0507
+#define GL_NEGATIVE_ONE_TO_ONE            0x935E
+#define GL_ZERO_TO_ONE                    0x935F
+#define GL_CLIP_ORIGIN                    0x935C
+#define GL_CLIP_DEPTH_MODE                0x935D
+#define GL_QUERY_WAIT_INVERTED            0x8E17
+#define GL_QUERY_NO_WAIT_INVERTED         0x8E18
+#define GL_QUERY_BY_REGION_WAIT_INVERTED  0x8E19
+#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A
+#define GL_MAX_CULL_DISTANCES             0x82F9
+#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA
+#define GL_TEXTURE_TARGET                 0x1006
+#define GL_QUERY_TARGET                   0x82EA
+#define GL_GUILTY_CONTEXT_RESET           0x8253
+#define GL_INNOCENT_CONTEXT_RESET         0x8254
+#define GL_UNKNOWN_CONTEXT_RESET          0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY    0x8256
+#define GL_LOSE_CONTEXT_ON_RESET          0x8252
+#define GL_NO_RESET_NOTIFICATION          0x8261
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004
+#define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
+#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
+typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
+typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum buf);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum src);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil);
+typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint *samplers);
+typedef void (APIENTRYP PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef void (APIENTRYP PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSPROC) (void);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNMAPDVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth);
+GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers);
+GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access);
+GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer);
+GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glNamedFramebufferTexture (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayer (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffer (GLuint framebuffer, GLenum buf);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffers (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glNamedFramebufferReadBuffer (GLuint framebuffer, GLenum src);
+GLAPI void APIENTRY glInvalidateNamedFramebufferData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil);
+GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameteriv (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glNamedRenderbufferStorage (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures);
+GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCompressedTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCopyTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureParameterf (GLuint texture, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfv (GLuint texture, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glTextureParameteri (GLuint texture, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterIiv (GLuint texture, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuiv (GLuint texture, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glTextureParameteriv (GLuint texture, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glGenerateTextureMipmap (GLuint texture);
+GLAPI void APIENTRY glBindTextureUnit (GLuint unit, GLuint texture);
+GLAPI void APIENTRY glGetTextureImage (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureImage (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetTextureLevelParameterfv (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameteriv (GLuint texture, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterfv (GLuint texture, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterIiv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuiv (GLuint texture, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetTextureParameteriv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI void APIENTRY glDisableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glEnableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glVertexArrayElementBuffer (GLuint vaobj, GLuint buffer);
+GLAPI void APIENTRY glVertexArrayVertexBuffer (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexBuffers (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+GLAPI void APIENTRY glVertexArrayAttribBinding (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayAttribFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribIFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribLFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayBindingDivisor (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glGetVertexArrayiv (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexediv (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexed64iv (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+GLAPI void APIENTRY glCreateSamplers (GLsizei n, GLuint *samplers);
+GLAPI void APIENTRY glCreateProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI void APIENTRY glCreateQueries (GLenum target, GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glGetQueryBufferObjecti64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectui64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectuiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glMemoryBarrierByRegion (GLbitfield barriers);
+GLAPI void APIENTRY glGetTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+GLAPI GLenum APIENTRY glGetGraphicsResetStatus (void);
+GLAPI void APIENTRY glGetnCompressedTexImage (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnUniformdv (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnUniformfv (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glReadnPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnMapdv (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfv (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapiv (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfv (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuiv (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusv (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStipple (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTable (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilter (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilter (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glTextureBarrier (void);
+#endif
+#endif /* GL_VERSION_4_5 */
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+#endif /* GL_ARB_ES2_compatibility */
+
+#ifndef GL_ARB_ES3_1_compatibility
+#define GL_ARB_ES3_1_compatibility 1
+#endif /* GL_ARB_ES3_1_compatibility */
+
+#ifndef GL_ARB_ES3_compatibility
+#define GL_ARB_ES3_compatibility 1
+#endif /* GL_ARB_ES3_compatibility */
+
+#ifndef GL_ARB_arrays_of_arrays
+#define GL_ARB_arrays_of_arrays 1
+#endif /* GL_ARB_arrays_of_arrays */
+
+#ifndef GL_ARB_base_instance
+#define GL_ARB_base_instance 1
+#endif /* GL_ARB_base_instance */
+
+#ifndef GL_ARB_bindless_texture
+#define GL_ARB_bindless_texture 1
+typedef uint64_t GLuint64EXT;
+#define GL_UNSIGNED_INT64_ARB             0x140F
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleARB (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleARB (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentARB (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleARB (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentARB (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64ARB (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64ARB (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentARB (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glVertexAttribL1ui64ARB (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL1ui64vARB (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLui64vARB (GLuint index, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_ARB_bindless_texture */
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#endif /* GL_ARB_blend_func_extended */
+
+#ifndef GL_ARB_buffer_storage
+#define GL_ARB_buffer_storage 1
+#endif /* GL_ARB_buffer_storage */
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+struct _cl_context;
+struct _cl_event;
+#define GL_SYNC_CL_EVENT_ARB              0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
+typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#endif
+#endif /* GL_ARB_cl_event */
+
+#ifndef GL_ARB_clear_buffer_object
+#define GL_ARB_clear_buffer_object 1
+#endif /* GL_ARB_clear_buffer_object */
+
+#ifndef GL_ARB_clear_texture
+#define GL_ARB_clear_texture 1
+#endif /* GL_ARB_clear_texture */
+
+#ifndef GL_ARB_clip_control
+#define GL_ARB_clip_control 1
+#endif /* GL_ARB_clip_control */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif
+#endif /* GL_ARB_color_buffer_float */
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif /* GL_ARB_compatibility */
+
+#ifndef GL_ARB_compressed_texture_pixel_storage
+#define GL_ARB_compressed_texture_pixel_storage 1
+#endif /* GL_ARB_compressed_texture_pixel_storage */
+
+#ifndef GL_ARB_compute_shader
+#define GL_ARB_compute_shader 1
+#endif /* GL_ARB_compute_shader */
+
+#ifndef GL_ARB_compute_variable_group_size
+#define GL_ARB_compute_variable_group_size 1
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344
+#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345
+#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDispatchComputeGroupSizeARB (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#endif
+#endif /* GL_ARB_compute_variable_group_size */
+
+#ifndef GL_ARB_conditional_render_inverted
+#define GL_ARB_conditional_render_inverted 1
+#endif /* GL_ARB_conditional_render_inverted */
+
+#ifndef GL_ARB_conservative_depth
+#define GL_ARB_conservative_depth 1
+#endif /* GL_ARB_conservative_depth */
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#endif /* GL_ARB_copy_buffer */
+
+#ifndef GL_ARB_copy_image
+#define GL_ARB_copy_image 1
+#endif /* GL_ARB_copy_image */
+
+#ifndef GL_ARB_cull_distance
+#define GL_ARB_cull_distance 1
+#endif /* GL_ARB_cull_distance */
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
+#define GL_DEBUG_SOURCE_API_ARB           0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif
+#endif /* GL_ARB_debug_output */
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif /* GL_ARB_depth_buffer_float */
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif /* GL_ARB_depth_clamp */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif /* GL_ARB_depth_texture */
+
+#ifndef GL_ARB_derivative_control
+#define GL_ARB_derivative_control 1
+#endif /* GL_ARB_derivative_control */
+
+#ifndef GL_ARB_direct_state_access
+#define GL_ARB_direct_state_access 1
+#endif /* GL_ARB_direct_state_access */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ARB_draw_buffers */
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+#endif /* GL_ARB_draw_buffers_blend */
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#endif /* GL_ARB_draw_indirect */
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_ARB_draw_instanced */
+
+#ifndef GL_ARB_enhanced_layouts
+#define GL_ARB_enhanced_layouts 1
+#endif /* GL_ARB_enhanced_layouts */
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+#endif /* GL_ARB_explicit_attrib_location */
+
+#ifndef GL_ARB_explicit_uniform_location
+#define GL_ARB_explicit_uniform_location 1
+#endif /* GL_ARB_explicit_uniform_location */
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif /* GL_ARB_fragment_coord_conventions */
+
+#ifndef GL_ARB_fragment_layer_viewport
+#define GL_ARB_fragment_layer_viewport 1
+#endif /* GL_ARB_fragment_layer_viewport */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, void *string);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif
+#endif /* GL_ARB_fragment_program */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif /* GL_ARB_fragment_program_shadow */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif /* GL_ARB_fragment_shader */
+
+#ifndef GL_ARB_framebuffer_no_attachments
+#define GL_ARB_framebuffer_no_attachments 1
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#endif /* GL_ARB_framebuffer_object */
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif /* GL_ARB_framebuffer_sRGB */
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_ARB_geometry_shader4 */
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+#endif /* GL_ARB_get_program_binary */
+
+#ifndef GL_ARB_get_texture_sub_image
+#define GL_ARB_get_texture_sub_image 1
+#endif /* GL_ARB_get_texture_sub_image */
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+#endif /* GL_ARB_gpu_shader5 */
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+typedef unsigned short GLhalfARB;
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif /* GL_ARB_half_float_pixel */
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif /* GL_ARB_half_float_vertex */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+#define GL_BLEND_COLOR                    0x8005
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif
+#endif /* GL_ARB_imaging */
+
+#ifndef GL_ARB_indirect_parameters
+#define GL_ARB_indirect_parameters 1
+#define GL_PARAMETER_BUFFER_ARB           0x80EE
+#define GL_PARAMETER_BUFFER_BINDING_ARB   0x80EF
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_ARB_indirect_parameters */
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif
+#endif /* GL_ARB_instanced_arrays */
+
+#ifndef GL_ARB_internalformat_query
+#define GL_ARB_internalformat_query 1
+#endif /* GL_ARB_internalformat_query */
+
+#ifndef GL_ARB_internalformat_query2
+#define GL_ARB_internalformat_query2 1
+#define GL_SRGB_DECODE_ARB                0x8299
+#endif /* GL_ARB_internalformat_query2 */
+
+#ifndef GL_ARB_invalidate_subdata
+#define GL_ARB_invalidate_subdata 1
+#endif /* GL_ARB_invalidate_subdata */
+
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+#endif /* GL_ARB_map_buffer_alignment */
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#endif /* GL_ARB_map_buffer_range */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_ARB_matrix_palette */
+
+#ifndef GL_ARB_multi_bind
+#define GL_ARB_multi_bind 1
+#endif /* GL_ARB_multi_bind */
+
+#ifndef GL_ARB_multi_draw_indirect
+#define GL_ARB_multi_draw_indirect 1
+#endif /* GL_ARB_multi_draw_indirect */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLfloat value, GLboolean invert);
+#endif
+#endif /* GL_ARB_multisample */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif
+#endif /* GL_ARB_multitexture */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_ARB_occlusion_query */
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+#endif /* GL_ARB_occlusion_query2 */
+
+#ifndef GL_ARB_pipeline_statistics_query
+#define GL_ARB_pipeline_statistics_query 1
+#define GL_VERTICES_SUBMITTED_ARB         0x82EE
+#define GL_PRIMITIVES_SUBMITTED_ARB       0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS_ARB  0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES_ARB  0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7
+#endif /* GL_ARB_pipeline_statistics_query */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif /* GL_ARB_pixel_buffer_object */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_ARB_point_parameters */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif /* GL_ARB_point_sprite */
+
+#ifndef GL_ARB_program_interface_query
+#define GL_ARB_program_interface_query 1
+#endif /* GL_ARB_program_interface_query */
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#endif /* GL_ARB_provoking_vertex */
+
+#ifndef GL_ARB_query_buffer_object
+#define GL_ARB_query_buffer_object 1
+#endif /* GL_ARB_query_buffer_object */
+
+#ifndef GL_ARB_robust_buffer_access_behavior
+#define GL_ARB_robust_buffer_access_behavior 1
+#endif /* GL_ARB_robust_buffer_access_behavior */
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
+GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#endif
+#endif /* GL_ARB_robustness */
+
+#ifndef GL_ARB_robustness_isolation
+#define GL_ARB_robustness_isolation 1
+#endif /* GL_ARB_robustness_isolation */
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#define GL_SAMPLE_SHADING_ARB             0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
+#endif
+#endif /* GL_ARB_sample_shading */
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#endif /* GL_ARB_sampler_objects */
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif /* GL_ARB_seamless_cube_map */
+
+#ifndef GL_ARB_seamless_cubemap_per_texture
+#define GL_ARB_seamless_cubemap_per_texture 1
+#endif /* GL_ARB_seamless_cubemap_per_texture */
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+#endif /* GL_ARB_separate_shader_objects */
+
+#ifndef GL_ARB_shader_atomic_counters
+#define GL_ARB_shader_atomic_counters 1
+#endif /* GL_ARB_shader_atomic_counters */
+
+#ifndef GL_ARB_shader_bit_encoding
+#define GL_ARB_shader_bit_encoding 1
+#endif /* GL_ARB_shader_bit_encoding */
+
+#ifndef GL_ARB_shader_draw_parameters
+#define GL_ARB_shader_draw_parameters 1
+#endif /* GL_ARB_shader_draw_parameters */
+
+#ifndef GL_ARB_shader_group_vote
+#define GL_ARB_shader_group_vote 1
+#endif /* GL_ARB_shader_group_vote */
+
+#ifndef GL_ARB_shader_image_load_store
+#define GL_ARB_shader_image_load_store 1
+#endif /* GL_ARB_shader_image_load_store */
+
+#ifndef GL_ARB_shader_image_size
+#define GL_ARB_shader_image_size 1
+#endif /* GL_ARB_shader_image_size */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef __APPLE__
+typedef void *GLhandleARB;
+#else
+typedef unsigned int GLhandleARB;
+#endif
+typedef char GLcharARB;
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+#endif /* GL_ARB_shader_objects */
+
+#ifndef GL_ARB_shader_precision
+#define GL_ARB_shader_precision 1
+#endif /* GL_ARB_shader_precision */
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+#endif /* GL_ARB_shader_stencil_export */
+
+#ifndef GL_ARB_shader_storage_buffer_object
+#define GL_ARB_shader_storage_buffer_object 1
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#endif /* GL_ARB_shader_subroutine */
+
+#ifndef GL_ARB_shader_texture_image_samples
+#define GL_ARB_shader_texture_image_samples 1
+#endif /* GL_ARB_shader_texture_image_samples */
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif /* GL_ARB_shader_texture_lod */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif /* GL_ARB_shading_language_100 */
+
+#ifndef GL_ARB_shading_language_420pack
+#define GL_ARB_shading_language_420pack 1
+#endif /* GL_ARB_shading_language_420pack */
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ARB_shading_language_include */
+
+#ifndef GL_ARB_shading_language_packing
+#define GL_ARB_shading_language_packing 1
+#endif /* GL_ARB_shading_language_packing */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif /* GL_ARB_shadow */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif /* GL_ARB_shadow_ambient */
+
+#ifndef GL_ARB_sparse_buffer
+#define GL_ARB_sparse_buffer 1
+#define GL_SPARSE_STORAGE_BIT_ARB         0x0400
+#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB    0x82F8
+typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTARBPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferPageCommitmentARB (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentARB (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_buffer */
+
+#ifndef GL_ARB_sparse_texture
+#define GL_ARB_sparse_texture 1
+#define GL_TEXTURE_SPARSE_ARB             0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB    0x91A7
+#define GL_NUM_SPARSE_LEVELS_ARB          0x91AA
+#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB     0x91A8
+#define GL_VIRTUAL_PAGE_SIZE_X_ARB        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_ARB        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_ARB        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_texture */
+
+#ifndef GL_ARB_stencil_texturing
+#define GL_ARB_stencil_texturing 1
+#endif /* GL_ARB_stencil_texturing */
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#endif /* GL_ARB_sync */
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#endif /* GL_ARB_tessellation_shader */
+
+#ifndef GL_ARB_texture_barrier
+#define GL_ARB_texture_barrier 1
+#endif /* GL_ARB_texture_barrier */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif /* GL_ARB_texture_border_clamp */
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_ARB_texture_buffer_object */
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+#endif /* GL_ARB_texture_buffer_object_rgb32 */
+
+#ifndef GL_ARB_texture_buffer_range
+#define GL_ARB_texture_buffer_range 1
+#endif /* GL_ARB_texture_buffer_range */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void *img);
+#endif
+#endif /* GL_ARB_texture_compression */
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif /* GL_ARB_texture_compression_bptc */
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif /* GL_ARB_texture_compression_rgtc */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif /* GL_ARB_texture_cube_map */
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+#endif /* GL_ARB_texture_cube_map_array */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif /* GL_ARB_texture_env_add */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif /* GL_ARB_texture_env_combine */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif /* GL_ARB_texture_env_crossbar */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif /* GL_ARB_texture_env_dot3 */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif /* GL_ARB_texture_float */
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
+#endif /* GL_ARB_texture_gather */
+
+#ifndef GL_ARB_texture_mirror_clamp_to_edge
+#define GL_ARB_texture_mirror_clamp_to_edge 1
+#endif /* GL_ARB_texture_mirror_clamp_to_edge */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#endif /* GL_ARB_texture_multisample */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif /* GL_ARB_texture_non_power_of_two */
+
+#ifndef GL_ARB_texture_query_levels
+#define GL_ARB_texture_query_levels 1
+#endif /* GL_ARB_texture_query_levels */
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif /* GL_ARB_texture_query_lod */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif /* GL_ARB_texture_rectangle */
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif /* GL_ARB_texture_rg */
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+#endif /* GL_ARB_texture_rgb10_a2ui */
+
+#ifndef GL_ARB_texture_stencil8
+#define GL_ARB_texture_stencil8 1
+#endif /* GL_ARB_texture_stencil8 */
+
+#ifndef GL_ARB_texture_storage
+#define GL_ARB_texture_storage 1
+#endif /* GL_ARB_texture_storage */
+
+#ifndef GL_ARB_texture_storage_multisample
+#define GL_ARB_texture_storage_multisample 1
+#endif /* GL_ARB_texture_storage_multisample */
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+#endif /* GL_ARB_texture_swizzle */
+
+#ifndef GL_ARB_texture_view
+#define GL_ARB_texture_view 1
+#endif /* GL_ARB_texture_view */
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#endif /* GL_ARB_timer_query */
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#endif /* GL_ARB_transform_feedback2 */
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#endif /* GL_ARB_transform_feedback3 */
+
+#ifndef GL_ARB_transform_feedback_instanced
+#define GL_ARB_transform_feedback_instanced 1
+#endif /* GL_ARB_transform_feedback_instanced */
+
+#ifndef GL_ARB_transform_feedback_overflow_query
+#define GL_ARB_transform_feedback_overflow_query 1
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED
+#endif /* GL_ARB_transform_feedback_overflow_query */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif
+#endif /* GL_ARB_transpose_matrix */
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#endif /* GL_ARB_uniform_buffer_object */
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif /* GL_ARB_vertex_array_bgra */
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#endif /* GL_ARB_vertex_array_object */
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+#ifndef GL_ARB_vertex_attrib_binding
+#define GL_ARB_vertex_attrib_binding 1
+#endif /* GL_ARB_vertex_attrib_binding */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif
+#endif /* GL_ARB_vertex_blend */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+typedef ptrdiff_t GLsizeiptrARB;
+typedef ptrdiff_t GLintptrARB;
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+GLAPI void *APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, void **pointer);
+#endif
+#endif /* GL_ARB_vertex_program */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif
+#endif /* GL_ARB_vertex_shader */
+
+#ifndef GL_ARB_vertex_type_10f_11f_11f_rev
+#define GL_ARB_vertex_type_10f_11f_11f_rev 1
+#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+#endif /* GL_ARB_viewport_array */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif
+#endif /* GL_ARB_window_pos */
+
+#ifndef GL_KHR_blend_equation_advanced
+#define GL_KHR_blend_equation_advanced 1
+#define GL_MULTIPLY_KHR                   0x9294
+#define GL_SCREEN_KHR                     0x9295
+#define GL_OVERLAY_KHR                    0x9296
+#define GL_DARKEN_KHR                     0x9297
+#define GL_LIGHTEN_KHR                    0x9298
+#define GL_COLORDODGE_KHR                 0x9299
+#define GL_COLORBURN_KHR                  0x929A
+#define GL_HARDLIGHT_KHR                  0x929B
+#define GL_SOFTLIGHT_KHR                  0x929C
+#define GL_DIFFERENCE_KHR                 0x929E
+#define GL_EXCLUSION_KHR                  0x92A0
+#define GL_HSL_HUE_KHR                    0x92AD
+#define GL_HSL_SATURATION_KHR             0x92AE
+#define GL_HSL_COLOR_KHR                  0x92AF
+#define GL_HSL_LUMINOSITY_KHR             0x92B0
+typedef void (APIENTRYP PFNGLBLENDBARRIERKHRPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendBarrierKHR (void);
+#endif
+#endif /* GL_KHR_blend_equation_advanced */
+
+#ifndef GL_KHR_blend_equation_advanced_coherent
+#define GL_KHR_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_KHR    0x9285
+#endif /* GL_KHR_blend_equation_advanced_coherent */
+
+#ifndef GL_KHR_context_flush_control
+#define GL_KHR_context_flush_control 1
+#endif /* GL_KHR_context_flush_control */
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#endif /* GL_KHR_debug */
+
+#ifndef GL_KHR_no_error
+#define GL_KHR_no_error 1
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
+#endif /* GL_KHR_no_error */
+
+#ifndef GL_KHR_robust_buffer_access_behavior
+#define GL_KHR_robust_buffer_access_behavior 1
+#endif /* GL_KHR_robust_buffer_access_behavior */
+
+#ifndef GL_KHR_robustness
+#define GL_KHR_robustness 1
+#define GL_CONTEXT_ROBUST_ACCESS          0x90F3
+#endif /* GL_KHR_robustness */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR   0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR   0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR   0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR   0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR   0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR   0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR   0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR   0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR  0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR  0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR  0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif /* GL_KHR_texture_compression_astc_ldr */
+
+#ifndef GL_OES_byte_coordinates
+#define GL_OES_byte_coordinates 1
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD1BOESPROC) (GLbyte s);
+typedef void (APIENTRYP PFNGLTEXCOORD1BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLTEXCOORD2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLTEXCOORD3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLTEXCOORD4BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX2BOESPROC) (GLbyte x, GLbyte y);
+typedef void (APIENTRYP PFNGLVERTEX2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX3BOESPROC) (GLbyte x, GLbyte y, GLbyte z);
+typedef void (APIENTRYP PFNGLVERTEX3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+typedef void (APIENTRYP PFNGLVERTEX4BVOESPROC) (const GLbyte *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiTexCoord1bOES (GLenum texture, GLbyte s);
+GLAPI void APIENTRY glMultiTexCoord1bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord2bOES (GLenum texture, GLbyte s, GLbyte t);
+GLAPI void APIENTRY glMultiTexCoord2bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord3bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glMultiTexCoord3bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord4bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glMultiTexCoord4bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord1bOES (GLbyte s);
+GLAPI void APIENTRY glTexCoord1bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord2bOES (GLbyte s, GLbyte t);
+GLAPI void APIENTRY glTexCoord2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord3bOES (GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glTexCoord3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord4bOES (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glTexCoord4bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex2bOES (GLbyte x, GLbyte y);
+GLAPI void APIENTRY glVertex2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex3bOES (GLbyte x, GLbyte y, GLbyte z);
+GLAPI void APIENTRY glVertex3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex4bOES (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords);
+#endif
+#endif /* GL_OES_byte_coordinates */
+
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#define GL_PALETTE4_RGB8_OES              0x8B90
+#define GL_PALETTE4_RGBA8_OES             0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES          0x8B92
+#define GL_PALETTE4_RGBA4_OES             0x8B93
+#define GL_PALETTE4_RGB5_A1_OES           0x8B94
+#define GL_PALETTE8_RGB8_OES              0x8B95
+#define GL_PALETTE8_RGBA8_OES             0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES          0x8B97
+#define GL_PALETTE8_RGBA4_OES             0x8B98
+#define GL_PALETTE8_RGB5_A1_OES           0x8B99
+#endif /* GL_OES_compressed_paletted_texture */
+
+#ifndef GL_OES_fixed_point
+#define GL_OES_fixed_point 1
+typedef GLint GLfixed;
+#define GL_FIXED_OES                      0x140C
+typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
+typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
+typedef void (APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
+typedef void (APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
+typedef void (APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
+typedef void (APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
+typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLACCUMXOESPROC) (GLenum op, GLfixed value);
+typedef void (APIENTRYP PFNGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+typedef void (APIENTRYP PFNGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue);
+typedef void (APIENTRYP PFNGLCOLOR3XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCOLOR4XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLEVALCOORD1XOESPROC) (GLfixed u);
+typedef void (APIENTRYP PFNGLEVALCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v);
+typedef void (APIENTRYP PFNGLEVALCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v);
+typedef void (APIENTRYP PFNGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values);
+typedef void (APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLINDEXXOESPROC) (GLfixed component);
+typedef void (APIENTRYP PFNGLINDEXXVOESPROC) (const GLfixed *component);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+typedef void (APIENTRYP PFNGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+typedef void (APIENTRYP PFNGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2);
+typedef void (APIENTRYP PFNGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLNORMAL3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLPASSTHROUGHXOESPROC) (GLfixed token);
+typedef void (APIENTRYP PFNGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values);
+typedef void (APIENTRYP PFNGLPIXELSTOREXPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+typedef void (APIENTRYP PFNGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLRASTERPOS2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLRASTERPOS3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+typedef void (APIENTRYP PFNGLRASTERPOS4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+typedef void (APIENTRYP PFNGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2);
+typedef void (APIENTRYP PFNGLTEXCOORD1XOESPROC) (GLfixed s);
+typedef void (APIENTRYP PFNGLTEXCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLTEXCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLTEXCOORD3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLTEXCOORD4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLVERTEX2XOESPROC) (GLfixed x);
+typedef void (APIENTRYP PFNGLVERTEX2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX3XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLVERTEX3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLVERTEX4XVOESPROC) (const GLfixed *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref);
+GLAPI void APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearDepthxOES (GLfixed depth);
+GLAPI void APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
+GLAPI void APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glDepthRangexOES (GLfixed n, GLfixed f);
+GLAPI void APIENTRY glFogxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glFogxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation);
+GLAPI void APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glLineWidthxOES (GLfixed width);
+GLAPI void APIENTRY glLoadMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glMultMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
+GLAPI void APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glPointSizexOES (GLfixed size);
+GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
+GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glAccumxOES (GLenum op, GLfixed value);
+GLAPI void APIENTRY glBitmapxOES (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+GLAPI void APIENTRY glBlendColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearAccumxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glColor3xOES (GLfixed red, GLfixed green, GLfixed blue);
+GLAPI void APIENTRY glColor3xvOES (const GLfixed *components);
+GLAPI void APIENTRY glColor4xvOES (const GLfixed *components);
+GLAPI void APIENTRY glConvolutionParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glConvolutionParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glEvalCoord1xOES (GLfixed u);
+GLAPI void APIENTRY glEvalCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glEvalCoord2xOES (GLfixed u, GLfixed v);
+GLAPI void APIENTRY glEvalCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glFeedbackBufferxOES (GLsizei n, GLenum type, const GLfixed *buffer);
+GLAPI void APIENTRY glGetConvolutionParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetHistogramParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetLightxOES (GLenum light, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetMapxvOES (GLenum target, GLenum query, GLfixed *v);
+GLAPI void APIENTRY glGetMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glGetPixelMapxv (GLenum map, GLint size, GLfixed *values);
+GLAPI void APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexLevelParameterxvOES (GLenum target, GLint level, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glIndexxOES (GLfixed component);
+GLAPI void APIENTRY glIndexxvOES (const GLfixed *component);
+GLAPI void APIENTRY glLoadTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMap1xOES (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+GLAPI void APIENTRY glMap2xOES (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+GLAPI void APIENTRY glMapGrid1xOES (GLint n, GLfixed u1, GLfixed u2);
+GLAPI void APIENTRY glMapGrid2xOES (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+GLAPI void APIENTRY glMultTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord1xOES (GLenum texture, GLfixed s);
+GLAPI void APIENTRY glMultiTexCoord1xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord2xOES (GLenum texture, GLfixed s, GLfixed t);
+GLAPI void APIENTRY glMultiTexCoord2xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord3xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glMultiTexCoord3xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord4xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glNormal3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glPassThroughxOES (GLfixed token);
+GLAPI void APIENTRY glPixelMapx (GLenum map, GLint size, const GLfixed *values);
+GLAPI void APIENTRY glPixelStorex (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelTransferxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelZoomxOES (GLfixed xfactor, GLfixed yfactor);
+GLAPI void APIENTRY glPrioritizeTexturesxOES (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+GLAPI void APIENTRY glRasterPos2xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glRasterPos2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos3xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glRasterPos3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos4xOES (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+GLAPI void APIENTRY glRasterPos4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRectxOES (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+GLAPI void APIENTRY glRectxvOES (const GLfixed *v1, const GLfixed *v2);
+GLAPI void APIENTRY glTexCoord1xOES (GLfixed s);
+GLAPI void APIENTRY glTexCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord2xOES (GLfixed s, GLfixed t);
+GLAPI void APIENTRY glTexCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord3xOES (GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glTexCoord3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord4xOES (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glTexCoord4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glVertex2xOES (GLfixed x);
+GLAPI void APIENTRY glVertex2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex3xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glVertex3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex4xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glVertex4xvOES (const GLfixed *coords);
+#endif
+#endif /* GL_OES_fixed_point */
+
+#ifndef GL_OES_query_matrix
+#define GL_OES_query_matrix 1
+typedef GLbitfield (APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent);
+#endif
+#endif /* GL_OES_query_matrix */
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif /* GL_OES_read_format */
+
+#ifndef GL_OES_single_precision
+#define GL_OES_single_precision 1
+typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
+typedef void (APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
+typedef void (APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearDepthfOES (GLclampf depth);
+GLAPI void APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
+GLAPI void APIENTRY glDepthRangefOES (GLclampf n, GLclampf f);
+GLAPI void APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+GLAPI void APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation);
+GLAPI void APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#endif
+#endif /* GL_OES_single_precision */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif /* GL_3DFX_multisample */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif
+#endif /* GL_3DFX_tbuffer */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+#define GL_FACTOR_MIN_AMD                 0x901C
+#define GL_FACTOR_MAX_AMD                 0x901D
+#endif /* GL_AMD_blend_minmax_factor */
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+#endif /* GL_AMD_conservative_depth */
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif
+#endif /* GL_AMD_debug_output */
+
+#ifndef GL_AMD_depth_clamp_separate
+#define GL_AMD_depth_clamp_separate 1
+#define GL_DEPTH_CLAMP_NEAR_AMD           0x901E
+#define GL_DEPTH_CLAMP_FAR_AMD            0x901F
+#endif /* GL_AMD_depth_clamp_separate */
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_AMD_draw_buffers_blend */
+
+#ifndef GL_AMD_gcn_shader
+#define GL_AMD_gcn_shader 1
+#endif /* GL_AMD_gcn_shader */
+
+#ifndef GL_AMD_gpu_shader_int64
+#define GL_AMD_gpu_shader_int64 1
+typedef int64_t GLint64EXT;
+#define GL_INT64_NV                       0x140E
+#define GL_UNSIGNED_INT64_NV              0x140F
+#define GL_INT8_NV                        0x8FE0
+#define GL_INT8_VEC2_NV                   0x8FE1
+#define GL_INT8_VEC3_NV                   0x8FE2
+#define GL_INT8_VEC4_NV                   0x8FE3
+#define GL_INT16_NV                       0x8FE4
+#define GL_INT16_VEC2_NV                  0x8FE5
+#define GL_INT16_VEC3_NV                  0x8FE6
+#define GL_INT16_VEC4_NV                  0x8FE7
+#define GL_INT64_VEC2_NV                  0x8FE9
+#define GL_INT64_VEC3_NV                  0x8FEA
+#define GL_INT64_VEC4_NV                  0x8FEB
+#define GL_UNSIGNED_INT8_NV               0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
+#define GL_UNSIGNED_INT16_NV              0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
+typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
+GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
+GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_AMD_gpu_shader_int64 */
+
+#ifndef GL_AMD_interleaved_elements
+#define GL_AMD_interleaved_elements 1
+#define GL_VERTEX_ELEMENT_SWIZZLE_AMD     0x91A4
+#define GL_VERTEX_ID_SWIZZLE_AMD          0x91A5
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribParameteriAMD (GLuint index, GLenum pname, GLint param);
+#endif
+#endif /* GL_AMD_interleaved_elements */
+
+#ifndef GL_AMD_multi_draw_indirect
+#define GL_AMD_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectAMD (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#endif
+#endif /* GL_AMD_multi_draw_indirect */
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+#define GL_DATA_BUFFER_AMD                0x9151
+#define GL_PERFORMANCE_MONITOR_AMD        0x9152
+#define GL_QUERY_OBJECT_AMD               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
+#define GL_SAMPLER_OBJECT_AMD             0x9155
+typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
+typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
+typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
+GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
+GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
+#endif
+#endif /* GL_AMD_name_gen_delete */
+
+#ifndef GL_AMD_occlusion_query_event
+#define GL_AMD_occlusion_query_event 1
+#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F
+#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001
+#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002
+#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004
+#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008
+#define GL_QUERY_ALL_EVENT_BITS_AMD       0xFFFFFFFF
+typedef void (APIENTRYP PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryObjectParameteruiAMD (GLenum target, GLuint id, GLenum pname, GLuint param);
+#endif
+#endif /* GL_AMD_occlusion_query_event */
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+#endif /* GL_AMD_performance_monitor */
+
+#ifndef GL_AMD_pinned_memory
+#define GL_AMD_pinned_memory 1
+#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
+#endif /* GL_AMD_pinned_memory */
+
+#ifndef GL_AMD_query_buffer_object
+#define GL_AMD_query_buffer_object 1
+#define GL_QUERY_BUFFER_AMD               0x9192
+#define GL_QUERY_BUFFER_BINDING_AMD       0x9193
+#define GL_QUERY_RESULT_NO_WAIT_AMD       0x9194
+#endif /* GL_AMD_query_buffer_object */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
+typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
+#endif
+#endif /* GL_AMD_sample_positions */
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif /* GL_AMD_seamless_cubemap_per_texture */
+
+#ifndef GL_AMD_shader_atomic_counter_ops
+#define GL_AMD_shader_atomic_counter_ops 1
+#endif /* GL_AMD_shader_atomic_counter_ops */
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif /* GL_AMD_shader_stencil_export */
+
+#ifndef GL_AMD_shader_trinary_minmax
+#define GL_AMD_shader_trinary_minmax 1
+#endif /* GL_AMD_shader_trinary_minmax */
+
+#ifndef GL_AMD_sparse_texture
+#define GL_AMD_sparse_texture 1
+#define GL_VIRTUAL_PAGE_SIZE_X_AMD        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_AMD        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_AMD        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A
+#define GL_MIN_SPARSE_LEVEL_AMD           0x919B
+#define GL_MIN_LOD_WARNING_AMD            0x919C
+#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001
+typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorageSparseAMD (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+GLAPI void APIENTRY glTextureStorageSparseAMD (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#endif
+#endif /* GL_AMD_sparse_texture */
+
+#ifndef GL_AMD_stencil_operation_extended
+#define GL_AMD_stencil_operation_extended 1
+#define GL_SET_AMD                        0x874A
+#define GL_REPLACE_VALUE_AMD              0x874B
+#define GL_STENCIL_OP_VALUE_AMD           0x874C
+#define GL_STENCIL_BACK_OP_VALUE_AMD      0x874D
+typedef void (APIENTRYP PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
+#endif
+#endif /* GL_AMD_stencil_operation_extended */
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif /* GL_AMD_texture_texture4 */
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+#endif /* GL_AMD_transform_feedback3_lines_triangles */
+
+#ifndef GL_AMD_transform_feedback4
+#define GL_AMD_transform_feedback4 1
+#define GL_STREAM_RASTERIZATION_AMD       0x91A0
+#endif /* GL_AMD_transform_feedback4 */
+
+#ifndef GL_AMD_vertex_shader_layer
+#define GL_AMD_vertex_shader_layer 1
+#endif /* GL_AMD_vertex_shader_layer */
+
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+#ifndef GL_AMD_vertex_shader_viewport_index
+#define GL_AMD_vertex_shader_viewport_index 1
+#endif /* GL_AMD_vertex_shader_viewport_index */
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif /* GL_APPLE_aux_depth_stencil */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif /* GL_APPLE_client_storage */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+#endif /* GL_APPLE_element_array */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif
+#endif /* GL_APPLE_fence */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif /* GL_APPLE_float_pixels */
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+#endif /* GL_APPLE_flush_buffer_range */
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_APPLE_object_purgeable */
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#define GL_RGB_422_APPLE                  0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#define GL_RGB_RAW_422_APPLE              0x8A51
+#endif /* GL_APPLE_rgb_422 */
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif /* GL_APPLE_row_bytes */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif /* GL_APPLE_specular_vector */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_APPLE_texture_range */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif /* GL_APPLE_transform_hint */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE           0x85B4
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#define GL_YCBCR_422_APPLE                0x85B9
+#endif /* GL_APPLE_ycbcr_422 */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ATI_draw_buffers */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+#endif /* GL_ATI_element_array */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif
+#endif /* GL_ATI_fragment_shader */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+typedef void *(APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void *APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif
+#endif /* GL_ATI_map_object_buffer */
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif /* GL_ATI_meminfo */
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+#define GL_RGBA_FLOAT_MODE_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif /* GL_ATI_pixel_format_float */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_pn_triangles */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+#endif /* GL_ATI_separate_stencil */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif /* GL_ATI_text_fragment_shader */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif /* GL_ATI_texture_env_combine3 */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif /* GL_ATI_texture_float */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif /* GL_ATI_texture_mirror_once */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const void *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_array_object */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_vertex_streams */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif /* GL_EXT_422_pixels */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#define GL_ABGR_EXT                       0x8000
+#endif /* GL_EXT_abgr */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif /* GL_EXT_bgra */
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif
+#endif /* GL_EXT_bindable_uniform */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#endif
+#endif /* GL_EXT_blend_color */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_EXT_blend_func_separate */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif /* GL_EXT_blend_logic_op */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_BLEND_EQUATION_EXT             0x8009
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_blend_minmax */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif /* GL_EXT_blend_subtract */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif /* GL_EXT_clip_volume_hint */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif /* GL_EXT_cmyka */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+#endif /* GL_EXT_color_subtable */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#endif
+#endif /* GL_EXT_convolution */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_coordinate_frame */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_copy_texture */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_cull_vertex */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
+#define GL_PROGRAM_OBJECT_EXT             0x8B40
+#define GL_SHADER_OBJECT_EXT              0x8B48
+#define GL_BUFFER_OBJECT_EXT              0x9151
+#define GL_QUERY_OBJECT_EXT               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT        0x9154
+typedef void (APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_EXT_debug_label */
+
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+typedef void (APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPopGroupMarkerEXT (void);
+#endif
+#endif /* GL_EXT_debug_marker */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void **data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void **params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void **param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void **param);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, void **data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void *APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glEnableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloati_vEXT (GLenum pname, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetDoublei_vEXT (GLenum pname, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetPointeri_vEXT (GLenum pname, GLuint index, void **params);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, void *string);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glVertexArrayVertexOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayEdgeFlagOffsetEXT (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayIndexOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayNormalOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayMultiTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayFogCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArraySecondaryColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glEnableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glDisableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glEnableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glDisableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glGetVertexArrayIntegervEXT (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointervEXT (GLuint vaobj, GLenum pname, void **param);
+GLAPI void APIENTRY glGetVertexArrayIntegeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, void **param);
+GLAPI void *APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glNamedBufferStorageEXT (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor);
+#endif
+#endif /* GL_EXT_direct_state_access */
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#endif
+#endif /* GL_EXT_draw_buffers2 */
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_draw_instanced */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#endif
+#endif /* GL_EXT_draw_range_elements */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_fog_coord */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifndef GL_EXT_framebuffer_multisample_blit_scaled
+#define GL_EXT_framebuffer_multisample_blit_scaled 1
+#define GL_SCALED_RESOLVE_FASTEST_EXT     0x90BA
+#define GL_SCALED_RESOLVE_NICEST_EXT      0x90BB
+#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif
+#endif /* GL_EXT_framebuffer_object */
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif /* GL_EXT_framebuffer_sRGB */
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif
+#endif /* GL_EXT_geometry_shader4 */
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+#endif /* GL_EXT_gpu_program_parameters */
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT   0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT   0x8905
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+#endif
+#endif /* GL_EXT_gpu_shader4 */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif
+#endif /* GL_EXT_histogram */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif /* GL_EXT_index_array_formats */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif
+#endif /* GL_EXT_index_func */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_index_material */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif /* GL_EXT_index_texture */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_light_texture */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif /* GL_EXT_misc_attribute */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif
+#endif /* GL_EXT_multisample */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif /* GL_EXT_packed_depth_stencil */
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif /* GL_EXT_packed_float */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif /* GL_EXT_packed_pixels */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, void *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_paletted_texture */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif /* GL_EXT_pixel_buffer_object */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_pixel_transform */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif /* GL_EXT_pixel_transform_color_table */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_EXT_point_parameters */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif
+#endif /* GL_EXT_polygon_offset */
+
+#ifndef GL_EXT_polygon_offset_clamp
+#define GL_EXT_polygon_offset_clamp 1
+#define GL_POLYGON_OFFSET_CLAMP_EXT       0x8E1B
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetClampEXT (GLfloat factor, GLfloat units, GLfloat clamp);
+#endif
+#endif /* GL_EXT_polygon_offset_clamp */
+
+#ifndef GL_EXT_post_depth_coverage
+#define GL_EXT_post_depth_coverage 1
+#endif /* GL_EXT_post_depth_coverage */
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_provoking_vertex */
+
+#ifndef GL_EXT_raster_multisample
+#define GL_EXT_raster_multisample 1
+#define GL_RASTER_MULTISAMPLE_EXT         0x9327
+#define GL_RASTER_SAMPLES_EXT             0x9328
+#define GL_MAX_RASTER_SAMPLES_EXT         0x9329
+#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A
+#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B
+#define GL_EFFECTIVE_RASTER_SAMPLES_EXT   0x932C
+typedef void (APIENTRYP PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRasterSamplesEXT (GLuint samples, GLboolean fixedsamplelocations);
+#endif
+#endif /* GL_EXT_raster_multisample */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif /* GL_EXT_rescale_normal */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_secondary_color */
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif
+#endif /* GL_EXT_separate_shader_objects */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif /* GL_EXT_separate_specular_color */
+
+#ifndef GL_EXT_shader_image_load_formatted
+#define GL_EXT_shader_image_load_formatted 1
+#endif /* GL_EXT_shader_image_load_formatted */
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
+#define GL_IMAGE_1D_EXT                   0x904C
+#define GL_IMAGE_2D_EXT                   0x904D
+#define GL_IMAGE_3D_EXT                   0x904E
+#define GL_IMAGE_2D_RECT_EXT              0x904F
+#define GL_IMAGE_CUBE_EXT                 0x9050
+#define GL_IMAGE_BUFFER_EXT               0x9051
+#define GL_IMAGE_1D_ARRAY_EXT             0x9052
+#define GL_IMAGE_2D_ARRAY_EXT             0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT               0x9057
+#define GL_INT_IMAGE_2D_EXT               0x9058
+#define GL_INT_IMAGE_3D_EXT               0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
+#define GL_INT_IMAGE_CUBE_EXT             0x905B
+#define GL_INT_IMAGE_BUFFER_EXT           0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
+#endif
+#endif /* GL_EXT_shader_image_load_store */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+#endif /* GL_EXT_shader_integer_mix */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif /* GL_EXT_shadow_funcs */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif /* GL_EXT_shared_texture_palette */
+
+#ifndef GL_EXT_sparse_texture2
+#define GL_EXT_sparse_texture2 1
+#endif /* GL_EXT_sparse_texture2 */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+#endif /* GL_EXT_stencil_clear_tag */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif
+#endif /* GL_EXT_stencil_two_side */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif /* GL_EXT_stencil_wrap */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_subtexture */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif /* GL_EXT_texture */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_texture3D */
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+#endif /* GL_EXT_texture_array */
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_EXT_texture_buffer_object */
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif /* GL_EXT_texture_compression_latc */
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif /* GL_EXT_texture_compression_rgtc */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif /* GL_EXT_texture_compression_s3tc */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif /* GL_EXT_texture_cube_map */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif /* GL_EXT_texture_env_add */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif /* GL_EXT_texture_env_combine */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif /* GL_EXT_texture_env_dot3 */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+#ifndef GL_EXT_texture_filter_minmax
+#define GL_EXT_texture_filter_minmax 1
+#endif /* GL_EXT_texture_filter_minmax */
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+#endif /* GL_EXT_texture_integer */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif /* GL_EXT_texture_lod_bias */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif /* GL_EXT_texture_mirror_clamp */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+#endif /* GL_EXT_texture_object */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif /* GL_EXT_texture_sRGB */
+
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+#define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
+#define GL_DECODE_EXT                     0x8A49
+#define GL_SKIP_DECODE_EXT                0x8A4A
+#endif /* GL_EXT_texture_sRGB_decode */
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif /* GL_EXT_texture_shared_exponent */
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#endif /* GL_EXT_texture_snorm */
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif /* GL_EXT_texture_swizzle */
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#define GL_TIME_ELAPSED_EXT               0x88BF
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+#endif /* GL_EXT_timer_query */
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+#endif /* GL_EXT_transform_feedback */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, void **params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_array */
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif /* GL_EXT_vertex_array_bgra */
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+#define GL_DOUBLE_VEC2_EXT                0x8FFC
+#define GL_DOUBLE_VEC3_EXT                0x8FFD
+#define GL_DOUBLE_VEC4_EXT                0x8FFE
+#define GL_DOUBLE_MAT2_EXT                0x8F46
+#define GL_DOUBLE_MAT3_EXT                0x8F47
+#define GL_DOUBLE_MAT4_EXT                0x8F48
+#define GL_DOUBLE_MAT2x3_EXT              0x8F49
+#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
+#endif
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const void *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const void *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, void **data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif
+#endif /* GL_EXT_vertex_shader */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     0x0BA3
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          0x0BA6
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 0x1700
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_weighting */
+
+#ifndef GL_EXT_x11_sync_object
+#define GL_EXT_x11_sync_object 1
+#define GL_SYNC_X11_FENCE_EXT             0x90E1
+typedef GLsync (APIENTRYP PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glImportSyncEXT (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#endif
+#endif /* GL_EXT_x11_sync_object */
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif
+#endif /* GL_GREMEDY_frame_terminator */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const void *string);
+#endif
+#endif /* GL_GREMEDY_string_marker */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif /* GL_HP_convolution_border_modes */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_HP_image_transform */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif /* GL_HP_occlusion_test */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif /* GL_HP_texture_lighting */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#define GL_CULL_VERTEX_IBM                103050
+#endif /* GL_IBM_cull_vertex */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#endif
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif /* GL_IBM_rasterpos_clip */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+#define GL_ALL_STATIC_DATA_IBM            103060
+#define GL_STATIC_VERTEX_ARRAY_IBM        103061
+typedef void (APIENTRYP PFNGLFLUSHSTATICDATAIBMPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushStaticDataIBM (GLenum target);
+#endif
+#endif /* GL_IBM_static_data */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean **pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#endif
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_INGR_blend_func_separate */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif /* GL_INGR_color_clamp */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif /* GL_INGR_interlace_read */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+#endif /* GL_INTEL_fragment_shader_ordering */
+
+#ifndef GL_INTEL_map_texture
+#define GL_INTEL_map_texture 1
+#define GL_TEXTURE_MEMORY_LAYOUT_INTEL    0x83FF
+#define GL_LAYOUT_DEFAULT_INTEL           0
+#define GL_LAYOUT_LINEAR_INTEL            1
+#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2
+typedef void (APIENTRYP PFNGLSYNCTEXTUREINTELPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level);
+typedef void *(APIENTRYP PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSyncTextureINTEL (GLuint texture);
+GLAPI void APIENTRY glUnmapTexture2DINTEL (GLuint texture, GLint level);
+GLAPI void *APIENTRY glMapTexture2DINTEL (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#endif
+#endif /* GL_INTEL_map_texture */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const void **pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const void **pointer);
+#endif
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifndef GL_INTEL_performance_query
+#define GL_INTEL_performance_query 1
+#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000
+#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001
+#define GL_PERFQUERY_WAIT_INTEL           0x83FB
+#define GL_PERFQUERY_FLUSH_INTEL          0x83FA
+#define GL_PERFQUERY_DONOT_FLUSH_INTEL    0x83F9
+#define GL_PERFQUERY_COUNTER_EVENT_INTEL  0x94F0
+#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
+#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
+#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
+#define GL_PERFQUERY_COUNTER_RAW_INTEL    0x94F4
+#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
+#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
+#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
+#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
+#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
+#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
+#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
+#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
+#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
+#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
+typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle);
+typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
+typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle);
+GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
+GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
+GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
+GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#endif
+#endif /* GL_INTEL_performance_query */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif /* GL_MESAX_texture_stack */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#define GL_PACK_INVERT_MESA               0x8758
+#endif /* GL_MESA_pack_invert */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif
+#endif /* GL_MESA_resize_buffers */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif
+#endif /* GL_MESA_window_pos */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif /* GL_MESA_ycbcr_texture */
+
+#ifndef GL_NVX_conditional_render
+#define GL_NVX_conditional_render 1
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNVX (GLuint id);
+GLAPI void APIENTRY glEndConditionalRenderNVX (void);
+#endif
+#endif /* GL_NVX_conditional_render */
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_NVX_gpu_memory_info 1
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+#endif /* GL_NVX_gpu_memory_info */
+
+#ifndef GL_NV_bindless_multi_draw_indirect
+#define GL_NV_bindless_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+#ifndef GL_NV_bindless_multi_draw_indirect_count
+#define GL_NV_bindless_multi_draw_indirect_count 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessCountNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessCountNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+
+#ifndef GL_NV_bindless_texture
+#define GL_NV_bindless_texture 1
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle);
+#endif
+#endif /* GL_NV_bindless_texture */
+
+#ifndef GL_NV_blend_equation_advanced
+#define GL_NV_blend_equation_advanced 1
+#define GL_BLEND_OVERLAP_NV               0x9281
+#define GL_BLEND_PREMULTIPLIED_SRC_NV     0x9280
+#define GL_BLUE_NV                        0x1905
+#define GL_COLORBURN_NV                   0x929A
+#define GL_COLORDODGE_NV                  0x9299
+#define GL_CONJOINT_NV                    0x9284
+#define GL_CONTRAST_NV                    0x92A1
+#define GL_DARKEN_NV                      0x9297
+#define GL_DIFFERENCE_NV                  0x929E
+#define GL_DISJOINT_NV                    0x9283
+#define GL_DST_ATOP_NV                    0x928F
+#define GL_DST_IN_NV                      0x928B
+#define GL_DST_NV                         0x9287
+#define GL_DST_OUT_NV                     0x928D
+#define GL_DST_OVER_NV                    0x9289
+#define GL_EXCLUSION_NV                   0x92A0
+#define GL_GREEN_NV                       0x1904
+#define GL_HARDLIGHT_NV                   0x929B
+#define GL_HARDMIX_NV                     0x92A9
+#define GL_HSL_COLOR_NV                   0x92AF
+#define GL_HSL_HUE_NV                     0x92AD
+#define GL_HSL_LUMINOSITY_NV              0x92B0
+#define GL_HSL_SATURATION_NV              0x92AE
+#define GL_INVERT_OVG_NV                  0x92B4
+#define GL_INVERT_RGB_NV                  0x92A3
+#define GL_LIGHTEN_NV                     0x9298
+#define GL_LINEARBURN_NV                  0x92A5
+#define GL_LINEARDODGE_NV                 0x92A4
+#define GL_LINEARLIGHT_NV                 0x92A7
+#define GL_MINUS_CLAMPED_NV               0x92B3
+#define GL_MINUS_NV                       0x929F
+#define GL_MULTIPLY_NV                    0x9294
+#define GL_OVERLAY_NV                     0x9296
+#define GL_PINLIGHT_NV                    0x92A8
+#define GL_PLUS_CLAMPED_ALPHA_NV          0x92B2
+#define GL_PLUS_CLAMPED_NV                0x92B1
+#define GL_PLUS_DARKER_NV                 0x9292
+#define GL_PLUS_NV                        0x9291
+#define GL_RED_NV                         0x1903
+#define GL_SCREEN_NV                      0x9295
+#define GL_SOFTLIGHT_NV                   0x929C
+#define GL_SRC_ATOP_NV                    0x928E
+#define GL_SRC_IN_NV                      0x928A
+#define GL_SRC_NV                         0x9286
+#define GL_SRC_OUT_NV                     0x928C
+#define GL_SRC_OVER_NV                    0x9288
+#define GL_UNCORRELATED_NV                0x9282
+#define GL_VIVIDLIGHT_NV                  0x92A6
+#define GL_XOR_NV                         0x1506
+typedef void (APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLBLENDBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendParameteriNV (GLenum pname, GLint value);
+GLAPI void APIENTRY glBlendBarrierNV (void);
+#endif
+#endif /* GL_NV_blend_equation_advanced */
+
+#ifndef GL_NV_blend_equation_advanced_coherent
+#define GL_NV_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
+#endif /* GL_NV_blend_equation_advanced_coherent */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif /* GL_NV_blend_square */
+
+#ifndef GL_NV_command_list
+#define GL_NV_command_list 1
+#define GL_TERMINATE_SEQUENCE_COMMAND_NV  0x0000
+#define GL_NOP_COMMAND_NV                 0x0001
+#define GL_DRAW_ELEMENTS_COMMAND_NV       0x0002
+#define GL_DRAW_ARRAYS_COMMAND_NV         0x0003
+#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004
+#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV   0x0005
+#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006
+#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007
+#define GL_ELEMENT_ADDRESS_COMMAND_NV     0x0008
+#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV   0x0009
+#define GL_UNIFORM_ADDRESS_COMMAND_NV     0x000A
+#define GL_BLEND_COLOR_COMMAND_NV         0x000B
+#define GL_STENCIL_REF_COMMAND_NV         0x000C
+#define GL_LINE_WIDTH_COMMAND_NV          0x000D
+#define GL_POLYGON_OFFSET_COMMAND_NV      0x000E
+#define GL_ALPHA_REF_COMMAND_NV           0x000F
+#define GL_VIEWPORT_COMMAND_NV            0x0010
+#define GL_SCISSOR_COMMAND_NV             0x0011
+#define GL_FRONT_FACE_COMMAND_NV          0x0012
+typedef void (APIENTRYP PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint *states);
+typedef void (APIENTRYP PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint *states);
+typedef GLboolean (APIENTRYP PFNGLISSTATENVPROC) (GLuint state);
+typedef void (APIENTRYP PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode);
+typedef GLuint (APIENTRYP PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size);
+typedef GLushort (APIENTRYP PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint *lists);
+typedef void (APIENTRYP PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint *lists);
+typedef GLboolean (APIENTRYP PFNGLISCOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments);
+typedef void (APIENTRYP PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLCALLCOMMANDLISTNVPROC) (GLuint list);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCreateStatesNV (GLsizei n, GLuint *states);
+GLAPI void APIENTRY glDeleteStatesNV (GLsizei n, const GLuint *states);
+GLAPI GLboolean APIENTRY glIsStateNV (GLuint state);
+GLAPI void APIENTRY glStateCaptureNV (GLuint state, GLenum mode);
+GLAPI GLuint APIENTRY glGetCommandHeaderNV (GLenum tokenID, GLuint size);
+GLAPI GLushort APIENTRY glGetStageIndexNV (GLenum shadertype);
+GLAPI void APIENTRY glDrawCommandsNV (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsAddressNV (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesNV (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesAddressNV (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCreateCommandListsNV (GLsizei n, GLuint *lists);
+GLAPI void APIENTRY glDeleteCommandListsNV (GLsizei n, const GLuint *lists);
+GLAPI GLboolean APIENTRY glIsCommandListNV (GLuint list);
+GLAPI void APIENTRY glListDrawCommandsStatesClientNV (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCommandListSegmentsNV (GLuint list, GLuint segments);
+GLAPI void APIENTRY glCompileCommandListNV (GLuint list);
+GLAPI void APIENTRY glCallCommandListNV (GLuint list);
+#endif
+#endif /* GL_NV_command_list */
+
+#ifndef GL_NV_compute_program5
+#define GL_NV_compute_program5 1
+#define GL_COMPUTE_PROGRAM_NV             0x90FB
+#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
+#endif /* GL_NV_compute_program5 */
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif
+#endif /* GL_NV_conditional_render */
+
+#ifndef GL_NV_conservative_raster
+#define GL_NV_conservative_raster 1
+#define GL_CONSERVATIVE_RASTERIZATION_NV  0x9346
+#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347
+#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348
+#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349
+typedef void (APIENTRYP PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits);
+#endif
+#endif /* GL_NV_conservative_raster */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif /* GL_NV_copy_depth_to_color */
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_NV_copy_image */
+
+#ifndef GL_NV_deep_texture3D
+#define GL_NV_deep_texture3D 1
+#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0
+#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV   0x90D1
+#endif /* GL_NV_deep_texture3D */
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif
+#endif /* GL_NV_depth_buffer_float */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif /* GL_NV_depth_clamp */
+
+#ifndef GL_NV_draw_texture
+#define GL_NV_draw_texture 1
+typedef void (APIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#endif
+#endif /* GL_NV_draw_texture */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif
+#endif /* GL_NV_evaluators */
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif
+#endif /* GL_NV_explicit_multisample */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif
+#endif /* GL_NV_fence */
+
+#ifndef GL_NV_fill_rectangle
+#define GL_NV_fill_rectangle 1
+#define GL_FILL_RECTANGLE_NV              0x933C
+#endif /* GL_NV_fill_rectangle */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif /* GL_NV_float_buffer */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+#endif /* GL_NV_fog_distance */
+
+#ifndef GL_NV_fragment_coverage_to_color
+#define GL_NV_fragment_coverage_to_color 1
+#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV  0x92DD
+#define GL_FRAGMENT_COVERAGE_COLOR_NV     0x92DE
+typedef void (APIENTRYP PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentCoverageColorNV (GLuint color);
+#endif
+#endif /* GL_NV_fragment_coverage_to_color */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+#endif /* GL_NV_fragment_program */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif /* GL_NV_fragment_program2 */
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif /* GL_NV_fragment_program4 */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif /* GL_NV_fragment_program_option */
+
+#ifndef GL_NV_fragment_shader_interlock
+#define GL_NV_fragment_shader_interlock 1
+#endif /* GL_NV_fragment_shader_interlock */
+
+#ifndef GL_NV_framebuffer_mixed_samples
+#define GL_NV_framebuffer_mixed_samples 1
+#define GL_COVERAGE_MODULATION_TABLE_NV   0x9331
+#define GL_COLOR_SAMPLES_NV               0x8E20
+#define GL_DEPTH_SAMPLES_NV               0x932D
+#define GL_STENCIL_SAMPLES_NV             0x932E
+#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F
+#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330
+#define GL_COVERAGE_MODULATION_NV         0x9332
+#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat *v);
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCoverageModulationTableNV (GLsizei n, const GLfloat *v);
+GLAPI void APIENTRY glGetCoverageModulationTableNV (GLsizei bufsize, GLfloat *v);
+GLAPI void APIENTRY glCoverageModulationNV (GLenum components);
+#endif
+#endif /* GL_NV_framebuffer_mixed_samples */
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_NV_geometry_program4 */
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif /* GL_NV_geometry_shader4 */
+
+#ifndef GL_NV_geometry_shader_passthrough
+#define GL_NV_geometry_shader_passthrough 1
+#endif /* GL_NV_geometry_shader_passthrough */
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif
+#endif /* GL_NV_gpu_program4 */
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
+#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
+#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
+typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
+#endif
+#endif /* GL_NV_gpu_program5 */
+
+#ifndef GL_NV_gpu_program5_mem_extended
+#define GL_NV_gpu_program5_mem_extended 1
+#endif /* GL_NV_gpu_program5_mem_extended */
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+#endif /* GL_NV_gpu_shader5 */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+typedef unsigned short GLhalfNV;
+#define GL_HALF_FLOAT_NV                  0x140B
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+#endif /* GL_NV_half_float */
+
+#ifndef GL_NV_internalformat_sample_query
+#define GL_NV_internalformat_sample_query 1
+#define GL_MULTISAMPLES_NV                0x9371
+#define GL_SUPERSAMPLE_SCALE_X_NV         0x9372
+#define GL_SUPERSAMPLE_SCALE_Y_NV         0x9373
+#define GL_CONFORMANT_NV                  0x9374
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint *params);
+#endif
+#endif /* GL_NV_internalformat_sample_query */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif /* GL_NV_light_max_exponent */
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+#endif /* GL_NV_multisample_coverage */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif /* GL_NV_multisample_filter_hint */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_occlusion_query */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif /* GL_NV_packed_depth_stencil */
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#endif
+#endif /* GL_NV_parameter_buffer_object */
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif /* GL_NV_parameter_buffer_object2 */
+
+#ifndef GL_NV_path_rendering
+#define GL_NV_path_rendering 1
+#define GL_PATH_FORMAT_SVG_NV             0x9070
+#define GL_PATH_FORMAT_PS_NV              0x9071
+#define GL_STANDARD_FONT_NAME_NV          0x9072
+#define GL_SYSTEM_FONT_NAME_NV            0x9073
+#define GL_FILE_NAME_NV                   0x9074
+#define GL_PATH_STROKE_WIDTH_NV           0x9075
+#define GL_PATH_END_CAPS_NV               0x9076
+#define GL_PATH_INITIAL_END_CAP_NV        0x9077
+#define GL_PATH_TERMINAL_END_CAP_NV       0x9078
+#define GL_PATH_JOIN_STYLE_NV             0x9079
+#define GL_PATH_MITER_LIMIT_NV            0x907A
+#define GL_PATH_DASH_CAPS_NV              0x907B
+#define GL_PATH_INITIAL_DASH_CAP_NV       0x907C
+#define GL_PATH_TERMINAL_DASH_CAP_NV      0x907D
+#define GL_PATH_DASH_OFFSET_NV            0x907E
+#define GL_PATH_CLIENT_LENGTH_NV          0x907F
+#define GL_PATH_FILL_MODE_NV              0x9080
+#define GL_PATH_FILL_MASK_NV              0x9081
+#define GL_PATH_FILL_COVER_MODE_NV        0x9082
+#define GL_PATH_STROKE_COVER_MODE_NV      0x9083
+#define GL_PATH_STROKE_MASK_NV            0x9084
+#define GL_COUNT_UP_NV                    0x9088
+#define GL_COUNT_DOWN_NV                  0x9089
+#define GL_PATH_OBJECT_BOUNDING_BOX_NV    0x908A
+#define GL_CONVEX_HULL_NV                 0x908B
+#define GL_BOUNDING_BOX_NV                0x908D
+#define GL_TRANSLATE_X_NV                 0x908E
+#define GL_TRANSLATE_Y_NV                 0x908F
+#define GL_TRANSLATE_2D_NV                0x9090
+#define GL_TRANSLATE_3D_NV                0x9091
+#define GL_AFFINE_2D_NV                   0x9092
+#define GL_AFFINE_3D_NV                   0x9094
+#define GL_TRANSPOSE_AFFINE_2D_NV         0x9096
+#define GL_TRANSPOSE_AFFINE_3D_NV         0x9098
+#define GL_UTF8_NV                        0x909A
+#define GL_UTF16_NV                       0x909B
+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
+#define GL_PATH_COMMAND_COUNT_NV          0x909D
+#define GL_PATH_COORD_COUNT_NV            0x909E
+#define GL_PATH_DASH_ARRAY_COUNT_NV       0x909F
+#define GL_PATH_COMPUTED_LENGTH_NV        0x90A0
+#define GL_PATH_FILL_BOUNDING_BOX_NV      0x90A1
+#define GL_PATH_STROKE_BOUNDING_BOX_NV    0x90A2
+#define GL_SQUARE_NV                      0x90A3
+#define GL_ROUND_NV                       0x90A4
+#define GL_TRIANGULAR_NV                  0x90A5
+#define GL_BEVEL_NV                       0x90A6
+#define GL_MITER_REVERT_NV                0x90A7
+#define GL_MITER_TRUNCATE_NV              0x90A8
+#define GL_SKIP_MISSING_GLYPH_NV          0x90A9
+#define GL_USE_MISSING_GLYPH_NV           0x90AA
+#define GL_PATH_ERROR_POSITION_NV         0x90AB
+#define GL_ACCUM_ADJACENT_PAIRS_NV        0x90AD
+#define GL_ADJACENT_PAIRS_NV              0x90AE
+#define GL_FIRST_TO_REST_NV               0x90AF
+#define GL_PATH_GEN_MODE_NV               0x90B0
+#define GL_PATH_GEN_COEFF_NV              0x90B1
+#define GL_PATH_GEN_COMPONENTS_NV         0x90B3
+#define GL_PATH_STENCIL_FUNC_NV           0x90B7
+#define GL_PATH_STENCIL_REF_NV            0x90B8
+#define GL_PATH_STENCIL_VALUE_MASK_NV     0x90B9
+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
+#define GL_PATH_COVER_DEPTH_FUNC_NV       0x90BF
+#define GL_PATH_DASH_OFFSET_RESET_NV      0x90B4
+#define GL_MOVE_TO_RESETS_NV              0x90B5
+#define GL_MOVE_TO_CONTINUES_NV           0x90B6
+#define GL_CLOSE_PATH_NV                  0x00
+#define GL_MOVE_TO_NV                     0x02
+#define GL_RELATIVE_MOVE_TO_NV            0x03
+#define GL_LINE_TO_NV                     0x04
+#define GL_RELATIVE_LINE_TO_NV            0x05
+#define GL_HORIZONTAL_LINE_TO_NV          0x06
+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
+#define GL_VERTICAL_LINE_TO_NV            0x08
+#define GL_RELATIVE_VERTICAL_LINE_TO_NV   0x09
+#define GL_QUADRATIC_CURVE_TO_NV          0x0A
+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
+#define GL_CUBIC_CURVE_TO_NV              0x0C
+#define GL_RELATIVE_CUBIC_CURVE_TO_NV     0x0D
+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV   0x0E
+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
+#define GL_SMOOTH_CUBIC_CURVE_TO_NV       0x10
+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
+#define GL_SMALL_CCW_ARC_TO_NV            0x12
+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV   0x13
+#define GL_SMALL_CW_ARC_TO_NV             0x14
+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV    0x15
+#define GL_LARGE_CCW_ARC_TO_NV            0x16
+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV   0x17
+#define GL_LARGE_CW_ARC_TO_NV             0x18
+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV    0x19
+#define GL_RESTART_PATH_NV                0xF0
+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV    0xF2
+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV     0xF4
+#define GL_RECT_NV                        0xF6
+#define GL_CIRCULAR_CCW_ARC_TO_NV         0xF8
+#define GL_CIRCULAR_CW_ARC_TO_NV          0xFA
+#define GL_CIRCULAR_TANGENT_ARC_TO_NV     0xFC
+#define GL_ARC_TO_NV                      0xFE
+#define GL_RELATIVE_ARC_TO_NV             0xFF
+#define GL_BOLD_BIT_NV                    0x01
+#define GL_ITALIC_BIT_NV                  0x02
+#define GL_GLYPH_WIDTH_BIT_NV             0x01
+#define GL_GLYPH_HEIGHT_BIT_NV            0x02
+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
+#define GL_GLYPH_HAS_KERNING_BIT_NV       0x100
+#define GL_FONT_X_MIN_BOUNDS_BIT_NV       0x00010000
+#define GL_FONT_Y_MIN_BOUNDS_BIT_NV       0x00020000
+#define GL_FONT_X_MAX_BOUNDS_BIT_NV       0x00040000
+#define GL_FONT_Y_MAX_BOUNDS_BIT_NV       0x00080000
+#define GL_FONT_UNITS_PER_EM_BIT_NV       0x00100000
+#define GL_FONT_ASCENDER_BIT_NV           0x00200000
+#define GL_FONT_DESCENDER_BIT_NV          0x00400000
+#define GL_FONT_HEIGHT_BIT_NV             0x00800000
+#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV  0x01000000
+#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
+#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
+#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
+#define GL_FONT_HAS_KERNING_BIT_NV        0x10000000
+#define GL_ROUNDED_RECT_NV                0xE8
+#define GL_RELATIVE_ROUNDED_RECT_NV       0xE9
+#define GL_ROUNDED_RECT2_NV               0xEA
+#define GL_RELATIVE_ROUNDED_RECT2_NV      0xEB
+#define GL_ROUNDED_RECT4_NV               0xEC
+#define GL_RELATIVE_ROUNDED_RECT4_NV      0xED
+#define GL_ROUNDED_RECT8_NV               0xEE
+#define GL_RELATIVE_ROUNDED_RECT8_NV      0xEF
+#define GL_RELATIVE_RECT_NV               0xF7
+#define GL_FONT_GLYPHS_AVAILABLE_NV       0x9368
+#define GL_FONT_TARGET_UNAVAILABLE_NV     0x9369
+#define GL_FONT_UNAVAILABLE_NV            0x936A
+#define GL_FONT_UNINTELLIGIBLE_NV         0x936B
+#define GL_CONIC_CURVE_TO_NV              0x1A
+#define GL_RELATIVE_CONIC_CURVE_TO_NV     0x1B
+#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV  0x20000000
+#define GL_STANDARD_FONT_FORMAT_NV        0x936C
+#define GL_2_BYTES_NV                     0x1407
+#define GL_3_BYTES_NV                     0x1408
+#define GL_4_BYTES_NV                     0x1409
+#define GL_EYE_LINEAR_NV                  0x2400
+#define GL_OBJECT_LINEAR_NV               0x2401
+#define GL_CONSTANT_NV                    0x8576
+#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
+#define GL_PATH_PROJECTION_NV             0x1701
+#define GL_PATH_MODELVIEW_NV              0x1700
+#define GL_PATH_MODELVIEW_STACK_DEPTH_NV  0x0BA3
+#define GL_PATH_MODELVIEW_MATRIX_NV       0x0BA6
+#define GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV 0x0D36
+#define GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV 0x84E3
+#define GL_PATH_PROJECTION_STACK_DEPTH_NV 0x0BA4
+#define GL_PATH_PROJECTION_MATRIX_NV      0x0BA7
+#define GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV 0x0D38
+#define GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV 0x84E4
+#define GL_FRAGMENT_INPUT_NV              0x936D
+typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path);
+typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString);
+typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
+typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
+typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands);
+typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords);
+typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
+typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
+typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
+GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
+GLAPI GLboolean APIENTRY glIsPathNV (GLuint path);
+GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const void *pathString);
+GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath);
+GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value);
+GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value);
+GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value);
+GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value);
+GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units);
+GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask);
+GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask);
+GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
+GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands);
+GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords);
+GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
+GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
+GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
+GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+GLAPI void APIENTRY glMatrixLoad3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoad3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glStencilThenCoverFillPathNV (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverStrokePathNV (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilThenCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#endif
+#endif /* GL_NV_path_rendering */
+
+#ifndef GL_NV_path_rendering_shared_edge
+#define GL_NV_path_rendering_shared_edge 1
+#define GL_SHARED_EDGE_NV                 0xC0
+#endif /* GL_NV_path_rendering_shared_edge */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif
+#endif /* GL_NV_pixel_data_range */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_NV_point_sprite */
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_NV_present_video */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif
+#endif /* GL_NV_primitive_restart */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_register_combiners */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_NV_register_combiners2 */
+
+#ifndef GL_NV_sample_locations
+#define GL_NV_sample_locations 1
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340
+#define GL_SAMPLE_LOCATION_NV             0x8E50
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLRESOLVEDEPTHVALUESNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSampleLocationsfvNV (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvNV (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glResolveDepthValuesNV (void);
+#endif
+#endif /* GL_NV_sample_locations */
+
+#ifndef GL_NV_sample_mask_override_coverage
+#define GL_NV_sample_mask_override_coverage 1
+#endif /* GL_NV_sample_mask_override_coverage */
+
+#ifndef GL_NV_shader_atomic_counters
+#define GL_NV_shader_atomic_counters 1
+#endif /* GL_NV_shader_atomic_counters */
+
+#ifndef GL_NV_shader_atomic_float
+#define GL_NV_shader_atomic_float 1
+#endif /* GL_NV_shader_atomic_float */
+
+#ifndef GL_NV_shader_atomic_fp16_vector
+#define GL_NV_shader_atomic_fp16_vector 1
+#endif /* GL_NV_shader_atomic_fp16_vector */
+
+#ifndef GL_NV_shader_atomic_int64
+#define GL_NV_shader_atomic_int64 1
+#endif /* GL_NV_shader_atomic_int64 */
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_NV_shader_buffer_load */
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_NV_shader_buffer_store 1
+#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
+#endif /* GL_NV_shader_buffer_store */
+
+#ifndef GL_NV_shader_storage_buffer_object
+#define GL_NV_shader_storage_buffer_object 1
+#endif /* GL_NV_shader_storage_buffer_object */
+
+#ifndef GL_NV_shader_thread_group
+#define GL_NV_shader_thread_group 1
+#define GL_WARP_SIZE_NV                   0x9339
+#define GL_WARPS_PER_SM_NV                0x933A
+#define GL_SM_COUNT_NV                    0x933B
+#endif /* GL_NV_shader_thread_group */
+
+#ifndef GL_NV_shader_thread_shuffle
+#define GL_NV_shader_thread_shuffle 1
+#endif /* GL_NV_shader_thread_shuffle */
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+#endif /* GL_NV_tessellation_program5 */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif /* GL_NV_texgen_emboss */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif /* GL_NV_texgen_reflection */
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif
+#endif /* GL_NV_texture_barrier */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif /* GL_NV_texture_compression_vtc */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif /* GL_NV_texture_env_combine4 */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif /* GL_NV_texture_expand_normal */
+
+#ifndef GL_NV_texture_multisample
+#define GL_NV_texture_multisample 1
+#define GL_TEXTURE_COVERAGE_SAMPLES_NV    0x9045
+#define GL_TEXTURE_COLOR_SAMPLES_NV       0x9046
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTexImage3DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#endif
+#endif /* GL_NV_texture_multisample */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif /* GL_NV_texture_rectangle */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    0x86E1
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     0x86E2
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif /* GL_NV_texture_shader */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif /* GL_NV_texture_shader2 */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif /* GL_NV_texture_shader3 */
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#define GL_LAYER_NV                       0x8DAA
+#define GL_NEXT_BUFFER_NV                 -2
+#define GL_SKIP_COMPONENTS4_NV            -3
+#define GL_SKIP_COMPONENTS3_NV            -4
+#define GL_SKIP_COMPONENTS2_NV            -5
+#define GL_SKIP_COMPONENTS1_NV            -6
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLsizei count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif
+#endif /* GL_NV_transform_feedback */
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif
+#endif /* GL_NV_transform_feedback2 */
+
+#ifndef GL_NV_uniform_buffer_unified_memory
+#define GL_NV_uniform_buffer_unified_memory 1
+#define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
+#define GL_UNIFORM_BUFFER_ADDRESS_NV      0x936F
+#define GL_UNIFORM_BUFFER_LENGTH_NV       0x9370
+#endif /* GL_NV_uniform_buffer_unified_memory */
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+typedef GLintptr GLvdpauSurfaceNV;
+#define GL_SURFACE_STATE_NV               0x86EB
+#define GL_SURFACE_REGISTERED_NV          0x86FD
+#define GL_SURFACE_MAPPED_NV              0x8700
+#define GL_WRITE_DISCARD_NV               0x88BE
+typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const void *vdpDevice, const void *getProcAddress);
+typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLboolean (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVDPAUInitNV (const void *vdpDevice, const void *getProcAddress);
+GLAPI void APIENTRY glVDPAUFiniNV (void);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLboolean APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
+GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif
+#endif /* GL_NV_vdpau_interop */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const void *pointer);
+#endif
+#endif /* GL_NV_vertex_array_range */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif /* GL_NV_vertex_array_range2 */
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+#endif /* GL_NV_vertex_program */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif /* GL_NV_vertex_program1_1 */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif /* GL_NV_vertex_program2 */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif /* GL_NV_vertex_program2_option */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif /* GL_NV_vertex_program3 */
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_vertex_program4 */
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+#endif /* GL_NV_video_capture */
+
+#ifndef GL_NV_viewport_array2
+#define GL_NV_viewport_array2 1
+#endif /* GL_NV_viewport_array2 */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif /* GL_OML_interlace */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif /* GL_OML_resample */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif /* GL_OML_subsample */
+
+#ifndef GL_OVR_multiview
+#define GL_OVR_multiview 1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
+#define GL_MAX_VIEWS_OVR                  0x9631
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#endif
+#endif /* GL_OVR_multiview */
+
+#ifndef GL_OVR_multiview2
+#define GL_OVR_multiview2 1
+#endif /* GL_OVR_multiview2 */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif
+#endif /* GL_PGI_misc_hints */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif /* GL_PGI_vertex_hints */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif /* GL_REND_screen_coordinates */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#define GL_RGBA_DXT5_S3TC                 0x83A4
+#define GL_RGBA4_DXT5_S3TC                0x83A5
+#endif /* GL_S3_s3tc */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_detail_texture */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif
+#endif /* GL_SGIS_fog_function */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif /* GL_SGIS_generate_mipmap */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif
+#endif /* GL_SGIS_multisample */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_SGIS_pixel_texture */
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif /* GL_SGIS_point_line_texgen */
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_SGIS_point_parameters */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_SGIS_texture4D */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif /* GL_SGIS_texture_border_clamp */
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+#endif /* GL_SGIS_texture_color_mask */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif /* GL_SGIS_texture_edge_clamp */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif /* GL_SGIS_texture_lod */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif /* GL_SGIS_texture_select */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#define GL_ASYNC_MARKER_SGIX              0x8329
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif
+#endif /* GL_SGIX_async */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif /* GL_SGIX_async_histogram */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif /* GL_SGIX_async_pixel */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif /* GL_SGIX_calligraphic_fragment */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif /* GL_SGIX_clipmap */
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif /* GL_SGIX_convolution_accuracy */
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif /* GL_SGIX_depth_pass_instrument */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif /* GL_SGIX_depth_texture */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif
+#endif /* GL_SGIX_flush_raster */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif /* GL_SGIX_fog_offset */
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif
+#endif /* GL_SGIX_fragment_lighting */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif
+#endif /* GL_SGIX_framezoom */
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const void *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const void *params);
+#endif
+#endif /* GL_SGIX_igloo_interface */
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif
+#endif /* GL_SGIX_instruments */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#define GL_INTERLACE_SGIX                 0x8094
+#endif /* GL_SGIX_interlace */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif /* GL_SGIX_ir_instrument1 */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#define GL_LIST_PRIORITY_SGIX             0x8182
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_list_priority */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif
+#endif /* GL_SGIX_pixel_texture */
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif /* GL_SGIX_pixel_tiles */
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif
+#endif /* GL_SGIX_polynomial_ffd */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif
+#endif /* GL_SGIX_reference_plane */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#define GL_PACK_RESAMPLE_SGIX             0x842E
+#define GL_UNPACK_RESAMPLE_SGIX           0x842F
+#define GL_RESAMPLE_REPLICATE_SGIX        0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x8434
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif /* GL_SGIX_resample */
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif /* GL_SGIX_scalebias_hint */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif /* GL_SGIX_shadow */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif /* GL_SGIX_shadow_ambient */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_sprite */
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif /* GL_SGIX_subsample */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif /* GL_SGIX_texture_add_env */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif /* GL_SGIX_texture_lod_bias */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif /* GL_SGIX_texture_multi_buffer */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif /* GL_SGIX_texture_scale_bias */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif /* GL_SGIX_vertex_preclip */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif /* GL_SGIX_ycrcb */
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif /* GL_SGIX_ycrcb_subsample */
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif /* GL_SGIX_ycrcba */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif /* GL_SGI_color_matrix */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif
+#endif /* GL_SGI_color_table */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif /* GL_SGI_texture_color_table */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif
+#endif /* GL_SUNX_constant_data */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif /* GL_SUN_convolution_border_modes */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif
+#endif /* GL_SUN_global_alpha */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+#endif /* GL_SUN_mesh_array */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif /* GL_SUN_slice_accum */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const void **pointer);
+#endif
+#endif /* GL_SUN_triangle_list */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+#endif /* GL_SUN_vertex */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif /* GL_WIN_phong_shading */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif /* GL_WIN_specular_fog */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Externals/GLES3/GLES3/gl3.h b/Externals/GLES3/GLES3/gl3.h
deleted file mode 100644
index e5bf8f5bfc..0000000000
--- a/Externals/GLES3/GLES3/gl3.h
+++ /dev/null
@@ -1,1034 +0,0 @@
-#ifndef __gl3_h_
-#define __gl3_h_
-
-/* 
- * gl3.h last updated on $Date: 2013-02-12 14:37:24 -0800 (Tue, 12 Feb 2013) $
- */
-
-#include <GLES3/gl3platform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007-2013 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.
-*/
-
-/*-------------------------------------------------------------------------
- * Data type definitions
- *-----------------------------------------------------------------------*/
-
-/* OpenGL ES 2.0 */
-
-typedef void             GLvoid;
-typedef char             GLchar;
-typedef unsigned int     GLenum;
-typedef unsigned char    GLboolean;
-typedef unsigned int     GLbitfield;
-typedef khronos_int8_t   GLbyte;
-typedef short            GLshort;
-typedef int              GLint;
-typedef int              GLsizei;
-typedef khronos_uint8_t  GLubyte;
-typedef unsigned short   GLushort;
-typedef unsigned int     GLuint;
-typedef khronos_float_t  GLfloat;
-typedef khronos_float_t  GLclampf;
-typedef khronos_int32_t  GLfixed;
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
-
-/* OpenGL ES 3.0 */
-
-typedef unsigned short   GLhalf;
-typedef khronos_int64_t  GLint64;
-typedef khronos_uint64_t GLuint64;
-typedef struct __GLsync *GLsync;
-
-/*-------------------------------------------------------------------------
- * Token definitions
- *-----------------------------------------------------------------------*/
-
-/* OpenGL ES core versions */
-#define GL_ES_VERSION_3_0                                1
-#define GL_ES_VERSION_2_0                                1
-
-/* OpenGL ES 2.0 */
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT                              0x00000100
-#define GL_STENCIL_BUFFER_BIT                            0x00000400
-#define GL_COLOR_BUFFER_BIT                              0x00004000
-
-/* Boolean */
-#define GL_FALSE                                         0
-#define GL_TRUE                                          1
-
-/* BeginMode */
-#define GL_POINTS                                        0x0000
-#define GL_LINES                                         0x0001
-#define GL_LINE_LOOP                                     0x0002
-#define GL_LINE_STRIP                                    0x0003
-#define GL_TRIANGLES                                     0x0004
-#define GL_TRIANGLE_STRIP                                0x0005
-#define GL_TRIANGLE_FAN                                  0x0006
-
-/* BlendingFactorDest */
-#define GL_ZERO                                          0
-#define GL_ONE                                           1
-#define GL_SRC_COLOR                                     0x0300
-#define GL_ONE_MINUS_SRC_COLOR                           0x0301
-#define GL_SRC_ALPHA                                     0x0302
-#define GL_ONE_MINUS_SRC_ALPHA                           0x0303
-#define GL_DST_ALPHA                                     0x0304
-#define GL_ONE_MINUS_DST_ALPHA                           0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                                     0x0306
-#define GL_ONE_MINUS_DST_COLOR                           0x0307
-#define GL_SRC_ALPHA_SATURATE                            0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* BlendEquationSeparate */
-#define GL_FUNC_ADD                                      0x8006
-#define GL_BLEND_EQUATION                                0x8009
-#define GL_BLEND_EQUATION_RGB                            0x8009    /* same as BLEND_EQUATION */
-#define GL_BLEND_EQUATION_ALPHA                          0x883D
-
-/* BlendSubtract */
-#define GL_FUNC_SUBTRACT                                 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT                         0x800B
-
-/* Separate Blend Functions */
-#define GL_BLEND_DST_RGB                                 0x80C8
-#define GL_BLEND_SRC_RGB                                 0x80C9
-#define GL_BLEND_DST_ALPHA                               0x80CA
-#define GL_BLEND_SRC_ALPHA                               0x80CB
-#define GL_CONSTANT_COLOR                                0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR                      0x8002
-#define GL_CONSTANT_ALPHA                                0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA                      0x8004
-#define GL_BLEND_COLOR                                   0x8005
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                                  0x8892
-#define GL_ELEMENT_ARRAY_BUFFER                          0x8893
-#define GL_ARRAY_BUFFER_BINDING                          0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING                  0x8895
-
-#define GL_STREAM_DRAW                                   0x88E0
-#define GL_STATIC_DRAW                                   0x88E4
-#define GL_DYNAMIC_DRAW                                  0x88E8
-
-#define GL_BUFFER_SIZE                                   0x8764
-#define GL_BUFFER_USAGE                                  0x8765
-
-#define GL_CURRENT_VERTEX_ATTRIB                         0x8626
-
-/* CullFaceMode */
-#define GL_FRONT                                         0x0404
-#define GL_BACK                                          0x0405
-#define GL_FRONT_AND_BACK                                0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_TEXTURE_2D                                    0x0DE1
-#define GL_CULL_FACE                                     0x0B44
-#define GL_BLEND                                         0x0BE2
-#define GL_DITHER                                        0x0BD0
-#define GL_STENCIL_TEST                                  0x0B90
-#define GL_DEPTH_TEST                                    0x0B71
-#define GL_SCISSOR_TEST                                  0x0C11
-#define GL_POLYGON_OFFSET_FILL                           0x8037
-#define GL_SAMPLE_ALPHA_TO_COVERAGE                      0x809E
-#define GL_SAMPLE_COVERAGE                               0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                                      0
-#define GL_INVALID_ENUM                                  0x0500
-#define GL_INVALID_VALUE                                 0x0501
-#define GL_INVALID_OPERATION                             0x0502
-#define GL_OUT_OF_MEMORY                                 0x0505
-
-/* FrontFaceDirection */
-#define GL_CW                                            0x0900
-#define GL_CCW                                           0x0901
-
-/* GetPName */
-#define GL_LINE_WIDTH                                    0x0B21
-#define GL_ALIASED_POINT_SIZE_RANGE                      0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE                      0x846E
-#define GL_CULL_FACE_MODE                                0x0B45
-#define GL_FRONT_FACE                                    0x0B46
-#define GL_DEPTH_RANGE                                   0x0B70
-#define GL_DEPTH_WRITEMASK                               0x0B72
-#define GL_DEPTH_CLEAR_VALUE                             0x0B73
-#define GL_DEPTH_FUNC                                    0x0B74
-#define GL_STENCIL_CLEAR_VALUE                           0x0B91
-#define GL_STENCIL_FUNC                                  0x0B92
-#define GL_STENCIL_FAIL                                  0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL                       0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS                       0x0B96
-#define GL_STENCIL_REF                                   0x0B97
-#define GL_STENCIL_VALUE_MASK                            0x0B93
-#define GL_STENCIL_WRITEMASK                             0x0B98
-#define GL_STENCIL_BACK_FUNC                             0x8800
-#define GL_STENCIL_BACK_FAIL                             0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL                  0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS                  0x8803
-#define GL_STENCIL_BACK_REF                              0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK                       0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK                        0x8CA5
-#define GL_VIEWPORT                                      0x0BA2
-#define GL_SCISSOR_BOX                                   0x0C10
-/*      GL_SCISSOR_TEST */
-#define GL_COLOR_CLEAR_VALUE                             0x0C22
-#define GL_COLOR_WRITEMASK                               0x0C23
-#define GL_UNPACK_ALIGNMENT                              0x0CF5
-#define GL_PACK_ALIGNMENT                                0x0D05
-#define GL_MAX_TEXTURE_SIZE                              0x0D33
-#define GL_MAX_VIEWPORT_DIMS                             0x0D3A
-#define GL_SUBPIXEL_BITS                                 0x0D50
-#define GL_RED_BITS                                      0x0D52
-#define GL_GREEN_BITS                                    0x0D53
-#define GL_BLUE_BITS                                     0x0D54
-#define GL_ALPHA_BITS                                    0x0D55
-#define GL_DEPTH_BITS                                    0x0D56
-#define GL_STENCIL_BITS                                  0x0D57
-#define GL_POLYGON_OFFSET_UNITS                          0x2A00
-/*      GL_POLYGON_OFFSET_FILL */
-#define GL_POLYGON_OFFSET_FACTOR                         0x8038
-#define GL_TEXTURE_BINDING_2D                            0x8069
-#define GL_SAMPLE_BUFFERS                                0x80A8
-#define GL_SAMPLES                                       0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE                         0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT                        0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS                0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS                    0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                                     0x1100
-#define GL_FASTEST                                       0x1101
-#define GL_NICEST                                        0x1102
-
-/* HintTarget */
-#define GL_GENERATE_MIPMAP_HINT                          0x8192
-
-/* DataType */
-#define GL_BYTE                                          0x1400
-#define GL_UNSIGNED_BYTE                                 0x1401
-#define GL_SHORT                                         0x1402
-#define GL_UNSIGNED_SHORT                                0x1403
-#define GL_INT                                           0x1404
-#define GL_UNSIGNED_INT                                  0x1405
-#define GL_FLOAT                                         0x1406
-#define GL_FIXED                                         0x140C
-
-/* PixelFormat */
-#define GL_DEPTH_COMPONENT                               0x1902
-#define GL_ALPHA                                         0x1906
-#define GL_RGB                                           0x1907
-#define GL_RGBA                                          0x1908
-#define GL_LUMINANCE                                     0x1909
-#define GL_LUMINANCE_ALPHA                               0x190A
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4                        0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1                        0x8034
-#define GL_UNSIGNED_SHORT_5_6_5                          0x8363
-
-/* Shaders */
-#define GL_FRAGMENT_SHADER                               0x8B30
-#define GL_VERTEX_SHADER                                 0x8B31
-#define GL_MAX_VERTEX_ATTRIBS                            0x8869
-#define GL_MAX_VERTEX_UNIFORM_VECTORS                    0x8DFB
-#define GL_MAX_VARYING_VECTORS                           0x8DFC
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS              0x8B4D
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS                0x8B4C
-#define GL_MAX_TEXTURE_IMAGE_UNITS                       0x8872
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS                  0x8DFD
-#define GL_SHADER_TYPE                                   0x8B4F
-#define GL_DELETE_STATUS                                 0x8B80
-#define GL_LINK_STATUS                                   0x8B82
-#define GL_VALIDATE_STATUS                               0x8B83
-#define GL_ATTACHED_SHADERS                              0x8B85
-#define GL_ACTIVE_UNIFORMS                               0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH                     0x8B87
-#define GL_ACTIVE_ATTRIBUTES                             0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH                   0x8B8A
-#define GL_SHADING_LANGUAGE_VERSION                      0x8B8C
-#define GL_CURRENT_PROGRAM                               0x8B8D
-
-/* StencilFunction */
-#define GL_NEVER                                         0x0200
-#define GL_LESS                                          0x0201
-#define GL_EQUAL                                         0x0202
-#define GL_LEQUAL                                        0x0203
-#define GL_GREATER                                       0x0204
-#define GL_NOTEQUAL                                      0x0205
-#define GL_GEQUAL                                        0x0206
-#define GL_ALWAYS                                        0x0207
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                                          0x1E00
-#define GL_REPLACE                                       0x1E01
-#define GL_INCR                                          0x1E02
-#define GL_DECR                                          0x1E03
-#define GL_INVERT                                        0x150A
-#define GL_INCR_WRAP                                     0x8507
-#define GL_DECR_WRAP                                     0x8508
-
-/* StringName */
-#define GL_VENDOR                                        0x1F00
-#define GL_RENDERER                                      0x1F01
-#define GL_VERSION                                       0x1F02
-#define GL_EXTENSIONS                                    0x1F03
-
-/* TextureMagFilter */
-#define GL_NEAREST                                       0x2600
-#define GL_LINEAR                                        0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST                        0x2700
-#define GL_LINEAR_MIPMAP_NEAREST                         0x2701
-#define GL_NEAREST_MIPMAP_LINEAR                         0x2702
-#define GL_LINEAR_MIPMAP_LINEAR                          0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER                            0x2800
-#define GL_TEXTURE_MIN_FILTER                            0x2801
-#define GL_TEXTURE_WRAP_S                                0x2802
-#define GL_TEXTURE_WRAP_T                                0x2803
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-#define GL_TEXTURE                                       0x1702
-
-#define GL_TEXTURE_CUBE_MAP                              0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP                      0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X                   0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X                   0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y                   0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y                   0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z                   0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z                   0x851A
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE                     0x851C
-
-/* TextureUnit */
-#define GL_TEXTURE0                                      0x84C0
-#define GL_TEXTURE1                                      0x84C1
-#define GL_TEXTURE2                                      0x84C2
-#define GL_TEXTURE3                                      0x84C3
-#define GL_TEXTURE4                                      0x84C4
-#define GL_TEXTURE5                                      0x84C5
-#define GL_TEXTURE6                                      0x84C6
-#define GL_TEXTURE7                                      0x84C7
-#define GL_TEXTURE8                                      0x84C8
-#define GL_TEXTURE9                                      0x84C9
-#define GL_TEXTURE10                                     0x84CA
-#define GL_TEXTURE11                                     0x84CB
-#define GL_TEXTURE12                                     0x84CC
-#define GL_TEXTURE13                                     0x84CD
-#define GL_TEXTURE14                                     0x84CE
-#define GL_TEXTURE15                                     0x84CF
-#define GL_TEXTURE16                                     0x84D0
-#define GL_TEXTURE17                                     0x84D1
-#define GL_TEXTURE18                                     0x84D2
-#define GL_TEXTURE19                                     0x84D3
-#define GL_TEXTURE20                                     0x84D4
-#define GL_TEXTURE21                                     0x84D5
-#define GL_TEXTURE22                                     0x84D6
-#define GL_TEXTURE23                                     0x84D7
-#define GL_TEXTURE24                                     0x84D8
-#define GL_TEXTURE25                                     0x84D9
-#define GL_TEXTURE26                                     0x84DA
-#define GL_TEXTURE27                                     0x84DB
-#define GL_TEXTURE28                                     0x84DC
-#define GL_TEXTURE29                                     0x84DD
-#define GL_TEXTURE30                                     0x84DE
-#define GL_TEXTURE31                                     0x84DF
-#define GL_ACTIVE_TEXTURE                                0x84E0
-
-/* TextureWrapMode */
-#define GL_REPEAT                                        0x2901
-#define GL_CLAMP_TO_EDGE                                 0x812F
-#define GL_MIRRORED_REPEAT                               0x8370
-
-/* Uniform Types */
-#define GL_FLOAT_VEC2                                    0x8B50
-#define GL_FLOAT_VEC3                                    0x8B51
-#define GL_FLOAT_VEC4                                    0x8B52
-#define GL_INT_VEC2                                      0x8B53
-#define GL_INT_VEC3                                      0x8B54
-#define GL_INT_VEC4                                      0x8B55
-#define GL_BOOL                                          0x8B56
-#define GL_BOOL_VEC2                                     0x8B57
-#define GL_BOOL_VEC3                                     0x8B58
-#define GL_BOOL_VEC4                                     0x8B59
-#define GL_FLOAT_MAT2                                    0x8B5A
-#define GL_FLOAT_MAT3                                    0x8B5B
-#define GL_FLOAT_MAT4                                    0x8B5C
-#define GL_SAMPLER_2D                                    0x8B5E
-#define GL_SAMPLER_CUBE                                  0x8B60
-
-/* Vertex Arrays */
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED                   0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE                      0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE                    0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE                      0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED                0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER                   0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING            0x889F
-
-/* Read Format */
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE                0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT              0x8B9B
-
-/* Shader Source */
-#define GL_COMPILE_STATUS                                0x8B81
-#define GL_INFO_LOG_LENGTH                               0x8B84
-#define GL_SHADER_SOURCE_LENGTH                          0x8B88
-#define GL_SHADER_COMPILER                               0x8DFA
-
-/* Shader Binary */
-#define GL_SHADER_BINARY_FORMATS                         0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS                     0x8DF9
-
-/* Shader Precision-Specified Types */
-#define GL_LOW_FLOAT                                     0x8DF0
-#define GL_MEDIUM_FLOAT                                  0x8DF1
-#define GL_HIGH_FLOAT                                    0x8DF2
-#define GL_LOW_INT                                       0x8DF3
-#define GL_MEDIUM_INT                                    0x8DF4
-#define GL_HIGH_INT                                      0x8DF5
-
-/* Framebuffer Object. */
-#define GL_FRAMEBUFFER                                   0x8D40
-#define GL_RENDERBUFFER                                  0x8D41
-
-#define GL_RGBA4                                         0x8056
-#define GL_RGB5_A1                                       0x8057
-#define GL_RGB565                                        0x8D62
-#define GL_DEPTH_COMPONENT16                             0x81A5
-#define GL_STENCIL_INDEX8                                0x8D48
-
-#define GL_RENDERBUFFER_WIDTH                            0x8D42
-#define GL_RENDERBUFFER_HEIGHT                           0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT                  0x8D44
-#define GL_RENDERBUFFER_RED_SIZE                         0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE                       0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE                        0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE                       0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE                       0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE                     0x8D55
-
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE            0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME            0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL          0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE  0x8CD3
-
-#define GL_COLOR_ATTACHMENT0                             0x8CE0
-#define GL_DEPTH_ATTACHMENT                              0x8D00
-#define GL_STENCIL_ATTACHMENT                            0x8D20
-
-#define GL_NONE                                          0
-
-#define GL_FRAMEBUFFER_COMPLETE                          0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT             0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS             0x8CD9
-#define GL_FRAMEBUFFER_UNSUPPORTED                       0x8CDD
-
-#define GL_FRAMEBUFFER_BINDING                           0x8CA6
-#define GL_RENDERBUFFER_BINDING                          0x8CA7
-#define GL_MAX_RENDERBUFFER_SIZE                         0x84E8
-
-#define GL_INVALID_FRAMEBUFFER_OPERATION                 0x0506
-
-/* OpenGL ES 3.0 */
-
-#define GL_READ_BUFFER                                   0x0C02
-#define GL_UNPACK_ROW_LENGTH                             0x0CF2
-#define GL_UNPACK_SKIP_ROWS                              0x0CF3
-#define GL_UNPACK_SKIP_PIXELS                            0x0CF4
-#define GL_PACK_ROW_LENGTH                               0x0D02
-#define GL_PACK_SKIP_ROWS                                0x0D03
-#define GL_PACK_SKIP_PIXELS                              0x0D04
-#define GL_COLOR                                         0x1800
-#define GL_DEPTH                                         0x1801
-#define GL_STENCIL                                       0x1802
-#define GL_RED                                           0x1903
-#define GL_RGB8                                          0x8051
-#define GL_RGBA8                                         0x8058
-#define GL_RGB10_A2                                      0x8059
-#define GL_TEXTURE_BINDING_3D                            0x806A
-#define GL_UNPACK_SKIP_IMAGES                            0x806D
-#define GL_UNPACK_IMAGE_HEIGHT                           0x806E
-#define GL_TEXTURE_3D                                    0x806F
-#define GL_TEXTURE_WRAP_R                                0x8072
-#define GL_MAX_3D_TEXTURE_SIZE                           0x8073
-#define GL_UNSIGNED_INT_2_10_10_10_REV                   0x8368
-#define GL_MAX_ELEMENTS_VERTICES                         0x80E8
-#define GL_MAX_ELEMENTS_INDICES                          0x80E9
-#define GL_TEXTURE_MIN_LOD                               0x813A
-#define GL_TEXTURE_MAX_LOD                               0x813B
-#define GL_TEXTURE_BASE_LEVEL                            0x813C
-#define GL_TEXTURE_MAX_LEVEL                             0x813D
-#define GL_MIN                                           0x8007
-#define GL_MAX                                           0x8008
-#define GL_DEPTH_COMPONENT24                             0x81A6
-#define GL_MAX_TEXTURE_LOD_BIAS                          0x84FD
-#define GL_TEXTURE_COMPARE_MODE                          0x884C
-#define GL_TEXTURE_COMPARE_FUNC                          0x884D
-#define GL_CURRENT_QUERY                                 0x8865
-#define GL_QUERY_RESULT                                  0x8866
-#define GL_QUERY_RESULT_AVAILABLE                        0x8867
-#define GL_BUFFER_MAPPED                                 0x88BC
-#define GL_BUFFER_MAP_POINTER                            0x88BD
-#define GL_STREAM_READ                                   0x88E1
-#define GL_STREAM_COPY                                   0x88E2
-#define GL_STATIC_READ                                   0x88E5
-#define GL_STATIC_COPY                                   0x88E6
-#define GL_DYNAMIC_READ                                  0x88E9
-#define GL_DYNAMIC_COPY                                  0x88EA
-#define GL_MAX_DRAW_BUFFERS                              0x8824
-#define GL_DRAW_BUFFER0                                  0x8825
-#define GL_DRAW_BUFFER1                                  0x8826
-#define GL_DRAW_BUFFER2                                  0x8827
-#define GL_DRAW_BUFFER3                                  0x8828
-#define GL_DRAW_BUFFER4                                  0x8829
-#define GL_DRAW_BUFFER5                                  0x882A
-#define GL_DRAW_BUFFER6                                  0x882B
-#define GL_DRAW_BUFFER7                                  0x882C
-#define GL_DRAW_BUFFER8                                  0x882D
-#define GL_DRAW_BUFFER9                                  0x882E
-#define GL_DRAW_BUFFER10                                 0x882F
-#define GL_DRAW_BUFFER11                                 0x8830
-#define GL_DRAW_BUFFER12                                 0x8831
-#define GL_DRAW_BUFFER13                                 0x8832
-#define GL_DRAW_BUFFER14                                 0x8833
-#define GL_DRAW_BUFFER15                                 0x8834
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS               0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS                 0x8B4A
-#define GL_SAMPLER_3D                                    0x8B5F
-#define GL_SAMPLER_2D_SHADOW                             0x8B62
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT               0x8B8B
-#define GL_PIXEL_PACK_BUFFER                             0x88EB
-#define GL_PIXEL_UNPACK_BUFFER                           0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING                     0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING                   0x88EF
-#define GL_FLOAT_MAT2x3                                  0x8B65
-#define GL_FLOAT_MAT2x4                                  0x8B66
-#define GL_FLOAT_MAT3x2                                  0x8B67
-#define GL_FLOAT_MAT3x4                                  0x8B68
-#define GL_FLOAT_MAT4x2                                  0x8B69
-#define GL_FLOAT_MAT4x3                                  0x8B6A
-#define GL_SRGB                                          0x8C40
-#define GL_SRGB8                                         0x8C41
-#define GL_SRGB8_ALPHA8                                  0x8C43
-#define GL_COMPARE_REF_TO_TEXTURE                        0x884E
-#define GL_MAJOR_VERSION                                 0x821B
-#define GL_MINOR_VERSION                                 0x821C
-#define GL_NUM_EXTENSIONS                                0x821D
-#define GL_RGBA32F                                       0x8814
-#define GL_RGB32F                                        0x8815
-#define GL_RGBA16F                                       0x881A
-#define GL_RGB16F                                        0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER                   0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS                      0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET                      0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET                      0x8905
-#define GL_MAX_VARYING_COMPONENTS                        0x8B4B
-#define GL_TEXTURE_2D_ARRAY                              0x8C1A
-#define GL_TEXTURE_BINDING_2D_ARRAY                      0x8C1D
-#define GL_R11F_G11F_B10F                                0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV                  0x8C3B
-#define GL_RGB9_E5                                       0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV                      0x8C3E
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH         0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE                0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS    0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS                   0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START               0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE                0x8C85
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN         0x8C88
-#define GL_RASTERIZER_DISCARD                            0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS       0x8C8B
-#define GL_INTERLEAVED_ATTRIBS                           0x8C8C
-#define GL_SEPARATE_ATTRIBS                              0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER                     0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING             0x8C8F
-#define GL_RGBA32UI                                      0x8D70
-#define GL_RGB32UI                                       0x8D71
-#define GL_RGBA16UI                                      0x8D76
-#define GL_RGB16UI                                       0x8D77
-#define GL_RGBA8UI                                       0x8D7C
-#define GL_RGB8UI                                        0x8D7D
-#define GL_RGBA32I                                       0x8D82
-#define GL_RGB32I                                        0x8D83
-#define GL_RGBA16I                                       0x8D88
-#define GL_RGB16I                                        0x8D89
-#define GL_RGBA8I                                        0x8D8E
-#define GL_RGB8I                                         0x8D8F
-#define GL_RED_INTEGER                                   0x8D94
-#define GL_RGB_INTEGER                                   0x8D98
-#define GL_RGBA_INTEGER                                  0x8D99
-#define GL_SAMPLER_2D_ARRAY                              0x8DC1
-#define GL_SAMPLER_2D_ARRAY_SHADOW                       0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW                           0x8DC5
-#define GL_UNSIGNED_INT_VEC2                             0x8DC6
-#define GL_UNSIGNED_INT_VEC3                             0x8DC7
-#define GL_UNSIGNED_INT_VEC4                             0x8DC8
-#define GL_INT_SAMPLER_2D                                0x8DCA
-#define GL_INT_SAMPLER_3D                                0x8DCB
-#define GL_INT_SAMPLER_CUBE                              0x8DCC
-#define GL_INT_SAMPLER_2D_ARRAY                          0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_2D                       0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D                       0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE                     0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY                 0x8DD7
-#define GL_BUFFER_ACCESS_FLAGS                           0x911F
-#define GL_BUFFER_MAP_LENGTH                             0x9120
-#define GL_BUFFER_MAP_OFFSET                             0x9121
-#define GL_DEPTH_COMPONENT32F                            0x8CAC
-#define GL_DEPTH32F_STENCIL8                             0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV                0x8DAD
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING         0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE         0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE               0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE             0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE              0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE             0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE             0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE           0x8217
-#define GL_FRAMEBUFFER_DEFAULT                           0x8218
-#define GL_FRAMEBUFFER_UNDEFINED                         0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT                      0x821A
-#define GL_DEPTH_STENCIL                                 0x84F9
-#define GL_UNSIGNED_INT_24_8                             0x84FA
-#define GL_DEPTH24_STENCIL8                              0x88F0
-#define GL_UNSIGNED_NORMALIZED                           0x8C17
-#define GL_DRAW_FRAMEBUFFER_BINDING                      GL_FRAMEBUFFER_BINDING
-#define GL_READ_FRAMEBUFFER                              0x8CA8
-#define GL_DRAW_FRAMEBUFFER                              0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING                      0x8CAA
-#define GL_RENDERBUFFER_SAMPLES                          0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER          0x8CD4
-#define GL_MAX_COLOR_ATTACHMENTS                         0x8CDF
-#define GL_COLOR_ATTACHMENT1                             0x8CE1
-#define GL_COLOR_ATTACHMENT2                             0x8CE2
-#define GL_COLOR_ATTACHMENT3                             0x8CE3
-#define GL_COLOR_ATTACHMENT4                             0x8CE4
-#define GL_COLOR_ATTACHMENT5                             0x8CE5
-#define GL_COLOR_ATTACHMENT6                             0x8CE6
-#define GL_COLOR_ATTACHMENT7                             0x8CE7
-#define GL_COLOR_ATTACHMENT8                             0x8CE8
-#define GL_COLOR_ATTACHMENT9                             0x8CE9
-#define GL_COLOR_ATTACHMENT10                            0x8CEA
-#define GL_COLOR_ATTACHMENT11                            0x8CEB
-#define GL_COLOR_ATTACHMENT12                            0x8CEC
-#define GL_COLOR_ATTACHMENT13                            0x8CED
-#define GL_COLOR_ATTACHMENT14                            0x8CEE
-#define GL_COLOR_ATTACHMENT15                            0x8CEF
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE            0x8D56
-#define GL_MAX_SAMPLES                                   0x8D57
-#define GL_HALF_FLOAT                                    0x140B
-#define GL_MAP_READ_BIT                                  0x0001
-#define GL_MAP_WRITE_BIT                                 0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT                      0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT                     0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT                        0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT                        0x0020
-#define GL_RG                                            0x8227
-#define GL_RG_INTEGER                                    0x8228
-#define GL_R8                                            0x8229
-#define GL_RG8                                           0x822B
-#define GL_R16F                                          0x822D
-#define GL_R32F                                          0x822E
-#define GL_RG16F                                         0x822F
-#define GL_RG32F                                         0x8230
-#define GL_R8I                                           0x8231
-#define GL_R8UI                                          0x8232
-#define GL_R16I                                          0x8233
-#define GL_R16UI                                         0x8234
-#define GL_R32I                                          0x8235
-#define GL_R32UI                                         0x8236
-#define GL_RG8I                                          0x8237
-#define GL_RG8UI                                         0x8238
-#define GL_RG16I                                         0x8239
-#define GL_RG16UI                                        0x823A
-#define GL_RG32I                                         0x823B
-#define GL_RG32UI                                        0x823C
-#define GL_VERTEX_ARRAY_BINDING                          0x85B5
-#define GL_R8_SNORM                                      0x8F94
-#define GL_RG8_SNORM                                     0x8F95
-#define GL_RGB8_SNORM                                    0x8F96
-#define GL_RGBA8_SNORM                                   0x8F97
-#define GL_SIGNED_NORMALIZED                             0x8F9C
-#define GL_PRIMITIVE_RESTART_FIXED_INDEX                 0x8D69
-#define GL_COPY_READ_BUFFER                              0x8F36
-#define GL_COPY_WRITE_BUFFER                             0x8F37
-#define GL_COPY_READ_BUFFER_BINDING                      GL_COPY_READ_BUFFER
-#define GL_COPY_WRITE_BUFFER_BINDING                     GL_COPY_WRITE_BUFFER
-#define GL_UNIFORM_BUFFER                                0x8A11
-#define GL_UNIFORM_BUFFER_BINDING                        0x8A28
-#define GL_UNIFORM_BUFFER_START                          0x8A29
-#define GL_UNIFORM_BUFFER_SIZE                           0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS                     0x8A2B
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS                   0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS                   0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS                   0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE                        0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS        0x8A31
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS      0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT               0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH          0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS                         0x8A36
-#define GL_UNIFORM_TYPE                                  0x8A37
-#define GL_UNIFORM_SIZE                                  0x8A38
-#define GL_UNIFORM_NAME_LENGTH                           0x8A39
-#define GL_UNIFORM_BLOCK_INDEX                           0x8A3A
-#define GL_UNIFORM_OFFSET                                0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE                          0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE                         0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR                          0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING                         0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE                       0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH                     0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS                 0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   0x8A46
-#define GL_INVALID_INDEX                                 0xFFFFFFFFu
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS                  0x9122
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS                 0x9125
-#define GL_MAX_SERVER_WAIT_TIMEOUT                       0x9111
-#define GL_OBJECT_TYPE                                   0x9112
-#define GL_SYNC_CONDITION                                0x9113
-#define GL_SYNC_STATUS                                   0x9114
-#define GL_SYNC_FLAGS                                    0x9115
-#define GL_SYNC_FENCE                                    0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE                    0x9117
-#define GL_UNSIGNALED                                    0x9118
-#define GL_SIGNALED                                      0x9119
-#define GL_ALREADY_SIGNALED                              0x911A
-#define GL_TIMEOUT_EXPIRED                               0x911B
-#define GL_CONDITION_SATISFIED                           0x911C
-#define GL_WAIT_FAILED                                   0x911D
-#define GL_SYNC_FLUSH_COMMANDS_BIT                       0x00000001
-#define GL_TIMEOUT_IGNORED                               0xFFFFFFFFFFFFFFFFull
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR                   0x88FE
-#define GL_ANY_SAMPLES_PASSED                            0x8C2F
-#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE               0x8D6A
-#define GL_SAMPLER_BINDING                               0x8919
-#define GL_RGB10_A2UI                                    0x906F
-#define GL_TEXTURE_SWIZZLE_R                             0x8E42
-#define GL_TEXTURE_SWIZZLE_G                             0x8E43
-#define GL_TEXTURE_SWIZZLE_B                             0x8E44
-#define GL_TEXTURE_SWIZZLE_A                             0x8E45
-#define GL_GREEN                                         0x1904
-#define GL_BLUE                                          0x1905
-#define GL_INT_2_10_10_10_REV                            0x8D9F
-#define GL_TRANSFORM_FEEDBACK                            0x8E22
-#define GL_TRANSFORM_FEEDBACK_PAUSED                     0x8E23
-#define GL_TRANSFORM_FEEDBACK_ACTIVE                     0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING                    0x8E25
-#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT               0x8257
-#define GL_PROGRAM_BINARY_LENGTH                         0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS                    0x87FE
-#define GL_PROGRAM_BINARY_FORMATS                        0x87FF
-#define GL_COMPRESSED_R11_EAC                            0x9270
-#define GL_COMPRESSED_SIGNED_R11_EAC                     0x9271
-#define GL_COMPRESSED_RG11_EAC                           0x9272
-#define GL_COMPRESSED_SIGNED_RG11_EAC                    0x9273
-#define GL_COMPRESSED_RGB8_ETC2                          0x9274
-#define GL_COMPRESSED_SRGB8_ETC2                         0x9275
-#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2      0x9276
-#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2     0x9277
-#define GL_COMPRESSED_RGBA8_ETC2_EAC                     0x9278
-#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC              0x9279
-#define GL_TEXTURE_IMMUTABLE_FORMAT                      0x912F
-#define GL_MAX_ELEMENT_INDEX                             0x8D6B
-#define GL_NUM_SAMPLE_COUNTS                             0x9380
-#define GL_TEXTURE_IMMUTABLE_LEVELS                      0x82DF
-
-/*-------------------------------------------------------------------------
- * Entrypoint definitions
- *-----------------------------------------------------------------------*/
-
-/* OpenGL ES 2.0 */
-
-GL_APICALL void           GL_APIENTRY glActiveTexture (GLenum texture);
-GL_APICALL void           GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
-GL_APICALL void           GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
-GL_APICALL void           GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_APICALL void           GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GL_APICALL void           GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GL_APICALL void           GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_APICALL void           GL_APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GL_APICALL void           GL_APIENTRY glBlendEquation (GLenum mode);
-GL_APICALL void           GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GL_APICALL void           GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_APICALL void           GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GL_APICALL void           GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
-GL_APICALL void           GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
-GL_APICALL GLenum         GL_APIENTRY glCheckFramebufferStatus (GLenum target);
-GL_APICALL void           GL_APIENTRY glClear (GLbitfield mask);
-GL_APICALL void           GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GL_APICALL void           GL_APIENTRY glClearDepthf (GLfloat depth);
-GL_APICALL void           GL_APIENTRY glClearStencil (GLint s);
-GL_APICALL void           GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_APICALL void           GL_APIENTRY glCompileShader (GLuint shader);
-GL_APICALL void           GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void           GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void           GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_APICALL void           GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL GLuint         GL_APIENTRY glCreateProgram (void);
-GL_APICALL GLuint         GL_APIENTRY glCreateShader (GLenum type);
-GL_APICALL void           GL_APIENTRY glCullFace (GLenum mode);
-GL_APICALL void           GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
-GL_APICALL void           GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
-GL_APICALL void           GL_APIENTRY glDeleteProgram (GLuint program);
-GL_APICALL void           GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
-GL_APICALL void           GL_APIENTRY glDeleteShader (GLuint shader);
-GL_APICALL void           GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
-GL_APICALL void           GL_APIENTRY glDepthFunc (GLenum func);
-GL_APICALL void           GL_APIENTRY glDepthMask (GLboolean flag);
-GL_APICALL void           GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f);
-GL_APICALL void           GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
-GL_APICALL void           GL_APIENTRY glDisable (GLenum cap);
-GL_APICALL void           GL_APIENTRY glDisableVertexAttribArray (GLuint index);
-GL_APICALL void           GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_APICALL void           GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
-GL_APICALL void           GL_APIENTRY glEnable (GLenum cap);
-GL_APICALL void           GL_APIENTRY glEnableVertexAttribArray (GLuint index);
-GL_APICALL void           GL_APIENTRY glFinish (void);
-GL_APICALL void           GL_APIENTRY glFlush (void);
-GL_APICALL void           GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_APICALL void           GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_APICALL void           GL_APIENTRY glFrontFace (GLenum mode);
-GL_APICALL void           GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
-GL_APICALL void           GL_APIENTRY glGenerateMipmap (GLenum target);
-GL_APICALL void           GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
-GL_APICALL void           GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
-GL_APICALL void           GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
-GL_APICALL void           GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void           GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void           GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-GL_APICALL GLint          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-GL_APICALL void           GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
-GL_APICALL void           GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL GLenum         GL_APIENTRY glGetError (void);
-GL_APICALL void           GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
-GL_APICALL void           GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void           GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void           GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-GL_APICALL void           GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
-GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
-GL_APICALL void           GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
-GL_APICALL void           GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
-GL_APICALL void           GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
-GL_APICALL GLint          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-GL_APICALL void           GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
-GL_APICALL void           GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-GL_APICALL void           GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_APICALL GLboolean      GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_APICALL GLboolean      GL_APIENTRY glIsEnabled (GLenum cap);
-GL_APICALL GLboolean      GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
-GL_APICALL GLboolean      GL_APIENTRY glIsProgram (GLuint program);
-GL_APICALL GLboolean      GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GL_APICALL GLboolean      GL_APIENTRY glIsShader (GLuint shader);
-GL_APICALL GLboolean      GL_APIENTRY glIsTexture (GLuint texture);
-GL_APICALL void           GL_APIENTRY glLineWidth (GLfloat width);
-GL_APICALL void           GL_APIENTRY glLinkProgram (GLuint program);
-GL_APICALL void           GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_APICALL void           GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_APICALL void           GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
-GL_APICALL void           GL_APIENTRY glReleaseShaderCompiler (void);
-GL_APICALL void           GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
-GL_APICALL void           GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
-GL_APICALL void           GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
-GL_APICALL void           GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GL_APICALL void           GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
-GL_APICALL void           GL_APIENTRY glStencilMask (GLuint mask);
-GL_APICALL void           GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GL_APICALL void           GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void           GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void           GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GL_APICALL void           GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
-GL_APICALL void           GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GL_APICALL void           GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
-GL_APICALL void           GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           GL_APIENTRY glUniform1f (GLint location, GLfloat x);
-GL_APICALL void           GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void           GL_APIENTRY glUniform1i (GLint location, GLint x);
-GL_APICALL void           GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void           GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
-GL_APICALL void           GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void           GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
-GL_APICALL void           GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void           GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void           GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void           GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
-GL_APICALL void           GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void           GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void           GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void           GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void           GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void           GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUseProgram (GLuint program);
-GL_APICALL void           GL_APIENTRY glValidateProgram (GLuint program);
-GL_APICALL void           GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
-GL_APICALL void           GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
-GL_APICALL void           GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
-GL_APICALL void           GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
-GL_APICALL void           GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void           GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
-GL_APICALL void           GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void           GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
-GL_APICALL void           GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
-GL_APICALL void           GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
-/* OpenGL ES 3.0 */
-
-GL_APICALL void           GL_APIENTRY glReadBuffer (GLenum mode);
-GL_APICALL void           GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           GL_APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           GL_APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void           GL_APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL GLboolean      GL_APIENTRY glIsQuery (GLuint id);
-GL_APICALL void           GL_APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid** params);
-GL_APICALL void           GL_APIENTRY glDrawBuffers (GLsizei n, const GLenum* bufs);
-GL_APICALL void           GL_APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GL_APICALL void           GL_APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
-GL_APICALL GLboolean      GL_APIENTRY glIsVertexArray (GLuint array);
-GL_APICALL void           GL_APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint* data);
-GL_APICALL void           GL_APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
-GL_APICALL void           GL_APIENTRY glEndTransformFeedback (void);
-GL_APICALL void           GL_APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
-GL_APICALL void           GL_APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode);
-GL_APICALL void           GL_APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name);
-GL_APICALL void           GL_APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer);
-GL_APICALL void           GL_APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint* params);
-GL_APICALL void           GL_APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void           GL_APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GL_APICALL void           GL_APIENTRY glVertexAttribI4iv (GLuint index, const GLint* v);
-GL_APICALL void           GL_APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint* v);
-GL_APICALL void           GL_APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint* params);
-GL_APICALL GLint          GL_APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
-GL_APICALL void           GL_APIENTRY glUniform1ui (GLint location, GLuint v0);
-GL_APICALL void           GL_APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
-GL_APICALL void           GL_APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GL_APICALL void           GL_APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GL_APICALL void           GL_APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           GL_APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           GL_APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           GL_APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           GL_APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint* value);
-GL_APICALL void           GL_APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint* value);
-GL_APICALL void           GL_APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat* value);
-GL_APICALL void           GL_APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GL_APICALL const GLubyte* GL_APIENTRY glGetStringi (GLenum name, GLuint index);
-GL_APICALL void           GL_APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-GL_APICALL void           GL_APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices);
-GL_APICALL void           GL_APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName);
-GL_APICALL void           GL_APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
-GL_APICALL void           GL_APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount);
-GL_APICALL GLboolean      GL_APIENTRY glIsSync (GLsync sync);
-GL_APICALL void           GL_APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GL_APICALL void           GL_APIENTRY glGetInteger64v (GLenum pname, GLint64* params);
-GL_APICALL void           GL_APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values);
-GL_APICALL void           GL_APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64* data);
-GL_APICALL void           GL_APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64* params);
-GL_APICALL GLboolean      GL_APIENTRY glIsSampler (GLuint sampler);
-GL_APICALL void           GL_APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint* param);
-GL_APICALL void           GL_APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint* params);
-GL_APICALL void           GL_APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat* params);
-GL_APICALL void           GL_APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
-GL_APICALL void           GL_APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
-GL_APICALL void           GL_APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint* ids);
-GL_APICALL void           GL_APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint* ids);
-GL_APICALL GLboolean      GL_APIENTRY glIsTransformFeedback (GLuint id);
-GL_APICALL void           GL_APIENTRY glPauseTransformFeedback (void);
-GL_APICALL void           GL_APIENTRY glResumeTransformFeedback (void);
-GL_APICALL void           GL_APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum* attachments);
-GL_APICALL void           GL_APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void           GL_APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-GL_APICALL void           GL_APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Externals/GLES3/GLES3/gl3ext.h b/Externals/GLES3/GLES3/gl3ext.h
deleted file mode 100644
index 4d4ea96c4d..0000000000
--- a/Externals/GLES3/GLES3/gl3ext.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __gl3ext_h_
-#define __gl3ext_h_
-
-/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* OpenGL ES 3 Extensions
- *
- * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
- * its tokens and function definitions should be added to this file in a manner
- * that does not conflict with gl2ext.h or gl3.h.
- *
- * Tokens and function definitions for extensions that have become standard
- * features in OpenGL ES 3.0 will not be added to this file.
- *
- * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
- */
-
-#endif /* __gl3ext_h_ */
-
diff --git a/Externals/GLES3/GLES3/gl3platform.h b/Externals/GLES3/GLES3/gl3platform.h
deleted file mode 100644
index 1bd1a850fa..0000000000
--- a/Externals/GLES3/GLES3/gl3platform.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __gl3platform_h_
-#define __gl3platform_h_
-
-/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 3.X  gl3.h
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY KHRONOS_APIENTRY
-#endif
-
-#endif /* __gl3platform_h_ */
diff --git a/Externals/GLew/CMakeLists.txt b/Externals/GLew/CMakeLists.txt
deleted file mode 100644
index 408509edc0..0000000000
--- a/Externals/GLew/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-include_directories(include)
-
-set(SRCS	src/glew.c)
-
-add_library(GLEW STATIC ${SRCS})
diff --git a/Externals/GLew/glew32s.lib b/Externals/GLew/glew32s.lib
deleted file mode 100755
index 589a5bb914..0000000000
Binary files a/Externals/GLew/glew32s.lib and /dev/null differ
diff --git a/Externals/GLew/glew64s.lib b/Externals/GLew/glew64s.lib
deleted file mode 100755
index 4316171d4c..0000000000
Binary files a/Externals/GLew/glew64s.lib and /dev/null differ
diff --git a/Externals/GLew/include/GL/glew.h b/Externals/GLew/include/GL/glew.h
deleted file mode 100644
index 8dec85bf77..0000000000
--- a/Externals/GLew/include/GL/glew.h
+++ /dev/null
@@ -1,17132 +0,0 @@
-/*
-** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2008, 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.
-*/
-
-#ifndef __glew_h__
-#define __glew_h__
-#define __GLEW_H__
-
-#if defined(__gl_h_) || defined(__GL_H__) || defined(__X_GL_H)
-#error gl.h included before glew.h
-#endif
-#if defined(__REGAL_H__)
-#error Regal.h included before glew.h
-#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
-#error glext.h included before glew.h
-#endif
-#if defined(__gl_ATI_h_)
-#error glATI.h included before glew.h
-#endif
-
-#define __gl_h_
-#define __GL_H__
-#define __REGAL_H__
-#define __X_GL_H
-#define __glext_h_
-#define __GLEXT_H_
-#define __gl_ATI_h_
-
-#if defined(_WIN32)
-
-/*
- * GLEW does not include <windows.h> to avoid name space pollution.
- * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
- * defined properly.
- */
-/* <windef.h> */
-#ifndef APIENTRY
-#define GLEW_APIENTRY_DEFINED
-#  if defined(__MINGW32__) || defined(__CYGWIN__)
-#    define APIENTRY __stdcall
-#  elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
-#    define APIENTRY __stdcall
-#  else
-#    define APIENTRY
-#  endif
-#endif
-#ifndef GLAPI
-#  if defined(__MINGW32__) || defined(__CYGWIN__)
-#    define GLAPI extern
-#  endif
-#endif
-/* <winnt.h> */
-#ifndef CALLBACK
-#define GLEW_CALLBACK_DEFINED
-#  if defined(__MINGW32__) || defined(__CYGWIN__)
-#    define CALLBACK __attribute__ ((__stdcall__))
-#  elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
-#    define CALLBACK __stdcall
-#  else
-#    define CALLBACK
-#  endif
-#endif
-/* <wingdi.h> and <winnt.h> */
-#ifndef WINGDIAPI
-#define GLEW_WINGDIAPI_DEFINED
-#define WINGDIAPI __declspec(dllimport)
-#endif
-/* <ctype.h> */
-#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
-typedef unsigned short wchar_t;
-#  define _WCHAR_T_DEFINED
-#endif
-/* <stddef.h> */
-#if !defined(_W64)
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300
-#    define _W64 __w64
-#  else
-#    define _W64
-#  endif
-#endif
-#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__)
-#  ifdef _WIN64
-typedef __int64 ptrdiff_t;
-#  else
-typedef _W64 int ptrdiff_t;
-#  endif
-#  define _PTRDIFF_T_DEFINED
-#  define _PTRDIFF_T_
-#endif
-
-#ifndef GLAPI
-#  if defined(__MINGW32__) || defined(__CYGWIN__)
-#    define GLAPI extern
-#  else
-#    define GLAPI WINGDIAPI
-#  endif
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY APIENTRY
-#endif
-
-#ifndef GLEWAPIENTRY
-#define GLEWAPIENTRY APIENTRY
-#endif
-
-/*
- * GLEW_STATIC is defined for static library.
- * GLEW_BUILD  is defined for building the DLL library.
- */
-
-#ifdef GLEW_STATIC
-#  define GLEWAPI extern
-#else
-#  ifdef GLEW_BUILD
-#    define GLEWAPI extern __declspec(dllexport)
-#  else
-#    define GLEWAPI extern __declspec(dllimport)
-#  endif
-#endif
-
-#else /* _UNIX */
-
-/*
- * Needed for ptrdiff_t in turn needed by VBO.  This is defined by ISO
- * C.  On my system, this amounts to _3 lines_ of included code, all of
- * them pretty much harmless.  If you know of a way of detecting 32 vs
- * 64 _targets_ at compile time you are free to replace this with
- * something that's portable.  For now, _this_ is the portable solution.
- * (mem, 2004-01-04)
- */
-
-#include <stddef.h>
-
-/* SGI MIPSPro doesn't like stdint.h in C++ mode          */
-/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */
-
-#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
-#define GLEW_APIENTRY_DEFINED
-#define APIENTRY
-
-/*
- * GLEW_STATIC is defined for static library.
- */
-
-#ifdef GLEW_STATIC
-#  define GLEWAPI extern
-#else
-#  if defined(__GNUC__) && __GNUC__>=4
-#   define GLEWAPI extern __attribute__ ((visibility("default")))
-#  elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#   define GLEWAPI extern __global
-#  else
-#   define GLEWAPI extern
-#  endif
-#endif
-
-/* <glu.h> */
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifndef GLEWAPIENTRY
-#define GLEWAPIENTRY
-#endif
-
-#endif /* _WIN32 */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ----------------------------- GL_VERSION_1_1 ---------------------------- */
-
-#ifndef GL_VERSION_1_1
-#define GL_VERSION_1_1 1
-
-typedef unsigned int GLenum;
-typedef unsigned int GLbitfield;
-typedef unsigned int GLuint;
-typedef int GLint;
-typedef int GLsizei;
-typedef unsigned char GLboolean;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned long GLulong;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void GLvoid;
-#if defined(_MSC_VER) && _MSC_VER < 1400
-typedef __int64 GLint64EXT;
-typedef unsigned __int64 GLuint64EXT;
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
-typedef signed long long GLint64EXT;
-typedef unsigned long long GLuint64EXT;
-#else
-#  if defined(__MINGW32__) || defined(__CYGWIN__)
-#include <inttypes.h>
-#  endif
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-typedef GLint64EXT  GLint64;
-typedef GLuint64EXT GLuint64;
-typedef struct __GLsync *GLsync;
-
-typedef char GLchar;
-
-#define GL_ZERO 0
-#define GL_FALSE 0
-#define GL_LOGIC_OP 0x0BF1
-#define GL_NONE 0
-#define GL_TEXTURE_COMPONENTS 0x1003
-#define GL_NO_ERROR 0
-#define GL_POINTS 0x0000
-#define GL_CURRENT_BIT 0x00000001
-#define GL_TRUE 1
-#define GL_ONE 1
-#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
-#define GL_LINES 0x0001
-#define GL_LINE_LOOP 0x0002
-#define GL_POINT_BIT 0x00000002
-#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
-#define GL_LINE_STRIP 0x0003
-#define GL_LINE_BIT 0x00000004
-#define GL_TRIANGLES 0x0004
-#define GL_TRIANGLE_STRIP 0x0005
-#define GL_TRIANGLE_FAN 0x0006
-#define GL_QUADS 0x0007
-#define GL_QUAD_STRIP 0x0008
-#define GL_POLYGON_BIT 0x00000008
-#define GL_POLYGON 0x0009
-#define GL_POLYGON_STIPPLE_BIT 0x00000010
-#define GL_PIXEL_MODE_BIT 0x00000020
-#define GL_LIGHTING_BIT 0x00000040
-#define GL_FOG_BIT 0x00000080
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#define GL_ACCUM 0x0100
-#define GL_LOAD 0x0101
-#define GL_RETURN 0x0102
-#define GL_MULT 0x0103
-#define GL_ADD 0x0104
-#define GL_NEVER 0x0200
-#define GL_ACCUM_BUFFER_BIT 0x00000200
-#define GL_LESS 0x0201
-#define GL_EQUAL 0x0202
-#define GL_LEQUAL 0x0203
-#define GL_GREATER 0x0204
-#define GL_NOTEQUAL 0x0205
-#define GL_GEQUAL 0x0206
-#define GL_ALWAYS 0x0207
-#define GL_SRC_COLOR 0x0300
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#define GL_SRC_ALPHA 0x0302
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#define GL_DST_ALPHA 0x0304
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#define GL_DST_COLOR 0x0306
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#define GL_SRC_ALPHA_SATURATE 0x0308
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#define GL_FRONT_LEFT 0x0400
-#define GL_FRONT_RIGHT 0x0401
-#define GL_BACK_LEFT 0x0402
-#define GL_BACK_RIGHT 0x0403
-#define GL_FRONT 0x0404
-#define GL_BACK 0x0405
-#define GL_LEFT 0x0406
-#define GL_RIGHT 0x0407
-#define GL_FRONT_AND_BACK 0x0408
-#define GL_AUX0 0x0409
-#define GL_AUX1 0x040A
-#define GL_AUX2 0x040B
-#define GL_AUX3 0x040C
-#define GL_INVALID_ENUM 0x0500
-#define GL_INVALID_VALUE 0x0501
-#define GL_INVALID_OPERATION 0x0502
-#define GL_STACK_OVERFLOW 0x0503
-#define GL_STACK_UNDERFLOW 0x0504
-#define GL_OUT_OF_MEMORY 0x0505
-#define GL_2D 0x0600
-#define GL_3D 0x0601
-#define GL_3D_COLOR 0x0602
-#define GL_3D_COLOR_TEXTURE 0x0603
-#define GL_4D_COLOR_TEXTURE 0x0604
-#define GL_PASS_THROUGH_TOKEN 0x0700
-#define GL_POINT_TOKEN 0x0701
-#define GL_LINE_TOKEN 0x0702
-#define GL_POLYGON_TOKEN 0x0703
-#define GL_BITMAP_TOKEN 0x0704
-#define GL_DRAW_PIXEL_TOKEN 0x0705
-#define GL_COPY_PIXEL_TOKEN 0x0706
-#define GL_LINE_RESET_TOKEN 0x0707
-#define GL_EXP 0x0800
-#define GL_VIEWPORT_BIT 0x00000800
-#define GL_EXP2 0x0801
-#define GL_CW 0x0900
-#define GL_CCW 0x0901
-#define GL_COEFF 0x0A00
-#define GL_ORDER 0x0A01
-#define GL_DOMAIN 0x0A02
-#define GL_CURRENT_COLOR 0x0B00
-#define GL_CURRENT_INDEX 0x0B01
-#define GL_CURRENT_NORMAL 0x0B02
-#define GL_CURRENT_TEXTURE_COORDS 0x0B03
-#define GL_CURRENT_RASTER_COLOR 0x0B04
-#define GL_CURRENT_RASTER_INDEX 0x0B05
-#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
-#define GL_CURRENT_RASTER_POSITION 0x0B07
-#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
-#define GL_CURRENT_RASTER_DISTANCE 0x0B09
-#define GL_POINT_SMOOTH 0x0B10
-#define GL_POINT_SIZE 0x0B11
-#define GL_POINT_SIZE_RANGE 0x0B12
-#define GL_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_LINE_SMOOTH 0x0B20
-#define GL_LINE_WIDTH 0x0B21
-#define GL_LINE_WIDTH_RANGE 0x0B22
-#define GL_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_LINE_STIPPLE 0x0B24
-#define GL_LINE_STIPPLE_PATTERN 0x0B25
-#define GL_LINE_STIPPLE_REPEAT 0x0B26
-#define GL_LIST_MODE 0x0B30
-#define GL_MAX_LIST_NESTING 0x0B31
-#define GL_LIST_BASE 0x0B32
-#define GL_LIST_INDEX 0x0B33
-#define GL_POLYGON_MODE 0x0B40
-#define GL_POLYGON_SMOOTH 0x0B41
-#define GL_POLYGON_STIPPLE 0x0B42
-#define GL_EDGE_FLAG 0x0B43
-#define GL_CULL_FACE 0x0B44
-#define GL_CULL_FACE_MODE 0x0B45
-#define GL_FRONT_FACE 0x0B46
-#define GL_LIGHTING 0x0B50
-#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
-#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
-#define GL_LIGHT_MODEL_AMBIENT 0x0B53
-#define GL_SHADE_MODEL 0x0B54
-#define GL_COLOR_MATERIAL_FACE 0x0B55
-#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
-#define GL_COLOR_MATERIAL 0x0B57
-#define GL_FOG 0x0B60
-#define GL_FOG_INDEX 0x0B61
-#define GL_FOG_DENSITY 0x0B62
-#define GL_FOG_START 0x0B63
-#define GL_FOG_END 0x0B64
-#define GL_FOG_MODE 0x0B65
-#define GL_FOG_COLOR 0x0B66
-#define GL_DEPTH_RANGE 0x0B70
-#define GL_DEPTH_TEST 0x0B71
-#define GL_DEPTH_WRITEMASK 0x0B72
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#define GL_DEPTH_FUNC 0x0B74
-#define GL_ACCUM_CLEAR_VALUE 0x0B80
-#define GL_STENCIL_TEST 0x0B90
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#define GL_STENCIL_FUNC 0x0B92
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#define GL_STENCIL_FAIL 0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#define GL_STENCIL_REF 0x0B97
-#define GL_STENCIL_WRITEMASK 0x0B98
-#define GL_MATRIX_MODE 0x0BA0
-#define GL_NORMALIZE 0x0BA1
-#define GL_VIEWPORT 0x0BA2
-#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
-#define GL_PROJECTION_STACK_DEPTH 0x0BA4
-#define GL_TEXTURE_STACK_DEPTH 0x0BA5
-#define GL_MODELVIEW_MATRIX 0x0BA6
-#define GL_PROJECTION_MATRIX 0x0BA7
-#define GL_TEXTURE_MATRIX 0x0BA8
-#define GL_ATTRIB_STACK_DEPTH 0x0BB0
-#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
-#define GL_ALPHA_TEST 0x0BC0
-#define GL_ALPHA_TEST_FUNC 0x0BC1
-#define GL_ALPHA_TEST_REF 0x0BC2
-#define GL_DITHER 0x0BD0
-#define GL_BLEND_DST 0x0BE0
-#define GL_BLEND_SRC 0x0BE1
-#define GL_BLEND 0x0BE2
-#define GL_LOGIC_OP_MODE 0x0BF0
-#define GL_INDEX_LOGIC_OP 0x0BF1
-#define GL_COLOR_LOGIC_OP 0x0BF2
-#define GL_AUX_BUFFERS 0x0C00
-#define GL_DRAW_BUFFER 0x0C01
-#define GL_READ_BUFFER 0x0C02
-#define GL_SCISSOR_BOX 0x0C10
-#define GL_SCISSOR_TEST 0x0C11
-#define GL_INDEX_CLEAR_VALUE 0x0C20
-#define GL_INDEX_WRITEMASK 0x0C21
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#define GL_COLOR_WRITEMASK 0x0C23
-#define GL_INDEX_MODE 0x0C30
-#define GL_RGBA_MODE 0x0C31
-#define GL_DOUBLEBUFFER 0x0C32
-#define GL_STEREO 0x0C33
-#define GL_RENDER_MODE 0x0C40
-#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
-#define GL_POINT_SMOOTH_HINT 0x0C51
-#define GL_LINE_SMOOTH_HINT 0x0C52
-#define GL_POLYGON_SMOOTH_HINT 0x0C53
-#define GL_FOG_HINT 0x0C54
-#define GL_TEXTURE_GEN_S 0x0C60
-#define GL_TEXTURE_GEN_T 0x0C61
-#define GL_TEXTURE_GEN_R 0x0C62
-#define GL_TEXTURE_GEN_Q 0x0C63
-#define GL_PIXEL_MAP_I_TO_I 0x0C70
-#define GL_PIXEL_MAP_S_TO_S 0x0C71
-#define GL_PIXEL_MAP_I_TO_R 0x0C72
-#define GL_PIXEL_MAP_I_TO_G 0x0C73
-#define GL_PIXEL_MAP_I_TO_B 0x0C74
-#define GL_PIXEL_MAP_I_TO_A 0x0C75
-#define GL_PIXEL_MAP_R_TO_R 0x0C76
-#define GL_PIXEL_MAP_G_TO_G 0x0C77
-#define GL_PIXEL_MAP_B_TO_B 0x0C78
-#define GL_PIXEL_MAP_A_TO_A 0x0C79
-#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
-#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
-#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
-#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
-#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
-#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
-#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
-#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
-#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
-#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
-#define GL_UNPACK_SWAP_BYTES 0x0CF0
-#define GL_UNPACK_LSB_FIRST 0x0CF1
-#define GL_UNPACK_ROW_LENGTH 0x0CF2
-#define GL_UNPACK_SKIP_ROWS 0x0CF3
-#define GL_UNPACK_SKIP_PIXELS 0x0CF4
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#define GL_PACK_SWAP_BYTES 0x0D00
-#define GL_PACK_LSB_FIRST 0x0D01
-#define GL_PACK_ROW_LENGTH 0x0D02
-#define GL_PACK_SKIP_ROWS 0x0D03
-#define GL_PACK_SKIP_PIXELS 0x0D04
-#define GL_PACK_ALIGNMENT 0x0D05
-#define GL_MAP_COLOR 0x0D10
-#define GL_MAP_STENCIL 0x0D11
-#define GL_INDEX_SHIFT 0x0D12
-#define GL_INDEX_OFFSET 0x0D13
-#define GL_RED_SCALE 0x0D14
-#define GL_RED_BIAS 0x0D15
-#define GL_ZOOM_X 0x0D16
-#define GL_ZOOM_Y 0x0D17
-#define GL_GREEN_SCALE 0x0D18
-#define GL_GREEN_BIAS 0x0D19
-#define GL_BLUE_SCALE 0x0D1A
-#define GL_BLUE_BIAS 0x0D1B
-#define GL_ALPHA_SCALE 0x0D1C
-#define GL_ALPHA_BIAS 0x0D1D
-#define GL_DEPTH_SCALE 0x0D1E
-#define GL_DEPTH_BIAS 0x0D1F
-#define GL_MAX_EVAL_ORDER 0x0D30
-#define GL_MAX_LIGHTS 0x0D31
-#define GL_MAX_CLIP_PLANES 0x0D32
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
-#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
-#define GL_MAX_NAME_STACK_DEPTH 0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
-#define GL_SUBPIXEL_BITS 0x0D50
-#define GL_INDEX_BITS 0x0D51
-#define GL_RED_BITS 0x0D52
-#define GL_GREEN_BITS 0x0D53
-#define GL_BLUE_BITS 0x0D54
-#define GL_ALPHA_BITS 0x0D55
-#define GL_DEPTH_BITS 0x0D56
-#define GL_STENCIL_BITS 0x0D57
-#define GL_ACCUM_RED_BITS 0x0D58
-#define GL_ACCUM_GREEN_BITS 0x0D59
-#define GL_ACCUM_BLUE_BITS 0x0D5A
-#define GL_ACCUM_ALPHA_BITS 0x0D5B
-#define GL_NAME_STACK_DEPTH 0x0D70
-#define GL_AUTO_NORMAL 0x0D80
-#define GL_MAP1_COLOR_4 0x0D90
-#define GL_MAP1_INDEX 0x0D91
-#define GL_MAP1_NORMAL 0x0D92
-#define GL_MAP1_TEXTURE_COORD_1 0x0D93
-#define GL_MAP1_TEXTURE_COORD_2 0x0D94
-#define GL_MAP1_TEXTURE_COORD_3 0x0D95
-#define GL_MAP1_TEXTURE_COORD_4 0x0D96
-#define GL_MAP1_VERTEX_3 0x0D97
-#define GL_MAP1_VERTEX_4 0x0D98
-#define GL_MAP2_COLOR_4 0x0DB0
-#define GL_MAP2_INDEX 0x0DB1
-#define GL_MAP2_NORMAL 0x0DB2
-#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
-#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
-#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
-#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
-#define GL_MAP2_VERTEX_3 0x0DB7
-#define GL_MAP2_VERTEX_4 0x0DB8
-#define GL_MAP1_GRID_DOMAIN 0x0DD0
-#define GL_MAP1_GRID_SEGMENTS 0x0DD1
-#define GL_MAP2_GRID_DOMAIN 0x0DD2
-#define GL_MAP2_GRID_SEGMENTS 0x0DD3
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
-#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
-#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
-#define GL_SELECTION_BUFFER_POINTER 0x0DF3
-#define GL_SELECTION_BUFFER_SIZE 0x0DF4
-#define GL_TEXTURE_WIDTH 0x1000
-#define GL_TRANSFORM_BIT 0x00001000
-#define GL_TEXTURE_HEIGHT 0x1001
-#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
-#define GL_TEXTURE_BORDER_COLOR 0x1004
-#define GL_TEXTURE_BORDER 0x1005
-#define GL_DONT_CARE 0x1100
-#define GL_FASTEST 0x1101
-#define GL_NICEST 0x1102
-#define GL_AMBIENT 0x1200
-#define GL_DIFFUSE 0x1201
-#define GL_SPECULAR 0x1202
-#define GL_POSITION 0x1203
-#define GL_SPOT_DIRECTION 0x1204
-#define GL_SPOT_EXPONENT 0x1205
-#define GL_SPOT_CUTOFF 0x1206
-#define GL_CONSTANT_ATTENUATION 0x1207
-#define GL_LINEAR_ATTENUATION 0x1208
-#define GL_QUADRATIC_ATTENUATION 0x1209
-#define GL_COMPILE 0x1300
-#define GL_COMPILE_AND_EXECUTE 0x1301
-#define GL_BYTE 0x1400
-#define GL_UNSIGNED_BYTE 0x1401
-#define GL_SHORT 0x1402
-#define GL_UNSIGNED_SHORT 0x1403
-#define GL_INT 0x1404
-#define GL_UNSIGNED_INT 0x1405
-#define GL_FLOAT 0x1406
-#define GL_2_BYTES 0x1407
-#define GL_3_BYTES 0x1408
-#define GL_4_BYTES 0x1409
-#define GL_DOUBLE 0x140A
-#define GL_CLEAR 0x1500
-#define GL_AND 0x1501
-#define GL_AND_REVERSE 0x1502
-#define GL_COPY 0x1503
-#define GL_AND_INVERTED 0x1504
-#define GL_NOOP 0x1505
-#define GL_XOR 0x1506
-#define GL_OR 0x1507
-#define GL_NOR 0x1508
-#define GL_EQUIV 0x1509
-#define GL_INVERT 0x150A
-#define GL_OR_REVERSE 0x150B
-#define GL_COPY_INVERTED 0x150C
-#define GL_OR_INVERTED 0x150D
-#define GL_NAND 0x150E
-#define GL_SET 0x150F
-#define GL_EMISSION 0x1600
-#define GL_SHININESS 0x1601
-#define GL_AMBIENT_AND_DIFFUSE 0x1602
-#define GL_COLOR_INDEXES 0x1603
-#define GL_MODELVIEW 0x1700
-#define GL_PROJECTION 0x1701
-#define GL_TEXTURE 0x1702
-#define GL_COLOR 0x1800
-#define GL_DEPTH 0x1801
-#define GL_STENCIL 0x1802
-#define GL_COLOR_INDEX 0x1900
-#define GL_STENCIL_INDEX 0x1901
-#define GL_DEPTH_COMPONENT 0x1902
-#define GL_RED 0x1903
-#define GL_GREEN 0x1904
-#define GL_BLUE 0x1905
-#define GL_ALPHA 0x1906
-#define GL_RGB 0x1907
-#define GL_RGBA 0x1908
-#define GL_LUMINANCE 0x1909
-#define GL_LUMINANCE_ALPHA 0x190A
-#define GL_BITMAP 0x1A00
-#define GL_POINT 0x1B00
-#define GL_LINE 0x1B01
-#define GL_FILL 0x1B02
-#define GL_RENDER 0x1C00
-#define GL_FEEDBACK 0x1C01
-#define GL_SELECT 0x1C02
-#define GL_FLAT 0x1D00
-#define GL_SMOOTH 0x1D01
-#define GL_KEEP 0x1E00
-#define GL_REPLACE 0x1E01
-#define GL_INCR 0x1E02
-#define GL_DECR 0x1E03
-#define GL_VENDOR 0x1F00
-#define GL_RENDERER 0x1F01
-#define GL_VERSION 0x1F02
-#define GL_EXTENSIONS 0x1F03
-#define GL_S 0x2000
-#define GL_ENABLE_BIT 0x00002000
-#define GL_T 0x2001
-#define GL_R 0x2002
-#define GL_Q 0x2003
-#define GL_MODULATE 0x2100
-#define GL_DECAL 0x2101
-#define GL_TEXTURE_ENV_MODE 0x2200
-#define GL_TEXTURE_ENV_COLOR 0x2201
-#define GL_TEXTURE_ENV 0x2300
-#define GL_EYE_LINEAR 0x2400
-#define GL_OBJECT_LINEAR 0x2401
-#define GL_SPHERE_MAP 0x2402
-#define GL_TEXTURE_GEN_MODE 0x2500
-#define GL_OBJECT_PLANE 0x2501
-#define GL_EYE_PLANE 0x2502
-#define GL_NEAREST 0x2600
-#define GL_LINEAR 0x2601
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#define GL_TEXTURE_WRAP_S 0x2802
-#define GL_TEXTURE_WRAP_T 0x2803
-#define GL_CLAMP 0x2900
-#define GL_REPEAT 0x2901
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#define GL_POLYGON_OFFSET_POINT 0x2A01
-#define GL_POLYGON_OFFSET_LINE 0x2A02
-#define GL_R3_G3_B2 0x2A10
-#define GL_V2F 0x2A20
-#define GL_V3F 0x2A21
-#define GL_C4UB_V2F 0x2A22
-#define GL_C4UB_V3F 0x2A23
-#define GL_C3F_V3F 0x2A24
-#define GL_N3F_V3F 0x2A25
-#define GL_C4F_N3F_V3F 0x2A26
-#define GL_T2F_V3F 0x2A27
-#define GL_T4F_V4F 0x2A28
-#define GL_T2F_C4UB_V3F 0x2A29
-#define GL_T2F_C3F_V3F 0x2A2A
-#define GL_T2F_N3F_V3F 0x2A2B
-#define GL_T2F_C4F_N3F_V3F 0x2A2C
-#define GL_T4F_C4F_N3F_V4F 0x2A2D
-#define GL_CLIP_PLANE0 0x3000
-#define GL_CLIP_PLANE1 0x3001
-#define GL_CLIP_PLANE2 0x3002
-#define GL_CLIP_PLANE3 0x3003
-#define GL_CLIP_PLANE4 0x3004
-#define GL_CLIP_PLANE5 0x3005
-#define GL_LIGHT0 0x4000
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#define GL_LIGHT1 0x4001
-#define GL_LIGHT2 0x4002
-#define GL_LIGHT3 0x4003
-#define GL_LIGHT4 0x4004
-#define GL_LIGHT5 0x4005
-#define GL_LIGHT6 0x4006
-#define GL_LIGHT7 0x4007
-#define GL_HINT_BIT 0x00008000
-#define GL_POLYGON_OFFSET_FILL 0x8037
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#define GL_ALPHA4 0x803B
-#define GL_ALPHA8 0x803C
-#define GL_ALPHA12 0x803D
-#define GL_ALPHA16 0x803E
-#define GL_LUMINANCE4 0x803F
-#define GL_LUMINANCE8 0x8040
-#define GL_LUMINANCE12 0x8041
-#define GL_LUMINANCE16 0x8042
-#define GL_LUMINANCE4_ALPHA4 0x8043
-#define GL_LUMINANCE6_ALPHA2 0x8044
-#define GL_LUMINANCE8_ALPHA8 0x8045
-#define GL_LUMINANCE12_ALPHA4 0x8046
-#define GL_LUMINANCE12_ALPHA12 0x8047
-#define GL_LUMINANCE16_ALPHA16 0x8048
-#define GL_INTENSITY 0x8049
-#define GL_INTENSITY4 0x804A
-#define GL_INTENSITY8 0x804B
-#define GL_INTENSITY12 0x804C
-#define GL_INTENSITY16 0x804D
-#define GL_RGB4 0x804F
-#define GL_RGB5 0x8050
-#define GL_RGB8 0x8051
-#define GL_RGB10 0x8052
-#define GL_RGB12 0x8053
-#define GL_RGB16 0x8054
-#define GL_RGBA2 0x8055
-#define GL_RGBA4 0x8056
-#define GL_RGB5_A1 0x8057
-#define GL_RGBA8 0x8058
-#define GL_RGB10_A2 0x8059
-#define GL_RGBA12 0x805A
-#define GL_RGBA16 0x805B
-#define GL_TEXTURE_RED_SIZE 0x805C
-#define GL_TEXTURE_GREEN_SIZE 0x805D
-#define GL_TEXTURE_BLUE_SIZE 0x805E
-#define GL_TEXTURE_ALPHA_SIZE 0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
-#define GL_TEXTURE_INTENSITY_SIZE 0x8061
-#define GL_PROXY_TEXTURE_1D 0x8063
-#define GL_PROXY_TEXTURE_2D 0x8064
-#define GL_TEXTURE_PRIORITY 0x8066
-#define GL_TEXTURE_RESIDENT 0x8067
-#define GL_TEXTURE_BINDING_1D 0x8068
-#define GL_TEXTURE_BINDING_2D 0x8069
-#define GL_VERTEX_ARRAY 0x8074
-#define GL_NORMAL_ARRAY 0x8075
-#define GL_COLOR_ARRAY 0x8076
-#define GL_INDEX_ARRAY 0x8077
-#define GL_TEXTURE_COORD_ARRAY 0x8078
-#define GL_EDGE_FLAG_ARRAY 0x8079
-#define GL_VERTEX_ARRAY_SIZE 0x807A
-#define GL_VERTEX_ARRAY_TYPE 0x807B
-#define GL_VERTEX_ARRAY_STRIDE 0x807C
-#define GL_NORMAL_ARRAY_TYPE 0x807E
-#define GL_NORMAL_ARRAY_STRIDE 0x807F
-#define GL_COLOR_ARRAY_SIZE 0x8081
-#define GL_COLOR_ARRAY_TYPE 0x8082
-#define GL_COLOR_ARRAY_STRIDE 0x8083
-#define GL_INDEX_ARRAY_TYPE 0x8085
-#define GL_INDEX_ARRAY_STRIDE 0x8086
-#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
-#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
-#define GL_VERTEX_ARRAY_POINTER 0x808E
-#define GL_NORMAL_ARRAY_POINTER 0x808F
-#define GL_COLOR_ARRAY_POINTER 0x8090
-#define GL_INDEX_ARRAY_POINTER 0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
-#define GL_COLOR_INDEX1_EXT 0x80E2
-#define GL_COLOR_INDEX2_EXT 0x80E3
-#define GL_COLOR_INDEX4_EXT 0x80E4
-#define GL_COLOR_INDEX8_EXT 0x80E5
-#define GL_COLOR_INDEX12_EXT 0x80E6
-#define GL_COLOR_INDEX16_EXT 0x80E7
-#define GL_EVAL_BIT 0x00010000
-#define GL_LIST_BIT 0x00020000
-#define GL_TEXTURE_BIT 0x00040000
-#define GL_SCISSOR_BIT 0x00080000
-#define GL_ALL_ATTRIB_BITS 0x000fffff
-#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff
-
-GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value);
-GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref);
-GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences);
-GLAPI void GLAPIENTRY glArrayElement (GLint i);
-GLAPI void GLAPIENTRY glBegin (GLenum mode);
-GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
-GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GLAPI void GLAPIENTRY glCallList (GLuint list);
-GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const GLvoid *lists);
-GLAPI void GLAPIENTRY glClear (GLbitfield mask);
-GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GLAPI void GLAPIENTRY glClearDepth (GLclampd depth);
-GLAPI void GLAPIENTRY glClearIndex (GLfloat c);
-GLAPI void GLAPIENTRY glClearStencil (GLint s);
-GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation);
-GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue);
-GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v);
-GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue);
-GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue);
-GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue);
-GLAPI void GLAPIENTRY glColor3iv (const GLint *v);
-GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue);
-GLAPI void GLAPIENTRY glColor3sv (const GLshort *v);
-GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue);
-GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v);
-GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue);
-GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v);
-GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue);
-GLAPI void GLAPIENTRY glColor3usv (const GLushort *v);
-GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v);
-GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha);
-GLAPI void GLAPIENTRY glColor4iv (const GLint *v);
-GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha);
-GLAPI void GLAPIENTRY glColor4sv (const GLshort *v);
-GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v);
-GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v);
-GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha);
-GLAPI void GLAPIENTRY glColor4usv (const GLushort *v);
-GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode);
-GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void GLAPIENTRY glCullFace (GLenum mode);
-GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range);
-GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
-GLAPI void GLAPIENTRY glDepthFunc (GLenum func);
-GLAPI void GLAPIENTRY glDepthMask (GLboolean flag);
-GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar);
-GLAPI void GLAPIENTRY glDisable (GLenum cap);
-GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
-GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode);
-GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag);
-GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag);
-GLAPI void GLAPIENTRY glEnable (GLenum cap);
-GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
-GLAPI void GLAPIENTRY glEnd (void);
-GLAPI void GLAPIENTRY glEndList (void);
-GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u);
-GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u);
-GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u);
-GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u);
-GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v);
-GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u);
-GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v);
-GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u);
-GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2);
-GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-GLAPI void GLAPIENTRY glEvalPoint1 (GLint i);
-GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j);
-GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer);
-GLAPI void GLAPIENTRY glFinish (void);
-GLAPI void GLAPIENTRY glFlush (void);
-GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glFrontFace (GLenum mode);
-GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range);
-GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures);
-GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
-GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation);
-GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params);
-GLAPI GLenum GLAPIENTRY glGetError (void);
-GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v);
-GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v);
-GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v);
-GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
-GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
-GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
-GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
-GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask);
-GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
-GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
-GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
-GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
-GLAPI void GLAPIENTRY glIndexMask (GLuint mask);
-GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glIndexd (GLdouble c);
-GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c);
-GLAPI void GLAPIENTRY glIndexf (GLfloat c);
-GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c);
-GLAPI void GLAPIENTRY glIndexi (GLint c);
-GLAPI void GLAPIENTRY glIndexiv (const GLint *c);
-GLAPI void GLAPIENTRY glIndexs (GLshort c);
-GLAPI void GLAPIENTRY glIndexsv (const GLshort *c);
-GLAPI void GLAPIENTRY glIndexub (GLubyte c);
-GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c);
-GLAPI void GLAPIENTRY glInitNames (void);
-GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer);
-GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap);
-GLAPI GLboolean GLAPIENTRY glIsList (GLuint list);
-GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture);
-GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern);
-GLAPI void GLAPIENTRY glLineWidth (GLfloat width);
-GLAPI void GLAPIENTRY glListBase (GLuint base);
-GLAPI void GLAPIENTRY glLoadIdentity (void);
-GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m);
-GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m);
-GLAPI void GLAPIENTRY glLoadName (GLuint name);
-GLAPI void GLAPIENTRY glLogicOp (GLenum opcode);
-GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2);
-GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2);
-GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glMatrixMode (GLenum mode);
-GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m);
-GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m);
-GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode);
-GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz);
-GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v);
-GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz);
-GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
-GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
-GLAPI void GLAPIENTRY glNormal3iv (const GLint *v);
-GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
-GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v);
-GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLAPI void GLAPIENTRY glPassThrough (GLfloat token);
-GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
-GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values);
-GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values);
-GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor);
-GLAPI void GLAPIENTRY glPointSize (GLfloat size);
-GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode);
-GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask);
-GLAPI void GLAPIENTRY glPopAttrib (void);
-GLAPI void GLAPIENTRY glPopClientAttrib (void);
-GLAPI void GLAPIENTRY glPopMatrix (void);
-GLAPI void GLAPIENTRY glPopName (void);
-GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask);
-GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask);
-GLAPI void GLAPIENTRY glPushMatrix (void);
-GLAPI void GLAPIENTRY glPushName (GLuint name);
-GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y);
-GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y);
-GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y);
-GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v);
-GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y);
-GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v);
-GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z);
-GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v);
-GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z);
-GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v);
-GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w);
-GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v);
-GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v);
-GLAPI void GLAPIENTRY glReadBuffer (GLenum mode);
-GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
-GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2);
-GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2);
-GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2);
-GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2);
-GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode);
-GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer);
-GLAPI void GLAPIENTRY glShadeModel (GLenum mode);
-GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GLAPI void GLAPIENTRY glStencilMask (GLuint mask);
-GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s);
-GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s);
-GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glTexCoord1i (GLint s);
-GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v);
-GLAPI void GLAPIENTRY glTexCoord1s (GLshort s);
-GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v);
-GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t);
-GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t);
-GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t);
-GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v);
-GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t);
-GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v);
-GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r);
-GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r);
-GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r);
-GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v);
-GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r);
-GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v);
-GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
-GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v);
-GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v);
-GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param);
-GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params);
-GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
-GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y);
-GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y);
-GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y);
-GLAPI void GLAPIENTRY glVertex2iv (const GLint *v);
-GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y);
-GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v);
-GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z);
-GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z);
-GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z);
-GLAPI void GLAPIENTRY glVertex3iv (const GLint *v);
-GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z);
-GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v);
-GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v);
-GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v);
-GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
-GLAPI void GLAPIENTRY glVertex4iv (const GLint *v);
-GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v);
-GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
-#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1)
-
-#endif /* GL_VERSION_1_1 */
-
-/* ---------------------------------- GLU ---------------------------------- */
-
-#ifndef GLEW_NO_GLU
-/* this is where we can safely include GLU */
-#  if defined(__APPLE__) && defined(__MACH__)
-#    include <OpenGL/glu.h>
-#  else
-#    include <GL/glu.h>
-#  endif
-#endif
-
-/* ----------------------------- GL_VERSION_1_2 ---------------------------- */
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-
-#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_UNSIGNED_BYTE_3_3_2 0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#define GL_UNSIGNED_INT_8_8_8_8 0x8035
-#define GL_UNSIGNED_INT_10_10_10_2 0x8036
-#define GL_RESCALE_NORMAL 0x803A
-#define GL_TEXTURE_BINDING_3D 0x806A
-#define GL_PACK_SKIP_IMAGES 0x806B
-#define GL_PACK_IMAGE_HEIGHT 0x806C
-#define GL_UNPACK_SKIP_IMAGES 0x806D
-#define GL_UNPACK_IMAGE_HEIGHT 0x806E
-#define GL_TEXTURE_3D 0x806F
-#define GL_PROXY_TEXTURE_3D 0x8070
-#define GL_TEXTURE_DEPTH 0x8071
-#define GL_TEXTURE_WRAP_R 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE 0x8073
-#define GL_BGR 0x80E0
-#define GL_BGRA 0x80E1
-#define GL_MAX_ELEMENTS_VERTICES 0x80E8
-#define GL_MAX_ELEMENTS_INDICES 0x80E9
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_TEXTURE_MIN_LOD 0x813A
-#define GL_TEXTURE_MAX_LOD 0x813B
-#define GL_TEXTURE_BASE_LEVEL 0x813C
-#define GL_TEXTURE_MAX_LEVEL 0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
-#define GL_SINGLE_COLOR 0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
-#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
-#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-
-typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-
-#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D)
-#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements)
-#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D)
-#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D)
-
-#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2)
-
-#endif /* GL_VERSION_1_2 */
-
-/* ---------------------------- GL_VERSION_1_2_1 --------------------------- */
-
-#ifndef GL_VERSION_1_2_1
-#define GL_VERSION_1_2_1 1
-
-#define GLEW_VERSION_1_2_1 GLEW_GET_VAR(__GLEW_VERSION_1_2_1)
-
-#endif /* GL_VERSION_1_2_1 */
-
-/* ----------------------------- GL_VERSION_1_3 ---------------------------- */
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-
-#define GL_MULTISAMPLE 0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
-#define GL_SAMPLE_COVERAGE 0x80A0
-#define GL_SAMPLE_BUFFERS 0x80A8
-#define GL_SAMPLES 0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#define GL_CLAMP_TO_BORDER 0x812D
-#define GL_TEXTURE0 0x84C0
-#define GL_TEXTURE1 0x84C1
-#define GL_TEXTURE2 0x84C2
-#define GL_TEXTURE3 0x84C3
-#define GL_TEXTURE4 0x84C4
-#define GL_TEXTURE5 0x84C5
-#define GL_TEXTURE6 0x84C6
-#define GL_TEXTURE7 0x84C7
-#define GL_TEXTURE8 0x84C8
-#define GL_TEXTURE9 0x84C9
-#define GL_TEXTURE10 0x84CA
-#define GL_TEXTURE11 0x84CB
-#define GL_TEXTURE12 0x84CC
-#define GL_TEXTURE13 0x84CD
-#define GL_TEXTURE14 0x84CE
-#define GL_TEXTURE15 0x84CF
-#define GL_TEXTURE16 0x84D0
-#define GL_TEXTURE17 0x84D1
-#define GL_TEXTURE18 0x84D2
-#define GL_TEXTURE19 0x84D3
-#define GL_TEXTURE20 0x84D4
-#define GL_TEXTURE21 0x84D5
-#define GL_TEXTURE22 0x84D6
-#define GL_TEXTURE23 0x84D7
-#define GL_TEXTURE24 0x84D8
-#define GL_TEXTURE25 0x84D9
-#define GL_TEXTURE26 0x84DA
-#define GL_TEXTURE27 0x84DB
-#define GL_TEXTURE28 0x84DC
-#define GL_TEXTURE29 0x84DD
-#define GL_TEXTURE30 0x84DE
-#define GL_TEXTURE31 0x84DF
-#define GL_ACTIVE_TEXTURE 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
-#define GL_MAX_TEXTURE_UNITS 0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
-#define GL_SUBTRACT 0x84E7
-#define GL_COMPRESSED_ALPHA 0x84E9
-#define GL_COMPRESSED_LUMINANCE 0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
-#define GL_COMPRESSED_INTENSITY 0x84EC
-#define GL_COMPRESSED_RGB 0x84ED
-#define GL_COMPRESSED_RGBA 0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
-#define GL_NORMAL_MAP 0x8511
-#define GL_REFLECTION_MAP 0x8512
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
-#define GL_COMBINE 0x8570
-#define GL_COMBINE_RGB 0x8571
-#define GL_COMBINE_ALPHA 0x8572
-#define GL_RGB_SCALE 0x8573
-#define GL_ADD_SIGNED 0x8574
-#define GL_INTERPOLATE 0x8575
-#define GL_CONSTANT 0x8576
-#define GL_PRIMARY_COLOR 0x8577
-#define GL_PREVIOUS 0x8578
-#define GL_SOURCE0_RGB 0x8580
-#define GL_SOURCE1_RGB 0x8581
-#define GL_SOURCE2_RGB 0x8582
-#define GL_SOURCE0_ALPHA 0x8588
-#define GL_SOURCE1_ALPHA 0x8589
-#define GL_SOURCE2_ALPHA 0x858A
-#define GL_OPERAND0_RGB 0x8590
-#define GL_OPERAND1_RGB 0x8591
-#define GL_OPERAND2_RGB 0x8592
-#define GL_OPERAND0_ALPHA 0x8598
-#define GL_OPERAND1_ALPHA 0x8599
-#define GL_OPERAND2_ALPHA 0x859A
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
-#define GL_TEXTURE_COMPRESSED 0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
-#define GL_DOT3_RGB 0x86AE
-#define GL_DOT3_RGBA 0x86AF
-#define GL_MULTISAMPLE_BIT 0x20000000
-
-typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLvoid *img);
-typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
-typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
-typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
-typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-
-#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture)
-#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture)
-#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D)
-#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D)
-#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D)
-#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D)
-#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D)
-#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D)
-#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage)
-#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd)
-#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf)
-#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd)
-#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf)
-#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d)
-#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv)
-#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f)
-#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv)
-#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i)
-#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv)
-#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s)
-#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv)
-#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d)
-#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv)
-#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f)
-#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv)
-#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i)
-#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv)
-#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s)
-#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv)
-#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d)
-#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv)
-#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f)
-#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv)
-#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i)
-#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv)
-#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s)
-#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv)
-#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d)
-#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv)
-#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f)
-#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv)
-#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i)
-#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv)
-#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s)
-#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv)
-#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage)
-
-#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3)
-
-#endif /* GL_VERSION_1_3 */
-
-/* ----------------------------- GL_VERSION_1_4 ---------------------------- */
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-
-#define GL_BLEND_DST_RGB 0x80C8
-#define GL_BLEND_SRC_RGB 0x80C9
-#define GL_BLEND_DST_ALPHA 0x80CA
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#define GL_POINT_SIZE_MIN 0x8126
-#define GL_POINT_SIZE_MAX 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
-#define GL_POINT_DISTANCE_ATTENUATION 0x8129
-#define GL_GENERATE_MIPMAP 0x8191
-#define GL_GENERATE_MIPMAP_HINT 0x8192
-#define GL_DEPTH_COMPONENT16 0x81A5
-#define GL_DEPTH_COMPONENT24 0x81A6
-#define GL_DEPTH_COMPONENT32 0x81A7
-#define GL_MIRRORED_REPEAT 0x8370
-#define GL_FOG_COORDINATE_SOURCE 0x8450
-#define GL_FOG_COORDINATE 0x8451
-#define GL_FRAGMENT_DEPTH 0x8452
-#define GL_CURRENT_FOG_COORDINATE 0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
-#define GL_FOG_COORDINATE_ARRAY 0x8457
-#define GL_COLOR_SUM 0x8458
-#define GL_CURRENT_SECONDARY_COLOR 0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
-#define GL_SECONDARY_COLOR_ARRAY 0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
-#define GL_TEXTURE_FILTER_CONTROL 0x8500
-#define GL_TEXTURE_LOD_BIAS 0x8501
-#define GL_INCR_WRAP 0x8507
-#define GL_DECR_WRAP 0x8508
-#define GL_TEXTURE_DEPTH_SIZE 0x884A
-#define GL_DEPTH_TEXTURE_MODE 0x884B
-#define GL_TEXTURE_COMPARE_MODE 0x884C
-#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#define GL_COMPARE_R_TO_TEXTURE 0x884E
-
-typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei drawcount);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p);
-
-#define glBlendColor GLEW_GET_FUN(__glewBlendColor)
-#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation)
-#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate)
-#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer)
-#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd)
-#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv)
-#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf)
-#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv)
-#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays)
-#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements)
-#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf)
-#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
-#define glPointParameteri GLEW_GET_FUN(__glewPointParameteri)
-#define glPointParameteriv GLEW_GET_FUN(__glewPointParameteriv)
-#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b)
-#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv)
-#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d)
-#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv)
-#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f)
-#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv)
-#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i)
-#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv)
-#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s)
-#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv)
-#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub)
-#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv)
-#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui)
-#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv)
-#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us)
-#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv)
-#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer)
-#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d)
-#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv)
-#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f)
-#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv)
-#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i)
-#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv)
-#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s)
-#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv)
-#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d)
-#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv)
-#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f)
-#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv)
-#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i)
-#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv)
-#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s)
-#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv)
-
-#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4)
-
-#endif /* GL_VERSION_1_4 */
-
-/* ----------------------------- GL_VERSION_1_5 ---------------------------- */
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-
-#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD GL_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
-#define GL_SRC0_RGB GL_SOURCE0_RGB
-#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
-#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
-#define GL_SRC1_RGB GL_SOURCE1_RGB
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
-#define GL_SRC2_RGB GL_SOURCE2_RGB
-#define GL_BUFFER_SIZE 0x8764
-#define GL_BUFFER_USAGE 0x8765
-#define GL_QUERY_COUNTER_BITS 0x8864
-#define GL_CURRENT_QUERY 0x8865
-#define GL_QUERY_RESULT 0x8866
-#define GL_QUERY_RESULT_AVAILABLE 0x8867
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#define GL_ARRAY_BUFFER_BINDING 0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY 0x88B8
-#define GL_WRITE_ONLY 0x88B9
-#define GL_READ_WRITE 0x88BA
-#define GL_BUFFER_ACCESS 0x88BB
-#define GL_BUFFER_MAPPED 0x88BC
-#define GL_BUFFER_MAP_POINTER 0x88BD
-#define GL_STREAM_DRAW 0x88E0
-#define GL_STREAM_READ 0x88E1
-#define GL_STREAM_COPY 0x88E2
-#define GL_STATIC_DRAW 0x88E4
-#define GL_STATIC_READ 0x88E5
-#define GL_STATIC_COPY 0x88E6
-#define GL_DYNAMIC_DRAW 0x88E8
-#define GL_DYNAMIC_READ 0x88E9
-#define GL_DYNAMIC_COPY 0x88EA
-#define GL_SAMPLES_PASSED 0x8914
-
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-
-typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
-typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
-typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers);
-typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid** params);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer);
-typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id);
-typedef GLvoid* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target);
-
-#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery)
-#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer)
-#define glBufferData GLEW_GET_FUN(__glewBufferData)
-#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData)
-#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers)
-#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries)
-#define glEndQuery GLEW_GET_FUN(__glewEndQuery)
-#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers)
-#define glGenQueries GLEW_GET_FUN(__glewGenQueries)
-#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv)
-#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv)
-#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData)
-#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv)
-#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv)
-#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv)
-#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer)
-#define glIsQuery GLEW_GET_FUN(__glewIsQuery)
-#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer)
-#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer)
-
-#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5)
-
-#endif /* GL_VERSION_1_5 */
-
-/* ----------------------------- GL_VERSION_2_0 ---------------------------- */
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-
-#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#define GL_STENCIL_BACK_FUNC 0x8800
-#define GL_STENCIL_BACK_FAIL 0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
-#define GL_MAX_DRAW_BUFFERS 0x8824
-#define GL_DRAW_BUFFER0 0x8825
-#define GL_DRAW_BUFFER1 0x8826
-#define GL_DRAW_BUFFER2 0x8827
-#define GL_DRAW_BUFFER3 0x8828
-#define GL_DRAW_BUFFER4 0x8829
-#define GL_DRAW_BUFFER5 0x882A
-#define GL_DRAW_BUFFER6 0x882B
-#define GL_DRAW_BUFFER7 0x882C
-#define GL_DRAW_BUFFER8 0x882D
-#define GL_DRAW_BUFFER9 0x882E
-#define GL_DRAW_BUFFER10 0x882F
-#define GL_DRAW_BUFFER11 0x8830
-#define GL_DRAW_BUFFER12 0x8831
-#define GL_DRAW_BUFFER13 0x8832
-#define GL_DRAW_BUFFER14 0x8833
-#define GL_DRAW_BUFFER15 0x8834
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#define GL_POINT_SPRITE 0x8861
-#define GL_COORD_REPLACE 0x8862
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS 0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
-#define GL_MAX_VARYING_FLOATS 0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE 0x8B4F
-#define GL_FLOAT_VEC2 0x8B50
-#define GL_FLOAT_VEC3 0x8B51
-#define GL_FLOAT_VEC4 0x8B52
-#define GL_INT_VEC2 0x8B53
-#define GL_INT_VEC3 0x8B54
-#define GL_INT_VEC4 0x8B55
-#define GL_BOOL 0x8B56
-#define GL_BOOL_VEC2 0x8B57
-#define GL_BOOL_VEC3 0x8B58
-#define GL_BOOL_VEC4 0x8B59
-#define GL_FLOAT_MAT2 0x8B5A
-#define GL_FLOAT_MAT3 0x8B5B
-#define GL_FLOAT_MAT4 0x8B5C
-#define GL_SAMPLER_1D 0x8B5D
-#define GL_SAMPLER_2D 0x8B5E
-#define GL_SAMPLER_3D 0x8B5F
-#define GL_SAMPLER_CUBE 0x8B60
-#define GL_SAMPLER_1D_SHADOW 0x8B61
-#define GL_SAMPLER_2D_SHADOW 0x8B62
-#define GL_DELETE_STATUS 0x8B80
-#define GL_COMPILE_STATUS 0x8B81
-#define GL_LINK_STATUS 0x8B82
-#define GL_VALIDATE_STATUS 0x8B83
-#define GL_INFO_LOG_LENGTH 0x8B84
-#define GL_ATTACHED_SHADERS 0x8B85
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
-#define GL_CURRENT_PROGRAM 0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
-#define GL_LOWER_LEFT 0x8CA1
-#define GL_UPPER_LEFT 0x8CA2
-#define GL_STENCIL_BACK_REF 0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
-
-typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum, GLenum);
-typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
-typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs);
-typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders);
-typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param);
-typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
-typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
-typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param);
-typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint, GLenum, GLvoid**);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint, GLenum, GLdouble*);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint, GLenum, GLfloat*);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint, GLenum, GLint*);
-typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader);
-typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar** strings, const GLint* lengths);
-typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum, GLuint);
-typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
-
-#define glAttachShader GLEW_GET_FUN(__glewAttachShader)
-#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
-#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
-#define glCompileShader GLEW_GET_FUN(__glewCompileShader)
-#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram)
-#define glCreateShader GLEW_GET_FUN(__glewCreateShader)
-#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram)
-#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader)
-#define glDetachShader GLEW_GET_FUN(__glewDetachShader)
-#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray)
-#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers)
-#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray)
-#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib)
-#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform)
-#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders)
-#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation)
-#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog)
-#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv)
-#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog)
-#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource)
-#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv)
-#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation)
-#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv)
-#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv)
-#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv)
-#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv)
-#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv)
-#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv)
-#define glIsProgram GLEW_GET_FUN(__glewIsProgram)
-#define glIsShader GLEW_GET_FUN(__glewIsShader)
-#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram)
-#define glShaderSource GLEW_GET_FUN(__glewShaderSource)
-#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate)
-#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate)
-#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate)
-#define glUniform1f GLEW_GET_FUN(__glewUniform1f)
-#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv)
-#define glUniform1i GLEW_GET_FUN(__glewUniform1i)
-#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv)
-#define glUniform2f GLEW_GET_FUN(__glewUniform2f)
-#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv)
-#define glUniform2i GLEW_GET_FUN(__glewUniform2i)
-#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv)
-#define glUniform3f GLEW_GET_FUN(__glewUniform3f)
-#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv)
-#define glUniform3i GLEW_GET_FUN(__glewUniform3i)
-#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv)
-#define glUniform4f GLEW_GET_FUN(__glewUniform4f)
-#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv)
-#define glUniform4i GLEW_GET_FUN(__glewUniform4i)
-#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv)
-#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv)
-#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv)
-#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv)
-#define glUseProgram GLEW_GET_FUN(__glewUseProgram)
-#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram)
-#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d)
-#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv)
-#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f)
-#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv)
-#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s)
-#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv)
-#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d)
-#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv)
-#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f)
-#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv)
-#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s)
-#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv)
-#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d)
-#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv)
-#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f)
-#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv)
-#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s)
-#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv)
-#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv)
-#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv)
-#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv)
-#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub)
-#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv)
-#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv)
-#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv)
-#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv)
-#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d)
-#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv)
-#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f)
-#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv)
-#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv)
-#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s)
-#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv)
-#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv)
-#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
-#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
-#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
-
-#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
-
-#endif /* GL_VERSION_2_0 */
-
-/* ----------------------------- GL_VERSION_2_1 ---------------------------- */
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_PIXEL_PACK_BUFFER 0x88EB
-#define GL_PIXEL_UNPACK_BUFFER 0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
-#define GL_FLOAT_MAT2x3 0x8B65
-#define GL_FLOAT_MAT2x4 0x8B66
-#define GL_FLOAT_MAT3x2 0x8B67
-#define GL_FLOAT_MAT3x4 0x8B68
-#define GL_FLOAT_MAT4x2 0x8B69
-#define GL_FLOAT_MAT4x3 0x8B6A
-#define GL_SRGB 0x8C40
-#define GL_SRGB8 0x8C41
-#define GL_SRGB_ALPHA 0x8C42
-#define GL_SRGB8_ALPHA8 0x8C43
-#define GL_SLUMINANCE_ALPHA 0x8C44
-#define GL_SLUMINANCE8_ALPHA8 0x8C45
-#define GL_SLUMINANCE 0x8C46
-#define GL_SLUMINANCE8 0x8C47
-#define GL_COMPRESSED_SRGB 0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
-#define GL_COMPRESSED_SLUMINANCE 0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
-
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-
-#define glUniformMatrix2x3fv GLEW_GET_FUN(__glewUniformMatrix2x3fv)
-#define glUniformMatrix2x4fv GLEW_GET_FUN(__glewUniformMatrix2x4fv)
-#define glUniformMatrix3x2fv GLEW_GET_FUN(__glewUniformMatrix3x2fv)
-#define glUniformMatrix3x4fv GLEW_GET_FUN(__glewUniformMatrix3x4fv)
-#define glUniformMatrix4x2fv GLEW_GET_FUN(__glewUniformMatrix4x2fv)
-#define glUniformMatrix4x3fv GLEW_GET_FUN(__glewUniformMatrix4x3fv)
-
-#define GLEW_VERSION_2_1 GLEW_GET_VAR(__GLEW_VERSION_2_1)
-
-#endif /* GL_VERSION_2_1 */
-
-/* ----------------------------- GL_VERSION_3_0 ---------------------------- */
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-
-#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES
-#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5
-#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1
-#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3
-#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB
-#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0
-#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4
-#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2
-#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_MAJOR_VERSION 0x821B
-#define GL_MINOR_VERSION 0x821C
-#define GL_NUM_EXTENSIONS 0x821D
-#define GL_CONTEXT_FLAGS 0x821E
-#define GL_DEPTH_BUFFER 0x8223
-#define GL_STENCIL_BUFFER 0x8224
-#define GL_COMPRESSED_RED 0x8225
-#define GL_COMPRESSED_RG 0x8226
-#define GL_RGBA32F 0x8814
-#define GL_RGB32F 0x8815
-#define GL_RGBA16F 0x881A
-#define GL_RGB16F 0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
-#define GL_CLAMP_VERTEX_COLOR 0x891A
-#define GL_CLAMP_FRAGMENT_COLOR 0x891B
-#define GL_CLAMP_READ_COLOR 0x891C
-#define GL_FIXED_ONLY 0x891D
-#define GL_TEXTURE_RED_TYPE 0x8C10
-#define GL_TEXTURE_GREEN_TYPE 0x8C11
-#define GL_TEXTURE_BLUE_TYPE 0x8C12
-#define GL_TEXTURE_ALPHA_TYPE 0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE 0x8C15
-#define GL_TEXTURE_DEPTH_TYPE 0x8C16
-#define GL_TEXTURE_1D_ARRAY 0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
-#define GL_TEXTURE_2D_ARRAY 0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
-#define GL_R11F_G11F_B10F 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
-#define GL_RGB9_E5 0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
-#define GL_TEXTURE_SHARED_SIZE 0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED 0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD 0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS 0x8C8C
-#define GL_SEPARATE_ATTRIBS 0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI 0x8D70
-#define GL_RGB32UI 0x8D71
-#define GL_RGBA16UI 0x8D76
-#define GL_RGB16UI 0x8D77
-#define GL_RGBA8UI 0x8D7C
-#define GL_RGB8UI 0x8D7D
-#define GL_RGBA32I 0x8D82
-#define GL_RGB32I 0x8D83
-#define GL_RGBA16I 0x8D88
-#define GL_RGB16I 0x8D89
-#define GL_RGBA8I 0x8D8E
-#define GL_RGB8I 0x8D8F
-#define GL_RED_INTEGER 0x8D94
-#define GL_GREEN_INTEGER 0x8D95
-#define GL_BLUE_INTEGER 0x8D96
-#define GL_ALPHA_INTEGER 0x8D97
-#define GL_RGB_INTEGER 0x8D98
-#define GL_RGBA_INTEGER 0x8D99
-#define GL_BGR_INTEGER 0x8D9A
-#define GL_BGRA_INTEGER 0x8D9B
-#define GL_SAMPLER_1D_ARRAY 0x8DC0
-#define GL_SAMPLER_2D_ARRAY 0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
-#define GL_UNSIGNED_INT_VEC2 0x8DC6
-#define GL_UNSIGNED_INT_VEC3 0x8DC7
-#define GL_UNSIGNED_INT_VEC4 0x8DC8
-#define GL_INT_SAMPLER_1D 0x8DC9
-#define GL_INT_SAMPLER_2D 0x8DCA
-#define GL_INT_SAMPLER_3D 0x8DCB
-#define GL_INT_SAMPLER_CUBE 0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
-#define GL_QUERY_WAIT 0x8E13
-#define GL_QUERY_NO_WAIT 0x8E14
-#define GL_QUERY_BY_REGION_WAIT 0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
-
-typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERPROC) (GLuint, GLenum);
-typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum);
-typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONPROC) (GLuint, GLuint, const GLchar*);
-typedef void (GLAPIENTRY * PFNGLCLAMPCOLORPROC) (GLenum, GLenum);
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFIPROC) (GLenum, GLint, GLfloat, GLint);
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFVPROC) (GLenum, GLint, const GLfloat*);
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERIVPROC) (GLenum, GLint, const GLint*);
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERUIVPROC) (GLenum, GLint, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLCOLORMASKIPROC) (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-typedef void (GLAPIENTRY * PFNGLDISABLEIPROC) (GLenum, GLuint);
-typedef void (GLAPIENTRY * PFNGLENABLEIPROC) (GLenum, GLuint);
-typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (GLAPIENTRY * PFNGLGETBOOLEANI_VPROC) (GLenum, GLuint, GLboolean*);
-typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONPROC) (GLuint, const GLchar*);
-typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGIPROC) (GLenum, GLuint);
-typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVPROC) (GLenum, GLenum, GLint*);
-typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVPROC) (GLenum, GLenum, GLuint*);
-typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVPROC) (GLuint, GLint, GLuint*);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVPROC) (GLuint, GLenum, GLint*);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint, GLenum, GLuint*);
-typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDIPROC) (GLenum, GLuint);
-typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVPROC) (GLenum, GLenum, const GLint*);
-typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVPROC) (GLenum, GLenum, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint, GLsizei, const GLchar **, GLenum);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UIPROC) (GLint, GLuint);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVPROC) (GLint, GLsizei, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UIPROC) (GLint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVPROC) (GLint, GLsizei, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UIPROC) (GLint, GLuint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVPROC) (GLint, GLsizei, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UIPROC) (GLint, GLuint, GLuint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVPROC) (GLint, GLsizei, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IPROC) (GLuint, GLint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVPROC) (GLuint, const GLint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIPROC) (GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVPROC) (GLuint, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IPROC) (GLuint, GLint, GLint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVPROC) (GLuint, const GLint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIPROC) (GLuint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVPROC) (GLuint, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IPROC) (GLuint, GLint, GLint, GLint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVPROC) (GLuint, const GLint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIPROC) (GLuint, GLuint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVPROC) (GLuint, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVPROC) (GLuint, const GLbyte*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IPROC) (GLuint, GLint, GLint, GLint, GLint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVPROC) (GLuint, const GLint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVPROC) (GLuint, const GLshort*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVPROC) (GLuint, const GLubyte*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIPROC) (GLuint, GLuint, GLuint, GLuint, GLuint);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVPROC) (GLuint, const GLuint*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVPROC) (GLuint, const GLushort*);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint, GLint, GLenum, GLsizei, const GLvoid*);
-
-#define glBeginConditionalRender GLEW_GET_FUN(__glewBeginConditionalRender)
-#define glBeginTransformFeedback GLEW_GET_FUN(__glewBeginTransformFeedback)
-#define glBindFragDataLocation GLEW_GET_FUN(__glewBindFragDataLocation)
-#define glClampColor GLEW_GET_FUN(__glewClampColor)
-#define glClearBufferfi GLEW_GET_FUN(__glewClearBufferfi)
-#define glClearBufferfv GLEW_GET_FUN(__glewClearBufferfv)
-#define glClearBufferiv GLEW_GET_FUN(__glewClearBufferiv)
-#define glClearBufferuiv GLEW_GET_FUN(__glewClearBufferuiv)
-#define glColorMaski GLEW_GET_FUN(__glewColorMaski)
-#define glDisablei GLEW_GET_FUN(__glewDisablei)
-#define glEnablei GLEW_GET_FUN(__glewEnablei)
-#define glEndConditionalRender GLEW_GET_FUN(__glewEndConditionalRender)
-#define glEndTransformFeedback GLEW_GET_FUN(__glewEndTransformFeedback)
-#define glGetBooleani_v GLEW_GET_FUN(__glewGetBooleani_v)
-#define glGetFragDataLocation GLEW_GET_FUN(__glewGetFragDataLocation)
-#define glGetStringi GLEW_GET_FUN(__glewGetStringi)
-#define glGetTexParameterIiv GLEW_GET_FUN(__glewGetTexParameterIiv)
-#define glGetTexParameterIuiv GLEW_GET_FUN(__glewGetTexParameterIuiv)
-#define glGetTransformFeedbackVarying GLEW_GET_FUN(__glewGetTransformFeedbackVarying)
-#define glGetUniformuiv GLEW_GET_FUN(__glewGetUniformuiv)
-#define glGetVertexAttribIiv GLEW_GET_FUN(__glewGetVertexAttribIiv)
-#define glGetVertexAttribIuiv GLEW_GET_FUN(__glewGetVertexAttribIuiv)
-#define glIsEnabledi GLEW_GET_FUN(__glewIsEnabledi)
-#define glTexParameterIiv GLEW_GET_FUN(__glewTexParameterIiv)
-#define glTexParameterIuiv GLEW_GET_FUN(__glewTexParameterIuiv)
-#define glTransformFeedbackVaryings GLEW_GET_FUN(__glewTransformFeedbackVaryings)
-#define glUniform1ui GLEW_GET_FUN(__glewUniform1ui)
-#define glUniform1uiv GLEW_GET_FUN(__glewUniform1uiv)
-#define glUniform2ui GLEW_GET_FUN(__glewUniform2ui)
-#define glUniform2uiv GLEW_GET_FUN(__glewUniform2uiv)
-#define glUniform3ui GLEW_GET_FUN(__glewUniform3ui)
-#define glUniform3uiv GLEW_GET_FUN(__glewUniform3uiv)
-#define glUniform4ui GLEW_GET_FUN(__glewUniform4ui)
-#define glUniform4uiv GLEW_GET_FUN(__glewUniform4uiv)
-#define glVertexAttribI1i GLEW_GET_FUN(__glewVertexAttribI1i)
-#define glVertexAttribI1iv GLEW_GET_FUN(__glewVertexAttribI1iv)
-#define glVertexAttribI1ui GLEW_GET_FUN(__glewVertexAttribI1ui)
-#define glVertexAttribI1uiv GLEW_GET_FUN(__glewVertexAttribI1uiv)
-#define glVertexAttribI2i GLEW_GET_FUN(__glewVertexAttribI2i)
-#define glVertexAttribI2iv GLEW_GET_FUN(__glewVertexAttribI2iv)
-#define glVertexAttribI2ui GLEW_GET_FUN(__glewVertexAttribI2ui)
-#define glVertexAttribI2uiv GLEW_GET_FUN(__glewVertexAttribI2uiv)
-#define glVertexAttribI3i GLEW_GET_FUN(__glewVertexAttribI3i)
-#define glVertexAttribI3iv GLEW_GET_FUN(__glewVertexAttribI3iv)
-#define glVertexAttribI3ui GLEW_GET_FUN(__glewVertexAttribI3ui)
-#define glVertexAttribI3uiv GLEW_GET_FUN(__glewVertexAttribI3uiv)
-#define glVertexAttribI4bv GLEW_GET_FUN(__glewVertexAttribI4bv)
-#define glVertexAttribI4i GLEW_GET_FUN(__glewVertexAttribI4i)
-#define glVertexAttribI4iv GLEW_GET_FUN(__glewVertexAttribI4iv)
-#define glVertexAttribI4sv GLEW_GET_FUN(__glewVertexAttribI4sv)
-#define glVertexAttribI4ubv GLEW_GET_FUN(__glewVertexAttribI4ubv)
-#define glVertexAttribI4ui GLEW_GET_FUN(__glewVertexAttribI4ui)
-#define glVertexAttribI4uiv GLEW_GET_FUN(__glewVertexAttribI4uiv)
-#define glVertexAttribI4usv GLEW_GET_FUN(__glewVertexAttribI4usv)
-#define glVertexAttribIPointer GLEW_GET_FUN(__glewVertexAttribIPointer)
-
-#define GLEW_VERSION_3_0 GLEW_GET_VAR(__GLEW_VERSION_3_0)
-
-#endif /* GL_VERSION_3_0 */
-
-/* ----------------------------- GL_VERSION_3_1 ---------------------------- */
-
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-
-#define GL_TEXTURE_RECTANGLE 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8
-#define GL_SAMPLER_2D_RECT 0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64
-#define GL_TEXTURE_BUFFER 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER 0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E
-#define GL_SAMPLER_BUFFER 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT 0x8DCD
-#define GL_INT_SAMPLER_BUFFER 0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8
-#define GL_RED_SNORM 0x8F90
-#define GL_RG_SNORM 0x8F91
-#define GL_RGB_SNORM 0x8F92
-#define GL_RGBA_SNORM 0x8F93
-#define GL_R8_SNORM 0x8F94
-#define GL_RG8_SNORM 0x8F95
-#define GL_RGB8_SNORM 0x8F96
-#define GL_RGBA8_SNORM 0x8F97
-#define GL_R16_SNORM 0x8F98
-#define GL_RG16_SNORM 0x8F99
-#define GL_RGB16_SNORM 0x8F9A
-#define GL_RGBA16_SNORM 0x8F9B
-#define GL_SIGNED_NORMALIZED 0x8F9C
-#define GL_PRIMITIVE_RESTART 0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E
-#define GL_BUFFER_ACCESS_FLAGS 0x911F
-#define GL_BUFFER_MAP_LENGTH 0x9120
-#define GL_BUFFER_MAP_OFFSET 0x9121
-
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum, GLint, GLsizei, GLsizei);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum, GLsizei, GLenum, const GLvoid*, GLsizei);
-typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint);
-typedef void (GLAPIENTRY * PFNGLTEXBUFFERPROC) (GLenum, GLenum, GLuint);
-
-#define glDrawArraysInstanced GLEW_GET_FUN(__glewDrawArraysInstanced)
-#define glDrawElementsInstanced GLEW_GET_FUN(__glewDrawElementsInstanced)
-#define glPrimitiveRestartIndex GLEW_GET_FUN(__glewPrimitiveRestartIndex)
-#define glTexBuffer GLEW_GET_FUN(__glewTexBuffer)
-
-#define GLEW_VERSION_3_1 GLEW_GET_VAR(__GLEW_VERSION_3_1)
-
-#endif /* GL_VERSION_3_1 */
-
-/* ----------------------------- GL_VERSION_3_2 ---------------------------- */
-
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-
-#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
-#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
-#define GL_LINES_ADJACENCY 0x000A
-#define GL_LINE_STRIP_ADJACENCY 0x000B
-#define GL_TRIANGLES_ADJACENCY 0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D
-#define GL_PROGRAM_POINT_SIZE 0x8642
-#define GL_GEOMETRY_VERTICES_OUT 0x8916
-#define GL_GEOMETRY_INPUT_TYPE 0x8917
-#define GL_GEOMETRY_OUTPUT_TYPE 0x8918
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
-#define GL_GEOMETRY_SHADER 0x8DD9
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122
-#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123
-#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125
-#define GL_CONTEXT_PROFILE_MASK 0x9126
-
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum, GLenum, GLuint, GLint);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum, GLenum, GLint64 *);
-typedef void (GLAPIENTRY * PFNGLGETINTEGER64I_VPROC) (GLenum, GLuint, GLint64 *);
-
-#define glFramebufferTexture GLEW_GET_FUN(__glewFramebufferTexture)
-#define glGetBufferParameteri64v GLEW_GET_FUN(__glewGetBufferParameteri64v)
-#define glGetInteger64i_v GLEW_GET_FUN(__glewGetInteger64i_v)
-
-#define GLEW_VERSION_3_2 GLEW_GET_VAR(__GLEW_VERSION_3_2)
-
-#endif /* GL_VERSION_3_2 */
-
-/* ----------------------------- GL_VERSION_3_3 ---------------------------- */
-
-#ifndef GL_VERSION_3_3
-#define GL_VERSION_3_3 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE
-#define GL_TEXTURE_SWIZZLE_R 0x8E42
-#define GL_TEXTURE_SWIZZLE_G 0x8E43
-#define GL_TEXTURE_SWIZZLE_B 0x8E44
-#define GL_TEXTURE_SWIZZLE_A 0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
-#define GL_RGB10_A2UI 0x906F
-
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
-
-#define glVertexAttribDivisor GLEW_GET_FUN(__glewVertexAttribDivisor)
-
-#define GLEW_VERSION_3_3 GLEW_GET_VAR(__GLEW_VERSION_3_3)
-
-#endif /* GL_VERSION_3_3 */
-
-/* ----------------------------- GL_VERSION_4_0 ---------------------------- */
-
-#ifndef GL_VERSION_4_0
-#define GL_VERSION_4_0 1
-
-#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F
-#define GL_SAMPLE_SHADING 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F
-#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
-
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
-
-#define glBlendEquationSeparatei GLEW_GET_FUN(__glewBlendEquationSeparatei)
-#define glBlendEquationi GLEW_GET_FUN(__glewBlendEquationi)
-#define glBlendFuncSeparatei GLEW_GET_FUN(__glewBlendFuncSeparatei)
-#define glBlendFunci GLEW_GET_FUN(__glewBlendFunci)
-#define glMinSampleShading GLEW_GET_FUN(__glewMinSampleShading)
-
-#define GLEW_VERSION_4_0 GLEW_GET_VAR(__GLEW_VERSION_4_0)
-
-#endif /* GL_VERSION_4_0 */
-
-/* ----------------------------- GL_VERSION_4_1 ---------------------------- */
-
-#ifndef GL_VERSION_4_1
-#define GL_VERSION_4_1 1
-
-#define GLEW_VERSION_4_1 GLEW_GET_VAR(__GLEW_VERSION_4_1)
-
-#endif /* GL_VERSION_4_1 */
-
-/* ----------------------------- GL_VERSION_4_2 ---------------------------- */
-
-#ifndef GL_VERSION_4_2
-#define GL_VERSION_4_2 1
-
-#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C
-#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
-#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
-#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
-
-#define GLEW_VERSION_4_2 GLEW_GET_VAR(__GLEW_VERSION_4_2)
-
-#endif /* GL_VERSION_4_2 */
-
-/* ----------------------------- GL_VERSION_4_3 ---------------------------- */
-
-#ifndef GL_VERSION_4_3
-#define GL_VERSION_4_3 1
-
-#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9
-#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E
-
-#define GLEW_VERSION_4_3 GLEW_GET_VAR(__GLEW_VERSION_4_3)
-
-#endif /* GL_VERSION_4_3 */
-
-/* -------------------------- GL_3DFX_multisample -------------------------- */
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-
-#define GL_MULTISAMPLE_3DFX 0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX 0x86B3
-#define GL_SAMPLES_3DFX 0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX 0x20000000
-
-#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample)
-
-#endif /* GL_3DFX_multisample */
-
-/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-
-typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-
-#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX)
-
-#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer)
-
-#endif /* GL_3DFX_tbuffer */
-
-/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-
-#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1
-
-#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1)
-
-#endif /* GL_3DFX_texture_compression_FXT1 */
-
-/* ----------------------- GL_AMD_blend_minmax_factor ---------------------- */
-
-#ifndef GL_AMD_blend_minmax_factor
-#define GL_AMD_blend_minmax_factor 1
-
-#define GL_FACTOR_MIN_AMD 0x901C
-#define GL_FACTOR_MAX_AMD 0x901D
-
-#define GLEW_AMD_blend_minmax_factor GLEW_GET_VAR(__GLEW_AMD_blend_minmax_factor)
-
-#endif /* GL_AMD_blend_minmax_factor */
-
-/* ----------------------- GL_AMD_conservative_depth ----------------------- */
-
-#ifndef GL_AMD_conservative_depth
-#define GL_AMD_conservative_depth 1
-
-#define GLEW_AMD_conservative_depth GLEW_GET_VAR(__GLEW_AMD_conservative_depth)
-
-#endif /* GL_AMD_conservative_depth */
-
-/* -------------------------- GL_AMD_debug_output -------------------------- */
-
-#ifndef GL_AMD_debug_output
-#define GL_AMD_debug_output 1
-
-#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144
-#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145
-#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147
-#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148
-#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149
-#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
-#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
-#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
-#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
-#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
-#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
-#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150
-
-typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
-
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void* userParam);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf);
-typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message);
-
-#define glDebugMessageCallbackAMD GLEW_GET_FUN(__glewDebugMessageCallbackAMD)
-#define glDebugMessageEnableAMD GLEW_GET_FUN(__glewDebugMessageEnableAMD)
-#define glDebugMessageInsertAMD GLEW_GET_FUN(__glewDebugMessageInsertAMD)
-#define glGetDebugMessageLogAMD GLEW_GET_FUN(__glewGetDebugMessageLogAMD)
-
-#define GLEW_AMD_debug_output GLEW_GET_VAR(__GLEW_AMD_debug_output)
-
-#endif /* GL_AMD_debug_output */
-
-/* ---------------------- GL_AMD_depth_clamp_separate ---------------------- */
-
-#ifndef GL_AMD_depth_clamp_separate
-#define GL_AMD_depth_clamp_separate 1
-
-#define GL_DEPTH_CLAMP_NEAR_AMD 0x901E
-#define GL_DEPTH_CLAMP_FAR_AMD 0x901F
-
-#define GLEW_AMD_depth_clamp_separate GLEW_GET_VAR(__GLEW_AMD_depth_clamp_separate)
-
-#endif /* GL_AMD_depth_clamp_separate */
-
-/* ----------------------- GL_AMD_draw_buffers_blend ----------------------- */
-
-#ifndef GL_AMD_draw_buffers_blend
-#define GL_AMD_draw_buffers_blend 1
-
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-
-#define glBlendEquationIndexedAMD GLEW_GET_FUN(__glewBlendEquationIndexedAMD)
-#define glBlendEquationSeparateIndexedAMD GLEW_GET_FUN(__glewBlendEquationSeparateIndexedAMD)
-#define glBlendFuncIndexedAMD GLEW_GET_FUN(__glewBlendFuncIndexedAMD)
-#define glBlendFuncSeparateIndexedAMD GLEW_GET_FUN(__glewBlendFuncSeparateIndexedAMD)
-
-#define GLEW_AMD_draw_buffers_blend GLEW_GET_VAR(__GLEW_AMD_draw_buffers_blend)
-
-#endif /* GL_AMD_draw_buffers_blend */
-
-/* ----------------------- GL_AMD_multi_draw_indirect ---------------------- */
-
-#ifndef GL_AMD_multi_draw_indirect
-#define GL_AMD_multi_draw_indirect 1
-
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void* indirect, GLsizei primcount, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void* indirect, GLsizei primcount, GLsizei stride);
-
-#define glMultiDrawArraysIndirectAMD GLEW_GET_FUN(__glewMultiDrawArraysIndirectAMD)
-#define glMultiDrawElementsIndirectAMD GLEW_GET_FUN(__glewMultiDrawElementsIndirectAMD)
-
-#define GLEW_AMD_multi_draw_indirect GLEW_GET_VAR(__GLEW_AMD_multi_draw_indirect)
-
-#endif /* GL_AMD_multi_draw_indirect */
-
-/* ------------------------- GL_AMD_name_gen_delete ------------------------ */
-
-#ifndef GL_AMD_name_gen_delete
-#define GL_AMD_name_gen_delete 1
-
-#define GL_DATA_BUFFER_AMD 0x9151
-#define GL_PERFORMANCE_MONITOR_AMD 0x9152
-#define GL_QUERY_OBJECT_AMD 0x9153
-#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154
-#define GL_SAMPLER_OBJECT_AMD 0x9155
-
-typedef void (GLAPIENTRY * PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint* names);
-typedef void (GLAPIENTRY * PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint* names);
-typedef GLboolean (GLAPIENTRY * PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
-
-#define glDeleteNamesAMD GLEW_GET_FUN(__glewDeleteNamesAMD)
-#define glGenNamesAMD GLEW_GET_FUN(__glewGenNamesAMD)
-#define glIsNameAMD GLEW_GET_FUN(__glewIsNameAMD)
-
-#define GLEW_AMD_name_gen_delete GLEW_GET_VAR(__GLEW_AMD_name_gen_delete)
-
-#endif /* GL_AMD_name_gen_delete */
-
-/* ----------------------- GL_AMD_performance_monitor ---------------------- */
-
-#ifndef GL_AMD_performance_monitor
-#define GL_AMD_performance_monitor 1
-
-#define GL_COUNTER_TYPE_AMD 0x8BC0
-#define GL_COUNTER_RANGE_AMD 0x8BC1
-#define GL_UNSIGNED_INT64_AMD 0x8BC2
-#define GL_PERCENTAGE_AMD 0x8BC3
-#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4
-#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5
-#define GL_PERFMON_RESULT_AMD 0x8BC6
-
-typedef void (GLAPIENTRY * PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GLAPIENTRY * PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors);
-typedef void (GLAPIENTRY * PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GLAPIENTRY * PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint *bytesWritten);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void* data);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar *counterString);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint* numCounters, GLint *maxActiveCounters, GLsizei countersSize, GLuint *counters);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei* length, GLchar *groupString);
-typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint* numGroups, GLsizei groupsSize, GLuint *groups);
-typedef void (GLAPIENTRY * PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* counterList);
-
-#define glBeginPerfMonitorAMD GLEW_GET_FUN(__glewBeginPerfMonitorAMD)
-#define glDeletePerfMonitorsAMD GLEW_GET_FUN(__glewDeletePerfMonitorsAMD)
-#define glEndPerfMonitorAMD GLEW_GET_FUN(__glewEndPerfMonitorAMD)
-#define glGenPerfMonitorsAMD GLEW_GET_FUN(__glewGenPerfMonitorsAMD)
-#define glGetPerfMonitorCounterDataAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterDataAMD)
-#define glGetPerfMonitorCounterInfoAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterInfoAMD)
-#define glGetPerfMonitorCounterStringAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterStringAMD)
-#define glGetPerfMonitorCountersAMD GLEW_GET_FUN(__glewGetPerfMonitorCountersAMD)
-#define glGetPerfMonitorGroupStringAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupStringAMD)
-#define glGetPerfMonitorGroupsAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupsAMD)
-#define glSelectPerfMonitorCountersAMD GLEW_GET_FUN(__glewSelectPerfMonitorCountersAMD)
-
-#define GLEW_AMD_performance_monitor GLEW_GET_VAR(__GLEW_AMD_performance_monitor)
-
-#endif /* GL_AMD_performance_monitor */
-
-/* -------------------------- GL_AMD_pinned_memory ------------------------- */
-
-#ifndef GL_AMD_pinned_memory
-#define GL_AMD_pinned_memory 1
-
-#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
-
-#define GLEW_AMD_pinned_memory GLEW_GET_VAR(__GLEW_AMD_pinned_memory)
-
-#endif /* GL_AMD_pinned_memory */
-
-/* ----------------------- GL_AMD_query_buffer_object ---------------------- */
-
-#ifndef GL_AMD_query_buffer_object
-#define GL_AMD_query_buffer_object 1
-
-#define GL_QUERY_BUFFER_AMD 0x9192
-#define GL_QUERY_BUFFER_BINDING_AMD 0x9193
-#define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194
-
-#define GLEW_AMD_query_buffer_object GLEW_GET_VAR(__GLEW_AMD_query_buffer_object)
-
-#endif /* GL_AMD_query_buffer_object */
-
-/* ------------------------ GL_AMD_sample_positions ------------------------ */
-
-#ifndef GL_AMD_sample_positions
-#define GL_AMD_sample_positions 1
-
-#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F
-
-typedef void (GLAPIENTRY * PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat* val);
-
-#define glSetMultisamplefvAMD GLEW_GET_FUN(__glewSetMultisamplefvAMD)
-
-#define GLEW_AMD_sample_positions GLEW_GET_VAR(__GLEW_AMD_sample_positions)
-
-#endif /* GL_AMD_sample_positions */
-
-/* ------------------ GL_AMD_seamless_cubemap_per_texture ------------------ */
-
-#ifndef GL_AMD_seamless_cubemap_per_texture
-#define GL_AMD_seamless_cubemap_per_texture 1
-
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB 0x884F
-
-#define GLEW_AMD_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_AMD_seamless_cubemap_per_texture)
-
-#endif /* GL_AMD_seamless_cubemap_per_texture */
-
-/* ---------------------- GL_AMD_shader_stencil_export --------------------- */
-
-#ifndef GL_AMD_shader_stencil_export
-#define GL_AMD_shader_stencil_export 1
-
-#define GLEW_AMD_shader_stencil_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_export)
-
-#endif /* GL_AMD_shader_stencil_export */
-
-/* ------------------- GL_AMD_stencil_operation_extended ------------------- */
-
-#ifndef GL_AMD_stencil_operation_extended
-#define GL_AMD_stencil_operation_extended 1
-
-#define GL_SET_AMD 0x874A
-#define GL_REPLACE_VALUE_AMD 0x874B
-#define GL_STENCIL_OP_VALUE_AMD 0x874C
-#define GL_STENCIL_BACK_OP_VALUE_AMD 0x874D
-
-typedef void (GLAPIENTRY * PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
-
-#define glStencilOpValueAMD GLEW_GET_FUN(__glewStencilOpValueAMD)
-
-#define GLEW_AMD_stencil_operation_extended GLEW_GET_VAR(__GLEW_AMD_stencil_operation_extended)
-
-#endif /* GL_AMD_stencil_operation_extended */
-
-/* ------------------------ GL_AMD_texture_texture4 ------------------------ */
-
-#ifndef GL_AMD_texture_texture4
-#define GL_AMD_texture_texture4 1
-
-#define GLEW_AMD_texture_texture4 GLEW_GET_VAR(__GLEW_AMD_texture_texture4)
-
-#endif /* GL_AMD_texture_texture4 */
-
-/* --------------- GL_AMD_transform_feedback3_lines_triangles -------------- */
-
-#ifndef GL_AMD_transform_feedback3_lines_triangles
-#define GL_AMD_transform_feedback3_lines_triangles 1
-
-#define GLEW_AMD_transform_feedback3_lines_triangles GLEW_GET_VAR(__GLEW_AMD_transform_feedback3_lines_triangles)
-
-#endif /* GL_AMD_transform_feedback3_lines_triangles */
-
-/* ----------------------- GL_AMD_vertex_shader_layer ---------------------- */
-
-#ifndef GL_AMD_vertex_shader_layer
-#define GL_AMD_vertex_shader_layer 1
-
-#define GLEW_AMD_vertex_shader_layer GLEW_GET_VAR(__GLEW_AMD_vertex_shader_layer)
-
-#endif /* GL_AMD_vertex_shader_layer */
-
-/* -------------------- GL_AMD_vertex_shader_tessellator ------------------- */
-
-#ifndef GL_AMD_vertex_shader_tessellator
-#define GL_AMD_vertex_shader_tessellator 1
-
-#define GL_SAMPLER_BUFFER_AMD 0x9001
-#define GL_INT_SAMPLER_BUFFER_AMD 0x9002
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
-#define GL_TESSELLATION_MODE_AMD 0x9004
-#define GL_TESSELLATION_FACTOR_AMD 0x9005
-#define GL_DISCRETE_AMD 0x9006
-#define GL_CONTINUOUS_AMD 0x9007
-
-typedef void (GLAPIENTRY * PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
-typedef void (GLAPIENTRY * PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
-
-#define glTessellationFactorAMD GLEW_GET_FUN(__glewTessellationFactorAMD)
-#define glTessellationModeAMD GLEW_GET_FUN(__glewTessellationModeAMD)
-
-#define GLEW_AMD_vertex_shader_tessellator GLEW_GET_VAR(__GLEW_AMD_vertex_shader_tessellator)
-
-#endif /* GL_AMD_vertex_shader_tessellator */
-
-/* ------------------ GL_AMD_vertex_shader_viewport_index ------------------ */
-
-#ifndef GL_AMD_vertex_shader_viewport_index
-#define GL_AMD_vertex_shader_viewport_index 1
-
-#define GLEW_AMD_vertex_shader_viewport_index GLEW_GET_VAR(__GLEW_AMD_vertex_shader_viewport_index)
-
-#endif /* GL_AMD_vertex_shader_viewport_index */
-
-/* ----------------------- GL_APPLE_aux_depth_stencil ---------------------- */
-
-#ifndef GL_APPLE_aux_depth_stencil
-#define GL_APPLE_aux_depth_stencil 1
-
-#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14
-
-#define GLEW_APPLE_aux_depth_stencil GLEW_GET_VAR(__GLEW_APPLE_aux_depth_stencil)
-
-#endif /* GL_APPLE_aux_depth_stencil */
-
-/* ------------------------ GL_APPLE_client_storage ------------------------ */
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-
-#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2
-
-#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage)
-
-#endif /* GL_APPLE_client_storage */
-
-/* ------------------------- GL_APPLE_element_array ------------------------ */
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-
-#define GL_ELEMENT_ARRAY_APPLE 0x8A0C
-#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D
-#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E
-
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount);
-
-#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE)
-#define glDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewDrawRangeElementArrayAPPLE)
-#define glElementPointerAPPLE GLEW_GET_FUN(__glewElementPointerAPPLE)
-#define glMultiDrawElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawElementArrayAPPLE)
-#define glMultiDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawRangeElementArrayAPPLE)
-
-#define GLEW_APPLE_element_array GLEW_GET_VAR(__GLEW_APPLE_element_array)
-
-#endif /* GL_APPLE_element_array */
-
-/* ----------------------------- GL_APPLE_fence ---------------------------- */
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-
-#define GL_DRAW_PIXELS_APPLE 0x8A0A
-#define GL_FENCE_APPLE 0x8A0B
-
-typedef void (GLAPIENTRY * PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint* fences);
-typedef void (GLAPIENTRY * PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef void (GLAPIENTRY * PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-typedef void (GLAPIENTRY * PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint* fences);
-typedef GLboolean (GLAPIENTRY * PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef void (GLAPIENTRY * PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (GLAPIENTRY * PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-
-#define glDeleteFencesAPPLE GLEW_GET_FUN(__glewDeleteFencesAPPLE)
-#define glFinishFenceAPPLE GLEW_GET_FUN(__glewFinishFenceAPPLE)
-#define glFinishObjectAPPLE GLEW_GET_FUN(__glewFinishObjectAPPLE)
-#define glGenFencesAPPLE GLEW_GET_FUN(__glewGenFencesAPPLE)
-#define glIsFenceAPPLE GLEW_GET_FUN(__glewIsFenceAPPLE)
-#define glSetFenceAPPLE GLEW_GET_FUN(__glewSetFenceAPPLE)
-#define glTestFenceAPPLE GLEW_GET_FUN(__glewTestFenceAPPLE)
-#define glTestObjectAPPLE GLEW_GET_FUN(__glewTestObjectAPPLE)
-
-#define GLEW_APPLE_fence GLEW_GET_VAR(__GLEW_APPLE_fence)
-
-#endif /* GL_APPLE_fence */
-
-/* ------------------------- GL_APPLE_float_pixels ------------------------- */
-
-#ifndef GL_APPLE_float_pixels
-#define GL_APPLE_float_pixels 1
-
-#define GL_HALF_APPLE 0x140B
-#define GL_RGBA_FLOAT32_APPLE 0x8814
-#define GL_RGB_FLOAT32_APPLE 0x8815
-#define GL_ALPHA_FLOAT32_APPLE 0x8816
-#define GL_INTENSITY_FLOAT32_APPLE 0x8817
-#define GL_LUMINANCE_FLOAT32_APPLE 0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819
-#define GL_RGBA_FLOAT16_APPLE 0x881A
-#define GL_RGB_FLOAT16_APPLE 0x881B
-#define GL_ALPHA_FLOAT16_APPLE 0x881C
-#define GL_INTENSITY_FLOAT16_APPLE 0x881D
-#define GL_LUMINANCE_FLOAT16_APPLE 0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F
-#define GL_COLOR_FLOAT_APPLE 0x8A0F
-
-#define GLEW_APPLE_float_pixels GLEW_GET_VAR(__GLEW_APPLE_float_pixels)
-
-#endif /* GL_APPLE_float_pixels */
-
-/* ---------------------- GL_APPLE_flush_buffer_range ---------------------- */
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13
-
-typedef void (GLAPIENTRY * PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-
-#define glBufferParameteriAPPLE GLEW_GET_FUN(__glewBufferParameteriAPPLE)
-#define glFlushMappedBufferRangeAPPLE GLEW_GET_FUN(__glewFlushMappedBufferRangeAPPLE)
-
-#define GLEW_APPLE_flush_buffer_range GLEW_GET_VAR(__GLEW_APPLE_flush_buffer_range)
-
-#endif /* GL_APPLE_flush_buffer_range */
-
-/* ----------------------- GL_APPLE_object_purgeable ----------------------- */
-
-#ifndef GL_APPLE_object_purgeable
-#define GL_APPLE_object_purgeable 1
-
-#define GL_BUFFER_OBJECT_APPLE 0x85B3
-#define GL_RELEASED_APPLE 0x8A19
-#define GL_VOLATILE_APPLE 0x8A1A
-#define GL_RETAINED_APPLE 0x8A1B
-#define GL_UNDEFINED_APPLE 0x8A1C
-#define GL_PURGEABLE_APPLE 0x8A1D
-
-typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint* params);
-typedef GLenum (GLAPIENTRY * PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-typedef GLenum (GLAPIENTRY * PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
-
-#define glGetObjectParameterivAPPLE GLEW_GET_FUN(__glewGetObjectParameterivAPPLE)
-#define glObjectPurgeableAPPLE GLEW_GET_FUN(__glewObjectPurgeableAPPLE)
-#define glObjectUnpurgeableAPPLE GLEW_GET_FUN(__glewObjectUnpurgeableAPPLE)
-
-#define GLEW_APPLE_object_purgeable GLEW_GET_VAR(__GLEW_APPLE_object_purgeable)
-
-#endif /* GL_APPLE_object_purgeable */
-
-/* ------------------------- GL_APPLE_pixel_buffer ------------------------- */
-
-#ifndef GL_APPLE_pixel_buffer
-#define GL_APPLE_pixel_buffer 1
-
-#define GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10
-
-#define GLEW_APPLE_pixel_buffer GLEW_GET_VAR(__GLEW_APPLE_pixel_buffer)
-
-#endif /* GL_APPLE_pixel_buffer */
-
-/* ---------------------------- GL_APPLE_rgb_422 --------------------------- */
-
-#ifndef GL_APPLE_rgb_422
-#define GL_APPLE_rgb_422 1
-
-#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB
-#define GL_RGB_422_APPLE 0x8A1F
-
-#define GLEW_APPLE_rgb_422 GLEW_GET_VAR(__GLEW_APPLE_rgb_422)
-
-#endif /* GL_APPLE_rgb_422 */
-
-/* --------------------------- GL_APPLE_row_bytes -------------------------- */
-
-#ifndef GL_APPLE_row_bytes
-#define GL_APPLE_row_bytes 1
-
-#define GL_PACK_ROW_BYTES_APPLE 0x8A15
-#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16
-
-#define GLEW_APPLE_row_bytes GLEW_GET_VAR(__GLEW_APPLE_row_bytes)
-
-#endif /* GL_APPLE_row_bytes */
-
-/* ------------------------ GL_APPLE_specular_vector ----------------------- */
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-
-#define GLEW_APPLE_specular_vector GLEW_GET_VAR(__GLEW_APPLE_specular_vector)
-
-#endif /* GL_APPLE_specular_vector */
-
-/* ------------------------- GL_APPLE_texture_range ------------------------ */
-
-#ifndef GL_APPLE_texture_range
-#define GL_APPLE_texture_range 1
-
-#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7
-#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8
-#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
-#define GL_STORAGE_PRIVATE_APPLE 0x85BD
-#define GL_STORAGE_CACHED_APPLE 0x85BE
-#define GL_STORAGE_SHARED_APPLE 0x85BF
-
-typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid **params);
-typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-
-#define glGetTexParameterPointervAPPLE GLEW_GET_FUN(__glewGetTexParameterPointervAPPLE)
-#define glTextureRangeAPPLE GLEW_GET_FUN(__glewTextureRangeAPPLE)
-
-#define GLEW_APPLE_texture_range GLEW_GET_VAR(__GLEW_APPLE_texture_range)
-
-#endif /* GL_APPLE_texture_range */
-
-/* ------------------------ GL_APPLE_transform_hint ------------------------ */
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-
-#define GL_TRANSFORM_HINT_APPLE 0x85B1
-
-#define GLEW_APPLE_transform_hint GLEW_GET_VAR(__GLEW_APPLE_transform_hint)
-
-#endif /* GL_APPLE_transform_hint */
-
-/* ---------------------- GL_APPLE_vertex_array_object --------------------- */
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-
-#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5
-
-typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
-typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
-typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-
-#define glBindVertexArrayAPPLE GLEW_GET_FUN(__glewBindVertexArrayAPPLE)
-#define glDeleteVertexArraysAPPLE GLEW_GET_FUN(__glewDeleteVertexArraysAPPLE)
-#define glGenVertexArraysAPPLE GLEW_GET_FUN(__glewGenVertexArraysAPPLE)
-#define glIsVertexArrayAPPLE GLEW_GET_FUN(__glewIsVertexArrayAPPLE)
-
-#define GLEW_APPLE_vertex_array_object GLEW_GET_VAR(__GLEW_APPLE_vertex_array_object)
-
-#endif /* GL_APPLE_vertex_array_object */
-
-/* ---------------------- GL_APPLE_vertex_array_range ---------------------- */
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-
-#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_APPLE 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CLIENT_APPLE 0x85B4
-#define GL_STORAGE_CACHED_APPLE 0x85BE
-#define GL_STORAGE_SHARED_APPLE 0x85BF
-
-typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void* pointer);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void* pointer);
-
-#define glFlushVertexArrayRangeAPPLE GLEW_GET_FUN(__glewFlushVertexArrayRangeAPPLE)
-#define glVertexArrayParameteriAPPLE GLEW_GET_FUN(__glewVertexArrayParameteriAPPLE)
-#define glVertexArrayRangeAPPLE GLEW_GET_FUN(__glewVertexArrayRangeAPPLE)
-
-#define GLEW_APPLE_vertex_array_range GLEW_GET_VAR(__GLEW_APPLE_vertex_array_range)
-
-#endif /* GL_APPLE_vertex_array_range */
-
-/* ------------------- GL_APPLE_vertex_program_evaluators ------------------ */
-
-#ifndef GL_APPLE_vertex_program_evaluators
-#define GL_APPLE_vertex_program_evaluators 1
-
-#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00
-#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01
-#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02
-#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
-#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
-#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
-#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06
-#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
-#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
-#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
-
-typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
-typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
-typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble* points);
-typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat* points);
-typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble* points);
-typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat* points);
-
-#define glDisableVertexAttribAPPLE GLEW_GET_FUN(__glewDisableVertexAttribAPPLE)
-#define glEnableVertexAttribAPPLE GLEW_GET_FUN(__glewEnableVertexAttribAPPLE)
-#define glIsVertexAttribEnabledAPPLE GLEW_GET_FUN(__glewIsVertexAttribEnabledAPPLE)
-#define glMapVertexAttrib1dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1dAPPLE)
-#define glMapVertexAttrib1fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1fAPPLE)
-#define glMapVertexAttrib2dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2dAPPLE)
-#define glMapVertexAttrib2fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2fAPPLE)
-
-#define GLEW_APPLE_vertex_program_evaluators GLEW_GET_VAR(__GLEW_APPLE_vertex_program_evaluators)
-
-#endif /* GL_APPLE_vertex_program_evaluators */
-
-/* --------------------------- GL_APPLE_ycbcr_422 -------------------------- */
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-
-#define GL_YCBCR_422_APPLE 0x85B9
-
-#define GLEW_APPLE_ycbcr_422 GLEW_GET_VAR(__GLEW_APPLE_ycbcr_422)
-
-#endif /* GL_APPLE_ycbcr_422 */
-
-/* ------------------------ GL_ARB_ES2_compatibility ----------------------- */
-
-#ifndef GL_ARB_ES2_compatibility
-#define GL_ARB_ES2_compatibility 1
-
-#define GL_FIXED 0x140C
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#define GL_RGB565 0x8D62
-#define GL_LOW_FLOAT 0x8DF0
-#define GL_MEDIUM_FLOAT 0x8DF1
-#define GL_HIGH_FLOAT 0x8DF2
-#define GL_LOW_INT 0x8DF3
-#define GL_MEDIUM_INT 0x8DF4
-#define GL_HIGH_INT 0x8DF5
-#define GL_SHADER_BINARY_FORMATS 0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
-#define GL_SHADER_COMPILER 0x8DFA
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-
-typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFPROC) (GLclampf d);
-typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f);
-typedef void (GLAPIENTRY * PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint* range, GLint *precision);
-typedef void (GLAPIENTRY * PFNGLRELEASESHADERCOMPILERPROC) (void);
-typedef void (GLAPIENTRY * PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint* shaders, GLenum binaryformat, const GLvoid*binary, GLsizei length);
-
-#define glClearDepthf GLEW_GET_FUN(__glewClearDepthf)
-#define glDepthRangef GLEW_GET_FUN(__glewDepthRangef)
-#define glGetShaderPrecisionFormat GLEW_GET_FUN(__glewGetShaderPrecisionFormat)
-#define glReleaseShaderCompiler GLEW_GET_FUN(__glewReleaseShaderCompiler)
-#define glShaderBinary GLEW_GET_FUN(__glewShaderBinary)
-
-#define GLEW_ARB_ES2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES2_compatibility)
-
-#endif /* GL_ARB_ES2_compatibility */
-
-/* ------------------------ GL_ARB_ES3_compatibility ----------------------- */
-
-#ifndef GL_ARB_ES3_compatibility
-#define GL_ARB_ES3_compatibility 1
-
-#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69
-#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
-#define GL_MAX_ELEMENT_INDEX 0x8D6B
-#define GL_COMPRESSED_R11_EAC 0x9270
-#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271
-#define GL_COMPRESSED_RG11_EAC 0x9272
-#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
-#define GL_COMPRESSED_RGB8_ETC2 0x9274
-#define GL_COMPRESSED_SRGB8_ETC2 0x9275
-#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
-#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
-#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278
-#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
-
-#define GLEW_ARB_ES3_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_compatibility)
-
-#endif /* GL_ARB_ES3_compatibility */
-
-/* ------------------------ GL_ARB_arrays_of_arrays ------------------------ */
-
-#ifndef GL_ARB_arrays_of_arrays
-#define GL_ARB_arrays_of_arrays 1
-
-#define GLEW_ARB_arrays_of_arrays GLEW_GET_VAR(__GLEW_ARB_arrays_of_arrays)
-
-#endif /* GL_ARB_arrays_of_arrays */
-
-/* -------------------------- GL_ARB_base_instance ------------------------- */
-
-#ifndef GL_ARB_base_instance
-#define GL_ARB_base_instance 1
-
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount, GLuint baseinstance);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount, GLint basevertex, GLuint baseinstance);
-
-#define glDrawArraysInstancedBaseInstance GLEW_GET_FUN(__glewDrawArraysInstancedBaseInstance)
-#define glDrawElementsInstancedBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseInstance)
-#define glDrawElementsInstancedBaseVertexBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexBaseInstance)
-
-#define GLEW_ARB_base_instance GLEW_GET_VAR(__GLEW_ARB_base_instance)
-
-#endif /* GL_ARB_base_instance */
-
-/* ----------------------- GL_ARB_blend_func_extended ---------------------- */
-
-#ifndef GL_ARB_blend_func_extended
-#define GL_ARB_blend_func_extended 1
-
-#define GL_SRC1_COLOR 0x88F9
-#define GL_ONE_MINUS_SRC1_COLOR 0x88FA
-#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB
-#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC
-
-typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name);
-typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar * name);
-
-#define glBindFragDataLocationIndexed GLEW_GET_FUN(__glewBindFragDataLocationIndexed)
-#define glGetFragDataIndex GLEW_GET_FUN(__glewGetFragDataIndex)
-
-#define GLEW_ARB_blend_func_extended GLEW_GET_VAR(__GLEW_ARB_blend_func_extended)
-
-#endif /* GL_ARB_blend_func_extended */
-
-/* ---------------------------- GL_ARB_cl_event ---------------------------- */
-
-#ifndef GL_ARB_cl_event
-#define GL_ARB_cl_event 1
-
-#define GL_SYNC_CL_EVENT_ARB 0x8240
-#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241
-
-typedef struct _cl_context *cl_context;
-typedef struct _cl_event *cl_event;
-
-typedef GLsync (GLAPIENTRY * PFNGLCREATESYNCFROMCLEVENTARBPROC) (cl_context context, cl_event event, GLbitfield flags);
-
-#define glCreateSyncFromCLeventARB GLEW_GET_FUN(__glewCreateSyncFromCLeventARB)
-
-#define GLEW_ARB_cl_event GLEW_GET_VAR(__GLEW_ARB_cl_event)
-
-#endif /* GL_ARB_cl_event */
-
-/* ----------------------- GL_ARB_clear_buffer_object ---------------------- */
-
-#ifndef GL_ARB_clear_buffer_object
-#define GL_ARB_clear_buffer_object 1
-
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid* data);
-
-#define glClearBufferData GLEW_GET_FUN(__glewClearBufferData)
-#define glClearBufferSubData GLEW_GET_FUN(__glewClearBufferSubData)
-#define glClearNamedBufferDataEXT GLEW_GET_FUN(__glewClearNamedBufferDataEXT)
-#define glClearNamedBufferSubDataEXT GLEW_GET_FUN(__glewClearNamedBufferSubDataEXT)
-
-#define GLEW_ARB_clear_buffer_object GLEW_GET_VAR(__GLEW_ARB_clear_buffer_object)
-
-#endif /* GL_ARB_clear_buffer_object */
-
-/* ----------------------- GL_ARB_color_buffer_float ----------------------- */
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-
-#define GL_RGBA_FLOAT_MODE_ARB 0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B
-#define GL_CLAMP_READ_COLOR_ARB 0x891C
-#define GL_FIXED_ONLY_ARB 0x891D
-
-typedef void (GLAPIENTRY * PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-
-#define glClampColorARB GLEW_GET_FUN(__glewClampColorARB)
-
-#define GLEW_ARB_color_buffer_float GLEW_GET_VAR(__GLEW_ARB_color_buffer_float)
-
-#endif /* GL_ARB_color_buffer_float */
-
-/* -------------------------- GL_ARB_compatibility ------------------------- */
-
-#ifndef GL_ARB_compatibility
-#define GL_ARB_compatibility 1
-
-#define GLEW_ARB_compatibility GLEW_GET_VAR(__GLEW_ARB_compatibility)
-
-#endif /* GL_ARB_compatibility */
-
-/* ---------------- GL_ARB_compressed_texture_pixel_storage ---------------- */
-
-#ifndef GL_ARB_compressed_texture_pixel_storage
-#define GL_ARB_compressed_texture_pixel_storage 1
-
-#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127
-#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
-#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129
-#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A
-#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B
-#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C
-#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D
-#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E
-
-#define GLEW_ARB_compressed_texture_pixel_storage GLEW_GET_VAR(__GLEW_ARB_compressed_texture_pixel_storage)
-
-#endif /* GL_ARB_compressed_texture_pixel_storage */
-
-/* ------------------------- GL_ARB_compute_shader ------------------------- */
-
-#ifndef GL_ARB_compute_shader
-#define GL_ARB_compute_shader 1
-
-#define GL_COMPUTE_SHADER_BIT 0x00000020
-#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
-#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
-#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
-#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265
-#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
-#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267
-#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
-#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE
-#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
-#define GL_COMPUTE_SHADER 0x91B9
-#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB
-#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
-#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD
-#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE
-#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF
-
-typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
-
-#define glDispatchCompute GLEW_GET_FUN(__glewDispatchCompute)
-#define glDispatchComputeIndirect GLEW_GET_FUN(__glewDispatchComputeIndirect)
-
-#define GLEW_ARB_compute_shader GLEW_GET_VAR(__GLEW_ARB_compute_shader)
-
-#endif /* GL_ARB_compute_shader */
-
-/* ----------------------- GL_ARB_conservative_depth ----------------------- */
-
-#ifndef GL_ARB_conservative_depth
-#define GL_ARB_conservative_depth 1
-
-#define GLEW_ARB_conservative_depth GLEW_GET_VAR(__GLEW_ARB_conservative_depth)
-
-#endif /* GL_ARB_conservative_depth */
-
-/* --------------------------- GL_ARB_copy_buffer -------------------------- */
-
-#ifndef GL_ARB_copy_buffer
-#define GL_ARB_copy_buffer 1
-
-#define GL_COPY_READ_BUFFER 0x8F36
-#define GL_COPY_WRITE_BUFFER 0x8F37
-
-typedef void (GLAPIENTRY * PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size);
-
-#define glCopyBufferSubData GLEW_GET_FUN(__glewCopyBufferSubData)
-
-#define GLEW_ARB_copy_buffer GLEW_GET_VAR(__GLEW_ARB_copy_buffer)
-
-#endif /* GL_ARB_copy_buffer */
-
-/* --------------------------- GL_ARB_copy_image --------------------------- */
-
-#ifndef GL_ARB_copy_image
-#define GL_ARB_copy_image 1
-
-typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-
-#define glCopyImageSubData GLEW_GET_FUN(__glewCopyImageSubData)
-
-#define GLEW_ARB_copy_image GLEW_GET_VAR(__GLEW_ARB_copy_image)
-
-#endif /* GL_ARB_copy_image */
-
-/* -------------------------- GL_ARB_debug_output -------------------------- */
-
-#ifndef GL_ARB_debug_output
-#define GL_ARB_debug_output 1
-
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245
-#define GL_DEBUG_SOURCE_API_ARB 0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249
-#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A
-#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B
-#define GL_DEBUG_TYPE_ERROR_ARB 0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
-#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250
-#define GL_DEBUG_TYPE_OTHER_ARB 0x8251
-#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144
-#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145
-#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147
-#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148
-
-typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
-
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, void* userParam);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
-typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
-
-#define glDebugMessageCallbackARB GLEW_GET_FUN(__glewDebugMessageCallbackARB)
-#define glDebugMessageControlARB GLEW_GET_FUN(__glewDebugMessageControlARB)
-#define glDebugMessageInsertARB GLEW_GET_FUN(__glewDebugMessageInsertARB)
-#define glGetDebugMessageLogARB GLEW_GET_FUN(__glewGetDebugMessageLogARB)
-
-#define GLEW_ARB_debug_output GLEW_GET_VAR(__GLEW_ARB_debug_output)
-
-#endif /* GL_ARB_debug_output */
-
-/* ----------------------- GL_ARB_depth_buffer_float ----------------------- */
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_ARB_depth_buffer_float 1
-
-#define GL_DEPTH_COMPONENT32F 0x8CAC
-#define GL_DEPTH32F_STENCIL8 0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-
-#define GLEW_ARB_depth_buffer_float GLEW_GET_VAR(__GLEW_ARB_depth_buffer_float)
-
-#endif /* GL_ARB_depth_buffer_float */
-
-/* --------------------------- GL_ARB_depth_clamp -------------------------- */
-
-#ifndef GL_ARB_depth_clamp
-#define GL_ARB_depth_clamp 1
-
-#define GL_DEPTH_CLAMP 0x864F
-
-#define GLEW_ARB_depth_clamp GLEW_GET_VAR(__GLEW_ARB_depth_clamp)
-
-#endif /* GL_ARB_depth_clamp */
-
-/* -------------------------- GL_ARB_depth_texture ------------------------- */
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-
-#define GL_DEPTH_COMPONENT16_ARB 0x81A5
-#define GL_DEPTH_COMPONENT24_ARB 0x81A6
-#define GL_DEPTH_COMPONENT32_ARB 0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
-
-#define GLEW_ARB_depth_texture GLEW_GET_VAR(__GLEW_ARB_depth_texture)
-
-#endif /* GL_ARB_depth_texture */
-
-/* -------------------------- GL_ARB_draw_buffers -------------------------- */
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-
-#define GL_MAX_DRAW_BUFFERS_ARB 0x8824
-#define GL_DRAW_BUFFER0_ARB 0x8825
-#define GL_DRAW_BUFFER1_ARB 0x8826
-#define GL_DRAW_BUFFER2_ARB 0x8827
-#define GL_DRAW_BUFFER3_ARB 0x8828
-#define GL_DRAW_BUFFER4_ARB 0x8829
-#define GL_DRAW_BUFFER5_ARB 0x882A
-#define GL_DRAW_BUFFER6_ARB 0x882B
-#define GL_DRAW_BUFFER7_ARB 0x882C
-#define GL_DRAW_BUFFER8_ARB 0x882D
-#define GL_DRAW_BUFFER9_ARB 0x882E
-#define GL_DRAW_BUFFER10_ARB 0x882F
-#define GL_DRAW_BUFFER11_ARB 0x8830
-#define GL_DRAW_BUFFER12_ARB 0x8831
-#define GL_DRAW_BUFFER13_ARB 0x8832
-#define GL_DRAW_BUFFER14_ARB 0x8833
-#define GL_DRAW_BUFFER15_ARB 0x8834
-
-typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum* bufs);
-
-#define glDrawBuffersARB GLEW_GET_FUN(__glewDrawBuffersARB)
-
-#define GLEW_ARB_draw_buffers GLEW_GET_VAR(__GLEW_ARB_draw_buffers)
-
-#endif /* GL_ARB_draw_buffers */
-
-/* ----------------------- GL_ARB_draw_buffers_blend ----------------------- */
-
-#ifndef GL_ARB_draw_buffers_blend
-#define GL_ARB_draw_buffers_blend 1
-
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
-
-#define glBlendEquationSeparateiARB GLEW_GET_FUN(__glewBlendEquationSeparateiARB)
-#define glBlendEquationiARB GLEW_GET_FUN(__glewBlendEquationiARB)
-#define glBlendFuncSeparateiARB GLEW_GET_FUN(__glewBlendFuncSeparateiARB)
-#define glBlendFunciARB GLEW_GET_FUN(__glewBlendFunciARB)
-
-#define GLEW_ARB_draw_buffers_blend GLEW_GET_VAR(__GLEW_ARB_draw_buffers_blend)
-
-#endif /* GL_ARB_draw_buffers_blend */
-
-/* -------------------- GL_ARB_draw_elements_base_vertex ------------------- */
-
-#ifndef GL_ARB_draw_elements_base_vertex
-#define GL_ARB_draw_elements_base_vertex 1
-
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, void* indices, GLint basevertex);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount, GLint basevertex);
-typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, void* indices, GLint basevertex);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei* count, GLenum type, GLvoid**indices, GLsizei primcount, GLint *basevertex);
-
-#define glDrawElementsBaseVertex GLEW_GET_FUN(__glewDrawElementsBaseVertex)
-#define glDrawElementsInstancedBaseVertex GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertex)
-#define glDrawRangeElementsBaseVertex GLEW_GET_FUN(__glewDrawRangeElementsBaseVertex)
-#define glMultiDrawElementsBaseVertex GLEW_GET_FUN(__glewMultiDrawElementsBaseVertex)
-
-#define GLEW_ARB_draw_elements_base_vertex GLEW_GET_VAR(__GLEW_ARB_draw_elements_base_vertex)
-
-#endif /* GL_ARB_draw_elements_base_vertex */
-
-/* -------------------------- GL_ARB_draw_indirect ------------------------- */
-
-#ifndef GL_ARB_draw_indirect
-#define GL_ARB_draw_indirect 1
-
-#define GL_DRAW_INDIRECT_BUFFER 0x8F3F
-#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43
-
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void* indirect);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void* indirect);
-
-#define glDrawArraysIndirect GLEW_GET_FUN(__glewDrawArraysIndirect)
-#define glDrawElementsIndirect GLEW_GET_FUN(__glewDrawElementsIndirect)
-
-#define GLEW_ARB_draw_indirect GLEW_GET_VAR(__GLEW_ARB_draw_indirect)
-
-#endif /* GL_ARB_draw_indirect */
-
-/* ------------------------- GL_ARB_draw_instanced ------------------------- */
-
-#ifndef GL_ARB_draw_instanced
-#define GL_ARB_draw_instanced 1
-
-#define GLEW_ARB_draw_instanced GLEW_GET_VAR(__GLEW_ARB_draw_instanced)
-
-#endif /* GL_ARB_draw_instanced */
-
-/* -------------------- GL_ARB_explicit_attrib_location -------------------- */
-
-#ifndef GL_ARB_explicit_attrib_location
-#define GL_ARB_explicit_attrib_location 1
-
-#define GLEW_ARB_explicit_attrib_location GLEW_GET_VAR(__GLEW_ARB_explicit_attrib_location)
-
-#endif /* GL_ARB_explicit_attrib_location */
-
-/* -------------------- GL_ARB_explicit_uniform_location ------------------- */
-
-#ifndef GL_ARB_explicit_uniform_location
-#define GL_ARB_explicit_uniform_location 1
-
-#define GL_MAX_UNIFORM_LOCATIONS 0x826E
-
-#define GLEW_ARB_explicit_uniform_location GLEW_GET_VAR(__GLEW_ARB_explicit_uniform_location)
-
-#endif /* GL_ARB_explicit_uniform_location */
-
-/* ------------------- GL_ARB_fragment_coord_conventions ------------------- */
-
-#ifndef GL_ARB_fragment_coord_conventions
-#define GL_ARB_fragment_coord_conventions 1
-
-#define GLEW_ARB_fragment_coord_conventions GLEW_GET_VAR(__GLEW_ARB_fragment_coord_conventions)
-
-#endif /* GL_ARB_fragment_coord_conventions */
-
-/* --------------------- GL_ARB_fragment_layer_viewport -------------------- */
-
-#ifndef GL_ARB_fragment_layer_viewport
-#define GL_ARB_fragment_layer_viewport 1
-
-#define GLEW_ARB_fragment_layer_viewport GLEW_GET_VAR(__GLEW_ARB_fragment_layer_viewport)
-
-#endif /* GL_ARB_fragment_layer_viewport */
-
-/* ------------------------ GL_ARB_fragment_program ------------------------ */
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-
-#define GL_FRAGMENT_PROGRAM_ARB 0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB 0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872
-
-#define GLEW_ARB_fragment_program GLEW_GET_VAR(__GLEW_ARB_fragment_program)
-
-#endif /* GL_ARB_fragment_program */
-
-/* --------------------- GL_ARB_fragment_program_shadow -------------------- */
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-
-#define GLEW_ARB_fragment_program_shadow GLEW_GET_VAR(__GLEW_ARB_fragment_program_shadow)
-
-#endif /* GL_ARB_fragment_program_shadow */
-
-/* ------------------------- GL_ARB_fragment_shader ------------------------ */
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-
-#define GL_FRAGMENT_SHADER_ARB 0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-
-#define GLEW_ARB_fragment_shader GLEW_GET_VAR(__GLEW_ARB_fragment_shader)
-
-#endif /* GL_ARB_fragment_shader */
-
-/* ------------------- GL_ARB_framebuffer_no_attachments ------------------- */
-
-#ifndef GL_ARB_framebuffer_no_attachments
-#define GL_ARB_framebuffer_no_attachments 1
-
-#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310
-#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311
-#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312
-#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313
-#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
-#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315
-#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316
-#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317
-#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318
-
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
-
-#define glFramebufferParameteri GLEW_GET_FUN(__glewFramebufferParameteri)
-#define glGetFramebufferParameteriv GLEW_GET_FUN(__glewGetFramebufferParameteriv)
-#define glGetNamedFramebufferParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferParameterivEXT)
-#define glNamedFramebufferParameteriEXT GLEW_GET_FUN(__glewNamedFramebufferParameteriEXT)
-
-#define GLEW_ARB_framebuffer_no_attachments GLEW_GET_VAR(__GLEW_ARB_framebuffer_no_attachments)
-
-#endif /* GL_ARB_framebuffer_no_attachments */
-
-/* ----------------------- GL_ARB_framebuffer_object ----------------------- */
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-
-#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT 0x8218
-#define GL_FRAMEBUFFER_UNDEFINED 0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#define GL_INDEX 0x8222
-#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
-#define GL_DEPTH_STENCIL 0x84F9
-#define GL_UNSIGNED_INT_24_8 0x84FA
-#define GL_DEPTH24_STENCIL8 0x88F0
-#define GL_TEXTURE_STENCIL_SIZE 0x88F1
-#define GL_UNSIGNED_NORMALIZED 0x8C17
-#define GL_SRGB 0x8C40
-#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6
-#define GL_FRAMEBUFFER_BINDING 0x8CA6
-#define GL_RENDERBUFFER_BINDING 0x8CA7
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA
-#define GL_RENDERBUFFER_SAMPLES 0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#define GL_COLOR_ATTACHMENT1 0x8CE1
-#define GL_COLOR_ATTACHMENT2 0x8CE2
-#define GL_COLOR_ATTACHMENT3 0x8CE3
-#define GL_COLOR_ATTACHMENT4 0x8CE4
-#define GL_COLOR_ATTACHMENT5 0x8CE5
-#define GL_COLOR_ATTACHMENT6 0x8CE6
-#define GL_COLOR_ATTACHMENT7 0x8CE7
-#define GL_COLOR_ATTACHMENT8 0x8CE8
-#define GL_COLOR_ATTACHMENT9 0x8CE9
-#define GL_COLOR_ATTACHMENT10 0x8CEA
-#define GL_COLOR_ATTACHMENT11 0x8CEB
-#define GL_COLOR_ATTACHMENT12 0x8CEC
-#define GL_COLOR_ATTACHMENT13 0x8CED
-#define GL_COLOR_ATTACHMENT14 0x8CEE
-#define GL_COLOR_ATTACHMENT15 0x8CEF
-#define GL_DEPTH_ATTACHMENT 0x8D00
-#define GL_STENCIL_ATTACHMENT 0x8D20
-#define GL_FRAMEBUFFER 0x8D40
-#define GL_RENDERBUFFER 0x8D41
-#define GL_RENDERBUFFER_WIDTH 0x8D42
-#define GL_RENDERBUFFER_HEIGHT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
-#define GL_STENCIL_INDEX1 0x8D46
-#define GL_STENCIL_INDEX4 0x8D47
-#define GL_STENCIL_INDEX8 0x8D48
-#define GL_STENCIL_INDEX16 0x8D49
-#define GL_RENDERBUFFER_RED_SIZE 0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES 0x8D57
-
-typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers);
-typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer);
-typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers);
-typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers);
-typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-
-#define glBindFramebuffer GLEW_GET_FUN(__glewBindFramebuffer)
-#define glBindRenderbuffer GLEW_GET_FUN(__glewBindRenderbuffer)
-#define glBlitFramebuffer GLEW_GET_FUN(__glewBlitFramebuffer)
-#define glCheckFramebufferStatus GLEW_GET_FUN(__glewCheckFramebufferStatus)
-#define glDeleteFramebuffers GLEW_GET_FUN(__glewDeleteFramebuffers)
-#define glDeleteRenderbuffers GLEW_GET_FUN(__glewDeleteRenderbuffers)
-#define glFramebufferRenderbuffer GLEW_GET_FUN(__glewFramebufferRenderbuffer)
-#define glFramebufferTexture1D GLEW_GET_FUN(__glewFramebufferTexture1D)
-#define glFramebufferTexture2D GLEW_GET_FUN(__glewFramebufferTexture2D)
-#define glFramebufferTexture3D GLEW_GET_FUN(__glewFramebufferTexture3D)
-#define glFramebufferTextureLayer GLEW_GET_FUN(__glewFramebufferTextureLayer)
-#define glGenFramebuffers GLEW_GET_FUN(__glewGenFramebuffers)
-#define glGenRenderbuffers GLEW_GET_FUN(__glewGenRenderbuffers)
-#define glGenerateMipmap GLEW_GET_FUN(__glewGenerateMipmap)
-#define glGetFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetFramebufferAttachmentParameteriv)
-#define glGetRenderbufferParameteriv GLEW_GET_FUN(__glewGetRenderbufferParameteriv)
-#define glIsFramebuffer GLEW_GET_FUN(__glewIsFramebuffer)
-#define glIsRenderbuffer GLEW_GET_FUN(__glewIsRenderbuffer)
-#define glRenderbufferStorage GLEW_GET_FUN(__glewRenderbufferStorage)
-#define glRenderbufferStorageMultisample GLEW_GET_FUN(__glewRenderbufferStorageMultisample)
-
-#define GLEW_ARB_framebuffer_object GLEW_GET_VAR(__GLEW_ARB_framebuffer_object)
-
-#endif /* GL_ARB_framebuffer_object */
-
-/* ------------------------ GL_ARB_framebuffer_sRGB ------------------------ */
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_ARB_framebuffer_sRGB 1
-
-#define GL_FRAMEBUFFER_SRGB 0x8DB9
-
-#define GLEW_ARB_framebuffer_sRGB GLEW_GET_VAR(__GLEW_ARB_framebuffer_sRGB)
-
-#endif /* GL_ARB_framebuffer_sRGB */
-
-/* ------------------------ GL_ARB_geometry_shader4 ------------------------ */
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_ARB_geometry_shader4 1
-
-#define GL_LINES_ADJACENCY_ARB 0xA
-#define GL_LINE_STRIP_ADJACENCY_ARB 0xB
-#define GL_TRIANGLES_ADJACENCY_ARB 0xC
-#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0xD
-#define GL_PROGRAM_POINT_SIZE_ARB 0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
-#define GL_GEOMETRY_SHADER_ARB 0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
-
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
-
-#define glFramebufferTextureARB GLEW_GET_FUN(__glewFramebufferTextureARB)
-#define glFramebufferTextureFaceARB GLEW_GET_FUN(__glewFramebufferTextureFaceARB)
-#define glFramebufferTextureLayerARB GLEW_GET_FUN(__glewFramebufferTextureLayerARB)
-#define glProgramParameteriARB GLEW_GET_FUN(__glewProgramParameteriARB)
-
-#define GLEW_ARB_geometry_shader4 GLEW_GET_VAR(__GLEW_ARB_geometry_shader4)
-
-#endif /* GL_ARB_geometry_shader4 */
-
-/* ----------------------- GL_ARB_get_program_binary ----------------------- */
-
-#ifndef GL_ARB_get_program_binary
-#define GL_ARB_get_program_binary 1
-
-#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
-#define GL_PROGRAM_BINARY_LENGTH 0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE
-#define GL_PROGRAM_BINARY_FORMATS 0x87FF
-
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, GLvoid*binary);
-typedef void (GLAPIENTRY * PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void* binary, GLsizei length);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-
-#define glGetProgramBinary GLEW_GET_FUN(__glewGetProgramBinary)
-#define glProgramBinary GLEW_GET_FUN(__glewProgramBinary)
-#define glProgramParameteri GLEW_GET_FUN(__glewProgramParameteri)
-
-#define GLEW_ARB_get_program_binary GLEW_GET_VAR(__GLEW_ARB_get_program_binary)
-
-#endif /* GL_ARB_get_program_binary */
-
-/* --------------------------- GL_ARB_gpu_shader5 -------------------------- */
-
-#ifndef GL_ARB_gpu_shader5
-#define GL_ARB_gpu_shader5 1
-
-#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-#define GL_MAX_VERTEX_STREAMS 0x8E71
-
-#define GLEW_ARB_gpu_shader5 GLEW_GET_VAR(__GLEW_ARB_gpu_shader5)
-
-#endif /* GL_ARB_gpu_shader5 */
-
-/* ------------------------- GL_ARB_gpu_shader_fp64 ------------------------ */
-
-#ifndef GL_ARB_gpu_shader_fp64
-#define GL_ARB_gpu_shader_fp64 1
-
-#define GL_DOUBLE_MAT2 0x8F46
-#define GL_DOUBLE_MAT3 0x8F47
-#define GL_DOUBLE_MAT4 0x8F48
-#define GL_DOUBLE_MAT2x3 0x8F49
-#define GL_DOUBLE_MAT2x4 0x8F4A
-#define GL_DOUBLE_MAT3x2 0x8F4B
-#define GL_DOUBLE_MAT3x4 0x8F4C
-#define GL_DOUBLE_MAT4x2 0x8F4D
-#define GL_DOUBLE_MAT4x3 0x8F4E
-#define GL_DOUBLE_VEC2 0x8FFC
-#define GL_DOUBLE_VEC3 0x8FFD
-#define GL_DOUBLE_VEC4 0x8FFE
-
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-
-#define glGetUniformdv GLEW_GET_FUN(__glewGetUniformdv)
-#define glUniform1d GLEW_GET_FUN(__glewUniform1d)
-#define glUniform1dv GLEW_GET_FUN(__glewUniform1dv)
-#define glUniform2d GLEW_GET_FUN(__glewUniform2d)
-#define glUniform2dv GLEW_GET_FUN(__glewUniform2dv)
-#define glUniform3d GLEW_GET_FUN(__glewUniform3d)
-#define glUniform3dv GLEW_GET_FUN(__glewUniform3dv)
-#define glUniform4d GLEW_GET_FUN(__glewUniform4d)
-#define glUniform4dv GLEW_GET_FUN(__glewUniform4dv)
-#define glUniformMatrix2dv GLEW_GET_FUN(__glewUniformMatrix2dv)
-#define glUniformMatrix2x3dv GLEW_GET_FUN(__glewUniformMatrix2x3dv)
-#define glUniformMatrix2x4dv GLEW_GET_FUN(__glewUniformMatrix2x4dv)
-#define glUniformMatrix3dv GLEW_GET_FUN(__glewUniformMatrix3dv)
-#define glUniformMatrix3x2dv GLEW_GET_FUN(__glewUniformMatrix3x2dv)
-#define glUniformMatrix3x4dv GLEW_GET_FUN(__glewUniformMatrix3x4dv)
-#define glUniformMatrix4dv GLEW_GET_FUN(__glewUniformMatrix4dv)
-#define glUniformMatrix4x2dv GLEW_GET_FUN(__glewUniformMatrix4x2dv)
-#define glUniformMatrix4x3dv GLEW_GET_FUN(__glewUniformMatrix4x3dv)
-
-#define GLEW_ARB_gpu_shader_fp64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_fp64)
-
-#endif /* GL_ARB_gpu_shader_fp64 */
-
-/* ------------------------ GL_ARB_half_float_pixel ------------------------ */
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-
-#define GL_HALF_FLOAT_ARB 0x140B
-
-#define GLEW_ARB_half_float_pixel GLEW_GET_VAR(__GLEW_ARB_half_float_pixel)
-
-#endif /* GL_ARB_half_float_pixel */
-
-/* ------------------------ GL_ARB_half_float_vertex ----------------------- */
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_ARB_half_float_vertex 1
-
-#define GL_HALF_FLOAT 0x140B
-
-#define GLEW_ARB_half_float_vertex GLEW_GET_VAR(__GLEW_ARB_half_float_vertex)
-
-#endif /* GL_ARB_half_float_vertex */
-
-/* ----------------------------- GL_ARB_imaging ---------------------------- */
-
-#ifndef GL_ARB_imaging
-#define GL_ARB_imaging 1
-
-#define GL_CONSTANT_COLOR 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define GL_CONSTANT_ALPHA 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#define GL_BLEND_COLOR 0x8005
-#define GL_FUNC_ADD 0x8006
-#define GL_MIN 0x8007
-#define GL_MAX 0x8008
-#define GL_BLEND_EQUATION 0x8009
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_CONVOLUTION_1D 0x8010
-#define GL_CONVOLUTION_2D 0x8011
-#define GL_SEPARABLE_2D 0x8012
-#define GL_CONVOLUTION_BORDER_MODE 0x8013
-#define GL_CONVOLUTION_FILTER_SCALE 0x8014
-#define GL_CONVOLUTION_FILTER_BIAS 0x8015
-#define GL_REDUCE 0x8016
-#define GL_CONVOLUTION_FORMAT 0x8017
-#define GL_CONVOLUTION_WIDTH 0x8018
-#define GL_CONVOLUTION_HEIGHT 0x8019
-#define GL_MAX_CONVOLUTION_WIDTH 0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
-#define GL_HISTOGRAM 0x8024
-#define GL_PROXY_HISTOGRAM 0x8025
-#define GL_HISTOGRAM_WIDTH 0x8026
-#define GL_HISTOGRAM_FORMAT 0x8027
-#define GL_HISTOGRAM_RED_SIZE 0x8028
-#define GL_HISTOGRAM_GREEN_SIZE 0x8029
-#define GL_HISTOGRAM_BLUE_SIZE 0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
-#define GL_HISTOGRAM_SINK 0x802D
-#define GL_MINMAX 0x802E
-#define GL_MINMAX_FORMAT 0x802F
-#define GL_MINMAX_SINK 0x8030
-#define GL_TABLE_TOO_LARGE 0x8031
-#define GL_COLOR_MATRIX 0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
-#define GL_COLOR_TABLE 0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
-#define GL_PROXY_COLOR_TABLE 0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE 0x80D6
-#define GL_COLOR_TABLE_BIAS 0x80D7
-#define GL_COLOR_TABLE_FORMAT 0x80D8
-#define GL_COLOR_TABLE_WIDTH 0x80D9
-#define GL_COLOR_TABLE_RED_SIZE 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
-#define GL_IGNORE_BORDER 0x8150
-#define GL_CONSTANT_BORDER 0x8151
-#define GL_WRAP_BORDER 0x8152
-#define GL_REPLICATE_BORDER 0x8153
-#define GL_CONVOLUTION_BORDER_COLOR 0x8154
-
-typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (GLAPIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (GLAPIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-
-#define glColorSubTable GLEW_GET_FUN(__glewColorSubTable)
-#define glColorTable GLEW_GET_FUN(__glewColorTable)
-#define glColorTableParameterfv GLEW_GET_FUN(__glewColorTableParameterfv)
-#define glColorTableParameteriv GLEW_GET_FUN(__glewColorTableParameteriv)
-#define glConvolutionFilter1D GLEW_GET_FUN(__glewConvolutionFilter1D)
-#define glConvolutionFilter2D GLEW_GET_FUN(__glewConvolutionFilter2D)
-#define glConvolutionParameterf GLEW_GET_FUN(__glewConvolutionParameterf)
-#define glConvolutionParameterfv GLEW_GET_FUN(__glewConvolutionParameterfv)
-#define glConvolutionParameteri GLEW_GET_FUN(__glewConvolutionParameteri)
-#define glConvolutionParameteriv GLEW_GET_FUN(__glewConvolutionParameteriv)
-#define glCopyColorSubTable GLEW_GET_FUN(__glewCopyColorSubTable)
-#define glCopyColorTable GLEW_GET_FUN(__glewCopyColorTable)
-#define glCopyConvolutionFilter1D GLEW_GET_FUN(__glewCopyConvolutionFilter1D)
-#define glCopyConvolutionFilter2D GLEW_GET_FUN(__glewCopyConvolutionFilter2D)
-#define glGetColorTable GLEW_GET_FUN(__glewGetColorTable)
-#define glGetColorTableParameterfv GLEW_GET_FUN(__glewGetColorTableParameterfv)
-#define glGetColorTableParameteriv GLEW_GET_FUN(__glewGetColorTableParameteriv)
-#define glGetConvolutionFilter GLEW_GET_FUN(__glewGetConvolutionFilter)
-#define glGetConvolutionParameterfv GLEW_GET_FUN(__glewGetConvolutionParameterfv)
-#define glGetConvolutionParameteriv GLEW_GET_FUN(__glewGetConvolutionParameteriv)
-#define glGetHistogram GLEW_GET_FUN(__glewGetHistogram)
-#define glGetHistogramParameterfv GLEW_GET_FUN(__glewGetHistogramParameterfv)
-#define glGetHistogramParameteriv GLEW_GET_FUN(__glewGetHistogramParameteriv)
-#define glGetMinmax GLEW_GET_FUN(__glewGetMinmax)
-#define glGetMinmaxParameterfv GLEW_GET_FUN(__glewGetMinmaxParameterfv)
-#define glGetMinmaxParameteriv GLEW_GET_FUN(__glewGetMinmaxParameteriv)
-#define glGetSeparableFilter GLEW_GET_FUN(__glewGetSeparableFilter)
-#define glHistogram GLEW_GET_FUN(__glewHistogram)
-#define glMinmax GLEW_GET_FUN(__glewMinmax)
-#define glResetHistogram GLEW_GET_FUN(__glewResetHistogram)
-#define glResetMinmax GLEW_GET_FUN(__glewResetMinmax)
-#define glSeparableFilter2D GLEW_GET_FUN(__glewSeparableFilter2D)
-
-#define GLEW_ARB_imaging GLEW_GET_VAR(__GLEW_ARB_imaging)
-
-#endif /* GL_ARB_imaging */
-
-/* ------------------------ GL_ARB_instanced_arrays ------------------------ */
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_ARB_instanced_arrays 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
-
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
-
-#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB)
-#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB)
-#define glVertexAttribDivisorARB GLEW_GET_FUN(__glewVertexAttribDivisorARB)
-
-#define GLEW_ARB_instanced_arrays GLEW_GET_VAR(__GLEW_ARB_instanced_arrays)
-
-#endif /* GL_ARB_instanced_arrays */
-
-/* ---------------------- GL_ARB_internalformat_query ---------------------- */
-
-#ifndef GL_ARB_internalformat_query
-#define GL_ARB_internalformat_query 1
-
-#define GL_NUM_SAMPLE_COUNTS 0x9380
-
-typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
-
-#define glGetInternalformativ GLEW_GET_FUN(__glewGetInternalformativ)
-
-#define GLEW_ARB_internalformat_query GLEW_GET_VAR(__GLEW_ARB_internalformat_query)
-
-#endif /* GL_ARB_internalformat_query */
-
-/* ---------------------- GL_ARB_internalformat_query2 --------------------- */
-
-#ifndef GL_ARB_internalformat_query2
-#define GL_ARB_internalformat_query2 1
-
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_TEXTURE_3D 0x806F
-#define GL_SAMPLES 0x80A9
-#define GL_INTERNALFORMAT_SUPPORTED 0x826F
-#define GL_INTERNALFORMAT_PREFERRED 0x8270
-#define GL_INTERNALFORMAT_RED_SIZE 0x8271
-#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272
-#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273
-#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274
-#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275
-#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276
-#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277
-#define GL_INTERNALFORMAT_RED_TYPE 0x8278
-#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279
-#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A
-#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B
-#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C
-#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D
-#define GL_MAX_WIDTH 0x827E
-#define GL_MAX_HEIGHT 0x827F
-#define GL_MAX_DEPTH 0x8280
-#define GL_MAX_LAYERS 0x8281
-#define GL_MAX_COMBINED_DIMENSIONS 0x8282
-#define GL_COLOR_COMPONENTS 0x8283
-#define GL_DEPTH_COMPONENTS 0x8284
-#define GL_STENCIL_COMPONENTS 0x8285
-#define GL_COLOR_RENDERABLE 0x8286
-#define GL_DEPTH_RENDERABLE 0x8287
-#define GL_STENCIL_RENDERABLE 0x8288
-#define GL_FRAMEBUFFER_RENDERABLE 0x8289
-#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
-#define GL_FRAMEBUFFER_BLEND 0x828B
-#define GL_READ_PIXELS 0x828C
-#define GL_READ_PIXELS_FORMAT 0x828D
-#define GL_READ_PIXELS_TYPE 0x828E
-#define GL_TEXTURE_IMAGE_FORMAT 0x828F
-#define GL_TEXTURE_IMAGE_TYPE 0x8290
-#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291
-#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292
-#define GL_MIPMAP 0x8293
-#define GL_MANUAL_GENERATE_MIPMAP 0x8294
-#define GL_AUTO_GENERATE_MIPMAP 0x8295
-#define GL_COLOR_ENCODING 0x8296
-#define GL_SRGB_READ 0x8297
-#define GL_SRGB_WRITE 0x8298
-#define GL_SRGB_DECODE_ARB 0x8299
-#define GL_FILTER 0x829A
-#define GL_VERTEX_TEXTURE 0x829B
-#define GL_TESS_CONTROL_TEXTURE 0x829C
-#define GL_TESS_EVALUATION_TEXTURE 0x829D
-#define GL_GEOMETRY_TEXTURE 0x829E
-#define GL_FRAGMENT_TEXTURE 0x829F
-#define GL_COMPUTE_TEXTURE 0x82A0
-#define GL_TEXTURE_SHADOW 0x82A1
-#define GL_TEXTURE_GATHER 0x82A2
-#define GL_TEXTURE_GATHER_SHADOW 0x82A3
-#define GL_SHADER_IMAGE_LOAD 0x82A4
-#define GL_SHADER_IMAGE_STORE 0x82A5
-#define GL_SHADER_IMAGE_ATOMIC 0x82A6
-#define GL_IMAGE_TEXEL_SIZE 0x82A7
-#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8
-#define GL_IMAGE_PIXEL_FORMAT 0x82A9
-#define GL_IMAGE_PIXEL_TYPE 0x82AA
-#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
-#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
-#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
-#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
-#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
-#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
-#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3
-#define GL_CLEAR_BUFFER 0x82B4
-#define GL_TEXTURE_VIEW 0x82B5
-#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6
-#define GL_FULL_SUPPORT 0x82B7
-#define GL_CAVEAT_SUPPORT 0x82B8
-#define GL_IMAGE_CLASS_4_X_32 0x82B9
-#define GL_IMAGE_CLASS_2_X_32 0x82BA
-#define GL_IMAGE_CLASS_1_X_32 0x82BB
-#define GL_IMAGE_CLASS_4_X_16 0x82BC
-#define GL_IMAGE_CLASS_2_X_16 0x82BD
-#define GL_IMAGE_CLASS_1_X_16 0x82BE
-#define GL_IMAGE_CLASS_4_X_8 0x82BF
-#define GL_IMAGE_CLASS_2_X_8 0x82C0
-#define GL_IMAGE_CLASS_1_X_8 0x82C1
-#define GL_IMAGE_CLASS_11_11_10 0x82C2
-#define GL_IMAGE_CLASS_10_10_10_2 0x82C3
-#define GL_VIEW_CLASS_128_BITS 0x82C4
-#define GL_VIEW_CLASS_96_BITS 0x82C5
-#define GL_VIEW_CLASS_64_BITS 0x82C6
-#define GL_VIEW_CLASS_48_BITS 0x82C7
-#define GL_VIEW_CLASS_32_BITS 0x82C8
-#define GL_VIEW_CLASS_24_BITS 0x82C9
-#define GL_VIEW_CLASS_16_BITS 0x82CA
-#define GL_VIEW_CLASS_8_BITS 0x82CB
-#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC
-#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD
-#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE
-#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF
-#define GL_VIEW_CLASS_RGTC1_RED 0x82D0
-#define GL_VIEW_CLASS_RGTC2_RG 0x82D1
-#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2
-#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3
-#define GL_TEXTURE_RECTANGLE 0x84F5
-#define GL_TEXTURE_1D_ARRAY 0x8C18
-#define GL_TEXTURE_2D_ARRAY 0x8C1A
-#define GL_TEXTURE_BUFFER 0x8C2A
-#define GL_RENDERBUFFER 0x8D41
-#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009
-#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102
-#define GL_NUM_SAMPLE_COUNTS 0x9380
-
-typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params);
-
-#define glGetInternalformati64v GLEW_GET_FUN(__glewGetInternalformati64v)
-
-#define GLEW_ARB_internalformat_query2 GLEW_GET_VAR(__GLEW_ARB_internalformat_query2)
-
-#endif /* GL_ARB_internalformat_query2 */
-
-/* ----------------------- GL_ARB_invalidate_subdata ----------------------- */
-
-#ifndef GL_ARB_invalidate_subdata
-#define GL_ARB_invalidate_subdata 1
-
-typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
-typedef void (GLAPIENTRY * PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments);
-typedef void (GLAPIENTRY * PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
-
-#define glInvalidateBufferData GLEW_GET_FUN(__glewInvalidateBufferData)
-#define glInvalidateBufferSubData GLEW_GET_FUN(__glewInvalidateBufferSubData)
-#define glInvalidateFramebuffer GLEW_GET_FUN(__glewInvalidateFramebuffer)
-#define glInvalidateSubFramebuffer GLEW_GET_FUN(__glewInvalidateSubFramebuffer)
-#define glInvalidateTexImage GLEW_GET_FUN(__glewInvalidateTexImage)
-#define glInvalidateTexSubImage GLEW_GET_FUN(__glewInvalidateTexSubImage)
-
-#define GLEW_ARB_invalidate_subdata GLEW_GET_VAR(__GLEW_ARB_invalidate_subdata)
-
-#endif /* GL_ARB_invalidate_subdata */
-
-/* ---------------------- GL_ARB_map_buffer_alignment ---------------------- */
-
-#ifndef GL_ARB_map_buffer_alignment
-#define GL_ARB_map_buffer_alignment 1
-
-#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC
-
-#define GLEW_ARB_map_buffer_alignment GLEW_GET_VAR(__GLEW_ARB_map_buffer_alignment)
-
-#endif /* GL_ARB_map_buffer_alignment */
-
-/* ------------------------ GL_ARB_map_buffer_range ------------------------ */
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-
-#define GL_MAP_READ_BIT 0x0001
-#define GL_MAP_WRITE_BIT 0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020
-
-typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-typedef GLvoid * (GLAPIENTRY * PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-
-#define glFlushMappedBufferRange GLEW_GET_FUN(__glewFlushMappedBufferRange)
-#define glMapBufferRange GLEW_GET_FUN(__glewMapBufferRange)
-
-#define GLEW_ARB_map_buffer_range GLEW_GET_VAR(__GLEW_ARB_map_buffer_range)
-
-#endif /* GL_ARB_map_buffer_range */
-
-/* ------------------------- GL_ARB_matrix_palette ------------------------- */
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-
-#define GL_MATRIX_PALETTE_ARB 0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-
-typedef void (GLAPIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (GLAPIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
-typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, GLubyte *indices);
-typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, GLuint *indices);
-typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, GLushort *indices);
-
-#define glCurrentPaletteMatrixARB GLEW_GET_FUN(__glewCurrentPaletteMatrixARB)
-#define glMatrixIndexPointerARB GLEW_GET_FUN(__glewMatrixIndexPointerARB)
-#define glMatrixIndexubvARB GLEW_GET_FUN(__glewMatrixIndexubvARB)
-#define glMatrixIndexuivARB GLEW_GET_FUN(__glewMatrixIndexuivARB)
-#define glMatrixIndexusvARB GLEW_GET_FUN(__glewMatrixIndexusvARB)
-
-#define GLEW_ARB_matrix_palette GLEW_GET_VAR(__GLEW_ARB_matrix_palette)
-
-#endif /* GL_ARB_matrix_palette */
-
-/* ----------------------- GL_ARB_multi_draw_indirect ---------------------- */
-
-#ifndef GL_ARB_multi_draw_indirect
-#define GL_ARB_multi_draw_indirect 1
-
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void* indirect, GLsizei primcount, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void* indirect, GLsizei primcount, GLsizei stride);
-
-#define glMultiDrawArraysIndirect GLEW_GET_FUN(__glewMultiDrawArraysIndirect)
-#define glMultiDrawElementsIndirect GLEW_GET_FUN(__glewMultiDrawElementsIndirect)
-
-#define GLEW_ARB_multi_draw_indirect GLEW_GET_VAR(__GLEW_ARB_multi_draw_indirect)
-
-#endif /* GL_ARB_multi_draw_indirect */
-
-/* --------------------------- GL_ARB_multisample -------------------------- */
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-
-#define GL_MULTISAMPLE_ARB 0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
-#define GL_SAMPLE_COVERAGE_ARB 0x80A0
-#define GL_SAMPLE_BUFFERS_ARB 0x80A8
-#define GL_SAMPLES_ARB 0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
-#define GL_MULTISAMPLE_BIT_ARB 0x20000000
-
-typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-
-#define glSampleCoverageARB GLEW_GET_FUN(__glewSampleCoverageARB)
-
-#define GLEW_ARB_multisample GLEW_GET_VAR(__GLEW_ARB_multisample)
-
-#endif /* GL_ARB_multisample */
-
-/* -------------------------- GL_ARB_multitexture -------------------------- */
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-
-#define GL_TEXTURE0_ARB 0x84C0
-#define GL_TEXTURE1_ARB 0x84C1
-#define GL_TEXTURE2_ARB 0x84C2
-#define GL_TEXTURE3_ARB 0x84C3
-#define GL_TEXTURE4_ARB 0x84C4
-#define GL_TEXTURE5_ARB 0x84C5
-#define GL_TEXTURE6_ARB 0x84C6
-#define GL_TEXTURE7_ARB 0x84C7
-#define GL_TEXTURE8_ARB 0x84C8
-#define GL_TEXTURE9_ARB 0x84C9
-#define GL_TEXTURE10_ARB 0x84CA
-#define GL_TEXTURE11_ARB 0x84CB
-#define GL_TEXTURE12_ARB 0x84CC
-#define GL_TEXTURE13_ARB 0x84CD
-#define GL_TEXTURE14_ARB 0x84CE
-#define GL_TEXTURE15_ARB 0x84CF
-#define GL_TEXTURE16_ARB 0x84D0
-#define GL_TEXTURE17_ARB 0x84D1
-#define GL_TEXTURE18_ARB 0x84D2
-#define GL_TEXTURE19_ARB 0x84D3
-#define GL_TEXTURE20_ARB 0x84D4
-#define GL_TEXTURE21_ARB 0x84D5
-#define GL_TEXTURE22_ARB 0x84D6
-#define GL_TEXTURE23_ARB 0x84D7
-#define GL_TEXTURE24_ARB 0x84D8
-#define GL_TEXTURE25_ARB 0x84D9
-#define GL_TEXTURE26_ARB 0x84DA
-#define GL_TEXTURE27_ARB 0x84DB
-#define GL_TEXTURE28_ARB 0x84DC
-#define GL_TEXTURE29_ARB 0x84DD
-#define GL_TEXTURE30_ARB 0x84DE
-#define GL_TEXTURE31_ARB 0x84DF
-#define GL_ACTIVE_TEXTURE_ARB 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
-
-typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-
-#define glActiveTextureARB GLEW_GET_FUN(__glewActiveTextureARB)
-#define glClientActiveTextureARB GLEW_GET_FUN(__glewClientActiveTextureARB)
-#define glMultiTexCoord1dARB GLEW_GET_FUN(__glewMultiTexCoord1dARB)
-#define glMultiTexCoord1dvARB GLEW_GET_FUN(__glewMultiTexCoord1dvARB)
-#define glMultiTexCoord1fARB GLEW_GET_FUN(__glewMultiTexCoord1fARB)
-#define glMultiTexCoord1fvARB GLEW_GET_FUN(__glewMultiTexCoord1fvARB)
-#define glMultiTexCoord1iARB GLEW_GET_FUN(__glewMultiTexCoord1iARB)
-#define glMultiTexCoord1ivARB GLEW_GET_FUN(__glewMultiTexCoord1ivARB)
-#define glMultiTexCoord1sARB GLEW_GET_FUN(__glewMultiTexCoord1sARB)
-#define glMultiTexCoord1svARB GLEW_GET_FUN(__glewMultiTexCoord1svARB)
-#define glMultiTexCoord2dARB GLEW_GET_FUN(__glewMultiTexCoord2dARB)
-#define glMultiTexCoord2dvARB GLEW_GET_FUN(__glewMultiTexCoord2dvARB)
-#define glMultiTexCoord2fARB GLEW_GET_FUN(__glewMultiTexCoord2fARB)
-#define glMultiTexCoord2fvARB GLEW_GET_FUN(__glewMultiTexCoord2fvARB)
-#define glMultiTexCoord2iARB GLEW_GET_FUN(__glewMultiTexCoord2iARB)
-#define glMultiTexCoord2ivARB GLEW_GET_FUN(__glewMultiTexCoord2ivARB)
-#define glMultiTexCoord2sARB GLEW_GET_FUN(__glewMultiTexCoord2sARB)
-#define glMultiTexCoord2svARB GLEW_GET_FUN(__glewMultiTexCoord2svARB)
-#define glMultiTexCoord3dARB GLEW_GET_FUN(__glewMultiTexCoord3dARB)
-#define glMultiTexCoord3dvARB GLEW_GET_FUN(__glewMultiTexCoord3dvARB)
-#define glMultiTexCoord3fARB GLEW_GET_FUN(__glewMultiTexCoord3fARB)
-#define glMultiTexCoord3fvARB GLEW_GET_FUN(__glewMultiTexCoord3fvARB)
-#define glMultiTexCoord3iARB GLEW_GET_FUN(__glewMultiTexCoord3iARB)
-#define glMultiTexCoord3ivARB GLEW_GET_FUN(__glewMultiTexCoord3ivARB)
-#define glMultiTexCoord3sARB GLEW_GET_FUN(__glewMultiTexCoord3sARB)
-#define glMultiTexCoord3svARB GLEW_GET_FUN(__glewMultiTexCoord3svARB)
-#define glMultiTexCoord4dARB GLEW_GET_FUN(__glewMultiTexCoord4dARB)
-#define glMultiTexCoord4dvARB GLEW_GET_FUN(__glewMultiTexCoord4dvARB)
-#define glMultiTexCoord4fARB GLEW_GET_FUN(__glewMultiTexCoord4fARB)
-#define glMultiTexCoord4fvARB GLEW_GET_FUN(__glewMultiTexCoord4fvARB)
-#define glMultiTexCoord4iARB GLEW_GET_FUN(__glewMultiTexCoord4iARB)
-#define glMultiTexCoord4ivARB GLEW_GET_FUN(__glewMultiTexCoord4ivARB)
-#define glMultiTexCoord4sARB GLEW_GET_FUN(__glewMultiTexCoord4sARB)
-#define glMultiTexCoord4svARB GLEW_GET_FUN(__glewMultiTexCoord4svARB)
-
-#define GLEW_ARB_multitexture GLEW_GET_VAR(__GLEW_ARB_multitexture)
-
-#endif /* GL_ARB_multitexture */
-
-/* ------------------------- GL_ARB_occlusion_query ------------------------ */
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-
-#define GL_QUERY_COUNTER_BITS_ARB 0x8864
-#define GL_CURRENT_QUERY_ARB 0x8865
-#define GL_QUERY_RESULT_ARB 0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867
-#define GL_SAMPLES_PASSED_ARB 0x8914
-
-typedef void (GLAPIENTRY * PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISQUERYARBPROC) (GLuint id);
-
-#define glBeginQueryARB GLEW_GET_FUN(__glewBeginQueryARB)
-#define glDeleteQueriesARB GLEW_GET_FUN(__glewDeleteQueriesARB)
-#define glEndQueryARB GLEW_GET_FUN(__glewEndQueryARB)
-#define glGenQueriesARB GLEW_GET_FUN(__glewGenQueriesARB)
-#define glGetQueryObjectivARB GLEW_GET_FUN(__glewGetQueryObjectivARB)
-#define glGetQueryObjectuivARB GLEW_GET_FUN(__glewGetQueryObjectuivARB)
-#define glGetQueryivARB GLEW_GET_FUN(__glewGetQueryivARB)
-#define glIsQueryARB GLEW_GET_FUN(__glewIsQueryARB)
-
-#define GLEW_ARB_occlusion_query GLEW_GET_VAR(__GLEW_ARB_occlusion_query)
-
-#endif /* GL_ARB_occlusion_query */
-
-/* ------------------------ GL_ARB_occlusion_query2 ------------------------ */
-
-#ifndef GL_ARB_occlusion_query2
-#define GL_ARB_occlusion_query2 1
-
-#define GL_ANY_SAMPLES_PASSED 0x8C2F
-
-#define GLEW_ARB_occlusion_query2 GLEW_GET_VAR(__GLEW_ARB_occlusion_query2)
-
-#endif /* GL_ARB_occlusion_query2 */
-
-/* ----------------------- GL_ARB_pixel_buffer_object ---------------------- */
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-
-#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-
-#define GLEW_ARB_pixel_buffer_object GLEW_GET_VAR(__GLEW_ARB_pixel_buffer_object)
-
-#endif /* GL_ARB_pixel_buffer_object */
-
-/* ------------------------ GL_ARB_point_parameters ------------------------ */
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-
-#define GL_POINT_SIZE_MIN_ARB 0x8126
-#define GL_POINT_SIZE_MAX_ARB 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat* params);
-
-#define glPointParameterfARB GLEW_GET_FUN(__glewPointParameterfARB)
-#define glPointParameterfvARB GLEW_GET_FUN(__glewPointParameterfvARB)
-
-#define GLEW_ARB_point_parameters GLEW_GET_VAR(__GLEW_ARB_point_parameters)
-
-#endif /* GL_ARB_point_parameters */
-
-/* -------------------------- GL_ARB_point_sprite -------------------------- */
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-
-#define GL_POINT_SPRITE_ARB 0x8861
-#define GL_COORD_REPLACE_ARB 0x8862
-
-#define GLEW_ARB_point_sprite GLEW_GET_VAR(__GLEW_ARB_point_sprite)
-
-#endif /* GL_ARB_point_sprite */
-
-/* --------------------- GL_ARB_program_interface_query -------------------- */
-
-#ifndef GL_ARB_program_interface_query
-#define GL_ARB_program_interface_query 1
-
-#define GL_UNIFORM 0x92E1
-#define GL_UNIFORM_BLOCK 0x92E2
-#define GL_PROGRAM_INPUT 0x92E3
-#define GL_PROGRAM_OUTPUT 0x92E4
-#define GL_BUFFER_VARIABLE 0x92E5
-#define GL_SHADER_STORAGE_BLOCK 0x92E6
-#define GL_IS_PER_PATCH 0x92E7
-#define GL_VERTEX_SUBROUTINE 0x92E8
-#define GL_TESS_CONTROL_SUBROUTINE 0x92E9
-#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA
-#define GL_GEOMETRY_SUBROUTINE 0x92EB
-#define GL_FRAGMENT_SUBROUTINE 0x92EC
-#define GL_COMPUTE_SUBROUTINE 0x92ED
-#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE
-#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
-#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
-#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1
-#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2
-#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3
-#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4
-#define GL_ACTIVE_RESOURCES 0x92F5
-#define GL_MAX_NAME_LENGTH 0x92F6
-#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7
-#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
-#define GL_NAME_LENGTH 0x92F9
-#define GL_TYPE 0x92FA
-#define GL_ARRAY_SIZE 0x92FB
-#define GL_OFFSET 0x92FC
-#define GL_BLOCK_INDEX 0x92FD
-#define GL_ARRAY_STRIDE 0x92FE
-#define GL_MATRIX_STRIDE 0x92FF
-#define GL_IS_ROW_MAJOR 0x9300
-#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301
-#define GL_BUFFER_BINDING 0x9302
-#define GL_BUFFER_DATA_SIZE 0x9303
-#define GL_NUM_ACTIVE_VARIABLES 0x9304
-#define GL_ACTIVE_VARIABLES 0x9305
-#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306
-#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
-#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
-#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309
-#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A
-#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B
-#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C
-#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D
-#define GL_LOCATION 0x930E
-#define GL_LOCATION_INDEX 0x930F
-
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint* params);
-typedef GLuint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name);
-typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar* name);
-typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar *name);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLint *params);
-
-#define glGetProgramInterfaceiv GLEW_GET_FUN(__glewGetProgramInterfaceiv)
-#define glGetProgramResourceIndex GLEW_GET_FUN(__glewGetProgramResourceIndex)
-#define glGetProgramResourceLocation GLEW_GET_FUN(__glewGetProgramResourceLocation)
-#define glGetProgramResourceLocationIndex GLEW_GET_FUN(__glewGetProgramResourceLocationIndex)
-#define glGetProgramResourceName GLEW_GET_FUN(__glewGetProgramResourceName)
-#define glGetProgramResourceiv GLEW_GET_FUN(__glewGetProgramResourceiv)
-
-#define GLEW_ARB_program_interface_query GLEW_GET_VAR(__GLEW_ARB_program_interface_query)
-
-#endif /* GL_ARB_program_interface_query */
-
-/* ------------------------ GL_ARB_provoking_vertex ------------------------ */
-
-#ifndef GL_ARB_provoking_vertex
-#define GL_ARB_provoking_vertex 1
-
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION 0x8E4D
-#define GL_LAST_VERTEX_CONVENTION 0x8E4E
-#define GL_PROVOKING_VERTEX 0x8E4F
-
-typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
-
-#define glProvokingVertex GLEW_GET_FUN(__glewProvokingVertex)
-
-#define GLEW_ARB_provoking_vertex GLEW_GET_VAR(__GLEW_ARB_provoking_vertex)
-
-#endif /* GL_ARB_provoking_vertex */
-
-/* ------------------ GL_ARB_robust_buffer_access_behavior ----------------- */
-
-#ifndef GL_ARB_robust_buffer_access_behavior
-#define GL_ARB_robust_buffer_access_behavior 1
-
-#define GLEW_ARB_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_ARB_robust_buffer_access_behavior)
-
-#endif /* GL_ARB_robust_buffer_access_behavior */
-
-/* --------------------------- GL_ARB_robustness --------------------------- */
-
-#ifndef GL_ARB_robustness
-#define GL_ARB_robustness 1
-
-#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
-#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
-#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253
-#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254
-#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255
-#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
-#define GL_NO_RESET_NOTIFICATION_ARB 0x8261
-
-typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
-typedef void (GLAPIENTRY * PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* table);
-typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void* img);
-typedef void (GLAPIENTRY * PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* image);
-typedef void (GLAPIENTRY * PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values);
-typedef void (GLAPIENTRY * PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint* v);
-typedef void (GLAPIENTRY * PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values);
-typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat* values);
-typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint* values);
-typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort* values);
-typedef void (GLAPIENTRY * PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte* pattern);
-typedef void (GLAPIENTRY * PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, GLvoid*column, GLvoid*span);
-typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img);
-typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void* data);
-
-#define glGetGraphicsResetStatusARB GLEW_GET_FUN(__glewGetGraphicsResetStatusARB)
-#define glGetnColorTableARB GLEW_GET_FUN(__glewGetnColorTableARB)
-#define glGetnCompressedTexImageARB GLEW_GET_FUN(__glewGetnCompressedTexImageARB)
-#define glGetnConvolutionFilterARB GLEW_GET_FUN(__glewGetnConvolutionFilterARB)
-#define glGetnHistogramARB GLEW_GET_FUN(__glewGetnHistogramARB)
-#define glGetnMapdvARB GLEW_GET_FUN(__glewGetnMapdvARB)
-#define glGetnMapfvARB GLEW_GET_FUN(__glewGetnMapfvARB)
-#define glGetnMapivARB GLEW_GET_FUN(__glewGetnMapivARB)
-#define glGetnMinmaxARB GLEW_GET_FUN(__glewGetnMinmaxARB)
-#define glGetnPixelMapfvARB GLEW_GET_FUN(__glewGetnPixelMapfvARB)
-#define glGetnPixelMapuivARB GLEW_GET_FUN(__glewGetnPixelMapuivARB)
-#define glGetnPixelMapusvARB GLEW_GET_FUN(__glewGetnPixelMapusvARB)
-#define glGetnPolygonStippleARB GLEW_GET_FUN(__glewGetnPolygonStippleARB)
-#define glGetnSeparableFilterARB GLEW_GET_FUN(__glewGetnSeparableFilterARB)
-#define glGetnTexImageARB GLEW_GET_FUN(__glewGetnTexImageARB)
-#define glGetnUniformdvARB GLEW_GET_FUN(__glewGetnUniformdvARB)
-#define glGetnUniformfvARB GLEW_GET_FUN(__glewGetnUniformfvARB)
-#define glGetnUniformivARB GLEW_GET_FUN(__glewGetnUniformivARB)
-#define glGetnUniformuivARB GLEW_GET_FUN(__glewGetnUniformuivARB)
-#define glReadnPixelsARB GLEW_GET_FUN(__glewReadnPixelsARB)
-
-#define GLEW_ARB_robustness GLEW_GET_VAR(__GLEW_ARB_robustness)
-
-#endif /* GL_ARB_robustness */
-
-/* ---------------- GL_ARB_robustness_application_isolation ---------------- */
-
-#ifndef GL_ARB_robustness_application_isolation
-#define GL_ARB_robustness_application_isolation 1
-
-#define GLEW_ARB_robustness_application_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_application_isolation)
-
-#endif /* GL_ARB_robustness_application_isolation */
-
-/* ---------------- GL_ARB_robustness_share_group_isolation ---------------- */
-
-#ifndef GL_ARB_robustness_share_group_isolation
-#define GL_ARB_robustness_share_group_isolation 1
-
-#define GLEW_ARB_robustness_share_group_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_share_group_isolation)
-
-#endif /* GL_ARB_robustness_share_group_isolation */
-
-/* ------------------------- GL_ARB_sample_shading ------------------------- */
-
-#ifndef GL_ARB_sample_shading
-#define GL_ARB_sample_shading 1
-
-#define GL_SAMPLE_SHADING_ARB 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37
-
-typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value);
-
-#define glMinSampleShadingARB GLEW_GET_FUN(__glewMinSampleShadingARB)
-
-#define GLEW_ARB_sample_shading GLEW_GET_VAR(__GLEW_ARB_sample_shading)
-
-#endif /* GL_ARB_sample_shading */
-
-/* ------------------------- GL_ARB_sampler_objects ------------------------ */
-
-#ifndef GL_ARB_sampler_objects
-#define GL_ARB_sampler_objects 1
-
-#define GL_SAMPLER_BINDING 0x8919
-
-typedef void (GLAPIENTRY * PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
-typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers);
-typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers);
-typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISSAMPLERPROC) (GLuint sampler);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint* params);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint* params);
-
-#define glBindSampler GLEW_GET_FUN(__glewBindSampler)
-#define glDeleteSamplers GLEW_GET_FUN(__glewDeleteSamplers)
-#define glGenSamplers GLEW_GET_FUN(__glewGenSamplers)
-#define glGetSamplerParameterIiv GLEW_GET_FUN(__glewGetSamplerParameterIiv)
-#define glGetSamplerParameterIuiv GLEW_GET_FUN(__glewGetSamplerParameterIuiv)
-#define glGetSamplerParameterfv GLEW_GET_FUN(__glewGetSamplerParameterfv)
-#define glGetSamplerParameteriv GLEW_GET_FUN(__glewGetSamplerParameteriv)
-#define glIsSampler GLEW_GET_FUN(__glewIsSampler)
-#define glSamplerParameterIiv GLEW_GET_FUN(__glewSamplerParameterIiv)
-#define glSamplerParameterIuiv GLEW_GET_FUN(__glewSamplerParameterIuiv)
-#define glSamplerParameterf GLEW_GET_FUN(__glewSamplerParameterf)
-#define glSamplerParameterfv GLEW_GET_FUN(__glewSamplerParameterfv)
-#define glSamplerParameteri GLEW_GET_FUN(__glewSamplerParameteri)
-#define glSamplerParameteriv GLEW_GET_FUN(__glewSamplerParameteriv)
-
-#define GLEW_ARB_sampler_objects GLEW_GET_VAR(__GLEW_ARB_sampler_objects)
-
-#endif /* GL_ARB_sampler_objects */
-
-/* ------------------------ GL_ARB_seamless_cube_map ----------------------- */
-
-#ifndef GL_ARB_seamless_cube_map
-#define GL_ARB_seamless_cube_map 1
-
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
-
-#define GLEW_ARB_seamless_cube_map GLEW_GET_VAR(__GLEW_ARB_seamless_cube_map)
-
-#endif /* GL_ARB_seamless_cube_map */
-
-/* --------------------- GL_ARB_separate_shader_objects -------------------- */
-
-#ifndef GL_ARB_separate_shader_objects
-#define GL_ARB_separate_shader_objects 1
-
-#define GL_VERTEX_SHADER_BIT 0x00000001
-#define GL_FRAGMENT_SHADER_BIT 0x00000002
-#define GL_GEOMETRY_SHADER_BIT 0x00000004
-#define GL_TESS_CONTROL_SHADER_BIT 0x00000008
-#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010
-#define GL_PROGRAM_SEPARABLE 0x8258
-#define GL_ACTIVE_PROGRAM 0x8259
-#define GL_PROGRAM_PIPELINE_BINDING 0x825A
-#define GL_ALL_SHADER_BITS 0xFFFFFFFF
-
-typedef void (GLAPIENTRY * PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
-typedef void (GLAPIENTRY * PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar ** strings);
-typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint* pipelines);
-typedef void (GLAPIENTRY * PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar *infoLog);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint x, GLuint y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
-
-#define glActiveShaderProgram GLEW_GET_FUN(__glewActiveShaderProgram)
-#define glBindProgramPipeline GLEW_GET_FUN(__glewBindProgramPipeline)
-#define glCreateShaderProgramv GLEW_GET_FUN(__glewCreateShaderProgramv)
-#define glDeleteProgramPipelines GLEW_GET_FUN(__glewDeleteProgramPipelines)
-#define glGenProgramPipelines GLEW_GET_FUN(__glewGenProgramPipelines)
-#define glGetProgramPipelineInfoLog GLEW_GET_FUN(__glewGetProgramPipelineInfoLog)
-#define glGetProgramPipelineiv GLEW_GET_FUN(__glewGetProgramPipelineiv)
-#define glIsProgramPipeline GLEW_GET_FUN(__glewIsProgramPipeline)
-#define glProgramUniform1d GLEW_GET_FUN(__glewProgramUniform1d)
-#define glProgramUniform1dv GLEW_GET_FUN(__glewProgramUniform1dv)
-#define glProgramUniform1f GLEW_GET_FUN(__glewProgramUniform1f)
-#define glProgramUniform1fv GLEW_GET_FUN(__glewProgramUniform1fv)
-#define glProgramUniform1i GLEW_GET_FUN(__glewProgramUniform1i)
-#define glProgramUniform1iv GLEW_GET_FUN(__glewProgramUniform1iv)
-#define glProgramUniform1ui GLEW_GET_FUN(__glewProgramUniform1ui)
-#define glProgramUniform1uiv GLEW_GET_FUN(__glewProgramUniform1uiv)
-#define glProgramUniform2d GLEW_GET_FUN(__glewProgramUniform2d)
-#define glProgramUniform2dv GLEW_GET_FUN(__glewProgramUniform2dv)
-#define glProgramUniform2f GLEW_GET_FUN(__glewProgramUniform2f)
-#define glProgramUniform2fv GLEW_GET_FUN(__glewProgramUniform2fv)
-#define glProgramUniform2i GLEW_GET_FUN(__glewProgramUniform2i)
-#define glProgramUniform2iv GLEW_GET_FUN(__glewProgramUniform2iv)
-#define glProgramUniform2ui GLEW_GET_FUN(__glewProgramUniform2ui)
-#define glProgramUniform2uiv GLEW_GET_FUN(__glewProgramUniform2uiv)
-#define glProgramUniform3d GLEW_GET_FUN(__glewProgramUniform3d)
-#define glProgramUniform3dv GLEW_GET_FUN(__glewProgramUniform3dv)
-#define glProgramUniform3f GLEW_GET_FUN(__glewProgramUniform3f)
-#define glProgramUniform3fv GLEW_GET_FUN(__glewProgramUniform3fv)
-#define glProgramUniform3i GLEW_GET_FUN(__glewProgramUniform3i)
-#define glProgramUniform3iv GLEW_GET_FUN(__glewProgramUniform3iv)
-#define glProgramUniform3ui GLEW_GET_FUN(__glewProgramUniform3ui)
-#define glProgramUniform3uiv GLEW_GET_FUN(__glewProgramUniform3uiv)
-#define glProgramUniform4d GLEW_GET_FUN(__glewProgramUniform4d)
-#define glProgramUniform4dv GLEW_GET_FUN(__glewProgramUniform4dv)
-#define glProgramUniform4f GLEW_GET_FUN(__glewProgramUniform4f)
-#define glProgramUniform4fv GLEW_GET_FUN(__glewProgramUniform4fv)
-#define glProgramUniform4i GLEW_GET_FUN(__glewProgramUniform4i)
-#define glProgramUniform4iv GLEW_GET_FUN(__glewProgramUniform4iv)
-#define glProgramUniform4ui GLEW_GET_FUN(__glewProgramUniform4ui)
-#define glProgramUniform4uiv GLEW_GET_FUN(__glewProgramUniform4uiv)
-#define glProgramUniformMatrix2dv GLEW_GET_FUN(__glewProgramUniformMatrix2dv)
-#define glProgramUniformMatrix2fv GLEW_GET_FUN(__glewProgramUniformMatrix2fv)
-#define glProgramUniformMatrix2x3dv GLEW_GET_FUN(__glewProgramUniformMatrix2x3dv)
-#define glProgramUniformMatrix2x3fv GLEW_GET_FUN(__glewProgramUniformMatrix2x3fv)
-#define glProgramUniformMatrix2x4dv GLEW_GET_FUN(__glewProgramUniformMatrix2x4dv)
-#define glProgramUniformMatrix2x4fv GLEW_GET_FUN(__glewProgramUniformMatrix2x4fv)
-#define glProgramUniformMatrix3dv GLEW_GET_FUN(__glewProgramUniformMatrix3dv)
-#define glProgramUniformMatrix3fv GLEW_GET_FUN(__glewProgramUniformMatrix3fv)
-#define glProgramUniformMatrix3x2dv GLEW_GET_FUN(__glewProgramUniformMatrix3x2dv)
-#define glProgramUniformMatrix3x2fv GLEW_GET_FUN(__glewProgramUniformMatrix3x2fv)
-#define glProgramUniformMatrix3x4dv GLEW_GET_FUN(__glewProgramUniformMatrix3x4dv)
-#define glProgramUniformMatrix3x4fv GLEW_GET_FUN(__glewProgramUniformMatrix3x4fv)
-#define glProgramUniformMatrix4dv GLEW_GET_FUN(__glewProgramUniformMatrix4dv)
-#define glProgramUniformMatrix4fv GLEW_GET_FUN(__glewProgramUniformMatrix4fv)
-#define glProgramUniformMatrix4x2dv GLEW_GET_FUN(__glewProgramUniformMatrix4x2dv)
-#define glProgramUniformMatrix4x2fv GLEW_GET_FUN(__glewProgramUniformMatrix4x2fv)
-#define glProgramUniformMatrix4x3dv GLEW_GET_FUN(__glewProgramUniformMatrix4x3dv)
-#define glProgramUniformMatrix4x3fv GLEW_GET_FUN(__glewProgramUniformMatrix4x3fv)
-#define glUseProgramStages GLEW_GET_FUN(__glewUseProgramStages)
-#define glValidateProgramPipeline GLEW_GET_FUN(__glewValidateProgramPipeline)
-
-#define GLEW_ARB_separate_shader_objects GLEW_GET_VAR(__GLEW_ARB_separate_shader_objects)
-
-#endif /* GL_ARB_separate_shader_objects */
-
-/* --------------------- GL_ARB_shader_atomic_counters --------------------- */
-
-#ifndef GL_ARB_shader_atomic_counters
-#define GL_ARB_shader_atomic_counters 1
-
-#define GL_ATOMIC_COUNTER_BUFFER 0x92C0
-#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1
-#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2
-#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3
-#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
-#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
-#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
-#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
-#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
-#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
-#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
-#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
-#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
-#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2
-#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
-#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
-#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5
-#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6
-#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7
-#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
-#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9
-#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
-#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB
-#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
-
-typedef void (GLAPIENTRY * PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint* params);
-
-#define glGetActiveAtomicCounterBufferiv GLEW_GET_FUN(__glewGetActiveAtomicCounterBufferiv)
-
-#define GLEW_ARB_shader_atomic_counters GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counters)
-
-#endif /* GL_ARB_shader_atomic_counters */
-
-/* ----------------------- GL_ARB_shader_bit_encoding ---------------------- */
-
-#ifndef GL_ARB_shader_bit_encoding
-#define GL_ARB_shader_bit_encoding 1
-
-#define GLEW_ARB_shader_bit_encoding GLEW_GET_VAR(__GLEW_ARB_shader_bit_encoding)
-
-#endif /* GL_ARB_shader_bit_encoding */
-
-/* --------------------- GL_ARB_shader_image_load_store -------------------- */
-
-#ifndef GL_ARB_shader_image_load_store
-#define GL_ARB_shader_image_load_store 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
-#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002
-#define GL_UNIFORM_BARRIER_BIT 0x00000004
-#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008
-#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
-#define GL_COMMAND_BARRIER_BIT 0x00000040
-#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080
-#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100
-#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200
-#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400
-#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
-#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000
-#define GL_MAX_IMAGE_UNITS 0x8F38
-#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
-#define GL_IMAGE_BINDING_NAME 0x8F3A
-#define GL_IMAGE_BINDING_LEVEL 0x8F3B
-#define GL_IMAGE_BINDING_LAYERED 0x8F3C
-#define GL_IMAGE_BINDING_LAYER 0x8F3D
-#define GL_IMAGE_BINDING_ACCESS 0x8F3E
-#define GL_IMAGE_1D 0x904C
-#define GL_IMAGE_2D 0x904D
-#define GL_IMAGE_3D 0x904E
-#define GL_IMAGE_2D_RECT 0x904F
-#define GL_IMAGE_CUBE 0x9050
-#define GL_IMAGE_BUFFER 0x9051
-#define GL_IMAGE_1D_ARRAY 0x9052
-#define GL_IMAGE_2D_ARRAY 0x9053
-#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054
-#define GL_IMAGE_2D_MULTISAMPLE 0x9055
-#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056
-#define GL_INT_IMAGE_1D 0x9057
-#define GL_INT_IMAGE_2D 0x9058
-#define GL_INT_IMAGE_3D 0x9059
-#define GL_INT_IMAGE_2D_RECT 0x905A
-#define GL_INT_IMAGE_CUBE 0x905B
-#define GL_INT_IMAGE_BUFFER 0x905C
-#define GL_INT_IMAGE_1D_ARRAY 0x905D
-#define GL_INT_IMAGE_2D_ARRAY 0x905E
-#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F
-#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060
-#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
-#define GL_UNSIGNED_INT_IMAGE_1D 0x9062
-#define GL_UNSIGNED_INT_IMAGE_2D 0x9063
-#define GL_UNSIGNED_INT_IMAGE_3D 0x9064
-#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065
-#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066
-#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067
-#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068
-#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069
-#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
-#define GL_MAX_IMAGE_SAMPLES 0x906D
-#define GL_IMAGE_BINDING_FORMAT 0x906E
-#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
-#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
-#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
-#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA
-#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
-#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
-#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD
-#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE
-#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF
-#define GL_ALL_BARRIER_BITS 0xFFFFFFFF
-
-typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
-
-#define glBindImageTexture GLEW_GET_FUN(__glewBindImageTexture)
-#define glMemoryBarrier GLEW_GET_FUN(__glewMemoryBarrier)
-
-#define GLEW_ARB_shader_image_load_store GLEW_GET_VAR(__GLEW_ARB_shader_image_load_store)
-
-#endif /* GL_ARB_shader_image_load_store */
-
-/* ------------------------ GL_ARB_shader_image_size ----------------------- */
-
-#ifndef GL_ARB_shader_image_size
-#define GL_ARB_shader_image_size 1
-
-#define GLEW_ARB_shader_image_size GLEW_GET_VAR(__GLEW_ARB_shader_image_size)
-
-#endif /* GL_ARB_shader_image_size */
-
-/* ------------------------- GL_ARB_shader_objects ------------------------- */
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-
-#define GL_PROGRAM_OBJECT_ARB 0x8B40
-#define GL_SHADER_OBJECT_ARB 0x8B48
-#define GL_OBJECT_TYPE_ARB 0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB 0x8B4F
-#define GL_FLOAT_VEC2_ARB 0x8B50
-#define GL_FLOAT_VEC3_ARB 0x8B51
-#define GL_FLOAT_VEC4_ARB 0x8B52
-#define GL_INT_VEC2_ARB 0x8B53
-#define GL_INT_VEC3_ARB 0x8B54
-#define GL_INT_VEC4_ARB 0x8B55
-#define GL_BOOL_ARB 0x8B56
-#define GL_BOOL_VEC2_ARB 0x8B57
-#define GL_BOOL_VEC3_ARB 0x8B58
-#define GL_BOOL_VEC4_ARB 0x8B59
-#define GL_FLOAT_MAT2_ARB 0x8B5A
-#define GL_FLOAT_MAT3_ARB 0x8B5B
-#define GL_FLOAT_MAT4_ARB 0x8B5C
-#define GL_SAMPLER_1D_ARB 0x8B5D
-#define GL_SAMPLER_2D_ARB 0x8B5E
-#define GL_SAMPLER_3D_ARB 0x8B5F
-#define GL_SAMPLER_CUBE_ARB 0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62
-#define GL_SAMPLER_2D_RECT_ARB 0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-
-typedef char GLcharARB;
-typedef unsigned int GLhandleARB;
-
-typedef void (GLAPIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (GLAPIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (GLAPIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef GLhandleARB (GLAPIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (GLAPIENTRY * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef void (GLAPIENTRY * PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (GLAPIENTRY * PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB *obj);
-typedef GLhandleARB (GLAPIENTRY * PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (GLAPIENTRY * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *infoLog);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *source);
-typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint* params);
-typedef void (GLAPIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (GLAPIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint *length);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-
-#define glAttachObjectARB GLEW_GET_FUN(__glewAttachObjectARB)
-#define glCompileShaderARB GLEW_GET_FUN(__glewCompileShaderARB)
-#define glCreateProgramObjectARB GLEW_GET_FUN(__glewCreateProgramObjectARB)
-#define glCreateShaderObjectARB GLEW_GET_FUN(__glewCreateShaderObjectARB)
-#define glDeleteObjectARB GLEW_GET_FUN(__glewDeleteObjectARB)
-#define glDetachObjectARB GLEW_GET_FUN(__glewDetachObjectARB)
-#define glGetActiveUniformARB GLEW_GET_FUN(__glewGetActiveUniformARB)
-#define glGetAttachedObjectsARB GLEW_GET_FUN(__glewGetAttachedObjectsARB)
-#define glGetHandleARB GLEW_GET_FUN(__glewGetHandleARB)
-#define glGetInfoLogARB GLEW_GET_FUN(__glewGetInfoLogARB)
-#define glGetObjectParameterfvARB GLEW_GET_FUN(__glewGetObjectParameterfvARB)
-#define glGetObjectParameterivARB GLEW_GET_FUN(__glewGetObjectParameterivARB)
-#define glGetShaderSourceARB GLEW_GET_FUN(__glewGetShaderSourceARB)
-#define glGetUniformLocationARB GLEW_GET_FUN(__glewGetUniformLocationARB)
-#define glGetUniformfvARB GLEW_GET_FUN(__glewGetUniformfvARB)
-#define glGetUniformivARB GLEW_GET_FUN(__glewGetUniformivARB)
-#define glLinkProgramARB GLEW_GET_FUN(__glewLinkProgramARB)
-#define glShaderSourceARB GLEW_GET_FUN(__glewShaderSourceARB)
-#define glUniform1fARB GLEW_GET_FUN(__glewUniform1fARB)
-#define glUniform1fvARB GLEW_GET_FUN(__glewUniform1fvARB)
-#define glUniform1iARB GLEW_GET_FUN(__glewUniform1iARB)
-#define glUniform1ivARB GLEW_GET_FUN(__glewUniform1ivARB)
-#define glUniform2fARB GLEW_GET_FUN(__glewUniform2fARB)
-#define glUniform2fvARB GLEW_GET_FUN(__glewUniform2fvARB)
-#define glUniform2iARB GLEW_GET_FUN(__glewUniform2iARB)
-#define glUniform2ivARB GLEW_GET_FUN(__glewUniform2ivARB)
-#define glUniform3fARB GLEW_GET_FUN(__glewUniform3fARB)
-#define glUniform3fvARB GLEW_GET_FUN(__glewUniform3fvARB)
-#define glUniform3iARB GLEW_GET_FUN(__glewUniform3iARB)
-#define glUniform3ivARB GLEW_GET_FUN(__glewUniform3ivARB)
-#define glUniform4fARB GLEW_GET_FUN(__glewUniform4fARB)
-#define glUniform4fvARB GLEW_GET_FUN(__glewUniform4fvARB)
-#define glUniform4iARB GLEW_GET_FUN(__glewUniform4iARB)
-#define glUniform4ivARB GLEW_GET_FUN(__glewUniform4ivARB)
-#define glUniformMatrix2fvARB GLEW_GET_FUN(__glewUniformMatrix2fvARB)
-#define glUniformMatrix3fvARB GLEW_GET_FUN(__glewUniformMatrix3fvARB)
-#define glUniformMatrix4fvARB GLEW_GET_FUN(__glewUniformMatrix4fvARB)
-#define glUseProgramObjectARB GLEW_GET_FUN(__glewUseProgramObjectARB)
-#define glValidateProgramARB GLEW_GET_FUN(__glewValidateProgramARB)
-
-#define GLEW_ARB_shader_objects GLEW_GET_VAR(__GLEW_ARB_shader_objects)
-
-#endif /* GL_ARB_shader_objects */
-
-/* ------------------------ GL_ARB_shader_precision ------------------------ */
-
-#ifndef GL_ARB_shader_precision
-#define GL_ARB_shader_precision 1
-
-#define GLEW_ARB_shader_precision GLEW_GET_VAR(__GLEW_ARB_shader_precision)
-
-#endif /* GL_ARB_shader_precision */
-
-/* ---------------------- GL_ARB_shader_stencil_export --------------------- */
-
-#ifndef GL_ARB_shader_stencil_export
-#define GL_ARB_shader_stencil_export 1
-
-#define GLEW_ARB_shader_stencil_export GLEW_GET_VAR(__GLEW_ARB_shader_stencil_export)
-
-#endif /* GL_ARB_shader_stencil_export */
-
-/* ------------------ GL_ARB_shader_storage_buffer_object ------------------ */
-
-#ifndef GL_ARB_shader_storage_buffer_object
-#define GL_ARB_shader_storage_buffer_object 1
-
-#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000
-#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
-#define GL_SHADER_STORAGE_BUFFER 0x90D2
-#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3
-#define GL_SHADER_STORAGE_BUFFER_START 0x90D4
-#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5
-#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
-#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
-#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
-#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
-#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
-#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
-#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
-#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
-#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE
-#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
-
-typedef void (GLAPIENTRY * PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
-
-#define glShaderStorageBlockBinding GLEW_GET_FUN(__glewShaderStorageBlockBinding)
-
-#define GLEW_ARB_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_ARB_shader_storage_buffer_object)
-
-#endif /* GL_ARB_shader_storage_buffer_object */
-
-/* ------------------------ GL_ARB_shader_subroutine ----------------------- */
-
-#ifndef GL_ARB_shader_subroutine
-#define GL_ARB_shader_subroutine 1
-
-#define GL_ACTIVE_SUBROUTINES 0x8DE5
-#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6
-#define GL_MAX_SUBROUTINES 0x8DE7
-#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
-#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
-#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A
-#define GL_COMPATIBLE_SUBROUTINES 0x8E4B
-
-typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name);
-typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name);
-typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint* values);
-typedef GLuint (GLAPIENTRY * PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar* name);
-typedef GLint (GLAPIENTRY * PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint* indices);
-
-#define glGetActiveSubroutineName GLEW_GET_FUN(__glewGetActiveSubroutineName)
-#define glGetActiveSubroutineUniformName GLEW_GET_FUN(__glewGetActiveSubroutineUniformName)
-#define glGetActiveSubroutineUniformiv GLEW_GET_FUN(__glewGetActiveSubroutineUniformiv)
-#define glGetProgramStageiv GLEW_GET_FUN(__glewGetProgramStageiv)
-#define glGetSubroutineIndex GLEW_GET_FUN(__glewGetSubroutineIndex)
-#define glGetSubroutineUniformLocation GLEW_GET_FUN(__glewGetSubroutineUniformLocation)
-#define glGetUniformSubroutineuiv GLEW_GET_FUN(__glewGetUniformSubroutineuiv)
-#define glUniformSubroutinesuiv GLEW_GET_FUN(__glewUniformSubroutinesuiv)
-
-#define GLEW_ARB_shader_subroutine GLEW_GET_VAR(__GLEW_ARB_shader_subroutine)
-
-#endif /* GL_ARB_shader_subroutine */
-
-/* ----------------------- GL_ARB_shader_texture_lod ----------------------- */
-
-#ifndef GL_ARB_shader_texture_lod
-#define GL_ARB_shader_texture_lod 1
-
-#define GLEW_ARB_shader_texture_lod GLEW_GET_VAR(__GLEW_ARB_shader_texture_lod)
-
-#endif /* GL_ARB_shader_texture_lod */
-
-/* ---------------------- GL_ARB_shading_language_100 ---------------------- */
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-
-#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
-
-#define GLEW_ARB_shading_language_100 GLEW_GET_VAR(__GLEW_ARB_shading_language_100)
-
-#endif /* GL_ARB_shading_language_100 */
-
-/* -------------------- GL_ARB_shading_language_420pack -------------------- */
-
-#ifndef GL_ARB_shading_language_420pack
-#define GL_ARB_shading_language_420pack 1
-
-#define GLEW_ARB_shading_language_420pack GLEW_GET_VAR(__GLEW_ARB_shading_language_420pack)
-
-#endif /* GL_ARB_shading_language_420pack */
-
-/* -------------------- GL_ARB_shading_language_include -------------------- */
-
-#ifndef GL_ARB_shading_language_include
-#define GL_ARB_shading_language_include 1
-
-#define GL_SHADER_INCLUDE_ARB 0x8DAE
-#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9
-#define GL_NAMED_STRING_TYPE_ARB 0x8DEA
-
-typedef void (GLAPIENTRY * PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar ** path, const GLint *length);
-typedef void (GLAPIENTRY * PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar* name, GLenum pname, GLint *params);
-typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name);
-typedef void (GLAPIENTRY * PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar *string);
-
-#define glCompileShaderIncludeARB GLEW_GET_FUN(__glewCompileShaderIncludeARB)
-#define glDeleteNamedStringARB GLEW_GET_FUN(__glewDeleteNamedStringARB)
-#define glGetNamedStringARB GLEW_GET_FUN(__glewGetNamedStringARB)
-#define glGetNamedStringivARB GLEW_GET_FUN(__glewGetNamedStringivARB)
-#define glIsNamedStringARB GLEW_GET_FUN(__glewIsNamedStringARB)
-#define glNamedStringARB GLEW_GET_FUN(__glewNamedStringARB)
-
-#define GLEW_ARB_shading_language_include GLEW_GET_VAR(__GLEW_ARB_shading_language_include)
-
-#endif /* GL_ARB_shading_language_include */
-
-/* -------------------- GL_ARB_shading_language_packing -------------------- */
-
-#ifndef GL_ARB_shading_language_packing
-#define GL_ARB_shading_language_packing 1
-
-#define GLEW_ARB_shading_language_packing GLEW_GET_VAR(__GLEW_ARB_shading_language_packing)
-
-#endif /* GL_ARB_shading_language_packing */
-
-/* ----------------------------- GL_ARB_shadow ----------------------------- */
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-
-#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E
-
-#define GLEW_ARB_shadow GLEW_GET_VAR(__GLEW_ARB_shadow)
-
-#endif /* GL_ARB_shadow */
-
-/* ------------------------- GL_ARB_shadow_ambient ------------------------- */
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-
-#define GLEW_ARB_shadow_ambient GLEW_GET_VAR(__GLEW_ARB_shadow_ambient)
-
-#endif /* GL_ARB_shadow_ambient */
-
-/* ------------------------ GL_ARB_stencil_texturing ----------------------- */
-
-#ifndef GL_ARB_stencil_texturing
-#define GL_ARB_stencil_texturing 1
-
-#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA
-
-#define GLEW_ARB_stencil_texturing GLEW_GET_VAR(__GLEW_ARB_stencil_texturing)
-
-#endif /* GL_ARB_stencil_texturing */
-
-/* ------------------------------ GL_ARB_sync ------------------------------ */
-
-#ifndef GL_ARB_sync
-#define GL_ARB_sync 1
-
-#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001
-#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111
-#define GL_OBJECT_TYPE 0x9112
-#define GL_SYNC_CONDITION 0x9113
-#define GL_SYNC_STATUS 0x9114
-#define GL_SYNC_FLAGS 0x9115
-#define GL_SYNC_FENCE 0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
-#define GL_UNSIGNALED 0x9118
-#define GL_SIGNALED 0x9119
-#define GL_ALREADY_SIGNALED 0x911A
-#define GL_TIMEOUT_EXPIRED 0x911B
-#define GL_CONDITION_SATISFIED 0x911C
-#define GL_WAIT_FAILED 0x911D
-#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF
-
-typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
-typedef void (GLAPIENTRY * PFNGLDELETESYNCPROC) (GLsync GLsync);
-typedef GLsync (GLAPIENTRY * PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags);
-typedef void (GLAPIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64* params);
-typedef void (GLAPIENTRY * PFNGLGETSYNCIVPROC) (GLsync GLsync,GLenum pname,GLsizei bufSize,GLsizei* length, GLint *values);
-typedef GLboolean (GLAPIENTRY * PFNGLISSYNCPROC) (GLsync GLsync);
-typedef void (GLAPIENTRY * PFNGLWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
-
-#define glClientWaitSync GLEW_GET_FUN(__glewClientWaitSync)
-#define glDeleteSync GLEW_GET_FUN(__glewDeleteSync)
-#define glFenceSync GLEW_GET_FUN(__glewFenceSync)
-#define glGetInteger64v GLEW_GET_FUN(__glewGetInteger64v)
-#define glGetSynciv GLEW_GET_FUN(__glewGetSynciv)
-#define glIsSync GLEW_GET_FUN(__glewIsSync)
-#define glWaitSync GLEW_GET_FUN(__glewWaitSync)
-
-#define GLEW_ARB_sync GLEW_GET_VAR(__GLEW_ARB_sync)
-
-#endif /* GL_ARB_sync */
-
-/* ----------------------- GL_ARB_tessellation_shader ---------------------- */
-
-#ifndef GL_ARB_tessellation_shader
-#define GL_ARB_tessellation_shader 1
-
-#define GL_PATCHES 0xE
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
-#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
-#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
-#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
-#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
-#define GL_PATCH_VERTICES 0x8E72
-#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73
-#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74
-#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75
-#define GL_TESS_GEN_MODE 0x8E76
-#define GL_TESS_GEN_SPACING 0x8E77
-#define GL_TESS_GEN_VERTEX_ORDER 0x8E78
-#define GL_TESS_GEN_POINT_MODE 0x8E79
-#define GL_ISOLINES 0x8E7A
-#define GL_FRACTIONAL_ODD 0x8E7B
-#define GL_FRACTIONAL_EVEN 0x8E7C
-#define GL_MAX_PATCH_VERTICES 0x8E7D
-#define GL_MAX_TESS_GEN_LEVEL 0x8E7E
-#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
-#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
-#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
-#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
-#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
-#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84
-#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
-#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
-#define GL_TESS_EVALUATION_SHADER 0x8E87
-#define GL_TESS_CONTROL_SHADER 0x8E88
-#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
-#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
-
-typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat* values);
-typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
-
-#define glPatchParameterfv GLEW_GET_FUN(__glewPatchParameterfv)
-#define glPatchParameteri GLEW_GET_FUN(__glewPatchParameteri)
-
-#define GLEW_ARB_tessellation_shader GLEW_GET_VAR(__GLEW_ARB_tessellation_shader)
-
-#endif /* GL_ARB_tessellation_shader */
-
-/* ---------------------- GL_ARB_texture_border_clamp ---------------------- */
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-
-#define GL_CLAMP_TO_BORDER_ARB 0x812D
-
-#define GLEW_ARB_texture_border_clamp GLEW_GET_VAR(__GLEW_ARB_texture_border_clamp)
-
-#endif /* GL_ARB_texture_border_clamp */
-
-/* ---------------------- GL_ARB_texture_buffer_object --------------------- */
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_ARB_texture_buffer_object 1
-
-#define GL_TEXTURE_BUFFER_ARB 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E
-
-typedef void (GLAPIENTRY * PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-
-#define glTexBufferARB GLEW_GET_FUN(__glewTexBufferARB)
-
-#define GLEW_ARB_texture_buffer_object GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object)
-
-#endif /* GL_ARB_texture_buffer_object */
-
-/* ------------------- GL_ARB_texture_buffer_object_rgb32 ------------------ */
-
-#ifndef GL_ARB_texture_buffer_object_rgb32
-#define GL_ARB_texture_buffer_object_rgb32 1
-
-#define GLEW_ARB_texture_buffer_object_rgb32 GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object_rgb32)
-
-#endif /* GL_ARB_texture_buffer_object_rgb32 */
-
-/* ---------------------- GL_ARB_texture_buffer_range ---------------------- */
-
-#ifndef GL_ARB_texture_buffer_range
-#define GL_ARB_texture_buffer_range 1
-
-#define GL_TEXTURE_BUFFER_OFFSET 0x919D
-#define GL_TEXTURE_BUFFER_SIZE 0x919E
-#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
-
-typedef void (GLAPIENTRY * PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-
-#define glTexBufferRange GLEW_GET_FUN(__glewTexBufferRange)
-#define glTextureBufferRangeEXT GLEW_GET_FUN(__glewTextureBufferRangeEXT)
-
-#define GLEW_ARB_texture_buffer_range GLEW_GET_VAR(__GLEW_ARB_texture_buffer_range)
-
-#endif /* GL_ARB_texture_buffer_range */
-
-/* ----------------------- GL_ARB_texture_compression ---------------------- */
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-
-#define GL_COMPRESSED_ALPHA_ARB 0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
-#define GL_COMPRESSED_RGB_ARB 0x84ED
-#define GL_COMPRESSED_RGBA_ARB 0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, void* img);
-
-#define glCompressedTexImage1DARB GLEW_GET_FUN(__glewCompressedTexImage1DARB)
-#define glCompressedTexImage2DARB GLEW_GET_FUN(__glewCompressedTexImage2DARB)
-#define glCompressedTexImage3DARB GLEW_GET_FUN(__glewCompressedTexImage3DARB)
-#define glCompressedTexSubImage1DARB GLEW_GET_FUN(__glewCompressedTexSubImage1DARB)
-#define glCompressedTexSubImage2DARB GLEW_GET_FUN(__glewCompressedTexSubImage2DARB)
-#define glCompressedTexSubImage3DARB GLEW_GET_FUN(__glewCompressedTexSubImage3DARB)
-#define glGetCompressedTexImageARB GLEW_GET_FUN(__glewGetCompressedTexImageARB)
-
-#define GLEW_ARB_texture_compression GLEW_GET_VAR(__GLEW_ARB_texture_compression)
-
-#endif /* GL_ARB_texture_compression */
-
-/* -------------------- GL_ARB_texture_compression_bptc -------------------- */
-
-#ifndef GL_ARB_texture_compression_bptc
-#define GL_ARB_texture_compression_bptc 1
-
-#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
-#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
-#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
-#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
-
-#define GLEW_ARB_texture_compression_bptc GLEW_GET_VAR(__GLEW_ARB_texture_compression_bptc)
-
-#endif /* GL_ARB_texture_compression_bptc */
-
-/* -------------------- GL_ARB_texture_compression_rgtc -------------------- */
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_ARB_texture_compression_rgtc 1
-
-#define GL_COMPRESSED_RED_RGTC1 0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
-#define GL_COMPRESSED_RG_RGTC2 0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE
-
-#define GLEW_ARB_texture_compression_rgtc GLEW_GET_VAR(__GLEW_ARB_texture_compression_rgtc)
-
-#endif /* GL_ARB_texture_compression_rgtc */
-
-/* ------------------------ GL_ARB_texture_cube_map ------------------------ */
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-
-#define GL_NORMAL_MAP_ARB 0x8511
-#define GL_REFLECTION_MAP_ARB 0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
-
-#define GLEW_ARB_texture_cube_map GLEW_GET_VAR(__GLEW_ARB_texture_cube_map)
-
-#endif /* GL_ARB_texture_cube_map */
-
-/* --------------------- GL_ARB_texture_cube_map_array --------------------- */
-
-#ifndef GL_ARB_texture_cube_map_array
-#define GL_ARB_texture_cube_map_array 1
-
-#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
-
-#define GLEW_ARB_texture_cube_map_array GLEW_GET_VAR(__GLEW_ARB_texture_cube_map_array)
-
-#endif /* GL_ARB_texture_cube_map_array */
-
-/* ------------------------- GL_ARB_texture_env_add ------------------------ */
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-
-#define GLEW_ARB_texture_env_add GLEW_GET_VAR(__GLEW_ARB_texture_env_add)
-
-#endif /* GL_ARB_texture_env_add */
-
-/* ----------------------- GL_ARB_texture_env_combine ---------------------- */
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-
-#define GL_SUBTRACT_ARB 0x84E7
-#define GL_COMBINE_ARB 0x8570
-#define GL_COMBINE_RGB_ARB 0x8571
-#define GL_COMBINE_ALPHA_ARB 0x8572
-#define GL_RGB_SCALE_ARB 0x8573
-#define GL_ADD_SIGNED_ARB 0x8574
-#define GL_INTERPOLATE_ARB 0x8575
-#define GL_CONSTANT_ARB 0x8576
-#define GL_PRIMARY_COLOR_ARB 0x8577
-#define GL_PREVIOUS_ARB 0x8578
-#define GL_SOURCE0_RGB_ARB 0x8580
-#define GL_SOURCE1_RGB_ARB 0x8581
-#define GL_SOURCE2_RGB_ARB 0x8582
-#define GL_SOURCE0_ALPHA_ARB 0x8588
-#define GL_SOURCE1_ALPHA_ARB 0x8589
-#define GL_SOURCE2_ALPHA_ARB 0x858A
-#define GL_OPERAND0_RGB_ARB 0x8590
-#define GL_OPERAND1_RGB_ARB 0x8591
-#define GL_OPERAND2_RGB_ARB 0x8592
-#define GL_OPERAND0_ALPHA_ARB 0x8598
-#define GL_OPERAND1_ALPHA_ARB 0x8599
-#define GL_OPERAND2_ALPHA_ARB 0x859A
-
-#define GLEW_ARB_texture_env_combine GLEW_GET_VAR(__GLEW_ARB_texture_env_combine)
-
-#endif /* GL_ARB_texture_env_combine */
-
-/* ---------------------- GL_ARB_texture_env_crossbar ---------------------- */
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-
-#define GLEW_ARB_texture_env_crossbar GLEW_GET_VAR(__GLEW_ARB_texture_env_crossbar)
-
-#endif /* GL_ARB_texture_env_crossbar */
-
-/* ------------------------ GL_ARB_texture_env_dot3 ------------------------ */
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-
-#define GL_DOT3_RGB_ARB 0x86AE
-#define GL_DOT3_RGBA_ARB 0x86AF
-
-#define GLEW_ARB_texture_env_dot3 GLEW_GET_VAR(__GLEW_ARB_texture_env_dot3)
-
-#endif /* GL_ARB_texture_env_dot3 */
-
-/* -------------------------- GL_ARB_texture_float ------------------------- */
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-
-#define GL_RGBA32F_ARB 0x8814
-#define GL_RGB32F_ARB 0x8815
-#define GL_ALPHA32F_ARB 0x8816
-#define GL_INTENSITY32F_ARB 0x8817
-#define GL_LUMINANCE32F_ARB 0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB 0x8819
-#define GL_RGBA16F_ARB 0x881A
-#define GL_RGB16F_ARB 0x881B
-#define GL_ALPHA16F_ARB 0x881C
-#define GL_INTENSITY16F_ARB 0x881D
-#define GL_LUMINANCE16F_ARB 0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB 0x881F
-#define GL_TEXTURE_RED_TYPE_ARB 0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17
-
-#define GLEW_ARB_texture_float GLEW_GET_VAR(__GLEW_ARB_texture_float)
-
-#endif /* GL_ARB_texture_float */
-
-/* ------------------------- GL_ARB_texture_gather ------------------------- */
-
-#ifndef GL_ARB_texture_gather
-#define GL_ARB_texture_gather 1
-
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
-
-#define GLEW_ARB_texture_gather GLEW_GET_VAR(__GLEW_ARB_texture_gather)
-
-#endif /* GL_ARB_texture_gather */
-
-/* --------------------- GL_ARB_texture_mirrored_repeat -------------------- */
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-
-#define GL_MIRRORED_REPEAT_ARB 0x8370
-
-#define GLEW_ARB_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_ARB_texture_mirrored_repeat)
-
-#endif /* GL_ARB_texture_mirrored_repeat */
-
-/* ----------------------- GL_ARB_texture_multisample ---------------------- */
-
-#ifndef GL_ARB_texture_multisample
-#define GL_ARB_texture_multisample 1
-
-#define GL_SAMPLE_POSITION 0x8E50
-#define GL_SAMPLE_MASK 0x8E51
-#define GL_SAMPLE_MASK_VALUE 0x8E52
-#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59
-#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
-#define GL_TEXTURE_SAMPLES 0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE 0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
-#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F
-#define GL_MAX_INTEGER_SAMPLES 0x9110
-
-typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat* val);
-typedef void (GLAPIENTRY * PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-
-#define glGetMultisamplefv GLEW_GET_FUN(__glewGetMultisamplefv)
-#define glSampleMaski GLEW_GET_FUN(__glewSampleMaski)
-#define glTexImage2DMultisample GLEW_GET_FUN(__glewTexImage2DMultisample)
-#define glTexImage3DMultisample GLEW_GET_FUN(__glewTexImage3DMultisample)
-
-#define GLEW_ARB_texture_multisample GLEW_GET_VAR(__GLEW_ARB_texture_multisample)
-
-#endif /* GL_ARB_texture_multisample */
-
-/* -------------------- GL_ARB_texture_non_power_of_two -------------------- */
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-
-#define GLEW_ARB_texture_non_power_of_two GLEW_GET_VAR(__GLEW_ARB_texture_non_power_of_two)
-
-#endif /* GL_ARB_texture_non_power_of_two */
-
-/* ---------------------- GL_ARB_texture_query_levels ---------------------- */
-
-#ifndef GL_ARB_texture_query_levels
-#define GL_ARB_texture_query_levels 1
-
-#define GLEW_ARB_texture_query_levels GLEW_GET_VAR(__GLEW_ARB_texture_query_levels)
-
-#endif /* GL_ARB_texture_query_levels */
-
-/* ------------------------ GL_ARB_texture_query_lod ----------------------- */
-
-#ifndef GL_ARB_texture_query_lod
-#define GL_ARB_texture_query_lod 1
-
-#define GLEW_ARB_texture_query_lod GLEW_GET_VAR(__GLEW_ARB_texture_query_lod)
-
-#endif /* GL_ARB_texture_query_lod */
-
-/* ------------------------ GL_ARB_texture_rectangle ----------------------- */
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-
-#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#define GL_SAMPLER_2D_RECT_ARB 0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
-
-#define GLEW_ARB_texture_rectangle GLEW_GET_VAR(__GLEW_ARB_texture_rectangle)
-
-#endif /* GL_ARB_texture_rectangle */
-
-/* --------------------------- GL_ARB_texture_rg --------------------------- */
-
-#ifndef GL_ARB_texture_rg
-#define GL_ARB_texture_rg 1
-
-#define GL_COMPRESSED_RED 0x8225
-#define GL_COMPRESSED_RG 0x8226
-#define GL_RG 0x8227
-#define GL_RG_INTEGER 0x8228
-#define GL_R8 0x8229
-#define GL_R16 0x822A
-#define GL_RG8 0x822B
-#define GL_RG16 0x822C
-#define GL_R16F 0x822D
-#define GL_R32F 0x822E
-#define GL_RG16F 0x822F
-#define GL_RG32F 0x8230
-#define GL_R8I 0x8231
-#define GL_R8UI 0x8232
-#define GL_R16I 0x8233
-#define GL_R16UI 0x8234
-#define GL_R32I 0x8235
-#define GL_R32UI 0x8236
-#define GL_RG8I 0x8237
-#define GL_RG8UI 0x8238
-#define GL_RG16I 0x8239
-#define GL_RG16UI 0x823A
-#define GL_RG32I 0x823B
-#define GL_RG32UI 0x823C
-
-#define GLEW_ARB_texture_rg GLEW_GET_VAR(__GLEW_ARB_texture_rg)
-
-#endif /* GL_ARB_texture_rg */
-
-/* ----------------------- GL_ARB_texture_rgb10_a2ui ----------------------- */
-
-#ifndef GL_ARB_texture_rgb10_a2ui
-#define GL_ARB_texture_rgb10_a2ui 1
-
-#define GL_RGB10_A2UI 0x906F
-
-#define GLEW_ARB_texture_rgb10_a2ui GLEW_GET_VAR(__GLEW_ARB_texture_rgb10_a2ui)
-
-#endif /* GL_ARB_texture_rgb10_a2ui */
-
-/* ------------------------- GL_ARB_texture_storage ------------------------ */
-
-#ifndef GL_ARB_texture_storage
-#define GL_ARB_texture_storage 1
-
-#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F
-
-typedef void (GLAPIENTRY * PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-
-#define glTexStorage1D GLEW_GET_FUN(__glewTexStorage1D)
-#define glTexStorage2D GLEW_GET_FUN(__glewTexStorage2D)
-#define glTexStorage3D GLEW_GET_FUN(__glewTexStorage3D)
-#define glTextureStorage1DEXT GLEW_GET_FUN(__glewTextureStorage1DEXT)
-#define glTextureStorage2DEXT GLEW_GET_FUN(__glewTextureStorage2DEXT)
-#define glTextureStorage3DEXT GLEW_GET_FUN(__glewTextureStorage3DEXT)
-
-#define GLEW_ARB_texture_storage GLEW_GET_VAR(__GLEW_ARB_texture_storage)
-
-#endif /* GL_ARB_texture_storage */
-
-/* ------------------- GL_ARB_texture_storage_multisample ------------------ */
-
-#ifndef GL_ARB_texture_storage_multisample
-#define GL_ARB_texture_storage_multisample 1
-
-typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-
-#define glTexStorage2DMultisample GLEW_GET_FUN(__glewTexStorage2DMultisample)
-#define glTexStorage3DMultisample GLEW_GET_FUN(__glewTexStorage3DMultisample)
-#define glTextureStorage2DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage2DMultisampleEXT)
-#define glTextureStorage3DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage3DMultisampleEXT)
-
-#define GLEW_ARB_texture_storage_multisample GLEW_GET_VAR(__GLEW_ARB_texture_storage_multisample)
-
-#endif /* GL_ARB_texture_storage_multisample */
-
-/* ------------------------- GL_ARB_texture_swizzle ------------------------ */
-
-#ifndef GL_ARB_texture_swizzle
-#define GL_ARB_texture_swizzle 1
-
-#define GL_TEXTURE_SWIZZLE_R 0x8E42
-#define GL_TEXTURE_SWIZZLE_G 0x8E43
-#define GL_TEXTURE_SWIZZLE_B 0x8E44
-#define GL_TEXTURE_SWIZZLE_A 0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
-
-#define GLEW_ARB_texture_swizzle GLEW_GET_VAR(__GLEW_ARB_texture_swizzle)
-
-#endif /* GL_ARB_texture_swizzle */
-
-/* -------------------------- GL_ARB_texture_view -------------------------- */
-
-#ifndef GL_ARB_texture_view
-#define GL_ARB_texture_view 1
-
-#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB
-#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC
-#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD
-#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE
-#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF
-
-typedef void (GLAPIENTRY * PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-
-#define glTextureView GLEW_GET_FUN(__glewTextureView)
-
-#define GLEW_ARB_texture_view GLEW_GET_VAR(__GLEW_ARB_texture_view)
-
-#endif /* GL_ARB_texture_view */
-
-/* --------------------------- GL_ARB_timer_query -------------------------- */
-
-#ifndef GL_ARB_timer_query
-#define GL_ARB_timer_query 1
-
-#define GL_TIME_ELAPSED 0x88BF
-#define GL_TIMESTAMP 0x8E28
-
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64* params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64* params);
-typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
-
-#define glGetQueryObjecti64v GLEW_GET_FUN(__glewGetQueryObjecti64v)
-#define glGetQueryObjectui64v GLEW_GET_FUN(__glewGetQueryObjectui64v)
-#define glQueryCounter GLEW_GET_FUN(__glewQueryCounter)
-
-#define GLEW_ARB_timer_query GLEW_GET_VAR(__GLEW_ARB_timer_query)
-
-#endif /* GL_ARB_timer_query */
-
-/* ----------------------- GL_ARB_transform_feedback2 ---------------------- */
-
-#ifndef GL_ARB_transform_feedback2
-#define GL_ARB_transform_feedback2 1
-
-#define GL_TRANSFORM_FEEDBACK 0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25
-
-typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
-typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids);
-typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
-typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
-
-#define glBindTransformFeedback GLEW_GET_FUN(__glewBindTransformFeedback)
-#define glDeleteTransformFeedbacks GLEW_GET_FUN(__glewDeleteTransformFeedbacks)
-#define glDrawTransformFeedback GLEW_GET_FUN(__glewDrawTransformFeedback)
-#define glGenTransformFeedbacks GLEW_GET_FUN(__glewGenTransformFeedbacks)
-#define glIsTransformFeedback GLEW_GET_FUN(__glewIsTransformFeedback)
-#define glPauseTransformFeedback GLEW_GET_FUN(__glewPauseTransformFeedback)
-#define glResumeTransformFeedback GLEW_GET_FUN(__glewResumeTransformFeedback)
-
-#define GLEW_ARB_transform_feedback2 GLEW_GET_VAR(__GLEW_ARB_transform_feedback2)
-
-#endif /* GL_ARB_transform_feedback2 */
-
-/* ----------------------- GL_ARB_transform_feedback3 ---------------------- */
-
-#ifndef GL_ARB_transform_feedback3
-#define GL_ARB_transform_feedback3 1
-
-#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
-#define GL_MAX_VERTEX_STREAMS 0x8E71
-
-typedef void (GLAPIENTRY * PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
-typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
-typedef void (GLAPIENTRY * PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
-typedef void (GLAPIENTRY * PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params);
-
-#define glBeginQueryIndexed GLEW_GET_FUN(__glewBeginQueryIndexed)
-#define glDrawTransformFeedbackStream GLEW_GET_FUN(__glewDrawTransformFeedbackStream)
-#define glEndQueryIndexed GLEW_GET_FUN(__glewEndQueryIndexed)
-#define glGetQueryIndexediv GLEW_GET_FUN(__glewGetQueryIndexediv)
-
-#define GLEW_ARB_transform_feedback3 GLEW_GET_VAR(__GLEW_ARB_transform_feedback3)
-
-#endif /* GL_ARB_transform_feedback3 */
-
-/* ------------------ GL_ARB_transform_feedback_instanced ------------------ */
-
-#ifndef GL_ARB_transform_feedback_instanced
-#define GL_ARB_transform_feedback_instanced 1
-
-typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei primcount);
-
-#define glDrawTransformFeedbackInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackInstanced)
-#define glDrawTransformFeedbackStreamInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackStreamInstanced)
-
-#define GLEW_ARB_transform_feedback_instanced GLEW_GET_VAR(__GLEW_ARB_transform_feedback_instanced)
-
-#endif /* GL_ARB_transform_feedback_instanced */
-
-/* ------------------------ GL_ARB_transpose_matrix ------------------------ */
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
-
-typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
-typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
-typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
-typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
-
-#define glLoadTransposeMatrixdARB GLEW_GET_FUN(__glewLoadTransposeMatrixdARB)
-#define glLoadTransposeMatrixfARB GLEW_GET_FUN(__glewLoadTransposeMatrixfARB)
-#define glMultTransposeMatrixdARB GLEW_GET_FUN(__glewMultTransposeMatrixdARB)
-#define glMultTransposeMatrixfARB GLEW_GET_FUN(__glewMultTransposeMatrixfARB)
-
-#define GLEW_ARB_transpose_matrix GLEW_GET_VAR(__GLEW_ARB_transpose_matrix)
-
-#endif /* GL_ARB_transpose_matrix */
-
-/* ---------------------- GL_ARB_uniform_buffer_object --------------------- */
-
-#ifndef GL_ARB_uniform_buffer_object
-#define GL_ARB_uniform_buffer_object 1
-
-#define GL_UNIFORM_BUFFER 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING 0x8A28
-#define GL_UNIFORM_BUFFER_START 0x8A29
-#define GL_UNIFORM_BUFFER_SIZE 0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36
-#define GL_UNIFORM_TYPE 0x8A37
-#define GL_UNIFORM_SIZE 0x8A38
-#define GL_UNIFORM_NAME_LENGTH 0x8A39
-#define GL_UNIFORM_BLOCK_INDEX 0x8A3A
-#define GL_UNIFORM_OFFSET 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING 0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-#define GL_INVALID_INDEX 0xFFFFFFFF
-
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint* data);
-typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar** uniformNames, GLuint* uniformIndices);
-typedef void (GLAPIENTRY * PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-
-#define glBindBufferBase GLEW_GET_FUN(__glewBindBufferBase)
-#define glBindBufferRange GLEW_GET_FUN(__glewBindBufferRange)
-#define glGetActiveUniformBlockName GLEW_GET_FUN(__glewGetActiveUniformBlockName)
-#define glGetActiveUniformBlockiv GLEW_GET_FUN(__glewGetActiveUniformBlockiv)
-#define glGetActiveUniformName GLEW_GET_FUN(__glewGetActiveUniformName)
-#define glGetActiveUniformsiv GLEW_GET_FUN(__glewGetActiveUniformsiv)
-#define glGetIntegeri_v GLEW_GET_FUN(__glewGetIntegeri_v)
-#define glGetUniformBlockIndex GLEW_GET_FUN(__glewGetUniformBlockIndex)
-#define glGetUniformIndices GLEW_GET_FUN(__glewGetUniformIndices)
-#define glUniformBlockBinding GLEW_GET_FUN(__glewUniformBlockBinding)
-
-#define GLEW_ARB_uniform_buffer_object GLEW_GET_VAR(__GLEW_ARB_uniform_buffer_object)
-
-#endif /* GL_ARB_uniform_buffer_object */
-
-/* ------------------------ GL_ARB_vertex_array_bgra ----------------------- */
-
-#ifndef GL_ARB_vertex_array_bgra
-#define GL_ARB_vertex_array_bgra 1
-
-#define GL_BGRA 0x80E1
-
-#define GLEW_ARB_vertex_array_bgra GLEW_GET_VAR(__GLEW_ARB_vertex_array_bgra)
-
-#endif /* GL_ARB_vertex_array_bgra */
-
-/* ----------------------- GL_ARB_vertex_array_object ---------------------- */
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-
-#define GL_VERTEX_ARRAY_BINDING 0x85B5
-
-typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays);
-typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
-typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYPROC) (GLuint array);
-
-#define glBindVertexArray GLEW_GET_FUN(__glewBindVertexArray)
-#define glDeleteVertexArrays GLEW_GET_FUN(__glewDeleteVertexArrays)
-#define glGenVertexArrays GLEW_GET_FUN(__glewGenVertexArrays)
-#define glIsVertexArray GLEW_GET_FUN(__glewIsVertexArray)
-
-#define GLEW_ARB_vertex_array_object GLEW_GET_VAR(__GLEW_ARB_vertex_array_object)
-
-#endif /* GL_ARB_vertex_array_object */
-
-/* ----------------------- GL_ARB_vertex_attrib_64bit ---------------------- */
-
-#ifndef GL_ARB_vertex_attrib_64bit
-#define GL_ARB_vertex_attrib_64bit 1
-
-#define GL_DOUBLE_MAT2 0x8F46
-#define GL_DOUBLE_MAT3 0x8F47
-#define GL_DOUBLE_MAT4 0x8F48
-#define GL_DOUBLE_VEC2 0x8FFC
-#define GL_DOUBLE_VEC3 0x8FFD
-#define GL_DOUBLE_VEC4 0x8FFE
-
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer);
-
-#define glGetVertexAttribLdv GLEW_GET_FUN(__glewGetVertexAttribLdv)
-#define glVertexAttribL1d GLEW_GET_FUN(__glewVertexAttribL1d)
-#define glVertexAttribL1dv GLEW_GET_FUN(__glewVertexAttribL1dv)
-#define glVertexAttribL2d GLEW_GET_FUN(__glewVertexAttribL2d)
-#define glVertexAttribL2dv GLEW_GET_FUN(__glewVertexAttribL2dv)
-#define glVertexAttribL3d GLEW_GET_FUN(__glewVertexAttribL3d)
-#define glVertexAttribL3dv GLEW_GET_FUN(__glewVertexAttribL3dv)
-#define glVertexAttribL4d GLEW_GET_FUN(__glewVertexAttribL4d)
-#define glVertexAttribL4dv GLEW_GET_FUN(__glewVertexAttribL4dv)
-#define glVertexAttribLPointer GLEW_GET_FUN(__glewVertexAttribLPointer)
-
-#define GLEW_ARB_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_64bit)
-
-#endif /* GL_ARB_vertex_attrib_64bit */
-
-/* ---------------------- GL_ARB_vertex_attrib_binding --------------------- */
-
-#ifndef GL_ARB_vertex_attrib_binding
-#define GL_ARB_vertex_attrib_binding 1
-
-#define GL_VERTEX_ATTRIB_BINDING 0x82D4
-#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5
-#define GL_VERTEX_BINDING_DIVISOR 0x82D6
-#define GL_VERTEX_BINDING_OFFSET 0x82D7
-#define GL_VERTEX_BINDING_STRIDE 0x82D8
-#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
-#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA
-
-typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-typedef void (GLAPIENTRY * PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
-
-#define glBindVertexBuffer GLEW_GET_FUN(__glewBindVertexBuffer)
-#define glVertexAttribBinding GLEW_GET_FUN(__glewVertexAttribBinding)
-#define glVertexAttribFormat GLEW_GET_FUN(__glewVertexAttribFormat)
-#define glVertexAttribIFormat GLEW_GET_FUN(__glewVertexAttribIFormat)
-#define glVertexAttribLFormat GLEW_GET_FUN(__glewVertexAttribLFormat)
-#define glVertexBindingDivisor GLEW_GET_FUN(__glewVertexBindingDivisor)
-
-#define GLEW_ARB_vertex_attrib_binding GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_binding)
-
-#endif /* GL_ARB_vertex_attrib_binding */
-
-/* -------------------------- GL_ARB_vertex_blend -------------------------- */
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-
-#define GL_MODELVIEW0_ARB 0x1700
-#define GL_MODELVIEW1_ARB 0x850A
-#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
-#define GL_VERTEX_BLEND_ARB 0x86A7
-#define GL_CURRENT_WEIGHT_ARB 0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
-#define GL_WEIGHT_ARRAY_ARB 0x86AD
-#define GL_MODELVIEW2_ARB 0x8722
-#define GL_MODELVIEW3_ARB 0x8723
-#define GL_MODELVIEW4_ARB 0x8724
-#define GL_MODELVIEW5_ARB 0x8725
-#define GL_MODELVIEW6_ARB 0x8726
-#define GL_MODELVIEW7_ARB 0x8727
-#define GL_MODELVIEW8_ARB 0x8728
-#define GL_MODELVIEW9_ARB 0x8729
-#define GL_MODELVIEW10_ARB 0x872A
-#define GL_MODELVIEW11_ARB 0x872B
-#define GL_MODELVIEW12_ARB 0x872C
-#define GL_MODELVIEW13_ARB 0x872D
-#define GL_MODELVIEW14_ARB 0x872E
-#define GL_MODELVIEW15_ARB 0x872F
-#define GL_MODELVIEW16_ARB 0x8730
-#define GL_MODELVIEW17_ARB 0x8731
-#define GL_MODELVIEW18_ARB 0x8732
-#define GL_MODELVIEW19_ARB 0x8733
-#define GL_MODELVIEW20_ARB 0x8734
-#define GL_MODELVIEW21_ARB 0x8735
-#define GL_MODELVIEW22_ARB 0x8736
-#define GL_MODELVIEW23_ARB 0x8737
-#define GL_MODELVIEW24_ARB 0x8738
-#define GL_MODELVIEW25_ARB 0x8739
-#define GL_MODELVIEW26_ARB 0x873A
-#define GL_MODELVIEW27_ARB 0x873B
-#define GL_MODELVIEW28_ARB 0x873C
-#define GL_MODELVIEW29_ARB 0x873D
-#define GL_MODELVIEW30_ARB 0x873E
-#define GL_MODELVIEW31_ARB 0x873F
-
-typedef void (GLAPIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count);
-typedef void (GLAPIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
-typedef void (GLAPIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, GLbyte *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, GLdouble *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, GLfloat *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, GLint *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, GLshort *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, GLubyte *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, GLuint *weights);
-typedef void (GLAPIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, GLushort *weights);
-
-#define glVertexBlendARB GLEW_GET_FUN(__glewVertexBlendARB)
-#define glWeightPointerARB GLEW_GET_FUN(__glewWeightPointerARB)
-#define glWeightbvARB GLEW_GET_FUN(__glewWeightbvARB)
-#define glWeightdvARB GLEW_GET_FUN(__glewWeightdvARB)
-#define glWeightfvARB GLEW_GET_FUN(__glewWeightfvARB)
-#define glWeightivARB GLEW_GET_FUN(__glewWeightivARB)
-#define glWeightsvARB GLEW_GET_FUN(__glewWeightsvARB)
-#define glWeightubvARB GLEW_GET_FUN(__glewWeightubvARB)
-#define glWeightuivARB GLEW_GET_FUN(__glewWeightuivARB)
-#define glWeightusvARB GLEW_GET_FUN(__glewWeightusvARB)
-
-#define GLEW_ARB_vertex_blend GLEW_GET_VAR(__GLEW_ARB_vertex_blend)
-
-#endif /* GL_ARB_vertex_blend */
-
-/* ---------------------- GL_ARB_vertex_buffer_object ---------------------- */
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-
-#define GL_BUFFER_SIZE_ARB 0x8764
-#define GL_BUFFER_USAGE_ARB 0x8765
-#define GL_ARRAY_BUFFER_ARB 0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB 0x88B8
-#define GL_WRITE_ONLY_ARB 0x88B9
-#define GL_READ_WRITE_ARB 0x88BA
-#define GL_BUFFER_ACCESS_ARB 0x88BB
-#define GL_BUFFER_MAPPED_ARB 0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB 0x88BD
-#define GL_STREAM_DRAW_ARB 0x88E0
-#define GL_STREAM_READ_ARB 0x88E1
-#define GL_STREAM_COPY_ARB 0x88E2
-#define GL_STATIC_DRAW_ARB 0x88E4
-#define GL_STATIC_READ_ARB 0x88E5
-#define GL_STATIC_COPY_ARB 0x88E6
-#define GL_DYNAMIC_DRAW_ARB 0x88E8
-#define GL_DYNAMIC_READ_ARB 0x88E9
-#define GL_DYNAMIC_COPY_ARB 0x88EA
-
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage);
-typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data);
-typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint* buffers);
-typedef void (GLAPIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint* buffers);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid** params);
-typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid* data);
-typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef GLvoid * (GLAPIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-
-#define glBindBufferARB GLEW_GET_FUN(__glewBindBufferARB)
-#define glBufferDataARB GLEW_GET_FUN(__glewBufferDataARB)
-#define glBufferSubDataARB GLEW_GET_FUN(__glewBufferSubDataARB)
-#define glDeleteBuffersARB GLEW_GET_FUN(__glewDeleteBuffersARB)
-#define glGenBuffersARB GLEW_GET_FUN(__glewGenBuffersARB)
-#define glGetBufferParameterivARB GLEW_GET_FUN(__glewGetBufferParameterivARB)
-#define glGetBufferPointervARB GLEW_GET_FUN(__glewGetBufferPointervARB)
-#define glGetBufferSubDataARB GLEW_GET_FUN(__glewGetBufferSubDataARB)
-#define glIsBufferARB GLEW_GET_FUN(__glewIsBufferARB)
-#define glMapBufferARB GLEW_GET_FUN(__glewMapBufferARB)
-#define glUnmapBufferARB GLEW_GET_FUN(__glewUnmapBufferARB)
-
-#define GLEW_ARB_vertex_buffer_object GLEW_GET_VAR(__GLEW_ARB_vertex_buffer_object)
-
-#endif /* GL_ARB_vertex_buffer_object */
-
-/* ------------------------- GL_ARB_vertex_program ------------------------- */
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-
-#define GL_COLOR_SUM_ARB 0x8458
-#define GL_VERTEX_PROGRAM_ARB 0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626
-#define GL_PROGRAM_LENGTH_ARB 0x8627
-#define GL_PROGRAM_STRING_ARB 0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB 0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B
-#define GL_PROGRAM_BINDING_ARB 0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB 0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
-#define GL_PROGRAM_FORMAT_ARB 0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB 0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB 0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7
-#define GL_MATRIX0_ARB 0x88C0
-#define GL_MATRIX1_ARB 0x88C1
-#define GL_MATRIX2_ARB 0x88C2
-#define GL_MATRIX3_ARB 0x88C3
-#define GL_MATRIX4_ARB 0x88C4
-#define GL_MATRIX5_ARB 0x88C5
-#define GL_MATRIX6_ARB 0x88C6
-#define GL_MATRIX7_ARB 0x88C7
-#define GL_MATRIX8_ARB 0x88C8
-#define GL_MATRIX9_ARB 0x88C9
-#define GL_MATRIX10_ARB 0x88CA
-#define GL_MATRIX11_ARB 0x88CB
-#define GL_MATRIX12_ARB 0x88CC
-#define GL_MATRIX13_ARB 0x88CD
-#define GL_MATRIX14_ARB 0x88CE
-#define GL_MATRIX15_ARB 0x88CF
-#define GL_MATRIX16_ARB 0x88D0
-#define GL_MATRIX17_ARB 0x88D1
-#define GL_MATRIX18_ARB 0x88D2
-#define GL_MATRIX19_ARB 0x88D3
-#define GL_MATRIX20_ARB 0x88D4
-#define GL_MATRIX21_ARB 0x88D5
-#define GL_MATRIX22_ARB 0x88D6
-#define GL_MATRIX23_ARB 0x88D7
-#define GL_MATRIX24_ARB 0x88D8
-#define GL_MATRIX25_ARB 0x88D9
-#define GL_MATRIX26_ARB 0x88DA
-#define GL_MATRIX27_ARB 0x88DB
-#define GL_MATRIX28_ARB 0x88DC
-#define GL_MATRIX29_ARB 0x88DD
-#define GL_MATRIX30_ARB 0x88DE
-#define GL_MATRIX31_ARB 0x88DF
-
-typedef void (GLAPIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint* programs);
-typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (GLAPIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint* programs);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void* string);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid** pointer);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMARBPROC) (GLuint program);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void* string);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer);
-
-#define glBindProgramARB GLEW_GET_FUN(__glewBindProgramARB)
-#define glDeleteProgramsARB GLEW_GET_FUN(__glewDeleteProgramsARB)
-#define glDisableVertexAttribArrayARB GLEW_GET_FUN(__glewDisableVertexAttribArrayARB)
-#define glEnableVertexAttribArrayARB GLEW_GET_FUN(__glewEnableVertexAttribArrayARB)
-#define glGenProgramsARB GLEW_GET_FUN(__glewGenProgramsARB)
-#define glGetProgramEnvParameterdvARB GLEW_GET_FUN(__glewGetProgramEnvParameterdvARB)
-#define glGetProgramEnvParameterfvARB GLEW_GET_FUN(__glewGetProgramEnvParameterfvARB)
-#define glGetProgramLocalParameterdvARB GLEW_GET_FUN(__glewGetProgramLocalParameterdvARB)
-#define glGetProgramLocalParameterfvARB GLEW_GET_FUN(__glewGetProgramLocalParameterfvARB)
-#define glGetProgramStringARB GLEW_GET_FUN(__glewGetProgramStringARB)
-#define glGetProgramivARB GLEW_GET_FUN(__glewGetProgramivARB)
-#define glGetVertexAttribPointervARB GLEW_GET_FUN(__glewGetVertexAttribPointervARB)
-#define glGetVertexAttribdvARB GLEW_GET_FUN(__glewGetVertexAttribdvARB)
-#define glGetVertexAttribfvARB GLEW_GET_FUN(__glewGetVertexAttribfvARB)
-#define glGetVertexAttribivARB GLEW_GET_FUN(__glewGetVertexAttribivARB)
-#define glIsProgramARB GLEW_GET_FUN(__glewIsProgramARB)
-#define glProgramEnvParameter4dARB GLEW_GET_FUN(__glewProgramEnvParameter4dARB)
-#define glProgramEnvParameter4dvARB GLEW_GET_FUN(__glewProgramEnvParameter4dvARB)
-#define glProgramEnvParameter4fARB GLEW_GET_FUN(__glewProgramEnvParameter4fARB)
-#define glProgramEnvParameter4fvARB GLEW_GET_FUN(__glewProgramEnvParameter4fvARB)
-#define glProgramLocalParameter4dARB GLEW_GET_FUN(__glewProgramLocalParameter4dARB)
-#define glProgramLocalParameter4dvARB GLEW_GET_FUN(__glewProgramLocalParameter4dvARB)
-#define glProgramLocalParameter4fARB GLEW_GET_FUN(__glewProgramLocalParameter4fARB)
-#define glProgramLocalParameter4fvARB GLEW_GET_FUN(__glewProgramLocalParameter4fvARB)
-#define glProgramStringARB GLEW_GET_FUN(__glewProgramStringARB)
-#define glVertexAttrib1dARB GLEW_GET_FUN(__glewVertexAttrib1dARB)
-#define glVertexAttrib1dvARB GLEW_GET_FUN(__glewVertexAttrib1dvARB)
-#define glVertexAttrib1fARB GLEW_GET_FUN(__glewVertexAttrib1fARB)
-#define glVertexAttrib1fvARB GLEW_GET_FUN(__glewVertexAttrib1fvARB)
-#define glVertexAttrib1sARB GLEW_GET_FUN(__glewVertexAttrib1sARB)
-#define glVertexAttrib1svARB GLEW_GET_FUN(__glewVertexAttrib1svARB)
-#define glVertexAttrib2dARB GLEW_GET_FUN(__glewVertexAttrib2dARB)
-#define glVertexAttrib2dvARB GLEW_GET_FUN(__glewVertexAttrib2dvARB)
-#define glVertexAttrib2fARB GLEW_GET_FUN(__glewVertexAttrib2fARB)
-#define glVertexAttrib2fvARB GLEW_GET_FUN(__glewVertexAttrib2fvARB)
-#define glVertexAttrib2sARB GLEW_GET_FUN(__glewVertexAttrib2sARB)
-#define glVertexAttrib2svARB GLEW_GET_FUN(__glewVertexAttrib2svARB)
-#define glVertexAttrib3dARB GLEW_GET_FUN(__glewVertexAttrib3dARB)
-#define glVertexAttrib3dvARB GLEW_GET_FUN(__glewVertexAttrib3dvARB)
-#define glVertexAttrib3fARB GLEW_GET_FUN(__glewVertexAttrib3fARB)
-#define glVertexAttrib3fvARB GLEW_GET_FUN(__glewVertexAttrib3fvARB)
-#define glVertexAttrib3sARB GLEW_GET_FUN(__glewVertexAttrib3sARB)
-#define glVertexAttrib3svARB GLEW_GET_FUN(__glewVertexAttrib3svARB)
-#define glVertexAttrib4NbvARB GLEW_GET_FUN(__glewVertexAttrib4NbvARB)
-#define glVertexAttrib4NivARB GLEW_GET_FUN(__glewVertexAttrib4NivARB)
-#define glVertexAttrib4NsvARB GLEW_GET_FUN(__glewVertexAttrib4NsvARB)
-#define glVertexAttrib4NubARB GLEW_GET_FUN(__glewVertexAttrib4NubARB)
-#define glVertexAttrib4NubvARB GLEW_GET_FUN(__glewVertexAttrib4NubvARB)
-#define glVertexAttrib4NuivARB GLEW_GET_FUN(__glewVertexAttrib4NuivARB)
-#define glVertexAttrib4NusvARB GLEW_GET_FUN(__glewVertexAttrib4NusvARB)
-#define glVertexAttrib4bvARB GLEW_GET_FUN(__glewVertexAttrib4bvARB)
-#define glVertexAttrib4dARB GLEW_GET_FUN(__glewVertexAttrib4dARB)
-#define glVertexAttrib4dvARB GLEW_GET_FUN(__glewVertexAttrib4dvARB)
-#define glVertexAttrib4fARB GLEW_GET_FUN(__glewVertexAttrib4fARB)
-#define glVertexAttrib4fvARB GLEW_GET_FUN(__glewVertexAttrib4fvARB)
-#define glVertexAttrib4ivARB GLEW_GET_FUN(__glewVertexAttrib4ivARB)
-#define glVertexAttrib4sARB GLEW_GET_FUN(__glewVertexAttrib4sARB)
-#define glVertexAttrib4svARB GLEW_GET_FUN(__glewVertexAttrib4svARB)
-#define glVertexAttrib4ubvARB GLEW_GET_FUN(__glewVertexAttrib4ubvARB)
-#define glVertexAttrib4uivARB GLEW_GET_FUN(__glewVertexAttrib4uivARB)
-#define glVertexAttrib4usvARB GLEW_GET_FUN(__glewVertexAttrib4usvARB)
-#define glVertexAttribPointerARB GLEW_GET_FUN(__glewVertexAttribPointerARB)
-
-#define GLEW_ARB_vertex_program GLEW_GET_VAR(__GLEW_ARB_vertex_program)
-
-#endif /* GL_ARB_vertex_program */
-
-/* -------------------------- GL_ARB_vertex_shader ------------------------- */
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-
-#define GL_VERTEX_SHADER_ARB 0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-
-typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB* name);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
-
-#define glBindAttribLocationARB GLEW_GET_FUN(__glewBindAttribLocationARB)
-#define glGetActiveAttribARB GLEW_GET_FUN(__glewGetActiveAttribARB)
-#define glGetAttribLocationARB GLEW_GET_FUN(__glewGetAttribLocationARB)
-
-#define GLEW_ARB_vertex_shader GLEW_GET_VAR(__GLEW_ARB_vertex_shader)
-
-#endif /* GL_ARB_vertex_shader */
-
-/* ------------------- GL_ARB_vertex_type_2_10_10_10_rev ------------------- */
-
-#ifndef GL_ARB_vertex_type_2_10_10_10_rev
-#define GL_ARB_vertex_type_2_10_10_10_rev 1
-
-#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
-#define GL_INT_2_10_10_10_REV 0x8D9F
-
-typedef void (GLAPIENTRY * PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (GLAPIENTRY * PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint* color);
-typedef void (GLAPIENTRY * PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
-typedef void (GLAPIENTRY * PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint* color);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint* color);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint* coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
-typedef void (GLAPIENTRY * PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint* value);
-
-#define glColorP3ui GLEW_GET_FUN(__glewColorP3ui)
-#define glColorP3uiv GLEW_GET_FUN(__glewColorP3uiv)
-#define glColorP4ui GLEW_GET_FUN(__glewColorP4ui)
-#define glColorP4uiv GLEW_GET_FUN(__glewColorP4uiv)
-#define glMultiTexCoordP1ui GLEW_GET_FUN(__glewMultiTexCoordP1ui)
-#define glMultiTexCoordP1uiv GLEW_GET_FUN(__glewMultiTexCoordP1uiv)
-#define glMultiTexCoordP2ui GLEW_GET_FUN(__glewMultiTexCoordP2ui)
-#define glMultiTexCoordP2uiv GLEW_GET_FUN(__glewMultiTexCoordP2uiv)
-#define glMultiTexCoordP3ui GLEW_GET_FUN(__glewMultiTexCoordP3ui)
-#define glMultiTexCoordP3uiv GLEW_GET_FUN(__glewMultiTexCoordP3uiv)
-#define glMultiTexCoordP4ui GLEW_GET_FUN(__glewMultiTexCoordP4ui)
-#define glMultiTexCoordP4uiv GLEW_GET_FUN(__glewMultiTexCoordP4uiv)
-#define glNormalP3ui GLEW_GET_FUN(__glewNormalP3ui)
-#define glNormalP3uiv GLEW_GET_FUN(__glewNormalP3uiv)
-#define glSecondaryColorP3ui GLEW_GET_FUN(__glewSecondaryColorP3ui)
-#define glSecondaryColorP3uiv GLEW_GET_FUN(__glewSecondaryColorP3uiv)
-#define glTexCoordP1ui GLEW_GET_FUN(__glewTexCoordP1ui)
-#define glTexCoordP1uiv GLEW_GET_FUN(__glewTexCoordP1uiv)
-#define glTexCoordP2ui GLEW_GET_FUN(__glewTexCoordP2ui)
-#define glTexCoordP2uiv GLEW_GET_FUN(__glewTexCoordP2uiv)
-#define glTexCoordP3ui GLEW_GET_FUN(__glewTexCoordP3ui)
-#define glTexCoordP3uiv GLEW_GET_FUN(__glewTexCoordP3uiv)
-#define glTexCoordP4ui GLEW_GET_FUN(__glewTexCoordP4ui)
-#define glTexCoordP4uiv GLEW_GET_FUN(__glewTexCoordP4uiv)
-#define glVertexAttribP1ui GLEW_GET_FUN(__glewVertexAttribP1ui)
-#define glVertexAttribP1uiv GLEW_GET_FUN(__glewVertexAttribP1uiv)
-#define glVertexAttribP2ui GLEW_GET_FUN(__glewVertexAttribP2ui)
-#define glVertexAttribP2uiv GLEW_GET_FUN(__glewVertexAttribP2uiv)
-#define glVertexAttribP3ui GLEW_GET_FUN(__glewVertexAttribP3ui)
-#define glVertexAttribP3uiv GLEW_GET_FUN(__glewVertexAttribP3uiv)
-#define glVertexAttribP4ui GLEW_GET_FUN(__glewVertexAttribP4ui)
-#define glVertexAttribP4uiv GLEW_GET_FUN(__glewVertexAttribP4uiv)
-#define glVertexP2ui GLEW_GET_FUN(__glewVertexP2ui)
-#define glVertexP2uiv GLEW_GET_FUN(__glewVertexP2uiv)
-#define glVertexP3ui GLEW_GET_FUN(__glewVertexP3ui)
-#define glVertexP3uiv GLEW_GET_FUN(__glewVertexP3uiv)
-#define glVertexP4ui GLEW_GET_FUN(__glewVertexP4ui)
-#define glVertexP4uiv GLEW_GET_FUN(__glewVertexP4uiv)
-
-#define GLEW_ARB_vertex_type_2_10_10_10_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_2_10_10_10_rev)
-
-#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
-
-/* ------------------------- GL_ARB_viewport_array ------------------------- */
-
-#ifndef GL_ARB_viewport_array
-#define GL_ARB_viewport_array 1
-
-#define GL_DEPTH_RANGE 0x0B70
-#define GL_VIEWPORT 0x0BA2
-#define GL_SCISSOR_BOX 0x0C10
-#define GL_SCISSOR_TEST 0x0C11
-#define GL_MAX_VIEWPORTS 0x825B
-#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C
-#define GL_VIEWPORT_BOUNDS_RANGE 0x825D
-#define GL_LAYER_PROVOKING_VERTEX 0x825E
-#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
-#define GL_UNDEFINED_VERTEX 0x8260
-#define GL_FIRST_VERTEX_CONVENTION 0x8E4D
-#define GL_LAST_VERTEX_CONVENTION 0x8E4E
-#define GL_PROVOKING_VERTEX 0x8E4F
-
-typedef void (GLAPIENTRY * PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd * v);
-typedef void (GLAPIENTRY * PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f);
-typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble* data);
-typedef void (GLAPIENTRY * PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat* data);
-typedef void (GLAPIENTRY * PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint * v);
-typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint * v);
-typedef void (GLAPIENTRY * PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat * v);
-typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat * v);
-
-#define glDepthRangeArrayv GLEW_GET_FUN(__glewDepthRangeArrayv)
-#define glDepthRangeIndexed GLEW_GET_FUN(__glewDepthRangeIndexed)
-#define glGetDoublei_v GLEW_GET_FUN(__glewGetDoublei_v)
-#define glGetFloati_v GLEW_GET_FUN(__glewGetFloati_v)
-#define glScissorArrayv GLEW_GET_FUN(__glewScissorArrayv)
-#define glScissorIndexed GLEW_GET_FUN(__glewScissorIndexed)
-#define glScissorIndexedv GLEW_GET_FUN(__glewScissorIndexedv)
-#define glViewportArrayv GLEW_GET_FUN(__glewViewportArrayv)
-#define glViewportIndexedf GLEW_GET_FUN(__glewViewportIndexedf)
-#define glViewportIndexedfv GLEW_GET_FUN(__glewViewportIndexedfv)
-
-#define GLEW_ARB_viewport_array GLEW_GET_VAR(__GLEW_ARB_viewport_array)
-
-#endif /* GL_ARB_viewport_array */
-
-/* --------------------------- GL_ARB_window_pos --------------------------- */
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort* p);
-
-#define glWindowPos2dARB GLEW_GET_FUN(__glewWindowPos2dARB)
-#define glWindowPos2dvARB GLEW_GET_FUN(__glewWindowPos2dvARB)
-#define glWindowPos2fARB GLEW_GET_FUN(__glewWindowPos2fARB)
-#define glWindowPos2fvARB GLEW_GET_FUN(__glewWindowPos2fvARB)
-#define glWindowPos2iARB GLEW_GET_FUN(__glewWindowPos2iARB)
-#define glWindowPos2ivARB GLEW_GET_FUN(__glewWindowPos2ivARB)
-#define glWindowPos2sARB GLEW_GET_FUN(__glewWindowPos2sARB)
-#define glWindowPos2svARB GLEW_GET_FUN(__glewWindowPos2svARB)
-#define glWindowPos3dARB GLEW_GET_FUN(__glewWindowPos3dARB)
-#define glWindowPos3dvARB GLEW_GET_FUN(__glewWindowPos3dvARB)
-#define glWindowPos3fARB GLEW_GET_FUN(__glewWindowPos3fARB)
-#define glWindowPos3fvARB GLEW_GET_FUN(__glewWindowPos3fvARB)
-#define glWindowPos3iARB GLEW_GET_FUN(__glewWindowPos3iARB)
-#define glWindowPos3ivARB GLEW_GET_FUN(__glewWindowPos3ivARB)
-#define glWindowPos3sARB GLEW_GET_FUN(__glewWindowPos3sARB)
-#define glWindowPos3svARB GLEW_GET_FUN(__glewWindowPos3svARB)
-
-#define GLEW_ARB_window_pos GLEW_GET_VAR(__GLEW_ARB_window_pos)
-
-#endif /* GL_ARB_window_pos */
-
-/* ------------------------- GL_ATIX_point_sprites ------------------------- */
-
-#ifndef GL_ATIX_point_sprites
-#define GL_ATIX_point_sprites 1
-
-#define GL_TEXTURE_POINT_MODE_ATIX 0x60B0
-#define GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60B1
-#define GL_TEXTURE_POINT_SPRITE_ATIX 0x60B2
-#define GL_POINT_SPRITE_CULL_MODE_ATIX 0x60B3
-#define GL_POINT_SPRITE_CULL_CENTER_ATIX 0x60B4
-#define GL_POINT_SPRITE_CULL_CLIP_ATIX 0x60B5
-
-#define GLEW_ATIX_point_sprites GLEW_GET_VAR(__GLEW_ATIX_point_sprites)
-
-#endif /* GL_ATIX_point_sprites */
-
-/* ---------------------- GL_ATIX_texture_env_combine3 --------------------- */
-
-#ifndef GL_ATIX_texture_env_combine3
-#define GL_ATIX_texture_env_combine3 1
-
-#define GL_MODULATE_ADD_ATIX 0x8744
-#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745
-#define GL_MODULATE_SUBTRACT_ATIX 0x8746
-
-#define GLEW_ATIX_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATIX_texture_env_combine3)
-
-#endif /* GL_ATIX_texture_env_combine3 */
-
-/* ----------------------- GL_ATIX_texture_env_route ----------------------- */
-
-#ifndef GL_ATIX_texture_env_route
-#define GL_ATIX_texture_env_route 1
-
-#define GL_SECONDARY_COLOR_ATIX 0x8747
-#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748
-#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749
-
-#define GLEW_ATIX_texture_env_route GLEW_GET_VAR(__GLEW_ATIX_texture_env_route)
-
-#endif /* GL_ATIX_texture_env_route */
-
-/* ---------------- GL_ATIX_vertex_shader_output_point_size ---------------- */
-
-#ifndef GL_ATIX_vertex_shader_output_point_size
-#define GL_ATIX_vertex_shader_output_point_size 1
-
-#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E
-
-#define GLEW_ATIX_vertex_shader_output_point_size GLEW_GET_VAR(__GLEW_ATIX_vertex_shader_output_point_size)
-
-#endif /* GL_ATIX_vertex_shader_output_point_size */
-
-/* -------------------------- GL_ATI_draw_buffers -------------------------- */
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-
-#define GL_MAX_DRAW_BUFFERS_ATI 0x8824
-#define GL_DRAW_BUFFER0_ATI 0x8825
-#define GL_DRAW_BUFFER1_ATI 0x8826
-#define GL_DRAW_BUFFER2_ATI 0x8827
-#define GL_DRAW_BUFFER3_ATI 0x8828
-#define GL_DRAW_BUFFER4_ATI 0x8829
-#define GL_DRAW_BUFFER5_ATI 0x882A
-#define GL_DRAW_BUFFER6_ATI 0x882B
-#define GL_DRAW_BUFFER7_ATI 0x882C
-#define GL_DRAW_BUFFER8_ATI 0x882D
-#define GL_DRAW_BUFFER9_ATI 0x882E
-#define GL_DRAW_BUFFER10_ATI 0x882F
-#define GL_DRAW_BUFFER11_ATI 0x8830
-#define GL_DRAW_BUFFER12_ATI 0x8831
-#define GL_DRAW_BUFFER13_ATI 0x8832
-#define GL_DRAW_BUFFER14_ATI 0x8833
-#define GL_DRAW_BUFFER15_ATI 0x8834
-
-typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum* bufs);
-
-#define glDrawBuffersATI GLEW_GET_FUN(__glewDrawBuffersATI)
-
-#define GLEW_ATI_draw_buffers GLEW_GET_VAR(__GLEW_ATI_draw_buffers)
-
-#endif /* GL_ATI_draw_buffers */
-
-/* -------------------------- GL_ATI_element_array ------------------------- */
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-
-#define GL_ELEMENT_ARRAY_ATI 0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A
-
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void* pointer);
-
-#define glDrawElementArrayATI GLEW_GET_FUN(__glewDrawElementArrayATI)
-#define glDrawRangeElementArrayATI GLEW_GET_FUN(__glewDrawRangeElementArrayATI)
-#define glElementPointerATI GLEW_GET_FUN(__glewElementPointerATI)
-
-#define GLEW_ATI_element_array GLEW_GET_VAR(__GLEW_ATI_element_array)
-
-#endif /* GL_ATI_element_array */
-
-/* ------------------------- GL_ATI_envmap_bumpmap ------------------------- */
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-
-#define GL_BUMP_ROT_MATRIX_ATI 0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777
-#define GL_BUMP_TEX_UNITS_ATI 0x8778
-#define GL_DUDV_ATI 0x8779
-#define GL_DU8DV8_ATI 0x877A
-#define GL_BUMP_ENVMAP_ATI 0x877B
-#define GL_BUMP_TARGET_ATI 0x877C
-
-typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-
-#define glGetTexBumpParameterfvATI GLEW_GET_FUN(__glewGetTexBumpParameterfvATI)
-#define glGetTexBumpParameterivATI GLEW_GET_FUN(__glewGetTexBumpParameterivATI)
-#define glTexBumpParameterfvATI GLEW_GET_FUN(__glewTexBumpParameterfvATI)
-#define glTexBumpParameterivATI GLEW_GET_FUN(__glewTexBumpParameterivATI)
-
-#define GLEW_ATI_envmap_bumpmap GLEW_GET_VAR(__GLEW_ATI_envmap_bumpmap)
-
-#endif /* GL_ATI_envmap_bumpmap */
-
-/* ------------------------- GL_ATI_fragment_shader ------------------------ */
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-
-#define GL_RED_BIT_ATI 0x00000001
-#define GL_2X_BIT_ATI 0x00000001
-#define GL_4X_BIT_ATI 0x00000002
-#define GL_GREEN_BIT_ATI 0x00000002
-#define GL_COMP_BIT_ATI 0x00000002
-#define GL_BLUE_BIT_ATI 0x00000004
-#define GL_8X_BIT_ATI 0x00000004
-#define GL_NEGATE_BIT_ATI 0x00000004
-#define GL_BIAS_BIT_ATI 0x00000008
-#define GL_HALF_BIT_ATI 0x00000008
-#define GL_QUARTER_BIT_ATI 0x00000010
-#define GL_EIGHTH_BIT_ATI 0x00000020
-#define GL_SATURATE_BIT_ATI 0x00000040
-#define GL_FRAGMENT_SHADER_ATI 0x8920
-#define GL_REG_0_ATI 0x8921
-#define GL_REG_1_ATI 0x8922
-#define GL_REG_2_ATI 0x8923
-#define GL_REG_3_ATI 0x8924
-#define GL_REG_4_ATI 0x8925
-#define GL_REG_5_ATI 0x8926
-#define GL_CON_0_ATI 0x8941
-#define GL_CON_1_ATI 0x8942
-#define GL_CON_2_ATI 0x8943
-#define GL_CON_3_ATI 0x8944
-#define GL_CON_4_ATI 0x8945
-#define GL_CON_5_ATI 0x8946
-#define GL_CON_6_ATI 0x8947
-#define GL_CON_7_ATI 0x8948
-#define GL_MOV_ATI 0x8961
-#define GL_ADD_ATI 0x8963
-#define GL_MUL_ATI 0x8964
-#define GL_SUB_ATI 0x8965
-#define GL_DOT3_ATI 0x8966
-#define GL_DOT4_ATI 0x8967
-#define GL_MAD_ATI 0x8968
-#define GL_LERP_ATI 0x8969
-#define GL_CND_ATI 0x896A
-#define GL_CND0_ATI 0x896B
-#define GL_DOT2_ADD_ATI 0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F
-#define GL_NUM_PASSES_ATI 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975
-#define GL_SWIZZLE_STR_ATI 0x8976
-#define GL_SWIZZLE_STQ_ATI 0x8977
-#define GL_SWIZZLE_STR_DR_ATI 0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI 0x8979
-#define GL_SWIZZLE_STRQ_ATI 0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B
-
-typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (GLAPIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (GLAPIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (GLAPIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef GLuint (GLAPIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (GLAPIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (GLAPIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (GLAPIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat* value);
-
-#define glAlphaFragmentOp1ATI GLEW_GET_FUN(__glewAlphaFragmentOp1ATI)
-#define glAlphaFragmentOp2ATI GLEW_GET_FUN(__glewAlphaFragmentOp2ATI)
-#define glAlphaFragmentOp3ATI GLEW_GET_FUN(__glewAlphaFragmentOp3ATI)
-#define glBeginFragmentShaderATI GLEW_GET_FUN(__glewBeginFragmentShaderATI)
-#define glBindFragmentShaderATI GLEW_GET_FUN(__glewBindFragmentShaderATI)
-#define glColorFragmentOp1ATI GLEW_GET_FUN(__glewColorFragmentOp1ATI)
-#define glColorFragmentOp2ATI GLEW_GET_FUN(__glewColorFragmentOp2ATI)
-#define glColorFragmentOp3ATI GLEW_GET_FUN(__glewColorFragmentOp3ATI)
-#define glDeleteFragmentShaderATI GLEW_GET_FUN(__glewDeleteFragmentShaderATI)
-#define glEndFragmentShaderATI GLEW_GET_FUN(__glewEndFragmentShaderATI)
-#define glGenFragmentShadersATI GLEW_GET_FUN(__glewGenFragmentShadersATI)
-#define glPassTexCoordATI GLEW_GET_FUN(__glewPassTexCoordATI)
-#define glSampleMapATI GLEW_GET_FUN(__glewSampleMapATI)
-#define glSetFragmentShaderConstantATI GLEW_GET_FUN(__glewSetFragmentShaderConstantATI)
-
-#define GLEW_ATI_fragment_shader GLEW_GET_VAR(__GLEW_ATI_fragment_shader)
-
-#endif /* GL_ATI_fragment_shader */
-
-/* ------------------------ GL_ATI_map_object_buffer ----------------------- */
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-
-typedef GLvoid * (GLAPIENTRY * PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-
-#define glMapObjectBufferATI GLEW_GET_FUN(__glewMapObjectBufferATI)
-#define glUnmapObjectBufferATI GLEW_GET_FUN(__glewUnmapObjectBufferATI)
-
-#define GLEW_ATI_map_object_buffer GLEW_GET_VAR(__GLEW_ATI_map_object_buffer)
-
-#endif /* GL_ATI_map_object_buffer */
-
-/* ----------------------------- GL_ATI_meminfo ---------------------------- */
-
-#ifndef GL_ATI_meminfo
-#define GL_ATI_meminfo 1
-
-#define GL_VBO_FREE_MEMORY_ATI 0x87FB
-#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC
-#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD
-
-#define GLEW_ATI_meminfo GLEW_GET_VAR(__GLEW_ATI_meminfo)
-
-#endif /* GL_ATI_meminfo */
-
-/* -------------------------- GL_ATI_pn_triangles -------------------------- */
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-
-#define GL_PN_TRIANGLES_ATI 0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-
-typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-
-#define glPNTrianglesfATI GLEW_GET_FUN(__glewPNTrianglesfATI)
-#define glPNTrianglesiATI GLEW_GET_FUN(__glewPNTrianglesiATI)
-
-#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles)
-
-#endif /* GL_ATI_pn_triangles */
-
-/* ------------------------ GL_ATI_separate_stencil ------------------------ */
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-
-#define GL_STENCIL_BACK_FUNC_ATI 0x8800
-#define GL_STENCIL_BACK_FAIL_ATI 0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-
-typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-
-#define glStencilFuncSeparateATI GLEW_GET_FUN(__glewStencilFuncSeparateATI)
-#define glStencilOpSeparateATI GLEW_GET_FUN(__glewStencilOpSeparateATI)
-
-#define GLEW_ATI_separate_stencil GLEW_GET_VAR(__GLEW_ATI_separate_stencil)
-
-#endif /* GL_ATI_separate_stencil */
-
-/* ----------------------- GL_ATI_shader_texture_lod ----------------------- */
-
-#ifndef GL_ATI_shader_texture_lod
-#define GL_ATI_shader_texture_lod 1
-
-#define GLEW_ATI_shader_texture_lod GLEW_GET_VAR(__GLEW_ATI_shader_texture_lod)
-
-#endif /* GL_ATI_shader_texture_lod */
-
-/* ---------------------- GL_ATI_text_fragment_shader ---------------------- */
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-
-#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200
-
-#define GLEW_ATI_text_fragment_shader GLEW_GET_VAR(__GLEW_ATI_text_fragment_shader)
-
-#endif /* GL_ATI_text_fragment_shader */
-
-/* --------------------- GL_ATI_texture_compression_3dc -------------------- */
-
-#ifndef GL_ATI_texture_compression_3dc
-#define GL_ATI_texture_compression_3dc 1
-
-#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837
-
-#define GLEW_ATI_texture_compression_3dc GLEW_GET_VAR(__GLEW_ATI_texture_compression_3dc)
-
-#endif /* GL_ATI_texture_compression_3dc */
-
-/* ---------------------- GL_ATI_texture_env_combine3 ---------------------- */
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-
-#define GL_MODULATE_ADD_ATI 0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI 0x8745
-#define GL_MODULATE_SUBTRACT_ATI 0x8746
-
-#define GLEW_ATI_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATI_texture_env_combine3)
-
-#endif /* GL_ATI_texture_env_combine3 */
-
-/* -------------------------- GL_ATI_texture_float ------------------------- */
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-
-#define GL_RGBA_FLOAT32_ATI 0x8814
-#define GL_RGB_FLOAT32_ATI 0x8815
-#define GL_ALPHA_FLOAT32_ATI 0x8816
-#define GL_INTENSITY_FLOAT32_ATI 0x8817
-#define GL_LUMINANCE_FLOAT32_ATI 0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819
-#define GL_RGBA_FLOAT16_ATI 0x881A
-#define GL_RGB_FLOAT16_ATI 0x881B
-#define GL_ALPHA_FLOAT16_ATI 0x881C
-#define GL_INTENSITY_FLOAT16_ATI 0x881D
-#define GL_LUMINANCE_FLOAT16_ATI 0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F
-
-#define GLEW_ATI_texture_float GLEW_GET_VAR(__GLEW_ATI_texture_float)
-
-#endif /* GL_ATI_texture_float */
-
-/* ----------------------- GL_ATI_texture_mirror_once ---------------------- */
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-
-#define GL_MIRROR_CLAMP_ATI 0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743
-
-#define GLEW_ATI_texture_mirror_once GLEW_GET_VAR(__GLEW_ATI_texture_mirror_once)
-
-#endif /* GL_ATI_texture_mirror_once */
-
-/* ----------------------- GL_ATI_vertex_array_object ---------------------- */
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-
-#define GL_STATIC_ATI 0x8760
-#define GL_DYNAMIC_ATI 0x8761
-#define GL_PRESERVE_ATI 0x8762
-#define GL_DISCARD_ATI 0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767
-
-typedef void (GLAPIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (GLAPIENTRY * PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef GLuint (GLAPIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void* pointer, GLenum usage);
-typedef void (GLAPIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void* pointer, GLenum preserve);
-typedef void (GLAPIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-
-#define glArrayObjectATI GLEW_GET_FUN(__glewArrayObjectATI)
-#define glFreeObjectBufferATI GLEW_GET_FUN(__glewFreeObjectBufferATI)
-#define glGetArrayObjectfvATI GLEW_GET_FUN(__glewGetArrayObjectfvATI)
-#define glGetArrayObjectivATI GLEW_GET_FUN(__glewGetArrayObjectivATI)
-#define glGetObjectBufferfvATI GLEW_GET_FUN(__glewGetObjectBufferfvATI)
-#define glGetObjectBufferivATI GLEW_GET_FUN(__glewGetObjectBufferivATI)
-#define glGetVariantArrayObjectfvATI GLEW_GET_FUN(__glewGetVariantArrayObjectfvATI)
-#define glGetVariantArrayObjectivATI GLEW_GET_FUN(__glewGetVariantArrayObjectivATI)
-#define glIsObjectBufferATI GLEW_GET_FUN(__glewIsObjectBufferATI)
-#define glNewObjectBufferATI GLEW_GET_FUN(__glewNewObjectBufferATI)
-#define glUpdateObjectBufferATI GLEW_GET_FUN(__glewUpdateObjectBufferATI)
-#define glVariantArrayObjectATI GLEW_GET_FUN(__glewVariantArrayObjectATI)
-
-#define GLEW_ATI_vertex_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_array_object)
-
-#endif /* GL_ATI_vertex_array_object */
-
-/* ------------------- GL_ATI_vertex_attrib_array_object ------------------- */
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-
-#define glGetVertexAttribArrayObjectfvATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectfvATI)
-#define glGetVertexAttribArrayObjectivATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectivATI)
-#define glVertexAttribArrayObjectATI GLEW_GET_FUN(__glewVertexAttribArrayObjectATI)
-
-#define GLEW_ATI_vertex_attrib_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_attrib_array_object)
-
-#endif /* GL_ATI_vertex_attrib_array_object */
-
-/* ------------------------- GL_ATI_vertex_streams ------------------------- */
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-
-#define GL_MAX_VERTEX_STREAMS_ATI 0x876B
-#define GL_VERTEX_SOURCE_ATI 0x876C
-#define GL_VERTEX_STREAM0_ATI 0x876D
-#define GL_VERTEX_STREAM1_ATI 0x876E
-#define GL_VERTEX_STREAM2_ATI 0x876F
-#define GL_VERTEX_STREAM3_ATI 0x8770
-#define GL_VERTEX_STREAM4_ATI 0x8771
-#define GL_VERTEX_STREAM5_ATI 0x8772
-#define GL_VERTEX_STREAM6_ATI 0x8773
-#define GL_VERTEX_STREAM7_ATI 0x8774
-
-typedef void (GLAPIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-
-#define glClientActiveVertexStreamATI GLEW_GET_FUN(__glewClientActiveVertexStreamATI)
-#define glNormalStream3bATI GLEW_GET_FUN(__glewNormalStream3bATI)
-#define glNormalStream3bvATI GLEW_GET_FUN(__glewNormalStream3bvATI)
-#define glNormalStream3dATI GLEW_GET_FUN(__glewNormalStream3dATI)
-#define glNormalStream3dvATI GLEW_GET_FUN(__glewNormalStream3dvATI)
-#define glNormalStream3fATI GLEW_GET_FUN(__glewNormalStream3fATI)
-#define glNormalStream3fvATI GLEW_GET_FUN(__glewNormalStream3fvATI)
-#define glNormalStream3iATI GLEW_GET_FUN(__glewNormalStream3iATI)
-#define glNormalStream3ivATI GLEW_GET_FUN(__glewNormalStream3ivATI)
-#define glNormalStream3sATI GLEW_GET_FUN(__glewNormalStream3sATI)
-#define glNormalStream3svATI GLEW_GET_FUN(__glewNormalStream3svATI)
-#define glVertexBlendEnvfATI GLEW_GET_FUN(__glewVertexBlendEnvfATI)
-#define glVertexBlendEnviATI GLEW_GET_FUN(__glewVertexBlendEnviATI)
-#define glVertexStream1dATI GLEW_GET_FUN(__glewVertexStream1dATI)
-#define glVertexStream1dvATI GLEW_GET_FUN(__glewVertexStream1dvATI)
-#define glVertexStream1fATI GLEW_GET_FUN(__glewVertexStream1fATI)
-#define glVertexStream1fvATI GLEW_GET_FUN(__glewVertexStream1fvATI)
-#define glVertexStream1iATI GLEW_GET_FUN(__glewVertexStream1iATI)
-#define glVertexStream1ivATI GLEW_GET_FUN(__glewVertexStream1ivATI)
-#define glVertexStream1sATI GLEW_GET_FUN(__glewVertexStream1sATI)
-#define glVertexStream1svATI GLEW_GET_FUN(__glewVertexStream1svATI)
-#define glVertexStream2dATI GLEW_GET_FUN(__glewVertexStream2dATI)
-#define glVertexStream2dvATI GLEW_GET_FUN(__glewVertexStream2dvATI)
-#define glVertexStream2fATI GLEW_GET_FUN(__glewVertexStream2fATI)
-#define glVertexStream2fvATI GLEW_GET_FUN(__glewVertexStream2fvATI)
-#define glVertexStream2iATI GLEW_GET_FUN(__glewVertexStream2iATI)
-#define glVertexStream2ivATI GLEW_GET_FUN(__glewVertexStream2ivATI)
-#define glVertexStream2sATI GLEW_GET_FUN(__glewVertexStream2sATI)
-#define glVertexStream2svATI GLEW_GET_FUN(__glewVertexStream2svATI)
-#define glVertexStream3dATI GLEW_GET_FUN(__glewVertexStream3dATI)
-#define glVertexStream3dvATI GLEW_GET_FUN(__glewVertexStream3dvATI)
-#define glVertexStream3fATI GLEW_GET_FUN(__glewVertexStream3fATI)
-#define glVertexStream3fvATI GLEW_GET_FUN(__glewVertexStream3fvATI)
-#define glVertexStream3iATI GLEW_GET_FUN(__glewVertexStream3iATI)
-#define glVertexStream3ivATI GLEW_GET_FUN(__glewVertexStream3ivATI)
-#define glVertexStream3sATI GLEW_GET_FUN(__glewVertexStream3sATI)
-#define glVertexStream3svATI GLEW_GET_FUN(__glewVertexStream3svATI)
-#define glVertexStream4dATI GLEW_GET_FUN(__glewVertexStream4dATI)
-#define glVertexStream4dvATI GLEW_GET_FUN(__glewVertexStream4dvATI)
-#define glVertexStream4fATI GLEW_GET_FUN(__glewVertexStream4fATI)
-#define glVertexStream4fvATI GLEW_GET_FUN(__glewVertexStream4fvATI)
-#define glVertexStream4iATI GLEW_GET_FUN(__glewVertexStream4iATI)
-#define glVertexStream4ivATI GLEW_GET_FUN(__glewVertexStream4ivATI)
-#define glVertexStream4sATI GLEW_GET_FUN(__glewVertexStream4sATI)
-#define glVertexStream4svATI GLEW_GET_FUN(__glewVertexStream4svATI)
-
-#define GLEW_ATI_vertex_streams GLEW_GET_VAR(__GLEW_ATI_vertex_streams)
-
-#endif /* GL_ATI_vertex_streams */
-
-/* --------------------------- GL_EXT_422_pixels --------------------------- */
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-
-#define GL_422_EXT 0x80CC
-#define GL_422_REV_EXT 0x80CD
-#define GL_422_AVERAGE_EXT 0x80CE
-#define GL_422_REV_AVERAGE_EXT 0x80CF
-
-#define GLEW_EXT_422_pixels GLEW_GET_VAR(__GLEW_EXT_422_pixels)
-
-#endif /* GL_EXT_422_pixels */
-
-/* ---------------------------- GL_EXT_Cg_shader --------------------------- */
-
-#ifndef GL_EXT_Cg_shader
-#define GL_EXT_Cg_shader 1
-
-#define GL_CG_VERTEX_SHADER_EXT 0x890E
-#define GL_CG_FRAGMENT_SHADER_EXT 0x890F
-
-#define GLEW_EXT_Cg_shader GLEW_GET_VAR(__GLEW_EXT_Cg_shader)
-
-#endif /* GL_EXT_Cg_shader */
-
-/* ------------------------------ GL_EXT_abgr ------------------------------ */
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-
-#define GL_ABGR_EXT 0x8000
-
-#define GLEW_EXT_abgr GLEW_GET_VAR(__GLEW_EXT_abgr)
-
-#endif /* GL_EXT_abgr */
-
-/* ------------------------------ GL_EXT_bgra ------------------------------ */
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-
-#define GL_BGR_EXT 0x80E0
-#define GL_BGRA_EXT 0x80E1
-
-#define GLEW_EXT_bgra GLEW_GET_VAR(__GLEW_EXT_bgra)
-
-#endif /* GL_EXT_bgra */
-
-/* ------------------------ GL_EXT_bindable_uniform ------------------------ */
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED
-#define GL_UNIFORM_BUFFER_EXT 0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF
-
-typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (GLAPIENTRY * PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-typedef void (GLAPIENTRY * PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-
-#define glGetUniformBufferSizeEXT GLEW_GET_FUN(__glewGetUniformBufferSizeEXT)
-#define glGetUniformOffsetEXT GLEW_GET_FUN(__glewGetUniformOffsetEXT)
-#define glUniformBufferEXT GLEW_GET_FUN(__glewUniformBufferEXT)
-
-#define GLEW_EXT_bindable_uniform GLEW_GET_VAR(__GLEW_EXT_bindable_uniform)
-
-#endif /* GL_EXT_bindable_uniform */
-
-/* --------------------------- GL_EXT_blend_color -------------------------- */
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-
-#define GL_CONSTANT_COLOR_EXT 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002
-#define GL_CONSTANT_ALPHA_EXT 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004
-#define GL_BLEND_COLOR_EXT 0x8005
-
-typedef void (GLAPIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-
-#define glBlendColorEXT GLEW_GET_FUN(__glewBlendColorEXT)
-
-#define GLEW_EXT_blend_color GLEW_GET_VAR(__GLEW_EXT_blend_color)
-
-#endif /* GL_EXT_blend_color */
-
-/* --------------------- GL_EXT_blend_equation_separate -------------------- */
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-
-#define GL_BLEND_EQUATION_RGB_EXT 0x8009
-#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D
-
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-
-#define glBlendEquationSeparateEXT GLEW_GET_FUN(__glewBlendEquationSeparateEXT)
-
-#define GLEW_EXT_blend_equation_separate GLEW_GET_VAR(__GLEW_EXT_blend_equation_separate)
-
-#endif /* GL_EXT_blend_equation_separate */
-
-/* ----------------------- GL_EXT_blend_func_separate ---------------------- */
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-
-#define GL_BLEND_DST_RGB_EXT 0x80C8
-#define GL_BLEND_SRC_RGB_EXT 0x80C9
-#define GL_BLEND_DST_ALPHA_EXT 0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT 0x80CB
-
-typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-
-#define glBlendFuncSeparateEXT GLEW_GET_FUN(__glewBlendFuncSeparateEXT)
-
-#define GLEW_EXT_blend_func_separate GLEW_GET_VAR(__GLEW_EXT_blend_func_separate)
-
-#endif /* GL_EXT_blend_func_separate */
-
-/* ------------------------- GL_EXT_blend_logic_op ------------------------- */
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-
-#define GLEW_EXT_blend_logic_op GLEW_GET_VAR(__GLEW_EXT_blend_logic_op)
-
-#endif /* GL_EXT_blend_logic_op */
-
-/* -------------------------- GL_EXT_blend_minmax -------------------------- */
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-
-#define GL_FUNC_ADD_EXT 0x8006
-#define GL_MIN_EXT 0x8007
-#define GL_MAX_EXT 0x8008
-#define GL_BLEND_EQUATION_EXT 0x8009
-
-typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-
-#define glBlendEquationEXT GLEW_GET_FUN(__glewBlendEquationEXT)
-
-#define GLEW_EXT_blend_minmax GLEW_GET_VAR(__GLEW_EXT_blend_minmax)
-
-#endif /* GL_EXT_blend_minmax */
-
-/* ------------------------- GL_EXT_blend_subtract ------------------------- */
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-
-#define GL_FUNC_SUBTRACT_EXT 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B
-
-#define GLEW_EXT_blend_subtract GLEW_GET_VAR(__GLEW_EXT_blend_subtract)
-
-#endif /* GL_EXT_blend_subtract */
-
-/* ------------------------ GL_EXT_clip_volume_hint ------------------------ */
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0
-
-#define GLEW_EXT_clip_volume_hint GLEW_GET_VAR(__GLEW_EXT_clip_volume_hint)
-
-#endif /* GL_EXT_clip_volume_hint */
-
-/* ------------------------------ GL_EXT_cmyka ----------------------------- */
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-
-#define GL_CMYK_EXT 0x800C
-#define GL_CMYKA_EXT 0x800D
-#define GL_PACK_CMYK_HINT_EXT 0x800E
-#define GL_UNPACK_CMYK_HINT_EXT 0x800F
-
-#define GLEW_EXT_cmyka GLEW_GET_VAR(__GLEW_EXT_cmyka)
-
-#endif /* GL_EXT_cmyka */
-
-/* ------------------------- GL_EXT_color_subtable ------------------------- */
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-
-typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-
-#define glColorSubTableEXT GLEW_GET_FUN(__glewColorSubTableEXT)
-#define glCopyColorSubTableEXT GLEW_GET_FUN(__glewCopyColorSubTableEXT)
-
-#define GLEW_EXT_color_subtable GLEW_GET_VAR(__GLEW_EXT_color_subtable)
-
-#endif /* GL_EXT_color_subtable */
-
-/* ---------------------- GL_EXT_compiled_vertex_array --------------------- */
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9
-
-typedef void (GLAPIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
-
-#define glLockArraysEXT GLEW_GET_FUN(__glewLockArraysEXT)
-#define glUnlockArraysEXT GLEW_GET_FUN(__glewUnlockArraysEXT)
-
-#define GLEW_EXT_compiled_vertex_array GLEW_GET_VAR(__GLEW_EXT_compiled_vertex_array)
-
-#endif /* GL_EXT_compiled_vertex_array */
-
-/* --------------------------- GL_EXT_convolution -------------------------- */
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-
-#define GL_CONVOLUTION_1D_EXT 0x8010
-#define GL_CONVOLUTION_2D_EXT 0x8011
-#define GL_SEPARABLE_2D_EXT 0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015
-#define GL_REDUCE_EXT 0x8016
-#define GL_CONVOLUTION_FORMAT_EXT 0x8017
-#define GL_CONVOLUTION_WIDTH_EXT 0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT 0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void* image);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* image);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void* image);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void* row, void* column, void* span);
-typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* row, const void* column);
-
-#define glConvolutionFilter1DEXT GLEW_GET_FUN(__glewConvolutionFilter1DEXT)
-#define glConvolutionFilter2DEXT GLEW_GET_FUN(__glewConvolutionFilter2DEXT)
-#define glConvolutionParameterfEXT GLEW_GET_FUN(__glewConvolutionParameterfEXT)
-#define glConvolutionParameterfvEXT GLEW_GET_FUN(__glewConvolutionParameterfvEXT)
-#define glConvolutionParameteriEXT GLEW_GET_FUN(__glewConvolutionParameteriEXT)
-#define glConvolutionParameterivEXT GLEW_GET_FUN(__glewConvolutionParameterivEXT)
-#define glCopyConvolutionFilter1DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter1DEXT)
-#define glCopyConvolutionFilter2DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter2DEXT)
-#define glGetConvolutionFilterEXT GLEW_GET_FUN(__glewGetConvolutionFilterEXT)
-#define glGetConvolutionParameterfvEXT GLEW_GET_FUN(__glewGetConvolutionParameterfvEXT)
-#define glGetConvolutionParameterivEXT GLEW_GET_FUN(__glewGetConvolutionParameterivEXT)
-#define glGetSeparableFilterEXT GLEW_GET_FUN(__glewGetSeparableFilterEXT)
-#define glSeparableFilter2DEXT GLEW_GET_FUN(__glewSeparableFilter2DEXT)
-
-#define GLEW_EXT_convolution GLEW_GET_VAR(__GLEW_EXT_convolution)
-
-#endif /* GL_EXT_convolution */
-
-/* ------------------------ GL_EXT_coordinate_frame ------------------------ */
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-
-#define GL_TANGENT_ARRAY_EXT 0x8439
-#define GL_BINORMAL_ARRAY_EXT 0x843A
-#define GL_CURRENT_TANGENT_EXT 0x843B
-#define GL_CURRENT_BINORMAL_EXT 0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443
-#define GL_MAP1_TANGENT_EXT 0x8444
-#define GL_MAP2_TANGENT_EXT 0x8445
-#define GL_MAP1_BINORMAL_EXT 0x8446
-#define GL_MAP2_BINORMAL_EXT 0x8447
-
-typedef void (GLAPIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, void* pointer);
-typedef void (GLAPIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, void* pointer);
-
-#define glBinormalPointerEXT GLEW_GET_FUN(__glewBinormalPointerEXT)
-#define glTangentPointerEXT GLEW_GET_FUN(__glewTangentPointerEXT)
-
-#define GLEW_EXT_coordinate_frame GLEW_GET_VAR(__GLEW_EXT_coordinate_frame)
-
-#endif /* GL_EXT_coordinate_frame */
-
-/* -------------------------- GL_EXT_copy_texture -------------------------- */
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-
-typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-
-#define glCopyTexImage1DEXT GLEW_GET_FUN(__glewCopyTexImage1DEXT)
-#define glCopyTexImage2DEXT GLEW_GET_FUN(__glewCopyTexImage2DEXT)
-#define glCopyTexSubImage1DEXT GLEW_GET_FUN(__glewCopyTexSubImage1DEXT)
-#define glCopyTexSubImage2DEXT GLEW_GET_FUN(__glewCopyTexSubImage2DEXT)
-#define glCopyTexSubImage3DEXT GLEW_GET_FUN(__glewCopyTexSubImage3DEXT)
-
-#define GLEW_EXT_copy_texture GLEW_GET_VAR(__GLEW_EXT_copy_texture)
-
-#endif /* GL_EXT_copy_texture */
-
-/* --------------------------- GL_EXT_cull_vertex -------------------------- */
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-
-#define GL_CULL_VERTEX_EXT 0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-
-typedef void (GLAPIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params);
-
-#define glCullParameterdvEXT GLEW_GET_FUN(__glewCullParameterdvEXT)
-#define glCullParameterfvEXT GLEW_GET_FUN(__glewCullParameterfvEXT)
-
-#define GLEW_EXT_cull_vertex GLEW_GET_VAR(__GLEW_EXT_cull_vertex)
-
-#endif /* GL_EXT_cull_vertex */
-
-/* -------------------------- GL_EXT_debug_marker -------------------------- */
-
-#ifndef GL_EXT_debug_marker
-#define GL_EXT_debug_marker 1
-
-typedef void (GLAPIENTRY * PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar* marker);
-typedef void (GLAPIENTRY * PFNGLPOPGROUPMARKEREXTPROC) (void);
-typedef void (GLAPIENTRY * PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar* marker);
-
-#define glInsertEventMarkerEXT GLEW_GET_FUN(__glewInsertEventMarkerEXT)
-#define glPopGroupMarkerEXT GLEW_GET_FUN(__glewPopGroupMarkerEXT)
-#define glPushGroupMarkerEXT GLEW_GET_FUN(__glewPushGroupMarkerEXT)
-
-#define GLEW_EXT_debug_marker GLEW_GET_VAR(__GLEW_EXT_debug_marker)
-
-#endif /* GL_EXT_debug_marker */
-
-/* ------------------------ GL_EXT_depth_bounds_test ----------------------- */
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-
-#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890
-#define GL_DEPTH_BOUNDS_EXT 0x8891
-
-typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-
-#define glDepthBoundsEXT GLEW_GET_FUN(__glewDepthBoundsEXT)
-
-#define GLEW_EXT_depth_bounds_test GLEW_GET_VAR(__GLEW_EXT_depth_bounds_test)
-
-#endif /* GL_EXT_depth_bounds_test */
-
-/* ----------------------- GL_EXT_direct_state_access ---------------------- */
-
-#ifndef GL_EXT_direct_state_access
-#define GL_EXT_direct_state_access 1
-
-#define GL_PROGRAM_MATRIX_EXT 0x8E2D
-#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E
-#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
-
-typedef void (GLAPIENTRY * PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
-typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
-typedef void (GLAPIENTRY * PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
-typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
-typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
-typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
-typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
-typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
-typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
-typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
-typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, void* img);
-typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, void* img);
-typedef void (GLAPIENTRY * PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* param);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void* pixels);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void** params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void* data);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void* string);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid** params);
-typedef void (GLAPIENTRY * PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, GLvoid** params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void* pixels);
-typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint* param);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLvoid** param);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, GLvoid** param);
-typedef GLvoid * (GLAPIENTRY * PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
-typedef GLvoid * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (GLAPIENTRY * PFNGLMATRIXFRUSTUMEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f);
-typedef void (GLAPIENTRY * PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum matrixMode);
-typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXLOADDEXTPROC) (GLenum matrixMode, const GLdouble* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXLOADFEXTPROC) (GLenum matrixMode, const GLfloat* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXMULTDEXTPROC) (GLenum matrixMode, const GLdouble* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXMULTFEXTPROC) (GLenum matrixMode, const GLfloat* m);
-typedef void (GLAPIENTRY * PFNGLMATRIXORTHOEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f);
-typedef void (GLAPIENTRY * PFNGLMATRIXPOPEXTPROC) (GLenum matrixMode);
-typedef void (GLAPIENTRY * PFNGLMATRIXPUSHEXTPROC) (GLenum matrixMode);
-typedef void (GLAPIENTRY * PFNGLMATRIXROTATEDEXTPROC) (GLenum matrixMode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLMATRIXROTATEFEXTPROC) (GLenum matrixMode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLMATRIXSCALEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLMATRIXSCALEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint* params);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* param);
-typedef void (GLAPIENTRY * PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void* data, GLenum usage);
-typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void* data);
-typedef void (GLAPIENTRY * PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint* params);
-typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void* string);
-typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint* params);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat* param);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* param);
-typedef void (GLAPIENTRY * PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
-typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-
-#define glBindMultiTextureEXT GLEW_GET_FUN(__glewBindMultiTextureEXT)
-#define glCheckNamedFramebufferStatusEXT GLEW_GET_FUN(__glewCheckNamedFramebufferStatusEXT)
-#define glClientAttribDefaultEXT GLEW_GET_FUN(__glewClientAttribDefaultEXT)
-#define glCompressedMultiTexImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage1DEXT)
-#define glCompressedMultiTexImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage2DEXT)
-#define glCompressedMultiTexImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage3DEXT)
-#define glCompressedMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage1DEXT)
-#define glCompressedMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage2DEXT)
-#define glCompressedMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage3DEXT)
-#define glCompressedTextureImage1DEXT GLEW_GET_FUN(__glewCompressedTextureImage1DEXT)
-#define glCompressedTextureImage2DEXT GLEW_GET_FUN(__glewCompressedTextureImage2DEXT)
-#define glCompressedTextureImage3DEXT GLEW_GET_FUN(__glewCompressedTextureImage3DEXT)
-#define glCompressedTextureSubImage1DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage1DEXT)
-#define glCompressedTextureSubImage2DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage2DEXT)
-#define glCompressedTextureSubImage3DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage3DEXT)
-#define glCopyMultiTexImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexImage1DEXT)
-#define glCopyMultiTexImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexImage2DEXT)
-#define glCopyMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage1DEXT)
-#define glCopyMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage2DEXT)
-#define glCopyMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage3DEXT)
-#define glCopyTextureImage1DEXT GLEW_GET_FUN(__glewCopyTextureImage1DEXT)
-#define glCopyTextureImage2DEXT GLEW_GET_FUN(__glewCopyTextureImage2DEXT)
-#define glCopyTextureSubImage1DEXT GLEW_GET_FUN(__glewCopyTextureSubImage1DEXT)
-#define glCopyTextureSubImage2DEXT GLEW_GET_FUN(__glewCopyTextureSubImage2DEXT)
-#define glCopyTextureSubImage3DEXT GLEW_GET_FUN(__glewCopyTextureSubImage3DEXT)
-#define glDisableClientStateIndexedEXT GLEW_GET_FUN(__glewDisableClientStateIndexedEXT)
-#define glDisableClientStateiEXT GLEW_GET_FUN(__glewDisableClientStateiEXT)
-#define glDisableVertexArrayAttribEXT GLEW_GET_FUN(__glewDisableVertexArrayAttribEXT)
-#define glDisableVertexArrayEXT GLEW_GET_FUN(__glewDisableVertexArrayEXT)
-#define glEnableClientStateIndexedEXT GLEW_GET_FUN(__glewEnableClientStateIndexedEXT)
-#define glEnableClientStateiEXT GLEW_GET_FUN(__glewEnableClientStateiEXT)
-#define glEnableVertexArrayAttribEXT GLEW_GET_FUN(__glewEnableVertexArrayAttribEXT)
-#define glEnableVertexArrayEXT GLEW_GET_FUN(__glewEnableVertexArrayEXT)
-#define glFlushMappedNamedBufferRangeEXT GLEW_GET_FUN(__glewFlushMappedNamedBufferRangeEXT)
-#define glFramebufferDrawBufferEXT GLEW_GET_FUN(__glewFramebufferDrawBufferEXT)
-#define glFramebufferDrawBuffersEXT GLEW_GET_FUN(__glewFramebufferDrawBuffersEXT)
-#define glFramebufferReadBufferEXT GLEW_GET_FUN(__glewFramebufferReadBufferEXT)
-#define glGenerateMultiTexMipmapEXT GLEW_GET_FUN(__glewGenerateMultiTexMipmapEXT)
-#define glGenerateTextureMipmapEXT GLEW_GET_FUN(__glewGenerateTextureMipmapEXT)
-#define glGetCompressedMultiTexImageEXT GLEW_GET_FUN(__glewGetCompressedMultiTexImageEXT)
-#define glGetCompressedTextureImageEXT GLEW_GET_FUN(__glewGetCompressedTextureImageEXT)
-#define glGetDoubleIndexedvEXT GLEW_GET_FUN(__glewGetDoubleIndexedvEXT)
-#define glGetDoublei_vEXT GLEW_GET_FUN(__glewGetDoublei_vEXT)
-#define glGetFloatIndexedvEXT GLEW_GET_FUN(__glewGetFloatIndexedvEXT)
-#define glGetFloati_vEXT GLEW_GET_FUN(__glewGetFloati_vEXT)
-#define glGetFramebufferParameterivEXT GLEW_GET_FUN(__glewGetFramebufferParameterivEXT)
-#define glGetMultiTexEnvfvEXT GLEW_GET_FUN(__glewGetMultiTexEnvfvEXT)
-#define glGetMultiTexEnvivEXT GLEW_GET_FUN(__glewGetMultiTexEnvivEXT)
-#define glGetMultiTexGendvEXT GLEW_GET_FUN(__glewGetMultiTexGendvEXT)
-#define glGetMultiTexGenfvEXT GLEW_GET_FUN(__glewGetMultiTexGenfvEXT)
-#define glGetMultiTexGenivEXT GLEW_GET_FUN(__glewGetMultiTexGenivEXT)
-#define glGetMultiTexImageEXT GLEW_GET_FUN(__glewGetMultiTexImageEXT)
-#define glGetMultiTexLevelParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterfvEXT)
-#define glGetMultiTexLevelParameterivEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterivEXT)
-#define glGetMultiTexParameterIivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIivEXT)
-#define glGetMultiTexParameterIuivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIuivEXT)
-#define glGetMultiTexParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexParameterfvEXT)
-#define glGetMultiTexParameterivEXT GLEW_GET_FUN(__glewGetMultiTexParameterivEXT)
-#define glGetNamedBufferParameterivEXT GLEW_GET_FUN(__glewGetNamedBufferParameterivEXT)
-#define glGetNamedBufferPointervEXT GLEW_GET_FUN(__glewGetNamedBufferPointervEXT)
-#define glGetNamedBufferSubDataEXT GLEW_GET_FUN(__glewGetNamedBufferSubDataEXT)
-#define glGetNamedFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameterivEXT)
-#define glGetNamedProgramLocalParameterIivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIivEXT)
-#define glGetNamedProgramLocalParameterIuivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIuivEXT)
-#define glGetNamedProgramLocalParameterdvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterdvEXT)
-#define glGetNamedProgramLocalParameterfvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterfvEXT)
-#define glGetNamedProgramStringEXT GLEW_GET_FUN(__glewGetNamedProgramStringEXT)
-#define glGetNamedProgramivEXT GLEW_GET_FUN(__glewGetNamedProgramivEXT)
-#define glGetNamedRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetNamedRenderbufferParameterivEXT)
-#define glGetPointerIndexedvEXT GLEW_GET_FUN(__glewGetPointerIndexedvEXT)
-#define glGetPointeri_vEXT GLEW_GET_FUN(__glewGetPointeri_vEXT)
-#define glGetTextureImageEXT GLEW_GET_FUN(__glewGetTextureImageEXT)
-#define glGetTextureLevelParameterfvEXT GLEW_GET_FUN(__glewGetTextureLevelParameterfvEXT)
-#define glGetTextureLevelParameterivEXT GLEW_GET_FUN(__glewGetTextureLevelParameterivEXT)
-#define glGetTextureParameterIivEXT GLEW_GET_FUN(__glewGetTextureParameterIivEXT)
-#define glGetTextureParameterIuivEXT GLEW_GET_FUN(__glewGetTextureParameterIuivEXT)
-#define glGetTextureParameterfvEXT GLEW_GET_FUN(__glewGetTextureParameterfvEXT)
-#define glGetTextureParameterivEXT GLEW_GET_FUN(__glewGetTextureParameterivEXT)
-#define glGetVertexArrayIntegeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayIntegeri_vEXT)
-#define glGetVertexArrayIntegervEXT GLEW_GET_FUN(__glewGetVertexArrayIntegervEXT)
-#define glGetVertexArrayPointeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayPointeri_vEXT)
-#define glGetVertexArrayPointervEXT GLEW_GET_FUN(__glewGetVertexArrayPointervEXT)
-#define glMapNamedBufferEXT GLEW_GET_FUN(__glewMapNamedBufferEXT)
-#define glMapNamedBufferRangeEXT GLEW_GET_FUN(__glewMapNamedBufferRangeEXT)
-#define glMatrixFrustumEXT GLEW_GET_FUN(__glewMatrixFrustumEXT)
-#define glMatrixLoadIdentityEXT GLEW_GET_FUN(__glewMatrixLoadIdentityEXT)
-#define glMatrixLoadTransposedEXT GLEW_GET_FUN(__glewMatrixLoadTransposedEXT)
-#define glMatrixLoadTransposefEXT GLEW_GET_FUN(__glewMatrixLoadTransposefEXT)
-#define glMatrixLoaddEXT GLEW_GET_FUN(__glewMatrixLoaddEXT)
-#define glMatrixLoadfEXT GLEW_GET_FUN(__glewMatrixLoadfEXT)
-#define glMatrixMultTransposedEXT GLEW_GET_FUN(__glewMatrixMultTransposedEXT)
-#define glMatrixMultTransposefEXT GLEW_GET_FUN(__glewMatrixMultTransposefEXT)
-#define glMatrixMultdEXT GLEW_GET_FUN(__glewMatrixMultdEXT)
-#define glMatrixMultfEXT GLEW_GET_FUN(__glewMatrixMultfEXT)
-#define glMatrixOrthoEXT GLEW_GET_FUN(__glewMatrixOrthoEXT)
-#define glMatrixPopEXT GLEW_GET_FUN(__glewMatrixPopEXT)
-#define glMatrixPushEXT GLEW_GET_FUN(__glewMatrixPushEXT)
-#define glMatrixRotatedEXT GLEW_GET_FUN(__glewMatrixRotatedEXT)
-#define glMatrixRotatefEXT GLEW_GET_FUN(__glewMatrixRotatefEXT)
-#define glMatrixScaledEXT GLEW_GET_FUN(__glewMatrixScaledEXT)
-#define glMatrixScalefEXT GLEW_GET_FUN(__glewMatrixScalefEXT)
-#define glMatrixTranslatedEXT GLEW_GET_FUN(__glewMatrixTranslatedEXT)
-#define glMatrixTranslatefEXT GLEW_GET_FUN(__glewMatrixTranslatefEXT)
-#define glMultiTexBufferEXT GLEW_GET_FUN(__glewMultiTexBufferEXT)
-#define glMultiTexCoordPointerEXT GLEW_GET_FUN(__glewMultiTexCoordPointerEXT)
-#define glMultiTexEnvfEXT GLEW_GET_FUN(__glewMultiTexEnvfEXT)
-#define glMultiTexEnvfvEXT GLEW_GET_FUN(__glewMultiTexEnvfvEXT)
-#define glMultiTexEnviEXT GLEW_GET_FUN(__glewMultiTexEnviEXT)
-#define glMultiTexEnvivEXT GLEW_GET_FUN(__glewMultiTexEnvivEXT)
-#define glMultiTexGendEXT GLEW_GET_FUN(__glewMultiTexGendEXT)
-#define glMultiTexGendvEXT GLEW_GET_FUN(__glewMultiTexGendvEXT)
-#define glMultiTexGenfEXT GLEW_GET_FUN(__glewMultiTexGenfEXT)
-#define glMultiTexGenfvEXT GLEW_GET_FUN(__glewMultiTexGenfvEXT)
-#define glMultiTexGeniEXT GLEW_GET_FUN(__glewMultiTexGeniEXT)
-#define glMultiTexGenivEXT GLEW_GET_FUN(__glewMultiTexGenivEXT)
-#define glMultiTexImage1DEXT GLEW_GET_FUN(__glewMultiTexImage1DEXT)
-#define glMultiTexImage2DEXT GLEW_GET_FUN(__glewMultiTexImage2DEXT)
-#define glMultiTexImage3DEXT GLEW_GET_FUN(__glewMultiTexImage3DEXT)
-#define glMultiTexParameterIivEXT GLEW_GET_FUN(__glewMultiTexParameterIivEXT)
-#define glMultiTexParameterIuivEXT GLEW_GET_FUN(__glewMultiTexParameterIuivEXT)
-#define glMultiTexParameterfEXT GLEW_GET_FUN(__glewMultiTexParameterfEXT)
-#define glMultiTexParameterfvEXT GLEW_GET_FUN(__glewMultiTexParameterfvEXT)
-#define glMultiTexParameteriEXT GLEW_GET_FUN(__glewMultiTexParameteriEXT)
-#define glMultiTexParameterivEXT GLEW_GET_FUN(__glewMultiTexParameterivEXT)
-#define glMultiTexRenderbufferEXT GLEW_GET_FUN(__glewMultiTexRenderbufferEXT)
-#define glMultiTexSubImage1DEXT GLEW_GET_FUN(__glewMultiTexSubImage1DEXT)
-#define glMultiTexSubImage2DEXT GLEW_GET_FUN(__glewMultiTexSubImage2DEXT)
-#define glMultiTexSubImage3DEXT GLEW_GET_FUN(__glewMultiTexSubImage3DEXT)
-#define glNamedBufferDataEXT GLEW_GET_FUN(__glewNamedBufferDataEXT)
-#define glNamedBufferSubDataEXT GLEW_GET_FUN(__glewNamedBufferSubDataEXT)
-#define glNamedCopyBufferSubDataEXT GLEW_GET_FUN(__glewNamedCopyBufferSubDataEXT)
-#define glNamedFramebufferRenderbufferEXT GLEW_GET_FUN(__glewNamedFramebufferRenderbufferEXT)
-#define glNamedFramebufferTexture1DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture1DEXT)
-#define glNamedFramebufferTexture2DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture2DEXT)
-#define glNamedFramebufferTexture3DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture3DEXT)
-#define glNamedFramebufferTextureEXT GLEW_GET_FUN(__glewNamedFramebufferTextureEXT)
-#define glNamedFramebufferTextureFaceEXT GLEW_GET_FUN(__glewNamedFramebufferTextureFaceEXT)
-#define glNamedFramebufferTextureLayerEXT GLEW_GET_FUN(__glewNamedFramebufferTextureLayerEXT)
-#define glNamedProgramLocalParameter4dEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dEXT)
-#define glNamedProgramLocalParameter4dvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dvEXT)
-#define glNamedProgramLocalParameter4fEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fEXT)
-#define glNamedProgramLocalParameter4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fvEXT)
-#define glNamedProgramLocalParameterI4iEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4iEXT)
-#define glNamedProgramLocalParameterI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4ivEXT)
-#define glNamedProgramLocalParameterI4uiEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uiEXT)
-#define glNamedProgramLocalParameterI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uivEXT)
-#define glNamedProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameters4fvEXT)
-#define glNamedProgramLocalParametersI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4ivEXT)
-#define glNamedProgramLocalParametersI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4uivEXT)
-#define glNamedProgramStringEXT GLEW_GET_FUN(__glewNamedProgramStringEXT)
-#define glNamedRenderbufferStorageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageEXT)
-#define glNamedRenderbufferStorageMultisampleCoverageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleCoverageEXT)
-#define glNamedRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleEXT)
-#define glProgramUniform1dEXT GLEW_GET_FUN(__glewProgramUniform1dEXT)
-#define glProgramUniform1dvEXT GLEW_GET_FUN(__glewProgramUniform1dvEXT)
-#define glProgramUniform1fEXT GLEW_GET_FUN(__glewProgramUniform1fEXT)
-#define glProgramUniform1fvEXT GLEW_GET_FUN(__glewProgramUniform1fvEXT)
-#define glProgramUniform1iEXT GLEW_GET_FUN(__glewProgramUniform1iEXT)
-#define glProgramUniform1ivEXT GLEW_GET_FUN(__glewProgramUniform1ivEXT)
-#define glProgramUniform1uiEXT GLEW_GET_FUN(__glewProgramUniform1uiEXT)
-#define glProgramUniform1uivEXT GLEW_GET_FUN(__glewProgramUniform1uivEXT)
-#define glProgramUniform2dEXT GLEW_GET_FUN(__glewProgramUniform2dEXT)
-#define glProgramUniform2dvEXT GLEW_GET_FUN(__glewProgramUniform2dvEXT)
-#define glProgramUniform2fEXT GLEW_GET_FUN(__glewProgramUniform2fEXT)
-#define glProgramUniform2fvEXT GLEW_GET_FUN(__glewProgramUniform2fvEXT)
-#define glProgramUniform2iEXT GLEW_GET_FUN(__glewProgramUniform2iEXT)
-#define glProgramUniform2ivEXT GLEW_GET_FUN(__glewProgramUniform2ivEXT)
-#define glProgramUniform2uiEXT GLEW_GET_FUN(__glewProgramUniform2uiEXT)
-#define glProgramUniform2uivEXT GLEW_GET_FUN(__glewProgramUniform2uivEXT)
-#define glProgramUniform3dEXT GLEW_GET_FUN(__glewProgramUniform3dEXT)
-#define glProgramUniform3dvEXT GLEW_GET_FUN(__glewProgramUniform3dvEXT)
-#define glProgramUniform3fEXT GLEW_GET_FUN(__glewProgramUniform3fEXT)
-#define glProgramUniform3fvEXT GLEW_GET_FUN(__glewProgramUniform3fvEXT)
-#define glProgramUniform3iEXT GLEW_GET_FUN(__glewProgramUniform3iEXT)
-#define glProgramUniform3ivEXT GLEW_GET_FUN(__glewProgramUniform3ivEXT)
-#define glProgramUniform3uiEXT GLEW_GET_FUN(__glewProgramUniform3uiEXT)
-#define glProgramUniform3uivEXT GLEW_GET_FUN(__glewProgramUniform3uivEXT)
-#define glProgramUniform4dEXT GLEW_GET_FUN(__glewProgramUniform4dEXT)
-#define glProgramUniform4dvEXT GLEW_GET_FUN(__glewProgramUniform4dvEXT)
-#define glProgramUniform4fEXT GLEW_GET_FUN(__glewProgramUniform4fEXT)
-#define glProgramUniform4fvEXT GLEW_GET_FUN(__glewProgramUniform4fvEXT)
-#define glProgramUniform4iEXT GLEW_GET_FUN(__glewProgramUniform4iEXT)
-#define glProgramUniform4ivEXT GLEW_GET_FUN(__glewProgramUniform4ivEXT)
-#define glProgramUniform4uiEXT GLEW_GET_FUN(__glewProgramUniform4uiEXT)
-#define glProgramUniform4uivEXT GLEW_GET_FUN(__glewProgramUniform4uivEXT)
-#define glProgramUniformMatrix2dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2dvEXT)
-#define glProgramUniformMatrix2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2fvEXT)
-#define glProgramUniformMatrix2x3dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x3dvEXT)
-#define glProgramUniformMatrix2x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x3fvEXT)
-#define glProgramUniformMatrix2x4dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x4dvEXT)
-#define glProgramUniformMatrix2x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x4fvEXT)
-#define glProgramUniformMatrix3dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3dvEXT)
-#define glProgramUniformMatrix3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3fvEXT)
-#define glProgramUniformMatrix3x2dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x2dvEXT)
-#define glProgramUniformMatrix3x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x2fvEXT)
-#define glProgramUniformMatrix3x4dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x4dvEXT)
-#define glProgramUniformMatrix3x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x4fvEXT)
-#define glProgramUniformMatrix4dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4dvEXT)
-#define glProgramUniformMatrix4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4fvEXT)
-#define glProgramUniformMatrix4x2dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x2dvEXT)
-#define glProgramUniformMatrix4x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x2fvEXT)
-#define glProgramUniformMatrix4x3dvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x3dvEXT)
-#define glProgramUniformMatrix4x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x3fvEXT)
-#define glPushClientAttribDefaultEXT GLEW_GET_FUN(__glewPushClientAttribDefaultEXT)
-#define glTextureBufferEXT GLEW_GET_FUN(__glewTextureBufferEXT)
-#define glTextureImage1DEXT GLEW_GET_FUN(__glewTextureImage1DEXT)
-#define glTextureImage2DEXT GLEW_GET_FUN(__glewTextureImage2DEXT)
-#define glTextureImage3DEXT GLEW_GET_FUN(__glewTextureImage3DEXT)
-#define glTextureParameterIivEXT GLEW_GET_FUN(__glewTextureParameterIivEXT)
-#define glTextureParameterIuivEXT GLEW_GET_FUN(__glewTextureParameterIuivEXT)
-#define glTextureParameterfEXT GLEW_GET_FUN(__glewTextureParameterfEXT)
-#define glTextureParameterfvEXT GLEW_GET_FUN(__glewTextureParameterfvEXT)
-#define glTextureParameteriEXT GLEW_GET_FUN(__glewTextureParameteriEXT)
-#define glTextureParameterivEXT GLEW_GET_FUN(__glewTextureParameterivEXT)
-#define glTextureRenderbufferEXT GLEW_GET_FUN(__glewTextureRenderbufferEXT)
-#define glTextureSubImage1DEXT GLEW_GET_FUN(__glewTextureSubImage1DEXT)
-#define glTextureSubImage2DEXT GLEW_GET_FUN(__glewTextureSubImage2DEXT)
-#define glTextureSubImage3DEXT GLEW_GET_FUN(__glewTextureSubImage3DEXT)
-#define glUnmapNamedBufferEXT GLEW_GET_FUN(__glewUnmapNamedBufferEXT)
-#define glVertexArrayColorOffsetEXT GLEW_GET_FUN(__glewVertexArrayColorOffsetEXT)
-#define glVertexArrayEdgeFlagOffsetEXT GLEW_GET_FUN(__glewVertexArrayEdgeFlagOffsetEXT)
-#define glVertexArrayFogCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayFogCoordOffsetEXT)
-#define glVertexArrayIndexOffsetEXT GLEW_GET_FUN(__glewVertexArrayIndexOffsetEXT)
-#define glVertexArrayMultiTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayMultiTexCoordOffsetEXT)
-#define glVertexArrayNormalOffsetEXT GLEW_GET_FUN(__glewVertexArrayNormalOffsetEXT)
-#define glVertexArraySecondaryColorOffsetEXT GLEW_GET_FUN(__glewVertexArraySecondaryColorOffsetEXT)
-#define glVertexArrayTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayTexCoordOffsetEXT)
-#define glVertexArrayVertexAttribIOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIOffsetEXT)
-#define glVertexArrayVertexAttribOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribOffsetEXT)
-#define glVertexArrayVertexOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexOffsetEXT)
-
-#define GLEW_EXT_direct_state_access GLEW_GET_VAR(__GLEW_EXT_direct_state_access)
-
-#endif /* GL_EXT_direct_state_access */
-
-/* -------------------------- GL_EXT_draw_buffers2 ------------------------- */
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-
-typedef void (GLAPIENTRY * PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (GLAPIENTRY * PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (GLAPIENTRY * PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (GLAPIENTRY * PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum value, GLuint index, GLboolean* data);
-typedef void (GLAPIENTRY * PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum value, GLuint index, GLint* data);
-typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-
-#define glColorMaskIndexedEXT GLEW_GET_FUN(__glewColorMaskIndexedEXT)
-#define glDisableIndexedEXT GLEW_GET_FUN(__glewDisableIndexedEXT)
-#define glEnableIndexedEXT GLEW_GET_FUN(__glewEnableIndexedEXT)
-#define glGetBooleanIndexedvEXT GLEW_GET_FUN(__glewGetBooleanIndexedvEXT)
-#define glGetIntegerIndexedvEXT GLEW_GET_FUN(__glewGetIntegerIndexedvEXT)
-#define glIsEnabledIndexedEXT GLEW_GET_FUN(__glewIsEnabledIndexedEXT)
-
-#define GLEW_EXT_draw_buffers2 GLEW_GET_VAR(__GLEW_EXT_draw_buffers2)
-
-#endif /* GL_EXT_draw_buffers2 */
-
-/* ------------------------- GL_EXT_draw_instanced ------------------------- */
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-
-#define glDrawArraysInstancedEXT GLEW_GET_FUN(__glewDrawArraysInstancedEXT)
-#define glDrawElementsInstancedEXT GLEW_GET_FUN(__glewDrawElementsInstancedEXT)
-
-#define GLEW_EXT_draw_instanced GLEW_GET_VAR(__GLEW_EXT_draw_instanced)
-
-#endif /* GL_EXT_draw_instanced */
-
-/* ----------------------- GL_EXT_draw_range_elements ---------------------- */
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-
-#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9
-
-typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-
-#define glDrawRangeElementsEXT GLEW_GET_FUN(__glewDrawRangeElementsEXT)
-
-#define GLEW_EXT_draw_range_elements GLEW_GET_VAR(__GLEW_EXT_draw_range_elements)
-
-#endif /* GL_EXT_draw_range_elements */
-
-/* ---------------------------- GL_EXT_fog_coord --------------------------- */
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-
-#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450
-#define GL_FOG_COORDINATE_EXT 0x8451
-#define GL_FRAGMENT_DEPTH_EXT 0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457
-
-typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-
-#define glFogCoordPointerEXT GLEW_GET_FUN(__glewFogCoordPointerEXT)
-#define glFogCoorddEXT GLEW_GET_FUN(__glewFogCoorddEXT)
-#define glFogCoorddvEXT GLEW_GET_FUN(__glewFogCoorddvEXT)
-#define glFogCoordfEXT GLEW_GET_FUN(__glewFogCoordfEXT)
-#define glFogCoordfvEXT GLEW_GET_FUN(__glewFogCoordfvEXT)
-
-#define GLEW_EXT_fog_coord GLEW_GET_VAR(__GLEW_EXT_fog_coord)
-
-#endif /* GL_EXT_fog_coord */
-
-/* ------------------------ GL_EXT_fragment_lighting ----------------------- */
-
-#ifndef GL_EXT_fragment_lighting
-#define GL_EXT_fragment_lighting 1
-
-#define GL_FRAGMENT_LIGHTING_EXT 0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_EXT 0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_EXT 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_EXT 0x8404
-#define GL_MAX_ACTIVE_LIGHTS_EXT 0x8405
-#define GL_CURRENT_RASTER_NORMAL_EXT 0x8406
-#define GL_LIGHT_ENV_MODE_EXT 0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_EXT 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT 0x840B
-#define GL_FRAGMENT_LIGHT0_EXT 0x840C
-#define GL_FRAGMENT_LIGHT7_EXT 0x8413
-
-typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALEXTPROC) (GLenum face, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVEXTPROC) (GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIEXTPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVEXTPROC) (GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFEXTPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIEXTPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFEXTPROC) (GLenum face, GLenum pname, const GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIEXTPROC) (GLenum face, GLenum pname, const GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLLIGHTENVIEXTPROC) (GLenum pname, GLint param);
-
-#define glFragmentColorMaterialEXT GLEW_GET_FUN(__glewFragmentColorMaterialEXT)
-#define glFragmentLightModelfEXT GLEW_GET_FUN(__glewFragmentLightModelfEXT)
-#define glFragmentLightModelfvEXT GLEW_GET_FUN(__glewFragmentLightModelfvEXT)
-#define glFragmentLightModeliEXT GLEW_GET_FUN(__glewFragmentLightModeliEXT)
-#define glFragmentLightModelivEXT GLEW_GET_FUN(__glewFragmentLightModelivEXT)
-#define glFragmentLightfEXT GLEW_GET_FUN(__glewFragmentLightfEXT)
-#define glFragmentLightfvEXT GLEW_GET_FUN(__glewFragmentLightfvEXT)
-#define glFragmentLightiEXT GLEW_GET_FUN(__glewFragmentLightiEXT)
-#define glFragmentLightivEXT GLEW_GET_FUN(__glewFragmentLightivEXT)
-#define glFragmentMaterialfEXT GLEW_GET_FUN(__glewFragmentMaterialfEXT)
-#define glFragmentMaterialfvEXT GLEW_GET_FUN(__glewFragmentMaterialfvEXT)
-#define glFragmentMaterialiEXT GLEW_GET_FUN(__glewFragmentMaterialiEXT)
-#define glFragmentMaterialivEXT GLEW_GET_FUN(__glewFragmentMaterialivEXT)
-#define glGetFragmentLightfvEXT GLEW_GET_FUN(__glewGetFragmentLightfvEXT)
-#define glGetFragmentLightivEXT GLEW_GET_FUN(__glewGetFragmentLightivEXT)
-#define glGetFragmentMaterialfvEXT GLEW_GET_FUN(__glewGetFragmentMaterialfvEXT)
-#define glGetFragmentMaterialivEXT GLEW_GET_FUN(__glewGetFragmentMaterialivEXT)
-#define glLightEnviEXT GLEW_GET_FUN(__glewLightEnviEXT)
-
-#define GLEW_EXT_fragment_lighting GLEW_GET_VAR(__GLEW_EXT_fragment_lighting)
-
-#endif /* GL_EXT_fragment_lighting */
-
-/* ------------------------ GL_EXT_framebuffer_blit ------------------------ */
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6
-#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA
-
-typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-
-#define glBlitFramebufferEXT GLEW_GET_FUN(__glewBlitFramebufferEXT)
-
-#define GLEW_EXT_framebuffer_blit GLEW_GET_VAR(__GLEW_EXT_framebuffer_blit)
-
-#endif /* GL_EXT_framebuffer_blit */
-
-/* --------------------- GL_EXT_framebuffer_multisample -------------------- */
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-
-#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT 0x8D57
-
-typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-
-#define glRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewRenderbufferStorageMultisampleEXT)
-
-#define GLEW_EXT_framebuffer_multisample GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample)
-
-#endif /* GL_EXT_framebuffer_multisample */
-
-/* --------------- GL_EXT_framebuffer_multisample_blit_scaled -------------- */
-
-#ifndef GL_EXT_framebuffer_multisample_blit_scaled
-#define GL_EXT_framebuffer_multisample_blit_scaled 1
-
-#define GL_SCALED_RESOLVE_FASTEST_EXT 0x90BA
-#define GL_SCALED_RESOLVE_NICEST_EXT 0x90BB
-
-#define GLEW_EXT_framebuffer_multisample_blit_scaled GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample_blit_scaled)
-
-#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
-
-/* ----------------------- GL_EXT_framebuffer_object ----------------------- */
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT 0x8D20
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#define GL_RENDERBUFFER_EXT 0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT 0x8D46
-#define GL_STENCIL_INDEX4_EXT 0x8D47
-#define GL_STENCIL_INDEX8_EXT 0x8D48
-#define GL_STENCIL_INDEX16_EXT 0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55
-
-typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint* framebuffers);
-typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint* renderbuffers);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint* framebuffers);
-typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint* renderbuffers);
-typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-
-#define glBindFramebufferEXT GLEW_GET_FUN(__glewBindFramebufferEXT)
-#define glBindRenderbufferEXT GLEW_GET_FUN(__glewBindRenderbufferEXT)
-#define glCheckFramebufferStatusEXT GLEW_GET_FUN(__glewCheckFramebufferStatusEXT)
-#define glDeleteFramebuffersEXT GLEW_GET_FUN(__glewDeleteFramebuffersEXT)
-#define glDeleteRenderbuffersEXT GLEW_GET_FUN(__glewDeleteRenderbuffersEXT)
-#define glFramebufferRenderbufferEXT GLEW_GET_FUN(__glewFramebufferRenderbufferEXT)
-#define glFramebufferTexture1DEXT GLEW_GET_FUN(__glewFramebufferTexture1DEXT)
-#define glFramebufferTexture2DEXT GLEW_GET_FUN(__glewFramebufferTexture2DEXT)
-#define glFramebufferTexture3DEXT GLEW_GET_FUN(__glewFramebufferTexture3DEXT)
-#define glGenFramebuffersEXT GLEW_GET_FUN(__glewGenFramebuffersEXT)
-#define glGenRenderbuffersEXT GLEW_GET_FUN(__glewGenRenderbuffersEXT)
-#define glGenerateMipmapEXT GLEW_GET_FUN(__glewGenerateMipmapEXT)
-#define glGetFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetFramebufferAttachmentParameterivEXT)
-#define glGetRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetRenderbufferParameterivEXT)
-#define glIsFramebufferEXT GLEW_GET_FUN(__glewIsFramebufferEXT)
-#define glIsRenderbufferEXT GLEW_GET_FUN(__glewIsRenderbufferEXT)
-#define glRenderbufferStorageEXT GLEW_GET_FUN(__glewRenderbufferStorageEXT)
-
-#define GLEW_EXT_framebuffer_object GLEW_GET_VAR(__GLEW_EXT_framebuffer_object)
-
-#endif /* GL_EXT_framebuffer_object */
-
-/* ------------------------ GL_EXT_framebuffer_sRGB ------------------------ */
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-
-#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA
-
-#define GLEW_EXT_framebuffer_sRGB GLEW_GET_VAR(__GLEW_EXT_framebuffer_sRGB)
-
-#endif /* GL_EXT_framebuffer_sRGB */
-
-/* ------------------------ GL_EXT_geometry_shader4 ------------------------ */
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-
-#define GL_LINES_ADJACENCY_EXT 0xA
-#define GL_LINE_STRIP_ADJACENCY_EXT 0xB
-#define GL_TRIANGLES_ADJACENCY_EXT 0xC
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
-#define GL_PROGRAM_POINT_SIZE_EXT 0x8642
-#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_GEOMETRY_SHADER_EXT 0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-
-#define glFramebufferTextureEXT GLEW_GET_FUN(__glewFramebufferTextureEXT)
-#define glFramebufferTextureFaceEXT GLEW_GET_FUN(__glewFramebufferTextureFaceEXT)
-#define glProgramParameteriEXT GLEW_GET_FUN(__glewProgramParameteriEXT)
-
-#define GLEW_EXT_geometry_shader4 GLEW_GET_VAR(__GLEW_EXT_geometry_shader4)
-
-#endif /* GL_EXT_geometry_shader4 */
-
-/* --------------------- GL_EXT_gpu_program_parameters --------------------- */
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params);
-
-#define glProgramEnvParameters4fvEXT GLEW_GET_FUN(__glewProgramEnvParameters4fvEXT)
-#define glProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewProgramLocalParameters4fvEXT)
-
-#define GLEW_EXT_gpu_program_parameters GLEW_GET_VAR(__GLEW_EXT_gpu_program_parameters)
-
-#endif /* GL_EXT_gpu_program_parameters */
-
-/* --------------------------- GL_EXT_gpu_shader4 -------------------------- */
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
-#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1
-#define GL_SAMPLER_BUFFER_EXT 0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8
-#define GL_INT_SAMPLER_1D_EXT 0x8DC9
-#define GL_INT_SAMPLER_2D_EXT 0x8DCA
-#define GL_INT_SAMPLER_3D_EXT 0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-
-typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-
-#define glBindFragDataLocationEXT GLEW_GET_FUN(__glewBindFragDataLocationEXT)
-#define glGetFragDataLocationEXT GLEW_GET_FUN(__glewGetFragDataLocationEXT)
-#define glGetUniformuivEXT GLEW_GET_FUN(__glewGetUniformuivEXT)
-#define glGetVertexAttribIivEXT GLEW_GET_FUN(__glewGetVertexAttribIivEXT)
-#define glGetVertexAttribIuivEXT GLEW_GET_FUN(__glewGetVertexAttribIuivEXT)
-#define glUniform1uiEXT GLEW_GET_FUN(__glewUniform1uiEXT)
-#define glUniform1uivEXT GLEW_GET_FUN(__glewUniform1uivEXT)
-#define glUniform2uiEXT GLEW_GET_FUN(__glewUniform2uiEXT)
-#define glUniform2uivEXT GLEW_GET_FUN(__glewUniform2uivEXT)
-#define glUniform3uiEXT GLEW_GET_FUN(__glewUniform3uiEXT)
-#define glUniform3uivEXT GLEW_GET_FUN(__glewUniform3uivEXT)
-#define glUniform4uiEXT GLEW_GET_FUN(__glewUniform4uiEXT)
-#define glUniform4uivEXT GLEW_GET_FUN(__glewUniform4uivEXT)
-#define glVertexAttribI1iEXT GLEW_GET_FUN(__glewVertexAttribI1iEXT)
-#define glVertexAttribI1ivEXT GLEW_GET_FUN(__glewVertexAttribI1ivEXT)
-#define glVertexAttribI1uiEXT GLEW_GET_FUN(__glewVertexAttribI1uiEXT)
-#define glVertexAttribI1uivEXT GLEW_GET_FUN(__glewVertexAttribI1uivEXT)
-#define glVertexAttribI2iEXT GLEW_GET_FUN(__glewVertexAttribI2iEXT)
-#define glVertexAttribI2ivEXT GLEW_GET_FUN(__glewVertexAttribI2ivEXT)
-#define glVertexAttribI2uiEXT GLEW_GET_FUN(__glewVertexAttribI2uiEXT)
-#define glVertexAttribI2uivEXT GLEW_GET_FUN(__glewVertexAttribI2uivEXT)
-#define glVertexAttribI3iEXT GLEW_GET_FUN(__glewVertexAttribI3iEXT)
-#define glVertexAttribI3ivEXT GLEW_GET_FUN(__glewVertexAttribI3ivEXT)
-#define glVertexAttribI3uiEXT GLEW_GET_FUN(__glewVertexAttribI3uiEXT)
-#define glVertexAttribI3uivEXT GLEW_GET_FUN(__glewVertexAttribI3uivEXT)
-#define glVertexAttribI4bvEXT GLEW_GET_FUN(__glewVertexAttribI4bvEXT)
-#define glVertexAttribI4iEXT GLEW_GET_FUN(__glewVertexAttribI4iEXT)
-#define glVertexAttribI4ivEXT GLEW_GET_FUN(__glewVertexAttribI4ivEXT)
-#define glVertexAttribI4svEXT GLEW_GET_FUN(__glewVertexAttribI4svEXT)
-#define glVertexAttribI4ubvEXT GLEW_GET_FUN(__glewVertexAttribI4ubvEXT)
-#define glVertexAttribI4uiEXT GLEW_GET_FUN(__glewVertexAttribI4uiEXT)
-#define glVertexAttribI4uivEXT GLEW_GET_FUN(__glewVertexAttribI4uivEXT)
-#define glVertexAttribI4usvEXT GLEW_GET_FUN(__glewVertexAttribI4usvEXT)
-#define glVertexAttribIPointerEXT GLEW_GET_FUN(__glewVertexAttribIPointerEXT)
-
-#define GLEW_EXT_gpu_shader4 GLEW_GET_VAR(__GLEW_EXT_gpu_shader4)
-
-#endif /* GL_EXT_gpu_shader4 */
-
-/* ---------------------------- GL_EXT_histogram --------------------------- */
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-
-#define GL_HISTOGRAM_EXT 0x8024
-#define GL_PROXY_HISTOGRAM_EXT 0x8025
-#define GL_HISTOGRAM_WIDTH_EXT 0x8026
-#define GL_HISTOGRAM_FORMAT_EXT 0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C
-#define GL_HISTOGRAM_SINK_EXT 0x802D
-#define GL_MINMAX_EXT 0x802E
-#define GL_MINMAX_FORMAT_EXT 0x802F
-#define GL_MINMAX_SINK_EXT 0x8030
-
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void* values);
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void* values);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (GLAPIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
-
-#define glGetHistogramEXT GLEW_GET_FUN(__glewGetHistogramEXT)
-#define glGetHistogramParameterfvEXT GLEW_GET_FUN(__glewGetHistogramParameterfvEXT)
-#define glGetHistogramParameterivEXT GLEW_GET_FUN(__glewGetHistogramParameterivEXT)
-#define glGetMinmaxEXT GLEW_GET_FUN(__glewGetMinmaxEXT)
-#define glGetMinmaxParameterfvEXT GLEW_GET_FUN(__glewGetMinmaxParameterfvEXT)
-#define glGetMinmaxParameterivEXT GLEW_GET_FUN(__glewGetMinmaxParameterivEXT)
-#define glHistogramEXT GLEW_GET_FUN(__glewHistogramEXT)
-#define glMinmaxEXT GLEW_GET_FUN(__glewMinmaxEXT)
-#define glResetHistogramEXT GLEW_GET_FUN(__glewResetHistogramEXT)
-#define glResetMinmaxEXT GLEW_GET_FUN(__glewResetMinmaxEXT)
-
-#define GLEW_EXT_histogram GLEW_GET_VAR(__GLEW_EXT_histogram)
-
-#endif /* GL_EXT_histogram */
-
-/* ----------------------- GL_EXT_index_array_formats ---------------------- */
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-
-#define GLEW_EXT_index_array_formats GLEW_GET_VAR(__GLEW_EXT_index_array_formats)
-
-#endif /* GL_EXT_index_array_formats */
-
-/* --------------------------- GL_EXT_index_func --------------------------- */
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-
-typedef void (GLAPIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref);
-
-#define glIndexFuncEXT GLEW_GET_FUN(__glewIndexFuncEXT)
-
-#define GLEW_EXT_index_func GLEW_GET_VAR(__GLEW_EXT_index_func)
-
-#endif /* GL_EXT_index_func */
-
-/* ------------------------- GL_EXT_index_material ------------------------- */
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-
-typedef void (GLAPIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-
-#define glIndexMaterialEXT GLEW_GET_FUN(__glewIndexMaterialEXT)
-
-#define GLEW_EXT_index_material GLEW_GET_VAR(__GLEW_EXT_index_material)
-
-#endif /* GL_EXT_index_material */
-
-/* -------------------------- GL_EXT_index_texture ------------------------- */
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-
-#define GLEW_EXT_index_texture GLEW_GET_VAR(__GLEW_EXT_index_texture)
-
-#endif /* GL_EXT_index_texture */
-
-/* -------------------------- GL_EXT_light_texture ------------------------- */
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-
-#define GL_FRAGMENT_MATERIAL_EXT 0x8349
-#define GL_FRAGMENT_NORMAL_EXT 0x834A
-#define GL_FRAGMENT_COLOR_EXT 0x834C
-#define GL_ATTENUATION_EXT 0x834D
-#define GL_SHADOW_ATTENUATION_EXT 0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F
-#define GL_TEXTURE_LIGHT_EXT 0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-
-typedef void (GLAPIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (GLAPIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-
-#define glApplyTextureEXT GLEW_GET_FUN(__glewApplyTextureEXT)
-#define glTextureLightEXT GLEW_GET_FUN(__glewTextureLightEXT)
-#define glTextureMaterialEXT GLEW_GET_FUN(__glewTextureMaterialEXT)
-
-#define GLEW_EXT_light_texture GLEW_GET_VAR(__GLEW_EXT_light_texture)
-
-#endif /* GL_EXT_light_texture */
-
-/* ------------------------- GL_EXT_misc_attribute ------------------------- */
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-
-#define GLEW_EXT_misc_attribute GLEW_GET_VAR(__GLEW_EXT_misc_attribute)
-
-#endif /* GL_EXT_misc_attribute */
-
-/* ------------------------ GL_EXT_multi_draw_arrays ----------------------- */
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid **indices, GLsizei primcount);
-
-#define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT)
-#define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT)
-
-#define GLEW_EXT_multi_draw_arrays GLEW_GET_VAR(__GLEW_EXT_multi_draw_arrays)
-
-#endif /* GL_EXT_multi_draw_arrays */
-
-/* --------------------------- GL_EXT_multisample -------------------------- */
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-
-#define GL_MULTISAMPLE_EXT 0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F
-#define GL_SAMPLE_MASK_EXT 0x80A0
-#define GL_1PASS_EXT 0x80A1
-#define GL_2PASS_0_EXT 0x80A2
-#define GL_2PASS_1_EXT 0x80A3
-#define GL_4PASS_0_EXT 0x80A4
-#define GL_4PASS_1_EXT 0x80A5
-#define GL_4PASS_2_EXT 0x80A6
-#define GL_4PASS_3_EXT 0x80A7
-#define GL_SAMPLE_BUFFERS_EXT 0x80A8
-#define GL_SAMPLES_EXT 0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB
-#define GL_SAMPLE_PATTERN_EXT 0x80AC
-#define GL_MULTISAMPLE_BIT_EXT 0x20000000
-
-typedef void (GLAPIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-
-#define glSampleMaskEXT GLEW_GET_FUN(__glewSampleMaskEXT)
-#define glSamplePatternEXT GLEW_GET_FUN(__glewSamplePatternEXT)
-
-#define GLEW_EXT_multisample GLEW_GET_VAR(__GLEW_EXT_multisample)
-
-#endif /* GL_EXT_multisample */
-
-/* ---------------------- GL_EXT_packed_depth_stencil ---------------------- */
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-
-#define GL_DEPTH_STENCIL_EXT 0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
-#define GL_DEPTH24_STENCIL8_EXT 0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
-
-#define GLEW_EXT_packed_depth_stencil GLEW_GET_VAR(__GLEW_EXT_packed_depth_stencil)
-
-#endif /* GL_EXT_packed_depth_stencil */
-
-/* -------------------------- GL_EXT_packed_float -------------------------- */
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-
-#define GL_R11F_G11F_B10F_EXT 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C
-
-#define GLEW_EXT_packed_float GLEW_GET_VAR(__GLEW_EXT_packed_float)
-
-#endif /* GL_EXT_packed_float */
-
-/* -------------------------- GL_EXT_packed_pixels ------------------------- */
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-
-#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036
-
-#define GLEW_EXT_packed_pixels GLEW_GET_VAR(__GLEW_EXT_packed_pixels)
-
-#endif /* GL_EXT_packed_pixels */
-
-/* ------------------------ GL_EXT_paletted_texture ------------------------ */
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_PROXY_TEXTURE_1D 0x8063
-#define GL_PROXY_TEXTURE_2D 0x8064
-#define GL_COLOR_TABLE_FORMAT_EXT 0x80D8
-#define GL_COLOR_TABLE_WIDTH_EXT 0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_EXT 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_EXT 0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_EXT 0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_EXT 0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF
-#define GL_COLOR_INDEX1_EXT 0x80E2
-#define GL_COLOR_INDEX2_EXT 0x80E3
-#define GL_COLOR_INDEX4_EXT 0x80E4
-#define GL_COLOR_INDEX8_EXT 0x80E5
-#define GL_COLOR_INDEX12_EXT 0x80E6
-#define GL_COLOR_INDEX16_EXT 0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
-#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
-
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void* data);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void* data);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
-
-#define glColorTableEXT GLEW_GET_FUN(__glewColorTableEXT)
-#define glGetColorTableEXT GLEW_GET_FUN(__glewGetColorTableEXT)
-#define glGetColorTableParameterfvEXT GLEW_GET_FUN(__glewGetColorTableParameterfvEXT)
-#define glGetColorTableParameterivEXT GLEW_GET_FUN(__glewGetColorTableParameterivEXT)
-
-#define GLEW_EXT_paletted_texture GLEW_GET_VAR(__GLEW_EXT_paletted_texture)
-
-#endif /* GL_EXT_paletted_texture */
-
-/* ----------------------- GL_EXT_pixel_buffer_object ---------------------- */
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-
-#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-
-#define GLEW_EXT_pixel_buffer_object GLEW_GET_VAR(__GLEW_EXT_pixel_buffer_object)
-
-#endif /* GL_EXT_pixel_buffer_object */
-
-/* ------------------------- GL_EXT_pixel_transform ------------------------ */
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-
-#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330
-#define GL_PIXEL_MAG_FILTER_EXT 0x8331
-#define GL_PIXEL_MIN_FILTER_EXT 0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333
-#define GL_CUBIC_EXT 0x8334
-#define GL_AVERAGE_EXT 0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338
-
-typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, const GLfloat param);
-typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, const GLint param);
-typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
-
-#define glGetPixelTransformParameterfvEXT GLEW_GET_FUN(__glewGetPixelTransformParameterfvEXT)
-#define glGetPixelTransformParameterivEXT GLEW_GET_FUN(__glewGetPixelTransformParameterivEXT)
-#define glPixelTransformParameterfEXT GLEW_GET_FUN(__glewPixelTransformParameterfEXT)
-#define glPixelTransformParameterfvEXT GLEW_GET_FUN(__glewPixelTransformParameterfvEXT)
-#define glPixelTransformParameteriEXT GLEW_GET_FUN(__glewPixelTransformParameteriEXT)
-#define glPixelTransformParameterivEXT GLEW_GET_FUN(__glewPixelTransformParameterivEXT)
-
-#define GLEW_EXT_pixel_transform GLEW_GET_VAR(__GLEW_EXT_pixel_transform)
-
-#endif /* GL_EXT_pixel_transform */
-
-/* ------------------- GL_EXT_pixel_transform_color_table ------------------ */
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-
-#define GLEW_EXT_pixel_transform_color_table GLEW_GET_VAR(__GLEW_EXT_pixel_transform_color_table)
-
-#endif /* GL_EXT_pixel_transform_color_table */
-
-/* ------------------------ GL_EXT_point_parameters ------------------------ */
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-
-#define GL_POINT_SIZE_MIN_EXT 0x8126
-#define GL_POINT_SIZE_MAX_EXT 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128
-#define GL_DISTANCE_ATTENUATION_EXT 0x8129
-
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat* params);
-
-#define glPointParameterfEXT GLEW_GET_FUN(__glewPointParameterfEXT)
-#define glPointParameterfvEXT GLEW_GET_FUN(__glewPointParameterfvEXT)
-
-#define GLEW_EXT_point_parameters GLEW_GET_VAR(__GLEW_EXT_point_parameters)
-
-#endif /* GL_EXT_point_parameters */
-
-/* ------------------------- GL_EXT_polygon_offset ------------------------- */
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-
-#define GL_POLYGON_OFFSET_EXT 0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039
-
-typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-
-#define glPolygonOffsetEXT GLEW_GET_FUN(__glewPolygonOffsetEXT)
-
-#define GLEW_EXT_polygon_offset GLEW_GET_VAR(__GLEW_EXT_polygon_offset)
-
-#endif /* GL_EXT_polygon_offset */
-
-/* ------------------------ GL_EXT_provoking_vertex ------------------------ */
-
-#ifndef GL_EXT_provoking_vertex
-#define GL_EXT_provoking_vertex 1
-
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D
-#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E
-#define GL_PROVOKING_VERTEX_EXT 0x8E4F
-
-typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
-
-#define glProvokingVertexEXT GLEW_GET_FUN(__glewProvokingVertexEXT)
-
-#define GLEW_EXT_provoking_vertex GLEW_GET_VAR(__GLEW_EXT_provoking_vertex)
-
-#endif /* GL_EXT_provoking_vertex */
-
-/* ------------------------- GL_EXT_rescale_normal ------------------------- */
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-
-#define GL_RESCALE_NORMAL_EXT 0x803A
-
-#define GLEW_EXT_rescale_normal GLEW_GET_VAR(__GLEW_EXT_rescale_normal)
-
-#endif /* GL_EXT_rescale_normal */
-
-/* -------------------------- GL_EXT_scene_marker -------------------------- */
-
-#ifndef GL_EXT_scene_marker
-#define GL_EXT_scene_marker 1
-
-typedef void (GLAPIENTRY * PFNGLBEGINSCENEEXTPROC) (void);
-typedef void (GLAPIENTRY * PFNGLENDSCENEEXTPROC) (void);
-
-#define glBeginSceneEXT GLEW_GET_FUN(__glewBeginSceneEXT)
-#define glEndSceneEXT GLEW_GET_FUN(__glewEndSceneEXT)
-
-#define GLEW_EXT_scene_marker GLEW_GET_VAR(__GLEW_EXT_scene_marker)
-
-#endif /* GL_EXT_scene_marker */
-
-/* ------------------------- GL_EXT_secondary_color ------------------------ */
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-
-#define GL_COLOR_SUM_EXT 0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E
-
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-
-#define glSecondaryColor3bEXT GLEW_GET_FUN(__glewSecondaryColor3bEXT)
-#define glSecondaryColor3bvEXT GLEW_GET_FUN(__glewSecondaryColor3bvEXT)
-#define glSecondaryColor3dEXT GLEW_GET_FUN(__glewSecondaryColor3dEXT)
-#define glSecondaryColor3dvEXT GLEW_GET_FUN(__glewSecondaryColor3dvEXT)
-#define glSecondaryColor3fEXT GLEW_GET_FUN(__glewSecondaryColor3fEXT)
-#define glSecondaryColor3fvEXT GLEW_GET_FUN(__glewSecondaryColor3fvEXT)
-#define glSecondaryColor3iEXT GLEW_GET_FUN(__glewSecondaryColor3iEXT)
-#define glSecondaryColor3ivEXT GLEW_GET_FUN(__glewSecondaryColor3ivEXT)
-#define glSecondaryColor3sEXT GLEW_GET_FUN(__glewSecondaryColor3sEXT)
-#define glSecondaryColor3svEXT GLEW_GET_FUN(__glewSecondaryColor3svEXT)
-#define glSecondaryColor3ubEXT GLEW_GET_FUN(__glewSecondaryColor3ubEXT)
-#define glSecondaryColor3ubvEXT GLEW_GET_FUN(__glewSecondaryColor3ubvEXT)
-#define glSecondaryColor3uiEXT GLEW_GET_FUN(__glewSecondaryColor3uiEXT)
-#define glSecondaryColor3uivEXT GLEW_GET_FUN(__glewSecondaryColor3uivEXT)
-#define glSecondaryColor3usEXT GLEW_GET_FUN(__glewSecondaryColor3usEXT)
-#define glSecondaryColor3usvEXT GLEW_GET_FUN(__glewSecondaryColor3usvEXT)
-#define glSecondaryColorPointerEXT GLEW_GET_FUN(__glewSecondaryColorPointerEXT)
-
-#define GLEW_EXT_secondary_color GLEW_GET_VAR(__GLEW_EXT_secondary_color)
-
-#endif /* GL_EXT_secondary_color */
-
-/* --------------------- GL_EXT_separate_shader_objects -------------------- */
-
-#ifndef GL_EXT_separate_shader_objects
-#define GL_EXT_separate_shader_objects 1
-
-#define GL_ACTIVE_PROGRAM_EXT 0x8B8D
-
-typedef void (GLAPIENTRY * PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
-typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar* string);
-typedef void (GLAPIENTRY * PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
-
-#define glActiveProgramEXT GLEW_GET_FUN(__glewActiveProgramEXT)
-#define glCreateShaderProgramEXT GLEW_GET_FUN(__glewCreateShaderProgramEXT)
-#define glUseShaderProgramEXT GLEW_GET_FUN(__glewUseShaderProgramEXT)
-
-#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects)
-
-#endif /* GL_EXT_separate_shader_objects */
-
-/* --------------------- GL_EXT_separate_specular_color -------------------- */
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8
-#define GL_SINGLE_COLOR_EXT 0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA
-
-#define GLEW_EXT_separate_specular_color GLEW_GET_VAR(__GLEW_EXT_separate_specular_color)
-
-#endif /* GL_EXT_separate_specular_color */
-
-/* --------------------- GL_EXT_shader_image_load_store -------------------- */
-
-#ifndef GL_EXT_shader_image_load_store
-#define GL_EXT_shader_image_load_store 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
-#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002
-#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004
-#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008
-#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
-#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040
-#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080
-#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
-#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200
-#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400
-#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
-#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
-#define GL_MAX_IMAGE_UNITS_EXT 0x8F38
-#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
-#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A
-#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B
-#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C
-#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D
-#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E
-#define GL_IMAGE_1D_EXT 0x904C
-#define GL_IMAGE_2D_EXT 0x904D
-#define GL_IMAGE_3D_EXT 0x904E
-#define GL_IMAGE_2D_RECT_EXT 0x904F
-#define GL_IMAGE_CUBE_EXT 0x9050
-#define GL_IMAGE_BUFFER_EXT 0x9051
-#define GL_IMAGE_1D_ARRAY_EXT 0x9052
-#define GL_IMAGE_2D_ARRAY_EXT 0x9053
-#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054
-#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055
-#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
-#define GL_INT_IMAGE_1D_EXT 0x9057
-#define GL_INT_IMAGE_2D_EXT 0x9058
-#define GL_INT_IMAGE_3D_EXT 0x9059
-#define GL_INT_IMAGE_2D_RECT_EXT 0x905A
-#define GL_INT_IMAGE_CUBE_EXT 0x905B
-#define GL_INT_IMAGE_BUFFER_EXT 0x905C
-#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D
-#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E
-#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F
-#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060
-#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
-#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062
-#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063
-#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064
-#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
-#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066
-#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067
-#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
-#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
-#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
-#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D
-#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E
-#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF
-
-typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
-typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
-
-#define glBindImageTextureEXT GLEW_GET_FUN(__glewBindImageTextureEXT)
-#define glMemoryBarrierEXT GLEW_GET_FUN(__glewMemoryBarrierEXT)
-
-#define GLEW_EXT_shader_image_load_store GLEW_GET_VAR(__GLEW_EXT_shader_image_load_store)
-
-#endif /* GL_EXT_shader_image_load_store */
-
-/* -------------------------- GL_EXT_shadow_funcs -------------------------- */
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-
-#define GLEW_EXT_shadow_funcs GLEW_GET_VAR(__GLEW_EXT_shadow_funcs)
-
-#endif /* GL_EXT_shadow_funcs */
-
-/* --------------------- GL_EXT_shared_texture_palette --------------------- */
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-
-#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB
-
-#define GLEW_EXT_shared_texture_palette GLEW_GET_VAR(__GLEW_EXT_shared_texture_palette)
-
-#endif /* GL_EXT_shared_texture_palette */
-
-/* ------------------------ GL_EXT_stencil_clear_tag ----------------------- */
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-
-#define GL_STENCIL_TAG_BITS_EXT 0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3
-
-#define GLEW_EXT_stencil_clear_tag GLEW_GET_VAR(__GLEW_EXT_stencil_clear_tag)
-
-#endif /* GL_EXT_stencil_clear_tag */
-
-/* ------------------------ GL_EXT_stencil_two_side ------------------------ */
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-
-#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911
-
-typedef void (GLAPIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-
-#define glActiveStencilFaceEXT GLEW_GET_FUN(__glewActiveStencilFaceEXT)
-
-#define GLEW_EXT_stencil_two_side GLEW_GET_VAR(__GLEW_EXT_stencil_two_side)
-
-#endif /* GL_EXT_stencil_two_side */
-
-/* -------------------------- GL_EXT_stencil_wrap -------------------------- */
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-
-#define GL_INCR_WRAP_EXT 0x8507
-#define GL_DECR_WRAP_EXT 0x8508
-
-#define GLEW_EXT_stencil_wrap GLEW_GET_VAR(__GLEW_EXT_stencil_wrap)
-
-#endif /* GL_EXT_stencil_wrap */
-
-/* --------------------------- GL_EXT_subtexture --------------------------- */
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-
-typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
-
-#define glTexSubImage1DEXT GLEW_GET_FUN(__glewTexSubImage1DEXT)
-#define glTexSubImage2DEXT GLEW_GET_FUN(__glewTexSubImage2DEXT)
-#define glTexSubImage3DEXT GLEW_GET_FUN(__glewTexSubImage3DEXT)
-
-#define GLEW_EXT_subtexture GLEW_GET_VAR(__GLEW_EXT_subtexture)
-
-#endif /* GL_EXT_subtexture */
-
-/* ----------------------------- GL_EXT_texture ---------------------------- */
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-
-#define GL_ALPHA4_EXT 0x803B
-#define GL_ALPHA8_EXT 0x803C
-#define GL_ALPHA12_EXT 0x803D
-#define GL_ALPHA16_EXT 0x803E
-#define GL_LUMINANCE4_EXT 0x803F
-#define GL_LUMINANCE8_EXT 0x8040
-#define GL_LUMINANCE12_EXT 0x8041
-#define GL_LUMINANCE16_EXT 0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT 0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT 0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT 0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT 0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT 0x8048
-#define GL_INTENSITY_EXT 0x8049
-#define GL_INTENSITY4_EXT 0x804A
-#define GL_INTENSITY8_EXT 0x804B
-#define GL_INTENSITY12_EXT 0x804C
-#define GL_INTENSITY16_EXT 0x804D
-#define GL_RGB2_EXT 0x804E
-#define GL_RGB4_EXT 0x804F
-#define GL_RGB5_EXT 0x8050
-#define GL_RGB8_EXT 0x8051
-#define GL_RGB10_EXT 0x8052
-#define GL_RGB12_EXT 0x8053
-#define GL_RGB16_EXT 0x8054
-#define GL_RGBA2_EXT 0x8055
-#define GL_RGBA4_EXT 0x8056
-#define GL_RGB5_A1_EXT 0x8057
-#define GL_RGBA8_EXT 0x8058
-#define GL_RGB10_A2_EXT 0x8059
-#define GL_RGBA12_EXT 0x805A
-#define GL_RGBA16_EXT 0x805B
-#define GL_TEXTURE_RED_SIZE_EXT 0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061
-#define GL_REPLACE_EXT 0x8062
-#define GL_PROXY_TEXTURE_1D_EXT 0x8063
-#define GL_PROXY_TEXTURE_2D_EXT 0x8064
-
-#define GLEW_EXT_texture GLEW_GET_VAR(__GLEW_EXT_texture)
-
-#endif /* GL_EXT_texture */
-
-/* ---------------------------- GL_EXT_texture3D --------------------------- */
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-
-#define GL_PACK_SKIP_IMAGES_EXT 0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E
-#define GL_TEXTURE_3D_EXT 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT 0x8070
-#define GL_TEXTURE_DEPTH_EXT 0x8071
-#define GL_TEXTURE_WRAP_R_EXT 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073
-
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels);
-
-#define glTexImage3DEXT GLEW_GET_FUN(__glewTexImage3DEXT)
-
-#define GLEW_EXT_texture3D GLEW_GET_VAR(__GLEW_EXT_texture3D)
-
-#endif /* GL_EXT_texture3D */
-
-/* -------------------------- GL_EXT_texture_array ------------------------- */
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
-#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
-
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-
-#define glFramebufferTextureLayerEXT GLEW_GET_FUN(__glewFramebufferTextureLayerEXT)
-
-#define GLEW_EXT_texture_array GLEW_GET_VAR(__GLEW_EXT_texture_array)
-
-#endif /* GL_EXT_texture_array */
-
-/* ---------------------- GL_EXT_texture_buffer_object --------------------- */
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-
-#define GL_TEXTURE_BUFFER_EXT 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E
-
-typedef void (GLAPIENTRY * PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-
-#define glTexBufferEXT GLEW_GET_FUN(__glewTexBufferEXT)
-
-#define GLEW_EXT_texture_buffer_object GLEW_GET_VAR(__GLEW_EXT_texture_buffer_object)
-
-#endif /* GL_EXT_texture_buffer_object */
-
-/* -------------------- GL_EXT_texture_compression_dxt1 -------------------- */
-
-#ifndef GL_EXT_texture_compression_dxt1
-#define GL_EXT_texture_compression_dxt1 1
-
-#define GLEW_EXT_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_EXT_texture_compression_dxt1)
-
-#endif /* GL_EXT_texture_compression_dxt1 */
-
-/* -------------------- GL_EXT_texture_compression_latc -------------------- */
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-
-#define GLEW_EXT_texture_compression_latc GLEW_GET_VAR(__GLEW_EXT_texture_compression_latc)
-
-#endif /* GL_EXT_texture_compression_latc */
-
-/* -------------------- GL_EXT_texture_compression_rgtc -------------------- */
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-
-#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-
-#define GLEW_EXT_texture_compression_rgtc GLEW_GET_VAR(__GLEW_EXT_texture_compression_rgtc)
-
-#endif /* GL_EXT_texture_compression_rgtc */
-
-/* -------------------- GL_EXT_texture_compression_s3tc -------------------- */
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_EXT_texture_compression_s3tc 1
-
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-
-#define GLEW_EXT_texture_compression_s3tc GLEW_GET_VAR(__GLEW_EXT_texture_compression_s3tc)
-
-#endif /* GL_EXT_texture_compression_s3tc */
-
-/* ------------------------ GL_EXT_texture_cube_map ------------------------ */
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_EXT_texture_cube_map 1
-
-#define GL_NORMAL_MAP_EXT 0x8511
-#define GL_REFLECTION_MAP_EXT 0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C
-
-#define GLEW_EXT_texture_cube_map GLEW_GET_VAR(__GLEW_EXT_texture_cube_map)
-
-#endif /* GL_EXT_texture_cube_map */
-
-/* ----------------------- GL_EXT_texture_edge_clamp ----------------------- */
-
-#ifndef GL_EXT_texture_edge_clamp
-#define GL_EXT_texture_edge_clamp 1
-
-#define GL_CLAMP_TO_EDGE_EXT 0x812F
-
-#define GLEW_EXT_texture_edge_clamp GLEW_GET_VAR(__GLEW_EXT_texture_edge_clamp)
-
-#endif /* GL_EXT_texture_edge_clamp */
-
-/* --------------------------- GL_EXT_texture_env -------------------------- */
-
-#ifndef GL_EXT_texture_env
-#define GL_EXT_texture_env 1
-
-#define GL_TEXTURE_ENV0_EXT 0
-#define GL_ENV_BLEND_EXT 0
-#define GL_TEXTURE_ENV_SHIFT_EXT 0
-#define GL_ENV_REPLACE_EXT 0
-#define GL_ENV_ADD_EXT 0
-#define GL_ENV_SUBTRACT_EXT 0
-#define GL_TEXTURE_ENV_MODE_ALPHA_EXT 0
-#define GL_ENV_REVERSE_SUBTRACT_EXT 0
-#define GL_ENV_REVERSE_BLEND_EXT 0
-#define GL_ENV_COPY_EXT 0
-#define GL_ENV_MODULATE_EXT 0
-
-#define GLEW_EXT_texture_env GLEW_GET_VAR(__GLEW_EXT_texture_env)
-
-#endif /* GL_EXT_texture_env */
-
-/* ------------------------- GL_EXT_texture_env_add ------------------------ */
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-
-#define GLEW_EXT_texture_env_add GLEW_GET_VAR(__GLEW_EXT_texture_env_add)
-
-#endif /* GL_EXT_texture_env_add */
-
-/* ----------------------- GL_EXT_texture_env_combine ---------------------- */
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-
-#define GL_COMBINE_EXT 0x8570
-#define GL_COMBINE_RGB_EXT 0x8571
-#define GL_COMBINE_ALPHA_EXT 0x8572
-#define GL_RGB_SCALE_EXT 0x8573
-#define GL_ADD_SIGNED_EXT 0x8574
-#define GL_INTERPOLATE_EXT 0x8575
-#define GL_CONSTANT_EXT 0x8576
-#define GL_PRIMARY_COLOR_EXT 0x8577
-#define GL_PREVIOUS_EXT 0x8578
-#define GL_SOURCE0_RGB_EXT 0x8580
-#define GL_SOURCE1_RGB_EXT 0x8581
-#define GL_SOURCE2_RGB_EXT 0x8582
-#define GL_SOURCE0_ALPHA_EXT 0x8588
-#define GL_SOURCE1_ALPHA_EXT 0x8589
-#define GL_SOURCE2_ALPHA_EXT 0x858A
-#define GL_OPERAND0_RGB_EXT 0x8590
-#define GL_OPERAND1_RGB_EXT 0x8591
-#define GL_OPERAND2_RGB_EXT 0x8592
-#define GL_OPERAND0_ALPHA_EXT 0x8598
-#define GL_OPERAND1_ALPHA_EXT 0x8599
-#define GL_OPERAND2_ALPHA_EXT 0x859A
-
-#define GLEW_EXT_texture_env_combine GLEW_GET_VAR(__GLEW_EXT_texture_env_combine)
-
-#endif /* GL_EXT_texture_env_combine */
-
-/* ------------------------ GL_EXT_texture_env_dot3 ------------------------ */
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-
-#define GL_DOT3_RGB_EXT 0x8740
-#define GL_DOT3_RGBA_EXT 0x8741
-
-#define GLEW_EXT_texture_env_dot3 GLEW_GET_VAR(__GLEW_EXT_texture_env_dot3)
-
-#endif /* GL_EXT_texture_env_dot3 */
-
-/* ------------------- GL_EXT_texture_filter_anisotropic ------------------- */
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-
-#define GLEW_EXT_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_EXT_texture_filter_anisotropic)
-
-#endif /* GL_EXT_texture_filter_anisotropic */
-
-/* ------------------------- GL_EXT_texture_integer ------------------------ */
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-
-#define GL_RGBA32UI_EXT 0x8D70
-#define GL_RGB32UI_EXT 0x8D71
-#define GL_ALPHA32UI_EXT 0x8D72
-#define GL_INTENSITY32UI_EXT 0x8D73
-#define GL_LUMINANCE32UI_EXT 0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75
-#define GL_RGBA16UI_EXT 0x8D76
-#define GL_RGB16UI_EXT 0x8D77
-#define GL_ALPHA16UI_EXT 0x8D78
-#define GL_INTENSITY16UI_EXT 0x8D79
-#define GL_LUMINANCE16UI_EXT 0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B
-#define GL_RGBA8UI_EXT 0x8D7C
-#define GL_RGB8UI_EXT 0x8D7D
-#define GL_ALPHA8UI_EXT 0x8D7E
-#define GL_INTENSITY8UI_EXT 0x8D7F
-#define GL_LUMINANCE8UI_EXT 0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81
-#define GL_RGBA32I_EXT 0x8D82
-#define GL_RGB32I_EXT 0x8D83
-#define GL_ALPHA32I_EXT 0x8D84
-#define GL_INTENSITY32I_EXT 0x8D85
-#define GL_LUMINANCE32I_EXT 0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87
-#define GL_RGBA16I_EXT 0x8D88
-#define GL_RGB16I_EXT 0x8D89
-#define GL_ALPHA16I_EXT 0x8D8A
-#define GL_INTENSITY16I_EXT 0x8D8B
-#define GL_LUMINANCE16I_EXT 0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D
-#define GL_RGBA8I_EXT 0x8D8E
-#define GL_RGB8I_EXT 0x8D8F
-#define GL_ALPHA8I_EXT 0x8D90
-#define GL_INTENSITY8I_EXT 0x8D91
-#define GL_LUMINANCE8I_EXT 0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93
-#define GL_RED_INTEGER_EXT 0x8D94
-#define GL_GREEN_INTEGER_EXT 0x8D95
-#define GL_BLUE_INTEGER_EXT 0x8D96
-#define GL_ALPHA_INTEGER_EXT 0x8D97
-#define GL_RGB_INTEGER_EXT 0x8D98
-#define GL_RGBA_INTEGER_EXT 0x8D99
-#define GL_BGR_INTEGER_EXT 0x8D9A
-#define GL_BGRA_INTEGER_EXT 0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT 0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E
-
-typedef void (GLAPIENTRY * PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (GLAPIENTRY * PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-
-#define glClearColorIiEXT GLEW_GET_FUN(__glewClearColorIiEXT)
-#define glClearColorIuiEXT GLEW_GET_FUN(__glewClearColorIuiEXT)
-#define glGetTexParameterIivEXT GLEW_GET_FUN(__glewGetTexParameterIivEXT)
-#define glGetTexParameterIuivEXT GLEW_GET_FUN(__glewGetTexParameterIuivEXT)
-#define glTexParameterIivEXT GLEW_GET_FUN(__glewTexParameterIivEXT)
-#define glTexParameterIuivEXT GLEW_GET_FUN(__glewTexParameterIuivEXT)
-
-#define GLEW_EXT_texture_integer GLEW_GET_VAR(__GLEW_EXT_texture_integer)
-
-#endif /* GL_EXT_texture_integer */
-
-/* ------------------------ GL_EXT_texture_lod_bias ------------------------ */
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT 0x8501
-
-#define GLEW_EXT_texture_lod_bias GLEW_GET_VAR(__GLEW_EXT_texture_lod_bias)
-
-#endif /* GL_EXT_texture_lod_bias */
-
-/* ---------------------- GL_EXT_texture_mirror_clamp ---------------------- */
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-
-#define GL_MIRROR_CLAMP_EXT 0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912
-
-#define GLEW_EXT_texture_mirror_clamp GLEW_GET_VAR(__GLEW_EXT_texture_mirror_clamp)
-
-#endif /* GL_EXT_texture_mirror_clamp */
-
-/* ------------------------- GL_EXT_texture_object ------------------------- */
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-
-#define GL_TEXTURE_PRIORITY_EXT 0x8066
-#define GL_TEXTURE_RESIDENT_EXT 0x8067
-#define GL_TEXTURE_1D_BINDING_EXT 0x8068
-#define GL_TEXTURE_2D_BINDING_EXT 0x8069
-#define GL_TEXTURE_3D_BINDING_EXT 0x806A
-
-typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint* textures, GLboolean* residences);
-typedef void (GLAPIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (GLAPIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint* textures);
-typedef void (GLAPIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint* textures);
-typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint* textures, const GLclampf* priorities);
-
-#define glAreTexturesResidentEXT GLEW_GET_FUN(__glewAreTexturesResidentEXT)
-#define glBindTextureEXT GLEW_GET_FUN(__glewBindTextureEXT)
-#define glDeleteTexturesEXT GLEW_GET_FUN(__glewDeleteTexturesEXT)
-#define glGenTexturesEXT GLEW_GET_FUN(__glewGenTexturesEXT)
-#define glIsTextureEXT GLEW_GET_FUN(__glewIsTextureEXT)
-#define glPrioritizeTexturesEXT GLEW_GET_FUN(__glewPrioritizeTexturesEXT)
-
-#define GLEW_EXT_texture_object GLEW_GET_VAR(__GLEW_EXT_texture_object)
-
-#endif /* GL_EXT_texture_object */
-
-/* --------------------- GL_EXT_texture_perturb_normal --------------------- */
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-
-#define GL_PERTURB_EXT 0x85AE
-#define GL_TEXTURE_NORMAL_EXT 0x85AF
-
-typedef void (GLAPIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-
-#define glTextureNormalEXT GLEW_GET_FUN(__glewTextureNormalEXT)
-
-#define GLEW_EXT_texture_perturb_normal GLEW_GET_VAR(__GLEW_EXT_texture_perturb_normal)
-
-#endif /* GL_EXT_texture_perturb_normal */
-
-/* ------------------------ GL_EXT_texture_rectangle ----------------------- */
-
-#ifndef GL_EXT_texture_rectangle
-#define GL_EXT_texture_rectangle 1
-
-#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT 0x84F8
-
-#define GLEW_EXT_texture_rectangle GLEW_GET_VAR(__GLEW_EXT_texture_rectangle)
-
-#endif /* GL_EXT_texture_rectangle */
-
-/* -------------------------- GL_EXT_texture_sRGB -------------------------- */
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-
-#define GL_SRGB_EXT 0x8C40
-#define GL_SRGB8_EXT 0x8C41
-#define GL_SRGB_ALPHA_EXT 0x8C42
-#define GL_SRGB8_ALPHA8_EXT 0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT 0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45
-#define GL_SLUMINANCE_EXT 0x8C46
-#define GL_SLUMINANCE8_EXT 0x8C47
-#define GL_COMPRESSED_SRGB_EXT 0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-
-#define GLEW_EXT_texture_sRGB GLEW_GET_VAR(__GLEW_EXT_texture_sRGB)
-
-#endif /* GL_EXT_texture_sRGB */
-
-/* ----------------------- GL_EXT_texture_sRGB_decode ---------------------- */
-
-#ifndef GL_EXT_texture_sRGB_decode
-#define GL_EXT_texture_sRGB_decode 1
-
-#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
-#define GL_DECODE_EXT 0x8A49
-#define GL_SKIP_DECODE_EXT 0x8A4A
-
-#define GLEW_EXT_texture_sRGB_decode GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_decode)
-
-#endif /* GL_EXT_texture_sRGB_decode */
-
-/* --------------------- GL_EXT_texture_shared_exponent -------------------- */
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-
-#define GL_RGB9_E5_EXT 0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F
-
-#define GLEW_EXT_texture_shared_exponent GLEW_GET_VAR(__GLEW_EXT_texture_shared_exponent)
-
-#endif /* GL_EXT_texture_shared_exponent */
-
-/* -------------------------- GL_EXT_texture_snorm ------------------------- */
-
-#ifndef GL_EXT_texture_snorm
-#define GL_EXT_texture_snorm 1
-
-#define GL_RED_SNORM 0x8F90
-#define GL_RG_SNORM 0x8F91
-#define GL_RGB_SNORM 0x8F92
-#define GL_RGBA_SNORM 0x8F93
-#define GL_R8_SNORM 0x8F94
-#define GL_RG8_SNORM 0x8F95
-#define GL_RGB8_SNORM 0x8F96
-#define GL_RGBA8_SNORM 0x8F97
-#define GL_R16_SNORM 0x8F98
-#define GL_RG16_SNORM 0x8F99
-#define GL_RGB16_SNORM 0x8F9A
-#define GL_RGBA16_SNORM 0x8F9B
-#define GL_SIGNED_NORMALIZED 0x8F9C
-#define GL_ALPHA_SNORM 0x9010
-#define GL_LUMINANCE_SNORM 0x9011
-#define GL_LUMINANCE_ALPHA_SNORM 0x9012
-#define GL_INTENSITY_SNORM 0x9013
-#define GL_ALPHA8_SNORM 0x9014
-#define GL_LUMINANCE8_SNORM 0x9015
-#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016
-#define GL_INTENSITY8_SNORM 0x9017
-#define GL_ALPHA16_SNORM 0x9018
-#define GL_LUMINANCE16_SNORM 0x9019
-#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A
-#define GL_INTENSITY16_SNORM 0x901B
-
-#define GLEW_EXT_texture_snorm GLEW_GET_VAR(__GLEW_EXT_texture_snorm)
-
-#endif /* GL_EXT_texture_snorm */
-
-/* ------------------------- GL_EXT_texture_swizzle ------------------------ */
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_EXT_texture_swizzle 1
-
-#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42
-#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43
-#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44
-#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46
-
-#define GLEW_EXT_texture_swizzle GLEW_GET_VAR(__GLEW_EXT_texture_swizzle)
-
-#endif /* GL_EXT_texture_swizzle */
-
-/* --------------------------- GL_EXT_timer_query -------------------------- */
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-
-#define GL_TIME_ELAPSED_EXT 0x88BF
-
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-
-#define glGetQueryObjecti64vEXT GLEW_GET_FUN(__glewGetQueryObjecti64vEXT)
-#define glGetQueryObjectui64vEXT GLEW_GET_FUN(__glewGetQueryObjectui64vEXT)
-
-#define GLEW_EXT_timer_query GLEW_GET_VAR(__GLEW_EXT_timer_query)
-
-#endif /* GL_EXT_timer_query */
-
-/* ----------------------- GL_EXT_transform_feedback ----------------------- */
-
-#ifndef GL_EXT_transform_feedback
-#define GL_EXT_transform_feedback 1
-
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
-#define GL_PRIMITIVES_GENERATED_EXT 0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
-#define GL_RASTERIZER_DISCARD_EXT 0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C
-#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
-
-typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
-typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar ** varyings, GLenum bufferMode);
-
-#define glBeginTransformFeedbackEXT GLEW_GET_FUN(__glewBeginTransformFeedbackEXT)
-#define glBindBufferBaseEXT GLEW_GET_FUN(__glewBindBufferBaseEXT)
-#define glBindBufferOffsetEXT GLEW_GET_FUN(__glewBindBufferOffsetEXT)
-#define glBindBufferRangeEXT GLEW_GET_FUN(__glewBindBufferRangeEXT)
-#define glEndTransformFeedbackEXT GLEW_GET_FUN(__glewEndTransformFeedbackEXT)
-#define glGetTransformFeedbackVaryingEXT GLEW_GET_FUN(__glewGetTransformFeedbackVaryingEXT)
-#define glTransformFeedbackVaryingsEXT GLEW_GET_FUN(__glewTransformFeedbackVaryingsEXT)
-
-#define GLEW_EXT_transform_feedback GLEW_GET_VAR(__GLEW_EXT_transform_feedback)
-
-#endif /* GL_EXT_transform_feedback */
-
-/* -------------------------- GL_EXT_vertex_array -------------------------- */
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-
-#define GL_DOUBLE_EXT 0x140A
-#define GL_VERTEX_ARRAY_EXT 0x8074
-#define GL_NORMAL_ARRAY_EXT 0x8075
-#define GL_COLOR_ARRAY_EXT 0x8076
-#define GL_INDEX_ARRAY_EXT 0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT 0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT 0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT 0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT 0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT 0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT 0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT 0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT 0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093
-
-typedef void (GLAPIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (GLAPIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean* pointer);
-typedef void (GLAPIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
-
-#define glArrayElementEXT GLEW_GET_FUN(__glewArrayElementEXT)
-#define glColorPointerEXT GLEW_GET_FUN(__glewColorPointerEXT)
-#define glDrawArraysEXT GLEW_GET_FUN(__glewDrawArraysEXT)
-#define glEdgeFlagPointerEXT GLEW_GET_FUN(__glewEdgeFlagPointerEXT)
-#define glIndexPointerEXT GLEW_GET_FUN(__glewIndexPointerEXT)
-#define glNormalPointerEXT GLEW_GET_FUN(__glewNormalPointerEXT)
-#define glTexCoordPointerEXT GLEW_GET_FUN(__glewTexCoordPointerEXT)
-#define glVertexPointerEXT GLEW_GET_FUN(__glewVertexPointerEXT)
-
-#define GLEW_EXT_vertex_array GLEW_GET_VAR(__GLEW_EXT_vertex_array)
-
-#endif /* GL_EXT_vertex_array */
-
-/* ------------------------ GL_EXT_vertex_array_bgra ----------------------- */
-
-#ifndef GL_EXT_vertex_array_bgra
-#define GL_EXT_vertex_array_bgra 1
-
-#define GL_BGRA 0x80E1
-
-#define GLEW_EXT_vertex_array_bgra GLEW_GET_VAR(__GLEW_EXT_vertex_array_bgra)
-
-#endif /* GL_EXT_vertex_array_bgra */
-
-/* ----------------------- GL_EXT_vertex_attrib_64bit ---------------------- */
-
-#ifndef GL_EXT_vertex_attrib_64bit
-#define GL_EXT_vertex_attrib_64bit 1
-
-#define GL_DOUBLE_MAT2_EXT 0x8F46
-#define GL_DOUBLE_MAT3_EXT 0x8F47
-#define GL_DOUBLE_MAT4_EXT 0x8F48
-#define GL_DOUBLE_MAT2x3_EXT 0x8F49
-#define GL_DOUBLE_MAT2x4_EXT 0x8F4A
-#define GL_DOUBLE_MAT3x2_EXT 0x8F4B
-#define GL_DOUBLE_MAT3x4_EXT 0x8F4C
-#define GL_DOUBLE_MAT4x2_EXT 0x8F4D
-#define GL_DOUBLE_MAT4x3_EXT 0x8F4E
-#define GL_DOUBLE_VEC2_EXT 0x8FFC
-#define GL_DOUBLE_VEC3_EXT 0x8FFD
-#define GL_DOUBLE_VEC4_EXT 0x8FFE
-
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer);
-
-#define glGetVertexAttribLdvEXT GLEW_GET_FUN(__glewGetVertexAttribLdvEXT)
-#define glVertexArrayVertexAttribLOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLOffsetEXT)
-#define glVertexAttribL1dEXT GLEW_GET_FUN(__glewVertexAttribL1dEXT)
-#define glVertexAttribL1dvEXT GLEW_GET_FUN(__glewVertexAttribL1dvEXT)
-#define glVertexAttribL2dEXT GLEW_GET_FUN(__glewVertexAttribL2dEXT)
-#define glVertexAttribL2dvEXT GLEW_GET_FUN(__glewVertexAttribL2dvEXT)
-#define glVertexAttribL3dEXT GLEW_GET_FUN(__glewVertexAttribL3dEXT)
-#define glVertexAttribL3dvEXT GLEW_GET_FUN(__glewVertexAttribL3dvEXT)
-#define glVertexAttribL4dEXT GLEW_GET_FUN(__glewVertexAttribL4dEXT)
-#define glVertexAttribL4dvEXT GLEW_GET_FUN(__glewVertexAttribL4dvEXT)
-#define glVertexAttribLPointerEXT GLEW_GET_FUN(__glewVertexAttribLPointerEXT)
-
-#define GLEW_EXT_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_EXT_vertex_attrib_64bit)
-
-#endif /* GL_EXT_vertex_attrib_64bit */
-
-/* -------------------------- GL_EXT_vertex_shader ------------------------- */
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-
-#define GL_VERTEX_SHADER_EXT 0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT 0x8781
-#define GL_OP_INDEX_EXT 0x8782
-#define GL_OP_NEGATE_EXT 0x8783
-#define GL_OP_DOT3_EXT 0x8784
-#define GL_OP_DOT4_EXT 0x8785
-#define GL_OP_MUL_EXT 0x8786
-#define GL_OP_ADD_EXT 0x8787
-#define GL_OP_MADD_EXT 0x8788
-#define GL_OP_FRAC_EXT 0x8789
-#define GL_OP_MAX_EXT 0x878A
-#define GL_OP_MIN_EXT 0x878B
-#define GL_OP_SET_GE_EXT 0x878C
-#define GL_OP_SET_LT_EXT 0x878D
-#define GL_OP_CLAMP_EXT 0x878E
-#define GL_OP_FLOOR_EXT 0x878F
-#define GL_OP_ROUND_EXT 0x8790
-#define GL_OP_EXP_BASE_2_EXT 0x8791
-#define GL_OP_LOG_BASE_2_EXT 0x8792
-#define GL_OP_POWER_EXT 0x8793
-#define GL_OP_RECIP_EXT 0x8794
-#define GL_OP_RECIP_SQRT_EXT 0x8795
-#define GL_OP_SUB_EXT 0x8796
-#define GL_OP_CROSS_PRODUCT_EXT 0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798
-#define GL_OP_MOV_EXT 0x8799
-#define GL_OUTPUT_VERTEX_EXT 0x879A
-#define GL_OUTPUT_COLOR0_EXT 0x879B
-#define GL_OUTPUT_COLOR1_EXT 0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC
-#define GL_OUTPUT_FOG_EXT 0x87BD
-#define GL_SCALAR_EXT 0x87BE
-#define GL_VECTOR_EXT 0x87BF
-#define GL_MATRIX_EXT 0x87C0
-#define GL_VARIANT_EXT 0x87C1
-#define GL_INVARIANT_EXT 0x87C2
-#define GL_LOCAL_CONSTANT_EXT 0x87C3
-#define GL_LOCAL_EXT 0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4
-#define GL_X_EXT 0x87D5
-#define GL_Y_EXT 0x87D6
-#define GL_Z_EXT 0x87D7
-#define GL_W_EXT 0x87D8
-#define GL_NEGATIVE_X_EXT 0x87D9
-#define GL_NEGATIVE_Y_EXT 0x87DA
-#define GL_NEGATIVE_Z_EXT 0x87DB
-#define GL_NEGATIVE_W_EXT 0x87DC
-#define GL_ZERO_EXT 0x87DD
-#define GL_ONE_EXT 0x87DE
-#define GL_NEGATIVE_ONE_EXT 0x87DF
-#define GL_NORMALIZED_RANGE_EXT 0x87E0
-#define GL_FULL_RANGE_EXT 0x87E1
-#define GL_CURRENT_VERTEX_EXT 0x87E2
-#define GL_MVP_MATRIX_EXT 0x87E3
-#define GL_VARIANT_VALUE_EXT 0x87E4
-#define GL_VARIANT_DATATYPE_EXT 0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7
-#define GL_VARIANT_ARRAY_EXT 0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9
-#define GL_INVARIANT_VALUE_EXT 0x87EA
-#define GL_INVARIANT_DATATYPE_EXT 0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED
-
-typedef void (GLAPIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef GLuint (GLAPIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (GLAPIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (GLAPIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLuint (GLAPIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (GLAPIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef void (GLAPIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (GLAPIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (GLAPIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components);
-typedef GLuint (GLAPIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (GLAPIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (GLAPIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (GLAPIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (GLAPIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid **data);
-typedef void (GLAPIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLboolean (GLAPIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (GLAPIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
-typedef void (GLAPIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
-typedef void (GLAPIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (GLAPIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (GLAPIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (GLAPIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (GLAPIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, GLvoid *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, GLbyte *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, GLdouble *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, GLfloat *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, GLint *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, GLshort *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, GLubyte *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, GLuint *addr);
-typedef void (GLAPIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, GLushort *addr);
-typedef void (GLAPIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-
-#define glBeginVertexShaderEXT GLEW_GET_FUN(__glewBeginVertexShaderEXT)
-#define glBindLightParameterEXT GLEW_GET_FUN(__glewBindLightParameterEXT)
-#define glBindMaterialParameterEXT GLEW_GET_FUN(__glewBindMaterialParameterEXT)
-#define glBindParameterEXT GLEW_GET_FUN(__glewBindParameterEXT)
-#define glBindTexGenParameterEXT GLEW_GET_FUN(__glewBindTexGenParameterEXT)
-#define glBindTextureUnitParameterEXT GLEW_GET_FUN(__glewBindTextureUnitParameterEXT)
-#define glBindVertexShaderEXT GLEW_GET_FUN(__glewBindVertexShaderEXT)
-#define glDeleteVertexShaderEXT GLEW_GET_FUN(__glewDeleteVertexShaderEXT)
-#define glDisableVariantClientStateEXT GLEW_GET_FUN(__glewDisableVariantClientStateEXT)
-#define glEnableVariantClientStateEXT GLEW_GET_FUN(__glewEnableVariantClientStateEXT)
-#define glEndVertexShaderEXT GLEW_GET_FUN(__glewEndVertexShaderEXT)
-#define glExtractComponentEXT GLEW_GET_FUN(__glewExtractComponentEXT)
-#define glGenSymbolsEXT GLEW_GET_FUN(__glewGenSymbolsEXT)
-#define glGenVertexShadersEXT GLEW_GET_FUN(__glewGenVertexShadersEXT)
-#define glGetInvariantBooleanvEXT GLEW_GET_FUN(__glewGetInvariantBooleanvEXT)
-#define glGetInvariantFloatvEXT GLEW_GET_FUN(__glewGetInvariantFloatvEXT)
-#define glGetInvariantIntegervEXT GLEW_GET_FUN(__glewGetInvariantIntegervEXT)
-#define glGetLocalConstantBooleanvEXT GLEW_GET_FUN(__glewGetLocalConstantBooleanvEXT)
-#define glGetLocalConstantFloatvEXT GLEW_GET_FUN(__glewGetLocalConstantFloatvEXT)
-#define glGetLocalConstantIntegervEXT GLEW_GET_FUN(__glewGetLocalConstantIntegervEXT)
-#define glGetVariantBooleanvEXT GLEW_GET_FUN(__glewGetVariantBooleanvEXT)
-#define glGetVariantFloatvEXT GLEW_GET_FUN(__glewGetVariantFloatvEXT)
-#define glGetVariantIntegervEXT GLEW_GET_FUN(__glewGetVariantIntegervEXT)
-#define glGetVariantPointervEXT GLEW_GET_FUN(__glewGetVariantPointervEXT)
-#define glInsertComponentEXT GLEW_GET_FUN(__glewInsertComponentEXT)
-#define glIsVariantEnabledEXT GLEW_GET_FUN(__glewIsVariantEnabledEXT)
-#define glSetInvariantEXT GLEW_GET_FUN(__glewSetInvariantEXT)
-#define glSetLocalConstantEXT GLEW_GET_FUN(__glewSetLocalConstantEXT)
-#define glShaderOp1EXT GLEW_GET_FUN(__glewShaderOp1EXT)
-#define glShaderOp2EXT GLEW_GET_FUN(__glewShaderOp2EXT)
-#define glShaderOp3EXT GLEW_GET_FUN(__glewShaderOp3EXT)
-#define glSwizzleEXT GLEW_GET_FUN(__glewSwizzleEXT)
-#define glVariantPointerEXT GLEW_GET_FUN(__glewVariantPointerEXT)
-#define glVariantbvEXT GLEW_GET_FUN(__glewVariantbvEXT)
-#define glVariantdvEXT GLEW_GET_FUN(__glewVariantdvEXT)
-#define glVariantfvEXT GLEW_GET_FUN(__glewVariantfvEXT)
-#define glVariantivEXT GLEW_GET_FUN(__glewVariantivEXT)
-#define glVariantsvEXT GLEW_GET_FUN(__glewVariantsvEXT)
-#define glVariantubvEXT GLEW_GET_FUN(__glewVariantubvEXT)
-#define glVariantuivEXT GLEW_GET_FUN(__glewVariantuivEXT)
-#define glVariantusvEXT GLEW_GET_FUN(__glewVariantusvEXT)
-#define glWriteMaskEXT GLEW_GET_FUN(__glewWriteMaskEXT)
-
-#define GLEW_EXT_vertex_shader GLEW_GET_VAR(__GLEW_EXT_vertex_shader)
-
-#endif /* GL_EXT_vertex_shader */
-
-/* ------------------------ GL_EXT_vertex_weighting ------------------------ */
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-
-#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3
-#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6
-#define GL_MODELVIEW0_EXT 0x1700
-#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502
-#define GL_MODELVIEW1_MATRIX_EXT 0x8506
-#define GL_VERTEX_WEIGHTING_EXT 0x8509
-#define GL_MODELVIEW1_EXT 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-
-typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, void* pointer);
-typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight);
-
-#define glVertexWeightPointerEXT GLEW_GET_FUN(__glewVertexWeightPointerEXT)
-#define glVertexWeightfEXT GLEW_GET_FUN(__glewVertexWeightfEXT)
-#define glVertexWeightfvEXT GLEW_GET_FUN(__glewVertexWeightfvEXT)
-
-#define GLEW_EXT_vertex_weighting GLEW_GET_VAR(__GLEW_EXT_vertex_weighting)
-
-#endif /* GL_EXT_vertex_weighting */
-
-/* ------------------------- GL_EXT_x11_sync_object ------------------------ */
-
-#ifndef GL_EXT_x11_sync_object
-#define GL_EXT_x11_sync_object 1
-
-#define GL_SYNC_X11_FENCE_EXT 0x90E1
-
-typedef GLsync (GLAPIENTRY * PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
-
-#define glImportSyncEXT GLEW_GET_FUN(__glewImportSyncEXT)
-
-#define GLEW_EXT_x11_sync_object GLEW_GET_VAR(__GLEW_EXT_x11_sync_object)
-
-#endif /* GL_EXT_x11_sync_object */
-
-/* ---------------------- GL_GREMEDY_frame_terminator ---------------------- */
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-
-typedef void (GLAPIENTRY * PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-
-#define glFrameTerminatorGREMEDY GLEW_GET_FUN(__glewFrameTerminatorGREMEDY)
-
-#define GLEW_GREMEDY_frame_terminator GLEW_GET_VAR(__GLEW_GREMEDY_frame_terminator)
-
-#endif /* GL_GREMEDY_frame_terminator */
-
-/* ------------------------ GL_GREMEDY_string_marker ----------------------- */
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-
-typedef void (GLAPIENTRY * PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void* string);
-
-#define glStringMarkerGREMEDY GLEW_GET_FUN(__glewStringMarkerGREMEDY)
-
-#define GLEW_GREMEDY_string_marker GLEW_GET_VAR(__GLEW_GREMEDY_string_marker)
-
-#endif /* GL_GREMEDY_string_marker */
-
-/* --------------------- GL_HP_convolution_border_modes -------------------- */
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-
-#define GLEW_HP_convolution_border_modes GLEW_GET_VAR(__GLEW_HP_convolution_border_modes)
-
-#endif /* GL_HP_convolution_border_modes */
-
-/* ------------------------- GL_HP_image_transform ------------------------- */
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-
-typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, const GLfloat param);
-typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, const GLint param);
-typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
-
-#define glGetImageTransformParameterfvHP GLEW_GET_FUN(__glewGetImageTransformParameterfvHP)
-#define glGetImageTransformParameterivHP GLEW_GET_FUN(__glewGetImageTransformParameterivHP)
-#define glImageTransformParameterfHP GLEW_GET_FUN(__glewImageTransformParameterfHP)
-#define glImageTransformParameterfvHP GLEW_GET_FUN(__glewImageTransformParameterfvHP)
-#define glImageTransformParameteriHP GLEW_GET_FUN(__glewImageTransformParameteriHP)
-#define glImageTransformParameterivHP GLEW_GET_FUN(__glewImageTransformParameterivHP)
-
-#define GLEW_HP_image_transform GLEW_GET_VAR(__GLEW_HP_image_transform)
-
-#endif /* GL_HP_image_transform */
-
-/* -------------------------- GL_HP_occlusion_test ------------------------- */
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-
-#define GL_OCCLUSION_TEST_HP 0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP 0x8166
-
-#define GLEW_HP_occlusion_test GLEW_GET_VAR(__GLEW_HP_occlusion_test)
-
-#endif /* GL_HP_occlusion_test */
-
-/* ------------------------- GL_HP_texture_lighting ------------------------ */
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-
-#define GLEW_HP_texture_lighting GLEW_GET_VAR(__GLEW_HP_texture_lighting)
-
-#endif /* GL_HP_texture_lighting */
-
-/* --------------------------- GL_IBM_cull_vertex -------------------------- */
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-
-#define GL_CULL_VERTEX_IBM 103050
-
-#define GLEW_IBM_cull_vertex GLEW_GET_VAR(__GLEW_IBM_cull_vertex)
-
-#endif /* GL_IBM_cull_vertex */
-
-/* ---------------------- GL_IBM_multimode_draw_arrays --------------------- */
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-
-typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
-
-#define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM)
-#define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM)
-
-#define GLEW_IBM_multimode_draw_arrays GLEW_GET_VAR(__GLEW_IBM_multimode_draw_arrays)
-
-#endif /* GL_IBM_multimode_draw_arrays */
-
-/* ------------------------- GL_IBM_rasterpos_clip ------------------------- */
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-
-#define GL_RASTER_POSITION_UNCLIPPED_IBM 103010
-
-#define GLEW_IBM_rasterpos_clip GLEW_GET_VAR(__GLEW_IBM_rasterpos_clip)
-
-#endif /* GL_IBM_rasterpos_clip */
-
-/* --------------------------- GL_IBM_static_data -------------------------- */
-
-#ifndef GL_IBM_static_data
-#define GL_IBM_static_data 1
-
-#define GL_ALL_STATIC_DATA_IBM 103060
-#define GL_STATIC_VERTEX_ARRAY_IBM 103061
-
-#define GLEW_IBM_static_data GLEW_GET_VAR(__GLEW_IBM_static_data)
-
-#endif /* GL_IBM_static_data */
-
-/* --------------------- GL_IBM_texture_mirrored_repeat -------------------- */
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_IBM_texture_mirrored_repeat 1
-
-#define GL_MIRRORED_REPEAT_IBM 0x8370
-
-#define GLEW_IBM_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_IBM_texture_mirrored_repeat)
-
-#endif /* GL_IBM_texture_mirrored_repeat */
-
-/* ----------------------- GL_IBM_vertex_array_lists ----------------------- */
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-
-#define GL_VERTEX_ARRAY_LIST_IBM 103070
-#define GL_NORMAL_ARRAY_LIST_IBM 103071
-#define GL_COLOR_ARRAY_LIST_IBM 103072
-#define GL_INDEX_ARRAY_LIST_IBM 103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-
-typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-
-#define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM)
-#define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM)
-#define glFogCoordPointerListIBM GLEW_GET_FUN(__glewFogCoordPointerListIBM)
-#define glIndexPointerListIBM GLEW_GET_FUN(__glewIndexPointerListIBM)
-#define glNormalPointerListIBM GLEW_GET_FUN(__glewNormalPointerListIBM)
-#define glSecondaryColorPointerListIBM GLEW_GET_FUN(__glewSecondaryColorPointerListIBM)
-#define glTexCoordPointerListIBM GLEW_GET_FUN(__glewTexCoordPointerListIBM)
-#define glVertexPointerListIBM GLEW_GET_FUN(__glewVertexPointerListIBM)
-
-#define GLEW_IBM_vertex_array_lists GLEW_GET_VAR(__GLEW_IBM_vertex_array_lists)
-
-#endif /* GL_IBM_vertex_array_lists */
-
-/* -------------------------- GL_INGR_color_clamp -------------------------- */
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-
-#define GL_RED_MIN_CLAMP_INGR 0x8560
-#define GL_GREEN_MIN_CLAMP_INGR 0x8561
-#define GL_BLUE_MIN_CLAMP_INGR 0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR 0x8563
-#define GL_RED_MAX_CLAMP_INGR 0x8564
-#define GL_GREEN_MAX_CLAMP_INGR 0x8565
-#define GL_BLUE_MAX_CLAMP_INGR 0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR 0x8567
-
-#define GLEW_INGR_color_clamp GLEW_GET_VAR(__GLEW_INGR_color_clamp)
-
-#endif /* GL_INGR_color_clamp */
-
-/* ------------------------- GL_INGR_interlace_read ------------------------ */
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-
-#define GL_INTERLACE_READ_INGR 0x8568
-
-#define GLEW_INGR_interlace_read GLEW_GET_VAR(__GLEW_INGR_interlace_read)
-
-#endif /* GL_INGR_interlace_read */
-
-/* ------------------------ GL_INTEL_parallel_arrays ----------------------- */
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-
-#define GL_PARALLEL_ARRAYS_INTEL 0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-
-typedef void (GLAPIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
-typedef void (GLAPIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void** pointer);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
-typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
-
-#define glColorPointervINTEL GLEW_GET_FUN(__glewColorPointervINTEL)
-#define glNormalPointervINTEL GLEW_GET_FUN(__glewNormalPointervINTEL)
-#define glTexCoordPointervINTEL GLEW_GET_FUN(__glewTexCoordPointervINTEL)
-#define glVertexPointervINTEL GLEW_GET_FUN(__glewVertexPointervINTEL)
-
-#define GLEW_INTEL_parallel_arrays GLEW_GET_VAR(__GLEW_INTEL_parallel_arrays)
-
-#endif /* GL_INTEL_parallel_arrays */
-
-/* ------------------------ GL_INTEL_texture_scissor ----------------------- */
-
-#ifndef GL_INTEL_texture_scissor
-#define GL_INTEL_texture_scissor 1
-
-typedef void (GLAPIENTRY * PFNGLTEXSCISSORFUNCINTELPROC) (GLenum target, GLenum lfunc, GLenum hfunc);
-typedef void (GLAPIENTRY * PFNGLTEXSCISSORINTELPROC) (GLenum target, GLclampf tlow, GLclampf thigh);
-
-#define glTexScissorFuncINTEL GLEW_GET_FUN(__glewTexScissorFuncINTEL)
-#define glTexScissorINTEL GLEW_GET_FUN(__glewTexScissorINTEL)
-
-#define GLEW_INTEL_texture_scissor GLEW_GET_VAR(__GLEW_INTEL_texture_scissor)
-
-#endif /* GL_INTEL_texture_scissor */
-
-/* ------------------------------ GL_KHR_debug ----------------------------- */
-
-#ifndef GL_KHR_debug
-#define GL_KHR_debug 1
-
-#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002
-#define GL_STACK_OVERFLOW 0x0503
-#define GL_STACK_UNDERFLOW 0x0504
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
-#define GL_DEBUG_SOURCE_API 0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
-#define GL_DEBUG_SOURCE_APPLICATION 0x824A
-#define GL_DEBUG_SOURCE_OTHER 0x824B
-#define GL_DEBUG_TYPE_ERROR 0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
-#define GL_DEBUG_TYPE_PORTABILITY 0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
-#define GL_DEBUG_TYPE_OTHER 0x8251
-#define GL_DEBUG_TYPE_MARKER 0x8268
-#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
-#define GL_DEBUG_TYPE_POP_GROUP 0x826A
-#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
-#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
-#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D
-#define GL_BUFFER 0x82E0
-#define GL_SHADER 0x82E1
-#define GL_PROGRAM 0x82E2
-#define GL_QUERY 0x82E3
-#define GL_PROGRAM_PIPELINE 0x82E4
-#define GL_SAMPLER 0x82E6
-#define GL_DISPLAY_LIST 0x82E7
-#define GL_MAX_LABEL_LENGTH 0x82E8
-#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
-#define GL_DEBUG_LOGGED_MESSAGES 0x9145
-#define GL_DEBUG_SEVERITY_HIGH 0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
-#define GL_DEBUG_SEVERITY_LOW 0x9148
-#define GL_DEBUG_OUTPUT 0x92E0
-
-typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
-
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, void* userParam);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
-typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
-typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label);
-typedef void (GLAPIENTRY * PFNGLGETOBJECTPTRLABELPROC) (void* ptr, GLsizei bufSize, GLsizei* length, GLchar *label);
-typedef void (GLAPIENTRY * PFNGLGETPOINTERVPROC) (GLenum pname, void** params);
-typedef void (GLAPIENTRY * PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar* label);
-typedef void (GLAPIENTRY * PFNGLOBJECTPTRLABELPROC) (void* ptr, GLsizei length, const GLchar* label);
-typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
-
-#define glDebugMessageCallback GLEW_GET_FUN(__glewDebugMessageCallback)
-#define glDebugMessageControl GLEW_GET_FUN(__glewDebugMessageControl)
-#define glDebugMessageInsert GLEW_GET_FUN(__glewDebugMessageInsert)
-#define glGetDebugMessageLog GLEW_GET_FUN(__glewGetDebugMessageLog)
-#define glGetObjectLabel GLEW_GET_FUN(__glewGetObjectLabel)
-#define glGetObjectPtrLabel GLEW_GET_FUN(__glewGetObjectPtrLabel)
-#define glGetPointerv GLEW_GET_FUN(__glewGetPointerv)
-#define glObjectLabel GLEW_GET_FUN(__glewObjectLabel)
-#define glObjectPtrLabel GLEW_GET_FUN(__glewObjectPtrLabel)
-#define glPushDebugGroup GLEW_GET_FUN(__glewPushDebugGroup)
-
-#define GLEW_KHR_debug GLEW_GET_VAR(__GLEW_KHR_debug)
-
-#endif /* GL_KHR_debug */
-
-/* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */
-
-#ifndef GL_KHR_texture_compression_astc_ldr
-#define GL_KHR_texture_compression_astc_ldr 1
-
-#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
-#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
-#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
-#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
-#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
-#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
-#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
-#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
-#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
-#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
-#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
-#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
-#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
-#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
-#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
-
-#define GLEW_KHR_texture_compression_astc_ldr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_ldr)
-
-#endif /* GL_KHR_texture_compression_astc_ldr */
-
-/* -------------------------- GL_KTX_buffer_region ------------------------- */
-
-#ifndef GL_KTX_buffer_region
-#define GL_KTX_buffer_region 1
-
-#define GL_KTX_FRONT_REGION 0x0
-#define GL_KTX_BACK_REGION 0x1
-#define GL_KTX_Z_REGION 0x2
-#define GL_KTX_STENCIL_REGION 0x3
-
-typedef GLuint (GLAPIENTRY * PFNGLBUFFERREGIONENABLEDPROC) (void);
-typedef void (GLAPIENTRY * PFNGLDELETEBUFFERREGIONPROC) (GLenum region);
-typedef void (GLAPIENTRY * PFNGLDRAWBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height, GLint xDest, GLint yDest);
-typedef GLuint (GLAPIENTRY * PFNGLNEWBUFFERREGIONPROC) (GLenum region);
-typedef void (GLAPIENTRY * PFNGLREADBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height);
-
-#define glBufferRegionEnabled GLEW_GET_FUN(__glewBufferRegionEnabled)
-#define glDeleteBufferRegion GLEW_GET_FUN(__glewDeleteBufferRegion)
-#define glDrawBufferRegion GLEW_GET_FUN(__glewDrawBufferRegion)
-#define glNewBufferRegion GLEW_GET_FUN(__glewNewBufferRegion)
-#define glReadBufferRegion GLEW_GET_FUN(__glewReadBufferRegion)
-
-#define GLEW_KTX_buffer_region GLEW_GET_VAR(__GLEW_KTX_buffer_region)
-
-#endif /* GL_KTX_buffer_region */
-
-/* ------------------------- GL_MESAX_texture_stack ------------------------ */
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-
-#define GL_TEXTURE_1D_STACK_MESAX 0x8759
-#define GL_TEXTURE_2D_STACK_MESAX 0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-
-#define GLEW_MESAX_texture_stack GLEW_GET_VAR(__GLEW_MESAX_texture_stack)
-
-#endif /* GL_MESAX_texture_stack */
-
-/* -------------------------- GL_MESA_pack_invert -------------------------- */
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-
-#define GL_PACK_INVERT_MESA 0x8758
-
-#define GLEW_MESA_pack_invert GLEW_GET_VAR(__GLEW_MESA_pack_invert)
-
-#endif /* GL_MESA_pack_invert */
-
-/* ------------------------- GL_MESA_resize_buffers ------------------------ */
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-
-typedef void (GLAPIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
-
-#define glResizeBuffersMESA GLEW_GET_FUN(__glewResizeBuffersMESA)
-
-#define GLEW_MESA_resize_buffers GLEW_GET_VAR(__GLEW_MESA_resize_buffers)
-
-#endif /* GL_MESA_resize_buffers */
-
-/* --------------------------- GL_MESA_window_pos -------------------------- */
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint* p);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort* p);
-
-#define glWindowPos2dMESA GLEW_GET_FUN(__glewWindowPos2dMESA)
-#define glWindowPos2dvMESA GLEW_GET_FUN(__glewWindowPos2dvMESA)
-#define glWindowPos2fMESA GLEW_GET_FUN(__glewWindowPos2fMESA)
-#define glWindowPos2fvMESA GLEW_GET_FUN(__glewWindowPos2fvMESA)
-#define glWindowPos2iMESA GLEW_GET_FUN(__glewWindowPos2iMESA)
-#define glWindowPos2ivMESA GLEW_GET_FUN(__glewWindowPos2ivMESA)
-#define glWindowPos2sMESA GLEW_GET_FUN(__glewWindowPos2sMESA)
-#define glWindowPos2svMESA GLEW_GET_FUN(__glewWindowPos2svMESA)
-#define glWindowPos3dMESA GLEW_GET_FUN(__glewWindowPos3dMESA)
-#define glWindowPos3dvMESA GLEW_GET_FUN(__glewWindowPos3dvMESA)
-#define glWindowPos3fMESA GLEW_GET_FUN(__glewWindowPos3fMESA)
-#define glWindowPos3fvMESA GLEW_GET_FUN(__glewWindowPos3fvMESA)
-#define glWindowPos3iMESA GLEW_GET_FUN(__glewWindowPos3iMESA)
-#define glWindowPos3ivMESA GLEW_GET_FUN(__glewWindowPos3ivMESA)
-#define glWindowPos3sMESA GLEW_GET_FUN(__glewWindowPos3sMESA)
-#define glWindowPos3svMESA GLEW_GET_FUN(__glewWindowPos3svMESA)
-#define glWindowPos4dMESA GLEW_GET_FUN(__glewWindowPos4dMESA)
-#define glWindowPos4dvMESA GLEW_GET_FUN(__glewWindowPos4dvMESA)
-#define glWindowPos4fMESA GLEW_GET_FUN(__glewWindowPos4fMESA)
-#define glWindowPos4fvMESA GLEW_GET_FUN(__glewWindowPos4fvMESA)
-#define glWindowPos4iMESA GLEW_GET_FUN(__glewWindowPos4iMESA)
-#define glWindowPos4ivMESA GLEW_GET_FUN(__glewWindowPos4ivMESA)
-#define glWindowPos4sMESA GLEW_GET_FUN(__glewWindowPos4sMESA)
-#define glWindowPos4svMESA GLEW_GET_FUN(__glewWindowPos4svMESA)
-
-#define GLEW_MESA_window_pos GLEW_GET_VAR(__GLEW_MESA_window_pos)
-
-#endif /* GL_MESA_window_pos */
-
-/* ------------------------- GL_MESA_ycbcr_texture ------------------------- */
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-
-#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB
-#define GL_YCBCR_MESA 0x8757
-
-#define GLEW_MESA_ycbcr_texture GLEW_GET_VAR(__GLEW_MESA_ycbcr_texture)
-
-#endif /* GL_MESA_ycbcr_texture */
-
-/* ------------------------- GL_NVX_gpu_memory_info ------------------------ */
-
-#ifndef GL_NVX_gpu_memory_info
-#define GL_NVX_gpu_memory_info 1
-
-#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
-#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
-#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
-#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
-#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
-
-#define GLEW_NVX_gpu_memory_info GLEW_GET_VAR(__GLEW_NVX_gpu_memory_info)
-
-#endif /* GL_NVX_gpu_memory_info */
-
-/* ------------------------- GL_NV_bindless_texture ------------------------ */
-
-#ifndef GL_NV_bindless_texture
-#define GL_NV_bindless_texture 1
-
-typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
-typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
-typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
-typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
-typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
-typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
-typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
-typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
-typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values);
-typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64* value);
-
-#define glGetImageHandleNV GLEW_GET_FUN(__glewGetImageHandleNV)
-#define glGetTextureHandleNV GLEW_GET_FUN(__glewGetTextureHandleNV)
-#define glGetTextureSamplerHandleNV GLEW_GET_FUN(__glewGetTextureSamplerHandleNV)
-#define glIsImageHandleResidentNV GLEW_GET_FUN(__glewIsImageHandleResidentNV)
-#define glIsTextureHandleResidentNV GLEW_GET_FUN(__glewIsTextureHandleResidentNV)
-#define glMakeImageHandleNonResidentNV GLEW_GET_FUN(__glewMakeImageHandleNonResidentNV)
-#define glMakeImageHandleResidentNV GLEW_GET_FUN(__glewMakeImageHandleResidentNV)
-#define glMakeTextureHandleNonResidentNV GLEW_GET_FUN(__glewMakeTextureHandleNonResidentNV)
-#define glMakeTextureHandleResidentNV GLEW_GET_FUN(__glewMakeTextureHandleResidentNV)
-#define glProgramUniformHandleui64NV GLEW_GET_FUN(__glewProgramUniformHandleui64NV)
-#define glProgramUniformHandleui64vNV GLEW_GET_FUN(__glewProgramUniformHandleui64vNV)
-#define glUniformHandleui64NV GLEW_GET_FUN(__glewUniformHandleui64NV)
-#define glUniformHandleui64vNV GLEW_GET_FUN(__glewUniformHandleui64vNV)
-
-#define GLEW_NV_bindless_texture GLEW_GET_VAR(__GLEW_NV_bindless_texture)
-
-#endif /* GL_NV_bindless_texture */
-
-/* --------------------------- GL_NV_blend_square -------------------------- */
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-
-#define GLEW_NV_blend_square GLEW_GET_VAR(__GLEW_NV_blend_square)
-
-#endif /* GL_NV_blend_square */
-
-/* ------------------------ GL_NV_conditional_render ----------------------- */
-
-#ifndef GL_NV_conditional_render
-#define GL_NV_conditional_render 1
-
-#define GL_QUERY_WAIT_NV 0x8E13
-#define GL_QUERY_NO_WAIT_NV 0x8E14
-#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16
-
-typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVPROC) (void);
-
-#define glBeginConditionalRenderNV GLEW_GET_FUN(__glewBeginConditionalRenderNV)
-#define glEndConditionalRenderNV GLEW_GET_FUN(__glewEndConditionalRenderNV)
-
-#define GLEW_NV_conditional_render GLEW_GET_VAR(__GLEW_NV_conditional_render)
-
-#endif /* GL_NV_conditional_render */
-
-/* ----------------------- GL_NV_copy_depth_to_color ----------------------- */
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-
-#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F
-
-#define GLEW_NV_copy_depth_to_color GLEW_GET_VAR(__GLEW_NV_copy_depth_to_color)
-
-#endif /* GL_NV_copy_depth_to_color */
-
-/* ---------------------------- GL_NV_copy_image --------------------------- */
-
-#ifndef GL_NV_copy_image
-#define GL_NV_copy_image 1
-
-typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-
-#define glCopyImageSubDataNV GLEW_GET_FUN(__glewCopyImageSubDataNV)
-
-#define GLEW_NV_copy_image GLEW_GET_VAR(__GLEW_NV_copy_image)
-
-#endif /* GL_NV_copy_image */
-
-/* ------------------------ GL_NV_depth_buffer_float ----------------------- */
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-
-#define GL_DEPTH_COMPONENT32F_NV 0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV 0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF
-
-typedef void (GLAPIENTRY * PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-typedef void (GLAPIENTRY * PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-
-#define glClearDepthdNV GLEW_GET_FUN(__glewClearDepthdNV)
-#define glDepthBoundsdNV GLEW_GET_FUN(__glewDepthBoundsdNV)
-#define glDepthRangedNV GLEW_GET_FUN(__glewDepthRangedNV)
-
-#define GLEW_NV_depth_buffer_float GLEW_GET_VAR(__GLEW_NV_depth_buffer_float)
-
-#endif /* GL_NV_depth_buffer_float */
-
-/* --------------------------- GL_NV_depth_clamp --------------------------- */
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-
-#define GL_DEPTH_CLAMP_NV 0x864F
-
-#define GLEW_NV_depth_clamp GLEW_GET_VAR(__GLEW_NV_depth_clamp)
-
-#endif /* GL_NV_depth_clamp */
-
-/* ---------------------- GL_NV_depth_range_unclamped ---------------------- */
-
-#ifndef GL_NV_depth_range_unclamped
-#define GL_NV_depth_range_unclamped 1
-
-#define GL_SAMPLE_COUNT_BITS_NV 0x8864
-#define GL_CURRENT_SAMPLE_COUNT_QUERY_NV 0x8865
-#define GL_QUERY_RESULT_NV 0x8866
-#define GL_QUERY_RESULT_AVAILABLE_NV 0x8867
-#define GL_SAMPLE_COUNT_NV 0x8914
-
-#define GLEW_NV_depth_range_unclamped GLEW_GET_VAR(__GLEW_NV_depth_range_unclamped)
-
-#endif /* GL_NV_depth_range_unclamped */
-
-/* ---------------------------- GL_NV_evaluators --------------------------- */
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-
-#define GL_EVAL_2D_NV 0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1
-#define GL_MAP_TESSELLATION_NV 0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV 0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7
-
-typedef void (GLAPIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void* points);
-typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void* points);
-typedef void (GLAPIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint* params);
-
-#define glEvalMapsNV GLEW_GET_FUN(__glewEvalMapsNV)
-#define glGetMapAttribParameterfvNV GLEW_GET_FUN(__glewGetMapAttribParameterfvNV)
-#define glGetMapAttribParameterivNV GLEW_GET_FUN(__glewGetMapAttribParameterivNV)
-#define glGetMapControlPointsNV GLEW_GET_FUN(__glewGetMapControlPointsNV)
-#define glGetMapParameterfvNV GLEW_GET_FUN(__glewGetMapParameterfvNV)
-#define glGetMapParameterivNV GLEW_GET_FUN(__glewGetMapParameterivNV)
-#define glMapControlPointsNV GLEW_GET_FUN(__glewMapControlPointsNV)
-#define glMapParameterfvNV GLEW_GET_FUN(__glewMapParameterfvNV)
-#define glMapParameterivNV GLEW_GET_FUN(__glewMapParameterivNV)
-
-#define GLEW_NV_evaluators GLEW_GET_VAR(__GLEW_NV_evaluators)
-
-#endif /* GL_NV_evaluators */
-
-/* ----------------------- GL_NV_explicit_multisample ---------------------- */
-
-#ifndef GL_NV_explicit_multisample
-#define GL_NV_explicit_multisample 1
-
-#define GL_SAMPLE_POSITION_NV 0x8E50
-#define GL_SAMPLE_MASK_NV 0x8E51
-#define GL_SAMPLE_MASK_VALUE_NV 0x8E52
-#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
-#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
-#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55
-#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56
-#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57
-#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
-#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59
-
-typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat* val);
-typedef void (GLAPIENTRY * PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
-typedef void (GLAPIENTRY * PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
-
-#define glGetMultisamplefvNV GLEW_GET_FUN(__glewGetMultisamplefvNV)
-#define glSampleMaskIndexedNV GLEW_GET_FUN(__glewSampleMaskIndexedNV)
-#define glTexRenderbufferNV GLEW_GET_FUN(__glewTexRenderbufferNV)
-
-#define GLEW_NV_explicit_multisample GLEW_GET_VAR(__GLEW_NV_explicit_multisample)
-
-#endif /* GL_NV_explicit_multisample */
-
-/* ------------------------------ GL_NV_fence ------------------------------ */
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-
-#define GL_ALL_COMPLETED_NV 0x84F2
-#define GL_FENCE_STATUS_NV 0x84F3
-#define GL_FENCE_CONDITION_NV 0x84F4
-
-typedef void (GLAPIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint* fences);
-typedef void (GLAPIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (GLAPIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint* fences);
-typedef void (GLAPIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISFENCENVPROC) (GLuint fence);
-typedef void (GLAPIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence);
-
-#define glDeleteFencesNV GLEW_GET_FUN(__glewDeleteFencesNV)
-#define glFinishFenceNV GLEW_GET_FUN(__glewFinishFenceNV)
-#define glGenFencesNV GLEW_GET_FUN(__glewGenFencesNV)
-#define glGetFenceivNV GLEW_GET_FUN(__glewGetFenceivNV)
-#define glIsFenceNV GLEW_GET_FUN(__glewIsFenceNV)
-#define glSetFenceNV GLEW_GET_FUN(__glewSetFenceNV)
-#define glTestFenceNV GLEW_GET_FUN(__glewTestFenceNV)
-
-#define GLEW_NV_fence GLEW_GET_VAR(__GLEW_NV_fence)
-
-#endif /* GL_NV_fence */
-
-/* --------------------------- GL_NV_float_buffer -------------------------- */
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-
-#define GL_FLOAT_R_NV 0x8880
-#define GL_FLOAT_RG_NV 0x8881
-#define GL_FLOAT_RGB_NV 0x8882
-#define GL_FLOAT_RGBA_NV 0x8883
-#define GL_FLOAT_R16_NV 0x8884
-#define GL_FLOAT_R32_NV 0x8885
-#define GL_FLOAT_RG16_NV 0x8886
-#define GL_FLOAT_RG32_NV 0x8887
-#define GL_FLOAT_RGB16_NV 0x8888
-#define GL_FLOAT_RGB32_NV 0x8889
-#define GL_FLOAT_RGBA16_NV 0x888A
-#define GL_FLOAT_RGBA32_NV 0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D
-#define GL_FLOAT_RGBA_MODE_NV 0x888E
-
-#define GLEW_NV_float_buffer GLEW_GET_VAR(__GLEW_NV_float_buffer)
-
-#endif /* GL_NV_float_buffer */
-
-/* --------------------------- GL_NV_fog_distance -------------------------- */
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-
-#define GL_FOG_DISTANCE_MODE_NV 0x855A
-#define GL_EYE_RADIAL_NV 0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C
-
-#define GLEW_NV_fog_distance GLEW_GET_VAR(__GLEW_NV_fog_distance)
-
-#endif /* GL_NV_fog_distance */
-
-/* ------------------------- GL_NV_fragment_program ------------------------ */
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV 0x8870
-#define GL_MAX_TEXTURE_COORDS_NV 0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873
-#define GL_PROGRAM_ERROR_STRING_NV 0x8874
-
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble *params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLdouble v[]);
-typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLfloat v[]);
-
-#define glGetProgramNamedParameterdvNV GLEW_GET_FUN(__glewGetProgramNamedParameterdvNV)
-#define glGetProgramNamedParameterfvNV GLEW_GET_FUN(__glewGetProgramNamedParameterfvNV)
-#define glProgramNamedParameter4dNV GLEW_GET_FUN(__glewProgramNamedParameter4dNV)
-#define glProgramNamedParameter4dvNV GLEW_GET_FUN(__glewProgramNamedParameter4dvNV)
-#define glProgramNamedParameter4fNV GLEW_GET_FUN(__glewProgramNamedParameter4fNV)
-#define glProgramNamedParameter4fvNV GLEW_GET_FUN(__glewProgramNamedParameter4fvNV)
-
-#define GLEW_NV_fragment_program GLEW_GET_VAR(__GLEW_NV_fragment_program)
-
-#endif /* GL_NV_fragment_program */
-
-/* ------------------------ GL_NV_fragment_program2 ------------------------ */
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8
-
-#define GLEW_NV_fragment_program2 GLEW_GET_VAR(__GLEW_NV_fragment_program2)
-
-#endif /* GL_NV_fragment_program2 */
-
-/* ------------------------ GL_NV_fragment_program4 ------------------------ */
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-
-#define GLEW_NV_fragment_program4 GLEW_GET_VAR(__GLEW_NV_fragment_program4)
-
-#endif /* GL_NV_fragment_program4 */
-
-/* --------------------- GL_NV_fragment_program_option --------------------- */
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-
-#define GLEW_NV_fragment_program_option GLEW_GET_VAR(__GLEW_NV_fragment_program_option)
-
-#endif /* GL_NV_fragment_program_option */
-
-/* ----------------- GL_NV_framebuffer_multisample_coverage ---------------- */
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12
-
-typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-
-#define glRenderbufferStorageMultisampleCoverageNV GLEW_GET_FUN(__glewRenderbufferStorageMultisampleCoverageNV)
-
-#define GLEW_NV_framebuffer_multisample_coverage GLEW_GET_VAR(__GLEW_NV_framebuffer_multisample_coverage)
-
-#endif /* GL_NV_framebuffer_multisample_coverage */
-
-/* ------------------------ GL_NV_geometry_program4 ------------------------ */
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-
-#define GL_GEOMETRY_PROGRAM_NV 0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-
-typedef void (GLAPIENTRY * PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-
-#define glProgramVertexLimitNV GLEW_GET_FUN(__glewProgramVertexLimitNV)
-
-#define GLEW_NV_geometry_program4 GLEW_GET_VAR(__GLEW_NV_geometry_program4)
-
-#endif /* GL_NV_geometry_program4 */
-
-/* ------------------------- GL_NV_geometry_shader4 ------------------------ */
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-
-#define GLEW_NV_geometry_shader4 GLEW_GET_VAR(__GLEW_NV_geometry_shader4)
-
-#endif /* GL_NV_geometry_shader4 */
-
-/* --------------------------- GL_NV_gpu_program4 -------------------------- */
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-
-#define glProgramEnvParameterI4iNV GLEW_GET_FUN(__glewProgramEnvParameterI4iNV)
-#define glProgramEnvParameterI4ivNV GLEW_GET_FUN(__glewProgramEnvParameterI4ivNV)
-#define glProgramEnvParameterI4uiNV GLEW_GET_FUN(__glewProgramEnvParameterI4uiNV)
-#define glProgramEnvParameterI4uivNV GLEW_GET_FUN(__glewProgramEnvParameterI4uivNV)
-#define glProgramEnvParametersI4ivNV GLEW_GET_FUN(__glewProgramEnvParametersI4ivNV)
-#define glProgramEnvParametersI4uivNV GLEW_GET_FUN(__glewProgramEnvParametersI4uivNV)
-#define glProgramLocalParameterI4iNV GLEW_GET_FUN(__glewProgramLocalParameterI4iNV)
-#define glProgramLocalParameterI4ivNV GLEW_GET_FUN(__glewProgramLocalParameterI4ivNV)
-#define glProgramLocalParameterI4uiNV GLEW_GET_FUN(__glewProgramLocalParameterI4uiNV)
-#define glProgramLocalParameterI4uivNV GLEW_GET_FUN(__glewProgramLocalParameterI4uivNV)
-#define glProgramLocalParametersI4ivNV GLEW_GET_FUN(__glewProgramLocalParametersI4ivNV)
-#define glProgramLocalParametersI4uivNV GLEW_GET_FUN(__glewProgramLocalParametersI4uivNV)
-
-#define GLEW_NV_gpu_program4 GLEW_GET_VAR(__GLEW_NV_gpu_program4)
-
-#endif /* GL_NV_gpu_program4 */
-
-/* --------------------------- GL_NV_gpu_program5 -------------------------- */
-
-#ifndef GL_NV_gpu_program5
-#define GL_NV_gpu_program5 1
-
-#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
-#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
-
-#define GLEW_NV_gpu_program5 GLEW_GET_VAR(__GLEW_NV_gpu_program5)
-
-#endif /* GL_NV_gpu_program5 */
-
-/* ------------------------- GL_NV_gpu_program_fp64 ------------------------ */
-
-#ifndef GL_NV_gpu_program_fp64
-#define GL_NV_gpu_program_fp64 1
-
-#define GLEW_NV_gpu_program_fp64 GLEW_GET_VAR(__GLEW_NV_gpu_program_fp64)
-
-#endif /* GL_NV_gpu_program_fp64 */
-
-/* --------------------------- GL_NV_gpu_shader5 --------------------------- */
-
-#ifndef GL_NV_gpu_shader5
-#define GL_NV_gpu_shader5 1
-
-#define GL_INT64_NV 0x140E
-#define GL_UNSIGNED_INT64_NV 0x140F
-#define GL_INT8_NV 0x8FE0
-#define GL_INT8_VEC2_NV 0x8FE1
-#define GL_INT8_VEC3_NV 0x8FE2
-#define GL_INT8_VEC4_NV 0x8FE3
-#define GL_INT16_NV 0x8FE4
-#define GL_INT16_VEC2_NV 0x8FE5
-#define GL_INT16_VEC3_NV 0x8FE6
-#define GL_INT16_VEC4_NV 0x8FE7
-#define GL_INT64_VEC2_NV 0x8FE9
-#define GL_INT64_VEC3_NV 0x8FEA
-#define GL_INT64_VEC4_NV 0x8FEB
-#define GL_UNSIGNED_INT8_NV 0x8FEC
-#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED
-#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE
-#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF
-#define GL_UNSIGNED_INT16_NV 0x8FF0
-#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1
-#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2
-#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3
-#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5
-#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6
-#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7
-#define GL_FLOAT16_NV 0x8FF8
-#define GL_FLOAT16_VEC2_NV 0x8FF9
-#define GL_FLOAT16_VEC3_NV 0x8FFA
-#define GL_FLOAT16_VEC4_NV 0x8FFB
-
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
-typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
-typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
-
-#define glGetUniformi64vNV GLEW_GET_FUN(__glewGetUniformi64vNV)
-#define glGetUniformui64vNV GLEW_GET_FUN(__glewGetUniformui64vNV)
-#define glProgramUniform1i64NV GLEW_GET_FUN(__glewProgramUniform1i64NV)
-#define glProgramUniform1i64vNV GLEW_GET_FUN(__glewProgramUniform1i64vNV)
-#define glProgramUniform1ui64NV GLEW_GET_FUN(__glewProgramUniform1ui64NV)
-#define glProgramUniform1ui64vNV GLEW_GET_FUN(__glewProgramUniform1ui64vNV)
-#define glProgramUniform2i64NV GLEW_GET_FUN(__glewProgramUniform2i64NV)
-#define glProgramUniform2i64vNV GLEW_GET_FUN(__glewProgramUniform2i64vNV)
-#define glProgramUniform2ui64NV GLEW_GET_FUN(__glewProgramUniform2ui64NV)
-#define glProgramUniform2ui64vNV GLEW_GET_FUN(__glewProgramUniform2ui64vNV)
-#define glProgramUniform3i64NV GLEW_GET_FUN(__glewProgramUniform3i64NV)
-#define glProgramUniform3i64vNV GLEW_GET_FUN(__glewProgramUniform3i64vNV)
-#define glProgramUniform3ui64NV GLEW_GET_FUN(__glewProgramUniform3ui64NV)
-#define glProgramUniform3ui64vNV GLEW_GET_FUN(__glewProgramUniform3ui64vNV)
-#define glProgramUniform4i64NV GLEW_GET_FUN(__glewProgramUniform4i64NV)
-#define glProgramUniform4i64vNV GLEW_GET_FUN(__glewProgramUniform4i64vNV)
-#define glProgramUniform4ui64NV GLEW_GET_FUN(__glewProgramUniform4ui64NV)
-#define glProgramUniform4ui64vNV GLEW_GET_FUN(__glewProgramUniform4ui64vNV)
-#define glUniform1i64NV GLEW_GET_FUN(__glewUniform1i64NV)
-#define glUniform1i64vNV GLEW_GET_FUN(__glewUniform1i64vNV)
-#define glUniform1ui64NV GLEW_GET_FUN(__glewUniform1ui64NV)
-#define glUniform1ui64vNV GLEW_GET_FUN(__glewUniform1ui64vNV)
-#define glUniform2i64NV GLEW_GET_FUN(__glewUniform2i64NV)
-#define glUniform2i64vNV GLEW_GET_FUN(__glewUniform2i64vNV)
-#define glUniform2ui64NV GLEW_GET_FUN(__glewUniform2ui64NV)
-#define glUniform2ui64vNV GLEW_GET_FUN(__glewUniform2ui64vNV)
-#define glUniform3i64NV GLEW_GET_FUN(__glewUniform3i64NV)
-#define glUniform3i64vNV GLEW_GET_FUN(__glewUniform3i64vNV)
-#define glUniform3ui64NV GLEW_GET_FUN(__glewUniform3ui64NV)
-#define glUniform3ui64vNV GLEW_GET_FUN(__glewUniform3ui64vNV)
-#define glUniform4i64NV GLEW_GET_FUN(__glewUniform4i64NV)
-#define glUniform4i64vNV GLEW_GET_FUN(__glewUniform4i64vNV)
-#define glUniform4ui64NV GLEW_GET_FUN(__glewUniform4ui64NV)
-#define glUniform4ui64vNV GLEW_GET_FUN(__glewUniform4ui64vNV)
-
-#define GLEW_NV_gpu_shader5 GLEW_GET_VAR(__GLEW_NV_gpu_shader5)
-
-#endif /* GL_NV_gpu_shader5 */
-
-/* ---------------------------- GL_NV_half_float --------------------------- */
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-
-#define GL_HALF_FLOAT_NV 0x140B
-
-typedef unsigned short GLhalf;
-
-typedef void (GLAPIENTRY * PFNGLCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
-typedef void (GLAPIENTRY * PFNGLCOLOR3HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLCOLOR4HNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha);
-typedef void (GLAPIENTRY * PFNGLCOLOR4HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDHNVPROC) (GLhalf fog);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDHVNVPROC) (const GLhalf* fog);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalf s);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalf s, GLhalf t);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q);
-typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLNORMAL3HNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz);
-typedef void (GLAPIENTRY * PFNGLNORMAL3HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD1HNVPROC) (GLhalf s);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD1HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2HNVPROC) (GLhalf s, GLhalf t);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD3HNVPROC) (GLhalf s, GLhalf t, GLhalf r);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD3HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4HNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEX2HNVPROC) (GLhalf x, GLhalf y);
-typedef void (GLAPIENTRY * PFNGLVERTEX2HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEX3HNVPROC) (GLhalf x, GLhalf y, GLhalf z);
-typedef void (GLAPIENTRY * PFNGLVERTEX3HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEX4HNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w);
-typedef void (GLAPIENTRY * PFNGLVERTEX4HVNVPROC) (const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalf x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalf x, GLhalf y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHNVPROC) (GLhalf weight);
-typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalf* weight);
-
-#define glColor3hNV GLEW_GET_FUN(__glewColor3hNV)
-#define glColor3hvNV GLEW_GET_FUN(__glewColor3hvNV)
-#define glColor4hNV GLEW_GET_FUN(__glewColor4hNV)
-#define glColor4hvNV GLEW_GET_FUN(__glewColor4hvNV)
-#define glFogCoordhNV GLEW_GET_FUN(__glewFogCoordhNV)
-#define glFogCoordhvNV GLEW_GET_FUN(__glewFogCoordhvNV)
-#define glMultiTexCoord1hNV GLEW_GET_FUN(__glewMultiTexCoord1hNV)
-#define glMultiTexCoord1hvNV GLEW_GET_FUN(__glewMultiTexCoord1hvNV)
-#define glMultiTexCoord2hNV GLEW_GET_FUN(__glewMultiTexCoord2hNV)
-#define glMultiTexCoord2hvNV GLEW_GET_FUN(__glewMultiTexCoord2hvNV)
-#define glMultiTexCoord3hNV GLEW_GET_FUN(__glewMultiTexCoord3hNV)
-#define glMultiTexCoord3hvNV GLEW_GET_FUN(__glewMultiTexCoord3hvNV)
-#define glMultiTexCoord4hNV GLEW_GET_FUN(__glewMultiTexCoord4hNV)
-#define glMultiTexCoord4hvNV GLEW_GET_FUN(__glewMultiTexCoord4hvNV)
-#define glNormal3hNV GLEW_GET_FUN(__glewNormal3hNV)
-#define glNormal3hvNV GLEW_GET_FUN(__glewNormal3hvNV)
-#define glSecondaryColor3hNV GLEW_GET_FUN(__glewSecondaryColor3hNV)
-#define glSecondaryColor3hvNV GLEW_GET_FUN(__glewSecondaryColor3hvNV)
-#define glTexCoord1hNV GLEW_GET_FUN(__glewTexCoord1hNV)
-#define glTexCoord1hvNV GLEW_GET_FUN(__glewTexCoord1hvNV)
-#define glTexCoord2hNV GLEW_GET_FUN(__glewTexCoord2hNV)
-#define glTexCoord2hvNV GLEW_GET_FUN(__glewTexCoord2hvNV)
-#define glTexCoord3hNV GLEW_GET_FUN(__glewTexCoord3hNV)
-#define glTexCoord3hvNV GLEW_GET_FUN(__glewTexCoord3hvNV)
-#define glTexCoord4hNV GLEW_GET_FUN(__glewTexCoord4hNV)
-#define glTexCoord4hvNV GLEW_GET_FUN(__glewTexCoord4hvNV)
-#define glVertex2hNV GLEW_GET_FUN(__glewVertex2hNV)
-#define glVertex2hvNV GLEW_GET_FUN(__glewVertex2hvNV)
-#define glVertex3hNV GLEW_GET_FUN(__glewVertex3hNV)
-#define glVertex3hvNV GLEW_GET_FUN(__glewVertex3hvNV)
-#define glVertex4hNV GLEW_GET_FUN(__glewVertex4hNV)
-#define glVertex4hvNV GLEW_GET_FUN(__glewVertex4hvNV)
-#define glVertexAttrib1hNV GLEW_GET_FUN(__glewVertexAttrib1hNV)
-#define glVertexAttrib1hvNV GLEW_GET_FUN(__glewVertexAttrib1hvNV)
-#define glVertexAttrib2hNV GLEW_GET_FUN(__glewVertexAttrib2hNV)
-#define glVertexAttrib2hvNV GLEW_GET_FUN(__glewVertexAttrib2hvNV)
-#define glVertexAttrib3hNV GLEW_GET_FUN(__glewVertexAttrib3hNV)
-#define glVertexAttrib3hvNV GLEW_GET_FUN(__glewVertexAttrib3hvNV)
-#define glVertexAttrib4hNV GLEW_GET_FUN(__glewVertexAttrib4hNV)
-#define glVertexAttrib4hvNV GLEW_GET_FUN(__glewVertexAttrib4hvNV)
-#define glVertexAttribs1hvNV GLEW_GET_FUN(__glewVertexAttribs1hvNV)
-#define glVertexAttribs2hvNV GLEW_GET_FUN(__glewVertexAttribs2hvNV)
-#define glVertexAttribs3hvNV GLEW_GET_FUN(__glewVertexAttribs3hvNV)
-#define glVertexAttribs4hvNV GLEW_GET_FUN(__glewVertexAttribs4hvNV)
-#define glVertexWeighthNV GLEW_GET_FUN(__glewVertexWeighthNV)
-#define glVertexWeighthvNV GLEW_GET_FUN(__glewVertexWeighthvNV)
-
-#define GLEW_NV_half_float GLEW_GET_VAR(__GLEW_NV_half_float)
-
-#endif /* GL_NV_half_float */
-
-/* ------------------------ GL_NV_light_max_exponent ----------------------- */
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-
-#define GL_MAX_SHININESS_NV 0x8504
-#define GL_MAX_SPOT_EXPONENT_NV 0x8505
-
-#define GLEW_NV_light_max_exponent GLEW_GET_VAR(__GLEW_NV_light_max_exponent)
-
-#endif /* GL_NV_light_max_exponent */
-
-/* ----------------------- GL_NV_multisample_coverage ---------------------- */
-
-#ifndef GL_NV_multisample_coverage
-#define GL_NV_multisample_coverage 1
-
-#define GL_COVERAGE_SAMPLES_NV 0x80A9
-#define GL_COLOR_SAMPLES_NV 0x8E20
-
-#define GLEW_NV_multisample_coverage GLEW_GET_VAR(__GLEW_NV_multisample_coverage)
-
-#endif /* GL_NV_multisample_coverage */
-
-/* --------------------- GL_NV_multisample_filter_hint --------------------- */
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-
-#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534
-
-#define GLEW_NV_multisample_filter_hint GLEW_GET_VAR(__GLEW_NV_multisample_filter_hint)
-
-#endif /* GL_NV_multisample_filter_hint */
-
-/* ------------------------- GL_NV_occlusion_query ------------------------- */
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-
-#define GL_PIXEL_COUNTER_BITS_NV 0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865
-#define GL_PIXEL_COUNT_NV 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867
-
-typedef void (GLAPIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (GLAPIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-
-#define glBeginOcclusionQueryNV GLEW_GET_FUN(__glewBeginOcclusionQueryNV)
-#define glDeleteOcclusionQueriesNV GLEW_GET_FUN(__glewDeleteOcclusionQueriesNV)
-#define glEndOcclusionQueryNV GLEW_GET_FUN(__glewEndOcclusionQueryNV)
-#define glGenOcclusionQueriesNV GLEW_GET_FUN(__glewGenOcclusionQueriesNV)
-#define glGetOcclusionQueryivNV GLEW_GET_FUN(__glewGetOcclusionQueryivNV)
-#define glGetOcclusionQueryuivNV GLEW_GET_FUN(__glewGetOcclusionQueryuivNV)
-#define glIsOcclusionQueryNV GLEW_GET_FUN(__glewIsOcclusionQueryNV)
-
-#define GLEW_NV_occlusion_query GLEW_GET_VAR(__GLEW_NV_occlusion_query)
-
-#endif /* GL_NV_occlusion_query */
-
-/* ----------------------- GL_NV_packed_depth_stencil ---------------------- */
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-
-#define GL_DEPTH_STENCIL_NV 0x84F9
-#define GL_UNSIGNED_INT_24_8_NV 0x84FA
-
-#define GLEW_NV_packed_depth_stencil GLEW_GET_VAR(__GLEW_NV_packed_depth_stencil)
-
-#endif /* GL_NV_packed_depth_stencil */
-
-/* --------------------- GL_NV_parameter_buffer_object --------------------- */
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-
-typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-
-#define glProgramBufferParametersIivNV GLEW_GET_FUN(__glewProgramBufferParametersIivNV)
-#define glProgramBufferParametersIuivNV GLEW_GET_FUN(__glewProgramBufferParametersIuivNV)
-#define glProgramBufferParametersfvNV GLEW_GET_FUN(__glewProgramBufferParametersfvNV)
-
-#define GLEW_NV_parameter_buffer_object GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object)
-
-#endif /* GL_NV_parameter_buffer_object */
-
-/* --------------------- GL_NV_parameter_buffer_object2 -------------------- */
-
-#ifndef GL_NV_parameter_buffer_object2
-#define GL_NV_parameter_buffer_object2 1
-
-#define GLEW_NV_parameter_buffer_object2 GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object2)
-
-#endif /* GL_NV_parameter_buffer_object2 */
-
-/* -------------------------- GL_NV_path_rendering ------------------------- */
-
-#ifndef GL_NV_path_rendering
-#define GL_NV_path_rendering 1
-
-#define GL_CLOSE_PATH_NV 0x00
-#define GL_BOLD_BIT_NV 0x01
-#define GL_GLYPH_WIDTH_BIT_NV 0x01
-#define GL_GLYPH_HEIGHT_BIT_NV 0x02
-#define GL_ITALIC_BIT_NV 0x02
-#define GL_MOVE_TO_NV 0x02
-#define GL_RELATIVE_MOVE_TO_NV 0x03
-#define GL_LINE_TO_NV 0x04
-#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
-#define GL_RELATIVE_LINE_TO_NV 0x05
-#define GL_HORIZONTAL_LINE_TO_NV 0x06
-#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
-#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
-#define GL_VERTICAL_LINE_TO_NV 0x08
-#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09
-#define GL_QUADRATIC_CURVE_TO_NV 0x0A
-#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
-#define GL_CUBIC_CURVE_TO_NV 0x0C
-#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D
-#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E
-#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
-#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
-#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10
-#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
-#define GL_SMALL_CCW_ARC_TO_NV 0x12
-#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13
-#define GL_SMALL_CW_ARC_TO_NV 0x14
-#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15
-#define GL_LARGE_CCW_ARC_TO_NV 0x16
-#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17
-#define GL_LARGE_CW_ARC_TO_NV 0x18
-#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19
-#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
-#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
-#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
-#define GL_RESTART_PATH_NV 0xF0
-#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2
-#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4
-#define GL_RECT_NV 0xF6
-#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8
-#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA
-#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC
-#define GL_ARC_TO_NV 0xFE
-#define GL_RELATIVE_ARC_TO_NV 0xFF
-#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100
-#define GL_PRIMARY_COLOR_NV 0x852C
-#define GL_SECONDARY_COLOR_NV 0x852D
-#define GL_PRIMARY_COLOR 0x8577
-#define GL_PATH_FORMAT_SVG_NV 0x9070
-#define GL_PATH_FORMAT_PS_NV 0x9071
-#define GL_STANDARD_FONT_NAME_NV 0x9072
-#define GL_SYSTEM_FONT_NAME_NV 0x9073
-#define GL_FILE_NAME_NV 0x9074
-#define GL_PATH_STROKE_WIDTH_NV 0x9075
-#define GL_PATH_END_CAPS_NV 0x9076
-#define GL_PATH_INITIAL_END_CAP_NV 0x9077
-#define GL_PATH_TERMINAL_END_CAP_NV 0x9078
-#define GL_PATH_JOIN_STYLE_NV 0x9079
-#define GL_PATH_MITER_LIMIT_NV 0x907A
-#define GL_PATH_DASH_CAPS_NV 0x907B
-#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C
-#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D
-#define GL_PATH_DASH_OFFSET_NV 0x907E
-#define GL_PATH_CLIENT_LENGTH_NV 0x907F
-#define GL_PATH_FILL_MODE_NV 0x9080
-#define GL_PATH_FILL_MASK_NV 0x9081
-#define GL_PATH_FILL_COVER_MODE_NV 0x9082
-#define GL_PATH_STROKE_COVER_MODE_NV 0x9083
-#define GL_PATH_STROKE_MASK_NV 0x9084
-#define GL_COUNT_UP_NV 0x9088
-#define GL_COUNT_DOWN_NV 0x9089
-#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A
-#define GL_CONVEX_HULL_NV 0x908B
-#define GL_BOUNDING_BOX_NV 0x908D
-#define GL_TRANSLATE_X_NV 0x908E
-#define GL_TRANSLATE_Y_NV 0x908F
-#define GL_TRANSLATE_2D_NV 0x9090
-#define GL_TRANSLATE_3D_NV 0x9091
-#define GL_AFFINE_2D_NV 0x9092
-#define GL_AFFINE_3D_NV 0x9094
-#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096
-#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098
-#define GL_UTF8_NV 0x909A
-#define GL_UTF16_NV 0x909B
-#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
-#define GL_PATH_COMMAND_COUNT_NV 0x909D
-#define GL_PATH_COORD_COUNT_NV 0x909E
-#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F
-#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0
-#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1
-#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2
-#define GL_SQUARE_NV 0x90A3
-#define GL_ROUND_NV 0x90A4
-#define GL_TRIANGULAR_NV 0x90A5
-#define GL_BEVEL_NV 0x90A6
-#define GL_MITER_REVERT_NV 0x90A7
-#define GL_MITER_TRUNCATE_NV 0x90A8
-#define GL_SKIP_MISSING_GLYPH_NV 0x90A9
-#define GL_USE_MISSING_GLYPH_NV 0x90AA
-#define GL_PATH_ERROR_POSITION_NV 0x90AB
-#define GL_PATH_FOG_GEN_MODE_NV 0x90AC
-#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD
-#define GL_ADJACENT_PAIRS_NV 0x90AE
-#define GL_FIRST_TO_REST_NV 0x90AF
-#define GL_PATH_GEN_MODE_NV 0x90B0
-#define GL_PATH_GEN_COEFF_NV 0x90B1
-#define GL_PATH_GEN_COLOR_FORMAT_NV 0x90B2
-#define GL_PATH_GEN_COMPONENTS_NV 0x90B3
-#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4
-#define GL_MOVE_TO_RESETS_NV 0x90B5
-#define GL_MOVE_TO_CONTINUES_NV 0x90B6
-#define GL_PATH_STENCIL_FUNC_NV 0x90B7
-#define GL_PATH_STENCIL_REF_NV 0x90B8
-#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9
-#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
-#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
-#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF
-#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000
-#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000
-#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000
-#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000
-#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000
-#define GL_FONT_ASCENDER_BIT_NV 0x00200000
-#define GL_FONT_DESCENDER_BIT_NV 0x00400000
-#define GL_FONT_HEIGHT_BIT_NV 0x00800000
-#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000
-#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
-#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
-#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
-#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000
-
-typedef void (GLAPIENTRY * PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
-typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
-typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
-typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
-typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHNVPROC) (GLuint name, GLenum coverMode);
-typedef void (GLAPIENTRY * PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
-typedef GLuint (GLAPIENTRY * PFNGLGENPATHSNVPROC) (GLsizei range);
-typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint* value);
-typedef void (GLAPIENTRY * PFNGLGETPATHCOMMANDSNVPROC) (GLuint name, GLubyte* commands);
-typedef void (GLAPIENTRY * PFNGLGETPATHCOORDSNVPROC) (GLuint name, GLfloat* coords);
-typedef void (GLAPIENTRY * PFNGLGETPATHDASHARRAYNVPROC) (GLuint name, GLfloat* dashArray);
-typedef GLfloat (GLAPIENTRY * PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
-typedef void (GLAPIENTRY * PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint fistPathName, GLsizei numPaths, GLsizei stride, GLfloat* metrics);
-typedef void (GLAPIENTRY * PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
-typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERFVNVPROC) (GLuint name, GLenum param, GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERIVNVPROC) (GLuint name, GLenum param, GLint* value);
-typedef void (GLAPIENTRY * PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
-typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint* value);
-typedef void (GLAPIENTRY * PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
-typedef GLboolean (GLAPIENTRY * PFNGLISPATHNVPROC) (GLuint path);
-typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
-typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs);
-typedef void (GLAPIENTRY * PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const GLvoid*coords);
-typedef void (GLAPIENTRY * PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void* coords);
-typedef void (GLAPIENTRY * PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum zfunc);
-typedef void (GLAPIENTRY * PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat* dashArray);
-typedef void (GLAPIENTRY * PFNGLPATHFOGGENNVPROC) (GLenum genMode);
-typedef void (GLAPIENTRY * PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
-typedef void (GLAPIENTRY * PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void* fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const GLvoid*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
-typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
-typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat* value);
-typedef void (GLAPIENTRY * PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
-typedef void (GLAPIENTRY * PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint* value);
-typedef void (GLAPIENTRY * PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
-typedef void (GLAPIENTRY * PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
-typedef void (GLAPIENTRY * PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void* pathString);
-typedef void (GLAPIENTRY * PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const GLvoid*coords);
-typedef void (GLAPIENTRY * PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void* coords);
-typedef void (GLAPIENTRY * PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat* coeffs);
-typedef GLboolean (GLAPIENTRY * PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
-typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
-typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
-typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void* paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
-typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
-typedef void (GLAPIENTRY * PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat* transformValues);
-typedef void (GLAPIENTRY * PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint paths[], const GLfloat weights[]);
-
-#define glCopyPathNV GLEW_GET_FUN(__glewCopyPathNV)
-#define glCoverFillPathInstancedNV GLEW_GET_FUN(__glewCoverFillPathInstancedNV)
-#define glCoverFillPathNV GLEW_GET_FUN(__glewCoverFillPathNV)
-#define glCoverStrokePathInstancedNV GLEW_GET_FUN(__glewCoverStrokePathInstancedNV)
-#define glCoverStrokePathNV GLEW_GET_FUN(__glewCoverStrokePathNV)
-#define glDeletePathsNV GLEW_GET_FUN(__glewDeletePathsNV)
-#define glGenPathsNV GLEW_GET_FUN(__glewGenPathsNV)
-#define glGetPathColorGenfvNV GLEW_GET_FUN(__glewGetPathColorGenfvNV)
-#define glGetPathColorGenivNV GLEW_GET_FUN(__glewGetPathColorGenivNV)
-#define glGetPathCommandsNV GLEW_GET_FUN(__glewGetPathCommandsNV)
-#define glGetPathCoordsNV GLEW_GET_FUN(__glewGetPathCoordsNV)
-#define glGetPathDashArrayNV GLEW_GET_FUN(__glewGetPathDashArrayNV)
-#define glGetPathLengthNV GLEW_GET_FUN(__glewGetPathLengthNV)
-#define glGetPathMetricRangeNV GLEW_GET_FUN(__glewGetPathMetricRangeNV)
-#define glGetPathMetricsNV GLEW_GET_FUN(__glewGetPathMetricsNV)
-#define glGetPathParameterfvNV GLEW_GET_FUN(__glewGetPathParameterfvNV)
-#define glGetPathParameterivNV GLEW_GET_FUN(__glewGetPathParameterivNV)
-#define glGetPathSpacingNV GLEW_GET_FUN(__glewGetPathSpacingNV)
-#define glGetPathTexGenfvNV GLEW_GET_FUN(__glewGetPathTexGenfvNV)
-#define glGetPathTexGenivNV GLEW_GET_FUN(__glewGetPathTexGenivNV)
-#define glInterpolatePathsNV GLEW_GET_FUN(__glewInterpolatePathsNV)
-#define glIsPathNV GLEW_GET_FUN(__glewIsPathNV)
-#define glIsPointInFillPathNV GLEW_GET_FUN(__glewIsPointInFillPathNV)
-#define glIsPointInStrokePathNV GLEW_GET_FUN(__glewIsPointInStrokePathNV)
-#define glPathColorGenNV GLEW_GET_FUN(__glewPathColorGenNV)
-#define glPathCommandsNV GLEW_GET_FUN(__glewPathCommandsNV)
-#define glPathCoordsNV GLEW_GET_FUN(__glewPathCoordsNV)
-#define glPathCoverDepthFuncNV GLEW_GET_FUN(__glewPathCoverDepthFuncNV)
-#define glPathDashArrayNV GLEW_GET_FUN(__glewPathDashArrayNV)
-#define glPathFogGenNV GLEW_GET_FUN(__glewPathFogGenNV)
-#define glPathGlyphRangeNV GLEW_GET_FUN(__glewPathGlyphRangeNV)
-#define glPathGlyphsNV GLEW_GET_FUN(__glewPathGlyphsNV)
-#define glPathParameterfNV GLEW_GET_FUN(__glewPathParameterfNV)
-#define glPathParameterfvNV GLEW_GET_FUN(__glewPathParameterfvNV)
-#define glPathParameteriNV GLEW_GET_FUN(__glewPathParameteriNV)
-#define glPathParameterivNV GLEW_GET_FUN(__glewPathParameterivNV)
-#define glPathStencilDepthOffsetNV GLEW_GET_FUN(__glewPathStencilDepthOffsetNV)
-#define glPathStencilFuncNV GLEW_GET_FUN(__glewPathStencilFuncNV)
-#define glPathStringNV GLEW_GET_FUN(__glewPathStringNV)
-#define glPathSubCommandsNV GLEW_GET_FUN(__glewPathSubCommandsNV)
-#define glPathSubCoordsNV GLEW_GET_FUN(__glewPathSubCoordsNV)
-#define glPathTexGenNV GLEW_GET_FUN(__glewPathTexGenNV)
-#define glPointAlongPathNV GLEW_GET_FUN(__glewPointAlongPathNV)
-#define glStencilFillPathInstancedNV GLEW_GET_FUN(__glewStencilFillPathInstancedNV)
-#define glStencilFillPathNV GLEW_GET_FUN(__glewStencilFillPathNV)
-#define glStencilStrokePathInstancedNV GLEW_GET_FUN(__glewStencilStrokePathInstancedNV)
-#define glStencilStrokePathNV GLEW_GET_FUN(__glewStencilStrokePathNV)
-#define glTransformPathNV GLEW_GET_FUN(__glewTransformPathNV)
-#define glWeightPathsNV GLEW_GET_FUN(__glewWeightPathsNV)
-
-#define GLEW_NV_path_rendering GLEW_GET_VAR(__GLEW_NV_path_rendering)
-
-#endif /* GL_NV_path_rendering */
-
-/* ------------------------- GL_NV_pixel_data_range ------------------------ */
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-
-#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-
-typedef void (GLAPIENTRY * PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, void* pointer);
-
-#define glFlushPixelDataRangeNV GLEW_GET_FUN(__glewFlushPixelDataRangeNV)
-#define glPixelDataRangeNV GLEW_GET_FUN(__glewPixelDataRangeNV)
-
-#define GLEW_NV_pixel_data_range GLEW_GET_VAR(__GLEW_NV_pixel_data_range)
-
-#endif /* GL_NV_pixel_data_range */
-
-/* --------------------------- GL_NV_point_sprite -------------------------- */
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-
-#define GL_POINT_SPRITE_NV 0x8861
-#define GL_COORD_REPLACE_NV 0x8862
-#define GL_POINT_SPRITE_R_MODE_NV 0x8863
-
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
-
-#define glPointParameteriNV GLEW_GET_FUN(__glewPointParameteriNV)
-#define glPointParameterivNV GLEW_GET_FUN(__glewPointParameterivNV)
-
-#define GLEW_NV_point_sprite GLEW_GET_VAR(__GLEW_NV_point_sprite)
-
-#endif /* GL_NV_point_sprite */
-
-/* -------------------------- GL_NV_present_video -------------------------- */
-
-#ifndef GL_NV_present_video
-#define GL_NV_present_video 1
-
-#define GL_FRAME_NV 0x8E26
-#define GL_FIELDS_NV 0x8E27
-#define GL_CURRENT_TIME_NV 0x8E28
-#define GL_NUM_FILL_STREAMS_NV 0x8E29
-#define GL_PRESENT_TIME_NV 0x8E2A
-#define GL_PRESENT_DURATION_NV 0x8E2B
-
-typedef void (GLAPIENTRY * PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint* params);
-typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
-typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-
-#define glGetVideoi64vNV GLEW_GET_FUN(__glewGetVideoi64vNV)
-#define glGetVideoivNV GLEW_GET_FUN(__glewGetVideoivNV)
-#define glGetVideoui64vNV GLEW_GET_FUN(__glewGetVideoui64vNV)
-#define glGetVideouivNV GLEW_GET_FUN(__glewGetVideouivNV)
-#define glPresentFrameDualFillNV GLEW_GET_FUN(__glewPresentFrameDualFillNV)
-#define glPresentFrameKeyedNV GLEW_GET_FUN(__glewPresentFrameKeyedNV)
-
-#define GLEW_NV_present_video GLEW_GET_VAR(__GLEW_NV_present_video)
-
-#endif /* GL_NV_present_video */
-
-/* ------------------------ GL_NV_primitive_restart ------------------------ */
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-
-#define GL_PRIMITIVE_RESTART_NV 0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559
-
-typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void);
-
-#define glPrimitiveRestartIndexNV GLEW_GET_FUN(__glewPrimitiveRestartIndexNV)
-#define glPrimitiveRestartNV GLEW_GET_FUN(__glewPrimitiveRestartNV)
-
-#define GLEW_NV_primitive_restart GLEW_GET_VAR(__GLEW_NV_primitive_restart)
-
-#endif /* GL_NV_primitive_restart */
-
-/* ------------------------ GL_NV_register_combiners ----------------------- */
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-
-#define GL_REGISTER_COMBINERS_NV 0x8522
-#define GL_VARIABLE_A_NV 0x8523
-#define GL_VARIABLE_B_NV 0x8524
-#define GL_VARIABLE_C_NV 0x8525
-#define GL_VARIABLE_D_NV 0x8526
-#define GL_VARIABLE_E_NV 0x8527
-#define GL_VARIABLE_F_NV 0x8528
-#define GL_VARIABLE_G_NV 0x8529
-#define GL_CONSTANT_COLOR0_NV 0x852A
-#define GL_CONSTANT_COLOR1_NV 0x852B
-#define GL_PRIMARY_COLOR_NV 0x852C
-#define GL_SECONDARY_COLOR_NV 0x852D
-#define GL_SPARE0_NV 0x852E
-#define GL_SPARE1_NV 0x852F
-#define GL_DISCARD_NV 0x8530
-#define GL_E_TIMES_F_NV 0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV 0x8536
-#define GL_UNSIGNED_INVERT_NV 0x8537
-#define GL_EXPAND_NORMAL_NV 0x8538
-#define GL_EXPAND_NEGATE_NV 0x8539
-#define GL_HALF_BIAS_NORMAL_NV 0x853A
-#define GL_HALF_BIAS_NEGATE_NV 0x853B
-#define GL_SIGNED_IDENTITY_NV 0x853C
-#define GL_SIGNED_NEGATE_NV 0x853D
-#define GL_SCALE_BY_TWO_NV 0x853E
-#define GL_SCALE_BY_FOUR_NV 0x853F
-#define GL_SCALE_BY_ONE_HALF_NV 0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541
-#define GL_COMBINER_INPUT_NV 0x8542
-#define GL_COMBINER_MAPPING_NV 0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546
-#define GL_COMBINER_MUX_SUM_NV 0x8547
-#define GL_COMBINER_SCALE_NV 0x8548
-#define GL_COMBINER_BIAS_NV 0x8549
-#define GL_COMBINER_AB_OUTPUT_NV 0x854A
-#define GL_COMBINER_CD_OUTPUT_NV 0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV 0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV 0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV 0x854E
-#define GL_COLOR_SUM_CLAMP_NV 0x854F
-#define GL_COMBINER0_NV 0x8550
-#define GL_COMBINER1_NV 0x8551
-#define GL_COMBINER2_NV 0x8552
-#define GL_COMBINER3_NV 0x8553
-#define GL_COMBINER4_NV 0x8554
-#define GL_COMBINER5_NV 0x8555
-#define GL_COMBINER6_NV 0x8556
-#define GL_COMBINER7_NV 0x8557
-
-typedef void (GLAPIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (GLAPIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint* params);
-
-#define glCombinerInputNV GLEW_GET_FUN(__glewCombinerInputNV)
-#define glCombinerOutputNV GLEW_GET_FUN(__glewCombinerOutputNV)
-#define glCombinerParameterfNV GLEW_GET_FUN(__glewCombinerParameterfNV)
-#define glCombinerParameterfvNV GLEW_GET_FUN(__glewCombinerParameterfvNV)
-#define glCombinerParameteriNV GLEW_GET_FUN(__glewCombinerParameteriNV)
-#define glCombinerParameterivNV GLEW_GET_FUN(__glewCombinerParameterivNV)
-#define glFinalCombinerInputNV GLEW_GET_FUN(__glewFinalCombinerInputNV)
-#define glGetCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetCombinerInputParameterfvNV)
-#define glGetCombinerInputParameterivNV GLEW_GET_FUN(__glewGetCombinerInputParameterivNV)
-#define glGetCombinerOutputParameterfvNV GLEW_GET_FUN(__glewGetCombinerOutputParameterfvNV)
-#define glGetCombinerOutputParameterivNV GLEW_GET_FUN(__glewGetCombinerOutputParameterivNV)
-#define glGetFinalCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterfvNV)
-#define glGetFinalCombinerInputParameterivNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterivNV)
-
-#define GLEW_NV_register_combiners GLEW_GET_VAR(__GLEW_NV_register_combiners)
-
-#endif /* GL_NV_register_combiners */
-
-/* ----------------------- GL_NV_register_combiners2 ----------------------- */
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-
-#define GL_PER_STAGE_CONSTANTS_NV 0x8535
-
-typedef void (GLAPIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat* params);
-
-#define glCombinerStageParameterfvNV GLEW_GET_FUN(__glewCombinerStageParameterfvNV)
-#define glGetCombinerStageParameterfvNV GLEW_GET_FUN(__glewGetCombinerStageParameterfvNV)
-
-#define GLEW_NV_register_combiners2 GLEW_GET_VAR(__GLEW_NV_register_combiners2)
-
-#endif /* GL_NV_register_combiners2 */
-
-/* ----------------------- GL_NV_shader_atomic_float ----------------------- */
-
-#ifndef GL_NV_shader_atomic_float
-#define GL_NV_shader_atomic_float 1
-
-#define GLEW_NV_shader_atomic_float GLEW_GET_VAR(__GLEW_NV_shader_atomic_float)
-
-#endif /* GL_NV_shader_atomic_float */
-
-/* ------------------------ GL_NV_shader_buffer_load ----------------------- */
-
-#ifndef GL_NV_shader_buffer_load
-#define GL_NV_shader_buffer_load 1
-
-#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D
-#define GL_GPU_ADDRESS_NV 0x8F34
-#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35
-
-typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT* result);
-typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
-typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
-typedef void (GLAPIENTRY * PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
-typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
-typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
-typedef void (GLAPIENTRY * PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value);
-
-#define glGetBufferParameterui64vNV GLEW_GET_FUN(__glewGetBufferParameterui64vNV)
-#define glGetIntegerui64vNV GLEW_GET_FUN(__glewGetIntegerui64vNV)
-#define glGetNamedBufferParameterui64vNV GLEW_GET_FUN(__glewGetNamedBufferParameterui64vNV)
-#define glIsBufferResidentNV GLEW_GET_FUN(__glewIsBufferResidentNV)
-#define glIsNamedBufferResidentNV GLEW_GET_FUN(__glewIsNamedBufferResidentNV)
-#define glMakeBufferNonResidentNV GLEW_GET_FUN(__glewMakeBufferNonResidentNV)
-#define glMakeBufferResidentNV GLEW_GET_FUN(__glewMakeBufferResidentNV)
-#define glMakeNamedBufferNonResidentNV GLEW_GET_FUN(__glewMakeNamedBufferNonResidentNV)
-#define glMakeNamedBufferResidentNV GLEW_GET_FUN(__glewMakeNamedBufferResidentNV)
-#define glProgramUniformui64NV GLEW_GET_FUN(__glewProgramUniformui64NV)
-#define glProgramUniformui64vNV GLEW_GET_FUN(__glewProgramUniformui64vNV)
-#define glUniformui64NV GLEW_GET_FUN(__glewUniformui64NV)
-#define glUniformui64vNV GLEW_GET_FUN(__glewUniformui64vNV)
-
-#define GLEW_NV_shader_buffer_load GLEW_GET_VAR(__GLEW_NV_shader_buffer_load)
-
-#endif /* GL_NV_shader_buffer_load */
-
-/* ---------------------- GL_NV_tessellation_program5 ---------------------- */
-
-#ifndef GL_NV_tessellation_program5
-#define GL_NV_tessellation_program5 1
-
-#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8
-#define GL_TESS_CONTROL_PROGRAM_NV 0x891E
-#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F
-#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
-#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
-
-#define GLEW_NV_tessellation_program5 GLEW_GET_VAR(__GLEW_NV_tessellation_program5)
-
-#endif /* GL_NV_tessellation_program5 */
-
-/* -------------------------- GL_NV_texgen_emboss -------------------------- */
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-
-#define GL_EMBOSS_LIGHT_NV 0x855D
-#define GL_EMBOSS_CONSTANT_NV 0x855E
-#define GL_EMBOSS_MAP_NV 0x855F
-
-#define GLEW_NV_texgen_emboss GLEW_GET_VAR(__GLEW_NV_texgen_emboss)
-
-#endif /* GL_NV_texgen_emboss */
-
-/* ------------------------ GL_NV_texgen_reflection ------------------------ */
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-
-#define GL_NORMAL_MAP_NV 0x8511
-#define GL_REFLECTION_MAP_NV 0x8512
-
-#define GLEW_NV_texgen_reflection GLEW_GET_VAR(__GLEW_NV_texgen_reflection)
-
-#endif /* GL_NV_texgen_reflection */
-
-/* ------------------------- GL_NV_texture_barrier ------------------------- */
-
-#ifndef GL_NV_texture_barrier
-#define GL_NV_texture_barrier 1
-
-typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERNVPROC) (void);
-
-#define glTextureBarrierNV GLEW_GET_FUN(__glewTextureBarrierNV)
-
-#define GLEW_NV_texture_barrier GLEW_GET_VAR(__GLEW_NV_texture_barrier)
-
-#endif /* GL_NV_texture_barrier */
-
-/* --------------------- GL_NV_texture_compression_vtc --------------------- */
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-
-#define GLEW_NV_texture_compression_vtc GLEW_GET_VAR(__GLEW_NV_texture_compression_vtc)
-
-#endif /* GL_NV_texture_compression_vtc */
-
-/* ----------------------- GL_NV_texture_env_combine4 ---------------------- */
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-
-#define GL_COMBINE4_NV 0x8503
-#define GL_SOURCE3_RGB_NV 0x8583
-#define GL_SOURCE3_ALPHA_NV 0x858B
-#define GL_OPERAND3_RGB_NV 0x8593
-#define GL_OPERAND3_ALPHA_NV 0x859B
-
-#define GLEW_NV_texture_env_combine4 GLEW_GET_VAR(__GLEW_NV_texture_env_combine4)
-
-#endif /* GL_NV_texture_env_combine4 */
-
-/* ---------------------- GL_NV_texture_expand_normal ---------------------- */
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-
-#define GLEW_NV_texture_expand_normal GLEW_GET_VAR(__GLEW_NV_texture_expand_normal)
-
-#endif /* GL_NV_texture_expand_normal */
-
-/* ----------------------- GL_NV_texture_multisample ----------------------- */
-
-#ifndef GL_NV_texture_multisample
-#define GL_NV_texture_multisample 1
-
-#define GL_TEXTURE_COVERAGE_SAMPLES_NV 0x9045
-#define GL_TEXTURE_COLOR_SAMPLES_NV 0x9046
-
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-
-#define glTexImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage2DMultisampleCoverageNV)
-#define glTexImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage3DMultisampleCoverageNV)
-#define glTextureImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage2DMultisampleCoverageNV)
-#define glTextureImage2DMultisampleNV GLEW_GET_FUN(__glewTextureImage2DMultisampleNV)
-#define glTextureImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage3DMultisampleCoverageNV)
-#define glTextureImage3DMultisampleNV GLEW_GET_FUN(__glewTextureImage3DMultisampleNV)
-
-#define GLEW_NV_texture_multisample GLEW_GET_VAR(__GLEW_NV_texture_multisample)
-
-#endif /* GL_NV_texture_multisample */
-
-/* ------------------------ GL_NV_texture_rectangle ------------------------ */
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-
-#define GL_TEXTURE_RECTANGLE_NV 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8
-
-#define GLEW_NV_texture_rectangle GLEW_GET_VAR(__GLEW_NV_texture_rectangle)
-
-#endif /* GL_NV_texture_rectangle */
-
-/* -------------------------- GL_NV_texture_shader ------------------------- */
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
-#define GL_SHADER_CONSISTENT_NV 0x86DD
-#define GL_TEXTURE_SHADER_NV 0x86DE
-#define GL_SHADER_OPERATION_NV 0x86DF
-#define GL_CULL_MODES_NV 0x86E0
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1
-#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2
-#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3
-#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4
-#define GL_CONST_EYE_NV 0x86E5
-#define GL_PASS_THROUGH_NV 0x86E6
-#define GL_CULL_FRAGMENT_NV 0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV 0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA
-#define GL_DOT_PRODUCT_NV 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV 0x86F4
-#define GL_DSDT_NV 0x86F5
-#define GL_DSDT_MAG_NV 0x86F6
-#define GL_DSDT_MAG_VIB_NV 0x86F7
-#define GL_HILO16_NV 0x86F8
-#define GL_SIGNED_HILO_NV 0x86F9
-#define GL_SIGNED_HILO16_NV 0x86FA
-#define GL_SIGNED_RGBA_NV 0x86FB
-#define GL_SIGNED_RGBA8_NV 0x86FC
-#define GL_SIGNED_RGB_NV 0x86FE
-#define GL_SIGNED_RGB8_NV 0x86FF
-#define GL_SIGNED_LUMINANCE_NV 0x8701
-#define GL_SIGNED_LUMINANCE8_NV 0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
-#define GL_SIGNED_ALPHA_NV 0x8705
-#define GL_SIGNED_ALPHA8_NV 0x8706
-#define GL_SIGNED_INTENSITY_NV 0x8707
-#define GL_SIGNED_INTENSITY8_NV 0x8708
-#define GL_DSDT8_NV 0x8709
-#define GL_DSDT8_MAG8_NV 0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV 0x870E
-#define GL_LO_SCALE_NV 0x870F
-#define GL_DS_SCALE_NV 0x8710
-#define GL_DT_SCALE_NV 0x8711
-#define GL_MAGNITUDE_SCALE_NV 0x8712
-#define GL_VIBRANCE_SCALE_NV 0x8713
-#define GL_HI_BIAS_NV 0x8714
-#define GL_LO_BIAS_NV 0x8715
-#define GL_DS_BIAS_NV 0x8716
-#define GL_DT_BIAS_NV 0x8717
-#define GL_MAGNITUDE_BIAS_NV 0x8718
-#define GL_VIBRANCE_BIAS_NV 0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV 0x871A
-#define GL_TEXTURE_HI_SIZE_NV 0x871B
-#define GL_TEXTURE_LO_SIZE_NV 0x871C
-#define GL_TEXTURE_DS_SIZE_NV 0x871D
-#define GL_TEXTURE_DT_SIZE_NV 0x871E
-#define GL_TEXTURE_MAG_SIZE_NV 0x871F
-
-#define GLEW_NV_texture_shader GLEW_GET_VAR(__GLEW_NV_texture_shader)
-
-#endif /* GL_NV_texture_shader */
-
-/* ------------------------- GL_NV_texture_shader2 ------------------------- */
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF
-#define GL_HILO_NV 0x86F4
-#define GL_DSDT_NV 0x86F5
-#define GL_DSDT_MAG_NV 0x86F6
-#define GL_DSDT_MAG_VIB_NV 0x86F7
-#define GL_HILO16_NV 0x86F8
-#define GL_SIGNED_HILO_NV 0x86F9
-#define GL_SIGNED_HILO16_NV 0x86FA
-#define GL_SIGNED_RGBA_NV 0x86FB
-#define GL_SIGNED_RGBA8_NV 0x86FC
-#define GL_SIGNED_RGB_NV 0x86FE
-#define GL_SIGNED_RGB8_NV 0x86FF
-#define GL_SIGNED_LUMINANCE_NV 0x8701
-#define GL_SIGNED_LUMINANCE8_NV 0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
-#define GL_SIGNED_ALPHA_NV 0x8705
-#define GL_SIGNED_ALPHA8_NV 0x8706
-#define GL_SIGNED_INTENSITY_NV 0x8707
-#define GL_SIGNED_INTENSITY8_NV 0x8708
-#define GL_DSDT8_NV 0x8709
-#define GL_DSDT8_MAG8_NV 0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-
-#define GLEW_NV_texture_shader2 GLEW_GET_VAR(__GLEW_NV_texture_shader2)
-
-#endif /* GL_NV_texture_shader2 */
-
-/* ------------------------- GL_NV_texture_shader3 ------------------------- */
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV 0x885E
-#define GL_SIGNED_HILO8_NV 0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV 0x8860
-
-#define GLEW_NV_texture_shader3 GLEW_GET_VAR(__GLEW_NV_texture_shader3)
-
-#endif /* GL_NV_texture_shader3 */
-
-/* ------------------------ GL_NV_transform_feedback ----------------------- */
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-
-#define GL_BACK_PRIMARY_COLOR_NV 0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV 0x8C78
-#define GL_TEXTURE_COORD_NV 0x8C79
-#define GL_CLIP_DISTANCE_NV 0x8C7A
-#define GL_VERTEX_ID_NV 0x8C7B
-#define GL_PRIMITIVE_ID_NV 0x8C7C
-#define GL_GENERIC_ATTRIB_NV 0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV 0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86
-#define GL_PRIMITIVES_GENERATED_NV 0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV 0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV 0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-
-typedef void (GLAPIENTRY * PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (GLAPIENTRY * PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-typedef GLint (GLAPIENTRY * PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-
-#define glActiveVaryingNV GLEW_GET_FUN(__glewActiveVaryingNV)
-#define glBeginTransformFeedbackNV GLEW_GET_FUN(__glewBeginTransformFeedbackNV)
-#define glBindBufferBaseNV GLEW_GET_FUN(__glewBindBufferBaseNV)
-#define glBindBufferOffsetNV GLEW_GET_FUN(__glewBindBufferOffsetNV)
-#define glBindBufferRangeNV GLEW_GET_FUN(__glewBindBufferRangeNV)
-#define glEndTransformFeedbackNV GLEW_GET_FUN(__glewEndTransformFeedbackNV)
-#define glGetActiveVaryingNV GLEW_GET_FUN(__glewGetActiveVaryingNV)
-#define glGetTransformFeedbackVaryingNV GLEW_GET_FUN(__glewGetTransformFeedbackVaryingNV)
-#define glGetVaryingLocationNV GLEW_GET_FUN(__glewGetVaryingLocationNV)
-#define glTransformFeedbackAttribsNV GLEW_GET_FUN(__glewTransformFeedbackAttribsNV)
-#define glTransformFeedbackVaryingsNV GLEW_GET_FUN(__glewTransformFeedbackVaryingsNV)
-
-#define GLEW_NV_transform_feedback GLEW_GET_VAR(__GLEW_NV_transform_feedback)
-
-#endif /* GL_NV_transform_feedback */
-
-/* ----------------------- GL_NV_transform_feedback2 ----------------------- */
-
-#ifndef GL_NV_transform_feedback2
-#define GL_NV_transform_feedback2 1
-
-#define GL_TRANSFORM_FEEDBACK_NV 0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25
-
-typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
-typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint* ids);
-typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
-
-#define glBindTransformFeedbackNV GLEW_GET_FUN(__glewBindTransformFeedbackNV)
-#define glDeleteTransformFeedbacksNV GLEW_GET_FUN(__glewDeleteTransformFeedbacksNV)
-#define glDrawTransformFeedbackNV GLEW_GET_FUN(__glewDrawTransformFeedbackNV)
-#define glGenTransformFeedbacksNV GLEW_GET_FUN(__glewGenTransformFeedbacksNV)
-#define glIsTransformFeedbackNV GLEW_GET_FUN(__glewIsTransformFeedbackNV)
-#define glPauseTransformFeedbackNV GLEW_GET_FUN(__glewPauseTransformFeedbackNV)
-#define glResumeTransformFeedbackNV GLEW_GET_FUN(__glewResumeTransformFeedbackNV)
-
-#define GLEW_NV_transform_feedback2 GLEW_GET_VAR(__GLEW_NV_transform_feedback2)
-
-#endif /* GL_NV_transform_feedback2 */
-
-/* -------------------------- GL_NV_vdpau_interop -------------------------- */
-
-#ifndef GL_NV_vdpau_interop
-#define GL_NV_vdpau_interop 1
-
-#define GL_SURFACE_STATE_NV 0x86EB
-#define GL_SURFACE_REGISTERED_NV 0x86FD
-#define GL_SURFACE_MAPPED_NV 0x8700
-#define GL_WRITE_DISCARD_NV 0x88BE
-
-typedef GLintptr GLvdpauSurfaceNV;
-
-typedef void (GLAPIENTRY * PFNGLVDPAUFININVPROC) (void);
-typedef void (GLAPIENTRY * PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values);
-typedef void (GLAPIENTRY * PFNGLVDPAUINITNVPROC) (const void* vdpDevice, const GLvoid*getProcAddress);
-typedef void (GLAPIENTRY * PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
-typedef void (GLAPIENTRY * PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces);
-typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
-typedef void (GLAPIENTRY * PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
-typedef void (GLAPIENTRY * PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV* surfaces);
-typedef void (GLAPIENTRY * PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
-
-#define glVDPAUFiniNV GLEW_GET_FUN(__glewVDPAUFiniNV)
-#define glVDPAUGetSurfaceivNV GLEW_GET_FUN(__glewVDPAUGetSurfaceivNV)
-#define glVDPAUInitNV GLEW_GET_FUN(__glewVDPAUInitNV)
-#define glVDPAUIsSurfaceNV GLEW_GET_FUN(__glewVDPAUIsSurfaceNV)
-#define glVDPAUMapSurfacesNV GLEW_GET_FUN(__glewVDPAUMapSurfacesNV)
-#define glVDPAURegisterOutputSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterOutputSurfaceNV)
-#define glVDPAURegisterVideoSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterVideoSurfaceNV)
-#define glVDPAUSurfaceAccessNV GLEW_GET_FUN(__glewVDPAUSurfaceAccessNV)
-#define glVDPAUUnmapSurfacesNV GLEW_GET_FUN(__glewVDPAUUnmapSurfacesNV)
-#define glVDPAUUnregisterSurfaceNV GLEW_GET_FUN(__glewVDPAUUnregisterSurfaceNV)
-
-#define GLEW_NV_vdpau_interop GLEW_GET_VAR(__GLEW_NV_vdpau_interop)
-
-#endif /* GL_NV_vdpau_interop */
-
-/* ------------------------ GL_NV_vertex_array_range ----------------------- */
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-
-#define GL_VERTEX_ARRAY_RANGE_NV 0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521
-
-typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, void* pointer);
-
-#define glFlushVertexArrayRangeNV GLEW_GET_FUN(__glewFlushVertexArrayRangeNV)
-#define glVertexArrayRangeNV GLEW_GET_FUN(__glewVertexArrayRangeNV)
-
-#define GLEW_NV_vertex_array_range GLEW_GET_VAR(__GLEW_NV_vertex_array_range)
-
-#endif /* GL_NV_vertex_array_range */
-
-/* ----------------------- GL_NV_vertex_array_range2 ----------------------- */
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-
-#define GLEW_NV_vertex_array_range2 GLEW_GET_VAR(__GLEW_NV_vertex_array_range2)
-
-#endif /* GL_NV_vertex_array_range2 */
-
-/* ------------------- GL_NV_vertex_attrib_integer_64bit ------------------- */
-
-#ifndef GL_NV_vertex_attrib_integer_64bit
-#define GL_NV_vertex_attrib_integer_64bit 1
-
-#define GL_INT64_NV 0x140E
-#define GL_UNSIGNED_INT64_NV 0x140F
-
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT* params);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
-
-#define glGetVertexAttribLi64vNV GLEW_GET_FUN(__glewGetVertexAttribLi64vNV)
-#define glGetVertexAttribLui64vNV GLEW_GET_FUN(__glewGetVertexAttribLui64vNV)
-#define glVertexAttribL1i64NV GLEW_GET_FUN(__glewVertexAttribL1i64NV)
-#define glVertexAttribL1i64vNV GLEW_GET_FUN(__glewVertexAttribL1i64vNV)
-#define glVertexAttribL1ui64NV GLEW_GET_FUN(__glewVertexAttribL1ui64NV)
-#define glVertexAttribL1ui64vNV GLEW_GET_FUN(__glewVertexAttribL1ui64vNV)
-#define glVertexAttribL2i64NV GLEW_GET_FUN(__glewVertexAttribL2i64NV)
-#define glVertexAttribL2i64vNV GLEW_GET_FUN(__glewVertexAttribL2i64vNV)
-#define glVertexAttribL2ui64NV GLEW_GET_FUN(__glewVertexAttribL2ui64NV)
-#define glVertexAttribL2ui64vNV GLEW_GET_FUN(__glewVertexAttribL2ui64vNV)
-#define glVertexAttribL3i64NV GLEW_GET_FUN(__glewVertexAttribL3i64NV)
-#define glVertexAttribL3i64vNV GLEW_GET_FUN(__glewVertexAttribL3i64vNV)
-#define glVertexAttribL3ui64NV GLEW_GET_FUN(__glewVertexAttribL3ui64NV)
-#define glVertexAttribL3ui64vNV GLEW_GET_FUN(__glewVertexAttribL3ui64vNV)
-#define glVertexAttribL4i64NV GLEW_GET_FUN(__glewVertexAttribL4i64NV)
-#define glVertexAttribL4i64vNV GLEW_GET_FUN(__glewVertexAttribL4i64vNV)
-#define glVertexAttribL4ui64NV GLEW_GET_FUN(__glewVertexAttribL4ui64NV)
-#define glVertexAttribL4ui64vNV GLEW_GET_FUN(__glewVertexAttribL4ui64vNV)
-#define glVertexAttribLFormatNV GLEW_GET_FUN(__glewVertexAttribLFormatNV)
-
-#define GLEW_NV_vertex_attrib_integer_64bit GLEW_GET_VAR(__GLEW_NV_vertex_attrib_integer_64bit)
-
-#endif /* GL_NV_vertex_attrib_integer_64bit */
-
-/* ------------------- GL_NV_vertex_buffer_unified_memory ------------------ */
-
-#ifndef GL_NV_vertex_buffer_unified_memory
-#define GL_NV_vertex_buffer_unified_memory 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
-#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F
-#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
-#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21
-#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22
-#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23
-#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24
-#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
-#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26
-#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
-#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28
-#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29
-#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A
-#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B
-#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C
-#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D
-#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E
-#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F
-#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30
-#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
-#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32
-#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33
-#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40
-#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41
-#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42
-
-typedef void (GLAPIENTRY * PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
-typedef void (GLAPIENTRY * PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT result[]);
-typedef void (GLAPIENTRY * PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
-typedef void (GLAPIENTRY * PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
-
-#define glBufferAddressRangeNV GLEW_GET_FUN(__glewBufferAddressRangeNV)
-#define glColorFormatNV GLEW_GET_FUN(__glewColorFormatNV)
-#define glEdgeFlagFormatNV GLEW_GET_FUN(__glewEdgeFlagFormatNV)
-#define glFogCoordFormatNV GLEW_GET_FUN(__glewFogCoordFormatNV)
-#define glGetIntegerui64i_vNV GLEW_GET_FUN(__glewGetIntegerui64i_vNV)
-#define glIndexFormatNV GLEW_GET_FUN(__glewIndexFormatNV)
-#define glNormalFormatNV GLEW_GET_FUN(__glewNormalFormatNV)
-#define glSecondaryColorFormatNV GLEW_GET_FUN(__glewSecondaryColorFormatNV)
-#define glTexCoordFormatNV GLEW_GET_FUN(__glewTexCoordFormatNV)
-#define glVertexAttribFormatNV GLEW_GET_FUN(__glewVertexAttribFormatNV)
-#define glVertexAttribIFormatNV GLEW_GET_FUN(__glewVertexAttribIFormatNV)
-#define glVertexFormatNV GLEW_GET_FUN(__glewVertexFormatNV)
-
-#define GLEW_NV_vertex_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_vertex_buffer_unified_memory)
-
-#endif /* GL_NV_vertex_buffer_unified_memory */
-
-/* -------------------------- GL_NV_vertex_program ------------------------- */
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-
-#define GL_VERTEX_PROGRAM_NV 0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV 0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625
-#define GL_CURRENT_ATTRIB_NV 0x8626
-#define GL_PROGRAM_LENGTH_NV 0x8627
-#define GL_PROGRAM_STRING_NV 0x8628
-#define GL_MODELVIEW_PROJECTION_NV 0x8629
-#define GL_IDENTITY_NV 0x862A
-#define GL_INVERSE_NV 0x862B
-#define GL_TRANSPOSE_NV 0x862C
-#define GL_INVERSE_TRANSPOSE_NV 0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV 0x862F
-#define GL_MATRIX0_NV 0x8630
-#define GL_MATRIX1_NV 0x8631
-#define GL_MATRIX2_NV 0x8632
-#define GL_MATRIX3_NV 0x8633
-#define GL_MATRIX4_NV 0x8634
-#define GL_MATRIX5_NV 0x8635
-#define GL_MATRIX6_NV 0x8636
-#define GL_MATRIX7_NV 0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640
-#define GL_CURRENT_MATRIX_NV 0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643
-#define GL_PROGRAM_PARAMETER_NV 0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645
-#define GL_PROGRAM_TARGET_NV 0x8646
-#define GL_PROGRAM_RESIDENT_NV 0x8647
-#define GL_TRACK_MATRIX_NV 0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV 0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F
-
-typedef GLboolean (GLAPIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint* ids, GLboolean *residences);
-typedef void (GLAPIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte* program);
-typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid** pointer);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint* params);
-typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (GLAPIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte* program);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
-typedef void (GLAPIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
-typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei n, const GLubyte* v);
-
-#define glAreProgramsResidentNV GLEW_GET_FUN(__glewAreProgramsResidentNV)
-#define glBindProgramNV GLEW_GET_FUN(__glewBindProgramNV)
-#define glDeleteProgramsNV GLEW_GET_FUN(__glewDeleteProgramsNV)
-#define glExecuteProgramNV GLEW_GET_FUN(__glewExecuteProgramNV)
-#define glGenProgramsNV GLEW_GET_FUN(__glewGenProgramsNV)
-#define glGetProgramParameterdvNV GLEW_GET_FUN(__glewGetProgramParameterdvNV)
-#define glGetProgramParameterfvNV GLEW_GET_FUN(__glewGetProgramParameterfvNV)
-#define glGetProgramStringNV GLEW_GET_FUN(__glewGetProgramStringNV)
-#define glGetProgramivNV GLEW_GET_FUN(__glewGetProgramivNV)
-#define glGetTrackMatrixivNV GLEW_GET_FUN(__glewGetTrackMatrixivNV)
-#define glGetVertexAttribPointervNV GLEW_GET_FUN(__glewGetVertexAttribPointervNV)
-#define glGetVertexAttribdvNV GLEW_GET_FUN(__glewGetVertexAttribdvNV)
-#define glGetVertexAttribfvNV GLEW_GET_FUN(__glewGetVertexAttribfvNV)
-#define glGetVertexAttribivNV GLEW_GET_FUN(__glewGetVertexAttribivNV)
-#define glIsProgramNV GLEW_GET_FUN(__glewIsProgramNV)
-#define glLoadProgramNV GLEW_GET_FUN(__glewLoadProgramNV)
-#define glProgramParameter4dNV GLEW_GET_FUN(__glewProgramParameter4dNV)
-#define glProgramParameter4dvNV GLEW_GET_FUN(__glewProgramParameter4dvNV)
-#define glProgramParameter4fNV GLEW_GET_FUN(__glewProgramParameter4fNV)
-#define glProgramParameter4fvNV GLEW_GET_FUN(__glewProgramParameter4fvNV)
-#define glProgramParameters4dvNV GLEW_GET_FUN(__glewProgramParameters4dvNV)
-#define glProgramParameters4fvNV GLEW_GET_FUN(__glewProgramParameters4fvNV)
-#define glRequestResidentProgramsNV GLEW_GET_FUN(__glewRequestResidentProgramsNV)
-#define glTrackMatrixNV GLEW_GET_FUN(__glewTrackMatrixNV)
-#define glVertexAttrib1dNV GLEW_GET_FUN(__glewVertexAttrib1dNV)
-#define glVertexAttrib1dvNV GLEW_GET_FUN(__glewVertexAttrib1dvNV)
-#define glVertexAttrib1fNV GLEW_GET_FUN(__glewVertexAttrib1fNV)
-#define glVertexAttrib1fvNV GLEW_GET_FUN(__glewVertexAttrib1fvNV)
-#define glVertexAttrib1sNV GLEW_GET_FUN(__glewVertexAttrib1sNV)
-#define glVertexAttrib1svNV GLEW_GET_FUN(__glewVertexAttrib1svNV)
-#define glVertexAttrib2dNV GLEW_GET_FUN(__glewVertexAttrib2dNV)
-#define glVertexAttrib2dvNV GLEW_GET_FUN(__glewVertexAttrib2dvNV)
-#define glVertexAttrib2fNV GLEW_GET_FUN(__glewVertexAttrib2fNV)
-#define glVertexAttrib2fvNV GLEW_GET_FUN(__glewVertexAttrib2fvNV)
-#define glVertexAttrib2sNV GLEW_GET_FUN(__glewVertexAttrib2sNV)
-#define glVertexAttrib2svNV GLEW_GET_FUN(__glewVertexAttrib2svNV)
-#define glVertexAttrib3dNV GLEW_GET_FUN(__glewVertexAttrib3dNV)
-#define glVertexAttrib3dvNV GLEW_GET_FUN(__glewVertexAttrib3dvNV)
-#define glVertexAttrib3fNV GLEW_GET_FUN(__glewVertexAttrib3fNV)
-#define glVertexAttrib3fvNV GLEW_GET_FUN(__glewVertexAttrib3fvNV)
-#define glVertexAttrib3sNV GLEW_GET_FUN(__glewVertexAttrib3sNV)
-#define glVertexAttrib3svNV GLEW_GET_FUN(__glewVertexAttrib3svNV)
-#define glVertexAttrib4dNV GLEW_GET_FUN(__glewVertexAttrib4dNV)
-#define glVertexAttrib4dvNV GLEW_GET_FUN(__glewVertexAttrib4dvNV)
-#define glVertexAttrib4fNV GLEW_GET_FUN(__glewVertexAttrib4fNV)
-#define glVertexAttrib4fvNV GLEW_GET_FUN(__glewVertexAttrib4fvNV)
-#define glVertexAttrib4sNV GLEW_GET_FUN(__glewVertexAttrib4sNV)
-#define glVertexAttrib4svNV GLEW_GET_FUN(__glewVertexAttrib4svNV)
-#define glVertexAttrib4ubNV GLEW_GET_FUN(__glewVertexAttrib4ubNV)
-#define glVertexAttrib4ubvNV GLEW_GET_FUN(__glewVertexAttrib4ubvNV)
-#define glVertexAttribPointerNV GLEW_GET_FUN(__glewVertexAttribPointerNV)
-#define glVertexAttribs1dvNV GLEW_GET_FUN(__glewVertexAttribs1dvNV)
-#define glVertexAttribs1fvNV GLEW_GET_FUN(__glewVertexAttribs1fvNV)
-#define glVertexAttribs1svNV GLEW_GET_FUN(__glewVertexAttribs1svNV)
-#define glVertexAttribs2dvNV GLEW_GET_FUN(__glewVertexAttribs2dvNV)
-#define glVertexAttribs2fvNV GLEW_GET_FUN(__glewVertexAttribs2fvNV)
-#define glVertexAttribs2svNV GLEW_GET_FUN(__glewVertexAttribs2svNV)
-#define glVertexAttribs3dvNV GLEW_GET_FUN(__glewVertexAttribs3dvNV)
-#define glVertexAttribs3fvNV GLEW_GET_FUN(__glewVertexAttribs3fvNV)
-#define glVertexAttribs3svNV GLEW_GET_FUN(__glewVertexAttribs3svNV)
-#define glVertexAttribs4dvNV GLEW_GET_FUN(__glewVertexAttribs4dvNV)
-#define glVertexAttribs4fvNV GLEW_GET_FUN(__glewVertexAttribs4fvNV)
-#define glVertexAttribs4svNV GLEW_GET_FUN(__glewVertexAttribs4svNV)
-#define glVertexAttribs4ubvNV GLEW_GET_FUN(__glewVertexAttribs4ubvNV)
-
-#define GLEW_NV_vertex_program GLEW_GET_VAR(__GLEW_NV_vertex_program)
-
-#endif /* GL_NV_vertex_program */
-
-/* ------------------------ GL_NV_vertex_program1_1 ------------------------ */
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-
-#define GLEW_NV_vertex_program1_1 GLEW_GET_VAR(__GLEW_NV_vertex_program1_1)
-
-#endif /* GL_NV_vertex_program1_1 */
-
-/* ------------------------- GL_NV_vertex_program2 ------------------------- */
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-
-#define GLEW_NV_vertex_program2 GLEW_GET_VAR(__GLEW_NV_vertex_program2)
-
-#endif /* GL_NV_vertex_program2 */
-
-/* ---------------------- GL_NV_vertex_program2_option --------------------- */
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
-
-#define GLEW_NV_vertex_program2_option GLEW_GET_VAR(__GLEW_NV_vertex_program2_option)
-
-#endif /* GL_NV_vertex_program2_option */
-
-/* ------------------------- GL_NV_vertex_program3 ------------------------- */
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-
-#define MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-
-#define GLEW_NV_vertex_program3 GLEW_GET_VAR(__GLEW_NV_vertex_program3)
-
-#endif /* GL_NV_vertex_program3 */
-
-/* ------------------------- GL_NV_vertex_program4 ------------------------- */
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-
-#define GLEW_NV_vertex_program4 GLEW_GET_VAR(__GLEW_NV_vertex_program4)
-
-#endif /* GL_NV_vertex_program4 */
-
-/* -------------------------- GL_NV_video_capture -------------------------- */
-
-#ifndef GL_NV_video_capture
-#define GL_NV_video_capture 1
-
-#define GL_VIDEO_BUFFER_NV 0x9020
-#define GL_VIDEO_BUFFER_BINDING_NV 0x9021
-#define GL_FIELD_UPPER_NV 0x9022
-#define GL_FIELD_LOWER_NV 0x9023
-#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024
-#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
-#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
-#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027
-#define GL_VIDEO_BUFFER_PITCH_NV 0x9028
-#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
-#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A
-#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B
-#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
-#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
-#define GL_PARTIAL_SUCCESS_NV 0x902E
-#define GL_SUCCESS_NV 0x902F
-#define GL_FAILURE_NV 0x9030
-#define GL_YCBYCR8_422_NV 0x9031
-#define GL_YCBAYCR8A_4224_NV 0x9032
-#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033
-#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
-#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035
-#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
-#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037
-#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038
-#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039
-#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
-#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
-#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
-
-typedef void (GLAPIENTRY * PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
-typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
-typedef void (GLAPIENTRY * PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint* params);
-typedef GLenum (GLAPIENTRY * PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT *capture_time);
-typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params);
-typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params);
-
-#define glBeginVideoCaptureNV GLEW_GET_FUN(__glewBeginVideoCaptureNV)
-#define glBindVideoCaptureStreamBufferNV GLEW_GET_FUN(__glewBindVideoCaptureStreamBufferNV)
-#define glBindVideoCaptureStreamTextureNV GLEW_GET_FUN(__glewBindVideoCaptureStreamTextureNV)
-#define glEndVideoCaptureNV GLEW_GET_FUN(__glewEndVideoCaptureNV)
-#define glGetVideoCaptureStreamdvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamdvNV)
-#define glGetVideoCaptureStreamfvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamfvNV)
-#define glGetVideoCaptureStreamivNV GLEW_GET_FUN(__glewGetVideoCaptureStreamivNV)
-#define glGetVideoCaptureivNV GLEW_GET_FUN(__glewGetVideoCaptureivNV)
-#define glVideoCaptureNV GLEW_GET_FUN(__glewVideoCaptureNV)
-#define glVideoCaptureStreamParameterdvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterdvNV)
-#define glVideoCaptureStreamParameterfvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterfvNV)
-#define glVideoCaptureStreamParameterivNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterivNV)
-
-#define GLEW_NV_video_capture GLEW_GET_VAR(__GLEW_NV_video_capture)
-
-#endif /* GL_NV_video_capture */
-
-/* ------------------------ GL_OES_byte_coordinates ------------------------ */
-
-#ifndef GL_OES_byte_coordinates
-#define GL_OES_byte_coordinates 1
-
-#define GL_BYTE 0x1400
-
-#define GLEW_OES_byte_coordinates GLEW_GET_VAR(__GLEW_OES_byte_coordinates)
-
-#endif /* GL_OES_byte_coordinates */
-
-/* ------------------- GL_OES_compressed_paletted_texture ------------------ */
-
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-
-#define GL_PALETTE4_RGB8_OES 0x8B90
-#define GL_PALETTE4_RGBA8_OES 0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES 0x8B92
-#define GL_PALETTE4_RGBA4_OES 0x8B93
-#define GL_PALETTE4_RGB5_A1_OES 0x8B94
-#define GL_PALETTE8_RGB8_OES 0x8B95
-#define GL_PALETTE8_RGBA8_OES 0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES 0x8B97
-#define GL_PALETTE8_RGBA4_OES 0x8B98
-#define GL_PALETTE8_RGB5_A1_OES 0x8B99
-
-#define GLEW_OES_compressed_paletted_texture GLEW_GET_VAR(__GLEW_OES_compressed_paletted_texture)
-
-#endif /* GL_OES_compressed_paletted_texture */
-
-/* --------------------------- GL_OES_read_format -------------------------- */
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-
-#define GLEW_OES_read_format GLEW_GET_VAR(__GLEW_OES_read_format)
-
-#endif /* GL_OES_read_format */
-
-/* ------------------------ GL_OES_single_precision ------------------------ */
-
-#ifndef GL_OES_single_precision
-#define GL_OES_single_precision 1
-
-typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFOESPROC) (GLclampd depth);
-typedef void (GLAPIENTRY * PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat* equation);
-typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
-typedef void (GLAPIENTRY * PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
-typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat* equation);
-typedef void (GLAPIENTRY * PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
-
-#define glClearDepthfOES GLEW_GET_FUN(__glewClearDepthfOES)
-#define glClipPlanefOES GLEW_GET_FUN(__glewClipPlanefOES)
-#define glDepthRangefOES GLEW_GET_FUN(__glewDepthRangefOES)
-#define glFrustumfOES GLEW_GET_FUN(__glewFrustumfOES)
-#define glGetClipPlanefOES GLEW_GET_FUN(__glewGetClipPlanefOES)
-#define glOrthofOES GLEW_GET_FUN(__glewOrthofOES)
-
-#define GLEW_OES_single_precision GLEW_GET_VAR(__GLEW_OES_single_precision)
-
-#endif /* GL_OES_single_precision */
-
-/* ---------------------------- GL_OML_interlace --------------------------- */
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-
-#define GL_INTERLACE_OML 0x8980
-#define GL_INTERLACE_READ_OML 0x8981
-
-#define GLEW_OML_interlace GLEW_GET_VAR(__GLEW_OML_interlace)
-
-#endif /* GL_OML_interlace */
-
-/* ---------------------------- GL_OML_resample ---------------------------- */
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-
-#define GL_PACK_RESAMPLE_OML 0x8984
-#define GL_UNPACK_RESAMPLE_OML 0x8985
-#define GL_RESAMPLE_REPLICATE_OML 0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML 0x8987
-#define GL_RESAMPLE_AVERAGE_OML 0x8988
-#define GL_RESAMPLE_DECIMATE_OML 0x8989
-
-#define GLEW_OML_resample GLEW_GET_VAR(__GLEW_OML_resample)
-
-#endif /* GL_OML_resample */
-
-/* ---------------------------- GL_OML_subsample --------------------------- */
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-
-#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983
-
-#define GLEW_OML_subsample GLEW_GET_VAR(__GLEW_OML_subsample)
-
-#endif /* GL_OML_subsample */
-
-/* --------------------------- GL_PGI_misc_hints --------------------------- */
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 107000
-#define GL_CONSERVE_MEMORY_HINT_PGI 107005
-#define GL_RECLAIM_MEMORY_HINT_PGI 107006
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI 107010
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 107011
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI 107012
-#define GL_ALWAYS_FAST_HINT_PGI 107020
-#define GL_ALWAYS_SOFT_HINT_PGI 107021
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI 107022
-#define GL_ALLOW_DRAW_WIN_HINT_PGI 107023
-#define GL_ALLOW_DRAW_FRG_HINT_PGI 107024
-#define GL_ALLOW_DRAW_MEM_HINT_PGI 107025
-#define GL_STRICT_DEPTHFUNC_HINT_PGI 107030
-#define GL_STRICT_LIGHTING_HINT_PGI 107031
-#define GL_STRICT_SCISSOR_HINT_PGI 107032
-#define GL_FULL_STIPPLE_HINT_PGI 107033
-#define GL_CLIP_NEAR_HINT_PGI 107040
-#define GL_CLIP_FAR_HINT_PGI 107041
-#define GL_WIDE_LINE_HINT_PGI 107042
-#define GL_BACK_NORMALS_HINT_PGI 107043
-
-#define GLEW_PGI_misc_hints GLEW_GET_VAR(__GLEW_PGI_misc_hints)
-
-#endif /* GL_PGI_misc_hints */
-
-/* -------------------------- GL_PGI_vertex_hints -------------------------- */
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-
-#define GL_VERTEX23_BIT_PGI 0x00000004
-#define GL_VERTEX4_BIT_PGI 0x00000008
-#define GL_COLOR3_BIT_PGI 0x00010000
-#define GL_COLOR4_BIT_PGI 0x00020000
-#define GL_EDGEFLAG_BIT_PGI 0x00040000
-#define GL_INDEX_BIT_PGI 0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI 0x00100000
-#define GL_VERTEX_DATA_HINT_PGI 107050
-#define GL_VERTEX_CONSISTENT_HINT_PGI 107051
-#define GL_MATERIAL_SIDE_HINT_PGI 107052
-#define GL_MAX_VERTEX_HINT_PGI 107053
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000
-#define GL_MAT_EMISSION_BIT_PGI 0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000
-#define GL_MAT_SHININESS_BIT_PGI 0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI 0x04000000
-#define GL_NORMAL_BIT_PGI 0x08000000
-#define GL_TEXCOORD1_BIT_PGI 0x10000000
-#define GL_TEXCOORD2_BIT_PGI 0x20000000
-#define GL_TEXCOORD3_BIT_PGI 0x40000000
-#define GL_TEXCOORD4_BIT_PGI 0x80000000
-
-#define GLEW_PGI_vertex_hints GLEW_GET_VAR(__GLEW_PGI_vertex_hints)
-
-#endif /* GL_PGI_vertex_hints */
-
-/* ------------------------- GL_REGAL_error_string ------------------------- */
-
-#ifndef GL_REGAL_error_string
-#define GL_REGAL_error_string 1
-
-typedef const GLchar* (GLAPIENTRY * PFNGLERRORSTRINGREGALPROC) (GLenum error);
-
-#define glErrorStringREGAL GLEW_GET_FUN(__glewErrorStringREGAL)
-
-#define GLEW_REGAL_error_string GLEW_GET_VAR(__GLEW_REGAL_error_string)
-
-#endif /* GL_REGAL_error_string */
-
-/* ------------------------ GL_REGAL_extension_query ----------------------- */
-
-#ifndef GL_REGAL_extension_query
-#define GL_REGAL_extension_query 1
-
-typedef GLboolean (GLAPIENTRY * PFNGLGETEXTENSIONREGALPROC) (const GLchar* ext);
-typedef GLboolean (GLAPIENTRY * PFNGLISSUPPORTEDREGALPROC) (const GLchar* ext);
-
-#define glGetExtensionREGAL GLEW_GET_FUN(__glewGetExtensionREGAL)
-#define glIsSupportedREGAL GLEW_GET_FUN(__glewIsSupportedREGAL)
-
-#define GLEW_REGAL_extension_query GLEW_GET_VAR(__GLEW_REGAL_extension_query)
-
-#endif /* GL_REGAL_extension_query */
-
-/* ------------------------------ GL_REGAL_log ----------------------------- */
-
-#ifndef GL_REGAL_log
-#define GL_REGAL_log 1
-
-#define GL_LOG_ERROR_REGAL 0x9319
-#define GL_LOG_WARNING_REGAL 0x931A
-#define GL_LOG_INFO_REGAL 0x931B
-#define GL_LOG_APP_REGAL 0x931C
-#define GL_LOG_DRIVER_REGAL 0x931D
-#define GL_LOG_INTERNAL_REGAL 0x931E
-#define GL_LOG_DEBUG_REGAL 0x931F
-#define GL_LOG_STATUS_REGAL 0x9320
-#define GL_LOG_HTTP_REGAL 0x9321
-
-#define GLEW_REGAL_log GLEW_GET_VAR(__GLEW_REGAL_log)
-
-#endif /* GL_REGAL_log */
-
-/* ----------------------- GL_REND_screen_coordinates ---------------------- */
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-
-#define GL_SCREEN_COORDINATES_REND 0x8490
-#define GL_INVERTED_SCREEN_W_REND 0x8491
-
-#define GLEW_REND_screen_coordinates GLEW_GET_VAR(__GLEW_REND_screen_coordinates)
-
-#endif /* GL_REND_screen_coordinates */
-
-/* ------------------------------- GL_S3_s3tc ------------------------------ */
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-
-#define GL_RGB_S3TC 0x83A0
-#define GL_RGB4_S3TC 0x83A1
-#define GL_RGBA_S3TC 0x83A2
-#define GL_RGBA4_S3TC 0x83A3
-#define GL_RGBA_DXT5_S3TC 0x83A4
-#define GL_RGBA4_DXT5_S3TC 0x83A5
-
-#define GLEW_S3_s3tc GLEW_GET_VAR(__GLEW_S3_s3tc)
-
-#endif /* GL_S3_s3tc */
-
-/* -------------------------- GL_SGIS_color_range -------------------------- */
-
-#ifndef GL_SGIS_color_range
-#define GL_SGIS_color_range 1
-
-#define GL_EXTENDED_RANGE_SGIS 0x85A5
-#define GL_MIN_RED_SGIS 0x85A6
-#define GL_MAX_RED_SGIS 0x85A7
-#define GL_MIN_GREEN_SGIS 0x85A8
-#define GL_MAX_GREEN_SGIS 0x85A9
-#define GL_MIN_BLUE_SGIS 0x85AA
-#define GL_MAX_BLUE_SGIS 0x85AB
-#define GL_MIN_ALPHA_SGIS 0x85AC
-#define GL_MAX_ALPHA_SGIS 0x85AD
-
-#define GLEW_SGIS_color_range GLEW_GET_VAR(__GLEW_SGIS_color_range)
-
-#endif /* GL_SGIS_color_range */
-
-/* ------------------------- GL_SGIS_detail_texture ------------------------ */
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-
-typedef void (GLAPIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
-typedef void (GLAPIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
-
-#define glDetailTexFuncSGIS GLEW_GET_FUN(__glewDetailTexFuncSGIS)
-#define glGetDetailTexFuncSGIS GLEW_GET_FUN(__glewGetDetailTexFuncSGIS)
-
-#define GLEW_SGIS_detail_texture GLEW_GET_VAR(__GLEW_SGIS_detail_texture)
-
-#endif /* GL_SGIS_detail_texture */
-
-/* -------------------------- GL_SGIS_fog_function ------------------------- */
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-
-typedef void (GLAPIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat* points);
-typedef void (GLAPIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat* points);
-
-#define glFogFuncSGIS GLEW_GET_FUN(__glewFogFuncSGIS)
-#define glGetFogFuncSGIS GLEW_GET_FUN(__glewGetFogFuncSGIS)
-
-#define GLEW_SGIS_fog_function GLEW_GET_VAR(__GLEW_SGIS_fog_function)
-
-#endif /* GL_SGIS_fog_function */
-
-/* ------------------------ GL_SGIS_generate_mipmap ------------------------ */
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-
-#define GL_GENERATE_MIPMAP_SGIS 0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
-
-#define GLEW_SGIS_generate_mipmap GLEW_GET_VAR(__GLEW_SGIS_generate_mipmap)
-
-#endif /* GL_SGIS_generate_mipmap */
-
-/* -------------------------- GL_SGIS_multisample -------------------------- */
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-
-#define GL_MULTISAMPLE_SGIS 0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F
-#define GL_SAMPLE_MASK_SGIS 0x80A0
-#define GL_1PASS_SGIS 0x80A1
-#define GL_2PASS_0_SGIS 0x80A2
-#define GL_2PASS_1_SGIS 0x80A3
-#define GL_4PASS_0_SGIS 0x80A4
-#define GL_4PASS_1_SGIS 0x80A5
-#define GL_4PASS_2_SGIS 0x80A6
-#define GL_4PASS_3_SGIS 0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS 0x80A8
-#define GL_SAMPLES_SGIS 0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB
-#define GL_SAMPLE_PATTERN_SGIS 0x80AC
-
-typedef void (GLAPIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-
-#define glSampleMaskSGIS GLEW_GET_FUN(__glewSampleMaskSGIS)
-#define glSamplePatternSGIS GLEW_GET_FUN(__glewSamplePatternSGIS)
-
-#define GLEW_SGIS_multisample GLEW_GET_VAR(__GLEW_SGIS_multisample)
-
-#endif /* GL_SGIS_multisample */
-
-/* ------------------------- GL_SGIS_pixel_texture ------------------------- */
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-
-#define GLEW_SGIS_pixel_texture GLEW_GET_VAR(__GLEW_SGIS_pixel_texture)
-
-#endif /* GL_SGIS_pixel_texture */
-
-/* ----------------------- GL_SGIS_point_line_texgen ----------------------- */
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-
-#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3
-#define GL_EYE_POINT_SGIS 0x81F4
-#define GL_OBJECT_POINT_SGIS 0x81F5
-#define GL_EYE_LINE_SGIS 0x81F6
-#define GL_OBJECT_LINE_SGIS 0x81F7
-
-#define GLEW_SGIS_point_line_texgen GLEW_GET_VAR(__GLEW_SGIS_point_line_texgen)
-
-#endif /* GL_SGIS_point_line_texgen */
-
-/* ------------------------ GL_SGIS_sharpen_texture ------------------------ */
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-
-typedef void (GLAPIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
-typedef void (GLAPIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
-
-#define glGetSharpenTexFuncSGIS GLEW_GET_FUN(__glewGetSharpenTexFuncSGIS)
-#define glSharpenTexFuncSGIS GLEW_GET_FUN(__glewSharpenTexFuncSGIS)
-
-#define GLEW_SGIS_sharpen_texture GLEW_GET_VAR(__GLEW_SGIS_sharpen_texture)
-
-#endif /* GL_SGIS_sharpen_texture */
-
-/* --------------------------- GL_SGIS_texture4D --------------------------- */
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-
-typedef void (GLAPIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void* pixels);
-typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void* pixels);
-
-#define glTexImage4DSGIS GLEW_GET_FUN(__glewTexImage4DSGIS)
-#define glTexSubImage4DSGIS GLEW_GET_FUN(__glewTexSubImage4DSGIS)
-
-#define GLEW_SGIS_texture4D GLEW_GET_VAR(__GLEW_SGIS_texture4D)
-
-#endif /* GL_SGIS_texture4D */
-
-/* ---------------------- GL_SGIS_texture_border_clamp --------------------- */
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-
-#define GL_CLAMP_TO_BORDER_SGIS 0x812D
-
-#define GLEW_SGIS_texture_border_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_border_clamp)
-
-#endif /* GL_SGIS_texture_border_clamp */
-
-/* ----------------------- GL_SGIS_texture_edge_clamp ---------------------- */
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-
-#define GL_CLAMP_TO_EDGE_SGIS 0x812F
-
-#define GLEW_SGIS_texture_edge_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_edge_clamp)
-
-#endif /* GL_SGIS_texture_edge_clamp */
-
-/* ------------------------ GL_SGIS_texture_filter4 ------------------------ */
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-
-typedef void (GLAPIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat* weights);
-typedef void (GLAPIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat* weights);
-
-#define glGetTexFilterFuncSGIS GLEW_GET_FUN(__glewGetTexFilterFuncSGIS)
-#define glTexFilterFuncSGIS GLEW_GET_FUN(__glewTexFilterFuncSGIS)
-
-#define GLEW_SGIS_texture_filter4 GLEW_GET_VAR(__GLEW_SGIS_texture_filter4)
-
-#endif /* GL_SGIS_texture_filter4 */
-
-/* -------------------------- GL_SGIS_texture_lod -------------------------- */
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-
-#define GL_TEXTURE_MIN_LOD_SGIS 0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS 0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D
-
-#define GLEW_SGIS_texture_lod GLEW_GET_VAR(__GLEW_SGIS_texture_lod)
-
-#endif /* GL_SGIS_texture_lod */
-
-/* ------------------------- GL_SGIS_texture_select ------------------------ */
-
-#ifndef GL_SGIS_texture_select
-#define GL_SGIS_texture_select 1
-
-#define GLEW_SGIS_texture_select GLEW_GET_VAR(__GLEW_SGIS_texture_select)
-
-#endif /* GL_SGIS_texture_select */
-
-/* ----------------------------- GL_SGIX_async ----------------------------- */
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-
-#define GL_ASYNC_MARKER_SGIX 0x8329
-
-typedef void (GLAPIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef void (GLAPIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLint (GLAPIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint* markerp);
-typedef GLuint (GLAPIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef GLboolean (GLAPIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (GLAPIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint* markerp);
-
-#define glAsyncMarkerSGIX GLEW_GET_FUN(__glewAsyncMarkerSGIX)
-#define glDeleteAsyncMarkersSGIX GLEW_GET_FUN(__glewDeleteAsyncMarkersSGIX)
-#define glFinishAsyncSGIX GLEW_GET_FUN(__glewFinishAsyncSGIX)
-#define glGenAsyncMarkersSGIX GLEW_GET_FUN(__glewGenAsyncMarkersSGIX)
-#define glIsAsyncMarkerSGIX GLEW_GET_FUN(__glewIsAsyncMarkerSGIX)
-#define glPollAsyncSGIX GLEW_GET_FUN(__glewPollAsyncSGIX)
-
-#define GLEW_SGIX_async GLEW_GET_VAR(__GLEW_SGIX_async)
-
-#endif /* GL_SGIX_async */
-
-/* ------------------------ GL_SGIX_async_histogram ------------------------ */
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-
-#define GL_ASYNC_HISTOGRAM_SGIX 0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D
-
-#define GLEW_SGIX_async_histogram GLEW_GET_VAR(__GLEW_SGIX_async_histogram)
-
-#endif /* GL_SGIX_async_histogram */
-
-/* -------------------------- GL_SGIX_async_pixel -------------------------- */
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-
-#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX 0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361
-
-#define GLEW_SGIX_async_pixel GLEW_GET_VAR(__GLEW_SGIX_async_pixel)
-
-#endif /* GL_SGIX_async_pixel */
-
-/* ----------------------- GL_SGIX_blend_alpha_minmax ---------------------- */
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-
-#define GL_ALPHA_MIN_SGIX 0x8320
-#define GL_ALPHA_MAX_SGIX 0x8321
-
-#define GLEW_SGIX_blend_alpha_minmax GLEW_GET_VAR(__GLEW_SGIX_blend_alpha_minmax)
-
-#endif /* GL_SGIX_blend_alpha_minmax */
-
-/* ---------------------------- GL_SGIX_clipmap ---------------------------- */
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-
-#define GLEW_SGIX_clipmap GLEW_GET_VAR(__GLEW_SGIX_clipmap)
-
-#endif /* GL_SGIX_clipmap */
-
-/* ---------------------- GL_SGIX_convolution_accuracy --------------------- */
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-
-#define GL_CONVOLUTION_HINT_SGIX 0x8316
-
-#define GLEW_SGIX_convolution_accuracy GLEW_GET_VAR(__GLEW_SGIX_convolution_accuracy)
-
-#endif /* GL_SGIX_convolution_accuracy */
-
-/* ------------------------- GL_SGIX_depth_texture ------------------------- */
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-
-#define GL_DEPTH_COMPONENT16_SGIX 0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX 0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX 0x81A7
-
-#define GLEW_SGIX_depth_texture GLEW_GET_VAR(__GLEW_SGIX_depth_texture)
-
-#endif /* GL_SGIX_depth_texture */
-
-/* -------------------------- GL_SGIX_flush_raster ------------------------- */
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-
-typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
-
-#define glFlushRasterSGIX GLEW_GET_FUN(__glewFlushRasterSGIX)
-
-#define GLEW_SGIX_flush_raster GLEW_GET_VAR(__GLEW_SGIX_flush_raster)
-
-#endif /* GL_SGIX_flush_raster */
-
-/* --------------------------- GL_SGIX_fog_offset -------------------------- */
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-
-#define GL_FOG_OFFSET_SGIX 0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX 0x8199
-
-#define GLEW_SGIX_fog_offset GLEW_GET_VAR(__GLEW_SGIX_fog_offset)
-
-#endif /* GL_SGIX_fog_offset */
-
-/* -------------------------- GL_SGIX_fog_texture -------------------------- */
-
-#ifndef GL_SGIX_fog_texture
-#define GL_SGIX_fog_texture 1
-
-#define GL_TEXTURE_FOG_SGIX 0
-#define GL_FOG_PATCHY_FACTOR_SGIX 0
-#define GL_FRAGMENT_FOG_SGIX 0
-
-typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname);
-
-#define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX)
-
-#define GLEW_SGIX_fog_texture GLEW_GET_VAR(__GLEW_SGIX_fog_texture)
-
-#endif /* GL_SGIX_fog_texture */
-
-/* ------------------- GL_SGIX_fragment_specular_lighting ------------------ */
-
-#ifndef GL_SGIX_fragment_specular_lighting
-#define GL_SGIX_fragment_specular_lighting 1
-
-typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, const GLfloat param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, const GLint param);
-typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum value, GLfloat* data);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum value, GLint* data);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* data);
-typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* data);
-
-#define glFragmentColorMaterialSGIX GLEW_GET_FUN(__glewFragmentColorMaterialSGIX)
-#define glFragmentLightModelfSGIX GLEW_GET_FUN(__glewFragmentLightModelfSGIX)
-#define glFragmentLightModelfvSGIX GLEW_GET_FUN(__glewFragmentLightModelfvSGIX)
-#define glFragmentLightModeliSGIX GLEW_GET_FUN(__glewFragmentLightModeliSGIX)
-#define glFragmentLightModelivSGIX GLEW_GET_FUN(__glewFragmentLightModelivSGIX)
-#define glFragmentLightfSGIX GLEW_GET_FUN(__glewFragmentLightfSGIX)
-#define glFragmentLightfvSGIX GLEW_GET_FUN(__glewFragmentLightfvSGIX)
-#define glFragmentLightiSGIX GLEW_GET_FUN(__glewFragmentLightiSGIX)
-#define glFragmentLightivSGIX GLEW_GET_FUN(__glewFragmentLightivSGIX)
-#define glFragmentMaterialfSGIX GLEW_GET_FUN(__glewFragmentMaterialfSGIX)
-#define glFragmentMaterialfvSGIX GLEW_GET_FUN(__glewFragmentMaterialfvSGIX)
-#define glFragmentMaterialiSGIX GLEW_GET_FUN(__glewFragmentMaterialiSGIX)
-#define glFragmentMaterialivSGIX GLEW_GET_FUN(__glewFragmentMaterialivSGIX)
-#define glGetFragmentLightfvSGIX GLEW_GET_FUN(__glewGetFragmentLightfvSGIX)
-#define glGetFragmentLightivSGIX GLEW_GET_FUN(__glewGetFragmentLightivSGIX)
-#define glGetFragmentMaterialfvSGIX GLEW_GET_FUN(__glewGetFragmentMaterialfvSGIX)
-#define glGetFragmentMaterialivSGIX GLEW_GET_FUN(__glewGetFragmentMaterialivSGIX)
-
-#define GLEW_SGIX_fragment_specular_lighting GLEW_GET_VAR(__GLEW_SGIX_fragment_specular_lighting)
-
-#endif /* GL_SGIX_fragment_specular_lighting */
-
-/* --------------------------- GL_SGIX_framezoom --------------------------- */
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-
-typedef void (GLAPIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-
-#define glFrameZoomSGIX GLEW_GET_FUN(__glewFrameZoomSGIX)
-
-#define GLEW_SGIX_framezoom GLEW_GET_VAR(__GLEW_SGIX_framezoom)
-
-#endif /* GL_SGIX_framezoom */
-
-/* --------------------------- GL_SGIX_interlace --------------------------- */
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-
-#define GL_INTERLACE_SGIX 0x8094
-
-#define GLEW_SGIX_interlace GLEW_GET_VAR(__GLEW_SGIX_interlace)
-
-#endif /* GL_SGIX_interlace */
-
-/* ------------------------- GL_SGIX_ir_instrument1 ------------------------ */
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-
-#define GLEW_SGIX_ir_instrument1 GLEW_GET_VAR(__GLEW_SGIX_ir_instrument1)
-
-#endif /* GL_SGIX_ir_instrument1 */
-
-/* ------------------------- GL_SGIX_list_priority ------------------------- */
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-
-#define GLEW_SGIX_list_priority GLEW_GET_VAR(__GLEW_SGIX_list_priority)
-
-#endif /* GL_SGIX_list_priority */
-
-/* ------------------------- GL_SGIX_pixel_texture ------------------------- */
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-
-typedef void (GLAPIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-
-#define glPixelTexGenSGIX GLEW_GET_FUN(__glewPixelTexGenSGIX)
-
-#define GLEW_SGIX_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_pixel_texture)
-
-#endif /* GL_SGIX_pixel_texture */
-
-/* ----------------------- GL_SGIX_pixel_texture_bits ---------------------- */
-
-#ifndef GL_SGIX_pixel_texture_bits
-#define GL_SGIX_pixel_texture_bits 1
-
-#define GLEW_SGIX_pixel_texture_bits GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_bits)
-
-#endif /* GL_SGIX_pixel_texture_bits */
-
-/* ------------------------ GL_SGIX_reference_plane ------------------------ */
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-
-typedef void (GLAPIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble* equation);
-
-#define glReferencePlaneSGIX GLEW_GET_FUN(__glewReferencePlaneSGIX)
-
-#define GLEW_SGIX_reference_plane GLEW_GET_VAR(__GLEW_SGIX_reference_plane)
-
-#endif /* GL_SGIX_reference_plane */
-
-/* ---------------------------- GL_SGIX_resample --------------------------- */
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-
-#define GL_PACK_RESAMPLE_SGIX 0x842E
-#define GL_UNPACK_RESAMPLE_SGIX 0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX 0x8430
-#define GL_RESAMPLE_REPLICATE_SGIX 0x8433
-#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434
-
-#define GLEW_SGIX_resample GLEW_GET_VAR(__GLEW_SGIX_resample)
-
-#endif /* GL_SGIX_resample */
-
-/* ----------------------------- GL_SGIX_shadow ---------------------------- */
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-
-#define GL_TEXTURE_COMPARE_SGIX 0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D
-
-#define GLEW_SGIX_shadow GLEW_GET_VAR(__GLEW_SGIX_shadow)
-
-#endif /* GL_SGIX_shadow */
-
-/* ------------------------- GL_SGIX_shadow_ambient ------------------------ */
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-
-#define GL_SHADOW_AMBIENT_SGIX 0x80BF
-
-#define GLEW_SGIX_shadow_ambient GLEW_GET_VAR(__GLEW_SGIX_shadow_ambient)
-
-#endif /* GL_SGIX_shadow_ambient */
-
-/* ----------------------------- GL_SGIX_sprite ---------------------------- */
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-
-typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, GLint* params);
-
-#define glSpriteParameterfSGIX GLEW_GET_FUN(__glewSpriteParameterfSGIX)
-#define glSpriteParameterfvSGIX GLEW_GET_FUN(__glewSpriteParameterfvSGIX)
-#define glSpriteParameteriSGIX GLEW_GET_FUN(__glewSpriteParameteriSGIX)
-#define glSpriteParameterivSGIX GLEW_GET_FUN(__glewSpriteParameterivSGIX)
-
-#define GLEW_SGIX_sprite GLEW_GET_VAR(__GLEW_SGIX_sprite)
-
-#endif /* GL_SGIX_sprite */
-
-/* ----------------------- GL_SGIX_tag_sample_buffer ----------------------- */
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-
-typedef void (GLAPIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-
-#define glTagSampleBufferSGIX GLEW_GET_FUN(__glewTagSampleBufferSGIX)
-
-#define GLEW_SGIX_tag_sample_buffer GLEW_GET_VAR(__GLEW_SGIX_tag_sample_buffer)
-
-#endif /* GL_SGIX_tag_sample_buffer */
-
-/* ------------------------ GL_SGIX_texture_add_env ------------------------ */
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-
-#define GLEW_SGIX_texture_add_env GLEW_GET_VAR(__GLEW_SGIX_texture_add_env)
-
-#endif /* GL_SGIX_texture_add_env */
-
-/* -------------------- GL_SGIX_texture_coordinate_clamp ------------------- */
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B
-
-#define GLEW_SGIX_texture_coordinate_clamp GLEW_GET_VAR(__GLEW_SGIX_texture_coordinate_clamp)
-
-#endif /* GL_SGIX_texture_coordinate_clamp */
-
-/* ------------------------ GL_SGIX_texture_lod_bias ----------------------- */
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-
-#define GLEW_SGIX_texture_lod_bias GLEW_GET_VAR(__GLEW_SGIX_texture_lod_bias)
-
-#endif /* GL_SGIX_texture_lod_bias */
-
-/* ---------------------- GL_SGIX_texture_multi_buffer --------------------- */
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-
-#define GLEW_SGIX_texture_multi_buffer GLEW_GET_VAR(__GLEW_SGIX_texture_multi_buffer)
-
-#endif /* GL_SGIX_texture_multi_buffer */
-
-/* ------------------------- GL_SGIX_texture_range ------------------------- */
-
-#ifndef GL_SGIX_texture_range
-#define GL_SGIX_texture_range 1
-
-#define GL_RGB_SIGNED_SGIX 0x85E0
-#define GL_RGBA_SIGNED_SGIX 0x85E1
-#define GL_ALPHA_SIGNED_SGIX 0x85E2
-#define GL_LUMINANCE_SIGNED_SGIX 0x85E3
-#define GL_INTENSITY_SIGNED_SGIX 0x85E4
-#define GL_LUMINANCE_ALPHA_SIGNED_SGIX 0x85E5
-#define GL_RGB16_SIGNED_SGIX 0x85E6
-#define GL_RGBA16_SIGNED_SGIX 0x85E7
-#define GL_ALPHA16_SIGNED_SGIX 0x85E8
-#define GL_LUMINANCE16_SIGNED_SGIX 0x85E9
-#define GL_INTENSITY16_SIGNED_SGIX 0x85EA
-#define GL_LUMINANCE16_ALPHA16_SIGNED_SGIX 0x85EB
-#define GL_RGB_EXTENDED_RANGE_SGIX 0x85EC
-#define GL_RGBA_EXTENDED_RANGE_SGIX 0x85ED
-#define GL_ALPHA_EXTENDED_RANGE_SGIX 0x85EE
-#define GL_LUMINANCE_EXTENDED_RANGE_SGIX 0x85EF
-#define GL_INTENSITY_EXTENDED_RANGE_SGIX 0x85F0
-#define GL_LUMINANCE_ALPHA_EXTENDED_RANGE_SGIX 0x85F1
-#define GL_RGB16_EXTENDED_RANGE_SGIX 0x85F2
-#define GL_RGBA16_EXTENDED_RANGE_SGIX 0x85F3
-#define GL_ALPHA16_EXTENDED_RANGE_SGIX 0x85F4
-#define GL_LUMINANCE16_EXTENDED_RANGE_SGIX 0x85F5
-#define GL_INTENSITY16_EXTENDED_RANGE_SGIX 0x85F6
-#define GL_LUMINANCE16_ALPHA16_EXTENDED_RANGE_SGIX 0x85F7
-#define GL_MIN_LUMINANCE_SGIS 0x85F8
-#define GL_MAX_LUMINANCE_SGIS 0x85F9
-#define GL_MIN_INTENSITY_SGIS 0x85FA
-#define GL_MAX_INTENSITY_SGIS 0x85FB
-
-#define GLEW_SGIX_texture_range GLEW_GET_VAR(__GLEW_SGIX_texture_range)
-
-#endif /* GL_SGIX_texture_range */
-
-/* ----------------------- GL_SGIX_texture_scale_bias ---------------------- */
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-
-#define GLEW_SGIX_texture_scale_bias GLEW_GET_VAR(__GLEW_SGIX_texture_scale_bias)
-
-#endif /* GL_SGIX_texture_scale_bias */
-
-/* ------------------------- GL_SGIX_vertex_preclip ------------------------ */
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-
-#define GL_VERTEX_PRECLIP_SGIX 0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
-
-#define GLEW_SGIX_vertex_preclip GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip)
-
-#endif /* GL_SGIX_vertex_preclip */
-
-/* ---------------------- GL_SGIX_vertex_preclip_hint ---------------------- */
-
-#ifndef GL_SGIX_vertex_preclip_hint
-#define GL_SGIX_vertex_preclip_hint 1
-
-#define GL_VERTEX_PRECLIP_SGIX 0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
-
-#define GLEW_SGIX_vertex_preclip_hint GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip_hint)
-
-#endif /* GL_SGIX_vertex_preclip_hint */
-
-/* ----------------------------- GL_SGIX_ycrcb ----------------------------- */
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-
-#define GLEW_SGIX_ycrcb GLEW_GET_VAR(__GLEW_SGIX_ycrcb)
-
-#endif /* GL_SGIX_ycrcb */
-
-/* -------------------------- GL_SGI_color_matrix -------------------------- */
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-
-#define GL_COLOR_MATRIX_SGI 0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-
-#define GLEW_SGI_color_matrix GLEW_GET_VAR(__GLEW_SGI_color_matrix)
-
-#endif /* GL_SGI_color_matrix */
-
-/* --------------------------- GL_SGI_color_table -------------------------- */
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-
-#define GL_COLOR_TABLE_SGI 0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI 0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI 0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI 0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params);
-typedef void (GLAPIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void* table);
-typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params);
-typedef void (GLAPIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void* table);
-
-#define glColorTableParameterfvSGI GLEW_GET_FUN(__glewColorTableParameterfvSGI)
-#define glColorTableParameterivSGI GLEW_GET_FUN(__glewColorTableParameterivSGI)
-#define glColorTableSGI GLEW_GET_FUN(__glewColorTableSGI)
-#define glCopyColorTableSGI GLEW_GET_FUN(__glewCopyColorTableSGI)
-#define glGetColorTableParameterfvSGI GLEW_GET_FUN(__glewGetColorTableParameterfvSGI)
-#define glGetColorTableParameterivSGI GLEW_GET_FUN(__glewGetColorTableParameterivSGI)
-#define glGetColorTableSGI GLEW_GET_FUN(__glewGetColorTableSGI)
-
-#define GLEW_SGI_color_table GLEW_GET_VAR(__GLEW_SGI_color_table)
-
-#endif /* GL_SGI_color_table */
-
-/* ----------------------- GL_SGI_texture_color_table ---------------------- */
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-
-#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD
-
-#define GLEW_SGI_texture_color_table GLEW_GET_VAR(__GLEW_SGI_texture_color_table)
-
-#endif /* GL_SGI_texture_color_table */
-
-/* ------------------------- GL_SUNX_constant_data ------------------------- */
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-
-#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6
-
-typedef void (GLAPIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
-
-#define glFinishTextureSUNX GLEW_GET_FUN(__glewFinishTextureSUNX)
-
-#define GLEW_SUNX_constant_data GLEW_GET_VAR(__GLEW_SUNX_constant_data)
-
-#endif /* GL_SUNX_constant_data */
-
-/* -------------------- GL_SUN_convolution_border_modes -------------------- */
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-
-#define GL_WRAP_BORDER_SUN 0x81D4
-
-#define GLEW_SUN_convolution_border_modes GLEW_GET_VAR(__GLEW_SUN_convolution_border_modes)
-
-#endif /* GL_SUN_convolution_border_modes */
-
-/* -------------------------- GL_SUN_global_alpha -------------------------- */
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-
-#define GL_GLOBAL_ALPHA_SUN 0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA
-
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-
-#define glGlobalAlphaFactorbSUN GLEW_GET_FUN(__glewGlobalAlphaFactorbSUN)
-#define glGlobalAlphaFactordSUN GLEW_GET_FUN(__glewGlobalAlphaFactordSUN)
-#define glGlobalAlphaFactorfSUN GLEW_GET_FUN(__glewGlobalAlphaFactorfSUN)
-#define glGlobalAlphaFactoriSUN GLEW_GET_FUN(__glewGlobalAlphaFactoriSUN)
-#define glGlobalAlphaFactorsSUN GLEW_GET_FUN(__glewGlobalAlphaFactorsSUN)
-#define glGlobalAlphaFactorubSUN GLEW_GET_FUN(__glewGlobalAlphaFactorubSUN)
-#define glGlobalAlphaFactoruiSUN GLEW_GET_FUN(__glewGlobalAlphaFactoruiSUN)
-#define glGlobalAlphaFactorusSUN GLEW_GET_FUN(__glewGlobalAlphaFactorusSUN)
-
-#define GLEW_SUN_global_alpha GLEW_GET_VAR(__GLEW_SUN_global_alpha)
-
-#endif /* GL_SUN_global_alpha */
-
-/* --------------------------- GL_SUN_mesh_array --------------------------- */
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-
-#define GL_QUAD_MESH_SUN 0x8614
-#define GL_TRIANGLE_MESH_SUN 0x8615
-
-#define GLEW_SUN_mesh_array GLEW_GET_VAR(__GLEW_SUN_mesh_array)
-
-#endif /* GL_SUN_mesh_array */
-
-/* ------------------------ GL_SUN_read_video_pixels ----------------------- */
-
-#ifndef GL_SUN_read_video_pixels
-#define GL_SUN_read_video_pixels 1
-
-typedef void (GLAPIENTRY * PFNGLREADVIDEOPIXELSSUNPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
-
-#define glReadVideoPixelsSUN GLEW_GET_FUN(__glewReadVideoPixelsSUN)
-
-#define GLEW_SUN_read_video_pixels GLEW_GET_VAR(__GLEW_SUN_read_video_pixels)
-
-#endif /* GL_SUN_read_video_pixels */
-
-/* --------------------------- GL_SUN_slice_accum -------------------------- */
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-
-#define GL_SLICE_ACCUM_SUN 0x85CC
-
-#define GLEW_SUN_slice_accum GLEW_GET_VAR(__GLEW_SUN_slice_accum)
-
-#endif /* GL_SUN_slice_accum */
-
-/* -------------------------- GL_SUN_triangle_list ------------------------- */
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-
-#define GL_RESTART_SUN 0x01
-#define GL_REPLACE_MIDDLE_SUN 0x02
-#define GL_REPLACE_OLDEST_SUN 0x03
-#define GL_TRIANGLE_LIST_SUN 0x81D7
-#define GL_REPLACEMENT_CODE_SUN 0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN 0x85C4
-#define GL_R1UI_C4UB_V3F_SUN 0x85C5
-#define GL_R1UI_C3F_V3F_SUN 0x85C6
-#define GL_R1UI_N3F_V3F_SUN 0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8
-#define GL_R1UI_T2F_V3F_SUN 0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB
-
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void* pointer);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte* code);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint* code);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort* code);
-
-#define glReplacementCodePointerSUN GLEW_GET_FUN(__glewReplacementCodePointerSUN)
-#define glReplacementCodeubSUN GLEW_GET_FUN(__glewReplacementCodeubSUN)
-#define glReplacementCodeubvSUN GLEW_GET_FUN(__glewReplacementCodeubvSUN)
-#define glReplacementCodeuiSUN GLEW_GET_FUN(__glewReplacementCodeuiSUN)
-#define glReplacementCodeuivSUN GLEW_GET_FUN(__glewReplacementCodeuivSUN)
-#define glReplacementCodeusSUN GLEW_GET_FUN(__glewReplacementCodeusSUN)
-#define glReplacementCodeusvSUN GLEW_GET_FUN(__glewReplacementCodeusvSUN)
-
-#define GLEW_SUN_triangle_list GLEW_GET_VAR(__GLEW_SUN_triangle_list)
-
-#endif /* GL_SUN_triangle_list */
-
-/* ----------------------------- GL_SUN_vertex ----------------------------- */
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-
-typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte* c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte* c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint* rc, const GLubyte *c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat* tc, const GLubyte *c, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
-
-#define glColor3fVertex3fSUN GLEW_GET_FUN(__glewColor3fVertex3fSUN)
-#define glColor3fVertex3fvSUN GLEW_GET_FUN(__glewColor3fVertex3fvSUN)
-#define glColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fSUN)
-#define glColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fvSUN)
-#define glColor4ubVertex2fSUN GLEW_GET_FUN(__glewColor4ubVertex2fSUN)
-#define glColor4ubVertex2fvSUN GLEW_GET_FUN(__glewColor4ubVertex2fvSUN)
-#define glColor4ubVertex3fSUN GLEW_GET_FUN(__glewColor4ubVertex3fSUN)
-#define glColor4ubVertex3fvSUN GLEW_GET_FUN(__glewColor4ubVertex3fvSUN)
-#define glNormal3fVertex3fSUN GLEW_GET_FUN(__glewNormal3fVertex3fSUN)
-#define glNormal3fVertex3fvSUN GLEW_GET_FUN(__glewNormal3fVertex3fvSUN)
-#define glReplacementCodeuiColor3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fSUN)
-#define glReplacementCodeuiColor3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fvSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiColor4ubVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fSUN)
-#define glReplacementCodeuiColor4ubVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fvSUN)
-#define glReplacementCodeuiNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fSUN)
-#define glReplacementCodeuiNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fvSUN)
-#define glReplacementCodeuiVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fSUN)
-#define glReplacementCodeuiVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fvSUN)
-#define glTexCoord2fColor3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fSUN)
-#define glTexCoord2fColor3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fvSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glTexCoord2fColor4ubVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fSUN)
-#define glTexCoord2fColor4ubVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fvSUN)
-#define glTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fSUN)
-#define glTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fvSUN)
-#define glTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fSUN)
-#define glTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fvSUN)
-#define glTexCoord4fColor4fNormal3fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fSUN)
-#define glTexCoord4fColor4fNormal3fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fvSUN)
-#define glTexCoord4fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fSUN)
-#define glTexCoord4fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fvSUN)
-
-#define GLEW_SUN_vertex GLEW_GET_VAR(__GLEW_SUN_vertex)
-
-#endif /* GL_SUN_vertex */
-
-/* -------------------------- GL_WIN_phong_shading ------------------------- */
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-
-#define GL_PHONG_WIN 0x80EA
-#define GL_PHONG_HINT_WIN 0x80EB
-
-#define GLEW_WIN_phong_shading GLEW_GET_VAR(__GLEW_WIN_phong_shading)
-
-#endif /* GL_WIN_phong_shading */
-
-/* -------------------------- GL_WIN_specular_fog -------------------------- */
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-
-#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC
-
-#define GLEW_WIN_specular_fog GLEW_GET_VAR(__GLEW_WIN_specular_fog)
-
-#endif /* GL_WIN_specular_fog */
-
-/* ---------------------------- GL_WIN_swap_hint --------------------------- */
-
-#ifndef GL_WIN_swap_hint
-#define GL_WIN_swap_hint 1
-
-typedef void (GLAPIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-
-#define glAddSwapHintRectWIN GLEW_GET_FUN(__glewAddSwapHintRectWIN)
-
-#define GLEW_WIN_swap_hint GLEW_GET_VAR(__GLEW_WIN_swap_hint)
-
-#endif /* GL_WIN_swap_hint */
-
-/* ------------------------------------------------------------------------- */
-
-#if defined(GLEW_MX) && defined(_WIN32)
-#define GLEW_FUN_EXPORT
-#else
-#define GLEW_FUN_EXPORT GLEWAPI
-#endif /* GLEW_MX */
-
-#if defined(GLEW_MX)
-#define GLEW_VAR_EXPORT
-#else
-#define GLEW_VAR_EXPORT GLEWAPI
-#endif /* GLEW_MX */
-
-#if defined(GLEW_MX) && defined(_WIN32)
-struct GLEWContextStruct
-{
-#endif /* GLEW_MX */
-
-GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D;
-GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements;
-GLEW_FUN_EXPORT PFNGLTEXIMAGE3DPROC __glewTexImage3D;
-GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D;
-
-GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture;
-GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D;
-GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage;
-GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd;
-GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf;
-GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd;
-GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv;
-GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage;
-
-GLEW_FUN_EXPORT PFNGLBLENDCOLORPROC __glewBlendColor;
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONPROC __glewBlendEquation;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate;
-GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer;
-GLEW_FUN_EXPORT PFNGLFOGCOORDDPROC __glewFogCoordd;
-GLEW_FUN_EXPORT PFNGLFOGCOORDDVPROC __glewFogCoorddv;
-GLEW_FUN_EXPORT PFNGLFOGCOORDFPROC __glewFogCoordf;
-GLEW_FUN_EXPORT PFNGLFOGCOORDFVPROC __glewFogCoordfv;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFPROC __glewPointParameterf;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIPROC __glewPointParameteri;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DPROC __glewWindowPos2d;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FPROC __glewWindowPos2f;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IPROC __glewWindowPos2i;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SPROC __glewWindowPos2s;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DPROC __glewWindowPos3d;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FPROC __glewWindowPos3f;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IPROC __glewWindowPos3i;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SPROC __glewWindowPos3s;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv;
-
-GLEW_FUN_EXPORT PFNGLBEGINQUERYPROC __glewBeginQuery;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERPROC __glewBindBuffer;
-GLEW_FUN_EXPORT PFNGLBUFFERDATAPROC __glewBufferData;
-GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAPROC __glewBufferSubData;
-GLEW_FUN_EXPORT PFNGLDELETEBUFFERSPROC __glewDeleteBuffers;
-GLEW_FUN_EXPORT PFNGLDELETEQUERIESPROC __glewDeleteQueries;
-GLEW_FUN_EXPORT PFNGLENDQUERYPROC __glewEndQuery;
-GLEW_FUN_EXPORT PFNGLGENBUFFERSPROC __glewGenBuffers;
-GLEW_FUN_EXPORT PFNGLGENQUERIESPROC __glewGenQueries;
-GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv;
-GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv;
-GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv;
-GLEW_FUN_EXPORT PFNGLGETQUERYIVPROC __glewGetQueryiv;
-GLEW_FUN_EXPORT PFNGLISBUFFERPROC __glewIsBuffer;
-GLEW_FUN_EXPORT PFNGLISQUERYPROC __glewIsQuery;
-GLEW_FUN_EXPORT PFNGLMAPBUFFERPROC __glewMapBuffer;
-GLEW_FUN_EXPORT PFNGLUNMAPBUFFERPROC __glewUnmapBuffer;
-
-GLEW_FUN_EXPORT PFNGLATTACHSHADERPROC __glewAttachShader;
-GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation;
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate;
-GLEW_FUN_EXPORT PFNGLCOMPILESHADERPROC __glewCompileShader;
-GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPROC __glewCreateProgram;
-GLEW_FUN_EXPORT PFNGLCREATESHADERPROC __glewCreateShader;
-GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPROC __glewDeleteProgram;
-GLEW_FUN_EXPORT PFNGLDELETESHADERPROC __glewDeleteShader;
-GLEW_FUN_EXPORT PFNGLDETACHSHADERPROC __glewDetachShader;
-GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray;
-GLEW_FUN_EXPORT PFNGLDRAWBUFFERSPROC __glewDrawBuffers;
-GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray;
-GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform;
-GLEW_FUN_EXPORT PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders;
-GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMIVPROC __glewGetProgramiv;
-GLEW_FUN_EXPORT PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog;
-GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEPROC __glewGetShaderSource;
-GLEW_FUN_EXPORT PFNGLGETSHADERIVPROC __glewGetShaderiv;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMFVPROC __glewGetUniformfv;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMIVPROC __glewGetUniformiv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv;
-GLEW_FUN_EXPORT PFNGLISPROGRAMPROC __glewIsProgram;
-GLEW_FUN_EXPORT PFNGLISSHADERPROC __glewIsShader;
-GLEW_FUN_EXPORT PFNGLLINKPROGRAMPROC __glewLinkProgram;
-GLEW_FUN_EXPORT PFNGLSHADERSOURCEPROC __glewShaderSource;
-GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate;
-GLEW_FUN_EXPORT PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate;
-GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate;
-GLEW_FUN_EXPORT PFNGLUNIFORM1FPROC __glewUniform1f;
-GLEW_FUN_EXPORT PFNGLUNIFORM1FVPROC __glewUniform1fv;
-GLEW_FUN_EXPORT PFNGLUNIFORM1IPROC __glewUniform1i;
-GLEW_FUN_EXPORT PFNGLUNIFORM1IVPROC __glewUniform1iv;
-GLEW_FUN_EXPORT PFNGLUNIFORM2FPROC __glewUniform2f;
-GLEW_FUN_EXPORT PFNGLUNIFORM2FVPROC __glewUniform2fv;
-GLEW_FUN_EXPORT PFNGLUNIFORM2IPROC __glewUniform2i;
-GLEW_FUN_EXPORT PFNGLUNIFORM2IVPROC __glewUniform2iv;
-GLEW_FUN_EXPORT PFNGLUNIFORM3FPROC __glewUniform3f;
-GLEW_FUN_EXPORT PFNGLUNIFORM3FVPROC __glewUniform3fv;
-GLEW_FUN_EXPORT PFNGLUNIFORM3IPROC __glewUniform3i;
-GLEW_FUN_EXPORT PFNGLUNIFORM3IVPROC __glewUniform3iv;
-GLEW_FUN_EXPORT PFNGLUNIFORM4FPROC __glewUniform4f;
-GLEW_FUN_EXPORT PFNGLUNIFORM4FVPROC __glewUniform4fv;
-GLEW_FUN_EXPORT PFNGLUNIFORM4IPROC __glewUniform4i;
-GLEW_FUN_EXPORT PFNGLUNIFORM4IVPROC __glewUniform4iv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv;
-GLEW_FUN_EXPORT PFNGLUSEPROGRAMPROC __glewUseProgram;
-GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPROC __glewValidateProgram;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer;
-
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv;
-
-GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender;
-GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback;
-GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation;
-GLEW_FUN_EXPORT PFNGLCLAMPCOLORPROC __glewClampColor;
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERFIPROC __glewClearBufferfi;
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERFVPROC __glewClearBufferfv;
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERIVPROC __glewClearBufferiv;
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv;
-GLEW_FUN_EXPORT PFNGLCOLORMASKIPROC __glewColorMaski;
-GLEW_FUN_EXPORT PFNGLDISABLEIPROC __glewDisablei;
-GLEW_FUN_EXPORT PFNGLENABLEIPROC __glewEnablei;
-GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender;
-GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback;
-GLEW_FUN_EXPORT PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v;
-GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation;
-GLEW_FUN_EXPORT PFNGLGETSTRINGIPROC __glewGetStringi;
-GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv;
-GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv;
-GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv;
-GLEW_FUN_EXPORT PFNGLISENABLEDIPROC __glewIsEnabledi;
-GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv;
-GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv;
-GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UIPROC __glewUniform1ui;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UIVPROC __glewUniform1uiv;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UIPROC __glewUniform2ui;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UIVPROC __glewUniform2uiv;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UIPROC __glewUniform3ui;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UIVPROC __glewUniform3uiv;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UIPROC __glewUniform4ui;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UIVPROC __glewUniform4uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer;
-
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced;
-GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex;
-GLEW_FUN_EXPORT PFNGLTEXBUFFERPROC __glewTexBuffer;
-
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture;
-GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v;
-GLEW_FUN_EXPORT PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v;
-
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor;
-
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei;
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIPROC __glewBlendEquationi;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCIPROC __glewBlendFunci;
-GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading;
-
-GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX;
-
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD;
-GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD;
-
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD;
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD;
-
-GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD;
-
-GLEW_FUN_EXPORT PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD;
-GLEW_FUN_EXPORT PFNGLGENNAMESAMDPROC __glewGenNamesAMD;
-GLEW_FUN_EXPORT PFNGLISNAMEAMDPROC __glewIsNameAMD;
-
-GLEW_FUN_EXPORT PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD;
-GLEW_FUN_EXPORT PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD;
-GLEW_FUN_EXPORT PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD;
-GLEW_FUN_EXPORT PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD;
-GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD;
-GLEW_FUN_EXPORT PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD;
-
-GLEW_FUN_EXPORT PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD;
-
-GLEW_FUN_EXPORT PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD;
-
-GLEW_FUN_EXPORT PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD;
-GLEW_FUN_EXPORT PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD;
-
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE;
-GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE;
-GLEW_FUN_EXPORT PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE;
-
-GLEW_FUN_EXPORT PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE;
-GLEW_FUN_EXPORT PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE;
-GLEW_FUN_EXPORT PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE;
-GLEW_FUN_EXPORT PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE;
-GLEW_FUN_EXPORT PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE;
-GLEW_FUN_EXPORT PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE;
-GLEW_FUN_EXPORT PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE;
-GLEW_FUN_EXPORT PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE;
-
-GLEW_FUN_EXPORT PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE;
-GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE;
-
-GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE;
-GLEW_FUN_EXPORT PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE;
-GLEW_FUN_EXPORT PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE;
-
-GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE;
-GLEW_FUN_EXPORT PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE;
-
-GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE;
-GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE;
-GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE;
-GLEW_FUN_EXPORT PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE;
-
-GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE;
-
-GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE;
-GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE;
-GLEW_FUN_EXPORT PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE;
-GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE;
-GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE;
-GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE;
-GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE;
-
-GLEW_FUN_EXPORT PFNGLCLEARDEPTHFPROC __glewClearDepthf;
-GLEW_FUN_EXPORT PFNGLDEPTHRANGEFPROC __glewDepthRangef;
-GLEW_FUN_EXPORT PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat;
-GLEW_FUN_EXPORT PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler;
-GLEW_FUN_EXPORT PFNGLSHADERBINARYPROC __glewShaderBinary;
-
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance;
-
-GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed;
-GLEW_FUN_EXPORT PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex;
-
-GLEW_FUN_EXPORT PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB;
-
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERDATAPROC __glewClearBufferData;
-GLEW_FUN_EXPORT PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData;
-GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT;
-GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT;
-
-GLEW_FUN_EXPORT PFNGLCLAMPCOLORARBPROC __glewClampColorARB;
-
-GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute;
-GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect;
-
-GLEW_FUN_EXPORT PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData;
-
-GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData;
-
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB;
-GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB;
-
-GLEW_FUN_EXPORT PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB;
-
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB;
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB;
-GLEW_FUN_EXPORT PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB;
-
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex;
-GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex;
-
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect;
-
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri;
-GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv;
-GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT;
-
-GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer;
-GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer;
-GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer;
-GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus;
-GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers;
-GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer;
-GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers;
-GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers;
-GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap;
-GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv;
-GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv;
-GLEW_FUN_EXPORT PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer;
-GLEW_FUN_EXPORT PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer;
-GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage;
-GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample;
-
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB;
-
-GLEW_FUN_EXPORT PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary;
-GLEW_FUN_EXPORT PFNGLPROGRAMBINARYPROC __glewProgramBinary;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri;
-
-GLEW_FUN_EXPORT PFNGLGETUNIFORMDVPROC __glewGetUniformdv;
-GLEW_FUN_EXPORT PFNGLUNIFORM1DPROC __glewUniform1d;
-GLEW_FUN_EXPORT PFNGLUNIFORM1DVPROC __glewUniform1dv;
-GLEW_FUN_EXPORT PFNGLUNIFORM2DPROC __glewUniform2d;
-GLEW_FUN_EXPORT PFNGLUNIFORM2DVPROC __glewUniform2dv;
-GLEW_FUN_EXPORT PFNGLUNIFORM3DPROC __glewUniform3d;
-GLEW_FUN_EXPORT PFNGLUNIFORM3DVPROC __glewUniform3dv;
-GLEW_FUN_EXPORT PFNGLUNIFORM4DPROC __glewUniform4d;
-GLEW_FUN_EXPORT PFNGLUNIFORM4DVPROC __glewUniform4dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv;
-
-GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEPROC __glewColorSubTable;
-GLEW_FUN_EXPORT PFNGLCOLORTABLEPROC __glewColorTable;
-GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv;
-GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv;
-GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable;
-GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable;
-GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D;
-GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPROC __glewGetColorTable;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv;
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPROC __glewGetHistogram;
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv;
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv;
-GLEW_FUN_EXPORT PFNGLGETMINMAXPROC __glewGetMinmax;
-GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv;
-GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv;
-GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter;
-GLEW_FUN_EXPORT PFNGLHISTOGRAMPROC __glewHistogram;
-GLEW_FUN_EXPORT PFNGLMINMAXPROC __glewMinmax;
-GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMPROC __glewResetHistogram;
-GLEW_FUN_EXPORT PFNGLRESETMINMAXPROC __glewResetMinmax;
-GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D;
-
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB;
-
-GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ;
-
-GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v;
-
-GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData;
-GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData;
-GLEW_FUN_EXPORT PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer;
-GLEW_FUN_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer;
-GLEW_FUN_EXPORT PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage;
-GLEW_FUN_EXPORT PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage;
-
-GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange;
-GLEW_FUN_EXPORT PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange;
-
-GLEW_FUN_EXPORT PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB;
-GLEW_FUN_EXPORT PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB;
-GLEW_FUN_EXPORT PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB;
-GLEW_FUN_EXPORT PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB;
-GLEW_FUN_EXPORT PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB;
-
-GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect;
-
-GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB;
-
-GLEW_FUN_EXPORT PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB;
-GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB;
-
-GLEW_FUN_EXPORT PFNGLBEGINQUERYARBPROC __glewBeginQueryARB;
-GLEW_FUN_EXPORT PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB;
-GLEW_FUN_EXPORT PFNGLENDQUERYARBPROC __glewEndQueryARB;
-GLEW_FUN_EXPORT PFNGLGENQUERIESARBPROC __glewGenQueriesARB;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB;
-GLEW_FUN_EXPORT PFNGLGETQUERYIVARBPROC __glewGetQueryivARB;
-GLEW_FUN_EXPORT PFNGLISQUERYARBPROC __glewIsQueryARB;
-
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB;
-
-GLEW_FUN_EXPORT PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv;
-
-GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex;
-
-GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB;
-GLEW_FUN_EXPORT PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB;
-GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB;
-GLEW_FUN_EXPORT PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB;
-GLEW_FUN_EXPORT PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB;
-GLEW_FUN_EXPORT PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB;
-GLEW_FUN_EXPORT PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB;
-GLEW_FUN_EXPORT PFNGLGETNMAPIVARBPROC __glewGetnMapivARB;
-GLEW_FUN_EXPORT PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB;
-GLEW_FUN_EXPORT PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB;
-GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB;
-GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB;
-GLEW_FUN_EXPORT PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB;
-GLEW_FUN_EXPORT PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB;
-GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB;
-GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB;
-GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB;
-GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB;
-GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB;
-GLEW_FUN_EXPORT PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB;
-
-GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB;
-
-GLEW_FUN_EXPORT PFNGLBINDSAMPLERPROC __glewBindSampler;
-GLEW_FUN_EXPORT PFNGLDELETESAMPLERSPROC __glewDeleteSamplers;
-GLEW_FUN_EXPORT PFNGLGENSAMPLERSPROC __glewGenSamplers;
-GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv;
-GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv;
-GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv;
-GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv;
-GLEW_FUN_EXPORT PFNGLISSAMPLERPROC __glewIsSampler;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri;
-GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv;
-
-GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram;
-GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline;
-GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv;
-GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines;
-GLEW_FUN_EXPORT PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv;
-GLEW_FUN_EXPORT PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv;
-GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages;
-GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline;
-
-GLEW_FUN_EXPORT PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv;
-
-GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture;
-GLEW_FUN_EXPORT PFNGLMEMORYBARRIERPROC __glewMemoryBarrier;
-
-GLEW_FUN_EXPORT PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB;
-GLEW_FUN_EXPORT PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB;
-GLEW_FUN_EXPORT PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB;
-GLEW_FUN_EXPORT PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB;
-GLEW_FUN_EXPORT PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB;
-GLEW_FUN_EXPORT PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB;
-GLEW_FUN_EXPORT PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB;
-GLEW_FUN_EXPORT PFNGLGETHANDLEARBPROC __glewGetHandleARB;
-GLEW_FUN_EXPORT PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB;
-GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB;
-GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB;
-GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB;
-GLEW_FUN_EXPORT PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB;
-GLEW_FUN_EXPORT PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM1FARBPROC __glewUniform1fARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM1IARBPROC __glewUniform1iARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM2FARBPROC __glewUniform2fARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM2IARBPROC __glewUniform2iARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM3FARBPROC __glewUniform3fARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM3IARBPROC __glewUniform3iARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM4FARBPROC __glewUniform4fARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM4IARBPROC __glewUniform4iARB;
-GLEW_FUN_EXPORT PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB;
-GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB;
-GLEW_FUN_EXPORT PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB;
-GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB;
-
-GLEW_FUN_EXPORT PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding;
-
-GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName;
-GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName;
-GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv;
-GLEW_FUN_EXPORT PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex;
-GLEW_FUN_EXPORT PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv;
-GLEW_FUN_EXPORT PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv;
-
-GLEW_FUN_EXPORT PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB;
-GLEW_FUN_EXPORT PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB;
-GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB;
-GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB;
-GLEW_FUN_EXPORT PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB;
-GLEW_FUN_EXPORT PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB;
-
-GLEW_FUN_EXPORT PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync;
-GLEW_FUN_EXPORT PFNGLDELETESYNCPROC __glewDeleteSync;
-GLEW_FUN_EXPORT PFNGLFENCESYNCPROC __glewFenceSync;
-GLEW_FUN_EXPORT PFNGLGETINTEGER64VPROC __glewGetInteger64v;
-GLEW_FUN_EXPORT PFNGLGETSYNCIVPROC __glewGetSynciv;
-GLEW_FUN_EXPORT PFNGLISSYNCPROC __glewIsSync;
-GLEW_FUN_EXPORT PFNGLWAITSYNCPROC __glewWaitSync;
-
-GLEW_FUN_EXPORT PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv;
-GLEW_FUN_EXPORT PFNGLPATCHPARAMETERIPROC __glewPatchParameteri;
-
-GLEW_FUN_EXPORT PFNGLTEXBUFFERARBPROC __glewTexBufferARB;
-
-GLEW_FUN_EXPORT PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange;
-GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT;
-
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB;
-GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB;
-
-GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv;
-GLEW_FUN_EXPORT PFNGLSAMPLEMASKIPROC __glewSampleMaski;
-GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample;
-GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample;
-
-GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DPROC __glewTexStorage1D;
-GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DPROC __glewTexStorage2D;
-GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DPROC __glewTexStorage3D;
-GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample;
-GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample;
-GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXTUREVIEWPROC __glewTextureView;
-
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v;
-GLEW_FUN_EXPORT PFNGLQUERYCOUNTERPROC __glewQueryCounter;
-
-GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback;
-GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks;
-GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback;
-GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks;
-GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback;
-GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback;
-GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback;
-
-GLEW_FUN_EXPORT PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed;
-GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream;
-GLEW_FUN_EXPORT PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed;
-GLEW_FUN_EXPORT PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv;
-
-GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced;
-GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced;
-
-GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB;
-GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB;
-GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB;
-GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB;
-
-GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEPROC __glewBindBufferBase;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName;
-GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv;
-GLEW_FUN_EXPORT PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices;
-GLEW_FUN_EXPORT PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding;
-
-GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray;
-GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays;
-GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays;
-GLEW_FUN_EXPORT PFNGLISVERTEXARRAYPROC __glewIsVertexArray;
-
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer;
-
-GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat;
-GLEW_FUN_EXPORT PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor;
-
-GLEW_FUN_EXPORT PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTBVARBPROC __glewWeightbvARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTDVARBPROC __glewWeightdvARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTFVARBPROC __glewWeightfvARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTIVARBPROC __glewWeightivARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTSVARBPROC __glewWeightsvARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTUBVARBPROC __glewWeightubvARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTUIVARBPROC __glewWeightuivARB;
-GLEW_FUN_EXPORT PFNGLWEIGHTUSVARBPROC __glewWeightusvARB;
-
-GLEW_FUN_EXPORT PFNGLBINDBUFFERARBPROC __glewBindBufferARB;
-GLEW_FUN_EXPORT PFNGLBUFFERDATAARBPROC __glewBufferDataARB;
-GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB;
-GLEW_FUN_EXPORT PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB;
-GLEW_FUN_EXPORT PFNGLGENBUFFERSARBPROC __glewGenBuffersARB;
-GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB;
-GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB;
-GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB;
-GLEW_FUN_EXPORT PFNGLISBUFFERARBPROC __glewIsBufferARB;
-GLEW_FUN_EXPORT PFNGLMAPBUFFERARBPROC __glewMapBufferARB;
-GLEW_FUN_EXPORT PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB;
-
-GLEW_FUN_EXPORT PFNGLBINDPROGRAMARBPROC __glewBindProgramARB;
-GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB;
-GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB;
-GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB;
-GLEW_FUN_EXPORT PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB;
-GLEW_FUN_EXPORT PFNGLISPROGRAMARBPROC __glewIsProgramARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB;
-GLEW_FUN_EXPORT PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB;
-
-GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB;
-GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB;
-GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB;
-
-GLEW_FUN_EXPORT PFNGLCOLORP3UIPROC __glewColorP3ui;
-GLEW_FUN_EXPORT PFNGLCOLORP3UIVPROC __glewColorP3uiv;
-GLEW_FUN_EXPORT PFNGLCOLORP4UIPROC __glewColorP4ui;
-GLEW_FUN_EXPORT PFNGLCOLORP4UIVPROC __glewColorP4uiv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv;
-GLEW_FUN_EXPORT PFNGLNORMALP3UIPROC __glewNormalP3ui;
-GLEW_FUN_EXPORT PFNGLNORMALP3UIVPROC __glewNormalP3uiv;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui;
-GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXP2UIPROC __glewVertexP2ui;
-GLEW_FUN_EXPORT PFNGLVERTEXP2UIVPROC __glewVertexP2uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXP3UIPROC __glewVertexP3ui;
-GLEW_FUN_EXPORT PFNGLVERTEXP3UIVPROC __glewVertexP3uiv;
-GLEW_FUN_EXPORT PFNGLVERTEXP4UIPROC __glewVertexP4ui;
-GLEW_FUN_EXPORT PFNGLVERTEXP4UIVPROC __glewVertexP4uiv;
-
-GLEW_FUN_EXPORT PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv;
-GLEW_FUN_EXPORT PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed;
-GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v;
-GLEW_FUN_EXPORT PFNGLGETFLOATI_VPROC __glewGetFloati_v;
-GLEW_FUN_EXPORT PFNGLSCISSORARRAYVPROC __glewScissorArrayv;
-GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDPROC __glewScissorIndexed;
-GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv;
-GLEW_FUN_EXPORT PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv;
-GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf;
-GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv;
-
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB;
-
-GLEW_FUN_EXPORT PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI;
-
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI;
-GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI;
-GLEW_FUN_EXPORT PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI;
-
-GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI;
-GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI;
-GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI;
-GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI;
-
-GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI;
-GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI;
-GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI;
-GLEW_FUN_EXPORT PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI;
-GLEW_FUN_EXPORT PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI;
-GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI;
-GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI;
-GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI;
-GLEW_FUN_EXPORT PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI;
-GLEW_FUN_EXPORT PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI;
-GLEW_FUN_EXPORT PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI;
-GLEW_FUN_EXPORT PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI;
-GLEW_FUN_EXPORT PFNGLSAMPLEMAPATIPROC __glewSampleMapATI;
-GLEW_FUN_EXPORT PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI;
-
-GLEW_FUN_EXPORT PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI;
-GLEW_FUN_EXPORT PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI;
-
-GLEW_FUN_EXPORT PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI;
-GLEW_FUN_EXPORT PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI;
-
-GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI;
-GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI;
-
-GLEW_FUN_EXPORT PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI;
-GLEW_FUN_EXPORT PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI;
-GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI;
-GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI;
-GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI;
-GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI;
-GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI;
-GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI;
-GLEW_FUN_EXPORT PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI;
-GLEW_FUN_EXPORT PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI;
-GLEW_FUN_EXPORT PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI;
-GLEW_FUN_EXPORT PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI;
-
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI;
-
-GLEW_FUN_EXPORT PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI;
-GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI;
-GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI;
-GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI;
-GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI;
-
-GLEW_FUN_EXPORT PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT;
-
-GLEW_FUN_EXPORT PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT;
-
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT;
-
-GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT;
-
-GLEW_FUN_EXPORT PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT;
-
-GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT;
-GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT;
-
-GLEW_FUN_EXPORT PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT;
-GLEW_FUN_EXPORT PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT;
-
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT;
-GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT;
-GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT;
-GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT;
-
-GLEW_FUN_EXPORT PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT;
-GLEW_FUN_EXPORT PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT;
-
-GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT;
-
-GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT;
-GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT;
-
-GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT;
-GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT;
-GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT;
-
-GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT;
-
-GLEW_FUN_EXPORT PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT;
-GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT;
-GLEW_FUN_EXPORT PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT;
-GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT;
-GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT;
-GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT;
-GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT;
-GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT;
-GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT;
-GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT;
-GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT;
-GLEW_FUN_EXPORT PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT;
-GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT;
-GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT;
-GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT;
-GLEW_FUN_EXPORT PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT;
-GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT;
-GLEW_FUN_EXPORT PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT;
-GLEW_FUN_EXPORT PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT;
-GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT;
-GLEW_FUN_EXPORT PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT;
-GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT;
-GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT;
-GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT;
-GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DEXTPROC __glewProgramUniform1dEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DVEXTPROC __glewProgramUniform1dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DEXTPROC __glewProgramUniform2dEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DVEXTPROC __glewProgramUniform2dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DEXTPROC __glewProgramUniform3dEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DVEXTPROC __glewProgramUniform3dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DEXTPROC __glewProgramUniform4dEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DVEXTPROC __glewProgramUniform4dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC __glewProgramUniformMatrix2dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC __glewProgramUniformMatrix2x3dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC __glewProgramUniformMatrix2x4dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC __glewProgramUniformMatrix3dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC __glewProgramUniformMatrix3x2dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC __glewProgramUniformMatrix3x4dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC __glewProgramUniformMatrix4dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC __glewProgramUniformMatrix4x2dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC __glewProgramUniformMatrix4x3dvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT;
-GLEW_FUN_EXPORT PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT;
-GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT;
-
-GLEW_FUN_EXPORT PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT;
-GLEW_FUN_EXPORT PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT;
-GLEW_FUN_EXPORT PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT;
-GLEW_FUN_EXPORT PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT;
-GLEW_FUN_EXPORT PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT;
-GLEW_FUN_EXPORT PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT;
-
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT;
-GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT;
-
-GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT;
-
-GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT;
-GLEW_FUN_EXPORT PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT;
-GLEW_FUN_EXPORT PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT;
-GLEW_FUN_EXPORT PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT;
-GLEW_FUN_EXPORT PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT;
-
-GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT;
-GLEW_FUN_EXPORT PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT;
-
-GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT;
-
-GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT;
-
-GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT;
-GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT;
-GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT;
-GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT;
-GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT;
-GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT;
-GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT;
-GLEW_FUN_EXPORT PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT;
-GLEW_FUN_EXPORT PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT;
-GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT;
-
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT;
-
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT;
-
-GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT;
-GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT;
-
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT;
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT;
-GLEW_FUN_EXPORT PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT;
-GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT;
-GLEW_FUN_EXPORT PFNGLHISTOGRAMEXTPROC __glewHistogramEXT;
-GLEW_FUN_EXPORT PFNGLMINMAXEXTPROC __glewMinmaxEXT;
-GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT;
-GLEW_FUN_EXPORT PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT;
-
-GLEW_FUN_EXPORT PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT;
-
-GLEW_FUN_EXPORT PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT;
-
-GLEW_FUN_EXPORT PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT;
-GLEW_FUN_EXPORT PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT;
-GLEW_FUN_EXPORT PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT;
-
-GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT;
-GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT;
-
-GLEW_FUN_EXPORT PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT;
-GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT;
-
-GLEW_FUN_EXPORT PFNGLCOLORTABLEEXTPROC __glewColorTableEXT;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT;
-
-GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT;
-GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT;
-GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT;
-GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT;
-GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT;
-
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT;
-
-GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT;
-
-GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT;
-
-GLEW_FUN_EXPORT PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT;
-GLEW_FUN_EXPORT PFNGLENDSCENEEXTPROC __glewEndSceneEXT;
-
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT;
-
-GLEW_FUN_EXPORT PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT;
-GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT;
-GLEW_FUN_EXPORT PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT;
-
-GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT;
-GLEW_FUN_EXPORT PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT;
-
-GLEW_FUN_EXPORT PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT;
-GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT;
-GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT;
-
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT;
-
-GLEW_FUN_EXPORT PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT;
-GLEW_FUN_EXPORT PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT;
-GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT;
-GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT;
-
-GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT;
-GLEW_FUN_EXPORT PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT;
-GLEW_FUN_EXPORT PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT;
-GLEW_FUN_EXPORT PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT;
-GLEW_FUN_EXPORT PFNGLISTEXTUREEXTPROC __glewIsTextureEXT;
-GLEW_FUN_EXPORT PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT;
-
-GLEW_FUN_EXPORT PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT;
-
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT;
-GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT;
-
-GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT;
-GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT;
-GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT;
-GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT;
-GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT;
-
-GLEW_FUN_EXPORT PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT;
-GLEW_FUN_EXPORT PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT;
-GLEW_FUN_EXPORT PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT;
-GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT;
-GLEW_FUN_EXPORT PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT;
-GLEW_FUN_EXPORT PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT;
-GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT;
-
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT;
-
-GLEW_FUN_EXPORT PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT;
-GLEW_FUN_EXPORT PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT;
-GLEW_FUN_EXPORT PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT;
-GLEW_FUN_EXPORT PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT;
-GLEW_FUN_EXPORT PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT;
-GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT;
-GLEW_FUN_EXPORT PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT;
-GLEW_FUN_EXPORT PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT;
-GLEW_FUN_EXPORT PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT;
-GLEW_FUN_EXPORT PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT;
-GLEW_FUN_EXPORT PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT;
-GLEW_FUN_EXPORT PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT;
-GLEW_FUN_EXPORT PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT;
-GLEW_FUN_EXPORT PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT;
-GLEW_FUN_EXPORT PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT;
-GLEW_FUN_EXPORT PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT;
-GLEW_FUN_EXPORT PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT;
-GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT;
-GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT;
-GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT;
-GLEW_FUN_EXPORT PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT;
-GLEW_FUN_EXPORT PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT;
-GLEW_FUN_EXPORT PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT;
-GLEW_FUN_EXPORT PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT;
-GLEW_FUN_EXPORT PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT;
-GLEW_FUN_EXPORT PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT;
-GLEW_FUN_EXPORT PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT;
-GLEW_FUN_EXPORT PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT;
-GLEW_FUN_EXPORT PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT;
-GLEW_FUN_EXPORT PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT;
-GLEW_FUN_EXPORT PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT;
-GLEW_FUN_EXPORT PFNGLSWIZZLEEXTPROC __glewSwizzleEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTBVEXTPROC __glewVariantbvEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTDVEXTPROC __glewVariantdvEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTFVEXTPROC __glewVariantfvEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTIVEXTPROC __glewVariantivEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTSVEXTPROC __glewVariantsvEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT;
-GLEW_FUN_EXPORT PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT;
-GLEW_FUN_EXPORT PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT;
-
-GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT;
-GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT;
-
-GLEW_FUN_EXPORT PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT;
-
-GLEW_FUN_EXPORT PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY;
-
-GLEW_FUN_EXPORT PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY;
-
-GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP;
-GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP;
-GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP;
-GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP;
-GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP;
-GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP;
-
-GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM;
-GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM;
-
-GLEW_FUN_EXPORT PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM;
-GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM;
-GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM;
-GLEW_FUN_EXPORT PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM;
-GLEW_FUN_EXPORT PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM;
-GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM;
-GLEW_FUN_EXPORT PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM;
-
-GLEW_FUN_EXPORT PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL;
-GLEW_FUN_EXPORT PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL;
-GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL;
-GLEW_FUN_EXPORT PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL;
-
-GLEW_FUN_EXPORT PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL;
-GLEW_FUN_EXPORT PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL;
-
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl;
-GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert;
-GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog;
-GLEW_FUN_EXPORT PFNGLGETOBJECTLABELPROC __glewGetObjectLabel;
-GLEW_FUN_EXPORT PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel;
-GLEW_FUN_EXPORT PFNGLGETPOINTERVPROC __glewGetPointerv;
-GLEW_FUN_EXPORT PFNGLOBJECTLABELPROC __glewObjectLabel;
-GLEW_FUN_EXPORT PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel;
-GLEW_FUN_EXPORT PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup;
-
-GLEW_FUN_EXPORT PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled;
-GLEW_FUN_EXPORT PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion;
-GLEW_FUN_EXPORT PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion;
-GLEW_FUN_EXPORT PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion;
-GLEW_FUN_EXPORT PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion;
-
-GLEW_FUN_EXPORT PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA;
-
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA;
-GLEW_FUN_EXPORT PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA;
-
-GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV;
-GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV;
-GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV;
-GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV;
-GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV;
-
-GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV;
-GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV;
-
-GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV;
-
-GLEW_FUN_EXPORT PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV;
-GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV;
-GLEW_FUN_EXPORT PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV;
-
-GLEW_FUN_EXPORT PFNGLEVALMAPSNVPROC __glewEvalMapsNV;
-GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV;
-GLEW_FUN_EXPORT PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV;
-GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV;
-GLEW_FUN_EXPORT PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV;
-GLEW_FUN_EXPORT PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV;
-GLEW_FUN_EXPORT PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV;
-
-GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV;
-GLEW_FUN_EXPORT PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV;
-GLEW_FUN_EXPORT PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV;
-
-GLEW_FUN_EXPORT PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV;
-GLEW_FUN_EXPORT PFNGLFINISHFENCENVPROC __glewFinishFenceNV;
-GLEW_FUN_EXPORT PFNGLGENFENCESNVPROC __glewGenFencesNV;
-GLEW_FUN_EXPORT PFNGLGETFENCEIVNVPROC __glewGetFenceivNV;
-GLEW_FUN_EXPORT PFNGLISFENCENVPROC __glewIsFenceNV;
-GLEW_FUN_EXPORT PFNGLSETFENCENVPROC __glewSetFenceNV;
-GLEW_FUN_EXPORT PFNGLTESTFENCENVPROC __glewTestFenceNV;
-
-GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV;
-
-GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV;
-
-GLEW_FUN_EXPORT PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV;
-
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV;
-
-GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV;
-GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV;
-
-GLEW_FUN_EXPORT PFNGLCOLOR3HNVPROC __glewColor3hNV;
-GLEW_FUN_EXPORT PFNGLCOLOR3HVNVPROC __glewColor3hvNV;
-GLEW_FUN_EXPORT PFNGLCOLOR4HNVPROC __glewColor4hNV;
-GLEW_FUN_EXPORT PFNGLCOLOR4HVNVPROC __glewColor4hvNV;
-GLEW_FUN_EXPORT PFNGLFOGCOORDHNVPROC __glewFogCoordhNV;
-GLEW_FUN_EXPORT PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV;
-GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV;
-GLEW_FUN_EXPORT PFNGLNORMAL3HNVPROC __glewNormal3hNV;
-GLEW_FUN_EXPORT PFNGLNORMAL3HVNVPROC __glewNormal3hvNV;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEX2HNVPROC __glewVertex2hNV;
-GLEW_FUN_EXPORT PFNGLVERTEX2HVNVPROC __glewVertex2hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEX3HNVPROC __glewVertex3hNV;
-GLEW_FUN_EXPORT PFNGLVERTEX3HVNVPROC __glewVertex3hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEX4HNVPROC __glewVertex4hNV;
-GLEW_FUN_EXPORT PFNGLVERTEX4HVNVPROC __glewVertex4hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV;
-GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV;
-
-GLEW_FUN_EXPORT PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV;
-GLEW_FUN_EXPORT PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV;
-GLEW_FUN_EXPORT PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV;
-GLEW_FUN_EXPORT PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV;
-GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV;
-GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV;
-GLEW_FUN_EXPORT PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV;
-
-GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV;
-
-GLEW_FUN_EXPORT PFNGLCOPYPATHNVPROC __glewCopyPathNV;
-GLEW_FUN_EXPORT PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV;
-GLEW_FUN_EXPORT PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV;
-GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV;
-GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV;
-GLEW_FUN_EXPORT PFNGLDELETEPATHSNVPROC __glewDeletePathsNV;
-GLEW_FUN_EXPORT PFNGLGENPATHSNVPROC __glewGenPathsNV;
-GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV;
-GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV;
-GLEW_FUN_EXPORT PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV;
-GLEW_FUN_EXPORT PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV;
-GLEW_FUN_EXPORT PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV;
-GLEW_FUN_EXPORT PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV;
-GLEW_FUN_EXPORT PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV;
-GLEW_FUN_EXPORT PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV;
-GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV;
-GLEW_FUN_EXPORT PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV;
-GLEW_FUN_EXPORT PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV;
-GLEW_FUN_EXPORT PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV;
-GLEW_FUN_EXPORT PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV;
-GLEW_FUN_EXPORT PFNGLISPATHNVPROC __glewIsPathNV;
-GLEW_FUN_EXPORT PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV;
-GLEW_FUN_EXPORT PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV;
-GLEW_FUN_EXPORT PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV;
-GLEW_FUN_EXPORT PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV;
-GLEW_FUN_EXPORT PFNGLPATHCOORDSNVPROC __glewPathCoordsNV;
-GLEW_FUN_EXPORT PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV;
-GLEW_FUN_EXPORT PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV;
-GLEW_FUN_EXPORT PFNGLPATHFOGGENNVPROC __glewPathFogGenNV;
-GLEW_FUN_EXPORT PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV;
-GLEW_FUN_EXPORT PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV;
-GLEW_FUN_EXPORT PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV;
-GLEW_FUN_EXPORT PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV;
-GLEW_FUN_EXPORT PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV;
-GLEW_FUN_EXPORT PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV;
-GLEW_FUN_EXPORT PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV;
-GLEW_FUN_EXPORT PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV;
-GLEW_FUN_EXPORT PFNGLPATHSTRINGNVPROC __glewPathStringNV;
-GLEW_FUN_EXPORT PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV;
-GLEW_FUN_EXPORT PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV;
-GLEW_FUN_EXPORT PFNGLPATHTEXGENNVPROC __glewPathTexGenNV;
-GLEW_FUN_EXPORT PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV;
-GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV;
-GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV;
-GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV;
-GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV;
-GLEW_FUN_EXPORT PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV;
-GLEW_FUN_EXPORT PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV;
-
-GLEW_FUN_EXPORT PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV;
-GLEW_FUN_EXPORT PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV;
-
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV;
-GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV;
-
-GLEW_FUN_EXPORT PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV;
-GLEW_FUN_EXPORT PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV;
-GLEW_FUN_EXPORT PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV;
-
-GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV;
-GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV;
-
-GLEW_FUN_EXPORT PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV;
-GLEW_FUN_EXPORT PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV;
-GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV;
-GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV;
-GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV;
-GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV;
-GLEW_FUN_EXPORT PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV;
-GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV;
-GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV;
-GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV;
-
-GLEW_FUN_EXPORT PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV;
-
-GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV;
-GLEW_FUN_EXPORT PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV;
-GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV;
-GLEW_FUN_EXPORT PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV;
-GLEW_FUN_EXPORT PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV;
-GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV;
-GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV;
-GLEW_FUN_EXPORT PFNGLUNIFORMUI64NVPROC __glewUniformui64NV;
-GLEW_FUN_EXPORT PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV;
-
-GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV;
-
-GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV;
-GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV;
-GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV;
-
-GLEW_FUN_EXPORT PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV;
-GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV;
-GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV;
-GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV;
-GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV;
-GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV;
-GLEW_FUN_EXPORT PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV;
-GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV;
-GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV;
-
-GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV;
-GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV;
-GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV;
-GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV;
-
-GLEW_FUN_EXPORT PFNGLVDPAUFININVPROC __glewVDPAUFiniNV;
-GLEW_FUN_EXPORT PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV;
-GLEW_FUN_EXPORT PFNGLVDPAUINITNVPROC __glewVDPAUInitNV;
-GLEW_FUN_EXPORT PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV;
-GLEW_FUN_EXPORT PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV;
-GLEW_FUN_EXPORT PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV;
-GLEW_FUN_EXPORT PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV;
-GLEW_FUN_EXPORT PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV;
-GLEW_FUN_EXPORT PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV;
-GLEW_FUN_EXPORT PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV;
-
-GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV;
-GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV;
-
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV;
-
-GLEW_FUN_EXPORT PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV;
-GLEW_FUN_EXPORT PFNGLCOLORFORMATNVPROC __glewColorFormatNV;
-GLEW_FUN_EXPORT PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV;
-GLEW_FUN_EXPORT PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV;
-GLEW_FUN_EXPORT PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV;
-GLEW_FUN_EXPORT PFNGLINDEXFORMATNVPROC __glewIndexFormatNV;
-GLEW_FUN_EXPORT PFNGLNORMALFORMATNVPROC __glewNormalFormatNV;
-GLEW_FUN_EXPORT PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV;
-GLEW_FUN_EXPORT PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV;
-GLEW_FUN_EXPORT PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV;
-
-GLEW_FUN_EXPORT PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV;
-GLEW_FUN_EXPORT PFNGLBINDPROGRAMNVPROC __glewBindProgramNV;
-GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV;
-GLEW_FUN_EXPORT PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV;
-GLEW_FUN_EXPORT PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV;
-GLEW_FUN_EXPORT PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV;
-GLEW_FUN_EXPORT PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV;
-GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV;
-GLEW_FUN_EXPORT PFNGLISPROGRAMNVPROC __glewIsProgramNV;
-GLEW_FUN_EXPORT PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV;
-GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV;
-GLEW_FUN_EXPORT PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV;
-GLEW_FUN_EXPORT PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV;
-GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV;
-
-GLEW_FUN_EXPORT PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV;
-GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV;
-GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV;
-GLEW_FUN_EXPORT PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV;
-GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV;
-GLEW_FUN_EXPORT PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV;
-GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV;
-GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV;
-GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV;
-
-GLEW_FUN_EXPORT PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES;
-GLEW_FUN_EXPORT PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES;
-GLEW_FUN_EXPORT PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES;
-GLEW_FUN_EXPORT PFNGLFRUSTUMFOESPROC __glewFrustumfOES;
-GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES;
-GLEW_FUN_EXPORT PFNGLORTHOFOESPROC __glewOrthofOES;
-
-GLEW_FUN_EXPORT PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL;
-
-GLEW_FUN_EXPORT PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL;
-GLEW_FUN_EXPORT PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL;
-
-GLEW_FUN_EXPORT PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS;
-GLEW_FUN_EXPORT PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS;
-
-GLEW_FUN_EXPORT PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS;
-GLEW_FUN_EXPORT PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS;
-
-GLEW_FUN_EXPORT PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS;
-GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS;
-
-GLEW_FUN_EXPORT PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS;
-GLEW_FUN_EXPORT PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS;
-
-GLEW_FUN_EXPORT PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS;
-GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS;
-
-GLEW_FUN_EXPORT PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS;
-GLEW_FUN_EXPORT PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS;
-
-GLEW_FUN_EXPORT PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX;
-GLEW_FUN_EXPORT PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX;
-GLEW_FUN_EXPORT PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX;
-GLEW_FUN_EXPORT PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX;
-GLEW_FUN_EXPORT PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX;
-GLEW_FUN_EXPORT PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX;
-
-GLEW_FUN_EXPORT PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX;
-
-GLEW_FUN_EXPORT PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX;
-
-GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX;
-GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX;
-GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX;
-
-GLEW_FUN_EXPORT PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX;
-
-GLEW_FUN_EXPORT PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX;
-
-GLEW_FUN_EXPORT PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX;
-
-GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX;
-GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX;
-GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX;
-GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX;
-
-GLEW_FUN_EXPORT PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX;
-
-GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI;
-GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI;
-GLEW_FUN_EXPORT PFNGLCOLORTABLESGIPROC __glewColorTableSGI;
-GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI;
-GLEW_FUN_EXPORT PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI;
-
-GLEW_FUN_EXPORT PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX;
-
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN;
-GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN;
-
-GLEW_FUN_EXPORT PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN;
-
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN;
-
-GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN;
-GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN;
-
-GLEW_FUN_EXPORT PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN;
-
-#if defined(GLEW_MX) && !defined(_WIN32)
-struct GLEWContextStruct
-{
-#endif /* GLEW_MX */
-
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_3;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_4;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_5;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_0;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_0;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_2;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_3;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_0;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_2;
-GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_3;
-GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_tbuffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_texture_compression_FXT1;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_blend_minmax_factor;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_conservative_depth;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_debug_output;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_depth_clamp_separate;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_draw_buffers_blend;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_multi_draw_indirect;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_name_gen_delete;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_performance_monitor;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_pinned_memory;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_query_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sample_positions;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_seamless_cubemap_per_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_export;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_stencil_operation_extended;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_texture_texture4;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback3_lines_triangles;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_layer;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_tessellator;
-GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_viewport_index;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_aux_depth_stencil;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_client_storage;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_element_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_fence;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_float_pixels;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_flush_buffer_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_object_purgeable;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_pixel_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_rgb_422;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_row_bytes;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_specular_vector;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_transform_hint;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_program_evaluators;
-GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_ycbcr_422;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES2_compatibility;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_compatibility;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_arrays_of_arrays;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_base_instance;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_blend_func_extended;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cl_event;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_color_buffer_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compatibility;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compressed_texture_pixel_storage;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conservative_depth;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_image;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_debug_output;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_buffer_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers_blend;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_elements_base_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_indirect;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_instanced;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_attrib_location;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_uniform_location;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_coord_conventions;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_layer_viewport;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program_shadow;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_no_attachments;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_sRGB;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_geometry_shader4;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_program_binary;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader5;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_fp64;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_pixel;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_imaging;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_instanced_arrays;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query2;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_invalidate_subdata;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_alignment;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_matrix_palette;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_draw_indirect;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multitexture;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query2;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pixel_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_parameters;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_sprite;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_program_interface_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_provoking_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robust_buffer_access_behavior;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_application_isolation;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_share_group_isolation;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_shading;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sampler_objects;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cube_map;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_separate_shader_objects;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counters;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_bit_encoding;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_load_store;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_size;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_objects;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_precision;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_stencil_export;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_storage_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_subroutine;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_lod;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_100;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_420pack;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_include;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_packing;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow_ambient;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_stencil_texturing;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sync;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_tessellation_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_border_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object_rgb32;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_bptc;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_rgtc;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_add;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_combine;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_crossbar;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_dot3;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_gather;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirrored_repeat;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_non_power_of_two;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_levels;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_lod;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rectangle;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rg;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rgb10_a2ui;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_swizzle;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_view;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_timer_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback2;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback3;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_instanced;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transpose_matrix;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_uniform_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_bgra;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_64bit;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_binding;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_blend;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_program;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_viewport_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_ARB_window_pos;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_point_sprites;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_combine3;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_route;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_vertex_shader_output_point_size;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_draw_buffers;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_element_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_envmap_bumpmap;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_fragment_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_map_object_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_meminfo;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_pn_triangles;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_separate_stencil;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_shader_texture_lod;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_text_fragment_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_compression_3dc;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_env_combine3;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_mirror_once;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_array_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_attrib_array_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_streams;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_422_pixels;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_Cg_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_abgr;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bgra;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bindable_uniform;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_color;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_equation_separate;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_separate;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_logic_op;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_minmax;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_subtract;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_volume_hint;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cmyka;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_subtable;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compiled_vertex_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers2;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_instanced;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_range_elements;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fog_coord;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fragment_lighting;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_blit;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_sRGB;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_shader4;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_program_parameters;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_shader4;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_histogram;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_array_formats;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_func;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_material;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_light_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_misc_attribute;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_arrays;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_depth_stencil;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_pixels;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_paletted_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform_color_table;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_point_parameters;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_provoking_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_two_side;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_wrap;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_subtexture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture3D;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_dxt1;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_latc;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_rgtc;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_s3tc;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_edge_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_add;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_combine;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_dot3;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_anisotropic;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_integer;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_lod_bias;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_mirror_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_perturb_normal;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rectangle;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_decode;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_shared_exponent;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_snorm;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_swizzle;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_timer_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_transform_feedback;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_bgra;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_attrib_64bit;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting;
-GLEW_VAR_EXPORT GLboolean __GLEW_EXT_x11_sync_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_frame_terminator;
-GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker;
-GLEW_VAR_EXPORT GLboolean __GLEW_HP_convolution_border_modes;
-GLEW_VAR_EXPORT GLboolean __GLEW_HP_image_transform;
-GLEW_VAR_EXPORT GLboolean __GLEW_HP_occlusion_test;
-GLEW_VAR_EXPORT GLboolean __GLEW_HP_texture_lighting;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_cull_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_multimode_draw_arrays;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_rasterpos_clip;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_static_data;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat;
-GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists;
-GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read;
-GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays;
-GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor;
-GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug;
-GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr;
-GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region;
-GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack;
-GLEW_VAR_EXPORT GLboolean __GLEW_MESA_pack_invert;
-GLEW_VAR_EXPORT GLboolean __GLEW_MESA_resize_buffers;
-GLEW_VAR_EXPORT GLboolean __GLEW_MESA_window_pos;
-GLEW_VAR_EXPORT GLboolean __GLEW_MESA_ycbcr_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_NVX_gpu_memory_info;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_square;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_conditional_render;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_depth_to_color;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_image;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_buffer_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_range_unclamped;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_evaluators;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_explicit_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fence;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_float_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fog_distance;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program_option;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_multisample_coverage;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_program4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program_fp64;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_shader5;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_half_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_light_max_exponent;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_coverage;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_filter_hint;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_occlusion_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_depth_stencil;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_data_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_point_sprite;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_present_video;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_primitive_restart;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_buffer_load;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_tessellation_program5;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_emboss;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_reflection;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_barrier;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_vtc;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_env_combine4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_expand_normal;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader3;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vdpau_interop;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_attrib_integer_64bit;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_buffer_unified_memory;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program1_1;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2_option;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program3;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program4;
-GLEW_VAR_EXPORT GLboolean __GLEW_NV_video_capture;
-GLEW_VAR_EXPORT GLboolean __GLEW_OES_byte_coordinates;
-GLEW_VAR_EXPORT GLboolean __GLEW_OES_compressed_paletted_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_OES_read_format;
-GLEW_VAR_EXPORT GLboolean __GLEW_OES_single_precision;
-GLEW_VAR_EXPORT GLboolean __GLEW_OML_interlace;
-GLEW_VAR_EXPORT GLboolean __GLEW_OML_resample;
-GLEW_VAR_EXPORT GLboolean __GLEW_OML_subsample;
-GLEW_VAR_EXPORT GLboolean __GLEW_PGI_misc_hints;
-GLEW_VAR_EXPORT GLboolean __GLEW_PGI_vertex_hints;
-GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_error_string;
-GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_extension_query;
-GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_log;
-GLEW_VAR_EXPORT GLboolean __GLEW_REND_screen_coordinates;
-GLEW_VAR_EXPORT GLboolean __GLEW_S3_s3tc;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_color_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_detail_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_fog_function;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_generate_mipmap;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multisample;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_pixel_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_point_line_texgen;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_sharpen_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture4D;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_border_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_edge_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_filter4;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_lod;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_select;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_histogram;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_pixel;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_alpha_minmax;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_clipmap;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_convolution_accuracy;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_flush_raster;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_offset;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_specular_lighting;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_framezoom;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_interlace;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ir_instrument1;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_list_priority;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_bits;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_reference_plane;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_resample;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow_ambient;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_sprite;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_tag_sample_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_add_env;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_coordinate_clamp;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_lod_bias;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_multi_buffer;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_range;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_scale_bias;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip_hint;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_matrix;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_table;
-GLEW_VAR_EXPORT GLboolean __GLEW_SGI_texture_color_table;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUNX_constant_data;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_convolution_border_modes;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_global_alpha;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_mesh_array;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_read_video_pixels;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_slice_accum;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_triangle_list;
-GLEW_VAR_EXPORT GLboolean __GLEW_SUN_vertex;
-GLEW_VAR_EXPORT GLboolean __GLEW_WIN_phong_shading;
-GLEW_VAR_EXPORT GLboolean __GLEW_WIN_specular_fog;
-GLEW_VAR_EXPORT GLboolean __GLEW_WIN_swap_hint;
-
-#ifdef GLEW_MX
-}; /* GLEWContextStruct */
-#endif /* GLEW_MX */
-
-/* ------------------------------------------------------------------------- */
-
-/* error codes */
-#define GLEW_OK 0
-#define GLEW_NO_ERROR 0
-#define GLEW_ERROR_NO_GL_VERSION 1  /* missing GL version */
-#define GLEW_ERROR_GL_VERSION_10_ONLY 2  /* Need at least OpenGL 1.1 */
-#define GLEW_ERROR_GLX_VERSION_11_ONLY 3  /* Need at least GLX 1.2 */
-
-/* string codes */
-#define GLEW_VERSION 1
-#define GLEW_VERSION_MAJOR 2
-#define GLEW_VERSION_MINOR 3
-#define GLEW_VERSION_MICRO 4
-
-/* API */
-#ifdef GLEW_MX
-
-typedef struct GLEWContextStruct GLEWContext;
-GLEWAPI GLenum GLEWAPIENTRY glewContextInit (GLEWContext *ctx);
-GLEWAPI GLboolean GLEWAPIENTRY glewContextIsSupported (const GLEWContext *ctx, const char *name);
-
-#define glewInit() glewContextInit(glewGetContext())
-#define glewIsSupported(x) glewContextIsSupported(glewGetContext(), x)
-#define glewIsExtensionSupported(x) glewIsSupported(x)
-
-#define GLEW_GET_VAR(x) (*(const GLboolean*)&(glewGetContext()->x))
-#ifdef _WIN32
-#  define GLEW_GET_FUN(x) glewGetContext()->x
-#else
-#  define GLEW_GET_FUN(x) x
-#endif
-
-#else /* GLEW_MX */
-
-GLEWAPI GLenum GLEWAPIENTRY glewInit (void);
-GLEWAPI GLboolean GLEWAPIENTRY glewIsSupported (const char *name);
-#define glewIsExtensionSupported(x) glewIsSupported(x)
-
-#define GLEW_GET_VAR(x) (*(const GLboolean*)&x)
-#define GLEW_GET_FUN(x) x
-
-#endif /* GLEW_MX */
-
-GLEWAPI GLboolean glewExperimental;
-GLEWAPI GLboolean GLEWAPIENTRY glewGetExtension (const char *name);
-GLEWAPI const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error);
-GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef GLEW_APIENTRY_DEFINED
-#undef GLEW_APIENTRY_DEFINED
-#undef APIENTRY
-#undef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifdef GLEW_CALLBACK_DEFINED
-#undef GLEW_CALLBACK_DEFINED
-#undef CALLBACK
-#endif
-
-#ifdef GLEW_WINGDIAPI_DEFINED
-#undef GLEW_WINGDIAPI_DEFINED
-#undef WINGDIAPI
-#endif
-
-#undef GLAPI
-/* #undef GLEWAPI */
-
-#endif /* __glew_h__ */
diff --git a/Externals/GLew/include/GL/glxew.h b/Externals/GLew/include/GL/glxew.h
deleted file mode 100644
index 0b66bde33a..0000000000
--- a/Externals/GLew/include/GL/glxew.h
+++ /dev/null
@@ -1,1637 +0,0 @@
-/*
-** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2008, 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.
-*/
-
-#ifndef __glxew_h__
-#define __glxew_h__
-#define __GLXEW_H__
-
-#ifdef __glxext_h_
-#error glxext.h included before glxew.h
-#endif
-
-#if defined(GLX_H) || defined(__GLX_glx_h__) || defined(__glx_h__)
-#error glx.h included before glxew.h
-#endif
-
-#define __glxext_h_
-
-#define GLX_H
-#define __GLX_glx_h__
-#define __glx_h__
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xmd.h>
-#include <GL/glew.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ---------------------------- GLX_VERSION_1_0 --------------------------- */
-
-#ifndef GLX_VERSION_1_0
-#define GLX_VERSION_1_0 1
-
-#define GLX_USE_GL 1
-#define GLX_BUFFER_SIZE 2
-#define GLX_LEVEL 3
-#define GLX_RGBA 4
-#define GLX_DOUBLEBUFFER 5
-#define GLX_STEREO 6
-#define GLX_AUX_BUFFERS 7
-#define GLX_RED_SIZE 8
-#define GLX_GREEN_SIZE 9
-#define GLX_BLUE_SIZE 10
-#define GLX_ALPHA_SIZE 11
-#define GLX_DEPTH_SIZE 12
-#define GLX_STENCIL_SIZE 13
-#define GLX_ACCUM_RED_SIZE 14
-#define GLX_ACCUM_GREEN_SIZE 15
-#define GLX_ACCUM_BLUE_SIZE 16
-#define GLX_ACCUM_ALPHA_SIZE 17
-#define GLX_BAD_SCREEN 1
-#define GLX_BAD_ATTRIBUTE 2
-#define GLX_NO_EXTENSION 3
-#define GLX_BAD_VISUAL 4
-#define GLX_BAD_CONTEXT 5
-#define GLX_BAD_VALUE 6
-#define GLX_BAD_ENUM 7
-
-typedef XID GLXDrawable;
-typedef XID GLXPixmap;
-#ifdef __sun
-typedef struct __glXContextRec *GLXContext;
-#else
-typedef struct __GLXcontextRec *GLXContext;
-#endif
-
-typedef unsigned int GLXVideoDeviceNV; 
-
-extern Bool glXQueryExtension (Display *dpy, int *errorBase, int *eventBase);
-extern Bool glXQueryVersion (Display *dpy, int *major, int *minor);
-extern int glXGetConfig (Display *dpy, XVisualInfo *vis, int attrib, int *value);
-extern XVisualInfo* glXChooseVisual (Display *dpy, int screen, int *attribList);
-extern GLXPixmap glXCreateGLXPixmap (Display *dpy, XVisualInfo *vis, Pixmap pixmap);
-extern void glXDestroyGLXPixmap (Display *dpy, GLXPixmap pix);
-extern GLXContext glXCreateContext (Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
-extern void glXDestroyContext (Display *dpy, GLXContext ctx);
-extern Bool glXIsDirect (Display *dpy, GLXContext ctx);
-extern void glXCopyContext (Display *dpy, GLXContext src, GLXContext dst, GLulong mask);
-extern Bool glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx);
-extern GLXContext glXGetCurrentContext (void);
-extern GLXDrawable glXGetCurrentDrawable (void);
-extern void glXWaitGL (void);
-extern void glXWaitX (void);
-extern void glXSwapBuffers (Display *dpy, GLXDrawable drawable);
-extern void glXUseXFont (Font font, int first, int count, int listBase);
-
-#define GLXEW_VERSION_1_0 GLXEW_GET_VAR(__GLXEW_VERSION_1_0)
-
-#endif /* GLX_VERSION_1_0 */
-
-/* ---------------------------- GLX_VERSION_1_1 --------------------------- */
-
-#ifndef GLX_VERSION_1_1
-#define GLX_VERSION_1_1
-
-#define GLX_VENDOR 0x1
-#define GLX_VERSION 0x2
-#define GLX_EXTENSIONS 0x3
-
-extern const char* glXQueryExtensionsString (Display *dpy, int screen);
-extern const char* glXGetClientString (Display *dpy, int name);
-extern const char* glXQueryServerString (Display *dpy, int screen, int name);
-
-#define GLXEW_VERSION_1_1 GLXEW_GET_VAR(__GLXEW_VERSION_1_1)
-
-#endif /* GLX_VERSION_1_1 */
-
-/* ---------------------------- GLX_VERSION_1_2 ---------------------------- */
-
-#ifndef GLX_VERSION_1_2
-#define GLX_VERSION_1_2 1
-
-typedef Display* ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
-
-#define glXGetCurrentDisplay GLXEW_GET_FUN(__glewXGetCurrentDisplay)
-
-#define GLXEW_VERSION_1_2 GLXEW_GET_VAR(__GLXEW_VERSION_1_2)
-
-#endif /* GLX_VERSION_1_2 */
-
-/* ---------------------------- GLX_VERSION_1_3 ---------------------------- */
-
-#ifndef GLX_VERSION_1_3
-#define GLX_VERSION_1_3 1
-
-#define GLX_RGBA_BIT 0x00000001
-#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
-#define GLX_WINDOW_BIT 0x00000001
-#define GLX_COLOR_INDEX_BIT 0x00000002
-#define GLX_PIXMAP_BIT 0x00000002
-#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
-#define GLX_PBUFFER_BIT 0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
-#define GLX_AUX_BUFFERS_BIT 0x00000010
-#define GLX_CONFIG_CAVEAT 0x20
-#define GLX_DEPTH_BUFFER_BIT 0x00000020
-#define GLX_X_VISUAL_TYPE 0x22
-#define GLX_TRANSPARENT_TYPE 0x23
-#define GLX_TRANSPARENT_INDEX_VALUE 0x24
-#define GLX_TRANSPARENT_RED_VALUE 0x25
-#define GLX_TRANSPARENT_GREEN_VALUE 0x26
-#define GLX_TRANSPARENT_BLUE_VALUE 0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
-#define GLX_STENCIL_BUFFER_BIT 0x00000040
-#define GLX_ACCUM_BUFFER_BIT 0x00000080
-#define GLX_NONE 0x8000
-#define GLX_SLOW_CONFIG 0x8001
-#define GLX_TRUE_COLOR 0x8002
-#define GLX_DIRECT_COLOR 0x8003
-#define GLX_PSEUDO_COLOR 0x8004
-#define GLX_STATIC_COLOR 0x8005
-#define GLX_GRAY_SCALE 0x8006
-#define GLX_STATIC_GRAY 0x8007
-#define GLX_TRANSPARENT_RGB 0x8008
-#define GLX_TRANSPARENT_INDEX 0x8009
-#define GLX_VISUAL_ID 0x800B
-#define GLX_SCREEN 0x800C
-#define GLX_NON_CONFORMANT_CONFIG 0x800D
-#define GLX_DRAWABLE_TYPE 0x8010
-#define GLX_RENDER_TYPE 0x8011
-#define GLX_X_RENDERABLE 0x8012
-#define GLX_FBCONFIG_ID 0x8013
-#define GLX_RGBA_TYPE 0x8014
-#define GLX_COLOR_INDEX_TYPE 0x8015
-#define GLX_MAX_PBUFFER_WIDTH 0x8016
-#define GLX_MAX_PBUFFER_HEIGHT 0x8017
-#define GLX_MAX_PBUFFER_PIXELS 0x8018
-#define GLX_PRESERVED_CONTENTS 0x801B
-#define GLX_LARGEST_PBUFFER 0x801C
-#define GLX_WIDTH 0x801D
-#define GLX_HEIGHT 0x801E
-#define GLX_EVENT_MASK 0x801F
-#define GLX_DAMAGED 0x8020
-#define GLX_SAVED 0x8021
-#define GLX_WINDOW 0x8022
-#define GLX_PBUFFER 0x8023
-#define GLX_PBUFFER_HEIGHT 0x8040
-#define GLX_PBUFFER_WIDTH 0x8041
-#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
-#define GLX_DONT_CARE 0xFFFFFFFF
-
-typedef XID GLXFBConfigID;
-typedef XID GLXPbuffer;
-typedef XID GLXWindow;
-typedef struct __GLXFBConfigRec *GLXFBConfig;
-
-typedef struct {
-  int event_type; 
-  int draw_type; 
-  unsigned long serial; 
-  Bool send_event; 
-  Display *display; 
-  GLXDrawable drawable; 
-  unsigned int buffer_mask; 
-  unsigned int aux_buffer; 
-  int x, y; 
-  int width, height; 
-  int count; 
-} GLXPbufferClobberEvent;
-typedef union __GLXEvent {
-  GLXPbufferClobberEvent glxpbufferclobber; 
-  long pad[24]; 
-} GLXEvent;
-
-typedef GLXFBConfig* ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
-typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
-typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
-typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
-typedef GLXFBConfig* ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
-typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
-typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
-typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
-typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
-
-#define glXChooseFBConfig GLXEW_GET_FUN(__glewXChooseFBConfig)
-#define glXCreateNewContext GLXEW_GET_FUN(__glewXCreateNewContext)
-#define glXCreatePbuffer GLXEW_GET_FUN(__glewXCreatePbuffer)
-#define glXCreatePixmap GLXEW_GET_FUN(__glewXCreatePixmap)
-#define glXCreateWindow GLXEW_GET_FUN(__glewXCreateWindow)
-#define glXDestroyPbuffer GLXEW_GET_FUN(__glewXDestroyPbuffer)
-#define glXDestroyPixmap GLXEW_GET_FUN(__glewXDestroyPixmap)
-#define glXDestroyWindow GLXEW_GET_FUN(__glewXDestroyWindow)
-#define glXGetCurrentReadDrawable GLXEW_GET_FUN(__glewXGetCurrentReadDrawable)
-#define glXGetFBConfigAttrib GLXEW_GET_FUN(__glewXGetFBConfigAttrib)
-#define glXGetFBConfigs GLXEW_GET_FUN(__glewXGetFBConfigs)
-#define glXGetSelectedEvent GLXEW_GET_FUN(__glewXGetSelectedEvent)
-#define glXGetVisualFromFBConfig GLXEW_GET_FUN(__glewXGetVisualFromFBConfig)
-#define glXMakeContextCurrent GLXEW_GET_FUN(__glewXMakeContextCurrent)
-#define glXQueryContext GLXEW_GET_FUN(__glewXQueryContext)
-#define glXQueryDrawable GLXEW_GET_FUN(__glewXQueryDrawable)
-#define glXSelectEvent GLXEW_GET_FUN(__glewXSelectEvent)
-
-#define GLXEW_VERSION_1_3 GLXEW_GET_VAR(__GLXEW_VERSION_1_3)
-
-#endif /* GLX_VERSION_1_3 */
-
-/* ---------------------------- GLX_VERSION_1_4 ---------------------------- */
-
-#ifndef GLX_VERSION_1_4
-#define GLX_VERSION_1_4 1
-
-#define GLX_SAMPLE_BUFFERS 100000
-#define GLX_SAMPLES 100001
-
-extern void ( * glXGetProcAddress (const GLubyte *procName)) (void);
-
-#define GLXEW_VERSION_1_4 GLXEW_GET_VAR(__GLXEW_VERSION_1_4)
-
-#endif /* GLX_VERSION_1_4 */
-
-/* -------------------------- GLX_3DFX_multisample ------------------------- */
-
-#ifndef GLX_3DFX_multisample
-#define GLX_3DFX_multisample 1
-
-#define GLX_SAMPLE_BUFFERS_3DFX 0x8050
-#define GLX_SAMPLES_3DFX 0x8051
-
-#define GLXEW_3DFX_multisample GLXEW_GET_VAR(__GLXEW_3DFX_multisample)
-
-#endif /* GLX_3DFX_multisample */
-
-/* ------------------------ GLX_AMD_gpu_association ------------------------ */
-
-#ifndef GLX_AMD_gpu_association
-#define GLX_AMD_gpu_association 1
-
-#define GLX_GPU_VENDOR_AMD 0x1F00
-#define GLX_GPU_RENDERER_STRING_AMD 0x1F01
-#define GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
-#define GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
-#define GLX_GPU_RAM_AMD 0x21A3
-#define GLX_GPU_CLOCK_AMD 0x21A4
-#define GLX_GPU_NUM_PIPES_AMD 0x21A5
-#define GLX_GPU_NUM_SIMD_AMD 0x21A6
-#define GLX_GPU_NUM_RB_AMD 0x21A7
-#define GLX_GPU_NUM_SPI_AMD 0x21A8
-
-#define GLXEW_AMD_gpu_association GLXEW_GET_VAR(__GLXEW_AMD_gpu_association)
-
-#endif /* GLX_AMD_gpu_association */
-
-/* ------------------------- GLX_ARB_create_context ------------------------ */
-
-#ifndef GLX_ARB_create_context
-#define GLX_ARB_create_context 1
-
-#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
-#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
-#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define GLX_CONTEXT_FLAGS_ARB 0x2094
-
-typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display* dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
-
-#define glXCreateContextAttribsARB GLXEW_GET_FUN(__glewXCreateContextAttribsARB)
-
-#define GLXEW_ARB_create_context GLXEW_GET_VAR(__GLXEW_ARB_create_context)
-
-#endif /* GLX_ARB_create_context */
-
-/* --------------------- GLX_ARB_create_context_profile -------------------- */
-
-#ifndef GLX_ARB_create_context_profile
-#define GLX_ARB_create_context_profile 1
-
-#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
-#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
-
-#define GLXEW_ARB_create_context_profile GLXEW_GET_VAR(__GLXEW_ARB_create_context_profile)
-
-#endif /* GLX_ARB_create_context_profile */
-
-/* ------------------- GLX_ARB_create_context_robustness ------------------- */
-
-#ifndef GLX_ARB_create_context_robustness
-#define GLX_ARB_create_context_robustness 1
-
-#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
-#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
-#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
-#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
-
-#define GLXEW_ARB_create_context_robustness GLXEW_GET_VAR(__GLXEW_ARB_create_context_robustness)
-
-#endif /* GLX_ARB_create_context_robustness */
-
-/* ------------------------- GLX_ARB_fbconfig_float ------------------------ */
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_ARB_fbconfig_float 1
-
-#define GLX_RGBA_FLOAT_BIT 0x00000004
-#define GLX_RGBA_FLOAT_TYPE 0x20B9
-
-#define GLXEW_ARB_fbconfig_float GLXEW_GET_VAR(__GLXEW_ARB_fbconfig_float)
-
-#endif /* GLX_ARB_fbconfig_float */
-
-/* ------------------------ GLX_ARB_framebuffer_sRGB ----------------------- */
-
-#ifndef GLX_ARB_framebuffer_sRGB
-#define GLX_ARB_framebuffer_sRGB 1
-
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
-
-#define GLXEW_ARB_framebuffer_sRGB GLXEW_GET_VAR(__GLXEW_ARB_framebuffer_sRGB)
-
-#endif /* GLX_ARB_framebuffer_sRGB */
-
-/* ------------------------ GLX_ARB_get_proc_address ----------------------- */
-
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-
-extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void);
-
-#define GLXEW_ARB_get_proc_address GLXEW_GET_VAR(__GLXEW_ARB_get_proc_address)
-
-#endif /* GLX_ARB_get_proc_address */
-
-/* -------------------------- GLX_ARB_multisample -------------------------- */
-
-#ifndef GLX_ARB_multisample
-#define GLX_ARB_multisample 1
-
-#define GLX_SAMPLE_BUFFERS_ARB 100000
-#define GLX_SAMPLES_ARB 100001
-
-#define GLXEW_ARB_multisample GLXEW_GET_VAR(__GLXEW_ARB_multisample)
-
-#endif /* GLX_ARB_multisample */
-
-/* ---------------- GLX_ARB_robustness_application_isolation --------------- */
-
-#ifndef GLX_ARB_robustness_application_isolation
-#define GLX_ARB_robustness_application_isolation 1
-
-#define GLX_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
-
-#define GLXEW_ARB_robustness_application_isolation GLXEW_GET_VAR(__GLXEW_ARB_robustness_application_isolation)
-
-#endif /* GLX_ARB_robustness_application_isolation */
-
-/* ---------------- GLX_ARB_robustness_share_group_isolation --------------- */
-
-#ifndef GLX_ARB_robustness_share_group_isolation
-#define GLX_ARB_robustness_share_group_isolation 1
-
-#define GLX_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
-
-#define GLXEW_ARB_robustness_share_group_isolation GLXEW_GET_VAR(__GLXEW_ARB_robustness_share_group_isolation)
-
-#endif /* GLX_ARB_robustness_share_group_isolation */
-
-/* ---------------------- GLX_ARB_vertex_buffer_object --------------------- */
-
-#ifndef GLX_ARB_vertex_buffer_object
-#define GLX_ARB_vertex_buffer_object 1
-
-#define GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB 0x2095
-
-#define GLXEW_ARB_vertex_buffer_object GLXEW_GET_VAR(__GLXEW_ARB_vertex_buffer_object)
-
-#endif /* GLX_ARB_vertex_buffer_object */
-
-/* ----------------------- GLX_ATI_pixel_format_float ---------------------- */
-
-#ifndef GLX_ATI_pixel_format_float
-#define GLX_ATI_pixel_format_float 1
-
-#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100
-
-#define GLXEW_ATI_pixel_format_float GLXEW_GET_VAR(__GLXEW_ATI_pixel_format_float)
-
-#endif /* GLX_ATI_pixel_format_float */
-
-/* ------------------------- GLX_ATI_render_texture ------------------------ */
-
-#ifndef GLX_ATI_render_texture
-#define GLX_ATI_render_texture 1
-
-#define GLX_BIND_TO_TEXTURE_RGB_ATI 0x9800
-#define GLX_BIND_TO_TEXTURE_RGBA_ATI 0x9801
-#define GLX_TEXTURE_FORMAT_ATI 0x9802
-#define GLX_TEXTURE_TARGET_ATI 0x9803
-#define GLX_MIPMAP_TEXTURE_ATI 0x9804
-#define GLX_TEXTURE_RGB_ATI 0x9805
-#define GLX_TEXTURE_RGBA_ATI 0x9806
-#define GLX_NO_TEXTURE_ATI 0x9807
-#define GLX_TEXTURE_CUBE_MAP_ATI 0x9808
-#define GLX_TEXTURE_1D_ATI 0x9809
-#define GLX_TEXTURE_2D_ATI 0x980A
-#define GLX_MIPMAP_LEVEL_ATI 0x980B
-#define GLX_CUBE_MAP_FACE_ATI 0x980C
-#define GLX_TEXTURE_CUBE_MAP_POSITIVE_X_ATI 0x980D
-#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_X_ATI 0x980E
-#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Y_ATI 0x980F
-#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Y_ATI 0x9810
-#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Z_ATI 0x9811
-#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Z_ATI 0x9812
-#define GLX_FRONT_LEFT_ATI 0x9813
-#define GLX_FRONT_RIGHT_ATI 0x9814
-#define GLX_BACK_LEFT_ATI 0x9815
-#define GLX_BACK_RIGHT_ATI 0x9816
-#define GLX_AUX0_ATI 0x9817
-#define GLX_AUX1_ATI 0x9818
-#define GLX_AUX2_ATI 0x9819
-#define GLX_AUX3_ATI 0x981A
-#define GLX_AUX4_ATI 0x981B
-#define GLX_AUX5_ATI 0x981C
-#define GLX_AUX6_ATI 0x981D
-#define GLX_AUX7_ATI 0x981E
-#define GLX_AUX8_ATI 0x981F
-#define GLX_AUX9_ATI 0x9820
-#define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821
-#define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822
-
-typedef void ( * PFNGLXBINDTEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
-typedef void ( * PFNGLXDRAWABLEATTRIBATIPROC) (Display *dpy, GLXDrawable draw, const int *attrib_list);
-typedef void ( * PFNGLXRELEASETEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
-
-#define glXBindTexImageATI GLXEW_GET_FUN(__glewXBindTexImageATI)
-#define glXDrawableAttribATI GLXEW_GET_FUN(__glewXDrawableAttribATI)
-#define glXReleaseTexImageATI GLXEW_GET_FUN(__glewXReleaseTexImageATI)
-
-#define GLXEW_ATI_render_texture GLXEW_GET_VAR(__GLXEW_ATI_render_texture)
-
-#endif /* GLX_ATI_render_texture */
-
-/* ------------------- GLX_EXT_create_context_es2_profile ------------------ */
-
-#ifndef GLX_EXT_create_context_es2_profile
-#define GLX_EXT_create_context_es2_profile 1
-
-#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
-
-#define GLXEW_EXT_create_context_es2_profile GLXEW_GET_VAR(__GLXEW_EXT_create_context_es2_profile)
-
-#endif /* GLX_EXT_create_context_es2_profile */
-
-/* ------------------- GLX_EXT_create_context_es_profile ------------------- */
-
-#ifndef GLX_EXT_create_context_es_profile
-#define GLX_EXT_create_context_es_profile 1
-
-#define GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
-
-#define GLXEW_EXT_create_context_es_profile GLXEW_GET_VAR(__GLXEW_EXT_create_context_es_profile)
-
-#endif /* GLX_EXT_create_context_es_profile */
-
-/* --------------------- GLX_EXT_fbconfig_packed_float --------------------- */
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_EXT_fbconfig_packed_float 1
-
-#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
-#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1
-
-#define GLXEW_EXT_fbconfig_packed_float GLXEW_GET_VAR(__GLXEW_EXT_fbconfig_packed_float)
-
-#endif /* GLX_EXT_fbconfig_packed_float */
-
-/* ------------------------ GLX_EXT_framebuffer_sRGB ----------------------- */
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_EXT_framebuffer_sRGB 1
-
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2
-
-#define GLXEW_EXT_framebuffer_sRGB GLXEW_GET_VAR(__GLXEW_EXT_framebuffer_sRGB)
-
-#endif /* GLX_EXT_framebuffer_sRGB */
-
-/* ------------------------- GLX_EXT_import_context ------------------------ */
-
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-
-#define GLX_SHARE_CONTEXT_EXT 0x800A
-#define GLX_VISUAL_ID_EXT 0x800B
-#define GLX_SCREEN_EXT 0x800C
-
-typedef XID GLXContextID;
-
-typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display* dpy, GLXContext context);
-typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
-typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display* dpy, GLXContextID contextID);
-typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context, int attribute,int *value);
-
-#define glXFreeContextEXT GLXEW_GET_FUN(__glewXFreeContextEXT)
-#define glXGetContextIDEXT GLXEW_GET_FUN(__glewXGetContextIDEXT)
-#define glXImportContextEXT GLXEW_GET_FUN(__glewXImportContextEXT)
-#define glXQueryContextInfoEXT GLXEW_GET_FUN(__glewXQueryContextInfoEXT)
-
-#define GLXEW_EXT_import_context GLXEW_GET_VAR(__GLXEW_EXT_import_context)
-
-#endif /* GLX_EXT_import_context */
-
-/* -------------------------- GLX_EXT_scene_marker ------------------------- */
-
-#ifndef GLX_EXT_scene_marker
-#define GLX_EXT_scene_marker 1
-
-#define GLXEW_EXT_scene_marker GLXEW_GET_VAR(__GLXEW_EXT_scene_marker)
-
-#endif /* GLX_EXT_scene_marker */
-
-/* -------------------------- GLX_EXT_swap_control ------------------------- */
-
-#ifndef GLX_EXT_swap_control
-#define GLX_EXT_swap_control 1
-
-#define GLX_SWAP_INTERVAL_EXT 0x20F1
-#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
-
-typedef void ( * PFNGLXSWAPINTERVALEXTPROC) (Display* dpy, GLXDrawable drawable, int interval);
-
-#define glXSwapIntervalEXT GLXEW_GET_FUN(__glewXSwapIntervalEXT)
-
-#define GLXEW_EXT_swap_control GLXEW_GET_VAR(__GLXEW_EXT_swap_control)
-
-#endif /* GLX_EXT_swap_control */
-
-/* ----------------------- GLX_EXT_swap_control_tear ----------------------- */
-
-#ifndef GLX_EXT_swap_control_tear
-#define GLX_EXT_swap_control_tear 1
-
-#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3
-
-#define GLXEW_EXT_swap_control_tear GLXEW_GET_VAR(__GLXEW_EXT_swap_control_tear)
-
-#endif /* GLX_EXT_swap_control_tear */
-
-/* ---------------------- GLX_EXT_texture_from_pixmap ---------------------- */
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_EXT_texture_from_pixmap 1
-
-#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
-#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
-#define GLX_Y_INVERTED_EXT 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT 0x20D5
-#define GLX_TEXTURE_TARGET_EXT 0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
-#define GLX_TEXTURE_1D_EXT 0x20DB
-#define GLX_TEXTURE_2D_EXT 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
-#define GLX_FRONT_LEFT_EXT 0x20DE
-#define GLX_FRONT_RIGHT_EXT 0x20DF
-#define GLX_BACK_LEFT_EXT 0x20E0
-#define GLX_BACK_RIGHT_EXT 0x20E1
-#define GLX_AUX0_EXT 0x20E2
-#define GLX_AUX1_EXT 0x20E3
-#define GLX_AUX2_EXT 0x20E4
-#define GLX_AUX3_EXT 0x20E5
-#define GLX_AUX4_EXT 0x20E6
-#define GLX_AUX5_EXT 0x20E7
-#define GLX_AUX6_EXT 0x20E8
-#define GLX_AUX7_EXT 0x20E9
-#define GLX_AUX8_EXT 0x20EA
-#define GLX_AUX9_EXT 0x20EB
-
-typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer, const int *attrib_list);
-typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display* display, GLXDrawable drawable, int buffer);
-
-#define glXBindTexImageEXT GLXEW_GET_FUN(__glewXBindTexImageEXT)
-#define glXReleaseTexImageEXT GLXEW_GET_FUN(__glewXReleaseTexImageEXT)
-
-#define GLXEW_EXT_texture_from_pixmap GLXEW_GET_VAR(__GLXEW_EXT_texture_from_pixmap)
-
-#endif /* GLX_EXT_texture_from_pixmap */
-
-/* -------------------------- GLX_EXT_visual_info -------------------------- */
-
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info 1
-
-#define GLX_X_VISUAL_TYPE_EXT 0x22
-#define GLX_TRANSPARENT_TYPE_EXT 0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT 0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28
-#define GLX_NONE_EXT 0x8000
-#define GLX_TRUE_COLOR_EXT 0x8002
-#define GLX_DIRECT_COLOR_EXT 0x8003
-#define GLX_PSEUDO_COLOR_EXT 0x8004
-#define GLX_STATIC_COLOR_EXT 0x8005
-#define GLX_GRAY_SCALE_EXT 0x8006
-#define GLX_STATIC_GRAY_EXT 0x8007
-#define GLX_TRANSPARENT_RGB_EXT 0x8008
-#define GLX_TRANSPARENT_INDEX_EXT 0x8009
-
-#define GLXEW_EXT_visual_info GLXEW_GET_VAR(__GLXEW_EXT_visual_info)
-
-#endif /* GLX_EXT_visual_info */
-
-/* ------------------------- GLX_EXT_visual_rating ------------------------- */
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating 1
-
-#define GLX_VISUAL_CAVEAT_EXT 0x20
-#define GLX_SLOW_VISUAL_EXT 0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D
-
-#define GLXEW_EXT_visual_rating GLXEW_GET_VAR(__GLXEW_EXT_visual_rating)
-
-#endif /* GLX_EXT_visual_rating */
-
-/* -------------------------- GLX_INTEL_swap_event ------------------------- */
-
-#ifndef GLX_INTEL_swap_event
-#define GLX_INTEL_swap_event 1
-
-#define GLX_EXCHANGE_COMPLETE_INTEL 0x8180
-#define GLX_COPY_COMPLETE_INTEL 0x8181
-#define GLX_FLIP_COMPLETE_INTEL 0x8182
-#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x04000000
-
-#define GLXEW_INTEL_swap_event GLXEW_GET_VAR(__GLXEW_INTEL_swap_event)
-
-#endif /* GLX_INTEL_swap_event */
-
-/* -------------------------- GLX_MESA_agp_offset -------------------------- */
-
-#ifndef GLX_MESA_agp_offset
-#define GLX_MESA_agp_offset 1
-
-typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void* pointer);
-
-#define glXGetAGPOffsetMESA GLXEW_GET_FUN(__glewXGetAGPOffsetMESA)
-
-#define GLXEW_MESA_agp_offset GLXEW_GET_VAR(__GLXEW_MESA_agp_offset)
-
-#endif /* GLX_MESA_agp_offset */
-
-/* ------------------------ GLX_MESA_copy_sub_buffer ----------------------- */
-
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-
-typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display* dpy, GLXDrawable drawable, int x, int y, int width, int height);
-
-#define glXCopySubBufferMESA GLXEW_GET_FUN(__glewXCopySubBufferMESA)
-
-#define GLXEW_MESA_copy_sub_buffer GLXEW_GET_VAR(__GLXEW_MESA_copy_sub_buffer)
-
-#endif /* GLX_MESA_copy_sub_buffer */
-
-/* ------------------------ GLX_MESA_pixmap_colormap ----------------------- */
-
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
-
-#define glXCreateGLXPixmapMESA GLXEW_GET_FUN(__glewXCreateGLXPixmapMESA)
-
-#define GLXEW_MESA_pixmap_colormap GLXEW_GET_VAR(__GLXEW_MESA_pixmap_colormap)
-
-#endif /* GLX_MESA_pixmap_colormap */
-
-/* ------------------------ GLX_MESA_release_buffers ----------------------- */
-
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-
-typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display* dpy, GLXDrawable d);
-
-#define glXReleaseBuffersMESA GLXEW_GET_FUN(__glewXReleaseBuffersMESA)
-
-#define GLXEW_MESA_release_buffers GLXEW_GET_VAR(__GLXEW_MESA_release_buffers)
-
-#endif /* GLX_MESA_release_buffers */
-
-/* ------------------------- GLX_MESA_set_3dfx_mode ------------------------ */
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-
-#define GLX_3DFX_WINDOW_MODE_MESA 0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2
-
-typedef GLboolean ( * PFNGLXSET3DFXMODEMESAPROC) (GLint mode);
-
-#define glXSet3DfxModeMESA GLXEW_GET_FUN(__glewXSet3DfxModeMESA)
-
-#define GLXEW_MESA_set_3dfx_mode GLXEW_GET_VAR(__GLXEW_MESA_set_3dfx_mode)
-
-#endif /* GLX_MESA_set_3dfx_mode */
-
-/* ------------------------- GLX_MESA_swap_control ------------------------- */
-
-#ifndef GLX_MESA_swap_control
-#define GLX_MESA_swap_control 1
-
-typedef int ( * PFNGLXGETSWAPINTERVALMESAPROC) (void);
-typedef int ( * PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval);
-
-#define glXGetSwapIntervalMESA GLXEW_GET_FUN(__glewXGetSwapIntervalMESA)
-#define glXSwapIntervalMESA GLXEW_GET_FUN(__glewXSwapIntervalMESA)
-
-#define GLXEW_MESA_swap_control GLXEW_GET_VAR(__GLXEW_MESA_swap_control)
-
-#endif /* GLX_MESA_swap_control */
-
-/* --------------------------- GLX_NV_copy_image --------------------------- */
-
-#ifndef GLX_NV_copy_image
-#define GLX_NV_copy_image 1
-
-typedef void ( * PFNGLXCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-
-#define glXCopyImageSubDataNV GLXEW_GET_FUN(__glewXCopyImageSubDataNV)
-
-#define GLXEW_NV_copy_image GLXEW_GET_VAR(__GLXEW_NV_copy_image)
-
-#endif /* GLX_NV_copy_image */
-
-/* -------------------------- GLX_NV_float_buffer -------------------------- */
-
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-
-#define GLX_FLOAT_COMPONENTS_NV 0x20B0
-
-#define GLXEW_NV_float_buffer GLXEW_GET_VAR(__GLXEW_NV_float_buffer)
-
-#endif /* GLX_NV_float_buffer */
-
-/* ---------------------- GLX_NV_multisample_coverage ---------------------- */
-
-#ifndef GLX_NV_multisample_coverage
-#define GLX_NV_multisample_coverage 1
-
-#define GLX_COLOR_SAMPLES_NV 0x20B3
-#define GLX_COVERAGE_SAMPLES_NV 100001
-
-#define GLXEW_NV_multisample_coverage GLXEW_GET_VAR(__GLXEW_NV_multisample_coverage)
-
-#endif /* GLX_NV_multisample_coverage */
-
-/* -------------------------- GLX_NV_present_video ------------------------- */
-
-#ifndef GLX_NV_present_video
-#define GLX_NV_present_video 1
-
-#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0
-
-typedef int ( * PFNGLXBINDVIDEODEVICENVPROC) (Display* dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list);
-typedef unsigned int* ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int screen, int *nelements);
-
-#define glXBindVideoDeviceNV GLXEW_GET_FUN(__glewXBindVideoDeviceNV)
-#define glXEnumerateVideoDevicesNV GLXEW_GET_FUN(__glewXEnumerateVideoDevicesNV)
-
-#define GLXEW_NV_present_video GLXEW_GET_VAR(__GLXEW_NV_present_video)
-
-#endif /* GLX_NV_present_video */
-
-/* --------------------------- GLX_NV_swap_group --------------------------- */
-
-#ifndef GLX_NV_swap_group
-#define GLX_NV_swap_group 1
-
-typedef Bool ( * PFNGLXBINDSWAPBARRIERNVPROC) (Display* dpy, GLuint group, GLuint barrier);
-typedef Bool ( * PFNGLXJOINSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint group);
-typedef Bool ( * PFNGLXQUERYFRAMECOUNTNVPROC) (Display* dpy, int screen, GLuint *count);
-typedef Bool ( * PFNGLXQUERYMAXSWAPGROUPSNVPROC) (Display* dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers);
-typedef Bool ( * PFNGLXQUERYSWAPGROUPNVPROC) (Display* dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier);
-typedef Bool ( * PFNGLXRESETFRAMECOUNTNVPROC) (Display* dpy, int screen);
-
-#define glXBindSwapBarrierNV GLXEW_GET_FUN(__glewXBindSwapBarrierNV)
-#define glXJoinSwapGroupNV GLXEW_GET_FUN(__glewXJoinSwapGroupNV)
-#define glXQueryFrameCountNV GLXEW_GET_FUN(__glewXQueryFrameCountNV)
-#define glXQueryMaxSwapGroupsNV GLXEW_GET_FUN(__glewXQueryMaxSwapGroupsNV)
-#define glXQuerySwapGroupNV GLXEW_GET_FUN(__glewXQuerySwapGroupNV)
-#define glXResetFrameCountNV GLXEW_GET_FUN(__glewXResetFrameCountNV)
-
-#define GLXEW_NV_swap_group GLXEW_GET_VAR(__GLXEW_NV_swap_group)
-
-#endif /* GLX_NV_swap_group */
-
-/* ----------------------- GLX_NV_vertex_array_range ----------------------- */
-
-#ifndef GLX_NV_vertex_array_range
-#define GLX_NV_vertex_array_range 1
-
-typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
-typedef void ( * PFNGLXFREEMEMORYNVPROC) (void *pointer);
-
-#define glXAllocateMemoryNV GLXEW_GET_FUN(__glewXAllocateMemoryNV)
-#define glXFreeMemoryNV GLXEW_GET_FUN(__glewXFreeMemoryNV)
-
-#define GLXEW_NV_vertex_array_range GLXEW_GET_VAR(__GLXEW_NV_vertex_array_range)
-
-#endif /* GLX_NV_vertex_array_range */
-
-/* -------------------------- GLX_NV_video_capture ------------------------- */
-
-#ifndef GLX_NV_video_capture
-#define GLX_NV_video_capture 1
-
-#define GLX_DEVICE_ID_NV 0x20CD
-#define GLX_UNIQUE_ID_NV 0x20CE
-#define GLX_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
-
-typedef XID GLXVideoCaptureDeviceNV;
-
-typedef int ( * PFNGLXBINDVIDEOCAPTUREDEVICENVPROC) (Display* dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device);
-typedef GLXVideoCaptureDeviceNV * ( * PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (Display* dpy, int screen, int *nelements);
-typedef void ( * PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
-typedef int ( * PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value);
-typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display* dpy, GLXVideoCaptureDeviceNV device);
-
-#define glXBindVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXBindVideoCaptureDeviceNV)
-#define glXEnumerateVideoCaptureDevicesNV GLXEW_GET_FUN(__glewXEnumerateVideoCaptureDevicesNV)
-#define glXLockVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXLockVideoCaptureDeviceNV)
-#define glXQueryVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXQueryVideoCaptureDeviceNV)
-#define glXReleaseVideoCaptureDeviceNV GLXEW_GET_FUN(__glewXReleaseVideoCaptureDeviceNV)
-
-#define GLXEW_NV_video_capture GLXEW_GET_VAR(__GLXEW_NV_video_capture)
-
-#endif /* GLX_NV_video_capture */
-
-/* ---------------------------- GLX_NV_video_out --------------------------- */
-
-#ifndef GLX_NV_video_out
-#define GLX_NV_video_out 1
-
-#define GLX_VIDEO_OUT_COLOR_NV 0x20C3
-#define GLX_VIDEO_OUT_ALPHA_NV 0x20C4
-#define GLX_VIDEO_OUT_DEPTH_NV 0x20C5
-#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
-#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
-#define GLX_VIDEO_OUT_FRAME_NV 0x20C8
-#define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9
-#define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA
-#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB
-#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
-
-typedef int ( * PFNGLXBINDVIDEOIMAGENVPROC) (Display* dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer);
-typedef int ( * PFNGLXGETVIDEODEVICENVPROC) (Display* dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice);
-typedef int ( * PFNGLXGETVIDEOINFONVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
-typedef int ( * PFNGLXRELEASEVIDEODEVICENVPROC) (Display* dpy, int screen, GLXVideoDeviceNV VideoDevice);
-typedef int ( * PFNGLXRELEASEVIDEOIMAGENVPROC) (Display* dpy, GLXPbuffer pbuf);
-typedef int ( * PFNGLXSENDPBUFFERTOVIDEONVPROC) (Display* dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock);
-
-#define glXBindVideoImageNV GLXEW_GET_FUN(__glewXBindVideoImageNV)
-#define glXGetVideoDeviceNV GLXEW_GET_FUN(__glewXGetVideoDeviceNV)
-#define glXGetVideoInfoNV GLXEW_GET_FUN(__glewXGetVideoInfoNV)
-#define glXReleaseVideoDeviceNV GLXEW_GET_FUN(__glewXReleaseVideoDeviceNV)
-#define glXReleaseVideoImageNV GLXEW_GET_FUN(__glewXReleaseVideoImageNV)
-#define glXSendPbufferToVideoNV GLXEW_GET_FUN(__glewXSendPbufferToVideoNV)
-
-#define GLXEW_NV_video_out GLXEW_GET_VAR(__GLXEW_NV_video_out)
-
-#endif /* GLX_NV_video_out */
-
-/* -------------------------- GLX_OML_swap_method -------------------------- */
-
-#ifndef GLX_OML_swap_method
-#define GLX_OML_swap_method 1
-
-#define GLX_SWAP_METHOD_OML 0x8060
-#define GLX_SWAP_EXCHANGE_OML 0x8061
-#define GLX_SWAP_COPY_OML 0x8062
-#define GLX_SWAP_UNDEFINED_OML 0x8063
-
-#define GLXEW_OML_swap_method GLXEW_GET_VAR(__GLXEW_OML_swap_method)
-
-#endif /* GLX_OML_swap_method */
-
-/* -------------------------- GLX_OML_sync_control ------------------------- */
-
-#ifndef GLX_OML_sync_control
-#define GLX_OML_sync_control 1
-
-typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display* dpy, GLXDrawable drawable, int32_t* numerator, int32_t* denominator);
-typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t* ust, int64_t* msc, int64_t* sbc);
-typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
-typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t* ust, int64_t* msc, int64_t* sbc);
-typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_sbc, int64_t* ust, int64_t* msc, int64_t* sbc);
-
-#define glXGetMscRateOML GLXEW_GET_FUN(__glewXGetMscRateOML)
-#define glXGetSyncValuesOML GLXEW_GET_FUN(__glewXGetSyncValuesOML)
-#define glXSwapBuffersMscOML GLXEW_GET_FUN(__glewXSwapBuffersMscOML)
-#define glXWaitForMscOML GLXEW_GET_FUN(__glewXWaitForMscOML)
-#define glXWaitForSbcOML GLXEW_GET_FUN(__glewXWaitForSbcOML)
-
-#define GLXEW_OML_sync_control GLXEW_GET_VAR(__GLXEW_OML_sync_control)
-
-#endif /* GLX_OML_sync_control */
-
-/* ------------------------ GLX_SGIS_blended_overlay ----------------------- */
-
-#ifndef GLX_SGIS_blended_overlay
-#define GLX_SGIS_blended_overlay 1
-
-#define GLX_BLENDED_RGBA_SGIS 0x8025
-
-#define GLXEW_SGIS_blended_overlay GLXEW_GET_VAR(__GLXEW_SGIS_blended_overlay)
-
-#endif /* GLX_SGIS_blended_overlay */
-
-/* -------------------------- GLX_SGIS_color_range ------------------------- */
-
-#ifndef GLX_SGIS_color_range
-#define GLX_SGIS_color_range 1
-
-#define GLX_MIN_RED_SGIS 0
-#define GLX_MAX_GREEN_SGIS 0
-#define GLX_MIN_BLUE_SGIS 0
-#define GLX_MAX_ALPHA_SGIS 0
-#define GLX_MIN_GREEN_SGIS 0
-#define GLX_MIN_ALPHA_SGIS 0
-#define GLX_MAX_RED_SGIS 0
-#define GLX_EXTENDED_RANGE_SGIS 0
-#define GLX_MAX_BLUE_SGIS 0
-
-#define GLXEW_SGIS_color_range GLXEW_GET_VAR(__GLXEW_SGIS_color_range)
-
-#endif /* GLX_SGIS_color_range */
-
-/* -------------------------- GLX_SGIS_multisample ------------------------- */
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SGIS_multisample 1
-
-#define GLX_SAMPLE_BUFFERS_SGIS 100000
-#define GLX_SAMPLES_SGIS 100001
-
-#define GLXEW_SGIS_multisample GLXEW_GET_VAR(__GLXEW_SGIS_multisample)
-
-#endif /* GLX_SGIS_multisample */
-
-/* ---------------------- GLX_SGIS_shared_multisample ---------------------- */
-
-#ifndef GLX_SGIS_shared_multisample
-#define GLX_SGIS_shared_multisample 1
-
-#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
-
-#define GLXEW_SGIS_shared_multisample GLXEW_GET_VAR(__GLXEW_SGIS_shared_multisample)
-
-#endif /* GLX_SGIS_shared_multisample */
-
-/* --------------------------- GLX_SGIX_fbconfig --------------------------- */
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_SGIX_fbconfig 1
-
-#define GLX_WINDOW_BIT_SGIX 0x00000001
-#define GLX_RGBA_BIT_SGIX 0x00000001
-#define GLX_PIXMAP_BIT_SGIX 0x00000002
-#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002
-#define GLX_SCREEN_EXT 0x800C
-#define GLX_DRAWABLE_TYPE_SGIX 0x8010
-#define GLX_RENDER_TYPE_SGIX 0x8011
-#define GLX_X_RENDERABLE_SGIX 0x8012
-#define GLX_FBCONFIG_ID_SGIX 0x8013
-#define GLX_RGBA_TYPE_SGIX 0x8014
-#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015
-
-typedef XID GLXFBConfigIDSGIX;
-typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
-
-typedef GLXFBConfigSGIX* ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, Pixmap pixmap);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int attribute, int *value);
-typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display* dpy, XVisualInfo *vis);
-typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfig config);
-
-#define glXChooseFBConfigSGIX GLXEW_GET_FUN(__glewXChooseFBConfigSGIX)
-#define glXCreateContextWithConfigSGIX GLXEW_GET_FUN(__glewXCreateContextWithConfigSGIX)
-#define glXCreateGLXPixmapWithConfigSGIX GLXEW_GET_FUN(__glewXCreateGLXPixmapWithConfigSGIX)
-#define glXGetFBConfigAttribSGIX GLXEW_GET_FUN(__glewXGetFBConfigAttribSGIX)
-#define glXGetFBConfigFromVisualSGIX GLXEW_GET_FUN(__glewXGetFBConfigFromVisualSGIX)
-#define glXGetVisualFromFBConfigSGIX GLXEW_GET_FUN(__glewXGetVisualFromFBConfigSGIX)
-
-#define GLXEW_SGIX_fbconfig GLXEW_GET_VAR(__GLXEW_SGIX_fbconfig)
-
-#endif /* GLX_SGIX_fbconfig */
-
-/* --------------------------- GLX_SGIX_hyperpipe -------------------------- */
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_SGIX_hyperpipe 1
-
-#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX 0x00000001
-#define GLX_PIPE_RECT_SGIX 0x00000001
-#define GLX_PIPE_RECT_LIMITS_SGIX 0x00000002
-#define GLX_HYPERPIPE_RENDER_PIPE_SGIX 0x00000002
-#define GLX_HYPERPIPE_STEREO_SGIX 0x00000003
-#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX 0x00000004
-#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
-#define GLX_BAD_HYPERPIPE_CONFIG_SGIX 91
-#define GLX_BAD_HYPERPIPE_SGIX 92
-#define GLX_HYPERPIPE_ID_SGIX 0x8030
-
-typedef struct {
-  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
-  int  networkId; 
-} GLXHyperpipeNetworkSGIX;
-typedef struct {
-  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
-  int XOrigin; 
-  int YOrigin; 
-  int maxHeight; 
-  int maxWidth; 
-} GLXPipeRectLimits;
-typedef struct {
-  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
-  int channel; 
-  unsigned int participationType; 
-  int timeSlice; 
-} GLXHyperpipeConfigSGIX;
-typedef struct {
-  char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX]; 
-  int srcXOrigin; 
-  int srcYOrigin; 
-  int srcWidth; 
-  int srcHeight; 
-  int destXOrigin; 
-  int destYOrigin; 
-  int destWidth; 
-  int destHeight; 
-} GLXPipeRect;
-
-typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
-typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
-typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
-typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
-typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
-typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
-
-#define glXBindHyperpipeSGIX GLXEW_GET_FUN(__glewXBindHyperpipeSGIX)
-#define glXDestroyHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXDestroyHyperpipeConfigSGIX)
-#define glXHyperpipeAttribSGIX GLXEW_GET_FUN(__glewXHyperpipeAttribSGIX)
-#define glXHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXHyperpipeConfigSGIX)
-#define glXQueryHyperpipeAttribSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeAttribSGIX)
-#define glXQueryHyperpipeBestAttribSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeBestAttribSGIX)
-#define glXQueryHyperpipeConfigSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeConfigSGIX)
-#define glXQueryHyperpipeNetworkSGIX GLXEW_GET_FUN(__glewXQueryHyperpipeNetworkSGIX)
-
-#define GLXEW_SGIX_hyperpipe GLXEW_GET_VAR(__GLXEW_SGIX_hyperpipe)
-
-#endif /* GLX_SGIX_hyperpipe */
-
-/* ---------------------------- GLX_SGIX_pbuffer --------------------------- */
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_SGIX_pbuffer 1
-
-#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX 0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX 0x00000002
-#define GLX_PBUFFER_BIT_SGIX 0x00000004
-#define GLX_BACK_LEFT_BUFFER_BIT_SGIX 0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX 0x00000008
-#define GLX_AUX_BUFFERS_BIT_SGIX 0x00000010
-#define GLX_DEPTH_BUFFER_BIT_SGIX 0x00000020
-#define GLX_STENCIL_BUFFER_BIT_SGIX 0x00000040
-#define GLX_ACCUM_BUFFER_BIT_SGIX 0x00000080
-#define GLX_SAMPLE_BUFFERS_BIT_SGIX 0x00000100
-#define GLX_MAX_PBUFFER_WIDTH_SGIX 0x8016
-#define GLX_MAX_PBUFFER_HEIGHT_SGIX 0x8017
-#define GLX_MAX_PBUFFER_PIXELS_SGIX 0x8018
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A
-#define GLX_PRESERVED_CONTENTS_SGIX 0x801B
-#define GLX_LARGEST_PBUFFER_SGIX 0x801C
-#define GLX_WIDTH_SGIX 0x801D
-#define GLX_HEIGHT_SGIX 0x801E
-#define GLX_EVENT_MASK_SGIX 0x801F
-#define GLX_DAMAGED_SGIX 0x8020
-#define GLX_SAVED_SGIX 0x8021
-#define GLX_WINDOW_SGIX 0x8022
-#define GLX_PBUFFER_SGIX 0x8023
-#define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000
-
-typedef XID GLXPbufferSGIX;
-typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX;
-
-typedef GLXPbuffer ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display* dpy, GLXFBConfig config, unsigned int width, unsigned int height, int *attrib_list);
-typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long *mask);
-typedef void ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long mask);
-
-#define glXCreateGLXPbufferSGIX GLXEW_GET_FUN(__glewXCreateGLXPbufferSGIX)
-#define glXDestroyGLXPbufferSGIX GLXEW_GET_FUN(__glewXDestroyGLXPbufferSGIX)
-#define glXGetSelectedEventSGIX GLXEW_GET_FUN(__glewXGetSelectedEventSGIX)
-#define glXQueryGLXPbufferSGIX GLXEW_GET_FUN(__glewXQueryGLXPbufferSGIX)
-#define glXSelectEventSGIX GLXEW_GET_FUN(__glewXSelectEventSGIX)
-
-#define GLXEW_SGIX_pbuffer GLXEW_GET_VAR(__GLXEW_SGIX_pbuffer)
-
-#endif /* GLX_SGIX_pbuffer */
-
-/* ------------------------- GLX_SGIX_swap_barrier ------------------------- */
-
-#ifndef GLX_SGIX_swap_barrier
-#define GLX_SGIX_swap_barrier 1
-
-typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
-typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
-
-#define glXBindSwapBarrierSGIX GLXEW_GET_FUN(__glewXBindSwapBarrierSGIX)
-#define glXQueryMaxSwapBarriersSGIX GLXEW_GET_FUN(__glewXQueryMaxSwapBarriersSGIX)
-
-#define GLXEW_SGIX_swap_barrier GLXEW_GET_VAR(__GLXEW_SGIX_swap_barrier)
-
-#endif /* GLX_SGIX_swap_barrier */
-
-/* -------------------------- GLX_SGIX_swap_group -------------------------- */
-
-#ifndef GLX_SGIX_swap_group
-#define GLX_SGIX_swap_group 1
-
-typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
-
-#define glXJoinSwapGroupSGIX GLXEW_GET_FUN(__glewXJoinSwapGroupSGIX)
-
-#define GLXEW_SGIX_swap_group GLXEW_GET_VAR(__GLXEW_SGIX_swap_group)
-
-#endif /* GLX_SGIX_swap_group */
-
-/* ------------------------- GLX_SGIX_video_resize ------------------------- */
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SGIX_video_resize 1
-
-#define GLX_SYNC_FRAME_SGIX 0x00000000
-#define GLX_SYNC_SWAP_SGIX 0x00000001
-
-typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display* display, int screen, int channel, Window window);
-typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int x, int y, int w, int h);
-typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display* display, int screen, int channel, GLenum synctype);
-typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display* display, int screen, int channel, int *x, int *y, int *w, int *h);
-typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
-
-#define glXBindChannelToWindowSGIX GLXEW_GET_FUN(__glewXBindChannelToWindowSGIX)
-#define glXChannelRectSGIX GLXEW_GET_FUN(__glewXChannelRectSGIX)
-#define glXChannelRectSyncSGIX GLXEW_GET_FUN(__glewXChannelRectSyncSGIX)
-#define glXQueryChannelDeltasSGIX GLXEW_GET_FUN(__glewXQueryChannelDeltasSGIX)
-#define glXQueryChannelRectSGIX GLXEW_GET_FUN(__glewXQueryChannelRectSGIX)
-
-#define GLXEW_SGIX_video_resize GLXEW_GET_VAR(__GLXEW_SGIX_video_resize)
-
-#endif /* GLX_SGIX_video_resize */
-
-/* ---------------------- GLX_SGIX_visual_select_group --------------------- */
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_SGIX_visual_select_group 1
-
-#define GLX_VISUAL_SELECT_GROUP_SGIX 0x8028
-
-#define GLXEW_SGIX_visual_select_group GLXEW_GET_VAR(__GLXEW_SGIX_visual_select_group)
-
-#endif /* GLX_SGIX_visual_select_group */
-
-/* ---------------------------- GLX_SGI_cushion ---------------------------- */
-
-#ifndef GLX_SGI_cushion
-#define GLX_SGI_cushion 1
-
-typedef void ( * PFNGLXCUSHIONSGIPROC) (Display* dpy, Window window, float cushion);
-
-#define glXCushionSGI GLXEW_GET_FUN(__glewXCushionSGI)
-
-#define GLXEW_SGI_cushion GLXEW_GET_VAR(__GLXEW_SGI_cushion)
-
-#endif /* GLX_SGI_cushion */
-
-/* ----------------------- GLX_SGI_make_current_read ----------------------- */
-
-#ifndef GLX_SGI_make_current_read
-#define GLX_SGI_make_current_read 1
-
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
-typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display* dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-
-#define glXGetCurrentReadDrawableSGI GLXEW_GET_FUN(__glewXGetCurrentReadDrawableSGI)
-#define glXMakeCurrentReadSGI GLXEW_GET_FUN(__glewXMakeCurrentReadSGI)
-
-#define GLXEW_SGI_make_current_read GLXEW_GET_VAR(__GLXEW_SGI_make_current_read)
-
-#endif /* GLX_SGI_make_current_read */
-
-/* -------------------------- GLX_SGI_swap_control ------------------------- */
-
-#ifndef GLX_SGI_swap_control
-#define GLX_SGI_swap_control 1
-
-typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-
-#define glXSwapIntervalSGI GLXEW_GET_FUN(__glewXSwapIntervalSGI)
-
-#define GLXEW_SGI_swap_control GLXEW_GET_VAR(__GLXEW_SGI_swap_control)
-
-#endif /* GLX_SGI_swap_control */
-
-/* --------------------------- GLX_SGI_video_sync -------------------------- */
-
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-
-typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int* count);
-typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int* count);
-
-#define glXGetVideoSyncSGI GLXEW_GET_FUN(__glewXGetVideoSyncSGI)
-#define glXWaitVideoSyncSGI GLXEW_GET_FUN(__glewXWaitVideoSyncSGI)
-
-#define GLXEW_SGI_video_sync GLXEW_GET_VAR(__GLXEW_SGI_video_sync)
-
-#endif /* GLX_SGI_video_sync */
-
-/* --------------------- GLX_SUN_get_transparent_index --------------------- */
-
-#ifndef GLX_SUN_get_transparent_index
-#define GLX_SUN_get_transparent_index 1
-
-typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display* dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex);
-
-#define glXGetTransparentIndexSUN GLXEW_GET_FUN(__glewXGetTransparentIndexSUN)
-
-#define GLXEW_SUN_get_transparent_index GLXEW_GET_VAR(__GLXEW_SUN_get_transparent_index)
-
-#endif /* GLX_SUN_get_transparent_index */
-
-/* -------------------------- GLX_SUN_video_resize ------------------------- */
-
-#ifndef GLX_SUN_video_resize
-#define GLX_SUN_video_resize 1
-
-#define GLX_VIDEO_RESIZE_SUN 0x8171
-#define GL_VIDEO_RESIZE_COMPENSATION_SUN 0x85CD
-
-typedef int ( * PFNGLXGETVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float* factor);
-typedef int ( * PFNGLXVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float factor);
-
-#define glXGetVideoResizeSUN GLXEW_GET_FUN(__glewXGetVideoResizeSUN)
-#define glXVideoResizeSUN GLXEW_GET_FUN(__glewXVideoResizeSUN)
-
-#define GLXEW_SUN_video_resize GLXEW_GET_VAR(__GLXEW_SUN_video_resize)
-
-#endif /* GLX_SUN_video_resize */
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef GLEW_MX
-#define GLXEW_FUN_EXPORT
-#define GLXEW_VAR_EXPORT
-#else
-#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
-#define GLXEW_VAR_EXPORT GLEW_VAR_EXPORT
-#endif /* GLEW_MX */
-
-GLXEW_FUN_EXPORT PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
-
-GLXEW_FUN_EXPORT PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig;
-GLXEW_FUN_EXPORT PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext;
-GLXEW_FUN_EXPORT PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer;
-GLXEW_FUN_EXPORT PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap;
-GLXEW_FUN_EXPORT PFNGLXCREATEWINDOWPROC __glewXCreateWindow;
-GLXEW_FUN_EXPORT PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer;
-GLXEW_FUN_EXPORT PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap;
-GLXEW_FUN_EXPORT PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow;
-GLXEW_FUN_EXPORT PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable;
-GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib;
-GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs;
-GLXEW_FUN_EXPORT PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent;
-GLXEW_FUN_EXPORT PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig;
-GLXEW_FUN_EXPORT PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent;
-GLXEW_FUN_EXPORT PFNGLXQUERYCONTEXTPROC __glewXQueryContext;
-GLXEW_FUN_EXPORT PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable;
-GLXEW_FUN_EXPORT PFNGLXSELECTEVENTPROC __glewXSelectEvent;
-
-GLXEW_FUN_EXPORT PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB;
-
-GLXEW_FUN_EXPORT PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI;
-GLXEW_FUN_EXPORT PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI;
-GLXEW_FUN_EXPORT PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI;
-
-GLXEW_FUN_EXPORT PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT;
-GLXEW_FUN_EXPORT PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT;
-GLXEW_FUN_EXPORT PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT;
-GLXEW_FUN_EXPORT PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT;
-
-GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALEXTPROC __glewXSwapIntervalEXT;
-
-GLXEW_FUN_EXPORT PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT;
-GLXEW_FUN_EXPORT PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT;
-
-GLXEW_FUN_EXPORT PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA;
-
-GLXEW_FUN_EXPORT PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA;
-
-GLXEW_FUN_EXPORT PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA;
-
-GLXEW_FUN_EXPORT PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA;
-
-GLXEW_FUN_EXPORT PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA;
-
-GLXEW_FUN_EXPORT PFNGLXGETSWAPINTERVALMESAPROC __glewXGetSwapIntervalMESA;
-GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALMESAPROC __glewXSwapIntervalMESA;
-
-GLXEW_FUN_EXPORT PFNGLXCOPYIMAGESUBDATANVPROC __glewXCopyImageSubDataNV;
-
-GLXEW_FUN_EXPORT PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV;
-
-GLXEW_FUN_EXPORT PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV;
-GLXEW_FUN_EXPORT PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV;
-GLXEW_FUN_EXPORT PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV;
-GLXEW_FUN_EXPORT PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV;
-GLXEW_FUN_EXPORT PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV;
-GLXEW_FUN_EXPORT PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV;
-
-GLXEW_FUN_EXPORT PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV;
-GLXEW_FUN_EXPORT PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV;
-
-GLXEW_FUN_EXPORT PFNGLXBINDVIDEOCAPTUREDEVICENVPROC __glewXBindVideoCaptureDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC __glewXEnumerateVideoCaptureDevicesNV;
-GLXEW_FUN_EXPORT PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC __glewXLockVideoCaptureDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC __glewXQueryVideoCaptureDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC __glewXReleaseVideoCaptureDeviceNV;
-
-GLXEW_FUN_EXPORT PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV;
-GLXEW_FUN_EXPORT PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV;
-GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV;
-GLXEW_FUN_EXPORT PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV;
-GLXEW_FUN_EXPORT PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV;
-
-GLXEW_FUN_EXPORT PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML;
-GLXEW_FUN_EXPORT PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML;
-GLXEW_FUN_EXPORT PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML;
-GLXEW_FUN_EXPORT PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML;
-GLXEW_FUN_EXPORT PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML;
-
-GLXEW_FUN_EXPORT PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX;
-GLXEW_FUN_EXPORT PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX;
-GLXEW_FUN_EXPORT PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX;
-GLXEW_FUN_EXPORT PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX;
-GLXEW_FUN_EXPORT PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX;
-GLXEW_FUN_EXPORT PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX;
-GLXEW_FUN_EXPORT PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX;
-GLXEW_FUN_EXPORT PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX;
-GLXEW_FUN_EXPORT PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX;
-GLXEW_FUN_EXPORT PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX;
-GLXEW_FUN_EXPORT PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX;
-
-GLXEW_FUN_EXPORT PFNGLXCUSHIONSGIPROC __glewXCushionSGI;
-
-GLXEW_FUN_EXPORT PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI;
-GLXEW_FUN_EXPORT PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI;
-
-GLXEW_FUN_EXPORT PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI;
-
-GLXEW_FUN_EXPORT PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI;
-GLXEW_FUN_EXPORT PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI;
-
-GLXEW_FUN_EXPORT PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
-
-GLXEW_FUN_EXPORT PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
-GLXEW_FUN_EXPORT PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
-
-#if defined(GLEW_MX)
-struct GLXEWContextStruct
-{
-#endif /* GLEW_MX */
-
-GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_0;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_1;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_2;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_3;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_VERSION_1_4;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_3DFX_multisample;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_AMD_gpu_association;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_profile;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_create_context_robustness;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_fbconfig_float;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_framebuffer_sRGB;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_get_proc_address;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_multisample;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_robustness_application_isolation;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_robustness_share_group_isolation;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ARB_vertex_buffer_object;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_pixel_format_float;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_ATI_render_texture;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es2_profile;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_create_context_es_profile;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_fbconfig_packed_float;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_framebuffer_sRGB;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_import_context;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_scene_marker;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_swap_control;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_swap_control_tear;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_texture_from_pixmap;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_visual_info;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_EXT_visual_rating;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_INTEL_swap_event;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_agp_offset;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_copy_sub_buffer;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_pixmap_colormap;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_release_buffers;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_set_3dfx_mode;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_MESA_swap_control;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_copy_image;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_float_buffer;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_multisample_coverage;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_present_video;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_swap_group;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_vertex_array_range;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_video_capture;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_NV_video_out;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_OML_swap_method;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_OML_sync_control;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_blended_overlay;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_color_range;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_multisample;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIS_shared_multisample;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_fbconfig;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_hyperpipe;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_pbuffer;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_swap_barrier;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_swap_group;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_video_resize;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGIX_visual_select_group;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_cushion;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_make_current_read;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_swap_control;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SGI_video_sync;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_get_transparent_index;
-GLXEW_VAR_EXPORT GLboolean __GLXEW_SUN_video_resize;
-
-#ifdef GLEW_MX
-}; /* GLXEWContextStruct */
-#endif /* GLEW_MX */
-
-/* ------------------------------------------------------------------------ */
-
-#ifdef GLEW_MX
-
-typedef struct GLXEWContextStruct GLXEWContext;
-GLEWAPI GLenum GLEWAPIENTRY glxewContextInit (GLXEWContext *ctx);
-GLEWAPI GLboolean GLEWAPIENTRY glxewContextIsSupported (const GLXEWContext *ctx, const char *name);
-
-#define glxewInit() glxewContextInit(glxewGetContext())
-#define glxewIsSupported(x) glxewContextIsSupported(glxewGetContext(), x)
-
-#define GLXEW_GET_VAR(x) (*(const GLboolean*)&(glxewGetContext()->x))
-#define GLXEW_GET_FUN(x) x
-
-#else /* GLEW_MX */
-
-#define GLXEW_GET_VAR(x) (*(const GLboolean*)&x)
-#define GLXEW_GET_FUN(x) x
-
-GLEWAPI GLboolean GLEWAPIENTRY glxewIsSupported (const char *name);
-
-#endif /* GLEW_MX */
-
-GLEWAPI GLboolean GLEWAPIENTRY glxewGetExtension (const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glxew_h__ */
diff --git a/Externals/GLew/include/GL/wglew.h b/Externals/GLew/include/GL/wglew.h
deleted file mode 100644
index 6dc08cdeee..0000000000
--- a/Externals/GLew/include/GL/wglew.h
+++ /dev/null
@@ -1,1397 +0,0 @@
-/*
-** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2008, 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.
-*/
-
-/*
-** 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.
-*/
-
-#ifndef __wglew_h__
-#define __wglew_h__
-#define __WGLEW_H__
-
-#ifdef __wglext_h_
-#error wglext.h included before wglew.h
-#endif
-
-#define __wglext_h_
-
-#if !defined(WINAPI)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN 1
-#  endif
-#include <windows.h>
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-/*
- * GLEW_STATIC needs to be set when using the static version.
- * GLEW_BUILD is set when building the DLL version.
- */
-#ifdef GLEW_STATIC
-#  define GLEWAPI extern
-#else
-#  ifdef GLEW_BUILD
-#    define GLEWAPI extern __declspec(dllexport)
-#  else
-#    define GLEWAPI extern __declspec(dllimport)
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* -------------------------- WGL_3DFX_multisample ------------------------- */
-
-#ifndef WGL_3DFX_multisample
-#define WGL_3DFX_multisample 1
-
-#define WGL_SAMPLE_BUFFERS_3DFX 0x2060
-#define WGL_SAMPLES_3DFX 0x2061
-
-#define WGLEW_3DFX_multisample WGLEW_GET_VAR(__WGLEW_3DFX_multisample)
-
-#endif /* WGL_3DFX_multisample */
-
-/* ------------------------- WGL_3DL_stereo_control ------------------------ */
-
-#ifndef WGL_3DL_stereo_control
-#define WGL_3DL_stereo_control 1
-
-#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055
-#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
-#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
-#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
-
-typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
-
-#define wglSetStereoEmitterState3DL WGLEW_GET_FUN(__wglewSetStereoEmitterState3DL)
-
-#define WGLEW_3DL_stereo_control WGLEW_GET_VAR(__WGLEW_3DL_stereo_control)
-
-#endif /* WGL_3DL_stereo_control */
-
-/* ------------------------ WGL_AMD_gpu_association ------------------------ */
-
-#ifndef WGL_AMD_gpu_association
-#define WGL_AMD_gpu_association 1
-
-#define WGL_GPU_VENDOR_AMD 0x1F00
-#define WGL_GPU_RENDERER_STRING_AMD 0x1F01
-#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
-#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
-#define WGL_GPU_RAM_AMD 0x21A3
-#define WGL_GPU_CLOCK_AMD 0x21A4
-#define WGL_GPU_NUM_PIPES_AMD 0x21A5
-#define WGL_GPU_NUM_SIMD_AMD 0x21A6
-#define WGL_GPU_NUM_RB_AMD 0x21A7
-#define WGL_GPU_NUM_SPI_AMD 0x21A8
-
-typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id);
-typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int* attribList);
-typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc);
-typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc);
-typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
-typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT* ids);
-typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void* data);
-typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc);
-
-#define wglBlitContextFramebufferAMD WGLEW_GET_FUN(__wglewBlitContextFramebufferAMD)
-#define wglCreateAssociatedContextAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAMD)
-#define wglCreateAssociatedContextAttribsAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAttribsAMD)
-#define wglDeleteAssociatedContextAMD WGLEW_GET_FUN(__wglewDeleteAssociatedContextAMD)
-#define wglGetContextGPUIDAMD WGLEW_GET_FUN(__wglewGetContextGPUIDAMD)
-#define wglGetCurrentAssociatedContextAMD WGLEW_GET_FUN(__wglewGetCurrentAssociatedContextAMD)
-#define wglGetGPUIDsAMD WGLEW_GET_FUN(__wglewGetGPUIDsAMD)
-#define wglGetGPUInfoAMD WGLEW_GET_FUN(__wglewGetGPUInfoAMD)
-#define wglMakeAssociatedContextCurrentAMD WGLEW_GET_FUN(__wglewMakeAssociatedContextCurrentAMD)
-
-#define WGLEW_AMD_gpu_association WGLEW_GET_VAR(__WGLEW_AMD_gpu_association)
-
-#endif /* WGL_AMD_gpu_association */
-
-/* ------------------------- WGL_ARB_buffer_region ------------------------- */
-
-#ifndef WGL_ARB_buffer_region
-#define WGL_ARB_buffer_region 1
-
-#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
-#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002
-#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004
-#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008
-
-typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
-typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
-typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
-typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
-
-#define wglCreateBufferRegionARB WGLEW_GET_FUN(__wglewCreateBufferRegionARB)
-#define wglDeleteBufferRegionARB WGLEW_GET_FUN(__wglewDeleteBufferRegionARB)
-#define wglRestoreBufferRegionARB WGLEW_GET_FUN(__wglewRestoreBufferRegionARB)
-#define wglSaveBufferRegionARB WGLEW_GET_FUN(__wglewSaveBufferRegionARB)
-
-#define WGLEW_ARB_buffer_region WGLEW_GET_VAR(__WGLEW_ARB_buffer_region)
-
-#endif /* WGL_ARB_buffer_region */
-
-/* ------------------------- WGL_ARB_create_context ------------------------ */
-
-#ifndef WGL_ARB_create_context
-#define WGL_ARB_create_context 1
-
-#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
-#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
-#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
-#define WGL_CONTEXT_FLAGS_ARB 0x2094
-#define ERROR_INVALID_VERSION_ARB 0x2095
-#define ERROR_INVALID_PROFILE_ARB 0x2096
-
-typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList);
-
-#define wglCreateContextAttribsARB WGLEW_GET_FUN(__wglewCreateContextAttribsARB)
-
-#define WGLEW_ARB_create_context WGLEW_GET_VAR(__WGLEW_ARB_create_context)
-
-#endif /* WGL_ARB_create_context */
-
-/* --------------------- WGL_ARB_create_context_profile -------------------- */
-
-#ifndef WGL_ARB_create_context_profile
-#define WGL_ARB_create_context_profile 1
-
-#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
-#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
-
-#define WGLEW_ARB_create_context_profile WGLEW_GET_VAR(__WGLEW_ARB_create_context_profile)
-
-#endif /* WGL_ARB_create_context_profile */
-
-/* ------------------- WGL_ARB_create_context_robustness ------------------- */
-
-#ifndef WGL_ARB_create_context_robustness
-#define WGL_ARB_create_context_robustness 1
-
-#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
-#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
-#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
-#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261
-
-#define WGLEW_ARB_create_context_robustness WGLEW_GET_VAR(__WGLEW_ARB_create_context_robustness)
-
-#endif /* WGL_ARB_create_context_robustness */
-
-/* ----------------------- WGL_ARB_extensions_string ----------------------- */
-
-#ifndef WGL_ARB_extensions_string
-#define WGL_ARB_extensions_string 1
-
-typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
-
-#define wglGetExtensionsStringARB WGLEW_GET_FUN(__wglewGetExtensionsStringARB)
-
-#define WGLEW_ARB_extensions_string WGLEW_GET_VAR(__WGLEW_ARB_extensions_string)
-
-#endif /* WGL_ARB_extensions_string */
-
-/* ------------------------ WGL_ARB_framebuffer_sRGB ----------------------- */
-
-#ifndef WGL_ARB_framebuffer_sRGB
-#define WGL_ARB_framebuffer_sRGB 1
-
-#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
-
-#define WGLEW_ARB_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_ARB_framebuffer_sRGB)
-
-#endif /* WGL_ARB_framebuffer_sRGB */
-
-/* ----------------------- WGL_ARB_make_current_read ----------------------- */
-
-#ifndef WGL_ARB_make_current_read
-#define WGL_ARB_make_current_read 1
-
-#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
-#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
-
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID);
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-
-#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB)
-#define wglMakeContextCurrentARB WGLEW_GET_FUN(__wglewMakeContextCurrentARB)
-
-#define WGLEW_ARB_make_current_read WGLEW_GET_VAR(__WGLEW_ARB_make_current_read)
-
-#endif /* WGL_ARB_make_current_read */
-
-/* -------------------------- WGL_ARB_multisample -------------------------- */
-
-#ifndef WGL_ARB_multisample
-#define WGL_ARB_multisample 1
-
-#define WGL_SAMPLE_BUFFERS_ARB 0x2041
-#define WGL_SAMPLES_ARB 0x2042
-
-#define WGLEW_ARB_multisample WGLEW_GET_VAR(__WGLEW_ARB_multisample)
-
-#endif /* WGL_ARB_multisample */
-
-/* ---------------------------- WGL_ARB_pbuffer ---------------------------- */
-
-#ifndef WGL_ARB_pbuffer
-#define WGL_ARB_pbuffer 1
-
-#define WGL_DRAW_TO_PBUFFER_ARB 0x202D
-#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E
-#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030
-#define WGL_PBUFFER_LARGEST_ARB 0x2033
-#define WGL_PBUFFER_WIDTH_ARB 0x2034
-#define WGL_PBUFFER_HEIGHT_ARB 0x2035
-#define WGL_PBUFFER_LOST_ARB 0x2036
-
-DECLARE_HANDLE(HPBUFFERARB);
-
-typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int* piValue);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
-
-#define wglCreatePbufferARB WGLEW_GET_FUN(__wglewCreatePbufferARB)
-#define wglDestroyPbufferARB WGLEW_GET_FUN(__wglewDestroyPbufferARB)
-#define wglGetPbufferDCARB WGLEW_GET_FUN(__wglewGetPbufferDCARB)
-#define wglQueryPbufferARB WGLEW_GET_FUN(__wglewQueryPbufferARB)
-#define wglReleasePbufferDCARB WGLEW_GET_FUN(__wglewReleasePbufferDCARB)
-
-#define WGLEW_ARB_pbuffer WGLEW_GET_VAR(__WGLEW_ARB_pbuffer)
-
-#endif /* WGL_ARB_pbuffer */
-
-/* -------------------------- WGL_ARB_pixel_format ------------------------- */
-
-#ifndef WGL_ARB_pixel_format
-#define WGL_ARB_pixel_format 1
-
-#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000
-#define WGL_DRAW_TO_WINDOW_ARB 0x2001
-#define WGL_DRAW_TO_BITMAP_ARB 0x2002
-#define WGL_ACCELERATION_ARB 0x2003
-#define WGL_NEED_PALETTE_ARB 0x2004
-#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005
-#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006
-#define WGL_SWAP_METHOD_ARB 0x2007
-#define WGL_NUMBER_OVERLAYS_ARB 0x2008
-#define WGL_NUMBER_UNDERLAYS_ARB 0x2009
-#define WGL_TRANSPARENT_ARB 0x200A
-#define WGL_SHARE_DEPTH_ARB 0x200C
-#define WGL_SHARE_STENCIL_ARB 0x200D
-#define WGL_SHARE_ACCUM_ARB 0x200E
-#define WGL_SUPPORT_GDI_ARB 0x200F
-#define WGL_SUPPORT_OPENGL_ARB 0x2010
-#define WGL_DOUBLE_BUFFER_ARB 0x2011
-#define WGL_STEREO_ARB 0x2012
-#define WGL_PIXEL_TYPE_ARB 0x2013
-#define WGL_COLOR_BITS_ARB 0x2014
-#define WGL_RED_BITS_ARB 0x2015
-#define WGL_RED_SHIFT_ARB 0x2016
-#define WGL_GREEN_BITS_ARB 0x2017
-#define WGL_GREEN_SHIFT_ARB 0x2018
-#define WGL_BLUE_BITS_ARB 0x2019
-#define WGL_BLUE_SHIFT_ARB 0x201A
-#define WGL_ALPHA_BITS_ARB 0x201B
-#define WGL_ALPHA_SHIFT_ARB 0x201C
-#define WGL_ACCUM_BITS_ARB 0x201D
-#define WGL_ACCUM_RED_BITS_ARB 0x201E
-#define WGL_ACCUM_GREEN_BITS_ARB 0x201F
-#define WGL_ACCUM_BLUE_BITS_ARB 0x2020
-#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021
-#define WGL_DEPTH_BITS_ARB 0x2022
-#define WGL_STENCIL_BITS_ARB 0x2023
-#define WGL_AUX_BUFFERS_ARB 0x2024
-#define WGL_NO_ACCELERATION_ARB 0x2025
-#define WGL_GENERIC_ACCELERATION_ARB 0x2026
-#define WGL_FULL_ACCELERATION_ARB 0x2027
-#define WGL_SWAP_EXCHANGE_ARB 0x2028
-#define WGL_SWAP_COPY_ARB 0x2029
-#define WGL_SWAP_UNDEFINED_ARB 0x202A
-#define WGL_TYPE_RGBA_ARB 0x202B
-#define WGL_TYPE_COLORINDEX_ARB 0x202C
-#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037
-#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
-#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
-#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
-#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
-
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues);
-
-#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB)
-#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB)
-#define wglGetPixelFormatAttribivARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribivARB)
-
-#define WGLEW_ARB_pixel_format WGLEW_GET_VAR(__WGLEW_ARB_pixel_format)
-
-#endif /* WGL_ARB_pixel_format */
-
-/* ----------------------- WGL_ARB_pixel_format_float ---------------------- */
-
-#ifndef WGL_ARB_pixel_format_float
-#define WGL_ARB_pixel_format_float 1
-
-#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0
-
-#define WGLEW_ARB_pixel_format_float WGLEW_GET_VAR(__WGLEW_ARB_pixel_format_float)
-
-#endif /* WGL_ARB_pixel_format_float */
-
-/* ------------------------- WGL_ARB_render_texture ------------------------ */
-
-#ifndef WGL_ARB_render_texture
-#define WGL_ARB_render_texture 1
-
-#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070
-#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071
-#define WGL_TEXTURE_FORMAT_ARB 0x2072
-#define WGL_TEXTURE_TARGET_ARB 0x2073
-#define WGL_MIPMAP_TEXTURE_ARB 0x2074
-#define WGL_TEXTURE_RGB_ARB 0x2075
-#define WGL_TEXTURE_RGBA_ARB 0x2076
-#define WGL_NO_TEXTURE_ARB 0x2077
-#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078
-#define WGL_TEXTURE_1D_ARB 0x2079
-#define WGL_TEXTURE_2D_ARB 0x207A
-#define WGL_MIPMAP_LEVEL_ARB 0x207B
-#define WGL_CUBE_MAP_FACE_ARB 0x207C
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
-#define WGL_FRONT_LEFT_ARB 0x2083
-#define WGL_FRONT_RIGHT_ARB 0x2084
-#define WGL_BACK_LEFT_ARB 0x2085
-#define WGL_BACK_RIGHT_ARB 0x2086
-#define WGL_AUX0_ARB 0x2087
-#define WGL_AUX1_ARB 0x2088
-#define WGL_AUX2_ARB 0x2089
-#define WGL_AUX3_ARB 0x208A
-#define WGL_AUX4_ARB 0x208B
-#define WGL_AUX5_ARB 0x208C
-#define WGL_AUX6_ARB 0x208D
-#define WGL_AUX7_ARB 0x208E
-#define WGL_AUX8_ARB 0x208F
-#define WGL_AUX9_ARB 0x2090
-
-typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int* piAttribList);
-
-#define wglBindTexImageARB WGLEW_GET_FUN(__wglewBindTexImageARB)
-#define wglReleaseTexImageARB WGLEW_GET_FUN(__wglewReleaseTexImageARB)
-#define wglSetPbufferAttribARB WGLEW_GET_FUN(__wglewSetPbufferAttribARB)
-
-#define WGLEW_ARB_render_texture WGLEW_GET_VAR(__WGLEW_ARB_render_texture)
-
-#endif /* WGL_ARB_render_texture */
-
-/* ----------------------- WGL_ATI_pixel_format_float ---------------------- */
-
-#ifndef WGL_ATI_pixel_format_float
-#define WGL_ATI_pixel_format_float 1
-
-#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0
-#define GL_RGBA_FLOAT_MODE_ATI 0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-
-#define WGLEW_ATI_pixel_format_float WGLEW_GET_VAR(__WGLEW_ATI_pixel_format_float)
-
-#endif /* WGL_ATI_pixel_format_float */
-
-/* -------------------- WGL_ATI_render_texture_rectangle ------------------- */
-
-#ifndef WGL_ATI_render_texture_rectangle
-#define WGL_ATI_render_texture_rectangle 1
-
-#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5
-
-#define WGLEW_ATI_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_ATI_render_texture_rectangle)
-
-#endif /* WGL_ATI_render_texture_rectangle */
-
-/* ------------------- WGL_EXT_create_context_es2_profile ------------------ */
-
-#ifndef WGL_EXT_create_context_es2_profile
-#define WGL_EXT_create_context_es2_profile 1
-
-#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
-
-#define WGLEW_EXT_create_context_es2_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es2_profile)
-
-#endif /* WGL_EXT_create_context_es2_profile */
-
-/* ------------------- WGL_EXT_create_context_es_profile ------------------- */
-
-#ifndef WGL_EXT_create_context_es_profile
-#define WGL_EXT_create_context_es_profile 1
-
-#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
-
-#define WGLEW_EXT_create_context_es_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es_profile)
-
-#endif /* WGL_EXT_create_context_es_profile */
-
-/* -------------------------- WGL_EXT_depth_float -------------------------- */
-
-#ifndef WGL_EXT_depth_float
-#define WGL_EXT_depth_float 1
-
-#define WGL_DEPTH_FLOAT_EXT 0x2040
-
-#define WGLEW_EXT_depth_float WGLEW_GET_VAR(__WGLEW_EXT_depth_float)
-
-#endif /* WGL_EXT_depth_float */
-
-/* ---------------------- WGL_EXT_display_color_table ---------------------- */
-
-#ifndef WGL_EXT_display_color_table
-#define WGL_EXT_display_color_table 1
-
-typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length);
-
-#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT)
-#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT)
-#define wglDestroyDisplayColorTableEXT WGLEW_GET_FUN(__wglewDestroyDisplayColorTableEXT)
-#define wglLoadDisplayColorTableEXT WGLEW_GET_FUN(__wglewLoadDisplayColorTableEXT)
-
-#define WGLEW_EXT_display_color_table WGLEW_GET_VAR(__WGLEW_EXT_display_color_table)
-
-#endif /* WGL_EXT_display_color_table */
-
-/* ----------------------- WGL_EXT_extensions_string ----------------------- */
-
-#ifndef WGL_EXT_extensions_string
-#define WGL_EXT_extensions_string 1
-
-typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
-
-#define wglGetExtensionsStringEXT WGLEW_GET_FUN(__wglewGetExtensionsStringEXT)
-
-#define WGLEW_EXT_extensions_string WGLEW_GET_VAR(__WGLEW_EXT_extensions_string)
-
-#endif /* WGL_EXT_extensions_string */
-
-/* ------------------------ WGL_EXT_framebuffer_sRGB ----------------------- */
-
-#ifndef WGL_EXT_framebuffer_sRGB
-#define WGL_EXT_framebuffer_sRGB 1
-
-#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
-
-#define WGLEW_EXT_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_EXT_framebuffer_sRGB)
-
-#endif /* WGL_EXT_framebuffer_sRGB */
-
-/* ----------------------- WGL_EXT_make_current_read ----------------------- */
-
-#ifndef WGL_EXT_make_current_read
-#define WGL_EXT_make_current_read 1
-
-#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
-
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID);
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-
-#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT)
-#define wglMakeContextCurrentEXT WGLEW_GET_FUN(__wglewMakeContextCurrentEXT)
-
-#define WGLEW_EXT_make_current_read WGLEW_GET_VAR(__WGLEW_EXT_make_current_read)
-
-#endif /* WGL_EXT_make_current_read */
-
-/* -------------------------- WGL_EXT_multisample -------------------------- */
-
-#ifndef WGL_EXT_multisample
-#define WGL_EXT_multisample 1
-
-#define WGL_SAMPLE_BUFFERS_EXT 0x2041
-#define WGL_SAMPLES_EXT 0x2042
-
-#define WGLEW_EXT_multisample WGLEW_GET_VAR(__WGLEW_EXT_multisample)
-
-#endif /* WGL_EXT_multisample */
-
-/* ---------------------------- WGL_EXT_pbuffer ---------------------------- */
-
-#ifndef WGL_EXT_pbuffer
-#define WGL_EXT_pbuffer 1
-
-#define WGL_DRAW_TO_PBUFFER_EXT 0x202D
-#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E
-#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030
-#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031
-#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
-#define WGL_PBUFFER_LARGEST_EXT 0x2033
-#define WGL_PBUFFER_WIDTH_EXT 0x2034
-#define WGL_PBUFFER_HEIGHT_EXT 0x2035
-
-DECLARE_HANDLE(HPBUFFEREXT);
-
-typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int* piValue);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
-
-#define wglCreatePbufferEXT WGLEW_GET_FUN(__wglewCreatePbufferEXT)
-#define wglDestroyPbufferEXT WGLEW_GET_FUN(__wglewDestroyPbufferEXT)
-#define wglGetPbufferDCEXT WGLEW_GET_FUN(__wglewGetPbufferDCEXT)
-#define wglQueryPbufferEXT WGLEW_GET_FUN(__wglewQueryPbufferEXT)
-#define wglReleasePbufferDCEXT WGLEW_GET_FUN(__wglewReleasePbufferDCEXT)
-
-#define WGLEW_EXT_pbuffer WGLEW_GET_VAR(__WGLEW_EXT_pbuffer)
-
-#endif /* WGL_EXT_pbuffer */
-
-/* -------------------------- WGL_EXT_pixel_format ------------------------- */
-
-#ifndef WGL_EXT_pixel_format
-#define WGL_EXT_pixel_format 1
-
-#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000
-#define WGL_DRAW_TO_WINDOW_EXT 0x2001
-#define WGL_DRAW_TO_BITMAP_EXT 0x2002
-#define WGL_ACCELERATION_EXT 0x2003
-#define WGL_NEED_PALETTE_EXT 0x2004
-#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005
-#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006
-#define WGL_SWAP_METHOD_EXT 0x2007
-#define WGL_NUMBER_OVERLAYS_EXT 0x2008
-#define WGL_NUMBER_UNDERLAYS_EXT 0x2009
-#define WGL_TRANSPARENT_EXT 0x200A
-#define WGL_TRANSPARENT_VALUE_EXT 0x200B
-#define WGL_SHARE_DEPTH_EXT 0x200C
-#define WGL_SHARE_STENCIL_EXT 0x200D
-#define WGL_SHARE_ACCUM_EXT 0x200E
-#define WGL_SUPPORT_GDI_EXT 0x200F
-#define WGL_SUPPORT_OPENGL_EXT 0x2010
-#define WGL_DOUBLE_BUFFER_EXT 0x2011
-#define WGL_STEREO_EXT 0x2012
-#define WGL_PIXEL_TYPE_EXT 0x2013
-#define WGL_COLOR_BITS_EXT 0x2014
-#define WGL_RED_BITS_EXT 0x2015
-#define WGL_RED_SHIFT_EXT 0x2016
-#define WGL_GREEN_BITS_EXT 0x2017
-#define WGL_GREEN_SHIFT_EXT 0x2018
-#define WGL_BLUE_BITS_EXT 0x2019
-#define WGL_BLUE_SHIFT_EXT 0x201A
-#define WGL_ALPHA_BITS_EXT 0x201B
-#define WGL_ALPHA_SHIFT_EXT 0x201C
-#define WGL_ACCUM_BITS_EXT 0x201D
-#define WGL_ACCUM_RED_BITS_EXT 0x201E
-#define WGL_ACCUM_GREEN_BITS_EXT 0x201F
-#define WGL_ACCUM_BLUE_BITS_EXT 0x2020
-#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021
-#define WGL_DEPTH_BITS_EXT 0x2022
-#define WGL_STENCIL_BITS_EXT 0x2023
-#define WGL_AUX_BUFFERS_EXT 0x2024
-#define WGL_NO_ACCELERATION_EXT 0x2025
-#define WGL_GENERIC_ACCELERATION_EXT 0x2026
-#define WGL_FULL_ACCELERATION_EXT 0x2027
-#define WGL_SWAP_EXCHANGE_EXT 0x2028
-#define WGL_SWAP_COPY_EXT 0x2029
-#define WGL_SWAP_UNDEFINED_EXT 0x202A
-#define WGL_TYPE_RGBA_EXT 0x202B
-#define WGL_TYPE_COLORINDEX_EXT 0x202C
-
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues);
-
-#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT)
-#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT)
-#define wglGetPixelFormatAttribivEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribivEXT)
-
-#define WGLEW_EXT_pixel_format WGLEW_GET_VAR(__WGLEW_EXT_pixel_format)
-
-#endif /* WGL_EXT_pixel_format */
-
-/* ------------------- WGL_EXT_pixel_format_packed_float ------------------- */
-
-#ifndef WGL_EXT_pixel_format_packed_float
-#define WGL_EXT_pixel_format_packed_float 1
-
-#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
-
-#define WGLEW_EXT_pixel_format_packed_float WGLEW_GET_VAR(__WGLEW_EXT_pixel_format_packed_float)
-
-#endif /* WGL_EXT_pixel_format_packed_float */
-
-/* -------------------------- WGL_EXT_swap_control ------------------------- */
-
-#ifndef WGL_EXT_swap_control
-#define WGL_EXT_swap_control 1
-
-typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
-typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
-
-#define wglGetSwapIntervalEXT WGLEW_GET_FUN(__wglewGetSwapIntervalEXT)
-#define wglSwapIntervalEXT WGLEW_GET_FUN(__wglewSwapIntervalEXT)
-
-#define WGLEW_EXT_swap_control WGLEW_GET_VAR(__WGLEW_EXT_swap_control)
-
-#endif /* WGL_EXT_swap_control */
-
-/* ----------------------- WGL_EXT_swap_control_tear ----------------------- */
-
-#ifndef WGL_EXT_swap_control_tear
-#define WGL_EXT_swap_control_tear 1
-
-#define WGLEW_EXT_swap_control_tear WGLEW_GET_VAR(__WGLEW_EXT_swap_control_tear)
-
-#endif /* WGL_EXT_swap_control_tear */
-
-/* --------------------- WGL_I3D_digital_video_control --------------------- */
-
-#ifndef WGL_I3D_digital_video_control
-#define WGL_I3D_digital_video_control 1
-
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
-#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
-#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
-
-typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
-typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
-
-#define wglGetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewGetDigitalVideoParametersI3D)
-#define wglSetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewSetDigitalVideoParametersI3D)
-
-#define WGLEW_I3D_digital_video_control WGLEW_GET_VAR(__WGLEW_I3D_digital_video_control)
-
-#endif /* WGL_I3D_digital_video_control */
-
-/* ----------------------------- WGL_I3D_gamma ----------------------------- */
-
-#ifndef WGL_I3D_gamma
-#define WGL_I3D_gamma 1
-
-#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E
-#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F
-
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue);
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
-
-#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D)
-#define wglGetGammaTableParametersI3D WGLEW_GET_FUN(__wglewGetGammaTableParametersI3D)
-#define wglSetGammaTableI3D WGLEW_GET_FUN(__wglewSetGammaTableI3D)
-#define wglSetGammaTableParametersI3D WGLEW_GET_FUN(__wglewSetGammaTableParametersI3D)
-
-#define WGLEW_I3D_gamma WGLEW_GET_VAR(__WGLEW_I3D_gamma)
-
-#endif /* WGL_I3D_gamma */
-
-/* ---------------------------- WGL_I3D_genlock ---------------------------- */
-
-#ifndef WGL_I3D_genlock
-#define WGL_I3D_genlock 1
-
-#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
-#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045
-#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046
-#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047
-#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
-#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
-#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
-#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
-#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
-
-typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT* uRate);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDelay);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource);
-typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag);
-typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay);
-
-#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D)
-#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D)
-#define wglGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGenlockSampleRateI3D)
-#define wglGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGenlockSourceDelayI3D)
-#define wglGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGenlockSourceEdgeI3D)
-#define wglGenlockSourceI3D WGLEW_GET_FUN(__wglewGenlockSourceI3D)
-#define wglGetGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGetGenlockSampleRateI3D)
-#define wglGetGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGetGenlockSourceDelayI3D)
-#define wglGetGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGetGenlockSourceEdgeI3D)
-#define wglGetGenlockSourceI3D WGLEW_GET_FUN(__wglewGetGenlockSourceI3D)
-#define wglIsEnabledGenlockI3D WGLEW_GET_FUN(__wglewIsEnabledGenlockI3D)
-#define wglQueryGenlockMaxSourceDelayI3D WGLEW_GET_FUN(__wglewQueryGenlockMaxSourceDelayI3D)
-
-#define WGLEW_I3D_genlock WGLEW_GET_VAR(__WGLEW_I3D_genlock)
-
-#endif /* WGL_I3D_genlock */
-
-/* -------------------------- WGL_I3D_image_buffer ------------------------- */
-
-#ifndef WGL_I3D_image_buffer
-#define WGL_I3D_image_buffer 1
-
-#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
-#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002
-
-typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count);
-typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
-typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
-typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count);
-
-#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D)
-#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D)
-#define wglDestroyImageBufferI3D WGLEW_GET_FUN(__wglewDestroyImageBufferI3D)
-#define wglReleaseImageBufferEventsI3D WGLEW_GET_FUN(__wglewReleaseImageBufferEventsI3D)
-
-#define WGLEW_I3D_image_buffer WGLEW_GET_VAR(__WGLEW_I3D_image_buffer)
-
-#endif /* WGL_I3D_image_buffer */
-
-/* ------------------------ WGL_I3D_swap_frame_lock ------------------------ */
-
-#ifndef WGL_I3D_swap_frame_lock
-#define WGL_I3D_swap_frame_lock 1
-
-typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID);
-typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID);
-typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag);
-
-#define wglDisableFrameLockI3D WGLEW_GET_FUN(__wglewDisableFrameLockI3D)
-#define wglEnableFrameLockI3D WGLEW_GET_FUN(__wglewEnableFrameLockI3D)
-#define wglIsEnabledFrameLockI3D WGLEW_GET_FUN(__wglewIsEnabledFrameLockI3D)
-#define wglQueryFrameLockMasterI3D WGLEW_GET_FUN(__wglewQueryFrameLockMasterI3D)
-
-#define WGLEW_I3D_swap_frame_lock WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_lock)
-
-#endif /* WGL_I3D_swap_frame_lock */
-
-/* ------------------------ WGL_I3D_swap_frame_usage ----------------------- */
-
-#ifndef WGL_I3D_swap_frame_usage
-#define WGL_I3D_swap_frame_usage 1
-
-typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
-
-#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D)
-#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D)
-#define wglGetFrameUsageI3D WGLEW_GET_FUN(__wglewGetFrameUsageI3D)
-#define wglQueryFrameTrackingI3D WGLEW_GET_FUN(__wglewQueryFrameTrackingI3D)
-
-#define WGLEW_I3D_swap_frame_usage WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_usage)
-
-#endif /* WGL_I3D_swap_frame_usage */
-
-/* --------------------------- WGL_NV_DX_interop --------------------------- */
-
-#ifndef WGL_NV_DX_interop
-#define WGL_NV_DX_interop 1
-
-#define WGL_ACCESS_READ_ONLY_NV 0x0000
-#define WGL_ACCESS_READ_WRITE_NV 0x0001
-#define WGL_ACCESS_WRITE_DISCARD_NV 0x0002
-
-typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
-typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects);
-typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access);
-typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void* dxDevice);
-typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access);
-typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void* dxObject, HANDLE shareHandle);
-typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects);
-typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject);
-
-#define wglDXCloseDeviceNV WGLEW_GET_FUN(__wglewDXCloseDeviceNV)
-#define wglDXLockObjectsNV WGLEW_GET_FUN(__wglewDXLockObjectsNV)
-#define wglDXObjectAccessNV WGLEW_GET_FUN(__wglewDXObjectAccessNV)
-#define wglDXOpenDeviceNV WGLEW_GET_FUN(__wglewDXOpenDeviceNV)
-#define wglDXRegisterObjectNV WGLEW_GET_FUN(__wglewDXRegisterObjectNV)
-#define wglDXSetResourceShareHandleNV WGLEW_GET_FUN(__wglewDXSetResourceShareHandleNV)
-#define wglDXUnlockObjectsNV WGLEW_GET_FUN(__wglewDXUnlockObjectsNV)
-#define wglDXUnregisterObjectNV WGLEW_GET_FUN(__wglewDXUnregisterObjectNV)
-
-#define WGLEW_NV_DX_interop WGLEW_GET_VAR(__WGLEW_NV_DX_interop)
-
-#endif /* WGL_NV_DX_interop */
-
-/* --------------------------- WGL_NV_DX_interop2 -------------------------- */
-
-#ifndef WGL_NV_DX_interop2
-#define WGL_NV_DX_interop2 1
-
-#define WGLEW_NV_DX_interop2 WGLEW_GET_VAR(__WGLEW_NV_DX_interop2)
-
-#endif /* WGL_NV_DX_interop2 */
-
-/* --------------------------- WGL_NV_copy_image --------------------------- */
-
-#ifndef WGL_NV_copy_image
-#define WGL_NV_copy_image 1
-
-typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-
-#define wglCopyImageSubDataNV WGLEW_GET_FUN(__wglewCopyImageSubDataNV)
-
-#define WGLEW_NV_copy_image WGLEW_GET_VAR(__WGLEW_NV_copy_image)
-
-#endif /* WGL_NV_copy_image */
-
-/* -------------------------- WGL_NV_float_buffer -------------------------- */
-
-#ifndef WGL_NV_float_buffer
-#define WGL_NV_float_buffer 1
-
-#define WGL_FLOAT_COMPONENTS_NV 0x20B0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
-#define WGL_TEXTURE_FLOAT_R_NV 0x20B5
-#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6
-#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7
-#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8
-
-#define WGLEW_NV_float_buffer WGLEW_GET_VAR(__WGLEW_NV_float_buffer)
-
-#endif /* WGL_NV_float_buffer */
-
-/* -------------------------- WGL_NV_gpu_affinity -------------------------- */
-
-#ifndef WGL_NV_gpu_affinity
-#define WGL_NV_gpu_affinity 1
-
-#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0
-#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1
-
-DECLARE_HANDLE(HGPUNV);
-typedef struct _GPU_DEVICE {
-  DWORD cb; 
-  CHAR DeviceName[32]; 
-  CHAR DeviceString[128]; 
-  DWORD Flags; 
-  RECT rcVirtualScreen; 
-} GPU_DEVICE, *PGPU_DEVICE;
-
-typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList);
-typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc);
-typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
-typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
-typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
-
-#define wglCreateAffinityDCNV WGLEW_GET_FUN(__wglewCreateAffinityDCNV)
-#define wglDeleteDCNV WGLEW_GET_FUN(__wglewDeleteDCNV)
-#define wglEnumGpuDevicesNV WGLEW_GET_FUN(__wglewEnumGpuDevicesNV)
-#define wglEnumGpusFromAffinityDCNV WGLEW_GET_FUN(__wglewEnumGpusFromAffinityDCNV)
-#define wglEnumGpusNV WGLEW_GET_FUN(__wglewEnumGpusNV)
-
-#define WGLEW_NV_gpu_affinity WGLEW_GET_VAR(__WGLEW_NV_gpu_affinity)
-
-#endif /* WGL_NV_gpu_affinity */
-
-/* ---------------------- WGL_NV_multisample_coverage ---------------------- */
-
-#ifndef WGL_NV_multisample_coverage
-#define WGL_NV_multisample_coverage 1
-
-#define WGL_COVERAGE_SAMPLES_NV 0x2042
-#define WGL_COLOR_SAMPLES_NV 0x20B9
-
-#define WGLEW_NV_multisample_coverage WGLEW_GET_VAR(__WGLEW_NV_multisample_coverage)
-
-#endif /* WGL_NV_multisample_coverage */
-
-/* -------------------------- WGL_NV_present_video ------------------------- */
-
-#ifndef WGL_NV_present_video
-#define WGL_NV_present_video 1
-
-#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0
-
-DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
-
-typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int* piAttribList);
-typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV* phDeviceList);
-typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* piValue);
-
-#define wglBindVideoDeviceNV WGLEW_GET_FUN(__wglewBindVideoDeviceNV)
-#define wglEnumerateVideoDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoDevicesNV)
-#define wglQueryCurrentContextNV WGLEW_GET_FUN(__wglewQueryCurrentContextNV)
-
-#define WGLEW_NV_present_video WGLEW_GET_VAR(__WGLEW_NV_present_video)
-
-#endif /* WGL_NV_present_video */
-
-/* ---------------------- WGL_NV_render_depth_texture ---------------------- */
-
-#ifndef WGL_NV_render_depth_texture
-#define WGL_NV_render_depth_texture 1
-
-#define WGL_NO_TEXTURE_ARB 0x2077
-#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
-#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5
-#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
-#define WGL_DEPTH_COMPONENT_NV 0x20A7
-
-#define WGLEW_NV_render_depth_texture WGLEW_GET_VAR(__WGLEW_NV_render_depth_texture)
-
-#endif /* WGL_NV_render_depth_texture */
-
-/* -------------------- WGL_NV_render_texture_rectangle -------------------- */
-
-#ifndef WGL_NV_render_texture_rectangle
-#define WGL_NV_render_texture_rectangle 1
-
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
-#define WGL_TEXTURE_RECTANGLE_NV 0x20A2
-
-#define WGLEW_NV_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_NV_render_texture_rectangle)
-
-#endif /* WGL_NV_render_texture_rectangle */
-
-/* --------------------------- WGL_NV_swap_group --------------------------- */
-
-#ifndef WGL_NV_swap_group
-#define WGL_NV_swap_group 1
-
-typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
-typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint* count);
-typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint *maxBarriers);
-typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint *barrier);
-typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
-
-#define wglBindSwapBarrierNV WGLEW_GET_FUN(__wglewBindSwapBarrierNV)
-#define wglJoinSwapGroupNV WGLEW_GET_FUN(__wglewJoinSwapGroupNV)
-#define wglQueryFrameCountNV WGLEW_GET_FUN(__wglewQueryFrameCountNV)
-#define wglQueryMaxSwapGroupsNV WGLEW_GET_FUN(__wglewQueryMaxSwapGroupsNV)
-#define wglQuerySwapGroupNV WGLEW_GET_FUN(__wglewQuerySwapGroupNV)
-#define wglResetFrameCountNV WGLEW_GET_FUN(__wglewResetFrameCountNV)
-
-#define WGLEW_NV_swap_group WGLEW_GET_VAR(__WGLEW_NV_swap_group)
-
-#endif /* WGL_NV_swap_group */
-
-/* ----------------------- WGL_NV_vertex_array_range ----------------------- */
-
-#ifndef WGL_NV_vertex_array_range
-#define WGL_NV_vertex_array_range 1
-
-typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
-typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
-
-#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV)
-#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV)
-
-#define WGLEW_NV_vertex_array_range WGLEW_GET_VAR(__WGLEW_NV_vertex_array_range)
-
-#endif /* WGL_NV_vertex_array_range */
-
-/* -------------------------- WGL_NV_video_capture ------------------------- */
-
-#ifndef WGL_NV_video_capture
-#define WGL_NV_video_capture 1
-
-#define WGL_UNIQUE_ID_NV 0x20CE
-#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
-
-DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
-
-typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
-typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV* phDeviceList);
-typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
-typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int* piValue);
-typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
-
-#define wglBindVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewBindVideoCaptureDeviceNV)
-#define wglEnumerateVideoCaptureDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoCaptureDevicesNV)
-#define wglLockVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewLockVideoCaptureDeviceNV)
-#define wglQueryVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewQueryVideoCaptureDeviceNV)
-#define wglReleaseVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoCaptureDeviceNV)
-
-#define WGLEW_NV_video_capture WGLEW_GET_VAR(__WGLEW_NV_video_capture)
-
-#endif /* WGL_NV_video_capture */
-
-/* -------------------------- WGL_NV_video_output -------------------------- */
-
-#ifndef WGL_NV_video_output
-#define WGL_NV_video_output 1
-
-#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0
-#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1
-#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2
-#define WGL_VIDEO_OUT_COLOR_NV 0x20C3
-#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4
-#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5
-#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
-#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
-#define WGL_VIDEO_OUT_FRAME 0x20C8
-#define WGL_VIDEO_OUT_FIELD_1 0x20C9
-#define WGL_VIDEO_OUT_FIELD_2 0x20CA
-#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB
-#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC
-
-DECLARE_HANDLE(HPVIDEODEV);
-
-typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
-typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV* hVideoDevice);
-typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
-typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
-typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
-typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long* pulCounterPbuffer, BOOL bBlock);
-
-#define wglBindVideoImageNV WGLEW_GET_FUN(__wglewBindVideoImageNV)
-#define wglGetVideoDeviceNV WGLEW_GET_FUN(__wglewGetVideoDeviceNV)
-#define wglGetVideoInfoNV WGLEW_GET_FUN(__wglewGetVideoInfoNV)
-#define wglReleaseVideoDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoDeviceNV)
-#define wglReleaseVideoImageNV WGLEW_GET_FUN(__wglewReleaseVideoImageNV)
-#define wglSendPbufferToVideoNV WGLEW_GET_FUN(__wglewSendPbufferToVideoNV)
-
-#define WGLEW_NV_video_output WGLEW_GET_VAR(__WGLEW_NV_video_output)
-
-#endif /* WGL_NV_video_output */
-
-/* -------------------------- WGL_OML_sync_control ------------------------- */
-
-#ifndef WGL_OML_sync_control
-#define WGL_OML_sync_control 1
-
-typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator);
-typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc);
-typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc);
-typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc);
-
-#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML)
-#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML)
-#define wglSwapBuffersMscOML WGLEW_GET_FUN(__wglewSwapBuffersMscOML)
-#define wglSwapLayerBuffersMscOML WGLEW_GET_FUN(__wglewSwapLayerBuffersMscOML)
-#define wglWaitForMscOML WGLEW_GET_FUN(__wglewWaitForMscOML)
-#define wglWaitForSbcOML WGLEW_GET_FUN(__wglewWaitForSbcOML)
-
-#define WGLEW_OML_sync_control WGLEW_GET_VAR(__WGLEW_OML_sync_control)
-
-#endif /* WGL_OML_sync_control */
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef GLEW_MX
-#define WGLEW_FUN_EXPORT
-#define WGLEW_VAR_EXPORT
-#else
-#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT
-#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT
-#endif /* GLEW_MX */
-
-#ifdef GLEW_MX
-struct WGLEWContextStruct
-{
-#endif /* GLEW_MX */
-
-WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
-
-WGLEW_FUN_EXPORT PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD;
-WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD;
-WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD;
-WGLEW_FUN_EXPORT PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD;
-WGLEW_FUN_EXPORT PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD;
-WGLEW_FUN_EXPORT PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD;
-WGLEW_FUN_EXPORT PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD;
-WGLEW_FUN_EXPORT PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD;
-WGLEW_FUN_EXPORT PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD;
-
-WGLEW_FUN_EXPORT PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB;
-WGLEW_FUN_EXPORT PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB;
-WGLEW_FUN_EXPORT PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB;
-WGLEW_FUN_EXPORT PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB;
-
-WGLEW_FUN_EXPORT PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB;
-
-WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB;
-
-WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB;
-WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB;
-
-WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB;
-WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB;
-WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB;
-WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB;
-WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB;
-
-WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB;
-WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB;
-WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB;
-
-WGLEW_FUN_EXPORT PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB;
-WGLEW_FUN_EXPORT PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB;
-WGLEW_FUN_EXPORT PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB;
-
-WGLEW_FUN_EXPORT PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT;
-WGLEW_FUN_EXPORT PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT;
-WGLEW_FUN_EXPORT PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT;
-WGLEW_FUN_EXPORT PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT;
-
-WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT;
-
-WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT;
-WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT;
-
-WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT;
-WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT;
-WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT;
-WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT;
-WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT;
-
-WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT;
-WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT;
-WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT;
-
-WGLEW_FUN_EXPORT PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT;
-WGLEW_FUN_EXPORT PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT;
-
-WGLEW_FUN_EXPORT PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D;
-WGLEW_FUN_EXPORT PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D;
-
-WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D;
-WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D;
-WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D;
-WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D;
-
-WGLEW_FUN_EXPORT PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D;
-WGLEW_FUN_EXPORT PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D;
-WGLEW_FUN_EXPORT PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D;
-WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D;
-WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D;
-WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D;
-WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D;
-WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D;
-WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D;
-WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D;
-WGLEW_FUN_EXPORT PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D;
-WGLEW_FUN_EXPORT PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D;
-
-WGLEW_FUN_EXPORT PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D;
-WGLEW_FUN_EXPORT PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D;
-WGLEW_FUN_EXPORT PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D;
-WGLEW_FUN_EXPORT PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D;
-
-WGLEW_FUN_EXPORT PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D;
-WGLEW_FUN_EXPORT PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D;
-WGLEW_FUN_EXPORT PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D;
-WGLEW_FUN_EXPORT PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D;
-
-WGLEW_FUN_EXPORT PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D;
-WGLEW_FUN_EXPORT PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D;
-WGLEW_FUN_EXPORT PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D;
-WGLEW_FUN_EXPORT PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D;
-
-WGLEW_FUN_EXPORT PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV;
-WGLEW_FUN_EXPORT PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV;
-WGLEW_FUN_EXPORT PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV;
-WGLEW_FUN_EXPORT PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV;
-WGLEW_FUN_EXPORT PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV;
-WGLEW_FUN_EXPORT PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV;
-
-WGLEW_FUN_EXPORT PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV;
-
-WGLEW_FUN_EXPORT PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV;
-WGLEW_FUN_EXPORT PFNWGLDELETEDCNVPROC __wglewDeleteDCNV;
-WGLEW_FUN_EXPORT PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV;
-WGLEW_FUN_EXPORT PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV;
-WGLEW_FUN_EXPORT PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV;
-
-WGLEW_FUN_EXPORT PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV;
-WGLEW_FUN_EXPORT PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV;
-
-WGLEW_FUN_EXPORT PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV;
-WGLEW_FUN_EXPORT PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV;
-WGLEW_FUN_EXPORT PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV;
-WGLEW_FUN_EXPORT PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV;
-WGLEW_FUN_EXPORT PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV;
-WGLEW_FUN_EXPORT PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV;
-
-WGLEW_FUN_EXPORT PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV;
-WGLEW_FUN_EXPORT PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV;
-
-WGLEW_FUN_EXPORT PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV;
-WGLEW_FUN_EXPORT PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV;
-
-WGLEW_FUN_EXPORT PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV;
-WGLEW_FUN_EXPORT PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV;
-WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV;
-WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV;
-WGLEW_FUN_EXPORT PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV;
-
-WGLEW_FUN_EXPORT PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML;
-WGLEW_FUN_EXPORT PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML;
-WGLEW_FUN_EXPORT PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML;
-WGLEW_FUN_EXPORT PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML;
-WGLEW_FUN_EXPORT PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML;
-WGLEW_FUN_EXPORT PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_3DFX_multisample;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_3DL_stereo_control;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_extensions_string;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_framebuffer_sRGB;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_make_current_read;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_multisample;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pbuffer;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format_float;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_render_texture;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_pixel_format_float;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es2_profile;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es_profile;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_depth_float;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_display_color_table;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_extensions_string;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_framebuffer_sRGB;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_make_current_read;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_multisample;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pbuffer;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format_packed_float;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control_tear;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_digital_video_control;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_gamma;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_genlock;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_image_buffer;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_lock;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop2;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_present_video;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_depth_texture;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_texture_rectangle;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_swap_group;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output;
-WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control;
-
-#ifdef GLEW_MX
-}; /* WGLEWContextStruct */
-#endif /* GLEW_MX */
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef GLEW_MX
-
-typedef struct WGLEWContextStruct WGLEWContext;
-GLEWAPI GLenum GLEWAPIENTRY wglewContextInit (WGLEWContext *ctx);
-GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx, const char *name);
-
-#define wglewInit() wglewContextInit(wglewGetContext())
-#define wglewIsSupported(x) wglewContextIsSupported(wglewGetContext(), x)
-
-#define WGLEW_GET_VAR(x) (*(const GLboolean*)&(wglewGetContext()->x))
-#define WGLEW_GET_FUN(x) wglewGetContext()->x
-
-#else /* GLEW_MX */
-
-#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
-#define WGLEW_GET_FUN(x) x
-
-GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
-
-#endif /* GLEW_MX */
-
-GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef GLEWAPI
-
-#endif /* __wglew_h__ */
diff --git a/Externals/GLew/src/glew.c b/Externals/GLew/src/glew.c
deleted file mode 100644
index 3703d9d306..0000000000
--- a/Externals/GLew/src/glew.c
+++ /dev/null
@@ -1,16972 +0,0 @@
-/*
-** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2008, 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.
-*/
-
-#include <GL/glew.h>
-
-#if defined(_WIN32)
-#  include <GL/wglew.h>
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
-#  include <GL/glxew.h>
-#endif
-
-/*
- * Define glewGetContext and related helper macros.
- */
-#ifdef GLEW_MX
-#  define glewGetContext() ctx
-#  ifdef _WIN32
-#    define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx
-#    define GLEW_CONTEXT_ARG_VAR_INIT ctx
-#    define wglewGetContext() ctx
-#    define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx
-#    define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx
-#  else /* _WIN32 */
-#    define GLEW_CONTEXT_ARG_DEF_INIT void
-#    define GLEW_CONTEXT_ARG_VAR_INIT
-#    define glxewGetContext() ctx
-#    define GLXEW_CONTEXT_ARG_DEF_INIT void
-#    define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx
-#  endif /* _WIN32 */
-#  define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx
-#else /* GLEW_MX */
-#  define GLEW_CONTEXT_ARG_DEF_INIT void
-#  define GLEW_CONTEXT_ARG_VAR_INIT
-#  define GLEW_CONTEXT_ARG_DEF_LIST void
-#  define WGLEW_CONTEXT_ARG_DEF_INIT void
-#  define WGLEW_CONTEXT_ARG_DEF_LIST void
-#  define GLXEW_CONTEXT_ARG_DEF_INIT void
-#  define GLXEW_CONTEXT_ARG_DEF_LIST void
-#endif /* GLEW_MX */
-
-#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX)
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void* dlGetProcAddress (const GLubyte* name)
-{
-  static void* h = NULL;
-  static void* gpa;
-
-  if (h == NULL)
-  {
-    if ((h = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL)) == NULL) return NULL;
-    gpa = dlsym(h, "glXGetProcAddress");
-  }
-
-  if (gpa != NULL)
-    return ((void*(*)(const GLubyte*))gpa)(name);
-  else
-    return dlsym(h, (const char*)name);
-}
-#endif /* __sgi || __sun || GLEW_APPLE_GLX */
-
-#if defined(__APPLE__)
-#include <stdlib.h>
-#include <string.h>
-#include <AvailabilityMacros.h>
-
-#ifdef MAC_OS_X_VERSION_10_3
-
-#include <dlfcn.h>
-
-void* NSGLGetProcAddress (const GLubyte *name)
-{
-  static void* image = NULL;
-  void* addr;
-  if (NULL == image) 
-  {
-#ifdef GLEW_REGAL
-    image = dlopen("libRegal.dylib", RTLD_LAZY);
-#else
-    image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
-#endif
-  }
-  if( !image ) return NULL;
-  addr = dlsym(image, (const char*)name);
-  if( addr ) return addr;
-#ifdef GLEW_APPLE_GLX
-  return dlGetProcAddress( name ); // try next for glx symbols
-#else
-  return NULL;
-#endif
-}
-#else
-
-#include <mach-o/dyld.h>
-
-void* NSGLGetProcAddress (const GLubyte *name)
-{
-  static const struct mach_header* image = NULL;
-  NSSymbol symbol;
-  char* symbolName;
-  if (NULL == image)
-  {
-#ifdef GLEW_REGAL
-    image = NSAddImage("libRegal.dylib", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-#else
-    image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-#endif
-  }
-  /* prepend a '_' for the Unix C symbol mangling convention */
-  symbolName = malloc(strlen((const char*)name) + 2);
-  strcpy(symbolName+1, (const char*)name);
-  symbolName[0] = '_';
-  symbol = NULL;
-  /* if (NSIsSymbolNameDefined(symbolName))
-	 symbol = NSLookupAndBindSymbol(symbolName); */
-  symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
-  free(symbolName);
-  if( symbol ) return NSAddressOfSymbol(symbol);
-#ifdef GLEW_APPLE_GLX
-  return dlGetProcAddress( name ); // try next for glx symbols
-#else
-  return NULL;
-#endif
-}
-#endif /* MAC_OS_X_VERSION_10_3 */
-#endif /* __APPLE__ */
-
-/*
- * Define glewGetProcAddress.
- */
-#if defined(_WIN32)
-#  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-#  define glewGetProcAddress(name) NSGLGetProcAddress(name)
-#elif defined(__sgi) || defined(__sun)
-#  define glewGetProcAddress(name) dlGetProcAddress(name)
-#elif defined(__ANDROID__)
-#  define glewGetProcAddress(name) NULL /* TODO */
-#else /* __linux */
-#  define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
-#endif
-
-/*
- * Define GLboolean const cast.
- */
-#define CONST_CAST(x) (*(GLboolean*)&x)
-
-/*
- * GLEW, just like OpenGL or GLU, does not rely on the standard C library.
- * These functions implement the functionality required in this file.
- */
-static GLuint _glewStrLen (const GLubyte* s)
-{
-  GLuint i=0;
-  if (s == NULL) return 0;
-  while (s[i] != '\0') i++;
-  return i;
-}
-
-static GLuint _glewStrCLen (const GLubyte* s, GLubyte c)
-{
-  GLuint i=0;
-  if (s == NULL) return 0;
-  while (s[i] != '\0' && s[i] != c) i++;
-  return (s[i] == '\0' || s[i] == c) ? i : 0;
-}
-
-static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
-{
-  GLuint i=0;
-  if(a == NULL || b == NULL)
-    return (a == NULL && b == NULL && n == 0) ? GL_TRUE : GL_FALSE;
-  while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++;
-  return i == n ? GL_TRUE : GL_FALSE;
-}
-
-static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
-{
-  while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t'))
-  {
-    (*a)++;
-    (*na)--;
-  }
-  if(*na >= nb)
-  {
-    GLuint i=0;
-    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
-    if(i == nb)
-    {
-      *a = *a + nb;
-      *na = *na - nb;
-      return GL_TRUE;
-    }
-  }
-  return GL_FALSE;
-}
-
-static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
-{
-  if(*na >= nb)
-  {
-    GLuint i=0;
-    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
-    if(i == nb)
-    {
-      *a = *a + nb;
-      *na = *na - nb;
-      return GL_TRUE;
-    }
-  }
-  return GL_FALSE;
-}
-
-static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
-{
-  if(*na >= nb)
-  {
-    GLuint i=0;
-    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
-    if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t'))
-    {
-      *a = *a + nb;
-      *na = *na - nb;
-      return GL_TRUE;
-    }
-  }
-  return GL_FALSE;
-}
-
-/*
- * Search for name in the extensions string. Use of strstr()
- * is not sufficient because extension names can be prefixes of
- * other extension names. Could use strtok() but the constant
- * string returned by glGetString might be in read-only memory.
- */
-static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, const GLubyte *end)
-{
-  const GLubyte* p;
-  GLuint len = _glewStrLen((const GLubyte*)name);
-  p = start;
-  while (p < end)
-  {
-    GLuint n = _glewStrCLen(p, ' ');
-    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
-    p += n+1;
-  }
-  return GL_FALSE;
-}
-
-#if !defined(_WIN32) || !defined(GLEW_MX)
-
-PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D = NULL;
-PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements = NULL;
-PFNGLTEXIMAGE3DPROC __glewTexImage3D = NULL;
-PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D = NULL;
-
-PFNGLACTIVETEXTUREPROC __glewActiveTexture = NULL;
-PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture = NULL;
-PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D = NULL;
-PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D = NULL;
-PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D = NULL;
-PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage = NULL;
-PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd = NULL;
-PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf = NULL;
-PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd = NULL;
-PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf = NULL;
-PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d = NULL;
-PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv = NULL;
-PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f = NULL;
-PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv = NULL;
-PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i = NULL;
-PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv = NULL;
-PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s = NULL;
-PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv = NULL;
-PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d = NULL;
-PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv = NULL;
-PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f = NULL;
-PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv = NULL;
-PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i = NULL;
-PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv = NULL;
-PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s = NULL;
-PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv = NULL;
-PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d = NULL;
-PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv = NULL;
-PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f = NULL;
-PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv = NULL;
-PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i = NULL;
-PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv = NULL;
-PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s = NULL;
-PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv = NULL;
-PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d = NULL;
-PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv = NULL;
-PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f = NULL;
-PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv = NULL;
-PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i = NULL;
-PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv = NULL;
-PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s = NULL;
-PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv = NULL;
-PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage = NULL;
-
-PFNGLBLENDCOLORPROC __glewBlendColor = NULL;
-PFNGLBLENDEQUATIONPROC __glewBlendEquation = NULL;
-PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate = NULL;
-PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer = NULL;
-PFNGLFOGCOORDDPROC __glewFogCoordd = NULL;
-PFNGLFOGCOORDDVPROC __glewFogCoorddv = NULL;
-PFNGLFOGCOORDFPROC __glewFogCoordf = NULL;
-PFNGLFOGCOORDFVPROC __glewFogCoordfv = NULL;
-PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays = NULL;
-PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements = NULL;
-PFNGLPOINTPARAMETERFPROC __glewPointParameterf = NULL;
-PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv = NULL;
-PFNGLPOINTPARAMETERIPROC __glewPointParameteri = NULL;
-PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv = NULL;
-PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b = NULL;
-PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv = NULL;
-PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d = NULL;
-PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv = NULL;
-PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f = NULL;
-PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv = NULL;
-PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i = NULL;
-PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv = NULL;
-PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s = NULL;
-PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv = NULL;
-PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub = NULL;
-PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv = NULL;
-PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui = NULL;
-PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv = NULL;
-PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us = NULL;
-PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv = NULL;
-PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer = NULL;
-PFNGLWINDOWPOS2DPROC __glewWindowPos2d = NULL;
-PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv = NULL;
-PFNGLWINDOWPOS2FPROC __glewWindowPos2f = NULL;
-PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv = NULL;
-PFNGLWINDOWPOS2IPROC __glewWindowPos2i = NULL;
-PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv = NULL;
-PFNGLWINDOWPOS2SPROC __glewWindowPos2s = NULL;
-PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv = NULL;
-PFNGLWINDOWPOS3DPROC __glewWindowPos3d = NULL;
-PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv = NULL;
-PFNGLWINDOWPOS3FPROC __glewWindowPos3f = NULL;
-PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv = NULL;
-PFNGLWINDOWPOS3IPROC __glewWindowPos3i = NULL;
-PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv = NULL;
-PFNGLWINDOWPOS3SPROC __glewWindowPos3s = NULL;
-PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv = NULL;
-
-PFNGLBEGINQUERYPROC __glewBeginQuery = NULL;
-PFNGLBINDBUFFERPROC __glewBindBuffer = NULL;
-PFNGLBUFFERDATAPROC __glewBufferData = NULL;
-PFNGLBUFFERSUBDATAPROC __glewBufferSubData = NULL;
-PFNGLDELETEBUFFERSPROC __glewDeleteBuffers = NULL;
-PFNGLDELETEQUERIESPROC __glewDeleteQueries = NULL;
-PFNGLENDQUERYPROC __glewEndQuery = NULL;
-PFNGLGENBUFFERSPROC __glewGenBuffers = NULL;
-PFNGLGENQUERIESPROC __glewGenQueries = NULL;
-PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv = NULL;
-PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv = NULL;
-PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData = NULL;
-PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv = NULL;
-PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv = NULL;
-PFNGLGETQUERYIVPROC __glewGetQueryiv = NULL;
-PFNGLISBUFFERPROC __glewIsBuffer = NULL;
-PFNGLISQUERYPROC __glewIsQuery = NULL;
-PFNGLMAPBUFFERPROC __glewMapBuffer = NULL;
-PFNGLUNMAPBUFFERPROC __glewUnmapBuffer = NULL;
-
-PFNGLATTACHSHADERPROC __glewAttachShader = NULL;
-PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation = NULL;
-PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate = NULL;
-PFNGLCOMPILESHADERPROC __glewCompileShader = NULL;
-PFNGLCREATEPROGRAMPROC __glewCreateProgram = NULL;
-PFNGLCREATESHADERPROC __glewCreateShader = NULL;
-PFNGLDELETEPROGRAMPROC __glewDeleteProgram = NULL;
-PFNGLDELETESHADERPROC __glewDeleteShader = NULL;
-PFNGLDETACHSHADERPROC __glewDetachShader = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray = NULL;
-PFNGLDRAWBUFFERSPROC __glewDrawBuffers = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray = NULL;
-PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib = NULL;
-PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform = NULL;
-PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders = NULL;
-PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation = NULL;
-PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog = NULL;
-PFNGLGETPROGRAMIVPROC __glewGetProgramiv = NULL;
-PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog = NULL;
-PFNGLGETSHADERSOURCEPROC __glewGetShaderSource = NULL;
-PFNGLGETSHADERIVPROC __glewGetShaderiv = NULL;
-PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation = NULL;
-PFNGLGETUNIFORMFVPROC __glewGetUniformfv = NULL;
-PFNGLGETUNIFORMIVPROC __glewGetUniformiv = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv = NULL;
-PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv = NULL;
-PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv = NULL;
-PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv = NULL;
-PFNGLISPROGRAMPROC __glewIsProgram = NULL;
-PFNGLISSHADERPROC __glewIsShader = NULL;
-PFNGLLINKPROGRAMPROC __glewLinkProgram = NULL;
-PFNGLSHADERSOURCEPROC __glewShaderSource = NULL;
-PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate = NULL;
-PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate = NULL;
-PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate = NULL;
-PFNGLUNIFORM1FPROC __glewUniform1f = NULL;
-PFNGLUNIFORM1FVPROC __glewUniform1fv = NULL;
-PFNGLUNIFORM1IPROC __glewUniform1i = NULL;
-PFNGLUNIFORM1IVPROC __glewUniform1iv = NULL;
-PFNGLUNIFORM2FPROC __glewUniform2f = NULL;
-PFNGLUNIFORM2FVPROC __glewUniform2fv = NULL;
-PFNGLUNIFORM2IPROC __glewUniform2i = NULL;
-PFNGLUNIFORM2IVPROC __glewUniform2iv = NULL;
-PFNGLUNIFORM3FPROC __glewUniform3f = NULL;
-PFNGLUNIFORM3FVPROC __glewUniform3fv = NULL;
-PFNGLUNIFORM3IPROC __glewUniform3i = NULL;
-PFNGLUNIFORM3IVPROC __glewUniform3iv = NULL;
-PFNGLUNIFORM4FPROC __glewUniform4f = NULL;
-PFNGLUNIFORM4FVPROC __glewUniform4fv = NULL;
-PFNGLUNIFORM4IPROC __glewUniform4i = NULL;
-PFNGLUNIFORM4IVPROC __glewUniform4iv = NULL;
-PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv = NULL;
-PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv = NULL;
-PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv = NULL;
-PFNGLUSEPROGRAMPROC __glewUseProgram = NULL;
-PFNGLVALIDATEPROGRAMPROC __glewValidateProgram = NULL;
-PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d = NULL;
-PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv = NULL;
-PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f = NULL;
-PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv = NULL;
-PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s = NULL;
-PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv = NULL;
-PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d = NULL;
-PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv = NULL;
-PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f = NULL;
-PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv = NULL;
-PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s = NULL;
-PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv = NULL;
-PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d = NULL;
-PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv = NULL;
-PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f = NULL;
-PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv = NULL;
-PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s = NULL;
-PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv = NULL;
-PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv = NULL;
-PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv = NULL;
-PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv = NULL;
-PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub = NULL;
-PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv = NULL;
-PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv = NULL;
-PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv = NULL;
-PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv = NULL;
-PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d = NULL;
-PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv = NULL;
-PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f = NULL;
-PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv = NULL;
-PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv = NULL;
-PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s = NULL;
-PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv = NULL;
-PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv = NULL;
-PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv = NULL;
-PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv = NULL;
-PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer = NULL;
-
-PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv = NULL;
-PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv = NULL;
-PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv = NULL;
-PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv = NULL;
-PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv = NULL;
-PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv = NULL;
-
-PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender = NULL;
-PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback = NULL;
-PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation = NULL;
-PFNGLCLAMPCOLORPROC __glewClampColor = NULL;
-PFNGLCLEARBUFFERFIPROC __glewClearBufferfi = NULL;
-PFNGLCLEARBUFFERFVPROC __glewClearBufferfv = NULL;
-PFNGLCLEARBUFFERIVPROC __glewClearBufferiv = NULL;
-PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv = NULL;
-PFNGLCOLORMASKIPROC __glewColorMaski = NULL;
-PFNGLDISABLEIPROC __glewDisablei = NULL;
-PFNGLENABLEIPROC __glewEnablei = NULL;
-PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender = NULL;
-PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback = NULL;
-PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v = NULL;
-PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation = NULL;
-PFNGLGETSTRINGIPROC __glewGetStringi = NULL;
-PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv = NULL;
-PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv = NULL;
-PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying = NULL;
-PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv = NULL;
-PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv = NULL;
-PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv = NULL;
-PFNGLISENABLEDIPROC __glewIsEnabledi = NULL;
-PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv = NULL;
-PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv = NULL;
-PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings = NULL;
-PFNGLUNIFORM1UIPROC __glewUniform1ui = NULL;
-PFNGLUNIFORM1UIVPROC __glewUniform1uiv = NULL;
-PFNGLUNIFORM2UIPROC __glewUniform2ui = NULL;
-PFNGLUNIFORM2UIVPROC __glewUniform2uiv = NULL;
-PFNGLUNIFORM3UIPROC __glewUniform3ui = NULL;
-PFNGLUNIFORM3UIVPROC __glewUniform3uiv = NULL;
-PFNGLUNIFORM4UIPROC __glewUniform4ui = NULL;
-PFNGLUNIFORM4UIVPROC __glewUniform4uiv = NULL;
-PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i = NULL;
-PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv = NULL;
-PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui = NULL;
-PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv = NULL;
-PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i = NULL;
-PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv = NULL;
-PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui = NULL;
-PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv = NULL;
-PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i = NULL;
-PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv = NULL;
-PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui = NULL;
-PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv = NULL;
-PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv = NULL;
-PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i = NULL;
-PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv = NULL;
-PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv = NULL;
-PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv = NULL;
-PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui = NULL;
-PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv = NULL;
-PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv = NULL;
-PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer = NULL;
-
-PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced = NULL;
-PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced = NULL;
-PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex = NULL;
-PFNGLTEXBUFFERPROC __glewTexBuffer = NULL;
-
-PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture = NULL;
-PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v = NULL;
-PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v = NULL;
-
-PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor = NULL;
-
-PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei = NULL;
-PFNGLBLENDEQUATIONIPROC __glewBlendEquationi = NULL;
-PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei = NULL;
-PFNGLBLENDFUNCIPROC __glewBlendFunci = NULL;
-PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading = NULL;
-
-PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL;
-
-PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD = NULL;
-PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD = NULL;
-PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD = NULL;
-PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD = NULL;
-
-PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD = NULL;
-PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD = NULL;
-PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD = NULL;
-PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD = NULL;
-
-PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD = NULL;
-PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD = NULL;
-
-PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD = NULL;
-PFNGLGENNAMESAMDPROC __glewGenNamesAMD = NULL;
-PFNGLISNAMEAMDPROC __glewIsNameAMD = NULL;
-
-PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD = NULL;
-PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD = NULL;
-PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD = NULL;
-PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD = NULL;
-PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD = NULL;
-PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD = NULL;
-PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD = NULL;
-PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD = NULL;
-PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD = NULL;
-PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD = NULL;
-PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD = NULL;
-
-PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD = NULL;
-
-PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD = NULL;
-
-PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD = NULL;
-PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD = NULL;
-
-PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE = NULL;
-PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE = NULL;
-PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE = NULL;
-PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE = NULL;
-PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE = NULL;
-
-PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE = NULL;
-PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE = NULL;
-PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE = NULL;
-PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE = NULL;
-PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE = NULL;
-PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE = NULL;
-PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE = NULL;
-PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE = NULL;
-
-PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE = NULL;
-PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE = NULL;
-
-PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE = NULL;
-PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE = NULL;
-PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE = NULL;
-
-PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE = NULL;
-PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE = NULL;
-
-PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE = NULL;
-PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE = NULL;
-PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE = NULL;
-PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE = NULL;
-
-PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE = NULL;
-PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE = NULL;
-PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE = NULL;
-
-PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE = NULL;
-PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE = NULL;
-PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE = NULL;
-PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE = NULL;
-PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE = NULL;
-PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE = NULL;
-PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE = NULL;
-
-PFNGLCLEARDEPTHFPROC __glewClearDepthf = NULL;
-PFNGLDEPTHRANGEFPROC __glewDepthRangef = NULL;
-PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat = NULL;
-PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler = NULL;
-PFNGLSHADERBINARYPROC __glewShaderBinary = NULL;
-
-PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance = NULL;
-
-PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed = NULL;
-PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex = NULL;
-
-PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB = NULL;
-
-PFNGLCLEARBUFFERDATAPROC __glewClearBufferData = NULL;
-PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData = NULL;
-PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT = NULL;
-PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT = NULL;
-
-PFNGLCLAMPCOLORARBPROC __glewClampColorARB = NULL;
-
-PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute = NULL;
-PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect = NULL;
-
-PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData = NULL;
-
-PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData = NULL;
-
-PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB = NULL;
-PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB = NULL;
-PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB = NULL;
-PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB = NULL;
-
-PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB = NULL;
-
-PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB = NULL;
-PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB = NULL;
-PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB = NULL;
-PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB = NULL;
-
-PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex = NULL;
-PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex = NULL;
-PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex = NULL;
-
-PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect = NULL;
-PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect = NULL;
-
-PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri = NULL;
-PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv = NULL;
-PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT = NULL;
-
-PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer = NULL;
-PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer = NULL;
-PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer = NULL;
-PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus = NULL;
-PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers = NULL;
-PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers = NULL;
-PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer = NULL;
-PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D = NULL;
-PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D = NULL;
-PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D = NULL;
-PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer = NULL;
-PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers = NULL;
-PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers = NULL;
-PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap = NULL;
-PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv = NULL;
-PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv = NULL;
-PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer = NULL;
-PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer = NULL;
-PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage = NULL;
-PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample = NULL;
-
-PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB = NULL;
-PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB = NULL;
-PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB = NULL;
-PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB = NULL;
-
-PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary = NULL;
-PFNGLPROGRAMBINARYPROC __glewProgramBinary = NULL;
-PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri = NULL;
-
-PFNGLGETUNIFORMDVPROC __glewGetUniformdv = NULL;
-PFNGLUNIFORM1DPROC __glewUniform1d = NULL;
-PFNGLUNIFORM1DVPROC __glewUniform1dv = NULL;
-PFNGLUNIFORM2DPROC __glewUniform2d = NULL;
-PFNGLUNIFORM2DVPROC __glewUniform2dv = NULL;
-PFNGLUNIFORM3DPROC __glewUniform3d = NULL;
-PFNGLUNIFORM3DVPROC __glewUniform3dv = NULL;
-PFNGLUNIFORM4DPROC __glewUniform4d = NULL;
-PFNGLUNIFORM4DVPROC __glewUniform4dv = NULL;
-PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv = NULL;
-PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv = NULL;
-PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv = NULL;
-PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv = NULL;
-PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv = NULL;
-PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv = NULL;
-PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv = NULL;
-PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv = NULL;
-PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv = NULL;
-
-PFNGLCOLORSUBTABLEPROC __glewColorSubTable = NULL;
-PFNGLCOLORTABLEPROC __glewColorTable = NULL;
-PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv = NULL;
-PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv = NULL;
-PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D = NULL;
-PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D = NULL;
-PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf = NULL;
-PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv = NULL;
-PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri = NULL;
-PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv = NULL;
-PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable = NULL;
-PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable = NULL;
-PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D = NULL;
-PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D = NULL;
-PFNGLGETCOLORTABLEPROC __glewGetColorTable = NULL;
-PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv = NULL;
-PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv = NULL;
-PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter = NULL;
-PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv = NULL;
-PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv = NULL;
-PFNGLGETHISTOGRAMPROC __glewGetHistogram = NULL;
-PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv = NULL;
-PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv = NULL;
-PFNGLGETMINMAXPROC __glewGetMinmax = NULL;
-PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv = NULL;
-PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv = NULL;
-PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter = NULL;
-PFNGLHISTOGRAMPROC __glewHistogram = NULL;
-PFNGLMINMAXPROC __glewMinmax = NULL;
-PFNGLRESETHISTOGRAMPROC __glewResetHistogram = NULL;
-PFNGLRESETMINMAXPROC __glewResetMinmax = NULL;
-PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D = NULL;
-
-PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB = NULL;
-PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB = NULL;
-PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB = NULL;
-
-PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ = NULL;
-
-PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v = NULL;
-
-PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData = NULL;
-PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData = NULL;
-PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer = NULL;
-PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer = NULL;
-PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage = NULL;
-PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage = NULL;
-
-PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange = NULL;
-PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange = NULL;
-
-PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB = NULL;
-PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB = NULL;
-PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB = NULL;
-PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB = NULL;
-PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB = NULL;
-
-PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect = NULL;
-PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect = NULL;
-
-PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB = NULL;
-
-PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB = NULL;
-PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB = NULL;
-PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB = NULL;
-PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB = NULL;
-PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB = NULL;
-PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB = NULL;
-PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB = NULL;
-PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB = NULL;
-PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB = NULL;
-PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB = NULL;
-PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB = NULL;
-PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB = NULL;
-PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB = NULL;
-PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB = NULL;
-PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB = NULL;
-PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB = NULL;
-PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB = NULL;
-PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB = NULL;
-PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB = NULL;
-PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB = NULL;
-PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB = NULL;
-PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB = NULL;
-PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB = NULL;
-PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB = NULL;
-PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB = NULL;
-PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB = NULL;
-PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB = NULL;
-PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB = NULL;
-PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB = NULL;
-PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB = NULL;
-PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB = NULL;
-PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB = NULL;
-PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB = NULL;
-PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB = NULL;
-
-PFNGLBEGINQUERYARBPROC __glewBeginQueryARB = NULL;
-PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB = NULL;
-PFNGLENDQUERYARBPROC __glewEndQueryARB = NULL;
-PFNGLGENQUERIESARBPROC __glewGenQueriesARB = NULL;
-PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB = NULL;
-PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB = NULL;
-PFNGLGETQUERYIVARBPROC __glewGetQueryivARB = NULL;
-PFNGLISQUERYARBPROC __glewIsQueryARB = NULL;
-
-PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB = NULL;
-PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB = NULL;
-
-PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv = NULL;
-PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex = NULL;
-PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation = NULL;
-PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex = NULL;
-PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName = NULL;
-PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv = NULL;
-
-PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex = NULL;
-
-PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB = NULL;
-PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB = NULL;
-PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB = NULL;
-PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB = NULL;
-PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB = NULL;
-PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB = NULL;
-PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB = NULL;
-PFNGLGETNMAPIVARBPROC __glewGetnMapivARB = NULL;
-PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB = NULL;
-PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB = NULL;
-PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB = NULL;
-PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB = NULL;
-PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB = NULL;
-PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB = NULL;
-PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB = NULL;
-PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB = NULL;
-PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB = NULL;
-PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB = NULL;
-PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB = NULL;
-PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB = NULL;
-
-PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB = NULL;
-
-PFNGLBINDSAMPLERPROC __glewBindSampler = NULL;
-PFNGLDELETESAMPLERSPROC __glewDeleteSamplers = NULL;
-PFNGLGENSAMPLERSPROC __glewGenSamplers = NULL;
-PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv = NULL;
-PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv = NULL;
-PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv = NULL;
-PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv = NULL;
-PFNGLISSAMPLERPROC __glewIsSampler = NULL;
-PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv = NULL;
-PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv = NULL;
-PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf = NULL;
-PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv = NULL;
-PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri = NULL;
-PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv = NULL;
-
-PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram = NULL;
-PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline = NULL;
-PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv = NULL;
-PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines = NULL;
-PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines = NULL;
-PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog = NULL;
-PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv = NULL;
-PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline = NULL;
-PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d = NULL;
-PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv = NULL;
-PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f = NULL;
-PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv = NULL;
-PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i = NULL;
-PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv = NULL;
-PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui = NULL;
-PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv = NULL;
-PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d = NULL;
-PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv = NULL;
-PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f = NULL;
-PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv = NULL;
-PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i = NULL;
-PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv = NULL;
-PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui = NULL;
-PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv = NULL;
-PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d = NULL;
-PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv = NULL;
-PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f = NULL;
-PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv = NULL;
-PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i = NULL;
-PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv = NULL;
-PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui = NULL;
-PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv = NULL;
-PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d = NULL;
-PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv = NULL;
-PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f = NULL;
-PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv = NULL;
-PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i = NULL;
-PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv = NULL;
-PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui = NULL;
-PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv = NULL;
-PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages = NULL;
-PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline = NULL;
-
-PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv = NULL;
-
-PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture = NULL;
-PFNGLMEMORYBARRIERPROC __glewMemoryBarrier = NULL;
-
-PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB = NULL;
-PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB = NULL;
-PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB = NULL;
-PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB = NULL;
-PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB = NULL;
-PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB = NULL;
-PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB = NULL;
-PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB = NULL;
-PFNGLGETHANDLEARBPROC __glewGetHandleARB = NULL;
-PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB = NULL;
-PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB = NULL;
-PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB = NULL;
-PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB = NULL;
-PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB = NULL;
-PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB = NULL;
-PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB = NULL;
-PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB = NULL;
-PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB = NULL;
-PFNGLUNIFORM1FARBPROC __glewUniform1fARB = NULL;
-PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB = NULL;
-PFNGLUNIFORM1IARBPROC __glewUniform1iARB = NULL;
-PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB = NULL;
-PFNGLUNIFORM2FARBPROC __glewUniform2fARB = NULL;
-PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB = NULL;
-PFNGLUNIFORM2IARBPROC __glewUniform2iARB = NULL;
-PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB = NULL;
-PFNGLUNIFORM3FARBPROC __glewUniform3fARB = NULL;
-PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB = NULL;
-PFNGLUNIFORM3IARBPROC __glewUniform3iARB = NULL;
-PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB = NULL;
-PFNGLUNIFORM4FARBPROC __glewUniform4fARB = NULL;
-PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB = NULL;
-PFNGLUNIFORM4IARBPROC __glewUniform4iARB = NULL;
-PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB = NULL;
-PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB = NULL;
-PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB = NULL;
-PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB = NULL;
-PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB = NULL;
-PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB = NULL;
-
-PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding = NULL;
-
-PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName = NULL;
-PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName = NULL;
-PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv = NULL;
-PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv = NULL;
-PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex = NULL;
-PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation = NULL;
-PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv = NULL;
-PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv = NULL;
-
-PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB = NULL;
-PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB = NULL;
-PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB = NULL;
-PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB = NULL;
-PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB = NULL;
-PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB = NULL;
-
-PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync = NULL;
-PFNGLDELETESYNCPROC __glewDeleteSync = NULL;
-PFNGLFENCESYNCPROC __glewFenceSync = NULL;
-PFNGLGETINTEGER64VPROC __glewGetInteger64v = NULL;
-PFNGLGETSYNCIVPROC __glewGetSynciv = NULL;
-PFNGLISSYNCPROC __glewIsSync = NULL;
-PFNGLWAITSYNCPROC __glewWaitSync = NULL;
-
-PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv = NULL;
-PFNGLPATCHPARAMETERIPROC __glewPatchParameteri = NULL;
-
-PFNGLTEXBUFFERARBPROC __glewTexBufferARB = NULL;
-
-PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange = NULL;
-PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT = NULL;
-
-PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB = NULL;
-PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB = NULL;
-PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB = NULL;
-PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB = NULL;
-
-PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv = NULL;
-PFNGLSAMPLEMASKIPROC __glewSampleMaski = NULL;
-PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample = NULL;
-PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample = NULL;
-
-PFNGLTEXSTORAGE1DPROC __glewTexStorage1D = NULL;
-PFNGLTEXSTORAGE2DPROC __glewTexStorage2D = NULL;
-PFNGLTEXSTORAGE3DPROC __glewTexStorage3D = NULL;
-PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT = NULL;
-PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT = NULL;
-PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT = NULL;
-
-PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample = NULL;
-PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample = NULL;
-PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT = NULL;
-PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT = NULL;
-
-PFNGLTEXTUREVIEWPROC __glewTextureView = NULL;
-
-PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v = NULL;
-PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v = NULL;
-PFNGLQUERYCOUNTERPROC __glewQueryCounter = NULL;
-
-PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback = NULL;
-PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback = NULL;
-PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks = NULL;
-PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback = NULL;
-PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback = NULL;
-PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback = NULL;
-
-PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream = NULL;
-PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed = NULL;
-PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv = NULL;
-
-PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced = NULL;
-
-PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB = NULL;
-PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB = NULL;
-PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB = NULL;
-PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB = NULL;
-
-PFNGLBINDBUFFERBASEPROC __glewBindBufferBase = NULL;
-PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange = NULL;
-PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName = NULL;
-PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv = NULL;
-PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName = NULL;
-PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv = NULL;
-PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v = NULL;
-PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex = NULL;
-PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices = NULL;
-PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding = NULL;
-
-PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray = NULL;
-PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays = NULL;
-PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays = NULL;
-PFNGLISVERTEXARRAYPROC __glewIsVertexArray = NULL;
-
-PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv = NULL;
-PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d = NULL;
-PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv = NULL;
-PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d = NULL;
-PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv = NULL;
-PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d = NULL;
-PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv = NULL;
-PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d = NULL;
-PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv = NULL;
-PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer = NULL;
-
-PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer = NULL;
-PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding = NULL;
-PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat = NULL;
-PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat = NULL;
-PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat = NULL;
-PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor = NULL;
-
-PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB = NULL;
-PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB = NULL;
-PFNGLWEIGHTBVARBPROC __glewWeightbvARB = NULL;
-PFNGLWEIGHTDVARBPROC __glewWeightdvARB = NULL;
-PFNGLWEIGHTFVARBPROC __glewWeightfvARB = NULL;
-PFNGLWEIGHTIVARBPROC __glewWeightivARB = NULL;
-PFNGLWEIGHTSVARBPROC __glewWeightsvARB = NULL;
-PFNGLWEIGHTUBVARBPROC __glewWeightubvARB = NULL;
-PFNGLWEIGHTUIVARBPROC __glewWeightuivARB = NULL;
-PFNGLWEIGHTUSVARBPROC __glewWeightusvARB = NULL;
-
-PFNGLBINDBUFFERARBPROC __glewBindBufferARB = NULL;
-PFNGLBUFFERDATAARBPROC __glewBufferDataARB = NULL;
-PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB = NULL;
-PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB = NULL;
-PFNGLGENBUFFERSARBPROC __glewGenBuffersARB = NULL;
-PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB = NULL;
-PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB = NULL;
-PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB = NULL;
-PFNGLISBUFFERARBPROC __glewIsBufferARB = NULL;
-PFNGLMAPBUFFERARBPROC __glewMapBufferARB = NULL;
-PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB = NULL;
-
-PFNGLBINDPROGRAMARBPROC __glewBindProgramARB = NULL;
-PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB = NULL;
-PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB = NULL;
-PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB = NULL;
-PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB = NULL;
-PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB = NULL;
-PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB = NULL;
-PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB = NULL;
-PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB = NULL;
-PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB = NULL;
-PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB = NULL;
-PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB = NULL;
-PFNGLISPROGRAMARBPROC __glewIsProgramARB = NULL;
-PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB = NULL;
-PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB = NULL;
-PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB = NULL;
-PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB = NULL;
-PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB = NULL;
-PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB = NULL;
-PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB = NULL;
-PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB = NULL;
-PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB = NULL;
-PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB = NULL;
-PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB = NULL;
-PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB = NULL;
-PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB = NULL;
-PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB = NULL;
-PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB = NULL;
-PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB = NULL;
-PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB = NULL;
-PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB = NULL;
-PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB = NULL;
-PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB = NULL;
-PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB = NULL;
-PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB = NULL;
-PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB = NULL;
-PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB = NULL;
-PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB = NULL;
-PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB = NULL;
-PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB = NULL;
-PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB = NULL;
-PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB = NULL;
-PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB = NULL;
-PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB = NULL;
-PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB = NULL;
-PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB = NULL;
-PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB = NULL;
-PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB = NULL;
-PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB = NULL;
-PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB = NULL;
-PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB = NULL;
-PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB = NULL;
-PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB = NULL;
-PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB = NULL;
-PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB = NULL;
-
-PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB = NULL;
-PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB = NULL;
-PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB = NULL;
-
-PFNGLCOLORP3UIPROC __glewColorP3ui = NULL;
-PFNGLCOLORP3UIVPROC __glewColorP3uiv = NULL;
-PFNGLCOLORP4UIPROC __glewColorP4ui = NULL;
-PFNGLCOLORP4UIVPROC __glewColorP4uiv = NULL;
-PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui = NULL;
-PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv = NULL;
-PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui = NULL;
-PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv = NULL;
-PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui = NULL;
-PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv = NULL;
-PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui = NULL;
-PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv = NULL;
-PFNGLNORMALP3UIPROC __glewNormalP3ui = NULL;
-PFNGLNORMALP3UIVPROC __glewNormalP3uiv = NULL;
-PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui = NULL;
-PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv = NULL;
-PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui = NULL;
-PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv = NULL;
-PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui = NULL;
-PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv = NULL;
-PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui = NULL;
-PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv = NULL;
-PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui = NULL;
-PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv = NULL;
-PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui = NULL;
-PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv = NULL;
-PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui = NULL;
-PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv = NULL;
-PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui = NULL;
-PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv = NULL;
-PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui = NULL;
-PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv = NULL;
-PFNGLVERTEXP2UIPROC __glewVertexP2ui = NULL;
-PFNGLVERTEXP2UIVPROC __glewVertexP2uiv = NULL;
-PFNGLVERTEXP3UIPROC __glewVertexP3ui = NULL;
-PFNGLVERTEXP3UIVPROC __glewVertexP3uiv = NULL;
-PFNGLVERTEXP4UIPROC __glewVertexP4ui = NULL;
-PFNGLVERTEXP4UIVPROC __glewVertexP4uiv = NULL;
-
-PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv = NULL;
-PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed = NULL;
-PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v = NULL;
-PFNGLGETFLOATI_VPROC __glewGetFloati_v = NULL;
-PFNGLSCISSORARRAYVPROC __glewScissorArrayv = NULL;
-PFNGLSCISSORINDEXEDPROC __glewScissorIndexed = NULL;
-PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv = NULL;
-PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv = NULL;
-PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf = NULL;
-PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv = NULL;
-
-PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB = NULL;
-PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB = NULL;
-PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB = NULL;
-PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB = NULL;
-PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB = NULL;
-PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB = NULL;
-PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB = NULL;
-PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB = NULL;
-PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB = NULL;
-PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB = NULL;
-PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB = NULL;
-PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB = NULL;
-PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB = NULL;
-PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB = NULL;
-PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB = NULL;
-PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB = NULL;
-
-PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI = NULL;
-
-PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI = NULL;
-PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI = NULL;
-PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI = NULL;
-
-PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI = NULL;
-PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI = NULL;
-PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI = NULL;
-PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI = NULL;
-
-PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI = NULL;
-PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI = NULL;
-PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI = NULL;
-PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI = NULL;
-PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI = NULL;
-PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI = NULL;
-PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI = NULL;
-PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI = NULL;
-PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI = NULL;
-PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI = NULL;
-PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI = NULL;
-PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI = NULL;
-PFNGLSAMPLEMAPATIPROC __glewSampleMapATI = NULL;
-PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI = NULL;
-
-PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI = NULL;
-PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI = NULL;
-
-PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI = NULL;
-PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI = NULL;
-
-PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI = NULL;
-PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI = NULL;
-
-PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI = NULL;
-PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI = NULL;
-PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI = NULL;
-PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI = NULL;
-PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI = NULL;
-PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI = NULL;
-PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI = NULL;
-PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI = NULL;
-PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI = NULL;
-PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI = NULL;
-PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI = NULL;
-PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI = NULL;
-
-PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI = NULL;
-PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI = NULL;
-PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI = NULL;
-
-PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI = NULL;
-PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI = NULL;
-PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI = NULL;
-PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI = NULL;
-PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI = NULL;
-PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI = NULL;
-PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI = NULL;
-PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI = NULL;
-PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI = NULL;
-PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI = NULL;
-PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI = NULL;
-PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI = NULL;
-PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI = NULL;
-PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI = NULL;
-PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI = NULL;
-PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI = NULL;
-PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI = NULL;
-PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI = NULL;
-PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI = NULL;
-PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI = NULL;
-PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI = NULL;
-PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI = NULL;
-PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI = NULL;
-PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI = NULL;
-PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI = NULL;
-PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI = NULL;
-PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI = NULL;
-PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI = NULL;
-PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI = NULL;
-PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI = NULL;
-PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI = NULL;
-PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI = NULL;
-PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI = NULL;
-PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI = NULL;
-PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI = NULL;
-PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI = NULL;
-PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI = NULL;
-PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI = NULL;
-PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI = NULL;
-PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI = NULL;
-PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI = NULL;
-PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI = NULL;
-PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI = NULL;
-PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI = NULL;
-PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI = NULL;
-
-PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT = NULL;
-PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT = NULL;
-PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT = NULL;
-
-PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT = NULL;
-
-PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT = NULL;
-
-PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT = NULL;
-
-PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT = NULL;
-
-PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT = NULL;
-PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT = NULL;
-
-PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT = NULL;
-PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT = NULL;
-
-PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT = NULL;
-PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT = NULL;
-PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT = NULL;
-PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT = NULL;
-PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT = NULL;
-PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT = NULL;
-PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT = NULL;
-PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT = NULL;
-PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT = NULL;
-PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT = NULL;
-PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT = NULL;
-PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT = NULL;
-PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT = NULL;
-
-PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT = NULL;
-PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT = NULL;
-
-PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT = NULL;
-PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT = NULL;
-PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT = NULL;
-PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT = NULL;
-PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL;
-
-PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL;
-PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL;
-
-PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT = NULL;
-PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT = NULL;
-PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT = NULL;
-
-PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT = NULL;
-
-PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT = NULL;
-PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT = NULL;
-PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT = NULL;
-PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT = NULL;
-PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT = NULL;
-PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT = NULL;
-PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT = NULL;
-PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT = NULL;
-PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT = NULL;
-PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT = NULL;
-PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT = NULL;
-PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT = NULL;
-PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT = NULL;
-PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT = NULL;
-PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT = NULL;
-PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT = NULL;
-PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT = NULL;
-PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT = NULL;
-PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT = NULL;
-PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT = NULL;
-PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT = NULL;
-PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT = NULL;
-PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT = NULL;
-PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT = NULL;
-PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT = NULL;
-PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT = NULL;
-PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT = NULL;
-PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT = NULL;
-PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT = NULL;
-PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT = NULL;
-PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT = NULL;
-PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT = NULL;
-PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT = NULL;
-PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT = NULL;
-PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT = NULL;
-PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT = NULL;
-PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT = NULL;
-PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT = NULL;
-PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT = NULL;
-PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT = NULL;
-PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT = NULL;
-PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT = NULL;
-PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT = NULL;
-PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT = NULL;
-PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT = NULL;
-PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT = NULL;
-PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT = NULL;
-PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT = NULL;
-PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT = NULL;
-PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT = NULL;
-PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT = NULL;
-PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT = NULL;
-PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT = NULL;
-PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT = NULL;
-PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT = NULL;
-PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT = NULL;
-PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT = NULL;
-PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT = NULL;
-PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT = NULL;
-PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT = NULL;
-PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT = NULL;
-PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT = NULL;
-PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT = NULL;
-PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT = NULL;
-PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT = NULL;
-PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT = NULL;
-PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT = NULL;
-PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT = NULL;
-PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT = NULL;
-PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT = NULL;
-PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT = NULL;
-PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT = NULL;
-PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT = NULL;
-PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT = NULL;
-PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT = NULL;
-PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT = NULL;
-PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT = NULL;
-PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT = NULL;
-PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT = NULL;
-PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT = NULL;
-PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT = NULL;
-PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT = NULL;
-PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT = NULL;
-PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT = NULL;
-PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT = NULL;
-PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT = NULL;
-PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT = NULL;
-PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT = NULL;
-PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT = NULL;
-PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT = NULL;
-PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT = NULL;
-PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT = NULL;
-PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT = NULL;
-PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT = NULL;
-PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT = NULL;
-PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT = NULL;
-PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT = NULL;
-PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT = NULL;
-PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT = NULL;
-PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT = NULL;
-PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT = NULL;
-PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT = NULL;
-PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT = NULL;
-PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT = NULL;
-PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT = NULL;
-PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT = NULL;
-PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT = NULL;
-PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT = NULL;
-PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT = NULL;
-PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT = NULL;
-PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT = NULL;
-PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT = NULL;
-PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT = NULL;
-PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT = NULL;
-PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT = NULL;
-PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT = NULL;
-PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT = NULL;
-PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT = NULL;
-PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT = NULL;
-PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT = NULL;
-PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT = NULL;
-PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT = NULL;
-PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT = NULL;
-PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT = NULL;
-PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT = NULL;
-PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT = NULL;
-PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT = NULL;
-PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT = NULL;
-PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT = NULL;
-PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT = NULL;
-PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT = NULL;
-PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT = NULL;
-PFNGLPROGRAMUNIFORM1DEXTPROC __glewProgramUniform1dEXT = NULL;
-PFNGLPROGRAMUNIFORM1DVEXTPROC __glewProgramUniform1dvEXT = NULL;
-PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT = NULL;
-PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT = NULL;
-PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT = NULL;
-PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT = NULL;
-PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT = NULL;
-PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT = NULL;
-PFNGLPROGRAMUNIFORM2DEXTPROC __glewProgramUniform2dEXT = NULL;
-PFNGLPROGRAMUNIFORM2DVEXTPROC __glewProgramUniform2dvEXT = NULL;
-PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT = NULL;
-PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT = NULL;
-PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT = NULL;
-PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT = NULL;
-PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT = NULL;
-PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT = NULL;
-PFNGLPROGRAMUNIFORM3DEXTPROC __glewProgramUniform3dEXT = NULL;
-PFNGLPROGRAMUNIFORM3DVEXTPROC __glewProgramUniform3dvEXT = NULL;
-PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT = NULL;
-PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT = NULL;
-PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT = NULL;
-PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT = NULL;
-PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT = NULL;
-PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT = NULL;
-PFNGLPROGRAMUNIFORM4DEXTPROC __glewProgramUniform4dEXT = NULL;
-PFNGLPROGRAMUNIFORM4DVEXTPROC __glewProgramUniform4dvEXT = NULL;
-PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT = NULL;
-PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT = NULL;
-PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT = NULL;
-PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT = NULL;
-PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT = NULL;
-PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC __glewProgramUniformMatrix2dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC __glewProgramUniformMatrix2x3dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC __glewProgramUniformMatrix2x4dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC __glewProgramUniformMatrix3dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC __glewProgramUniformMatrix3x2dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC __glewProgramUniformMatrix3x4dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC __glewProgramUniformMatrix4dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC __glewProgramUniformMatrix4x2dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC __glewProgramUniformMatrix4x3dvEXT = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT = NULL;
-PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT = NULL;
-PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT = NULL;
-PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT = NULL;
-PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT = NULL;
-PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT = NULL;
-PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT = NULL;
-PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT = NULL;
-PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT = NULL;
-PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT = NULL;
-PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT = NULL;
-PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT = NULL;
-PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT = NULL;
-PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT = NULL;
-PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT = NULL;
-PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT = NULL;
-PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT = NULL;
-PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT = NULL;
-PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT = NULL;
-PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT = NULL;
-PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT = NULL;
-PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT = NULL;
-PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT = NULL;
-PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT = NULL;
-PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT = NULL;
-PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT = NULL;
-PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT = NULL;
-PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT = NULL;
-
-PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT = NULL;
-PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT = NULL;
-PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT = NULL;
-PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT = NULL;
-PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT = NULL;
-PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT = NULL;
-
-PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT = NULL;
-PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT = NULL;
-
-PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT = NULL;
-
-PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT = NULL;
-PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT = NULL;
-PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT = NULL;
-PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT = NULL;
-PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT = NULL;
-
-PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT = NULL;
-PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT = NULL;
-PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT = NULL;
-PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT = NULL;
-PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT = NULL;
-PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT = NULL;
-PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT = NULL;
-PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT = NULL;
-PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT = NULL;
-PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT = NULL;
-PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT = NULL;
-PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT = NULL;
-PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT = NULL;
-PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT = NULL;
-PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT = NULL;
-PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT = NULL;
-PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT = NULL;
-PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT = NULL;
-
-PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL;
-
-PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT = NULL;
-
-PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT = NULL;
-PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT = NULL;
-PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT = NULL;
-PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT = NULL;
-PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT = NULL;
-PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT = NULL;
-PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT = NULL;
-PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT = NULL;
-PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT = NULL;
-PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT = NULL;
-PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT = NULL;
-PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT = NULL;
-PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT = NULL;
-PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT = NULL;
-
-PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT = NULL;
-PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT = NULL;
-PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT = NULL;
-
-PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT = NULL;
-PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT = NULL;
-
-PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT = NULL;
-PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT = NULL;
-PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT = NULL;
-PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT = NULL;
-PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT = NULL;
-PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT = NULL;
-PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT = NULL;
-PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT = NULL;
-PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT = NULL;
-PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT = NULL;
-PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT = NULL;
-PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT = NULL;
-PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT = NULL;
-PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT = NULL;
-PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT = NULL;
-PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT = NULL;
-PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT = NULL;
-PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT = NULL;
-PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT = NULL;
-PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT = NULL;
-PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT = NULL;
-PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT = NULL;
-PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT = NULL;
-PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT = NULL;
-PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT = NULL;
-PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT = NULL;
-PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT = NULL;
-PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT = NULL;
-PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT = NULL;
-PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT = NULL;
-PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT = NULL;
-PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT = NULL;
-PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT = NULL;
-PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT = NULL;
-
-PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT = NULL;
-PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT = NULL;
-PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT = NULL;
-PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT = NULL;
-PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT = NULL;
-PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT = NULL;
-PFNGLHISTOGRAMEXTPROC __glewHistogramEXT = NULL;
-PFNGLMINMAXEXTPROC __glewMinmaxEXT = NULL;
-PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT = NULL;
-PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT = NULL;
-
-PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT = NULL;
-
-PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT = NULL;
-
-PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT = NULL;
-PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT = NULL;
-PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT = NULL;
-
-PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL;
-PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL;
-
-PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT = NULL;
-PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT = NULL;
-
-PFNGLCOLORTABLEEXTPROC __glewColorTableEXT = NULL;
-PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT = NULL;
-PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT = NULL;
-PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT = NULL;
-
-PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT = NULL;
-PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT = NULL;
-PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT = NULL;
-PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT = NULL;
-PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT = NULL;
-PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT = NULL;
-
-PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT = NULL;
-PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT = NULL;
-
-PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT = NULL;
-
-PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT = NULL;
-
-PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT = NULL;
-PFNGLENDSCENEEXTPROC __glewEndSceneEXT = NULL;
-
-PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT = NULL;
-PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT = NULL;
-PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT = NULL;
-PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT = NULL;
-PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT = NULL;
-PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT = NULL;
-PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT = NULL;
-PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT = NULL;
-PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT = NULL;
-PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT = NULL;
-PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT = NULL;
-PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT = NULL;
-PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT = NULL;
-PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT = NULL;
-PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT = NULL;
-PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL;
-PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL;
-
-PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT = NULL;
-PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT = NULL;
-PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT = NULL;
-
-PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT = NULL;
-PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT = NULL;
-
-PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT = NULL;
-
-PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT = NULL;
-PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT = NULL;
-PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT = NULL;
-
-PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT = NULL;
-
-PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT = NULL;
-
-PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT = NULL;
-
-PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT = NULL;
-PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT = NULL;
-PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT = NULL;
-PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT = NULL;
-PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT = NULL;
-PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT = NULL;
-
-PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT = NULL;
-PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT = NULL;
-PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT = NULL;
-PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT = NULL;
-PFNGLISTEXTUREEXTPROC __glewIsTextureEXT = NULL;
-PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT = NULL;
-
-PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT = NULL;
-
-PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT = NULL;
-PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT = NULL;
-
-PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT = NULL;
-PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT = NULL;
-PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT = NULL;
-PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT = NULL;
-PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT = NULL;
-PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT = NULL;
-PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT = NULL;
-
-PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT = NULL;
-PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT = NULL;
-PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT = NULL;
-PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT = NULL;
-PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT = NULL;
-PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT = NULL;
-PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT = NULL;
-PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT = NULL;
-
-PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT = NULL;
-PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT = NULL;
-PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT = NULL;
-PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT = NULL;
-PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT = NULL;
-PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT = NULL;
-PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT = NULL;
-PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT = NULL;
-PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT = NULL;
-PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT = NULL;
-PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT = NULL;
-
-PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT = NULL;
-PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT = NULL;
-PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT = NULL;
-PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT = NULL;
-PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT = NULL;
-PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT = NULL;
-PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT = NULL;
-PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT = NULL;
-PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT = NULL;
-PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT = NULL;
-PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT = NULL;
-PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT = NULL;
-PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT = NULL;
-PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT = NULL;
-PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT = NULL;
-PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT = NULL;
-PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT = NULL;
-PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT = NULL;
-PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT = NULL;
-PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT = NULL;
-PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT = NULL;
-PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT = NULL;
-PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT = NULL;
-PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT = NULL;
-PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT = NULL;
-PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT = NULL;
-PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT = NULL;
-PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT = NULL;
-PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT = NULL;
-PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT = NULL;
-PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT = NULL;
-PFNGLSWIZZLEEXTPROC __glewSwizzleEXT = NULL;
-PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT = NULL;
-PFNGLVARIANTBVEXTPROC __glewVariantbvEXT = NULL;
-PFNGLVARIANTDVEXTPROC __glewVariantdvEXT = NULL;
-PFNGLVARIANTFVEXTPROC __glewVariantfvEXT = NULL;
-PFNGLVARIANTIVEXTPROC __glewVariantivEXT = NULL;
-PFNGLVARIANTSVEXTPROC __glewVariantsvEXT = NULL;
-PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT = NULL;
-PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT = NULL;
-PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT = NULL;
-PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT = NULL;
-
-PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL;
-PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL;
-PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL;
-
-PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT = NULL;
-
-PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY = NULL;
-
-PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY = NULL;
-
-PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP = NULL;
-PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP = NULL;
-PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP = NULL;
-PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP = NULL;
-PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP = NULL;
-PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP = NULL;
-
-PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM = NULL;
-PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM = NULL;
-
-PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM = NULL;
-PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM = NULL;
-PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM = NULL;
-PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM = NULL;
-PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM = NULL;
-PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM = NULL;
-PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM = NULL;
-PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM = NULL;
-
-PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL = NULL;
-PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL = NULL;
-PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL = NULL;
-PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL = NULL;
-
-PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL = NULL;
-PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL = NULL;
-
-PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback = NULL;
-PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl = NULL;
-PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert = NULL;
-PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog = NULL;
-PFNGLGETOBJECTLABELPROC __glewGetObjectLabel = NULL;
-PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel = NULL;
-PFNGLGETPOINTERVPROC __glewGetPointerv = NULL;
-PFNGLOBJECTLABELPROC __glewObjectLabel = NULL;
-PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel = NULL;
-PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup = NULL;
-
-PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled = NULL;
-PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion = NULL;
-PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion = NULL;
-PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion = NULL;
-PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion = NULL;
-
-PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA = NULL;
-
-PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA = NULL;
-PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA = NULL;
-PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA = NULL;
-PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA = NULL;
-PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA = NULL;
-PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA = NULL;
-PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA = NULL;
-PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA = NULL;
-PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA = NULL;
-PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA = NULL;
-PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA = NULL;
-PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA = NULL;
-PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA = NULL;
-PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA = NULL;
-PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA = NULL;
-PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA = NULL;
-PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA = NULL;
-PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA = NULL;
-PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA = NULL;
-PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA = NULL;
-PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA = NULL;
-PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA = NULL;
-PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA = NULL;
-PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA = NULL;
-
-PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV = NULL;
-PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV = NULL;
-PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV = NULL;
-PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV = NULL;
-PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV = NULL;
-PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV = NULL;
-PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV = NULL;
-PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV = NULL;
-PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV = NULL;
-PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV = NULL;
-PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV = NULL;
-PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV = NULL;
-PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV = NULL;
-
-PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV = NULL;
-PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV = NULL;
-
-PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV = NULL;
-
-PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV = NULL;
-PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV = NULL;
-PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV = NULL;
-
-PFNGLEVALMAPSNVPROC __glewEvalMapsNV = NULL;
-PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV = NULL;
-PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV = NULL;
-PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV = NULL;
-PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV = NULL;
-PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV = NULL;
-PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV = NULL;
-PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV = NULL;
-PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV = NULL;
-
-PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV = NULL;
-PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV = NULL;
-PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV = NULL;
-
-PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV = NULL;
-PFNGLFINISHFENCENVPROC __glewFinishFenceNV = NULL;
-PFNGLGENFENCESNVPROC __glewGenFencesNV = NULL;
-PFNGLGETFENCEIVNVPROC __glewGetFenceivNV = NULL;
-PFNGLISFENCENVPROC __glewIsFenceNV = NULL;
-PFNGLSETFENCENVPROC __glewSetFenceNV = NULL;
-PFNGLTESTFENCENVPROC __glewTestFenceNV = NULL;
-
-PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV = NULL;
-PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV = NULL;
-PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV = NULL;
-PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV = NULL;
-PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV = NULL;
-PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV = NULL;
-
-PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV = NULL;
-
-PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV = NULL;
-
-PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV = NULL;
-PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV = NULL;
-PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV = NULL;
-PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV = NULL;
-PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV = NULL;
-PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV = NULL;
-PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV = NULL;
-
-PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV = NULL;
-PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV = NULL;
-PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV = NULL;
-PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV = NULL;
-PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV = NULL;
-PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV = NULL;
-PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV = NULL;
-PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV = NULL;
-PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV = NULL;
-PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV = NULL;
-PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV = NULL;
-PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV = NULL;
-PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV = NULL;
-PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV = NULL;
-PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV = NULL;
-PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV = NULL;
-PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV = NULL;
-PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV = NULL;
-PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV = NULL;
-PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV = NULL;
-PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV = NULL;
-PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV = NULL;
-PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV = NULL;
-PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV = NULL;
-PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV = NULL;
-PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV = NULL;
-PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV = NULL;
-PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV = NULL;
-PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV = NULL;
-PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV = NULL;
-PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV = NULL;
-PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV = NULL;
-PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV = NULL;
-PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV = NULL;
-
-PFNGLCOLOR3HNVPROC __glewColor3hNV = NULL;
-PFNGLCOLOR3HVNVPROC __glewColor3hvNV = NULL;
-PFNGLCOLOR4HNVPROC __glewColor4hNV = NULL;
-PFNGLCOLOR4HVNVPROC __glewColor4hvNV = NULL;
-PFNGLFOGCOORDHNVPROC __glewFogCoordhNV = NULL;
-PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV = NULL;
-PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV = NULL;
-PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV = NULL;
-PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV = NULL;
-PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV = NULL;
-PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV = NULL;
-PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV = NULL;
-PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV = NULL;
-PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV = NULL;
-PFNGLNORMAL3HNVPROC __glewNormal3hNV = NULL;
-PFNGLNORMAL3HVNVPROC __glewNormal3hvNV = NULL;
-PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV = NULL;
-PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV = NULL;
-PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV = NULL;
-PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV = NULL;
-PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV = NULL;
-PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV = NULL;
-PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV = NULL;
-PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV = NULL;
-PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV = NULL;
-PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV = NULL;
-PFNGLVERTEX2HNVPROC __glewVertex2hNV = NULL;
-PFNGLVERTEX2HVNVPROC __glewVertex2hvNV = NULL;
-PFNGLVERTEX3HNVPROC __glewVertex3hNV = NULL;
-PFNGLVERTEX3HVNVPROC __glewVertex3hvNV = NULL;
-PFNGLVERTEX4HNVPROC __glewVertex4hNV = NULL;
-PFNGLVERTEX4HVNVPROC __glewVertex4hvNV = NULL;
-PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV = NULL;
-PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV = NULL;
-PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV = NULL;
-PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV = NULL;
-PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV = NULL;
-PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV = NULL;
-PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV = NULL;
-PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV = NULL;
-PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV = NULL;
-PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV = NULL;
-PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV = NULL;
-PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV = NULL;
-PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV = NULL;
-PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV = NULL;
-
-PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV = NULL;
-PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV = NULL;
-PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV = NULL;
-PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV = NULL;
-PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV = NULL;
-PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV = NULL;
-PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV = NULL;
-
-PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV = NULL;
-PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV = NULL;
-PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV = NULL;
-
-PFNGLCOPYPATHNVPROC __glewCopyPathNV = NULL;
-PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV = NULL;
-PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV = NULL;
-PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV = NULL;
-PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV = NULL;
-PFNGLDELETEPATHSNVPROC __glewDeletePathsNV = NULL;
-PFNGLGENPATHSNVPROC __glewGenPathsNV = NULL;
-PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV = NULL;
-PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV = NULL;
-PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV = NULL;
-PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV = NULL;
-PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV = NULL;
-PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV = NULL;
-PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV = NULL;
-PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV = NULL;
-PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV = NULL;
-PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV = NULL;
-PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV = NULL;
-PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV = NULL;
-PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV = NULL;
-PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV = NULL;
-PFNGLISPATHNVPROC __glewIsPathNV = NULL;
-PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV = NULL;
-PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV = NULL;
-PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV = NULL;
-PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV = NULL;
-PFNGLPATHCOORDSNVPROC __glewPathCoordsNV = NULL;
-PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV = NULL;
-PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV = NULL;
-PFNGLPATHFOGGENNVPROC __glewPathFogGenNV = NULL;
-PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV = NULL;
-PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV = NULL;
-PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV = NULL;
-PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV = NULL;
-PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV = NULL;
-PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV = NULL;
-PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV = NULL;
-PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV = NULL;
-PFNGLPATHSTRINGNVPROC __glewPathStringNV = NULL;
-PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV = NULL;
-PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV = NULL;
-PFNGLPATHTEXGENNVPROC __glewPathTexGenNV = NULL;
-PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV = NULL;
-PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV = NULL;
-PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV = NULL;
-PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV = NULL;
-PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV = NULL;
-PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV = NULL;
-PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV = NULL;
-
-PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV = NULL;
-PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV = NULL;
-
-PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV = NULL;
-PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV = NULL;
-
-PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV = NULL;
-PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV = NULL;
-PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV = NULL;
-PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV = NULL;
-PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV = NULL;
-PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV = NULL;
-
-PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL;
-PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL;
-
-PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV = NULL;
-PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV = NULL;
-PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV = NULL;
-PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV = NULL;
-PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV = NULL;
-PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV = NULL;
-PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV = NULL;
-PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV = NULL;
-PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV = NULL;
-PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV = NULL;
-PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV = NULL;
-PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV = NULL;
-PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV = NULL;
-
-PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV = NULL;
-PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV = NULL;
-
-PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV = NULL;
-PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV = NULL;
-PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV = NULL;
-PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV = NULL;
-PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV = NULL;
-PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV = NULL;
-PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV = NULL;
-PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV = NULL;
-PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV = NULL;
-PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV = NULL;
-PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV = NULL;
-PFNGLUNIFORMUI64NVPROC __glewUniformui64NV = NULL;
-PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV = NULL;
-
-PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV = NULL;
-
-PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV = NULL;
-PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV = NULL;
-PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV = NULL;
-PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV = NULL;
-PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV = NULL;
-PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV = NULL;
-
-PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV = NULL;
-PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV = NULL;
-PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV = NULL;
-PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV = NULL;
-PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV = NULL;
-PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV = NULL;
-PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV = NULL;
-PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV = NULL;
-PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV = NULL;
-PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV = NULL;
-PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV = NULL;
-
-PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV = NULL;
-PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV = NULL;
-PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV = NULL;
-PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV = NULL;
-PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV = NULL;
-PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV = NULL;
-
-PFNGLVDPAUFININVPROC __glewVDPAUFiniNV = NULL;
-PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV = NULL;
-PFNGLVDPAUINITNVPROC __glewVDPAUInitNV = NULL;
-PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV = NULL;
-PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV = NULL;
-PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV = NULL;
-PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV = NULL;
-PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV = NULL;
-PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV = NULL;
-PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV = NULL;
-
-PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV = NULL;
-PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV = NULL;
-
-PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV = NULL;
-PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV = NULL;
-PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV = NULL;
-PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV = NULL;
-PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV = NULL;
-PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV = NULL;
-PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV = NULL;
-PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV = NULL;
-PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV = NULL;
-PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV = NULL;
-PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV = NULL;
-PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV = NULL;
-PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV = NULL;
-PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV = NULL;
-PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV = NULL;
-PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV = NULL;
-PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV = NULL;
-PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV = NULL;
-PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV = NULL;
-
-PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV = NULL;
-PFNGLCOLORFORMATNVPROC __glewColorFormatNV = NULL;
-PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV = NULL;
-PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV = NULL;
-PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV = NULL;
-PFNGLINDEXFORMATNVPROC __glewIndexFormatNV = NULL;
-PFNGLNORMALFORMATNVPROC __glewNormalFormatNV = NULL;
-PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV = NULL;
-PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV = NULL;
-PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV = NULL;
-PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV = NULL;
-PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV = NULL;
-
-PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV = NULL;
-PFNGLBINDPROGRAMNVPROC __glewBindProgramNV = NULL;
-PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV = NULL;
-PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV = NULL;
-PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV = NULL;
-PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV = NULL;
-PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV = NULL;
-PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV = NULL;
-PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV = NULL;
-PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV = NULL;
-PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV = NULL;
-PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV = NULL;
-PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV = NULL;
-PFNGLISPROGRAMNVPROC __glewIsProgramNV = NULL;
-PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV = NULL;
-PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV = NULL;
-PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV = NULL;
-PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV = NULL;
-PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV = NULL;
-PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV = NULL;
-PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV = NULL;
-PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV = NULL;
-PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV = NULL;
-PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV = NULL;
-PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV = NULL;
-PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV = NULL;
-PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV = NULL;
-PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV = NULL;
-PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV = NULL;
-PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV = NULL;
-PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV = NULL;
-PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV = NULL;
-PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV = NULL;
-PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV = NULL;
-PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV = NULL;
-PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV = NULL;
-PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV = NULL;
-PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV = NULL;
-PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV = NULL;
-PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV = NULL;
-PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV = NULL;
-PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV = NULL;
-PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV = NULL;
-PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV = NULL;
-PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV = NULL;
-PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV = NULL;
-PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV = NULL;
-PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV = NULL;
-PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV = NULL;
-PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV = NULL;
-PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV = NULL;
-PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV = NULL;
-PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV = NULL;
-PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV = NULL;
-PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV = NULL;
-PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV = NULL;
-PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV = NULL;
-PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV = NULL;
-PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV = NULL;
-PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV = NULL;
-PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV = NULL;
-PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV = NULL;
-PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV = NULL;
-
-PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV = NULL;
-PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV = NULL;
-PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV = NULL;
-PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV = NULL;
-PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV = NULL;
-PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV = NULL;
-PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV = NULL;
-PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV = NULL;
-PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV = NULL;
-PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV = NULL;
-PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV = NULL;
-PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV = NULL;
-
-PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES = NULL;
-PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES = NULL;
-PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES = NULL;
-PFNGLFRUSTUMFOESPROC __glewFrustumfOES = NULL;
-PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES = NULL;
-PFNGLORTHOFOESPROC __glewOrthofOES = NULL;
-
-PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL = NULL;
-
-PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL = NULL;
-PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL = NULL;
-
-PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS = NULL;
-PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS = NULL;
-
-PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS = NULL;
-PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS = NULL;
-
-PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS = NULL;
-PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS = NULL;
-
-PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS = NULL;
-PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS = NULL;
-
-PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS = NULL;
-PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS = NULL;
-
-PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS = NULL;
-PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS = NULL;
-
-PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX = NULL;
-PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX = NULL;
-PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX = NULL;
-PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX = NULL;
-PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX = NULL;
-PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX = NULL;
-
-PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX = NULL;
-
-PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX = NULL;
-
-PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX = NULL;
-PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX = NULL;
-PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX = NULL;
-PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX = NULL;
-PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX = NULL;
-PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX = NULL;
-PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX = NULL;
-PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX = NULL;
-PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX = NULL;
-PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX = NULL;
-PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX = NULL;
-PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX = NULL;
-PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX = NULL;
-PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX = NULL;
-PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX = NULL;
-PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX = NULL;
-PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX = NULL;
-
-PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX = NULL;
-
-PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX = NULL;
-
-PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX = NULL;
-
-PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX = NULL;
-PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX = NULL;
-PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX = NULL;
-PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX = NULL;
-
-PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX = NULL;
-
-PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI = NULL;
-PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI = NULL;
-PFNGLCOLORTABLESGIPROC __glewColorTableSGI = NULL;
-PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI = NULL;
-PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI = NULL;
-PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI = NULL;
-PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI = NULL;
-
-PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX = NULL;
-
-PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN = NULL;
-PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN = NULL;
-PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN = NULL;
-PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN = NULL;
-PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN = NULL;
-PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN = NULL;
-PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN = NULL;
-PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN = NULL;
-
-PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN = NULL;
-
-PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN = NULL;
-PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN = NULL;
-PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN = NULL;
-PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN = NULL;
-PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN = NULL;
-PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN = NULL;
-PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN = NULL;
-
-PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN = NULL;
-PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN = NULL;
-PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN = NULL;
-PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN = NULL;
-PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN = NULL;
-PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN = NULL;
-PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN = NULL;
-PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN = NULL;
-PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN = NULL;
-PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN = NULL;
-PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN = NULL;
-PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN = NULL;
-PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN = NULL;
-PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN = NULL;
-PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
-PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
-PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN = NULL;
-PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN = NULL;
-PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN = NULL;
-PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN = NULL;
-PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN = NULL;
-PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN = NULL;
-PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN = NULL;
-PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN = NULL;
-PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN = NULL;
-PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL;
-
-PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL;
-
-#endif /* !WIN32 || !GLEW_MX */
-
-#if !defined(GLEW_MX)
-
-GLboolean __GLEW_VERSION_1_1 = GL_FALSE;
-GLboolean __GLEW_VERSION_1_2 = GL_FALSE;
-GLboolean __GLEW_VERSION_1_2_1 = GL_FALSE;
-GLboolean __GLEW_VERSION_1_3 = GL_FALSE;
-GLboolean __GLEW_VERSION_1_4 = GL_FALSE;
-GLboolean __GLEW_VERSION_1_5 = GL_FALSE;
-GLboolean __GLEW_VERSION_2_0 = GL_FALSE;
-GLboolean __GLEW_VERSION_2_1 = GL_FALSE;
-GLboolean __GLEW_VERSION_3_0 = GL_FALSE;
-GLboolean __GLEW_VERSION_3_1 = GL_FALSE;
-GLboolean __GLEW_VERSION_3_2 = GL_FALSE;
-GLboolean __GLEW_VERSION_3_3 = GL_FALSE;
-GLboolean __GLEW_VERSION_4_0 = GL_FALSE;
-GLboolean __GLEW_VERSION_4_1 = GL_FALSE;
-GLboolean __GLEW_VERSION_4_2 = GL_FALSE;
-GLboolean __GLEW_VERSION_4_3 = GL_FALSE;
-GLboolean __GLEW_3DFX_multisample = GL_FALSE;
-GLboolean __GLEW_3DFX_tbuffer = GL_FALSE;
-GLboolean __GLEW_3DFX_texture_compression_FXT1 = GL_FALSE;
-GLboolean __GLEW_AMD_blend_minmax_factor = GL_FALSE;
-GLboolean __GLEW_AMD_conservative_depth = GL_FALSE;
-GLboolean __GLEW_AMD_debug_output = GL_FALSE;
-GLboolean __GLEW_AMD_depth_clamp_separate = GL_FALSE;
-GLboolean __GLEW_AMD_draw_buffers_blend = GL_FALSE;
-GLboolean __GLEW_AMD_multi_draw_indirect = GL_FALSE;
-GLboolean __GLEW_AMD_name_gen_delete = GL_FALSE;
-GLboolean __GLEW_AMD_performance_monitor = GL_FALSE;
-GLboolean __GLEW_AMD_pinned_memory = GL_FALSE;
-GLboolean __GLEW_AMD_query_buffer_object = GL_FALSE;
-GLboolean __GLEW_AMD_sample_positions = GL_FALSE;
-GLboolean __GLEW_AMD_seamless_cubemap_per_texture = GL_FALSE;
-GLboolean __GLEW_AMD_shader_stencil_export = GL_FALSE;
-GLboolean __GLEW_AMD_stencil_operation_extended = GL_FALSE;
-GLboolean __GLEW_AMD_texture_texture4 = GL_FALSE;
-GLboolean __GLEW_AMD_transform_feedback3_lines_triangles = GL_FALSE;
-GLboolean __GLEW_AMD_vertex_shader_layer = GL_FALSE;
-GLboolean __GLEW_AMD_vertex_shader_tessellator = GL_FALSE;
-GLboolean __GLEW_AMD_vertex_shader_viewport_index = GL_FALSE;
-GLboolean __GLEW_APPLE_aux_depth_stencil = GL_FALSE;
-GLboolean __GLEW_APPLE_client_storage = GL_FALSE;
-GLboolean __GLEW_APPLE_element_array = GL_FALSE;
-GLboolean __GLEW_APPLE_fence = GL_FALSE;
-GLboolean __GLEW_APPLE_float_pixels = GL_FALSE;
-GLboolean __GLEW_APPLE_flush_buffer_range = GL_FALSE;
-GLboolean __GLEW_APPLE_object_purgeable = GL_FALSE;
-GLboolean __GLEW_APPLE_pixel_buffer = GL_FALSE;
-GLboolean __GLEW_APPLE_rgb_422 = GL_FALSE;
-GLboolean __GLEW_APPLE_row_bytes = GL_FALSE;
-GLboolean __GLEW_APPLE_specular_vector = GL_FALSE;
-GLboolean __GLEW_APPLE_texture_range = GL_FALSE;
-GLboolean __GLEW_APPLE_transform_hint = GL_FALSE;
-GLboolean __GLEW_APPLE_vertex_array_object = GL_FALSE;
-GLboolean __GLEW_APPLE_vertex_array_range = GL_FALSE;
-GLboolean __GLEW_APPLE_vertex_program_evaluators = GL_FALSE;
-GLboolean __GLEW_APPLE_ycbcr_422 = GL_FALSE;
-GLboolean __GLEW_ARB_ES2_compatibility = GL_FALSE;
-GLboolean __GLEW_ARB_ES3_compatibility = GL_FALSE;
-GLboolean __GLEW_ARB_arrays_of_arrays = GL_FALSE;
-GLboolean __GLEW_ARB_base_instance = GL_FALSE;
-GLboolean __GLEW_ARB_blend_func_extended = GL_FALSE;
-GLboolean __GLEW_ARB_cl_event = GL_FALSE;
-GLboolean __GLEW_ARB_clear_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_color_buffer_float = GL_FALSE;
-GLboolean __GLEW_ARB_compatibility = GL_FALSE;
-GLboolean __GLEW_ARB_compressed_texture_pixel_storage = GL_FALSE;
-GLboolean __GLEW_ARB_compute_shader = GL_FALSE;
-GLboolean __GLEW_ARB_conservative_depth = GL_FALSE;
-GLboolean __GLEW_ARB_copy_buffer = GL_FALSE;
-GLboolean __GLEW_ARB_copy_image = GL_FALSE;
-GLboolean __GLEW_ARB_debug_output = GL_FALSE;
-GLboolean __GLEW_ARB_depth_buffer_float = GL_FALSE;
-GLboolean __GLEW_ARB_depth_clamp = GL_FALSE;
-GLboolean __GLEW_ARB_depth_texture = GL_FALSE;
-GLboolean __GLEW_ARB_draw_buffers = GL_FALSE;
-GLboolean __GLEW_ARB_draw_buffers_blend = GL_FALSE;
-GLboolean __GLEW_ARB_draw_elements_base_vertex = GL_FALSE;
-GLboolean __GLEW_ARB_draw_indirect = GL_FALSE;
-GLboolean __GLEW_ARB_draw_instanced = GL_FALSE;
-GLboolean __GLEW_ARB_explicit_attrib_location = GL_FALSE;
-GLboolean __GLEW_ARB_explicit_uniform_location = GL_FALSE;
-GLboolean __GLEW_ARB_fragment_coord_conventions = GL_FALSE;
-GLboolean __GLEW_ARB_fragment_layer_viewport = GL_FALSE;
-GLboolean __GLEW_ARB_fragment_program = GL_FALSE;
-GLboolean __GLEW_ARB_fragment_program_shadow = GL_FALSE;
-GLboolean __GLEW_ARB_fragment_shader = GL_FALSE;
-GLboolean __GLEW_ARB_framebuffer_no_attachments = GL_FALSE;
-GLboolean __GLEW_ARB_framebuffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_framebuffer_sRGB = GL_FALSE;
-GLboolean __GLEW_ARB_geometry_shader4 = GL_FALSE;
-GLboolean __GLEW_ARB_get_program_binary = GL_FALSE;
-GLboolean __GLEW_ARB_gpu_shader5 = GL_FALSE;
-GLboolean __GLEW_ARB_gpu_shader_fp64 = GL_FALSE;
-GLboolean __GLEW_ARB_half_float_pixel = GL_FALSE;
-GLboolean __GLEW_ARB_half_float_vertex = GL_FALSE;
-GLboolean __GLEW_ARB_imaging = GL_FALSE;
-GLboolean __GLEW_ARB_instanced_arrays = GL_FALSE;
-GLboolean __GLEW_ARB_internalformat_query = GL_FALSE;
-GLboolean __GLEW_ARB_internalformat_query2 = GL_FALSE;
-GLboolean __GLEW_ARB_invalidate_subdata = GL_FALSE;
-GLboolean __GLEW_ARB_map_buffer_alignment = GL_FALSE;
-GLboolean __GLEW_ARB_map_buffer_range = GL_FALSE;
-GLboolean __GLEW_ARB_matrix_palette = GL_FALSE;
-GLboolean __GLEW_ARB_multi_draw_indirect = GL_FALSE;
-GLboolean __GLEW_ARB_multisample = GL_FALSE;
-GLboolean __GLEW_ARB_multitexture = GL_FALSE;
-GLboolean __GLEW_ARB_occlusion_query = GL_FALSE;
-GLboolean __GLEW_ARB_occlusion_query2 = GL_FALSE;
-GLboolean __GLEW_ARB_pixel_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_point_parameters = GL_FALSE;
-GLboolean __GLEW_ARB_point_sprite = GL_FALSE;
-GLboolean __GLEW_ARB_program_interface_query = GL_FALSE;
-GLboolean __GLEW_ARB_provoking_vertex = GL_FALSE;
-GLboolean __GLEW_ARB_robust_buffer_access_behavior = GL_FALSE;
-GLboolean __GLEW_ARB_robustness = GL_FALSE;
-GLboolean __GLEW_ARB_robustness_application_isolation = GL_FALSE;
-GLboolean __GLEW_ARB_robustness_share_group_isolation = GL_FALSE;
-GLboolean __GLEW_ARB_sample_shading = GL_FALSE;
-GLboolean __GLEW_ARB_sampler_objects = GL_FALSE;
-GLboolean __GLEW_ARB_seamless_cube_map = GL_FALSE;
-GLboolean __GLEW_ARB_separate_shader_objects = GL_FALSE;
-GLboolean __GLEW_ARB_shader_atomic_counters = GL_FALSE;
-GLboolean __GLEW_ARB_shader_bit_encoding = GL_FALSE;
-GLboolean __GLEW_ARB_shader_image_load_store = GL_FALSE;
-GLboolean __GLEW_ARB_shader_image_size = GL_FALSE;
-GLboolean __GLEW_ARB_shader_objects = GL_FALSE;
-GLboolean __GLEW_ARB_shader_precision = GL_FALSE;
-GLboolean __GLEW_ARB_shader_stencil_export = GL_FALSE;
-GLboolean __GLEW_ARB_shader_storage_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_shader_subroutine = GL_FALSE;
-GLboolean __GLEW_ARB_shader_texture_lod = GL_FALSE;
-GLboolean __GLEW_ARB_shading_language_100 = GL_FALSE;
-GLboolean __GLEW_ARB_shading_language_420pack = GL_FALSE;
-GLboolean __GLEW_ARB_shading_language_include = GL_FALSE;
-GLboolean __GLEW_ARB_shading_language_packing = GL_FALSE;
-GLboolean __GLEW_ARB_shadow = GL_FALSE;
-GLboolean __GLEW_ARB_shadow_ambient = GL_FALSE;
-GLboolean __GLEW_ARB_stencil_texturing = GL_FALSE;
-GLboolean __GLEW_ARB_sync = GL_FALSE;
-GLboolean __GLEW_ARB_tessellation_shader = GL_FALSE;
-GLboolean __GLEW_ARB_texture_border_clamp = GL_FALSE;
-GLboolean __GLEW_ARB_texture_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_texture_buffer_object_rgb32 = GL_FALSE;
-GLboolean __GLEW_ARB_texture_buffer_range = GL_FALSE;
-GLboolean __GLEW_ARB_texture_compression = GL_FALSE;
-GLboolean __GLEW_ARB_texture_compression_bptc = GL_FALSE;
-GLboolean __GLEW_ARB_texture_compression_rgtc = GL_FALSE;
-GLboolean __GLEW_ARB_texture_cube_map = GL_FALSE;
-GLboolean __GLEW_ARB_texture_cube_map_array = GL_FALSE;
-GLboolean __GLEW_ARB_texture_env_add = GL_FALSE;
-GLboolean __GLEW_ARB_texture_env_combine = GL_FALSE;
-GLboolean __GLEW_ARB_texture_env_crossbar = GL_FALSE;
-GLboolean __GLEW_ARB_texture_env_dot3 = GL_FALSE;
-GLboolean __GLEW_ARB_texture_float = GL_FALSE;
-GLboolean __GLEW_ARB_texture_gather = GL_FALSE;
-GLboolean __GLEW_ARB_texture_mirrored_repeat = GL_FALSE;
-GLboolean __GLEW_ARB_texture_multisample = GL_FALSE;
-GLboolean __GLEW_ARB_texture_non_power_of_two = GL_FALSE;
-GLboolean __GLEW_ARB_texture_query_levels = GL_FALSE;
-GLboolean __GLEW_ARB_texture_query_lod = GL_FALSE;
-GLboolean __GLEW_ARB_texture_rectangle = GL_FALSE;
-GLboolean __GLEW_ARB_texture_rg = GL_FALSE;
-GLboolean __GLEW_ARB_texture_rgb10_a2ui = GL_FALSE;
-GLboolean __GLEW_ARB_texture_storage = GL_FALSE;
-GLboolean __GLEW_ARB_texture_storage_multisample = GL_FALSE;
-GLboolean __GLEW_ARB_texture_swizzle = GL_FALSE;
-GLboolean __GLEW_ARB_texture_view = GL_FALSE;
-GLboolean __GLEW_ARB_timer_query = GL_FALSE;
-GLboolean __GLEW_ARB_transform_feedback2 = GL_FALSE;
-GLboolean __GLEW_ARB_transform_feedback3 = GL_FALSE;
-GLboolean __GLEW_ARB_transform_feedback_instanced = GL_FALSE;
-GLboolean __GLEW_ARB_transpose_matrix = GL_FALSE;
-GLboolean __GLEW_ARB_uniform_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_array_bgra = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_array_object = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_attrib_64bit = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_attrib_binding = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_blend = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_buffer_object = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_program = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_shader = GL_FALSE;
-GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev = GL_FALSE;
-GLboolean __GLEW_ARB_viewport_array = GL_FALSE;
-GLboolean __GLEW_ARB_window_pos = GL_FALSE;
-GLboolean __GLEW_ATIX_point_sprites = GL_FALSE;
-GLboolean __GLEW_ATIX_texture_env_combine3 = GL_FALSE;
-GLboolean __GLEW_ATIX_texture_env_route = GL_FALSE;
-GLboolean __GLEW_ATIX_vertex_shader_output_point_size = GL_FALSE;
-GLboolean __GLEW_ATI_draw_buffers = GL_FALSE;
-GLboolean __GLEW_ATI_element_array = GL_FALSE;
-GLboolean __GLEW_ATI_envmap_bumpmap = GL_FALSE;
-GLboolean __GLEW_ATI_fragment_shader = GL_FALSE;
-GLboolean __GLEW_ATI_map_object_buffer = GL_FALSE;
-GLboolean __GLEW_ATI_meminfo = GL_FALSE;
-GLboolean __GLEW_ATI_pn_triangles = GL_FALSE;
-GLboolean __GLEW_ATI_separate_stencil = GL_FALSE;
-GLboolean __GLEW_ATI_shader_texture_lod = GL_FALSE;
-GLboolean __GLEW_ATI_text_fragment_shader = GL_FALSE;
-GLboolean __GLEW_ATI_texture_compression_3dc = GL_FALSE;
-GLboolean __GLEW_ATI_texture_env_combine3 = GL_FALSE;
-GLboolean __GLEW_ATI_texture_float = GL_FALSE;
-GLboolean __GLEW_ATI_texture_mirror_once = GL_FALSE;
-GLboolean __GLEW_ATI_vertex_array_object = GL_FALSE;
-GLboolean __GLEW_ATI_vertex_attrib_array_object = GL_FALSE;
-GLboolean __GLEW_ATI_vertex_streams = GL_FALSE;
-GLboolean __GLEW_EXT_422_pixels = GL_FALSE;
-GLboolean __GLEW_EXT_Cg_shader = GL_FALSE;
-GLboolean __GLEW_EXT_abgr = GL_FALSE;
-GLboolean __GLEW_EXT_bgra = GL_FALSE;
-GLboolean __GLEW_EXT_bindable_uniform = GL_FALSE;
-GLboolean __GLEW_EXT_blend_color = GL_FALSE;
-GLboolean __GLEW_EXT_blend_equation_separate = GL_FALSE;
-GLboolean __GLEW_EXT_blend_func_separate = GL_FALSE;
-GLboolean __GLEW_EXT_blend_logic_op = GL_FALSE;
-GLboolean __GLEW_EXT_blend_minmax = GL_FALSE;
-GLboolean __GLEW_EXT_blend_subtract = GL_FALSE;
-GLboolean __GLEW_EXT_clip_volume_hint = GL_FALSE;
-GLboolean __GLEW_EXT_cmyka = GL_FALSE;
-GLboolean __GLEW_EXT_color_subtable = GL_FALSE;
-GLboolean __GLEW_EXT_compiled_vertex_array = GL_FALSE;
-GLboolean __GLEW_EXT_convolution = GL_FALSE;
-GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE;
-GLboolean __GLEW_EXT_copy_texture = GL_FALSE;
-GLboolean __GLEW_EXT_cull_vertex = GL_FALSE;
-GLboolean __GLEW_EXT_debug_marker = GL_FALSE;
-GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE;
-GLboolean __GLEW_EXT_direct_state_access = GL_FALSE;
-GLboolean __GLEW_EXT_draw_buffers2 = GL_FALSE;
-GLboolean __GLEW_EXT_draw_instanced = GL_FALSE;
-GLboolean __GLEW_EXT_draw_range_elements = GL_FALSE;
-GLboolean __GLEW_EXT_fog_coord = GL_FALSE;
-GLboolean __GLEW_EXT_fragment_lighting = GL_FALSE;
-GLboolean __GLEW_EXT_framebuffer_blit = GL_FALSE;
-GLboolean __GLEW_EXT_framebuffer_multisample = GL_FALSE;
-GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled = GL_FALSE;
-GLboolean __GLEW_EXT_framebuffer_object = GL_FALSE;
-GLboolean __GLEW_EXT_framebuffer_sRGB = GL_FALSE;
-GLboolean __GLEW_EXT_geometry_shader4 = GL_FALSE;
-GLboolean __GLEW_EXT_gpu_program_parameters = GL_FALSE;
-GLboolean __GLEW_EXT_gpu_shader4 = GL_FALSE;
-GLboolean __GLEW_EXT_histogram = GL_FALSE;
-GLboolean __GLEW_EXT_index_array_formats = GL_FALSE;
-GLboolean __GLEW_EXT_index_func = GL_FALSE;
-GLboolean __GLEW_EXT_index_material = GL_FALSE;
-GLboolean __GLEW_EXT_index_texture = GL_FALSE;
-GLboolean __GLEW_EXT_light_texture = GL_FALSE;
-GLboolean __GLEW_EXT_misc_attribute = GL_FALSE;
-GLboolean __GLEW_EXT_multi_draw_arrays = GL_FALSE;
-GLboolean __GLEW_EXT_multisample = GL_FALSE;
-GLboolean __GLEW_EXT_packed_depth_stencil = GL_FALSE;
-GLboolean __GLEW_EXT_packed_float = GL_FALSE;
-GLboolean __GLEW_EXT_packed_pixels = GL_FALSE;
-GLboolean __GLEW_EXT_paletted_texture = GL_FALSE;
-GLboolean __GLEW_EXT_pixel_buffer_object = GL_FALSE;
-GLboolean __GLEW_EXT_pixel_transform = GL_FALSE;
-GLboolean __GLEW_EXT_pixel_transform_color_table = GL_FALSE;
-GLboolean __GLEW_EXT_point_parameters = GL_FALSE;
-GLboolean __GLEW_EXT_polygon_offset = GL_FALSE;
-GLboolean __GLEW_EXT_provoking_vertex = GL_FALSE;
-GLboolean __GLEW_EXT_rescale_normal = GL_FALSE;
-GLboolean __GLEW_EXT_scene_marker = GL_FALSE;
-GLboolean __GLEW_EXT_secondary_color = GL_FALSE;
-GLboolean __GLEW_EXT_separate_shader_objects = GL_FALSE;
-GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE;
-GLboolean __GLEW_EXT_shader_image_load_store = GL_FALSE;
-GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE;
-GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE;
-GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE;
-GLboolean __GLEW_EXT_stencil_two_side = GL_FALSE;
-GLboolean __GLEW_EXT_stencil_wrap = GL_FALSE;
-GLboolean __GLEW_EXT_subtexture = GL_FALSE;
-GLboolean __GLEW_EXT_texture = GL_FALSE;
-GLboolean __GLEW_EXT_texture3D = GL_FALSE;
-GLboolean __GLEW_EXT_texture_array = GL_FALSE;
-GLboolean __GLEW_EXT_texture_buffer_object = GL_FALSE;
-GLboolean __GLEW_EXT_texture_compression_dxt1 = GL_FALSE;
-GLboolean __GLEW_EXT_texture_compression_latc = GL_FALSE;
-GLboolean __GLEW_EXT_texture_compression_rgtc = GL_FALSE;
-GLboolean __GLEW_EXT_texture_compression_s3tc = GL_FALSE;
-GLboolean __GLEW_EXT_texture_cube_map = GL_FALSE;
-GLboolean __GLEW_EXT_texture_edge_clamp = GL_FALSE;
-GLboolean __GLEW_EXT_texture_env = GL_FALSE;
-GLboolean __GLEW_EXT_texture_env_add = GL_FALSE;
-GLboolean __GLEW_EXT_texture_env_combine = GL_FALSE;
-GLboolean __GLEW_EXT_texture_env_dot3 = GL_FALSE;
-GLboolean __GLEW_EXT_texture_filter_anisotropic = GL_FALSE;
-GLboolean __GLEW_EXT_texture_integer = GL_FALSE;
-GLboolean __GLEW_EXT_texture_lod_bias = GL_FALSE;
-GLboolean __GLEW_EXT_texture_mirror_clamp = GL_FALSE;
-GLboolean __GLEW_EXT_texture_object = GL_FALSE;
-GLboolean __GLEW_EXT_texture_perturb_normal = GL_FALSE;
-GLboolean __GLEW_EXT_texture_rectangle = GL_FALSE;
-GLboolean __GLEW_EXT_texture_sRGB = GL_FALSE;
-GLboolean __GLEW_EXT_texture_sRGB_decode = GL_FALSE;
-GLboolean __GLEW_EXT_texture_shared_exponent = GL_FALSE;
-GLboolean __GLEW_EXT_texture_snorm = GL_FALSE;
-GLboolean __GLEW_EXT_texture_swizzle = GL_FALSE;
-GLboolean __GLEW_EXT_timer_query = GL_FALSE;
-GLboolean __GLEW_EXT_transform_feedback = GL_FALSE;
-GLboolean __GLEW_EXT_vertex_array = GL_FALSE;
-GLboolean __GLEW_EXT_vertex_array_bgra = GL_FALSE;
-GLboolean __GLEW_EXT_vertex_attrib_64bit = GL_FALSE;
-GLboolean __GLEW_EXT_vertex_shader = GL_FALSE;
-GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE;
-GLboolean __GLEW_EXT_x11_sync_object = GL_FALSE;
-GLboolean __GLEW_GREMEDY_frame_terminator = GL_FALSE;
-GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE;
-GLboolean __GLEW_HP_convolution_border_modes = GL_FALSE;
-GLboolean __GLEW_HP_image_transform = GL_FALSE;
-GLboolean __GLEW_HP_occlusion_test = GL_FALSE;
-GLboolean __GLEW_HP_texture_lighting = GL_FALSE;
-GLboolean __GLEW_IBM_cull_vertex = GL_FALSE;
-GLboolean __GLEW_IBM_multimode_draw_arrays = GL_FALSE;
-GLboolean __GLEW_IBM_rasterpos_clip = GL_FALSE;
-GLboolean __GLEW_IBM_static_data = GL_FALSE;
-GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE;
-GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE;
-GLboolean __GLEW_INGR_color_clamp = GL_FALSE;
-GLboolean __GLEW_INGR_interlace_read = GL_FALSE;
-GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE;
-GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE;
-GLboolean __GLEW_KHR_debug = GL_FALSE;
-GLboolean __GLEW_KHR_texture_compression_astc_ldr = GL_FALSE;
-GLboolean __GLEW_KTX_buffer_region = GL_FALSE;
-GLboolean __GLEW_MESAX_texture_stack = GL_FALSE;
-GLboolean __GLEW_MESA_pack_invert = GL_FALSE;
-GLboolean __GLEW_MESA_resize_buffers = GL_FALSE;
-GLboolean __GLEW_MESA_window_pos = GL_FALSE;
-GLboolean __GLEW_MESA_ycbcr_texture = GL_FALSE;
-GLboolean __GLEW_NVX_gpu_memory_info = GL_FALSE;
-GLboolean __GLEW_NV_bindless_texture = GL_FALSE;
-GLboolean __GLEW_NV_blend_square = GL_FALSE;
-GLboolean __GLEW_NV_conditional_render = GL_FALSE;
-GLboolean __GLEW_NV_copy_depth_to_color = GL_FALSE;
-GLboolean __GLEW_NV_copy_image = GL_FALSE;
-GLboolean __GLEW_NV_depth_buffer_float = GL_FALSE;
-GLboolean __GLEW_NV_depth_clamp = GL_FALSE;
-GLboolean __GLEW_NV_depth_range_unclamped = GL_FALSE;
-GLboolean __GLEW_NV_evaluators = GL_FALSE;
-GLboolean __GLEW_NV_explicit_multisample = GL_FALSE;
-GLboolean __GLEW_NV_fence = GL_FALSE;
-GLboolean __GLEW_NV_float_buffer = GL_FALSE;
-GLboolean __GLEW_NV_fog_distance = GL_FALSE;
-GLboolean __GLEW_NV_fragment_program = GL_FALSE;
-GLboolean __GLEW_NV_fragment_program2 = GL_FALSE;
-GLboolean __GLEW_NV_fragment_program4 = GL_FALSE;
-GLboolean __GLEW_NV_fragment_program_option = GL_FALSE;
-GLboolean __GLEW_NV_framebuffer_multisample_coverage = GL_FALSE;
-GLboolean __GLEW_NV_geometry_program4 = GL_FALSE;
-GLboolean __GLEW_NV_geometry_shader4 = GL_FALSE;
-GLboolean __GLEW_NV_gpu_program4 = GL_FALSE;
-GLboolean __GLEW_NV_gpu_program5 = GL_FALSE;
-GLboolean __GLEW_NV_gpu_program_fp64 = GL_FALSE;
-GLboolean __GLEW_NV_gpu_shader5 = GL_FALSE;
-GLboolean __GLEW_NV_half_float = GL_FALSE;
-GLboolean __GLEW_NV_light_max_exponent = GL_FALSE;
-GLboolean __GLEW_NV_multisample_coverage = GL_FALSE;
-GLboolean __GLEW_NV_multisample_filter_hint = GL_FALSE;
-GLboolean __GLEW_NV_occlusion_query = GL_FALSE;
-GLboolean __GLEW_NV_packed_depth_stencil = GL_FALSE;
-GLboolean __GLEW_NV_parameter_buffer_object = GL_FALSE;
-GLboolean __GLEW_NV_parameter_buffer_object2 = GL_FALSE;
-GLboolean __GLEW_NV_path_rendering = GL_FALSE;
-GLboolean __GLEW_NV_pixel_data_range = GL_FALSE;
-GLboolean __GLEW_NV_point_sprite = GL_FALSE;
-GLboolean __GLEW_NV_present_video = GL_FALSE;
-GLboolean __GLEW_NV_primitive_restart = GL_FALSE;
-GLboolean __GLEW_NV_register_combiners = GL_FALSE;
-GLboolean __GLEW_NV_register_combiners2 = GL_FALSE;
-GLboolean __GLEW_NV_shader_atomic_float = GL_FALSE;
-GLboolean __GLEW_NV_shader_buffer_load = GL_FALSE;
-GLboolean __GLEW_NV_tessellation_program5 = GL_FALSE;
-GLboolean __GLEW_NV_texgen_emboss = GL_FALSE;
-GLboolean __GLEW_NV_texgen_reflection = GL_FALSE;
-GLboolean __GLEW_NV_texture_barrier = GL_FALSE;
-GLboolean __GLEW_NV_texture_compression_vtc = GL_FALSE;
-GLboolean __GLEW_NV_texture_env_combine4 = GL_FALSE;
-GLboolean __GLEW_NV_texture_expand_normal = GL_FALSE;
-GLboolean __GLEW_NV_texture_multisample = GL_FALSE;
-GLboolean __GLEW_NV_texture_rectangle = GL_FALSE;
-GLboolean __GLEW_NV_texture_shader = GL_FALSE;
-GLboolean __GLEW_NV_texture_shader2 = GL_FALSE;
-GLboolean __GLEW_NV_texture_shader3 = GL_FALSE;
-GLboolean __GLEW_NV_transform_feedback = GL_FALSE;
-GLboolean __GLEW_NV_transform_feedback2 = GL_FALSE;
-GLboolean __GLEW_NV_vdpau_interop = GL_FALSE;
-GLboolean __GLEW_NV_vertex_array_range = GL_FALSE;
-GLboolean __GLEW_NV_vertex_array_range2 = GL_FALSE;
-GLboolean __GLEW_NV_vertex_attrib_integer_64bit = GL_FALSE;
-GLboolean __GLEW_NV_vertex_buffer_unified_memory = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program1_1 = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program2 = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program2_option = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program3 = GL_FALSE;
-GLboolean __GLEW_NV_vertex_program4 = GL_FALSE;
-GLboolean __GLEW_NV_video_capture = GL_FALSE;
-GLboolean __GLEW_OES_byte_coordinates = GL_FALSE;
-GLboolean __GLEW_OES_compressed_paletted_texture = GL_FALSE;
-GLboolean __GLEW_OES_read_format = GL_FALSE;
-GLboolean __GLEW_OES_single_precision = GL_FALSE;
-GLboolean __GLEW_OML_interlace = GL_FALSE;
-GLboolean __GLEW_OML_resample = GL_FALSE;
-GLboolean __GLEW_OML_subsample = GL_FALSE;
-GLboolean __GLEW_PGI_misc_hints = GL_FALSE;
-GLboolean __GLEW_PGI_vertex_hints = GL_FALSE;
-GLboolean __GLEW_REGAL_error_string = GL_FALSE;
-GLboolean __GLEW_REGAL_extension_query = GL_FALSE;
-GLboolean __GLEW_REGAL_log = GL_FALSE;
-GLboolean __GLEW_REND_screen_coordinates = GL_FALSE;
-GLboolean __GLEW_S3_s3tc = GL_FALSE;
-GLboolean __GLEW_SGIS_color_range = GL_FALSE;
-GLboolean __GLEW_SGIS_detail_texture = GL_FALSE;
-GLboolean __GLEW_SGIS_fog_function = GL_FALSE;
-GLboolean __GLEW_SGIS_generate_mipmap = GL_FALSE;
-GLboolean __GLEW_SGIS_multisample = GL_FALSE;
-GLboolean __GLEW_SGIS_pixel_texture = GL_FALSE;
-GLboolean __GLEW_SGIS_point_line_texgen = GL_FALSE;
-GLboolean __GLEW_SGIS_sharpen_texture = GL_FALSE;
-GLboolean __GLEW_SGIS_texture4D = GL_FALSE;
-GLboolean __GLEW_SGIS_texture_border_clamp = GL_FALSE;
-GLboolean __GLEW_SGIS_texture_edge_clamp = GL_FALSE;
-GLboolean __GLEW_SGIS_texture_filter4 = GL_FALSE;
-GLboolean __GLEW_SGIS_texture_lod = GL_FALSE;
-GLboolean __GLEW_SGIS_texture_select = GL_FALSE;
-GLboolean __GLEW_SGIX_async = GL_FALSE;
-GLboolean __GLEW_SGIX_async_histogram = GL_FALSE;
-GLboolean __GLEW_SGIX_async_pixel = GL_FALSE;
-GLboolean __GLEW_SGIX_blend_alpha_minmax = GL_FALSE;
-GLboolean __GLEW_SGIX_clipmap = GL_FALSE;
-GLboolean __GLEW_SGIX_convolution_accuracy = GL_FALSE;
-GLboolean __GLEW_SGIX_depth_texture = GL_FALSE;
-GLboolean __GLEW_SGIX_flush_raster = GL_FALSE;
-GLboolean __GLEW_SGIX_fog_offset = GL_FALSE;
-GLboolean __GLEW_SGIX_fog_texture = GL_FALSE;
-GLboolean __GLEW_SGIX_fragment_specular_lighting = GL_FALSE;
-GLboolean __GLEW_SGIX_framezoom = GL_FALSE;
-GLboolean __GLEW_SGIX_interlace = GL_FALSE;
-GLboolean __GLEW_SGIX_ir_instrument1 = GL_FALSE;
-GLboolean __GLEW_SGIX_list_priority = GL_FALSE;
-GLboolean __GLEW_SGIX_pixel_texture = GL_FALSE;
-GLboolean __GLEW_SGIX_pixel_texture_bits = GL_FALSE;
-GLboolean __GLEW_SGIX_reference_plane = GL_FALSE;
-GLboolean __GLEW_SGIX_resample = GL_FALSE;
-GLboolean __GLEW_SGIX_shadow = GL_FALSE;
-GLboolean __GLEW_SGIX_shadow_ambient = GL_FALSE;
-GLboolean __GLEW_SGIX_sprite = GL_FALSE;
-GLboolean __GLEW_SGIX_tag_sample_buffer = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_add_env = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_coordinate_clamp = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_lod_bias = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_multi_buffer = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_range = GL_FALSE;
-GLboolean __GLEW_SGIX_texture_scale_bias = GL_FALSE;
-GLboolean __GLEW_SGIX_vertex_preclip = GL_FALSE;
-GLboolean __GLEW_SGIX_vertex_preclip_hint = GL_FALSE;
-GLboolean __GLEW_SGIX_ycrcb = GL_FALSE;
-GLboolean __GLEW_SGI_color_matrix = GL_FALSE;
-GLboolean __GLEW_SGI_color_table = GL_FALSE;
-GLboolean __GLEW_SGI_texture_color_table = GL_FALSE;
-GLboolean __GLEW_SUNX_constant_data = GL_FALSE;
-GLboolean __GLEW_SUN_convolution_border_modes = GL_FALSE;
-GLboolean __GLEW_SUN_global_alpha = GL_FALSE;
-GLboolean __GLEW_SUN_mesh_array = GL_FALSE;
-GLboolean __GLEW_SUN_read_video_pixels = GL_FALSE;
-GLboolean __GLEW_SUN_slice_accum = GL_FALSE;
-GLboolean __GLEW_SUN_triangle_list = GL_FALSE;
-GLboolean __GLEW_SUN_vertex = GL_FALSE;
-GLboolean __GLEW_WIN_phong_shading = GL_FALSE;
-GLboolean __GLEW_WIN_specular_fog = GL_FALSE;
-GLboolean __GLEW_WIN_swap_hint = GL_FALSE;
-
-#endif /* !GLEW_MX */
-
-#ifdef GL_VERSION_1_2
-
-static GLboolean _glewInit_GL_VERSION_1_2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3D")) == NULL) || r;
-  r = ((glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElements")) == NULL) || r;
-  r = ((glTexImage3D = (PFNGLTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexImage3D")) == NULL) || r;
-  r = ((glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_1_2 */
-
-#ifdef GL_VERSION_1_2_1
-
-#endif /* GL_VERSION_1_2_1 */
-
-#ifdef GL_VERSION_1_3
-
-static GLboolean _glewInit_GL_VERSION_1_3 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveTexture = (PFNGLACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glActiveTexture")) == NULL) || r;
-  r = ((glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTexture")) == NULL) || r;
-  r = ((glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1D")) == NULL) || r;
-  r = ((glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2D")) == NULL) || r;
-  r = ((glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3D")) == NULL) || r;
-  r = ((glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1D")) == NULL) || r;
-  r = ((glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2D")) == NULL) || r;
-  r = ((glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3D")) == NULL) || r;
-  r = ((glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImage")) == NULL) || r;
-  r = ((glLoadTransposeMatrixd = (PFNGLLOADTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixd")) == NULL) || r;
-  r = ((glLoadTransposeMatrixf = (PFNGLLOADTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixf")) == NULL) || r;
-  r = ((glMultTransposeMatrixd = (PFNGLMULTTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixd")) == NULL) || r;
-  r = ((glMultTransposeMatrixf = (PFNGLMULTTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixf")) == NULL) || r;
-  r = ((glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1d")) == NULL) || r;
-  r = ((glMultiTexCoord1dv = (PFNGLMULTITEXCOORD1DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dv")) == NULL) || r;
-  r = ((glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1f")) == NULL) || r;
-  r = ((glMultiTexCoord1fv = (PFNGLMULTITEXCOORD1FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fv")) == NULL) || r;
-  r = ((glMultiTexCoord1i = (PFNGLMULTITEXCOORD1IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1i")) == NULL) || r;
-  r = ((glMultiTexCoord1iv = (PFNGLMULTITEXCOORD1IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iv")) == NULL) || r;
-  r = ((glMultiTexCoord1s = (PFNGLMULTITEXCOORD1SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1s")) == NULL) || r;
-  r = ((glMultiTexCoord1sv = (PFNGLMULTITEXCOORD1SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sv")) == NULL) || r;
-  r = ((glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2d")) == NULL) || r;
-  r = ((glMultiTexCoord2dv = (PFNGLMULTITEXCOORD2DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dv")) == NULL) || r;
-  r = ((glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2f")) == NULL) || r;
-  r = ((glMultiTexCoord2fv = (PFNGLMULTITEXCOORD2FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fv")) == NULL) || r;
-  r = ((glMultiTexCoord2i = (PFNGLMULTITEXCOORD2IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2i")) == NULL) || r;
-  r = ((glMultiTexCoord2iv = (PFNGLMULTITEXCOORD2IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iv")) == NULL) || r;
-  r = ((glMultiTexCoord2s = (PFNGLMULTITEXCOORD2SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2s")) == NULL) || r;
-  r = ((glMultiTexCoord2sv = (PFNGLMULTITEXCOORD2SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sv")) == NULL) || r;
-  r = ((glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3d")) == NULL) || r;
-  r = ((glMultiTexCoord3dv = (PFNGLMULTITEXCOORD3DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dv")) == NULL) || r;
-  r = ((glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3f")) == NULL) || r;
-  r = ((glMultiTexCoord3fv = (PFNGLMULTITEXCOORD3FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fv")) == NULL) || r;
-  r = ((glMultiTexCoord3i = (PFNGLMULTITEXCOORD3IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3i")) == NULL) || r;
-  r = ((glMultiTexCoord3iv = (PFNGLMULTITEXCOORD3IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iv")) == NULL) || r;
-  r = ((glMultiTexCoord3s = (PFNGLMULTITEXCOORD3SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3s")) == NULL) || r;
-  r = ((glMultiTexCoord3sv = (PFNGLMULTITEXCOORD3SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sv")) == NULL) || r;
-  r = ((glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4d")) == NULL) || r;
-  r = ((glMultiTexCoord4dv = (PFNGLMULTITEXCOORD4DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dv")) == NULL) || r;
-  r = ((glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4f")) == NULL) || r;
-  r = ((glMultiTexCoord4fv = (PFNGLMULTITEXCOORD4FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fv")) == NULL) || r;
-  r = ((glMultiTexCoord4i = (PFNGLMULTITEXCOORD4IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4i")) == NULL) || r;
-  r = ((glMultiTexCoord4iv = (PFNGLMULTITEXCOORD4IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iv")) == NULL) || r;
-  r = ((glMultiTexCoord4s = (PFNGLMULTITEXCOORD4SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4s")) == NULL) || r;
-  r = ((glMultiTexCoord4sv = (PFNGLMULTITEXCOORD4SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sv")) == NULL) || r;
-  r = ((glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverage")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_1_3 */
-
-#ifdef GL_VERSION_1_4
-
-static GLboolean _glewInit_GL_VERSION_1_4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendColor = (PFNGLBLENDCOLORPROC)glewGetProcAddress((const GLubyte*)"glBlendColor")) == NULL) || r;
-  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
-  r = ((glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparate")) == NULL) || r;
-  r = ((glFogCoordPointer = (PFNGLFOGCOORDPOINTERPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointer")) == NULL) || r;
-  r = ((glFogCoordd = (PFNGLFOGCOORDDPROC)glewGetProcAddress((const GLubyte*)"glFogCoordd")) == NULL) || r;
-  r = ((glFogCoorddv = (PFNGLFOGCOORDDVPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddv")) == NULL) || r;
-  r = ((glFogCoordf = (PFNGLFOGCOORDFPROC)glewGetProcAddress((const GLubyte*)"glFogCoordf")) == NULL) || r;
-  r = ((glFogCoordfv = (PFNGLFOGCOORDFVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfv")) == NULL) || r;
-  r = ((glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArrays")) == NULL) || r;
-  r = ((glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElements")) == NULL) || r;
-  r = ((glPointParameterf = (PFNGLPOINTPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glPointParameterf")) == NULL) || r;
-  r = ((glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfv")) == NULL) || r;
-  r = ((glPointParameteri = (PFNGLPOINTPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPointParameteri")) == NULL) || r;
-  r = ((glPointParameteriv = (PFNGLPOINTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriv")) == NULL) || r;
-  r = ((glSecondaryColor3b = (PFNGLSECONDARYCOLOR3BPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3b")) == NULL) || r;
-  r = ((glSecondaryColor3bv = (PFNGLSECONDARYCOLOR3BVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bv")) == NULL) || r;
-  r = ((glSecondaryColor3d = (PFNGLSECONDARYCOLOR3DPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3d")) == NULL) || r;
-  r = ((glSecondaryColor3dv = (PFNGLSECONDARYCOLOR3DVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dv")) == NULL) || r;
-  r = ((glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3f")) == NULL) || r;
-  r = ((glSecondaryColor3fv = (PFNGLSECONDARYCOLOR3FVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fv")) == NULL) || r;
-  r = ((glSecondaryColor3i = (PFNGLSECONDARYCOLOR3IPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3i")) == NULL) || r;
-  r = ((glSecondaryColor3iv = (PFNGLSECONDARYCOLOR3IVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iv")) == NULL) || r;
-  r = ((glSecondaryColor3s = (PFNGLSECONDARYCOLOR3SPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3s")) == NULL) || r;
-  r = ((glSecondaryColor3sv = (PFNGLSECONDARYCOLOR3SVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sv")) == NULL) || r;
-  r = ((glSecondaryColor3ub = (PFNGLSECONDARYCOLOR3UBPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ub")) == NULL) || r;
-  r = ((glSecondaryColor3ubv = (PFNGLSECONDARYCOLOR3UBVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubv")) == NULL) || r;
-  r = ((glSecondaryColor3ui = (PFNGLSECONDARYCOLOR3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ui")) == NULL) || r;
-  r = ((glSecondaryColor3uiv = (PFNGLSECONDARYCOLOR3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiv")) == NULL) || r;
-  r = ((glSecondaryColor3us = (PFNGLSECONDARYCOLOR3USPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3us")) == NULL) || r;
-  r = ((glSecondaryColor3usv = (PFNGLSECONDARYCOLOR3USVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usv")) == NULL) || r;
-  r = ((glSecondaryColorPointer = (PFNGLSECONDARYCOLORPOINTERPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointer")) == NULL) || r;
-  r = ((glWindowPos2d = (PFNGLWINDOWPOS2DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2d")) == NULL) || r;
-  r = ((glWindowPos2dv = (PFNGLWINDOWPOS2DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dv")) == NULL) || r;
-  r = ((glWindowPos2f = (PFNGLWINDOWPOS2FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2f")) == NULL) || r;
-  r = ((glWindowPos2fv = (PFNGLWINDOWPOS2FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fv")) == NULL) || r;
-  r = ((glWindowPos2i = (PFNGLWINDOWPOS2IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2i")) == NULL) || r;
-  r = ((glWindowPos2iv = (PFNGLWINDOWPOS2IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iv")) == NULL) || r;
-  r = ((glWindowPos2s = (PFNGLWINDOWPOS2SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2s")) == NULL) || r;
-  r = ((glWindowPos2sv = (PFNGLWINDOWPOS2SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sv")) == NULL) || r;
-  r = ((glWindowPos3d = (PFNGLWINDOWPOS3DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3d")) == NULL) || r;
-  r = ((glWindowPos3dv = (PFNGLWINDOWPOS3DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dv")) == NULL) || r;
-  r = ((glWindowPos3f = (PFNGLWINDOWPOS3FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3f")) == NULL) || r;
-  r = ((glWindowPos3fv = (PFNGLWINDOWPOS3FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fv")) == NULL) || r;
-  r = ((glWindowPos3i = (PFNGLWINDOWPOS3IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3i")) == NULL) || r;
-  r = ((glWindowPos3iv = (PFNGLWINDOWPOS3IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iv")) == NULL) || r;
-  r = ((glWindowPos3s = (PFNGLWINDOWPOS3SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3s")) == NULL) || r;
-  r = ((glWindowPos3sv = (PFNGLWINDOWPOS3SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_1_4 */
-
-#ifdef GL_VERSION_1_5
-
-static GLboolean _glewInit_GL_VERSION_1_5 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginQuery = (PFNGLBEGINQUERYPROC)glewGetProcAddress((const GLubyte*)"glBeginQuery")) == NULL) || r;
-  r = ((glBindBuffer = (PFNGLBINDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindBuffer")) == NULL) || r;
-  r = ((glBufferData = (PFNGLBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferData")) == NULL) || r;
-  r = ((glBufferSubData = (PFNGLBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferSubData")) == NULL) || r;
-  r = ((glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffers")) == NULL) || r;
-  r = ((glDeleteQueries = (PFNGLDELETEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueries")) == NULL) || r;
-  r = ((glEndQuery = (PFNGLENDQUERYPROC)glewGetProcAddress((const GLubyte*)"glEndQuery")) == NULL) || r;
-  r = ((glGenBuffers = (PFNGLGENBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenBuffers")) == NULL) || r;
-  r = ((glGenQueries = (PFNGLGENQUERIESPROC)glewGetProcAddress((const GLubyte*)"glGenQueries")) == NULL) || r;
-  r = ((glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteriv")) == NULL) || r;
-  r = ((glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointerv")) == NULL) || r;
-  r = ((glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubData")) == NULL) || r;
-  r = ((glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectiv")) == NULL) || r;
-  r = ((glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuiv")) == NULL) || r;
-  r = ((glGetQueryiv = (PFNGLGETQUERYIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryiv")) == NULL) || r;
-  r = ((glIsBuffer = (PFNGLISBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsBuffer")) == NULL) || r;
-  r = ((glIsQuery = (PFNGLISQUERYPROC)glewGetProcAddress((const GLubyte*)"glIsQuery")) == NULL) || r;
-  r = ((glMapBuffer = (PFNGLMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapBuffer")) == NULL) || r;
-  r = ((glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapBuffer")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_1_5 */
-
-#ifdef GL_VERSION_2_0
-
-static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r;
-  r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r;
-  r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r;
-  r = ((glCompileShader = (PFNGLCOMPILESHADERPROC)glewGetProcAddress((const GLubyte*)"glCompileShader")) == NULL) || r;
-  r = ((glCreateProgram = (PFNGLCREATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glCreateProgram")) == NULL) || r;
-  r = ((glCreateShader = (PFNGLCREATESHADERPROC)glewGetProcAddress((const GLubyte*)"glCreateShader")) == NULL) || r;
-  r = ((glDeleteProgram = (PFNGLDELETEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgram")) == NULL) || r;
-  r = ((glDeleteShader = (PFNGLDELETESHADERPROC)glewGetProcAddress((const GLubyte*)"glDeleteShader")) == NULL) || r;
-  r = ((glDetachShader = (PFNGLDETACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glDetachShader")) == NULL) || r;
-  r = ((glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArray")) == NULL) || r;
-  r = ((glDrawBuffers = (PFNGLDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffers")) == NULL) || r;
-  r = ((glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArray")) == NULL) || r;
-  r = ((glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttrib")) == NULL) || r;
-  r = ((glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniform")) == NULL) || r;
-  r = ((glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedShaders")) == NULL) || r;
-  r = ((glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocation")) == NULL) || r;
-  r = ((glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInfoLog")) == NULL) || r;
-  r = ((glGetProgramiv = (PFNGLGETPROGRAMIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramiv")) == NULL) || r;
-  r = ((glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetShaderInfoLog")) == NULL) || r;
-  r = ((glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSource")) == NULL) || r;
-  r = ((glGetShaderiv = (PFNGLGETSHADERIVPROC)glewGetProcAddress((const GLubyte*)"glGetShaderiv")) == NULL) || r;
-  r = ((glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocation")) == NULL) || r;
-  r = ((glGetUniformfv = (PFNGLGETUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfv")) == NULL) || r;
-  r = ((glGetUniformiv = (PFNGLGETUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformiv")) == NULL) || r;
-  r = ((glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointerv")) == NULL) || r;
-  r = ((glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdv")) == NULL) || r;
-  r = ((glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfv")) == NULL) || r;
-  r = ((glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribiv")) == NULL) || r;
-  r = ((glIsProgram = (PFNGLISPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glIsProgram")) == NULL) || r;
-  r = ((glIsShader = (PFNGLISSHADERPROC)glewGetProcAddress((const GLubyte*)"glIsShader")) == NULL) || r;
-  r = ((glLinkProgram = (PFNGLLINKPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glLinkProgram")) == NULL) || r;
-  r = ((glShaderSource = (PFNGLSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glShaderSource")) == NULL) || r;
-  r = ((glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparate")) == NULL) || r;
-  r = ((glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilMaskSeparate")) == NULL) || r;
-  r = ((glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparate")) == NULL) || r;
-  r = ((glUniform1f = (PFNGLUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glUniform1f")) == NULL) || r;
-  r = ((glUniform1fv = (PFNGLUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glUniform1fv")) == NULL) || r;
-  r = ((glUniform1i = (PFNGLUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glUniform1i")) == NULL) || r;
-  r = ((glUniform1iv = (PFNGLUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glUniform1iv")) == NULL) || r;
-  r = ((glUniform2f = (PFNGLUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glUniform2f")) == NULL) || r;
-  r = ((glUniform2fv = (PFNGLUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glUniform2fv")) == NULL) || r;
-  r = ((glUniform2i = (PFNGLUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glUniform2i")) == NULL) || r;
-  r = ((glUniform2iv = (PFNGLUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glUniform2iv")) == NULL) || r;
-  r = ((glUniform3f = (PFNGLUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glUniform3f")) == NULL) || r;
-  r = ((glUniform3fv = (PFNGLUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glUniform3fv")) == NULL) || r;
-  r = ((glUniform3i = (PFNGLUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glUniform3i")) == NULL) || r;
-  r = ((glUniform3iv = (PFNGLUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glUniform3iv")) == NULL) || r;
-  r = ((glUniform4f = (PFNGLUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glUniform4f")) == NULL) || r;
-  r = ((glUniform4fv = (PFNGLUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glUniform4fv")) == NULL) || r;
-  r = ((glUniform4i = (PFNGLUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glUniform4i")) == NULL) || r;
-  r = ((glUniform4iv = (PFNGLUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glUniform4iv")) == NULL) || r;
-  r = ((glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fv")) == NULL) || r;
-  r = ((glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fv")) == NULL) || r;
-  r = ((glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fv")) == NULL) || r;
-  r = ((glUseProgram = (PFNGLUSEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glUseProgram")) == NULL) || r;
-  r = ((glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glValidateProgram")) == NULL) || r;
-  r = ((glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1d")) == NULL) || r;
-  r = ((glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dv")) == NULL) || r;
-  r = ((glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1f")) == NULL) || r;
-  r = ((glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fv")) == NULL) || r;
-  r = ((glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1s")) == NULL) || r;
-  r = ((glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sv")) == NULL) || r;
-  r = ((glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2d")) == NULL) || r;
-  r = ((glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dv")) == NULL) || r;
-  r = ((glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2f")) == NULL) || r;
-  r = ((glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fv")) == NULL) || r;
-  r = ((glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2s")) == NULL) || r;
-  r = ((glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sv")) == NULL) || r;
-  r = ((glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3d")) == NULL) || r;
-  r = ((glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dv")) == NULL) || r;
-  r = ((glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3f")) == NULL) || r;
-  r = ((glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fv")) == NULL) || r;
-  r = ((glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3s")) == NULL) || r;
-  r = ((glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sv")) == NULL) || r;
-  r = ((glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nbv")) == NULL) || r;
-  r = ((glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Niv")) == NULL) || r;
-  r = ((glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nsv")) == NULL) || r;
-  r = ((glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nub")) == NULL) || r;
-  r = ((glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nubv")) == NULL) || r;
-  r = ((glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nuiv")) == NULL) || r;
-  r = ((glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nusv")) == NULL) || r;
-  r = ((glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bv")) == NULL) || r;
-  r = ((glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4d")) == NULL) || r;
-  r = ((glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dv")) == NULL) || r;
-  r = ((glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4f")) == NULL) || r;
-  r = ((glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fv")) == NULL) || r;
-  r = ((glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4iv")) == NULL) || r;
-  r = ((glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4s")) == NULL) || r;
-  r = ((glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sv")) == NULL) || r;
-  r = ((glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubv")) == NULL) || r;
-  r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r;
-  r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r;
-  r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_2_0 */
-
-#ifdef GL_VERSION_2_1
-
-static GLboolean _glewInit_GL_VERSION_2_1 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3fv")) == NULL) || r;
-  r = ((glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4fv")) == NULL) || r;
-  r = ((glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2fv")) == NULL) || r;
-  r = ((glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4fv")) == NULL) || r;
-  r = ((glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2fv")) == NULL) || r;
-  r = ((glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3fv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_2_1 */
-
-#ifdef GL_VERSION_3_0
-
-static GLboolean _glewInit_GL_VERSION_3_0 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRender")) == NULL) || r;
-  r = ((glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedback")) == NULL) || r;
-  r = ((glBindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocation")) == NULL) || r;
-  r = ((glClampColor = (PFNGLCLAMPCOLORPROC)glewGetProcAddress((const GLubyte*)"glClampColor")) == NULL) || r;
-  r = ((glClearBufferfi = (PFNGLCLEARBUFFERFIPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfi")) == NULL) || r;
-  r = ((glClearBufferfv = (PFNGLCLEARBUFFERFVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfv")) == NULL) || r;
-  r = ((glClearBufferiv = (PFNGLCLEARBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferiv")) == NULL) || r;
-  r = ((glClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferuiv")) == NULL) || r;
-  r = ((glColorMaski = (PFNGLCOLORMASKIPROC)glewGetProcAddress((const GLubyte*)"glColorMaski")) == NULL) || r;
-  r = ((glDisablei = (PFNGLDISABLEIPROC)glewGetProcAddress((const GLubyte*)"glDisablei")) == NULL) || r;
-  r = ((glEnablei = (PFNGLENABLEIPROC)glewGetProcAddress((const GLubyte*)"glEnablei")) == NULL) || r;
-  r = ((glEndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRender")) == NULL) || r;
-  r = ((glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedback")) == NULL) || r;
-  r = ((glGetBooleani_v = (PFNGLGETBOOLEANI_VPROC)glewGetProcAddress((const GLubyte*)"glGetBooleani_v")) == NULL) || r;
-  r = ((glGetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocation")) == NULL) || r;
-  r = ((glGetStringi = (PFNGLGETSTRINGIPROC)glewGetProcAddress((const GLubyte*)"glGetStringi")) == NULL) || r;
-  r = ((glGetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIiv")) == NULL) || r;
-  r = ((glGetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuiv")) == NULL) || r;
-  r = ((glGetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVarying")) == NULL) || r;
-  r = ((glGetUniformuiv = (PFNGLGETUNIFORMUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuiv")) == NULL) || r;
-  r = ((glGetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIiv")) == NULL) || r;
-  r = ((glGetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuiv")) == NULL) || r;
-  r = ((glIsEnabledi = (PFNGLISENABLEDIPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledi")) == NULL) || r;
-  r = ((glTexParameterIiv = (PFNGLTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIiv")) == NULL) || r;
-  r = ((glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuiv")) == NULL) || r;
-  r = ((glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryings")) == NULL) || r;
-  r = ((glUniform1ui = (PFNGLUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui")) == NULL) || r;
-  r = ((glUniform1uiv = (PFNGLUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiv")) == NULL) || r;
-  r = ((glUniform2ui = (PFNGLUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui")) == NULL) || r;
-  r = ((glUniform2uiv = (PFNGLUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiv")) == NULL) || r;
-  r = ((glUniform3ui = (PFNGLUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui")) == NULL) || r;
-  r = ((glUniform3uiv = (PFNGLUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiv")) == NULL) || r;
-  r = ((glUniform4ui = (PFNGLUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui")) == NULL) || r;
-  r = ((glUniform4uiv = (PFNGLUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiv")) == NULL) || r;
-  r = ((glVertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1i")) == NULL) || r;
-  r = ((glVertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iv")) == NULL) || r;
-  r = ((glVertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ui")) == NULL) || r;
-  r = ((glVertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiv")) == NULL) || r;
-  r = ((glVertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2i")) == NULL) || r;
-  r = ((glVertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iv")) == NULL) || r;
-  r = ((glVertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ui")) == NULL) || r;
-  r = ((glVertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiv")) == NULL) || r;
-  r = ((glVertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3i")) == NULL) || r;
-  r = ((glVertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iv")) == NULL) || r;
-  r = ((glVertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ui")) == NULL) || r;
-  r = ((glVertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiv")) == NULL) || r;
-  r = ((glVertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bv")) == NULL) || r;
-  r = ((glVertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4i")) == NULL) || r;
-  r = ((glVertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iv")) == NULL) || r;
-  r = ((glVertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4sv")) == NULL) || r;
-  r = ((glVertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubv")) == NULL) || r;
-  r = ((glVertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ui")) == NULL) || r;
-  r = ((glVertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiv")) == NULL) || r;
-  r = ((glVertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usv")) == NULL) || r;
-  r = ((glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointer")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_3_0 */
-
-#ifdef GL_VERSION_3_1
-
-static GLboolean _glewInit_GL_VERSION_3_1 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstanced")) == NULL) || r;
-  r = ((glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstanced")) == NULL) || r;
-  r = ((glPrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndex")) == NULL) || r;
-  r = ((glTexBuffer = (PFNGLTEXBUFFERPROC)glewGetProcAddress((const GLubyte*)"glTexBuffer")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_3_1 */
-
-#ifdef GL_VERSION_3_2
-
-static GLboolean _glewInit_GL_VERSION_3_2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture")) == NULL) || r;
-  r = ((glGetBufferParameteri64v = (PFNGLGETBUFFERPARAMETERI64VPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteri64v")) == NULL) || r;
-  r = ((glGetInteger64i_v = (PFNGLGETINTEGER64I_VPROC)glewGetProcAddress((const GLubyte*)"glGetInteger64i_v")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_3_2 */
-
-#ifdef GL_VERSION_3_3
-
-static GLboolean _glewInit_GL_VERSION_3_3 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisor")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_3_3 */
-
-#ifdef GL_VERSION_4_0
-
-static GLboolean _glewInit_GL_VERSION_4_0 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquationSeparatei = (PFNGLBLENDEQUATIONSEPARATEIPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparatei")) == NULL) || r;
-  r = ((glBlendEquationi = (PFNGLBLENDEQUATIONIPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationi")) == NULL) || r;
-  r = ((glBlendFuncSeparatei = (PFNGLBLENDFUNCSEPARATEIPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparatei")) == NULL) || r;
-  r = ((glBlendFunci = (PFNGLBLENDFUNCIPROC)glewGetProcAddress((const GLubyte*)"glBlendFunci")) == NULL) || r;
-  r = ((glMinSampleShading = (PFNGLMINSAMPLESHADINGPROC)glewGetProcAddress((const GLubyte*)"glMinSampleShading")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_VERSION_4_0 */
-
-#ifdef GL_VERSION_4_1
-
-#endif /* GL_VERSION_4_1 */
-
-#ifdef GL_VERSION_4_2
-
-#endif /* GL_VERSION_4_2 */
-
-#ifdef GL_VERSION_4_3
-
-#endif /* GL_VERSION_4_3 */
-
-#ifdef GL_3DFX_multisample
-
-#endif /* GL_3DFX_multisample */
-
-#ifdef GL_3DFX_tbuffer
-
-static GLboolean _glewInit_GL_3DFX_tbuffer (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTbufferMask3DFX = (PFNGLTBUFFERMASK3DFXPROC)glewGetProcAddress((const GLubyte*)"glTbufferMask3DFX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_3DFX_tbuffer */
-
-#ifdef GL_3DFX_texture_compression_FXT1
-
-#endif /* GL_3DFX_texture_compression_FXT1 */
-
-#ifdef GL_AMD_blend_minmax_factor
-
-#endif /* GL_AMD_blend_minmax_factor */
-
-#ifdef GL_AMD_conservative_depth
-
-#endif /* GL_AMD_conservative_depth */
-
-#ifdef GL_AMD_debug_output
-
-static GLboolean _glewInit_GL_AMD_debug_output (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDebugMessageCallbackAMD = (PFNGLDEBUGMESSAGECALLBACKAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallbackAMD")) == NULL) || r;
-  r = ((glDebugMessageEnableAMD = (PFNGLDEBUGMESSAGEENABLEAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageEnableAMD")) == NULL) || r;
-  r = ((glDebugMessageInsertAMD = (PFNGLDEBUGMESSAGEINSERTAMDPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsertAMD")) == NULL) || r;
-  r = ((glGetDebugMessageLogAMD = (PFNGLGETDEBUGMESSAGELOGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLogAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_debug_output */
-
-#ifdef GL_AMD_depth_clamp_separate
-
-#endif /* GL_AMD_depth_clamp_separate */
-
-#ifdef GL_AMD_draw_buffers_blend
-
-static GLboolean _glewInit_GL_AMD_draw_buffers_blend (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquationIndexedAMD = (PFNGLBLENDEQUATIONINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationIndexedAMD")) == NULL) || r;
-  r = ((glBlendEquationSeparateIndexedAMD = (PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateIndexedAMD")) == NULL) || r;
-  r = ((glBlendFuncIndexedAMD = (PFNGLBLENDFUNCINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncIndexedAMD")) == NULL) || r;
-  r = ((glBlendFuncSeparateIndexedAMD = (PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateIndexedAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_draw_buffers_blend */
-
-#ifdef GL_AMD_multi_draw_indirect
-
-static GLboolean _glewInit_GL_AMD_multi_draw_indirect (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMultiDrawArraysIndirectAMD = (PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirectAMD")) == NULL) || r;
-  r = ((glMultiDrawElementsIndirectAMD = (PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirectAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_multi_draw_indirect */
-
-#ifdef GL_AMD_name_gen_delete
-
-static GLboolean _glewInit_GL_AMD_name_gen_delete (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDeleteNamesAMD = (PFNGLDELETENAMESAMDPROC)glewGetProcAddress((const GLubyte*)"glDeleteNamesAMD")) == NULL) || r;
-  r = ((glGenNamesAMD = (PFNGLGENNAMESAMDPROC)glewGetProcAddress((const GLubyte*)"glGenNamesAMD")) == NULL) || r;
-  r = ((glIsNameAMD = (PFNGLISNAMEAMDPROC)glewGetProcAddress((const GLubyte*)"glIsNameAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_name_gen_delete */
-
-#ifdef GL_AMD_performance_monitor
-
-static GLboolean _glewInit_GL_AMD_performance_monitor (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginPerfMonitorAMD = (PFNGLBEGINPERFMONITORAMDPROC)glewGetProcAddress((const GLubyte*)"glBeginPerfMonitorAMD")) == NULL) || r;
-  r = ((glDeletePerfMonitorsAMD = (PFNGLDELETEPERFMONITORSAMDPROC)glewGetProcAddress((const GLubyte*)"glDeletePerfMonitorsAMD")) == NULL) || r;
-  r = ((glEndPerfMonitorAMD = (PFNGLENDPERFMONITORAMDPROC)glewGetProcAddress((const GLubyte*)"glEndPerfMonitorAMD")) == NULL) || r;
-  r = ((glGenPerfMonitorsAMD = (PFNGLGENPERFMONITORSAMDPROC)glewGetProcAddress((const GLubyte*)"glGenPerfMonitorsAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorCounterDataAMD = (PFNGLGETPERFMONITORCOUNTERDATAAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterDataAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorCounterInfoAMD = (PFNGLGETPERFMONITORCOUNTERINFOAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterInfoAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorCounterStringAMD = (PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCounterStringAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorCountersAMD = (PFNGLGETPERFMONITORCOUNTERSAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorCountersAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorGroupStringAMD = (PFNGLGETPERFMONITORGROUPSTRINGAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorGroupStringAMD")) == NULL) || r;
-  r = ((glGetPerfMonitorGroupsAMD = (PFNGLGETPERFMONITORGROUPSAMDPROC)glewGetProcAddress((const GLubyte*)"glGetPerfMonitorGroupsAMD")) == NULL) || r;
-  r = ((glSelectPerfMonitorCountersAMD = (PFNGLSELECTPERFMONITORCOUNTERSAMDPROC)glewGetProcAddress((const GLubyte*)"glSelectPerfMonitorCountersAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_performance_monitor */
-
-#ifdef GL_AMD_pinned_memory
-
-#endif /* GL_AMD_pinned_memory */
-
-#ifdef GL_AMD_query_buffer_object
-
-#endif /* GL_AMD_query_buffer_object */
-
-#ifdef GL_AMD_sample_positions
-
-static GLboolean _glewInit_GL_AMD_sample_positions (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSetMultisamplefvAMD = (PFNGLSETMULTISAMPLEFVAMDPROC)glewGetProcAddress((const GLubyte*)"glSetMultisamplefvAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_sample_positions */
-
-#ifdef GL_AMD_seamless_cubemap_per_texture
-
-#endif /* GL_AMD_seamless_cubemap_per_texture */
-
-#ifdef GL_AMD_shader_stencil_export
-
-#endif /* GL_AMD_shader_stencil_export */
-
-#ifdef GL_AMD_stencil_operation_extended
-
-static GLboolean _glewInit_GL_AMD_stencil_operation_extended (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glStencilOpValueAMD = (PFNGLSTENCILOPVALUEAMDPROC)glewGetProcAddress((const GLubyte*)"glStencilOpValueAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_stencil_operation_extended */
-
-#ifdef GL_AMD_texture_texture4
-
-#endif /* GL_AMD_texture_texture4 */
-
-#ifdef GL_AMD_transform_feedback3_lines_triangles
-
-#endif /* GL_AMD_transform_feedback3_lines_triangles */
-
-#ifdef GL_AMD_vertex_shader_layer
-
-#endif /* GL_AMD_vertex_shader_layer */
-
-#ifdef GL_AMD_vertex_shader_tessellator
-
-static GLboolean _glewInit_GL_AMD_vertex_shader_tessellator (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTessellationFactorAMD = (PFNGLTESSELLATIONFACTORAMDPROC)glewGetProcAddress((const GLubyte*)"glTessellationFactorAMD")) == NULL) || r;
-  r = ((glTessellationModeAMD = (PFNGLTESSELLATIONMODEAMDPROC)glewGetProcAddress((const GLubyte*)"glTessellationModeAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_AMD_vertex_shader_tessellator */
-
-#ifdef GL_AMD_vertex_shader_viewport_index
-
-#endif /* GL_AMD_vertex_shader_viewport_index */
-
-#ifdef GL_APPLE_aux_depth_stencil
-
-#endif /* GL_APPLE_aux_depth_stencil */
-
-#ifdef GL_APPLE_client_storage
-
-#endif /* GL_APPLE_client_storage */
-
-#ifdef GL_APPLE_element_array
-
-static GLboolean _glewInit_GL_APPLE_element_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawElementArrayAPPLE = (PFNGLDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayAPPLE")) == NULL) || r;
-  r = ((glDrawRangeElementArrayAPPLE = (PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayAPPLE")) == NULL) || r;
-  r = ((glElementPointerAPPLE = (PFNGLELEMENTPOINTERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glElementPointerAPPLE")) == NULL) || r;
-  r = ((glMultiDrawElementArrayAPPLE = (PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementArrayAPPLE")) == NULL) || r;
-  r = ((glMultiDrawRangeElementArrayAPPLE = (PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawRangeElementArrayAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_element_array */
-
-#ifdef GL_APPLE_fence
-
-static GLboolean _glewInit_GL_APPLE_fence (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDeleteFencesAPPLE = (PFNGLDELETEFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesAPPLE")) == NULL) || r;
-  r = ((glFinishFenceAPPLE = (PFNGLFINISHFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceAPPLE")) == NULL) || r;
-  r = ((glFinishObjectAPPLE = (PFNGLFINISHOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishObjectAPPLE")) == NULL) || r;
-  r = ((glGenFencesAPPLE = (PFNGLGENFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenFencesAPPLE")) == NULL) || r;
-  r = ((glIsFenceAPPLE = (PFNGLISFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsFenceAPPLE")) == NULL) || r;
-  r = ((glSetFenceAPPLE = (PFNGLSETFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glSetFenceAPPLE")) == NULL) || r;
-  r = ((glTestFenceAPPLE = (PFNGLTESTFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestFenceAPPLE")) == NULL) || r;
-  r = ((glTestObjectAPPLE = (PFNGLTESTOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestObjectAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_fence */
-
-#ifdef GL_APPLE_float_pixels
-
-#endif /* GL_APPLE_float_pixels */
-
-#ifdef GL_APPLE_flush_buffer_range
-
-static GLboolean _glewInit_GL_APPLE_flush_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBufferParameteriAPPLE = (PFNGLBUFFERPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBufferParameteriAPPLE")) == NULL) || r;
-  r = ((glFlushMappedBufferRangeAPPLE = (PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRangeAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_flush_buffer_range */
-
-#ifdef GL_APPLE_object_purgeable
-
-static GLboolean _glewInit_GL_APPLE_object_purgeable (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetObjectParameterivAPPLE = (PFNGLGETOBJECTPARAMETERIVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivAPPLE")) == NULL) || r;
-  r = ((glObjectPurgeableAPPLE = (PFNGLOBJECTPURGEABLEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glObjectPurgeableAPPLE")) == NULL) || r;
-  r = ((glObjectUnpurgeableAPPLE = (PFNGLOBJECTUNPURGEABLEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glObjectUnpurgeableAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_object_purgeable */
-
-#ifdef GL_APPLE_pixel_buffer
-
-#endif /* GL_APPLE_pixel_buffer */
-
-#ifdef GL_APPLE_rgb_422
-
-#endif /* GL_APPLE_rgb_422 */
-
-#ifdef GL_APPLE_row_bytes
-
-#endif /* GL_APPLE_row_bytes */
-
-#ifdef GL_APPLE_specular_vector
-
-#endif /* GL_APPLE_specular_vector */
-
-#ifdef GL_APPLE_texture_range
-
-static GLboolean _glewInit_GL_APPLE_texture_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetTexParameterPointervAPPLE = (PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterPointervAPPLE")) == NULL) || r;
-  r = ((glTextureRangeAPPLE = (PFNGLTEXTURERANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureRangeAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_texture_range */
-
-#ifdef GL_APPLE_transform_hint
-
-#endif /* GL_APPLE_transform_hint */
-
-#ifdef GL_APPLE_vertex_array_object
-
-static GLboolean _glewInit_GL_APPLE_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindVertexArrayAPPLE = (PFNGLBINDVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArrayAPPLE")) == NULL) || r;
-  r = ((glDeleteVertexArraysAPPLE = (PFNGLDELETEVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysAPPLE")) == NULL) || r;
-  r = ((glGenVertexArraysAPPLE = (PFNGLGENVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysAPPLE")) == NULL) || r;
-  r = ((glIsVertexArrayAPPLE = (PFNGLISVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArrayAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_vertex_array_object */
-
-#ifdef GL_APPLE_vertex_array_range
-
-static GLboolean _glewInit_GL_APPLE_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFlushVertexArrayRangeAPPLE = (PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeAPPLE")) == NULL) || r;
-  r = ((glVertexArrayParameteriAPPLE = (PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayParameteriAPPLE")) == NULL) || r;
-  r = ((glVertexArrayRangeAPPLE = (PFNGLVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_vertex_array_range */
-
-#ifdef GL_APPLE_vertex_program_evaluators
-
-static GLboolean _glewInit_GL_APPLE_vertex_program_evaluators (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDisableVertexAttribAPPLE = (PFNGLDISABLEVERTEXATTRIBAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribAPPLE")) == NULL) || r;
-  r = ((glEnableVertexAttribAPPLE = (PFNGLENABLEVERTEXATTRIBAPPLEPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribAPPLE")) == NULL) || r;
-  r = ((glIsVertexAttribEnabledAPPLE = (PFNGLISVERTEXATTRIBENABLEDAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexAttribEnabledAPPLE")) == NULL) || r;
-  r = ((glMapVertexAttrib1dAPPLE = (PFNGLMAPVERTEXATTRIB1DAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib1dAPPLE")) == NULL) || r;
-  r = ((glMapVertexAttrib1fAPPLE = (PFNGLMAPVERTEXATTRIB1FAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib1fAPPLE")) == NULL) || r;
-  r = ((glMapVertexAttrib2dAPPLE = (PFNGLMAPVERTEXATTRIB2DAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib2dAPPLE")) == NULL) || r;
-  r = ((glMapVertexAttrib2fAPPLE = (PFNGLMAPVERTEXATTRIB2FAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMapVertexAttrib2fAPPLE")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_APPLE_vertex_program_evaluators */
-
-#ifdef GL_APPLE_ycbcr_422
-
-#endif /* GL_APPLE_ycbcr_422 */
-
-#ifdef GL_ARB_ES2_compatibility
-
-static GLboolean _glewInit_GL_ARB_ES2_compatibility (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClearDepthf = (PFNGLCLEARDEPTHFPROC)glewGetProcAddress((const GLubyte*)"glClearDepthf")) == NULL) || r;
-  r = ((glDepthRangef = (PFNGLDEPTHRANGEFPROC)glewGetProcAddress((const GLubyte*)"glDepthRangef")) == NULL) || r;
-  r = ((glGetShaderPrecisionFormat = (PFNGLGETSHADERPRECISIONFORMATPROC)glewGetProcAddress((const GLubyte*)"glGetShaderPrecisionFormat")) == NULL) || r;
-  r = ((glReleaseShaderCompiler = (PFNGLRELEASESHADERCOMPILERPROC)glewGetProcAddress((const GLubyte*)"glReleaseShaderCompiler")) == NULL) || r;
-  r = ((glShaderBinary = (PFNGLSHADERBINARYPROC)glewGetProcAddress((const GLubyte*)"glShaderBinary")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_ES2_compatibility */
-
-#ifdef GL_ARB_ES3_compatibility
-
-#endif /* GL_ARB_ES3_compatibility */
-
-#ifdef GL_ARB_arrays_of_arrays
-
-#endif /* GL_ARB_arrays_of_arrays */
-
-#ifdef GL_ARB_base_instance
-
-static GLboolean _glewInit_GL_ARB_base_instance (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawArraysInstancedBaseInstance = (PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedBaseInstance")) == NULL) || r;
-  r = ((glDrawElementsInstancedBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseInstance")) == NULL) || r;
-  r = ((glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertexBaseInstance")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_base_instance */
-
-#ifdef GL_ARB_blend_func_extended
-
-static GLboolean _glewInit_GL_ARB_blend_func_extended (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindFragDataLocationIndexed = (PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationIndexed")) == NULL) || r;
-  r = ((glGetFragDataIndex = (PFNGLGETFRAGDATAINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataIndex")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_blend_func_extended */
-
-#ifdef GL_ARB_cl_event
-
-static GLboolean _glewInit_GL_ARB_cl_event (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCreateSyncFromCLeventARB = (PFNGLCREATESYNCFROMCLEVENTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateSyncFromCLeventARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_cl_event */
-
-#ifdef GL_ARB_clear_buffer_object
-
-static GLboolean _glewInit_GL_ARB_clear_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClearBufferData = (PFNGLCLEARBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glClearBufferData")) == NULL) || r;
-  r = ((glClearBufferSubData = (PFNGLCLEARBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glClearBufferSubData")) == NULL) || r;
-  r = ((glClearNamedBufferDataEXT = (PFNGLCLEARNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferDataEXT")) == NULL) || r;
-  r = ((glClearNamedBufferSubDataEXT = (PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glClearNamedBufferSubDataEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_clear_buffer_object */
-
-#ifdef GL_ARB_color_buffer_float
-
-static GLboolean _glewInit_GL_ARB_color_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClampColorARB = (PFNGLCLAMPCOLORARBPROC)glewGetProcAddress((const GLubyte*)"glClampColorARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_color_buffer_float */
-
-#ifdef GL_ARB_compatibility
-
-#endif /* GL_ARB_compatibility */
-
-#ifdef GL_ARB_compressed_texture_pixel_storage
-
-#endif /* GL_ARB_compressed_texture_pixel_storage */
-
-#ifdef GL_ARB_compute_shader
-
-static GLboolean _glewInit_GL_ARB_compute_shader (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)glewGetProcAddress((const GLubyte*)"glDispatchCompute")) == NULL) || r;
-  r = ((glDispatchComputeIndirect = (PFNGLDISPATCHCOMPUTEINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDispatchComputeIndirect")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_compute_shader */
-
-#ifdef GL_ARB_conservative_depth
-
-#endif /* GL_ARB_conservative_depth */
-
-#ifdef GL_ARB_copy_buffer
-
-static GLboolean _glewInit_GL_ARB_copy_buffer (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyBufferSubData = (PFNGLCOPYBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glCopyBufferSubData")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_copy_buffer */
-
-#ifdef GL_ARB_copy_image
-
-static GLboolean _glewInit_GL_ARB_copy_image (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyImageSubData = (PFNGLCOPYIMAGESUBDATAPROC)glewGetProcAddress((const GLubyte*)"glCopyImageSubData")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_copy_image */
-
-#ifdef GL_ARB_debug_output
-
-static GLboolean _glewInit_GL_ARB_debug_output (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallbackARB")) == NULL) || r;
-  r = ((glDebugMessageControlARB = (PFNGLDEBUGMESSAGECONTROLARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageControlARB")) == NULL) || r;
-  r = ((glDebugMessageInsertARB = (PFNGLDEBUGMESSAGEINSERTARBPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsertARB")) == NULL) || r;
-  r = ((glGetDebugMessageLogARB = (PFNGLGETDEBUGMESSAGELOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLogARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_debug_output */
-
-#ifdef GL_ARB_depth_buffer_float
-
-#endif /* GL_ARB_depth_buffer_float */
-
-#ifdef GL_ARB_depth_clamp
-
-#endif /* GL_ARB_depth_clamp */
-
-#ifdef GL_ARB_depth_texture
-
-#endif /* GL_ARB_depth_texture */
-
-#ifdef GL_ARB_draw_buffers
-
-static GLboolean _glewInit_GL_ARB_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_draw_buffers */
-
-#ifdef GL_ARB_draw_buffers_blend
-
-static GLboolean _glewInit_GL_ARB_draw_buffers_blend (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquationSeparateiARB = (PFNGLBLENDEQUATIONSEPARATEIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateiARB")) == NULL) || r;
-  r = ((glBlendEquationiARB = (PFNGLBLENDEQUATIONIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationiARB")) == NULL) || r;
-  r = ((glBlendFuncSeparateiARB = (PFNGLBLENDFUNCSEPARATEIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateiARB")) == NULL) || r;
-  r = ((glBlendFunciARB = (PFNGLBLENDFUNCIARBPROC)glewGetProcAddress((const GLubyte*)"glBlendFunciARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_draw_buffers_blend */
-
-#ifdef GL_ARB_draw_elements_base_vertex
-
-static GLboolean _glewInit_GL_ARB_draw_elements_base_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsBaseVertex")) == NULL) || r;
-  r = ((glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedBaseVertex")) == NULL) || r;
-  r = ((glDrawRangeElementsBaseVertex = (PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsBaseVertex")) == NULL) || r;
-  r = ((glMultiDrawElementsBaseVertex = (PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsBaseVertex")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_draw_elements_base_vertex */
-
-#ifdef GL_ARB_draw_indirect
-
-static GLboolean _glewInit_GL_ARB_draw_indirect (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawArraysIndirect = (PFNGLDRAWARRAYSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysIndirect")) == NULL) || r;
-  r = ((glDrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsIndirect")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_draw_indirect */
-
-#ifdef GL_ARB_draw_instanced
-
-#endif /* GL_ARB_draw_instanced */
-
-#ifdef GL_ARB_explicit_attrib_location
-
-#endif /* GL_ARB_explicit_attrib_location */
-
-#ifdef GL_ARB_explicit_uniform_location
-
-#endif /* GL_ARB_explicit_uniform_location */
-
-#ifdef GL_ARB_fragment_coord_conventions
-
-#endif /* GL_ARB_fragment_coord_conventions */
-
-#ifdef GL_ARB_fragment_layer_viewport
-
-#endif /* GL_ARB_fragment_layer_viewport */
-
-#ifdef GL_ARB_fragment_program
-
-#endif /* GL_ARB_fragment_program */
-
-#ifdef GL_ARB_fragment_program_shadow
-
-#endif /* GL_ARB_fragment_program_shadow */
-
-#ifdef GL_ARB_fragment_shader
-
-#endif /* GL_ARB_fragment_shader */
-
-#ifdef GL_ARB_framebuffer_no_attachments
-
-static GLboolean _glewInit_GL_ARB_framebuffer_no_attachments (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFramebufferParameteri = (PFNGLFRAMEBUFFERPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glFramebufferParameteri")) == NULL) || r;
-  r = ((glGetFramebufferParameteriv = (PFNGLGETFRAMEBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameteriv")) == NULL) || r;
-  r = ((glGetNamedFramebufferParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferParameterivEXT")) == NULL) || r;
-  r = ((glNamedFramebufferParameteriEXT = (PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferParameteriEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_framebuffer_no_attachments */
-
-#ifdef GL_ARB_framebuffer_object
-
-static GLboolean _glewInit_GL_ARB_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindFramebuffer")) == NULL) || r;
-  r = ((glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbuffer")) == NULL) || r;
-  r = ((glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebuffer")) == NULL) || r;
-  r = ((glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatus")) == NULL) || r;
-  r = ((glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffers")) == NULL) || r;
-  r = ((glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffers")) == NULL) || r;
-  r = ((glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbuffer")) == NULL) || r;
-  r = ((glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1D")) == NULL) || r;
-  r = ((glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2D")) == NULL) || r;
-  r = ((glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3D")) == NULL) || r;
-  r = ((glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayer")) == NULL) || r;
-  r = ((glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffers")) == NULL) || r;
-  r = ((glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffers")) == NULL) || r;
-  r = ((glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmap")) == NULL) || r;
-  r = ((glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameteriv")) == NULL) || r;
-  r = ((glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameteriv")) == NULL) || r;
-  r = ((glIsFramebuffer = (PFNGLISFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsFramebuffer")) == NULL) || r;
-  r = ((glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbuffer")) == NULL) || r;
-  r = ((glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorage")) == NULL) || r;
-  r = ((glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisample")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_framebuffer_object */
-
-#ifdef GL_ARB_framebuffer_sRGB
-
-#endif /* GL_ARB_framebuffer_sRGB */
-
-#ifdef GL_ARB_geometry_shader4
-
-static GLboolean _glewInit_GL_ARB_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFramebufferTextureARB = (PFNGLFRAMEBUFFERTEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureARB")) == NULL) || r;
-  r = ((glFramebufferTextureFaceARB = (PFNGLFRAMEBUFFERTEXTUREFACEARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceARB")) == NULL) || r;
-  r = ((glFramebufferTextureLayerARB = (PFNGLFRAMEBUFFERTEXTURELAYERARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerARB")) == NULL) || r;
-  r = ((glProgramParameteriARB = (PFNGLPROGRAMPARAMETERIARBPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_geometry_shader4 */
-
-#ifdef GL_ARB_get_program_binary
-
-static GLboolean _glewInit_GL_ARB_get_program_binary (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetProgramBinary = (PFNGLGETPROGRAMBINARYPROC)glewGetProcAddress((const GLubyte*)"glGetProgramBinary")) == NULL) || r;
-  r = ((glProgramBinary = (PFNGLPROGRAMBINARYPROC)glewGetProcAddress((const GLubyte*)"glProgramBinary")) == NULL) || r;
-  r = ((glProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteri")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_get_program_binary */
-
-#ifdef GL_ARB_gpu_shader5
-
-#endif /* GL_ARB_gpu_shader5 */
-
-#ifdef GL_ARB_gpu_shader_fp64
-
-static GLboolean _glewInit_GL_ARB_gpu_shader_fp64 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetUniformdv = (PFNGLGETUNIFORMDVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformdv")) == NULL) || r;
-  r = ((glUniform1d = (PFNGLUNIFORM1DPROC)glewGetProcAddress((const GLubyte*)"glUniform1d")) == NULL) || r;
-  r = ((glUniform1dv = (PFNGLUNIFORM1DVPROC)glewGetProcAddress((const GLubyte*)"glUniform1dv")) == NULL) || r;
-  r = ((glUniform2d = (PFNGLUNIFORM2DPROC)glewGetProcAddress((const GLubyte*)"glUniform2d")) == NULL) || r;
-  r = ((glUniform2dv = (PFNGLUNIFORM2DVPROC)glewGetProcAddress((const GLubyte*)"glUniform2dv")) == NULL) || r;
-  r = ((glUniform3d = (PFNGLUNIFORM3DPROC)glewGetProcAddress((const GLubyte*)"glUniform3d")) == NULL) || r;
-  r = ((glUniform3dv = (PFNGLUNIFORM3DVPROC)glewGetProcAddress((const GLubyte*)"glUniform3dv")) == NULL) || r;
-  r = ((glUniform4d = (PFNGLUNIFORM4DPROC)glewGetProcAddress((const GLubyte*)"glUniform4d")) == NULL) || r;
-  r = ((glUniform4dv = (PFNGLUNIFORM4DVPROC)glewGetProcAddress((const GLubyte*)"glUniform4dv")) == NULL) || r;
-  r = ((glUniformMatrix2dv = (PFNGLUNIFORMMATRIX2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2dv")) == NULL) || r;
-  r = ((glUniformMatrix2x3dv = (PFNGLUNIFORMMATRIX2X3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3dv")) == NULL) || r;
-  r = ((glUniformMatrix2x4dv = (PFNGLUNIFORMMATRIX2X4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4dv")) == NULL) || r;
-  r = ((glUniformMatrix3dv = (PFNGLUNIFORMMATRIX3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3dv")) == NULL) || r;
-  r = ((glUniformMatrix3x2dv = (PFNGLUNIFORMMATRIX3X2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2dv")) == NULL) || r;
-  r = ((glUniformMatrix3x4dv = (PFNGLUNIFORMMATRIX3X4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4dv")) == NULL) || r;
-  r = ((glUniformMatrix4dv = (PFNGLUNIFORMMATRIX4DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4dv")) == NULL) || r;
-  r = ((glUniformMatrix4x2dv = (PFNGLUNIFORMMATRIX4X2DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2dv")) == NULL) || r;
-  r = ((glUniformMatrix4x3dv = (PFNGLUNIFORMMATRIX4X3DVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3dv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_gpu_shader_fp64 */
-
-#ifdef GL_ARB_half_float_pixel
-
-#endif /* GL_ARB_half_float_pixel */
-
-#ifdef GL_ARB_half_float_vertex
-
-#endif /* GL_ARB_half_float_vertex */
-
-#ifdef GL_ARB_imaging
-
-static GLboolean _glewInit_GL_ARB_imaging (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
-  r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r;
-  r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r;
-  r = ((glColorTableParameterfv = (PFNGLCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfv")) == NULL) || r;
-  r = ((glColorTableParameteriv = (PFNGLCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameteriv")) == NULL) || r;
-  r = ((glConvolutionFilter1D = (PFNGLCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1D")) == NULL) || r;
-  r = ((glConvolutionFilter2D = (PFNGLCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2D")) == NULL) || r;
-  r = ((glConvolutionParameterf = (PFNGLCONVOLUTIONPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterf")) == NULL) || r;
-  r = ((glConvolutionParameterfv = (PFNGLCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfv")) == NULL) || r;
-  r = ((glConvolutionParameteri = (PFNGLCONVOLUTIONPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteri")) == NULL) || r;
-  r = ((glConvolutionParameteriv = (PFNGLCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriv")) == NULL) || r;
-  r = ((glCopyColorSubTable = (PFNGLCOPYCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTable")) == NULL) || r;
-  r = ((glCopyColorTable = (PFNGLCOPYCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTable")) == NULL) || r;
-  r = ((glCopyConvolutionFilter1D = (PFNGLCOPYCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1D")) == NULL) || r;
-  r = ((glCopyConvolutionFilter2D = (PFNGLCOPYCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2D")) == NULL) || r;
-  r = ((glGetColorTable = (PFNGLGETCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glGetColorTable")) == NULL) || r;
-  r = ((glGetColorTableParameterfv = (PFNGLGETCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfv")) == NULL) || r;
-  r = ((glGetColorTableParameteriv = (PFNGLGETCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameteriv")) == NULL) || r;
-  r = ((glGetConvolutionFilter = (PFNGLGETCONVOLUTIONFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilter")) == NULL) || r;
-  r = ((glGetConvolutionParameterfv = (PFNGLGETCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfv")) == NULL) || r;
-  r = ((glGetConvolutionParameteriv = (PFNGLGETCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameteriv")) == NULL) || r;
-  r = ((glGetHistogram = (PFNGLGETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glGetHistogram")) == NULL) || r;
-  r = ((glGetHistogramParameterfv = (PFNGLGETHISTOGRAMPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfv")) == NULL) || r;
-  r = ((glGetHistogramParameteriv = (PFNGLGETHISTOGRAMPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameteriv")) == NULL) || r;
-  r = ((glGetMinmax = (PFNGLGETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glGetMinmax")) == NULL) || r;
-  r = ((glGetMinmaxParameterfv = (PFNGLGETMINMAXPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfv")) == NULL) || r;
-  r = ((glGetMinmaxParameteriv = (PFNGLGETMINMAXPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameteriv")) == NULL) || r;
-  r = ((glGetSeparableFilter = (PFNGLGETSEPARABLEFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilter")) == NULL) || r;
-  r = ((glHistogram = (PFNGLHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glHistogram")) == NULL) || r;
-  r = ((glMinmax = (PFNGLMINMAXPROC)glewGetProcAddress((const GLubyte*)"glMinmax")) == NULL) || r;
-  r = ((glResetHistogram = (PFNGLRESETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glResetHistogram")) == NULL) || r;
-  r = ((glResetMinmax = (PFNGLRESETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glResetMinmax")) == NULL) || r;
-  r = ((glSeparableFilter2D = (PFNGLSEPARABLEFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_imaging */
-
-#ifdef GL_ARB_instanced_arrays
-
-static GLboolean _glewInit_GL_ARB_instanced_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedARB")) == NULL) || r;
-  r = ((glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedARB")) == NULL) || r;
-  r = ((glVertexAttribDivisorARB = (PFNGLVERTEXATTRIBDIVISORARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_instanced_arrays */
-
-#ifdef GL_ARB_internalformat_query
-
-static GLboolean _glewInit_GL_ARB_internalformat_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetInternalformativ = (PFNGLGETINTERNALFORMATIVPROC)glewGetProcAddress((const GLubyte*)"glGetInternalformativ")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_internalformat_query */
-
-#ifdef GL_ARB_internalformat_query2
-
-static GLboolean _glewInit_GL_ARB_internalformat_query2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetInternalformati64v = (PFNGLGETINTERNALFORMATI64VPROC)glewGetProcAddress((const GLubyte*)"glGetInternalformati64v")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_internalformat_query2 */
-
-#ifdef GL_ARB_invalidate_subdata
-
-static GLboolean _glewInit_GL_ARB_invalidate_subdata (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glInvalidateBufferData = (PFNGLINVALIDATEBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateBufferData")) == NULL) || r;
-  r = ((glInvalidateBufferSubData = (PFNGLINVALIDATEBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glInvalidateBufferSubData")) == NULL) || r;
-  r = ((glInvalidateFramebuffer = (PFNGLINVALIDATEFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glInvalidateFramebuffer")) == NULL) || r;
-  r = ((glInvalidateSubFramebuffer = (PFNGLINVALIDATESUBFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glInvalidateSubFramebuffer")) == NULL) || r;
-  r = ((glInvalidateTexImage = (PFNGLINVALIDATETEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glInvalidateTexImage")) == NULL) || r;
-  r = ((glInvalidateTexSubImage = (PFNGLINVALIDATETEXSUBIMAGEPROC)glewGetProcAddress((const GLubyte*)"glInvalidateTexSubImage")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_invalidate_subdata */
-
-#ifdef GL_ARB_map_buffer_alignment
-
-#endif /* GL_ARB_map_buffer_alignment */
-
-#ifdef GL_ARB_map_buffer_range
-
-static GLboolean _glewInit_GL_ARB_map_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRange")) == NULL) || r;
-  r = ((glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glMapBufferRange")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_map_buffer_range */
-
-#ifdef GL_ARB_matrix_palette
-
-static GLboolean _glewInit_GL_ARB_matrix_palette (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCurrentPaletteMatrixARB = (PFNGLCURRENTPALETTEMATRIXARBPROC)glewGetProcAddress((const GLubyte*)"glCurrentPaletteMatrixARB")) == NULL) || r;
-  r = ((glMatrixIndexPointerARB = (PFNGLMATRIXINDEXPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexPointerARB")) == NULL) || r;
-  r = ((glMatrixIndexubvARB = (PFNGLMATRIXINDEXUBVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexubvARB")) == NULL) || r;
-  r = ((glMatrixIndexuivARB = (PFNGLMATRIXINDEXUIVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexuivARB")) == NULL) || r;
-  r = ((glMatrixIndexusvARB = (PFNGLMATRIXINDEXUSVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexusvARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_matrix_palette */
-
-#ifdef GL_ARB_multi_draw_indirect
-
-static GLboolean _glewInit_GL_ARB_multi_draw_indirect (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMultiDrawArraysIndirect = (PFNGLMULTIDRAWARRAYSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysIndirect")) == NULL) || r;
-  r = ((glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsIndirect")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_multi_draw_indirect */
-
-#ifdef GL_ARB_multisample
-
-static GLboolean _glewInit_GL_ARB_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSampleCoverageARB = (PFNGLSAMPLECOVERAGEARBPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverageARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_multisample */
-
-#ifdef GL_ARB_multitexture
-
-static GLboolean _glewInit_GL_ARB_multitexture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glActiveTextureARB")) == NULL) || r;
-  r = ((glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTextureARB")) == NULL) || r;
-  r = ((glMultiTexCoord1dARB = (PFNGLMULTITEXCOORD1DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dARB")) == NULL) || r;
-  r = ((glMultiTexCoord1dvARB = (PFNGLMULTITEXCOORD1DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dvARB")) == NULL) || r;
-  r = ((glMultiTexCoord1fARB = (PFNGLMULTITEXCOORD1FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fARB")) == NULL) || r;
-  r = ((glMultiTexCoord1fvARB = (PFNGLMULTITEXCOORD1FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fvARB")) == NULL) || r;
-  r = ((glMultiTexCoord1iARB = (PFNGLMULTITEXCOORD1IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iARB")) == NULL) || r;
-  r = ((glMultiTexCoord1ivARB = (PFNGLMULTITEXCOORD1IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1ivARB")) == NULL) || r;
-  r = ((glMultiTexCoord1sARB = (PFNGLMULTITEXCOORD1SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sARB")) == NULL) || r;
-  r = ((glMultiTexCoord1svARB = (PFNGLMULTITEXCOORD1SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1svARB")) == NULL) || r;
-  r = ((glMultiTexCoord2dARB = (PFNGLMULTITEXCOORD2DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dARB")) == NULL) || r;
-  r = ((glMultiTexCoord2dvARB = (PFNGLMULTITEXCOORD2DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dvARB")) == NULL) || r;
-  r = ((glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fARB")) == NULL) || r;
-  r = ((glMultiTexCoord2fvARB = (PFNGLMULTITEXCOORD2FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fvARB")) == NULL) || r;
-  r = ((glMultiTexCoord2iARB = (PFNGLMULTITEXCOORD2IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iARB")) == NULL) || r;
-  r = ((glMultiTexCoord2ivARB = (PFNGLMULTITEXCOORD2IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2ivARB")) == NULL) || r;
-  r = ((glMultiTexCoord2sARB = (PFNGLMULTITEXCOORD2SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sARB")) == NULL) || r;
-  r = ((glMultiTexCoord2svARB = (PFNGLMULTITEXCOORD2SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2svARB")) == NULL) || r;
-  r = ((glMultiTexCoord3dARB = (PFNGLMULTITEXCOORD3DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dARB")) == NULL) || r;
-  r = ((glMultiTexCoord3dvARB = (PFNGLMULTITEXCOORD3DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dvARB")) == NULL) || r;
-  r = ((glMultiTexCoord3fARB = (PFNGLMULTITEXCOORD3FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fARB")) == NULL) || r;
-  r = ((glMultiTexCoord3fvARB = (PFNGLMULTITEXCOORD3FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fvARB")) == NULL) || r;
-  r = ((glMultiTexCoord3iARB = (PFNGLMULTITEXCOORD3IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iARB")) == NULL) || r;
-  r = ((glMultiTexCoord3ivARB = (PFNGLMULTITEXCOORD3IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3ivARB")) == NULL) || r;
-  r = ((glMultiTexCoord3sARB = (PFNGLMULTITEXCOORD3SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sARB")) == NULL) || r;
-  r = ((glMultiTexCoord3svARB = (PFNGLMULTITEXCOORD3SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3svARB")) == NULL) || r;
-  r = ((glMultiTexCoord4dARB = (PFNGLMULTITEXCOORD4DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dARB")) == NULL) || r;
-  r = ((glMultiTexCoord4dvARB = (PFNGLMULTITEXCOORD4DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dvARB")) == NULL) || r;
-  r = ((glMultiTexCoord4fARB = (PFNGLMULTITEXCOORD4FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fARB")) == NULL) || r;
-  r = ((glMultiTexCoord4fvARB = (PFNGLMULTITEXCOORD4FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fvARB")) == NULL) || r;
-  r = ((glMultiTexCoord4iARB = (PFNGLMULTITEXCOORD4IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iARB")) == NULL) || r;
-  r = ((glMultiTexCoord4ivARB = (PFNGLMULTITEXCOORD4IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4ivARB")) == NULL) || r;
-  r = ((glMultiTexCoord4sARB = (PFNGLMULTITEXCOORD4SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sARB")) == NULL) || r;
-  r = ((glMultiTexCoord4svARB = (PFNGLMULTITEXCOORD4SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4svARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_multitexture */
-
-#ifdef GL_ARB_occlusion_query
-
-static GLboolean _glewInit_GL_ARB_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryARB")) == NULL) || r;
-  r = ((glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesARB")) == NULL) || r;
-  r = ((glEndQueryARB = (PFNGLENDQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glEndQueryARB")) == NULL) || r;
-  r = ((glGenQueriesARB = (PFNGLGENQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesARB")) == NULL) || r;
-  r = ((glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivARB")) == NULL) || r;
-  r = ((glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivARB")) == NULL) || r;
-  r = ((glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivARB")) == NULL) || r;
-  r = ((glIsQueryARB = (PFNGLISQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glIsQueryARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_occlusion_query */
-
-#ifdef GL_ARB_occlusion_query2
-
-#endif /* GL_ARB_occlusion_query2 */
-
-#ifdef GL_ARB_pixel_buffer_object
-
-#endif /* GL_ARB_pixel_buffer_object */
-
-#ifdef GL_ARB_point_parameters
-
-static GLboolean _glewInit_GL_ARB_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfARB")) == NULL) || r;
-  r = ((glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_point_parameters */
-
-#ifdef GL_ARB_point_sprite
-
-#endif /* GL_ARB_point_sprite */
-
-#ifdef GL_ARB_program_interface_query
-
-static GLboolean _glewInit_GL_ARB_program_interface_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetProgramInterfaceiv = (PFNGLGETPROGRAMINTERFACEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInterfaceiv")) == NULL) || r;
-  r = ((glGetProgramResourceIndex = (PFNGLGETPROGRAMRESOURCEINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceIndex")) == NULL) || r;
-  r = ((glGetProgramResourceLocation = (PFNGLGETPROGRAMRESOURCELOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceLocation")) == NULL) || r;
-  r = ((glGetProgramResourceLocationIndex = (PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceLocationIndex")) == NULL) || r;
-  r = ((glGetProgramResourceName = (PFNGLGETPROGRAMRESOURCENAMEPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceName")) == NULL) || r;
-  r = ((glGetProgramResourceiv = (PFNGLGETPROGRAMRESOURCEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramResourceiv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_program_interface_query */
-
-#ifdef GL_ARB_provoking_vertex
-
-static GLboolean _glewInit_GL_ARB_provoking_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProvokingVertex = (PFNGLPROVOKINGVERTEXPROC)glewGetProcAddress((const GLubyte*)"glProvokingVertex")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_provoking_vertex */
-
-#ifdef GL_ARB_robust_buffer_access_behavior
-
-#endif /* GL_ARB_robust_buffer_access_behavior */
-
-#ifdef GL_ARB_robustness
-
-static GLboolean _glewInit_GL_ARB_robustness (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetGraphicsResetStatusARB = (PFNGLGETGRAPHICSRESETSTATUSARBPROC)glewGetProcAddress((const GLubyte*)"glGetGraphicsResetStatusARB")) == NULL) || r;
-  r = ((glGetnColorTableARB = (PFNGLGETNCOLORTABLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnColorTableARB")) == NULL) || r;
-  r = ((glGetnCompressedTexImageARB = (PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnCompressedTexImageARB")) == NULL) || r;
-  r = ((glGetnConvolutionFilterARB = (PFNGLGETNCONVOLUTIONFILTERARBPROC)glewGetProcAddress((const GLubyte*)"glGetnConvolutionFilterARB")) == NULL) || r;
-  r = ((glGetnHistogramARB = (PFNGLGETNHISTOGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glGetnHistogramARB")) == NULL) || r;
-  r = ((glGetnMapdvARB = (PFNGLGETNMAPDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapdvARB")) == NULL) || r;
-  r = ((glGetnMapfvARB = (PFNGLGETNMAPFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapfvARB")) == NULL) || r;
-  r = ((glGetnMapivARB = (PFNGLGETNMAPIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMapivARB")) == NULL) || r;
-  r = ((glGetnMinmaxARB = (PFNGLGETNMINMAXARBPROC)glewGetProcAddress((const GLubyte*)"glGetnMinmaxARB")) == NULL) || r;
-  r = ((glGetnPixelMapfvARB = (PFNGLGETNPIXELMAPFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapfvARB")) == NULL) || r;
-  r = ((glGetnPixelMapuivARB = (PFNGLGETNPIXELMAPUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapuivARB")) == NULL) || r;
-  r = ((glGetnPixelMapusvARB = (PFNGLGETNPIXELMAPUSVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPixelMapusvARB")) == NULL) || r;
-  r = ((glGetnPolygonStippleARB = (PFNGLGETNPOLYGONSTIPPLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnPolygonStippleARB")) == NULL) || r;
-  r = ((glGetnSeparableFilterARB = (PFNGLGETNSEPARABLEFILTERARBPROC)glewGetProcAddress((const GLubyte*)"glGetnSeparableFilterARB")) == NULL) || r;
-  r = ((glGetnTexImageARB = (PFNGLGETNTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetnTexImageARB")) == NULL) || r;
-  r = ((glGetnUniformdvARB = (PFNGLGETNUNIFORMDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformdvARB")) == NULL) || r;
-  r = ((glGetnUniformfvARB = (PFNGLGETNUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformfvARB")) == NULL) || r;
-  r = ((glGetnUniformivARB = (PFNGLGETNUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformivARB")) == NULL) || r;
-  r = ((glGetnUniformuivARB = (PFNGLGETNUNIFORMUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetnUniformuivARB")) == NULL) || r;
-  r = ((glReadnPixelsARB = (PFNGLREADNPIXELSARBPROC)glewGetProcAddress((const GLubyte*)"glReadnPixelsARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_robustness */
-
-#ifdef GL_ARB_robustness_application_isolation
-
-#endif /* GL_ARB_robustness_application_isolation */
-
-#ifdef GL_ARB_robustness_share_group_isolation
-
-#endif /* GL_ARB_robustness_share_group_isolation */
-
-#ifdef GL_ARB_sample_shading
-
-static GLboolean _glewInit_GL_ARB_sample_shading (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMinSampleShadingARB = (PFNGLMINSAMPLESHADINGARBPROC)glewGetProcAddress((const GLubyte*)"glMinSampleShadingARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_sample_shading */
-
-#ifdef GL_ARB_sampler_objects
-
-static GLboolean _glewInit_GL_ARB_sampler_objects (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindSampler = (PFNGLBINDSAMPLERPROC)glewGetProcAddress((const GLubyte*)"glBindSampler")) == NULL) || r;
-  r = ((glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteSamplers")) == NULL) || r;
-  r = ((glGenSamplers = (PFNGLGENSAMPLERSPROC)glewGetProcAddress((const GLubyte*)"glGenSamplers")) == NULL) || r;
-  r = ((glGetSamplerParameterIiv = (PFNGLGETSAMPLERPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterIiv")) == NULL) || r;
-  r = ((glGetSamplerParameterIuiv = (PFNGLGETSAMPLERPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterIuiv")) == NULL) || r;
-  r = ((glGetSamplerParameterfv = (PFNGLGETSAMPLERPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameterfv")) == NULL) || r;
-  r = ((glGetSamplerParameteriv = (PFNGLGETSAMPLERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetSamplerParameteriv")) == NULL) || r;
-  r = ((glIsSampler = (PFNGLISSAMPLERPROC)glewGetProcAddress((const GLubyte*)"glIsSampler")) == NULL) || r;
-  r = ((glSamplerParameterIiv = (PFNGLSAMPLERPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterIiv")) == NULL) || r;
-  r = ((glSamplerParameterIuiv = (PFNGLSAMPLERPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterIuiv")) == NULL) || r;
-  r = ((glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterf")) == NULL) || r;
-  r = ((glSamplerParameterfv = (PFNGLSAMPLERPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameterfv")) == NULL) || r;
-  r = ((glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameteri")) == NULL) || r;
-  r = ((glSamplerParameteriv = (PFNGLSAMPLERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glSamplerParameteriv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_sampler_objects */
-
-#ifdef GL_ARB_seamless_cube_map
-
-#endif /* GL_ARB_seamless_cube_map */
-
-#ifdef GL_ARB_separate_shader_objects
-
-static GLboolean _glewInit_GL_ARB_separate_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveShaderProgram = (PFNGLACTIVESHADERPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glActiveShaderProgram")) == NULL) || r;
-  r = ((glBindProgramPipeline = (PFNGLBINDPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glBindProgramPipeline")) == NULL) || r;
-  r = ((glCreateShaderProgramv = (PFNGLCREATESHADERPROGRAMVPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderProgramv")) == NULL) || r;
-  r = ((glDeleteProgramPipelines = (PFNGLDELETEPROGRAMPIPELINESPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramPipelines")) == NULL) || r;
-  r = ((glGenProgramPipelines = (PFNGLGENPROGRAMPIPELINESPROC)glewGetProcAddress((const GLubyte*)"glGenProgramPipelines")) == NULL) || r;
-  r = ((glGetProgramPipelineInfoLog = (PFNGLGETPROGRAMPIPELINEINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramPipelineInfoLog")) == NULL) || r;
-  r = ((glGetProgramPipelineiv = (PFNGLGETPROGRAMPIPELINEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramPipelineiv")) == NULL) || r;
-  r = ((glIsProgramPipeline = (PFNGLISPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glIsProgramPipeline")) == NULL) || r;
-  r = ((glProgramUniform1d = (PFNGLPROGRAMUNIFORM1DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1d")) == NULL) || r;
-  r = ((glProgramUniform1dv = (PFNGLPROGRAMUNIFORM1DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1dv")) == NULL) || r;
-  r = ((glProgramUniform1f = (PFNGLPROGRAMUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1f")) == NULL) || r;
-  r = ((glProgramUniform1fv = (PFNGLPROGRAMUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fv")) == NULL) || r;
-  r = ((glProgramUniform1i = (PFNGLPROGRAMUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i")) == NULL) || r;
-  r = ((glProgramUniform1iv = (PFNGLPROGRAMUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iv")) == NULL) || r;
-  r = ((glProgramUniform1ui = (PFNGLPROGRAMUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui")) == NULL) || r;
-  r = ((glProgramUniform1uiv = (PFNGLPROGRAMUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiv")) == NULL) || r;
-  r = ((glProgramUniform2d = (PFNGLPROGRAMUNIFORM2DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2d")) == NULL) || r;
-  r = ((glProgramUniform2dv = (PFNGLPROGRAMUNIFORM2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2dv")) == NULL) || r;
-  r = ((glProgramUniform2f = (PFNGLPROGRAMUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2f")) == NULL) || r;
-  r = ((glProgramUniform2fv = (PFNGLPROGRAMUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fv")) == NULL) || r;
-  r = ((glProgramUniform2i = (PFNGLPROGRAMUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i")) == NULL) || r;
-  r = ((glProgramUniform2iv = (PFNGLPROGRAMUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iv")) == NULL) || r;
-  r = ((glProgramUniform2ui = (PFNGLPROGRAMUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui")) == NULL) || r;
-  r = ((glProgramUniform2uiv = (PFNGLPROGRAMUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiv")) == NULL) || r;
-  r = ((glProgramUniform3d = (PFNGLPROGRAMUNIFORM3DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3d")) == NULL) || r;
-  r = ((glProgramUniform3dv = (PFNGLPROGRAMUNIFORM3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3dv")) == NULL) || r;
-  r = ((glProgramUniform3f = (PFNGLPROGRAMUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3f")) == NULL) || r;
-  r = ((glProgramUniform3fv = (PFNGLPROGRAMUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fv")) == NULL) || r;
-  r = ((glProgramUniform3i = (PFNGLPROGRAMUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i")) == NULL) || r;
-  r = ((glProgramUniform3iv = (PFNGLPROGRAMUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iv")) == NULL) || r;
-  r = ((glProgramUniform3ui = (PFNGLPROGRAMUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui")) == NULL) || r;
-  r = ((glProgramUniform3uiv = (PFNGLPROGRAMUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiv")) == NULL) || r;
-  r = ((glProgramUniform4d = (PFNGLPROGRAMUNIFORM4DPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4d")) == NULL) || r;
-  r = ((glProgramUniform4dv = (PFNGLPROGRAMUNIFORM4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4dv")) == NULL) || r;
-  r = ((glProgramUniform4f = (PFNGLPROGRAMUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4f")) == NULL) || r;
-  r = ((glProgramUniform4fv = (PFNGLPROGRAMUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fv")) == NULL) || r;
-  r = ((glProgramUniform4i = (PFNGLPROGRAMUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i")) == NULL) || r;
-  r = ((glProgramUniform4iv = (PFNGLPROGRAMUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iv")) == NULL) || r;
-  r = ((glProgramUniform4ui = (PFNGLPROGRAMUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui")) == NULL) || r;
-  r = ((glProgramUniform4uiv = (PFNGLPROGRAMUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2dv = (PFNGLPROGRAMUNIFORMMATRIX2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2fv = (PFNGLPROGRAMUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x3dv = (PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x3fv = (PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x4dv = (PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x4fv = (PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3dv = (PFNGLPROGRAMUNIFORMMATRIX3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3fv = (PFNGLPROGRAMUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x2dv = (PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x2fv = (PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x4dv = (PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x4fv = (PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4dv = (PFNGLPROGRAMUNIFORMMATRIX4DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4fv = (PFNGLPROGRAMUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x2dv = (PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x2fv = (PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x3dv = (PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3dv")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x3fv = (PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fv")) == NULL) || r;
-  r = ((glUseProgramStages = (PFNGLUSEPROGRAMSTAGESPROC)glewGetProcAddress((const GLubyte*)"glUseProgramStages")) == NULL) || r;
-  r = ((glValidateProgramPipeline = (PFNGLVALIDATEPROGRAMPIPELINEPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramPipeline")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_separate_shader_objects */
-
-#ifdef GL_ARB_shader_atomic_counters
-
-static GLboolean _glewInit_GL_ARB_shader_atomic_counters (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetActiveAtomicCounterBufferiv = (PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAtomicCounterBufferiv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shader_atomic_counters */
-
-#ifdef GL_ARB_shader_bit_encoding
-
-#endif /* GL_ARB_shader_bit_encoding */
-
-#ifdef GL_ARB_shader_image_load_store
-
-static GLboolean _glewInit_GL_ARB_shader_image_load_store (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glBindImageTexture")) == NULL) || r;
-  r = ((glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)glewGetProcAddress((const GLubyte*)"glMemoryBarrier")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shader_image_load_store */
-
-#ifdef GL_ARB_shader_image_size
-
-#endif /* GL_ARB_shader_image_size */
-
-#ifdef GL_ARB_shader_objects
-
-static GLboolean _glewInit_GL_ARB_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glAttachObjectARB")) == NULL) || r;
-  r = ((glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderARB")) == NULL) || r;
-  r = ((glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramObjectARB")) == NULL) || r;
-  r = ((glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderObjectARB")) == NULL) || r;
-  r = ((glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteObjectARB")) == NULL) || r;
-  r = ((glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDetachObjectARB")) == NULL) || r;
-  r = ((glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformARB")) == NULL) || r;
-  r = ((glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedObjectsARB")) == NULL) || r;
-  r = ((glGetHandleARB = (PFNGLGETHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetHandleARB")) == NULL) || r;
-  r = ((glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetInfoLogARB")) == NULL) || r;
-  r = ((glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterfvARB")) == NULL) || r;
-  r = ((glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivARB")) == NULL) || r;
-  r = ((glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSourceARB")) == NULL) || r;
-  r = ((glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocationARB")) == NULL) || r;
-  r = ((glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfvARB")) == NULL) || r;
-  r = ((glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformivARB")) == NULL) || r;
-  r = ((glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glLinkProgramARB")) == NULL) || r;
-  r = ((glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glShaderSourceARB")) == NULL) || r;
-  r = ((glUniform1fARB = (PFNGLUNIFORM1FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fARB")) == NULL) || r;
-  r = ((glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fvARB")) == NULL) || r;
-  r = ((glUniform1iARB = (PFNGLUNIFORM1IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1iARB")) == NULL) || r;
-  r = ((glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ivARB")) == NULL) || r;
-  r = ((glUniform2fARB = (PFNGLUNIFORM2FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fARB")) == NULL) || r;
-  r = ((glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fvARB")) == NULL) || r;
-  r = ((glUniform2iARB = (PFNGLUNIFORM2IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2iARB")) == NULL) || r;
-  r = ((glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ivARB")) == NULL) || r;
-  r = ((glUniform3fARB = (PFNGLUNIFORM3FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fARB")) == NULL) || r;
-  r = ((glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fvARB")) == NULL) || r;
-  r = ((glUniform3iARB = (PFNGLUNIFORM3IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3iARB")) == NULL) || r;
-  r = ((glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ivARB")) == NULL) || r;
-  r = ((glUniform4fARB = (PFNGLUNIFORM4FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fARB")) == NULL) || r;
-  r = ((glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fvARB")) == NULL) || r;
-  r = ((glUniform4iARB = (PFNGLUNIFORM4IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4iARB")) == NULL) || r;
-  r = ((glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ivARB")) == NULL) || r;
-  r = ((glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fvARB")) == NULL) || r;
-  r = ((glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fvARB")) == NULL) || r;
-  r = ((glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fvARB")) == NULL) || r;
-  r = ((glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glUseProgramObjectARB")) == NULL) || r;
-  r = ((glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shader_objects */
-
-#ifdef GL_ARB_shader_precision
-
-#endif /* GL_ARB_shader_precision */
-
-#ifdef GL_ARB_shader_stencil_export
-
-#endif /* GL_ARB_shader_stencil_export */
-
-#ifdef GL_ARB_shader_storage_buffer_object
-
-static GLboolean _glewInit_GL_ARB_shader_storage_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glShaderStorageBlockBinding = (PFNGLSHADERSTORAGEBLOCKBINDINGPROC)glewGetProcAddress((const GLubyte*)"glShaderStorageBlockBinding")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shader_storage_buffer_object */
-
-#ifdef GL_ARB_shader_subroutine
-
-static GLboolean _glewInit_GL_ARB_shader_subroutine (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetActiveSubroutineName = (PFNGLGETACTIVESUBROUTINENAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineName")) == NULL) || r;
-  r = ((glGetActiveSubroutineUniformName = (PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineUniformName")) == NULL) || r;
-  r = ((glGetActiveSubroutineUniformiv = (PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveSubroutineUniformiv")) == NULL) || r;
-  r = ((glGetProgramStageiv = (PFNGLGETPROGRAMSTAGEIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStageiv")) == NULL) || r;
-  r = ((glGetSubroutineIndex = (PFNGLGETSUBROUTINEINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetSubroutineIndex")) == NULL) || r;
-  r = ((glGetSubroutineUniformLocation = (PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetSubroutineUniformLocation")) == NULL) || r;
-  r = ((glGetUniformSubroutineuiv = (PFNGLGETUNIFORMSUBROUTINEUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformSubroutineuiv")) == NULL) || r;
-  r = ((glUniformSubroutinesuiv = (PFNGLUNIFORMSUBROUTINESUIVPROC)glewGetProcAddress((const GLubyte*)"glUniformSubroutinesuiv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shader_subroutine */
-
-#ifdef GL_ARB_shader_texture_lod
-
-#endif /* GL_ARB_shader_texture_lod */
-
-#ifdef GL_ARB_shading_language_100
-
-#endif /* GL_ARB_shading_language_100 */
-
-#ifdef GL_ARB_shading_language_420pack
-
-#endif /* GL_ARB_shading_language_420pack */
-
-#ifdef GL_ARB_shading_language_include
-
-static GLboolean _glewInit_GL_ARB_shading_language_include (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCompileShaderIncludeARB = (PFNGLCOMPILESHADERINCLUDEARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderIncludeARB")) == NULL) || r;
-  r = ((glDeleteNamedStringARB = (PFNGLDELETENAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteNamedStringARB")) == NULL) || r;
-  r = ((glGetNamedStringARB = (PFNGLGETNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetNamedStringARB")) == NULL) || r;
-  r = ((glGetNamedStringivARB = (PFNGLGETNAMEDSTRINGIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetNamedStringivARB")) == NULL) || r;
-  r = ((glIsNamedStringARB = (PFNGLISNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glIsNamedStringARB")) == NULL) || r;
-  r = ((glNamedStringARB = (PFNGLNAMEDSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glNamedStringARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_shading_language_include */
-
-#ifdef GL_ARB_shading_language_packing
-
-#endif /* GL_ARB_shading_language_packing */
-
-#ifdef GL_ARB_shadow
-
-#endif /* GL_ARB_shadow */
-
-#ifdef GL_ARB_shadow_ambient
-
-#endif /* GL_ARB_shadow_ambient */
-
-#ifdef GL_ARB_stencil_texturing
-
-#endif /* GL_ARB_stencil_texturing */
-
-#ifdef GL_ARB_sync
-
-static GLboolean _glewInit_GL_ARB_sync (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"glClientWaitSync")) == NULL) || r;
-  r = ((glDeleteSync = (PFNGLDELETESYNCPROC)glewGetProcAddress((const GLubyte*)"glDeleteSync")) == NULL) || r;
-  r = ((glFenceSync = (PFNGLFENCESYNCPROC)glewGetProcAddress((const GLubyte*)"glFenceSync")) == NULL) || r;
-  r = ((glGetInteger64v = (PFNGLGETINTEGER64VPROC)glewGetProcAddress((const GLubyte*)"glGetInteger64v")) == NULL) || r;
-  r = ((glGetSynciv = (PFNGLGETSYNCIVPROC)glewGetProcAddress((const GLubyte*)"glGetSynciv")) == NULL) || r;
-  r = ((glIsSync = (PFNGLISSYNCPROC)glewGetProcAddress((const GLubyte*)"glIsSync")) == NULL) || r;
-  r = ((glWaitSync = (PFNGLWAITSYNCPROC)glewGetProcAddress((const GLubyte*)"glWaitSync")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_sync */
-
-#ifdef GL_ARB_tessellation_shader
-
-static GLboolean _glewInit_GL_ARB_tessellation_shader (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPatchParameterfv = (PFNGLPATCHPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPatchParameterfv")) == NULL) || r;
-  r = ((glPatchParameteri = (PFNGLPATCHPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPatchParameteri")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_tessellation_shader */
-
-#ifdef GL_ARB_texture_border_clamp
-
-#endif /* GL_ARB_texture_border_clamp */
-
-#ifdef GL_ARB_texture_buffer_object
-
-static GLboolean _glewInit_GL_ARB_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexBufferARB = (PFNGLTEXBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glTexBufferARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_buffer_object */
-
-#ifdef GL_ARB_texture_buffer_object_rgb32
-
-#endif /* GL_ARB_texture_buffer_object_rgb32 */
-
-#ifdef GL_ARB_texture_buffer_range
-
-static GLboolean _glewInit_GL_ARB_texture_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexBufferRange = (PFNGLTEXBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glTexBufferRange")) == NULL) || r;
-  r = ((glTextureBufferRangeEXT = (PFNGLTEXTUREBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferRangeEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_buffer_range */
-
-#ifdef GL_ARB_texture_compression
-
-static GLboolean _glewInit_GL_ARB_texture_compression (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCompressedTexImage1DARB = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1DARB")) == NULL) || r;
-  r = ((glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2DARB")) == NULL) || r;
-  r = ((glCompressedTexImage3DARB = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DARB")) == NULL) || r;
-  r = ((glCompressedTexSubImage1DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1DARB")) == NULL) || r;
-  r = ((glCompressedTexSubImage2DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2DARB")) == NULL) || r;
-  r = ((glCompressedTexSubImage3DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DARB")) == NULL) || r;
-  r = ((glGetCompressedTexImageARB = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImageARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_compression */
-
-#ifdef GL_ARB_texture_compression_bptc
-
-#endif /* GL_ARB_texture_compression_bptc */
-
-#ifdef GL_ARB_texture_compression_rgtc
-
-#endif /* GL_ARB_texture_compression_rgtc */
-
-#ifdef GL_ARB_texture_cube_map
-
-#endif /* GL_ARB_texture_cube_map */
-
-#ifdef GL_ARB_texture_cube_map_array
-
-#endif /* GL_ARB_texture_cube_map_array */
-
-#ifdef GL_ARB_texture_env_add
-
-#endif /* GL_ARB_texture_env_add */
-
-#ifdef GL_ARB_texture_env_combine
-
-#endif /* GL_ARB_texture_env_combine */
-
-#ifdef GL_ARB_texture_env_crossbar
-
-#endif /* GL_ARB_texture_env_crossbar */
-
-#ifdef GL_ARB_texture_env_dot3
-
-#endif /* GL_ARB_texture_env_dot3 */
-
-#ifdef GL_ARB_texture_float
-
-#endif /* GL_ARB_texture_float */
-
-#ifdef GL_ARB_texture_gather
-
-#endif /* GL_ARB_texture_gather */
-
-#ifdef GL_ARB_texture_mirrored_repeat
-
-#endif /* GL_ARB_texture_mirrored_repeat */
-
-#ifdef GL_ARB_texture_multisample
-
-static GLboolean _glewInit_GL_ARB_texture_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefv")) == NULL) || r;
-  r = ((glSampleMaski = (PFNGLSAMPLEMASKIPROC)glewGetProcAddress((const GLubyte*)"glSampleMaski")) == NULL) || r;
-  r = ((glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexImage2DMultisample")) == NULL) || r;
-  r = ((glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DMultisample")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_multisample */
-
-#ifdef GL_ARB_texture_non_power_of_two
-
-#endif /* GL_ARB_texture_non_power_of_two */
-
-#ifdef GL_ARB_texture_query_levels
-
-#endif /* GL_ARB_texture_query_levels */
-
-#ifdef GL_ARB_texture_query_lod
-
-#endif /* GL_ARB_texture_query_lod */
-
-#ifdef GL_ARB_texture_rectangle
-
-#endif /* GL_ARB_texture_rectangle */
-
-#ifdef GL_ARB_texture_rg
-
-#endif /* GL_ARB_texture_rg */
-
-#ifdef GL_ARB_texture_rgb10_a2ui
-
-#endif /* GL_ARB_texture_rgb10_a2ui */
-
-#ifdef GL_ARB_texture_storage
-
-static GLboolean _glewInit_GL_ARB_texture_storage (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage1D")) == NULL) || r;
-  r = ((glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage2D")) == NULL) || r;
-  r = ((glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexStorage3D")) == NULL) || r;
-  r = ((glTextureStorage1DEXT = (PFNGLTEXTURESTORAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage1DEXT")) == NULL) || r;
-  r = ((glTextureStorage2DEXT = (PFNGLTEXTURESTORAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2DEXT")) == NULL) || r;
-  r = ((glTextureStorage3DEXT = (PFNGLTEXTURESTORAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3DEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_storage */
-
-#ifdef GL_ARB_texture_storage_multisample
-
-static GLboolean _glewInit_GL_ARB_texture_storage_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexStorage2DMultisample = (PFNGLTEXSTORAGE2DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexStorage2DMultisample")) == NULL) || r;
-  r = ((glTexStorage3DMultisample = (PFNGLTEXSTORAGE3DMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glTexStorage3DMultisample")) == NULL) || r;
-  r = ((glTextureStorage2DMultisampleEXT = (PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage2DMultisampleEXT")) == NULL) || r;
-  r = ((glTextureStorage3DMultisampleEXT = (PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureStorage3DMultisampleEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_storage_multisample */
-
-#ifdef GL_ARB_texture_swizzle
-
-#endif /* GL_ARB_texture_swizzle */
-
-#ifdef GL_ARB_texture_view
-
-static GLboolean _glewInit_GL_ARB_texture_view (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTextureView = (PFNGLTEXTUREVIEWPROC)glewGetProcAddress((const GLubyte*)"glTextureView")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_texture_view */
-
-#ifdef GL_ARB_timer_query
-
-static GLboolean _glewInit_GL_ARB_timer_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64v")) == NULL) || r;
-  r = ((glGetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64v")) == NULL) || r;
-  r = ((glQueryCounter = (PFNGLQUERYCOUNTERPROC)glewGetProcAddress((const GLubyte*)"glQueryCounter")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_timer_query */
-
-#ifdef GL_ARB_transform_feedback2
-
-static GLboolean _glewInit_GL_ARB_transform_feedback2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindTransformFeedback = (PFNGLBINDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBindTransformFeedback")) == NULL) || r;
-  r = ((glDeleteTransformFeedbacks = (PFNGLDELETETRANSFORMFEEDBACKSPROC)glewGetProcAddress((const GLubyte*)"glDeleteTransformFeedbacks")) == NULL) || r;
-  r = ((glDrawTransformFeedback = (PFNGLDRAWTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedback")) == NULL) || r;
-  r = ((glGenTransformFeedbacks = (PFNGLGENTRANSFORMFEEDBACKSPROC)glewGetProcAddress((const GLubyte*)"glGenTransformFeedbacks")) == NULL) || r;
-  r = ((glIsTransformFeedback = (PFNGLISTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glIsTransformFeedback")) == NULL) || r;
-  r = ((glPauseTransformFeedback = (PFNGLPAUSETRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glPauseTransformFeedback")) == NULL) || r;
-  r = ((glResumeTransformFeedback = (PFNGLRESUMETRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glResumeTransformFeedback")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_transform_feedback2 */
-
-#ifdef GL_ARB_transform_feedback3
-
-static GLboolean _glewInit_GL_ARB_transform_feedback3 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginQueryIndexed = (PFNGLBEGINQUERYINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryIndexed")) == NULL) || r;
-  r = ((glDrawTransformFeedbackStream = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackStream")) == NULL) || r;
-  r = ((glEndQueryIndexed = (PFNGLENDQUERYINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glEndQueryIndexed")) == NULL) || r;
-  r = ((glGetQueryIndexediv = (PFNGLGETQUERYINDEXEDIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryIndexediv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_transform_feedback3 */
-
-#ifdef GL_ARB_transform_feedback_instanced
-
-static GLboolean _glewInit_GL_ARB_transform_feedback_instanced (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawTransformFeedbackInstanced = (PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackInstanced")) == NULL) || r;
-  r = ((glDrawTransformFeedbackStreamInstanced = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackStreamInstanced")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_transform_feedback_instanced */
-
-#ifdef GL_ARB_transpose_matrix
-
-static GLboolean _glewInit_GL_ARB_transpose_matrix (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glLoadTransposeMatrixdARB = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixdARB")) == NULL) || r;
-  r = ((glLoadTransposeMatrixfARB = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixfARB")) == NULL) || r;
-  r = ((glMultTransposeMatrixdARB = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixdARB")) == NULL) || r;
-  r = ((glMultTransposeMatrixfARB = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixfARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_transpose_matrix */
-
-#ifdef GL_ARB_uniform_buffer_object
-
-static GLboolean _glewInit_GL_ARB_uniform_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBase")) == NULL) || r;
-  r = ((glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRange")) == NULL) || r;
-  r = ((glGetActiveUniformBlockName = (PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformBlockName")) == NULL) || r;
-  r = ((glGetActiveUniformBlockiv = (PFNGLGETACTIVEUNIFORMBLOCKIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformBlockiv")) == NULL) || r;
-  r = ((glGetActiveUniformName = (PFNGLGETACTIVEUNIFORMNAMEPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformName")) == NULL) || r;
-  r = ((glGetActiveUniformsiv = (PFNGLGETACTIVEUNIFORMSIVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformsiv")) == NULL) || r;
-  r = ((glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)glewGetProcAddress((const GLubyte*)"glGetIntegeri_v")) == NULL) || r;
-  r = ((glGetUniformBlockIndex = (PFNGLGETUNIFORMBLOCKINDEXPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBlockIndex")) == NULL) || r;
-  r = ((glGetUniformIndices = (PFNGLGETUNIFORMINDICESPROC)glewGetProcAddress((const GLubyte*)"glGetUniformIndices")) == NULL) || r;
-  r = ((glUniformBlockBinding = (PFNGLUNIFORMBLOCKBINDINGPROC)glewGetProcAddress((const GLubyte*)"glUniformBlockBinding")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_uniform_buffer_object */
-
-#ifdef GL_ARB_vertex_array_bgra
-
-#endif /* GL_ARB_vertex_array_bgra */
-
-#ifdef GL_ARB_vertex_array_object
-
-static GLboolean _glewInit_GL_ARB_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArray")) == NULL) || r;
-  r = ((glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArrays")) == NULL) || r;
-  r = ((glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArrays")) == NULL) || r;
-  r = ((glIsVertexArray = (PFNGLISVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArray")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_array_object */
-
-#ifdef GL_ARB_vertex_attrib_64bit
-
-static GLboolean _glewInit_GL_ARB_vertex_attrib_64bit (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetVertexAttribLdv = (PFNGLGETVERTEXATTRIBLDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLdv")) == NULL) || r;
-  r = ((glVertexAttribL1d = (PFNGLVERTEXATTRIBL1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1d")) == NULL) || r;
-  r = ((glVertexAttribL1dv = (PFNGLVERTEXATTRIBL1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dv")) == NULL) || r;
-  r = ((glVertexAttribL2d = (PFNGLVERTEXATTRIBL2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2d")) == NULL) || r;
-  r = ((glVertexAttribL2dv = (PFNGLVERTEXATTRIBL2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dv")) == NULL) || r;
-  r = ((glVertexAttribL3d = (PFNGLVERTEXATTRIBL3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3d")) == NULL) || r;
-  r = ((glVertexAttribL3dv = (PFNGLVERTEXATTRIBL3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dv")) == NULL) || r;
-  r = ((glVertexAttribL4d = (PFNGLVERTEXATTRIBL4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4d")) == NULL) || r;
-  r = ((glVertexAttribL4dv = (PFNGLVERTEXATTRIBL4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dv")) == NULL) || r;
-  r = ((glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLPointer")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_attrib_64bit */
-
-#ifdef GL_ARB_vertex_attrib_binding
-
-static GLboolean _glewInit_GL_ARB_vertex_attrib_binding (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindVertexBuffer = (PFNGLBINDVERTEXBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindVertexBuffer")) == NULL) || r;
-  r = ((glVertexAttribBinding = (PFNGLVERTEXATTRIBBINDINGPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribBinding")) == NULL) || r;
-  r = ((glVertexAttribFormat = (PFNGLVERTEXATTRIBFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribFormat")) == NULL) || r;
-  r = ((glVertexAttribIFormat = (PFNGLVERTEXATTRIBIFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIFormat")) == NULL) || r;
-  r = ((glVertexAttribLFormat = (PFNGLVERTEXATTRIBLFORMATPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLFormat")) == NULL) || r;
-  r = ((glVertexBindingDivisor = (PFNGLVERTEXBINDINGDIVISORPROC)glewGetProcAddress((const GLubyte*)"glVertexBindingDivisor")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_attrib_binding */
-
-#ifdef GL_ARB_vertex_blend
-
-static GLboolean _glewInit_GL_ARB_vertex_blend (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glVertexBlendARB = (PFNGLVERTEXBLENDARBPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendARB")) == NULL) || r;
-  r = ((glWeightPointerARB = (PFNGLWEIGHTPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glWeightPointerARB")) == NULL) || r;
-  r = ((glWeightbvARB = (PFNGLWEIGHTBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightbvARB")) == NULL) || r;
-  r = ((glWeightdvARB = (PFNGLWEIGHTDVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightdvARB")) == NULL) || r;
-  r = ((glWeightfvARB = (PFNGLWEIGHTFVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightfvARB")) == NULL) || r;
-  r = ((glWeightivARB = (PFNGLWEIGHTIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightivARB")) == NULL) || r;
-  r = ((glWeightsvARB = (PFNGLWEIGHTSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightsvARB")) == NULL) || r;
-  r = ((glWeightubvARB = (PFNGLWEIGHTUBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightubvARB")) == NULL) || r;
-  r = ((glWeightuivARB = (PFNGLWEIGHTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightuivARB")) == NULL) || r;
-  r = ((glWeightusvARB = (PFNGLWEIGHTUSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightusvARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_blend */
-
-#ifdef GL_ARB_vertex_buffer_object
-
-static GLboolean _glewInit_GL_ARB_vertex_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindBufferARB = (PFNGLBINDBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glBindBufferARB")) == NULL) || r;
-  r = ((glBufferDataARB = (PFNGLBUFFERDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferDataARB")) == NULL) || r;
-  r = ((glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferSubDataARB")) == NULL) || r;
-  r = ((glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffersARB")) == NULL) || r;
-  r = ((glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glGenBuffersARB")) == NULL) || r;
-  r = ((glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterivARB")) == NULL) || r;
-  r = ((glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointervARB")) == NULL) || r;
-  r = ((glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubDataARB")) == NULL) || r;
-  r = ((glIsBufferARB = (PFNGLISBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glIsBufferARB")) == NULL) || r;
-  r = ((glMapBufferARB = (PFNGLMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glMapBufferARB")) == NULL) || r;
-  r = ((glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glUnmapBufferARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_buffer_object */
-
-#ifdef GL_ARB_vertex_program
-
-static GLboolean _glewInit_GL_ARB_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glBindProgramARB")) == NULL) || r;
-  r = ((glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsARB")) == NULL) || r;
-  r = ((glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArrayARB")) == NULL) || r;
-  r = ((glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArrayARB")) == NULL) || r;
-  r = ((glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsARB")) == NULL) || r;
-  r = ((glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterdvARB")) == NULL) || r;
-  r = ((glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterfvARB")) == NULL) || r;
-  r = ((glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterdvARB")) == NULL) || r;
-  r = ((glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterfvARB")) == NULL) || r;
-  r = ((glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringARB")) == NULL) || r;
-  r = ((glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivARB")) == NULL) || r;
-  r = ((glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervARB")) == NULL) || r;
-  r = ((glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvARB")) == NULL) || r;
-  r = ((glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvARB")) == NULL) || r;
-  r = ((glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivARB")) == NULL) || r;
-  r = ((glIsProgramARB = (PFNGLISPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glIsProgramARB")) == NULL) || r;
-  r = ((glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dARB")) == NULL) || r;
-  r = ((glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dvARB")) == NULL) || r;
-  r = ((glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fARB")) == NULL) || r;
-  r = ((glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fvARB")) == NULL) || r;
-  r = ((glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dARB")) == NULL) || r;
-  r = ((glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dvARB")) == NULL) || r;
-  r = ((glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fARB")) == NULL) || r;
-  r = ((glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fvARB")) == NULL) || r;
-  r = ((glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glProgramStringARB")) == NULL) || r;
-  r = ((glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dARB")) == NULL) || r;
-  r = ((glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvARB")) == NULL) || r;
-  r = ((glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fARB")) == NULL) || r;
-  r = ((glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvARB")) == NULL) || r;
-  r = ((glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sARB")) == NULL) || r;
-  r = ((glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svARB")) == NULL) || r;
-  r = ((glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dARB")) == NULL) || r;
-  r = ((glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvARB")) == NULL) || r;
-  r = ((glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fARB")) == NULL) || r;
-  r = ((glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvARB")) == NULL) || r;
-  r = ((glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sARB")) == NULL) || r;
-  r = ((glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svARB")) == NULL) || r;
-  r = ((glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dARB")) == NULL) || r;
-  r = ((glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvARB")) == NULL) || r;
-  r = ((glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fARB")) == NULL) || r;
-  r = ((glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvARB")) == NULL) || r;
-  r = ((glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sARB")) == NULL) || r;
-  r = ((glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svARB")) == NULL) || r;
-  r = ((glVertexAttrib4NbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NbvARB")) == NULL) || r;
-  r = ((glVertexAttrib4NivARB = (PFNGLVERTEXATTRIB4NIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NivARB")) == NULL) || r;
-  r = ((glVertexAttrib4NsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NsvARB")) == NULL) || r;
-  r = ((glVertexAttrib4NubARB = (PFNGLVERTEXATTRIB4NUBARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubARB")) == NULL) || r;
-  r = ((glVertexAttrib4NubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubvARB")) == NULL) || r;
-  r = ((glVertexAttrib4NuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NuivARB")) == NULL) || r;
-  r = ((glVertexAttrib4NusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NusvARB")) == NULL) || r;
-  r = ((glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bvARB")) == NULL) || r;
-  r = ((glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dARB")) == NULL) || r;
-  r = ((glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvARB")) == NULL) || r;
-  r = ((glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fARB")) == NULL) || r;
-  r = ((glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvARB")) == NULL) || r;
-  r = ((glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ivARB")) == NULL) || r;
-  r = ((glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sARB")) == NULL) || r;
-  r = ((glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svARB")) == NULL) || r;
-  r = ((glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvARB")) == NULL) || r;
-  r = ((glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uivARB")) == NULL) || r;
-  r = ((glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usvARB")) == NULL) || r;
-  r = ((glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_program */
-
-#ifdef GL_ARB_vertex_shader
-
-static GLboolean _glewInit_GL_ARB_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocationARB")) == NULL) || r;
-  r = ((glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttribARB")) == NULL) || r;
-  r = ((glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocationARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_shader */
-
-#ifdef GL_ARB_vertex_type_2_10_10_10_rev
-
-static GLboolean _glewInit_GL_ARB_vertex_type_2_10_10_10_rev (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorP3ui = (PFNGLCOLORP3UIPROC)glewGetProcAddress((const GLubyte*)"glColorP3ui")) == NULL) || r;
-  r = ((glColorP3uiv = (PFNGLCOLORP3UIVPROC)glewGetProcAddress((const GLubyte*)"glColorP3uiv")) == NULL) || r;
-  r = ((glColorP4ui = (PFNGLCOLORP4UIPROC)glewGetProcAddress((const GLubyte*)"glColorP4ui")) == NULL) || r;
-  r = ((glColorP4uiv = (PFNGLCOLORP4UIVPROC)glewGetProcAddress((const GLubyte*)"glColorP4uiv")) == NULL) || r;
-  r = ((glMultiTexCoordP1ui = (PFNGLMULTITEXCOORDP1UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP1ui")) == NULL) || r;
-  r = ((glMultiTexCoordP1uiv = (PFNGLMULTITEXCOORDP1UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP1uiv")) == NULL) || r;
-  r = ((glMultiTexCoordP2ui = (PFNGLMULTITEXCOORDP2UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP2ui")) == NULL) || r;
-  r = ((glMultiTexCoordP2uiv = (PFNGLMULTITEXCOORDP2UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP2uiv")) == NULL) || r;
-  r = ((glMultiTexCoordP3ui = (PFNGLMULTITEXCOORDP3UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP3ui")) == NULL) || r;
-  r = ((glMultiTexCoordP3uiv = (PFNGLMULTITEXCOORDP3UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP3uiv")) == NULL) || r;
-  r = ((glMultiTexCoordP4ui = (PFNGLMULTITEXCOORDP4UIPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP4ui")) == NULL) || r;
-  r = ((glMultiTexCoordP4uiv = (PFNGLMULTITEXCOORDP4UIVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordP4uiv")) == NULL) || r;
-  r = ((glNormalP3ui = (PFNGLNORMALP3UIPROC)glewGetProcAddress((const GLubyte*)"glNormalP3ui")) == NULL) || r;
-  r = ((glNormalP3uiv = (PFNGLNORMALP3UIVPROC)glewGetProcAddress((const GLubyte*)"glNormalP3uiv")) == NULL) || r;
-  r = ((glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorP3ui")) == NULL) || r;
-  r = ((glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorP3uiv")) == NULL) || r;
-  r = ((glTexCoordP1ui = (PFNGLTEXCOORDP1UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP1ui")) == NULL) || r;
-  r = ((glTexCoordP1uiv = (PFNGLTEXCOORDP1UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP1uiv")) == NULL) || r;
-  r = ((glTexCoordP2ui = (PFNGLTEXCOORDP2UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP2ui")) == NULL) || r;
-  r = ((glTexCoordP2uiv = (PFNGLTEXCOORDP2UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP2uiv")) == NULL) || r;
-  r = ((glTexCoordP3ui = (PFNGLTEXCOORDP3UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP3ui")) == NULL) || r;
-  r = ((glTexCoordP3uiv = (PFNGLTEXCOORDP3UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP3uiv")) == NULL) || r;
-  r = ((glTexCoordP4ui = (PFNGLTEXCOORDP4UIPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP4ui")) == NULL) || r;
-  r = ((glTexCoordP4uiv = (PFNGLTEXCOORDP4UIVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordP4uiv")) == NULL) || r;
-  r = ((glVertexAttribP1ui = (PFNGLVERTEXATTRIBP1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP1ui")) == NULL) || r;
-  r = ((glVertexAttribP1uiv = (PFNGLVERTEXATTRIBP1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP1uiv")) == NULL) || r;
-  r = ((glVertexAttribP2ui = (PFNGLVERTEXATTRIBP2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP2ui")) == NULL) || r;
-  r = ((glVertexAttribP2uiv = (PFNGLVERTEXATTRIBP2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP2uiv")) == NULL) || r;
-  r = ((glVertexAttribP3ui = (PFNGLVERTEXATTRIBP3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP3ui")) == NULL) || r;
-  r = ((glVertexAttribP3uiv = (PFNGLVERTEXATTRIBP3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP3uiv")) == NULL) || r;
-  r = ((glVertexAttribP4ui = (PFNGLVERTEXATTRIBP4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP4ui")) == NULL) || r;
-  r = ((glVertexAttribP4uiv = (PFNGLVERTEXATTRIBP4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribP4uiv")) == NULL) || r;
-  r = ((glVertexP2ui = (PFNGLVERTEXP2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP2ui")) == NULL) || r;
-  r = ((glVertexP2uiv = (PFNGLVERTEXP2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP2uiv")) == NULL) || r;
-  r = ((glVertexP3ui = (PFNGLVERTEXP3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP3ui")) == NULL) || r;
-  r = ((glVertexP3uiv = (PFNGLVERTEXP3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP3uiv")) == NULL) || r;
-  r = ((glVertexP4ui = (PFNGLVERTEXP4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexP4ui")) == NULL) || r;
-  r = ((glVertexP4uiv = (PFNGLVERTEXP4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexP4uiv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
-
-#ifdef GL_ARB_viewport_array
-
-static GLboolean _glewInit_GL_ARB_viewport_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDepthRangeArrayv = (PFNGLDEPTHRANGEARRAYVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeArrayv")) == NULL) || r;
-  r = ((glDepthRangeIndexed = (PFNGLDEPTHRANGEINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glDepthRangeIndexed")) == NULL) || r;
-  r = ((glGetDoublei_v = (PFNGLGETDOUBLEI_VPROC)glewGetProcAddress((const GLubyte*)"glGetDoublei_v")) == NULL) || r;
-  r = ((glGetFloati_v = (PFNGLGETFLOATI_VPROC)glewGetProcAddress((const GLubyte*)"glGetFloati_v")) == NULL) || r;
-  r = ((glScissorArrayv = (PFNGLSCISSORARRAYVPROC)glewGetProcAddress((const GLubyte*)"glScissorArrayv")) == NULL) || r;
-  r = ((glScissorIndexed = (PFNGLSCISSORINDEXEDPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexed")) == NULL) || r;
-  r = ((glScissorIndexedv = (PFNGLSCISSORINDEXEDVPROC)glewGetProcAddress((const GLubyte*)"glScissorIndexedv")) == NULL) || r;
-  r = ((glViewportArrayv = (PFNGLVIEWPORTARRAYVPROC)glewGetProcAddress((const GLubyte*)"glViewportArrayv")) == NULL) || r;
-  r = ((glViewportIndexedf = (PFNGLVIEWPORTINDEXEDFPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedf")) == NULL) || r;
-  r = ((glViewportIndexedfv = (PFNGLVIEWPORTINDEXEDFVPROC)glewGetProcAddress((const GLubyte*)"glViewportIndexedfv")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_viewport_array */
-
-#ifdef GL_ARB_window_pos
-
-static GLboolean _glewInit_GL_ARB_window_pos (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glWindowPos2dARB = (PFNGLWINDOWPOS2DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dARB")) == NULL) || r;
-  r = ((glWindowPos2dvARB = (PFNGLWINDOWPOS2DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvARB")) == NULL) || r;
-  r = ((glWindowPos2fARB = (PFNGLWINDOWPOS2FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fARB")) == NULL) || r;
-  r = ((glWindowPos2fvARB = (PFNGLWINDOWPOS2FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvARB")) == NULL) || r;
-  r = ((glWindowPos2iARB = (PFNGLWINDOWPOS2IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iARB")) == NULL) || r;
-  r = ((glWindowPos2ivARB = (PFNGLWINDOWPOS2IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivARB")) == NULL) || r;
-  r = ((glWindowPos2sARB = (PFNGLWINDOWPOS2SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sARB")) == NULL) || r;
-  r = ((glWindowPos2svARB = (PFNGLWINDOWPOS2SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svARB")) == NULL) || r;
-  r = ((glWindowPos3dARB = (PFNGLWINDOWPOS3DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dARB")) == NULL) || r;
-  r = ((glWindowPos3dvARB = (PFNGLWINDOWPOS3DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvARB")) == NULL) || r;
-  r = ((glWindowPos3fARB = (PFNGLWINDOWPOS3FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fARB")) == NULL) || r;
-  r = ((glWindowPos3fvARB = (PFNGLWINDOWPOS3FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvARB")) == NULL) || r;
-  r = ((glWindowPos3iARB = (PFNGLWINDOWPOS3IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iARB")) == NULL) || r;
-  r = ((glWindowPos3ivARB = (PFNGLWINDOWPOS3IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivARB")) == NULL) || r;
-  r = ((glWindowPos3sARB = (PFNGLWINDOWPOS3SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sARB")) == NULL) || r;
-  r = ((glWindowPos3svARB = (PFNGLWINDOWPOS3SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ARB_window_pos */
-
-#ifdef GL_ATIX_point_sprites
-
-#endif /* GL_ATIX_point_sprites */
-
-#ifdef GL_ATIX_texture_env_combine3
-
-#endif /* GL_ATIX_texture_env_combine3 */
-
-#ifdef GL_ATIX_texture_env_route
-
-#endif /* GL_ATIX_texture_env_route */
-
-#ifdef GL_ATIX_vertex_shader_output_point_size
-
-#endif /* GL_ATIX_vertex_shader_output_point_size */
-
-#ifdef GL_ATI_draw_buffers
-
-static GLboolean _glewInit_GL_ATI_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_draw_buffers */
-
-#ifdef GL_ATI_element_array
-
-static GLboolean _glewInit_GL_ATI_element_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawElementArrayATI = (PFNGLDRAWELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayATI")) == NULL) || r;
-  r = ((glDrawRangeElementArrayATI = (PFNGLDRAWRANGEELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayATI")) == NULL) || r;
-  r = ((glElementPointerATI = (PFNGLELEMENTPOINTERATIPROC)glewGetProcAddress((const GLubyte*)"glElementPointerATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_element_array */
-
-#ifdef GL_ATI_envmap_bumpmap
-
-static GLboolean _glewInit_GL_ATI_envmap_bumpmap (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetTexBumpParameterfvATI = (PFNGLGETTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterfvATI")) == NULL) || r;
-  r = ((glGetTexBumpParameterivATI = (PFNGLGETTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterivATI")) == NULL) || r;
-  r = ((glTexBumpParameterfvATI = (PFNGLTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterfvATI")) == NULL) || r;
-  r = ((glTexBumpParameterivATI = (PFNGLTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterivATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_envmap_bumpmap */
-
-#ifdef GL_ATI_fragment_shader
-
-static GLboolean _glewInit_GL_ATI_fragment_shader (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAlphaFragmentOp1ATI = (PFNGLALPHAFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp1ATI")) == NULL) || r;
-  r = ((glAlphaFragmentOp2ATI = (PFNGLALPHAFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp2ATI")) == NULL) || r;
-  r = ((glAlphaFragmentOp3ATI = (PFNGLALPHAFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp3ATI")) == NULL) || r;
-  r = ((glBeginFragmentShaderATI = (PFNGLBEGINFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBeginFragmentShaderATI")) == NULL) || r;
-  r = ((glBindFragmentShaderATI = (PFNGLBINDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBindFragmentShaderATI")) == NULL) || r;
-  r = ((glColorFragmentOp1ATI = (PFNGLCOLORFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp1ATI")) == NULL) || r;
-  r = ((glColorFragmentOp2ATI = (PFNGLCOLORFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp2ATI")) == NULL) || r;
-  r = ((glColorFragmentOp3ATI = (PFNGLCOLORFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp3ATI")) == NULL) || r;
-  r = ((glDeleteFragmentShaderATI = (PFNGLDELETEFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glDeleteFragmentShaderATI")) == NULL) || r;
-  r = ((glEndFragmentShaderATI = (PFNGLENDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glEndFragmentShaderATI")) == NULL) || r;
-  r = ((glGenFragmentShadersATI = (PFNGLGENFRAGMENTSHADERSATIPROC)glewGetProcAddress((const GLubyte*)"glGenFragmentShadersATI")) == NULL) || r;
-  r = ((glPassTexCoordATI = (PFNGLPASSTEXCOORDATIPROC)glewGetProcAddress((const GLubyte*)"glPassTexCoordATI")) == NULL) || r;
-  r = ((glSampleMapATI = (PFNGLSAMPLEMAPATIPROC)glewGetProcAddress((const GLubyte*)"glSampleMapATI")) == NULL) || r;
-  r = ((glSetFragmentShaderConstantATI = (PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)glewGetProcAddress((const GLubyte*)"glSetFragmentShaderConstantATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_fragment_shader */
-
-#ifdef GL_ATI_map_object_buffer
-
-static GLboolean _glewInit_GL_ATI_map_object_buffer (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMapObjectBufferATI = (PFNGLMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glMapObjectBufferATI")) == NULL) || r;
-  r = ((glUnmapObjectBufferATI = (PFNGLUNMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUnmapObjectBufferATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_map_object_buffer */
-
-#ifdef GL_ATI_meminfo
-
-#endif /* GL_ATI_meminfo */
-
-#ifdef GL_ATI_pn_triangles
-
-static GLboolean _glewInit_GL_ATI_pn_triangles (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPNTrianglesfATI = (PFNGLPNTRIANGLESFATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesfATI")) == NULL) || r;
-  r = ((glPNTrianglesiATI = (PFNGLPNTRIANGLESIATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesiATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_pn_triangles */
-
-#ifdef GL_ATI_separate_stencil
-
-static GLboolean _glewInit_GL_ATI_separate_stencil (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparateATI")) == NULL) || r;
-  r = ((glStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparateATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_separate_stencil */
-
-#ifdef GL_ATI_shader_texture_lod
-
-#endif /* GL_ATI_shader_texture_lod */
-
-#ifdef GL_ATI_text_fragment_shader
-
-#endif /* GL_ATI_text_fragment_shader */
-
-#ifdef GL_ATI_texture_compression_3dc
-
-#endif /* GL_ATI_texture_compression_3dc */
-
-#ifdef GL_ATI_texture_env_combine3
-
-#endif /* GL_ATI_texture_env_combine3 */
-
-#ifdef GL_ATI_texture_float
-
-#endif /* GL_ATI_texture_float */
-
-#ifdef GL_ATI_texture_mirror_once
-
-#endif /* GL_ATI_texture_mirror_once */
-
-#ifdef GL_ATI_vertex_array_object
-
-static GLboolean _glewInit_GL_ATI_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glArrayObjectATI = (PFNGLARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glArrayObjectATI")) == NULL) || r;
-  r = ((glFreeObjectBufferATI = (PFNGLFREEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glFreeObjectBufferATI")) == NULL) || r;
-  r = ((glGetArrayObjectfvATI = (PFNGLGETARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectfvATI")) == NULL) || r;
-  r = ((glGetArrayObjectivATI = (PFNGLGETARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectivATI")) == NULL) || r;
-  r = ((glGetObjectBufferfvATI = (PFNGLGETOBJECTBUFFERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferfvATI")) == NULL) || r;
-  r = ((glGetObjectBufferivATI = (PFNGLGETOBJECTBUFFERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferivATI")) == NULL) || r;
-  r = ((glGetVariantArrayObjectfvATI = (PFNGLGETVARIANTARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectfvATI")) == NULL) || r;
-  r = ((glGetVariantArrayObjectivATI = (PFNGLGETVARIANTARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectivATI")) == NULL) || r;
-  r = ((glIsObjectBufferATI = (PFNGLISOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glIsObjectBufferATI")) == NULL) || r;
-  r = ((glNewObjectBufferATI = (PFNGLNEWOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glNewObjectBufferATI")) == NULL) || r;
-  r = ((glUpdateObjectBufferATI = (PFNGLUPDATEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUpdateObjectBufferATI")) == NULL) || r;
-  r = ((glVariantArrayObjectATI = (PFNGLVARIANTARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVariantArrayObjectATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_vertex_array_object */
-
-#ifdef GL_ATI_vertex_attrib_array_object
-
-static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetVertexAttribArrayObjectfvATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectfvATI")) == NULL) || r;
-  r = ((glGetVertexAttribArrayObjectivATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectivATI")) == NULL) || r;
-  r = ((glVertexAttribArrayObjectATI = (PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribArrayObjectATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_vertex_attrib_array_object */
-
-#ifdef GL_ATI_vertex_streams
-
-static GLboolean _glewInit_GL_ATI_vertex_streams (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClientActiveVertexStreamATI = (PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)glewGetProcAddress((const GLubyte*)"glClientActiveVertexStreamATI")) == NULL) || r;
-  r = ((glNormalStream3bATI = (PFNGLNORMALSTREAM3BATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bATI")) == NULL) || r;
-  r = ((glNormalStream3bvATI = (PFNGLNORMALSTREAM3BVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bvATI")) == NULL) || r;
-  r = ((glNormalStream3dATI = (PFNGLNORMALSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dATI")) == NULL) || r;
-  r = ((glNormalStream3dvATI = (PFNGLNORMALSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dvATI")) == NULL) || r;
-  r = ((glNormalStream3fATI = (PFNGLNORMALSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fATI")) == NULL) || r;
-  r = ((glNormalStream3fvATI = (PFNGLNORMALSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fvATI")) == NULL) || r;
-  r = ((glNormalStream3iATI = (PFNGLNORMALSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3iATI")) == NULL) || r;
-  r = ((glNormalStream3ivATI = (PFNGLNORMALSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3ivATI")) == NULL) || r;
-  r = ((glNormalStream3sATI = (PFNGLNORMALSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3sATI")) == NULL) || r;
-  r = ((glNormalStream3svATI = (PFNGLNORMALSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3svATI")) == NULL) || r;
-  r = ((glVertexBlendEnvfATI = (PFNGLVERTEXBLENDENVFATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnvfATI")) == NULL) || r;
-  r = ((glVertexBlendEnviATI = (PFNGLVERTEXBLENDENVIATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnviATI")) == NULL) || r;
-  r = ((glVertexStream1dATI = (PFNGLVERTEXSTREAM1DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1dATI")) == NULL) || r;
-  r = ((glVertexStream1dvATI = (PFNGLVERTEXSTREAM1DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1dvATI")) == NULL) || r;
-  r = ((glVertexStream1fATI = (PFNGLVERTEXSTREAM1FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1fATI")) == NULL) || r;
-  r = ((glVertexStream1fvATI = (PFNGLVERTEXSTREAM1FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1fvATI")) == NULL) || r;
-  r = ((glVertexStream1iATI = (PFNGLVERTEXSTREAM1IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1iATI")) == NULL) || r;
-  r = ((glVertexStream1ivATI = (PFNGLVERTEXSTREAM1IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1ivATI")) == NULL) || r;
-  r = ((glVertexStream1sATI = (PFNGLVERTEXSTREAM1SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1sATI")) == NULL) || r;
-  r = ((glVertexStream1svATI = (PFNGLVERTEXSTREAM1SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream1svATI")) == NULL) || r;
-  r = ((glVertexStream2dATI = (PFNGLVERTEXSTREAM2DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dATI")) == NULL) || r;
-  r = ((glVertexStream2dvATI = (PFNGLVERTEXSTREAM2DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dvATI")) == NULL) || r;
-  r = ((glVertexStream2fATI = (PFNGLVERTEXSTREAM2FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fATI")) == NULL) || r;
-  r = ((glVertexStream2fvATI = (PFNGLVERTEXSTREAM2FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fvATI")) == NULL) || r;
-  r = ((glVertexStream2iATI = (PFNGLVERTEXSTREAM2IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2iATI")) == NULL) || r;
-  r = ((glVertexStream2ivATI = (PFNGLVERTEXSTREAM2IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2ivATI")) == NULL) || r;
-  r = ((glVertexStream2sATI = (PFNGLVERTEXSTREAM2SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2sATI")) == NULL) || r;
-  r = ((glVertexStream2svATI = (PFNGLVERTEXSTREAM2SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2svATI")) == NULL) || r;
-  r = ((glVertexStream3dATI = (PFNGLVERTEXSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dATI")) == NULL) || r;
-  r = ((glVertexStream3dvATI = (PFNGLVERTEXSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dvATI")) == NULL) || r;
-  r = ((glVertexStream3fATI = (PFNGLVERTEXSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fATI")) == NULL) || r;
-  r = ((glVertexStream3fvATI = (PFNGLVERTEXSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fvATI")) == NULL) || r;
-  r = ((glVertexStream3iATI = (PFNGLVERTEXSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3iATI")) == NULL) || r;
-  r = ((glVertexStream3ivATI = (PFNGLVERTEXSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3ivATI")) == NULL) || r;
-  r = ((glVertexStream3sATI = (PFNGLVERTEXSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3sATI")) == NULL) || r;
-  r = ((glVertexStream3svATI = (PFNGLVERTEXSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3svATI")) == NULL) || r;
-  r = ((glVertexStream4dATI = (PFNGLVERTEXSTREAM4DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dATI")) == NULL) || r;
-  r = ((glVertexStream4dvATI = (PFNGLVERTEXSTREAM4DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dvATI")) == NULL) || r;
-  r = ((glVertexStream4fATI = (PFNGLVERTEXSTREAM4FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fATI")) == NULL) || r;
-  r = ((glVertexStream4fvATI = (PFNGLVERTEXSTREAM4FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fvATI")) == NULL) || r;
-  r = ((glVertexStream4iATI = (PFNGLVERTEXSTREAM4IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4iATI")) == NULL) || r;
-  r = ((glVertexStream4ivATI = (PFNGLVERTEXSTREAM4IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4ivATI")) == NULL) || r;
-  r = ((glVertexStream4sATI = (PFNGLVERTEXSTREAM4SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4sATI")) == NULL) || r;
-  r = ((glVertexStream4svATI = (PFNGLVERTEXSTREAM4SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4svATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_ATI_vertex_streams */
-
-#ifdef GL_EXT_422_pixels
-
-#endif /* GL_EXT_422_pixels */
-
-#ifdef GL_EXT_Cg_shader
-
-#endif /* GL_EXT_Cg_shader */
-
-#ifdef GL_EXT_abgr
-
-#endif /* GL_EXT_abgr */
-
-#ifdef GL_EXT_bgra
-
-#endif /* GL_EXT_bgra */
-
-#ifdef GL_EXT_bindable_uniform
-
-static GLboolean _glewInit_GL_EXT_bindable_uniform (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetUniformBufferSizeEXT = (PFNGLGETUNIFORMBUFFERSIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBufferSizeEXT")) == NULL) || r;
-  r = ((glGetUniformOffsetEXT = (PFNGLGETUNIFORMOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformOffsetEXT")) == NULL) || r;
-  r = ((glUniformBufferEXT = (PFNGLUNIFORMBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUniformBufferEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_bindable_uniform */
-
-#ifdef GL_EXT_blend_color
-
-static GLboolean _glewInit_GL_EXT_blend_color (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendColorEXT = (PFNGLBLENDCOLOREXTPROC)glewGetProcAddress((const GLubyte*)"glBlendColorEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_blend_color */
-
-#ifdef GL_EXT_blend_equation_separate
-
-static GLboolean _glewInit_GL_EXT_blend_equation_separate (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_blend_equation_separate */
-
-#ifdef GL_EXT_blend_func_separate
-
-static GLboolean _glewInit_GL_EXT_blend_func_separate (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_blend_func_separate */
-
-#ifdef GL_EXT_blend_logic_op
-
-#endif /* GL_EXT_blend_logic_op */
-
-#ifdef GL_EXT_blend_minmax
-
-static GLboolean _glewInit_GL_EXT_blend_minmax (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_blend_minmax */
-
-#ifdef GL_EXT_blend_subtract
-
-#endif /* GL_EXT_blend_subtract */
-
-#ifdef GL_EXT_clip_volume_hint
-
-#endif /* GL_EXT_clip_volume_hint */
-
-#ifdef GL_EXT_cmyka
-
-#endif /* GL_EXT_cmyka */
-
-#ifdef GL_EXT_color_subtable
-
-static GLboolean _glewInit_GL_EXT_color_subtable (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorSubTableEXT = (PFNGLCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorSubTableEXT")) == NULL) || r;
-  r = ((glCopyColorSubTableEXT = (PFNGLCOPYCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTableEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_color_subtable */
-
-#ifdef GL_EXT_compiled_vertex_array
-
-static GLboolean _glewInit_GL_EXT_compiled_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glLockArraysEXT = (PFNGLLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glLockArraysEXT")) == NULL) || r;
-  r = ((glUnlockArraysEXT = (PFNGLUNLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glUnlockArraysEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_compiled_vertex_array */
-
-#ifdef GL_EXT_convolution
-
-static GLboolean _glewInit_GL_EXT_convolution (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glConvolutionFilter1DEXT = (PFNGLCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1DEXT")) == NULL) || r;
-  r = ((glConvolutionFilter2DEXT = (PFNGLCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2DEXT")) == NULL) || r;
-  r = ((glConvolutionParameterfEXT = (PFNGLCONVOLUTIONPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfEXT")) == NULL) || r;
-  r = ((glConvolutionParameterfvEXT = (PFNGLCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfvEXT")) == NULL) || r;
-  r = ((glConvolutionParameteriEXT = (PFNGLCONVOLUTIONPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriEXT")) == NULL) || r;
-  r = ((glConvolutionParameterivEXT = (PFNGLCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterivEXT")) == NULL) || r;
-  r = ((glCopyConvolutionFilter1DEXT = (PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1DEXT")) == NULL) || r;
-  r = ((glCopyConvolutionFilter2DEXT = (PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2DEXT")) == NULL) || r;
-  r = ((glGetConvolutionFilterEXT = (PFNGLGETCONVOLUTIONFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilterEXT")) == NULL) || r;
-  r = ((glGetConvolutionParameterfvEXT = (PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfvEXT")) == NULL) || r;
-  r = ((glGetConvolutionParameterivEXT = (PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterivEXT")) == NULL) || r;
-  r = ((glGetSeparableFilterEXT = (PFNGLGETSEPARABLEFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilterEXT")) == NULL) || r;
-  r = ((glSeparableFilter2DEXT = (PFNGLSEPARABLEFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2DEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_convolution */
-
-#ifdef GL_EXT_coordinate_frame
-
-static GLboolean _glewInit_GL_EXT_coordinate_frame (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBinormalPointerEXT = (PFNGLBINORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glBinormalPointerEXT")) == NULL) || r;
-  r = ((glTangentPointerEXT = (PFNGLTANGENTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTangentPointerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_coordinate_frame */
-
-#ifdef GL_EXT_copy_texture
-
-static GLboolean _glewInit_GL_EXT_copy_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyTexImage1DEXT = (PFNGLCOPYTEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage1DEXT")) == NULL) || r;
-  r = ((glCopyTexImage2DEXT = (PFNGLCOPYTEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage2DEXT")) == NULL) || r;
-  r = ((glCopyTexSubImage1DEXT = (PFNGLCOPYTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage1DEXT")) == NULL) || r;
-  r = ((glCopyTexSubImage2DEXT = (PFNGLCOPYTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage2DEXT")) == NULL) || r;
-  r = ((glCopyTexSubImage3DEXT = (PFNGLCOPYTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_copy_texture */
-
-#ifdef GL_EXT_cull_vertex
-
-static GLboolean _glewInit_GL_EXT_cull_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCullParameterdvEXT = (PFNGLCULLPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterdvEXT")) == NULL) || r;
-  r = ((glCullParameterfvEXT = (PFNGLCULLPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterfvEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_cull_vertex */
-
-#ifdef GL_EXT_debug_marker
-
-static GLboolean _glewInit_GL_EXT_debug_marker (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glInsertEventMarkerEXT = (PFNGLINSERTEVENTMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glInsertEventMarkerEXT")) == NULL) || r;
-  r = ((glPopGroupMarkerEXT = (PFNGLPOPGROUPMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glPopGroupMarkerEXT")) == NULL) || r;
-  r = ((glPushGroupMarkerEXT = (PFNGLPUSHGROUPMARKEREXTPROC)glewGetProcAddress((const GLubyte*)"glPushGroupMarkerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_debug_marker */
-
-#ifdef GL_EXT_depth_bounds_test
-
-static GLboolean _glewInit_GL_EXT_depth_bounds_test (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDepthBoundsEXT = (PFNGLDEPTHBOUNDSEXTPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_depth_bounds_test */
-
-#ifdef GL_EXT_direct_state_access
-
-static GLboolean _glewInit_GL_EXT_direct_state_access (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindMultiTextureEXT = (PFNGLBINDMULTITEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindMultiTextureEXT")) == NULL) || r;
-  r = ((glCheckNamedFramebufferStatusEXT = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckNamedFramebufferStatusEXT")) == NULL) || r;
-  r = ((glClientAttribDefaultEXT = (PFNGLCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glClientAttribDefaultEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexImage1DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage1DEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexImage2DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage2DEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexImage3DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage3DEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexSubImage1DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage1DEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexSubImage2DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage2DEXT")) == NULL) || r;
-  r = ((glCompressedMultiTexSubImage3DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage3DEXT")) == NULL) || r;
-  r = ((glCompressedTextureImage1DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage1DEXT")) == NULL) || r;
-  r = ((glCompressedTextureImage2DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage2DEXT")) == NULL) || r;
-  r = ((glCompressedTextureImage3DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage3DEXT")) == NULL) || r;
-  r = ((glCompressedTextureSubImage1DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage1DEXT")) == NULL) || r;
-  r = ((glCompressedTextureSubImage2DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage2DEXT")) == NULL) || r;
-  r = ((glCompressedTextureSubImage3DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage3DEXT")) == NULL) || r;
-  r = ((glCopyMultiTexImage1DEXT = (PFNGLCOPYMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage1DEXT")) == NULL) || r;
-  r = ((glCopyMultiTexImage2DEXT = (PFNGLCOPYMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage2DEXT")) == NULL) || r;
-  r = ((glCopyMultiTexSubImage1DEXT = (PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage1DEXT")) == NULL) || r;
-  r = ((glCopyMultiTexSubImage2DEXT = (PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage2DEXT")) == NULL) || r;
-  r = ((glCopyMultiTexSubImage3DEXT = (PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage3DEXT")) == NULL) || r;
-  r = ((glCopyTextureImage1DEXT = (PFNGLCOPYTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage1DEXT")) == NULL) || r;
-  r = ((glCopyTextureImage2DEXT = (PFNGLCOPYTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage2DEXT")) == NULL) || r;
-  r = ((glCopyTextureSubImage1DEXT = (PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage1DEXT")) == NULL) || r;
-  r = ((glCopyTextureSubImage2DEXT = (PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage2DEXT")) == NULL) || r;
-  r = ((glCopyTextureSubImage3DEXT = (PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage3DEXT")) == NULL) || r;
-  r = ((glDisableClientStateIndexedEXT = (PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateIndexedEXT")) == NULL) || r;
-  r = ((glDisableClientStateiEXT = (PFNGLDISABLECLIENTSTATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateiEXT")) == NULL) || r;
-  r = ((glDisableVertexArrayAttribEXT = (PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexArrayAttribEXT")) == NULL) || r;
-  r = ((glDisableVertexArrayEXT = (PFNGLDISABLEVERTEXARRAYEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexArrayEXT")) == NULL) || r;
-  r = ((glEnableClientStateIndexedEXT = (PFNGLENABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateIndexedEXT")) == NULL) || r;
-  r = ((glEnableClientStateiEXT = (PFNGLENABLECLIENTSTATEIEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateiEXT")) == NULL) || r;
-  r = ((glEnableVertexArrayAttribEXT = (PFNGLENABLEVERTEXARRAYATTRIBEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexArrayAttribEXT")) == NULL) || r;
-  r = ((glEnableVertexArrayEXT = (PFNGLENABLEVERTEXARRAYEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexArrayEXT")) == NULL) || r;
-  r = ((glFlushMappedNamedBufferRangeEXT = (PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedNamedBufferRangeEXT")) == NULL) || r;
-  r = ((glFramebufferDrawBufferEXT = (PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBufferEXT")) == NULL) || r;
-  r = ((glFramebufferDrawBuffersEXT = (PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBuffersEXT")) == NULL) || r;
-  r = ((glFramebufferReadBufferEXT = (PFNGLFRAMEBUFFERREADBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferReadBufferEXT")) == NULL) || r;
-  r = ((glGenerateMultiTexMipmapEXT = (PFNGLGENERATEMULTITEXMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMultiTexMipmapEXT")) == NULL) || r;
-  r = ((glGenerateTextureMipmapEXT = (PFNGLGENERATETEXTUREMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateTextureMipmapEXT")) == NULL) || r;
-  r = ((glGetCompressedMultiTexImageEXT = (PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedMultiTexImageEXT")) == NULL) || r;
-  r = ((glGetCompressedTextureImageEXT = (PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureImageEXT")) == NULL) || r;
-  r = ((glGetDoubleIndexedvEXT = (PFNGLGETDOUBLEINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoubleIndexedvEXT")) == NULL) || r;
-  r = ((glGetDoublei_vEXT = (PFNGLGETDOUBLEI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoublei_vEXT")) == NULL) || r;
-  r = ((glGetFloatIndexedvEXT = (PFNGLGETFLOATINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloatIndexedvEXT")) == NULL) || r;
-  r = ((glGetFloati_vEXT = (PFNGLGETFLOATI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloati_vEXT")) == NULL) || r;
-  r = ((glGetFramebufferParameterivEXT = (PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameterivEXT")) == NULL) || r;
-  r = ((glGetMultiTexEnvfvEXT = (PFNGLGETMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvfvEXT")) == NULL) || r;
-  r = ((glGetMultiTexEnvivEXT = (PFNGLGETMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvivEXT")) == NULL) || r;
-  r = ((glGetMultiTexGendvEXT = (PFNGLGETMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGendvEXT")) == NULL) || r;
-  r = ((glGetMultiTexGenfvEXT = (PFNGLGETMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenfvEXT")) == NULL) || r;
-  r = ((glGetMultiTexGenivEXT = (PFNGLGETMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenivEXT")) == NULL) || r;
-  r = ((glGetMultiTexImageEXT = (PFNGLGETMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexImageEXT")) == NULL) || r;
-  r = ((glGetMultiTexLevelParameterfvEXT = (PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterfvEXT")) == NULL) || r;
-  r = ((glGetMultiTexLevelParameterivEXT = (PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterivEXT")) == NULL) || r;
-  r = ((glGetMultiTexParameterIivEXT = (PFNGLGETMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIivEXT")) == NULL) || r;
-  r = ((glGetMultiTexParameterIuivEXT = (PFNGLGETMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIuivEXT")) == NULL) || r;
-  r = ((glGetMultiTexParameterfvEXT = (PFNGLGETMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterfvEXT")) == NULL) || r;
-  r = ((glGetMultiTexParameterivEXT = (PFNGLGETMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterivEXT")) == NULL) || r;
-  r = ((glGetNamedBufferParameterivEXT = (PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterivEXT")) == NULL) || r;
-  r = ((glGetNamedBufferPointervEXT = (PFNGLGETNAMEDBUFFERPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferPointervEXT")) == NULL) || r;
-  r = ((glGetNamedBufferSubDataEXT = (PFNGLGETNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferSubDataEXT")) == NULL) || r;
-  r = ((glGetNamedFramebufferAttachmentParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferAttachmentParameterivEXT")) == NULL) || r;
-  r = ((glGetNamedProgramLocalParameterIivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIivEXT")) == NULL) || r;
-  r = ((glGetNamedProgramLocalParameterIuivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIuivEXT")) == NULL) || r;
-  r = ((glGetNamedProgramLocalParameterdvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterdvEXT")) == NULL) || r;
-  r = ((glGetNamedProgramLocalParameterfvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterfvEXT")) == NULL) || r;
-  r = ((glGetNamedProgramStringEXT = (PFNGLGETNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramStringEXT")) == NULL) || r;
-  r = ((glGetNamedProgramivEXT = (PFNGLGETNAMEDPROGRAMIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramivEXT")) == NULL) || r;
-  r = ((glGetNamedRenderbufferParameterivEXT = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedRenderbufferParameterivEXT")) == NULL) || r;
-  r = ((glGetPointerIndexedvEXT = (PFNGLGETPOINTERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointerIndexedvEXT")) == NULL) || r;
-  r = ((glGetPointeri_vEXT = (PFNGLGETPOINTERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointeri_vEXT")) == NULL) || r;
-  r = ((glGetTextureImageEXT = (PFNGLGETTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureImageEXT")) == NULL) || r;
-  r = ((glGetTextureLevelParameterfvEXT = (PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterfvEXT")) == NULL) || r;
-  r = ((glGetTextureLevelParameterivEXT = (PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterivEXT")) == NULL) || r;
-  r = ((glGetTextureParameterIivEXT = (PFNGLGETTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIivEXT")) == NULL) || r;
-  r = ((glGetTextureParameterIuivEXT = (PFNGLGETTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIuivEXT")) == NULL) || r;
-  r = ((glGetTextureParameterfvEXT = (PFNGLGETTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterfvEXT")) == NULL) || r;
-  r = ((glGetTextureParameterivEXT = (PFNGLGETTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterivEXT")) == NULL) || r;
-  r = ((glGetVertexArrayIntegeri_vEXT = (PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIntegeri_vEXT")) == NULL) || r;
-  r = ((glGetVertexArrayIntegervEXT = (PFNGLGETVERTEXARRAYINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayIntegervEXT")) == NULL) || r;
-  r = ((glGetVertexArrayPointeri_vEXT = (PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayPointeri_vEXT")) == NULL) || r;
-  r = ((glGetVertexArrayPointervEXT = (PFNGLGETVERTEXARRAYPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexArrayPointervEXT")) == NULL) || r;
-  r = ((glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferEXT")) == NULL) || r;
-  r = ((glMapNamedBufferRangeEXT = (PFNGLMAPNAMEDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferRangeEXT")) == NULL) || r;
-  r = ((glMatrixFrustumEXT = (PFNGLMATRIXFRUSTUMEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixFrustumEXT")) == NULL) || r;
-  r = ((glMatrixLoadIdentityEXT = (PFNGLMATRIXLOADIDENTITYEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadIdentityEXT")) == NULL) || r;
-  r = ((glMatrixLoadTransposedEXT = (PFNGLMATRIXLOADTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposedEXT")) == NULL) || r;
-  r = ((glMatrixLoadTransposefEXT = (PFNGLMATRIXLOADTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposefEXT")) == NULL) || r;
-  r = ((glMatrixLoaddEXT = (PFNGLMATRIXLOADDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoaddEXT")) == NULL) || r;
-  r = ((glMatrixLoadfEXT = (PFNGLMATRIXLOADFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadfEXT")) == NULL) || r;
-  r = ((glMatrixMultTransposedEXT = (PFNGLMATRIXMULTTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposedEXT")) == NULL) || r;
-  r = ((glMatrixMultTransposefEXT = (PFNGLMATRIXMULTTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposefEXT")) == NULL) || r;
-  r = ((glMatrixMultdEXT = (PFNGLMATRIXMULTDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultdEXT")) == NULL) || r;
-  r = ((glMatrixMultfEXT = (PFNGLMATRIXMULTFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultfEXT")) == NULL) || r;
-  r = ((glMatrixOrthoEXT = (PFNGLMATRIXORTHOEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixOrthoEXT")) == NULL) || r;
-  r = ((glMatrixPopEXT = (PFNGLMATRIXPOPEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPopEXT")) == NULL) || r;
-  r = ((glMatrixPushEXT = (PFNGLMATRIXPUSHEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPushEXT")) == NULL) || r;
-  r = ((glMatrixRotatedEXT = (PFNGLMATRIXROTATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatedEXT")) == NULL) || r;
-  r = ((glMatrixRotatefEXT = (PFNGLMATRIXROTATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatefEXT")) == NULL) || r;
-  r = ((glMatrixScaledEXT = (PFNGLMATRIXSCALEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScaledEXT")) == NULL) || r;
-  r = ((glMatrixScalefEXT = (PFNGLMATRIXSCALEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScalefEXT")) == NULL) || r;
-  r = ((glMatrixTranslatedEXT = (PFNGLMATRIXTRANSLATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatedEXT")) == NULL) || r;
-  r = ((glMatrixTranslatefEXT = (PFNGLMATRIXTRANSLATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatefEXT")) == NULL) || r;
-  r = ((glMultiTexBufferEXT = (PFNGLMULTITEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexBufferEXT")) == NULL) || r;
-  r = ((glMultiTexCoordPointerEXT = (PFNGLMULTITEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordPointerEXT")) == NULL) || r;
-  r = ((glMultiTexEnvfEXT = (PFNGLMULTITEXENVFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfEXT")) == NULL) || r;
-  r = ((glMultiTexEnvfvEXT = (PFNGLMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfvEXT")) == NULL) || r;
-  r = ((glMultiTexEnviEXT = (PFNGLMULTITEXENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnviEXT")) == NULL) || r;
-  r = ((glMultiTexEnvivEXT = (PFNGLMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvivEXT")) == NULL) || r;
-  r = ((glMultiTexGendEXT = (PFNGLMULTITEXGENDEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendEXT")) == NULL) || r;
-  r = ((glMultiTexGendvEXT = (PFNGLMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendvEXT")) == NULL) || r;
-  r = ((glMultiTexGenfEXT = (PFNGLMULTITEXGENFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfEXT")) == NULL) || r;
-  r = ((glMultiTexGenfvEXT = (PFNGLMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfvEXT")) == NULL) || r;
-  r = ((glMultiTexGeniEXT = (PFNGLMULTITEXGENIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGeniEXT")) == NULL) || r;
-  r = ((glMultiTexGenivEXT = (PFNGLMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenivEXT")) == NULL) || r;
-  r = ((glMultiTexImage1DEXT = (PFNGLMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage1DEXT")) == NULL) || r;
-  r = ((glMultiTexImage2DEXT = (PFNGLMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage2DEXT")) == NULL) || r;
-  r = ((glMultiTexImage3DEXT = (PFNGLMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage3DEXT")) == NULL) || r;
-  r = ((glMultiTexParameterIivEXT = (PFNGLMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIivEXT")) == NULL) || r;
-  r = ((glMultiTexParameterIuivEXT = (PFNGLMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIuivEXT")) == NULL) || r;
-  r = ((glMultiTexParameterfEXT = (PFNGLMULTITEXPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfEXT")) == NULL) || r;
-  r = ((glMultiTexParameterfvEXT = (PFNGLMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfvEXT")) == NULL) || r;
-  r = ((glMultiTexParameteriEXT = (PFNGLMULTITEXPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameteriEXT")) == NULL) || r;
-  r = ((glMultiTexParameterivEXT = (PFNGLMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterivEXT")) == NULL) || r;
-  r = ((glMultiTexRenderbufferEXT = (PFNGLMULTITEXRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexRenderbufferEXT")) == NULL) || r;
-  r = ((glMultiTexSubImage1DEXT = (PFNGLMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage1DEXT")) == NULL) || r;
-  r = ((glMultiTexSubImage2DEXT = (PFNGLMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage2DEXT")) == NULL) || r;
-  r = ((glMultiTexSubImage3DEXT = (PFNGLMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage3DEXT")) == NULL) || r;
-  r = ((glNamedBufferDataEXT = (PFNGLNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferDataEXT")) == NULL) || r;
-  r = ((glNamedBufferSubDataEXT = (PFNGLNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferSubDataEXT")) == NULL) || r;
-  r = ((glNamedCopyBufferSubDataEXT = (PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedCopyBufferSubDataEXT")) == NULL) || r;
-  r = ((glNamedFramebufferRenderbufferEXT = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferRenderbufferEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTexture1DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture1DEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTexture2DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture2DEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTexture3DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture3DEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTextureEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTextureFaceEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureFaceEXT")) == NULL) || r;
-  r = ((glNamedFramebufferTextureLayerEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureLayerEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameter4dEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameter4dvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dvEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameter4fEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameter4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fvEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameterI4iEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4iEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameterI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4ivEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameterI4uiEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uiEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameterI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uivEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParameters4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameters4fvEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParametersI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4ivEXT")) == NULL) || r;
-  r = ((glNamedProgramLocalParametersI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4uivEXT")) == NULL) || r;
-  r = ((glNamedProgramStringEXT = (PFNGLNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramStringEXT")) == NULL) || r;
-  r = ((glNamedRenderbufferStorageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageEXT")) == NULL) || r;
-  r = ((glNamedRenderbufferStorageMultisampleCoverageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleCoverageEXT")) == NULL) || r;
-  r = ((glNamedRenderbufferStorageMultisampleEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleEXT")) == NULL) || r;
-  r = ((glProgramUniform1dEXT = (PFNGLPROGRAMUNIFORM1DEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1dEXT")) == NULL) || r;
-  r = ((glProgramUniform1dvEXT = (PFNGLPROGRAMUNIFORM1DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1dvEXT")) == NULL) || r;
-  r = ((glProgramUniform1fEXT = (PFNGLPROGRAMUNIFORM1FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fEXT")) == NULL) || r;
-  r = ((glProgramUniform1fvEXT = (PFNGLPROGRAMUNIFORM1FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fvEXT")) == NULL) || r;
-  r = ((glProgramUniform1iEXT = (PFNGLPROGRAMUNIFORM1IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iEXT")) == NULL) || r;
-  r = ((glProgramUniform1ivEXT = (PFNGLPROGRAMUNIFORM1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ivEXT")) == NULL) || r;
-  r = ((glProgramUniform1uiEXT = (PFNGLPROGRAMUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiEXT")) == NULL) || r;
-  r = ((glProgramUniform1uivEXT = (PFNGLPROGRAMUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uivEXT")) == NULL) || r;
-  r = ((glProgramUniform2dEXT = (PFNGLPROGRAMUNIFORM2DEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2dEXT")) == NULL) || r;
-  r = ((glProgramUniform2dvEXT = (PFNGLPROGRAMUNIFORM2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2dvEXT")) == NULL) || r;
-  r = ((glProgramUniform2fEXT = (PFNGLPROGRAMUNIFORM2FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fEXT")) == NULL) || r;
-  r = ((glProgramUniform2fvEXT = (PFNGLPROGRAMUNIFORM2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fvEXT")) == NULL) || r;
-  r = ((glProgramUniform2iEXT = (PFNGLPROGRAMUNIFORM2IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iEXT")) == NULL) || r;
-  r = ((glProgramUniform2ivEXT = (PFNGLPROGRAMUNIFORM2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ivEXT")) == NULL) || r;
-  r = ((glProgramUniform2uiEXT = (PFNGLPROGRAMUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiEXT")) == NULL) || r;
-  r = ((glProgramUniform2uivEXT = (PFNGLPROGRAMUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uivEXT")) == NULL) || r;
-  r = ((glProgramUniform3dEXT = (PFNGLPROGRAMUNIFORM3DEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3dEXT")) == NULL) || r;
-  r = ((glProgramUniform3dvEXT = (PFNGLPROGRAMUNIFORM3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3dvEXT")) == NULL) || r;
-  r = ((glProgramUniform3fEXT = (PFNGLPROGRAMUNIFORM3FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fEXT")) == NULL) || r;
-  r = ((glProgramUniform3fvEXT = (PFNGLPROGRAMUNIFORM3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fvEXT")) == NULL) || r;
-  r = ((glProgramUniform3iEXT = (PFNGLPROGRAMUNIFORM3IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iEXT")) == NULL) || r;
-  r = ((glProgramUniform3ivEXT = (PFNGLPROGRAMUNIFORM3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ivEXT")) == NULL) || r;
-  r = ((glProgramUniform3uiEXT = (PFNGLPROGRAMUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiEXT")) == NULL) || r;
-  r = ((glProgramUniform3uivEXT = (PFNGLPROGRAMUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uivEXT")) == NULL) || r;
-  r = ((glProgramUniform4dEXT = (PFNGLPROGRAMUNIFORM4DEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4dEXT")) == NULL) || r;
-  r = ((glProgramUniform4dvEXT = (PFNGLPROGRAMUNIFORM4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4dvEXT")) == NULL) || r;
-  r = ((glProgramUniform4fEXT = (PFNGLPROGRAMUNIFORM4FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fEXT")) == NULL) || r;
-  r = ((glProgramUniform4fvEXT = (PFNGLPROGRAMUNIFORM4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fvEXT")) == NULL) || r;
-  r = ((glProgramUniform4iEXT = (PFNGLPROGRAMUNIFORM4IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iEXT")) == NULL) || r;
-  r = ((glProgramUniform4ivEXT = (PFNGLPROGRAMUNIFORM4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ivEXT")) == NULL) || r;
-  r = ((glProgramUniform4uiEXT = (PFNGLPROGRAMUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiEXT")) == NULL) || r;
-  r = ((glProgramUniform4uivEXT = (PFNGLPROGRAMUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uivEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2dvEXT = (PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x3dvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x4dvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix2x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3dvEXT = (PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x2dvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x4dvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix3x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4dvEXT = (PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x2dvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x3dvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3dvEXT")) == NULL) || r;
-  r = ((glProgramUniformMatrix4x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fvEXT")) == NULL) || r;
-  r = ((glPushClientAttribDefaultEXT = (PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glPushClientAttribDefaultEXT")) == NULL) || r;
-  r = ((glTextureBufferEXT = (PFNGLTEXTUREBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferEXT")) == NULL) || r;
-  r = ((glTextureImage1DEXT = (PFNGLTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage1DEXT")) == NULL) || r;
-  r = ((glTextureImage2DEXT = (PFNGLTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DEXT")) == NULL) || r;
-  r = ((glTextureImage3DEXT = (PFNGLTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DEXT")) == NULL) || r;
-  r = ((glTextureParameterIivEXT = (PFNGLTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIivEXT")) == NULL) || r;
-  r = ((glTextureParameterIuivEXT = (PFNGLTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIuivEXT")) == NULL) || r;
-  r = ((glTextureParameterfEXT = (PFNGLTEXTUREPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfEXT")) == NULL) || r;
-  r = ((glTextureParameterfvEXT = (PFNGLTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfvEXT")) == NULL) || r;
-  r = ((glTextureParameteriEXT = (PFNGLTEXTUREPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteriEXT")) == NULL) || r;
-  r = ((glTextureParameterivEXT = (PFNGLTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterivEXT")) == NULL) || r;
-  r = ((glTextureRenderbufferEXT = (PFNGLTEXTURERENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureRenderbufferEXT")) == NULL) || r;
-  r = ((glTextureSubImage1DEXT = (PFNGLTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage1DEXT")) == NULL) || r;
-  r = ((glTextureSubImage2DEXT = (PFNGLTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage2DEXT")) == NULL) || r;
-  r = ((glTextureSubImage3DEXT = (PFNGLTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage3DEXT")) == NULL) || r;
-  r = ((glUnmapNamedBufferEXT = (PFNGLUNMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUnmapNamedBufferEXT")) == NULL) || r;
-  r = ((glVertexArrayColorOffsetEXT = (PFNGLVERTEXARRAYCOLOROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayColorOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayEdgeFlagOffsetEXT = (PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayEdgeFlagOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayFogCoordOffsetEXT = (PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayFogCoordOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayIndexOffsetEXT = (PFNGLVERTEXARRAYINDEXOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayIndexOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayMultiTexCoordOffsetEXT = (PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayMultiTexCoordOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayNormalOffsetEXT = (PFNGLVERTEXARRAYNORMALOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayNormalOffsetEXT")) == NULL) || r;
-  r = ((glVertexArraySecondaryColorOffsetEXT = (PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArraySecondaryColorOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayTexCoordOffsetEXT = (PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayTexCoordOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayVertexAttribIOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribIOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayVertexAttribOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribOffsetEXT")) == NULL) || r;
-  r = ((glVertexArrayVertexOffsetEXT = (PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexOffsetEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_direct_state_access */
-
-#ifdef GL_EXT_draw_buffers2
-
-static GLboolean _glewInit_GL_EXT_draw_buffers2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorMaskIndexedEXT = (PFNGLCOLORMASKINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glColorMaskIndexedEXT")) == NULL) || r;
-  r = ((glDisableIndexedEXT = (PFNGLDISABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableIndexedEXT")) == NULL) || r;
-  r = ((glEnableIndexedEXT = (PFNGLENABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableIndexedEXT")) == NULL) || r;
-  r = ((glGetBooleanIndexedvEXT = (PFNGLGETBOOLEANINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetBooleanIndexedvEXT")) == NULL) || r;
-  r = ((glGetIntegerIndexedvEXT = (PFNGLGETINTEGERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerIndexedvEXT")) == NULL) || r;
-  r = ((glIsEnabledIndexedEXT = (PFNGLISENABLEDINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledIndexedEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_draw_buffers2 */
-
-#ifdef GL_EXT_draw_instanced
-
-static GLboolean _glewInit_GL_EXT_draw_instanced (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawArraysInstancedEXT = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedEXT")) == NULL) || r;
-  r = ((glDrawElementsInstancedEXT = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_draw_instanced */
-
-#ifdef GL_EXT_draw_range_elements
-
-static GLboolean _glewInit_GL_EXT_draw_range_elements (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDrawRangeElementsEXT = (PFNGLDRAWRANGEELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_draw_range_elements */
-
-#ifdef GL_EXT_fog_coord
-
-static GLboolean _glewInit_GL_EXT_fog_coord (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerEXT")) == NULL) || r;
-  r = ((glFogCoorddEXT = (PFNGLFOGCOORDDEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddEXT")) == NULL) || r;
-  r = ((glFogCoorddvEXT = (PFNGLFOGCOORDDVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddvEXT")) == NULL) || r;
-  r = ((glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfEXT")) == NULL) || r;
-  r = ((glFogCoordfvEXT = (PFNGLFOGCOORDFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfvEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_fog_coord */
-
-#ifdef GL_EXT_fragment_lighting
-
-static GLboolean _glewInit_GL_EXT_fragment_lighting (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFragmentColorMaterialEXT = (PFNGLFRAGMENTCOLORMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialEXT")) == NULL) || r;
-  r = ((glFragmentLightModelfEXT = (PFNGLFRAGMENTLIGHTMODELFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfEXT")) == NULL) || r;
-  r = ((glFragmentLightModelfvEXT = (PFNGLFRAGMENTLIGHTMODELFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvEXT")) == NULL) || r;
-  r = ((glFragmentLightModeliEXT = (PFNGLFRAGMENTLIGHTMODELIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliEXT")) == NULL) || r;
-  r = ((glFragmentLightModelivEXT = (PFNGLFRAGMENTLIGHTMODELIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivEXT")) == NULL) || r;
-  r = ((glFragmentLightfEXT = (PFNGLFRAGMENTLIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfEXT")) == NULL) || r;
-  r = ((glFragmentLightfvEXT = (PFNGLFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvEXT")) == NULL) || r;
-  r = ((glFragmentLightiEXT = (PFNGLFRAGMENTLIGHTIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiEXT")) == NULL) || r;
-  r = ((glFragmentLightivEXT = (PFNGLFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivEXT")) == NULL) || r;
-  r = ((glFragmentMaterialfEXT = (PFNGLFRAGMENTMATERIALFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfEXT")) == NULL) || r;
-  r = ((glFragmentMaterialfvEXT = (PFNGLFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvEXT")) == NULL) || r;
-  r = ((glFragmentMaterialiEXT = (PFNGLFRAGMENTMATERIALIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiEXT")) == NULL) || r;
-  r = ((glFragmentMaterialivEXT = (PFNGLFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivEXT")) == NULL) || r;
-  r = ((glGetFragmentLightfvEXT = (PFNGLGETFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvEXT")) == NULL) || r;
-  r = ((glGetFragmentLightivEXT = (PFNGLGETFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivEXT")) == NULL) || r;
-  r = ((glGetFragmentMaterialfvEXT = (PFNGLGETFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvEXT")) == NULL) || r;
-  r = ((glGetFragmentMaterialivEXT = (PFNGLGETFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivEXT")) == NULL) || r;
-  r = ((glLightEnviEXT = (PFNGLLIGHTENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glLightEnviEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_fragment_lighting */
-
-#ifdef GL_EXT_framebuffer_blit
-
-static GLboolean _glewInit_GL_EXT_framebuffer_blit (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_framebuffer_blit */
-
-#ifdef GL_EXT_framebuffer_multisample
-
-static GLboolean _glewInit_GL_EXT_framebuffer_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_framebuffer_multisample */
-
-#ifdef GL_EXT_framebuffer_multisample_blit_scaled
-
-#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
-
-#ifdef GL_EXT_framebuffer_object
-
-static GLboolean _glewInit_GL_EXT_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindFramebufferEXT")) == NULL) || r;
-  r = ((glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbufferEXT")) == NULL) || r;
-  r = ((glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatusEXT")) == NULL) || r;
-  r = ((glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffersEXT")) == NULL) || r;
-  r = ((glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffersEXT")) == NULL) || r;
-  r = ((glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbufferEXT")) == NULL) || r;
-  r = ((glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1DEXT")) == NULL) || r;
-  r = ((glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DEXT")) == NULL) || r;
-  r = ((glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3DEXT")) == NULL) || r;
-  r = ((glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffersEXT")) == NULL) || r;
-  r = ((glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffersEXT")) == NULL) || r;
-  r = ((glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmapEXT")) == NULL) || r;
-  r = ((glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameterivEXT")) == NULL) || r;
-  r = ((glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameterivEXT")) == NULL) || r;
-  r = ((glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsFramebufferEXT")) == NULL) || r;
-  r = ((glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbufferEXT")) == NULL) || r;
-  r = ((glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_framebuffer_object */
-
-#ifdef GL_EXT_framebuffer_sRGB
-
-#endif /* GL_EXT_framebuffer_sRGB */
-
-#ifdef GL_EXT_geometry_shader4
-
-static GLboolean _glewInit_GL_EXT_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFramebufferTextureEXT = (PFNGLFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureEXT")) == NULL) || r;
-  r = ((glFramebufferTextureFaceEXT = (PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceEXT")) == NULL) || r;
-  r = ((glProgramParameteriEXT = (PFNGLPROGRAMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_geometry_shader4 */
-
-#ifdef GL_EXT_gpu_program_parameters
-
-static GLboolean _glewInit_GL_EXT_gpu_program_parameters (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProgramEnvParameters4fvEXT = (PFNGLPROGRAMENVPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameters4fvEXT")) == NULL) || r;
-  r = ((glProgramLocalParameters4fvEXT = (PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameters4fvEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_gpu_program_parameters */
-
-#ifdef GL_EXT_gpu_shader4
-
-static GLboolean _glewInit_GL_EXT_gpu_shader4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindFragDataLocationEXT = (PFNGLBINDFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationEXT")) == NULL) || r;
-  r = ((glGetFragDataLocationEXT = (PFNGLGETFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocationEXT")) == NULL) || r;
-  r = ((glGetUniformuivEXT = (PFNGLGETUNIFORMUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuivEXT")) == NULL) || r;
-  r = ((glGetVertexAttribIivEXT = (PFNGLGETVERTEXATTRIBIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIivEXT")) == NULL) || r;
-  r = ((glGetVertexAttribIuivEXT = (PFNGLGETVERTEXATTRIBIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuivEXT")) == NULL) || r;
-  r = ((glUniform1uiEXT = (PFNGLUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiEXT")) == NULL) || r;
-  r = ((glUniform1uivEXT = (PFNGLUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uivEXT")) == NULL) || r;
-  r = ((glUniform2uiEXT = (PFNGLUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiEXT")) == NULL) || r;
-  r = ((glUniform2uivEXT = (PFNGLUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uivEXT")) == NULL) || r;
-  r = ((glUniform3uiEXT = (PFNGLUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiEXT")) == NULL) || r;
-  r = ((glUniform3uivEXT = (PFNGLUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uivEXT")) == NULL) || r;
-  r = ((glUniform4uiEXT = (PFNGLUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiEXT")) == NULL) || r;
-  r = ((glUniform4uivEXT = (PFNGLUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uivEXT")) == NULL) || r;
-  r = ((glVertexAttribI1iEXT = (PFNGLVERTEXATTRIBI1IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iEXT")) == NULL) || r;
-  r = ((glVertexAttribI1ivEXT = (PFNGLVERTEXATTRIBI1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ivEXT")) == NULL) || r;
-  r = ((glVertexAttribI1uiEXT = (PFNGLVERTEXATTRIBI1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiEXT")) == NULL) || r;
-  r = ((glVertexAttribI1uivEXT = (PFNGLVERTEXATTRIBI1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uivEXT")) == NULL) || r;
-  r = ((glVertexAttribI2iEXT = (PFNGLVERTEXATTRIBI2IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iEXT")) == NULL) || r;
-  r = ((glVertexAttribI2ivEXT = (PFNGLVERTEXATTRIBI2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ivEXT")) == NULL) || r;
-  r = ((glVertexAttribI2uiEXT = (PFNGLVERTEXATTRIBI2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiEXT")) == NULL) || r;
-  r = ((glVertexAttribI2uivEXT = (PFNGLVERTEXATTRIBI2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uivEXT")) == NULL) || r;
-  r = ((glVertexAttribI3iEXT = (PFNGLVERTEXATTRIBI3IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iEXT")) == NULL) || r;
-  r = ((glVertexAttribI3ivEXT = (PFNGLVERTEXATTRIBI3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ivEXT")) == NULL) || r;
-  r = ((glVertexAttribI3uiEXT = (PFNGLVERTEXATTRIBI3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiEXT")) == NULL) || r;
-  r = ((glVertexAttribI3uivEXT = (PFNGLVERTEXATTRIBI3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uivEXT")) == NULL) || r;
-  r = ((glVertexAttribI4bvEXT = (PFNGLVERTEXATTRIBI4BVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bvEXT")) == NULL) || r;
-  r = ((glVertexAttribI4iEXT = (PFNGLVERTEXATTRIBI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iEXT")) == NULL) || r;
-  r = ((glVertexAttribI4ivEXT = (PFNGLVERTEXATTRIBI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ivEXT")) == NULL) || r;
-  r = ((glVertexAttribI4svEXT = (PFNGLVERTEXATTRIBI4SVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4svEXT")) == NULL) || r;
-  r = ((glVertexAttribI4ubvEXT = (PFNGLVERTEXATTRIBI4UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubvEXT")) == NULL) || r;
-  r = ((glVertexAttribI4uiEXT = (PFNGLVERTEXATTRIBI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiEXT")) == NULL) || r;
-  r = ((glVertexAttribI4uivEXT = (PFNGLVERTEXATTRIBI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uivEXT")) == NULL) || r;
-  r = ((glVertexAttribI4usvEXT = (PFNGLVERTEXATTRIBI4USVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usvEXT")) == NULL) || r;
-  r = ((glVertexAttribIPointerEXT = (PFNGLVERTEXATTRIBIPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_gpu_shader4 */
-
-#ifdef GL_EXT_histogram
-
-static GLboolean _glewInit_GL_EXT_histogram (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetHistogramEXT = (PFNGLGETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramEXT")) == NULL) || r;
-  r = ((glGetHistogramParameterfvEXT = (PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfvEXT")) == NULL) || r;
-  r = ((glGetHistogramParameterivEXT = (PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterivEXT")) == NULL) || r;
-  r = ((glGetMinmaxEXT = (PFNGLGETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxEXT")) == NULL) || r;
-  r = ((glGetMinmaxParameterfvEXT = (PFNGLGETMINMAXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfvEXT")) == NULL) || r;
-  r = ((glGetMinmaxParameterivEXT = (PFNGLGETMINMAXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterivEXT")) == NULL) || r;
-  r = ((glHistogramEXT = (PFNGLHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glHistogramEXT")) == NULL) || r;
-  r = ((glMinmaxEXT = (PFNGLMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glMinmaxEXT")) == NULL) || r;
-  r = ((glResetHistogramEXT = (PFNGLRESETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glResetHistogramEXT")) == NULL) || r;
-  r = ((glResetMinmaxEXT = (PFNGLRESETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glResetMinmaxEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_histogram */
-
-#ifdef GL_EXT_index_array_formats
-
-#endif /* GL_EXT_index_array_formats */
-
-#ifdef GL_EXT_index_func
-
-static GLboolean _glewInit_GL_EXT_index_func (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glIndexFuncEXT = (PFNGLINDEXFUNCEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexFuncEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_index_func */
-
-#ifdef GL_EXT_index_material
-
-static GLboolean _glewInit_GL_EXT_index_material (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glIndexMaterialEXT = (PFNGLINDEXMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexMaterialEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_index_material */
-
-#ifdef GL_EXT_index_texture
-
-#endif /* GL_EXT_index_texture */
-
-#ifdef GL_EXT_light_texture
-
-static GLboolean _glewInit_GL_EXT_light_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glApplyTextureEXT = (PFNGLAPPLYTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glApplyTextureEXT")) == NULL) || r;
-  r = ((glTextureLightEXT = (PFNGLTEXTURELIGHTEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureLightEXT")) == NULL) || r;
-  r = ((glTextureMaterialEXT = (PFNGLTEXTUREMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureMaterialEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_light_texture */
-
-#ifdef GL_EXT_misc_attribute
-
-#endif /* GL_EXT_misc_attribute */
-
-#ifdef GL_EXT_multi_draw_arrays
-
-static GLboolean _glewInit_GL_EXT_multi_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMultiDrawArraysEXT = (PFNGLMULTIDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysEXT")) == NULL) || r;
-  r = ((glMultiDrawElementsEXT = (PFNGLMULTIDRAWELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_multi_draw_arrays */
-
-#ifdef GL_EXT_multisample
-
-static GLboolean _glewInit_GL_EXT_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSampleMaskEXT = (PFNGLSAMPLEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskEXT")) == NULL) || r;
-  r = ((glSamplePatternEXT = (PFNGLSAMPLEPATTERNEXTPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_multisample */
-
-#ifdef GL_EXT_packed_depth_stencil
-
-#endif /* GL_EXT_packed_depth_stencil */
-
-#ifdef GL_EXT_packed_float
-
-#endif /* GL_EXT_packed_float */
-
-#ifdef GL_EXT_packed_pixels
-
-#endif /* GL_EXT_packed_pixels */
-
-#ifdef GL_EXT_paletted_texture
-
-static GLboolean _glewInit_GL_EXT_paletted_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorTableEXT")) == NULL) || r;
-  r = ((glGetColorTableEXT = (PFNGLGETCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableEXT")) == NULL) || r;
-  r = ((glGetColorTableParameterfvEXT = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvEXT")) == NULL) || r;
-  r = ((glGetColorTableParameterivEXT = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_paletted_texture */
-
-#ifdef GL_EXT_pixel_buffer_object
-
-#endif /* GL_EXT_pixel_buffer_object */
-
-#ifdef GL_EXT_pixel_transform
-
-static GLboolean _glewInit_GL_EXT_pixel_transform (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetPixelTransformParameterfvEXT = (PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvEXT")) == NULL) || r;
-  r = ((glGetPixelTransformParameterivEXT = (PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivEXT")) == NULL) || r;
-  r = ((glPixelTransformParameterfEXT = (PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfEXT")) == NULL) || r;
-  r = ((glPixelTransformParameterfvEXT = (PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvEXT")) == NULL) || r;
-  r = ((glPixelTransformParameteriEXT = (PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriEXT")) == NULL) || r;
-  r = ((glPixelTransformParameterivEXT = (PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_pixel_transform */
-
-#ifdef GL_EXT_pixel_transform_color_table
-
-#endif /* GL_EXT_pixel_transform_color_table */
-
-#ifdef GL_EXT_point_parameters
-
-static GLboolean _glewInit_GL_EXT_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfEXT")) == NULL) || r;
-  r = ((glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_point_parameters */
-
-#ifdef GL_EXT_polygon_offset
-
-static GLboolean _glewInit_GL_EXT_polygon_offset (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_polygon_offset */
-
-#ifdef GL_EXT_provoking_vertex
-
-static GLboolean _glewInit_GL_EXT_provoking_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProvokingVertexEXT = (PFNGLPROVOKINGVERTEXEXTPROC)glewGetProcAddress((const GLubyte*)"glProvokingVertexEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_provoking_vertex */
-
-#ifdef GL_EXT_rescale_normal
-
-#endif /* GL_EXT_rescale_normal */
-
-#ifdef GL_EXT_scene_marker
-
-static GLboolean _glewInit_GL_EXT_scene_marker (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginSceneEXT = (PFNGLBEGINSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginSceneEXT")) == NULL) || r;
-  r = ((glEndSceneEXT = (PFNGLENDSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glEndSceneEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_scene_marker */
-
-#ifdef GL_EXT_secondary_color
-
-static GLboolean _glewInit_GL_EXT_secondary_color (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSecondaryColor3bEXT = (PFNGLSECONDARYCOLOR3BEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bEXT")) == NULL) || r;
-  r = ((glSecondaryColor3bvEXT = (PFNGLSECONDARYCOLOR3BVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bvEXT")) == NULL) || r;
-  r = ((glSecondaryColor3dEXT = (PFNGLSECONDARYCOLOR3DEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dEXT")) == NULL) || r;
-  r = ((glSecondaryColor3dvEXT = (PFNGLSECONDARYCOLOR3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dvEXT")) == NULL) || r;
-  r = ((glSecondaryColor3fEXT = (PFNGLSECONDARYCOLOR3FEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fEXT")) == NULL) || r;
-  r = ((glSecondaryColor3fvEXT = (PFNGLSECONDARYCOLOR3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fvEXT")) == NULL) || r;
-  r = ((glSecondaryColor3iEXT = (PFNGLSECONDARYCOLOR3IEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iEXT")) == NULL) || r;
-  r = ((glSecondaryColor3ivEXT = (PFNGLSECONDARYCOLOR3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ivEXT")) == NULL) || r;
-  r = ((glSecondaryColor3sEXT = (PFNGLSECONDARYCOLOR3SEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sEXT")) == NULL) || r;
-  r = ((glSecondaryColor3svEXT = (PFNGLSECONDARYCOLOR3SVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3svEXT")) == NULL) || r;
-  r = ((glSecondaryColor3ubEXT = (PFNGLSECONDARYCOLOR3UBEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubEXT")) == NULL) || r;
-  r = ((glSecondaryColor3ubvEXT = (PFNGLSECONDARYCOLOR3UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubvEXT")) == NULL) || r;
-  r = ((glSecondaryColor3uiEXT = (PFNGLSECONDARYCOLOR3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiEXT")) == NULL) || r;
-  r = ((glSecondaryColor3uivEXT = (PFNGLSECONDARYCOLOR3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uivEXT")) == NULL) || r;
-  r = ((glSecondaryColor3usEXT = (PFNGLSECONDARYCOLOR3USEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usEXT")) == NULL) || r;
-  r = ((glSecondaryColor3usvEXT = (PFNGLSECONDARYCOLOR3USVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usvEXT")) == NULL) || r;
-  r = ((glSecondaryColorPointerEXT = (PFNGLSECONDARYCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_secondary_color */
-
-#ifdef GL_EXT_separate_shader_objects
-
-static GLboolean _glewInit_GL_EXT_separate_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveProgramEXT = (PFNGLACTIVEPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveProgramEXT")) == NULL) || r;
-  r = ((glCreateShaderProgramEXT = (PFNGLCREATESHADERPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderProgramEXT")) == NULL) || r;
-  r = ((glUseShaderProgramEXT = (PFNGLUSESHADERPROGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glUseShaderProgramEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_separate_shader_objects */
-
-#ifdef GL_EXT_separate_specular_color
-
-#endif /* GL_EXT_separate_specular_color */
-
-#ifdef GL_EXT_shader_image_load_store
-
-static GLboolean _glewInit_GL_EXT_shader_image_load_store (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindImageTextureEXT = (PFNGLBINDIMAGETEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindImageTextureEXT")) == NULL) || r;
-  r = ((glMemoryBarrierEXT = (PFNGLMEMORYBARRIEREXTPROC)glewGetProcAddress((const GLubyte*)"glMemoryBarrierEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_shader_image_load_store */
-
-#ifdef GL_EXT_shadow_funcs
-
-#endif /* GL_EXT_shadow_funcs */
-
-#ifdef GL_EXT_shared_texture_palette
-
-#endif /* GL_EXT_shared_texture_palette */
-
-#ifdef GL_EXT_stencil_clear_tag
-
-#endif /* GL_EXT_stencil_clear_tag */
-
-#ifdef GL_EXT_stencil_two_side
-
-static GLboolean _glewInit_GL_EXT_stencil_two_side (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveStencilFaceEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_stencil_two_side */
-
-#ifdef GL_EXT_stencil_wrap
-
-#endif /* GL_EXT_stencil_wrap */
-
-#ifdef GL_EXT_subtexture
-
-static GLboolean _glewInit_GL_EXT_subtexture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexSubImage1DEXT = (PFNGLTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage1DEXT")) == NULL) || r;
-  r = ((glTexSubImage2DEXT = (PFNGLTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage2DEXT")) == NULL) || r;
-  r = ((glTexSubImage3DEXT = (PFNGLTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_subtexture */
-
-#ifdef GL_EXT_texture
-
-#endif /* GL_EXT_texture */
-
-#ifdef GL_EXT_texture3D
-
-static GLboolean _glewInit_GL_EXT_texture3D (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexImage3DEXT = (PFNGLTEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture3D */
-
-#ifdef GL_EXT_texture_array
-
-static GLboolean _glewInit_GL_EXT_texture_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFramebufferTextureLayerEXT = (PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture_array */
-
-#ifdef GL_EXT_texture_buffer_object
-
-static GLboolean _glewInit_GL_EXT_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexBufferEXT = (PFNGLTEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexBufferEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture_buffer_object */
-
-#ifdef GL_EXT_texture_compression_dxt1
-
-#endif /* GL_EXT_texture_compression_dxt1 */
-
-#ifdef GL_EXT_texture_compression_latc
-
-#endif /* GL_EXT_texture_compression_latc */
-
-#ifdef GL_EXT_texture_compression_rgtc
-
-#endif /* GL_EXT_texture_compression_rgtc */
-
-#ifdef GL_EXT_texture_compression_s3tc
-
-#endif /* GL_EXT_texture_compression_s3tc */
-
-#ifdef GL_EXT_texture_cube_map
-
-#endif /* GL_EXT_texture_cube_map */
-
-#ifdef GL_EXT_texture_edge_clamp
-
-#endif /* GL_EXT_texture_edge_clamp */
-
-#ifdef GL_EXT_texture_env
-
-#endif /* GL_EXT_texture_env */
-
-#ifdef GL_EXT_texture_env_add
-
-#endif /* GL_EXT_texture_env_add */
-
-#ifdef GL_EXT_texture_env_combine
-
-#endif /* GL_EXT_texture_env_combine */
-
-#ifdef GL_EXT_texture_env_dot3
-
-#endif /* GL_EXT_texture_env_dot3 */
-
-#ifdef GL_EXT_texture_filter_anisotropic
-
-#endif /* GL_EXT_texture_filter_anisotropic */
-
-#ifdef GL_EXT_texture_integer
-
-static GLboolean _glewInit_GL_EXT_texture_integer (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClearColorIiEXT = (PFNGLCLEARCOLORIIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIiEXT")) == NULL) || r;
-  r = ((glClearColorIuiEXT = (PFNGLCLEARCOLORIUIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIuiEXT")) == NULL) || r;
-  r = ((glGetTexParameterIivEXT = (PFNGLGETTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIivEXT")) == NULL) || r;
-  r = ((glGetTexParameterIuivEXT = (PFNGLGETTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuivEXT")) == NULL) || r;
-  r = ((glTexParameterIivEXT = (PFNGLTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIivEXT")) == NULL) || r;
-  r = ((glTexParameterIuivEXT = (PFNGLTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuivEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture_integer */
-
-#ifdef GL_EXT_texture_lod_bias
-
-#endif /* GL_EXT_texture_lod_bias */
-
-#ifdef GL_EXT_texture_mirror_clamp
-
-#endif /* GL_EXT_texture_mirror_clamp */
-
-#ifdef GL_EXT_texture_object
-
-static GLboolean _glewInit_GL_EXT_texture_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAreTexturesResidentEXT = (PFNGLARETEXTURESRESIDENTEXTPROC)glewGetProcAddress((const GLubyte*)"glAreTexturesResidentEXT")) == NULL) || r;
-  r = ((glBindTextureEXT = (PFNGLBINDTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureEXT")) == NULL) || r;
-  r = ((glDeleteTexturesEXT = (PFNGLDELETETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteTexturesEXT")) == NULL) || r;
-  r = ((glGenTexturesEXT = (PFNGLGENTEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenTexturesEXT")) == NULL) || r;
-  r = ((glIsTextureEXT = (PFNGLISTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsTextureEXT")) == NULL) || r;
-  r = ((glPrioritizeTexturesEXT = (PFNGLPRIORITIZETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeTexturesEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture_object */
-
-#ifdef GL_EXT_texture_perturb_normal
-
-static GLboolean _glewInit_GL_EXT_texture_perturb_normal (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTextureNormalEXT = (PFNGLTEXTURENORMALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureNormalEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_texture_perturb_normal */
-
-#ifdef GL_EXT_texture_rectangle
-
-#endif /* GL_EXT_texture_rectangle */
-
-#ifdef GL_EXT_texture_sRGB
-
-#endif /* GL_EXT_texture_sRGB */
-
-#ifdef GL_EXT_texture_sRGB_decode
-
-#endif /* GL_EXT_texture_sRGB_decode */
-
-#ifdef GL_EXT_texture_shared_exponent
-
-#endif /* GL_EXT_texture_shared_exponent */
-
-#ifdef GL_EXT_texture_snorm
-
-#endif /* GL_EXT_texture_snorm */
-
-#ifdef GL_EXT_texture_swizzle
-
-#endif /* GL_EXT_texture_swizzle */
-
-#ifdef GL_EXT_timer_query
-
-static GLboolean _glewInit_GL_EXT_timer_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetQueryObjecti64vEXT = (PFNGLGETQUERYOBJECTI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64vEXT")) == NULL) || r;
-  r = ((glGetQueryObjectui64vEXT = (PFNGLGETQUERYOBJECTUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64vEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_timer_query */
-
-#ifdef GL_EXT_transform_feedback
-
-static GLboolean _glewInit_GL_EXT_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginTransformFeedbackEXT = (PFNGLBEGINTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackEXT")) == NULL) || r;
-  r = ((glBindBufferBaseEXT = (PFNGLBINDBUFFERBASEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseEXT")) == NULL) || r;
-  r = ((glBindBufferOffsetEXT = (PFNGLBINDBUFFEROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetEXT")) == NULL) || r;
-  r = ((glBindBufferRangeEXT = (PFNGLBINDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeEXT")) == NULL) || r;
-  r = ((glEndTransformFeedbackEXT = (PFNGLENDTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackEXT")) == NULL) || r;
-  r = ((glGetTransformFeedbackVaryingEXT = (PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingEXT")) == NULL) || r;
-  r = ((glTransformFeedbackVaryingsEXT = (PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_transform_feedback */
-
-#ifdef GL_EXT_vertex_array
-
-static GLboolean _glewInit_GL_EXT_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glArrayElementEXT = (PFNGLARRAYELEMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glArrayElementEXT")) == NULL) || r;
-  r = ((glColorPointerEXT = (PFNGLCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glColorPointerEXT")) == NULL) || r;
-  r = ((glDrawArraysEXT = (PFNGLDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysEXT")) == NULL) || r;
-  r = ((glEdgeFlagPointerEXT = (PFNGLEDGEFLAGPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerEXT")) == NULL) || r;
-  r = ((glIndexPointerEXT = (PFNGLINDEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerEXT")) == NULL) || r;
-  r = ((glNormalPointerEXT = (PFNGLNORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerEXT")) == NULL) || r;
-  r = ((glTexCoordPointerEXT = (PFNGLTEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerEXT")) == NULL) || r;
-  r = ((glVertexPointerEXT = (PFNGLVERTEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_vertex_array */
-
-#ifdef GL_EXT_vertex_array_bgra
-
-#endif /* GL_EXT_vertex_array_bgra */
-
-#ifdef GL_EXT_vertex_attrib_64bit
-
-static GLboolean _glewInit_GL_EXT_vertex_attrib_64bit (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetVertexAttribLdvEXT = (PFNGLGETVERTEXATTRIBLDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLdvEXT")) == NULL) || r;
-  r = ((glVertexArrayVertexAttribLOffsetEXT = (PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayVertexAttribLOffsetEXT")) == NULL) || r;
-  r = ((glVertexAttribL1dEXT = (PFNGLVERTEXATTRIBL1DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dEXT")) == NULL) || r;
-  r = ((glVertexAttribL1dvEXT = (PFNGLVERTEXATTRIBL1DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1dvEXT")) == NULL) || r;
-  r = ((glVertexAttribL2dEXT = (PFNGLVERTEXATTRIBL2DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dEXT")) == NULL) || r;
-  r = ((glVertexAttribL2dvEXT = (PFNGLVERTEXATTRIBL2DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2dvEXT")) == NULL) || r;
-  r = ((glVertexAttribL3dEXT = (PFNGLVERTEXATTRIBL3DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dEXT")) == NULL) || r;
-  r = ((glVertexAttribL3dvEXT = (PFNGLVERTEXATTRIBL3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3dvEXT")) == NULL) || r;
-  r = ((glVertexAttribL4dEXT = (PFNGLVERTEXATTRIBL4DEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dEXT")) == NULL) || r;
-  r = ((glVertexAttribL4dvEXT = (PFNGLVERTEXATTRIBL4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4dvEXT")) == NULL) || r;
-  r = ((glVertexAttribLPointerEXT = (PFNGLVERTEXATTRIBLPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLPointerEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_vertex_attrib_64bit */
-
-#ifdef GL_EXT_vertex_shader
-
-static GLboolean _glewInit_GL_EXT_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginVertexShaderEXT = (PFNGLBEGINVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBeginVertexShaderEXT")) == NULL) || r;
-  r = ((glBindLightParameterEXT = (PFNGLBINDLIGHTPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindLightParameterEXT")) == NULL) || r;
-  r = ((glBindMaterialParameterEXT = (PFNGLBINDMATERIALPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindMaterialParameterEXT")) == NULL) || r;
-  r = ((glBindParameterEXT = (PFNGLBINDPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindParameterEXT")) == NULL) || r;
-  r = ((glBindTexGenParameterEXT = (PFNGLBINDTEXGENPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTexGenParameterEXT")) == NULL) || r;
-  r = ((glBindTextureUnitParameterEXT = (PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnitParameterEXT")) == NULL) || r;
-  r = ((glBindVertexShaderEXT = (PFNGLBINDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindVertexShaderEXT")) == NULL) || r;
-  r = ((glDeleteVertexShaderEXT = (PFNGLDELETEVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexShaderEXT")) == NULL) || r;
-  r = ((glDisableVariantClientStateEXT = (PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVariantClientStateEXT")) == NULL) || r;
-  r = ((glEnableVariantClientStateEXT = (PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVariantClientStateEXT")) == NULL) || r;
-  r = ((glEndVertexShaderEXT = (PFNGLENDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glEndVertexShaderEXT")) == NULL) || r;
-  r = ((glExtractComponentEXT = (PFNGLEXTRACTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glExtractComponentEXT")) == NULL) || r;
-  r = ((glGenSymbolsEXT = (PFNGLGENSYMBOLSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSymbolsEXT")) == NULL) || r;
-  r = ((glGenVertexShadersEXT = (PFNGLGENVERTEXSHADERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenVertexShadersEXT")) == NULL) || r;
-  r = ((glGetInvariantBooleanvEXT = (PFNGLGETINVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantBooleanvEXT")) == NULL) || r;
-  r = ((glGetInvariantFloatvEXT = (PFNGLGETINVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantFloatvEXT")) == NULL) || r;
-  r = ((glGetInvariantIntegervEXT = (PFNGLGETINVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantIntegervEXT")) == NULL) || r;
-  r = ((glGetLocalConstantBooleanvEXT = (PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantBooleanvEXT")) == NULL) || r;
-  r = ((glGetLocalConstantFloatvEXT = (PFNGLGETLOCALCONSTANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantFloatvEXT")) == NULL) || r;
-  r = ((glGetLocalConstantIntegervEXT = (PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantIntegervEXT")) == NULL) || r;
-  r = ((glGetVariantBooleanvEXT = (PFNGLGETVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantBooleanvEXT")) == NULL) || r;
-  r = ((glGetVariantFloatvEXT = (PFNGLGETVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantFloatvEXT")) == NULL) || r;
-  r = ((glGetVariantIntegervEXT = (PFNGLGETVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantIntegervEXT")) == NULL) || r;
-  r = ((glGetVariantPointervEXT = (PFNGLGETVARIANTPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantPointervEXT")) == NULL) || r;
-  r = ((glInsertComponentEXT = (PFNGLINSERTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glInsertComponentEXT")) == NULL) || r;
-  r = ((glIsVariantEnabledEXT = (PFNGLISVARIANTENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsVariantEnabledEXT")) == NULL) || r;
-  r = ((glSetInvariantEXT = (PFNGLSETINVARIANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetInvariantEXT")) == NULL) || r;
-  r = ((glSetLocalConstantEXT = (PFNGLSETLOCALCONSTANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetLocalConstantEXT")) == NULL) || r;
-  r = ((glShaderOp1EXT = (PFNGLSHADEROP1EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp1EXT")) == NULL) || r;
-  r = ((glShaderOp2EXT = (PFNGLSHADEROP2EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp2EXT")) == NULL) || r;
-  r = ((glShaderOp3EXT = (PFNGLSHADEROP3EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp3EXT")) == NULL) || r;
-  r = ((glSwizzleEXT = (PFNGLSWIZZLEEXTPROC)glewGetProcAddress((const GLubyte*)"glSwizzleEXT")) == NULL) || r;
-  r = ((glVariantPointerEXT = (PFNGLVARIANTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVariantPointerEXT")) == NULL) || r;
-  r = ((glVariantbvEXT = (PFNGLVARIANTBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantbvEXT")) == NULL) || r;
-  r = ((glVariantdvEXT = (PFNGLVARIANTDVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantdvEXT")) == NULL) || r;
-  r = ((glVariantfvEXT = (PFNGLVARIANTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantfvEXT")) == NULL) || r;
-  r = ((glVariantivEXT = (PFNGLVARIANTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantivEXT")) == NULL) || r;
-  r = ((glVariantsvEXT = (PFNGLVARIANTSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantsvEXT")) == NULL) || r;
-  r = ((glVariantubvEXT = (PFNGLVARIANTUBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantubvEXT")) == NULL) || r;
-  r = ((glVariantuivEXT = (PFNGLVARIANTUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantuivEXT")) == NULL) || r;
-  r = ((glVariantusvEXT = (PFNGLVARIANTUSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantusvEXT")) == NULL) || r;
-  r = ((glWriteMaskEXT = (PFNGLWRITEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glWriteMaskEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_vertex_shader */
-
-#ifdef GL_EXT_vertex_weighting
-
-static GLboolean _glewInit_GL_EXT_vertex_weighting (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glVertexWeightPointerEXT = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightPointerEXT")) == NULL) || r;
-  r = ((glVertexWeightfEXT = (PFNGLVERTEXWEIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfEXT")) == NULL) || r;
-  r = ((glVertexWeightfvEXT = (PFNGLVERTEXWEIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfvEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_vertex_weighting */
-
-#ifdef GL_EXT_x11_sync_object
-
-static GLboolean _glewInit_GL_EXT_x11_sync_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glImportSyncEXT = (PFNGLIMPORTSYNCEXTPROC)glewGetProcAddress((const GLubyte*)"glImportSyncEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_EXT_x11_sync_object */
-
-#ifdef GL_GREMEDY_frame_terminator
-
-static GLboolean _glewInit_GL_GREMEDY_frame_terminator (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFrameTerminatorGREMEDY = (PFNGLFRAMETERMINATORGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glFrameTerminatorGREMEDY")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_GREMEDY_frame_terminator */
-
-#ifdef GL_GREMEDY_string_marker
-
-static GLboolean _glewInit_GL_GREMEDY_string_marker (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glStringMarkerGREMEDY = (PFNGLSTRINGMARKERGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glStringMarkerGREMEDY")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_GREMEDY_string_marker */
-
-#ifdef GL_HP_convolution_border_modes
-
-#endif /* GL_HP_convolution_border_modes */
-
-#ifdef GL_HP_image_transform
-
-static GLboolean _glewInit_GL_HP_image_transform (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetImageTransformParameterfvHP = (PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterfvHP")) == NULL) || r;
-  r = ((glGetImageTransformParameterivHP = (PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterivHP")) == NULL) || r;
-  r = ((glImageTransformParameterfHP = (PFNGLIMAGETRANSFORMPARAMETERFHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfHP")) == NULL) || r;
-  r = ((glImageTransformParameterfvHP = (PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfvHP")) == NULL) || r;
-  r = ((glImageTransformParameteriHP = (PFNGLIMAGETRANSFORMPARAMETERIHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameteriHP")) == NULL) || r;
-  r = ((glImageTransformParameterivHP = (PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterivHP")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_HP_image_transform */
-
-#ifdef GL_HP_occlusion_test
-
-#endif /* GL_HP_occlusion_test */
-
-#ifdef GL_HP_texture_lighting
-
-#endif /* GL_HP_texture_lighting */
-
-#ifdef GL_IBM_cull_vertex
-
-#endif /* GL_IBM_cull_vertex */
-
-#ifdef GL_IBM_multimode_draw_arrays
-
-static GLboolean _glewInit_GL_IBM_multimode_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glMultiModeDrawArraysIBM = (PFNGLMULTIMODEDRAWARRAYSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawArraysIBM")) == NULL) || r;
-  r = ((glMultiModeDrawElementsIBM = (PFNGLMULTIMODEDRAWELEMENTSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawElementsIBM")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_IBM_multimode_draw_arrays */
-
-#ifdef GL_IBM_rasterpos_clip
-
-#endif /* GL_IBM_rasterpos_clip */
-
-#ifdef GL_IBM_static_data
-
-#endif /* GL_IBM_static_data */
-
-#ifdef GL_IBM_texture_mirrored_repeat
-
-#endif /* GL_IBM_texture_mirrored_repeat */
-
-#ifdef GL_IBM_vertex_array_lists
-
-static GLboolean _glewInit_GL_IBM_vertex_array_lists (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorPointerListIBM = (PFNGLCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glColorPointerListIBM")) == NULL) || r;
-  r = ((glEdgeFlagPointerListIBM = (PFNGLEDGEFLAGPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerListIBM")) == NULL) || r;
-  r = ((glFogCoordPointerListIBM = (PFNGLFOGCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerListIBM")) == NULL) || r;
-  r = ((glIndexPointerListIBM = (PFNGLINDEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerListIBM")) == NULL) || r;
-  r = ((glNormalPointerListIBM = (PFNGLNORMALPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerListIBM")) == NULL) || r;
-  r = ((glSecondaryColorPointerListIBM = (PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerListIBM")) == NULL) || r;
-  r = ((glTexCoordPointerListIBM = (PFNGLTEXCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerListIBM")) == NULL) || r;
-  r = ((glVertexPointerListIBM = (PFNGLVERTEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerListIBM")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_IBM_vertex_array_lists */
-
-#ifdef GL_INGR_color_clamp
-
-#endif /* GL_INGR_color_clamp */
-
-#ifdef GL_INGR_interlace_read
-
-#endif /* GL_INGR_interlace_read */
-
-#ifdef GL_INTEL_parallel_arrays
-
-static GLboolean _glewInit_GL_INTEL_parallel_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorPointervINTEL = (PFNGLCOLORPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glColorPointervINTEL")) == NULL) || r;
-  r = ((glNormalPointervINTEL = (PFNGLNORMALPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glNormalPointervINTEL")) == NULL) || r;
-  r = ((glTexCoordPointervINTEL = (PFNGLTEXCOORDPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointervINTEL")) == NULL) || r;
-  r = ((glVertexPointervINTEL = (PFNGLVERTEXPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glVertexPointervINTEL")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_INTEL_parallel_arrays */
-
-#ifdef GL_INTEL_texture_scissor
-
-static GLboolean _glewInit_GL_INTEL_texture_scissor (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexScissorFuncINTEL = (PFNGLTEXSCISSORFUNCINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorFuncINTEL")) == NULL) || r;
-  r = ((glTexScissorINTEL = (PFNGLTEXSCISSORINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorINTEL")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_INTEL_texture_scissor */
-
-#ifdef GL_KHR_debug
-
-static GLboolean _glewInit_GL_KHR_debug (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageCallback")) == NULL) || r;
-  r = ((glDebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageControl")) == NULL) || r;
-  r = ((glDebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC)glewGetProcAddress((const GLubyte*)"glDebugMessageInsert")) == NULL) || r;
-  r = ((glGetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC)glewGetProcAddress((const GLubyte*)"glGetDebugMessageLog")) == NULL) || r;
-  r = ((glGetObjectLabel = (PFNGLGETOBJECTLABELPROC)glewGetProcAddress((const GLubyte*)"glGetObjectLabel")) == NULL) || r;
-  r = ((glGetObjectPtrLabel = (PFNGLGETOBJECTPTRLABELPROC)glewGetProcAddress((const GLubyte*)"glGetObjectPtrLabel")) == NULL) || r;
-  r = ((glGetPointerv = (PFNGLGETPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetPointerv")) == NULL) || r;
-  r = ((glObjectLabel = (PFNGLOBJECTLABELPROC)glewGetProcAddress((const GLubyte*)"glObjectLabel")) == NULL) || r;
-  r = ((glObjectPtrLabel = (PFNGLOBJECTPTRLABELPROC)glewGetProcAddress((const GLubyte*)"glObjectPtrLabel")) == NULL) || r;
-  r = ((glPushDebugGroup = (PFNGLPUSHDEBUGGROUPPROC)glewGetProcAddress((const GLubyte*)"glPushDebugGroup")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_KHR_debug */
-
-#ifdef GL_KHR_texture_compression_astc_ldr
-
-#endif /* GL_KHR_texture_compression_astc_ldr */
-
-#ifdef GL_KTX_buffer_region
-
-static GLboolean _glewInit_GL_KTX_buffer_region (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBufferRegionEnabled = (PFNGLBUFFERREGIONENABLEDPROC)glewGetProcAddress((const GLubyte*)"glBufferRegionEnabled")) == NULL) || r;
-  r = ((glDeleteBufferRegion = (PFNGLDELETEBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glDeleteBufferRegion")) == NULL) || r;
-  r = ((glDrawBufferRegion = (PFNGLDRAWBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glDrawBufferRegion")) == NULL) || r;
-  r = ((glNewBufferRegion = (PFNGLNEWBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glNewBufferRegion")) == NULL) || r;
-  r = ((glReadBufferRegion = (PFNGLREADBUFFERREGIONPROC)glewGetProcAddress((const GLubyte*)"glReadBufferRegion")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_KTX_buffer_region */
-
-#ifdef GL_MESAX_texture_stack
-
-#endif /* GL_MESAX_texture_stack */
-
-#ifdef GL_MESA_pack_invert
-
-#endif /* GL_MESA_pack_invert */
-
-#ifdef GL_MESA_resize_buffers
-
-static GLboolean _glewInit_GL_MESA_resize_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glResizeBuffersMESA = (PFNGLRESIZEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glResizeBuffersMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_MESA_resize_buffers */
-
-#ifdef GL_MESA_window_pos
-
-static GLboolean _glewInit_GL_MESA_window_pos (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glWindowPos2dMESA = (PFNGLWINDOWPOS2DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dMESA")) == NULL) || r;
-  r = ((glWindowPos2dvMESA = (PFNGLWINDOWPOS2DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvMESA")) == NULL) || r;
-  r = ((glWindowPos2fMESA = (PFNGLWINDOWPOS2FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fMESA")) == NULL) || r;
-  r = ((glWindowPos2fvMESA = (PFNGLWINDOWPOS2FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvMESA")) == NULL) || r;
-  r = ((glWindowPos2iMESA = (PFNGLWINDOWPOS2IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iMESA")) == NULL) || r;
-  r = ((glWindowPos2ivMESA = (PFNGLWINDOWPOS2IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivMESA")) == NULL) || r;
-  r = ((glWindowPos2sMESA = (PFNGLWINDOWPOS2SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sMESA")) == NULL) || r;
-  r = ((glWindowPos2svMESA = (PFNGLWINDOWPOS2SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svMESA")) == NULL) || r;
-  r = ((glWindowPos3dMESA = (PFNGLWINDOWPOS3DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dMESA")) == NULL) || r;
-  r = ((glWindowPos3dvMESA = (PFNGLWINDOWPOS3DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvMESA")) == NULL) || r;
-  r = ((glWindowPos3fMESA = (PFNGLWINDOWPOS3FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fMESA")) == NULL) || r;
-  r = ((glWindowPos3fvMESA = (PFNGLWINDOWPOS3FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvMESA")) == NULL) || r;
-  r = ((glWindowPos3iMESA = (PFNGLWINDOWPOS3IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iMESA")) == NULL) || r;
-  r = ((glWindowPos3ivMESA = (PFNGLWINDOWPOS3IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivMESA")) == NULL) || r;
-  r = ((glWindowPos3sMESA = (PFNGLWINDOWPOS3SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sMESA")) == NULL) || r;
-  r = ((glWindowPos3svMESA = (PFNGLWINDOWPOS3SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svMESA")) == NULL) || r;
-  r = ((glWindowPos4dMESA = (PFNGLWINDOWPOS4DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dMESA")) == NULL) || r;
-  r = ((glWindowPos4dvMESA = (PFNGLWINDOWPOS4DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dvMESA")) == NULL) || r;
-  r = ((glWindowPos4fMESA = (PFNGLWINDOWPOS4FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fMESA")) == NULL) || r;
-  r = ((glWindowPos4fvMESA = (PFNGLWINDOWPOS4FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fvMESA")) == NULL) || r;
-  r = ((glWindowPos4iMESA = (PFNGLWINDOWPOS4IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4iMESA")) == NULL) || r;
-  r = ((glWindowPos4ivMESA = (PFNGLWINDOWPOS4IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4ivMESA")) == NULL) || r;
-  r = ((glWindowPos4sMESA = (PFNGLWINDOWPOS4SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4sMESA")) == NULL) || r;
-  r = ((glWindowPos4svMESA = (PFNGLWINDOWPOS4SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4svMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_MESA_window_pos */
-
-#ifdef GL_MESA_ycbcr_texture
-
-#endif /* GL_MESA_ycbcr_texture */
-
-#ifdef GL_NVX_gpu_memory_info
-
-#endif /* GL_NVX_gpu_memory_info */
-
-#ifdef GL_NV_bindless_texture
-
-static GLboolean _glewInit_GL_NV_bindless_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetImageHandleNV = (PFNGLGETIMAGEHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetImageHandleNV")) == NULL) || r;
-  r = ((glGetTextureHandleNV = (PFNGLGETTEXTUREHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureHandleNV")) == NULL) || r;
-  r = ((glGetTextureSamplerHandleNV = (PFNGLGETTEXTURESAMPLERHANDLENVPROC)glewGetProcAddress((const GLubyte*)"glGetTextureSamplerHandleNV")) == NULL) || r;
-  r = ((glIsImageHandleResidentNV = (PFNGLISIMAGEHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsImageHandleResidentNV")) == NULL) || r;
-  r = ((glIsTextureHandleResidentNV = (PFNGLISTEXTUREHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsTextureHandleResidentNV")) == NULL) || r;
-  r = ((glMakeImageHandleNonResidentNV = (PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleNonResidentNV")) == NULL) || r;
-  r = ((glMakeImageHandleResidentNV = (PFNGLMAKEIMAGEHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeImageHandleResidentNV")) == NULL) || r;
-  r = ((glMakeTextureHandleNonResidentNV = (PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleNonResidentNV")) == NULL) || r;
-  r = ((glMakeTextureHandleResidentNV = (PFNGLMAKETEXTUREHANDLERESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeTextureHandleResidentNV")) == NULL) || r;
-  r = ((glProgramUniformHandleui64NV = (PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64NV")) == NULL) || r;
-  r = ((glProgramUniformHandleui64vNV = (PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformHandleui64vNV")) == NULL) || r;
-  r = ((glUniformHandleui64NV = (PFNGLUNIFORMHANDLEUI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64NV")) == NULL) || r;
-  r = ((glUniformHandleui64vNV = (PFNGLUNIFORMHANDLEUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniformHandleui64vNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_bindless_texture */
-
-#ifdef GL_NV_blend_square
-
-#endif /* GL_NV_blend_square */
-
-#ifdef GL_NV_conditional_render
-
-static GLboolean _glewInit_GL_NV_conditional_render (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginConditionalRenderNV = (PFNGLBEGINCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRenderNV")) == NULL) || r;
-  r = ((glEndConditionalRenderNV = (PFNGLENDCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRenderNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_conditional_render */
-
-#ifdef GL_NV_copy_depth_to_color
-
-#endif /* GL_NV_copy_depth_to_color */
-
-#ifdef GL_NV_copy_image
-
-static GLboolean _glewInit_GL_NV_copy_image (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyImageSubDataNV = (PFNGLCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glCopyImageSubDataNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_copy_image */
-
-#ifdef GL_NV_depth_buffer_float
-
-static GLboolean _glewInit_GL_NV_depth_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClearDepthdNV = (PFNGLCLEARDEPTHDNVPROC)glewGetProcAddress((const GLubyte*)"glClearDepthdNV")) == NULL) || r;
-  r = ((glDepthBoundsdNV = (PFNGLDEPTHBOUNDSDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsdNV")) == NULL) || r;
-  r = ((glDepthRangedNV = (PFNGLDEPTHRANGEDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangedNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_depth_buffer_float */
-
-#ifdef GL_NV_depth_clamp
-
-#endif /* GL_NV_depth_clamp */
-
-#ifdef GL_NV_depth_range_unclamped
-
-#endif /* GL_NV_depth_range_unclamped */
-
-#ifdef GL_NV_evaluators
-
-static GLboolean _glewInit_GL_NV_evaluators (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glEvalMapsNV = (PFNGLEVALMAPSNVPROC)glewGetProcAddress((const GLubyte*)"glEvalMapsNV")) == NULL) || r;
-  r = ((glGetMapAttribParameterfvNV = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterfvNV")) == NULL) || r;
-  r = ((glGetMapAttribParameterivNV = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterivNV")) == NULL) || r;
-  r = ((glGetMapControlPointsNV = (PFNGLGETMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapControlPointsNV")) == NULL) || r;
-  r = ((glGetMapParameterfvNV = (PFNGLGETMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterfvNV")) == NULL) || r;
-  r = ((glGetMapParameterivNV = (PFNGLGETMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterivNV")) == NULL) || r;
-  r = ((glMapControlPointsNV = (PFNGLMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glMapControlPointsNV")) == NULL) || r;
-  r = ((glMapParameterfvNV = (PFNGLMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterfvNV")) == NULL) || r;
-  r = ((glMapParameterivNV = (PFNGLMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterivNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_evaluators */
-
-#ifdef GL_NV_explicit_multisample
-
-static GLboolean _glewInit_GL_NV_explicit_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetMultisamplefvNV = (PFNGLGETMULTISAMPLEFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefvNV")) == NULL) || r;
-  r = ((glSampleMaskIndexedNV = (PFNGLSAMPLEMASKINDEXEDNVPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskIndexedNV")) == NULL) || r;
-  r = ((glTexRenderbufferNV = (PFNGLTEXRENDERBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glTexRenderbufferNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_explicit_multisample */
-
-#ifdef GL_NV_fence
-
-static GLboolean _glewInit_GL_NV_fence (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesNV")) == NULL) || r;
-  r = ((glFinishFenceNV = (PFNGLFINISHFENCENVPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceNV")) == NULL) || r;
-  r = ((glGenFencesNV = (PFNGLGENFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glGenFencesNV")) == NULL) || r;
-  r = ((glGetFenceivNV = (PFNGLGETFENCEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFenceivNV")) == NULL) || r;
-  r = ((glIsFenceNV = (PFNGLISFENCENVPROC)glewGetProcAddress((const GLubyte*)"glIsFenceNV")) == NULL) || r;
-  r = ((glSetFenceNV = (PFNGLSETFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSetFenceNV")) == NULL) || r;
-  r = ((glTestFenceNV = (PFNGLTESTFENCENVPROC)glewGetProcAddress((const GLubyte*)"glTestFenceNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_fence */
-
-#ifdef GL_NV_float_buffer
-
-#endif /* GL_NV_float_buffer */
-
-#ifdef GL_NV_fog_distance
-
-#endif /* GL_NV_fog_distance */
-
-#ifdef GL_NV_fragment_program
-
-static GLboolean _glewInit_GL_NV_fragment_program (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetProgramNamedParameterdvNV = (PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterdvNV")) == NULL) || r;
-  r = ((glGetProgramNamedParameterfvNV = (PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterfvNV")) == NULL) || r;
-  r = ((glProgramNamedParameter4dNV = (PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dNV")) == NULL) || r;
-  r = ((glProgramNamedParameter4dvNV = (PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dvNV")) == NULL) || r;
-  r = ((glProgramNamedParameter4fNV = (PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fNV")) == NULL) || r;
-  r = ((glProgramNamedParameter4fvNV = (PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fvNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_fragment_program */
-
-#ifdef GL_NV_fragment_program2
-
-#endif /* GL_NV_fragment_program2 */
-
-#ifdef GL_NV_fragment_program4
-
-#endif /* GL_NV_fragment_program4 */
-
-#ifdef GL_NV_fragment_program_option
-
-#endif /* GL_NV_fragment_program_option */
-
-#ifdef GL_NV_framebuffer_multisample_coverage
-
-static GLboolean _glewInit_GL_NV_framebuffer_multisample_coverage (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glRenderbufferStorageMultisampleCoverageNV = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleCoverageNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_framebuffer_multisample_coverage */
-
-#ifdef GL_NV_geometry_program4
-
-static GLboolean _glewInit_GL_NV_geometry_program4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProgramVertexLimitNV = (PFNGLPROGRAMVERTEXLIMITNVPROC)glewGetProcAddress((const GLubyte*)"glProgramVertexLimitNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_geometry_program4 */
-
-#ifdef GL_NV_geometry_shader4
-
-#endif /* GL_NV_geometry_shader4 */
-
-#ifdef GL_NV_gpu_program4
-
-static GLboolean _glewInit_GL_NV_gpu_program4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProgramEnvParameterI4iNV = (PFNGLPROGRAMENVPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4iNV")) == NULL) || r;
-  r = ((glProgramEnvParameterI4ivNV = (PFNGLPROGRAMENVPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4ivNV")) == NULL) || r;
-  r = ((glProgramEnvParameterI4uiNV = (PFNGLPROGRAMENVPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uiNV")) == NULL) || r;
-  r = ((glProgramEnvParameterI4uivNV = (PFNGLPROGRAMENVPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uivNV")) == NULL) || r;
-  r = ((glProgramEnvParametersI4ivNV = (PFNGLPROGRAMENVPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4ivNV")) == NULL) || r;
-  r = ((glProgramEnvParametersI4uivNV = (PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4uivNV")) == NULL) || r;
-  r = ((glProgramLocalParameterI4iNV = (PFNGLPROGRAMLOCALPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4iNV")) == NULL) || r;
-  r = ((glProgramLocalParameterI4ivNV = (PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4ivNV")) == NULL) || r;
-  r = ((glProgramLocalParameterI4uiNV = (PFNGLPROGRAMLOCALPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uiNV")) == NULL) || r;
-  r = ((glProgramLocalParameterI4uivNV = (PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uivNV")) == NULL) || r;
-  r = ((glProgramLocalParametersI4ivNV = (PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4ivNV")) == NULL) || r;
-  r = ((glProgramLocalParametersI4uivNV = (PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4uivNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_gpu_program4 */
-
-#ifdef GL_NV_gpu_program5
-
-#endif /* GL_NV_gpu_program5 */
-
-#ifdef GL_NV_gpu_program_fp64
-
-#endif /* GL_NV_gpu_program_fp64 */
-
-#ifdef GL_NV_gpu_shader5
-
-static GLboolean _glewInit_GL_NV_gpu_shader5 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetUniformi64vNV = (PFNGLGETUNIFORMI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformi64vNV")) == NULL) || r;
-  r = ((glGetUniformui64vNV = (PFNGLGETUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformui64vNV")) == NULL) || r;
-  r = ((glProgramUniform1i64NV = (PFNGLPROGRAMUNIFORM1I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64NV")) == NULL) || r;
-  r = ((glProgramUniform1i64vNV = (PFNGLPROGRAMUNIFORM1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1i64vNV")) == NULL) || r;
-  r = ((glProgramUniform1ui64NV = (PFNGLPROGRAMUNIFORM1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64NV")) == NULL) || r;
-  r = ((glProgramUniform1ui64vNV = (PFNGLPROGRAMUNIFORM1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ui64vNV")) == NULL) || r;
-  r = ((glProgramUniform2i64NV = (PFNGLPROGRAMUNIFORM2I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64NV")) == NULL) || r;
-  r = ((glProgramUniform2i64vNV = (PFNGLPROGRAMUNIFORM2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2i64vNV")) == NULL) || r;
-  r = ((glProgramUniform2ui64NV = (PFNGLPROGRAMUNIFORM2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64NV")) == NULL) || r;
-  r = ((glProgramUniform2ui64vNV = (PFNGLPROGRAMUNIFORM2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ui64vNV")) == NULL) || r;
-  r = ((glProgramUniform3i64NV = (PFNGLPROGRAMUNIFORM3I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64NV")) == NULL) || r;
-  r = ((glProgramUniform3i64vNV = (PFNGLPROGRAMUNIFORM3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3i64vNV")) == NULL) || r;
-  r = ((glProgramUniform3ui64NV = (PFNGLPROGRAMUNIFORM3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64NV")) == NULL) || r;
-  r = ((glProgramUniform3ui64vNV = (PFNGLPROGRAMUNIFORM3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ui64vNV")) == NULL) || r;
-  r = ((glProgramUniform4i64NV = (PFNGLPROGRAMUNIFORM4I64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64NV")) == NULL) || r;
-  r = ((glProgramUniform4i64vNV = (PFNGLPROGRAMUNIFORM4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4i64vNV")) == NULL) || r;
-  r = ((glProgramUniform4ui64NV = (PFNGLPROGRAMUNIFORM4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64NV")) == NULL) || r;
-  r = ((glProgramUniform4ui64vNV = (PFNGLPROGRAMUNIFORM4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ui64vNV")) == NULL) || r;
-  r = ((glUniform1i64NV = (PFNGLUNIFORM1I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64NV")) == NULL) || r;
-  r = ((glUniform1i64vNV = (PFNGLUNIFORM1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform1i64vNV")) == NULL) || r;
-  r = ((glUniform1ui64NV = (PFNGLUNIFORM1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64NV")) == NULL) || r;
-  r = ((glUniform1ui64vNV = (PFNGLUNIFORM1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui64vNV")) == NULL) || r;
-  r = ((glUniform2i64NV = (PFNGLUNIFORM2I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64NV")) == NULL) || r;
-  r = ((glUniform2i64vNV = (PFNGLUNIFORM2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform2i64vNV")) == NULL) || r;
-  r = ((glUniform2ui64NV = (PFNGLUNIFORM2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64NV")) == NULL) || r;
-  r = ((glUniform2ui64vNV = (PFNGLUNIFORM2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui64vNV")) == NULL) || r;
-  r = ((glUniform3i64NV = (PFNGLUNIFORM3I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64NV")) == NULL) || r;
-  r = ((glUniform3i64vNV = (PFNGLUNIFORM3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform3i64vNV")) == NULL) || r;
-  r = ((glUniform3ui64NV = (PFNGLUNIFORM3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64NV")) == NULL) || r;
-  r = ((glUniform3ui64vNV = (PFNGLUNIFORM3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui64vNV")) == NULL) || r;
-  r = ((glUniform4i64NV = (PFNGLUNIFORM4I64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64NV")) == NULL) || r;
-  r = ((glUniform4i64vNV = (PFNGLUNIFORM4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform4i64vNV")) == NULL) || r;
-  r = ((glUniform4ui64NV = (PFNGLUNIFORM4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64NV")) == NULL) || r;
-  r = ((glUniform4ui64vNV = (PFNGLUNIFORM4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui64vNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_gpu_shader5 */
-
-#ifdef GL_NV_half_float
-
-static GLboolean _glewInit_GL_NV_half_float (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColor3hNV = (PFNGLCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hNV")) == NULL) || r;
-  r = ((glColor3hvNV = (PFNGLCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hvNV")) == NULL) || r;
-  r = ((glColor4hNV = (PFNGLCOLOR4HNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hNV")) == NULL) || r;
-  r = ((glColor4hvNV = (PFNGLCOLOR4HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hvNV")) == NULL) || r;
-  r = ((glFogCoordhNV = (PFNGLFOGCOORDHNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhNV")) == NULL) || r;
-  r = ((glFogCoordhvNV = (PFNGLFOGCOORDHVNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhvNV")) == NULL) || r;
-  r = ((glMultiTexCoord1hNV = (PFNGLMULTITEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hNV")) == NULL) || r;
-  r = ((glMultiTexCoord1hvNV = (PFNGLMULTITEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hvNV")) == NULL) || r;
-  r = ((glMultiTexCoord2hNV = (PFNGLMULTITEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hNV")) == NULL) || r;
-  r = ((glMultiTexCoord2hvNV = (PFNGLMULTITEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hvNV")) == NULL) || r;
-  r = ((glMultiTexCoord3hNV = (PFNGLMULTITEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hNV")) == NULL) || r;
-  r = ((glMultiTexCoord3hvNV = (PFNGLMULTITEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hvNV")) == NULL) || r;
-  r = ((glMultiTexCoord4hNV = (PFNGLMULTITEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hNV")) == NULL) || r;
-  r = ((glMultiTexCoord4hvNV = (PFNGLMULTITEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hvNV")) == NULL) || r;
-  r = ((glNormal3hNV = (PFNGLNORMAL3HNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hNV")) == NULL) || r;
-  r = ((glNormal3hvNV = (PFNGLNORMAL3HVNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hvNV")) == NULL) || r;
-  r = ((glSecondaryColor3hNV = (PFNGLSECONDARYCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hNV")) == NULL) || r;
-  r = ((glSecondaryColor3hvNV = (PFNGLSECONDARYCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hvNV")) == NULL) || r;
-  r = ((glTexCoord1hNV = (PFNGLTEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hNV")) == NULL) || r;
-  r = ((glTexCoord1hvNV = (PFNGLTEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hvNV")) == NULL) || r;
-  r = ((glTexCoord2hNV = (PFNGLTEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hNV")) == NULL) || r;
-  r = ((glTexCoord2hvNV = (PFNGLTEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hvNV")) == NULL) || r;
-  r = ((glTexCoord3hNV = (PFNGLTEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hNV")) == NULL) || r;
-  r = ((glTexCoord3hvNV = (PFNGLTEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hvNV")) == NULL) || r;
-  r = ((glTexCoord4hNV = (PFNGLTEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hNV")) == NULL) || r;
-  r = ((glTexCoord4hvNV = (PFNGLTEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hvNV")) == NULL) || r;
-  r = ((glVertex2hNV = (PFNGLVERTEX2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hNV")) == NULL) || r;
-  r = ((glVertex2hvNV = (PFNGLVERTEX2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hvNV")) == NULL) || r;
-  r = ((glVertex3hNV = (PFNGLVERTEX3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hNV")) == NULL) || r;
-  r = ((glVertex3hvNV = (PFNGLVERTEX3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hvNV")) == NULL) || r;
-  r = ((glVertex4hNV = (PFNGLVERTEX4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hNV")) == NULL) || r;
-  r = ((glVertex4hvNV = (PFNGLVERTEX4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hvNV")) == NULL) || r;
-  r = ((glVertexAttrib1hNV = (PFNGLVERTEXATTRIB1HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hNV")) == NULL) || r;
-  r = ((glVertexAttrib1hvNV = (PFNGLVERTEXATTRIB1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hvNV")) == NULL) || r;
-  r = ((glVertexAttrib2hNV = (PFNGLVERTEXATTRIB2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hNV")) == NULL) || r;
-  r = ((glVertexAttrib2hvNV = (PFNGLVERTEXATTRIB2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hvNV")) == NULL) || r;
-  r = ((glVertexAttrib3hNV = (PFNGLVERTEXATTRIB3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hNV")) == NULL) || r;
-  r = ((glVertexAttrib3hvNV = (PFNGLVERTEXATTRIB3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hvNV")) == NULL) || r;
-  r = ((glVertexAttrib4hNV = (PFNGLVERTEXATTRIB4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hNV")) == NULL) || r;
-  r = ((glVertexAttrib4hvNV = (PFNGLVERTEXATTRIB4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hvNV")) == NULL) || r;
-  r = ((glVertexAttribs1hvNV = (PFNGLVERTEXATTRIBS1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1hvNV")) == NULL) || r;
-  r = ((glVertexAttribs2hvNV = (PFNGLVERTEXATTRIBS2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2hvNV")) == NULL) || r;
-  r = ((glVertexAttribs3hvNV = (PFNGLVERTEXATTRIBS3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3hvNV")) == NULL) || r;
-  r = ((glVertexAttribs4hvNV = (PFNGLVERTEXATTRIBS4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4hvNV")) == NULL) || r;
-  r = ((glVertexWeighthNV = (PFNGLVERTEXWEIGHTHNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthNV")) == NULL) || r;
-  r = ((glVertexWeighthvNV = (PFNGLVERTEXWEIGHTHVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthvNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_half_float */
-
-#ifdef GL_NV_light_max_exponent
-
-#endif /* GL_NV_light_max_exponent */
-
-#ifdef GL_NV_multisample_coverage
-
-#endif /* GL_NV_multisample_coverage */
-
-#ifdef GL_NV_multisample_filter_hint
-
-#endif /* GL_NV_multisample_filter_hint */
-
-#ifdef GL_NV_occlusion_query
-
-static GLboolean _glewInit_GL_NV_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glBeginOcclusionQueryNV")) == NULL) || r;
-  r = ((glDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteOcclusionQueriesNV")) == NULL) || r;
-  r = ((glEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glEndOcclusionQueryNV")) == NULL) || r;
-  r = ((glGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glGenOcclusionQueriesNV")) == NULL) || r;
-  r = ((glGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryivNV")) == NULL) || r;
-  r = ((glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryuivNV")) == NULL) || r;
-  r = ((glIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glIsOcclusionQueryNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_occlusion_query */
-
-#ifdef GL_NV_packed_depth_stencil
-
-#endif /* GL_NV_packed_depth_stencil */
-
-#ifdef GL_NV_parameter_buffer_object
-
-static GLboolean _glewInit_GL_NV_parameter_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glProgramBufferParametersIivNV = (PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIivNV")) == NULL) || r;
-  r = ((glProgramBufferParametersIuivNV = (PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIuivNV")) == NULL) || r;
-  r = ((glProgramBufferParametersfvNV = (PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersfvNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_parameter_buffer_object */
-
-#ifdef GL_NV_parameter_buffer_object2
-
-#endif /* GL_NV_parameter_buffer_object2 */
-
-#ifdef GL_NV_path_rendering
-
-static GLboolean _glewInit_GL_NV_path_rendering (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCopyPathNV = (PFNGLCOPYPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCopyPathNV")) == NULL) || r;
-  r = ((glCoverFillPathInstancedNV = (PFNGLCOVERFILLPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glCoverFillPathInstancedNV")) == NULL) || r;
-  r = ((glCoverFillPathNV = (PFNGLCOVERFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCoverFillPathNV")) == NULL) || r;
-  r = ((glCoverStrokePathInstancedNV = (PFNGLCOVERSTROKEPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glCoverStrokePathInstancedNV")) == NULL) || r;
-  r = ((glCoverStrokePathNV = (PFNGLCOVERSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glCoverStrokePathNV")) == NULL) || r;
-  r = ((glDeletePathsNV = (PFNGLDELETEPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glDeletePathsNV")) == NULL) || r;
-  r = ((glGenPathsNV = (PFNGLGENPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glGenPathsNV")) == NULL) || r;
-  r = ((glGetPathColorGenfvNV = (PFNGLGETPATHCOLORGENFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathColorGenfvNV")) == NULL) || r;
-  r = ((glGetPathColorGenivNV = (PFNGLGETPATHCOLORGENIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathColorGenivNV")) == NULL) || r;
-  r = ((glGetPathCommandsNV = (PFNGLGETPATHCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathCommandsNV")) == NULL) || r;
-  r = ((glGetPathCoordsNV = (PFNGLGETPATHCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathCoordsNV")) == NULL) || r;
-  r = ((glGetPathDashArrayNV = (PFNGLGETPATHDASHARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathDashArrayNV")) == NULL) || r;
-  r = ((glGetPathLengthNV = (PFNGLGETPATHLENGTHNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathLengthNV")) == NULL) || r;
-  r = ((glGetPathMetricRangeNV = (PFNGLGETPATHMETRICRANGENVPROC)glewGetProcAddress((const GLubyte*)"glGetPathMetricRangeNV")) == NULL) || r;
-  r = ((glGetPathMetricsNV = (PFNGLGETPATHMETRICSNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathMetricsNV")) == NULL) || r;
-  r = ((glGetPathParameterfvNV = (PFNGLGETPATHPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathParameterfvNV")) == NULL) || r;
-  r = ((glGetPathParameterivNV = (PFNGLGETPATHPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathParameterivNV")) == NULL) || r;
-  r = ((glGetPathSpacingNV = (PFNGLGETPATHSPACINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathSpacingNV")) == NULL) || r;
-  r = ((glGetPathTexGenfvNV = (PFNGLGETPATHTEXGENFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathTexGenfvNV")) == NULL) || r;
-  r = ((glGetPathTexGenivNV = (PFNGLGETPATHTEXGENIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetPathTexGenivNV")) == NULL) || r;
-  r = ((glInterpolatePathsNV = (PFNGLINTERPOLATEPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glInterpolatePathsNV")) == NULL) || r;
-  r = ((glIsPathNV = (PFNGLISPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPathNV")) == NULL) || r;
-  r = ((glIsPointInFillPathNV = (PFNGLISPOINTINFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPointInFillPathNV")) == NULL) || r;
-  r = ((glIsPointInStrokePathNV = (PFNGLISPOINTINSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glIsPointInStrokePathNV")) == NULL) || r;
-  r = ((glPathColorGenNV = (PFNGLPATHCOLORGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathColorGenNV")) == NULL) || r;
-  r = ((glPathCommandsNV = (PFNGLPATHCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathCommandsNV")) == NULL) || r;
-  r = ((glPathCoordsNV = (PFNGLPATHCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathCoordsNV")) == NULL) || r;
-  r = ((glPathCoverDepthFuncNV = (PFNGLPATHCOVERDEPTHFUNCNVPROC)glewGetProcAddress((const GLubyte*)"glPathCoverDepthFuncNV")) == NULL) || r;
-  r = ((glPathDashArrayNV = (PFNGLPATHDASHARRAYNVPROC)glewGetProcAddress((const GLubyte*)"glPathDashArrayNV")) == NULL) || r;
-  r = ((glPathFogGenNV = (PFNGLPATHFOGGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathFogGenNV")) == NULL) || r;
-  r = ((glPathGlyphRangeNV = (PFNGLPATHGLYPHRANGENVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphRangeNV")) == NULL) || r;
-  r = ((glPathGlyphsNV = (PFNGLPATHGLYPHSNVPROC)glewGetProcAddress((const GLubyte*)"glPathGlyphsNV")) == NULL) || r;
-  r = ((glPathParameterfNV = (PFNGLPATHPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterfNV")) == NULL) || r;
-  r = ((glPathParameterfvNV = (PFNGLPATHPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterfvNV")) == NULL) || r;
-  r = ((glPathParameteriNV = (PFNGLPATHPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPathParameteriNV")) == NULL) || r;
-  r = ((glPathParameterivNV = (PFNGLPATHPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPathParameterivNV")) == NULL) || r;
-  r = ((glPathStencilDepthOffsetNV = (PFNGLPATHSTENCILDEPTHOFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glPathStencilDepthOffsetNV")) == NULL) || r;
-  r = ((glPathStencilFuncNV = (PFNGLPATHSTENCILFUNCNVPROC)glewGetProcAddress((const GLubyte*)"glPathStencilFuncNV")) == NULL) || r;
-  r = ((glPathStringNV = (PFNGLPATHSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glPathStringNV")) == NULL) || r;
-  r = ((glPathSubCommandsNV = (PFNGLPATHSUBCOMMANDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathSubCommandsNV")) == NULL) || r;
-  r = ((glPathSubCoordsNV = (PFNGLPATHSUBCOORDSNVPROC)glewGetProcAddress((const GLubyte*)"glPathSubCoordsNV")) == NULL) || r;
-  r = ((glPathTexGenNV = (PFNGLPATHTEXGENNVPROC)glewGetProcAddress((const GLubyte*)"glPathTexGenNV")) == NULL) || r;
-  r = ((glPointAlongPathNV = (PFNGLPOINTALONGPATHNVPROC)glewGetProcAddress((const GLubyte*)"glPointAlongPathNV")) == NULL) || r;
-  r = ((glStencilFillPathInstancedNV = (PFNGLSTENCILFILLPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilFillPathInstancedNV")) == NULL) || r;
-  r = ((glStencilFillPathNV = (PFNGLSTENCILFILLPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilFillPathNV")) == NULL) || r;
-  r = ((glStencilStrokePathInstancedNV = (PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC)glewGetProcAddress((const GLubyte*)"glStencilStrokePathInstancedNV")) == NULL) || r;
-  r = ((glStencilStrokePathNV = (PFNGLSTENCILSTROKEPATHNVPROC)glewGetProcAddress((const GLubyte*)"glStencilStrokePathNV")) == NULL) || r;
-  r = ((glTransformPathNV = (PFNGLTRANSFORMPATHNVPROC)glewGetProcAddress((const GLubyte*)"glTransformPathNV")) == NULL) || r;
-  r = ((glWeightPathsNV = (PFNGLWEIGHTPATHSNVPROC)glewGetProcAddress((const GLubyte*)"glWeightPathsNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_path_rendering */
-
-#ifdef GL_NV_pixel_data_range
-
-static GLboolean _glewInit_GL_NV_pixel_data_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFlushPixelDataRangeNV = (PFNGLFLUSHPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushPixelDataRangeNV")) == NULL) || r;
-  r = ((glPixelDataRangeNV = (PFNGLPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glPixelDataRangeNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_pixel_data_range */
-
-#ifdef GL_NV_point_sprite
-
-static GLboolean _glewInit_GL_NV_point_sprite (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPointParameteriNV = (PFNGLPOINTPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriNV")) == NULL) || r;
-  r = ((glPointParameterivNV = (PFNGLPOINTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterivNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_point_sprite */
-
-#ifdef GL_NV_present_video
-
-static GLboolean _glewInit_GL_NV_present_video (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetVideoi64vNV = (PFNGLGETVIDEOI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoi64vNV")) == NULL) || r;
-  r = ((glGetVideoivNV = (PFNGLGETVIDEOIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoivNV")) == NULL) || r;
-  r = ((glGetVideoui64vNV = (PFNGLGETVIDEOUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoui64vNV")) == NULL) || r;
-  r = ((glGetVideouivNV = (PFNGLGETVIDEOUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideouivNV")) == NULL) || r;
-  r = ((glPresentFrameDualFillNV = (PFNGLPRESENTFRAMEDUALFILLNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameDualFillNV")) == NULL) || r;
-  r = ((glPresentFrameKeyedNV = (PFNGLPRESENTFRAMEKEYEDNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameKeyedNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_present_video */
-
-#ifdef GL_NV_primitive_restart
-
-static GLboolean _glewInit_GL_NV_primitive_restart (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPrimitiveRestartIndexNV = (PFNGLPRIMITIVERESTARTINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndexNV")) == NULL) || r;
-  r = ((glPrimitiveRestartNV = (PFNGLPRIMITIVERESTARTNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_primitive_restart */
-
-#ifdef GL_NV_register_combiners
-
-static GLboolean _glewInit_GL_NV_register_combiners (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerInputNV")) == NULL) || r;
-  r = ((glCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerOutputNV")) == NULL) || r;
-  r = ((glCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfNV")) == NULL) || r;
-  r = ((glCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfvNV")) == NULL) || r;
-  r = ((glCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameteriNV")) == NULL) || r;
-  r = ((glCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterivNV")) == NULL) || r;
-  r = ((glFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glFinalCombinerInputNV")) == NULL) || r;
-  r = ((glGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterfvNV")) == NULL) || r;
-  r = ((glGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterivNV")) == NULL) || r;
-  r = ((glGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterfvNV")) == NULL) || r;
-  r = ((glGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterivNV")) == NULL) || r;
-  r = ((glGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterfvNV")) == NULL) || r;
-  r = ((glGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterivNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_register_combiners */
-
-#ifdef GL_NV_register_combiners2
-
-static GLboolean _glewInit_GL_NV_register_combiners2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glCombinerStageParameterfvNV = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerStageParameterfvNV")) == NULL) || r;
-  r = ((glGetCombinerStageParameterfvNV = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerStageParameterfvNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_register_combiners2 */
-
-#ifdef GL_NV_shader_atomic_float
-
-#endif /* GL_NV_shader_atomic_float */
-
-#ifdef GL_NV_shader_buffer_load
-
-static GLboolean _glewInit_GL_NV_shader_buffer_load (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetBufferParameterui64vNV = (PFNGLGETBUFFERPARAMETERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterui64vNV")) == NULL) || r;
-  r = ((glGetIntegerui64vNV = (PFNGLGETINTEGERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerui64vNV")) == NULL) || r;
-  r = ((glGetNamedBufferParameterui64vNV = (PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterui64vNV")) == NULL) || r;
-  r = ((glIsBufferResidentNV = (PFNGLISBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsBufferResidentNV")) == NULL) || r;
-  r = ((glIsNamedBufferResidentNV = (PFNGLISNAMEDBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glIsNamedBufferResidentNV")) == NULL) || r;
-  r = ((glMakeBufferNonResidentNV = (PFNGLMAKEBUFFERNONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeBufferNonResidentNV")) == NULL) || r;
-  r = ((glMakeBufferResidentNV = (PFNGLMAKEBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeBufferResidentNV")) == NULL) || r;
-  r = ((glMakeNamedBufferNonResidentNV = (PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeNamedBufferNonResidentNV")) == NULL) || r;
-  r = ((glMakeNamedBufferResidentNV = (PFNGLMAKENAMEDBUFFERRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glMakeNamedBufferResidentNV")) == NULL) || r;
-  r = ((glProgramUniformui64NV = (PFNGLPROGRAMUNIFORMUI64NVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformui64NV")) == NULL) || r;
-  r = ((glProgramUniformui64vNV = (PFNGLPROGRAMUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformui64vNV")) == NULL) || r;
-  r = ((glUniformui64NV = (PFNGLUNIFORMUI64NVPROC)glewGetProcAddress((const GLubyte*)"glUniformui64NV")) == NULL) || r;
-  r = ((glUniformui64vNV = (PFNGLUNIFORMUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glUniformui64vNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_shader_buffer_load */
-
-#ifdef GL_NV_tessellation_program5
-
-#endif /* GL_NV_tessellation_program5 */
-
-#ifdef GL_NV_texgen_emboss
-
-#endif /* GL_NV_texgen_emboss */
-
-#ifdef GL_NV_texgen_reflection
-
-#endif /* GL_NV_texgen_reflection */
-
-#ifdef GL_NV_texture_barrier
-
-static GLboolean _glewInit_GL_NV_texture_barrier (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTextureBarrierNV = (PFNGLTEXTUREBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glTextureBarrierNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_texture_barrier */
-
-#ifdef GL_NV_texture_compression_vtc
-
-#endif /* GL_NV_texture_compression_vtc */
-
-#ifdef GL_NV_texture_env_combine4
-
-#endif /* GL_NV_texture_env_combine4 */
-
-#ifdef GL_NV_texture_expand_normal
-
-#endif /* GL_NV_texture_expand_normal */
-
-#ifdef GL_NV_texture_multisample
-
-static GLboolean _glewInit_GL_NV_texture_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexImage2DMultisampleCoverageNV = (PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTexImage2DMultisampleCoverageNV")) == NULL) || r;
-  r = ((glTexImage3DMultisampleCoverageNV = (PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DMultisampleCoverageNV")) == NULL) || r;
-  r = ((glTextureImage2DMultisampleCoverageNV = (PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DMultisampleCoverageNV")) == NULL) || r;
-  r = ((glTextureImage2DMultisampleNV = (PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DMultisampleNV")) == NULL) || r;
-  r = ((glTextureImage3DMultisampleCoverageNV = (PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DMultisampleCoverageNV")) == NULL) || r;
-  r = ((glTextureImage3DMultisampleNV = (PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DMultisampleNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_texture_multisample */
-
-#ifdef GL_NV_texture_rectangle
-
-#endif /* GL_NV_texture_rectangle */
-
-#ifdef GL_NV_texture_shader
-
-#endif /* GL_NV_texture_shader */
-
-#ifdef GL_NV_texture_shader2
-
-#endif /* GL_NV_texture_shader2 */
-
-#ifdef GL_NV_texture_shader3
-
-#endif /* GL_NV_texture_shader3 */
-
-#ifdef GL_NV_transform_feedback
-
-static GLboolean _glewInit_GL_NV_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glActiveVaryingNV = (PFNGLACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glActiveVaryingNV")) == NULL) || r;
-  r = ((glBeginTransformFeedbackNV = (PFNGLBEGINTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackNV")) == NULL) || r;
-  r = ((glBindBufferBaseNV = (PFNGLBINDBUFFERBASENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseNV")) == NULL) || r;
-  r = ((glBindBufferOffsetNV = (PFNGLBINDBUFFEROFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetNV")) == NULL) || r;
-  r = ((glBindBufferRangeNV = (PFNGLBINDBUFFERRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeNV")) == NULL) || r;
-  r = ((glEndTransformFeedbackNV = (PFNGLENDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackNV")) == NULL) || r;
-  r = ((glGetActiveVaryingNV = (PFNGLGETACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveVaryingNV")) == NULL) || r;
-  r = ((glGetTransformFeedbackVaryingNV = (PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingNV")) == NULL) || r;
-  r = ((glGetVaryingLocationNV = (PFNGLGETVARYINGLOCATIONNVPROC)glewGetProcAddress((const GLubyte*)"glGetVaryingLocationNV")) == NULL) || r;
-  r = ((glTransformFeedbackAttribsNV = (PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackAttribsNV")) == NULL) || r;
-  r = ((glTransformFeedbackVaryingsNV = (PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_transform_feedback */
-
-#ifdef GL_NV_transform_feedback2
-
-static GLboolean _glewInit_GL_NV_transform_feedback2 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBindTransformFeedbackNV = (PFNGLBINDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBindTransformFeedbackNV")) == NULL) || r;
-  r = ((glDeleteTransformFeedbacksNV = (PFNGLDELETETRANSFORMFEEDBACKSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteTransformFeedbacksNV")) == NULL) || r;
-  r = ((glDrawTransformFeedbackNV = (PFNGLDRAWTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glDrawTransformFeedbackNV")) == NULL) || r;
-  r = ((glGenTransformFeedbacksNV = (PFNGLGENTRANSFORMFEEDBACKSNVPROC)glewGetProcAddress((const GLubyte*)"glGenTransformFeedbacksNV")) == NULL) || r;
-  r = ((glIsTransformFeedbackNV = (PFNGLISTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glIsTransformFeedbackNV")) == NULL) || r;
-  r = ((glPauseTransformFeedbackNV = (PFNGLPAUSETRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glPauseTransformFeedbackNV")) == NULL) || r;
-  r = ((glResumeTransformFeedbackNV = (PFNGLRESUMETRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glResumeTransformFeedbackNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_transform_feedback2 */
-
-#ifdef GL_NV_vdpau_interop
-
-static GLboolean _glewInit_GL_NV_vdpau_interop (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glVDPAUFiniNV = (PFNGLVDPAUFININVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUFiniNV")) == NULL) || r;
-  r = ((glVDPAUGetSurfaceivNV = (PFNGLVDPAUGETSURFACEIVNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUGetSurfaceivNV")) == NULL) || r;
-  r = ((glVDPAUInitNV = (PFNGLVDPAUINITNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUInitNV")) == NULL) || r;
-  r = ((glVDPAUIsSurfaceNV = (PFNGLVDPAUISSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUIsSurfaceNV")) == NULL) || r;
-  r = ((glVDPAUMapSurfacesNV = (PFNGLVDPAUMAPSURFACESNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUMapSurfacesNV")) == NULL) || r;
-  r = ((glVDPAURegisterOutputSurfaceNV = (PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAURegisterOutputSurfaceNV")) == NULL) || r;
-  r = ((glVDPAURegisterVideoSurfaceNV = (PFNGLVDPAUREGISTERVIDEOSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAURegisterVideoSurfaceNV")) == NULL) || r;
-  r = ((glVDPAUSurfaceAccessNV = (PFNGLVDPAUSURFACEACCESSNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUSurfaceAccessNV")) == NULL) || r;
-  r = ((glVDPAUUnmapSurfacesNV = (PFNGLVDPAUUNMAPSURFACESNVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUUnmapSurfacesNV")) == NULL) || r;
-  r = ((glVDPAUUnregisterSurfaceNV = (PFNGLVDPAUUNREGISTERSURFACENVPROC)glewGetProcAddress((const GLubyte*)"glVDPAUUnregisterSurfaceNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_vdpau_interop */
-
-#ifdef GL_NV_vertex_array_range
-
-static GLboolean _glewInit_GL_NV_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFlushVertexArrayRangeNV = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeNV")) == NULL) || r;
-  r = ((glVertexArrayRangeNV = (PFNGLVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_vertex_array_range */
-
-#ifdef GL_NV_vertex_array_range2
-
-#endif /* GL_NV_vertex_array_range2 */
-
-#ifdef GL_NV_vertex_attrib_integer_64bit
-
-static GLboolean _glewInit_GL_NV_vertex_attrib_integer_64bit (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetVertexAttribLi64vNV = (PFNGLGETVERTEXATTRIBLI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLi64vNV")) == NULL) || r;
-  r = ((glGetVertexAttribLui64vNV = (PFNGLGETVERTEXATTRIBLUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribLui64vNV")) == NULL) || r;
-  r = ((glVertexAttribL1i64NV = (PFNGLVERTEXATTRIBL1I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1i64NV")) == NULL) || r;
-  r = ((glVertexAttribL1i64vNV = (PFNGLVERTEXATTRIBL1I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1i64vNV")) == NULL) || r;
-  r = ((glVertexAttribL1ui64NV = (PFNGLVERTEXATTRIBL1UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64NV")) == NULL) || r;
-  r = ((glVertexAttribL1ui64vNV = (PFNGLVERTEXATTRIBL1UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL1ui64vNV")) == NULL) || r;
-  r = ((glVertexAttribL2i64NV = (PFNGLVERTEXATTRIBL2I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2i64NV")) == NULL) || r;
-  r = ((glVertexAttribL2i64vNV = (PFNGLVERTEXATTRIBL2I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2i64vNV")) == NULL) || r;
-  r = ((glVertexAttribL2ui64NV = (PFNGLVERTEXATTRIBL2UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2ui64NV")) == NULL) || r;
-  r = ((glVertexAttribL2ui64vNV = (PFNGLVERTEXATTRIBL2UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL2ui64vNV")) == NULL) || r;
-  r = ((glVertexAttribL3i64NV = (PFNGLVERTEXATTRIBL3I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3i64NV")) == NULL) || r;
-  r = ((glVertexAttribL3i64vNV = (PFNGLVERTEXATTRIBL3I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3i64vNV")) == NULL) || r;
-  r = ((glVertexAttribL3ui64NV = (PFNGLVERTEXATTRIBL3UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3ui64NV")) == NULL) || r;
-  r = ((glVertexAttribL3ui64vNV = (PFNGLVERTEXATTRIBL3UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL3ui64vNV")) == NULL) || r;
-  r = ((glVertexAttribL4i64NV = (PFNGLVERTEXATTRIBL4I64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4i64NV")) == NULL) || r;
-  r = ((glVertexAttribL4i64vNV = (PFNGLVERTEXATTRIBL4I64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4i64vNV")) == NULL) || r;
-  r = ((glVertexAttribL4ui64NV = (PFNGLVERTEXATTRIBL4UI64NVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4ui64NV")) == NULL) || r;
-  r = ((glVertexAttribL4ui64vNV = (PFNGLVERTEXATTRIBL4UI64VNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribL4ui64vNV")) == NULL) || r;
-  r = ((glVertexAttribLFormatNV = (PFNGLVERTEXATTRIBLFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribLFormatNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_vertex_attrib_integer_64bit */
-
-#ifdef GL_NV_vertex_buffer_unified_memory
-
-static GLboolean _glewInit_GL_NV_vertex_buffer_unified_memory (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBufferAddressRangeNV = (PFNGLBUFFERADDRESSRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBufferAddressRangeNV")) == NULL) || r;
-  r = ((glColorFormatNV = (PFNGLCOLORFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glColorFormatNV")) == NULL) || r;
-  r = ((glEdgeFlagFormatNV = (PFNGLEDGEFLAGFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagFormatNV")) == NULL) || r;
-  r = ((glFogCoordFormatNV = (PFNGLFOGCOORDFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordFormatNV")) == NULL) || r;
-  r = ((glGetIntegerui64i_vNV = (PFNGLGETINTEGERUI64I_VNVPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerui64i_vNV")) == NULL) || r;
-  r = ((glIndexFormatNV = (PFNGLINDEXFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glIndexFormatNV")) == NULL) || r;
-  r = ((glNormalFormatNV = (PFNGLNORMALFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glNormalFormatNV")) == NULL) || r;
-  r = ((glSecondaryColorFormatNV = (PFNGLSECONDARYCOLORFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorFormatNV")) == NULL) || r;
-  r = ((glTexCoordFormatNV = (PFNGLTEXCOORDFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoordFormatNV")) == NULL) || r;
-  r = ((glVertexAttribFormatNV = (PFNGLVERTEXATTRIBFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribFormatNV")) == NULL) || r;
-  r = ((glVertexAttribIFormatNV = (PFNGLVERTEXATTRIBIFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIFormatNV")) == NULL) || r;
-  r = ((glVertexFormatNV = (PFNGLVERTEXFORMATNVPROC)glewGetProcAddress((const GLubyte*)"glVertexFormatNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_vertex_buffer_unified_memory */
-
-#ifdef GL_NV_vertex_program
-
-static GLboolean _glewInit_GL_NV_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAreProgramsResidentNV = (PFNGLAREPROGRAMSRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glAreProgramsResidentNV")) == NULL) || r;
-  r = ((glBindProgramNV = (PFNGLBINDPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glBindProgramNV")) == NULL) || r;
-  r = ((glDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsNV")) == NULL) || r;
-  r = ((glExecuteProgramNV = (PFNGLEXECUTEPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glExecuteProgramNV")) == NULL) || r;
-  r = ((glGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsNV")) == NULL) || r;
-  r = ((glGetProgramParameterdvNV = (PFNGLGETPROGRAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterdvNV")) == NULL) || r;
-  r = ((glGetProgramParameterfvNV = (PFNGLGETPROGRAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterfvNV")) == NULL) || r;
-  r = ((glGetProgramStringNV = (PFNGLGETPROGRAMSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringNV")) == NULL) || r;
-  r = ((glGetProgramivNV = (PFNGLGETPROGRAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivNV")) == NULL) || r;
-  r = ((glGetTrackMatrixivNV = (PFNGLGETTRACKMATRIXIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetTrackMatrixivNV")) == NULL) || r;
-  r = ((glGetVertexAttribPointervNV = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervNV")) == NULL) || r;
-  r = ((glGetVertexAttribdvNV = (PFNGLGETVERTEXATTRIBDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvNV")) == NULL) || r;
-  r = ((glGetVertexAttribfvNV = (PFNGLGETVERTEXATTRIBFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvNV")) == NULL) || r;
-  r = ((glGetVertexAttribivNV = (PFNGLGETVERTEXATTRIBIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivNV")) == NULL) || r;
-  r = ((glIsProgramNV = (PFNGLISPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glIsProgramNV")) == NULL) || r;
-  r = ((glLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glLoadProgramNV")) == NULL) || r;
-  r = ((glProgramParameter4dNV = (PFNGLPROGRAMPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dNV")) == NULL) || r;
-  r = ((glProgramParameter4dvNV = (PFNGLPROGRAMPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dvNV")) == NULL) || r;
-  r = ((glProgramParameter4fNV = (PFNGLPROGRAMPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fNV")) == NULL) || r;
-  r = ((glProgramParameter4fvNV = (PFNGLPROGRAMPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fvNV")) == NULL) || r;
-  r = ((glProgramParameters4dvNV = (PFNGLPROGRAMPARAMETERS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4dvNV")) == NULL) || r;
-  r = ((glProgramParameters4fvNV = (PFNGLPROGRAMPARAMETERS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4fvNV")) == NULL) || r;
-  r = ((glRequestResidentProgramsNV = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glRequestResidentProgramsNV")) == NULL) || r;
-  r = ((glTrackMatrixNV = (PFNGLTRACKMATRIXNVPROC)glewGetProcAddress((const GLubyte*)"glTrackMatrixNV")) == NULL) || r;
-  r = ((glVertexAttrib1dNV = (PFNGLVERTEXATTRIB1DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dNV")) == NULL) || r;
-  r = ((glVertexAttrib1dvNV = (PFNGLVERTEXATTRIB1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvNV")) == NULL) || r;
-  r = ((glVertexAttrib1fNV = (PFNGLVERTEXATTRIB1FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fNV")) == NULL) || r;
-  r = ((glVertexAttrib1fvNV = (PFNGLVERTEXATTRIB1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvNV")) == NULL) || r;
-  r = ((glVertexAttrib1sNV = (PFNGLVERTEXATTRIB1SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sNV")) == NULL) || r;
-  r = ((glVertexAttrib1svNV = (PFNGLVERTEXATTRIB1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svNV")) == NULL) || r;
-  r = ((glVertexAttrib2dNV = (PFNGLVERTEXATTRIB2DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dNV")) == NULL) || r;
-  r = ((glVertexAttrib2dvNV = (PFNGLVERTEXATTRIB2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvNV")) == NULL) || r;
-  r = ((glVertexAttrib2fNV = (PFNGLVERTEXATTRIB2FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fNV")) == NULL) || r;
-  r = ((glVertexAttrib2fvNV = (PFNGLVERTEXATTRIB2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvNV")) == NULL) || r;
-  r = ((glVertexAttrib2sNV = (PFNGLVERTEXATTRIB2SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sNV")) == NULL) || r;
-  r = ((glVertexAttrib2svNV = (PFNGLVERTEXATTRIB2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svNV")) == NULL) || r;
-  r = ((glVertexAttrib3dNV = (PFNGLVERTEXATTRIB3DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dNV")) == NULL) || r;
-  r = ((glVertexAttrib3dvNV = (PFNGLVERTEXATTRIB3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvNV")) == NULL) || r;
-  r = ((glVertexAttrib3fNV = (PFNGLVERTEXATTRIB3FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fNV")) == NULL) || r;
-  r = ((glVertexAttrib3fvNV = (PFNGLVERTEXATTRIB3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvNV")) == NULL) || r;
-  r = ((glVertexAttrib3sNV = (PFNGLVERTEXATTRIB3SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sNV")) == NULL) || r;
-  r = ((glVertexAttrib3svNV = (PFNGLVERTEXATTRIB3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svNV")) == NULL) || r;
-  r = ((glVertexAttrib4dNV = (PFNGLVERTEXATTRIB4DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dNV")) == NULL) || r;
-  r = ((glVertexAttrib4dvNV = (PFNGLVERTEXATTRIB4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvNV")) == NULL) || r;
-  r = ((glVertexAttrib4fNV = (PFNGLVERTEXATTRIB4FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fNV")) == NULL) || r;
-  r = ((glVertexAttrib4fvNV = (PFNGLVERTEXATTRIB4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvNV")) == NULL) || r;
-  r = ((glVertexAttrib4sNV = (PFNGLVERTEXATTRIB4SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sNV")) == NULL) || r;
-  r = ((glVertexAttrib4svNV = (PFNGLVERTEXATTRIB4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svNV")) == NULL) || r;
-  r = ((glVertexAttrib4ubNV = (PFNGLVERTEXATTRIB4UBNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubNV")) == NULL) || r;
-  r = ((glVertexAttrib4ubvNV = (PFNGLVERTEXATTRIB4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvNV")) == NULL) || r;
-  r = ((glVertexAttribPointerNV = (PFNGLVERTEXATTRIBPOINTERNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerNV")) == NULL) || r;
-  r = ((glVertexAttribs1dvNV = (PFNGLVERTEXATTRIBS1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1dvNV")) == NULL) || r;
-  r = ((glVertexAttribs1fvNV = (PFNGLVERTEXATTRIBS1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1fvNV")) == NULL) || r;
-  r = ((glVertexAttribs1svNV = (PFNGLVERTEXATTRIBS1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1svNV")) == NULL) || r;
-  r = ((glVertexAttribs2dvNV = (PFNGLVERTEXATTRIBS2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2dvNV")) == NULL) || r;
-  r = ((glVertexAttribs2fvNV = (PFNGLVERTEXATTRIBS2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2fvNV")) == NULL) || r;
-  r = ((glVertexAttribs2svNV = (PFNGLVERTEXATTRIBS2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2svNV")) == NULL) || r;
-  r = ((glVertexAttribs3dvNV = (PFNGLVERTEXATTRIBS3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3dvNV")) == NULL) || r;
-  r = ((glVertexAttribs3fvNV = (PFNGLVERTEXATTRIBS3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3fvNV")) == NULL) || r;
-  r = ((glVertexAttribs3svNV = (PFNGLVERTEXATTRIBS3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3svNV")) == NULL) || r;
-  r = ((glVertexAttribs4dvNV = (PFNGLVERTEXATTRIBS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4dvNV")) == NULL) || r;
-  r = ((glVertexAttribs4fvNV = (PFNGLVERTEXATTRIBS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4fvNV")) == NULL) || r;
-  r = ((glVertexAttribs4svNV = (PFNGLVERTEXATTRIBS4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4svNV")) == NULL) || r;
-  r = ((glVertexAttribs4ubvNV = (PFNGLVERTEXATTRIBS4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4ubvNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_vertex_program */
-
-#ifdef GL_NV_vertex_program1_1
-
-#endif /* GL_NV_vertex_program1_1 */
-
-#ifdef GL_NV_vertex_program2
-
-#endif /* GL_NV_vertex_program2 */
-
-#ifdef GL_NV_vertex_program2_option
-
-#endif /* GL_NV_vertex_program2_option */
-
-#ifdef GL_NV_vertex_program3
-
-#endif /* GL_NV_vertex_program3 */
-
-#ifdef GL_NV_vertex_program4
-
-#endif /* GL_NV_vertex_program4 */
-
-#ifdef GL_NV_video_capture
-
-static GLboolean _glewInit_GL_NV_video_capture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glBeginVideoCaptureNV = (PFNGLBEGINVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glBeginVideoCaptureNV")) == NULL) || r;
-  r = ((glBindVideoCaptureStreamBufferNV = (PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glBindVideoCaptureStreamBufferNV")) == NULL) || r;
-  r = ((glBindVideoCaptureStreamTextureNV = (PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC)glewGetProcAddress((const GLubyte*)"glBindVideoCaptureStreamTextureNV")) == NULL) || r;
-  r = ((glEndVideoCaptureNV = (PFNGLENDVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glEndVideoCaptureNV")) == NULL) || r;
-  r = ((glGetVideoCaptureStreamdvNV = (PFNGLGETVIDEOCAPTURESTREAMDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamdvNV")) == NULL) || r;
-  r = ((glGetVideoCaptureStreamfvNV = (PFNGLGETVIDEOCAPTURESTREAMFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamfvNV")) == NULL) || r;
-  r = ((glGetVideoCaptureStreamivNV = (PFNGLGETVIDEOCAPTURESTREAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureStreamivNV")) == NULL) || r;
-  r = ((glGetVideoCaptureivNV = (PFNGLGETVIDEOCAPTUREIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoCaptureivNV")) == NULL) || r;
-  r = ((glVideoCaptureNV = (PFNGLVIDEOCAPTURENVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureNV")) == NULL) || r;
-  r = ((glVideoCaptureStreamParameterdvNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterdvNV")) == NULL) || r;
-  r = ((glVideoCaptureStreamParameterfvNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterfvNV")) == NULL) || r;
-  r = ((glVideoCaptureStreamParameterivNV = (PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoCaptureStreamParameterivNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_NV_video_capture */
-
-#ifdef GL_OES_byte_coordinates
-
-#endif /* GL_OES_byte_coordinates */
-
-#ifdef GL_OES_compressed_paletted_texture
-
-#endif /* GL_OES_compressed_paletted_texture */
-
-#ifdef GL_OES_read_format
-
-#endif /* GL_OES_read_format */
-
-#ifdef GL_OES_single_precision
-
-static GLboolean _glewInit_GL_OES_single_precision (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glClearDepthfOES = (PFNGLCLEARDEPTHFOESPROC)glewGetProcAddress((const GLubyte*)"glClearDepthfOES")) == NULL) || r;
-  r = ((glClipPlanefOES = (PFNGLCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glClipPlanefOES")) == NULL) || r;
-  r = ((glDepthRangefOES = (PFNGLDEPTHRANGEFOESPROC)glewGetProcAddress((const GLubyte*)"glDepthRangefOES")) == NULL) || r;
-  r = ((glFrustumfOES = (PFNGLFRUSTUMFOESPROC)glewGetProcAddress((const GLubyte*)"glFrustumfOES")) == NULL) || r;
-  r = ((glGetClipPlanefOES = (PFNGLGETCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glGetClipPlanefOES")) == NULL) || r;
-  r = ((glOrthofOES = (PFNGLORTHOFOESPROC)glewGetProcAddress((const GLubyte*)"glOrthofOES")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_OES_single_precision */
-
-#ifdef GL_OML_interlace
-
-#endif /* GL_OML_interlace */
-
-#ifdef GL_OML_resample
-
-#endif /* GL_OML_resample */
-
-#ifdef GL_OML_subsample
-
-#endif /* GL_OML_subsample */
-
-#ifdef GL_PGI_misc_hints
-
-#endif /* GL_PGI_misc_hints */
-
-#ifdef GL_PGI_vertex_hints
-
-#endif /* GL_PGI_vertex_hints */
-
-#ifdef GL_REGAL_error_string
-
-static GLboolean _glewInit_GL_REGAL_error_string (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glErrorStringREGAL = (PFNGLERRORSTRINGREGALPROC)glewGetProcAddress((const GLubyte*)"glErrorStringREGAL")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_REGAL_error_string */
-
-#ifdef GL_REGAL_extension_query
-
-static GLboolean _glewInit_GL_REGAL_extension_query (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetExtensionREGAL = (PFNGLGETEXTENSIONREGALPROC)glewGetProcAddress((const GLubyte*)"glGetExtensionREGAL")) == NULL) || r;
-  r = ((glIsSupportedREGAL = (PFNGLISSUPPORTEDREGALPROC)glewGetProcAddress((const GLubyte*)"glIsSupportedREGAL")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_REGAL_extension_query */
-
-#ifdef GL_REGAL_log
-
-#endif /* GL_REGAL_log */
-
-#ifdef GL_REND_screen_coordinates
-
-#endif /* GL_REND_screen_coordinates */
-
-#ifdef GL_S3_s3tc
-
-#endif /* GL_S3_s3tc */
-
-#ifdef GL_SGIS_color_range
-
-#endif /* GL_SGIS_color_range */
-
-#ifdef GL_SGIS_detail_texture
-
-static GLboolean _glewInit_GL_SGIS_detail_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glDetailTexFuncSGIS = (PFNGLDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glDetailTexFuncSGIS")) == NULL) || r;
-  r = ((glGetDetailTexFuncSGIS = (PFNGLGETDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetDetailTexFuncSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_detail_texture */
-
-#ifdef GL_SGIS_fog_function
-
-static GLboolean _glewInit_GL_SGIS_fog_function (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFogFuncSGIS = (PFNGLFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glFogFuncSGIS")) == NULL) || r;
-  r = ((glGetFogFuncSGIS = (PFNGLGETFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetFogFuncSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_fog_function */
-
-#ifdef GL_SGIS_generate_mipmap
-
-#endif /* GL_SGIS_generate_mipmap */
-
-#ifdef GL_SGIS_multisample
-
-static GLboolean _glewInit_GL_SGIS_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSampleMaskSGIS = (PFNGLSAMPLEMASKSGISPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskSGIS")) == NULL) || r;
-  r = ((glSamplePatternSGIS = (PFNGLSAMPLEPATTERNSGISPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_multisample */
-
-#ifdef GL_SGIS_pixel_texture
-
-#endif /* GL_SGIS_pixel_texture */
-
-#ifdef GL_SGIS_point_line_texgen
-
-#endif /* GL_SGIS_point_line_texgen */
-
-#ifdef GL_SGIS_sharpen_texture
-
-static GLboolean _glewInit_GL_SGIS_sharpen_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetSharpenTexFuncSGIS = (PFNGLGETSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetSharpenTexFuncSGIS")) == NULL) || r;
-  r = ((glSharpenTexFuncSGIS = (PFNGLSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glSharpenTexFuncSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_sharpen_texture */
-
-#ifdef GL_SGIS_texture4D
-
-static GLboolean _glewInit_GL_SGIS_texture4D (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTexImage4DSGIS = (PFNGLTEXIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexImage4DSGIS")) == NULL) || r;
-  r = ((glTexSubImage4DSGIS = (PFNGLTEXSUBIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage4DSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_texture4D */
-
-#ifdef GL_SGIS_texture_border_clamp
-
-#endif /* GL_SGIS_texture_border_clamp */
-
-#ifdef GL_SGIS_texture_edge_clamp
-
-#endif /* GL_SGIS_texture_edge_clamp */
-
-#ifdef GL_SGIS_texture_filter4
-
-static GLboolean _glewInit_GL_SGIS_texture_filter4 (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGetTexFilterFuncSGIS = (PFNGLGETTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetTexFilterFuncSGIS")) == NULL) || r;
-  r = ((glTexFilterFuncSGIS = (PFNGLTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glTexFilterFuncSGIS")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIS_texture_filter4 */
-
-#ifdef GL_SGIS_texture_lod
-
-#endif /* GL_SGIS_texture_lod */
-
-#ifdef GL_SGIS_texture_select
-
-#endif /* GL_SGIS_texture_select */
-
-#ifdef GL_SGIX_async
-
-static GLboolean _glewInit_GL_SGIX_async (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAsyncMarkerSGIX = (PFNGLASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glAsyncMarkerSGIX")) == NULL) || r;
-  r = ((glDeleteAsyncMarkersSGIX = (PFNGLDELETEASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteAsyncMarkersSGIX")) == NULL) || r;
-  r = ((glFinishAsyncSGIX = (PFNGLFINISHASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glFinishAsyncSGIX")) == NULL) || r;
-  r = ((glGenAsyncMarkersSGIX = (PFNGLGENASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenAsyncMarkersSGIX")) == NULL) || r;
-  r = ((glIsAsyncMarkerSGIX = (PFNGLISASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsAsyncMarkerSGIX")) == NULL) || r;
-  r = ((glPollAsyncSGIX = (PFNGLPOLLASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glPollAsyncSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_async */
-
-#ifdef GL_SGIX_async_histogram
-
-#endif /* GL_SGIX_async_histogram */
-
-#ifdef GL_SGIX_async_pixel
-
-#endif /* GL_SGIX_async_pixel */
-
-#ifdef GL_SGIX_blend_alpha_minmax
-
-#endif /* GL_SGIX_blend_alpha_minmax */
-
-#ifdef GL_SGIX_clipmap
-
-#endif /* GL_SGIX_clipmap */
-
-#ifdef GL_SGIX_convolution_accuracy
-
-#endif /* GL_SGIX_convolution_accuracy */
-
-#ifdef GL_SGIX_depth_texture
-
-#endif /* GL_SGIX_depth_texture */
-
-#ifdef GL_SGIX_flush_raster
-
-static GLboolean _glewInit_GL_SGIX_flush_raster (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFlushRasterSGIX = (PFNGLFLUSHRASTERSGIXPROC)glewGetProcAddress((const GLubyte*)"glFlushRasterSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_flush_raster */
-
-#ifdef GL_SGIX_fog_offset
-
-#endif /* GL_SGIX_fog_offset */
-
-#ifdef GL_SGIX_fog_texture
-
-static GLboolean _glewInit_GL_SGIX_fog_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTextureFogSGIX = (PFNGLTEXTUREFOGSGIXPROC)glewGetProcAddress((const GLubyte*)"glTextureFogSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_fog_texture */
-
-#ifdef GL_SGIX_fragment_specular_lighting
-
-static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFragmentColorMaterialSGIX = (PFNGLFRAGMENTCOLORMATERIALSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialSGIX")) == NULL) || r;
-  r = ((glFragmentLightModelfSGIX = (PFNGLFRAGMENTLIGHTMODELFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfSGIX")) == NULL) || r;
-  r = ((glFragmentLightModelfvSGIX = (PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvSGIX")) == NULL) || r;
-  r = ((glFragmentLightModeliSGIX = (PFNGLFRAGMENTLIGHTMODELISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliSGIX")) == NULL) || r;
-  r = ((glFragmentLightModelivSGIX = (PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivSGIX")) == NULL) || r;
-  r = ((glFragmentLightfSGIX = (PFNGLFRAGMENTLIGHTFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfSGIX")) == NULL) || r;
-  r = ((glFragmentLightfvSGIX = (PFNGLFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvSGIX")) == NULL) || r;
-  r = ((glFragmentLightiSGIX = (PFNGLFRAGMENTLIGHTISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiSGIX")) == NULL) || r;
-  r = ((glFragmentLightivSGIX = (PFNGLFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivSGIX")) == NULL) || r;
-  r = ((glFragmentMaterialfSGIX = (PFNGLFRAGMENTMATERIALFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfSGIX")) == NULL) || r;
-  r = ((glFragmentMaterialfvSGIX = (PFNGLFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvSGIX")) == NULL) || r;
-  r = ((glFragmentMaterialiSGIX = (PFNGLFRAGMENTMATERIALISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiSGIX")) == NULL) || r;
-  r = ((glFragmentMaterialivSGIX = (PFNGLFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivSGIX")) == NULL) || r;
-  r = ((glGetFragmentLightfvSGIX = (PFNGLGETFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvSGIX")) == NULL) || r;
-  r = ((glGetFragmentLightivSGIX = (PFNGLGETFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivSGIX")) == NULL) || r;
-  r = ((glGetFragmentMaterialfvSGIX = (PFNGLGETFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvSGIX")) == NULL) || r;
-  r = ((glGetFragmentMaterialivSGIX = (PFNGLGETFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_fragment_specular_lighting */
-
-#ifdef GL_SGIX_framezoom
-
-static GLboolean _glewInit_GL_SGIX_framezoom (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFrameZoomSGIX = (PFNGLFRAMEZOOMSGIXPROC)glewGetProcAddress((const GLubyte*)"glFrameZoomSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_framezoom */
-
-#ifdef GL_SGIX_interlace
-
-#endif /* GL_SGIX_interlace */
-
-#ifdef GL_SGIX_ir_instrument1
-
-#endif /* GL_SGIX_ir_instrument1 */
-
-#ifdef GL_SGIX_list_priority
-
-#endif /* GL_SGIX_list_priority */
-
-#ifdef GL_SGIX_pixel_texture
-
-static GLboolean _glewInit_GL_SGIX_pixel_texture (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glPixelTexGenSGIX = (PFNGLPIXELTEXGENSGIXPROC)glewGetProcAddress((const GLubyte*)"glPixelTexGenSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_pixel_texture */
-
-#ifdef GL_SGIX_pixel_texture_bits
-
-#endif /* GL_SGIX_pixel_texture_bits */
-
-#ifdef GL_SGIX_reference_plane
-
-static GLboolean _glewInit_GL_SGIX_reference_plane (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glReferencePlaneSGIX = (PFNGLREFERENCEPLANESGIXPROC)glewGetProcAddress((const GLubyte*)"glReferencePlaneSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_reference_plane */
-
-#ifdef GL_SGIX_resample
-
-#endif /* GL_SGIX_resample */
-
-#ifdef GL_SGIX_shadow
-
-#endif /* GL_SGIX_shadow */
-
-#ifdef GL_SGIX_shadow_ambient
-
-#endif /* GL_SGIX_shadow_ambient */
-
-#ifdef GL_SGIX_sprite
-
-static GLboolean _glewInit_GL_SGIX_sprite (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glSpriteParameterfSGIX = (PFNGLSPRITEPARAMETERFSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfSGIX")) == NULL) || r;
-  r = ((glSpriteParameterfvSGIX = (PFNGLSPRITEPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfvSGIX")) == NULL) || r;
-  r = ((glSpriteParameteriSGIX = (PFNGLSPRITEPARAMETERISGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameteriSGIX")) == NULL) || r;
-  r = ((glSpriteParameterivSGIX = (PFNGLSPRITEPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterivSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_sprite */
-
-#ifdef GL_SGIX_tag_sample_buffer
-
-static GLboolean _glewInit_GL_SGIX_tag_sample_buffer (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glTagSampleBufferSGIX = (PFNGLTAGSAMPLEBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glTagSampleBufferSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGIX_tag_sample_buffer */
-
-#ifdef GL_SGIX_texture_add_env
-
-#endif /* GL_SGIX_texture_add_env */
-
-#ifdef GL_SGIX_texture_coordinate_clamp
-
-#endif /* GL_SGIX_texture_coordinate_clamp */
-
-#ifdef GL_SGIX_texture_lod_bias
-
-#endif /* GL_SGIX_texture_lod_bias */
-
-#ifdef GL_SGIX_texture_multi_buffer
-
-#endif /* GL_SGIX_texture_multi_buffer */
-
-#ifdef GL_SGIX_texture_range
-
-#endif /* GL_SGIX_texture_range */
-
-#ifdef GL_SGIX_texture_scale_bias
-
-#endif /* GL_SGIX_texture_scale_bias */
-
-#ifdef GL_SGIX_vertex_preclip
-
-#endif /* GL_SGIX_vertex_preclip */
-
-#ifdef GL_SGIX_vertex_preclip_hint
-
-#endif /* GL_SGIX_vertex_preclip_hint */
-
-#ifdef GL_SGIX_ycrcb
-
-#endif /* GL_SGIX_ycrcb */
-
-#ifdef GL_SGI_color_matrix
-
-#endif /* GL_SGI_color_matrix */
-
-#ifdef GL_SGI_color_table
-
-static GLboolean _glewInit_GL_SGI_color_table (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColorTableParameterfvSGI = (PFNGLCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfvSGI")) == NULL) || r;
-  r = ((glColorTableParameterivSGI = (PFNGLCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterivSGI")) == NULL) || r;
-  r = ((glColorTableSGI = (PFNGLCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableSGI")) == NULL) || r;
-  r = ((glCopyColorTableSGI = (PFNGLCOPYCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTableSGI")) == NULL) || r;
-  r = ((glGetColorTableParameterfvSGI = (PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvSGI")) == NULL) || r;
-  r = ((glGetColorTableParameterivSGI = (PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivSGI")) == NULL) || r;
-  r = ((glGetColorTableSGI = (PFNGLGETCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableSGI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SGI_color_table */
-
-#ifdef GL_SGI_texture_color_table
-
-#endif /* GL_SGI_texture_color_table */
-
-#ifdef GL_SUNX_constant_data
-
-static GLboolean _glewInit_GL_SUNX_constant_data (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glFinishTextureSUNX = (PFNGLFINISHTEXTURESUNXPROC)glewGetProcAddress((const GLubyte*)"glFinishTextureSUNX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SUNX_constant_data */
-
-#ifdef GL_SUN_convolution_border_modes
-
-#endif /* GL_SUN_convolution_border_modes */
-
-#ifdef GL_SUN_global_alpha
-
-static GLboolean _glewInit_GL_SUN_global_alpha (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glGlobalAlphaFactorbSUN = (PFNGLGLOBALALPHAFACTORBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorbSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactordSUN = (PFNGLGLOBALALPHAFACTORDSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactordSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactorfSUN = (PFNGLGLOBALALPHAFACTORFSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorfSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactoriSUN = (PFNGLGLOBALALPHAFACTORISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoriSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactorsSUN = (PFNGLGLOBALALPHAFACTORSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorsSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactorubSUN = (PFNGLGLOBALALPHAFACTORUBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorubSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactoruiSUN = (PFNGLGLOBALALPHAFACTORUISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoruiSUN")) == NULL) || r;
-  r = ((glGlobalAlphaFactorusSUN = (PFNGLGLOBALALPHAFACTORUSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorusSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SUN_global_alpha */
-
-#ifdef GL_SUN_mesh_array
-
-#endif /* GL_SUN_mesh_array */
-
-#ifdef GL_SUN_read_video_pixels
-
-static GLboolean _glewInit_GL_SUN_read_video_pixels (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glReadVideoPixelsSUN = (PFNGLREADVIDEOPIXELSSUNPROC)glewGetProcAddress((const GLubyte*)"glReadVideoPixelsSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SUN_read_video_pixels */
-
-#ifdef GL_SUN_slice_accum
-
-#endif /* GL_SUN_slice_accum */
-
-#ifdef GL_SUN_triangle_list
-
-static GLboolean _glewInit_GL_SUN_triangle_list (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glReplacementCodePointerSUN = (PFNGLREPLACEMENTCODEPOINTERSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodePointerSUN")) == NULL) || r;
-  r = ((glReplacementCodeubSUN = (PFNGLREPLACEMENTCODEUBSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubSUN")) == NULL) || r;
-  r = ((glReplacementCodeubvSUN = (PFNGLREPLACEMENTCODEUBVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiSUN = (PFNGLREPLACEMENTCODEUISUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiSUN")) == NULL) || r;
-  r = ((glReplacementCodeuivSUN = (PFNGLREPLACEMENTCODEUIVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuivSUN")) == NULL) || r;
-  r = ((glReplacementCodeusSUN = (PFNGLREPLACEMENTCODEUSSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusSUN")) == NULL) || r;
-  r = ((glReplacementCodeusvSUN = (PFNGLREPLACEMENTCODEUSVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusvSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SUN_triangle_list */
-
-#ifdef GL_SUN_vertex
-
-static GLboolean _glewInit_GL_SUN_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glColor3fVertex3fSUN = (PFNGLCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fSUN")) == NULL) || r;
-  r = ((glColor3fVertex3fvSUN = (PFNGLCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fvSUN")) == NULL) || r;
-  r = ((glColor4fNormal3fVertex3fSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glColor4fNormal3fVertex3fvSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glColor4ubVertex2fSUN = (PFNGLCOLOR4UBVERTEX2FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fSUN")) == NULL) || r;
-  r = ((glColor4ubVertex2fvSUN = (PFNGLCOLOR4UBVERTEX2FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fvSUN")) == NULL) || r;
-  r = ((glColor4ubVertex3fSUN = (PFNGLCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fSUN")) == NULL) || r;
-  r = ((glColor4ubVertex3fvSUN = (PFNGLCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fvSUN")) == NULL) || r;
-  r = ((glNormal3fVertex3fSUN = (PFNGLNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glNormal3fVertex3fvSUN = (PFNGLNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor4ubVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiColor4ubVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiTexCoord2fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fvSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiVertex3fSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fSUN")) == NULL) || r;
-  r = ((glReplacementCodeuiVertex3fvSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor4ubVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fSUN")) == NULL) || r;
-  r = ((glTexCoord2fColor4ubVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord2fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
-  r = ((glTexCoord2fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord2fVertex3fSUN = (PFNGLTEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fSUN")) == NULL) || r;
-  r = ((glTexCoord2fVertex3fvSUN = (PFNGLTEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fvSUN")) == NULL) || r;
-  r = ((glTexCoord4fColor4fNormal3fVertex4fSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fSUN")) == NULL) || r;
-  r = ((glTexCoord4fColor4fNormal3fVertex4fvSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fvSUN")) == NULL) || r;
-  r = ((glTexCoord4fVertex4fSUN = (PFNGLTEXCOORD4FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fSUN")) == NULL) || r;
-  r = ((glTexCoord4fVertex4fvSUN = (PFNGLTEXCOORD4FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fvSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_SUN_vertex */
-
-#ifdef GL_WIN_phong_shading
-
-#endif /* GL_WIN_phong_shading */
-
-#ifdef GL_WIN_specular_fog
-
-#endif /* GL_WIN_specular_fog */
-
-#ifdef GL_WIN_swap_hint
-
-static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glAddSwapHintRectWIN = (PFNGLADDSWAPHINTRECTWINPROC)glewGetProcAddress((const GLubyte*)"glAddSwapHintRectWIN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GL_WIN_swap_hint */
-
-/* ------------------------------------------------------------------------- */
-
-GLboolean GLEWAPIENTRY glewGetExtension (const char* name)
-{    
-  const GLubyte* start;
-  const GLubyte* end;
-  start = (const GLubyte*)glGetString(GL_EXTENSIONS);
-  if (start == 0)
-    return GL_FALSE;
-  end = start + _glewStrLen(start);
-  return _glewSearchExtension(name, start, end);
-}
-
-/* ------------------------------------------------------------------------- */
-
-#ifndef GLEW_MX
-static
-#endif
-GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
-{
-  const GLubyte* s;
-  GLuint dot;
-  GLint major, minor;
-  const GLubyte* extStart;
-  const GLubyte* extEnd;
-  /* query opengl version */
-  s = glGetString(GL_VERSION);
-  dot = _glewStrCLen(s, '.');
-  if (dot == 0)
-    return GLEW_ERROR_NO_GL_VERSION;
-  
-  major = s[dot-1]-'0';
-  minor = s[dot+1]-'0';
-
-  if (minor < 0 || minor > 9)
-    minor = 0;
-  if (major<0 || major>9)
-    return GLEW_ERROR_NO_GL_VERSION;
-  
-
-  if (major == 1 && minor == 0)
-  {
-    return GLEW_ERROR_GL_VERSION_10_ONLY;
-  }
-  else
-  {
-    CONST_CAST(GLEW_VERSION_4_3)   = ( major > 4 )                 || ( major == 4 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_4_2)   = GLEW_VERSION_4_3   == GL_TRUE || ( major == 4 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_4_1)   = GLEW_VERSION_4_2   == GL_TRUE || ( major == 4 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_4_0)   = GLEW_VERSION_4_1   == GL_TRUE || ( major == 4               ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_3_3)   = GLEW_VERSION_4_0   == GL_TRUE || ( major == 3 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_3_2)   = GLEW_VERSION_3_3   == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_3_1)   = GLEW_VERSION_3_2   == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_3_0)   = GLEW_VERSION_3_1   == GL_TRUE || ( major == 3               ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_2_1)   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;    
-    CONST_CAST(GLEW_VERSION_2_0)   = GLEW_VERSION_2_1   == GL_TRUE || ( major == 2               ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_5)   = GLEW_VERSION_2_0   == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_4)   = GLEW_VERSION_1_5   == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_3)   = GLEW_VERSION_1_4   == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_2_1) = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE; 
-    CONST_CAST(GLEW_VERSION_1_2)   = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
-    CONST_CAST(GLEW_VERSION_1_1)   = GLEW_VERSION_1_2   == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
-  }
-
-  /* query opengl extensions string */
-  extStart = glGetString(GL_EXTENSIONS);
-  if (extStart == 0)
-    extStart = (const GLubyte*)"";
-  extEnd = extStart + _glewStrLen(extStart);
-
-  /* initialize extensions */
-#ifdef GL_VERSION_1_2
-  if (glewExperimental || GLEW_VERSION_1_2) CONST_CAST(GLEW_VERSION_1_2) = !_glewInit_GL_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_1_2 */
-#ifdef GL_VERSION_1_2_1
-#endif /* GL_VERSION_1_2_1 */
-#ifdef GL_VERSION_1_3
-  if (glewExperimental || GLEW_VERSION_1_3) CONST_CAST(GLEW_VERSION_1_3) = !_glewInit_GL_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_1_3 */
-#ifdef GL_VERSION_1_4
-  if (glewExperimental || GLEW_VERSION_1_4) CONST_CAST(GLEW_VERSION_1_4) = !_glewInit_GL_VERSION_1_4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_1_4 */
-#ifdef GL_VERSION_1_5
-  if (glewExperimental || GLEW_VERSION_1_5) CONST_CAST(GLEW_VERSION_1_5) = !_glewInit_GL_VERSION_1_5(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_1_5 */
-#ifdef GL_VERSION_2_0
-  if (glewExperimental || GLEW_VERSION_2_0) CONST_CAST(GLEW_VERSION_2_0) = !_glewInit_GL_VERSION_2_0(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_2_0 */
-#ifdef GL_VERSION_2_1
-  if (glewExperimental || GLEW_VERSION_2_1) CONST_CAST(GLEW_VERSION_2_1) = !_glewInit_GL_VERSION_2_1(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_2_1 */
-#ifdef GL_VERSION_3_0
-  if (glewExperimental || GLEW_VERSION_3_0) CONST_CAST(GLEW_VERSION_3_0) = !_glewInit_GL_VERSION_3_0(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_3_0 */
-#ifdef GL_VERSION_3_1
-  if (glewExperimental || GLEW_VERSION_3_1) CONST_CAST(GLEW_VERSION_3_1) = !_glewInit_GL_VERSION_3_1(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_3_1 */
-#ifdef GL_VERSION_3_2
-  if (glewExperimental || GLEW_VERSION_3_2) CONST_CAST(GLEW_VERSION_3_2) = !_glewInit_GL_VERSION_3_2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_3_2 */
-#ifdef GL_VERSION_3_3
-  if (glewExperimental || GLEW_VERSION_3_3) CONST_CAST(GLEW_VERSION_3_3) = !_glewInit_GL_VERSION_3_3(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_3_3 */
-#ifdef GL_VERSION_4_0
-  if (glewExperimental || GLEW_VERSION_4_0) CONST_CAST(GLEW_VERSION_4_0) = !_glewInit_GL_VERSION_4_0(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_VERSION_4_0 */
-#ifdef GL_VERSION_4_1
-#endif /* GL_VERSION_4_1 */
-#ifdef GL_VERSION_4_2
-#endif /* GL_VERSION_4_2 */
-#ifdef GL_VERSION_4_3
-#endif /* GL_VERSION_4_3 */
-#ifdef GL_3DFX_multisample
-  CONST_CAST(GLEW_3DFX_multisample) = _glewSearchExtension("GL_3DFX_multisample", extStart, extEnd);
-#endif /* GL_3DFX_multisample */
-#ifdef GL_3DFX_tbuffer
-  CONST_CAST(GLEW_3DFX_tbuffer) = _glewSearchExtension("GL_3DFX_tbuffer", extStart, extEnd);
-  if (glewExperimental || GLEW_3DFX_tbuffer) CONST_CAST(GLEW_3DFX_tbuffer) = !_glewInit_GL_3DFX_tbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_3DFX_tbuffer */
-#ifdef GL_3DFX_texture_compression_FXT1
-  CONST_CAST(GLEW_3DFX_texture_compression_FXT1) = _glewSearchExtension("GL_3DFX_texture_compression_FXT1", extStart, extEnd);
-#endif /* GL_3DFX_texture_compression_FXT1 */
-#ifdef GL_AMD_blend_minmax_factor
-  CONST_CAST(GLEW_AMD_blend_minmax_factor) = _glewSearchExtension("GL_AMD_blend_minmax_factor", extStart, extEnd);
-#endif /* GL_AMD_blend_minmax_factor */
-#ifdef GL_AMD_conservative_depth
-  CONST_CAST(GLEW_AMD_conservative_depth) = _glewSearchExtension("GL_AMD_conservative_depth", extStart, extEnd);
-#endif /* GL_AMD_conservative_depth */
-#ifdef GL_AMD_debug_output
-  CONST_CAST(GLEW_AMD_debug_output) = _glewSearchExtension("GL_AMD_debug_output", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_debug_output) CONST_CAST(GLEW_AMD_debug_output) = !_glewInit_GL_AMD_debug_output(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_debug_output */
-#ifdef GL_AMD_depth_clamp_separate
-  CONST_CAST(GLEW_AMD_depth_clamp_separate) = _glewSearchExtension("GL_AMD_depth_clamp_separate", extStart, extEnd);
-#endif /* GL_AMD_depth_clamp_separate */
-#ifdef GL_AMD_draw_buffers_blend
-  CONST_CAST(GLEW_AMD_draw_buffers_blend) = _glewSearchExtension("GL_AMD_draw_buffers_blend", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_draw_buffers_blend) CONST_CAST(GLEW_AMD_draw_buffers_blend) = !_glewInit_GL_AMD_draw_buffers_blend(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_draw_buffers_blend */
-#ifdef GL_AMD_multi_draw_indirect
-  CONST_CAST(GLEW_AMD_multi_draw_indirect) = _glewSearchExtension("GL_AMD_multi_draw_indirect", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_multi_draw_indirect) CONST_CAST(GLEW_AMD_multi_draw_indirect) = !_glewInit_GL_AMD_multi_draw_indirect(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_multi_draw_indirect */
-#ifdef GL_AMD_name_gen_delete
-  CONST_CAST(GLEW_AMD_name_gen_delete) = _glewSearchExtension("GL_AMD_name_gen_delete", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_name_gen_delete) CONST_CAST(GLEW_AMD_name_gen_delete) = !_glewInit_GL_AMD_name_gen_delete(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_name_gen_delete */
-#ifdef GL_AMD_performance_monitor
-  CONST_CAST(GLEW_AMD_performance_monitor) = _glewSearchExtension("GL_AMD_performance_monitor", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_performance_monitor) CONST_CAST(GLEW_AMD_performance_monitor) = !_glewInit_GL_AMD_performance_monitor(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_performance_monitor */
-#ifdef GL_AMD_pinned_memory
-  CONST_CAST(GLEW_AMD_pinned_memory) = _glewSearchExtension("GL_AMD_pinned_memory", extStart, extEnd);
-#endif /* GL_AMD_pinned_memory */
-#ifdef GL_AMD_query_buffer_object
-  CONST_CAST(GLEW_AMD_query_buffer_object) = _glewSearchExtension("GL_AMD_query_buffer_object", extStart, extEnd);
-#endif /* GL_AMD_query_buffer_object */
-#ifdef GL_AMD_sample_positions
-  CONST_CAST(GLEW_AMD_sample_positions) = _glewSearchExtension("GL_AMD_sample_positions", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_sample_positions) CONST_CAST(GLEW_AMD_sample_positions) = !_glewInit_GL_AMD_sample_positions(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_sample_positions */
-#ifdef GL_AMD_seamless_cubemap_per_texture
-  CONST_CAST(GLEW_AMD_seamless_cubemap_per_texture) = _glewSearchExtension("GL_AMD_seamless_cubemap_per_texture", extStart, extEnd);
-#endif /* GL_AMD_seamless_cubemap_per_texture */
-#ifdef GL_AMD_shader_stencil_export
-  CONST_CAST(GLEW_AMD_shader_stencil_export) = _glewSearchExtension("GL_AMD_shader_stencil_export", extStart, extEnd);
-#endif /* GL_AMD_shader_stencil_export */
-#ifdef GL_AMD_stencil_operation_extended
-  CONST_CAST(GLEW_AMD_stencil_operation_extended) = _glewSearchExtension("GL_AMD_stencil_operation_extended", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_stencil_operation_extended) CONST_CAST(GLEW_AMD_stencil_operation_extended) = !_glewInit_GL_AMD_stencil_operation_extended(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_stencil_operation_extended */
-#ifdef GL_AMD_texture_texture4
-  CONST_CAST(GLEW_AMD_texture_texture4) = _glewSearchExtension("GL_AMD_texture_texture4", extStart, extEnd);
-#endif /* GL_AMD_texture_texture4 */
-#ifdef GL_AMD_transform_feedback3_lines_triangles
-  CONST_CAST(GLEW_AMD_transform_feedback3_lines_triangles) = _glewSearchExtension("GL_AMD_transform_feedback3_lines_triangles", extStart, extEnd);
-#endif /* GL_AMD_transform_feedback3_lines_triangles */
-#ifdef GL_AMD_vertex_shader_layer
-  CONST_CAST(GLEW_AMD_vertex_shader_layer) = _glewSearchExtension("GL_AMD_vertex_shader_layer", extStart, extEnd);
-#endif /* GL_AMD_vertex_shader_layer */
-#ifdef GL_AMD_vertex_shader_tessellator
-  CONST_CAST(GLEW_AMD_vertex_shader_tessellator) = _glewSearchExtension("GL_AMD_vertex_shader_tessellator", extStart, extEnd);
-  if (glewExperimental || GLEW_AMD_vertex_shader_tessellator) CONST_CAST(GLEW_AMD_vertex_shader_tessellator) = !_glewInit_GL_AMD_vertex_shader_tessellator(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_AMD_vertex_shader_tessellator */
-#ifdef GL_AMD_vertex_shader_viewport_index
-  CONST_CAST(GLEW_AMD_vertex_shader_viewport_index) = _glewSearchExtension("GL_AMD_vertex_shader_viewport_index", extStart, extEnd);
-#endif /* GL_AMD_vertex_shader_viewport_index */
-#ifdef GL_APPLE_aux_depth_stencil
-  CONST_CAST(GLEW_APPLE_aux_depth_stencil) = _glewSearchExtension("GL_APPLE_aux_depth_stencil", extStart, extEnd);
-#endif /* GL_APPLE_aux_depth_stencil */
-#ifdef GL_APPLE_client_storage
-  CONST_CAST(GLEW_APPLE_client_storage) = _glewSearchExtension("GL_APPLE_client_storage", extStart, extEnd);
-#endif /* GL_APPLE_client_storage */
-#ifdef GL_APPLE_element_array
-  CONST_CAST(GLEW_APPLE_element_array) = _glewSearchExtension("GL_APPLE_element_array", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_element_array) CONST_CAST(GLEW_APPLE_element_array) = !_glewInit_GL_APPLE_element_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_element_array */
-#ifdef GL_APPLE_fence
-  CONST_CAST(GLEW_APPLE_fence) = _glewSearchExtension("GL_APPLE_fence", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_fence) CONST_CAST(GLEW_APPLE_fence) = !_glewInit_GL_APPLE_fence(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_fence */
-#ifdef GL_APPLE_float_pixels
-  CONST_CAST(GLEW_APPLE_float_pixels) = _glewSearchExtension("GL_APPLE_float_pixels", extStart, extEnd);
-#endif /* GL_APPLE_float_pixels */
-#ifdef GL_APPLE_flush_buffer_range
-  CONST_CAST(GLEW_APPLE_flush_buffer_range) = _glewSearchExtension("GL_APPLE_flush_buffer_range", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_flush_buffer_range) CONST_CAST(GLEW_APPLE_flush_buffer_range) = !_glewInit_GL_APPLE_flush_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_flush_buffer_range */
-#ifdef GL_APPLE_object_purgeable
-  CONST_CAST(GLEW_APPLE_object_purgeable) = _glewSearchExtension("GL_APPLE_object_purgeable", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_object_purgeable) CONST_CAST(GLEW_APPLE_object_purgeable) = !_glewInit_GL_APPLE_object_purgeable(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_object_purgeable */
-#ifdef GL_APPLE_pixel_buffer
-  CONST_CAST(GLEW_APPLE_pixel_buffer) = _glewSearchExtension("GL_APPLE_pixel_buffer", extStart, extEnd);
-#endif /* GL_APPLE_pixel_buffer */
-#ifdef GL_APPLE_rgb_422
-  CONST_CAST(GLEW_APPLE_rgb_422) = _glewSearchExtension("GL_APPLE_rgb_422", extStart, extEnd);
-#endif /* GL_APPLE_rgb_422 */
-#ifdef GL_APPLE_row_bytes
-  CONST_CAST(GLEW_APPLE_row_bytes) = _glewSearchExtension("GL_APPLE_row_bytes", extStart, extEnd);
-#endif /* GL_APPLE_row_bytes */
-#ifdef GL_APPLE_specular_vector
-  CONST_CAST(GLEW_APPLE_specular_vector) = _glewSearchExtension("GL_APPLE_specular_vector", extStart, extEnd);
-#endif /* GL_APPLE_specular_vector */
-#ifdef GL_APPLE_texture_range
-  CONST_CAST(GLEW_APPLE_texture_range) = _glewSearchExtension("GL_APPLE_texture_range", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_texture_range) CONST_CAST(GLEW_APPLE_texture_range) = !_glewInit_GL_APPLE_texture_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_texture_range */
-#ifdef GL_APPLE_transform_hint
-  CONST_CAST(GLEW_APPLE_transform_hint) = _glewSearchExtension("GL_APPLE_transform_hint", extStart, extEnd);
-#endif /* GL_APPLE_transform_hint */
-#ifdef GL_APPLE_vertex_array_object
-  CONST_CAST(GLEW_APPLE_vertex_array_object) = _glewSearchExtension("GL_APPLE_vertex_array_object", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_vertex_array_object) CONST_CAST(GLEW_APPLE_vertex_array_object) = !_glewInit_GL_APPLE_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_vertex_array_object */
-#ifdef GL_APPLE_vertex_array_range
-  CONST_CAST(GLEW_APPLE_vertex_array_range) = _glewSearchExtension("GL_APPLE_vertex_array_range", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_vertex_array_range) CONST_CAST(GLEW_APPLE_vertex_array_range) = !_glewInit_GL_APPLE_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_vertex_array_range */
-#ifdef GL_APPLE_vertex_program_evaluators
-  CONST_CAST(GLEW_APPLE_vertex_program_evaluators) = _glewSearchExtension("GL_APPLE_vertex_program_evaluators", extStart, extEnd);
-  if (glewExperimental || GLEW_APPLE_vertex_program_evaluators) CONST_CAST(GLEW_APPLE_vertex_program_evaluators) = !_glewInit_GL_APPLE_vertex_program_evaluators(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_APPLE_vertex_program_evaluators */
-#ifdef GL_APPLE_ycbcr_422
-  CONST_CAST(GLEW_APPLE_ycbcr_422) = _glewSearchExtension("GL_APPLE_ycbcr_422", extStart, extEnd);
-#endif /* GL_APPLE_ycbcr_422 */
-#ifdef GL_ARB_ES2_compatibility
-  CONST_CAST(GLEW_ARB_ES2_compatibility) = _glewSearchExtension("GL_ARB_ES2_compatibility", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_ES2_compatibility) CONST_CAST(GLEW_ARB_ES2_compatibility) = !_glewInit_GL_ARB_ES2_compatibility(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_ES2_compatibility */
-#ifdef GL_ARB_ES3_compatibility
-  CONST_CAST(GLEW_ARB_ES3_compatibility) = _glewSearchExtension("GL_ARB_ES3_compatibility", extStart, extEnd);
-#endif /* GL_ARB_ES3_compatibility */
-#ifdef GL_ARB_arrays_of_arrays
-  CONST_CAST(GLEW_ARB_arrays_of_arrays) = _glewSearchExtension("GL_ARB_arrays_of_arrays", extStart, extEnd);
-#endif /* GL_ARB_arrays_of_arrays */
-#ifdef GL_ARB_base_instance
-  CONST_CAST(GLEW_ARB_base_instance) = _glewSearchExtension("GL_ARB_base_instance", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_base_instance) CONST_CAST(GLEW_ARB_base_instance) = !_glewInit_GL_ARB_base_instance(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_base_instance */
-#ifdef GL_ARB_blend_func_extended
-  CONST_CAST(GLEW_ARB_blend_func_extended) = _glewSearchExtension("GL_ARB_blend_func_extended", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_blend_func_extended) CONST_CAST(GLEW_ARB_blend_func_extended) = !_glewInit_GL_ARB_blend_func_extended(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_blend_func_extended */
-#ifdef GL_ARB_cl_event
-  CONST_CAST(GLEW_ARB_cl_event) = _glewSearchExtension("GL_ARB_cl_event", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_cl_event) CONST_CAST(GLEW_ARB_cl_event) = !_glewInit_GL_ARB_cl_event(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_cl_event */
-#ifdef GL_ARB_clear_buffer_object
-  CONST_CAST(GLEW_ARB_clear_buffer_object) = _glewSearchExtension("GL_ARB_clear_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_clear_buffer_object) CONST_CAST(GLEW_ARB_clear_buffer_object) = !_glewInit_GL_ARB_clear_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_clear_buffer_object */
-#ifdef GL_ARB_color_buffer_float
-  CONST_CAST(GLEW_ARB_color_buffer_float) = _glewSearchExtension("GL_ARB_color_buffer_float", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_color_buffer_float) CONST_CAST(GLEW_ARB_color_buffer_float) = !_glewInit_GL_ARB_color_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_color_buffer_float */
-#ifdef GL_ARB_compatibility
-  CONST_CAST(GLEW_ARB_compatibility) = _glewSearchExtension("GL_ARB_compatibility", extStart, extEnd);
-#endif /* GL_ARB_compatibility */
-#ifdef GL_ARB_compressed_texture_pixel_storage
-  CONST_CAST(GLEW_ARB_compressed_texture_pixel_storage) = _glewSearchExtension("GL_ARB_compressed_texture_pixel_storage", extStart, extEnd);
-#endif /* GL_ARB_compressed_texture_pixel_storage */
-#ifdef GL_ARB_compute_shader
-  CONST_CAST(GLEW_ARB_compute_shader) = _glewSearchExtension("GL_ARB_compute_shader", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_compute_shader) CONST_CAST(GLEW_ARB_compute_shader) = !_glewInit_GL_ARB_compute_shader(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_compute_shader */
-#ifdef GL_ARB_conservative_depth
-  CONST_CAST(GLEW_ARB_conservative_depth) = _glewSearchExtension("GL_ARB_conservative_depth", extStart, extEnd);
-#endif /* GL_ARB_conservative_depth */
-#ifdef GL_ARB_copy_buffer
-  CONST_CAST(GLEW_ARB_copy_buffer) = _glewSearchExtension("GL_ARB_copy_buffer", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_copy_buffer) CONST_CAST(GLEW_ARB_copy_buffer) = !_glewInit_GL_ARB_copy_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_copy_buffer */
-#ifdef GL_ARB_copy_image
-  CONST_CAST(GLEW_ARB_copy_image) = _glewSearchExtension("GL_ARB_copy_image", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_copy_image) CONST_CAST(GLEW_ARB_copy_image) = !_glewInit_GL_ARB_copy_image(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_copy_image */
-#ifdef GL_ARB_debug_output
-  CONST_CAST(GLEW_ARB_debug_output) = _glewSearchExtension("GL_ARB_debug_output", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_debug_output) CONST_CAST(GLEW_ARB_debug_output) = !_glewInit_GL_ARB_debug_output(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_debug_output */
-#ifdef GL_ARB_depth_buffer_float
-  CONST_CAST(GLEW_ARB_depth_buffer_float) = _glewSearchExtension("GL_ARB_depth_buffer_float", extStart, extEnd);
-#endif /* GL_ARB_depth_buffer_float */
-#ifdef GL_ARB_depth_clamp
-  CONST_CAST(GLEW_ARB_depth_clamp) = _glewSearchExtension("GL_ARB_depth_clamp", extStart, extEnd);
-#endif /* GL_ARB_depth_clamp */
-#ifdef GL_ARB_depth_texture
-  CONST_CAST(GLEW_ARB_depth_texture) = _glewSearchExtension("GL_ARB_depth_texture", extStart, extEnd);
-#endif /* GL_ARB_depth_texture */
-#ifdef GL_ARB_draw_buffers
-  CONST_CAST(GLEW_ARB_draw_buffers) = _glewSearchExtension("GL_ARB_draw_buffers", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_draw_buffers) CONST_CAST(GLEW_ARB_draw_buffers) = !_glewInit_GL_ARB_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_draw_buffers */
-#ifdef GL_ARB_draw_buffers_blend
-  CONST_CAST(GLEW_ARB_draw_buffers_blend) = _glewSearchExtension("GL_ARB_draw_buffers_blend", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_draw_buffers_blend) CONST_CAST(GLEW_ARB_draw_buffers_blend) = !_glewInit_GL_ARB_draw_buffers_blend(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_draw_buffers_blend */
-#ifdef GL_ARB_draw_elements_base_vertex
-  CONST_CAST(GLEW_ARB_draw_elements_base_vertex) = _glewSearchExtension("GL_ARB_draw_elements_base_vertex", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_draw_elements_base_vertex) CONST_CAST(GLEW_ARB_draw_elements_base_vertex) = !_glewInit_GL_ARB_draw_elements_base_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_draw_elements_base_vertex */
-#ifdef GL_ARB_draw_indirect
-  CONST_CAST(GLEW_ARB_draw_indirect) = _glewSearchExtension("GL_ARB_draw_indirect", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_draw_indirect) CONST_CAST(GLEW_ARB_draw_indirect) = !_glewInit_GL_ARB_draw_indirect(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_draw_indirect */
-#ifdef GL_ARB_draw_instanced
-  CONST_CAST(GLEW_ARB_draw_instanced) = _glewSearchExtension("GL_ARB_draw_instanced", extStart, extEnd);
-#endif /* GL_ARB_draw_instanced */
-#ifdef GL_ARB_explicit_attrib_location
-  CONST_CAST(GLEW_ARB_explicit_attrib_location) = _glewSearchExtension("GL_ARB_explicit_attrib_location", extStart, extEnd);
-#endif /* GL_ARB_explicit_attrib_location */
-#ifdef GL_ARB_explicit_uniform_location
-  CONST_CAST(GLEW_ARB_explicit_uniform_location) = _glewSearchExtension("GL_ARB_explicit_uniform_location", extStart, extEnd);
-#endif /* GL_ARB_explicit_uniform_location */
-#ifdef GL_ARB_fragment_coord_conventions
-  CONST_CAST(GLEW_ARB_fragment_coord_conventions) = _glewSearchExtension("GL_ARB_fragment_coord_conventions", extStart, extEnd);
-#endif /* GL_ARB_fragment_coord_conventions */
-#ifdef GL_ARB_fragment_layer_viewport
-  CONST_CAST(GLEW_ARB_fragment_layer_viewport) = _glewSearchExtension("GL_ARB_fragment_layer_viewport", extStart, extEnd);
-#endif /* GL_ARB_fragment_layer_viewport */
-#ifdef GL_ARB_fragment_program
-  CONST_CAST(GLEW_ARB_fragment_program) = _glewSearchExtension("GL_ARB_fragment_program", extStart, extEnd);
-#endif /* GL_ARB_fragment_program */
-#ifdef GL_ARB_fragment_program_shadow
-  CONST_CAST(GLEW_ARB_fragment_program_shadow) = _glewSearchExtension("GL_ARB_fragment_program_shadow", extStart, extEnd);
-#endif /* GL_ARB_fragment_program_shadow */
-#ifdef GL_ARB_fragment_shader
-  CONST_CAST(GLEW_ARB_fragment_shader) = _glewSearchExtension("GL_ARB_fragment_shader", extStart, extEnd);
-#endif /* GL_ARB_fragment_shader */
-#ifdef GL_ARB_framebuffer_no_attachments
-  CONST_CAST(GLEW_ARB_framebuffer_no_attachments) = _glewSearchExtension("GL_ARB_framebuffer_no_attachments", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_framebuffer_no_attachments) CONST_CAST(GLEW_ARB_framebuffer_no_attachments) = !_glewInit_GL_ARB_framebuffer_no_attachments(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_framebuffer_no_attachments */
-#ifdef GL_ARB_framebuffer_object
-  CONST_CAST(GLEW_ARB_framebuffer_object) = _glewSearchExtension("GL_ARB_framebuffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_framebuffer_object) CONST_CAST(GLEW_ARB_framebuffer_object) = !_glewInit_GL_ARB_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_framebuffer_object */
-#ifdef GL_ARB_framebuffer_sRGB
-  CONST_CAST(GLEW_ARB_framebuffer_sRGB) = _glewSearchExtension("GL_ARB_framebuffer_sRGB", extStart, extEnd);
-#endif /* GL_ARB_framebuffer_sRGB */
-#ifdef GL_ARB_geometry_shader4
-  CONST_CAST(GLEW_ARB_geometry_shader4) = _glewSearchExtension("GL_ARB_geometry_shader4", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_geometry_shader4) CONST_CAST(GLEW_ARB_geometry_shader4) = !_glewInit_GL_ARB_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_geometry_shader4 */
-#ifdef GL_ARB_get_program_binary
-  CONST_CAST(GLEW_ARB_get_program_binary) = _glewSearchExtension("GL_ARB_get_program_binary", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_get_program_binary) CONST_CAST(GLEW_ARB_get_program_binary) = !_glewInit_GL_ARB_get_program_binary(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_get_program_binary */
-#ifdef GL_ARB_gpu_shader5
-  CONST_CAST(GLEW_ARB_gpu_shader5) = _glewSearchExtension("GL_ARB_gpu_shader5", extStart, extEnd);
-#endif /* GL_ARB_gpu_shader5 */
-#ifdef GL_ARB_gpu_shader_fp64
-  CONST_CAST(GLEW_ARB_gpu_shader_fp64) = _glewSearchExtension("GL_ARB_gpu_shader_fp64", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_gpu_shader_fp64) CONST_CAST(GLEW_ARB_gpu_shader_fp64) = !_glewInit_GL_ARB_gpu_shader_fp64(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_gpu_shader_fp64 */
-#ifdef GL_ARB_half_float_pixel
-  CONST_CAST(GLEW_ARB_half_float_pixel) = _glewSearchExtension("GL_ARB_half_float_pixel", extStart, extEnd);
-#endif /* GL_ARB_half_float_pixel */
-#ifdef GL_ARB_half_float_vertex
-  CONST_CAST(GLEW_ARB_half_float_vertex) = _glewSearchExtension("GL_ARB_half_float_vertex", extStart, extEnd);
-#endif /* GL_ARB_half_float_vertex */
-#ifdef GL_ARB_imaging
-  CONST_CAST(GLEW_ARB_imaging) = _glewSearchExtension("GL_ARB_imaging", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_imaging) CONST_CAST(GLEW_ARB_imaging) = !_glewInit_GL_ARB_imaging(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_imaging */
-#ifdef GL_ARB_instanced_arrays
-  CONST_CAST(GLEW_ARB_instanced_arrays) = _glewSearchExtension("GL_ARB_instanced_arrays", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_instanced_arrays) CONST_CAST(GLEW_ARB_instanced_arrays) = !_glewInit_GL_ARB_instanced_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_instanced_arrays */
-#ifdef GL_ARB_internalformat_query
-  CONST_CAST(GLEW_ARB_internalformat_query) = _glewSearchExtension("GL_ARB_internalformat_query", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_internalformat_query) CONST_CAST(GLEW_ARB_internalformat_query) = !_glewInit_GL_ARB_internalformat_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_internalformat_query */
-#ifdef GL_ARB_internalformat_query2
-  CONST_CAST(GLEW_ARB_internalformat_query2) = _glewSearchExtension("GL_ARB_internalformat_query2", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_internalformat_query2) CONST_CAST(GLEW_ARB_internalformat_query2) = !_glewInit_GL_ARB_internalformat_query2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_internalformat_query2 */
-#ifdef GL_ARB_invalidate_subdata
-  CONST_CAST(GLEW_ARB_invalidate_subdata) = _glewSearchExtension("GL_ARB_invalidate_subdata", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_invalidate_subdata) CONST_CAST(GLEW_ARB_invalidate_subdata) = !_glewInit_GL_ARB_invalidate_subdata(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_invalidate_subdata */
-#ifdef GL_ARB_map_buffer_alignment
-  CONST_CAST(GLEW_ARB_map_buffer_alignment) = _glewSearchExtension("GL_ARB_map_buffer_alignment", extStart, extEnd);
-#endif /* GL_ARB_map_buffer_alignment */
-#ifdef GL_ARB_map_buffer_range
-  CONST_CAST(GLEW_ARB_map_buffer_range) = _glewSearchExtension("GL_ARB_map_buffer_range", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_map_buffer_range) CONST_CAST(GLEW_ARB_map_buffer_range) = !_glewInit_GL_ARB_map_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_map_buffer_range */
-#ifdef GL_ARB_matrix_palette
-  CONST_CAST(GLEW_ARB_matrix_palette) = _glewSearchExtension("GL_ARB_matrix_palette", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_matrix_palette) CONST_CAST(GLEW_ARB_matrix_palette) = !_glewInit_GL_ARB_matrix_palette(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_matrix_palette */
-#ifdef GL_ARB_multi_draw_indirect
-  CONST_CAST(GLEW_ARB_multi_draw_indirect) = _glewSearchExtension("GL_ARB_multi_draw_indirect", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_multi_draw_indirect) CONST_CAST(GLEW_ARB_multi_draw_indirect) = !_glewInit_GL_ARB_multi_draw_indirect(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_multi_draw_indirect */
-#ifdef GL_ARB_multisample
-  CONST_CAST(GLEW_ARB_multisample) = _glewSearchExtension("GL_ARB_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_multisample) CONST_CAST(GLEW_ARB_multisample) = !_glewInit_GL_ARB_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_multisample */
-#ifdef GL_ARB_multitexture
-  CONST_CAST(GLEW_ARB_multitexture) = _glewSearchExtension("GL_ARB_multitexture", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_multitexture) CONST_CAST(GLEW_ARB_multitexture) = !_glewInit_GL_ARB_multitexture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_multitexture */
-#ifdef GL_ARB_occlusion_query
-  CONST_CAST(GLEW_ARB_occlusion_query) = _glewSearchExtension("GL_ARB_occlusion_query", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_occlusion_query) CONST_CAST(GLEW_ARB_occlusion_query) = !_glewInit_GL_ARB_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_occlusion_query */
-#ifdef GL_ARB_occlusion_query2
-  CONST_CAST(GLEW_ARB_occlusion_query2) = _glewSearchExtension("GL_ARB_occlusion_query2", extStart, extEnd);
-#endif /* GL_ARB_occlusion_query2 */
-#ifdef GL_ARB_pixel_buffer_object
-  CONST_CAST(GLEW_ARB_pixel_buffer_object) = _glewSearchExtension("GL_ARB_pixel_buffer_object", extStart, extEnd);
-#endif /* GL_ARB_pixel_buffer_object */
-#ifdef GL_ARB_point_parameters
-  CONST_CAST(GLEW_ARB_point_parameters) = _glewSearchExtension("GL_ARB_point_parameters", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_point_parameters) CONST_CAST(GLEW_ARB_point_parameters) = !_glewInit_GL_ARB_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_point_parameters */
-#ifdef GL_ARB_point_sprite
-  CONST_CAST(GLEW_ARB_point_sprite) = _glewSearchExtension("GL_ARB_point_sprite", extStart, extEnd);
-#endif /* GL_ARB_point_sprite */
-#ifdef GL_ARB_program_interface_query
-  CONST_CAST(GLEW_ARB_program_interface_query) = _glewSearchExtension("GL_ARB_program_interface_query", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_program_interface_query) CONST_CAST(GLEW_ARB_program_interface_query) = !_glewInit_GL_ARB_program_interface_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_program_interface_query */
-#ifdef GL_ARB_provoking_vertex
-  CONST_CAST(GLEW_ARB_provoking_vertex) = _glewSearchExtension("GL_ARB_provoking_vertex", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_provoking_vertex) CONST_CAST(GLEW_ARB_provoking_vertex) = !_glewInit_GL_ARB_provoking_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_provoking_vertex */
-#ifdef GL_ARB_robust_buffer_access_behavior
-  CONST_CAST(GLEW_ARB_robust_buffer_access_behavior) = _glewSearchExtension("GL_ARB_robust_buffer_access_behavior", extStart, extEnd);
-#endif /* GL_ARB_robust_buffer_access_behavior */
-#ifdef GL_ARB_robustness
-  CONST_CAST(GLEW_ARB_robustness) = _glewSearchExtension("GL_ARB_robustness", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_robustness) CONST_CAST(GLEW_ARB_robustness) = !_glewInit_GL_ARB_robustness(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_robustness */
-#ifdef GL_ARB_robustness_application_isolation
-  CONST_CAST(GLEW_ARB_robustness_application_isolation) = _glewSearchExtension("GL_ARB_robustness_application_isolation", extStart, extEnd);
-#endif /* GL_ARB_robustness_application_isolation */
-#ifdef GL_ARB_robustness_share_group_isolation
-  CONST_CAST(GLEW_ARB_robustness_share_group_isolation) = _glewSearchExtension("GL_ARB_robustness_share_group_isolation", extStart, extEnd);
-#endif /* GL_ARB_robustness_share_group_isolation */
-#ifdef GL_ARB_sample_shading
-  CONST_CAST(GLEW_ARB_sample_shading) = _glewSearchExtension("GL_ARB_sample_shading", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_sample_shading) CONST_CAST(GLEW_ARB_sample_shading) = !_glewInit_GL_ARB_sample_shading(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_sample_shading */
-#ifdef GL_ARB_sampler_objects
-  CONST_CAST(GLEW_ARB_sampler_objects) = _glewSearchExtension("GL_ARB_sampler_objects", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_sampler_objects) CONST_CAST(GLEW_ARB_sampler_objects) = !_glewInit_GL_ARB_sampler_objects(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_sampler_objects */
-#ifdef GL_ARB_seamless_cube_map
-  CONST_CAST(GLEW_ARB_seamless_cube_map) = _glewSearchExtension("GL_ARB_seamless_cube_map", extStart, extEnd);
-#endif /* GL_ARB_seamless_cube_map */
-#ifdef GL_ARB_separate_shader_objects
-  CONST_CAST(GLEW_ARB_separate_shader_objects) = _glewSearchExtension("GL_ARB_separate_shader_objects", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_separate_shader_objects) CONST_CAST(GLEW_ARB_separate_shader_objects) = !_glewInit_GL_ARB_separate_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_separate_shader_objects */
-#ifdef GL_ARB_shader_atomic_counters
-  CONST_CAST(GLEW_ARB_shader_atomic_counters) = _glewSearchExtension("GL_ARB_shader_atomic_counters", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shader_atomic_counters) CONST_CAST(GLEW_ARB_shader_atomic_counters) = !_glewInit_GL_ARB_shader_atomic_counters(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shader_atomic_counters */
-#ifdef GL_ARB_shader_bit_encoding
-  CONST_CAST(GLEW_ARB_shader_bit_encoding) = _glewSearchExtension("GL_ARB_shader_bit_encoding", extStart, extEnd);
-#endif /* GL_ARB_shader_bit_encoding */
-#ifdef GL_ARB_shader_image_load_store
-  CONST_CAST(GLEW_ARB_shader_image_load_store) = _glewSearchExtension("GL_ARB_shader_image_load_store", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shader_image_load_store) CONST_CAST(GLEW_ARB_shader_image_load_store) = !_glewInit_GL_ARB_shader_image_load_store(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shader_image_load_store */
-#ifdef GL_ARB_shader_image_size
-  CONST_CAST(GLEW_ARB_shader_image_size) = _glewSearchExtension("GL_ARB_shader_image_size", extStart, extEnd);
-#endif /* GL_ARB_shader_image_size */
-#ifdef GL_ARB_shader_objects
-  CONST_CAST(GLEW_ARB_shader_objects) = _glewSearchExtension("GL_ARB_shader_objects", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shader_objects) CONST_CAST(GLEW_ARB_shader_objects) = !_glewInit_GL_ARB_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shader_objects */
-#ifdef GL_ARB_shader_precision
-  CONST_CAST(GLEW_ARB_shader_precision) = _glewSearchExtension("GL_ARB_shader_precision", extStart, extEnd);
-#endif /* GL_ARB_shader_precision */
-#ifdef GL_ARB_shader_stencil_export
-  CONST_CAST(GLEW_ARB_shader_stencil_export) = _glewSearchExtension("GL_ARB_shader_stencil_export", extStart, extEnd);
-#endif /* GL_ARB_shader_stencil_export */
-#ifdef GL_ARB_shader_storage_buffer_object
-  CONST_CAST(GLEW_ARB_shader_storage_buffer_object) = _glewSearchExtension("GL_ARB_shader_storage_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shader_storage_buffer_object) CONST_CAST(GLEW_ARB_shader_storage_buffer_object) = !_glewInit_GL_ARB_shader_storage_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shader_storage_buffer_object */
-#ifdef GL_ARB_shader_subroutine
-  CONST_CAST(GLEW_ARB_shader_subroutine) = _glewSearchExtension("GL_ARB_shader_subroutine", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shader_subroutine) CONST_CAST(GLEW_ARB_shader_subroutine) = !_glewInit_GL_ARB_shader_subroutine(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shader_subroutine */
-#ifdef GL_ARB_shader_texture_lod
-  CONST_CAST(GLEW_ARB_shader_texture_lod) = _glewSearchExtension("GL_ARB_shader_texture_lod", extStart, extEnd);
-#endif /* GL_ARB_shader_texture_lod */
-#ifdef GL_ARB_shading_language_100
-  CONST_CAST(GLEW_ARB_shading_language_100) = _glewSearchExtension("GL_ARB_shading_language_100", extStart, extEnd);
-#endif /* GL_ARB_shading_language_100 */
-#ifdef GL_ARB_shading_language_420pack
-  CONST_CAST(GLEW_ARB_shading_language_420pack) = _glewSearchExtension("GL_ARB_shading_language_420pack", extStart, extEnd);
-#endif /* GL_ARB_shading_language_420pack */
-#ifdef GL_ARB_shading_language_include
-  CONST_CAST(GLEW_ARB_shading_language_include) = _glewSearchExtension("GL_ARB_shading_language_include", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_shading_language_include) CONST_CAST(GLEW_ARB_shading_language_include) = !_glewInit_GL_ARB_shading_language_include(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_shading_language_include */
-#ifdef GL_ARB_shading_language_packing
-  CONST_CAST(GLEW_ARB_shading_language_packing) = _glewSearchExtension("GL_ARB_shading_language_packing", extStart, extEnd);
-#endif /* GL_ARB_shading_language_packing */
-#ifdef GL_ARB_shadow
-  CONST_CAST(GLEW_ARB_shadow) = _glewSearchExtension("GL_ARB_shadow", extStart, extEnd);
-#endif /* GL_ARB_shadow */
-#ifdef GL_ARB_shadow_ambient
-  CONST_CAST(GLEW_ARB_shadow_ambient) = _glewSearchExtension("GL_ARB_shadow_ambient", extStart, extEnd);
-#endif /* GL_ARB_shadow_ambient */
-#ifdef GL_ARB_stencil_texturing
-  CONST_CAST(GLEW_ARB_stencil_texturing) = _glewSearchExtension("GL_ARB_stencil_texturing", extStart, extEnd);
-#endif /* GL_ARB_stencil_texturing */
-#ifdef GL_ARB_sync
-  CONST_CAST(GLEW_ARB_sync) = _glewSearchExtension("GL_ARB_sync", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_sync) CONST_CAST(GLEW_ARB_sync) = !_glewInit_GL_ARB_sync(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_sync */
-#ifdef GL_ARB_tessellation_shader
-  CONST_CAST(GLEW_ARB_tessellation_shader) = _glewSearchExtension("GL_ARB_tessellation_shader", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_tessellation_shader) CONST_CAST(GLEW_ARB_tessellation_shader) = !_glewInit_GL_ARB_tessellation_shader(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_tessellation_shader */
-#ifdef GL_ARB_texture_border_clamp
-  CONST_CAST(GLEW_ARB_texture_border_clamp) = _glewSearchExtension("GL_ARB_texture_border_clamp", extStart, extEnd);
-#endif /* GL_ARB_texture_border_clamp */
-#ifdef GL_ARB_texture_buffer_object
-  CONST_CAST(GLEW_ARB_texture_buffer_object) = _glewSearchExtension("GL_ARB_texture_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_buffer_object) CONST_CAST(GLEW_ARB_texture_buffer_object) = !_glewInit_GL_ARB_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_buffer_object */
-#ifdef GL_ARB_texture_buffer_object_rgb32
-  CONST_CAST(GLEW_ARB_texture_buffer_object_rgb32) = _glewSearchExtension("GL_ARB_texture_buffer_object_rgb32", extStart, extEnd);
-#endif /* GL_ARB_texture_buffer_object_rgb32 */
-#ifdef GL_ARB_texture_buffer_range
-  CONST_CAST(GLEW_ARB_texture_buffer_range) = _glewSearchExtension("GL_ARB_texture_buffer_range", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_buffer_range) CONST_CAST(GLEW_ARB_texture_buffer_range) = !_glewInit_GL_ARB_texture_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_buffer_range */
-#ifdef GL_ARB_texture_compression
-  CONST_CAST(GLEW_ARB_texture_compression) = _glewSearchExtension("GL_ARB_texture_compression", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_compression) CONST_CAST(GLEW_ARB_texture_compression) = !_glewInit_GL_ARB_texture_compression(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_compression */
-#ifdef GL_ARB_texture_compression_bptc
-  CONST_CAST(GLEW_ARB_texture_compression_bptc) = _glewSearchExtension("GL_ARB_texture_compression_bptc", extStart, extEnd);
-#endif /* GL_ARB_texture_compression_bptc */
-#ifdef GL_ARB_texture_compression_rgtc
-  CONST_CAST(GLEW_ARB_texture_compression_rgtc) = _glewSearchExtension("GL_ARB_texture_compression_rgtc", extStart, extEnd);
-#endif /* GL_ARB_texture_compression_rgtc */
-#ifdef GL_ARB_texture_cube_map
-  CONST_CAST(GLEW_ARB_texture_cube_map) = _glewSearchExtension("GL_ARB_texture_cube_map", extStart, extEnd);
-#endif /* GL_ARB_texture_cube_map */
-#ifdef GL_ARB_texture_cube_map_array
-  CONST_CAST(GLEW_ARB_texture_cube_map_array) = _glewSearchExtension("GL_ARB_texture_cube_map_array", extStart, extEnd);
-#endif /* GL_ARB_texture_cube_map_array */
-#ifdef GL_ARB_texture_env_add
-  CONST_CAST(GLEW_ARB_texture_env_add) = _glewSearchExtension("GL_ARB_texture_env_add", extStart, extEnd);
-#endif /* GL_ARB_texture_env_add */
-#ifdef GL_ARB_texture_env_combine
-  CONST_CAST(GLEW_ARB_texture_env_combine) = _glewSearchExtension("GL_ARB_texture_env_combine", extStart, extEnd);
-#endif /* GL_ARB_texture_env_combine */
-#ifdef GL_ARB_texture_env_crossbar
-  CONST_CAST(GLEW_ARB_texture_env_crossbar) = _glewSearchExtension("GL_ARB_texture_env_crossbar", extStart, extEnd);
-#endif /* GL_ARB_texture_env_crossbar */
-#ifdef GL_ARB_texture_env_dot3
-  CONST_CAST(GLEW_ARB_texture_env_dot3) = _glewSearchExtension("GL_ARB_texture_env_dot3", extStart, extEnd);
-#endif /* GL_ARB_texture_env_dot3 */
-#ifdef GL_ARB_texture_float
-  CONST_CAST(GLEW_ARB_texture_float) = _glewSearchExtension("GL_ARB_texture_float", extStart, extEnd);
-#endif /* GL_ARB_texture_float */
-#ifdef GL_ARB_texture_gather
-  CONST_CAST(GLEW_ARB_texture_gather) = _glewSearchExtension("GL_ARB_texture_gather", extStart, extEnd);
-#endif /* GL_ARB_texture_gather */
-#ifdef GL_ARB_texture_mirrored_repeat
-  CONST_CAST(GLEW_ARB_texture_mirrored_repeat) = _glewSearchExtension("GL_ARB_texture_mirrored_repeat", extStart, extEnd);
-#endif /* GL_ARB_texture_mirrored_repeat */
-#ifdef GL_ARB_texture_multisample
-  CONST_CAST(GLEW_ARB_texture_multisample) = _glewSearchExtension("GL_ARB_texture_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_multisample) CONST_CAST(GLEW_ARB_texture_multisample) = !_glewInit_GL_ARB_texture_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_multisample */
-#ifdef GL_ARB_texture_non_power_of_two
-  CONST_CAST(GLEW_ARB_texture_non_power_of_two) = _glewSearchExtension("GL_ARB_texture_non_power_of_two", extStart, extEnd);
-#endif /* GL_ARB_texture_non_power_of_two */
-#ifdef GL_ARB_texture_query_levels
-  CONST_CAST(GLEW_ARB_texture_query_levels) = _glewSearchExtension("GL_ARB_texture_query_levels", extStart, extEnd);
-#endif /* GL_ARB_texture_query_levels */
-#ifdef GL_ARB_texture_query_lod
-  CONST_CAST(GLEW_ARB_texture_query_lod) = _glewSearchExtension("GL_ARB_texture_query_lod", extStart, extEnd);
-#endif /* GL_ARB_texture_query_lod */
-#ifdef GL_ARB_texture_rectangle
-  CONST_CAST(GLEW_ARB_texture_rectangle) = _glewSearchExtension("GL_ARB_texture_rectangle", extStart, extEnd);
-#endif /* GL_ARB_texture_rectangle */
-#ifdef GL_ARB_texture_rg
-  CONST_CAST(GLEW_ARB_texture_rg) = _glewSearchExtension("GL_ARB_texture_rg", extStart, extEnd);
-#endif /* GL_ARB_texture_rg */
-#ifdef GL_ARB_texture_rgb10_a2ui
-  CONST_CAST(GLEW_ARB_texture_rgb10_a2ui) = _glewSearchExtension("GL_ARB_texture_rgb10_a2ui", extStart, extEnd);
-#endif /* GL_ARB_texture_rgb10_a2ui */
-#ifdef GL_ARB_texture_storage
-  CONST_CAST(GLEW_ARB_texture_storage) = _glewSearchExtension("GL_ARB_texture_storage", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_storage) CONST_CAST(GLEW_ARB_texture_storage) = !_glewInit_GL_ARB_texture_storage(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_storage */
-#ifdef GL_ARB_texture_storage_multisample
-  CONST_CAST(GLEW_ARB_texture_storage_multisample) = _glewSearchExtension("GL_ARB_texture_storage_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_storage_multisample) CONST_CAST(GLEW_ARB_texture_storage_multisample) = !_glewInit_GL_ARB_texture_storage_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_storage_multisample */
-#ifdef GL_ARB_texture_swizzle
-  CONST_CAST(GLEW_ARB_texture_swizzle) = _glewSearchExtension("GL_ARB_texture_swizzle", extStart, extEnd);
-#endif /* GL_ARB_texture_swizzle */
-#ifdef GL_ARB_texture_view
-  CONST_CAST(GLEW_ARB_texture_view) = _glewSearchExtension("GL_ARB_texture_view", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_texture_view) CONST_CAST(GLEW_ARB_texture_view) = !_glewInit_GL_ARB_texture_view(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_texture_view */
-#ifdef GL_ARB_timer_query
-  CONST_CAST(GLEW_ARB_timer_query) = _glewSearchExtension("GL_ARB_timer_query", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_timer_query) CONST_CAST(GLEW_ARB_timer_query) = !_glewInit_GL_ARB_timer_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_timer_query */
-#ifdef GL_ARB_transform_feedback2
-  CONST_CAST(GLEW_ARB_transform_feedback2) = _glewSearchExtension("GL_ARB_transform_feedback2", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_transform_feedback2) CONST_CAST(GLEW_ARB_transform_feedback2) = !_glewInit_GL_ARB_transform_feedback2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_transform_feedback2 */
-#ifdef GL_ARB_transform_feedback3
-  CONST_CAST(GLEW_ARB_transform_feedback3) = _glewSearchExtension("GL_ARB_transform_feedback3", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_transform_feedback3) CONST_CAST(GLEW_ARB_transform_feedback3) = !_glewInit_GL_ARB_transform_feedback3(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_transform_feedback3 */
-#ifdef GL_ARB_transform_feedback_instanced
-  CONST_CAST(GLEW_ARB_transform_feedback_instanced) = _glewSearchExtension("GL_ARB_transform_feedback_instanced", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_transform_feedback_instanced) CONST_CAST(GLEW_ARB_transform_feedback_instanced) = !_glewInit_GL_ARB_transform_feedback_instanced(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_transform_feedback_instanced */
-#ifdef GL_ARB_transpose_matrix
-  CONST_CAST(GLEW_ARB_transpose_matrix) = _glewSearchExtension("GL_ARB_transpose_matrix", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_transpose_matrix) CONST_CAST(GLEW_ARB_transpose_matrix) = !_glewInit_GL_ARB_transpose_matrix(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_transpose_matrix */
-#ifdef GL_ARB_uniform_buffer_object
-  CONST_CAST(GLEW_ARB_uniform_buffer_object) = _glewSearchExtension("GL_ARB_uniform_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_uniform_buffer_object) CONST_CAST(GLEW_ARB_uniform_buffer_object) = !_glewInit_GL_ARB_uniform_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_uniform_buffer_object */
-#ifdef GL_ARB_vertex_array_bgra
-  CONST_CAST(GLEW_ARB_vertex_array_bgra) = _glewSearchExtension("GL_ARB_vertex_array_bgra", extStart, extEnd);
-#endif /* GL_ARB_vertex_array_bgra */
-#ifdef GL_ARB_vertex_array_object
-  CONST_CAST(GLEW_ARB_vertex_array_object) = _glewSearchExtension("GL_ARB_vertex_array_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_array_object) CONST_CAST(GLEW_ARB_vertex_array_object) = !_glewInit_GL_ARB_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_array_object */
-#ifdef GL_ARB_vertex_attrib_64bit
-  CONST_CAST(GLEW_ARB_vertex_attrib_64bit) = _glewSearchExtension("GL_ARB_vertex_attrib_64bit", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_attrib_64bit) CONST_CAST(GLEW_ARB_vertex_attrib_64bit) = !_glewInit_GL_ARB_vertex_attrib_64bit(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_attrib_64bit */
-#ifdef GL_ARB_vertex_attrib_binding
-  CONST_CAST(GLEW_ARB_vertex_attrib_binding) = _glewSearchExtension("GL_ARB_vertex_attrib_binding", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_attrib_binding) CONST_CAST(GLEW_ARB_vertex_attrib_binding) = !_glewInit_GL_ARB_vertex_attrib_binding(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_attrib_binding */
-#ifdef GL_ARB_vertex_blend
-  CONST_CAST(GLEW_ARB_vertex_blend) = _glewSearchExtension("GL_ARB_vertex_blend", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_blend) CONST_CAST(GLEW_ARB_vertex_blend) = !_glewInit_GL_ARB_vertex_blend(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_blend */
-#ifdef GL_ARB_vertex_buffer_object
-  CONST_CAST(GLEW_ARB_vertex_buffer_object) = _glewSearchExtension("GL_ARB_vertex_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_buffer_object) CONST_CAST(GLEW_ARB_vertex_buffer_object) = !_glewInit_GL_ARB_vertex_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_buffer_object */
-#ifdef GL_ARB_vertex_program
-  CONST_CAST(GLEW_ARB_vertex_program) = _glewSearchExtension("GL_ARB_vertex_program", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_program) CONST_CAST(GLEW_ARB_vertex_program) = !_glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_program */
-#ifdef GL_ARB_vertex_shader
-  CONST_CAST(GLEW_ARB_vertex_shader) = _glewSearchExtension("GL_ARB_vertex_shader", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_shader) CONST_CAST(GLEW_ARB_vertex_shader) = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_shader */
-#ifdef GL_ARB_vertex_type_2_10_10_10_rev
-  CONST_CAST(GLEW_ARB_vertex_type_2_10_10_10_rev) = _glewSearchExtension("GL_ARB_vertex_type_2_10_10_10_rev", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_vertex_type_2_10_10_10_rev) CONST_CAST(GLEW_ARB_vertex_type_2_10_10_10_rev) = !_glewInit_GL_ARB_vertex_type_2_10_10_10_rev(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
-#ifdef GL_ARB_viewport_array
-  CONST_CAST(GLEW_ARB_viewport_array) = _glewSearchExtension("GL_ARB_viewport_array", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_viewport_array) CONST_CAST(GLEW_ARB_viewport_array) = !_glewInit_GL_ARB_viewport_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_viewport_array */
-#ifdef GL_ARB_window_pos
-  CONST_CAST(GLEW_ARB_window_pos) = _glewSearchExtension("GL_ARB_window_pos", extStart, extEnd);
-  if (glewExperimental || GLEW_ARB_window_pos) CONST_CAST(GLEW_ARB_window_pos) = !_glewInit_GL_ARB_window_pos(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ARB_window_pos */
-#ifdef GL_ATIX_point_sprites
-  CONST_CAST(GLEW_ATIX_point_sprites) = _glewSearchExtension("GL_ATIX_point_sprites", extStart, extEnd);
-#endif /* GL_ATIX_point_sprites */
-#ifdef GL_ATIX_texture_env_combine3
-  CONST_CAST(GLEW_ATIX_texture_env_combine3) = _glewSearchExtension("GL_ATIX_texture_env_combine3", extStart, extEnd);
-#endif /* GL_ATIX_texture_env_combine3 */
-#ifdef GL_ATIX_texture_env_route
-  CONST_CAST(GLEW_ATIX_texture_env_route) = _glewSearchExtension("GL_ATIX_texture_env_route", extStart, extEnd);
-#endif /* GL_ATIX_texture_env_route */
-#ifdef GL_ATIX_vertex_shader_output_point_size
-  CONST_CAST(GLEW_ATIX_vertex_shader_output_point_size) = _glewSearchExtension("GL_ATIX_vertex_shader_output_point_size", extStart, extEnd);
-#endif /* GL_ATIX_vertex_shader_output_point_size */
-#ifdef GL_ATI_draw_buffers
-  CONST_CAST(GLEW_ATI_draw_buffers) = _glewSearchExtension("GL_ATI_draw_buffers", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_draw_buffers) CONST_CAST(GLEW_ATI_draw_buffers) = !_glewInit_GL_ATI_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_draw_buffers */
-#ifdef GL_ATI_element_array
-  CONST_CAST(GLEW_ATI_element_array) = _glewSearchExtension("GL_ATI_element_array", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_element_array) CONST_CAST(GLEW_ATI_element_array) = !_glewInit_GL_ATI_element_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_element_array */
-#ifdef GL_ATI_envmap_bumpmap
-  CONST_CAST(GLEW_ATI_envmap_bumpmap) = _glewSearchExtension("GL_ATI_envmap_bumpmap", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_envmap_bumpmap) CONST_CAST(GLEW_ATI_envmap_bumpmap) = !_glewInit_GL_ATI_envmap_bumpmap(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_envmap_bumpmap */
-#ifdef GL_ATI_fragment_shader
-  CONST_CAST(GLEW_ATI_fragment_shader) = _glewSearchExtension("GL_ATI_fragment_shader", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_fragment_shader) CONST_CAST(GLEW_ATI_fragment_shader) = !_glewInit_GL_ATI_fragment_shader(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_fragment_shader */
-#ifdef GL_ATI_map_object_buffer
-  CONST_CAST(GLEW_ATI_map_object_buffer) = _glewSearchExtension("GL_ATI_map_object_buffer", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_map_object_buffer) CONST_CAST(GLEW_ATI_map_object_buffer) = !_glewInit_GL_ATI_map_object_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_map_object_buffer */
-#ifdef GL_ATI_meminfo
-  CONST_CAST(GLEW_ATI_meminfo) = _glewSearchExtension("GL_ATI_meminfo", extStart, extEnd);
-#endif /* GL_ATI_meminfo */
-#ifdef GL_ATI_pn_triangles
-  CONST_CAST(GLEW_ATI_pn_triangles) = _glewSearchExtension("GL_ATI_pn_triangles", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_pn_triangles) CONST_CAST(GLEW_ATI_pn_triangles) = !_glewInit_GL_ATI_pn_triangles(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_pn_triangles */
-#ifdef GL_ATI_separate_stencil
-  CONST_CAST(GLEW_ATI_separate_stencil) = _glewSearchExtension("GL_ATI_separate_stencil", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_separate_stencil) CONST_CAST(GLEW_ATI_separate_stencil) = !_glewInit_GL_ATI_separate_stencil(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_separate_stencil */
-#ifdef GL_ATI_shader_texture_lod
-  CONST_CAST(GLEW_ATI_shader_texture_lod) = _glewSearchExtension("GL_ATI_shader_texture_lod", extStart, extEnd);
-#endif /* GL_ATI_shader_texture_lod */
-#ifdef GL_ATI_text_fragment_shader
-  CONST_CAST(GLEW_ATI_text_fragment_shader) = _glewSearchExtension("GL_ATI_text_fragment_shader", extStart, extEnd);
-#endif /* GL_ATI_text_fragment_shader */
-#ifdef GL_ATI_texture_compression_3dc
-  CONST_CAST(GLEW_ATI_texture_compression_3dc) = _glewSearchExtension("GL_ATI_texture_compression_3dc", extStart, extEnd);
-#endif /* GL_ATI_texture_compression_3dc */
-#ifdef GL_ATI_texture_env_combine3
-  CONST_CAST(GLEW_ATI_texture_env_combine3) = _glewSearchExtension("GL_ATI_texture_env_combine3", extStart, extEnd);
-#endif /* GL_ATI_texture_env_combine3 */
-#ifdef GL_ATI_texture_float
-  CONST_CAST(GLEW_ATI_texture_float) = _glewSearchExtension("GL_ATI_texture_float", extStart, extEnd);
-#endif /* GL_ATI_texture_float */
-#ifdef GL_ATI_texture_mirror_once
-  CONST_CAST(GLEW_ATI_texture_mirror_once) = _glewSearchExtension("GL_ATI_texture_mirror_once", extStart, extEnd);
-#endif /* GL_ATI_texture_mirror_once */
-#ifdef GL_ATI_vertex_array_object
-  CONST_CAST(GLEW_ATI_vertex_array_object) = _glewSearchExtension("GL_ATI_vertex_array_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_vertex_array_object) CONST_CAST(GLEW_ATI_vertex_array_object) = !_glewInit_GL_ATI_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_vertex_array_object */
-#ifdef GL_ATI_vertex_attrib_array_object
-  CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = _glewSearchExtension("GL_ATI_vertex_attrib_array_object", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_vertex_attrib_array_object) CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = !_glewInit_GL_ATI_vertex_attrib_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_vertex_attrib_array_object */
-#ifdef GL_ATI_vertex_streams
-  CONST_CAST(GLEW_ATI_vertex_streams) = _glewSearchExtension("GL_ATI_vertex_streams", extStart, extEnd);
-  if (glewExperimental || GLEW_ATI_vertex_streams) CONST_CAST(GLEW_ATI_vertex_streams) = !_glewInit_GL_ATI_vertex_streams(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_ATI_vertex_streams */
-#ifdef GL_EXT_422_pixels
-  CONST_CAST(GLEW_EXT_422_pixels) = _glewSearchExtension("GL_EXT_422_pixels", extStart, extEnd);
-#endif /* GL_EXT_422_pixels */
-#ifdef GL_EXT_Cg_shader
-  CONST_CAST(GLEW_EXT_Cg_shader) = _glewSearchExtension("GL_EXT_Cg_shader", extStart, extEnd);
-#endif /* GL_EXT_Cg_shader */
-#ifdef GL_EXT_abgr
-  CONST_CAST(GLEW_EXT_abgr) = _glewSearchExtension("GL_EXT_abgr", extStart, extEnd);
-#endif /* GL_EXT_abgr */
-#ifdef GL_EXT_bgra
-  CONST_CAST(GLEW_EXT_bgra) = _glewSearchExtension("GL_EXT_bgra", extStart, extEnd);
-#endif /* GL_EXT_bgra */
-#ifdef GL_EXT_bindable_uniform
-  CONST_CAST(GLEW_EXT_bindable_uniform) = _glewSearchExtension("GL_EXT_bindable_uniform", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_bindable_uniform) CONST_CAST(GLEW_EXT_bindable_uniform) = !_glewInit_GL_EXT_bindable_uniform(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_bindable_uniform */
-#ifdef GL_EXT_blend_color
-  CONST_CAST(GLEW_EXT_blend_color) = _glewSearchExtension("GL_EXT_blend_color", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_blend_color) CONST_CAST(GLEW_EXT_blend_color) = !_glewInit_GL_EXT_blend_color(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_blend_color */
-#ifdef GL_EXT_blend_equation_separate
-  CONST_CAST(GLEW_EXT_blend_equation_separate) = _glewSearchExtension("GL_EXT_blend_equation_separate", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_blend_equation_separate) CONST_CAST(GLEW_EXT_blend_equation_separate) = !_glewInit_GL_EXT_blend_equation_separate(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_blend_equation_separate */
-#ifdef GL_EXT_blend_func_separate
-  CONST_CAST(GLEW_EXT_blend_func_separate) = _glewSearchExtension("GL_EXT_blend_func_separate", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_blend_func_separate) CONST_CAST(GLEW_EXT_blend_func_separate) = !_glewInit_GL_EXT_blend_func_separate(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_blend_func_separate */
-#ifdef GL_EXT_blend_logic_op
-  CONST_CAST(GLEW_EXT_blend_logic_op) = _glewSearchExtension("GL_EXT_blend_logic_op", extStart, extEnd);
-#endif /* GL_EXT_blend_logic_op */
-#ifdef GL_EXT_blend_minmax
-  CONST_CAST(GLEW_EXT_blend_minmax) = _glewSearchExtension("GL_EXT_blend_minmax", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_blend_minmax) CONST_CAST(GLEW_EXT_blend_minmax) = !_glewInit_GL_EXT_blend_minmax(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_blend_minmax */
-#ifdef GL_EXT_blend_subtract
-  CONST_CAST(GLEW_EXT_blend_subtract) = _glewSearchExtension("GL_EXT_blend_subtract", extStart, extEnd);
-#endif /* GL_EXT_blend_subtract */
-#ifdef GL_EXT_clip_volume_hint
-  CONST_CAST(GLEW_EXT_clip_volume_hint) = _glewSearchExtension("GL_EXT_clip_volume_hint", extStart, extEnd);
-#endif /* GL_EXT_clip_volume_hint */
-#ifdef GL_EXT_cmyka
-  CONST_CAST(GLEW_EXT_cmyka) = _glewSearchExtension("GL_EXT_cmyka", extStart, extEnd);
-#endif /* GL_EXT_cmyka */
-#ifdef GL_EXT_color_subtable
-  CONST_CAST(GLEW_EXT_color_subtable) = _glewSearchExtension("GL_EXT_color_subtable", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_color_subtable) CONST_CAST(GLEW_EXT_color_subtable) = !_glewInit_GL_EXT_color_subtable(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_color_subtable */
-#ifdef GL_EXT_compiled_vertex_array
-  CONST_CAST(GLEW_EXT_compiled_vertex_array) = _glewSearchExtension("GL_EXT_compiled_vertex_array", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_compiled_vertex_array) CONST_CAST(GLEW_EXT_compiled_vertex_array) = !_glewInit_GL_EXT_compiled_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_compiled_vertex_array */
-#ifdef GL_EXT_convolution
-  CONST_CAST(GLEW_EXT_convolution) = _glewSearchExtension("GL_EXT_convolution", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_convolution) CONST_CAST(GLEW_EXT_convolution) = !_glewInit_GL_EXT_convolution(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_convolution */
-#ifdef GL_EXT_coordinate_frame
-  CONST_CAST(GLEW_EXT_coordinate_frame) = _glewSearchExtension("GL_EXT_coordinate_frame", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_coordinate_frame) CONST_CAST(GLEW_EXT_coordinate_frame) = !_glewInit_GL_EXT_coordinate_frame(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_coordinate_frame */
-#ifdef GL_EXT_copy_texture
-  CONST_CAST(GLEW_EXT_copy_texture) = _glewSearchExtension("GL_EXT_copy_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_copy_texture) CONST_CAST(GLEW_EXT_copy_texture) = !_glewInit_GL_EXT_copy_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_copy_texture */
-#ifdef GL_EXT_cull_vertex
-  CONST_CAST(GLEW_EXT_cull_vertex) = _glewSearchExtension("GL_EXT_cull_vertex", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_cull_vertex) CONST_CAST(GLEW_EXT_cull_vertex) = !_glewInit_GL_EXT_cull_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_cull_vertex */
-#ifdef GL_EXT_debug_marker
-  CONST_CAST(GLEW_EXT_debug_marker) = _glewSearchExtension("GL_EXT_debug_marker", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_debug_marker) CONST_CAST(GLEW_EXT_debug_marker) = !_glewInit_GL_EXT_debug_marker(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_debug_marker */
-#ifdef GL_EXT_depth_bounds_test
-  CONST_CAST(GLEW_EXT_depth_bounds_test) = _glewSearchExtension("GL_EXT_depth_bounds_test", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_depth_bounds_test) CONST_CAST(GLEW_EXT_depth_bounds_test) = !_glewInit_GL_EXT_depth_bounds_test(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_depth_bounds_test */
-#ifdef GL_EXT_direct_state_access
-  CONST_CAST(GLEW_EXT_direct_state_access) = _glewSearchExtension("GL_EXT_direct_state_access", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_direct_state_access) CONST_CAST(GLEW_EXT_direct_state_access) = !_glewInit_GL_EXT_direct_state_access(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_direct_state_access */
-#ifdef GL_EXT_draw_buffers2
-  CONST_CAST(GLEW_EXT_draw_buffers2) = _glewSearchExtension("GL_EXT_draw_buffers2", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_draw_buffers2) CONST_CAST(GLEW_EXT_draw_buffers2) = !_glewInit_GL_EXT_draw_buffers2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_draw_buffers2 */
-#ifdef GL_EXT_draw_instanced
-  CONST_CAST(GLEW_EXT_draw_instanced) = _glewSearchExtension("GL_EXT_draw_instanced", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_draw_instanced) CONST_CAST(GLEW_EXT_draw_instanced) = !_glewInit_GL_EXT_draw_instanced(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_draw_instanced */
-#ifdef GL_EXT_draw_range_elements
-  CONST_CAST(GLEW_EXT_draw_range_elements) = _glewSearchExtension("GL_EXT_draw_range_elements", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_draw_range_elements) CONST_CAST(GLEW_EXT_draw_range_elements) = !_glewInit_GL_EXT_draw_range_elements(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_draw_range_elements */
-#ifdef GL_EXT_fog_coord
-  CONST_CAST(GLEW_EXT_fog_coord) = _glewSearchExtension("GL_EXT_fog_coord", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_fog_coord) CONST_CAST(GLEW_EXT_fog_coord) = !_glewInit_GL_EXT_fog_coord(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_fog_coord */
-#ifdef GL_EXT_fragment_lighting
-  CONST_CAST(GLEW_EXT_fragment_lighting) = _glewSearchExtension("GL_EXT_fragment_lighting", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_fragment_lighting) CONST_CAST(GLEW_EXT_fragment_lighting) = !_glewInit_GL_EXT_fragment_lighting(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_fragment_lighting */
-#ifdef GL_EXT_framebuffer_blit
-  CONST_CAST(GLEW_EXT_framebuffer_blit) = _glewSearchExtension("GL_EXT_framebuffer_blit", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_framebuffer_blit) CONST_CAST(GLEW_EXT_framebuffer_blit) = !_glewInit_GL_EXT_framebuffer_blit(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_framebuffer_blit */
-#ifdef GL_EXT_framebuffer_multisample
-  CONST_CAST(GLEW_EXT_framebuffer_multisample) = _glewSearchExtension("GL_EXT_framebuffer_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_framebuffer_multisample) CONST_CAST(GLEW_EXT_framebuffer_multisample) = !_glewInit_GL_EXT_framebuffer_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_framebuffer_multisample */
-#ifdef GL_EXT_framebuffer_multisample_blit_scaled
-  CONST_CAST(GLEW_EXT_framebuffer_multisample_blit_scaled) = _glewSearchExtension("GL_EXT_framebuffer_multisample_blit_scaled", extStart, extEnd);
-#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
-#ifdef GL_EXT_framebuffer_object
-  CONST_CAST(GLEW_EXT_framebuffer_object) = _glewSearchExtension("GL_EXT_framebuffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_framebuffer_object) CONST_CAST(GLEW_EXT_framebuffer_object) = !_glewInit_GL_EXT_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_framebuffer_object */
-#ifdef GL_EXT_framebuffer_sRGB
-  CONST_CAST(GLEW_EXT_framebuffer_sRGB) = _glewSearchExtension("GL_EXT_framebuffer_sRGB", extStart, extEnd);
-#endif /* GL_EXT_framebuffer_sRGB */
-#ifdef GL_EXT_geometry_shader4
-  CONST_CAST(GLEW_EXT_geometry_shader4) = _glewSearchExtension("GL_EXT_geometry_shader4", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_geometry_shader4) CONST_CAST(GLEW_EXT_geometry_shader4) = !_glewInit_GL_EXT_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_geometry_shader4 */
-#ifdef GL_EXT_gpu_program_parameters
-  CONST_CAST(GLEW_EXT_gpu_program_parameters) = _glewSearchExtension("GL_EXT_gpu_program_parameters", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_gpu_program_parameters) CONST_CAST(GLEW_EXT_gpu_program_parameters) = !_glewInit_GL_EXT_gpu_program_parameters(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_gpu_program_parameters */
-#ifdef GL_EXT_gpu_shader4
-  CONST_CAST(GLEW_EXT_gpu_shader4) = _glewSearchExtension("GL_EXT_gpu_shader4", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_gpu_shader4) CONST_CAST(GLEW_EXT_gpu_shader4) = !_glewInit_GL_EXT_gpu_shader4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_gpu_shader4 */
-#ifdef GL_EXT_histogram
-  CONST_CAST(GLEW_EXT_histogram) = _glewSearchExtension("GL_EXT_histogram", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_histogram) CONST_CAST(GLEW_EXT_histogram) = !_glewInit_GL_EXT_histogram(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_histogram */
-#ifdef GL_EXT_index_array_formats
-  CONST_CAST(GLEW_EXT_index_array_formats) = _glewSearchExtension("GL_EXT_index_array_formats", extStart, extEnd);
-#endif /* GL_EXT_index_array_formats */
-#ifdef GL_EXT_index_func
-  CONST_CAST(GLEW_EXT_index_func) = _glewSearchExtension("GL_EXT_index_func", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_index_func) CONST_CAST(GLEW_EXT_index_func) = !_glewInit_GL_EXT_index_func(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_index_func */
-#ifdef GL_EXT_index_material
-  CONST_CAST(GLEW_EXT_index_material) = _glewSearchExtension("GL_EXT_index_material", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_index_material) CONST_CAST(GLEW_EXT_index_material) = !_glewInit_GL_EXT_index_material(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_index_material */
-#ifdef GL_EXT_index_texture
-  CONST_CAST(GLEW_EXT_index_texture) = _glewSearchExtension("GL_EXT_index_texture", extStart, extEnd);
-#endif /* GL_EXT_index_texture */
-#ifdef GL_EXT_light_texture
-  CONST_CAST(GLEW_EXT_light_texture) = _glewSearchExtension("GL_EXT_light_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_light_texture) CONST_CAST(GLEW_EXT_light_texture) = !_glewInit_GL_EXT_light_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_light_texture */
-#ifdef GL_EXT_misc_attribute
-  CONST_CAST(GLEW_EXT_misc_attribute) = _glewSearchExtension("GL_EXT_misc_attribute", extStart, extEnd);
-#endif /* GL_EXT_misc_attribute */
-#ifdef GL_EXT_multi_draw_arrays
-  CONST_CAST(GLEW_EXT_multi_draw_arrays) = _glewSearchExtension("GL_EXT_multi_draw_arrays", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_multi_draw_arrays) CONST_CAST(GLEW_EXT_multi_draw_arrays) = !_glewInit_GL_EXT_multi_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_multi_draw_arrays */
-#ifdef GL_EXT_multisample
-  CONST_CAST(GLEW_EXT_multisample) = _glewSearchExtension("GL_EXT_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_multisample) CONST_CAST(GLEW_EXT_multisample) = !_glewInit_GL_EXT_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_multisample */
-#ifdef GL_EXT_packed_depth_stencil
-  CONST_CAST(GLEW_EXT_packed_depth_stencil) = _glewSearchExtension("GL_EXT_packed_depth_stencil", extStart, extEnd);
-#endif /* GL_EXT_packed_depth_stencil */
-#ifdef GL_EXT_packed_float
-  CONST_CAST(GLEW_EXT_packed_float) = _glewSearchExtension("GL_EXT_packed_float", extStart, extEnd);
-#endif /* GL_EXT_packed_float */
-#ifdef GL_EXT_packed_pixels
-  CONST_CAST(GLEW_EXT_packed_pixels) = _glewSearchExtension("GL_EXT_packed_pixels", extStart, extEnd);
-#endif /* GL_EXT_packed_pixels */
-#ifdef GL_EXT_paletted_texture
-  CONST_CAST(GLEW_EXT_paletted_texture) = _glewSearchExtension("GL_EXT_paletted_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_paletted_texture) CONST_CAST(GLEW_EXT_paletted_texture) = !_glewInit_GL_EXT_paletted_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_paletted_texture */
-#ifdef GL_EXT_pixel_buffer_object
-  CONST_CAST(GLEW_EXT_pixel_buffer_object) = _glewSearchExtension("GL_EXT_pixel_buffer_object", extStart, extEnd);
-#endif /* GL_EXT_pixel_buffer_object */
-#ifdef GL_EXT_pixel_transform
-  CONST_CAST(GLEW_EXT_pixel_transform) = _glewSearchExtension("GL_EXT_pixel_transform", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_pixel_transform) CONST_CAST(GLEW_EXT_pixel_transform) = !_glewInit_GL_EXT_pixel_transform(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_pixel_transform */
-#ifdef GL_EXT_pixel_transform_color_table
-  CONST_CAST(GLEW_EXT_pixel_transform_color_table) = _glewSearchExtension("GL_EXT_pixel_transform_color_table", extStart, extEnd);
-#endif /* GL_EXT_pixel_transform_color_table */
-#ifdef GL_EXT_point_parameters
-  CONST_CAST(GLEW_EXT_point_parameters) = _glewSearchExtension("GL_EXT_point_parameters", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_point_parameters) CONST_CAST(GLEW_EXT_point_parameters) = !_glewInit_GL_EXT_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_point_parameters */
-#ifdef GL_EXT_polygon_offset
-  CONST_CAST(GLEW_EXT_polygon_offset) = _glewSearchExtension("GL_EXT_polygon_offset", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_polygon_offset) CONST_CAST(GLEW_EXT_polygon_offset) = !_glewInit_GL_EXT_polygon_offset(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_polygon_offset */
-#ifdef GL_EXT_provoking_vertex
-  CONST_CAST(GLEW_EXT_provoking_vertex) = _glewSearchExtension("GL_EXT_provoking_vertex", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_provoking_vertex) CONST_CAST(GLEW_EXT_provoking_vertex) = !_glewInit_GL_EXT_provoking_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_provoking_vertex */
-#ifdef GL_EXT_rescale_normal
-  CONST_CAST(GLEW_EXT_rescale_normal) = _glewSearchExtension("GL_EXT_rescale_normal", extStart, extEnd);
-#endif /* GL_EXT_rescale_normal */
-#ifdef GL_EXT_scene_marker
-  CONST_CAST(GLEW_EXT_scene_marker) = _glewSearchExtension("GL_EXT_scene_marker", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_scene_marker) CONST_CAST(GLEW_EXT_scene_marker) = !_glewInit_GL_EXT_scene_marker(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_scene_marker */
-#ifdef GL_EXT_secondary_color
-  CONST_CAST(GLEW_EXT_secondary_color) = _glewSearchExtension("GL_EXT_secondary_color", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_secondary_color) CONST_CAST(GLEW_EXT_secondary_color) = !_glewInit_GL_EXT_secondary_color(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_secondary_color */
-#ifdef GL_EXT_separate_shader_objects
-  CONST_CAST(GLEW_EXT_separate_shader_objects) = _glewSearchExtension("GL_EXT_separate_shader_objects", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_separate_shader_objects) CONST_CAST(GLEW_EXT_separate_shader_objects) = !_glewInit_GL_EXT_separate_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_separate_shader_objects */
-#ifdef GL_EXT_separate_specular_color
-  CONST_CAST(GLEW_EXT_separate_specular_color) = _glewSearchExtension("GL_EXT_separate_specular_color", extStart, extEnd);
-#endif /* GL_EXT_separate_specular_color */
-#ifdef GL_EXT_shader_image_load_store
-  CONST_CAST(GLEW_EXT_shader_image_load_store) = _glewSearchExtension("GL_EXT_shader_image_load_store", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_shader_image_load_store) CONST_CAST(GLEW_EXT_shader_image_load_store) = !_glewInit_GL_EXT_shader_image_load_store(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_shader_image_load_store */
-#ifdef GL_EXT_shadow_funcs
-  CONST_CAST(GLEW_EXT_shadow_funcs) = _glewSearchExtension("GL_EXT_shadow_funcs", extStart, extEnd);
-#endif /* GL_EXT_shadow_funcs */
-#ifdef GL_EXT_shared_texture_palette
-  CONST_CAST(GLEW_EXT_shared_texture_palette) = _glewSearchExtension("GL_EXT_shared_texture_palette", extStart, extEnd);
-#endif /* GL_EXT_shared_texture_palette */
-#ifdef GL_EXT_stencil_clear_tag
-  CONST_CAST(GLEW_EXT_stencil_clear_tag) = _glewSearchExtension("GL_EXT_stencil_clear_tag", extStart, extEnd);
-#endif /* GL_EXT_stencil_clear_tag */
-#ifdef GL_EXT_stencil_two_side
-  CONST_CAST(GLEW_EXT_stencil_two_side) = _glewSearchExtension("GL_EXT_stencil_two_side", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_stencil_two_side) CONST_CAST(GLEW_EXT_stencil_two_side) = !_glewInit_GL_EXT_stencil_two_side(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_stencil_two_side */
-#ifdef GL_EXT_stencil_wrap
-  CONST_CAST(GLEW_EXT_stencil_wrap) = _glewSearchExtension("GL_EXT_stencil_wrap", extStart, extEnd);
-#endif /* GL_EXT_stencil_wrap */
-#ifdef GL_EXT_subtexture
-  CONST_CAST(GLEW_EXT_subtexture) = _glewSearchExtension("GL_EXT_subtexture", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_subtexture) CONST_CAST(GLEW_EXT_subtexture) = !_glewInit_GL_EXT_subtexture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_subtexture */
-#ifdef GL_EXT_texture
-  CONST_CAST(GLEW_EXT_texture) = _glewSearchExtension("GL_EXT_texture", extStart, extEnd);
-#endif /* GL_EXT_texture */
-#ifdef GL_EXT_texture3D
-  CONST_CAST(GLEW_EXT_texture3D) = _glewSearchExtension("GL_EXT_texture3D", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture3D) CONST_CAST(GLEW_EXT_texture3D) = !_glewInit_GL_EXT_texture3D(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture3D */
-#ifdef GL_EXT_texture_array
-  CONST_CAST(GLEW_EXT_texture_array) = _glewSearchExtension("GL_EXT_texture_array", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture_array) CONST_CAST(GLEW_EXT_texture_array) = !_glewInit_GL_EXT_texture_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture_array */
-#ifdef GL_EXT_texture_buffer_object
-  CONST_CAST(GLEW_EXT_texture_buffer_object) = _glewSearchExtension("GL_EXT_texture_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture_buffer_object) CONST_CAST(GLEW_EXT_texture_buffer_object) = !_glewInit_GL_EXT_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture_buffer_object */
-#ifdef GL_EXT_texture_compression_dxt1
-  CONST_CAST(GLEW_EXT_texture_compression_dxt1) = _glewSearchExtension("GL_EXT_texture_compression_dxt1", extStart, extEnd);
-#endif /* GL_EXT_texture_compression_dxt1 */
-#ifdef GL_EXT_texture_compression_latc
-  CONST_CAST(GLEW_EXT_texture_compression_latc) = _glewSearchExtension("GL_EXT_texture_compression_latc", extStart, extEnd);
-#endif /* GL_EXT_texture_compression_latc */
-#ifdef GL_EXT_texture_compression_rgtc
-  CONST_CAST(GLEW_EXT_texture_compression_rgtc) = _glewSearchExtension("GL_EXT_texture_compression_rgtc", extStart, extEnd);
-#endif /* GL_EXT_texture_compression_rgtc */
-#ifdef GL_EXT_texture_compression_s3tc
-  CONST_CAST(GLEW_EXT_texture_compression_s3tc) = _glewSearchExtension("GL_EXT_texture_compression_s3tc", extStart, extEnd);
-#endif /* GL_EXT_texture_compression_s3tc */
-#ifdef GL_EXT_texture_cube_map
-  CONST_CAST(GLEW_EXT_texture_cube_map) = _glewSearchExtension("GL_EXT_texture_cube_map", extStart, extEnd);
-#endif /* GL_EXT_texture_cube_map */
-#ifdef GL_EXT_texture_edge_clamp
-  CONST_CAST(GLEW_EXT_texture_edge_clamp) = _glewSearchExtension("GL_EXT_texture_edge_clamp", extStart, extEnd);
-#endif /* GL_EXT_texture_edge_clamp */
-#ifdef GL_EXT_texture_env
-  CONST_CAST(GLEW_EXT_texture_env) = _glewSearchExtension("GL_EXT_texture_env", extStart, extEnd);
-#endif /* GL_EXT_texture_env */
-#ifdef GL_EXT_texture_env_add
-  CONST_CAST(GLEW_EXT_texture_env_add) = _glewSearchExtension("GL_EXT_texture_env_add", extStart, extEnd);
-#endif /* GL_EXT_texture_env_add */
-#ifdef GL_EXT_texture_env_combine
-  CONST_CAST(GLEW_EXT_texture_env_combine) = _glewSearchExtension("GL_EXT_texture_env_combine", extStart, extEnd);
-#endif /* GL_EXT_texture_env_combine */
-#ifdef GL_EXT_texture_env_dot3
-  CONST_CAST(GLEW_EXT_texture_env_dot3) = _glewSearchExtension("GL_EXT_texture_env_dot3", extStart, extEnd);
-#endif /* GL_EXT_texture_env_dot3 */
-#ifdef GL_EXT_texture_filter_anisotropic
-  CONST_CAST(GLEW_EXT_texture_filter_anisotropic) = _glewSearchExtension("GL_EXT_texture_filter_anisotropic", extStart, extEnd);
-#endif /* GL_EXT_texture_filter_anisotropic */
-#ifdef GL_EXT_texture_integer
-  CONST_CAST(GLEW_EXT_texture_integer) = _glewSearchExtension("GL_EXT_texture_integer", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture_integer) CONST_CAST(GLEW_EXT_texture_integer) = !_glewInit_GL_EXT_texture_integer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture_integer */
-#ifdef GL_EXT_texture_lod_bias
-  CONST_CAST(GLEW_EXT_texture_lod_bias) = _glewSearchExtension("GL_EXT_texture_lod_bias", extStart, extEnd);
-#endif /* GL_EXT_texture_lod_bias */
-#ifdef GL_EXT_texture_mirror_clamp
-  CONST_CAST(GLEW_EXT_texture_mirror_clamp) = _glewSearchExtension("GL_EXT_texture_mirror_clamp", extStart, extEnd);
-#endif /* GL_EXT_texture_mirror_clamp */
-#ifdef GL_EXT_texture_object
-  CONST_CAST(GLEW_EXT_texture_object) = _glewSearchExtension("GL_EXT_texture_object", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture_object) CONST_CAST(GLEW_EXT_texture_object) = !_glewInit_GL_EXT_texture_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture_object */
-#ifdef GL_EXT_texture_perturb_normal
-  CONST_CAST(GLEW_EXT_texture_perturb_normal) = _glewSearchExtension("GL_EXT_texture_perturb_normal", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_texture_perturb_normal) CONST_CAST(GLEW_EXT_texture_perturb_normal) = !_glewInit_GL_EXT_texture_perturb_normal(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_texture_perturb_normal */
-#ifdef GL_EXT_texture_rectangle
-  CONST_CAST(GLEW_EXT_texture_rectangle) = _glewSearchExtension("GL_EXT_texture_rectangle", extStart, extEnd);
-#endif /* GL_EXT_texture_rectangle */
-#ifdef GL_EXT_texture_sRGB
-  CONST_CAST(GLEW_EXT_texture_sRGB) = _glewSearchExtension("GL_EXT_texture_sRGB", extStart, extEnd);
-#endif /* GL_EXT_texture_sRGB */
-#ifdef GL_EXT_texture_sRGB_decode
-  CONST_CAST(GLEW_EXT_texture_sRGB_decode) = _glewSearchExtension("GL_EXT_texture_sRGB_decode", extStart, extEnd);
-#endif /* GL_EXT_texture_sRGB_decode */
-#ifdef GL_EXT_texture_shared_exponent
-  CONST_CAST(GLEW_EXT_texture_shared_exponent) = _glewSearchExtension("GL_EXT_texture_shared_exponent", extStart, extEnd);
-#endif /* GL_EXT_texture_shared_exponent */
-#ifdef GL_EXT_texture_snorm
-  CONST_CAST(GLEW_EXT_texture_snorm) = _glewSearchExtension("GL_EXT_texture_snorm", extStart, extEnd);
-#endif /* GL_EXT_texture_snorm */
-#ifdef GL_EXT_texture_swizzle
-  CONST_CAST(GLEW_EXT_texture_swizzle) = _glewSearchExtension("GL_EXT_texture_swizzle", extStart, extEnd);
-#endif /* GL_EXT_texture_swizzle */
-#ifdef GL_EXT_timer_query
-  CONST_CAST(GLEW_EXT_timer_query) = _glewSearchExtension("GL_EXT_timer_query", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_timer_query) CONST_CAST(GLEW_EXT_timer_query) = !_glewInit_GL_EXT_timer_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_timer_query */
-#ifdef GL_EXT_transform_feedback
-  CONST_CAST(GLEW_EXT_transform_feedback) = _glewSearchExtension("GL_EXT_transform_feedback", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_transform_feedback) CONST_CAST(GLEW_EXT_transform_feedback) = !_glewInit_GL_EXT_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_transform_feedback */
-#ifdef GL_EXT_vertex_array
-  CONST_CAST(GLEW_EXT_vertex_array) = _glewSearchExtension("GL_EXT_vertex_array", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_vertex_array) CONST_CAST(GLEW_EXT_vertex_array) = !_glewInit_GL_EXT_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_vertex_array */
-#ifdef GL_EXT_vertex_array_bgra
-  CONST_CAST(GLEW_EXT_vertex_array_bgra) = _glewSearchExtension("GL_EXT_vertex_array_bgra", extStart, extEnd);
-#endif /* GL_EXT_vertex_array_bgra */
-#ifdef GL_EXT_vertex_attrib_64bit
-  CONST_CAST(GLEW_EXT_vertex_attrib_64bit) = _glewSearchExtension("GL_EXT_vertex_attrib_64bit", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_vertex_attrib_64bit) CONST_CAST(GLEW_EXT_vertex_attrib_64bit) = !_glewInit_GL_EXT_vertex_attrib_64bit(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_vertex_attrib_64bit */
-#ifdef GL_EXT_vertex_shader
-  CONST_CAST(GLEW_EXT_vertex_shader) = _glewSearchExtension("GL_EXT_vertex_shader", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_vertex_shader) CONST_CAST(GLEW_EXT_vertex_shader) = !_glewInit_GL_EXT_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_vertex_shader */
-#ifdef GL_EXT_vertex_weighting
-  CONST_CAST(GLEW_EXT_vertex_weighting) = _glewSearchExtension("GL_EXT_vertex_weighting", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_vertex_weighting) CONST_CAST(GLEW_EXT_vertex_weighting) = !_glewInit_GL_EXT_vertex_weighting(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_vertex_weighting */
-#ifdef GL_EXT_x11_sync_object
-  CONST_CAST(GLEW_EXT_x11_sync_object) = _glewSearchExtension("GL_EXT_x11_sync_object", extStart, extEnd);
-  if (glewExperimental || GLEW_EXT_x11_sync_object) CONST_CAST(GLEW_EXT_x11_sync_object) = !_glewInit_GL_EXT_x11_sync_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_EXT_x11_sync_object */
-#ifdef GL_GREMEDY_frame_terminator
-  CONST_CAST(GLEW_GREMEDY_frame_terminator) = _glewSearchExtension("GL_GREMEDY_frame_terminator", extStart, extEnd);
-  if (glewExperimental || GLEW_GREMEDY_frame_terminator) CONST_CAST(GLEW_GREMEDY_frame_terminator) = !_glewInit_GL_GREMEDY_frame_terminator(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_GREMEDY_frame_terminator */
-#ifdef GL_GREMEDY_string_marker
-  CONST_CAST(GLEW_GREMEDY_string_marker) = _glewSearchExtension("GL_GREMEDY_string_marker", extStart, extEnd);
-  if (glewExperimental || GLEW_GREMEDY_string_marker) CONST_CAST(GLEW_GREMEDY_string_marker) = !_glewInit_GL_GREMEDY_string_marker(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_GREMEDY_string_marker */
-#ifdef GL_HP_convolution_border_modes
-  CONST_CAST(GLEW_HP_convolution_border_modes) = _glewSearchExtension("GL_HP_convolution_border_modes", extStart, extEnd);
-#endif /* GL_HP_convolution_border_modes */
-#ifdef GL_HP_image_transform
-  CONST_CAST(GLEW_HP_image_transform) = _glewSearchExtension("GL_HP_image_transform", extStart, extEnd);
-  if (glewExperimental || GLEW_HP_image_transform) CONST_CAST(GLEW_HP_image_transform) = !_glewInit_GL_HP_image_transform(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_HP_image_transform */
-#ifdef GL_HP_occlusion_test
-  CONST_CAST(GLEW_HP_occlusion_test) = _glewSearchExtension("GL_HP_occlusion_test", extStart, extEnd);
-#endif /* GL_HP_occlusion_test */
-#ifdef GL_HP_texture_lighting
-  CONST_CAST(GLEW_HP_texture_lighting) = _glewSearchExtension("GL_HP_texture_lighting", extStart, extEnd);
-#endif /* GL_HP_texture_lighting */
-#ifdef GL_IBM_cull_vertex
-  CONST_CAST(GLEW_IBM_cull_vertex) = _glewSearchExtension("GL_IBM_cull_vertex", extStart, extEnd);
-#endif /* GL_IBM_cull_vertex */
-#ifdef GL_IBM_multimode_draw_arrays
-  CONST_CAST(GLEW_IBM_multimode_draw_arrays) = _glewSearchExtension("GL_IBM_multimode_draw_arrays", extStart, extEnd);
-  if (glewExperimental || GLEW_IBM_multimode_draw_arrays) CONST_CAST(GLEW_IBM_multimode_draw_arrays) = !_glewInit_GL_IBM_multimode_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_IBM_multimode_draw_arrays */
-#ifdef GL_IBM_rasterpos_clip
-  CONST_CAST(GLEW_IBM_rasterpos_clip) = _glewSearchExtension("GL_IBM_rasterpos_clip", extStart, extEnd);
-#endif /* GL_IBM_rasterpos_clip */
-#ifdef GL_IBM_static_data
-  CONST_CAST(GLEW_IBM_static_data) = _glewSearchExtension("GL_IBM_static_data", extStart, extEnd);
-#endif /* GL_IBM_static_data */
-#ifdef GL_IBM_texture_mirrored_repeat
-  CONST_CAST(GLEW_IBM_texture_mirrored_repeat) = _glewSearchExtension("GL_IBM_texture_mirrored_repeat", extStart, extEnd);
-#endif /* GL_IBM_texture_mirrored_repeat */
-#ifdef GL_IBM_vertex_array_lists
-  CONST_CAST(GLEW_IBM_vertex_array_lists) = _glewSearchExtension("GL_IBM_vertex_array_lists", extStart, extEnd);
-  if (glewExperimental || GLEW_IBM_vertex_array_lists) CONST_CAST(GLEW_IBM_vertex_array_lists) = !_glewInit_GL_IBM_vertex_array_lists(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_IBM_vertex_array_lists */
-#ifdef GL_INGR_color_clamp
-  CONST_CAST(GLEW_INGR_color_clamp) = _glewSearchExtension("GL_INGR_color_clamp", extStart, extEnd);
-#endif /* GL_INGR_color_clamp */
-#ifdef GL_INGR_interlace_read
-  CONST_CAST(GLEW_INGR_interlace_read) = _glewSearchExtension("GL_INGR_interlace_read", extStart, extEnd);
-#endif /* GL_INGR_interlace_read */
-#ifdef GL_INTEL_parallel_arrays
-  CONST_CAST(GLEW_INTEL_parallel_arrays) = _glewSearchExtension("GL_INTEL_parallel_arrays", extStart, extEnd);
-  if (glewExperimental || GLEW_INTEL_parallel_arrays) CONST_CAST(GLEW_INTEL_parallel_arrays) = !_glewInit_GL_INTEL_parallel_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_INTEL_parallel_arrays */
-#ifdef GL_INTEL_texture_scissor
-  CONST_CAST(GLEW_INTEL_texture_scissor) = _glewSearchExtension("GL_INTEL_texture_scissor", extStart, extEnd);
-  if (glewExperimental || GLEW_INTEL_texture_scissor) CONST_CAST(GLEW_INTEL_texture_scissor) = !_glewInit_GL_INTEL_texture_scissor(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_INTEL_texture_scissor */
-#ifdef GL_KHR_debug
-  CONST_CAST(GLEW_KHR_debug) = _glewSearchExtension("GL_KHR_debug", extStart, extEnd);
-  if (glewExperimental || GLEW_KHR_debug) CONST_CAST(GLEW_KHR_debug) = !_glewInit_GL_KHR_debug(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_KHR_debug */
-#ifdef GL_KHR_texture_compression_astc_ldr
-  CONST_CAST(GLEW_KHR_texture_compression_astc_ldr) = _glewSearchExtension("GL_KHR_texture_compression_astc_ldr", extStart, extEnd);
-#endif /* GL_KHR_texture_compression_astc_ldr */
-#ifdef GL_KTX_buffer_region
-  CONST_CAST(GLEW_KTX_buffer_region) = _glewSearchExtension("GL_KTX_buffer_region", extStart, extEnd);
-  if (glewExperimental || GLEW_KTX_buffer_region) CONST_CAST(GLEW_KTX_buffer_region) = !_glewInit_GL_KTX_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_KTX_buffer_region */
-#ifdef GL_MESAX_texture_stack
-  CONST_CAST(GLEW_MESAX_texture_stack) = _glewSearchExtension("GL_MESAX_texture_stack", extStart, extEnd);
-#endif /* GL_MESAX_texture_stack */
-#ifdef GL_MESA_pack_invert
-  CONST_CAST(GLEW_MESA_pack_invert) = _glewSearchExtension("GL_MESA_pack_invert", extStart, extEnd);
-#endif /* GL_MESA_pack_invert */
-#ifdef GL_MESA_resize_buffers
-  CONST_CAST(GLEW_MESA_resize_buffers) = _glewSearchExtension("GL_MESA_resize_buffers", extStart, extEnd);
-  if (glewExperimental || GLEW_MESA_resize_buffers) CONST_CAST(GLEW_MESA_resize_buffers) = !_glewInit_GL_MESA_resize_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_MESA_resize_buffers */
-#ifdef GL_MESA_window_pos
-  CONST_CAST(GLEW_MESA_window_pos) = _glewSearchExtension("GL_MESA_window_pos", extStart, extEnd);
-  if (glewExperimental || GLEW_MESA_window_pos) CONST_CAST(GLEW_MESA_window_pos) = !_glewInit_GL_MESA_window_pos(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_MESA_window_pos */
-#ifdef GL_MESA_ycbcr_texture
-  CONST_CAST(GLEW_MESA_ycbcr_texture) = _glewSearchExtension("GL_MESA_ycbcr_texture", extStart, extEnd);
-#endif /* GL_MESA_ycbcr_texture */
-#ifdef GL_NVX_gpu_memory_info
-  CONST_CAST(GLEW_NVX_gpu_memory_info) = _glewSearchExtension("GL_NVX_gpu_memory_info", extStart, extEnd);
-#endif /* GL_NVX_gpu_memory_info */
-#ifdef GL_NV_bindless_texture
-  CONST_CAST(GLEW_NV_bindless_texture) = _glewSearchExtension("GL_NV_bindless_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_bindless_texture) CONST_CAST(GLEW_NV_bindless_texture) = !_glewInit_GL_NV_bindless_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_bindless_texture */
-#ifdef GL_NV_blend_square
-  CONST_CAST(GLEW_NV_blend_square) = _glewSearchExtension("GL_NV_blend_square", extStart, extEnd);
-#endif /* GL_NV_blend_square */
-#ifdef GL_NV_conditional_render
-  CONST_CAST(GLEW_NV_conditional_render) = _glewSearchExtension("GL_NV_conditional_render", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_conditional_render) CONST_CAST(GLEW_NV_conditional_render) = !_glewInit_GL_NV_conditional_render(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_conditional_render */
-#ifdef GL_NV_copy_depth_to_color
-  CONST_CAST(GLEW_NV_copy_depth_to_color) = _glewSearchExtension("GL_NV_copy_depth_to_color", extStart, extEnd);
-#endif /* GL_NV_copy_depth_to_color */
-#ifdef GL_NV_copy_image
-  CONST_CAST(GLEW_NV_copy_image) = _glewSearchExtension("GL_NV_copy_image", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_copy_image) CONST_CAST(GLEW_NV_copy_image) = !_glewInit_GL_NV_copy_image(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_copy_image */
-#ifdef GL_NV_depth_buffer_float
-  CONST_CAST(GLEW_NV_depth_buffer_float) = _glewSearchExtension("GL_NV_depth_buffer_float", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_depth_buffer_float) CONST_CAST(GLEW_NV_depth_buffer_float) = !_glewInit_GL_NV_depth_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_depth_buffer_float */
-#ifdef GL_NV_depth_clamp
-  CONST_CAST(GLEW_NV_depth_clamp) = _glewSearchExtension("GL_NV_depth_clamp", extStart, extEnd);
-#endif /* GL_NV_depth_clamp */
-#ifdef GL_NV_depth_range_unclamped
-  CONST_CAST(GLEW_NV_depth_range_unclamped) = _glewSearchExtension("GL_NV_depth_range_unclamped", extStart, extEnd);
-#endif /* GL_NV_depth_range_unclamped */
-#ifdef GL_NV_evaluators
-  CONST_CAST(GLEW_NV_evaluators) = _glewSearchExtension("GL_NV_evaluators", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_evaluators) CONST_CAST(GLEW_NV_evaluators) = !_glewInit_GL_NV_evaluators(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_evaluators */
-#ifdef GL_NV_explicit_multisample
-  CONST_CAST(GLEW_NV_explicit_multisample) = _glewSearchExtension("GL_NV_explicit_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_explicit_multisample) CONST_CAST(GLEW_NV_explicit_multisample) = !_glewInit_GL_NV_explicit_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_explicit_multisample */
-#ifdef GL_NV_fence
-  CONST_CAST(GLEW_NV_fence) = _glewSearchExtension("GL_NV_fence", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_fence) CONST_CAST(GLEW_NV_fence) = !_glewInit_GL_NV_fence(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_fence */
-#ifdef GL_NV_float_buffer
-  CONST_CAST(GLEW_NV_float_buffer) = _glewSearchExtension("GL_NV_float_buffer", extStart, extEnd);
-#endif /* GL_NV_float_buffer */
-#ifdef GL_NV_fog_distance
-  CONST_CAST(GLEW_NV_fog_distance) = _glewSearchExtension("GL_NV_fog_distance", extStart, extEnd);
-#endif /* GL_NV_fog_distance */
-#ifdef GL_NV_fragment_program
-  CONST_CAST(GLEW_NV_fragment_program) = _glewSearchExtension("GL_NV_fragment_program", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_fragment_program) CONST_CAST(GLEW_NV_fragment_program) = !_glewInit_GL_NV_fragment_program(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_fragment_program */
-#ifdef GL_NV_fragment_program2
-  CONST_CAST(GLEW_NV_fragment_program2) = _glewSearchExtension("GL_NV_fragment_program2", extStart, extEnd);
-#endif /* GL_NV_fragment_program2 */
-#ifdef GL_NV_fragment_program4
-  CONST_CAST(GLEW_NV_fragment_program4) = _glewSearchExtension("GL_NV_gpu_program4", extStart, extEnd);
-#endif /* GL_NV_fragment_program4 */
-#ifdef GL_NV_fragment_program_option
-  CONST_CAST(GLEW_NV_fragment_program_option) = _glewSearchExtension("GL_NV_fragment_program_option", extStart, extEnd);
-#endif /* GL_NV_fragment_program_option */
-#ifdef GL_NV_framebuffer_multisample_coverage
-  CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = _glewSearchExtension("GL_NV_framebuffer_multisample_coverage", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_framebuffer_multisample_coverage) CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = !_glewInit_GL_NV_framebuffer_multisample_coverage(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_framebuffer_multisample_coverage */
-#ifdef GL_NV_geometry_program4
-  CONST_CAST(GLEW_NV_geometry_program4) = _glewSearchExtension("GL_NV_gpu_program4", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_geometry_program4) CONST_CAST(GLEW_NV_geometry_program4) = !_glewInit_GL_NV_geometry_program4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_geometry_program4 */
-#ifdef GL_NV_geometry_shader4
-  CONST_CAST(GLEW_NV_geometry_shader4) = _glewSearchExtension("GL_NV_geometry_shader4", extStart, extEnd);
-#endif /* GL_NV_geometry_shader4 */
-#ifdef GL_NV_gpu_program4
-  CONST_CAST(GLEW_NV_gpu_program4) = _glewSearchExtension("GL_NV_gpu_program4", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_gpu_program4) CONST_CAST(GLEW_NV_gpu_program4) = !_glewInit_GL_NV_gpu_program4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_gpu_program4 */
-#ifdef GL_NV_gpu_program5
-  CONST_CAST(GLEW_NV_gpu_program5) = _glewSearchExtension("GL_NV_gpu_program5", extStart, extEnd);
-#endif /* GL_NV_gpu_program5 */
-#ifdef GL_NV_gpu_program_fp64
-  CONST_CAST(GLEW_NV_gpu_program_fp64) = _glewSearchExtension("GL_NV_gpu_program_fp64", extStart, extEnd);
-#endif /* GL_NV_gpu_program_fp64 */
-#ifdef GL_NV_gpu_shader5
-  CONST_CAST(GLEW_NV_gpu_shader5) = _glewSearchExtension("GL_NV_gpu_shader5", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_gpu_shader5) CONST_CAST(GLEW_NV_gpu_shader5) = !_glewInit_GL_NV_gpu_shader5(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_gpu_shader5 */
-#ifdef GL_NV_half_float
-  CONST_CAST(GLEW_NV_half_float) = _glewSearchExtension("GL_NV_half_float", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_half_float) CONST_CAST(GLEW_NV_half_float) = !_glewInit_GL_NV_half_float(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_half_float */
-#ifdef GL_NV_light_max_exponent
-  CONST_CAST(GLEW_NV_light_max_exponent) = _glewSearchExtension("GL_NV_light_max_exponent", extStart, extEnd);
-#endif /* GL_NV_light_max_exponent */
-#ifdef GL_NV_multisample_coverage
-  CONST_CAST(GLEW_NV_multisample_coverage) = _glewSearchExtension("GL_NV_multisample_coverage", extStart, extEnd);
-#endif /* GL_NV_multisample_coverage */
-#ifdef GL_NV_multisample_filter_hint
-  CONST_CAST(GLEW_NV_multisample_filter_hint) = _glewSearchExtension("GL_NV_multisample_filter_hint", extStart, extEnd);
-#endif /* GL_NV_multisample_filter_hint */
-#ifdef GL_NV_occlusion_query
-  CONST_CAST(GLEW_NV_occlusion_query) = _glewSearchExtension("GL_NV_occlusion_query", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_occlusion_query) CONST_CAST(GLEW_NV_occlusion_query) = !_glewInit_GL_NV_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_occlusion_query */
-#ifdef GL_NV_packed_depth_stencil
-  CONST_CAST(GLEW_NV_packed_depth_stencil) = _glewSearchExtension("GL_NV_packed_depth_stencil", extStart, extEnd);
-#endif /* GL_NV_packed_depth_stencil */
-#ifdef GL_NV_parameter_buffer_object
-  CONST_CAST(GLEW_NV_parameter_buffer_object) = _glewSearchExtension("GL_NV_parameter_buffer_object", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_parameter_buffer_object) CONST_CAST(GLEW_NV_parameter_buffer_object) = !_glewInit_GL_NV_parameter_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_parameter_buffer_object */
-#ifdef GL_NV_parameter_buffer_object2
-  CONST_CAST(GLEW_NV_parameter_buffer_object2) = _glewSearchExtension("GL_NV_parameter_buffer_object2", extStart, extEnd);
-#endif /* GL_NV_parameter_buffer_object2 */
-#ifdef GL_NV_path_rendering
-  CONST_CAST(GLEW_NV_path_rendering) = _glewSearchExtension("GL_NV_path_rendering", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_path_rendering) CONST_CAST(GLEW_NV_path_rendering) = !_glewInit_GL_NV_path_rendering(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_path_rendering */
-#ifdef GL_NV_pixel_data_range
-  CONST_CAST(GLEW_NV_pixel_data_range) = _glewSearchExtension("GL_NV_pixel_data_range", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_pixel_data_range) CONST_CAST(GLEW_NV_pixel_data_range) = !_glewInit_GL_NV_pixel_data_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_pixel_data_range */
-#ifdef GL_NV_point_sprite
-  CONST_CAST(GLEW_NV_point_sprite) = _glewSearchExtension("GL_NV_point_sprite", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_point_sprite) CONST_CAST(GLEW_NV_point_sprite) = !_glewInit_GL_NV_point_sprite(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_point_sprite */
-#ifdef GL_NV_present_video
-  CONST_CAST(GLEW_NV_present_video) = _glewSearchExtension("GL_NV_present_video", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_present_video) CONST_CAST(GLEW_NV_present_video) = !_glewInit_GL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_present_video */
-#ifdef GL_NV_primitive_restart
-  CONST_CAST(GLEW_NV_primitive_restart) = _glewSearchExtension("GL_NV_primitive_restart", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_primitive_restart) CONST_CAST(GLEW_NV_primitive_restart) = !_glewInit_GL_NV_primitive_restart(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_primitive_restart */
-#ifdef GL_NV_register_combiners
-  CONST_CAST(GLEW_NV_register_combiners) = _glewSearchExtension("GL_NV_register_combiners", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_register_combiners) CONST_CAST(GLEW_NV_register_combiners) = !_glewInit_GL_NV_register_combiners(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_register_combiners */
-#ifdef GL_NV_register_combiners2
-  CONST_CAST(GLEW_NV_register_combiners2) = _glewSearchExtension("GL_NV_register_combiners2", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_register_combiners2) CONST_CAST(GLEW_NV_register_combiners2) = !_glewInit_GL_NV_register_combiners2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_register_combiners2 */
-#ifdef GL_NV_shader_atomic_float
-  CONST_CAST(GLEW_NV_shader_atomic_float) = _glewSearchExtension("GL_NV_shader_atomic_float", extStart, extEnd);
-#endif /* GL_NV_shader_atomic_float */
-#ifdef GL_NV_shader_buffer_load
-  CONST_CAST(GLEW_NV_shader_buffer_load) = _glewSearchExtension("GL_NV_shader_buffer_load", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_shader_buffer_load) CONST_CAST(GLEW_NV_shader_buffer_load) = !_glewInit_GL_NV_shader_buffer_load(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_shader_buffer_load */
-#ifdef GL_NV_tessellation_program5
-  CONST_CAST(GLEW_NV_tessellation_program5) = _glewSearchExtension("GL_NV_gpu_program5", extStart, extEnd);
-#endif /* GL_NV_tessellation_program5 */
-#ifdef GL_NV_texgen_emboss
-  CONST_CAST(GLEW_NV_texgen_emboss) = _glewSearchExtension("GL_NV_texgen_emboss", extStart, extEnd);
-#endif /* GL_NV_texgen_emboss */
-#ifdef GL_NV_texgen_reflection
-  CONST_CAST(GLEW_NV_texgen_reflection) = _glewSearchExtension("GL_NV_texgen_reflection", extStart, extEnd);
-#endif /* GL_NV_texgen_reflection */
-#ifdef GL_NV_texture_barrier
-  CONST_CAST(GLEW_NV_texture_barrier) = _glewSearchExtension("GL_NV_texture_barrier", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_texture_barrier) CONST_CAST(GLEW_NV_texture_barrier) = !_glewInit_GL_NV_texture_barrier(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_texture_barrier */
-#ifdef GL_NV_texture_compression_vtc
-  CONST_CAST(GLEW_NV_texture_compression_vtc) = _glewSearchExtension("GL_NV_texture_compression_vtc", extStart, extEnd);
-#endif /* GL_NV_texture_compression_vtc */
-#ifdef GL_NV_texture_env_combine4
-  CONST_CAST(GLEW_NV_texture_env_combine4) = _glewSearchExtension("GL_NV_texture_env_combine4", extStart, extEnd);
-#endif /* GL_NV_texture_env_combine4 */
-#ifdef GL_NV_texture_expand_normal
-  CONST_CAST(GLEW_NV_texture_expand_normal) = _glewSearchExtension("GL_NV_texture_expand_normal", extStart, extEnd);
-#endif /* GL_NV_texture_expand_normal */
-#ifdef GL_NV_texture_multisample
-  CONST_CAST(GLEW_NV_texture_multisample) = _glewSearchExtension("GL_NV_texture_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_texture_multisample) CONST_CAST(GLEW_NV_texture_multisample) = !_glewInit_GL_NV_texture_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_texture_multisample */
-#ifdef GL_NV_texture_rectangle
-  CONST_CAST(GLEW_NV_texture_rectangle) = _glewSearchExtension("GL_NV_texture_rectangle", extStart, extEnd);
-#endif /* GL_NV_texture_rectangle */
-#ifdef GL_NV_texture_shader
-  CONST_CAST(GLEW_NV_texture_shader) = _glewSearchExtension("GL_NV_texture_shader", extStart, extEnd);
-#endif /* GL_NV_texture_shader */
-#ifdef GL_NV_texture_shader2
-  CONST_CAST(GLEW_NV_texture_shader2) = _glewSearchExtension("GL_NV_texture_shader2", extStart, extEnd);
-#endif /* GL_NV_texture_shader2 */
-#ifdef GL_NV_texture_shader3
-  CONST_CAST(GLEW_NV_texture_shader3) = _glewSearchExtension("GL_NV_texture_shader3", extStart, extEnd);
-#endif /* GL_NV_texture_shader3 */
-#ifdef GL_NV_transform_feedback
-  CONST_CAST(GLEW_NV_transform_feedback) = _glewSearchExtension("GL_NV_transform_feedback", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_transform_feedback) CONST_CAST(GLEW_NV_transform_feedback) = !_glewInit_GL_NV_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_transform_feedback */
-#ifdef GL_NV_transform_feedback2
-  CONST_CAST(GLEW_NV_transform_feedback2) = _glewSearchExtension("GL_NV_transform_feedback2", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_transform_feedback2) CONST_CAST(GLEW_NV_transform_feedback2) = !_glewInit_GL_NV_transform_feedback2(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_transform_feedback2 */
-#ifdef GL_NV_vdpau_interop
-  CONST_CAST(GLEW_NV_vdpau_interop) = _glewSearchExtension("GL_NV_vdpau_interop", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_vdpau_interop) CONST_CAST(GLEW_NV_vdpau_interop) = !_glewInit_GL_NV_vdpau_interop(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_vdpau_interop */
-#ifdef GL_NV_vertex_array_range
-  CONST_CAST(GLEW_NV_vertex_array_range) = _glewSearchExtension("GL_NV_vertex_array_range", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_vertex_array_range) CONST_CAST(GLEW_NV_vertex_array_range) = !_glewInit_GL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_vertex_array_range */
-#ifdef GL_NV_vertex_array_range2
-  CONST_CAST(GLEW_NV_vertex_array_range2) = _glewSearchExtension("GL_NV_vertex_array_range2", extStart, extEnd);
-#endif /* GL_NV_vertex_array_range2 */
-#ifdef GL_NV_vertex_attrib_integer_64bit
-  CONST_CAST(GLEW_NV_vertex_attrib_integer_64bit) = _glewSearchExtension("GL_NV_vertex_attrib_integer_64bit", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_vertex_attrib_integer_64bit) CONST_CAST(GLEW_NV_vertex_attrib_integer_64bit) = !_glewInit_GL_NV_vertex_attrib_integer_64bit(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_vertex_attrib_integer_64bit */
-#ifdef GL_NV_vertex_buffer_unified_memory
-  CONST_CAST(GLEW_NV_vertex_buffer_unified_memory) = _glewSearchExtension("GL_NV_vertex_buffer_unified_memory", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_vertex_buffer_unified_memory) CONST_CAST(GLEW_NV_vertex_buffer_unified_memory) = !_glewInit_GL_NV_vertex_buffer_unified_memory(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_vertex_buffer_unified_memory */
-#ifdef GL_NV_vertex_program
-  CONST_CAST(GLEW_NV_vertex_program) = _glewSearchExtension("GL_NV_vertex_program", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_vertex_program) CONST_CAST(GLEW_NV_vertex_program) = !_glewInit_GL_NV_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_vertex_program */
-#ifdef GL_NV_vertex_program1_1
-  CONST_CAST(GLEW_NV_vertex_program1_1) = _glewSearchExtension("GL_NV_vertex_program1_1", extStart, extEnd);
-#endif /* GL_NV_vertex_program1_1 */
-#ifdef GL_NV_vertex_program2
-  CONST_CAST(GLEW_NV_vertex_program2) = _glewSearchExtension("GL_NV_vertex_program2", extStart, extEnd);
-#endif /* GL_NV_vertex_program2 */
-#ifdef GL_NV_vertex_program2_option
-  CONST_CAST(GLEW_NV_vertex_program2_option) = _glewSearchExtension("GL_NV_vertex_program2_option", extStart, extEnd);
-#endif /* GL_NV_vertex_program2_option */
-#ifdef GL_NV_vertex_program3
-  CONST_CAST(GLEW_NV_vertex_program3) = _glewSearchExtension("GL_NV_vertex_program3", extStart, extEnd);
-#endif /* GL_NV_vertex_program3 */
-#ifdef GL_NV_vertex_program4
-  CONST_CAST(GLEW_NV_vertex_program4) = _glewSearchExtension("GL_NV_gpu_program4", extStart, extEnd);
-#endif /* GL_NV_vertex_program4 */
-#ifdef GL_NV_video_capture
-  CONST_CAST(GLEW_NV_video_capture) = _glewSearchExtension("GL_NV_video_capture", extStart, extEnd);
-  if (glewExperimental || GLEW_NV_video_capture) CONST_CAST(GLEW_NV_video_capture) = !_glewInit_GL_NV_video_capture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_NV_video_capture */
-#ifdef GL_OES_byte_coordinates
-  CONST_CAST(GLEW_OES_byte_coordinates) = _glewSearchExtension("GL_OES_byte_coordinates", extStart, extEnd);
-#endif /* GL_OES_byte_coordinates */
-#ifdef GL_OES_compressed_paletted_texture
-  CONST_CAST(GLEW_OES_compressed_paletted_texture) = _glewSearchExtension("GL_OES_compressed_paletted_texture", extStart, extEnd);
-#endif /* GL_OES_compressed_paletted_texture */
-#ifdef GL_OES_read_format
-  CONST_CAST(GLEW_OES_read_format) = _glewSearchExtension("GL_OES_read_format", extStart, extEnd);
-#endif /* GL_OES_read_format */
-#ifdef GL_OES_single_precision
-  CONST_CAST(GLEW_OES_single_precision) = _glewSearchExtension("GL_OES_single_precision", extStart, extEnd);
-  if (glewExperimental || GLEW_OES_single_precision) CONST_CAST(GLEW_OES_single_precision) = !_glewInit_GL_OES_single_precision(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_OES_single_precision */
-#ifdef GL_OML_interlace
-  CONST_CAST(GLEW_OML_interlace) = _glewSearchExtension("GL_OML_interlace", extStart, extEnd);
-#endif /* GL_OML_interlace */
-#ifdef GL_OML_resample
-  CONST_CAST(GLEW_OML_resample) = _glewSearchExtension("GL_OML_resample", extStart, extEnd);
-#endif /* GL_OML_resample */
-#ifdef GL_OML_subsample
-  CONST_CAST(GLEW_OML_subsample) = _glewSearchExtension("GL_OML_subsample", extStart, extEnd);
-#endif /* GL_OML_subsample */
-#ifdef GL_PGI_misc_hints
-  CONST_CAST(GLEW_PGI_misc_hints) = _glewSearchExtension("GL_PGI_misc_hints", extStart, extEnd);
-#endif /* GL_PGI_misc_hints */
-#ifdef GL_PGI_vertex_hints
-  CONST_CAST(GLEW_PGI_vertex_hints) = _glewSearchExtension("GL_PGI_vertex_hints", extStart, extEnd);
-#endif /* GL_PGI_vertex_hints */
-#ifdef GL_REGAL_error_string
-  CONST_CAST(GLEW_REGAL_error_string) = _glewSearchExtension("GL_REGAL_error_string", extStart, extEnd);
-  if (glewExperimental || GLEW_REGAL_error_string) CONST_CAST(GLEW_REGAL_error_string) = !_glewInit_GL_REGAL_error_string(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_REGAL_error_string */
-#ifdef GL_REGAL_extension_query
-  CONST_CAST(GLEW_REGAL_extension_query) = _glewSearchExtension("GL_REGAL_extension_query", extStart, extEnd);
-  if (glewExperimental || GLEW_REGAL_extension_query) CONST_CAST(GLEW_REGAL_extension_query) = !_glewInit_GL_REGAL_extension_query(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_REGAL_extension_query */
-#ifdef GL_REGAL_log
-  CONST_CAST(GLEW_REGAL_log) = _glewSearchExtension("GL_REGAL_log", extStart, extEnd);
-#endif /* GL_REGAL_log */
-#ifdef GL_REND_screen_coordinates
-  CONST_CAST(GLEW_REND_screen_coordinates) = _glewSearchExtension("GL_REND_screen_coordinates", extStart, extEnd);
-#endif /* GL_REND_screen_coordinates */
-#ifdef GL_S3_s3tc
-  CONST_CAST(GLEW_S3_s3tc) = _glewSearchExtension("GL_S3_s3tc", extStart, extEnd);
-#endif /* GL_S3_s3tc */
-#ifdef GL_SGIS_color_range
-  CONST_CAST(GLEW_SGIS_color_range) = _glewSearchExtension("GL_SGIS_color_range", extStart, extEnd);
-#endif /* GL_SGIS_color_range */
-#ifdef GL_SGIS_detail_texture
-  CONST_CAST(GLEW_SGIS_detail_texture) = _glewSearchExtension("GL_SGIS_detail_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_detail_texture) CONST_CAST(GLEW_SGIS_detail_texture) = !_glewInit_GL_SGIS_detail_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_detail_texture */
-#ifdef GL_SGIS_fog_function
-  CONST_CAST(GLEW_SGIS_fog_function) = _glewSearchExtension("GL_SGIS_fog_function", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_fog_function) CONST_CAST(GLEW_SGIS_fog_function) = !_glewInit_GL_SGIS_fog_function(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_fog_function */
-#ifdef GL_SGIS_generate_mipmap
-  CONST_CAST(GLEW_SGIS_generate_mipmap) = _glewSearchExtension("GL_SGIS_generate_mipmap", extStart, extEnd);
-#endif /* GL_SGIS_generate_mipmap */
-#ifdef GL_SGIS_multisample
-  CONST_CAST(GLEW_SGIS_multisample) = _glewSearchExtension("GL_SGIS_multisample", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_multisample) CONST_CAST(GLEW_SGIS_multisample) = !_glewInit_GL_SGIS_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_multisample */
-#ifdef GL_SGIS_pixel_texture
-  CONST_CAST(GLEW_SGIS_pixel_texture) = _glewSearchExtension("GL_SGIS_pixel_texture", extStart, extEnd);
-#endif /* GL_SGIS_pixel_texture */
-#ifdef GL_SGIS_point_line_texgen
-  CONST_CAST(GLEW_SGIS_point_line_texgen) = _glewSearchExtension("GL_SGIS_point_line_texgen", extStart, extEnd);
-#endif /* GL_SGIS_point_line_texgen */
-#ifdef GL_SGIS_sharpen_texture
-  CONST_CAST(GLEW_SGIS_sharpen_texture) = _glewSearchExtension("GL_SGIS_sharpen_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_sharpen_texture) CONST_CAST(GLEW_SGIS_sharpen_texture) = !_glewInit_GL_SGIS_sharpen_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_sharpen_texture */
-#ifdef GL_SGIS_texture4D
-  CONST_CAST(GLEW_SGIS_texture4D) = _glewSearchExtension("GL_SGIS_texture4D", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_texture4D) CONST_CAST(GLEW_SGIS_texture4D) = !_glewInit_GL_SGIS_texture4D(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_texture4D */
-#ifdef GL_SGIS_texture_border_clamp
-  CONST_CAST(GLEW_SGIS_texture_border_clamp) = _glewSearchExtension("GL_SGIS_texture_border_clamp", extStart, extEnd);
-#endif /* GL_SGIS_texture_border_clamp */
-#ifdef GL_SGIS_texture_edge_clamp
-  CONST_CAST(GLEW_SGIS_texture_edge_clamp) = _glewSearchExtension("GL_SGIS_texture_edge_clamp", extStart, extEnd);
-#endif /* GL_SGIS_texture_edge_clamp */
-#ifdef GL_SGIS_texture_filter4
-  CONST_CAST(GLEW_SGIS_texture_filter4) = _glewSearchExtension("GL_SGIS_texture_filter4", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIS_texture_filter4) CONST_CAST(GLEW_SGIS_texture_filter4) = !_glewInit_GL_SGIS_texture_filter4(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIS_texture_filter4 */
-#ifdef GL_SGIS_texture_lod
-  CONST_CAST(GLEW_SGIS_texture_lod) = _glewSearchExtension("GL_SGIS_texture_lod", extStart, extEnd);
-#endif /* GL_SGIS_texture_lod */
-#ifdef GL_SGIS_texture_select
-  CONST_CAST(GLEW_SGIS_texture_select) = _glewSearchExtension("GL_SGIS_texture_select", extStart, extEnd);
-#endif /* GL_SGIS_texture_select */
-#ifdef GL_SGIX_async
-  CONST_CAST(GLEW_SGIX_async) = _glewSearchExtension("GL_SGIX_async", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_async) CONST_CAST(GLEW_SGIX_async) = !_glewInit_GL_SGIX_async(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_async */
-#ifdef GL_SGIX_async_histogram
-  CONST_CAST(GLEW_SGIX_async_histogram) = _glewSearchExtension("GL_SGIX_async_histogram", extStart, extEnd);
-#endif /* GL_SGIX_async_histogram */
-#ifdef GL_SGIX_async_pixel
-  CONST_CAST(GLEW_SGIX_async_pixel) = _glewSearchExtension("GL_SGIX_async_pixel", extStart, extEnd);
-#endif /* GL_SGIX_async_pixel */
-#ifdef GL_SGIX_blend_alpha_minmax
-  CONST_CAST(GLEW_SGIX_blend_alpha_minmax) = _glewSearchExtension("GL_SGIX_blend_alpha_minmax", extStart, extEnd);
-#endif /* GL_SGIX_blend_alpha_minmax */
-#ifdef GL_SGIX_clipmap
-  CONST_CAST(GLEW_SGIX_clipmap) = _glewSearchExtension("GL_SGIX_clipmap", extStart, extEnd);
-#endif /* GL_SGIX_clipmap */
-#ifdef GL_SGIX_convolution_accuracy
-  CONST_CAST(GLEW_SGIX_convolution_accuracy) = _glewSearchExtension("GL_SGIX_convolution_accuracy", extStart, extEnd);
-#endif /* GL_SGIX_convolution_accuracy */
-#ifdef GL_SGIX_depth_texture
-  CONST_CAST(GLEW_SGIX_depth_texture) = _glewSearchExtension("GL_SGIX_depth_texture", extStart, extEnd);
-#endif /* GL_SGIX_depth_texture */
-#ifdef GL_SGIX_flush_raster
-  CONST_CAST(GLEW_SGIX_flush_raster) = _glewSearchExtension("GL_SGIX_flush_raster", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_flush_raster) CONST_CAST(GLEW_SGIX_flush_raster) = !_glewInit_GL_SGIX_flush_raster(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_flush_raster */
-#ifdef GL_SGIX_fog_offset
-  CONST_CAST(GLEW_SGIX_fog_offset) = _glewSearchExtension("GL_SGIX_fog_offset", extStart, extEnd);
-#endif /* GL_SGIX_fog_offset */
-#ifdef GL_SGIX_fog_texture
-  CONST_CAST(GLEW_SGIX_fog_texture) = _glewSearchExtension("GL_SGIX_fog_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_fog_texture) CONST_CAST(GLEW_SGIX_fog_texture) = !_glewInit_GL_SGIX_fog_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_fog_texture */
-#ifdef GL_SGIX_fragment_specular_lighting
-  CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = _glewSearchExtension("GL_SGIX_fragment_specular_lighting", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_fragment_specular_lighting) CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = !_glewInit_GL_SGIX_fragment_specular_lighting(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_fragment_specular_lighting */
-#ifdef GL_SGIX_framezoom
-  CONST_CAST(GLEW_SGIX_framezoom) = _glewSearchExtension("GL_SGIX_framezoom", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_framezoom) CONST_CAST(GLEW_SGIX_framezoom) = !_glewInit_GL_SGIX_framezoom(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_framezoom */
-#ifdef GL_SGIX_interlace
-  CONST_CAST(GLEW_SGIX_interlace) = _glewSearchExtension("GL_SGIX_interlace", extStart, extEnd);
-#endif /* GL_SGIX_interlace */
-#ifdef GL_SGIX_ir_instrument1
-  CONST_CAST(GLEW_SGIX_ir_instrument1) = _glewSearchExtension("GL_SGIX_ir_instrument1", extStart, extEnd);
-#endif /* GL_SGIX_ir_instrument1 */
-#ifdef GL_SGIX_list_priority
-  CONST_CAST(GLEW_SGIX_list_priority) = _glewSearchExtension("GL_SGIX_list_priority", extStart, extEnd);
-#endif /* GL_SGIX_list_priority */
-#ifdef GL_SGIX_pixel_texture
-  CONST_CAST(GLEW_SGIX_pixel_texture) = _glewSearchExtension("GL_SGIX_pixel_texture", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_pixel_texture) CONST_CAST(GLEW_SGIX_pixel_texture) = !_glewInit_GL_SGIX_pixel_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_pixel_texture */
-#ifdef GL_SGIX_pixel_texture_bits
-  CONST_CAST(GLEW_SGIX_pixel_texture_bits) = _glewSearchExtension("GL_SGIX_pixel_texture_bits", extStart, extEnd);
-#endif /* GL_SGIX_pixel_texture_bits */
-#ifdef GL_SGIX_reference_plane
-  CONST_CAST(GLEW_SGIX_reference_plane) = _glewSearchExtension("GL_SGIX_reference_plane", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_reference_plane) CONST_CAST(GLEW_SGIX_reference_plane) = !_glewInit_GL_SGIX_reference_plane(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_reference_plane */
-#ifdef GL_SGIX_resample
-  CONST_CAST(GLEW_SGIX_resample) = _glewSearchExtension("GL_SGIX_resample", extStart, extEnd);
-#endif /* GL_SGIX_resample */
-#ifdef GL_SGIX_shadow
-  CONST_CAST(GLEW_SGIX_shadow) = _glewSearchExtension("GL_SGIX_shadow", extStart, extEnd);
-#endif /* GL_SGIX_shadow */
-#ifdef GL_SGIX_shadow_ambient
-  CONST_CAST(GLEW_SGIX_shadow_ambient) = _glewSearchExtension("GL_SGIX_shadow_ambient", extStart, extEnd);
-#endif /* GL_SGIX_shadow_ambient */
-#ifdef GL_SGIX_sprite
-  CONST_CAST(GLEW_SGIX_sprite) = _glewSearchExtension("GL_SGIX_sprite", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_sprite) CONST_CAST(GLEW_SGIX_sprite) = !_glewInit_GL_SGIX_sprite(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_sprite */
-#ifdef GL_SGIX_tag_sample_buffer
-  CONST_CAST(GLEW_SGIX_tag_sample_buffer) = _glewSearchExtension("GL_SGIX_tag_sample_buffer", extStart, extEnd);
-  if (glewExperimental || GLEW_SGIX_tag_sample_buffer) CONST_CAST(GLEW_SGIX_tag_sample_buffer) = !_glewInit_GL_SGIX_tag_sample_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGIX_tag_sample_buffer */
-#ifdef GL_SGIX_texture_add_env
-  CONST_CAST(GLEW_SGIX_texture_add_env) = _glewSearchExtension("GL_SGIX_texture_add_env", extStart, extEnd);
-#endif /* GL_SGIX_texture_add_env */
-#ifdef GL_SGIX_texture_coordinate_clamp
-  CONST_CAST(GLEW_SGIX_texture_coordinate_clamp) = _glewSearchExtension("GL_SGIX_texture_coordinate_clamp", extStart, extEnd);
-#endif /* GL_SGIX_texture_coordinate_clamp */
-#ifdef GL_SGIX_texture_lod_bias
-  CONST_CAST(GLEW_SGIX_texture_lod_bias) = _glewSearchExtension("GL_SGIX_texture_lod_bias", extStart, extEnd);
-#endif /* GL_SGIX_texture_lod_bias */
-#ifdef GL_SGIX_texture_multi_buffer
-  CONST_CAST(GLEW_SGIX_texture_multi_buffer) = _glewSearchExtension("GL_SGIX_texture_multi_buffer", extStart, extEnd);
-#endif /* GL_SGIX_texture_multi_buffer */
-#ifdef GL_SGIX_texture_range
-  CONST_CAST(GLEW_SGIX_texture_range) = _glewSearchExtension("GL_SGIX_texture_range", extStart, extEnd);
-#endif /* GL_SGIX_texture_range */
-#ifdef GL_SGIX_texture_scale_bias
-  CONST_CAST(GLEW_SGIX_texture_scale_bias) = _glewSearchExtension("GL_SGIX_texture_scale_bias", extStart, extEnd);
-#endif /* GL_SGIX_texture_scale_bias */
-#ifdef GL_SGIX_vertex_preclip
-  CONST_CAST(GLEW_SGIX_vertex_preclip) = _glewSearchExtension("GL_SGIX_vertex_preclip", extStart, extEnd);
-#endif /* GL_SGIX_vertex_preclip */
-#ifdef GL_SGIX_vertex_preclip_hint
-  CONST_CAST(GLEW_SGIX_vertex_preclip_hint) = _glewSearchExtension("GL_SGIX_vertex_preclip_hint", extStart, extEnd);
-#endif /* GL_SGIX_vertex_preclip_hint */
-#ifdef GL_SGIX_ycrcb
-  CONST_CAST(GLEW_SGIX_ycrcb) = _glewSearchExtension("GL_SGIX_ycrcb", extStart, extEnd);
-#endif /* GL_SGIX_ycrcb */
-#ifdef GL_SGI_color_matrix
-  CONST_CAST(GLEW_SGI_color_matrix) = _glewSearchExtension("GL_SGI_color_matrix", extStart, extEnd);
-#endif /* GL_SGI_color_matrix */
-#ifdef GL_SGI_color_table
-  CONST_CAST(GLEW_SGI_color_table) = _glewSearchExtension("GL_SGI_color_table", extStart, extEnd);
-  if (glewExperimental || GLEW_SGI_color_table) CONST_CAST(GLEW_SGI_color_table) = !_glewInit_GL_SGI_color_table(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SGI_color_table */
-#ifdef GL_SGI_texture_color_table
-  CONST_CAST(GLEW_SGI_texture_color_table) = _glewSearchExtension("GL_SGI_texture_color_table", extStart, extEnd);
-#endif /* GL_SGI_texture_color_table */
-#ifdef GL_SUNX_constant_data
-  CONST_CAST(GLEW_SUNX_constant_data) = _glewSearchExtension("GL_SUNX_constant_data", extStart, extEnd);
-  if (glewExperimental || GLEW_SUNX_constant_data) CONST_CAST(GLEW_SUNX_constant_data) = !_glewInit_GL_SUNX_constant_data(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SUNX_constant_data */
-#ifdef GL_SUN_convolution_border_modes
-  CONST_CAST(GLEW_SUN_convolution_border_modes) = _glewSearchExtension("GL_SUN_convolution_border_modes", extStart, extEnd);
-#endif /* GL_SUN_convolution_border_modes */
-#ifdef GL_SUN_global_alpha
-  CONST_CAST(GLEW_SUN_global_alpha) = _glewSearchExtension("GL_SUN_global_alpha", extStart, extEnd);
-  if (glewExperimental || GLEW_SUN_global_alpha) CONST_CAST(GLEW_SUN_global_alpha) = !_glewInit_GL_SUN_global_alpha(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SUN_global_alpha */
-#ifdef GL_SUN_mesh_array
-  CONST_CAST(GLEW_SUN_mesh_array) = _glewSearchExtension("GL_SUN_mesh_array", extStart, extEnd);
-#endif /* GL_SUN_mesh_array */
-#ifdef GL_SUN_read_video_pixels
-  CONST_CAST(GLEW_SUN_read_video_pixels) = _glewSearchExtension("GL_SUN_read_video_pixels", extStart, extEnd);
-  if (glewExperimental || GLEW_SUN_read_video_pixels) CONST_CAST(GLEW_SUN_read_video_pixels) = !_glewInit_GL_SUN_read_video_pixels(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SUN_read_video_pixels */
-#ifdef GL_SUN_slice_accum
-  CONST_CAST(GLEW_SUN_slice_accum) = _glewSearchExtension("GL_SUN_slice_accum", extStart, extEnd);
-#endif /* GL_SUN_slice_accum */
-#ifdef GL_SUN_triangle_list
-  CONST_CAST(GLEW_SUN_triangle_list) = _glewSearchExtension("GL_SUN_triangle_list", extStart, extEnd);
-  if (glewExperimental || GLEW_SUN_triangle_list) CONST_CAST(GLEW_SUN_triangle_list) = !_glewInit_GL_SUN_triangle_list(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SUN_triangle_list */
-#ifdef GL_SUN_vertex
-  CONST_CAST(GLEW_SUN_vertex) = _glewSearchExtension("GL_SUN_vertex", extStart, extEnd);
-  if (glewExperimental || GLEW_SUN_vertex) CONST_CAST(GLEW_SUN_vertex) = !_glewInit_GL_SUN_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_SUN_vertex */
-#ifdef GL_WIN_phong_shading
-  CONST_CAST(GLEW_WIN_phong_shading) = _glewSearchExtension("GL_WIN_phong_shading", extStart, extEnd);
-#endif /* GL_WIN_phong_shading */
-#ifdef GL_WIN_specular_fog
-  CONST_CAST(GLEW_WIN_specular_fog) = _glewSearchExtension("GL_WIN_specular_fog", extStart, extEnd);
-#endif /* GL_WIN_specular_fog */
-#ifdef GL_WIN_swap_hint
-  CONST_CAST(GLEW_WIN_swap_hint) = _glewSearchExtension("GL_WIN_swap_hint", extStart, extEnd);
-  if (glewExperimental || GLEW_WIN_swap_hint) CONST_CAST(GLEW_WIN_swap_hint) = !_glewInit_GL_WIN_swap_hint(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GL_WIN_swap_hint */
-
-  return GLEW_OK;
-}
-
-
-#if defined(_WIN32)
-
-#if !defined(GLEW_MX)
-
-PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;
-
-PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD = NULL;
-PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD = NULL;
-PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD = NULL;
-PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD = NULL;
-PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD = NULL;
-PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD = NULL;
-PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD = NULL;
-PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD = NULL;
-PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD = NULL;
-
-PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB = NULL;
-PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB = NULL;
-PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB = NULL;
-PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB = NULL;
-
-PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB = NULL;
-
-PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB = NULL;
-
-PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB = NULL;
-PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB = NULL;
-
-PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB = NULL;
-PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB = NULL;
-PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB = NULL;
-PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB = NULL;
-PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB = NULL;
-
-PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB = NULL;
-PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB = NULL;
-PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB = NULL;
-
-PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB = NULL;
-PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB = NULL;
-PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB = NULL;
-
-PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT = NULL;
-PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT = NULL;
-PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT = NULL;
-PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT = NULL;
-
-PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT = NULL;
-
-PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT = NULL;
-PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT = NULL;
-
-PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT = NULL;
-PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT = NULL;
-PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT = NULL;
-PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT = NULL;
-PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT = NULL;
-
-PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT = NULL;
-PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT = NULL;
-PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT = NULL;
-
-PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT = NULL;
-PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT = NULL;
-
-PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D = NULL;
-PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D = NULL;
-
-PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D = NULL;
-PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D = NULL;
-PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D = NULL;
-PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D = NULL;
-
-PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D = NULL;
-PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D = NULL;
-PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D = NULL;
-PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D = NULL;
-PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D = NULL;
-PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D = NULL;
-PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D = NULL;
-PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D = NULL;
-PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D = NULL;
-PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D = NULL;
-PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D = NULL;
-PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D = NULL;
-
-PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D = NULL;
-PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D = NULL;
-PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D = NULL;
-PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D = NULL;
-
-PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D = NULL;
-PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D = NULL;
-PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D = NULL;
-PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D = NULL;
-
-PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D = NULL;
-PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D = NULL;
-PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D = NULL;
-PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D = NULL;
-
-PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV = NULL;
-PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV = NULL;
-PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV = NULL;
-PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV = NULL;
-PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV = NULL;
-PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV = NULL;
-PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV = NULL;
-PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV = NULL;
-
-PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV = NULL;
-
-PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV = NULL;
-PFNWGLDELETEDCNVPROC __wglewDeleteDCNV = NULL;
-PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV = NULL;
-PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV = NULL;
-PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV = NULL;
-
-PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV = NULL;
-PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV = NULL;
-PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV = NULL;
-
-PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV = NULL;
-PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV = NULL;
-PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV = NULL;
-PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV = NULL;
-PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV = NULL;
-PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV = NULL;
-
-PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV = NULL;
-PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV = NULL;
-
-PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV = NULL;
-PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV = NULL;
-PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV = NULL;
-PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV = NULL;
-PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV = NULL;
-
-PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV = NULL;
-PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV = NULL;
-PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV = NULL;
-PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV = NULL;
-PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV = NULL;
-PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV = NULL;
-
-PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML = NULL;
-PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML = NULL;
-PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML = NULL;
-PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML = NULL;
-PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML = NULL;
-PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML = NULL;
-GLboolean __WGLEW_3DFX_multisample = GL_FALSE;
-GLboolean __WGLEW_3DL_stereo_control = GL_FALSE;
-GLboolean __WGLEW_AMD_gpu_association = GL_FALSE;
-GLboolean __WGLEW_ARB_buffer_region = GL_FALSE;
-GLboolean __WGLEW_ARB_create_context = GL_FALSE;
-GLboolean __WGLEW_ARB_create_context_profile = GL_FALSE;
-GLboolean __WGLEW_ARB_create_context_robustness = GL_FALSE;
-GLboolean __WGLEW_ARB_extensions_string = GL_FALSE;
-GLboolean __WGLEW_ARB_framebuffer_sRGB = GL_FALSE;
-GLboolean __WGLEW_ARB_make_current_read = GL_FALSE;
-GLboolean __WGLEW_ARB_multisample = GL_FALSE;
-GLboolean __WGLEW_ARB_pbuffer = GL_FALSE;
-GLboolean __WGLEW_ARB_pixel_format = GL_FALSE;
-GLboolean __WGLEW_ARB_pixel_format_float = GL_FALSE;
-GLboolean __WGLEW_ARB_render_texture = GL_FALSE;
-GLboolean __WGLEW_ATI_pixel_format_float = GL_FALSE;
-GLboolean __WGLEW_ATI_render_texture_rectangle = GL_FALSE;
-GLboolean __WGLEW_EXT_create_context_es2_profile = GL_FALSE;
-GLboolean __WGLEW_EXT_create_context_es_profile = GL_FALSE;
-GLboolean __WGLEW_EXT_depth_float = GL_FALSE;
-GLboolean __WGLEW_EXT_display_color_table = GL_FALSE;
-GLboolean __WGLEW_EXT_extensions_string = GL_FALSE;
-GLboolean __WGLEW_EXT_framebuffer_sRGB = GL_FALSE;
-GLboolean __WGLEW_EXT_make_current_read = GL_FALSE;
-GLboolean __WGLEW_EXT_multisample = GL_FALSE;
-GLboolean __WGLEW_EXT_pbuffer = GL_FALSE;
-GLboolean __WGLEW_EXT_pixel_format = GL_FALSE;
-GLboolean __WGLEW_EXT_pixel_format_packed_float = GL_FALSE;
-GLboolean __WGLEW_EXT_swap_control = GL_FALSE;
-GLboolean __WGLEW_EXT_swap_control_tear = GL_FALSE;
-GLboolean __WGLEW_I3D_digital_video_control = GL_FALSE;
-GLboolean __WGLEW_I3D_gamma = GL_FALSE;
-GLboolean __WGLEW_I3D_genlock = GL_FALSE;
-GLboolean __WGLEW_I3D_image_buffer = GL_FALSE;
-GLboolean __WGLEW_I3D_swap_frame_lock = GL_FALSE;
-GLboolean __WGLEW_I3D_swap_frame_usage = GL_FALSE;
-GLboolean __WGLEW_NV_DX_interop = GL_FALSE;
-GLboolean __WGLEW_NV_DX_interop2 = GL_FALSE;
-GLboolean __WGLEW_NV_copy_image = GL_FALSE;
-GLboolean __WGLEW_NV_float_buffer = GL_FALSE;
-GLboolean __WGLEW_NV_gpu_affinity = GL_FALSE;
-GLboolean __WGLEW_NV_multisample_coverage = GL_FALSE;
-GLboolean __WGLEW_NV_present_video = GL_FALSE;
-GLboolean __WGLEW_NV_render_depth_texture = GL_FALSE;
-GLboolean __WGLEW_NV_render_texture_rectangle = GL_FALSE;
-GLboolean __WGLEW_NV_swap_group = GL_FALSE;
-GLboolean __WGLEW_NV_vertex_array_range = GL_FALSE;
-GLboolean __WGLEW_NV_video_capture = GL_FALSE;
-GLboolean __WGLEW_NV_video_output = GL_FALSE;
-GLboolean __WGLEW_OML_sync_control = GL_FALSE;
-
-#endif /* !GLEW_MX */
-
-#ifdef WGL_3DFX_multisample
-
-#endif /* WGL_3DFX_multisample */
-
-#ifdef WGL_3DL_stereo_control
-
-static GLboolean _glewInit_WGL_3DL_stereo_control (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglSetStereoEmitterState3DL = (PFNWGLSETSTEREOEMITTERSTATE3DLPROC)glewGetProcAddress((const GLubyte*)"wglSetStereoEmitterState3DL")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_3DL_stereo_control */
-
-#ifdef WGL_AMD_gpu_association
-
-static GLboolean _glewInit_WGL_AMD_gpu_association (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBlitContextFramebufferAMD = (PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC)glewGetProcAddress((const GLubyte*)"wglBlitContextFramebufferAMD")) == NULL) || r;
-  r = ((wglCreateAssociatedContextAMD = (PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglCreateAssociatedContextAMD")) == NULL) || r;
-  r = ((wglCreateAssociatedContextAttribsAMD = (PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC)glewGetProcAddress((const GLubyte*)"wglCreateAssociatedContextAttribsAMD")) == NULL) || r;
-  r = ((wglDeleteAssociatedContextAMD = (PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglDeleteAssociatedContextAMD")) == NULL) || r;
-  r = ((wglGetContextGPUIDAMD = (PFNWGLGETCONTEXTGPUIDAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetContextGPUIDAMD")) == NULL) || r;
-  r = ((wglGetCurrentAssociatedContextAMD = (PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentAssociatedContextAMD")) == NULL) || r;
-  r = ((wglGetGPUIDsAMD = (PFNWGLGETGPUIDSAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetGPUIDsAMD")) == NULL) || r;
-  r = ((wglGetGPUInfoAMD = (PFNWGLGETGPUINFOAMDPROC)glewGetProcAddress((const GLubyte*)"wglGetGPUInfoAMD")) == NULL) || r;
-  r = ((wglMakeAssociatedContextCurrentAMD = (PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC)glewGetProcAddress((const GLubyte*)"wglMakeAssociatedContextCurrentAMD")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_AMD_gpu_association */
-
-#ifdef WGL_ARB_buffer_region
-
-static GLboolean _glewInit_WGL_ARB_buffer_region (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCreateBufferRegionARB = (PFNWGLCREATEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateBufferRegionARB")) == NULL) || r;
-  r = ((wglDeleteBufferRegionARB = (PFNWGLDELETEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglDeleteBufferRegionARB")) == NULL) || r;
-  r = ((wglRestoreBufferRegionARB = (PFNWGLRESTOREBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglRestoreBufferRegionARB")) == NULL) || r;
-  r = ((wglSaveBufferRegionARB = (PFNWGLSAVEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglSaveBufferRegionARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_buffer_region */
-
-#ifdef WGL_ARB_create_context
-
-static GLboolean _glewInit_WGL_ARB_create_context (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateContextAttribsARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_create_context */
-
-#ifdef WGL_ARB_create_context_profile
-
-#endif /* WGL_ARB_create_context_profile */
-
-#ifdef WGL_ARB_create_context_robustness
-
-#endif /* WGL_ARB_create_context_robustness */
-
-#ifdef WGL_ARB_extensions_string
-
-static GLboolean _glewInit_WGL_ARB_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_extensions_string */
-
-#ifdef WGL_ARB_framebuffer_sRGB
-
-#endif /* WGL_ARB_framebuffer_sRGB */
-
-#ifdef WGL_ARB_make_current_read
-
-static GLboolean _glewInit_WGL_ARB_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetCurrentReadDCARB = (PFNWGLGETCURRENTREADDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCARB")) == NULL) || r;
-  r = ((wglMakeContextCurrentARB = (PFNWGLMAKECONTEXTCURRENTARBPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_make_current_read */
-
-#ifdef WGL_ARB_multisample
-
-#endif /* WGL_ARB_multisample */
-
-#ifdef WGL_ARB_pbuffer
-
-static GLboolean _glewInit_WGL_ARB_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCreatePbufferARB = (PFNWGLCREATEPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferARB")) == NULL) || r;
-  r = ((wglDestroyPbufferARB = (PFNWGLDESTROYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferARB")) == NULL) || r;
-  r = ((wglGetPbufferDCARB = (PFNWGLGETPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCARB")) == NULL) || r;
-  r = ((wglQueryPbufferARB = (PFNWGLQUERYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferARB")) == NULL) || r;
-  r = ((wglReleasePbufferDCARB = (PFNWGLRELEASEPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_pbuffer */
-
-#ifdef WGL_ARB_pixel_format
-
-static GLboolean _glewInit_WGL_ARB_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatARB")) == NULL) || r;
-  r = ((wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvARB")) == NULL) || r;
-  r = ((wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_pixel_format */
-
-#ifdef WGL_ARB_pixel_format_float
-
-#endif /* WGL_ARB_pixel_format_float */
-
-#ifdef WGL_ARB_render_texture
-
-static GLboolean _glewInit_WGL_ARB_render_texture (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindTexImageARB = (PFNWGLBINDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglBindTexImageARB")) == NULL) || r;
-  r = ((wglReleaseTexImageARB = (PFNWGLRELEASETEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglReleaseTexImageARB")) == NULL) || r;
-  r = ((wglSetPbufferAttribARB = (PFNWGLSETPBUFFERATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"wglSetPbufferAttribARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_ARB_render_texture */
-
-#ifdef WGL_ATI_pixel_format_float
-
-#endif /* WGL_ATI_pixel_format_float */
-
-#ifdef WGL_ATI_render_texture_rectangle
-
-#endif /* WGL_ATI_render_texture_rectangle */
-
-#ifdef WGL_EXT_create_context_es2_profile
-
-#endif /* WGL_EXT_create_context_es2_profile */
-
-#ifdef WGL_EXT_create_context_es_profile
-
-#endif /* WGL_EXT_create_context_es_profile */
-
-#ifdef WGL_EXT_depth_float
-
-#endif /* WGL_EXT_depth_float */
-
-#ifdef WGL_EXT_display_color_table
-
-static GLboolean _glewInit_WGL_EXT_display_color_table (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindDisplayColorTableEXT = (PFNWGLBINDDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglBindDisplayColorTableEXT")) == NULL) || r;
-  r = ((wglCreateDisplayColorTableEXT = (PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglCreateDisplayColorTableEXT")) == NULL) || r;
-  r = ((wglDestroyDisplayColorTableEXT = (PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyDisplayColorTableEXT")) == NULL) || r;
-  r = ((wglLoadDisplayColorTableEXT = (PFNWGLLOADDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglLoadDisplayColorTableEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_display_color_table */
-
-#ifdef WGL_EXT_extensions_string
-
-static GLboolean _glewInit_WGL_EXT_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_extensions_string */
-
-#ifdef WGL_EXT_framebuffer_sRGB
-
-#endif /* WGL_EXT_framebuffer_sRGB */
-
-#ifdef WGL_EXT_make_current_read
-
-static GLboolean _glewInit_WGL_EXT_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetCurrentReadDCEXT = (PFNWGLGETCURRENTREADDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCEXT")) == NULL) || r;
-  r = ((wglMakeContextCurrentEXT = (PFNWGLMAKECONTEXTCURRENTEXTPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_make_current_read */
-
-#ifdef WGL_EXT_multisample
-
-#endif /* WGL_EXT_multisample */
-
-#ifdef WGL_EXT_pbuffer
-
-static GLboolean _glewInit_WGL_EXT_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCreatePbufferEXT = (PFNWGLCREATEPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferEXT")) == NULL) || r;
-  r = ((wglDestroyPbufferEXT = (PFNWGLDESTROYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferEXT")) == NULL) || r;
-  r = ((wglGetPbufferDCEXT = (PFNWGLGETPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCEXT")) == NULL) || r;
-  r = ((wglQueryPbufferEXT = (PFNWGLQUERYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferEXT")) == NULL) || r;
-  r = ((wglReleasePbufferDCEXT = (PFNWGLRELEASEPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_pbuffer */
-
-#ifdef WGL_EXT_pixel_format
-
-static GLboolean _glewInit_WGL_EXT_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglChoosePixelFormatEXT = (PFNWGLCHOOSEPIXELFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatEXT")) == NULL) || r;
-  r = ((wglGetPixelFormatAttribfvEXT = (PFNWGLGETPIXELFORMATATTRIBFVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvEXT")) == NULL) || r;
-  r = ((wglGetPixelFormatAttribivEXT = (PFNWGLGETPIXELFORMATATTRIBIVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_pixel_format */
-
-#ifdef WGL_EXT_pixel_format_packed_float
-
-#endif /* WGL_EXT_pixel_format_packed_float */
-
-#ifdef WGL_EXT_swap_control
-
-static GLboolean _glewInit_WGL_EXT_swap_control (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetSwapIntervalEXT")) == NULL) || r;
-  r = ((wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglSwapIntervalEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_EXT_swap_control */
-
-#ifdef WGL_EXT_swap_control_tear
-
-#endif /* WGL_EXT_swap_control_tear */
-
-#ifdef WGL_I3D_digital_video_control
-
-static GLboolean _glewInit_WGL_I3D_digital_video_control (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetDigitalVideoParametersI3D = (PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetDigitalVideoParametersI3D")) == NULL) || r;
-  r = ((wglSetDigitalVideoParametersI3D = (PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetDigitalVideoParametersI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_digital_video_control */
-
-#ifdef WGL_I3D_gamma
-
-static GLboolean _glewInit_WGL_I3D_gamma (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetGammaTableI3D = (PFNWGLGETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableI3D")) == NULL) || r;
-  r = ((wglGetGammaTableParametersI3D = (PFNWGLGETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableParametersI3D")) == NULL) || r;
-  r = ((wglSetGammaTableI3D = (PFNWGLSETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableI3D")) == NULL) || r;
-  r = ((wglSetGammaTableParametersI3D = (PFNWGLSETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableParametersI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_gamma */
-
-#ifdef WGL_I3D_genlock
-
-static GLboolean _glewInit_WGL_I3D_genlock (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglDisableGenlockI3D = (PFNWGLDISABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableGenlockI3D")) == NULL) || r;
-  r = ((wglEnableGenlockI3D = (PFNWGLENABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableGenlockI3D")) == NULL) || r;
-  r = ((wglGenlockSampleRateI3D = (PFNWGLGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSampleRateI3D")) == NULL) || r;
-  r = ((wglGenlockSourceDelayI3D = (PFNWGLGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceDelayI3D")) == NULL) || r;
-  r = ((wglGenlockSourceEdgeI3D = (PFNWGLGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceEdgeI3D")) == NULL) || r;
-  r = ((wglGenlockSourceI3D = (PFNWGLGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceI3D")) == NULL) || r;
-  r = ((wglGetGenlockSampleRateI3D = (PFNWGLGETGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSampleRateI3D")) == NULL) || r;
-  r = ((wglGetGenlockSourceDelayI3D = (PFNWGLGETGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceDelayI3D")) == NULL) || r;
-  r = ((wglGetGenlockSourceEdgeI3D = (PFNWGLGETGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceEdgeI3D")) == NULL) || r;
-  r = ((wglGetGenlockSourceI3D = (PFNWGLGETGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceI3D")) == NULL) || r;
-  r = ((wglIsEnabledGenlockI3D = (PFNWGLISENABLEDGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledGenlockI3D")) == NULL) || r;
-  r = ((wglQueryGenlockMaxSourceDelayI3D = (PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryGenlockMaxSourceDelayI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_genlock */
-
-#ifdef WGL_I3D_image_buffer
-
-static GLboolean _glewInit_WGL_I3D_image_buffer (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglAssociateImageBufferEventsI3D = (PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglAssociateImageBufferEventsI3D")) == NULL) || r;
-  r = ((wglCreateImageBufferI3D = (PFNWGLCREATEIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglCreateImageBufferI3D")) == NULL) || r;
-  r = ((wglDestroyImageBufferI3D = (PFNWGLDESTROYIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglDestroyImageBufferI3D")) == NULL) || r;
-  r = ((wglReleaseImageBufferEventsI3D = (PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglReleaseImageBufferEventsI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_image_buffer */
-
-#ifdef WGL_I3D_swap_frame_lock
-
-static GLboolean _glewInit_WGL_I3D_swap_frame_lock (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglDisableFrameLockI3D = (PFNWGLDISABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableFrameLockI3D")) == NULL) || r;
-  r = ((wglEnableFrameLockI3D = (PFNWGLENABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableFrameLockI3D")) == NULL) || r;
-  r = ((wglIsEnabledFrameLockI3D = (PFNWGLISENABLEDFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledFrameLockI3D")) == NULL) || r;
-  r = ((wglQueryFrameLockMasterI3D = (PFNWGLQUERYFRAMELOCKMASTERI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameLockMasterI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_swap_frame_lock */
-
-#ifdef WGL_I3D_swap_frame_usage
-
-static GLboolean _glewInit_WGL_I3D_swap_frame_usage (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBeginFrameTrackingI3D = (PFNWGLBEGINFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglBeginFrameTrackingI3D")) == NULL) || r;
-  r = ((wglEndFrameTrackingI3D = (PFNWGLENDFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglEndFrameTrackingI3D")) == NULL) || r;
-  r = ((wglGetFrameUsageI3D = (PFNWGLGETFRAMEUSAGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetFrameUsageI3D")) == NULL) || r;
-  r = ((wglQueryFrameTrackingI3D = (PFNWGLQUERYFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameTrackingI3D")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_I3D_swap_frame_usage */
-
-#ifdef WGL_NV_DX_interop
-
-static GLboolean _glewInit_WGL_NV_DX_interop (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglDXCloseDeviceNV = (PFNWGLDXCLOSEDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglDXCloseDeviceNV")) == NULL) || r;
-  r = ((wglDXLockObjectsNV = (PFNWGLDXLOCKOBJECTSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXLockObjectsNV")) == NULL) || r;
-  r = ((wglDXObjectAccessNV = (PFNWGLDXOBJECTACCESSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXObjectAccessNV")) == NULL) || r;
-  r = ((wglDXOpenDeviceNV = (PFNWGLDXOPENDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglDXOpenDeviceNV")) == NULL) || r;
-  r = ((wglDXRegisterObjectNV = (PFNWGLDXREGISTEROBJECTNVPROC)glewGetProcAddress((const GLubyte*)"wglDXRegisterObjectNV")) == NULL) || r;
-  r = ((wglDXSetResourceShareHandleNV = (PFNWGLDXSETRESOURCESHAREHANDLENVPROC)glewGetProcAddress((const GLubyte*)"wglDXSetResourceShareHandleNV")) == NULL) || r;
-  r = ((wglDXUnlockObjectsNV = (PFNWGLDXUNLOCKOBJECTSNVPROC)glewGetProcAddress((const GLubyte*)"wglDXUnlockObjectsNV")) == NULL) || r;
-  r = ((wglDXUnregisterObjectNV = (PFNWGLDXUNREGISTEROBJECTNVPROC)glewGetProcAddress((const GLubyte*)"wglDXUnregisterObjectNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_DX_interop */
-
-#ifdef WGL_NV_DX_interop2
-
-#endif /* WGL_NV_DX_interop2 */
-
-#ifdef WGL_NV_copy_image
-
-static GLboolean _glewInit_WGL_NV_copy_image (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCopyImageSubDataNV = (PFNWGLCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"wglCopyImageSubDataNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_copy_image */
-
-#ifdef WGL_NV_float_buffer
-
-#endif /* WGL_NV_float_buffer */
-
-#ifdef WGL_NV_gpu_affinity
-
-static GLboolean _glewInit_WGL_NV_gpu_affinity (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglCreateAffinityDCNV = (PFNWGLCREATEAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglCreateAffinityDCNV")) == NULL) || r;
-  r = ((wglDeleteDCNV = (PFNWGLDELETEDCNVPROC)glewGetProcAddress((const GLubyte*)"wglDeleteDCNV")) == NULL) || r;
-  r = ((wglEnumGpuDevicesNV = (PFNWGLENUMGPUDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpuDevicesNV")) == NULL) || r;
-  r = ((wglEnumGpusFromAffinityDCNV = (PFNWGLENUMGPUSFROMAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusFromAffinityDCNV")) == NULL) || r;
-  r = ((wglEnumGpusNV = (PFNWGLENUMGPUSNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_gpu_affinity */
-
-#ifdef WGL_NV_multisample_coverage
-
-#endif /* WGL_NV_multisample_coverage */
-
-#ifdef WGL_NV_present_video
-
-static GLboolean _glewInit_WGL_NV_present_video (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindVideoDeviceNV = (PFNWGLBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoDeviceNV")) == NULL) || r;
-  r = ((wglEnumerateVideoDevicesNV = (PFNWGLENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoDevicesNV")) == NULL) || r;
-  r = ((wglQueryCurrentContextNV = (PFNWGLQUERYCURRENTCONTEXTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryCurrentContextNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_present_video */
-
-#ifdef WGL_NV_render_depth_texture
-
-#endif /* WGL_NV_render_depth_texture */
-
-#ifdef WGL_NV_render_texture_rectangle
-
-#endif /* WGL_NV_render_texture_rectangle */
-
-#ifdef WGL_NV_swap_group
-
-static GLboolean _glewInit_WGL_NV_swap_group (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindSwapBarrierNV = (PFNWGLBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"wglBindSwapBarrierNV")) == NULL) || r;
-  r = ((wglJoinSwapGroupNV = (PFNWGLJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglJoinSwapGroupNV")) == NULL) || r;
-  r = ((wglQueryFrameCountNV = (PFNWGLQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameCountNV")) == NULL) || r;
-  r = ((wglQueryMaxSwapGroupsNV = (PFNWGLQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryMaxSwapGroupsNV")) == NULL) || r;
-  r = ((wglQuerySwapGroupNV = (PFNWGLQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglQuerySwapGroupNV")) == NULL) || r;
-  r = ((wglResetFrameCountNV = (PFNWGLRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglResetFrameCountNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_swap_group */
-
-#ifdef WGL_NV_vertex_array_range
-
-static GLboolean _glewInit_WGL_NV_vertex_array_range (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglAllocateMemoryNV = (PFNWGLALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglAllocateMemoryNV")) == NULL) || r;
-  r = ((wglFreeMemoryNV = (PFNWGLFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglFreeMemoryNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_vertex_array_range */
-
-#ifdef WGL_NV_video_capture
-
-static GLboolean _glewInit_WGL_NV_video_capture (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindVideoCaptureDeviceNV = (PFNWGLBINDVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((wglEnumerateVideoCaptureDevicesNV = (PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoCaptureDevicesNV")) == NULL) || r;
-  r = ((wglLockVideoCaptureDeviceNV = (PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglLockVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((wglQueryVideoCaptureDeviceNV = (PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglQueryVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((wglReleaseVideoCaptureDeviceNV = (PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoCaptureDeviceNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_video_capture */
-
-#ifdef WGL_NV_video_output
-
-static GLboolean _glewInit_WGL_NV_video_output (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglBindVideoImageNV = (PFNWGLBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoImageNV")) == NULL) || r;
-  r = ((wglGetVideoDeviceNV = (PFNWGLGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoDeviceNV")) == NULL) || r;
-  r = ((wglGetVideoInfoNV = (PFNWGLGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoInfoNV")) == NULL) || r;
-  r = ((wglReleaseVideoDeviceNV = (PFNWGLRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoDeviceNV")) == NULL) || r;
-  r = ((wglReleaseVideoImageNV = (PFNWGLRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoImageNV")) == NULL) || r;
-  r = ((wglSendPbufferToVideoNV = (PFNWGLSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"wglSendPbufferToVideoNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_NV_video_output */
-
-#ifdef WGL_OML_sync_control
-
-static GLboolean _glewInit_WGL_OML_sync_control (WGLEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((wglGetMscRateOML = (PFNWGLGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetMscRateOML")) == NULL) || r;
-  r = ((wglGetSyncValuesOML = (PFNWGLGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetSyncValuesOML")) == NULL) || r;
-  r = ((wglSwapBuffersMscOML = (PFNWGLSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapBuffersMscOML")) == NULL) || r;
-  r = ((wglSwapLayerBuffersMscOML = (PFNWGLSWAPLAYERBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapLayerBuffersMscOML")) == NULL) || r;
-  r = ((wglWaitForMscOML = (PFNWGLWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForMscOML")) == NULL) || r;
-  r = ((wglWaitForSbcOML = (PFNWGLWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForSbcOML")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* WGL_OML_sync_control */
-
-/* ------------------------------------------------------------------------- */
-
-static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL;
-static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL;
-
-GLboolean GLEWAPIENTRY wglewGetExtension (const char* name)
-{    
-  const GLubyte* start;
-  const GLubyte* end;
-  if (_wglewGetExtensionsStringARB == NULL)
-    if (_wglewGetExtensionsStringEXT == NULL)
-      return GL_FALSE;
-    else
-      start = (const GLubyte*)_wglewGetExtensionsStringEXT();
-  else
-    start = (const GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC());
-  if (start == 0)
-    return GL_FALSE;
-  end = start + _glewStrLen(start);
-  return _glewSearchExtension(name, start, end);
-}
-
-GLenum GLEWAPIENTRY wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST)
-{
-  GLboolean crippled;
-  const GLubyte* extStart;
-  const GLubyte* extEnd;
-  /* find wgl extension string query functions */
-  _wglewGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB");
-  _wglewGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT");
-  /* query wgl extension string */
-  if (_wglewGetExtensionsStringARB == NULL)
-    if (_wglewGetExtensionsStringEXT == NULL)
-      extStart = (const GLubyte*)"";
-    else
-      extStart = (const GLubyte*)_wglewGetExtensionsStringEXT();
-  else
-    extStart = (const GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC());
-  extEnd = extStart + _glewStrLen(extStart);
-  /* initialize extensions */
-  crippled = _wglewGetExtensionsStringARB == NULL && _wglewGetExtensionsStringEXT == NULL;
-#ifdef WGL_3DFX_multisample
-  CONST_CAST(WGLEW_3DFX_multisample) = _glewSearchExtension("WGL_3DFX_multisample", extStart, extEnd);
-#endif /* WGL_3DFX_multisample */
-#ifdef WGL_3DL_stereo_control
-  CONST_CAST(WGLEW_3DL_stereo_control) = _glewSearchExtension("WGL_3DL_stereo_control", extStart, extEnd);
-  if (glewExperimental || WGLEW_3DL_stereo_control|| crippled) CONST_CAST(WGLEW_3DL_stereo_control)= !_glewInit_WGL_3DL_stereo_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_3DL_stereo_control */
-#ifdef WGL_AMD_gpu_association
-  CONST_CAST(WGLEW_AMD_gpu_association) = _glewSearchExtension("WGL_AMD_gpu_association", extStart, extEnd);
-  if (glewExperimental || WGLEW_AMD_gpu_association|| crippled) CONST_CAST(WGLEW_AMD_gpu_association)= !_glewInit_WGL_AMD_gpu_association(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_AMD_gpu_association */
-#ifdef WGL_ARB_buffer_region
-  CONST_CAST(WGLEW_ARB_buffer_region) = _glewSearchExtension("WGL_ARB_buffer_region", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_buffer_region|| crippled) CONST_CAST(WGLEW_ARB_buffer_region)= !_glewInit_WGL_ARB_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_buffer_region */
-#ifdef WGL_ARB_create_context
-  CONST_CAST(WGLEW_ARB_create_context) = _glewSearchExtension("WGL_ARB_create_context", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_create_context|| crippled) CONST_CAST(WGLEW_ARB_create_context)= !_glewInit_WGL_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_create_context */
-#ifdef WGL_ARB_create_context_profile
-  CONST_CAST(WGLEW_ARB_create_context_profile) = _glewSearchExtension("WGL_ARB_create_context_profile", extStart, extEnd);
-#endif /* WGL_ARB_create_context_profile */
-#ifdef WGL_ARB_create_context_robustness
-  CONST_CAST(WGLEW_ARB_create_context_robustness) = _glewSearchExtension("WGL_ARB_create_context_robustness", extStart, extEnd);
-#endif /* WGL_ARB_create_context_robustness */
-#ifdef WGL_ARB_extensions_string
-  CONST_CAST(WGLEW_ARB_extensions_string) = _glewSearchExtension("WGL_ARB_extensions_string", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_extensions_string|| crippled) CONST_CAST(WGLEW_ARB_extensions_string)= !_glewInit_WGL_ARB_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_extensions_string */
-#ifdef WGL_ARB_framebuffer_sRGB
-  CONST_CAST(WGLEW_ARB_framebuffer_sRGB) = _glewSearchExtension("WGL_ARB_framebuffer_sRGB", extStart, extEnd);
-#endif /* WGL_ARB_framebuffer_sRGB */
-#ifdef WGL_ARB_make_current_read
-  CONST_CAST(WGLEW_ARB_make_current_read) = _glewSearchExtension("WGL_ARB_make_current_read", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_make_current_read|| crippled) CONST_CAST(WGLEW_ARB_make_current_read)= !_glewInit_WGL_ARB_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_make_current_read */
-#ifdef WGL_ARB_multisample
-  CONST_CAST(WGLEW_ARB_multisample) = _glewSearchExtension("WGL_ARB_multisample", extStart, extEnd);
-#endif /* WGL_ARB_multisample */
-#ifdef WGL_ARB_pbuffer
-  CONST_CAST(WGLEW_ARB_pbuffer) = _glewSearchExtension("WGL_ARB_pbuffer", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_pbuffer|| crippled) CONST_CAST(WGLEW_ARB_pbuffer)= !_glewInit_WGL_ARB_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_pbuffer */
-#ifdef WGL_ARB_pixel_format
-  CONST_CAST(WGLEW_ARB_pixel_format) = _glewSearchExtension("WGL_ARB_pixel_format", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_pixel_format|| crippled) CONST_CAST(WGLEW_ARB_pixel_format)= !_glewInit_WGL_ARB_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_pixel_format */
-#ifdef WGL_ARB_pixel_format_float
-  CONST_CAST(WGLEW_ARB_pixel_format_float) = _glewSearchExtension("WGL_ARB_pixel_format_float", extStart, extEnd);
-#endif /* WGL_ARB_pixel_format_float */
-#ifdef WGL_ARB_render_texture
-  CONST_CAST(WGLEW_ARB_render_texture) = _glewSearchExtension("WGL_ARB_render_texture", extStart, extEnd);
-  if (glewExperimental || WGLEW_ARB_render_texture|| crippled) CONST_CAST(WGLEW_ARB_render_texture)= !_glewInit_WGL_ARB_render_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_ARB_render_texture */
-#ifdef WGL_ATI_pixel_format_float
-  CONST_CAST(WGLEW_ATI_pixel_format_float) = _glewSearchExtension("WGL_ATI_pixel_format_float", extStart, extEnd);
-#endif /* WGL_ATI_pixel_format_float */
-#ifdef WGL_ATI_render_texture_rectangle
-  CONST_CAST(WGLEW_ATI_render_texture_rectangle) = _glewSearchExtension("WGL_ATI_render_texture_rectangle", extStart, extEnd);
-#endif /* WGL_ATI_render_texture_rectangle */
-#ifdef WGL_EXT_create_context_es2_profile
-  CONST_CAST(WGLEW_EXT_create_context_es2_profile) = _glewSearchExtension("WGL_EXT_create_context_es2_profile", extStart, extEnd);
-#endif /* WGL_EXT_create_context_es2_profile */
-#ifdef WGL_EXT_create_context_es_profile
-  CONST_CAST(WGLEW_EXT_create_context_es_profile) = _glewSearchExtension("WGL_EXT_create_context_es_profile", extStart, extEnd);
-#endif /* WGL_EXT_create_context_es_profile */
-#ifdef WGL_EXT_depth_float
-  CONST_CAST(WGLEW_EXT_depth_float) = _glewSearchExtension("WGL_EXT_depth_float", extStart, extEnd);
-#endif /* WGL_EXT_depth_float */
-#ifdef WGL_EXT_display_color_table
-  CONST_CAST(WGLEW_EXT_display_color_table) = _glewSearchExtension("WGL_EXT_display_color_table", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_display_color_table|| crippled) CONST_CAST(WGLEW_EXT_display_color_table)= !_glewInit_WGL_EXT_display_color_table(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_display_color_table */
-#ifdef WGL_EXT_extensions_string
-  CONST_CAST(WGLEW_EXT_extensions_string) = _glewSearchExtension("WGL_EXT_extensions_string", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_extensions_string|| crippled) CONST_CAST(WGLEW_EXT_extensions_string)= !_glewInit_WGL_EXT_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_extensions_string */
-#ifdef WGL_EXT_framebuffer_sRGB
-  CONST_CAST(WGLEW_EXT_framebuffer_sRGB) = _glewSearchExtension("WGL_EXT_framebuffer_sRGB", extStart, extEnd);
-#endif /* WGL_EXT_framebuffer_sRGB */
-#ifdef WGL_EXT_make_current_read
-  CONST_CAST(WGLEW_EXT_make_current_read) = _glewSearchExtension("WGL_EXT_make_current_read", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_make_current_read|| crippled) CONST_CAST(WGLEW_EXT_make_current_read)= !_glewInit_WGL_EXT_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_make_current_read */
-#ifdef WGL_EXT_multisample
-  CONST_CAST(WGLEW_EXT_multisample) = _glewSearchExtension("WGL_EXT_multisample", extStart, extEnd);
-#endif /* WGL_EXT_multisample */
-#ifdef WGL_EXT_pbuffer
-  CONST_CAST(WGLEW_EXT_pbuffer) = _glewSearchExtension("WGL_EXT_pbuffer", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_pbuffer|| crippled) CONST_CAST(WGLEW_EXT_pbuffer)= !_glewInit_WGL_EXT_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_pbuffer */
-#ifdef WGL_EXT_pixel_format
-  CONST_CAST(WGLEW_EXT_pixel_format) = _glewSearchExtension("WGL_EXT_pixel_format", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_pixel_format|| crippled) CONST_CAST(WGLEW_EXT_pixel_format)= !_glewInit_WGL_EXT_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_pixel_format */
-#ifdef WGL_EXT_pixel_format_packed_float
-  CONST_CAST(WGLEW_EXT_pixel_format_packed_float) = _glewSearchExtension("WGL_EXT_pixel_format_packed_float", extStart, extEnd);
-#endif /* WGL_EXT_pixel_format_packed_float */
-#ifdef WGL_EXT_swap_control
-  CONST_CAST(WGLEW_EXT_swap_control) = _glewSearchExtension("WGL_EXT_swap_control", extStart, extEnd);
-  if (glewExperimental || WGLEW_EXT_swap_control|| crippled) CONST_CAST(WGLEW_EXT_swap_control)= !_glewInit_WGL_EXT_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_EXT_swap_control */
-#ifdef WGL_EXT_swap_control_tear
-  CONST_CAST(WGLEW_EXT_swap_control_tear) = _glewSearchExtension("WGL_EXT_swap_control_tear", extStart, extEnd);
-#endif /* WGL_EXT_swap_control_tear */
-#ifdef WGL_I3D_digital_video_control
-  CONST_CAST(WGLEW_I3D_digital_video_control) = _glewSearchExtension("WGL_I3D_digital_video_control", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_digital_video_control|| crippled) CONST_CAST(WGLEW_I3D_digital_video_control)= !_glewInit_WGL_I3D_digital_video_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_digital_video_control */
-#ifdef WGL_I3D_gamma
-  CONST_CAST(WGLEW_I3D_gamma) = _glewSearchExtension("WGL_I3D_gamma", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_gamma|| crippled) CONST_CAST(WGLEW_I3D_gamma)= !_glewInit_WGL_I3D_gamma(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_gamma */
-#ifdef WGL_I3D_genlock
-  CONST_CAST(WGLEW_I3D_genlock) = _glewSearchExtension("WGL_I3D_genlock", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_genlock|| crippled) CONST_CAST(WGLEW_I3D_genlock)= !_glewInit_WGL_I3D_genlock(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_genlock */
-#ifdef WGL_I3D_image_buffer
-  CONST_CAST(WGLEW_I3D_image_buffer) = _glewSearchExtension("WGL_I3D_image_buffer", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_image_buffer|| crippled) CONST_CAST(WGLEW_I3D_image_buffer)= !_glewInit_WGL_I3D_image_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_image_buffer */
-#ifdef WGL_I3D_swap_frame_lock
-  CONST_CAST(WGLEW_I3D_swap_frame_lock) = _glewSearchExtension("WGL_I3D_swap_frame_lock", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_swap_frame_lock|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_lock)= !_glewInit_WGL_I3D_swap_frame_lock(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_swap_frame_lock */
-#ifdef WGL_I3D_swap_frame_usage
-  CONST_CAST(WGLEW_I3D_swap_frame_usage) = _glewSearchExtension("WGL_I3D_swap_frame_usage", extStart, extEnd);
-  if (glewExperimental || WGLEW_I3D_swap_frame_usage|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_usage)= !_glewInit_WGL_I3D_swap_frame_usage(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_I3D_swap_frame_usage */
-#ifdef WGL_NV_DX_interop
-  CONST_CAST(WGLEW_NV_DX_interop) = _glewSearchExtension("WGL_NV_DX_interop", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_DX_interop|| crippled) CONST_CAST(WGLEW_NV_DX_interop)= !_glewInit_WGL_NV_DX_interop(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_DX_interop */
-#ifdef WGL_NV_DX_interop2
-  CONST_CAST(WGLEW_NV_DX_interop2) = _glewSearchExtension("WGL_NV_DX_interop2", extStart, extEnd);
-#endif /* WGL_NV_DX_interop2 */
-#ifdef WGL_NV_copy_image
-  CONST_CAST(WGLEW_NV_copy_image) = _glewSearchExtension("WGL_NV_copy_image", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_copy_image|| crippled) CONST_CAST(WGLEW_NV_copy_image)= !_glewInit_WGL_NV_copy_image(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_copy_image */
-#ifdef WGL_NV_float_buffer
-  CONST_CAST(WGLEW_NV_float_buffer) = _glewSearchExtension("WGL_NV_float_buffer", extStart, extEnd);
-#endif /* WGL_NV_float_buffer */
-#ifdef WGL_NV_gpu_affinity
-  CONST_CAST(WGLEW_NV_gpu_affinity) = _glewSearchExtension("WGL_NV_gpu_affinity", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_gpu_affinity|| crippled) CONST_CAST(WGLEW_NV_gpu_affinity)= !_glewInit_WGL_NV_gpu_affinity(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_gpu_affinity */
-#ifdef WGL_NV_multisample_coverage
-  CONST_CAST(WGLEW_NV_multisample_coverage) = _glewSearchExtension("WGL_NV_multisample_coverage", extStart, extEnd);
-#endif /* WGL_NV_multisample_coverage */
-#ifdef WGL_NV_present_video
-  CONST_CAST(WGLEW_NV_present_video) = _glewSearchExtension("WGL_NV_present_video", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_present_video|| crippled) CONST_CAST(WGLEW_NV_present_video)= !_glewInit_WGL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_present_video */
-#ifdef WGL_NV_render_depth_texture
-  CONST_CAST(WGLEW_NV_render_depth_texture) = _glewSearchExtension("WGL_NV_render_depth_texture", extStart, extEnd);
-#endif /* WGL_NV_render_depth_texture */
-#ifdef WGL_NV_render_texture_rectangle
-  CONST_CAST(WGLEW_NV_render_texture_rectangle) = _glewSearchExtension("WGL_NV_render_texture_rectangle", extStart, extEnd);
-#endif /* WGL_NV_render_texture_rectangle */
-#ifdef WGL_NV_swap_group
-  CONST_CAST(WGLEW_NV_swap_group) = _glewSearchExtension("WGL_NV_swap_group", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_swap_group|| crippled) CONST_CAST(WGLEW_NV_swap_group)= !_glewInit_WGL_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_swap_group */
-#ifdef WGL_NV_vertex_array_range
-  CONST_CAST(WGLEW_NV_vertex_array_range) = _glewSearchExtension("WGL_NV_vertex_array_range", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_vertex_array_range|| crippled) CONST_CAST(WGLEW_NV_vertex_array_range)= !_glewInit_WGL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_vertex_array_range */
-#ifdef WGL_NV_video_capture
-  CONST_CAST(WGLEW_NV_video_capture) = _glewSearchExtension("WGL_NV_video_capture", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_video_capture|| crippled) CONST_CAST(WGLEW_NV_video_capture)= !_glewInit_WGL_NV_video_capture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_video_capture */
-#ifdef WGL_NV_video_output
-  CONST_CAST(WGLEW_NV_video_output) = _glewSearchExtension("WGL_NV_video_output", extStart, extEnd);
-  if (glewExperimental || WGLEW_NV_video_output|| crippled) CONST_CAST(WGLEW_NV_video_output)= !_glewInit_WGL_NV_video_output(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_NV_video_output */
-#ifdef WGL_OML_sync_control
-  CONST_CAST(WGLEW_OML_sync_control) = _glewSearchExtension("WGL_OML_sync_control", extStart, extEnd);
-  if (glewExperimental || WGLEW_OML_sync_control|| crippled) CONST_CAST(WGLEW_OML_sync_control)= !_glewInit_WGL_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* WGL_OML_sync_control */
-
-  return GLEW_OK;
-}
-
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
-
-PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL;
-
-PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig = NULL;
-PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext = NULL;
-PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer = NULL;
-PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap = NULL;
-PFNGLXCREATEWINDOWPROC __glewXCreateWindow = NULL;
-PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer = NULL;
-PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap = NULL;
-PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow = NULL;
-PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable = NULL;
-PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib = NULL;
-PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs = NULL;
-PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent = NULL;
-PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig = NULL;
-PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent = NULL;
-PFNGLXQUERYCONTEXTPROC __glewXQueryContext = NULL;
-PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable = NULL;
-PFNGLXSELECTEVENTPROC __glewXSelectEvent = NULL;
-
-PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB = NULL;
-
-PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI = NULL;
-PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI = NULL;
-PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI = NULL;
-
-PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT = NULL;
-PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT = NULL;
-PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT = NULL;
-PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT = NULL;
-
-PFNGLXSWAPINTERVALEXTPROC __glewXSwapIntervalEXT = NULL;
-
-PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT = NULL;
-PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT = NULL;
-
-PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA = NULL;
-
-PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA = NULL;
-
-PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA = NULL;
-
-PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA = NULL;
-
-PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA = NULL;
-
-PFNGLXGETSWAPINTERVALMESAPROC __glewXGetSwapIntervalMESA = NULL;
-PFNGLXSWAPINTERVALMESAPROC __glewXSwapIntervalMESA = NULL;
-
-PFNGLXCOPYIMAGESUBDATANVPROC __glewXCopyImageSubDataNV = NULL;
-
-PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV = NULL;
-PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV = NULL;
-
-PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV = NULL;
-PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV = NULL;
-PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV = NULL;
-PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV = NULL;
-PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV = NULL;
-PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV = NULL;
-
-PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV = NULL;
-PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV = NULL;
-
-PFNGLXBINDVIDEOCAPTUREDEVICENVPROC __glewXBindVideoCaptureDeviceNV = NULL;
-PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC __glewXEnumerateVideoCaptureDevicesNV = NULL;
-PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC __glewXLockVideoCaptureDeviceNV = NULL;
-PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC __glewXQueryVideoCaptureDeviceNV = NULL;
-PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC __glewXReleaseVideoCaptureDeviceNV = NULL;
-
-PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV = NULL;
-PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV = NULL;
-PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV = NULL;
-PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV = NULL;
-PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV = NULL;
-PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV = NULL;
-
-PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL;
-PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML = NULL;
-PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML = NULL;
-PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML = NULL;
-PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL;
-
-PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX = NULL;
-PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX = NULL;
-PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX = NULL;
-PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX = NULL;
-PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX = NULL;
-PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX = NULL;
-
-PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX = NULL;
-PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX = NULL;
-PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX = NULL;
-PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX = NULL;
-PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX = NULL;
-PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX = NULL;
-PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX = NULL;
-PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX = NULL;
-
-PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX = NULL;
-PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX = NULL;
-PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX = NULL;
-PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX = NULL;
-PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX = NULL;
-
-PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX = NULL;
-PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX = NULL;
-
-PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX = NULL;
-
-PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX = NULL;
-PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX = NULL;
-PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX = NULL;
-PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX = NULL;
-PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX = NULL;
-
-PFNGLXCUSHIONSGIPROC __glewXCushionSGI = NULL;
-
-PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI = NULL;
-PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI = NULL;
-
-PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI = NULL;
-
-PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI = NULL;
-PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI = NULL;
-
-PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN = NULL;
-
-PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN = NULL;
-PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN = NULL;
-
-#if !defined(GLEW_MX)
-
-GLboolean __GLXEW_VERSION_1_0 = GL_FALSE;
-GLboolean __GLXEW_VERSION_1_1 = GL_FALSE;
-GLboolean __GLXEW_VERSION_1_2 = GL_FALSE;
-GLboolean __GLXEW_VERSION_1_3 = GL_FALSE;
-GLboolean __GLXEW_VERSION_1_4 = GL_FALSE;
-GLboolean __GLXEW_3DFX_multisample = GL_FALSE;
-GLboolean __GLXEW_AMD_gpu_association = GL_FALSE;
-GLboolean __GLXEW_ARB_create_context = GL_FALSE;
-GLboolean __GLXEW_ARB_create_context_profile = GL_FALSE;
-GLboolean __GLXEW_ARB_create_context_robustness = GL_FALSE;
-GLboolean __GLXEW_ARB_fbconfig_float = GL_FALSE;
-GLboolean __GLXEW_ARB_framebuffer_sRGB = GL_FALSE;
-GLboolean __GLXEW_ARB_get_proc_address = GL_FALSE;
-GLboolean __GLXEW_ARB_multisample = GL_FALSE;
-GLboolean __GLXEW_ARB_robustness_application_isolation = GL_FALSE;
-GLboolean __GLXEW_ARB_robustness_share_group_isolation = GL_FALSE;
-GLboolean __GLXEW_ARB_vertex_buffer_object = GL_FALSE;
-GLboolean __GLXEW_ATI_pixel_format_float = GL_FALSE;
-GLboolean __GLXEW_ATI_render_texture = GL_FALSE;
-GLboolean __GLXEW_EXT_create_context_es2_profile = GL_FALSE;
-GLboolean __GLXEW_EXT_create_context_es_profile = GL_FALSE;
-GLboolean __GLXEW_EXT_fbconfig_packed_float = GL_FALSE;
-GLboolean __GLXEW_EXT_framebuffer_sRGB = GL_FALSE;
-GLboolean __GLXEW_EXT_import_context = GL_FALSE;
-GLboolean __GLXEW_EXT_scene_marker = GL_FALSE;
-GLboolean __GLXEW_EXT_swap_control = GL_FALSE;
-GLboolean __GLXEW_EXT_swap_control_tear = GL_FALSE;
-GLboolean __GLXEW_EXT_texture_from_pixmap = GL_FALSE;
-GLboolean __GLXEW_EXT_visual_info = GL_FALSE;
-GLboolean __GLXEW_EXT_visual_rating = GL_FALSE;
-GLboolean __GLXEW_INTEL_swap_event = GL_FALSE;
-GLboolean __GLXEW_MESA_agp_offset = GL_FALSE;
-GLboolean __GLXEW_MESA_copy_sub_buffer = GL_FALSE;
-GLboolean __GLXEW_MESA_pixmap_colormap = GL_FALSE;
-GLboolean __GLXEW_MESA_release_buffers = GL_FALSE;
-GLboolean __GLXEW_MESA_set_3dfx_mode = GL_FALSE;
-GLboolean __GLXEW_MESA_swap_control = GL_FALSE;
-GLboolean __GLXEW_NV_copy_image = GL_FALSE;
-GLboolean __GLXEW_NV_float_buffer = GL_FALSE;
-GLboolean __GLXEW_NV_multisample_coverage = GL_FALSE;
-GLboolean __GLXEW_NV_present_video = GL_FALSE;
-GLboolean __GLXEW_NV_swap_group = GL_FALSE;
-GLboolean __GLXEW_NV_vertex_array_range = GL_FALSE;
-GLboolean __GLXEW_NV_video_capture = GL_FALSE;
-GLboolean __GLXEW_NV_video_out = GL_FALSE;
-GLboolean __GLXEW_OML_swap_method = GL_FALSE;
-GLboolean __GLXEW_OML_sync_control = GL_FALSE;
-GLboolean __GLXEW_SGIS_blended_overlay = GL_FALSE;
-GLboolean __GLXEW_SGIS_color_range = GL_FALSE;
-GLboolean __GLXEW_SGIS_multisample = GL_FALSE;
-GLboolean __GLXEW_SGIS_shared_multisample = GL_FALSE;
-GLboolean __GLXEW_SGIX_fbconfig = GL_FALSE;
-GLboolean __GLXEW_SGIX_hyperpipe = GL_FALSE;
-GLboolean __GLXEW_SGIX_pbuffer = GL_FALSE;
-GLboolean __GLXEW_SGIX_swap_barrier = GL_FALSE;
-GLboolean __GLXEW_SGIX_swap_group = GL_FALSE;
-GLboolean __GLXEW_SGIX_video_resize = GL_FALSE;
-GLboolean __GLXEW_SGIX_visual_select_group = GL_FALSE;
-GLboolean __GLXEW_SGI_cushion = GL_FALSE;
-GLboolean __GLXEW_SGI_make_current_read = GL_FALSE;
-GLboolean __GLXEW_SGI_swap_control = GL_FALSE;
-GLboolean __GLXEW_SGI_video_sync = GL_FALSE;
-GLboolean __GLXEW_SUN_get_transparent_index = GL_FALSE;
-GLboolean __GLXEW_SUN_video_resize = GL_FALSE;
-
-#endif /* !GLEW_MX */
-
-#ifdef GLX_VERSION_1_2
-
-static GLboolean _glewInit_GLX_VERSION_1_2 (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_VERSION_1_2 */
-
-#ifdef GLX_VERSION_1_3
-
-static GLboolean _glewInit_GLX_VERSION_1_3 (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfig")) == NULL) || r;
-  r = ((glXCreateNewContext = (PFNGLXCREATENEWCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXCreateNewContext")) == NULL) || r;
-  r = ((glXCreatePbuffer = (PFNGLXCREATEPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXCreatePbuffer")) == NULL) || r;
-  r = ((glXCreatePixmap = (PFNGLXCREATEPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXCreatePixmap")) == NULL) || r;
-  r = ((glXCreateWindow = (PFNGLXCREATEWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXCreateWindow")) == NULL) || r;
-  r = ((glXDestroyPbuffer = (PFNGLXDESTROYPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPbuffer")) == NULL) || r;
-  r = ((glXDestroyPixmap = (PFNGLXDESTROYPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPixmap")) == NULL) || r;
-  r = ((glXDestroyWindow = (PFNGLXDESTROYWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXDestroyWindow")) == NULL) || r;
-  r = ((glXGetCurrentReadDrawable = (PFNGLXGETCURRENTREADDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawable")) == NULL) || r;
-  r = ((glXGetFBConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttrib")) == NULL) || r;
-  r = ((glXGetFBConfigs = (PFNGLXGETFBCONFIGSPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigs")) == NULL) || r;
-  r = ((glXGetSelectedEvent = (PFNGLXGETSELECTEDEVENTPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEvent")) == NULL) || r;
-  r = ((glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfig")) == NULL) || r;
-  r = ((glXMakeContextCurrent = (PFNGLXMAKECONTEXTCURRENTPROC)glewGetProcAddress((const GLubyte*)"glXMakeContextCurrent")) == NULL) || r;
-  r = ((glXQueryContext = (PFNGLXQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContext")) == NULL) || r;
-  r = ((glXQueryDrawable = (PFNGLXQUERYDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXQueryDrawable")) == NULL) || r;
-  r = ((glXSelectEvent = (PFNGLXSELECTEVENTPROC)glewGetProcAddress((const GLubyte*)"glXSelectEvent")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_VERSION_1_3 */
-
-#ifdef GLX_VERSION_1_4
-
-#endif /* GLX_VERSION_1_4 */
-
-#ifdef GLX_3DFX_multisample
-
-#endif /* GLX_3DFX_multisample */
-
-#ifdef GLX_AMD_gpu_association
-
-#endif /* GLX_AMD_gpu_association */
-
-#ifdef GLX_ARB_create_context
-
-static GLboolean _glewInit_GLX_ARB_create_context (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_ARB_create_context */
-
-#ifdef GLX_ARB_create_context_profile
-
-#endif /* GLX_ARB_create_context_profile */
-
-#ifdef GLX_ARB_create_context_robustness
-
-#endif /* GLX_ARB_create_context_robustness */
-
-#ifdef GLX_ARB_fbconfig_float
-
-#endif /* GLX_ARB_fbconfig_float */
-
-#ifdef GLX_ARB_framebuffer_sRGB
-
-#endif /* GLX_ARB_framebuffer_sRGB */
-
-#ifdef GLX_ARB_get_proc_address
-
-#endif /* GLX_ARB_get_proc_address */
-
-#ifdef GLX_ARB_multisample
-
-#endif /* GLX_ARB_multisample */
-
-#ifdef GLX_ARB_robustness_application_isolation
-
-#endif /* GLX_ARB_robustness_application_isolation */
-
-#ifdef GLX_ARB_robustness_share_group_isolation
-
-#endif /* GLX_ARB_robustness_share_group_isolation */
-
-#ifdef GLX_ARB_vertex_buffer_object
-
-#endif /* GLX_ARB_vertex_buffer_object */
-
-#ifdef GLX_ATI_pixel_format_float
-
-#endif /* GLX_ATI_pixel_format_float */
-
-#ifdef GLX_ATI_render_texture
-
-static GLboolean _glewInit_GLX_ATI_render_texture (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindTexImageATI = (PFNGLXBINDTEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageATI")) == NULL) || r;
-  r = ((glXDrawableAttribATI = (PFNGLXDRAWABLEATTRIBATIPROC)glewGetProcAddress((const GLubyte*)"glXDrawableAttribATI")) == NULL) || r;
-  r = ((glXReleaseTexImageATI = (PFNGLXRELEASETEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageATI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_ATI_render_texture */
-
-#ifdef GLX_EXT_create_context_es2_profile
-
-#endif /* GLX_EXT_create_context_es2_profile */
-
-#ifdef GLX_EXT_create_context_es_profile
-
-#endif /* GLX_EXT_create_context_es_profile */
-
-#ifdef GLX_EXT_fbconfig_packed_float
-
-#endif /* GLX_EXT_fbconfig_packed_float */
-
-#ifdef GLX_EXT_framebuffer_sRGB
-
-#endif /* GLX_EXT_framebuffer_sRGB */
-
-#ifdef GLX_EXT_import_context
-
-static GLboolean _glewInit_GLX_EXT_import_context (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXFreeContextEXT = (PFNGLXFREECONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXFreeContextEXT")) == NULL) || r;
-  r = ((glXGetContextIDEXT = (PFNGLXGETCONTEXTIDEXTPROC)glewGetProcAddress((const GLubyte*)"glXGetContextIDEXT")) == NULL) || r;
-  r = ((glXImportContextEXT = (PFNGLXIMPORTCONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXImportContextEXT")) == NULL) || r;
-  r = ((glXQueryContextInfoEXT = (PFNGLXQUERYCONTEXTINFOEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContextInfoEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_EXT_import_context */
-
-#ifdef GLX_EXT_scene_marker
-
-#endif /* GLX_EXT_scene_marker */
-
-#ifdef GLX_EXT_swap_control
-
-static GLboolean _glewInit_GLX_EXT_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_EXT_swap_control */
-
-#ifdef GLX_EXT_swap_control_tear
-
-#endif /* GLX_EXT_swap_control_tear */
-
-#ifdef GLX_EXT_texture_from_pixmap
-
-static GLboolean _glewInit_GLX_EXT_texture_from_pixmap (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageEXT")) == NULL) || r;
-  r = ((glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageEXT")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_EXT_texture_from_pixmap */
-
-#ifdef GLX_EXT_visual_info
-
-#endif /* GLX_EXT_visual_info */
-
-#ifdef GLX_EXT_visual_rating
-
-#endif /* GLX_EXT_visual_rating */
-
-#ifdef GLX_INTEL_swap_event
-
-#endif /* GLX_INTEL_swap_event */
-
-#ifdef GLX_MESA_agp_offset
-
-static GLboolean _glewInit_GLX_MESA_agp_offset (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetAGPOffsetMESA = (PFNGLXGETAGPOFFSETMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetAGPOffsetMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_agp_offset */
-
-#ifdef GLX_MESA_copy_sub_buffer
-
-static GLboolean _glewInit_GLX_MESA_copy_sub_buffer (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)glewGetProcAddress((const GLubyte*)"glXCopySubBufferMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_copy_sub_buffer */
-
-#ifdef GLX_MESA_pixmap_colormap
-
-static GLboolean _glewInit_GLX_MESA_pixmap_colormap (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCreateGLXPixmapMESA = (PFNGLXCREATEGLXPIXMAPMESAPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_pixmap_colormap */
-
-#ifdef GLX_MESA_release_buffers
-
-static GLboolean _glewInit_GLX_MESA_release_buffers (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXReleaseBuffersMESA = (PFNGLXRELEASEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glXReleaseBuffersMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_release_buffers */
-
-#ifdef GLX_MESA_set_3dfx_mode
-
-static GLboolean _glewInit_GLX_MESA_set_3dfx_mode (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXSet3DfxModeMESA = (PFNGLXSET3DFXMODEMESAPROC)glewGetProcAddress((const GLubyte*)"glXSet3DfxModeMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_set_3dfx_mode */
-
-#ifdef GLX_MESA_swap_control
-
-static GLboolean _glewInit_GLX_MESA_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetSwapIntervalMESA = (PFNGLXGETSWAPINTERVALMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetSwapIntervalMESA")) == NULL) || r;
-  r = ((glXSwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalMESA")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_MESA_swap_control */
-
-#ifdef GLX_NV_copy_image
-
-static GLboolean _glewInit_GLX_NV_copy_image (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCopyImageSubDataNV = (PFNGLXCOPYIMAGESUBDATANVPROC)glewGetProcAddress((const GLubyte*)"glXCopyImageSubDataNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_copy_image */
-
-#ifdef GLX_NV_float_buffer
-
-#endif /* GLX_NV_float_buffer */
-
-#ifdef GLX_NV_multisample_coverage
-
-#endif /* GLX_NV_multisample_coverage */
-
-#ifdef GLX_NV_present_video
-
-static GLboolean _glewInit_GLX_NV_present_video (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindVideoDeviceNV = (PFNGLXBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoDeviceNV")) == NULL) || r;
-  r = ((glXEnumerateVideoDevicesNV = (PFNGLXENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoDevicesNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_present_video */
-
-#ifdef GLX_NV_swap_group
-
-static GLboolean _glewInit_GLX_NV_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindSwapBarrierNV = (PFNGLXBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierNV")) == NULL) || r;
-  r = ((glXJoinSwapGroupNV = (PFNGLXJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupNV")) == NULL) || r;
-  r = ((glXQueryFrameCountNV = (PFNGLXQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryFrameCountNV")) == NULL) || r;
-  r = ((glXQueryMaxSwapGroupsNV = (PFNGLXQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapGroupsNV")) == NULL) || r;
-  r = ((glXQuerySwapGroupNV = (PFNGLXQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXQuerySwapGroupNV")) == NULL) || r;
-  r = ((glXResetFrameCountNV = (PFNGLXRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXResetFrameCountNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_swap_group */
-
-#ifdef GLX_NV_vertex_array_range
-
-static GLboolean _glewInit_GLX_NV_vertex_array_range (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXAllocateMemoryNV = (PFNGLXALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXAllocateMemoryNV")) == NULL) || r;
-  r = ((glXFreeMemoryNV = (PFNGLXFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXFreeMemoryNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_vertex_array_range */
-
-#ifdef GLX_NV_video_capture
-
-static GLboolean _glewInit_GLX_NV_video_capture (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindVideoCaptureDeviceNV = (PFNGLXBINDVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((glXEnumerateVideoCaptureDevicesNV = (PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoCaptureDevicesNV")) == NULL) || r;
-  r = ((glXLockVideoCaptureDeviceNV = (PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXLockVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((glXQueryVideoCaptureDeviceNV = (PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXQueryVideoCaptureDeviceNV")) == NULL) || r;
-  r = ((glXReleaseVideoCaptureDeviceNV = (PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoCaptureDeviceNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_video_capture */
-
-#ifdef GLX_NV_video_out
-
-static GLboolean _glewInit_GLX_NV_video_out (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindVideoImageNV = (PFNGLXBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoImageNV")) == NULL) || r;
-  r = ((glXGetVideoDeviceNV = (PFNGLXGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoDeviceNV")) == NULL) || r;
-  r = ((glXGetVideoInfoNV = (PFNGLXGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoInfoNV")) == NULL) || r;
-  r = ((glXReleaseVideoDeviceNV = (PFNGLXRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoDeviceNV")) == NULL) || r;
-  r = ((glXReleaseVideoImageNV = (PFNGLXRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoImageNV")) == NULL) || r;
-  r = ((glXSendPbufferToVideoNV = (PFNGLXSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"glXSendPbufferToVideoNV")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_NV_video_out */
-
-#ifdef GLX_OML_swap_method
-
-#endif /* GLX_OML_swap_method */
-
-#ifdef GLX_OML_sync_control
-
-static GLboolean _glewInit_GLX_OML_sync_control (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetMscRateOML = (PFNGLXGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetMscRateOML")) == NULL) || r;
-  r = ((glXGetSyncValuesOML = (PFNGLXGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetSyncValuesOML")) == NULL) || r;
-  r = ((glXSwapBuffersMscOML = (PFNGLXSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXSwapBuffersMscOML")) == NULL) || r;
-  r = ((glXWaitForMscOML = (PFNGLXWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForMscOML")) == NULL) || r;
-  r = ((glXWaitForSbcOML = (PFNGLXWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForSbcOML")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_OML_sync_control */
-
-#ifdef GLX_SGIS_blended_overlay
-
-#endif /* GLX_SGIS_blended_overlay */
-
-#ifdef GLX_SGIS_color_range
-
-#endif /* GLX_SGIS_color_range */
-
-#ifdef GLX_SGIS_multisample
-
-#endif /* GLX_SGIS_multisample */
-
-#ifdef GLX_SGIS_shared_multisample
-
-#endif /* GLX_SGIS_shared_multisample */
-
-#ifdef GLX_SGIX_fbconfig
-
-static GLboolean _glewInit_GLX_SGIX_fbconfig (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfigSGIX")) == NULL) || r;
-  r = ((glXCreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextWithConfigSGIX")) == NULL) || r;
-  r = ((glXCreateGLXPixmapWithConfigSGIX = (PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapWithConfigSGIX")) == NULL) || r;
-  r = ((glXGetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttribSGIX")) == NULL) || r;
-  r = ((glXGetFBConfigFromVisualSGIX = (PFNGLXGETFBCONFIGFROMVISUALSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigFromVisualSGIX")) == NULL) || r;
-  r = ((glXGetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfigSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_fbconfig */
-
-#ifdef GLX_SGIX_hyperpipe
-
-static GLboolean _glewInit_GLX_SGIX_hyperpipe (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindHyperpipeSGIX = (PFNGLXBINDHYPERPIPESGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindHyperpipeSGIX")) == NULL) || r;
-  r = ((glXDestroyHyperpipeConfigSGIX = (PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyHyperpipeConfigSGIX")) == NULL) || r;
-  r = ((glXHyperpipeAttribSGIX = (PFNGLXHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeAttribSGIX")) == NULL) || r;
-  r = ((glXHyperpipeConfigSGIX = (PFNGLXHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeConfigSGIX")) == NULL) || r;
-  r = ((glXQueryHyperpipeAttribSGIX = (PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeAttribSGIX")) == NULL) || r;
-  r = ((glXQueryHyperpipeBestAttribSGIX = (PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeBestAttribSGIX")) == NULL) || r;
-  r = ((glXQueryHyperpipeConfigSGIX = (PFNGLXQUERYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeConfigSGIX")) == NULL) || r;
-  r = ((glXQueryHyperpipeNetworkSGIX = (PFNGLXQUERYHYPERPIPENETWORKSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeNetworkSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_hyperpipe */
-
-#ifdef GLX_SGIX_pbuffer
-
-static GLboolean _glewInit_GLX_SGIX_pbuffer (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCreateGLXPbufferSGIX = (PFNGLXCREATEGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPbufferSGIX")) == NULL) || r;
-  r = ((glXDestroyGLXPbufferSGIX = (PFNGLXDESTROYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyGLXPbufferSGIX")) == NULL) || r;
-  r = ((glXGetSelectedEventSGIX = (PFNGLXGETSELECTEDEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEventSGIX")) == NULL) || r;
-  r = ((glXQueryGLXPbufferSGIX = (PFNGLXQUERYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryGLXPbufferSGIX")) == NULL) || r;
-  r = ((glXSelectEventSGIX = (PFNGLXSELECTEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXSelectEventSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_pbuffer */
-
-#ifdef GLX_SGIX_swap_barrier
-
-static GLboolean _glewInit_GLX_SGIX_swap_barrier (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindSwapBarrierSGIX = (PFNGLXBINDSWAPBARRIERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierSGIX")) == NULL) || r;
-  r = ((glXQueryMaxSwapBarriersSGIX = (PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapBarriersSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_swap_barrier */
-
-#ifdef GLX_SGIX_swap_group
-
-static GLboolean _glewInit_GLX_SGIX_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXJoinSwapGroupSGIX = (PFNGLXJOINSWAPGROUPSGIXPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_swap_group */
-
-#ifdef GLX_SGIX_video_resize
-
-static GLboolean _glewInit_GLX_SGIX_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXBindChannelToWindowSGIX = (PFNGLXBINDCHANNELTOWINDOWSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindChannelToWindowSGIX")) == NULL) || r;
-  r = ((glXChannelRectSGIX = (PFNGLXCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSGIX")) == NULL) || r;
-  r = ((glXChannelRectSyncSGIX = (PFNGLXCHANNELRECTSYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSyncSGIX")) == NULL) || r;
-  r = ((glXQueryChannelDeltasSGIX = (PFNGLXQUERYCHANNELDELTASSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelDeltasSGIX")) == NULL) || r;
-  r = ((glXQueryChannelRectSGIX = (PFNGLXQUERYCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelRectSGIX")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGIX_video_resize */
-
-#ifdef GLX_SGIX_visual_select_group
-
-#endif /* GLX_SGIX_visual_select_group */
-
-#ifdef GLX_SGI_cushion
-
-static GLboolean _glewInit_GLX_SGI_cushion (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXCushionSGI = (PFNGLXCUSHIONSGIPROC)glewGetProcAddress((const GLubyte*)"glXCushionSGI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGI_cushion */
-
-#ifdef GLX_SGI_make_current_read
-
-static GLboolean _glewInit_GLX_SGI_make_current_read (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetCurrentReadDrawableSGI = (PFNGLXGETCURRENTREADDRAWABLESGIPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawableSGI")) == NULL) || r;
-  r = ((glXMakeCurrentReadSGI = (PFNGLXMAKECURRENTREADSGIPROC)glewGetProcAddress((const GLubyte*)"glXMakeCurrentReadSGI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGI_make_current_read */
-
-#ifdef GLX_SGI_swap_control
-
-static GLboolean _glewInit_GLX_SGI_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalSGI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGI_swap_control */
-
-#ifdef GLX_SGI_video_sync
-
-static GLboolean _glewInit_GLX_SGI_video_sync (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI")) == NULL) || r;
-  r = ((glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SGI_video_sync */
-
-#ifdef GLX_SUN_get_transparent_index
-
-static GLboolean _glewInit_GLX_SUN_get_transparent_index (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetTransparentIndexSUN = (PFNGLXGETTRANSPARENTINDEXSUNPROC)glewGetProcAddress((const GLubyte*)"glXGetTransparentIndexSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SUN_get_transparent_index */
-
-#ifdef GLX_SUN_video_resize
-
-static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
-{
-  GLboolean r = GL_FALSE;
-
-  r = ((glXGetVideoResizeSUN = (PFNGLXGETVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoResizeSUN")) == NULL) || r;
-  r = ((glXVideoResizeSUN = (PFNGLXVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXVideoResizeSUN")) == NULL) || r;
-
-  return r;
-}
-
-#endif /* GLX_SUN_video_resize */
-
-/* ------------------------------------------------------------------------ */
-
-GLboolean glxewGetExtension (const char* name)
-{    
-  const GLubyte* start;
-  const GLubyte* end;
-
-  if (glXGetCurrentDisplay == NULL) return GL_FALSE;
-  start = (const GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS);
-  if (0 == start) return GL_FALSE;
-  end = start + _glewStrLen(start);
-  return _glewSearchExtension(name, start, end);
-}
-
-GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
-{
-  int major, minor;
-  const GLubyte* extStart;
-  const GLubyte* extEnd;
-  /* initialize core GLX 1.2 */
-  if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
-  /* initialize flags */
-  CONST_CAST(GLXEW_VERSION_1_0) = GL_TRUE;
-  CONST_CAST(GLXEW_VERSION_1_1) = GL_TRUE;
-  CONST_CAST(GLXEW_VERSION_1_2) = GL_TRUE;
-  CONST_CAST(GLXEW_VERSION_1_3) = GL_TRUE;
-  CONST_CAST(GLXEW_VERSION_1_4) = GL_TRUE;
-  /* query GLX version */
-  glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
-  if (major == 1 && minor <= 3)
-  {
-    switch (minor)
-    {
-      case 3:
-      CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE;
-      break;
-      case 2:
-      CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE;
-      CONST_CAST(GLXEW_VERSION_1_3) = GL_FALSE;
-      break;
-      default:
-      return GLEW_ERROR_GLX_VERSION_11_ONLY;
-      break;
-    }
-  }
-  /* query GLX extension string */
-  extStart = 0;
-  if (glXGetCurrentDisplay != NULL)
-    extStart = (const GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS);
-  if (extStart == 0)
-    extStart = (const GLubyte *)"";
-  extEnd = extStart + _glewStrLen(extStart);
-  /* initialize extensions */
-#ifdef GLX_VERSION_1_3
-  if (glewExperimental || GLXEW_VERSION_1_3) CONST_CAST(GLXEW_VERSION_1_3) = !_glewInit_GLX_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_VERSION_1_3 */
-#ifdef GLX_3DFX_multisample
-  CONST_CAST(GLXEW_3DFX_multisample) = _glewSearchExtension("GLX_3DFX_multisample", extStart, extEnd);
-#endif /* GLX_3DFX_multisample */
-#ifdef GLX_AMD_gpu_association
-  CONST_CAST(GLXEW_AMD_gpu_association) = _glewSearchExtension("GLX_AMD_gpu_association", extStart, extEnd);
-#endif /* GLX_AMD_gpu_association */
-#ifdef GLX_ARB_create_context
-  CONST_CAST(GLXEW_ARB_create_context) = _glewSearchExtension("GLX_ARB_create_context", extStart, extEnd);
-  if (glewExperimental || GLXEW_ARB_create_context) CONST_CAST(GLXEW_ARB_create_context) = !_glewInit_GLX_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_ARB_create_context */
-#ifdef GLX_ARB_create_context_profile
-  CONST_CAST(GLXEW_ARB_create_context_profile) = _glewSearchExtension("GLX_ARB_create_context_profile", extStart, extEnd);
-#endif /* GLX_ARB_create_context_profile */
-#ifdef GLX_ARB_create_context_robustness
-  CONST_CAST(GLXEW_ARB_create_context_robustness) = _glewSearchExtension("GLX_ARB_create_context_robustness", extStart, extEnd);
-#endif /* GLX_ARB_create_context_robustness */
-#ifdef GLX_ARB_fbconfig_float
-  CONST_CAST(GLXEW_ARB_fbconfig_float) = _glewSearchExtension("GLX_ARB_fbconfig_float", extStart, extEnd);
-#endif /* GLX_ARB_fbconfig_float */
-#ifdef GLX_ARB_framebuffer_sRGB
-  CONST_CAST(GLXEW_ARB_framebuffer_sRGB) = _glewSearchExtension("GLX_ARB_framebuffer_sRGB", extStart, extEnd);
-#endif /* GLX_ARB_framebuffer_sRGB */
-#ifdef GLX_ARB_get_proc_address
-  CONST_CAST(GLXEW_ARB_get_proc_address) = _glewSearchExtension("GLX_ARB_get_proc_address", extStart, extEnd);
-#endif /* GLX_ARB_get_proc_address */
-#ifdef GLX_ARB_multisample
-  CONST_CAST(GLXEW_ARB_multisample) = _glewSearchExtension("GLX_ARB_multisample", extStart, extEnd);
-#endif /* GLX_ARB_multisample */
-#ifdef GLX_ARB_robustness_application_isolation
-  CONST_CAST(GLXEW_ARB_robustness_application_isolation) = _glewSearchExtension("GLX_ARB_robustness_application_isolation", extStart, extEnd);
-#endif /* GLX_ARB_robustness_application_isolation */
-#ifdef GLX_ARB_robustness_share_group_isolation
-  CONST_CAST(GLXEW_ARB_robustness_share_group_isolation) = _glewSearchExtension("GLX_ARB_robustness_share_group_isolation", extStart, extEnd);
-#endif /* GLX_ARB_robustness_share_group_isolation */
-#ifdef GLX_ARB_vertex_buffer_object
-  CONST_CAST(GLXEW_ARB_vertex_buffer_object) = _glewSearchExtension("GLX_ARB_vertex_buffer_object", extStart, extEnd);
-#endif /* GLX_ARB_vertex_buffer_object */
-#ifdef GLX_ATI_pixel_format_float
-  CONST_CAST(GLXEW_ATI_pixel_format_float) = _glewSearchExtension("GLX_ATI_pixel_format_float", extStart, extEnd);
-#endif /* GLX_ATI_pixel_format_float */
-#ifdef GLX_ATI_render_texture
-  CONST_CAST(GLXEW_ATI_render_texture) = _glewSearchExtension("GLX_ATI_render_texture", extStart, extEnd);
-  if (glewExperimental || GLXEW_ATI_render_texture) CONST_CAST(GLXEW_ATI_render_texture) = !_glewInit_GLX_ATI_render_texture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_ATI_render_texture */
-#ifdef GLX_EXT_create_context_es2_profile
-  CONST_CAST(GLXEW_EXT_create_context_es2_profile) = _glewSearchExtension("GLX_EXT_create_context_es2_profile", extStart, extEnd);
-#endif /* GLX_EXT_create_context_es2_profile */
-#ifdef GLX_EXT_create_context_es_profile
-  CONST_CAST(GLXEW_EXT_create_context_es_profile) = _glewSearchExtension("GLX_EXT_create_context_es_profile", extStart, extEnd);
-#endif /* GLX_EXT_create_context_es_profile */
-#ifdef GLX_EXT_fbconfig_packed_float
-  CONST_CAST(GLXEW_EXT_fbconfig_packed_float) = _glewSearchExtension("GLX_EXT_fbconfig_packed_float", extStart, extEnd);
-#endif /* GLX_EXT_fbconfig_packed_float */
-#ifdef GLX_EXT_framebuffer_sRGB
-  CONST_CAST(GLXEW_EXT_framebuffer_sRGB) = _glewSearchExtension("GLX_EXT_framebuffer_sRGB", extStart, extEnd);
-#endif /* GLX_EXT_framebuffer_sRGB */
-#ifdef GLX_EXT_import_context
-  CONST_CAST(GLXEW_EXT_import_context) = _glewSearchExtension("GLX_EXT_import_context", extStart, extEnd);
-  if (glewExperimental || GLXEW_EXT_import_context) CONST_CAST(GLXEW_EXT_import_context) = !_glewInit_GLX_EXT_import_context(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_EXT_import_context */
-#ifdef GLX_EXT_scene_marker
-  CONST_CAST(GLXEW_EXT_scene_marker) = _glewSearchExtension("GLX_EXT_scene_marker", extStart, extEnd);
-#endif /* GLX_EXT_scene_marker */
-#ifdef GLX_EXT_swap_control
-  CONST_CAST(GLXEW_EXT_swap_control) = _glewSearchExtension("GLX_EXT_swap_control", extStart, extEnd);
-  if (glewExperimental || GLXEW_EXT_swap_control) CONST_CAST(GLXEW_EXT_swap_control) = !_glewInit_GLX_EXT_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_EXT_swap_control */
-#ifdef GLX_EXT_swap_control_tear
-  CONST_CAST(GLXEW_EXT_swap_control_tear) = _glewSearchExtension("GLX_EXT_swap_control_tear", extStart, extEnd);
-#endif /* GLX_EXT_swap_control_tear */
-#ifdef GLX_EXT_texture_from_pixmap
-  CONST_CAST(GLXEW_EXT_texture_from_pixmap) = _glewSearchExtension("GLX_EXT_texture_from_pixmap", extStart, extEnd);
-  if (glewExperimental || GLXEW_EXT_texture_from_pixmap) CONST_CAST(GLXEW_EXT_texture_from_pixmap) = !_glewInit_GLX_EXT_texture_from_pixmap(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_EXT_texture_from_pixmap */
-#ifdef GLX_EXT_visual_info
-  CONST_CAST(GLXEW_EXT_visual_info) = _glewSearchExtension("GLX_EXT_visual_info", extStart, extEnd);
-#endif /* GLX_EXT_visual_info */
-#ifdef GLX_EXT_visual_rating
-  CONST_CAST(GLXEW_EXT_visual_rating) = _glewSearchExtension("GLX_EXT_visual_rating", extStart, extEnd);
-#endif /* GLX_EXT_visual_rating */
-#ifdef GLX_INTEL_swap_event
-  CONST_CAST(GLXEW_INTEL_swap_event) = _glewSearchExtension("GLX_INTEL_swap_event", extStart, extEnd);
-#endif /* GLX_INTEL_swap_event */
-#ifdef GLX_MESA_agp_offset
-  CONST_CAST(GLXEW_MESA_agp_offset) = _glewSearchExtension("GLX_MESA_agp_offset", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_agp_offset) CONST_CAST(GLXEW_MESA_agp_offset) = !_glewInit_GLX_MESA_agp_offset(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_agp_offset */
-#ifdef GLX_MESA_copy_sub_buffer
-  CONST_CAST(GLXEW_MESA_copy_sub_buffer) = _glewSearchExtension("GLX_MESA_copy_sub_buffer", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_copy_sub_buffer) CONST_CAST(GLXEW_MESA_copy_sub_buffer) = !_glewInit_GLX_MESA_copy_sub_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_copy_sub_buffer */
-#ifdef GLX_MESA_pixmap_colormap
-  CONST_CAST(GLXEW_MESA_pixmap_colormap) = _glewSearchExtension("GLX_MESA_pixmap_colormap", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_pixmap_colormap) CONST_CAST(GLXEW_MESA_pixmap_colormap) = !_glewInit_GLX_MESA_pixmap_colormap(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_pixmap_colormap */
-#ifdef GLX_MESA_release_buffers
-  CONST_CAST(GLXEW_MESA_release_buffers) = _glewSearchExtension("GLX_MESA_release_buffers", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_release_buffers) CONST_CAST(GLXEW_MESA_release_buffers) = !_glewInit_GLX_MESA_release_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_release_buffers */
-#ifdef GLX_MESA_set_3dfx_mode
-  CONST_CAST(GLXEW_MESA_set_3dfx_mode) = _glewSearchExtension("GLX_MESA_set_3dfx_mode", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_set_3dfx_mode) CONST_CAST(GLXEW_MESA_set_3dfx_mode) = !_glewInit_GLX_MESA_set_3dfx_mode(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_set_3dfx_mode */
-#ifdef GLX_MESA_swap_control
-  CONST_CAST(GLXEW_MESA_swap_control) = _glewSearchExtension("GLX_MESA_swap_control", extStart, extEnd);
-  if (glewExperimental || GLXEW_MESA_swap_control) CONST_CAST(GLXEW_MESA_swap_control) = !_glewInit_GLX_MESA_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_MESA_swap_control */
-#ifdef GLX_NV_copy_image
-  CONST_CAST(GLXEW_NV_copy_image) = _glewSearchExtension("GLX_NV_copy_image", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_copy_image) CONST_CAST(GLXEW_NV_copy_image) = !_glewInit_GLX_NV_copy_image(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_copy_image */
-#ifdef GLX_NV_float_buffer
-  CONST_CAST(GLXEW_NV_float_buffer) = _glewSearchExtension("GLX_NV_float_buffer", extStart, extEnd);
-#endif /* GLX_NV_float_buffer */
-#ifdef GLX_NV_multisample_coverage
-  CONST_CAST(GLXEW_NV_multisample_coverage) = _glewSearchExtension("GLX_NV_multisample_coverage", extStart, extEnd);
-#endif /* GLX_NV_multisample_coverage */
-#ifdef GLX_NV_present_video
-  CONST_CAST(GLXEW_NV_present_video) = _glewSearchExtension("GLX_NV_present_video", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_present_video) CONST_CAST(GLXEW_NV_present_video) = !_glewInit_GLX_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_present_video */
-#ifdef GLX_NV_swap_group
-  CONST_CAST(GLXEW_NV_swap_group) = _glewSearchExtension("GLX_NV_swap_group", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_swap_group) CONST_CAST(GLXEW_NV_swap_group) = !_glewInit_GLX_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_swap_group */
-#ifdef GLX_NV_vertex_array_range
-  CONST_CAST(GLXEW_NV_vertex_array_range) = _glewSearchExtension("GLX_NV_vertex_array_range", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_vertex_array_range) CONST_CAST(GLXEW_NV_vertex_array_range) = !_glewInit_GLX_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_vertex_array_range */
-#ifdef GLX_NV_video_capture
-  CONST_CAST(GLXEW_NV_video_capture) = _glewSearchExtension("GLX_NV_video_capture", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_video_capture) CONST_CAST(GLXEW_NV_video_capture) = !_glewInit_GLX_NV_video_capture(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_video_capture */
-#ifdef GLX_NV_video_out
-  CONST_CAST(GLXEW_NV_video_out) = _glewSearchExtension("GLX_NV_video_out", extStart, extEnd);
-  if (glewExperimental || GLXEW_NV_video_out) CONST_CAST(GLXEW_NV_video_out) = !_glewInit_GLX_NV_video_out(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_NV_video_out */
-#ifdef GLX_OML_swap_method
-  CONST_CAST(GLXEW_OML_swap_method) = _glewSearchExtension("GLX_OML_swap_method", extStart, extEnd);
-#endif /* GLX_OML_swap_method */
-#ifdef GLX_OML_sync_control
-  CONST_CAST(GLXEW_OML_sync_control) = _glewSearchExtension("GLX_OML_sync_control", extStart, extEnd);
-  if (glewExperimental || GLXEW_OML_sync_control) CONST_CAST(GLXEW_OML_sync_control) = !_glewInit_GLX_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_OML_sync_control */
-#ifdef GLX_SGIS_blended_overlay
-  CONST_CAST(GLXEW_SGIS_blended_overlay) = _glewSearchExtension("GLX_SGIS_blended_overlay", extStart, extEnd);
-#endif /* GLX_SGIS_blended_overlay */
-#ifdef GLX_SGIS_color_range
-  CONST_CAST(GLXEW_SGIS_color_range) = _glewSearchExtension("GLX_SGIS_color_range", extStart, extEnd);
-#endif /* GLX_SGIS_color_range */
-#ifdef GLX_SGIS_multisample
-  CONST_CAST(GLXEW_SGIS_multisample) = _glewSearchExtension("GLX_SGIS_multisample", extStart, extEnd);
-#endif /* GLX_SGIS_multisample */
-#ifdef GLX_SGIS_shared_multisample
-  CONST_CAST(GLXEW_SGIS_shared_multisample) = _glewSearchExtension("GLX_SGIS_shared_multisample", extStart, extEnd);
-#endif /* GLX_SGIS_shared_multisample */
-#ifdef GLX_SGIX_fbconfig
-  CONST_CAST(GLXEW_SGIX_fbconfig) = _glewSearchExtension("GLX_SGIX_fbconfig", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_fbconfig) CONST_CAST(GLXEW_SGIX_fbconfig) = !_glewInit_GLX_SGIX_fbconfig(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_fbconfig */
-#ifdef GLX_SGIX_hyperpipe
-  CONST_CAST(GLXEW_SGIX_hyperpipe) = _glewSearchExtension("GLX_SGIX_hyperpipe", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_hyperpipe) CONST_CAST(GLXEW_SGIX_hyperpipe) = !_glewInit_GLX_SGIX_hyperpipe(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_hyperpipe */
-#ifdef GLX_SGIX_pbuffer
-  CONST_CAST(GLXEW_SGIX_pbuffer) = _glewSearchExtension("GLX_SGIX_pbuffer", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_pbuffer) CONST_CAST(GLXEW_SGIX_pbuffer) = !_glewInit_GLX_SGIX_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_pbuffer */
-#ifdef GLX_SGIX_swap_barrier
-  CONST_CAST(GLXEW_SGIX_swap_barrier) = _glewSearchExtension("GLX_SGIX_swap_barrier", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_swap_barrier) CONST_CAST(GLXEW_SGIX_swap_barrier) = !_glewInit_GLX_SGIX_swap_barrier(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_swap_barrier */
-#ifdef GLX_SGIX_swap_group
-  CONST_CAST(GLXEW_SGIX_swap_group) = _glewSearchExtension("GLX_SGIX_swap_group", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_swap_group) CONST_CAST(GLXEW_SGIX_swap_group) = !_glewInit_GLX_SGIX_swap_group(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_swap_group */
-#ifdef GLX_SGIX_video_resize
-  CONST_CAST(GLXEW_SGIX_video_resize) = _glewSearchExtension("GLX_SGIX_video_resize", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGIX_video_resize) CONST_CAST(GLXEW_SGIX_video_resize) = !_glewInit_GLX_SGIX_video_resize(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGIX_video_resize */
-#ifdef GLX_SGIX_visual_select_group
-  CONST_CAST(GLXEW_SGIX_visual_select_group) = _glewSearchExtension("GLX_SGIX_visual_select_group", extStart, extEnd);
-#endif /* GLX_SGIX_visual_select_group */
-#ifdef GLX_SGI_cushion
-  CONST_CAST(GLXEW_SGI_cushion) = _glewSearchExtension("GLX_SGI_cushion", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGI_cushion) CONST_CAST(GLXEW_SGI_cushion) = !_glewInit_GLX_SGI_cushion(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGI_cushion */
-#ifdef GLX_SGI_make_current_read
-  CONST_CAST(GLXEW_SGI_make_current_read) = _glewSearchExtension("GLX_SGI_make_current_read", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGI_make_current_read) CONST_CAST(GLXEW_SGI_make_current_read) = !_glewInit_GLX_SGI_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGI_make_current_read */
-#ifdef GLX_SGI_swap_control
-  CONST_CAST(GLXEW_SGI_swap_control) = _glewSearchExtension("GLX_SGI_swap_control", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGI_swap_control) CONST_CAST(GLXEW_SGI_swap_control) = !_glewInit_GLX_SGI_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGI_swap_control */
-#ifdef GLX_SGI_video_sync
-  CONST_CAST(GLXEW_SGI_video_sync) = _glewSearchExtension("GLX_SGI_video_sync", extStart, extEnd);
-  if (glewExperimental || GLXEW_SGI_video_sync) CONST_CAST(GLXEW_SGI_video_sync) = !_glewInit_GLX_SGI_video_sync(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SGI_video_sync */
-#ifdef GLX_SUN_get_transparent_index
-  CONST_CAST(GLXEW_SUN_get_transparent_index) = _glewSearchExtension("GLX_SUN_get_transparent_index", extStart, extEnd);
-  if (glewExperimental || GLXEW_SUN_get_transparent_index) CONST_CAST(GLXEW_SUN_get_transparent_index) = !_glewInit_GLX_SUN_get_transparent_index(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SUN_get_transparent_index */
-#ifdef GLX_SUN_video_resize
-  CONST_CAST(GLXEW_SUN_video_resize) = _glewSearchExtension("GLX_SUN_video_resize", extStart, extEnd);
-  if (glewExperimental || GLXEW_SUN_video_resize) CONST_CAST(GLXEW_SUN_video_resize) = !_glewInit_GLX_SUN_video_resize(GLEW_CONTEXT_ARG_VAR_INIT);
-#endif /* GLX_SUN_video_resize */
-
-  return GLEW_OK;
-}
-
-#endif /* !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */
-
-/* ------------------------------------------------------------------------ */
-
-const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error)
-{
-  static const GLubyte* _glewErrorString[] =
-  {
-    (const GLubyte*)"No error",
-    (const GLubyte*)"Missing GL version",
-    (const GLubyte*)"GL 1.1 and up are not supported",
-    (const GLubyte*)"GLX 1.2 and up are not supported",
-    (const GLubyte*)"Unknown error"
-  };
-  const int max_error = sizeof(_glewErrorString)/sizeof(*_glewErrorString) - 1;
-  return _glewErrorString[(int)error > max_error ? max_error : (int)error];
-}
-
-const GLubyte * GLEWAPIENTRY glewGetString (GLenum name)
-{
-  static const GLubyte* _glewString[] =
-  {
-    (const GLubyte*)NULL,
-    (const GLubyte*)"1.9.0",
-    (const GLubyte*)"1",
-    (const GLubyte*)"9",
-    (const GLubyte*)"0"
-  };
-  const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1;
-  return _glewString[(int)name > max_string ? 0 : (int)name];
-}
-
-/* ------------------------------------------------------------------------ */
-
-GLboolean glewExperimental = GL_FALSE;
-
-#if !defined(GLEW_MX)
-
-#if defined(_WIN32)
-extern GLenum GLEWAPIENTRY wglewContextInit (void);
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
-extern GLenum GLEWAPIENTRY glxewContextInit (void);
-#endif /* _WIN32 */
-
-GLenum GLEWAPIENTRY glewInit (void)
-{
-  GLenum r;
-  r = glewContextInit();
-  if ( r != 0 ) return r;
-#if defined(_WIN32)
-  return wglewContextInit();
-#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */
-  return glxewContextInit();
-#else
-  return r;
-#endif /* _WIN32 */
-}
-
-#endif /* !GLEW_MX */
-#ifdef GLEW_MX
-GLboolean GLEWAPIENTRY glewContextIsSupported (const GLEWContext* ctx, const char* name)
-#else
-GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
-#endif
-{
-  GLubyte* pos = (GLubyte*)name;
-  GLuint len = _glewStrLen(pos);
-  GLboolean ret = GL_TRUE;
-  while (ret && len > 0)
-  {
-    if (_glewStrSame1(&pos, &len, (const GLubyte*)"GL_", 3))
-    {
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
-      {
-#ifdef GL_VERSION_1_2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
-        {
-          ret = GLEW_VERSION_1_2;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_1_2_1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2_1", 5))
-        {
-          ret = GLEW_VERSION_1_2_1;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_1_3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
-        {
-          ret = GLEW_VERSION_1_3;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_1_4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
-        {
-          ret = GLEW_VERSION_1_4;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_1_5
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3))
-        {
-          ret = GLEW_VERSION_1_5;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_2_0
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_0", 3))
-        {
-          ret = GLEW_VERSION_2_0;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_2_1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_1", 3))
-        {
-          ret = GLEW_VERSION_2_1;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_3_0
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_0", 3))
-        {
-          ret = GLEW_VERSION_3_0;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_3_1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_1", 3))
-        {
-          ret = GLEW_VERSION_3_1;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_3_2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_2", 3))
-        {
-          ret = GLEW_VERSION_3_2;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_3_3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_3", 3))
-        {
-          ret = GLEW_VERSION_3_3;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_4_0
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_0", 3))
-        {
-          ret = GLEW_VERSION_4_0;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_4_1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_1", 3))
-        {
-          ret = GLEW_VERSION_4_1;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_4_2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_2", 3))
-        {
-          ret = GLEW_VERSION_4_2;
-          continue;
-        }
-#endif
-#ifdef GL_VERSION_4_3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"4_3", 3))
-        {
-          ret = GLEW_VERSION_4_3;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
-      {
-#ifdef GL_3DFX_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLEW_3DFX_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_3DFX_tbuffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tbuffer", 7))
-        {
-          ret = GLEW_3DFX_tbuffer;
-          continue;
-        }
-#endif
-#ifdef GL_3DFX_texture_compression_FXT1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_FXT1", 24))
-        {
-          ret = GLEW_3DFX_texture_compression_FXT1;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
-      {
-#ifdef GL_AMD_blend_minmax_factor
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax_factor", 19))
-        {
-          ret = GLEW_AMD_blend_minmax_factor;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_conservative_depth
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_depth", 18))
-        {
-          ret = GLEW_AMD_conservative_depth;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_debug_output
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_output", 12))
-        {
-          ret = GLEW_AMD_debug_output;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_depth_clamp_separate
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp_separate", 20))
-        {
-          ret = GLEW_AMD_depth_clamp_separate;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_draw_buffers_blend
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers_blend", 18))
-        {
-          ret = GLEW_AMD_draw_buffers_blend;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_multi_draw_indirect
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_indirect", 19))
-        {
-          ret = GLEW_AMD_multi_draw_indirect;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_name_gen_delete
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"name_gen_delete", 15))
-        {
-          ret = GLEW_AMD_name_gen_delete;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_performance_monitor
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"performance_monitor", 19))
-        {
-          ret = GLEW_AMD_performance_monitor;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_pinned_memory
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pinned_memory", 13))
-        {
-          ret = GLEW_AMD_pinned_memory;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_query_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_buffer_object", 19))
-        {
-          ret = GLEW_AMD_query_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_sample_positions
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_positions", 16))
-        {
-          ret = GLEW_AMD_sample_positions;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_seamless_cubemap_per_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"seamless_cubemap_per_texture", 28))
-        {
-          ret = GLEW_AMD_seamless_cubemap_per_texture;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_shader_stencil_export
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_stencil_export", 21))
-        {
-          ret = GLEW_AMD_shader_stencil_export;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_stencil_operation_extended
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_operation_extended", 26))
-        {
-          ret = GLEW_AMD_stencil_operation_extended;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_texture_texture4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_texture4", 16))
-        {
-          ret = GLEW_AMD_texture_texture4;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_transform_feedback3_lines_triangles
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback3_lines_triangles", 35))
-        {
-          ret = GLEW_AMD_transform_feedback3_lines_triangles;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_vertex_shader_layer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_layer", 19))
-        {
-          ret = GLEW_AMD_vertex_shader_layer;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_vertex_shader_tessellator
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_tessellator", 25))
-        {
-          ret = GLEW_AMD_vertex_shader_tessellator;
-          continue;
-        }
-#endif
-#ifdef GL_AMD_vertex_shader_viewport_index
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_viewport_index", 28))
-        {
-          ret = GLEW_AMD_vertex_shader_viewport_index;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"APPLE_", 6))
-      {
-#ifdef GL_APPLE_aux_depth_stencil
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"aux_depth_stencil", 17))
-        {
-          ret = GLEW_APPLE_aux_depth_stencil;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_client_storage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_storage", 14))
-        {
-          ret = GLEW_APPLE_client_storage;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_element_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
-        {
-          ret = GLEW_APPLE_element_array;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_fence
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
-        {
-          ret = GLEW_APPLE_fence;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_float_pixels
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_pixels", 12))
-        {
-          ret = GLEW_APPLE_float_pixels;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_flush_buffer_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_buffer_range", 18))
-        {
-          ret = GLEW_APPLE_flush_buffer_range;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_object_purgeable
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"object_purgeable", 16))
-        {
-          ret = GLEW_APPLE_object_purgeable;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_pixel_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer", 12))
-        {
-          ret = GLEW_APPLE_pixel_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_rgb_422
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rgb_422", 7))
-        {
-          ret = GLEW_APPLE_rgb_422;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_row_bytes
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"row_bytes", 9))
-        {
-          ret = GLEW_APPLE_row_bytes;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_specular_vector
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_vector", 15))
-        {
-          ret = GLEW_APPLE_specular_vector;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_texture_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
-        {
-          ret = GLEW_APPLE_texture_range;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_transform_hint
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_hint", 14))
-        {
-          ret = GLEW_APPLE_transform_hint;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_vertex_array_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
-        {
-          ret = GLEW_APPLE_vertex_array_object;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_vertex_array_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
-        {
-          ret = GLEW_APPLE_vertex_array_range;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_vertex_program_evaluators
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program_evaluators", 25))
-        {
-          ret = GLEW_APPLE_vertex_program_evaluators;
-          continue;
-        }
-#endif
-#ifdef GL_APPLE_ycbcr_422
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_422", 9))
-        {
-          ret = GLEW_APPLE_ycbcr_422;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
-      {
-#ifdef GL_ARB_ES2_compatibility
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES2_compatibility", 17))
-        {
-          ret = GLEW_ARB_ES2_compatibility;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_ES3_compatibility
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ES3_compatibility", 17))
-        {
-          ret = GLEW_ARB_ES3_compatibility;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_arrays_of_arrays
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"arrays_of_arrays", 16))
-        {
-          ret = GLEW_ARB_arrays_of_arrays;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_base_instance
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"base_instance", 13))
-        {
-          ret = GLEW_ARB_base_instance;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_blend_func_extended
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_extended", 19))
-        {
-          ret = GLEW_ARB_blend_func_extended;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_cl_event
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cl_event", 8))
-        {
-          ret = GLEW_ARB_cl_event;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_clear_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clear_buffer_object", 19))
-        {
-          ret = GLEW_ARB_clear_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_color_buffer_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18))
-        {
-          ret = GLEW_ARB_color_buffer_float;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_compatibility
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compatibility", 13))
-        {
-          ret = GLEW_ARB_compatibility;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_compressed_texture_pixel_storage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_texture_pixel_storage", 32))
-        {
-          ret = GLEW_ARB_compressed_texture_pixel_storage;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_compute_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compute_shader", 14))
-        {
-          ret = GLEW_ARB_compute_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_conservative_depth
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conservative_depth", 18))
-        {
-          ret = GLEW_ARB_conservative_depth;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_copy_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_buffer", 11))
-        {
-          ret = GLEW_ARB_copy_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_copy_image
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
-        {
-          ret = GLEW_ARB_copy_image;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_debug_output
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_output", 12))
-        {
-          ret = GLEW_ARB_debug_output;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_depth_buffer_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18))
-        {
-          ret = GLEW_ARB_depth_buffer_float;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_depth_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11))
-        {
-          ret = GLEW_ARB_depth_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_depth_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
-        {
-          ret = GLEW_ARB_depth_texture;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_draw_buffers
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
-        {
-          ret = GLEW_ARB_draw_buffers;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_draw_buffers_blend
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers_blend", 18))
-        {
-          ret = GLEW_ARB_draw_buffers_blend;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_draw_elements_base_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_elements_base_vertex", 25))
-        {
-          ret = GLEW_ARB_draw_elements_base_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_draw_indirect
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_indirect", 13))
-        {
-          ret = GLEW_ARB_draw_indirect;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_draw_instanced
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14))
-        {
-          ret = GLEW_ARB_draw_instanced;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_explicit_attrib_location
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_attrib_location", 24))
-        {
-          ret = GLEW_ARB_explicit_attrib_location;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_explicit_uniform_location
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_uniform_location", 25))
-        {
-          ret = GLEW_ARB_explicit_uniform_location;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_fragment_coord_conventions
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_coord_conventions", 26))
-        {
-          ret = GLEW_ARB_fragment_coord_conventions;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_fragment_layer_viewport
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_layer_viewport", 23))
-        {
-          ret = GLEW_ARB_fragment_layer_viewport;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_fragment_program
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
-        {
-          ret = GLEW_ARB_fragment_program;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_fragment_program_shadow
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_shadow", 23))
-        {
-          ret = GLEW_ARB_fragment_program_shadow;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_fragment_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
-        {
-          ret = GLEW_ARB_fragment_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_framebuffer_no_attachments
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_no_attachments", 26))
-        {
-          ret = GLEW_ARB_framebuffer_no_attachments;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_framebuffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18))
-        {
-          ret = GLEW_ARB_framebuffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = GLEW_ARB_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_geometry_shader4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
-        {
-          ret = GLEW_ARB_geometry_shader4;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_get_program_binary
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_program_binary", 18))
-        {
-          ret = GLEW_ARB_get_program_binary;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_gpu_shader5
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader5", 11))
-        {
-          ret = GLEW_ARB_gpu_shader5;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_gpu_shader_fp64
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader_fp64", 15))
-        {
-          ret = GLEW_ARB_gpu_shader_fp64;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_half_float_pixel
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_pixel", 16))
-        {
-          ret = GLEW_ARB_half_float_pixel;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_half_float_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_vertex", 17))
-        {
-          ret = GLEW_ARB_half_float_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_imaging
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"imaging", 7))
-        {
-          ret = GLEW_ARB_imaging;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_instanced_arrays
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16))
-        {
-          ret = GLEW_ARB_instanced_arrays;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_internalformat_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"internalformat_query", 20))
-        {
-          ret = GLEW_ARB_internalformat_query;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_internalformat_query2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"internalformat_query2", 21))
-        {
-          ret = GLEW_ARB_internalformat_query2;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_invalidate_subdata
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"invalidate_subdata", 18))
-        {
-          ret = GLEW_ARB_invalidate_subdata;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_map_buffer_alignment
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_alignment", 20))
-        {
-          ret = GLEW_ARB_map_buffer_alignment;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_map_buffer_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_range", 16))
-        {
-          ret = GLEW_ARB_map_buffer_range;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_matrix_palette
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"matrix_palette", 14))
-        {
-          ret = GLEW_ARB_matrix_palette;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_multi_draw_indirect
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_indirect", 19))
-        {
-          ret = GLEW_ARB_multi_draw_indirect;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLEW_ARB_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_multitexture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12))
-        {
-          ret = GLEW_ARB_multitexture;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_occlusion_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
-        {
-          ret = GLEW_ARB_occlusion_query;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_occlusion_query2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query2", 16))
-        {
-          ret = GLEW_ARB_occlusion_query2;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_pixel_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
-        {
-          ret = GLEW_ARB_pixel_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_point_parameters
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
-        {
-          ret = GLEW_ARB_point_parameters;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_point_sprite
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
-        {
-          ret = GLEW_ARB_point_sprite;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_program_interface_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"program_interface_query", 23))
-        {
-          ret = GLEW_ARB_program_interface_query;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_provoking_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"provoking_vertex", 16))
-        {
-          ret = GLEW_ARB_provoking_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_robust_buffer_access_behavior
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robust_buffer_access_behavior", 29))
-        {
-          ret = GLEW_ARB_robust_buffer_access_behavior;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_robustness
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness", 10))
-        {
-          ret = GLEW_ARB_robustness;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_robustness_application_isolation
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_application_isolation", 32))
-        {
-          ret = GLEW_ARB_robustness_application_isolation;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_robustness_share_group_isolation
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_share_group_isolation", 32))
-        {
-          ret = GLEW_ARB_robustness_share_group_isolation;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_sample_shading
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sample_shading", 14))
-        {
-          ret = GLEW_ARB_sample_shading;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_sampler_objects
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sampler_objects", 15))
-        {
-          ret = GLEW_ARB_sampler_objects;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_seamless_cube_map
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"seamless_cube_map", 17))
-        {
-          ret = GLEW_ARB_seamless_cube_map;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_separate_shader_objects
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_shader_objects", 23))
-        {
-          ret = GLEW_ARB_separate_shader_objects;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_atomic_counters
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_counters", 22))
-        {
-          ret = GLEW_ARB_shader_atomic_counters;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_bit_encoding
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_bit_encoding", 19))
-        {
-          ret = GLEW_ARB_shader_bit_encoding;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_image_load_store
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_load_store", 23))
-        {
-          ret = GLEW_ARB_shader_image_load_store;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_image_size
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_size", 17))
-        {
-          ret = GLEW_ARB_shader_image_size;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_objects
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_objects", 14))
-        {
-          ret = GLEW_ARB_shader_objects;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_precision
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_precision", 16))
-        {
-          ret = GLEW_ARB_shader_precision;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_stencil_export
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_stencil_export", 21))
-        {
-          ret = GLEW_ARB_shader_stencil_export;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_storage_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_storage_buffer_object", 28))
-        {
-          ret = GLEW_ARB_shader_storage_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_subroutine
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_subroutine", 17))
-        {
-          ret = GLEW_ARB_shader_subroutine;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shader_texture_lod
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18))
-        {
-          ret = GLEW_ARB_shader_texture_lod;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shading_language_100
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_100", 20))
-        {
-          ret = GLEW_ARB_shading_language_100;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shading_language_420pack
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_420pack", 24))
-        {
-          ret = GLEW_ARB_shading_language_420pack;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shading_language_include
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_include", 24))
-        {
-          ret = GLEW_ARB_shading_language_include;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shading_language_packing
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_packing", 24))
-        {
-          ret = GLEW_ARB_shading_language_packing;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shadow
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
-        {
-          ret = GLEW_ARB_shadow;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_shadow_ambient
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
-        {
-          ret = GLEW_ARB_shadow_ambient;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_stencil_texturing
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_texturing", 17))
-        {
-          ret = GLEW_ARB_stencil_texturing;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_sync
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync", 4))
-        {
-          ret = GLEW_ARB_sync;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_tessellation_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tessellation_shader", 19))
-        {
-          ret = GLEW_ARB_tessellation_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_border_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
-        {
-          ret = GLEW_ARB_texture_border_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21))
-        {
-          ret = GLEW_ARB_texture_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_buffer_object_rgb32
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object_rgb32", 27))
-        {
-          ret = GLEW_ARB_texture_buffer_object_rgb32;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_buffer_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_range", 20))
-        {
-          ret = GLEW_ARB_texture_buffer_range;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_compression
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression", 19))
-        {
-          ret = GLEW_ARB_texture_compression;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_compression_bptc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_bptc", 24))
-        {
-          ret = GLEW_ARB_texture_compression_bptc;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_compression_rgtc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24))
-        {
-          ret = GLEW_ARB_texture_compression_rgtc;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_cube_map
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
-        {
-          ret = GLEW_ARB_texture_cube_map;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_cube_map_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map_array", 22))
-        {
-          ret = GLEW_ARB_texture_cube_map_array;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_env_add
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
-        {
-          ret = GLEW_ARB_texture_env_add;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_env_combine
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
-        {
-          ret = GLEW_ARB_texture_env_combine;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_env_crossbar
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_crossbar", 20))
-        {
-          ret = GLEW_ARB_texture_env_crossbar;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_env_dot3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
-        {
-          ret = GLEW_ARB_texture_env_dot3;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
-        {
-          ret = GLEW_ARB_texture_float;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_gather
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_gather", 14))
-        {
-          ret = GLEW_ARB_texture_gather;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_mirrored_repeat
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
-        {
-          ret = GLEW_ARB_texture_mirrored_repeat;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multisample", 19))
-        {
-          ret = GLEW_ARB_texture_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_non_power_of_two
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_non_power_of_two", 24))
-        {
-          ret = GLEW_ARB_texture_non_power_of_two;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_query_levels
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_query_levels", 20))
-        {
-          ret = GLEW_ARB_texture_query_levels;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_query_lod
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_query_lod", 17))
-        {
-          ret = GLEW_ARB_texture_query_lod;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_rectangle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
-        {
-          ret = GLEW_ARB_texture_rectangle;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_rg
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rg", 10))
-        {
-          ret = GLEW_ARB_texture_rg;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_rgb10_a2ui
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rgb10_a2ui", 18))
-        {
-          ret = GLEW_ARB_texture_rgb10_a2ui;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_storage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_storage", 15))
-        {
-          ret = GLEW_ARB_texture_storage;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_storage_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_storage_multisample", 27))
-        {
-          ret = GLEW_ARB_texture_storage_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_swizzle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15))
-        {
-          ret = GLEW_ARB_texture_swizzle;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_texture_view
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_view", 12))
-        {
-          ret = GLEW_ARB_texture_view;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_timer_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11))
-        {
-          ret = GLEW_ARB_timer_query;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_transform_feedback2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback2", 19))
-        {
-          ret = GLEW_ARB_transform_feedback2;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_transform_feedback3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback3", 19))
-        {
-          ret = GLEW_ARB_transform_feedback3;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_transform_feedback_instanced
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback_instanced", 28))
-        {
-          ret = GLEW_ARB_transform_feedback_instanced;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_transpose_matrix
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transpose_matrix", 16))
-        {
-          ret = GLEW_ARB_transpose_matrix;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_uniform_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"uniform_buffer_object", 21))
-        {
-          ret = GLEW_ARB_uniform_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_array_bgra
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17))
-        {
-          ret = GLEW_ARB_vertex_array_bgra;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_array_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
-        {
-          ret = GLEW_ARB_vertex_array_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_attrib_64bit
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_64bit", 19))
-        {
-          ret = GLEW_ARB_vertex_attrib_64bit;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_attrib_binding
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_binding", 21))
-        {
-          ret = GLEW_ARB_vertex_attrib_binding;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_blend
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_blend", 12))
-        {
-          ret = GLEW_ARB_vertex_blend;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20))
-        {
-          ret = GLEW_ARB_vertex_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_program
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
-        {
-          ret = GLEW_ARB_vertex_program;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
-        {
-          ret = GLEW_ARB_vertex_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_vertex_type_2_10_10_10_rev
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_type_2_10_10_10_rev", 26))
-        {
-          ret = GLEW_ARB_vertex_type_2_10_10_10_rev;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_viewport_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"viewport_array", 14))
-        {
-          ret = GLEW_ARB_viewport_array;
-          continue;
-        }
-#endif
-#ifdef GL_ARB_window_pos
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
-        {
-          ret = GLEW_ARB_window_pos;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATIX_", 5))
-      {
-#ifdef GL_ATIX_point_sprites
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprites", 13))
-        {
-          ret = GLEW_ATIX_point_sprites;
-          continue;
-        }
-#endif
-#ifdef GL_ATIX_texture_env_combine3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
-        {
-          ret = GLEW_ATIX_texture_env_combine3;
-          continue;
-        }
-#endif
-#ifdef GL_ATIX_texture_env_route
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_route", 17))
-        {
-          ret = GLEW_ATIX_texture_env_route;
-          continue;
-        }
-#endif
-#ifdef GL_ATIX_vertex_shader_output_point_size
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_output_point_size", 31))
-        {
-          ret = GLEW_ATIX_vertex_shader_output_point_size;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
-      {
-#ifdef GL_ATI_draw_buffers
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
-        {
-          ret = GLEW_ATI_draw_buffers;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_element_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
-        {
-          ret = GLEW_ATI_element_array;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_envmap_bumpmap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"envmap_bumpmap", 14))
-        {
-          ret = GLEW_ATI_envmap_bumpmap;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_fragment_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
-        {
-          ret = GLEW_ATI_fragment_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_map_object_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_object_buffer", 17))
-        {
-          ret = GLEW_ATI_map_object_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_meminfo
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"meminfo", 7))
-        {
-          ret = GLEW_ATI_meminfo;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_pn_triangles
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pn_triangles", 12))
-        {
-          ret = GLEW_ATI_pn_triangles;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_separate_stencil
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_stencil", 16))
-        {
-          ret = GLEW_ATI_separate_stencil;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_shader_texture_lod
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18))
-        {
-          ret = GLEW_ATI_shader_texture_lod;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_text_fragment_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"text_fragment_shader", 20))
-        {
-          ret = GLEW_ATI_text_fragment_shader;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_texture_compression_3dc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_3dc", 23))
-        {
-          ret = GLEW_ATI_texture_compression_3dc;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_texture_env_combine3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
-        {
-          ret = GLEW_ATI_texture_env_combine3;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_texture_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
-        {
-          ret = GLEW_ATI_texture_float;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_texture_mirror_once
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_once", 19))
-        {
-          ret = GLEW_ATI_texture_mirror_once;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_vertex_array_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
-        {
-          ret = GLEW_ATI_vertex_array_object;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_vertex_attrib_array_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_array_object", 26))
-        {
-          ret = GLEW_ATI_vertex_attrib_array_object;
-          continue;
-        }
-#endif
-#ifdef GL_ATI_vertex_streams
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_streams", 14))
-        {
-          ret = GLEW_ATI_vertex_streams;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
-      {
-#ifdef GL_EXT_422_pixels
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"422_pixels", 10))
-        {
-          ret = GLEW_EXT_422_pixels;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_Cg_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"Cg_shader", 9))
-        {
-          ret = GLEW_EXT_Cg_shader;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_abgr
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"abgr", 4))
-        {
-          ret = GLEW_EXT_abgr;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_bgra
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgra", 4))
-        {
-          ret = GLEW_EXT_bgra;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_bindable_uniform
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindable_uniform", 16))
-        {
-          ret = GLEW_EXT_bindable_uniform;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_color
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_color", 11))
-        {
-          ret = GLEW_EXT_blend_color;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_equation_separate
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_separate", 23))
-        {
-          ret = GLEW_EXT_blend_equation_separate;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_func_separate
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_separate", 19))
-        {
-          ret = GLEW_EXT_blend_func_separate;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_logic_op
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_logic_op", 14))
-        {
-          ret = GLEW_EXT_blend_logic_op;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_minmax
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax", 12))
-        {
-          ret = GLEW_EXT_blend_minmax;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_blend_subtract
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_subtract", 14))
-        {
-          ret = GLEW_EXT_blend_subtract;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_clip_volume_hint
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_volume_hint", 16))
-        {
-          ret = GLEW_EXT_clip_volume_hint;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_cmyka
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cmyka", 5))
-        {
-          ret = GLEW_EXT_cmyka;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_color_subtable
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_subtable", 14))
-        {
-          ret = GLEW_EXT_color_subtable;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_compiled_vertex_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compiled_vertex_array", 21))
-        {
-          ret = GLEW_EXT_compiled_vertex_array;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_convolution
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution", 11))
-        {
-          ret = GLEW_EXT_convolution;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_coordinate_frame
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"coordinate_frame", 16))
-        {
-          ret = GLEW_EXT_coordinate_frame;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_copy_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture", 12))
-        {
-          ret = GLEW_EXT_copy_texture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_cull_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
-        {
-          ret = GLEW_EXT_cull_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_debug_marker
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_marker", 12))
-        {
-          ret = GLEW_EXT_debug_marker;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_depth_bounds_test
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_bounds_test", 17))
-        {
-          ret = GLEW_EXT_depth_bounds_test;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_direct_state_access
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"direct_state_access", 19))
-        {
-          ret = GLEW_EXT_direct_state_access;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_draw_buffers2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers2", 13))
-        {
-          ret = GLEW_EXT_draw_buffers2;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_draw_instanced
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14))
-        {
-          ret = GLEW_EXT_draw_instanced;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_draw_range_elements
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_range_elements", 19))
-        {
-          ret = GLEW_EXT_draw_range_elements;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_fog_coord
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_coord", 9))
-        {
-          ret = GLEW_EXT_fog_coord;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_fragment_lighting
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting", 17))
-        {
-          ret = GLEW_EXT_fragment_lighting;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_framebuffer_blit
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16))
-        {
-          ret = GLEW_EXT_framebuffer_blit;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_framebuffer_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
-        {
-          ret = GLEW_EXT_framebuffer_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_framebuffer_multisample_blit_scaled
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_blit_scaled", 35))
-        {
-          ret = GLEW_EXT_framebuffer_multisample_blit_scaled;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_framebuffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18))
-        {
-          ret = GLEW_EXT_framebuffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = GLEW_EXT_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_geometry_shader4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
-        {
-          ret = GLEW_EXT_geometry_shader4;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_gpu_program_parameters
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_parameters", 22))
-        {
-          ret = GLEW_EXT_gpu_program_parameters;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_gpu_shader4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader4", 11))
-        {
-          ret = GLEW_EXT_gpu_shader4;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_histogram
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"histogram", 9))
-        {
-          ret = GLEW_EXT_histogram;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_index_array_formats
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_array_formats", 19))
-        {
-          ret = GLEW_EXT_index_array_formats;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_index_func
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_func", 10))
-        {
-          ret = GLEW_EXT_index_func;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_index_material
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_material", 14))
-        {
-          ret = GLEW_EXT_index_material;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_index_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_texture", 13))
-        {
-          ret = GLEW_EXT_index_texture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_light_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_texture", 13))
-        {
-          ret = GLEW_EXT_light_texture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_misc_attribute
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_attribute", 14))
-        {
-          ret = GLEW_EXT_misc_attribute;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_multi_draw_arrays
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_arrays", 17))
-        {
-          ret = GLEW_EXT_multi_draw_arrays;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLEW_EXT_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_packed_depth_stencil
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
-        {
-          ret = GLEW_EXT_packed_depth_stencil;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_packed_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float", 12))
-        {
-          ret = GLEW_EXT_packed_float;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_packed_pixels
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_pixels", 13))
-        {
-          ret = GLEW_EXT_packed_pixels;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_paletted_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"paletted_texture", 16))
-        {
-          ret = GLEW_EXT_paletted_texture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_pixel_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
-        {
-          ret = GLEW_EXT_pixel_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_pixel_transform
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform", 15))
-        {
-          ret = GLEW_EXT_pixel_transform;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_pixel_transform_color_table
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform_color_table", 27))
-        {
-          ret = GLEW_EXT_pixel_transform_color_table;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_point_parameters
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
-        {
-          ret = GLEW_EXT_point_parameters;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_polygon_offset
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset", 14))
-        {
-          ret = GLEW_EXT_polygon_offset;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_provoking_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"provoking_vertex", 16))
-        {
-          ret = GLEW_EXT_provoking_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_rescale_normal
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rescale_normal", 14))
-        {
-          ret = GLEW_EXT_rescale_normal;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_scene_marker
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
-        {
-          ret = GLEW_EXT_scene_marker;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_secondary_color
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"secondary_color", 15))
-        {
-          ret = GLEW_EXT_secondary_color;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_separate_shader_objects
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_shader_objects", 23))
-        {
-          ret = GLEW_EXT_separate_shader_objects;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_separate_specular_color
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_specular_color", 23))
-        {
-          ret = GLEW_EXT_separate_specular_color;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_shader_image_load_store
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_image_load_store", 23))
-        {
-          ret = GLEW_EXT_shader_image_load_store;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_shadow_funcs
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12))
-        {
-          ret = GLEW_EXT_shadow_funcs;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_shared_texture_palette
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_texture_palette", 22))
-        {
-          ret = GLEW_EXT_shared_texture_palette;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_stencil_clear_tag
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_clear_tag", 17))
-        {
-          ret = GLEW_EXT_stencil_clear_tag;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_stencil_two_side
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_two_side", 16))
-        {
-          ret = GLEW_EXT_stencil_two_side;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_stencil_wrap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_wrap", 12))
-        {
-          ret = GLEW_EXT_stencil_wrap;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_subtexture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subtexture", 10))
-        {
-          ret = GLEW_EXT_subtexture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture", 7))
-        {
-          ret = GLEW_EXT_texture;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture3D
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture3D", 9))
-        {
-          ret = GLEW_EXT_texture3D;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_array", 13))
-        {
-          ret = GLEW_EXT_texture_array;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21))
-        {
-          ret = GLEW_EXT_texture_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_compression_dxt1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24))
-        {
-          ret = GLEW_EXT_texture_compression_dxt1;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_compression_latc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_latc", 24))
-        {
-          ret = GLEW_EXT_texture_compression_latc;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_compression_rgtc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24))
-        {
-          ret = GLEW_EXT_texture_compression_rgtc;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_compression_s3tc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24))
-        {
-          ret = GLEW_EXT_texture_compression_s3tc;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_cube_map
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
-        {
-          ret = GLEW_EXT_texture_cube_map;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_edge_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
-        {
-          ret = GLEW_EXT_texture_edge_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_env
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env", 11))
-        {
-          ret = GLEW_EXT_texture_env;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_env_add
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
-        {
-          ret = GLEW_EXT_texture_env_add;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_env_combine
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
-        {
-          ret = GLEW_EXT_texture_env_combine;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_env_dot3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
-        {
-          ret = GLEW_EXT_texture_env_dot3;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_filter_anisotropic
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26))
-        {
-          ret = GLEW_EXT_texture_filter_anisotropic;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_integer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_integer", 15))
-        {
-          ret = GLEW_EXT_texture_integer;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_lod_bias
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
-        {
-          ret = GLEW_EXT_texture_lod_bias;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_mirror_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp", 20))
-        {
-          ret = GLEW_EXT_texture_mirror_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_object", 14))
-        {
-          ret = GLEW_EXT_texture_object;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_perturb_normal
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_perturb_normal", 22))
-        {
-          ret = GLEW_EXT_texture_perturb_normal;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_rectangle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
-        {
-          ret = GLEW_EXT_texture_rectangle;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB", 12))
-        {
-          ret = GLEW_EXT_texture_sRGB;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_sRGB_decode
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB_decode", 19))
-        {
-          ret = GLEW_EXT_texture_sRGB_decode;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_shared_exponent
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shared_exponent", 23))
-        {
-          ret = GLEW_EXT_texture_shared_exponent;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_snorm
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_snorm", 13))
-        {
-          ret = GLEW_EXT_texture_snorm;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_texture_swizzle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15))
-        {
-          ret = GLEW_EXT_texture_swizzle;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_timer_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11))
-        {
-          ret = GLEW_EXT_timer_query;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_transform_feedback
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18))
-        {
-          ret = GLEW_EXT_transform_feedback;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_vertex_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array", 12))
-        {
-          ret = GLEW_EXT_vertex_array;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_vertex_array_bgra
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17))
-        {
-          ret = GLEW_EXT_vertex_array_bgra;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_vertex_attrib_64bit
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_64bit", 19))
-        {
-          ret = GLEW_EXT_vertex_attrib_64bit;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_vertex_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
-        {
-          ret = GLEW_EXT_vertex_shader;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_vertex_weighting
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_weighting", 16))
-        {
-          ret = GLEW_EXT_vertex_weighting;
-          continue;
-        }
-#endif
-#ifdef GL_EXT_x11_sync_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"x11_sync_object", 15))
-        {
-          ret = GLEW_EXT_x11_sync_object;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"GREMEDY_", 8))
-      {
-#ifdef GL_GREMEDY_frame_terminator
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"frame_terminator", 16))
-        {
-          ret = GLEW_GREMEDY_frame_terminator;
-          continue;
-        }
-#endif
-#ifdef GL_GREMEDY_string_marker
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"string_marker", 13))
-        {
-          ret = GLEW_GREMEDY_string_marker;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"HP_", 3))
-      {
-#ifdef GL_HP_convolution_border_modes
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
-        {
-          ret = GLEW_HP_convolution_border_modes;
-          continue;
-        }
-#endif
-#ifdef GL_HP_image_transform
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_transform", 15))
-        {
-          ret = GLEW_HP_image_transform;
-          continue;
-        }
-#endif
-#ifdef GL_HP_occlusion_test
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_test", 14))
-        {
-          ret = GLEW_HP_occlusion_test;
-          continue;
-        }
-#endif
-#ifdef GL_HP_texture_lighting
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lighting", 16))
-        {
-          ret = GLEW_HP_texture_lighting;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"IBM_", 4))
-      {
-#ifdef GL_IBM_cull_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
-        {
-          ret = GLEW_IBM_cull_vertex;
-          continue;
-        }
-#endif
-#ifdef GL_IBM_multimode_draw_arrays
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multimode_draw_arrays", 21))
-        {
-          ret = GLEW_IBM_multimode_draw_arrays;
-          continue;
-        }
-#endif
-#ifdef GL_IBM_rasterpos_clip
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rasterpos_clip", 14))
-        {
-          ret = GLEW_IBM_rasterpos_clip;
-          continue;
-        }
-#endif
-#ifdef GL_IBM_static_data
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"static_data", 11))
-        {
-          ret = GLEW_IBM_static_data;
-          continue;
-        }
-#endif
-#ifdef GL_IBM_texture_mirrored_repeat
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
-        {
-          ret = GLEW_IBM_texture_mirrored_repeat;
-          continue;
-        }
-#endif
-#ifdef GL_IBM_vertex_array_lists
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_lists", 18))
-        {
-          ret = GLEW_IBM_vertex_array_lists;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INGR_", 5))
-      {
-#ifdef GL_INGR_color_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_clamp", 11))
-        {
-          ret = GLEW_INGR_color_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_INGR_interlace_read
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace_read", 14))
-        {
-          ret = GLEW_INGR_interlace_read;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
-      {
-#ifdef GL_INTEL_parallel_arrays
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_arrays", 15))
-        {
-          ret = GLEW_INTEL_parallel_arrays;
-          continue;
-        }
-#endif
-#ifdef GL_INTEL_texture_scissor
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scissor", 15))
-        {
-          ret = GLEW_INTEL_texture_scissor;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KHR_", 4))
-      {
-#ifdef GL_KHR_debug
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug", 5))
-        {
-          ret = GLEW_KHR_debug;
-          continue;
-        }
-#endif
-#ifdef GL_KHR_texture_compression_astc_ldr
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_ldr", 28))
-        {
-          ret = GLEW_KHR_texture_compression_astc_ldr;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KTX_", 4))
-      {
-#ifdef GL_KTX_buffer_region
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
-        {
-          ret = GLEW_KTX_buffer_region;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESAX_", 6))
-      {
-#ifdef GL_MESAX_texture_stack
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stack", 13))
-        {
-          ret = GLEW_MESAX_texture_stack;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
-      {
-#ifdef GL_MESA_pack_invert
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_invert", 11))
-        {
-          ret = GLEW_MESA_pack_invert;
-          continue;
-        }
-#endif
-#ifdef GL_MESA_resize_buffers
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resize_buffers", 14))
-        {
-          ret = GLEW_MESA_resize_buffers;
-          continue;
-        }
-#endif
-#ifdef GL_MESA_window_pos
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
-        {
-          ret = GLEW_MESA_window_pos;
-          continue;
-        }
-#endif
-#ifdef GL_MESA_ycbcr_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_texture", 13))
-        {
-          ret = GLEW_MESA_ycbcr_texture;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NVX_", 4))
-      {
-#ifdef GL_NVX_gpu_memory_info
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_memory_info", 15))
-        {
-          ret = GLEW_NVX_gpu_memory_info;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
-      {
-#ifdef GL_NV_bindless_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindless_texture", 16))
-        {
-          ret = GLEW_NV_bindless_texture;
-          continue;
-        }
-#endif
-#ifdef GL_NV_blend_square
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_square", 12))
-        {
-          ret = GLEW_NV_blend_square;
-          continue;
-        }
-#endif
-#ifdef GL_NV_conditional_render
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render", 18))
-        {
-          ret = GLEW_NV_conditional_render;
-          continue;
-        }
-#endif
-#ifdef GL_NV_copy_depth_to_color
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_depth_to_color", 19))
-        {
-          ret = GLEW_NV_copy_depth_to_color;
-          continue;
-        }
-#endif
-#ifdef GL_NV_copy_image
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
-        {
-          ret = GLEW_NV_copy_image;
-          continue;
-        }
-#endif
-#ifdef GL_NV_depth_buffer_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18))
-        {
-          ret = GLEW_NV_depth_buffer_float;
-          continue;
-        }
-#endif
-#ifdef GL_NV_depth_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11))
-        {
-          ret = GLEW_NV_depth_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_NV_depth_range_unclamped
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_range_unclamped", 21))
-        {
-          ret = GLEW_NV_depth_range_unclamped;
-          continue;
-        }
-#endif
-#ifdef GL_NV_evaluators
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"evaluators", 10))
-        {
-          ret = GLEW_NV_evaluators;
-          continue;
-        }
-#endif
-#ifdef GL_NV_explicit_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_multisample", 20))
-        {
-          ret = GLEW_NV_explicit_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fence
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
-        {
-          ret = GLEW_NV_fence;
-          continue;
-        }
-#endif
-#ifdef GL_NV_float_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
-        {
-          ret = GLEW_NV_float_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fog_distance
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_distance", 12))
-        {
-          ret = GLEW_NV_fog_distance;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fragment_program
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
-        {
-          ret = GLEW_NV_fragment_program;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fragment_program2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program2", 17))
-        {
-          ret = GLEW_NV_fragment_program2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fragment_program4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program4", 17))
-        {
-          ret = GLEW_NV_fragment_program4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_fragment_program_option
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_option", 23))
-        {
-          ret = GLEW_NV_fragment_program_option;
-          continue;
-        }
-#endif
-#ifdef GL_NV_framebuffer_multisample_coverage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_coverage", 32))
-        {
-          ret = GLEW_NV_framebuffer_multisample_coverage;
-          continue;
-        }
-#endif
-#ifdef GL_NV_geometry_program4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_program4", 17))
-        {
-          ret = GLEW_NV_geometry_program4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_geometry_shader4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16))
-        {
-          ret = GLEW_NV_geometry_shader4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_gpu_program4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program4", 12))
-        {
-          ret = GLEW_NV_gpu_program4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_gpu_program5
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program5", 12))
-        {
-          ret = GLEW_NV_gpu_program5;
-          continue;
-        }
-#endif
-#ifdef GL_NV_gpu_program_fp64
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_fp64", 16))
-        {
-          ret = GLEW_NV_gpu_program_fp64;
-          continue;
-        }
-#endif
-#ifdef GL_NV_gpu_shader5
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader5", 11))
-        {
-          ret = GLEW_NV_gpu_shader5;
-          continue;
-        }
-#endif
-#ifdef GL_NV_half_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float", 10))
-        {
-          ret = GLEW_NV_half_float;
-          continue;
-        }
-#endif
-#ifdef GL_NV_light_max_exponent
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_max_exponent", 18))
-        {
-          ret = GLEW_NV_light_max_exponent;
-          continue;
-        }
-#endif
-#ifdef GL_NV_multisample_coverage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
-        {
-          ret = GLEW_NV_multisample_coverage;
-          continue;
-        }
-#endif
-#ifdef GL_NV_multisample_filter_hint
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_filter_hint", 23))
-        {
-          ret = GLEW_NV_multisample_filter_hint;
-          continue;
-        }
-#endif
-#ifdef GL_NV_occlusion_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
-        {
-          ret = GLEW_NV_occlusion_query;
-          continue;
-        }
-#endif
-#ifdef GL_NV_packed_depth_stencil
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
-        {
-          ret = GLEW_NV_packed_depth_stencil;
-          continue;
-        }
-#endif
-#ifdef GL_NV_parameter_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object", 23))
-        {
-          ret = GLEW_NV_parameter_buffer_object;
-          continue;
-        }
-#endif
-#ifdef GL_NV_parameter_buffer_object2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object2", 24))
-        {
-          ret = GLEW_NV_parameter_buffer_object2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_path_rendering
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"path_rendering", 14))
-        {
-          ret = GLEW_NV_path_rendering;
-          continue;
-        }
-#endif
-#ifdef GL_NV_pixel_data_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_data_range", 16))
-        {
-          ret = GLEW_NV_pixel_data_range;
-          continue;
-        }
-#endif
-#ifdef GL_NV_point_sprite
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
-        {
-          ret = GLEW_NV_point_sprite;
-          continue;
-        }
-#endif
-#ifdef GL_NV_present_video
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
-        {
-          ret = GLEW_NV_present_video;
-          continue;
-        }
-#endif
-#ifdef GL_NV_primitive_restart
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"primitive_restart", 17))
-        {
-          ret = GLEW_NV_primitive_restart;
-          continue;
-        }
-#endif
-#ifdef GL_NV_register_combiners
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners", 18))
-        {
-          ret = GLEW_NV_register_combiners;
-          continue;
-        }
-#endif
-#ifdef GL_NV_register_combiners2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners2", 19))
-        {
-          ret = GLEW_NV_register_combiners2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_shader_atomic_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_atomic_float", 19))
-        {
-          ret = GLEW_NV_shader_atomic_float;
-          continue;
-        }
-#endif
-#ifdef GL_NV_shader_buffer_load
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_buffer_load", 18))
-        {
-          ret = GLEW_NV_shader_buffer_load;
-          continue;
-        }
-#endif
-#ifdef GL_NV_tessellation_program5
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tessellation_program5", 21))
-        {
-          ret = GLEW_NV_tessellation_program5;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texgen_emboss
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_emboss", 13))
-        {
-          ret = GLEW_NV_texgen_emboss;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texgen_reflection
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_reflection", 17))
-        {
-          ret = GLEW_NV_texgen_reflection;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_barrier
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_barrier", 15))
-        {
-          ret = GLEW_NV_texture_barrier;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_compression_vtc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_vtc", 23))
-        {
-          ret = GLEW_NV_texture_compression_vtc;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_env_combine4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine4", 20))
-        {
-          ret = GLEW_NV_texture_env_combine4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_expand_normal
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_expand_normal", 21))
-        {
-          ret = GLEW_NV_texture_expand_normal;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multisample", 19))
-        {
-          ret = GLEW_NV_texture_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_rectangle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
-        {
-          ret = GLEW_NV_texture_rectangle;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_shader
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader", 14))
-        {
-          ret = GLEW_NV_texture_shader;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_shader2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader2", 15))
-        {
-          ret = GLEW_NV_texture_shader2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_texture_shader3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader3", 15))
-        {
-          ret = GLEW_NV_texture_shader3;
-          continue;
-        }
-#endif
-#ifdef GL_NV_transform_feedback
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18))
-        {
-          ret = GLEW_NV_transform_feedback;
-          continue;
-        }
-#endif
-#ifdef GL_NV_transform_feedback2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback2", 19))
-        {
-          ret = GLEW_NV_transform_feedback2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vdpau_interop
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vdpau_interop", 13))
-        {
-          ret = GLEW_NV_vdpau_interop;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_array_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
-        {
-          ret = GLEW_NV_vertex_array_range;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_array_range2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range2", 19))
-        {
-          ret = GLEW_NV_vertex_array_range2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_attrib_integer_64bit
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_integer_64bit", 27))
-        {
-          ret = GLEW_NV_vertex_attrib_integer_64bit;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_buffer_unified_memory
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_unified_memory", 28))
-        {
-          ret = GLEW_NV_vertex_buffer_unified_memory;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
-        {
-          ret = GLEW_NV_vertex_program;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program1_1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program1_1", 17))
-        {
-          ret = GLEW_NV_vertex_program1_1;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2", 15))
-        {
-          ret = GLEW_NV_vertex_program2;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program2_option
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2_option", 22))
-        {
-          ret = GLEW_NV_vertex_program2_option;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program3", 15))
-        {
-          ret = GLEW_NV_vertex_program3;
-          continue;
-        }
-#endif
-#ifdef GL_NV_vertex_program4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program4", 15))
-        {
-          ret = GLEW_NV_vertex_program4;
-          continue;
-        }
-#endif
-#ifdef GL_NV_video_capture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
-        {
-          ret = GLEW_NV_video_capture;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OES_", 4))
-      {
-#ifdef GL_OES_byte_coordinates
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"byte_coordinates", 16))
-        {
-          ret = GLEW_OES_byte_coordinates;
-          continue;
-        }
-#endif
-#ifdef GL_OES_compressed_paletted_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_paletted_texture", 27))
-        {
-          ret = GLEW_OES_compressed_paletted_texture;
-          continue;
-        }
-#endif
-#ifdef GL_OES_read_format
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_format", 11))
-        {
-          ret = GLEW_OES_read_format;
-          continue;
-        }
-#endif
-#ifdef GL_OES_single_precision
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"single_precision", 16))
-        {
-          ret = GLEW_OES_single_precision;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
-      {
-#ifdef GL_OML_interlace
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
-        {
-          ret = GLEW_OML_interlace;
-          continue;
-        }
-#endif
-#ifdef GL_OML_resample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
-        {
-          ret = GLEW_OML_resample;
-          continue;
-        }
-#endif
-#ifdef GL_OML_subsample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9))
-        {
-          ret = GLEW_OML_subsample;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"PGI_", 4))
-      {
-#ifdef GL_PGI_misc_hints
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_hints", 10))
-        {
-          ret = GLEW_PGI_misc_hints;
-          continue;
-        }
-#endif
-#ifdef GL_PGI_vertex_hints
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_hints", 12))
-        {
-          ret = GLEW_PGI_vertex_hints;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"REGAL_", 6))
-      {
-#ifdef GL_REGAL_error_string
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"error_string", 12))
-        {
-          ret = GLEW_REGAL_error_string;
-          continue;
-        }
-#endif
-#ifdef GL_REGAL_extension_query
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extension_query", 15))
-        {
-          ret = GLEW_REGAL_extension_query;
-          continue;
-        }
-#endif
-#ifdef GL_REGAL_log
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"log", 3))
-        {
-          ret = GLEW_REGAL_log;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"REND_", 5))
-      {
-#ifdef GL_REND_screen_coordinates
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"screen_coordinates", 18))
-        {
-          ret = GLEW_REND_screen_coordinates;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"S3_", 3))
-      {
-#ifdef GL_S3_s3tc
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"s3tc", 4))
-        {
-          ret = GLEW_S3_s3tc;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
-      {
-#ifdef GL_SGIS_color_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
-        {
-          ret = GLEW_SGIS_color_range;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_detail_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"detail_texture", 14))
-        {
-          ret = GLEW_SGIS_detail_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_fog_function
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_function", 12))
-        {
-          ret = GLEW_SGIS_fog_function;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_generate_mipmap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap", 15))
-        {
-          ret = GLEW_SGIS_generate_mipmap;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLEW_SGIS_multisample;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_pixel_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
-        {
-          ret = GLEW_SGIS_pixel_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_point_line_texgen
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_line_texgen", 17))
-        {
-          ret = GLEW_SGIS_point_line_texgen;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_sharpen_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sharpen_texture", 15))
-        {
-          ret = GLEW_SGIS_sharpen_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture4D
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture4D", 9))
-        {
-          ret = GLEW_SGIS_texture4D;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture_border_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
-        {
-          ret = GLEW_SGIS_texture_border_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture_edge_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
-        {
-          ret = GLEW_SGIS_texture_edge_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture_filter4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter4", 15))
-        {
-          ret = GLEW_SGIS_texture_filter4;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture_lod
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod", 11))
-        {
-          ret = GLEW_SGIS_texture_lod;
-          continue;
-        }
-#endif
-#ifdef GL_SGIS_texture_select
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_select", 14))
-        {
-          ret = GLEW_SGIS_texture_select;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
-      {
-#ifdef GL_SGIX_async
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async", 5))
-        {
-          ret = GLEW_SGIX_async;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_async_histogram
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_histogram", 15))
-        {
-          ret = GLEW_SGIX_async_histogram;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_async_pixel
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_pixel", 11))
-        {
-          ret = GLEW_SGIX_async_pixel;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_blend_alpha_minmax
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_alpha_minmax", 18))
-        {
-          ret = GLEW_SGIX_blend_alpha_minmax;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_clipmap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clipmap", 7))
-        {
-          ret = GLEW_SGIX_clipmap;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_convolution_accuracy
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_accuracy", 20))
-        {
-          ret = GLEW_SGIX_convolution_accuracy;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_depth_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
-        {
-          ret = GLEW_SGIX_depth_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_flush_raster
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_raster", 12))
-        {
-          ret = GLEW_SGIX_flush_raster;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_fog_offset
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_offset", 10))
-        {
-          ret = GLEW_SGIX_fog_offset;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_fog_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_texture", 11))
-        {
-          ret = GLEW_SGIX_fog_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_fragment_specular_lighting
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_specular_lighting", 26))
-        {
-          ret = GLEW_SGIX_fragment_specular_lighting;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_framezoom
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framezoom", 9))
-        {
-          ret = GLEW_SGIX_framezoom;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_interlace
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
-        {
-          ret = GLEW_SGIX_interlace;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_ir_instrument1
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ir_instrument1", 14))
-        {
-          ret = GLEW_SGIX_ir_instrument1;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_list_priority
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"list_priority", 13))
-        {
-          ret = GLEW_SGIX_list_priority;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_pixel_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
-        {
-          ret = GLEW_SGIX_pixel_texture;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_pixel_texture_bits
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_bits", 18))
-        {
-          ret = GLEW_SGIX_pixel_texture_bits;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_reference_plane
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"reference_plane", 15))
-        {
-          ret = GLEW_SGIX_reference_plane;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_resample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
-        {
-          ret = GLEW_SGIX_resample;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_shadow
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
-        {
-          ret = GLEW_SGIX_shadow;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_shadow_ambient
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
-        {
-          ret = GLEW_SGIX_shadow_ambient;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_sprite
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sprite", 6))
-        {
-          ret = GLEW_SGIX_sprite;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_tag_sample_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tag_sample_buffer", 17))
-        {
-          ret = GLEW_SGIX_tag_sample_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_add_env
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_add_env", 15))
-        {
-          ret = GLEW_SGIX_texture_add_env;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_coordinate_clamp
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_coordinate_clamp", 24))
-        {
-          ret = GLEW_SGIX_texture_coordinate_clamp;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_lod_bias
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
-        {
-          ret = GLEW_SGIX_texture_lod_bias;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_multi_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multi_buffer", 20))
-        {
-          ret = GLEW_SGIX_texture_multi_buffer;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
-        {
-          ret = GLEW_SGIX_texture_range;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_texture_scale_bias
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scale_bias", 18))
-        {
-          ret = GLEW_SGIX_texture_scale_bias;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_vertex_preclip
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip", 14))
-        {
-          ret = GLEW_SGIX_vertex_preclip;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_vertex_preclip_hint
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip_hint", 19))
-        {
-          ret = GLEW_SGIX_vertex_preclip_hint;
-          continue;
-        }
-#endif
-#ifdef GL_SGIX_ycrcb
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb", 5))
-        {
-          ret = GLEW_SGIX_ycrcb;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
-      {
-#ifdef GL_SGI_color_matrix
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix", 12))
-        {
-          ret = GLEW_SGI_color_matrix;
-          continue;
-        }
-#endif
-#ifdef GL_SGI_color_table
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table", 11))
-        {
-          ret = GLEW_SGI_color_table;
-          continue;
-        }
-#endif
-#ifdef GL_SGI_texture_color_table
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_color_table", 19))
-        {
-          ret = GLEW_SGI_texture_color_table;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUNX_", 5))
-      {
-#ifdef GL_SUNX_constant_data
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"constant_data", 13))
-        {
-          ret = GLEW_SUNX_constant_data;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
-      {
-#ifdef GL_SUN_convolution_border_modes
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
-        {
-          ret = GLEW_SUN_convolution_border_modes;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_global_alpha
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"global_alpha", 12))
-        {
-          ret = GLEW_SUN_global_alpha;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_mesh_array
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mesh_array", 10))
-        {
-          ret = GLEW_SUN_mesh_array;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_read_video_pixels
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_video_pixels", 17))
-        {
-          ret = GLEW_SUN_read_video_pixels;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_slice_accum
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"slice_accum", 11))
-        {
-          ret = GLEW_SUN_slice_accum;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_triangle_list
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"triangle_list", 13))
-        {
-          ret = GLEW_SUN_triangle_list;
-          continue;
-        }
-#endif
-#ifdef GL_SUN_vertex
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex", 6))
-        {
-          ret = GLEW_SUN_vertex;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"WIN_", 4))
-      {
-#ifdef GL_WIN_phong_shading
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"phong_shading", 13))
-        {
-          ret = GLEW_WIN_phong_shading;
-          continue;
-        }
-#endif
-#ifdef GL_WIN_specular_fog
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_fog", 12))
-        {
-          ret = GLEW_WIN_specular_fog;
-          continue;
-        }
-#endif
-#ifdef GL_WIN_swap_hint
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_hint", 9))
-        {
-          ret = GLEW_WIN_swap_hint;
-          continue;
-        }
-#endif
-      }
-    }
-    ret = (len == 0);
-  }
-  return ret;
-}
-
-#if defined(_WIN32)
-
-#if defined(GLEW_MX)
-GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext* ctx, const char* name)
-#else
-GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
-#endif
-{
-  GLubyte* pos = (GLubyte*)name;
-  GLuint len = _glewStrLen(pos);
-  GLboolean ret = GL_TRUE;
-  while (ret && len > 0)
-  {
-    if (_glewStrSame1(&pos, &len, (const GLubyte*)"WGL_", 4))
-    {
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
-      {
-#ifdef WGL_3DFX_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = WGLEW_3DFX_multisample;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DL_", 4))
-      {
-#ifdef WGL_3DL_stereo_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_control", 14))
-        {
-          ret = WGLEW_3DL_stereo_control;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
-      {
-#ifdef WGL_AMD_gpu_association
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_association", 15))
-        {
-          ret = WGLEW_AMD_gpu_association;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
-      {
-#ifdef WGL_ARB_buffer_region
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
-        {
-          ret = WGLEW_ARB_buffer_region;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_create_context
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14))
-        {
-          ret = WGLEW_ARB_create_context;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_create_context_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_profile", 22))
-        {
-          ret = WGLEW_ARB_create_context_profile;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_create_context_robustness
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_robustness", 25))
-        {
-          ret = WGLEW_ARB_create_context_robustness;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_extensions_string
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
-        {
-          ret = WGLEW_ARB_extensions_string;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = WGLEW_ARB_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_make_current_read
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
-        {
-          ret = WGLEW_ARB_make_current_read;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = WGLEW_ARB_multisample;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_pbuffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
-        {
-          ret = WGLEW_ARB_pbuffer;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_pixel_format
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
-        {
-          ret = WGLEW_ARB_pixel_format;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_pixel_format_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
-        {
-          ret = WGLEW_ARB_pixel_format_float;
-          continue;
-        }
-#endif
-#ifdef WGL_ARB_render_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
-        {
-          ret = WGLEW_ARB_render_texture;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
-      {
-#ifdef WGL_ATI_pixel_format_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
-        {
-          ret = WGLEW_ATI_pixel_format_float;
-          continue;
-        }
-#endif
-#ifdef WGL_ATI_render_texture_rectangle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
-        {
-          ret = WGLEW_ATI_render_texture_rectangle;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
-      {
-#ifdef WGL_EXT_create_context_es2_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es2_profile", 26))
-        {
-          ret = WGLEW_EXT_create_context_es2_profile;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_create_context_es_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es_profile", 25))
-        {
-          ret = WGLEW_EXT_create_context_es_profile;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_depth_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_float", 11))
-        {
-          ret = WGLEW_EXT_depth_float;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_display_color_table
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"display_color_table", 19))
-        {
-          ret = WGLEW_EXT_display_color_table;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_extensions_string
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
-        {
-          ret = WGLEW_EXT_extensions_string;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = WGLEW_EXT_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_make_current_read
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
-        {
-          ret = WGLEW_EXT_make_current_read;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = WGLEW_EXT_multisample;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_pbuffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
-        {
-          ret = WGLEW_EXT_pbuffer;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_pixel_format
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
-        {
-          ret = WGLEW_EXT_pixel_format;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_pixel_format_packed_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_packed_float", 25))
-        {
-          ret = WGLEW_EXT_pixel_format_packed_float;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_swap_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
-        {
-          ret = WGLEW_EXT_swap_control;
-          continue;
-        }
-#endif
-#ifdef WGL_EXT_swap_control_tear
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control_tear", 17))
-        {
-          ret = WGLEW_EXT_swap_control_tear;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"I3D_", 4))
-      {
-#ifdef WGL_I3D_digital_video_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"digital_video_control", 21))
-        {
-          ret = WGLEW_I3D_digital_video_control;
-          continue;
-        }
-#endif
-#ifdef WGL_I3D_gamma
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gamma", 5))
-        {
-          ret = WGLEW_I3D_gamma;
-          continue;
-        }
-#endif
-#ifdef WGL_I3D_genlock
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"genlock", 7))
-        {
-          ret = WGLEW_I3D_genlock;
-          continue;
-        }
-#endif
-#ifdef WGL_I3D_image_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_buffer", 12))
-        {
-          ret = WGLEW_I3D_image_buffer;
-          continue;
-        }
-#endif
-#ifdef WGL_I3D_swap_frame_lock
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_lock", 15))
-        {
-          ret = WGLEW_I3D_swap_frame_lock;
-          continue;
-        }
-#endif
-#ifdef WGL_I3D_swap_frame_usage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_usage", 16))
-        {
-          ret = WGLEW_I3D_swap_frame_usage;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
-      {
-#ifdef WGL_NV_DX_interop
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"DX_interop", 10))
-        {
-          ret = WGLEW_NV_DX_interop;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_DX_interop2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"DX_interop2", 11))
-        {
-          ret = WGLEW_NV_DX_interop2;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_copy_image
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
-        {
-          ret = WGLEW_NV_copy_image;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_float_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
-        {
-          ret = WGLEW_NV_float_buffer;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_gpu_affinity
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_affinity", 12))
-        {
-          ret = WGLEW_NV_gpu_affinity;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_multisample_coverage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
-        {
-          ret = WGLEW_NV_multisample_coverage;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_present_video
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
-        {
-          ret = WGLEW_NV_present_video;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_render_depth_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_depth_texture", 20))
-        {
-          ret = WGLEW_NV_render_depth_texture;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_render_texture_rectangle
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
-        {
-          ret = WGLEW_NV_render_texture_rectangle;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_swap_group
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
-        {
-          ret = WGLEW_NV_swap_group;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_vertex_array_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
-        {
-          ret = WGLEW_NV_vertex_array_range;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_video_capture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
-        {
-          ret = WGLEW_NV_video_capture;
-          continue;
-        }
-#endif
-#ifdef WGL_NV_video_output
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12))
-        {
-          ret = WGLEW_NV_video_output;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
-      {
-#ifdef WGL_OML_sync_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
-        {
-          ret = WGLEW_OML_sync_control;
-          continue;
-        }
-#endif
-      }
-    }
-    ret = (len == 0);
-  }
-  return ret;
-}
-
-#elif !defined(__ANDROID__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-
-#if defined(GLEW_MX)
-GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name)
-#else
-GLboolean glxewIsSupported (const char* name)
-#endif
-{
-  GLubyte* pos = (GLubyte*)name;
-  GLuint len = _glewStrLen(pos);
-  GLboolean ret = GL_TRUE;
-  while (ret && len > 0)
-  {
-    if(_glewStrSame1(&pos, &len, (const GLubyte*)"GLX_", 4))
-    {
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
-      {
-#ifdef GLX_VERSION_1_2
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
-        {
-          ret = GLXEW_VERSION_1_2;
-          continue;
-        }
-#endif
-#ifdef GLX_VERSION_1_3
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
-        {
-          ret = GLXEW_VERSION_1_3;
-          continue;
-        }
-#endif
-#ifdef GLX_VERSION_1_4
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
-        {
-          ret = GLXEW_VERSION_1_4;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
-      {
-#ifdef GLX_3DFX_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLXEW_3DFX_multisample;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"AMD_", 4))
-      {
-#ifdef GLX_AMD_gpu_association
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_association", 15))
-        {
-          ret = GLXEW_AMD_gpu_association;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
-      {
-#ifdef GLX_ARB_create_context
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14))
-        {
-          ret = GLXEW_ARB_create_context;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_create_context_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_profile", 22))
-        {
-          ret = GLXEW_ARB_create_context_profile;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_create_context_robustness
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_robustness", 25))
-        {
-          ret = GLXEW_ARB_create_context_robustness;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_fbconfig_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_float", 14))
-        {
-          ret = GLXEW_ARB_fbconfig_float;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = GLXEW_ARB_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_get_proc_address
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_proc_address", 16))
-        {
-          ret = GLXEW_ARB_get_proc_address;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLXEW_ARB_multisample;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_robustness_application_isolation
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_application_isolation", 32))
-        {
-          ret = GLXEW_ARB_robustness_application_isolation;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_robustness_share_group_isolation
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"robustness_share_group_isolation", 32))
-        {
-          ret = GLXEW_ARB_robustness_share_group_isolation;
-          continue;
-        }
-#endif
-#ifdef GLX_ARB_vertex_buffer_object
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20))
-        {
-          ret = GLXEW_ARB_vertex_buffer_object;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
-      {
-#ifdef GLX_ATI_pixel_format_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
-        {
-          ret = GLXEW_ATI_pixel_format_float;
-          continue;
-        }
-#endif
-#ifdef GLX_ATI_render_texture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
-        {
-          ret = GLXEW_ATI_render_texture;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
-      {
-#ifdef GLX_EXT_create_context_es2_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es2_profile", 26))
-        {
-          ret = GLXEW_EXT_create_context_es2_profile;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_create_context_es_profile
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context_es_profile", 25))
-        {
-          ret = GLXEW_EXT_create_context_es_profile;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_fbconfig_packed_float
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_packed_float", 21))
-        {
-          ret = GLXEW_EXT_fbconfig_packed_float;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_framebuffer_sRGB
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16))
-        {
-          ret = GLXEW_EXT_framebuffer_sRGB;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_import_context
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"import_context", 14))
-        {
-          ret = GLXEW_EXT_import_context;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_scene_marker
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
-        {
-          ret = GLXEW_EXT_scene_marker;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_swap_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
-        {
-          ret = GLXEW_EXT_swap_control;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_swap_control_tear
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control_tear", 17))
-        {
-          ret = GLXEW_EXT_swap_control_tear;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_texture_from_pixmap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_from_pixmap", 19))
-        {
-          ret = GLXEW_EXT_texture_from_pixmap;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_visual_info
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_info", 11))
-        {
-          ret = GLXEW_EXT_visual_info;
-          continue;
-        }
-#endif
-#ifdef GLX_EXT_visual_rating
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_rating", 13))
-        {
-          ret = GLXEW_EXT_visual_rating;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
-      {
-#ifdef GLX_INTEL_swap_event
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_event", 10))
-        {
-          ret = GLXEW_INTEL_swap_event;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
-      {
-#ifdef GLX_MESA_agp_offset
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"agp_offset", 10))
-        {
-          ret = GLXEW_MESA_agp_offset;
-          continue;
-        }
-#endif
-#ifdef GLX_MESA_copy_sub_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_sub_buffer", 15))
-        {
-          ret = GLXEW_MESA_copy_sub_buffer;
-          continue;
-        }
-#endif
-#ifdef GLX_MESA_pixmap_colormap
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_colormap", 15))
-        {
-          ret = GLXEW_MESA_pixmap_colormap;
-          continue;
-        }
-#endif
-#ifdef GLX_MESA_release_buffers
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"release_buffers", 15))
-        {
-          ret = GLXEW_MESA_release_buffers;
-          continue;
-        }
-#endif
-#ifdef GLX_MESA_set_3dfx_mode
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"set_3dfx_mode", 13))
-        {
-          ret = GLXEW_MESA_set_3dfx_mode;
-          continue;
-        }
-#endif
-#ifdef GLX_MESA_swap_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
-        {
-          ret = GLXEW_MESA_swap_control;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
-      {
-#ifdef GLX_NV_copy_image
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_image", 10))
-        {
-          ret = GLXEW_NV_copy_image;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_float_buffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
-        {
-          ret = GLXEW_NV_float_buffer;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_multisample_coverage
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_coverage", 20))
-        {
-          ret = GLXEW_NV_multisample_coverage;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_present_video
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13))
-        {
-          ret = GLXEW_NV_present_video;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_swap_group
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
-        {
-          ret = GLXEW_NV_swap_group;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_vertex_array_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
-        {
-          ret = GLXEW_NV_vertex_array_range;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_video_capture
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_capture", 13))
-        {
-          ret = GLXEW_NV_video_capture;
-          continue;
-        }
-#endif
-#ifdef GLX_NV_video_out
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_out", 9))
-        {
-          ret = GLXEW_NV_video_out;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
-      {
-#ifdef GLX_OML_swap_method
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_method", 11))
-        {
-          ret = GLXEW_OML_swap_method;
-          continue;
-        }
-#endif
-#ifdef GLX_OML_sync_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
-        {
-          ret = GLXEW_OML_sync_control;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
-      {
-#ifdef GLX_SGIS_blended_overlay
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blended_overlay", 15))
-        {
-          ret = GLXEW_SGIS_blended_overlay;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIS_color_range
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
-        {
-          ret = GLXEW_SGIS_color_range;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIS_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
-        {
-          ret = GLXEW_SGIS_multisample;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIS_shared_multisample
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18))
-        {
-          ret = GLXEW_SGIS_shared_multisample;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
-      {
-#ifdef GLX_SGIX_fbconfig
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig", 8))
-        {
-          ret = GLXEW_SGIX_fbconfig;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_hyperpipe
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"hyperpipe", 9))
-        {
-          ret = GLXEW_SGIX_hyperpipe;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_pbuffer
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
-        {
-          ret = GLXEW_SGIX_pbuffer;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_swap_barrier
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_barrier", 12))
-        {
-          ret = GLXEW_SGIX_swap_barrier;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_swap_group
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
-        {
-          ret = GLXEW_SGIX_swap_group;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_video_resize
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
-        {
-          ret = GLXEW_SGIX_video_resize;
-          continue;
-        }
-#endif
-#ifdef GLX_SGIX_visual_select_group
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_select_group", 19))
-        {
-          ret = GLXEW_SGIX_visual_select_group;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
-      {
-#ifdef GLX_SGI_cushion
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cushion", 7))
-        {
-          ret = GLXEW_SGI_cushion;
-          continue;
-        }
-#endif
-#ifdef GLX_SGI_make_current_read
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
-        {
-          ret = GLXEW_SGI_make_current_read;
-          continue;
-        }
-#endif
-#ifdef GLX_SGI_swap_control
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
-        {
-          ret = GLXEW_SGI_swap_control;
-          continue;
-        }
-#endif
-#ifdef GLX_SGI_video_sync
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_sync", 10))
-        {
-          ret = GLXEW_SGI_video_sync;
-          continue;
-        }
-#endif
-      }
-      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
-      {
-#ifdef GLX_SUN_get_transparent_index
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_transparent_index", 21))
-        {
-          ret = GLXEW_SUN_get_transparent_index;
-          continue;
-        }
-#endif
-#ifdef GLX_SUN_video_resize
-        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
-        {
-          ret = GLXEW_SUN_video_resize;
-          continue;
-        }
-#endif
-      }
-    }
-    ret = (len == 0);
-  }
-  return ret;
-}
-
-#endif /* _WIN32 */
diff --git a/Externals/GLew/src/glewinfo.c b/Externals/GLew/src/glewinfo.c
deleted file mode 100644
index ac0434bc95..0000000000
--- a/Externals/GLew/src/glewinfo.c
+++ /dev/null
@@ -1,9984 +0,0 @@
-/*
-** The OpenGL Extension Wrangler Library
-** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
-** Copyright (C) 2002-2008, 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.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <GL/glew.h>
-#if defined(_WIN32)
-#include <GL/wglew.h>
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-#include <GL/glxew.h>
-#endif
-
-#ifdef GLEW_REGAL
-#include <GL/Regal.h>
-#endif
-
-static FILE* f;
-
-#ifdef GLEW_MX
-GLEWContext _glewctx;
-#define glewGetContext() (&_glewctx)
-#ifdef _WIN32
-WGLEWContext _wglewctx;
-#define wglewGetContext() (&_wglewctx)
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-GLXEWContext _glxewctx;
-#define glxewGetContext() (&_glxewctx)
-#endif
-#endif
-
-#if defined(_WIN32)
-GLboolean glewCreateContext (int* pixelformat);
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-GLboolean glewCreateContext (const char* display, int* visual);
-#else
-GLboolean glewCreateContext ();
-#endif
-
-#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-GLboolean glewParseArgs (int argc, char** argv, char** display, int* visual);
-#endif
-
-void glewDestroyContext ();
-
-/* ------------------------------------------------------------------------- */
-
-static void glewPrintExt (const char* name, GLboolean def1, GLboolean def2, GLboolean def3)
-{
-  unsigned int i;
-  fprintf(f, "\n%s:", name);
-  for (i=0; i<62-strlen(name); i++) fprintf(f, " ");
-  fprintf(f, "%s ", def1 ? "OK" : "MISSING");
-  if (def1 != def2)
-    fprintf(f, "[%s] ", def2 ? "OK" : "MISSING");
-  if (def1 != def3)
-    fprintf(f, "[%s]\n", def3 ? "OK" : "MISSING");
-  else
-    fprintf(f, "\n");
-  for (i=0; i<strlen(name)+1; i++) fprintf(f, "-");
-  fprintf(f, "\n");
-  fflush(f);
-}
-
-static void glewInfoFunc (const char* name, GLint undefined)
-{
-  unsigned int i;
-  fprintf(f, "  %s:", name);
-  for (i=0; i<60-strlen(name); i++) fprintf(f, " ");
-  fprintf(f, "%s\n", undefined ? "MISSING" : "OK");
-  fflush(f);
-}
-
-/* ----------------------------- GL_VERSION_1_1 ---------------------------- */
-
-#ifdef GL_VERSION_1_1
-
-static void _glewInfo_GL_VERSION_1_1 (void)
-{
-  glewPrintExt("GL_VERSION_1_1", GLEW_VERSION_1_1, GLEW_VERSION_1_1, GLEW_VERSION_1_1);
-}
-
-#endif /* GL_VERSION_1_1 */
-
-#ifdef GL_VERSION_1_2
-
-static void _glewInfo_GL_VERSION_1_2 (void)
-{
-  glewPrintExt("GL_VERSION_1_2", GLEW_VERSION_1_2, GLEW_VERSION_1_2, GLEW_VERSION_1_2);
-
-  glewInfoFunc("glCopyTexSubImage3D", glCopyTexSubImage3D == NULL);
-  glewInfoFunc("glDrawRangeElements", glDrawRangeElements == NULL);
-  glewInfoFunc("glTexImage3D", glTexImage3D == NULL);
-  glewInfoFunc("glTexSubImage3D", glTexSubImage3D == NULL);
-}
-
-#endif /* GL_VERSION_1_2 */
-
-#ifdef GL_VERSION_1_2_1
-
-static void _glewInfo_GL_VERSION_1_2_1 (void)
-{
-  glewPrintExt("GL_VERSION_1_2_1", GLEW_VERSION_1_2_1, GLEW_VERSION_1_2_1, GLEW_VERSION_1_2_1);
-}
-
-#endif /* GL_VERSION_1_2_1 */
-
-#ifdef GL_VERSION_1_3
-
-static void _glewInfo_GL_VERSION_1_3 (void)
-{
-  glewPrintExt("GL_VERSION_1_3", GLEW_VERSION_1_3, GLEW_VERSION_1_3, GLEW_VERSION_1_3);
-
-  glewInfoFunc("glActiveTexture", glActiveTexture == NULL);
-  glewInfoFunc("glClientActiveTexture", glClientActiveTexture == NULL);
-  glewInfoFunc("glCompressedTexImage1D", glCompressedTexImage1D == NULL);
-  glewInfoFunc("glCompressedTexImage2D", glCompressedTexImage2D == NULL);
-  glewInfoFunc("glCompressedTexImage3D", glCompressedTexImage3D == NULL);
-  glewInfoFunc("glCompressedTexSubImage1D", glCompressedTexSubImage1D == NULL);
-  glewInfoFunc("glCompressedTexSubImage2D", glCompressedTexSubImage2D == NULL);
-  glewInfoFunc("glCompressedTexSubImage3D", glCompressedTexSubImage3D == NULL);
-  glewInfoFunc("glGetCompressedTexImage", glGetCompressedTexImage == NULL);
-  glewInfoFunc("glLoadTransposeMatrixd", glLoadTransposeMatrixd == NULL);
-  glewInfoFunc("glLoadTransposeMatrixf", glLoadTransposeMatrixf == NULL);
-  glewInfoFunc("glMultTransposeMatrixd", glMultTransposeMatrixd == NULL);
-  glewInfoFunc("glMultTransposeMatrixf", glMultTransposeMatrixf == NULL);
-  glewInfoFunc("glMultiTexCoord1d", glMultiTexCoord1d == NULL);
-  glewInfoFunc("glMultiTexCoord1dv", glMultiTexCoord1dv == NULL);
-  glewInfoFunc("glMultiTexCoord1f", glMultiTexCoord1f == NULL);
-  glewInfoFunc("glMultiTexCoord1fv", glMultiTexCoord1fv == NULL);
-  glewInfoFunc("glMultiTexCoord1i", glMultiTexCoord1i == NULL);
-  glewInfoFunc("glMultiTexCoord1iv", glMultiTexCoord1iv == NULL);
-  glewInfoFunc("glMultiTexCoord1s", glMultiTexCoord1s == NULL);
-  glewInfoFunc("glMultiTexCoord1sv", glMultiTexCoord1sv == NULL);
-  glewInfoFunc("glMultiTexCoord2d", glMultiTexCoord2d == NULL);
-  glewInfoFunc("glMultiTexCoord2dv", glMultiTexCoord2dv == NULL);
-  glewInfoFunc("glMultiTexCoord2f", glMultiTexCoord2f == NULL);
-  glewInfoFunc("glMultiTexCoord2fv", glMultiTexCoord2fv == NULL);
-  glewInfoFunc("glMultiTexCoord2i", glMultiTexCoord2i == NULL);
-  glewInfoFunc("glMultiTexCoord2iv", glMultiTexCoord2iv == NULL);
-  glewInfoFunc("glMultiTexCoord2s", glMultiTexCoord2s == NULL);
-  glewInfoFunc("glMultiTexCoord2sv", glMultiTexCoord2sv == NULL);
-  glewInfoFunc("glMultiTexCoord3d", glMultiTexCoord3d == NULL);
-  glewInfoFunc("glMultiTexCoord3dv", glMultiTexCoord3dv == NULL);
-  glewInfoFunc("glMultiTexCoord3f", glMultiTexCoord3f == NULL);
-  glewInfoFunc("glMultiTexCoord3fv", glMultiTexCoord3fv == NULL);
-  glewInfoFunc("glMultiTexCoord3i", glMultiTexCoord3i == NULL);
-  glewInfoFunc("glMultiTexCoord3iv", glMultiTexCoord3iv == NULL);
-  glewInfoFunc("glMultiTexCoord3s", glMultiTexCoord3s == NULL);
-  glewInfoFunc("glMultiTexCoord3sv", glMultiTexCoord3sv == NULL);
-  glewInfoFunc("glMultiTexCoord4d", glMultiTexCoord4d == NULL);
-  glewInfoFunc("glMultiTexCoord4dv", glMultiTexCoord4dv == NULL);
-  glewInfoFunc("glMultiTexCoord4f", glMultiTexCoord4f == NULL);
-  glewInfoFunc("glMultiTexCoord4fv", glMultiTexCoord4fv == NULL);
-  glewInfoFunc("glMultiTexCoord4i", glMultiTexCoord4i == NULL);
-  glewInfoFunc("glMultiTexCoord4iv", glMultiTexCoord4iv == NULL);
-  glewInfoFunc("glMultiTexCoord4s", glMultiTexCoord4s == NULL);
-  glewInfoFunc("glMultiTexCoord4sv", glMultiTexCoord4sv == NULL);
-  glewInfoFunc("glSampleCoverage", glSampleCoverage == NULL);
-}
-
-#endif /* GL_VERSION_1_3 */
-
-#ifdef GL_VERSION_1_4
-
-static void _glewInfo_GL_VERSION_1_4 (void)
-{
-  glewPrintExt("GL_VERSION_1_4", GLEW_VERSION_1_4, GLEW_VERSION_1_4, GLEW_VERSION_1_4);
-
-  glewInfoFunc("glBlendColor", glBlendColor == NULL);
-  glewInfoFunc("glBlendEquation", glBlendEquation == NULL);
-  glewInfoFunc("glBlendFuncSeparate", glBlendFuncSeparate == NULL);
-  glewInfoFunc("glFogCoordPointer", glFogCoordPointer == NULL);
-  glewInfoFunc("glFogCoordd", glFogCoordd == NULL);
-  glewInfoFunc("glFogCoorddv", glFogCoorddv == NULL);
-  glewInfoFunc("glFogCoordf", glFogCoordf == NULL);
-  glewInfoFunc("glFogCoordfv", glFogCoordfv == NULL);
-  glewInfoFunc("glMultiDrawArrays", glMultiDrawArrays == NULL);
-  glewInfoFunc("glMultiDrawElements", glMultiDrawElements == NULL);
-  glewInfoFunc("glPointParameterf", glPointParameterf == NULL);
-  glewInfoFunc("glPointParameterfv", glPointParameterfv == NULL);
-  glewInfoFunc("glPointParameteri", glPointParameteri == NULL);
-  glewInfoFunc("glPointParameteriv", glPointParameteriv == NULL);
-  glewInfoFunc("glSecondaryColor3b", glSecondaryColor3b == NULL);
-  glewInfoFunc("glSecondaryColor3bv", glSecondaryColor3bv == NULL);
-  glewInfoFunc("glSecondaryColor3d", glSecondaryColor3d == NULL);
-  glewInfoFunc("glSecondaryColor3dv", glSecondaryColor3dv == NULL);
-  glewInfoFunc("glSecondaryColor3f", glSecondaryColor3f == NULL);
-  glewInfoFunc("glSecondaryColor3fv", glSecondaryColor3fv == NULL);
-  glewInfoFunc("glSecondaryColor3i", glSecondaryColor3i == NULL);
-  glewInfoFunc("glSecondaryColor3iv", glSecondaryColor3iv == NULL);
-  glewInfoFunc("glSecondaryColor3s", glSecondaryColor3s == NULL);
-  glewInfoFunc("glSecondaryColor3sv", glSecondaryColor3sv == NULL);
-  glewInfoFunc("glSecondaryColor3ub", glSecondaryColor3ub == NULL);
-  glewInfoFunc("glSecondaryColor3ubv", glSecondaryColor3ubv == NULL);
-  glewInfoFunc("glSecondaryColor3ui", glSecondaryColor3ui == NULL);
-  glewInfoFunc("glSecondaryColor3uiv", glSecondaryColor3uiv == NULL);
-  glewInfoFunc("glSecondaryColor3us", glSecondaryColor3us == NULL);
-  glewInfoFunc("glSecondaryColor3usv", glSecondaryColor3usv == NULL);
-  glewInfoFunc("glSecondaryColorPointer", glSecondaryColorPointer == NULL);
-  glewInfoFunc("glWindowPos2d", glWindowPos2d == NULL);
-  glewInfoFunc("glWindowPos2dv", glWindowPos2dv == NULL);
-  glewInfoFunc("glWindowPos2f", glWindowPos2f == NULL);
-  glewInfoFunc("glWindowPos2fv", glWindowPos2fv == NULL);
-  glewInfoFunc("glWindowPos2i", glWindowPos2i == NULL);
-  glewInfoFunc("glWindowPos2iv", glWindowPos2iv == NULL);
-  glewInfoFunc("glWindowPos2s", glWindowPos2s == NULL);
-  glewInfoFunc("glWindowPos2sv", glWindowPos2sv == NULL);
-  glewInfoFunc("glWindowPos3d", glWindowPos3d == NULL);
-  glewInfoFunc("glWindowPos3dv", glWindowPos3dv == NULL);
-  glewInfoFunc("glWindowPos3f", glWindowPos3f == NULL);
-  glewInfoFunc("glWindowPos3fv", glWindowPos3fv == NULL);
-  glewInfoFunc("glWindowPos3i", glWindowPos3i == NULL);
-  glewInfoFunc("glWindowPos3iv", glWindowPos3iv == NULL);
-  glewInfoFunc("glWindowPos3s", glWindowPos3s == NULL);
-  glewInfoFunc("glWindowPos3sv", glWindowPos3sv == NULL);
-}
-
-#endif /* GL_VERSION_1_4 */
-
-#ifdef GL_VERSION_1_5
-
-static void _glewInfo_GL_VERSION_1_5 (void)
-{
-  glewPrintExt("GL_VERSION_1_5", GLEW_VERSION_1_5, GLEW_VERSION_1_5, GLEW_VERSION_1_5);
-
-  glewInfoFunc("glBeginQuery", glBeginQuery == NULL);
-  glewInfoFunc("glBindBuffer", glBindBuffer == NULL);
-  glewInfoFunc("glBufferData", glBufferData == NULL);
-  glewInfoFunc("glBufferSubData", glBufferSubData == NULL);
-  glewInfoFunc("glDeleteBuffers", glDeleteBuffers == NULL);
-  glewInfoFunc("glDeleteQueries", glDeleteQueries == NULL);
-  glewInfoFunc("glEndQuery", glEndQuery == NULL);
-  glewInfoFunc("glGenBuffers", glGenBuffers == NULL);
-  glewInfoFunc("glGenQueries", glGenQueries == NULL);
-  glewInfoFunc("glGetBufferParameteriv", glGetBufferParameteriv == NULL);
-  glewInfoFunc("glGetBufferPointerv", glGetBufferPointerv == NULL);
-  glewInfoFunc("glGetBufferSubData", glGetBufferSubData == NULL);
-  glewInfoFunc("glGetQueryObjectiv", glGetQueryObjectiv == NULL);
-  glewInfoFunc("glGetQueryObjectuiv", glGetQueryObjectuiv == NULL);
-  glewInfoFunc("glGetQueryiv", glGetQueryiv == NULL);
-  glewInfoFunc("glIsBuffer", glIsBuffer == NULL);
-  glewInfoFunc("glIsQuery", glIsQuery == NULL);
-  glewInfoFunc("glMapBuffer", glMapBuffer == NULL);
-  glewInfoFunc("glUnmapBuffer", glUnmapBuffer == NULL);
-}
-
-#endif /* GL_VERSION_1_5 */
-
-#ifdef GL_VERSION_2_0
-
-static void _glewInfo_GL_VERSION_2_0 (void)
-{
-  glewPrintExt("GL_VERSION_2_0", GLEW_VERSION_2_0, GLEW_VERSION_2_0, GLEW_VERSION_2_0);
-
-  glewInfoFunc("glAttachShader", glAttachShader == NULL);
-  glewInfoFunc("glBindAttribLocation", glBindAttribLocation == NULL);
-  glewInfoFunc("glBlendEquationSeparate", glBlendEquationSeparate == NULL);
-  glewInfoFunc("glCompileShader", glCompileShader == NULL);
-  glewInfoFunc("glCreateProgram", glCreateProgram == NULL);
-  glewInfoFunc("glCreateShader", glCreateShader == NULL);
-  glewInfoFunc("glDeleteProgram", glDeleteProgram == NULL);
-  glewInfoFunc("glDeleteShader", glDeleteShader == NULL);
-  glewInfoFunc("glDetachShader", glDetachShader == NULL);
-  glewInfoFunc("glDisableVertexAttribArray", glDisableVertexAttribArray == NULL);
-  glewInfoFunc("glDrawBuffers", glDrawBuffers == NULL);
-  glewInfoFunc("glEnableVertexAttribArray", glEnableVertexAttribArray == NULL);
-  glewInfoFunc("glGetActiveAttrib", glGetActiveAttrib == NULL);
-  glewInfoFunc("glGetActiveUniform", glGetActiveUniform == NULL);
-  glewInfoFunc("glGetAttachedShaders", glGetAttachedShaders == NULL);
-  glewInfoFunc("glGetAttribLocation", glGetAttribLocation == NULL);
-  glewInfoFunc("glGetProgramInfoLog", glGetProgramInfoLog == NULL);
-  glewInfoFunc("glGetProgramiv", glGetProgramiv == NULL);
-  glewInfoFunc("glGetShaderInfoLog", glGetShaderInfoLog == NULL);
-  glewInfoFunc("glGetShaderSource", glGetShaderSource == NULL);
-  glewInfoFunc("glGetShaderiv", glGetShaderiv == NULL);
-  glewInfoFunc("glGetUniformLocation", glGetUniformLocation == NULL);
-  glewInfoFunc("glGetUniformfv", glGetUniformfv == NULL);
-  glewInfoFunc("glGetUniformiv", glGetUniformiv == NULL);
-  glewInfoFunc("glGetVertexAttribPointerv", glGetVertexAttribPointerv == NULL);
-  glewInfoFunc("glGetVertexAttribdv", glGetVertexAttribdv == NULL);
-  glewInfoFunc("glGetVertexAttribfv", glGetVertexAttribfv == NULL);
-  glewInfoFunc("glGetVertexAttribiv", glGetVertexAttribiv == NULL);
-  glewInfoFunc("glIsProgram", glIsProgram == NULL);
-  glewInfoFunc("glIsShader", glIsShader == NULL);
-  glewInfoFunc("glLinkProgram", glLinkProgram == NULL);
-  glewInfoFunc("glShaderSource", glShaderSource == NULL);
-  glewInfoFunc("glStencilFuncSeparate", glStencilFuncSeparate == NULL);
-  glewInfoFunc("glStencilMaskSeparate", glStencilMaskSeparate == NULL);
-  glewInfoFunc("glStencilOpSeparate", glStencilOpSeparate == NULL);
-  glewInfoFunc("glUniform1f", glUniform1f == NULL);
-  glewInfoFunc("glUniform1fv", glUniform1fv == NULL);
-  glewInfoFunc("glUniform1i", glUniform1i == NULL);
-  glewInfoFunc("glUniform1iv", glUniform1iv == NULL);
-  glewInfoFunc("glUniform2f", glUniform2f == NULL);
-  glewInfoFunc("glUniform2fv", glUniform2fv == NULL);
-  glewInfoFunc("glUniform2i", glUniform2i == NULL);
-  glewInfoFunc("glUniform2iv", glUniform2iv == NULL);
-  glewInfoFunc("glUniform3f", glUniform3f == NULL);
-  glewInfoFunc("glUniform3fv", glUniform3fv == NULL);
-  glewInfoFunc("glUniform3i", glUniform3i == NULL);
-  glewInfoFunc("glUniform3iv", glUniform3iv == NULL);
-  glewInfoFunc("glUniform4f", glUniform4f == NULL);
-  glewInfoFunc("glUniform4fv", glUniform4fv == NULL);
-  glewInfoFunc("glUniform4i", glUniform4i == NULL);
-  glewInfoFunc("glUniform4iv", glUniform4iv == NULL);
-  glewInfoFunc("glUniformMatrix2fv", glUniformMatrix2fv == NULL);
-  glewInfoFunc("glUniformMatrix3fv", glUniformMatrix3fv == NULL);
-  glewInfoFunc("glUniformMatrix4fv", glUniformMatrix4fv == NULL);
-  glewInfoFunc("glUseProgram", glUseProgram == NULL);
-  glewInfoFunc("glValidateProgram", glValidateProgram == NULL);
-  glewInfoFunc("glVertexAttrib1d", glVertexAttrib1d == NULL);
-  glewInfoFunc("glVertexAttrib1dv", glVertexAttrib1dv == NULL);
-  glewInfoFunc("glVertexAttrib1f", glVertexAttrib1f == NULL);
-  glewInfoFunc("glVertexAttrib1fv", glVertexAttrib1fv == NULL);
-  glewInfoFunc("glVertexAttrib1s", glVertexAttrib1s == NULL);
-  glewInfoFunc("glVertexAttrib1sv", glVertexAttrib1sv == NULL);
-  glewInfoFunc("glVertexAttrib2d", glVertexAttrib2d == NULL);
-  glewInfoFunc("glVertexAttrib2dv", glVertexAttrib2dv == NULL);
-  glewInfoFunc("glVertexAttrib2f", glVertexAttrib2f == NULL);
-  glewInfoFunc("glVertexAttrib2fv", glVertexAttrib2fv == NULL);
-  glewInfoFunc("glVertexAttrib2s", glVertexAttrib2s == NULL);
-  glewInfoFunc("glVertexAttrib2sv", glVertexAttrib2sv == NULL);
-  glewInfoFunc("glVertexAttrib3d", glVertexAttrib3d == NULL);
-  glewInfoFunc("glVertexAttrib3dv", glVertexAttrib3dv == NULL);
-  glewInfoFunc("glVertexAttrib3f", glVertexAttrib3f == NULL);
-  glewInfoFunc("glVertexAttrib3fv", glVertexAttrib3fv == NULL);
-  glewInfoFunc("glVertexAttrib3s", glVertexAttrib3s == NULL);
-  glewInfoFunc("glVertexAttrib3sv", glVertexAttrib3sv == NULL);
-  glewInfoFunc("glVertexAttrib4Nbv", glVertexAttrib4Nbv == NULL);
-  glewInfoFunc("glVertexAttrib4Niv", glVertexAttrib4Niv == NULL);
-  glewInfoFunc("glVertexAttrib4Nsv", glVertexAttrib4Nsv == NULL);
-  glewInfoFunc("glVertexAttrib4Nub", glVertexAttrib4Nub == NULL);
-  glewInfoFunc("glVertexAttrib4Nubv", glVertexAttrib4Nubv == NULL);
-  glewInfoFunc("glVertexAttrib4Nuiv", glVertexAttrib4Nuiv == NULL);
-  glewInfoFunc("glVertexAttrib4Nusv", glVertexAttrib4Nusv == NULL);
-  glewInfoFunc("glVertexAttrib4bv", glVertexAttrib4bv == NULL);
-  glewInfoFunc("glVertexAttrib4d", glVertexAttrib4d == NULL);
-  glewInfoFunc("glVertexAttrib4dv", glVertexAttrib4dv == NULL);
-  glewInfoFunc("glVertexAttrib4f", glVertexAttrib4f == NULL);
-  glewInfoFunc("glVertexAttrib4fv", glVertexAttrib4fv == NULL);
-  glewInfoFunc("glVertexAttrib4iv", glVertexAttrib4iv == NULL);
-  glewInfoFunc("glVertexAttrib4s", glVertexAttrib4s == NULL);
-  glewInfoFunc("glVertexAttrib4sv", glVertexAttrib4sv == NULL);
-  glewInfoFunc("glVertexAttrib4ubv", glVertexAttrib4ubv == NULL);
-  glewInfoFunc("glVertexAttrib4uiv", glVertexAttrib4uiv == NULL);
-  glewInfoFunc("glVertexAttrib4usv", glVertexAttrib4usv == NULL);
-  glewInfoFunc("glVertexAttribPointer", glVertexAttribPointer == NULL);
-}
-
-#endif /* GL_VERSION_2_0 */
-
-#ifdef GL_VERSION_2_1
-
-static void _glewInfo_GL_VERSION_2_1 (void)
-{
-  glewPrintExt("GL_VERSION_2_1", GLEW_VERSION_2_1, GLEW_VERSION_2_1, GLEW_VERSION_2_1);
-
-  glewInfoFunc("glUniformMatrix2x3fv", glUniformMatrix2x3fv == NULL);
-  glewInfoFunc("glUniformMatrix2x4fv", glUniformMatrix2x4fv == NULL);
-  glewInfoFunc("glUniformMatrix3x2fv", glUniformMatrix3x2fv == NULL);
-  glewInfoFunc("glUniformMatrix3x4fv", glUniformMatrix3x4fv == NULL);
-  glewInfoFunc("glUniformMatrix4x2fv", glUniformMatrix4x2fv == NULL);
-  glewInfoFunc("glUniformMatrix4x3fv", glUniformMatrix4x3fv == NULL);
-}
-
-#endif /* GL_VERSION_2_1 */
-
-#ifdef GL_VERSION_3_0
-
-static void _glewInfo_GL_VERSION_3_0 (void)
-{
-  glewPrintExt("GL_VERSION_3_0", GLEW_VERSION_3_0, GLEW_VERSION_3_0, GLEW_VERSION_3_0);
-
-  glewInfoFunc("glBeginConditionalRender", glBeginConditionalRender == NULL);
-  glewInfoFunc("glBeginTransformFeedback", glBeginTransformFeedback == NULL);
-  glewInfoFunc("glBindFragDataLocation", glBindFragDataLocation == NULL);
-  glewInfoFunc("glClampColor", glClampColor == NULL);
-  glewInfoFunc("glClearBufferfi", glClearBufferfi == NULL);
-  glewInfoFunc("glClearBufferfv", glClearBufferfv == NULL);
-  glewInfoFunc("glClearBufferiv", glClearBufferiv == NULL);
-  glewInfoFunc("glClearBufferuiv", glClearBufferuiv == NULL);
-  glewInfoFunc("glColorMaski", glColorMaski == NULL);
-  glewInfoFunc("glDisablei", glDisablei == NULL);
-  glewInfoFunc("glEnablei", glEnablei == NULL);
-  glewInfoFunc("glEndConditionalRender", glEndConditionalRender == NULL);
-  glewInfoFunc("glEndTransformFeedback", glEndTransformFeedback == NULL);
-  glewInfoFunc("glGetBooleani_v", glGetBooleani_v == NULL);
-  glewInfoFunc("glGetFragDataLocation", glGetFragDataLocation == NULL);
-  glewInfoFunc("glGetStringi", glGetStringi == NULL);
-  glewInfoFunc("glGetTexParameterIiv", glGetTexParameterIiv == NULL);
-  glewInfoFunc("glGetTexParameterIuiv", glGetTexParameterIuiv == NULL);
-  glewInfoFunc("glGetTransformFeedbackVarying", glGetTransformFeedbackVarying == NULL);
-  glewInfoFunc("glGetUniformuiv", glGetUniformuiv == NULL);
-  glewInfoFunc("glGetVertexAttribIiv", glGetVertexAttribIiv == NULL);
-  glewInfoFunc("glGetVertexAttribIuiv", glGetVertexAttribIuiv == NULL);
-  glewInfoFunc("glIsEnabledi", glIsEnabledi == NULL);
-  glewInfoFunc("glTexParameterIiv", glTexParameterIiv == NULL);
-  glewInfoFunc("glTexParameterIuiv", glTexParameterIuiv == NULL);
-  glewInfoFunc("glTransformFeedbackVaryings", glTransformFeedbackVaryings == NULL);
-  glewInfoFunc("glUniform1ui", glUniform1ui == NULL);
-  glewInfoFunc("glUniform1uiv", glUniform1uiv == NULL);
-  glewInfoFunc("glUniform2ui", glUniform2ui == NULL);
-  glewInfoFunc("glUniform2uiv", glUniform2uiv == NULL);
-  glewInfoFunc("glUniform3ui", glUniform3ui == NULL);
-  glewInfoFunc("glUniform3uiv", glUniform3uiv == NULL);
-  glewInfoFunc("glUniform4ui", glUniform4ui == NULL);
-  glewInfoFunc("glUniform4uiv", glUniform4uiv == NULL);
-  glewInfoFunc("glVertexAttribI1i", glVertexAttribI1i == NULL);
-  glewInfoFunc("glVertexAttribI1iv", glVertexAttribI1iv == NULL);
-  glewInfoFunc("glVertexAttribI1ui", glVertexAttribI1ui == NULL);
-  glewInfoFunc("glVertexAttribI1uiv", glVertexAttribI1uiv == NULL);
-  glewInfoFunc("glVertexAttribI2i", glVertexAttribI2i == NULL);
-  glewInfoFunc("glVertexAttribI2iv", glVertexAttribI2iv == NULL);
-  glewInfoFunc("glVertexAttribI2ui", glVertexAttribI2ui == NULL);
-  glewInfoFunc("glVertexAttribI2uiv", glVertexAttribI2uiv == NULL);
-  glewInfoFunc("glVertexAttribI3i", glVertexAttribI3i == NULL);
-  glewInfoFunc("glVertexAttribI3iv", glVertexAttribI3iv == NULL);
-  glewInfoFunc("glVertexAttribI3ui", glVertexAttribI3ui == NULL);
-  glewInfoFunc("glVertexAttribI3uiv", glVertexAttribI3uiv == NULL);
-  glewInfoFunc("glVertexAttribI4bv", glVertexAttribI4bv == NULL);
-  glewInfoFunc("glVertexAttribI4i", glVertexAttribI4i == NULL);
-  glewInfoFunc("glVertexAttribI4iv", glVertexAttribI4iv == NULL);
-  glewInfoFunc("glVertexAttribI4sv", glVertexAttribI4sv == NULL);
-  glewInfoFunc("glVertexAttribI4ubv", glVertexAttribI4ubv == NULL);
-  glewInfoFunc("glVertexAttribI4ui", glVertexAttribI4ui == NULL);
-  glewInfoFunc("glVertexAttribI4uiv", glVertexAttribI4uiv == NULL);
-  glewInfoFunc("glVertexAttribI4usv", glVertexAttribI4usv == NULL);
-  glewInfoFunc("glVertexAttribIPointer", glVertexAttribIPointer == NULL);
-}
-
-#endif /* GL_VERSION_3_0 */
-
-#ifdef GL_VERSION_3_1
-
-static void _glewInfo_GL_VERSION_3_1 (void)
-{
-  glewPrintExt("GL_VERSION_3_1", GLEW_VERSION_3_1, GLEW_VERSION_3_1, GLEW_VERSION_3_1);
-
-  glewInfoFunc("glDrawArraysInstanced", glDrawArraysInstanced == NULL);
-  glewInfoFunc("glDrawElementsInstanced", glDrawElementsInstanced == NULL);
-  glewInfoFunc("glPrimitiveRestartIndex", glPrimitiveRestartIndex == NULL);
-  glewInfoFunc("glTexBuffer", glTexBuffer == NULL);
-}
-
-#endif /* GL_VERSION_3_1 */
-
-#ifdef GL_VERSION_3_2
-
-static void _glewInfo_GL_VERSION_3_2 (void)
-{
-  glewPrintExt("GL_VERSION_3_2", GLEW_VERSION_3_2, GLEW_VERSION_3_2, GLEW_VERSION_3_2);
-
-  glewInfoFunc("glFramebufferTexture", glFramebufferTexture == NULL);
-  glewInfoFunc("glGetBufferParameteri64v", glGetBufferParameteri64v == NULL);
-  glewInfoFunc("glGetInteger64i_v", glGetInteger64i_v == NULL);
-}
-
-#endif /* GL_VERSION_3_2 */
-
-#ifdef GL_VERSION_3_3
-
-static void _glewInfo_GL_VERSION_3_3 (void)
-{
-  glewPrintExt("GL_VERSION_3_3", GLEW_VERSION_3_3, GLEW_VERSION_3_3, GLEW_VERSION_3_3);
-
-  glewInfoFunc("glVertexAttribDivisor", glVertexAttribDivisor == NULL);
-}
-
-#endif /* GL_VERSION_3_3 */
-
-#ifdef GL_VERSION_4_0
-
-static void _glewInfo_GL_VERSION_4_0 (void)
-{
-  glewPrintExt("GL_VERSION_4_0", GLEW_VERSION_4_0, GLEW_VERSION_4_0, GLEW_VERSION_4_0);
-
-  glewInfoFunc("glBlendEquationSeparatei", glBlendEquationSeparatei == NULL);
-  glewInfoFunc("glBlendEquationi", glBlendEquationi == NULL);
-  glewInfoFunc("glBlendFuncSeparatei", glBlendFuncSeparatei == NULL);
-  glewInfoFunc("glBlendFunci", glBlendFunci == NULL);
-  glewInfoFunc("glMinSampleShading", glMinSampleShading == NULL);
-}
-
-#endif /* GL_VERSION_4_0 */
-
-#ifdef GL_VERSION_4_1
-
-static void _glewInfo_GL_VERSION_4_1 (void)
-{
-  glewPrintExt("GL_VERSION_4_1", GLEW_VERSION_4_1, GLEW_VERSION_4_1, GLEW_VERSION_4_1);
-}
-
-#endif /* GL_VERSION_4_1 */
-
-#ifdef GL_VERSION_4_2
-
-static void _glewInfo_GL_VERSION_4_2 (void)
-{
-  glewPrintExt("GL_VERSION_4_2", GLEW_VERSION_4_2, GLEW_VERSION_4_2, GLEW_VERSION_4_2);
-}
-
-#endif /* GL_VERSION_4_2 */
-
-#ifdef GL_VERSION_4_3
-
-static void _glewInfo_GL_VERSION_4_3 (void)
-{
-  glewPrintExt("GL_VERSION_4_3", GLEW_VERSION_4_3, GLEW_VERSION_4_3, GLEW_VERSION_4_3);
-}
-
-#endif /* GL_VERSION_4_3 */
-
-#ifdef GL_3DFX_multisample
-
-static void _glewInfo_GL_3DFX_multisample (void)
-{
-  glewPrintExt("GL_3DFX_multisample", GLEW_3DFX_multisample, glewIsSupported("GL_3DFX_multisample"), glewGetExtension("GL_3DFX_multisample"));
-}
-
-#endif /* GL_3DFX_multisample */
-
-#ifdef GL_3DFX_tbuffer
-
-static void _glewInfo_GL_3DFX_tbuffer (void)
-{
-  glewPrintExt("GL_3DFX_tbuffer", GLEW_3DFX_tbuffer, glewIsSupported("GL_3DFX_tbuffer"), glewGetExtension("GL_3DFX_tbuffer"));
-
-  glewInfoFunc("glTbufferMask3DFX", glTbufferMask3DFX == NULL);
-}
-
-#endif /* GL_3DFX_tbuffer */
-
-#ifdef GL_3DFX_texture_compression_FXT1
-
-static void _glewInfo_GL_3DFX_texture_compression_FXT1 (void)
-{
-  glewPrintExt("GL_3DFX_texture_compression_FXT1", GLEW_3DFX_texture_compression_FXT1, glewIsSupported("GL_3DFX_texture_compression_FXT1"), glewGetExtension("GL_3DFX_texture_compression_FXT1"));
-}
-
-#endif /* GL_3DFX_texture_compression_FXT1 */
-
-#ifdef GL_AMD_blend_minmax_factor
-
-static void _glewInfo_GL_AMD_blend_minmax_factor (void)
-{
-  glewPrintExt("GL_AMD_blend_minmax_factor", GLEW_AMD_blend_minmax_factor, glewIsSupported("GL_AMD_blend_minmax_factor"), glewGetExtension("GL_AMD_blend_minmax_factor"));
-}
-
-#endif /* GL_AMD_blend_minmax_factor */
-
-#ifdef GL_AMD_conservative_depth
-
-static void _glewInfo_GL_AMD_conservative_depth (void)
-{
-  glewPrintExt("GL_AMD_conservative_depth", GLEW_AMD_conservative_depth, glewIsSupported("GL_AMD_conservative_depth"), glewGetExtension("GL_AMD_conservative_depth"));
-}
-
-#endif /* GL_AMD_conservative_depth */
-
-#ifdef GL_AMD_debug_output
-
-static void _glewInfo_GL_AMD_debug_output (void)
-{
-  glewPrintExt("GL_AMD_debug_output", GLEW_AMD_debug_output, glewIsSupported("GL_AMD_debug_output"), glewGetExtension("GL_AMD_debug_output"));
-
-  glewInfoFunc("glDebugMessageCallbackAMD", glDebugMessageCallbackAMD == NULL);
-  glewInfoFunc("glDebugMessageEnableAMD", glDebugMessageEnableAMD == NULL);
-  glewInfoFunc("glDebugMessageInsertAMD", glDebugMessageInsertAMD == NULL);
-  glewInfoFunc("glGetDebugMessageLogAMD", glGetDebugMessageLogAMD == NULL);
-}
-
-#endif /* GL_AMD_debug_output */
-
-#ifdef GL_AMD_depth_clamp_separate
-
-static void _glewInfo_GL_AMD_depth_clamp_separate (void)
-{
-  glewPrintExt("GL_AMD_depth_clamp_separate", GLEW_AMD_depth_clamp_separate, glewIsSupported("GL_AMD_depth_clamp_separate"), glewGetExtension("GL_AMD_depth_clamp_separate"));
-}
-
-#endif /* GL_AMD_depth_clamp_separate */
-
-#ifdef GL_AMD_draw_buffers_blend
-
-static void _glewInfo_GL_AMD_draw_buffers_blend (void)
-{
-  glewPrintExt("GL_AMD_draw_buffers_blend", GLEW_AMD_draw_buffers_blend, glewIsSupported("GL_AMD_draw_buffers_blend"), glewGetExtension("GL_AMD_draw_buffers_blend"));
-
-  glewInfoFunc("glBlendEquationIndexedAMD", glBlendEquationIndexedAMD == NULL);
-  glewInfoFunc("glBlendEquationSeparateIndexedAMD", glBlendEquationSeparateIndexedAMD == NULL);
-  glewInfoFunc("glBlendFuncIndexedAMD", glBlendFuncIndexedAMD == NULL);
-  glewInfoFunc("glBlendFuncSeparateIndexedAMD", glBlendFuncSeparateIndexedAMD == NULL);
-}
-
-#endif /* GL_AMD_draw_buffers_blend */
-
-#ifdef GL_AMD_multi_draw_indirect
-
-static void _glewInfo_GL_AMD_multi_draw_indirect (void)
-{
-  glewPrintExt("GL_AMD_multi_draw_indirect", GLEW_AMD_multi_draw_indirect, glewIsSupported("GL_AMD_multi_draw_indirect"), glewGetExtension("GL_AMD_multi_draw_indirect"));
-
-  glewInfoFunc("glMultiDrawArraysIndirectAMD", glMultiDrawArraysIndirectAMD == NULL);
-  glewInfoFunc("glMultiDrawElementsIndirectAMD", glMultiDrawElementsIndirectAMD == NULL);
-}
-
-#endif /* GL_AMD_multi_draw_indirect */
-
-#ifdef GL_AMD_name_gen_delete
-
-static void _glewInfo_GL_AMD_name_gen_delete (void)
-{
-  glewPrintExt("GL_AMD_name_gen_delete", GLEW_AMD_name_gen_delete, glewIsSupported("GL_AMD_name_gen_delete"), glewGetExtension("GL_AMD_name_gen_delete"));
-
-  glewInfoFunc("glDeleteNamesAMD", glDeleteNamesAMD == NULL);
-  glewInfoFunc("glGenNamesAMD", glGenNamesAMD == NULL);
-  glewInfoFunc("glIsNameAMD", glIsNameAMD == NULL);
-}
-
-#endif /* GL_AMD_name_gen_delete */
-
-#ifdef GL_AMD_performance_monitor
-
-static void _glewInfo_GL_AMD_performance_monitor (void)
-{
-  glewPrintExt("GL_AMD_performance_monitor", GLEW_AMD_performance_monitor, glewIsSupported("GL_AMD_performance_monitor"), glewGetExtension("GL_AMD_performance_monitor"));
-
-  glewInfoFunc("glBeginPerfMonitorAMD", glBeginPerfMonitorAMD == NULL);
-  glewInfoFunc("glDeletePerfMonitorsAMD", glDeletePerfMonitorsAMD == NULL);
-  glewInfoFunc("glEndPerfMonitorAMD", glEndPerfMonitorAMD == NULL);
-  glewInfoFunc("glGenPerfMonitorsAMD", glGenPerfMonitorsAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorCounterDataAMD", glGetPerfMonitorCounterDataAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorCounterInfoAMD", glGetPerfMonitorCounterInfoAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorCounterStringAMD", glGetPerfMonitorCounterStringAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorCountersAMD", glGetPerfMonitorCountersAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorGroupStringAMD", glGetPerfMonitorGroupStringAMD == NULL);
-  glewInfoFunc("glGetPerfMonitorGroupsAMD", glGetPerfMonitorGroupsAMD == NULL);
-  glewInfoFunc("glSelectPerfMonitorCountersAMD", glSelectPerfMonitorCountersAMD == NULL);
-}
-
-#endif /* GL_AMD_performance_monitor */
-
-#ifdef GL_AMD_pinned_memory
-
-static void _glewInfo_GL_AMD_pinned_memory (void)
-{
-  glewPrintExt("GL_AMD_pinned_memory", GLEW_AMD_pinned_memory, glewIsSupported("GL_AMD_pinned_memory"), glewGetExtension("GL_AMD_pinned_memory"));
-}
-
-#endif /* GL_AMD_pinned_memory */
-
-#ifdef GL_AMD_query_buffer_object
-
-static void _glewInfo_GL_AMD_query_buffer_object (void)
-{
-  glewPrintExt("GL_AMD_query_buffer_object", GLEW_AMD_query_buffer_object, glewIsSupported("GL_AMD_query_buffer_object"), glewGetExtension("GL_AMD_query_buffer_object"));
-}
-
-#endif /* GL_AMD_query_buffer_object */
-
-#ifdef GL_AMD_sample_positions
-
-static void _glewInfo_GL_AMD_sample_positions (void)
-{
-  glewPrintExt("GL_AMD_sample_positions", GLEW_AMD_sample_positions, glewIsSupported("GL_AMD_sample_positions"), glewGetExtension("GL_AMD_sample_positions"));
-
-  glewInfoFunc("glSetMultisamplefvAMD", glSetMultisamplefvAMD == NULL);
-}
-
-#endif /* GL_AMD_sample_positions */
-
-#ifdef GL_AMD_seamless_cubemap_per_texture
-
-static void _glewInfo_GL_AMD_seamless_cubemap_per_texture (void)
-{
-  glewPrintExt("GL_AMD_seamless_cubemap_per_texture", GLEW_AMD_seamless_cubemap_per_texture, glewIsSupported("GL_AMD_seamless_cubemap_per_texture"), glewGetExtension("GL_AMD_seamless_cubemap_per_texture"));
-}
-
-#endif /* GL_AMD_seamless_cubemap_per_texture */
-
-#ifdef GL_AMD_shader_stencil_export
-
-static void _glewInfo_GL_AMD_shader_stencil_export (void)
-{
-  glewPrintExt("GL_AMD_shader_stencil_export", GLEW_AMD_shader_stencil_export, glewIsSupported("GL_AMD_shader_stencil_export"), glewGetExtension("GL_AMD_shader_stencil_export"));
-}
-
-#endif /* GL_AMD_shader_stencil_export */
-
-#ifdef GL_AMD_stencil_operation_extended
-
-static void _glewInfo_GL_AMD_stencil_operation_extended (void)
-{
-  glewPrintExt("GL_AMD_stencil_operation_extended", GLEW_AMD_stencil_operation_extended, glewIsSupported("GL_AMD_stencil_operation_extended"), glewGetExtension("GL_AMD_stencil_operation_extended"));
-
-  glewInfoFunc("glStencilOpValueAMD", glStencilOpValueAMD == NULL);
-}
-
-#endif /* GL_AMD_stencil_operation_extended */
-
-#ifdef GL_AMD_texture_texture4
-
-static void _glewInfo_GL_AMD_texture_texture4 (void)
-{
-  glewPrintExt("GL_AMD_texture_texture4", GLEW_AMD_texture_texture4, glewIsSupported("GL_AMD_texture_texture4"), glewGetExtension("GL_AMD_texture_texture4"));
-}
-
-#endif /* GL_AMD_texture_texture4 */
-
-#ifdef GL_AMD_transform_feedback3_lines_triangles
-
-static void _glewInfo_GL_AMD_transform_feedback3_lines_triangles (void)
-{
-  glewPrintExt("GL_AMD_transform_feedback3_lines_triangles", GLEW_AMD_transform_feedback3_lines_triangles, glewIsSupported("GL_AMD_transform_feedback3_lines_triangles"), glewGetExtension("GL_AMD_transform_feedback3_lines_triangles"));
-}
-
-#endif /* GL_AMD_transform_feedback3_lines_triangles */
-
-#ifdef GL_AMD_vertex_shader_layer
-
-static void _glewInfo_GL_AMD_vertex_shader_layer (void)
-{
-  glewPrintExt("GL_AMD_vertex_shader_layer", GLEW_AMD_vertex_shader_layer, glewIsSupported("GL_AMD_vertex_shader_layer"), glewGetExtension("GL_AMD_vertex_shader_layer"));
-}
-
-#endif /* GL_AMD_vertex_shader_layer */
-
-#ifdef GL_AMD_vertex_shader_tessellator
-
-static void _glewInfo_GL_AMD_vertex_shader_tessellator (void)
-{
-  glewPrintExt("GL_AMD_vertex_shader_tessellator", GLEW_AMD_vertex_shader_tessellator, glewIsSupported("GL_AMD_vertex_shader_tessellator"), glewGetExtension("GL_AMD_vertex_shader_tessellator"));
-
-  glewInfoFunc("glTessellationFactorAMD", glTessellationFactorAMD == NULL);
-  glewInfoFunc("glTessellationModeAMD", glTessellationModeAMD == NULL);
-}
-
-#endif /* GL_AMD_vertex_shader_tessellator */
-
-#ifdef GL_AMD_vertex_shader_viewport_index
-
-static void _glewInfo_GL_AMD_vertex_shader_viewport_index (void)
-{
-  glewPrintExt("GL_AMD_vertex_shader_viewport_index", GLEW_AMD_vertex_shader_viewport_index, glewIsSupported("GL_AMD_vertex_shader_viewport_index"), glewGetExtension("GL_AMD_vertex_shader_viewport_index"));
-}
-
-#endif /* GL_AMD_vertex_shader_viewport_index */
-
-#ifdef GL_APPLE_aux_depth_stencil
-
-static void _glewInfo_GL_APPLE_aux_depth_stencil (void)
-{
-  glewPrintExt("GL_APPLE_aux_depth_stencil", GLEW_APPLE_aux_depth_stencil, glewIsSupported("GL_APPLE_aux_depth_stencil"), glewGetExtension("GL_APPLE_aux_depth_stencil"));
-}
-
-#endif /* GL_APPLE_aux_depth_stencil */
-
-#ifdef GL_APPLE_client_storage
-
-static void _glewInfo_GL_APPLE_client_storage (void)
-{
-  glewPrintExt("GL_APPLE_client_storage", GLEW_APPLE_client_storage, glewIsSupported("GL_APPLE_client_storage"), glewGetExtension("GL_APPLE_client_storage"));
-}
-
-#endif /* GL_APPLE_client_storage */
-
-#ifdef GL_APPLE_element_array
-
-static void _glewInfo_GL_APPLE_element_array (void)
-{
-  glewPrintExt("GL_APPLE_element_array", GLEW_APPLE_element_array, glewIsSupported("GL_APPLE_element_array"), glewGetExtension("GL_APPLE_element_array"));
-
-  glewInfoFunc("glDrawElementArrayAPPLE", glDrawElementArrayAPPLE == NULL);
-  glewInfoFunc("glDrawRangeElementArrayAPPLE", glDrawRangeElementArrayAPPLE == NULL);
-  glewInfoFunc("glElementPointerAPPLE", glElementPointerAPPLE == NULL);
-  glewInfoFunc("glMultiDrawElementArrayAPPLE", glMultiDrawElementArrayAPPLE == NULL);
-  glewInfoFunc("glMultiDrawRangeElementArrayAPPLE", glMultiDrawRangeElementArrayAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_element_array */
-
-#ifdef GL_APPLE_fence
-
-static void _glewInfo_GL_APPLE_fence (void)
-{
-  glewPrintExt("GL_APPLE_fence", GLEW_APPLE_fence, glewIsSupported("GL_APPLE_fence"), glewGetExtension("GL_APPLE_fence"));
-
-  glewInfoFunc("glDeleteFencesAPPLE", glDeleteFencesAPPLE == NULL);
-  glewInfoFunc("glFinishFenceAPPLE", glFinishFenceAPPLE == NULL);
-  glewInfoFunc("glFinishObjectAPPLE", glFinishObjectAPPLE == NULL);
-  glewInfoFunc("glGenFencesAPPLE", glGenFencesAPPLE == NULL);
-  glewInfoFunc("glIsFenceAPPLE", glIsFenceAPPLE == NULL);
-  glewInfoFunc("glSetFenceAPPLE", glSetFenceAPPLE == NULL);
-  glewInfoFunc("glTestFenceAPPLE", glTestFenceAPPLE == NULL);
-  glewInfoFunc("glTestObjectAPPLE", glTestObjectAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_fence */
-
-#ifdef GL_APPLE_float_pixels
-
-static void _glewInfo_GL_APPLE_float_pixels (void)
-{
-  glewPrintExt("GL_APPLE_float_pixels", GLEW_APPLE_float_pixels, glewIsSupported("GL_APPLE_float_pixels"), glewGetExtension("GL_APPLE_float_pixels"));
-}
-
-#endif /* GL_APPLE_float_pixels */
-
-#ifdef GL_APPLE_flush_buffer_range
-
-static void _glewInfo_GL_APPLE_flush_buffer_range (void)
-{
-  glewPrintExt("GL_APPLE_flush_buffer_range", GLEW_APPLE_flush_buffer_range, glewIsSupported("GL_APPLE_flush_buffer_range"), glewGetExtension("GL_APPLE_flush_buffer_range"));
-
-  glewInfoFunc("glBufferParameteriAPPLE", glBufferParameteriAPPLE == NULL);
-  glewInfoFunc("glFlushMappedBufferRangeAPPLE", glFlushMappedBufferRangeAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_flush_buffer_range */
-
-#ifdef GL_APPLE_object_purgeable
-
-static void _glewInfo_GL_APPLE_object_purgeable (void)
-{
-  glewPrintExt("GL_APPLE_object_purgeable", GLEW_APPLE_object_purgeable, glewIsSupported("GL_APPLE_object_purgeable"), glewGetExtension("GL_APPLE_object_purgeable"));
-
-  glewInfoFunc("glGetObjectParameterivAPPLE", glGetObjectParameterivAPPLE == NULL);
-  glewInfoFunc("glObjectPurgeableAPPLE", glObjectPurgeableAPPLE == NULL);
-  glewInfoFunc("glObjectUnpurgeableAPPLE", glObjectUnpurgeableAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_object_purgeable */
-
-#ifdef GL_APPLE_pixel_buffer
-
-static void _glewInfo_GL_APPLE_pixel_buffer (void)
-{
-  glewPrintExt("GL_APPLE_pixel_buffer", GLEW_APPLE_pixel_buffer, glewIsSupported("GL_APPLE_pixel_buffer"), glewGetExtension("GL_APPLE_pixel_buffer"));
-}
-
-#endif /* GL_APPLE_pixel_buffer */
-
-#ifdef GL_APPLE_rgb_422
-
-static void _glewInfo_GL_APPLE_rgb_422 (void)
-{
-  glewPrintExt("GL_APPLE_rgb_422", GLEW_APPLE_rgb_422, glewIsSupported("GL_APPLE_rgb_422"), glewGetExtension("GL_APPLE_rgb_422"));
-}
-
-#endif /* GL_APPLE_rgb_422 */
-
-#ifdef GL_APPLE_row_bytes
-
-static void _glewInfo_GL_APPLE_row_bytes (void)
-{
-  glewPrintExt("GL_APPLE_row_bytes", GLEW_APPLE_row_bytes, glewIsSupported("GL_APPLE_row_bytes"), glewGetExtension("GL_APPLE_row_bytes"));
-}
-
-#endif /* GL_APPLE_row_bytes */
-
-#ifdef GL_APPLE_specular_vector
-
-static void _glewInfo_GL_APPLE_specular_vector (void)
-{
-  glewPrintExt("GL_APPLE_specular_vector", GLEW_APPLE_specular_vector, glewIsSupported("GL_APPLE_specular_vector"), glewGetExtension("GL_APPLE_specular_vector"));
-}
-
-#endif /* GL_APPLE_specular_vector */
-
-#ifdef GL_APPLE_texture_range
-
-static void _glewInfo_GL_APPLE_texture_range (void)
-{
-  glewPrintExt("GL_APPLE_texture_range", GLEW_APPLE_texture_range, glewIsSupported("GL_APPLE_texture_range"), glewGetExtension("GL_APPLE_texture_range"));
-
-  glewInfoFunc("glGetTexParameterPointervAPPLE", glGetTexParameterPointervAPPLE == NULL);
-  glewInfoFunc("glTextureRangeAPPLE", glTextureRangeAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_texture_range */
-
-#ifdef GL_APPLE_transform_hint
-
-static void _glewInfo_GL_APPLE_transform_hint (void)
-{
-  glewPrintExt("GL_APPLE_transform_hint", GLEW_APPLE_transform_hint, glewIsSupported("GL_APPLE_transform_hint"), glewGetExtension("GL_APPLE_transform_hint"));
-}
-
-#endif /* GL_APPLE_transform_hint */
-
-#ifdef GL_APPLE_vertex_array_object
-
-static void _glewInfo_GL_APPLE_vertex_array_object (void)
-{
-  glewPrintExt("GL_APPLE_vertex_array_object", GLEW_APPLE_vertex_array_object, glewIsSupported("GL_APPLE_vertex_array_object"), glewGetExtension("GL_APPLE_vertex_array_object"));
-
-  glewInfoFunc("glBindVertexArrayAPPLE", glBindVertexArrayAPPLE == NULL);
-  glewInfoFunc("glDeleteVertexArraysAPPLE", glDeleteVertexArraysAPPLE == NULL);
-  glewInfoFunc("glGenVertexArraysAPPLE", glGenVertexArraysAPPLE == NULL);
-  glewInfoFunc("glIsVertexArrayAPPLE", glIsVertexArrayAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_vertex_array_object */
-
-#ifdef GL_APPLE_vertex_array_range
-
-static void _glewInfo_GL_APPLE_vertex_array_range (void)
-{
-  glewPrintExt("GL_APPLE_vertex_array_range", GLEW_APPLE_vertex_array_range, glewIsSupported("GL_APPLE_vertex_array_range"), glewGetExtension("GL_APPLE_vertex_array_range"));
-
-  glewInfoFunc("glFlushVertexArrayRangeAPPLE", glFlushVertexArrayRangeAPPLE == NULL);
-  glewInfoFunc("glVertexArrayParameteriAPPLE", glVertexArrayParameteriAPPLE == NULL);
-  glewInfoFunc("glVertexArrayRangeAPPLE", glVertexArrayRangeAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_vertex_array_range */
-
-#ifdef GL_APPLE_vertex_program_evaluators
-
-static void _glewInfo_GL_APPLE_vertex_program_evaluators (void)
-{
-  glewPrintExt("GL_APPLE_vertex_program_evaluators", GLEW_APPLE_vertex_program_evaluators, glewIsSupported("GL_APPLE_vertex_program_evaluators"), glewGetExtension("GL_APPLE_vertex_program_evaluators"));
-
-  glewInfoFunc("glDisableVertexAttribAPPLE", glDisableVertexAttribAPPLE == NULL);
-  glewInfoFunc("glEnableVertexAttribAPPLE", glEnableVertexAttribAPPLE == NULL);
-  glewInfoFunc("glIsVertexAttribEnabledAPPLE", glIsVertexAttribEnabledAPPLE == NULL);
-  glewInfoFunc("glMapVertexAttrib1dAPPLE", glMapVertexAttrib1dAPPLE == NULL);
-  glewInfoFunc("glMapVertexAttrib1fAPPLE", glMapVertexAttrib1fAPPLE == NULL);
-  glewInfoFunc("glMapVertexAttrib2dAPPLE", glMapVertexAttrib2dAPPLE == NULL);
-  glewInfoFunc("glMapVertexAttrib2fAPPLE", glMapVertexAttrib2fAPPLE == NULL);
-}
-
-#endif /* GL_APPLE_vertex_program_evaluators */
-
-#ifdef GL_APPLE_ycbcr_422
-
-static void _glewInfo_GL_APPLE_ycbcr_422 (void)
-{
-  glewPrintExt("GL_APPLE_ycbcr_422", GLEW_APPLE_ycbcr_422, glewIsSupported("GL_APPLE_ycbcr_422"), glewGetExtension("GL_APPLE_ycbcr_422"));
-}
-
-#endif /* GL_APPLE_ycbcr_422 */
-
-#ifdef GL_ARB_ES2_compatibility
-
-static void _glewInfo_GL_ARB_ES2_compatibility (void)
-{
-  glewPrintExt("GL_ARB_ES2_compatibility", GLEW_ARB_ES2_compatibility, glewIsSupported("GL_ARB_ES2_compatibility"), glewGetExtension("GL_ARB_ES2_compatibility"));
-
-  glewInfoFunc("glClearDepthf", glClearDepthf == NULL);
-  glewInfoFunc("glDepthRangef", glDepthRangef == NULL);
-  glewInfoFunc("glGetShaderPrecisionFormat", glGetShaderPrecisionFormat == NULL);
-  glewInfoFunc("glReleaseShaderCompiler", glReleaseShaderCompiler == NULL);
-  glewInfoFunc("glShaderBinary", glShaderBinary == NULL);
-}
-
-#endif /* GL_ARB_ES2_compatibility */
-
-#ifdef GL_ARB_ES3_compatibility
-
-static void _glewInfo_GL_ARB_ES3_compatibility (void)
-{
-  glewPrintExt("GL_ARB_ES3_compatibility", GLEW_ARB_ES3_compatibility, glewIsSupported("GL_ARB_ES3_compatibility"), glewGetExtension("GL_ARB_ES3_compatibility"));
-}
-
-#endif /* GL_ARB_ES3_compatibility */
-
-#ifdef GL_ARB_arrays_of_arrays
-
-static void _glewInfo_GL_ARB_arrays_of_arrays (void)
-{
-  glewPrintExt("GL_ARB_arrays_of_arrays", GLEW_ARB_arrays_of_arrays, glewIsSupported("GL_ARB_arrays_of_arrays"), glewGetExtension("GL_ARB_arrays_of_arrays"));
-}
-
-#endif /* GL_ARB_arrays_of_arrays */
-
-#ifdef GL_ARB_base_instance
-
-static void _glewInfo_GL_ARB_base_instance (void)
-{
-  glewPrintExt("GL_ARB_base_instance", GLEW_ARB_base_instance, glewIsSupported("GL_ARB_base_instance"), glewGetExtension("GL_ARB_base_instance"));
-
-  glewInfoFunc("glDrawArraysInstancedBaseInstance", glDrawArraysInstancedBaseInstance == NULL);
-  glewInfoFunc("glDrawElementsInstancedBaseInstance", glDrawElementsInstancedBaseInstance == NULL);
-  glewInfoFunc("glDrawElementsInstancedBaseVertexBaseInstance", glDrawElementsInstancedBaseVertexBaseInstance == NULL);
-}
-
-#endif /* GL_ARB_base_instance */
-
-#ifdef GL_ARB_blend_func_extended
-
-static void _glewInfo_GL_ARB_blend_func_extended (void)
-{
-  glewPrintExt("GL_ARB_blend_func_extended", GLEW_ARB_blend_func_extended, glewIsSupported("GL_ARB_blend_func_extended"), glewGetExtension("GL_ARB_blend_func_extended"));
-
-  glewInfoFunc("glBindFragDataLocationIndexed", glBindFragDataLocationIndexed == NULL);
-  glewInfoFunc("glGetFragDataIndex", glGetFragDataIndex == NULL);
-}
-
-#endif /* GL_ARB_blend_func_extended */
-
-#ifdef GL_ARB_cl_event
-
-static void _glewInfo_GL_ARB_cl_event (void)
-{
-  glewPrintExt("GL_ARB_cl_event", GLEW_ARB_cl_event, glewIsSupported("GL_ARB_cl_event"), glewGetExtension("GL_ARB_cl_event"));
-
-  glewInfoFunc("glCreateSyncFromCLeventARB", glCreateSyncFromCLeventARB == NULL);
-}
-
-#endif /* GL_ARB_cl_event */
-
-#ifdef GL_ARB_clear_buffer_object
-
-static void _glewInfo_GL_ARB_clear_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_clear_buffer_object", GLEW_ARB_clear_buffer_object, glewIsSupported("GL_ARB_clear_buffer_object"), glewGetExtension("GL_ARB_clear_buffer_object"));
-
-  glewInfoFunc("glClearBufferData", glClearBufferData == NULL);
-  glewInfoFunc("glClearBufferSubData", glClearBufferSubData == NULL);
-  glewInfoFunc("glClearNamedBufferDataEXT", glClearNamedBufferDataEXT == NULL);
-  glewInfoFunc("glClearNamedBufferSubDataEXT", glClearNamedBufferSubDataEXT == NULL);
-}
-
-#endif /* GL_ARB_clear_buffer_object */
-
-#ifdef GL_ARB_color_buffer_float
-
-static void _glewInfo_GL_ARB_color_buffer_float (void)
-{
-  glewPrintExt("GL_ARB_color_buffer_float", GLEW_ARB_color_buffer_float, glewIsSupported("GL_ARB_color_buffer_float"), glewGetExtension("GL_ARB_color_buffer_float"));
-
-  glewInfoFunc("glClampColorARB", glClampColorARB == NULL);
-}
-
-#endif /* GL_ARB_color_buffer_float */
-
-#ifdef GL_ARB_compatibility
-
-static void _glewInfo_GL_ARB_compatibility (void)
-{
-  glewPrintExt("GL_ARB_compatibility", GLEW_ARB_compatibility, glewIsSupported("GL_ARB_compatibility"), glewGetExtension("GL_ARB_compatibility"));
-}
-
-#endif /* GL_ARB_compatibility */
-
-#ifdef GL_ARB_compressed_texture_pixel_storage
-
-static void _glewInfo_GL_ARB_compressed_texture_pixel_storage (void)
-{
-  glewPrintExt("GL_ARB_compressed_texture_pixel_storage", GLEW_ARB_compressed_texture_pixel_storage, glewIsSupported("GL_ARB_compressed_texture_pixel_storage"), glewGetExtension("GL_ARB_compressed_texture_pixel_storage"));
-}
-
-#endif /* GL_ARB_compressed_texture_pixel_storage */
-
-#ifdef GL_ARB_compute_shader
-
-static void _glewInfo_GL_ARB_compute_shader (void)
-{
-  glewPrintExt("GL_ARB_compute_shader", GLEW_ARB_compute_shader, glewIsSupported("GL_ARB_compute_shader"), glewGetExtension("GL_ARB_compute_shader"));
-
-  glewInfoFunc("glDispatchCompute", glDispatchCompute == NULL);
-  glewInfoFunc("glDispatchComputeIndirect", glDispatchComputeIndirect == NULL);
-}
-
-#endif /* GL_ARB_compute_shader */
-
-#ifdef GL_ARB_conservative_depth
-
-static void _glewInfo_GL_ARB_conservative_depth (void)
-{
-  glewPrintExt("GL_ARB_conservative_depth", GLEW_ARB_conservative_depth, glewIsSupported("GL_ARB_conservative_depth"), glewGetExtension("GL_ARB_conservative_depth"));
-}
-
-#endif /* GL_ARB_conservative_depth */
-
-#ifdef GL_ARB_copy_buffer
-
-static void _glewInfo_GL_ARB_copy_buffer (void)
-{
-  glewPrintExt("GL_ARB_copy_buffer", GLEW_ARB_copy_buffer, glewIsSupported("GL_ARB_copy_buffer"), glewGetExtension("GL_ARB_copy_buffer"));
-
-  glewInfoFunc("glCopyBufferSubData", glCopyBufferSubData == NULL);
-}
-
-#endif /* GL_ARB_copy_buffer */
-
-#ifdef GL_ARB_copy_image
-
-static void _glewInfo_GL_ARB_copy_image (void)
-{
-  glewPrintExt("GL_ARB_copy_image", GLEW_ARB_copy_image, glewIsSupported("GL_ARB_copy_image"), glewGetExtension("GL_ARB_copy_image"));
-
-  glewInfoFunc("glCopyImageSubData", glCopyImageSubData == NULL);
-}
-
-#endif /* GL_ARB_copy_image */
-
-#ifdef GL_ARB_debug_output
-
-static void _glewInfo_GL_ARB_debug_output (void)
-{
-  glewPrintExt("GL_ARB_debug_output", GLEW_ARB_debug_output, glewIsSupported("GL_ARB_debug_output"), glewGetExtension("GL_ARB_debug_output"));
-
-  glewInfoFunc("glDebugMessageCallbackARB", glDebugMessageCallbackARB == NULL);
-  glewInfoFunc("glDebugMessageControlARB", glDebugMessageControlARB == NULL);
-  glewInfoFunc("glDebugMessageInsertARB", glDebugMessageInsertARB == NULL);
-  glewInfoFunc("glGetDebugMessageLogARB", glGetDebugMessageLogARB == NULL);
-}
-
-#endif /* GL_ARB_debug_output */
-
-#ifdef GL_ARB_depth_buffer_float
-
-static void _glewInfo_GL_ARB_depth_buffer_float (void)
-{
-  glewPrintExt("GL_ARB_depth_buffer_float", GLEW_ARB_depth_buffer_float, glewIsSupported("GL_ARB_depth_buffer_float"), glewGetExtension("GL_ARB_depth_buffer_float"));
-}
-
-#endif /* GL_ARB_depth_buffer_float */
-
-#ifdef GL_ARB_depth_clamp
-
-static void _glewInfo_GL_ARB_depth_clamp (void)
-{
-  glewPrintExt("GL_ARB_depth_clamp", GLEW_ARB_depth_clamp, glewIsSupported("GL_ARB_depth_clamp"), glewGetExtension("GL_ARB_depth_clamp"));
-}
-
-#endif /* GL_ARB_depth_clamp */
-
-#ifdef GL_ARB_depth_texture
-
-static void _glewInfo_GL_ARB_depth_texture (void)
-{
-  glewPrintExt("GL_ARB_depth_texture", GLEW_ARB_depth_texture, glewIsSupported("GL_ARB_depth_texture"), glewGetExtension("GL_ARB_depth_texture"));
-}
-
-#endif /* GL_ARB_depth_texture */
-
-#ifdef GL_ARB_draw_buffers
-
-static void _glewInfo_GL_ARB_draw_buffers (void)
-{
-  glewPrintExt("GL_ARB_draw_buffers", GLEW_ARB_draw_buffers, glewIsSupported("GL_ARB_draw_buffers"), glewGetExtension("GL_ARB_draw_buffers"));
-
-  glewInfoFunc("glDrawBuffersARB", glDrawBuffersARB == NULL);
-}
-
-#endif /* GL_ARB_draw_buffers */
-
-#ifdef GL_ARB_draw_buffers_blend
-
-static void _glewInfo_GL_ARB_draw_buffers_blend (void)
-{
-  glewPrintExt("GL_ARB_draw_buffers_blend", GLEW_ARB_draw_buffers_blend, glewIsSupported("GL_ARB_draw_buffers_blend"), glewGetExtension("GL_ARB_draw_buffers_blend"));
-
-  glewInfoFunc("glBlendEquationSeparateiARB", glBlendEquationSeparateiARB == NULL);
-  glewInfoFunc("glBlendEquationiARB", glBlendEquationiARB == NULL);
-  glewInfoFunc("glBlendFuncSeparateiARB", glBlendFuncSeparateiARB == NULL);
-  glewInfoFunc("glBlendFunciARB", glBlendFunciARB == NULL);
-}
-
-#endif /* GL_ARB_draw_buffers_blend */
-
-#ifdef GL_ARB_draw_elements_base_vertex
-
-static void _glewInfo_GL_ARB_draw_elements_base_vertex (void)
-{
-  glewPrintExt("GL_ARB_draw_elements_base_vertex", GLEW_ARB_draw_elements_base_vertex, glewIsSupported("GL_ARB_draw_elements_base_vertex"), glewGetExtension("GL_ARB_draw_elements_base_vertex"));
-
-  glewInfoFunc("glDrawElementsBaseVertex", glDrawElementsBaseVertex == NULL);
-  glewInfoFunc("glDrawElementsInstancedBaseVertex", glDrawElementsInstancedBaseVertex == NULL);
-  glewInfoFunc("glDrawRangeElementsBaseVertex", glDrawRangeElementsBaseVertex == NULL);
-  glewInfoFunc("glMultiDrawElementsBaseVertex", glMultiDrawElementsBaseVertex == NULL);
-}
-
-#endif /* GL_ARB_draw_elements_base_vertex */
-
-#ifdef GL_ARB_draw_indirect
-
-static void _glewInfo_GL_ARB_draw_indirect (void)
-{
-  glewPrintExt("GL_ARB_draw_indirect", GLEW_ARB_draw_indirect, glewIsSupported("GL_ARB_draw_indirect"), glewGetExtension("GL_ARB_draw_indirect"));
-
-  glewInfoFunc("glDrawArraysIndirect", glDrawArraysIndirect == NULL);
-  glewInfoFunc("glDrawElementsIndirect", glDrawElementsIndirect == NULL);
-}
-
-#endif /* GL_ARB_draw_indirect */
-
-#ifdef GL_ARB_draw_instanced
-
-static void _glewInfo_GL_ARB_draw_instanced (void)
-{
-  glewPrintExt("GL_ARB_draw_instanced", GLEW_ARB_draw_instanced, glewIsSupported("GL_ARB_draw_instanced"), glewGetExtension("GL_ARB_draw_instanced"));
-}
-
-#endif /* GL_ARB_draw_instanced */
-
-#ifdef GL_ARB_explicit_attrib_location
-
-static void _glewInfo_GL_ARB_explicit_attrib_location (void)
-{
-  glewPrintExt("GL_ARB_explicit_attrib_location", GLEW_ARB_explicit_attrib_location, glewIsSupported("GL_ARB_explicit_attrib_location"), glewGetExtension("GL_ARB_explicit_attrib_location"));
-}
-
-#endif /* GL_ARB_explicit_attrib_location */
-
-#ifdef GL_ARB_explicit_uniform_location
-
-static void _glewInfo_GL_ARB_explicit_uniform_location (void)
-{
-  glewPrintExt("GL_ARB_explicit_uniform_location", GLEW_ARB_explicit_uniform_location, glewIsSupported("GL_ARB_explicit_uniform_location"), glewGetExtension("GL_ARB_explicit_uniform_location"));
-}
-
-#endif /* GL_ARB_explicit_uniform_location */
-
-#ifdef GL_ARB_fragment_coord_conventions
-
-static void _glewInfo_GL_ARB_fragment_coord_conventions (void)
-{
-  glewPrintExt("GL_ARB_fragment_coord_conventions", GLEW_ARB_fragment_coord_conventions, glewIsSupported("GL_ARB_fragment_coord_conventions"), glewGetExtension("GL_ARB_fragment_coord_conventions"));
-}
-
-#endif /* GL_ARB_fragment_coord_conventions */
-
-#ifdef GL_ARB_fragment_layer_viewport
-
-static void _glewInfo_GL_ARB_fragment_layer_viewport (void)
-{
-  glewPrintExt("GL_ARB_fragment_layer_viewport", GLEW_ARB_fragment_layer_viewport, glewIsSupported("GL_ARB_fragment_layer_viewport"), glewGetExtension("GL_ARB_fragment_layer_viewport"));
-}
-
-#endif /* GL_ARB_fragment_layer_viewport */
-
-#ifdef GL_ARB_fragment_program
-
-static void _glewInfo_GL_ARB_fragment_program (void)
-{
-  glewPrintExt("GL_ARB_fragment_program", GLEW_ARB_fragment_program, glewIsSupported("GL_ARB_fragment_program"), glewGetExtension("GL_ARB_fragment_program"));
-}
-
-#endif /* GL_ARB_fragment_program */
-
-#ifdef GL_ARB_fragment_program_shadow
-
-static void _glewInfo_GL_ARB_fragment_program_shadow (void)
-{
-  glewPrintExt("GL_ARB_fragment_program_shadow", GLEW_ARB_fragment_program_shadow, glewIsSupported("GL_ARB_fragment_program_shadow"), glewGetExtension("GL_ARB_fragment_program_shadow"));
-}
-
-#endif /* GL_ARB_fragment_program_shadow */
-
-#ifdef GL_ARB_fragment_shader
-
-static void _glewInfo_GL_ARB_fragment_shader (void)
-{
-  glewPrintExt("GL_ARB_fragment_shader", GLEW_ARB_fragment_shader, glewIsSupported("GL_ARB_fragment_shader"), glewGetExtension("GL_ARB_fragment_shader"));
-}
-
-#endif /* GL_ARB_fragment_shader */
-
-#ifdef GL_ARB_framebuffer_no_attachments
-
-static void _glewInfo_GL_ARB_framebuffer_no_attachments (void)
-{
-  glewPrintExt("GL_ARB_framebuffer_no_attachments", GLEW_ARB_framebuffer_no_attachments, glewIsSupported("GL_ARB_framebuffer_no_attachments"), glewGetExtension("GL_ARB_framebuffer_no_attachments"));
-
-  glewInfoFunc("glFramebufferParameteri", glFramebufferParameteri == NULL);
-  glewInfoFunc("glGetFramebufferParameteriv", glGetFramebufferParameteriv == NULL);
-  glewInfoFunc("glGetNamedFramebufferParameterivEXT", glGetNamedFramebufferParameterivEXT == NULL);
-  glewInfoFunc("glNamedFramebufferParameteriEXT", glNamedFramebufferParameteriEXT == NULL);
-}
-
-#endif /* GL_ARB_framebuffer_no_attachments */
-
-#ifdef GL_ARB_framebuffer_object
-
-static void _glewInfo_GL_ARB_framebuffer_object (void)
-{
-  glewPrintExt("GL_ARB_framebuffer_object", GLEW_ARB_framebuffer_object, glewIsSupported("GL_ARB_framebuffer_object"), glewGetExtension("GL_ARB_framebuffer_object"));
-
-  glewInfoFunc("glBindFramebuffer", glBindFramebuffer == NULL);
-  glewInfoFunc("glBindRenderbuffer", glBindRenderbuffer == NULL);
-  glewInfoFunc("glBlitFramebuffer", glBlitFramebuffer == NULL);
-  glewInfoFunc("glCheckFramebufferStatus", glCheckFramebufferStatus == NULL);
-  glewInfoFunc("glDeleteFramebuffers", glDeleteFramebuffers == NULL);
-  glewInfoFunc("glDeleteRenderbuffers", glDeleteRenderbuffers == NULL);
-  glewInfoFunc("glFramebufferRenderbuffer", glFramebufferRenderbuffer == NULL);
-  glewInfoFunc("glFramebufferTexture1D", glFramebufferTexture1D == NULL);
-  glewInfoFunc("glFramebufferTexture2D", glFramebufferTexture2D == NULL);
-  glewInfoFunc("glFramebufferTexture3D", glFramebufferTexture3D == NULL);
-  glewInfoFunc("glFramebufferTextureLayer", glFramebufferTextureLayer == NULL);
-  glewInfoFunc("glGenFramebuffers", glGenFramebuffers == NULL);
-  glewInfoFunc("glGenRenderbuffers", glGenRenderbuffers == NULL);
-  glewInfoFunc("glGenerateMipmap", glGenerateMipmap == NULL);
-  glewInfoFunc("glGetFramebufferAttachmentParameteriv", glGetFramebufferAttachmentParameteriv == NULL);
-  glewInfoFunc("glGetRenderbufferParameteriv", glGetRenderbufferParameteriv == NULL);
-  glewInfoFunc("glIsFramebuffer", glIsFramebuffer == NULL);
-  glewInfoFunc("glIsRenderbuffer", glIsRenderbuffer == NULL);
-  glewInfoFunc("glRenderbufferStorage", glRenderbufferStorage == NULL);
-  glewInfoFunc("glRenderbufferStorageMultisample", glRenderbufferStorageMultisample == NULL);
-}
-
-#endif /* GL_ARB_framebuffer_object */
-
-#ifdef GL_ARB_framebuffer_sRGB
-
-static void _glewInfo_GL_ARB_framebuffer_sRGB (void)
-{
-  glewPrintExt("GL_ARB_framebuffer_sRGB", GLEW_ARB_framebuffer_sRGB, glewIsSupported("GL_ARB_framebuffer_sRGB"), glewGetExtension("GL_ARB_framebuffer_sRGB"));
-}
-
-#endif /* GL_ARB_framebuffer_sRGB */
-
-#ifdef GL_ARB_geometry_shader4
-
-static void _glewInfo_GL_ARB_geometry_shader4 (void)
-{
-  glewPrintExt("GL_ARB_geometry_shader4", GLEW_ARB_geometry_shader4, glewIsSupported("GL_ARB_geometry_shader4"), glewGetExtension("GL_ARB_geometry_shader4"));
-
-  glewInfoFunc("glFramebufferTextureARB", glFramebufferTextureARB == NULL);
-  glewInfoFunc("glFramebufferTextureFaceARB", glFramebufferTextureFaceARB == NULL);
-  glewInfoFunc("glFramebufferTextureLayerARB", glFramebufferTextureLayerARB == NULL);
-  glewInfoFunc("glProgramParameteriARB", glProgramParameteriARB == NULL);
-}
-
-#endif /* GL_ARB_geometry_shader4 */
-
-#ifdef GL_ARB_get_program_binary
-
-static void _glewInfo_GL_ARB_get_program_binary (void)
-{
-  glewPrintExt("GL_ARB_get_program_binary", GLEW_ARB_get_program_binary, glewIsSupported("GL_ARB_get_program_binary"), glewGetExtension("GL_ARB_get_program_binary"));
-
-  glewInfoFunc("glGetProgramBinary", glGetProgramBinary == NULL);
-  glewInfoFunc("glProgramBinary", glProgramBinary == NULL);
-  glewInfoFunc("glProgramParameteri", glProgramParameteri == NULL);
-}
-
-#endif /* GL_ARB_get_program_binary */
-
-#ifdef GL_ARB_gpu_shader5
-
-static void _glewInfo_GL_ARB_gpu_shader5 (void)
-{
-  glewPrintExt("GL_ARB_gpu_shader5", GLEW_ARB_gpu_shader5, glewIsSupported("GL_ARB_gpu_shader5"), glewGetExtension("GL_ARB_gpu_shader5"));
-}
-
-#endif /* GL_ARB_gpu_shader5 */
-
-#ifdef GL_ARB_gpu_shader_fp64
-
-static void _glewInfo_GL_ARB_gpu_shader_fp64 (void)
-{
-  glewPrintExt("GL_ARB_gpu_shader_fp64", GLEW_ARB_gpu_shader_fp64, glewIsSupported("GL_ARB_gpu_shader_fp64"), glewGetExtension("GL_ARB_gpu_shader_fp64"));
-
-  glewInfoFunc("glGetUniformdv", glGetUniformdv == NULL);
-  glewInfoFunc("glUniform1d", glUniform1d == NULL);
-  glewInfoFunc("glUniform1dv", glUniform1dv == NULL);
-  glewInfoFunc("glUniform2d", glUniform2d == NULL);
-  glewInfoFunc("glUniform2dv", glUniform2dv == NULL);
-  glewInfoFunc("glUniform3d", glUniform3d == NULL);
-  glewInfoFunc("glUniform3dv", glUniform3dv == NULL);
-  glewInfoFunc("glUniform4d", glUniform4d == NULL);
-  glewInfoFunc("glUniform4dv", glUniform4dv == NULL);
-  glewInfoFunc("glUniformMatrix2dv", glUniformMatrix2dv == NULL);
-  glewInfoFunc("glUniformMatrix2x3dv", glUniformMatrix2x3dv == NULL);
-  glewInfoFunc("glUniformMatrix2x4dv", glUniformMatrix2x4dv == NULL);
-  glewInfoFunc("glUniformMatrix3dv", glUniformMatrix3dv == NULL);
-  glewInfoFunc("glUniformMatrix3x2dv", glUniformMatrix3x2dv == NULL);
-  glewInfoFunc("glUniformMatrix3x4dv", glUniformMatrix3x4dv == NULL);
-  glewInfoFunc("glUniformMatrix4dv", glUniformMatrix4dv == NULL);
-  glewInfoFunc("glUniformMatrix4x2dv", glUniformMatrix4x2dv == NULL);
-  glewInfoFunc("glUniformMatrix4x3dv", glUniformMatrix4x3dv == NULL);
-}
-
-#endif /* GL_ARB_gpu_shader_fp64 */
-
-#ifdef GL_ARB_half_float_pixel
-
-static void _glewInfo_GL_ARB_half_float_pixel (void)
-{
-  glewPrintExt("GL_ARB_half_float_pixel", GLEW_ARB_half_float_pixel, glewIsSupported("GL_ARB_half_float_pixel"), glewGetExtension("GL_ARB_half_float_pixel"));
-}
-
-#endif /* GL_ARB_half_float_pixel */
-
-#ifdef GL_ARB_half_float_vertex
-
-static void _glewInfo_GL_ARB_half_float_vertex (void)
-{
-  glewPrintExt("GL_ARB_half_float_vertex", GLEW_ARB_half_float_vertex, glewIsSupported("GL_ARB_half_float_vertex"), glewGetExtension("GL_ARB_half_float_vertex"));
-}
-
-#endif /* GL_ARB_half_float_vertex */
-
-#ifdef GL_ARB_imaging
-
-static void _glewInfo_GL_ARB_imaging (void)
-{
-  glewPrintExt("GL_ARB_imaging", GLEW_ARB_imaging, glewIsSupported("GL_ARB_imaging"), glewGetExtension("GL_ARB_imaging"));
-
-  glewInfoFunc("glBlendEquation", glBlendEquation == NULL);
-  glewInfoFunc("glColorSubTable", glColorSubTable == NULL);
-  glewInfoFunc("glColorTable", glColorTable == NULL);
-  glewInfoFunc("glColorTableParameterfv", glColorTableParameterfv == NULL);
-  glewInfoFunc("glColorTableParameteriv", glColorTableParameteriv == NULL);
-  glewInfoFunc("glConvolutionFilter1D", glConvolutionFilter1D == NULL);
-  glewInfoFunc("glConvolutionFilter2D", glConvolutionFilter2D == NULL);
-  glewInfoFunc("glConvolutionParameterf", glConvolutionParameterf == NULL);
-  glewInfoFunc("glConvolutionParameterfv", glConvolutionParameterfv == NULL);
-  glewInfoFunc("glConvolutionParameteri", glConvolutionParameteri == NULL);
-  glewInfoFunc("glConvolutionParameteriv", glConvolutionParameteriv == NULL);
-  glewInfoFunc("glCopyColorSubTable", glCopyColorSubTable == NULL);
-  glewInfoFunc("glCopyColorTable", glCopyColorTable == NULL);
-  glewInfoFunc("glCopyConvolutionFilter1D", glCopyConvolutionFilter1D == NULL);
-  glewInfoFunc("glCopyConvolutionFilter2D", glCopyConvolutionFilter2D == NULL);
-  glewInfoFunc("glGetColorTable", glGetColorTable == NULL);
-  glewInfoFunc("glGetColorTableParameterfv", glGetColorTableParameterfv == NULL);
-  glewInfoFunc("glGetColorTableParameteriv", glGetColorTableParameteriv == NULL);
-  glewInfoFunc("glGetConvolutionFilter", glGetConvolutionFilter == NULL);
-  glewInfoFunc("glGetConvolutionParameterfv", glGetConvolutionParameterfv == NULL);
-  glewInfoFunc("glGetConvolutionParameteriv", glGetConvolutionParameteriv == NULL);
-  glewInfoFunc("glGetHistogram", glGetHistogram == NULL);
-  glewInfoFunc("glGetHistogramParameterfv", glGetHistogramParameterfv == NULL);
-  glewInfoFunc("glGetHistogramParameteriv", glGetHistogramParameteriv == NULL);
-  glewInfoFunc("glGetMinmax", glGetMinmax == NULL);
-  glewInfoFunc("glGetMinmaxParameterfv", glGetMinmaxParameterfv == NULL);
-  glewInfoFunc("glGetMinmaxParameteriv", glGetMinmaxParameteriv == NULL);
-  glewInfoFunc("glGetSeparableFilter", glGetSeparableFilter == NULL);
-  glewInfoFunc("glHistogram", glHistogram == NULL);
-  glewInfoFunc("glMinmax", glMinmax == NULL);
-  glewInfoFunc("glResetHistogram", glResetHistogram == NULL);
-  glewInfoFunc("glResetMinmax", glResetMinmax == NULL);
-  glewInfoFunc("glSeparableFilter2D", glSeparableFilter2D == NULL);
-}
-
-#endif /* GL_ARB_imaging */
-
-#ifdef GL_ARB_instanced_arrays
-
-static void _glewInfo_GL_ARB_instanced_arrays (void)
-{
-  glewPrintExt("GL_ARB_instanced_arrays", GLEW_ARB_instanced_arrays, glewIsSupported("GL_ARB_instanced_arrays"), glewGetExtension("GL_ARB_instanced_arrays"));
-
-  glewInfoFunc("glDrawArraysInstancedARB", glDrawArraysInstancedARB == NULL);
-  glewInfoFunc("glDrawElementsInstancedARB", glDrawElementsInstancedARB == NULL);
-  glewInfoFunc("glVertexAttribDivisorARB", glVertexAttribDivisorARB == NULL);
-}
-
-#endif /* GL_ARB_instanced_arrays */
-
-#ifdef GL_ARB_internalformat_query
-
-static void _glewInfo_GL_ARB_internalformat_query (void)
-{
-  glewPrintExt("GL_ARB_internalformat_query", GLEW_ARB_internalformat_query, glewIsSupported("GL_ARB_internalformat_query"), glewGetExtension("GL_ARB_internalformat_query"));
-
-  glewInfoFunc("glGetInternalformativ", glGetInternalformativ == NULL);
-}
-
-#endif /* GL_ARB_internalformat_query */
-
-#ifdef GL_ARB_internalformat_query2
-
-static void _glewInfo_GL_ARB_internalformat_query2 (void)
-{
-  glewPrintExt("GL_ARB_internalformat_query2", GLEW_ARB_internalformat_query2, glewIsSupported("GL_ARB_internalformat_query2"), glewGetExtension("GL_ARB_internalformat_query2"));
-
-  glewInfoFunc("glGetInternalformati64v", glGetInternalformati64v == NULL);
-}
-
-#endif /* GL_ARB_internalformat_query2 */
-
-#ifdef GL_ARB_invalidate_subdata
-
-static void _glewInfo_GL_ARB_invalidate_subdata (void)
-{
-  glewPrintExt("GL_ARB_invalidate_subdata", GLEW_ARB_invalidate_subdata, glewIsSupported("GL_ARB_invalidate_subdata"), glewGetExtension("GL_ARB_invalidate_subdata"));
-
-  glewInfoFunc("glInvalidateBufferData", glInvalidateBufferData == NULL);
-  glewInfoFunc("glInvalidateBufferSubData", glInvalidateBufferSubData == NULL);
-  glewInfoFunc("glInvalidateFramebuffer", glInvalidateFramebuffer == NULL);
-  glewInfoFunc("glInvalidateSubFramebuffer", glInvalidateSubFramebuffer == NULL);
-  glewInfoFunc("glInvalidateTexImage", glInvalidateTexImage == NULL);
-  glewInfoFunc("glInvalidateTexSubImage", glInvalidateTexSubImage == NULL);
-}
-
-#endif /* GL_ARB_invalidate_subdata */
-
-#ifdef GL_ARB_map_buffer_alignment
-
-static void _glewInfo_GL_ARB_map_buffer_alignment (void)
-{
-  glewPrintExt("GL_ARB_map_buffer_alignment", GLEW_ARB_map_buffer_alignment, glewIsSupported("GL_ARB_map_buffer_alignment"), glewGetExtension("GL_ARB_map_buffer_alignment"));
-}
-
-#endif /* GL_ARB_map_buffer_alignment */
-
-#ifdef GL_ARB_map_buffer_range
-
-static void _glewInfo_GL_ARB_map_buffer_range (void)
-{
-  glewPrintExt("GL_ARB_map_buffer_range", GLEW_ARB_map_buffer_range, glewIsSupported("GL_ARB_map_buffer_range"), glewGetExtension("GL_ARB_map_buffer_range"));
-
-  glewInfoFunc("glFlushMappedBufferRange", glFlushMappedBufferRange == NULL);
-  glewInfoFunc("glMapBufferRange", glMapBufferRange == NULL);
-}
-
-#endif /* GL_ARB_map_buffer_range */
-
-#ifdef GL_ARB_matrix_palette
-
-static void _glewInfo_GL_ARB_matrix_palette (void)
-{
-  glewPrintExt("GL_ARB_matrix_palette", GLEW_ARB_matrix_palette, glewIsSupported("GL_ARB_matrix_palette"), glewGetExtension("GL_ARB_matrix_palette"));
-
-  glewInfoFunc("glCurrentPaletteMatrixARB", glCurrentPaletteMatrixARB == NULL);
-  glewInfoFunc("glMatrixIndexPointerARB", glMatrixIndexPointerARB == NULL);
-  glewInfoFunc("glMatrixIndexubvARB", glMatrixIndexubvARB == NULL);
-  glewInfoFunc("glMatrixIndexuivARB", glMatrixIndexuivARB == NULL);
-  glewInfoFunc("glMatrixIndexusvARB", glMatrixIndexusvARB == NULL);
-}
-
-#endif /* GL_ARB_matrix_palette */
-
-#ifdef GL_ARB_multi_draw_indirect
-
-static void _glewInfo_GL_ARB_multi_draw_indirect (void)
-{
-  glewPrintExt("GL_ARB_multi_draw_indirect", GLEW_ARB_multi_draw_indirect, glewIsSupported("GL_ARB_multi_draw_indirect"), glewGetExtension("GL_ARB_multi_draw_indirect"));
-
-  glewInfoFunc("glMultiDrawArraysIndirect", glMultiDrawArraysIndirect == NULL);
-  glewInfoFunc("glMultiDrawElementsIndirect", glMultiDrawElementsIndirect == NULL);
-}
-
-#endif /* GL_ARB_multi_draw_indirect */
-
-#ifdef GL_ARB_multisample
-
-static void _glewInfo_GL_ARB_multisample (void)
-{
-  glewPrintExt("GL_ARB_multisample", GLEW_ARB_multisample, glewIsSupported("GL_ARB_multisample"), glewGetExtension("GL_ARB_multisample"));
-
-  glewInfoFunc("glSampleCoverageARB", glSampleCoverageARB == NULL);
-}
-
-#endif /* GL_ARB_multisample */
-
-#ifdef GL_ARB_multitexture
-
-static void _glewInfo_GL_ARB_multitexture (void)
-{
-  glewPrintExt("GL_ARB_multitexture", GLEW_ARB_multitexture, glewIsSupported("GL_ARB_multitexture"), glewGetExtension("GL_ARB_multitexture"));
-
-  glewInfoFunc("glActiveTextureARB", glActiveTextureARB == NULL);
-  glewInfoFunc("glClientActiveTextureARB", glClientActiveTextureARB == NULL);
-  glewInfoFunc("glMultiTexCoord1dARB", glMultiTexCoord1dARB == NULL);
-  glewInfoFunc("glMultiTexCoord1dvARB", glMultiTexCoord1dvARB == NULL);
-  glewInfoFunc("glMultiTexCoord1fARB", glMultiTexCoord1fARB == NULL);
-  glewInfoFunc("glMultiTexCoord1fvARB", glMultiTexCoord1fvARB == NULL);
-  glewInfoFunc("glMultiTexCoord1iARB", glMultiTexCoord1iARB == NULL);
-  glewInfoFunc("glMultiTexCoord1ivARB", glMultiTexCoord1ivARB == NULL);
-  glewInfoFunc("glMultiTexCoord1sARB", glMultiTexCoord1sARB == NULL);
-  glewInfoFunc("glMultiTexCoord1svARB", glMultiTexCoord1svARB == NULL);
-  glewInfoFunc("glMultiTexCoord2dARB", glMultiTexCoord2dARB == NULL);
-  glewInfoFunc("glMultiTexCoord2dvARB", glMultiTexCoord2dvARB == NULL);
-  glewInfoFunc("glMultiTexCoord2fARB", glMultiTexCoord2fARB == NULL);
-  glewInfoFunc("glMultiTexCoord2fvARB", glMultiTexCoord2fvARB == NULL);
-  glewInfoFunc("glMultiTexCoord2iARB", glMultiTexCoord2iARB == NULL);
-  glewInfoFunc("glMultiTexCoord2ivARB", glMultiTexCoord2ivARB == NULL);
-  glewInfoFunc("glMultiTexCoord2sARB", glMultiTexCoord2sARB == NULL);
-  glewInfoFunc("glMultiTexCoord2svARB", glMultiTexCoord2svARB == NULL);
-  glewInfoFunc("glMultiTexCoord3dARB", glMultiTexCoord3dARB == NULL);
-  glewInfoFunc("glMultiTexCoord3dvARB", glMultiTexCoord3dvARB == NULL);
-  glewInfoFunc("glMultiTexCoord3fARB", glMultiTexCoord3fARB == NULL);
-  glewInfoFunc("glMultiTexCoord3fvARB", glMultiTexCoord3fvARB == NULL);
-  glewInfoFunc("glMultiTexCoord3iARB", glMultiTexCoord3iARB == NULL);
-  glewInfoFunc("glMultiTexCoord3ivARB", glMultiTexCoord3ivARB == NULL);
-  glewInfoFunc("glMultiTexCoord3sARB", glMultiTexCoord3sARB == NULL);
-  glewInfoFunc("glMultiTexCoord3svARB", glMultiTexCoord3svARB == NULL);
-  glewInfoFunc("glMultiTexCoord4dARB", glMultiTexCoord4dARB == NULL);
-  glewInfoFunc("glMultiTexCoord4dvARB", glMultiTexCoord4dvARB == NULL);
-  glewInfoFunc("glMultiTexCoord4fARB", glMultiTexCoord4fARB == NULL);
-  glewInfoFunc("glMultiTexCoord4fvARB", glMultiTexCoord4fvARB == NULL);
-  glewInfoFunc("glMultiTexCoord4iARB", glMultiTexCoord4iARB == NULL);
-  glewInfoFunc("glMultiTexCoord4ivARB", glMultiTexCoord4ivARB == NULL);
-  glewInfoFunc("glMultiTexCoord4sARB", glMultiTexCoord4sARB == NULL);
-  glewInfoFunc("glMultiTexCoord4svARB", glMultiTexCoord4svARB == NULL);
-}
-
-#endif /* GL_ARB_multitexture */
-
-#ifdef GL_ARB_occlusion_query
-
-static void _glewInfo_GL_ARB_occlusion_query (void)
-{
-  glewPrintExt("GL_ARB_occlusion_query", GLEW_ARB_occlusion_query, glewIsSupported("GL_ARB_occlusion_query"), glewGetExtension("GL_ARB_occlusion_query"));
-
-  glewInfoFunc("glBeginQueryARB", glBeginQueryARB == NULL);
-  glewInfoFunc("glDeleteQueriesARB", glDeleteQueriesARB == NULL);
-  glewInfoFunc("glEndQueryARB", glEndQueryARB == NULL);
-  glewInfoFunc("glGenQueriesARB", glGenQueriesARB == NULL);
-  glewInfoFunc("glGetQueryObjectivARB", glGetQueryObjectivARB == NULL);
-  glewInfoFunc("glGetQueryObjectuivARB", glGetQueryObjectuivARB == NULL);
-  glewInfoFunc("glGetQueryivARB", glGetQueryivARB == NULL);
-  glewInfoFunc("glIsQueryARB", glIsQueryARB == NULL);
-}
-
-#endif /* GL_ARB_occlusion_query */
-
-#ifdef GL_ARB_occlusion_query2
-
-static void _glewInfo_GL_ARB_occlusion_query2 (void)
-{
-  glewPrintExt("GL_ARB_occlusion_query2", GLEW_ARB_occlusion_query2, glewIsSupported("GL_ARB_occlusion_query2"), glewGetExtension("GL_ARB_occlusion_query2"));
-}
-
-#endif /* GL_ARB_occlusion_query2 */
-
-#ifdef GL_ARB_pixel_buffer_object
-
-static void _glewInfo_GL_ARB_pixel_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_pixel_buffer_object", GLEW_ARB_pixel_buffer_object, glewIsSupported("GL_ARB_pixel_buffer_object"), glewGetExtension("GL_ARB_pixel_buffer_object"));
-}
-
-#endif /* GL_ARB_pixel_buffer_object */
-
-#ifdef GL_ARB_point_parameters
-
-static void _glewInfo_GL_ARB_point_parameters (void)
-{
-  glewPrintExt("GL_ARB_point_parameters", GLEW_ARB_point_parameters, glewIsSupported("GL_ARB_point_parameters"), glewGetExtension("GL_ARB_point_parameters"));
-
-  glewInfoFunc("glPointParameterfARB", glPointParameterfARB == NULL);
-  glewInfoFunc("glPointParameterfvARB", glPointParameterfvARB == NULL);
-}
-
-#endif /* GL_ARB_point_parameters */
-
-#ifdef GL_ARB_point_sprite
-
-static void _glewInfo_GL_ARB_point_sprite (void)
-{
-  glewPrintExt("GL_ARB_point_sprite", GLEW_ARB_point_sprite, glewIsSupported("GL_ARB_point_sprite"), glewGetExtension("GL_ARB_point_sprite"));
-}
-
-#endif /* GL_ARB_point_sprite */
-
-#ifdef GL_ARB_program_interface_query
-
-static void _glewInfo_GL_ARB_program_interface_query (void)
-{
-  glewPrintExt("GL_ARB_program_interface_query", GLEW_ARB_program_interface_query, glewIsSupported("GL_ARB_program_interface_query"), glewGetExtension("GL_ARB_program_interface_query"));
-
-  glewInfoFunc("glGetProgramInterfaceiv", glGetProgramInterfaceiv == NULL);
-  glewInfoFunc("glGetProgramResourceIndex", glGetProgramResourceIndex == NULL);
-  glewInfoFunc("glGetProgramResourceLocation", glGetProgramResourceLocation == NULL);
-  glewInfoFunc("glGetProgramResourceLocationIndex", glGetProgramResourceLocationIndex == NULL);
-  glewInfoFunc("glGetProgramResourceName", glGetProgramResourceName == NULL);
-  glewInfoFunc("glGetProgramResourceiv", glGetProgramResourceiv == NULL);
-}
-
-#endif /* GL_ARB_program_interface_query */
-
-#ifdef GL_ARB_provoking_vertex
-
-static void _glewInfo_GL_ARB_provoking_vertex (void)
-{
-  glewPrintExt("GL_ARB_provoking_vertex", GLEW_ARB_provoking_vertex, glewIsSupported("GL_ARB_provoking_vertex"), glewGetExtension("GL_ARB_provoking_vertex"));
-
-  glewInfoFunc("glProvokingVertex", glProvokingVertex == NULL);
-}
-
-#endif /* GL_ARB_provoking_vertex */
-
-#ifdef GL_ARB_robust_buffer_access_behavior
-
-static void _glewInfo_GL_ARB_robust_buffer_access_behavior (void)
-{
-  glewPrintExt("GL_ARB_robust_buffer_access_behavior", GLEW_ARB_robust_buffer_access_behavior, glewIsSupported("GL_ARB_robust_buffer_access_behavior"), glewGetExtension("GL_ARB_robust_buffer_access_behavior"));
-}
-
-#endif /* GL_ARB_robust_buffer_access_behavior */
-
-#ifdef GL_ARB_robustness
-
-static void _glewInfo_GL_ARB_robustness (void)
-{
-  glewPrintExt("GL_ARB_robustness", GLEW_ARB_robustness, glewIsSupported("GL_ARB_robustness"), glewGetExtension("GL_ARB_robustness"));
-
-  glewInfoFunc("glGetGraphicsResetStatusARB", glGetGraphicsResetStatusARB == NULL);
-  glewInfoFunc("glGetnColorTableARB", glGetnColorTableARB == NULL);
-  glewInfoFunc("glGetnCompressedTexImageARB", glGetnCompressedTexImageARB == NULL);
-  glewInfoFunc("glGetnConvolutionFilterARB", glGetnConvolutionFilterARB == NULL);
-  glewInfoFunc("glGetnHistogramARB", glGetnHistogramARB == NULL);
-  glewInfoFunc("glGetnMapdvARB", glGetnMapdvARB == NULL);
-  glewInfoFunc("glGetnMapfvARB", glGetnMapfvARB == NULL);
-  glewInfoFunc("glGetnMapivARB", glGetnMapivARB == NULL);
-  glewInfoFunc("glGetnMinmaxARB", glGetnMinmaxARB == NULL);
-  glewInfoFunc("glGetnPixelMapfvARB", glGetnPixelMapfvARB == NULL);
-  glewInfoFunc("glGetnPixelMapuivARB", glGetnPixelMapuivARB == NULL);
-  glewInfoFunc("glGetnPixelMapusvARB", glGetnPixelMapusvARB == NULL);
-  glewInfoFunc("glGetnPolygonStippleARB", glGetnPolygonStippleARB == NULL);
-  glewInfoFunc("glGetnSeparableFilterARB", glGetnSeparableFilterARB == NULL);
-  glewInfoFunc("glGetnTexImageARB", glGetnTexImageARB == NULL);
-  glewInfoFunc("glGetnUniformdvARB", glGetnUniformdvARB == NULL);
-  glewInfoFunc("glGetnUniformfvARB", glGetnUniformfvARB == NULL);
-  glewInfoFunc("glGetnUniformivARB", glGetnUniformivARB == NULL);
-  glewInfoFunc("glGetnUniformuivARB", glGetnUniformuivARB == NULL);
-  glewInfoFunc("glReadnPixelsARB", glReadnPixelsARB == NULL);
-}
-
-#endif /* GL_ARB_robustness */
-
-#ifdef GL_ARB_robustness_application_isolation
-
-static void _glewInfo_GL_ARB_robustness_application_isolation (void)
-{
-  glewPrintExt("GL_ARB_robustness_application_isolation", GLEW_ARB_robustness_application_isolation, glewIsSupported("GL_ARB_robustness_application_isolation"), glewGetExtension("GL_ARB_robustness_application_isolation"));
-}
-
-#endif /* GL_ARB_robustness_application_isolation */
-
-#ifdef GL_ARB_robustness_share_group_isolation
-
-static void _glewInfo_GL_ARB_robustness_share_group_isolation (void)
-{
-  glewPrintExt("GL_ARB_robustness_share_group_isolation", GLEW_ARB_robustness_share_group_isolation, glewIsSupported("GL_ARB_robustness_share_group_isolation"), glewGetExtension("GL_ARB_robustness_share_group_isolation"));
-}
-
-#endif /* GL_ARB_robustness_share_group_isolation */
-
-#ifdef GL_ARB_sample_shading
-
-static void _glewInfo_GL_ARB_sample_shading (void)
-{
-  glewPrintExt("GL_ARB_sample_shading", GLEW_ARB_sample_shading, glewIsSupported("GL_ARB_sample_shading"), glewGetExtension("GL_ARB_sample_shading"));
-
-  glewInfoFunc("glMinSampleShadingARB", glMinSampleShadingARB == NULL);
-}
-
-#endif /* GL_ARB_sample_shading */
-
-#ifdef GL_ARB_sampler_objects
-
-static void _glewInfo_GL_ARB_sampler_objects (void)
-{
-  glewPrintExt("GL_ARB_sampler_objects", GLEW_ARB_sampler_objects, glewIsSupported("GL_ARB_sampler_objects"), glewGetExtension("GL_ARB_sampler_objects"));
-
-  glewInfoFunc("glBindSampler", glBindSampler == NULL);
-  glewInfoFunc("glDeleteSamplers", glDeleteSamplers == NULL);
-  glewInfoFunc("glGenSamplers", glGenSamplers == NULL);
-  glewInfoFunc("glGetSamplerParameterIiv", glGetSamplerParameterIiv == NULL);
-  glewInfoFunc("glGetSamplerParameterIuiv", glGetSamplerParameterIuiv == NULL);
-  glewInfoFunc("glGetSamplerParameterfv", glGetSamplerParameterfv == NULL);
-  glewInfoFunc("glGetSamplerParameteriv", glGetSamplerParameteriv == NULL);
-  glewInfoFunc("glIsSampler", glIsSampler == NULL);
-  glewInfoFunc("glSamplerParameterIiv", glSamplerParameterIiv == NULL);
-  glewInfoFunc("glSamplerParameterIuiv", glSamplerParameterIuiv == NULL);
-  glewInfoFunc("glSamplerParameterf", glSamplerParameterf == NULL);
-  glewInfoFunc("glSamplerParameterfv", glSamplerParameterfv == NULL);
-  glewInfoFunc("glSamplerParameteri", glSamplerParameteri == NULL);
-  glewInfoFunc("glSamplerParameteriv", glSamplerParameteriv == NULL);
-}
-
-#endif /* GL_ARB_sampler_objects */
-
-#ifdef GL_ARB_seamless_cube_map
-
-static void _glewInfo_GL_ARB_seamless_cube_map (void)
-{
-  glewPrintExt("GL_ARB_seamless_cube_map", GLEW_ARB_seamless_cube_map, glewIsSupported("GL_ARB_seamless_cube_map"), glewGetExtension("GL_ARB_seamless_cube_map"));
-}
-
-#endif /* GL_ARB_seamless_cube_map */
-
-#ifdef GL_ARB_separate_shader_objects
-
-static void _glewInfo_GL_ARB_separate_shader_objects (void)
-{
-  glewPrintExt("GL_ARB_separate_shader_objects", GLEW_ARB_separate_shader_objects, glewIsSupported("GL_ARB_separate_shader_objects"), glewGetExtension("GL_ARB_separate_shader_objects"));
-
-  glewInfoFunc("glActiveShaderProgram", glActiveShaderProgram == NULL);
-  glewInfoFunc("glBindProgramPipeline", glBindProgramPipeline == NULL);
-  glewInfoFunc("glCreateShaderProgramv", glCreateShaderProgramv == NULL);
-  glewInfoFunc("glDeleteProgramPipelines", glDeleteProgramPipelines == NULL);
-  glewInfoFunc("glGenProgramPipelines", glGenProgramPipelines == NULL);
-  glewInfoFunc("glGetProgramPipelineInfoLog", glGetProgramPipelineInfoLog == NULL);
-  glewInfoFunc("glGetProgramPipelineiv", glGetProgramPipelineiv == NULL);
-  glewInfoFunc("glIsProgramPipeline", glIsProgramPipeline == NULL);
-  glewInfoFunc("glProgramUniform1d", glProgramUniform1d == NULL);
-  glewInfoFunc("glProgramUniform1dv", glProgramUniform1dv == NULL);
-  glewInfoFunc("glProgramUniform1f", glProgramUniform1f == NULL);
-  glewInfoFunc("glProgramUniform1fv", glProgramUniform1fv == NULL);
-  glewInfoFunc("glProgramUniform1i", glProgramUniform1i == NULL);
-  glewInfoFunc("glProgramUniform1iv", glProgramUniform1iv == NULL);
-  glewInfoFunc("glProgramUniform1ui", glProgramUniform1ui == NULL);
-  glewInfoFunc("glProgramUniform1uiv", glProgramUniform1uiv == NULL);
-  glewInfoFunc("glProgramUniform2d", glProgramUniform2d == NULL);
-  glewInfoFunc("glProgramUniform2dv", glProgramUniform2dv == NULL);
-  glewInfoFunc("glProgramUniform2f", glProgramUniform2f == NULL);
-  glewInfoFunc("glProgramUniform2fv", glProgramUniform2fv == NULL);
-  glewInfoFunc("glProgramUniform2i", glProgramUniform2i == NULL);
-  glewInfoFunc("glProgramUniform2iv", glProgramUniform2iv == NULL);
-  glewInfoFunc("glProgramUniform2ui", glProgramUniform2ui == NULL);
-  glewInfoFunc("glProgramUniform2uiv", glProgramUniform2uiv == NULL);
-  glewInfoFunc("glProgramUniform3d", glProgramUniform3d == NULL);
-  glewInfoFunc("glProgramUniform3dv", glProgramUniform3dv == NULL);
-  glewInfoFunc("glProgramUniform3f", glProgramUniform3f == NULL);
-  glewInfoFunc("glProgramUniform3fv", glProgramUniform3fv == NULL);
-  glewInfoFunc("glProgramUniform3i", glProgramUniform3i == NULL);
-  glewInfoFunc("glProgramUniform3iv", glProgramUniform3iv == NULL);
-  glewInfoFunc("glProgramUniform3ui", glProgramUniform3ui == NULL);
-  glewInfoFunc("glProgramUniform3uiv", glProgramUniform3uiv == NULL);
-  glewInfoFunc("glProgramUniform4d", glProgramUniform4d == NULL);
-  glewInfoFunc("glProgramUniform4dv", glProgramUniform4dv == NULL);
-  glewInfoFunc("glProgramUniform4f", glProgramUniform4f == NULL);
-  glewInfoFunc("glProgramUniform4fv", glProgramUniform4fv == NULL);
-  glewInfoFunc("glProgramUniform4i", glProgramUniform4i == NULL);
-  glewInfoFunc("glProgramUniform4iv", glProgramUniform4iv == NULL);
-  glewInfoFunc("glProgramUniform4ui", glProgramUniform4ui == NULL);
-  glewInfoFunc("glProgramUniform4uiv", glProgramUniform4uiv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2dv", glProgramUniformMatrix2dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2fv", glProgramUniformMatrix2fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x3dv", glProgramUniformMatrix2x3dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x3fv", glProgramUniformMatrix2x3fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x4dv", glProgramUniformMatrix2x4dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x4fv", glProgramUniformMatrix2x4fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3dv", glProgramUniformMatrix3dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3fv", glProgramUniformMatrix3fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x2dv", glProgramUniformMatrix3x2dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x2fv", glProgramUniformMatrix3x2fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x4dv", glProgramUniformMatrix3x4dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x4fv", glProgramUniformMatrix3x4fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4dv", glProgramUniformMatrix4dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4fv", glProgramUniformMatrix4fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x2dv", glProgramUniformMatrix4x2dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x2fv", glProgramUniformMatrix4x2fv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x3dv", glProgramUniformMatrix4x3dv == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x3fv", glProgramUniformMatrix4x3fv == NULL);
-  glewInfoFunc("glUseProgramStages", glUseProgramStages == NULL);
-  glewInfoFunc("glValidateProgramPipeline", glValidateProgramPipeline == NULL);
-}
-
-#endif /* GL_ARB_separate_shader_objects */
-
-#ifdef GL_ARB_shader_atomic_counters
-
-static void _glewInfo_GL_ARB_shader_atomic_counters (void)
-{
-  glewPrintExt("GL_ARB_shader_atomic_counters", GLEW_ARB_shader_atomic_counters, glewIsSupported("GL_ARB_shader_atomic_counters"), glewGetExtension("GL_ARB_shader_atomic_counters"));
-
-  glewInfoFunc("glGetActiveAtomicCounterBufferiv", glGetActiveAtomicCounterBufferiv == NULL);
-}
-
-#endif /* GL_ARB_shader_atomic_counters */
-
-#ifdef GL_ARB_shader_bit_encoding
-
-static void _glewInfo_GL_ARB_shader_bit_encoding (void)
-{
-  glewPrintExt("GL_ARB_shader_bit_encoding", GLEW_ARB_shader_bit_encoding, glewIsSupported("GL_ARB_shader_bit_encoding"), glewGetExtension("GL_ARB_shader_bit_encoding"));
-}
-
-#endif /* GL_ARB_shader_bit_encoding */
-
-#ifdef GL_ARB_shader_image_load_store
-
-static void _glewInfo_GL_ARB_shader_image_load_store (void)
-{
-  glewPrintExt("GL_ARB_shader_image_load_store", GLEW_ARB_shader_image_load_store, glewIsSupported("GL_ARB_shader_image_load_store"), glewGetExtension("GL_ARB_shader_image_load_store"));
-
-  glewInfoFunc("glBindImageTexture", glBindImageTexture == NULL);
-  glewInfoFunc("glMemoryBarrier", glMemoryBarrier == NULL);
-}
-
-#endif /* GL_ARB_shader_image_load_store */
-
-#ifdef GL_ARB_shader_image_size
-
-static void _glewInfo_GL_ARB_shader_image_size (void)
-{
-  glewPrintExt("GL_ARB_shader_image_size", GLEW_ARB_shader_image_size, glewIsSupported("GL_ARB_shader_image_size"), glewGetExtension("GL_ARB_shader_image_size"));
-}
-
-#endif /* GL_ARB_shader_image_size */
-
-#ifdef GL_ARB_shader_objects
-
-static void _glewInfo_GL_ARB_shader_objects (void)
-{
-  glewPrintExt("GL_ARB_shader_objects", GLEW_ARB_shader_objects, glewIsSupported("GL_ARB_shader_objects"), glewGetExtension("GL_ARB_shader_objects"));
-
-  glewInfoFunc("glAttachObjectARB", glAttachObjectARB == NULL);
-  glewInfoFunc("glCompileShaderARB", glCompileShaderARB == NULL);
-  glewInfoFunc("glCreateProgramObjectARB", glCreateProgramObjectARB == NULL);
-  glewInfoFunc("glCreateShaderObjectARB", glCreateShaderObjectARB == NULL);
-  glewInfoFunc("glDeleteObjectARB", glDeleteObjectARB == NULL);
-  glewInfoFunc("glDetachObjectARB", glDetachObjectARB == NULL);
-  glewInfoFunc("glGetActiveUniformARB", glGetActiveUniformARB == NULL);
-  glewInfoFunc("glGetAttachedObjectsARB", glGetAttachedObjectsARB == NULL);
-  glewInfoFunc("glGetHandleARB", glGetHandleARB == NULL);
-  glewInfoFunc("glGetInfoLogARB", glGetInfoLogARB == NULL);
-  glewInfoFunc("glGetObjectParameterfvARB", glGetObjectParameterfvARB == NULL);
-  glewInfoFunc("glGetObjectParameterivARB", glGetObjectParameterivARB == NULL);
-  glewInfoFunc("glGetShaderSourceARB", glGetShaderSourceARB == NULL);
-  glewInfoFunc("glGetUniformLocationARB", glGetUniformLocationARB == NULL);
-  glewInfoFunc("glGetUniformfvARB", glGetUniformfvARB == NULL);
-  glewInfoFunc("glGetUniformivARB", glGetUniformivARB == NULL);
-  glewInfoFunc("glLinkProgramARB", glLinkProgramARB == NULL);
-  glewInfoFunc("glShaderSourceARB", glShaderSourceARB == NULL);
-  glewInfoFunc("glUniform1fARB", glUniform1fARB == NULL);
-  glewInfoFunc("glUniform1fvARB", glUniform1fvARB == NULL);
-  glewInfoFunc("glUniform1iARB", glUniform1iARB == NULL);
-  glewInfoFunc("glUniform1ivARB", glUniform1ivARB == NULL);
-  glewInfoFunc("glUniform2fARB", glUniform2fARB == NULL);
-  glewInfoFunc("glUniform2fvARB", glUniform2fvARB == NULL);
-  glewInfoFunc("glUniform2iARB", glUniform2iARB == NULL);
-  glewInfoFunc("glUniform2ivARB", glUniform2ivARB == NULL);
-  glewInfoFunc("glUniform3fARB", glUniform3fARB == NULL);
-  glewInfoFunc("glUniform3fvARB", glUniform3fvARB == NULL);
-  glewInfoFunc("glUniform3iARB", glUniform3iARB == NULL);
-  glewInfoFunc("glUniform3ivARB", glUniform3ivARB == NULL);
-  glewInfoFunc("glUniform4fARB", glUniform4fARB == NULL);
-  glewInfoFunc("glUniform4fvARB", glUniform4fvARB == NULL);
-  glewInfoFunc("glUniform4iARB", glUniform4iARB == NULL);
-  glewInfoFunc("glUniform4ivARB", glUniform4ivARB == NULL);
-  glewInfoFunc("glUniformMatrix2fvARB", glUniformMatrix2fvARB == NULL);
-  glewInfoFunc("glUniformMatrix3fvARB", glUniformMatrix3fvARB == NULL);
-  glewInfoFunc("glUniformMatrix4fvARB", glUniformMatrix4fvARB == NULL);
-  glewInfoFunc("glUseProgramObjectARB", glUseProgramObjectARB == NULL);
-  glewInfoFunc("glValidateProgramARB", glValidateProgramARB == NULL);
-}
-
-#endif /* GL_ARB_shader_objects */
-
-#ifdef GL_ARB_shader_precision
-
-static void _glewInfo_GL_ARB_shader_precision (void)
-{
-  glewPrintExt("GL_ARB_shader_precision", GLEW_ARB_shader_precision, glewIsSupported("GL_ARB_shader_precision"), glewGetExtension("GL_ARB_shader_precision"));
-}
-
-#endif /* GL_ARB_shader_precision */
-
-#ifdef GL_ARB_shader_stencil_export
-
-static void _glewInfo_GL_ARB_shader_stencil_export (void)
-{
-  glewPrintExt("GL_ARB_shader_stencil_export", GLEW_ARB_shader_stencil_export, glewIsSupported("GL_ARB_shader_stencil_export"), glewGetExtension("GL_ARB_shader_stencil_export"));
-}
-
-#endif /* GL_ARB_shader_stencil_export */
-
-#ifdef GL_ARB_shader_storage_buffer_object
-
-static void _glewInfo_GL_ARB_shader_storage_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_shader_storage_buffer_object", GLEW_ARB_shader_storage_buffer_object, glewIsSupported("GL_ARB_shader_storage_buffer_object"), glewGetExtension("GL_ARB_shader_storage_buffer_object"));
-
-  glewInfoFunc("glShaderStorageBlockBinding", glShaderStorageBlockBinding == NULL);
-}
-
-#endif /* GL_ARB_shader_storage_buffer_object */
-
-#ifdef GL_ARB_shader_subroutine
-
-static void _glewInfo_GL_ARB_shader_subroutine (void)
-{
-  glewPrintExt("GL_ARB_shader_subroutine", GLEW_ARB_shader_subroutine, glewIsSupported("GL_ARB_shader_subroutine"), glewGetExtension("GL_ARB_shader_subroutine"));
-
-  glewInfoFunc("glGetActiveSubroutineName", glGetActiveSubroutineName == NULL);
-  glewInfoFunc("glGetActiveSubroutineUniformName", glGetActiveSubroutineUniformName == NULL);
-  glewInfoFunc("glGetActiveSubroutineUniformiv", glGetActiveSubroutineUniformiv == NULL);
-  glewInfoFunc("glGetProgramStageiv", glGetProgramStageiv == NULL);
-  glewInfoFunc("glGetSubroutineIndex", glGetSubroutineIndex == NULL);
-  glewInfoFunc("glGetSubroutineUniformLocation", glGetSubroutineUniformLocation == NULL);
-  glewInfoFunc("glGetUniformSubroutineuiv", glGetUniformSubroutineuiv == NULL);
-  glewInfoFunc("glUniformSubroutinesuiv", glUniformSubroutinesuiv == NULL);
-}
-
-#endif /* GL_ARB_shader_subroutine */
-
-#ifdef GL_ARB_shader_texture_lod
-
-static void _glewInfo_GL_ARB_shader_texture_lod (void)
-{
-  glewPrintExt("GL_ARB_shader_texture_lod", GLEW_ARB_shader_texture_lod, glewIsSupported("GL_ARB_shader_texture_lod"), glewGetExtension("GL_ARB_shader_texture_lod"));
-}
-
-#endif /* GL_ARB_shader_texture_lod */
-
-#ifdef GL_ARB_shading_language_100
-
-static void _glewInfo_GL_ARB_shading_language_100 (void)
-{
-  glewPrintExt("GL_ARB_shading_language_100", GLEW_ARB_shading_language_100, glewIsSupported("GL_ARB_shading_language_100"), glewGetExtension("GL_ARB_shading_language_100"));
-}
-
-#endif /* GL_ARB_shading_language_100 */
-
-#ifdef GL_ARB_shading_language_420pack
-
-static void _glewInfo_GL_ARB_shading_language_420pack (void)
-{
-  glewPrintExt("GL_ARB_shading_language_420pack", GLEW_ARB_shading_language_420pack, glewIsSupported("GL_ARB_shading_language_420pack"), glewGetExtension("GL_ARB_shading_language_420pack"));
-}
-
-#endif /* GL_ARB_shading_language_420pack */
-
-#ifdef GL_ARB_shading_language_include
-
-static void _glewInfo_GL_ARB_shading_language_include (void)
-{
-  glewPrintExt("GL_ARB_shading_language_include", GLEW_ARB_shading_language_include, glewIsSupported("GL_ARB_shading_language_include"), glewGetExtension("GL_ARB_shading_language_include"));
-
-  glewInfoFunc("glCompileShaderIncludeARB", glCompileShaderIncludeARB == NULL);
-  glewInfoFunc("glDeleteNamedStringARB", glDeleteNamedStringARB == NULL);
-  glewInfoFunc("glGetNamedStringARB", glGetNamedStringARB == NULL);
-  glewInfoFunc("glGetNamedStringivARB", glGetNamedStringivARB == NULL);
-  glewInfoFunc("glIsNamedStringARB", glIsNamedStringARB == NULL);
-  glewInfoFunc("glNamedStringARB", glNamedStringARB == NULL);
-}
-
-#endif /* GL_ARB_shading_language_include */
-
-#ifdef GL_ARB_shading_language_packing
-
-static void _glewInfo_GL_ARB_shading_language_packing (void)
-{
-  glewPrintExt("GL_ARB_shading_language_packing", GLEW_ARB_shading_language_packing, glewIsSupported("GL_ARB_shading_language_packing"), glewGetExtension("GL_ARB_shading_language_packing"));
-}
-
-#endif /* GL_ARB_shading_language_packing */
-
-#ifdef GL_ARB_shadow
-
-static void _glewInfo_GL_ARB_shadow (void)
-{
-  glewPrintExt("GL_ARB_shadow", GLEW_ARB_shadow, glewIsSupported("GL_ARB_shadow"), glewGetExtension("GL_ARB_shadow"));
-}
-
-#endif /* GL_ARB_shadow */
-
-#ifdef GL_ARB_shadow_ambient
-
-static void _glewInfo_GL_ARB_shadow_ambient (void)
-{
-  glewPrintExt("GL_ARB_shadow_ambient", GLEW_ARB_shadow_ambient, glewIsSupported("GL_ARB_shadow_ambient"), glewGetExtension("GL_ARB_shadow_ambient"));
-}
-
-#endif /* GL_ARB_shadow_ambient */
-
-#ifdef GL_ARB_stencil_texturing
-
-static void _glewInfo_GL_ARB_stencil_texturing (void)
-{
-  glewPrintExt("GL_ARB_stencil_texturing", GLEW_ARB_stencil_texturing, glewIsSupported("GL_ARB_stencil_texturing"), glewGetExtension("GL_ARB_stencil_texturing"));
-}
-
-#endif /* GL_ARB_stencil_texturing */
-
-#ifdef GL_ARB_sync
-
-static void _glewInfo_GL_ARB_sync (void)
-{
-  glewPrintExt("GL_ARB_sync", GLEW_ARB_sync, glewIsSupported("GL_ARB_sync"), glewGetExtension("GL_ARB_sync"));
-
-  glewInfoFunc("glClientWaitSync", glClientWaitSync == NULL);
-  glewInfoFunc("glDeleteSync", glDeleteSync == NULL);
-  glewInfoFunc("glFenceSync", glFenceSync == NULL);
-  glewInfoFunc("glGetInteger64v", glGetInteger64v == NULL);
-  glewInfoFunc("glGetSynciv", glGetSynciv == NULL);
-  glewInfoFunc("glIsSync", glIsSync == NULL);
-  glewInfoFunc("glWaitSync", glWaitSync == NULL);
-}
-
-#endif /* GL_ARB_sync */
-
-#ifdef GL_ARB_tessellation_shader
-
-static void _glewInfo_GL_ARB_tessellation_shader (void)
-{
-  glewPrintExt("GL_ARB_tessellation_shader", GLEW_ARB_tessellation_shader, glewIsSupported("GL_ARB_tessellation_shader"), glewGetExtension("GL_ARB_tessellation_shader"));
-
-  glewInfoFunc("glPatchParameterfv", glPatchParameterfv == NULL);
-  glewInfoFunc("glPatchParameteri", glPatchParameteri == NULL);
-}
-
-#endif /* GL_ARB_tessellation_shader */
-
-#ifdef GL_ARB_texture_border_clamp
-
-static void _glewInfo_GL_ARB_texture_border_clamp (void)
-{
-  glewPrintExt("GL_ARB_texture_border_clamp", GLEW_ARB_texture_border_clamp, glewIsSupported("GL_ARB_texture_border_clamp"), glewGetExtension("GL_ARB_texture_border_clamp"));
-}
-
-#endif /* GL_ARB_texture_border_clamp */
-
-#ifdef GL_ARB_texture_buffer_object
-
-static void _glewInfo_GL_ARB_texture_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_texture_buffer_object", GLEW_ARB_texture_buffer_object, glewIsSupported("GL_ARB_texture_buffer_object"), glewGetExtension("GL_ARB_texture_buffer_object"));
-
-  glewInfoFunc("glTexBufferARB", glTexBufferARB == NULL);
-}
-
-#endif /* GL_ARB_texture_buffer_object */
-
-#ifdef GL_ARB_texture_buffer_object_rgb32
-
-static void _glewInfo_GL_ARB_texture_buffer_object_rgb32 (void)
-{
-  glewPrintExt("GL_ARB_texture_buffer_object_rgb32", GLEW_ARB_texture_buffer_object_rgb32, glewIsSupported("GL_ARB_texture_buffer_object_rgb32"), glewGetExtension("GL_ARB_texture_buffer_object_rgb32"));
-}
-
-#endif /* GL_ARB_texture_buffer_object_rgb32 */
-
-#ifdef GL_ARB_texture_buffer_range
-
-static void _glewInfo_GL_ARB_texture_buffer_range (void)
-{
-  glewPrintExt("GL_ARB_texture_buffer_range", GLEW_ARB_texture_buffer_range, glewIsSupported("GL_ARB_texture_buffer_range"), glewGetExtension("GL_ARB_texture_buffer_range"));
-
-  glewInfoFunc("glTexBufferRange", glTexBufferRange == NULL);
-  glewInfoFunc("glTextureBufferRangeEXT", glTextureBufferRangeEXT == NULL);
-}
-
-#endif /* GL_ARB_texture_buffer_range */
-
-#ifdef GL_ARB_texture_compression
-
-static void _glewInfo_GL_ARB_texture_compression (void)
-{
-  glewPrintExt("GL_ARB_texture_compression", GLEW_ARB_texture_compression, glewIsSupported("GL_ARB_texture_compression"), glewGetExtension("GL_ARB_texture_compression"));
-
-  glewInfoFunc("glCompressedTexImage1DARB", glCompressedTexImage1DARB == NULL);
-  glewInfoFunc("glCompressedTexImage2DARB", glCompressedTexImage2DARB == NULL);
-  glewInfoFunc("glCompressedTexImage3DARB", glCompressedTexImage3DARB == NULL);
-  glewInfoFunc("glCompressedTexSubImage1DARB", glCompressedTexSubImage1DARB == NULL);
-  glewInfoFunc("glCompressedTexSubImage2DARB", glCompressedTexSubImage2DARB == NULL);
-  glewInfoFunc("glCompressedTexSubImage3DARB", glCompressedTexSubImage3DARB == NULL);
-  glewInfoFunc("glGetCompressedTexImageARB", glGetCompressedTexImageARB == NULL);
-}
-
-#endif /* GL_ARB_texture_compression */
-
-#ifdef GL_ARB_texture_compression_bptc
-
-static void _glewInfo_GL_ARB_texture_compression_bptc (void)
-{
-  glewPrintExt("GL_ARB_texture_compression_bptc", GLEW_ARB_texture_compression_bptc, glewIsSupported("GL_ARB_texture_compression_bptc"), glewGetExtension("GL_ARB_texture_compression_bptc"));
-}
-
-#endif /* GL_ARB_texture_compression_bptc */
-
-#ifdef GL_ARB_texture_compression_rgtc
-
-static void _glewInfo_GL_ARB_texture_compression_rgtc (void)
-{
-  glewPrintExt("GL_ARB_texture_compression_rgtc", GLEW_ARB_texture_compression_rgtc, glewIsSupported("GL_ARB_texture_compression_rgtc"), glewGetExtension("GL_ARB_texture_compression_rgtc"));
-}
-
-#endif /* GL_ARB_texture_compression_rgtc */
-
-#ifdef GL_ARB_texture_cube_map
-
-static void _glewInfo_GL_ARB_texture_cube_map (void)
-{
-  glewPrintExt("GL_ARB_texture_cube_map", GLEW_ARB_texture_cube_map, glewIsSupported("GL_ARB_texture_cube_map"), glewGetExtension("GL_ARB_texture_cube_map"));
-}
-
-#endif /* GL_ARB_texture_cube_map */
-
-#ifdef GL_ARB_texture_cube_map_array
-
-static void _glewInfo_GL_ARB_texture_cube_map_array (void)
-{
-  glewPrintExt("GL_ARB_texture_cube_map_array", GLEW_ARB_texture_cube_map_array, glewIsSupported("GL_ARB_texture_cube_map_array"), glewGetExtension("GL_ARB_texture_cube_map_array"));
-}
-
-#endif /* GL_ARB_texture_cube_map_array */
-
-#ifdef GL_ARB_texture_env_add
-
-static void _glewInfo_GL_ARB_texture_env_add (void)
-{
-  glewPrintExt("GL_ARB_texture_env_add", GLEW_ARB_texture_env_add, glewIsSupported("GL_ARB_texture_env_add"), glewGetExtension("GL_ARB_texture_env_add"));
-}
-
-#endif /* GL_ARB_texture_env_add */
-
-#ifdef GL_ARB_texture_env_combine
-
-static void _glewInfo_GL_ARB_texture_env_combine (void)
-{
-  glewPrintExt("GL_ARB_texture_env_combine", GLEW_ARB_texture_env_combine, glewIsSupported("GL_ARB_texture_env_combine"), glewGetExtension("GL_ARB_texture_env_combine"));
-}
-
-#endif /* GL_ARB_texture_env_combine */
-
-#ifdef GL_ARB_texture_env_crossbar
-
-static void _glewInfo_GL_ARB_texture_env_crossbar (void)
-{
-  glewPrintExt("GL_ARB_texture_env_crossbar", GLEW_ARB_texture_env_crossbar, glewIsSupported("GL_ARB_texture_env_crossbar"), glewGetExtension("GL_ARB_texture_env_crossbar"));
-}
-
-#endif /* GL_ARB_texture_env_crossbar */
-
-#ifdef GL_ARB_texture_env_dot3
-
-static void _glewInfo_GL_ARB_texture_env_dot3 (void)
-{
-  glewPrintExt("GL_ARB_texture_env_dot3", GLEW_ARB_texture_env_dot3, glewIsSupported("GL_ARB_texture_env_dot3"), glewGetExtension("GL_ARB_texture_env_dot3"));
-}
-
-#endif /* GL_ARB_texture_env_dot3 */
-
-#ifdef GL_ARB_texture_float
-
-static void _glewInfo_GL_ARB_texture_float (void)
-{
-  glewPrintExt("GL_ARB_texture_float", GLEW_ARB_texture_float, glewIsSupported("GL_ARB_texture_float"), glewGetExtension("GL_ARB_texture_float"));
-}
-
-#endif /* GL_ARB_texture_float */
-
-#ifdef GL_ARB_texture_gather
-
-static void _glewInfo_GL_ARB_texture_gather (void)
-{
-  glewPrintExt("GL_ARB_texture_gather", GLEW_ARB_texture_gather, glewIsSupported("GL_ARB_texture_gather"), glewGetExtension("GL_ARB_texture_gather"));
-}
-
-#endif /* GL_ARB_texture_gather */
-
-#ifdef GL_ARB_texture_mirrored_repeat
-
-static void _glewInfo_GL_ARB_texture_mirrored_repeat (void)
-{
-  glewPrintExt("GL_ARB_texture_mirrored_repeat", GLEW_ARB_texture_mirrored_repeat, glewIsSupported("GL_ARB_texture_mirrored_repeat"), glewGetExtension("GL_ARB_texture_mirrored_repeat"));
-}
-
-#endif /* GL_ARB_texture_mirrored_repeat */
-
-#ifdef GL_ARB_texture_multisample
-
-static void _glewInfo_GL_ARB_texture_multisample (void)
-{
-  glewPrintExt("GL_ARB_texture_multisample", GLEW_ARB_texture_multisample, glewIsSupported("GL_ARB_texture_multisample"), glewGetExtension("GL_ARB_texture_multisample"));
-
-  glewInfoFunc("glGetMultisamplefv", glGetMultisamplefv == NULL);
-  glewInfoFunc("glSampleMaski", glSampleMaski == NULL);
-  glewInfoFunc("glTexImage2DMultisample", glTexImage2DMultisample == NULL);
-  glewInfoFunc("glTexImage3DMultisample", glTexImage3DMultisample == NULL);
-}
-
-#endif /* GL_ARB_texture_multisample */
-
-#ifdef GL_ARB_texture_non_power_of_two
-
-static void _glewInfo_GL_ARB_texture_non_power_of_two (void)
-{
-  glewPrintExt("GL_ARB_texture_non_power_of_two", GLEW_ARB_texture_non_power_of_two, glewIsSupported("GL_ARB_texture_non_power_of_two"), glewGetExtension("GL_ARB_texture_non_power_of_two"));
-}
-
-#endif /* GL_ARB_texture_non_power_of_two */
-
-#ifdef GL_ARB_texture_query_levels
-
-static void _glewInfo_GL_ARB_texture_query_levels (void)
-{
-  glewPrintExt("GL_ARB_texture_query_levels", GLEW_ARB_texture_query_levels, glewIsSupported("GL_ARB_texture_query_levels"), glewGetExtension("GL_ARB_texture_query_levels"));
-}
-
-#endif /* GL_ARB_texture_query_levels */
-
-#ifdef GL_ARB_texture_query_lod
-
-static void _glewInfo_GL_ARB_texture_query_lod (void)
-{
-  glewPrintExt("GL_ARB_texture_query_lod", GLEW_ARB_texture_query_lod, glewIsSupported("GL_ARB_texture_query_lod"), glewGetExtension("GL_ARB_texture_query_lod"));
-}
-
-#endif /* GL_ARB_texture_query_lod */
-
-#ifdef GL_ARB_texture_rectangle
-
-static void _glewInfo_GL_ARB_texture_rectangle (void)
-{
-  glewPrintExt("GL_ARB_texture_rectangle", GLEW_ARB_texture_rectangle, glewIsSupported("GL_ARB_texture_rectangle"), glewGetExtension("GL_ARB_texture_rectangle"));
-}
-
-#endif /* GL_ARB_texture_rectangle */
-
-#ifdef GL_ARB_texture_rg
-
-static void _glewInfo_GL_ARB_texture_rg (void)
-{
-  glewPrintExt("GL_ARB_texture_rg", GLEW_ARB_texture_rg, glewIsSupported("GL_ARB_texture_rg"), glewGetExtension("GL_ARB_texture_rg"));
-}
-
-#endif /* GL_ARB_texture_rg */
-
-#ifdef GL_ARB_texture_rgb10_a2ui
-
-static void _glewInfo_GL_ARB_texture_rgb10_a2ui (void)
-{
-  glewPrintExt("GL_ARB_texture_rgb10_a2ui", GLEW_ARB_texture_rgb10_a2ui, glewIsSupported("GL_ARB_texture_rgb10_a2ui"), glewGetExtension("GL_ARB_texture_rgb10_a2ui"));
-}
-
-#endif /* GL_ARB_texture_rgb10_a2ui */
-
-#ifdef GL_ARB_texture_storage
-
-static void _glewInfo_GL_ARB_texture_storage (void)
-{
-  glewPrintExt("GL_ARB_texture_storage", GLEW_ARB_texture_storage, glewIsSupported("GL_ARB_texture_storage"), glewGetExtension("GL_ARB_texture_storage"));
-
-  glewInfoFunc("glTexStorage1D", glTexStorage1D == NULL);
-  glewInfoFunc("glTexStorage2D", glTexStorage2D == NULL);
-  glewInfoFunc("glTexStorage3D", glTexStorage3D == NULL);
-  glewInfoFunc("glTextureStorage1DEXT", glTextureStorage1DEXT == NULL);
-  glewInfoFunc("glTextureStorage2DEXT", glTextureStorage2DEXT == NULL);
-  glewInfoFunc("glTextureStorage3DEXT", glTextureStorage3DEXT == NULL);
-}
-
-#endif /* GL_ARB_texture_storage */
-
-#ifdef GL_ARB_texture_storage_multisample
-
-static void _glewInfo_GL_ARB_texture_storage_multisample (void)
-{
-  glewPrintExt("GL_ARB_texture_storage_multisample", GLEW_ARB_texture_storage_multisample, glewIsSupported("GL_ARB_texture_storage_multisample"), glewGetExtension("GL_ARB_texture_storage_multisample"));
-
-  glewInfoFunc("glTexStorage2DMultisample", glTexStorage2DMultisample == NULL);
-  glewInfoFunc("glTexStorage3DMultisample", glTexStorage3DMultisample == NULL);
-  glewInfoFunc("glTextureStorage2DMultisampleEXT", glTextureStorage2DMultisampleEXT == NULL);
-  glewInfoFunc("glTextureStorage3DMultisampleEXT", glTextureStorage3DMultisampleEXT == NULL);
-}
-
-#endif /* GL_ARB_texture_storage_multisample */
-
-#ifdef GL_ARB_texture_swizzle
-
-static void _glewInfo_GL_ARB_texture_swizzle (void)
-{
-  glewPrintExt("GL_ARB_texture_swizzle", GLEW_ARB_texture_swizzle, glewIsSupported("GL_ARB_texture_swizzle"), glewGetExtension("GL_ARB_texture_swizzle"));
-}
-
-#endif /* GL_ARB_texture_swizzle */
-
-#ifdef GL_ARB_texture_view
-
-static void _glewInfo_GL_ARB_texture_view (void)
-{
-  glewPrintExt("GL_ARB_texture_view", GLEW_ARB_texture_view, glewIsSupported("GL_ARB_texture_view"), glewGetExtension("GL_ARB_texture_view"));
-
-  glewInfoFunc("glTextureView", glTextureView == NULL);
-}
-
-#endif /* GL_ARB_texture_view */
-
-#ifdef GL_ARB_timer_query
-
-static void _glewInfo_GL_ARB_timer_query (void)
-{
-  glewPrintExt("GL_ARB_timer_query", GLEW_ARB_timer_query, glewIsSupported("GL_ARB_timer_query"), glewGetExtension("GL_ARB_timer_query"));
-
-  glewInfoFunc("glGetQueryObjecti64v", glGetQueryObjecti64v == NULL);
-  glewInfoFunc("glGetQueryObjectui64v", glGetQueryObjectui64v == NULL);
-  glewInfoFunc("glQueryCounter", glQueryCounter == NULL);
-}
-
-#endif /* GL_ARB_timer_query */
-
-#ifdef GL_ARB_transform_feedback2
-
-static void _glewInfo_GL_ARB_transform_feedback2 (void)
-{
-  glewPrintExt("GL_ARB_transform_feedback2", GLEW_ARB_transform_feedback2, glewIsSupported("GL_ARB_transform_feedback2"), glewGetExtension("GL_ARB_transform_feedback2"));
-
-  glewInfoFunc("glBindTransformFeedback", glBindTransformFeedback == NULL);
-  glewInfoFunc("glDeleteTransformFeedbacks", glDeleteTransformFeedbacks == NULL);
-  glewInfoFunc("glDrawTransformFeedback", glDrawTransformFeedback == NULL);
-  glewInfoFunc("glGenTransformFeedbacks", glGenTransformFeedbacks == NULL);
-  glewInfoFunc("glIsTransformFeedback", glIsTransformFeedback == NULL);
-  glewInfoFunc("glPauseTransformFeedback", glPauseTransformFeedback == NULL);
-  glewInfoFunc("glResumeTransformFeedback", glResumeTransformFeedback == NULL);
-}
-
-#endif /* GL_ARB_transform_feedback2 */
-
-#ifdef GL_ARB_transform_feedback3
-
-static void _glewInfo_GL_ARB_transform_feedback3 (void)
-{
-  glewPrintExt("GL_ARB_transform_feedback3", GLEW_ARB_transform_feedback3, glewIsSupported("GL_ARB_transform_feedback3"), glewGetExtension("GL_ARB_transform_feedback3"));
-
-  glewInfoFunc("glBeginQueryIndexed", glBeginQueryIndexed == NULL);
-  glewInfoFunc("glDrawTransformFeedbackStream", glDrawTransformFeedbackStream == NULL);
-  glewInfoFunc("glEndQueryIndexed", glEndQueryIndexed == NULL);
-  glewInfoFunc("glGetQueryIndexediv", glGetQueryIndexediv == NULL);
-}
-
-#endif /* GL_ARB_transform_feedback3 */
-
-#ifdef GL_ARB_transform_feedback_instanced
-
-static void _glewInfo_GL_ARB_transform_feedback_instanced (void)
-{
-  glewPrintExt("GL_ARB_transform_feedback_instanced", GLEW_ARB_transform_feedback_instanced, glewIsSupported("GL_ARB_transform_feedback_instanced"), glewGetExtension("GL_ARB_transform_feedback_instanced"));
-
-  glewInfoFunc("glDrawTransformFeedbackInstanced", glDrawTransformFeedbackInstanced == NULL);
-  glewInfoFunc("glDrawTransformFeedbackStreamInstanced", glDrawTransformFeedbackStreamInstanced == NULL);
-}
-
-#endif /* GL_ARB_transform_feedback_instanced */
-
-#ifdef GL_ARB_transpose_matrix
-
-static void _glewInfo_GL_ARB_transpose_matrix (void)
-{
-  glewPrintExt("GL_ARB_transpose_matrix", GLEW_ARB_transpose_matrix, glewIsSupported("GL_ARB_transpose_matrix"), glewGetExtension("GL_ARB_transpose_matrix"));
-
-  glewInfoFunc("glLoadTransposeMatrixdARB", glLoadTransposeMatrixdARB == NULL);
-  glewInfoFunc("glLoadTransposeMatrixfARB", glLoadTransposeMatrixfARB == NULL);
-  glewInfoFunc("glMultTransposeMatrixdARB", glMultTransposeMatrixdARB == NULL);
-  glewInfoFunc("glMultTransposeMatrixfARB", glMultTransposeMatrixfARB == NULL);
-}
-
-#endif /* GL_ARB_transpose_matrix */
-
-#ifdef GL_ARB_uniform_buffer_object
-
-static void _glewInfo_GL_ARB_uniform_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_uniform_buffer_object", GLEW_ARB_uniform_buffer_object, glewIsSupported("GL_ARB_uniform_buffer_object"), glewGetExtension("GL_ARB_uniform_buffer_object"));
-
-  glewInfoFunc("glBindBufferBase", glBindBufferBase == NULL);
-  glewInfoFunc("glBindBufferRange", glBindBufferRange == NULL);
-  glewInfoFunc("glGetActiveUniformBlockName", glGetActiveUniformBlockName == NULL);
-  glewInfoFunc("glGetActiveUniformBlockiv", glGetActiveUniformBlockiv == NULL);
-  glewInfoFunc("glGetActiveUniformName", glGetActiveUniformName == NULL);
-  glewInfoFunc("glGetActiveUniformsiv", glGetActiveUniformsiv == NULL);
-  glewInfoFunc("glGetIntegeri_v", glGetIntegeri_v == NULL);
-  glewInfoFunc("glGetUniformBlockIndex", glGetUniformBlockIndex == NULL);
-  glewInfoFunc("glGetUniformIndices", glGetUniformIndices == NULL);
-  glewInfoFunc("glUniformBlockBinding", glUniformBlockBinding == NULL);
-}
-
-#endif /* GL_ARB_uniform_buffer_object */
-
-#ifdef GL_ARB_vertex_array_bgra
-
-static void _glewInfo_GL_ARB_vertex_array_bgra (void)
-{
-  glewPrintExt("GL_ARB_vertex_array_bgra", GLEW_ARB_vertex_array_bgra, glewIsSupported("GL_ARB_vertex_array_bgra"), glewGetExtension("GL_ARB_vertex_array_bgra"));
-}
-
-#endif /* GL_ARB_vertex_array_bgra */
-
-#ifdef GL_ARB_vertex_array_object
-
-static void _glewInfo_GL_ARB_vertex_array_object (void)
-{
-  glewPrintExt("GL_ARB_vertex_array_object", GLEW_ARB_vertex_array_object, glewIsSupported("GL_ARB_vertex_array_object"), glewGetExtension("GL_ARB_vertex_array_object"));
-
-  glewInfoFunc("glBindVertexArray", glBindVertexArray == NULL);
-  glewInfoFunc("glDeleteVertexArrays", glDeleteVertexArrays == NULL);
-  glewInfoFunc("glGenVertexArrays", glGenVertexArrays == NULL);
-  glewInfoFunc("glIsVertexArray", glIsVertexArray == NULL);
-}
-
-#endif /* GL_ARB_vertex_array_object */
-
-#ifdef GL_ARB_vertex_attrib_64bit
-
-static void _glewInfo_GL_ARB_vertex_attrib_64bit (void)
-{
-  glewPrintExt("GL_ARB_vertex_attrib_64bit", GLEW_ARB_vertex_attrib_64bit, glewIsSupported("GL_ARB_vertex_attrib_64bit"), glewGetExtension("GL_ARB_vertex_attrib_64bit"));
-
-  glewInfoFunc("glGetVertexAttribLdv", glGetVertexAttribLdv == NULL);
-  glewInfoFunc("glVertexAttribL1d", glVertexAttribL1d == NULL);
-  glewInfoFunc("glVertexAttribL1dv", glVertexAttribL1dv == NULL);
-  glewInfoFunc("glVertexAttribL2d", glVertexAttribL2d == NULL);
-  glewInfoFunc("glVertexAttribL2dv", glVertexAttribL2dv == NULL);
-  glewInfoFunc("glVertexAttribL3d", glVertexAttribL3d == NULL);
-  glewInfoFunc("glVertexAttribL3dv", glVertexAttribL3dv == NULL);
-  glewInfoFunc("glVertexAttribL4d", glVertexAttribL4d == NULL);
-  glewInfoFunc("glVertexAttribL4dv", glVertexAttribL4dv == NULL);
-  glewInfoFunc("glVertexAttribLPointer", glVertexAttribLPointer == NULL);
-}
-
-#endif /* GL_ARB_vertex_attrib_64bit */
-
-#ifdef GL_ARB_vertex_attrib_binding
-
-static void _glewInfo_GL_ARB_vertex_attrib_binding (void)
-{
-  glewPrintExt("GL_ARB_vertex_attrib_binding", GLEW_ARB_vertex_attrib_binding, glewIsSupported("GL_ARB_vertex_attrib_binding"), glewGetExtension("GL_ARB_vertex_attrib_binding"));
-
-  glewInfoFunc("glBindVertexBuffer", glBindVertexBuffer == NULL);
-  glewInfoFunc("glVertexAttribBinding", glVertexAttribBinding == NULL);
-  glewInfoFunc("glVertexAttribFormat", glVertexAttribFormat == NULL);
-  glewInfoFunc("glVertexAttribIFormat", glVertexAttribIFormat == NULL);
-  glewInfoFunc("glVertexAttribLFormat", glVertexAttribLFormat == NULL);
-  glewInfoFunc("glVertexBindingDivisor", glVertexBindingDivisor == NULL);
-}
-
-#endif /* GL_ARB_vertex_attrib_binding */
-
-#ifdef GL_ARB_vertex_blend
-
-static void _glewInfo_GL_ARB_vertex_blend (void)
-{
-  glewPrintExt("GL_ARB_vertex_blend", GLEW_ARB_vertex_blend, glewIsSupported("GL_ARB_vertex_blend"), glewGetExtension("GL_ARB_vertex_blend"));
-
-  glewInfoFunc("glVertexBlendARB", glVertexBlendARB == NULL);
-  glewInfoFunc("glWeightPointerARB", glWeightPointerARB == NULL);
-  glewInfoFunc("glWeightbvARB", glWeightbvARB == NULL);
-  glewInfoFunc("glWeightdvARB", glWeightdvARB == NULL);
-  glewInfoFunc("glWeightfvARB", glWeightfvARB == NULL);
-  glewInfoFunc("glWeightivARB", glWeightivARB == NULL);
-  glewInfoFunc("glWeightsvARB", glWeightsvARB == NULL);
-  glewInfoFunc("glWeightubvARB", glWeightubvARB == NULL);
-  glewInfoFunc("glWeightuivARB", glWeightuivARB == NULL);
-  glewInfoFunc("glWeightusvARB", glWeightusvARB == NULL);
-}
-
-#endif /* GL_ARB_vertex_blend */
-
-#ifdef GL_ARB_vertex_buffer_object
-
-static void _glewInfo_GL_ARB_vertex_buffer_object (void)
-{
-  glewPrintExt("GL_ARB_vertex_buffer_object", GLEW_ARB_vertex_buffer_object, glewIsSupported("GL_ARB_vertex_buffer_object"), glewGetExtension("GL_ARB_vertex_buffer_object"));
-
-  glewInfoFunc("glBindBufferARB", glBindBufferARB == NULL);
-  glewInfoFunc("glBufferDataARB", glBufferDataARB == NULL);
-  glewInfoFunc("glBufferSubDataARB", glBufferSubDataARB == NULL);
-  glewInfoFunc("glDeleteBuffersARB", glDeleteBuffersARB == NULL);
-  glewInfoFunc("glGenBuffersARB", glGenBuffersARB == NULL);
-  glewInfoFunc("glGetBufferParameterivARB", glGetBufferParameterivARB == NULL);
-  glewInfoFunc("glGetBufferPointervARB", glGetBufferPointervARB == NULL);
-  glewInfoFunc("glGetBufferSubDataARB", glGetBufferSubDataARB == NULL);
-  glewInfoFunc("glIsBufferARB", glIsBufferARB == NULL);
-  glewInfoFunc("glMapBufferARB", glMapBufferARB == NULL);
-  glewInfoFunc("glUnmapBufferARB", glUnmapBufferARB == NULL);
-}
-
-#endif /* GL_ARB_vertex_buffer_object */
-
-#ifdef GL_ARB_vertex_program
-
-static void _glewInfo_GL_ARB_vertex_program (void)
-{
-  glewPrintExt("GL_ARB_vertex_program", GLEW_ARB_vertex_program, glewIsSupported("GL_ARB_vertex_program"), glewGetExtension("GL_ARB_vertex_program"));
-
-  glewInfoFunc("glBindProgramARB", glBindProgramARB == NULL);
-  glewInfoFunc("glDeleteProgramsARB", glDeleteProgramsARB == NULL);
-  glewInfoFunc("glDisableVertexAttribArrayARB", glDisableVertexAttribArrayARB == NULL);
-  glewInfoFunc("glEnableVertexAttribArrayARB", glEnableVertexAttribArrayARB == NULL);
-  glewInfoFunc("glGenProgramsARB", glGenProgramsARB == NULL);
-  glewInfoFunc("glGetProgramEnvParameterdvARB", glGetProgramEnvParameterdvARB == NULL);
-  glewInfoFunc("glGetProgramEnvParameterfvARB", glGetProgramEnvParameterfvARB == NULL);
-  glewInfoFunc("glGetProgramLocalParameterdvARB", glGetProgramLocalParameterdvARB == NULL);
-  glewInfoFunc("glGetProgramLocalParameterfvARB", glGetProgramLocalParameterfvARB == NULL);
-  glewInfoFunc("glGetProgramStringARB", glGetProgramStringARB == NULL);
-  glewInfoFunc("glGetProgramivARB", glGetProgramivARB == NULL);
-  glewInfoFunc("glGetVertexAttribPointervARB", glGetVertexAttribPointervARB == NULL);
-  glewInfoFunc("glGetVertexAttribdvARB", glGetVertexAttribdvARB == NULL);
-  glewInfoFunc("glGetVertexAttribfvARB", glGetVertexAttribfvARB == NULL);
-  glewInfoFunc("glGetVertexAttribivARB", glGetVertexAttribivARB == NULL);
-  glewInfoFunc("glIsProgramARB", glIsProgramARB == NULL);
-  glewInfoFunc("glProgramEnvParameter4dARB", glProgramEnvParameter4dARB == NULL);
-  glewInfoFunc("glProgramEnvParameter4dvARB", glProgramEnvParameter4dvARB == NULL);
-  glewInfoFunc("glProgramEnvParameter4fARB", glProgramEnvParameter4fARB == NULL);
-  glewInfoFunc("glProgramEnvParameter4fvARB", glProgramEnvParameter4fvARB == NULL);
-  glewInfoFunc("glProgramLocalParameter4dARB", glProgramLocalParameter4dARB == NULL);
-  glewInfoFunc("glProgramLocalParameter4dvARB", glProgramLocalParameter4dvARB == NULL);
-  glewInfoFunc("glProgramLocalParameter4fARB", glProgramLocalParameter4fARB == NULL);
-  glewInfoFunc("glProgramLocalParameter4fvARB", glProgramLocalParameter4fvARB == NULL);
-  glewInfoFunc("glProgramStringARB", glProgramStringARB == NULL);
-  glewInfoFunc("glVertexAttrib1dARB", glVertexAttrib1dARB == NULL);
-  glewInfoFunc("glVertexAttrib1dvARB", glVertexAttrib1dvARB == NULL);
-  glewInfoFunc("glVertexAttrib1fARB", glVertexAttrib1fARB == NULL);
-  glewInfoFunc("glVertexAttrib1fvARB", glVertexAttrib1fvARB == NULL);
-  glewInfoFunc("glVertexAttrib1sARB", glVertexAttrib1sARB == NULL);
-  glewInfoFunc("glVertexAttrib1svARB", glVertexAttrib1svARB == NULL);
-  glewInfoFunc("glVertexAttrib2dARB", glVertexAttrib2dARB == NULL);
-  glewInfoFunc("glVertexAttrib2dvARB", glVertexAttrib2dvARB == NULL);
-  glewInfoFunc("glVertexAttrib2fARB", glVertexAttrib2fARB == NULL);
-  glewInfoFunc("glVertexAttrib2fvARB", glVertexAttrib2fvARB == NULL);
-  glewInfoFunc("glVertexAttrib2sARB", glVertexAttrib2sARB == NULL);
-  glewInfoFunc("glVertexAttrib2svARB", glVertexAttrib2svARB == NULL);
-  glewInfoFunc("glVertexAttrib3dARB", glVertexAttrib3dARB == NULL);
-  glewInfoFunc("glVertexAttrib3dvARB", glVertexAttrib3dvARB == NULL);
-  glewInfoFunc("glVertexAttrib3fARB", glVertexAttrib3fARB == NULL);
-  glewInfoFunc("glVertexAttrib3fvARB", glVertexAttrib3fvARB == NULL);
-  glewInfoFunc("glVertexAttrib3sARB", glVertexAttrib3sARB == NULL);
-  glewInfoFunc("glVertexAttrib3svARB", glVertexAttrib3svARB == NULL);
-  glewInfoFunc("glVertexAttrib4NbvARB", glVertexAttrib4NbvARB == NULL);
-  glewInfoFunc("glVertexAttrib4NivARB", glVertexAttrib4NivARB == NULL);
-  glewInfoFunc("glVertexAttrib4NsvARB", glVertexAttrib4NsvARB == NULL);
-  glewInfoFunc("glVertexAttrib4NubARB", glVertexAttrib4NubARB == NULL);
-  glewInfoFunc("glVertexAttrib4NubvARB", glVertexAttrib4NubvARB == NULL);
-  glewInfoFunc("glVertexAttrib4NuivARB", glVertexAttrib4NuivARB == NULL);
-  glewInfoFunc("glVertexAttrib4NusvARB", glVertexAttrib4NusvARB == NULL);
-  glewInfoFunc("glVertexAttrib4bvARB", glVertexAttrib4bvARB == NULL);
-  glewInfoFunc("glVertexAttrib4dARB", glVertexAttrib4dARB == NULL);
-  glewInfoFunc("glVertexAttrib4dvARB", glVertexAttrib4dvARB == NULL);
-  glewInfoFunc("glVertexAttrib4fARB", glVertexAttrib4fARB == NULL);
-  glewInfoFunc("glVertexAttrib4fvARB", glVertexAttrib4fvARB == NULL);
-  glewInfoFunc("glVertexAttrib4ivARB", glVertexAttrib4ivARB == NULL);
-  glewInfoFunc("glVertexAttrib4sARB", glVertexAttrib4sARB == NULL);
-  glewInfoFunc("glVertexAttrib4svARB", glVertexAttrib4svARB == NULL);
-  glewInfoFunc("glVertexAttrib4ubvARB", glVertexAttrib4ubvARB == NULL);
-  glewInfoFunc("glVertexAttrib4uivARB", glVertexAttrib4uivARB == NULL);
-  glewInfoFunc("glVertexAttrib4usvARB", glVertexAttrib4usvARB == NULL);
-  glewInfoFunc("glVertexAttribPointerARB", glVertexAttribPointerARB == NULL);
-}
-
-#endif /* GL_ARB_vertex_program */
-
-#ifdef GL_ARB_vertex_shader
-
-static void _glewInfo_GL_ARB_vertex_shader (void)
-{
-  glewPrintExt("GL_ARB_vertex_shader", GLEW_ARB_vertex_shader, glewIsSupported("GL_ARB_vertex_shader"), glewGetExtension("GL_ARB_vertex_shader"));
-
-  glewInfoFunc("glBindAttribLocationARB", glBindAttribLocationARB == NULL);
-  glewInfoFunc("glGetActiveAttribARB", glGetActiveAttribARB == NULL);
-  glewInfoFunc("glGetAttribLocationARB", glGetAttribLocationARB == NULL);
-}
-
-#endif /* GL_ARB_vertex_shader */
-
-#ifdef GL_ARB_vertex_type_2_10_10_10_rev
-
-static void _glewInfo_GL_ARB_vertex_type_2_10_10_10_rev (void)
-{
-  glewPrintExt("GL_ARB_vertex_type_2_10_10_10_rev", GLEW_ARB_vertex_type_2_10_10_10_rev, glewIsSupported("GL_ARB_vertex_type_2_10_10_10_rev"), glewGetExtension("GL_ARB_vertex_type_2_10_10_10_rev"));
-
-  glewInfoFunc("glColorP3ui", glColorP3ui == NULL);
-  glewInfoFunc("glColorP3uiv", glColorP3uiv == NULL);
-  glewInfoFunc("glColorP4ui", glColorP4ui == NULL);
-  glewInfoFunc("glColorP4uiv", glColorP4uiv == NULL);
-  glewInfoFunc("glMultiTexCoordP1ui", glMultiTexCoordP1ui == NULL);
-  glewInfoFunc("glMultiTexCoordP1uiv", glMultiTexCoordP1uiv == NULL);
-  glewInfoFunc("glMultiTexCoordP2ui", glMultiTexCoordP2ui == NULL);
-  glewInfoFunc("glMultiTexCoordP2uiv", glMultiTexCoordP2uiv == NULL);
-  glewInfoFunc("glMultiTexCoordP3ui", glMultiTexCoordP3ui == NULL);
-  glewInfoFunc("glMultiTexCoordP3uiv", glMultiTexCoordP3uiv == NULL);
-  glewInfoFunc("glMultiTexCoordP4ui", glMultiTexCoordP4ui == NULL);
-  glewInfoFunc("glMultiTexCoordP4uiv", glMultiTexCoordP4uiv == NULL);
-  glewInfoFunc("glNormalP3ui", glNormalP3ui == NULL);
-  glewInfoFunc("glNormalP3uiv", glNormalP3uiv == NULL);
-  glewInfoFunc("glSecondaryColorP3ui", glSecondaryColorP3ui == NULL);
-  glewInfoFunc("glSecondaryColorP3uiv", glSecondaryColorP3uiv == NULL);
-  glewInfoFunc("glTexCoordP1ui", glTexCoordP1ui == NULL);
-  glewInfoFunc("glTexCoordP1uiv", glTexCoordP1uiv == NULL);
-  glewInfoFunc("glTexCoordP2ui", glTexCoordP2ui == NULL);
-  glewInfoFunc("glTexCoordP2uiv", glTexCoordP2uiv == NULL);
-  glewInfoFunc("glTexCoordP3ui", glTexCoordP3ui == NULL);
-  glewInfoFunc("glTexCoordP3uiv", glTexCoordP3uiv == NULL);
-  glewInfoFunc("glTexCoordP4ui", glTexCoordP4ui == NULL);
-  glewInfoFunc("glTexCoordP4uiv", glTexCoordP4uiv == NULL);
-  glewInfoFunc("glVertexAttribP1ui", glVertexAttribP1ui == NULL);
-  glewInfoFunc("glVertexAttribP1uiv", glVertexAttribP1uiv == NULL);
-  glewInfoFunc("glVertexAttribP2ui", glVertexAttribP2ui == NULL);
-  glewInfoFunc("glVertexAttribP2uiv", glVertexAttribP2uiv == NULL);
-  glewInfoFunc("glVertexAttribP3ui", glVertexAttribP3ui == NULL);
-  glewInfoFunc("glVertexAttribP3uiv", glVertexAttribP3uiv == NULL);
-  glewInfoFunc("glVertexAttribP4ui", glVertexAttribP4ui == NULL);
-  glewInfoFunc("glVertexAttribP4uiv", glVertexAttribP4uiv == NULL);
-  glewInfoFunc("glVertexP2ui", glVertexP2ui == NULL);
-  glewInfoFunc("glVertexP2uiv", glVertexP2uiv == NULL);
-  glewInfoFunc("glVertexP3ui", glVertexP3ui == NULL);
-  glewInfoFunc("glVertexP3uiv", glVertexP3uiv == NULL);
-  glewInfoFunc("glVertexP4ui", glVertexP4ui == NULL);
-  glewInfoFunc("glVertexP4uiv", glVertexP4uiv == NULL);
-}
-
-#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
-
-#ifdef GL_ARB_viewport_array
-
-static void _glewInfo_GL_ARB_viewport_array (void)
-{
-  glewPrintExt("GL_ARB_viewport_array", GLEW_ARB_viewport_array, glewIsSupported("GL_ARB_viewport_array"), glewGetExtension("GL_ARB_viewport_array"));
-
-  glewInfoFunc("glDepthRangeArrayv", glDepthRangeArrayv == NULL);
-  glewInfoFunc("glDepthRangeIndexed", glDepthRangeIndexed == NULL);
-  glewInfoFunc("glGetDoublei_v", glGetDoublei_v == NULL);
-  glewInfoFunc("glGetFloati_v", glGetFloati_v == NULL);
-  glewInfoFunc("glScissorArrayv", glScissorArrayv == NULL);
-  glewInfoFunc("glScissorIndexed", glScissorIndexed == NULL);
-  glewInfoFunc("glScissorIndexedv", glScissorIndexedv == NULL);
-  glewInfoFunc("glViewportArrayv", glViewportArrayv == NULL);
-  glewInfoFunc("glViewportIndexedf", glViewportIndexedf == NULL);
-  glewInfoFunc("glViewportIndexedfv", glViewportIndexedfv == NULL);
-}
-
-#endif /* GL_ARB_viewport_array */
-
-#ifdef GL_ARB_window_pos
-
-static void _glewInfo_GL_ARB_window_pos (void)
-{
-  glewPrintExt("GL_ARB_window_pos", GLEW_ARB_window_pos, glewIsSupported("GL_ARB_window_pos"), glewGetExtension("GL_ARB_window_pos"));
-
-  glewInfoFunc("glWindowPos2dARB", glWindowPos2dARB == NULL);
-  glewInfoFunc("glWindowPos2dvARB", glWindowPos2dvARB == NULL);
-  glewInfoFunc("glWindowPos2fARB", glWindowPos2fARB == NULL);
-  glewInfoFunc("glWindowPos2fvARB", glWindowPos2fvARB == NULL);
-  glewInfoFunc("glWindowPos2iARB", glWindowPos2iARB == NULL);
-  glewInfoFunc("glWindowPos2ivARB", glWindowPos2ivARB == NULL);
-  glewInfoFunc("glWindowPos2sARB", glWindowPos2sARB == NULL);
-  glewInfoFunc("glWindowPos2svARB", glWindowPos2svARB == NULL);
-  glewInfoFunc("glWindowPos3dARB", glWindowPos3dARB == NULL);
-  glewInfoFunc("glWindowPos3dvARB", glWindowPos3dvARB == NULL);
-  glewInfoFunc("glWindowPos3fARB", glWindowPos3fARB == NULL);
-  glewInfoFunc("glWindowPos3fvARB", glWindowPos3fvARB == NULL);
-  glewInfoFunc("glWindowPos3iARB", glWindowPos3iARB == NULL);
-  glewInfoFunc("glWindowPos3ivARB", glWindowPos3ivARB == NULL);
-  glewInfoFunc("glWindowPos3sARB", glWindowPos3sARB == NULL);
-  glewInfoFunc("glWindowPos3svARB", glWindowPos3svARB == NULL);
-}
-
-#endif /* GL_ARB_window_pos */
-
-#ifdef GL_ATIX_point_sprites
-
-static void _glewInfo_GL_ATIX_point_sprites (void)
-{
-  glewPrintExt("GL_ATIX_point_sprites", GLEW_ATIX_point_sprites, glewIsSupported("GL_ATIX_point_sprites"), glewGetExtension("GL_ATIX_point_sprites"));
-}
-
-#endif /* GL_ATIX_point_sprites */
-
-#ifdef GL_ATIX_texture_env_combine3
-
-static void _glewInfo_GL_ATIX_texture_env_combine3 (void)
-{
-  glewPrintExt("GL_ATIX_texture_env_combine3", GLEW_ATIX_texture_env_combine3, glewIsSupported("GL_ATIX_texture_env_combine3"), glewGetExtension("GL_ATIX_texture_env_combine3"));
-}
-
-#endif /* GL_ATIX_texture_env_combine3 */
-
-#ifdef GL_ATIX_texture_env_route
-
-static void _glewInfo_GL_ATIX_texture_env_route (void)
-{
-  glewPrintExt("GL_ATIX_texture_env_route", GLEW_ATIX_texture_env_route, glewIsSupported("GL_ATIX_texture_env_route"), glewGetExtension("GL_ATIX_texture_env_route"));
-}
-
-#endif /* GL_ATIX_texture_env_route */
-
-#ifdef GL_ATIX_vertex_shader_output_point_size
-
-static void _glewInfo_GL_ATIX_vertex_shader_output_point_size (void)
-{
-  glewPrintExt("GL_ATIX_vertex_shader_output_point_size", GLEW_ATIX_vertex_shader_output_point_size, glewIsSupported("GL_ATIX_vertex_shader_output_point_size"), glewGetExtension("GL_ATIX_vertex_shader_output_point_size"));
-}
-
-#endif /* GL_ATIX_vertex_shader_output_point_size */
-
-#ifdef GL_ATI_draw_buffers
-
-static void _glewInfo_GL_ATI_draw_buffers (void)
-{
-  glewPrintExt("GL_ATI_draw_buffers", GLEW_ATI_draw_buffers, glewIsSupported("GL_ATI_draw_buffers"), glewGetExtension("GL_ATI_draw_buffers"));
-
-  glewInfoFunc("glDrawBuffersATI", glDrawBuffersATI == NULL);
-}
-
-#endif /* GL_ATI_draw_buffers */
-
-#ifdef GL_ATI_element_array
-
-static void _glewInfo_GL_ATI_element_array (void)
-{
-  glewPrintExt("GL_ATI_element_array", GLEW_ATI_element_array, glewIsSupported("GL_ATI_element_array"), glewGetExtension("GL_ATI_element_array"));
-
-  glewInfoFunc("glDrawElementArrayATI", glDrawElementArrayATI == NULL);
-  glewInfoFunc("glDrawRangeElementArrayATI", glDrawRangeElementArrayATI == NULL);
-  glewInfoFunc("glElementPointerATI", glElementPointerATI == NULL);
-}
-
-#endif /* GL_ATI_element_array */
-
-#ifdef GL_ATI_envmap_bumpmap
-
-static void _glewInfo_GL_ATI_envmap_bumpmap (void)
-{
-  glewPrintExt("GL_ATI_envmap_bumpmap", GLEW_ATI_envmap_bumpmap, glewIsSupported("GL_ATI_envmap_bumpmap"), glewGetExtension("GL_ATI_envmap_bumpmap"));
-
-  glewInfoFunc("glGetTexBumpParameterfvATI", glGetTexBumpParameterfvATI == NULL);
-  glewInfoFunc("glGetTexBumpParameterivATI", glGetTexBumpParameterivATI == NULL);
-  glewInfoFunc("glTexBumpParameterfvATI", glTexBumpParameterfvATI == NULL);
-  glewInfoFunc("glTexBumpParameterivATI", glTexBumpParameterivATI == NULL);
-}
-
-#endif /* GL_ATI_envmap_bumpmap */
-
-#ifdef GL_ATI_fragment_shader
-
-static void _glewInfo_GL_ATI_fragment_shader (void)
-{
-  glewPrintExt("GL_ATI_fragment_shader", GLEW_ATI_fragment_shader, glewIsSupported("GL_ATI_fragment_shader"), glewGetExtension("GL_ATI_fragment_shader"));
-
-  glewInfoFunc("glAlphaFragmentOp1ATI", glAlphaFragmentOp1ATI == NULL);
-  glewInfoFunc("glAlphaFragmentOp2ATI", glAlphaFragmentOp2ATI == NULL);
-  glewInfoFunc("glAlphaFragmentOp3ATI", glAlphaFragmentOp3ATI == NULL);
-  glewInfoFunc("glBeginFragmentShaderATI", glBeginFragmentShaderATI == NULL);
-  glewInfoFunc("glBindFragmentShaderATI", glBindFragmentShaderATI == NULL);
-  glewInfoFunc("glColorFragmentOp1ATI", glColorFragmentOp1ATI == NULL);
-  glewInfoFunc("glColorFragmentOp2ATI", glColorFragmentOp2ATI == NULL);
-  glewInfoFunc("glColorFragmentOp3ATI", glColorFragmentOp3ATI == NULL);
-  glewInfoFunc("glDeleteFragmentShaderATI", glDeleteFragmentShaderATI == NULL);
-  glewInfoFunc("glEndFragmentShaderATI", glEndFragmentShaderATI == NULL);
-  glewInfoFunc("glGenFragmentShadersATI", glGenFragmentShadersATI == NULL);
-  glewInfoFunc("glPassTexCoordATI", glPassTexCoordATI == NULL);
-  glewInfoFunc("glSampleMapATI", glSampleMapATI == NULL);
-  glewInfoFunc("glSetFragmentShaderConstantATI", glSetFragmentShaderConstantATI == NULL);
-}
-
-#endif /* GL_ATI_fragment_shader */
-
-#ifdef GL_ATI_map_object_buffer
-
-static void _glewInfo_GL_ATI_map_object_buffer (void)
-{
-  glewPrintExt("GL_ATI_map_object_buffer", GLEW_ATI_map_object_buffer, glewIsSupported("GL_ATI_map_object_buffer"), glewGetExtension("GL_ATI_map_object_buffer"));
-
-  glewInfoFunc("glMapObjectBufferATI", glMapObjectBufferATI == NULL);
-  glewInfoFunc("glUnmapObjectBufferATI", glUnmapObjectBufferATI == NULL);
-}
-
-#endif /* GL_ATI_map_object_buffer */
-
-#ifdef GL_ATI_meminfo
-
-static void _glewInfo_GL_ATI_meminfo (void)
-{
-  glewPrintExt("GL_ATI_meminfo", GLEW_ATI_meminfo, glewIsSupported("GL_ATI_meminfo"), glewGetExtension("GL_ATI_meminfo"));
-}
-
-#endif /* GL_ATI_meminfo */
-
-#ifdef GL_ATI_pn_triangles
-
-static void _glewInfo_GL_ATI_pn_triangles (void)
-{
-  glewPrintExt("GL_ATI_pn_triangles", GLEW_ATI_pn_triangles, glewIsSupported("GL_ATI_pn_triangles"), glewGetExtension("GL_ATI_pn_triangles"));
-
-  glewInfoFunc("glPNTrianglesfATI", glPNTrianglesfATI == NULL);
-  glewInfoFunc("glPNTrianglesiATI", glPNTrianglesiATI == NULL);
-}
-
-#endif /* GL_ATI_pn_triangles */
-
-#ifdef GL_ATI_separate_stencil
-
-static void _glewInfo_GL_ATI_separate_stencil (void)
-{
-  glewPrintExt("GL_ATI_separate_stencil", GLEW_ATI_separate_stencil, glewIsSupported("GL_ATI_separate_stencil"), glewGetExtension("GL_ATI_separate_stencil"));
-
-  glewInfoFunc("glStencilFuncSeparateATI", glStencilFuncSeparateATI == NULL);
-  glewInfoFunc("glStencilOpSeparateATI", glStencilOpSeparateATI == NULL);
-}
-
-#endif /* GL_ATI_separate_stencil */
-
-#ifdef GL_ATI_shader_texture_lod
-
-static void _glewInfo_GL_ATI_shader_texture_lod (void)
-{
-  glewPrintExt("GL_ATI_shader_texture_lod", GLEW_ATI_shader_texture_lod, glewIsSupported("GL_ATI_shader_texture_lod"), glewGetExtension("GL_ATI_shader_texture_lod"));
-}
-
-#endif /* GL_ATI_shader_texture_lod */
-
-#ifdef GL_ATI_text_fragment_shader
-
-static void _glewInfo_GL_ATI_text_fragment_shader (void)
-{
-  glewPrintExt("GL_ATI_text_fragment_shader", GLEW_ATI_text_fragment_shader, glewIsSupported("GL_ATI_text_fragment_shader"), glewGetExtension("GL_ATI_text_fragment_shader"));
-}
-
-#endif /* GL_ATI_text_fragment_shader */
-
-#ifdef GL_ATI_texture_compression_3dc
-
-static void _glewInfo_GL_ATI_texture_compression_3dc (void)
-{
-  glewPrintExt("GL_ATI_texture_compression_3dc", GLEW_ATI_texture_compression_3dc, glewIsSupported("GL_ATI_texture_compression_3dc"), glewGetExtension("GL_ATI_texture_compression_3dc"));
-}
-
-#endif /* GL_ATI_texture_compression_3dc */
-
-#ifdef GL_ATI_texture_env_combine3
-
-static void _glewInfo_GL_ATI_texture_env_combine3 (void)
-{
-  glewPrintExt("GL_ATI_texture_env_combine3", GLEW_ATI_texture_env_combine3, glewIsSupported("GL_ATI_texture_env_combine3"), glewGetExtension("GL_ATI_texture_env_combine3"));
-}
-
-#endif /* GL_ATI_texture_env_combine3 */
-
-#ifdef GL_ATI_texture_float
-
-static void _glewInfo_GL_ATI_texture_float (void)
-{
-  glewPrintExt("GL_ATI_texture_float", GLEW_ATI_texture_float, glewIsSupported("GL_ATI_texture_float"), glewGetExtension("GL_ATI_texture_float"));
-}
-
-#endif /* GL_ATI_texture_float */
-
-#ifdef GL_ATI_texture_mirror_once
-
-static void _glewInfo_GL_ATI_texture_mirror_once (void)
-{
-  glewPrintExt("GL_ATI_texture_mirror_once", GLEW_ATI_texture_mirror_once, glewIsSupported("GL_ATI_texture_mirror_once"), glewGetExtension("GL_ATI_texture_mirror_once"));
-}
-
-#endif /* GL_ATI_texture_mirror_once */
-
-#ifdef GL_ATI_vertex_array_object
-
-static void _glewInfo_GL_ATI_vertex_array_object (void)
-{
-  glewPrintExt("GL_ATI_vertex_array_object", GLEW_ATI_vertex_array_object, glewIsSupported("GL_ATI_vertex_array_object"), glewGetExtension("GL_ATI_vertex_array_object"));
-
-  glewInfoFunc("glArrayObjectATI", glArrayObjectATI == NULL);
-  glewInfoFunc("glFreeObjectBufferATI", glFreeObjectBufferATI == NULL);
-  glewInfoFunc("glGetArrayObjectfvATI", glGetArrayObjectfvATI == NULL);
-  glewInfoFunc("glGetArrayObjectivATI", glGetArrayObjectivATI == NULL);
-  glewInfoFunc("glGetObjectBufferfvATI", glGetObjectBufferfvATI == NULL);
-  glewInfoFunc("glGetObjectBufferivATI", glGetObjectBufferivATI == NULL);
-  glewInfoFunc("glGetVariantArrayObjectfvATI", glGetVariantArrayObjectfvATI == NULL);
-  glewInfoFunc("glGetVariantArrayObjectivATI", glGetVariantArrayObjectivATI == NULL);
-  glewInfoFunc("glIsObjectBufferATI", glIsObjectBufferATI == NULL);
-  glewInfoFunc("glNewObjectBufferATI", glNewObjectBufferATI == NULL);
-  glewInfoFunc("glUpdateObjectBufferATI", glUpdateObjectBufferATI == NULL);
-  glewInfoFunc("glVariantArrayObjectATI", glVariantArrayObjectATI == NULL);
-}
-
-#endif /* GL_ATI_vertex_array_object */
-
-#ifdef GL_ATI_vertex_attrib_array_object
-
-static void _glewInfo_GL_ATI_vertex_attrib_array_object (void)
-{
-  glewPrintExt("GL_ATI_vertex_attrib_array_object", GLEW_ATI_vertex_attrib_array_object, glewIsSupported("GL_ATI_vertex_attrib_array_object"), glewGetExtension("GL_ATI_vertex_attrib_array_object"));
-
-  glewInfoFunc("glGetVertexAttribArrayObjectfvATI", glGetVertexAttribArrayObjectfvATI == NULL);
-  glewInfoFunc("glGetVertexAttribArrayObjectivATI", glGetVertexAttribArrayObjectivATI == NULL);
-  glewInfoFunc("glVertexAttribArrayObjectATI", glVertexAttribArrayObjectATI == NULL);
-}
-
-#endif /* GL_ATI_vertex_attrib_array_object */
-
-#ifdef GL_ATI_vertex_streams
-
-static void _glewInfo_GL_ATI_vertex_streams (void)
-{
-  glewPrintExt("GL_ATI_vertex_streams", GLEW_ATI_vertex_streams, glewIsSupported("GL_ATI_vertex_streams"), glewGetExtension("GL_ATI_vertex_streams"));
-
-  glewInfoFunc("glClientActiveVertexStreamATI", glClientActiveVertexStreamATI == NULL);
-  glewInfoFunc("glNormalStream3bATI", glNormalStream3bATI == NULL);
-  glewInfoFunc("glNormalStream3bvATI", glNormalStream3bvATI == NULL);
-  glewInfoFunc("glNormalStream3dATI", glNormalStream3dATI == NULL);
-  glewInfoFunc("glNormalStream3dvATI", glNormalStream3dvATI == NULL);
-  glewInfoFunc("glNormalStream3fATI", glNormalStream3fATI == NULL);
-  glewInfoFunc("glNormalStream3fvATI", glNormalStream3fvATI == NULL);
-  glewInfoFunc("glNormalStream3iATI", glNormalStream3iATI == NULL);
-  glewInfoFunc("glNormalStream3ivATI", glNormalStream3ivATI == NULL);
-  glewInfoFunc("glNormalStream3sATI", glNormalStream3sATI == NULL);
-  glewInfoFunc("glNormalStream3svATI", glNormalStream3svATI == NULL);
-  glewInfoFunc("glVertexBlendEnvfATI", glVertexBlendEnvfATI == NULL);
-  glewInfoFunc("glVertexBlendEnviATI", glVertexBlendEnviATI == NULL);
-  glewInfoFunc("glVertexStream1dATI", glVertexStream1dATI == NULL);
-  glewInfoFunc("glVertexStream1dvATI", glVertexStream1dvATI == NULL);
-  glewInfoFunc("glVertexStream1fATI", glVertexStream1fATI == NULL);
-  glewInfoFunc("glVertexStream1fvATI", glVertexStream1fvATI == NULL);
-  glewInfoFunc("glVertexStream1iATI", glVertexStream1iATI == NULL);
-  glewInfoFunc("glVertexStream1ivATI", glVertexStream1ivATI == NULL);
-  glewInfoFunc("glVertexStream1sATI", glVertexStream1sATI == NULL);
-  glewInfoFunc("glVertexStream1svATI", glVertexStream1svATI == NULL);
-  glewInfoFunc("glVertexStream2dATI", glVertexStream2dATI == NULL);
-  glewInfoFunc("glVertexStream2dvATI", glVertexStream2dvATI == NULL);
-  glewInfoFunc("glVertexStream2fATI", glVertexStream2fATI == NULL);
-  glewInfoFunc("glVertexStream2fvATI", glVertexStream2fvATI == NULL);
-  glewInfoFunc("glVertexStream2iATI", glVertexStream2iATI == NULL);
-  glewInfoFunc("glVertexStream2ivATI", glVertexStream2ivATI == NULL);
-  glewInfoFunc("glVertexStream2sATI", glVertexStream2sATI == NULL);
-  glewInfoFunc("glVertexStream2svATI", glVertexStream2svATI == NULL);
-  glewInfoFunc("glVertexStream3dATI", glVertexStream3dATI == NULL);
-  glewInfoFunc("glVertexStream3dvATI", glVertexStream3dvATI == NULL);
-  glewInfoFunc("glVertexStream3fATI", glVertexStream3fATI == NULL);
-  glewInfoFunc("glVertexStream3fvATI", glVertexStream3fvATI == NULL);
-  glewInfoFunc("glVertexStream3iATI", glVertexStream3iATI == NULL);
-  glewInfoFunc("glVertexStream3ivATI", glVertexStream3ivATI == NULL);
-  glewInfoFunc("glVertexStream3sATI", glVertexStream3sATI == NULL);
-  glewInfoFunc("glVertexStream3svATI", glVertexStream3svATI == NULL);
-  glewInfoFunc("glVertexStream4dATI", glVertexStream4dATI == NULL);
-  glewInfoFunc("glVertexStream4dvATI", glVertexStream4dvATI == NULL);
-  glewInfoFunc("glVertexStream4fATI", glVertexStream4fATI == NULL);
-  glewInfoFunc("glVertexStream4fvATI", glVertexStream4fvATI == NULL);
-  glewInfoFunc("glVertexStream4iATI", glVertexStream4iATI == NULL);
-  glewInfoFunc("glVertexStream4ivATI", glVertexStream4ivATI == NULL);
-  glewInfoFunc("glVertexStream4sATI", glVertexStream4sATI == NULL);
-  glewInfoFunc("glVertexStream4svATI", glVertexStream4svATI == NULL);
-}
-
-#endif /* GL_ATI_vertex_streams */
-
-#ifdef GL_EXT_422_pixels
-
-static void _glewInfo_GL_EXT_422_pixels (void)
-{
-  glewPrintExt("GL_EXT_422_pixels", GLEW_EXT_422_pixels, glewIsSupported("GL_EXT_422_pixels"), glewGetExtension("GL_EXT_422_pixels"));
-}
-
-#endif /* GL_EXT_422_pixels */
-
-#ifdef GL_EXT_Cg_shader
-
-static void _glewInfo_GL_EXT_Cg_shader (void)
-{
-  glewPrintExt("GL_EXT_Cg_shader", GLEW_EXT_Cg_shader, glewIsSupported("GL_EXT_Cg_shader"), glewGetExtension("GL_EXT_Cg_shader"));
-}
-
-#endif /* GL_EXT_Cg_shader */
-
-#ifdef GL_EXT_abgr
-
-static void _glewInfo_GL_EXT_abgr (void)
-{
-  glewPrintExt("GL_EXT_abgr", GLEW_EXT_abgr, glewIsSupported("GL_EXT_abgr"), glewGetExtension("GL_EXT_abgr"));
-}
-
-#endif /* GL_EXT_abgr */
-
-#ifdef GL_EXT_bgra
-
-static void _glewInfo_GL_EXT_bgra (void)
-{
-  glewPrintExt("GL_EXT_bgra", GLEW_EXT_bgra, glewIsSupported("GL_EXT_bgra"), glewGetExtension("GL_EXT_bgra"));
-}
-
-#endif /* GL_EXT_bgra */
-
-#ifdef GL_EXT_bindable_uniform
-
-static void _glewInfo_GL_EXT_bindable_uniform (void)
-{
-  glewPrintExt("GL_EXT_bindable_uniform", GLEW_EXT_bindable_uniform, glewIsSupported("GL_EXT_bindable_uniform"), glewGetExtension("GL_EXT_bindable_uniform"));
-
-  glewInfoFunc("glGetUniformBufferSizeEXT", glGetUniformBufferSizeEXT == NULL);
-  glewInfoFunc("glGetUniformOffsetEXT", glGetUniformOffsetEXT == NULL);
-  glewInfoFunc("glUniformBufferEXT", glUniformBufferEXT == NULL);
-}
-
-#endif /* GL_EXT_bindable_uniform */
-
-#ifdef GL_EXT_blend_color
-
-static void _glewInfo_GL_EXT_blend_color (void)
-{
-  glewPrintExt("GL_EXT_blend_color", GLEW_EXT_blend_color, glewIsSupported("GL_EXT_blend_color"), glewGetExtension("GL_EXT_blend_color"));
-
-  glewInfoFunc("glBlendColorEXT", glBlendColorEXT == NULL);
-}
-
-#endif /* GL_EXT_blend_color */
-
-#ifdef GL_EXT_blend_equation_separate
-
-static void _glewInfo_GL_EXT_blend_equation_separate (void)
-{
-  glewPrintExt("GL_EXT_blend_equation_separate", GLEW_EXT_blend_equation_separate, glewIsSupported("GL_EXT_blend_equation_separate"), glewGetExtension("GL_EXT_blend_equation_separate"));
-
-  glewInfoFunc("glBlendEquationSeparateEXT", glBlendEquationSeparateEXT == NULL);
-}
-
-#endif /* GL_EXT_blend_equation_separate */
-
-#ifdef GL_EXT_blend_func_separate
-
-static void _glewInfo_GL_EXT_blend_func_separate (void)
-{
-  glewPrintExt("GL_EXT_blend_func_separate", GLEW_EXT_blend_func_separate, glewIsSupported("GL_EXT_blend_func_separate"), glewGetExtension("GL_EXT_blend_func_separate"));
-
-  glewInfoFunc("glBlendFuncSeparateEXT", glBlendFuncSeparateEXT == NULL);
-}
-
-#endif /* GL_EXT_blend_func_separate */
-
-#ifdef GL_EXT_blend_logic_op
-
-static void _glewInfo_GL_EXT_blend_logic_op (void)
-{
-  glewPrintExt("GL_EXT_blend_logic_op", GLEW_EXT_blend_logic_op, glewIsSupported("GL_EXT_blend_logic_op"), glewGetExtension("GL_EXT_blend_logic_op"));
-}
-
-#endif /* GL_EXT_blend_logic_op */
-
-#ifdef GL_EXT_blend_minmax
-
-static void _glewInfo_GL_EXT_blend_minmax (void)
-{
-  glewPrintExt("GL_EXT_blend_minmax", GLEW_EXT_blend_minmax, glewIsSupported("GL_EXT_blend_minmax"), glewGetExtension("GL_EXT_blend_minmax"));
-
-  glewInfoFunc("glBlendEquationEXT", glBlendEquationEXT == NULL);
-}
-
-#endif /* GL_EXT_blend_minmax */
-
-#ifdef GL_EXT_blend_subtract
-
-static void _glewInfo_GL_EXT_blend_subtract (void)
-{
-  glewPrintExt("GL_EXT_blend_subtract", GLEW_EXT_blend_subtract, glewIsSupported("GL_EXT_blend_subtract"), glewGetExtension("GL_EXT_blend_subtract"));
-}
-
-#endif /* GL_EXT_blend_subtract */
-
-#ifdef GL_EXT_clip_volume_hint
-
-static void _glewInfo_GL_EXT_clip_volume_hint (void)
-{
-  glewPrintExt("GL_EXT_clip_volume_hint", GLEW_EXT_clip_volume_hint, glewIsSupported("GL_EXT_clip_volume_hint"), glewGetExtension("GL_EXT_clip_volume_hint"));
-}
-
-#endif /* GL_EXT_clip_volume_hint */
-
-#ifdef GL_EXT_cmyka
-
-static void _glewInfo_GL_EXT_cmyka (void)
-{
-  glewPrintExt("GL_EXT_cmyka", GLEW_EXT_cmyka, glewIsSupported("GL_EXT_cmyka"), glewGetExtension("GL_EXT_cmyka"));
-}
-
-#endif /* GL_EXT_cmyka */
-
-#ifdef GL_EXT_color_subtable
-
-static void _glewInfo_GL_EXT_color_subtable (void)
-{
-  glewPrintExt("GL_EXT_color_subtable", GLEW_EXT_color_subtable, glewIsSupported("GL_EXT_color_subtable"), glewGetExtension("GL_EXT_color_subtable"));
-
-  glewInfoFunc("glColorSubTableEXT", glColorSubTableEXT == NULL);
-  glewInfoFunc("glCopyColorSubTableEXT", glCopyColorSubTableEXT == NULL);
-}
-
-#endif /* GL_EXT_color_subtable */
-
-#ifdef GL_EXT_compiled_vertex_array
-
-static void _glewInfo_GL_EXT_compiled_vertex_array (void)
-{
-  glewPrintExt("GL_EXT_compiled_vertex_array", GLEW_EXT_compiled_vertex_array, glewIsSupported("GL_EXT_compiled_vertex_array"), glewGetExtension("GL_EXT_compiled_vertex_array"));
-
-  glewInfoFunc("glLockArraysEXT", glLockArraysEXT == NULL);
-  glewInfoFunc("glUnlockArraysEXT", glUnlockArraysEXT == NULL);
-}
-
-#endif /* GL_EXT_compiled_vertex_array */
-
-#ifdef GL_EXT_convolution
-
-static void _glewInfo_GL_EXT_convolution (void)
-{
-  glewPrintExt("GL_EXT_convolution", GLEW_EXT_convolution, glewIsSupported("GL_EXT_convolution"), glewGetExtension("GL_EXT_convolution"));
-
-  glewInfoFunc("glConvolutionFilter1DEXT", glConvolutionFilter1DEXT == NULL);
-  glewInfoFunc("glConvolutionFilter2DEXT", glConvolutionFilter2DEXT == NULL);
-  glewInfoFunc("glConvolutionParameterfEXT", glConvolutionParameterfEXT == NULL);
-  glewInfoFunc("glConvolutionParameterfvEXT", glConvolutionParameterfvEXT == NULL);
-  glewInfoFunc("glConvolutionParameteriEXT", glConvolutionParameteriEXT == NULL);
-  glewInfoFunc("glConvolutionParameterivEXT", glConvolutionParameterivEXT == NULL);
-  glewInfoFunc("glCopyConvolutionFilter1DEXT", glCopyConvolutionFilter1DEXT == NULL);
-  glewInfoFunc("glCopyConvolutionFilter2DEXT", glCopyConvolutionFilter2DEXT == NULL);
-  glewInfoFunc("glGetConvolutionFilterEXT", glGetConvolutionFilterEXT == NULL);
-  glewInfoFunc("glGetConvolutionParameterfvEXT", glGetConvolutionParameterfvEXT == NULL);
-  glewInfoFunc("glGetConvolutionParameterivEXT", glGetConvolutionParameterivEXT == NULL);
-  glewInfoFunc("glGetSeparableFilterEXT", glGetSeparableFilterEXT == NULL);
-  glewInfoFunc("glSeparableFilter2DEXT", glSeparableFilter2DEXT == NULL);
-}
-
-#endif /* GL_EXT_convolution */
-
-#ifdef GL_EXT_coordinate_frame
-
-static void _glewInfo_GL_EXT_coordinate_frame (void)
-{
-  glewPrintExt("GL_EXT_coordinate_frame", GLEW_EXT_coordinate_frame, glewIsSupported("GL_EXT_coordinate_frame"), glewGetExtension("GL_EXT_coordinate_frame"));
-
-  glewInfoFunc("glBinormalPointerEXT", glBinormalPointerEXT == NULL);
-  glewInfoFunc("glTangentPointerEXT", glTangentPointerEXT == NULL);
-}
-
-#endif /* GL_EXT_coordinate_frame */
-
-#ifdef GL_EXT_copy_texture
-
-static void _glewInfo_GL_EXT_copy_texture (void)
-{
-  glewPrintExt("GL_EXT_copy_texture", GLEW_EXT_copy_texture, glewIsSupported("GL_EXT_copy_texture"), glewGetExtension("GL_EXT_copy_texture"));
-
-  glewInfoFunc("glCopyTexImage1DEXT", glCopyTexImage1DEXT == NULL);
-  glewInfoFunc("glCopyTexImage2DEXT", glCopyTexImage2DEXT == NULL);
-  glewInfoFunc("glCopyTexSubImage1DEXT", glCopyTexSubImage1DEXT == NULL);
-  glewInfoFunc("glCopyTexSubImage2DEXT", glCopyTexSubImage2DEXT == NULL);
-  glewInfoFunc("glCopyTexSubImage3DEXT", glCopyTexSubImage3DEXT == NULL);
-}
-
-#endif /* GL_EXT_copy_texture */
-
-#ifdef GL_EXT_cull_vertex
-
-static void _glewInfo_GL_EXT_cull_vertex (void)
-{
-  glewPrintExt("GL_EXT_cull_vertex", GLEW_EXT_cull_vertex, glewIsSupported("GL_EXT_cull_vertex"), glewGetExtension("GL_EXT_cull_vertex"));
-
-  glewInfoFunc("glCullParameterdvEXT", glCullParameterdvEXT == NULL);
-  glewInfoFunc("glCullParameterfvEXT", glCullParameterfvEXT == NULL);
-}
-
-#endif /* GL_EXT_cull_vertex */
-
-#ifdef GL_EXT_debug_marker
-
-static void _glewInfo_GL_EXT_debug_marker (void)
-{
-  glewPrintExt("GL_EXT_debug_marker", GLEW_EXT_debug_marker, glewIsSupported("GL_EXT_debug_marker"), glewGetExtension("GL_EXT_debug_marker"));
-
-  glewInfoFunc("glInsertEventMarkerEXT", glInsertEventMarkerEXT == NULL);
-  glewInfoFunc("glPopGroupMarkerEXT", glPopGroupMarkerEXT == NULL);
-  glewInfoFunc("glPushGroupMarkerEXT", glPushGroupMarkerEXT == NULL);
-}
-
-#endif /* GL_EXT_debug_marker */
-
-#ifdef GL_EXT_depth_bounds_test
-
-static void _glewInfo_GL_EXT_depth_bounds_test (void)
-{
-  glewPrintExt("GL_EXT_depth_bounds_test", GLEW_EXT_depth_bounds_test, glewIsSupported("GL_EXT_depth_bounds_test"), glewGetExtension("GL_EXT_depth_bounds_test"));
-
-  glewInfoFunc("glDepthBoundsEXT", glDepthBoundsEXT == NULL);
-}
-
-#endif /* GL_EXT_depth_bounds_test */
-
-#ifdef GL_EXT_direct_state_access
-
-static void _glewInfo_GL_EXT_direct_state_access (void)
-{
-  glewPrintExt("GL_EXT_direct_state_access", GLEW_EXT_direct_state_access, glewIsSupported("GL_EXT_direct_state_access"), glewGetExtension("GL_EXT_direct_state_access"));
-
-  glewInfoFunc("glBindMultiTextureEXT", glBindMultiTextureEXT == NULL);
-  glewInfoFunc("glCheckNamedFramebufferStatusEXT", glCheckNamedFramebufferStatusEXT == NULL);
-  glewInfoFunc("glClientAttribDefaultEXT", glClientAttribDefaultEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexImage1DEXT", glCompressedMultiTexImage1DEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexImage2DEXT", glCompressedMultiTexImage2DEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexImage3DEXT", glCompressedMultiTexImage3DEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexSubImage1DEXT", glCompressedMultiTexSubImage1DEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexSubImage2DEXT", glCompressedMultiTexSubImage2DEXT == NULL);
-  glewInfoFunc("glCompressedMultiTexSubImage3DEXT", glCompressedMultiTexSubImage3DEXT == NULL);
-  glewInfoFunc("glCompressedTextureImage1DEXT", glCompressedTextureImage1DEXT == NULL);
-  glewInfoFunc("glCompressedTextureImage2DEXT", glCompressedTextureImage2DEXT == NULL);
-  glewInfoFunc("glCompressedTextureImage3DEXT", glCompressedTextureImage3DEXT == NULL);
-  glewInfoFunc("glCompressedTextureSubImage1DEXT", glCompressedTextureSubImage1DEXT == NULL);
-  glewInfoFunc("glCompressedTextureSubImage2DEXT", glCompressedTextureSubImage2DEXT == NULL);
-  glewInfoFunc("glCompressedTextureSubImage3DEXT", glCompressedTextureSubImage3DEXT == NULL);
-  glewInfoFunc("glCopyMultiTexImage1DEXT", glCopyMultiTexImage1DEXT == NULL);
-  glewInfoFunc("glCopyMultiTexImage2DEXT", glCopyMultiTexImage2DEXT == NULL);
-  glewInfoFunc("glCopyMultiTexSubImage1DEXT", glCopyMultiTexSubImage1DEXT == NULL);
-  glewInfoFunc("glCopyMultiTexSubImage2DEXT", glCopyMultiTexSubImage2DEXT == NULL);
-  glewInfoFunc("glCopyMultiTexSubImage3DEXT", glCopyMultiTexSubImage3DEXT == NULL);
-  glewInfoFunc("glCopyTextureImage1DEXT", glCopyTextureImage1DEXT == NULL);
-  glewInfoFunc("glCopyTextureImage2DEXT", glCopyTextureImage2DEXT == NULL);
-  glewInfoFunc("glCopyTextureSubImage1DEXT", glCopyTextureSubImage1DEXT == NULL);
-  glewInfoFunc("glCopyTextureSubImage2DEXT", glCopyTextureSubImage2DEXT == NULL);
-  glewInfoFunc("glCopyTextureSubImage3DEXT", glCopyTextureSubImage3DEXT == NULL);
-  glewInfoFunc("glDisableClientStateIndexedEXT", glDisableClientStateIndexedEXT == NULL);
-  glewInfoFunc("glDisableClientStateiEXT", glDisableClientStateiEXT == NULL);
-  glewInfoFunc("glDisableVertexArrayAttribEXT", glDisableVertexArrayAttribEXT == NULL);
-  glewInfoFunc("glDisableVertexArrayEXT", glDisableVertexArrayEXT == NULL);
-  glewInfoFunc("glEnableClientStateIndexedEXT", glEnableClientStateIndexedEXT == NULL);
-  glewInfoFunc("glEnableClientStateiEXT", glEnableClientStateiEXT == NULL);
-  glewInfoFunc("glEnableVertexArrayAttribEXT", glEnableVertexArrayAttribEXT == NULL);
-  glewInfoFunc("glEnableVertexArrayEXT", glEnableVertexArrayEXT == NULL);
-  glewInfoFunc("glFlushMappedNamedBufferRangeEXT", glFlushMappedNamedBufferRangeEXT == NULL);
-  glewInfoFunc("glFramebufferDrawBufferEXT", glFramebufferDrawBufferEXT == NULL);
-  glewInfoFunc("glFramebufferDrawBuffersEXT", glFramebufferDrawBuffersEXT == NULL);
-  glewInfoFunc("glFramebufferReadBufferEXT", glFramebufferReadBufferEXT == NULL);
-  glewInfoFunc("glGenerateMultiTexMipmapEXT", glGenerateMultiTexMipmapEXT == NULL);
-  glewInfoFunc("glGenerateTextureMipmapEXT", glGenerateTextureMipmapEXT == NULL);
-  glewInfoFunc("glGetCompressedMultiTexImageEXT", glGetCompressedMultiTexImageEXT == NULL);
-  glewInfoFunc("glGetCompressedTextureImageEXT", glGetCompressedTextureImageEXT == NULL);
-  glewInfoFunc("glGetDoubleIndexedvEXT", glGetDoubleIndexedvEXT == NULL);
-  glewInfoFunc("glGetDoublei_vEXT", glGetDoublei_vEXT == NULL);
-  glewInfoFunc("glGetFloatIndexedvEXT", glGetFloatIndexedvEXT == NULL);
-  glewInfoFunc("glGetFloati_vEXT", glGetFloati_vEXT == NULL);
-  glewInfoFunc("glGetFramebufferParameterivEXT", glGetFramebufferParameterivEXT == NULL);
-  glewInfoFunc("glGetMultiTexEnvfvEXT", glGetMultiTexEnvfvEXT == NULL);
-  glewInfoFunc("glGetMultiTexEnvivEXT", glGetMultiTexEnvivEXT == NULL);
-  glewInfoFunc("glGetMultiTexGendvEXT", glGetMultiTexGendvEXT == NULL);
-  glewInfoFunc("glGetMultiTexGenfvEXT", glGetMultiTexGenfvEXT == NULL);
-  glewInfoFunc("glGetMultiTexGenivEXT", glGetMultiTexGenivEXT == NULL);
-  glewInfoFunc("glGetMultiTexImageEXT", glGetMultiTexImageEXT == NULL);
-  glewInfoFunc("glGetMultiTexLevelParameterfvEXT", glGetMultiTexLevelParameterfvEXT == NULL);
-  glewInfoFunc("glGetMultiTexLevelParameterivEXT", glGetMultiTexLevelParameterivEXT == NULL);
-  glewInfoFunc("glGetMultiTexParameterIivEXT", glGetMultiTexParameterIivEXT == NULL);
-  glewInfoFunc("glGetMultiTexParameterIuivEXT", glGetMultiTexParameterIuivEXT == NULL);
-  glewInfoFunc("glGetMultiTexParameterfvEXT", glGetMultiTexParameterfvEXT == NULL);
-  glewInfoFunc("glGetMultiTexParameterivEXT", glGetMultiTexParameterivEXT == NULL);
-  glewInfoFunc("glGetNamedBufferParameterivEXT", glGetNamedBufferParameterivEXT == NULL);
-  glewInfoFunc("glGetNamedBufferPointervEXT", glGetNamedBufferPointervEXT == NULL);
-  glewInfoFunc("glGetNamedBufferSubDataEXT", glGetNamedBufferSubDataEXT == NULL);
-  glewInfoFunc("glGetNamedFramebufferAttachmentParameterivEXT", glGetNamedFramebufferAttachmentParameterivEXT == NULL);
-  glewInfoFunc("glGetNamedProgramLocalParameterIivEXT", glGetNamedProgramLocalParameterIivEXT == NULL);
-  glewInfoFunc("glGetNamedProgramLocalParameterIuivEXT", glGetNamedProgramLocalParameterIuivEXT == NULL);
-  glewInfoFunc("glGetNamedProgramLocalParameterdvEXT", glGetNamedProgramLocalParameterdvEXT == NULL);
-  glewInfoFunc("glGetNamedProgramLocalParameterfvEXT", glGetNamedProgramLocalParameterfvEXT == NULL);
-  glewInfoFunc("glGetNamedProgramStringEXT", glGetNamedProgramStringEXT == NULL);
-  glewInfoFunc("glGetNamedProgramivEXT", glGetNamedProgramivEXT == NULL);
-  glewInfoFunc("glGetNamedRenderbufferParameterivEXT", glGetNamedRenderbufferParameterivEXT == NULL);
-  glewInfoFunc("glGetPointerIndexedvEXT", glGetPointerIndexedvEXT == NULL);
-  glewInfoFunc("glGetPointeri_vEXT", glGetPointeri_vEXT == NULL);
-  glewInfoFunc("glGetTextureImageEXT", glGetTextureImageEXT == NULL);
-  glewInfoFunc("glGetTextureLevelParameterfvEXT", glGetTextureLevelParameterfvEXT == NULL);
-  glewInfoFunc("glGetTextureLevelParameterivEXT", glGetTextureLevelParameterivEXT == NULL);
-  glewInfoFunc("glGetTextureParameterIivEXT", glGetTextureParameterIivEXT == NULL);
-  glewInfoFunc("glGetTextureParameterIuivEXT", glGetTextureParameterIuivEXT == NULL);
-  glewInfoFunc("glGetTextureParameterfvEXT", glGetTextureParameterfvEXT == NULL);
-  glewInfoFunc("glGetTextureParameterivEXT", glGetTextureParameterivEXT == NULL);
-  glewInfoFunc("glGetVertexArrayIntegeri_vEXT", glGetVertexArrayIntegeri_vEXT == NULL);
-  glewInfoFunc("glGetVertexArrayIntegervEXT", glGetVertexArrayIntegervEXT == NULL);
-  glewInfoFunc("glGetVertexArrayPointeri_vEXT", glGetVertexArrayPointeri_vEXT == NULL);
-  glewInfoFunc("glGetVertexArrayPointervEXT", glGetVertexArrayPointervEXT == NULL);
-  glewInfoFunc("glMapNamedBufferEXT", glMapNamedBufferEXT == NULL);
-  glewInfoFunc("glMapNamedBufferRangeEXT", glMapNamedBufferRangeEXT == NULL);
-  glewInfoFunc("glMatrixFrustumEXT", glMatrixFrustumEXT == NULL);
-  glewInfoFunc("glMatrixLoadIdentityEXT", glMatrixLoadIdentityEXT == NULL);
-  glewInfoFunc("glMatrixLoadTransposedEXT", glMatrixLoadTransposedEXT == NULL);
-  glewInfoFunc("glMatrixLoadTransposefEXT", glMatrixLoadTransposefEXT == NULL);
-  glewInfoFunc("glMatrixLoaddEXT", glMatrixLoaddEXT == NULL);
-  glewInfoFunc("glMatrixLoadfEXT", glMatrixLoadfEXT == NULL);
-  glewInfoFunc("glMatrixMultTransposedEXT", glMatrixMultTransposedEXT == NULL);
-  glewInfoFunc("glMatrixMultTransposefEXT", glMatrixMultTransposefEXT == NULL);
-  glewInfoFunc("glMatrixMultdEXT", glMatrixMultdEXT == NULL);
-  glewInfoFunc("glMatrixMultfEXT", glMatrixMultfEXT == NULL);
-  glewInfoFunc("glMatrixOrthoEXT", glMatrixOrthoEXT == NULL);
-  glewInfoFunc("glMatrixPopEXT", glMatrixPopEXT == NULL);
-  glewInfoFunc("glMatrixPushEXT", glMatrixPushEXT == NULL);
-  glewInfoFunc("glMatrixRotatedEXT", glMatrixRotatedEXT == NULL);
-  glewInfoFunc("glMatrixRotatefEXT", glMatrixRotatefEXT == NULL);
-  glewInfoFunc("glMatrixScaledEXT", glMatrixScaledEXT == NULL);
-  glewInfoFunc("glMatrixScalefEXT", glMatrixScalefEXT == NULL);
-  glewInfoFunc("glMatrixTranslatedEXT", glMatrixTranslatedEXT == NULL);
-  glewInfoFunc("glMatrixTranslatefEXT", glMatrixTranslatefEXT == NULL);
-  glewInfoFunc("glMultiTexBufferEXT", glMultiTexBufferEXT == NULL);
-  glewInfoFunc("glMultiTexCoordPointerEXT", glMultiTexCoordPointerEXT == NULL);
-  glewInfoFunc("glMultiTexEnvfEXT", glMultiTexEnvfEXT == NULL);
-  glewInfoFunc("glMultiTexEnvfvEXT", glMultiTexEnvfvEXT == NULL);
-  glewInfoFunc("glMultiTexEnviEXT", glMultiTexEnviEXT == NULL);
-  glewInfoFunc("glMultiTexEnvivEXT", glMultiTexEnvivEXT == NULL);
-  glewInfoFunc("glMultiTexGendEXT", glMultiTexGendEXT == NULL);
-  glewInfoFunc("glMultiTexGendvEXT", glMultiTexGendvEXT == NULL);
-  glewInfoFunc("glMultiTexGenfEXT", glMultiTexGenfEXT == NULL);
-  glewInfoFunc("glMultiTexGenfvEXT", glMultiTexGenfvEXT == NULL);
-  glewInfoFunc("glMultiTexGeniEXT", glMultiTexGeniEXT == NULL);
-  glewInfoFunc("glMultiTexGenivEXT", glMultiTexGenivEXT == NULL);
-  glewInfoFunc("glMultiTexImage1DEXT", glMultiTexImage1DEXT == NULL);
-  glewInfoFunc("glMultiTexImage2DEXT", glMultiTexImage2DEXT == NULL);
-  glewInfoFunc("glMultiTexImage3DEXT", glMultiTexImage3DEXT == NULL);
-  glewInfoFunc("glMultiTexParameterIivEXT", glMultiTexParameterIivEXT == NULL);
-  glewInfoFunc("glMultiTexParameterIuivEXT", glMultiTexParameterIuivEXT == NULL);
-  glewInfoFunc("glMultiTexParameterfEXT", glMultiTexParameterfEXT == NULL);
-  glewInfoFunc("glMultiTexParameterfvEXT", glMultiTexParameterfvEXT == NULL);
-  glewInfoFunc("glMultiTexParameteriEXT", glMultiTexParameteriEXT == NULL);
-  glewInfoFunc("glMultiTexParameterivEXT", glMultiTexParameterivEXT == NULL);
-  glewInfoFunc("glMultiTexRenderbufferEXT", glMultiTexRenderbufferEXT == NULL);
-  glewInfoFunc("glMultiTexSubImage1DEXT", glMultiTexSubImage1DEXT == NULL);
-  glewInfoFunc("glMultiTexSubImage2DEXT", glMultiTexSubImage2DEXT == NULL);
-  glewInfoFunc("glMultiTexSubImage3DEXT", glMultiTexSubImage3DEXT == NULL);
-  glewInfoFunc("glNamedBufferDataEXT", glNamedBufferDataEXT == NULL);
-  glewInfoFunc("glNamedBufferSubDataEXT", glNamedBufferSubDataEXT == NULL);
-  glewInfoFunc("glNamedCopyBufferSubDataEXT", glNamedCopyBufferSubDataEXT == NULL);
-  glewInfoFunc("glNamedFramebufferRenderbufferEXT", glNamedFramebufferRenderbufferEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTexture1DEXT", glNamedFramebufferTexture1DEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTexture2DEXT", glNamedFramebufferTexture2DEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTexture3DEXT", glNamedFramebufferTexture3DEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTextureEXT", glNamedFramebufferTextureEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTextureFaceEXT", glNamedFramebufferTextureFaceEXT == NULL);
-  glewInfoFunc("glNamedFramebufferTextureLayerEXT", glNamedFramebufferTextureLayerEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameter4dEXT", glNamedProgramLocalParameter4dEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameter4dvEXT", glNamedProgramLocalParameter4dvEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameter4fEXT", glNamedProgramLocalParameter4fEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameter4fvEXT", glNamedProgramLocalParameter4fvEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameterI4iEXT", glNamedProgramLocalParameterI4iEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameterI4ivEXT", glNamedProgramLocalParameterI4ivEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameterI4uiEXT", glNamedProgramLocalParameterI4uiEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameterI4uivEXT", glNamedProgramLocalParameterI4uivEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParameters4fvEXT", glNamedProgramLocalParameters4fvEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParametersI4ivEXT", glNamedProgramLocalParametersI4ivEXT == NULL);
-  glewInfoFunc("glNamedProgramLocalParametersI4uivEXT", glNamedProgramLocalParametersI4uivEXT == NULL);
-  glewInfoFunc("glNamedProgramStringEXT", glNamedProgramStringEXT == NULL);
-  glewInfoFunc("glNamedRenderbufferStorageEXT", glNamedRenderbufferStorageEXT == NULL);
-  glewInfoFunc("glNamedRenderbufferStorageMultisampleCoverageEXT", glNamedRenderbufferStorageMultisampleCoverageEXT == NULL);
-  glewInfoFunc("glNamedRenderbufferStorageMultisampleEXT", glNamedRenderbufferStorageMultisampleEXT == NULL);
-  glewInfoFunc("glProgramUniform1dEXT", glProgramUniform1dEXT == NULL);
-  glewInfoFunc("glProgramUniform1dvEXT", glProgramUniform1dvEXT == NULL);
-  glewInfoFunc("glProgramUniform1fEXT", glProgramUniform1fEXT == NULL);
-  glewInfoFunc("glProgramUniform1fvEXT", glProgramUniform1fvEXT == NULL);
-  glewInfoFunc("glProgramUniform1iEXT", glProgramUniform1iEXT == NULL);
-  glewInfoFunc("glProgramUniform1ivEXT", glProgramUniform1ivEXT == NULL);
-  glewInfoFunc("glProgramUniform1uiEXT", glProgramUniform1uiEXT == NULL);
-  glewInfoFunc("glProgramUniform1uivEXT", glProgramUniform1uivEXT == NULL);
-  glewInfoFunc("glProgramUniform2dEXT", glProgramUniform2dEXT == NULL);
-  glewInfoFunc("glProgramUniform2dvEXT", glProgramUniform2dvEXT == NULL);
-  glewInfoFunc("glProgramUniform2fEXT", glProgramUniform2fEXT == NULL);
-  glewInfoFunc("glProgramUniform2fvEXT", glProgramUniform2fvEXT == NULL);
-  glewInfoFunc("glProgramUniform2iEXT", glProgramUniform2iEXT == NULL);
-  glewInfoFunc("glProgramUniform2ivEXT", glProgramUniform2ivEXT == NULL);
-  glewInfoFunc("glProgramUniform2uiEXT", glProgramUniform2uiEXT == NULL);
-  glewInfoFunc("glProgramUniform2uivEXT", glProgramUniform2uivEXT == NULL);
-  glewInfoFunc("glProgramUniform3dEXT", glProgramUniform3dEXT == NULL);
-  glewInfoFunc("glProgramUniform3dvEXT", glProgramUniform3dvEXT == NULL);
-  glewInfoFunc("glProgramUniform3fEXT", glProgramUniform3fEXT == NULL);
-  glewInfoFunc("glProgramUniform3fvEXT", glProgramUniform3fvEXT == NULL);
-  glewInfoFunc("glProgramUniform3iEXT", glProgramUniform3iEXT == NULL);
-  glewInfoFunc("glProgramUniform3ivEXT", glProgramUniform3ivEXT == NULL);
-  glewInfoFunc("glProgramUniform3uiEXT", glProgramUniform3uiEXT == NULL);
-  glewInfoFunc("glProgramUniform3uivEXT", glProgramUniform3uivEXT == NULL);
-  glewInfoFunc("glProgramUniform4dEXT", glProgramUniform4dEXT == NULL);
-  glewInfoFunc("glProgramUniform4dvEXT", glProgramUniform4dvEXT == NULL);
-  glewInfoFunc("glProgramUniform4fEXT", glProgramUniform4fEXT == NULL);
-  glewInfoFunc("glProgramUniform4fvEXT", glProgramUniform4fvEXT == NULL);
-  glewInfoFunc("glProgramUniform4iEXT", glProgramUniform4iEXT == NULL);
-  glewInfoFunc("glProgramUniform4ivEXT", glProgramUniform4ivEXT == NULL);
-  glewInfoFunc("glProgramUniform4uiEXT", glProgramUniform4uiEXT == NULL);
-  glewInfoFunc("glProgramUniform4uivEXT", glProgramUniform4uivEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2dvEXT", glProgramUniformMatrix2dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2fvEXT", glProgramUniformMatrix2fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x3dvEXT", glProgramUniformMatrix2x3dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x3fvEXT", glProgramUniformMatrix2x3fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x4dvEXT", glProgramUniformMatrix2x4dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix2x4fvEXT", glProgramUniformMatrix2x4fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3dvEXT", glProgramUniformMatrix3dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3fvEXT", glProgramUniformMatrix3fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x2dvEXT", glProgramUniformMatrix3x2dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x2fvEXT", glProgramUniformMatrix3x2fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x4dvEXT", glProgramUniformMatrix3x4dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix3x4fvEXT", glProgramUniformMatrix3x4fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4dvEXT", glProgramUniformMatrix4dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4fvEXT", glProgramUniformMatrix4fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x2dvEXT", glProgramUniformMatrix4x2dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x2fvEXT", glProgramUniformMatrix4x2fvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x3dvEXT", glProgramUniformMatrix4x3dvEXT == NULL);
-  glewInfoFunc("glProgramUniformMatrix4x3fvEXT", glProgramUniformMatrix4x3fvEXT == NULL);
-  glewInfoFunc("glPushClientAttribDefaultEXT", glPushClientAttribDefaultEXT == NULL);
-  glewInfoFunc("glTextureBufferEXT", glTextureBufferEXT == NULL);
-  glewInfoFunc("glTextureImage1DEXT", glTextureImage1DEXT == NULL);
-  glewInfoFunc("glTextureImage2DEXT", glTextureImage2DEXT == NULL);
-  glewInfoFunc("glTextureImage3DEXT", glTextureImage3DEXT == NULL);
-  glewInfoFunc("glTextureParameterIivEXT", glTextureParameterIivEXT == NULL);
-  glewInfoFunc("glTextureParameterIuivEXT", glTextureParameterIuivEXT == NULL);
-  glewInfoFunc("glTextureParameterfEXT", glTextureParameterfEXT == NULL);
-  glewInfoFunc("glTextureParameterfvEXT", glTextureParameterfvEXT == NULL);
-  glewInfoFunc("glTextureParameteriEXT", glTextureParameteriEXT == NULL);
-  glewInfoFunc("glTextureParameterivEXT", glTextureParameterivEXT == NULL);
-  glewInfoFunc("glTextureRenderbufferEXT", glTextureRenderbufferEXT == NULL);
-  glewInfoFunc("glTextureSubImage1DEXT", glTextureSubImage1DEXT == NULL);
-  glewInfoFunc("glTextureSubImage2DEXT", glTextureSubImage2DEXT == NULL);
-  glewInfoFunc("glTextureSubImage3DEXT", glTextureSubImage3DEXT == NULL);
-  glewInfoFunc("glUnmapNamedBufferEXT", glUnmapNamedBufferEXT == NULL);
-  glewInfoFunc("glVertexArrayColorOffsetEXT", glVertexArrayColorOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayEdgeFlagOffsetEXT", glVertexArrayEdgeFlagOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayFogCoordOffsetEXT", glVertexArrayFogCoordOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayIndexOffsetEXT", glVertexArrayIndexOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayMultiTexCoordOffsetEXT", glVertexArrayMultiTexCoordOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayNormalOffsetEXT", glVertexArrayNormalOffsetEXT == NULL);
-  glewInfoFunc("glVertexArraySecondaryColorOffsetEXT", glVertexArraySecondaryColorOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayTexCoordOffsetEXT", glVertexArrayTexCoordOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayVertexAttribIOffsetEXT", glVertexArrayVertexAttribIOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayVertexAttribOffsetEXT", glVertexArrayVertexAttribOffsetEXT == NULL);
-  glewInfoFunc("glVertexArrayVertexOffsetEXT", glVertexArrayVertexOffsetEXT == NULL);
-}
-
-#endif /* GL_EXT_direct_state_access */
-
-#ifdef GL_EXT_draw_buffers2
-
-static void _glewInfo_GL_EXT_draw_buffers2 (void)
-{
-  glewPrintExt("GL_EXT_draw_buffers2", GLEW_EXT_draw_buffers2, glewIsSupported("GL_EXT_draw_buffers2"), glewGetExtension("GL_EXT_draw_buffers2"));
-
-  glewInfoFunc("glColorMaskIndexedEXT", glColorMaskIndexedEXT == NULL);
-  glewInfoFunc("glDisableIndexedEXT", glDisableIndexedEXT == NULL);
-  glewInfoFunc("glEnableIndexedEXT", glEnableIndexedEXT == NULL);
-  glewInfoFunc("glGetBooleanIndexedvEXT", glGetBooleanIndexedvEXT == NULL);
-  glewInfoFunc("glGetIntegerIndexedvEXT", glGetIntegerIndexedvEXT == NULL);
-  glewInfoFunc("glIsEnabledIndexedEXT", glIsEnabledIndexedEXT == NULL);
-}
-
-#endif /* GL_EXT_draw_buffers2 */
-
-#ifdef GL_EXT_draw_instanced
-
-static void _glewInfo_GL_EXT_draw_instanced (void)
-{
-  glewPrintExt("GL_EXT_draw_instanced", GLEW_EXT_draw_instanced, glewIsSupported("GL_EXT_draw_instanced"), glewGetExtension("GL_EXT_draw_instanced"));
-
-  glewInfoFunc("glDrawArraysInstancedEXT", glDrawArraysInstancedEXT == NULL);
-  glewInfoFunc("glDrawElementsInstancedEXT", glDrawElementsInstancedEXT == NULL);
-}
-
-#endif /* GL_EXT_draw_instanced */
-
-#ifdef GL_EXT_draw_range_elements
-
-static void _glewInfo_GL_EXT_draw_range_elements (void)
-{
-  glewPrintExt("GL_EXT_draw_range_elements", GLEW_EXT_draw_range_elements, glewIsSupported("GL_EXT_draw_range_elements"), glewGetExtension("GL_EXT_draw_range_elements"));
-
-  glewInfoFunc("glDrawRangeElementsEXT", glDrawRangeElementsEXT == NULL);
-}
-
-#endif /* GL_EXT_draw_range_elements */
-
-#ifdef GL_EXT_fog_coord
-
-static void _glewInfo_GL_EXT_fog_coord (void)
-{
-  glewPrintExt("GL_EXT_fog_coord", GLEW_EXT_fog_coord, glewIsSupported("GL_EXT_fog_coord"), glewGetExtension("GL_EXT_fog_coord"));
-
-  glewInfoFunc("glFogCoordPointerEXT", glFogCoordPointerEXT == NULL);
-  glewInfoFunc("glFogCoorddEXT", glFogCoorddEXT == NULL);
-  glewInfoFunc("glFogCoorddvEXT", glFogCoorddvEXT == NULL);
-  glewInfoFunc("glFogCoordfEXT", glFogCoordfEXT == NULL);
-  glewInfoFunc("glFogCoordfvEXT", glFogCoordfvEXT == NULL);
-}
-
-#endif /* GL_EXT_fog_coord */
-
-#ifdef GL_EXT_fragment_lighting
-
-static void _glewInfo_GL_EXT_fragment_lighting (void)
-{
-  glewPrintExt("GL_EXT_fragment_lighting", GLEW_EXT_fragment_lighting, glewIsSupported("GL_EXT_fragment_lighting"), glewGetExtension("GL_EXT_fragment_lighting"));
-
-  glewInfoFunc("glFragmentColorMaterialEXT", glFragmentColorMaterialEXT == NULL);
-  glewInfoFunc("glFragmentLightModelfEXT", glFragmentLightModelfEXT == NULL);
-  glewInfoFunc("glFragmentLightModelfvEXT", glFragmentLightModelfvEXT == NULL);
-  glewInfoFunc("glFragmentLightModeliEXT", glFragmentLightModeliEXT == NULL);
-  glewInfoFunc("glFragmentLightModelivEXT", glFragmentLightModelivEXT == NULL);
-  glewInfoFunc("glFragmentLightfEXT", glFragmentLightfEXT == NULL);
-  glewInfoFunc("glFragmentLightfvEXT", glFragmentLightfvEXT == NULL);
-  glewInfoFunc("glFragmentLightiEXT", glFragmentLightiEXT == NULL);
-  glewInfoFunc("glFragmentLightivEXT", glFragmentLightivEXT == NULL);
-  glewInfoFunc("glFragmentMaterialfEXT", glFragmentMaterialfEXT == NULL);
-  glewInfoFunc("glFragmentMaterialfvEXT", glFragmentMaterialfvEXT == NULL);
-  glewInfoFunc("glFragmentMaterialiEXT", glFragmentMaterialiEXT == NULL);
-  glewInfoFunc("glFragmentMaterialivEXT", glFragmentMaterialivEXT == NULL);
-  glewInfoFunc("glGetFragmentLightfvEXT", glGetFragmentLightfvEXT == NULL);
-  glewInfoFunc("glGetFragmentLightivEXT", glGetFragmentLightivEXT == NULL);
-  glewInfoFunc("glGetFragmentMaterialfvEXT", glGetFragmentMaterialfvEXT == NULL);
-  glewInfoFunc("glGetFragmentMaterialivEXT", glGetFragmentMaterialivEXT == NULL);
-  glewInfoFunc("glLightEnviEXT", glLightEnviEXT == NULL);
-}
-
-#endif /* GL_EXT_fragment_lighting */
-
-#ifdef GL_EXT_framebuffer_blit
-
-static void _glewInfo_GL_EXT_framebuffer_blit (void)
-{
-  glewPrintExt("GL_EXT_framebuffer_blit", GLEW_EXT_framebuffer_blit, glewIsSupported("GL_EXT_framebuffer_blit"), glewGetExtension("GL_EXT_framebuffer_blit"));
-
-  glewInfoFunc("glBlitFramebufferEXT", glBlitFramebufferEXT == NULL);
-}
-
-#endif /* GL_EXT_framebuffer_blit */
-
-#ifdef GL_EXT_framebuffer_multisample
-
-static void _glewInfo_GL_EXT_framebuffer_multisample (void)
-{
-  glewPrintExt("GL_EXT_framebuffer_multisample", GLEW_EXT_framebuffer_multisample, glewIsSupported("GL_EXT_framebuffer_multisample"), glewGetExtension("GL_EXT_framebuffer_multisample"));
-
-  glewInfoFunc("glRenderbufferStorageMultisampleEXT", glRenderbufferStorageMultisampleEXT == NULL);
-}
-
-#endif /* GL_EXT_framebuffer_multisample */
-
-#ifdef GL_EXT_framebuffer_multisample_blit_scaled
-
-static void _glewInfo_GL_EXT_framebuffer_multisample_blit_scaled (void)
-{
-  glewPrintExt("GL_EXT_framebuffer_multisample_blit_scaled", GLEW_EXT_framebuffer_multisample_blit_scaled, glewIsSupported("GL_EXT_framebuffer_multisample_blit_scaled"), glewGetExtension("GL_EXT_framebuffer_multisample_blit_scaled"));
-}
-
-#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
-
-#ifdef GL_EXT_framebuffer_object
-
-static void _glewInfo_GL_EXT_framebuffer_object (void)
-{
-  glewPrintExt("GL_EXT_framebuffer_object", GLEW_EXT_framebuffer_object, glewIsSupported("GL_EXT_framebuffer_object"), glewGetExtension("GL_EXT_framebuffer_object"));
-
-  glewInfoFunc("glBindFramebufferEXT", glBindFramebufferEXT == NULL);
-  glewInfoFunc("glBindRenderbufferEXT", glBindRenderbufferEXT == NULL);
-  glewInfoFunc("glCheckFramebufferStatusEXT", glCheckFramebufferStatusEXT == NULL);
-  glewInfoFunc("glDeleteFramebuffersEXT", glDeleteFramebuffersEXT == NULL);
-  glewInfoFunc("glDeleteRenderbuffersEXT", glDeleteRenderbuffersEXT == NULL);
-  glewInfoFunc("glFramebufferRenderbufferEXT", glFramebufferRenderbufferEXT == NULL);
-  glewInfoFunc("glFramebufferTexture1DEXT", glFramebufferTexture1DEXT == NULL);
-  glewInfoFunc("glFramebufferTexture2DEXT", glFramebufferTexture2DEXT == NULL);
-  glewInfoFunc("glFramebufferTexture3DEXT", glFramebufferTexture3DEXT == NULL);
-  glewInfoFunc("glGenFramebuffersEXT", glGenFramebuffersEXT == NULL);
-  glewInfoFunc("glGenRenderbuffersEXT", glGenRenderbuffersEXT == NULL);
-  glewInfoFunc("glGenerateMipmapEXT", glGenerateMipmapEXT == NULL);
-  glewInfoFunc("glGetFramebufferAttachmentParameterivEXT", glGetFramebufferAttachmentParameterivEXT == NULL);
-  glewInfoFunc("glGetRenderbufferParameterivEXT", glGetRenderbufferParameterivEXT == NULL);
-  glewInfoFunc("glIsFramebufferEXT", glIsFramebufferEXT == NULL);
-  glewInfoFunc("glIsRenderbufferEXT", glIsRenderbufferEXT == NULL);
-  glewInfoFunc("glRenderbufferStorageEXT", glRenderbufferStorageEXT == NULL);
-}
-
-#endif /* GL_EXT_framebuffer_object */
-
-#ifdef GL_EXT_framebuffer_sRGB
-
-static void _glewInfo_GL_EXT_framebuffer_sRGB (void)
-{
-  glewPrintExt("GL_EXT_framebuffer_sRGB", GLEW_EXT_framebuffer_sRGB, glewIsSupported("GL_EXT_framebuffer_sRGB"), glewGetExtension("GL_EXT_framebuffer_sRGB"));
-}
-
-#endif /* GL_EXT_framebuffer_sRGB */
-
-#ifdef GL_EXT_geometry_shader4
-
-static void _glewInfo_GL_EXT_geometry_shader4 (void)
-{
-  glewPrintExt("GL_EXT_geometry_shader4", GLEW_EXT_geometry_shader4, glewIsSupported("GL_EXT_geometry_shader4"), glewGetExtension("GL_EXT_geometry_shader4"));
-
-  glewInfoFunc("glFramebufferTextureEXT", glFramebufferTextureEXT == NULL);
-  glewInfoFunc("glFramebufferTextureFaceEXT", glFramebufferTextureFaceEXT == NULL);
-  glewInfoFunc("glProgramParameteriEXT", glProgramParameteriEXT == NULL);
-}
-
-#endif /* GL_EXT_geometry_shader4 */
-
-#ifdef GL_EXT_gpu_program_parameters
-
-static void _glewInfo_GL_EXT_gpu_program_parameters (void)
-{
-  glewPrintExt("GL_EXT_gpu_program_parameters", GLEW_EXT_gpu_program_parameters, glewIsSupported("GL_EXT_gpu_program_parameters"), glewGetExtension("GL_EXT_gpu_program_parameters"));
-
-  glewInfoFunc("glProgramEnvParameters4fvEXT", glProgramEnvParameters4fvEXT == NULL);
-  glewInfoFunc("glProgramLocalParameters4fvEXT", glProgramLocalParameters4fvEXT == NULL);
-}
-
-#endif /* GL_EXT_gpu_program_parameters */
-
-#ifdef GL_EXT_gpu_shader4
-
-static void _glewInfo_GL_EXT_gpu_shader4 (void)
-{
-  glewPrintExt("GL_EXT_gpu_shader4", GLEW_EXT_gpu_shader4, glewIsSupported("GL_EXT_gpu_shader4"), glewGetExtension("GL_EXT_gpu_shader4"));
-
-  glewInfoFunc("glBindFragDataLocationEXT", glBindFragDataLocationEXT == NULL);
-  glewInfoFunc("glGetFragDataLocationEXT", glGetFragDataLocationEXT == NULL);
-  glewInfoFunc("glGetUniformuivEXT", glGetUniformuivEXT == NULL);
-  glewInfoFunc("glGetVertexAttribIivEXT", glGetVertexAttribIivEXT == NULL);
-  glewInfoFunc("glGetVertexAttribIuivEXT", glGetVertexAttribIuivEXT == NULL);
-  glewInfoFunc("glUniform1uiEXT", glUniform1uiEXT == NULL);
-  glewInfoFunc("glUniform1uivEXT", glUniform1uivEXT == NULL);
-  glewInfoFunc("glUniform2uiEXT", glUniform2uiEXT == NULL);
-  glewInfoFunc("glUniform2uivEXT", glUniform2uivEXT == NULL);
-  glewInfoFunc("glUniform3uiEXT", glUniform3uiEXT == NULL);
-  glewInfoFunc("glUniform3uivEXT", glUniform3uivEXT == NULL);
-  glewInfoFunc("glUniform4uiEXT", glUniform4uiEXT == NULL);
-  glewInfoFunc("glUniform4uivEXT", glUniform4uivEXT == NULL);
-  glewInfoFunc("glVertexAttribI1iEXT", glVertexAttribI1iEXT == NULL);
-  glewInfoFunc("glVertexAttribI1ivEXT", glVertexAttribI1ivEXT == NULL);
-  glewInfoFunc("glVertexAttribI1uiEXT", glVertexAttribI1uiEXT == NULL);
-  glewInfoFunc("glVertexAttribI1uivEXT", glVertexAttribI1uivEXT == NULL);
-  glewInfoFunc("glVertexAttribI2iEXT", glVertexAttribI2iEXT == NULL);
-  glewInfoFunc("glVertexAttribI2ivEXT", glVertexAttribI2ivEXT == NULL);
-  glewInfoFunc("glVertexAttribI2uiEXT", glVertexAttribI2uiEXT == NULL);
-  glewInfoFunc("glVertexAttribI2uivEXT", glVertexAttribI2uivEXT == NULL);
-  glewInfoFunc("glVertexAttribI3iEXT", glVertexAttribI3iEXT == NULL);
-  glewInfoFunc("glVertexAttribI3ivEXT", glVertexAttribI3ivEXT == NULL);
-  glewInfoFunc("glVertexAttribI3uiEXT", glVertexAttribI3uiEXT == NULL);
-  glewInfoFunc("glVertexAttribI3uivEXT", glVertexAttribI3uivEXT == NULL);
-  glewInfoFunc("glVertexAttribI4bvEXT", glVertexAttribI4bvEXT == NULL);
-  glewInfoFunc("glVertexAttribI4iEXT", glVertexAttribI4iEXT == NULL);
-  glewInfoFunc("glVertexAttribI4ivEXT", glVertexAttribI4ivEXT == NULL);
-  glewInfoFunc("glVertexAttribI4svEXT", glVertexAttribI4svEXT == NULL);
-  glewInfoFunc("glVertexAttribI4ubvEXT", glVertexAttribI4ubvEXT == NULL);
-  glewInfoFunc("glVertexAttribI4uiEXT", glVertexAttribI4uiEXT == NULL);
-  glewInfoFunc("glVertexAttribI4uivEXT", glVertexAttribI4uivEXT == NULL);
-  glewInfoFunc("glVertexAttribI4usvEXT", glVertexAttribI4usvEXT == NULL);
-  glewInfoFunc("glVertexAttribIPointerEXT", glVertexAttribIPointerEXT == NULL);
-}
-
-#endif /* GL_EXT_gpu_shader4 */
-
-#ifdef GL_EXT_histogram
-
-static void _glewInfo_GL_EXT_histogram (void)
-{
-  glewPrintExt("GL_EXT_histogram", GLEW_EXT_histogram, glewIsSupported("GL_EXT_histogram"), glewGetExtension("GL_EXT_histogram"));
-
-  glewInfoFunc("glGetHistogramEXT", glGetHistogramEXT == NULL);
-  glewInfoFunc("glGetHistogramParameterfvEXT", glGetHistogramParameterfvEXT == NULL);
-  glewInfoFunc("glGetHistogramParameterivEXT", glGetHistogramParameterivEXT == NULL);
-  glewInfoFunc("glGetMinmaxEXT", glGetMinmaxEXT == NULL);
-  glewInfoFunc("glGetMinmaxParameterfvEXT", glGetMinmaxParameterfvEXT == NULL);
-  glewInfoFunc("glGetMinmaxParameterivEXT", glGetMinmaxParameterivEXT == NULL);
-  glewInfoFunc("glHistogramEXT", glHistogramEXT == NULL);
-  glewInfoFunc("glMinmaxEXT", glMinmaxEXT == NULL);
-  glewInfoFunc("glResetHistogramEXT", glResetHistogramEXT == NULL);
-  glewInfoFunc("glResetMinmaxEXT", glResetMinmaxEXT == NULL);
-}
-
-#endif /* GL_EXT_histogram */
-
-#ifdef GL_EXT_index_array_formats
-
-static void _glewInfo_GL_EXT_index_array_formats (void)
-{
-  glewPrintExt("GL_EXT_index_array_formats", GLEW_EXT_index_array_formats, glewIsSupported("GL_EXT_index_array_formats"), glewGetExtension("GL_EXT_index_array_formats"));
-}
-
-#endif /* GL_EXT_index_array_formats */
-
-#ifdef GL_EXT_index_func
-
-static void _glewInfo_GL_EXT_index_func (void)
-{
-  glewPrintExt("GL_EXT_index_func", GLEW_EXT_index_func, glewIsSupported("GL_EXT_index_func"), glewGetExtension("GL_EXT_index_func"));
-
-  glewInfoFunc("glIndexFuncEXT", glIndexFuncEXT == NULL);
-}
-
-#endif /* GL_EXT_index_func */
-
-#ifdef GL_EXT_index_material
-
-static void _glewInfo_GL_EXT_index_material (void)
-{
-  glewPrintExt("GL_EXT_index_material", GLEW_EXT_index_material, glewIsSupported("GL_EXT_index_material"), glewGetExtension("GL_EXT_index_material"));
-
-  glewInfoFunc("glIndexMaterialEXT", glIndexMaterialEXT == NULL);
-}
-
-#endif /* GL_EXT_index_material */
-
-#ifdef GL_EXT_index_texture
-
-static void _glewInfo_GL_EXT_index_texture (void)
-{
-  glewPrintExt("GL_EXT_index_texture", GLEW_EXT_index_texture, glewIsSupported("GL_EXT_index_texture"), glewGetExtension("GL_EXT_index_texture"));
-}
-
-#endif /* GL_EXT_index_texture */
-
-#ifdef GL_EXT_light_texture
-
-static void _glewInfo_GL_EXT_light_texture (void)
-{
-  glewPrintExt("GL_EXT_light_texture", GLEW_EXT_light_texture, glewIsSupported("GL_EXT_light_texture"), glewGetExtension("GL_EXT_light_texture"));
-
-  glewInfoFunc("glApplyTextureEXT", glApplyTextureEXT == NULL);
-  glewInfoFunc("glTextureLightEXT", glTextureLightEXT == NULL);
-  glewInfoFunc("glTextureMaterialEXT", glTextureMaterialEXT == NULL);
-}
-
-#endif /* GL_EXT_light_texture */
-
-#ifdef GL_EXT_misc_attribute
-
-static void _glewInfo_GL_EXT_misc_attribute (void)
-{
-  glewPrintExt("GL_EXT_misc_attribute", GLEW_EXT_misc_attribute, glewIsSupported("GL_EXT_misc_attribute"), glewGetExtension("GL_EXT_misc_attribute"));
-}
-
-#endif /* GL_EXT_misc_attribute */
-
-#ifdef GL_EXT_multi_draw_arrays
-
-static void _glewInfo_GL_EXT_multi_draw_arrays (void)
-{
-  glewPrintExt("GL_EXT_multi_draw_arrays", GLEW_EXT_multi_draw_arrays, glewIsSupported("GL_EXT_multi_draw_arrays"), glewGetExtension("GL_EXT_multi_draw_arrays"));
-
-  glewInfoFunc("glMultiDrawArraysEXT", glMultiDrawArraysEXT == NULL);
-  glewInfoFunc("glMultiDrawElementsEXT", glMultiDrawElementsEXT == NULL);
-}
-
-#endif /* GL_EXT_multi_draw_arrays */
-
-#ifdef GL_EXT_multisample
-
-static void _glewInfo_GL_EXT_multisample (void)
-{
-  glewPrintExt("GL_EXT_multisample", GLEW_EXT_multisample, glewIsSupported("GL_EXT_multisample"), glewGetExtension("GL_EXT_multisample"));
-
-  glewInfoFunc("glSampleMaskEXT", glSampleMaskEXT == NULL);
-  glewInfoFunc("glSamplePatternEXT", glSamplePatternEXT == NULL);
-}
-
-#endif /* GL_EXT_multisample */
-
-#ifdef GL_EXT_packed_depth_stencil
-
-static void _glewInfo_GL_EXT_packed_depth_stencil (void)
-{
-  glewPrintExt("GL_EXT_packed_depth_stencil", GLEW_EXT_packed_depth_stencil, glewIsSupported("GL_EXT_packed_depth_stencil"), glewGetExtension("GL_EXT_packed_depth_stencil"));
-}
-
-#endif /* GL_EXT_packed_depth_stencil */
-
-#ifdef GL_EXT_packed_float
-
-static void _glewInfo_GL_EXT_packed_float (void)
-{
-  glewPrintExt("GL_EXT_packed_float", GLEW_EXT_packed_float, glewIsSupported("GL_EXT_packed_float"), glewGetExtension("GL_EXT_packed_float"));
-}
-
-#endif /* GL_EXT_packed_float */
-
-#ifdef GL_EXT_packed_pixels
-
-static void _glewInfo_GL_EXT_packed_pixels (void)
-{
-  glewPrintExt("GL_EXT_packed_pixels", GLEW_EXT_packed_pixels, glewIsSupported("GL_EXT_packed_pixels"), glewGetExtension("GL_EXT_packed_pixels"));
-}
-
-#endif /* GL_EXT_packed_pixels */
-
-#ifdef GL_EXT_paletted_texture
-
-static void _glewInfo_GL_EXT_paletted_texture (void)
-{
-  glewPrintExt("GL_EXT_paletted_texture", GLEW_EXT_paletted_texture, glewIsSupported("GL_EXT_paletted_texture"), glewGetExtension("GL_EXT_paletted_texture"));
-
-  glewInfoFunc("glColorTableEXT", glColorTableEXT == NULL);
-  glewInfoFunc("glGetColorTableEXT", glGetColorTableEXT == NULL);
-  glewInfoFunc("glGetColorTableParameterfvEXT", glGetColorTableParameterfvEXT == NULL);
-  glewInfoFunc("glGetColorTableParameterivEXT", glGetColorTableParameterivEXT == NULL);
-}
-
-#endif /* GL_EXT_paletted_texture */
-
-#ifdef GL_EXT_pixel_buffer_object
-
-static void _glewInfo_GL_EXT_pixel_buffer_object (void)
-{
-  glewPrintExt("GL_EXT_pixel_buffer_object", GLEW_EXT_pixel_buffer_object, glewIsSupported("GL_EXT_pixel_buffer_object"), glewGetExtension("GL_EXT_pixel_buffer_object"));
-}
-
-#endif /* GL_EXT_pixel_buffer_object */
-
-#ifdef GL_EXT_pixel_transform
-
-static void _glewInfo_GL_EXT_pixel_transform (void)
-{
-  glewPrintExt("GL_EXT_pixel_transform", GLEW_EXT_pixel_transform, glewIsSupported("GL_EXT_pixel_transform"), glewGetExtension("GL_EXT_pixel_transform"));
-
-  glewInfoFunc("glGetPixelTransformParameterfvEXT", glGetPixelTransformParameterfvEXT == NULL);
-  glewInfoFunc("glGetPixelTransformParameterivEXT", glGetPixelTransformParameterivEXT == NULL);
-  glewInfoFunc("glPixelTransformParameterfEXT", glPixelTransformParameterfEXT == NULL);
-  glewInfoFunc("glPixelTransformParameterfvEXT", glPixelTransformParameterfvEXT == NULL);
-  glewInfoFunc("glPixelTransformParameteriEXT", glPixelTransformParameteriEXT == NULL);
-  glewInfoFunc("glPixelTransformParameterivEXT", glPixelTransformParameterivEXT == NULL);
-}
-
-#endif /* GL_EXT_pixel_transform */
-
-#ifdef GL_EXT_pixel_transform_color_table
-
-static void _glewInfo_GL_EXT_pixel_transform_color_table (void)
-{
-  glewPrintExt("GL_EXT_pixel_transform_color_table", GLEW_EXT_pixel_transform_color_table, glewIsSupported("GL_EXT_pixel_transform_color_table"), glewGetExtension("GL_EXT_pixel_transform_color_table"));
-}
-
-#endif /* GL_EXT_pixel_transform_color_table */
-
-#ifdef GL_EXT_point_parameters
-
-static void _glewInfo_GL_EXT_point_parameters (void)
-{
-  glewPrintExt("GL_EXT_point_parameters", GLEW_EXT_point_parameters, glewIsSupported("GL_EXT_point_parameters"), glewGetExtension("GL_EXT_point_parameters"));
-
-  glewInfoFunc("glPointParameterfEXT", glPointParameterfEXT == NULL);
-  glewInfoFunc("glPointParameterfvEXT", glPointParameterfvEXT == NULL);
-}
-
-#endif /* GL_EXT_point_parameters */
-
-#ifdef GL_EXT_polygon_offset
-
-static void _glewInfo_GL_EXT_polygon_offset (void)
-{
-  glewPrintExt("GL_EXT_polygon_offset", GLEW_EXT_polygon_offset, glewIsSupported("GL_EXT_polygon_offset"), glewGetExtension("GL_EXT_polygon_offset"));
-
-  glewInfoFunc("glPolygonOffsetEXT", glPolygonOffsetEXT == NULL);
-}
-
-#endif /* GL_EXT_polygon_offset */
-
-#ifdef GL_EXT_provoking_vertex
-
-static void _glewInfo_GL_EXT_provoking_vertex (void)
-{
-  glewPrintExt("GL_EXT_provoking_vertex", GLEW_EXT_provoking_vertex, glewIsSupported("GL_EXT_provoking_vertex"), glewGetExtension("GL_EXT_provoking_vertex"));
-
-  glewInfoFunc("glProvokingVertexEXT", glProvokingVertexEXT == NULL);
-}
-
-#endif /* GL_EXT_provoking_vertex */
-
-#ifdef GL_EXT_rescale_normal
-
-static void _glewInfo_GL_EXT_rescale_normal (void)
-{
-  glewPrintExt("GL_EXT_rescale_normal", GLEW_EXT_rescale_normal, glewIsSupported("GL_EXT_rescale_normal"), glewGetExtension("GL_EXT_rescale_normal"));
-}
-
-#endif /* GL_EXT_rescale_normal */
-
-#ifdef GL_EXT_scene_marker
-
-static void _glewInfo_GL_EXT_scene_marker (void)
-{
-  glewPrintExt("GL_EXT_scene_marker", GLEW_EXT_scene_marker, glewIsSupported("GL_EXT_scene_marker"), glewGetExtension("GL_EXT_scene_marker"));
-
-  glewInfoFunc("glBeginSceneEXT", glBeginSceneEXT == NULL);
-  glewInfoFunc("glEndSceneEXT", glEndSceneEXT == NULL);
-}
-
-#endif /* GL_EXT_scene_marker */
-
-#ifdef GL_EXT_secondary_color
-
-static void _glewInfo_GL_EXT_secondary_color (void)
-{
-  glewPrintExt("GL_EXT_secondary_color", GLEW_EXT_secondary_color, glewIsSupported("GL_EXT_secondary_color"), glewGetExtension("GL_EXT_secondary_color"));
-
-  glewInfoFunc("glSecondaryColor3bEXT", glSecondaryColor3bEXT == NULL);
-  glewInfoFunc("glSecondaryColor3bvEXT", glSecondaryColor3bvEXT == NULL);
-  glewInfoFunc("glSecondaryColor3dEXT", glSecondaryColor3dEXT == NULL);
-  glewInfoFunc("glSecondaryColor3dvEXT", glSecondaryColor3dvEXT == NULL);
-  glewInfoFunc("glSecondaryColor3fEXT", glSecondaryColor3fEXT == NULL);
-  glewInfoFunc("glSecondaryColor3fvEXT", glSecondaryColor3fvEXT == NULL);
-  glewInfoFunc("glSecondaryColor3iEXT", glSecondaryColor3iEXT == NULL);
-  glewInfoFunc("glSecondaryColor3ivEXT", glSecondaryColor3ivEXT == NULL);
-  glewInfoFunc("glSecondaryColor3sEXT", glSecondaryColor3sEXT == NULL);
-  glewInfoFunc("glSecondaryColor3svEXT", glSecondaryColor3svEXT == NULL);
-  glewInfoFunc("glSecondaryColor3ubEXT", glSecondaryColor3ubEXT == NULL);
-  glewInfoFunc("glSecondaryColor3ubvEXT", glSecondaryColor3ubvEXT == NULL);
-  glewInfoFunc("glSecondaryColor3uiEXT", glSecondaryColor3uiEXT == NULL);
-  glewInfoFunc("glSecondaryColor3uivEXT", glSecondaryColor3uivEXT == NULL);
-  glewInfoFunc("glSecondaryColor3usEXT", glSecondaryColor3usEXT == NULL);
-  glewInfoFunc("glSecondaryColor3usvEXT", glSecondaryColor3usvEXT == NULL);
-  glewInfoFunc("glSecondaryColorPointerEXT", glSecondaryColorPointerEXT == NULL);
-}
-
-#endif /* GL_EXT_secondary_color */
-
-#ifdef GL_EXT_separate_shader_objects
-
-static void _glewInfo_GL_EXT_separate_shader_objects (void)
-{
-  glewPrintExt("GL_EXT_separate_shader_objects", GLEW_EXT_separate_shader_objects, glewIsSupported("GL_EXT_separate_shader_objects"), glewGetExtension("GL_EXT_separate_shader_objects"));
-
-  glewInfoFunc("glActiveProgramEXT", glActiveProgramEXT == NULL);
-  glewInfoFunc("glCreateShaderProgramEXT", glCreateShaderProgramEXT == NULL);
-  glewInfoFunc("glUseShaderProgramEXT", glUseShaderProgramEXT == NULL);
-}
-
-#endif /* GL_EXT_separate_shader_objects */
-
-#ifdef GL_EXT_separate_specular_color
-
-static void _glewInfo_GL_EXT_separate_specular_color (void)
-{
-  glewPrintExt("GL_EXT_separate_specular_color", GLEW_EXT_separate_specular_color, glewIsSupported("GL_EXT_separate_specular_color"), glewGetExtension("GL_EXT_separate_specular_color"));
-}
-
-#endif /* GL_EXT_separate_specular_color */
-
-#ifdef GL_EXT_shader_image_load_store
-
-static void _glewInfo_GL_EXT_shader_image_load_store (void)
-{
-  glewPrintExt("GL_EXT_shader_image_load_store", GLEW_EXT_shader_image_load_store, glewIsSupported("GL_EXT_shader_image_load_store"), glewGetExtension("GL_EXT_shader_image_load_store"));
-
-  glewInfoFunc("glBindImageTextureEXT", glBindImageTextureEXT == NULL);
-  glewInfoFunc("glMemoryBarrierEXT", glMemoryBarrierEXT == NULL);
-}
-
-#endif /* GL_EXT_shader_image_load_store */
-
-#ifdef GL_EXT_shadow_funcs
-
-static void _glewInfo_GL_EXT_shadow_funcs (void)
-{
-  glewPrintExt("GL_EXT_shadow_funcs", GLEW_EXT_shadow_funcs, glewIsSupported("GL_EXT_shadow_funcs"), glewGetExtension("GL_EXT_shadow_funcs"));
-}
-
-#endif /* GL_EXT_shadow_funcs */
-
-#ifdef GL_EXT_shared_texture_palette
-
-static void _glewInfo_GL_EXT_shared_texture_palette (void)
-{
-  glewPrintExt("GL_EXT_shared_texture_palette", GLEW_EXT_shared_texture_palette, glewIsSupported("GL_EXT_shared_texture_palette"), glewGetExtension("GL_EXT_shared_texture_palette"));
-}
-
-#endif /* GL_EXT_shared_texture_palette */
-
-#ifdef GL_EXT_stencil_clear_tag
-
-static void _glewInfo_GL_EXT_stencil_clear_tag (void)
-{
-  glewPrintExt("GL_EXT_stencil_clear_tag", GLEW_EXT_stencil_clear_tag, glewIsSupported("GL_EXT_stencil_clear_tag"), glewGetExtension("GL_EXT_stencil_clear_tag"));
-}
-
-#endif /* GL_EXT_stencil_clear_tag */
-
-#ifdef GL_EXT_stencil_two_side
-
-static void _glewInfo_GL_EXT_stencil_two_side (void)
-{
-  glewPrintExt("GL_EXT_stencil_two_side", GLEW_EXT_stencil_two_side, glewIsSupported("GL_EXT_stencil_two_side"), glewGetExtension("GL_EXT_stencil_two_side"));
-
-  glewInfoFunc("glActiveStencilFaceEXT", glActiveStencilFaceEXT == NULL);
-}
-
-#endif /* GL_EXT_stencil_two_side */
-
-#ifdef GL_EXT_stencil_wrap
-
-static void _glewInfo_GL_EXT_stencil_wrap (void)
-{
-  glewPrintExt("GL_EXT_stencil_wrap", GLEW_EXT_stencil_wrap, glewIsSupported("GL_EXT_stencil_wrap"), glewGetExtension("GL_EXT_stencil_wrap"));
-}
-
-#endif /* GL_EXT_stencil_wrap */
-
-#ifdef GL_EXT_subtexture
-
-static void _glewInfo_GL_EXT_subtexture (void)
-{
-  glewPrintExt("GL_EXT_subtexture", GLEW_EXT_subtexture, glewIsSupported("GL_EXT_subtexture"), glewGetExtension("GL_EXT_subtexture"));
-
-  glewInfoFunc("glTexSubImage1DEXT", glTexSubImage1DEXT == NULL);
-  glewInfoFunc("glTexSubImage2DEXT", glTexSubImage2DEXT == NULL);
-  glewInfoFunc("glTexSubImage3DEXT", glTexSubImage3DEXT == NULL);
-}
-
-#endif /* GL_EXT_subtexture */
-
-#ifdef GL_EXT_texture
-
-static void _glewInfo_GL_EXT_texture (void)
-{
-  glewPrintExt("GL_EXT_texture", GLEW_EXT_texture, glewIsSupported("GL_EXT_texture"), glewGetExtension("GL_EXT_texture"));
-}
-
-#endif /* GL_EXT_texture */
-
-#ifdef GL_EXT_texture3D
-
-static void _glewInfo_GL_EXT_texture3D (void)
-{
-  glewPrintExt("GL_EXT_texture3D", GLEW_EXT_texture3D, glewIsSupported("GL_EXT_texture3D"), glewGetExtension("GL_EXT_texture3D"));
-
-  glewInfoFunc("glTexImage3DEXT", glTexImage3DEXT == NULL);
-}
-
-#endif /* GL_EXT_texture3D */
-
-#ifdef GL_EXT_texture_array
-
-static void _glewInfo_GL_EXT_texture_array (void)
-{
-  glewPrintExt("GL_EXT_texture_array", GLEW_EXT_texture_array, glewIsSupported("GL_EXT_texture_array"), glewGetExtension("GL_EXT_texture_array"));
-
-  glewInfoFunc("glFramebufferTextureLayerEXT", glFramebufferTextureLayerEXT == NULL);
-}
-
-#endif /* GL_EXT_texture_array */
-
-#ifdef GL_EXT_texture_buffer_object
-
-static void _glewInfo_GL_EXT_texture_buffer_object (void)
-{
-  glewPrintExt("GL_EXT_texture_buffer_object", GLEW_EXT_texture_buffer_object, glewIsSupported("GL_EXT_texture_buffer_object"), glewGetExtension("GL_EXT_texture_buffer_object"));
-
-  glewInfoFunc("glTexBufferEXT", glTexBufferEXT == NULL);
-}
-
-#endif /* GL_EXT_texture_buffer_object */
-
-#ifdef GL_EXT_texture_compression_dxt1
-
-static void _glewInfo_GL_EXT_texture_compression_dxt1 (void)
-{
-  glewPrintExt("GL_EXT_texture_compression_dxt1", GLEW_EXT_texture_compression_dxt1, glewIsSupported("GL_EXT_texture_compression_dxt1"), glewGetExtension("GL_EXT_texture_compression_dxt1"));
-}
-
-#endif /* GL_EXT_texture_compression_dxt1 */
-
-#ifdef GL_EXT_texture_compression_latc
-
-static void _glewInfo_GL_EXT_texture_compression_latc (void)
-{
-  glewPrintExt("GL_EXT_texture_compression_latc", GLEW_EXT_texture_compression_latc, glewIsSupported("GL_EXT_texture_compression_latc"), glewGetExtension("GL_EXT_texture_compression_latc"));
-}
-
-#endif /* GL_EXT_texture_compression_latc */
-
-#ifdef GL_EXT_texture_compression_rgtc
-
-static void _glewInfo_GL_EXT_texture_compression_rgtc (void)
-{
-  glewPrintExt("GL_EXT_texture_compression_rgtc", GLEW_EXT_texture_compression_rgtc, glewIsSupported("GL_EXT_texture_compression_rgtc"), glewGetExtension("GL_EXT_texture_compression_rgtc"));
-}
-
-#endif /* GL_EXT_texture_compression_rgtc */
-
-#ifdef GL_EXT_texture_compression_s3tc
-
-static void _glewInfo_GL_EXT_texture_compression_s3tc (void)
-{
-  glewPrintExt("GL_EXT_texture_compression_s3tc", GLEW_EXT_texture_compression_s3tc, glewIsSupported("GL_EXT_texture_compression_s3tc"), glewGetExtension("GL_EXT_texture_compression_s3tc"));
-}
-
-#endif /* GL_EXT_texture_compression_s3tc */
-
-#ifdef GL_EXT_texture_cube_map
-
-static void _glewInfo_GL_EXT_texture_cube_map (void)
-{
-  glewPrintExt("GL_EXT_texture_cube_map", GLEW_EXT_texture_cube_map, glewIsSupported("GL_EXT_texture_cube_map"), glewGetExtension("GL_EXT_texture_cube_map"));
-}
-
-#endif /* GL_EXT_texture_cube_map */
-
-#ifdef GL_EXT_texture_edge_clamp
-
-static void _glewInfo_GL_EXT_texture_edge_clamp (void)
-{
-  glewPrintExt("GL_EXT_texture_edge_clamp", GLEW_EXT_texture_edge_clamp, glewIsSupported("GL_EXT_texture_edge_clamp"), glewGetExtension("GL_EXT_texture_edge_clamp"));
-}
-
-#endif /* GL_EXT_texture_edge_clamp */
-
-#ifdef GL_EXT_texture_env
-
-static void _glewInfo_GL_EXT_texture_env (void)
-{
-  glewPrintExt("GL_EXT_texture_env", GLEW_EXT_texture_env, glewIsSupported("GL_EXT_texture_env"), glewGetExtension("GL_EXT_texture_env"));
-}
-
-#endif /* GL_EXT_texture_env */
-
-#ifdef GL_EXT_texture_env_add
-
-static void _glewInfo_GL_EXT_texture_env_add (void)
-{
-  glewPrintExt("GL_EXT_texture_env_add", GLEW_EXT_texture_env_add, glewIsSupported("GL_EXT_texture_env_add"), glewGetExtension("GL_EXT_texture_env_add"));
-}
-
-#endif /* GL_EXT_texture_env_add */
-
-#ifdef GL_EXT_texture_env_combine
-
-static void _glewInfo_GL_EXT_texture_env_combine (void)
-{
-  glewPrintExt("GL_EXT_texture_env_combine", GLEW_EXT_texture_env_combine, glewIsSupported("GL_EXT_texture_env_combine"), glewGetExtension("GL_EXT_texture_env_combine"));
-}
-
-#endif /* GL_EXT_texture_env_combine */
-
-#ifdef GL_EXT_texture_env_dot3
-
-static void _glewInfo_GL_EXT_texture_env_dot3 (void)
-{
-  glewPrintExt("GL_EXT_texture_env_dot3", GLEW_EXT_texture_env_dot3, glewIsSupported("GL_EXT_texture_env_dot3"), glewGetExtension("GL_EXT_texture_env_dot3"));
-}
-
-#endif /* GL_EXT_texture_env_dot3 */
-
-#ifdef GL_EXT_texture_filter_anisotropic
-
-static void _glewInfo_GL_EXT_texture_filter_anisotropic (void)
-{
-  glewPrintExt("GL_EXT_texture_filter_anisotropic", GLEW_EXT_texture_filter_anisotropic, glewIsSupported("GL_EXT_texture_filter_anisotropic"), glewGetExtension("GL_EXT_texture_filter_anisotropic"));
-}
-
-#endif /* GL_EXT_texture_filter_anisotropic */
-
-#ifdef GL_EXT_texture_integer
-
-static void _glewInfo_GL_EXT_texture_integer (void)
-{
-  glewPrintExt("GL_EXT_texture_integer", GLEW_EXT_texture_integer, glewIsSupported("GL_EXT_texture_integer"), glewGetExtension("GL_EXT_texture_integer"));
-
-  glewInfoFunc("glClearColorIiEXT", glClearColorIiEXT == NULL);
-  glewInfoFunc("glClearColorIuiEXT", glClearColorIuiEXT == NULL);
-  glewInfoFunc("glGetTexParameterIivEXT", glGetTexParameterIivEXT == NULL);
-  glewInfoFunc("glGetTexParameterIuivEXT", glGetTexParameterIuivEXT == NULL);
-  glewInfoFunc("glTexParameterIivEXT", glTexParameterIivEXT == NULL);
-  glewInfoFunc("glTexParameterIuivEXT", glTexParameterIuivEXT == NULL);
-}
-
-#endif /* GL_EXT_texture_integer */
-
-#ifdef GL_EXT_texture_lod_bias
-
-static void _glewInfo_GL_EXT_texture_lod_bias (void)
-{
-  glewPrintExt("GL_EXT_texture_lod_bias", GLEW_EXT_texture_lod_bias, glewIsSupported("GL_EXT_texture_lod_bias"), glewGetExtension("GL_EXT_texture_lod_bias"));
-}
-
-#endif /* GL_EXT_texture_lod_bias */
-
-#ifdef GL_EXT_texture_mirror_clamp
-
-static void _glewInfo_GL_EXT_texture_mirror_clamp (void)
-{
-  glewPrintExt("GL_EXT_texture_mirror_clamp", GLEW_EXT_texture_mirror_clamp, glewIsSupported("GL_EXT_texture_mirror_clamp"), glewGetExtension("GL_EXT_texture_mirror_clamp"));
-}
-
-#endif /* GL_EXT_texture_mirror_clamp */
-
-#ifdef GL_EXT_texture_object
-
-static void _glewInfo_GL_EXT_texture_object (void)
-{
-  glewPrintExt("GL_EXT_texture_object", GLEW_EXT_texture_object, glewIsSupported("GL_EXT_texture_object"), glewGetExtension("GL_EXT_texture_object"));
-
-  glewInfoFunc("glAreTexturesResidentEXT", glAreTexturesResidentEXT == NULL);
-  glewInfoFunc("glBindTextureEXT", glBindTextureEXT == NULL);
-  glewInfoFunc("glDeleteTexturesEXT", glDeleteTexturesEXT == NULL);
-  glewInfoFunc("glGenTexturesEXT", glGenTexturesEXT == NULL);
-  glewInfoFunc("glIsTextureEXT", glIsTextureEXT == NULL);
-  glewInfoFunc("glPrioritizeTexturesEXT", glPrioritizeTexturesEXT == NULL);
-}
-
-#endif /* GL_EXT_texture_object */
-
-#ifdef GL_EXT_texture_perturb_normal
-
-static void _glewInfo_GL_EXT_texture_perturb_normal (void)
-{
-  glewPrintExt("GL_EXT_texture_perturb_normal", GLEW_EXT_texture_perturb_normal, glewIsSupported("GL_EXT_texture_perturb_normal"), glewGetExtension("GL_EXT_texture_perturb_normal"));
-
-  glewInfoFunc("glTextureNormalEXT", glTextureNormalEXT == NULL);
-}
-
-#endif /* GL_EXT_texture_perturb_normal */
-
-#ifdef GL_EXT_texture_rectangle
-
-static void _glewInfo_GL_EXT_texture_rectangle (void)
-{
-  glewPrintExt("GL_EXT_texture_rectangle", GLEW_EXT_texture_rectangle, glewIsSupported("GL_EXT_texture_rectangle"), glewGetExtension("GL_EXT_texture_rectangle"));
-}
-
-#endif /* GL_EXT_texture_rectangle */
-
-#ifdef GL_EXT_texture_sRGB
-
-static void _glewInfo_GL_EXT_texture_sRGB (void)
-{
-  glewPrintExt("GL_EXT_texture_sRGB", GLEW_EXT_texture_sRGB, glewIsSupported("GL_EXT_texture_sRGB"), glewGetExtension("GL_EXT_texture_sRGB"));
-}
-
-#endif /* GL_EXT_texture_sRGB */
-
-#ifdef GL_EXT_texture_sRGB_decode
-
-static void _glewInfo_GL_EXT_texture_sRGB_decode (void)
-{
-  glewPrintExt("GL_EXT_texture_sRGB_decode", GLEW_EXT_texture_sRGB_decode, glewIsSupported("GL_EXT_texture_sRGB_decode"), glewGetExtension("GL_EXT_texture_sRGB_decode"));
-}
-
-#endif /* GL_EXT_texture_sRGB_decode */
-
-#ifdef GL_EXT_texture_shared_exponent
-
-static void _glewInfo_GL_EXT_texture_shared_exponent (void)
-{
-  glewPrintExt("GL_EXT_texture_shared_exponent", GLEW_EXT_texture_shared_exponent, glewIsSupported("GL_EXT_texture_shared_exponent"), glewGetExtension("GL_EXT_texture_shared_exponent"));
-}
-
-#endif /* GL_EXT_texture_shared_exponent */
-
-#ifdef GL_EXT_texture_snorm
-
-static void _glewInfo_GL_EXT_texture_snorm (void)
-{
-  glewPrintExt("GL_EXT_texture_snorm", GLEW_EXT_texture_snorm, glewIsSupported("GL_EXT_texture_snorm"), glewGetExtension("GL_EXT_texture_snorm"));
-}
-
-#endif /* GL_EXT_texture_snorm */
-
-#ifdef GL_EXT_texture_swizzle
-
-static void _glewInfo_GL_EXT_texture_swizzle (void)
-{
-  glewPrintExt("GL_EXT_texture_swizzle", GLEW_EXT_texture_swizzle, glewIsSupported("GL_EXT_texture_swizzle"), glewGetExtension("GL_EXT_texture_swizzle"));
-}
-
-#endif /* GL_EXT_texture_swizzle */
-
-#ifdef GL_EXT_timer_query
-
-static void _glewInfo_GL_EXT_timer_query (void)
-{
-  glewPrintExt("GL_EXT_timer_query", GLEW_EXT_timer_query, glewIsSupported("GL_EXT_timer_query"), glewGetExtension("GL_EXT_timer_query"));
-
-  glewInfoFunc("glGetQueryObjecti64vEXT", glGetQueryObjecti64vEXT == NULL);
-  glewInfoFunc("glGetQueryObjectui64vEXT", glGetQueryObjectui64vEXT == NULL);
-}
-
-#endif /* GL_EXT_timer_query */
-
-#ifdef GL_EXT_transform_feedback
-
-static void _glewInfo_GL_EXT_transform_feedback (void)
-{
-  glewPrintExt("GL_EXT_transform_feedback", GLEW_EXT_transform_feedback, glewIsSupported("GL_EXT_transform_feedback"), glewGetExtension("GL_EXT_transform_feedback"));
-
-  glewInfoFunc("glBeginTransformFeedbackEXT", glBeginTransformFeedbackEXT == NULL);
-  glewInfoFunc("glBindBufferBaseEXT", glBindBufferBaseEXT == NULL);
-  glewInfoFunc("glBindBufferOffsetEXT", glBindBufferOffsetEXT == NULL);
-  glewInfoFunc("glBindBufferRangeEXT", glBindBufferRangeEXT == NULL);
-  glewInfoFunc("glEndTransformFeedbackEXT", glEndTransformFeedbackEXT == NULL);
-  glewInfoFunc("glGetTransformFeedbackVaryingEXT", glGetTransformFeedbackVaryingEXT == NULL);
-  glewInfoFunc("glTransformFeedbackVaryingsEXT", glTransformFeedbackVaryingsEXT == NULL);
-}
-
-#endif /* GL_EXT_transform_feedback */
-
-#ifdef GL_EXT_vertex_array
-
-static void _glewInfo_GL_EXT_vertex_array (void)
-{
-  glewPrintExt("GL_EXT_vertex_array", GLEW_EXT_vertex_array, glewIsSupported("GL_EXT_vertex_array"), glewGetExtension("GL_EXT_vertex_array"));
-
-  glewInfoFunc("glArrayElementEXT", glArrayElementEXT == NULL);
-  glewInfoFunc("glColorPointerEXT", glColorPointerEXT == NULL);
-  glewInfoFunc("glDrawArraysEXT", glDrawArraysEXT == NULL);
-  glewInfoFunc("glEdgeFlagPointerEXT", glEdgeFlagPointerEXT == NULL);
-  glewInfoFunc("glIndexPointerEXT", glIndexPointerEXT == NULL);
-  glewInfoFunc("glNormalPointerEXT", glNormalPointerEXT == NULL);
-  glewInfoFunc("glTexCoordPointerEXT", glTexCoordPointerEXT == NULL);
-  glewInfoFunc("glVertexPointerEXT", glVertexPointerEXT == NULL);
-}
-
-#endif /* GL_EXT_vertex_array */
-
-#ifdef GL_EXT_vertex_array_bgra
-
-static void _glewInfo_GL_EXT_vertex_array_bgra (void)
-{
-  glewPrintExt("GL_EXT_vertex_array_bgra", GLEW_EXT_vertex_array_bgra, glewIsSupported("GL_EXT_vertex_array_bgra"), glewGetExtension("GL_EXT_vertex_array_bgra"));
-}
-
-#endif /* GL_EXT_vertex_array_bgra */
-
-#ifdef GL_EXT_vertex_attrib_64bit
-
-static void _glewInfo_GL_EXT_vertex_attrib_64bit (void)
-{
-  glewPrintExt("GL_EXT_vertex_attrib_64bit", GLEW_EXT_vertex_attrib_64bit, glewIsSupported("GL_EXT_vertex_attrib_64bit"), glewGetExtension("GL_EXT_vertex_attrib_64bit"));
-
-  glewInfoFunc("glGetVertexAttribLdvEXT", glGetVertexAttribLdvEXT == NULL);
-  glewInfoFunc("glVertexArrayVertexAttribLOffsetEXT", glVertexArrayVertexAttribLOffsetEXT == NULL);
-  glewInfoFunc("glVertexAttribL1dEXT", glVertexAttribL1dEXT == NULL);
-  glewInfoFunc("glVertexAttribL1dvEXT", glVertexAttribL1dvEXT == NULL);
-  glewInfoFunc("glVertexAttribL2dEXT", glVertexAttribL2dEXT == NULL);
-  glewInfoFunc("glVertexAttribL2dvEXT", glVertexAttribL2dvEXT == NULL);
-  glewInfoFunc("glVertexAttribL3dEXT", glVertexAttribL3dEXT == NULL);
-  glewInfoFunc("glVertexAttribL3dvEXT", glVertexAttribL3dvEXT == NULL);
-  glewInfoFunc("glVertexAttribL4dEXT", glVertexAttribL4dEXT == NULL);
-  glewInfoFunc("glVertexAttribL4dvEXT", glVertexAttribL4dvEXT == NULL);
-  glewInfoFunc("glVertexAttribLPointerEXT", glVertexAttribLPointerEXT == NULL);
-}
-
-#endif /* GL_EXT_vertex_attrib_64bit */
-
-#ifdef GL_EXT_vertex_shader
-
-static void _glewInfo_GL_EXT_vertex_shader (void)
-{
-  glewPrintExt("GL_EXT_vertex_shader", GLEW_EXT_vertex_shader, glewIsSupported("GL_EXT_vertex_shader"), glewGetExtension("GL_EXT_vertex_shader"));
-
-  glewInfoFunc("glBeginVertexShaderEXT", glBeginVertexShaderEXT == NULL);
-  glewInfoFunc("glBindLightParameterEXT", glBindLightParameterEXT == NULL);
-  glewInfoFunc("glBindMaterialParameterEXT", glBindMaterialParameterEXT == NULL);
-  glewInfoFunc("glBindParameterEXT", glBindParameterEXT == NULL);
-  glewInfoFunc("glBindTexGenParameterEXT", glBindTexGenParameterEXT == NULL);
-  glewInfoFunc("glBindTextureUnitParameterEXT", glBindTextureUnitParameterEXT == NULL);
-  glewInfoFunc("glBindVertexShaderEXT", glBindVertexShaderEXT == NULL);
-  glewInfoFunc("glDeleteVertexShaderEXT", glDeleteVertexShaderEXT == NULL);
-  glewInfoFunc("glDisableVariantClientStateEXT", glDisableVariantClientStateEXT == NULL);
-  glewInfoFunc("glEnableVariantClientStateEXT", glEnableVariantClientStateEXT == NULL);
-  glewInfoFunc("glEndVertexShaderEXT", glEndVertexShaderEXT == NULL);
-  glewInfoFunc("glExtractComponentEXT", glExtractComponentEXT == NULL);
-  glewInfoFunc("glGenSymbolsEXT", glGenSymbolsEXT == NULL);
-  glewInfoFunc("glGenVertexShadersEXT", glGenVertexShadersEXT == NULL);
-  glewInfoFunc("glGetInvariantBooleanvEXT", glGetInvariantBooleanvEXT == NULL);
-  glewInfoFunc("glGetInvariantFloatvEXT", glGetInvariantFloatvEXT == NULL);
-  glewInfoFunc("glGetInvariantIntegervEXT", glGetInvariantIntegervEXT == NULL);
-  glewInfoFunc("glGetLocalConstantBooleanvEXT", glGetLocalConstantBooleanvEXT == NULL);
-  glewInfoFunc("glGetLocalConstantFloatvEXT", glGetLocalConstantFloatvEXT == NULL);
-  glewInfoFunc("glGetLocalConstantIntegervEXT", glGetLocalConstantIntegervEXT == NULL);
-  glewInfoFunc("glGetVariantBooleanvEXT", glGetVariantBooleanvEXT == NULL);
-  glewInfoFunc("glGetVariantFloatvEXT", glGetVariantFloatvEXT == NULL);
-  glewInfoFunc("glGetVariantIntegervEXT", glGetVariantIntegervEXT == NULL);
-  glewInfoFunc("glGetVariantPointervEXT", glGetVariantPointervEXT == NULL);
-  glewInfoFunc("glInsertComponentEXT", glInsertComponentEXT == NULL);
-  glewInfoFunc("glIsVariantEnabledEXT", glIsVariantEnabledEXT == NULL);
-  glewInfoFunc("glSetInvariantEXT", glSetInvariantEXT == NULL);
-  glewInfoFunc("glSetLocalConstantEXT", glSetLocalConstantEXT == NULL);
-  glewInfoFunc("glShaderOp1EXT", glShaderOp1EXT == NULL);
-  glewInfoFunc("glShaderOp2EXT", glShaderOp2EXT == NULL);
-  glewInfoFunc("glShaderOp3EXT", glShaderOp3EXT == NULL);
-  glewInfoFunc("glSwizzleEXT", glSwizzleEXT == NULL);
-  glewInfoFunc("glVariantPointerEXT", glVariantPointerEXT == NULL);
-  glewInfoFunc("glVariantbvEXT", glVariantbvEXT == NULL);
-  glewInfoFunc("glVariantdvEXT", glVariantdvEXT == NULL);
-  glewInfoFunc("glVariantfvEXT", glVariantfvEXT == NULL);
-  glewInfoFunc("glVariantivEXT", glVariantivEXT == NULL);
-  glewInfoFunc("glVariantsvEXT", glVariantsvEXT == NULL);
-  glewInfoFunc("glVariantubvEXT", glVariantubvEXT == NULL);
-  glewInfoFunc("glVariantuivEXT", glVariantuivEXT == NULL);
-  glewInfoFunc("glVariantusvEXT", glVariantusvEXT == NULL);
-  glewInfoFunc("glWriteMaskEXT", glWriteMaskEXT == NULL);
-}
-
-#endif /* GL_EXT_vertex_shader */
-
-#ifdef GL_EXT_vertex_weighting
-
-static void _glewInfo_GL_EXT_vertex_weighting (void)
-{
-  glewPrintExt("GL_EXT_vertex_weighting", GLEW_EXT_vertex_weighting, glewIsSupported("GL_EXT_vertex_weighting"), glewGetExtension("GL_EXT_vertex_weighting"));
-
-  glewInfoFunc("glVertexWeightPointerEXT", glVertexWeightPointerEXT == NULL);
-  glewInfoFunc("glVertexWeightfEXT", glVertexWeightfEXT == NULL);
-  glewInfoFunc("glVertexWeightfvEXT", glVertexWeightfvEXT == NULL);
-}
-
-#endif /* GL_EXT_vertex_weighting */
-
-#ifdef GL_EXT_x11_sync_object
-
-static void _glewInfo_GL_EXT_x11_sync_object (void)
-{
-  glewPrintExt("GL_EXT_x11_sync_object", GLEW_EXT_x11_sync_object, glewIsSupported("GL_EXT_x11_sync_object"), glewGetExtension("GL_EXT_x11_sync_object"));
-
-  glewInfoFunc("glImportSyncEXT", glImportSyncEXT == NULL);
-}
-
-#endif /* GL_EXT_x11_sync_object */
-
-#ifdef GL_GREMEDY_frame_terminator
-
-static void _glewInfo_GL_GREMEDY_frame_terminator (void)
-{
-  glewPrintExt("GL_GREMEDY_frame_terminator", GLEW_GREMEDY_frame_terminator, glewIsSupported("GL_GREMEDY_frame_terminator"), glewGetExtension("GL_GREMEDY_frame_terminator"));
-
-  glewInfoFunc("glFrameTerminatorGREMEDY", glFrameTerminatorGREMEDY == NULL);
-}
-
-#endif /* GL_GREMEDY_frame_terminator */
-
-#ifdef GL_GREMEDY_string_marker
-
-static void _glewInfo_GL_GREMEDY_string_marker (void)
-{
-  glewPrintExt("GL_GREMEDY_string_marker", GLEW_GREMEDY_string_marker, glewIsSupported("GL_GREMEDY_string_marker"), glewGetExtension("GL_GREMEDY_string_marker"));
-
-  glewInfoFunc("glStringMarkerGREMEDY", glStringMarkerGREMEDY == NULL);
-}
-
-#endif /* GL_GREMEDY_string_marker */
-
-#ifdef GL_HP_convolution_border_modes
-
-static void _glewInfo_GL_HP_convolution_border_modes (void)
-{
-  glewPrintExt("GL_HP_convolution_border_modes", GLEW_HP_convolution_border_modes, glewIsSupported("GL_HP_convolution_border_modes"), glewGetExtension("GL_HP_convolution_border_modes"));
-}
-
-#endif /* GL_HP_convolution_border_modes */
-
-#ifdef GL_HP_image_transform
-
-static void _glewInfo_GL_HP_image_transform (void)
-{
-  glewPrintExt("GL_HP_image_transform", GLEW_HP_image_transform, glewIsSupported("GL_HP_image_transform"), glewGetExtension("GL_HP_image_transform"));
-
-  glewInfoFunc("glGetImageTransformParameterfvHP", glGetImageTransformParameterfvHP == NULL);
-  glewInfoFunc("glGetImageTransformParameterivHP", glGetImageTransformParameterivHP == NULL);
-  glewInfoFunc("glImageTransformParameterfHP", glImageTransformParameterfHP == NULL);
-  glewInfoFunc("glImageTransformParameterfvHP", glImageTransformParameterfvHP == NULL);
-  glewInfoFunc("glImageTransformParameteriHP", glImageTransformParameteriHP == NULL);
-  glewInfoFunc("glImageTransformParameterivHP", glImageTransformParameterivHP == NULL);
-}
-
-#endif /* GL_HP_image_transform */
-
-#ifdef GL_HP_occlusion_test
-
-static void _glewInfo_GL_HP_occlusion_test (void)
-{
-  glewPrintExt("GL_HP_occlusion_test", GLEW_HP_occlusion_test, glewIsSupported("GL_HP_occlusion_test"), glewGetExtension("GL_HP_occlusion_test"));
-}
-
-#endif /* GL_HP_occlusion_test */
-
-#ifdef GL_HP_texture_lighting
-
-static void _glewInfo_GL_HP_texture_lighting (void)
-{
-  glewPrintExt("GL_HP_texture_lighting", GLEW_HP_texture_lighting, glewIsSupported("GL_HP_texture_lighting"), glewGetExtension("GL_HP_texture_lighting"));
-}
-
-#endif /* GL_HP_texture_lighting */
-
-#ifdef GL_IBM_cull_vertex
-
-static void _glewInfo_GL_IBM_cull_vertex (void)
-{
-  glewPrintExt("GL_IBM_cull_vertex", GLEW_IBM_cull_vertex, glewIsSupported("GL_IBM_cull_vertex"), glewGetExtension("GL_IBM_cull_vertex"));
-}
-
-#endif /* GL_IBM_cull_vertex */
-
-#ifdef GL_IBM_multimode_draw_arrays
-
-static void _glewInfo_GL_IBM_multimode_draw_arrays (void)
-{
-  glewPrintExt("GL_IBM_multimode_draw_arrays", GLEW_IBM_multimode_draw_arrays, glewIsSupported("GL_IBM_multimode_draw_arrays"), glewGetExtension("GL_IBM_multimode_draw_arrays"));
-
-  glewInfoFunc("glMultiModeDrawArraysIBM", glMultiModeDrawArraysIBM == NULL);
-  glewInfoFunc("glMultiModeDrawElementsIBM", glMultiModeDrawElementsIBM == NULL);
-}
-
-#endif /* GL_IBM_multimode_draw_arrays */
-
-#ifdef GL_IBM_rasterpos_clip
-
-static void _glewInfo_GL_IBM_rasterpos_clip (void)
-{
-  glewPrintExt("GL_IBM_rasterpos_clip", GLEW_IBM_rasterpos_clip, glewIsSupported("GL_IBM_rasterpos_clip"), glewGetExtension("GL_IBM_rasterpos_clip"));
-}
-
-#endif /* GL_IBM_rasterpos_clip */
-
-#ifdef GL_IBM_static_data
-
-static void _glewInfo_GL_IBM_static_data (void)
-{
-  glewPrintExt("GL_IBM_static_data", GLEW_IBM_static_data, glewIsSupported("GL_IBM_static_data"), glewGetExtension("GL_IBM_static_data"));
-}
-
-#endif /* GL_IBM_static_data */
-
-#ifdef GL_IBM_texture_mirrored_repeat
-
-static void _glewInfo_GL_IBM_texture_mirrored_repeat (void)
-{
-  glewPrintExt("GL_IBM_texture_mirrored_repeat", GLEW_IBM_texture_mirrored_repeat, glewIsSupported("GL_IBM_texture_mirrored_repeat"), glewGetExtension("GL_IBM_texture_mirrored_repeat"));
-}
-
-#endif /* GL_IBM_texture_mirrored_repeat */
-
-#ifdef GL_IBM_vertex_array_lists
-
-static void _glewInfo_GL_IBM_vertex_array_lists (void)
-{
-  glewPrintExt("GL_IBM_vertex_array_lists", GLEW_IBM_vertex_array_lists, glewIsSupported("GL_IBM_vertex_array_lists"), glewGetExtension("GL_IBM_vertex_array_lists"));
-
-  glewInfoFunc("glColorPointerListIBM", glColorPointerListIBM == NULL);
-  glewInfoFunc("glEdgeFlagPointerListIBM", glEdgeFlagPointerListIBM == NULL);
-  glewInfoFunc("glFogCoordPointerListIBM", glFogCoordPointerListIBM == NULL);
-  glewInfoFunc("glIndexPointerListIBM", glIndexPointerListIBM == NULL);
-  glewInfoFunc("glNormalPointerListIBM", glNormalPointerListIBM == NULL);
-  glewInfoFunc("glSecondaryColorPointerListIBM", glSecondaryColorPointerListIBM == NULL);
-  glewInfoFunc("glTexCoordPointerListIBM", glTexCoordPointerListIBM == NULL);
-  glewInfoFunc("glVertexPointerListIBM", glVertexPointerListIBM == NULL);
-}
-
-#endif /* GL_IBM_vertex_array_lists */
-
-#ifdef GL_INGR_color_clamp
-
-static void _glewInfo_GL_INGR_color_clamp (void)
-{
-  glewPrintExt("GL_INGR_color_clamp", GLEW_INGR_color_clamp, glewIsSupported("GL_INGR_color_clamp"), glewGetExtension("GL_INGR_color_clamp"));
-}
-
-#endif /* GL_INGR_color_clamp */
-
-#ifdef GL_INGR_interlace_read
-
-static void _glewInfo_GL_INGR_interlace_read (void)
-{
-  glewPrintExt("GL_INGR_interlace_read", GLEW_INGR_interlace_read, glewIsSupported("GL_INGR_interlace_read"), glewGetExtension("GL_INGR_interlace_read"));
-}
-
-#endif /* GL_INGR_interlace_read */
-
-#ifdef GL_INTEL_parallel_arrays
-
-static void _glewInfo_GL_INTEL_parallel_arrays (void)
-{
-  glewPrintExt("GL_INTEL_parallel_arrays", GLEW_INTEL_parallel_arrays, glewIsSupported("GL_INTEL_parallel_arrays"), glewGetExtension("GL_INTEL_parallel_arrays"));
-
-  glewInfoFunc("glColorPointervINTEL", glColorPointervINTEL == NULL);
-  glewInfoFunc("glNormalPointervINTEL", glNormalPointervINTEL == NULL);
-  glewInfoFunc("glTexCoordPointervINTEL", glTexCoordPointervINTEL == NULL);
-  glewInfoFunc("glVertexPointervINTEL", glVertexPointervINTEL == NULL);
-}
-
-#endif /* GL_INTEL_parallel_arrays */
-
-#ifdef GL_INTEL_texture_scissor
-
-static void _glewInfo_GL_INTEL_texture_scissor (void)
-{
-  glewPrintExt("GL_INTEL_texture_scissor", GLEW_INTEL_texture_scissor, glewIsSupported("GL_INTEL_texture_scissor"), glewGetExtension("GL_INTEL_texture_scissor"));
-
-  glewInfoFunc("glTexScissorFuncINTEL", glTexScissorFuncINTEL == NULL);
-  glewInfoFunc("glTexScissorINTEL", glTexScissorINTEL == NULL);
-}
-
-#endif /* GL_INTEL_texture_scissor */
-
-#ifdef GL_KHR_debug
-
-static void _glewInfo_GL_KHR_debug (void)
-{
-  glewPrintExt("GL_KHR_debug", GLEW_KHR_debug, glewIsSupported("GL_KHR_debug"), glewGetExtension("GL_KHR_debug"));
-
-  glewInfoFunc("glDebugMessageCallback", glDebugMessageCallback == NULL);
-  glewInfoFunc("glDebugMessageControl", glDebugMessageControl == NULL);
-  glewInfoFunc("glDebugMessageInsert", glDebugMessageInsert == NULL);
-  glewInfoFunc("glGetDebugMessageLog", glGetDebugMessageLog == NULL);
-  glewInfoFunc("glGetObjectLabel", glGetObjectLabel == NULL);
-  glewInfoFunc("glGetObjectPtrLabel", glGetObjectPtrLabel == NULL);
-  glewInfoFunc("glGetPointerv", glGetPointerv == NULL);
-  glewInfoFunc("glObjectLabel", glObjectLabel == NULL);
-  glewInfoFunc("glObjectPtrLabel", glObjectPtrLabel == NULL);
-  glewInfoFunc("glPushDebugGroup", glPushDebugGroup == NULL);
-}
-
-#endif /* GL_KHR_debug */
-
-#ifdef GL_KHR_texture_compression_astc_ldr
-
-static void _glewInfo_GL_KHR_texture_compression_astc_ldr (void)
-{
-  glewPrintExt("GL_KHR_texture_compression_astc_ldr", GLEW_KHR_texture_compression_astc_ldr, glewIsSupported("GL_KHR_texture_compression_astc_ldr"), glewGetExtension("GL_KHR_texture_compression_astc_ldr"));
-}
-
-#endif /* GL_KHR_texture_compression_astc_ldr */
-
-#ifdef GL_KTX_buffer_region
-
-static void _glewInfo_GL_KTX_buffer_region (void)
-{
-  glewPrintExt("GL_KTX_buffer_region", GLEW_KTX_buffer_region, glewIsSupported("GL_KTX_buffer_region"), glewGetExtension("GL_KTX_buffer_region"));
-
-  glewInfoFunc("glBufferRegionEnabled", glBufferRegionEnabled == NULL);
-  glewInfoFunc("glDeleteBufferRegion", glDeleteBufferRegion == NULL);
-  glewInfoFunc("glDrawBufferRegion", glDrawBufferRegion == NULL);
-  glewInfoFunc("glNewBufferRegion", glNewBufferRegion == NULL);
-  glewInfoFunc("glReadBufferRegion", glReadBufferRegion == NULL);
-}
-
-#endif /* GL_KTX_buffer_region */
-
-#ifdef GL_MESAX_texture_stack
-
-static void _glewInfo_GL_MESAX_texture_stack (void)
-{
-  glewPrintExt("GL_MESAX_texture_stack", GLEW_MESAX_texture_stack, glewIsSupported("GL_MESAX_texture_stack"), glewGetExtension("GL_MESAX_texture_stack"));
-}
-
-#endif /* GL_MESAX_texture_stack */
-
-#ifdef GL_MESA_pack_invert
-
-static void _glewInfo_GL_MESA_pack_invert (void)
-{
-  glewPrintExt("GL_MESA_pack_invert", GLEW_MESA_pack_invert, glewIsSupported("GL_MESA_pack_invert"), glewGetExtension("GL_MESA_pack_invert"));
-}
-
-#endif /* GL_MESA_pack_invert */
-
-#ifdef GL_MESA_resize_buffers
-
-static void _glewInfo_GL_MESA_resize_buffers (void)
-{
-  glewPrintExt("GL_MESA_resize_buffers", GLEW_MESA_resize_buffers, glewIsSupported("GL_MESA_resize_buffers"), glewGetExtension("GL_MESA_resize_buffers"));
-
-  glewInfoFunc("glResizeBuffersMESA", glResizeBuffersMESA == NULL);
-}
-
-#endif /* GL_MESA_resize_buffers */
-
-#ifdef GL_MESA_window_pos
-
-static void _glewInfo_GL_MESA_window_pos (void)
-{
-  glewPrintExt("GL_MESA_window_pos", GLEW_MESA_window_pos, glewIsSupported("GL_MESA_window_pos"), glewGetExtension("GL_MESA_window_pos"));
-
-  glewInfoFunc("glWindowPos2dMESA", glWindowPos2dMESA == NULL);
-  glewInfoFunc("glWindowPos2dvMESA", glWindowPos2dvMESA == NULL);
-  glewInfoFunc("glWindowPos2fMESA", glWindowPos2fMESA == NULL);
-  glewInfoFunc("glWindowPos2fvMESA", glWindowPos2fvMESA == NULL);
-  glewInfoFunc("glWindowPos2iMESA", glWindowPos2iMESA == NULL);
-  glewInfoFunc("glWindowPos2ivMESA", glWindowPos2ivMESA == NULL);
-  glewInfoFunc("glWindowPos2sMESA", glWindowPos2sMESA == NULL);
-  glewInfoFunc("glWindowPos2svMESA", glWindowPos2svMESA == NULL);
-  glewInfoFunc("glWindowPos3dMESA", glWindowPos3dMESA == NULL);
-  glewInfoFunc("glWindowPos3dvMESA", glWindowPos3dvMESA == NULL);
-  glewInfoFunc("glWindowPos3fMESA", glWindowPos3fMESA == NULL);
-  glewInfoFunc("glWindowPos3fvMESA", glWindowPos3fvMESA == NULL);
-  glewInfoFunc("glWindowPos3iMESA", glWindowPos3iMESA == NULL);
-  glewInfoFunc("glWindowPos3ivMESA", glWindowPos3ivMESA == NULL);
-  glewInfoFunc("glWindowPos3sMESA", glWindowPos3sMESA == NULL);
-  glewInfoFunc("glWindowPos3svMESA", glWindowPos3svMESA == NULL);
-  glewInfoFunc("glWindowPos4dMESA", glWindowPos4dMESA == NULL);
-  glewInfoFunc("glWindowPos4dvMESA", glWindowPos4dvMESA == NULL);
-  glewInfoFunc("glWindowPos4fMESA", glWindowPos4fMESA == NULL);
-  glewInfoFunc("glWindowPos4fvMESA", glWindowPos4fvMESA == NULL);
-  glewInfoFunc("glWindowPos4iMESA", glWindowPos4iMESA == NULL);
-  glewInfoFunc("glWindowPos4ivMESA", glWindowPos4ivMESA == NULL);
-  glewInfoFunc("glWindowPos4sMESA", glWindowPos4sMESA == NULL);
-  glewInfoFunc("glWindowPos4svMESA", glWindowPos4svMESA == NULL);
-}
-
-#endif /* GL_MESA_window_pos */
-
-#ifdef GL_MESA_ycbcr_texture
-
-static void _glewInfo_GL_MESA_ycbcr_texture (void)
-{
-  glewPrintExt("GL_MESA_ycbcr_texture", GLEW_MESA_ycbcr_texture, glewIsSupported("GL_MESA_ycbcr_texture"), glewGetExtension("GL_MESA_ycbcr_texture"));
-}
-
-#endif /* GL_MESA_ycbcr_texture */
-
-#ifdef GL_NVX_gpu_memory_info
-
-static void _glewInfo_GL_NVX_gpu_memory_info (void)
-{
-  glewPrintExt("GL_NVX_gpu_memory_info", GLEW_NVX_gpu_memory_info, glewIsSupported("GL_NVX_gpu_memory_info"), glewGetExtension("GL_NVX_gpu_memory_info"));
-}
-
-#endif /* GL_NVX_gpu_memory_info */
-
-#ifdef GL_NV_bindless_texture
-
-static void _glewInfo_GL_NV_bindless_texture (void)
-{
-  glewPrintExt("GL_NV_bindless_texture", GLEW_NV_bindless_texture, glewIsSupported("GL_NV_bindless_texture"), glewGetExtension("GL_NV_bindless_texture"));
-
-  glewInfoFunc("glGetImageHandleNV", glGetImageHandleNV == NULL);
-  glewInfoFunc("glGetTextureHandleNV", glGetTextureHandleNV == NULL);
-  glewInfoFunc("glGetTextureSamplerHandleNV", glGetTextureSamplerHandleNV == NULL);
-  glewInfoFunc("glIsImageHandleResidentNV", glIsImageHandleResidentNV == NULL);
-  glewInfoFunc("glIsTextureHandleResidentNV", glIsTextureHandleResidentNV == NULL);
-  glewInfoFunc("glMakeImageHandleNonResidentNV", glMakeImageHandleNonResidentNV == NULL);
-  glewInfoFunc("glMakeImageHandleResidentNV", glMakeImageHandleResidentNV == NULL);
-  glewInfoFunc("glMakeTextureHandleNonResidentNV", glMakeTextureHandleNonResidentNV == NULL);
-  glewInfoFunc("glMakeTextureHandleResidentNV", glMakeTextureHandleResidentNV == NULL);
-  glewInfoFunc("glProgramUniformHandleui64NV", glProgramUniformHandleui64NV == NULL);
-  glewInfoFunc("glProgramUniformHandleui64vNV", glProgramUniformHandleui64vNV == NULL);
-  glewInfoFunc("glUniformHandleui64NV", glUniformHandleui64NV == NULL);
-  glewInfoFunc("glUniformHandleui64vNV", glUniformHandleui64vNV == NULL);
-}
-
-#endif /* GL_NV_bindless_texture */
-
-#ifdef GL_NV_blend_square
-
-static void _glewInfo_GL_NV_blend_square (void)
-{
-  glewPrintExt("GL_NV_blend_square", GLEW_NV_blend_square, glewIsSupported("GL_NV_blend_square"), glewGetExtension("GL_NV_blend_square"));
-}
-
-#endif /* GL_NV_blend_square */
-
-#ifdef GL_NV_conditional_render
-
-static void _glewInfo_GL_NV_conditional_render (void)
-{
-  glewPrintExt("GL_NV_conditional_render", GLEW_NV_conditional_render, glewIsSupported("GL_NV_conditional_render"), glewGetExtension("GL_NV_conditional_render"));
-
-  glewInfoFunc("glBeginConditionalRenderNV", glBeginConditionalRenderNV == NULL);
-  glewInfoFunc("glEndConditionalRenderNV", glEndConditionalRenderNV == NULL);
-}
-
-#endif /* GL_NV_conditional_render */
-
-#ifdef GL_NV_copy_depth_to_color
-
-static void _glewInfo_GL_NV_copy_depth_to_color (void)
-{
-  glewPrintExt("GL_NV_copy_depth_to_color", GLEW_NV_copy_depth_to_color, glewIsSupported("GL_NV_copy_depth_to_color"), glewGetExtension("GL_NV_copy_depth_to_color"));
-}
-
-#endif /* GL_NV_copy_depth_to_color */
-
-#ifdef GL_NV_copy_image
-
-static void _glewInfo_GL_NV_copy_image (void)
-{
-  glewPrintExt("GL_NV_copy_image", GLEW_NV_copy_image, glewIsSupported("GL_NV_copy_image"), glewGetExtension("GL_NV_copy_image"));
-
-  glewInfoFunc("glCopyImageSubDataNV", glCopyImageSubDataNV == NULL);
-}
-
-#endif /* GL_NV_copy_image */
-
-#ifdef GL_NV_depth_buffer_float
-
-static void _glewInfo_GL_NV_depth_buffer_float (void)
-{
-  glewPrintExt("GL_NV_depth_buffer_float", GLEW_NV_depth_buffer_float, glewIsSupported("GL_NV_depth_buffer_float"), glewGetExtension("GL_NV_depth_buffer_float"));
-
-  glewInfoFunc("glClearDepthdNV", glClearDepthdNV == NULL);
-  glewInfoFunc("glDepthBoundsdNV", glDepthBoundsdNV == NULL);
-  glewInfoFunc("glDepthRangedNV", glDepthRangedNV == NULL);
-}
-
-#endif /* GL_NV_depth_buffer_float */
-
-#ifdef GL_NV_depth_clamp
-
-static void _glewInfo_GL_NV_depth_clamp (void)
-{
-  glewPrintExt("GL_NV_depth_clamp", GLEW_NV_depth_clamp, glewIsSupported("GL_NV_depth_clamp"), glewGetExtension("GL_NV_depth_clamp"));
-}
-
-#endif /* GL_NV_depth_clamp */
-
-#ifdef GL_NV_depth_range_unclamped
-
-static void _glewInfo_GL_NV_depth_range_unclamped (void)
-{
-  glewPrintExt("GL_NV_depth_range_unclamped", GLEW_NV_depth_range_unclamped, glewIsSupported("GL_NV_depth_range_unclamped"), glewGetExtension("GL_NV_depth_range_unclamped"));
-}
-
-#endif /* GL_NV_depth_range_unclamped */
-
-#ifdef GL_NV_evaluators
-
-static void _glewInfo_GL_NV_evaluators (void)
-{
-  glewPrintExt("GL_NV_evaluators", GLEW_NV_evaluators, glewIsSupported("GL_NV_evaluators"), glewGetExtension("GL_NV_evaluators"));
-
-  glewInfoFunc("glEvalMapsNV", glEvalMapsNV == NULL);
-  glewInfoFunc("glGetMapAttribParameterfvNV", glGetMapAttribParameterfvNV == NULL);
-  glewInfoFunc("glGetMapAttribParameterivNV", glGetMapAttribParameterivNV == NULL);
-  glewInfoFunc("glGetMapControlPointsNV", glGetMapControlPointsNV == NULL);
-  glewInfoFunc("glGetMapParameterfvNV", glGetMapParameterfvNV == NULL);
-  glewInfoFunc("glGetMapParameterivNV", glGetMapParameterivNV == NULL);
-  glewInfoFunc("glMapControlPointsNV", glMapControlPointsNV == NULL);
-  glewInfoFunc("glMapParameterfvNV", glMapParameterfvNV == NULL);
-  glewInfoFunc("glMapParameterivNV", glMapParameterivNV == NULL);
-}
-
-#endif /* GL_NV_evaluators */
-
-#ifdef GL_NV_explicit_multisample
-
-static void _glewInfo_GL_NV_explicit_multisample (void)
-{
-  glewPrintExt("GL_NV_explicit_multisample", GLEW_NV_explicit_multisample, glewIsSupported("GL_NV_explicit_multisample"), glewGetExtension("GL_NV_explicit_multisample"));
-
-  glewInfoFunc("glGetMultisamplefvNV", glGetMultisamplefvNV == NULL);
-  glewInfoFunc("glSampleMaskIndexedNV", glSampleMaskIndexedNV == NULL);
-  glewInfoFunc("glTexRenderbufferNV", glTexRenderbufferNV == NULL);
-}
-
-#endif /* GL_NV_explicit_multisample */
-
-#ifdef GL_NV_fence
-
-static void _glewInfo_GL_NV_fence (void)
-{
-  glewPrintExt("GL_NV_fence", GLEW_NV_fence, glewIsSupported("GL_NV_fence"), glewGetExtension("GL_NV_fence"));
-
-  glewInfoFunc("glDeleteFencesNV", glDeleteFencesNV == NULL);
-  glewInfoFunc("glFinishFenceNV", glFinishFenceNV == NULL);
-  glewInfoFunc("glGenFencesNV", glGenFencesNV == NULL);
-  glewInfoFunc("glGetFenceivNV", glGetFenceivNV == NULL);
-  glewInfoFunc("glIsFenceNV", glIsFenceNV == NULL);
-  glewInfoFunc("glSetFenceNV", glSetFenceNV == NULL);
-  glewInfoFunc("glTestFenceNV", glTestFenceNV == NULL);
-}
-
-#endif /* GL_NV_fence */
-
-#ifdef GL_NV_float_buffer
-
-static void _glewInfo_GL_NV_float_buffer (void)
-{
-  glewPrintExt("GL_NV_float_buffer", GLEW_NV_float_buffer, glewIsSupported("GL_NV_float_buffer"), glewGetExtension("GL_NV_float_buffer"));
-}
-
-#endif /* GL_NV_float_buffer */
-
-#ifdef GL_NV_fog_distance
-
-static void _glewInfo_GL_NV_fog_distance (void)
-{
-  glewPrintExt("GL_NV_fog_distance", GLEW_NV_fog_distance, glewIsSupported("GL_NV_fog_distance"), glewGetExtension("GL_NV_fog_distance"));
-}
-
-#endif /* GL_NV_fog_distance */
-
-#ifdef GL_NV_fragment_program
-
-static void _glewInfo_GL_NV_fragment_program (void)
-{
-  glewPrintExt("GL_NV_fragment_program", GLEW_NV_fragment_program, glewIsSupported("GL_NV_fragment_program"), glewGetExtension("GL_NV_fragment_program"));
-
-  glewInfoFunc("glGetProgramNamedParameterdvNV", glGetProgramNamedParameterdvNV == NULL);
-  glewInfoFunc("glGetProgramNamedParameterfvNV", glGetProgramNamedParameterfvNV == NULL);
-  glewInfoFunc("glProgramNamedParameter4dNV", glProgramNamedParameter4dNV == NULL);
-  glewInfoFunc("glProgramNamedParameter4dvNV", glProgramNamedParameter4dvNV == NULL);
-  glewInfoFunc("glProgramNamedParameter4fNV", glProgramNamedParameter4fNV == NULL);
-  glewInfoFunc("glProgramNamedParameter4fvNV", glProgramNamedParameter4fvNV == NULL);
-}
-
-#endif /* GL_NV_fragment_program */
-
-#ifdef GL_NV_fragment_program2
-
-static void _glewInfo_GL_NV_fragment_program2 (void)
-{
-  glewPrintExt("GL_NV_fragment_program2", GLEW_NV_fragment_program2, glewIsSupported("GL_NV_fragment_program2"), glewGetExtension("GL_NV_fragment_program2"));
-}
-
-#endif /* GL_NV_fragment_program2 */
-
-#ifdef GL_NV_fragment_program4
-
-static void _glewInfo_GL_NV_fragment_program4 (void)
-{
-  glewPrintExt("GL_NV_fragment_program4", GLEW_NV_fragment_program4, glewIsSupported("GL_NV_fragment_program4"), glewGetExtension("GL_NV_gpu_program4"));
-}
-
-#endif /* GL_NV_fragment_program4 */
-
-#ifdef GL_NV_fragment_program_option
-
-static void _glewInfo_GL_NV_fragment_program_option (void)
-{
-  glewPrintExt("GL_NV_fragment_program_option", GLEW_NV_fragment_program_option, glewIsSupported("GL_NV_fragment_program_option"), glewGetExtension("GL_NV_fragment_program_option"));
-}
-
-#endif /* GL_NV_fragment_program_option */
-
-#ifdef GL_NV_framebuffer_multisample_coverage
-
-static void _glewInfo_GL_NV_framebuffer_multisample_coverage (void)
-{
-  glewPrintExt("GL_NV_framebuffer_multisample_coverage", GLEW_NV_framebuffer_multisample_coverage, glewIsSupported("GL_NV_framebuffer_multisample_coverage"), glewGetExtension("GL_NV_framebuffer_multisample_coverage"));
-
-  glewInfoFunc("glRenderbufferStorageMultisampleCoverageNV", glRenderbufferStorageMultisampleCoverageNV == NULL);
-}
-
-#endif /* GL_NV_framebuffer_multisample_coverage */
-
-#ifdef GL_NV_geometry_program4
-
-static void _glewInfo_GL_NV_geometry_program4 (void)
-{
-  glewPrintExt("GL_NV_geometry_program4", GLEW_NV_geometry_program4, glewIsSupported("GL_NV_geometry_program4"), glewGetExtension("GL_NV_gpu_program4"));
-
-  glewInfoFunc("glProgramVertexLimitNV", glProgramVertexLimitNV == NULL);
-}
-
-#endif /* GL_NV_geometry_program4 */
-
-#ifdef GL_NV_geometry_shader4
-
-static void _glewInfo_GL_NV_geometry_shader4 (void)
-{
-  glewPrintExt("GL_NV_geometry_shader4", GLEW_NV_geometry_shader4, glewIsSupported("GL_NV_geometry_shader4"), glewGetExtension("GL_NV_geometry_shader4"));
-}
-
-#endif /* GL_NV_geometry_shader4 */
-
-#ifdef GL_NV_gpu_program4
-
-static void _glewInfo_GL_NV_gpu_program4 (void)
-{
-  glewPrintExt("GL_NV_gpu_program4", GLEW_NV_gpu_program4, glewIsSupported("GL_NV_gpu_program4"), glewGetExtension("GL_NV_gpu_program4"));
-
-  glewInfoFunc("glProgramEnvParameterI4iNV", glProgramEnvParameterI4iNV == NULL);
-  glewInfoFunc("glProgramEnvParameterI4ivNV", glProgramEnvParameterI4ivNV == NULL);
-  glewInfoFunc("glProgramEnvParameterI4uiNV", glProgramEnvParameterI4uiNV == NULL);
-  glewInfoFunc("glProgramEnvParameterI4uivNV", glProgramEnvParameterI4uivNV == NULL);
-  glewInfoFunc("glProgramEnvParametersI4ivNV", glProgramEnvParametersI4ivNV == NULL);
-  glewInfoFunc("glProgramEnvParametersI4uivNV", glProgramEnvParametersI4uivNV == NULL);
-  glewInfoFunc("glProgramLocalParameterI4iNV", glProgramLocalParameterI4iNV == NULL);
-  glewInfoFunc("glProgramLocalParameterI4ivNV", glProgramLocalParameterI4ivNV == NULL);
-  glewInfoFunc("glProgramLocalParameterI4uiNV", glProgramLocalParameterI4uiNV == NULL);
-  glewInfoFunc("glProgramLocalParameterI4uivNV", glProgramLocalParameterI4uivNV == NULL);
-  glewInfoFunc("glProgramLocalParametersI4ivNV", glProgramLocalParametersI4ivNV == NULL);
-  glewInfoFunc("glProgramLocalParametersI4uivNV", glProgramLocalParametersI4uivNV == NULL);
-}
-
-#endif /* GL_NV_gpu_program4 */
-
-#ifdef GL_NV_gpu_program5
-
-static void _glewInfo_GL_NV_gpu_program5 (void)
-{
-  glewPrintExt("GL_NV_gpu_program5", GLEW_NV_gpu_program5, glewIsSupported("GL_NV_gpu_program5"), glewGetExtension("GL_NV_gpu_program5"));
-}
-
-#endif /* GL_NV_gpu_program5 */
-
-#ifdef GL_NV_gpu_program_fp64
-
-static void _glewInfo_GL_NV_gpu_program_fp64 (void)
-{
-  glewPrintExt("GL_NV_gpu_program_fp64", GLEW_NV_gpu_program_fp64, glewIsSupported("GL_NV_gpu_program_fp64"), glewGetExtension("GL_NV_gpu_program_fp64"));
-}
-
-#endif /* GL_NV_gpu_program_fp64 */
-
-#ifdef GL_NV_gpu_shader5
-
-static void _glewInfo_GL_NV_gpu_shader5 (void)
-{
-  glewPrintExt("GL_NV_gpu_shader5", GLEW_NV_gpu_shader5, glewIsSupported("GL_NV_gpu_shader5"), glewGetExtension("GL_NV_gpu_shader5"));
-
-  glewInfoFunc("glGetUniformi64vNV", glGetUniformi64vNV == NULL);
-  glewInfoFunc("glGetUniformui64vNV", glGetUniformui64vNV == NULL);
-  glewInfoFunc("glProgramUniform1i64NV", glProgramUniform1i64NV == NULL);
-  glewInfoFunc("glProgramUniform1i64vNV", glProgramUniform1i64vNV == NULL);
-  glewInfoFunc("glProgramUniform1ui64NV", glProgramUniform1ui64NV == NULL);
-  glewInfoFunc("glProgramUniform1ui64vNV", glProgramUniform1ui64vNV == NULL);
-  glewInfoFunc("glProgramUniform2i64NV", glProgramUniform2i64NV == NULL);
-  glewInfoFunc("glProgramUniform2i64vNV", glProgramUniform2i64vNV == NULL);
-  glewInfoFunc("glProgramUniform2ui64NV", glProgramUniform2ui64NV == NULL);
-  glewInfoFunc("glProgramUniform2ui64vNV", glProgramUniform2ui64vNV == NULL);
-  glewInfoFunc("glProgramUniform3i64NV", glProgramUniform3i64NV == NULL);
-  glewInfoFunc("glProgramUniform3i64vNV", glProgramUniform3i64vNV == NULL);
-  glewInfoFunc("glProgramUniform3ui64NV", glProgramUniform3ui64NV == NULL);
-  glewInfoFunc("glProgramUniform3ui64vNV", glProgramUniform3ui64vNV == NULL);
-  glewInfoFunc("glProgramUniform4i64NV", glProgramUniform4i64NV == NULL);
-  glewInfoFunc("glProgramUniform4i64vNV", glProgramUniform4i64vNV == NULL);
-  glewInfoFunc("glProgramUniform4ui64NV", glProgramUniform4ui64NV == NULL);
-  glewInfoFunc("glProgramUniform4ui64vNV", glProgramUniform4ui64vNV == NULL);
-  glewInfoFunc("glUniform1i64NV", glUniform1i64NV == NULL);
-  glewInfoFunc("glUniform1i64vNV", glUniform1i64vNV == NULL);
-  glewInfoFunc("glUniform1ui64NV", glUniform1ui64NV == NULL);
-  glewInfoFunc("glUniform1ui64vNV", glUniform1ui64vNV == NULL);
-  glewInfoFunc("glUniform2i64NV", glUniform2i64NV == NULL);
-  glewInfoFunc("glUniform2i64vNV", glUniform2i64vNV == NULL);
-  glewInfoFunc("glUniform2ui64NV", glUniform2ui64NV == NULL);
-  glewInfoFunc("glUniform2ui64vNV", glUniform2ui64vNV == NULL);
-  glewInfoFunc("glUniform3i64NV", glUniform3i64NV == NULL);
-  glewInfoFunc("glUniform3i64vNV", glUniform3i64vNV == NULL);
-  glewInfoFunc("glUniform3ui64NV", glUniform3ui64NV == NULL);
-  glewInfoFunc("glUniform3ui64vNV", glUniform3ui64vNV == NULL);
-  glewInfoFunc("glUniform4i64NV", glUniform4i64NV == NULL);
-  glewInfoFunc("glUniform4i64vNV", glUniform4i64vNV == NULL);
-  glewInfoFunc("glUniform4ui64NV", glUniform4ui64NV == NULL);
-  glewInfoFunc("glUniform4ui64vNV", glUniform4ui64vNV == NULL);
-}
-
-#endif /* GL_NV_gpu_shader5 */
-
-#ifdef GL_NV_half_float
-
-static void _glewInfo_GL_NV_half_float (void)
-{
-  glewPrintExt("GL_NV_half_float", GLEW_NV_half_float, glewIsSupported("GL_NV_half_float"), glewGetExtension("GL_NV_half_float"));
-
-  glewInfoFunc("glColor3hNV", glColor3hNV == NULL);
-  glewInfoFunc("glColor3hvNV", glColor3hvNV == NULL);
-  glewInfoFunc("glColor4hNV", glColor4hNV == NULL);
-  glewInfoFunc("glColor4hvNV", glColor4hvNV == NULL);
-  glewInfoFunc("glFogCoordhNV", glFogCoordhNV == NULL);
-  glewInfoFunc("glFogCoordhvNV", glFogCoordhvNV == NULL);
-  glewInfoFunc("glMultiTexCoord1hNV", glMultiTexCoord1hNV == NULL);
-  glewInfoFunc("glMultiTexCoord1hvNV", glMultiTexCoord1hvNV == NULL);
-  glewInfoFunc("glMultiTexCoord2hNV", glMultiTexCoord2hNV == NULL);
-  glewInfoFunc("glMultiTexCoord2hvNV", glMultiTexCoord2hvNV == NULL);
-  glewInfoFunc("glMultiTexCoord3hNV", glMultiTexCoord3hNV == NULL);
-  glewInfoFunc("glMultiTexCoord3hvNV", glMultiTexCoord3hvNV == NULL);
-  glewInfoFunc("glMultiTexCoord4hNV", glMultiTexCoord4hNV == NULL);
-  glewInfoFunc("glMultiTexCoord4hvNV", glMultiTexCoord4hvNV == NULL);
-  glewInfoFunc("glNormal3hNV", glNormal3hNV == NULL);
-  glewInfoFunc("glNormal3hvNV", glNormal3hvNV == NULL);
-  glewInfoFunc("glSecondaryColor3hNV", glSecondaryColor3hNV == NULL);
-  glewInfoFunc("glSecondaryColor3hvNV", glSecondaryColor3hvNV == NULL);
-  glewInfoFunc("glTexCoord1hNV", glTexCoord1hNV == NULL);
-  glewInfoFunc("glTexCoord1hvNV", glTexCoord1hvNV == NULL);
-  glewInfoFunc("glTexCoord2hNV", glTexCoord2hNV == NULL);
-  glewInfoFunc("glTexCoord2hvNV", glTexCoord2hvNV == NULL);
-  glewInfoFunc("glTexCoord3hNV", glTexCoord3hNV == NULL);
-  glewInfoFunc("glTexCoord3hvNV", glTexCoord3hvNV == NULL);
-  glewInfoFunc("glTexCoord4hNV", glTexCoord4hNV == NULL);
-  glewInfoFunc("glTexCoord4hvNV", glTexCoord4hvNV == NULL);
-  glewInfoFunc("glVertex2hNV", glVertex2hNV == NULL);
-  glewInfoFunc("glVertex2hvNV", glVertex2hvNV == NULL);
-  glewInfoFunc("glVertex3hNV", glVertex3hNV == NULL);
-  glewInfoFunc("glVertex3hvNV", glVertex3hvNV == NULL);
-  glewInfoFunc("glVertex4hNV", glVertex4hNV == NULL);
-  glewInfoFunc("glVertex4hvNV", glVertex4hvNV == NULL);
-  glewInfoFunc("glVertexAttrib1hNV", glVertexAttrib1hNV == NULL);
-  glewInfoFunc("glVertexAttrib1hvNV", glVertexAttrib1hvNV == NULL);
-  glewInfoFunc("glVertexAttrib2hNV", glVertexAttrib2hNV == NULL);
-  glewInfoFunc("glVertexAttrib2hvNV", glVertexAttrib2hvNV == NULL);
-  glewInfoFunc("glVertexAttrib3hNV", glVertexAttrib3hNV == NULL);
-  glewInfoFunc("glVertexAttrib3hvNV", glVertexAttrib3hvNV == NULL);
-  glewInfoFunc("glVertexAttrib4hNV", glVertexAttrib4hNV == NULL);
-  glewInfoFunc("glVertexAttrib4hvNV", glVertexAttrib4hvNV == NULL);
-  glewInfoFunc("glVertexAttribs1hvNV", glVertexAttribs1hvNV == NULL);
-  glewInfoFunc("glVertexAttribs2hvNV", glVertexAttribs2hvNV == NULL);
-  glewInfoFunc("glVertexAttribs3hvNV", glVertexAttribs3hvNV == NULL);
-  glewInfoFunc("glVertexAttribs4hvNV", glVertexAttribs4hvNV == NULL);
-  glewInfoFunc("glVertexWeighthNV", glVertexWeighthNV == NULL);
-  glewInfoFunc("glVertexWeighthvNV", glVertexWeighthvNV == NULL);
-}
-
-#endif /* GL_NV_half_float */
-
-#ifdef GL_NV_light_max_exponent
-
-static void _glewInfo_GL_NV_light_max_exponent (void)
-{
-  glewPrintExt("GL_NV_light_max_exponent", GLEW_NV_light_max_exponent, glewIsSupported("GL_NV_light_max_exponent"), glewGetExtension("GL_NV_light_max_exponent"));
-}
-
-#endif /* GL_NV_light_max_exponent */
-
-#ifdef GL_NV_multisample_coverage
-
-static void _glewInfo_GL_NV_multisample_coverage (void)
-{
-  glewPrintExt("GL_NV_multisample_coverage", GLEW_NV_multisample_coverage, glewIsSupported("GL_NV_multisample_coverage"), glewGetExtension("GL_NV_multisample_coverage"));
-}
-
-#endif /* GL_NV_multisample_coverage */
-
-#ifdef GL_NV_multisample_filter_hint
-
-static void _glewInfo_GL_NV_multisample_filter_hint (void)
-{
-  glewPrintExt("GL_NV_multisample_filter_hint", GLEW_NV_multisample_filter_hint, glewIsSupported("GL_NV_multisample_filter_hint"), glewGetExtension("GL_NV_multisample_filter_hint"));
-}
-
-#endif /* GL_NV_multisample_filter_hint */
-
-#ifdef GL_NV_occlusion_query
-
-static void _glewInfo_GL_NV_occlusion_query (void)
-{
-  glewPrintExt("GL_NV_occlusion_query", GLEW_NV_occlusion_query, glewIsSupported("GL_NV_occlusion_query"), glewGetExtension("GL_NV_occlusion_query"));
-
-  glewInfoFunc("glBeginOcclusionQueryNV", glBeginOcclusionQueryNV == NULL);
-  glewInfoFunc("glDeleteOcclusionQueriesNV", glDeleteOcclusionQueriesNV == NULL);
-  glewInfoFunc("glEndOcclusionQueryNV", glEndOcclusionQueryNV == NULL);
-  glewInfoFunc("glGenOcclusionQueriesNV", glGenOcclusionQueriesNV == NULL);
-  glewInfoFunc("glGetOcclusionQueryivNV", glGetOcclusionQueryivNV == NULL);
-  glewInfoFunc("glGetOcclusionQueryuivNV", glGetOcclusionQueryuivNV == NULL);
-  glewInfoFunc("glIsOcclusionQueryNV", glIsOcclusionQueryNV == NULL);
-}
-
-#endif /* GL_NV_occlusion_query */
-
-#ifdef GL_NV_packed_depth_stencil
-
-static void _glewInfo_GL_NV_packed_depth_stencil (void)
-{
-  glewPrintExt("GL_NV_packed_depth_stencil", GLEW_NV_packed_depth_stencil, glewIsSupported("GL_NV_packed_depth_stencil"), glewGetExtension("GL_NV_packed_depth_stencil"));
-}
-
-#endif /* GL_NV_packed_depth_stencil */
-
-#ifdef GL_NV_parameter_buffer_object
-
-static void _glewInfo_GL_NV_parameter_buffer_object (void)
-{
-  glewPrintExt("GL_NV_parameter_buffer_object", GLEW_NV_parameter_buffer_object, glewIsSupported("GL_NV_parameter_buffer_object"), glewGetExtension("GL_NV_parameter_buffer_object"));
-
-  glewInfoFunc("glProgramBufferParametersIivNV", glProgramBufferParametersIivNV == NULL);
-  glewInfoFunc("glProgramBufferParametersIuivNV", glProgramBufferParametersIuivNV == NULL);
-  glewInfoFunc("glProgramBufferParametersfvNV", glProgramBufferParametersfvNV == NULL);
-}
-
-#endif /* GL_NV_parameter_buffer_object */
-
-#ifdef GL_NV_parameter_buffer_object2
-
-static void _glewInfo_GL_NV_parameter_buffer_object2 (void)
-{
-  glewPrintExt("GL_NV_parameter_buffer_object2", GLEW_NV_parameter_buffer_object2, glewIsSupported("GL_NV_parameter_buffer_object2"), glewGetExtension("GL_NV_parameter_buffer_object2"));
-}
-
-#endif /* GL_NV_parameter_buffer_object2 */
-
-#ifdef GL_NV_path_rendering
-
-static void _glewInfo_GL_NV_path_rendering (void)
-{
-  glewPrintExt("GL_NV_path_rendering", GLEW_NV_path_rendering, glewIsSupported("GL_NV_path_rendering"), glewGetExtension("GL_NV_path_rendering"));
-
-  glewInfoFunc("glCopyPathNV", glCopyPathNV == NULL);
-  glewInfoFunc("glCoverFillPathInstancedNV", glCoverFillPathInstancedNV == NULL);
-  glewInfoFunc("glCoverFillPathNV", glCoverFillPathNV == NULL);
-  glewInfoFunc("glCoverStrokePathInstancedNV", glCoverStrokePathInstancedNV == NULL);
-  glewInfoFunc("glCoverStrokePathNV", glCoverStrokePathNV == NULL);
-  glewInfoFunc("glDeletePathsNV", glDeletePathsNV == NULL);
-  glewInfoFunc("glGenPathsNV", glGenPathsNV == NULL);
-  glewInfoFunc("glGetPathColorGenfvNV", glGetPathColorGenfvNV == NULL);
-  glewInfoFunc("glGetPathColorGenivNV", glGetPathColorGenivNV == NULL);
-  glewInfoFunc("glGetPathCommandsNV", glGetPathCommandsNV == NULL);
-  glewInfoFunc("glGetPathCoordsNV", glGetPathCoordsNV == NULL);
-  glewInfoFunc("glGetPathDashArrayNV", glGetPathDashArrayNV == NULL);
-  glewInfoFunc("glGetPathLengthNV", glGetPathLengthNV == NULL);
-  glewInfoFunc("glGetPathMetricRangeNV", glGetPathMetricRangeNV == NULL);
-  glewInfoFunc("glGetPathMetricsNV", glGetPathMetricsNV == NULL);
-  glewInfoFunc("glGetPathParameterfvNV", glGetPathParameterfvNV == NULL);
-  glewInfoFunc("glGetPathParameterivNV", glGetPathParameterivNV == NULL);
-  glewInfoFunc("glGetPathSpacingNV", glGetPathSpacingNV == NULL);
-  glewInfoFunc("glGetPathTexGenfvNV", glGetPathTexGenfvNV == NULL);
-  glewInfoFunc("glGetPathTexGenivNV", glGetPathTexGenivNV == NULL);
-  glewInfoFunc("glInterpolatePathsNV", glInterpolatePathsNV == NULL);
-  glewInfoFunc("glIsPathNV", glIsPathNV == NULL);
-  glewInfoFunc("glIsPointInFillPathNV", glIsPointInFillPathNV == NULL);
-  glewInfoFunc("glIsPointInStrokePathNV", glIsPointInStrokePathNV == NULL);
-  glewInfoFunc("glPathColorGenNV", glPathColorGenNV == NULL);
-  glewInfoFunc("glPathCommandsNV", glPathCommandsNV == NULL);
-  glewInfoFunc("glPathCoordsNV", glPathCoordsNV == NULL);
-  glewInfoFunc("glPathCoverDepthFuncNV", glPathCoverDepthFuncNV == NULL);
-  glewInfoFunc("glPathDashArrayNV", glPathDashArrayNV == NULL);
-  glewInfoFunc("glPathFogGenNV", glPathFogGenNV == NULL);
-  glewInfoFunc("glPathGlyphRangeNV", glPathGlyphRangeNV == NULL);
-  glewInfoFunc("glPathGlyphsNV", glPathGlyphsNV == NULL);
-  glewInfoFunc("glPathParameterfNV", glPathParameterfNV == NULL);
-  glewInfoFunc("glPathParameterfvNV", glPathParameterfvNV == NULL);
-  glewInfoFunc("glPathParameteriNV", glPathParameteriNV == NULL);
-  glewInfoFunc("glPathParameterivNV", glPathParameterivNV == NULL);
-  glewInfoFunc("glPathStencilDepthOffsetNV", glPathStencilDepthOffsetNV == NULL);
-  glewInfoFunc("glPathStencilFuncNV", glPathStencilFuncNV == NULL);
-  glewInfoFunc("glPathStringNV", glPathStringNV == NULL);
-  glewInfoFunc("glPathSubCommandsNV", glPathSubCommandsNV == NULL);
-  glewInfoFunc("glPathSubCoordsNV", glPathSubCoordsNV == NULL);
-  glewInfoFunc("glPathTexGenNV", glPathTexGenNV == NULL);
-  glewInfoFunc("glPointAlongPathNV", glPointAlongPathNV == NULL);
-  glewInfoFunc("glStencilFillPathInstancedNV", glStencilFillPathInstancedNV == NULL);
-  glewInfoFunc("glStencilFillPathNV", glStencilFillPathNV == NULL);
-  glewInfoFunc("glStencilStrokePathInstancedNV", glStencilStrokePathInstancedNV == NULL);
-  glewInfoFunc("glStencilStrokePathNV", glStencilStrokePathNV == NULL);
-  glewInfoFunc("glTransformPathNV", glTransformPathNV == NULL);
-  glewInfoFunc("glWeightPathsNV", glWeightPathsNV == NULL);
-}
-
-#endif /* GL_NV_path_rendering */
-
-#ifdef GL_NV_pixel_data_range
-
-static void _glewInfo_GL_NV_pixel_data_range (void)
-{
-  glewPrintExt("GL_NV_pixel_data_range", GLEW_NV_pixel_data_range, glewIsSupported("GL_NV_pixel_data_range"), glewGetExtension("GL_NV_pixel_data_range"));
-
-  glewInfoFunc("glFlushPixelDataRangeNV", glFlushPixelDataRangeNV == NULL);
-  glewInfoFunc("glPixelDataRangeNV", glPixelDataRangeNV == NULL);
-}
-
-#endif /* GL_NV_pixel_data_range */
-
-#ifdef GL_NV_point_sprite
-
-static void _glewInfo_GL_NV_point_sprite (void)
-{
-  glewPrintExt("GL_NV_point_sprite", GLEW_NV_point_sprite, glewIsSupported("GL_NV_point_sprite"), glewGetExtension("GL_NV_point_sprite"));
-
-  glewInfoFunc("glPointParameteriNV", glPointParameteriNV == NULL);
-  glewInfoFunc("glPointParameterivNV", glPointParameterivNV == NULL);
-}
-
-#endif /* GL_NV_point_sprite */
-
-#ifdef GL_NV_present_video
-
-static void _glewInfo_GL_NV_present_video (void)
-{
-  glewPrintExt("GL_NV_present_video", GLEW_NV_present_video, glewIsSupported("GL_NV_present_video"), glewGetExtension("GL_NV_present_video"));
-
-  glewInfoFunc("glGetVideoi64vNV", glGetVideoi64vNV == NULL);
-  glewInfoFunc("glGetVideoivNV", glGetVideoivNV == NULL);
-  glewInfoFunc("glGetVideoui64vNV", glGetVideoui64vNV == NULL);
-  glewInfoFunc("glGetVideouivNV", glGetVideouivNV == NULL);
-  glewInfoFunc("glPresentFrameDualFillNV", glPresentFrameDualFillNV == NULL);
-  glewInfoFunc("glPresentFrameKeyedNV", glPresentFrameKeyedNV == NULL);
-}
-
-#endif /* GL_NV_present_video */
-
-#ifdef GL_NV_primitive_restart
-
-static void _glewInfo_GL_NV_primitive_restart (void)
-{
-  glewPrintExt("GL_NV_primitive_restart", GLEW_NV_primitive_restart, glewIsSupported("GL_NV_primitive_restart"), glewGetExtension("GL_NV_primitive_restart"));
-
-  glewInfoFunc("glPrimitiveRestartIndexNV", glPrimitiveRestartIndexNV == NULL);
-  glewInfoFunc("glPrimitiveRestartNV", glPrimitiveRestartNV == NULL);
-}
-
-#endif /* GL_NV_primitive_restart */
-
-#ifdef GL_NV_register_combiners
-
-static void _glewInfo_GL_NV_register_combiners (void)
-{
-  glewPrintExt("GL_NV_register_combiners", GLEW_NV_register_combiners, glewIsSupported("GL_NV_register_combiners"), glewGetExtension("GL_NV_register_combiners"));
-
-  glewInfoFunc("glCombinerInputNV", glCombinerInputNV == NULL);
-  glewInfoFunc("glCombinerOutputNV", glCombinerOutputNV == NULL);
-  glewInfoFunc("glCombinerParameterfNV", glCombinerParameterfNV == NULL);
-  glewInfoFunc("glCombinerParameterfvNV", glCombinerParameterfvNV == NULL);
-  glewInfoFunc("glCombinerParameteriNV", glCombinerParameteriNV == NULL);
-  glewInfoFunc("glCombinerParameterivNV", glCombinerParameterivNV == NULL);
-  glewInfoFunc("glFinalCombinerInputNV", glFinalCombinerInputNV == NULL);
-  glewInfoFunc("glGetCombinerInputParameterfvNV", glGetCombinerInputParameterfvNV == NULL);
-  glewInfoFunc("glGetCombinerInputParameterivNV", glGetCombinerInputParameterivNV == NULL);
-  glewInfoFunc("glGetCombinerOutputParameterfvNV", glGetCombinerOutputParameterfvNV == NULL);
-  glewInfoFunc("glGetCombinerOutputParameterivNV", glGetCombinerOutputParameterivNV == NULL);
-  glewInfoFunc("glGetFinalCombinerInputParameterfvNV", glGetFinalCombinerInputParameterfvNV == NULL);
-  glewInfoFunc("glGetFinalCombinerInputParameterivNV", glGetFinalCombinerInputParameterivNV == NULL);
-}
-
-#endif /* GL_NV_register_combiners */
-
-#ifdef GL_NV_register_combiners2
-
-static void _glewInfo_GL_NV_register_combiners2 (void)
-{
-  glewPrintExt("GL_NV_register_combiners2", GLEW_NV_register_combiners2, glewIsSupported("GL_NV_register_combiners2"), glewGetExtension("GL_NV_register_combiners2"));
-
-  glewInfoFunc("glCombinerStageParameterfvNV", glCombinerStageParameterfvNV == NULL);
-  glewInfoFunc("glGetCombinerStageParameterfvNV", glGetCombinerStageParameterfvNV == NULL);
-}
-
-#endif /* GL_NV_register_combiners2 */
-
-#ifdef GL_NV_shader_atomic_float
-
-static void _glewInfo_GL_NV_shader_atomic_float (void)
-{
-  glewPrintExt("GL_NV_shader_atomic_float", GLEW_NV_shader_atomic_float, glewIsSupported("GL_NV_shader_atomic_float"), glewGetExtension("GL_NV_shader_atomic_float"));
-}
-
-#endif /* GL_NV_shader_atomic_float */
-
-#ifdef GL_NV_shader_buffer_load
-
-static void _glewInfo_GL_NV_shader_buffer_load (void)
-{
-  glewPrintExt("GL_NV_shader_buffer_load", GLEW_NV_shader_buffer_load, glewIsSupported("GL_NV_shader_buffer_load"), glewGetExtension("GL_NV_shader_buffer_load"));
-
-  glewInfoFunc("glGetBufferParameterui64vNV", glGetBufferParameterui64vNV == NULL);
-  glewInfoFunc("glGetIntegerui64vNV", glGetIntegerui64vNV == NULL);
-  glewInfoFunc("glGetNamedBufferParameterui64vNV", glGetNamedBufferParameterui64vNV == NULL);
-  glewInfoFunc("glIsBufferResidentNV", glIsBufferResidentNV == NULL);
-  glewInfoFunc("glIsNamedBufferResidentNV", glIsNamedBufferResidentNV == NULL);
-  glewInfoFunc("glMakeBufferNonResidentNV", glMakeBufferNonResidentNV == NULL);
-  glewInfoFunc("glMakeBufferResidentNV", glMakeBufferResidentNV == NULL);
-  glewInfoFunc("glMakeNamedBufferNonResidentNV", glMakeNamedBufferNonResidentNV == NULL);
-  glewInfoFunc("glMakeNamedBufferResidentNV", glMakeNamedBufferResidentNV == NULL);
-  glewInfoFunc("glProgramUniformui64NV", glProgramUniformui64NV == NULL);
-  glewInfoFunc("glProgramUniformui64vNV", glProgramUniformui64vNV == NULL);
-  glewInfoFunc("glUniformui64NV", glUniformui64NV == NULL);
-  glewInfoFunc("glUniformui64vNV", glUniformui64vNV == NULL);
-}
-
-#endif /* GL_NV_shader_buffer_load */
-
-#ifdef GL_NV_tessellation_program5
-
-static void _glewInfo_GL_NV_tessellation_program5 (void)
-{
-  glewPrintExt("GL_NV_tessellation_program5", GLEW_NV_tessellation_program5, glewIsSupported("GL_NV_tessellation_program5"), glewGetExtension("GL_NV_gpu_program5"));
-}
-
-#endif /* GL_NV_tessellation_program5 */
-
-#ifdef GL_NV_texgen_emboss
-
-static void _glewInfo_GL_NV_texgen_emboss (void)
-{
-  glewPrintExt("GL_NV_texgen_emboss", GLEW_NV_texgen_emboss, glewIsSupported("GL_NV_texgen_emboss"), glewGetExtension("GL_NV_texgen_emboss"));
-}
-
-#endif /* GL_NV_texgen_emboss */
-
-#ifdef GL_NV_texgen_reflection
-
-static void _glewInfo_GL_NV_texgen_reflection (void)
-{
-  glewPrintExt("GL_NV_texgen_reflection", GLEW_NV_texgen_reflection, glewIsSupported("GL_NV_texgen_reflection"), glewGetExtension("GL_NV_texgen_reflection"));
-}
-
-#endif /* GL_NV_texgen_reflection */
-
-#ifdef GL_NV_texture_barrier
-
-static void _glewInfo_GL_NV_texture_barrier (void)
-{
-  glewPrintExt("GL_NV_texture_barrier", GLEW_NV_texture_barrier, glewIsSupported("GL_NV_texture_barrier"), glewGetExtension("GL_NV_texture_barrier"));
-
-  glewInfoFunc("glTextureBarrierNV", glTextureBarrierNV == NULL);
-}
-
-#endif /* GL_NV_texture_barrier */
-
-#ifdef GL_NV_texture_compression_vtc
-
-static void _glewInfo_GL_NV_texture_compression_vtc (void)
-{
-  glewPrintExt("GL_NV_texture_compression_vtc", GLEW_NV_texture_compression_vtc, glewIsSupported("GL_NV_texture_compression_vtc"), glewGetExtension("GL_NV_texture_compression_vtc"));
-}
-
-#endif /* GL_NV_texture_compression_vtc */
-
-#ifdef GL_NV_texture_env_combine4
-
-static void _glewInfo_GL_NV_texture_env_combine4 (void)
-{
-  glewPrintExt("GL_NV_texture_env_combine4", GLEW_NV_texture_env_combine4, glewIsSupported("GL_NV_texture_env_combine4"), glewGetExtension("GL_NV_texture_env_combine4"));
-}
-
-#endif /* GL_NV_texture_env_combine4 */
-
-#ifdef GL_NV_texture_expand_normal
-
-static void _glewInfo_GL_NV_texture_expand_normal (void)
-{
-  glewPrintExt("GL_NV_texture_expand_normal", GLEW_NV_texture_expand_normal, glewIsSupported("GL_NV_texture_expand_normal"), glewGetExtension("GL_NV_texture_expand_normal"));
-}
-
-#endif /* GL_NV_texture_expand_normal */
-
-#ifdef GL_NV_texture_multisample
-
-static void _glewInfo_GL_NV_texture_multisample (void)
-{
-  glewPrintExt("GL_NV_texture_multisample", GLEW_NV_texture_multisample, glewIsSupported("GL_NV_texture_multisample"), glewGetExtension("GL_NV_texture_multisample"));
-
-  glewInfoFunc("glTexImage2DMultisampleCoverageNV", glTexImage2DMultisampleCoverageNV == NULL);
-  glewInfoFunc("glTexImage3DMultisampleCoverageNV", glTexImage3DMultisampleCoverageNV == NULL);
-  glewInfoFunc("glTextureImage2DMultisampleCoverageNV", glTextureImage2DMultisampleCoverageNV == NULL);
-  glewInfoFunc("glTextureImage2DMultisampleNV", glTextureImage2DMultisampleNV == NULL);
-  glewInfoFunc("glTextureImage3DMultisampleCoverageNV", glTextureImage3DMultisampleCoverageNV == NULL);
-  glewInfoFunc("glTextureImage3DMultisampleNV", glTextureImage3DMultisampleNV == NULL);
-}
-
-#endif /* GL_NV_texture_multisample */
-
-#ifdef GL_NV_texture_rectangle
-
-static void _glewInfo_GL_NV_texture_rectangle (void)
-{
-  glewPrintExt("GL_NV_texture_rectangle", GLEW_NV_texture_rectangle, glewIsSupported("GL_NV_texture_rectangle"), glewGetExtension("GL_NV_texture_rectangle"));
-}
-
-#endif /* GL_NV_texture_rectangle */
-
-#ifdef GL_NV_texture_shader
-
-static void _glewInfo_GL_NV_texture_shader (void)
-{
-  glewPrintExt("GL_NV_texture_shader", GLEW_NV_texture_shader, glewIsSupported("GL_NV_texture_shader"), glewGetExtension("GL_NV_texture_shader"));
-}
-
-#endif /* GL_NV_texture_shader */
-
-#ifdef GL_NV_texture_shader2
-
-static void _glewInfo_GL_NV_texture_shader2 (void)
-{
-  glewPrintExt("GL_NV_texture_shader2", GLEW_NV_texture_shader2, glewIsSupported("GL_NV_texture_shader2"), glewGetExtension("GL_NV_texture_shader2"));
-}
-
-#endif /* GL_NV_texture_shader2 */
-
-#ifdef GL_NV_texture_shader3
-
-static void _glewInfo_GL_NV_texture_shader3 (void)
-{
-  glewPrintExt("GL_NV_texture_shader3", GLEW_NV_texture_shader3, glewIsSupported("GL_NV_texture_shader3"), glewGetExtension("GL_NV_texture_shader3"));
-}
-
-#endif /* GL_NV_texture_shader3 */
-
-#ifdef GL_NV_transform_feedback
-
-static void _glewInfo_GL_NV_transform_feedback (void)
-{
-  glewPrintExt("GL_NV_transform_feedback", GLEW_NV_transform_feedback, glewIsSupported("GL_NV_transform_feedback"), glewGetExtension("GL_NV_transform_feedback"));
-
-  glewInfoFunc("glActiveVaryingNV", glActiveVaryingNV == NULL);
-  glewInfoFunc("glBeginTransformFeedbackNV", glBeginTransformFeedbackNV == NULL);
-  glewInfoFunc("glBindBufferBaseNV", glBindBufferBaseNV == NULL);
-  glewInfoFunc("glBindBufferOffsetNV", glBindBufferOffsetNV == NULL);
-  glewInfoFunc("glBindBufferRangeNV", glBindBufferRangeNV == NULL);
-  glewInfoFunc("glEndTransformFeedbackNV", glEndTransformFeedbackNV == NULL);
-  glewInfoFunc("glGetActiveVaryingNV", glGetActiveVaryingNV == NULL);
-  glewInfoFunc("glGetTransformFeedbackVaryingNV", glGetTransformFeedbackVaryingNV == NULL);
-  glewInfoFunc("glGetVaryingLocationNV", glGetVaryingLocationNV == NULL);
-  glewInfoFunc("glTransformFeedbackAttribsNV", glTransformFeedbackAttribsNV == NULL);
-  glewInfoFunc("glTransformFeedbackVaryingsNV", glTransformFeedbackVaryingsNV == NULL);
-}
-
-#endif /* GL_NV_transform_feedback */
-
-#ifdef GL_NV_transform_feedback2
-
-static void _glewInfo_GL_NV_transform_feedback2 (void)
-{
-  glewPrintExt("GL_NV_transform_feedback2", GLEW_NV_transform_feedback2, glewIsSupported("GL_NV_transform_feedback2"), glewGetExtension("GL_NV_transform_feedback2"));
-
-  glewInfoFunc("glBindTransformFeedbackNV", glBindTransformFeedbackNV == NULL);
-  glewInfoFunc("glDeleteTransformFeedbacksNV", glDeleteTransformFeedbacksNV == NULL);
-  glewInfoFunc("glDrawTransformFeedbackNV", glDrawTransformFeedbackNV == NULL);
-  glewInfoFunc("glGenTransformFeedbacksNV", glGenTransformFeedbacksNV == NULL);
-  glewInfoFunc("glIsTransformFeedbackNV", glIsTransformFeedbackNV == NULL);
-  glewInfoFunc("glPauseTransformFeedbackNV", glPauseTransformFeedbackNV == NULL);
-  glewInfoFunc("glResumeTransformFeedbackNV", glResumeTransformFeedbackNV == NULL);
-}
-
-#endif /* GL_NV_transform_feedback2 */
-
-#ifdef GL_NV_vdpau_interop
-
-static void _glewInfo_GL_NV_vdpau_interop (void)
-{
-  glewPrintExt("GL_NV_vdpau_interop", GLEW_NV_vdpau_interop, glewIsSupported("GL_NV_vdpau_interop"), glewGetExtension("GL_NV_vdpau_interop"));
-
-  glewInfoFunc("glVDPAUFiniNV", glVDPAUFiniNV == NULL);
-  glewInfoFunc("glVDPAUGetSurfaceivNV", glVDPAUGetSurfaceivNV == NULL);
-  glewInfoFunc("glVDPAUInitNV", glVDPAUInitNV == NULL);
-  glewInfoFunc("glVDPAUIsSurfaceNV", glVDPAUIsSurfaceNV == NULL);
-  glewInfoFunc("glVDPAUMapSurfacesNV", glVDPAUMapSurfacesNV == NULL);
-  glewInfoFunc("glVDPAURegisterOutputSurfaceNV", glVDPAURegisterOutputSurfaceNV == NULL);
-  glewInfoFunc("glVDPAURegisterVideoSurfaceNV", glVDPAURegisterVideoSurfaceNV == NULL);
-  glewInfoFunc("glVDPAUSurfaceAccessNV", glVDPAUSurfaceAccessNV == NULL);
-  glewInfoFunc("glVDPAUUnmapSurfacesNV", glVDPAUUnmapSurfacesNV == NULL);
-  glewInfoFunc("glVDPAUUnregisterSurfaceNV", glVDPAUUnregisterSurfaceNV == NULL);
-}
-
-#endif /* GL_NV_vdpau_interop */
-
-#ifdef GL_NV_vertex_array_range
-
-static void _glewInfo_GL_NV_vertex_array_range (void)
-{
-  glewPrintExt("GL_NV_vertex_array_range", GLEW_NV_vertex_array_range, glewIsSupported("GL_NV_vertex_array_range"), glewGetExtension("GL_NV_vertex_array_range"));
-
-  glewInfoFunc("glFlushVertexArrayRangeNV", glFlushVertexArrayRangeNV == NULL);
-  glewInfoFunc("glVertexArrayRangeNV", glVertexArrayRangeNV == NULL);
-}
-
-#endif /* GL_NV_vertex_array_range */
-
-#ifdef GL_NV_vertex_array_range2
-
-static void _glewInfo_GL_NV_vertex_array_range2 (void)
-{
-  glewPrintExt("GL_NV_vertex_array_range2", GLEW_NV_vertex_array_range2, glewIsSupported("GL_NV_vertex_array_range2"), glewGetExtension("GL_NV_vertex_array_range2"));
-}
-
-#endif /* GL_NV_vertex_array_range2 */
-
-#ifdef GL_NV_vertex_attrib_integer_64bit
-
-static void _glewInfo_GL_NV_vertex_attrib_integer_64bit (void)
-{
-  glewPrintExt("GL_NV_vertex_attrib_integer_64bit", GLEW_NV_vertex_attrib_integer_64bit, glewIsSupported("GL_NV_vertex_attrib_integer_64bit"), glewGetExtension("GL_NV_vertex_attrib_integer_64bit"));
-
-  glewInfoFunc("glGetVertexAttribLi64vNV", glGetVertexAttribLi64vNV == NULL);
-  glewInfoFunc("glGetVertexAttribLui64vNV", glGetVertexAttribLui64vNV == NULL);
-  glewInfoFunc("glVertexAttribL1i64NV", glVertexAttribL1i64NV == NULL);
-  glewInfoFunc("glVertexAttribL1i64vNV", glVertexAttribL1i64vNV == NULL);
-  glewInfoFunc("glVertexAttribL1ui64NV", glVertexAttribL1ui64NV == NULL);
-  glewInfoFunc("glVertexAttribL1ui64vNV", glVertexAttribL1ui64vNV == NULL);
-  glewInfoFunc("glVertexAttribL2i64NV", glVertexAttribL2i64NV == NULL);
-  glewInfoFunc("glVertexAttribL2i64vNV", glVertexAttribL2i64vNV == NULL);
-  glewInfoFunc("glVertexAttribL2ui64NV", glVertexAttribL2ui64NV == NULL);
-  glewInfoFunc("glVertexAttribL2ui64vNV", glVertexAttribL2ui64vNV == NULL);
-  glewInfoFunc("glVertexAttribL3i64NV", glVertexAttribL3i64NV == NULL);
-  glewInfoFunc("glVertexAttribL3i64vNV", glVertexAttribL3i64vNV == NULL);
-  glewInfoFunc("glVertexAttribL3ui64NV", glVertexAttribL3ui64NV == NULL);
-  glewInfoFunc("glVertexAttribL3ui64vNV", glVertexAttribL3ui64vNV == NULL);
-  glewInfoFunc("glVertexAttribL4i64NV", glVertexAttribL4i64NV == NULL);
-  glewInfoFunc("glVertexAttribL4i64vNV", glVertexAttribL4i64vNV == NULL);
-  glewInfoFunc("glVertexAttribL4ui64NV", glVertexAttribL4ui64NV == NULL);
-  glewInfoFunc("glVertexAttribL4ui64vNV", glVertexAttribL4ui64vNV == NULL);
-  glewInfoFunc("glVertexAttribLFormatNV", glVertexAttribLFormatNV == NULL);
-}
-
-#endif /* GL_NV_vertex_attrib_integer_64bit */
-
-#ifdef GL_NV_vertex_buffer_unified_memory
-
-static void _glewInfo_GL_NV_vertex_buffer_unified_memory (void)
-{
-  glewPrintExt("GL_NV_vertex_buffer_unified_memory", GLEW_NV_vertex_buffer_unified_memory, glewIsSupported("GL_NV_vertex_buffer_unified_memory"), glewGetExtension("GL_NV_vertex_buffer_unified_memory"));
-
-  glewInfoFunc("glBufferAddressRangeNV", glBufferAddressRangeNV == NULL);
-  glewInfoFunc("glColorFormatNV", glColorFormatNV == NULL);
-  glewInfoFunc("glEdgeFlagFormatNV", glEdgeFlagFormatNV == NULL);
-  glewInfoFunc("glFogCoordFormatNV", glFogCoordFormatNV == NULL);
-  glewInfoFunc("glGetIntegerui64i_vNV", glGetIntegerui64i_vNV == NULL);
-  glewInfoFunc("glIndexFormatNV", glIndexFormatNV == NULL);
-  glewInfoFunc("glNormalFormatNV", glNormalFormatNV == NULL);
-  glewInfoFunc("glSecondaryColorFormatNV", glSecondaryColorFormatNV == NULL);
-  glewInfoFunc("glTexCoordFormatNV", glTexCoordFormatNV == NULL);
-  glewInfoFunc("glVertexAttribFormatNV", glVertexAttribFormatNV == NULL);
-  glewInfoFunc("glVertexAttribIFormatNV", glVertexAttribIFormatNV == NULL);
-  glewInfoFunc("glVertexFormatNV", glVertexFormatNV == NULL);
-}
-
-#endif /* GL_NV_vertex_buffer_unified_memory */
-
-#ifdef GL_NV_vertex_program
-
-static void _glewInfo_GL_NV_vertex_program (void)
-{
-  glewPrintExt("GL_NV_vertex_program", GLEW_NV_vertex_program, glewIsSupported("GL_NV_vertex_program"), glewGetExtension("GL_NV_vertex_program"));
-
-  glewInfoFunc("glAreProgramsResidentNV", glAreProgramsResidentNV == NULL);
-  glewInfoFunc("glBindProgramNV", glBindProgramNV == NULL);
-  glewInfoFunc("glDeleteProgramsNV", glDeleteProgramsNV == NULL);
-  glewInfoFunc("glExecuteProgramNV", glExecuteProgramNV == NULL);
-  glewInfoFunc("glGenProgramsNV", glGenProgramsNV == NULL);
-  glewInfoFunc("glGetProgramParameterdvNV", glGetProgramParameterdvNV == NULL);
-  glewInfoFunc("glGetProgramParameterfvNV", glGetProgramParameterfvNV == NULL);
-  glewInfoFunc("glGetProgramStringNV", glGetProgramStringNV == NULL);
-  glewInfoFunc("glGetProgramivNV", glGetProgramivNV == NULL);
-  glewInfoFunc("glGetTrackMatrixivNV", glGetTrackMatrixivNV == NULL);
-  glewInfoFunc("glGetVertexAttribPointervNV", glGetVertexAttribPointervNV == NULL);
-  glewInfoFunc("glGetVertexAttribdvNV", glGetVertexAttribdvNV == NULL);
-  glewInfoFunc("glGetVertexAttribfvNV", glGetVertexAttribfvNV == NULL);
-  glewInfoFunc("glGetVertexAttribivNV", glGetVertexAttribivNV == NULL);
-  glewInfoFunc("glIsProgramNV", glIsProgramNV == NULL);
-  glewInfoFunc("glLoadProgramNV", glLoadProgramNV == NULL);
-  glewInfoFunc("glProgramParameter4dNV", glProgramParameter4dNV == NULL);
-  glewInfoFunc("glProgramParameter4dvNV", glProgramParameter4dvNV == NULL);
-  glewInfoFunc("glProgramParameter4fNV", glProgramParameter4fNV == NULL);
-  glewInfoFunc("glProgramParameter4fvNV", glProgramParameter4fvNV == NULL);
-  glewInfoFunc("glProgramParameters4dvNV", glProgramParameters4dvNV == NULL);
-  glewInfoFunc("glProgramParameters4fvNV", glProgramParameters4fvNV == NULL);
-  glewInfoFunc("glRequestResidentProgramsNV", glRequestResidentProgramsNV == NULL);
-  glewInfoFunc("glTrackMatrixNV", glTrackMatrixNV == NULL);
-  glewInfoFunc("glVertexAttrib1dNV", glVertexAttrib1dNV == NULL);
-  glewInfoFunc("glVertexAttrib1dvNV", glVertexAttrib1dvNV == NULL);
-  glewInfoFunc("glVertexAttrib1fNV", glVertexAttrib1fNV == NULL);
-  glewInfoFunc("glVertexAttrib1fvNV", glVertexAttrib1fvNV == NULL);
-  glewInfoFunc("glVertexAttrib1sNV", glVertexAttrib1sNV == NULL);
-  glewInfoFunc("glVertexAttrib1svNV", glVertexAttrib1svNV == NULL);
-  glewInfoFunc("glVertexAttrib2dNV", glVertexAttrib2dNV == NULL);
-  glewInfoFunc("glVertexAttrib2dvNV", glVertexAttrib2dvNV == NULL);
-  glewInfoFunc("glVertexAttrib2fNV", glVertexAttrib2fNV == NULL);
-  glewInfoFunc("glVertexAttrib2fvNV", glVertexAttrib2fvNV == NULL);
-  glewInfoFunc("glVertexAttrib2sNV", glVertexAttrib2sNV == NULL);
-  glewInfoFunc("glVertexAttrib2svNV", glVertexAttrib2svNV == NULL);
-  glewInfoFunc("glVertexAttrib3dNV", glVertexAttrib3dNV == NULL);
-  glewInfoFunc("glVertexAttrib3dvNV", glVertexAttrib3dvNV == NULL);
-  glewInfoFunc("glVertexAttrib3fNV", glVertexAttrib3fNV == NULL);
-  glewInfoFunc("glVertexAttrib3fvNV", glVertexAttrib3fvNV == NULL);
-  glewInfoFunc("glVertexAttrib3sNV", glVertexAttrib3sNV == NULL);
-  glewInfoFunc("glVertexAttrib3svNV", glVertexAttrib3svNV == NULL);
-  glewInfoFunc("glVertexAttrib4dNV", glVertexAttrib4dNV == NULL);
-  glewInfoFunc("glVertexAttrib4dvNV", glVertexAttrib4dvNV == NULL);
-  glewInfoFunc("glVertexAttrib4fNV", glVertexAttrib4fNV == NULL);
-  glewInfoFunc("glVertexAttrib4fvNV", glVertexAttrib4fvNV == NULL);
-  glewInfoFunc("glVertexAttrib4sNV", glVertexAttrib4sNV == NULL);
-  glewInfoFunc("glVertexAttrib4svNV", glVertexAttrib4svNV == NULL);
-  glewInfoFunc("glVertexAttrib4ubNV", glVertexAttrib4ubNV == NULL);
-  glewInfoFunc("glVertexAttrib4ubvNV", glVertexAttrib4ubvNV == NULL);
-  glewInfoFunc("glVertexAttribPointerNV", glVertexAttribPointerNV == NULL);
-  glewInfoFunc("glVertexAttribs1dvNV", glVertexAttribs1dvNV == NULL);
-  glewInfoFunc("glVertexAttribs1fvNV", glVertexAttribs1fvNV == NULL);
-  glewInfoFunc("glVertexAttribs1svNV", glVertexAttribs1svNV == NULL);
-  glewInfoFunc("glVertexAttribs2dvNV", glVertexAttribs2dvNV == NULL);
-  glewInfoFunc("glVertexAttribs2fvNV", glVertexAttribs2fvNV == NULL);
-  glewInfoFunc("glVertexAttribs2svNV", glVertexAttribs2svNV == NULL);
-  glewInfoFunc("glVertexAttribs3dvNV", glVertexAttribs3dvNV == NULL);
-  glewInfoFunc("glVertexAttribs3fvNV", glVertexAttribs3fvNV == NULL);
-  glewInfoFunc("glVertexAttribs3svNV", glVertexAttribs3svNV == NULL);
-  glewInfoFunc("glVertexAttribs4dvNV", glVertexAttribs4dvNV == NULL);
-  glewInfoFunc("glVertexAttribs4fvNV", glVertexAttribs4fvNV == NULL);
-  glewInfoFunc("glVertexAttribs4svNV", glVertexAttribs4svNV == NULL);
-  glewInfoFunc("glVertexAttribs4ubvNV", glVertexAttribs4ubvNV == NULL);
-}
-
-#endif /* GL_NV_vertex_program */
-
-#ifdef GL_NV_vertex_program1_1
-
-static void _glewInfo_GL_NV_vertex_program1_1 (void)
-{
-  glewPrintExt("GL_NV_vertex_program1_1", GLEW_NV_vertex_program1_1, glewIsSupported("GL_NV_vertex_program1_1"), glewGetExtension("GL_NV_vertex_program1_1"));
-}
-
-#endif /* GL_NV_vertex_program1_1 */
-
-#ifdef GL_NV_vertex_program2
-
-static void _glewInfo_GL_NV_vertex_program2 (void)
-{
-  glewPrintExt("GL_NV_vertex_program2", GLEW_NV_vertex_program2, glewIsSupported("GL_NV_vertex_program2"), glewGetExtension("GL_NV_vertex_program2"));
-}
-
-#endif /* GL_NV_vertex_program2 */
-
-#ifdef GL_NV_vertex_program2_option
-
-static void _glewInfo_GL_NV_vertex_program2_option (void)
-{
-  glewPrintExt("GL_NV_vertex_program2_option", GLEW_NV_vertex_program2_option, glewIsSupported("GL_NV_vertex_program2_option"), glewGetExtension("GL_NV_vertex_program2_option"));
-}
-
-#endif /* GL_NV_vertex_program2_option */
-
-#ifdef GL_NV_vertex_program3
-
-static void _glewInfo_GL_NV_vertex_program3 (void)
-{
-  glewPrintExt("GL_NV_vertex_program3", GLEW_NV_vertex_program3, glewIsSupported("GL_NV_vertex_program3"), glewGetExtension("GL_NV_vertex_program3"));
-}
-
-#endif /* GL_NV_vertex_program3 */
-
-#ifdef GL_NV_vertex_program4
-
-static void _glewInfo_GL_NV_vertex_program4 (void)
-{
-  glewPrintExt("GL_NV_vertex_program4", GLEW_NV_vertex_program4, glewIsSupported("GL_NV_vertex_program4"), glewGetExtension("GL_NV_gpu_program4"));
-}
-
-#endif /* GL_NV_vertex_program4 */
-
-#ifdef GL_NV_video_capture
-
-static void _glewInfo_GL_NV_video_capture (void)
-{
-  glewPrintExt("GL_NV_video_capture", GLEW_NV_video_capture, glewIsSupported("GL_NV_video_capture"), glewGetExtension("GL_NV_video_capture"));
-
-  glewInfoFunc("glBeginVideoCaptureNV", glBeginVideoCaptureNV == NULL);
-  glewInfoFunc("glBindVideoCaptureStreamBufferNV", glBindVideoCaptureStreamBufferNV == NULL);
-  glewInfoFunc("glBindVideoCaptureStreamTextureNV", glBindVideoCaptureStreamTextureNV == NULL);
-  glewInfoFunc("glEndVideoCaptureNV", glEndVideoCaptureNV == NULL);
-  glewInfoFunc("glGetVideoCaptureStreamdvNV", glGetVideoCaptureStreamdvNV == NULL);
-  glewInfoFunc("glGetVideoCaptureStreamfvNV", glGetVideoCaptureStreamfvNV == NULL);
-  glewInfoFunc("glGetVideoCaptureStreamivNV", glGetVideoCaptureStreamivNV == NULL);
-  glewInfoFunc("glGetVideoCaptureivNV", glGetVideoCaptureivNV == NULL);
-  glewInfoFunc("glVideoCaptureNV", glVideoCaptureNV == NULL);
-  glewInfoFunc("glVideoCaptureStreamParameterdvNV", glVideoCaptureStreamParameterdvNV == NULL);
-  glewInfoFunc("glVideoCaptureStreamParameterfvNV", glVideoCaptureStreamParameterfvNV == NULL);
-  glewInfoFunc("glVideoCaptureStreamParameterivNV", glVideoCaptureStreamParameterivNV == NULL);
-}
-
-#endif /* GL_NV_video_capture */
-
-#ifdef GL_OES_byte_coordinates
-
-static void _glewInfo_GL_OES_byte_coordinates (void)
-{
-  glewPrintExt("GL_OES_byte_coordinates", GLEW_OES_byte_coordinates, glewIsSupported("GL_OES_byte_coordinates"), glewGetExtension("GL_OES_byte_coordinates"));
-}
-
-#endif /* GL_OES_byte_coordinates */
-
-#ifdef GL_OES_compressed_paletted_texture
-
-static void _glewInfo_GL_OES_compressed_paletted_texture (void)
-{
-  glewPrintExt("GL_OES_compressed_paletted_texture", GLEW_OES_compressed_paletted_texture, glewIsSupported("GL_OES_compressed_paletted_texture"), glewGetExtension("GL_OES_compressed_paletted_texture"));
-}
-
-#endif /* GL_OES_compressed_paletted_texture */
-
-#ifdef GL_OES_read_format
-
-static void _glewInfo_GL_OES_read_format (void)
-{
-  glewPrintExt("GL_OES_read_format", GLEW_OES_read_format, glewIsSupported("GL_OES_read_format"), glewGetExtension("GL_OES_read_format"));
-}
-
-#endif /* GL_OES_read_format */
-
-#ifdef GL_OES_single_precision
-
-static void _glewInfo_GL_OES_single_precision (void)
-{
-  glewPrintExt("GL_OES_single_precision", GLEW_OES_single_precision, glewIsSupported("GL_OES_single_precision"), glewGetExtension("GL_OES_single_precision"));
-
-  glewInfoFunc("glClearDepthfOES", glClearDepthfOES == NULL);
-  glewInfoFunc("glClipPlanefOES", glClipPlanefOES == NULL);
-  glewInfoFunc("glDepthRangefOES", glDepthRangefOES == NULL);
-  glewInfoFunc("glFrustumfOES", glFrustumfOES == NULL);
-  glewInfoFunc("glGetClipPlanefOES", glGetClipPlanefOES == NULL);
-  glewInfoFunc("glOrthofOES", glOrthofOES == NULL);
-}
-
-#endif /* GL_OES_single_precision */
-
-#ifdef GL_OML_interlace
-
-static void _glewInfo_GL_OML_interlace (void)
-{
-  glewPrintExt("GL_OML_interlace", GLEW_OML_interlace, glewIsSupported("GL_OML_interlace"), glewGetExtension("GL_OML_interlace"));
-}
-
-#endif /* GL_OML_interlace */
-
-#ifdef GL_OML_resample
-
-static void _glewInfo_GL_OML_resample (void)
-{
-  glewPrintExt("GL_OML_resample", GLEW_OML_resample, glewIsSupported("GL_OML_resample"), glewGetExtension("GL_OML_resample"));
-}
-
-#endif /* GL_OML_resample */
-
-#ifdef GL_OML_subsample
-
-static void _glewInfo_GL_OML_subsample (void)
-{
-  glewPrintExt("GL_OML_subsample", GLEW_OML_subsample, glewIsSupported("GL_OML_subsample"), glewGetExtension("GL_OML_subsample"));
-}
-
-#endif /* GL_OML_subsample */
-
-#ifdef GL_PGI_misc_hints
-
-static void _glewInfo_GL_PGI_misc_hints (void)
-{
-  glewPrintExt("GL_PGI_misc_hints", GLEW_PGI_misc_hints, glewIsSupported("GL_PGI_misc_hints"), glewGetExtension("GL_PGI_misc_hints"));
-}
-
-#endif /* GL_PGI_misc_hints */
-
-#ifdef GL_PGI_vertex_hints
-
-static void _glewInfo_GL_PGI_vertex_hints (void)
-{
-  glewPrintExt("GL_PGI_vertex_hints", GLEW_PGI_vertex_hints, glewIsSupported("GL_PGI_vertex_hints"), glewGetExtension("GL_PGI_vertex_hints"));
-}
-
-#endif /* GL_PGI_vertex_hints */
-
-#ifdef GL_REGAL_error_string
-
-static void _glewInfo_GL_REGAL_error_string (void)
-{
-  glewPrintExt("GL_REGAL_error_string", GLEW_REGAL_error_string, glewIsSupported("GL_REGAL_error_string"), glewGetExtension("GL_REGAL_error_string"));
-
-  glewInfoFunc("glErrorStringREGAL", glErrorStringREGAL == NULL);
-}
-
-#endif /* GL_REGAL_error_string */
-
-#ifdef GL_REGAL_extension_query
-
-static void _glewInfo_GL_REGAL_extension_query (void)
-{
-  glewPrintExt("GL_REGAL_extension_query", GLEW_REGAL_extension_query, glewIsSupported("GL_REGAL_extension_query"), glewGetExtension("GL_REGAL_extension_query"));
-
-  glewInfoFunc("glGetExtensionREGAL", glGetExtensionREGAL == NULL);
-  glewInfoFunc("glIsSupportedREGAL", glIsSupportedREGAL == NULL);
-}
-
-#endif /* GL_REGAL_extension_query */
-
-#ifdef GL_REGAL_log
-
-static void _glewInfo_GL_REGAL_log (void)
-{
-  glewPrintExt("GL_REGAL_log", GLEW_REGAL_log, glewIsSupported("GL_REGAL_log"), glewGetExtension("GL_REGAL_log"));
-}
-
-#endif /* GL_REGAL_log */
-
-#ifdef GL_REND_screen_coordinates
-
-static void _glewInfo_GL_REND_screen_coordinates (void)
-{
-  glewPrintExt("GL_REND_screen_coordinates", GLEW_REND_screen_coordinates, glewIsSupported("GL_REND_screen_coordinates"), glewGetExtension("GL_REND_screen_coordinates"));
-}
-
-#endif /* GL_REND_screen_coordinates */
-
-#ifdef GL_S3_s3tc
-
-static void _glewInfo_GL_S3_s3tc (void)
-{
-  glewPrintExt("GL_S3_s3tc", GLEW_S3_s3tc, glewIsSupported("GL_S3_s3tc"), glewGetExtension("GL_S3_s3tc"));
-}
-
-#endif /* GL_S3_s3tc */
-
-#ifdef GL_SGIS_color_range
-
-static void _glewInfo_GL_SGIS_color_range (void)
-{
-  glewPrintExt("GL_SGIS_color_range", GLEW_SGIS_color_range, glewIsSupported("GL_SGIS_color_range"), glewGetExtension("GL_SGIS_color_range"));
-}
-
-#endif /* GL_SGIS_color_range */
-
-#ifdef GL_SGIS_detail_texture
-
-static void _glewInfo_GL_SGIS_detail_texture (void)
-{
-  glewPrintExt("GL_SGIS_detail_texture", GLEW_SGIS_detail_texture, glewIsSupported("GL_SGIS_detail_texture"), glewGetExtension("GL_SGIS_detail_texture"));
-
-  glewInfoFunc("glDetailTexFuncSGIS", glDetailTexFuncSGIS == NULL);
-  glewInfoFunc("glGetDetailTexFuncSGIS", glGetDetailTexFuncSGIS == NULL);
-}
-
-#endif /* GL_SGIS_detail_texture */
-
-#ifdef GL_SGIS_fog_function
-
-static void _glewInfo_GL_SGIS_fog_function (void)
-{
-  glewPrintExt("GL_SGIS_fog_function", GLEW_SGIS_fog_function, glewIsSupported("GL_SGIS_fog_function"), glewGetExtension("GL_SGIS_fog_function"));
-
-  glewInfoFunc("glFogFuncSGIS", glFogFuncSGIS == NULL);
-  glewInfoFunc("glGetFogFuncSGIS", glGetFogFuncSGIS == NULL);
-}
-
-#endif /* GL_SGIS_fog_function */
-
-#ifdef GL_SGIS_generate_mipmap
-
-static void _glewInfo_GL_SGIS_generate_mipmap (void)
-{
-  glewPrintExt("GL_SGIS_generate_mipmap", GLEW_SGIS_generate_mipmap, glewIsSupported("GL_SGIS_generate_mipmap"), glewGetExtension("GL_SGIS_generate_mipmap"));
-}
-
-#endif /* GL_SGIS_generate_mipmap */
-
-#ifdef GL_SGIS_multisample
-
-static void _glewInfo_GL_SGIS_multisample (void)
-{
-  glewPrintExt("GL_SGIS_multisample", GLEW_SGIS_multisample, glewIsSupported("GL_SGIS_multisample"), glewGetExtension("GL_SGIS_multisample"));
-
-  glewInfoFunc("glSampleMaskSGIS", glSampleMaskSGIS == NULL);
-  glewInfoFunc("glSamplePatternSGIS", glSamplePatternSGIS == NULL);
-}
-
-#endif /* GL_SGIS_multisample */
-
-#ifdef GL_SGIS_pixel_texture
-
-static void _glewInfo_GL_SGIS_pixel_texture (void)
-{
-  glewPrintExt("GL_SGIS_pixel_texture", GLEW_SGIS_pixel_texture, glewIsSupported("GL_SGIS_pixel_texture"), glewGetExtension("GL_SGIS_pixel_texture"));
-}
-
-#endif /* GL_SGIS_pixel_texture */
-
-#ifdef GL_SGIS_point_line_texgen
-
-static void _glewInfo_GL_SGIS_point_line_texgen (void)
-{
-  glewPrintExt("GL_SGIS_point_line_texgen", GLEW_SGIS_point_line_texgen, glewIsSupported("GL_SGIS_point_line_texgen"), glewGetExtension("GL_SGIS_point_line_texgen"));
-}
-
-#endif /* GL_SGIS_point_line_texgen */
-
-#ifdef GL_SGIS_sharpen_texture
-
-static void _glewInfo_GL_SGIS_sharpen_texture (void)
-{
-  glewPrintExt("GL_SGIS_sharpen_texture", GLEW_SGIS_sharpen_texture, glewIsSupported("GL_SGIS_sharpen_texture"), glewGetExtension("GL_SGIS_sharpen_texture"));
-
-  glewInfoFunc("glGetSharpenTexFuncSGIS", glGetSharpenTexFuncSGIS == NULL);
-  glewInfoFunc("glSharpenTexFuncSGIS", glSharpenTexFuncSGIS == NULL);
-}
-
-#endif /* GL_SGIS_sharpen_texture */
-
-#ifdef GL_SGIS_texture4D
-
-static void _glewInfo_GL_SGIS_texture4D (void)
-{
-  glewPrintExt("GL_SGIS_texture4D", GLEW_SGIS_texture4D, glewIsSupported("GL_SGIS_texture4D"), glewGetExtension("GL_SGIS_texture4D"));
-
-  glewInfoFunc("glTexImage4DSGIS", glTexImage4DSGIS == NULL);
-  glewInfoFunc("glTexSubImage4DSGIS", glTexSubImage4DSGIS == NULL);
-}
-
-#endif /* GL_SGIS_texture4D */
-
-#ifdef GL_SGIS_texture_border_clamp
-
-static void _glewInfo_GL_SGIS_texture_border_clamp (void)
-{
-  glewPrintExt("GL_SGIS_texture_border_clamp", GLEW_SGIS_texture_border_clamp, glewIsSupported("GL_SGIS_texture_border_clamp"), glewGetExtension("GL_SGIS_texture_border_clamp"));
-}
-
-#endif /* GL_SGIS_texture_border_clamp */
-
-#ifdef GL_SGIS_texture_edge_clamp
-
-static void _glewInfo_GL_SGIS_texture_edge_clamp (void)
-{
-  glewPrintExt("GL_SGIS_texture_edge_clamp", GLEW_SGIS_texture_edge_clamp, glewIsSupported("GL_SGIS_texture_edge_clamp"), glewGetExtension("GL_SGIS_texture_edge_clamp"));
-}
-
-#endif /* GL_SGIS_texture_edge_clamp */
-
-#ifdef GL_SGIS_texture_filter4
-
-static void _glewInfo_GL_SGIS_texture_filter4 (void)
-{
-  glewPrintExt("GL_SGIS_texture_filter4", GLEW_SGIS_texture_filter4, glewIsSupported("GL_SGIS_texture_filter4"), glewGetExtension("GL_SGIS_texture_filter4"));
-
-  glewInfoFunc("glGetTexFilterFuncSGIS", glGetTexFilterFuncSGIS == NULL);
-  glewInfoFunc("glTexFilterFuncSGIS", glTexFilterFuncSGIS == NULL);
-}
-
-#endif /* GL_SGIS_texture_filter4 */
-
-#ifdef GL_SGIS_texture_lod
-
-static void _glewInfo_GL_SGIS_texture_lod (void)
-{
-  glewPrintExt("GL_SGIS_texture_lod", GLEW_SGIS_texture_lod, glewIsSupported("GL_SGIS_texture_lod"), glewGetExtension("GL_SGIS_texture_lod"));
-}
-
-#endif /* GL_SGIS_texture_lod */
-
-#ifdef GL_SGIS_texture_select
-
-static void _glewInfo_GL_SGIS_texture_select (void)
-{
-  glewPrintExt("GL_SGIS_texture_select", GLEW_SGIS_texture_select, glewIsSupported("GL_SGIS_texture_select"), glewGetExtension("GL_SGIS_texture_select"));
-}
-
-#endif /* GL_SGIS_texture_select */
-
-#ifdef GL_SGIX_async
-
-static void _glewInfo_GL_SGIX_async (void)
-{
-  glewPrintExt("GL_SGIX_async", GLEW_SGIX_async, glewIsSupported("GL_SGIX_async"), glewGetExtension("GL_SGIX_async"));
-
-  glewInfoFunc("glAsyncMarkerSGIX", glAsyncMarkerSGIX == NULL);
-  glewInfoFunc("glDeleteAsyncMarkersSGIX", glDeleteAsyncMarkersSGIX == NULL);
-  glewInfoFunc("glFinishAsyncSGIX", glFinishAsyncSGIX == NULL);
-  glewInfoFunc("glGenAsyncMarkersSGIX", glGenAsyncMarkersSGIX == NULL);
-  glewInfoFunc("glIsAsyncMarkerSGIX", glIsAsyncMarkerSGIX == NULL);
-  glewInfoFunc("glPollAsyncSGIX", glPollAsyncSGIX == NULL);
-}
-
-#endif /* GL_SGIX_async */
-
-#ifdef GL_SGIX_async_histogram
-
-static void _glewInfo_GL_SGIX_async_histogram (void)
-{
-  glewPrintExt("GL_SGIX_async_histogram", GLEW_SGIX_async_histogram, glewIsSupported("GL_SGIX_async_histogram"), glewGetExtension("GL_SGIX_async_histogram"));
-}
-
-#endif /* GL_SGIX_async_histogram */
-
-#ifdef GL_SGIX_async_pixel
-
-static void _glewInfo_GL_SGIX_async_pixel (void)
-{
-  glewPrintExt("GL_SGIX_async_pixel", GLEW_SGIX_async_pixel, glewIsSupported("GL_SGIX_async_pixel"), glewGetExtension("GL_SGIX_async_pixel"));
-}
-
-#endif /* GL_SGIX_async_pixel */
-
-#ifdef GL_SGIX_blend_alpha_minmax
-
-static void _glewInfo_GL_SGIX_blend_alpha_minmax (void)
-{
-  glewPrintExt("GL_SGIX_blend_alpha_minmax", GLEW_SGIX_blend_alpha_minmax, glewIsSupported("GL_SGIX_blend_alpha_minmax"), glewGetExtension("GL_SGIX_blend_alpha_minmax"));
-}
-
-#endif /* GL_SGIX_blend_alpha_minmax */
-
-#ifdef GL_SGIX_clipmap
-
-static void _glewInfo_GL_SGIX_clipmap (void)
-{
-  glewPrintExt("GL_SGIX_clipmap", GLEW_SGIX_clipmap, glewIsSupported("GL_SGIX_clipmap"), glewGetExtension("GL_SGIX_clipmap"));
-}
-
-#endif /* GL_SGIX_clipmap */
-
-#ifdef GL_SGIX_convolution_accuracy
-
-static void _glewInfo_GL_SGIX_convolution_accuracy (void)
-{
-  glewPrintExt("GL_SGIX_convolution_accuracy", GLEW_SGIX_convolution_accuracy, glewIsSupported("GL_SGIX_convolution_accuracy"), glewGetExtension("GL_SGIX_convolution_accuracy"));
-}
-
-#endif /* GL_SGIX_convolution_accuracy */
-
-#ifdef GL_SGIX_depth_texture
-
-static void _glewInfo_GL_SGIX_depth_texture (void)
-{
-  glewPrintExt("GL_SGIX_depth_texture", GLEW_SGIX_depth_texture, glewIsSupported("GL_SGIX_depth_texture"), glewGetExtension("GL_SGIX_depth_texture"));
-}
-
-#endif /* GL_SGIX_depth_texture */
-
-#ifdef GL_SGIX_flush_raster
-
-static void _glewInfo_GL_SGIX_flush_raster (void)
-{
-  glewPrintExt("GL_SGIX_flush_raster", GLEW_SGIX_flush_raster, glewIsSupported("GL_SGIX_flush_raster"), glewGetExtension("GL_SGIX_flush_raster"));
-
-  glewInfoFunc("glFlushRasterSGIX", glFlushRasterSGIX == NULL);
-}
-
-#endif /* GL_SGIX_flush_raster */
-
-#ifdef GL_SGIX_fog_offset
-
-static void _glewInfo_GL_SGIX_fog_offset (void)
-{
-  glewPrintExt("GL_SGIX_fog_offset", GLEW_SGIX_fog_offset, glewIsSupported("GL_SGIX_fog_offset"), glewGetExtension("GL_SGIX_fog_offset"));
-}
-
-#endif /* GL_SGIX_fog_offset */
-
-#ifdef GL_SGIX_fog_texture
-
-static void _glewInfo_GL_SGIX_fog_texture (void)
-{
-  glewPrintExt("GL_SGIX_fog_texture", GLEW_SGIX_fog_texture, glewIsSupported("GL_SGIX_fog_texture"), glewGetExtension("GL_SGIX_fog_texture"));
-
-  glewInfoFunc("glTextureFogSGIX", glTextureFogSGIX == NULL);
-}
-
-#endif /* GL_SGIX_fog_texture */
-
-#ifdef GL_SGIX_fragment_specular_lighting
-
-static void _glewInfo_GL_SGIX_fragment_specular_lighting (void)
-{
-  glewPrintExt("GL_SGIX_fragment_specular_lighting", GLEW_SGIX_fragment_specular_lighting, glewIsSupported("GL_SGIX_fragment_specular_lighting"), glewGetExtension("GL_SGIX_fragment_specular_lighting"));
-
-  glewInfoFunc("glFragmentColorMaterialSGIX", glFragmentColorMaterialSGIX == NULL);
-  glewInfoFunc("glFragmentLightModelfSGIX", glFragmentLightModelfSGIX == NULL);
-  glewInfoFunc("glFragmentLightModelfvSGIX", glFragmentLightModelfvSGIX == NULL);
-  glewInfoFunc("glFragmentLightModeliSGIX", glFragmentLightModeliSGIX == NULL);
-  glewInfoFunc("glFragmentLightModelivSGIX", glFragmentLightModelivSGIX == NULL);
-  glewInfoFunc("glFragmentLightfSGIX", glFragmentLightfSGIX == NULL);
-  glewInfoFunc("glFragmentLightfvSGIX", glFragmentLightfvSGIX == NULL);
-  glewInfoFunc("glFragmentLightiSGIX", glFragmentLightiSGIX == NULL);
-  glewInfoFunc("glFragmentLightivSGIX", glFragmentLightivSGIX == NULL);
-  glewInfoFunc("glFragmentMaterialfSGIX", glFragmentMaterialfSGIX == NULL);
-  glewInfoFunc("glFragmentMaterialfvSGIX", glFragmentMaterialfvSGIX == NULL);
-  glewInfoFunc("glFragmentMaterialiSGIX", glFragmentMaterialiSGIX == NULL);
-  glewInfoFunc("glFragmentMaterialivSGIX", glFragmentMaterialivSGIX == NULL);
-  glewInfoFunc("glGetFragmentLightfvSGIX", glGetFragmentLightfvSGIX == NULL);
-  glewInfoFunc("glGetFragmentLightivSGIX", glGetFragmentLightivSGIX == NULL);
-  glewInfoFunc("glGetFragmentMaterialfvSGIX", glGetFragmentMaterialfvSGIX == NULL);
-  glewInfoFunc("glGetFragmentMaterialivSGIX", glGetFragmentMaterialivSGIX == NULL);
-}
-
-#endif /* GL_SGIX_fragment_specular_lighting */
-
-#ifdef GL_SGIX_framezoom
-
-static void _glewInfo_GL_SGIX_framezoom (void)
-{
-  glewPrintExt("GL_SGIX_framezoom", GLEW_SGIX_framezoom, glewIsSupported("GL_SGIX_framezoom"), glewGetExtension("GL_SGIX_framezoom"));
-
-  glewInfoFunc("glFrameZoomSGIX", glFrameZoomSGIX == NULL);
-}
-
-#endif /* GL_SGIX_framezoom */
-
-#ifdef GL_SGIX_interlace
-
-static void _glewInfo_GL_SGIX_interlace (void)
-{
-  glewPrintExt("GL_SGIX_interlace", GLEW_SGIX_interlace, glewIsSupported("GL_SGIX_interlace"), glewGetExtension("GL_SGIX_interlace"));
-}
-
-#endif /* GL_SGIX_interlace */
-
-#ifdef GL_SGIX_ir_instrument1
-
-static void _glewInfo_GL_SGIX_ir_instrument1 (void)
-{
-  glewPrintExt("GL_SGIX_ir_instrument1", GLEW_SGIX_ir_instrument1, glewIsSupported("GL_SGIX_ir_instrument1"), glewGetExtension("GL_SGIX_ir_instrument1"));
-}
-
-#endif /* GL_SGIX_ir_instrument1 */
-
-#ifdef GL_SGIX_list_priority
-
-static void _glewInfo_GL_SGIX_list_priority (void)
-{
-  glewPrintExt("GL_SGIX_list_priority", GLEW_SGIX_list_priority, glewIsSupported("GL_SGIX_list_priority"), glewGetExtension("GL_SGIX_list_priority"));
-}
-
-#endif /* GL_SGIX_list_priority */
-
-#ifdef GL_SGIX_pixel_texture
-
-static void _glewInfo_GL_SGIX_pixel_texture (void)
-{
-  glewPrintExt("GL_SGIX_pixel_texture", GLEW_SGIX_pixel_texture, glewIsSupported("GL_SGIX_pixel_texture"), glewGetExtension("GL_SGIX_pixel_texture"));
-
-  glewInfoFunc("glPixelTexGenSGIX", glPixelTexGenSGIX == NULL);
-}
-
-#endif /* GL_SGIX_pixel_texture */
-
-#ifdef GL_SGIX_pixel_texture_bits
-
-static void _glewInfo_GL_SGIX_pixel_texture_bits (void)
-{
-  glewPrintExt("GL_SGIX_pixel_texture_bits", GLEW_SGIX_pixel_texture_bits, glewIsSupported("GL_SGIX_pixel_texture_bits"), glewGetExtension("GL_SGIX_pixel_texture_bits"));
-}
-
-#endif /* GL_SGIX_pixel_texture_bits */
-
-#ifdef GL_SGIX_reference_plane
-
-static void _glewInfo_GL_SGIX_reference_plane (void)
-{
-  glewPrintExt("GL_SGIX_reference_plane", GLEW_SGIX_reference_plane, glewIsSupported("GL_SGIX_reference_plane"), glewGetExtension("GL_SGIX_reference_plane"));
-
-  glewInfoFunc("glReferencePlaneSGIX", glReferencePlaneSGIX == NULL);
-}
-
-#endif /* GL_SGIX_reference_plane */
-
-#ifdef GL_SGIX_resample
-
-static void _glewInfo_GL_SGIX_resample (void)
-{
-  glewPrintExt("GL_SGIX_resample", GLEW_SGIX_resample, glewIsSupported("GL_SGIX_resample"), glewGetExtension("GL_SGIX_resample"));
-}
-
-#endif /* GL_SGIX_resample */
-
-#ifdef GL_SGIX_shadow
-
-static void _glewInfo_GL_SGIX_shadow (void)
-{
-  glewPrintExt("GL_SGIX_shadow", GLEW_SGIX_shadow, glewIsSupported("GL_SGIX_shadow"), glewGetExtension("GL_SGIX_shadow"));
-}
-
-#endif /* GL_SGIX_shadow */
-
-#ifdef GL_SGIX_shadow_ambient
-
-static void _glewInfo_GL_SGIX_shadow_ambient (void)
-{
-  glewPrintExt("GL_SGIX_shadow_ambient", GLEW_SGIX_shadow_ambient, glewIsSupported("GL_SGIX_shadow_ambient"), glewGetExtension("GL_SGIX_shadow_ambient"));
-}
-
-#endif /* GL_SGIX_shadow_ambient */
-
-#ifdef GL_SGIX_sprite
-
-static void _glewInfo_GL_SGIX_sprite (void)
-{
-  glewPrintExt("GL_SGIX_sprite", GLEW_SGIX_sprite, glewIsSupported("GL_SGIX_sprite"), glewGetExtension("GL_SGIX_sprite"));
-
-  glewInfoFunc("glSpriteParameterfSGIX", glSpriteParameterfSGIX == NULL);
-  glewInfoFunc("glSpriteParameterfvSGIX", glSpriteParameterfvSGIX == NULL);
-  glewInfoFunc("glSpriteParameteriSGIX", glSpriteParameteriSGIX == NULL);
-  glewInfoFunc("glSpriteParameterivSGIX", glSpriteParameterivSGIX == NULL);
-}
-
-#endif /* GL_SGIX_sprite */
-
-#ifdef GL_SGIX_tag_sample_buffer
-
-static void _glewInfo_GL_SGIX_tag_sample_buffer (void)
-{
-  glewPrintExt("GL_SGIX_tag_sample_buffer", GLEW_SGIX_tag_sample_buffer, glewIsSupported("GL_SGIX_tag_sample_buffer"), glewGetExtension("GL_SGIX_tag_sample_buffer"));
-
-  glewInfoFunc("glTagSampleBufferSGIX", glTagSampleBufferSGIX == NULL);
-}
-
-#endif /* GL_SGIX_tag_sample_buffer */
-
-#ifdef GL_SGIX_texture_add_env
-
-static void _glewInfo_GL_SGIX_texture_add_env (void)
-{
-  glewPrintExt("GL_SGIX_texture_add_env", GLEW_SGIX_texture_add_env, glewIsSupported("GL_SGIX_texture_add_env"), glewGetExtension("GL_SGIX_texture_add_env"));
-}
-
-#endif /* GL_SGIX_texture_add_env */
-
-#ifdef GL_SGIX_texture_coordinate_clamp
-
-static void _glewInfo_GL_SGIX_texture_coordinate_clamp (void)
-{
-  glewPrintExt("GL_SGIX_texture_coordinate_clamp", GLEW_SGIX_texture_coordinate_clamp, glewIsSupported("GL_SGIX_texture_coordinate_clamp"), glewGetExtension("GL_SGIX_texture_coordinate_clamp"));
-}
-
-#endif /* GL_SGIX_texture_coordinate_clamp */
-
-#ifdef GL_SGIX_texture_lod_bias
-
-static void _glewInfo_GL_SGIX_texture_lod_bias (void)
-{
-  glewPrintExt("GL_SGIX_texture_lod_bias", GLEW_SGIX_texture_lod_bias, glewIsSupported("GL_SGIX_texture_lod_bias"), glewGetExtension("GL_SGIX_texture_lod_bias"));
-}
-
-#endif /* GL_SGIX_texture_lod_bias */
-
-#ifdef GL_SGIX_texture_multi_buffer
-
-static void _glewInfo_GL_SGIX_texture_multi_buffer (void)
-{
-  glewPrintExt("GL_SGIX_texture_multi_buffer", GLEW_SGIX_texture_multi_buffer, glewIsSupported("GL_SGIX_texture_multi_buffer"), glewGetExtension("GL_SGIX_texture_multi_buffer"));
-}
-
-#endif /* GL_SGIX_texture_multi_buffer */
-
-#ifdef GL_SGIX_texture_range
-
-static void _glewInfo_GL_SGIX_texture_range (void)
-{
-  glewPrintExt("GL_SGIX_texture_range", GLEW_SGIX_texture_range, glewIsSupported("GL_SGIX_texture_range"), glewGetExtension("GL_SGIX_texture_range"));
-}
-
-#endif /* GL_SGIX_texture_range */
-
-#ifdef GL_SGIX_texture_scale_bias
-
-static void _glewInfo_GL_SGIX_texture_scale_bias (void)
-{
-  glewPrintExt("GL_SGIX_texture_scale_bias", GLEW_SGIX_texture_scale_bias, glewIsSupported("GL_SGIX_texture_scale_bias"), glewGetExtension("GL_SGIX_texture_scale_bias"));
-}
-
-#endif /* GL_SGIX_texture_scale_bias */
-
-#ifdef GL_SGIX_vertex_preclip
-
-static void _glewInfo_GL_SGIX_vertex_preclip (void)
-{
-  glewPrintExt("GL_SGIX_vertex_preclip", GLEW_SGIX_vertex_preclip, glewIsSupported("GL_SGIX_vertex_preclip"), glewGetExtension("GL_SGIX_vertex_preclip"));
-}
-
-#endif /* GL_SGIX_vertex_preclip */
-
-#ifdef GL_SGIX_vertex_preclip_hint
-
-static void _glewInfo_GL_SGIX_vertex_preclip_hint (void)
-{
-  glewPrintExt("GL_SGIX_vertex_preclip_hint", GLEW_SGIX_vertex_preclip_hint, glewIsSupported("GL_SGIX_vertex_preclip_hint"), glewGetExtension("GL_SGIX_vertex_preclip_hint"));
-}
-
-#endif /* GL_SGIX_vertex_preclip_hint */
-
-#ifdef GL_SGIX_ycrcb
-
-static void _glewInfo_GL_SGIX_ycrcb (void)
-{
-  glewPrintExt("GL_SGIX_ycrcb", GLEW_SGIX_ycrcb, glewIsSupported("GL_SGIX_ycrcb"), glewGetExtension("GL_SGIX_ycrcb"));
-}
-
-#endif /* GL_SGIX_ycrcb */
-
-#ifdef GL_SGI_color_matrix
-
-static void _glewInfo_GL_SGI_color_matrix (void)
-{
-  glewPrintExt("GL_SGI_color_matrix", GLEW_SGI_color_matrix, glewIsSupported("GL_SGI_color_matrix"), glewGetExtension("GL_SGI_color_matrix"));
-}
-
-#endif /* GL_SGI_color_matrix */
-
-#ifdef GL_SGI_color_table
-
-static void _glewInfo_GL_SGI_color_table (void)
-{
-  glewPrintExt("GL_SGI_color_table", GLEW_SGI_color_table, glewIsSupported("GL_SGI_color_table"), glewGetExtension("GL_SGI_color_table"));
-
-  glewInfoFunc("glColorTableParameterfvSGI", glColorTableParameterfvSGI == NULL);
-  glewInfoFunc("glColorTableParameterivSGI", glColorTableParameterivSGI == NULL);
-  glewInfoFunc("glColorTableSGI", glColorTableSGI == NULL);
-  glewInfoFunc("glCopyColorTableSGI", glCopyColorTableSGI == NULL);
-  glewInfoFunc("glGetColorTableParameterfvSGI", glGetColorTableParameterfvSGI == NULL);
-  glewInfoFunc("glGetColorTableParameterivSGI", glGetColorTableParameterivSGI == NULL);
-  glewInfoFunc("glGetColorTableSGI", glGetColorTableSGI == NULL);
-}
-
-#endif /* GL_SGI_color_table */
-
-#ifdef GL_SGI_texture_color_table
-
-static void _glewInfo_GL_SGI_texture_color_table (void)
-{
-  glewPrintExt("GL_SGI_texture_color_table", GLEW_SGI_texture_color_table, glewIsSupported("GL_SGI_texture_color_table"), glewGetExtension("GL_SGI_texture_color_table"));
-}
-
-#endif /* GL_SGI_texture_color_table */
-
-#ifdef GL_SUNX_constant_data
-
-static void _glewInfo_GL_SUNX_constant_data (void)
-{
-  glewPrintExt("GL_SUNX_constant_data", GLEW_SUNX_constant_data, glewIsSupported("GL_SUNX_constant_data"), glewGetExtension("GL_SUNX_constant_data"));
-
-  glewInfoFunc("glFinishTextureSUNX", glFinishTextureSUNX == NULL);
-}
-
-#endif /* GL_SUNX_constant_data */
-
-#ifdef GL_SUN_convolution_border_modes
-
-static void _glewInfo_GL_SUN_convolution_border_modes (void)
-{
-  glewPrintExt("GL_SUN_convolution_border_modes", GLEW_SUN_convolution_border_modes, glewIsSupported("GL_SUN_convolution_border_modes"), glewGetExtension("GL_SUN_convolution_border_modes"));
-}
-
-#endif /* GL_SUN_convolution_border_modes */
-
-#ifdef GL_SUN_global_alpha
-
-static void _glewInfo_GL_SUN_global_alpha (void)
-{
-  glewPrintExt("GL_SUN_global_alpha", GLEW_SUN_global_alpha, glewIsSupported("GL_SUN_global_alpha"), glewGetExtension("GL_SUN_global_alpha"));
-
-  glewInfoFunc("glGlobalAlphaFactorbSUN", glGlobalAlphaFactorbSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactordSUN", glGlobalAlphaFactordSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactorfSUN", glGlobalAlphaFactorfSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactoriSUN", glGlobalAlphaFactoriSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactorsSUN", glGlobalAlphaFactorsSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactorubSUN", glGlobalAlphaFactorubSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactoruiSUN", glGlobalAlphaFactoruiSUN == NULL);
-  glewInfoFunc("glGlobalAlphaFactorusSUN", glGlobalAlphaFactorusSUN == NULL);
-}
-
-#endif /* GL_SUN_global_alpha */
-
-#ifdef GL_SUN_mesh_array
-
-static void _glewInfo_GL_SUN_mesh_array (void)
-{
-  glewPrintExt("GL_SUN_mesh_array", GLEW_SUN_mesh_array, glewIsSupported("GL_SUN_mesh_array"), glewGetExtension("GL_SUN_mesh_array"));
-}
-
-#endif /* GL_SUN_mesh_array */
-
-#ifdef GL_SUN_read_video_pixels
-
-static void _glewInfo_GL_SUN_read_video_pixels (void)
-{
-  glewPrintExt("GL_SUN_read_video_pixels", GLEW_SUN_read_video_pixels, glewIsSupported("GL_SUN_read_video_pixels"), glewGetExtension("GL_SUN_read_video_pixels"));
-
-  glewInfoFunc("glReadVideoPixelsSUN", glReadVideoPixelsSUN == NULL);
-}
-
-#endif /* GL_SUN_read_video_pixels */
-
-#ifdef GL_SUN_slice_accum
-
-static void _glewInfo_GL_SUN_slice_accum (void)
-{
-  glewPrintExt("GL_SUN_slice_accum", GLEW_SUN_slice_accum, glewIsSupported("GL_SUN_slice_accum"), glewGetExtension("GL_SUN_slice_accum"));
-}
-
-#endif /* GL_SUN_slice_accum */
-
-#ifdef GL_SUN_triangle_list
-
-static void _glewInfo_GL_SUN_triangle_list (void)
-{
-  glewPrintExt("GL_SUN_triangle_list", GLEW_SUN_triangle_list, glewIsSupported("GL_SUN_triangle_list"), glewGetExtension("GL_SUN_triangle_list"));
-
-  glewInfoFunc("glReplacementCodePointerSUN", glReplacementCodePointerSUN == NULL);
-  glewInfoFunc("glReplacementCodeubSUN", glReplacementCodeubSUN == NULL);
-  glewInfoFunc("glReplacementCodeubvSUN", glReplacementCodeubvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiSUN", glReplacementCodeuiSUN == NULL);
-  glewInfoFunc("glReplacementCodeuivSUN", glReplacementCodeuivSUN == NULL);
-  glewInfoFunc("glReplacementCodeusSUN", glReplacementCodeusSUN == NULL);
-  glewInfoFunc("glReplacementCodeusvSUN", glReplacementCodeusvSUN == NULL);
-}
-
-#endif /* GL_SUN_triangle_list */
-
-#ifdef GL_SUN_vertex
-
-static void _glewInfo_GL_SUN_vertex (void)
-{
-  glewPrintExt("GL_SUN_vertex", GLEW_SUN_vertex, glewIsSupported("GL_SUN_vertex"), glewGetExtension("GL_SUN_vertex"));
-
-  glewInfoFunc("glColor3fVertex3fSUN", glColor3fVertex3fSUN == NULL);
-  glewInfoFunc("glColor3fVertex3fvSUN", glColor3fVertex3fvSUN == NULL);
-  glewInfoFunc("glColor4fNormal3fVertex3fSUN", glColor4fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glColor4fNormal3fVertex3fvSUN", glColor4fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glColor4ubVertex2fSUN", glColor4ubVertex2fSUN == NULL);
-  glewInfoFunc("glColor4ubVertex2fvSUN", glColor4ubVertex2fvSUN == NULL);
-  glewInfoFunc("glColor4ubVertex3fSUN", glColor4ubVertex3fSUN == NULL);
-  glewInfoFunc("glColor4ubVertex3fvSUN", glColor4ubVertex3fvSUN == NULL);
-  glewInfoFunc("glNormal3fVertex3fSUN", glNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glNormal3fVertex3fvSUN", glNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor3fVertex3fSUN", glReplacementCodeuiColor3fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor3fVertex3fvSUN", glReplacementCodeuiColor3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor4fNormal3fVertex3fSUN", glReplacementCodeuiColor4fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor4fNormal3fVertex3fvSUN", glReplacementCodeuiColor4fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor4ubVertex3fSUN", glReplacementCodeuiColor4ubVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiColor4ubVertex3fvSUN", glReplacementCodeuiColor4ubVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiNormal3fVertex3fSUN", glReplacementCodeuiNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiNormal3fVertex3fvSUN", glReplacementCodeuiNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN", glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN", glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN", glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN", glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fVertex3fSUN", glReplacementCodeuiTexCoord2fVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiTexCoord2fVertex3fvSUN", glReplacementCodeuiTexCoord2fVertex3fvSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiVertex3fSUN", glReplacementCodeuiVertex3fSUN == NULL);
-  glewInfoFunc("glReplacementCodeuiVertex3fvSUN", glReplacementCodeuiVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor3fVertex3fSUN", glTexCoord2fColor3fVertex3fSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor3fVertex3fvSUN", glTexCoord2fColor3fVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor4fNormal3fVertex3fSUN", glTexCoord2fColor4fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor4fNormal3fVertex3fvSUN", glTexCoord2fColor4fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor4ubVertex3fSUN", glTexCoord2fColor4ubVertex3fSUN == NULL);
-  glewInfoFunc("glTexCoord2fColor4ubVertex3fvSUN", glTexCoord2fColor4ubVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord2fNormal3fVertex3fSUN", glTexCoord2fNormal3fVertex3fSUN == NULL);
-  glewInfoFunc("glTexCoord2fNormal3fVertex3fvSUN", glTexCoord2fNormal3fVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord2fVertex3fSUN", glTexCoord2fVertex3fSUN == NULL);
-  glewInfoFunc("glTexCoord2fVertex3fvSUN", glTexCoord2fVertex3fvSUN == NULL);
-  glewInfoFunc("glTexCoord4fColor4fNormal3fVertex4fSUN", glTexCoord4fColor4fNormal3fVertex4fSUN == NULL);
-  glewInfoFunc("glTexCoord4fColor4fNormal3fVertex4fvSUN", glTexCoord4fColor4fNormal3fVertex4fvSUN == NULL);
-  glewInfoFunc("glTexCoord4fVertex4fSUN", glTexCoord4fVertex4fSUN == NULL);
-  glewInfoFunc("glTexCoord4fVertex4fvSUN", glTexCoord4fVertex4fvSUN == NULL);
-}
-
-#endif /* GL_SUN_vertex */
-
-#ifdef GL_WIN_phong_shading
-
-static void _glewInfo_GL_WIN_phong_shading (void)
-{
-  glewPrintExt("GL_WIN_phong_shading", GLEW_WIN_phong_shading, glewIsSupported("GL_WIN_phong_shading"), glewGetExtension("GL_WIN_phong_shading"));
-}
-
-#endif /* GL_WIN_phong_shading */
-
-#ifdef GL_WIN_specular_fog
-
-static void _glewInfo_GL_WIN_specular_fog (void)
-{
-  glewPrintExt("GL_WIN_specular_fog", GLEW_WIN_specular_fog, glewIsSupported("GL_WIN_specular_fog"), glewGetExtension("GL_WIN_specular_fog"));
-}
-
-#endif /* GL_WIN_specular_fog */
-
-#ifdef GL_WIN_swap_hint
-
-static void _glewInfo_GL_WIN_swap_hint (void)
-{
-  glewPrintExt("GL_WIN_swap_hint", GLEW_WIN_swap_hint, glewIsSupported("GL_WIN_swap_hint"), glewGetExtension("GL_WIN_swap_hint"));
-
-  glewInfoFunc("glAddSwapHintRectWIN", glAddSwapHintRectWIN == NULL);
-}
-
-#endif /* GL_WIN_swap_hint */
-
-#ifdef _WIN32
-
-#ifdef WGL_3DFX_multisample
-
-static void _glewInfo_WGL_3DFX_multisample (void)
-{
-  glewPrintExt("WGL_3DFX_multisample", WGLEW_3DFX_multisample, wglewIsSupported("WGL_3DFX_multisample"), wglewGetExtension("WGL_3DFX_multisample"));
-}
-
-#endif /* WGL_3DFX_multisample */
-
-#ifdef WGL_3DL_stereo_control
-
-static void _glewInfo_WGL_3DL_stereo_control (void)
-{
-  glewPrintExt("WGL_3DL_stereo_control", WGLEW_3DL_stereo_control, wglewIsSupported("WGL_3DL_stereo_control"), wglewGetExtension("WGL_3DL_stereo_control"));
-
-  glewInfoFunc("wglSetStereoEmitterState3DL", wglSetStereoEmitterState3DL == NULL);
-}
-
-#endif /* WGL_3DL_stereo_control */
-
-#ifdef WGL_AMD_gpu_association
-
-static void _glewInfo_WGL_AMD_gpu_association (void)
-{
-  glewPrintExt("WGL_AMD_gpu_association", WGLEW_AMD_gpu_association, wglewIsSupported("WGL_AMD_gpu_association"), wglewGetExtension("WGL_AMD_gpu_association"));
-
-  glewInfoFunc("wglBlitContextFramebufferAMD", wglBlitContextFramebufferAMD == NULL);
-  glewInfoFunc("wglCreateAssociatedContextAMD", wglCreateAssociatedContextAMD == NULL);
-  glewInfoFunc("wglCreateAssociatedContextAttribsAMD", wglCreateAssociatedContextAttribsAMD == NULL);
-  glewInfoFunc("wglDeleteAssociatedContextAMD", wglDeleteAssociatedContextAMD == NULL);
-  glewInfoFunc("wglGetContextGPUIDAMD", wglGetContextGPUIDAMD == NULL);
-  glewInfoFunc("wglGetCurrentAssociatedContextAMD", wglGetCurrentAssociatedContextAMD == NULL);
-  glewInfoFunc("wglGetGPUIDsAMD", wglGetGPUIDsAMD == NULL);
-  glewInfoFunc("wglGetGPUInfoAMD", wglGetGPUInfoAMD == NULL);
-  glewInfoFunc("wglMakeAssociatedContextCurrentAMD", wglMakeAssociatedContextCurrentAMD == NULL);
-}
-
-#endif /* WGL_AMD_gpu_association */
-
-#ifdef WGL_ARB_buffer_region
-
-static void _glewInfo_WGL_ARB_buffer_region (void)
-{
-  glewPrintExt("WGL_ARB_buffer_region", WGLEW_ARB_buffer_region, wglewIsSupported("WGL_ARB_buffer_region"), wglewGetExtension("WGL_ARB_buffer_region"));
-
-  glewInfoFunc("wglCreateBufferRegionARB", wglCreateBufferRegionARB == NULL);
-  glewInfoFunc("wglDeleteBufferRegionARB", wglDeleteBufferRegionARB == NULL);
-  glewInfoFunc("wglRestoreBufferRegionARB", wglRestoreBufferRegionARB == NULL);
-  glewInfoFunc("wglSaveBufferRegionARB", wglSaveBufferRegionARB == NULL);
-}
-
-#endif /* WGL_ARB_buffer_region */
-
-#ifdef WGL_ARB_create_context
-
-static void _glewInfo_WGL_ARB_create_context (void)
-{
-  glewPrintExt("WGL_ARB_create_context", WGLEW_ARB_create_context, wglewIsSupported("WGL_ARB_create_context"), wglewGetExtension("WGL_ARB_create_context"));
-
-  glewInfoFunc("wglCreateContextAttribsARB", wglCreateContextAttribsARB == NULL);
-}
-
-#endif /* WGL_ARB_create_context */
-
-#ifdef WGL_ARB_create_context_profile
-
-static void _glewInfo_WGL_ARB_create_context_profile (void)
-{
-  glewPrintExt("WGL_ARB_create_context_profile", WGLEW_ARB_create_context_profile, wglewIsSupported("WGL_ARB_create_context_profile"), wglewGetExtension("WGL_ARB_create_context_profile"));
-}
-
-#endif /* WGL_ARB_create_context_profile */
-
-#ifdef WGL_ARB_create_context_robustness
-
-static void _glewInfo_WGL_ARB_create_context_robustness (void)
-{
-  glewPrintExt("WGL_ARB_create_context_robustness", WGLEW_ARB_create_context_robustness, wglewIsSupported("WGL_ARB_create_context_robustness"), wglewGetExtension("WGL_ARB_create_context_robustness"));
-}
-
-#endif /* WGL_ARB_create_context_robustness */
-
-#ifdef WGL_ARB_extensions_string
-
-static void _glewInfo_WGL_ARB_extensions_string (void)
-{
-  glewPrintExt("WGL_ARB_extensions_string", WGLEW_ARB_extensions_string, wglewIsSupported("WGL_ARB_extensions_string"), wglewGetExtension("WGL_ARB_extensions_string"));
-
-  glewInfoFunc("wglGetExtensionsStringARB", wglGetExtensionsStringARB == NULL);
-}
-
-#endif /* WGL_ARB_extensions_string */
-
-#ifdef WGL_ARB_framebuffer_sRGB
-
-static void _glewInfo_WGL_ARB_framebuffer_sRGB (void)
-{
-  glewPrintExt("WGL_ARB_framebuffer_sRGB", WGLEW_ARB_framebuffer_sRGB, wglewIsSupported("WGL_ARB_framebuffer_sRGB"), wglewGetExtension("WGL_ARB_framebuffer_sRGB"));
-}
-
-#endif /* WGL_ARB_framebuffer_sRGB */
-
-#ifdef WGL_ARB_make_current_read
-
-static void _glewInfo_WGL_ARB_make_current_read (void)
-{
-  glewPrintExt("WGL_ARB_make_current_read", WGLEW_ARB_make_current_read, wglewIsSupported("WGL_ARB_make_current_read"), wglewGetExtension("WGL_ARB_make_current_read"));
-
-  glewInfoFunc("wglGetCurrentReadDCARB", wglGetCurrentReadDCARB == NULL);
-  glewInfoFunc("wglMakeContextCurrentARB", wglMakeContextCurrentARB == NULL);
-}
-
-#endif /* WGL_ARB_make_current_read */
-
-#ifdef WGL_ARB_multisample
-
-static void _glewInfo_WGL_ARB_multisample (void)
-{
-  glewPrintExt("WGL_ARB_multisample", WGLEW_ARB_multisample, wglewIsSupported("WGL_ARB_multisample"), wglewGetExtension("WGL_ARB_multisample"));
-}
-
-#endif /* WGL_ARB_multisample */
-
-#ifdef WGL_ARB_pbuffer
-
-static void _glewInfo_WGL_ARB_pbuffer (void)
-{
-  glewPrintExt("WGL_ARB_pbuffer", WGLEW_ARB_pbuffer, wglewIsSupported("WGL_ARB_pbuffer"), wglewGetExtension("WGL_ARB_pbuffer"));
-
-  glewInfoFunc("wglCreatePbufferARB", wglCreatePbufferARB == NULL);
-  glewInfoFunc("wglDestroyPbufferARB", wglDestroyPbufferARB == NULL);
-  glewInfoFunc("wglGetPbufferDCARB", wglGetPbufferDCARB == NULL);
-  glewInfoFunc("wglQueryPbufferARB", wglQueryPbufferARB == NULL);
-  glewInfoFunc("wglReleasePbufferDCARB", wglReleasePbufferDCARB == NULL);
-}
-
-#endif /* WGL_ARB_pbuffer */
-
-#ifdef WGL_ARB_pixel_format
-
-static void _glewInfo_WGL_ARB_pixel_format (void)
-{
-  glewPrintExt("WGL_ARB_pixel_format", WGLEW_ARB_pixel_format, wglewIsSupported("WGL_ARB_pixel_format"), wglewGetExtension("WGL_ARB_pixel_format"));
-
-  glewInfoFunc("wglChoosePixelFormatARB", wglChoosePixelFormatARB == NULL);
-  glewInfoFunc("wglGetPixelFormatAttribfvARB", wglGetPixelFormatAttribfvARB == NULL);
-  glewInfoFunc("wglGetPixelFormatAttribivARB", wglGetPixelFormatAttribivARB == NULL);
-}
-
-#endif /* WGL_ARB_pixel_format */
-
-#ifdef WGL_ARB_pixel_format_float
-
-static void _glewInfo_WGL_ARB_pixel_format_float (void)
-{
-  glewPrintExt("WGL_ARB_pixel_format_float", WGLEW_ARB_pixel_format_float, wglewIsSupported("WGL_ARB_pixel_format_float"), wglewGetExtension("WGL_ARB_pixel_format_float"));
-}
-
-#endif /* WGL_ARB_pixel_format_float */
-
-#ifdef WGL_ARB_render_texture
-
-static void _glewInfo_WGL_ARB_render_texture (void)
-{
-  glewPrintExt("WGL_ARB_render_texture", WGLEW_ARB_render_texture, wglewIsSupported("WGL_ARB_render_texture"), wglewGetExtension("WGL_ARB_render_texture"));
-
-  glewInfoFunc("wglBindTexImageARB", wglBindTexImageARB == NULL);
-  glewInfoFunc("wglReleaseTexImageARB", wglReleaseTexImageARB == NULL);
-  glewInfoFunc("wglSetPbufferAttribARB", wglSetPbufferAttribARB == NULL);
-}
-
-#endif /* WGL_ARB_render_texture */
-
-#ifdef WGL_ATI_pixel_format_float
-
-static void _glewInfo_WGL_ATI_pixel_format_float (void)
-{
-  glewPrintExt("WGL_ATI_pixel_format_float", WGLEW_ATI_pixel_format_float, wglewIsSupported("WGL_ATI_pixel_format_float"), wglewGetExtension("WGL_ATI_pixel_format_float"));
-}
-
-#endif /* WGL_ATI_pixel_format_float */
-
-#ifdef WGL_ATI_render_texture_rectangle
-
-static void _glewInfo_WGL_ATI_render_texture_rectangle (void)
-{
-  glewPrintExt("WGL_ATI_render_texture_rectangle", WGLEW_ATI_render_texture_rectangle, wglewIsSupported("WGL_ATI_render_texture_rectangle"), wglewGetExtension("WGL_ATI_render_texture_rectangle"));
-}
-
-#endif /* WGL_ATI_render_texture_rectangle */
-
-#ifdef WGL_EXT_create_context_es2_profile
-
-static void _glewInfo_WGL_EXT_create_context_es2_profile (void)
-{
-  glewPrintExt("WGL_EXT_create_context_es2_profile", WGLEW_EXT_create_context_es2_profile, wglewIsSupported("WGL_EXT_create_context_es2_profile"), wglewGetExtension("WGL_EXT_create_context_es2_profile"));
-}
-
-#endif /* WGL_EXT_create_context_es2_profile */
-
-#ifdef WGL_EXT_create_context_es_profile
-
-static void _glewInfo_WGL_EXT_create_context_es_profile (void)
-{
-  glewPrintExt("WGL_EXT_create_context_es_profile", WGLEW_EXT_create_context_es_profile, wglewIsSupported("WGL_EXT_create_context_es_profile"), wglewGetExtension("WGL_EXT_create_context_es_profile"));
-}
-
-#endif /* WGL_EXT_create_context_es_profile */
-
-#ifdef WGL_EXT_depth_float
-
-static void _glewInfo_WGL_EXT_depth_float (void)
-{
-  glewPrintExt("WGL_EXT_depth_float", WGLEW_EXT_depth_float, wglewIsSupported("WGL_EXT_depth_float"), wglewGetExtension("WGL_EXT_depth_float"));
-}
-
-#endif /* WGL_EXT_depth_float */
-
-#ifdef WGL_EXT_display_color_table
-
-static void _glewInfo_WGL_EXT_display_color_table (void)
-{
-  glewPrintExt("WGL_EXT_display_color_table", WGLEW_EXT_display_color_table, wglewIsSupported("WGL_EXT_display_color_table"), wglewGetExtension("WGL_EXT_display_color_table"));
-
-  glewInfoFunc("wglBindDisplayColorTableEXT", wglBindDisplayColorTableEXT == NULL);
-  glewInfoFunc("wglCreateDisplayColorTableEXT", wglCreateDisplayColorTableEXT == NULL);
-  glewInfoFunc("wglDestroyDisplayColorTableEXT", wglDestroyDisplayColorTableEXT == NULL);
-  glewInfoFunc("wglLoadDisplayColorTableEXT", wglLoadDisplayColorTableEXT == NULL);
-}
-
-#endif /* WGL_EXT_display_color_table */
-
-#ifdef WGL_EXT_extensions_string
-
-static void _glewInfo_WGL_EXT_extensions_string (void)
-{
-  glewPrintExt("WGL_EXT_extensions_string", WGLEW_EXT_extensions_string, wglewIsSupported("WGL_EXT_extensions_string"), wglewGetExtension("WGL_EXT_extensions_string"));
-
-  glewInfoFunc("wglGetExtensionsStringEXT", wglGetExtensionsStringEXT == NULL);
-}
-
-#endif /* WGL_EXT_extensions_string */
-
-#ifdef WGL_EXT_framebuffer_sRGB
-
-static void _glewInfo_WGL_EXT_framebuffer_sRGB (void)
-{
-  glewPrintExt("WGL_EXT_framebuffer_sRGB", WGLEW_EXT_framebuffer_sRGB, wglewIsSupported("WGL_EXT_framebuffer_sRGB"), wglewGetExtension("WGL_EXT_framebuffer_sRGB"));
-}
-
-#endif /* WGL_EXT_framebuffer_sRGB */
-
-#ifdef WGL_EXT_make_current_read
-
-static void _glewInfo_WGL_EXT_make_current_read (void)
-{
-  glewPrintExt("WGL_EXT_make_current_read", WGLEW_EXT_make_current_read, wglewIsSupported("WGL_EXT_make_current_read"), wglewGetExtension("WGL_EXT_make_current_read"));
-
-  glewInfoFunc("wglGetCurrentReadDCEXT", wglGetCurrentReadDCEXT == NULL);
-  glewInfoFunc("wglMakeContextCurrentEXT", wglMakeContextCurrentEXT == NULL);
-}
-
-#endif /* WGL_EXT_make_current_read */
-
-#ifdef WGL_EXT_multisample
-
-static void _glewInfo_WGL_EXT_multisample (void)
-{
-  glewPrintExt("WGL_EXT_multisample", WGLEW_EXT_multisample, wglewIsSupported("WGL_EXT_multisample"), wglewGetExtension("WGL_EXT_multisample"));
-}
-
-#endif /* WGL_EXT_multisample */
-
-#ifdef WGL_EXT_pbuffer
-
-static void _glewInfo_WGL_EXT_pbuffer (void)
-{
-  glewPrintExt("WGL_EXT_pbuffer", WGLEW_EXT_pbuffer, wglewIsSupported("WGL_EXT_pbuffer"), wglewGetExtension("WGL_EXT_pbuffer"));
-
-  glewInfoFunc("wglCreatePbufferEXT", wglCreatePbufferEXT == NULL);
-  glewInfoFunc("wglDestroyPbufferEXT", wglDestroyPbufferEXT == NULL);
-  glewInfoFunc("wglGetPbufferDCEXT", wglGetPbufferDCEXT == NULL);
-  glewInfoFunc("wglQueryPbufferEXT", wglQueryPbufferEXT == NULL);
-  glewInfoFunc("wglReleasePbufferDCEXT", wglReleasePbufferDCEXT == NULL);
-}
-
-#endif /* WGL_EXT_pbuffer */
-
-#ifdef WGL_EXT_pixel_format
-
-static void _glewInfo_WGL_EXT_pixel_format (void)
-{
-  glewPrintExt("WGL_EXT_pixel_format", WGLEW_EXT_pixel_format, wglewIsSupported("WGL_EXT_pixel_format"), wglewGetExtension("WGL_EXT_pixel_format"));
-
-  glewInfoFunc("wglChoosePixelFormatEXT", wglChoosePixelFormatEXT == NULL);
-  glewInfoFunc("wglGetPixelFormatAttribfvEXT", wglGetPixelFormatAttribfvEXT == NULL);
-  glewInfoFunc("wglGetPixelFormatAttribivEXT", wglGetPixelFormatAttribivEXT == NULL);
-}
-
-#endif /* WGL_EXT_pixel_format */
-
-#ifdef WGL_EXT_pixel_format_packed_float
-
-static void _glewInfo_WGL_EXT_pixel_format_packed_float (void)
-{
-  glewPrintExt("WGL_EXT_pixel_format_packed_float", WGLEW_EXT_pixel_format_packed_float, wglewIsSupported("WGL_EXT_pixel_format_packed_float"), wglewGetExtension("WGL_EXT_pixel_format_packed_float"));
-}
-
-#endif /* WGL_EXT_pixel_format_packed_float */
-
-#ifdef WGL_EXT_swap_control
-
-static void _glewInfo_WGL_EXT_swap_control (void)
-{
-  glewPrintExt("WGL_EXT_swap_control", WGLEW_EXT_swap_control, wglewIsSupported("WGL_EXT_swap_control"), wglewGetExtension("WGL_EXT_swap_control"));
-
-  glewInfoFunc("wglGetSwapIntervalEXT", wglGetSwapIntervalEXT == NULL);
-  glewInfoFunc("wglSwapIntervalEXT", wglSwapIntervalEXT == NULL);
-}
-
-#endif /* WGL_EXT_swap_control */
-
-#ifdef WGL_EXT_swap_control_tear
-
-static void _glewInfo_WGL_EXT_swap_control_tear (void)
-{
-  glewPrintExt("WGL_EXT_swap_control_tear", WGLEW_EXT_swap_control_tear, wglewIsSupported("WGL_EXT_swap_control_tear"), wglewGetExtension("WGL_EXT_swap_control_tear"));
-}
-
-#endif /* WGL_EXT_swap_control_tear */
-
-#ifdef WGL_I3D_digital_video_control
-
-static void _glewInfo_WGL_I3D_digital_video_control (void)
-{
-  glewPrintExt("WGL_I3D_digital_video_control", WGLEW_I3D_digital_video_control, wglewIsSupported("WGL_I3D_digital_video_control"), wglewGetExtension("WGL_I3D_digital_video_control"));
-
-  glewInfoFunc("wglGetDigitalVideoParametersI3D", wglGetDigitalVideoParametersI3D == NULL);
-  glewInfoFunc("wglSetDigitalVideoParametersI3D", wglSetDigitalVideoParametersI3D == NULL);
-}
-
-#endif /* WGL_I3D_digital_video_control */
-
-#ifdef WGL_I3D_gamma
-
-static void _glewInfo_WGL_I3D_gamma (void)
-{
-  glewPrintExt("WGL_I3D_gamma", WGLEW_I3D_gamma, wglewIsSupported("WGL_I3D_gamma"), wglewGetExtension("WGL_I3D_gamma"));
-
-  glewInfoFunc("wglGetGammaTableI3D", wglGetGammaTableI3D == NULL);
-  glewInfoFunc("wglGetGammaTableParametersI3D", wglGetGammaTableParametersI3D == NULL);
-  glewInfoFunc("wglSetGammaTableI3D", wglSetGammaTableI3D == NULL);
-  glewInfoFunc("wglSetGammaTableParametersI3D", wglSetGammaTableParametersI3D == NULL);
-}
-
-#endif /* WGL_I3D_gamma */
-
-#ifdef WGL_I3D_genlock
-
-static void _glewInfo_WGL_I3D_genlock (void)
-{
-  glewPrintExt("WGL_I3D_genlock", WGLEW_I3D_genlock, wglewIsSupported("WGL_I3D_genlock"), wglewGetExtension("WGL_I3D_genlock"));
-
-  glewInfoFunc("wglDisableGenlockI3D", wglDisableGenlockI3D == NULL);
-  glewInfoFunc("wglEnableGenlockI3D", wglEnableGenlockI3D == NULL);
-  glewInfoFunc("wglGenlockSampleRateI3D", wglGenlockSampleRateI3D == NULL);
-  glewInfoFunc("wglGenlockSourceDelayI3D", wglGenlockSourceDelayI3D == NULL);
-  glewInfoFunc("wglGenlockSourceEdgeI3D", wglGenlockSourceEdgeI3D == NULL);
-  glewInfoFunc("wglGenlockSourceI3D", wglGenlockSourceI3D == NULL);
-  glewInfoFunc("wglGetGenlockSampleRateI3D", wglGetGenlockSampleRateI3D == NULL);
-  glewInfoFunc("wglGetGenlockSourceDelayI3D", wglGetGenlockSourceDelayI3D == NULL);
-  glewInfoFunc("wglGetGenlockSourceEdgeI3D", wglGetGenlockSourceEdgeI3D == NULL);
-  glewInfoFunc("wglGetGenlockSourceI3D", wglGetGenlockSourceI3D == NULL);
-  glewInfoFunc("wglIsEnabledGenlockI3D", wglIsEnabledGenlockI3D == NULL);
-  glewInfoFunc("wglQueryGenlockMaxSourceDelayI3D", wglQueryGenlockMaxSourceDelayI3D == NULL);
-}
-
-#endif /* WGL_I3D_genlock */
-
-#ifdef WGL_I3D_image_buffer
-
-static void _glewInfo_WGL_I3D_image_buffer (void)
-{
-  glewPrintExt("WGL_I3D_image_buffer", WGLEW_I3D_image_buffer, wglewIsSupported("WGL_I3D_image_buffer"), wglewGetExtension("WGL_I3D_image_buffer"));
-
-  glewInfoFunc("wglAssociateImageBufferEventsI3D", wglAssociateImageBufferEventsI3D == NULL);
-  glewInfoFunc("wglCreateImageBufferI3D", wglCreateImageBufferI3D == NULL);
-  glewInfoFunc("wglDestroyImageBufferI3D", wglDestroyImageBufferI3D == NULL);
-  glewInfoFunc("wglReleaseImageBufferEventsI3D", wglReleaseImageBufferEventsI3D == NULL);
-}
-
-#endif /* WGL_I3D_image_buffer */
-
-#ifdef WGL_I3D_swap_frame_lock
-
-static void _glewInfo_WGL_I3D_swap_frame_lock (void)
-{
-  glewPrintExt("WGL_I3D_swap_frame_lock", WGLEW_I3D_swap_frame_lock, wglewIsSupported("WGL_I3D_swap_frame_lock"), wglewGetExtension("WGL_I3D_swap_frame_lock"));
-
-  glewInfoFunc("wglDisableFrameLockI3D", wglDisableFrameLockI3D == NULL);
-  glewInfoFunc("wglEnableFrameLockI3D", wglEnableFrameLockI3D == NULL);
-  glewInfoFunc("wglIsEnabledFrameLockI3D", wglIsEnabledFrameLockI3D == NULL);
-  glewInfoFunc("wglQueryFrameLockMasterI3D", wglQueryFrameLockMasterI3D == NULL);
-}
-
-#endif /* WGL_I3D_swap_frame_lock */
-
-#ifdef WGL_I3D_swap_frame_usage
-
-static void _glewInfo_WGL_I3D_swap_frame_usage (void)
-{
-  glewPrintExt("WGL_I3D_swap_frame_usage", WGLEW_I3D_swap_frame_usage, wglewIsSupported("WGL_I3D_swap_frame_usage"), wglewGetExtension("WGL_I3D_swap_frame_usage"));
-
-  glewInfoFunc("wglBeginFrameTrackingI3D", wglBeginFrameTrackingI3D == NULL);
-  glewInfoFunc("wglEndFrameTrackingI3D", wglEndFrameTrackingI3D == NULL);
-  glewInfoFunc("wglGetFrameUsageI3D", wglGetFrameUsageI3D == NULL);
-  glewInfoFunc("wglQueryFrameTrackingI3D", wglQueryFrameTrackingI3D == NULL);
-}
-
-#endif /* WGL_I3D_swap_frame_usage */
-
-#ifdef WGL_NV_DX_interop
-
-static void _glewInfo_WGL_NV_DX_interop (void)
-{
-  glewPrintExt("WGL_NV_DX_interop", WGLEW_NV_DX_interop, wglewIsSupported("WGL_NV_DX_interop"), wglewGetExtension("WGL_NV_DX_interop"));
-
-  glewInfoFunc("wglDXCloseDeviceNV", wglDXCloseDeviceNV == NULL);
-  glewInfoFunc("wglDXLockObjectsNV", wglDXLockObjectsNV == NULL);
-  glewInfoFunc("wglDXObjectAccessNV", wglDXObjectAccessNV == NULL);
-  glewInfoFunc("wglDXOpenDeviceNV", wglDXOpenDeviceNV == NULL);
-  glewInfoFunc("wglDXRegisterObjectNV", wglDXRegisterObjectNV == NULL);
-  glewInfoFunc("wglDXSetResourceShareHandleNV", wglDXSetResourceShareHandleNV == NULL);
-  glewInfoFunc("wglDXUnlockObjectsNV", wglDXUnlockObjectsNV == NULL);
-  glewInfoFunc("wglDXUnregisterObjectNV", wglDXUnregisterObjectNV == NULL);
-}
-
-#endif /* WGL_NV_DX_interop */
-
-#ifdef WGL_NV_DX_interop2
-
-static void _glewInfo_WGL_NV_DX_interop2 (void)
-{
-  glewPrintExt("WGL_NV_DX_interop2", WGLEW_NV_DX_interop2, wglewIsSupported("WGL_NV_DX_interop2"), wglewGetExtension("WGL_NV_DX_interop2"));
-}
-
-#endif /* WGL_NV_DX_interop2 */
-
-#ifdef WGL_NV_copy_image
-
-static void _glewInfo_WGL_NV_copy_image (void)
-{
-  glewPrintExt("WGL_NV_copy_image", WGLEW_NV_copy_image, wglewIsSupported("WGL_NV_copy_image"), wglewGetExtension("WGL_NV_copy_image"));
-
-  glewInfoFunc("wglCopyImageSubDataNV", wglCopyImageSubDataNV == NULL);
-}
-
-#endif /* WGL_NV_copy_image */
-
-#ifdef WGL_NV_float_buffer
-
-static void _glewInfo_WGL_NV_float_buffer (void)
-{
-  glewPrintExt("WGL_NV_float_buffer", WGLEW_NV_float_buffer, wglewIsSupported("WGL_NV_float_buffer"), wglewGetExtension("WGL_NV_float_buffer"));
-}
-
-#endif /* WGL_NV_float_buffer */
-
-#ifdef WGL_NV_gpu_affinity
-
-static void _glewInfo_WGL_NV_gpu_affinity (void)
-{
-  glewPrintExt("WGL_NV_gpu_affinity", WGLEW_NV_gpu_affinity, wglewIsSupported("WGL_NV_gpu_affinity"), wglewGetExtension("WGL_NV_gpu_affinity"));
-
-  glewInfoFunc("wglCreateAffinityDCNV", wglCreateAffinityDCNV == NULL);
-  glewInfoFunc("wglDeleteDCNV", wglDeleteDCNV == NULL);
-  glewInfoFunc("wglEnumGpuDevicesNV", wglEnumGpuDevicesNV == NULL);
-  glewInfoFunc("wglEnumGpusFromAffinityDCNV", wglEnumGpusFromAffinityDCNV == NULL);
-  glewInfoFunc("wglEnumGpusNV", wglEnumGpusNV == NULL);
-}
-
-#endif /* WGL_NV_gpu_affinity */
-
-#ifdef WGL_NV_multisample_coverage
-
-static void _glewInfo_WGL_NV_multisample_coverage (void)
-{
-  glewPrintExt("WGL_NV_multisample_coverage", WGLEW_NV_multisample_coverage, wglewIsSupported("WGL_NV_multisample_coverage"), wglewGetExtension("WGL_NV_multisample_coverage"));
-}
-
-#endif /* WGL_NV_multisample_coverage */
-
-#ifdef WGL_NV_present_video
-
-static void _glewInfo_WGL_NV_present_video (void)
-{
-  glewPrintExt("WGL_NV_present_video", WGLEW_NV_present_video, wglewIsSupported("WGL_NV_present_video"), wglewGetExtension("WGL_NV_present_video"));
-
-  glewInfoFunc("wglBindVideoDeviceNV", wglBindVideoDeviceNV == NULL);
-  glewInfoFunc("wglEnumerateVideoDevicesNV", wglEnumerateVideoDevicesNV == NULL);
-  glewInfoFunc("wglQueryCurrentContextNV", wglQueryCurrentContextNV == NULL);
-}
-
-#endif /* WGL_NV_present_video */
-
-#ifdef WGL_NV_render_depth_texture
-
-static void _glewInfo_WGL_NV_render_depth_texture (void)
-{
-  glewPrintExt("WGL_NV_render_depth_texture", WGLEW_NV_render_depth_texture, wglewIsSupported("WGL_NV_render_depth_texture"), wglewGetExtension("WGL_NV_render_depth_texture"));
-}
-
-#endif /* WGL_NV_render_depth_texture */
-
-#ifdef WGL_NV_render_texture_rectangle
-
-static void _glewInfo_WGL_NV_render_texture_rectangle (void)
-{
-  glewPrintExt("WGL_NV_render_texture_rectangle", WGLEW_NV_render_texture_rectangle, wglewIsSupported("WGL_NV_render_texture_rectangle"), wglewGetExtension("WGL_NV_render_texture_rectangle"));
-}
-
-#endif /* WGL_NV_render_texture_rectangle */
-
-#ifdef WGL_NV_swap_group
-
-static void _glewInfo_WGL_NV_swap_group (void)
-{
-  glewPrintExt("WGL_NV_swap_group", WGLEW_NV_swap_group, wglewIsSupported("WGL_NV_swap_group"), wglewGetExtension("WGL_NV_swap_group"));
-
-  glewInfoFunc("wglBindSwapBarrierNV", wglBindSwapBarrierNV == NULL);
-  glewInfoFunc("wglJoinSwapGroupNV", wglJoinSwapGroupNV == NULL);
-  glewInfoFunc("wglQueryFrameCountNV", wglQueryFrameCountNV == NULL);
-  glewInfoFunc("wglQueryMaxSwapGroupsNV", wglQueryMaxSwapGroupsNV == NULL);
-  glewInfoFunc("wglQuerySwapGroupNV", wglQuerySwapGroupNV == NULL);
-  glewInfoFunc("wglResetFrameCountNV", wglResetFrameCountNV == NULL);
-}
-
-#endif /* WGL_NV_swap_group */
-
-#ifdef WGL_NV_vertex_array_range
-
-static void _glewInfo_WGL_NV_vertex_array_range (void)
-{
-  glewPrintExt("WGL_NV_vertex_array_range", WGLEW_NV_vertex_array_range, wglewIsSupported("WGL_NV_vertex_array_range"), wglewGetExtension("WGL_NV_vertex_array_range"));
-
-  glewInfoFunc("wglAllocateMemoryNV", wglAllocateMemoryNV == NULL);
-  glewInfoFunc("wglFreeMemoryNV", wglFreeMemoryNV == NULL);
-}
-
-#endif /* WGL_NV_vertex_array_range */
-
-#ifdef WGL_NV_video_capture
-
-static void _glewInfo_WGL_NV_video_capture (void)
-{
-  glewPrintExt("WGL_NV_video_capture", WGLEW_NV_video_capture, wglewIsSupported("WGL_NV_video_capture"), wglewGetExtension("WGL_NV_video_capture"));
-
-  glewInfoFunc("wglBindVideoCaptureDeviceNV", wglBindVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("wglEnumerateVideoCaptureDevicesNV", wglEnumerateVideoCaptureDevicesNV == NULL);
-  glewInfoFunc("wglLockVideoCaptureDeviceNV", wglLockVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("wglQueryVideoCaptureDeviceNV", wglQueryVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("wglReleaseVideoCaptureDeviceNV", wglReleaseVideoCaptureDeviceNV == NULL);
-}
-
-#endif /* WGL_NV_video_capture */
-
-#ifdef WGL_NV_video_output
-
-static void _glewInfo_WGL_NV_video_output (void)
-{
-  glewPrintExt("WGL_NV_video_output", WGLEW_NV_video_output, wglewIsSupported("WGL_NV_video_output"), wglewGetExtension("WGL_NV_video_output"));
-
-  glewInfoFunc("wglBindVideoImageNV", wglBindVideoImageNV == NULL);
-  glewInfoFunc("wglGetVideoDeviceNV", wglGetVideoDeviceNV == NULL);
-  glewInfoFunc("wglGetVideoInfoNV", wglGetVideoInfoNV == NULL);
-  glewInfoFunc("wglReleaseVideoDeviceNV", wglReleaseVideoDeviceNV == NULL);
-  glewInfoFunc("wglReleaseVideoImageNV", wglReleaseVideoImageNV == NULL);
-  glewInfoFunc("wglSendPbufferToVideoNV", wglSendPbufferToVideoNV == NULL);
-}
-
-#endif /* WGL_NV_video_output */
-
-#ifdef WGL_OML_sync_control
-
-static void _glewInfo_WGL_OML_sync_control (void)
-{
-  glewPrintExt("WGL_OML_sync_control", WGLEW_OML_sync_control, wglewIsSupported("WGL_OML_sync_control"), wglewGetExtension("WGL_OML_sync_control"));
-
-  glewInfoFunc("wglGetMscRateOML", wglGetMscRateOML == NULL);
-  glewInfoFunc("wglGetSyncValuesOML", wglGetSyncValuesOML == NULL);
-  glewInfoFunc("wglSwapBuffersMscOML", wglSwapBuffersMscOML == NULL);
-  glewInfoFunc("wglSwapLayerBuffersMscOML", wglSwapLayerBuffersMscOML == NULL);
-  glewInfoFunc("wglWaitForMscOML", wglWaitForMscOML == NULL);
-  glewInfoFunc("wglWaitForSbcOML", wglWaitForSbcOML == NULL);
-}
-
-#endif /* WGL_OML_sync_control */
-
-#else /* _UNIX */
-
-#ifdef GLX_VERSION_1_2
-
-static void _glewInfo_GLX_VERSION_1_2 (void)
-{
-  glewPrintExt("GLX_VERSION_1_2", GLXEW_VERSION_1_2, GLXEW_VERSION_1_2, GLXEW_VERSION_1_2);
-
-  glewInfoFunc("glXGetCurrentDisplay", glXGetCurrentDisplay == NULL);
-}
-
-#endif /* GLX_VERSION_1_2 */
-
-#ifdef GLX_VERSION_1_3
-
-static void _glewInfo_GLX_VERSION_1_3 (void)
-{
-  glewPrintExt("GLX_VERSION_1_3", GLXEW_VERSION_1_3, GLXEW_VERSION_1_3, GLXEW_VERSION_1_3);
-
-  glewInfoFunc("glXChooseFBConfig", glXChooseFBConfig == NULL);
-  glewInfoFunc("glXCreateNewContext", glXCreateNewContext == NULL);
-  glewInfoFunc("glXCreatePbuffer", glXCreatePbuffer == NULL);
-  glewInfoFunc("glXCreatePixmap", glXCreatePixmap == NULL);
-  glewInfoFunc("glXCreateWindow", glXCreateWindow == NULL);
-  glewInfoFunc("glXDestroyPbuffer", glXDestroyPbuffer == NULL);
-  glewInfoFunc("glXDestroyPixmap", glXDestroyPixmap == NULL);
-  glewInfoFunc("glXDestroyWindow", glXDestroyWindow == NULL);
-  glewInfoFunc("glXGetCurrentReadDrawable", glXGetCurrentReadDrawable == NULL);
-  glewInfoFunc("glXGetFBConfigAttrib", glXGetFBConfigAttrib == NULL);
-  glewInfoFunc("glXGetFBConfigs", glXGetFBConfigs == NULL);
-  glewInfoFunc("glXGetSelectedEvent", glXGetSelectedEvent == NULL);
-  glewInfoFunc("glXGetVisualFromFBConfig", glXGetVisualFromFBConfig == NULL);
-  glewInfoFunc("glXMakeContextCurrent", glXMakeContextCurrent == NULL);
-  glewInfoFunc("glXQueryContext", glXQueryContext == NULL);
-  glewInfoFunc("glXQueryDrawable", glXQueryDrawable == NULL);
-  glewInfoFunc("glXSelectEvent", glXSelectEvent == NULL);
-}
-
-#endif /* GLX_VERSION_1_3 */
-
-#ifdef GLX_VERSION_1_4
-
-static void _glewInfo_GLX_VERSION_1_4 (void)
-{
-  glewPrintExt("GLX_VERSION_1_4", GLXEW_VERSION_1_4, GLXEW_VERSION_1_4, GLXEW_VERSION_1_4);
-}
-
-#endif /* GLX_VERSION_1_4 */
-
-#ifdef GLX_3DFX_multisample
-
-static void _glewInfo_GLX_3DFX_multisample (void)
-{
-  glewPrintExt("GLX_3DFX_multisample", GLXEW_3DFX_multisample, glxewIsSupported("GLX_3DFX_multisample"), glxewGetExtension("GLX_3DFX_multisample"));
-}
-
-#endif /* GLX_3DFX_multisample */
-
-#ifdef GLX_AMD_gpu_association
-
-static void _glewInfo_GLX_AMD_gpu_association (void)
-{
-  glewPrintExt("GLX_AMD_gpu_association", GLXEW_AMD_gpu_association, glxewIsSupported("GLX_AMD_gpu_association"), glxewGetExtension("GLX_AMD_gpu_association"));
-}
-
-#endif /* GLX_AMD_gpu_association */
-
-#ifdef GLX_ARB_create_context
-
-static void _glewInfo_GLX_ARB_create_context (void)
-{
-  glewPrintExt("GLX_ARB_create_context", GLXEW_ARB_create_context, glxewIsSupported("GLX_ARB_create_context"), glxewGetExtension("GLX_ARB_create_context"));
-
-  glewInfoFunc("glXCreateContextAttribsARB", glXCreateContextAttribsARB == NULL);
-}
-
-#endif /* GLX_ARB_create_context */
-
-#ifdef GLX_ARB_create_context_profile
-
-static void _glewInfo_GLX_ARB_create_context_profile (void)
-{
-  glewPrintExt("GLX_ARB_create_context_profile", GLXEW_ARB_create_context_profile, glxewIsSupported("GLX_ARB_create_context_profile"), glxewGetExtension("GLX_ARB_create_context_profile"));
-}
-
-#endif /* GLX_ARB_create_context_profile */
-
-#ifdef GLX_ARB_create_context_robustness
-
-static void _glewInfo_GLX_ARB_create_context_robustness (void)
-{
-  glewPrintExt("GLX_ARB_create_context_robustness", GLXEW_ARB_create_context_robustness, glxewIsSupported("GLX_ARB_create_context_robustness"), glxewGetExtension("GLX_ARB_create_context_robustness"));
-}
-
-#endif /* GLX_ARB_create_context_robustness */
-
-#ifdef GLX_ARB_fbconfig_float
-
-static void _glewInfo_GLX_ARB_fbconfig_float (void)
-{
-  glewPrintExt("GLX_ARB_fbconfig_float", GLXEW_ARB_fbconfig_float, glxewIsSupported("GLX_ARB_fbconfig_float"), glxewGetExtension("GLX_ARB_fbconfig_float"));
-}
-
-#endif /* GLX_ARB_fbconfig_float */
-
-#ifdef GLX_ARB_framebuffer_sRGB
-
-static void _glewInfo_GLX_ARB_framebuffer_sRGB (void)
-{
-  glewPrintExt("GLX_ARB_framebuffer_sRGB", GLXEW_ARB_framebuffer_sRGB, glxewIsSupported("GLX_ARB_framebuffer_sRGB"), glxewGetExtension("GLX_ARB_framebuffer_sRGB"));
-}
-
-#endif /* GLX_ARB_framebuffer_sRGB */
-
-#ifdef GLX_ARB_get_proc_address
-
-static void _glewInfo_GLX_ARB_get_proc_address (void)
-{
-  glewPrintExt("GLX_ARB_get_proc_address", GLXEW_ARB_get_proc_address, glxewIsSupported("GLX_ARB_get_proc_address"), glxewGetExtension("GLX_ARB_get_proc_address"));
-}
-
-#endif /* GLX_ARB_get_proc_address */
-
-#ifdef GLX_ARB_multisample
-
-static void _glewInfo_GLX_ARB_multisample (void)
-{
-  glewPrintExt("GLX_ARB_multisample", GLXEW_ARB_multisample, glxewIsSupported("GLX_ARB_multisample"), glxewGetExtension("GLX_ARB_multisample"));
-}
-
-#endif /* GLX_ARB_multisample */
-
-#ifdef GLX_ARB_robustness_application_isolation
-
-static void _glewInfo_GLX_ARB_robustness_application_isolation (void)
-{
-  glewPrintExt("GLX_ARB_robustness_application_isolation", GLXEW_ARB_robustness_application_isolation, glxewIsSupported("GLX_ARB_robustness_application_isolation"), glxewGetExtension("GLX_ARB_robustness_application_isolation"));
-}
-
-#endif /* GLX_ARB_robustness_application_isolation */
-
-#ifdef GLX_ARB_robustness_share_group_isolation
-
-static void _glewInfo_GLX_ARB_robustness_share_group_isolation (void)
-{
-  glewPrintExt("GLX_ARB_robustness_share_group_isolation", GLXEW_ARB_robustness_share_group_isolation, glxewIsSupported("GLX_ARB_robustness_share_group_isolation"), glxewGetExtension("GLX_ARB_robustness_share_group_isolation"));
-}
-
-#endif /* GLX_ARB_robustness_share_group_isolation */
-
-#ifdef GLX_ARB_vertex_buffer_object
-
-static void _glewInfo_GLX_ARB_vertex_buffer_object (void)
-{
-  glewPrintExt("GLX_ARB_vertex_buffer_object", GLXEW_ARB_vertex_buffer_object, glxewIsSupported("GLX_ARB_vertex_buffer_object"), glxewGetExtension("GLX_ARB_vertex_buffer_object"));
-}
-
-#endif /* GLX_ARB_vertex_buffer_object */
-
-#ifdef GLX_ATI_pixel_format_float
-
-static void _glewInfo_GLX_ATI_pixel_format_float (void)
-{
-  glewPrintExt("GLX_ATI_pixel_format_float", GLXEW_ATI_pixel_format_float, glxewIsSupported("GLX_ATI_pixel_format_float"), glxewGetExtension("GLX_ATI_pixel_format_float"));
-}
-
-#endif /* GLX_ATI_pixel_format_float */
-
-#ifdef GLX_ATI_render_texture
-
-static void _glewInfo_GLX_ATI_render_texture (void)
-{
-  glewPrintExt("GLX_ATI_render_texture", GLXEW_ATI_render_texture, glxewIsSupported("GLX_ATI_render_texture"), glxewGetExtension("GLX_ATI_render_texture"));
-
-  glewInfoFunc("glXBindTexImageATI", glXBindTexImageATI == NULL);
-  glewInfoFunc("glXDrawableAttribATI", glXDrawableAttribATI == NULL);
-  glewInfoFunc("glXReleaseTexImageATI", glXReleaseTexImageATI == NULL);
-}
-
-#endif /* GLX_ATI_render_texture */
-
-#ifdef GLX_EXT_create_context_es2_profile
-
-static void _glewInfo_GLX_EXT_create_context_es2_profile (void)
-{
-  glewPrintExt("GLX_EXT_create_context_es2_profile", GLXEW_EXT_create_context_es2_profile, glxewIsSupported("GLX_EXT_create_context_es2_profile"), glxewGetExtension("GLX_EXT_create_context_es2_profile"));
-}
-
-#endif /* GLX_EXT_create_context_es2_profile */
-
-#ifdef GLX_EXT_create_context_es_profile
-
-static void _glewInfo_GLX_EXT_create_context_es_profile (void)
-{
-  glewPrintExt("GLX_EXT_create_context_es_profile", GLXEW_EXT_create_context_es_profile, glxewIsSupported("GLX_EXT_create_context_es_profile"), glxewGetExtension("GLX_EXT_create_context_es_profile"));
-}
-
-#endif /* GLX_EXT_create_context_es_profile */
-
-#ifdef GLX_EXT_fbconfig_packed_float
-
-static void _glewInfo_GLX_EXT_fbconfig_packed_float (void)
-{
-  glewPrintExt("GLX_EXT_fbconfig_packed_float", GLXEW_EXT_fbconfig_packed_float, glxewIsSupported("GLX_EXT_fbconfig_packed_float"), glxewGetExtension("GLX_EXT_fbconfig_packed_float"));
-}
-
-#endif /* GLX_EXT_fbconfig_packed_float */
-
-#ifdef GLX_EXT_framebuffer_sRGB
-
-static void _glewInfo_GLX_EXT_framebuffer_sRGB (void)
-{
-  glewPrintExt("GLX_EXT_framebuffer_sRGB", GLXEW_EXT_framebuffer_sRGB, glxewIsSupported("GLX_EXT_framebuffer_sRGB"), glxewGetExtension("GLX_EXT_framebuffer_sRGB"));
-}
-
-#endif /* GLX_EXT_framebuffer_sRGB */
-
-#ifdef GLX_EXT_import_context
-
-static void _glewInfo_GLX_EXT_import_context (void)
-{
-  glewPrintExt("GLX_EXT_import_context", GLXEW_EXT_import_context, glxewIsSupported("GLX_EXT_import_context"), glxewGetExtension("GLX_EXT_import_context"));
-
-  glewInfoFunc("glXFreeContextEXT", glXFreeContextEXT == NULL);
-  glewInfoFunc("glXGetContextIDEXT", glXGetContextIDEXT == NULL);
-  glewInfoFunc("glXImportContextEXT", glXImportContextEXT == NULL);
-  glewInfoFunc("glXQueryContextInfoEXT", glXQueryContextInfoEXT == NULL);
-}
-
-#endif /* GLX_EXT_import_context */
-
-#ifdef GLX_EXT_scene_marker
-
-static void _glewInfo_GLX_EXT_scene_marker (void)
-{
-  glewPrintExt("GLX_EXT_scene_marker", GLXEW_EXT_scene_marker, glxewIsSupported("GLX_EXT_scene_marker"), glxewGetExtension("GLX_EXT_scene_marker"));
-}
-
-#endif /* GLX_EXT_scene_marker */
-
-#ifdef GLX_EXT_swap_control
-
-static void _glewInfo_GLX_EXT_swap_control (void)
-{
-  glewPrintExt("GLX_EXT_swap_control", GLXEW_EXT_swap_control, glxewIsSupported("GLX_EXT_swap_control"), glxewGetExtension("GLX_EXT_swap_control"));
-
-  glewInfoFunc("glXSwapIntervalEXT", glXSwapIntervalEXT == NULL);
-}
-
-#endif /* GLX_EXT_swap_control */
-
-#ifdef GLX_EXT_swap_control_tear
-
-static void _glewInfo_GLX_EXT_swap_control_tear (void)
-{
-  glewPrintExt("GLX_EXT_swap_control_tear", GLXEW_EXT_swap_control_tear, glxewIsSupported("GLX_EXT_swap_control_tear"), glxewGetExtension("GLX_EXT_swap_control_tear"));
-}
-
-#endif /* GLX_EXT_swap_control_tear */
-
-#ifdef GLX_EXT_texture_from_pixmap
-
-static void _glewInfo_GLX_EXT_texture_from_pixmap (void)
-{
-  glewPrintExt("GLX_EXT_texture_from_pixmap", GLXEW_EXT_texture_from_pixmap, glxewIsSupported("GLX_EXT_texture_from_pixmap"), glxewGetExtension("GLX_EXT_texture_from_pixmap"));
-
-  glewInfoFunc("glXBindTexImageEXT", glXBindTexImageEXT == NULL);
-  glewInfoFunc("glXReleaseTexImageEXT", glXReleaseTexImageEXT == NULL);
-}
-
-#endif /* GLX_EXT_texture_from_pixmap */
-
-#ifdef GLX_EXT_visual_info
-
-static void _glewInfo_GLX_EXT_visual_info (void)
-{
-  glewPrintExt("GLX_EXT_visual_info", GLXEW_EXT_visual_info, glxewIsSupported("GLX_EXT_visual_info"), glxewGetExtension("GLX_EXT_visual_info"));
-}
-
-#endif /* GLX_EXT_visual_info */
-
-#ifdef GLX_EXT_visual_rating
-
-static void _glewInfo_GLX_EXT_visual_rating (void)
-{
-  glewPrintExt("GLX_EXT_visual_rating", GLXEW_EXT_visual_rating, glxewIsSupported("GLX_EXT_visual_rating"), glxewGetExtension("GLX_EXT_visual_rating"));
-}
-
-#endif /* GLX_EXT_visual_rating */
-
-#ifdef GLX_INTEL_swap_event
-
-static void _glewInfo_GLX_INTEL_swap_event (void)
-{
-  glewPrintExt("GLX_INTEL_swap_event", GLXEW_INTEL_swap_event, glxewIsSupported("GLX_INTEL_swap_event"), glxewGetExtension("GLX_INTEL_swap_event"));
-}
-
-#endif /* GLX_INTEL_swap_event */
-
-#ifdef GLX_MESA_agp_offset
-
-static void _glewInfo_GLX_MESA_agp_offset (void)
-{
-  glewPrintExt("GLX_MESA_agp_offset", GLXEW_MESA_agp_offset, glxewIsSupported("GLX_MESA_agp_offset"), glxewGetExtension("GLX_MESA_agp_offset"));
-
-  glewInfoFunc("glXGetAGPOffsetMESA", glXGetAGPOffsetMESA == NULL);
-}
-
-#endif /* GLX_MESA_agp_offset */
-
-#ifdef GLX_MESA_copy_sub_buffer
-
-static void _glewInfo_GLX_MESA_copy_sub_buffer (void)
-{
-  glewPrintExt("GLX_MESA_copy_sub_buffer", GLXEW_MESA_copy_sub_buffer, glxewIsSupported("GLX_MESA_copy_sub_buffer"), glxewGetExtension("GLX_MESA_copy_sub_buffer"));
-
-  glewInfoFunc("glXCopySubBufferMESA", glXCopySubBufferMESA == NULL);
-}
-
-#endif /* GLX_MESA_copy_sub_buffer */
-
-#ifdef GLX_MESA_pixmap_colormap
-
-static void _glewInfo_GLX_MESA_pixmap_colormap (void)
-{
-  glewPrintExt("GLX_MESA_pixmap_colormap", GLXEW_MESA_pixmap_colormap, glxewIsSupported("GLX_MESA_pixmap_colormap"), glxewGetExtension("GLX_MESA_pixmap_colormap"));
-
-  glewInfoFunc("glXCreateGLXPixmapMESA", glXCreateGLXPixmapMESA == NULL);
-}
-
-#endif /* GLX_MESA_pixmap_colormap */
-
-#ifdef GLX_MESA_release_buffers
-
-static void _glewInfo_GLX_MESA_release_buffers (void)
-{
-  glewPrintExt("GLX_MESA_release_buffers", GLXEW_MESA_release_buffers, glxewIsSupported("GLX_MESA_release_buffers"), glxewGetExtension("GLX_MESA_release_buffers"));
-
-  glewInfoFunc("glXReleaseBuffersMESA", glXReleaseBuffersMESA == NULL);
-}
-
-#endif /* GLX_MESA_release_buffers */
-
-#ifdef GLX_MESA_set_3dfx_mode
-
-static void _glewInfo_GLX_MESA_set_3dfx_mode (void)
-{
-  glewPrintExt("GLX_MESA_set_3dfx_mode", GLXEW_MESA_set_3dfx_mode, glxewIsSupported("GLX_MESA_set_3dfx_mode"), glxewGetExtension("GLX_MESA_set_3dfx_mode"));
-
-  glewInfoFunc("glXSet3DfxModeMESA", glXSet3DfxModeMESA == NULL);
-}
-
-#endif /* GLX_MESA_set_3dfx_mode */
-
-#ifdef GLX_MESA_swap_control
-
-static void _glewInfo_GLX_MESA_swap_control (void)
-{
-  glewPrintExt("GLX_MESA_swap_control", GLXEW_MESA_swap_control, glxewIsSupported("GLX_MESA_swap_control"), glxewGetExtension("GLX_MESA_swap_control"));
-
-  glewInfoFunc("glXGetSwapIntervalMESA", glXGetSwapIntervalMESA == NULL);
-  glewInfoFunc("glXSwapIntervalMESA", glXSwapIntervalMESA == NULL);
-}
-
-#endif /* GLX_MESA_swap_control */
-
-#ifdef GLX_NV_copy_image
-
-static void _glewInfo_GLX_NV_copy_image (void)
-{
-  glewPrintExt("GLX_NV_copy_image", GLXEW_NV_copy_image, glxewIsSupported("GLX_NV_copy_image"), glxewGetExtension("GLX_NV_copy_image"));
-
-  glewInfoFunc("glXCopyImageSubDataNV", glXCopyImageSubDataNV == NULL);
-}
-
-#endif /* GLX_NV_copy_image */
-
-#ifdef GLX_NV_float_buffer
-
-static void _glewInfo_GLX_NV_float_buffer (void)
-{
-  glewPrintExt("GLX_NV_float_buffer", GLXEW_NV_float_buffer, glxewIsSupported("GLX_NV_float_buffer"), glxewGetExtension("GLX_NV_float_buffer"));
-}
-
-#endif /* GLX_NV_float_buffer */
-
-#ifdef GLX_NV_multisample_coverage
-
-static void _glewInfo_GLX_NV_multisample_coverage (void)
-{
-  glewPrintExt("GLX_NV_multisample_coverage", GLXEW_NV_multisample_coverage, glxewIsSupported("GLX_NV_multisample_coverage"), glxewGetExtension("GLX_NV_multisample_coverage"));
-}
-
-#endif /* GLX_NV_multisample_coverage */
-
-#ifdef GLX_NV_present_video
-
-static void _glewInfo_GLX_NV_present_video (void)
-{
-  glewPrintExt("GLX_NV_present_video", GLXEW_NV_present_video, glxewIsSupported("GLX_NV_present_video"), glxewGetExtension("GLX_NV_present_video"));
-
-  glewInfoFunc("glXBindVideoDeviceNV", glXBindVideoDeviceNV == NULL);
-  glewInfoFunc("glXEnumerateVideoDevicesNV", glXEnumerateVideoDevicesNV == NULL);
-}
-
-#endif /* GLX_NV_present_video */
-
-#ifdef GLX_NV_swap_group
-
-static void _glewInfo_GLX_NV_swap_group (void)
-{
-  glewPrintExt("GLX_NV_swap_group", GLXEW_NV_swap_group, glxewIsSupported("GLX_NV_swap_group"), glxewGetExtension("GLX_NV_swap_group"));
-
-  glewInfoFunc("glXBindSwapBarrierNV", glXBindSwapBarrierNV == NULL);
-  glewInfoFunc("glXJoinSwapGroupNV", glXJoinSwapGroupNV == NULL);
-  glewInfoFunc("glXQueryFrameCountNV", glXQueryFrameCountNV == NULL);
-  glewInfoFunc("glXQueryMaxSwapGroupsNV", glXQueryMaxSwapGroupsNV == NULL);
-  glewInfoFunc("glXQuerySwapGroupNV", glXQuerySwapGroupNV == NULL);
-  glewInfoFunc("glXResetFrameCountNV", glXResetFrameCountNV == NULL);
-}
-
-#endif /* GLX_NV_swap_group */
-
-#ifdef GLX_NV_vertex_array_range
-
-static void _glewInfo_GLX_NV_vertex_array_range (void)
-{
-  glewPrintExt("GLX_NV_vertex_array_range", GLXEW_NV_vertex_array_range, glxewIsSupported("GLX_NV_vertex_array_range"), glxewGetExtension("GLX_NV_vertex_array_range"));
-
-  glewInfoFunc("glXAllocateMemoryNV", glXAllocateMemoryNV == NULL);
-  glewInfoFunc("glXFreeMemoryNV", glXFreeMemoryNV == NULL);
-}
-
-#endif /* GLX_NV_vertex_array_range */
-
-#ifdef GLX_NV_video_capture
-
-static void _glewInfo_GLX_NV_video_capture (void)
-{
-  glewPrintExt("GLX_NV_video_capture", GLXEW_NV_video_capture, glxewIsSupported("GLX_NV_video_capture"), glxewGetExtension("GLX_NV_video_capture"));
-
-  glewInfoFunc("glXBindVideoCaptureDeviceNV", glXBindVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("glXEnumerateVideoCaptureDevicesNV", glXEnumerateVideoCaptureDevicesNV == NULL);
-  glewInfoFunc("glXLockVideoCaptureDeviceNV", glXLockVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("glXQueryVideoCaptureDeviceNV", glXQueryVideoCaptureDeviceNV == NULL);
-  glewInfoFunc("glXReleaseVideoCaptureDeviceNV", glXReleaseVideoCaptureDeviceNV == NULL);
-}
-
-#endif /* GLX_NV_video_capture */
-
-#ifdef GLX_NV_video_out
-
-static void _glewInfo_GLX_NV_video_out (void)
-{
-  glewPrintExt("GLX_NV_video_out", GLXEW_NV_video_out, glxewIsSupported("GLX_NV_video_out"), glxewGetExtension("GLX_NV_video_out"));
-
-  glewInfoFunc("glXBindVideoImageNV", glXBindVideoImageNV == NULL);
-  glewInfoFunc("glXGetVideoDeviceNV", glXGetVideoDeviceNV == NULL);
-  glewInfoFunc("glXGetVideoInfoNV", glXGetVideoInfoNV == NULL);
-  glewInfoFunc("glXReleaseVideoDeviceNV", glXReleaseVideoDeviceNV == NULL);
-  glewInfoFunc("glXReleaseVideoImageNV", glXReleaseVideoImageNV == NULL);
-  glewInfoFunc("glXSendPbufferToVideoNV", glXSendPbufferToVideoNV == NULL);
-}
-
-#endif /* GLX_NV_video_out */
-
-#ifdef GLX_OML_swap_method
-
-static void _glewInfo_GLX_OML_swap_method (void)
-{
-  glewPrintExt("GLX_OML_swap_method", GLXEW_OML_swap_method, glxewIsSupported("GLX_OML_swap_method"), glxewGetExtension("GLX_OML_swap_method"));
-}
-
-#endif /* GLX_OML_swap_method */
-
-#ifdef GLX_OML_sync_control
-
-static void _glewInfo_GLX_OML_sync_control (void)
-{
-  glewPrintExt("GLX_OML_sync_control", GLXEW_OML_sync_control, glxewIsSupported("GLX_OML_sync_control"), glxewGetExtension("GLX_OML_sync_control"));
-
-  glewInfoFunc("glXGetMscRateOML", glXGetMscRateOML == NULL);
-  glewInfoFunc("glXGetSyncValuesOML", glXGetSyncValuesOML == NULL);
-  glewInfoFunc("glXSwapBuffersMscOML", glXSwapBuffersMscOML == NULL);
-  glewInfoFunc("glXWaitForMscOML", glXWaitForMscOML == NULL);
-  glewInfoFunc("glXWaitForSbcOML", glXWaitForSbcOML == NULL);
-}
-
-#endif /* GLX_OML_sync_control */
-
-#ifdef GLX_SGIS_blended_overlay
-
-static void _glewInfo_GLX_SGIS_blended_overlay (void)
-{
-  glewPrintExt("GLX_SGIS_blended_overlay", GLXEW_SGIS_blended_overlay, glxewIsSupported("GLX_SGIS_blended_overlay"), glxewGetExtension("GLX_SGIS_blended_overlay"));
-}
-
-#endif /* GLX_SGIS_blended_overlay */
-
-#ifdef GLX_SGIS_color_range
-
-static void _glewInfo_GLX_SGIS_color_range (void)
-{
-  glewPrintExt("GLX_SGIS_color_range", GLXEW_SGIS_color_range, glxewIsSupported("GLX_SGIS_color_range"), glxewGetExtension("GLX_SGIS_color_range"));
-}
-
-#endif /* GLX_SGIS_color_range */
-
-#ifdef GLX_SGIS_multisample
-
-static void _glewInfo_GLX_SGIS_multisample (void)
-{
-  glewPrintExt("GLX_SGIS_multisample", GLXEW_SGIS_multisample, glxewIsSupported("GLX_SGIS_multisample"), glxewGetExtension("GLX_SGIS_multisample"));
-}
-
-#endif /* GLX_SGIS_multisample */
-
-#ifdef GLX_SGIS_shared_multisample
-
-static void _glewInfo_GLX_SGIS_shared_multisample (void)
-{
-  glewPrintExt("GLX_SGIS_shared_multisample", GLXEW_SGIS_shared_multisample, glxewIsSupported("GLX_SGIS_shared_multisample"), glxewGetExtension("GLX_SGIS_shared_multisample"));
-}
-
-#endif /* GLX_SGIS_shared_multisample */
-
-#ifdef GLX_SGIX_fbconfig
-
-static void _glewInfo_GLX_SGIX_fbconfig (void)
-{
-  glewPrintExt("GLX_SGIX_fbconfig", GLXEW_SGIX_fbconfig, glxewIsSupported("GLX_SGIX_fbconfig"), glxewGetExtension("GLX_SGIX_fbconfig"));
-
-  glewInfoFunc("glXChooseFBConfigSGIX", glXChooseFBConfigSGIX == NULL);
-  glewInfoFunc("glXCreateContextWithConfigSGIX", glXCreateContextWithConfigSGIX == NULL);
-  glewInfoFunc("glXCreateGLXPixmapWithConfigSGIX", glXCreateGLXPixmapWithConfigSGIX == NULL);
-  glewInfoFunc("glXGetFBConfigAttribSGIX", glXGetFBConfigAttribSGIX == NULL);
-  glewInfoFunc("glXGetFBConfigFromVisualSGIX", glXGetFBConfigFromVisualSGIX == NULL);
-  glewInfoFunc("glXGetVisualFromFBConfigSGIX", glXGetVisualFromFBConfigSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_fbconfig */
-
-#ifdef GLX_SGIX_hyperpipe
-
-static void _glewInfo_GLX_SGIX_hyperpipe (void)
-{
-  glewPrintExt("GLX_SGIX_hyperpipe", GLXEW_SGIX_hyperpipe, glxewIsSupported("GLX_SGIX_hyperpipe"), glxewGetExtension("GLX_SGIX_hyperpipe"));
-
-  glewInfoFunc("glXBindHyperpipeSGIX", glXBindHyperpipeSGIX == NULL);
-  glewInfoFunc("glXDestroyHyperpipeConfigSGIX", glXDestroyHyperpipeConfigSGIX == NULL);
-  glewInfoFunc("glXHyperpipeAttribSGIX", glXHyperpipeAttribSGIX == NULL);
-  glewInfoFunc("glXHyperpipeConfigSGIX", glXHyperpipeConfigSGIX == NULL);
-  glewInfoFunc("glXQueryHyperpipeAttribSGIX", glXQueryHyperpipeAttribSGIX == NULL);
-  glewInfoFunc("glXQueryHyperpipeBestAttribSGIX", glXQueryHyperpipeBestAttribSGIX == NULL);
-  glewInfoFunc("glXQueryHyperpipeConfigSGIX", glXQueryHyperpipeConfigSGIX == NULL);
-  glewInfoFunc("glXQueryHyperpipeNetworkSGIX", glXQueryHyperpipeNetworkSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_hyperpipe */
-
-#ifdef GLX_SGIX_pbuffer
-
-static void _glewInfo_GLX_SGIX_pbuffer (void)
-{
-  glewPrintExt("GLX_SGIX_pbuffer", GLXEW_SGIX_pbuffer, glxewIsSupported("GLX_SGIX_pbuffer"), glxewGetExtension("GLX_SGIX_pbuffer"));
-
-  glewInfoFunc("glXCreateGLXPbufferSGIX", glXCreateGLXPbufferSGIX == NULL);
-  glewInfoFunc("glXDestroyGLXPbufferSGIX", glXDestroyGLXPbufferSGIX == NULL);
-  glewInfoFunc("glXGetSelectedEventSGIX", glXGetSelectedEventSGIX == NULL);
-  glewInfoFunc("glXQueryGLXPbufferSGIX", glXQueryGLXPbufferSGIX == NULL);
-  glewInfoFunc("glXSelectEventSGIX", glXSelectEventSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_pbuffer */
-
-#ifdef GLX_SGIX_swap_barrier
-
-static void _glewInfo_GLX_SGIX_swap_barrier (void)
-{
-  glewPrintExt("GLX_SGIX_swap_barrier", GLXEW_SGIX_swap_barrier, glxewIsSupported("GLX_SGIX_swap_barrier"), glxewGetExtension("GLX_SGIX_swap_barrier"));
-
-  glewInfoFunc("glXBindSwapBarrierSGIX", glXBindSwapBarrierSGIX == NULL);
-  glewInfoFunc("glXQueryMaxSwapBarriersSGIX", glXQueryMaxSwapBarriersSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_swap_barrier */
-
-#ifdef GLX_SGIX_swap_group
-
-static void _glewInfo_GLX_SGIX_swap_group (void)
-{
-  glewPrintExt("GLX_SGIX_swap_group", GLXEW_SGIX_swap_group, glxewIsSupported("GLX_SGIX_swap_group"), glxewGetExtension("GLX_SGIX_swap_group"));
-
-  glewInfoFunc("glXJoinSwapGroupSGIX", glXJoinSwapGroupSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_swap_group */
-
-#ifdef GLX_SGIX_video_resize
-
-static void _glewInfo_GLX_SGIX_video_resize (void)
-{
-  glewPrintExt("GLX_SGIX_video_resize", GLXEW_SGIX_video_resize, glxewIsSupported("GLX_SGIX_video_resize"), glxewGetExtension("GLX_SGIX_video_resize"));
-
-  glewInfoFunc("glXBindChannelToWindowSGIX", glXBindChannelToWindowSGIX == NULL);
-  glewInfoFunc("glXChannelRectSGIX", glXChannelRectSGIX == NULL);
-  glewInfoFunc("glXChannelRectSyncSGIX", glXChannelRectSyncSGIX == NULL);
-  glewInfoFunc("glXQueryChannelDeltasSGIX", glXQueryChannelDeltasSGIX == NULL);
-  glewInfoFunc("glXQueryChannelRectSGIX", glXQueryChannelRectSGIX == NULL);
-}
-
-#endif /* GLX_SGIX_video_resize */
-
-#ifdef GLX_SGIX_visual_select_group
-
-static void _glewInfo_GLX_SGIX_visual_select_group (void)
-{
-  glewPrintExt("GLX_SGIX_visual_select_group", GLXEW_SGIX_visual_select_group, glxewIsSupported("GLX_SGIX_visual_select_group"), glxewGetExtension("GLX_SGIX_visual_select_group"));
-}
-
-#endif /* GLX_SGIX_visual_select_group */
-
-#ifdef GLX_SGI_cushion
-
-static void _glewInfo_GLX_SGI_cushion (void)
-{
-  glewPrintExt("GLX_SGI_cushion", GLXEW_SGI_cushion, glxewIsSupported("GLX_SGI_cushion"), glxewGetExtension("GLX_SGI_cushion"));
-
-  glewInfoFunc("glXCushionSGI", glXCushionSGI == NULL);
-}
-
-#endif /* GLX_SGI_cushion */
-
-#ifdef GLX_SGI_make_current_read
-
-static void _glewInfo_GLX_SGI_make_current_read (void)
-{
-  glewPrintExt("GLX_SGI_make_current_read", GLXEW_SGI_make_current_read, glxewIsSupported("GLX_SGI_make_current_read"), glxewGetExtension("GLX_SGI_make_current_read"));
-
-  glewInfoFunc("glXGetCurrentReadDrawableSGI", glXGetCurrentReadDrawableSGI == NULL);
-  glewInfoFunc("glXMakeCurrentReadSGI", glXMakeCurrentReadSGI == NULL);
-}
-
-#endif /* GLX_SGI_make_current_read */
-
-#ifdef GLX_SGI_swap_control
-
-static void _glewInfo_GLX_SGI_swap_control (void)
-{
-  glewPrintExt("GLX_SGI_swap_control", GLXEW_SGI_swap_control, glxewIsSupported("GLX_SGI_swap_control"), glxewGetExtension("GLX_SGI_swap_control"));
-
-  glewInfoFunc("glXSwapIntervalSGI", glXSwapIntervalSGI == NULL);
-}
-
-#endif /* GLX_SGI_swap_control */
-
-#ifdef GLX_SGI_video_sync
-
-static void _glewInfo_GLX_SGI_video_sync (void)
-{
-  glewPrintExt("GLX_SGI_video_sync", GLXEW_SGI_video_sync, glxewIsSupported("GLX_SGI_video_sync"), glxewGetExtension("GLX_SGI_video_sync"));
-
-  glewInfoFunc("glXGetVideoSyncSGI", glXGetVideoSyncSGI == NULL);
-  glewInfoFunc("glXWaitVideoSyncSGI", glXWaitVideoSyncSGI == NULL);
-}
-
-#endif /* GLX_SGI_video_sync */
-
-#ifdef GLX_SUN_get_transparent_index
-
-static void _glewInfo_GLX_SUN_get_transparent_index (void)
-{
-  glewPrintExt("GLX_SUN_get_transparent_index", GLXEW_SUN_get_transparent_index, glxewIsSupported("GLX_SUN_get_transparent_index"), glxewGetExtension("GLX_SUN_get_transparent_index"));
-
-  glewInfoFunc("glXGetTransparentIndexSUN", glXGetTransparentIndexSUN == NULL);
-}
-
-#endif /* GLX_SUN_get_transparent_index */
-
-#ifdef GLX_SUN_video_resize
-
-static void _glewInfo_GLX_SUN_video_resize (void)
-{
-  glewPrintExt("GLX_SUN_video_resize", GLXEW_SUN_video_resize, glxewIsSupported("GLX_SUN_video_resize"), glxewGetExtension("GLX_SUN_video_resize"));
-
-  glewInfoFunc("glXGetVideoResizeSUN", glXGetVideoResizeSUN == NULL);
-  glewInfoFunc("glXVideoResizeSUN", glXVideoResizeSUN == NULL);
-}
-
-#endif /* GLX_SUN_video_resize */
-
-#endif /* _WIN32 */
-
-/* ------------------------------------------------------------------------ */
-
-static void glewInfo (void)
-{
-#ifdef GL_VERSION_1_1
-  _glewInfo_GL_VERSION_1_1();
-#endif /* GL_VERSION_1_1 */
-#ifdef GL_VERSION_1_2
-  _glewInfo_GL_VERSION_1_2();
-#endif /* GL_VERSION_1_2 */
-#ifdef GL_VERSION_1_2_1
-  _glewInfo_GL_VERSION_1_2_1();
-#endif /* GL_VERSION_1_2_1 */
-#ifdef GL_VERSION_1_3
-  _glewInfo_GL_VERSION_1_3();
-#endif /* GL_VERSION_1_3 */
-#ifdef GL_VERSION_1_4
-  _glewInfo_GL_VERSION_1_4();
-#endif /* GL_VERSION_1_4 */
-#ifdef GL_VERSION_1_5
-  _glewInfo_GL_VERSION_1_5();
-#endif /* GL_VERSION_1_5 */
-#ifdef GL_VERSION_2_0
-  _glewInfo_GL_VERSION_2_0();
-#endif /* GL_VERSION_2_0 */
-#ifdef GL_VERSION_2_1
-  _glewInfo_GL_VERSION_2_1();
-#endif /* GL_VERSION_2_1 */
-#ifdef GL_VERSION_3_0
-  _glewInfo_GL_VERSION_3_0();
-#endif /* GL_VERSION_3_0 */
-#ifdef GL_VERSION_3_1
-  _glewInfo_GL_VERSION_3_1();
-#endif /* GL_VERSION_3_1 */
-#ifdef GL_VERSION_3_2
-  _glewInfo_GL_VERSION_3_2();
-#endif /* GL_VERSION_3_2 */
-#ifdef GL_VERSION_3_3
-  _glewInfo_GL_VERSION_3_3();
-#endif /* GL_VERSION_3_3 */
-#ifdef GL_VERSION_4_0
-  _glewInfo_GL_VERSION_4_0();
-#endif /* GL_VERSION_4_0 */
-#ifdef GL_VERSION_4_1
-  _glewInfo_GL_VERSION_4_1();
-#endif /* GL_VERSION_4_1 */
-#ifdef GL_VERSION_4_2
-  _glewInfo_GL_VERSION_4_2();
-#endif /* GL_VERSION_4_2 */
-#ifdef GL_VERSION_4_3
-  _glewInfo_GL_VERSION_4_3();
-#endif /* GL_VERSION_4_3 */
-#ifdef GL_3DFX_multisample
-  _glewInfo_GL_3DFX_multisample();
-#endif /* GL_3DFX_multisample */
-#ifdef GL_3DFX_tbuffer
-  _glewInfo_GL_3DFX_tbuffer();
-#endif /* GL_3DFX_tbuffer */
-#ifdef GL_3DFX_texture_compression_FXT1
-  _glewInfo_GL_3DFX_texture_compression_FXT1();
-#endif /* GL_3DFX_texture_compression_FXT1 */
-#ifdef GL_AMD_blend_minmax_factor
-  _glewInfo_GL_AMD_blend_minmax_factor();
-#endif /* GL_AMD_blend_minmax_factor */
-#ifdef GL_AMD_conservative_depth
-  _glewInfo_GL_AMD_conservative_depth();
-#endif /* GL_AMD_conservative_depth */
-#ifdef GL_AMD_debug_output
-  _glewInfo_GL_AMD_debug_output();
-#endif /* GL_AMD_debug_output */
-#ifdef GL_AMD_depth_clamp_separate
-  _glewInfo_GL_AMD_depth_clamp_separate();
-#endif /* GL_AMD_depth_clamp_separate */
-#ifdef GL_AMD_draw_buffers_blend
-  _glewInfo_GL_AMD_draw_buffers_blend();
-#endif /* GL_AMD_draw_buffers_blend */
-#ifdef GL_AMD_multi_draw_indirect
-  _glewInfo_GL_AMD_multi_draw_indirect();
-#endif /* GL_AMD_multi_draw_indirect */
-#ifdef GL_AMD_name_gen_delete
-  _glewInfo_GL_AMD_name_gen_delete();
-#endif /* GL_AMD_name_gen_delete */
-#ifdef GL_AMD_performance_monitor
-  _glewInfo_GL_AMD_performance_monitor();
-#endif /* GL_AMD_performance_monitor */
-#ifdef GL_AMD_pinned_memory
-  _glewInfo_GL_AMD_pinned_memory();
-#endif /* GL_AMD_pinned_memory */
-#ifdef GL_AMD_query_buffer_object
-  _glewInfo_GL_AMD_query_buffer_object();
-#endif /* GL_AMD_query_buffer_object */
-#ifdef GL_AMD_sample_positions
-  _glewInfo_GL_AMD_sample_positions();
-#endif /* GL_AMD_sample_positions */
-#ifdef GL_AMD_seamless_cubemap_per_texture
-  _glewInfo_GL_AMD_seamless_cubemap_per_texture();
-#endif /* GL_AMD_seamless_cubemap_per_texture */
-#ifdef GL_AMD_shader_stencil_export
-  _glewInfo_GL_AMD_shader_stencil_export();
-#endif /* GL_AMD_shader_stencil_export */
-#ifdef GL_AMD_stencil_operation_extended
-  _glewInfo_GL_AMD_stencil_operation_extended();
-#endif /* GL_AMD_stencil_operation_extended */
-#ifdef GL_AMD_texture_texture4
-  _glewInfo_GL_AMD_texture_texture4();
-#endif /* GL_AMD_texture_texture4 */
-#ifdef GL_AMD_transform_feedback3_lines_triangles
-  _glewInfo_GL_AMD_transform_feedback3_lines_triangles();
-#endif /* GL_AMD_transform_feedback3_lines_triangles */
-#ifdef GL_AMD_vertex_shader_layer
-  _glewInfo_GL_AMD_vertex_shader_layer();
-#endif /* GL_AMD_vertex_shader_layer */
-#ifdef GL_AMD_vertex_shader_tessellator
-  _glewInfo_GL_AMD_vertex_shader_tessellator();
-#endif /* GL_AMD_vertex_shader_tessellator */
-#ifdef GL_AMD_vertex_shader_viewport_index
-  _glewInfo_GL_AMD_vertex_shader_viewport_index();
-#endif /* GL_AMD_vertex_shader_viewport_index */
-#ifdef GL_APPLE_aux_depth_stencil
-  _glewInfo_GL_APPLE_aux_depth_stencil();
-#endif /* GL_APPLE_aux_depth_stencil */
-#ifdef GL_APPLE_client_storage
-  _glewInfo_GL_APPLE_client_storage();
-#endif /* GL_APPLE_client_storage */
-#ifdef GL_APPLE_element_array
-  _glewInfo_GL_APPLE_element_array();
-#endif /* GL_APPLE_element_array */
-#ifdef GL_APPLE_fence
-  _glewInfo_GL_APPLE_fence();
-#endif /* GL_APPLE_fence */
-#ifdef GL_APPLE_float_pixels
-  _glewInfo_GL_APPLE_float_pixels();
-#endif /* GL_APPLE_float_pixels */
-#ifdef GL_APPLE_flush_buffer_range
-  _glewInfo_GL_APPLE_flush_buffer_range();
-#endif /* GL_APPLE_flush_buffer_range */
-#ifdef GL_APPLE_object_purgeable
-  _glewInfo_GL_APPLE_object_purgeable();
-#endif /* GL_APPLE_object_purgeable */
-#ifdef GL_APPLE_pixel_buffer
-  _glewInfo_GL_APPLE_pixel_buffer();
-#endif /* GL_APPLE_pixel_buffer */
-#ifdef GL_APPLE_rgb_422
-  _glewInfo_GL_APPLE_rgb_422();
-#endif /* GL_APPLE_rgb_422 */
-#ifdef GL_APPLE_row_bytes
-  _glewInfo_GL_APPLE_row_bytes();
-#endif /* GL_APPLE_row_bytes */
-#ifdef GL_APPLE_specular_vector
-  _glewInfo_GL_APPLE_specular_vector();
-#endif /* GL_APPLE_specular_vector */
-#ifdef GL_APPLE_texture_range
-  _glewInfo_GL_APPLE_texture_range();
-#endif /* GL_APPLE_texture_range */
-#ifdef GL_APPLE_transform_hint
-  _glewInfo_GL_APPLE_transform_hint();
-#endif /* GL_APPLE_transform_hint */
-#ifdef GL_APPLE_vertex_array_object
-  _glewInfo_GL_APPLE_vertex_array_object();
-#endif /* GL_APPLE_vertex_array_object */
-#ifdef GL_APPLE_vertex_array_range
-  _glewInfo_GL_APPLE_vertex_array_range();
-#endif /* GL_APPLE_vertex_array_range */
-#ifdef GL_APPLE_vertex_program_evaluators
-  _glewInfo_GL_APPLE_vertex_program_evaluators();
-#endif /* GL_APPLE_vertex_program_evaluators */
-#ifdef GL_APPLE_ycbcr_422
-  _glewInfo_GL_APPLE_ycbcr_422();
-#endif /* GL_APPLE_ycbcr_422 */
-#ifdef GL_ARB_ES2_compatibility
-  _glewInfo_GL_ARB_ES2_compatibility();
-#endif /* GL_ARB_ES2_compatibility */
-#ifdef GL_ARB_ES3_compatibility
-  _glewInfo_GL_ARB_ES3_compatibility();
-#endif /* GL_ARB_ES3_compatibility */
-#ifdef GL_ARB_arrays_of_arrays
-  _glewInfo_GL_ARB_arrays_of_arrays();
-#endif /* GL_ARB_arrays_of_arrays */
-#ifdef GL_ARB_base_instance
-  _glewInfo_GL_ARB_base_instance();
-#endif /* GL_ARB_base_instance */
-#ifdef GL_ARB_blend_func_extended
-  _glewInfo_GL_ARB_blend_func_extended();
-#endif /* GL_ARB_blend_func_extended */
-#ifdef GL_ARB_cl_event
-  _glewInfo_GL_ARB_cl_event();
-#endif /* GL_ARB_cl_event */
-#ifdef GL_ARB_clear_buffer_object
-  _glewInfo_GL_ARB_clear_buffer_object();
-#endif /* GL_ARB_clear_buffer_object */
-#ifdef GL_ARB_color_buffer_float
-  _glewInfo_GL_ARB_color_buffer_float();
-#endif /* GL_ARB_color_buffer_float */
-#ifdef GL_ARB_compatibility
-  _glewInfo_GL_ARB_compatibility();
-#endif /* GL_ARB_compatibility */
-#ifdef GL_ARB_compressed_texture_pixel_storage
-  _glewInfo_GL_ARB_compressed_texture_pixel_storage();
-#endif /* GL_ARB_compressed_texture_pixel_storage */
-#ifdef GL_ARB_compute_shader
-  _glewInfo_GL_ARB_compute_shader();
-#endif /* GL_ARB_compute_shader */
-#ifdef GL_ARB_conservative_depth
-  _glewInfo_GL_ARB_conservative_depth();
-#endif /* GL_ARB_conservative_depth */
-#ifdef GL_ARB_copy_buffer
-  _glewInfo_GL_ARB_copy_buffer();
-#endif /* GL_ARB_copy_buffer */
-#ifdef GL_ARB_copy_image
-  _glewInfo_GL_ARB_copy_image();
-#endif /* GL_ARB_copy_image */
-#ifdef GL_ARB_debug_output
-  _glewInfo_GL_ARB_debug_output();
-#endif /* GL_ARB_debug_output */
-#ifdef GL_ARB_depth_buffer_float
-  _glewInfo_GL_ARB_depth_buffer_float();
-#endif /* GL_ARB_depth_buffer_float */
-#ifdef GL_ARB_depth_clamp
-  _glewInfo_GL_ARB_depth_clamp();
-#endif /* GL_ARB_depth_clamp */
-#ifdef GL_ARB_depth_texture
-  _glewInfo_GL_ARB_depth_texture();
-#endif /* GL_ARB_depth_texture */
-#ifdef GL_ARB_draw_buffers
-  _glewInfo_GL_ARB_draw_buffers();
-#endif /* GL_ARB_draw_buffers */
-#ifdef GL_ARB_draw_buffers_blend
-  _glewInfo_GL_ARB_draw_buffers_blend();
-#endif /* GL_ARB_draw_buffers_blend */
-#ifdef GL_ARB_draw_elements_base_vertex
-  _glewInfo_GL_ARB_draw_elements_base_vertex();
-#endif /* GL_ARB_draw_elements_base_vertex */
-#ifdef GL_ARB_draw_indirect
-  _glewInfo_GL_ARB_draw_indirect();
-#endif /* GL_ARB_draw_indirect */
-#ifdef GL_ARB_draw_instanced
-  _glewInfo_GL_ARB_draw_instanced();
-#endif /* GL_ARB_draw_instanced */
-#ifdef GL_ARB_explicit_attrib_location
-  _glewInfo_GL_ARB_explicit_attrib_location();
-#endif /* GL_ARB_explicit_attrib_location */
-#ifdef GL_ARB_explicit_uniform_location
-  _glewInfo_GL_ARB_explicit_uniform_location();
-#endif /* GL_ARB_explicit_uniform_location */
-#ifdef GL_ARB_fragment_coord_conventions
-  _glewInfo_GL_ARB_fragment_coord_conventions();
-#endif /* GL_ARB_fragment_coord_conventions */
-#ifdef GL_ARB_fragment_layer_viewport
-  _glewInfo_GL_ARB_fragment_layer_viewport();
-#endif /* GL_ARB_fragment_layer_viewport */
-#ifdef GL_ARB_fragment_program
-  _glewInfo_GL_ARB_fragment_program();
-#endif /* GL_ARB_fragment_program */
-#ifdef GL_ARB_fragment_program_shadow
-  _glewInfo_GL_ARB_fragment_program_shadow();
-#endif /* GL_ARB_fragment_program_shadow */
-#ifdef GL_ARB_fragment_shader
-  _glewInfo_GL_ARB_fragment_shader();
-#endif /* GL_ARB_fragment_shader */
-#ifdef GL_ARB_framebuffer_no_attachments
-  _glewInfo_GL_ARB_framebuffer_no_attachments();
-#endif /* GL_ARB_framebuffer_no_attachments */
-#ifdef GL_ARB_framebuffer_object
-  _glewInfo_GL_ARB_framebuffer_object();
-#endif /* GL_ARB_framebuffer_object */
-#ifdef GL_ARB_framebuffer_sRGB
-  _glewInfo_GL_ARB_framebuffer_sRGB();
-#endif /* GL_ARB_framebuffer_sRGB */
-#ifdef GL_ARB_geometry_shader4
-  _glewInfo_GL_ARB_geometry_shader4();
-#endif /* GL_ARB_geometry_shader4 */
-#ifdef GL_ARB_get_program_binary
-  _glewInfo_GL_ARB_get_program_binary();
-#endif /* GL_ARB_get_program_binary */
-#ifdef GL_ARB_gpu_shader5
-  _glewInfo_GL_ARB_gpu_shader5();
-#endif /* GL_ARB_gpu_shader5 */
-#ifdef GL_ARB_gpu_shader_fp64
-  _glewInfo_GL_ARB_gpu_shader_fp64();
-#endif /* GL_ARB_gpu_shader_fp64 */
-#ifdef GL_ARB_half_float_pixel
-  _glewInfo_GL_ARB_half_float_pixel();
-#endif /* GL_ARB_half_float_pixel */
-#ifdef GL_ARB_half_float_vertex
-  _glewInfo_GL_ARB_half_float_vertex();
-#endif /* GL_ARB_half_float_vertex */
-#ifdef GL_ARB_imaging
-  _glewInfo_GL_ARB_imaging();
-#endif /* GL_ARB_imaging */
-#ifdef GL_ARB_instanced_arrays
-  _glewInfo_GL_ARB_instanced_arrays();
-#endif /* GL_ARB_instanced_arrays */
-#ifdef GL_ARB_internalformat_query
-  _glewInfo_GL_ARB_internalformat_query();
-#endif /* GL_ARB_internalformat_query */
-#ifdef GL_ARB_internalformat_query2
-  _glewInfo_GL_ARB_internalformat_query2();
-#endif /* GL_ARB_internalformat_query2 */
-#ifdef GL_ARB_invalidate_subdata
-  _glewInfo_GL_ARB_invalidate_subdata();
-#endif /* GL_ARB_invalidate_subdata */
-#ifdef GL_ARB_map_buffer_alignment
-  _glewInfo_GL_ARB_map_buffer_alignment();
-#endif /* GL_ARB_map_buffer_alignment */
-#ifdef GL_ARB_map_buffer_range
-  _glewInfo_GL_ARB_map_buffer_range();
-#endif /* GL_ARB_map_buffer_range */
-#ifdef GL_ARB_matrix_palette
-  _glewInfo_GL_ARB_matrix_palette();
-#endif /* GL_ARB_matrix_palette */
-#ifdef GL_ARB_multi_draw_indirect
-  _glewInfo_GL_ARB_multi_draw_indirect();
-#endif /* GL_ARB_multi_draw_indirect */
-#ifdef GL_ARB_multisample
-  _glewInfo_GL_ARB_multisample();
-#endif /* GL_ARB_multisample */
-#ifdef GL_ARB_multitexture
-  _glewInfo_GL_ARB_multitexture();
-#endif /* GL_ARB_multitexture */
-#ifdef GL_ARB_occlusion_query
-  _glewInfo_GL_ARB_occlusion_query();
-#endif /* GL_ARB_occlusion_query */
-#ifdef GL_ARB_occlusion_query2
-  _glewInfo_GL_ARB_occlusion_query2();
-#endif /* GL_ARB_occlusion_query2 */
-#ifdef GL_ARB_pixel_buffer_object
-  _glewInfo_GL_ARB_pixel_buffer_object();
-#endif /* GL_ARB_pixel_buffer_object */
-#ifdef GL_ARB_point_parameters
-  _glewInfo_GL_ARB_point_parameters();
-#endif /* GL_ARB_point_parameters */
-#ifdef GL_ARB_point_sprite
-  _glewInfo_GL_ARB_point_sprite();
-#endif /* GL_ARB_point_sprite */
-#ifdef GL_ARB_program_interface_query
-  _glewInfo_GL_ARB_program_interface_query();
-#endif /* GL_ARB_program_interface_query */
-#ifdef GL_ARB_provoking_vertex
-  _glewInfo_GL_ARB_provoking_vertex();
-#endif /* GL_ARB_provoking_vertex */
-#ifdef GL_ARB_robust_buffer_access_behavior
-  _glewInfo_GL_ARB_robust_buffer_access_behavior();
-#endif /* GL_ARB_robust_buffer_access_behavior */
-#ifdef GL_ARB_robustness
-  _glewInfo_GL_ARB_robustness();
-#endif /* GL_ARB_robustness */
-#ifdef GL_ARB_robustness_application_isolation
-  _glewInfo_GL_ARB_robustness_application_isolation();
-#endif /* GL_ARB_robustness_application_isolation */
-#ifdef GL_ARB_robustness_share_group_isolation
-  _glewInfo_GL_ARB_robustness_share_group_isolation();
-#endif /* GL_ARB_robustness_share_group_isolation */
-#ifdef GL_ARB_sample_shading
-  _glewInfo_GL_ARB_sample_shading();
-#endif /* GL_ARB_sample_shading */
-#ifdef GL_ARB_sampler_objects
-  _glewInfo_GL_ARB_sampler_objects();
-#endif /* GL_ARB_sampler_objects */
-#ifdef GL_ARB_seamless_cube_map
-  _glewInfo_GL_ARB_seamless_cube_map();
-#endif /* GL_ARB_seamless_cube_map */
-#ifdef GL_ARB_separate_shader_objects
-  _glewInfo_GL_ARB_separate_shader_objects();
-#endif /* GL_ARB_separate_shader_objects */
-#ifdef GL_ARB_shader_atomic_counters
-  _glewInfo_GL_ARB_shader_atomic_counters();
-#endif /* GL_ARB_shader_atomic_counters */
-#ifdef GL_ARB_shader_bit_encoding
-  _glewInfo_GL_ARB_shader_bit_encoding();
-#endif /* GL_ARB_shader_bit_encoding */
-#ifdef GL_ARB_shader_image_load_store
-  _glewInfo_GL_ARB_shader_image_load_store();
-#endif /* GL_ARB_shader_image_load_store */
-#ifdef GL_ARB_shader_image_size
-  _glewInfo_GL_ARB_shader_image_size();
-#endif /* GL_ARB_shader_image_size */
-#ifdef GL_ARB_shader_objects
-  _glewInfo_GL_ARB_shader_objects();
-#endif /* GL_ARB_shader_objects */
-#ifdef GL_ARB_shader_precision
-  _glewInfo_GL_ARB_shader_precision();
-#endif /* GL_ARB_shader_precision */
-#ifdef GL_ARB_shader_stencil_export
-  _glewInfo_GL_ARB_shader_stencil_export();
-#endif /* GL_ARB_shader_stencil_export */
-#ifdef GL_ARB_shader_storage_buffer_object
-  _glewInfo_GL_ARB_shader_storage_buffer_object();
-#endif /* GL_ARB_shader_storage_buffer_object */
-#ifdef GL_ARB_shader_subroutine
-  _glewInfo_GL_ARB_shader_subroutine();
-#endif /* GL_ARB_shader_subroutine */
-#ifdef GL_ARB_shader_texture_lod
-  _glewInfo_GL_ARB_shader_texture_lod();
-#endif /* GL_ARB_shader_texture_lod */
-#ifdef GL_ARB_shading_language_100
-  _glewInfo_GL_ARB_shading_language_100();
-#endif /* GL_ARB_shading_language_100 */
-#ifdef GL_ARB_shading_language_420pack
-  _glewInfo_GL_ARB_shading_language_420pack();
-#endif /* GL_ARB_shading_language_420pack */
-#ifdef GL_ARB_shading_language_include
-  _glewInfo_GL_ARB_shading_language_include();
-#endif /* GL_ARB_shading_language_include */
-#ifdef GL_ARB_shading_language_packing
-  _glewInfo_GL_ARB_shading_language_packing();
-#endif /* GL_ARB_shading_language_packing */
-#ifdef GL_ARB_shadow
-  _glewInfo_GL_ARB_shadow();
-#endif /* GL_ARB_shadow */
-#ifdef GL_ARB_shadow_ambient
-  _glewInfo_GL_ARB_shadow_ambient();
-#endif /* GL_ARB_shadow_ambient */
-#ifdef GL_ARB_stencil_texturing
-  _glewInfo_GL_ARB_stencil_texturing();
-#endif /* GL_ARB_stencil_texturing */
-#ifdef GL_ARB_sync
-  _glewInfo_GL_ARB_sync();
-#endif /* GL_ARB_sync */
-#ifdef GL_ARB_tessellation_shader
-  _glewInfo_GL_ARB_tessellation_shader();
-#endif /* GL_ARB_tessellation_shader */
-#ifdef GL_ARB_texture_border_clamp
-  _glewInfo_GL_ARB_texture_border_clamp();
-#endif /* GL_ARB_texture_border_clamp */
-#ifdef GL_ARB_texture_buffer_object
-  _glewInfo_GL_ARB_texture_buffer_object();
-#endif /* GL_ARB_texture_buffer_object */
-#ifdef GL_ARB_texture_buffer_object_rgb32
-  _glewInfo_GL_ARB_texture_buffer_object_rgb32();
-#endif /* GL_ARB_texture_buffer_object_rgb32 */
-#ifdef GL_ARB_texture_buffer_range
-  _glewInfo_GL_ARB_texture_buffer_range();
-#endif /* GL_ARB_texture_buffer_range */
-#ifdef GL_ARB_texture_compression
-  _glewInfo_GL_ARB_texture_compression();
-#endif /* GL_ARB_texture_compression */
-#ifdef GL_ARB_texture_compression_bptc
-  _glewInfo_GL_ARB_texture_compression_bptc();
-#endif /* GL_ARB_texture_compression_bptc */
-#ifdef GL_ARB_texture_compression_rgtc
-  _glewInfo_GL_ARB_texture_compression_rgtc();
-#endif /* GL_ARB_texture_compression_rgtc */
-#ifdef GL_ARB_texture_cube_map
-  _glewInfo_GL_ARB_texture_cube_map();
-#endif /* GL_ARB_texture_cube_map */
-#ifdef GL_ARB_texture_cube_map_array
-  _glewInfo_GL_ARB_texture_cube_map_array();
-#endif /* GL_ARB_texture_cube_map_array */
-#ifdef GL_ARB_texture_env_add
-  _glewInfo_GL_ARB_texture_env_add();
-#endif /* GL_ARB_texture_env_add */
-#ifdef GL_ARB_texture_env_combine
-  _glewInfo_GL_ARB_texture_env_combine();
-#endif /* GL_ARB_texture_env_combine */
-#ifdef GL_ARB_texture_env_crossbar
-  _glewInfo_GL_ARB_texture_env_crossbar();
-#endif /* GL_ARB_texture_env_crossbar */
-#ifdef GL_ARB_texture_env_dot3
-  _glewInfo_GL_ARB_texture_env_dot3();
-#endif /* GL_ARB_texture_env_dot3 */
-#ifdef GL_ARB_texture_float
-  _glewInfo_GL_ARB_texture_float();
-#endif /* GL_ARB_texture_float */
-#ifdef GL_ARB_texture_gather
-  _glewInfo_GL_ARB_texture_gather();
-#endif /* GL_ARB_texture_gather */
-#ifdef GL_ARB_texture_mirrored_repeat
-  _glewInfo_GL_ARB_texture_mirrored_repeat();
-#endif /* GL_ARB_texture_mirrored_repeat */
-#ifdef GL_ARB_texture_multisample
-  _glewInfo_GL_ARB_texture_multisample();
-#endif /* GL_ARB_texture_multisample */
-#ifdef GL_ARB_texture_non_power_of_two
-  _glewInfo_GL_ARB_texture_non_power_of_two();
-#endif /* GL_ARB_texture_non_power_of_two */
-#ifdef GL_ARB_texture_query_levels
-  _glewInfo_GL_ARB_texture_query_levels();
-#endif /* GL_ARB_texture_query_levels */
-#ifdef GL_ARB_texture_query_lod
-  _glewInfo_GL_ARB_texture_query_lod();
-#endif /* GL_ARB_texture_query_lod */
-#ifdef GL_ARB_texture_rectangle
-  _glewInfo_GL_ARB_texture_rectangle();
-#endif /* GL_ARB_texture_rectangle */
-#ifdef GL_ARB_texture_rg
-  _glewInfo_GL_ARB_texture_rg();
-#endif /* GL_ARB_texture_rg */
-#ifdef GL_ARB_texture_rgb10_a2ui
-  _glewInfo_GL_ARB_texture_rgb10_a2ui();
-#endif /* GL_ARB_texture_rgb10_a2ui */
-#ifdef GL_ARB_texture_storage
-  _glewInfo_GL_ARB_texture_storage();
-#endif /* GL_ARB_texture_storage */
-#ifdef GL_ARB_texture_storage_multisample
-  _glewInfo_GL_ARB_texture_storage_multisample();
-#endif /* GL_ARB_texture_storage_multisample */
-#ifdef GL_ARB_texture_swizzle
-  _glewInfo_GL_ARB_texture_swizzle();
-#endif /* GL_ARB_texture_swizzle */
-#ifdef GL_ARB_texture_view
-  _glewInfo_GL_ARB_texture_view();
-#endif /* GL_ARB_texture_view */
-#ifdef GL_ARB_timer_query
-  _glewInfo_GL_ARB_timer_query();
-#endif /* GL_ARB_timer_query */
-#ifdef GL_ARB_transform_feedback2
-  _glewInfo_GL_ARB_transform_feedback2();
-#endif /* GL_ARB_transform_feedback2 */
-#ifdef GL_ARB_transform_feedback3
-  _glewInfo_GL_ARB_transform_feedback3();
-#endif /* GL_ARB_transform_feedback3 */
-#ifdef GL_ARB_transform_feedback_instanced
-  _glewInfo_GL_ARB_transform_feedback_instanced();
-#endif /* GL_ARB_transform_feedback_instanced */
-#ifdef GL_ARB_transpose_matrix
-  _glewInfo_GL_ARB_transpose_matrix();
-#endif /* GL_ARB_transpose_matrix */
-#ifdef GL_ARB_uniform_buffer_object
-  _glewInfo_GL_ARB_uniform_buffer_object();
-#endif /* GL_ARB_uniform_buffer_object */
-#ifdef GL_ARB_vertex_array_bgra
-  _glewInfo_GL_ARB_vertex_array_bgra();
-#endif /* GL_ARB_vertex_array_bgra */
-#ifdef GL_ARB_vertex_array_object
-  _glewInfo_GL_ARB_vertex_array_object();
-#endif /* GL_ARB_vertex_array_object */
-#ifdef GL_ARB_vertex_attrib_64bit
-  _glewInfo_GL_ARB_vertex_attrib_64bit();
-#endif /* GL_ARB_vertex_attrib_64bit */
-#ifdef GL_ARB_vertex_attrib_binding
-  _glewInfo_GL_ARB_vertex_attrib_binding();
-#endif /* GL_ARB_vertex_attrib_binding */
-#ifdef GL_ARB_vertex_blend
-  _glewInfo_GL_ARB_vertex_blend();
-#endif /* GL_ARB_vertex_blend */
-#ifdef GL_ARB_vertex_buffer_object
-  _glewInfo_GL_ARB_vertex_buffer_object();
-#endif /* GL_ARB_vertex_buffer_object */
-#ifdef GL_ARB_vertex_program
-  _glewInfo_GL_ARB_vertex_program();
-#endif /* GL_ARB_vertex_program */
-#ifdef GL_ARB_vertex_shader
-  _glewInfo_GL_ARB_vertex_shader();
-#endif /* GL_ARB_vertex_shader */
-#ifdef GL_ARB_vertex_type_2_10_10_10_rev
-  _glewInfo_GL_ARB_vertex_type_2_10_10_10_rev();
-#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
-#ifdef GL_ARB_viewport_array
-  _glewInfo_GL_ARB_viewport_array();
-#endif /* GL_ARB_viewport_array */
-#ifdef GL_ARB_window_pos
-  _glewInfo_GL_ARB_window_pos();
-#endif /* GL_ARB_window_pos */
-#ifdef GL_ATIX_point_sprites
-  _glewInfo_GL_ATIX_point_sprites();
-#endif /* GL_ATIX_point_sprites */
-#ifdef GL_ATIX_texture_env_combine3
-  _glewInfo_GL_ATIX_texture_env_combine3();
-#endif /* GL_ATIX_texture_env_combine3 */
-#ifdef GL_ATIX_texture_env_route
-  _glewInfo_GL_ATIX_texture_env_route();
-#endif /* GL_ATIX_texture_env_route */
-#ifdef GL_ATIX_vertex_shader_output_point_size
-  _glewInfo_GL_ATIX_vertex_shader_output_point_size();
-#endif /* GL_ATIX_vertex_shader_output_point_size */
-#ifdef GL_ATI_draw_buffers
-  _glewInfo_GL_ATI_draw_buffers();
-#endif /* GL_ATI_draw_buffers */
-#ifdef GL_ATI_element_array
-  _glewInfo_GL_ATI_element_array();
-#endif /* GL_ATI_element_array */
-#ifdef GL_ATI_envmap_bumpmap
-  _glewInfo_GL_ATI_envmap_bumpmap();
-#endif /* GL_ATI_envmap_bumpmap */
-#ifdef GL_ATI_fragment_shader
-  _glewInfo_GL_ATI_fragment_shader();
-#endif /* GL_ATI_fragment_shader */
-#ifdef GL_ATI_map_object_buffer
-  _glewInfo_GL_ATI_map_object_buffer();
-#endif /* GL_ATI_map_object_buffer */
-#ifdef GL_ATI_meminfo
-  _glewInfo_GL_ATI_meminfo();
-#endif /* GL_ATI_meminfo */
-#ifdef GL_ATI_pn_triangles
-  _glewInfo_GL_ATI_pn_triangles();
-#endif /* GL_ATI_pn_triangles */
-#ifdef GL_ATI_separate_stencil
-  _glewInfo_GL_ATI_separate_stencil();
-#endif /* GL_ATI_separate_stencil */
-#ifdef GL_ATI_shader_texture_lod
-  _glewInfo_GL_ATI_shader_texture_lod();
-#endif /* GL_ATI_shader_texture_lod */
-#ifdef GL_ATI_text_fragment_shader
-  _glewInfo_GL_ATI_text_fragment_shader();
-#endif /* GL_ATI_text_fragment_shader */
-#ifdef GL_ATI_texture_compression_3dc
-  _glewInfo_GL_ATI_texture_compression_3dc();
-#endif /* GL_ATI_texture_compression_3dc */
-#ifdef GL_ATI_texture_env_combine3
-  _glewInfo_GL_ATI_texture_env_combine3();
-#endif /* GL_ATI_texture_env_combine3 */
-#ifdef GL_ATI_texture_float
-  _glewInfo_GL_ATI_texture_float();
-#endif /* GL_ATI_texture_float */
-#ifdef GL_ATI_texture_mirror_once
-  _glewInfo_GL_ATI_texture_mirror_once();
-#endif /* GL_ATI_texture_mirror_once */
-#ifdef GL_ATI_vertex_array_object
-  _glewInfo_GL_ATI_vertex_array_object();
-#endif /* GL_ATI_vertex_array_object */
-#ifdef GL_ATI_vertex_attrib_array_object
-  _glewInfo_GL_ATI_vertex_attrib_array_object();
-#endif /* GL_ATI_vertex_attrib_array_object */
-#ifdef GL_ATI_vertex_streams
-  _glewInfo_GL_ATI_vertex_streams();
-#endif /* GL_ATI_vertex_streams */
-#ifdef GL_EXT_422_pixels
-  _glewInfo_GL_EXT_422_pixels();
-#endif /* GL_EXT_422_pixels */
-#ifdef GL_EXT_Cg_shader
-  _glewInfo_GL_EXT_Cg_shader();
-#endif /* GL_EXT_Cg_shader */
-#ifdef GL_EXT_abgr
-  _glewInfo_GL_EXT_abgr();
-#endif /* GL_EXT_abgr */
-#ifdef GL_EXT_bgra
-  _glewInfo_GL_EXT_bgra();
-#endif /* GL_EXT_bgra */
-#ifdef GL_EXT_bindable_uniform
-  _glewInfo_GL_EXT_bindable_uniform();
-#endif /* GL_EXT_bindable_uniform */
-#ifdef GL_EXT_blend_color
-  _glewInfo_GL_EXT_blend_color();
-#endif /* GL_EXT_blend_color */
-#ifdef GL_EXT_blend_equation_separate
-  _glewInfo_GL_EXT_blend_equation_separate();
-#endif /* GL_EXT_blend_equation_separate */
-#ifdef GL_EXT_blend_func_separate
-  _glewInfo_GL_EXT_blend_func_separate();
-#endif /* GL_EXT_blend_func_separate */
-#ifdef GL_EXT_blend_logic_op
-  _glewInfo_GL_EXT_blend_logic_op();
-#endif /* GL_EXT_blend_logic_op */
-#ifdef GL_EXT_blend_minmax
-  _glewInfo_GL_EXT_blend_minmax();
-#endif /* GL_EXT_blend_minmax */
-#ifdef GL_EXT_blend_subtract
-  _glewInfo_GL_EXT_blend_subtract();
-#endif /* GL_EXT_blend_subtract */
-#ifdef GL_EXT_clip_volume_hint
-  _glewInfo_GL_EXT_clip_volume_hint();
-#endif /* GL_EXT_clip_volume_hint */
-#ifdef GL_EXT_cmyka
-  _glewInfo_GL_EXT_cmyka();
-#endif /* GL_EXT_cmyka */
-#ifdef GL_EXT_color_subtable
-  _glewInfo_GL_EXT_color_subtable();
-#endif /* GL_EXT_color_subtable */
-#ifdef GL_EXT_compiled_vertex_array
-  _glewInfo_GL_EXT_compiled_vertex_array();
-#endif /* GL_EXT_compiled_vertex_array */
-#ifdef GL_EXT_convolution
-  _glewInfo_GL_EXT_convolution();
-#endif /* GL_EXT_convolution */
-#ifdef GL_EXT_coordinate_frame
-  _glewInfo_GL_EXT_coordinate_frame();
-#endif /* GL_EXT_coordinate_frame */
-#ifdef GL_EXT_copy_texture
-  _glewInfo_GL_EXT_copy_texture();
-#endif /* GL_EXT_copy_texture */
-#ifdef GL_EXT_cull_vertex
-  _glewInfo_GL_EXT_cull_vertex();
-#endif /* GL_EXT_cull_vertex */
-#ifdef GL_EXT_debug_marker
-  _glewInfo_GL_EXT_debug_marker();
-#endif /* GL_EXT_debug_marker */
-#ifdef GL_EXT_depth_bounds_test
-  _glewInfo_GL_EXT_depth_bounds_test();
-#endif /* GL_EXT_depth_bounds_test */
-#ifdef GL_EXT_direct_state_access
-  _glewInfo_GL_EXT_direct_state_access();
-#endif /* GL_EXT_direct_state_access */
-#ifdef GL_EXT_draw_buffers2
-  _glewInfo_GL_EXT_draw_buffers2();
-#endif /* GL_EXT_draw_buffers2 */
-#ifdef GL_EXT_draw_instanced
-  _glewInfo_GL_EXT_draw_instanced();
-#endif /* GL_EXT_draw_instanced */
-#ifdef GL_EXT_draw_range_elements
-  _glewInfo_GL_EXT_draw_range_elements();
-#endif /* GL_EXT_draw_range_elements */
-#ifdef GL_EXT_fog_coord
-  _glewInfo_GL_EXT_fog_coord();
-#endif /* GL_EXT_fog_coord */
-#ifdef GL_EXT_fragment_lighting
-  _glewInfo_GL_EXT_fragment_lighting();
-#endif /* GL_EXT_fragment_lighting */
-#ifdef GL_EXT_framebuffer_blit
-  _glewInfo_GL_EXT_framebuffer_blit();
-#endif /* GL_EXT_framebuffer_blit */
-#ifdef GL_EXT_framebuffer_multisample
-  _glewInfo_GL_EXT_framebuffer_multisample();
-#endif /* GL_EXT_framebuffer_multisample */
-#ifdef GL_EXT_framebuffer_multisample_blit_scaled
-  _glewInfo_GL_EXT_framebuffer_multisample_blit_scaled();
-#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
-#ifdef GL_EXT_framebuffer_object
-  _glewInfo_GL_EXT_framebuffer_object();
-#endif /* GL_EXT_framebuffer_object */
-#ifdef GL_EXT_framebuffer_sRGB
-  _glewInfo_GL_EXT_framebuffer_sRGB();
-#endif /* GL_EXT_framebuffer_sRGB */
-#ifdef GL_EXT_geometry_shader4
-  _glewInfo_GL_EXT_geometry_shader4();
-#endif /* GL_EXT_geometry_shader4 */
-#ifdef GL_EXT_gpu_program_parameters
-  _glewInfo_GL_EXT_gpu_program_parameters();
-#endif /* GL_EXT_gpu_program_parameters */
-#ifdef GL_EXT_gpu_shader4
-  _glewInfo_GL_EXT_gpu_shader4();
-#endif /* GL_EXT_gpu_shader4 */
-#ifdef GL_EXT_histogram
-  _glewInfo_GL_EXT_histogram();
-#endif /* GL_EXT_histogram */
-#ifdef GL_EXT_index_array_formats
-  _glewInfo_GL_EXT_index_array_formats();
-#endif /* GL_EXT_index_array_formats */
-#ifdef GL_EXT_index_func
-  _glewInfo_GL_EXT_index_func();
-#endif /* GL_EXT_index_func */
-#ifdef GL_EXT_index_material
-  _glewInfo_GL_EXT_index_material();
-#endif /* GL_EXT_index_material */
-#ifdef GL_EXT_index_texture
-  _glewInfo_GL_EXT_index_texture();
-#endif /* GL_EXT_index_texture */
-#ifdef GL_EXT_light_texture
-  _glewInfo_GL_EXT_light_texture();
-#endif /* GL_EXT_light_texture */
-#ifdef GL_EXT_misc_attribute
-  _glewInfo_GL_EXT_misc_attribute();
-#endif /* GL_EXT_misc_attribute */
-#ifdef GL_EXT_multi_draw_arrays
-  _glewInfo_GL_EXT_multi_draw_arrays();
-#endif /* GL_EXT_multi_draw_arrays */
-#ifdef GL_EXT_multisample
-  _glewInfo_GL_EXT_multisample();
-#endif /* GL_EXT_multisample */
-#ifdef GL_EXT_packed_depth_stencil
-  _glewInfo_GL_EXT_packed_depth_stencil();
-#endif /* GL_EXT_packed_depth_stencil */
-#ifdef GL_EXT_packed_float
-  _glewInfo_GL_EXT_packed_float();
-#endif /* GL_EXT_packed_float */
-#ifdef GL_EXT_packed_pixels
-  _glewInfo_GL_EXT_packed_pixels();
-#endif /* GL_EXT_packed_pixels */
-#ifdef GL_EXT_paletted_texture
-  _glewInfo_GL_EXT_paletted_texture();
-#endif /* GL_EXT_paletted_texture */
-#ifdef GL_EXT_pixel_buffer_object
-  _glewInfo_GL_EXT_pixel_buffer_object();
-#endif /* GL_EXT_pixel_buffer_object */
-#ifdef GL_EXT_pixel_transform
-  _glewInfo_GL_EXT_pixel_transform();
-#endif /* GL_EXT_pixel_transform */
-#ifdef GL_EXT_pixel_transform_color_table
-  _glewInfo_GL_EXT_pixel_transform_color_table();
-#endif /* GL_EXT_pixel_transform_color_table */
-#ifdef GL_EXT_point_parameters
-  _glewInfo_GL_EXT_point_parameters();
-#endif /* GL_EXT_point_parameters */
-#ifdef GL_EXT_polygon_offset
-  _glewInfo_GL_EXT_polygon_offset();
-#endif /* GL_EXT_polygon_offset */
-#ifdef GL_EXT_provoking_vertex
-  _glewInfo_GL_EXT_provoking_vertex();
-#endif /* GL_EXT_provoking_vertex */
-#ifdef GL_EXT_rescale_normal
-  _glewInfo_GL_EXT_rescale_normal();
-#endif /* GL_EXT_rescale_normal */
-#ifdef GL_EXT_scene_marker
-  _glewInfo_GL_EXT_scene_marker();
-#endif /* GL_EXT_scene_marker */
-#ifdef GL_EXT_secondary_color
-  _glewInfo_GL_EXT_secondary_color();
-#endif /* GL_EXT_secondary_color */
-#ifdef GL_EXT_separate_shader_objects
-  _glewInfo_GL_EXT_separate_shader_objects();
-#endif /* GL_EXT_separate_shader_objects */
-#ifdef GL_EXT_separate_specular_color
-  _glewInfo_GL_EXT_separate_specular_color();
-#endif /* GL_EXT_separate_specular_color */
-#ifdef GL_EXT_shader_image_load_store
-  _glewInfo_GL_EXT_shader_image_load_store();
-#endif /* GL_EXT_shader_image_load_store */
-#ifdef GL_EXT_shadow_funcs
-  _glewInfo_GL_EXT_shadow_funcs();
-#endif /* GL_EXT_shadow_funcs */
-#ifdef GL_EXT_shared_texture_palette
-  _glewInfo_GL_EXT_shared_texture_palette();
-#endif /* GL_EXT_shared_texture_palette */
-#ifdef GL_EXT_stencil_clear_tag
-  _glewInfo_GL_EXT_stencil_clear_tag();
-#endif /* GL_EXT_stencil_clear_tag */
-#ifdef GL_EXT_stencil_two_side
-  _glewInfo_GL_EXT_stencil_two_side();
-#endif /* GL_EXT_stencil_two_side */
-#ifdef GL_EXT_stencil_wrap
-  _glewInfo_GL_EXT_stencil_wrap();
-#endif /* GL_EXT_stencil_wrap */
-#ifdef GL_EXT_subtexture
-  _glewInfo_GL_EXT_subtexture();
-#endif /* GL_EXT_subtexture */
-#ifdef GL_EXT_texture
-  _glewInfo_GL_EXT_texture();
-#endif /* GL_EXT_texture */
-#ifdef GL_EXT_texture3D
-  _glewInfo_GL_EXT_texture3D();
-#endif /* GL_EXT_texture3D */
-#ifdef GL_EXT_texture_array
-  _glewInfo_GL_EXT_texture_array();
-#endif /* GL_EXT_texture_array */
-#ifdef GL_EXT_texture_buffer_object
-  _glewInfo_GL_EXT_texture_buffer_object();
-#endif /* GL_EXT_texture_buffer_object */
-#ifdef GL_EXT_texture_compression_dxt1
-  _glewInfo_GL_EXT_texture_compression_dxt1();
-#endif /* GL_EXT_texture_compression_dxt1 */
-#ifdef GL_EXT_texture_compression_latc
-  _glewInfo_GL_EXT_texture_compression_latc();
-#endif /* GL_EXT_texture_compression_latc */
-#ifdef GL_EXT_texture_compression_rgtc
-  _glewInfo_GL_EXT_texture_compression_rgtc();
-#endif /* GL_EXT_texture_compression_rgtc */
-#ifdef GL_EXT_texture_compression_s3tc
-  _glewInfo_GL_EXT_texture_compression_s3tc();
-#endif /* GL_EXT_texture_compression_s3tc */
-#ifdef GL_EXT_texture_cube_map
-  _glewInfo_GL_EXT_texture_cube_map();
-#endif /* GL_EXT_texture_cube_map */
-#ifdef GL_EXT_texture_edge_clamp
-  _glewInfo_GL_EXT_texture_edge_clamp();
-#endif /* GL_EXT_texture_edge_clamp */
-#ifdef GL_EXT_texture_env
-  _glewInfo_GL_EXT_texture_env();
-#endif /* GL_EXT_texture_env */
-#ifdef GL_EXT_texture_env_add
-  _glewInfo_GL_EXT_texture_env_add();
-#endif /* GL_EXT_texture_env_add */
-#ifdef GL_EXT_texture_env_combine
-  _glewInfo_GL_EXT_texture_env_combine();
-#endif /* GL_EXT_texture_env_combine */
-#ifdef GL_EXT_texture_env_dot3
-  _glewInfo_GL_EXT_texture_env_dot3();
-#endif /* GL_EXT_texture_env_dot3 */
-#ifdef GL_EXT_texture_filter_anisotropic
-  _glewInfo_GL_EXT_texture_filter_anisotropic();
-#endif /* GL_EXT_texture_filter_anisotropic */
-#ifdef GL_EXT_texture_integer
-  _glewInfo_GL_EXT_texture_integer();
-#endif /* GL_EXT_texture_integer */
-#ifdef GL_EXT_texture_lod_bias
-  _glewInfo_GL_EXT_texture_lod_bias();
-#endif /* GL_EXT_texture_lod_bias */
-#ifdef GL_EXT_texture_mirror_clamp
-  _glewInfo_GL_EXT_texture_mirror_clamp();
-#endif /* GL_EXT_texture_mirror_clamp */
-#ifdef GL_EXT_texture_object
-  _glewInfo_GL_EXT_texture_object();
-#endif /* GL_EXT_texture_object */
-#ifdef GL_EXT_texture_perturb_normal
-  _glewInfo_GL_EXT_texture_perturb_normal();
-#endif /* GL_EXT_texture_perturb_normal */
-#ifdef GL_EXT_texture_rectangle
-  _glewInfo_GL_EXT_texture_rectangle();
-#endif /* GL_EXT_texture_rectangle */
-#ifdef GL_EXT_texture_sRGB
-  _glewInfo_GL_EXT_texture_sRGB();
-#endif /* GL_EXT_texture_sRGB */
-#ifdef GL_EXT_texture_sRGB_decode
-  _glewInfo_GL_EXT_texture_sRGB_decode();
-#endif /* GL_EXT_texture_sRGB_decode */
-#ifdef GL_EXT_texture_shared_exponent
-  _glewInfo_GL_EXT_texture_shared_exponent();
-#endif /* GL_EXT_texture_shared_exponent */
-#ifdef GL_EXT_texture_snorm
-  _glewInfo_GL_EXT_texture_snorm();
-#endif /* GL_EXT_texture_snorm */
-#ifdef GL_EXT_texture_swizzle
-  _glewInfo_GL_EXT_texture_swizzle();
-#endif /* GL_EXT_texture_swizzle */
-#ifdef GL_EXT_timer_query
-  _glewInfo_GL_EXT_timer_query();
-#endif /* GL_EXT_timer_query */
-#ifdef GL_EXT_transform_feedback
-  _glewInfo_GL_EXT_transform_feedback();
-#endif /* GL_EXT_transform_feedback */
-#ifdef GL_EXT_vertex_array
-  _glewInfo_GL_EXT_vertex_array();
-#endif /* GL_EXT_vertex_array */
-#ifdef GL_EXT_vertex_array_bgra
-  _glewInfo_GL_EXT_vertex_array_bgra();
-#endif /* GL_EXT_vertex_array_bgra */
-#ifdef GL_EXT_vertex_attrib_64bit
-  _glewInfo_GL_EXT_vertex_attrib_64bit();
-#endif /* GL_EXT_vertex_attrib_64bit */
-#ifdef GL_EXT_vertex_shader
-  _glewInfo_GL_EXT_vertex_shader();
-#endif /* GL_EXT_vertex_shader */
-#ifdef GL_EXT_vertex_weighting
-  _glewInfo_GL_EXT_vertex_weighting();
-#endif /* GL_EXT_vertex_weighting */
-#ifdef GL_EXT_x11_sync_object
-  _glewInfo_GL_EXT_x11_sync_object();
-#endif /* GL_EXT_x11_sync_object */
-#ifdef GL_GREMEDY_frame_terminator
-  _glewInfo_GL_GREMEDY_frame_terminator();
-#endif /* GL_GREMEDY_frame_terminator */
-#ifdef GL_GREMEDY_string_marker
-  _glewInfo_GL_GREMEDY_string_marker();
-#endif /* GL_GREMEDY_string_marker */
-#ifdef GL_HP_convolution_border_modes
-  _glewInfo_GL_HP_convolution_border_modes();
-#endif /* GL_HP_convolution_border_modes */
-#ifdef GL_HP_image_transform
-  _glewInfo_GL_HP_image_transform();
-#endif /* GL_HP_image_transform */
-#ifdef GL_HP_occlusion_test
-  _glewInfo_GL_HP_occlusion_test();
-#endif /* GL_HP_occlusion_test */
-#ifdef GL_HP_texture_lighting
-  _glewInfo_GL_HP_texture_lighting();
-#endif /* GL_HP_texture_lighting */
-#ifdef GL_IBM_cull_vertex
-  _glewInfo_GL_IBM_cull_vertex();
-#endif /* GL_IBM_cull_vertex */
-#ifdef GL_IBM_multimode_draw_arrays
-  _glewInfo_GL_IBM_multimode_draw_arrays();
-#endif /* GL_IBM_multimode_draw_arrays */
-#ifdef GL_IBM_rasterpos_clip
-  _glewInfo_GL_IBM_rasterpos_clip();
-#endif /* GL_IBM_rasterpos_clip */
-#ifdef GL_IBM_static_data
-  _glewInfo_GL_IBM_static_data();
-#endif /* GL_IBM_static_data */
-#ifdef GL_IBM_texture_mirrored_repeat
-  _glewInfo_GL_IBM_texture_mirrored_repeat();
-#endif /* GL_IBM_texture_mirrored_repeat */
-#ifdef GL_IBM_vertex_array_lists
-  _glewInfo_GL_IBM_vertex_array_lists();
-#endif /* GL_IBM_vertex_array_lists */
-#ifdef GL_INGR_color_clamp
-  _glewInfo_GL_INGR_color_clamp();
-#endif /* GL_INGR_color_clamp */
-#ifdef GL_INGR_interlace_read
-  _glewInfo_GL_INGR_interlace_read();
-#endif /* GL_INGR_interlace_read */
-#ifdef GL_INTEL_parallel_arrays
-  _glewInfo_GL_INTEL_parallel_arrays();
-#endif /* GL_INTEL_parallel_arrays */
-#ifdef GL_INTEL_texture_scissor
-  _glewInfo_GL_INTEL_texture_scissor();
-#endif /* GL_INTEL_texture_scissor */
-#ifdef GL_KHR_debug
-  _glewInfo_GL_KHR_debug();
-#endif /* GL_KHR_debug */
-#ifdef GL_KHR_texture_compression_astc_ldr
-  _glewInfo_GL_KHR_texture_compression_astc_ldr();
-#endif /* GL_KHR_texture_compression_astc_ldr */
-#ifdef GL_KTX_buffer_region
-  _glewInfo_GL_KTX_buffer_region();
-#endif /* GL_KTX_buffer_region */
-#ifdef GL_MESAX_texture_stack
-  _glewInfo_GL_MESAX_texture_stack();
-#endif /* GL_MESAX_texture_stack */
-#ifdef GL_MESA_pack_invert
-  _glewInfo_GL_MESA_pack_invert();
-#endif /* GL_MESA_pack_invert */
-#ifdef GL_MESA_resize_buffers
-  _glewInfo_GL_MESA_resize_buffers();
-#endif /* GL_MESA_resize_buffers */
-#ifdef GL_MESA_window_pos
-  _glewInfo_GL_MESA_window_pos();
-#endif /* GL_MESA_window_pos */
-#ifdef GL_MESA_ycbcr_texture
-  _glewInfo_GL_MESA_ycbcr_texture();
-#endif /* GL_MESA_ycbcr_texture */
-#ifdef GL_NVX_gpu_memory_info
-  _glewInfo_GL_NVX_gpu_memory_info();
-#endif /* GL_NVX_gpu_memory_info */
-#ifdef GL_NV_bindless_texture
-  _glewInfo_GL_NV_bindless_texture();
-#endif /* GL_NV_bindless_texture */
-#ifdef GL_NV_blend_square
-  _glewInfo_GL_NV_blend_square();
-#endif /* GL_NV_blend_square */
-#ifdef GL_NV_conditional_render
-  _glewInfo_GL_NV_conditional_render();
-#endif /* GL_NV_conditional_render */
-#ifdef GL_NV_copy_depth_to_color
-  _glewInfo_GL_NV_copy_depth_to_color();
-#endif /* GL_NV_copy_depth_to_color */
-#ifdef GL_NV_copy_image
-  _glewInfo_GL_NV_copy_image();
-#endif /* GL_NV_copy_image */
-#ifdef GL_NV_depth_buffer_float
-  _glewInfo_GL_NV_depth_buffer_float();
-#endif /* GL_NV_depth_buffer_float */
-#ifdef GL_NV_depth_clamp
-  _glewInfo_GL_NV_depth_clamp();
-#endif /* GL_NV_depth_clamp */
-#ifdef GL_NV_depth_range_unclamped
-  _glewInfo_GL_NV_depth_range_unclamped();
-#endif /* GL_NV_depth_range_unclamped */
-#ifdef GL_NV_evaluators
-  _glewInfo_GL_NV_evaluators();
-#endif /* GL_NV_evaluators */
-#ifdef GL_NV_explicit_multisample
-  _glewInfo_GL_NV_explicit_multisample();
-#endif /* GL_NV_explicit_multisample */
-#ifdef GL_NV_fence
-  _glewInfo_GL_NV_fence();
-#endif /* GL_NV_fence */
-#ifdef GL_NV_float_buffer
-  _glewInfo_GL_NV_float_buffer();
-#endif /* GL_NV_float_buffer */
-#ifdef GL_NV_fog_distance
-  _glewInfo_GL_NV_fog_distance();
-#endif /* GL_NV_fog_distance */
-#ifdef GL_NV_fragment_program
-  _glewInfo_GL_NV_fragment_program();
-#endif /* GL_NV_fragment_program */
-#ifdef GL_NV_fragment_program2
-  _glewInfo_GL_NV_fragment_program2();
-#endif /* GL_NV_fragment_program2 */
-#ifdef GL_NV_fragment_program4
-  _glewInfo_GL_NV_fragment_program4();
-#endif /* GL_NV_fragment_program4 */
-#ifdef GL_NV_fragment_program_option
-  _glewInfo_GL_NV_fragment_program_option();
-#endif /* GL_NV_fragment_program_option */
-#ifdef GL_NV_framebuffer_multisample_coverage
-  _glewInfo_GL_NV_framebuffer_multisample_coverage();
-#endif /* GL_NV_framebuffer_multisample_coverage */
-#ifdef GL_NV_geometry_program4
-  _glewInfo_GL_NV_geometry_program4();
-#endif /* GL_NV_geometry_program4 */
-#ifdef GL_NV_geometry_shader4
-  _glewInfo_GL_NV_geometry_shader4();
-#endif /* GL_NV_geometry_shader4 */
-#ifdef GL_NV_gpu_program4
-  _glewInfo_GL_NV_gpu_program4();
-#endif /* GL_NV_gpu_program4 */
-#ifdef GL_NV_gpu_program5
-  _glewInfo_GL_NV_gpu_program5();
-#endif /* GL_NV_gpu_program5 */
-#ifdef GL_NV_gpu_program_fp64
-  _glewInfo_GL_NV_gpu_program_fp64();
-#endif /* GL_NV_gpu_program_fp64 */
-#ifdef GL_NV_gpu_shader5
-  _glewInfo_GL_NV_gpu_shader5();
-#endif /* GL_NV_gpu_shader5 */
-#ifdef GL_NV_half_float
-  _glewInfo_GL_NV_half_float();
-#endif /* GL_NV_half_float */
-#ifdef GL_NV_light_max_exponent
-  _glewInfo_GL_NV_light_max_exponent();
-#endif /* GL_NV_light_max_exponent */
-#ifdef GL_NV_multisample_coverage
-  _glewInfo_GL_NV_multisample_coverage();
-#endif /* GL_NV_multisample_coverage */
-#ifdef GL_NV_multisample_filter_hint
-  _glewInfo_GL_NV_multisample_filter_hint();
-#endif /* GL_NV_multisample_filter_hint */
-#ifdef GL_NV_occlusion_query
-  _glewInfo_GL_NV_occlusion_query();
-#endif /* GL_NV_occlusion_query */
-#ifdef GL_NV_packed_depth_stencil
-  _glewInfo_GL_NV_packed_depth_stencil();
-#endif /* GL_NV_packed_depth_stencil */
-#ifdef GL_NV_parameter_buffer_object
-  _glewInfo_GL_NV_parameter_buffer_object();
-#endif /* GL_NV_parameter_buffer_object */
-#ifdef GL_NV_parameter_buffer_object2
-  _glewInfo_GL_NV_parameter_buffer_object2();
-#endif /* GL_NV_parameter_buffer_object2 */
-#ifdef GL_NV_path_rendering
-  _glewInfo_GL_NV_path_rendering();
-#endif /* GL_NV_path_rendering */
-#ifdef GL_NV_pixel_data_range
-  _glewInfo_GL_NV_pixel_data_range();
-#endif /* GL_NV_pixel_data_range */
-#ifdef GL_NV_point_sprite
-  _glewInfo_GL_NV_point_sprite();
-#endif /* GL_NV_point_sprite */
-#ifdef GL_NV_present_video
-  _glewInfo_GL_NV_present_video();
-#endif /* GL_NV_present_video */
-#ifdef GL_NV_primitive_restart
-  _glewInfo_GL_NV_primitive_restart();
-#endif /* GL_NV_primitive_restart */
-#ifdef GL_NV_register_combiners
-  _glewInfo_GL_NV_register_combiners();
-#endif /* GL_NV_register_combiners */
-#ifdef GL_NV_register_combiners2
-  _glewInfo_GL_NV_register_combiners2();
-#endif /* GL_NV_register_combiners2 */
-#ifdef GL_NV_shader_atomic_float
-  _glewInfo_GL_NV_shader_atomic_float();
-#endif /* GL_NV_shader_atomic_float */
-#ifdef GL_NV_shader_buffer_load
-  _glewInfo_GL_NV_shader_buffer_load();
-#endif /* GL_NV_shader_buffer_load */
-#ifdef GL_NV_tessellation_program5
-  _glewInfo_GL_NV_tessellation_program5();
-#endif /* GL_NV_tessellation_program5 */
-#ifdef GL_NV_texgen_emboss
-  _glewInfo_GL_NV_texgen_emboss();
-#endif /* GL_NV_texgen_emboss */
-#ifdef GL_NV_texgen_reflection
-  _glewInfo_GL_NV_texgen_reflection();
-#endif /* GL_NV_texgen_reflection */
-#ifdef GL_NV_texture_barrier
-  _glewInfo_GL_NV_texture_barrier();
-#endif /* GL_NV_texture_barrier */
-#ifdef GL_NV_texture_compression_vtc
-  _glewInfo_GL_NV_texture_compression_vtc();
-#endif /* GL_NV_texture_compression_vtc */
-#ifdef GL_NV_texture_env_combine4
-  _glewInfo_GL_NV_texture_env_combine4();
-#endif /* GL_NV_texture_env_combine4 */
-#ifdef GL_NV_texture_expand_normal
-  _glewInfo_GL_NV_texture_expand_normal();
-#endif /* GL_NV_texture_expand_normal */
-#ifdef GL_NV_texture_multisample
-  _glewInfo_GL_NV_texture_multisample();
-#endif /* GL_NV_texture_multisample */
-#ifdef GL_NV_texture_rectangle
-  _glewInfo_GL_NV_texture_rectangle();
-#endif /* GL_NV_texture_rectangle */
-#ifdef GL_NV_texture_shader
-  _glewInfo_GL_NV_texture_shader();
-#endif /* GL_NV_texture_shader */
-#ifdef GL_NV_texture_shader2
-  _glewInfo_GL_NV_texture_shader2();
-#endif /* GL_NV_texture_shader2 */
-#ifdef GL_NV_texture_shader3
-  _glewInfo_GL_NV_texture_shader3();
-#endif /* GL_NV_texture_shader3 */
-#ifdef GL_NV_transform_feedback
-  _glewInfo_GL_NV_transform_feedback();
-#endif /* GL_NV_transform_feedback */
-#ifdef GL_NV_transform_feedback2
-  _glewInfo_GL_NV_transform_feedback2();
-#endif /* GL_NV_transform_feedback2 */
-#ifdef GL_NV_vdpau_interop
-  _glewInfo_GL_NV_vdpau_interop();
-#endif /* GL_NV_vdpau_interop */
-#ifdef GL_NV_vertex_array_range
-  _glewInfo_GL_NV_vertex_array_range();
-#endif /* GL_NV_vertex_array_range */
-#ifdef GL_NV_vertex_array_range2
-  _glewInfo_GL_NV_vertex_array_range2();
-#endif /* GL_NV_vertex_array_range2 */
-#ifdef GL_NV_vertex_attrib_integer_64bit
-  _glewInfo_GL_NV_vertex_attrib_integer_64bit();
-#endif /* GL_NV_vertex_attrib_integer_64bit */
-#ifdef GL_NV_vertex_buffer_unified_memory
-  _glewInfo_GL_NV_vertex_buffer_unified_memory();
-#endif /* GL_NV_vertex_buffer_unified_memory */
-#ifdef GL_NV_vertex_program
-  _glewInfo_GL_NV_vertex_program();
-#endif /* GL_NV_vertex_program */
-#ifdef GL_NV_vertex_program1_1
-  _glewInfo_GL_NV_vertex_program1_1();
-#endif /* GL_NV_vertex_program1_1 */
-#ifdef GL_NV_vertex_program2
-  _glewInfo_GL_NV_vertex_program2();
-#endif /* GL_NV_vertex_program2 */
-#ifdef GL_NV_vertex_program2_option
-  _glewInfo_GL_NV_vertex_program2_option();
-#endif /* GL_NV_vertex_program2_option */
-#ifdef GL_NV_vertex_program3
-  _glewInfo_GL_NV_vertex_program3();
-#endif /* GL_NV_vertex_program3 */
-#ifdef GL_NV_vertex_program4
-  _glewInfo_GL_NV_vertex_program4();
-#endif /* GL_NV_vertex_program4 */
-#ifdef GL_NV_video_capture
-  _glewInfo_GL_NV_video_capture();
-#endif /* GL_NV_video_capture */
-#ifdef GL_OES_byte_coordinates
-  _glewInfo_GL_OES_byte_coordinates();
-#endif /* GL_OES_byte_coordinates */
-#ifdef GL_OES_compressed_paletted_texture
-  _glewInfo_GL_OES_compressed_paletted_texture();
-#endif /* GL_OES_compressed_paletted_texture */
-#ifdef GL_OES_read_format
-  _glewInfo_GL_OES_read_format();
-#endif /* GL_OES_read_format */
-#ifdef GL_OES_single_precision
-  _glewInfo_GL_OES_single_precision();
-#endif /* GL_OES_single_precision */
-#ifdef GL_OML_interlace
-  _glewInfo_GL_OML_interlace();
-#endif /* GL_OML_interlace */
-#ifdef GL_OML_resample
-  _glewInfo_GL_OML_resample();
-#endif /* GL_OML_resample */
-#ifdef GL_OML_subsample
-  _glewInfo_GL_OML_subsample();
-#endif /* GL_OML_subsample */
-#ifdef GL_PGI_misc_hints
-  _glewInfo_GL_PGI_misc_hints();
-#endif /* GL_PGI_misc_hints */
-#ifdef GL_PGI_vertex_hints
-  _glewInfo_GL_PGI_vertex_hints();
-#endif /* GL_PGI_vertex_hints */
-#ifdef GL_REGAL_error_string
-  _glewInfo_GL_REGAL_error_string();
-#endif /* GL_REGAL_error_string */
-#ifdef GL_REGAL_extension_query
-  _glewInfo_GL_REGAL_extension_query();
-#endif /* GL_REGAL_extension_query */
-#ifdef GL_REGAL_log
-  _glewInfo_GL_REGAL_log();
-#endif /* GL_REGAL_log */
-#ifdef GL_REND_screen_coordinates
-  _glewInfo_GL_REND_screen_coordinates();
-#endif /* GL_REND_screen_coordinates */
-#ifdef GL_S3_s3tc
-  _glewInfo_GL_S3_s3tc();
-#endif /* GL_S3_s3tc */
-#ifdef GL_SGIS_color_range
-  _glewInfo_GL_SGIS_color_range();
-#endif /* GL_SGIS_color_range */
-#ifdef GL_SGIS_detail_texture
-  _glewInfo_GL_SGIS_detail_texture();
-#endif /* GL_SGIS_detail_texture */
-#ifdef GL_SGIS_fog_function
-  _glewInfo_GL_SGIS_fog_function();
-#endif /* GL_SGIS_fog_function */
-#ifdef GL_SGIS_generate_mipmap
-  _glewInfo_GL_SGIS_generate_mipmap();
-#endif /* GL_SGIS_generate_mipmap */
-#ifdef GL_SGIS_multisample
-  _glewInfo_GL_SGIS_multisample();
-#endif /* GL_SGIS_multisample */
-#ifdef GL_SGIS_pixel_texture
-  _glewInfo_GL_SGIS_pixel_texture();
-#endif /* GL_SGIS_pixel_texture */
-#ifdef GL_SGIS_point_line_texgen
-  _glewInfo_GL_SGIS_point_line_texgen();
-#endif /* GL_SGIS_point_line_texgen */
-#ifdef GL_SGIS_sharpen_texture
-  _glewInfo_GL_SGIS_sharpen_texture();
-#endif /* GL_SGIS_sharpen_texture */
-#ifdef GL_SGIS_texture4D
-  _glewInfo_GL_SGIS_texture4D();
-#endif /* GL_SGIS_texture4D */
-#ifdef GL_SGIS_texture_border_clamp
-  _glewInfo_GL_SGIS_texture_border_clamp();
-#endif /* GL_SGIS_texture_border_clamp */
-#ifdef GL_SGIS_texture_edge_clamp
-  _glewInfo_GL_SGIS_texture_edge_clamp();
-#endif /* GL_SGIS_texture_edge_clamp */
-#ifdef GL_SGIS_texture_filter4
-  _glewInfo_GL_SGIS_texture_filter4();
-#endif /* GL_SGIS_texture_filter4 */
-#ifdef GL_SGIS_texture_lod
-  _glewInfo_GL_SGIS_texture_lod();
-#endif /* GL_SGIS_texture_lod */
-#ifdef GL_SGIS_texture_select
-  _glewInfo_GL_SGIS_texture_select();
-#endif /* GL_SGIS_texture_select */
-#ifdef GL_SGIX_async
-  _glewInfo_GL_SGIX_async();
-#endif /* GL_SGIX_async */
-#ifdef GL_SGIX_async_histogram
-  _glewInfo_GL_SGIX_async_histogram();
-#endif /* GL_SGIX_async_histogram */
-#ifdef GL_SGIX_async_pixel
-  _glewInfo_GL_SGIX_async_pixel();
-#endif /* GL_SGIX_async_pixel */
-#ifdef GL_SGIX_blend_alpha_minmax
-  _glewInfo_GL_SGIX_blend_alpha_minmax();
-#endif /* GL_SGIX_blend_alpha_minmax */
-#ifdef GL_SGIX_clipmap
-  _glewInfo_GL_SGIX_clipmap();
-#endif /* GL_SGIX_clipmap */
-#ifdef GL_SGIX_convolution_accuracy
-  _glewInfo_GL_SGIX_convolution_accuracy();
-#endif /* GL_SGIX_convolution_accuracy */
-#ifdef GL_SGIX_depth_texture
-  _glewInfo_GL_SGIX_depth_texture();
-#endif /* GL_SGIX_depth_texture */
-#ifdef GL_SGIX_flush_raster
-  _glewInfo_GL_SGIX_flush_raster();
-#endif /* GL_SGIX_flush_raster */
-#ifdef GL_SGIX_fog_offset
-  _glewInfo_GL_SGIX_fog_offset();
-#endif /* GL_SGIX_fog_offset */
-#ifdef GL_SGIX_fog_texture
-  _glewInfo_GL_SGIX_fog_texture();
-#endif /* GL_SGIX_fog_texture */
-#ifdef GL_SGIX_fragment_specular_lighting
-  _glewInfo_GL_SGIX_fragment_specular_lighting();
-#endif /* GL_SGIX_fragment_specular_lighting */
-#ifdef GL_SGIX_framezoom
-  _glewInfo_GL_SGIX_framezoom();
-#endif /* GL_SGIX_framezoom */
-#ifdef GL_SGIX_interlace
-  _glewInfo_GL_SGIX_interlace();
-#endif /* GL_SGIX_interlace */
-#ifdef GL_SGIX_ir_instrument1
-  _glewInfo_GL_SGIX_ir_instrument1();
-#endif /* GL_SGIX_ir_instrument1 */
-#ifdef GL_SGIX_list_priority
-  _glewInfo_GL_SGIX_list_priority();
-#endif /* GL_SGIX_list_priority */
-#ifdef GL_SGIX_pixel_texture
-  _glewInfo_GL_SGIX_pixel_texture();
-#endif /* GL_SGIX_pixel_texture */
-#ifdef GL_SGIX_pixel_texture_bits
-  _glewInfo_GL_SGIX_pixel_texture_bits();
-#endif /* GL_SGIX_pixel_texture_bits */
-#ifdef GL_SGIX_reference_plane
-  _glewInfo_GL_SGIX_reference_plane();
-#endif /* GL_SGIX_reference_plane */
-#ifdef GL_SGIX_resample
-  _glewInfo_GL_SGIX_resample();
-#endif /* GL_SGIX_resample */
-#ifdef GL_SGIX_shadow
-  _glewInfo_GL_SGIX_shadow();
-#endif /* GL_SGIX_shadow */
-#ifdef GL_SGIX_shadow_ambient
-  _glewInfo_GL_SGIX_shadow_ambient();
-#endif /* GL_SGIX_shadow_ambient */
-#ifdef GL_SGIX_sprite
-  _glewInfo_GL_SGIX_sprite();
-#endif /* GL_SGIX_sprite */
-#ifdef GL_SGIX_tag_sample_buffer
-  _glewInfo_GL_SGIX_tag_sample_buffer();
-#endif /* GL_SGIX_tag_sample_buffer */
-#ifdef GL_SGIX_texture_add_env
-  _glewInfo_GL_SGIX_texture_add_env();
-#endif /* GL_SGIX_texture_add_env */
-#ifdef GL_SGIX_texture_coordinate_clamp
-  _glewInfo_GL_SGIX_texture_coordinate_clamp();
-#endif /* GL_SGIX_texture_coordinate_clamp */
-#ifdef GL_SGIX_texture_lod_bias
-  _glewInfo_GL_SGIX_texture_lod_bias();
-#endif /* GL_SGIX_texture_lod_bias */
-#ifdef GL_SGIX_texture_multi_buffer
-  _glewInfo_GL_SGIX_texture_multi_buffer();
-#endif /* GL_SGIX_texture_multi_buffer */
-#ifdef GL_SGIX_texture_range
-  _glewInfo_GL_SGIX_texture_range();
-#endif /* GL_SGIX_texture_range */
-#ifdef GL_SGIX_texture_scale_bias
-  _glewInfo_GL_SGIX_texture_scale_bias();
-#endif /* GL_SGIX_texture_scale_bias */
-#ifdef GL_SGIX_vertex_preclip
-  _glewInfo_GL_SGIX_vertex_preclip();
-#endif /* GL_SGIX_vertex_preclip */
-#ifdef GL_SGIX_vertex_preclip_hint
-  _glewInfo_GL_SGIX_vertex_preclip_hint();
-#endif /* GL_SGIX_vertex_preclip_hint */
-#ifdef GL_SGIX_ycrcb
-  _glewInfo_GL_SGIX_ycrcb();
-#endif /* GL_SGIX_ycrcb */
-#ifdef GL_SGI_color_matrix
-  _glewInfo_GL_SGI_color_matrix();
-#endif /* GL_SGI_color_matrix */
-#ifdef GL_SGI_color_table
-  _glewInfo_GL_SGI_color_table();
-#endif /* GL_SGI_color_table */
-#ifdef GL_SGI_texture_color_table
-  _glewInfo_GL_SGI_texture_color_table();
-#endif /* GL_SGI_texture_color_table */
-#ifdef GL_SUNX_constant_data
-  _glewInfo_GL_SUNX_constant_data();
-#endif /* GL_SUNX_constant_data */
-#ifdef GL_SUN_convolution_border_modes
-  _glewInfo_GL_SUN_convolution_border_modes();
-#endif /* GL_SUN_convolution_border_modes */
-#ifdef GL_SUN_global_alpha
-  _glewInfo_GL_SUN_global_alpha();
-#endif /* GL_SUN_global_alpha */
-#ifdef GL_SUN_mesh_array
-  _glewInfo_GL_SUN_mesh_array();
-#endif /* GL_SUN_mesh_array */
-#ifdef GL_SUN_read_video_pixels
-  _glewInfo_GL_SUN_read_video_pixels();
-#endif /* GL_SUN_read_video_pixels */
-#ifdef GL_SUN_slice_accum
-  _glewInfo_GL_SUN_slice_accum();
-#endif /* GL_SUN_slice_accum */
-#ifdef GL_SUN_triangle_list
-  _glewInfo_GL_SUN_triangle_list();
-#endif /* GL_SUN_triangle_list */
-#ifdef GL_SUN_vertex
-  _glewInfo_GL_SUN_vertex();
-#endif /* GL_SUN_vertex */
-#ifdef GL_WIN_phong_shading
-  _glewInfo_GL_WIN_phong_shading();
-#endif /* GL_WIN_phong_shading */
-#ifdef GL_WIN_specular_fog
-  _glewInfo_GL_WIN_specular_fog();
-#endif /* GL_WIN_specular_fog */
-#ifdef GL_WIN_swap_hint
-  _glewInfo_GL_WIN_swap_hint();
-#endif /* GL_WIN_swap_hint */
-}
-
-/* ------------------------------------------------------------------------ */
-
-#ifdef _WIN32
-
-static void wglewInfo ()
-{
-#ifdef WGL_3DFX_multisample
-  _glewInfo_WGL_3DFX_multisample();
-#endif /* WGL_3DFX_multisample */
-#ifdef WGL_3DL_stereo_control
-  _glewInfo_WGL_3DL_stereo_control();
-#endif /* WGL_3DL_stereo_control */
-#ifdef WGL_AMD_gpu_association
-  _glewInfo_WGL_AMD_gpu_association();
-#endif /* WGL_AMD_gpu_association */
-#ifdef WGL_ARB_buffer_region
-  _glewInfo_WGL_ARB_buffer_region();
-#endif /* WGL_ARB_buffer_region */
-#ifdef WGL_ARB_create_context
-  _glewInfo_WGL_ARB_create_context();
-#endif /* WGL_ARB_create_context */
-#ifdef WGL_ARB_create_context_profile
-  _glewInfo_WGL_ARB_create_context_profile();
-#endif /* WGL_ARB_create_context_profile */
-#ifdef WGL_ARB_create_context_robustness
-  _glewInfo_WGL_ARB_create_context_robustness();
-#endif /* WGL_ARB_create_context_robustness */
-#ifdef WGL_ARB_extensions_string
-  _glewInfo_WGL_ARB_extensions_string();
-#endif /* WGL_ARB_extensions_string */
-#ifdef WGL_ARB_framebuffer_sRGB
-  _glewInfo_WGL_ARB_framebuffer_sRGB();
-#endif /* WGL_ARB_framebuffer_sRGB */
-#ifdef WGL_ARB_make_current_read
-  _glewInfo_WGL_ARB_make_current_read();
-#endif /* WGL_ARB_make_current_read */
-#ifdef WGL_ARB_multisample
-  _glewInfo_WGL_ARB_multisample();
-#endif /* WGL_ARB_multisample */
-#ifdef WGL_ARB_pbuffer
-  _glewInfo_WGL_ARB_pbuffer();
-#endif /* WGL_ARB_pbuffer */
-#ifdef WGL_ARB_pixel_format
-  _glewInfo_WGL_ARB_pixel_format();
-#endif /* WGL_ARB_pixel_format */
-#ifdef WGL_ARB_pixel_format_float
-  _glewInfo_WGL_ARB_pixel_format_float();
-#endif /* WGL_ARB_pixel_format_float */
-#ifdef WGL_ARB_render_texture
-  _glewInfo_WGL_ARB_render_texture();
-#endif /* WGL_ARB_render_texture */
-#ifdef WGL_ATI_pixel_format_float
-  _glewInfo_WGL_ATI_pixel_format_float();
-#endif /* WGL_ATI_pixel_format_float */
-#ifdef WGL_ATI_render_texture_rectangle
-  _glewInfo_WGL_ATI_render_texture_rectangle();
-#endif /* WGL_ATI_render_texture_rectangle */
-#ifdef WGL_EXT_create_context_es2_profile
-  _glewInfo_WGL_EXT_create_context_es2_profile();
-#endif /* WGL_EXT_create_context_es2_profile */
-#ifdef WGL_EXT_create_context_es_profile
-  _glewInfo_WGL_EXT_create_context_es_profile();
-#endif /* WGL_EXT_create_context_es_profile */
-#ifdef WGL_EXT_depth_float
-  _glewInfo_WGL_EXT_depth_float();
-#endif /* WGL_EXT_depth_float */
-#ifdef WGL_EXT_display_color_table
-  _glewInfo_WGL_EXT_display_color_table();
-#endif /* WGL_EXT_display_color_table */
-#ifdef WGL_EXT_extensions_string
-  _glewInfo_WGL_EXT_extensions_string();
-#endif /* WGL_EXT_extensions_string */
-#ifdef WGL_EXT_framebuffer_sRGB
-  _glewInfo_WGL_EXT_framebuffer_sRGB();
-#endif /* WGL_EXT_framebuffer_sRGB */
-#ifdef WGL_EXT_make_current_read
-  _glewInfo_WGL_EXT_make_current_read();
-#endif /* WGL_EXT_make_current_read */
-#ifdef WGL_EXT_multisample
-  _glewInfo_WGL_EXT_multisample();
-#endif /* WGL_EXT_multisample */
-#ifdef WGL_EXT_pbuffer
-  _glewInfo_WGL_EXT_pbuffer();
-#endif /* WGL_EXT_pbuffer */
-#ifdef WGL_EXT_pixel_format
-  _glewInfo_WGL_EXT_pixel_format();
-#endif /* WGL_EXT_pixel_format */
-#ifdef WGL_EXT_pixel_format_packed_float
-  _glewInfo_WGL_EXT_pixel_format_packed_float();
-#endif /* WGL_EXT_pixel_format_packed_float */
-#ifdef WGL_EXT_swap_control
-  _glewInfo_WGL_EXT_swap_control();
-#endif /* WGL_EXT_swap_control */
-#ifdef WGL_EXT_swap_control_tear
-  _glewInfo_WGL_EXT_swap_control_tear();
-#endif /* WGL_EXT_swap_control_tear */
-#ifdef WGL_I3D_digital_video_control
-  _glewInfo_WGL_I3D_digital_video_control();
-#endif /* WGL_I3D_digital_video_control */
-#ifdef WGL_I3D_gamma
-  _glewInfo_WGL_I3D_gamma();
-#endif /* WGL_I3D_gamma */
-#ifdef WGL_I3D_genlock
-  _glewInfo_WGL_I3D_genlock();
-#endif /* WGL_I3D_genlock */
-#ifdef WGL_I3D_image_buffer
-  _glewInfo_WGL_I3D_image_buffer();
-#endif /* WGL_I3D_image_buffer */
-#ifdef WGL_I3D_swap_frame_lock
-  _glewInfo_WGL_I3D_swap_frame_lock();
-#endif /* WGL_I3D_swap_frame_lock */
-#ifdef WGL_I3D_swap_frame_usage
-  _glewInfo_WGL_I3D_swap_frame_usage();
-#endif /* WGL_I3D_swap_frame_usage */
-#ifdef WGL_NV_DX_interop
-  _glewInfo_WGL_NV_DX_interop();
-#endif /* WGL_NV_DX_interop */
-#ifdef WGL_NV_DX_interop2
-  _glewInfo_WGL_NV_DX_interop2();
-#endif /* WGL_NV_DX_interop2 */
-#ifdef WGL_NV_copy_image
-  _glewInfo_WGL_NV_copy_image();
-#endif /* WGL_NV_copy_image */
-#ifdef WGL_NV_float_buffer
-  _glewInfo_WGL_NV_float_buffer();
-#endif /* WGL_NV_float_buffer */
-#ifdef WGL_NV_gpu_affinity
-  _glewInfo_WGL_NV_gpu_affinity();
-#endif /* WGL_NV_gpu_affinity */
-#ifdef WGL_NV_multisample_coverage
-  _glewInfo_WGL_NV_multisample_coverage();
-#endif /* WGL_NV_multisample_coverage */
-#ifdef WGL_NV_present_video
-  _glewInfo_WGL_NV_present_video();
-#endif /* WGL_NV_present_video */
-#ifdef WGL_NV_render_depth_texture
-  _glewInfo_WGL_NV_render_depth_texture();
-#endif /* WGL_NV_render_depth_texture */
-#ifdef WGL_NV_render_texture_rectangle
-  _glewInfo_WGL_NV_render_texture_rectangle();
-#endif /* WGL_NV_render_texture_rectangle */
-#ifdef WGL_NV_swap_group
-  _glewInfo_WGL_NV_swap_group();
-#endif /* WGL_NV_swap_group */
-#ifdef WGL_NV_vertex_array_range
-  _glewInfo_WGL_NV_vertex_array_range();
-#endif /* WGL_NV_vertex_array_range */
-#ifdef WGL_NV_video_capture
-  _glewInfo_WGL_NV_video_capture();
-#endif /* WGL_NV_video_capture */
-#ifdef WGL_NV_video_output
-  _glewInfo_WGL_NV_video_output();
-#endif /* WGL_NV_video_output */
-#ifdef WGL_OML_sync_control
-  _glewInfo_WGL_OML_sync_control();
-#endif /* WGL_OML_sync_control */
-}
-
-#else /* _UNIX */
-
-static void glxewInfo ()
-{
-#ifdef GLX_VERSION_1_2
-  _glewInfo_GLX_VERSION_1_2();
-#endif /* GLX_VERSION_1_2 */
-#ifdef GLX_VERSION_1_3
-  _glewInfo_GLX_VERSION_1_3();
-#endif /* GLX_VERSION_1_3 */
-#ifdef GLX_VERSION_1_4
-  _glewInfo_GLX_VERSION_1_4();
-#endif /* GLX_VERSION_1_4 */
-#ifdef GLX_3DFX_multisample
-  _glewInfo_GLX_3DFX_multisample();
-#endif /* GLX_3DFX_multisample */
-#ifdef GLX_AMD_gpu_association
-  _glewInfo_GLX_AMD_gpu_association();
-#endif /* GLX_AMD_gpu_association */
-#ifdef GLX_ARB_create_context
-  _glewInfo_GLX_ARB_create_context();
-#endif /* GLX_ARB_create_context */
-#ifdef GLX_ARB_create_context_profile
-  _glewInfo_GLX_ARB_create_context_profile();
-#endif /* GLX_ARB_create_context_profile */
-#ifdef GLX_ARB_create_context_robustness
-  _glewInfo_GLX_ARB_create_context_robustness();
-#endif /* GLX_ARB_create_context_robustness */
-#ifdef GLX_ARB_fbconfig_float
-  _glewInfo_GLX_ARB_fbconfig_float();
-#endif /* GLX_ARB_fbconfig_float */
-#ifdef GLX_ARB_framebuffer_sRGB
-  _glewInfo_GLX_ARB_framebuffer_sRGB();
-#endif /* GLX_ARB_framebuffer_sRGB */
-#ifdef GLX_ARB_get_proc_address
-  _glewInfo_GLX_ARB_get_proc_address();
-#endif /* GLX_ARB_get_proc_address */
-#ifdef GLX_ARB_multisample
-  _glewInfo_GLX_ARB_multisample();
-#endif /* GLX_ARB_multisample */
-#ifdef GLX_ARB_robustness_application_isolation
-  _glewInfo_GLX_ARB_robustness_application_isolation();
-#endif /* GLX_ARB_robustness_application_isolation */
-#ifdef GLX_ARB_robustness_share_group_isolation
-  _glewInfo_GLX_ARB_robustness_share_group_isolation();
-#endif /* GLX_ARB_robustness_share_group_isolation */
-#ifdef GLX_ARB_vertex_buffer_object
-  _glewInfo_GLX_ARB_vertex_buffer_object();
-#endif /* GLX_ARB_vertex_buffer_object */
-#ifdef GLX_ATI_pixel_format_float
-  _glewInfo_GLX_ATI_pixel_format_float();
-#endif /* GLX_ATI_pixel_format_float */
-#ifdef GLX_ATI_render_texture
-  _glewInfo_GLX_ATI_render_texture();
-#endif /* GLX_ATI_render_texture */
-#ifdef GLX_EXT_create_context_es2_profile
-  _glewInfo_GLX_EXT_create_context_es2_profile();
-#endif /* GLX_EXT_create_context_es2_profile */
-#ifdef GLX_EXT_create_context_es_profile
-  _glewInfo_GLX_EXT_create_context_es_profile();
-#endif /* GLX_EXT_create_context_es_profile */
-#ifdef GLX_EXT_fbconfig_packed_float
-  _glewInfo_GLX_EXT_fbconfig_packed_float();
-#endif /* GLX_EXT_fbconfig_packed_float */
-#ifdef GLX_EXT_framebuffer_sRGB
-  _glewInfo_GLX_EXT_framebuffer_sRGB();
-#endif /* GLX_EXT_framebuffer_sRGB */
-#ifdef GLX_EXT_import_context
-  _glewInfo_GLX_EXT_import_context();
-#endif /* GLX_EXT_import_context */
-#ifdef GLX_EXT_scene_marker
-  _glewInfo_GLX_EXT_scene_marker();
-#endif /* GLX_EXT_scene_marker */
-#ifdef GLX_EXT_swap_control
-  _glewInfo_GLX_EXT_swap_control();
-#endif /* GLX_EXT_swap_control */
-#ifdef GLX_EXT_swap_control_tear
-  _glewInfo_GLX_EXT_swap_control_tear();
-#endif /* GLX_EXT_swap_control_tear */
-#ifdef GLX_EXT_texture_from_pixmap
-  _glewInfo_GLX_EXT_texture_from_pixmap();
-#endif /* GLX_EXT_texture_from_pixmap */
-#ifdef GLX_EXT_visual_info
-  _glewInfo_GLX_EXT_visual_info();
-#endif /* GLX_EXT_visual_info */
-#ifdef GLX_EXT_visual_rating
-  _glewInfo_GLX_EXT_visual_rating();
-#endif /* GLX_EXT_visual_rating */
-#ifdef GLX_INTEL_swap_event
-  _glewInfo_GLX_INTEL_swap_event();
-#endif /* GLX_INTEL_swap_event */
-#ifdef GLX_MESA_agp_offset
-  _glewInfo_GLX_MESA_agp_offset();
-#endif /* GLX_MESA_agp_offset */
-#ifdef GLX_MESA_copy_sub_buffer
-  _glewInfo_GLX_MESA_copy_sub_buffer();
-#endif /* GLX_MESA_copy_sub_buffer */
-#ifdef GLX_MESA_pixmap_colormap
-  _glewInfo_GLX_MESA_pixmap_colormap();
-#endif /* GLX_MESA_pixmap_colormap */
-#ifdef GLX_MESA_release_buffers
-  _glewInfo_GLX_MESA_release_buffers();
-#endif /* GLX_MESA_release_buffers */
-#ifdef GLX_MESA_set_3dfx_mode
-  _glewInfo_GLX_MESA_set_3dfx_mode();
-#endif /* GLX_MESA_set_3dfx_mode */
-#ifdef GLX_MESA_swap_control
-  _glewInfo_GLX_MESA_swap_control();
-#endif /* GLX_MESA_swap_control */
-#ifdef GLX_NV_copy_image
-  _glewInfo_GLX_NV_copy_image();
-#endif /* GLX_NV_copy_image */
-#ifdef GLX_NV_float_buffer
-  _glewInfo_GLX_NV_float_buffer();
-#endif /* GLX_NV_float_buffer */
-#ifdef GLX_NV_multisample_coverage
-  _glewInfo_GLX_NV_multisample_coverage();
-#endif /* GLX_NV_multisample_coverage */
-#ifdef GLX_NV_present_video
-  _glewInfo_GLX_NV_present_video();
-#endif /* GLX_NV_present_video */
-#ifdef GLX_NV_swap_group
-  _glewInfo_GLX_NV_swap_group();
-#endif /* GLX_NV_swap_group */
-#ifdef GLX_NV_vertex_array_range
-  _glewInfo_GLX_NV_vertex_array_range();
-#endif /* GLX_NV_vertex_array_range */
-#ifdef GLX_NV_video_capture
-  _glewInfo_GLX_NV_video_capture();
-#endif /* GLX_NV_video_capture */
-#ifdef GLX_NV_video_out
-  _glewInfo_GLX_NV_video_out();
-#endif /* GLX_NV_video_out */
-#ifdef GLX_OML_swap_method
-  _glewInfo_GLX_OML_swap_method();
-#endif /* GLX_OML_swap_method */
-#ifdef GLX_OML_sync_control
-  _glewInfo_GLX_OML_sync_control();
-#endif /* GLX_OML_sync_control */
-#ifdef GLX_SGIS_blended_overlay
-  _glewInfo_GLX_SGIS_blended_overlay();
-#endif /* GLX_SGIS_blended_overlay */
-#ifdef GLX_SGIS_color_range
-  _glewInfo_GLX_SGIS_color_range();
-#endif /* GLX_SGIS_color_range */
-#ifdef GLX_SGIS_multisample
-  _glewInfo_GLX_SGIS_multisample();
-#endif /* GLX_SGIS_multisample */
-#ifdef GLX_SGIS_shared_multisample
-  _glewInfo_GLX_SGIS_shared_multisample();
-#endif /* GLX_SGIS_shared_multisample */
-#ifdef GLX_SGIX_fbconfig
-  _glewInfo_GLX_SGIX_fbconfig();
-#endif /* GLX_SGIX_fbconfig */
-#ifdef GLX_SGIX_hyperpipe
-  _glewInfo_GLX_SGIX_hyperpipe();
-#endif /* GLX_SGIX_hyperpipe */
-#ifdef GLX_SGIX_pbuffer
-  _glewInfo_GLX_SGIX_pbuffer();
-#endif /* GLX_SGIX_pbuffer */
-#ifdef GLX_SGIX_swap_barrier
-  _glewInfo_GLX_SGIX_swap_barrier();
-#endif /* GLX_SGIX_swap_barrier */
-#ifdef GLX_SGIX_swap_group
-  _glewInfo_GLX_SGIX_swap_group();
-#endif /* GLX_SGIX_swap_group */
-#ifdef GLX_SGIX_video_resize
-  _glewInfo_GLX_SGIX_video_resize();
-#endif /* GLX_SGIX_video_resize */
-#ifdef GLX_SGIX_visual_select_group
-  _glewInfo_GLX_SGIX_visual_select_group();
-#endif /* GLX_SGIX_visual_select_group */
-#ifdef GLX_SGI_cushion
-  _glewInfo_GLX_SGI_cushion();
-#endif /* GLX_SGI_cushion */
-#ifdef GLX_SGI_make_current_read
-  _glewInfo_GLX_SGI_make_current_read();
-#endif /* GLX_SGI_make_current_read */
-#ifdef GLX_SGI_swap_control
-  _glewInfo_GLX_SGI_swap_control();
-#endif /* GLX_SGI_swap_control */
-#ifdef GLX_SGI_video_sync
-  _glewInfo_GLX_SGI_video_sync();
-#endif /* GLX_SGI_video_sync */
-#ifdef GLX_SUN_get_transparent_index
-  _glewInfo_GLX_SUN_get_transparent_index();
-#endif /* GLX_SUN_get_transparent_index */
-#ifdef GLX_SUN_video_resize
-  _glewInfo_GLX_SUN_video_resize();
-#endif /* GLX_SUN_video_resize */
-}
-
-#endif /* _WIN32 */
-
-/* ------------------------------------------------------------------------ */
-
-#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-int main (int argc, char** argv)
-#else
-int main (void)
-#endif
-{
-  GLuint err;
-
-#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-  char* display = NULL;
-  int visual = -1;
-
-  if (glewParseArgs(argc-1, argv+1, &display, &visual))
-  {
-#if defined(_WIN32)
-    fprintf(stderr, "Usage: glewinfo [-pf <id>]\n");
-#else
-    fprintf(stderr, "Usage: glewinfo [-display <display>] [-visual <id>]\n");
-#endif
-    return 1;
-  }
-#endif
-
-#if defined(_WIN32)
-  if (GL_TRUE == glewCreateContext(&visual))
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-  if (GL_TRUE == glewCreateContext())
-#else
-  if (GL_TRUE == glewCreateContext(display, &visual))
-#endif
-  {
-    fprintf(stderr, "Error: glewCreateContext failed\n");
-    glewDestroyContext();
-    return 1;
-  }
-  glewExperimental = GL_TRUE;
-#ifdef GLEW_MX
-  err = glewContextInit(glewGetContext());
-#ifdef _WIN32
-  err = err || wglewContextInit(wglewGetContext());
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-  err = err || glxewContextInit(glxewGetContext());
-#endif
-
-#else
-  err = glewInit();
-#endif
-  if (GLEW_OK != err)
-  {
-    fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err));
-    glewDestroyContext();
-    return 1;
-  }
-#if defined(_WIN32)
-  f = fopen("glewinfo.txt", "w");
-  if (f == NULL) f = stdout;
-#else
-  f = stdout;
-#endif
-  fprintf(f, "---------------------------\n");
-  fprintf(f, "    GLEW Extension Info\n");
-  fprintf(f, "---------------------------\n\n");
-  fprintf(f, "GLEW version %s\n", glewGetString(GLEW_VERSION));
-#if defined(_WIN32)
-  fprintf(f, "Reporting capabilities of pixelformat %d\n", visual);
-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-  fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", 
-    display == NULL ? getenv("DISPLAY") : display, visual);
-#endif
-  fprintf(f, "Running on a %s from %s\n", 
-	  glGetString(GL_RENDERER), glGetString(GL_VENDOR));
-  fprintf(f, "OpenGL version %s is supported\n", glGetString(GL_VERSION));
-  glewInfo();
-#if defined(_WIN32)
-  wglewInfo();
-#else
-  glxewInfo();
-#endif
-  if (f != stdout) fclose(f);
-  glewDestroyContext();
-  return 0;
-}
-
-/* ------------------------------------------------------------------------ */
-
-#if defined(_WIN32) || !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-GLboolean glewParseArgs (int argc, char** argv, char** display, int* visual)
-{
-  int p = 0;
-  while (p < argc)
-  {
-#if defined(_WIN32)
-    if (!strcmp(argv[p], "-pf") || !strcmp(argv[p], "-pixelformat"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      *display = 0;
-      *visual = strtol(argv[p++], NULL, 0);
-    }
-    else
-      return GL_TRUE;
-#else
-    if (!strcmp(argv[p], "-display"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      *display = argv[p++];
-    }
-    else if (!strcmp(argv[p], "-visual"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      *visual = (int)strtol(argv[p++], NULL, 0);
-    }
-    else
-      return GL_TRUE;
-#endif
-  }
-  return GL_FALSE;
-}
-#endif
-
-/* ------------------------------------------------------------------------ */
-
-#if defined(_WIN32)
-
-HWND wnd = NULL;
-HDC dc = NULL;
-HGLRC rc = NULL;
-
-GLboolean glewCreateContext (int* pixelformat)
-{
-  WNDCLASS wc;
-  PIXELFORMATDESCRIPTOR pfd;
-  /* register window class */
-  ZeroMemory(&wc, sizeof(WNDCLASS));
-  wc.hInstance = GetModuleHandle(NULL);
-  wc.lpfnWndProc = DefWindowProc;
-  wc.lpszClassName = "GLEW";
-  if (0 == RegisterClass(&wc)) return GL_TRUE;
-  /* create window */
-  wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 
-                     CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL);
-  if (NULL == wnd) return GL_TRUE;
-  /* get the device context */
-  dc = GetDC(wnd);
-  if (NULL == dc) return GL_TRUE;
-  /* find pixel format */
-  ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR));
-  if (*pixelformat == -1) /* find default */
-  {
-    pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
-    pfd.nVersion = 1;
-    pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
-    *pixelformat = ChoosePixelFormat(dc, &pfd);
-    if (*pixelformat == 0) return GL_TRUE;
-  }
-  /* set the pixel format for the dc */
-  if (FALSE == SetPixelFormat(dc, *pixelformat, &pfd)) return GL_TRUE;
-  /* create rendering context */
-  rc = wglCreateContext(dc);
-  if (NULL == rc) return GL_TRUE;
-  if (FALSE == wglMakeCurrent(dc, rc)) return GL_TRUE;
-  return GL_FALSE;
-}
-
-void glewDestroyContext ()
-{
-  if (NULL != rc) wglMakeCurrent(NULL, NULL);
-  if (NULL != rc) wglDeleteContext(rc);
-  if (NULL != wnd && NULL != dc) ReleaseDC(wnd, dc);
-  if (NULL != wnd) DestroyWindow(wnd);
-  UnregisterClass("GLEW", GetModuleHandle(NULL));
-}
-
-/* ------------------------------------------------------------------------ */
-
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-
-#include <AGL/agl.h>
-
-AGLContext ctx, octx;
-
-GLboolean glewCreateContext ()
-{
-  int attrib[] = { AGL_RGBA, AGL_NONE };
-  AGLPixelFormat pf;
-  /*int major, minor;
-  SetPortWindowPort(wnd);
-  aglGetVersion(&major, &minor);
-  fprintf(stderr, "GL %d.%d\n", major, minor);*/
-  pf = aglChoosePixelFormat(NULL, 0, attrib);
-  if (NULL == pf) return GL_TRUE;
-  ctx = aglCreateContext(pf, NULL);
-  if (NULL == ctx || AGL_NO_ERROR != aglGetError()) return GL_TRUE;
-  aglDestroyPixelFormat(pf);
-  /*aglSetDrawable(ctx, GetWindowPort(wnd));*/
-  octx = aglGetCurrentContext();
-  if (GL_FALSE == aglSetCurrentContext(ctx)) return GL_TRUE;
-  /* Needed for Regal on the Mac */
-  #if defined(GLEW_REGAL) && defined(__APPLE__)
-  RegalMakeCurrent(octx);
-  #endif
-  return GL_FALSE;
-}
-
-void glewDestroyContext ()
-{
-  aglSetCurrentContext(octx);
-  if (NULL != ctx) aglDestroyContext(ctx);
-}
-
-/* ------------------------------------------------------------------------ */
-
-#else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
-
-Display* dpy = NULL;
-XVisualInfo* vi = NULL;
-XVisualInfo* vis = NULL;
-GLXContext ctx = NULL;
-Window wnd = 0;
-Colormap cmap = 0;
-
-GLboolean glewCreateContext (const char* display, int* visual)
-{
-  int attrib[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
-  int erb, evb;
-  XSetWindowAttributes swa;
-  /* open display */
-  dpy = XOpenDisplay(display);
-  if (NULL == dpy) return GL_TRUE;
-  /* query for glx */
-  if (!glXQueryExtension(dpy, &erb, &evb)) return GL_TRUE;
-  /* choose visual */
-  if (*visual == -1)
-  {
-    vi = glXChooseVisual(dpy, DefaultScreen(dpy), attrib);
-    if (NULL == vi) return GL_TRUE;
-    *visual = (int)XVisualIDFromVisual(vi->visual);
-  }
-  else
-  {
-    int n_vis, i;
-    vis = XGetVisualInfo(dpy, 0, NULL, &n_vis);
-    for (i=0; i<n_vis; i++)
-    {
-      if ((int)XVisualIDFromVisual(vis[i].visual) == *visual)
-        vi = &vis[i];
-    }
-    if (vi == NULL) return GL_TRUE;
-  }
-  /* create context */
-  ctx = glXCreateContext(dpy, vi, None, True);
-  if (NULL == ctx) return GL_TRUE;
-  /* create window */
-  /*wnd = XCreateSimpleWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, 1, 1, 1, 0, 0);*/
-  cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone);
-  swa.border_pixel = 0;
-  swa.colormap = cmap;
-  wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), 
-                      0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, 
-                      CWBorderPixel | CWColormap, &swa);
-  /* make context current */
-  if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE;
-  return GL_FALSE;
-}
-
-void glewDestroyContext ()
-{
-  if (NULL != dpy && NULL != ctx) glXDestroyContext(dpy, ctx);
-  if (NULL != dpy && 0 != wnd) XDestroyWindow(dpy, wnd);
-  if (NULL != dpy && 0 != cmap) XFreeColormap(dpy, cmap);
-  if (NULL != vis)
-    XFree(vis);
-  else if (NULL != vi)
-    XFree(vi);
-  if (NULL != dpy) XCloseDisplay(dpy);
-}
-
-#endif /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
diff --git a/Externals/GLew/src/visualinfo.c b/Externals/GLew/src/visualinfo.c
deleted file mode 100644
index fda4da82b3..0000000000
--- a/Externals/GLew/src/visualinfo.c
+++ /dev/null
@@ -1,1178 +0,0 @@
-/*
-** visualinfo.c
-**
-** Copyright (C) Nate Robins, 1997
-**               Michael Wimmer, 1999
-**               Milan Ikits, 2002-2008
-**
-** visualinfo is a small utility that displays all available visuals,
-** aka. pixelformats, in an OpenGL system along with renderer version
-** information. It shows a table of all the visuals that support OpenGL
-** along with their capabilities. The format of the table is similar to
-** that of glxinfo on Unix systems:
-**
-** visual ~= pixel format descriptor
-** id       = visual id (integer from 1 - max visuals)
-** tp       = type (wn: window, pb: pbuffer, wp: window & pbuffer, bm: bitmap)
-** ac	    = acceleration (ge: generic, fu: full, no: none)
-** fm	    = format (i: integer, f: float, c: color index)
-** db	    = double buffer (y = yes)
-** sw       = swap method (x: exchange, c: copy, u: undefined)
-** st	    = stereo (y = yes)
-** sz       = total # bits
-** r        = # bits of red
-** g        = # bits of green
-** b        = # bits of blue
-** a        = # bits of alpha
-** axbf     = # aux buffers
-** dpth     = # bits of depth
-** stcl     = # bits of stencil
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <GL/glew.h>
-#if defined(_WIN32)
-#include <GL/wglew.h>
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-#include <AGL/agl.h>
-#else
-#include <GL/glxew.h>
-#endif
-
-#ifdef GLEW_MX
-GLEWContext _glewctx;
-#  define glewGetContext() (&_glewctx)
-#  ifdef _WIN32
-WGLEWContext _wglewctx;
-#    define wglewGetContext() (&_wglewctx)
-#  elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-GLXEWContext _glxewctx;
-#    define glxewGetContext() (&_glxewctx)
-#  endif
-#endif /* GLEW_MX */
-
-typedef struct GLContextStruct
-{
-#ifdef _WIN32
-  HWND wnd;
-  HDC dc;
-  HGLRC rc;
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-  AGLContext ctx, octx;
-#else
-  Display* dpy;
-  XVisualInfo* vi;
-  GLXContext ctx;
-  Window wnd;
-  Colormap cmap;
-#endif
-} GLContext;
-
-void InitContext (GLContext* ctx);
-GLboolean CreateContext (GLContext* ctx);
-void DestroyContext (GLContext* ctx);
-void VisualInfo (GLContext* ctx);
-void PrintExtensions (const char* s);
-GLboolean ParseArgs (int argc, char** argv);
-
-int showall = 0;
-int displaystdout = 0;
-int verbose = 0;
-int drawableonly = 0;
-
-char* display = NULL;
-int visual = -1;
-
-FILE* file = 0;
-
-int 
-main (int argc, char** argv)
-{
-  GLenum err;
-  GLContext ctx;
-
-  /* ---------------------------------------------------------------------- */
-  /* parse arguments */
-  if (GL_TRUE == ParseArgs(argc-1, argv+1))
-  {
-#if defined(_WIN32)
-    fprintf(stderr, "Usage: visualinfo [-a] [-s] [-h] [-pf <id>]\n");
-    fprintf(stderr, "        -a: show all visuals\n");
-    fprintf(stderr, "        -s: display to stdout instead of visualinfo.txt\n");
-    fprintf(stderr, "        -pf <id>: use given pixelformat\n");
-    fprintf(stderr, "        -h: this screen\n");
-#else
-    fprintf(stderr, "Usage: visualinfo [-h] [-display <display>] [-visual <id>]\n");
-    fprintf(stderr, "        -h: this screen\n");
-    fprintf(stderr, "        -display <display>: use given display\n");
-    fprintf(stderr, "        -visual <id>: use given visual\n");
-#endif
-    return 1;
-  }
-
-  /* ---------------------------------------------------------------------- */
-  /* create OpenGL rendering context */
-  InitContext(&ctx);
-  if (GL_TRUE == CreateContext(&ctx))
-  {
-    fprintf(stderr, "Error: CreateContext failed\n");
-    DestroyContext(&ctx);
-    return 1;
-  }
-
-  /* ---------------------------------------------------------------------- */
-  /* initialize GLEW */
-  glewExperimental = GL_TRUE;
-#ifdef GLEW_MX
-  err = glewContextInit(glewGetContext());
-#  ifdef _WIN32
-  err = err || wglewContextInit(wglewGetContext());
-#  elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-  err = err || glxewContextInit(glxewGetContext());
-#  endif
-#else
-  err = glewInit();
-#endif
-  if (GLEW_OK != err)
-  {
-    fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err));
-    DestroyContext(&ctx);
-    return 1;
-  }
-
-  /* ---------------------------------------------------------------------- */
-  /* open file */
-#if defined(_WIN32)
-  if (!displaystdout) 
-    file = fopen("visualinfo.txt", "w");
-  if (file == NULL)
-    file = stdout;
-#else
-  file = stdout;
-#endif
-
-  /* ---------------------------------------------------------------------- */
-  /* output header information */
-  /* OpenGL extensions */
-  fprintf(file, "OpenGL vendor string: %s\n", glGetString(GL_VENDOR));
-  fprintf(file, "OpenGL renderer string: %s\n", glGetString(GL_RENDERER));
-  fprintf(file, "OpenGL version string: %s\n", glGetString(GL_VERSION));
-  fprintf(file, "OpenGL extensions (GL_): \n");
-  PrintExtensions((char*)glGetString(GL_EXTENSIONS));
-
-#ifndef GLEW_NO_GLU
-  /* GLU extensions */
-  fprintf(file, "GLU version string: %s\n", gluGetString(GLU_VERSION));
-  fprintf(file, "GLU extensions (GLU_): \n");
-  PrintExtensions((char*)gluGetString(GLU_EXTENSIONS));
-#endif
-
-  /* ---------------------------------------------------------------------- */
-  /* extensions string */
-#if defined(_WIN32)
-  /* WGL extensions */
-  if (WGLEW_ARB_extensions_string || WGLEW_EXT_extensions_string)
-  {
-    fprintf(file, "WGL extensions (WGL_): \n");
-    PrintExtensions(wglGetExtensionsStringARB ? 
-                    (char*)wglGetExtensionsStringARB(ctx.dc) :
-		    (char*)wglGetExtensionsStringEXT());
-  }
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-  
-#else
-  /* GLX extensions */
-  fprintf(file, "GLX extensions (GLX_): \n");
-  PrintExtensions(glXQueryExtensionsString(glXGetCurrentDisplay(), 
-                                           DefaultScreen(glXGetCurrentDisplay())));
-#endif
-
-  /* ---------------------------------------------------------------------- */
-  /* enumerate all the formats */
-  VisualInfo(&ctx);
-
-  /* ---------------------------------------------------------------------- */
-  /* release resources */
-  DestroyContext(&ctx);
-  if (file != stdout)
-    fclose(file);
-  return 0;
-}
-
-/* do the magic to separate all extensions with comma's, except
-   for the last one that _may_ terminate in a space. */
-void PrintExtensions (const char* s)
-{
-  char t[80];
-  int i=0;
-  char* p=0;
-
-  t[79] = '\0';
-  while (*s)
-  {
-    t[i++] = *s;
-    if(*s == ' ')
-    {
-      if (*(s+1) != '\0') {
-	t[i-1] = ',';
-	t[i] = ' ';
-	p = &t[i++];
-      }
-      else /* zoinks! last one terminated in a space! */
-      {
-	t[i-1] = '\0';
-      }
-    }
-    if(i > 80 - 5)
-    {
-      *p = t[i] = '\0';
-      fprintf(file, "    %s\n", t);
-      p++;
-      i = (int)strlen(p);
-      strcpy(t, p);
-    }
-    s++;
-  }
-  t[i] = '\0';
-  fprintf(file, "    %s.\n", t);
-}
-
-/* ---------------------------------------------------------------------- */
-
-#if defined(_WIN32)
-
-void
-VisualInfoARB (GLContext* ctx)
-{
-  int attrib[32], value[32], n_attrib, n_pbuffer=0, n_float=0;
-  int i, pf, maxpf;
-  unsigned int c;
-
-  /* to get pbuffer capable pixel formats */
-  attrib[0] = WGL_DRAW_TO_PBUFFER_ARB;
-  attrib[1] = GL_TRUE;
-  attrib[2] = 0;
-  wglChoosePixelFormatARB(ctx->dc, attrib, 0, 1, &pf, &c);
-  /* query number of pixel formats */
-  attrib[0] = WGL_NUMBER_PIXEL_FORMATS_ARB;
-  wglGetPixelFormatAttribivARB(ctx->dc, 0, 0, 1, attrib, value);
-  maxpf = value[0];
-  for (i=0; i<32; i++)
-    value[i] = 0;
-
-  attrib[0] = WGL_SUPPORT_OPENGL_ARB;
-  attrib[1] = WGL_DRAW_TO_WINDOW_ARB;
-  attrib[2] = WGL_DRAW_TO_BITMAP_ARB;
-  attrib[3] = WGL_ACCELERATION_ARB;
-  /* WGL_NO_ACCELERATION_ARB, WGL_GENERIC_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB */
-  attrib[4] = WGL_SWAP_METHOD_ARB;
-  /* WGL_SWAP_EXCHANGE_ARB, WGL_SWAP_COPY_ARB, WGL_SWAP_UNDEFINED_ARB */
-  attrib[5] = WGL_DOUBLE_BUFFER_ARB;
-  attrib[6] = WGL_STEREO_ARB;
-  attrib[7] = WGL_PIXEL_TYPE_ARB;
-  /* WGL_TYPE_RGBA_ARB, WGL_TYPE_COLORINDEX_ARB,
-     WGL_TYPE_RGBA_FLOAT_ATI (WGL_ATI_pixel_format_float) */
-  /* Color buffer information */
-  attrib[8] = WGL_COLOR_BITS_ARB;
-  attrib[9] = WGL_RED_BITS_ARB;
-  attrib[10] = WGL_GREEN_BITS_ARB;
-  attrib[11] = WGL_BLUE_BITS_ARB;
-  attrib[12] = WGL_ALPHA_BITS_ARB;
-  /* Accumulation buffer information */
-  attrib[13] = WGL_ACCUM_BITS_ARB;
-  attrib[14] = WGL_ACCUM_RED_BITS_ARB;
-  attrib[15] = WGL_ACCUM_GREEN_BITS_ARB;
-  attrib[16] = WGL_ACCUM_BLUE_BITS_ARB;
-  attrib[17] = WGL_ACCUM_ALPHA_BITS_ARB;
-  /* Depth, stencil, and aux buffer information */
-  attrib[18] = WGL_DEPTH_BITS_ARB;
-  attrib[19] = WGL_STENCIL_BITS_ARB;
-  attrib[20] = WGL_AUX_BUFFERS_ARB;
-  /* Layer information */
-  attrib[21] = WGL_NUMBER_OVERLAYS_ARB;
-  attrib[22] = WGL_NUMBER_UNDERLAYS_ARB;
-  attrib[23] = WGL_SWAP_LAYER_BUFFERS_ARB;
-  attrib[24] = WGL_SAMPLES_ARB;
-  attrib[25] = WGL_SUPPORT_GDI_ARB;
-  n_attrib = 26;
-  if (WGLEW_ARB_pbuffer)
-  {
-    attrib[n_attrib] = WGL_DRAW_TO_PBUFFER_ARB;
-    n_pbuffer = n_attrib;
-    n_attrib++;
-  }
-  if (WGLEW_NV_float_buffer)
-  {
-    attrib[n_attrib] = WGL_FLOAT_COMPONENTS_NV;
-    n_float = n_attrib;
-    n_attrib++;
-  }
-  
-  if (!verbose)
-  {
-    /* print table header */
-    fprintf(file, " +-----+-------------------------+-----------------+----------+-----------------+----------+\n");
-    fprintf(file, " |     |          visual         |      color      | ax dp st |      accum      |   layer  |\n");
-    fprintf(file, " |  id | tp ac gd fm db sw st ms |  sz  r  g  b  a | bf th cl |  sz  r  g  b  a | ov un sw |\n");
-    fprintf(file, " +-----+-------------------------+-----------------+----------+-----------------+----------+\n");
-    /* loop through all the pixel formats */
-    for(i = 1; i <= maxpf; i++)
-    {
-      wglGetPixelFormatAttribivARB(ctx->dc, i, 0, n_attrib, attrib, value);
-      /* only describe this format if it supports OpenGL */
-      if (!value[0]) continue;
-      /* by default show only fully accelerated window or pbuffer capable visuals */
-      if (!showall
-	  && ((value[2] && !value[1])
-	  || (!WGLEW_ARB_pbuffer || !value[n_pbuffer])
-	  || (value[3] != WGL_FULL_ACCELERATION_ARB))) continue;
-      /* print out the information for this visual */
-      /* visual id */
-      fprintf(file, " |% 4d | ", i);
-      /* visual type */
-      if (value[1])
-      {
-	if (WGLEW_ARB_pbuffer && value[n_pbuffer]) fprintf(file, "wp ");
-	else fprintf(file, "wn ");
-      }
-      else
-      {
-	if (value[2]) fprintf(file, "bm ");
-	else if (WGLEW_ARB_pbuffer && value[n_pbuffer]) fprintf(file, "pb ");
-      }
-      /* acceleration */
-      fprintf(file, "%s ", value[3] == WGL_FULL_ACCELERATION_ARB ? "fu" : 
-	      value[3] == WGL_GENERIC_ACCELERATION_ARB ? "ge" :
-	      value[3] == WGL_NO_ACCELERATION_ARB ? "no" : ". ");
-      /* gdi support */
-      fprintf(file, " %c ", value[25] ? 'y' : '.');
-      /* format */
-      if (WGLEW_NV_float_buffer && value[n_float]) fprintf(file, " f ");
-      else if (WGLEW_ATI_pixel_format_float && value[7] == WGL_TYPE_RGBA_FLOAT_ATI) fprintf(file, " f ");
-      else if (value[7] == WGL_TYPE_RGBA_ARB) fprintf(file, " i ");
-      else if (value[7] == WGL_TYPE_COLORINDEX_ARB) fprintf(file, " c ");
-      else if (value[7] == WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT) fprintf(file," p ");
-      else fprintf(file," ? ");
-      /* double buffer */
-      fprintf(file, " %c ", value[5] ? 'y' : '.');
-      /* swap method */
-      if (value[4] == WGL_SWAP_EXCHANGE_ARB) fprintf(file, " x ");
-      else if (value[4] == WGL_SWAP_COPY_ARB) fprintf(file, " c ");
-      else if (value[4] == WGL_SWAP_UNDEFINED_ARB) fprintf(file, " . ");
-      else fprintf(file, " . ");
-      /* stereo */
-      fprintf(file, " %c ", value[6] ? 'y' : '.');
-      /* multisample */
-      if (value[24] > 0)
-	fprintf(file, "%2d | ", value[24]);
-      else
-	fprintf(file, " . | ");
-      /* color size */
-      if (value[8]) fprintf(file, "%3d ", value[8]);
-      else fprintf(file, "  . ");
-      /* red */
-      if (value[9]) fprintf(file, "%2d ", value[9]); 
-      else fprintf(file, " . ");
-      /* green */
-      if (value[10]) fprintf(file, "%2d ", value[10]); 
-      else fprintf(file, " . ");
-      /* blue */
-      if (value[11]) fprintf(file, "%2d ", value[11]);
-      else fprintf(file, " . ");
-      /* alpha */
-      if (value[12]) fprintf(file, "%2d | ", value[12]); 
-      else fprintf(file, " . | ");
-      /* aux buffers */
-      if (value[20]) fprintf(file, "%2d ", value[20]);
-      else fprintf(file, " . ");
-      /* depth */
-      if (value[18]) fprintf(file, "%2d ", value[18]);
-      else fprintf(file, " . ");
-      /* stencil */
-      if (value[19]) fprintf(file, "%2d | ", value[19]);
-      else fprintf(file, " . | ");
-      /* accum size */
-      if (value[13]) fprintf(file, "%3d ", value[13]);
-      else fprintf(file, "  . ");
-      /* accum red */
-      if (value[14]) fprintf(file, "%2d ", value[14]);
-      else fprintf(file, " . ");
-      /* accum green */
-      if (value[15]) fprintf(file, "%2d ", value[15]);
-      else fprintf(file, " . ");
-      /* accum blue */
-      if (value[16]) fprintf(file, "%2d ", value[16]);
-      else fprintf(file, " . ");
-      /* accum alpha */
-      if (value[17]) fprintf(file, "%2d | ", value[17]);
-      else fprintf(file, " . | ");
-      /* overlay */
-      if (value[21]) fprintf(file, "%2d ", value[21]);
-      else fprintf(file, " . ");
-      /* underlay */
-      if (value[22]) fprintf(file, "%2d ", value[22]);
-      else fprintf(file, " . ");
-      /* layer swap */
-      if (value[23]) fprintf(file, "y ");
-      else fprintf(file, " . ");
-      fprintf(file, "|\n");
-    }
-    /* print table footer */
-    fprintf(file, " +-----+-------------------------+-----------------+----------+-----------------+----------+\n");
-    fprintf(file, " |     |          visual         |      color      | ax dp st |      accum      |   layer  |\n");
-    fprintf(file, " |  id | tp ac gd fm db sw st ms |  sz  r  g  b  a | bf th cl |  sz  r  g  b  a | ov un sw |\n");
-    fprintf(file, " +-----+-------------------------+-----------------+----------+-----------------+----------+\n");
-  }
-  else /* verbose */
-  {
-#if 0
-    fprintf(file, "\n");
-    /* loop through all the pixel formats */
-    for(i = 1; i <= maxpf; i++)
-    {	    
-      DescribePixelFormat(ctx->dc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
-      /* only describe this format if it supports OpenGL */
-      if(!(pfd.dwFlags & PFD_SUPPORT_OPENGL)
-	 || (drawableonly && !(pfd.dwFlags & PFD_DRAW_TO_WINDOW))) continue;
-      fprintf(file, "Visual ID: %2d  depth=%d  class=%s\n", i, pfd.cDepthBits, 
-	     pfd.cColorBits <= 8 ? "PseudoColor" : "TrueColor");
-      fprintf(file, "    bufferSize=%d level=%d renderType=%s doubleBuffer=%d stereo=%d\n", pfd.cColorBits, pfd.bReserved, pfd.iPixelType == PFD_TYPE_RGBA ? "rgba" : "ci", pfd.dwFlags & PFD_DOUBLEBUFFER, pfd.dwFlags & PFD_STEREO);
-      fprintf(file, "    generic=%d generic accelerated=%d\n", (pfd.dwFlags & PFD_GENERIC_FORMAT) == PFD_GENERIC_FORMAT, (pfd.dwFlags & PFD_GENERIC_ACCELERATED) == PFD_GENERIC_ACCELERATED);
-      fprintf(file, "    rgba: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n", pfd.cRedBits, pfd.cGreenBits, pfd.cBlueBits, pfd.cAlphaBits);
-      fprintf(file, "    auxBuffers=%d depthSize=%d stencilSize=%d\n", pfd.cAuxBuffers, pfd.cDepthBits, pfd.cStencilBits);
-      fprintf(file, "    accum: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n", pfd.cAccumRedBits, pfd.cAccumGreenBits, pfd.cAccumBlueBits, pfd.cAccumAlphaBits);
-      fprintf(file, "    multiSample=%d multisampleBuffers=%d\n", 0, 0);
-      fprintf(file, "    Opaque.\n");
-    }
-#endif
-  }
-}
-
-void
-VisualInfoGDI (GLContext* ctx)
-{
-  int i, maxpf;
-  PIXELFORMATDESCRIPTOR pfd;
-
-  /* calling DescribePixelFormat() with NULL pfd (!!!) return maximum
-     number of pixel formats */
-  maxpf = DescribePixelFormat(ctx->dc, 1, 0, NULL);
-
-  if (!verbose)
-  {
-    fprintf(file, "-----------------------------------------------------------------------------\n");
-    fprintf(file, "   visual   x  bf  lv rg d st ge ge  r  g  b a  ax dp st   accum buffs    ms \n");
-    fprintf(file, " id  dep tp sp sz  l  ci b ro ne ac sz sz sz sz bf th cl  sz  r  g  b  a ns b\n");
-    fprintf(file, "-----------------------------------------------------------------------------\n");
-
-    /* loop through all the pixel formats */
-    for(i = 1; i <= maxpf; i++)
-    {
-      DescribePixelFormat(ctx->dc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
-      /* only describe this format if it supports OpenGL */
-      if(!(pfd.dwFlags & PFD_SUPPORT_OPENGL)
-	 || (drawableonly && (pfd.dwFlags & PFD_DRAW_TO_BITMAP))) continue;
-      /* other criteria could be tested here for actual pixel format
-	 choosing in an application:
-	   
-	 for (...each pixel format...) {
-	 if (pfd.dwFlags & PFD_SUPPORT_OPENGL &&
-	 pfd.dwFlags & PFD_DOUBLEBUFFER &&
-	 pfd.cDepthBits >= 24 &&
-	 pfd.cColorBits >= 24)
-	 {
-	 goto found;
-	 }
-	 }
-	 ... not found so exit ...
-	 found:
-	 ... found so use it ...
-      */
-      /* print out the information for this pixel format */
-      fprintf(file, "0x%02x ", i);
-      fprintf(file, "%3d ", pfd.cColorBits);
-      if(pfd.dwFlags & PFD_DRAW_TO_WINDOW) fprintf(file, "wn ");
-      else if(pfd.dwFlags & PFD_DRAW_TO_BITMAP) fprintf(file, "bm ");
-      else fprintf(file, "pb ");
-      /* should find transparent pixel from LAYERPLANEDESCRIPTOR */
-      fprintf(file, " . "); 
-      fprintf(file, "%3d ", pfd.cColorBits);
-      /* bReserved field indicates number of over/underlays */
-      if(pfd.bReserved) fprintf(file, " %d ", pfd.bReserved);
-      else fprintf(file, " . "); 
-      fprintf(file, " %c ", pfd.iPixelType == PFD_TYPE_RGBA ? 'r' : 'c');
-      fprintf(file, "%c ", pfd.dwFlags & PFD_DOUBLEBUFFER ? 'y' : '.');
-      fprintf(file, " %c ", pfd.dwFlags & PFD_STEREO ? 'y' : '.');
-      /* added: */
-      fprintf(file, " %c ", pfd.dwFlags & PFD_GENERIC_FORMAT ? 'y' : '.');
-      fprintf(file, " %c ", pfd.dwFlags & PFD_GENERIC_ACCELERATED ? 'y' : '.');
-      if(pfd.cRedBits && pfd.iPixelType == PFD_TYPE_RGBA) 
-	fprintf(file, "%2d ", pfd.cRedBits);
-      else fprintf(file, " . ");
-      if(pfd.cGreenBits && pfd.iPixelType == PFD_TYPE_RGBA) 
-	fprintf(file, "%2d ", pfd.cGreenBits);
-      else fprintf(file, " . ");
-      if(pfd.cBlueBits && pfd.iPixelType == PFD_TYPE_RGBA) 
-	fprintf(file, "%2d ", pfd.cBlueBits);
-      else fprintf(file, " . ");
-      if(pfd.cAlphaBits && pfd.iPixelType == PFD_TYPE_RGBA) 
-	fprintf(file, "%2d ", pfd.cAlphaBits);
-      else fprintf(file, " . ");
-      if(pfd.cAuxBuffers)     fprintf(file, "%2d ", pfd.cAuxBuffers);
-      else fprintf(file, " . ");
-      if(pfd.cDepthBits)      fprintf(file, "%2d ", pfd.cDepthBits);
-      else fprintf(file, " . ");
-      if(pfd.cStencilBits)    fprintf(file, "%2d ", pfd.cStencilBits);
-      else fprintf(file, " . ");
-      if(pfd.cAccumBits)   fprintf(file, "%3d ", pfd.cAccumBits);
-      else fprintf(file, "  . ");
-      if(pfd.cAccumRedBits)   fprintf(file, "%2d ", pfd.cAccumRedBits);
-      else fprintf(file, " . ");
-      if(pfd.cAccumGreenBits) fprintf(file, "%2d ", pfd.cAccumGreenBits);
-      else fprintf(file, " . ");
-      if(pfd.cAccumBlueBits)  fprintf(file, "%2d ", pfd.cAccumBlueBits);
-      else fprintf(file, " . ");
-      if(pfd.cAccumAlphaBits) fprintf(file, "%2d ", pfd.cAccumAlphaBits);
-      else fprintf(file, " . ");
-      /* no multisample in win32 */
-      fprintf(file, " . .\n");
-    }
-    /* print table footer */
-    fprintf(file, "-----------------------------------------------------------------------------\n");
-    fprintf(file, "   visual   x  bf  lv rg d st ge ge  r  g  b a  ax dp st   accum buffs    ms \n");
-    fprintf(file, " id  dep tp sp sz  l  ci b ro ne ac sz sz sz sz bf th cl  sz  r  g  b  a ns b\n");
-    fprintf(file, "-----------------------------------------------------------------------------\n");
-  }
-  else /* verbose */
-  {
-    fprintf(file, "\n");
-    /* loop through all the pixel formats */
-    for(i = 1; i <= maxpf; i++)
-    {	    
-      DescribePixelFormat(ctx->dc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
-      /* only describe this format if it supports OpenGL */
-      if(!(pfd.dwFlags & PFD_SUPPORT_OPENGL)
-	 || (drawableonly && !(pfd.dwFlags & PFD_DRAW_TO_WINDOW))) continue;
-      fprintf(file, "Visual ID: %2d  depth=%d  class=%s\n", i, pfd.cDepthBits, 
-	     pfd.cColorBits <= 8 ? "PseudoColor" : "TrueColor");
-      fprintf(file, "    bufferSize=%d level=%d renderType=%s doubleBuffer=%ld stereo=%ld\n", pfd.cColorBits, pfd.bReserved, pfd.iPixelType == PFD_TYPE_RGBA ? "rgba" : "ci", pfd.dwFlags & PFD_DOUBLEBUFFER, pfd.dwFlags & PFD_STEREO);
-      fprintf(file, "    generic=%d generic accelerated=%d\n", (pfd.dwFlags & PFD_GENERIC_FORMAT) == PFD_GENERIC_FORMAT, (pfd.dwFlags & PFD_GENERIC_ACCELERATED) == PFD_GENERIC_ACCELERATED);
-      fprintf(file, "    rgba: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n", pfd.cRedBits, pfd.cGreenBits, pfd.cBlueBits, pfd.cAlphaBits);
-      fprintf(file, "    auxBuffers=%d depthSize=%d stencilSize=%d\n", pfd.cAuxBuffers, pfd.cDepthBits, pfd.cStencilBits);
-      fprintf(file, "    accum: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n", pfd.cAccumRedBits, pfd.cAccumGreenBits, pfd.cAccumBlueBits, pfd.cAccumAlphaBits);
-      fprintf(file, "    multiSample=%d multisampleBuffers=%d\n", 0, 0);
-      fprintf(file, "    Opaque.\n");
-    }
-  }
-}
-
-void
-VisualInfo (GLContext* ctx)
-{
-  if (WGLEW_ARB_pixel_format)
-    VisualInfoARB(ctx);
-  else
-    VisualInfoGDI(ctx);
-}
-
-/* ---------------------------------------------------------------------- */
-
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-
-void
-VisualInfo (GLContext* ctx)
-{
-/*
-  int attrib[] = { AGL_RGBA, AGL_NONE };
-  AGLPixelFormat pf;
-  GLint value;
-  pf = aglChoosePixelFormat(NULL, 0, attrib);
-  while (pf != NULL)
-  {
-    aglDescribePixelFormat(pf, GL_RGBA, &value);
-    fprintf(stderr, "%d\n", value);
-    pf = aglNextPixelFormat(pf);
-  }
-*/
-}
-
-#else /* GLX */
-
-void
-VisualInfo (GLContext* ctx)
-{
-  int n_fbc;
-  GLXFBConfig* fbc;
-  int value, ret, i;
-
-  fbc = glXGetFBConfigs(ctx->dpy, DefaultScreen(ctx->dpy), &n_fbc);
-
-  if (fbc)
-  {
-    if (!verbose)
-    {
-      /* print table header */
-      fprintf(file, " +-----+-------------------------+-----------------+----------+-------------+-------+------+\n");
-      fprintf(file, " |     |        visual           |      color      | ax dp st |    accum    |   ms  |  cav |\n");
-      fprintf(file, " |  id | tp xr cl fm db st lv xp |  sz  r  g  b  a | bf th cl | r  g  b  a  | ns  b |  eat |\n");
-      fprintf(file, " +-----+-------------------------+-----------------+----------+-------------+-------+------+\n");
-      /* loop through all the fbcs */
-      for (i=0; i<n_fbc; i++)
-      {
-        /* print out the information for this fbc */
-        /* visual id */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_FBCONFIG_ID, &value);
-        if (ret != Success)
-        {
-          fprintf(file, "|  ?  |");
-        }
-        else
-        {
-          fprintf(file, " |% 4d | ", value);
-        }
-        /* visual type */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_DRAWABLE_TYPE, &value);
-        if (ret != Success)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value & GLX_WINDOW_BIT)
-          {
-            if (value & GLX_PBUFFER_BIT)
-            {
-              fprintf(file, "wp ");
-            }
-            else
-            {
-              fprintf(file, "wn ");
-            }
-          }
-          else
-          {
-            if (value & GLX_PBUFFER_BIT)
-            {
-              fprintf(file, "pb ");
-            }
-            else if (value & GLX_PIXMAP_BIT)
-            {
-              fprintf(file, "pm ");
-            }
-            else
-            {
-              fprintf(file, " ? ");
-            }
-          }
-        }
-        /* x renderable */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_X_RENDERABLE, &value);
-        if (ret != Success)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          fprintf(file, value ? " y " : " n ");
-        }
-        /* class */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_X_VISUAL_TYPE, &value);
-        if (ret != Success)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (GLX_TRUE_COLOR == value)
-            fprintf(file, "tc ");
-          else if (GLX_DIRECT_COLOR == value)
-            fprintf(file, "dc ");
-          else if (GLX_PSEUDO_COLOR == value)
-            fprintf(file, "pc ");
-          else if (GLX_STATIC_COLOR == value)
-            fprintf(file, "sc ");
-          else if (GLX_GRAY_SCALE == value)
-            fprintf(file, "gs ");
-          else if (GLX_STATIC_GRAY == value)
-            fprintf(file, "sg ");
-          else if (GLX_X_VISUAL_TYPE == value)
-            fprintf(file, " . ");
-          else
-            fprintf(file, " ? ");
-        }
-        /* format */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_RENDER_TYPE, &value);
-        if (ret != Success)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (GLXEW_NV_float_buffer)
-          {
-            int ret2, value2;
-            ret2 = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_FLOAT_COMPONENTS_NV, &value2);
-            if (Success == ret2 && GL_TRUE == value2)
-            {
-              fprintf(file, " f ");
-            }
-            else if (value & GLX_RGBA_BIT)
-              fprintf(file, " i ");
-            else if (value & GLX_COLOR_INDEX_BIT)
-              fprintf(file, " c ");
-            else
-              fprintf(file, " ? ");
-          }
-          else
-          {
-            if (value & GLX_RGBA_FLOAT_ATI_BIT)
-              fprintf(file, " f ");
-            else if (value & GLX_RGBA_BIT)
-              fprintf(file, " i ");
-            else if (value & GLX_COLOR_INDEX_BIT)
-              fprintf(file, " c ");
-            else
-              fprintf(file, " ? ");
-          }
-        }
-        /* double buffer */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_DOUBLEBUFFER, &value);
-        fprintf(file, " %c ", Success != ret ? '?' : (value ? 'y' : '.'));
-        /* stereo */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_STEREO, &value);
-        fprintf(file, " %c ", Success != ret ? '?' : (value ? 'y' : '.'));
-        /* level */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_LEVEL, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          fprintf(file, "%2d ", value);
-        }
-        /* transparency */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_TRANSPARENT_TYPE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? | ");
-        }
-        else
-        {
-          if (GLX_TRANSPARENT_RGB == value)
-            fprintf(file, " r | ");
-          else if (GLX_TRANSPARENT_INDEX == value)
-            fprintf(file, " i | ");
-          else if (GLX_NONE == value)
-            fprintf(file, " . | ");
-          else
-            fprintf(file, " ? | ");
-        }
-        /* color size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_BUFFER_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, "  ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%3d ", value);
-          else
-            fprintf(file, "  . ");
-        }
-        /* red size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_RED_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* green size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_GREEN_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* blue size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_BLUE_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* alpha size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_ALPHA_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? | ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d | ", value);
-          else
-            fprintf(file, " . | ");
-        }
-        /* aux buffers */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_AUX_BUFFERS, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* depth size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_DEPTH_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* stencil size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_STENCIL_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? | ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d | ", value);
-          else
-            fprintf(file, " . | ");
-        }
-        /* accum red size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_ACCUM_RED_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* accum green size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_ACCUM_GREEN_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* accum blue size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_ACCUM_BLUE_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d ", value);
-          else
-            fprintf(file, " . ");
-        }
-        /* accum alpha size */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_ACCUM_ALPHA_SIZE, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? | ");
-        }
-        else
-        {
-          if (value)
-            fprintf(file, "%2d | ", value);
-          else
-            fprintf(file, " . | ");
-        }
-        /* multisample */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_SAMPLES, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? ");
-        }
-        else
-        {
-          fprintf(file, "%2d ", value);
-        }
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_SAMPLE_BUFFERS, &value);
-        if (Success != ret)
-        {
-          fprintf(file, " ? | ");
-        }
-        else
-        {
-          fprintf(file, "%2d | ", value);
-        }
-        /* caveat */
-        ret = glXGetFBConfigAttrib(ctx->dpy, fbc[i], GLX_CONFIG_CAVEAT, &value);
-        if (Success != ret)
-        {
-          fprintf(file, "???? |");
-        }
-        else
-        {
-          if (GLX_NONE == value)
-            fprintf(file, "none |\n");
-          else if (GLX_SLOW_CONFIG == value)
-            fprintf(file, "slow |\n");
-          else if (GLX_NON_CONFORMANT_CONFIG == value)
-            fprintf(file, "ncft |\n");
-          else
-            fprintf(file, "???? |\n");
-        }
-      }
-      /* print table footer */
-      fprintf(file, " +-----+-------------------------+-----------------+----------+-------------+-------+------+\n");
-      fprintf(file, " |  id | tp xr cl fm db st lv xp |  sz  r  g  b  a | bf th cl | r  g  b  a  | ns  b |  eat |\n");
-      fprintf(file, " |     |        visual           |      color      | ax dp st |    accum    |   ms  |  cav |\n");
-      fprintf(file, " +-----+-------------------------+-----------------+----------+-------------+-------+------+\n");
-    }
-  }
-}
-
-#endif
-
-/* ------------------------------------------------------------------------ */
-
-#if defined(_WIN32)
-
-void InitContext (GLContext* ctx)
-{
-  ctx->wnd = NULL;
-  ctx->dc = NULL;
-  ctx->rc = NULL;
-}
-
-GLboolean CreateContext (GLContext* ctx)
-{
-  WNDCLASS wc;
-  PIXELFORMATDESCRIPTOR pfd;
-  /* check for input */
-  if (NULL == ctx) return GL_TRUE;
-  /* register window class */
-  ZeroMemory(&wc, sizeof(WNDCLASS));
-  wc.hInstance = GetModuleHandle(NULL);
-  wc.lpfnWndProc = DefWindowProc;
-  wc.lpszClassName = "GLEW";
-  if (0 == RegisterClass(&wc)) return GL_TRUE;
-  /* create window */
-  ctx->wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, 
-                          CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, 
-                          GetModuleHandle(NULL), NULL);
-  if (NULL == ctx->wnd) return GL_TRUE;
-  /* get the device context */
-  ctx->dc = GetDC(ctx->wnd);
-  if (NULL == ctx->dc) return GL_TRUE;
-  /* find pixel format */
-  ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR));
-  if (visual == -1) /* find default */
-  {
-    pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
-    pfd.nVersion = 1;
-    pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
-    visual = ChoosePixelFormat(ctx->dc, &pfd);
-    if (0 == visual) return GL_TRUE;
-  }
-  /* set the pixel format for the dc */
-  if (FALSE == SetPixelFormat(ctx->dc, visual, &pfd)) return GL_TRUE;
-  /* create rendering context */
-  ctx->rc = wglCreateContext(ctx->dc);
-  if (NULL == ctx->rc) return GL_TRUE;
-  if (FALSE == wglMakeCurrent(ctx->dc, ctx->rc)) return GL_TRUE;
-  return GL_FALSE;
-}
-
-void DestroyContext (GLContext* ctx)
-{
-  if (NULL == ctx) return;
-  if (NULL != ctx->rc) wglMakeCurrent(NULL, NULL);
-  if (NULL != ctx->rc) wglDeleteContext(wglGetCurrentContext());
-  if (NULL != ctx->wnd && NULL != ctx->dc) ReleaseDC(ctx->wnd, ctx->dc);
-  if (NULL != ctx->wnd) DestroyWindow(ctx->wnd);
-  UnregisterClass("GLEW", GetModuleHandle(NULL));
-}
-
-/* ------------------------------------------------------------------------ */
-
-#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-
-void InitContext (GLContext* ctx)
-{
-  ctx->ctx = NULL;
-  ctx->octx = NULL;
-}
-
-GLboolean CreateContext (GLContext* ctx)
-{
-  int attrib[] = { AGL_RGBA, AGL_NONE };
-  AGLPixelFormat pf;
-  /* check input */
-  if (NULL == ctx) return GL_TRUE;
-  /*int major, minor;
-  SetPortWindowPort(wnd);
-  aglGetVersion(&major, &minor);
-  fprintf(stderr, "GL %d.%d\n", major, minor);*/
-  pf = aglChoosePixelFormat(NULL, 0, attrib);
-  if (NULL == pf) return GL_TRUE;
-  ctx->ctx = aglCreateContext(pf, NULL);
-  if (NULL == ctx->ctx || AGL_NO_ERROR != aglGetError()) return GL_TRUE;
-  aglDestroyPixelFormat(pf);
-  /*aglSetDrawable(ctx, GetWindowPort(wnd));*/
-  ctx->octx = aglGetCurrentContext();
-  if (GL_FALSE == aglSetCurrentContext(ctx->ctx)) return GL_TRUE;
-  return GL_FALSE;
-}
-
-void DestroyContext (GLContext* ctx)
-{
-  if (NULL == ctx) return;
-  aglSetCurrentContext(ctx->octx);
-  if (NULL != ctx->ctx) aglDestroyContext(ctx->ctx);
-}
-
-/* ------------------------------------------------------------------------ */
-
-#else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
-
-void InitContext (GLContext* ctx)
-{
-  ctx->dpy = NULL;
-  ctx->vi = NULL;
-  ctx->ctx = NULL;
-  ctx->wnd = 0;
-  ctx->cmap = 0;
-}
-
-GLboolean CreateContext (GLContext* ctx)
-{
-  int attrib[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
-  int erb, evb;
-  XSetWindowAttributes swa;
-  /* check input */
-  if (NULL == ctx) return GL_TRUE;
-  /* open display */
-  ctx->dpy = XOpenDisplay(display);
-  if (NULL == ctx->dpy) return GL_TRUE;
-  /* query for glx */
-  if (!glXQueryExtension(ctx->dpy, &erb, &evb)) return GL_TRUE;
-  /* choose visual */
-  ctx->vi = glXChooseVisual(ctx->dpy, DefaultScreen(ctx->dpy), attrib);
-  if (NULL == ctx->vi) return GL_TRUE;
-  /* create context */
-  ctx->ctx = glXCreateContext(ctx->dpy, ctx->vi, None, True);
-  if (NULL == ctx->ctx) return GL_TRUE;
-  /* create window */
-  /*wnd = XCreateSimpleWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, 1, 1, 1, 0, 0);*/
-  ctx->cmap = XCreateColormap(ctx->dpy, RootWindow(ctx->dpy, ctx->vi->screen),
-                              ctx->vi->visual, AllocNone);
-  swa.border_pixel = 0;
-  swa.colormap = ctx->cmap;
-  ctx->wnd = XCreateWindow(ctx->dpy, RootWindow(ctx->dpy, ctx->vi->screen), 
-                           0, 0, 1, 1, 0, ctx->vi->depth, InputOutput, ctx->vi->visual, 
-                           CWBorderPixel | CWColormap, &swa);
-  /* make context current */
-  if (!glXMakeCurrent(ctx->dpy, ctx->wnd, ctx->ctx)) return GL_TRUE;
-  return GL_FALSE;
-}
-
-void DestroyContext (GLContext* ctx)
-{
-  if (NULL != ctx->dpy && NULL != ctx->ctx) glXDestroyContext(ctx->dpy, ctx->ctx);
-  if (NULL != ctx->dpy && 0 != ctx->wnd) XDestroyWindow(ctx->dpy, ctx->wnd);
-  if (NULL != ctx->dpy && 0 != ctx->cmap) XFreeColormap(ctx->dpy, ctx->cmap);
-  if (NULL != ctx->vi) XFree(ctx->vi);
-  if (NULL != ctx->dpy) XCloseDisplay(ctx->dpy);
-}
-
-#endif /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
-
-GLboolean ParseArgs (int argc, char** argv)
-{
-  int p = 0;
-  while (p < argc)
-  {
-#if defined(_WIN32)
-    if (!strcmp(argv[p], "-pf") || !strcmp(argv[p], "-pixelformat"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      display = NULL;
-      visual = strtol(argv[p], NULL, 0);
-    }
-    else if (!strcmp(argv[p], "-a"))
-    {
-      showall = 1;
-    }
-    else if (!strcmp(argv[p], "-s"))
-    {
-      displaystdout = 1;
-    }
-    else if (!strcmp(argv[p], "-h"))
-    {
-      return GL_TRUE;
-    }
-    else
-      return GL_TRUE;
-#else
-    if (!strcmp(argv[p], "-display"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      display = argv[p];
-    }
-    else if (!strcmp(argv[p], "-visual"))
-    {
-      if (++p >= argc) return GL_TRUE;
-      visual = (int)strtol(argv[p], NULL, 0);
-    }
-    else if (!strcmp(argv[p], "-h"))
-    {
-      return GL_TRUE;
-    }
-    else
-      return GL_TRUE;
-#endif
-    p++;
-  }
-  return GL_FALSE;
-}
diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj
index 76b75cdc4c..e89fde653c 100644
--- a/Externals/LZO/LZO.vcxproj
+++ b/Externals/LZO/LZO.vcxproj
@@ -1,148 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}</ProjectGuid>
-    <RootNamespace>LZO</RootNamespace>
+    <ProjectGuid>{AB993F38-C31D-4897-B139-A620C42BC565}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="lzoconf.h" />
     <ClInclude Include="lzodefs.h" />
     <ClInclude Include="minilzo.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="minilzo.c" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <None Include="README.LZO" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Externals/LZO/LZO.vcxproj.filters b/Externals/LZO/LZO.vcxproj.filters
deleted file mode 100644
index 889fdb14a0..0000000000
--- a/Externals/LZO/LZO.vcxproj.filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="lzoconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="minilzo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="lzodefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{a40ddc0f-650c-440f-9a85-52fd8dc26122}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{65dbafef-bdb1-4bbc-8ebc-08f69f8f5f3a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="minilzo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/OpenAL/Win32/EFX-Util.lib b/Externals/OpenAL/Win32/EFX-Util.lib
deleted file mode 100644
index 94ab9c817a..0000000000
Binary files a/Externals/OpenAL/Win32/EFX-Util.lib and /dev/null differ
diff --git a/Externals/OpenAL/Win32/OpenAL32.dll b/Externals/OpenAL/Win32/OpenAL32.dll
deleted file mode 100644
index 71ced6a21f..0000000000
Binary files a/Externals/OpenAL/Win32/OpenAL32.dll and /dev/null differ
diff --git a/Externals/OpenAL/Win32/OpenAL32.lib b/Externals/OpenAL/Win32/OpenAL32.lib
deleted file mode 100644
index d635de97ef..0000000000
Binary files a/Externals/OpenAL/Win32/OpenAL32.lib and /dev/null differ
diff --git a/Externals/OpenAL/Win64/EFX-Util.lib b/Externals/OpenAL/Win64/EFX-Util.lib
deleted file mode 100644
index 5c5e98177a..0000000000
Binary files a/Externals/OpenAL/Win64/EFX-Util.lib and /dev/null differ
diff --git a/Externals/OpenAL/Win64/OpenAL32.dll b/Externals/OpenAL/Win64/OpenAL32.dll
deleted file mode 100644
index b47ff952b7..0000000000
Binary files a/Externals/OpenAL/Win64/OpenAL32.dll and /dev/null differ
diff --git a/Externals/OpenAL/Win64/OpenAL32.lib b/Externals/OpenAL/Win64/OpenAL32.lib
deleted file mode 100644
index 17663e0a38..0000000000
Binary files a/Externals/OpenAL/Win64/OpenAL32.lib and /dev/null differ
diff --git a/Externals/OpenAL/include/EFX-Util.h b/Externals/OpenAL/include/EFX-Util.h
deleted file mode 100644
index b4a6b4e2d8..0000000000
--- a/Externals/OpenAL/include/EFX-Util.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************\
-*                                                                   *
-*  EFX-UTIL.H - EFX Utilities functions and Reverb Presets          *
-*                                                                   *
-*               File revision 1.0                                   *
-*                                                                   *
-\*******************************************************************/
-
-#ifndef EAXVECTOR_DEFINED
-#define EAXVECTOR_DEFINED
-typedef struct _EAXVECTOR {
-	float x;
-	float y;
-	float z;
-} EAXVECTOR;
-#endif
-
-#ifndef EAXREVERBPROPERTIES_DEFINED
-#define EAXREVERBPROPERTIES_DEFINED
-typedef struct _EAXREVERBPROPERTIES
-{
-    unsigned long ulEnvironment;
-    float flEnvironmentSize;
-    float flEnvironmentDiffusion;
-    long lRoom;
-    long lRoomHF;
-    long lRoomLF;
-    float flDecayTime;
-    float flDecayHFRatio;
-    float flDecayLFRatio;
-    long lReflections;
-    float flReflectionsDelay;
-    EAXVECTOR vReflectionsPan;
-    long lReverb;
-    float flReverbDelay;
-    EAXVECTOR vReverbPan;
-    float flEchoTime;
-    float flEchoDepth;
-    float flModulationTime;
-    float flModulationDepth;
-    float flAirAbsorptionHF;
-    float flHFReference;
-    float flLFReference;
-    float flRoomRolloffFactor;
-    unsigned long ulFlags;
-} EAXREVERBPROPERTIES, *LPEAXREVERBPROPERTIES;
-#endif
-
-#ifndef EFXEAXREVERBPROPERTIES_DEFINED
-#define EFXEAXREVERBPROPERTIES_DEFINED
-typedef struct
-{
-	float flDensity;
-	float flDiffusion;
-	float flGain;
-	float flGainHF;
-	float flGainLF;
-	float flDecayTime;
-	float flDecayHFRatio;
-	float flDecayLFRatio;
-	float flReflectionsGain;
-	float flReflectionsDelay;
-	float flReflectionsPan[3];
-	float flLateReverbGain;
-	float flLateReverbDelay;
-	float flLateReverbPan[3];
-	float flEchoTime;
-	float flEchoDepth;
-	float flModulationTime;
-	float flModulationDepth;
-	float flAirAbsorptionGainHF;
-	float flHFReference;
-	float flLFReference;
-	float flRoomRolloffFactor;
-	int	iDecayHFLimit;
-} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES;
-#endif
-
-#ifndef EAXOBSTRUCTIONPROPERTIES_DEFINED
-#define EAXOBSTRUCTIONPROPERTIES_DEFINED
-typedef struct _EAXOBSTRUCTIONPROPERTIES
-{
-    long          lObstruction;
-    float         flObstructionLFRatio;
-} EAXOBSTRUCTIONPROPERTIES, *LPEAXOBSTRUCTIONPROPERTIES;
-#endif
-
-#ifndef EAXOCCLUSIONPROPERTIES_DEFINED
-#define EAXOCCLUSIONPROPERTIES_DEFINED
-typedef struct _EAXOCCLUSIONPROPERTIES
-{
-    long          lOcclusion;
-    float         flOcclusionLFRatio;
-    float         flOcclusionRoomRatio;
-    float         flOcclusionDirectRatio;
-} EAXOCCLUSIONPROPERTIES, *LPEAXOCCLUSIONPROPERTIES;
-#endif
-
-#ifndef EAXEXCLUSIONPROPERTIES_DEFINED
-#define EAXEXCLUSIONPROPERTIES_DEFINED
-typedef struct _EAXEXCLUSIONPROPERTIES
-{
-    long          lExclusion;
-    float         flExclusionLFRatio;
-} EAXEXCLUSIONPROPERTIES, *LPEAXEXCLUSIONPROPERTIES;
-#endif
-
-#ifndef EFXLOWPASSFILTER_DEFINED
-#define EFXLOWPASSFILTER_DEFINED
-typedef struct _EFXLOWPASSFILTER
-{
-	float		flGain;
-	float		flGainHF;
-} EFXLOWPASSFILTER, *LPEFXLOWPASSFILTER;
-#endif
-
-void ConvertReverbParameters(EAXREVERBPROPERTIES *pEAXProp, EFXEAXREVERBPROPERTIES *pEFXEAXReverb);
-void ConvertObstructionParameters(EAXOBSTRUCTIONPROPERTIES *pObProp, EFXLOWPASSFILTER *pDirectLowPassFilter);
-void ConvertExclusionParameters(EAXEXCLUSIONPROPERTIES *pExProp, EFXLOWPASSFILTER *pSendLowPassFilter);
-void ConvertOcclusionParameters(EAXOCCLUSIONPROPERTIES *pOcProp, EFXLOWPASSFILTER *pDirectLowPassFilter, EFXLOWPASSFILTER *pSendLowPassFilter);
-
-
-/***********************************************************************************************\
-*
-* EAX Reverb Presets in legacy format - use ConvertReverbParameters() to convert to
-* EFX EAX Reverb Presets for use with the OpenAL Effects Extension.
-*
-************************************************************************************************/
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_GENERIC \
-	{0,		7.5f,	1.000f,	-1000,	-100,	0,		1.49f,	0.83f,	1.00f,	-2602,	0.007f,	0.00f,0.00f,0.00f,	200,	0.011f,		0.00f,0.00f,0.00f,	0.250f,	0.000f,	0.250f,	0.000f,	-5.0f,	5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_PADDEDCELL \
-	{1,		1.4f,	1.000f,	-1000,	-6000,	0,		0.17f,	0.10f,	1.00f,	-1204,	0.001f, 0.00f,0.00f,0.00f,  207,	0.002f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,	5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_ROOM \
-	{2,		1.9f,	1.000f,	-1000,	-454,	0,		0.40f,	0.83f,	1.00f,  -1646,	0.002f, 0.00f,0.00f,0.00f,	53,		0.003f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_BATHROOM \
-	{3,		1.4f,	1.000f,	-1000,  -1200,	0,		1.49f,	0.54f,	1.00f,  -370,	0.007f, 0.00f,0.00f,0.00f,	1030,	0.011f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_LIVINGROOM \
-	{4,		2.5f,	1.000f,	-1000,  -6000,	0,		0.50f,	0.10f,	1.00f,  -1376,	0.003f, 0.00f,0.00f,0.00f,	-1104,	0.004f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_STONEROOM \
-	{5,		11.6f,	1.000f,  -1000, -300,	0,		2.31f,	0.64f,	1.00f,	-711,	0.012f, 0.00f,0.00f,0.00f,	83,		0.017f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_AUDITORIUM \
-	{6,		21.6f,	1.000f,  -1000,	-476,	0,		4.32f,	0.59f,	1.00f,	-789,	0.020f, 0.00f,0.00f,0.00f,	-289,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f,	-5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_CONCERTHALL \
-	{7,		19.6f,	1.000f,  -1000,	-500,	0,		3.92f,	0.70f,	1.00f,  -1230,	0.020f, 0.00f,0.00f,0.00f,  -02,	0.029f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_CAVE \
-	{8,		14.6f,	1.000f,  -1000,	0,		0,		2.91f,	1.30f,	1.00f,  -602,	0.015f, 0.00f,0.00f,0.00f,	-302,	0.022f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,	0.00f,	0x1f }
-#define REVERB_PRESET_ARENA \
-	{9,		36.2f,	1.000f,  -1000,	-698,	0,		7.24f,	0.33f,	1.00f,  -1166,	0.020f, 0.00f,0.00f,0.00f,  16,		0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,	0.00f,	0x3f }
-#define REVERB_PRESET_HANGAR \
-	{10,	50.3f,	1.000f,  -1000,	-1000,	0,		10.05f, 0.23f,	1.00f,  -602,	0.020f, 0.00f,0.00f,0.00f,  198,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_CARPETTEDHALLWAY \
-	{11,	1.9f,	1.000f,	-1000,	-4000,	0,		0.30f,	0.10f,	1.00f,  -1831,	0.002f, 0.00f,0.00f,0.00f,	-1630,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_HALLWAY \
-	{12,	1.8f,	1.000f,	-1000,	-300,	0,		1.49f,	0.59f,	1.00f,  -1219,	0.007f, 0.00f,0.00f,0.00f,  441,	0.011f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_STONECORRIDOR \
-	{13,	13.5f,	1.000f,	-1000,	-237,	0,		2.70f,	0.79f,	1.00f,  -1214,	0.013f, 0.00f,0.00f,0.00f,  395,	0.020f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_ALLEY \
-	{14,	7.5f,	0.300f,	-1000,	-270,	0,		1.49f,	0.86f,	1.00f,  -1204,	0.007f, 0.00f,0.00f,0.00f,  -4,		0.011f,		0.00f,0.00f,0.00f,	0.125f, 0.950f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_FOREST \
-	{15,	38.0f,	0.300f,	-1000,	-3300,	0,		1.49f,	0.54f,	1.00f,  -2560,	0.162f, 0.00f,0.00f,0.00f,	-229,	0.088f,		0.00f,0.00f,0.00f,	0.125f, 1.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_CITY \
-	{16,	7.5f,	0.500f,	-1000,	-800,	0,		1.49f,	0.67f,	1.00f,  -2273,	0.007f, 0.00f,0.00f,0.00f,	-1691,	0.011f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_MOUNTAINS \
-	{17,	100.0f, 0.270f,	-1000,	-2500,	0,		1.49f,	0.21f,	1.00f,  -2780,	0.300f, 0.00f,0.00f,0.00f,	-1434,	0.100f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x1f }
-#define REVERB_PRESET_QUARRY \
-	{18,	17.5f,	1.000f,	-1000,	-1000,	0,		1.49f,	0.83f,	1.00f,	-10000, 0.061f, 0.00f,0.00f,0.00f,  500,	0.025f,		0.00f,0.00f,0.00f,	0.125f, 0.700f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_PLAIN \
-	{19,	42.5f,	0.210f,	-1000,	-2000,	0,		1.49f,	0.50f,	1.00f,  -2466,	0.179f, 0.00f,0.00f,0.00f,	-1926,	0.100f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_PARKINGLOT \
-	{20,	8.3f,	1.000f,	-1000,	0,		0,		1.65f,	1.50f,	1.00f,  -1363,	0.008f, 0.00f,0.00f,0.00f,	-1153,	0.012f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x1f }
-#define REVERB_PRESET_SEWERPIPE \
-	{21,	1.7f,	0.800f,	-1000,	-1000,	0,		2.81f,	0.14f,	1.00f,	429,	0.014f, 0.00f,0.00f,0.00f,	1023,	0.021f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_UNDERWATER \
-	{22,	1.8f,	1.000f,	-1000,  -4000,	0,		1.49f,	0.10f,	1.00f,  -449,	0.007f, 0.00f,0.00f,0.00f,	1700,	0.011f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 1.180f, 0.348f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_DRUGGED \
-	{23,	1.9f,	0.500f,	-1000,	0,		0,		8.39f,	1.39f,	1.00f,  -115,	0.002f, 0.00f,0.00f,0.00f,  985,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 1.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x1f }
-#define REVERB_PRESET_DIZZY \
-	{24,	1.8f,	0.600f,	-1000,	-400,	0,		17.23f, 0.56f,	1.00f,  -1713,	0.020f, 0.00f,0.00f,0.00f,	-613,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.810f, 0.310f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x1f }
-#define REVERB_PRESET_PSYCHOTIC \
-	{25,	1.0f,	0.500f,	-1000,	-151,	0,		7.56f,	0.91f,	1.00f,  -626,	0.020f, 0.00f,0.00f,0.00f,  774,	0.030f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 4.000f, 1.000f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x1f }
-
-
-// CASTLE PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_CASTLE_SMALLROOM \
-	{ 26,   8.3f,	0.890f,	-1000,	-800,	-2000,	1.22f,	0.83f,	0.31f,	-100,	0.022f,	0.00f,0.00f,0.00f,	600,	0.011f,		0.00f,0.00f,0.00f,	0.138f,	0.080f,	0.250f,	0.000f,	-5.0f,	5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_SHORTPASSAGE \
-	{ 26,   8.3f,	0.890f, -1000,  -1000,  -2000,  2.32f,	0.83f,	0.31f,	-100,	0.007f, 0.00f,0.00f,0.00f,  200,		0.023f,		0.00f,0.00f,0.00f,	0.138f, 0.080f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_MEDIUMROOM \
-	{ 26,   8.3f,	0.930f, -1000,  -1100,  -2000,  2.04f,	0.83f,	0.46f,  -400,	0.022f, 0.00f,0.00f,0.00f,	400,	0.011f,		0.00f,0.00f,0.00f,	0.155f, 0.030f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_LONGPASSAGE \
-	{ 26,   8.3f,	0.890f, -1000,  -800,	-2000,  3.42f,	0.83f,	0.31f,  -100,	0.007f, 0.00f,0.00f,0.00f,	300,	0.023f,		0.00f,0.00f,0.00f,	0.138f, 0.080f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_LARGEROOM \
-	{ 26,   8.3f,	0.820f, -1000,  -1100,  -1800,  2.53f,	0.83f,	0.50f,  -700,	0.034f, 0.00f,0.00f,0.00f,	200,		0.016f,		0.00f,0.00f,0.00f,	0.185f, 0.070f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_HALL \
-	{ 26,   8.3f,	0.810f, -1000,  -1100,  -1500,  3.14f,	0.79f,	0.62f,  -1500,	0.056f, 0.00f,0.00f,0.00f,	100,	0.024f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_CUPBOARD \
-	{ 26,   8.3f,	0.890f, -1000,  -1100,  -2000,  0.67f,	0.87f,	0.31f,  300,	0.010f,	0.00f,0.00f,0.00f,	1100,	0.007f,		0.00f,0.00f,0.00f,	0.138f, 0.080f, 0.250f, 0.000f, -5.0f,  5168.6f,	139.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_CASTLE_COURTYARD \
-	{ 26,   8.3f,	0.420f, -1000,  -700,   -1400,	2.13f,	0.61f,	0.23f,  -1300,	0.160f, 0.00f,0.00f,0.00f,	-300,	0.036f,		0.00f,0.00f,0.00f,	0.250f, 0.370f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x1f }
-#define REVERB_PRESET_CASTLE_ALCOVE \
-	{ 26,   8.3f,	0.890f,	-1000,  -600,	-2000,  1.64f,	0.87f,	0.31f,  00,	0.007f, 0.00f,0.00f,0.00f,		300,	0.034f,		0.00f,0.00f,0.00f,	0.138f, 0.080f, 0.250f, 0.000f, -5.0f,	5168.6f,	139.5f,  0.00f, 0x20 }
-
-
-// FACTORY PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_FACTORY_ALCOVE \
-	{ 26,   1.8f,	0.590f,  -1200, -200,   -600,	3.14f,	0.65f,	1.31f,  300,	0.010f, 0.00f,0.00f,0.00f,	000,	0.038f,		0.00f,0.00f,0.00f,	0.114f, 0.100f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_SHORTPASSAGE \
-	{ 26,   1.8f,	0.640f,  -1200, -200,   -600,	2.53f,	0.65f,	1.31f,  0,		0.010f, 0.00f,0.00f,0.00f,	200,	0.038f,		0.00f,0.00f,0.00f,	0.135f, 0.230f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_MEDIUMROOM \
-	{ 26,   1.9f,	0.820f,  -1200, -200,   -600,	2.76f,	0.65f,	1.31f,  -1100,	0.022f, 0.00f,0.00f,0.00f,	300,	0.023f,		0.00f,0.00f,0.00f,	0.174f, 0.070f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_LONGPASSAGE \
-	{ 26,   1.8f,	0.640f,  -1200, -200,   -600,	4.06f,	0.65f,	1.31f,  0,		0.020f, 0.00f,0.00f,0.00f,	200,	0.037f,		0.00f,0.00f,0.00f,	0.135f, 0.230f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_LARGEROOM \
-	{ 26,   1.9f,	0.750f,  -1200, -300,   -400,	4.24f,	0.51f,	1.31f,  -1500,	0.039f, 0.00f,0.00f,0.00f,	100,		0.023f,		0.00f,0.00f,0.00f,	0.231f, 0.070f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_HALL \
-	{ 26,   1.9f,	0.750f,  -1000, -300,   -400,	7.43f,	0.51f,	1.31f,  -2400,	0.073f, 0.00f,0.00f,0.00f,	-100,	0.027f,		0.00f,0.00f,0.00f,	0.250f, 0.070f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_CUPBOARD \
-	{ 26,   1.7f,	0.630f,  -1200, -200,   -600,	0.49f,	0.65f,	1.31f,  200,	0.010f, 0.00f,0.00f,0.00f,	600,	0.032f,		0.00f,0.00f,0.00f,	0.107f, 0.070f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_COURTYARD \
-	{ 26,   1.7f,	0.570f,  -1000, -1000,  -400,	2.32f,	0.29f,	0.56f,  -1300,	0.140f, 0.00f,0.00f,0.00f,	-800,	0.039f,		0.00f,0.00f,0.00f,	0.250f, 0.290f, 0.250f, 0.000f, -5.0f,  3762.6f,	362.5f,  0.00f, 0x20 }
-#define REVERB_PRESET_FACTORY_SMALLROOM \
-	{ 26,   1.8f,	0.820f,  -1000,	-200,   -600,	1.72f,	0.65f,	1.31f,  -300,	0.010f, 0.00f,0.00f,0.00f,	500,	0.024f,		0.00f,0.00f,0.00f,	0.119f, 0.070f, 0.250f, 0.000f, -5.0f,	3762.6f,	362.5f,  0.00f, 0x20 }
-
-
-// ICE PALACE PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_ICEPALACE_ALCOVE \
-	{ 26,   2.7f,	0.840f, -1000,  -500,	-1100,  2.76f,	1.46f,	0.28f,  100,	0.010f, 0.00f,0.00f,0.00f,	-100,	0.030f,		0.00f,0.00f,0.00f,	0.161f, 0.090f, 0.250f, 0.000f,	-5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_SHORTPASSAGE \
-	{ 26,   2.7f,	0.750f, -1000,  -500,	-1100,  1.79f,	1.46f,	0.28f,  -600,	0.010f, 0.00f,0.00f,0.00f,	100,		0.019f,		0.00f,0.00f,0.00f,	0.177f, 0.090f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_MEDIUMROOM \
-	{ 26,   2.7f,	0.870f, -1000,  -500,   -700,	2.22f,	1.53f,	0.32f,  -800,	0.039f, 0.00f,0.00f,0.00f,	100,	0.027f,		0.00f,0.00f,0.00f,	0.186f, 0.120f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_LONGPASSAGE \
-	{ 26,   2.7f,	0.770f, -1000,  -500,   -800,	3.01f,	1.46f,	0.28f,  -200,	0.012f, 0.00f,0.00f,0.00f,	200,	0.025f,		0.00f,0.00f,0.00f,	0.186f, 0.040f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_LARGEROOM \
-	{ 26,   2.9f,	0.810f, -1000,  -500,   -700,	3.14f,	1.53f,	0.32f,  -1200,	0.039f, 0.00f,0.00f,0.00f,	000,	0.027f,		0.00f,0.00f,0.00f,	0.214f, 0.110f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_HALL \
-	{ 26,   2.9f,	0.760f, -1000,  -700,   -500,	5.49f,	1.53f,	0.38f,  -1900,	0.054f, 0.00f,0.00f,0.00f,	-400,	0.052f,		0.00f,0.00f,0.00f,	0.226f, 0.110f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_CUPBOARD \
-	{ 26,   2.7f,	0.830f, -1000,  -600,	-1300,  0.76f,	1.53f,	0.26f,  100,	0.012f, 0.00f,0.00f,0.00f,	600,	0.016f,		0.00f,0.00f,0.00f,	0.143f, 0.080f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_COURTYARD \
-	{ 26,   2.9f,	0.590f, -1000,  -1100,  -1000,  2.04f,	1.20f,	0.38f,  -1000,	0.173f, 0.00f,0.00f,0.00f,	-1000,	0.043f,		0.00f,0.00f,0.00f,	0.235f, 0.480f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-#define REVERB_PRESET_ICEPALACE_SMALLROOM \
-	{ 26,   2.7f,	0.840f, -1000,  -500,	-1100,  1.51f,	1.53f,	0.27f,	-100,	0.010f, 0.00f,0.00f,0.00f,	300,	0.011f,		0.00f,0.00f,0.00f,	0.164f, 0.140f, 0.250f, 0.000f, -5.0f,	12428.5f,	99.6f,  0.00f,	0x20 }
-
-
-// SPACE STATION PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_SPACESTATION_ALCOVE \
-	{ 26,   1.5f,	0.780f, -1000,  -300,   -100,	1.16f,	0.81f,	0.55f,  300,	0.007f, 0.00f,0.00f,0.00f,	000,	0.018f,		0.00f,0.00f,0.00f,	0.192f, 0.210f, 0.250f, 0.000f,	-5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_MEDIUMROOM \
-	{ 26,   1.5f,	0.750f, -1000,  -400,   -100,	3.01f,	0.50f,	0.55f,  -800,	0.034f, 0.00f,0.00f,0.00f,	100,		0.035f,		0.00f,0.00f,0.00f,	0.209f, 0.310f, 0.250f, 0.000f,	-5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_SHORTPASSAGE \
-	{ 26,   1.5f,	0.870f, -1000,  -400,   -100,	3.57f,	0.50f,	0.55f,  0,		0.012f, 0.00f,0.00f,0.00f,	100,		0.016f,		0.00f,0.00f,0.00f,	0.172f, 0.200f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_LONGPASSAGE \
-	{ 26,   1.9f,	0.820f, -1000,  -400,   -100,	4.62f,	0.62f,	0.55f,  0,		0.012f, 0.00f,0.00f,0.00f,	200,		0.031f,		0.00f,0.00f,0.00f,	0.250f, 0.230f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_LARGEROOM \
-	{ 26,   1.8f,	0.810f, -1000,  -400,   -100,	3.89f,	0.38f,	0.61f,  -1000,	0.056f, 0.00f,0.00f,0.00f,	-100,	0.035f,		0.00f,0.00f,0.00f,	0.233f, 0.280f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_HALL \
-	{ 26,   1.9f,	0.870f, -1000,  -400,   -100,	7.11f,	0.38f,	0.61f,  -1500,	0.100f, 0.00f,0.00f,0.00f,	-400,	0.047f,		0.00f,0.00f,0.00f,	0.250f, 0.250f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_CUPBOARD \
-	{ 26,   1.4f,	0.560f, -1000,  -300,   -100,	0.79f,	0.81f,	0.55f,  300,	0.007f, 0.00f,0.00f,0.00f,	500,	0.018f,		0.00f,0.00f,0.00f,	0.181f, 0.310f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPACESTATION_SMALLROOM \
-	{ 26,   1.5f,	0.700f, -1000,  -300,   -100,	1.72f,	0.82f,	0.55f,	-200,	0.007f, 0.00f,0.00f,0.00f,	300,	0.013f,		0.00f,0.00f,0.00f,	0.188f, 0.260f, 0.250f, 0.000f, -5.0f,  3316.1f,	458.2f,  0.00f, 0x20 }
-
-
-// WOODEN GALLEON PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_WOODEN_ALCOVE \
-	{ 26,   7.5f,	1.000f, -1000,  -1800,  -1000,  1.22f,	0.62f,	0.91f,	100,	0.012f, 0.00f,0.00f,0.00f,	-300,	0.024f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_SHORTPASSAGE \
-	{ 26,   7.5f,	1.000f, -1000,  -1800,  -1000,  1.75f,	0.50f,	0.87f,	-100,	0.012f, 0.00f,0.00f,0.00f,	-400,	0.024f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_MEDIUMROOM \
-	{ 26,   7.5f,	1.000f, -1000,  -2000,  -1100,  1.47f,	0.42f,	0.82f,	-100,	0.049f, 0.00f,0.00f,0.00f,	-100,	0.029f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_LONGPASSAGE \
-	{ 26,   7.5f,	1.000f, -1000,  -2000,  -1000,  1.99f,	0.40f,	0.79f,	000,	0.020f, 0.00f,0.00f,0.00f,	-700,	0.036f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_LARGEROOM \
-	{ 26,   7.5f,	1.000f, -1000,  -2100,  -1100,  2.65f,	0.33f,	0.82f,	-100,	0.066f, 0.00f,0.00f,0.00f,	-200,	0.049f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_HALL \
-	{ 26,   7.5f,	1.000f, -1000,  -2200,  -1100,  3.45f,	0.30f,	0.82f,	-100,	0.088f, 0.00f,0.00f,0.00f,	-200,	0.063f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_CUPBOARD \
-	{ 26,   7.5f,	1.000f, -1000,  -1700,  -1000,  0.56f,	0.46f,	0.91f,	100,	0.012f, 0.00f,0.00f,0.00f,	100,	0.028f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_SMALLROOM \
-	{ 26,   7.5f,	1.000f, -1000,  -1900,  -1000,  0.79f,	0.32f,	0.87f,	00,		0.032f, 0.00f,0.00f,0.00f,	-100,	0.029f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-#define REVERB_PRESET_WOODEN_COURTYARD \
-	{ 26,   7.5f,	0.650f, -1000,  -2200,  -1000,  1.79f,	0.35f,	0.79f,	-500,	0.123f, 0.00f,0.00f,0.00f,	-2000,	0.032f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  4705.0f,	99.6f,  0.00f,	0x3f }
-
-
-// SPORTS PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_SPORT_EMPTYSTADIUM \
-	{ 26,   7.2f,	1.000f, -1000,  -700,   -200,	6.26f,	0.51f,	1.10f,  -2400,	0.183f, 0.00f,0.00f,0.00f,	-800,	0.038f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPORT_SQUASHCOURT \
-	{ 26,   7.5f,	0.750f, -1000,  -1000,  -200,	2.22f,	0.91f,	1.16f,  -700,	0.007f, 0.00f,0.00f,0.00f,	-200,	0.011f,		0.00f,0.00f,0.00f,	0.126f, 0.190f, 0.250f, 0.000f, -5.0f,  7176.9f,	211.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \
-	{ 26,  36.2f,	0.700f, -1000,  -200,   -100,	2.76f,	1.25f,	1.14f,  -400,	0.020f, 0.00f,0.00f,0.00f,	-200,	0.030f,		0.00f,0.00f,0.00f,	0.179f, 0.150f, 0.895f, 0.190f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x0 }
-#define REVERB_PRESET_SPORT_LARGESWIMMINGPOOL\
-	{ 26,  36.2f,	0.820f, -1000,  -200,   0,		5.49f,	1.31f,	1.14f,  -700,	0.039f, 0.00f,0.00f,0.00f,	-600,	0.049f,		0.00f,0.00f,0.00f,	0.222f, 0.550f, 1.159f, 0.210f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x0 }
-#define REVERB_PRESET_SPORT_GYMNASIUM \
-	{ 26,   7.5f,	0.810f, -1000,  -700,   -100,	3.14f,	1.06f,	1.35f,  -800,	0.029f, 0.00f,0.00f,0.00f,	-500,	0.045f,		0.00f,0.00f,0.00f,	0.146f, 0.140f, 0.250f, 0.000f, -5.0f,  7176.9f,	211.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPORT_FULLSTADIUM \
-	{ 26,   7.2f,	1.000f, -1000,  -2300,  -200,	5.25f,	0.17f,	0.80f,  -2000,	0.188f, 0.00f,0.00f,0.00f,	-1100,	0.038f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_SPORT_STADIUMTANNOY \
-	{ 26,   3.0f,	0.780f, -1000,   -500,   -600,	2.53f,	0.88f,	0.68f,  -1100,	0.230f, 0.00f,0.00f,0.00f,	-600,	0.063f,		0.00f,0.00f,0.00f,	0.250f, 0.200f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-
-
-// PREFAB PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_PREFAB_WORKSHOP \
-	{ 26,   1.9f,	1.000f, -1000,  -1700,  -800,	0.76f,	1.00f,	1.00f,	0,		0.012f, 0.00f,0.00f,0.00f,	100,		0.012f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x0 }
-#define REVERB_PRESET_PREFAB_SCHOOLROOM \
-	{ 26,   1.86f,	0.690f, -1000,  -400,   -600,	0.98f,	0.45f,	0.18f,  300,	0.017f, 0.00f,0.00f,0.00f,  300,	0.015f,		0.00f,0.00f,0.00f,	0.095f, 0.140f, 0.250f, 0.000f, -5.0f,  7176.9f,	211.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_PREFAB_PRACTISEROOM \
-	{ 26,   1.86f,	0.870f, -1000,  -800,   -600,	1.12f,	0.56f,	0.18f,  200,	0.010f, 0.00f,0.00f,0.00f,	300,	0.011f,		0.00f,0.00f,0.00f,	0.095f, 0.140f, 0.250f, 0.000f, -5.0f,  7176.9f,	211.2f,  0.00f, 0x20 }
-#define REVERB_PRESET_PREFAB_OUTHOUSE \
-	{ 26,  80.3f,	0.820f, -1000,  -1900,  -1600,  1.38f,	0.38f,	0.35f,	-100,	0.024f, 0.00f,0.00f,-0.00f,	-400,	0.044f,		0.00f,0.00f,0.00f,	0.121f, 0.170f, 0.250f, 0.000f, -5.0f,  2854.4f,	107.5f,  0.00f, 0x0 }
-#define REVERB_PRESET_PREFAB_CARAVAN \
-	{ 26,   8.3f,	1.000f, -1000,  -2100,  -1800,  0.43f,	1.50f,	1.00f,  0,		0.012f, 0.00f,0.00f,0.00f,	600,	0.012f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x1f }
-			// for US developers, a caravan is the same as a trailer =o)
-
-
-// DOME AND PIPE PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_DOME_TOMB \
-	{ 26,  51.8f,	0.790f, -1000,  -900,	-1300,  4.18f,	0.21f,	0.10f,  -825,	0.030f, 0.00f,0.00f,0.00f,	450,	0.022f,		0.00f,0.00f,0.00f,	0.177f, 0.190f, 0.250f, 0.000f,	-5.0f,  2854.4f,	20.0f,  0.00f,	0x0 }
-#define REVERB_PRESET_PIPE_SMALL \
-	{ 26,  50.3f,	1.000f, -1000,  -900,	-1300,  5.04f,	0.10f,	0.10f,  -600,	0.032f, 0.00f,0.00f,0.00f,	800,	0.015f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  2854.4f,	20.0f,  0.00f,	0x3f }
-#define REVERB_PRESET_DOME_SAINTPAULS \
-	{ 26,  50.3f,	0.870f, -1000,  -900,	-1300,  10.48f,	0.19f,	0.10f,  -1500,	0.090f, 0.00f,0.00f,0.00f,	200,	0.042f,		0.00f,0.00f,0.00f,	0.250f, 0.120f, 0.250f, 0.000f, -5.0f,  2854.4f,	20.0f,  0.00f,	0x3f }
-#define REVERB_PRESET_PIPE_LONGTHIN \
-	{ 26,   1.6f,	0.910f, -1000,  -700,	-1100,  9.21f,	0.18f,	0.10f,  -300,	0.010f, 0.00f,0.00f,0.00f,	-300,	0.022f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  2854.4f,	20.0f,  0.00f,	0x0 }
-#define REVERB_PRESET_PIPE_LARGE \
-	{ 26,  50.3f,	1.000f, -1000,  -900,	-1300,  8.45f,	0.10f,	0.10f,  -800,	0.046f, 0.00f,0.00f,0.00f,  400,	0.032f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  2854.4f,	20.0f,  0.00f,	0x3f }
-#define REVERB_PRESET_PIPE_RESONANT \
-	{ 26,   1.3f,	0.910f, -1000,  -700,	-1100,  6.81f,	0.18f,	0.10f,  -300,	0.010f, 0.00f,0.00f,0.00f,	00,		0.022f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,  2854.4f,	20.0f,  0.00f,	0x0 }
-
-
-// OUTDOORS PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_OUTDOORS_BACKYARD \
-	{ 26,  80.3f,	0.450f,	-1000,  -1200,  -600,	1.12f,	0.34f,	0.46f,  -700,	0.069f, 0.00f,0.00f,-0.00f,	-300,	0.023f,		0.00f,0.00f,0.00f,	0.218f, 0.340f, 0.250f, 0.000f,	-5.0f,  4399.1f,	242.9f,  0.00f, 0x0 }
-#define REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \
-	{ 26,  80.3f,	0.000f,	-1000,  -3900,  -400,	2.13f,	0.21f,	0.46f,  -1500,	0.300f, 0.00f,0.00f,-0.00f,	-700,	0.019f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.250f, 0.000f, -5.0f,  4399.1f,	242.9f,  0.00f, 0x0 }
-#define REVERB_PRESET_OUTDOORS_DEEPCANYON \
-	{ 26,  80.3f,	0.740f,	-1000,  -1500,  -400,	3.89f,	0.21f,	0.46f,  -1000,	0.223f, 0.00f,0.00f,-0.00f,	-900,	0.019f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.250f, 0.000f, -5.0f,  4399.1f,	242.9f,  0.00f, 0x0 }
-#define REVERB_PRESET_OUTDOORS_CREEK \
-	{ 26,  80.3f,	0.350f,	-1000,  -1500,  -600,	2.13f,	0.21f,	0.46f,  -800,	0.115f, 0.00f,0.00f,-0.00f,	-1400,	0.031f,		0.00f,0.00f,0.00f,	0.218f, 0.340f, 0.250f, 0.000f, -5.0f,  4399.1f,	242.9f,  0.00f, 0x0 }
-#define REVERB_PRESET_OUTDOORS_VALLEY \
-	{ 26,  80.3f,	0.280f,	-1000,  -3100,	-1600,  2.88f,	0.26f,	0.35f,  -1700,	0.263f, 0.00f,0.00f,-0.00f,	-800,	0.100f,		0.00f,0.00f,0.00f,	0.250f, 0.340f, 0.250f, 0.000f, -5.0f,  2854.4f,	107.5f,  0.00f, 0x0 }
-
-
-// MOOD PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_MOOD_HEAVEN \
-	{ 26,  19.6f,	0.940f,  -1000, -200,   -700,	5.04f,	1.12f,	0.56f,  -1230,	0.020f, 0.00f,0.00f,0.00f,	200,	0.029f,		0.00f,0.00f,0.00f,	0.250f, 0.080f, 2.742f, 0.050f, -2.0f,  5000.0f,	250.0f,  0.00f, 0x3f }
-#define REVERB_PRESET_MOOD_HELL \
-	{ 26, 100.0f,	0.570f,  -1000, -900,   -700,	3.57f,	0.49f,	2.00f,	-10000, 0.020f, 0.00f,0.00f,0.00f,	300,	0.030f,		0.00f,0.00f,0.00f,	0.110f, 0.040f, 2.109f, 0.520f, -5.0f,  5000.0f,	139.5f,  0.00f, 0x40 }
-#define REVERB_PRESET_MOOD_MEMORY \
-	{ 26,   8.0f,	0.850f,  -1000, -400,   -900,	4.06f,	0.82f,	0.56f,  -2800,	0.000f, 0.00f,0.00f,0.00f,	100,	0.000f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.474f, 0.450f, -10.0f,  5000.0f,	250.0f,  0.00f, 0x0 }
-
-
-// DRIVING SIMULATION PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_DRIVING_COMMENTATOR \
-	{ 26,   3.0f,	0.000f, 1000,   -500,   -600,	2.42f,	0.88f,	0.68f,  -1400,	0.093f, 0.00f,0.00f,0.00f,	-1200,	0.017f,		0.00f,0.00f,0.00f,	0.250f, 1.000f, 0.250f, 0.000f, -10.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_DRIVING_PITGARAGE \
-	{ 26,   1.9f,	0.590f, -1000,  -300,   -500,	1.72f,	0.93f,	0.87f,  -500,	0.000f, 0.00f,0.00f,0.00f,	200,		0.016f,		0.00f,0.00f,0.00f,	0.250f, 0.110f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x0 }
-#define REVERB_PRESET_DRIVING_INCAR_RACER \
-	{ 26,   1.1f,	0.800f, -1000,   0,		-200,	0.17f,	2.00f,	0.41f,  500,	0.007f, 0.00f,0.00f,0.00f,	-300,	0.015f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,	10268.2f,	251.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_DRIVING_INCAR_SPORTS \
-	{ 26,   1.1f,	0.800f, -1000,	-400,   0,		0.17f,	0.75f,	0.41f,  0,		0.010f, 0.00f,0.00f,0.00f,	-500,	0.000f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,	10268.2f,	251.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_DRIVING_INCAR_LUXURY \
-	{ 26,   1.6f,	1.000f, -1000,	-2000,  -600,	0.13f,	0.41f,	0.46f,  -200,	0.010f, 0.00f,0.00f,0.00f,	400,	0.010f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,	10268.2f,	251.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_DRIVING_FULLGRANDSTAND \
-	{ 26,   8.3f,	1.000f, -1000,  -1100,  -400,	3.01f,	1.37f,	1.28f,  -900,	0.090f, 0.00f,0.00f,0.00f,	-1500,	0.049f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,	10420.2f,	250.0f,  0.00f, 0x1f }
-#define REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \
-	{ 26,   8.3f,	1.000f, -1000,   0,		-200,	4.62f,	1.75f,	1.40f,  -1363,	0.090f, 0.00f,0.00f,0.00f,	-1200,	0.049f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.000f, -5.0f,	10420.2f,	250.0f,  0.00f, 0x1f }
-#define REVERB_PRESET_DRIVING_TUNNEL \
-	{ 26,   3.1f,	0.810f, -1000,   -800,	-100,	3.42f,	0.94f,	1.31f,  -300,	0.051f, 0.00f,0.00f,0.00f,  -300,	0.047f,		0.00f,0.00f,0.00f,	0.214f, 0.050f, 0.250f, 0.000f, -5.0f,  5000.0f,	155.3f,  0.00f, 0x20 }
-
-
-// CITY PRESETS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_CITY_STREETS \
-	{ 26,   3.0f,	0.780f, -1000,  -300,   -100,	1.79f,	1.12f,	0.91f,  -1100,	0.046f, 0.00f,0.00f,0.00f,	-1400,	0.028f,		0.00f,0.00f,0.00f,	0.250f, 0.200f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_CITY_SUBWAY \
-	{ 26,   3.0f,	0.740f, -1000,  -300,   -100,	3.01f,	1.23f,	0.91f,   -300,	0.046f, 0.00f,0.00f,0.00f,	200,	0.028f,		0.00f,0.00f,0.00f,	0.125f, 0.210f, 0.250f, 0.000f, -5.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_CITY_MUSEUM \
-	{ 26,  80.3f,	0.820f, -1000,  -1500,  -1500,  3.28f,	1.40f,	0.57f,  -1200,	0.039f, 0.00f,0.00f,-0.00f, -100,	0.034f,		0.00f,0.00f,0.00f,	0.130f, 0.170f, 0.250f, 0.000f, -5.0f,  2854.4f,	107.5f,  0.00f, 0x0 }
-#define REVERB_PRESET_CITY_LIBRARY \
-	{ 26,  80.3f,	0.820f, -1000,  -1100,  -2100,  2.76f,	0.89f,	0.41f,  -900,	0.029f, 0.00f,0.00f,-0.00f, -100,	0.020f,		0.00f,0.00f,0.00f,	0.130f, 0.170f, 0.250f, 0.000f, -5.0f,  2854.4f,	107.5f,  0.00f, 0x0 }
-#define REVERB_PRESET_CITY_UNDERPASS \
-	{ 26,   3.0f,	0.820f, -1000,  -700,   -100,	3.57f,	1.12f,	0.91f,  -800,	0.059f, 0.00f,0.00f,0.00f,	-100,	0.037f,		0.00f,0.00f,0.00f,	0.250f, 0.140f, 0.250f, 0.000f, -7.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-#define REVERB_PRESET_CITY_ABANDONED \
-	{ 26,   3.0f,	0.690f, -1000,  -200,   -100,	3.28f,	1.17f,	0.91f,  -700,	0.044f, 0.00f,0.00f,0.00f,	-1100,	0.024f,		0.00f,0.00f,0.00f,	0.250f, 0.200f, 0.250f, 0.000f, -3.0f,  5000.0f,	250.0f,  0.00f, 0x20 }
-
-
-// MISC ROOMS
-
-//	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
-#define REVERB_PRESET_DUSTYROOM  \
-	{ 26,   1.8f,	0.560f,	-1000,	-200,	-300,	1.79f,	0.38f,	0.21f,	-600,	0.002f,	0.00f,0.00f,0.00f,	200,	0.006f,		0.00f,0.00f,0.00f,	0.202f, 0.050f, 0.250f, 0.000f, -10.0f,  13046.0f,	163.3f,	0.00f,	0x20 }
-#define REVERB_PRESET_CHAPEL \
-	{ 26,  19.6f,	0.840f,	-1000,  -500,	0,		4.62f,	0.64f,	1.23f,  -700,	0.032f,	0.00f,0.00f,0.00f,	-200,	0.049f,		0.00f,0.00f,0.00f,	0.250f, 0.000f, 0.250f, 0.110f, -5.0f,  5000.0f,	250.0f, 0.00f,	0x3f }
-#define REVERB_PRESET_SMALLWATERROOM \
-	{ 26,  36.2f,	0.700f, -1000,  -698,   0,		1.51f,	1.25f,	1.14f,  -100,	0.020f, 0.00f,0.00f,0.00f,	300,	0.030f,		0.00f,0.00f,0.00f,	0.179f, 0.150f, 0.895f, 0.190f, -7.0f,  5000.0f,	250.0f, 0.00f, 0x0 }
diff --git a/Externals/OpenAL/include/alext.h b/Externals/OpenAL/include/alext.h
index 0447f2bb45..7d2a95274a 100644
--- a/Externals/OpenAL/include/alext.h
+++ b/Externals/OpenAL/include/alext.h
@@ -348,6 +348,51 @@ AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64
 #endif
 #endif
 
+#ifndef ALC_EXT_DEFAULT_FILTER_ORDER
+#define ALC_EXT_DEFAULT_FILTER_ORDER 1
+#define ALC_DEFAULT_FILTER_ORDER                 0x1100
+#endif
+
+#ifndef AL_SOFT_deferred_updates
+#define AL_SOFT_deferred_updates 1
+#define AL_DEFERRED_UPDATES_SOFT                 0xC002
+typedef ALvoid (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void);
+typedef ALvoid (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void);
+AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void);
+#endif
+#endif
+
+#ifndef AL_SOFT_block_alignment
+#define AL_SOFT_block_alignment 1
+#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT           0x200C
+#define AL_PACK_BLOCK_ALIGNMENT_SOFT             0x200D
+#endif
+
+#ifndef AL_SOFT_MSADPCM
+#define AL_SOFT_MSADPCM 1
+#define AL_FORMAT_MONO_MSADPCM_SOFT              0x1302
+#define AL_FORMAT_STEREO_MSADPCM_SOFT            0x1303
+#endif
+
+#ifndef AL_SOFT_source_length
+#define AL_SOFT_source_length 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef ALC_SOFT_pause_device
+#define ALC_SOFT_pause_device 1
+typedef void (ALC_APIENTRY*LPALCDEVICEPAUSESOFT)(ALCdevice *device);
+typedef void (ALC_APIENTRY*LPALCDEVICERESUMESOFT)(ALCdevice *device);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice *device);
+ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/OpenAL/include/xram.h b/Externals/OpenAL/include/xram.h
deleted file mode 100644
index cfff054329..0000000000
--- a/Externals/OpenAL/include/xram.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <al.h>
-
-// X-RAM Function pointer definitions
-typedef ALboolean (__cdecl *EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value);
-typedef ALenum    (__cdecl *EAXGetBufferMode)(ALuint buffer, ALint *value);
-
-//////////////////////////////////////////////////////////////////////////////
-// Query for X-RAM extension
-//
-// if (alIsExtensionPresent("EAX-RAM") == AL_TRUE)
-//		X-RAM Extension found
-//  
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// X-RAM enum names
-//
-// "AL_EAX_RAM_SIZE"
-// "AL_EAX_RAM_FREE"
-// "AL_STORAGE_AUTOMATIC"
-// "AL_STORAGE_HARDWARE"
-// "AL_STORAGE_ACCESSIBLE"
-//
-// Query enum values using alGetEnumValue, for example
-// 
-// long lRamSizeEnum = alGetEnumValue("AL_EAX_RAM_SIZE")
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Query total amount of X-RAM
-//
-// long lTotalSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_SIZE")
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Query free X-RAM available
-//
-// long lFreeSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_FREE")
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Query X-RAM Function pointers
-// 
-// Use typedefs defined above to get the X-RAM function pointers using
-// alGetProcAddress
-//
-// EAXSetBufferMode eaxSetBufferMode;
-// EAXGetBufferMode eaxGetBufferMode;
-//
-// eaxSetBufferMode = (EAXSetBufferMode)alGetProcAddress("EAXSetBufferMode");
-// eaxGetBufferMode = (EAXGetBufferMode)alGetProcAddress("EAXGetBufferMode");
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Force an Open AL Buffer into X-RAM (good for non-streaming buffers)
-//
-// ALuint uiBuffer;
-// alGenBuffers(1, &uiBuffer);
-// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_HARDWARE"));
-// alBufferData(...);
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Force an Open AL Buffer into 'accessible' (currently host) RAM (good for streaming buffers)
-//
-// ALuint uiBuffer;
-// alGenBuffers(1, &uiBuffer);
-// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_ACCESSIBLE"));
-// alBufferData(...);
-//
-//////////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Put an Open AL Buffer into X-RAM if memory is available, otherwise use
-// host RAM.  This is the default mode.
-//
-// ALuint uiBuffer;
-// alGenBuffers(1, &uiBuffer);
-// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_AUTOMATIC"));
-// alBufferData(...);
-//
-//////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/OpenAL/x64/OpenAL32.dll b/Externals/OpenAL/x64/OpenAL32.dll
new file mode 100644
index 0000000000..a718bdc5b5
Binary files /dev/null and b/Externals/OpenAL/x64/OpenAL32.dll differ
diff --git a/Externals/OpenAL/x64/OpenAL32.lib b/Externals/OpenAL/x64/OpenAL32.lib
new file mode 100644
index 0000000000..88dfed146a
Binary files /dev/null and b/Externals/OpenAL/x64/OpenAL32.lib differ
diff --git a/Externals/Qt b/Externals/Qt
new file mode 160000
index 0000000000..e800367547
--- /dev/null
+++ b/Externals/Qt
@@ -0,0 +1 @@
+Subproject commit e800367547f23b981d1de8e6c13c1d6a88d56746
diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt
deleted file mode 100644
index 33a42362e3..0000000000
--- a/Externals/SDL/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-add_definitions(-DSDL_VIDEO_DISABLED=1)
-add_definitions(-DSDL_EVENTS_DISABLED=1)
-
-set(SRCS src/SDL.c src/SDL_error.c src/SDL_fatal.c src/joystick/SDL_joystick.c)
-
-if(APPLE)
-	set(SRCS ${SRCS} src/joystick/darwin/SDL_sysjoystick.c)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	set(SRCS ${SRCS} src/joystick/linux/SDL_sysjoystick.c)
-	set(SRCS ${SRCS} src/stdlib/SDL_string.c)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-	${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-	set(SRCS ${SRCS} src/joystick/bsd/SDL_sysjoystick.c)
-	set(SRCS ${SRCS} src/stdlib/SDL_malloc.c)
-	set(SRCS ${SRCS} src/stdlib/SDL_string.c)
-elseif(WIN32)
-	set(SRCS ${SRCS} src/joystick/win32/SDL_mmjoystick.c)
-else()
-	set(SRCS ${SRCS} src/joystick/dummy/SDL_sysjoystick.c)
-endif()
-
-add_library(SDL STATIC ${SRCS})
diff --git a/Externals/SDL/Include_1.2/SDL.h b/Externals/SDL/Include_1.2/SDL.h
deleted file mode 100644
index 60ac26ce4b..0000000000
--- a/Externals/SDL/Include_1.2/SDL.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Main include header for the SDL library */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_audio.h"
-#include "SDL_cdrom.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_loadso.h"
-#include "SDL_mutex.h"
-#include "SDL_rwops.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* As of version 0.5, SDL is loaded dynamically into the application */
-
-/* These are the flags which may be passed to SDL_Init() -- you should
-   specify the subsystems which you will be using in your application.
-*/
-#define	SDL_INIT_TIMER		0x00000001
-#define SDL_INIT_AUDIO		0x00000010
-#define SDL_INIT_VIDEO		0x00000020
-#define SDL_INIT_CDROM		0x00000100
-#define SDL_INIT_JOYSTICK	0x00000200
-#define SDL_INIT_NOPARACHUTE	0x00100000	/* Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD	0x01000000	/* Not supported on all OS's */
-#define SDL_INIT_EVERYTHING	0x0000FFFF
-
-/* This function loads the SDL dynamically linked library and initializes 
- * the subsystems specified by 'flags' (and those satisfying dependencies)
- * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- * signal handlers for some commonly ignored fatal signals (like SIGSEGV)
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/* This function initializes specific SDL subsystems */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/* This function cleans up specific SDL subsystems */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/* This function returns mask of the specified subsystems which have
-   been initialized.
-   If 'flags' is 0, it returns a mask of all initialized subsystems.
-*/
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/* This function cleans up all initialized subsystems and unloads the
- * dynamically linked library.  You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
diff --git a/Externals/SDL/Include_1.2/SDL_active.h b/Externals/SDL/Include_1.2/SDL_active.h
deleted file mode 100644
index 2cf474c5a3..0000000000
--- a/Externals/SDL/Include_1.2/SDL_active.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL application focus event handling */
-
-#ifndef _SDL_active_h
-#define _SDL_active_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The available application states */
-#define SDL_APPMOUSEFOCUS	0x01		/* The app has mouse coverage */
-#define SDL_APPINPUTFOCUS	0x02		/* The app has input focus */
-#define SDL_APPACTIVE		0x04		/* The application is active */
-
-/* Function prototypes */
-/* 
- * This function returns the current state of the application, which is a
- * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
- * SDL_APPACTIVE.  If SDL_APPACTIVE is set, then the user is able to
- * see your application, otherwise it has been iconified or disabled.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_active_h */
diff --git a/Externals/SDL/Include_1.2/SDL_audio.h b/Externals/SDL/Include_1.2/SDL_audio.h
deleted file mode 100644
index 68ec4759d8..0000000000
--- a/Externals/SDL/Include_1.2/SDL_audio.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Access to the raw audio mixing buffer for the SDL library */
-
-#ifndef _SDL_audio_h
-#define _SDL_audio_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The calculated values in this structure are calculated by SDL_OpenAudio() */
-typedef struct SDL_AudioSpec {
-	int freq;		/* DSP frequency -- samples per second */
-	Uint16 format;		/* Audio data format */
-	Uint8  channels;	/* Number of channels: 1 mono, 2 stereo */
-	Uint8  silence;		/* Audio buffer silence value (calculated) */
-	Uint16 samples;		/* Audio buffer size in samples (power of 2) */
-	Uint16 padding;		/* Necessary for some compile environments */
-	Uint32 size;		/* Audio buffer size in bytes (calculated) */
-	/* This function is called when the audio device needs more data.
-	   'stream' is a pointer to the audio data buffer
-	   'len' is the length of that buffer in bytes.
-	   Once the callback returns, the buffer will no longer be valid.
-	   Stereo samples are stored in a LRLRLR ordering.
-	*/
-	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
-	void  *userdata;
-} SDL_AudioSpec;
-
-/* Audio format flags (defaults to LSB byte order) */
-#define AUDIO_U8	0x0008	/* Unsigned 8-bit samples */
-#define AUDIO_S8	0x8008	/* Signed 8-bit samples */
-#define AUDIO_U16LSB	0x0010	/* Unsigned 16-bit samples */
-#define AUDIO_S16LSB	0x8010	/* Signed 16-bit samples */
-#define AUDIO_U16MSB	0x1010	/* As above, but big-endian byte order */
-#define AUDIO_S16MSB	0x9010	/* As above, but big-endian byte order */
-#define AUDIO_U16	AUDIO_U16LSB
-#define AUDIO_S16	AUDIO_S16LSB
-
-/* Native audio byte ordering */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define AUDIO_U16SYS	AUDIO_U16LSB
-#define AUDIO_S16SYS	AUDIO_S16LSB
-#else
-#define AUDIO_U16SYS	AUDIO_U16MSB
-#define AUDIO_S16SYS	AUDIO_S16MSB
-#endif
-
-
-/* A structure to hold a set of audio conversion filters and buffers */
-typedef struct SDL_AudioCVT {
-	int needed;			/* Set to 1 if conversion possible */
-	Uint16 src_format;		/* Source audio format */
-	Uint16 dst_format;		/* Target audio format */
-	double rate_incr;		/* Rate conversion increment */
-	Uint8 *buf;			/* Buffer to hold entire audio data */
-	int    len;			/* Length of original audio buffer */
-	int    len_cvt;			/* Length of converted audio buffer */
-	int    len_mult;		/* buffer must be len*len_mult big */
-	double len_ratio; 	/* Given len, final size is len*len_ratio */
-	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
-	int filter_index;		/* Current audio conversion function */
-} SDL_AudioCVT;
-
-
-/* Function prototypes */
-
-/* These functions are used internally, and should not be used unless you
- * have a specific need to specify the audio driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-
-/* This function fills the given character buffer with the name of the
- * current audio driver, and returns a pointer to it if the audio driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
-
-/*
- * This function opens the audio device with the desired parameters, and
- * returns 0 if successful, placing the actual hardware parameters in the
- * structure pointed to by 'obtained'.  If 'obtained' is NULL, the audio
- * data passed to the callback function will be guaranteed to be in the
- * requested format, and will be automatically converted to the hardware
- * audio format if necessary.  This function returns -1 if it failed 
- * to open the audio device, or couldn't set up the audio thread.
- *
- * When filling in the desired audio spec structure,
- *  'desired->freq' should be the desired audio frequency in samples-per-second.
- *  'desired->format' should be the desired audio format.
- *  'desired->samples' is the desired size of the audio buffer, in samples.
- *     This number should be a power of two, and may be adjusted by the audio
- *     driver to a value more suitable for the hardware.  Good values seem to
- *     range between 512 and 8096 inclusive, depending on the application and
- *     CPU speed.  Smaller values yield faster response time, but can lead
- *     to underflow if the application is doing heavy processing and cannot
- *     fill the audio buffer in time.  A stereo sample consists of both right
- *     and left channels in LR ordering.
- *     Note that the number of samples is directly related to time by the
- *     following formula:  ms = (samples*1000)/freq
- *  'desired->size' is the size in bytes of the audio buffer, and is
- *     calculated by SDL_OpenAudio().
- *  'desired->silence' is the value used to set the buffer to silence,
- *     and is calculated by SDL_OpenAudio().
- *  'desired->callback' should be set to a function that will be called
- *     when the audio device is ready for more data.  It is passed a pointer
- *     to the audio buffer, and the length in bytes of the audio buffer.
- *     This function usually runs in a separate thread, and so you should
- *     protect data structures that it accesses by calling SDL_LockAudio()
- *     and SDL_UnlockAudio() in your code.
- *  'desired->userdata' is passed as the first parameter to your callback
- *     function.
- *
- * The audio device starts out playing silence when it's opened, and should
- * be enabled for playing by calling SDL_PauseAudio(0) when you are ready
- * for your audio callback function to be called.  Since the audio driver
- * may modify the requested size of the audio buffer, you should allocate
- * any local mixing buffers after you open the audio device.
- */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
-
-/*
- * Get the current audio state:
- */
-typedef enum {
-	SDL_AUDIO_STOPPED = 0,
-	SDL_AUDIO_PLAYING,
-	SDL_AUDIO_PAUSED
-} SDL_audiostatus;
-extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);
-
-/*
- * This function pauses and unpauses the audio callback processing.
- * It should be called with a parameter of 0 after opening the audio
- * device to start playing sound.  This is so you can safely initialize
- * data for your callback function after opening the audio device.
- * Silence will be written to the audio device during the pause.
- */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
-
-/*
- * This function loads a WAVE from the data source, automatically freeing
- * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
- * you could do:
- *	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
- *
- * If this function succeeds, it returns the given SDL_AudioSpec,
- * filled with the audio data format of the wave data, and sets
- * 'audio_buf' to a malloc()'d buffer containing the audio data,
- * and sets 'audio_len' to the length of that audio buffer, in bytes.
- * You need to free the audio buffer with SDL_FreeWAV() when you are 
- * done with it.
- *
- * This function returns NULL and sets the SDL error message if the 
- * wave file cannot be opened, uses an unknown data format, or is 
- * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
- */
-extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
-
-/* Compatibility convenience function -- loads a WAV from a file */
-#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
-	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
-
-/*
- * This function frees data previously allocated with SDL_LoadWAV_RW()
- */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf);
-
-/*
- * This function takes a source format and rate and a destination format
- * and rate, and initializes the 'cvt' structure with information needed
- * by SDL_ConvertAudio() to convert a buffer of audio data from one format
- * to the other.
- * This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
-		Uint16 src_format, Uint8 src_channels, int src_rate,
-		Uint16 dst_format, Uint8 dst_channels, int dst_rate);
-
-/* Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
- * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
- * audio data in the source format, this function will convert it in-place
- * to the desired format.
- * The data conversion may expand the size of the audio data, so the buffer
- * cvt->buf should be allocated after the cvt structure is initialized by
- * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
- */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt);
-
-/*
- * This takes two audio buffers of the playing audio format and mixes
- * them, performing addition, volume adjustment, and overflow clipping.
- * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME
- * for full audio volume.  Note this does not change hardware volume.
- * This is provided for convenience -- you can mix your own audio data.
- */
-#define SDL_MIX_MAXVOLUME 128
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume);
-
-/*
- * The lock manipulated by these functions protects the callback function.
- * During a LockAudio/UnlockAudio pair, you can be guaranteed that the
- * callback function is not running.  Do not call these from the callback
- * function or you will cause deadlock.
- */
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
-
-/*
- * This function shuts down audio processing and closes the audio device.
- */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_audio_h */
diff --git a/Externals/SDL/Include_1.2/SDL_byteorder.h b/Externals/SDL/Include_1.2/SDL_byteorder.h
deleted file mode 100644
index 3871cfed56..0000000000
--- a/Externals/SDL/Include_1.2/SDL_byteorder.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_endian.h"
diff --git a/Externals/SDL/Include_1.2/SDL_cdrom.h b/Externals/SDL/Include_1.2/SDL_cdrom.h
deleted file mode 100644
index 5f8f0c62a0..0000000000
--- a/Externals/SDL/Include_1.2/SDL_cdrom.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This is the CD-audio control API for Simple DirectMedia Layer */
-
-#ifndef _SDL_cdrom_h
-#define _SDL_cdrom_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* In order to use these functions, SDL_Init() must have been called
-   with the SDL_INIT_CDROM flag.  This causes SDL to scan the system
-   for CD-ROM drives, and load appropriate drivers.
-*/
-
-/* The maximum number of CD-ROM tracks on a disk */
-#define SDL_MAX_TRACKS	99
-
-/* The types of CD-ROM track possible */
-#define SDL_AUDIO_TRACK	0x00
-#define SDL_DATA_TRACK	0x04
-
-/* The possible states which a CD-ROM drive can be in. */
-typedef enum {
-	CD_TRAYEMPTY,
-	CD_STOPPED,
-	CD_PLAYING,
-	CD_PAUSED,
-	CD_ERROR = -1
-} CDstatus;
-
-/* Given a status, returns true if there's a disk in the drive */
-#define CD_INDRIVE(status)	((int)(status) > 0)
-
-typedef struct SDL_CDtrack {
-	Uint8 id;		/* Track number */
-	Uint8 type;		/* Data or audio track */
-	Uint16 unused;
-	Uint32 length;		/* Length, in frames, of this track */
-	Uint32 offset;		/* Offset, in frames, from start of disk */
-} SDL_CDtrack;
-
-/* This structure is only current as of the last call to SDL_CDStatus() */
-typedef struct SDL_CD {
-	int id;			/* Private drive identifier */
-	CDstatus status;	/* Current drive status */
-
-	/* The rest of this structure is only valid if there's a CD in drive */
-	int numtracks;		/* Number of tracks on disk */
-	int cur_track;		/* Current track position */
-	int cur_frame;		/* Current frame offset within current track */
-	SDL_CDtrack track[SDL_MAX_TRACKS+1];
-} SDL_CD;
-
-/* Conversion functions from frames to Minute/Second/Frames and vice versa */
-#define CD_FPS	75
-#define FRAMES_TO_MSF(f, M,S,F)	{					\
-	int value = f;							\
-	*(F) = value%CD_FPS;						\
-	value /= CD_FPS;						\
-	*(S) = value%60;						\
-	value /= 60;							\
-	*(M) = value;							\
-}
-#define MSF_TO_FRAMES(M, S, F)	((M)*60*CD_FPS+(S)*CD_FPS+(F))
-
-/* CD-audio API functions: */
-
-/* Returns the number of CD-ROM drives on the system, or -1 if
-   SDL_Init() has not been called with the SDL_INIT_CDROM flag.
- */
-extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);
-
-/* Returns a human-readable, system-dependent identifier for the CD-ROM.
-   Example:
-	"/dev/cdrom"
-	"E:"
-	"/dev/disk/ide/1/master"
-*/
-extern DECLSPEC const char * SDLCALL SDL_CDName(int drive);
-
-/* Opens a CD-ROM drive for access.  It returns a drive handle on success,
-   or NULL if the drive was invalid or busy.  This newly opened CD-ROM
-   becomes the default CD used when other CD functions are passed a NULL
-   CD-ROM handle.
-   Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
-*/
-extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive);
-
-/* This function returns the current status of the given drive.
-   If the drive has a CD in it, the table of contents of the CD and current
-   play position of the CD will be stored in the SDL_CD structure.
-*/
-extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom);
-
-/* Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
-   tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
-   until the end of the CD.  This function will skip data tracks.
-   This function should only be called after calling SDL_CDStatus() to 
-   get track information about the CD.
-   For example:
-	// Play entire CD:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-		SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
-	// Play last track:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
-		SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0);
-	}
-	// Play first and second track and 10 seconds of third track:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-		SDL_CDPlayTracks(cdrom, 0, 0, 2, 10);
-
-   This function returns 0, or -1 if there was an error.
-*/
-extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom,
-		int start_track, int start_frame, int ntracks, int nframes);
-
-/* Play the given CD starting at 'start' frame for 'length' frames.
-   It returns 0, or -1 if there was an error.
-*/
-extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length);
-
-/* Pause play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom);
-
-/* Resume play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom);
-
-/* Stop play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom);
-
-/* Eject CD-ROM -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom);
-
-/* Closes the handle for the CD-ROM drive */
-extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config.h b/Externals/SDL/Include_1.2/SDL_config.h
deleted file mode 100644
index c82f42adf0..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__SYMBIAN32__)
-#include "SDL_config_symbian.h"  /* must be before win32! */
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config.h.in b/Externals/SDL/Include_1.2/SDL_config.h.in
deleted file mode 100644
index fb49c0e2fa..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config.h.in
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-#undef const
-#undef inline
-#undef volatile
-
-/* C datatypes */
-#undef size_t
-#undef int8_t
-#undef uint8_t
-#undef int16_t
-#undef uint16_t
-#undef int32_t
-#undef uint32_t
-#undef int64_t
-#undef uint64_t
-#undef uintptr_t
-#undef SDL_HAS_64BIT_TYPE
-
-/* Endianness */
-#undef SDL_BYTEORDER
-
-/* Comment this if you want to build without any C library requirements */
-#undef HAVE_LIBC
-#if HAVE_LIBC
-
-/* Useful headers */
-#undef HAVE_ALLOCA_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_STDIO_H
-#undef STDC_HEADERS
-#undef HAVE_STDLIB_H
-#undef HAVE_STDARG_H
-#undef HAVE_MALLOC_H
-#undef HAVE_MEMORY_H
-#undef HAVE_STRING_H
-#undef HAVE_STRINGS_H
-#undef HAVE_INTTYPES_H
-#undef HAVE_STDINT_H
-#undef HAVE_CTYPE_H
-#undef HAVE_MATH_H
-#undef HAVE_ICONV_H
-#undef HAVE_SIGNAL_H
-#undef HAVE_ALTIVEC_H
-
-/* C library functions */
-#undef HAVE_MALLOC
-#undef HAVE_CALLOC
-#undef HAVE_REALLOC
-#undef HAVE_FREE
-#undef HAVE_ALLOCA
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#undef HAVE_GETENV
-#undef HAVE_PUTENV
-#undef HAVE_UNSETENV
-#endif
-#undef HAVE_QSORT
-#undef HAVE_ABS
-#undef HAVE_BCOPY
-#undef HAVE_MEMSET
-#undef HAVE_MEMCPY
-#undef HAVE_MEMMOVE
-#undef HAVE_MEMCMP
-#undef HAVE_STRLEN
-#undef HAVE_STRLCPY
-#undef HAVE_STRLCAT
-#undef HAVE_STRDUP
-#undef HAVE__STRREV
-#undef HAVE__STRUPR
-#undef HAVE__STRLWR
-#undef HAVE_INDEX
-#undef HAVE_RINDEX
-#undef HAVE_STRCHR
-#undef HAVE_STRRCHR
-#undef HAVE_STRSTR
-#undef HAVE_ITOA
-#undef HAVE__LTOA
-#undef HAVE__UITOA
-#undef HAVE__ULTOA
-#undef HAVE_STRTOL
-#undef HAVE_STRTOUL
-#undef HAVE__I64TOA
-#undef HAVE__UI64TOA
-#undef HAVE_STRTOLL
-#undef HAVE_STRTOULL
-#undef HAVE_STRTOD
-#undef HAVE_ATOI
-#undef HAVE_ATOF
-#undef HAVE_STRCMP
-#undef HAVE_STRNCMP
-#undef HAVE__STRICMP
-#undef HAVE_STRCASECMP
-#undef HAVE__STRNICMP
-#undef HAVE_STRNCASECMP
-#undef HAVE_SSCANF
-#undef HAVE_SNPRINTF
-#undef HAVE_VSNPRINTF
-#undef HAVE_ICONV
-#undef HAVE_SIGACTION
-#undef HAVE_SETJMP
-#undef HAVE_NANOSLEEP
-#undef HAVE_CLOCK_GETTIME
-#undef HAVE_DLVSYM
-#undef HAVE_GETPAGESIZE
-#undef HAVE_MPROTECT
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* Allow disabling of core subsystems */
-#undef SDL_AUDIO_DISABLED
-#undef SDL_CDROM_DISABLED
-#undef SDL_CPUINFO_DISABLED
-#undef SDL_EVENTS_DISABLED
-#undef SDL_FILE_DISABLED
-#undef SDL_JOYSTICK_DISABLED
-#undef SDL_LOADSO_DISABLED
-#undef SDL_THREADS_DISABLED
-#undef SDL_TIMERS_DISABLED
-#undef SDL_VIDEO_DISABLED
-
-/* Enable various audio drivers */
-#undef SDL_AUDIO_DRIVER_ALSA
-#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
-#undef SDL_AUDIO_DRIVER_ARTS
-#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
-#undef SDL_AUDIO_DRIVER_BAUDIO
-#undef SDL_AUDIO_DRIVER_BSD
-#undef SDL_AUDIO_DRIVER_COREAUDIO
-#undef SDL_AUDIO_DRIVER_DART
-#undef SDL_AUDIO_DRIVER_DC
-#undef SDL_AUDIO_DRIVER_DISK
-#undef SDL_AUDIO_DRIVER_DUMMY
-#undef SDL_AUDIO_DRIVER_DMEDIA
-#undef SDL_AUDIO_DRIVER_DSOUND
-#undef SDL_AUDIO_DRIVER_PULSE
-#undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC
-#undef SDL_AUDIO_DRIVER_ESD
-#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
-#undef SDL_AUDIO_DRIVER_MINT
-#undef SDL_AUDIO_DRIVER_MMEAUDIO
-#undef SDL_AUDIO_DRIVER_NAS
-#undef SDL_AUDIO_DRIVER_OSS
-#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
-#undef SDL_AUDIO_DRIVER_PAUD
-#undef SDL_AUDIO_DRIVER_QNXNTO
-#undef SDL_AUDIO_DRIVER_SNDMGR
-#undef SDL_AUDIO_DRIVER_SUNAUDIO
-#undef SDL_AUDIO_DRIVER_WAVEOUT
-
-/* Enable various cdrom drivers */
-#undef SDL_CDROM_AIX
-#undef SDL_CDROM_BEOS
-#undef SDL_CDROM_BSDI
-#undef SDL_CDROM_DC
-#undef SDL_CDROM_DUMMY
-#undef SDL_CDROM_FREEBSD
-#undef SDL_CDROM_LINUX
-#undef SDL_CDROM_MACOS
-#undef SDL_CDROM_MACOSX
-#undef SDL_CDROM_MINT
-#undef SDL_CDROM_OPENBSD
-#undef SDL_CDROM_OS2
-#undef SDL_CDROM_OSF
-#undef SDL_CDROM_QNX
-#undef SDL_CDROM_WIN32
-
-/* Enable various input drivers */
-#undef SDL_INPUT_LINUXEV
-#undef SDL_INPUT_TSLIB
-#undef SDL_JOYSTICK_BEOS
-#undef SDL_JOYSTICK_DC
-#undef SDL_JOYSTICK_DUMMY
-#undef SDL_JOYSTICK_IOKIT
-#undef SDL_JOYSTICK_LINUX
-#undef SDL_JOYSTICK_MACOS
-#undef SDL_JOYSTICK_MINT
-#undef SDL_JOYSTICK_OS2
-#undef SDL_JOYSTICK_RISCOS
-#undef SDL_JOYSTICK_WINMM
-#undef SDL_JOYSTICK_USBHID
-#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
-
-/* Enable various shared object loading systems */
-#undef SDL_LOADSO_BEOS
-#undef SDL_LOADSO_DLCOMPAT
-#undef SDL_LOADSO_DLOPEN
-#undef SDL_LOADSO_DUMMY
-#undef SDL_LOADSO_LDG
-#undef SDL_LOADSO_MACOS
-#undef SDL_LOADSO_OS2
-#undef SDL_LOADSO_WIN32
-
-/* Enable various threading systems */
-#undef SDL_THREAD_BEOS
-#undef SDL_THREAD_DC
-#undef SDL_THREAD_OS2
-#undef SDL_THREAD_PTH
-#undef SDL_THREAD_PTHREAD
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
-#undef SDL_THREAD_SPROC
-#undef SDL_THREAD_WIN32
-
-/* Enable various timer systems */
-#undef SDL_TIMER_BEOS
-#undef SDL_TIMER_DC
-#undef SDL_TIMER_DUMMY
-#undef SDL_TIMER_MACOS
-#undef SDL_TIMER_MINT
-#undef SDL_TIMER_OS2
-#undef SDL_TIMER_RISCOS
-#undef SDL_TIMER_UNIX
-#undef SDL_TIMER_WIN32
-#undef SDL_TIMER_WINCE
-
-/* Enable various video drivers */
-#undef SDL_VIDEO_DRIVER_AALIB
-#undef SDL_VIDEO_DRIVER_BWINDOW
-#undef SDL_VIDEO_DRIVER_DC
-#undef SDL_VIDEO_DRIVER_DDRAW
-#undef SDL_VIDEO_DRIVER_DGA
-#undef SDL_VIDEO_DRIVER_DIRECTFB
-#undef SDL_VIDEO_DRIVER_DRAWSPROCKET
-#undef SDL_VIDEO_DRIVER_DUMMY
-#undef SDL_VIDEO_DRIVER_FBCON
-#undef SDL_VIDEO_DRIVER_GAPI
-#undef SDL_VIDEO_DRIVER_GEM
-#undef SDL_VIDEO_DRIVER_GGI
-#undef SDL_VIDEO_DRIVER_IPOD
-#undef SDL_VIDEO_DRIVER_NANOX
-#undef SDL_VIDEO_DRIVER_OS2FS
-#undef SDL_VIDEO_DRIVER_PHOTON
-#undef SDL_VIDEO_DRIVER_PICOGUI
-#undef SDL_VIDEO_DRIVER_PS2GS
-#undef SDL_VIDEO_DRIVER_QTOPIA
-#undef SDL_VIDEO_DRIVER_QUARTZ
-#undef SDL_VIDEO_DRIVER_RISCOS
-#undef SDL_VIDEO_DRIVER_SVGALIB
-#undef SDL_VIDEO_DRIVER_TOOLBOX
-#undef SDL_VIDEO_DRIVER_VGL
-#undef SDL_VIDEO_DRIVER_WINDIB
-#undef SDL_VIDEO_DRIVER_WSCONS
-#undef SDL_VIDEO_DRIVER_X11
-#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
-#undef SDL_VIDEO_DRIVER_X11_DPMS
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER
-#undef SDL_VIDEO_DRIVER_X11_VIDMODE
-#undef SDL_VIDEO_DRIVER_X11_XINERAMA
-#undef SDL_VIDEO_DRIVER_X11_XME
-#undef SDL_VIDEO_DRIVER_X11_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_XV
-#undef SDL_VIDEO_DRIVER_XBIOS
-
-/* Enable OpenGL support */
-#undef SDL_VIDEO_OPENGL
-#undef SDL_VIDEO_OPENGL_GLX
-#undef SDL_VIDEO_OPENGL_WGL
-#undef SDL_VIDEO_OPENGL_OSMESA
-#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
-
-/* Enable assembly routines */
-#undef SDL_ASSEMBLY_ROUTINES
-#undef SDL_HERMES_BLITTERS
-#undef SDL_ALTIVEC_BLITTERS
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_dreamcast.h b/Externals/SDL/Include_1.2/SDL_config_dreamcast.h
deleted file mode 100644
index 9cbeea3166..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_dreamcast.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_dreamcast_h
-#define _SDL_config_dreamcast_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long uintptr_t;
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DC	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DC	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_DC	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_DC	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_DC	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DC	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_dreamcast_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_macos.h b/Externals/SDL/Include_1.2/SDL_config_macos.h
deleted file mode 100644
index c4a1c59804..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_macos.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macos_h
-#define _SDL_config_macos_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#include <MacTypes.h>
-
-typedef SInt8	int8_t;
-typedef UInt8	uint8_t;
-typedef SInt16	int16_t;
-typedef UInt16	uint16_t;
-typedef SInt32	int32_t;
-typedef UInt32	uint32_t;
-typedef SInt64	int64_t;
-typedef UInt64	uint64_t;
-typedef unsigned long	uintptr_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_ABS	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_ITOA	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_SSCANF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_SNDMGR	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_CDROM_DUMMY		1
-#else
-#define SDL_CDROM_MACOS		1
-#endif
-
-/* Enable various input drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_JOYSTICK_DUMMY	1
-#else
-#define SDL_JOYSTICK_MACOS	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_MACOS	1
-
-/* Enable various threading systems */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_MACOS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_DRAWSPROCKET	1
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-
-#endif /* _SDL_config_macos_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_macosx.h b/Externals/SDL/Include_1.2/SDL_config_macosx.h
deleted file mode 100644
index 481c22edc3..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_macosx.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macosx_h
-#define _SDL_config_macosx_h
-
-#include "SDL_platform.h"
-
-/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
-#include <AvailabilityMacros.h>
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
-#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
-#define HAVE_ALLOCA_H		1
-#endif
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_STDINT_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_UNSETENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRLCPY	1
-#define HAVE_STRLCAT	1
-#define HAVE_STRDUP	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOUL	1
-#define HAVE_STRTOLL	1
-#define HAVE_STRTOULL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-#define HAVE_SIGACTION	1
-#define HAVE_SETJMP	1
-#define HAVE_NANOSLEEP	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_COREAUDIO	1
-#define SDL_AUDIO_DRIVER_SNDMGR	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_MACOSX	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_IOKIT	1
-
-/* Enable various shared object loading systems */
-#ifdef __ppc__
-/* For Mac OS X 10.2 compatibility */
-#define SDL_LOADSO_DLCOMPAT	1
-#else
-#define SDL_LOADSO_DLOPEN	1
-#endif
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD	1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON))
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-#else
-#define SDL_VIDEO_DRIVER_QUARTZ	1
-#endif
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES	1
-#ifdef __ppc__
-#define SDL_ALTIVEC_BLITTERS	1
-#endif
-
-#endif /* _SDL_config_macosx_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_minimal.h b/Externals/SDL/Include_1.2/SDL_config_minimal.h
deleted file mode 100644
index 78b6148ca9..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_minimal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_minimal_h
-#define _SDL_config_minimal_h
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-#include <stdarg.h>
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-
-/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable the stub timer support (src/timer/dummy/\*.c) */
-#define SDL_TIMERS_DISABLED	1
-
-/* Enable the dummy video driver (src/video/dummy/\*.c) */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_minimal_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_nds.h b/Externals/SDL/Include_1.2/SDL_config_nds.h
deleted file mode 100644
index 20b789c85a..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_nds.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_nds_h
-#define _SDL_config_nds_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* C datatypes */
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Endianness */
-#define SDL_BYTEORDER 1234
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_STRING_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_NDS	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_NDS	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_NDS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_NDS	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_nds_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_os2.h b/Externals/SDL/Include_1.2/SDL_config_os2.h
deleted file mode 100644
index 8cdea9ff2b..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_os2.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_os2_h
-#define _SDL_config_os2_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Use Watcom's LIBC */
-#define HAVE_LIBC 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__UITOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_CLOCK_GETTIME 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DART	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_OS2	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_OS2	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_OS2	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_OS2	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_OS2	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_OS2FS	1
-
-/* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
-
-/* Enable assembly routines where available */
-#define SDL_ASSEMBLY_ROUTINES	1
-
-#endif /* _SDL_config_os2_h */
diff --git a/Externals/SDL/Include_1.2/SDL_config_win32.h b/Externals/SDL/Include_1.2/SDL_config_win32.h
deleted file mode 100644
index cfb44d2a07..0000000000
--- a/Externals/SDL/Include_1.2/SDL_config_win32.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_win32_h
-#define _SDL_config_win32_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if defined(__GNUC__) || defined(__DMC__)
-#define HAVE_STDINT_H	1
-#elif defined(_MSC_VER)
-typedef signed __int8		int8_t;
-typedef unsigned __int8		uint8_t;
-typedef signed __int16		int16_t;
-typedef unsigned __int16	uint16_t;
-typedef signed __int32		int32_t;
-typedef unsigned __int32	uint32_t;
-typedef signed __int64		int64_t;
-typedef unsigned __int64	uint64_t;
-#ifndef _UINTPTR_T_DEFINED
-#ifdef  _WIN64
-typedef unsigned __int64    uintptr_t;
-#else
-typedef unsigned int   uintptr_t;
-#endif
-#define _UINTPTR_T_DEFINED
-#endif
-/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
-#define LONG_PTR LONG
-#endif
-#else	/* !__GNUC__ && !_MSC_VER */
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef unsigned int size_t;
-#endif
-typedef unsigned int uintptr_t;
-#endif /* __GNUC__ || _MSC_VER */
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Enabled for SDL 1.2 (binary compatibility) */
-#define HAVE_LIBC	1
-#ifdef HAVE_LIBC
-/* Useful headers */
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#ifndef _WIN32_WCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE__STRICMP 1
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#else
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-#endif
-
-/* Enable various audio drivers */
-#ifndef _WIN32_WCE
-#define SDL_AUDIO_DRIVER_DSOUND	1
-#endif
-#define SDL_AUDIO_DRIVER_WAVEOUT	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#ifdef _WIN32_WCE
-#define SDL_CDROM_DISABLED      1
-#else
-#define SDL_CDROM_WIN32		1
-#endif
-
-/* Enable various input drivers */
-#ifdef _WIN32_WCE
-#define SDL_JOYSTICK_DISABLED   1
-#else
-#define SDL_JOYSTICK_WINMM	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_WIN32	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_WIN32	1
-
-/* Enable various timer systems */
-#ifdef _WIN32_WCE
-#define SDL_TIMER_WINCE	1
-#else
-#define SDL_TIMER_WIN32	1
-#endif
-
-/* Enable various video drivers */
-#ifdef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_GAPI	1
-#endif
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_DDRAW	1
-#endif
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_WINDIB	1
-
-/* Enable OpenGL support */
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_WGL	1
-#endif
-
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES	1
-#endif
-
-#endif /* _SDL_config_win32_h */
diff --git a/Externals/SDL/Include_1.2/SDL_copying.h b/Externals/SDL/Include_1.2/SDL_copying.h
deleted file mode 100644
index 39e122db73..0000000000
--- a/Externals/SDL/Include_1.2/SDL_copying.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
diff --git a/Externals/SDL/Include_1.2/SDL_cpuinfo.h b/Externals/SDL/Include_1.2/SDL_cpuinfo.h
deleted file mode 100644
index 72acbdd8ba..0000000000
--- a/Externals/SDL/Include_1.2/SDL_cpuinfo.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* CPU feature detection for SDL                                       */
-
-#ifndef _SDL_cpuinfo_h
-#define _SDL_cpuinfo_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This function returns true if the CPU has the RDTSC instruction
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
-
-/* This function returns true if the CPU has MMX features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
-
-/* This function returns true if the CPU has MMX Ext. features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
-
-/* This function returns true if the CPU has 3DNow features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
-
-/* This function returns true if the CPU has 3DNow! Ext. features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
-
-/* This function returns true if the CPU has SSE features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
-
-/* This function returns true if the CPU has SSE2 features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
-
-/* This function returns true if the CPU has AltiVec features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_cpuinfo_h */
diff --git a/Externals/SDL/Include_1.2/SDL_endian.h b/Externals/SDL/Include_1.2/SDL_endian.h
deleted file mode 100644
index 8f8db4ccae..0000000000
--- a/Externals/SDL/Include_1.2/SDL_endian.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Functions for reading and writing endian-specific values */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/* The two types of endianness */
-#define SDL_LIL_ENDIAN	1234
-#define SDL_BIG_ENDIAN	4321
-
-#ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
-#if defined(__hppa__) || \
-    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MISPEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
-    defined(__sparc__)
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER	SDL_LIL_ENDIAN
-#endif
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Use inline functions for compilers that support them, and static
-   functions for those that do not.  Because these functions become
-   static for compilers that do not support inline functions, this
-   header should only be included in files that actually use them.
-*/
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	Uint16 result;
-
-	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswap %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswapl %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	Uint32 result;
-
-	__asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (x>>24), "r" (x));
-	__asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (x));
-	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	union { 
-		struct { Uint32 a,b; } s;
-		Uint64 u;
-	} v;
-	v.u = x;
-	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
-	        : "=r" (v.s.a), "=r" (v.s.b) 
-	        : "0" (v.s.a), "1" (v.s.b)); 
-	return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	__asm__("bswapq %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#else
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	Uint32 hi, lo;
-
-	/* Separate into high and low 32-bit values and swap them */
-	lo = (Uint32)(x&0xFFFFFFFF);
-	x >>= 32;
-	hi = (Uint32)(x&0xFFFFFFFF);
-	x = SDL_Swap32(lo);
-	x <<= 32;
-	x |= SDL_Swap32(hi);
-	return(x);
-}
-#endif
-#else
-/* This is mainly to keep compilers from complaining in SDL code.
-   If there is no real 64-bit datatype, then compilers will complain about
-   the fake 64-bit datatype that SDL provides when it compiles user code.
-*/
-#define SDL_Swap64(X)	(X)
-#endif /* SDL_HAS_64BIT_TYPE */
-
-
-/* Byteswap item from the specified endianness to the native endianness */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X)	(X)
-#define SDL_SwapLE32(X)	(X)
-#define SDL_SwapLE64(X)	(X)
-#define SDL_SwapBE16(X)	SDL_Swap16(X)
-#define SDL_SwapBE32(X)	SDL_Swap32(X)
-#define SDL_SwapBE64(X)	SDL_Swap64(X)
-#else
-#define SDL_SwapLE16(X)	SDL_Swap16(X)
-#define SDL_SwapLE32(X)	SDL_Swap32(X)
-#define SDL_SwapLE64(X)	SDL_Swap64(X)
-#define SDL_SwapBE16(X)	(X)
-#define SDL_SwapBE32(X)	(X)
-#define SDL_SwapBE64(X)	(X)
-#endif
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
diff --git a/Externals/SDL/Include_1.2/SDL_error.h b/Externals/SDL/Include_1.2/SDL_error.h
deleted file mode 100644
index 26d6bfaef1..0000000000
--- a/Externals/SDL/Include_1.2/SDL_error.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Simple error message routines for SDL */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public functions */
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char * SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-
-/* Private error message function - used internally */
-#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum {
-	SDL_ENOMEM,
-	SDL_EFREAD,
-	SDL_EFWRITE,
-	SDL_EFSEEK,
-	SDL_UNSUPPORTED,
-	SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
diff --git a/Externals/SDL/Include_1.2/SDL_events.h b/Externals/SDL/Include_1.2/SDL_events.h
deleted file mode 100644
index 9fe918c7be..0000000000
--- a/Externals/SDL/Include_1.2/SDL_events.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL event handling */
-
-#ifndef _SDL_events_h
-#define _SDL_events_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_active.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_quit.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* General keyboard/mouse state definitions */
-#define SDL_RELEASED	0
-#define SDL_PRESSED	1
-
-/* Event enumerations */
-typedef enum {
-       SDL_NOEVENT = 0,			/* Unused (do not remove) */
-       SDL_ACTIVEEVENT,			/* Application loses/gains visibility */
-       SDL_KEYDOWN,			/* Keys pressed */
-       SDL_KEYUP,			/* Keys released */
-       SDL_MOUSEMOTION,			/* Mouse moved */
-       SDL_MOUSEBUTTONDOWN,		/* Mouse button pressed */
-       SDL_MOUSEBUTTONUP,		/* Mouse button released */
-       SDL_JOYAXISMOTION,		/* Joystick axis motion */
-       SDL_JOYBALLMOTION,		/* Joystick trackball motion */
-       SDL_JOYHATMOTION,		/* Joystick hat position change */
-       SDL_JOYBUTTONDOWN,		/* Joystick button pressed */
-       SDL_JOYBUTTONUP,			/* Joystick button released */
-       SDL_QUIT,			/* User-requested quit */
-       SDL_SYSWMEVENT,			/* System specific event */
-       SDL_EVENT_RESERVEDA,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVEDB,		/* Reserved for future use.. */
-       SDL_VIDEORESIZE,			/* User resized video mode */
-       SDL_VIDEOEXPOSE,			/* Screen needs to be redrawn */
-       SDL_EVENT_RESERVED2,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED3,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED4,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED5,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED6,		/* Reserved for future use.. */
-       SDL_EVENT_RESERVED7,		/* Reserved for future use.. */
-       /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-       SDL_USEREVENT = 24,
-       /* This last event is only for bounding internal arrays
-	  It is the number of bits in the event mask datatype -- Uint32
-        */
-       SDL_NUMEVENTS = 32
-} SDL_EventType;
-
-/* Predefined event masks */
-#define SDL_EVENTMASK(X)	(1<<(X))
-typedef enum {
-	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
-	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
-	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
-	SDL_KEYEVENTMASK	= SDL_EVENTMASK(SDL_KEYDOWN)|
-	                          SDL_EVENTMASK(SDL_KEYUP),
-	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
-	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
-	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_MOUSEEVENTMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_JOYAXISMOTIONMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION),
-	SDL_JOYBALLMOTIONMASK	= SDL_EVENTMASK(SDL_JOYBALLMOTION),
-	SDL_JOYHATMOTIONMASK	= SDL_EVENTMASK(SDL_JOYHATMOTION),
-	SDL_JOYBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
-	SDL_JOYBUTTONUPMASK	= SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_JOYEVENTMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBALLMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYHATMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_VIDEORESIZEMASK	= SDL_EVENTMASK(SDL_VIDEORESIZE),
-	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
-	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
-	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
-} SDL_EventMask ;
-#define SDL_ALLEVENTS		0xFFFFFFFF
-
-/* Application visibility event structure */
-typedef struct SDL_ActiveEvent {
-	Uint8 type;	/* SDL_ACTIVEEVENT */
-	Uint8 gain;	/* Whether given states were gained or lost (1/0) */
-	Uint8 state;	/* A mask of the focus states */
-} SDL_ActiveEvent;
-
-/* Keyboard event structure */
-typedef struct SDL_KeyboardEvent {
-	Uint8 type;	/* SDL_KEYDOWN or SDL_KEYUP */
-	Uint8 which;	/* The keyboard device index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
-	SDL_keysym keysym;
-} SDL_KeyboardEvent;
-
-/* Mouse motion event structure */
-typedef struct SDL_MouseMotionEvent {
-	Uint8 type;	/* SDL_MOUSEMOTION */
-	Uint8 which;	/* The mouse device index */
-	Uint8 state;	/* The current button state */
-	Uint16 x, y;	/* The X/Y coordinates of the mouse */
-	Sint16 xrel;	/* The relative motion in the X direction */
-	Sint16 yrel;	/* The relative motion in the Y direction */
-} SDL_MouseMotionEvent;
-
-/* Mouse button event structure */
-typedef struct SDL_MouseButtonEvent {
-	Uint8 type;	/* SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
-	Uint8 which;	/* The mouse device index */
-	Uint8 button;	/* The mouse button index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
-	Uint16 x, y;	/* The X/Y coordinates of the mouse at press time */
-} SDL_MouseButtonEvent;
-
-/* Joystick axis motion event structure */
-typedef struct SDL_JoyAxisEvent {
-	Uint8 type;	/* SDL_JOYAXISMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 axis;	/* The joystick axis index */
-	Sint16 value;	/* The axis value (range: -32768 to 32767) */
-} SDL_JoyAxisEvent;
-
-/* Joystick trackball motion event structure */
-typedef struct SDL_JoyBallEvent {
-	Uint8 type;	/* SDL_JOYBALLMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 ball;	/* The joystick trackball index */
-	Sint16 xrel;	/* The relative motion in the X direction */
-	Sint16 yrel;	/* The relative motion in the Y direction */
-} SDL_JoyBallEvent;
-
-/* Joystick hat position change event structure */
-typedef struct SDL_JoyHatEvent {
-	Uint8 type;	/* SDL_JOYHATMOTION */
-	Uint8 which;	/* The joystick device index */
-	Uint8 hat;	/* The joystick hat index */
-	Uint8 value;	/* The hat position value:
-			    SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-			    SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-			    SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-			   Note that zero means the POV is centered.
-			*/
-} SDL_JoyHatEvent;
-
-/* Joystick button event structure */
-typedef struct SDL_JoyButtonEvent {
-	Uint8 type;	/* SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
-	Uint8 which;	/* The joystick device index */
-	Uint8 button;	/* The joystick button index */
-	Uint8 state;	/* SDL_PRESSED or SDL_RELEASED */
-} SDL_JoyButtonEvent;
-
-/* The "window resized" event
-   When you get this event, you are responsible for setting a new video
-   mode with the new width and height.
- */
-typedef struct SDL_ResizeEvent {
-	Uint8 type;	/* SDL_VIDEORESIZE */
-	int w;		/* New width */
-	int h;		/* New height */
-} SDL_ResizeEvent;
-
-/* The "screen redraw" event */
-typedef struct SDL_ExposeEvent {
-	Uint8 type;	/* SDL_VIDEOEXPOSE */
-} SDL_ExposeEvent;
-
-/* The "quit requested" event */
-typedef struct SDL_QuitEvent {
-	Uint8 type;	/* SDL_QUIT */
-} SDL_QuitEvent;
-
-/* A user-defined event type */
-typedef struct SDL_UserEvent {
-	Uint8 type;	/* SDL_USEREVENT through SDL_NUMEVENTS-1 */
-	int code;	/* User defined event code */
-	void *data1;	/* User defined data pointer */
-	void *data2;	/* User defined data pointer */
-} SDL_UserEvent;
-
-/* If you want to use this event, you should include SDL_syswm.h */
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent {
-	Uint8 type;
-	SDL_SysWMmsg *msg;
-} SDL_SysWMEvent;
-
-/* General event structure */
-typedef union SDL_Event {
-	Uint8 type;
-	SDL_ActiveEvent active;
-	SDL_KeyboardEvent key;
-	SDL_MouseMotionEvent motion;
-	SDL_MouseButtonEvent button;
-	SDL_JoyAxisEvent jaxis;
-	SDL_JoyBallEvent jball;
-	SDL_JoyHatEvent jhat;
-	SDL_JoyButtonEvent jbutton;
-	SDL_ResizeEvent resize;
-	SDL_ExposeEvent expose;
-	SDL_QuitEvent quit;
-	SDL_UserEvent user;
-	SDL_SysWMEvent syswm;
-} SDL_Event;
-
-
-/* Function prototypes */
-
-/* Pumps the event loop, gathering events from the input devices.
-   This function updates the event queue and internal input device state.
-   This should only be run in the thread that sets the video mode.
-*/
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-
-/* Checks the event queue for messages and optionally returns them.
-   If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
-   the back of the event queue.
-   If 'action' is SDL_PEEKEVENT, up to 'numevents' events at the front
-   of the event queue, matching 'mask', will be returned and will not
-   be removed from the queue.
-   If 'action' is SDL_GETEVENT, up to 'numevents' events at the front 
-   of the event queue, matching 'mask', will be returned and will be
-   removed from the queue.
-   This function returns the number of events actually stored, or -1
-   if there was an error.  This function is thread-safe.
-*/
-typedef enum {
-	SDL_ADDEVENT,
-	SDL_PEEKEVENT,
-	SDL_GETEVENT
-} SDL_eventaction;
-/* */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents,
-				SDL_eventaction action, Uint32 mask);
-
-/* Polls for currently pending events, and returns 1 if there are any pending
-   events, or 0 if there are none available.  If 'event' is not NULL, the next
-   event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event *event);
-
-/* Waits indefinitely for the next available event, returning 1, or 0 if there
-   was an error while waiting for events.  If 'event' is not NULL, the next
-   event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event *event);
-
-/* Add an event to the event queue.
-   This function returns 0 on success, or -1 if the event queue was full
-   or there was some other error.
- */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);
-
-/*
-  This function sets up a filter to process all events before they
-  change internal state and are posted to the internal event queue.
-
-  The filter is protypted as:
-*/
-typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
-/*
-  If the filter returns 1, then the event will be added to the internal queue.
-  If it returns 0, then the event will be dropped from the queue, but the 
-  internal state will still be updated.  This allows selective filtering of
-  dynamically arriving events.
-
-  WARNING:  Be very careful of what you do in the event filter function, as 
-            it may run in a different thread!
-
-  There is one caveat when dealing with the SDL_QUITEVENT event type.  The
-  event filter is only called when the window manager desires to close the
-  application window.  If the event filter returns 1, then the window will
-  be closed, otherwise the window will remain open if possible.
-  If the quit event is generated by an interrupt signal, it will bypass the
-  internal queue and be delivered to the application at the next event poll.
-*/
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);
-
-/*
-  Return the current event filter - can be used to "chain" filters.
-  If there is no event filter set, this function returns NULL.
-*/
-extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);
-
-/*
-  This function allows you to set the state of processing certain events.
-  If 'state' is set to SDL_IGNORE, that event will be automatically dropped
-  from the event queue and will not event be filtered.
-  If 'state' is set to SDL_ENABLE, that event will be processed normally.
-  If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
-  current processing state of the specified event.
-*/
-#define SDL_QUERY	-1
-#define SDL_IGNORE	 0
-#define SDL_DISABLE	 0
-#define SDL_ENABLE	 1
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_events_h */
diff --git a/Externals/SDL/Include_1.2/SDL_getenv.h b/Externals/SDL/Include_1.2/SDL_getenv.h
deleted file mode 100644
index 853b9ce454..0000000000
--- a/Externals/SDL/Include_1.2/SDL_getenv.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/Externals/SDL/Include_1.2/SDL_joystick.h b/Externals/SDL/Include_1.2/SDL_joystick.h
deleted file mode 100644
index e4f72f1a41..0000000000
--- a/Externals/SDL/Include_1.2/SDL_joystick.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL joystick event handling */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* In order to use these functions, SDL_Init() must have been called
-   with the SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
-   for joysticks, and load appropriate drivers.
-*/
-
-/* The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-
-/* Function prototypes */
-/*
- * Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/*
- * Get the implementation dependent name of a joystick.
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char * SDLCALL SDL_JoystickName(int device_index);
-
-/*
- * Open a joystick for use - the index passed as an argument refers to
- * the N'th joystick on the system.  This index is the value which will
- * identify this joystick in future joystick events.
- *
- * This function returns a joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick * SDLCALL SDL_JoystickOpen(int device_index);
-
-/*
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/*
- * Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick *joystick);
-
-/*
- * Get the number of general axis controls on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick);
-
-/*
- * Get the number of trackballs on a joystick
- * Joystick trackballs have only relative motion events associated
- * with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick);
-
-/*
- * Get the number of POV hats on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick);
-
-/*
- * Get the number of buttons on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick);
-
-/*
- * Update the current state of the open joysticks.
- * This is called automatically by the event loop if any joystick
- * events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/*
- * Enable/disable joystick event polling.
- * If joystick events are disabled, you must call SDL_JoystickUpdate()
- * yourself and check the state of the joystick when you want joystick
- * information.
- * The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/*
- * Get the current state of an axis control on a joystick
- * The state is a value ranging from -32768 to 32767.
- * The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis);
-
-/*
- * Get the current state of a POV hat on a joystick
- * The return value is one of the following positions:
- */
-#define SDL_HAT_CENTERED	0x00
-#define SDL_HAT_UP		0x01
-#define SDL_HAT_RIGHT		0x02
-#define SDL_HAT_DOWN		0x04
-#define SDL_HAT_LEFT		0x08
-#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*
- * The hat indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat);
-
-/*
- * Get the ball axis change since the last poll
- * This returns 0, or -1 if you passed it invalid parameters.
- * The ball indices start at index 0.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy);
-
-/*
- * Get the current state of a button on a joystick
- * The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button);
-
-/*
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
diff --git a/Externals/SDL/Include_1.2/SDL_keyboard.h b/Externals/SDL/Include_1.2/SDL_keyboard.h
deleted file mode 100644
index 1ad7dcaa44..0000000000
--- a/Externals/SDL/Include_1.2/SDL_keyboard.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL keyboard event handling */
-
-#ifndef _SDL_keyboard_h
-#define _SDL_keyboard_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keysym.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Keysym structure
-   - The scancode is hardware dependent, and should not be used by general
-     applications.  If no hardware scancode is available, it will be 0.
-
-   - The 'unicode' translated character is only available when character
-     translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
-     this is a UNICODE character corresponding to the keypress.  If the
-     high 9 bits of the character are 0, then this maps to the equivalent
-     ASCII character:
-	char ch;
-	if ( (keysym.unicode & 0xFF80) == 0 ) {
-		ch = keysym.unicode & 0x7F;
-	} else {
-		An international character..
-	}
- */
-typedef struct SDL_keysym {
-	Uint8 scancode;			/* hardware specific scancode */
-	SDLKey sym;			/* SDL virtual keysym */
-	SDLMod mod;			/* current key modifiers */
-	Uint16 unicode;			/* translated character */
-} SDL_keysym;
-
-/* This is the mask which refers to all hotkey bindings */
-#define SDL_ALL_HOTKEYS		0xFFFFFFFF
-
-/* Function prototypes */
-/*
- * Enable/Disable UNICODE translation of keyboard input.
- * This translation has some overhead, so translation defaults off.
- * If 'enable' is 1, translation is enabled.
- * If 'enable' is 0, translation is disabled.
- * If 'enable' is -1, the translation state is not changed.
- * It returns the previous state of keyboard translation.
- */
-extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
-
-/*
- * Enable/Disable keyboard repeat.  Keyboard repeat defaults to off.
- * 'delay' is the initial delay in ms between the time when a key is
- * pressed, and keyboard repeat begins.
- * 'interval' is the time in ms between keyboard repeat events.
- */
-#define SDL_DEFAULT_REPEAT_DELAY	500
-#define SDL_DEFAULT_REPEAT_INTERVAL	30
-/*
- * If 'delay' is set to 0, keyboard repeat is disabled.
- */
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
-
-/*
- * Get a snapshot of the current state of the keyboard.
- * Returns an array of keystates, indexed by the SDLK_* syms.
- * Used:
- * 	Uint8 *keystate = SDL_GetKeyState(NULL);
- *	if ( keystate[SDLK_RETURN] ) ... <RETURN> is pressed.
- */
-extern DECLSPEC Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
-
-/*
- * Get the current key modifier state
- */
-extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);
-
-/*
- * Set the current key modifier state
- * This does not change the keyboard state, only the key modifier flags.
- */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
-
-/*
- * Get the name of an SDL virtual keysym
- */
-extern DECLSPEC char * SDLCALL SDL_GetKeyName(SDLKey key);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_keyboard_h */
diff --git a/Externals/SDL/Include_1.2/SDL_keysym.h b/Externals/SDL/Include_1.2/SDL_keysym.h
deleted file mode 100644
index ff44a035f9..0000000000
--- a/Externals/SDL/Include_1.2/SDL_keysym.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_keysym_h
-#define _SDL_keysym_h
-
-/* What we really want is a mapping of every raw key on the keyboard.
-   To support international keyboards, we use the range 0xA1 - 0xFF
-   as international virtual keycodes.  We'll follow in the footsteps of X11...
-   The names of the keys
- */
- 
-typedef enum {
-	/* The keyboard syms have been cleverly chosen to map to ASCII */
-	SDLK_UNKNOWN		= 0,
-	SDLK_FIRST		= 0,
-	SDLK_BACKSPACE		= 8,
-	SDLK_TAB		= 9,
-	SDLK_CLEAR		= 12,
-	SDLK_RETURN		= 13,
-	SDLK_PAUSE		= 19,
-	SDLK_ESCAPE		= 27,
-	SDLK_SPACE		= 32,
-	SDLK_EXCLAIM		= 33,
-	SDLK_QUOTEDBL		= 34,
-	SDLK_HASH		= 35,
-	SDLK_DOLLAR		= 36,
-	SDLK_AMPERSAND		= 38,
-	SDLK_QUOTE		= 39,
-	SDLK_LEFTPAREN		= 40,
-	SDLK_RIGHTPAREN		= 41,
-	SDLK_ASTERISK		= 42,
-	SDLK_PLUS		= 43,
-	SDLK_COMMA		= 44,
-	SDLK_MINUS		= 45,
-	SDLK_PERIOD		= 46,
-	SDLK_SLASH		= 47,
-	SDLK_0			= 48,
-	SDLK_1			= 49,
-	SDLK_2			= 50,
-	SDLK_3			= 51,
-	SDLK_4			= 52,
-	SDLK_5			= 53,
-	SDLK_6			= 54,
-	SDLK_7			= 55,
-	SDLK_8			= 56,
-	SDLK_9			= 57,
-	SDLK_COLON		= 58,
-	SDLK_SEMICOLON		= 59,
-	SDLK_LESS		= 60,
-	SDLK_EQUALS		= 61,
-	SDLK_GREATER		= 62,
-	SDLK_QUESTION		= 63,
-	SDLK_AT			= 64,
-	/* 
-	   Skip uppercase letters
-	 */
-	SDLK_LEFTBRACKET	= 91,
-	SDLK_BACKSLASH		= 92,
-	SDLK_RIGHTBRACKET	= 93,
-	SDLK_CARET		= 94,
-	SDLK_UNDERSCORE		= 95,
-	SDLK_BACKQUOTE		= 96,
-	SDLK_a			= 97,
-	SDLK_b			= 98,
-	SDLK_c			= 99,
-	SDLK_d			= 100,
-	SDLK_e			= 101,
-	SDLK_f			= 102,
-	SDLK_g			= 103,
-	SDLK_h			= 104,
-	SDLK_i			= 105,
-	SDLK_j			= 106,
-	SDLK_k			= 107,
-	SDLK_l			= 108,
-	SDLK_m			= 109,
-	SDLK_n			= 110,
-	SDLK_o			= 111,
-	SDLK_p			= 112,
-	SDLK_q			= 113,
-	SDLK_r			= 114,
-	SDLK_s			= 115,
-	SDLK_t			= 116,
-	SDLK_u			= 117,
-	SDLK_v			= 118,
-	SDLK_w			= 119,
-	SDLK_x			= 120,
-	SDLK_y			= 121,
-	SDLK_z			= 122,
-	SDLK_DELETE		= 127,
-	/* End of ASCII mapped keysyms */
-
-	/* International keyboard syms */
-	SDLK_WORLD_0		= 160,		/* 0xA0 */
-	SDLK_WORLD_1		= 161,
-	SDLK_WORLD_2		= 162,
-	SDLK_WORLD_3		= 163,
-	SDLK_WORLD_4		= 164,
-	SDLK_WORLD_5		= 165,
-	SDLK_WORLD_6		= 166,
-	SDLK_WORLD_7		= 167,
-	SDLK_WORLD_8		= 168,
-	SDLK_WORLD_9		= 169,
-	SDLK_WORLD_10		= 170,
-	SDLK_WORLD_11		= 171,
-	SDLK_WORLD_12		= 172,
-	SDLK_WORLD_13		= 173,
-	SDLK_WORLD_14		= 174,
-	SDLK_WORLD_15		= 175,
-	SDLK_WORLD_16		= 176,
-	SDLK_WORLD_17		= 177,
-	SDLK_WORLD_18		= 178,
-	SDLK_WORLD_19		= 179,
-	SDLK_WORLD_20		= 180,
-	SDLK_WORLD_21		= 181,
-	SDLK_WORLD_22		= 182,
-	SDLK_WORLD_23		= 183,
-	SDLK_WORLD_24		= 184,
-	SDLK_WORLD_25		= 185,
-	SDLK_WORLD_26		= 186,
-	SDLK_WORLD_27		= 187,
-	SDLK_WORLD_28		= 188,
-	SDLK_WORLD_29		= 189,
-	SDLK_WORLD_30		= 190,
-	SDLK_WORLD_31		= 191,
-	SDLK_WORLD_32		= 192,
-	SDLK_WORLD_33		= 193,
-	SDLK_WORLD_34		= 194,
-	SDLK_WORLD_35		= 195,
-	SDLK_WORLD_36		= 196,
-	SDLK_WORLD_37		= 197,
-	SDLK_WORLD_38		= 198,
-	SDLK_WORLD_39		= 199,
-	SDLK_WORLD_40		= 200,
-	SDLK_WORLD_41		= 201,
-	SDLK_WORLD_42		= 202,
-	SDLK_WORLD_43		= 203,
-	SDLK_WORLD_44		= 204,
-	SDLK_WORLD_45		= 205,
-	SDLK_WORLD_46		= 206,
-	SDLK_WORLD_47		= 207,
-	SDLK_WORLD_48		= 208,
-	SDLK_WORLD_49		= 209,
-	SDLK_WORLD_50		= 210,
-	SDLK_WORLD_51		= 211,
-	SDLK_WORLD_52		= 212,
-	SDLK_WORLD_53		= 213,
-	SDLK_WORLD_54		= 214,
-	SDLK_WORLD_55		= 215,
-	SDLK_WORLD_56		= 216,
-	SDLK_WORLD_57		= 217,
-	SDLK_WORLD_58		= 218,
-	SDLK_WORLD_59		= 219,
-	SDLK_WORLD_60		= 220,
-	SDLK_WORLD_61		= 221,
-	SDLK_WORLD_62		= 222,
-	SDLK_WORLD_63		= 223,
-	SDLK_WORLD_64		= 224,
-	SDLK_WORLD_65		= 225,
-	SDLK_WORLD_66		= 226,
-	SDLK_WORLD_67		= 227,
-	SDLK_WORLD_68		= 228,
-	SDLK_WORLD_69		= 229,
-	SDLK_WORLD_70		= 230,
-	SDLK_WORLD_71		= 231,
-	SDLK_WORLD_72		= 232,
-	SDLK_WORLD_73		= 233,
-	SDLK_WORLD_74		= 234,
-	SDLK_WORLD_75		= 235,
-	SDLK_WORLD_76		= 236,
-	SDLK_WORLD_77		= 237,
-	SDLK_WORLD_78		= 238,
-	SDLK_WORLD_79		= 239,
-	SDLK_WORLD_80		= 240,
-	SDLK_WORLD_81		= 241,
-	SDLK_WORLD_82		= 242,
-	SDLK_WORLD_83		= 243,
-	SDLK_WORLD_84		= 244,
-	SDLK_WORLD_85		= 245,
-	SDLK_WORLD_86		= 246,
-	SDLK_WORLD_87		= 247,
-	SDLK_WORLD_88		= 248,
-	SDLK_WORLD_89		= 249,
-	SDLK_WORLD_90		= 250,
-	SDLK_WORLD_91		= 251,
-	SDLK_WORLD_92		= 252,
-	SDLK_WORLD_93		= 253,
-	SDLK_WORLD_94		= 254,
-	SDLK_WORLD_95		= 255,		/* 0xFF */
-
-	/* Numeric keypad */
-	SDLK_KP0		= 256,
-	SDLK_KP1		= 257,
-	SDLK_KP2		= 258,
-	SDLK_KP3		= 259,
-	SDLK_KP4		= 260,
-	SDLK_KP5		= 261,
-	SDLK_KP6		= 262,
-	SDLK_KP7		= 263,
-	SDLK_KP8		= 264,
-	SDLK_KP9		= 265,
-	SDLK_KP_PERIOD		= 266,
-	SDLK_KP_DIVIDE		= 267,
-	SDLK_KP_MULTIPLY	= 268,
-	SDLK_KP_MINUS		= 269,
-	SDLK_KP_PLUS		= 270,
-	SDLK_KP_ENTER		= 271,
-	SDLK_KP_EQUALS		= 272,
-
-	/* Arrows + Home/End pad */
-	SDLK_UP			= 273,
-	SDLK_DOWN		= 274,
-	SDLK_RIGHT		= 275,
-	SDLK_LEFT		= 276,
-	SDLK_INSERT		= 277,
-	SDLK_HOME		= 278,
-	SDLK_END		= 279,
-	SDLK_PAGEUP		= 280,
-	SDLK_PAGEDOWN		= 281,
-
-	/* Function keys */
-	SDLK_F1			= 282,
-	SDLK_F2			= 283,
-	SDLK_F3			= 284,
-	SDLK_F4			= 285,
-	SDLK_F5			= 286,
-	SDLK_F6			= 287,
-	SDLK_F7			= 288,
-	SDLK_F8			= 289,
-	SDLK_F9			= 290,
-	SDLK_F10		= 291,
-	SDLK_F11		= 292,
-	SDLK_F12		= 293,
-	SDLK_F13		= 294,
-	SDLK_F14		= 295,
-	SDLK_F15		= 296,
-
-	/* Key state modifier keys */
-	SDLK_NUMLOCK		= 300,
-	SDLK_CAPSLOCK		= 301,
-	SDLK_SCROLLOCK		= 302,
-	SDLK_RSHIFT		= 303,
-	SDLK_LSHIFT		= 304,
-	SDLK_RCTRL		= 305,
-	SDLK_LCTRL		= 306,
-	SDLK_RALT		= 307,
-	SDLK_LALT		= 308,
-	SDLK_RMETA		= 309,
-	SDLK_LMETA		= 310,
-	SDLK_LSUPER		= 311,		/* Left "Windows" key */
-	SDLK_RSUPER		= 312,		/* Right "Windows" key */
-	SDLK_MODE		= 313,		/* "Alt Gr" key */
-	SDLK_COMPOSE		= 314,		/* Multi-key compose key */
-
-	/* Miscellaneous function keys */
-	SDLK_HELP		= 315,
-	SDLK_PRINT		= 316,
-	SDLK_SYSREQ		= 317,
-	SDLK_BREAK		= 318,
-	SDLK_MENU		= 319,
-	SDLK_POWER		= 320,		/* Power Macintosh power key */
-	SDLK_EURO		= 321,		/* Some european keyboards */
-	SDLK_UNDO		= 322,		/* Atari keyboard has Undo */
-
-	/* Add any other keys here */
-
-	SDLK_LAST
-} SDLKey;
-
-/* Enumeration of valid key mods (possibly OR'd together) */
-typedef enum {
-	KMOD_NONE  = 0x0000,
-	KMOD_LSHIFT= 0x0001,
-	KMOD_RSHIFT= 0x0002,
-	KMOD_LCTRL = 0x0040,
-	KMOD_RCTRL = 0x0080,
-	KMOD_LALT  = 0x0100,
-	KMOD_RALT  = 0x0200,
-	KMOD_LMETA = 0x0400,
-	KMOD_RMETA = 0x0800,
-	KMOD_NUM   = 0x1000,
-	KMOD_CAPS  = 0x2000,
-	KMOD_MODE  = 0x4000,
-	KMOD_RESERVED = 0x8000
-} SDLMod;
-
-#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
-#define KMOD_META	(KMOD_LMETA|KMOD_RMETA)
-
-#endif /* _SDL_keysym_h */
diff --git a/Externals/SDL/Include_1.2/SDL_loadso.h b/Externals/SDL/Include_1.2/SDL_loadso.h
deleted file mode 100644
index ce96449494..0000000000
--- a/Externals/SDL/Include_1.2/SDL_loadso.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* System dependent library loading routines                           */
-
-/* Some things to keep in mind:                                        
-   - These functions only work on C function names.  Other languages may
-     have name mangling and intrinsic language support that varies from
-     compiler to compiler.
-   - Make sure you declare your function pointers with the same calling
-     convention as the actual library function.  Your code will crash
-     mysteriously if you do not do this.
-   - Avoid namespace collisions.  If you load a symbol from the library,
-     it is not defined whether or not it goes into the global symbol
-     namespace for the application.  If it does and it conflicts with
-     symbols in your code or other shared libraries, you will not get
-     the results you expect. :)
-*/
-
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This function dynamically loads a shared object and returns a pointer
- * to the object handle (or NULL if there was an error).
- * The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
-
-/* Given an object handle, this function looks up the address of the
- * named function in the shared object and returns it.  This address
- * is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
-
-/* Unload a shared object from memory */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */
diff --git a/Externals/SDL/Include_1.2/SDL_main.h b/Externals/SDL/Include_1.2/SDL_main.h
deleted file mode 100644
index cf8b728dc3..0000000000
--- a/Externals/SDL/Include_1.2/SDL_main.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
-
-#if defined(__WIN32__) || \
-    (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__MACOS__) || defined(__MACOSX__) || \
-    defined(__SYMBIAN32__) || defined(QWS)
-
-#ifdef __cplusplus
-#define C_LINKAGE	"C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/* The application's main() function must be called with C linkage,
-   and should be declared like this:
-#ifdef __cplusplus
-extern "C"
-#endif
-	int main(int argc, char *argv[])
-	{
-	}
- */
-#define main	SDL_main
-
-/* The prototype for the application's main() function */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This should be called from your WinMain() function, if any */
-extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst);
-/* This can also be called, but is no longer necessary */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
-/* This can also be called, but is no longer necessary (SDL_Quit calls it) */
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-
-/* From the SDL library code -- needed for registering QuickDraw on MacOS */
-#if defined(__MACOS__)
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Forward declaration so we don't need to include QuickDraw.h */
-struct QDGlobals;
-
-/* This should be called from your main() function, if any */
-extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
-
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
diff --git a/Externals/SDL/Include_1.2/SDL_mouse.h b/Externals/SDL/Include_1.2/SDL_mouse.h
deleted file mode 100644
index 019497fbb1..0000000000
--- a/Externals/SDL/Include_1.2/SDL_mouse.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL mouse event handling */
-
-#ifndef _SDL_mouse_h
-#define _SDL_mouse_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct WMcursor WMcursor;	/* Implementation dependent */
-typedef struct SDL_Cursor {
-	SDL_Rect area;			/* The area of the mouse cursor */
-	Sint16 hot_x, hot_y;		/* The "tip" of the cursor */
-	Uint8 *data;			/* B/W cursor data */
-	Uint8 *mask;			/* B/W cursor mask */
-	Uint8 *save[2];			/* Place to save cursor area */
-	WMcursor *wm_cursor;		/* Window-manager cursor */
-} SDL_Cursor;
-
-/* Function prototypes */
-/*
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * current mouse cursor position.  You can pass NULL for either x or y.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);
-
-/*
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * mouse deltas since the last call to SDL_GetRelativeMouseState().
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
-
-/*
- * Set the position of the mouse cursor (generates a mouse motion event)
- */
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
-
-/*
- * Create a cursor using the specified data and mask (in MSB format).
- * The cursor width must be a multiple of 8 bits.
- *
- * The cursor is created in black and white according to the following:
- * data  mask    resulting pixel on screen
- *  0     1       White
- *  1     1       Black
- *  0     0       Transparent
- *  1     0       Inverted color if possible, black if not.
- *
- * Cursors created with this function must be freed with SDL_FreeCursor().
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_CreateCursor
-		(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);
-
-/*
- * Set the currently active cursor to the specified one.
- * If the cursor is currently visible, the change will be immediately 
- * represented on the display.
- */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor *cursor);
-
-/*
- * Returns the currently active cursor.
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_GetCursor(void);
-
-/*
- * Deallocates a cursor created with SDL_CreateCursor().
- */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor *cursor);
-
-/*
- * Toggle whether or not the cursor is shown on the screen.
- * The cursor start off displayed, but can be turned off.
- * SDL_ShowCursor() returns 1 if the cursor was being displayed
- * before the call, or 0 if it was not.  You can query the current
- * state by passing a 'toggle' value of -1.
- */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
-
-/* Used as a mask when testing buttons in buttonstate
-   Button 1:	Left mouse button
-   Button 2:	Middle mouse button
-   Button 3:	Right mouse button
-   Button 4:	Mouse wheel up	 (may also be a real button)
-   Button 5:	Mouse wheel down (may also be a real button)
- */
-#define SDL_BUTTON(X)		(1 << ((X)-1))
-#define SDL_BUTTON_LEFT		1
-#define SDL_BUTTON_MIDDLE	2
-#define SDL_BUTTON_RIGHT	3
-#define SDL_BUTTON_WHEELUP	4
-#define SDL_BUTTON_WHEELDOWN	5
-#define SDL_BUTTON_X1		6
-#define SDL_BUTTON_X2		7
-#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
-#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
-#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
-#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
-#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
diff --git a/Externals/SDL/Include_1.2/SDL_mutex.h b/Externals/SDL/Include_1.2/SDL_mutex.h
deleted file mode 100644
index 00165281de..0000000000
--- a/Externals/SDL/Include_1.2/SDL_mutex.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_mutex_h
-#define _SDL_mutex_h
-
-/* Functions to provide thread synchronization primitives
-
-	These are independent of the other SDL routines.
-*/
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Synchronization functions which can time out return this value
-   if they time out.
-*/
-#define SDL_MUTEX_TIMEDOUT	1
-
-/* This is the timeout value which corresponds to never time out */
-#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Mutex functions                                               */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL mutex structure, defined in SDL_mutex.c */
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-
-/* Create a mutex, initialized unlocked */
-extern DECLSPEC SDL_mutex * SDLCALL SDL_CreateMutex(void);
-
-/* Lock the mutex  (Returns 0, or -1 on error) */
-#define SDL_LockMutex(m)	SDL_mutexP(m)
-extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex *mutex);
-
-/* Unlock the mutex  (Returns 0, or -1 on error)
-   It is an error to unlock a mutex that has not been locked by
-   the current thread, and doing so results in undefined behavior.
- */
-#define SDL_UnlockMutex(m)	SDL_mutexV(m)
-extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex *mutex);
-
-/* Destroy a mutex */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Semaphore functions                                           */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL semaphore structure, defined in SDL_sem.c */
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-
-/* Create a semaphore, initialized with value, returns NULL on failure. */
-extern DECLSPEC SDL_sem * SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
-
-/* Destroy a semaphore */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem *sem);
-
-/* This function suspends the calling thread until the semaphore pointed 
- * to by sem has a positive count. It then atomically decreases the semaphore
- * count.
- */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem *sem);
-
-/* Non-blocking variant of SDL_SemWait(), returns 0 if the wait succeeds,
-   SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
-*/
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem *sem);
-
-/* Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
-   the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
-   the allotted time, and -1 on error.
-   On some platforms this function is implemented by looping with a delay
-   of 1 ms, and so should be avoided if possible.
-*/
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms);
-
-/* Atomically increases the semaphore's count (not blocking), returns 0,
-   or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem *sem);
-
-/* Returns the current count of the semaphore */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem *sem);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Condition variable functions                                  */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL condition variable structure, defined in SDL_cond.c */
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-
-/* Create a condition variable */
-extern DECLSPEC SDL_cond * SDLCALL SDL_CreateCond(void);
-
-/* Destroy a condition variable */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond *cond);
-
-/* Restart one of the threads that are waiting on the condition variable,
-   returns 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond *cond);
-
-/* Restart all threads that are waiting on the condition variable,
-   returns 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond *cond);
-
-/* Wait on the condition variable, unlocking the provided mutex.
-   The mutex must be locked before entering this function!
-   The mutex is re-locked once the condition variable is signaled.
-   Returns 0 when it is signaled, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
-
-/* Waits for at most 'ms' milliseconds, and returns 0 if the condition
-   variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
-   signaled in the allotted time, and -1 on error.
-   On some platforms this function is implemented by looping with a delay
-   of 1 ms, and so should be avoided if possible.
-*/
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mutex_h */
diff --git a/Externals/SDL/Include_1.2/SDL_name.h b/Externals/SDL/Include_1.2/SDL_name.h
deleted file mode 100644
index 511619af56..0000000000
--- a/Externals/SDL/Include_1.2/SDL_name.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NeedFunctionPrototypes 1
-#endif
-
-#define SDL_NAME(X)	SDL_##X
-
-#endif /* _SDLname_h_ */
diff --git a/Externals/SDL/Include_1.2/SDL_opengl.h b/Externals/SDL/Include_1.2/SDL_opengl.h
deleted file mode 100644
index 36c0a3099e..0000000000
--- a/Externals/SDL/Include_1.2/SDL_opengl.h
+++ /dev/null
@@ -1,6551 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This is a simple file to encapsulate the OpenGL API headers */
-
-#include "SDL_config.h"
-
-#ifdef __WIN32__
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX	/* Don't defined min() and max() */
-#endif
-#include <windows.h>
-#endif
-#ifndef NO_SDL_GLEXT
-#define __glext_h_  /* Don't let gl.h include glext.h */
-#endif
-#if defined(__MACOSX__)
-#include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
-#elif defined(__MACOS__)
-#include <gl.h>		/* Header File For The OpenGL Library */
-#include <glu.h>	/* Header File For The GLU Library */
-#else
-#include <GL/gl.h>	/* Header File For The OpenGL Library */
-#include <GL/glu.h>	/* Header File For The GLU Library */
-#endif
-#ifndef NO_SDL_GLEXT
-#undef __glext_h_
-#endif
-
-/* This file taken from "GLext.h" from the Jeff Molofee OpenGL tutorials.
-   It is included here because glext.h is not available on some systems.
-   If you don't want this version included, simply define "NO_SDL_GLEXT"
- */
-#ifndef NO_SDL_GLEXT
-#if !defined(__glext_h_) && !defined(GL_GLEXT_LEGACY)
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2005/06/20 */
-/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 29
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_EXT_color_matrix
-#define GL_EXT_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif /* NO_SDL_GLEXT */
diff --git a/Externals/SDL/Include_1.2/SDL_platform.h b/Externals/SDL/Include_1.2/SDL_platform.h
deleted file mode 100644
index 1bfee29ec0..0000000000
--- a/Externals/SDL/Include_1.2/SDL_platform.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Try to get a standard set of platform defines */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__		1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__	1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__	1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__	1
-#endif
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__	1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__	1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__	1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__	1
-#endif
-#if defined(__APPLE__)
-#undef __MACOSX__
-#define __MACOSX__	1
-#elif defined(macintosh)
-#undef __MACOS__
-#define __MACOS__	1
-#endif
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__	1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__	1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__		1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__		1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__	1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__	1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__	1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__	1
-#endif
-
-#endif /* _SDL_platform_h */
diff --git a/Externals/SDL/Include_1.2/SDL_quit.h b/Externals/SDL/Include_1.2/SDL_quit.h
deleted file mode 100644
index fcf40fbdda..0000000000
--- a/Externals/SDL/Include_1.2/SDL_quit.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL quit event handling */
-
-#ifndef _SDL_quit_h
-#define _SDL_quit_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* 
-  An SDL_QUITEVENT is generated when the user tries to close the application
-  window.  If it is ignored or filtered out, the window will remain open.
-  If it is not ignored or filtered, it is queued normally and the window
-  is allowed to close.  When the window is closed, screen updates will 
-  complete, but have no effect.
-
-  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
-  and SIGTERM (system termination request), if handlers do not already
-  exist, that generate SDL_QUITEVENT events as well.  There is no way
-  to determine the cause of an SDL_QUITEVENT, but setting a signal
-  handler in your application will override the default generation of
-  quit events for that signal.
-*/
-
-/* There are no functions directly affecting the quit event */
-#define SDL_QuitRequested() \
-        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUITMASK))
-
-#endif /* _SDL_quit_h */
diff --git a/Externals/SDL/Include_1.2/SDL_rwops.h b/Externals/SDL/Include_1.2/SDL_rwops.h
deleted file mode 100644
index 8c177017f5..0000000000
--- a/Externals/SDL/Include_1.2/SDL_rwops.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file provides a general interface for SDL to read and write
-   data sources.  It can easily be extended to files, memory, etc.
-*/
-
-#ifndef _SDL_rwops_h
-#define _SDL_rwops_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the read/write operation structure -- very basic */
-
-typedef struct SDL_RWops {
-	/* Seek to 'offset' relative to whence, one of stdio's whence values:
-		SEEK_SET, SEEK_CUR, SEEK_END
-	   Returns the final offset in the data source.
-	 */
-	int (SDLCALL *seek)(struct SDL_RWops *context, int offset, int whence);
-
-	/* Read up to 'num' objects each of size 'objsize' from the data
-	   source to the area pointed at by 'ptr'.
-	   Returns the number of objects read, or -1 if the read failed.
-	 */
-	int (SDLCALL *read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);
-
-	/* Write exactly 'num' objects each of size 'objsize' from the area
-	   pointed at by 'ptr' to data source.
-	   Returns 'num', or -1 if the write failed.
-	 */
-	int (SDLCALL *write)(struct SDL_RWops *context, const void *ptr, int size, int num);
-
-	/* Close and free an allocated SDL_FSops structure */
-	int (SDLCALL *close)(struct SDL_RWops *context);
-
-	Uint32 type;
-	union {
-#if defined(__WIN32__) && !defined(__SYMBIAN32__)
-	    struct {
-		int   append;
-		void *h;
-		struct {
-		    void *data;
-		    int size;
-		    int left;
-		} buffer;
-	    } win32io;
-#endif
-#ifdef HAVE_STDIO_H 
-	    struct {
-		int autoclose;
-	 	FILE *fp;
-	    } stdio;
-#endif
-	    struct {
-		Uint8 *base;
-	 	Uint8 *here;
-		Uint8 *stop;
-	    } mem;
-	    struct {
-		void *data1;
-	    } unknown;
-	} hidden;
-
-} SDL_RWops;
-
-
-/* Functions to create SDL_RWops structures from various data sources */
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);
-
-#ifdef HAVE_STDIO_H
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFP(FILE *fp, int autoclose);
-#endif
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromMem(void *mem, int size);
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromConstMem(const void *mem, int size);
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_AllocRW(void);
-extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops *area);
-
-#define RW_SEEK_SET	0	/* Seek from the beginning of data */
-#define RW_SEEK_CUR	1	/* Seek relative to current read point */
-#define RW_SEEK_END	2	/* Seek relative to the end of data */
-
-/* Macros to easily read and write from an SDL_RWops structure */
-#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)		(ctx)->close(ctx)
-
-
-/* Read an item of the specified endianness and return in native format */
-extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops *src);
-
-/* Write an item of native format to the specified endianness */
-extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops *dst, Uint64 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rwops_h */
diff --git a/Externals/SDL/Include_1.2/SDL_stdinc.h b/Externals/SDL/Include_1.2/SDL_stdinc.h
deleted file mode 100644
index e47c21daff..0000000000
--- a/Externals/SDL/Include_1.2/SDL_stdinc.h
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This is a general header that includes C language support */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-#  include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-#  include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_ICONV_H
-# include <iconv.h>
-#endif
-
-/* The number of elements in an array */
-#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)	SDL_arraysize(table)
-
-/* Basic data types */
-typedef enum SDL_bool {
-	SDL_FALSE = 0,
-	SDL_TRUE  = 1
-} SDL_bool;
-
-typedef int8_t		Sint8;
-typedef uint8_t		Uint8;
-typedef int16_t		Sint16;
-typedef uint16_t	Uint16;
-typedef int32_t		Sint32;
-typedef uint32_t	Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-typedef int64_t		Sint64;
-#ifndef SYMBIAN32_GCCE
-typedef uint64_t	Uint64;
-#endif
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef struct {
-	Uint32 hi;
-	Uint32 lo;
-} Uint64, Sint64;
-#endif
-
-/* Make sure the types really have the right sizes */
-#define SDL_COMPILE_TIME_ASSERT(name, x)               \
-       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-
-/* Check to make sure enums are the size of ints, for structure packing.
-   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
-   enums having the size of an int must be enabled.
-   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
-*/
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-typedef enum {
-	DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-#ifndef __NDS__
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc	malloc
-#else
-extern DECLSPEC void * SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc	calloc
-#else
-extern DECLSPEC void * SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc	realloc
-#else
-extern DECLSPEC void * SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free	free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-#  include <alloca.h>
-# elif defined(__GNUC__)
-#  define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-#  include <malloc.h>
-#  define alloca _alloca
-# elif defined(__WATCOMC__)
-#  include <malloc.h>
-# elif defined(__BORLANDC__)
-#  include <malloc.h>
-# elif defined(__DMC__)
-#  include <stdlib.h>
-# elif defined(__AIX__)
-  #pragma alloca
-# elif defined(__MRC__)
-   void *alloca (unsigned);
-# else
-   char *alloca ();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data)            SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv	getenv
-#else
-extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
-#endif
-
-#ifdef HAVE_PUTENV
-#define SDL_putenv	putenv
-#else
-extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort	qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
-           int (*compare)(const void *, const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs		abs
-#else
-#define SDL_abs(X)	((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y)	(((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y)	(((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X)  isdigit(X)
-#define SDL_isspace(X)  isspace(X)
-#define SDL_toupper(X)  toupper(X)
-#define SDL_tolower(X)  tolower(X)
-#else
-#define SDL_isdigit(X)  (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X)  (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X)  (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X)  (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset      memset
-#else
-extern DECLSPEC void * SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len)				\
-do {								\
-	int u0, u1, u2;						\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; stosl\n\t"				\
-		: "=&D" (u0), "=&a" (u1), "=&c" (u2)		\
-		: "0" (dst), "1" (val), "2" ((Uint32)(len))	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len)		\
-do {						\
-	unsigned _count = (len);		\
-	unsigned _n = (_count + 3) / 4;		\
-	Uint32 *_p = (Uint32 *)(dst);		\
-	Uint32 _val = (val);			\
-        switch (_count % 4) {			\
-        case 0: do {    *_p++ = _val;		\
-        case 3:         *_p++ = _val;		\
-        case 2:         *_p++ = _val;		\
-        case 1:         *_p++ = _val;		\
-		} while ( --_n );		\
-	}					\
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len)					  \
-do {									  \
-	int u0, u1, u2;						  	  \
-	__asm__ __volatile__ (						  \
-		"cld\n\t"						  \
-		"rep ; movsl\n\t"					  \
-		"testb $2,%b4\n\t"					  \
-		"je 1f\n\t"						  \
-		"movsw\n"						  \
-		"1:\ttestb $1,%b4\n\t"					  \
-		"je 2f\n\t"						  \
-		"movsb\n"						  \
-		"2:"							  \
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)			  \
-		: "0" ((unsigned)(len)/4), "q" (len), "1" (dst),"2" (src) \
-		: "memory" );						  \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy      memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n)	bcopy((s), (d), (n))
-#else
-extern DECLSPEC void * SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len)				\
-do {								\
-	int ecx, edi, esi;					\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; movsl"					\
-		: "=&c" (ecx), "=&D" (edi), "=&S" (esi)		\
-		: "0" ((unsigned)(len)), "1" (dst), "2" (src)	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len)			\
-do {							\
-	int u0, u1, u2;					\
-	char *dstp = (char *)(dst);			\
-	char *srcp = (char *)(src);			\
-	int n = (len);					\
-	if ( n >= 4 ) {					\
-	__asm__ __volatile__ (				\
-		"std\n\t"				\
-		"rep ; movsl\n\t"			\
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)	\
-		: "0" (n >> 2),				\
-		  "1" (dstp+(n-4)), "2" (srcp+(n-4))	\
-		: "memory" );				\
-	}						\
-	switch (n & 3) {				\
-		case 3: dstp[2] = srcp[2];		\
-		case 2: dstp[1] = srcp[1];		\
-		case 1: dstp[0] = srcp[0];		\
-			break;				\
-		default:				\
-			break;				\
-	}						\
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void * SDLCALL SDL_revcpy(void *dst, const void *src, size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove     memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n)	bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len)			\
-do {							\
-	if ( dst < src ) {				\
-		SDL_memcpy(dst, src, len);		\
-	} else {					\
-		SDL_revcpy(dst, src, len);		\
-	}						\
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp      memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen      strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy     strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat    strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup     strdup
-#else
-extern DECLSPEC char * SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev      _strrev
-#else
-extern DECLSPEC char * SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr      _strupr
-#else
-extern DECLSPEC char * SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr      _strlwr
-#else
-extern DECLSPEC char * SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr      strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr      index
-#else
-extern DECLSPEC char * SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr     strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr     rindex
-#else
-extern DECLSPEC char * SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr      strstr
-#else
-extern DECLSPEC char * SDLCALL SDL_strstr(const char *haystack, const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa        itoa
-#else
-#define SDL_itoa(value, string, radix)	SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa        _ltoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa       _uitoa
-#else
-#define SDL_uitoa(value, string, radix)	SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa       _ultoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ultoa(unsigned long value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol      strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul      strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string, char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa       _i64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_lltoa(Sint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa      _ui64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll     strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull     strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod      strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi        atoi
-#else
-#define SDL_atoi(X)     SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof        atof
-#else
-#define SDL_atof(X)     SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp      strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp     strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp  strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp  _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf      sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf    snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf   vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
-#endif
-
-/* The SDL implementation of iconv() returns these error codes */
-#define SDL_ICONV_ERROR		(size_t)-1
-#define SDL_ICONV_E2BIG		(size_t)-2
-#define SDL_ICONV_EILSEQ	(size_t)-3
-#define SDL_ICONV_EINVAL	(size_t)-4
-
-#ifdef HAVE_ICONV
-#define SDL_iconv_t     iconv_t
-#define SDL_iconv_open  iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-/* This function converts a string between encodings in one pass, returning a
-   string that must be freed with SDL_free() or NULL on error.
-*/
-extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
diff --git a/Externals/SDL/Include_1.2/SDL_syswm.h b/Externals/SDL/Include_1.2/SDL_syswm.h
deleted file mode 100644
index 010dd1bcc6..0000000000
--- a/Externals/SDL/Include_1.2/SDL_syswm.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Include file for SDL custom system window manager hooks */
-
-#ifndef _SDL_syswm_h
-#define _SDL_syswm_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Your application has access to a special type of event 'SDL_SYSWMEVENT',
-   which contains window-manager specific information and arrives whenever
-   an unhandled window event occurs.  This event is ignored by default, but
-   you can enable it with SDL_EventState()
-*/
-#ifdef SDL_PROTOTYPES_ONLY
-struct SDL_SysWMinfo;
-typedef struct SDL_SysWMinfo SDL_SysWMinfo;
-#else
-
-/* This is the structure for custom window manager events */
-#if defined(SDL_VIDEO_DRIVER_X11)
-#if defined(__APPLE__) && defined(__MACH__)
-/* conflicts with Quickdraw.h */
-#define Cursor X11Cursor
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* matches the re-define above */
-#undef Cursor
-#endif
-
-/* These are the various supported subsystems under UNIX */
-typedef enum {
-	SDL_SYSWM_X11
-} SDL_SYSWM_TYPE;
-
-/* The UNIX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    XEvent xevent;
-	} event;
-};
-
-/* The UNIX custom window manager information structure.
-   When this structure is returned, it holds information about which
-   low level system it is using, and will be one of SDL_SYSWM_TYPE.
- */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    struct {
-	    	Display *display;	/* The X11 display */
-	    	Window window;		/* The X11 display window */
-		/* These locking functions should be called around
-                   any X11 functions using the display variable, 
-                   but not the gfxdisplay variable.
-                   They lock the event thread, so should not be
-		   called around event functions or from event filters.
-		 */
-		void (*lock_func)(void);
-		void (*unlock_func)(void);
-
-		/* Introduced in SDL 1.0.2 */
-	    	Window fswindow;	/* The X11 fullscreen window */
-	    	Window wmwindow;	/* The X11 managed input window */
-
-		/* Introduced in SDL 1.2.12 */
-		Display *gfxdisplay;	/* The X11 display to which rendering is done */
-	    } x11;
-	} info;
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_NANOX)
-#include <microwin/nano-X.h>
-
-/* The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/* The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version ;
-	GR_WINDOW_ID window ;	/* The display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* The windows custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	HWND hwnd;			/* The window for the message */
-	UINT msg;			/* The type of message */
-	WPARAM wParam;			/* WORD message parameter */
-	LPARAM lParam;			/* LONG message parameter */
-};
-
-/* The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	HWND window;			/* The Win32 display window */
-	HGLRC hglrc;			/* The OpenGL context, if any */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_RISCOS)
-
-/* RISC OS custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int eventCode;		/* The window for the message */
-	int pollBlock[64];
-};
-
-/* The RISC OS custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int wimpVersion;    /* Wimp version running under */
-	int taskHandle;     /* The RISC OS task handle */
-	int window;		/* The RISC OS display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_PHOTON)
-#include <sys/neutrino.h>
-#include <Ph.h>
-
-/* The QNX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/* The QNX custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#else
-
-/* The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/* The generic custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#endif /* video driver type */
-
-#endif /* SDL_PROTOTYPES_ONLY */
-
-/* Function prototypes */
-/*
- * This function gives you custom hooks into the window manager information.
- * It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented.  If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0. 
- *
- * You typically use this function like this:
- * SDL_SysWMInfo info;
- * SDL_VERSION(&info.version);
- * if ( SDL_GetWMInfo(&info) ) { ... }
- */
-extern DECLSPEC int SDLCALL SDL_GetWMInfo(SDL_SysWMinfo *info);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_syswm_h */
diff --git a/Externals/SDL/Include_1.2/SDL_thread.h b/Externals/SDL/Include_1.2/SDL_thread.h
deleted file mode 100644
index 403ee46209..0000000000
--- a/Externals/SDL/Include_1.2/SDL_thread.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_thread_h
-#define _SDL_thread_h
-
-/* Header for the SDL thread management routines 
-
-	These are independent of the other SDL routines.
-*/
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* Thread synchronization primitives */
-#include "SDL_mutex.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The SDL thread structure, defined in SDL_thread.c */
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-
-/* Create a thread */
-#if ((defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)) &&  !defined(__SYMBIAN32__)
-/*
-   We compile SDL into a DLL on OS/2. This means, that it's the DLL which
-   creates a new thread for the calling process with the SDL_CreateThread()
-   API. There is a problem with this, that only the RTL of the SDL.DLL will
-   be initialized for those threads, and not the RTL of the calling application!
-   To solve this, we make a little hack here.
-   We'll always use the caller's _beginthread() and _endthread() APIs to
-   start a new thread. This way, if it's the SDL.DLL which uses this API,
-   then the RTL of SDL.DLL will be used to create the new thread, and if it's
-   the application, then the RTL of the application will be used.
-   So, in short:
-   Always use the _beginthread() and _endthread() of the calling runtime library!
-*/
-#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#ifndef _WIN32_WCE
-#include <process.h> /* This has _beginthread() and _endthread() defined! */
-#endif
-
-#ifdef __OS2__
-typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
-typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#else
-typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#endif
-
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
-
-#ifdef __OS2__
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
-#elif defined(_WIN32_WCE)
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL)
-#else
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex)
-#endif
-#else
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data);
-#endif
-
-/* Get the 32-bit thread identifier for the current thread */
-extern DECLSPEC Uint32 SDLCALL SDL_ThreadID(void);
-
-/* Get the 32-bit thread identifier for the specified thread,
-   equivalent to SDL_ThreadID() if the specified thread is NULL.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetThreadID(SDL_Thread *thread);
-
-/* Wait for a thread to finish.
-   The return code for the thread function is placed in the area
-   pointed to by 'status', if 'status' is not NULL.
- */
-extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread *thread, int *status);
-
-/* Forcefully kill a thread without worrying about its state */
-extern DECLSPEC void SDLCALL SDL_KillThread(SDL_Thread *thread);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_thread_h */
diff --git a/Externals/SDL/Include_1.2/SDL_timer.h b/Externals/SDL/Include_1.2/SDL_timer.h
deleted file mode 100644
index d21159fed2..0000000000
--- a/Externals/SDL/Include_1.2/SDL_timer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_timer_h
-#define _SDL_timer_h
-
-/* Header for the SDL time management routines */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the OS scheduler timeslice, in milliseconds */
-#define SDL_TIMESLICE		10
-
-/* This is the maximum resolution of the SDL timer on all platforms */
-#define TIMER_RESOLUTION	10	/* Experimentally determined */
-
-/* Get the number of milliseconds since the SDL library initialization.
- * Note that this value wraps if the program runs for more than ~49 days.
- */ 
-extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
-
-/* Wait a specified number of milliseconds before returning */
-extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
-
-/* Function prototype for the timer callback function */
-typedef Uint32 (SDLCALL *SDL_TimerCallback)(Uint32 interval);
-
-/* Set a callback to run after the specified number of milliseconds has
- * elapsed. The callback function is passed the current timer interval
- * and returns the next timer interval.  If the returned value is the 
- * same as the one passed in, the periodic alarm continues, otherwise a
- * new alarm is scheduled.  If the callback returns 0, the periodic alarm
- * is cancelled.
- *
- * To cancel a currently running timer, call SDL_SetTimer(0, NULL);
- *
- * The timer callback function may run in a different thread than your
- * main code, and so shouldn't call any functions from within itself.
- *
- * The maximum resolution of this timer is 10 ms, which means that if
- * you request a 16 ms timer, your callback will run approximately 20 ms
- * later on an unloaded system.  If you wanted to set a flag signaling
- * a frame update at 30 frames per second (every 33 ms), you might set a 
- * timer for 30 ms:
- *   SDL_SetTimer((33/10)*10, flag_update);
- *
- * If you use this function, you need to pass SDL_INIT_TIMER to SDL_Init().
- *
- * Under UNIX, you should not use raise or use SIGALRM and this function
- * in the same program, as it is implemented using setitimer().  You also
- * should not use this function in multi-threaded applications as signals
- * to multi-threaded apps have undefined behavior in some implementations.
- *
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_TimerCallback callback);
-
-/* New timer API, supports multiple timers
- * Written by Stephane Peter <megastep@lokigames.com>
- */
-
-/* Function prototype for the new timer callback function.
- * The callback function is passed the current timer interval and returns
- * the next timer interval.  If the returned value is the same as the one
- * passed in, the periodic alarm continues, otherwise a new alarm is
- * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
- */
-typedef Uint32 (SDLCALL *SDL_NewTimerCallback)(Uint32 interval, void *param);
-
-/* Definition of the timer ID type */
-typedef struct _SDL_TimerID *SDL_TimerID;
-
-/* Add a new timer to the pool of timers already running.
-   Returns a timer ID, or NULL when an error occurs.
- */
-extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);
-
-/* Remove one of the multiple timers knowing its ID.
- * Returns a boolean value indicating success.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_timer_h */
diff --git a/Externals/SDL/Include_1.2/SDL_types.h b/Externals/SDL/Include_1.2/SDL_types.h
deleted file mode 100644
index 853b9ce454..0000000000
--- a/Externals/SDL/Include_1.2/SDL_types.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/Externals/SDL/Include_1.2/SDL_version.h b/Externals/SDL/Include_1.2/SDL_version.h
deleted file mode 100644
index 9ff0fa8a7f..0000000000
--- a/Externals/SDL/Include_1.2/SDL_version.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This header defines the current SDL version */
-
-#ifndef _SDL_version_h
-#define _SDL_version_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
-*/
-#define SDL_MAJOR_VERSION	1
-#define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		13
-
-typedef struct SDL_version {
-	Uint8 major;
-	Uint8 minor;
-	Uint8 patch;
-} SDL_version;
-
-/* This macro can be used to fill a version structure with the compile-time
- * version of the SDL library.
- */
-#define SDL_VERSION(X)							\
-{									\
-	(X)->major = SDL_MAJOR_VERSION;					\
-	(X)->minor = SDL_MINOR_VERSION;					\
-	(X)->patch = SDL_PATCHLEVEL;					\
-}
-
-/* This macro turns the version numbers into a numeric value:
-   (1,2,3) -> (1203)
-   This assumes that there will never be more than 100 patchlevels
-*/
-#define SDL_VERSIONNUM(X, Y, Z)						\
-	((X)*1000 + (Y)*100 + (Z))
-
-/* This is the version number macro for the current SDL version */
-#define SDL_COMPILEDVERSION \
-	SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
-
-/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */
-#define SDL_VERSION_ATLEAST(X, Y, Z) \
-	(SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
-
-/* This function gets the version of the dynamically linked SDL library.
-   it should NOT be used to fill a version structure, instead you should
-   use the SDL_Version() macro.
- */
-extern DECLSPEC const SDL_version * SDLCALL SDL_Linked_Version(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_version_h */
diff --git a/Externals/SDL/Include_1.2/SDL_video.h b/Externals/SDL/Include_1.2/SDL_video.h
deleted file mode 100644
index f6baccee7f..0000000000
--- a/Externals/SDL/Include_1.2/SDL_video.h
+++ /dev/null
@@ -1,891 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Header file for access to the SDL raw framebuffer window */
-
-#ifndef _SDL_video_h
-#define _SDL_video_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Transparency definitions: These define alpha as the opacity of a surface */
-#define SDL_ALPHA_OPAQUE 255
-#define SDL_ALPHA_TRANSPARENT 0
-
-/* Useful data types */
-typedef struct SDL_Rect {
-	Sint16 x, y;
-	Uint16 w, h;
-} SDL_Rect;
-
-typedef struct SDL_Color {
-	Uint8 r;
-	Uint8 g;
-	Uint8 b;
-	Uint8 unused;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette {
-	int       ncolors;
-	SDL_Color *colors;
-} SDL_Palette;
-
-/* Everything in the pixel format structure is read-only */
-typedef struct SDL_PixelFormat {
-	SDL_Palette *palette;
-	Uint8  BitsPerPixel;
-	Uint8  BytesPerPixel;
-	Uint8  Rloss;
-	Uint8  Gloss;
-	Uint8  Bloss;
-	Uint8  Aloss;
-	Uint8  Rshift;
-	Uint8  Gshift;
-	Uint8  Bshift;
-	Uint8  Ashift;
-	Uint32 Rmask;
-	Uint32 Gmask;
-	Uint32 Bmask;
-	Uint32 Amask;
-
-	/* RGB color key information */
-	Uint32 colorkey;
-	/* Alpha value information (per-surface alpha) */
-	Uint8  alpha;
-} SDL_PixelFormat;
-
-/* This structure should be treated as read-only, except for 'pixels',
-   which, if not NULL, contains the raw pixel data for the surface.
-*/
-typedef struct SDL_Surface {
-	Uint32 flags;				/* Read-only */
-	SDL_PixelFormat *format;		/* Read-only */
-	int w, h;				/* Read-only */
-	Uint16 pitch;				/* Read-only */
-	void *pixels;				/* Read-write */
-	int offset;				/* Private */
-
-	/* Hardware-specific surface info */
-	struct private_hwdata *hwdata;
-
-	/* clipping information */
-	SDL_Rect clip_rect;			/* Read-only */
-	Uint32 unused1;				/* for binary compatibility */
-
-	/* Allow recursive locks */
-	Uint32 locked;				/* Private */
-
-	/* info for fast blit mapping to other surfaces */
-	struct SDL_BlitMap *map;		/* Private */
-
-	/* format version, bumped at every change to invalidate blit maps */
-	unsigned int format_version;		/* Private */
-
-	/* Reference count -- used when freeing surface */
-	int refcount;				/* Read-mostly */
-} SDL_Surface;
-
-/* These are the currently supported flags for the SDL_surface */
-/* Available for SDL_CreateRGBSurface() or SDL_SetVideoMode() */
-#define SDL_SWSURFACE	0x00000000	/* Surface is in system memory */
-#define SDL_HWSURFACE	0x00000001	/* Surface is in video memory */
-#define SDL_ASYNCBLIT	0x00000004	/* Use asynchronous blits if possible */
-/* Available for SDL_SetVideoMode() */
-#define SDL_ANYFORMAT	0x10000000	/* Allow any video depth/pixel-format */
-#define SDL_HWPALETTE	0x20000000	/* Surface has exclusive palette */
-#define SDL_DOUBLEBUF	0x40000000	/* Set up double-buffered video mode */
-#define SDL_FULLSCREEN	0x80000000	/* Surface is a full screen display */
-#define SDL_OPENGL      0x00000002      /* Create an OpenGL rendering context */
-#define SDL_OPENGLBLIT	0x0000000A	/* Create an OpenGL rendering context and use it for blitting */
-#define SDL_RESIZABLE	0x00000010	/* This video mode may be resized */
-#define SDL_NOFRAME	0x00000020	/* No window caption or edge frame */
-/* Used internally (read-only) */
-#define SDL_HWACCEL	0x00000100	/* Blit uses hardware acceleration */
-#define SDL_SRCCOLORKEY	0x00001000	/* Blit uses a source color key */
-#define SDL_RLEACCELOK	0x00002000	/* Private flag */
-#define SDL_RLEACCEL	0x00004000	/* Surface is RLE encoded */
-#define SDL_SRCALPHA	0x00010000	/* Blit uses source alpha blending */
-#define SDL_PREALLOC	0x01000000	/* Surface uses preallocated memory */
-
-/* Evaluates to true if the surface needs to be locked before access */
-#define SDL_MUSTLOCK(surface)	\
-  (surface->offset ||		\
-  ((surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_RLEACCEL)) != 0))
-
-/* typedef for private surface blitting functions */
-typedef int (*SDL_blit)(struct SDL_Surface *src, SDL_Rect *srcrect,
-			struct SDL_Surface *dst, SDL_Rect *dstrect);
-
-
-/* Useful for determining the video hardware capabilities */
-typedef struct SDL_VideoInfo {
-	Uint32 hw_available :1;	/* Flag: Can you create hardware surfaces? */
-	Uint32 wm_available :1;	/* Flag: Can you talk to a window manager? */
-	Uint32 UnusedBits1  :6;
-	Uint32 UnusedBits2  :1;
-	Uint32 blit_hw      :1;	/* Flag: Accelerated blits HW --> HW */
-	Uint32 blit_hw_CC   :1;	/* Flag: Accelerated blits with Colorkey */
-	Uint32 blit_hw_A    :1;	/* Flag: Accelerated blits with Alpha */
-	Uint32 blit_sw      :1;	/* Flag: Accelerated blits SW --> HW */
-	Uint32 blit_sw_CC   :1;	/* Flag: Accelerated blits with Colorkey */
-	Uint32 blit_sw_A    :1;	/* Flag: Accelerated blits with Alpha */
-	Uint32 blit_fill    :1;	/* Flag: Accelerated color fill */
-	Uint32 UnusedBits3  :16;
-	Uint32 video_mem;	/* The total amount of video memory (in K) */
-	SDL_PixelFormat *vfmt;	/* Value: The format of the video surface */
-	int    current_w;	/* Value: The current video mode width */
-	int    current_h;	/* Value: The current video mode height */
-} SDL_VideoInfo;
-
-
-/* The most common video overlay formats.
-   For an explanation of these pixel formats, see:
-	http://www.webartz.com/fourcc/indexyuv.htm
-
-   For information on the relationship between color spaces, see:
-   http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
- */
-#define SDL_YV12_OVERLAY  0x32315659	/* Planar mode: Y + V + U  (3 planes) */
-#define SDL_IYUV_OVERLAY  0x56555949	/* Planar mode: Y + U + V  (3 planes) */
-#define SDL_YUY2_OVERLAY  0x32595559	/* Packed mode: Y0+U0+Y1+V0 (1 plane) */
-#define SDL_UYVY_OVERLAY  0x59565955	/* Packed mode: U0+Y0+V0+Y1 (1 plane) */
-#define SDL_YVYU_OVERLAY  0x55595659	/* Packed mode: Y0+V0+Y1+U0 (1 plane) */
-
-/* The YUV hardware video overlay */
-typedef struct SDL_Overlay {
-	Uint32 format;				/* Read-only */
-	int w, h;				/* Read-only */
-	int planes;				/* Read-only */
-	Uint16 *pitches;			/* Read-only */
-	Uint8 **pixels;				/* Read-write */
-
-	/* Hardware-specific surface info */
-	struct private_yuvhwfuncs *hwfuncs;
-	struct private_yuvhwdata *hwdata;
-
-	/* Special flags */
-	Uint32 hw_overlay :1;	/* Flag: This overlay hardware accelerated? */
-	Uint32 UnusedBits :31;
-} SDL_Overlay;
-
-
-/* Public enumeration for setting the OpenGL window attributes. */
-typedef enum {
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_SWAP_CONTROL
-} SDL_GLattr;
-
-/* flags for SDL_SetPalette() */
-#define SDL_LOGPAL 0x01
-#define SDL_PHYSPAL 0x02
-
-/* Function prototypes */
-
-/* These functions are used internally, and should not be used unless you
- * have a specific need to specify the video driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- *
- * SDL_VideoInit() initializes the video subsystem -- sets up a connection
- * to the window manager, etc, and determines the current video mode and
- * pixel format, but does not initialize a window or graphics mode.
- * Note that event handling is activated by this routine.
- *
- * If you use both sound and video in your application, you need to call
- * SDL_Init() before opening the sound device, otherwise under Win32 DirectX,
- * you won't be able to set full-screen display modes.
- */
-extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name, Uint32 flags);
-extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
-
-/* This function fills the given character buffer with the name of the
- * video driver, and returns a pointer to it if the video driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
-
-/*
- * This function returns a pointer to the current display surface.
- * If SDL is doing format conversion on the display surface, this
- * function returns the publicly visible surface, not the real video
- * surface.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_GetVideoSurface(void);
-
-/*
- * This function returns a read-only pointer to information about the
- * video hardware.  If this is called before SDL_SetVideoMode(), the 'vfmt'
- * member of the returned structure will contain the pixel format of the
- * "best" video mode.
- */
-extern DECLSPEC const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);
-
-/* 
- * Check to see if a particular video mode is supported.
- * It returns 0 if the requested mode is not supported under any bit depth,
- * or returns the bits-per-pixel of the closest available mode with the
- * given width and height.  If this bits-per-pixel is different from the
- * one used when setting the video mode, SDL_SetVideoMode() will succeed,
- * but will emulate the requested bits-per-pixel with a shadow surface.
- *
- * The arguments to SDL_VideoModeOK() are the same ones you would pass to
- * SDL_SetVideoMode()
- */
-extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags);
-
-/*
- * Return a pointer to an array of available screen dimensions for the
- * given format and video flags, sorted largest to smallest.  Returns 
- * NULL if there are no dimensions available for a particular format, 
- * or (SDL_Rect **)-1 if any dimension is okay for the given format.
- *
- * If 'format' is NULL, the mode list will be for the format given 
- * by SDL_GetVideoInfo()->vfmt
- */
-extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);
-
-/*
- * Set up a video mode with the specified width, height and bits-per-pixel.
- *
- * If 'bpp' is 0, it is treated as the current display bits per pixel.
- *
- * If SDL_ANYFORMAT is set in 'flags', the SDL library will try to set the
- * requested bits-per-pixel, but will return whatever video pixel format is
- * available.  The default is to emulate the requested pixel format if it
- * is not natively available.
- *
- * If SDL_HWSURFACE is set in 'flags', the video surface will be placed in
- * video memory, if possible, and you may have to call SDL_LockSurface()
- * in order to access the raw framebuffer.  Otherwise, the video surface
- * will be created in system memory.
- *
- * If SDL_ASYNCBLIT is set in 'flags', SDL will try to perform rectangle
- * updates asynchronously, but you must always lock before accessing pixels.
- * SDL will wait for updates to complete before returning from the lock.
- *
- * If SDL_HWPALETTE is set in 'flags', the SDL library will guarantee
- * that the colors set by SDL_SetColors() will be the colors you get.
- * Otherwise, in 8-bit mode, SDL_SetColors() may not be able to set all
- * of the colors exactly the way they are requested, and you should look
- * at the video surface structure to determine the actual palette.
- * If SDL cannot guarantee that the colors you request can be set, 
- * i.e. if the colormap is shared, then the video surface may be created
- * under emulation in system memory, overriding the SDL_HWSURFACE flag.
- *
- * If SDL_FULLSCREEN is set in 'flags', the SDL library will try to set
- * a fullscreen video mode.  The default is to create a windowed mode
- * if the current graphics system has a window manager.
- * If the SDL library is able to set a fullscreen video mode, this flag 
- * will be set in the surface that is returned.
- *
- * If SDL_DOUBLEBUF is set in 'flags', the SDL library will try to set up
- * two surfaces in video memory and swap between them when you call 
- * SDL_Flip().  This is usually slower than the normal single-buffering
- * scheme, but prevents "tearing" artifacts caused by modifying video 
- * memory while the monitor is refreshing.  It should only be used by 
- * applications that redraw the entire screen on every update.
- *
- * If SDL_RESIZABLE is set in 'flags', the SDL library will allow the
- * window manager, if any, to resize the window at runtime.  When this
- * occurs, SDL will send a SDL_VIDEORESIZE event to you application,
- * and you must respond to the event by re-calling SDL_SetVideoMode()
- * with the requested size (or another size that suits the application).
- *
- * If SDL_NOFRAME is set in 'flags', the SDL library will create a window
- * without any title bar or frame decoration.  Fullscreen video modes have
- * this flag set automatically.
- *
- * This function returns the video framebuffer surface, or NULL if it fails.
- *
- * If you rely on functionality provided by certain video flags, check the
- * flags of the returned surface to make sure that functionality is available.
- * SDL will fall back to reduced functionality if the exact flags you wanted
- * are not available.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_SetVideoMode
-			(int width, int height, int bpp, Uint32 flags);
-
-/*
- * Makes sure the given list of rectangles is updated on the given screen.
- * If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire
- * screen.
- * These functions should not be called while 'screen' is locked.
- */
-extern DECLSPEC void SDLCALL SDL_UpdateRects
-		(SDL_Surface *screen, int numrects, SDL_Rect *rects);
-extern DECLSPEC void SDLCALL SDL_UpdateRect
-		(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h);
-
-/*
- * On hardware that supports double-buffering, this function sets up a flip
- * and returns.  The hardware will wait for vertical retrace, and then swap
- * video buffers before the next video surface blit or lock will return.
- * On hardware that doesn not support double-buffering, this is equivalent
- * to calling SDL_UpdateRect(screen, 0, 0, 0, 0);
- * The SDL_DOUBLEBUF flag must have been passed to SDL_SetVideoMode() when
- * setting the video mode for this function to perform hardware flipping.
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface *screen);
-
-/*
- * Set the gamma correction for each of the color channels.
- * The gamma values range (approximately) between 0.1 and 10.0
- * 
- * If this function isn't supported directly by the hardware, it will
- * be emulated using gamma ramps, if available.  If successful, this
- * function returns 0, otherwise it returns -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue);
-
-/*
- * Set the gamma translation table for the red, green, and blue channels
- * of the video hardware.  Each table is an array of 256 16-bit quantities,
- * representing a mapping between the input and output for that channel.
- * The input is the index into the array, and the output is the 16-bit
- * gamma value at that index, scaled to the output color precision.
- * 
- * You may pass NULL for any of the channels to leave it unchanged.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 *red, const Uint16 *green, const Uint16 *blue);
-
-/*
- * Retrieve the current values of the gamma translation tables.
- * 
- * You must pass in valid pointers to arrays of 256 16-bit quantities.
- * Any of the pointers may be NULL to ignore that channel.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue);
-
-/*
- * Sets a portion of the colormap for the given 8-bit surface.  If 'surface'
- * is not a palettized surface, this function does nothing, returning 0.
- * If all of the colors were set as passed to SDL_SetColors(), it will
- * return 1.  If not all the color entries were set exactly as given,
- * it will return 0, and you should look at the surface palette to
- * determine the actual color palette.
- *
- * When 'surface' is the surface associated with the current display, the
- * display colormap will be updated with the requested colors.  If 
- * SDL_HWPALETTE was set in SDL_SetVideoMode() flags, SDL_SetColors()
- * will always return 1, and the palette is guaranteed to be set the way
- * you desire, even if the window colormap has to be warped or run under
- * emulation.
- */
-extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface *surface, 
-			SDL_Color *colors, int firstcolor, int ncolors);
-
-/*
- * Sets a portion of the colormap for a given 8-bit surface.
- * 'flags' is one or both of:
- * SDL_LOGPAL  -- set logical palette, which controls how blits are mapped
- *                to/from the surface,
- * SDL_PHYSPAL -- set physical palette, which controls how pixels look on
- *                the screen
- * Only screens have physical palettes. Separate change of physical/logical
- * palettes is only possible if the screen has SDL_HWPALETTE set.
- *
- * The return value is 1 if all colours could be set as requested, and 0
- * otherwise.
- *
- * SDL_SetColors() is equivalent to calling this function with
- *     flags = (SDL_LOGPAL|SDL_PHYSPAL).
- */
-extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface *surface, int flags,
-				   SDL_Color *colors, int firstcolor,
-				   int ncolors);
-
-/*
- * Maps an RGB triple to an opaque pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b);
-
-/*
- * Maps an RGBA quadruple to a pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a);
-
-/*
- * Maps a pixel value into the RGB components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, SDL_PixelFormat *fmt,
-				Uint8 *r, Uint8 *g, Uint8 *b);
-
-/*
- * Maps a pixel value into the RGBA components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, SDL_PixelFormat *fmt,
-				 Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);
-
-/*
- * Allocate and free an RGB surface (must be called after SDL_SetVideoMode)
- * If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
- * If the depth is greater than 8 bits, the pixel format is set using the
- * flags '[RGB]mask'.
- * If the function runs out of memory, it will return NULL.
- *
- * The 'flags' tell what kind of surface to create.
- * SDL_SWSURFACE means that the surface should be created in system memory.
- * SDL_HWSURFACE means that the surface should be created in video memory,
- * with the same format as the display surface.  This is useful for surfaces
- * that will not change much, to take advantage of hardware acceleration
- * when being blitted to the display surface.
- * SDL_ASYNCBLIT means that SDL will try to perform asynchronous blits with
- * this surface, but you must always lock it before accessing the pixels.
- * SDL will wait for current blits to finish before returning from the lock.
- * SDL_SRCCOLORKEY indicates that the surface will be used for colorkey blits.
- * If the hardware supports acceleration of colorkey blits between
- * two surfaces in video memory, SDL will try to place the surface in
- * video memory. If this isn't possible or if there is no hardware
- * acceleration available, the surface will be placed in system memory.
- * SDL_SRCALPHA means that the surface will be used for alpha blits and 
- * if the hardware supports hardware acceleration of alpha blits between
- * two surfaces in video memory, to place the surface in video memory
- * if possible, otherwise it will be placed in system memory.
- * If the surface is created in video memory, blits will be _much_ faster,
- * but the surface format must be identical to the video surface format,
- * and the only way to access the pixels member of the surface is to use
- * the SDL_LockSurface() and SDL_UnlockSurface() calls.
- * If the requested surface actually resides in video memory, SDL_HWSURFACE
- * will be set in the flags member of the returned surface.  If for some
- * reason the surface could not be placed in video memory, it will not have
- * the SDL_HWSURFACE flag set, and will be created in system memory instead.
- */
-#define SDL_AllocSurface    SDL_CreateRGBSurface
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurface
-			(Uint32 flags, int width, int height, int depth, 
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
-			int width, int height, int depth, int pitch,
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface *surface);
-
-/*
- * SDL_LockSurface() sets up a surface for directly accessing the pixels.
- * Between calls to SDL_LockSurface()/SDL_UnlockSurface(), you can write
- * to and read from 'surface->pixels', using the pixel format stored in 
- * 'surface->format'.  Once you are done accessing the surface, you should 
- * use SDL_UnlockSurface() to release it.
- *
- * Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
- * to 0, then you can read and write to the surface at any time, and the
- * pixel format of the surface will not change.  In particular, if the
- * SDL_HWSURFACE flag is not given when calling SDL_SetVideoMode(), you
- * will not need to lock the display surface before accessing it.
- * 
- * No operating system or library calls should be made between lock/unlock
- * pairs, as critical system locks may be held during this time.
- *
- * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
- */
-extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface *surface);
-extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);
-
-/*
- * Load a surface from a seekable SDL data source (memory or file.)
- * If 'freesrc' is non-zero, the source will be closed after being read.
- * Returns the new surface, or NULL if there was an error.
- * The new surface should be freed with SDL_FreeSurface().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
-
-/* Convenience macro -- load a surface from a file */
-#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
-
-/*
- * Save a surface to a seekable SDL data source (memory or file.)
- * If 'freedst' is non-zero, the source will be closed after being written.
- * Returns 0 if successful or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
-		(SDL_Surface *surface, SDL_RWops *dst, int freedst);
-
-/* Convenience macro -- save a surface to a file */
-#define SDL_SaveBMP(surface, file) \
-		SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
-
-/*
- * Sets the color key (transparent pixel) in a blittable surface.
- * If 'flag' is SDL_SRCCOLORKEY (optionally OR'd with SDL_RLEACCEL), 
- * 'key' will be the transparent pixel in the source image of a blit.
- * SDL_RLEACCEL requests RLE acceleration for the surface if present,
- * and removes RLE acceleration if absent.
- * If 'flag' is 0, this function clears any current color key.
- * This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetColorKey
-			(SDL_Surface *surface, Uint32 flag, Uint32 key);
-
-/*
- * This function sets the alpha value for the entire surface, as opposed to
- * using the alpha component of each pixel. This value measures the range
- * of transparency of the surface, 0 being completely transparent to 255
- * being completely opaque. An 'alpha' value of 255 causes blits to be
- * opaque, the source pixels copied to the destination (the default). Note
- * that per-surface alpha can be combined with colorkey transparency.
- *
- * If 'flag' is 0, alpha blending is disabled for the surface.
- * If 'flag' is SDL_SRCALPHA, alpha blending is enabled for the surface.
- * OR:ing the flag with SDL_RLEACCEL requests RLE acceleration for the
- * surface; if SDL_RLEACCEL is not specified, the RLE accel will be removed.
- *
- * The 'alpha' parameter is ignored for surfaces that have an alpha channel.
- */
-extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
-
-/*
- * Sets the clipping rectangle for the destination surface in a blit.
- *
- * If the clip rectangle is NULL, clipping will be disabled.
- * If the clip rectangle doesn't intersect the surface, the function will
- * return SDL_FALSE and blits will be completely clipped.  Otherwise the
- * function returns SDL_TRUE and blits to the surface will be clipped to
- * the intersection of the surface area and the clipping rectangle.
- *
- * Note that blits are automatically clipped to the edges of the source
- * and destination surfaces.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface *surface, const SDL_Rect *rect);
-
-/*
- * Gets the clipping rectangle for the destination surface in a blit.
- * 'rect' must be a pointer to a valid rectangle which will be filled
- * with the correct values.
- */
-extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect);
-
-/*
- * Creates a new surface of the specified format, and then copies and maps 
- * the given surface to it so the blit of the converted surface will be as 
- * fast as possible.  If this function fails, it returns NULL.
- *
- * The 'flags' parameter is passed to SDL_CreateRGBSurface() and has those 
- * semantics.  You can also pass SDL_RLEACCEL in the flags parameter and
- * SDL will try to RLE accelerate colorkey and alpha blits in the resulting
- * surface.
- *
- * This function is used internally by SDL_DisplayFormat().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_ConvertSurface
-			(SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);
-
-/*
- * This performs a fast blit from the source surface to the destination
- * surface.  It assumes that the source and destination rectangles are
- * the same size.  If either 'srcrect' or 'dstrect' are NULL, the entire
- * surface (src or dst) is copied.  The final blit rectangles are saved
- * in 'srcrect' and 'dstrect' after all clipping is performed.
- * If the blit is successful, it returns 0, otherwise it returns -1.
- *
- * The blit function should not be called on a locked surface.
- *
- * The blit semantics for surfaces with and without alpha and colorkey
- * are defined as follows:
- *
- * RGBA->RGB:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using alpha-channel).
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value);
- * 	set destination alpha to opaque.
- *     SDL_SRCALPHA not set:
- * 	copy RGB, set destination alpha to source per-surface alpha value.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- * 
- * RGBA->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source alpha channel) the RGB values;
- * 	leave destination alpha untouched. [Note: is this correct?]
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy all of RGBA to the destination.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGB: 
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value).
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- *
- * If either of the surfaces were in video memory, and the blit returns -2,
- * the video memory was lost, so it should be reloaded with artwork and 
- * re-blitted:
-	while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
-		while ( SDL_LockSurface(image) < 0 )
-			Sleep(10);
-		-- Write image pixels to image->pixels --
-		SDL_UnlockSurface(image);
-	}
- * This happens under DirectX 5.0 when the system switches away from your
- * fullscreen application.  The lock will also fail until you have access
- * to the video memory again.
- */
-/* You should call SDL_BlitSurface() unless you know exactly how SDL
-   blitting works internally and how to use the other blit functions.
-*/
-#define SDL_BlitSurface SDL_UpperBlit
-
-/* This is the public blit function, SDL_BlitSurface(), and it performs
-   rectangle validation and clipping before passing it to SDL_LowerBlit()
-*/
-extern DECLSPEC int SDLCALL SDL_UpperBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-/* This is a semi-private blit function and it performs low-level surface
-   blitting only.
-*/
-extern DECLSPEC int SDLCALL SDL_LowerBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-
-/*
- * This function performs a fast fill of the given rectangle with 'color'
- * The given rectangle is clipped to the destination surface clip area
- * and the final fill rectangle is saved in the passed in pointer.
- * If 'dstrect' is NULL, the whole surface will be filled with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_FillRect
-		(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);
-
-/* 
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer, suitable for fast
- * blitting onto the display surface.  It calls SDL_ConvertSurface()
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormat(SDL_Surface *surface);
-
-/* 
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer (if possible),
- * suitable for fast alpha blitting onto the display surface.
- * The new surface will always have an alpha channel.
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *surface);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* YUV video surface overlay functions                                       */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* This function creates a video output overlay
-   Calling the returned surface an overlay is something of a misnomer because
-   the contents of the display surface underneath the area where the overlay
-   is shown is undefined - it may be overwritten with the converted YUV data.
-*/
-extern DECLSPEC SDL_Overlay * SDLCALL SDL_CreateYUVOverlay(int width, int height,
-				Uint32 format, SDL_Surface *display);
-
-/* Lock an overlay for direct access, and unlock it when you are done */
-extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay *overlay);
-extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay *overlay);
-
-/* Blit a video overlay to the display surface.
-   The contents of the video surface underneath the blit destination are
-   not defined.  
-   The width and height of the destination rectangle may be different from
-   that of the overlay, but currently only 2x scaling is supported.
-*/
-extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect);
-
-/* Free a video overlay */
-extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay *overlay);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* OpenGL support functions.                                                 */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Dynamically load an OpenGL library, or the default one if path is NULL
- *
- * If you do this, you need to retrieve all of the GL functions used in
- * your program from the dynamic library using SDL_GL_GetProcAddress().
- */
-extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
-
-/*
- * Get the address of a GL function
- */
-extern DECLSPEC void * SDLCALL SDL_GL_GetProcAddress(const char* proc);
-
-/*
- * Set an attribute of the OpenGL subsystem before intialization.
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-/*
- * Get an attribute of the OpenGL subsystem from the windowing
- * interface, such as glX. This is of course different from getting
- * the values from SDL's internal OpenGL subsystem, which only
- * stores the values you request before initialization.
- *
- * Developers should track the values they pass into SDL_GL_SetAttribute
- * themselves if they want to retrieve these values.
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);
-
-/*
- * Swap the OpenGL buffers, if double-buffering is supported.
- */
-extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
-
-/*
- * Internal functions that should not be called unless you have read
- * and understood the source code for these functions.
- */
-extern DECLSPEC void SDLCALL SDL_GL_UpdateRects(int numrects, SDL_Rect* rects);
-extern DECLSPEC void SDLCALL SDL_GL_Lock(void);
-extern DECLSPEC void SDLCALL SDL_GL_Unlock(void);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* These functions allow interaction with the window manager, if any.        */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Sets/Gets the title and icon text of the display window (UTF-8 encoded)
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
-extern DECLSPEC void SDLCALL SDL_WM_GetCaption(char **title, char **icon);
-
-/*
- * Sets the icon for the display window.
- * This function must be called before the first call to SDL_SetVideoMode().
- * It takes an icon surface, and a mask in MSB format.
- * If 'mask' is NULL, the entire icon surface will be used as the icon.
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
-
-/*
- * This function iconifies the window, and returns 1 if it succeeded.
- * If the function succeeds, it generates an SDL_APPACTIVE loss event.
- * This function is a noop and returns 0 in non-windowed environments.
- */
-extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
-
-/*
- * Toggle fullscreen mode without changing the contents of the screen.
- * If the display surface does not require locking before accessing
- * the pixel information, then the memory pointers will not change.
- *
- * If this function was able to toggle fullscreen mode (change from 
- * running in a window to fullscreen, or vice-versa), it will return 1.
- * If it is not implemented, or fails, it returns 0.
- *
- * The next call to SDL_SetVideoMode() will set the mode fullscreen
- * attribute based on the flags parameter - if SDL_FULLSCREEN is not
- * set, then the display will be windowed by default where supported.
- *
- * This is currently only implemented in the X11 video driver.
- */
-extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface *surface);
-
-/*
- * This function allows you to set and query the input grab state of
- * the application.  It returns the new input grab state.
- */
-typedef enum {
-	SDL_GRAB_QUERY = -1,
-	SDL_GRAB_OFF = 0,
-	SDL_GRAB_ON = 1,
-	SDL_GRAB_FULLSCREEN	/* Used internally */
-} SDL_GrabMode;
-/*
- * Grabbing means that the mouse is confined to the application window,
- * and nearly all keyboard input is passed directly to the application,
- * and not interpreted by a window manager, if any.
- */
-extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
-
-/* Not in public API at the moment - do not use! */
-extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface *src, SDL_Rect *srcrect,
-                                    SDL_Surface *dst, SDL_Rect *dstrect);
-                    
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/Externals/SDL/Include_1.2/begin_code.h b/Externals/SDL/Include_1.2/begin_code.h
deleted file mode 100644
index d1ddaa6ac2..0000000000
--- a/Externals/SDL/Include_1.2/begin_code.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2004 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file sets things up for C dynamic library function definitions,
-   static inlined functions, and structures aligned at 4-byte alignment.
-   If you don't like ugly C preprocessor code, don't look at this file. :)
-*/
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__BEOS__)
-#  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
-#  else
-#   define DECLSPEC	__declspec(export)
-#  endif
-# elif defined(__WIN32__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC 
-#   else
-#    define DECLSPEC	__declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC	__declspec(dllexport)
-#  endif
-# elif defined(__OS2__)
-#  ifdef __WATCOMC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC	__declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC	__attribute__ ((visibility("default")))
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if defined(__WIN32__) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#ifdef __OS2__
-/* But on OS/2, we use the _System calling convention */
-/* to be compatible with every compiler */
-#define SDLCALL _System
-#else
-#define SDLCALL
-#endif
-#endif
-#endif /* SDLCALL */
-
-#ifdef __SYMBIAN32__ 
-#ifndef EKA2 
-#undef DECLSPEC
-#define DECLSPEC
-#elif !defined(__WINS__)
-#undef DECLSPEC
-#define DECLSPEC __declspec(dllexport)
-#endif /* !EKA2 */
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
-   This is necessary if the header is included in code which has structure
-   packing set to an alternate value, say for loading structures from disk.
-   The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#elif (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=mac68k4byte
-#pragma enumsalwaysint on
-#endif /* Compiler needs structure packing set */
-
-/* Set up compiler-specific options for inlining functions */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
-    defined(__DMC__) || defined(__SC__) || \
-    defined(__WATCOMC__) || defined(__LCC__) || \
-    defined(__DECC) || defined(__EABI__)
-#ifndef __inline__
-#define __inline__	__inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/* If inlining isn't supported, remove "__inline__", turning static
-   inlined functions into static functions (resulting in code bloat
-   in all files which include the offending header files)
-*/
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/Externals/SDL/Include_1.2/close_code.h b/Externals/SDL/Include_1.2/close_code.h
deleted file mode 100644
index afbb65047c..0000000000
--- a/Externals/SDL/Include_1.2/close_code.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2004 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file reverses the effects of begin_code.h and should be included
-   after you finish any function and structure declarations in your headers
-*/
-
-#undef _begin_code_h
-
-/* Reset structure packing at previous byte alignment */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#if (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=reset
-#pragma enumsalwaysint reset
-#else
-#pragma pack(pop)
-#endif
-#endif /* Compiler needs structure packing set */
-
diff --git a/Externals/SDL/Include_1.3/SDL.h b/Externals/SDL/Include_1.3/SDL.h
deleted file mode 100644
index f1078304de..0000000000
--- a/Externals/SDL/Include_1.3/SDL.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL.h
- *
- * Main include header for the SDL library
- */
-/**
- * \mainpage Simple DirectMedia Layer (SDL)
-
-http://www.libsdl.org/
-
-* \section intro_sec Introduction
-
-This is the Simple DirectMedia Layer, a general API that provides low
-level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
-and 2D framebuffer across multiple platforms.
-
-The current version supports Linux, Windows, Windows CE, BeOS, MacOS,
-Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.
-The code contains support for Dreamcast, Atari, AIX, OSF/Tru64,
-RISC OS, SymbianOS, and OS/2, but these are not officially supported.
-
-SDL is written in C, but works with C++ natively, and has bindings to
-several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
-Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
-Pike, Pliant, Python, Ruby, and Smalltalk.
-
-This library is distributed under GNU LGPL version 2, which can be
-found in the file  "COPYING".  This license allows you to use SDL
-freely in commercial programs as long as you link with the dynamic
-library.
-
-The best way to learn how to use SDL is to check out the header files in
-the "include" subdirectory and the programs in the "test" subdirectory.
-The header files and test programs are well commented and always up to date.
-More documentation is available in HTML format in "docs/index.html", and
-a documentation wiki is available online at:
-	http://www.libsdl.org/cgi/docwiki.cgi
-
-The test programs in the "test" subdirectory are in the public domain.
-
-Frequently asked questions are answered online:
-	http://www.libsdl.org/faq.php
-
-If you need help with the library, or just want to discuss SDL related
-issues, you can join the developers mailing list:
-	http://www.libsdl.org/mailing-list.php
-
-Enjoy!
-	Sam Lantinga				(slouken@libsdl.org)
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_audio.h"
-#include "SDL_cdrom.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_loadso.h"
-#include "SDL_mutex.h"
-#include "SDL_rwops.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-#include "SDL_compat.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* As of version 0.5, SDL is loaded dynamically into the application */
-
-/* These are the flags which may be passed to SDL_Init() -- you should
-   specify the subsystems which you will be using in your application.
-*/
-#define SDL_INIT_TIMER          0x00000001
-#define SDL_INIT_AUDIO          0x00000010
-#define SDL_INIT_VIDEO          0x00000020
-#define SDL_INIT_CDROM          0x00000100
-#define SDL_INIT_JOYSTICK       0x00000200
-#define SDL_INIT_HAPTIC         0x00001000
-#define SDL_INIT_NOPARACHUTE    0x00100000      /* Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD    0x01000000      /* Not supported on all OS's */
-#define SDL_INIT_EVERYTHING     0x0000FFFF
-
-/* This function loads the SDL dynamically linked library and initializes 
- * the subsystems specified by 'flags' (and those satisfying dependencies)
- * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- * signal handlers for some commonly ignored fatal signals (like SIGSEGV)
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/* This function initializes specific SDL subsystems */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/* This function cleans up specific SDL subsystems */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/* This function returns mask of the specified subsystems which have
-   been initialized.
-   If 'flags' is 0, it returns a mask of all initialized subsystems.
-*/
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/* This function cleans up all initialized subsystems and unloads the
- * dynamically linked library.  You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_audio.h b/Externals/SDL/Include_1.3/SDL_audio.h
deleted file mode 100644
index eeac3f5774..0000000000
--- a/Externals/SDL/Include_1.3/SDL_audio.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_audio.h
- *
- * Access to the raw audio mixing buffer for the SDL library
- */
-
-#ifndef _SDL_audio_h
-#define _SDL_audio_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-typedef Uint16 SDL_AudioFormat;
-
-/* The calculated values in this structure are calculated by SDL_OpenAudio() */
-typedef struct SDL_AudioSpec
-{
-    int freq;                   /* DSP frequency -- samples per second */
-    SDL_AudioFormat format;     /* Audio data format */
-    Uint8 channels;             /* Number of channels: 1 mono, 2 stereo */
-    Uint8 silence;              /* Audio buffer silence value (calculated) */
-    Uint16 samples;             /* Audio buffer size in samples (power of 2) */
-    Uint16 padding;             /* Necessary for some compile environments */
-    Uint32 size;                /* Audio buffer size in bytes (calculated) */
-    /* This function is called when the audio device needs more data.
-       'stream' is a pointer to the audio data buffer
-       'len' is the length of that buffer in bytes.
-       Once the callback returns, the buffer will no longer be valid.
-       Stereo samples are stored in a LRLRLR ordering.
-     */
-    void (SDLCALL * callback) (void *userdata, Uint8 * stream, int len);
-    void *userdata;
-} SDL_AudioSpec;
-
-
-/*
- These are what the 16 bits in SDL_AudioFormat currently mean...
- (Unspecified bits are always zero.)
-
- ++-----------------------sample is signed if set
- ||
- ||       ++-----------sample is bigendian if set
- ||       ||
- ||       ||          ++---sample is float if set
- ||       ||          ||
- ||       ||          || +---sample bit size---+
- ||       ||          || |                     |
- 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
-
- There are macros in SDL 1.3 and later to query these bits.
-*/
-
-#define SDL_AUDIO_MASK_BITSIZE       (0xFF)
-#define SDL_AUDIO_MASK_DATATYPE      (1<<8)
-#define SDL_AUDIO_MASK_ENDIAN        (1<<12)
-#define SDL_AUDIO_MASK_SIGNED        (1<<15)
-#define SDL_AUDIO_BITSIZE(x)         (x & SDL_AUDIO_MASK_BITSIZE)
-#define SDL_AUDIO_ISFLOAT(x)         (x & SDL_AUDIO_MASK_DATATYPE)
-#define SDL_AUDIO_ISBIGENDIAN(x)     (x & SDL_AUDIO_MASK_ENDIAN)
-#define SDL_AUDIO_ISSIGNED(x)        (x & SDL_AUDIO_MASK_SIGNED)
-#define SDL_AUDIO_ISINT(x)           (!SDL_AUDIO_ISFLOAT(x))
-#define SDL_AUDIO_ISLITTLEENDIAN(x)  (!SDL_AUDIO_ISBIGENDIAN(x))
-#define SDL_AUDIO_ISUNSIGNED(x)      (!SDL_AUDIO_ISSIGNED(x))
-
-/* Audio format flags (defaults to LSB byte order) */
-#define AUDIO_U8	0x0008  /* Unsigned 8-bit samples */
-#define AUDIO_S8	0x8008  /* Signed 8-bit samples */
-#define AUDIO_U16LSB	0x0010  /* Unsigned 16-bit samples */
-#define AUDIO_S16LSB	0x8010  /* Signed 16-bit samples */
-#define AUDIO_U16MSB	0x1010  /* As above, but big-endian byte order */
-#define AUDIO_S16MSB	0x9010  /* As above, but big-endian byte order */
-#define AUDIO_U16	AUDIO_U16LSB
-#define AUDIO_S16	AUDIO_S16LSB
-
-/* int32 support new to SDL 1.3 */
-#define AUDIO_S32LSB	0x8020  /* 32-bit integer samples */
-#define AUDIO_S32MSB	0x9020  /* As above, but big-endian byte order */
-#define AUDIO_S32	AUDIO_S32LSB
-
-/* float32 support new to SDL 1.3 */
-#define AUDIO_F32LSB	0x8120  /* 32-bit floating point samples */
-#define AUDIO_F32MSB	0x9120  /* As above, but big-endian byte order */
-#define AUDIO_F32	AUDIO_F32LSB
-
-/* Native audio byte ordering */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define AUDIO_U16SYS	AUDIO_U16LSB
-#define AUDIO_S16SYS	AUDIO_S16LSB
-#define AUDIO_S32SYS	AUDIO_S32LSB
-#define AUDIO_F32SYS	AUDIO_F32LSB
-#else
-#define AUDIO_U16SYS	AUDIO_U16MSB
-#define AUDIO_S16SYS	AUDIO_S16MSB
-#define AUDIO_S32SYS	AUDIO_S32MSB
-#define AUDIO_F32SYS	AUDIO_F32MSB
-#endif
-
-/* Which audio format changes are allowed when opening a device */
-#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
-#define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
-#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
-#define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
-
-/* A structure to hold a set of audio conversion filters and buffers */
-struct SDL_AudioCVT;
-typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt,
-                                          SDL_AudioFormat format);
-
-typedef struct SDL_AudioCVT
-{
-    int needed;                 /* Set to 1 if conversion possible */
-    SDL_AudioFormat src_format; /* Source audio format */
-    SDL_AudioFormat dst_format; /* Target audio format */
-    double rate_incr;           /* Rate conversion increment */
-    Uint8 *buf;                 /* Buffer to hold entire audio data */
-    int len;                    /* Length of original audio buffer */
-    int len_cvt;                /* Length of converted audio buffer */
-    int len_mult;               /* buffer must be len*len_mult big */
-    double len_ratio;           /* Given len, final size is len*len_ratio */
-    SDL_AudioFilter filters[10];        /* Filter list */
-    int filter_index;           /* Current audio conversion function */
-} SDL_AudioCVT;
-
-
-/* Function prototypes */
-
-/* These functions return the list of built in audio drivers, in the
- * order that they are normally initialized by default.
- */
-extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
-extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
-
-/* These functions are used internally, and should not be used unless you
- * have a specific need to specify the audio driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-
-/* This function returns the name of the current audio driver, or NULL
- * if no driver has been initialized.
- */
-extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void);
-
-/*
- * This function opens the audio device with the desired parameters, and
- * returns 0 if successful, placing the actual hardware parameters in the
- * structure pointed to by 'obtained'.  If 'obtained' is NULL, the audio
- * data passed to the callback function will be guaranteed to be in the
- * requested format, and will be automatically converted to the hardware
- * audio format if necessary.  This function returns -1 if it failed 
- * to open the audio device, or couldn't set up the audio thread.
- *
- * When filling in the desired audio spec structure,
- *  'desired->freq' should be the desired audio frequency in samples-per-second.
- *  'desired->format' should be the desired audio format.
- *  'desired->samples' is the desired size of the audio buffer, in samples.
- *     This number should be a power of two, and may be adjusted by the audio
- *     driver to a value more suitable for the hardware.  Good values seem to
- *     range between 512 and 8096 inclusive, depending on the application and
- *     CPU speed.  Smaller values yield faster response time, but can lead
- *     to underflow if the application is doing heavy processing and cannot
- *     fill the audio buffer in time.  A stereo sample consists of both right
- *     and left channels in LR ordering.
- *     Note that the number of samples is directly related to time by the
- *     following formula:  ms = (samples*1000)/freq
- *  'desired->size' is the size in bytes of the audio buffer, and is
- *     calculated by SDL_OpenAudio().
- *  'desired->silence' is the value used to set the buffer to silence,
- *     and is calculated by SDL_OpenAudio().
- *  'desired->callback' should be set to a function that will be called
- *     when the audio device is ready for more data.  It is passed a pointer
- *     to the audio buffer, and the length in bytes of the audio buffer.
- *     This function usually runs in a separate thread, and so you should
- *     protect data structures that it accesses by calling SDL_LockAudio()
- *     and SDL_UnlockAudio() in your code.
- *  'desired->userdata' is passed as the first parameter to your callback
- *     function.
- *
- * The audio device starts out playing silence when it's opened, and should
- * be enabled for playing by calling SDL_PauseAudio(0) when you are ready
- * for your audio callback function to be called.  Since the audio driver
- * may modify the requested size of the audio buffer, you should allocate
- * any local mixing buffers after you open the audio device.
- */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired,
-                                          SDL_AudioSpec * obtained);
-
-/*
- * SDL Audio Device IDs.
- * A successful call to SDL_OpenAudio() is always device id 1, and legacy
- *  SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls
- *  always returns devices >= 2 on success. The legacy calls are good both
- *  for backwards compatibility and when you don't care about multiple,
- *  specific, or capture devices.
- */
-typedef Uint32 SDL_AudioDeviceID;
-
-/*
- * Get the number of available devices exposed by the current driver.
- *  Only valid after a successfully initializing the audio subsystem.
- *  Returns -1 if an explicit list of devices can't be determined; this is
- *  not an error. For example, if SDL is set up to talk to a remote audio
- *  server, it can't list every one available on the Internet, but it will
- *  still allow a specific host to be specified to SDL_OpenAudioDevice().
- * In many common cases, when this function returns a value <= 0, it can still
- *  successfully open the default device (NULL for first argument of
- *  SDL_OpenAudioDevice()).
- */
-extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture);
-
-/*
- * Get the human-readable name of a specific audio device.
- *  Must be a value between 0 and (number of audio devices-1).
- *  Only valid after a successfully initializing the audio subsystem.
- *  The values returned by this function reflect the latest call to
- *  SDL_GetNumAudioDevices(); recall that function to redetect available
- *  hardware.
- *
- * The string returned by this function is UTF-8 encoded, read-only, and
- *  managed internally. You are not to free it. If you need to keep the
- *  string for any length of time, you should make your own copy of it, as it
- *  will be invalid next time any of several other SDL functions is called.
- */
-extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
-                                                           int iscapture);
-
-
-/*
- * Open a specific audio device. Passing in a device name of NULL requests
- *  the most reasonable default (and is equivalent to calling SDL_OpenAudio()).
- * The device name is a UTF-8 string reported by SDL_GetAudioDevice(), but
- *  some drivers allow arbitrary and driver-specific strings, such as a
- *  hostname/IP address for a remote audio server, or a filename in the
- *  diskaudio driver.
- * Returns 0 on error, a valid device ID that is >= 2 on success.
- *  SDL_OpenAudio(), unlike this function, always acts on device ID 1.
- */
-extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
-                                                              *device,
-                                                              int iscapture,
-                                                              const
-                                                              SDL_AudioSpec *
-                                                              desired,
-                                                              SDL_AudioSpec *
-                                                              obtained,
-                                                              int
-                                                              allowed_changes);
-
-
-
-/*
- * Get the current audio state:
- */
-typedef enum
-{
-    SDL_AUDIO_STOPPED = 0,
-    SDL_AUDIO_PLAYING,
-    SDL_AUDIO_PAUSED
-} SDL_audiostatus;
-extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);
-
-extern DECLSPEC SDL_audiostatus SDLCALL
-SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
-
-/*
- * This function pauses and unpauses the audio callback processing.
- * It should be called with a parameter of 0 after opening the audio
- * device to start playing sound.  This is so you can safely initialize
- * data for your callback function after opening the audio device.
- * Silence will be written to the audio device during the pause.
- */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
-extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
-                                                  int pause_on);
-
-/*
- * This function loads a WAVE from the data source, automatically freeing
- * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
- * you could do:
- *	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
- *
- * If this function succeeds, it returns the given SDL_AudioSpec,
- * filled with the audio data format of the wave data, and sets
- * 'audio_buf' to a malloc()'d buffer containing the audio data,
- * and sets 'audio_len' to the length of that audio buffer, in bytes.
- * You need to free the audio buffer with SDL_FreeWAV() when you are 
- * done with it.
- *
- * This function returns NULL and sets the SDL error message if the 
- * wave file cannot be opened, uses an unknown data format, or is 
- * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
- */
-extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
-                                                      int freesrc,
-                                                      SDL_AudioSpec * spec,
-                                                      Uint8 ** audio_buf,
-                                                      Uint32 * audio_len);
-
-/* Compatibility convenience function -- loads a WAV from a file */
-#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
-	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
-
-/*
- * This function frees data previously allocated with SDL_LoadWAV_RW()
- */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf);
-
-/*
- * This function takes a source format and rate and a destination format
- * and rate, and initializes the 'cvt' structure with information needed
- * by SDL_ConvertAudio() to convert a buffer of audio data from one format
- * to the other.
- * Returns -1 if the format conversion is not supported, 0 if there's
- *  no conversion needed, or 1 if the audio filter is set up.
- */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
-                                              SDL_AudioFormat src_format,
-                                              Uint8 src_channels,
-                                              int src_rate,
-                                              SDL_AudioFormat dst_format,
-                                              Uint8 dst_channels,
-                                              int dst_rate);
-
-/* Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
- * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
- * audio data in the source format, this function will convert it in-place
- * to the desired format.
- * The data conversion may expand the size of the audio data, so the buffer
- * cvt->buf should be allocated after the cvt structure is initialized by
- * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
- */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt);
-
-/*
- * This takes two audio buffers of the playing audio format and mixes
- * them, performing addition, volume adjustment, and overflow clipping.
- * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME
- * for full audio volume.  Note this does not change hardware volume.
- * This is provided for convenience -- you can mix your own audio data.
- */
-#define SDL_MIX_MAXVOLUME 128
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src,
-                                          Uint32 len, int volume);
-
-/*
- * This works like SDL_MixAudio, but you specify the audio format instead of
- *  using the format of audio device 1. Thus it can be used when no audio
- *  device is open at all.
- */
-extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
-                                                const Uint8 * src,
-                                                SDL_AudioFormat format,
-                                                Uint32 len, int volume);
-
-/*
- * The lock manipulated by these functions protects the callback function.
- * During a LockAudio/UnlockAudio pair, you can be guaranteed that the
- * callback function is not running.  Do not call these from the callback
- * function or you will cause deadlock.
- */
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
-
-/*
- * This function shuts down audio processing and closes the audio device.
- */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
-extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
-
-/*
- * Returns 1 if audio device is still functioning, zero if not, -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_AudioDeviceConnected(SDL_AudioDeviceID dev);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_audio_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_cdrom.h b/Externals/SDL/Include_1.3/SDL_cdrom.h
deleted file mode 100644
index f90dfda7c9..0000000000
--- a/Externals/SDL/Include_1.3/SDL_cdrom.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_cdrom.h
- *
- * This is the CD-audio control API for Simple DirectMedia Layer
- */
-
-#ifndef _SDL_cdrom_h
-#define _SDL_cdrom_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* In order to use these functions, SDL_Init() must have been called
-   with the SDL_INIT_CDROM flag.  This causes SDL to scan the system
-   for CD-ROM drives, and load appropriate drivers.
-*/
-
-/* The maximum number of CD-ROM tracks on a disk */
-#define SDL_MAX_TRACKS	99
-
-/* The types of CD-ROM track possible */
-#define SDL_AUDIO_TRACK	0x00
-#define SDL_DATA_TRACK	0x04
-
-/* The possible states which a CD-ROM drive can be in. */
-typedef enum
-{
-    CD_TRAYEMPTY,
-    CD_STOPPED,
-    CD_PLAYING,
-    CD_PAUSED,
-    CD_ERROR = -1
-} CDstatus;
-
-/* Given a status, returns true if there's a disk in the drive */
-#define CD_INDRIVE(status)	((int)(status) > 0)
-
-typedef struct SDL_CDtrack
-{
-    Uint8 id;                   /* Track number */
-    Uint8 type;                 /* Data or audio track */
-    Uint16 unused;
-    Uint32 length;              /* Length, in frames, of this track */
-    Uint32 offset;              /* Offset, in frames, from start of disk */
-} SDL_CDtrack;
-
-/* This structure is only current as of the last call to SDL_CDStatus() */
-typedef struct SDL_CD
-{
-    int id;                     /* Private drive identifier */
-    CDstatus status;            /* Current drive status */
-
-    /* The rest of this structure is only valid if there's a CD in drive */
-    int numtracks;              /* Number of tracks on disk */
-    int cur_track;              /* Current track position */
-    int cur_frame;              /* Current frame offset within current track */
-    SDL_CDtrack track[SDL_MAX_TRACKS + 1];
-} SDL_CD;
-
-/* Conversion functions from frames to Minute/Second/Frames and vice versa */
-#define CD_FPS	75
-#define FRAMES_TO_MSF(f, M,S,F)	{					\
-	int value = f;							\
-	*(F) = value%CD_FPS;						\
-	value /= CD_FPS;						\
-	*(S) = value%60;						\
-	value /= 60;							\
-	*(M) = value;							\
-}
-#define MSF_TO_FRAMES(M, S, F)	((M)*60*CD_FPS+(S)*CD_FPS+(F))
-
-/* CD-audio API functions: */
-
-/* Returns the number of CD-ROM drives on the system, or -1 if
-   SDL_Init() has not been called with the SDL_INIT_CDROM flag.
- */
-extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);
-
-/* Returns a human-readable, system-dependent identifier for the CD-ROM.
-   Example:
-	"/dev/cdrom"
-	"E:"
-	"/dev/disk/ide/1/master"
-*/
-extern DECLSPEC const char *SDLCALL SDL_CDName(int drive);
-
-/* Opens a CD-ROM drive for access.  It returns a drive handle on success,
-   or NULL if the drive was invalid or busy.  This newly opened CD-ROM
-   becomes the default CD used when other CD functions are passed a NULL
-   CD-ROM handle.
-   Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
-*/
-extern DECLSPEC SDL_CD *SDLCALL SDL_CDOpen(int drive);
-
-/* This function returns the current status of the given drive.
-   If the drive has a CD in it, the table of contents of the CD and current
-   play position of the CD will be stored in the SDL_CD structure.
-*/
-extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD * cdrom);
-
-/* Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
-   tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
-   until the end of the CD.  This function will skip data tracks.
-   This function should only be called after calling SDL_CDStatus() to 
-   get track information about the CD.
-   For example:
-	// Play entire CD:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-		SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
-	// Play last track:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
-		SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0);
-	}
-	// Play first and second track and 10 seconds of third track:
-	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
-		SDL_CDPlayTracks(cdrom, 0, 0, 2, 10);
-
-   This function returns 0, or -1 if there was an error.
-*/
-extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD * cdrom,
-                                             int start_track,
-                                             int start_frame, int ntracks,
-                                             int nframes);
-
-/* Play the given CD starting at 'start' frame for 'length' frames.
-   It returns 0, or -1 if there was an error.
-*/
-extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD * cdrom, int start, int length);
-
-/* Pause play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD * cdrom);
-
-/* Resume play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD * cdrom);
-
-/* Stop play -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD * cdrom);
-
-/* Eject CD-ROM -- returns 0, or -1 on error */
-extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD * cdrom);
-
-/* Closes the handle for the CD-ROM drive */
-extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD * cdrom);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_compat.h b/Externals/SDL/Include_1.3/SDL_compat.h
deleted file mode 100644
index 109dfb374e..0000000000
--- a/Externals/SDL/Include_1.3/SDL_compat.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file contains functions for backwards compatibility with SDL 1.2 */
-
-#ifndef _SDL_compat_h
-#define _SDL_compat_h
-
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-#define SDL_SWSURFACE       0x00000000  /* Not used */
-#define SDL_SRCALPHA        0x00010000
-#define SDL_SRCCOLORKEY     0x00020000
-#define SDL_ANYFORMAT       0x00100000
-#define SDL_HWPALETTE       0x00200000
-#define SDL_DOUBLEBUF       0x00400000
-#define SDL_FULLSCREEN      0x00800000
-#define SDL_RESIZABLE       0x01000000
-#define SDL_NOFRAME         0x02000000
-#define SDL_OPENGL          0x04000000
-#define SDL_HWSURFACE       0x08000001  /* Not used */
-#define SDL_ASYNCBLIT       0x08000000  /* Not used */
-#define SDL_RLEACCELOK      0x08000000  /* Not used */
-#define SDL_HWACCEL         0x08000000  /* Not used */
-
-#define SDL_APPMOUSEFOCUS	0x01
-#define SDL_APPINPUTFOCUS	0x02
-#define SDL_APPACTIVE		0x04
-
-#define SDL_LOGPAL 0x01
-#define SDL_PHYSPAL 0x02
-
-#define SDL_ACTIVEEVENT	SDL_EVENT_RESERVED1
-#define SDL_VIDEORESIZE	SDL_EVENT_RESERVED2
-#define SDL_VIDEOEXPOSE	SDL_EVENT_RESERVED3
-#define SDL_ACTIVEEVENTMASK	SDL_EVENTMASK(SDL_ACTIVEEVENT)
-#define SDL_VIDEORESIZEMASK SDL_EVENTMASK(SDL_VIDEORESIZE)
-#define SDL_VIDEOEXPOSEMASK SDL_EVENTMASK(SDL_VIDEOEXPOSE)
-
-#define SDL_BUTTON_WHEELUP	4
-#define SDL_BUTTON_WHEELDOWN	5
-
-#define SDL_DEFAULT_REPEAT_DELAY	500
-#define SDL_DEFAULT_REPEAT_INTERVAL	30
-
-typedef struct SDL_VideoInfo
-{
-    Uint32 hw_available:1;
-    Uint32 wm_available:1;
-    Uint32 UnusedBits1:6;
-    Uint32 UnusedBits2:1;
-    Uint32 blit_hw:1;
-    Uint32 blit_hw_CC:1;
-    Uint32 blit_hw_A:1;
-    Uint32 blit_sw:1;
-    Uint32 blit_sw_CC:1;
-    Uint32 blit_sw_A:1;
-    Uint32 blit_fill:1;
-    Uint32 UnusedBits3:16;
-    Uint32 video_mem;
-
-    SDL_PixelFormat *vfmt;
-
-    int current_w;
-    int current_h;
-} SDL_VideoInfo;
-
-/* The most common video overlay formats.
-   For an explanation of these pixel formats, see:
-   http://www.webartz.com/fourcc/indexyuv.htm
-
-   For information on the relationship between color spaces, see:
-   http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
- */
-#define SDL_YV12_OVERLAY  0x32315659    /* Planar mode: Y + V + U  (3 planes) */
-#define SDL_IYUV_OVERLAY  0x56555949    /* Planar mode: Y + U + V  (3 planes) */
-#define SDL_YUY2_OVERLAY  0x32595559    /* Packed mode: Y0+U0+Y1+V0 (1 plane) */
-#define SDL_UYVY_OVERLAY  0x59565955    /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
-#define SDL_YVYU_OVERLAY  0x55595659    /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
-
-/* The YUV hardware video overlay */
-typedef struct SDL_Overlay
-{
-    Uint32 format;              /* Read-only */
-    int w, h;                   /* Read-only */
-    int planes;                 /* Read-only */
-    Uint16 *pitches;            /* Read-only */
-    Uint8 **pixels;             /* Read-write */
-
-    /* Hardware-specific surface info */
-    struct private_yuvhwfuncs *hwfuncs;
-    struct private_yuvhwdata *hwdata;
-
-    /* Special flags */
-    Uint32 hw_overlay:1;        /* Flag: This overlay hardware accelerated? */
-    Uint32 UnusedBits:31;
-} SDL_Overlay;
-
-typedef enum
-{
-    SDL_GRAB_QUERY = -1,
-    SDL_GRAB_OFF = 0,
-    SDL_GRAB_ON = 1
-} SDL_GrabMode;
-
-struct SDL_SysWMinfo;
-
-/* Obsolete or renamed key codes */
-
-/* These key constants were renamed for clarity or consistency. */
-#define SDLK_0	'0'
-#define SDLK_1	'1'
-#define SDLK_2	'2'
-#define SDLK_3	'3'
-#define SDLK_4	'4'
-#define SDLK_5	'5'
-#define SDLK_6	'6'
-#define SDLK_7	'7'
-#define SDLK_8	'8'
-#define SDLK_9	'9'
-#define SDLK_a  'a'
-#define SDLK_b  'b'
-#define SDLK_c  'c'
-#define SDLK_d  'd'
-#define SDLK_e  'e'
-#define SDLK_f  'f'
-#define SDLK_g  'g'
-#define SDLK_h  'h'
-#define SDLK_i  'i'
-#define SDLK_j  'j'
-#define SDLK_k  'k'
-#define SDLK_l  'l'
-#define SDLK_m  'm'
-#define SDLK_n  'n'
-#define SDLK_o  'o'
-#define SDLK_p  'p'
-#define SDLK_q  'q'
-#define SDLK_r  'r'
-#define SDLK_s  's'
-#define SDLK_t  't'
-#define SDLK_u  'u'
-#define SDLK_v  'v'
-#define SDLK_w  'w'
-#define SDLK_x  'x'
-#define SDLK_y  'y'
-#define SDLK_z  'z'
-#define SDLK_QUOTE      '\''
-#define SDLK_MINUS      '-'
-#define SDLK_BACKQUOTE  '`'
-#define SDLK_EXCLAIM    '!'
-#define SDLK_QUOTEDBL   '"'
-#define SDLK_HASH       '#'
-#define SDLK_DOLLAR     '$'
-#define SDLK_AMPERSAND  '&'
-#define SDLK_LEFTPAREN  '('
-#define SDLK_RIGHTPAREN ')'
-#define SDLK_ASTERISK   '*'
-#define SDLK_PLUS       '+'
-#define SDLK_COLON      ':'
-#define SDLK_LESS       '<'
-#define SDLK_GREATER    '>'
-#define SDLK_QUESTION   '?'
-#define SDLK_AT         '@'
-#define SDLK_CARET      '^'
-#define SDLK_UNDERSCORE '_'
-#define SDLK_KP0 SDLK_KP_0
-#define SDLK_KP1 SDLK_KP_1
-#define SDLK_KP2 SDLK_KP_2
-#define SDLK_KP3 SDLK_KP_3
-#define SDLK_KP4 SDLK_KP_4
-#define SDLK_KP5 SDLK_KP_5
-#define SDLK_KP6 SDLK_KP_6
-#define SDLK_KP7 SDLK_KP_7
-#define SDLK_KP8 SDLK_KP_8
-#define SDLK_KP9 SDLK_KP_9
-#define SDLK_NUMLOCK SDLK_NUMLOCKCLEAR
-#define SDLK_SCROLLOCK SDLK_SCROLLLOCK
-#define SDLK_PRINT SDLK_PRINTSCREEN
-
-/* The META modifier is equivalent to the GUI modifier from the USB standard */
-#define KMOD_LMETA KMOD_LGUI
-#define KMOD_RMETA KMOD_RGUI
-#define KMOD_META KMOD_GUI
-
-/* These keys don't appear in the USB specification (or at least not under those names). I'm unsure if the following assignments make sense or if these codes should be defined as actual additional SDLK_ constants. */
-#define SDLK_LSUPER SDLK_LMETA
-#define SDLK_RSUPER SDLK_RMETA
-#define SDLK_COMPOSE SDLK_APPLICATION
-#define SDLK_BREAK SDLK_STOP
-#define SDLK_EURO SDLK_2
-
-
-#define SDL_SetModuleHandle(x)
-#define SDL_AllocSurface    SDL_CreateRGBSurface
-
-extern DECLSPEC const SDL_version *SDLCALL SDL_Linked_Version(void);
-extern DECLSPEC char *SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
-extern DECLSPEC char *SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
-extern DECLSPEC const SDL_VideoInfo *SDLCALL SDL_GetVideoInfo(void);
-extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width,
-                                            int height,
-                                            int bpp, Uint32 flags);
-extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(const SDL_PixelFormat *
-                                                 format, Uint32 flags);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode(int width, int height,
-                                                      int bpp, Uint32 flags);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_GetVideoSurface(void);
-extern DECLSPEC void SDLCALL SDL_UpdateRects(SDL_Surface * screen,
-                                             int numrects, SDL_Rect * rects);
-extern DECLSPEC void SDLCALL SDL_UpdateRect(SDL_Surface * screen,
-                                            Sint32 x,
-                                            Sint32 y, Uint32 w, Uint32 h);
-extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface * screen);
-extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface * surface,
-                                         Uint32 flag, Uint8 alpha);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormat(SDL_Surface * surface);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *
-                                                            surface);
-extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
-                                               const char *icon);
-extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title,
-                                               const char **icon);
-extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
-extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
-extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);
-extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
-extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface * surface,
-                                           int flags,
-                                           const SDL_Color * colors,
-                                           int firstcolor, int ncolors);
-extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface * surface,
-                                          const SDL_Color * colors,
-                                          int firstcolor, int ncolors);
-extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo *info);
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
-extern DECLSPEC SDL_Overlay *SDLCALL SDL_CreateYUVOverlay(int width,
-                                                          int height,
-                                                          Uint32 format,
-                                                          SDL_Surface *
-                                                          display);
-extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay * overlay);
-extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay * overlay);
-extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay * overlay,
-                                                  SDL_Rect * dstrect);
-extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay * overlay);
-extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
-extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_compat_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_config.h b/Externals/SDL/Include_1.3/SDL_config.h
deleted file mode 100644
index d72d7e585e..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__NINTENDODS__)
-#include "SDL_config_nintendods.h"
-#elif defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__IPHONEOS__) 
-#include "SDL_config_iphoneos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config.h.default b/Externals/SDL/Include_1.3/SDL_config.h.default
deleted file mode 100644
index d72d7e585e..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config.h.default
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__NINTENDODS__)
-#include "SDL_config_nintendods.h"
-#elif defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__IPHONEOS__) 
-#include "SDL_config_iphoneos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config.h.in b/Externals/SDL/Include_1.3/SDL_config.h.in
deleted file mode 100644
index 88a1f11c8c..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config.h.in
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-#undef const
-#undef inline
-#undef volatile
-
-/* C datatypes */
-#undef size_t
-#undef int8_t
-#undef uint8_t
-#undef int16_t
-#undef uint16_t
-#undef int32_t
-#undef uint32_t
-#undef int64_t
-#undef uint64_t
-#undef uintptr_t
-#undef SDL_HAS_64BIT_TYPE
-
-/* Endianness */
-#undef SDL_BYTEORDER
-
-/* Comment this if you want to build without any C library requirements */
-#undef HAVE_LIBC
-#if HAVE_LIBC
-
-/* Useful headers */
-#undef HAVE_ALLOCA_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_STDIO_H
-#undef STDC_HEADERS
-#undef HAVE_STDLIB_H
-#undef HAVE_STDARG_H
-#undef HAVE_MALLOC_H
-#undef HAVE_MEMORY_H
-#undef HAVE_STRING_H
-#undef HAVE_STRINGS_H
-#undef HAVE_INTTYPES_H
-#undef HAVE_STDINT_H
-#undef HAVE_CTYPE_H
-#undef HAVE_MATH_H
-#undef HAVE_ICONV_H
-#undef HAVE_SIGNAL_H
-#undef HAVE_ALTIVEC_H
-
-/* C library functions */
-#undef HAVE_MALLOC
-#undef HAVE_CALLOC
-#undef HAVE_REALLOC
-#undef HAVE_FREE
-#undef HAVE_ALLOCA
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#undef HAVE_GETENV
-#undef HAVE_PUTENV
-#undef HAVE_UNSETENV
-#endif
-#undef HAVE_QSORT
-#undef HAVE_ABS
-#undef HAVE_BCOPY
-#undef HAVE_MEMSET
-#undef HAVE_MEMCPY
-#undef HAVE_MEMMOVE
-#undef HAVE_MEMCMP
-#undef HAVE_STRLEN
-#undef HAVE_STRLCPY
-#undef HAVE_STRLCAT
-#undef HAVE_STRDUP
-#undef HAVE__STRREV
-#undef HAVE__STRUPR
-#undef HAVE__STRLWR
-#undef HAVE_INDEX
-#undef HAVE_RINDEX
-#undef HAVE_STRCHR
-#undef HAVE_STRRCHR
-#undef HAVE_STRSTR
-#undef HAVE_ITOA
-#undef HAVE__LTOA
-#undef HAVE__UITOA
-#undef HAVE__ULTOA
-#undef HAVE_STRTOL
-#undef HAVE_STRTOUL
-#undef HAVE__I64TOA
-#undef HAVE__UI64TOA
-#undef HAVE_STRTOLL
-#undef HAVE_STRTOULL
-#undef HAVE_STRTOD
-#undef HAVE_ATOI
-#undef HAVE_ATOF
-#undef HAVE_STRCMP
-#undef HAVE_STRNCMP
-#undef HAVE__STRICMP
-#undef HAVE_STRCASECMP
-#undef HAVE__STRNICMP
-#undef HAVE_STRNCASECMP
-#undef HAVE_SSCANF
-#undef HAVE_SNPRINTF
-#undef HAVE_VSNPRINTF
-#undef HAVE_M_PI
-#undef HAVE_CEIL
-#undef HAVE_COPYSIGN
-#undef HAVE_COS
-#undef HAVE_COSF
-#undef HAVE_FABS
-#undef HAVE_FLOOR
-#undef HAVE_LOG
-#undef HAVE_POW
-#undef HAVE_SCALBN
-#undef HAVE_SIN
-#undef HAVE_SINF
-#undef HAVE_SQRT
-#undef HAVE_SIGACTION
-#undef HAVE_SETJMP
-#undef HAVE_NANOSLEEP
-#undef HAVE_CLOCK_GETTIME
-#undef HAVE_DLVSYM
-#undef HAVE_GETPAGESIZE
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* Allow disabling of core subsystems */
-#undef SDL_AUDIO_DISABLED
-#undef SDL_CDROM_DISABLED
-#undef SDL_CPUINFO_DISABLED
-#undef SDL_EVENTS_DISABLED
-#undef SDL_FILE_DISABLED
-#undef SDL_JOYSTICK_DISABLED
-#undef SDL_HAPTIC_DISABLED
-#undef SDL_LOADSO_DISABLED
-#undef SDL_THREADS_DISABLED
-#undef SDL_TIMERS_DISABLED
-#undef SDL_VIDEO_DISABLED
-
-/* Enable various audio drivers */
-#undef SDL_AUDIO_DRIVER_ALSA
-#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
-#undef SDL_AUDIO_DRIVER_ARTS
-#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
-#undef SDL_AUDIO_DRIVER_PULSEAUDIO
-#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
-#undef SDL_AUDIO_DRIVER_BEOSAUDIO
-#undef SDL_AUDIO_DRIVER_BSD
-#undef SDL_AUDIO_DRIVER_COREAUDIO
-#undef SDL_AUDIO_DRIVER_DART
-#undef SDL_AUDIO_DRIVER_DC
-#undef SDL_AUDIO_DRIVER_DISK
-#undef SDL_AUDIO_DRIVER_DUMMY
-#undef SDL_AUDIO_DRIVER_DMEDIA
-#undef SDL_AUDIO_DRIVER_DSOUND
-#undef SDL_AUDIO_DRIVER_ESD
-#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
-#undef SDL_AUDIO_DRIVER_MINT
-#undef SDL_AUDIO_DRIVER_MMEAUDIO
-#undef SDL_AUDIO_DRIVER_NAS
-#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC
-#undef SDL_AUDIO_DRIVER_NDS
-#undef SDL_AUDIO_DRIVER_OSS
-#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
-#undef SDL_AUDIO_DRIVER_PAUDIO
-#undef SDL_AUDIO_DRIVER_QNXNTO
-#undef SDL_AUDIO_DRIVER_SNDMGR
-#undef SDL_AUDIO_DRIVER_SUNAUDIO
-#undef SDL_AUDIO_DRIVER_WINWAVEOUT
-#undef SDL_AUDIO_DRIVER_FUSIONSOUND
-#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
-
-/* Enable various cdrom drivers */
-#undef SDL_CDROM_AIX
-#undef SDL_CDROM_BEOS
-#undef SDL_CDROM_BSDI
-#undef SDL_CDROM_DC
-#undef SDL_CDROM_DUMMY
-#undef SDL_CDROM_FREEBSD
-#undef SDL_CDROM_LINUX
-#undef SDL_CDROM_MACOSX
-#undef SDL_CDROM_MINT
-#undef SDL_CDROM_OPENBSD
-#undef SDL_CDROM_OS2
-#undef SDL_CDROM_OSF
-#undef SDL_CDROM_QNX
-#undef SDL_CDROM_WIN32
-
-/* Enable various input drivers */
-#undef SDL_INPUT_LINUXEV
-#undef SDL_INPUT_TSLIB
-#undef SDL_JOYSTICK_BEOS
-#undef SDL_JOYSTICK_DC
-#undef SDL_JOYSTICK_DINPUT
-#undef SDL_JOYSTICK_DUMMY
-#undef SDL_JOYSTICK_IOKIT
-#undef SDL_JOYSTICK_LINUX
-#undef SDL_JOYSTICK_MINT
-#undef SDL_JOYSTICK_NDS
-#undef SDL_JOYSTICK_OS2
-#undef SDL_JOYSTICK_RISCOS
-#undef SDL_JOYSTICK_WINMM
-#undef SDL_JOYSTICK_USBHID
-#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
-#undef SDL_HAPTIC_DUMMY
-#undef SDL_HAPTIC_LINUX
-#undef SDL_HAPTIC_IOKIT
-#undef SDL_HAPTIC_DINPUT
-
-/* Enable various shared object loading systems */
-#undef SDL_LOADSO_BEOS
-#undef SDL_LOADSO_DLCOMPAT
-#undef SDL_LOADSO_DLOPEN
-#undef SDL_LOADSO_DUMMY
-#undef SDL_LOADSO_LDG
-#undef SDL_LOADSO_OS2
-#undef SDL_LOADSO_WIN32
-
-/* Enable various threading systems */
-#undef SDL_THREAD_BEOS
-#undef SDL_THREAD_DC
-#undef SDL_THREAD_NDS
-#undef SDL_THREAD_OS2
-#undef SDL_THREAD_PTH
-#undef SDL_THREAD_PTHREAD
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
-#undef SDL_THREAD_SPROC
-#undef SDL_THREAD_WIN32
-
-/* Enable various timer systems */
-#undef SDL_TIMER_BEOS
-#undef SDL_TIMER_DC
-#undef SDL_TIMER_DUMMY
-#undef SDL_TIMER_MINT
-#undef SDL_TIMER_NDS
-#undef SDL_TIMER_OS2
-#undef SDL_TIMER_RISCOS
-#undef SDL_TIMER_UNIX
-#undef SDL_TIMER_WIN32
-#undef SDL_TIMER_WINCE
-
-/* Enable various video drivers */
-#undef SDL_VIDEO_DRIVER_BWINDOW
-#undef SDL_VIDEO_DRIVER_COCOA
-#undef SDL_VIDEO_DRIVER_DC
-#undef SDL_VIDEO_DRIVER_DIRECTFB
-#undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC
-#undef SDL_VIDEO_DRIVER_DUMMY
-#undef SDL_VIDEO_DRIVER_FBCON
-#undef SDL_VIDEO_DRIVER_GAPI
-#undef SDL_VIDEO_DRIVER_GEM
-#undef SDL_VIDEO_DRIVER_IPOD
-#undef SDL_VIDEO_DRIVER_NANOX
-#undef SDL_VIDEO_DRIVER_NDS
-#undef SDL_VIDEO_DRIVER_OS2FS
-#undef SDL_VIDEO_DRIVER_PHOTON
-#undef SDL_VIDEO_DRIVER_PS2GS
-#undef SDL_VIDEO_DRIVER_RISCOS
-#undef SDL_VIDEO_DRIVER_SVGALIB
-#undef SDL_VIDEO_DRIVER_VGL
-#undef SDL_VIDEO_DRIVER_WIN32
-#undef SDL_VIDEO_DRIVER_WSCONS
-#undef SDL_VIDEO_DRIVER_X11
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS
-#undef SDL_VIDEO_DRIVER_X11_VIDMODE
-#undef SDL_VIDEO_DRIVER_X11_XINERAMA
-#undef SDL_VIDEO_DRIVER_X11_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_XINPUT
-#undef SDL_VIDEO_DRIVER_X11_SCRNSAVER
-#undef SDL_VIDEO_DRIVER_X11_XV
-#undef SDL_VIDEO_DRIVER_XBIOS
-
-#undef SDL_VIDEO_RENDER_D3D
-#undef SDL_VIDEO_RENDER_GDI
-#undef SDL_VIDEO_RENDER_OGL
-#undef SDL_VIDEO_RENDER_X11
-
-/* Enable OpenGL support */
-#undef SDL_VIDEO_OPENGL
-#undef SDL_VIDEO_OPENGL_BGL
-#undef SDL_VIDEO_OPENGL_CGL
-#undef SDL_VIDEO_OPENGL_GLX
-#undef SDL_VIDEO_OPENGL_WGL
-#undef SDL_VIDEO_OPENGL_OSMESA
-#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
-
-/* Enable assembly routines */
-#undef SDL_ASSEMBLY_ROUTINES
-#undef SDL_ALTIVEC_BLITTERS
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_dreamcast.h b/Externals/SDL/Include_1.3/SDL_config_dreamcast.h
deleted file mode 100644
index 5b8175c8a7..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_dreamcast.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_dreamcast_h
-#define _SDL_config_dreamcast_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long uintptr_t;
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DC	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DC	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_DC	1
-#define SDL_HAPTIC_DUMMY	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_DC	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_DC	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DC	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_dreamcast_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_iphoneos.h b/Externals/SDL/Include_1.3/SDL_config_iphoneos.h
deleted file mode 100644
index 928976ac93..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_iphoneos.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_iphoneos_h
-#define _SDL_config_iphoneos_h
-
-#include "SDL_platform.h"
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uintptr_t;
-#define SDL_HAS_64BIT_TYPE	1
-
-#define HAVE_ALLOCA_H		1
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_STDINT_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_UNSETENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRLCPY	1
-#define HAVE_STRLCAT	1
-#define HAVE_STRDUP	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOUL	1
-#define HAVE_STRTOLL	1
-#define HAVE_STRTOULL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-#define HAVE_SIGACTION	1
-#define HAVE_SETJMP	1
-#define HAVE_NANOSLEEP	1
-
-/* enable iPhone version of Core Audio driver */
-#define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1
-/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
-#define SDL_HAPTIC_DISABLED	1
-
-/* Enable Unix style SO loading */
-/* Technically this works, but it violates the iPhone developer agreement */
-/* #define SDL_LOADSO_DLOPEN 1 */
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD	1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX	1
-
-/* Supported video drivers */
-#define SDL_VIDEO_DRIVER_UIKIT	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-/* enable OpenGL ES */
-#define SDL_VIDEO_OPENGL_ES	1
-#define SDL_VIDEO_RENDER_OGL_ES	1
-
-/* enable iPhone keyboard support */
-#define SDL_IPHONE_KEYBOARD 1
-
-/* Enable emulation of multiple mice through multi-touch */
-#define SDL_IPHONE_MULTIPLE_MICE 1
-
-/* Set max recognized G-force from acceleromter
-   See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed
- */
-#define SDL_IPHONE_MAX_GFORCE 5.0
-
-#endif /* _SDL_config_iphoneos_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_macosx.h b/Externals/SDL/Include_1.3/SDL_config_macosx.h
deleted file mode 100644
index c23274e15e..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_macosx.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macosx_h
-#define _SDL_config_macosx_h
-
-#include "SDL_platform.h"
-
-/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
-#include <AvailabilityMacros.h>
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
-#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
-#define HAVE_ALLOCA_H		1
-#endif
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_STDINT_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_UNSETENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRLCPY	1
-#define HAVE_STRLCAT	1
-#define HAVE_STRDUP	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOUL	1
-#define HAVE_STRTOLL	1
-#define HAVE_STRTOULL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-#define HAVE_SIGACTION	1
-#define HAVE_SETJMP	1
-#define HAVE_NANOSLEEP	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_COREAUDIO	1
-#define SDL_AUDIO_DRIVER_SNDMGR	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_MACOSX	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_IOKIT	1
-#define SDL_HAPTIC_IOKIT	1
-
-/* Enable various shared object loading systems */
-#ifdef __ppc__
-/* For Mac OS X 10.2 compatibility */
-#define SDL_LOADSO_DLCOMPAT	1
-#else
-#define SDL_LOADSO_DLOPEN	1
-#endif
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD	1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_COCOA	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_CGL	1
-#define SDL_VIDEO_RENDER_OGL	1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES	1
-#ifdef __ppc__
-#define SDL_ALTIVEC_BLITTERS	1
-#endif
-
-#endif /* _SDL_config_macosx_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_minimal.h b/Externals/SDL/Include_1.3/SDL_config_minimal.h
deleted file mode 100644
index 1a85667484..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_minimal.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_minimal_h
-#define _SDL_config_minimal_h
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-#include <stdarg.h>
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-
-/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
-#define SDL_HAPTIC_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable the stub timer support (src/timer/dummy/\*.c) */
-#define SDL_TIMERS_DISABLED	1
-
-/* Enable the dummy video driver (src/video/dummy/\*.c) */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_minimal_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_nintendods.h b/Externals/SDL/Include_1.3/SDL_config_nintendods.h
deleted file mode 100644
index 043ad08efa..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_nintendods.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_nintendods_h
-#define _SDL_config_nintendods_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-
-/* LiF: __PTRDIFF_TYPE__ was causing errors of conflicting typedefs with the
-   <stdint.h> shipping with devkitARM.  copied a similar ifdef from it. */
-#ifndef __PTRDIFF_TYPE__
-typedef unsigned long uintptr_t;
-#else
-typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-#endif
-
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* DS isn't that sophisticated */
-#define LACKS_SYS_MMAN_H 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_NDS	1
-/*#define SDL_AUDIO_DRIVER_DUMMY	1 TODO: uncomment this later*/
-
-/* DS doesn't have optical media */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_NDS	1
-/*#define SDL_JOYSTICK_DUMMY	1 TODO: uncomment this later*/
-
-/* DS has no dynamic linking afaik */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable various threading systems */
-/*#define SDL_THREAD_NDS	1*/
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_NDS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_NDS	1
-/*#define SDL_VIDEO_DRIVER_DUMMY	1 TODO: uncomment this later*/
-
-#endif /* _SDL_config_nintendods_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_os2.h b/Externals/SDL/Include_1.3/SDL_config_os2.h
deleted file mode 100644
index b80c85a13a..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_os2.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_os2_h
-#define _SDL_config_os2_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Use Watcom's LIBC */
-#define HAVE_LIBC 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__UITOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_CLOCK_GETTIME 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DART	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_OS2	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_OS2	1
-#define SDL_HAPTIC_DUMMY	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_OS2	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_OS2	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_OS2	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_OS2FS	1
-
-/* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
-
-/* Enable assembly routines where available */
-#define SDL_ASSEMBLY_ROUTINES	1
-
-#endif /* _SDL_config_os2_h */
diff --git a/Externals/SDL/Include_1.3/SDL_config_win32.h b/Externals/SDL/Include_1.3/SDL_config_win32.h
deleted file mode 100644
index 9d0da4dcd8..0000000000
--- a/Externals/SDL/Include_1.3/SDL_config_win32.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_win32_h
-#define _SDL_config_win32_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if defined(__GNUC__) || defined(__DMC__)
-#define HAVE_STDINT_H	1
-#elif defined(_MSC_VER)
-typedef signed __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef signed __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef signed __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#ifndef _UINTPTR_T_DEFINED
-#ifdef  _WIN64
-typedef unsigned __int64 uintptr_t;
-#else
-typedef unsigned int uintptr_t;
-#endif
-#define _UINTPTR_T_DEFINED
-#endif
-/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
-#define LONG_PTR LONG
-#endif
-#else /* !__GNUC__ && !_MSC_VER */
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef unsigned int size_t;
-#endif
-typedef unsigned int uintptr_t;
-#endif /* __GNUC__ || _MSC_VER */
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Enabled for SDL 1.2 (binary compatibility) */
-//#define HAVE_LIBC     1
-#ifdef HAVE_LIBC
-/* Useful headers */
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#ifndef _WIN32_WCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE__STRICMP 1
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#define HAVE_M_PI 1
-#define HAVE_CEIL 1
-#define HAVE_COPYSIGN 1
-#define HAVE_COS 1
-#define HAVE_COSF 1
-#define HAVE_FABS 1
-#define HAVE_FLOOR 1
-#define HAVE_LOG 1
-#define HAVE_POW 1
-#define HAVE_SCALBN 1
-#define HAVE_SIN 1
-#define HAVE_SINF 1
-#define HAVE_SQRT 1
-#else
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-#endif
-
-/* Enable various audio drivers */
-#ifndef _WIN32_WCE
-#define SDL_AUDIO_DRIVER_DSOUND	1
-#endif
-#define SDL_AUDIO_DRIVER_WINWAVEOUT	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#ifdef _WIN32_WCE
-#define SDL_CDROM_DISABLED	1
-#else
-#define SDL_CDROM_WIN32		1
-#endif
-
-/* Enable various input drivers */
-#ifdef _WIN32_WCE
-#define SDL_JOYSTICK_DISABLED	1
-#define SDL_HAPTIC_DUMMY	1
-#else
-#define SDL_JOYSTICK_DINPUT	1
-#define SDL_HAPTIC_DINPUT	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_WIN32	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_WIN32	1
-
-/* Enable various timer systems */
-#ifdef _WIN32_WCE
-#define SDL_TIMER_WINCE	1
-#else
-#define SDL_TIMER_WIN32	1
-#endif
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_WIN32	1
-
-#define SDL_VIDEO_RENDER_D3D	1
-#define SDL_VIDEO_RENDER_GDI	1
-
-/* Enable OpenGL support */
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_WGL	1
-#define SDL_VIDEO_RENDER_OGL	1
-#endif
-
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES	1
-#endif
-
-#endif /* _SDL_config_win32_h */
diff --git a/Externals/SDL/Include_1.3/SDL_copying.h b/Externals/SDL/Include_1.3/SDL_copying.h
deleted file mode 100644
index 419598f7e3..0000000000
--- a/Externals/SDL/Include_1.3/SDL_copying.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
diff --git a/Externals/SDL/Include_1.3/SDL_cpuinfo.h b/Externals/SDL/Include_1.3/SDL_cpuinfo.h
deleted file mode 100644
index fe4193eba9..0000000000
--- a/Externals/SDL/Include_1.3/SDL_cpuinfo.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_cpuinfo.h
- *
- * CPU feature detection for SDL
- */
-
-#ifndef _SDL_cpuinfo_h
-#define _SDL_cpuinfo_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* This function returns true if the CPU has the RDTSC instruction
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
-
-/* This function returns true if the CPU has MMX features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
-
-/* This function returns true if the CPU has MMX Ext. features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
-
-/* This function returns true if the CPU has 3DNow features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
-
-/* This function returns true if the CPU has 3DNow! Ext. features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
-
-/* This function returns true if the CPU has SSE features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
-
-/* This function returns true if the CPU has SSE2 features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
-
-/* This function returns true if the CPU has AltiVec features
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_cpuinfo_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_endian.h b/Externals/SDL/Include_1.3/SDL_endian.h
deleted file mode 100644
index db06dafd8f..0000000000
--- a/Externals/SDL/Include_1.3/SDL_endian.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_endian.h
- *
- * Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/* The two types of endianness */
-#define SDL_LIL_ENDIAN	1234
-#define SDL_BIG_ENDIAN	4321
-
-#ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
-#if defined(__hppa__) || \
-    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MISPEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
-    defined(__sparc__)
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER	SDL_LIL_ENDIAN
-#endif
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Use inline functions for compilers that support them, and static
-   functions for those that do not.  Because these functions become
-   static for compilers that do not support inline functions, this
-   header should only be included in files that actually use them.
-*/
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
-    Uint16 result;
-
-  __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
-    return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
-  __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
-    return x;
-}
-#else
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
-    return ((x << 8) | (x >> 8));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("bswap %0": "=r"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("bswapl %0": "=r"(x):"0"(x));
-    return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
-    Uint32 result;
-
-  __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
-  __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
-  __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
-    return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
-  __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
-    return x;
-}
-#else
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
-    return ((x << 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) |
-            (x >> 24));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
-    union
-    {
-        struct
-        {
-            Uint32 a, b;
-        } s;
-        Uint64 u;
-    } v;
-    v.u = x;
-  __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
-            "1"(v.s.
-                b));
-    return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
-  __asm__("bswapq %0": "=r"(x):"0"(x));
-    return x;
-}
-#else
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
-    Uint32 hi, lo;
-
-    /* Separate into high and low 32-bit values and swap them */
-    lo = (Uint32) (x & 0xFFFFFFFF);
-    x >>= 32;
-    hi = (Uint32) (x & 0xFFFFFFFF);
-    x = SDL_Swap32(lo);
-    x <<= 32;
-    x |= SDL_Swap32(hi);
-    return (x);
-}
-#endif
-#else
-/* This is mainly to keep compilers from complaining in SDL code.
-   If there is no real 64-bit datatype, then compilers will complain about
-   the fake 64-bit datatype that SDL provides when it compiles user code.
-*/
-#define SDL_Swap64(X)	(X)
-#endif /* SDL_HAS_64BIT_TYPE */
-
-
-static __inline__ float
-SDL_SwapFloat(float x)
-{
-    union
-    {
-        float f;
-        Uint32 ui32;
-    } swapper;
-    swapper.f = x;
-    swapper.ui32 = SDL_Swap32(swapper.ui32);
-    return swapper.f;
-}
-
-
-/* Byteswap item from the specified endianness to the native endianness */
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X)	(X)
-#define SDL_SwapLE32(X)	(X)
-#define SDL_SwapLE64(X)	(X)
-#define SDL_SwapFloatLE(X)	(X)
-#define SDL_SwapBE16(X)	SDL_Swap16(X)
-#define SDL_SwapBE32(X)	SDL_Swap32(X)
-#define SDL_SwapBE64(X)	SDL_Swap64(X)
-#define SDL_SwapFloatBE(X)	SDL_SwapFloat(X)
-#else
-#define SDL_SwapLE16(X)	SDL_Swap16(X)
-#define SDL_SwapLE32(X)	SDL_Swap32(X)
-#define SDL_SwapLE64(X)	SDL_Swap64(X)
-#define SDL_SwapFloatLE(X)	SDL_SwapFloat(X)
-#define SDL_SwapBE16(X)	(X)
-#define SDL_SwapBE32(X)	(X)
-#define SDL_SwapBE64(X)	(X)
-#define SDL_SwapFloatBE(X)	(X)
-#endif
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_error.h b/Externals/SDL/Include_1.3/SDL_error.h
deleted file mode 100644
index 5d54726e22..0000000000
--- a/Externals/SDL/Include_1.3/SDL_error.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_error.h
- * Simple error message routines for SDL
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Public functions */
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char *SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-
-/* Private error message function - used internally */
-#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum
-{
-    SDL_ENOMEM,
-    SDL_EFREAD,
-    SDL_EFWRITE,
-    SDL_EFSEEK,
-    SDL_UNSUPPORTED,
-    SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_events.h b/Externals/SDL/Include_1.3/SDL_events.h
deleted file mode 100644
index 13672f2e4a..0000000000
--- a/Externals/SDL/Include_1.3/SDL_events.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_events.h
- *
- * Include file for SDL event handling
- */
-
-#ifndef _SDL_events_h
-#define _SDL_events_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_quit.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* General keyboard/mouse state definitions */
-#define SDL_RELEASED	0
-#define SDL_PRESSED	1
-
-/**
- * \enum SDL_EventType
- *
- * \brief The types of events that can be delivered
- */
-typedef enum
-{
-    SDL_NOEVENT = 0,            /**< Unused (do not remove) */
-    SDL_WINDOWEVENT,            /**< Window state change */
-    SDL_KEYDOWN,                /**< Keys pressed */
-    SDL_KEYUP,                  /**< Keys released */
-    SDL_TEXTINPUT,              /**< Keyboard text input */
-    SDL_MOUSEMOTION,            /**< Mouse moved */
-    SDL_MOUSEBUTTONDOWN,        /**< Mouse button pressed */
-    SDL_MOUSEBUTTONUP,          /**< Mouse button released */
-    SDL_MOUSEWHEEL,             /**< Mouse wheel motion */
-    SDL_JOYAXISMOTION,          /**< Joystick axis motion */
-    SDL_JOYBALLMOTION,          /**< Joystick trackball motion */
-    SDL_JOYHATMOTION,           /**< Joystick hat position change */
-    SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
-    SDL_JOYBUTTONUP,            /**< Joystick button released */
-    SDL_QUIT,                   /**< User-requested quit */
-    SDL_SYSWMEVENT,             /**< System specific event */
-    SDL_PROXIMITYIN,            /**< Proximity In event */
-    SDL_PROXIMITYOUT,           /**< Proximity Out event */
-    SDL_EVENT_RESERVED1,        /**< Reserved for future use... */
-    SDL_EVENT_RESERVED2,
-    SDL_EVENT_RESERVED3,
-    /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-    SDL_USEREVENT = 24,
-    /* This last event is only for bounding internal arrays
-       It is the number of bits in the event mask datatype -- Uint32
-     */
-    SDL_NUMEVENTS = 32
-} SDL_EventType;
-
-/**
- * \enum SDL_EventMask
- *
- * \brief Predefined event masks
- */
-#define SDL_EVENTMASK(X)	(1<<(X))
-typedef enum
-{
-    SDL_WINDOWEVENTMASK = SDL_EVENTMASK(SDL_WINDOWEVENT),
-    SDL_KEYDOWNMASK = SDL_EVENTMASK(SDL_KEYDOWN),
-    SDL_KEYUPMASK = SDL_EVENTMASK(SDL_KEYUP),
-    SDL_KEYEVENTMASK = SDL_EVENTMASK(SDL_KEYDOWN) | SDL_EVENTMASK(SDL_KEYUP),
-    SDL_TEXTINPUTMASK = SDL_EVENTMASK(SDL_TEXTINPUT),
-    SDL_MOUSEMOTIONMASK = SDL_EVENTMASK(SDL_MOUSEMOTION),
-    SDL_MOUSEBUTTONDOWNMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
-    SDL_MOUSEBUTTONUPMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-    SDL_MOUSEWHEELMASK = SDL_EVENTMASK(SDL_MOUSEWHEEL),
-    SDL_MOUSEEVENTMASK = SDL_EVENTMASK(SDL_MOUSEMOTION) |
-        SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN) | SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-    SDL_JOYAXISMOTIONMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION),
-    SDL_JOYBALLMOTIONMASK = SDL_EVENTMASK(SDL_JOYBALLMOTION),
-    SDL_JOYHATMOTIONMASK = SDL_EVENTMASK(SDL_JOYHATMOTION),
-    SDL_JOYBUTTONDOWNMASK = SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
-    SDL_JOYBUTTONUPMASK = SDL_EVENTMASK(SDL_JOYBUTTONUP),
-    SDL_JOYEVENTMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION) |
-        SDL_EVENTMASK(SDL_JOYBALLMOTION) |
-        SDL_EVENTMASK(SDL_JOYHATMOTION) |
-        SDL_EVENTMASK(SDL_JOYBUTTONDOWN) | SDL_EVENTMASK(SDL_JOYBUTTONUP),
-    SDL_QUITMASK = SDL_EVENTMASK(SDL_QUIT),
-    SDL_SYSWMEVENTMASK = SDL_EVENTMASK(SDL_SYSWMEVENT),
-    SDL_PROXIMITYINMASK = SDL_EVENTMASK(SDL_PROXIMITYIN),
-    SDL_PROXIMITYOUTMASK = SDL_EVENTMASK(SDL_PROXIMITYOUT)
-} SDL_EventMask;
-#define SDL_ALLEVENTS		0xFFFFFFFF
-
-/**
- * \struct SDL_WindowEvent
- *
- * \brief Window state change event data (event.window.*)
- */
-typedef struct SDL_WindowEvent
-{
-    Uint8 type;             /**< SDL_WINDOWEVENT */
-    Uint8 event;            /**< SDL_WindowEventID */
-    int data1;              /**< event dependent data */
-    int data2;              /**< event dependent data */
-    SDL_WindowID windowID;  /**< The associated window */
-} SDL_WindowEvent;
-
-/**
- * \struct SDL_KeyboardEvent
- *
- * \brief Keyboard button event structure (event.key.*)
- */
-typedef struct SDL_KeyboardEvent
-{
-    Uint8 type;             /**< SDL_KEYDOWN or SDL_KEYUP */
-    Uint8 which;            /**< The keyboard device index */
-    Uint8 state;            /**< SDL_PRESSED or SDL_RELEASED */
-    SDL_keysym keysym;      /**< The key that was pressed or released */
-    SDL_WindowID windowID;  /**< The window with keyboard focus, if any */
-} SDL_KeyboardEvent;
-
-/**
- * \struct SDL_TextInputEvent
- *
- * \brief Keyboard text input event structure (event.text.*)
- */
-#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32)
-typedef struct SDL_TextInputEvent
-{
-    Uint8 type;                               /**< SDL_TEXTINPUT */
-    Uint8 which;                              /**< The keyboard device index */
-    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
-    SDL_WindowID windowID;                    /**< The window with keyboard focus, if any */
-} SDL_TextInputEvent;
-
-/**
- * \struct SDL_MouseMotionEvent
- *
- * \brief Mouse motion event structure (event.motion.*)
- */
-typedef struct SDL_MouseMotionEvent
-{
-    Uint8 type;             /**< SDL_MOUSEMOTION */
-    Uint8 which;            /**< The mouse device index */
-    Uint8 state;            /**< The current button state */
-    int x;                  /**< X coordinate, relative to window */
-    int y;                  /**< Y coordinate, relative to window */
-    int z;                  /**< Z coordinate, for future use */
-    int pressure;           /**< Pressure reported by tablets */
-    int pressure_max;       /**< Maximum value of the pressure reported by the device */
-    int pressure_min;       /**< Minimum value of the pressure reported by the device */
-    int rotation;           /**< For future use */
-    int tilt;               /**< For future use */
-    int cursor;             /**< The cursor being used in the event */
-    int xrel;               /**< The relative motion in the X direction */
-    int yrel;               /**< The relative motion in the Y direction */
-    SDL_WindowID windowID;  /**< The window with mouse focus, if any */
-} SDL_MouseMotionEvent;
-
-/**
- * \struct SDL_MouseButtonEvent
- *
- * \brief Mouse button event structure (event.button.*)
- */
-typedef struct SDL_MouseButtonEvent
-{
-    Uint8 type;             /**< SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
-    Uint8 which;            /**< The mouse device index */
-    Uint8 button;           /**< The mouse button index */
-    Uint8 state;            /**< SDL_PRESSED or SDL_RELEASED */
-    int x;                  /**< X coordinate, relative to window */
-    int y;                  /**< Y coordinate, relative to window */
-    SDL_WindowID windowID;  /**< The window with mouse focus, if any */
-} SDL_MouseButtonEvent;
-
-/**
- * \struct SDL_MouseWheelEvent
- *
- * \brief Mouse wheel event structure (event.wheel.*)
- */
-typedef struct SDL_MouseWheelEvent
-{
-    Uint8 type;             /**< SDL_MOUSEWHEEL */
-    Uint8 which;            /**< The mouse device index */
-    int x;                  /**< The amount scrolled horizontally */
-    int y;                  /**< The amount scrolled vertically */
-    SDL_WindowID windowID;  /**< The window with mouse focus, if any */
-} SDL_MouseWheelEvent;
-
-/**
- * \struct SDL_JoyAxisEvent
- *
- * \brief Joystick axis motion event structure (event.jaxis.*)
- */
-typedef struct SDL_JoyAxisEvent
-{
-    Uint8 type;         /**< SDL_JOYAXISMOTION */
-    Uint8 which;        /**< The joystick device index */
-    Uint8 axis;         /**< The joystick axis index */
-    int value;          /**< The axis value (range: -32768 to 32767) */
-} SDL_JoyAxisEvent;
-
-/**
- * \struct SDL_JoyBallEvent
- *
- * \brief Joystick trackball motion event structure (event.jball.*)
- */
-typedef struct SDL_JoyBallEvent
-{
-    Uint8 type;         /**< SDL_JOYBALLMOTION */
-    Uint8 which;        /**< The joystick device index */
-    Uint8 ball;         /**< The joystick trackball index */
-    int xrel;           /**< The relative motion in the X direction */
-    int yrel;           /**< The relative motion in the Y direction */
-} SDL_JoyBallEvent;
-
-/**
- * \struct SDL_JoyHatEvent
- *
- * \brief Joystick hat position change event structure (event.jhat.*)
- */
-typedef struct SDL_JoyHatEvent
-{
-    Uint8 type;         /**< SDL_JOYHATMOTION */
-    Uint8 which;        /**< The joystick device index */
-    Uint8 hat;          /**< The joystick hat index */
-    Uint8 value;        /**< The hat position value:
-                             SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-                             SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-                             SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-                             Note that zero means the POV is centered.
-                         */
-} SDL_JoyHatEvent;
-
-/**
- * \struct SDL_JoyButtonEvent
- *
- * \brief Joystick button event structure (event.jbutton.*)
- */
-typedef struct SDL_JoyButtonEvent
-{
-    Uint8 type;         /**< SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
-    Uint8 which;        /**< The joystick device index */
-    Uint8 button;       /**< The joystick button index */
-    Uint8 state;        /**< SDL_PRESSED or SDL_RELEASED */
-} SDL_JoyButtonEvent;
-
-/**
- * \struct SDL_QuitEvent
- *
- * \brief The "quit requested" event
- */
-typedef struct SDL_QuitEvent
-{
-    Uint8 type;         /**< SDL_QUIT */
-} SDL_QuitEvent;
-
-/**
- * \struct SDL_UserEvent
- *
- * \brief A user-defined event type (event.user.*)
- */
-typedef struct SDL_UserEvent
-{
-    Uint8 type;             /**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
-    int code;               /**< User defined event code */
-    void *data1;            /**< User defined data pointer */
-    void *data2;            /**< User defined data pointer */
-    SDL_WindowID windowID;  /**< The associated window if any*/
-} SDL_UserEvent;
-
-/**
- * \struct SDL_SysWMEvent
- *
- * \brief A video driver dependent system event (event.syswm.*)
- *
- * \note If you want to use this event, you should include SDL_syswm.h
- */
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent
-{
-    Uint8 type;         /**< SDL_SYSWMEVENT */
-    SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
-} SDL_SysWMEvent;
-
-/* Typedefs for backwards compatibility */
-typedef struct SDL_ActiveEvent
-{
-    Uint8 type;
-    Uint8 gain;
-    Uint8 state;
-} SDL_ActiveEvent;
-typedef struct SDL_ResizeEvent
-{
-    Uint8 type;
-    int w;
-    int h;
-} SDL_ResizeEvent;
-
-typedef struct SDL_ProximityEvent
-{
-    Uint8 type;
-    Uint8 which;
-    int cursor;
-    int x;
-    int y;
-} SDL_ProximityEvent;
-
-/**
- * \union SDL_Event
- *
- * \brief General event structure
- */
-typedef union SDL_Event
-{
-    Uint8 type;                     /**< Event type, shared with all events */
-    SDL_WindowEvent window;         /**< Window event data */
-    SDL_KeyboardEvent key;          /**< Keyboard event data */
-    SDL_TextInputEvent text;        /**< Text input event data */
-    SDL_MouseMotionEvent motion;    /**< Mouse motion event data */
-    SDL_MouseButtonEvent button;    /**< Mouse button event data */
-    SDL_MouseWheelEvent wheel;      /**< Mouse wheel event data */
-    SDL_JoyAxisEvent jaxis;         /**< Joystick axis event data */
-    SDL_JoyBallEvent jball;         /**< Joystick ball event data */
-    SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
-    SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
-    SDL_QuitEvent quit;             /**< Quit request event data */
-    SDL_UserEvent user;             /**< Custom event data */
-    SDL_SysWMEvent syswm;           /**< System dependent window event data */
-    SDL_ProximityEvent proximity;   /**< Proximity In or Out event */
-
-    /* Temporarily here for backwards compatibility */
-    SDL_ActiveEvent active;
-    SDL_ResizeEvent resize;
-} SDL_Event;
-
-
-/* Function prototypes */
-
-/* Pumps the event loop, gathering events from the input devices.
-   This function updates the event queue and internal input device state.
-   This should only be run in the thread that sets the video mode.
-*/
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-
-/* Checks the event queue for messages and optionally returns them.
-   If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
-   the back of the event queue.
-   If 'action' is SDL_PEEKEVENT, up to 'numevents' events at the front
-   of the event queue, matching 'mask', will be returned and will not
-   be removed from the queue.
-   If 'action' is SDL_GETEVENT, up to 'numevents' events at the front 
-   of the event queue, matching 'mask', will be returned and will be
-   removed from the queue.
-   This function returns the number of events actually stored, or -1
-   if there was an error.  This function is thread-safe.
-*/
-typedef enum
-{
-    SDL_ADDEVENT,
-    SDL_PEEKEVENT,
-    SDL_GETEVENT
-} SDL_eventaction;
-/* */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
-                                           SDL_eventaction action,
-                                           Uint32 mask);
-
-/* Checks to see if certain event types are in the event queue.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 mask);
-
-/* Polls for currently pending events, and returns 1 if there are any pending
-   events, or 0 if there are none available.  If 'event' is not NULL, the next
-   event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
-
-/* Waits indefinitely for the next available event, returning 1, or 0 if there
-   was an error while waiting for events.  If 'event' is not NULL, the next
-   event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
-
-/* Add an event to the event queue.
-   This function returns 1 on success, 0 if the event was filtered,
-   or -1 if the event queue was full or there was some other error.
- */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
-
-/*
-  This function sets up a filter to process all events before they
-  change internal state and are posted to the internal event queue.
-
-  The filter is protypted as:
-*/
-typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event);
-/*
-  If the filter returns 1, then the event will be added to the internal queue.
-  If it returns 0, then the event will be dropped from the queue, but the 
-  internal state will still be updated.  This allows selective filtering of
-  dynamically arriving events.
-
-  WARNING:  Be very careful of what you do in the event filter function, as 
-            it may run in a different thread!
-
-  There is one caveat when dealing with the SDL_QUITEVENT event type.  The
-  event filter is only called when the window manager desires to close the
-  application window.  If the event filter returns 1, then the window will
-  be closed, otherwise the window will remain open if possible.
-  If the quit event is generated by an interrupt signal, it will bypass the
-  internal queue and be delivered to the application at the next event poll.
-*/
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter,
-                                                void *userdata);
-
-/*
-  Return the current event filter - can be used to "chain" filters.
-  If there is no event filter set, this function returns SDL_FALSE.
-*/
-extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter,
-                                                    void **userdata);
-
-/*
-  Run the filter function on the current event queue, removing any
-  events for which the filter returns 0.
-*/
-extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
-                                              void *userdata);
-
-/*
-  This function allows you to set the state of processing certain events.
-  If 'state' is set to SDL_IGNORE, that event will be automatically dropped
-  from the event queue and will not event be filtered.
-  If 'state' is set to SDL_ENABLE, that event will be processed normally.
-  If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
-  current processing state of the specified event.
-*/
-#define SDL_QUERY	-1
-#define SDL_IGNORE	 0
-#define SDL_DISABLE	 0
-#define SDL_ENABLE	 1
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_events_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_haptic.h b/Externals/SDL/Include_1.3/SDL_haptic.h
deleted file mode 100644
index 6d748c2d0d..0000000000
--- a/Externals/SDL/Include_1.3/SDL_haptic.h
+++ /dev/null
@@ -1,1154 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 2008 Edgar Simo
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_haptic.h
- *
- * \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
- *  devices.
- *
- * The basic usage is as follows:
- *   - Initialize the Subsystem (SDL_INIT_HAPTIC).
- *   - Open a Haptic Device.
- *     - SDL_HapticOpen(...) to open from index.
- *     - SDL_HapticOpenFromJoystick(...) to open from an existing joystick.
- *   - Create an effect (SDL_HapticEffect).
- *   - Upload the effect with SDL_HapticNewEffect(...).
- *   - Run the effect with SDL_HapticRunEffect(...).
- *   - (optional) Free the effect with SDL_HapticDestroyEffect(...).
- *   - Close the haptic device with SDL_HapticClose(...).
- *
- * Example:
- *
- * \code
- * int test_haptic( SDL_Joystick * joystick ) {
- *    SDL_Haptic *haptic;
- *    SDL_HapticEffect effect;
- *    int effect_id;
- *
- *    // Open the device
- *    haptic = SDL_HapticOpenFromJoystick( joystick );
- *    if (haptic == NULL) return -1; // Most likely joystick isn't haptic
- *
- *    // See if it can do sine waves
- *    if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
- *       SDL_HapticClose(haptic); // No sine effect
- *       return -1;
- *    }
- *
- *    // Create the effect
- *    memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
- *    effect.type = SDL_HAPTIC_SINE;
- *    effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
- *    effect.periodic.direction.dir[0] = 18000; // Force comes from south
- *    effect.periodic.period = 1000; // 1000 ms
- *    effect.periodic.magnitude = 20000; // 20000/32767 strength
- *    effect.periodic.length = 5000; // 5 seconds long
- *    effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
- *    effect.periodic.fade_length = 1000; // Takes 1 second to fade away
- *
- *    // Upload the effect
- *    effect_id = SDL_HapticNewEffect( haptic, &effect );
- *
- *    // Test the effect
- *    SDL_HapticRunEffect( haptic, effect_id, 1 );
- *    SDL_Delay( 5000); // Wait for the effect to finish
- *
- *    // We destroy the effect, although closing the device also does this
- *    SDL_HapticDestroyEffect( haptic, effect_id );
- *
- *    // Close the device
- *    SDL_HapticClose(haptic);
- *
- *    return 0; // Success
- * }
- * \endcode
- *
- * \author Edgar Simo Serra
- */
-
-#ifndef _SDL_haptic_h
-#define _SDL_haptic_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_joystick.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-   /* *INDENT-ON* */                                                         
-#endif /* __cplusplus */
-
-/**
- * \typedef SDL_Haptic
- *
- * \brief The haptic structure used to identify an SDL haptic.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- */
-struct _SDL_Haptic;
-typedef struct _SDL_Haptic SDL_Haptic;
-
-
-/*
- * Different haptic features a device can have.
- */
-/**
- * \def SDL_HAPTIC_CONSTANT
- *
- * \brief Constant haptic effect.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_CONSTANT   (1<<0)    /* Constant effect supported */
-/**
- * \def SDL_HAPTIC_SINE
- *
- * \brief Periodic haptic effect that simulates sine waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SINE       (1<<1)    /* Sine wave effect supported */
-/**
- * \def SDL_HAPTIC_SQUARE
- *
- * \brief Periodic haptic effect that simulates square waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SQUARE     (1<<2)    /* Square wave effect supported */
-/**
- * \def SDL_HAPTIC_TRIANGLE
- *
- * \brief Periodic haptic effect that simulates triangular waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_TRIANGLE   (1<<3)    /* Triangle wave effect supported */
-/**
- * \def SDL_HAPTIC_SAWTOOTHUP
- *
- * \brief Periodic haptic effect that simulates saw tooth up waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHUP (1<<4)    /* Sawtoothup wave effect supported */
-/**
- * \def SDL_HAPTIC_SAWTOOTHDOWN
- *
- * \brief Periodic haptic effect that simulates saw tooth down waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)  /* Sawtoothdown wave effect supported */
-/**
- * \def SDL_HAPTIC_RAMP
- *
- * \brief Ramp haptic effect.
- *
- * \sa SDL_HapticRamp
- */
-#define SDL_HAPTIC_RAMP       (1<<6)    /* Ramp effect supported */
-/**
- * \def SDL_HAPTIC_SPRING
- *
- * \brief Condition haptic effect that simulates a spring.  Effect is based on the
- * axes position.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_SPRING     (1<<7)    /* Spring effect supported - uses axes position */
-/**
- * \def SDL_HAPTIC_DAMPER
- *
- * \brief Condition haptic effect that simulates dampening.  Effect is based on the
- * axes velocity.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_DAMPER     (1<<8)    /* Damper effect supported - uses axes velocity */
-/**
- * \def SDL_HAPTIC_INERTIA
- *
- * \brief Condition haptic effect that simulates inertia.  Effect is based on the axes
- * acceleration.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_INERTIA    (1<<9)    /* Inertia effect supported - uses axes acceleration */
-/**
- * \def SDL_HAPTIC_FRICTION
- *
- * \brief Condition haptic effect that simulates friction.  Effect is based on the axes
- * movement.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_FRICTION   (1<<10)   /* Friction effect supported - uses axes movement */
-/**
- * \def SDL_HAPTIC_CUSTOM
- *
- * \brief User defined custom haptic effect.
- */
-#define SDL_HAPTIC_CUSTOM     (1<<11)   /* Custom effect is supported */
-/* These last two are features the device has, not effects */
-/**
- * \def SDL_HAPTIC_GAIN
- *
- * \brief Device supports setting the global gain.
- *
- * \sa SDL_HapticSetGain
- */
-#define SDL_HAPTIC_GAIN       (1<<12)   /* Device can set global gain */
-/**
- * \def SDL_HAPTIC_AUTOCENTER
- *
- * \brief Device supports setting autocenter.
- *
- * \sa SDL_HapticSetAutocenter
- */
-#define SDL_HAPTIC_AUTOCENTER (1<<13)   /* Device can set autocenter */
-/**
- * \def SDL_HAPTIC_STATUS
- *
- * \brief Device can be queried for effect status.
- *
- * \sa SDL_HapticGetEffectStatus
- */
-#define SDL_HAPTIC_STATUS     (1<<14)   /* Device can be queried for effect status */
-/**
- * \def SDL_HAPTIC_PAUSE
- *
- * \brief Device can be paused.
- *
- * \sa SDL_HapticPause
- * \sa SDL_HapticUnpause
- */
-#define SDL_HAPTIC_PAUSE      (1<<15)   /* Device can be paused. */
-
-
-/*
- * Direction encodings
- */
-/**
- * \def SDL_HAPTIC_POLAR
- *
- * \brief Uses polar coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_POLAR      0
-/**
- * \def SDL_HAPTIC_CARTESIAN
- *
- * \brief Uses cartesian coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_CARTESIAN  1
-/**
- * \def SDL_HAPTIC_SPHERICAL
- *
- * \brief Uses spherical coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_SPHERICAL  2
-
-
-/*
- * Misc defines.
- */
-/**
- * \def SDL_HAPTIC_INFINITY
- *
- * \brief Used to play a device an infinite number of times.
- *
- * \sa SDL_HapticRunEffect
- */
-#define SDL_HAPTIC_INFINITY   4294967295U
-
-
-/**
- * \struct SDL_HapticDirection
- *
- * \brief Structure that represents a haptic direction.
- *
- * Directions can be specified by:
- *   - SDL_HAPTIC_POLAR : Specified by polar coordinates.
- *   - SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
- *   - SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
- *
- * Cardinal directions of the haptic device are relative to the positioning
- *  of the device.  North is considered to be away from the user.
- *
- * The following diagram represents the cardinal directions:
- * \code
- *              .--.
- *              |__| .-------.
- *              |=.| |.-----.|
- *              |--| ||     ||
- *              |  | |'-----'|
- *              |__|~')_____('
- *                [ COMPUTER ]
- *
- *
- *                  North (0,-1)
- *                      ^
- *                      |
- *                      |
- * (1,0)  West <----[ HAPTIC ]----> East (-1,0)
- *                      |
- *                      |
- *                      v
- *                   South (0,1)
- *
- *
- *                   [ USER ]
- *                     \|||/
- *                     (o o)
- *               ---ooO-(_)-Ooo---
- * \endcode
- *
- * If type is SDL_HAPTIC_POLAR, direction is encoded by hundredths of a 
- *  degree starting north and turning clockwise.  SDL_HAPTIC_POLAR only uses
- *  the first dir parameter.  The cardinal directions would be:
- *   - North: 0 (0 degrees)
- *   - East: 9000 (90 degrees)
- *   - South: 18000 (180 degrees)
- *   - West: 27000 (270 degrees)
- *
- * If type is SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
- *  (X axis, Y axis and Z axis (with 3 axes)).  SDL_HAPTIC_CARTESIAN uses
- *  the first three dir parameters.  The cardinal directions would be:
- *   - North:  0,-1, 0
- *   - East:  -1, 0, 0
- *   - South:  0, 1, 0
- *   - West:   1, 0, 0
- *  The Z axis represents the height of the effect if supported, otherwise
- *  it's unused.  In cartesian encoding (1,2) would be the same as (2,4), you
- *  can use any multiple you want, only the direction matters.
- *
- * If type is SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
- *  The first two  dir parameters are used.  The dir parameters are as follows
- *  (all values are in hundredths of degrees):
- *    1) Degrees from (1, 0) rotated towards (0, 1).
- *    2) Degrees towards (0, 0, 1) (device needs at least 3 axes).
- *
- *
- * Example of force coming from the south with all encodings (force coming
- *  from the south means the user will have to pull the stick to counteract):
- * \code
- * SDL_HapticDirection direction;
- *
- * // Cartesian directions
- * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
- * direction.dir[0] = 0; // X position
- * direction.dir[1] = 1; // Y position
- * // Assuming the device has 2 axes, we don't need to specify third parameter.
- *
- * // Polar directions
- * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
- * direction.dir[0] = 18000; // Polar only uses first parameter
- *
- * // Spherical coordinates
- * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
- * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
- * \endcode
- *
- * \sa SDL_HAPTIC_POLAR
- * \sa SDL_HAPTIC_CARTESIAN
- * \sa SDL_HAPTIC_SPHERICAL
- * \sa SDL_HapticEffect
- * \sa SDL_HapticNumAxes
- */
-typedef struct SDL_HapticDirection
-{
-    Uint8 type;         /**< The type of encoding. */
-    Uint16 dir[3];      /**< The encoded direction. */
-} SDL_HapticDirection;
-
-
-/**
- * \struct SDL_HapticConstant
- *
- * \brief A structure containing a template for a Constant effect.
- *
- * The struct is exclusive to the SDL_HAPTIC_CONSTANT effect.
- *
- * A constant effect applies a constant force in the specified direction
- *  to the joystick.
- *
- * \sa SDL_HAPTIC_CONSTANT
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticConstant
-{
-    /* Header */
-    Uint16 type;            /**< SDL_HAPTIC_CONSTANT */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Constant */
-    Sint16 level;           /**< Strength of the constant effect. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticConstant;
-/**
- * \struct SDL_HapticPeriodic
- *
- * \brief A structure containing a template for a Periodic effect.
- *
- * The struct handles the following effects:
- *   - SDL_HAPTIC_SINE
- *   - SDL_HAPTIC_SQUARE
- *   - SDL_HAPTIC_TRIANGLE
- *   - SDL_HAPTIC_SAWTOOTHUP
- *   - SDL_HAPTIC_SAWTOOTHDOWN
- *
- * A periodic effect consists in a wave-shaped effect that repeats itself
- *  over time.  The type determines the shape of the wave and the parameters
- *  determine the dimensions of the wave.
- *
- * Phase is given by hundredth of a cyle meaning that giving the phase a value
- *  of 9000 will displace it 25% of it's period.  Here are sample values:
- *    -     0: No phase displacement.
- *    -  9000: Displaced 25% of it's period.
- *    - 18000: Displaced 50% of it's period.
- *    - 27000: Displaced 75% of it's period.
- *    - 36000: Displaced 100% of it's period, same as 0, but 0 is preffered.
- *
- * Examples:
- * \code
- * SDL_HAPTIC_SINE
- *   __      __      __      __
- *  /  \    /  \    /  \    /
- * /    \__/    \__/    \__/
- *
- * SDL_HAPTIC_SQUARE
- *  __    __    __    __    __
- * |  |  |  |  |  |  |  |  |  |
- * |  |__|  |__|  |__|  |__|  |
- *
- * SDL_HAPTIC_TRIANGLE
- *   /\    /\    /\    /\    /\
- *  /  \  /  \  /  \  /  \  /
- * /    \/    \/    \/    \/
- *
- * SDL_HAPTIC_SAWTOOTHUP
- *   /|  /|  /|  /|  /|  /|  /|
- *  / | / | / | / | / | / | / |
- * /  |/  |/  |/  |/  |/  |/  |
- *
- * SDL_HAPTIC_SAWTOOTHDOWN
- * \  |\  |\  |\  |\  |\  |\  |
- *  \ | \ | \ | \ | \ | \ | \ |
- *   \|  \|  \|  \|  \|  \|  \|
- * \endcode
- *
- * \sa SDL_HAPTIC_SINE
- * \sa SDL_HAPTIC_SQUARE
- * \sa SDL_HAPTIC_TRIANGLE
- * \sa SDL_HAPTIC_SAWTOOTHUP
- * \sa SDL_HAPTIC_SAWTOOTHDOWN
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticPeriodic
-{
-    /* Header */
-    Uint16 type;        /**< SDL_HAPTIC_SINE, SDL_HAPTIC_SQUARE,
-                             SDL_HAPTIC_TRIANGLE, SDL_HAPTIC_SAWTOOTHUP or
-                             SDL_HAPTIC_SAWTOOTHDOWN */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;      /**< Duration of the effect. */
-    Uint16 delay;       /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;      /**< Button that triggers the effect. */
-    Uint16 interval;    /**< How soon it can be triggered again after button. */
-
-    /* Periodic */
-    Uint16 period;      /**< Period of the wave. */
-    Sint16 magnitude;   /**< Peak value. */
-    Sint16 offset;      /**< Mean value of the wave. */
-    Uint16 phase;       /**< Horizontal shift given by hundredth of a cycle. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length; /**< Duration of the fade. */
-    Uint16 fade_level;  /**< Level at the end of the fade. */
-} SDL_HapticPeriodic;
-/**
- * \struct SDL_HapticCondition
- *
- * \brief A structure containing a template for a Condition effect.
- *
- * The struct handles the following effects:
- *   - SDL_HAPTIC_SPRING: Effect based on axes position.
- *   - SDL_HAPTIC_DAMPER: Effect based on axes velocity.
- *   - SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
- *   - SDL_HAPTIC_FRICTION: Effect based on axes movement.
- *
- * Direction is handled by condition internals instead of a direction member.
- *  The condition effect specific members have three parameters.  The first
- *  refers to the X axis, the second refers to the Y axis and the third
- *  refers to the Z axis.  The right terms refer to the positive side of the
- *  axis and the left terms refer to the negative side of the axis.  Please 
- *  refer to the SDL_HapticDirection  diagram for which side is positive and
- *  which is negative.
- *
- * \sa SDL_HapticDirection
- * \sa SDL_HAPTIC_SPRING
- * \sa SDL_HAPTIC_DAMPER
- * \sa SDL_HAPTIC_INERTIA
- * \sa SDL_HAPTIC_FRICTION
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCondition
-{
-    /* Header */
-    Uint16 type;            /**< SDL_HAPTIC_SPRING, SDL_HAPTIC_DAMPER,
-                                 SDL_HAPTIC_INERTIA or SDL_HAPTIC_FRICTION */
-    SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Condition */
-    Uint16 right_sat[3];    /**< Level when joystick is to the positive side. */
-    Uint16 left_sat[3];     /**< Level when joystick is to the negative side. */
-    Sint16 right_coeff[3];  /**< How fast to increase the force towards the positive side. */
-    Sint16 left_coeff[3];   /**< How fast to increase the force towards the negative side. */
-    Uint16 deadband[3];     /**< Size of the dead zone. */
-    Sint16 center[3];       /**< Position of the dead zone. */
-} SDL_HapticCondition;
-/**
- * \struct SDL_HapticRamp
- *
- * \brief A structure containing a template for a Ramp effect.
- *
- * This struct is exclusively for the SDL_HAPTIC_RAMP effect.
- *
- * The ramp effect starts at start strength and ends at end strength.
- *  It augments in linear fashion.  If you use attack and fade with a ramp
- *  they effects get added to the ramp effect making the effect become
- *  quadratic instead of linear.
- *
- * \sa SDL_HAPTIC_RAMP
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticRamp
-{
-    /* Header */
-    Uint16 type;            /**< SDL_HAPTIC_RAMP */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Ramp */
-    Sint16 start;           /**< Beginning strength level. */
-    Sint16 end;             /**< Ending strength level. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticRamp;
-/**
- * \struct SDL_HapticCustom
- *
- * \brief A structure containing a template for the SDL_HAPTIC_CUSTOM effect.
- *
- * A custom force feedback effect is much like a periodic effect, where the
- *  application can define it's exact shape.  You will have to allocate the
- *  data yourself.  Data should consist of channels * samples Uint16 samples.
- *
- * If channels is one, the effect is rotated using the defined direction.
- *  Otherwise it uses the samples in data for the different axes.
- *
- * \sa SDL_HAPTIC_CUSTOM
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCustom
-{
-    /* Header */
-    Uint16 type;            /**< SDL_HAPTIC_CUSTOM */
-    SDL_HapticDirection direction;  /**< Direction of the effect. */
-
-    /* Replay */
-    Uint32 length;          /**< Duration of the effect. */
-    Uint16 delay;           /**< Delay before starting the effect. */
-
-    /* Trigger */
-    Uint16 button;          /**< Button that triggers the effect. */
-    Uint16 interval;        /**< How soon it can be triggered again after button. */
-
-    /* Custom */
-    Uint8 channels;         /**< Axes to use, minimum of one. */
-    Uint16 period;          /**< Sample periods. */
-    Uint16 samples;         /**< Amount of samples. */
-    Uint16 *data;           /**< Should contain channels*samples items. */
-
-    /* Envelope */
-    Uint16 attack_length;   /**< Duration of the attack. */
-    Uint16 attack_level;    /**< Level at the start of the attack. */
-    Uint16 fade_length;     /**< Duration of the fade. */
-    Uint16 fade_level;      /**< Level at the end of the fade. */
-} SDL_HapticCustom;
-/**
- * \union SDL_HapticEffect
- *
- * \brief The generic template for any haptic effect.
- *
- * All values max at 32767 (0x7FFF).  Signed values also can be negative.
- *  Time values unless specified otherwise are in milliseconds.
- *
- * You can also pass SDL_HAPTIC_INFINITY to length instead of a 0-32767 value.
- *  Neither delay, interval, attack_length nor fade_length support 
- *  SDL_HAPTIC_INFINITY.  Fade will also not be used since effect never ends.
- *
- * Additionally, the SDL_HAPTIC_RAMP effect does not support a duration of
- *  SDL_HAPTIC_INFINITY.
- *
- * Button triggers may not be supported on all devices, it is advised to not
- *  use them if possible.  Buttons start at index 1 instead of index 0 like
- *  they joystick.
- *
- * If both attack_length and fade_level are 0, the envelope is not used,
- *  otherwise both values are used.
- *
- * Common parts:
- * \code
- * // Replay - All effects have this
- * Uint32 length;        // Duration of effect (ms).
- * Uint16 delay;         // Delay before starting effect.
- *
- * // Trigger - All effects have this
- * Uint16 button;        // Button that triggers effect.
- * Uint16 interval;      // How soon before effect can be triggered again.
- *
- * // Envelope - All effects except condition effects have this
- * Uint16 attack_length; // Duration of the attack (ms).
- * Uint16 attack_level;  // Level at the start of the attack.
- * Uint16 fade_length;   // Duration of the fade out (ms).
- * Uint16 fade_level;    // Level at the end of the fade.
- * \endcode
- *
- *
- * Here we have an example of a constant effect evolution in time:
- *
- * \code
- * Strength
- * ^
- * |
- * |    effect level -->  _________________
- * |                     /                 \
- * |                    /                   \
- * |                   /                     \
- * |                  /                       \ 
- * | attack_level --> |                        \
- * |                  |                        |  <---  fade_level
- * |
- * +--------------------------------------------------> Time
- *                    [--]                 [---]
- *                    attack_length        fade_length
- * 
- * [------------------][-----------------------]
- * delay               length
- * \endcode
- *
- * Note either the attack_level or the fade_level may be above the actual
- *  effect level.
- *
- * \sa SDL_HapticConstant
- * \sa SDL_HapticPeriodic
- * \sa SDL_HapticCondition
- * \sa SDL_HapticRamp
- * \sa SDL_HapticCustom
- */
-typedef union SDL_HapticEffect
-{
-    /* Common for all force feedback effects */
-    Uint16 type;                    /**< Effect type. */
-    SDL_HapticConstant constant;    /**< Constant effect. */
-    SDL_HapticPeriodic periodic;    /**< Periodic effect. */
-    SDL_HapticCondition condition;  /**< Condition effect. */
-    SDL_HapticRamp ramp;            /**< Ramp effect. */
-    SDL_HapticCustom custom;        /**< Custom effect. */
-} SDL_HapticEffect;
-
-
-/* Function prototypes */
-/**
- * \fn int SDL_NumHaptics(void)
- *
- * \brief Count the number of joysticks attached to the system.
- *
- *    \return Number of haptic devices detected on the system.
- */
-extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
-
-/**
- * \fn const char * SDL_HapticName(int device_index)
- *
- * \brief Get the implementation dependent name of a Haptic device.
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- *
- *    \param device_index Index of the device to get it's name.
- *    \return Name of the device or NULL on error.
- *
- * \sa SDL_NumHaptics
- */
-extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
-
-/**
- * \fn SDL_Haptic * SDL_HapticOpen(int device_index)
- *
- * \brief Opens a Haptic device for usage - the index passed as an
- * argument refers to the N'th Haptic device on this system.
- *
- * When opening a haptic device, it's gain will be set to maximum and
- *  autocenter will be disabled.  To modify these values use
- *  SDL_HapticSetGain and SDL_HapticSetAutocenter
- *
- *    \param device_index Index of the device to open.
- *    \return Device identifier or NULL on error.
- *
- * \sa SDL_HapticIndex
- * \sa SDL_HapticOpenFromMouse
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- * \sa SDL_HapticSetGain
- * \sa SDL_HapticSetAutocenter
- * \sa SDL_HapticPause
- * \sa SDL_HapticStopAll
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
-
-/**
- * \fn int SDL_HapticOpened(int device_index)
- *
- * \brief Checks if the haptic device at index has been opened.
- *
- *    \param device_index Index to check to see if it has been opened.
- *    \return 1 if it has been opened or 0 if it hasn't.
- * 
- * \sa SDL_HapticOpen
- * \sa SDL_HapticIndex
- */
-extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
-
-/**
- * \fn int SDL_HapticIndex(SDL_Haptic * haptic)
- *
- * \brief Gets the index of a haptic device.
- *
- *    \param haptic Haptic device to get the index of.
- *    \return The index of the haptic device or -1 on error.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpened
- */
-extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
-
-/**
- * \fn int SDL_MouseIsHaptic(void)
- *
- * \brief Gets whether or not the current mouse has haptic capabilities.
- *
- *    \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
- *
- * \sa SDL_HapticOpenFromMouse
- */
-extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
-
-/**
- * \fn SDL_Haptic * SDL_HapticOpenFromMouse(void)
- *
- * \brief Tries to open a haptic device from the current mouse.
- *
- *    \return The haptic device identifier or NULL on error.
- *
- * \sa SDL_MouseIsHaptic
- * \sa SDL_HapticOpen
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
-
-/**
- * \fn int SDL_JoystickIsHaptic(SDL_Joystick * joystick)
- *
- * \brief Checks to see if a joystick has haptic features.
- *
- *    \param joystick Joystick to test for haptic capabilities.
- *    \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't
- *            or -1 if an error ocurred.
- *
- * \sa SDL_HapticOpenFromJoystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/**
- * \fn SDL_Haptic * SDL_HapticOpenFromJoystick(SDL_Joystick * joystick)
- *
- * \brief Opens a Haptic device for usage from a Joystick device.  Still has
- * to be closed seperately to the joystick.
- *
- * When opening from a joystick you should first close the haptic device before
- *  closing the joystick device.  If not, on some implementations the haptic
- *  device will also get unallocated and you'll be unable to use force feedback
- *  on that device.
- *
- *    \param joystick Joystick to create a haptic device from.
- *    \return A valid haptic device identifier on success or NULL on error.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticClose
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
-                                                               joystick);
-
-/**
- * \fn void SDL_HapticClose(SDL_Haptic * haptic)
- *
- * \brief Closes a Haptic device previously opened with SDL_HapticOpen.
- *
- *    \param haptic Haptic device to close.
- */
-extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
-
-/**
- * \fn int SDL_HapticNumEffects(SDL_Haptic * haptic)
- *
- * \brief Returns the number of effects a haptic device can store.
- *
- * On some platforms this isn't fully supported, and therefore is an
- *  aproximation.  Always check to see if your created effect was actually
- *  created and do not rely solely on HapticNumEffects.
- *
- *    \param haptic The haptic device to query effect max.
- *    \return The number of effects the haptic device can store or
- *            -1 on error.
- *
- * \sa SDL_HapticNumEffectsPlaying
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
-
-/**
- * \fn int SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic)
- *
- * \brief Returns the number of effects a haptic device can play at the same time.
- *
- * This is not supported on all platforms, but will always return a value.  Added
- *  here for the sake of completness.
- *
- *    \param haptic The haptic device to query maximum playing effect.s
- *    \return The number of effects the haptic device can play at the same time
- *            or -1 on error.
- *
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
-
-/**
- * \fn unsigned int SDL_HapticQuery(SDL_Haptic * haptic)
- *
- * \brief Gets the haptic devices supported features in bitwise matter.
- *
- * Example: 
- * \code
- * if (SDL_HapticQueryEffects(haptic) & SDL_HAPTIC_CONSTANT) {
- *    printf("We have constant haptic effect!");
- * }
- * \endcode
- *    
- *
- *    \param haptic The haptic device to query.
- *    \return Haptic features in bitwise manner (OR'd).
- *
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticEffectSupported
- */
-extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
-
-
-/**
- * \fn int SDL_HapticNumAxes(SDL_Haptic * haptic)
- *
- * \brief Gets the number of haptic axes the device has.
- *
- * \sa SDL_HapticDirection
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
-
-/**
- * \fn int SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect)
- *
- * \brief Checks to see if effect is supported by haptic.
- *
- *    \param haptic Haptic device to check on.
- *    \param effect Effect to check to see if it is supported.
- *    \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or 
- *            -1 on error.
- * 
- * \sa SDL_HapticQuery
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
-                                                      SDL_HapticEffect *
-                                                      effect);
-
-/**
- * \fn int SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect)
- *
- * \brief Creates a new haptic effect on the device.
- *
- *    \param haptic Haptic device to create the effect on.
- *    \param effect Properties of the effect to create.
- *    \return The id of the effect on success or -1 on error.
- *
- * \sa SDL_HapticUpdateEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
-                                                SDL_HapticEffect * effect);
-
-/**
- * \fn int SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect, SDL_HapticEffect * data)
- *
- * \brief Updates the properties of an effect.
- *
- * Can be used dynamically, although behaviour when dynamically changing
- * direction may be strange.  Specifically the effect may reupload itself
- * and start playing from the start.  You cannot change the type either when
- * running UpdateEffect.
- *
- *    \param haptic Haptic device that has the effect.
- *    \param effect Effect to update.
- *    \param data New effect properties to use.
- *    \return The id of the effect on success or -1 on error.
- *
- * \sa SDL_HapticNewEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
-                                                   int effect,
-                                                   SDL_HapticEffect * data);
-
-/**
- * \fn int SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations)
- *
- * \brief Runs the haptic effect on it's assosciated haptic device.
- *
- * If iterations are SDL_HAPTIC_INFINITY, it'll run the effect over and over
- *  repeating the envelope (attack and fade) every time.  If you only want the
- *  effect to last forever, set SDL_HAPTIC_INFINITY in the effect's length
- *  parameter.
- *
- *    \param haptic Haptic device to run the effect on.
- *    \param effect Identifier of the haptic effect to run.
- *    \param iterations Number of iterations to run the effect. Use
- *           SDL_HAPTIC_INFINITY for infinity.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticStopEffect
- * \sa SDL_HapticDestroyEffect
- * \sa SDL_HapticGetEffectStatus
- */
-extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
-                                                int effect,
-                                                Uint32 iterations);
-
-/**
- * \fn int SDL_HapticStopEffect(SDL_Haptic * haptic, int effect)
- *
- * \brief Stops the haptic effect on it's assosciated haptic device.
- *
- *    \param haptic Haptic device to stop the effect on.
- *    \param effect Identifier of the effect to stop.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
-                                                 int effect);
-
-/**
- * \fn void SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect)
- *
- * \brief Destroys a haptic effect on the device.  This will stop the effect
- * if it's running.  Effects are automatically destroyed when the device is
- * closed.
- *
- *    \param haptic Device to destroy the effect on.
- *    \param effect Identifier of the effect to destroy.
- * 
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
-                                                     int effect);
-
-/**
- * \fn int SDL_HapticGetEffectStatus(SDL_Haptic *haptic, int effect)
- *
- * \brief Gets the status of the current effect on the haptic device.
- *
- * Device must support the SDL_HAPTIC_STATUS feature.
- *
- *    \param haptic Haptic device to query the effect status on.
- *    \param effect Identifier of the effect to query it's status.
- *    \return 0 if it isn't playing, SDL_HAPTIC_PLAYING if it is playing
- *            or -1 on error.
- *
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticStopEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
-                                                      int effect);
-
-/**
- * \fn int SDL_HapticSetGain(SDL_Haptic * haptic, int gain)
- *
- * \brief Sets the global gain of the device.  Gain should be between 0 and 100.
- *
- * Device must support the SDL_HAPTIC_GAIN feature.
- *
- * The user may specify the maxmimum gain by setting the environment variable
- *  SDL_HAPTIC_GAIN_MAX which should be between 0 and 100.  All calls to
- *  SDL_HapticSetGain will scale linearly using SDL_HAPTIC_GAIN_MAX as the
- *  maximum.
- *
- *    \param haptic Haptic device to set the gain on.
- *    \param gain Value to set the gain to, should be between 0 and 100.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/**
- * \fn int SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
- *
- * \brief Sets the global autocenter of the device.  Autocenter should be between
- * 0 and 100.  Setting it to 0 will disable autocentering.
- *
- * Device must support the SDL_HAPTIC_AUTOCENTER feature.
- *
- *    \param haptic Haptic device to set autocentering on.
- *    \param autocenter Value to set autocenter to, 0 disables autocentering.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
-                                                    int autocenter);
-
-/**
- * \fn extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic)
- *
- * \brief Pauses a haptic device.
- *
- * Device must support the SDL_HAPTIC_PAUSE feature.  Call SDL_HapticUnpause
- *  to resume playback.
- *
- * Do not modify the effects nor add new ones while the device is paused.
- *  That can cause all sorts of weird errors.
- *
- *    \param haptic Haptic device to pause.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticUnpause
- */
-extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
-
-/**
- * \fn extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic)
- *
- * \brief Unpauses a haptic device.
- *
- * Call to unpause after SDL_HapticPause.
- *
- *    \param haptic Haptic device to pause.
- *    \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticPause
- */
-extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
-
-/**
- * \fn extern DECSLPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic)
- *
- * \brief Stops all the currently playing effects on a haptic device.
- *
- *    \param haptic Haptic device to stop.
- *    \return 0 on success or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_haptic_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_joystick.h b/Externals/SDL/Include_1.3/SDL_joystick.h
deleted file mode 100644
index 44aa3fbe23..0000000000
--- a/Externals/SDL/Include_1.3/SDL_joystick.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_joystick.h
- *
- * Include file for SDL joystick event handling
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* In order to use these functions, SDL_Init() must have been called
-   with the SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
-   for joysticks, and load appropriate drivers.
-*/
-
-/* The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-
-/* Function prototypes */
-/*
- * Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/*
- * Get the implementation dependent name of a joystick.
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_JoystickName(int device_index);
-
-/*
- * Open a joystick for use - the index passed as an argument refers to
- * the N'th joystick on the system.  This index is the value which will
- * identify this joystick in future joystick events.
- *
- * This function returns a joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
-
-/*
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/*
- * Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick * joystick);
-
-/*
- * Get the number of general axis controls on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
-
-/*
- * Get the number of trackballs on a joystick
- * Joystick trackballs have only relative motion events associated
- * with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
-
-/*
- * Get the number of POV hats on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
-
-/*
- * Get the number of buttons on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
-
-/*
- * Update the current state of the open joysticks.
- * This is called automatically by the event loop if any joystick
- * events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/*
- * Enable/disable joystick event polling.
- * If joystick events are disabled, you must call SDL_JoystickUpdate()
- * yourself and check the state of the joystick when you want joystick
- * information.
- * The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/*
- * Get the current state of an axis control on a joystick
- * The state is a value ranging from -32768 to 32767.
- * The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
-                                                   int axis);
-
-/*
- * Get the current state of a POV hat on a joystick
- * The return value is one of the following positions:
- */
-#define SDL_HAT_CENTERED	0x00
-#define SDL_HAT_UP		0x01
-#define SDL_HAT_RIGHT		0x02
-#define SDL_HAT_DOWN		0x04
-#define SDL_HAT_LEFT		0x08
-#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*
- * The hat indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
-                                                 int hat);
-
-/*
- * Get the ball axis change since the last poll
- * This returns 0, or -1 if you passed it invalid parameters.
- * The ball indices start at index 0.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
-                                                int ball, int *dx, int *dy);
-
-/*
- * Get the current state of a button on a joystick
- * The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
-                                                    int button);
-
-/*
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_keyboard.h b/Externals/SDL/Include_1.3/SDL_keyboard.h
deleted file mode 100644
index 28737ee0e2..0000000000
--- a/Externals/SDL/Include_1.3/SDL_keyboard.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_keyboard.h
- *
- * Include file for SDL keyboard event handling
- */
-
-#ifndef _SDL_keyboard_h
-#define _SDL_keyboard_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keysym.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \struct SDL_keysym
- *
- * \brief The SDL keysym structure, used in key events.
- */
-typedef struct SDL_keysym
-{
-    SDL_scancode scancode;      /**< SDL physical key code - see ::SDL_scancode for details */
-    SDLKey sym;                 /**< SDL virtual key code - see ::SDLKey for details */
-    Uint16 mod;                 /**< current key modifiers */
-    Uint32 unicode;             /**< OBSOLETE, use SDL_TextInputEvent instead */
-} SDL_keysym;
-
-/* Function prototypes */
-
-/**
- * \fn int SDL_GetNumKeyboards(void)
- *
- * \brief Get the number of keyboard input devices available.
- *
- * \sa SDL_SelectKeyboard()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumKeyboards(void);
-
-/**
- * \fn int SDL_SelectKeyboard(int index)
- *
- * \brief Set the index of the currently selected keyboard.
- *
- * \return The index of the previously selected keyboard.
- *
- * \note You can query the currently selected keyboard by passing an index of -1.
- *
- * \sa SDL_GetNumKeyboards()
- */
-extern DECLSPEC int SDLCALL SDL_SelectKeyboard(int index);
-
-/**
- * \fn Uint8 *SDL_GetKeyboardState(int *numkeys)
- *
- * \brief Get a snapshot of the current state of the selected keyboard.
- *
- * \param numkeys if non-NULL, receives the length of the returned array.
- *
- * \return An array of key states. Indexes into this array are obtained by using ::SDL_scancode values.
- *
- * Example:
- * 	Uint8 *state = SDL_GetKeyboardState(NULL);
- *	if ( state[SDL_SCANCODE_RETURN)] ) ... <RETURN> is pressed.
- */
-extern DECLSPEC Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys);
-
-/**
- * \fn SDLMod SDL_GetModState(void)
- *
- * \brief Get the current key modifier state for the selected keyboard.
- */
-extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);
-
-/**
- * \fn void SDL_SetModState(SDLMod modstate)
- *
- * \brief Set the current key modifier state for the selected keyboard.
- *
- * \note This does not change the keyboard state, only the key modifier flags.
- */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
-
-/**
- * \fn SDLKey SDL_GetKeyFromScancode(SDL_scancode scancode)
- * 
- * \brief Get the key code corresponding to the given scancode according to the current keyboard layout.
- *
- * See ::SDLKey for details.
- *
- * \sa SDL_GetKeyName()
- */
-extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_scancode scancode);
-
-/**
- * \fn SDL_scancode SDL_GetScancodeFromKey(SDLKey key)
- * 
- * \brief Get the scancode corresponding to the given key code according to the current keyboard layout.
- *
- * See ::SDL_scancode for details.
- *
- * \sa SDL_GetScancodeName()
- */
-extern DECLSPEC SDL_scancode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
-
-/**
- * \fn const char *SDL_GetScancodeName(SDL_scancode scancode)
- * 
- * \brief Get a human-readable name for a scancode.
- *
- * \return A pointer to a UTF-8 string that stays valid at least until the next call to this function. If you need it around any longer, you must copy it.  If the scancode doesn't have a name, this function returns "".
- *
- * \sa SDL_scancode
- */
-extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_scancode
-                                                        scancode);
-
-/**
- * \fn const char *SDL_GetKeyName(SDLKey key)
- * 
- * \brief Get a human-readable name for a key.
- *
- * \return A pointer to a UTF-8 string that stays valid at least until the next call to this function. If you need it around any longer, you must copy it.  If the key doesn't have a name, this function returns "".
- *
- * \sa SDLKey
- */
-extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDLKey key);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_keyboard_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_keysym.h b/Externals/SDL/Include_1.3/SDL_keysym.h
deleted file mode 100644
index 72b2c35fb3..0000000000
--- a/Externals/SDL/Include_1.3/SDL_keysym.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_keysym.h
- */
-
-#ifndef _SDL_keysym_h
-#define _SDL_keysym_h
-
-#include "SDL_stdinc.h"
-#include "SDL_scancode.h"
-
-/**
- * \typedef SDLKey
- *
- * \brief The SDL virtual key representation.
- *
- * Values of this type are used to represent keyboard keys using the current
- * layout of the keyboard.  These values include Unicode values representing
- * the unmodified character that would be generated by pressing the key, or
- * an SDLK_* constant for those keys that do not generate characters.
- */
-typedef Sint32 SDLKey;
-
-#define SDLK_SCANCODE_MASK (1<<30)
-#define SDL_SCANCODE_TO_KEYCODE(X)	(X | SDLK_SCANCODE_MASK)
-
-enum
-{
-    SDLK_UNKNOWN = 0,
-
-    SDLK_RETURN = '\r',
-    SDLK_ESCAPE = '\033',
-    SDLK_BACKSPACE = '\b',
-    SDLK_TAB = '\t',
-    SDLK_SPACE = ' ',
-
-    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
-
-    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
-    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
-    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
-    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
-    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
-    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
-    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
-    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
-    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
-    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
-    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
-    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
-
-    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
-    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
-    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
-    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
-    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
-    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
-    SDLK_DELETE = '\177',
-    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
-    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
-    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
-    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
-    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
-    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
-
-    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
-    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
-    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
-    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
-    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
-    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
-    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
-    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
-    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
-    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
-    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
-    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
-    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
-    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
-    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
-    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
-    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
-
-    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
-    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
-    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
-    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
-    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
-    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
-    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
-    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
-    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
-    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
-    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
-    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
-    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
-    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
-    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
-    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
-    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
-    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
-    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
-    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
-    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
-    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
-    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
-    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
-    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
-    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
-    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
-    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
-    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
-    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
-    SDLK_KP_EQUALSAS400 =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
-
-    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
-    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
-    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
-    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
-    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
-    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
-    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
-    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
-    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
-    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
-    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
-    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
-
-    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
-    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
-    SDLK_THOUSANDSSEPARATOR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
-    SDLK_DECIMALSEPARATOR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
-    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
-    SDLK_CURRENCYSUBUNIT =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
-    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
-    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
-    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
-    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
-    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
-    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
-    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
-    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
-    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
-    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
-    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
-    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
-    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
-    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
-    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
-    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
-    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
-    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
-    SDLK_KP_DBLAMPERSAND =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
-    SDLK_KP_VERTICALBAR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
-    SDLK_KP_DBLVERTICALBAR =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
-    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
-    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
-    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
-    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
-    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
-    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
-    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
-    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
-    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
-    SDLK_KP_MEMSUBTRACT =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
-    SDLK_KP_MEMMULTIPLY =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
-    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
-    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
-    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
-    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
-    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
-    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
-    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
-    SDLK_KP_HEXADECIMAL =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
-
-    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
-    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
-    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
-    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
-    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
-    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
-    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
-    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
-
-    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
-
-    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
-    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
-    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
-    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
-    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
-    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
-    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
-    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
-    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
-    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
-    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
-    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
-    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
-    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
-    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
-    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
-    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
-
-    SDLK_BRIGHTNESSDOWN =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
-    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
-    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
-    SDLK_KBDILLUMTOGGLE =
-        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
-    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
-    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
-    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
-    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP)
-};
-
-/**
- * \enum SDLMod
- *
- * \brief Enumeration of valid key mods (possibly OR'd together)
- */
-typedef enum
-{
-    KMOD_NONE = 0x0000,
-    KMOD_LSHIFT = 0x0001,
-    KMOD_RSHIFT = 0x0002,
-    KMOD_LCTRL = 0x0040,
-    KMOD_RCTRL = 0x0080,
-    KMOD_LALT = 0x0100,
-    KMOD_RALT = 0x0200,
-    KMOD_LGUI = 0x0400,
-    KMOD_RGUI = 0x0800,
-    KMOD_NUM = 0x1000,
-    KMOD_CAPS = 0x2000,
-    KMOD_MODE = 0x4000,
-    KMOD_RESERVED = 0x8000
-} SDLMod;
-
-#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
-#define KMOD_GUI	(KMOD_LGUI|KMOD_RGUI)
-
-#endif /* _SDL_keysym_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_loadso.h b/Externals/SDL/Include_1.3/SDL_loadso.h
deleted file mode 100644
index be3ea3228b..0000000000
--- a/Externals/SDL/Include_1.3/SDL_loadso.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_loadso.h
- *
- * System dependent library loading routines
- *
- * Some things to keep in mind:                                        
- * - These functions only work on C function names.  Other languages may
- *   have name mangling and intrinsic language support that varies from
- *   compiler to compiler.
- * - Make sure you declare your function pointers with the same calling
- *   convention as the actual library function.  Your code will crash
- *   mysteriously if you do not do this.
- * - Avoid namespace collisions.  If you load a symbol from the library,
- *   it is not defined whether or not it goes into the global symbol
- *   namespace for the application.  If it does and it conflicts with
- *   symbols in your code or other shared libraries, you will not get
- *   the results you expect. :)
- */
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* This function dynamically loads a shared object and returns a pointer
- * to the object handle (or NULL if there was an error).
- * The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile);
-
-/* Given an object handle, this function looks up the address of the
- * named function in the shared object and returns it.  This address
- * is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle,
-                                               const char *name);
-
-/* Unload a shared object from memory */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_main.h b/Externals/SDL/Include_1.3/SDL_main.h
deleted file mode 100644
index d4d902de82..0000000000
--- a/Externals/SDL/Include_1.3/SDL_main.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/* Redefine main() on some platforms so that it is called by SDL */
-
-#if defined(__WIN32__) || \
-    (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__SYMBIAN32__) || defined(__IPHONEOS__)
-
-#ifdef __cplusplus
-#define C_LINKAGE	"C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/* The application's main() function must be called with C linkage,
-   and should be declared like this:
-#ifdef __cplusplus
-extern "C"
-#endif
-	int main(int argc, char *argv[])
-	{
-	}
- */
-#define main	SDL_main
-
-/* The prototype for the application's main() function */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* This can be called to set the application class at startup */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
-                                            void *hInst);
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-#endif
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_mouse.h b/Externals/SDL/Include_1.3/SDL_mouse.h
deleted file mode 100644
index b57c371ca5..0000000000
--- a/Externals/SDL/Include_1.3/SDL_mouse.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_mouse.h
- *
- * Include file for SDL mouse event handling
- */
-
-#ifndef _SDL_mouse_h
-#define _SDL_mouse_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-typedef struct SDL_Cursor SDL_Cursor;   /* Implementation dependent */
-
-/* Function prototypes */
-
-/**
- * \fn int SDL_GetNumMice(void)
- *
- * \brief Get the number of mouse input devices available.
- *
- * \sa SDL_SelectMouse()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumMice(void);
-
-/**
- * \fn char* SDL_GetMouseName(int index)
- *
- * \brief Gets the name of a mouse with the given index.
- *
- * \param index is the index of the mouse, which name is to be returned.
- *
- * \return the name of the mouse with the specified index
- */
-extern DECLSPEC char *SDLCALL SDL_GetMouseName(int index);
-
-/**
- * \fn int SDL_SelectMouse(int index)
- *
- * \brief Set the index of the currently selected mouse.
- *
- * \return The index of the previously selected mouse.
- *
- * \note You can query the currently selected mouse by passing an index of -1.
- *
- * \sa SDL_GetNumMice()
- */
-extern DECLSPEC int SDLCALL SDL_SelectMouse(int index);
-
-/**
- * \fn SDL_WindowID SDL_GetMouseFocusWindow(int index)
- *
- * \brief Get the window which currently has focus for the currently selected mouse.
- */
-extern DECLSPEC SDL_WindowID SDLCALL SDL_GetMouseFocusWindow(int index);
-
-/**
- * \fn int SDL_SetRelativeMouseMode(int index, SDL_bool enabled)
- *
- * \brief Set relative mouse mode for the currently selected mouse.
- *
- * \param enabled Whether or not to enable relative mode
- *
- * \return 0 on success, or -1 if relative mode is not supported.
- *
- * While the mouse is in relative mode, the cursor is hidden, and the
- * driver will try to report continuous motion in the current window.
- * Only relative motion events will be delivered, the mouse position
- * will not change.
- *
- * \note This function will flush any pending mouse motion.
- *
- * \sa SDL_GetRelativeMouseMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(int index,
-                                                     SDL_bool enabled);
-
-/**
- * \fn SDL_bool SDL_GetRelativeMouseMode(int index)
- *
- * \brief Query whether relative mouse mode is enabled for the currently selected mouse.
- *
- * \sa SDL_SetRelativeMouseMode()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(int index);
-
-/**
- * \fn Uint8 SDL_GetMouseState(int index, int *x, int *y)
- *
- * \brief Retrieve the current state of the currently selected mouse.
- *
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * mouse cursor position relative to the focus window for the currently
- * selected mouse.  You can pass NULL for either x or y.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int index, int *x, int *y);
-
-/**
- * \fn Uint8 SDL_GetRelativeMouseState(int index, int *x, int *y)
- *
- * \brief Retrieve the state of the currently selected mouse.
- *
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * mouse deltas since the last call to SDL_GetRelativeMouseState().
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int index, int *x,
-                                                        int *y);
-
-/**
- * \fn void SDL_WarpMouseInWindow(SDL_WindowID windowID, int x, int y)
- *
- * \brief Moves the currently selected mouse to the given position within the window.
- *
- * \param windowID The window to move the mouse into, or 0 for the current mouse focus
- * \param x The x coordinate within the window
- * \param y The y coordinate within the window
- *
- * \note This function generates a mouse motion event
- */
-extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_WindowID windowID,
-                                                   int x, int y);
-
-/**
- * \fn SDL_Cursor *SDL_CreateCursor (const Uint8 * data, const Uint8 * mask, int w, int h, int hot_x, int hot_y)
- *
- * \brief Create a cursor for the currently selected mouse, using the
- *        specified bitmap data and mask (in MSB format).
- *
- * The cursor width must be a multiple of 8 bits.
- *
- * The cursor is created in black and white according to the following:
- * data  mask    resulting pixel on screen
- *  0     1       White
- *  1     1       Black
- *  0     0       Transparent
- *  1     0       Inverted color if possible, black if not.
- *
- * \sa SDL_FreeCursor()
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data,
-                                                     const Uint8 * mask,
-                                                     int w, int h, int hot_x,
-                                                     int hot_y);
-
-/**
- * \fn void SDL_SetCursor(SDL_Cursor * cursor)
- *
- * \brief Set the active cursor for the currently selected mouse.
- *
- * \note The cursor must have been created for the selected mouse.
- */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor);
-
-/**
- * \fn SDL_Cursor *SDL_GetCursor(void)
- *
- * \brief Return the active cursor for the currently selected mouse.
- */
-extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void);
-
-/**
- * \fn void SDL_FreeCursor(SDL_Cursor * cursor)
- *
- * \brief Frees a cursor created with SDL_CreateCursor().
- *
- * \sa SDL_CreateCursor()
- */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor);
-
-/**
- * \fn int SDL_ShowCursor(int toggle)
- *
- * \brief Toggle whether or not the cursor is shown for the currently selected mouse.
- *
- * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current state.
- *
- * \return 1 if the cursor is shown, or 0 if the cursor is hidden.
- */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
-
-/* Used as a mask when testing buttons in buttonstate
-   Button 1:	Left mouse button
-   Button 2:	Middle mouse button
-   Button 3:	Right mouse button
- */
-
-/**
- * \fn int SDL_GetCursorsNumber(int index)
- *
- * \brief Gets the number of cursors a pointing device supports.
- * Useful for tablet users. Useful only under Windows.
- *
- * \param index is the index of the pointing device, which number of cursors we
- * want to receive.
- *
- * \return the number of cursors supported by the pointing device. On Windows
- * if a device is a tablet it returns a number >=1. Normal mice always return 1.
- * On Linux every device reports one cursor.
- */
-extern DECLSPEC int SDLCALL SDL_GetCursorsNumber(int index);
-
-/**
- * \fn int SDL_GetCurrentCursor(int index)
- *
- * \brief Returns the index of the current cursor used by a specific pointing
- * device. Useful only under Windows.
- *
- * \param index is the index of the pointing device, which cursor index we want
- * to receive.
- *
- * \return the index of the cursor currently used by a specific pointing device.
- * Always 0 under Linux. On Windows if the device isn't a tablet it returns 0.
- * If the device is the tablet it returns the cursor index.
- * 0 - stylus, 1 - eraser, 2 - cursor.
- */
-extern DECLSPEC int SDLCALL SDL_GetCurrentCursor(int index);
-
-#define SDL_BUTTON(X)		(1 << ((X)-1))
-#define SDL_BUTTON_LEFT		1
-#define SDL_BUTTON_MIDDLE	2
-#define SDL_BUTTON_RIGHT	3
-#define SDL_BUTTON_X1		4
-#define SDL_BUTTON_X2		5
-#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
-#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
-#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
-#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
-#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_mutex.h b/Externals/SDL/Include_1.3/SDL_mutex.h
deleted file mode 100644
index 98f98a098a..0000000000
--- a/Externals/SDL/Include_1.3/SDL_mutex.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_mutex_h
-#define _SDL_mutex_h
-
-/**
- * \file SDL_mutex.h
- *
- * Functions to provide thread synchronization primitives
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Synchronization functions which can time out return this value
-   if they time out.
-*/
-#define SDL_MUTEX_TIMEDOUT	1
-
-/* This is the timeout value which corresponds to never time out */
-#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Mutex functions                                               */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL mutex structure, defined in SDL_mutex.c */
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-
-/* Create a mutex, initialized unlocked */
-extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void);
-
-/* Lock the mutex  (Returns 0, or -1 on error) */
-#define SDL_LockMutex(m)	SDL_mutexP(m)
-extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex * mutex);
-
-/* Unlock the mutex  (Returns 0, or -1 on error)
-   It is an error to unlock a mutex that has not been locked by
-   the current thread, and doing so results in undefined behavior.
- */
-#define SDL_UnlockMutex(m)	SDL_mutexV(m)
-extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex * mutex);
-
-/* Destroy a mutex */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Semaphore functions                                           */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL semaphore structure, defined in SDL_sem.c */
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-
-/* Create a semaphore, initialized with value, returns NULL on failure. */
-extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
-
-/* Destroy a semaphore */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem);
-
-/* This function suspends the calling thread until the semaphore pointed 
- * to by sem has a positive count. It then atomically decreases the semaphore
- * count.
- */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem);
-
-/* Non-blocking variant of SDL_SemWait(), returns 0 if the wait succeeds,
-   SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
-*/
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem);
-
-/* Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
-   the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
-   the allotted time, and -1 on error.
-   On some platforms this function is implemented by looping with a delay
-   of 1 ms, and so should be avoided if possible.
-*/
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
-
-/* Atomically increases the semaphore's count (not blocking), returns 0,
-   or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
-
-/* Returns the current count of the semaphore */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* Condition variable functions                                  */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* The SDL condition variable structure, defined in SDL_cond.c */
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-
-/* Create a condition variable */
-extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void);
-
-/* Destroy a condition variable */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond);
-
-/* Restart one of the threads that are waiting on the condition variable,
-   returns 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond);
-
-/* Restart all threads that are waiting on the condition variable,
-   returns 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond);
-
-/* Wait on the condition variable, unlocking the provided mutex.
-   The mutex must be locked before entering this function!
-   The mutex is re-locked once the condition variable is signaled.
-   Returns 0 when it is signaled, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mut);
-
-/* Waits for at most 'ms' milliseconds, and returns 0 if the condition
-   variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
-   signaled in the allotted time, and -1 on error.
-   On some platforms this function is implemented by looping with a delay
-   of 1 ms, and so should be avoided if possible.
-*/
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
-                                                SDL_mutex * mutex, Uint32 ms);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mutex_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_name.h b/Externals/SDL/Include_1.3/SDL_name.h
deleted file mode 100644
index 511619af56..0000000000
--- a/Externals/SDL/Include_1.3/SDL_name.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NeedFunctionPrototypes 1
-#endif
-
-#define SDL_NAME(X)	SDL_##X
-
-#endif /* _SDLname_h_ */
diff --git a/Externals/SDL/Include_1.3/SDL_opengl.h b/Externals/SDL/Include_1.3/SDL_opengl.h
deleted file mode 100644
index 2a2ebb47ee..0000000000
--- a/Externals/SDL/Include_1.3/SDL_opengl.h
+++ /dev/null
@@ -1,8515 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This is a simple file to encapsulate the OpenGL API headers */
-
-#include "SDL_config.h"
-
-#ifdef __WIN32__
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX                /* Don't defined min() and max() */
-#endif
-#include <windows.h>
-#endif
-#ifndef NO_SDL_GLEXT
-#define __glext_h_              /* Don't let gl.h include glext.h */
-#endif
-#if defined(__MACOSX__)
-#include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
-#include <OpenGL/glu.h>         /* Header File For The GLU Library */
-#else
-#include <GL/gl.h>              /* Header File For The OpenGL Library */
-#include <GL/glu.h>             /* Header File For The GLU Library */
-#endif
-#ifndef NO_SDL_GLEXT
-#undef __glext_h_
-#endif
-
-/* This file is included because glext.h is not available on some systems.
-   If you don't want this version included, simply define "NO_SDL_GLEXT"
-   The latest version is available from:
-	http://oss.sgi.com/projects/ogl-sample/registry/
- */
-#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
-/* *INDENT-OFF* */
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** 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.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2008/11/14 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 44
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_COMPARE_REF_TO_TEXTURE         GL_COMPARE_R_TO_TEXTURE_ARB
-#define GL_CLIP_DISTANCE0                 GL_CLIP_PLANE0
-#define GL_CLIP_DISTANCE1                 GL_CLIP_PLANE1
-#define GL_CLIP_DISTANCE2                 GL_CLIP_PLANE2
-#define GL_CLIP_DISTANCE3                 GL_CLIP_PLANE3
-#define GL_CLIP_DISTANCE4                 GL_CLIP_PLANE4
-#define GL_CLIP_DISTANCE5                 GL_CLIP_PLANE5
-#define GL_MAX_CLIP_DISTANCES             GL_MAX_CLIP_PLANES
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-#define GL_CONTEXT_FLAGS                  0x821E
-#define GL_DEPTH_BUFFER                   0x8223
-#define GL_STENCIL_BUFFER                 0x8224
-#define GL_COMPRESSED_RED                 0x8225
-#define GL_COMPRESSED_RG                  0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
-#define GL_RGBA32F                        0x8814
-#define GL_RGB32F                         0x8815
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
-#define GL_CLAMP_VERTEX_COLOR             0x891A
-#define GL_CLAMP_FRAGMENT_COLOR           0x891B
-#define GL_CLAMP_READ_COLOR               0x891C
-#define GL_FIXED_ONLY                     0x891D
-#define GL_MAX_VARYING_COMPONENTS         GL_MAX_VARYING_FLOATS
-#define GL_TEXTURE_RED_TYPE               0x8C10
-#define GL_TEXTURE_GREEN_TYPE             0x8C11
-#define GL_TEXTURE_BLUE_TYPE              0x8C12
-#define GL_TEXTURE_ALPHA_TYPE             0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
-#define GL_TEXTURE_DEPTH_TYPE             0x8C16
-#define GL_UNSIGNED_NORMALIZED            0x8C17
-#define GL_TEXTURE_1D_ARRAY               0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
-#define GL_TEXTURE_2D_ARRAY               0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
-#define GL_R11F_G11F_B10F                 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
-#define GL_RGB9_E5                        0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
-#define GL_TEXTURE_SHARED_SIZE            0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED           0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS            0x8C8C
-#define GL_SEPARATE_ATTRIBS               0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI                       0x8D70
-#define GL_RGB32UI                        0x8D71
-#define GL_RGBA16UI                       0x8D76
-#define GL_RGB16UI                        0x8D77
-#define GL_RGBA8UI                        0x8D7C
-#define GL_RGB8UI                         0x8D7D
-#define GL_RGBA32I                        0x8D82
-#define GL_RGB32I                         0x8D83
-#define GL_RGBA16I                        0x8D88
-#define GL_RGB16I                         0x8D89
-#define GL_RGBA8I                         0x8D8E
-#define GL_RGB8I                          0x8D8F
-#define GL_RED_INTEGER                    0x8D94
-#define GL_GREEN_INTEGER                  0x8D95
-#define GL_BLUE_INTEGER                   0x8D96
-#define GL_ALPHA_INTEGER                  0x8D97
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#define GL_BGR_INTEGER                    0x8D9A
-#define GL_BGRA_INTEGER                   0x8D9B
-#define GL_SAMPLER_1D_ARRAY               0x8DC0
-#define GL_SAMPLER_2D_ARRAY               0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
-#define GL_UNSIGNED_INT_VEC2              0x8DC6
-#define GL_UNSIGNED_INT_VEC3              0x8DC7
-#define GL_UNSIGNED_INT_VEC4              0x8DC8
-#define GL_INT_SAMPLER_1D                 0x8DC9
-#define GL_INT_SAMPLER_2D                 0x8DCA
-#define GL_INT_SAMPLER_3D                 0x8DCB
-#define GL_INT_SAMPLER_CUBE               0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
-#define GL_QUERY_WAIT                     0x8E13
-#define GL_QUERY_NO_WAIT                  0x8E14
-#define GL_QUERY_BY_REGION_WAIT           0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
-/* Reuse tokens from ARB_depth_buffer_float */
-/* reuse GL_DEPTH_COMPONENT32F */
-/* reuse GL_DEPTH32F_STENCIL8 */
-/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
-/* Reuse tokens from ARB_framebuffer_object */
-/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_DEFAULT */
-/* reuse GL_FRAMEBUFFER_UNDEFINED */
-/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
-/* reuse GL_INDEX */
-/* reuse GL_MAX_RENDERBUFFER_SIZE */
-/* reuse GL_DEPTH_STENCIL */
-/* reuse GL_UNSIGNED_INT_24_8 */
-/* reuse GL_DEPTH24_STENCIL8 */
-/* reuse GL_TEXTURE_STENCIL_SIZE */
-/* reuse GL_TEXTURE_RED_TYPE */
-/* reuse GL_TEXTURE_GREEN_TYPE */
-/* reuse GL_TEXTURE_BLUE_TYPE */
-/* reuse GL_TEXTURE_ALPHA_TYPE */
-/* reuse GL_TEXTURE_LUMINANCE_TYPE */
-/* reuse GL_TEXTURE_INTENSITY_TYPE */
-/* reuse GL_TEXTURE_DEPTH_TYPE */
-/* reuse GL_UNSIGNED_NORMALIZED */
-/* reuse GL_FRAMEBUFFER_BINDING */
-/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_BINDING */
-/* reuse GL_READ_FRAMEBUFFER */
-/* reuse GL_DRAW_FRAMEBUFFER */
-/* reuse GL_READ_FRAMEBUFFER_BINDING */
-/* reuse GL_RENDERBUFFER_SAMPLES */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-/* reuse GL_FRAMEBUFFER_COMPLETE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
-/* reuse GL_MAX_COLOR_ATTACHMENTS */
-/* reuse GL_COLOR_ATTACHMENT0 */
-/* reuse GL_COLOR_ATTACHMENT1 */
-/* reuse GL_COLOR_ATTACHMENT2 */
-/* reuse GL_COLOR_ATTACHMENT3 */
-/* reuse GL_COLOR_ATTACHMENT4 */
-/* reuse GL_COLOR_ATTACHMENT5 */
-/* reuse GL_COLOR_ATTACHMENT6 */
-/* reuse GL_COLOR_ATTACHMENT7 */
-/* reuse GL_COLOR_ATTACHMENT8 */
-/* reuse GL_COLOR_ATTACHMENT9 */
-/* reuse GL_COLOR_ATTACHMENT10 */
-/* reuse GL_COLOR_ATTACHMENT11 */
-/* reuse GL_COLOR_ATTACHMENT12 */
-/* reuse GL_COLOR_ATTACHMENT13 */
-/* reuse GL_COLOR_ATTACHMENT14 */
-/* reuse GL_COLOR_ATTACHMENT15 */
-/* reuse GL_DEPTH_ATTACHMENT */
-/* reuse GL_STENCIL_ATTACHMENT */
-/* reuse GL_FRAMEBUFFER */
-/* reuse GL_RENDERBUFFER */
-/* reuse GL_RENDERBUFFER_WIDTH */
-/* reuse GL_RENDERBUFFER_HEIGHT */
-/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
-/* reuse GL_STENCIL_INDEX1 */
-/* reuse GL_STENCIL_INDEX4 */
-/* reuse GL_STENCIL_INDEX8 */
-/* reuse GL_STENCIL_INDEX16 */
-/* reuse GL_RENDERBUFFER_RED_SIZE */
-/* reuse GL_RENDERBUFFER_GREEN_SIZE */
-/* reuse GL_RENDERBUFFER_BLUE_SIZE */
-/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
-/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
-/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-/* reuse GL_MAX_SAMPLES */
-/* Reuse tokens from ARB_framebuffer_sRGB */
-/* reuse GL_FRAMEBUFFER_SRGB */
-/* Reuse tokens from ARB_half_float_vertex */
-/* reuse GL_HALF_FLOAT */
-/* Reuse tokens from ARB_map_buffer_range */
-/* reuse GL_MAP_READ_BIT */
-/* reuse GL_MAP_WRITE_BIT */
-/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
-/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
-/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
-/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
-/* Reuse tokens from ARB_texture_compression_rgtc */
-/* reuse GL_COMPRESSED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
-/* reuse GL_COMPRESSED_RG_RGTC2 */
-/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
-/* Reuse tokens from ARB_texture_rg */
-/* reuse GL_RG */
-/* reuse GL_RG_INTEGER */
-/* reuse GL_R8 */
-/* reuse GL_R16 */
-/* reuse GL_RG8 */
-/* reuse GL_RG16 */
-/* reuse GL_R16F */
-/* reuse GL_R32F */
-/* reuse GL_RG16F */
-/* reuse GL_RG32F */
-/* reuse GL_R8I */
-/* reuse GL_R8UI */
-/* reuse GL_R16I */
-/* reuse GL_R16UI */
-/* reuse GL_R32I */
-/* reuse GL_R32UI */
-/* reuse GL_RG8I */
-/* reuse GL_RG8UI */
-/* reuse GL_RG16I */
-/* reuse GL_RG16UI */
-/* reuse GL_RG32I */
-/* reuse GL_RG32UI */
-/* Reuse tokens from ARB_vertex_array_object */
-/* reuse GL_VERTEX_ARRAY_BINDING */
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F             0x8CAC
-#define GL_DEPTH32F_STENCIL8              0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT            0x8218
-#define GL_FRAMEBUFFER_UNDEFINED          0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#define GL_INDEX                          0x8222
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-#define GL_DEPTH_STENCIL                  0x84F9
-#define GL_UNSIGNED_INT_24_8              0x84FA
-#define GL_DEPTH24_STENCIL8               0x88F0
-#define GL_TEXTURE_STENCIL_SIZE           0x88F1
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_READ_FRAMEBUFFER               0x8CA8
-#define GL_DRAW_FRAMEBUFFER               0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
-#define GL_RENDERBUFFER_SAMPLES           0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_COLOR_ATTACHMENT1              0x8CE1
-#define GL_COLOR_ATTACHMENT2              0x8CE2
-#define GL_COLOR_ATTACHMENT3              0x8CE3
-#define GL_COLOR_ATTACHMENT4              0x8CE4
-#define GL_COLOR_ATTACHMENT5              0x8CE5
-#define GL_COLOR_ATTACHMENT6              0x8CE6
-#define GL_COLOR_ATTACHMENT7              0x8CE7
-#define GL_COLOR_ATTACHMENT8              0x8CE8
-#define GL_COLOR_ATTACHMENT9              0x8CE9
-#define GL_COLOR_ATTACHMENT10             0x8CEA
-#define GL_COLOR_ATTACHMENT11             0x8CEB
-#define GL_COLOR_ATTACHMENT12             0x8CEC
-#define GL_COLOR_ATTACHMENT13             0x8CED
-#define GL_COLOR_ATTACHMENT14             0x8CEE
-#define GL_COLOR_ATTACHMENT15             0x8CEF
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_STENCIL_INDEX1                 0x8D46
-#define GL_STENCIL_INDEX4                 0x8D47
-#define GL_STENCIL_INDEX8                 0x8D48
-#define GL_STENCIL_INDEX16                0x8D49
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES                    0x8D57
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_LINES_ADJACENCY_ARB            0x000A
-#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
-#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
-#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
-#define GL_GEOMETRY_SHADER_ARB            0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
-/* reuse GL_MAX_VARYING_COMPONENTS */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_HALF_FLOAT                     0x140B
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_TEXTURE_BUFFER_ARB             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1           0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
-#define GL_COMPRESSED_RG_RGTC2            0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_RG                             0x8227
-#define GL_RG_INTEGER                     0x8228
-#define GL_R8                             0x8229
-#define GL_R16                            0x822A
-#define GL_RG8                            0x822B
-#define GL_RG16                           0x822C
-#define GL_R16F                           0x822D
-#define GL_R32F                           0x822E
-#define GL_RG16F                          0x822F
-#define GL_RG32F                          0x8230
-#define GL_R8I                            0x8231
-#define GL_R8UI                           0x8232
-#define GL_R16I                           0x8233
-#define GL_R16UI                          0x8234
-#define GL_R32I                           0x8235
-#define GL_R32UI                          0x8236
-#define GL_RG8I                           0x8237
-#define GL_RG8UI                          0x8238
-#define GL_RG16I                          0x8239
-#define GL_RG16UI                         0x823A
-#define GL_RG32I                          0x823B
-#define GL_RG32UI                         0x823C
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING           0x85B5
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_QUERY_WAIT_NV                  0x8E13
-#define GL_QUERY_NO_WAIT_NV               0x8E14
-#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_FRAME_NV                       0x8E26
-#define GL_FIELDS_NV                      0x8E27
-#define GL_CURRENT_TIME_NV                0x8E28
-#define GL_NUM_FILL_STREAMS_NV            0x8E29
-#define GL_PRESENT_TIME_NV                0x8E2A
-#define GL_PRESENT_DURATION_NV            0x8E2B
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
-#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
-#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
-#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
-#define GL_RASTERIZER_DISCARD_EXT         0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_PROGRAM_MATRIX_EXT             0x8E2D
-#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
-#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-/* reuse GL_BGRA */
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
-#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
-#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
-#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_SAMPLE_POSITION_NV             0x8E50
-#define GL_SAMPLE_MASK_NV                 0x8E51
-#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
-#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
-#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
-#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
-#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
-#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
-#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
-#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-/* OpenGL 3.0 also reuses entry points from these extensions: */
-/* ARB_framebuffer_object */
-/* ARB_map_buffer_range */
-/* ARB_vertex_array_object */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaski (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleani_v (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegeri_v (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnablei (GLenum, GLuint);
-GLAPI void APIENTRY glDisablei (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledi (GLenum, GLuint);
-GLAPI void APIENTRY glBeginTransformFeedback (GLenum);
-GLAPI void APIENTRY glEndTransformFeedback (void);
-GLAPI void APIENTRY glBindBufferRange (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferBase (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint, GLuint, GLint *);
-GLAPI void APIENTRY glClampColor (GLenum, GLenum);
-GLAPI void APIENTRY glBeginConditionalRender (GLuint, GLenum);
-GLAPI void APIENTRY glEndConditionalRender (void);
-GLAPI void APIENTRY glVertexAttribI1i (GLuint, GLint);
-GLAPI void APIENTRY glVertexAttribI2i (GLuint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI3i (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI4i (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI1ui (GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI2ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI3ui (GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI4ui (GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI1iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI2iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI3iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI1uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI2uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI3uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttribI4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttribI4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribI4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glGetUniformuiv (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocation (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1ui (GLint, GLuint);
-GLAPI void APIENTRY glUniform2ui (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3ui (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4ui (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uiv (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glTexParameterIiv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuiv (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuiv (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearBufferiv (GLenum, GLint, const GLint *);
-GLAPI void APIENTRY glClearBufferuiv (GLenum, GLint, const GLuint *);
-GLAPI void APIENTRY glClearBufferfv (GLenum, GLint, const GLfloat *);
-GLAPI void APIENTRY glClearBufferfi (GLenum, GLint, GLfloat, GLint);
-GLAPI const GLubyte * APIENTRY glGetStringi (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLint *location);
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_ARB_depth_buffer_float
-#define GL_ARB_depth_buffer_float 1
-#endif
-
-#ifndef GL_ARB_draw_instanced
-#define GL_ARB_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_ARB_framebuffer_object
-#define GL_ARB_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint);
-GLAPI void APIENTRY glBindRenderbuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffers (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorage (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint);
-GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1D (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3D (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmap (GLenum);
-GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glFramebufferTextureLayer (GLenum, GLenum, GLuint, GLint, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-#endif
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_ARB_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_ARB_geometry_shader4
-#define GL_ARB_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriARB (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureARB (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_ARB_half_float_vertex
-#define GL_ARB_half_float_vertex 1
-#endif
-
-#ifndef GL_ARB_instanced_arrays
-#define GL_ARB_instanced_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribDivisor (GLuint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
-#endif
-
-#ifndef GL_ARB_map_buffer_range
-#define GL_ARB_map_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapBufferRange (GLenum, GLintptr, GLsizeiptr, GLbitfield);
-GLAPI void APIENTRY glFlushMappedBufferRange (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-#endif
-
-#ifndef GL_ARB_texture_buffer_object
-#define GL_ARB_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferARB (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_ARB_texture_compression_rgtc
-#define GL_ARB_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_ARB_texture_rg
-#define GL_ARB_texture_rg 1
-#endif
-
-#ifndef GL_ARB_vertex_array_object
-#define GL_ARB_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArray (GLuint);
-GLAPI void APIENTRY glDeleteVertexArrays (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArrays (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArray (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
-GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-#endif
-
-#ifndef GL_NV_conditional_render
-#define GL_NV_conditional_render 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint, GLenum);
-GLAPI void APIENTRY glEndConditionalRenderNV (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
-#endif
-
-#ifndef GL_NV_present_video
-#define GL_NV_present_video 1
-#endif
-
-#ifndef GL_EXT_transform_feedback
-#define GL_EXT_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum);
-GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
-GLAPI void APIENTRY glBindBufferRangeEXT (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum, GLuint, GLuint, GLintptr);
-GLAPI void APIENTRY glBindBufferBaseEXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint, GLuint, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_direct_state_access
-#define GL_EXT_direct_state_access 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield);
-GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield);
-GLAPI void APIENTRY glMatrixLoadfEXT (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMatrixLoaddEXT (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMatrixMultfEXT (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMatrixMultdEXT (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum);
-GLAPI void APIENTRY glMatrixRotatefEXT (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMatrixRotatedEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMatrixScalefEXT (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMatrixScaledEXT (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMatrixFrustumEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMatrixOrthoEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMatrixPopEXT (GLenum);
-GLAPI void APIENTRY glMatrixPushEXT (GLenum);
-GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum, const GLdouble *);
-GLAPI void APIENTRY glTextureParameterfEXT (GLuint, GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glTextureParameterfvEXT (GLuint, GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glTextureParameteriEXT (GLuint, GLenum, GLenum, GLint);
-GLAPI void APIENTRY glTextureParameterivEXT (GLuint, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetTextureImageEXT (GLuint, GLenum, GLint, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint, GLenum, GLint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint, GLenum, GLint, GLenum, GLint *);
-GLAPI void APIENTRY glTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum, GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum, GLenum, GLenum, GLint);
-GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum, GLenum, GLint, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum, GLenum, GLint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum, GLenum, GLint, GLenum, GLint *);
-GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glBindMultiTextureEXT (GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum, GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexEnviEXT (GLenum, GLenum, GLenum, GLint);
-GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexGendEXT (GLenum, GLenum, GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexGendvEXT (GLenum, GLenum, GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexGenfEXT (GLenum, GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexGeniEXT (GLenum, GLenum, GLenum, GLint);
-GLAPI void APIENTRY glMultiTexGenivEXT (GLenum, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum, GLenum, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum, GLuint, GLvoid* *);
-GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint, GLenum, GLint, GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum, GLenum, GLint, GLvoid *);
-GLAPI void APIENTRY glNamedProgramStringEXT (GLuint, GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint, GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint, GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint, GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint, GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint, GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint, GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint, GLenum, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint, GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint, GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint, GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint, GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint, GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint, GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint, GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint, GLenum, GLuint, GLuint *);
-GLAPI void APIENTRY glTextureParameterIivEXT (GLuint, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint, GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint, GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum, GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glProgramUniform1fEXT (GLuint, GLint, GLfloat);
-GLAPI void APIENTRY glProgramUniform2fEXT (GLuint, GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramUniform3fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramUniform4fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramUniform1iEXT (GLuint, GLint, GLint);
-GLAPI void APIENTRY glProgramUniform2iEXT (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramUniform3iEXT (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramUniform4iEXT (GLuint, GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint, GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint, GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint, GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint, GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint, GLint, GLuint);
-GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint, GLint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint, GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint, GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint, GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint, GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint, GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint, GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glNamedBufferDataEXT (GLuint, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint, GLenum);
-GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint);
-GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI void APIENTRY glTextureBufferEXT (GLuint, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glMultiTexBufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint, GLenum, GLint *);
-GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint, GLenum);
-GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum, GLenum);
-GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint, GLenum);
-GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint, GLsizei, const GLenum *);
-GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint, GLsizei, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint, GLenum, GLuint, GLint, GLenum);
-GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint, GLenum, GLuint);
-GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
-typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
-typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
-typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
-typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
-typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
-#endif
-
-#ifndef GL_EXT_vertex_array_bgra
-#define GL_EXT_vertex_array_bgra 1
-#endif
-
-#ifndef GL_EXT_texture_swizzle
-#define GL_EXT_texture_swizzle 1
-#endif
-
-#ifndef GL_NV_explicit_multisample
-#define GL_NV_explicit_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetMultisamplefvNV (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint, GLbitfield);
-GLAPI void APIENTRY glTexRenderbufferNV (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
-typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
-#endif
-
-#ifndef GL_NV_transform_feedback2
-#define GL_NV_transform_feedback2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint);
-GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
-GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
-GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* *INDENT-ON* */
-#endif /* NO_SDL_GLEXT */
diff --git a/Externals/SDL/Include_1.3/SDL_opengles.h b/Externals/SDL/Include_1.3/SDL_opengles.h
deleted file mode 100644
index 814eb07159..0000000000
--- a/Externals/SDL/Include_1.3/SDL_opengles.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
- 
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
- Sam Lantinga
- slouken@libsdl.org
- */
-
-/*
-	This is a simple file to encapsulate the OpenGL ES API headers.
-	Headers copied from The Kronos Group website.
-	http://www.khronos.org/opengles/
- */
-
-#ifndef __gles_h_
-#define __gles_h_
-
-/* $Id: gl.h 4533 2007-11-26 11:19:35Z markc $ */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifdef __IPHONEOS__
-#include <OpenGLES/ES1/gl.h>    /* Header File For The OpenGL ES Library */
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY
-#endif
-
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-    typedef unsigned int GLenum;
-    typedef unsigned char GLboolean;
-    typedef unsigned int GLbitfield;
-    typedef signed char GLbyte;
-    typedef short GLshort;
-    typedef int GLint;
-    typedef int GLsizei;
-    typedef unsigned char GLubyte;
-    typedef unsigned short GLushort;
-    typedef unsigned int GLuint;
-    typedef float GLfloat;
-    typedef float GLclampf;
-    typedef void GLvoid;
-    typedef int GLfixed;
-    typedef int GLclampx;
-
-    typedef int GLintptr;
-    typedef int GLsizeiptr;
-
-
-/*************************************************************/
-
-/* OpenGL ES core versions */
-#define GL_VERSION_ES_CM_1_0		  1
-#define GL_VERSION_ES_CL_1_0		  1
-#define GL_VERSION_ES_CM_1_1		  1
-#define GL_VERSION_ES_CL_1_1		  1
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* ClipPlaneName */
-#define GL_CLIP_PLANE0                    0x3000
-#define GL_CLIP_PLANE1                    0x3001
-#define GL_CLIP_PLANE2                    0x3002
-#define GL_CLIP_PLANE3                    0x3003
-#define GL_CLIP_PLANE4                    0x3004
-#define GL_CLIP_PLANE5                    0x3005
-
-/* ColorMaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* ColorMaterialParameter */
-/*      GL_AMBIENT_AND_DIFFUSE */
-
-/* ColorPointerType */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* CullFaceMode */
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_FOG                            0x0B60
-#define GL_LIGHTING                       0x0B50
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_ALPHA_TEST                     0x0BC0
-#define GL_BLEND                          0x0BE2
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-/*      GL_LIGHT0 */
-/*      GL_LIGHT1 */
-/*      GL_LIGHT2 */
-/*      GL_LIGHT3 */
-/*      GL_LIGHT4 */
-/*      GL_LIGHT5 */
-/*      GL_LIGHT6 */
-/*      GL_LIGHT7 */
-#define GL_POINT_SMOOTH                   0x0B10
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_MATERIAL                 0x0B57
-#define GL_NORMALIZE                      0x0BA1
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_VERTEX_ARRAY                   0x8074
-#define GL_NORMAL_ARRAY                   0x8075
-#define GL_COLOR_ARRAY                    0x8076
-#define GL_TEXTURE_COORD_ARRAY            0x8078
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_STACK_OVERFLOW                 0x0503
-#define GL_STACK_UNDERFLOW                0x0504
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FogMode */
-/*      GL_LINEAR */
-#define GL_EXP                            0x0800
-#define GL_EXP2                           0x0801
-
-/* FogParameter */
-#define GL_FOG_DENSITY                    0x0B62
-#define GL_FOG_START                      0x0B63
-#define GL_FOG_END                        0x0B64
-#define GL_FOG_MODE                       0x0B65
-#define GL_FOG_COLOR                      0x0B66
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetPName */
-#define GL_CURRENT_COLOR                  0x0B00
-#define GL_CURRENT_NORMAL                 0x0B02
-#define GL_CURRENT_TEXTURE_COORDS         0x0B03
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_SHADE_MODEL                    0x0B54
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_MATRIX_MODE                    0x0BA0
-#define GL_VIEWPORT                       0x0BA2
-#define GL_MODELVIEW_STACK_DEPTH          0x0BA3
-#define GL_PROJECTION_STACK_DEPTH         0x0BA4
-#define GL_TEXTURE_STACK_DEPTH            0x0BA5
-#define GL_MODELVIEW_MATRIX               0x0BA6
-#define GL_PROJECTION_MATRIX              0x0BA7
-#define GL_TEXTURE_MATRIX                 0x0BA8
-#define GL_ALPHA_TEST_FUNC                0x0BC1
-#define GL_ALPHA_TEST_REF                 0x0BC2
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_LIGHTS                     0x0D31
-#define GL_MAX_CLIP_PLANES                0x0D32
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_MODELVIEW_STACK_DEPTH      0x0D36
-#define GL_MAX_PROJECTION_STACK_DEPTH     0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH        0x0D39
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_VERTEX_ARRAY_SIZE              0x807A
-#define GL_VERTEX_ARRAY_TYPE              0x807B
-#define GL_VERTEX_ARRAY_STRIDE            0x807C
-#define GL_NORMAL_ARRAY_TYPE              0x807E
-#define GL_NORMAL_ARRAY_STRIDE            0x807F
-#define GL_COLOR_ARRAY_SIZE               0x8081
-#define GL_COLOR_ARRAY_TYPE               0x8082
-#define GL_COLOR_ARRAY_STRIDE             0x8083
-#define GL_TEXTURE_COORD_ARRAY_SIZE       0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE       0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE     0x808A
-#define GL_VERTEX_ARRAY_POINTER           0x808E
-#define GL_NORMAL_ARRAY_POINTER           0x808F
-#define GL_COLOR_ARRAY_POINTER            0x8090
-#define GL_TEXTURE_COORD_ARRAY_POINTER    0x8092
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_PERSPECTIVE_CORRECTION_HINT    0x0C50
-#define GL_POINT_SMOOTH_HINT              0x0C51
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_FOG_HINT                       0x0C54
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-
-/* LightModelParameter */
-#define GL_LIGHT_MODEL_AMBIENT            0x0B53
-#define GL_LIGHT_MODEL_TWO_SIDE           0x0B52
-
-/* LightParameter */
-#define GL_AMBIENT                        0x1200
-#define GL_DIFFUSE                        0x1201
-#define GL_SPECULAR                       0x1202
-#define GL_POSITION                       0x1203
-#define GL_SPOT_DIRECTION                 0x1204
-#define GL_SPOT_EXPONENT                  0x1205
-#define GL_SPOT_CUTOFF                    0x1206
-#define GL_CONSTANT_ATTENUATION           0x1207
-#define GL_LINEAR_ATTENUATION             0x1208
-#define GL_QUADRATIC_ATTENUATION          0x1209
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-
-/* MaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* MaterialParameter */
-#define GL_EMISSION                       0x1600
-#define GL_SHININESS                      0x1601
-#define GL_AMBIENT_AND_DIFFUSE            0x1602
-/*      GL_AMBIENT */
-/*      GL_DIFFUSE */
-/*      GL_SPECULAR */
-
-/* MatrixMode */
-#define GL_MODELVIEW                      0x1700
-#define GL_PROJECTION                     0x1701
-#define GL_TEXTURE                        0x1702
-
-/* NormalPointerType */
-/*      GL_BYTE */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* PixelFormat */
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelStoreParameter */
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* ShadingModel */
-#define GL_FLAT                           0x1D00
-#define GL_SMOOTH                         0x1D01
-
-/* StencilFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/*      GL_INVERT */
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TexCoordPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* TextureEnvMode */
-#define GL_MODULATE                       0x2100
-#define GL_DECAL                          0x2101
-/*      GL_BLEND */
-#define GL_ADD                            0x0104
-/*      GL_REPLACE */
-
-/* TextureEnvParameter */
-#define GL_TEXTURE_ENV_MODE               0x2200
-#define GL_TEXTURE_ENV_COLOR              0x2201
-
-/* TextureEnvTarget */
-#define GL_TEXTURE_ENV                    0x2300
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-#define GL_GENERATE_MIPMAP                0x8191
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-
-/* TextureUnit */
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-
-/* VertexPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* LightName */
-#define GL_LIGHT0                         0x4000
-#define GL_LIGHT1                         0x4001
-#define GL_LIGHT2                         0x4002
-#define GL_LIGHT3                         0x4003
-#define GL_LIGHT4                         0x4004
-#define GL_LIGHT5                         0x4005
-#define GL_LIGHT6                         0x4006
-#define GL_LIGHT7                         0x4007
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-
-#define GL_ARRAY_BUFFER_BINDING               0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING       0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING        0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING        0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING         0x8898
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-
-/* Texture combine + dot3 */
-#define GL_SUBTRACT                       0x84E7
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-
-#define GL_ALPHA_SCALE                    0x0D1C
-
-#define GL_SRC0_RGB                       0x8580
-#define GL_SRC1_RGB                       0x8581
-#define GL_SRC2_RGB                       0x8582
-#define GL_SRC0_ALPHA                     0x8588
-#define GL_SRC1_ALPHA                     0x8589
-#define GL_SRC2_ALPHA                     0x858A
-
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-
-/*------------------------------------------------------------------------*
- * required OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES                   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES                 0x8B9B
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-/* OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
-#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
-#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
-#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
-#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
-#endif
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_POINT_SPRITE_OES                                     0x8861
-#define GL_COORD_REPLACE_OES                                    0x8862
-#endif
-
-/*************************************************************/
-
-/* Available only in Common profile */
-    GL_API void GL_APIENTRY glAlphaFunc(GLenum func, GLclampf ref);
-    GL_API void GL_APIENTRY glClearColor(GLclampf red, GLclampf green,
-                                         GLclampf blue, GLclampf alpha);
-    GL_API void GL_APIENTRY glClearDepthf(GLclampf depth);
-    GL_API void GL_APIENTRY glClipPlanef(GLenum plane,
-                                         const GLfloat * equation);
-    GL_API void GL_APIENTRY glColor4f(GLfloat red, GLfloat green,
-                                      GLfloat blue, GLfloat alpha);
-    GL_API void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar);
-    GL_API void GL_APIENTRY glFogf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glFogfv(GLenum pname, const GLfloat * params);
-    GL_API void GL_APIENTRY glFrustumf(GLfloat left, GLfloat right,
-                                       GLfloat bottom, GLfloat top,
-                                       GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glGetClipPlanef(GLenum pname, GLfloat eqn[4]);
-    GL_API void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat * params);
-    GL_API void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname,
-                                         GLfloat * params);
-    GL_API void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname,
-                                            GLfloat * params);
-    GL_API void GL_APIENTRY glGetTexEnvfv(GLenum env, GLenum pname,
-                                          GLfloat * params);
-    GL_API void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname,
-                                                GLfloat * params);
-    GL_API void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glLightModelfv(GLenum pname,
-                                           const GLfloat * params);
-    GL_API void GL_APIENTRY glLightf(GLenum light, GLenum pname,
-                                     GLfloat param);
-    GL_API void GL_APIENTRY glLightfv(GLenum light, GLenum pname,
-                                      const GLfloat * params);
-    GL_API void GL_APIENTRY glLineWidth(GLfloat width);
-    GL_API void GL_APIENTRY glLoadMatrixf(const GLfloat * m);
-    GL_API void GL_APIENTRY glMaterialf(GLenum face, GLenum pname,
-                                        GLfloat param);
-    GL_API void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname,
-                                         const GLfloat * params);
-    GL_API void GL_APIENTRY glMultMatrixf(const GLfloat * m);
-    GL_API void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s,
-                                              GLfloat t, GLfloat r,
-                                              GLfloat q);
-    GL_API void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz);
-    GL_API void GL_APIENTRY glOrthof(GLfloat left, GLfloat right,
-                                     GLfloat bottom, GLfloat top,
-                                     GLfloat zNear, GLfloat zFar);
-    GL_API void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param);
-    GL_API void GL_APIENTRY glPointParameterfv(GLenum pname,
-                                               const GLfloat * params);
-    GL_API void GL_APIENTRY glPointSize(GLfloat size);
-    GL_API void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units);
-    GL_API void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y,
-                                      GLfloat z);
-    GL_API void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z);
-    GL_API void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname,
-                                      GLfloat param);
-    GL_API void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname,
-                                       const GLfloat * params);
-    GL_API void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname,
-                                            GLfloat param);
-    GL_API void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname,
-                                             const GLfloat * params);
-    GL_API void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z);
-
-/* Available in both Common and Common-Lite profiles */
-    GL_API void GL_APIENTRY glActiveTexture(GLenum texture);
-    GL_API void GL_APIENTRY glAlphaFuncx(GLenum func, GLclampx ref);
-    GL_API void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer);
-    GL_API void GL_APIENTRY glBindTexture(GLenum target, GLuint texture);
-    GL_API void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor);
-    GL_API void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size,
-                                         const GLvoid * data, GLenum usage);
-    GL_API void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset,
-                                            GLsizeiptr size,
-                                            const GLvoid * data);
-    GL_API void GL_APIENTRY glClear(GLbitfield mask);
-    GL_API void GL_APIENTRY glClearColorx(GLclampx red, GLclampx green,
-                                          GLclampx blue, GLclampx alpha);
-    GL_API void GL_APIENTRY glClearDepthx(GLclampx depth);
-    GL_API void GL_APIENTRY glClearStencil(GLint s);
-    GL_API void GL_APIENTRY glClientActiveTexture(GLenum texture);
-    GL_API void GL_APIENTRY glClipPlanex(GLenum plane,
-                                         const GLfixed * equation);
-    GL_API void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green,
-                                       GLubyte blue, GLubyte alpha);
-    GL_API void GL_APIENTRY glColor4x(GLfixed red, GLfixed green,
-                                      GLfixed blue, GLfixed alpha);
-    GL_API void GL_APIENTRY glColorMask(GLboolean red, GLboolean green,
-                                        GLboolean blue, GLboolean alpha);
-    GL_API void GL_APIENTRY glColorPointer(GLint size, GLenum type,
-                                           GLsizei stride,
-                                           const GLvoid * pointer);
-    GL_API void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level,
-                                                   GLenum internalformat,
-                                                   GLsizei width,
-                                                   GLsizei height,
-                                                   GLint border,
-                                                   GLsizei imageSize,
-                                                   const GLvoid * data);
-    GL_API void GL_APIENTRY glCompressedTexSubImage2D(GLenum target,
-                                                      GLint level,
-                                                      GLint xoffset,
-                                                      GLint yoffset,
-                                                      GLsizei width,
-                                                      GLsizei height,
-                                                      GLenum format,
-                                                      GLsizei imageSize,
-                                                      const GLvoid * data);
-    GL_API void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level,
-                                             GLenum internalformat, GLint x,
-                                             GLint y, GLsizei width,
-                                             GLsizei height, GLint border);
-    GL_API void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level,
-                                                GLint xoffset, GLint yoffset,
-                                                GLint x, GLint y,
-                                                GLsizei width,
-                                                GLsizei height);
-    GL_API void GL_APIENTRY glCullFace(GLenum mode);
-    GL_API void GL_APIENTRY glDeleteBuffers(GLsizei n,
-                                            const GLuint * buffers);
-    GL_API void GL_APIENTRY glDeleteTextures(GLsizei n,
-                                             const GLuint * textures);
-    GL_API void GL_APIENTRY glDepthFunc(GLenum func);
-    GL_API void GL_APIENTRY glDepthMask(GLboolean flag);
-    GL_API void GL_APIENTRY glDepthRangex(GLclampx zNear, GLclampx zFar);
-    GL_API void GL_APIENTRY glDisable(GLenum cap);
-    GL_API void GL_APIENTRY glDisableClientState(GLenum array);
-    GL_API void GL_APIENTRY glDrawArrays(GLenum mode, GLint first,
-                                         GLsizei count);
-    GL_API void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count,
-                                           GLenum type,
-                                           const GLvoid * indices);
-    GL_API void GL_APIENTRY glEnable(GLenum cap);
-    GL_API void GL_APIENTRY glEnableClientState(GLenum array);
-    GL_API void GL_APIENTRY glFinish(void);
-    GL_API void GL_APIENTRY glFlush(void);
-    GL_API void GL_APIENTRY glFogx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glFogxv(GLenum pname, const GLfixed * params);
-    GL_API void GL_APIENTRY glFrontFace(GLenum mode);
-    GL_API void GL_APIENTRY glFrustumx(GLfixed left, GLfixed right,
-                                       GLfixed bottom, GLfixed top,
-                                       GLfixed zNear, GLfixed zFar);
-    GL_API void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean * params);
-    GL_API void GL_APIENTRY glGetBufferParameteriv(GLenum target,
-                                                   GLenum pname,
-                                                   GLint * params);
-    GL_API void GL_APIENTRY glGetClipPlanex(GLenum pname, GLfixed eqn[4]);
-    GL_API void GL_APIENTRY glGenBuffers(GLsizei n, GLuint * buffers);
-    GL_API void GL_APIENTRY glGenTextures(GLsizei n, GLuint * textures);
-    GL_API GLenum GL_APIENTRY glGetError(void);
-    GL_API void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed * params);
-    GL_API void GL_APIENTRY glGetIntegerv(GLenum pname, GLint * params);
-    GL_API void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname,
-                                         GLfixed * params);
-    GL_API void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname,
-                                            GLfixed * params);
-    GL_API void GL_APIENTRY glGetPointerv(GLenum pname, void **params);
-    GL_API const GLubyte *GL_APIENTRY glGetString(GLenum name);
-    GL_API void GL_APIENTRY glGetTexEnviv(GLenum env, GLenum pname,
-                                          GLint * params);
-    GL_API void GL_APIENTRY glGetTexEnvxv(GLenum env, GLenum pname,
-                                          GLfixed * params);
-    GL_API void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname,
-                                                GLint * params);
-    GL_API void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname,
-                                                GLfixed * params);
-    GL_API void GL_APIENTRY glHint(GLenum target, GLenum mode);
-    GL_API GLboolean GL_APIENTRY glIsBuffer(GLuint buffer);
-    GL_API GLboolean GL_APIENTRY glIsEnabled(GLenum cap);
-    GL_API GLboolean GL_APIENTRY glIsTexture(GLuint texture);
-    GL_API void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glLightModelxv(GLenum pname,
-                                           const GLfixed * params);
-    GL_API void GL_APIENTRY glLightx(GLenum light, GLenum pname,
-                                     GLfixed param);
-    GL_API void GL_APIENTRY glLightxv(GLenum light, GLenum pname,
-                                      const GLfixed * params);
-    GL_API void GL_APIENTRY glLineWidthx(GLfixed width);
-    GL_API void GL_APIENTRY glLoadIdentity(void);
-    GL_API void GL_APIENTRY glLoadMatrixx(const GLfixed * m);
-    GL_API void GL_APIENTRY glLogicOp(GLenum opcode);
-    GL_API void GL_APIENTRY glMaterialx(GLenum face, GLenum pname,
-                                        GLfixed param);
-    GL_API void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname,
-                                         const GLfixed * params);
-    GL_API void GL_APIENTRY glMatrixMode(GLenum mode);
-    GL_API void GL_APIENTRY glMultMatrixx(const GLfixed * m);
-    GL_API void GL_APIENTRY glMultiTexCoord4x(GLenum target, GLfixed s,
-                                              GLfixed t, GLfixed r,
-                                              GLfixed q);
-    GL_API void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz);
-    GL_API void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride,
-                                            const GLvoid * pointer);
-    GL_API void GL_APIENTRY glOrthox(GLfixed left, GLfixed right,
-                                     GLfixed bottom, GLfixed top,
-                                     GLfixed zNear, GLfixed zFar);
-    GL_API void GL_APIENTRY glPixelStorei(GLenum pname, GLint param);
-    GL_API void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param);
-    GL_API void GL_APIENTRY glPointParameterxv(GLenum pname,
-                                               const GLfixed * params);
-    GL_API void GL_APIENTRY glPointSizex(GLfixed size);
-    GL_API void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units);
-    GL_API void GL_APIENTRY glPopMatrix(void);
-    GL_API void GL_APIENTRY glPushMatrix(void);
-    GL_API void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width,
-                                         GLsizei height, GLenum format,
-                                         GLenum type, GLvoid * pixels);
-    GL_API void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y,
-                                      GLfixed z);
-    GL_API void GL_APIENTRY glSampleCoverage(GLclampf value,
-                                             GLboolean invert);
-    GL_API void GL_APIENTRY glSampleCoveragex(GLclampx value,
-                                              GLboolean invert);
-    GL_API void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z);
-    GL_API void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width,
-                                      GLsizei height);
-    GL_API void GL_APIENTRY glShadeModel(GLenum mode);
-    GL_API void GL_APIENTRY glStencilFunc(GLenum func, GLint ref,
-                                          GLuint mask);
-    GL_API void GL_APIENTRY glStencilMask(GLuint mask);
-    GL_API void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail,
-                                        GLenum zpass);
-    GL_API void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type,
-                                              GLsizei stride,
-                                              const GLvoid * pointer);
-    GL_API void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname,
-                                      GLint param);
-    GL_API void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname,
-                                      GLfixed param);
-    GL_API void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname,
-                                       const GLint * params);
-    GL_API void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname,
-                                       const GLfixed * params);
-    GL_API void GL_APIENTRY glTexImage2D(GLenum target, GLint level,
-                                         GLint internalformat, GLsizei width,
-                                         GLsizei height, GLint border,
-                                         GLenum format, GLenum type,
-                                         const GLvoid * pixels);
-    GL_API void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname,
-                                            GLint param);
-    GL_API void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname,
-                                            GLfixed param);
-    GL_API void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname,
-                                             const GLint * params);
-    GL_API void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname,
-                                             const GLfixed * params);
-    GL_API void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level,
-                                            GLint xoffset, GLint yoffset,
-                                            GLsizei width, GLsizei height,
-                                            GLenum format, GLenum type,
-                                            const GLvoid * pixels);
-    GL_API void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z);
-    GL_API void GL_APIENTRY glVertexPointer(GLint size, GLenum type,
-                                            GLsizei stride,
-                                            const GLvoid * pointer);
-    GL_API void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width,
-                                       GLsizei height);
-
-/*------------------------------------------------------------------------*
- * Required OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-#endif
-
-/* GL_OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_OES_point_size_array 1
-    GL_API void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride,
-                                                  const GLvoid * pointer);
-#endif
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_OES_point_sprite 1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif                          /* __gles_h_ */
diff --git a/Externals/SDL/Include_1.3/SDL_pixels.h b/Externals/SDL/Include_1.3/SDL_pixels.h
deleted file mode 100644
index f4523fa8e6..0000000000
--- a/Externals/SDL/Include_1.3/SDL_pixels.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_pixels.h
- *
- * Header for the enumerated pixel format definitions
- */
-
-#ifndef _SDL_pixels_h
-#define _SDL_pixels_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Transparency definitions: These define alpha as the opacity of a surface */
-#define SDL_ALPHA_OPAQUE 255
-#define SDL_ALPHA_TRANSPARENT 0
-
-enum
-{                               /* Pixel type */
-    SDL_PIXELTYPE_UNKNOWN,
-    SDL_PIXELTYPE_INDEX1,
-    SDL_PIXELTYPE_INDEX4,
-    SDL_PIXELTYPE_INDEX8,
-    SDL_PIXELTYPE_PACKED8,
-    SDL_PIXELTYPE_PACKED16,
-    SDL_PIXELTYPE_PACKED32,
-    SDL_PIXELTYPE_ARRAYU8,
-    SDL_PIXELTYPE_ARRAYU16,
-    SDL_PIXELTYPE_ARRAYU32,
-    SDL_PIXELTYPE_ARRAYF16,
-    SDL_PIXELTYPE_ARRAYF32
-};
-
-enum
-{                               /* bitmap pixel order, high bit -> low bit */
-    SDL_BITMAPORDER_NONE,
-    SDL_BITMAPORDER_4321,
-    SDL_BITMAPORDER_1234
-};
-enum
-{                               /* packed component order, high bit -> low bit */
-    SDL_PACKEDORDER_NONE,
-    SDL_PACKEDORDER_XRGB,
-    SDL_PACKEDORDER_RGBX,
-    SDL_PACKEDORDER_ARGB,
-    SDL_PACKEDORDER_RGBA,
-    SDL_PACKEDORDER_XBGR,
-    SDL_PACKEDORDER_BGRX,
-    SDL_PACKEDORDER_ABGR,
-    SDL_PACKEDORDER_BGRA
-};
-enum
-{                               /* array component order, low byte -> high byte */
-    SDL_ARRAYORDER_NONE,
-    SDL_ARRAYORDER_RGB,
-    SDL_ARRAYORDER_RGBA,
-    SDL_ARRAYORDER_ARGB,
-    SDL_ARRAYORDER_BGR,
-    SDL_ARRAYORDER_BGRA,
-    SDL_ARRAYORDER_ABGR
-};
-
-enum
-{                               /* Packed component layout */
-    SDL_PACKEDLAYOUT_NONE,
-    SDL_PACKEDLAYOUT_332,
-    SDL_PACKEDLAYOUT_4444,
-    SDL_PACKEDLAYOUT_1555,
-    SDL_PACKEDLAYOUT_5551,
-    SDL_PACKEDLAYOUT_565,
-    SDL_PACKEDLAYOUT_8888,
-    SDL_PACKEDLAYOUT_2101010,
-    SDL_PACKEDLAYOUT_1010102
-};
-
-#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \
-    ((A) | ((B) << 8) | ((C) << 16) | ((D) << 24))
-
-#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
-    ((1 << 31) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
-     ((bits) << 8) | ((bytes) << 0))
-
-#define SDL_PIXELTYPE(X)	(((X) >> 24) & 0x0F)
-#define SDL_PIXELORDER(X)	(((X) >> 20) & 0x0F)
-#define SDL_PIXELLAYOUT(X)	(((X) >> 16) & 0x0F)
-#define SDL_BITSPERPIXEL(X)	(((X) >> 8) & 0xFF)
-#define SDL_BYTESPERPIXEL(X)	(((X) >> 0) & 0xFF)
-
-#define SDL_ISPIXELFORMAT_INDEXED(format)   \
-    ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \
-     (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \
-     (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8))
-
-#define SDL_ISPIXELFORMAT_FOURCC(format)    \
-    ((format) && !((format) & 0x80000000))
-
-enum
-{
-    SDL_PIXELFORMAT_UNKNOWN,
-    SDL_PIXELFORMAT_INDEX1LSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0,
-                               1, 0),
-    SDL_PIXELFORMAT_INDEX1MSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0,
-                               1, 0),
-    SDL_PIXELFORMAT_INDEX4LSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0,
-                               2, 0),
-    SDL_PIXELFORMAT_INDEX4MSB =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0,
-                               2, 0),
-    SDL_PIXELFORMAT_INDEX8 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
-    SDL_PIXELFORMAT_RGB332 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_332, 8, 1),
-    SDL_PIXELFORMAT_RGB444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_4444, 12, 2),
-    SDL_PIXELFORMAT_RGB555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_1555, 15, 2),
-    SDL_PIXELFORMAT_BGR555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
-                               SDL_PACKEDLAYOUT_1555, 15, 2),
-    SDL_PIXELFORMAT_ARGB4444 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_4444, 16, 2),
-    SDL_PIXELFORMAT_ARGB1555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_1555, 16, 2),
-    SDL_PIXELFORMAT_ABGR1555 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
-                               SDL_PACKEDLAYOUT_1555, 16, 2),
-    SDL_PIXELFORMAT_RGB565 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_565, 16, 2),
-    SDL_PIXELFORMAT_RGB24 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0,
-                               24, 3),
-    SDL_PIXELFORMAT_BGR24 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0,
-                               24, 3),
-    SDL_PIXELFORMAT_RGB888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_BGR888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR,
-                               SDL_PACKEDLAYOUT_8888, 24, 4),
-    SDL_PIXELFORMAT_ARGB8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_RGBA8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_ABGR8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_BGRA8888 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA,
-                               SDL_PACKEDLAYOUT_8888, 32, 4),
-    SDL_PIXELFORMAT_ARGB2101010 =
-        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
-                               SDL_PACKEDLAYOUT_2101010, 32, 4),
-
-    SDL_PIXELFORMAT_YV12 =      /* Planar mode: Y + V + U  (3 planes) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
-    SDL_PIXELFORMAT_IYUV =      /* Planar mode: Y + U + V  (3 planes) */
-        SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'),
-    SDL_PIXELFORMAT_YUY2 =      /* Packed mode: Y0+U0+Y1+V0 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
-    SDL_PIXELFORMAT_UYVY =      /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
-    SDL_PIXELFORMAT_YVYU =      /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
-        SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
-};
-
-typedef struct SDL_Color
-{
-    Uint8 r;
-    Uint8 g;
-    Uint8 b;
-    Uint8 unused;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette SDL_Palette;
-typedef int (*SDL_PaletteChangedFunc) (void *userdata, SDL_Palette * palette);
-
-typedef struct SDL_PaletteWatch
-{
-    SDL_PaletteChangedFunc callback;
-    void *userdata;
-    struct SDL_PaletteWatch *next;
-} SDL_PaletteWatch;
-
-struct SDL_Palette
-{
-    int ncolors;
-    SDL_Color *colors;
-
-    int refcount;
-    SDL_PaletteWatch *watch;
-};
-
-/* Everything in the pixel format structure is read-only */
-typedef struct SDL_PixelFormat
-{
-    SDL_Palette *palette;
-    Uint8 BitsPerPixel;
-    Uint8 BytesPerPixel;
-    Uint8 Rloss;
-    Uint8 Gloss;
-    Uint8 Bloss;
-    Uint8 Aloss;
-    Uint8 Rshift;
-    Uint8 Gshift;
-    Uint8 Bshift;
-    Uint8 Ashift;
-    Uint32 Rmask;
-    Uint32 Gmask;
-    Uint32 Bmask;
-    Uint32 Amask;
-} SDL_PixelFormat;
-
-/**
- * \fn SDL_bool SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, Uint32 * Rmask, Uint32 * Gmask, Uint32 * Bmask, Uint32 * Amask)
- *
- * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
- *
- * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
- *
- * \sa SDL_MasksToPixelFormatEnum()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format,
-                                                            int *bpp,
-                                                            Uint32 * Rmask,
-                                                            Uint32 * Gmask,
-                                                            Uint32 * Bmask,
-                                                            Uint32 * Amask);
-
-/**
- * \fn Uint32 SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
- *
- * \brief Convert a bpp and RGBA masks to an enumerated pixel format.
- *
- * \return The pixel format, or SDL_PixelFormat_Unknown if the conversion wasn't possible.
- *
- * \sa SDL_PixelFormatEnumToMasks()
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp,
-                                                          Uint32 Rmask,
-                                                          Uint32 Gmask,
-                                                          Uint32 Bmask,
-                                                          Uint32 Amask);
-
-/**
- * \fn SDL_Palette *SDL_AllocPalette(int ncolors)
- *
- * \brief Create a palette structure with the specified number of color entries.
- *
- * \return A new palette, or NULL if there wasn't enough memory
- *
- * \note The palette entries are initialized to white.
- *
- * \sa SDL_FreePalette()
- */
-extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
-
-/**
- * \fn int SDL_AddPaletteWatch(SDL_Palette *palette, SDL_PaletteChangedFunc callback, void *userdata)
- *
- * \brief Add a callback function which is called when the palette changes.
- *
- * \sa SDL_DelPaletteWatch()
- */
-extern DECLSPEC int SDLCALL SDL_AddPaletteWatch(SDL_Palette * palette,
-                                                SDL_PaletteChangedFunc
-                                                callback, void *userdata);
-
-/**
- * \fn void SDL_DelPaletteWatch(SDL_Palette *palette, SDL_PaletteChangedFunc callback, void *userdata)
- *
- * \brief Remove a callback function previously added with SDL_AddPaletteWatch()
- *
- * \sa SDL_AddPaletteWatch()
- */
-extern DECLSPEC void SDLCALL SDL_DelPaletteWatch(SDL_Palette * palette,
-                                                 SDL_PaletteChangedFunc
-                                                 callback, void *userdata);
-
-/**
- * \fn int SDL_SetPaletteColors(SDL_Palette *palette, const SDL_Colors *colors, int firstcolor, int numcolors)
- *
- * \brief Set a range of colors in a palette.
- *
- * \param palette The palette to modify
- * \param colors An array of colors to copy into the palette
- * \param firstcolor The index of the first palette entry to modify
- * \param ncolors The number of entries to modify
- *
- * \return 0 on success, or -1 if not all of the colors could be set
- */
-extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette,
-                                                 const SDL_Color * colors,
-                                                 int firstcolor, int ncolors);
-
-/**
- * \fn void SDL_FreePalette(SDL_Palette *palette)
- *
- * \brief Free a palette created with SDL_AllocPalette()
- *
- * \sa SDL_AllocPalette()
- */
-extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette);
-
-/**
- * \fn Uint32 SDL_MapRGB(const SDL_PixelFormat *format,
- *                       Uint8 r, Uint8 g, Uint8 b)
- *
- * \brief Maps an RGB triple to an opaque pixel value for a given pixel format
- *
- * \sa SDL_MapRGBA
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format,
-                                          Uint8 r, Uint8 g, Uint8 b);
-
-/**
- * \fn Uint32 SDL_MapRGBA(const SDL_PixelFormat *fmt,
- *                        Uint8 r, Uint8 g, Uint8 b, Uint8 a)
- *
- * \brief Maps an RGBA quadruple to a pixel value for a given pixel format
- *
- * \sa SDL_MapRGB
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format,
-                                           Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-
-/**
- * \fn void SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format,
- *                     Uint8 * r, Uint8 * g, Uint8 * b)
- *
- * \brief Maps a pixel value into the RGB components for a given pixel format
- *
- * \sa SDL_GetRGBA
- */
-extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
-                                        const SDL_PixelFormat * format,
-                                        Uint8 * r, Uint8 * g, Uint8 * b);
-
-/**
- * \fn void SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format,
- *                      Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a)
- *
- * \brief Maps a pixel value into the RGBA components for a given pixel format
- *
- * \sa SDL_GetRGB
- */
-extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
-                                         const SDL_PixelFormat * format,
-                                         Uint8 * r, Uint8 * g, Uint8 * b,
-                                         Uint8 * a);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_pixels_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_platform.h b/Externals/SDL/Include_1.3/SDL_platform.h
deleted file mode 100644
index cc2e67fa49..0000000000
--- a/Externals/SDL/Include_1.3/SDL_platform.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* Try to get a standard set of platform defines */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__		1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__	1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__	1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__	1
-#endif
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__	1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__	1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__	1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__	1
-#endif
-
-#if defined(__APPLE__)
-/* lets us know what version of Mac OS X we're compiling on */
-#include "AvailabilityMacros.h"
-#ifdef MAC_OS_X_VERSION_10_3
-#include "TargetConditionals.h" /* this header is in 10.3 or later */
-#if TARGET_OS_IPHONE
-/* if compiling for iPhone */
-#undef __IPHONEOS__
-#define __IPHONEOS__ 1
-#undef __MACOSX__
-#else
-/* if not compiling for iPhone */
-#undef __MACOSX__
-#define __MACOSX__	1
-#endif /* TARGET_OS_IPHONE */
-#else
-/* if earlier verion of Mac OS X than version 10.3 */
-#undef __MACOSX__
-#define __MACOSX__	1
-#endif
-
-#endif /* defined(__APPLE__) */
-
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__	1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__	1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__		1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__		1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__	1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__	1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__	1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__	1
-#endif
-
-#if defined(__NDS__)
-#undef __NINTENDODS__
-#define __NINTENDODS__	1
-#endif
-
-#endif /* _SDL_platform_h */
diff --git a/Externals/SDL/Include_1.3/SDL_quit.h b/Externals/SDL/Include_1.3/SDL_quit.h
deleted file mode 100644
index bcf6e3c457..0000000000
--- a/Externals/SDL/Include_1.3/SDL_quit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_quit.h
- *
- * Include file for SDL quit event handling
- */
-
-#ifndef _SDL_quit_h
-#define _SDL_quit_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* 
-  An SDL_QUITEVENT is generated when the user tries to close the application
-  window.  If it is ignored or filtered out, the window will remain open.
-  If it is not ignored or filtered, it is queued normally and the window
-  is allowed to close.  When the window is closed, screen updates will 
-  complete, but have no effect.
-
-  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
-  and SIGTERM (system termination request), if handlers do not already
-  exist, that generate SDL_QUITEVENT events as well.  There is no way
-  to determine the cause of an SDL_QUITEVENT, but setting a signal
-  handler in your application will override the default generation of
-  quit events for that signal.
-*/
-
-/* There are no functions directly affecting the quit event */
-#define SDL_QuitRequested() \
-        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUITMASK))
-
-#endif /* _SDL_quit_h */
diff --git a/Externals/SDL/Include_1.3/SDL_rect.h b/Externals/SDL/Include_1.3/SDL_rect.h
deleted file mode 100644
index c3394468e0..0000000000
--- a/Externals/SDL/Include_1.3/SDL_rect.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_rect.h
- *
- * Header file for SDL_rect definition and management functions
- */
-
-#ifndef _SDL_rect_h
-#define _SDL_rect_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_pixels.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \struct SDL_Rect
- *
- * \brief A rectangle, with the origin at the upper left.
- *
- * \sa SDL_RectEmpty
- * \sa SDL_RectEquals
- * \sa SDL_HasIntersection
- * \sa SDL_IntersectRect
- * \sa SDL_UnionRect
- */
-typedef struct SDL_Rect
-{
-    int x, y;
-    int w, h;
-} SDL_Rect;
-
-/**
- * \def SDL_RectEmpty()
- *
- * \brief Returns true if the rectangle has no area.
- */
-#define SDL_RectEmpty(X)    (((X)->w <= 0) || ((X)->h <= 0))
-
-/**
- * \def SDL_RectEquals()
- *
- * \brief Returns true if the two rectangles are equal.
- */
-#define SDL_RectEquals(A, B)   (((A)->x == (B)->x) && ((A)->y == (B)->y) && \
-                                ((A)->w == (B)->w) && ((A)->h == (B)->h))
-
-/**
- * \fn SDL_bool SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B);
- *
- * \brief Determine whether two rectangles intersect.
- *
- * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A,
-                                                     const SDL_Rect * B);
-
-/**
- * \fn SDL_bool SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
- *
- * \brief Calculate the intersection of two rectangles.
- *
- * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A,
-                                                   const SDL_Rect * B,
-                                                   SDL_Rect * result);
-
-/**
- * \fn void SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
- *
- * \brief Calculate the union of two rectangles
- */
-extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A,
-                                           const SDL_Rect * B,
-                                           SDL_Rect * result);
-
-/**
- * \fn SDL_bool SDL_IntersectRectAndLine(const SDL_Rect *rect, int *X1, int *Y1, int *X2, int *Y2)
- *
- * \brief Calculate the intersection of a rectangle and line segment.
- *
- * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
-                                                          rect, int *X1,
-                                                          int *Y1, int *X2,
-                                                          int *Y2);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rect_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_revision.h b/Externals/SDL/Include_1.3/SDL_revision.h
deleted file mode 100644
index a7851a2f4d..0000000000
--- a/Externals/SDL/Include_1.3/SDL_revision.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SDL_REVISION 4404
diff --git a/Externals/SDL/Include_1.3/SDL_rwops.h b/Externals/SDL/Include_1.3/SDL_rwops.h
deleted file mode 100644
index 957ce2edff..0000000000
--- a/Externals/SDL/Include_1.3/SDL_rwops.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_rwops.h
- *
- * This file provides a general interface for SDL to read and write
- * data sources.  It can easily be extended to files, memory, etc.
- */
-
-#ifndef _SDL_rwops_h
-#define _SDL_rwops_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* This is the read/write operation structure -- very basic */
-
-typedef struct SDL_RWops
-{
-    /* Seek to 'offset' relative to whence, one of stdio's whence values:
-       RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
-       Returns the final offset in the data source.
-     */
-    long (SDLCALL * seek) (struct SDL_RWops * context, long offset,
-                           int whence);
-
-    /* Read up to 'num' objects each of size 'objsize' from the data
-       source to the area pointed at by 'ptr'.
-       Returns the number of objects read, or 0 at error or end of file.
-     */
-      size_t(SDLCALL * read) (struct SDL_RWops * context, void *ptr,
-                              size_t size, size_t maxnum);
-
-    /* Write exactly 'num' objects each of size 'objsize' from the area
-       pointed at by 'ptr' to data source.
-       Returns the number of objects written, or 0 at error or end of file.
-     */
-      size_t(SDLCALL * write) (struct SDL_RWops * context, const void *ptr,
-                               size_t size, size_t num);
-
-    /* Close and free an allocated SDL_RWops structure.
-       Returns 0 if successful or -1 on write error when flushing data.
-     */
-    int (SDLCALL * close) (struct SDL_RWops * context);
-
-    Uint32 type;
-    union
-    {
-#ifdef __WIN32__
-        struct
-        {
-            SDL_bool append;
-            void *h;
-            struct
-            {
-                void *data;
-                int size;
-                int left;
-            } buffer;
-        } win32io;
-#endif
-#ifdef HAVE_STDIO_H
-        struct
-        {
-            SDL_bool autoclose;
-            FILE *fp;
-        } stdio;
-#endif
-        struct
-        {
-            Uint8 *base;
-            Uint8 *here;
-            Uint8 *stop;
-        } mem;
-        struct
-        {
-            void *data1;
-        } unknown;
-    } hidden;
-
-} SDL_RWops;
-
-
-/* Functions to create SDL_RWops structures from various data sources */
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
-                                                  const char *mode);
-
-#ifdef HAVE_STDIO_H
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp,
-                                                SDL_bool autoclose);
-#endif
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
-extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
-                                                      int size);
-
-extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
-extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
-
-#define RW_SEEK_SET	0       /* Seek from the beginning of data */
-#define RW_SEEK_CUR	1       /* Seek relative to current read point */
-#define RW_SEEK_END	2       /* Seek relative to the end of data */
-
-/* Macros to easily read and write from an SDL_RWops structure */
-#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)		(ctx)->close(ctx)
-
-
-/* Read an item of the specified endianness and return in native format */
-extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
-
-/* Write an item of native format to the specified endianness */
-extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rwops_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_scancode.h b/Externals/SDL/Include_1.3/SDL_scancode.h
deleted file mode 100644
index 8cbfa08b93..0000000000
--- a/Externals/SDL/Include_1.3/SDL_scancode.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_scancode.h
- */
-
-#ifndef _SDL_scancode_h
-#define _SDL_scancode_h
-
-#include "SDL_stdinc.h"
-
-/**
- * \enum SDL_scancode
- *
- * \brief The SDL keyboard scancode representation.
- *
- * Values of this type are used to represent keyboard keys, among other places
- * in the \link SDL_keysym::scancode key.keysym.scancode \endlink field of the
- * SDL_Event structure.
- *
- * The values in this enumeration are based on the USB usage page standard:
- * http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
- */
-typedef enum
-{
-    SDL_SCANCODE_UNKNOWN = 0,
-
-    /* These values are from usage page 0x07 (USB keyboard page) */
-
-    SDL_SCANCODE_A = 4,
-    SDL_SCANCODE_B = 5,
-    SDL_SCANCODE_C = 6,
-    SDL_SCANCODE_D = 7,
-    SDL_SCANCODE_E = 8,
-    SDL_SCANCODE_F = 9,
-    SDL_SCANCODE_G = 10,
-    SDL_SCANCODE_H = 11,
-    SDL_SCANCODE_I = 12,
-    SDL_SCANCODE_J = 13,
-    SDL_SCANCODE_K = 14,
-    SDL_SCANCODE_L = 15,
-    SDL_SCANCODE_M = 16,
-    SDL_SCANCODE_N = 17,
-    SDL_SCANCODE_O = 18,
-    SDL_SCANCODE_P = 19,
-    SDL_SCANCODE_Q = 20,
-    SDL_SCANCODE_R = 21,
-    SDL_SCANCODE_S = 22,
-    SDL_SCANCODE_T = 23,
-    SDL_SCANCODE_U = 24,
-    SDL_SCANCODE_V = 25,
-    SDL_SCANCODE_W = 26,
-    SDL_SCANCODE_X = 27,
-    SDL_SCANCODE_Y = 28,
-    SDL_SCANCODE_Z = 29,
-
-    SDL_SCANCODE_1 = 30,
-    SDL_SCANCODE_2 = 31,
-    SDL_SCANCODE_3 = 32,
-    SDL_SCANCODE_4 = 33,
-    SDL_SCANCODE_5 = 34,
-    SDL_SCANCODE_6 = 35,
-    SDL_SCANCODE_7 = 36,
-    SDL_SCANCODE_8 = 37,
-    SDL_SCANCODE_9 = 38,
-    SDL_SCANCODE_0 = 39,
-
-    SDL_SCANCODE_RETURN = 40,
-    SDL_SCANCODE_ESCAPE = 41,
-    SDL_SCANCODE_BACKSPACE = 42,
-    SDL_SCANCODE_TAB = 43,
-    SDL_SCANCODE_SPACE = 44,
-
-    SDL_SCANCODE_MINUS = 45,
-    SDL_SCANCODE_EQUALS = 46,
-    SDL_SCANCODE_LEFTBRACKET = 47,
-    SDL_SCANCODE_RIGHTBRACKET = 48,
-    SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return key on ISO keyboards and at the right end of the QWERTY row on ANSI keyboards. Produces REVERSE SOLIDUS (backslash) and VERTICAL LINE in a US layout, REVERSE SOLIDUS and VERTICAL LINE in a UK Mac layout, NUMBER SIGN and TILDE in a UK Windows layout, DOLLAR SIGN and POUND SIGN in a Swiss German layout, NUMBER SIGN and APOSTROPHE in a German layout, GRAVE ACCENT and POUND SIGN in a French Mac layout, and ASTERISK and MICRO SIGN in a French Windows layout. */
-    SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code instead of 49 for the same key, but all OSes I've seen treat the two codes identically. So, as an implementor, unless your keyboard generates both of those codes and your OS treats them differently, you should generate SDL_SCANCODE_BACKSLASH instead of this code. As a user, you should not rely on this code because SDL will never generate it with most (all?) keyboards. */
-    SDL_SCANCODE_SEMICOLON = 51,
-    SDL_SCANCODE_APOSTROPHE = 52,
-    SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI and ISO keyboards). Produces GRAVE ACCENT and TILDE in a US Windows layout and in US and UK Mac layouts on ANSI keyboards, GRAVE ACCENT and NOT SIGN in a UK Windows layout, SECTION SIGN and PLUS-MINUS SIGN in US and UK Mac layouts on ISO keyboards, SECTION SIGN and DEGREE SIGN in a Swiss German layout (Mac: only on ISO keyboards), CIRCUMFLEX ACCENT and DEGREE SIGN in a German layout (Mac: only on ISO keyboards), SUPERSCRIPT TWO and TILDE in a French Windows layout, COMMERCIAL AT and NUMBER SIGN in a French Mac layout on ISO keyboards, and LESS-THAN SIGN and GREATER-THAN SIGN in a Swiss German, German, or French Mac layout on ANSI keyboards. */
-    SDL_SCANCODE_COMMA = 54,
-    SDL_SCANCODE_PERIOD = 55,
-    SDL_SCANCODE_SLASH = 56,
-
-    SDL_SCANCODE_CAPSLOCK = 57,
-
-    SDL_SCANCODE_F1 = 58,
-    SDL_SCANCODE_F2 = 59,
-    SDL_SCANCODE_F3 = 60,
-    SDL_SCANCODE_F4 = 61,
-    SDL_SCANCODE_F5 = 62,
-    SDL_SCANCODE_F6 = 63,
-    SDL_SCANCODE_F7 = 64,
-    SDL_SCANCODE_F8 = 65,
-    SDL_SCANCODE_F9 = 66,
-    SDL_SCANCODE_F10 = 67,
-    SDL_SCANCODE_F11 = 68,
-    SDL_SCANCODE_F12 = 69,
-
-    SDL_SCANCODE_PRINTSCREEN = 70,
-    SDL_SCANCODE_SCROLLLOCK = 71,
-    SDL_SCANCODE_PAUSE = 72,
-    SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but does send code 73, not 117) */
-    SDL_SCANCODE_HOME = 74,
-    SDL_SCANCODE_PAGEUP = 75,
-    SDL_SCANCODE_DELETE = 76,
-    SDL_SCANCODE_END = 77,
-    SDL_SCANCODE_PAGEDOWN = 78,
-    SDL_SCANCODE_RIGHT = 79,
-    SDL_SCANCODE_LEFT = 80,
-    SDL_SCANCODE_DOWN = 81,
-    SDL_SCANCODE_UP = 82,
-
-    SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards */
-    SDL_SCANCODE_KP_DIVIDE = 84,
-    SDL_SCANCODE_KP_MULTIPLY = 85,
-    SDL_SCANCODE_KP_MINUS = 86,
-    SDL_SCANCODE_KP_PLUS = 87,
-    SDL_SCANCODE_KP_ENTER = 88,
-    SDL_SCANCODE_KP_1 = 89,
-    SDL_SCANCODE_KP_2 = 90,
-    SDL_SCANCODE_KP_3 = 91,
-    SDL_SCANCODE_KP_4 = 92,
-    SDL_SCANCODE_KP_5 = 93,
-    SDL_SCANCODE_KP_6 = 94,
-    SDL_SCANCODE_KP_7 = 95,
-    SDL_SCANCODE_KP_8 = 96,
-    SDL_SCANCODE_KP_9 = 97,
-    SDL_SCANCODE_KP_0 = 98,
-    SDL_SCANCODE_KP_PERIOD = 99,
-
-    SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO keyboards have over ANSI ones, located between left shift and Y. Produces GRAVE ACCENT and TILDE in a US or UK Mac layout, REVERSE SOLIDUS (backslash) and VERTICAL LINE in a US or UK Windows layout, and LESS-THAN SIGN and GREATER-THAN SIGN in a Swiss German, German, or French layout. */
-    SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */
-    SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag, not a physical key - but some Mac keyboards do have a power key. */
-    SDL_SCANCODE_KP_EQUALS = 103,
-    SDL_SCANCODE_F13 = 104,
-    SDL_SCANCODE_F14 = 105,
-    SDL_SCANCODE_F15 = 106,
-    SDL_SCANCODE_F16 = 107,
-    SDL_SCANCODE_F17 = 108,
-    SDL_SCANCODE_F18 = 109,
-    SDL_SCANCODE_F19 = 110,
-    SDL_SCANCODE_F20 = 111,
-    SDL_SCANCODE_F21 = 112,
-    SDL_SCANCODE_F22 = 113,
-    SDL_SCANCODE_F23 = 114,
-    SDL_SCANCODE_F24 = 115,
-    SDL_SCANCODE_EXECUTE = 116,
-    SDL_SCANCODE_HELP = 117,
-    SDL_SCANCODE_MENU = 118,
-    SDL_SCANCODE_SELECT = 119,
-    SDL_SCANCODE_STOP = 120,
-    SDL_SCANCODE_AGAIN = 121,   /*!< redo */
-    SDL_SCANCODE_UNDO = 122,
-    SDL_SCANCODE_CUT = 123,
-    SDL_SCANCODE_COPY = 124,
-    SDL_SCANCODE_PASTE = 125,
-    SDL_SCANCODE_FIND = 126,
-    SDL_SCANCODE_MUTE = 127,
-    SDL_SCANCODE_VOLUMEUP = 128,
-    SDL_SCANCODE_VOLUMEDOWN = 129,
-/* not sure whether there's a reason to enable these */
-/*     SDL_SCANCODE_LOCKINGCAPSLOCK = 130,  */
-/*     SDL_SCANCODE_LOCKINGNUMLOCK = 131, */
-/*     SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */
-    SDL_SCANCODE_KP_COMMA = 133,
-    SDL_SCANCODE_KP_EQUALSAS400 = 134,
-
-    SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see footnotes in USB doc */
-    SDL_SCANCODE_INTERNATIONAL2 = 136,
-    SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */
-    SDL_SCANCODE_INTERNATIONAL4 = 138,
-    SDL_SCANCODE_INTERNATIONAL5 = 139,
-    SDL_SCANCODE_INTERNATIONAL6 = 140,
-    SDL_SCANCODE_INTERNATIONAL7 = 141,
-    SDL_SCANCODE_INTERNATIONAL8 = 142,
-    SDL_SCANCODE_INTERNATIONAL9 = 143,
-    SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */
-    SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */
-    SDL_SCANCODE_LANG3 = 146, /**< Katakana */
-    SDL_SCANCODE_LANG4 = 147, /**< Hiragana */
-    SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */
-    SDL_SCANCODE_LANG6 = 149, /**< reserved */
-    SDL_SCANCODE_LANG7 = 150, /**< reserved */
-    SDL_SCANCODE_LANG8 = 151, /**< reserved */
-    SDL_SCANCODE_LANG9 = 152, /**< reserved */
-
-    SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */
-    SDL_SCANCODE_SYSREQ = 154,
-    SDL_SCANCODE_CANCEL = 155,
-    SDL_SCANCODE_CLEAR = 156,
-    SDL_SCANCODE_PRIOR = 157,
-    SDL_SCANCODE_RETURN2 = 158,
-    SDL_SCANCODE_SEPARATOR = 159,
-    SDL_SCANCODE_OUT = 160,
-    SDL_SCANCODE_OPER = 161,
-    SDL_SCANCODE_CLEARAGAIN = 162,
-    SDL_SCANCODE_CRSEL = 163,
-    SDL_SCANCODE_EXSEL = 164,
-
-    SDL_SCANCODE_KP_00 = 176,
-    SDL_SCANCODE_KP_000 = 177,
-    SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
-    SDL_SCANCODE_DECIMALSEPARATOR = 179,
-    SDL_SCANCODE_CURRENCYUNIT = 180,
-    SDL_SCANCODE_CURRENCYSUBUNIT = 181,
-    SDL_SCANCODE_KP_LEFTPAREN = 182,
-    SDL_SCANCODE_KP_RIGHTPAREN = 183,
-    SDL_SCANCODE_KP_LEFTBRACE = 184,
-    SDL_SCANCODE_KP_RIGHTBRACE = 185,
-    SDL_SCANCODE_KP_TAB = 186,
-    SDL_SCANCODE_KP_BACKSPACE = 187,
-    SDL_SCANCODE_KP_A = 188,
-    SDL_SCANCODE_KP_B = 189,
-    SDL_SCANCODE_KP_C = 190,
-    SDL_SCANCODE_KP_D = 191,
-    SDL_SCANCODE_KP_E = 192,
-    SDL_SCANCODE_KP_F = 193,
-    SDL_SCANCODE_KP_XOR = 194,
-    SDL_SCANCODE_KP_POWER = 195,
-    SDL_SCANCODE_KP_PERCENT = 196,
-    SDL_SCANCODE_KP_LESS = 197,
-    SDL_SCANCODE_KP_GREATER = 198,
-    SDL_SCANCODE_KP_AMPERSAND = 199,
-    SDL_SCANCODE_KP_DBLAMPERSAND = 200,
-    SDL_SCANCODE_KP_VERTICALBAR = 201,
-    SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
-    SDL_SCANCODE_KP_COLON = 203,
-    SDL_SCANCODE_KP_HASH = 204,
-    SDL_SCANCODE_KP_SPACE = 205,
-    SDL_SCANCODE_KP_AT = 206,
-    SDL_SCANCODE_KP_EXCLAM = 207,
-    SDL_SCANCODE_KP_MEMSTORE = 208,
-    SDL_SCANCODE_KP_MEMRECALL = 209,
-    SDL_SCANCODE_KP_MEMCLEAR = 210,
-    SDL_SCANCODE_KP_MEMADD = 211,
-    SDL_SCANCODE_KP_MEMSUBTRACT = 212,
-    SDL_SCANCODE_KP_MEMMULTIPLY = 213,
-    SDL_SCANCODE_KP_MEMDIVIDE = 214,
-    SDL_SCANCODE_KP_PLUSMINUS = 215,
-    SDL_SCANCODE_KP_CLEAR = 216,
-    SDL_SCANCODE_KP_CLEARENTRY = 217,
-    SDL_SCANCODE_KP_BINARY = 218,
-    SDL_SCANCODE_KP_OCTAL = 219,
-    SDL_SCANCODE_KP_DECIMAL = 220,
-    SDL_SCANCODE_KP_HEXADECIMAL = 221,
-
-    SDL_SCANCODE_LCTRL = 224,
-    SDL_SCANCODE_LSHIFT = 225,
-    SDL_SCANCODE_LALT = 226, /**< alt, option */
-    SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */
-    SDL_SCANCODE_RCTRL = 228,
-    SDL_SCANCODE_RSHIFT = 229,
-    SDL_SCANCODE_RALT = 230, /**< alt gr, option */
-    SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */
-
-    SDL_SCANCODE_MODE = 257,    /* I'm not sure if this is really not covered by any of the above, but since there's a special KMOD_MODE for it I'm adding it here */
-
-    /* These values are mapped from usage page 0x0C (USB consumer page) */
-
-    SDL_SCANCODE_AUDIONEXT = 258,
-    SDL_SCANCODE_AUDIOPREV = 259,
-    SDL_SCANCODE_AUDIOSTOP = 260,
-    SDL_SCANCODE_AUDIOPLAY = 261,
-    SDL_SCANCODE_AUDIOMUTE = 262,
-    SDL_SCANCODE_MEDIASELECT = 263,
-    SDL_SCANCODE_WWW = 264,
-    SDL_SCANCODE_MAIL = 265,
-    SDL_SCANCODE_CALCULATOR = 266,
-    SDL_SCANCODE_COMPUTER = 267,
-    SDL_SCANCODE_AC_SEARCH = 268,
-    SDL_SCANCODE_AC_HOME = 269,
-    SDL_SCANCODE_AC_BACK = 270,
-    SDL_SCANCODE_AC_FORWARD = 271,
-    SDL_SCANCODE_AC_STOP = 272,
-    SDL_SCANCODE_AC_REFRESH = 273,
-    SDL_SCANCODE_AC_BOOKMARKS = 274,
-
-    /* These are values that Christian Walther added (for mac keyboard?) */
-
-    SDL_SCANCODE_BRIGHTNESSDOWN = 275,
-    SDL_SCANCODE_BRIGHTNESSUP = 276,
-    SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display switch, video mode switch */
-    SDL_SCANCODE_KBDILLUMTOGGLE = 278,
-    SDL_SCANCODE_KBDILLUMDOWN = 279,
-    SDL_SCANCODE_KBDILLUMUP = 280,
-    SDL_SCANCODE_EJECT = 281,
-    SDL_SCANCODE_SLEEP = 282,
-
-    /* Add any other keys here */
-
-    SDL_NUM_SCANCODES = 512 /**< (not a key, just marks the number of scancodes for array bounds) */
-} SDL_scancode;
-
-#endif /* _SDL_scancode_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_stdinc.h b/Externals/SDL/Include_1.3/SDL_stdinc.h
deleted file mode 100644
index 1792759cc7..0000000000
--- a/Externals/SDL/Include_1.3/SDL_stdinc.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_stdinc.h
- *
- * This is a general header that includes C language support
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-#  include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-#  include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-#ifdef HAVE_ICONV_H
-# include <iconv.h>
-#endif
-
-/* The number of elements in an array */
-#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)	SDL_arraysize(table)
-
-/* Basic data types */
-typedef enum SDL_bool
-{
-    SDL_FALSE = 0,
-    SDL_TRUE = 1
-} SDL_bool;
-
-/**
- * \typedef Sint8
- * \brief A signed 8-bit integer type.
- */
-typedef int8_t Sint8;
-/**
- * \typedef Uint8
- * \brief An unsigned 8-bit integer type.
- */
-typedef uint8_t Uint8;
-/**
- * \typedef Sint16
- * \brief A signed 16-bit integer type.
- */
-typedef int16_t Sint16;
-/**
- * \typedef Uint16
- * \brief An unsigned 16-bit integer type.
- */
-typedef uint16_t Uint16;
-/**
- * \typedef Sint32
- * \brief A signed 32-bit integer type.
- */
-typedef int32_t Sint32;
-/**
- * \typedef Uint32
- * \brief An unsigned 32-bit integer type.
- */
-typedef uint32_t Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-/**
- * \typedef Sint64
- * \brief A signed 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Sint32!
- */
-typedef int64_t Sint64;
-/**
- * \typedef Uint64
- * \brief An unsigned 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Uint32!
- */
-typedef uint64_t Uint64;
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef Sint32 Sint64;
-typedef Uint32 Uint64;
-#endif
-
-/* Make sure the types really have the right sizes */
-#define SDL_COMPILE_TIME_ASSERT(name, x)               \
-       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-#ifndef __NINTENDODS__          /* TODO: figure out why the following happens:
-                                   include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
-                                   include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-
-/* Check to make sure enums are the size of ints, for structure packing.
-   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
-   enums having the size of an int must be enabled.
-   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
-*/
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#ifndef __NINTENDODS__          /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
-typedef enum
-{
-    DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc	malloc
-#else
-extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc	calloc
-#else
-extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc	realloc
-#else
-extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free	free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-#  include <alloca.h>
-# elif defined(__GNUC__)
-#  define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-#  include <malloc.h>
-#  define alloca _alloca
-# elif defined(__WATCOMC__)
-#  include <malloc.h>
-# elif defined(__BORLANDC__)
-#  include <malloc.h>
-# elif defined(__DMC__)
-#  include <stdlib.h>
-# elif defined(__AIX__)
-#pragma alloca
-# elif defined(__MRC__)
-void *alloca(unsigned);
-# else
-char *alloca();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data)            SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv	getenv
-#else
-extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
-#endif
-
-#ifdef HAVE_PUTENV
-#define SDL_putenv	putenv
-#else
-extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort	qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
-                                       int (*compare) (const void *,
-                                                       const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs		abs
-#else
-#define SDL_abs(X)	((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y)	(((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y)	(((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X)  isdigit(X)
-#define SDL_isspace(X)  isspace(X)
-#define SDL_toupper(X)  toupper(X)
-#define SDL_tolower(X)  tolower(X)
-#else
-#define SDL_isdigit(X)  (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X)  (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X)  (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X)  (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset      memset
-#else
-extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-#define SDL_zero(x)	SDL_memset(&(x), 0, sizeof((x)))
-#define SDL_zerop(x)	SDL_memset((x), 0, sizeof(*(x)))
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len)				\
-do {								\
-	int u0, u1, u2;						\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; stosl\n\t"				\
-		: "=&D" (u0), "=&a" (u1), "=&c" (u2)		\
-		: "0" (dst), "1" (val), "2" ((Uint32)(len))	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len)		\
-do {						\
-	unsigned _count = (len);		\
-	unsigned _n = (_count + 3) / 4;		\
-	Uint32 *_p = (Uint32 *)(dst);		\
-	Uint32 _val = (val);			\
-        switch (_count % 4) {			\
-        case 0: do {    *_p++ = _val;		\
-        case 3:         *_p++ = _val;		\
-        case 2:         *_p++ = _val;		\
-        case 1:         *_p++ = _val;		\
-		} while ( --_n );		\
-	}					\
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len)					  \
-do {									  \
-	int u0, u1, u2;						  	  \
-	__asm__ __volatile__ (						  \
-		"cld\n\t"						  \
-		"rep ; movsl\n\t"					  \
-		"testb $2,%b4\n\t"					  \
-		"je 1f\n\t"						  \
-		"movsw\n"						  \
-		"1:\ttestb $1,%b4\n\t"					  \
-		"je 2f\n\t"						  \
-		"movsb\n"						  \
-		"2:"							  \
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)			  \
-		: "0" ((unsigned)(len)/4), "q" (len), "1" (dst),"2" (src) \
-		: "memory" );						  \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy      memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n)	bcopy((s), (d), (n))
-#else
-extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src,
-                                         size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len)				\
-do {								\
-	int ecx, edi, esi;					\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; movsl"					\
-		: "=&c" (ecx), "=&D" (edi), "=&S" (esi)		\
-		: "0" ((unsigned)(len)), "1" (dst), "2" (src)	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len)			\
-do {							\
-	int u0, u1, u2;					\
-	char *dstp = (char *)(dst);			\
-	char *srcp = (char *)(src);			\
-	int n = (len);					\
-	if ( n >= 4 ) {					\
-	__asm__ __volatile__ (				\
-		"std\n\t"				\
-		"rep ; movsl\n\t"			\
-		"cld\n\t"				\
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)	\
-		: "0" (n >> 2),				\
-		  "1" (dstp+(n-4)), "2" (srcp+(n-4))	\
-		: "memory" );				\
-	}						\
-	switch (n & 3) {				\
-		case 3: dstp[2] = srcp[2];		\
-		case 2: dstp[1] = srcp[1];		\
-		case 1: dstp[0] = srcp[0];		\
-			break;				\
-		default:				\
-			break;				\
-	}						\
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void *SDLCALL SDL_revcpy(void *dst, const void *src,
-                                         size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove     memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n)	bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len)			\
-do {							\
-	if ( dst < src ) {				\
-		SDL_memcpy(dst, src, len);		\
-	} else {					\
-		SDL_revcpy(dst, src, len);		\
-	}						\
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp      memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2,
-                                       size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen      strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_WCSLEN
-#define SDL_wcslen      wcslen
-#else
-#if !defined(wchar_t) && defined(__NINTENDODS__)
-#define wchar_t short           /* TODO: figure out why libnds doesn't have this */
-#endif
-extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t * string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy     strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src,
-                                           size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat    strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src,
-                                           size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup     strdup
-#else
-extern DECLSPEC char *SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev      _strrev
-#else
-extern DECLSPEC char *SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr      _strupr
-#else
-extern DECLSPEC char *SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr      _strlwr
-#else
-extern DECLSPEC char *SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr      strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr      index
-#else
-extern DECLSPEC char *SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr     strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr     rindex
-#else
-extern DECLSPEC char *SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr      strstr
-#else
-extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack,
-                                         const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa        itoa
-#else
-#define SDL_itoa(value, string, radix)	SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa        _ltoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa       _uitoa
-#else
-#define SDL_uitoa(value, string, radix)	SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa       _ultoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *string,
-                                        int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol      strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp,
-                                        int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul      strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string,
-                                                  char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa       _i64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *string,
-                                        int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa      _ui64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *string,
-                                         int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll     strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp,
-                                           int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull     strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp,
-                                            int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod      strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi        atoi
-#else
-#define SDL_atoi(X)     SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof        atof
-#else
-#define SDL_atof(X)     SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp      strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp     strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2,
-                                        size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp  strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp  _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1,
-                                           const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1,
-                                            const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf      sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt,
-                                       ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf    snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen,
-                                         const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf   vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen,
-                                          const char *fmt, va_list ap);
-#endif
-
-#ifndef M_PI
-#define M_PI    3.14159265358979323846264338327950288   /* pi */
-#endif
-
-#ifdef HAVE_CEIL
-#define SDL_ceil        ceil
-#else
-#define SDL_ceil(x)     ((double)(int)((x)+0.5))
-#endif
-
-#ifdef HAVE_COPYSIGN
-#define SDL_copysign    copysign
-#else
-extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
-#endif
-
-#ifdef HAVE_COS
-#define SDL_cos         cos
-#else
-extern DECLSPEC double SDLCALL SDL_cos(double x);
-#endif
-
-#ifdef HAVE_COSF
-#define SDL_cosf        cosf
-#else
-#define SDL_cosf(x) (float)SDL_cos((double)x)
-#endif
-
-#ifdef HAVE_FABS
-#define SDL_fabs        fabs
-#else
-extern DECLSPEC double SDLCALL SDL_fabs(double x);
-#endif
-
-#ifdef HAVE_FLOOR
-#define SDL_floor       floor
-#else
-extern DECLSPEC double SDLCALL SDL_floor(double x);
-#endif
-
-#ifdef HAVE_LOG
-#define SDL_log         log
-#else
-extern DECLSPEC double SDLCALL SDL_log(double x);
-#endif
-
-#ifdef HAVE_POW
-#define SDL_pow         pow
-#else
-extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
-#endif
-
-#ifdef HAVE_SCALBN
-#define SDL_scalbn      scalbn
-#else
-extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
-#endif
-
-#ifdef HAVE_SIN
-#define SDL_sin         sin
-#else
-extern DECLSPEC double SDLCALL SDL_sin(double x);
-#endif
-
-#ifdef HAVE_SINF
-#define SDL_sinf        sinf
-#else
-#define SDL_sinf(x) (float)SDL_sin((double)x)
-#endif
-
-#ifdef HAVE_SQRT
-#define SDL_sqrt        sqrt
-#else
-extern DECLSPEC double SDLCALL SDL_sqrt(double x);
-#endif
-
-/* The SDL implementation of iconv() returns these error codes */
-#define SDL_ICONV_ERROR		(size_t)-1
-#define SDL_ICONV_E2BIG		(size_t)-2
-#define SDL_ICONV_EILSEQ	(size_t)-3
-#define SDL_ICONV_EINVAL	(size_t)-4
-
-#ifdef HAVE_ICONV
-#define SDL_iconv_t     iconv_t
-#define SDL_iconv_open  iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
-                                                   const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
-                                         size_t * inbytesleft, char **outbuf,
-                                         size_t * outbytesleft);
-/* This function converts a string between encodings in one pass, returning a
-   string that must be freed with SDL_free() or NULL on error.
-*/
-extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
-                                               const char *fromcode,
-                                               const char *inbuf,
-                                               size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_surface.h b/Externals/SDL/Include_1.3/SDL_surface.h
deleted file mode 100644
index 3a4abba939..0000000000
--- a/Externals/SDL/Include_1.3/SDL_surface.h
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_surface.h
- *
- * Header file for SDL_surface definition and management functions
- */
-
-#ifndef _SDL_surface_h
-#define _SDL_surface_h
-
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* These are the currently supported flags for the SDL_surface */
-/* Used internally (read-only) */
-#define SDL_PREALLOC        0x00000001  /* Surface uses preallocated memory */
-#define SDL_RLEACCEL        0x00000002  /* Surface is RLE encoded */
-
-/* Evaluates to true if the surface needs to be locked before access */
-#define SDL_MUSTLOCK(S)	(((S)->flags & SDL_RLEACCEL) != 0)
-
-/**
- * \struct SDL_Surface
- *
- * \brief A collection of pixels used in software blitting
- *
- * \note  This structure should be treated as read-only, except for 'pixels',
- *        which, if not NULL, contains the raw pixel data for the surface.
- */
-typedef struct SDL_Surface
-{
-    Uint32 flags;               /**< Read-only */
-    SDL_PixelFormat *format;    /**< Read-only */
-    int w, h;                   /**< Read-only */
-    int pitch;                  /**< Read-only */
-    void *pixels;               /**< Read-write */
-
-    /* Application data associated with the surfade */
-    void *userdata;             /**< Read-write */
-
-    /* information needed for surfaces requiring locks */
-    int locked;                 /**< Read-only */
-    void *lock_data;            /**< Read-only */
-
-    /* clipping information */
-    SDL_Rect clip_rect;         /**< Read-only */
-
-    /* info for fast blit mapping to other surfaces */
-    struct SDL_BlitMap *map;    /**< Private */
-
-    /* format version, bumped at every change to invalidate blit maps */
-    unsigned int format_version;        /**< Private */
-
-    /* Reference count -- used when freeing surface */
-    int refcount;               /**< Read-mostly */
-} SDL_Surface;
-
-/**
- * \typedef SDL_blit
- *
- * \brief The type of function used for surface blitting functions
- */
-typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
-                         struct SDL_Surface * dst, SDL_Rect * dstrect);
-
-/*
- * Allocate and free an RGB surface (must be called after SDL_SetVideoMode)
- * If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
- * If the depth is greater than 8 bits, the pixel format is set using the
- * flags '[RGB]mask'.
- * If the function runs out of memory, it will return NULL.
- *
- * The 'flags' are obsolete and should be set to 0.
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface
-    (Uint32 flags, int width, int height, int depth,
-     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
-                                                              int width,
-                                                              int height,
-                                                              int depth,
-                                                              int pitch,
-                                                              Uint32 Rmask,
-                                                              Uint32 Gmask,
-                                                              Uint32 Bmask,
-                                                              Uint32 Amask);
-extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface);
-
-/**
- * \fn int SDL_SetSurfacePalette(SDL_Surface *surface, SDL_Palette *palette)
- *
- * \brief Set the palette used by a surface.
- *
- * \return 0, or -1 if the surface format doesn't use a palette.
- *
- * \note A single palette can be shared with many surfaces.
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface,
-                                                  SDL_Palette * palette);
-
-/*
- * SDL_LockSurface() sets up a surface for directly accessing the pixels.
- * Between calls to SDL_LockSurface()/SDL_UnlockSurface(), you can write
- * to and read from 'surface->pixels', using the pixel format stored in 
- * 'surface->format'.  Once you are done accessing the surface, you should 
- * use SDL_UnlockSurface() to release it.
- *
- * Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
- * to 0, then you can read and write to the surface at any time, and the
- * pixel format of the surface will not change.
- * 
- * No operating system or library calls should be made between lock/unlock
- * pairs, as critical system locks may be held during this time.
- *
- * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
- */
-extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface);
-extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface);
-
-/*
- * Load a surface from a seekable SDL data source (memory or file.)
- * If 'freesrc' is non-zero, the source will be closed after being read.
- * Returns the new surface, or NULL if there was an error.
- * The new surface should be freed with SDL_FreeSurface().
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src,
-                                                    int freesrc);
-
-/* Convenience macro -- load a surface from a file */
-#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
-
-/*
- * Save a surface to a seekable SDL data source (memory or file.)
- * If 'freedst' is non-zero, the source will be closed after being written.
- * Returns 0 if successful or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
-    (SDL_Surface * surface, SDL_RWops * dst, int freedst);
-
-/* Convenience macro -- save a surface to a file */
-#define SDL_SaveBMP(surface, file) \
-		SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
-
-/*
- * \fn int SDL_SetSurfaceRLE(SDL_Surface *surface, int flag)
- *
- * \brief Sets the RLE acceleration hint for a surface.
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \note If RLE is enabled, colorkey and alpha blending blits are much faster,
- *       but the surface must be locked before directly accessing the pixels.
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
-                                              int flag);
-
-/*
- * \fn int SDL_SetColorKey(SDL_Surface *surface, Uint32 flag, Uint32 key)
- *
- * \brief Sets the color key (transparent pixel) in a blittable surface.
- *
- * \param surface The surface to update
- * \param flag Non-zero to enable colorkey and 0 to disable colorkey 
- * \param key The transparent pixel in the native surface format
- *
- * \return 0 on success, or -1 if the surface is not valid
- */
-extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
-                                            Uint32 flag, Uint32 key);
-
-/**
- * \fn int SDL_SetSurfaceColorMod(SDL_Surface *surface, Uint8 r, Uint8 g, Uint8 b)
- *
- * \brief Set an additional color value used in blit operations
- *
- * \param surface The surface to update
- * \param r The red source color value multiplied into blit operations
- * \param g The green source color value multiplied into blit operations
- * \param b The blue source color value multiplied into blit operations
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_GetSurfaceColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-
-
-/**
- * \fn int SDL_GetSurfaceColorMod(SDL_Surface *surface, Uint8 *r, Uint8 *g, Uint8 *b)
- *
- * \brief Get the additional color value used in blit operations
- *
- * \param surface The surface to query
- * \param r A pointer filled in with the source red color value
- * \param g A pointer filled in with the source green color value
- * \param b A pointer filled in with the source blue color value
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_SetSurfaceColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-
-/**
- * \fn int SDL_SetSurfaceAlphaMod(SDL_Surface *surface, Uint8 alpha)
- *
- * \brief Set an additional alpha value used in blit operations
- *
- * \param surface The surface to update
- * \param alpha The source alpha value multiplied into blit operations.
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_GetSurfaceAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 alpha);
-
-/**
- * \fn int SDL_GetSurfaceAlphaMod(SDL_Surface *surface, Uint8 *alpha)
- *
- * \brief Get the additional alpha value used in blit operations
- *
- * \param surface The surface to query
- * \param alpha A pointer filled in with the source alpha value
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_SetSurfaceAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface,
-                                                   Uint8 * alpha);
-
-/**
- * \fn int SDL_SetSurfaceBlendMode(SDL_Surface *surface, int blendMode)
- *
- * \brief Set the blend mode used for blit operations
- *
- * \param surface The surface to update
- * \param blendMode SDL_TextureBlendMode to use for blit blending
- *
- * \return 0 on success, or -1 if the parameters are not valid
- *
- * \sa SDL_GetSurfaceBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface,
-                                                    int blendMode);
-
-/**
- * \fn int SDL_GetSurfaceBlendMode(SDL_Surface *surface, int *blendMode)
- *
- * \brief Get the blend mode used for blit operations
- *
- * \param surface The surface to query
- * \param blendMode A pointer filled in with the current blend mode
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_SetSurfaceBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface,
-                                                    int *blendMode);
-
-/**
- * \fn int SDL_SetSurfaceScaleMode(SDL_Surface *surface, int scaleMode)
- *
- * \brief Set the scale mode used for blit operations
- *
- * \param surface The surface to update
- * \param scaleMode SDL_TextureScaleMode to use for blit scaling
- *
- * \return 0 on success, or -1 if the surface is not valid or the scale mode is not supported
- *
- * \note If the scale mode is not supported, the closest supported mode is chosen.  Currently only SDL_TEXTURESCALEMODE_FAST is supported on surfaces.
- *
- * \sa SDL_GetSurfaceScaleMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetSurfaceScaleMode(SDL_Surface * surface,
-                                                    int scaleMode);
-
-/**
- * \fn int SDL_GetSurfaceScaleMode(SDL_Surface *surface, int *scaleMode)
- *
- * \brief Get the scale mode used for blit operations
- *
- * \param surface The surface to query
- * \param scaleMode A pointer filled in with the current scale mode
- *
- * \return 0 on success, or -1 if the surface is not valid
- *
- * \sa SDL_SetSurfaceScaleMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetSurfaceScaleMode(SDL_Surface * surface,
-                                                    int *scaleMode);
-
-/*
- * Sets the clipping rectangle for the destination surface in a blit.
- *
- * If the clip rectangle is NULL, clipping will be disabled.
- * If the clip rectangle doesn't intersect the surface, the function will
- * return SDL_FALSE and blits will be completely clipped.  Otherwise the
- * function returns SDL_TRUE and blits to the surface will be clipped to
- * the intersection of the surface area and the clipping rectangle.
- *
- * Note that blits are automatically clipped to the edges of the source
- * and destination surfaces.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface,
-                                                 const SDL_Rect * rect);
-
-/*
- * Gets the clipping rectangle for the destination surface in a blit.
- * 'rect' must be a pointer to a valid rectangle which will be filled
- * with the correct values.
- */
-extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface,
-                                             SDL_Rect * rect);
-
-/*
- * Creates a new surface of the specified format, and then copies and maps 
- * the given surface to it so the blit of the converted surface will be as 
- * fast as possible.  If this function fails, it returns NULL.
- *
- * The 'flags' parameter is passed to SDL_CreateRGBSurface() and has those 
- * semantics.  You can also pass SDL_RLEACCEL in the flags parameter and
- * SDL will try to RLE accelerate colorkey and alpha blits in the resulting
- * surface.
- *
- * This function is used internally by SDL_DisplayFormat().
- */
-extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
-    (SDL_Surface * src, SDL_PixelFormat * fmt, Uint32 flags);
-
-/*
- * This function draws a point with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_DrawPoint
-    (SDL_Surface * dst, int x, int y, Uint32 color);
-
-/*
- * This function blends a point with an RGBA value
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_BlendPoint
-    (SDL_Surface * dst, int x, int y, int blendMode,
-     Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/*
- * This function draws a line with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_DrawLine
-    (SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color);
-
-/*
- * This function blends an RGBA value along a line
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_BlendLine
-    (SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode,
-     Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/*
- * This function performs a fast fill of the given rectangle with 'color'
- * The given rectangle is clipped to the destination surface clip area
- * and the final fill rectangle is saved in the passed in pointer.
- * If 'dstrect' is NULL, the whole surface will be filled with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_FillRect
-    (SDL_Surface * dst, SDL_Rect * dstrect, Uint32 color);
-
-/*
- * This function blends an RGBA value into the given rectangle.
- * The given rectangle is clipped to the destination surface clip area
- * and the final fill rectangle is saved in the passed in pointer.
- * If 'dstrect' is NULL, the whole surface will be filled with 'color'
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_BlendRect
-    (SDL_Surface * dst, SDL_Rect * dstrect, int blendMode, Uint8 r, Uint8 g,
-     Uint8 b, Uint8 a);
-
-/*
- * This performs a fast blit from the source surface to the destination
- * surface.  It assumes that the source and destination rectangles are
- * the same size.  If either 'srcrect' or 'dstrect' are NULL, the entire
- * surface (src or dst) is copied.  The final blit rectangles are saved
- * in 'srcrect' and 'dstrect' after all clipping is performed.
- * If the blit is successful, it returns 0, otherwise it returns -1.
- *
- * The blit function should not be called on a locked surface.
- *
- * The blit semantics for surfaces with and without alpha and colorkey
- * are defined as follows:
- *
- * RGBA->RGB:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using alpha-channel).
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value);
- * 	set destination alpha to opaque.
- *     SDL_SRCALPHA not set:
- * 	copy RGB, set destination alpha to source per-surface alpha value.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- * 
- * RGBA->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source alpha channel) the RGB values;
- * 	leave destination alpha untouched. [Note: is this correct?]
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy all of RGBA to the destination.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGB: 
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value).
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- *
- * If either of the surfaces were in video memory, and the blit returns -2,
- * the video memory was lost, so it should be reloaded with artwork and 
- * re-blitted:
-	while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
-		while ( SDL_LockSurface(image) < 0 )
-			Sleep(10);
-		-- Write image pixels to image->pixels --
-		SDL_UnlockSurface(image);
-	}
- * This happens under DirectX 5.0 when the system switches away from your
- * fullscreen application.  The lock will also fail until you have access
- * to the video memory again.
- */
-/* You should call SDL_BlitSurface() unless you know exactly how SDL
-   blitting works internally and how to use the other blit functions.
-*/
-#define SDL_BlitSurface SDL_UpperBlit
-
-/* This is the public blit function, SDL_BlitSurface(), and it performs
-   rectangle validation and clipping before passing it to SDL_LowerBlit()
-*/
-extern DECLSPEC int SDLCALL SDL_UpperBlit
-    (SDL_Surface * src, SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-/* This is a semi-private blit function and it performs low-level surface
-   blitting only.
-*/
-extern DECLSPEC int SDLCALL SDL_LowerBlit
-    (SDL_Surface * src, SDL_Rect * srcrect,
-     SDL_Surface * dst, SDL_Rect * dstrect);
-
-/**
- * \fn int SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, const SDL_Rect * dstrect)
- *
- * \brief Perform a fast, low quality, stretch blit between two surfaces of the same pixel format.
- *
- * \note This function uses a static buffer, and is not thread-safe.
- */
-extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src,
-                                            const SDL_Rect * srcrect,
-                                            SDL_Surface * dst,
-                                            const SDL_Rect * dstrect);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_surface_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_syswm.h b/Externals/SDL/Include_1.3/SDL_syswm.h
deleted file mode 100644
index 483118cf86..0000000000
--- a/Externals/SDL/Include_1.3/SDL_syswm.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_syswm.h
- *
- * Include file for SDL custom system window manager hooks
- */
-
-#ifndef _SDL_syswm_h
-#define _SDL_syswm_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Your application has access to a special type of event 'SDL_SYSWMEVENT',
-   which contains window-manager specific information and arrives whenever
-   an unhandled window event occurs.  This event is ignored by default, but
-   you can enable it with SDL_EventState()
-*/
-#ifdef SDL_PROTOTYPES_ONLY
-struct SDL_SysWMinfo;
-#else
-
-/* This is the structure for custom window manager events */
-#if defined(SDL_VIDEO_DRIVER_X11)
-#if defined(__APPLE__) && defined(__MACH__)
-/* conflicts with Quickdraw.h */
-#define Cursor X11Cursor
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* matches the re-define above */
-#undef Cursor
-#endif
-
-/* These are the various supported subsystems under UNIX */
-typedef enum
-{
-    SDL_SYSWM_X11
-} SDL_SYSWM_TYPE;
-
-/* The UNIX custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    SDL_SYSWM_TYPE subsystem;
-    union
-    {
-        XEvent xevent;
-    } event;
-};
-
-/* The UNIX custom window manager information structure.
-   When this structure is returned, it holds information about which
-   low level system it is using, and will be one of SDL_SYSWM_TYPE.
- */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    SDL_SYSWM_TYPE subsystem;
-    union
-    {
-        struct
-        {
-            Display *display;   /* The X11 display */
-            Window window;      /* The X11 display window */
-            /* These locking functions should be called around
-               any X11 functions using the display variable.
-               They lock the event thread, so should not be
-               called around event functions or from event filters.
-             */
-            void (*lock_func) (void);
-            void (*unlock_func) (void);
-
-            /* Introduced in SDL 1.0.2 */
-            Window fswindow;    /* The X11 fullscreen window */
-            Window wmwindow;    /* The X11 managed input window */
-        } x11;
-    } info;
-};
-
-#elif defined(SDL_VIDEO_DRIVER_NANOX)
-#include <microwin/nano-X.h>
-
-/* The generic custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    int data;
-};
-
-/* The windows custom window manager information structure */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    GR_WINDOW_ID window;        /* The display window */
-};
-
-#elif defined(SDL_VIDEO_DRIVER_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* The windows custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    HWND hwnd;                  /* The window for the message */
-    UINT msg;                   /* The type of message */
-    WPARAM wParam;              /* WORD message parameter */
-    LPARAM lParam;              /* LONG message parameter */
-};
-
-/* The windows custom window manager information structure */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    HWND window;                /* The Win32 display window */
-};
-
-#elif defined(SDL_VIDEO_DRIVER_RISCOS)
-
-/* RISC OS custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    int eventCode;              /* The window for the message */
-    int pollBlock[64];
-};
-
-/* The RISC OS custom window manager information structure */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    int wimpVersion;            /* Wimp version running under */
-    int taskHandle;             /* The RISC OS task handle */
-    int window;                 /* The RISC OS display window */
-};
-
-#elif defined(SDL_VIDEO_DRIVER_PHOTON)
-#include <sys/neutrino.h>
-#include <Ph.h>
-
-/* The QNX custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    int data;
-};
-
-/* The QNX custom window manager information structure */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    int data;
-};
-
-#else
-
-/* The generic custom event structure */
-struct SDL_SysWMmsg
-{
-    SDL_version version;
-    int data;
-};
-
-/* The generic custom window manager information structure */
-struct SDL_SysWMinfo
-{
-    SDL_version version;
-    int data;
-};
-
-#endif /* video driver type */
-
-#endif /* SDL_PROTOTYPES_ONLY */
-
-typedef struct SDL_SysWMinfo SDL_SysWMinfo;
-
-/* Function prototypes */
-/**
- * \fn SDL_bool SDL_GetWindowWMInfo (SDL_WindowID windowID, SDL_SysWMinfo * info)
- *
- * \brief This function allows access to driver-dependent window information.
- *
- * \param windowID The window about which information is being requested
- * \param info This structure must be initialized with the SDL version, and is then filled in with information about the given window.
- *
- * \return SDL_TRUE if the function is implemented and the version member of the 'info' struct is valid, SDL_FALSE otherwise.
- *
- * You typically use this function like this:
- * \code
- * SDL_SysWMInfo info;
- * SDL_VERSION(&info.version);
- * if ( SDL_GetWindowWMInfo(&info) ) { ... }
- * \endcode
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_WindowID windowID,
-                                                     SDL_SysWMinfo * info);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_syswm_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_thread.h b/Externals/SDL/Include_1.3/SDL_thread.h
deleted file mode 100644
index 1a8b13f2e8..0000000000
--- a/Externals/SDL/Include_1.3/SDL_thread.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_thread_h
-#define _SDL_thread_h
-
-/**
- * \file SDL_thread.h
- *
- * Header for the SDL thread management routines 
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* Thread synchronization primitives */
-#include "SDL_mutex.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* The SDL thread structure, defined in SDL_thread.c */
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-
-/* Create a thread */
-#if (defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)
-/*
-   We compile SDL into a DLL on OS/2. This means, that it's the DLL which
-   creates a new thread for the calling process with the SDL_CreateThread()
-   API. There is a problem with this, that only the RTL of the SDL.DLL will
-   be initialized for those threads, and not the RTL of the calling application!
-   To solve this, we make a little hack here.
-   We'll always use the caller's _beginthread() and _endthread() APIs to
-   start a new thread. This way, if it's the SDL.DLL which uses this API,
-   then the RTL of SDL.DLL will be used to create the new thread, and if it's
-   the application, then the RTL of the application will be used.
-   So, in short:
-   Always use the _beginthread() and _endthread() of the calling runtime library!
-*/
-#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#ifndef _WIN32_WCE
-#include <process.h>            /* This has _beginthread() and _endthread() defined! */
-#endif
-
-#ifdef __OS2__
-typedef int (*pfnSDL_CurrentBeginThread) (void (*func) (void *), void *,
-                                          unsigned, void *arg);
-typedef void (*pfnSDL_CurrentEndThread) (void);
-#elif __GNUC__
-typedef unsigned long (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
-                                                             unsigned
-                                                             (__stdcall *
-                                                              func) (void *),
-                                                             void *arg,
-                                                             unsigned,
-                                                             unsigned
-                                                             *threadID);
-typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
-#else
-typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
-                                                        unsigned (__stdcall *
-                                                                  func) (void
-                                                                         *),
-                                                        void *arg, unsigned,
-                                                        unsigned *threadID);
-typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
-#endif
-
-extern DECLSPEC SDL_Thread *SDLCALL
-SDL_CreateThread(int (SDLCALL * f) (void *), void *data,
-                 pfnSDL_CurrentBeginThread pfnBeginThread,
-                 pfnSDL_CurrentEndThread pfnEndThread);
-
-#ifdef __OS2__
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
-#elif defined(_WIN32_WCE)
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL)
-#else
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex)
-#endif
-#else
-extern DECLSPEC SDL_Thread *SDLCALL
-SDL_CreateThread(int (SDLCALL * fn) (void *), void *data);
-#endif
-
-/* Get the 32-bit thread identifier for the current thread */
-extern DECLSPEC Uint32 SDLCALL SDL_ThreadID(void);
-
-/* Get the 32-bit thread identifier for the specified thread,
-   equivalent to SDL_ThreadID() if the specified thread is NULL.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetThreadID(SDL_Thread * thread);
-
-/* Wait for a thread to finish.
-   The return code for the thread function is placed in the area
-   pointed to by 'status', if 'status' is not NULL.
- */
-extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status);
-
-/* This function is here for binary compatibility with legacy apps, but
-   in SDL 1.3 and later, it's a no-op. You cannot forcibly kill a thread
-   in a safe manner on many platforms. You should instead find a way to
-   alert your thread that it is time to terminate, and then have it gracefully
-   exit on its own. Do not ever call this function!
- */
-extern DECLSPEC void SDLCALL SDL_KillThread(SDL_Thread * thread);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_thread_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_timer.h b/Externals/SDL/Include_1.3/SDL_timer.h
deleted file mode 100644
index 75901d7311..0000000000
--- a/Externals/SDL/Include_1.3/SDL_timer.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_timer_h
-#define _SDL_timer_h
-
-/**
- * \file SDL_timer.h
- *
- * Header for the SDL time management routines
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* This is the OS scheduler timeslice, in milliseconds */
-#define SDL_TIMESLICE		10
-
-/* This is the maximum resolution of the SDL timer on all platforms */
-#define TIMER_RESOLUTION	10      /* Experimentally determined */
-
-/* Get the number of milliseconds since the SDL library initialization.
- * Note that this value wraps if the program runs for more than ~49 days.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
-
-/* Wait a specified number of milliseconds before returning */
-extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
-
-/* Function prototype for the timer callback function */
-typedef Uint32(SDLCALL * SDL_TimerCallback) (Uint32 interval);
-
-/* Set a callback to run after the specified number of milliseconds has
- * elapsed. The callback function is passed the current timer interval
- * and returns the next timer interval.  If the returned value is the 
- * same as the one passed in, the periodic alarm continues, otherwise a
- * new alarm is scheduled.  If the callback returns 0, the periodic alarm
- * is cancelled.
- *
- * To cancel a currently running timer, call SDL_SetTimer(0, NULL);
- *
- * The timer callback function may run in a different thread than your
- * main code, and so shouldn't call any functions from within itself.
- *
- * The maximum resolution of this timer is 10 ms, which means that if
- * you request a 16 ms timer, your callback will run approximately 20 ms
- * later on an unloaded system.  If you wanted to set a flag signaling
- * a frame update at 30 frames per second (every 33 ms), you might set a 
- * timer for 30 ms:
- *   SDL_SetTimer((33/10)*10, flag_update);
- *
- * If you use this function, you need to pass SDL_INIT_TIMER to SDL_Init().
- *
- * Under UNIX, you should not use raise or use SIGALRM and this function
- * in the same program, as it is implemented using setitimer().  You also
- * should not use this function in multi-threaded applications as signals
- * to multi-threaded apps have undefined behavior in some implementations.
- *
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval,
-                                         SDL_TimerCallback callback);
-
-/* New timer API, supports multiple timers
- * Written by Stephane Peter <megastep@lokigames.com>
- */
-
-/* Function prototype for the new timer callback function.
- * The callback function is passed the current timer interval and returns
- * the next timer interval.  If the returned value is the same as the one
- * passed in, the periodic alarm continues, otherwise a new alarm is
- * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
- */
-typedef Uint32(SDLCALL * SDL_NewTimerCallback) (Uint32 interval, void *param);
-
-/* Definition of the timer ID type */
-typedef struct _SDL_TimerID *SDL_TimerID;
-
-/* Add a new timer to the pool of timers already running.
-   Returns a timer ID, or NULL when an error occurs.
- */
-extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval,
-                                                 SDL_NewTimerCallback
-                                                 callback, void *param);
-
-/* Remove one of the multiple timers knowing its ID.
- * Returns a boolean value indicating success.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_timer_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_types.h b/Externals/SDL/Include_1.3/SDL_types.h
deleted file mode 100644
index 942732d0a0..0000000000
--- a/Externals/SDL/Include_1.3/SDL_types.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/Externals/SDL/Include_1.3/SDL_version.h b/Externals/SDL/Include_1.3/SDL_version.h
deleted file mode 100644
index 702386ba4a..0000000000
--- a/Externals/SDL/Include_1.3/SDL_version.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_version.h
- *
- * This header defines the current SDL version
- */
-
-#ifndef _SDL_version_h
-#define _SDL_version_h
-
-#include "SDL_stdinc.h"
-#include "SDL_revision.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \struct SDL_version
- * \brief Information the version of SDL in use.
- *
- * Represents the library's version as three levels: major revision
- *  (increments with massive changes, additions, and enhancements),
- *  minor revision (increments with backwards-compatible changes to the
- *  major revision), and patchlevel (increments with fixes to the minor
- *  revision).
- *
- * \sa SDL_VERSION
- * \sa SDL_GetVersion
- */
-typedef struct SDL_version
-{
-    Uint8 major;        /**< major version */
-    Uint8 minor;        /**< minor version */
-    Uint8 patch;        /**< update version */
-} SDL_version;
-
-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
-*/
-#define SDL_MAJOR_VERSION	1
-#define SDL_MINOR_VERSION	3
-#define SDL_PATCHLEVEL		0
-
-/**
- * \def SDL_VERSION(x)
- * \brief Macro to determine SDL version program was compiled against.
- *
- * This macro fills in a SDL_version structure with the version of the
- *  library you compiled against. This is determined by what header the
- *  compiler uses. Note that if you dynamically linked the library, you might
- *  have a slightly newer or older version at runtime. That version can be
- *  determined with SDL_GetVersion(), which, unlike SDL_VERSION,
- *  is not a macro.
- *
- * \param x A pointer to a SDL_version struct to initialize.
- *
- * \sa SDL_version
- * \sa SDL_GetVersion
- */
-#define SDL_VERSION(x)							\
-{									\
-	(x)->major = SDL_MAJOR_VERSION;					\
-	(x)->minor = SDL_MINOR_VERSION;					\
-	(x)->patch = SDL_PATCHLEVEL;					\
-}
-
-/* This macro turns the version numbers into a numeric value:
-   (1,2,3) -> (1203)
-   This assumes that there will never be more than 100 patchlevels
-*/
-#define SDL_VERSIONNUM(X, Y, Z)						\
-	((X)*1000 + (Y)*100 + (Z))
-
-/* This is the version number macro for the current SDL version */
-#define SDL_COMPILEDVERSION \
-	SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
-
-/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */
-#define SDL_VERSION_ATLEAST(X, Y, Z) \
-	(SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
-
-/**
- * \fn void SDL_GetVersion(SDL_version *ver)
- * \brief Get the version of SDL that is linked against your program.
- *
- * If you are using a shared library (DLL) version of SDL, then it is
- *  possible that it will be different than the version you compiled against.
- *
- * This is a real function; the macro SDL_VERSION tells you what version
- *  of SDL you compiled against:
- *
- * \code
- * SDL_version compiled;
- * SDL_version linked;
- *
- * SDL_VERSION(&compiled);
- * SDL_GetVersion(&linked);
- * printf("We compiled against SDL version %d.%d.%d ...\n",
- *           compiled.major, compiled.minor, compiled.patch);
- * printf("But we linked against SDL version %d.%d.%d.\n",
- *           linked.major, linked.minor, linked.patch);
- * \endcode
- *
- * This function may be called safely at any time, even before SDL_Init().
- *
- * \sa SDL_VERSION
- */
-extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
-
-/**
- * \fn int SDL_GetRevision(void)
- * \brief Get the code revision of SDL that is linked against your program.
- */
-extern DECLSPEC int SDLCALL SDL_GetRevision(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_version_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/SDL_video.h b/Externals/SDL/Include_1.3/SDL_video.h
deleted file mode 100644
index 02aec68642..0000000000
--- a/Externals/SDL/Include_1.3/SDL_video.h
+++ /dev/null
@@ -1,1469 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- * \file SDL_video.h
- *
- * Header file for SDL video functions.
- */
-
-#ifndef _SDL_video_h
-#define _SDL_video_h
-
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_surface.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \struct SDL_DisplayMode
- *
- * \brief  The structure that defines a display mode
- *
- * \sa SDL_GetNumDisplayModes()
- * \sa SDL_GetDisplayMode()
- * \sa SDL_GetDesktopDisplayMode()
- * \sa SDL_GetCurrentDisplayMode()
- * \sa SDL_GetClosestDisplayMode()
- * \sa SDL_SetDisplayMode()
- */
-typedef struct
-{
-    Uint32 format;              /**< pixel format */
-    int w;                      /**< width */
-    int h;                      /**< height */
-    int refresh_rate;           /**< refresh rate (or zero for unspecified) */
-    void *driverdata;           /**< driver-specific data, initialize to 0 */
-} SDL_DisplayMode;
-
-/**
- * \typedef SDL_WindowID
- *
- * \brief The type used to identify a window
- *
- * \sa SDL_CreateWindow()
- * \sa SDL_CreateWindowFrom()
- * \sa SDL_DestroyWindow()
- * \sa SDL_GetWindowData()
- * \sa SDL_GetWindowFlags()
- * \sa SDL_GetWindowGrab()
- * \sa SDL_GetWindowPosition()
- * \sa SDL_GetWindowSize()
- * \sa SDL_GetWindowTitle()
- * \sa SDL_HideWindow()
- * \sa SDL_MaximizeWindow()
- * \sa SDL_MinimizeWindow()
- * \sa SDL_RaiseWindow()
- * \sa SDL_RestoreWindow()
- * \sa SDL_SetWindowData()
- * \sa SDL_SetWindowFullscreen()
- * \sa SDL_SetWindowGrab()
- * \sa SDL_SetWindowIcon()
- * \sa SDL_SetWindowPosition()
- * \sa SDL_SetWindowSize()
- * \sa SDL_SetWindowTitle()
- * \sa SDL_ShowWindow()
- */
-typedef Uint32 SDL_WindowID;
-
-/**
- * \enum SDL_WindowFlags
- *
- * \brief The flags on a window
- *
- * \sa SDL_GetWindowFlags()
- */
-typedef enum
-{
-    SDL_WINDOW_FULLSCREEN = 0x00000001,         /**< fullscreen window, implies borderless */
-    SDL_WINDOW_OPENGL = 0x00000002,             /**< window usable with OpenGL context */
-    SDL_WINDOW_SHOWN = 0x00000004,              /**< window is visible */
-    SDL_WINDOW_BORDERLESS = 0x00000008,         /**< no window decoration */
-    SDL_WINDOW_RESIZABLE = 0x00000010,          /**< window can be resized */
-    SDL_WINDOW_MINIMIZED = 0x00000020,          /**< minimized */
-    SDL_WINDOW_MAXIMIZED = 0x00000040,          /**< maximized */
-    SDL_WINDOW_INPUT_GRABBED = 0x00000100,      /**< window has grabbed input focus */
-    SDL_WINDOW_INPUT_FOCUS = 0x00000200,        /**< window has input focus */
-    SDL_WINDOW_MOUSE_FOCUS = 0x00000400         /**< window has mouse focus */
-} SDL_WindowFlags;
-
-/**
- * \def SDL_WINDOWPOS_UNDEFINED
- * \brief Used to indicate that you don't care what the window position is.
- */
-#define SDL_WINDOWPOS_UNDEFINED 0x7FFFFFF
-/**
- * \def SDL_WINDOWPOS_CENTERED
- * \brief Used to indicate that the window position should be centered.
- */
-#define SDL_WINDOWPOS_CENTERED  0x7FFFFFE
-
-/**
- * \enum SDL_WindowEventID
- *
- * \brief Event subtype for window events
- */
-typedef enum
-{
-    SDL_WINDOWEVENT_NONE,               /**< Never used */
-    SDL_WINDOWEVENT_SHOWN,              /**< Window has been shown */
-    SDL_WINDOWEVENT_HIDDEN,             /**< Window has been hidden */
-    SDL_WINDOWEVENT_EXPOSED,            /**< Window has been exposed and should be redrawn */
-    SDL_WINDOWEVENT_MOVED,              /**< Window has been moved to data1,data2 */
-    SDL_WINDOWEVENT_RESIZED,            /**< Window size changed to data1xdata2 */
-    SDL_WINDOWEVENT_MINIMIZED,          /**< Window has been minimized */
-    SDL_WINDOWEVENT_MAXIMIZED,          /**< Window has been maximized */
-    SDL_WINDOWEVENT_RESTORED,           /**< Window has been restored to normal size and position */
-    SDL_WINDOWEVENT_ENTER,              /**< The window has gained mouse focus */
-    SDL_WINDOWEVENT_LEAVE,              /**< The window has lost mouse focus */
-    SDL_WINDOWEVENT_FOCUS_GAINED,       /**< The window has gained keyboard focus */
-    SDL_WINDOWEVENT_FOCUS_LOST,         /**< The window has lost keyboard focus */
-    SDL_WINDOWEVENT_CLOSE               /**< The window manager requests that the window be closed */
-} SDL_WindowEventID;
-
-/**
- * \enum SDL_RendererFlags
- *
- * \brief Flags used when creating a rendering context
- */
-typedef enum
-{
-    SDL_RENDERER_SINGLEBUFFER = 0x00000001,     /**< Render directly to the window, if possible */
-    SDL_RENDERER_PRESENTCOPY = 0x00000002,      /**< Present uses a copy from back buffer to the front buffer */
-    SDL_RENDERER_PRESENTFLIP2 = 0x00000004,     /**< Present uses a flip, swapping back buffer and front buffer */
-    SDL_RENDERER_PRESENTFLIP3 = 0x00000008,     /**< Present uses a flip, rotating between two back buffers and a front buffer */
-    SDL_RENDERER_PRESENTDISCARD = 0x00000010,   /**< Present leaves the contents of the backbuffer undefined */
-    SDL_RENDERER_PRESENTVSYNC = 0x00000020,     /**< Present is synchronized with the refresh rate */
-    SDL_RENDERER_ACCELERATED = 0x00000040       /**< The renderer uses hardware acceleration */
-} SDL_RendererFlags;
-
-/**
- * \struct SDL_RendererInfo
- *
- * \brief Information on the capabilities of a render driver or context
- */
-typedef struct SDL_RendererInfo
-{
-    const char *name;           /**< The name of the renderer */
-    Uint32 flags;               /**< Supported SDL_RendererFlags */
-    Uint32 mod_modes;           /**< A mask of supported channel modulation */
-    Uint32 blend_modes;         /**< A mask of supported blend modes */
-    Uint32 scale_modes;         /**< A mask of supported scale modes */
-    Uint32 num_texture_formats; /**< The number of available texture formats */
-    Uint32 texture_formats[20]; /**< The available texture formats */
-    int max_texture_width;      /**< The maximimum texture width */
-    int max_texture_height;     /**< The maximimum texture height */
-} SDL_RendererInfo;
-
-/**
- * \enum SDL_TextureAccess
- *
- * \brief The access pattern allowed for a texture
- */
-typedef enum
-{
-    SDL_TEXTUREACCESS_STATIC,    /**< Changes rarely, not lockable */
-    SDL_TEXTUREACCESS_STREAMING  /**< Changes frequently, lockable */
-} SDL_TextureAccess;
-
-/**
- * \enum SDL_TextureModulate
- *
- * \brief The texture channel modulation used in SDL_RenderCopy()
- */
-typedef enum
-{
-    SDL_TEXTUREMODULATE_NONE = 0x00000000,     /**< No modulation */
-    SDL_TEXTUREMODULATE_COLOR = 0x00000001,    /**< srcC = srcC * color */
-    SDL_TEXTUREMODULATE_ALPHA = 0x00000002     /**< srcA = srcA * alpha */
-} SDL_TextureModulate;
-
-/**
- * \enum SDL_BlendMode
- *
- * \brief The blend mode used in SDL_RenderCopy() and drawing operations
- */
-typedef enum
-{
-    SDL_BLENDMODE_NONE = 0x00000000,     /**< No blending */
-    SDL_BLENDMODE_MASK = 0x00000001,     /**< dst = A ? src : dst (alpha is mask) */
-    SDL_BLENDMODE_BLEND = 0x00000002,    /**< dst = (src * A) + (dst * (1-A)) */
-    SDL_BLENDMODE_ADD = 0x00000004,      /**< dst = (src * A) + dst */
-    SDL_BLENDMODE_MOD = 0x00000008       /**< dst = src * dst */
-} SDL_BlendMode;
-
-/**
- * \enum SDL_TextureScaleMode
- *
- * \brief The texture scale mode used in SDL_RenderCopy()
- */
-typedef enum
-{
-    SDL_TEXTURESCALEMODE_NONE = 0x00000000,     /**< No scaling, rectangles must match dimensions */
-    SDL_TEXTURESCALEMODE_FAST = 0x00000001,     /**< Point sampling or equivalent algorithm */
-    SDL_TEXTURESCALEMODE_SLOW = 0x00000002,     /**< Linear filtering or equivalent algorithm */
-    SDL_TEXTURESCALEMODE_BEST = 0x00000004      /**< Bicubic filtering or equivalent algorithm */
-} SDL_TextureScaleMode;
-
-/**
- * \typedef SDL_TextureID
- *
- * \brief An efficient driver-specific representation of pixel data
- */
-typedef Uint32 SDL_TextureID;
-
-/**
- * \typedef SDL_GLContext
- *
- * \brief An opaque handle to an OpenGL context.
- */
-typedef void *SDL_GLContext;
-
-/**
- * \enum SDL_GLattr
- *
- * \brief OpenGL configuration attributes
- */
-typedef enum
-{
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_RETAINED_BACKING
-} SDL_GLattr;
-
-
-/* Function prototypes */
-
-/**
- * \fn int SDL_GetNumVideoDrivers(void)
- *
- * \brief Get the number of video drivers compiled into SDL
- *
- * \sa SDL_GetVideoDriver()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void);
-
-/**
- * \fn const char *SDL_GetVideoDriver(int index)
- *
- * \brief Get the name of a built in video driver.
- *
- * \note The video drivers are presented in the order in which they are
- * normally checked during initialization.
- *
- * \sa SDL_GetNumVideoDrivers()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
-
-/**
- * \fn int SDL_VideoInit(const char *driver_name, Uint32 flags)
- *
- * \brief Initialize the video subsystem, optionally specifying a video driver.
- *
- * \param driver_name Initialize a specific driver by name, or NULL for the default video driver.
- * \param flags FIXME: Still needed?
- *
- * \return 0 on success, -1 on error
- *
- * This function initializes the video subsystem; setting up a connection
- * to the window manager, etc, and determines the available display modes
- * and pixel formats, but does not initialize a window or graphics mode.
- *
- * \sa SDL_VideoQuit()
- */
-extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name,
-                                          Uint32 flags);
-
-/**
- * \fn void SDL_VideoQuit(void)
- *
- * \brief Shuts down the video subsystem.
- *
- * This function closes all windows, and restores the original video mode.
- *
- * \sa SDL_VideoInit()
- */
-extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
-
-/**
- * \fn const char *SDL_GetCurrentVideoDriver(void)
- *
- * \brief Returns the name of the currently initialized video driver.
- *
- * \return The name of the current video driver or NULL if no driver
- *         has been initialized
- *
- * \sa SDL_GetNumVideoDrivers()
- * \sa SDL_GetVideoDriver()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void);
-
-/**
- * \fn int SDL_GetNumVideoDisplays(void)
- *
- * \brief Returns the number of available video displays.
- *
- * \sa SDL_SelectVideoDisplay()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void);
-
-/**
- * \fn int SDL_SelectVideoDisplay(int index)
- *
- * \brief Set the index of the currently selected display.
- *
- * \return 0 on success, or -1 if the index is out of range.
- *
- * \sa SDL_GetNumVideoDisplays()
- * \sa SDL_GetCurrentVideoDisplay()
- */
-extern DECLSPEC int SDLCALL SDL_SelectVideoDisplay(int index);
-
-/**
- * \fn int SDL_GetCurrentVideoDisplay(void)
- *
- * \brief Get the index of the currently selected display.
- *
- * \return The index of the currently selected display.
- *
- * \sa SDL_GetNumVideoDisplays()
- * \sa SDL_SelectVideoDisplay()
- */
-extern DECLSPEC int SDLCALL SDL_GetCurrentVideoDisplay(void);
-
-/**
- * \fn int SDL_GetNumDisplayModes(void)
- *
- * \brief Returns the number of available display modes for the current display.
- *
- * \sa SDL_GetDisplayMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(void);
-
-/**
- * \fn int SDL_GetDisplayMode(int index, SDL_DisplayMode *mode)
- *
- * \brief Fill in information about a specific display mode.
- *
- * \note The display modes are sorted in this priority:
- *       \li bits per pixel -> more colors to fewer colors
- *       \li width -> largest to smallest
- *       \li height -> largest to smallest
- *       \li refresh rate -> highest to lowest
- *
- * \sa SDL_GetNumDisplayModes()
- */
-extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int index,
-                                               SDL_DisplayMode * mode);
-
-/**
- * \fn int SDL_GetDesktopDisplayMode(SDL_DisplayMode *mode)
- *
- * \brief Fill in information about the desktop display mode for the current display.
- */
-extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(SDL_DisplayMode * mode);
-
-/**
- * \fn int SDL_GetCurrentDisplayMode(SDL_DisplayMode *mode)
- *
- * \brief Fill in information about the current display mode.
- */
-extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(SDL_DisplayMode * mode);
-
-/**
- * \fn SDL_DisplayMode *SDL_GetClosestDisplayMode(const SDL_DisplayMode *mode, SDL_DisplayMode *closest)
- *
- * \brief Get the closest match to the requested display mode.
- *
- * \param mode The desired display mode
- * \param closest A pointer to a display mode to be filled in with the closest match of the available display modes.
- *
- * \return The passed in value 'closest', or NULL if no matching video mode was available.
- *
- * The available display modes are scanned, and 'closest' is filled in with the closest mode matching the requested mode and returned.  The mode format and refresh_rate default to the desktop mode if they are 0.  The modes are scanned with size being first priority, format being second priority, and finally checking the refresh_rate.  If all the available modes are too small, then NULL is returned.
- *
- * \sa SDL_GetNumDisplayModes()
- * \sa SDL_GetDisplayMode()
- */
-extern DECLSPEC SDL_DisplayMode *SDLCALL SDL_GetClosestDisplayMode(const
-                                                                   SDL_DisplayMode
-                                                                   * mode,
-                                                                   SDL_DisplayMode
-                                                                   * closest);
-
-/**
- * \fn int SDL_SetFullscreenDisplayMode(const SDL_DisplayMode *mode)
- *
- * \brief Set the display mode used when a fullscreen window is visible
- *        on the currently selected display.
- *
- * \param mode The mode to use, or NULL for the desktop mode.
- *
- * \return 0 on success, or -1 if setting the display mode failed.
- *
- * \sa SDL_SetWindowFullscreen()
- */
-extern DECLSPEC int SDLCALL SDL_SetFullscreenDisplayMode(const SDL_DisplayMode
-                                                         * mode);
-
-/**
- * \fn int SDL_GetFullscreenDisplayMode(SDL_DisplayMode *mode)
- *
- * \brief Fill in information about the display mode used when a fullscreen
- *        window is visible on the currently selected display.
- */
-extern DECLSPEC int SDLCALL SDL_GetFullscreenDisplayMode(SDL_DisplayMode *
-                                                         mode);
-
-/**
- * \fn int SDL_SetDisplayPalette(const SDL_Color *colors, int firstcolor, int ncolors)
- *
- * \brief Set the palette entries for indexed display modes.
- *
- * \return 0 on success, or -1 if the display mode isn't palettized or the colors couldn't be set.
- */
-extern DECLSPEC int SDLCALL SDL_SetDisplayPalette(const SDL_Color * colors,
-                                                  int firstcolor,
-                                                  int ncolors);
-
-/**
- * \fn int SDL_GetDisplayPalette(SDL_Color *colors, int firstcolor, int ncolors)
- *
- * \brief Gets the palette entries for indexed display modes.
- *
- * \return 0 on success, or -1 if the display mode isn't palettized
- */
-extern DECLSPEC int SDLCALL SDL_GetDisplayPalette(SDL_Color * colors,
-                                                  int firstcolor,
-                                                  int ncolors);
-
-/**
- * \fn int SDL_SetGamma(float red, float green, float blue)
- *
- * \brief Set the gamma correction for each of the color channels on the currently selected display.
- *
- * \return 0 on success, or -1 if setting the gamma isn't supported.
- *
- * \sa SDL_SetGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue);
-
-/**
- * \fn int SDL_SetGammaRamp(const Uint16 * red, const Uint16 * green, const Uint16 * blue)
- *
- * \brief Set the gamma ramp for the currently selected display.
- *
- * \param red The translation table for the red channel, or NULL
- * \param green The translation table for the green channel, or NULL
- * \param blue The translation table for the blue channel, or NULL
- *
- * \return 0 on success, or -1 if gamma ramps are unsupported.
- *
- * Set the gamma translation table for the red, green, and blue channels
- * of the video hardware.  Each table is an array of 256 16-bit quantities,
- * representing a mapping between the input and output for that channel.
- * The input is the index into the array, and the output is the 16-bit
- * gamma value at that index, scaled to the output color precision.
- * 
- * \sa SDL_GetGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 * red,
-                                             const Uint16 * green,
-                                             const Uint16 * blue);
-
-/**
- * \fn int SDL_GetGammaRamp(Uint16 * red, Uint16 * green, Uint16 * blue)
- *
- * \brief Get the gamma ramp for the currently selected display.
- *
- * \param red A pointer to a 256 element array of 16-bit quantities to hold the translation table for the red channel, or NULL.
- * \param green A pointer to a 256 element array of 16-bit quantities to hold the translation table for the green channel, or NULL.
- * \param blue A pointer to a 256 element array of 16-bit quantities to hold the translation table for the blue channel, or NULL.
- * 
- * \return 0 on success, or -1 if gamma ramps are unsupported.
- *
- * \sa SDL_SetGammaRamp()
- */
-extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 * red, Uint16 * green,
-                                             Uint16 * blue);
-
-
-/**
- * \fn SDL_WindowID SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
- *
- * \brief Create a window with the specified position, dimensions, and flags.
- *
- * \param title The title of the window, in UTF-8 encoding
- * \param x The x position of the window, SDL_WINDOWPOS_CENTERED, or SDL_WINDOWPOS_UNDEFINED
- * \param y The y position of the window, SDL_WINDOWPOS_CENTERED, or SDL_WINDOWPOS_UNDEFINED
- * \param w The width of the window
- * \param h The height of the window
- * \param flags The flags for the window, a mask of any of the following: SDL_WINDOW_FULLSCREEN, SDL_WINDOW_OPENGL, SDL_WINDOW_SHOWN, SDL_WINDOW_BORDERLESS, SDL_WINDOW_RESIZABLE, SDL_WINDOW_MAXIMIZED, SDL_WINDOW_MINIMIZED, SDL_WINDOW_INPUT_GRABBED
- *
- * \return The id of the window created, or zero if window creation failed.
- *
- * \sa SDL_DestroyWindow()
- */
-extern DECLSPEC SDL_WindowID SDLCALL SDL_CreateWindow(const char *title,
-                                                      int x, int y, int w,
-                                                      int h, Uint32 flags);
-
-/**
- * \fn SDL_WindowID SDL_CreateWindowFrom(void *data)
- *
- * \brief Create an SDL window struct from an existing native window.
- *
- * \param data A pointer to driver-dependent window creation data
- *
- * \return The id of the window created, or zero if window creation failed.
- *
- * \warning This function is NOT SUPPORTED, use at your own risk!
- *
- * \sa SDL_DestroyWindow()
- */
-extern DECLSPEC SDL_WindowID SDLCALL SDL_CreateWindowFrom(const void *data);
-
-/**
- * \fn Uint32 SDL_GetWindowFlags(SDL_WindowID windowID)
- *
- * \brief Get the window flags.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_SetWindowTitle(SDL_WindowID windowID, const char *title)
- *
- * \brief Set the title of the window, in UTF-8 format.
- *
- * \sa SDL_GetWindowTitle()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_WindowID windowID,
-                                                const char *title);
-
-/**
- * \fn const char *SDL_GetWindowTitle(SDL_WindowID windowID)
- *
- * \brief Get the title of the window, in UTF-8 format.
- *
- * \sa SDL_SetWindowTitle()
- */
-extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_SetWindowIcon(SDL_WindowID windowID, SDL_Surface *icon)
- *
- * \brief Set the icon of the window.
- *
- * \param icon The icon for the window
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_WindowID windowID,
-                                               SDL_Surface * icon);
-
-/**
- * \fn void SDL_SetWindowData(SDL_WindowID windowID, void *userdata)
- *
- * \brief Associate an arbitrary pointer with the window.
- *
- * \sa SDL_GetWindowData()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowData(SDL_WindowID windowID,
-                                               void *userdata);
-
-/**
- * \fn void *SDL_GetWindowData(SDL_WindowID windowID)
- *
- * \brief Retrieve the data pointer associated with the window.
- *
- * \sa SDL_SetWindowData()
- */
-extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_SetWindowPosition(SDL_WindowID windowID, int x, int y)
- *
- * \brief Set the position of the window.
- *
- * \param windowID The window to reposition
- * \param x The x coordinate of the window, SDL_WINDOWPOS_CENTERED, or SDL_WINDOWPOS_UNDEFINED
- * \param y The y coordinate of the window, SDL_WINDOWPOS_CENTERED, or SDL_WINDOWPOS_UNDEFINED
- *
- * \note The window coordinate origin is the upper left of the display.
- *
- * \sa SDL_GetWindowPosition()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_WindowID windowID,
-                                                   int x, int y);
-
-/**
- * \fn void SDL_GetWindowPosition(SDL_WindowID windowID, int *x, int *y)
- *
- * \brief Get the position of the window.
- *
- * \sa SDL_SetWindowPosition()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_WindowID windowID,
-                                                   int *x, int *y);
-
-/**
- * \fn void SDL_SetWindowSize(SDL_WindowID windowID, int w, int w)
- *
- * \brief Set the size of the window's client area.
- *
- * \note You can't change the size of a fullscreen window, it automatically
- * matches the size of the display mode.
- *
- * \sa SDL_GetWindowSize()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_WindowID windowID, int w,
-                                               int h);
-
-/**
- * \fn void SDL_GetWindowSize(SDL_WindowID windowID, int *w, int *h)
- *
- * \brief Get the size of the window's client area.
- *
- * \sa SDL_SetWindowSize()
- */
-extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_WindowID windowID, int *w,
-                                               int *h);
-
-/**
- * \fn void SDL_ShowWindow(SDL_WindowID windowID)
- *
- * \brief Show the window
- *
- * \sa SDL_HideWindow()
- */
-extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_HideWindow(SDL_WindowID windowID)
- *
- * \brief Hide the window
- *
- * \sa SDL_ShowWindow()
- */
-extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_RaiseWindow(SDL_WindowID windowID)
- *
- * \brief Raise the window above other windows and set the input focus.
- */
-extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_MaximizeWindow(SDL_WindowID windowID)
- *
- * \brief Make the window as large as possible.
- *
- * \sa SDL_RestoreWindow()
- */
-extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_MinimizeWindow(SDL_WindowID windowID)
- *
- * \brief Minimize the window to an iconic representation.
- *
- * \sa SDL_RestoreWindow()
- */
-extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_RestoreWindow(SDL_WindowID windowID)
- *
- * \brief Restore the size and position of a minimized or maximized window.
- *
- * \sa SDL_MaximizeWindow()
- * \sa SDL_MinimizeWindow()
- */
-extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_WindowID windowID);
-
-/**
- * \fn int SDL_SetWindowFullscreen(SDL_WindowID windowID, int fullscreen)
- *
- * \brief Set the window's fullscreen state.
- *
- * \return 0 on success, or -1 if setting the display mode failed.
- *
- * \sa SDL_SetFullscreenDisplayMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_WindowID windowID,
-                                                    int fullscreen);
-
-/**
- * \fn void SDL_SetWindowGrab(SDL_WindowID windowID, int mode)
- *
- * \brief Set the window's input grab mode.
- *
- * \param mode This is 1 to grab input, and 0 to release input.
- *
- * \sa SDL_GetWindowGrab()
- */
-extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_WindowID windowID,
-                                               int mode);
-
-/**
- * \fn int SDL_GetWindowGrab(SDL_WindowID windowID)
- *
- * \brief Get the window's input grab mode.
- *
- * \return This returns 1 if input is grabbed, and 0 otherwise.
- *
- * \sa SDL_SetWindowGrab()
- */
-extern DECLSPEC int SDLCALL SDL_GetWindowGrab(SDL_WindowID windowID);
-
-/**
- * \fn SDL_bool SDL_GetWindowWMInfo(SDL_WindowID windowID, struct SDL_SysWMinfo * info)
- *
- * \brief Get driver specific information about a window.
- *
- * \note Include SDL_syswm.h for the declaration of SDL_SysWMinfo.
- */
-struct SDL_SysWMinfo;
-extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_WindowID windowID,
-                                                     struct SDL_SysWMinfo
-                                                     *info);
-
-/**
- * \fn void SDL_DestroyWindow(SDL_WindowID windowID)
- *
- * \brief Destroy a window.
- */
-extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_WindowID windowID);
-
-/**
- * \fn int SDL_GetNumRenderDrivers(void)
- *
- * \brief Get the number of 2D rendering drivers available for the current display.
- *
- * A render driver is a set of code that handles rendering and texture
- * management on a particular display.  Normally there is only one, but
- * some drivers may have several available with different capabilities.
- *
- * \sa SDL_GetRenderDriverInfo()
- * \sa SDL_CreateRenderer()
- */
-extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void);
-
-/**
- * \fn int SDL_GetRenderDriverInfo(int index, SDL_RendererInfo *info)
- *
- * \brief Get information about a specific 2D rendering driver for the current display.
- *
- * \param index The index of the driver to query information about.
- * \param info A pointer to an SDL_RendererInfo struct to be filled with information on the rendering driver.
- *
- * \return 0 on success, -1 if the index was out of range
- *
- * \sa SDL_CreateRenderer()
- */
-extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index,
-                                                    SDL_RendererInfo * info);
-
-/**
- * \fn int SDL_CreateRenderer(SDL_WindowID window, int index, Uint32 flags)
- *
- * \brief Create and make active a 2D rendering context for a window.
- *
- * \param windowID The window used for rendering
- * \param index The index of the rendering driver to initialize, or -1 to initialize the first one supporting the requested flags.
- * \param flags SDL_RendererFlags
- *
- * \return 0 on success, -1 if the flags were not supported, or -2 if
- *         there isn't enough memory to support the requested flags
- *
- * \sa SDL_SelectRenderer()
- * \sa SDL_GetRendererInfo()
- * \sa SDL_DestroyRenderer()
- */
-extern DECLSPEC int SDLCALL SDL_CreateRenderer(SDL_WindowID windowID,
-                                               int index, Uint32 flags);
-
-/**
- * \fn int SDL_SelectRenderer(SDL_WindowID windowID)
- *
- * \brief Select the rendering context for a particular window.
- *
- * \return 0 on success, -1 if the selected window doesn't have a
- *         rendering context.
- */
-extern DECLSPEC int SDLCALL SDL_SelectRenderer(SDL_WindowID windowID);
-
-/**
- * \fn int SDL_GetRendererInfo(SDL_RendererInfo *info)
- *
- * \brief Get information about the current rendering context.
- */
-extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_RendererInfo * info);
-
-/**
- * \fn SDL_TextureID SDL_CreateTexture(Uint32 format, int access, int w, int h)
- *
- * \brief Create a texture for the current rendering context.
- *
- * \param format The format of the texture
- * \param access One of the enumerated values in SDL_TextureAccess
- * \param w The width of the texture in pixels
- * \param h The height of the texture in pixels
- *
- * \return The created texture is returned, or 0 if no rendering context was active,  the format was unsupported, or the width or height were out of range.
- *
- * \sa SDL_QueryTexture()
- * \sa SDL_DestroyTexture()
- */
-extern DECLSPEC SDL_TextureID SDLCALL SDL_CreateTexture(Uint32 format,
-                                                        int access, int w,
-                                                        int h);
-
-/**
- * \fn SDL_TextureID SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface *surface)
- *
- * \brief Create a texture from an existing surface.
- *
- * \param format The format of the texture, or 0 to pick an appropriate format
- * \param surface The surface containing pixel data used to fill the texture
- *
- * \return The created texture is returned, or 0 if no rendering context was active,  the format was unsupported, or the surface width or height were out of range.
- *
- * \note The surface is not modified or freed by this function.
- *
- * \sa SDL_QueryTexture()
- * \sa SDL_DestroyTexture()
- */
-extern DECLSPEC SDL_TextureID SDLCALL SDL_CreateTextureFromSurface(Uint32
-                                                                   format,
-                                                                   SDL_Surface
-                                                                   * surface);
-
-/**
- * \fn int SDL_QueryTexture(SDL_TextureID textureID, Uint32 *format, int *access, int *w, int *h)
- *
- * \brief Query the attributes of a texture
- *
- * \param texture A texture to be queried
- * \param format A pointer filled in with the raw format of the texture.  The actual format may differ, but pixel transfers will use this format.
- * \param access A pointer filled in with the actual access to the texture.
- * \param w A pointer filled in with the width of the texture in pixels
- * \param h A pointer filled in with the height of the texture in pixels
- *
- * \return 0 on success, or -1 if the texture is not valid
- */
-extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_TextureID textureID,
-                                             Uint32 * format, int *access,
-                                             int *w, int *h);
-
-/**
- * \fn int SDL_QueryTexturePixels(SDL_TextureID textureID, void **pixels, int pitch)
- *
- * \brief Query the pixels of a texture, if the texture does not need to be locked for pixel access.
- *
- * \param texture A texture to be queried, which was created with SDL_TEXTUREACCESS_STREAMING
- * \param pixels A pointer filled with a pointer to the pixels for the texture 
- * \param pitch A pointer filled in with the pitch of the pixel data
- *
- * \return 0 on success, or -1 if the texture is not valid, or must be locked for pixel access.
- */
-extern DECLSPEC int SDLCALL SDL_QueryTexturePixels(SDL_TextureID textureID,
-                                                   void **pixels, int *pitch);
-
-/**
- * \fn int SDL_SetTexturePalette(SDL_TextureID textureID, const SDL_Color * colors, int firstcolor, int ncolors)
- *
- * \brief Update an indexed texture with a color palette
- *
- * \param texture The texture to update
- * \param colors The array of RGB color data
- * \param firstcolor The first index to update
- * \param ncolors The number of palette entries to fill with the color data
- *
- * \return 0 on success, or -1 if the texture is not valid or not an indexed texture
- */
-extern DECLSPEC int SDLCALL SDL_SetTexturePalette(SDL_TextureID textureID,
-                                                  const SDL_Color * colors,
-                                                  int firstcolor,
-                                                  int ncolors);
-
-/**
- * \fn int SDL_GetTexturePalette(SDL_TextureID textureID, SDL_Color * colors, int firstcolor, int ncolors)
- *
- * \brief Update an indexed texture with a color palette
- *
- * \param texture The texture to update
- * \param colors The array to fill with RGB color data
- * \param firstcolor The first index to retrieve
- * \param ncolors The number of palette entries to retrieve
- *
- * \return 0 on success, or -1 if the texture is not valid or not an indexed texture
- */
-extern DECLSPEC int SDLCALL SDL_GetTexturePalette(SDL_TextureID textureID,
-                                                  SDL_Color * colors,
-                                                  int firstcolor,
-                                                  int ncolors);
-
-/**
- * \fn int SDL_SetTextureColorMod(SDL_TextureID textureID, Uint8 r, Uint8 g, Uint8 b)
- *
- * \brief Set an additional color value used in render copy operations
- *
- * \param texture The texture to update
- * \param r The red source color value multiplied into copy operations
- * \param g The green source color value multiplied into copy operations
- * \param b The blue source color value multiplied into copy operations
- *
- * \return 0 on success, or -1 if the texture is not valid or color modulation is not supported
- *
- * \sa SDL_GetTextureColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_TextureID textureID,
-                                                   Uint8 r, Uint8 g, Uint8 b);
-
-
-/**
- * \fn int SDL_GetTextureColorMod(SDL_TextureID textureID, Uint8 *r, Uint8 *g, Uint8 *b)
- *
- * \brief Get the additional color value used in render copy operations
- *
- * \param texture The texture to query
- * \param r A pointer filled in with the source red color value
- * \param g A pointer filled in with the source green color value
- * \param b A pointer filled in with the source blue color value
- *
- * \return 0 on success, or -1 if the texture is not valid
- *
- * \sa SDL_SetTextureColorMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_TextureID textureID,
-                                                   Uint8 * r, Uint8 * g,
-                                                   Uint8 * b);
-
-/**
- * \fn int SDL_SetTextureAlphaMod(SDL_TextureID textureID, Uint8 alpha)
- *
- * \brief Set an additional alpha value used in render copy operations
- *
- * \param texture The texture to update
- * \param alpha The source alpha value multiplied into copy operations.
- *
- * \return 0 on success, or -1 if the texture is not valid or alpha modulation is not supported
- *
- * \sa SDL_GetTextureAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_TextureID textureID,
-                                                   Uint8 alpha);
-
-/**
- * \fn int SDL_GetTextureAlphaMod(SDL_TextureID textureID, Uint8 *alpha)
- *
- * \brief Get the additional alpha value used in render copy operations
- *
- * \param texture The texture to query
- * \param alpha A pointer filled in with the source alpha value
- *
- * \return 0 on success, or -1 if the texture is not valid
- *
- * \sa SDL_SetTextureAlphaMod()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_TextureID textureID,
-                                                   Uint8 * alpha);
-
-/**
- * \fn int SDL_SetTextureBlendMode(SDL_TextureID textureID, int blendMode)
- *
- * \brief Set the blend mode used for texture copy operations
- *
- * \param texture The texture to update
- * \param blendMode SDL_TextureBlendMode to use for texture blending
- *
- * \return 0 on success, or -1 if the texture is not valid or the blend mode is not supported
- *
- * \note If the blend mode is not supported, the closest supported mode is chosen.
- *
- * \sa SDL_GetTextureBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_TextureID textureID,
-                                                    int blendMode);
-
-/**
- * \fn int SDL_GetTextureBlendMode(SDL_TextureID textureID, int *blendMode)
- *
- * \brief Get the blend mode used for texture copy operations
- *
- * \param texture The texture to query
- * \param blendMode A pointer filled in with the current blend mode
- *
- * \return 0 on success, or -1 if the texture is not valid
- *
- * \sa SDL_SetTextureBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_TextureID textureID,
-                                                    int *blendMode);
-
-/**
- * \fn int SDL_SetTextureScaleMode(SDL_TextureID textureID, int scaleMode)
- *
- * \brief Set the scale mode used for texture copy operations
- *
- * \param texture The texture to update
- * \param scaleMode SDL_TextureScaleMode to use for texture scaling
- *
- * \return 0 on success, or -1 if the texture is not valid or the scale mode is not supported
- *
- * \note If the scale mode is not supported, the closest supported mode is chosen.
- *
- * \sa SDL_GetTextureScaleMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_TextureID textureID,
-                                                    int scaleMode);
-
-/**
- * \fn int SDL_GetTextureScaleMode(SDL_TextureID textureID, int *scaleMode)
- *
- * \brief Get the scale mode used for texture copy operations
- *
- * \param texture The texture to query
- * \param scaleMode A pointer filled in with the current scale mode
- *
- * \return 0 on success, or -1 if the texture is not valid
- *
- * \sa SDL_SetTextureScaleMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_TextureID textureID,
-                                                    int *scaleMode);
-
-/**
- * \fn int SDL_UpdateTexture(SDL_TextureID textureID, const SDL_Rect *rect, const void *pixels, int pitch)
- *
- * \brief Update the given texture rectangle with new pixel data.
- *
- * \param texture The texture to update
- * \param rect A pointer to the rectangle of pixels to update, or NULL to update the entire texture.
- * \param pixels The raw pixel data
- * \param pitch The number of bytes between rows of pixel data
- *
- * \return 0 on success, or -1 if the texture is not valid
- *
- * \note This is a fairly slow function.
- */
-extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_TextureID textureID,
-                                              const SDL_Rect * rect,
-                                              const void *pixels, int pitch);
-
-/**
- * \fn void SDL_LockTexture(SDL_TextureID textureID, const SDL_Rect *rect, int markDirty, void **pixels, int *pitch)
- *
- * \brief Lock a portion of the texture for pixel access.
- *
- * \param textureID The texture to lock for access, which was created with SDL_TEXTUREACCESS_STREAMING.
- * \param rect A pointer to the rectangle to lock for access. If the rect is NULL, the entire texture will be locked.
- * \param markDirty If this is nonzero, the locked area will be marked dirty when the texture is unlocked.
- * \param pixels This is filled in with a pointer to the locked pixels, appropriately offset by the locked area.
- * \param pitch This is filled in with the pitch of the locked pixels.
- *
- * \return 0 on success, or -1 if the texture is not valid or was created with SDL_TEXTUREACCESS_STATIC
- *
- * \sa SDL_DirtyTexture()
- * \sa SDL_UnlockTexture()
- */
-extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_TextureID textureID,
-                                            const SDL_Rect * rect,
-                                            int markDirty, void **pixels,
-                                            int *pitch);
-
-/**
- * \fn void SDL_UnlockTexture(SDL_TextureID textureID)
- *
- * \brief Unlock a texture, uploading the changes to video memory, if needed.
- *
- * \sa SDL_LockTexture()
- * \sa SDL_DirtyTexture()
- */
-extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_TextureID textureID);
-
-/**
- * \fn void SDL_DirtyTexture(SDL_TextureID textureID, int numrects, const SDL_Rect * rects)
- *
- * \brief Mark the specified rectangles of the texture as dirty.
- *
- * \param textureID The texture to mark dirty, which was created with SDL_TEXTUREACCESS_STREAMING.
- * \param numrects The number of rectangles pointed to by rects.
- * \param rects The pointer to an array of dirty rectangles.
- *
- * \sa SDL_LockTexture()
- * \sa SDL_UnlockTexture()
- */
-extern DECLSPEC void SDLCALL SDL_DirtyTexture(SDL_TextureID textureID,
-                                              int numrects,
-                                              const SDL_Rect * rects);
-
-/**
- * \fn void SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
- *
- * \brief Set the color used for drawing operations (Fill and Line).
- *
- * \param r The red value used to draw on the rendering target
- * \param g The green value used to draw on the rendering target
- * \param b The blue value used to draw on the rendering target
- * \param a The alpha value used to draw on the rendering target, usually SDL_ALPHA_OPAQUE (255)
- * \return 0 on success, or -1 if there is no rendering context current
- */
-extern DECLSPEC int SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b,
-                                           Uint8 a);
-
-/**
- * \fn void SDL_GetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
- *
- * \brief Get the color used for drawing operations (Fill and Line).
- *
- * \param r A pointer to the red value used to draw on the rendering target
- * \param g A pointer to the green value used to draw on the rendering target
- * \param b A pointer to the blue value used to draw on the rendering target
- * \param a A pointer to the alpha value used to draw on the rendering target, usually SDL_ALPHA_OPAQUE (255)
- * \return 0 on success, or -1 if there is no rendering context current
- */
-extern DECLSPEC int SDL_GetRenderDrawColor(Uint8 * r, Uint8 * g, Uint8 * b,
-                                           Uint8 * a);
-
-/**
- * \fn int SDL_SetRenderDrawBlendMode(int blendMode)
- *
- * \brief Set the blend mode used for drawing operations (Fill and Line).
- *
- * \param blendMode SDL_BlendMode to use for blending
- *
- * \return 0 on success, or -1 if there is no rendering context current
- *
- * \note If the blend mode is not supported, the closest supported mode is chosen.
- *
- * \sa SDL_SetRenderDrawBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(int blendMode);
-
-/**
- * \fn int SDL_GetRenderDrawBlendMode(int *blendMode)
- *
- * \brief Get the blend mode used for drawing operations
- *
- * \param blendMode A pointer filled in with the current blend mode
- *
- * \return 0 on success, or -1 if there is no rendering context current
- *
- * \sa SDL_SetRenderDrawBlendMode()
- */
-extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(int *blendMode);
-
-/**
- * \fn int SDL_RenderPoint(int x, int y)
- *
- * \brief Draw a point on the current rendering target.
- *
- * \param x The x coordinate of the point
- * \param y The y coordinate of the point
- *
- * \return 0 on success, or -1 if there is no rendering context current
- */
-extern DECLSPEC int SDLCALL SDL_RenderPoint(int x, int y);
-
-/**
- * \fn int SDL_RenderLine(int x1, int y1, int x2, int y2)
- *
- * \brief Draw a line on the current rendering target.
- *
- * \param x1 The x coordinate of the start point
- * \param y1 The y coordinate of the start point
- * \param x2 The x coordinate of the end point
- * \param y2 The y coordinate of the end point
- *
- * \return 0 on success, or -1 if there is no rendering context current
- */
-extern DECLSPEC int SDLCALL SDL_RenderLine(int x1, int y1, int x2, int y2);
-
-/**
- * \fn void SDL_RenderFill(const SDL_Rect *rect)
- *
- * \brief Fill the current rendering target with the drawing color.
- *
- * \param r The red value used to fill the rendering target
- * \param g The green value used to fill the rendering target
- * \param b The blue value used to fill the rendering target
- * \param a The alpha value used to fill the rendering target, usually SDL_ALPHA_OPAQUE (255)
- * \param rect A pointer to the destination rectangle, or NULL for the entire rendering target.
- *
- * \return 0 on success, or -1 if there is no rendering context current
- */
-extern DECLSPEC int SDLCALL SDL_RenderFill(const SDL_Rect * rect);
-
-/**
- * \fn int SDL_RenderCopy(SDL_TextureID textureID, const SDL_Rect *srcrect, const SDL_Rect *dstrect)
- *
- * \brief Copy a portion of the texture to the current rendering target.
- *
- * \param texture The source texture.
- * \param srcrect A pointer to the source rectangle, or NULL for the entire texture.
- * \param dstrect A pointer to the destination rectangle, or NULL for the entire rendering target.
- *
- * \return 0 on success, or -1 if there is no rendering context current, or the driver doesn't support the requested operation.
- */
-extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_TextureID textureID,
-                                           const SDL_Rect * srcrect,
-                                           const SDL_Rect * dstrect);
-
-/**
- * \fn int SDL_RenderReadPixels(const SDL_Rect *rect, void *pixels, int pitch)
- *
- * \brief Read pixels from the current rendering target.
- *
- * \param rect A pointer to the rectangle to read, or NULL for the entire render target
- * \param pixels A pointer to be filled in with the pixel data
- * \param pitch The pitch of the pixels parameter
- *
- * \return 0 on success, or -1 if pixel reading is not supported.
- *
- * \warning This is a very slow operation, and should not be used frequently.
- */
-extern DECLSPEC int SDLCALL SDL_RenderReadPixels(const SDL_Rect * rect,
-                                                 void *pixels, int pitch);
-
-/**
- * \fn int SDL_RenderWritePixels(const SDL_Rect *rect, const void *pixels, int pitch)
- *
- * \brief Write pixels to the current rendering target.
- *
- * \param rect A pointer to the rectangle to write, or NULL for the entire render target
- * \param pixels A pointer to the pixel data to write
- * \param pitch The pitch of the pixels parameter
- *
- * \return 0 on success, or -1 if pixel writing is not supported.
- *
- * \warning This is a very slow operation, and should not be used frequently.
- */
-extern DECLSPEC int SDLCALL SDL_RenderWritePixels(const SDL_Rect * rect,
-                                                  const void *pixels,
-                                                  int pitch);
-
-/**
- * \fn void SDL_RenderPresent(void)
- *
- * \brief Update the screen with rendering performed.
- */
-extern DECLSPEC void SDLCALL SDL_RenderPresent(void);
-
-/**
- * \fn void SDL_DestroyTexture(SDL_TextureID textureID);
- *
- * \brief Destroy the specified texture.
- *
- * \sa SDL_CreateTexture()
- * \sa SDL_CreateTextureFromSurface()
- */
-extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_TextureID textureID);
-
-/**
- * \fn void SDL_DestroyRenderer(SDL_WindowID windowID);
- *
- * \brief Destroy the rendering context for a window and free associated
- *        textures.
- *
- * \sa SDL_CreateRenderer()
- */
-extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_WindowID windowID);
-
-/**
- * \fn SDL_bool SDL_IsScreenSaverEnabled();
- *
- * \brief Returns whether the screensaver is currently enabled (default off).
- *
- * \sa SDL_EnableScreenSaver()
- * \sa SDL_DisableScreenSaver()
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
-
-/**
- * \fn void SDL_EnableScreenSaver();
- *
- * \brief Allow the screen to be blanked by a screensaver
- *
- * \sa SDL_IsScreenSaverEnabled()
- * \sa SDL_DisableScreenSaver()
- */
-extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
-
-/**
- * \fn void SDL_DisableScreenSaver();
- *
- * \brief Prevent the screen from being blanked by a screensaver
- *
- * \sa SDL_IsScreenSaverEnabled()
- * \sa SDL_EnableScreenSaver()
- */
-extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* OpenGL support functions.                                                 */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * \fn int SDL_GL_LoadLibrary(const char *path)
- *
- * \brief Dynamically load an OpenGL library.
- *
- * \param path The platform dependent OpenGL library name, or NULL to open the default OpenGL library
- *
- * \return 0 on success, or -1 if the library couldn't be loaded
- *
- * This should be done after initializing the video driver, but before
- * creating any OpenGL windows.  If no OpenGL library is loaded, the default
- * library will be loaded upon creation of the first OpenGL window.
- *
- * \note If you do this, you need to retrieve all of the GL functions used in
- *       your program from the dynamic library using SDL_GL_GetProcAddress().
- *
- * \sa SDL_GL_GetProcAddress()
- */
-extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
-
-/**
- * \fn void *SDL_GL_GetProcAddress(const char *proc)
- *
- * \brief Get the address of an OpenGL function.
- */
-extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc);
-
-/**
- * \fn SDL_bool SDL_GL_ExtensionSupported(const char *extension)
- *
- * \brief Return true if an OpenGL extension is supported for the current context.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char
-                                                           *extension);
-
-/**
- * \fn int SDL_GL_SetAttribute(SDL_GLattr attr, int value)
- *
- * \brief Set an OpenGL window attribute before window creation.
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-/**
- * \fn int SDL_GL_GetWindowAttribute(SDL_WindowID windowID, SDL_GLattr attr, int *value)
- *
- * \brief Get the actual value for an attribute from the current context.
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value);
-
-/**
- * \fn SDL_GLContext SDL_GL_CreateContext(SDL_WindowID windowID)
- *
- * \brief Create an OpenGL context for use with an OpenGL window, and make it current.
- *
- * \sa SDL_GL_DeleteContext()
- */
-extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_WindowID
-                                                           windowID);
-
-/**
- * \fn int SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context)
- *
- * \brief Set up an OpenGL context for rendering into an OpenGL window.
- *
- * \note The context must have been created with a compatible window.
- */
-extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_WindowID windowID,
-                                               SDL_GLContext context);
-
-/**
- * \fn int SDL_GL_SetSwapInterval(int interval)
- *
- * \brief Set the swap interval for the current OpenGL context.
- *
- * \param interval 0 for immediate updates, 1 for updates synchronized with the vertical retrace
- *
- * \return 0 on success, or -1 if setting the swap interval is not supported.
- *
- * \sa SDL_GL_GetSwapInterval()
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval);
-
-/**
- * \fn int SDL_GL_GetSwapInterval(void)
- *
- * \brief Get the swap interval for the current OpenGL context.
- *
- * \return 0 if there is no vertical retrace synchronization, 1 if the buffer swap is synchronized with the vertical retrace, and -1 if getting the swap interval is not supported.
- *
- * \sa SDL_GL_SetSwapInterval()
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void);
-
-/**
- * \fn void SDL_GL_SwapWindow(SDL_WindowID windowID)
- *
- * \brief Swap the OpenGL buffers for the window, if double-buffering is supported.
- */
-extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_WindowID windowID);
-
-/**
- * \fn void SDL_GL_DeleteContext(SDL_GLContext context)
- *
- * \brief Delete an OpenGL context.
- *
- * \sa SDL_GL_CreateContext()
- */
-extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Externals/SDL/Include_1.3/begin_code.h b/Externals/SDL/Include_1.3/begin_code.h
deleted file mode 100644
index 33e8e53484..0000000000
--- a/Externals/SDL/Include_1.3/begin_code.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file sets things up for C dynamic library function definitions,
-   static inlined functions, and structures aligned at 4-byte alignment.
-   If you don't like ugly C preprocessor code, don't look at this file. :)
-*/
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__BEOS__)
-#  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
-#  else
-#   define DECLSPEC	__declspec(export)
-#  endif
-# elif defined(__WIN32__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC
-#   else
-#    define DECLSPEC	__declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC	__declspec(dllexport)
-#  endif
-# elif defined(__OS2__)
-#  ifdef __WATCOMC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC	__declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC	__attribute__ ((visibility("default")))
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if defined(__WIN32__) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#ifdef __OS2__
-/* But on OS/2, we use the _System calling convention */
-/* to be compatible with every compiler */
-#define SDLCALL _System
-#else
-#define SDLCALL
-#endif
-#endif
-#endif /* SDLCALL */
-
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
-#ifdef __SYMBIAN32__
-#undef DECLSPEC
-#define DECLSPEC
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
-   This is necessary if the header is included in code which has structure
-   packing set to an alternate value, say for loading structures from disk.
-   The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#endif /* Compiler needs structure packing set */
-
-/* Set up compiler-specific options for inlining functions */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
-    defined(__DMC__) || defined(__SC__) || \
-    defined(__WATCOMC__) || defined(__LCC__) || \
-    defined(__DECC)
-#ifndef __inline__
-#define __inline__	__inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/* If inlining isn't supported, remove "__inline__", turning static
-   inlined functions into static functions (resulting in code bloat
-   in all files which include the offending header files)
-*/
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/Externals/SDL/Include_1.3/close_code.h b/Externals/SDL/Include_1.3/close_code.h
deleted file mode 100644
index 660933d5f5..0000000000
--- a/Externals/SDL/Include_1.3/close_code.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* This file reverses the effects of begin_code.h and should be included
-   after you finish any function and structure declarations in your headers
-*/
-
-#undef _begin_code_h
-
-/* Reset structure packing at previous byte alignment */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(pop)
-#endif /* Compiler needs structure packing set */
diff --git a/Externals/SDL/Include_1.3/doxyfile b/Externals/SDL/Include_1.3/doxyfile
deleted file mode 100644
index e53097f4bd..0000000000
--- a/Externals/SDL/Include_1.3/doxyfile
+++ /dev/null
@@ -1,1229 +0,0 @@
-# Doxyfile 1.4.4
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = SDL
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 1.3.0
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = docs
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
-# Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is YES.
-
-SHOW_DIRECTORIES       = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from the 
-# version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the progam writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = 
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          = 
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = DOXYGEN_SHOULD_IGNORE_THIS=1 \
-                         DECLSPEC= SDLCALL=
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = NO
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that a graph may be further truncated if the graph's 
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
-# the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, which results in a white background. 
-# Warning: Depending on the platform used, enabling this option may lead to 
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
-# read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/Externals/SDL/SDL/SDL.h b/Externals/SDL/SDL/SDL.h
deleted file mode 100644
index 9f5fdd4bb4..0000000000
--- a/Externals/SDL/SDL/SDL.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SDL_config.h"
-#include "include/SDL.h"
diff --git a/Externals/SDL/SDL/SDL_config_bsd.h b/Externals/SDL/SDL/SDL_config_bsd.h
deleted file mode 100644
index 552349837e..0000000000
--- a/Externals/SDL/SDL/SDL_config_bsd.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include <sys/ioctl.h>	/* XXX */
-
-#define SDL_JOYSTICK_USBHID 1
-
-#define HAVE_USBHID_H 1
-#define USBHID_NEW
-#define USBHID_UCR_DATA
-
-#define HAVE_ABS 1
-#define HAVE_ALLOCA 1
-#define HAVE_ATOF 1
-#define HAVE_ATOI 1
-#define HAVE_BCOPY 1
-#define HAVE_CALLOC 1
-#define HAVE_CTYPE_H 1
-#define HAVE_FREE 1
-#define HAVE_GETENV 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_MALLOC 1
-#define HAVE_MATH_H 1
-#define HAVE_MEMCMP 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MEMSET 1
-#define HAVE_MPROTECT 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_PUTENV 1
-#define HAVE_QSORT 1
-#define HAVE_REALLOC 1
-#define HAVE_SETJMP 1
-#define HAVE_SIGACTION 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_SNPRINTF 1
-#define HAVE_SSCANF 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDIO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRCMP 1
-#define HAVE_STRDUP 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLEN 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOD 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOULL 1
-#define HAVE_SYS_TYPES_H
-#define HAVE_UNSETENV 1
-#define HAVE_VSNPRINTF 1
-
-#endif
diff --git a/Externals/SDL/SDL/SDL_config_linux.h b/Externals/SDL/SDL/SDL_config_linux.h
deleted file mode 100644
index 79571abb87..0000000000
--- a/Externals/SDL/SDL/SDL_config_linux.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
-
-/* C datatypes */
-/* #undef size_t */
-/* #undef int8_t */
-/* #undef uint8_t */
-/* #undef int16_t */
-/* #undef uint16_t */
-/* #undef int32_t */
-/* #undef uint32_t */
-/* #undef int64_t */
-/* #undef uint64_t */
-/* #undef uintptr_t */
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Endianness */
-#define SDL_BYTEORDER 1234
-
-/* Comment this if you want to build without any C library requirements */
-#define HAVE_LIBC 1
-#if HAVE_LIBC
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-/* #undef HAVE_ALTIVEC_H */
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#endif
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-/* #undef HAVE_STRLCPY */
-/* #undef HAVE_STRLCAT */
-#define HAVE_STRDUP 1
-/* #undef HAVE__STRREV */
-/* #undef HAVE__STRUPR */
-/* #undef HAVE__STRLWR */
-/* #undef HAVE_INDEX */
-/* #undef HAVE_RINDEX */
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_ITOA */
-/* #undef HAVE__LTOA */
-/* #undef HAVE__UITOA */
-/* #undef HAVE__ULTOA */
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-/* #undef HAVE__I64TOA */
-/* #undef HAVE__UI64TOA */
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/* #undef HAVE__STRICMP */
-#define HAVE_STRCASECMP 1
-/* #undef HAVE__STRNICMP */
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_ICONV 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETJMP 1
-#define HAVE_NANOSLEEP 1
-/* #undef HAVE_CLOCK_GETTIME */
-#define HAVE_GETPAGESIZE 1
-#define HAVE_MPROTECT 1
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* Allow disabling of core subsystems */
-/* #undef SDL_AUDIO_DISABLED */
-/* #undef SDL_CDROM_DISABLED */
-/* #undef SDL_CPUINFO_DISABLED */
-/* #undef SDL_EVENTS_DISABLED */
-/* #undef SDL_FILE_DISABLED */
-/* #undef SDL_JOYSTICK_DISABLED */
-/* #undef SDL_LOADSO_DISABLED */
-/* #undef SDL_THREADS_DISABLED */
-/* #undef SDL_TIMERS_DISABLED */
-/* #undef SDL_VIDEO_DISABLED */
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_ALSA 1
-#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
-/* #undef SDL_AUDIO_DRIVER_ARTS */
-/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_BAUDIO */
-/* #undef SDL_AUDIO_DRIVER_BSD */
-/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
-/* #undef SDL_AUDIO_DRIVER_DART */
-/* #undef SDL_AUDIO_DRIVER_DC */
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_DUMMY 1
-/* #undef SDL_AUDIO_DRIVER_DMEDIA */
-/* #undef SDL_AUDIO_DRIVER_DSOUND */
-#define SDL_AUDIO_DRIVER_PULSE 1
-#define SDL_AUDIO_DRIVER_PULSE_DYNAMIC "libpulse-simple.so.0"
-#define SDL_AUDIO_DRIVER_ESD 1
-#define SDL_AUDIO_DRIVER_ESD_DYNAMIC "libesd.so.0"
-/* #undef SDL_AUDIO_DRIVER_MINT */
-/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
-#define SDL_AUDIO_DRIVER_NAS 1
-#define SDL_AUDIO_DRIVER_NAS_DYNAMIC "libaudio.so.2"
-#define SDL_AUDIO_DRIVER_OSS 1
-/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
-/* #undef SDL_AUDIO_DRIVER_PAUD */
-/* #undef SDL_AUDIO_DRIVER_QNXNTO */
-/* #undef SDL_AUDIO_DRIVER_SNDMGR */
-/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
-/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
-
-/* Enable various cdrom drivers */
-/* #undef SDL_CDROM_AIX */
-/* #undef SDL_CDROM_BEOS */
-/* #undef SDL_CDROM_BSDI */
-/* #undef SDL_CDROM_DC */
-/* #undef SDL_CDROM_DUMMY */
-/* #undef SDL_CDROM_FREEBSD */
-#define SDL_CDROM_LINUX 1
-/* #undef SDL_CDROM_MACOS */
-/* #undef SDL_CDROM_MACOSX */
-/* #undef SDL_CDROM_MINT */
-/* #undef SDL_CDROM_OPENBSD */
-/* #undef SDL_CDROM_OS2 */
-/* #undef SDL_CDROM_OSF */
-/* #undef SDL_CDROM_QNX */
-/* #undef SDL_CDROM_WIN32 */
-
-/* Enable various input drivers */
-#define SDL_INPUT_LINUXEV 1
-/* #undef SDL_INPUT_TSLIB */
-/* #undef SDL_JOYSTICK_BEOS */
-/* #undef SDL_JOYSTICK_DC */
-/* #undef SDL_JOYSTICK_DUMMY */
-/* #undef SDL_JOYSTICK_IOKIT */
-#define SDL_JOYSTICK_LINUX 1
-/* #undef SDL_JOYSTICK_MACOS */
-/* #undef SDL_JOYSTICK_MINT */
-/* #undef SDL_JOYSTICK_OS2 */
-/* #undef SDL_JOYSTICK_RISCOS */
-/* #undef SDL_JOYSTICK_WINMM */
-/* #undef SDL_JOYSTICK_USBHID */
-/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
-
-/* Enable various shared object loading systems */
-/* #undef SDL_LOADSO_BEOS */
-/* #undef SDL_LOADSO_DLCOMPAT */
-#define SDL_LOADSO_DLOPEN 1
-/* #undef SDL_LOADSO_DUMMY */
-/* #undef SDL_LOADSO_LDG */
-/* #undef SDL_LOADSO_MACOS */
-/* #undef SDL_LOADSO_OS2 */
-/* #undef SDL_LOADSO_WIN32 */
-
-/* Enable various threading systems */
-/* #undef SDL_THREAD_BEOS */
-/* #undef SDL_THREAD_DC */
-/* #undef SDL_THREAD_OS2 */
-/* #undef SDL_THREAD_PTH */
-#define SDL_THREAD_PTHREAD 1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
-/* #undef SDL_THREAD_SPROC */
-/* #undef SDL_THREAD_WIN32 */
-
-/* Enable various timer systems */
-/* #undef SDL_TIMER_BEOS */
-/* #undef SDL_TIMER_DC */
-/* #undef SDL_TIMER_DUMMY */
-/* #undef SDL_TIMER_MACOS */
-/* #undef SDL_TIMER_MINT */
-/* #undef SDL_TIMER_OS2 */
-/* #undef SDL_TIMER_RISCOS */
-#define SDL_TIMER_UNIX 1
-/* #undef SDL_TIMER_WIN32 */
-/* #undef SDL_TIMER_WINCE */
-
-/* Enable various video drivers */
-/* #undef SDL_VIDEO_DRIVER_AALIB */
-/* #undef SDL_VIDEO_DRIVER_BWINDOW */
-/* #undef SDL_VIDEO_DRIVER_CACA */
-/* #undef SDL_VIDEO_DRIVER_DC */
-/* #undef SDL_VIDEO_DRIVER_DDRAW */
-#define SDL_VIDEO_DRIVER_DGA 1
-#define SDL_VIDEO_DRIVER_DIRECTFB 1
-/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
-#define SDL_VIDEO_DRIVER_DUMMY 1
-#define SDL_VIDEO_DRIVER_FBCON 1
-/* #undef SDL_VIDEO_DRIVER_GAPI */
-/* #undef SDL_VIDEO_DRIVER_GEM */
-/* #undef SDL_VIDEO_DRIVER_GGI */
-/* #undef SDL_VIDEO_DRIVER_IPOD */
-/* #undef SDL_VIDEO_DRIVER_NANOX */
-/* #undef SDL_VIDEO_DRIVER_OS2FS */
-/* #undef SDL_VIDEO_DRIVER_PHOTON */
-/* #undef SDL_VIDEO_DRIVER_PICOGUI */
-/* #undef SDL_VIDEO_DRIVER_PS2GS */
-/* #undef SDL_VIDEO_DRIVER_PS3 */
-/* #undef SDL_VIDEO_DRIVER_QTOPIA */
-/* #undef SDL_VIDEO_DRIVER_QUARTZ */
-/* #undef SDL_VIDEO_DRIVER_RISCOS */
-/* #undef SDL_VIDEO_DRIVER_SVGALIB */
-/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
-/* #undef SDL_VIDEO_DRIVER_VGL */
-/* #undef SDL_VIDEO_DRIVER_WINDIB */
-/* #undef SDL_VIDEO_DRIVER_WSCONS */
-#define SDL_VIDEO_DRIVER_X11 1
-#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1"
-#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
-#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
-#define SDL_VIDEO_DRIVER_X11_XME 1
-#define SDL_VIDEO_DRIVER_X11_XRANDR 1
-#define SDL_VIDEO_DRIVER_X11_XV 1
-/* #undef SDL_VIDEO_DRIVER_XBIOS */
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL 1
-#define SDL_VIDEO_OPENGL_GLX 1
-/* #undef SDL_VIDEO_OPENGL_WGL */
-/* #undef SDL_VIDEO_OPENGL_OSMESA */
-/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
-
-/* Disable screensaver */
-#define SDL_VIDEO_DISABLE_SCREENSAVER 1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-/* #undef SDL_HERMES_BLITTERS */
-/* #undef SDL_ALTIVEC_BLITTERS */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/SDL/SDL_version.h b/Externals/SDL/SDL/SDL_version.h
deleted file mode 100644
index 4fe1f31514..0000000000
--- a/Externals/SDL/SDL/SDL_version.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "include/SDL_version.h"
diff --git a/Externals/SDL/SDL_config.h b/Externals/SDL/SDL_config.h
deleted file mode 100644
index 8f91437cb1..0000000000
--- a/Externals/SDL/SDL_config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <sys/param.h>
-
-#if defined __APPLE__
-#include "include/SDL_config_macosx.h"
-#elif defined BSD4_4
-#include "SDL/SDL_config_bsd.h"
-#elif defined __linux__
-#include "SDL/SDL_config_linux.h"
-#endif
-
-#define SDL_AUDIO_DISABLED 1
-#define SDL_CDROM_DISABLED 1
-#define SDL_CPUINFO_DISABLED 1
-#define SDL_EVENTS_DISABLED 1
-#define SDL_FILE_DISABLED 1
-#undef SDL_JOYSTICK_DISABLED
-#define SDL_LOADSO_DISABLED 1
-#define SDL_THREADS_DISABLED 1
-#define SDL_TIMERS_DISABLED 1
-#define SDL_VIDEO_DISABLED 1
-
diff --git a/Externals/SDL/include/SDL.h b/Externals/SDL/include/SDL.h
deleted file mode 100644
index 119ed7ff14..0000000000
--- a/Externals/SDL/include/SDL.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL.h
- *  Main include header for the SDL library
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_audio.h"
-#include "SDL_cdrom.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_loadso.h"
-#include "SDL_mutex.h"
-#include "SDL_rwops.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL.h
- *  @note As of version 0.5, SDL is loaded dynamically into the application
- */
-
-/** @name SDL_INIT Flags
- *  These are the flags which may be passed to SDL_Init() -- you should
- *  specify the subsystems which you will be using in your application.
- */
-/*@{*/
-#define	SDL_INIT_TIMER		0x00000001
-#define SDL_INIT_AUDIO		0x00000010
-#define SDL_INIT_VIDEO		0x00000020
-#define SDL_INIT_CDROM		0x00000100
-#define SDL_INIT_JOYSTICK	0x00000200
-#define SDL_INIT_NOPARACHUTE	0x00100000	/**< Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD	0x01000000	/**< Not supported on all OS's */
-#define SDL_INIT_EVERYTHING	0x0000FFFF
-/*@}*/
-
-/** This function loads the SDL dynamically linked library and initializes 
- *  the subsystems specified by 'flags' (and those satisfying dependencies)
- *  Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- *  signal handlers for some commonly ignored fatal signals (like SIGSEGV)
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/** This function initializes specific SDL subsystems */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/** This function cleans up specific SDL subsystems */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/** This function returns mask of the specified subsystems which have
- *  been initialized.
- *  If 'flags' is 0, it returns a mask of all initialized subsystems.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/** This function cleans up all initialized subsystems and unloads the
- *  dynamically linked library.  You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
diff --git a/Externals/SDL/include/SDL_active.h b/Externals/SDL/include/SDL_active.h
deleted file mode 100644
index 0ae92f2d56..0000000000
--- a/Externals/SDL/include/SDL_active.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_active.h
- *  Include file for SDL application focus event handling 
- */
-
-#ifndef _SDL_active_h
-#define _SDL_active_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name The available application states */
-/*@{*/
-#define SDL_APPMOUSEFOCUS	0x01		/**< The app has mouse coverage */
-#define SDL_APPINPUTFOCUS	0x02		/**< The app has input focus */
-#define SDL_APPACTIVE		0x04		/**< The application is active */
-/*@}*/
-
-/* Function prototypes */
-/** 
- * This function returns the current state of the application, which is a
- * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
- * SDL_APPACTIVE.  If SDL_APPACTIVE is set, then the user is able to
- * see your application, otherwise it has been iconified or disabled.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_active_h */
diff --git a/Externals/SDL/include/SDL_audio.h b/Externals/SDL/include/SDL_audio.h
deleted file mode 100644
index 3a8e7fa8b8..0000000000
--- a/Externals/SDL/include/SDL_audio.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_audio.h
- *  Access to the raw audio mixing buffer for the SDL library
- */
-
-#ifndef _SDL_audio_h
-#define _SDL_audio_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * When filling in the desired audio spec structure,
- * - 'desired->freq' should be the desired audio frequency in samples-per-second.
- * - 'desired->format' should be the desired audio format.
- * - 'desired->samples' is the desired size of the audio buffer, in samples.
- *     This number should be a power of two, and may be adjusted by the audio
- *     driver to a value more suitable for the hardware.  Good values seem to
- *     range between 512 and 8096 inclusive, depending on the application and
- *     CPU speed.  Smaller values yield faster response time, but can lead
- *     to underflow if the application is doing heavy processing and cannot
- *     fill the audio buffer in time.  A stereo sample consists of both right
- *     and left channels in LR ordering.
- *     Note that the number of samples is directly related to time by the
- *     following formula:  ms = (samples*1000)/freq
- * - 'desired->size' is the size in bytes of the audio buffer, and is
- *     calculated by SDL_OpenAudio().
- * - 'desired->silence' is the value used to set the buffer to silence,
- *     and is calculated by SDL_OpenAudio().
- * - 'desired->callback' should be set to a function that will be called
- *     when the audio device is ready for more data.  It is passed a pointer
- *     to the audio buffer, and the length in bytes of the audio buffer.
- *     This function usually runs in a separate thread, and so you should
- *     protect data structures that it accesses by calling SDL_LockAudio()
- *     and SDL_UnlockAudio() in your code.
- * - 'desired->userdata' is passed as the first parameter to your callback
- *     function.
- *
- * @note The calculated values in this structure are calculated by SDL_OpenAudio()
- *
- */
-typedef struct SDL_AudioSpec {
-	int freq;		/**< DSP frequency -- samples per second */
-	Uint16 format;		/**< Audio data format */
-	Uint8  channels;	/**< Number of channels: 1 mono, 2 stereo */
-	Uint8  silence;		/**< Audio buffer silence value (calculated) */
-	Uint16 samples;		/**< Audio buffer size in samples (power of 2) */
-	Uint16 padding;		/**< Necessary for some compile environments */
-	Uint32 size;		/**< Audio buffer size in bytes (calculated) */
-	/**
-	 *  This function is called when the audio device needs more data.
-	 *
-	 *  @param[out] stream	A pointer to the audio data buffer
-	 *  @param[in]  len	The length of the audio buffer in bytes.
-	 *
-	 *  Once the callback returns, the buffer will no longer be valid.
-	 *  Stereo samples are stored in a LRLRLR ordering.
-	 */
-	void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
-	void  *userdata;
-} SDL_AudioSpec;
-
-/**
- *  @name Audio format flags
- *  defaults to LSB byte order
- */
-/*@{*/
-#define AUDIO_U8	0x0008	/**< Unsigned 8-bit samples */
-#define AUDIO_S8	0x8008	/**< Signed 8-bit samples */
-#define AUDIO_U16LSB	0x0010	/**< Unsigned 16-bit samples */
-#define AUDIO_S16LSB	0x8010	/**< Signed 16-bit samples */
-#define AUDIO_U16MSB	0x1010	/**< As above, but big-endian byte order */
-#define AUDIO_S16MSB	0x9010	/**< As above, but big-endian byte order */
-#define AUDIO_U16	AUDIO_U16LSB
-#define AUDIO_S16	AUDIO_S16LSB
-
-/**
- *  @name Native audio byte ordering
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define AUDIO_U16SYS	AUDIO_U16LSB
-#define AUDIO_S16SYS	AUDIO_S16LSB
-#else
-#define AUDIO_U16SYS	AUDIO_U16MSB
-#define AUDIO_S16SYS	AUDIO_S16MSB
-#endif
-/*@}*/
-
-/*@}*/
-
-
-/** A structure to hold a set of audio conversion filters and buffers */
-typedef struct SDL_AudioCVT {
-	int needed;			/**< Set to 1 if conversion possible */
-	Uint16 src_format;		/**< Source audio format */
-	Uint16 dst_format;		/**< Target audio format */
-	double rate_incr;		/**< Rate conversion increment */
-	Uint8 *buf;			/**< Buffer to hold entire audio data */
-	int    len;			/**< Length of original audio buffer */
-	int    len_cvt;			/**< Length of converted audio buffer */
-	int    len_mult;		/**< buffer must be len*len_mult big */
-	double len_ratio; 	/**< Given len, final size is len*len_ratio */
-	void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
-	int filter_index;		/**< Current audio conversion function */
-} SDL_AudioCVT;
-
-
-/* Function prototypes */
-
-/**
- * @name Audio Init and Quit
- * These functions are used internally, and should not be used unless you
- * have a specific need to specify the audio driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-/*@{*/
-extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
-extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-/*@}*/
-
-/**
- * This function fills the given character buffer with the name of the
- * current audio driver, and returns a pointer to it if the audio driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
-
-/**
- * This function opens the audio device with the desired parameters, and
- * returns 0 if successful, placing the actual hardware parameters in the
- * structure pointed to by 'obtained'.  If 'obtained' is NULL, the audio
- * data passed to the callback function will be guaranteed to be in the
- * requested format, and will be automatically converted to the hardware
- * audio format if necessary.  This function returns -1 if it failed 
- * to open the audio device, or couldn't set up the audio thread.
- *
- * The audio device starts out playing silence when it's opened, and should
- * be enabled for playing by calling SDL_PauseAudio(0) when you are ready
- * for your audio callback function to be called.  Since the audio driver
- * may modify the requested size of the audio buffer, you should allocate
- * any local mixing buffers after you open the audio device.
- *
- * @sa SDL_AudioSpec
- */
-extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
-
-typedef enum {
-	SDL_AUDIO_STOPPED = 0,
-	SDL_AUDIO_PLAYING,
-	SDL_AUDIO_PAUSED
-} SDL_audiostatus;
-
-/** Get the current audio state */
-extern DECLSPEC SDL_audiostatus SDLCALL SDL_GetAudioStatus(void);
-
-/**
- * This function pauses and unpauses the audio callback processing.
- * It should be called with a parameter of 0 after opening the audio
- * device to start playing sound.  This is so you can safely initialize
- * data for your callback function after opening the audio device.
- * Silence will be written to the audio device during the pause.
- */
-extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
-
-/**
- * This function loads a WAVE from the data source, automatically freeing
- * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
- * you could do:
- *	@code SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); @endcode
- *
- * If this function succeeds, it returns the given SDL_AudioSpec,
- * filled with the audio data format of the wave data, and sets
- * 'audio_buf' to a malloc()'d buffer containing the audio data,
- * and sets 'audio_len' to the length of that audio buffer, in bytes.
- * You need to free the audio buffer with SDL_FreeWAV() when you are 
- * done with it.
- *
- * This function returns NULL and sets the SDL error message if the 
- * wave file cannot be opened, uses an unknown data format, or is 
- * corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
- */
-extern DECLSPEC SDL_AudioSpec * SDLCALL SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
-
-/** Compatibility convenience function -- loads a WAV from a file */
-#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
-	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
-
-/**
- * This function frees data previously allocated with SDL_LoadWAV_RW()
- */
-extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 *audio_buf);
-
-/**
- * This function takes a source format and rate and a destination format
- * and rate, and initializes the 'cvt' structure with information needed
- * by SDL_ConvertAudio() to convert a buffer of audio data from one format
- * to the other.
- *
- * @return This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
-		Uint16 src_format, Uint8 src_channels, int src_rate,
-		Uint16 dst_format, Uint8 dst_channels, int dst_rate);
-
-/**
- * Once you have initialized the 'cvt' structure using SDL_BuildAudioCVT(),
- * created an audio buffer cvt->buf, and filled it with cvt->len bytes of
- * audio data in the source format, this function will convert it in-place
- * to the desired format.
- * The data conversion may expand the size of the audio data, so the buffer
- * cvt->buf should be allocated after the cvt structure is initialized by
- * SDL_BuildAudioCVT(), and should be cvt->len*cvt->len_mult bytes long.
- */
-extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT *cvt);
-
-
-#define SDL_MIX_MAXVOLUME 128
-/**
- * This takes two audio buffers of the playing audio format and mixes
- * them, performing addition, volume adjustment, and overflow clipping.
- * The volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME
- * for full audio volume.  Note this does not change hardware volume.
- * This is provided for convenience -- you can mix your own audio data.
- */
-extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume);
-
-/**
- * @name Audio Locks
- * The lock manipulated by these functions protects the callback function.
- * During a LockAudio/UnlockAudio pair, you can be guaranteed that the
- * callback function is not running.  Do not call these from the callback
- * function or you will cause deadlock.
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_LockAudio(void);
-extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
-/*@}*/
-
-/**
- * This function shuts down audio processing and closes the audio device.
- */
-extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_audio_h */
diff --git a/Externals/SDL/include/SDL_byteorder.h b/Externals/SDL/include/SDL_byteorder.h
deleted file mode 100644
index 9b93cd69a3..0000000000
--- a/Externals/SDL/include/SDL_byteorder.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_byteorder.h
- *  @deprecated Use SDL_endian.h instead
- */
-
-/* DEPRECATED */
-#include "SDL_endian.h"
diff --git a/Externals/SDL/include/SDL_cdrom.h b/Externals/SDL/include/SDL_cdrom.h
deleted file mode 100644
index fff5cfa158..0000000000
--- a/Externals/SDL/include/SDL_cdrom.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_cdrom.h
- *  This is the CD-audio control API for Simple DirectMedia Layer
- */
-
-#ifndef _SDL_cdrom_h
-#define _SDL_cdrom_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @file SDL_cdrom.h
- *  In order to use these functions, SDL_Init() must have been called
- *  with the SDL_INIT_CDROM flag.  This causes SDL to scan the system
- *  for CD-ROM drives, and load appropriate drivers.
- */
-
-/** The maximum number of CD-ROM tracks on a disk */
-#define SDL_MAX_TRACKS	99
-
-/** @name Track Types
- *  The types of CD-ROM track possible
- */
-/*@{*/
-#define SDL_AUDIO_TRACK	0x00
-#define SDL_DATA_TRACK	0x04
-/*@}*/
-
-/** The possible states which a CD-ROM drive can be in. */
-typedef enum {
-	CD_TRAYEMPTY,
-	CD_STOPPED,
-	CD_PLAYING,
-	CD_PAUSED,
-	CD_ERROR = -1
-} CDstatus;
-
-/** Given a status, returns true if there's a disk in the drive */
-#define CD_INDRIVE(status)	((int)(status) > 0)
-
-typedef struct SDL_CDtrack {
-	Uint8 id;		/**< Track number */
-	Uint8 type;		/**< Data or audio track */
-	Uint16 unused;
-	Uint32 length;		/**< Length, in frames, of this track */
-	Uint32 offset;		/**< Offset, in frames, from start of disk */
-} SDL_CDtrack;
-
-/** This structure is only current as of the last call to SDL_CDStatus() */
-typedef struct SDL_CD {
-	int id;			/**< Private drive identifier */
-	CDstatus status;	/**< Current drive status */
-
-	/** The rest of this structure is only valid if there's a CD in drive */
-        /*@{*/
-	int numtracks;		/**< Number of tracks on disk */
-	int cur_track;		/**< Current track position */
-	int cur_frame;		/**< Current frame offset within current track */
-	SDL_CDtrack track[SDL_MAX_TRACKS+1];
-        /*@}*/
-} SDL_CD;
-
-/** @name Frames / MSF Conversion Functions
- *  Conversion functions from frames to Minute/Second/Frames and vice versa
- */
-/*@{*/
-#define CD_FPS	75
-#define FRAMES_TO_MSF(f, M,S,F)	{					\
-	int value = f;							\
-	*(F) = value%CD_FPS;						\
-	value /= CD_FPS;						\
-	*(S) = value%60;						\
-	value /= 60;							\
-	*(M) = value;							\
-}
-#define MSF_TO_FRAMES(M, S, F)	((M)*60*CD_FPS+(S)*CD_FPS+(F))
-/*@}*/
-
-/* CD-audio API functions: */
-
-/**
- *  Returns the number of CD-ROM drives on the system, or -1 if
- *  SDL_Init() has not been called with the SDL_INIT_CDROM flag.
- */
-extern DECLSPEC int SDLCALL SDL_CDNumDrives(void);
-
-/**
- *  Returns a human-readable, system-dependent identifier for the CD-ROM.
- *  Example:
- *   - "/dev/cdrom"
- *   - "E:"
- *   - "/dev/disk/ide/1/master"
- */
-extern DECLSPEC const char * SDLCALL SDL_CDName(int drive);
-
-/**
- *  Opens a CD-ROM drive for access.  It returns a drive handle on success,
- *  or NULL if the drive was invalid or busy.  This newly opened CD-ROM
- *  becomes the default CD used when other CD functions are passed a NULL
- *  CD-ROM handle.
- *  Drives are numbered starting with 0.  Drive 0 is the system default CD-ROM.
- */
-extern DECLSPEC SDL_CD * SDLCALL SDL_CDOpen(int drive);
-
-/**
- *  This function returns the current status of the given drive.
- *  If the drive has a CD in it, the table of contents of the CD and current
- *  play position of the CD will be stored in the SDL_CD structure.
- */
-extern DECLSPEC CDstatus SDLCALL SDL_CDStatus(SDL_CD *cdrom);
-
-/**
- *  Play the given CD starting at 'start_track' and 'start_frame' for 'ntracks'
- *  tracks and 'nframes' frames.  If both 'ntrack' and 'nframe' are 0, play 
- *  until the end of the CD.  This function will skip data tracks.
- *  This function should only be called after calling SDL_CDStatus() to 
- *  get track information about the CD.
- *  For example:
- *      @code
- *	// Play entire CD:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
- *		SDL_CDPlayTracks(cdrom, 0, 0, 0, 0);
- *	// Play last track:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) ) {
- *		SDL_CDPlayTracks(cdrom, cdrom->numtracks-1, 0, 0, 0);
- *	}
- *	// Play first and second track and 10 seconds of third track:
- *	if ( CD_INDRIVE(SDL_CDStatus(cdrom)) )
- *		SDL_CDPlayTracks(cdrom, 0, 0, 2, 10);
- *      @endcode
- *
- *  @return This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_CDPlayTracks(SDL_CD *cdrom,
-		int start_track, int start_frame, int ntracks, int nframes);
-
-/**
- *  Play the given CD starting at 'start' frame for 'length' frames.
- *  @return It returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_CDPlay(SDL_CD *cdrom, int start, int length);
-
-/** Pause play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDPause(SDL_CD *cdrom);
-
-/** Resume play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDResume(SDL_CD *cdrom);
-
-/** Stop play
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDStop(SDL_CD *cdrom);
-
-/** Eject CD-ROM
- *  @return returns 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_CDEject(SDL_CD *cdrom);
-
-/** Closes the handle for the CD-ROM drive */
-extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/Externals/SDL/include/SDL_config.h b/Externals/SDL/include/SDL_config.h
deleted file mode 100644
index a50810169c..0000000000
--- a/Externals/SDL/include/SDL_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__SYMBIAN32__)
-#include "SDL_config_symbian.h"  /* must be before win32! */
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/include/SDL_config.h.default b/Externals/SDL/include/SDL_config.h.default
deleted file mode 100644
index a50810169c..0000000000
--- a/Externals/SDL/include/SDL_config.h.default
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__SYMBIAN32__)
-#include "SDL_config_symbian.h"  /* must be before win32! */
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/include/SDL_config.h.in b/Externals/SDL/include/SDL_config.h.in
deleted file mode 100644
index 58593ca2a5..0000000000
--- a/Externals/SDL/include/SDL_config.h.in
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-#undef const
-#undef inline
-#undef volatile
-
-/* C datatypes */
-#undef size_t
-#undef int8_t
-#undef uint8_t
-#undef int16_t
-#undef uint16_t
-#undef int32_t
-#undef uint32_t
-#undef int64_t
-#undef uint64_t
-#undef uintptr_t
-#undef SDL_HAS_64BIT_TYPE
-
-/* Endianness */
-#undef SDL_BYTEORDER
-
-/* Comment this if you want to build without any C library requirements */
-#undef HAVE_LIBC
-#if HAVE_LIBC
-
-/* Useful headers */
-#undef HAVE_ALLOCA_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_STDIO_H
-#undef STDC_HEADERS
-#undef HAVE_STDLIB_H
-#undef HAVE_STDARG_H
-#undef HAVE_MALLOC_H
-#undef HAVE_MEMORY_H
-#undef HAVE_STRING_H
-#undef HAVE_STRINGS_H
-#undef HAVE_INTTYPES_H
-#undef HAVE_STDINT_H
-#undef HAVE_CTYPE_H
-#undef HAVE_MATH_H
-#undef HAVE_ICONV_H
-#undef HAVE_SIGNAL_H
-#undef HAVE_ALTIVEC_H
-
-/* C library functions */
-#undef HAVE_MALLOC
-#undef HAVE_CALLOC
-#undef HAVE_REALLOC
-#undef HAVE_FREE
-#undef HAVE_ALLOCA
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#undef HAVE_GETENV
-#undef HAVE_PUTENV
-#undef HAVE_UNSETENV
-#endif
-#undef HAVE_QSORT
-#undef HAVE_ABS
-#undef HAVE_BCOPY
-#undef HAVE_MEMSET
-#undef HAVE_MEMCPY
-#undef HAVE_MEMMOVE
-#undef HAVE_MEMCMP
-#undef HAVE_STRLEN
-#undef HAVE_STRLCPY
-#undef HAVE_STRLCAT
-#undef HAVE_STRDUP
-#undef HAVE__STRREV
-#undef HAVE__STRUPR
-#undef HAVE__STRLWR
-#undef HAVE_INDEX
-#undef HAVE_RINDEX
-#undef HAVE_STRCHR
-#undef HAVE_STRRCHR
-#undef HAVE_STRSTR
-#undef HAVE_ITOA
-#undef HAVE__LTOA
-#undef HAVE__UITOA
-#undef HAVE__ULTOA
-#undef HAVE_STRTOL
-#undef HAVE_STRTOUL
-#undef HAVE__I64TOA
-#undef HAVE__UI64TOA
-#undef HAVE_STRTOLL
-#undef HAVE_STRTOULL
-#undef HAVE_STRTOD
-#undef HAVE_ATOI
-#undef HAVE_ATOF
-#undef HAVE_STRCMP
-#undef HAVE_STRNCMP
-#undef HAVE__STRICMP
-#undef HAVE_STRCASECMP
-#undef HAVE__STRNICMP
-#undef HAVE_STRNCASECMP
-#undef HAVE_SSCANF
-#undef HAVE_SNPRINTF
-#undef HAVE_VSNPRINTF
-#undef HAVE_ICONV
-#undef HAVE_SIGACTION
-#undef HAVE_SETJMP
-#undef HAVE_NANOSLEEP
-#undef HAVE_CLOCK_GETTIME
-#undef HAVE_GETPAGESIZE
-#undef HAVE_MPROTECT
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* Allow disabling of core subsystems */
-#undef SDL_AUDIO_DISABLED
-#undef SDL_CDROM_DISABLED
-#undef SDL_CPUINFO_DISABLED
-#undef SDL_EVENTS_DISABLED
-#undef SDL_FILE_DISABLED
-#undef SDL_JOYSTICK_DISABLED
-#undef SDL_LOADSO_DISABLED
-#undef SDL_THREADS_DISABLED
-#undef SDL_TIMERS_DISABLED
-#undef SDL_VIDEO_DISABLED
-
-/* Enable various audio drivers */
-#undef SDL_AUDIO_DRIVER_ALSA
-#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
-#undef SDL_AUDIO_DRIVER_ARTS
-#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
-#undef SDL_AUDIO_DRIVER_BAUDIO
-#undef SDL_AUDIO_DRIVER_BSD
-#undef SDL_AUDIO_DRIVER_COREAUDIO
-#undef SDL_AUDIO_DRIVER_DART
-#undef SDL_AUDIO_DRIVER_DC
-#undef SDL_AUDIO_DRIVER_DISK
-#undef SDL_AUDIO_DRIVER_DUMMY
-#undef SDL_AUDIO_DRIVER_DMEDIA
-#undef SDL_AUDIO_DRIVER_DSOUND
-#undef SDL_AUDIO_DRIVER_PULSE
-#undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC
-#undef SDL_AUDIO_DRIVER_ESD
-#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
-#undef SDL_AUDIO_DRIVER_MINT
-#undef SDL_AUDIO_DRIVER_MMEAUDIO
-#undef SDL_AUDIO_DRIVER_NAS
-#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC
-#undef SDL_AUDIO_DRIVER_OSS
-#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
-#undef SDL_AUDIO_DRIVER_PAUD
-#undef SDL_AUDIO_DRIVER_QNXNTO
-#undef SDL_AUDIO_DRIVER_SNDMGR
-#undef SDL_AUDIO_DRIVER_SUNAUDIO
-#undef SDL_AUDIO_DRIVER_WAVEOUT
-
-/* Enable various cdrom drivers */
-#undef SDL_CDROM_AIX
-#undef SDL_CDROM_BEOS
-#undef SDL_CDROM_BSDI
-#undef SDL_CDROM_DC
-#undef SDL_CDROM_DUMMY
-#undef SDL_CDROM_FREEBSD
-#undef SDL_CDROM_LINUX
-#undef SDL_CDROM_MACOS
-#undef SDL_CDROM_MACOSX
-#undef SDL_CDROM_MINT
-#undef SDL_CDROM_OPENBSD
-#undef SDL_CDROM_OS2
-#undef SDL_CDROM_OSF
-#undef SDL_CDROM_QNX
-#undef SDL_CDROM_WIN32
-
-/* Enable various input drivers */
-#undef SDL_INPUT_LINUXEV
-#undef SDL_INPUT_TSLIB
-#undef SDL_JOYSTICK_BEOS
-#undef SDL_JOYSTICK_DC
-#undef SDL_JOYSTICK_DUMMY
-#undef SDL_JOYSTICK_IOKIT
-#undef SDL_JOYSTICK_LINUX
-#undef SDL_JOYSTICK_MACOS
-#undef SDL_JOYSTICK_MINT
-#undef SDL_JOYSTICK_OS2
-#undef SDL_JOYSTICK_RISCOS
-#undef SDL_JOYSTICK_WINMM
-#undef SDL_JOYSTICK_USBHID
-#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
-
-/* Enable various shared object loading systems */
-#undef SDL_LOADSO_BEOS
-#undef SDL_LOADSO_DLCOMPAT
-#undef SDL_LOADSO_DLOPEN
-#undef SDL_LOADSO_DUMMY
-#undef SDL_LOADSO_LDG
-#undef SDL_LOADSO_MACOS
-#undef SDL_LOADSO_OS2
-#undef SDL_LOADSO_WIN32
-
-/* Enable various threading systems */
-#undef SDL_THREAD_BEOS
-#undef SDL_THREAD_DC
-#undef SDL_THREAD_OS2
-#undef SDL_THREAD_PTH
-#undef SDL_THREAD_PTHREAD
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
-#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
-#undef SDL_THREAD_SPROC
-#undef SDL_THREAD_WIN32
-
-/* Enable various timer systems */
-#undef SDL_TIMER_BEOS
-#undef SDL_TIMER_DC
-#undef SDL_TIMER_DUMMY
-#undef SDL_TIMER_MACOS
-#undef SDL_TIMER_MINT
-#undef SDL_TIMER_OS2
-#undef SDL_TIMER_RISCOS
-#undef SDL_TIMER_UNIX
-#undef SDL_TIMER_WIN32
-#undef SDL_TIMER_WINCE
-
-/* Enable various video drivers */
-#undef SDL_VIDEO_DRIVER_AALIB
-#undef SDL_VIDEO_DRIVER_BWINDOW
-#undef SDL_VIDEO_DRIVER_CACA
-#undef SDL_VIDEO_DRIVER_DC
-#undef SDL_VIDEO_DRIVER_DDRAW
-#undef SDL_VIDEO_DRIVER_DGA
-#undef SDL_VIDEO_DRIVER_DIRECTFB
-#undef SDL_VIDEO_DRIVER_DRAWSPROCKET
-#undef SDL_VIDEO_DRIVER_DUMMY
-#undef SDL_VIDEO_DRIVER_FBCON
-#undef SDL_VIDEO_DRIVER_GAPI
-#undef SDL_VIDEO_DRIVER_GEM
-#undef SDL_VIDEO_DRIVER_GGI
-#undef SDL_VIDEO_DRIVER_IPOD
-#undef SDL_VIDEO_DRIVER_NANOX
-#undef SDL_VIDEO_DRIVER_OS2FS
-#undef SDL_VIDEO_DRIVER_PHOTON
-#undef SDL_VIDEO_DRIVER_PICOGUI
-#undef SDL_VIDEO_DRIVER_PS2GS
-#undef SDL_VIDEO_DRIVER_PS3
-#undef SDL_VIDEO_DRIVER_QTOPIA
-#undef SDL_VIDEO_DRIVER_QUARTZ
-#undef SDL_VIDEO_DRIVER_RISCOS
-#undef SDL_VIDEO_DRIVER_SVGALIB
-#undef SDL_VIDEO_DRIVER_TOOLBOX
-#undef SDL_VIDEO_DRIVER_VGL
-#undef SDL_VIDEO_DRIVER_WINDIB
-#undef SDL_VIDEO_DRIVER_WSCONS
-#undef SDL_VIDEO_DRIVER_X11
-#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER
-#undef SDL_VIDEO_DRIVER_X11_VIDMODE
-#undef SDL_VIDEO_DRIVER_X11_XINERAMA
-#undef SDL_VIDEO_DRIVER_X11_XME
-#undef SDL_VIDEO_DRIVER_X11_XRANDR
-#undef SDL_VIDEO_DRIVER_X11_XV
-#undef SDL_VIDEO_DRIVER_XBIOS
-
-/* Enable OpenGL support */
-#undef SDL_VIDEO_OPENGL
-#undef SDL_VIDEO_OPENGL_GLX
-#undef SDL_VIDEO_OPENGL_WGL
-#undef SDL_VIDEO_OPENGL_OSMESA
-#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
-
-/* Disable screensaver */
-#undef SDL_VIDEO_DISABLE_SCREENSAVER
-
-/* Enable assembly routines */
-#undef SDL_ASSEMBLY_ROUTINES
-#undef SDL_HERMES_BLITTERS
-#undef SDL_ALTIVEC_BLITTERS
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/include/SDL_config_dreamcast.h b/Externals/SDL/include/SDL_config_dreamcast.h
deleted file mode 100644
index 07c2f08155..0000000000
--- a/Externals/SDL/include/SDL_config_dreamcast.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_dreamcast_h
-#define _SDL_config_dreamcast_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long uintptr_t;
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DC	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DC	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_DC	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_DC	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_DC	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DC	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_dreamcast_h */
diff --git a/Externals/SDL/include/SDL_config_macos.h b/Externals/SDL/include/SDL_config_macos.h
deleted file mode 100644
index 4ba5c22c34..0000000000
--- a/Externals/SDL/include/SDL_config_macos.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macos_h
-#define _SDL_config_macos_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#include <MacTypes.h>
-
-typedef SInt8	int8_t;
-typedef UInt8	uint8_t;
-typedef SInt16	int16_t;
-typedef UInt16	uint16_t;
-typedef SInt32	int32_t;
-typedef UInt32	uint32_t;
-typedef SInt64	int64_t;
-typedef UInt64	uint64_t;
-typedef unsigned long	uintptr_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_ABS	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_ITOA	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_SSCANF	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_SNDMGR	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_CDROM_DUMMY		1
-#else
-#define SDL_CDROM_MACOS		1
-#endif
-
-/* Enable various input drivers */
-#if TARGET_API_MAC_CARBON
-#define SDL_JOYSTICK_DUMMY	1
-#else
-#define SDL_JOYSTICK_MACOS	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_MACOS	1
-
-/* Enable various threading systems */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_MACOS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_DRAWSPROCKET	1
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-
-#endif /* _SDL_config_macos_h */
diff --git a/Externals/SDL/include/SDL_config_macosx.h b/Externals/SDL/include/SDL_config_macosx.h
deleted file mode 100644
index 295b87245e..0000000000
--- a/Externals/SDL/include/SDL_config_macosx.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_macosx_h
-#define _SDL_config_macosx_h
-
-#include "SDL_platform.h"
-
-/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
-#include <AvailabilityMacros.h>
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Useful headers */
-/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
-#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
-#define HAVE_ALLOCA_H		1
-#endif
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_INTTYPES_H	1
-#define HAVE_STDINT_H	1
-#define HAVE_CTYPE_H	1
-#define HAVE_MATH_H	1
-#define HAVE_SIGNAL_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_UNSETENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRLCPY	1
-#define HAVE_STRLCAT	1
-#define HAVE_STRDUP	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOUL	1
-#define HAVE_STRTOLL	1
-#define HAVE_STRTOULL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-#define HAVE_SIGACTION	1
-#define HAVE_SETJMP	1
-#define HAVE_NANOSLEEP	1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_COREAUDIO	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_MACOSX	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_IOKIT	1
-
-/* Enable various shared object loading systems */
-#ifdef __ppc__
-/* For Mac OS X 10.2 compatibility */
-#define SDL_LOADSO_DLCOMPAT	1
-#else
-#define SDL_LOADSO_DLOPEN	1
-#endif
-
-/* Enable various threading systems */
-#define SDL_THREAD_PTHREAD	1
-#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_UNIX	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON))
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-#else
-#define SDL_VIDEO_DRIVER_QUARTZ	1
-#endif
-#define SDL_VIDEO_DRIVER_DGA 1
-#define SDL_VIDEO_DRIVER_X11 1
-#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "/usr/X11R6/lib/libXrender.1.dylib"
-#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
-#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
-#define SDL_VIDEO_DRIVER_X11_XME 1
-#define SDL_VIDEO_DRIVER_X11_XRANDR 1
-#define SDL_VIDEO_DRIVER_X11_XV 1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_GLX 1
-
-/* Disable screensaver */
-#define SDL_VIDEO_DISABLE_SCREENSAVER	1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES	1
-#ifdef __ppc__
-#define SDL_ALTIVEC_BLITTERS	1
-#endif
-
-#endif /* _SDL_config_macosx_h */
diff --git a/Externals/SDL/include/SDL_config_minimal.h b/Externals/SDL/include/SDL_config_minimal.h
deleted file mode 100644
index 002c56eadb..0000000000
--- a/Externals/SDL/include/SDL_config_minimal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_minimal_h
-#define _SDL_config_minimal_h
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-#include <stdarg.h>
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-
-/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable the stub timer support (src/timer/dummy/\*.c) */
-#define SDL_TIMERS_DISABLED	1
-
-/* Enable the dummy video driver (src/video/dummy/\*.c) */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_minimal_h */
diff --git a/Externals/SDL/include/SDL_config_nds.h b/Externals/SDL/include/SDL_config_nds.h
deleted file mode 100644
index 4ac60a5045..0000000000
--- a/Externals/SDL/include/SDL_config_nds.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_nds_h
-#define _SDL_config_nds_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* C datatypes */
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Endianness */
-#define SDL_BYTEORDER 1234
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_STRING_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_NDS	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_NDS	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable the stub thread support (src/thread/generic/\*.c) */
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_NDS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_NDS	1
-#define SDL_VIDEO_DRIVER_DUMMY	1
-
-#endif /* _SDL_config_nds_h */
diff --git a/Externals/SDL/include/SDL_config_os2.h b/Externals/SDL/include/SDL_config_os2.h
deleted file mode 100644
index bb40df0018..0000000000
--- a/Externals/SDL/include/SDL_config_os2.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_os2_h
-#define _SDL_config_os2_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
-
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Use Watcom's LIBC */
-#define HAVE_LIBC 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__UITOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_CLOCK_GETTIME 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DART	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_OS2	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_OS2	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_OS2	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_OS2	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_OS2	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_OS2FS	1
-
-/* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
-
-/* Enable assembly routines where available */
-#define SDL_ASSEMBLY_ROUTINES	1
-
-#endif /* _SDL_config_os2_h */
diff --git a/Externals/SDL/include/SDL_config_symbian.h b/Externals/SDL/include/SDL_config_symbian.h
deleted file mode 100644
index 53527b2324..0000000000
--- a/Externals/SDL/include/SDL_config_symbian.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/*
-
-Symbian version Markus Mertama
-
-*/
-
-
-#ifndef _SDL_CONFIG_SYMBIAN_H
-#define _SDL_CONFIG_SYMBIAN_H
-
-#include "SDL_platform.h"
-
-/* This is the minimal configuration that can be used to build SDL */
-
-
-#include <stdarg.h>
-#include <stddef.h>
-
-
-#ifdef __GCCE__
-#define SYMBIAN32_GCCE
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#endif
-
-#ifndef _INTPTR_T_DECLARED
-typedef unsigned int uintptr_t;
-#endif 
-
-#ifndef _INT8_T_DECLARED
-typedef signed char int8_t;
-#endif 
-
-#ifndef _UINT8_T_DECLARED
-typedef unsigned char uint8_t;
-#endif
-
-#ifndef _INT16_T_DECLARED
-typedef signed short int16_t;
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef unsigned short uint16_t;
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef signed int int32_t;
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef unsigned int uint32_t;
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef signed long long int64_t;
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef unsigned long long uint64_t;
-#endif
-
-#define SDL_AUDIO_DRIVER_EPOCAUDIO	1
-
-
-/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
-#define SDL_CDROM_DISABLED	1
-
-/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
-#define SDL_JOYSTICK_DISABLED	1
-
-/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
-#define SDL_LOADSO_DISABLED	1
-
-#define SDL_THREAD_SYMBIAN 1
-
-#define SDL_VIDEO_DRIVER_EPOC    1
-
-#define SDL_VIDEO_OPENGL 0
-
-#define SDL_HAS_64BIT_TYPE	1
-
-#define HAVE_LIBC	1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-/*#define HAVE_ALLOCA 1*/
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRUPR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/*#define HAVE__STRICMP 1*/
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-
-
-
-#endif /* _SDL_CONFIG_SYMBIAN_H */
diff --git a/Externals/SDL/include/SDL_config_win32.h b/Externals/SDL/include/SDL_config_win32.h
deleted file mode 100644
index 6d019a8d9c..0000000000
--- a/Externals/SDL/include/SDL_config_win32.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_win32_h
-#define _SDL_config_win32_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if defined(__GNUC__) || defined(__DMC__)
-#define HAVE_STDINT_H	1
-#elif defined(_MSC_VER)
-typedef signed __int8		int8_t;
-typedef unsigned __int8		uint8_t;
-typedef signed __int16		int16_t;
-typedef unsigned __int16	uint16_t;
-typedef signed __int32		int32_t;
-typedef unsigned __int32	uint32_t;
-typedef signed __int64		int64_t;
-typedef unsigned __int64	uint64_t;
-#ifndef _UINTPTR_T_DEFINED
-#ifdef  _WIN64
-typedef unsigned __int64    uintptr_t;
-#else
-typedef unsigned int   uintptr_t;
-#endif
-#define _UINTPTR_T_DEFINED
-#endif
-/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
-#define LONG_PTR LONG
-#endif
-#else	/* !__GNUC__ && !_MSC_VER */
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef unsigned int size_t;
-#endif
-typedef unsigned int uintptr_t;
-#endif /* __GNUC__ || _MSC_VER */
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Enabled for SDL 1.2 (binary compatibility) */
-#define HAVE_LIBC	1
-#ifdef HAVE_LIBC
-/* Useful headers */
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#ifndef _WIN32_WCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE__STRICMP 1
-#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#else
-#define HAVE_STDARG_H	1
-#define HAVE_STDDEF_H	1
-#endif
-
-/* Enable various audio drivers */
-#ifndef _WIN32_WCE
-#define SDL_AUDIO_DRIVER_DSOUND	1
-#endif
-#define SDL_AUDIO_DRIVER_WAVEOUT	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various cdrom drivers */
-#ifdef _WIN32_WCE
-#define SDL_CDROM_DISABLED      1
-#else
-#define SDL_CDROM_WIN32		1
-#endif
-
-/* Enable various input drivers */
-#ifdef _WIN32_WCE
-#define SDL_JOYSTICK_DISABLED   1
-#else
-#define SDL_JOYSTICK_WINMM	1
-#endif
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_WIN32	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_WIN32	1
-
-/* Enable various timer systems */
-#ifdef _WIN32_WCE
-#define SDL_TIMER_WINCE	1
-#else
-#define SDL_TIMER_WIN32	1
-#endif
-
-/* Enable various video drivers */
-#ifdef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_GAPI	1
-#endif
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_DRIVER_DDRAW	1
-#endif
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_WINDIB	1
-
-/* Enable OpenGL support */
-#ifndef _WIN32_WCE
-#define SDL_VIDEO_OPENGL	1
-#define SDL_VIDEO_OPENGL_WGL	1
-#endif
-
-/* Disable screensaver */
-#define SDL_VIDEO_DISABLE_SCREENSAVER	1
-
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES	1
-#endif
-
-#endif /* _SDL_config_win32_h */
diff --git a/Externals/SDL/include/SDL_copying.h b/Externals/SDL/include/SDL_copying.h
deleted file mode 100644
index 1bd6b84cd8..0000000000
--- a/Externals/SDL/include/SDL_copying.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
diff --git a/Externals/SDL/include/SDL_cpuinfo.h b/Externals/SDL/include/SDL_cpuinfo.h
deleted file mode 100644
index f4be8e0323..0000000000
--- a/Externals/SDL/include/SDL_cpuinfo.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_cpuinfo.h
- *  CPU feature detection for SDL
- */
-
-#ifndef _SDL_cpuinfo_h
-#define _SDL_cpuinfo_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This function returns true if the CPU has the RDTSC instruction */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
-
-/** This function returns true if the CPU has MMX features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
-
-/** This function returns true if the CPU has MMX Ext. features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
-
-/** This function returns true if the CPU has 3DNow features */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
-
-/** This function returns true if the CPU has 3DNow! Ext. features */
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
-
-/** This function returns true if the CPU has SSE features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
-
-/** This function returns true if the CPU has SSE2 features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
-
-/** This function returns true if the CPU has AltiVec features */
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_cpuinfo_h */
diff --git a/Externals/SDL/include/SDL_endian.h b/Externals/SDL/include/SDL_endian.h
deleted file mode 100644
index f7a2e2f8c0..0000000000
--- a/Externals/SDL/include/SDL_endian.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_endian.h
- *  Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/** @name SDL_ENDIANs
- *  The two types of endianness 
- */
-/*@{*/
-#define SDL_LIL_ENDIAN	1234
-#define SDL_BIG_ENDIAN	4321
-/*@}*/
-
-#ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
-#if defined(__hppa__) || \
-    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MISPEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
-    defined(__sparc__)
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER	SDL_LIL_ENDIAN
-#endif
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @name SDL_Swap Functions
- *  Use inline functions for compilers that support them, and static
- *  functions for those that do not.  Because these functions become
- *  static for compilers that do not support inline functions, this
- *  header should only be included in files that actually use them.
- */
-/*@{*/
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	Uint16 result;
-
-	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint16 SDL_Swap16(Uint16 x)
-{
-	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswap %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("bswapl %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	Uint32 result;
-
-	__asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (x>>24), "r" (x));
-	__asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (x));
-	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
-	return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
-static __inline__ Uint32 SDL_Swap32(Uint32 x)
-{
-	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
-	return x;
-}
-#else
-static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__) && \
-   !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	union { 
-		struct { Uint32 a,b; } s;
-		Uint64 u;
-	} v;
-	v.u = x;
-	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
-	        : "=r" (v.s.a), "=r" (v.s.b) 
-	        : "0" (v.s.a), "1" (v.s.b)); 
-	return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	__asm__("bswapq %0" : "=r" (x) : "0" (x));
-	return x;
-}
-#else
-static __inline__ Uint64 SDL_Swap64(Uint64 x)
-{
-	Uint32 hi, lo;
-
-	/* Separate into high and low 32-bit values and swap them */
-	lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-	x >>= 32;
-	hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
-	x = SDL_Swap32(lo);
-	x <<= 32;
-	x |= SDL_Swap32(hi);
-	return(x);
-}
-#endif
-#else
-/* This is mainly to keep compilers from complaining in SDL code.
- * If there is no real 64-bit datatype, then compilers will complain about
- * the fake 64-bit datatype that SDL provides when it compiles user code.
- */
-#define SDL_Swap64(X)	(X)
-#endif /* SDL_HAS_64BIT_TYPE */
-/*@}*/
-
-/**
- *  @name SDL_SwapLE and SDL_SwapBE Functions
- *  Byteswap item from the specified endianness to the native endianness
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X)	(X)
-#define SDL_SwapLE32(X)	(X)
-#define SDL_SwapLE64(X)	(X)
-#define SDL_SwapBE16(X)	SDL_Swap16(X)
-#define SDL_SwapBE32(X)	SDL_Swap32(X)
-#define SDL_SwapBE64(X)	SDL_Swap64(X)
-#else
-#define SDL_SwapLE16(X)	SDL_Swap16(X)
-#define SDL_SwapLE32(X)	SDL_Swap32(X)
-#define SDL_SwapLE64(X)	SDL_Swap64(X)
-#define SDL_SwapBE16(X)	(X)
-#define SDL_SwapBE32(X)	(X)
-#define SDL_SwapBE64(X)	(X)
-#endif
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
diff --git a/Externals/SDL/include/SDL_error.h b/Externals/SDL/include/SDL_error.h
deleted file mode 100644
index b103703a5b..0000000000
--- a/Externals/SDL/include/SDL_error.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_error.h
- *  Simple error message routines for SDL
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** 
- *  @name Public functions
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char * SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-/*@}*/
-
-/**
- *  @name Private functions
- *  @internal Private error message function - used internally
- */
-/*@{*/
-#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum {
-	SDL_ENOMEM,
-	SDL_EFREAD,
-	SDL_EFWRITE,
-	SDL_EFSEEK,
-	SDL_UNSUPPORTED,
-	SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
diff --git a/Externals/SDL/include/SDL_events.h b/Externals/SDL/include/SDL_events.h
deleted file mode 100644
index c94a30c9c9..0000000000
--- a/Externals/SDL/include/SDL_events.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file SDL_events.h
- *  Include file for SDL event handling
- */
-
-#ifndef _SDL_events_h
-#define _SDL_events_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_active.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_quit.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name General keyboard/mouse state definitions */
-/*@{*/
-#define SDL_RELEASED	0
-#define SDL_PRESSED	1
-/*@}*/
-
-/** Event enumerations */
-typedef enum {
-       SDL_NOEVENT = 0,			/**< Unused (do not remove) */
-       SDL_ACTIVEEVENT,			/**< Application loses/gains visibility */
-       SDL_KEYDOWN,			/**< Keys pressed */
-       SDL_KEYUP,			/**< Keys released */
-       SDL_MOUSEMOTION,			/**< Mouse moved */
-       SDL_MOUSEBUTTONDOWN,		/**< Mouse button pressed */
-       SDL_MOUSEBUTTONUP,		/**< Mouse button released */
-       SDL_JOYAXISMOTION,		/**< Joystick axis motion */
-       SDL_JOYBALLMOTION,		/**< Joystick trackball motion */
-       SDL_JOYHATMOTION,		/**< Joystick hat position change */
-       SDL_JOYBUTTONDOWN,		/**< Joystick button pressed */
-       SDL_JOYBUTTONUP,			/**< Joystick button released */
-       SDL_QUIT,			/**< User-requested quit */
-       SDL_SYSWMEVENT,			/**< System specific event */
-       SDL_EVENT_RESERVEDA,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVEDB,		/**< Reserved for future use.. */
-       SDL_VIDEORESIZE,			/**< User resized video mode */
-       SDL_VIDEOEXPOSE,			/**< Screen needs to be redrawn */
-       SDL_EVENT_RESERVED2,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED3,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED4,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED5,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED6,		/**< Reserved for future use.. */
-       SDL_EVENT_RESERVED7,		/**< Reserved for future use.. */
-       /** Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-       SDL_USEREVENT = 24,
-       /** This last event is only for bounding internal arrays
-	*  It is the number of bits in the event mask datatype -- Uint32
-        */
-       SDL_NUMEVENTS = 32
-} SDL_EventType;
-
-/** @name Predefined event masks */
-/*@{*/
-#define SDL_EVENTMASK(X)	(1<<(X))
-typedef enum {
-	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
-	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
-	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
-	SDL_KEYEVENTMASK	= SDL_EVENTMASK(SDL_KEYDOWN)|
-	                          SDL_EVENTMASK(SDL_KEYUP),
-	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
-	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
-	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_MOUSEEVENTMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
-	SDL_JOYAXISMOTIONMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION),
-	SDL_JOYBALLMOTIONMASK	= SDL_EVENTMASK(SDL_JOYBALLMOTION),
-	SDL_JOYHATMOTIONMASK	= SDL_EVENTMASK(SDL_JOYHATMOTION),
-	SDL_JOYBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
-	SDL_JOYBUTTONUPMASK	= SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_JOYEVENTMASK	= SDL_EVENTMASK(SDL_JOYAXISMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBALLMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYHATMOTION)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
-	                          SDL_EVENTMASK(SDL_JOYBUTTONUP),
-	SDL_VIDEORESIZEMASK	= SDL_EVENTMASK(SDL_VIDEORESIZE),
-	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
-	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
-	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
-} SDL_EventMask ;
-#define SDL_ALLEVENTS		0xFFFFFFFF
-/*@}*/
-
-/** Application visibility event structure */
-typedef struct SDL_ActiveEvent {
-	Uint8 type;	/**< SDL_ACTIVEEVENT */
-	Uint8 gain;	/**< Whether given states were gained or lost (1/0) */
-	Uint8 state;	/**< A mask of the focus states */
-} SDL_ActiveEvent;
-
-/** Keyboard event structure */
-typedef struct SDL_KeyboardEvent {
-	Uint8 type;	/**< SDL_KEYDOWN or SDL_KEYUP */
-	Uint8 which;	/**< The keyboard device index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-	SDL_keysym keysym;
-} SDL_KeyboardEvent;
-
-/** Mouse motion event structure */
-typedef struct SDL_MouseMotionEvent {
-	Uint8 type;	/**< SDL_MOUSEMOTION */
-	Uint8 which;	/**< The mouse device index */
-	Uint8 state;	/**< The current button state */
-	Uint16 x, y;	/**< The X/Y coordinates of the mouse */
-	Sint16 xrel;	/**< The relative motion in the X direction */
-	Sint16 yrel;	/**< The relative motion in the Y direction */
-} SDL_MouseMotionEvent;
-
-/** Mouse button event structure */
-typedef struct SDL_MouseButtonEvent {
-	Uint8 type;	/**< SDL_MOUSEBUTTONDOWN or SDL_MOUSEBUTTONUP */
-	Uint8 which;	/**< The mouse device index */
-	Uint8 button;	/**< The mouse button index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-	Uint16 x, y;	/**< The X/Y coordinates of the mouse at press time */
-} SDL_MouseButtonEvent;
-
-/** Joystick axis motion event structure */
-typedef struct SDL_JoyAxisEvent {
-	Uint8 type;	/**< SDL_JOYAXISMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 axis;	/**< The joystick axis index */
-	Sint16 value;	/**< The axis value (range: -32768 to 32767) */
-} SDL_JoyAxisEvent;
-
-/** Joystick trackball motion event structure */
-typedef struct SDL_JoyBallEvent {
-	Uint8 type;	/**< SDL_JOYBALLMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 ball;	/**< The joystick trackball index */
-	Sint16 xrel;	/**< The relative motion in the X direction */
-	Sint16 yrel;	/**< The relative motion in the Y direction */
-} SDL_JoyBallEvent;
-
-/** Joystick hat position change event structure */
-typedef struct SDL_JoyHatEvent {
-	Uint8 type;	/**< SDL_JOYHATMOTION */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 hat;	/**< The joystick hat index */
-	Uint8 value;	/**< The hat position value:
-			 *   SDL_HAT_LEFTUP   SDL_HAT_UP       SDL_HAT_RIGHTUP
-			 *   SDL_HAT_LEFT     SDL_HAT_CENTERED SDL_HAT_RIGHT
-			 *   SDL_HAT_LEFTDOWN SDL_HAT_DOWN     SDL_HAT_RIGHTDOWN
-			 *  Note that zero means the POV is centered.
-			 */
-} SDL_JoyHatEvent;
-
-/** Joystick button event structure */
-typedef struct SDL_JoyButtonEvent {
-	Uint8 type;	/**< SDL_JOYBUTTONDOWN or SDL_JOYBUTTONUP */
-	Uint8 which;	/**< The joystick device index */
-	Uint8 button;	/**< The joystick button index */
-	Uint8 state;	/**< SDL_PRESSED or SDL_RELEASED */
-} SDL_JoyButtonEvent;
-
-/** The "window resized" event
- *  When you get this event, you are responsible for setting a new video
- *  mode with the new width and height.
- */
-typedef struct SDL_ResizeEvent {
-	Uint8 type;	/**< SDL_VIDEORESIZE */
-	int w;		/**< New width */
-	int h;		/**< New height */
-} SDL_ResizeEvent;
-
-/** The "screen redraw" event */
-typedef struct SDL_ExposeEvent {
-	Uint8 type;	/**< SDL_VIDEOEXPOSE */
-} SDL_ExposeEvent;
-
-/** The "quit requested" event */
-typedef struct SDL_QuitEvent {
-	Uint8 type;	/**< SDL_QUIT */
-} SDL_QuitEvent;
-
-/** A user-defined event type */
-typedef struct SDL_UserEvent {
-	Uint8 type;	/**< SDL_USEREVENT through SDL_NUMEVENTS-1 */
-	int code;	/**< User defined event code */
-	void *data1;	/**< User defined data pointer */
-	void *data2;	/**< User defined data pointer */
-} SDL_UserEvent;
-
-/** If you want to use this event, you should include SDL_syswm.h */
-struct SDL_SysWMmsg;
-typedef struct SDL_SysWMmsg SDL_SysWMmsg;
-typedef struct SDL_SysWMEvent {
-	Uint8 type;
-	SDL_SysWMmsg *msg;
-} SDL_SysWMEvent;
-
-/** General event structure */
-typedef union SDL_Event {
-	Uint8 type;
-	SDL_ActiveEvent active;
-	SDL_KeyboardEvent key;
-	SDL_MouseMotionEvent motion;
-	SDL_MouseButtonEvent button;
-	SDL_JoyAxisEvent jaxis;
-	SDL_JoyBallEvent jball;
-	SDL_JoyHatEvent jhat;
-	SDL_JoyButtonEvent jbutton;
-	SDL_ResizeEvent resize;
-	SDL_ExposeEvent expose;
-	SDL_QuitEvent quit;
-	SDL_UserEvent user;
-	SDL_SysWMEvent syswm;
-} SDL_Event;
-
-
-/* Function prototypes */
-
-/** Pumps the event loop, gathering events from the input devices.
- *  This function updates the event queue and internal input device state.
- *  This should only be run in the thread that sets the video mode.
- */
-extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-
-typedef enum {
-	SDL_ADDEVENT,
-	SDL_PEEKEVENT,
-	SDL_GETEVENT
-} SDL_eventaction;
-
-/**
- *  Checks the event queue for messages and optionally returns them.
- *
- *  If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
- *  the back of the event queue.
- *  If 'action' is SDL_PEEKEVENT, up to 'numevents' events at the front
- *  of the event queue, matching 'mask', will be returned and will not
- *  be removed from the queue.
- *  If 'action' is SDL_GETEVENT, up to 'numevents' events at the front 
- *  of the event queue, matching 'mask', will be returned and will be
- *  removed from the queue.
- *
- *  @return
- *  This function returns the number of events actually stored, or -1
- *  if there was an error.
- *
- *  This function is thread-safe.
- */
-extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents,
-				SDL_eventaction action, Uint32 mask);
-
-/** Polls for currently pending events, and returns 1 if there are any pending
- *  events, or 0 if there are none available.  If 'event' is not NULL, the next
- *  event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event *event);
-
-/** Waits indefinitely for the next available event, returning 1, or 0 if there
- *  was an error while waiting for events.  If 'event' is not NULL, the next
- *  event is removed from the queue and stored in that area.
- */
-extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event *event);
-
-/** Add an event to the event queue.
- *  This function returns 0 on success, or -1 if the event queue was full
- *  or there was some other error.
- */
-extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event *event);
-
-/** @name Event Filtering */
-/*@{*/
-typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event);
-/**
- *  This function sets up a filter to process all events before they
- *  change internal state and are posted to the internal event queue.
- *
- *  The filter is protypted as:
- *      @code typedef int (SDLCALL *SDL_EventFilter)(const SDL_Event *event); @endcode
- *
- * If the filter returns 1, then the event will be added to the internal queue.
- * If it returns 0, then the event will be dropped from the queue, but the 
- * internal state will still be updated.  This allows selective filtering of
- * dynamically arriving events.
- *
- * @warning  Be very careful of what you do in the event filter function, as 
- *           it may run in a different thread!
- *
- * There is one caveat when dealing with the SDL_QUITEVENT event type.  The
- * event filter is only called when the window manager desires to close the
- * application window.  If the event filter returns 1, then the window will
- * be closed, otherwise the window will remain open if possible.
- * If the quit event is generated by an interrupt signal, it will bypass the
- * internal queue and be delivered to the application at the next event poll.
- */
-extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);
-
-/**
- *  Return the current event filter - can be used to "chain" filters.
- *  If there is no event filter set, this function returns NULL.
- */
-extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);
-/*@}*/
-
-/** @name Event State */
-/*@{*/
-#define SDL_QUERY	-1
-#define SDL_IGNORE	 0
-#define SDL_DISABLE	 0
-#define SDL_ENABLE	 1
-/*@}*/
-
-/**
-* This function allows you to set the state of processing certain events.
-* If 'state' is set to SDL_IGNORE, that event will be automatically dropped
-* from the event queue and will not event be filtered.
-* If 'state' is set to SDL_ENABLE, that event will be processed normally.
-* If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
-* current processing state of the specified event.
-*/
-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_events_h */
diff --git a/Externals/SDL/include/SDL_getenv.h b/Externals/SDL/include/SDL_getenv.h
deleted file mode 100644
index 253ad88cc5..0000000000
--- a/Externals/SDL/include/SDL_getenv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_getenv.h
- *  @deprecated Use SDL_stdinc.h instead
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/Externals/SDL/include/SDL_joystick.h b/Externals/SDL/include/SDL_joystick.h
deleted file mode 100644
index d5135c3d53..0000000000
--- a/Externals/SDL/include/SDL_joystick.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_joystick.h
- *  Include file for SDL joystick event handling
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL_joystick.h
- *  @note In order to use these functions, SDL_Init() must have been called
- *        with the SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
- *        for joysticks, and load appropriate drivers.
- */
-
-/** The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-/* Function prototypes */
-/**
- * Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/**
- * Get the implementation dependent name of a joystick.
- *
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char * SDLCALL SDL_JoystickName(int device_index);
-
-/**
- * Open a joystick for use.
- *
- * @param[in] device_index
- * The index passed as an argument refers to
- * the N'th joystick on the system.  This index is the value which will
- * identify this joystick in future joystick events.
- *
- * @return This function returns a joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick * SDLCALL SDL_JoystickOpen(int device_index);
-
-/**
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/**
- * Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick *joystick);
-
-/**
- * Get the number of general axis controls on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick);
-
-/**
- * Get the number of trackballs on a joystick
- *
- * Joystick trackballs have only relative motion events associated
- * with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick);
-
-/**
- * Get the number of POV hats on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick);
-
-/**
- * Get the number of buttons on a joystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick);
-
-/**
- * Update the current state of the open joysticks.
- *
- * This is called automatically by the event loop if any joystick
- * events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/**
- * Enable/disable joystick event polling.
- *
- * If joystick events are disabled, you must call SDL_JoystickUpdate()
- * yourself and check the state of the joystick when you want joystick
- * information.
- *
- * @param[in] state The state can be one of SDL_QUERY, SDL_ENABLE or SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/**
- * Get the current state of an axis control on a joystick
- *
- * @param[in] axis The axis indices start at index 0.
- *
- * @return The state is a value ranging from -32768 to 32767.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis);
-
-/**
- *  @name Hat Positions
- *  The return value of SDL_JoystickGetHat() is one of the following positions:
- */
-/*@{*/
-#define SDL_HAT_CENTERED	0x00
-#define SDL_HAT_UP		0x01
-#define SDL_HAT_RIGHT		0x02
-#define SDL_HAT_DOWN		0x04
-#define SDL_HAT_LEFT		0x08
-#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@}*/
-
-/** 
- *  Get the current state of a POV hat on a joystick
- *
- *  @param[in] hat The hat indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat);
-
-/**
- * Get the ball axis change since the last poll
- *
- * @param[in] ball The ball indices start at index 0.
- *
- * @return This returns 0, or -1 if you passed it invalid parameters.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy);
-
-/**
- * Get the current state of a button on a joystick
- *
- * @param[in] button The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button);
-
-/**
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
diff --git a/Externals/SDL/include/SDL_keyboard.h b/Externals/SDL/include/SDL_keyboard.h
deleted file mode 100644
index 7b59d24e55..0000000000
--- a/Externals/SDL/include/SDL_keyboard.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_keyboard.h
- *  Include file for SDL keyboard event handling
- */
-
-#ifndef _SDL_keyboard_h
-#define _SDL_keyboard_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keysym.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Keysym structure
- *
- *  - The scancode is hardware dependent, and should not be used by general
- *    applications.  If no hardware scancode is available, it will be 0.
- *
- *  - The 'unicode' translated character is only available when character
- *    translation is enabled by the SDL_EnableUNICODE() API.  If non-zero,
- *    this is a UNICODE character corresponding to the keypress.  If the
- *    high 9 bits of the character are 0, then this maps to the equivalent
- *    ASCII character:
- *      @code
- *	char ch;
- *	if ( (keysym.unicode & 0xFF80) == 0 ) {
- *		ch = keysym.unicode & 0x7F;
- *	} else {
- *		An international character..
- *	}
- *      @endcode
- */
-typedef struct SDL_keysym {
-	Uint8 scancode;			/**< hardware specific scancode */
-	SDLKey sym;			/**< SDL virtual keysym */
-	SDLMod mod;			/**< current key modifiers */
-	Uint16 unicode;			/**< translated character */
-} SDL_keysym;
-
-/** This is the mask which refers to all hotkey bindings */
-#define SDL_ALL_HOTKEYS		0xFFFFFFFF
-
-/* Function prototypes */
-/**
- * Enable/Disable UNICODE translation of keyboard input.
- *
- * This translation has some overhead, so translation defaults off.
- *
- * @param[in] enable
- * If 'enable' is 1, translation is enabled.
- * If 'enable' is 0, translation is disabled.
- * If 'enable' is -1, the translation state is not changed.
- *
- * @return It returns the previous state of keyboard translation.
- */
-extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable);
-
-#define SDL_DEFAULT_REPEAT_DELAY	500
-#define SDL_DEFAULT_REPEAT_INTERVAL	30
-/**
- * Enable/Disable keyboard repeat.  Keyboard repeat defaults to off.
- *
- *  @param[in] delay
- *  'delay' is the initial delay in ms between the time when a key is
- *  pressed, and keyboard repeat begins.
- *
- *  @param[in] interval
- *  'interval' is the time in ms between keyboard repeat events.
- *
- *  If 'delay' is set to 0, keyboard repeat is disabled.
- */
-extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
-
-/**
- * Get a snapshot of the current state of the keyboard.
- * Returns an array of keystates, indexed by the SDLK_* syms.
- * Usage:
- *	@code
- * 	Uint8 *keystate = SDL_GetKeyState(NULL);
- *	if ( keystate[SDLK_RETURN] ) //... \<RETURN> is pressed.
- *	@endcode
- */
-extern DECLSPEC Uint8 * SDLCALL SDL_GetKeyState(int *numkeys);
-
-/**
- * Get the current key modifier state
- */
-extern DECLSPEC SDLMod SDLCALL SDL_GetModState(void);
-
-/**
- * Set the current key modifier state.
- * This does not change the keyboard state, only the key modifier flags.
- */
-extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
-
-/**
- * Get the name of an SDL virtual keysym
- */
-extern DECLSPEC char * SDLCALL SDL_GetKeyName(SDLKey key);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_keyboard_h */
diff --git a/Externals/SDL/include/SDL_keysym.h b/Externals/SDL/include/SDL_keysym.h
deleted file mode 100644
index 90101286e3..0000000000
--- a/Externals/SDL/include/SDL_keysym.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_keysym_h
-#define _SDL_keysym_h
-
-/** What we really want is a mapping of every raw key on the keyboard.
- *  To support international keyboards, we use the range 0xA1 - 0xFF
- *  as international virtual keycodes.  We'll follow in the footsteps of X11...
- *  @brief The names of the keys
- */
-typedef enum {
-        /** @name ASCII mapped keysyms
-         *  The keyboard syms have been cleverly chosen to map to ASCII
-         */
-        /*@{*/
-	SDLK_UNKNOWN		= 0,
-	SDLK_FIRST		= 0,
-	SDLK_BACKSPACE		= 8,
-	SDLK_TAB		= 9,
-	SDLK_CLEAR		= 12,
-	SDLK_RETURN		= 13,
-	SDLK_PAUSE		= 19,
-	SDLK_ESCAPE		= 27,
-	SDLK_SPACE		= 32,
-	SDLK_EXCLAIM		= 33,
-	SDLK_QUOTEDBL		= 34,
-	SDLK_HASH		= 35,
-	SDLK_DOLLAR		= 36,
-	SDLK_AMPERSAND		= 38,
-	SDLK_QUOTE		= 39,
-	SDLK_LEFTPAREN		= 40,
-	SDLK_RIGHTPAREN		= 41,
-	SDLK_ASTERISK		= 42,
-	SDLK_PLUS		= 43,
-	SDLK_COMMA		= 44,
-	SDLK_MINUS		= 45,
-	SDLK_PERIOD		= 46,
-	SDLK_SLASH		= 47,
-	SDLK_0			= 48,
-	SDLK_1			= 49,
-	SDLK_2			= 50,
-	SDLK_3			= 51,
-	SDLK_4			= 52,
-	SDLK_5			= 53,
-	SDLK_6			= 54,
-	SDLK_7			= 55,
-	SDLK_8			= 56,
-	SDLK_9			= 57,
-	SDLK_COLON		= 58,
-	SDLK_SEMICOLON		= 59,
-	SDLK_LESS		= 60,
-	SDLK_EQUALS		= 61,
-	SDLK_GREATER		= 62,
-	SDLK_QUESTION		= 63,
-	SDLK_AT			= 64,
-	/* 
-	   Skip uppercase letters
-	 */
-	SDLK_LEFTBRACKET	= 91,
-	SDLK_BACKSLASH		= 92,
-	SDLK_RIGHTBRACKET	= 93,
-	SDLK_CARET		= 94,
-	SDLK_UNDERSCORE		= 95,
-	SDLK_BACKQUOTE		= 96,
-	SDLK_a			= 97,
-	SDLK_b			= 98,
-	SDLK_c			= 99,
-	SDLK_d			= 100,
-	SDLK_e			= 101,
-	SDLK_f			= 102,
-	SDLK_g			= 103,
-	SDLK_h			= 104,
-	SDLK_i			= 105,
-	SDLK_j			= 106,
-	SDLK_k			= 107,
-	SDLK_l			= 108,
-	SDLK_m			= 109,
-	SDLK_n			= 110,
-	SDLK_o			= 111,
-	SDLK_p			= 112,
-	SDLK_q			= 113,
-	SDLK_r			= 114,
-	SDLK_s			= 115,
-	SDLK_t			= 116,
-	SDLK_u			= 117,
-	SDLK_v			= 118,
-	SDLK_w			= 119,
-	SDLK_x			= 120,
-	SDLK_y			= 121,
-	SDLK_z			= 122,
-	SDLK_DELETE		= 127,
-	/* End of ASCII mapped keysyms */
-        /*@}*/
-
-	/** @name International keyboard syms */
-        /*@{*/
-	SDLK_WORLD_0		= 160,		/* 0xA0 */
-	SDLK_WORLD_1		= 161,
-	SDLK_WORLD_2		= 162,
-	SDLK_WORLD_3		= 163,
-	SDLK_WORLD_4		= 164,
-	SDLK_WORLD_5		= 165,
-	SDLK_WORLD_6		= 166,
-	SDLK_WORLD_7		= 167,
-	SDLK_WORLD_8		= 168,
-	SDLK_WORLD_9		= 169,
-	SDLK_WORLD_10		= 170,
-	SDLK_WORLD_11		= 171,
-	SDLK_WORLD_12		= 172,
-	SDLK_WORLD_13		= 173,
-	SDLK_WORLD_14		= 174,
-	SDLK_WORLD_15		= 175,
-	SDLK_WORLD_16		= 176,
-	SDLK_WORLD_17		= 177,
-	SDLK_WORLD_18		= 178,
-	SDLK_WORLD_19		= 179,
-	SDLK_WORLD_20		= 180,
-	SDLK_WORLD_21		= 181,
-	SDLK_WORLD_22		= 182,
-	SDLK_WORLD_23		= 183,
-	SDLK_WORLD_24		= 184,
-	SDLK_WORLD_25		= 185,
-	SDLK_WORLD_26		= 186,
-	SDLK_WORLD_27		= 187,
-	SDLK_WORLD_28		= 188,
-	SDLK_WORLD_29		= 189,
-	SDLK_WORLD_30		= 190,
-	SDLK_WORLD_31		= 191,
-	SDLK_WORLD_32		= 192,
-	SDLK_WORLD_33		= 193,
-	SDLK_WORLD_34		= 194,
-	SDLK_WORLD_35		= 195,
-	SDLK_WORLD_36		= 196,
-	SDLK_WORLD_37		= 197,
-	SDLK_WORLD_38		= 198,
-	SDLK_WORLD_39		= 199,
-	SDLK_WORLD_40		= 200,
-	SDLK_WORLD_41		= 201,
-	SDLK_WORLD_42		= 202,
-	SDLK_WORLD_43		= 203,
-	SDLK_WORLD_44		= 204,
-	SDLK_WORLD_45		= 205,
-	SDLK_WORLD_46		= 206,
-	SDLK_WORLD_47		= 207,
-	SDLK_WORLD_48		= 208,
-	SDLK_WORLD_49		= 209,
-	SDLK_WORLD_50		= 210,
-	SDLK_WORLD_51		= 211,
-	SDLK_WORLD_52		= 212,
-	SDLK_WORLD_53		= 213,
-	SDLK_WORLD_54		= 214,
-	SDLK_WORLD_55		= 215,
-	SDLK_WORLD_56		= 216,
-	SDLK_WORLD_57		= 217,
-	SDLK_WORLD_58		= 218,
-	SDLK_WORLD_59		= 219,
-	SDLK_WORLD_60		= 220,
-	SDLK_WORLD_61		= 221,
-	SDLK_WORLD_62		= 222,
-	SDLK_WORLD_63		= 223,
-	SDLK_WORLD_64		= 224,
-	SDLK_WORLD_65		= 225,
-	SDLK_WORLD_66		= 226,
-	SDLK_WORLD_67		= 227,
-	SDLK_WORLD_68		= 228,
-	SDLK_WORLD_69		= 229,
-	SDLK_WORLD_70		= 230,
-	SDLK_WORLD_71		= 231,
-	SDLK_WORLD_72		= 232,
-	SDLK_WORLD_73		= 233,
-	SDLK_WORLD_74		= 234,
-	SDLK_WORLD_75		= 235,
-	SDLK_WORLD_76		= 236,
-	SDLK_WORLD_77		= 237,
-	SDLK_WORLD_78		= 238,
-	SDLK_WORLD_79		= 239,
-	SDLK_WORLD_80		= 240,
-	SDLK_WORLD_81		= 241,
-	SDLK_WORLD_82		= 242,
-	SDLK_WORLD_83		= 243,
-	SDLK_WORLD_84		= 244,
-	SDLK_WORLD_85		= 245,
-	SDLK_WORLD_86		= 246,
-	SDLK_WORLD_87		= 247,
-	SDLK_WORLD_88		= 248,
-	SDLK_WORLD_89		= 249,
-	SDLK_WORLD_90		= 250,
-	SDLK_WORLD_91		= 251,
-	SDLK_WORLD_92		= 252,
-	SDLK_WORLD_93		= 253,
-	SDLK_WORLD_94		= 254,
-	SDLK_WORLD_95		= 255,		/* 0xFF */
-        /*@}*/
-
-	/** @name Numeric keypad */
-        /*@{*/
-	SDLK_KP0		= 256,
-	SDLK_KP1		= 257,
-	SDLK_KP2		= 258,
-	SDLK_KP3		= 259,
-	SDLK_KP4		= 260,
-	SDLK_KP5		= 261,
-	SDLK_KP6		= 262,
-	SDLK_KP7		= 263,
-	SDLK_KP8		= 264,
-	SDLK_KP9		= 265,
-	SDLK_KP_PERIOD		= 266,
-	SDLK_KP_DIVIDE		= 267,
-	SDLK_KP_MULTIPLY	= 268,
-	SDLK_KP_MINUS		= 269,
-	SDLK_KP_PLUS		= 270,
-	SDLK_KP_ENTER		= 271,
-	SDLK_KP_EQUALS		= 272,
-        /*@}*/
-
-	/** @name Arrows + Home/End pad */
-        /*@{*/
-	SDLK_UP			= 273,
-	SDLK_DOWN		= 274,
-	SDLK_RIGHT		= 275,
-	SDLK_LEFT		= 276,
-	SDLK_INSERT		= 277,
-	SDLK_HOME		= 278,
-	SDLK_END		= 279,
-	SDLK_PAGEUP		= 280,
-	SDLK_PAGEDOWN		= 281,
-        /*@}*/
-
-	/** @name Function keys */
-        /*@{*/
-	SDLK_F1			= 282,
-	SDLK_F2			= 283,
-	SDLK_F3			= 284,
-	SDLK_F4			= 285,
-	SDLK_F5			= 286,
-	SDLK_F6			= 287,
-	SDLK_F7			= 288,
-	SDLK_F8			= 289,
-	SDLK_F9			= 290,
-	SDLK_F10		= 291,
-	SDLK_F11		= 292,
-	SDLK_F12		= 293,
-	SDLK_F13		= 294,
-	SDLK_F14		= 295,
-	SDLK_F15		= 296,
-        /*@}*/
-
-	/** @name Key state modifier keys */
-        /*@{*/
-	SDLK_NUMLOCK		= 300,
-	SDLK_CAPSLOCK		= 301,
-	SDLK_SCROLLOCK		= 302,
-	SDLK_RSHIFT		= 303,
-	SDLK_LSHIFT		= 304,
-	SDLK_RCTRL		= 305,
-	SDLK_LCTRL		= 306,
-	SDLK_RALT		= 307,
-	SDLK_LALT		= 308,
-	SDLK_RMETA		= 309,
-	SDLK_LMETA		= 310,
-	SDLK_LSUPER		= 311,		/**< Left "Windows" key */
-	SDLK_RSUPER		= 312,		/**< Right "Windows" key */
-	SDLK_MODE		= 313,		/**< "Alt Gr" key */
-	SDLK_COMPOSE		= 314,		/**< Multi-key compose key */
-        /*@}*/
-
-	/** @name Miscellaneous function keys */
-        /*@{*/
-	SDLK_HELP		= 315,
-	SDLK_PRINT		= 316,
-	SDLK_SYSREQ		= 317,
-	SDLK_BREAK		= 318,
-	SDLK_MENU		= 319,
-	SDLK_POWER		= 320,		/**< Power Macintosh power key */
-	SDLK_EURO		= 321,		/**< Some european keyboards */
-	SDLK_UNDO		= 322,		/**< Atari keyboard has Undo */
-        /*@}*/
-
-	/* Add any other keys here */
-
-	SDLK_LAST
-} SDLKey;
-
-/** Enumeration of valid key mods (possibly OR'd together) */
-typedef enum {
-	KMOD_NONE  = 0x0000,
-	KMOD_LSHIFT= 0x0001,
-	KMOD_RSHIFT= 0x0002,
-	KMOD_LCTRL = 0x0040,
-	KMOD_RCTRL = 0x0080,
-	KMOD_LALT  = 0x0100,
-	KMOD_RALT  = 0x0200,
-	KMOD_LMETA = 0x0400,
-	KMOD_RMETA = 0x0800,
-	KMOD_NUM   = 0x1000,
-	KMOD_CAPS  = 0x2000,
-	KMOD_MODE  = 0x4000,
-	KMOD_RESERVED = 0x8000
-} SDLMod;
-
-#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
-#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
-#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
-#define KMOD_META	(KMOD_LMETA|KMOD_RMETA)
-
-#endif /* _SDL_keysym_h */
diff --git a/Externals/SDL/include/SDL_loadso.h b/Externals/SDL/include/SDL_loadso.h
deleted file mode 100644
index 45a17f9f41..0000000000
--- a/Externals/SDL/include/SDL_loadso.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_loadso.h
- *  System dependent library loading routines
- */
-
-/** @file SDL_loadso.h
- *  Some things to keep in mind:                                        
- *  - These functions only work on C function names.  Other languages may
- *    have name mangling and intrinsic language support that varies from
- *    compiler to compiler.
- *  - Make sure you declare your function pointers with the same calling
- *    convention as the actual library function.  Your code will crash
- *    mysteriously if you do not do this.
- *  - Avoid namespace collisions.  If you load a symbol from the library,
- *    it is not defined whether or not it goes into the global symbol
- *    namespace for the application.  If it does and it conflicts with
- *    symbols in your code or other shared libraries, you will not get
- *    the results you expect. :)
- */
-
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * This function dynamically loads a shared object and returns a pointer
- * to the object handle (or NULL if there was an error).
- * The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void * SDLCALL SDL_LoadObject(const char *sofile);
-
-/**
- * Given an object handle, this function looks up the address of the
- * named function in the shared object and returns it.  This address
- * is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void * SDLCALL SDL_LoadFunction(void *handle, const char *name);
-
-/** Unload a shared object from memory */
-extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */
diff --git a/Externals/SDL/include/SDL_main.h b/Externals/SDL/include/SDL_main.h
deleted file mode 100644
index b7f6b2c823..0000000000
--- a/Externals/SDL/include/SDL_main.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/** @file SDL_main.h
- *  Redefine main() on Win32 and MacOS so that it is called by winmain.c
- */
-
-#if defined(__WIN32__) || \
-    (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__MACOS__) || defined(__MACOSX__) || \
-    defined(__SYMBIAN32__) || defined(QWS)
-
-#ifdef __cplusplus
-#define C_LINKAGE	"C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/** The application's main() function must be called with C linkage,
- *  and should be declared like this:
- *      @code
- *      #ifdef __cplusplus
- *      extern "C"
- *      #endif
- *	int main(int argc, char *argv[])
- *	{
- *	}
- *      @endcode
- */
-#define main	SDL_main
-
-/** The prototype for the application's main() function */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/** @name From the SDL library code -- needed for registering the app on Win32 */
-/*@{*/
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This should be called from your WinMain() function, if any */
-extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst);
-/** This can also be called, but is no longer necessary */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
-/** This can also be called, but is no longer necessary (SDL_Quit calls it) */
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-/*@}*/
-
-/** @name From the SDL library code -- needed for registering QuickDraw on MacOS */
-/*@{*/
-#if defined(__MACOS__)
-
-#include "begin_code.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Forward declaration so we don't need to include QuickDraw.h */
-struct QDGlobals;
-
-/** This should be called from your main() function, if any */
-extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
-
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-#endif
-/*@}*/
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
diff --git a/Externals/SDL/include/SDL_mouse.h b/Externals/SDL/include/SDL_mouse.h
deleted file mode 100644
index a573f04ee0..0000000000
--- a/Externals/SDL/include/SDL_mouse.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_mouse.h
- *  Include file for SDL mouse event handling
- */
-
-#ifndef _SDL_mouse_h
-#define _SDL_mouse_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct WMcursor WMcursor;	/**< Implementation dependent */
-typedef struct SDL_Cursor {
-	SDL_Rect area;			/**< The area of the mouse cursor */
-	Sint16 hot_x, hot_y;		/**< The "tip" of the cursor */
-	Uint8 *data;			/**< B/W cursor data */
-	Uint8 *mask;			/**< B/W cursor mask */
-	Uint8 *save[2];			/**< Place to save cursor area */
-	WMcursor *wm_cursor;		/**< Window-manager cursor */
-} SDL_Cursor;
-
-/* Function prototypes */
-/**
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * current mouse cursor position.  You can pass NULL for either x or y.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetMouseState(int *x, int *y);
-
-/**
- * Retrieve the current state of the mouse.
- * The current button state is returned as a button bitmask, which can
- * be tested using the SDL_BUTTON(X) macros, and x and y are set to the
- * mouse deltas since the last call to SDL_GetRelativeMouseState().
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
-
-/**
- * Set the position of the mouse cursor (generates a mouse motion event)
- */
-extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y);
-
-/**
- * Create a cursor using the specified data and mask (in MSB format).
- * The cursor width must be a multiple of 8 bits.
- *
- * The cursor is created in black and white according to the following:
- * data  mask    resulting pixel on screen
- *  0     1       White
- *  1     1       Black
- *  0     0       Transparent
- *  1     0       Inverted color if possible, black if not.
- *
- * Cursors created with this function must be freed with SDL_FreeCursor().
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_CreateCursor
-		(Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y);
-
-/**
- * Set the currently active cursor to the specified one.
- * If the cursor is currently visible, the change will be immediately 
- * represented on the display.
- */
-extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor *cursor);
-
-/**
- * Returns the currently active cursor.
- */
-extern DECLSPEC SDL_Cursor * SDLCALL SDL_GetCursor(void);
-
-/**
- * Deallocates a cursor created with SDL_CreateCursor().
- */
-extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor *cursor);
-
-/**
- * Toggle whether or not the cursor is shown on the screen.
- * The cursor start off displayed, but can be turned off.
- * SDL_ShowCursor() returns 1 if the cursor was being displayed
- * before the call, or 0 if it was not.  You can query the current
- * state by passing a 'toggle' value of -1.
- */
-extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
-
-/*@{*/
-/** Used as a mask when testing buttons in buttonstate
- *  Button 1:	Left mouse button
- *  Button 2:	Middle mouse button
- *  Button 3:	Right mouse button
- *  Button 4:	Mouse wheel up	 (may also be a real button)
- *  Button 5:	Mouse wheel down (may also be a real button)
- */
-#define SDL_BUTTON(X)		(1 << ((X)-1))
-#define SDL_BUTTON_LEFT		1
-#define SDL_BUTTON_MIDDLE	2
-#define SDL_BUTTON_RIGHT	3
-#define SDL_BUTTON_WHEELUP	4
-#define SDL_BUTTON_WHEELDOWN	5
-#define SDL_BUTTON_X1		6
-#define SDL_BUTTON_X2		7
-#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
-#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
-#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
-#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
-#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
diff --git a/Externals/SDL/include/SDL_mutex.h b/Externals/SDL/include/SDL_mutex.h
deleted file mode 100644
index 920971dfa7..0000000000
--- a/Externals/SDL/include/SDL_mutex.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_mutex_h
-#define _SDL_mutex_h
-
-/** @file SDL_mutex.h
- *  Functions to provide thread synchronization primitives
- *
- *  @note These are independent of the other SDL routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Synchronization functions which can time out return this value
- *  if they time out.
- */
-#define SDL_MUTEX_TIMEDOUT	1
-
-/** This is the timeout value which corresponds to never time out */
-#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Mutex functions                                        */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** The SDL mutex structure, defined in SDL_mutex.c */
-struct SDL_mutex;
-typedef struct SDL_mutex SDL_mutex;
-
-/** Create a mutex, initialized unlocked */
-extern DECLSPEC SDL_mutex * SDLCALL SDL_CreateMutex(void);
-
-#define SDL_LockMutex(m)	SDL_mutexP(m)
-/** Lock the mutex
- *  @return 0, or -1 on error
- */
-extern DECLSPEC int SDLCALL SDL_mutexP(SDL_mutex *mutex);
-
-#define SDL_UnlockMutex(m)	SDL_mutexV(m)
-/** Unlock the mutex
- *  @return 0, or -1 on error
- *
- *  It is an error to unlock a mutex that has not been locked by
- *  the current thread, and doing so results in undefined behavior.
- */
-extern DECLSPEC int SDLCALL SDL_mutexV(SDL_mutex *mutex);
-
-/** Destroy a mutex */
-extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Semaphore functions                                    */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** The SDL semaphore structure, defined in SDL_sem.c */
-struct SDL_semaphore;
-typedef struct SDL_semaphore SDL_sem;
-
-/** Create a semaphore, initialized with value, returns NULL on failure. */
-extern DECLSPEC SDL_sem * SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
-
-/** Destroy a semaphore */
-extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem *sem);
-
-/**
- * This function suspends the calling thread until the semaphore pointed 
- * to by sem has a positive count. It then atomically decreases the semaphore
- * count.
- */
-extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem *sem);
-
-/** Non-blocking variant of SDL_SemWait().
- *  @return 0 if the wait succeeds,
- *  SDL_MUTEX_TIMEDOUT if the wait would block, and -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem *sem);
-
-/** Variant of SDL_SemWait() with a timeout in milliseconds, returns 0 if
- *  the wait succeeds, SDL_MUTEX_TIMEDOUT if the wait does not succeed in
- *  the allotted time, and -1 on error.
- *
- *  On some platforms this function is implemented by looping with a delay
- *  of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem *sem, Uint32 ms);
-
-/** Atomically increases the semaphore's count (not blocking).
- *  @return 0, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem *sem);
-
-/** Returns the current count of the semaphore */
-extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem *sem);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Condition_variable_functions                           */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*@{*/
-/** The SDL condition variable structure, defined in SDL_cond.c */
-struct SDL_cond;
-typedef struct SDL_cond SDL_cond;
-/*@}*/
-
-/** Create a condition variable */
-extern DECLSPEC SDL_cond * SDLCALL SDL_CreateCond(void);
-
-/** Destroy a condition variable */
-extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond *cond);
-
-/** Restart one of the threads that are waiting on the condition variable,
- *  @return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond *cond);
-
-/** Restart all threads that are waiting on the condition variable,
- *  @return 0 or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond *cond);
-
-/** Wait on the condition variable, unlocking the provided mutex.
- *  The mutex must be locked before entering this function!
- *  The mutex is re-locked once the condition variable is signaled.
- *  @return 0 when it is signaled, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond *cond, SDL_mutex *mut);
-
-/** Waits for at most 'ms' milliseconds, and returns 0 if the condition
- *  variable is signaled, SDL_MUTEX_TIMEDOUT if the condition is not
- *  signaled in the allotted time, and -1 on error.
- *  On some platforms this function is implemented by looping with a delay
- *  of 1 ms, and so should be avoided if possible.
- */
-extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms);
-
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mutex_h */
-
diff --git a/Externals/SDL/include/SDL_name.h b/Externals/SDL/include/SDL_name.h
deleted file mode 100644
index 511619af56..0000000000
--- a/Externals/SDL/include/SDL_name.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NeedFunctionPrototypes 1
-#endif
-
-#define SDL_NAME(X)	SDL_##X
-
-#endif /* _SDLname_h_ */
diff --git a/Externals/SDL/include/SDL_opengl.h b/Externals/SDL/include/SDL_opengl.h
deleted file mode 100644
index c479a3a4e4..0000000000
--- a/Externals/SDL/include/SDL_opengl.h
+++ /dev/null
@@ -1,6556 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_opengl.h
- *  This is a simple file to encapsulate the OpenGL API headers
- */
-
-#include "SDL_config.h"
-
-#ifdef __WIN32__
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX	/* Don't defined min() and max() */
-#endif
-#include <windows.h>
-#endif
-#ifndef NO_SDL_GLEXT
-#define __glext_h_  /* Don't let gl.h include glext.h */
-#endif
-#if defined(__MACOSX__)
-#include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
-#elif defined(__MACOS__)
-#include <gl.h>		/* Header File For The OpenGL Library */
-#include <glu.h>	/* Header File For The GLU Library */
-#else
-#include <GL/gl.h>	/* Header File For The OpenGL Library */
-#include <GL/glu.h>	/* Header File For The GLU Library */
-#endif
-#ifndef NO_SDL_GLEXT
-#undef __glext_h_
-#endif
-
-/** @name GLext.h
- *  This file taken from "GLext.h" from the Jeff Molofee OpenGL tutorials.
- *  It is included here because glext.h is not available on some systems.
- *  If you don't want this version included, simply define "NO_SDL_GLEXT"
- */
-/*@{*/
-#ifndef NO_SDL_GLEXT
-#if !defined(__glext_h_) && !defined(GL_GLEXT_LEGACY)
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2005/06/20 */
-/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 29
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_EXT_color_matrix
-#define GL_EXT_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif /* NO_SDL_GLEXT */
-/*@}*/
diff --git a/Externals/SDL/include/SDL_platform.h b/Externals/SDL/include/SDL_platform.h
deleted file mode 100644
index 11d8673667..0000000000
--- a/Externals/SDL/include/SDL_platform.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_platform.h
- *  Try to get a standard set of platform defines
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__		1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__	1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__ 1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__	1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__	1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__	1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__	1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__	1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__	1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__	1
-#endif
-#if defined(__APPLE__)
-#undef __MACOSX__
-#define __MACOSX__	1
-#elif defined(macintosh)
-#undef __MACOS__
-#define __MACOS__	1
-#endif
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__	1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__	1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__		1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__		1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__	1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__	1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__	1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__	1
-#endif
-
-#endif /* _SDL_platform_h */
diff --git a/Externals/SDL/include/SDL_quit.h b/Externals/SDL/include/SDL_quit.h
deleted file mode 100644
index 6d82e7e061..0000000000
--- a/Externals/SDL/include/SDL_quit.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_quit.h
- *  Include file for SDL quit event handling
- */
-
-#ifndef _SDL_quit_h
-#define _SDL_quit_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/** @file SDL_quit.h
- *  An SDL_QUITEVENT is generated when the user tries to close the application
- *  window.  If it is ignored or filtered out, the window will remain open.
- *  If it is not ignored or filtered, it is queued normally and the window
- *  is allowed to close.  When the window is closed, screen updates will 
- *  complete, but have no effect.
- *
- *  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
- *  and SIGTERM (system termination request), if handlers do not already
- *  exist, that generate SDL_QUITEVENT events as well.  There is no way
- *  to determine the cause of an SDL_QUITEVENT, but setting a signal
- *  handler in your application will override the default generation of
- *  quit events for that signal.
- */
-
-/** @file SDL_quit.h
- *  There are no functions directly affecting the quit event 
- */
-
-#define SDL_QuitRequested() \
-        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUITMASK))
-
-#endif /* _SDL_quit_h */
diff --git a/Externals/SDL/include/SDL_rwops.h b/Externals/SDL/include/SDL_rwops.h
deleted file mode 100644
index a450119f1c..0000000000
--- a/Externals/SDL/include/SDL_rwops.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_rwops.h
- *  This file provides a general interface for SDL to read and write
- *  data sources.  It can easily be extended to files, memory, etc.
- */
-
-#ifndef _SDL_rwops_h
-#define _SDL_rwops_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the read/write operation structure -- very basic */
-
-typedef struct SDL_RWops {
-	/** Seek to 'offset' relative to whence, one of stdio's whence values:
-	 *	SEEK_SET, SEEK_CUR, SEEK_END
-	 *  Returns the final offset in the data source.
-	 */
-	int (SDLCALL *seek)(struct SDL_RWops *context, int offset, int whence);
-
-	/** Read up to 'maxnum' objects each of size 'size' from the data
-	 *  source to the area pointed at by 'ptr'.
-	 *  Returns the number of objects read, or -1 if the read failed.
-	 */
-	int (SDLCALL *read)(struct SDL_RWops *context, void *ptr, int size, int maxnum);
-
-	/** Write exactly 'num' objects each of size 'objsize' from the area
-	 *  pointed at by 'ptr' to data source.
-	 *  Returns 'num', or -1 if the write failed.
-	 */
-	int (SDLCALL *write)(struct SDL_RWops *context, const void *ptr, int size, int num);
-
-	/** Close and free an allocated SDL_FSops structure */
-	int (SDLCALL *close)(struct SDL_RWops *context);
-
-	Uint32 type;
-	union {
-#if defined(__WIN32__) && !defined(__SYMBIAN32__)
-	    struct {
-		int   append;
-		void *h;
-		struct {
-		    void *data;
-		    int size;
-		    int left;
-		} buffer;
-	    } win32io;
-#endif
-#ifdef HAVE_STDIO_H 
-	    struct {
-		int autoclose;
-	 	FILE *fp;
-	    } stdio;
-#endif
-	    struct {
-		Uint8 *base;
-	 	Uint8 *here;
-		Uint8 *stop;
-	    } mem;
-	    struct {
-		void *data1;
-	    } unknown;
-	} hidden;
-
-} SDL_RWops;
-
-
-/** @name Functions to create SDL_RWops structures from various data sources */
-/*@{*/
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char *mode);
-
-#ifdef HAVE_STDIO_H
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFP(FILE *fp, int autoclose);
-#endif
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromMem(void *mem, int size);
-extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromConstMem(const void *mem, int size);
-
-extern DECLSPEC SDL_RWops * SDLCALL SDL_AllocRW(void);
-extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops *area);
-
-/*@}*/
-
-/** @name Seek Reference Points */
-/*@{*/
-#define RW_SEEK_SET	0	/**< Seek from the beginning of data */
-#define RW_SEEK_CUR	1	/**< Seek relative to current read point */
-#define RW_SEEK_END	2	/**< Seek relative to the end of data */
-/*@}*/
-
-/** @name Macros to easily read and write from an SDL_RWops structure */
-/*@{*/
-#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)		(ctx)->close(ctx)
-/*@}*/
-
-/** @name Read an item of the specified endianness and return in native format */
-/*@{*/
-extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
-extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
-extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops *src);
-extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops *src);
-/*@}*/
-
-/** @name Write an item of native format to the specified endianness */
-/*@{*/
-extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops *dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops *dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops *dst, Uint64 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_rwops_h */
diff --git a/Externals/SDL/include/SDL_stdinc.h b/Externals/SDL/include/SDL_stdinc.h
deleted file mode 100644
index e1f85fb75a..0000000000
--- a/Externals/SDL/include/SDL_stdinc.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_stdinc.h
- *  This is a general header that includes C language support
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-#  include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-#  include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-#  include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-#  include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
-
-/** The number of elements in an array */
-#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)	SDL_arraysize(table)
-
-/* Use proper C++ casts when compiled as C++ to be compatible with the option
- -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above. */
-#ifdef __cplusplus
-#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
-#define SDL_static_cast(type, expression) static_cast<type>(expression)
-#else
-#define SDL_reinterpret_cast(type, expression) ((type)(expression))
-#define SDL_static_cast(type, expression) ((type)(expression))
-#endif
-
-/** @name Basic data types */
-/*@{*/
-typedef enum {
-	SDL_FALSE = 0,
-	SDL_TRUE  = 1
-} SDL_bool;
-
-typedef int8_t		Sint8;
-typedef uint8_t		Uint8;
-typedef int16_t		Sint16;
-typedef uint16_t	Uint16;
-typedef int32_t		Sint32;
-typedef uint32_t	Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-typedef int64_t		Sint64;
-#ifndef SYMBIAN32_GCCE
-typedef uint64_t	Uint64;
-#endif
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef struct {
-	Uint32 hi;
-	Uint32 lo;
-} Uint64, Sint64;
-#endif
-
-/*@}*/
-
-/** @name Make sure the types really have the right sizes */
-/*@{*/
-#define SDL_COMPILE_TIME_ASSERT(name, x)               \
-       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-/*@}*/
-
-/** @name Enum Size Check
- *  Check to make sure enums are the size of ints, for structure packing.
- *  For both Watcom C/C++ and Borland C/C++ the compiler option that makes
- *  enums having the size of an int must be enabled.
- *  This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
- */
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-typedef enum {
-	DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-#ifndef __NDS__
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-/*@}*/
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc	malloc
-#else
-extern DECLSPEC void * SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc	calloc
-#else
-extern DECLSPEC void * SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc	realloc
-#else
-extern DECLSPEC void * SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free	free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-#  include <alloca.h>
-# elif defined(__GNUC__)
-#  define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-#  include <malloc.h>
-#  define alloca _alloca
-# elif defined(__WATCOMC__)
-#  include <malloc.h>
-# elif defined(__BORLANDC__)
-#  include <malloc.h>
-# elif defined(__DMC__)
-#  include <stdlib.h>
-# elif defined(__AIX__)
-  #pragma alloca
-# elif defined(__MRC__)
-   void *alloca (unsigned);
-# else
-   char *alloca ();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data)            SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv	getenv
-#else
-extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
-#endif
-
-#ifdef HAVE_PUTENV
-#define SDL_putenv	putenv
-#else
-extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort	qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
-           int (*compare)(const void *, const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs		abs
-#else
-#define SDL_abs(X)	((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y)	(((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y)	(((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X)  isdigit(X)
-#define SDL_isspace(X)  isspace(X)
-#define SDL_toupper(X)  toupper(X)
-#define SDL_tolower(X)  tolower(X)
-#else
-#define SDL_isdigit(X)  (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X)  (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X)  (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X)  (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset      memset
-#else
-extern DECLSPEC void * SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len)				\
-do {								\
-	int u0, u1, u2;						\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; stosl\n\t"				\
-		: "=&D" (u0), "=&a" (u1), "=&c" (u2)		\
-		: "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, len))	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len)		\
-do {						\
-	unsigned _count = (len);		\
-	unsigned _n = (_count + 3) / 4;		\
-	Uint32 *_p = SDL_static_cast(Uint32 *, dst);	\
-	Uint32 _val = (val);			\
-	if (len == 0) break;			\
-        switch (_count % 4) {			\
-        case 0: do {    *_p++ = _val;		\
-        case 3:         *_p++ = _val;		\
-        case 2:         *_p++ = _val;		\
-        case 1:         *_p++ = _val;		\
-		} while ( --_n );		\
-	}					\
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len)					  \
-do {									  \
-	int u0, u1, u2;						  	  \
-	__asm__ __volatile__ (						  \
-		"cld\n\t"						  \
-		"rep ; movsl\n\t"					  \
-		"testb $2,%b4\n\t"					  \
-		"je 1f\n\t"						  \
-		"movsw\n"						  \
-		"1:\ttestb $1,%b4\n\t"					  \
-		"je 2f\n\t"						  \
-		"movsb\n"						  \
-		"2:"							  \
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)			  \
-		: "0" (SDL_static_cast(unsigned, len)/4), "q" (len), "1" (dst),"2" (src) \
-		: "memory" );						  \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy      memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n)	bcopy((s), (d), (n))
-#else
-extern DECLSPEC void * SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len)				\
-do {								\
-	int ecx, edi, esi;					\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; movsl"					\
-		: "=&c" (ecx), "=&D" (edi), "=&S" (esi)		\
-		: "0" (SDL_static_cast(unsigned, len)), "1" (dst), "2" (src)	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len)			\
-do {							\
-	int u0, u1, u2;					\
-	char *dstp = SDL_static_cast(char *, dst);	\
-	char *srcp = SDL_static_cast(char *, src);	\
-	int n = (len);					\
-	if ( n >= 4 ) {					\
-	__asm__ __volatile__ (				\
-		"std\n\t"				\
-		"rep ; movsl\n\t"			\
-		"cld\n\t"				\
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)	\
-		: "0" (n >> 2),				\
-		  "1" (dstp+(n-4)), "2" (srcp+(n-4))	\
-		: "memory" );				\
-	}						\
-	switch (n & 3) {				\
-		case 3: dstp[2] = srcp[2];		\
-		case 2: dstp[1] = srcp[1];		\
-		case 1: dstp[0] = srcp[0];		\
-			break;				\
-		default:				\
-			break;				\
-	}						\
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void * SDLCALL SDL_revcpy(void *dst, const void *src, size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove     memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n)	bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len)			\
-do {							\
-	if ( dst < src ) {				\
-		SDL_memcpy(dst, src, len);		\
-	} else {					\
-		SDL_revcpy(dst, src, len);		\
-	}						\
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp      memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen      strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy     strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat    strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup     strdup
-#else
-extern DECLSPEC char * SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev      _strrev
-#else
-extern DECLSPEC char * SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr      _strupr
-#else
-extern DECLSPEC char * SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr      _strlwr
-#else
-extern DECLSPEC char * SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr      strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr      index
-#else
-extern DECLSPEC char * SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr     strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr     rindex
-#else
-extern DECLSPEC char * SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr      strstr
-#else
-extern DECLSPEC char * SDLCALL SDL_strstr(const char *haystack, const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa        itoa
-#else
-#define SDL_itoa(value, string, radix)	SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa        _ltoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa       _uitoa
-#else
-#define SDL_uitoa(value, string, radix)	SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa       _ultoa
-#else
-extern DECLSPEC char * SDLCALL SDL_ultoa(unsigned long value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol      strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul      strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string, char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa       _i64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_lltoa(Sint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa      _ui64toa
-#else
-extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll     strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull     strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod      strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi        atoi
-#else
-#define SDL_atoi(X)     SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof        atof
-#else
-#define SDL_atof(X)     SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp      strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp     strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp  strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp  _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf      sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf    snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf   vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
-#endif
-
-/** @name SDL_ICONV Error Codes
- *  The SDL implementation of iconv() returns these error codes 
- */
-/*@{*/
-#define SDL_ICONV_ERROR		(size_t)-1
-#define SDL_ICONV_E2BIG		(size_t)-2
-#define SDL_ICONV_EILSEQ	(size_t)-3
-#define SDL_ICONV_EINVAL	(size_t)-4
-/*@}*/
-
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-#define SDL_iconv_t     iconv_t
-#define SDL_iconv_open  iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-/** This function converts a string between encodings in one pass, returning a
- *  string that must be freed with SDL_free() or NULL on error.
- */
-extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
diff --git a/Externals/SDL/include/SDL_syswm.h b/Externals/SDL/include/SDL_syswm.h
deleted file mode 100644
index 716dddcb73..0000000000
--- a/Externals/SDL/include/SDL_syswm.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_syswm.h
- *  Include file for SDL custom system window manager hooks
- */
-
-#ifndef _SDL_syswm_h
-#define _SDL_syswm_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_version.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file SDL_syswm.h
- *  Your application has access to a special type of event 'SDL_SYSWMEVENT',
- *  which contains window-manager specific information and arrives whenever
- *  an unhandled window event occurs.  This event is ignored by default, but
- *  you can enable it with SDL_EventState()
- */
-#ifdef SDL_PROTOTYPES_ONLY
-struct SDL_SysWMinfo;
-typedef struct SDL_SysWMinfo SDL_SysWMinfo;
-#else
-
-/* This is the structure for custom window manager events */
-#if defined(SDL_VIDEO_DRIVER_X11)
-#if defined(__APPLE__) && defined(__MACH__)
-/* conflicts with Quickdraw.h */
-#define Cursor X11Cursor
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* matches the re-define above */
-#undef Cursor
-#endif
-
-/** These are the various supported subsystems under UNIX */
-typedef enum {
-	SDL_SYSWM_X11
-} SDL_SYSWM_TYPE;
-
-/** The UNIX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    XEvent xevent;
-	} event;
-};
-
-/** The UNIX custom window manager information structure.
- *  When this structure is returned, it holds information about which
- *  low level system it is using, and will be one of SDL_SYSWM_TYPE.
- */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	SDL_SYSWM_TYPE subsystem;
-	union {
-	    struct {
-	    	Display *display;	/**< The X11 display */
-	    	Window window;		/**< The X11 display window */
-		/** These locking functions should be called around
-                 *  any X11 functions using the display variable, 
-                 *  but not the gfxdisplay variable.
-                 *  They lock the event thread, so should not be
-		 *  called around event functions or from event filters.
-		 */
-                /*@{*/
-		void (*lock_func)(void);
-		void (*unlock_func)(void);
-                /*@}*/
-
-		/** @name Introduced in SDL 1.0.2 */
-                /*@{*/
-	    	Window fswindow;	/**< The X11 fullscreen window */
-	    	Window wmwindow;	/**< The X11 managed input window */
-                /*@}*/
-
-		/** @name Introduced in SDL 1.2.12 */
-                /*@{*/
-		Display *gfxdisplay;	/**< The X11 display to which rendering is done */
-                /*@}*/
-	    } x11;
-	} info;
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_NANOX)
-#include <microwin/nano-X.h>
-
-/** The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version ;
-	GR_WINDOW_ID window ;	/* The display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/** The windows custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	HWND hwnd;			/**< The window for the message */
-	UINT msg;			/**< The type of message */
-	WPARAM wParam;			/**< WORD message parameter */
-	LPARAM lParam;			/**< LONG message parameter */
-};
-
-/** The windows custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	HWND window;			/**< The Win32 display window */
-	HGLRC hglrc;			/**< The OpenGL context, if any */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_RISCOS)
-
-/** RISC OS custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int eventCode;		/**< The window for the message */
-	int pollBlock[64];
-};
-
-/** The RISC OS custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int wimpVersion;    /**< Wimp version running under */
-	int taskHandle;     /**< The RISC OS task handle */
-	int window;		/**< The RISC OS display window */
-} SDL_SysWMinfo;
-
-#elif defined(SDL_VIDEO_DRIVER_PHOTON)
-#include <sys/neutrino.h>
-#include <Ph.h>
-
-/** The QNX custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The QNX custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#else
-
-/** The generic custom event structure */
-struct SDL_SysWMmsg {
-	SDL_version version;
-	int data;
-};
-
-/** The generic custom window manager information structure */
-typedef struct SDL_SysWMinfo {
-	SDL_version version;
-	int data;
-} SDL_SysWMinfo;
-
-#endif /* video driver type */
-
-#endif /* SDL_PROTOTYPES_ONLY */
-
-/* Function prototypes */
-/**
- * This function gives you custom hooks into the window manager information.
- * It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented.  If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0. 
- *
- * You typically use this function like this:
- * @code
- * SDL_SysWMInfo info;
- * SDL_VERSION(&info.version);
- * if ( SDL_GetWMInfo(&info) ) { ... }
- * @endcode
- */
-extern DECLSPEC int SDLCALL SDL_GetWMInfo(SDL_SysWMinfo *info);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_syswm_h */
diff --git a/Externals/SDL/include/SDL_thread.h b/Externals/SDL/include/SDL_thread.h
deleted file mode 100644
index 1ca9a1bc42..0000000000
--- a/Externals/SDL/include/SDL_thread.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_thread_h
-#define _SDL_thread_h
-
-/** @file SDL_thread.h
- *  Header for the SDL thread management routines 
- *
- *  @note These are independent of the other SDL routines.
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-/* Thread synchronization primitives */
-#include "SDL_mutex.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** The SDL thread structure, defined in SDL_thread.c */
-struct SDL_Thread;
-typedef struct SDL_Thread SDL_Thread;
-
-/** Create a thread */
-#if ((defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)) &&  !defined(__SYMBIAN32__)
-/**
- *  We compile SDL into a DLL on OS/2. This means, that it's the DLL which
- *  creates a new thread for the calling process with the SDL_CreateThread()
- *  API. There is a problem with this, that only the RTL of the SDL.DLL will
- *  be initialized for those threads, and not the RTL of the calling application!
- *  To solve this, we make a little hack here.
- *  We'll always use the caller's _beginthread() and _endthread() APIs to
- *  start a new thread. This way, if it's the SDL.DLL which uses this API,
- *  then the RTL of SDL.DLL will be used to create the new thread, and if it's
- *  the application, then the RTL of the application will be used.
- *  So, in short:
- *  Always use the _beginthread() and _endthread() of the calling runtime library!
- */
-#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
-#ifndef _WIN32_WCE
-#include <process.h> /* This has _beginthread() and _endthread() defined! */
-#endif
-
-#ifdef __OS2__
-typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
-typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#else
-typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
-#endif
-
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
-
-#ifdef __OS2__
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
-#elif defined(_WIN32_WCE)
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL)
-#else
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex)
-#endif
-#else
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data);
-#endif
-
-/** Get the 32-bit thread identifier for the current thread */
-extern DECLSPEC Uint32 SDLCALL SDL_ThreadID(void);
-
-/** Get the 32-bit thread identifier for the specified thread,
- *  equivalent to SDL_ThreadID() if the specified thread is NULL.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_GetThreadID(SDL_Thread *thread);
-
-/** Wait for a thread to finish.
- *  The return code for the thread function is placed in the area
- *  pointed to by 'status', if 'status' is not NULL.
- */
-extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread *thread, int *status);
-
-/** Forcefully kill a thread without worrying about its state */
-extern DECLSPEC void SDLCALL SDL_KillThread(SDL_Thread *thread);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_thread_h */
diff --git a/Externals/SDL/include/SDL_timer.h b/Externals/SDL/include/SDL_timer.h
deleted file mode 100644
index d7cd024601..0000000000
--- a/Externals/SDL/include/SDL_timer.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_timer_h
-#define _SDL_timer_h
-
-/** @file SDL_timer.h
- *  Header for the SDL time management routines
- */
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the OS scheduler timeslice, in milliseconds */
-#define SDL_TIMESLICE		10
-
-/** This is the maximum resolution of the SDL timer on all platforms */
-#define TIMER_RESOLUTION	10	/**< Experimentally determined */
-
-/**
- * Get the number of milliseconds since the SDL library initialization.
- * Note that this value wraps if the program runs for more than ~49 days.
- */ 
-extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
-
-/** Wait a specified number of milliseconds before returning */
-extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
-
-/** Function prototype for the timer callback function */
-typedef Uint32 (SDLCALL *SDL_TimerCallback)(Uint32 interval);
-
-/**
- * Set a callback to run after the specified number of milliseconds has
- * elapsed. The callback function is passed the current timer interval
- * and returns the next timer interval.  If the returned value is the 
- * same as the one passed in, the periodic alarm continues, otherwise a
- * new alarm is scheduled.  If the callback returns 0, the periodic alarm
- * is cancelled.
- *
- * To cancel a currently running timer, call SDL_SetTimer(0, NULL);
- *
- * The timer callback function may run in a different thread than your
- * main code, and so shouldn't call any functions from within itself.
- *
- * The maximum resolution of this timer is 10 ms, which means that if
- * you request a 16 ms timer, your callback will run approximately 20 ms
- * later on an unloaded system.  If you wanted to set a flag signaling
- * a frame update at 30 frames per second (every 33 ms), you might set a 
- * timer for 30 ms:
- *   @code SDL_SetTimer((33/10)*10, flag_update); @endcode
- *
- * If you use this function, you need to pass SDL_INIT_TIMER to SDL_Init().
- *
- * Under UNIX, you should not use raise or use SIGALRM and this function
- * in the same program, as it is implemented using setitimer().  You also
- * should not use this function in multi-threaded applications as signals
- * to multi-threaded apps have undefined behavior in some implementations.
- *
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_TimerCallback callback);
-
-/** @name New timer API
- * New timer API, supports multiple timers
- * Written by Stephane Peter <megastep@lokigames.com>
- */
-/*@{*/
-
-/**
- * Function prototype for the new timer callback function.
- * The callback function is passed the current timer interval and returns
- * the next timer interval.  If the returned value is the same as the one
- * passed in, the periodic alarm continues, otherwise a new alarm is
- * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
- */
-typedef Uint32 (SDLCALL *SDL_NewTimerCallback)(Uint32 interval, void *param);
-
-/** Definition of the timer ID type */
-typedef struct _SDL_TimerID *SDL_TimerID;
-
-/** Add a new timer to the pool of timers already running.
- *  Returns a timer ID, or NULL when an error occurs.
- */
-extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_NewTimerCallback callback, void *param);
-
-/**
- * Remove one of the multiple timers knowing its ID.
- * Returns a boolean value indicating success.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID t);
-
-/*@}*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_timer_h */
diff --git a/Externals/SDL/include/SDL_types.h b/Externals/SDL/include/SDL_types.h
deleted file mode 100644
index cfa35236a4..0000000000
--- a/Externals/SDL/include/SDL_types.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_types.h
- *  @deprecated Use SDL_stdinc.h instead.
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"
diff --git a/Externals/SDL/include/SDL_version.h b/Externals/SDL/include/SDL_version.h
deleted file mode 100644
index fa02c3f6da..0000000000
--- a/Externals/SDL/include/SDL_version.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_version.h
- *  This header defines the current SDL version
- */
-
-#ifndef _SDL_version_h
-#define _SDL_version_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name Version Number
- *  Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
- */
-/*@{*/
-#define SDL_MAJOR_VERSION	1
-#define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		14
-/*@}*/
-
-typedef struct SDL_version {
-	Uint8 major;
-	Uint8 minor;
-	Uint8 patch;
-} SDL_version;
-
-/**
- * This macro can be used to fill a version structure with the compile-time
- * version of the SDL library.
- */
-#define SDL_VERSION(X)							\
-{									\
-	(X)->major = SDL_MAJOR_VERSION;					\
-	(X)->minor = SDL_MINOR_VERSION;					\
-	(X)->patch = SDL_PATCHLEVEL;					\
-}
-
-/** This macro turns the version numbers into a numeric value:
- *  (1,2,3) -> (1203)
- *  This assumes that there will never be more than 100 patchlevels
- */
-#define SDL_VERSIONNUM(X, Y, Z)						\
-	((X)*1000 + (Y)*100 + (Z))
-
-/** This is the version number macro for the current SDL version */
-#define SDL_COMPILEDVERSION \
-	SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
-
-/** This macro will evaluate to true if compiled with SDL at least X.Y.Z */
-#define SDL_VERSION_ATLEAST(X, Y, Z) \
-	(SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
-
-/** This function gets the version of the dynamically linked SDL library.
- *  it should NOT be used to fill a version structure, instead you should
- *  use the SDL_Version() macro.
- */
-extern DECLSPEC const SDL_version * SDLCALL SDL_Linked_Version(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_version_h */
diff --git a/Externals/SDL/include/SDL_video.h b/Externals/SDL/include/SDL_video.h
deleted file mode 100644
index 8f7f305203..0000000000
--- a/Externals/SDL/include/SDL_video.h
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** @file SDL_video.h
- *  Header file for access to the SDL raw framebuffer window
- */
-
-#ifndef _SDL_video_h
-#define _SDL_video_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @name Transparency definitions
- *  These define alpha as the opacity of a surface
- */
-/*@{*/
-#define SDL_ALPHA_OPAQUE 255
-#define SDL_ALPHA_TRANSPARENT 0
-/*@}*/
-
-/** @name Useful data types */
-/*@{*/
-typedef struct SDL_Rect {
-	Sint16 x, y;
-	Uint16 w, h;
-} SDL_Rect;
-
-typedef struct SDL_Color {
-	Uint8 r;
-	Uint8 g;
-	Uint8 b;
-	Uint8 unused;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette {
-	int       ncolors;
-	SDL_Color *colors;
-} SDL_Palette;
-/*@}*/
-
-/** Everything in the pixel format structure is read-only */
-typedef struct SDL_PixelFormat {
-	SDL_Palette *palette;
-	Uint8  BitsPerPixel;
-	Uint8  BytesPerPixel;
-	Uint8  Rloss;
-	Uint8  Gloss;
-	Uint8  Bloss;
-	Uint8  Aloss;
-	Uint8  Rshift;
-	Uint8  Gshift;
-	Uint8  Bshift;
-	Uint8  Ashift;
-	Uint32 Rmask;
-	Uint32 Gmask;
-	Uint32 Bmask;
-	Uint32 Amask;
-
-	/** RGB color key information */
-	Uint32 colorkey;
-	/** Alpha value information (per-surface alpha) */
-	Uint8  alpha;
-} SDL_PixelFormat;
-
-/** This structure should be treated as read-only, except for 'pixels',
- *  which, if not NULL, contains the raw pixel data for the surface.
- */
-typedef struct SDL_Surface {
-	Uint32 flags;				/**< Read-only */
-	SDL_PixelFormat *format;		/**< Read-only */
-	int w, h;				/**< Read-only */
-	Uint16 pitch;				/**< Read-only */
-	void *pixels;				/**< Read-write */
-	int offset;				/**< Private */
-
-	/** Hardware-specific surface info */
-	struct private_hwdata *hwdata;
-
-	/** clipping information */
-	SDL_Rect clip_rect;			/**< Read-only */
-	Uint32 unused1;				/**< for binary compatibility */
-
-	/** Allow recursive locks */
-	Uint32 locked;				/**< Private */
-
-	/** info for fast blit mapping to other surfaces */
-	struct SDL_BlitMap *map;		/**< Private */
-
-	/** format version, bumped at every change to invalidate blit maps */
-	unsigned int format_version;		/**< Private */
-
-	/** Reference count -- used when freeing surface */
-	int refcount;				/**< Read-mostly */
-} SDL_Surface;
-
-/** @name SDL_Surface Flags
- *  These are the currently supported flags for the SDL_surface
- */
-/*@{*/
-
-/** Available for SDL_CreateRGBSurface() or SDL_SetVideoMode() */
-/*@{*/
-#define SDL_SWSURFACE	0x00000000	/**< Surface is in system memory */
-#define SDL_HWSURFACE	0x00000001	/**< Surface is in video memory */
-#define SDL_ASYNCBLIT	0x00000004	/**< Use asynchronous blits if possible */
-/*@}*/
-
-/** Available for SDL_SetVideoMode() */
-/*@{*/
-#define SDL_ANYFORMAT	0x10000000	/**< Allow any video depth/pixel-format */
-#define SDL_HWPALETTE	0x20000000	/**< Surface has exclusive palette */
-#define SDL_DOUBLEBUF	0x40000000	/**< Set up double-buffered video mode */
-#define SDL_FULLSCREEN	0x80000000	/**< Surface is a full screen display */
-#define SDL_OPENGL      0x00000002      /**< Create an OpenGL rendering context */
-#define SDL_OPENGLBLIT	0x0000000A	/**< Create an OpenGL rendering context and use it for blitting */
-#define SDL_RESIZABLE	0x00000010	/**< This video mode may be resized */
-#define SDL_NOFRAME	0x00000020	/**< No window caption or edge frame */
-/*@}*/
-
-/** Used internally (read-only) */
-/*@{*/
-#define SDL_HWACCEL	0x00000100	/**< Blit uses hardware acceleration */
-#define SDL_SRCCOLORKEY	0x00001000	/**< Blit uses a source color key */
-#define SDL_RLEACCELOK	0x00002000	/**< Private flag */
-#define SDL_RLEACCEL	0x00004000	/**< Surface is RLE encoded */
-#define SDL_SRCALPHA	0x00010000	/**< Blit uses source alpha blending */
-#define SDL_PREALLOC	0x01000000	/**< Surface uses preallocated memory */
-/*@}*/
-
-/*@}*/
-
-/** Evaluates to true if the surface needs to be locked before access */
-#define SDL_MUSTLOCK(surface)	\
-  (surface->offset ||		\
-  ((surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_RLEACCEL)) != 0))
-
-/** typedef for private surface blitting functions */
-typedef int (*SDL_blit)(struct SDL_Surface *src, SDL_Rect *srcrect,
-			struct SDL_Surface *dst, SDL_Rect *dstrect);
-
-
-/** Useful for determining the video hardware capabilities */
-typedef struct SDL_VideoInfo {
-	Uint32 hw_available :1;	/**< Flag: Can you create hardware surfaces? */
-	Uint32 wm_available :1;	/**< Flag: Can you talk to a window manager? */
-	Uint32 UnusedBits1  :6;
-	Uint32 UnusedBits2  :1;
-	Uint32 blit_hw      :1;	/**< Flag: Accelerated blits HW --> HW */
-	Uint32 blit_hw_CC   :1;	/**< Flag: Accelerated blits with Colorkey */
-	Uint32 blit_hw_A    :1;	/**< Flag: Accelerated blits with Alpha */
-	Uint32 blit_sw      :1;	/**< Flag: Accelerated blits SW --> HW */
-	Uint32 blit_sw_CC   :1;	/**< Flag: Accelerated blits with Colorkey */
-	Uint32 blit_sw_A    :1;	/**< Flag: Accelerated blits with Alpha */
-	Uint32 blit_fill    :1;	/**< Flag: Accelerated color fill */
-	Uint32 UnusedBits3  :16;
-	Uint32 video_mem;	/**< The total amount of video memory (in K) */
-	SDL_PixelFormat *vfmt;	/**< Value: The format of the video surface */
-	int    current_w;	/**< Value: The current video mode width */
-	int    current_h;	/**< Value: The current video mode height */
-} SDL_VideoInfo;
-
-
-/** @name Overlay Formats
- *  The most common video overlay formats.
- *  For an explanation of these pixel formats, see:
- *	http://www.webartz.com/fourcc/indexyuv.htm
- *
- *  For information on the relationship between color spaces, see:
- *  http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
- */
-/*@{*/
-#define SDL_YV12_OVERLAY  0x32315659	/**< Planar mode: Y + V + U  (3 planes) */
-#define SDL_IYUV_OVERLAY  0x56555949	/**< Planar mode: Y + U + V  (3 planes) */
-#define SDL_YUY2_OVERLAY  0x32595559	/**< Packed mode: Y0+U0+Y1+V0 (1 plane) */
-#define SDL_UYVY_OVERLAY  0x59565955	/**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
-#define SDL_YVYU_OVERLAY  0x55595659	/**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
-/*@}*/
-
-/** The YUV hardware video overlay */
-typedef struct SDL_Overlay {
-	Uint32 format;				/**< Read-only */
-	int w, h;				/**< Read-only */
-	int planes;				/**< Read-only */
-	Uint16 *pitches;			/**< Read-only */
-	Uint8 **pixels;				/**< Read-write */
-
-	/** @name Hardware-specific surface info */
-        /*@{*/
-	struct private_yuvhwfuncs *hwfuncs;
-	struct private_yuvhwdata *hwdata;
-        /*@{*/
-
-	/** @name Special flags */
-        /*@{*/
-	Uint32 hw_overlay :1;	/**< Flag: This overlay hardware accelerated? */
-	Uint32 UnusedBits :31;
-        /*@}*/
-} SDL_Overlay;
-
-
-/** Public enumeration for setting the OpenGL window attributes. */
-typedef enum {
-    SDL_GL_RED_SIZE,
-    SDL_GL_GREEN_SIZE,
-    SDL_GL_BLUE_SIZE,
-    SDL_GL_ALPHA_SIZE,
-    SDL_GL_BUFFER_SIZE,
-    SDL_GL_DOUBLEBUFFER,
-    SDL_GL_DEPTH_SIZE,
-    SDL_GL_STENCIL_SIZE,
-    SDL_GL_ACCUM_RED_SIZE,
-    SDL_GL_ACCUM_GREEN_SIZE,
-    SDL_GL_ACCUM_BLUE_SIZE,
-    SDL_GL_ACCUM_ALPHA_SIZE,
-    SDL_GL_STEREO,
-    SDL_GL_MULTISAMPLEBUFFERS,
-    SDL_GL_MULTISAMPLESAMPLES,
-    SDL_GL_ACCELERATED_VISUAL,
-    SDL_GL_SWAP_CONTROL
-} SDL_GLattr;
-
-/** @name flags for SDL_SetPalette() */
-/*@{*/
-#define SDL_LOGPAL 0x01
-#define SDL_PHYSPAL 0x02
-/*@}*/
-
-/* Function prototypes */
-
-/**
- * @name Video Init and Quit
- * These functions are used internally, and should not be used unless you
- * have a specific need to specify the video driver you want to use.
- * You should normally use SDL_Init() or SDL_InitSubSystem().
- */
-/*@{*/
-/**
- * Initializes the video subsystem. Sets up a connection
- * to the window manager, etc, and determines the current video mode and
- * pixel format, but does not initialize a window or graphics mode.
- * Note that event handling is activated by this routine.
- *
- * If you use both sound and video in your application, you need to call
- * SDL_Init() before opening the sound device, otherwise under Win32 DirectX,
- * you won't be able to set full-screen display modes.
- */
-extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name, Uint32 flags);
-extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
-/*@}*/
-
-/**
- * This function fills the given character buffer with the name of the
- * video driver, and returns a pointer to it if the video driver has
- * been initialized.  It returns NULL if no driver has been initialized.
- */
-extern DECLSPEC char * SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen);
-
-/**
- * This function returns a pointer to the current display surface.
- * If SDL is doing format conversion on the display surface, this
- * function returns the publicly visible surface, not the real video
- * surface.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_GetVideoSurface(void);
-
-/**
- * This function returns a read-only pointer to information about the
- * video hardware.  If this is called before SDL_SetVideoMode(), the 'vfmt'
- * member of the returned structure will contain the pixel format of the
- * "best" video mode.
- */
-extern DECLSPEC const SDL_VideoInfo * SDLCALL SDL_GetVideoInfo(void);
-
-/**
- * Check to see if a particular video mode is supported.
- * It returns 0 if the requested mode is not supported under any bit depth,
- * or returns the bits-per-pixel of the closest available mode with the
- * given width and height.  If this bits-per-pixel is different from the
- * one used when setting the video mode, SDL_SetVideoMode() will succeed,
- * but will emulate the requested bits-per-pixel with a shadow surface.
- *
- * The arguments to SDL_VideoModeOK() are the same ones you would pass to
- * SDL_SetVideoMode()
- */
-extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags);
-
-/**
- * Return a pointer to an array of available screen dimensions for the
- * given format and video flags, sorted largest to smallest.  Returns 
- * NULL if there are no dimensions available for a particular format, 
- * or (SDL_Rect **)-1 if any dimension is okay for the given format.
- *
- * If 'format' is NULL, the mode list will be for the format given 
- * by SDL_GetVideoInfo()->vfmt
- */
-extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);
-
-/**
- * Set up a video mode with the specified width, height and bits-per-pixel.
- *
- * If 'bpp' is 0, it is treated as the current display bits per pixel.
- *
- * If SDL_ANYFORMAT is set in 'flags', the SDL library will try to set the
- * requested bits-per-pixel, but will return whatever video pixel format is
- * available.  The default is to emulate the requested pixel format if it
- * is not natively available.
- *
- * If SDL_HWSURFACE is set in 'flags', the video surface will be placed in
- * video memory, if possible, and you may have to call SDL_LockSurface()
- * in order to access the raw framebuffer.  Otherwise, the video surface
- * will be created in system memory.
- *
- * If SDL_ASYNCBLIT is set in 'flags', SDL will try to perform rectangle
- * updates asynchronously, but you must always lock before accessing pixels.
- * SDL will wait for updates to complete before returning from the lock.
- *
- * If SDL_HWPALETTE is set in 'flags', the SDL library will guarantee
- * that the colors set by SDL_SetColors() will be the colors you get.
- * Otherwise, in 8-bit mode, SDL_SetColors() may not be able to set all
- * of the colors exactly the way they are requested, and you should look
- * at the video surface structure to determine the actual palette.
- * If SDL cannot guarantee that the colors you request can be set, 
- * i.e. if the colormap is shared, then the video surface may be created
- * under emulation in system memory, overriding the SDL_HWSURFACE flag.
- *
- * If SDL_FULLSCREEN is set in 'flags', the SDL library will try to set
- * a fullscreen video mode.  The default is to create a windowed mode
- * if the current graphics system has a window manager.
- * If the SDL library is able to set a fullscreen video mode, this flag 
- * will be set in the surface that is returned.
- *
- * If SDL_DOUBLEBUF is set in 'flags', the SDL library will try to set up
- * two surfaces in video memory and swap between them when you call 
- * SDL_Flip().  This is usually slower than the normal single-buffering
- * scheme, but prevents "tearing" artifacts caused by modifying video 
- * memory while the monitor is refreshing.  It should only be used by 
- * applications that redraw the entire screen on every update.
- *
- * If SDL_RESIZABLE is set in 'flags', the SDL library will allow the
- * window manager, if any, to resize the window at runtime.  When this
- * occurs, SDL will send a SDL_VIDEORESIZE event to you application,
- * and you must respond to the event by re-calling SDL_SetVideoMode()
- * with the requested size (or another size that suits the application).
- *
- * If SDL_NOFRAME is set in 'flags', the SDL library will create a window
- * without any title bar or frame decoration.  Fullscreen video modes have
- * this flag set automatically.
- *
- * This function returns the video framebuffer surface, or NULL if it fails.
- *
- * If you rely on functionality provided by certain video flags, check the
- * flags of the returned surface to make sure that functionality is available.
- * SDL will fall back to reduced functionality if the exact flags you wanted
- * are not available.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_SetVideoMode
-			(int width, int height, int bpp, Uint32 flags);
-
-/** @name SDL_Update Functions
- * These functions should not be called while 'screen' is locked.
- */
-/*@{*/
-/**
- * Makes sure the given list of rectangles is updated on the given screen.
- */
-extern DECLSPEC void SDLCALL SDL_UpdateRects
-		(SDL_Surface *screen, int numrects, SDL_Rect *rects);
-/**
- * If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire
- * screen.
- */
-extern DECLSPEC void SDLCALL SDL_UpdateRect
-		(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h);
-/*@}*/
-
-/**
- * On hardware that supports double-buffering, this function sets up a flip
- * and returns.  The hardware will wait for vertical retrace, and then swap
- * video buffers before the next video surface blit or lock will return.
- * On hardware that doesn not support double-buffering, this is equivalent
- * to calling SDL_UpdateRect(screen, 0, 0, 0, 0);
- * The SDL_DOUBLEBUF flag must have been passed to SDL_SetVideoMode() when
- * setting the video mode for this function to perform hardware flipping.
- * This function returns 0 if successful, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface *screen);
-
-/**
- * Set the gamma correction for each of the color channels.
- * The gamma values range (approximately) between 0.1 and 10.0
- * 
- * If this function isn't supported directly by the hardware, it will
- * be emulated using gamma ramps, if available.  If successful, this
- * function returns 0, otherwise it returns -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue);
-
-/**
- * Set the gamma translation table for the red, green, and blue channels
- * of the video hardware.  Each table is an array of 256 16-bit quantities,
- * representing a mapping between the input and output for that channel.
- * The input is the index into the array, and the output is the 16-bit
- * gamma value at that index, scaled to the output color precision.
- * 
- * You may pass NULL for any of the channels to leave it unchanged.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 *red, const Uint16 *green, const Uint16 *blue);
-
-/**
- * Retrieve the current values of the gamma translation tables.
- * 
- * You must pass in valid pointers to arrays of 256 16-bit quantities.
- * Any of the pointers may be NULL to ignore that channel.
- * If the call succeeds, it will return 0.  If the display driver or
- * hardware does not support gamma translation, or otherwise fails,
- * this function will return -1.
- */
-extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue);
-
-/**
- * Sets a portion of the colormap for the given 8-bit surface.  If 'surface'
- * is not a palettized surface, this function does nothing, returning 0.
- * If all of the colors were set as passed to SDL_SetColors(), it will
- * return 1.  If not all the color entries were set exactly as given,
- * it will return 0, and you should look at the surface palette to
- * determine the actual color palette.
- *
- * When 'surface' is the surface associated with the current display, the
- * display colormap will be updated with the requested colors.  If 
- * SDL_HWPALETTE was set in SDL_SetVideoMode() flags, SDL_SetColors()
- * will always return 1, and the palette is guaranteed to be set the way
- * you desire, even if the window colormap has to be warped or run under
- * emulation.
- */
-extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface *surface, 
-			SDL_Color *colors, int firstcolor, int ncolors);
-
-/**
- * Sets a portion of the colormap for a given 8-bit surface.
- * 'flags' is one or both of:
- * SDL_LOGPAL  -- set logical palette, which controls how blits are mapped
- *                to/from the surface,
- * SDL_PHYSPAL -- set physical palette, which controls how pixels look on
- *                the screen
- * Only screens have physical palettes. Separate change of physical/logical
- * palettes is only possible if the screen has SDL_HWPALETTE set.
- *
- * The return value is 1 if all colours could be set as requested, and 0
- * otherwise.
- *
- * SDL_SetColors() is equivalent to calling this function with
- *     flags = (SDL_LOGPAL|SDL_PHYSPAL).
- */
-extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface *surface, int flags,
-				   SDL_Color *colors, int firstcolor,
-				   int ncolors);
-
-/**
- * Maps an RGB triple to an opaque pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGB
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b);
-
-/**
- * Maps an RGBA quadruple to a pixel value for a given pixel format
- */
-extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA
-(const SDL_PixelFormat * const format,
- const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a);
-
-/**
- * Maps a pixel value into the RGB components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
-				const SDL_PixelFormat * const fmt,
-				Uint8 *r, Uint8 *g, Uint8 *b);
-
-/**
- * Maps a pixel value into the RGBA components for a given pixel format
- */
-extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
-				const SDL_PixelFormat * const fmt,
-				Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);
-
-/** @sa SDL_CreateRGBSurface */
-#define SDL_AllocSurface    SDL_CreateRGBSurface
-/**
- * Allocate and free an RGB surface (must be called after SDL_SetVideoMode)
- * If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
- * If the depth is greater than 8 bits, the pixel format is set using the
- * flags '[RGB]mask'.
- * If the function runs out of memory, it will return NULL.
- *
- * The 'flags' tell what kind of surface to create.
- * SDL_SWSURFACE means that the surface should be created in system memory.
- * SDL_HWSURFACE means that the surface should be created in video memory,
- * with the same format as the display surface.  This is useful for surfaces
- * that will not change much, to take advantage of hardware acceleration
- * when being blitted to the display surface.
- * SDL_ASYNCBLIT means that SDL will try to perform asynchronous blits with
- * this surface, but you must always lock it before accessing the pixels.
- * SDL will wait for current blits to finish before returning from the lock.
- * SDL_SRCCOLORKEY indicates that the surface will be used for colorkey blits.
- * If the hardware supports acceleration of colorkey blits between
- * two surfaces in video memory, SDL will try to place the surface in
- * video memory. If this isn't possible or if there is no hardware
- * acceleration available, the surface will be placed in system memory.
- * SDL_SRCALPHA means that the surface will be used for alpha blits and 
- * if the hardware supports hardware acceleration of alpha blits between
- * two surfaces in video memory, to place the surface in video memory
- * if possible, otherwise it will be placed in system memory.
- * If the surface is created in video memory, blits will be _much_ faster,
- * but the surface format must be identical to the video surface format,
- * and the only way to access the pixels member of the surface is to use
- * the SDL_LockSurface() and SDL_UnlockSurface() calls.
- * If the requested surface actually resides in video memory, SDL_HWSURFACE
- * will be set in the flags member of the returned surface.  If for some
- * reason the surface could not be placed in video memory, it will not have
- * the SDL_HWSURFACE flag set, and will be created in system memory instead.
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurface
-			(Uint32 flags, int width, int height, int depth, 
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-/** @sa SDL_CreateRGBSurface */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
-			int width, int height, int depth, int pitch,
-			Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface *surface);
-
-/**
- * SDL_LockSurface() sets up a surface for directly accessing the pixels.
- * Between calls to SDL_LockSurface()/SDL_UnlockSurface(), you can write
- * to and read from 'surface->pixels', using the pixel format stored in 
- * 'surface->format'.  Once you are done accessing the surface, you should 
- * use SDL_UnlockSurface() to release it.
- *
- * Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
- * to 0, then you can read and write to the surface at any time, and the
- * pixel format of the surface will not change.  In particular, if the
- * SDL_HWSURFACE flag is not given when calling SDL_SetVideoMode(), you
- * will not need to lock the display surface before accessing it.
- * 
- * No operating system or library calls should be made between lock/unlock
- * pairs, as critical system locks may be held during this time.
- *
- * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
- */
-extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface *surface);
-extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface *surface);
-
-/**
- * Load a surface from a seekable SDL data source (memory or file.)
- * If 'freesrc' is non-zero, the source will be closed after being read.
- * Returns the new surface, or NULL if there was an error.
- * The new surface should be freed with SDL_FreeSurface().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
-
-/** Convenience macro -- load a surface from a file */
-#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
-
-/**
- * Save a surface to a seekable SDL data source (memory or file.)
- * If 'freedst' is non-zero, the source will be closed after being written.
- * Returns 0 if successful or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
-		(SDL_Surface *surface, SDL_RWops *dst, int freedst);
-
-/** Convenience macro -- save a surface to a file */
-#define SDL_SaveBMP(surface, file) \
-		SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
-
-/**
- * Sets the color key (transparent pixel) in a blittable surface.
- * If 'flag' is SDL_SRCCOLORKEY (optionally OR'd with SDL_RLEACCEL), 
- * 'key' will be the transparent pixel in the source image of a blit.
- * SDL_RLEACCEL requests RLE acceleration for the surface if present,
- * and removes RLE acceleration if absent.
- * If 'flag' is 0, this function clears any current color key.
- * This function returns 0, or -1 if there was an error.
- */
-extern DECLSPEC int SDLCALL SDL_SetColorKey
-			(SDL_Surface *surface, Uint32 flag, Uint32 key);
-
-/**
- * This function sets the alpha value for the entire surface, as opposed to
- * using the alpha component of each pixel. This value measures the range
- * of transparency of the surface, 0 being completely transparent to 255
- * being completely opaque. An 'alpha' value of 255 causes blits to be
- * opaque, the source pixels copied to the destination (the default). Note
- * that per-surface alpha can be combined with colorkey transparency.
- *
- * If 'flag' is 0, alpha blending is disabled for the surface.
- * If 'flag' is SDL_SRCALPHA, alpha blending is enabled for the surface.
- * OR:ing the flag with SDL_RLEACCEL requests RLE acceleration for the
- * surface; if SDL_RLEACCEL is not specified, the RLE accel will be removed.
- *
- * The 'alpha' parameter is ignored for surfaces that have an alpha channel.
- */
-extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
-
-/**
- * Sets the clipping rectangle for the destination surface in a blit.
- *
- * If the clip rectangle is NULL, clipping will be disabled.
- * If the clip rectangle doesn't intersect the surface, the function will
- * return SDL_FALSE and blits will be completely clipped.  Otherwise the
- * function returns SDL_TRUE and blits to the surface will be clipped to
- * the intersection of the surface area and the clipping rectangle.
- *
- * Note that blits are automatically clipped to the edges of the source
- * and destination surfaces.
- */
-extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface *surface, const SDL_Rect *rect);
-
-/**
- * Gets the clipping rectangle for the destination surface in a blit.
- * 'rect' must be a pointer to a valid rectangle which will be filled
- * with the correct values.
- */
-extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect);
-
-/**
- * Creates a new surface of the specified format, and then copies and maps 
- * the given surface to it so the blit of the converted surface will be as 
- * fast as possible.  If this function fails, it returns NULL.
- *
- * The 'flags' parameter is passed to SDL_CreateRGBSurface() and has those 
- * semantics.  You can also pass SDL_RLEACCEL in the flags parameter and
- * SDL will try to RLE accelerate colorkey and alpha blits in the resulting
- * surface.
- *
- * This function is used internally by SDL_DisplayFormat().
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_ConvertSurface
-			(SDL_Surface *src, SDL_PixelFormat *fmt, Uint32 flags);
-
-/**
- * This performs a fast blit from the source surface to the destination
- * surface.  It assumes that the source and destination rectangles are
- * the same size.  If either 'srcrect' or 'dstrect' are NULL, the entire
- * surface (src or dst) is copied.  The final blit rectangles are saved
- * in 'srcrect' and 'dstrect' after all clipping is performed.
- * If the blit is successful, it returns 0, otherwise it returns -1.
- *
- * The blit function should not be called on a locked surface.
- *
- * The blit semantics for surfaces with and without alpha and colorkey
- * are defined as follows:
- *
- * RGBA->RGB:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using alpha-channel).
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value);
- * 	set destination alpha to opaque.
- *     SDL_SRCALPHA not set:
- * 	copy RGB, set destination alpha to source per-surface alpha value.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- * 
- * RGBA->RGBA:
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source alpha channel) the RGB values;
- * 	leave destination alpha untouched. [Note: is this correct?]
- * 	SDL_SRCCOLORKEY ignored.
- *     SDL_SRCALPHA not set:
- * 	copy all of RGBA to the destination.
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	RGB values of the source colour key, ignoring alpha in the
- * 	comparison.
- * 
- * RGB->RGB: 
- *     SDL_SRCALPHA set:
- * 	alpha-blend (using the source per-surface alpha value).
- *     SDL_SRCALPHA not set:
- * 	copy RGB.
- *     both:
- * 	if SDL_SRCCOLORKEY set, only copy the pixels matching the
- * 	source colour key.
- *
- * If either of the surfaces were in video memory, and the blit returns -2,
- * the video memory was lost, so it should be reloaded with artwork and 
- * re-blitted:
- * @code
- *	while ( SDL_BlitSurface(image, imgrect, screen, dstrect) == -2 ) {
- *		while ( SDL_LockSurface(image) < 0 )
- *			Sleep(10);
- *		-- Write image pixels to image->pixels --
- *		SDL_UnlockSurface(image);
- *	}
- * @endcode
- *
- * This happens under DirectX 5.0 when the system switches away from your
- * fullscreen application.  The lock will also fail until you have access
- * to the video memory again.
- *
- * You should call SDL_BlitSurface() unless you know exactly how SDL
- * blitting works internally and how to use the other blit functions.
- */
-#define SDL_BlitSurface SDL_UpperBlit
-
-/** This is the public blit function, SDL_BlitSurface(), and it performs
- *  rectangle validation and clipping before passing it to SDL_LowerBlit()
- */
-extern DECLSPEC int SDLCALL SDL_UpperBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-/** This is a semi-private blit function and it performs low-level surface
- *  blitting only.
- */
-extern DECLSPEC int SDLCALL SDL_LowerBlit
-			(SDL_Surface *src, SDL_Rect *srcrect,
-			 SDL_Surface *dst, SDL_Rect *dstrect);
-
-/**
- * This function performs a fast fill of the given rectangle with 'color'
- * The given rectangle is clipped to the destination surface clip area
- * and the final fill rectangle is saved in the passed in pointer.
- * If 'dstrect' is NULL, the whole surface will be filled with 'color'
- * The color should be a pixel of the format used by the surface, and 
- * can be generated by the SDL_MapRGB() function.
- * This function returns 0 on success, or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_FillRect
-		(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color);
-
-/**
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer, suitable for fast
- * blitting onto the display surface.  It calls SDL_ConvertSurface()
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormat(SDL_Surface *surface);
-
-/**
- * This function takes a surface and copies it to a new surface of the
- * pixel format and colors of the video framebuffer (if possible),
- * suitable for fast alpha blitting onto the display surface.
- * The new surface will always have an alpha channel.
- *
- * If you want to take advantage of hardware colorkey or alpha blit
- * acceleration, you should set the colorkey and alpha value before
- * calling this function.
- *
- * If the conversion fails or runs out of memory, it returns NULL
- */
-extern DECLSPEC SDL_Surface * SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *surface);
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name YUV video surface overlay functions                                */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/** This function creates a video output overlay
- *  Calling the returned surface an overlay is something of a misnomer because
- *  the contents of the display surface underneath the area where the overlay
- *  is shown is undefined - it may be overwritten with the converted YUV data.
- */
-extern DECLSPEC SDL_Overlay * SDLCALL SDL_CreateYUVOverlay(int width, int height,
-				Uint32 format, SDL_Surface *display);
-
-/** Lock an overlay for direct access, and unlock it when you are done */
-extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay *overlay);
-extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay *overlay);
-
-/** Blit a video overlay to the display surface.
- *  The contents of the video surface underneath the blit destination are
- *  not defined.  
- *  The width and height of the destination rectangle may be different from
- *  that of the overlay, but currently only 2x scaling is supported.
- */
-extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect);
-
-/** Free a video overlay */
-extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay *overlay);
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name OpenGL support functions.                                          */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Dynamically load an OpenGL library, or the default one if path is NULL
- *
- * If you do this, you need to retrieve all of the GL functions used in
- * your program from the dynamic library using SDL_GL_GetProcAddress().
- */
-extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
-
-/**
- * Get the address of a GL function
- */
-extern DECLSPEC void * SDLCALL SDL_GL_GetProcAddress(const char* proc);
-
-/**
- * Set an attribute of the OpenGL subsystem before intialization.
- */
-extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
-
-/**
- * Get an attribute of the OpenGL subsystem from the windowing
- * interface, such as glX. This is of course different from getting
- * the values from SDL's internal OpenGL subsystem, which only
- * stores the values you request before initialization.
- *
- * Developers should track the values they pass into SDL_GL_SetAttribute
- * themselves if they want to retrieve these values.
- */
-extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int* value);
-
-/**
- * Swap the OpenGL buffers, if double-buffering is supported.
- */
-extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
-
-/** @name OpenGL Internal Functions
- * Internal functions that should not be called unless you have read
- * and understood the source code for these functions.
- */
-/*@{*/
-extern DECLSPEC void SDLCALL SDL_GL_UpdateRects(int numrects, SDL_Rect* rects);
-extern DECLSPEC void SDLCALL SDL_GL_Lock(void);
-extern DECLSPEC void SDLCALL SDL_GL_Unlock(void);
-/*@}*/
-
-/*@}*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** @name Window Manager Functions                                           */
-/** These functions allow interaction with the window manager, if any.       */ /*@{*/
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/**
- * Sets the title and icon text of the display window (UTF-8 encoded)
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, const char *icon);
-/**
- * Gets the title and icon text of the display window (UTF-8 encoded)
- */
-extern DECLSPEC void SDLCALL SDL_WM_GetCaption(char **title, char **icon);
-
-/**
- * Sets the icon for the display window.
- * This function must be called before the first call to SDL_SetVideoMode().
- * It takes an icon surface, and a mask in MSB format.
- * If 'mask' is NULL, the entire icon surface will be used as the icon.
- */
-extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
-
-/**
- * This function iconifies the window, and returns 1 if it succeeded.
- * If the function succeeds, it generates an SDL_APPACTIVE loss event.
- * This function is a noop and returns 0 in non-windowed environments.
- */
-extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
-
-/**
- * Toggle fullscreen mode without changing the contents of the screen.
- * If the display surface does not require locking before accessing
- * the pixel information, then the memory pointers will not change.
- *
- * If this function was able to toggle fullscreen mode (change from 
- * running in a window to fullscreen, or vice-versa), it will return 1.
- * If it is not implemented, or fails, it returns 0.
- *
- * The next call to SDL_SetVideoMode() will set the mode fullscreen
- * attribute based on the flags parameter - if SDL_FULLSCREEN is not
- * set, then the display will be windowed by default where supported.
- *
- * This is currently only implemented in the X11 video driver.
- */
-extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface *surface);
-
-typedef enum {
-	SDL_GRAB_QUERY = -1,
-	SDL_GRAB_OFF = 0,
-	SDL_GRAB_ON = 1,
-	SDL_GRAB_FULLSCREEN	/**< Used internally */
-} SDL_GrabMode;
-/**
- * This function allows you to set and query the input grab state of
- * the application.  It returns the new input grab state.
- *
- * Grabbing means that the mouse is confined to the application window,
- * and nearly all keyboard input is passed directly to the application,
- * and not interpreted by a window manager, if any.
- */
-extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode);
-
-/*@}*/
-
-/** @internal Not in public API at the moment - do not use! */
-extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface *src, SDL_Rect *srcrect,
-                                    SDL_Surface *dst, SDL_Rect *dstrect);
-                    
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_video_h */
diff --git a/Externals/SDL/include/begin_code.h b/Externals/SDL/include/begin_code.h
deleted file mode 100644
index 22748090c5..0000000000
--- a/Externals/SDL/include/begin_code.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/** 
- *  @file begin_code.h
- *  This file sets things up for C dynamic library function definitions,
- *  static inlined functions, and structures aligned at 4-byte alignment.
- *  If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/** 
- *  @file begin_code.h
- *  This shouldn't be nested -- included it around code only.
- */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/** 
- *  @def DECLSPEC
- *  Some compilers use a special export keyword
- */
-#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
-#  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
-#  else
-#   define DECLSPEC	__declspec(export)
-#  endif
-# elif defined(__WIN32__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC 
-#   else
-#    define DECLSPEC	__declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC	__declspec(dllexport)
-#  endif
-# elif defined(__OS2__)
-#  ifdef __WATCOMC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC	__declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  elif defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   ifdef BUILD_SDL
-#    define DECLSPEC    __declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC	__attribute__ ((visibility("default")))
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/** 
- *  @def SDLCALL
- *  By default SDL uses the C calling convention
- */
-#ifndef SDLCALL
-# if defined(__WIN32__) && !defined(__GNUC__)
-#  define SDLCALL __cdecl
-# elif defined(__OS2__)
-#  if defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   define SDLCALL _cdecl
-#  else
-#   /* On other compilers on OS/2, we use the _System calling convention */
-#   /* to be compatible with every compiler */
-#   define SDLCALL _System
-#  endif
-# else
-#  define SDLCALL
-# endif
-#endif /* SDLCALL */
-
-#ifdef __SYMBIAN32__ 
-#ifndef EKA2 
-#undef DECLSPEC
-#define DECLSPEC
-#elif !defined(__WINS__)
-#undef DECLSPEC
-#define DECLSPEC __declspec(dllexport)
-#endif /* !EKA2 */
-#endif /* __SYMBIAN32__ */
-
-/**
- *  @file begin_code.h
- *  Force structure packing at 4 byte alignment.
- *  This is necessary if the header is included in code which has structure
- *  packing set to an alternate value, say for loading structures from disk.
- *  The packing is reset to the previous value in close_code.h 
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#elif (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=mac68k4byte
-#pragma enumsalwaysint on
-#endif /* Compiler needs structure packing set */
-
-/**
- *  @def SDL_INLINE_OKAY
- *  Set up compiler-specific options for inlining functions
- */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
-    defined(__DMC__) || defined(__SC__) || \
-    defined(__WATCOMC__) || defined(__LCC__) || \
-    defined(__DECC) || defined(__EABI__)
-#ifndef __inline__
-#define __inline__	__inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/**
- *  @def __inline__
- *  If inlining isn't supported, remove "__inline__", turning static
- *  inlined functions into static functions (resulting in code bloat
- *  in all files which include the offending header files)
- */
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/**
- *  @def NULL
- *  Apparently this is needed by several Windows compilers
- */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/Externals/SDL/include/close_code.h b/Externals/SDL/include/close_code.h
deleted file mode 100644
index 46a07208a7..0000000000
--- a/Externals/SDL/include/close_code.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  @file close_code.h
- *  This file reverses the effects of begin_code.h and should be included
- *  after you finish any function and structure declarations in your headers
- */
-
-#undef _begin_code_h
-
-/**
- *  @file close_code.h
- *  Reset structure packing at previous byte alignment
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#if (defined(__MWERKS__) && defined(__MACOS__))
-#pragma options align=reset
-#pragma enumsalwaysint reset
-#else
-#pragma pack(pop)
-#endif
-#endif /* Compiler needs structure packing set */
-
diff --git a/Externals/SDL/include/doxyfile b/Externals/SDL/include/doxyfile
deleted file mode 100644
index afffb4941c..0000000000
--- a/Externals/SDL/include/doxyfile
+++ /dev/null
@@ -1,946 +0,0 @@
-# Doxyfile 1.2.16
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = SDL
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = 1.2.14
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = docs
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean,
-# Norwegian, Polish, Portuguese, Romanian, Russian, Slovak, Slovene,
-# Spanish, Swedish and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these class will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. It is allowed to use relative paths in the argument list.
-
-STRIP_FROM_PATH        =
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower case letters. If set to YES upper case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# users are adviced to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments  will behave just like the Qt-style comments (thus requiring an
-# explict @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# reimplements.
-
-INHERIT_DOCS           = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consist of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = include
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl
-
-FILE_PATTERNS          = *.h
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-
-INPUT_FILTER           =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse.
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the Html help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript and frames is required (for instance Mozilla, Netscape 4.0+,
-# or Internet explorer 4.0+). Note that for large projects the tree generation
-# can take a very long time. In such cases it is better to disable this feature.
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimised for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = YES
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assigments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_XML           = NO
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED             = DOXYGEN_SHOULD_IGNORE_THIS=1 SDLCALL= SNDDECLSPEC=
-
-# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line and do not end with a semicolon. Such function macros are typically
-# used for boiler-plate code, and will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tagfiles.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = NO
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = NO
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermedate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
-
-# The CGI_NAME tag should be the name of the CGI script that
-# starts the search engine (doxysearch) with the correct parameters.
-# A script with this name will be generated by doxygen.
-
-CGI_NAME               = search.cgi
-
-# The CGI_URL tag should be the absolute URL to the directory where the
-# cgi binaries are located. See the documentation of your http daemon for
-# details.
-
-CGI_URL                =
-
-# The DOC_URL tag should be the absolute URL to the directory where the
-# documentation is located. If left blank the absolute path to the
-# documentation, with file:// prepended to it, will be used.
-
-DOC_URL                =
-
-# The DOC_ABSPATH tag should be the absolute path to the directory where the
-# documentation is located. If left blank the directory on the local machine
-# will be used.
-
-DOC_ABSPATH            =
-
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary
-# is installed.
-
-BIN_ABSPATH            = /usr/local/bin/
-
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to
-# documentation generated for other projects. This allows doxysearch to search
-# the documentation for these projects as well.
-
-EXT_DOC_PATHS          =
diff --git a/Externals/SDL/src/SDL.c b/Externals/SDL/src/SDL.c
deleted file mode 100644
index 6058b3e4ec..0000000000
--- a/Externals/SDL/src/SDL.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Initialization code for SDL */
-
-#include "SDL.h"
-#include "SDL_fatal.h"
-#if !SDL_VIDEO_DISABLED
-#include "video/SDL_leaks.h"
-#endif
-
-#if SDL_THREAD_PTH
-#include <pth.h>
-#endif
-
-/* Initialization/Cleanup routines */
-#if !SDL_JOYSTICK_DISABLED
-extern int  SDL_JoystickInit(void);
-extern void SDL_JoystickQuit(void);
-#endif
-#if !SDL_CDROM_DISABLED
-extern int  SDL_CDROMInit(void);
-extern void SDL_CDROMQuit(void);
-#endif
-#if !SDL_TIMERS_DISABLED
-extern void SDL_StartTicks(void);
-extern int  SDL_TimerInit(void);
-extern void SDL_TimerQuit(void);
-#endif
-
-/* The current SDL version */
-static SDL_version version = 
-	{ SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL };
-
-/* The initialized subsystems */
-static Uint32 SDL_initialized = 0;
-#if !SDL_TIMERS_DISABLED
-static Uint32 ticks_started = 0;
-#endif
-
-#ifdef CHECK_LEAKS
-int surfaces_allocated = 0;
-#endif
-
-int SDL_InitSubSystem(Uint32 flags)
-{
-#if !SDL_VIDEO_DISABLED
-	/* Initialize the video/event subsystem */
-	if ( (flags & SDL_INIT_VIDEO) && !(SDL_initialized & SDL_INIT_VIDEO) ) {
-		if ( SDL_VideoInit(SDL_getenv("SDL_VIDEODRIVER"),
-		                   (flags&SDL_INIT_EVENTTHREAD)) < 0 ) {
-			return(-1);
-		}
-		SDL_initialized |= SDL_INIT_VIDEO;
-	}
-#else
-	if ( flags & SDL_INIT_VIDEO ) {
-		SDL_SetError("SDL not built with video support");
-		return(-1);
-	}
-#endif
-
-#if !SDL_AUDIO_DISABLED
-	/* Initialize the audio subsystem */
-	if ( (flags & SDL_INIT_AUDIO) && !(SDL_initialized & SDL_INIT_AUDIO) ) {
-		if ( SDL_AudioInit(SDL_getenv("SDL_AUDIODRIVER")) < 0 ) {
-			return(-1);
-		}
-		SDL_initialized |= SDL_INIT_AUDIO;
-	}
-#else
-	if ( flags & SDL_INIT_AUDIO ) {
-		SDL_SetError("SDL not built with audio support");
-		return(-1);
-	}
-#endif
-
-#if !SDL_TIMERS_DISABLED
-	/* Initialize the timer subsystem */
-	if ( ! ticks_started ) {
-		SDL_StartTicks();
-		ticks_started = 1;
-	}
-	if ( (flags & SDL_INIT_TIMER) && !(SDL_initialized & SDL_INIT_TIMER) ) {
-		if ( SDL_TimerInit() < 0 ) {
-			return(-1);
-		}
-		SDL_initialized |= SDL_INIT_TIMER;
-	}
-#else
-	if ( flags & SDL_INIT_TIMER ) {
-		SDL_SetError("SDL not built with timer support");
-		return(-1);
-	}
-#endif
-
-#if !SDL_JOYSTICK_DISABLED
-	/* Initialize the joystick subsystem */
-	if ( (flags & SDL_INIT_JOYSTICK) &&
-	     !(SDL_initialized & SDL_INIT_JOYSTICK) ) {
-		if ( SDL_JoystickInit() < 0 ) {
-			return(-1);
-		}
-		SDL_initialized |= SDL_INIT_JOYSTICK;
-	}
-#else
-	if ( flags & SDL_INIT_JOYSTICK ) {
-		SDL_SetError("SDL not built with joystick support");
-		return(-1);
-	}
-#endif
-
-#if !SDL_CDROM_DISABLED
-	/* Initialize the CD-ROM subsystem */
-	if ( (flags & SDL_INIT_CDROM) && !(SDL_initialized & SDL_INIT_CDROM) ) {
-		if ( SDL_CDROMInit() < 0 ) {
-			return(-1);
-		}
-		SDL_initialized |= SDL_INIT_CDROM;
-	}
-#else
-	if ( flags & SDL_INIT_CDROM ) {
-		SDL_SetError("SDL not built with cdrom support");
-		return(-1);
-	}
-#endif
-	return(0);
-}
-
-int SDL_Init(Uint32 flags)
-{
-#if !SDL_THREADS_DISABLED && SDL_THREAD_PTH
-	if (!pth_init()) {
-		return -1;
-	}
-#endif
-
-	/* Clear the error message */
-	SDL_ClearError();
-
-	/* Initialize the desired subsystems */
-	if ( SDL_InitSubSystem(flags) < 0 ) {
-		return(-1);
-	}
-
-	/* Everything is initialized */
-	if ( !(flags & SDL_INIT_NOPARACHUTE) ) {
-		SDL_InstallParachute();
-	}
-	return(0);
-}
-
-void SDL_QuitSubSystem(Uint32 flags)
-{
-	/* Shut down requested initialized subsystems */
-#if !SDL_CDROM_DISABLED
-	if ( (flags & SDL_initialized & SDL_INIT_CDROM) ) {
-		SDL_CDROMQuit();
-		SDL_initialized &= ~SDL_INIT_CDROM;
-	}
-#endif
-#if !SDL_JOYSTICK_DISABLED
-	if ( (flags & SDL_initialized & SDL_INIT_JOYSTICK) ) {
-		SDL_JoystickQuit();
-		SDL_initialized &= ~SDL_INIT_JOYSTICK;
-	}
-#endif
-#if !SDL_TIMERS_DISABLED
-	if ( (flags & SDL_initialized & SDL_INIT_TIMER) ) {
-		SDL_TimerQuit();
-		SDL_initialized &= ~SDL_INIT_TIMER;
-	}
-#endif
-#if !SDL_AUDIO_DISABLED
-	if ( (flags & SDL_initialized & SDL_INIT_AUDIO) ) {
-		SDL_AudioQuit();
-		SDL_initialized &= ~SDL_INIT_AUDIO;
-	}
-#endif
-#if !SDL_VIDEO_DISABLED
-	if ( (flags & SDL_initialized & SDL_INIT_VIDEO) ) {
-		SDL_VideoQuit();
-		SDL_initialized &= ~SDL_INIT_VIDEO;
-	}
-#endif
-}
-
-Uint32 SDL_WasInit(Uint32 flags)
-{
-	if ( ! flags ) {
-		flags = SDL_INIT_EVERYTHING;
-	}
-	return (SDL_initialized&flags);
-}
-
-void SDL_Quit(void)
-{
-	/* Quit all subsystems */
-#ifdef DEBUG_BUILD
-  printf("[SDL_Quit] : Enter! Calling QuitSubSystem()\n"); fflush(stdout);
-#endif
-	SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
-
-#ifdef CHECK_LEAKS
-#ifdef DEBUG_BUILD
-  printf("[SDL_Quit] : CHECK_LEAKS\n"); fflush(stdout);
-#endif
-
-	/* Print the number of surfaces not freed */
-	if ( surfaces_allocated != 0 ) {
-		fprintf(stderr, "SDL Warning: %d SDL surfaces extant\n", 
-							surfaces_allocated);
-	}
-#endif
-#ifdef DEBUG_BUILD
-  printf("[SDL_Quit] : SDL_UninstallParachute()\n"); fflush(stdout);
-#endif
-
-	/* Uninstall any parachute signal handlers */
-	SDL_UninstallParachute();
-
-#if !SDL_THREADS_DISABLED && SDL_THREAD_PTH
-	pth_kill();
-#endif
-#ifdef DEBUG_BUILD
-  printf("[SDL_Quit] : Returning!\n"); fflush(stdout);
-#endif
-
-}
-
-/* Return the library version number */
-const SDL_version * SDL_Linked_Version(void)
-{
-	return(&version);
-}
-
-#if defined(__OS2__)
-/* Building for OS/2 */
-#ifdef __WATCOMC__
-
-#define INCL_DOSERRORS
-#define INCL_DOSEXCEPTIONS
-#include <os2.h>
-
-/* Exception handler to prevent the Audio thread hanging, making a zombie process! */
-ULONG _System SDL_Main_ExceptionHandler(PEXCEPTIONREPORTRECORD pERepRec,
-                                        PEXCEPTIONREGISTRATIONRECORD pERegRec,
-                                        PCONTEXTRECORD pCtxRec,
-                                        PVOID p)
-{
-  if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
-    return XCPT_CONTINUE_SEARCH;
-  if (pERepRec->fHandlerFlags & EH_UNWINDING)
-    return XCPT_CONTINUE_SEARCH;
-  if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
-    return XCPT_CONTINUE_SEARCH;
-
-  /* Do cleanup at every fatal exception! */
-  if (((pERepRec->ExceptionNum & XCPT_SEVERITY_CODE) == XCPT_FATAL_EXCEPTION) &&
-      (pERepRec->ExceptionNum != XCPT_BREAKPOINT) &&
-      (pERepRec->ExceptionNum != XCPT_SINGLE_STEP)
-     )
-  {
-    if (SDL_initialized & SDL_INIT_AUDIO)
-    {
-      /* This removes the zombie audio thread in case of emergency. */
-#ifdef DEBUG_BUILD
-      printf("[SDL_Main_ExceptionHandler] : Calling SDL_CloseAudio()!\n");
-#endif
-      SDL_CloseAudio();
-    }
-  }
-  return (XCPT_CONTINUE_SEARCH);
-}
-
-
-EXCEPTIONREGISTRATIONRECORD SDL_Main_xcpthand = {0, SDL_Main_ExceptionHandler};
-
-/* The main DLL entry for DLL Initialization and Uninitialization: */
-unsigned _System LibMain(unsigned hmod, unsigned termination)
-{
-  if (termination)
-  {
-#ifdef DEBUG_BUILD
-/*    printf("[SDL DLL Unintialization] : Removing exception handler\n"); */
-#endif
-    DosUnsetExceptionHandler(&SDL_Main_xcpthand);
-    return 1;
-  } else
-  {
-#ifdef DEBUG_BUILD
-    /* Make stdout and stderr unbuffered! */
-    setbuf(stdout, NULL);
-    setbuf(stderr, NULL);
-#endif
-    /* Fire up exception handler */
-#ifdef DEBUG_BUILD
-/*    printf("[SDL DLL Initialization] : Setting exception handler\n"); */
-#endif
-    /* Set exception handler */
-    DosSetExceptionHandler(&SDL_Main_xcpthand);
-
-    return 1;
-  }
-}
-#endif /* __WATCOMC__ */
-
-#elif defined(__WIN32__)  && !defined(__SYMBIAN32__)
-
-#if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
-/* Need to include DllMain() on Watcom C for some reason.. */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-BOOL APIENTRY _DllMainCRTStartup( HANDLE hModule, 
-                       DWORD  ul_reason_for_call, 
-                       LPVOID lpReserved )
-{
-	switch (ul_reason_for_call) {
-		case DLL_PROCESS_ATTACH:
-		case DLL_THREAD_ATTACH:
-		case DLL_THREAD_DETACH:
-		case DLL_PROCESS_DETACH:
-			break;
-	}
-	return TRUE;
-}
-#endif /* building DLL with Watcom C */
-
-#endif /* OS/2 elif __WIN32__ */
diff --git a/Externals/SDL/src/SDL_error.c b/Externals/SDL/src/SDL_error.c
deleted file mode 100644
index 900309ee31..0000000000
--- a/Externals/SDL/src/SDL_error.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Simple error handling in SDL */
-
-#include "SDL_error.h"
-#include "SDL_error_c.h"
-
-/* Routine to get the thread-specific error variable */
-#if SDL_THREADS_DISABLED
-/* The  SDL_arraysize(The ),default (non-thread-safe) global error variable */
-static SDL_error SDL_global_error;
-#define SDL_GetErrBuf()	(&SDL_global_error)
-#else
-extern SDL_error *SDL_GetErrBuf(void);
-#endif /* SDL_THREADS_DISABLED */
-
-#define SDL_ERRBUFIZE	1024
-
-/* Private functions */
-
-static const char *SDL_LookupString(const char *key)
-{
-	/* FIXME: Add code to lookup key in language string hash-table */
-	return key;
-}
-
-/* Public functions */
-
-void SDL_SetError (const char *fmt, ...)
-{
-	va_list ap;
-	SDL_error *error;
-
-	/* Copy in the key, mark error as valid */
-	error = SDL_GetErrBuf();
-	error->error = 1;
-	SDL_strlcpy((char *)error->key, fmt, sizeof(error->key));
-
-	va_start(ap, fmt);
-	error->argc = 0;
-	while ( *fmt ) {
-		if ( *fmt++ == '%' ) {
-			while ( *fmt == '.' || (*fmt >= '0' && *fmt <= '9') ) {
-				++fmt;
-			}
-			switch (*fmt++) {
-			    case 0:  /* Malformed format string.. */
-				--fmt;
-				break;
-			    case 'c':
-			    case 'i':
-			    case 'd':
-			    case 'u':
-			    case 'o':
-			    case 'x':
-			    case 'X':
-				error->args[error->argc++].value_i =
-							va_arg(ap, int);
-				break;
-			    case 'f':
-				error->args[error->argc++].value_f =
-							va_arg(ap, double);
-				break;
-			    case 'p':
-				error->args[error->argc++].value_ptr =
-							va_arg(ap, void *);
-				break;
-			    case 's':
-				{
-				  int i = error->argc;
-				  const char *str = va_arg(ap, const char *);
-				  if (str == NULL)
-				      str = "(null)";
-				  SDL_strlcpy((char *)error->args[i].buf, str, ERR_MAX_STRLEN);
-				  error->argc++;
-				}
-				break;
-			    default:
-				break;
-			}
-			if ( error->argc >= ERR_MAX_ARGS ) {
-				break;
-			}
-		}
-	}
-	va_end(ap);
-
-	/* If we are in debug mode, print out an error message */
-#ifdef DEBUG_ERROR
-	fprintf(stderr, "SDL_SetError: %s\n", SDL_GetError());
-#endif
-}
-
-/* This function has a bit more overhead than most error functions
-   so that it supports internationalization and thread-safe errors.
-*/
-char *SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
-{
-	SDL_error *error;
-
-	/* Clear the error string */
-	*errstr = '\0'; --maxlen;
-
-	/* Get the thread-safe error, and print it out */
-	error = SDL_GetErrBuf();
-	if ( error->error ) {
-		const char *fmt;
-		char *msg = errstr;
-		int len;
-		int argi;
-
-		fmt = SDL_LookupString(error->key);
-		argi = 0;
-		while ( *fmt && (maxlen > 0) ) {
-			if ( *fmt == '%' ) {
-				char tmp[32], *spot = tmp;
-				*spot++ = *fmt++;
-				while ( (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) && spot < (tmp+SDL_arraysize(tmp)-2) ) {
-					*spot++ = *fmt++;
-				}
-				*spot++ = *fmt++;
-				*spot++ = '\0';
-				switch (spot[-2]) {
-				    case '%':
-					*msg++ = '%';
-					maxlen -= 1;
-					break;
-				    case 'c':
-				    case 'i':
-			            case 'd':
-			            case 'u':
-			            case 'o':
-				    case 'x':
-				    case 'X':
-					len = SDL_snprintf(msg, maxlen, tmp, error->args[argi++].value_i);
-					msg += len;
-					maxlen -= len;
-					break;
-				    case 'f':
-					len = SDL_snprintf(msg, maxlen, tmp, error->args[argi++].value_f);
-					msg += len;
-					maxlen -= len;
-					break;
-				    case 'p':
-					len = SDL_snprintf(msg, maxlen, tmp, error->args[argi++].value_ptr);
-					msg += len;
-					maxlen -= len;
-					break;
-				    case 's':
-					len = SDL_snprintf(msg, maxlen, tmp, SDL_LookupString(error->args[argi++].buf));
-					msg += len;
-					maxlen -= len;
-					break;
-				}
-			} else {
-				*msg++ = *fmt++;
-				maxlen -= 1;
-			}
-		}
-		*msg = 0;	/* NULL terminate the string */
-	}
-	return(errstr);
-}
-
-/* Available for backwards compatibility */
-char *SDL_GetError (void)
-{
-	static char errmsg[SDL_ERRBUFIZE];
-
-	return((char *)SDL_GetErrorMsg(errmsg, SDL_ERRBUFIZE));
-}
-
-void SDL_ClearError(void)
-{
-	SDL_error *error;
-
-	error = SDL_GetErrBuf();
-	error->error = 0;
-}
-
-/* Very common errors go here */
-void SDL_Error(SDL_errorcode code)
-{
-	switch (code) {
-		case SDL_ENOMEM:
-			SDL_SetError("Out of memory");
-			break;
-		case SDL_EFREAD:
-			SDL_SetError("Error reading from datastream");
-			break;
-		case SDL_EFWRITE:
-			SDL_SetError("Error writing to datastream");
-			break;
-		case SDL_EFSEEK:
-			SDL_SetError("Error seeking in datastream");
-			break;
-		default:
-			SDL_SetError("Unknown SDL error");
-			break;
-	}
-}
-
-#ifdef TEST_ERROR
-int main(int argc, char *argv[])
-{
-	char buffer[BUFSIZ+1];
-
-	SDL_SetError("Hi there!");
-	printf("Error 1: %s\n", SDL_GetError());
-	SDL_ClearError();
-	SDL_memset(buffer, '1', BUFSIZ);
-	buffer[BUFSIZ] = 0;
-	SDL_SetError("This is the error: %s (%f)", buffer, 1.0);
-	printf("Error 2: %s\n", SDL_GetError());
-	exit(0);
-}
-#endif
diff --git a/Externals/SDL/src/SDL_error_c.h b/Externals/SDL/src/SDL_error_c.h
deleted file mode 100644
index d8f08ee5e7..0000000000
--- a/Externals/SDL/src/SDL_error_c.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This file defines a structure that carries language-independent
-   error messages
-*/
-
-#ifndef _SDL_error_c_h
-#define _SDL_error_c_h
-
-#define ERR_MAX_STRLEN	128
-#define ERR_MAX_ARGS	5
-
-typedef struct SDL_error {
-	/* This is a numeric value corresponding to the current error */
-	int error;
-
-	/* This is a key used to index into a language hashtable containing
-	   internationalized versions of the SDL error messages.  If the key
-	   is not in the hashtable, or no hashtable is available, the key is
-	   used directly as an error message format string.
-	*/
-	char key[ERR_MAX_STRLEN];
-
-	/* These are the arguments for the error functions */
-	int argc;
-	union {
-		void *value_ptr;
-#if 0	/* What is a character anyway?  (UNICODE issues) */
-		unsigned char value_c;
-#endif
-		int value_i;
-		double value_f;
-		char buf[ERR_MAX_STRLEN];
-	} args[ERR_MAX_ARGS];
-} SDL_error;
-
-#endif /* _SDL_error_c_h */
diff --git a/Externals/SDL/src/SDL_fatal.c b/Externals/SDL/src/SDL_fatal.c
deleted file mode 100644
index 15c0be7f9c..0000000000
--- a/Externals/SDL/src/SDL_fatal.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* General fatal signal handling code for SDL */
-
-#ifdef HAVE_SIGNAL_H
-
-#include <signal.h>
-
-#include "SDL.h"
-#include "SDL_fatal.h"
-
-/* This installs some signal handlers for the more common fatal signals,
-   so that if the programmer is lazy, the app doesn't die so horribly if
-   the program crashes.
-*/
-
-static void SDL_Parachute(int sig)
-{
-	signal(sig, SIG_DFL);
-	SDL_Quit();
-	raise(sig);
-}
-
-static int SDL_fatal_signals[] = {
-	SIGSEGV,
-#ifdef SIGBUS
-	SIGBUS,
-#endif
-#ifdef SIGFPE
-	SIGFPE,
-#endif
-#ifdef SIGQUIT
-	SIGQUIT,
-#endif
-	0
-};
-
-void SDL_InstallParachute(void)
-{
-	/* Set a handler for any fatal signal not already handled */
-	int i;
-#ifdef HAVE_SIGACTION
-	struct sigaction action;
-
-	for ( i=0; SDL_fatal_signals[i]; ++i ) {
-		sigaction(SDL_fatal_signals[i], NULL, &action);
-		if ( action.sa_handler == SIG_DFL ) {
-			action.sa_handler = SDL_Parachute;
-			sigaction(SDL_fatal_signals[i], &action, NULL);
-		}
-	}
-#ifdef SIGALRM
-	/* Set SIGALRM to be ignored -- necessary on Solaris */
-	sigaction(SIGALRM, NULL, &action);
-	if ( action.sa_handler == SIG_DFL ) {
-		action.sa_handler = SIG_IGN;
-		sigaction(SIGALRM, &action, NULL);
-	}
-#endif
-#else
-	void (*ohandler)(int);
-
-	for ( i=0; SDL_fatal_signals[i]; ++i ) {
-		ohandler = signal(SDL_fatal_signals[i], SDL_Parachute);
-		if ( ohandler != SIG_DFL ) {
-			signal(SDL_fatal_signals[i], ohandler);
-		}
-	}
-#endif /* HAVE_SIGACTION */
-	return;
-}
-
-void SDL_UninstallParachute(void)
-{
-	/* Remove a handler for any fatal signal handled */
-	int i;
-#ifdef HAVE_SIGACTION
-	struct sigaction action;
-
-	for ( i=0; SDL_fatal_signals[i]; ++i ) {
-		sigaction(SDL_fatal_signals[i], NULL, &action);
-		if ( action.sa_handler == SDL_Parachute ) {
-			action.sa_handler = SIG_DFL;
-			sigaction(SDL_fatal_signals[i], &action, NULL);
-		}
-	}
-#else
-	void (*ohandler)(int);
-
-	for ( i=0; SDL_fatal_signals[i]; ++i ) {
-		ohandler = signal(SDL_fatal_signals[i], SIG_DFL);
-		if ( ohandler != SDL_Parachute ) {
-			signal(SDL_fatal_signals[i], ohandler);
-		}
-	}
-#endif /* HAVE_SIGACTION */
-}
-
-#else
-
-/* No signals on this platform, nothing to do.. */
-
-void SDL_InstallParachute(void)
-{
-	return;
-}
-
-void SDL_UninstallParachute(void)
-{
-	return;
-}
-
-#endif /* HAVE_SIGNAL_H */
diff --git a/Externals/SDL/src/SDL_fatal.h b/Externals/SDL/src/SDL_fatal.h
deleted file mode 100644
index 8211caf427..0000000000
--- a/Externals/SDL/src/SDL_fatal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* General fatal signal handling code for SDL */
-
-extern void SDL_InstallParachute(void);
-extern void SDL_UninstallParachute(void);
-
diff --git a/Externals/SDL/src/joystick/SDL_joystick.c b/Externals/SDL/src/joystick/SDL_joystick.c
deleted file mode 100644
index 1972d13b73..0000000000
--- a/Externals/SDL/src/joystick/SDL_joystick.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the joystick API for Simple DirectMedia Layer */
-
-#include "SDL_events.h"
-#include "SDL_sysjoystick.h"
-#include "SDL_joystick_c.h"
-#if !SDL_EVENTS_DISABLED
-#include "../events/SDL_events_c.h"
-#endif
-
-/* This is used for Quake III Arena */
-#if SDL_EVENTS_DISABLED
-#define SDL_Lock_EventThread()
-#define SDL_Unlock_EventThread()
-#endif
-
-Uint8 SDL_numjoysticks = 0;
-SDL_Joystick **SDL_joysticks = NULL;
-static SDL_Joystick *default_joystick = NULL;
-
-int SDL_JoystickInit(void)
-{
-	int arraylen;
-	int status;
-
-	SDL_numjoysticks = 0;
-	status = SDL_SYS_JoystickInit();
-	if ( status >= 0 ) {
-		arraylen = (status+1)*sizeof(*SDL_joysticks);
-		SDL_joysticks = (SDL_Joystick **)SDL_malloc(arraylen);
-		if ( SDL_joysticks == NULL ) {
-			SDL_numjoysticks = 0;
-		} else {
-			SDL_memset(SDL_joysticks, 0, arraylen);
-			SDL_numjoysticks = status;
-		}
-		status = 0;
-	}
-	default_joystick = NULL;
-	return(status);
-}
-
-/*
- * Count the number of joysticks attached to the system
- */
-int SDL_NumJoysticks(void)
-{
-	return SDL_numjoysticks;
-}
-
-/*
- * Get the implementation dependent name of a joystick
- */
-const char *SDL_JoystickName(int device_index)
-{
-	if ( (device_index < 0) || (device_index >= SDL_numjoysticks) ) {
-		SDL_SetError("There are %d joysticks available",
-		             SDL_numjoysticks);
-		return(NULL);
-	}
-	return(SDL_SYS_JoystickName(device_index));
-}
-
-/*
- * Open a joystick for use - the index passed as an argument refers to
- * the N'th joystick on the system.  This index is the value which will
- * identify this joystick in future joystick events.
- *
- * This function returns a joystick identifier, or NULL if an error occurred.
- */
-SDL_Joystick *SDL_JoystickOpen(int device_index)
-{
-	int i;
-	SDL_Joystick *joystick;
-
-	if ( (device_index < 0) || (device_index >= SDL_numjoysticks) ) {
-		SDL_SetError("There are %d joysticks available",
-		             SDL_numjoysticks);
-		return(NULL);
-	}
-
-	/* If the joystick is already open, return it */
-	for ( i=0; SDL_joysticks[i]; ++i ) {
-		if ( device_index == SDL_joysticks[i]->index ) {
-			joystick = SDL_joysticks[i];
-			++joystick->ref_count;
-			return(joystick);
-		}
-	}
-
-	/* Create and initialize the joystick */
-	joystick = (SDL_Joystick *)SDL_malloc((sizeof *joystick));
-	if ( !joystick ) {
-		return(NULL);
-	}
-
-	SDL_memset(joystick, 0, (sizeof *joystick));
-	joystick->index = device_index;
-	if ( SDL_SYS_JoystickOpen(joystick) < 0 ) {
-		SDL_free(joystick);
-		return(NULL);
-	}
-
-	if ( joystick->naxes > 0 ) {
-		joystick->axes = (Sint16 *)SDL_malloc
-			(joystick->naxes*sizeof(Sint16));
-	}
-	if ( joystick->nhats > 0 ) {
-		joystick->hats = (Uint8 *)SDL_malloc
-			(joystick->nhats*sizeof(Uint8));
-	}
-	if ( joystick->nballs > 0 ) {
-		joystick->balls = (struct balldelta *)SDL_malloc
-			(joystick->nballs*sizeof(*joystick->balls));
-	}
-	if ( joystick->nbuttons > 0 ) {
-		joystick->buttons = (Uint8 *)SDL_malloc
-			(joystick->nbuttons*sizeof(Uint8));
-	}
-	if ( ((joystick->naxes > 0) && !joystick->axes)
-	  || ((joystick->nhats > 0) && !joystick->hats)
-	  || ((joystick->nballs > 0) && !joystick->balls)
-	  || ((joystick->nbuttons > 0) && !joystick->buttons)) {
-		SDL_OutOfMemory();
-		SDL_JoystickClose(joystick);
-		return(NULL);
-	}
-
-	if ( joystick->axes ) {
-		SDL_memset(joystick->axes, 0,
-			joystick->naxes*sizeof(Sint16));
-	}
-	if ( joystick->hats ) {
-		SDL_memset(joystick->hats, 0,
-			joystick->nhats*sizeof(Uint8));
-	}
-	if ( joystick->balls ) {
-		SDL_memset(joystick->balls, 0,
-			joystick->nballs*sizeof(*joystick->balls));
-	}
-	if ( joystick->buttons ) {
-		SDL_memset(joystick->buttons, 0,
-			joystick->nbuttons*sizeof(Uint8));
-	}
-
-	/* Add joystick to list */
-	++joystick->ref_count;
-	SDL_Lock_EventThread();
-	for ( i=0; SDL_joysticks[i]; ++i )
-		/* Skip to next joystick */ ;
-	SDL_joysticks[i] = joystick;
-	SDL_Unlock_EventThread();
-
-	return(joystick);
-}
-
-/*
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-int SDL_JoystickOpened(int device_index)
-{
-	int i, opened;
-
-	opened = 0;
-	for ( i=0; SDL_joysticks[i]; ++i ) {
-		if ( SDL_joysticks[i]->index == (Uint8)device_index ) {
-			opened = 1;
-			break;
-		}
-	}
-	return(opened);
-}
-
-static int ValidJoystick(SDL_Joystick **joystick)
-{
-	int valid;
-
-	if ( *joystick == NULL ) {
-		*joystick = default_joystick;
-	}
-	if ( *joystick == NULL ) {
-		SDL_SetError("Joystick hasn't been opened yet");
-		valid = 0;
-	} else {
-		valid = 1;
-	}
-	return valid;
-}
-
-/*
- * Get the device index of an opened joystick.
- */
-int SDL_JoystickIndex(SDL_Joystick *joystick)
-{
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-	return(joystick->index);
-}
-
-/*
- * Get the number of multi-dimensional axis controls on a joystick
- */
-int SDL_JoystickNumAxes(SDL_Joystick *joystick)
-{
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-	return(joystick->naxes);
-}
-
-/*
- * Get the number of hats on a joystick
- */
-int SDL_JoystickNumHats(SDL_Joystick *joystick)
-{
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-	return(joystick->nhats);
-}
-
-/*
- * Get the number of trackballs on a joystick
- */
-int SDL_JoystickNumBalls(SDL_Joystick *joystick)
-{
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-	return(joystick->nballs);
-}
-
-/*
- * Get the number of buttons on a joystick
- */
-int SDL_JoystickNumButtons(SDL_Joystick *joystick)
-{
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-	return(joystick->nbuttons);
-}
-
-/*
- * Get the current state of an axis control on a joystick
- */
-Sint16 SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis)
-{
-	Sint16 state;
-
-	if ( ! ValidJoystick(&joystick) ) {
-		return(0);
-	}
-	if ( axis < joystick->naxes ) {
-		state = joystick->axes[axis];
-	} else {
-		SDL_SetError("Joystick only has %d axes", joystick->naxes);
-		state = 0;
-	}
-	return(state);
-}
-
-/*
- * Get the current state of a hat on a joystick
- */
-Uint8 SDL_JoystickGetHat(SDL_Joystick *joystick, int hat)
-{
-	Uint8 state;
-
-	if ( ! ValidJoystick(&joystick) ) {
-		return(0);
-	}
-	if ( hat < joystick->nhats ) {
-		state = joystick->hats[hat];
-	} else {
-		SDL_SetError("Joystick only has %d hats", joystick->nhats);
-		state = 0;
-	}
-	return(state);
-}
-
-/*
- * Get the ball axis change since the last poll
- */
-int SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy)
-{
-	int retval;
-
-	if ( ! ValidJoystick(&joystick) ) {
-		return(-1);
-	}
-
-	retval = 0;
-	if ( ball < joystick->nballs ) {
-		if ( dx ) {
-			*dx = joystick->balls[ball].dx;
-		}
-		if ( dy ) {
-			*dy = joystick->balls[ball].dy;
-		}
-		joystick->balls[ball].dx = 0;
-		joystick->balls[ball].dy = 0;
-	} else {
-		SDL_SetError("Joystick only has %d balls", joystick->nballs);
-		retval = -1;
-	}
-	return(retval);
-}
-
-/*
- * Get the current state of a button on a joystick
- */
-Uint8 SDL_JoystickGetButton(SDL_Joystick *joystick, int button)
-{
-	Uint8 state;
-
-	if ( ! ValidJoystick(&joystick) ) {
-		return(0);
-	}
-	if ( button < joystick->nbuttons ) {
-		state = joystick->buttons[button];
-	} else {
-		SDL_SetError("Joystick only has %d buttons",joystick->nbuttons);
-		state = 0;
-	}
-	return(state);
-}
-
-/*
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-void SDL_JoystickClose(SDL_Joystick *joystick)
-{
-	int i;
-
-	if ( ! ValidJoystick(&joystick) ) {
-		return;
-	}
-
-	/* First decrement ref count */
-	if ( --joystick->ref_count > 0 ) {
-		return;
-	}
-
-	/* Lock the event queue - prevent joystick polling */
-	SDL_Lock_EventThread();
-
-	if ( joystick == default_joystick ) {
-		default_joystick = NULL;
-	}
-	SDL_SYS_JoystickClose(joystick);
-
-	/* Remove joystick from list */
-	for ( i=0; SDL_joysticks[i]; ++i ) {
-		if ( joystick == SDL_joysticks[i] ) {
-			SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i+1],
-			       (SDL_numjoysticks-i)*sizeof(joystick));
-			break;
-		}
-	}
-
-	/* Let the event thread keep running */
-	SDL_Unlock_EventThread();
-
-	/* Free the data associated with this joystick */
-	if ( joystick->axes ) {
-		SDL_free(joystick->axes);
-	}
-	if ( joystick->hats ) {
-		SDL_free(joystick->hats);
-	}
-	if ( joystick->balls ) {
-		SDL_free(joystick->balls);
-	}
-	if ( joystick->buttons ) {
-		SDL_free(joystick->buttons);
-	}
-	SDL_free(joystick);
-}
-
-void SDL_JoystickQuit(void)
-{
-	/* Stop the event polling */
-	SDL_Lock_EventThread();
-	SDL_numjoysticks = 0;
-	SDL_Unlock_EventThread();
-
-	/* Quit the joystick setup */
-	SDL_SYS_JoystickQuit();
-	if ( SDL_joysticks ) {
-		SDL_free(SDL_joysticks);
-		SDL_joysticks = NULL;
-	}
-}
-
-
-/* These are global for SDL_sysjoystick.c and SDL_events.c */
-
-int SDL_PrivateJoystickAxis(SDL_Joystick *joystick, Uint8 axis, Sint16 value)
-{
-	int posted;
-
-	/* Update internal joystick state */
-	joystick->axes[axis] = value;
-
-	/* Post the event, if desired */
-	posted = 0;
-#if !SDL_EVENTS_DISABLED
-	if ( SDL_ProcessEvents[SDL_JOYAXISMOTION] == SDL_ENABLE ) {
-		SDL_Event event;
-		event.type = SDL_JOYAXISMOTION;
-		event.jaxis.which = joystick->index;
-		event.jaxis.axis = axis;
-		event.jaxis.value = value;
-		if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) {
-			posted = 1;
-			SDL_PushEvent(&event);
-		}
-	}
-#endif /* !SDL_EVENTS_DISABLED */
-	return(posted);
-}
-
-int SDL_PrivateJoystickHat(SDL_Joystick *joystick, Uint8 hat, Uint8 value)
-{
-	int posted;
-
-	/* Update internal joystick state */
-	joystick->hats[hat] = value;
-
-	/* Post the event, if desired */
-	posted = 0;
-#if !SDL_EVENTS_DISABLED
-	if ( SDL_ProcessEvents[SDL_JOYHATMOTION] == SDL_ENABLE ) {
-		SDL_Event event;
-		event.jhat.type = SDL_JOYHATMOTION;
-		event.jhat.which = joystick->index;
-		event.jhat.hat = hat;
-		event.jhat.value = value;
-		if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) {
-			posted = 1;
-			SDL_PushEvent(&event);
-		}
-	}
-#endif /* !SDL_EVENTS_DISABLED */
-	return(posted);
-}
-
-int SDL_PrivateJoystickBall(SDL_Joystick *joystick, Uint8 ball,
-					Sint16 xrel, Sint16 yrel)
-{
-	int posted;
-
-	/* Update internal mouse state */
-	joystick->balls[ball].dx += xrel;
-	joystick->balls[ball].dy += yrel;
-
-	/* Post the event, if desired */
-	posted = 0;
-#if !SDL_EVENTS_DISABLED
-	if ( SDL_ProcessEvents[SDL_JOYBALLMOTION] == SDL_ENABLE ) {
-		SDL_Event event;
-		event.jball.type = SDL_JOYBALLMOTION;
-		event.jball.which = joystick->index;
-		event.jball.ball = ball;
-		event.jball.xrel = xrel;
-		event.jball.yrel = yrel;
-		if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) {
-			posted = 1;
-			SDL_PushEvent(&event);
-		}
-	}
-#endif /* !SDL_EVENTS_DISABLED */
-	return(posted);
-}
-
-int SDL_PrivateJoystickButton(SDL_Joystick *joystick, Uint8 button, Uint8 state)
-{
-	int posted;
-#if !SDL_EVENTS_DISABLED
-	SDL_Event event;
-
-	switch ( state ) {
-		case SDL_PRESSED:
-			event.type = SDL_JOYBUTTONDOWN;
-			break;
-		case SDL_RELEASED:
-			event.type = SDL_JOYBUTTONUP;
-			break;
-		default:
-			/* Invalid state -- bail */
-			return(0);
-	}
-#endif /* !SDL_EVENTS_DISABLED */
-
-	/* Update internal joystick state */
-	joystick->buttons[button] = state;
-
-	/* Post the event, if desired */
-	posted = 0;
-#if !SDL_EVENTS_DISABLED
-	if ( SDL_ProcessEvents[event.type] == SDL_ENABLE ) {
-		event.jbutton.which = joystick->index;
-		event.jbutton.button = button;
-		event.jbutton.state = state;
-		if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) {
-			posted = 1;
-			SDL_PushEvent(&event);
-		}
-	}
-#endif /* !SDL_EVENTS_DISABLED */
-	return(posted);
-}
-
-void SDL_JoystickUpdate(void)
-{
-	int i;
-
-	for ( i=0; SDL_joysticks[i]; ++i ) {
-		SDL_SYS_JoystickUpdate(SDL_joysticks[i]);
-	}
-}
-
-int SDL_JoystickEventState(int state)
-{
-#if SDL_EVENTS_DISABLED
-	return SDL_IGNORE;
-#else
-	const Uint8 event_list[] = {
-		SDL_JOYAXISMOTION, SDL_JOYBALLMOTION, SDL_JOYHATMOTION,
-		SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP,
-	};
-	unsigned int i;
-
-	switch (state) {
-		case SDL_QUERY:
-			state = SDL_IGNORE;
-			for ( i=0; i<SDL_arraysize(event_list); ++i ) {
-				state = SDL_EventState(event_list[i],SDL_QUERY);
-				if ( state == SDL_ENABLE ) {
-					break;
-				}
-			}
-			break;
-		default:
-			for ( i=0; i<SDL_arraysize(event_list); ++i ) {
-				SDL_EventState(event_list[i], state);
-			}
-			break;
-	}
-	return(state);
-#endif /* SDL_EVENTS_DISABLED */
-}
diff --git a/Externals/SDL/src/joystick/SDL_joystick_c.h b/Externals/SDL/src/joystick/SDL_joystick_c.h
deleted file mode 100644
index 7f725cbdad..0000000000
--- a/Externals/SDL/src/joystick/SDL_joystick_c.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Useful functions and variables from SDL_joystick.c */
-#include "SDL_joystick.h"
-
-/* The number of available joysticks on the system */
-extern Uint8 SDL_numjoysticks;
-
-/* Internal event queueing functions */
-extern int SDL_PrivateJoystickAxis(SDL_Joystick *joystick,
-                                   Uint8 axis, Sint16 value);
-extern int SDL_PrivateJoystickBall(SDL_Joystick *joystick,
-                                   Uint8 ball, Sint16 xrel, Sint16 yrel);
-extern int SDL_PrivateJoystickHat(SDL_Joystick *joystick,
-                                 Uint8 hat, Uint8 value);
-extern int SDL_PrivateJoystickButton(SDL_Joystick *joystick,
-                                     Uint8 button, Uint8 state);
diff --git a/Externals/SDL/src/joystick/SDL_sysjoystick.h b/Externals/SDL/src/joystick/SDL_sysjoystick.h
deleted file mode 100644
index bf00a2ad28..0000000000
--- a/Externals/SDL/src/joystick/SDL_sysjoystick.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is SDL_free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the system specific header for the SDL joystick API */
-
-#include "SDL_joystick.h"
-
-/* The SDL joystick structure */
-struct _SDL_Joystick {
-	Uint8 index;		/* Device index */
-	const char *name;	/* Joystick name - system dependent */
-
-	int naxes;		/* Number of axis controls on the joystick */
-	Sint16 *axes;		/* Current axis states */
-
-	int nhats;		/* Number of hats on the joystick */
-	Uint8 *hats;		/* Current hat states */
-	
-	int nballs;		/* Number of trackballs on the joystick */
-	struct balldelta {
-		int dx;
-		int dy;
-	} *balls;		/* Current ball motion deltas */
-	
-	int nbuttons;		/* Number of buttons on the joystick */
-	Uint8 *buttons;		/* Current button states */
-	
-	struct joystick_hwdata *hwdata;	/* Driver dependent information */
-
-	int ref_count;		/* Reference count for multiple opens */
-};
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-extern int SDL_SYS_JoystickInit(void);
-
-/* Function to get the device-dependent name of a joystick */
-extern const char *SDL_SYS_JoystickName(int index);
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-extern int SDL_SYS_JoystickOpen(SDL_Joystick *joystick);
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-extern void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick);
-
-/* Function to close a joystick after use */
-extern void SDL_SYS_JoystickClose(SDL_Joystick *joystick);
-
-/* Function to perform any system-specific joystick related cleanup */
-extern void SDL_SYS_JoystickQuit(void);
-
diff --git a/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c b/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c
deleted file mode 100644
index dafade71ea..0000000000
--- a/Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_USBHID
-
-/*
- * Joystick driver for the uhid(4) interface found in OpenBSD,
- * NetBSD and FreeBSD.
- *
- * Maintainer: <vedge at csoft.org>
- */
-
-#include <sys/param.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifndef __FreeBSD_kernel_version
-#define __FreeBSD_kernel_version __FreeBSD_version
-#endif
-
-#if defined(HAVE_USB_H)
-#include <usb.h>
-#endif
-#ifdef __DragonFly__
-#include <bus/usb/usb.h>
-#include <bus/usb/usbhid.h>
-#else
-#include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
-#endif
-
-#if defined(HAVE_USBHID_H)
-#include <usbhid.h>
-#elif defined(HAVE_LIBUSB_H)
-#include <libusb.h>
-#elif defined(HAVE_LIBUSBHID_H)
-#include <libusbhid.h>
-#endif
-
-#ifdef __FREEBSD__
-#ifndef __DragonFly__
-#include <osreldate.h>
-#endif
-#include <sys/joystick.h>
-#endif
-
-#if SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
-#include <machine/joystick.h>
-#endif
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-#define MAX_UHID_JOYS	4
-#define MAX_JOY_JOYS	2
-#define MAX_JOYS	(MAX_UHID_JOYS + MAX_JOY_JOYS)
-
-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
-struct usb_ctl_report {
-	int	ucr_report;
-	u_char	ucr_data[1024]; /* filled data size will vary */
-};
-#endif
-
-struct report {
-	struct	usb_ctl_report *buf;	/* Buffer */
-	ssize_t	size;			/* Buffer size */
-	int	rid;			/* Report ID */
-	enum {
-		SREPORT_UNINIT,
-		SREPORT_CLEAN,
-		SREPORT_DIRTY
-	} status;
-};
-
-static struct {
-	int	uhid_report;
-	hid_kind_t kind;
-	const	char *name;
-} const repinfo[] = {
-	{ UHID_INPUT_REPORT,	hid_input,	"input" },
-	{ UHID_OUTPUT_REPORT,	hid_output,	"output" },
-	{ UHID_FEATURE_REPORT,	hid_feature,	"feature" }
-};
-
-enum {
-	REPORT_INPUT = 0,
-	REPORT_OUTPUT = 1,
-	REPORT_FEATURE = 2
-};
-
-enum {
-	JOYAXE_X,
-	JOYAXE_Y,
-	JOYAXE_Z,
-	JOYAXE_SLIDER,
-	JOYAXE_WHEEL,
-	JOYAXE_RX,
-	JOYAXE_RY,
-	JOYAXE_RZ,
-	JOYAXE_count
-};
-
-struct joystick_hwdata {
-	int	fd;
-	char	*path;
-	enum {
-		BSDJOY_UHID,	/* uhid(4) */
-		BSDJOY_JOY	/* joy(4) */
-	} type;
-	struct	report_desc *repdesc;
-	struct	report inreport;
-	int	axis_map[JOYAXE_count];	/* map present JOYAXE_* to 0,1,..*/
-	int	x;
-	int	y;
-	int	xmin;
-	int	ymin;
-	int	xmax;
-	int	ymax;
-};
-
-static char *joynames[MAX_JOYS];
-static char *joydevnames[MAX_JOYS];
-
-static int	report_alloc(struct report *, struct report_desc *, int);
-static void	report_free(struct report *);
-
-#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
-#define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
-#else
-#define REP_BUF_DATA(rep) ((rep)->buf->data)
-#endif
-
-int
-SDL_SYS_JoystickInit(void)
-{
-	char s[16];
-	int i, fd;
-
-	SDL_numjoysticks = 0;
-
-	SDL_memset(joynames, 0, sizeof(joynames));
-	SDL_memset(joydevnames, 0, sizeof(joydevnames));
-
-	for (i = 0; i < MAX_UHID_JOYS; i++) {
-		SDL_Joystick nj;
-
-		SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i);
-
-		nj.index = SDL_numjoysticks;
-		joynames[nj.index] = strdup(s);
-
-		if (SDL_SYS_JoystickOpen(&nj) == 0) {
-			SDL_SYS_JoystickClose(&nj);
-			SDL_numjoysticks++;
-		} else {
-			SDL_free(joynames[nj.index]);
-			joynames[nj.index] = NULL;
-		}
-	}
-	for (i = 0; i < MAX_JOY_JOYS; i++) {
-		SDL_snprintf(s, SDL_arraysize(s), "/dev/joy%d", i);
-		fd = open(s, O_RDONLY);
-		if (fd != -1) {
-			joynames[SDL_numjoysticks++] = strdup(s);
-			close(fd);
-		}
-	}
-
-	/* Read the default USB HID usage table. */
-	hid_init(NULL);
-
-	return (SDL_numjoysticks);
-}
-
-const char *
-SDL_SYS_JoystickName(int jindex)
-{
-	if (joydevnames[jindex] != NULL) {
-		return (joydevnames[jindex]);
-	}
-	return (joynames[jindex]);
-}
-
-static int
-usage_to_joyaxe(unsigned usage)
-{
-    int joyaxe;
-    switch (usage) {
-    case HUG_X:
-	joyaxe = JOYAXE_X; break;
-    case HUG_Y:
-	joyaxe = JOYAXE_Y; break;
-    case HUG_Z:
-	joyaxe = JOYAXE_Z; break;
-    case HUG_SLIDER:
-	joyaxe = JOYAXE_SLIDER; break;
-    case HUG_WHEEL:
-	joyaxe = JOYAXE_WHEEL; break;
-    case HUG_RX:
-	joyaxe = JOYAXE_RX; break;
-    case HUG_RY:
-	joyaxe = JOYAXE_RY; break;
-    case HUG_RZ:
-	joyaxe = JOYAXE_RZ; break;
-    default:
-	joyaxe = -1;
-    }
-    return joyaxe;    
-}
-
-static unsigned
-hatval_to_sdl(Sint32 hatval)
-{
-    static const unsigned hat_dir_map[8] = {
-	SDL_HAT_UP, SDL_HAT_RIGHTUP, SDL_HAT_RIGHT, SDL_HAT_RIGHTDOWN, 
-	SDL_HAT_DOWN, SDL_HAT_LEFTDOWN, SDL_HAT_LEFT, SDL_HAT_LEFTUP
-    };
-    unsigned result;
-    if ((hatval & 7) == hatval) 
-	result = hat_dir_map[hatval];
-    else 
-	result = SDL_HAT_CENTERED;
-    return result;
-}
-
-
-int
-SDL_SYS_JoystickOpen(SDL_Joystick *joy)
-{
-	char *path = joynames[joy->index];
-	struct joystick_hwdata *hw;
-	struct hid_item hitem;
-	struct hid_data *hdata;
-	struct report *rep;
-	int fd;
-	int i;
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1) {
-		SDL_SetError("%s: %s", path, strerror(errno));
-		return (-1);
-	}
-
-	hw = (struct joystick_hwdata *)SDL_malloc(sizeof(struct joystick_hwdata));
-	if (hw == NULL) {
-		SDL_OutOfMemory();
-		close(fd);
-		return (-1);
-	}
-	joy->hwdata = hw;
-	hw->fd = fd;
-	hw->path = strdup(path);
-	hw->x = 0;
-	hw->y = 0;
-	hw->xmin = 0xffff;
-	hw->ymin = 0xffff;
-	hw->xmax = 0;
-	hw->ymax = 0;
-	if (! SDL_strncmp(path, "/dev/joy", 8)) {
-		hw->type = BSDJOY_JOY;
-		joy->naxes = 2;
-		joy->nbuttons = 2;
-		joy->nhats = 0;
-		joy->nballs = 0;
-		joydevnames[joy->index] = strdup("Gameport joystick");
-		goto usbend;
-	} else {
-		hw->type = BSDJOY_UHID;
-	}
-
-	{
-	    int ax;
-	    for (ax = 0; ax < JOYAXE_count; ax++)
-		hw->axis_map[ax] = -1;
-	}
-	hw->repdesc = hid_get_report_desc(fd);
-	if (hw->repdesc == NULL) {
-		SDL_SetError("%s: USB_GET_REPORT_DESC: %s", hw->path,
-		    strerror(errno));
-		goto usberr;
-	}
-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
-       rep->rid = hid_get_report_id(fd);
-       if (rep->rid < 0) {
-#else
-	rep = &hw->inreport;
-	if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
-#endif
-		rep->rid = -1; /* XXX */
-	}
-	if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
-		goto usberr;
-	}
-	if (rep->size <= 0) {
-		SDL_SetError("%s: Input report descriptor has invalid length",
-		    hw->path);
-		goto usberr;
-	}
-
-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
-	hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
-#else
-	hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
-#endif
-	if (hdata == NULL) {
-		SDL_SetError("%s: Cannot start HID parser", hw->path);
-		goto usberr;
-	}
-	joy->naxes = 0;
-	joy->nbuttons = 0;
-	joy->nhats = 0;
-	joy->nballs = 0;
-	for (i=0; i<JOYAXE_count; i++)
-		hw->axis_map[i] = -1;
-
-	while (hid_get_item(hdata, &hitem) > 0) {
-		char *sp;
-		const char *s;
-
-		switch (hitem.kind) {
-		case hid_collection:
-			switch (HID_PAGE(hitem.usage)) {
-			case HUP_GENERIC_DESKTOP:
-				switch (HID_USAGE(hitem.usage)) {
-				case HUG_JOYSTICK:
-				case HUG_GAME_PAD:
-					s = hid_usage_in_page(hitem.usage);
-					sp = SDL_malloc(SDL_strlen(s) + 5);
-					SDL_snprintf(sp, SDL_strlen(s) + 5, "%s (%d)", s,
-					    joy->index);
-					joydevnames[joy->index] = sp;
-				}
-			}
-			break;
-		case hid_input:
-			switch (HID_PAGE(hitem.usage)) {
-			case HUP_GENERIC_DESKTOP: {
-			    unsigned usage = HID_USAGE(hitem.usage);
-			    int joyaxe = usage_to_joyaxe(usage);
-			    if (joyaxe >= 0) {
-				hw->axis_map[joyaxe] = 1;
-			    } else if (usage == HUG_HAT_SWITCH) {
-				joy->nhats++;
-			    }
-			    break;
-			}
-			case HUP_BUTTON:
-				joy->nbuttons++;
-				break;
-			default:
-				break;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	hid_end_parse(hdata);
-	for (i=0; i<JOYAXE_count; i++)
-		if (hw->axis_map[i] > 0)
-			hw->axis_map[i] = joy->naxes++;
-
-usbend:
-	/* The poll blocks the event thread. */
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-
-	return (0);
-usberr:
-	close(hw->fd);
-	SDL_free(hw->path);
-	SDL_free(hw);
-	return (-1);
-}
-
-void
-SDL_SYS_JoystickUpdate(SDL_Joystick *joy)
-{
-	struct hid_item hitem;
-	struct hid_data *hdata;
-	struct report *rep;
-	int nbutton, naxe = -1;
-	Sint32 v;
-
-#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
-	struct joystick gameport;
- 
-	if (joy->hwdata->type == BSDJOY_JOY) {
-		if (read(joy->hwdata->fd, &gameport, sizeof gameport) != sizeof gameport)
-			return;
-		if (abs(joy->hwdata->x - gameport.x) > 8) {
-			joy->hwdata->x = gameport.x;
-			if (joy->hwdata->x < joy->hwdata->xmin) {
-				joy->hwdata->xmin = joy->hwdata->x;
-			}
-			if (joy->hwdata->x > joy->hwdata->xmax) {
-				joy->hwdata->xmax = joy->hwdata->x;
-			}
-			if (joy->hwdata->xmin == joy->hwdata->xmax) {
-				joy->hwdata->xmin--;
-				joy->hwdata->xmax++;
-			}
-			v = (Sint32)joy->hwdata->x;
-			v -= (joy->hwdata->xmax + joy->hwdata->xmin + 1)/2;
-			v *= 32768/((joy->hwdata->xmax - joy->hwdata->xmin + 1)/2);
-			SDL_PrivateJoystickAxis(joy, 0, v);
-		}
-		if (abs(joy->hwdata->y - gameport.y) > 8) {
-			joy->hwdata->y = gameport.y;
-			if (joy->hwdata->y < joy->hwdata->ymin) {
-				joy->hwdata->ymin = joy->hwdata->y;
-			}
-			if (joy->hwdata->y > joy->hwdata->ymax) {
-				joy->hwdata->ymax = joy->hwdata->y;
-			}
-			if (joy->hwdata->ymin == joy->hwdata->ymax) {
-				joy->hwdata->ymin--;
-				joy->hwdata->ymax++;
-			}
-			v = (Sint32)joy->hwdata->y;
-			v -= (joy->hwdata->ymax + joy->hwdata->ymin + 1)/2;
-			v *= 32768/((joy->hwdata->ymax - joy->hwdata->ymin + 1)/2);
-			SDL_PrivateJoystickAxis(joy, 1, v);
-		}
-		if (gameport.b1 != joy->buttons[0]) {
-			SDL_PrivateJoystickButton(joy, 0, gameport.b1);
-		}
-		if (gameport.b2 != joy->buttons[1]) {
-			SDL_PrivateJoystickButton(joy, 1, gameport.b2);
-		}
-		return;
-	}
-#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
-	
-	rep = &joy->hwdata->inreport;
-
-	if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
-		return;
-	}
-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
-	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
-#else
-	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
-#endif
-	if (hdata == NULL) {
-		fprintf(stderr, "%s: Cannot start HID parser\n",
-		    joy->hwdata->path);
-		return;
-	}
-
-	for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) {
-		switch (hitem.kind) {
-		case hid_input:
-			switch (HID_PAGE(hitem.usage)) {
-			case HUP_GENERIC_DESKTOP: {
-			    unsigned usage = HID_USAGE(hitem.usage);
-			    int joyaxe = usage_to_joyaxe(usage);
-			    if (joyaxe >= 0) {
-				naxe = joy->hwdata->axis_map[joyaxe];
-				/* scaleaxe */
-				v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
-							 &hitem);
-				v -= (hitem.logical_maximum + hitem.logical_minimum + 1)/2;
-				v *= 32768/((hitem.logical_maximum - hitem.logical_minimum + 1)/2);
-				if (v != joy->axes[naxe]) {
-				    SDL_PrivateJoystickAxis(joy, naxe, v);
-				}
-			    } else if (usage == HUG_HAT_SWITCH) {
-				v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
-							 &hitem);
-				SDL_PrivateJoystickHat(joy, 0,
-					hatval_to_sdl(v)-hitem.logical_minimum);
-			    }
-			    break;
-			}
-			case HUP_BUTTON:
-				v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
-				    &hitem);
-				if (joy->buttons[nbutton] != v) {
-					SDL_PrivateJoystickButton(joy,
-					    nbutton, v);
-				}
-				nbutton++;
-				break;
-			default:
-				continue;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	hid_end_parse(hdata);
-
-	return;
-}
-
-/* Function to close a joystick after use */
-void
-SDL_SYS_JoystickClose(SDL_Joystick *joy)
-{
-	if (SDL_strncmp(joy->hwdata->path, "/dev/joy", 8))	{
-		report_free(&joy->hwdata->inreport);
-		hid_dispose_report_desc(joy->hwdata->repdesc);
-	}
-	close(joy->hwdata->fd);
-	SDL_free(joy->hwdata->path);
-	SDL_free(joy->hwdata);
-
-	return;
-}
-
-void
-SDL_SYS_JoystickQuit(void)
-{
-	int i;
-
-	for (i = 0; i < MAX_JOYS; i++) {
-		if (joynames[i] != NULL)
-			SDL_free(joynames[i]);
-		if (joydevnames[i] != NULL)
-			SDL_free(joydevnames[i]);
-	}
-
-	return;
-}
-
-static int
-report_alloc(struct report *r, struct report_desc *rd, int repind)
-{
-	int len;
-
-#ifdef __DragonFly__
-	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
-#elif __FREEBSD__
-# if (__FreeBSD_kernel_version >= 460000) || defined(__FreeBSD_kernel__)
-#  if (__FreeBSD_kernel_version <= 500111)
-	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
-#  else
-	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
-#  endif
-# else
-	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
-# endif
-#else
-# ifdef USBHID_NEW
-	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
-# else
-	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
-# endif
-#endif
-
-	if (len < 0) {
-		SDL_SetError("Negative HID report size");
-		return (-1);
-	}
-	r->size = len;
-
-	if (r->size > 0) {
-		r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +
-		    r->size);
-		if (r->buf == NULL) {
-			SDL_OutOfMemory();
-			return (-1);
-		}
-	} else {
-		r->buf = NULL;
-	}
-
-	r->status = SREPORT_CLEAN;
-	return (0);
-}
-
-static void
-report_free(struct report *r)
-{
-	if (r->buf != NULL) {
-		SDL_free(r->buf);
-	}
-	r->status = SREPORT_UNINIT;
-}
-
-#endif /* SDL_JOYSTICK_USBHID */
diff --git a/Externals/SDL/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h b/Externals/SDL/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
deleted file mode 100644
index 836a71ec34..0000000000
--- a/Externals/SDL/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
+++ /dev/null
@@ -1,874 +0,0 @@
-/* *INDENT-OFF* */
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDLIB_H_
-#define _IOKIT_HID_IOHIDLIB_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-#include <CoreFoundation/CoreFoundation.h>
-#if COREFOUNDATION_CFPLUGINCOM_SEPARATE
-#include <CoreFoundation/CFPlugInCOM.h>
-#endif
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOReturn.h>
-
-#include <IOKit/hid/IOHIDKeys.h>
-
-struct IOHIDEventStruct
-{
-    IOHIDElementType	type;
-    IOHIDElementCookie	elementCookie;
-    SInt32		value;
-    AbsoluteTime	timestamp;
-    UInt32		longValueSize;
-    void *		longValue;
-};
-typedef struct IOHIDEventStruct IOHIDEventStruct;
-
-/* FA12FA38-6F1A-11D4-BA0C-0005028F18D5 */
-#define kIOHIDDeviceUserClientTypeID CFUUIDGetConstantUUIDWithBytes(NULL, \
-    0xFA, 0x12, 0xFA, 0x38, 0x6F, 0x1A, 0x11, 0xD4,			\
-    0xBA, 0x0C, 0x00, 0x05, 0x02, 0x8F, 0x18, 0xD5)
-
-/* 13AA9C44-6F1B-11D4-907C-0005028F18D5 */
-#define kIOHIDDeviceFactoryID CFUUIDGetConstantUUIDWithBytes(NULL,	\
-    0x13, 0xAA, 0x9C, 0x44, 0x6F, 0x1B, 0x11, 0xD4,			\
-    0x90, 0x7C, 0x00, 0x05, 0x02, 0x8F, 0x18, 0xD5)
-
-/* 78BD420C-6F14-11D4-9474-0005028F18D5 */
-/*! @defined kIOHIDDeviceInterfaceID
-    @discussion Interface ID for the IOHIDDeviceInterface. Corresponds to an
-                 available HID device. */
-#define kIOHIDDeviceInterfaceID CFUUIDGetConstantUUIDWithBytes(NULL, 	\
-    0x78, 0xBD, 0x42, 0x0C, 0x6F, 0x14, 0x11, 0xD4,			\
-    0x94, 0x74, 0x00, 0x05, 0x02, 0x8F, 0x18, 0xD5)
-    
-/* 7D0B510E-16D5-11D7-9E9B-000393992E38 */
-/*! @defined kIOHIDDeviceInterfaceID121
-    @discussion Interface ID for the IOHIDDeviceInterface121. Corresponds to 
-                an available HID device that includes methods from
-                IOHIDDeviceInterface.  This interface is available on 
-                IOHIDLib 1.2.1 and Mac OS X 10.2.3 or later.*/
-#define kIOHIDDeviceInterfaceID121 CFUUIDGetConstantUUIDWithBytes(NULL, \
-    0x7d, 0xb, 0x51, 0xe, 0x16, 0xd5, 0x11, 0xd7, 			\
-    0x9e, 0x9b, 0x0, 0x3, 0x93, 0x99, 0x2e, 0x38)
-
-/* B70ABF31-16D5-11D7-AB35-000393992E38 */
-/*! @defined kIOHIDDeviceInterfaceID122
-    @discussion Interface ID for the IOHIDDeviceInterface122. Corresponds to 
-                an available HID device that includes methods from
-                IOHIDDeviceInterface and IOHIDDeviceInterface121. This 
-                interface is available on IOHIDLib 1.2.2 and Mac OS X 10.3
-                or later.*/
-#define kIOHIDDeviceInterfaceID122 CFUUIDGetConstantUUIDWithBytes(NULL, \
-    0xb7, 0xa, 0xbf, 0x31, 0x16, 0xd5, 0x11, 0xd7, 			\
-    0xab, 0x35, 0x0, 0x3, 0x93, 0x99, 0x2e, 0x38)
-
-/* 8138629E-6F14-11D4-970E-0005028F18D5 */
-/*! @defined kIOHIDQueueInterfaceID
-    @discussion Interface ID for the kIOHIDQueueInterfaceID. Corresponds to a
-                queue for a specific HID device. */
-#define kIOHIDQueueInterfaceID CFUUIDGetConstantUUIDWithBytes(NULL, 	\
-    0x81, 0x38, 0x62, 0x9E, 0x6F, 0x14, 0x11, 0xD4,			\
-    0x97, 0x0E, 0x00, 0x05, 0x02, 0x8F, 0x18, 0xD5)
-
-/* 80CDCC00-755D-11D4-8E0F-0005028F18D5 */
-/*! @defined kIOHIDOutputTransactionInterfaceID
-    @discussion Interface ID for the kIOHIDOutputTransactionInterfaceID.
-                Corresponds to an output transaction for one or more report IDs
-                on a specific device. */
-#define kIOHIDOutputTransactionInterfaceID CFUUIDGetConstantUUIDWithBytes(NULL,\
-    0x80, 0xCD, 0xCC, 0x00, 0x75, 0x5D, 0x11, 0xD4,			\
-    0x80, 0xEF, 0x00, 0x05, 0x02, 0x8F, 0x18, 0xD5)
-
-/*! @typedef IOHIDCallbackFunction
-    @discussion Type and arguments of callout C function that is used when a
-                completion routine is called, see
-                IOHIDLib.h:setRemovalCallback().
-    @param target void * pointer to your data, often a pointer to an object.
-    @param result Completion result of desired operation.
-    @param refcon void * pointer to more data.
-    @param sender Interface instance sending the completion routine.
-*/
-typedef void (*IOHIDCallbackFunction)
-              (void * target, IOReturn result, void * refcon, void * sender);
-
-/*! @typedef IOHIDElementCallbackFunction
-    @discussion Type and arguments of callout C function that is used when a
-                completion routine is called, see IOHIDLib.h:setElementValue().
-    @param target void * pointer to your data, often a pointer to an object.
-    @param result Completion result of desired operation.
-    @param refcon void * pointer to more data.
-    @param sender Interface instance sending the completion routine.
-    @param elementCookie Element within interface instance sending completion.
-*/
-typedef void (*IOHIDElementCallbackFunction)
-              (void *	 		target,
-               IOReturn 		result,
-               void * 			refcon,
-               void * 			sender,
-               IOHIDElementCookie 	elementCookie);
-
-/*! @typedef IOHIDReportCallbackFunction
-    @discussion Type and arguments of callout C function that is used when a
-                completion routine is called, see IOHIDLib.h:setReport().
-    @param target void * pointer to your data, often a pointer to an object.
-    @param result Completion result of desired operation.
-    @param refcon void * pointer to more data.
-    @param sender Interface instance sending the completion routine.
-    @param bufferSize Size of the buffer received upon completion.
-*/
-typedef void (*IOHIDReportCallbackFunction)
-              (void *	 		target,
-               IOReturn 		result,
-               void * 			refcon,
-               void * 			sender,
-               UInt32		 	bufferSize);
-               
-
-/* Forward declarations of the queue and output transaction interfaces */
-struct IOHIDQueueInterface;
-struct IOHIDOutputTransactionInterface;
-typedef struct IOHIDQueueInterface IOHIDQueueInterface;
-typedef struct IOHIDOutputTransactionInterface IOHIDOutputTransactionInterface;
-
-//
-// IOHIDDeviceInterface Functions available in version 1.0 (10.0) and higher of Mac OS X
-//
-#define IOHIDDEVICEINTERFACE_FUNCS_100 							\
-    IOReturn (*createAsyncEventSource)(void * self, CFRunLoopSourceRef * source); 	\
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);				\
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);			\
-    mach_port_t (*getAsyncPort)(void * self);						\
-    IOReturn (*open)(void * self, UInt32 flags);					\
-    IOReturn (*close)(void * self);							\
-    IOReturn (*setRemovalCallback)(void * self, IOHIDCallbackFunction removalCallback,	\
-                                   void * removalTarget, void * removalRefcon);		\
-    IOReturn (*getElementValue)(void * self, IOHIDElementCookie	elementCookie,		\
-                                IOHIDEventStruct * valueEvent);				\
-    IOReturn (*setElementValue)(void * self, IOHIDElementCookie elementCookie,		\
-                                IOHIDEventStruct * valueEvent, UInt32 timeoutMS,	\
-                                IOHIDElementCallbackFunction callback,			\
-                                void * callbackTarget, void * callbackRefcon);		\
-    IOReturn (*queryElementValue)(void * self, IOHIDElementCookie elementCookie,	\
-                                IOHIDEventStruct * valueEvent, UInt32 timeoutMS,	\
-                                IOHIDElementCallbackFunction callback,			\
-                                void * callbackTarget, void * callbackRefcon);		\
-    IOReturn (*startAllQueues)(void * self);						\
-    IOReturn (*stopAllQueues)(void * self);						\
-    IOHIDQueueInterface ** (*allocQueue) (void *self);					\
-    IOHIDOutputTransactionInterface ** (*allocOutputTransaction) (void *self)
-    
-//
-// IOHIDDeviceInterface Functions available in version 1.2.1 (10.2.3) and higher of Mac OS X
-//
-#define IOHIDDEVICEINTERFACE_FUNCS_121	 						\
-    IOReturn (*setReport)(void * self, IOHIDReportType reportType, UInt32 reportID,	\
-                                void * reportBuffer, UInt32 reportBufferSize,		\
-                                UInt32 timeoutMS, IOHIDReportCallbackFunction callback,	\
-                                void * callbackTarget, void * callbackRefcon);		\
-    IOReturn (*getReport)(void * self, IOHIDReportType reportType,			\
-                                UInt32 reportID, void * reportBuffer,			\
-                                UInt32 * reportBufferSize, UInt32 timeoutMS,		\
-                                IOHIDReportCallbackFunction callback,			\
-                                void * callbackTarget, void * callbackRefcon)
-                                
-//
-// IOHIDDeviceInterface Functions available in version 1.2.2 (10.3) and higher of Mac OS X
-//
-#define IOHIDDEVICEINTERFACE_FUNCS_122	 						\
-    IOReturn (*copyMatchingElements)(void * self, CFDictionaryRef matchingDict, 	\
-                                CFArrayRef * elements);					\
-    IOReturn (*setInterruptReportHandlerCallback)(void * self, void * reportBuffer, 		\
-                                UInt32 reportBufferSize, 				\
-                                IOHIDReportCallbackFunction callback,			\
-                                void * callbackTarget, void * callbackRefcon)	
-
-typedef struct IOHIDDeviceInterface
-{
-    IUNKNOWN_C_GUTS;
-    IOHIDDEVICEINTERFACE_FUNCS_100;
-    IOHIDDEVICEINTERFACE_FUNCS_121;
-} IOHIDDeviceInterface;
-
-typedef struct IOHIDDeviceInterface121
-{
-    IUNKNOWN_C_GUTS;
-    IOHIDDEVICEINTERFACE_FUNCS_100;
-    IOHIDDEVICEINTERFACE_FUNCS_121;
-} IOHIDDeviceInterface121;
-
-typedef struct IOHIDDeviceInterface122
-{
-    IUNKNOWN_C_GUTS;
-    IOHIDDEVICEINTERFACE_FUNCS_100;
-    IOHIDDEVICEINTERFACE_FUNCS_121;
-    IOHIDDEVICEINTERFACE_FUNCS_122;
-} IOHIDDeviceInterface122;
-
-
-//
-// IOHIDQueueInterface Functions available in version 1.0 (10.0) and higher of Mac OS X
-//
-#define IOHIDQUEUEINTERFACE_FUNCS_100							\
-    IOReturn (*createAsyncEventSource)(void * self, CFRunLoopSourceRef * source);	\
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);				\
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);			\
-    mach_port_t (*getAsyncPort)(void * self);						\
-    IOReturn (*create)(void * self, UInt32 flags, UInt32 depth);			\
-    IOReturn (*dispose)(void * self);							\
-    IOReturn (*addElement)(void * self, IOHIDElementCookie elementCookie, UInt32 flags);\
-    IOReturn (*removeElement)(void * self, IOHIDElementCookie elementCookie);		\
-    Boolean (*hasElement)(void * self, IOHIDElementCookie elementCookie);		\
-    IOReturn (*start)(void * self);							\
-    IOReturn (*stop)(void * self);							\
-    IOReturn (*getNextEvent)(void * self, IOHIDEventStruct * event,			\
-                                AbsoluteTime maxTime, UInt32 timeoutMS);		\
-    IOReturn (*setEventCallout)(void * self, IOHIDCallbackFunction callback,		\
-                                void * callbackTarget,  void * callbackRefcon);		\
-    IOReturn (*getEventCallout)(void * self, IOHIDCallbackFunction * outCallback,	\
-                                void ** outCallbackTarget, void ** outCallbackRefcon)
-
-struct IOHIDQueueInterface
-{
-    IUNKNOWN_C_GUTS;
-    IOHIDQUEUEINTERFACE_FUNCS_100;
-};
-
-//
-// IOHIDOutputTransactionInterface Functions available in version 1.2 (10.2) and higher of Mac OS X
-//
-#define IOHIDOUTPUTTRANSACTIONINTERFACE_FUNCS_120 					\
-    IOReturn (*createAsyncEventSource)(void * self, CFRunLoopSourceRef * source);	\
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);				\
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);			\
-    mach_port_t (*getAsyncPort)(void * self);						\
-    IOReturn (*create)(void * self);							\
-    IOReturn (*dispose)(void * self);							\
-    IOReturn (*addElement)(void * self, IOHIDElementCookie elementCookie);		\
-    IOReturn (*removeElement)(void * self, IOHIDElementCookie elementCookie);		\
-    Boolean  (*hasElement)(void * self, IOHIDElementCookie elementCookie);		\
-    IOReturn (*setElementDefault)(void *self, IOHIDElementCookie elementCookie,		\
-                                IOHIDEventStruct * valueEvent);				\
-    IOReturn (*getElementDefault)(void * self, IOHIDElementCookie elementCookie,	\
-                                IOHIDEventStruct * outValueEvent);			\
-    IOReturn (*setElementValue)(void * self, IOHIDElementCookie elementCookie,		\
-                                IOHIDEventStruct * valueEvent);				\
-    IOReturn (*getElementValue)(void * self, IOHIDElementCookie elementCookie,		\
-                                IOHIDEventStruct * outValueEvent);			\
-    IOReturn (*commit)(void * self, UInt32 timeoutMS, IOHIDCallbackFunction callback,	\
-                                void * callbackTarget, void * callbackRefcon);		\
-    IOReturn (*clear)(void * self)
-
-struct IOHIDOutputTransactionInterface
-{
-    IUNKNOWN_C_GUTS;
-    IOHIDOUTPUTTRANSACTIONINTERFACE_FUNCS_120;
-};
-
-
-//
-//  BEGIN READABLE STRUCTURE DEFINITIONS 
-//  
-//  This portion of uncompiled code provides a more reader friendly representation of 
-//  the CFPlugin methods defined above.
-
-#if 0
-/*! @class IOHIDDeviceInterface
-    @discussion CFPlugin object subclass which provides the primary interface to
-                HID devices.
-*/
-typedef struct IOHIDDeviceInterface
-{
-
-    IUNKNOWN_C_GUTS;
-
-/*! @function createAsyncEventSource
-    @abstract Creates async eventsource.
-    @discussion This method will create an async mach port, if one
-        has not already been created.
-    @param source Reference to CFRunLoopSourceRef that is created.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*createAsyncEventSource)(void * 			self,
-                                       CFRunLoopSourceRef * 	source);
-
-/*! @function getAsyncEventSource
-    @abstract Gets the created async event source.
-    @result Returns a CFRunLoopSourceRef.
-*/
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);
-    
-/*! @function createAsyncPort
-    @abstract Creates an async port.
-    @discussion The port must be created before any callbacks can be used. 
-    @param port Reference to mach port that is created. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);
-    
-/*! @function getAsyncPort
-    @abstract Gets the current async port.
-    @result Returns a mach_port_t.
-*/
-    mach_port_t (*getAsyncPort)(void * self);
-    
-/*! @function open
-    @abstract Opens the device.
-    @param flags Flags to be passed down to the user client.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*open)(void * self, UInt32 flags);
-    
-/*! @function close
-    @abstract Closes the device.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*close)(void * self);
-
-/*! @function setRemovalCallback
-    @abstract Sets callback to be used when device is removed.
-    @param removalCallback Called when the device is removed. 
-    @param removeTarget Passed to the callback.
-    @param removalRefcon Passed to the callback.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*setRemovalCallback)(void * 			self,
-                                   IOHIDCallbackFunction	removalCallback,
-                                   void *			removalTarget,
-                                   void *			removalRefcon);
-
-/*! @function getElementValue
-    @abstract Obtains the most recent value of an element.
-    @discussion This call is most useful for interrupt driven elements,
-        such as input type elements.  Since feature type element values 
-        need to be polled from the device, it is recommended to use the 
-        queryElementValue method to obtain the current value.  The  
-        timestamp field in the event details the last time the element 
-        value was altered.
-    @param elementCookie The element of interest. 
-    @param valueEvent The event that will be filled.   If a long value is 
-        present, it is up to the caller to deallocate it.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*getElementValue)(void * 			self,
-                                IOHIDElementCookie	elementCookie,
-                                IOHIDEventStruct *	valueEvent);
-
-/*! @function setElementValue
-    @abstract Sets an element value on the device.
-    @discussion This call is most useful for feature type elements.  It is
-        recommended to use IOOutputTransaction for output type elements.
-    @param elementCookie The element of interest. 
-    @param valueEvent The event that will be filled.  If a long value is
-        present, it will be copied.
-    @param timeoutMS UNSUPPORTED.
-    @param callback UNSUPPORTED.
-    @param callbackTarget UNSUPPORTED.
-    @param callbackRefcon UNSUPPORTED.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*setElementValue)(void *	 			self,
-                                IOHIDElementCookie		elementCookie,
-                                IOHIDEventStruct *		valueEvent,
-                                UInt32 				timeoutMS,
-                                IOHIDElementCallbackFunction	callback,
-                                void * 				callbackTarget,
-                                void *				callbackRefcon);
-
-/*! @function queryElementValue
-    @abstract Obtains the current value of an element.
-    @discussion This call is most useful for feature type elements.  This
-        method will poll the device for the current element value.
-    @param elementCookie The element of interest. 
-    @param valueEvent The event that will be filled.  If a long value is 
-        present, it is up to the caller to deallocate it.
-    @param timeoutMS UNSUPPORTED.
-    @param callback UNSUPPORTED.
-    @param callbackTarget UNSUPPORTED.
-    @param callbackRefcon UNSUPPORTED.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*queryElementValue)(void * 			self,
-                                IOHIDElementCookie		elementCookie,
-                                IOHIDEventStruct *		valueEvent,
-                                UInt32 				timeoutMS,
-                                IOHIDElementCallbackFunction	callback,
-                                void * 				callbackTarget,
-                                void *				callbackRefcon);
-
-/*! @function startAllQueues
-    @abstract Starts data delivery on all queues for this device.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*startAllQueues)(void * self);
-    
-/*! @function stopAllQueues
-    @abstract Stops data delivery on all queues for this device.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*stopAllQueues)(void * self);
-
-/*! @function allocQueue
-    @abstract Wrapper to return instances of the IOHIDQueueInterface. 
-    @result Returns the created IOHIDQueueInterface.
-*/
-    IOHIDQueueInterface ** (*allocQueue) (void *self);
-    
-/*! @function allocOutputTransaction
-    @abstract Wrapper to return instances of the IOHIDOutputTransactionInterface. 
-    @result Returns the created IOHIDOutputTransactionInterface.
-*/
-    IOHIDOutputTransactionInterface ** (*allocOutputTransaction) (void *self);
-    
-} IOHIDDeviceInterface;
-
-/*! @class IOHIDDeviceInterface121
-    @discussion CFPlugin object subclass which provides the primary interface to
-                HID devices.  This class is a subclass of IOHIDDeviceInterface.
-*/
-typedef struct IOHIDDeviceInterface121
-{
-
-    IUNKNOWN_C_GUTS;
-    IOHIDDEVICEINTERFACE_FUNCS_100;
-
-/*! @function setReport
-    @abstract Sends a report to the device.
-    @param reportType The report type.
-    @param reportID The report id.
-    @param reportBuffer Pointer to a preallocated buffer.
-    @param reportBufferSize Size of the reportBuffer in bytes.
-    @param timeoutMS
-    @param callback If null, this method will behave synchronously.
-    @param callbackTarget The callback target passed to the callback.
-    @param callbackRefcon The callback refcon passed to the callback. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*setReport)	(void * 			self,
-                                IOHIDReportType			reportType,
-                                UInt32				reportID,
-                                void *				reportBuffer,
-                                UInt32				reportBufferSize,
-                                UInt32 				timeoutMS,
-                                IOHIDReportCallbackFunction	callback,
-                                void * 				callbackTarget,
-                                void *				callbackRefcon);
-
-/*! @function getReport
-    @abstract Obtains a report from the device.
-    @param reportType The report type.
-    @param reportID The report ID.
-    @param reportBuffer Pointer to a preallocated buffer.
-    @param reportBufferSize Size of the reportBuffer in bytes.  
-        When finished, will contain the actual size of the report.
-    @param timeoutMS
-    @param callback If null, this method will behave synchronously.
-    @param callbackTarget The callback target passed to the callback.
-    @param callbackRefcon The callback refcon passed to the callback. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*getReport)	(void * 			self,
-                                IOHIDReportType			reportType,
-                                UInt32				reportID,
-                                void *				reportBuffer,
-                                UInt32 *			reportBufferSize,
-                                UInt32 				timeoutMS,
-                                IOHIDReportCallbackFunction	callback,
-                                void * 				callbackTarget,
-                                void *				callbackRefcon);
-                                
-}IOHIDDeviceInterface121;
-
-/*! @class IOHIDDeviceInterface122
-    @discussion CFPlugin object subclass which provides the primary interface to
-                HID devices.  This class is a subclass of IOHIDDeviceInterface121.
-*/
-typedef struct IOHIDDeviceInterface122
-{
-
-    IUNKNOWN_C_GUTS;
-    IOHIDDEVICEINTERFACE_FUNCS_100;
-    IOHIDDEVICEINTERFACE_FUNCS_121;
-
-/*! @function copyMatchingElements
-    @abstract Obtains specific elements defined by the device.
-    @discussion Using keys defined in IOHIDKeys.h for elements, create a 
-            matching dictonary containing items that you wish to search for.  
-            A null array indicates that no elements matching that criteria 
-            were found. Each item in the array is a reference to the same 
-            dictionary item that represents each element in the I/O Registry.
-            It is up to the caller to release the returned array of elements. 
-    @param matchingDict Dictionary containg key/value pairs to match on.  Pass
-            a null value to match on all elements.
-    @param elements Pointer to a CFArrayRef that will be returned by this
-            method.  It is up to the caller to release it when finished. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*copyMatchingElements)(void * 			self, 
-                                CFDictionaryRef 		matchingDict, 
-                                CFArrayRef * 			elements);
-                                
-/*! @function setInterruptReportHandlerCallback
-    @abstract Sets the report handler callout to be called when the data 
-        is received from the Interrupt-In pipe.
-    @discussion In order for this to work correctly, you must call
-        createAsyncPort and createAsyncEventSource.
-    @param reportBuffer Pointer to a preallocated buffer.
-    @param reportBufferSize Size of the reportBuffer in bytes.  
-    @param callback If non-NULL, is a callback to be called when data 
-        is received from the device.
-    @param callbackTarget The callback target passed to the callback
-    @param callbackRefcon The callback refcon passed to the callback.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*setInterruptReportHandlerCallback)(
-                            void * 				self,
-                            void *				reportBuffer,
-                            UInt32				reportBufferSize, 
-                            IOHIDReportCallbackFunction 	callback,
-                            void * 				callbackTarget, 
-                            void * 				callbackRefcon);
-    
-}IOHIDDeviceInterface122;
-
-/*! @class IOHIDQueueInterface
-    @discussion CFPlugin object subclass which provides an interface for input
-                queues from HID devices. Created by an IOHIDDeviceInterface
-                object.
-*/
-typedef struct IOHIDQueueInterface
-{
-
-    IUNKNOWN_C_GUTS;
-
-/*! @function createAsyncEventSource
-    @abstract Creates an async event source.
-    @discussion This will be used with setEventCallout.
-    @param source The newly created event source.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*createAsyncEventSource)(void * 			self, 
-                                        CFRunLoopSourceRef * 	source);
-
-/*! @function getAsyncEventSource
-    @abstract Obtains the current event source.
-    @result Returns a CFRunLoopSourceRef.
-*/
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);
-
-/*! @function createAsyncPort
-    @abstract Creates an async port.
-    @discussion This will be used with createAsyncEventSource.
-    @param port The newly created async port.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);
-    
-/*! @function getAsyncPort
-    @abstract Obtains the current async port.
-    @result Returns a mach_port_t.
-*/
-    mach_port_t (*getAsyncPort)(void * self);
-    
-/*! @function create
-    @abstract Creates the current queue. 
-    @param flags
-    @param depth The maximum number of elements in the queue 
-        before the oldest elements in the queue begin to be lost.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*create)(void * 			self, 
-                        UInt32 			flags,
-                        UInt32			depth);
-
-/*! @function create
-    @abstract Disposes of the current queue. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*dispose)(void * self);
-    
-/*! @function addElement
-    @abstract Adds an element to the queue.
-    @discussion If the element has already been added to queue,
-        an error will be returned.
-    @param elementCookie The element of interest. 
-    @param flags 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*addElement)(void * self,
-                           IOHIDElementCookie elementCookie,
-                           UInt32 flags);
-
-/*! @function removeElement
-    @abstract Removes an element from the queue.
-    @discussion If the element has not been added to queue,
-        an error will be returned.
-    @param elementCookie The element of interest. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*removeElement)(void * self, IOHIDElementCookie elementCookie);
-    
-/*! @function hasElement
-    @abstract Checks whether an element has been added to 
-        the queue.
-    @discussion Will return true if present, otherwise will return false.
-    @param elementCookie The element of interest. 
-    @result Returns a Boolean value. 
-*/
-    Boolean (*hasElement)(void * self, IOHIDElementCookie elementCookie);
-
-/*! @function start
-    @abstract Starts event delivery to the queue. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*start)(void * self);
-    
-/*! @function stop
-    @abstract Stops event delivery to the queue. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*stop)(void * self);
-
-/*! @function getNextEvent
-    @abstract Reads next event from the queue.
-    @param event The event that will be filled.  If a long value is
-        present, it is up to the caller to deallocate it.
-    @param maxtime UNSUPPORTED.  If non-zero, limits read events to 
-        those that occured on or before maxTime.
-    @param timoutMS UNSUPPORTED.  The timeout in milliseconds, a zero  
-        timeout will cause this call to be non-blocking (returning  
-        queue empty) if there is a NULL callback, and blocking forever 
-        until the queue is non-empty if there is a valid callback.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*getNextEvent)(void * 			self,
-                            IOHIDEventStruct *		event,
-                            AbsoluteTime		maxTime,
-                            UInt32 			timeoutMS);
-
-/*! @function setEventCallout
-    @abstract Sets the event callout to be called when the queue 
-        transitions to non-empty.
-    @discussion In order for this to work correctly, you must call
-        createAsyncPort and createAsyncEventSource.
-    @param callback if non-NULL is a callback to be called when data 
-        is  inserted to the queue
-    @param callbackTarget The callback target passed to the callback
-    @param callbackRefcon The callback refcon passed to the callback.
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*setEventCallout)(void * 			self,
-                                IOHIDCallbackFunction   callback,
-                                void * 			callbackTarget,
-                                void *			callbackRefcon);
-
-/*! @function getEventCallout
-    @abstract Gets the event callout.
-    @discussion This callback will be called the queue transitions
-        to non-empty.
-    @param callback if non-NULL is a callback to be called when data 
-        is  inserted to the queue
-    @param callbackTarget The callback target passed to the callback
-    @param callbackRefcon The callback refcon passed to the callback 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*getEventCallout)(void * 			self,
-                                IOHIDCallbackFunction * outCallback,
-                                void ** 		outCallbackTarget,
-                                void **			outCallbackRefcon);
-} IOHIDQueueInterface;
-
-/*! @class IOHIDOutputTransactionInterface
-    @discussion CFPlugin object subclass which privides interface for output
-                transactions to HID devices. Created by a IOHIDDeviceInterface
-                object. */
-
-typedef struct IOHIDOutputTransactionInterface
-{
-    IUNKNOWN_C_GUTS;
-                    
-/*! @function createAsyncEventSource
-    @abstract Creates an async event source.
-    @discussion This will be used with setEventCallout.
-    @param source The newly created event source 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*createAsyncEventSource)(void * 			self, 
-                                        CFRunLoopSourceRef * 	source);
-
-/*! @function getAsyncEventSource
-    @abstract Obtains the current event source.
-    @result Returns a CFRunLoopSourceRef.
-*/
-    CFRunLoopSourceRef (*getAsyncEventSource)(void * self);
-
-/*! @function createAsyncPort
-    @abstract Creates an async port.
-    @discussion This will be used with createAsyncEventSource.
-    @param port The newly created async port. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*createAsyncPort)(void * self, mach_port_t * port);
-    
-/*! @function getAsyncPort
-    @abstract Obtains the current async port. 
-    @result Returns a mach_port_t.
-*/
-    mach_port_t (*getAsyncPort)(void * self);
-    
-/*! @function create
-    @abstract Creates the current transaction.
-    @discussion This method will free any memory that has been
-        allocated for this transaction. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*create)(void * self);
-    
-/*! @function dispose
-    @abstract Disposes of the current transaction.
-    @discussion The transaction will have to be recreated, in order
-        to perform any operations on the transaction. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*dispose)(void * self);
-    
-/*! @function addElement
-    @abstract Adds an element to the transaction.
-    @discussion If the element has already been added to transaction,
-        an error will be returned.
-    @param elementCookie The element of interest.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*addElement)	(void * self, IOHIDElementCookie elementCookie);
-    
-/*! @function removeElement
-    @abstract Removes an element from the transaction.
-    @discussion If the element has not been added to transaction,
-        an error will be returned.
-    @param elementCookie The element of interest. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*removeElement)	(void * self, IOHIDElementCookie elementCookie);
-    
-/*! @function hasElement
-    @abstract Checks whether an element has been added to 
-        the transaction.
-    @discussion Will return true if present, otherwise will return false.
-    @param elementCookie The element of interest. 
-    @result Returns a Boolean value. 
-*/
-    Boolean  (*hasElement)	(void * self, IOHIDElementCookie elementCookie);
-    
-/*! @function setElementDefault
-    @abstract Sets the default value of an element in a 
-        transaction.
-    @discussion An error will be returned if the element has not been
-        added to the transaction.
-    @param elementCookie The element of interest. 
-    @param valueEvent The event that will be filled.  If a long value is
-        present, it will be copied. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*setElementDefault)(void *	 	self,
-                                    IOHIDElementCookie	elementCookie,
-                                    IOHIDEventStruct *	valueEvent);
-    
-/*! @function getElementDefault
-    @abstract Obtains the default value of an element in a 
-        transaction.
-    @discussion An error will be returned if the element has not been 
-        added to the transaction.
-    @param elementCookie The element of interest. 
-    @param outValueEvent The event that will be filled.  If a long value is 
-        present, it is up to the caller to deallocate it. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*getElementDefault)(void *	 	self,
-                                    IOHIDElementCookie	elementCookie,
-                                    IOHIDEventStruct *	outValueEvent);
-    
-/*! @function setElementValue
-    @abstract Sets the value of an element in a transaction.
-    @discussion An error will be returned if the element has not been
-        added to the transaction.
-    @param elementCookie The element of interest. 
-    @param valueEvent The event that will be filled.  If a long value is
-        present, it will be copied.
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*setElementValue)(void *	 		self,
-                                IOHIDElementCookie	elementCookie,
-                                IOHIDEventStruct *	valueEvent);
-    
-/*! @function getElementValue
-    @abstract Obtains the value of an element in a transaction.
-    @discussion An error will be returned if the element has not been 
-        added to the transaction.
-    @param elementCookie The element of interest. 
-    @param outValueEvent The event that will be filled.  If a long value is 
-        present, it is up to the caller to deallocate it. 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*getElementValue)(void *	 		self,
-                                IOHIDElementCookie	elementCookie,
-                                IOHIDEventStruct *	outValueEvent);
-    
-/*! @function commit
-    @abstract Commits the transaction.
-    @discussion Transaction element values, if set, will be sent to the 
-        device.  Otherwise, the default element value will be used.  If
-        neither are set, that element will be omitted from the commit.
-        After a transaction is committed, transaction element values 
-        will be cleared.  Default values will be preserved.
-    @param timeoutMS UNSUPPORTED
-    @param callback UNSUPPORTED
-    @param callbackTarget UNSUPPORTED
-    @param callbackRefcon UNSUPPORTED 
-    @result Returns an IOReturn code.
-*/
-    IOReturn (*commit)(void * 			self,
-                        UInt32 			timeoutMS,
-                        IOHIDCallbackFunction   callback,
-                        void * 			callbackTarget,
-                        void *			callbackRefcon);
-    
-/*! @function clear
-    @abstract Clears the transaction.
-    @discussion Transaction element values will cleared.   Default 
-        values will be preserved. 
-    @result Returns an IOReturn code. 
-*/
-    IOReturn (*clear)(void * self);
-} IOHIDOutputTransactionInterface;
-
-#endif
-
-__END_DECLS
-
-#endif /* !_IOKIT_HID_IOHIDLIB_H_ */
diff --git a/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c b/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
deleted file mode 100644
index 32d82f6df3..0000000000
--- a/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/*
-	SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Library General Public
-	License as published by the Free Software Foundation; either
-	version 2 of the License, or (at your option) any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	Library General Public License for more details.
-
-	You should have received a copy of the GNU Library General Public
-	License along with this library; if not, write to the Free
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-	Sam Lantinga
-	slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_IOKIT
-
-/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
-/* Written 2001 by Max Horn */
-
-#include <unistd.h>
-#include <ctype.h>
-#include <sysexits.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOCFPlugIn.h>
-#ifdef MACOS_10_0_4
-#include <IOKit/hidsystem/IOHIDUsageTables.h>
-#else
-/* The header was moved here in Mac OS X 10.1 */
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
-#endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED == 1030
-#include "10.3.9-FIX/IOHIDLib.h"
-#else
-#include <IOKit/hid/IOHIDLib.h>
-#endif
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-struct recElement
-{
-	IOHIDElementCookie cookie;				/* unique value which identifies element, will NOT change */
-	long min;								/* reported min value possible */
-	long max;								/* reported max value possible */
-#if 0
-	/* TODO: maybe should handle the following stuff somehow? */
-
-	long scaledMin;							/* reported scaled min value possible */
-	long scaledMax;							/* reported scaled max value possible */
-	long size;								/* size in bits of data return from element */
-	Boolean relative;						/* are reports relative to last report (deltas) */
-	Boolean wrapping;						/* does element wrap around (one value higher than max is min) */
-	Boolean nonLinear;						/* are the values reported non-linear relative to element movement */
-	Boolean preferredState;					/* does element have a preferred state (such as a button) */
-	Boolean nullState;						/* does element have null state */
-#endif /* 0 */
-
-	/* runtime variables used for auto-calibration */
-	long minReport;							/* min returned value */
-	long maxReport;							/* max returned value */
-	
-	struct recElement * pNext;				/* next element in list */
-};
-typedef struct recElement recElement;
-
-struct joystick_hwdata
-{
-	IOHIDDeviceInterface ** interface;		/* interface to device, NULL = no interface */
-
-	char product[256];							/* name of product */
-	long usage;								/* usage page from IOUSBHID Parser.h which defines general usage */
-	long usagePage;							/* usage within above page from IOUSBHID Parser.h which defines specific usage */
-
-	long axes;								/* number of axis (calculated, not reported by device) */
-	long buttons;							/* number of buttons (calculated, not reported by device) */
-	long hats;								/* number of hat switches (calculated, not reported by device) */
-	long elements;							/* number of total elements (shouldbe total of above) (calculated, not reported by device) */
-
-	recElement* firstAxis;
-	recElement* firstButton;
-	recElement* firstHat;
-
-	int removed;
-	int uncentered;
-
-	struct joystick_hwdata* pNext;			/* next device */
-};
-typedef struct joystick_hwdata recDevice;
-
-
-/* Linked list of all available devices */
-static recDevice *gpDeviceList = NULL;
-
-
-static void HIDReportErrorNum (const char * strError, long numError)
-{
-	SDL_SetError(strError);
-}
-
-static void HIDGetCollectionElements (CFMutableDictionaryRef deviceProperties, recDevice *pDevice);
-
-/* returns current value for element, polling element
- * will return 0 on error conditions which should be accounted for by application
- */
-
-static SInt32 HIDGetElementValue (recDevice *pDevice, recElement *pElement)
-{
-	IOReturn result = kIOReturnSuccess;
-	IOHIDEventStruct hidEvent;
-	hidEvent.value = 0;
-	
-	if (NULL != pDevice && NULL != pElement && NULL != pDevice->interface)
-	{
-		result = (*(pDevice->interface))->getElementValue(pDevice->interface, pElement->cookie, &hidEvent);
-		if (kIOReturnSuccess == result)
-		{
-			/* record min and max for auto calibration */
-			if (hidEvent.value < pElement->minReport)
-				pElement->minReport = hidEvent.value;
-			if (hidEvent.value > pElement->maxReport)
-				pElement->maxReport = hidEvent.value;
-		}
-	}
-
-	/* auto user scale */
-	return hidEvent.value;
-}
-
-static SInt32 HIDScaledCalibratedValue (recDevice *pDevice, recElement *pElement, long min, long max)
-{
-	float deviceScale = max - min;
-	float readScale = pElement->maxReport - pElement->minReport;
-	SInt32 value = HIDGetElementValue(pDevice, pElement);
-	if (readScale == 0)
-		return value; /* no scaling at all */
-	else
-		return ((value - pElement->minReport) * deviceScale / readScale) + min;
-}
-
-
-static void HIDRemovalCallback(void * target,
-                               IOReturn result,
-                               void * refcon,
-                               void * sender)
-{
-	recDevice *device = (recDevice *) refcon;
-	device->removed = 1;
-	device->uncentered = 1;
-}
-
-
-
-/* Create and open an interface to device, required prior to extracting values or building queues.
- * Note: appliction now owns the device and must close and release it prior to exiting
- */
-
-static IOReturn HIDCreateOpenDeviceInterface (io_object_t hidDevice, recDevice *pDevice)
-{
-	IOReturn result = kIOReturnSuccess;
-	HRESULT plugInResult = S_OK;
-	SInt32 score = 0;
-	IOCFPlugInInterface ** ppPlugInInterface = NULL;
-	
-	if (NULL == pDevice->interface)
-	{
-		result = IOCreatePlugInInterfaceForService (hidDevice, kIOHIDDeviceUserClientTypeID,
-													kIOCFPlugInInterfaceID, &ppPlugInInterface, &score);
-		if (kIOReturnSuccess == result)
-		{
-			/* Call a method of the intermediate plug-in to create the device interface */
-			plugInResult = (*ppPlugInInterface)->QueryInterface (ppPlugInInterface,
-								CFUUIDGetUUIDBytes (kIOHIDDeviceInterfaceID), (void *) &(pDevice->interface));
-			if (S_OK != plugInResult)
-				HIDReportErrorNum ("Couldn�t query HID class device interface from plugInInterface", plugInResult);
-			(*ppPlugInInterface)->Release (ppPlugInInterface);
-		}
-		else
-			HIDReportErrorNum ("Failed to create **plugInInterface via IOCreatePlugInInterfaceForService.", result);
-	}
-	if (NULL != pDevice->interface)
-	{
-		result = (*(pDevice->interface))->open (pDevice->interface, 0);
-		if (kIOReturnSuccess != result)
-			HIDReportErrorNum ("Failed to open pDevice->interface via open.", result);
-		else
-			(*(pDevice->interface))->setRemovalCallback (pDevice->interface, HIDRemovalCallback, pDevice, pDevice);
-
-	}
-	return result;
-}
-
-/* Closes and releases interface to device, should be done prior to exting application
- * Note: will have no affect if device or interface do not exist
- * application will "own" the device if interface is not closed
- * (device may have to be plug and re-plugged in different location to get it working again without a restart)
- */
-
-static IOReturn HIDCloseReleaseInterface (recDevice *pDevice)
-{
-	IOReturn result = kIOReturnSuccess;
-	
-	if ((NULL != pDevice) && (NULL != pDevice->interface))
-	{
-		/* close the interface */
-		result = (*(pDevice->interface))->close (pDevice->interface);
-		if (kIOReturnNotOpen == result)
-		{
-			/* do nothing as device was not opened, thus can't be closed */
-		}
-		else if (kIOReturnSuccess != result)
-			HIDReportErrorNum ("Failed to close IOHIDDeviceInterface.", result);
-		/* release the interface */
-		result = (*(pDevice->interface))->Release (pDevice->interface);
-		if (kIOReturnSuccess != result)
-			HIDReportErrorNum ("Failed to release IOHIDDeviceInterface.", result);
-		pDevice->interface = NULL;
-	}	
-	return result;
-}
-
-/* extracts actual specific element information from each element CF dictionary entry */
-
-static void HIDGetElementInfo (CFTypeRef refElement, recElement *pElement)
-{
-	long number;
-	CFTypeRef refType;
-
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementCookieKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->cookie = (IOHIDElementCookie) number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementMinKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->minReport = pElement->min = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementMaxKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->maxReport = pElement->max = number;
-/*
-	TODO: maybe should handle the following stuff somehow?
-
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMinKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->scaledMin = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMaxKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->scaledMax = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementSizeKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->size = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsRelativeKey));
-	if (refType)
-		pElement->relative = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsWrappingKey));
-	if (refType)
-		pElement->wrapping = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsNonLinearKey));
-	if (refType)
-		pElement->nonLinear = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasPreferedStateKey));
-	if (refType)
-		pElement->preferredState = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasNullStateKey));
-	if (refType)
-		pElement->nullState = CFBooleanGetValue (refType);
-*/
-}			
-
-/* examines CF dictionary vlaue in device element hierarchy to determine if it is element of interest or a collection of more elements
- * if element of interest allocate storage, add to list and retrieve element specific info
- * if collection then pass on to deconstruction collection into additional individual elements
- */
-
-static void HIDAddElement (CFTypeRef refElement, recDevice* pDevice)
-{
-	recElement* element = NULL;
-	recElement** headElement = NULL;
-	long elementType, usagePage, usage;
-	CFTypeRef refElementType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementTypeKey));
-	CFTypeRef refUsagePage = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementUsagePageKey));
-	CFTypeRef refUsage = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementUsageKey));
-
-
-	if ((refElementType) && (CFNumberGetValue (refElementType, kCFNumberLongType, &elementType)))
-	{
-		/* look at types of interest */
-		if ((elementType == kIOHIDElementTypeInput_Misc) || (elementType == kIOHIDElementTypeInput_Button) ||
-			(elementType == kIOHIDElementTypeInput_Axis))
-		{
-			if (refUsagePage && CFNumberGetValue (refUsagePage, kCFNumberLongType, &usagePage) &&
-				refUsage && CFNumberGetValue (refUsage, kCFNumberLongType, &usage))
-			{
-				switch (usagePage) /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
-				{
-					case kHIDPage_GenericDesktop:
-						{
-							switch (usage) /* look at usage to determine function */
-							{
-								case kHIDUsage_GD_X:
-								case kHIDUsage_GD_Y:
-								case kHIDUsage_GD_Z:
-								case kHIDUsage_GD_Rx:
-								case kHIDUsage_GD_Ry:
-								case kHIDUsage_GD_Rz:
-								case kHIDUsage_GD_Slider:
-								case kHIDUsage_GD_Dial:
-								case kHIDUsage_GD_Wheel:
-									element = (recElement *) NewPtrClear (sizeof (recElement));
-									if (element)
-									{
-										pDevice->axes++;
-										headElement = &(pDevice->firstAxis);
-									}
-								break;
-								case kHIDUsage_GD_Hatswitch:
-									element = (recElement *) NewPtrClear (sizeof (recElement));
-									if (element)
-									{
-										pDevice->hats++;
-										headElement = &(pDevice->firstHat);
-									}
-								break;
-							}							
-						}
-						break;
-					case kHIDPage_Button:
-						element = (recElement *) NewPtrClear (sizeof (recElement));
-						if (element)
-						{
-							pDevice->buttons++;
-							headElement = &(pDevice->firstButton);
-						}
-						break;
-					default:
-						break;
-				}
-			}
-		}
-		else if (kIOHIDElementTypeCollection == elementType)
-			HIDGetCollectionElements ((CFMutableDictionaryRef) refElement, pDevice);
-	}
-
-	if (element && headElement) /* add to list */
-	{
-		pDevice->elements++;
-		if (NULL == *headElement)
-			*headElement = element;
-		else
-		{
-			recElement *elementPrevious, *elementCurrent;
-			elementCurrent = *headElement;
-			while (elementCurrent)
-			{
-				elementPrevious = elementCurrent;
-				elementCurrent = elementPrevious->pNext;
-			}
-			elementPrevious->pNext = element;
-		}
-		element->pNext = NULL;
-		HIDGetElementInfo (refElement, element);
-	}
-}
-
-/* collects information from each array member in device element list (each array memeber = element) */
-
-static void HIDGetElementsCFArrayHandler (const void * value, void * parameter)
-{
-	if (CFGetTypeID (value) == CFDictionaryGetTypeID ())
-		HIDAddElement ((CFTypeRef) value, (recDevice *) parameter);
-}
-
-/* handles retrieval of element information from arrays of elements in device IO registry information */
-
-static void HIDGetElements (CFTypeRef refElementCurrent, recDevice *pDevice)
-{
-	CFTypeID type = CFGetTypeID (refElementCurrent);
-	if (type == CFArrayGetTypeID()) /* if element is an array */
-	{
-		CFRange range = {0, CFArrayGetCount (refElementCurrent)};
-		/* CountElementsCFArrayHandler called for each array member */
-		CFArrayApplyFunction (refElementCurrent, range, HIDGetElementsCFArrayHandler, pDevice);
-	}
-}			
-
-/* handles extracting element information from element collection CF types
- * used from top level element decoding and hierarchy deconstruction to flatten device element list
- */
-
-static void HIDGetCollectionElements (CFMutableDictionaryRef deviceProperties, recDevice *pDevice)
-{
-	CFTypeRef refElementTop = CFDictionaryGetValue (deviceProperties, CFSTR(kIOHIDElementKey));
-	if (refElementTop)
-		HIDGetElements (refElementTop, pDevice);
-}
-
-/* use top level element usage page and usage to discern device usage page and usage setting appropriate vlaues in device record */
-
-static void HIDTopLevelElementHandler (const void * value, void * parameter)
-{
-	CFTypeRef refCF = 0;
-	if (CFGetTypeID (value) != CFDictionaryGetTypeID ())
-		return;
-	refCF = CFDictionaryGetValue (value, CFSTR(kIOHIDElementUsagePageKey));
-	if (!CFNumberGetValue (refCF, kCFNumberLongType, &((recDevice *) parameter)->usagePage))
-		SDL_SetError ("CFNumberGetValue error retrieving pDevice->usagePage.");
-	refCF = CFDictionaryGetValue (value, CFSTR(kIOHIDElementUsageKey));
-	if (!CFNumberGetValue (refCF, kCFNumberLongType, &((recDevice *) parameter)->usage))
-		SDL_SetError ("CFNumberGetValue error retrieving pDevice->usage.");
-}
-
-/* extracts device info from CF dictionary records in IO registry */
-
-static void HIDGetDeviceInfo (io_object_t hidDevice, CFMutableDictionaryRef hidProperties, recDevice *pDevice)
-{
-	CFMutableDictionaryRef usbProperties = 0;
-	io_registry_entry_t parent1, parent2;
-	
-	/* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
-	 * get dictionary for usb properties: step up two levels and get CF dictionary for USB properties
-	 */
-	if ((KERN_SUCCESS == IORegistryEntryGetParentEntry (hidDevice, kIOServicePlane, &parent1)) &&
-		(KERN_SUCCESS == IORegistryEntryGetParentEntry (parent1, kIOServicePlane, &parent2)) &&
-		(KERN_SUCCESS == IORegistryEntryCreateCFProperties (parent2, &usbProperties, kCFAllocatorDefault, kNilOptions)))
-	{
-		if (usbProperties)
-		{
-			CFTypeRef refCF = 0;
-			/* get device info
-			 * try hid dictionary first, if fail then go to usb dictionary
-			 */
-			
-			
-			/* get product name */
-			refCF = CFDictionaryGetValue (hidProperties, CFSTR(kIOHIDProductKey));
-			if (!refCF)
-				refCF = CFDictionaryGetValue (usbProperties, CFSTR("USB Product Name"));
-			if (refCF)
-			{
-				if (!CFStringGetCString (refCF, pDevice->product, 256, CFStringGetSystemEncoding ()))
-					SDL_SetError ("CFStringGetCString error retrieving pDevice->product.");
-			}
-			
-			/* get usage page and usage */
-			refCF = CFDictionaryGetValue (hidProperties, CFSTR(kIOHIDPrimaryUsagePageKey));
-			if (refCF)
-			{
-				if (!CFNumberGetValue (refCF, kCFNumberLongType, &pDevice->usagePage))
-					SDL_SetError ("CFNumberGetValue error retrieving pDevice->usagePage.");
-				refCF = CFDictionaryGetValue (hidProperties, CFSTR(kIOHIDPrimaryUsageKey));
-				if (refCF)
-					if (!CFNumberGetValue (refCF, kCFNumberLongType, &pDevice->usage))
-						SDL_SetError ("CFNumberGetValue error retrieving pDevice->usage.");
-			}
-
-			if (NULL == refCF) /* get top level element HID usage page or usage */
-			{
-				/* use top level element instead */
-				CFTypeRef refCFTopElement = 0;
-				refCFTopElement = CFDictionaryGetValue (hidProperties, CFSTR(kIOHIDElementKey));
-				{
-					/* refCFTopElement points to an array of element dictionaries */
-					CFRange range = {0, CFArrayGetCount (refCFTopElement)};
-					CFArrayApplyFunction (refCFTopElement, range, HIDTopLevelElementHandler, pDevice);
-				}
-			}
-
-			CFRelease (usbProperties);
-		}
-		else
-			SDL_SetError ("IORegistryEntryCreateCFProperties failed to create usbProperties.");
-
-		if (kIOReturnSuccess != IOObjectRelease (parent2))
-			SDL_SetError ("IOObjectRelease error with parent2.");
-		if (kIOReturnSuccess != IOObjectRelease (parent1))
-			SDL_SetError ("IOObjectRelease error with parent1.");
-	}
-}
-
-
-static recDevice *HIDBuildDevice (io_object_t hidDevice)
-{
-	recDevice *pDevice = (recDevice *) NewPtrClear (sizeof (recDevice));
-	if (pDevice)
-	{
-		/* get dictionary for HID properties */
-		CFMutableDictionaryRef hidProperties = 0;
-		kern_return_t result = IORegistryEntryCreateCFProperties (hidDevice, &hidProperties, kCFAllocatorDefault, kNilOptions);
-		if ((result == KERN_SUCCESS) && hidProperties)
-		{
-			/* create device interface */
-			result = HIDCreateOpenDeviceInterface (hidDevice, pDevice);
-			if (kIOReturnSuccess == result)
-			{
-				HIDGetDeviceInfo (hidDevice, hidProperties, pDevice); /* hidDevice used to find parents in registry tree */
-				HIDGetCollectionElements (hidProperties, pDevice);
-			}
-			else
-			{
-				DisposePtr((Ptr)pDevice);
-				pDevice = NULL;
-			}
-			CFRelease (hidProperties);
-		}
-		else
-		{
-			DisposePtr((Ptr)pDevice);
-			pDevice = NULL;
-		}
-	}
-	return pDevice;
-}
-
-/* disposes of the element list associated with a device and the memory associated with the list
- */
-
-static void HIDDisposeElementList (recElement **elementList)
-{
-	recElement *pElement = *elementList;
-	while (pElement)
-	{
-		recElement *pElementNext = pElement->pNext;
-		DisposePtr ((Ptr) pElement);
-		pElement = pElementNext;
-	}
-	*elementList = NULL;
-}
-
-/* disposes of a single device, closing and releaseing interface, freeing memory fro device and elements, setting device pointer to NULL
- * all your device no longer belong to us... (i.e., you do not 'own' the device anymore)
- */
-
-static recDevice *HIDDisposeDevice (recDevice **ppDevice)
-{
-	kern_return_t result = KERN_SUCCESS;
-	recDevice *pDeviceNext = NULL;
-	if (*ppDevice)
-	{
-		/* save next device prior to disposing of this device */
-		pDeviceNext = (*ppDevice)->pNext;
-		
-		/* free element lists */
-		HIDDisposeElementList (&(*ppDevice)->firstAxis);
-		HIDDisposeElementList (&(*ppDevice)->firstButton);
-		HIDDisposeElementList (&(*ppDevice)->firstHat);
-		
-		result = HIDCloseReleaseInterface (*ppDevice); /* function sanity checks interface value (now application does not own device) */
-		if (kIOReturnSuccess != result)
-			HIDReportErrorNum ("HIDCloseReleaseInterface failed when trying to dipose device.", result);
-		DisposePtr ((Ptr)*ppDevice);
-		*ppDevice = NULL;
-	}
-	return pDeviceNext;
-}
-
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-int SDL_SYS_JoystickInit(void)
-{
-	IOReturn result = kIOReturnSuccess;
-	mach_port_t masterPort = 0;
-	io_iterator_t hidObjectIterator = 0;
-	CFMutableDictionaryRef hidMatchDictionary = NULL;
-	recDevice *device, *lastDevice;
-	io_object_t ioHIDDeviceObject = 0;
-	
-	SDL_numjoysticks = 0;
-	
-	if (gpDeviceList)
-	{
-		SDL_SetError("Joystick: Device list already inited.");
-		return -1;
-	}
-	
-	result = IOMasterPort (bootstrap_port, &masterPort);
-	if (kIOReturnSuccess != result)
-	{
-		SDL_SetError("Joystick: IOMasterPort error with bootstrap_port.");
-		return -1;
-	}
-
-	/* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */
-	hidMatchDictionary = IOServiceMatching (kIOHIDDeviceKey);
-	if (hidMatchDictionary)
-	{
-		/* Add key for device type (joystick, in this case) to refine the matching dictionary. */
-		
-		/* NOTE: we now perform this filtering later
-		UInt32 usagePage = kHIDPage_GenericDesktop;
-		UInt32 usage = kHIDUsage_GD_Joystick;
-		CFNumberRef refUsage = NULL, refUsagePage = NULL;
-
-		refUsage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usage);
-		CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsageKey), refUsage);
-		refUsagePage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usagePage);
-		CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsagePageKey), refUsagePage);
-		*/
-	}
-	else
-	{
-		SDL_SetError("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
-		return -1;
-	}
-	
-	/*/ Now search I/O Registry for matching devices. */
-	result = IOServiceGetMatchingServices (masterPort, hidMatchDictionary, &hidObjectIterator);
-	/* Check for errors */
-	if (kIOReturnSuccess != result)
-	{
-		SDL_SetError("Joystick: Couldn't create a HID object iterator.");
-		return -1;
-	}
-	if (!hidObjectIterator) /* there are no joysticks */
-	{
-		gpDeviceList = NULL;
-		SDL_numjoysticks = 0;
-		return 0;
-	}
-	/* IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. */
-
-	/* build flat linked list of devices from device iterator */
-
-	gpDeviceList = lastDevice = NULL;
-	
-	while ((ioHIDDeviceObject = IOIteratorNext (hidObjectIterator)))
-	{
-		/* build a device record */
-		device = HIDBuildDevice (ioHIDDeviceObject);
-		if (!device)
-			continue;
-
-		/* dump device object, it is no longer needed */
-		result = IOObjectRelease (ioHIDDeviceObject);
-/*		if (KERN_SUCCESS != result)
-			HIDReportErrorNum ("IOObjectRelease error with ioHIDDeviceObject.", result);
-*/
-
-		/* Filter device list to non-keyboard/mouse stuff */ 
-		if ( (device->usagePage != kHIDPage_GenericDesktop) ||
-		     ((device->usage != kHIDUsage_GD_Joystick &&
-		      device->usage != kHIDUsage_GD_GamePad &&
-		      device->usage != kHIDUsage_GD_MultiAxisController)) ) {
-
-			/* release memory for the device */
-			HIDDisposeDevice (&device);
-			DisposePtr((Ptr)device);
-			continue;
-		}
-		
-		/* Add device to the end of the list */
-		if (lastDevice)
-			lastDevice->pNext = device;
-		else
-			gpDeviceList = device;
-		lastDevice = device;
-	}
-	result = IOObjectRelease (hidObjectIterator); /* release the iterator */
-
-	/* Count the total number of devices we found */
-	device = gpDeviceList;
-	while (device)
-	{
-		SDL_numjoysticks++;
-		device = device->pNext;
-	}
-	
-	return SDL_numjoysticks;
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *SDL_SYS_JoystickName(int jindex)
-{
-	recDevice *device = gpDeviceList;
-	
-	for (; jindex > 0; jindex--)
-		device = device->pNext;
-
-	return device->product;
-}
-
-/* Function to open a joystick for use.
- * The joystick to open is specified by the index field of the joystick.
- * This should fill the nbuttons and naxes fields of the joystick structure.
- * It returns 0, or -1 if there is an error.
- */
-int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
-{
-	recDevice *device = gpDeviceList;
-	int jindex;
-	
-	for (jindex = joystick->index; jindex > 0; jindex--)
-		device = device->pNext;
-
-	joystick->hwdata = device;
-	joystick->name = device->product;
-
-	joystick->naxes = device->axes;
-	joystick->nhats = device->hats;
-	joystick->nballs = 0;
-	joystick->nbuttons = device->buttons;
-
-	return 0;
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
-{
-	recDevice *device = joystick->hwdata;
-	recElement *element;
-	SInt32 value, range;
-	int i;
-
-	if (device->removed)  /* device was unplugged; ignore it. */
-	{
-		if (device->uncentered)
-		{
-			device->uncentered = 0;
-
-			/* Tell the app that everything is centered/unpressed... */
-			for (i = 0; i < device->axes; i++)
-				SDL_PrivateJoystickAxis(joystick, i, 0);
-
-			for (i = 0; i < device->buttons; i++)
-				SDL_PrivateJoystickButton(joystick, i, 0);
-
-			for (i = 0; i < device->hats; i++)
-				SDL_PrivateJoystickHat(joystick, i, SDL_HAT_CENTERED);
-		}
-
-		return;
-	}
-
-	element = device->firstAxis;
-	i = 0;
-	while (element)
-	{
-		value = HIDScaledCalibratedValue(device, element, -32768, 32767);
-		if ( value != joystick->axes[i] )
-			SDL_PrivateJoystickAxis(joystick, i, value);
-		element = element->pNext;
-		++i;
-	}
-	
-	element = device->firstButton;
-	i = 0;
-	while (element)
-	{
-		value = HIDGetElementValue(device, element);
-        if (value > 1)  /* handle pressure-sensitive buttons */
-            value = 1;
-		if ( value != joystick->buttons[i] )
-			SDL_PrivateJoystickButton(joystick, i, value);
-		element = element->pNext;
-		++i;
-	}
-	    
-	element = device->firstHat;
-	i = 0;
-	while (element)
-	{
-		Uint8 pos = 0;
-
-		range = (element->max - element->min + 1);
-		value = HIDGetElementValue(device, element) - element->min;
-		if (range == 4) /* 4 position hatswitch - scale up value */
-			value *= 2;
-		else if (range != 8) /* Neither a 4 nor 8 positions - fall back to default position (centered) */
-			value = -1;
-		switch(value)
-		{
-			case 0:
-				pos = SDL_HAT_UP;
-				break;
-			case 1:
-				pos = SDL_HAT_RIGHTUP;
-				break;
-			case 2:
-				pos = SDL_HAT_RIGHT;
-				break;
-			case 3:
-				pos = SDL_HAT_RIGHTDOWN;
-				break;
-			case 4:
-				pos = SDL_HAT_DOWN;
-				break;
-			case 5:
-				pos = SDL_HAT_LEFTDOWN;
-				break;
-			case 6:
-				pos = SDL_HAT_LEFT;
-				break;
-			case 7:
-				pos = SDL_HAT_LEFTUP;
-				break;
-			default:
-				/* Every other value is mapped to center. We do that because some
-				 * joysticks use 8 and some 15 for this value, and apparently
-				 * there are even more variants out there - so we try to be generous.
-				 */
-				pos = SDL_HAT_CENTERED;
-				break;
-		}
-		if ( pos != joystick->hats[i] )
-			SDL_PrivateJoystickHat(joystick, i, pos);
-		element = element->pNext;
-		++i;
-	}
-	
-	return;
-}
-
-/* Function to close a joystick after use */
-void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
-{
-	/* Should we do anything here? */
-	return;
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void SDL_SYS_JoystickQuit(void)
-{
-	while (NULL != gpDeviceList)
-		gpDeviceList = HIDDisposeDevice (&gpDeviceList);
-}
-
-#endif /* SDL_JOYSTICK_IOKIT */
diff --git a/Externals/SDL/src/joystick/dummy/SDL_sysjoystick.c b/Externals/SDL/src/joystick/dummy/SDL_sysjoystick.c
deleted file mode 100644
index 68713b676f..0000000000
--- a/Externals/SDL/src/joystick/dummy/SDL_sysjoystick.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#if defined(SDL_JOYSTICK_DUMMY) || defined(SDL_JOYSTICK_DISABLED)
-
-/* This is the system specific header for the SDL joystick API */
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks.  Joystick 0 should be the system default joystick.
- * It should return 0, or -1 on an unrecoverable fatal error.
- */
-int SDL_SYS_JoystickInit(void)
-{
-	SDL_numjoysticks = 0;
-	return(0);
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *SDL_SYS_JoystickName(int index)
-{
-	SDL_SetError("Logic error: No joysticks available");
-	return(NULL);
-}
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
-{
-	SDL_SetError("Logic error: No joysticks available");
-	return(-1);
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
-{
-	return;
-}
-
-/* Function to close a joystick after use */
-void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
-{
-	return;
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void SDL_SYS_JoystickQuit(void)
-{
-	return;
-}
-
-#endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
diff --git a/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c b/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
deleted file mode 100644
index e13c8cb115..0000000000
--- a/Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
+++ /dev/null
@@ -1,1202 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_LINUX
-
-/* This is the system specific header for the SDL joystick API */
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <limits.h>		/* For the definition of PATH_MAX */
-#include <linux/joystick.h>
-#if SDL_INPUT_LINUXEV
-#include <linux/input.h>
-#endif
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-/* Special joystick configurations */
-static struct {
-	const char *name;
-	int naxes;
-	int nhats;
-	int nballs;
-} special_joysticks[] = {
-	{ "MadCatz Panther XL", 3, 2, 1 }, /* We don't handle rudder (axis 8) */
-	{ "SideWinder Precision Pro", 4, 1, 0 },
-	{ "SideWinder 3D Pro", 4, 1, 0 },
-	{ "Microsoft SideWinder 3D Pro", 4, 1, 0 },
-	{ "Microsoft SideWinder Precision Pro", 4, 1, 0 },
-	{ "Microsoft SideWinder Dual Strike USB version 1.0", 2, 1, 0 },
-	{ "WingMan Interceptor", 3, 3, 0 },
-	{ "WingMan Extreme Digital 3D", 4, 1, 0 },
-	{ "Microsoft SideWinder Precision 2 Joystick", 4, 1, 0 },
-	{ "Logitech Inc. WingMan Extreme Digital 3D", 4, 1, 0 },
-	{ "Saitek Saitek X45", 6, 1, 0 }
-};
-
-/* It looks like newer kernels have the logical mapping at the driver level */
-#define NO_LOGICAL_JOYSTICKS
-
-#ifndef NO_LOGICAL_JOYSTICKS
-
-/*
-   Some USB HIDs show up as a single joystick even though they actually
-   control 2 or more joysticks.
-*/
-/*
-   This code handles the MP-8800 (Quad) and MP-8866 (Dual), which can
-   be identified by their transparent blue design. It's quite trivial
-   to add other joysticks with similar quirky behavior.
-   -id
-*/
-
-struct joystick_logical_mapping {
-        int njoy;
-        int nthing;
-};
-
-/*
-   {logical joy, logical axis},
-   {logical joy, logical hat},
-   {logical joy, logical ball},
-   {logical joy, logical button}
-*/
-
-static struct joystick_logical_mapping mp88xx_1_logical_axismap[] = {
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5}
-};
-static struct joystick_logical_mapping mp88xx_1_logical_buttonmap[] = {
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11}
-};
-
-static struct joystick_logical_mapping mp88xx_2_logical_axismap[] = {
-   {0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
-   {1,2},{1,3},{0,4},{0,5},{1,4},{1,5}
-};
-static struct joystick_logical_mapping mp88xx_2_logical_buttonmap[] = {
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11},
-   {1,0},{1,1},{1,2},{1,3},{1,4},{1,5},{1,6},{1,7},{1,8},{1,9},{1,10},{1,11}
-};
-
-static struct joystick_logical_mapping mp88xx_3_logical_axismap[] = {
-   {0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
-   {1,2},{1,3},{2,0},{2,1},{2,2},{2,3},
-   {0,4},{0,5},{1,4},{1,5},{2,4},{2,5}
-};
-static struct joystick_logical_mapping mp88xx_3_logical_buttonmap[] = {
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11},
-   {1,0},{1,1},{1,2},{1,3},{1,4},{1,5},{1,6},{1,7},{1,8},{1,9},{1,10},{1,11},
-   {2,0},{2,1},{2,2},{2,3},{2,4},{2,5},{2,6},{2,7},{2,8},{2,9},{2,10},{2,11}
-};
-
-static struct joystick_logical_mapping mp88xx_4_logical_axismap[] = {
-   {0,0},{0,1},{0,2},{1,0},{1,1},{0,3},
-   {1,2},{1,3},{2,0},{2,1},{2,2},{2,3},
-   {3,0},{3,1},{3,2},{3,3},{0,4},{0,5},
-   {1,4},{1,5},{2,4},{2,5},{3,4},{3,5}
-};
-static struct joystick_logical_mapping mp88xx_4_logical_buttonmap[] = {
-   {0,0},{0,1},{0,2},{0,3},{0,4},{0,5},{0,6},{0,7},{0,8},{0,9},{0,10},{0,11},
-   {1,0},{1,1},{1,2},{1,3},{1,4},{1,5},{1,6},{1,7},{1,8},{1,9},{1,10},{1,11},
-   {2,0},{2,1},{2,2},{2,3},{2,4},{2,5},{2,6},{2,7},{2,8},{2,9},{2,10},{2,11},
-   {3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,6},{3,7},{3,8},{3,9},{3,10},{3,11}
-};
-
-struct joystick_logical_layout {
-        int naxes;
-        int nhats;
-        int nballs;
-        int nbuttons;
-};
-
-static struct joystick_logical_layout mp88xx_1_logical_layout[] = {
-        {6, 0, 0, 12}
-};
-static struct joystick_logical_layout mp88xx_2_logical_layout[] = {
-        {6, 0, 0, 12},
-        {6, 0, 0, 12}
-};
-static struct joystick_logical_layout mp88xx_3_logical_layout[] = {
-        {6, 0, 0, 12},
-        {6, 0, 0, 12},
-        {6, 0, 0, 12}
-};
-static struct joystick_logical_layout mp88xx_4_logical_layout[] = {
-        {6, 0, 0, 12},
-        {6, 0, 0, 12},
-        {6, 0, 0, 12},
-        {6, 0, 0, 12}
-};
-
-/*
-   This array sets up a means of mapping a single physical joystick to
-   multiple logical joysticks. (djm)
-                                                                                
-   njoys
-        the number of logical joysticks
-                                                                                
-   layouts
-        an array of layout structures, one to describe each logical joystick
-                                                                                
-   axes, hats, balls, buttons
-        arrays that map a physical thingy to a logical thingy
- */
-struct joystick_logicalmap {
-        const char *name;
-	int nbuttons;
-        int njoys;
-        struct joystick_logical_layout *layout;
-        struct joystick_logical_mapping *axismap;
-        struct joystick_logical_mapping *hatmap;
-        struct joystick_logical_mapping *ballmap;
-        struct joystick_logical_mapping *buttonmap;
-};
-
-static struct joystick_logicalmap joystick_logicalmap[] = {
-        {
-		"WiseGroup.,Ltd MP-8866 Dual USB Joypad",
-		12,
-		1,
-		mp88xx_1_logical_layout,
-        	mp88xx_1_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_1_logical_buttonmap
-	},
-        {
-		"WiseGroup.,Ltd MP-8866 Dual USB Joypad",
-		24,
-		2,
-		mp88xx_2_logical_layout,
-        	mp88xx_2_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_2_logical_buttonmap
-	},
-        {
-		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
-		12,
-		1,
-		mp88xx_1_logical_layout,
-        	mp88xx_1_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_1_logical_buttonmap
-	},
-        {
-		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
-		24,
-		2,
-		mp88xx_2_logical_layout,
-        	mp88xx_2_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_2_logical_buttonmap
-	},
-        {
-		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
-		36,
-		3,
-		mp88xx_3_logical_layout,
-        	mp88xx_3_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_3_logical_buttonmap
-	},
-        {
-		"WiseGroup.,Ltd MP-8800 Quad USB Joypad",
-		48,
-		4,
-		mp88xx_4_logical_layout,
-        	mp88xx_4_logical_axismap,
-		NULL,
-		NULL,
-        	mp88xx_4_logical_buttonmap
-	}
-};
-
-/* find the head of a linked list, given a point in it
- */
-#define SDL_joylist_head(i, start)\
-        for(i = start; SDL_joylist[i].fname == NULL;) i = SDL_joylist[i].prev;
-
-#define SDL_logical_joydecl(d) d
-
-
-#else
-
-#define SDL_logical_joydecl(d)
-
-#endif /* USE_LOGICAL_JOYSTICKS */
-
-/* The maximum number of joysticks we'll detect */
-#define MAX_JOYSTICKS	32
-
-/* A list of available joysticks */
-static struct
-{
-        char* fname;
-#ifndef NO_LOGICAL_JOYSTICKS
-        SDL_Joystick* joy;
-        struct joystick_logicalmap* map;
-        int prev;
-        int next;
-        int logicalno;
-#endif /* USE_LOGICAL_JOYSTICKS */
-} SDL_joylist[MAX_JOYSTICKS];
-
-
-/* The private structure used to keep track of a joystick */
-struct joystick_hwdata {
-	int fd;
-	/* The current linux joystick driver maps hats to two axes */
-	struct hwdata_hat {
-		int axis[2];
-	} *hats;
-	/* The current linux joystick driver maps balls to two axes */
-	struct hwdata_ball {
-		int axis[2];
-	} *balls;
-
-	/* Support for the Linux 2.4 unified input interface */
-#if SDL_INPUT_LINUXEV
-	SDL_bool is_hid;
-	Uint8 key_map[KEY_MAX-BTN_MISC];
-	Uint8 abs_map[ABS_MAX];
-	struct axis_correct {
-		int used;
-		int coef[3];
-	} abs_correct[ABS_MAX];
-#endif
-};
-
-
-#ifndef NO_LOGICAL_JOYSTICKS
-
-static int CountLogicalJoysticks(int max)
-{
-   register int i, j, k, ret, prev;
-   const char* name;
-   int nbuttons, fd;
-   unsigned char n;
-
-   ret = 0;
-
-   for(i = 0; i < max; i++) {
-      name = SDL_SYS_JoystickName(i);
-	
-      fd = open(SDL_joylist[i].fname, O_RDONLY, 0);
-      if ( fd >= 0 ) {
-	 if ( ioctl(fd, JSIOCGBUTTONS, &n) < 0 ) {
-	    nbuttons = -1;
-	 } else {
-            nbuttons = n;
-	 }
-	 close(fd);
-      }
-      else {
-	 nbuttons=-1;
-      }
-
-      if (name) {
-         for(j = 0; j < SDL_arraysize(joystick_logicalmap); j++) {
-            if (!SDL_strcmp(name, joystick_logicalmap[j].name) && (nbuttons==-1 || nbuttons==joystick_logicalmap[j].nbuttons)) {
-               prev = i;
-               SDL_joylist[prev].map = &(joystick_logicalmap[j]);
-
-               for(k = 1; k < joystick_logicalmap[j].njoys; k++) {
-                  SDL_joylist[prev].next = max + ret;
-                  SDL_joylist[max+ret].prev = prev;
-		  
-                  prev = max + ret;
-                  SDL_joylist[prev].logicalno = k;
-                  SDL_joylist[prev].map = &(joystick_logicalmap[j]);
-                  ret++;
-               }
-
-               break;
-            }
-         }
-      }
-   }
-
-   return ret;
-}
-
-static void LogicalSuffix(int logicalno, char* namebuf, int len)
-{
-   register int slen;
-   const static char suffixs[] =
-      "01020304050607080910111213141516171819"
-      "20212223242526272829303132";
-   const char* suffix;
-   slen = SDL_strlen(namebuf);
-   suffix = NULL;
-
-   if (logicalno*2<sizeof(suffixs))
-      suffix = suffixs + (logicalno*2);
-
-   if (slen + 4 < len && suffix) {
-      namebuf[slen++] = ' ';
-      namebuf[slen++] = '#';
-      namebuf[slen++] = suffix[0];
-      namebuf[slen++] = suffix[1];
-      namebuf[slen++] = 0;
-   }
-}
-
-#endif /* USE_LOGICAL_JOYSTICKS */
-
-#if SDL_INPUT_LINUXEV
-#define test_bit(nr, addr) \
-	(((1UL << ((nr) % (sizeof(long) * 8))) & ((addr)[(nr) / (sizeof(long) * 8)])) != 0)
-#define NBITS(x) ((((x)-1)/(sizeof(long) * 8))+1)
-
-static int EV_IsJoystick(int fd)
-{
-	unsigned long evbit[NBITS(EV_MAX)] = { 0 };
-	unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
-	unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
-
-	if ( (ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
-	     (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
-	     (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0) ) {
-		return(0);
-	}
-	if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) &&
-	      test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit) &&
-	     (test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_A, keybit) || test_bit(BTN_1, keybit)))) return 0;
-	return(1);
-}
-
-#endif /* SDL_INPUT_LINUXEV */
-
-/* Function to scan the system for joysticks */
-int SDL_SYS_JoystickInit(void)
-{
-	/* The base path of the joystick devices */
-	const char *joydev_pattern[] = {
-#if SDL_INPUT_LINUXEV
-		"/dev/input/event%d",
-#endif
-		"/dev/input/js%d",
-		"/dev/js%d"
-	};
-	int numjoysticks;
-	int i, j;
-	int fd;
-	char path[PATH_MAX];
-	dev_t dev_nums[MAX_JOYSTICKS];  /* major/minor device numbers */
-	struct stat sb;
-	int n, duplicate;
-
-	numjoysticks = 0;
-
-	/* First see if the user specified a joystick to use */
-	if ( SDL_getenv("SDL_JOYSTICK_DEVICE") != NULL ) {
-		SDL_strlcpy(path, SDL_getenv("SDL_JOYSTICK_DEVICE"), sizeof(path));
-		if ( stat(path, &sb) == 0 ) {
-			fd = open(path, O_RDONLY, 0);
-			if ( fd >= 0 ) {
-				/* Assume the user knows what they're doing. */
-				SDL_joylist[numjoysticks].fname = SDL_strdup(path);
-				if ( SDL_joylist[numjoysticks].fname ) {
-					dev_nums[numjoysticks] = sb.st_rdev;
-					++numjoysticks;
-				}
-				close(fd);
-			}
-		}
-	}
-
-	for ( i=0; i<SDL_arraysize(joydev_pattern); ++i ) {
-		for ( j=0; j < MAX_JOYSTICKS; ++j ) {
-			SDL_snprintf(path, SDL_arraysize(path), joydev_pattern[i], j);
-
-			/* rcg06302000 replaced access(F_OK) call with stat().
-			 * stat() will fail if the file doesn't exist, so it's
-			 * equivalent behaviour.
-			 */
-			if ( stat(path, &sb) == 0 ) {
-				/* Check to make sure it's not already in list.
-				 * This happens when we see a stick via symlink.
-				 */
-				duplicate = 0;
-				for (n=0; (n<numjoysticks) && !duplicate; ++n) {
-					if ( sb.st_rdev == dev_nums[n] ) {
-						duplicate = 1;
-					}
-				}
-				if (duplicate) {
-					continue;
-				}
-
-				fd = open(path, O_RDONLY, 0);
-				if ( fd < 0 ) {
-					continue;
-				}
-#if SDL_INPUT_LINUXEV
-#ifdef DEBUG_INPUT_EVENTS
-				printf("Checking %s\n", path);
-#endif
-				if ( (i == 0) && ! EV_IsJoystick(fd) ) {
-					close(fd);
-					continue;
-				}
-#endif
-				close(fd);
-
-				/* We're fine, add this joystick */
-				SDL_joylist[numjoysticks].fname = SDL_strdup(path);
-				if ( SDL_joylist[numjoysticks].fname ) {
-					dev_nums[numjoysticks] = sb.st_rdev;
-					++numjoysticks;
-				}
-			}
-		}
-
-#if SDL_INPUT_LINUXEV
-		/* This is a special case...
-		   If the event devices are valid then the joystick devices
-		   will be duplicates but without extra information about their
-		   hats or balls. Unfortunately, the event devices can't
-		   currently be calibrated, so it's a win-lose situation.
-		   So : /dev/input/eventX = /dev/input/jsY = /dev/jsY
-		*/
-		if ( (i == 0) && (numjoysticks > 0) )
-			break;
-#endif
-	}
-#ifndef NO_LOGICAL_JOYSTICKS
-	numjoysticks += CountLogicalJoysticks(numjoysticks);
-#endif
-
-	return(numjoysticks);
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *SDL_SYS_JoystickName(int jindex)
-{
-	int fd;
-	static char namebuf[128];
-	char *name;
-	SDL_logical_joydecl(int oindex = jindex);
-
-#ifndef NO_LOGICAL_JOYSTICKS
-	SDL_joylist_head(jindex, jindex);
-#endif
-	name = NULL;
-	fd = open(SDL_joylist[jindex].fname, O_RDONLY, 0);
-	if ( fd >= 0 ) {
-		if ( 
-#if SDL_INPUT_LINUXEV
-		     (ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) &&
-#endif
-		     (ioctl(fd, JSIOCGNAME(sizeof(namebuf)), namebuf) <= 0) ) {
-			name = SDL_joylist[jindex].fname;
-		} else {
-			name = namebuf;
-		}
-		close(fd);
-
-
-#ifndef NO_LOGICAL_JOYSTICKS
-		if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || jindex!=oindex)
-		{
-       		   LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128);
-		}
-#endif
-	}
-	return name;
-}
-
-static int allocate_hatdata(SDL_Joystick *joystick)
-{
-	int i;
-
-	joystick->hwdata->hats = (struct hwdata_hat *)SDL_malloc(
-		joystick->nhats * sizeof(struct hwdata_hat));
-	if ( joystick->hwdata->hats == NULL ) {
-		return(-1);
-	}
-	for ( i=0; i<joystick->nhats; ++i ) {
-		joystick->hwdata->hats[i].axis[0] = 1;
-		joystick->hwdata->hats[i].axis[1] = 1;
-	}
-	return(0);
-}
-
-static int allocate_balldata(SDL_Joystick *joystick)
-{
-	int i;
-
-	joystick->hwdata->balls = (struct hwdata_ball *)SDL_malloc(
-		joystick->nballs * sizeof(struct hwdata_ball));
-	if ( joystick->hwdata->balls == NULL ) {
-		return(-1);
-	}
-	for ( i=0; i<joystick->nballs; ++i ) {
-		joystick->hwdata->balls[i].axis[0] = 0;
-		joystick->hwdata->balls[i].axis[1] = 0;
-	}
-	return(0);
-}
-
-static SDL_bool JS_ConfigJoystick(SDL_Joystick *joystick, int fd)
-{
-	SDL_bool handled;
-	unsigned char n;
-	int old_axes, tmp_naxes, tmp_nhats, tmp_nballs;
-	const char *name;
-	char *env, env_name[128];
-	int i;
-
-	handled = SDL_FALSE;
-
-	/* Default joystick device settings */
-	if ( ioctl(fd, JSIOCGAXES, &n) < 0 ) {
-		joystick->naxes = 2;
-	} else {
-		joystick->naxes = n;
-	}
-	if ( ioctl(fd, JSIOCGBUTTONS, &n) < 0 ) {
-		joystick->nbuttons = 2;
-	} else {
-		joystick->nbuttons = n;
-	}
-
-	name = SDL_SYS_JoystickName(joystick->index);
-	old_axes = joystick->naxes;
-
-	/* Generic analog joystick support */
-	if ( SDL_strstr(name, "Analog") == name && SDL_strstr(name, "-hat") ) {
-		if ( SDL_sscanf(name,"Analog %d-axis %*d-button %d-hat",
-			&tmp_naxes, &tmp_nhats) == 2 ) {
-
-			joystick->naxes = tmp_naxes;
-			joystick->nhats = tmp_nhats;
-
-			handled = SDL_TRUE;
-		}
-	}
-
-	/* Special joystick support */
-	for ( i=0; i < SDL_arraysize(special_joysticks); ++i ) {
-		if ( SDL_strcmp(name, special_joysticks[i].name) == 0 ) {
-
-			joystick->naxes = special_joysticks[i].naxes;
-			joystick->nhats = special_joysticks[i].nhats;
-			joystick->nballs = special_joysticks[i].nballs;
-
-			handled = SDL_TRUE;
-			break;
-		}
-	}
-
-	/* User environment joystick support */
-	if ( (env = SDL_getenv("SDL_LINUX_JOYSTICK")) ) {
-		*env_name = '\0';
-		if ( *env == '\'' && SDL_sscanf(env, "'%[^']s'", env_name) == 1 )
-			env += SDL_strlen(env_name)+2;
-		else if ( SDL_sscanf(env, "%s", env_name) == 1 )
-			env += SDL_strlen(env_name);
-
-		if ( SDL_strcmp(name, env_name) == 0 ) {
-
-			if ( SDL_sscanf(env, "%d %d %d", &tmp_naxes, &tmp_nhats,
-				&tmp_nballs) == 3 ) {
-
-				joystick->naxes = tmp_naxes;
-				joystick->nhats = tmp_nhats;
-				joystick->nballs = tmp_nballs;
-
-				handled = SDL_TRUE;
-			}
-		}
-	}
-
-	/* Remap hats and balls */
-	if (handled) {
-		if ( joystick->nhats > 0 ) {
-			if ( allocate_hatdata(joystick) < 0 ) {
-				joystick->nhats = 0;
-			}
-		}
-		if ( joystick->nballs > 0 ) {
-			if ( allocate_balldata(joystick) < 0 ) {
-				joystick->nballs = 0;
-			}
-		}
-	}
-
-	return(handled);
-}
-
-#if SDL_INPUT_LINUXEV
-
-static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
-{
-	int i, t;
-	unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
-	unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
-	unsigned long relbit[NBITS(REL_MAX)] = { 0 };
-
-	/* See if this device uses the new unified event API */
-	if ( (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) >= 0) &&
-	     (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
-	     (ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relbit)), relbit) >= 0) ) {
-		joystick->hwdata->is_hid = SDL_TRUE;
-
-		/* Get the number of buttons, axes, and other thingamajigs */
-		for ( i=BTN_JOYSTICK; i < KEY_MAX; ++i ) {
-			if ( test_bit(i, keybit) ) {
-#ifdef DEBUG_INPUT_EVENTS
-				printf("Joystick has button: 0x%x\n", i);
-#endif
-				joystick->hwdata->key_map[i-BTN_MISC] =
-						joystick->nbuttons;
-				++joystick->nbuttons;
-			}
-		}
-		for ( i=BTN_MISC; i < BTN_JOYSTICK; ++i ) {
-			if ( test_bit(i, keybit) ) {
-#ifdef DEBUG_INPUT_EVENTS
-				printf("Joystick has button: 0x%x\n", i);
-#endif
-				joystick->hwdata->key_map[i-BTN_MISC] =
-						joystick->nbuttons;
-				++joystick->nbuttons;
-			}
-		}
-		for ( i=0; i<ABS_MAX; ++i ) {
-			/* Skip hats */
-			if ( i == ABS_HAT0X ) {
-				i = ABS_HAT3Y;
-				continue;
-			}
-			if ( test_bit(i, absbit) ) {
-				int values[5];
-
-				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
-					continue;
-#ifdef DEBUG_INPUT_EVENTS
-				printf("Joystick has absolute axis: %x\n", i);
-				printf("Values = { %d, %d, %d, %d, %d }\n",
-					values[0], values[1],
-					values[2], values[3], values[4]);
-#endif /* DEBUG_INPUT_EVENTS */
-				joystick->hwdata->abs_map[i] = joystick->naxes;
-				if ( values[1] == values[2] ) {
-				    joystick->hwdata->abs_correct[i].used = 0;
-				} else {
-				    joystick->hwdata->abs_correct[i].used = 1;
-				    joystick->hwdata->abs_correct[i].coef[0] =
-					(values[2] + values[1]) / 2 - values[4];
-				    joystick->hwdata->abs_correct[i].coef[1] =
-					(values[2] + values[1]) / 2 + values[4];
-				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
-				    if ( t != 0 ) {
-					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
-				    } else {
-					joystick->hwdata->abs_correct[i].coef[2] = 0;
-				    }
-				}
-				++joystick->naxes;
-			}
-		}
-		for ( i=ABS_HAT0X; i <= ABS_HAT3Y; i += 2 ) {
-			if ( test_bit(i, absbit) || test_bit(i+1, absbit) ) {
-#ifdef DEBUG_INPUT_EVENTS
-				printf("Joystick has hat %d\n",(i-ABS_HAT0X)/2);
-#endif
-				++joystick->nhats;
-			}
-		}
-		if ( test_bit(REL_X, relbit) || test_bit(REL_Y, relbit) ) {
-			++joystick->nballs;
-		}
-
-		/* Allocate data to keep track of these thingamajigs */
-		if ( joystick->nhats > 0 ) {
-			if ( allocate_hatdata(joystick) < 0 ) {
-				joystick->nhats = 0;
-			}
-		}
-		if ( joystick->nballs > 0 ) {
-			if ( allocate_balldata(joystick) < 0 ) {
-				joystick->nballs = 0;
-			}
-		}
-	}
-	return(joystick->hwdata->is_hid);
-}
-
-#endif /* SDL_INPUT_LINUXEV */
-
-#ifndef NO_LOGICAL_JOYSTICKS
-static void ConfigLogicalJoystick(SDL_Joystick *joystick)
-{
-        struct joystick_logical_layout* layout;
-                                                                                
-        layout = SDL_joylist[joystick->index].map->layout +
-                SDL_joylist[joystick->index].logicalno;
-                                                                                
-        joystick->nbuttons = layout->nbuttons;
-        joystick->nhats = layout->nhats;
-        joystick->naxes = layout->naxes;
-        joystick->nballs = layout->nballs;
-}
-#endif
-
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
-{
-	int fd;
-	SDL_logical_joydecl(int realindex);
-	SDL_logical_joydecl(SDL_Joystick *realjoy = NULL);
-
-	/* Open the joystick and set the joystick file descriptor */
-#ifndef NO_LOGICAL_JOYSTICKS
-	if (SDL_joylist[joystick->index].fname == NULL) {
-		SDL_joylist_head(realindex, joystick->index);
-		realjoy = SDL_JoystickOpen(realindex);
-
-		if (realjoy == NULL)
-			return(-1);
-                                                                                
-		fd = realjoy->hwdata->fd;
-
-	} else {
-		fd = open(SDL_joylist[joystick->index].fname, O_RDONLY, 0);
-	}
-	SDL_joylist[joystick->index].joy = joystick;
-#else
-	fd = open(SDL_joylist[joystick->index].fname, O_RDONLY, 0);
-#endif
-
-	if ( fd < 0 ) {
-		SDL_SetError("Unable to open %s\n",
-		             SDL_joylist[joystick->index]);
-		return(-1);
-	}
-	joystick->hwdata = (struct joystick_hwdata *)
-	                   SDL_malloc(sizeof(*joystick->hwdata));
-	if ( joystick->hwdata == NULL ) {
-		SDL_OutOfMemory();
-		close(fd);
-		return(-1);
-	}
-	SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
-	joystick->hwdata->fd = fd;
-
-	/* Set the joystick to non-blocking read mode */
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-
-	/* Get the number of buttons and axes on the joystick */
-#ifndef NO_LOGICAL_JOYSTICKS
-	if (realjoy)
-		ConfigLogicalJoystick(joystick);
-	else
-#endif
-#if SDL_INPUT_LINUXEV
-	if ( ! EV_ConfigJoystick(joystick, fd) )
-#endif
-		JS_ConfigJoystick(joystick, fd);
-
-	return(0);
-}
-
-#ifndef NO_LOGICAL_JOYSTICKS
-
-static SDL_Joystick* FindLogicalJoystick(
-   SDL_Joystick *joystick, struct joystick_logical_mapping* v)
-{
-        SDL_Joystick *logicaljoy;
-        register int i;
-
-        i = joystick->index;
-        logicaljoy = NULL;
-
-        /* get the fake joystick that will receive the event
-         */
-        for(;;) {
-
-           if (SDL_joylist[i].logicalno == v->njoy) {
-              logicaljoy = SDL_joylist[i].joy;
-              break;
-           }
-
-           if (SDL_joylist[i].next == 0)
-              break;
-
-           i = SDL_joylist[i].next;
-
-        }
-
-        return logicaljoy;
-}
-
-static int LogicalJoystickButton(
-   SDL_Joystick *joystick, Uint8 button, Uint8 state){
-        struct joystick_logical_mapping* buttons;
-        SDL_Joystick *logicaljoy = NULL;
-
-        /* if there's no map then this is just a regular joystick
-         */
-        if (SDL_joylist[joystick->index].map == NULL)
-           return 0;
-
-        /* get the logical joystick that will receive the event
-         */
-        buttons = SDL_joylist[joystick->index].map->buttonmap+button;
-        logicaljoy = FindLogicalJoystick(joystick, buttons);
-
-        if (logicaljoy == NULL)
-           return 1;
-
-        SDL_PrivateJoystickButton(logicaljoy, buttons->nthing, state);
-
-        return 1;
-}
-
-static int LogicalJoystickAxis(
-	SDL_Joystick *joystick, Uint8 axis, Sint16 value)
-{
-        struct joystick_logical_mapping* axes;
-        SDL_Joystick *logicaljoy = NULL;
-
-        /* if there's no map then this is just a regular joystick
-         */
-        if (SDL_joylist[joystick->index].map == NULL)
-           return 0;
-
-        /* get the logical joystick that will receive the event
-         */
-        axes = SDL_joylist[joystick->index].map->axismap+axis;
-        logicaljoy = FindLogicalJoystick(joystick, axes);
-
-        if (logicaljoy == NULL)
-           return 1;
-
-        SDL_PrivateJoystickAxis(logicaljoy, axes->nthing, value);
-
-        return 1;
-}
-#endif /* USE_LOGICAL_JOYSTICKS */
-
-static __inline__
-void HandleHat(SDL_Joystick *stick, Uint8 hat, int axis, int value)
-{
-	struct hwdata_hat *the_hat;
-	const Uint8 position_map[3][3] = {
-		{ SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP },
-		{ SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT },
-		{ SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN }
-	};
-	SDL_logical_joydecl(SDL_Joystick *logicaljoy = NULL);
-	SDL_logical_joydecl(struct joystick_logical_mapping* hats = NULL);
-
-	the_hat = &stick->hwdata->hats[hat];
-	if ( value < 0 ) {
-		value = 0;
-	} else
-	if ( value == 0 ) {
-		value = 1;
-	} else
-	if ( value > 0 ) {
-		value = 2;
-	}
-	if ( value != the_hat->axis[axis] ) {
-		the_hat->axis[axis] = value;
-
-#ifndef NO_LOGICAL_JOYSTICKS
-		/* if there's no map then this is just a regular joystick
-		*/
-		if (SDL_joylist[stick->index].map != NULL) {
-
-			/* get the fake joystick that will receive the event
-			*/
-			hats = SDL_joylist[stick->index].map->hatmap+hat;
-			logicaljoy = FindLogicalJoystick(stick, hats);
-		}
-
-		if (logicaljoy) {
-			stick = logicaljoy;
-			hat = hats->nthing;
-		}
-#endif /* USE_LOGICAL_JOYSTICKS */
-
-		SDL_PrivateJoystickHat(stick, hat,
-			position_map[the_hat->axis[1]][the_hat->axis[0]]);
-	}
-}
-
-static __inline__
-void HandleBall(SDL_Joystick *stick, Uint8 ball, int axis, int value)
-{
-	stick->hwdata->balls[ball].axis[axis] += value;
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-static __inline__ void JS_HandleEvents(SDL_Joystick *joystick)
-{
-	struct js_event events[32];
-	int i, len;
-	Uint8 other_axis;
-
-#ifndef NO_LOGICAL_JOYSTICKS
-	if (SDL_joylist[joystick->index].fname == NULL) {
-		SDL_joylist_head(i, joystick->index);
-		JS_HandleEvents(SDL_joylist[i].joy);
-		return;
-	}
-#endif
-
-	while ((len=read(joystick->hwdata->fd, events, (sizeof events))) > 0) {
-		len /= sizeof(events[0]);
-		for ( i=0; i<len; ++i ) {
-			switch (events[i].type & ~JS_EVENT_INIT) {
-			    case JS_EVENT_AXIS:
-				if ( events[i].number < joystick->naxes ) {
-#ifndef NO_LOGICAL_JOYSTICKS
-					if (!LogicalJoystickAxis(joystick,
-				           events[i].number, events[i].value))
-#endif
-					SDL_PrivateJoystickAxis(joystick,
-				           events[i].number, events[i].value);
-					break;
-				}
-				events[i].number -= joystick->naxes;
-				other_axis = (events[i].number / 2);
-				if ( other_axis < joystick->nhats ) {
-					HandleHat(joystick, other_axis,
-						events[i].number%2,
-						events[i].value);
-					break;
-				}
-				events[i].number -= joystick->nhats*2;
-				other_axis = (events[i].number / 2);
-				if ( other_axis < joystick->nballs ) {
-					HandleBall(joystick, other_axis,
-						events[i].number%2,
-						events[i].value);
-					break;
-				}
-				break;
-			    case JS_EVENT_BUTTON:
-#ifndef NO_LOGICAL_JOYSTICKS
-				if (!LogicalJoystickButton(joystick,
-				           events[i].number, events[i].value))
-#endif
-				SDL_PrivateJoystickButton(joystick,
-				           events[i].number, events[i].value);
-				break;
-			    default:
-				/* ?? */
-				break;
-			}
-		}
-	}
-}
-#if SDL_INPUT_LINUXEV
-static __inline__ int EV_AxisCorrect(SDL_Joystick *joystick, int which, int value)
-{
-	struct axis_correct *correct;
-
-	correct = &joystick->hwdata->abs_correct[which];
-	if ( correct->used ) {
-		if ( value > correct->coef[0] ) {
-			if ( value < correct->coef[1] ) {
-				return 0;
-			}
-			value -= correct->coef[1];
-		} else {
-			value -= correct->coef[0];
-		}
-		value *= correct->coef[2];
-		value >>= 14;
-	}
-
-	/* Clamp and return */
-	if ( value < -32768 ) return -32768;
-	if ( value >  32767 ) return  32767;
-
-	return value;
-}
-
-static __inline__ void EV_HandleEvents(SDL_Joystick *joystick)
-{
-	struct input_event events[32];
-	int i, len;
-	int code;
-
-#ifndef NO_LOGICAL_JOYSTICKS
-	if (SDL_joylist[joystick->index].fname == NULL) {
-		SDL_joylist_head(i, joystick->index);
-		return EV_HandleEvents(SDL_joylist[i].joy);
-	}
-#endif
-
-	while ((len=read(joystick->hwdata->fd, events, (sizeof events))) > 0) {
-		len /= sizeof(events[0]);
-		for ( i=0; i<len; ++i ) {
-			code = events[i].code;
-			switch (events[i].type) {
-			    case EV_KEY:
-				if ( code >= BTN_MISC ) {
-					code -= BTN_MISC;
-#ifndef NO_LOGICAL_JOYSTICKS
-					if (!LogicalJoystickButton(joystick,
-				           joystick->hwdata->key_map[code],
-					   events[i].value))
-#endif
-					SDL_PrivateJoystickButton(joystick,
-				           joystick->hwdata->key_map[code],
-					   events[i].value);
-				}
-				break;
-			    case EV_ABS:
-				switch (code) {
-				    case ABS_HAT0X:
-				    case ABS_HAT0Y:
-				    case ABS_HAT1X:
-				    case ABS_HAT1Y:
-				    case ABS_HAT2X:
-				    case ABS_HAT2Y:
-				    case ABS_HAT3X:
-				    case ABS_HAT3Y:
-					code -= ABS_HAT0X;
-					HandleHat(joystick, code/2, code%2,
-							events[i].value);
-					break;
-				    default:
-					events[i].value = EV_AxisCorrect(joystick, code, events[i].value);
-#ifndef NO_LOGICAL_JOYSTICKS
-					if (!LogicalJoystickAxis(joystick,
-				           joystick->hwdata->abs_map[code],
-					   events[i].value))
-#endif
-					SDL_PrivateJoystickAxis(joystick,
-				           joystick->hwdata->abs_map[code],
-					   events[i].value);
-					break;
-				}
-				break;
-			    case EV_REL:
-				switch (code) {
-				    case REL_X:
-				    case REL_Y:
-					code -= REL_X;
-					HandleBall(joystick, code/2, code%2,
-							events[i].value);
-					break;
-				    default:
-					break;
-				}
-				break;
-			    default:
-				break;
-			}
-		}
-	}
-}
-#endif /* SDL_INPUT_LINUXEV */
-
-void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
-{
-	int i;
-	
-#if SDL_INPUT_LINUXEV
-	if ( joystick->hwdata->is_hid )
-		EV_HandleEvents(joystick);
-	else
-#endif
-		JS_HandleEvents(joystick);
-
-	/* Deliver ball motion updates */
-	for ( i=0; i<joystick->nballs; ++i ) {
-		int xrel, yrel;
-
-		xrel = joystick->hwdata->balls[i].axis[0];
-		yrel = joystick->hwdata->balls[i].axis[1];
-		if ( xrel || yrel ) {
-			joystick->hwdata->balls[i].axis[0] = 0;
-			joystick->hwdata->balls[i].axis[1] = 0;
-			SDL_PrivateJoystickBall(joystick, (Uint8)i, xrel, yrel);
-		}
-	}
-}
-
-/* Function to close a joystick after use */
-void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
-{
-#ifndef NO_LOGICAL_JOYSTICKS
-	register int i;
-	if (SDL_joylist[joystick->index].fname == NULL) {
-		SDL_joylist_head(i, joystick->index);
-		SDL_JoystickClose(SDL_joylist[i].joy);
-	}
-#endif
-
-	if ( joystick->hwdata ) {
-#ifndef NO_LOGICAL_JOYSTICKS
-		if (SDL_joylist[joystick->index].fname != NULL)
-#endif
-		close(joystick->hwdata->fd);
-		if ( joystick->hwdata->hats ) {
-			SDL_free(joystick->hwdata->hats);
-		}
-		if ( joystick->hwdata->balls ) {
-			SDL_free(joystick->hwdata->balls);
-		}
-		SDL_free(joystick->hwdata);
-		joystick->hwdata = NULL;
-	}
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void SDL_SYS_JoystickQuit(void)
-{
-	int i;
-
-	for ( i=0; SDL_joylist[i].fname; ++i ) {
-		SDL_free(SDL_joylist[i].fname);
-		SDL_joylist[i].fname = NULL;
-	}
-}
-
-#endif /* SDL_JOYSTICK_LINUX */
diff --git a/Externals/SDL/src/joystick/win32/SDL_mmjoystick.c b/Externals/SDL/src/joystick/win32/SDL_mmjoystick.c
deleted file mode 100644
index 485d3c2d57..0000000000
--- a/Externals/SDL/src/joystick/win32/SDL_mmjoystick.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_WINMM
-
-/* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-#include <regstr.h>
-
-#include "SDL_events.h"
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-
-#define MAX_JOYSTICKS	16
-#define MAX_AXES	6	/* each joystick can have up to 6 axes */
-#define MAX_BUTTONS	32	/* and 32 buttons                      */
-#define AXIS_MIN	-32768  /* minimum value for axis coordinate */
-#define AXIS_MAX	32767   /* maximum value for axis coordinate */
-/* limit axis to 256 possible positions to filter out noise */
-#define JOY_AXIS_THRESHOLD      (((AXIS_MAX)-(AXIS_MIN))/256)
-#define JOY_BUTTON_FLAG(n)	(1<<n)
-
-
-/* array to hold joystick ID values */
-static UINT	SYS_JoystickID[MAX_JOYSTICKS];
-static JOYCAPS	SYS_Joystick[MAX_JOYSTICKS];
-static char	*SYS_JoystickName[MAX_JOYSTICKS];
-
-/* The private structure used to keep track of a joystick */
-struct joystick_hwdata
-{
-	/* joystick ID */
-	UINT	id;
-
-	/* values used to translate device-specific coordinates into
-	   SDL-standard ranges */
-	struct _transaxis {
-		int offset;
-		float scale;
-	} transaxis[6];
-};
-
-/* Convert a win32 Multimedia API return code to a text message */
-static void SetMMerror(char *function, int code);
-
-
-static char *GetJoystickName(int index, const char *szRegKey)
-{
-	/* added 7/24/2004 by Eckhard Stolberg */
-	/*
-		see if there is a joystick for the current
-		index (1-16) listed in the registry
-	*/
-	char *name = NULL;
-	HKEY hTopKey;
-	HKEY hKey;
-	DWORD regsize;
-	LONG regresult;
-	char regkey[256];
-	char regvalue[256];
-	char regname[256];
-
-	SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s\\%s",
-		REGSTR_PATH_JOYCONFIG, szRegKey, REGSTR_KEY_JOYCURR);
-	hTopKey = HKEY_LOCAL_MACHINE;
-	regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
-	if (regresult != ERROR_SUCCESS) {
-		hTopKey = HKEY_CURRENT_USER;
-		regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
-	}
-	if (regresult != ERROR_SUCCESS) {
-		return NULL;
-	}
-
-	/* find the registry key name for the joystick's properties */
-	regsize = sizeof(regname);
-	SDL_snprintf(regvalue, SDL_arraysize(regvalue), "Joystick%d%s", index+1, REGSTR_VAL_JOYOEMNAME);
-	regresult = RegQueryValueExA(hKey, regvalue, 0, 0, (LPBYTE)regname, &regsize);
-	RegCloseKey(hKey);
-
-	if (regresult != ERROR_SUCCESS) {
-		return NULL;
-	}
-
-	/* open that registry key */
-	SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s", REGSTR_PATH_JOYOEM, regname);
-	regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
-	if (regresult != ERROR_SUCCESS) {
-		return NULL;
-	}
-
-	/* find the size for the OEM name text */
-	regsize = sizeof(regvalue);
-	regresult = RegQueryValueExA(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, NULL, &regsize);
-	if (regresult == ERROR_SUCCESS) {
-		/* allocate enough memory for the OEM name text ... */
-		name = (char *) SDL_malloc(regsize);
-		if ( name ) {
-			/* ... and read it from the registry */
-			regresult = RegQueryValueExA(hKey,
-				REGSTR_VAL_JOYOEMNAME, 0, 0,
-				(LPBYTE) name, &regsize);
-		}
-	}
-	RegCloseKey(hKey);
-
-	return(name);
-}
-
-/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks.  Joystick 0 should be the system default joystick.
- * It should return 0, or -1 on an unrecoverable fatal error.
- */
-int SDL_SYS_JoystickInit(void)
-{
-	int	i;
-	int maxdevs;
-	int numdevs;
-	JOYINFOEX joyinfo;
-	JOYCAPS	joycaps;
-	MMRESULT result;
-
-	/* Reset the joystick ID & name mapping tables */
-	for ( i = 0; i < MAX_JOYSTICKS; ++i ) {
-		SYS_JoystickID[i] = 0;
-		SYS_JoystickName[i] = NULL;
-	}
-
-	/* Loop over all potential joystick devices */
-	numdevs = 0;
-	maxdevs = joyGetNumDevs();
-	for ( i = JOYSTICKID1; i < maxdevs && numdevs < MAX_JOYSTICKS; ++i ) {
-		
-		joyinfo.dwSize = sizeof(joyinfo);
-		joyinfo.dwFlags = JOY_RETURNALL;
-		result = joyGetPosEx(i, &joyinfo);
-		if ( result == JOYERR_NOERROR ) {
-			result = joyGetDevCaps(i, &joycaps, sizeof(joycaps));
-			if ( result == JOYERR_NOERROR ) {
-				SYS_JoystickID[numdevs] = i;
-				SYS_Joystick[numdevs] = joycaps;
-				SYS_JoystickName[numdevs] = GetJoystickName(i, joycaps.szRegKey);
-				numdevs++;
-			}
-		}
-	}
-	return(numdevs);
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *SDL_SYS_JoystickName(int index)
-{
-	if ( SYS_JoystickName[index] != NULL ) {
-		return(SYS_JoystickName[index]);
-	} else {
-		return(SYS_Joystick[index].szPname);
-	}
-}
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
-{
-	int index, i;
-	int caps_flags[MAX_AXES-2] =
-		{ JOYCAPS_HASZ, JOYCAPS_HASR, JOYCAPS_HASU, JOYCAPS_HASV };
-	int axis_min[MAX_AXES], axis_max[MAX_AXES];
-
-
-	/* shortcut */
-	index = joystick->index;
-	axis_min[0] = SYS_Joystick[index].wXmin;
-	axis_max[0] = SYS_Joystick[index].wXmax;
-	axis_min[1] = SYS_Joystick[index].wYmin;
-	axis_max[1] = SYS_Joystick[index].wYmax;
-	axis_min[2] = SYS_Joystick[index].wZmin;
-	axis_max[2] = SYS_Joystick[index].wZmax;
-	axis_min[3] = SYS_Joystick[index].wRmin;
-	axis_max[3] = SYS_Joystick[index].wRmax;
-	axis_min[4] = SYS_Joystick[index].wUmin;
-	axis_max[4] = SYS_Joystick[index].wUmax;
-	axis_min[5] = SYS_Joystick[index].wVmin;
-	axis_max[5] = SYS_Joystick[index].wVmax;
-
-	/* allocate memory for system specific hardware data */
-	joystick->hwdata = (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata));
-	if (joystick->hwdata == NULL)
-	{
-		SDL_OutOfMemory();
-		return(-1);
-	}
-	SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
-
-	/* set hardware data */
-	joystick->hwdata->id = SYS_JoystickID[index];
-	for ( i = 0; i < MAX_AXES; ++i ) {
-		if ( (i<2) || (SYS_Joystick[index].wCaps & caps_flags[i-2]) ) {
-			joystick->hwdata->transaxis[i].offset =
-				AXIS_MIN - axis_min[i];
-			joystick->hwdata->transaxis[i].scale =
-				(float)(AXIS_MAX - AXIS_MIN) / (axis_max[i] - axis_min[i]);
-		} else {
-			joystick->hwdata->transaxis[i].offset = 0;
-			joystick->hwdata->transaxis[i].scale = 1.0; /* Just in case */
-		}
-	}
-
-	/* fill nbuttons, naxes, and nhats fields */
-	joystick->nbuttons = SYS_Joystick[index].wNumButtons;
-	joystick->naxes = SYS_Joystick[index].wNumAxes;
-	if ( SYS_Joystick[index].wCaps & JOYCAPS_HASPOV ) {
-		joystick->nhats = 1;
-	} else {
-		joystick->nhats = 0;
-	}
-	return(0);
-}
-
-static Uint8 TranslatePOV(DWORD value)
-{
-	Uint8 pos;
-
-	pos = SDL_HAT_CENTERED;
-	if ( value != JOY_POVCENTERED ) {
-		if ( (value > JOY_POVLEFT) || (value < JOY_POVRIGHT) ) {
-			pos |= SDL_HAT_UP;
-		}
-		if ( (value > JOY_POVFORWARD) && (value < JOY_POVBACKWARD) ) {
-			pos |= SDL_HAT_RIGHT;
-		}
-		if ( (value > JOY_POVRIGHT) && (value < JOY_POVLEFT) ) {
-			pos |= SDL_HAT_DOWN;
-		}
-		if ( value > JOY_POVBACKWARD ) {
-			pos |= SDL_HAT_LEFT;
-		}
-	}
-	return(pos);
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
-{
-	MMRESULT result;
-	int i;
-	DWORD flags[MAX_AXES] = { JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, 
-				  JOY_RETURNR, JOY_RETURNU, JOY_RETURNV };
-	DWORD pos[MAX_AXES];
-	struct _transaxis *transaxis;
-	int value, change;
-	JOYINFOEX joyinfo;
-
-	joyinfo.dwSize = sizeof(joyinfo);
-	joyinfo.dwFlags = JOY_RETURNALL|JOY_RETURNPOVCTS;
-	if ( ! joystick->hats ) {
-		joyinfo.dwFlags &= ~(JOY_RETURNPOV|JOY_RETURNPOVCTS);
-	}
-	result = joyGetPosEx(joystick->hwdata->id, &joyinfo);
-	if ( result != JOYERR_NOERROR ) {
-		SetMMerror("joyGetPosEx", result);
-		return;
-	}
-
-	/* joystick motion events */
-	pos[0] = joyinfo.dwXpos;
-	pos[1] = joyinfo.dwYpos;
-	pos[2] = joyinfo.dwZpos;
-	pos[3] = joyinfo.dwRpos;
-	pos[4] = joyinfo.dwUpos;
-	pos[5] = joyinfo.dwVpos;
-
-	transaxis = joystick->hwdata->transaxis;
-	for (i = 0; i < joystick->naxes; i++) {
-		if (joyinfo.dwFlags & flags[i]) {
-			value = (int)(((float)pos[i] + transaxis[i].offset) * transaxis[i].scale);
-			change = (value - joystick->axes[i]);
-			if ( (change < -JOY_AXIS_THRESHOLD) || (change > JOY_AXIS_THRESHOLD) ) {
-				SDL_PrivateJoystickAxis(joystick, (Uint8)i, (Sint16)value);
-			}
-		}
-	}
-
-	/* joystick button events */
-	if ( joyinfo.dwFlags & JOY_RETURNBUTTONS ) {
-		for ( i = 0; i < joystick->nbuttons; ++i ) {
-			if ( joyinfo.dwButtons & JOY_BUTTON_FLAG(i) ) {
-				if ( ! joystick->buttons[i] ) {
-					SDL_PrivateJoystickButton(joystick, (Uint8)i, SDL_PRESSED);
-				}
-			} else {
-				if ( joystick->buttons[i] ) {
-					SDL_PrivateJoystickButton(joystick, (Uint8)i, SDL_RELEASED);
-				}
-			}
-		}
-	}
-
-	/* joystick hat events */
-	if ( joyinfo.dwFlags & JOY_RETURNPOV ) {
-		Uint8 pos;
-
-		pos = TranslatePOV(joyinfo.dwPOV);
-		if ( pos != joystick->hats[0] ) {
-			SDL_PrivateJoystickHat(joystick, 0, pos);
-		}
-	}
-}
-
-/* Function to close a joystick after use */
-void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
-{
-	if (joystick->hwdata != NULL) {
-		/* free system specific hardware data */
-		SDL_free(joystick->hwdata);
-		joystick->hwdata = NULL;
-	}
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void SDL_SYS_JoystickQuit(void)
-{
-	int i;
-	for (i = 0; i < MAX_JOYSTICKS; i++) {
-		if ( SYS_JoystickName[i] != NULL ) {
-			SDL_free(SYS_JoystickName[i]);
-			SYS_JoystickName[i] = NULL;
-		}
-	}
-}
-
-
-/* implementation functions */
-void SetMMerror(char *function, int code)
-{
-	static char *error;
-	static char  errbuf[1024];
-
-	errbuf[0] = 0;
-	switch (code) 
-	{
-		case MMSYSERR_NODRIVER:
-			error = "Joystick driver not present";
-		break;
-
-		case MMSYSERR_INVALPARAM:
-		case JOYERR_PARMS:
-			error = "Invalid parameter(s)";
-		break;
-		
-		case MMSYSERR_BADDEVICEID:
-			error = "Bad device ID";
-		break;
-
-		case JOYERR_UNPLUGGED:
-			error = "Joystick not attached";
-		break;
-
-		case JOYERR_NOCANDO:
-			error = "Can't capture joystick input";
-		break;
-
-		default:
-			SDL_snprintf(errbuf, SDL_arraysize(errbuf),
-			         "%s: Unknown Multimedia system error: 0x%x",
-								function, code);
-		break;
-	}
-
-	if ( ! errbuf[0] ) {
-		SDL_snprintf(errbuf, SDL_arraysize(errbuf), "%s: %s", function, error);
-	}
-	SDL_SetError("%s", errbuf);
-}
-
-#endif /* SDL_JOYSTICK_WINMM */
diff --git a/Externals/SDL/src/stdlib/SDL_malloc.c b/Externals/SDL/src/stdlib/SDL_malloc.c
deleted file mode 100644
index 14f179d6c1..0000000000
--- a/Externals/SDL/src/stdlib/SDL_malloc.c
+++ /dev/null
@@ -1,5111 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This file contains portable memory management functions for SDL */
-
-#include "SDL_stdinc.h"
-
-#ifndef HAVE_MALLOC
-
-#define LACKS_SYS_TYPES_H
-#define LACKS_STDIO_H
-#define LACKS_STRINGS_H
-#define LACKS_STRING_H
-#define LACKS_STDLIB_H
-#define ABORT
-
-/*
-  This is a version (aka dlmalloc) of malloc/free/realloc written by
-  Doug Lea and released to the public domain, as explained at
-  http://creativecommons.org/licenses/publicdomain.  Send questions,
-  comments, complaints, performance data, etc to dl@cs.oswego.edu
-
-* Version 2.8.3 Thu Sep 22 11:16:15 2005  Doug Lea  (dl at gee)
-
-   Note: There may be an updated version of this malloc obtainable at
-           ftp://gee.cs.oswego.edu/pub/misc/malloc.c
-         Check before installing!
-
-* Quickstart
-
-  This library is all in one file to simplify the most common usage:
-  ftp it, compile it (-O3), and link it into another program. All of
-  the compile-time options default to reasonable values for use on
-  most platforms.  You might later want to step through various
-  compile-time and dynamic tuning options.
-
-  For convenience, an include file for code using this malloc is at:
-     ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.3.h
-  You don't really need this .h file unless you call functions not
-  defined in your system include files.  The .h file contains only the
-  excerpts from this file needed for using this malloc on ANSI C/C++
-  systems, so long as you haven't changed compile-time options about
-  naming and tuning parameters.  If you do, then you can create your
-  own malloc.h that does include all settings by cutting at the point
-  indicated below. Note that you may already by default be using a C
-  library containing a malloc that is based on some version of this
-  malloc (for example in linux). You might still want to use the one
-  in this file to customize settings or to avoid overheads associated
-  with library versions.
-
-* Vital statistics:
-
-  Supported pointer/size_t representation:       4 or 8 bytes
-       size_t MUST be an unsigned type of the same width as
-       pointers. (If you are using an ancient system that declares
-       size_t as a signed type, or need it to be a different width
-       than pointers, you can use a previous release of this malloc
-       (e.g. 2.7.2) supporting these.)
-
-  Alignment:                                     8 bytes (default)
-       This suffices for nearly all current machines and C compilers.
-       However, you can define MALLOC_ALIGNMENT to be wider than this
-       if necessary (up to 128bytes), at the expense of using more space.
-
-  Minimum overhead per allocated chunk:   4 or  8 bytes (if 4byte sizes)
-                                          8 or 16 bytes (if 8byte sizes)
-       Each malloced chunk has a hidden word of overhead holding size
-       and status information, and additional cross-check word
-       if FOOTERS is defined.
-
-  Minimum allocated size: 4-byte ptrs:  16 bytes    (including overhead)
-                          8-byte ptrs:  32 bytes    (including overhead)
-
-       Even a request for zero bytes (i.e., malloc(0)) returns a
-       pointer to something of the minimum allocatable size.
-       The maximum overhead wastage (i.e., number of extra bytes
-       allocated than were requested in malloc) is less than or equal
-       to the minimum size, except for requests >= mmap_threshold that
-       are serviced via mmap(), where the worst case wastage is about
-       32 bytes plus the remainder from a system page (the minimal
-       mmap unit); typically 4096 or 8192 bytes.
-
-  Security: static-safe; optionally more or less
-       The "security" of malloc refers to the ability of malicious
-       code to accentuate the effects of errors (for example, freeing
-       space that is not currently malloc'ed or overwriting past the
-       ends of chunks) in code that calls malloc.  This malloc
-       guarantees not to modify any memory locations below the base of
-       heap, i.e., static variables, even in the presence of usage
-       errors.  The routines additionally detect most improper frees
-       and reallocs.  All this holds as long as the static bookkeeping
-       for malloc itself is not corrupted by some other means.  This
-       is only one aspect of security -- these checks do not, and
-       cannot, detect all possible programming errors.
-
-       If FOOTERS is defined nonzero, then each allocated chunk
-       carries an additional check word to verify that it was malloced
-       from its space.  These check words are the same within each
-       execution of a program using malloc, but differ across
-       executions, so externally crafted fake chunks cannot be
-       freed. This improves security by rejecting frees/reallocs that
-       could corrupt heap memory, in addition to the checks preventing
-       writes to statics that are always on.  This may further improve
-       security at the expense of time and space overhead.  (Note that
-       FOOTERS may also be worth using with MSPACES.)
-
-       By default detected errors cause the program to abort (calling
-       "abort()"). You can override this to instead proceed past
-       errors by defining PROCEED_ON_ERROR.  In this case, a bad free
-       has no effect, and a malloc that encounters a bad address
-       caused by user overwrites will ignore the bad address by
-       dropping pointers and indices to all known memory. This may
-       be appropriate for programs that should continue if at all
-       possible in the face of programming errors, although they may
-       run out of memory because dropped memory is never reclaimed.
-
-       If you don't like either of these options, you can define
-       CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything
-       else. And if if you are sure that your program using malloc has
-       no errors or vulnerabilities, you can define INSECURE to 1,
-       which might (or might not) provide a small performance improvement.
-
-  Thread-safety: NOT thread-safe unless USE_LOCKS defined
-       When USE_LOCKS is defined, each public call to malloc, free,
-       etc is surrounded with either a pthread mutex or a win32
-       spinlock (depending on WIN32). This is not especially fast, and
-       can be a major bottleneck.  It is designed only to provide
-       minimal protection in concurrent environments, and to provide a
-       basis for extensions.  If you are using malloc in a concurrent
-       program, consider instead using ptmalloc, which is derived from
-       a version of this malloc. (See http://www.malloc.de).
-
-  System requirements: Any combination of MORECORE and/or MMAP/MUNMAP
-       This malloc can use unix sbrk or any emulation (invoked using
-       the CALL_MORECORE macro) and/or mmap/munmap or any emulation
-       (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system
-       memory.  On most unix systems, it tends to work best if both
-       MORECORE and MMAP are enabled.  On Win32, it uses emulations
-       based on VirtualAlloc. It also uses common C library functions
-       like memset.
-
-  Compliance: I believe it is compliant with the Single Unix Specification
-       (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably
-       others as well.
-
-* Overview of algorithms
-
-  This is not the fastest, most space-conserving, most portable, or
-  most tunable malloc ever written. However it is among the fastest
-  while also being among the most space-conserving, portable and
-  tunable.  Consistent balance across these factors results in a good
-  general-purpose allocator for malloc-intensive programs.
-
-  In most ways, this malloc is a best-fit allocator. Generally, it
-  chooses the best-fitting existing chunk for a request, with ties
-  broken in approximately least-recently-used order. (This strategy
-  normally maintains low fragmentation.) However, for requests less
-  than 256bytes, it deviates from best-fit when there is not an
-  exactly fitting available chunk by preferring to use space adjacent
-  to that used for the previous small request, as well as by breaking
-  ties in approximately most-recently-used order. (These enhance
-  locality of series of small allocations.)  And for very large requests
-  (>= 256Kb by default), it relies on system memory mapping
-  facilities, if supported.  (This helps avoid carrying around and
-  possibly fragmenting memory used only for large chunks.)
-
-  All operations (except malloc_stats and mallinfo) have execution
-  times that are bounded by a constant factor of the number of bits in
-  a size_t, not counting any clearing in calloc or copying in realloc,
-  or actions surrounding MORECORE and MMAP that have times
-  proportional to the number of non-contiguous regions returned by
-  system allocation routines, which is often just 1.
-
-  The implementation is not very modular and seriously overuses
-  macros. Perhaps someday all C compilers will do as good a job
-  inlining modular code as can now be done by brute-force expansion,
-  but now, enough of them seem not to.
-
-  Some compilers issue a lot of warnings about code that is
-  dead/unreachable only on some platforms, and also about intentional
-  uses of negation on unsigned types. All known cases of each can be
-  ignored.
-
-  For a longer but out of date high-level description, see
-     http://gee.cs.oswego.edu/dl/html/malloc.html
-
-* MSPACES
-  If MSPACES is defined, then in addition to malloc, free, etc.,
-  this file also defines mspace_malloc, mspace_free, etc. These
-  are versions of malloc routines that take an "mspace" argument
-  obtained using create_mspace, to control all internal bookkeeping.
-  If ONLY_MSPACES is defined, only these versions are compiled.
-  So if you would like to use this allocator for only some allocations,
-  and your system malloc for others, you can compile with
-  ONLY_MSPACES and then do something like...
-    static mspace mymspace = create_mspace(0,0); // for example
-    #define mymalloc(bytes)  mspace_malloc(mymspace, bytes)
-
-  (Note: If you only need one instance of an mspace, you can instead
-  use "USE_DL_PREFIX" to relabel the global malloc.)
-
-  You can similarly create thread-local allocators by storing
-  mspaces as thread-locals. For example:
-    static __thread mspace tlms = 0;
-    void*  tlmalloc(size_t bytes) {
-      if (tlms == 0) tlms = create_mspace(0, 0);
-      return mspace_malloc(tlms, bytes);
-    }
-    void  tlfree(void* mem) { mspace_free(tlms, mem); }
-
-  Unless FOOTERS is defined, each mspace is completely independent.
-  You cannot allocate from one and free to another (although
-  conformance is only weakly checked, so usage errors are not always
-  caught). If FOOTERS is defined, then each chunk carries around a tag
-  indicating its originating mspace, and frees are directed to their
-  originating spaces.
-
- -------------------------  Compile-time options ---------------------------
-
-Be careful in setting #define values for numerical constants of type
-size_t. On some systems, literal values are not automatically extended
-to size_t precision unless they are explicitly casted.
-
-WIN32                    default: defined if _WIN32 defined
-  Defining WIN32 sets up defaults for MS environment and compilers.
-  Otherwise defaults are for unix.
-
-MALLOC_ALIGNMENT         default: (size_t)8
-  Controls the minimum alignment for malloc'ed chunks.  It must be a
-  power of two and at least 8, even on machines for which smaller
-  alignments would suffice. It may be defined as larger than this
-  though. Note however that code and data structures are optimized for
-  the case of 8-byte alignment.
-
-MSPACES                  default: 0 (false)
-  If true, compile in support for independent allocation spaces.
-  This is only supported if HAVE_MMAP is true.
-
-ONLY_MSPACES             default: 0 (false)
-  If true, only compile in mspace versions, not regular versions.
-
-USE_LOCKS                default: 0 (false)
-  Causes each call to each public routine to be surrounded with
-  pthread or WIN32 mutex lock/unlock. (If set true, this can be
-  overridden on a per-mspace basis for mspace versions.)
-
-FOOTERS                  default: 0
-  If true, provide extra checking and dispatching by placing
-  information in the footers of allocated chunks. This adds
-  space and time overhead.
-
-INSECURE                 default: 0
-  If true, omit checks for usage errors and heap space overwrites.
-
-USE_DL_PREFIX            default: NOT defined
-  Causes compiler to prefix all public routines with the string 'dl'.
-  This can be useful when you only want to use this malloc in one part
-  of a program, using your regular system malloc elsewhere.
-
-ABORT                    default: defined as abort()
-  Defines how to abort on failed checks.  On most systems, a failed
-  check cannot die with an "assert" or even print an informative
-  message, because the underlying print routines in turn call malloc,
-  which will fail again.  Generally, the best policy is to simply call
-  abort(). It's not very useful to do more than this because many
-  errors due to overwriting will show up as address faults (null, odd
-  addresses etc) rather than malloc-triggered checks, so will also
-  abort.  Also, most compilers know that abort() does not return, so
-  can better optimize code conditionally calling it.
-
-PROCEED_ON_ERROR           default: defined as 0 (false)
-  Controls whether detected bad addresses cause them to bypassed
-  rather than aborting. If set, detected bad arguments to free and
-  realloc are ignored. And all bookkeeping information is zeroed out
-  upon a detected overwrite of freed heap space, thus losing the
-  ability to ever return it from malloc again, but enabling the
-  application to proceed. If PROCEED_ON_ERROR is defined, the
-  static variable malloc_corruption_error_count is compiled in
-  and can be examined to see if errors have occurred. This option
-  generates slower code than the default abort policy.
-
-DEBUG                    default: NOT defined
-  The DEBUG setting is mainly intended for people trying to modify
-  this code or diagnose problems when porting to new platforms.
-  However, it may also be able to better isolate user errors than just
-  using runtime checks.  The assertions in the check routines spell
-  out in more detail the assumptions and invariants underlying the
-  algorithms.  The checking is fairly extensive, and will slow down
-  execution noticeably. Calling malloc_stats or mallinfo with DEBUG
-  set will attempt to check every non-mmapped allocated and free chunk
-  in the course of computing the summaries.
-
-ABORT_ON_ASSERT_FAILURE   default: defined as 1 (true)
-  Debugging assertion failures can be nearly impossible if your
-  version of the assert macro causes malloc to be called, which will
-  lead to a cascade of further failures, blowing the runtime stack.
-  ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(),
-  which will usually make debugging easier.
-
-MALLOC_FAILURE_ACTION     default: sets errno to ENOMEM, or no-op on win32
-  The action to take before "return 0" when malloc fails to be able to
-  return memory because there is none available.
-
-HAVE_MORECORE             default: 1 (true) unless win32 or ONLY_MSPACES
-  True if this system supports sbrk or an emulation of it.
-
-MORECORE                  default: sbrk
-  The name of the sbrk-style system routine to call to obtain more
-  memory.  See below for guidance on writing custom MORECORE
-  functions. The type of the argument to sbrk/MORECORE varies across
-  systems.  It cannot be size_t, because it supports negative
-  arguments, so it is normally the signed type of the same width as
-  size_t (sometimes declared as "intptr_t").  It doesn't much matter
-  though. Internally, we only call it with arguments less than half
-  the max value of a size_t, which should work across all reasonable
-  possibilities, although sometimes generating compiler warnings.  See
-  near the end of this file for guidelines for creating a custom
-  version of MORECORE.
-
-MORECORE_CONTIGUOUS       default: 1 (true)
-  If true, take advantage of fact that consecutive calls to MORECORE
-  with positive arguments always return contiguous increasing
-  addresses.  This is true of unix sbrk. It does not hurt too much to
-  set it true anyway, since malloc copes with non-contiguities.
-  Setting it false when definitely non-contiguous saves time
-  and possibly wasted space it would take to discover this though.
-
-MORECORE_CANNOT_TRIM      default: NOT defined
-  True if MORECORE cannot release space back to the system when given
-  negative arguments. This is generally necessary only if you are
-  using a hand-crafted MORECORE function that cannot handle negative
-  arguments.
-
-HAVE_MMAP                 default: 1 (true)
-  True if this system supports mmap or an emulation of it.  If so, and
-  HAVE_MORECORE is not true, MMAP is used for all system
-  allocation. If set and HAVE_MORECORE is true as well, MMAP is
-  primarily used to directly allocate very large blocks. It is also
-  used as a backup strategy in cases where MORECORE fails to provide
-  space from system. Note: A single call to MUNMAP is assumed to be
-  able to unmap memory that may have be allocated using multiple calls
-  to MMAP, so long as they are adjacent.
-
-HAVE_MREMAP               default: 1 on linux, else 0
-  If true realloc() uses mremap() to re-allocate large blocks and
-  extend or shrink allocation spaces.
-
-MMAP_CLEARS               default: 1 on unix
-  True if mmap clears memory so calloc doesn't need to. This is true
-  for standard unix mmap using /dev/zero.
-
-USE_BUILTIN_FFS            default: 0 (i.e., not used)
-  Causes malloc to use the builtin ffs() function to compute indices.
-  Some compilers may recognize and intrinsify ffs to be faster than the
-  supplied C version. Also, the case of x86 using gcc is special-cased
-  to an asm instruction, so is already as fast as it can be, and so
-  this setting has no effect. (On most x86s, the asm version is only
-  slightly faster than the C version.)
-
-malloc_getpagesize         default: derive from system includes, or 4096.
-  The system page size. To the extent possible, this malloc manages
-  memory from the system in page-size units.  This may be (and
-  usually is) a function rather than a constant. This is ignored
-  if WIN32, where page size is determined using getSystemInfo during
-  initialization.
-
-USE_DEV_RANDOM             default: 0 (i.e., not used)
-  Causes malloc to use /dev/random to initialize secure magic seed for
-  stamping footers. Otherwise, the current time is used.
-
-NO_MALLINFO                default: 0
-  If defined, don't compile "mallinfo". This can be a simple way
-  of dealing with mismatches between system declarations and
-  those in this file.
-
-MALLINFO_FIELD_TYPE        default: size_t
-  The type of the fields in the mallinfo struct. This was originally
-  defined as "int" in SVID etc, but is more usefully defined as
-  size_t. The value is used only if  HAVE_USR_INCLUDE_MALLOC_H is not set
-
-REALLOC_ZERO_BYTES_FREES    default: not defined
-  This should be set if a call to realloc with zero bytes should 
-  be the same as a call to free. Some people think it should. Otherwise, 
-  since this malloc returns a unique pointer for malloc(0), so does 
-  realloc(p, 0).
-
-LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H
-LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H,  LACKS_ERRNO_H
-LACKS_STDLIB_H                default: NOT defined unless on WIN32
-  Define these if your system does not have these header files.
-  You might need to manually insert some of the declarations they provide.
-
-DEFAULT_GRANULARITY        default: page size if MORECORE_CONTIGUOUS,
-                                system_info.dwAllocationGranularity in WIN32,
-                                otherwise 64K.
-      Also settable using mallopt(M_GRANULARITY, x)
-  The unit for allocating and deallocating memory from the system.  On
-  most systems with contiguous MORECORE, there is no reason to
-  make this more than a page. However, systems with MMAP tend to
-  either require or encourage larger granularities.  You can increase
-  this value to prevent system allocation functions to be called so
-  often, especially if they are slow.  The value must be at least one
-  page and must be a power of two.  Setting to 0 causes initialization
-  to either page size or win32 region size.  (Note: In previous
-  versions of malloc, the equivalent of this option was called
-  "TOP_PAD")
-
-DEFAULT_TRIM_THRESHOLD    default: 2MB
-      Also settable using mallopt(M_TRIM_THRESHOLD, x)
-  The maximum amount of unused top-most memory to keep before
-  releasing via malloc_trim in free().  Automatic trimming is mainly
-  useful in long-lived programs using contiguous MORECORE.  Because
-  trimming via sbrk can be slow on some systems, and can sometimes be
-  wasteful (in cases where programs immediately afterward allocate
-  more large chunks) the value should be high enough so that your
-  overall system performance would improve by releasing this much
-  memory.  As a rough guide, you might set to a value close to the
-  average size of a process (program) running on your system.
-  Releasing this much memory would allow such a process to run in
-  memory.  Generally, it is worth tuning trim thresholds when a
-  program undergoes phases where several large chunks are allocated
-  and released in ways that can reuse each other's storage, perhaps
-  mixed with phases where there are no such chunks at all. The trim
-  value must be greater than page size to have any useful effect.  To
-  disable trimming completely, you can set to MAX_SIZE_T. Note that the trick
-  some people use of mallocing a huge space and then freeing it at
-  program startup, in an attempt to reserve system memory, doesn't
-  have the intended effect under automatic trimming, since that memory
-  will immediately be returned to the system.
-
-DEFAULT_MMAP_THRESHOLD       default: 256K
-      Also settable using mallopt(M_MMAP_THRESHOLD, x)
-  The request size threshold for using MMAP to directly service a
-  request. Requests of at least this size that cannot be allocated
-  using already-existing space will be serviced via mmap.  (If enough
-  normal freed space already exists it is used instead.)  Using mmap
-  segregates relatively large chunks of memory so that they can be
-  individually obtained and released from the host system. A request
-  serviced through mmap is never reused by any other request (at least
-  not directly; the system may just so happen to remap successive
-  requests to the same locations).  Segregating space in this way has
-  the benefits that: Mmapped space can always be individually released
-  back to the system, which helps keep the system level memory demands
-  of a long-lived program low.  Also, mapped memory doesn't become
-  `locked' between other chunks, as can happen with normally allocated
-  chunks, which means that even trimming via malloc_trim would not
-  release them.  However, it has the disadvantage that the space
-  cannot be reclaimed, consolidated, and then used to service later
-  requests, as happens with normal chunks.  The advantages of mmap
-  nearly always outweigh disadvantages for "large" chunks, but the
-  value of "large" may vary across systems.  The default is an
-  empirically derived value that works well in most systems. You can
-  disable mmap by setting to MAX_SIZE_T.
-
-*/
-
-#ifndef WIN32
-#ifdef _WIN32
-#define WIN32 1
-#endif  /* _WIN32 */
-#endif  /* WIN32 */
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define HAVE_MMAP 1
-#define HAVE_MORECORE 0
-#define LACKS_UNISTD_H
-#define LACKS_SYS_PARAM_H
-#define LACKS_SYS_MMAN_H
-#define LACKS_STRING_H
-#define LACKS_STRINGS_H
-#define LACKS_SYS_TYPES_H
-#define LACKS_ERRNO_H
-#define LACKS_FCNTL_H 
-#define MALLOC_FAILURE_ACTION
-#define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */
-#endif  /* WIN32 */
-
-#if defined(DARWIN) || defined(_DARWIN)
-/* Mac OSX docs advise not to use sbrk; it seems better to use mmap */
-#ifndef HAVE_MORECORE
-#define HAVE_MORECORE 0
-#define HAVE_MMAP 1
-#endif  /* HAVE_MORECORE */
-#endif  /* DARWIN */
-
-#ifndef LACKS_SYS_TYPES_H
-#include <sys/types.h>  /* For size_t */
-#endif  /* LACKS_SYS_TYPES_H */
-
-/* The maximum possible size_t value has all bits set */
-#define MAX_SIZE_T           (~(size_t)0)
-
-#ifndef ONLY_MSPACES
-#define ONLY_MSPACES 0
-#endif  /* ONLY_MSPACES */
-#ifndef MSPACES
-#if ONLY_MSPACES
-#define MSPACES 1
-#else   /* ONLY_MSPACES */
-#define MSPACES 0
-#endif  /* ONLY_MSPACES */
-#endif  /* MSPACES */
-#ifndef MALLOC_ALIGNMENT
-#define MALLOC_ALIGNMENT ((size_t)8U)
-#endif  /* MALLOC_ALIGNMENT */
-#ifndef FOOTERS
-#define FOOTERS 0
-#endif  /* FOOTERS */
-#ifndef ABORT
-#define ABORT  abort()
-#endif  /* ABORT */
-#ifndef ABORT_ON_ASSERT_FAILURE
-#define ABORT_ON_ASSERT_FAILURE 1
-#endif  /* ABORT_ON_ASSERT_FAILURE */
-#ifndef PROCEED_ON_ERROR
-#define PROCEED_ON_ERROR 0
-#endif  /* PROCEED_ON_ERROR */
-#ifndef USE_LOCKS
-#define USE_LOCKS 0
-#endif  /* USE_LOCKS */
-#ifndef INSECURE
-#define INSECURE 0
-#endif  /* INSECURE */
-#ifndef HAVE_MMAP
-#define HAVE_MMAP 1
-#endif  /* HAVE_MMAP */
-#ifndef MMAP_CLEARS
-#define MMAP_CLEARS 1
-#endif  /* MMAP_CLEARS */
-#ifndef HAVE_MREMAP
-#ifdef linux
-#define HAVE_MREMAP 1
-#else   /* linux */
-#define HAVE_MREMAP 0
-#endif  /* linux */
-#endif  /* HAVE_MREMAP */
-#ifndef MALLOC_FAILURE_ACTION
-#define MALLOC_FAILURE_ACTION  errno = ENOMEM;
-#endif  /* MALLOC_FAILURE_ACTION */
-#ifndef HAVE_MORECORE
-#if ONLY_MSPACES
-#define HAVE_MORECORE 0
-#else   /* ONLY_MSPACES */
-#define HAVE_MORECORE 1
-#endif  /* ONLY_MSPACES */
-#endif  /* HAVE_MORECORE */
-#if !HAVE_MORECORE
-#define MORECORE_CONTIGUOUS 0
-#else   /* !HAVE_MORECORE */
-#ifndef MORECORE
-#define MORECORE sbrk
-#endif  /* MORECORE */
-#ifndef MORECORE_CONTIGUOUS
-#define MORECORE_CONTIGUOUS 1
-#endif  /* MORECORE_CONTIGUOUS */
-#endif  /* HAVE_MORECORE */
-#ifndef DEFAULT_GRANULARITY
-#if MORECORE_CONTIGUOUS
-#define DEFAULT_GRANULARITY (0)  /* 0 means to compute in init_mparams */
-#else   /* MORECORE_CONTIGUOUS */
-#define DEFAULT_GRANULARITY ((size_t)64U * (size_t)1024U)
-#endif  /* MORECORE_CONTIGUOUS */
-#endif  /* DEFAULT_GRANULARITY */
-#ifndef DEFAULT_TRIM_THRESHOLD
-#ifndef MORECORE_CANNOT_TRIM
-#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U)
-#else   /* MORECORE_CANNOT_TRIM */
-#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T
-#endif  /* MORECORE_CANNOT_TRIM */
-#endif  /* DEFAULT_TRIM_THRESHOLD */
-#ifndef DEFAULT_MMAP_THRESHOLD
-#if HAVE_MMAP
-#define DEFAULT_MMAP_THRESHOLD ((size_t)256U * (size_t)1024U)
-#else   /* HAVE_MMAP */
-#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
-#endif  /* HAVE_MMAP */
-#endif  /* DEFAULT_MMAP_THRESHOLD */
-#ifndef USE_BUILTIN_FFS
-#define USE_BUILTIN_FFS 0
-#endif  /* USE_BUILTIN_FFS */
-#ifndef USE_DEV_RANDOM
-#define USE_DEV_RANDOM 0
-#endif  /* USE_DEV_RANDOM */
-#ifndef NO_MALLINFO
-#define NO_MALLINFO 0
-#endif  /* NO_MALLINFO */
-#ifndef MALLINFO_FIELD_TYPE
-#define MALLINFO_FIELD_TYPE size_t
-#endif  /* MALLINFO_FIELD_TYPE */
-
-#define memset	SDL_memset
-#define memcpy	SDL_memcpy
-#define malloc	SDL_malloc
-#define calloc	SDL_calloc
-#define realloc	SDL_realloc
-#define free	SDL_free
-
-/*
-  mallopt tuning options.  SVID/XPG defines four standard parameter
-  numbers for mallopt, normally defined in malloc.h.  None of these
-  are used in this malloc, so setting them has no effect. But this
-  malloc does support the following options.
-*/
-
-#define M_TRIM_THRESHOLD     (-1)
-#define M_GRANULARITY        (-2)
-#define M_MMAP_THRESHOLD     (-3)
-
-/* ------------------------ Mallinfo declarations ------------------------ */
-
-#if !NO_MALLINFO
-/*
-  This version of malloc supports the standard SVID/XPG mallinfo
-  routine that returns a struct containing usage properties and
-  statistics. It should work on any system that has a
-  /usr/include/malloc.h defining struct mallinfo.  The main
-  declaration needed is the mallinfo struct that is returned (by-copy)
-  by mallinfo().  The malloinfo struct contains a bunch of fields that
-  are not even meaningful in this version of malloc.  These fields are
-  are instead filled by mallinfo() with other numbers that might be of
-  interest.
-
-  HAVE_USR_INCLUDE_MALLOC_H should be set if you have a
-  /usr/include/malloc.h file that includes a declaration of struct
-  mallinfo.  If so, it is included; else a compliant version is
-  declared below.  These must be precisely the same for mallinfo() to
-  work.  The original SVID version of this struct, defined on most
-  systems with mallinfo, declares all fields as ints. But some others
-  define as unsigned long. If your system defines the fields using a
-  type of different width than listed here, you MUST #include your
-  system version and #define HAVE_USR_INCLUDE_MALLOC_H.
-*/
-
-/* #define HAVE_USR_INCLUDE_MALLOC_H */
-
-#ifdef HAVE_USR_INCLUDE_MALLOC_H
-#include "/usr/include/malloc.h"
-#else /* HAVE_USR_INCLUDE_MALLOC_H */
-
-struct mallinfo {
-  MALLINFO_FIELD_TYPE arena;    /* non-mmapped space allocated from system */
-  MALLINFO_FIELD_TYPE ordblks;  /* number of free chunks */
-  MALLINFO_FIELD_TYPE smblks;   /* always 0 */
-  MALLINFO_FIELD_TYPE hblks;    /* always 0 */
-  MALLINFO_FIELD_TYPE hblkhd;   /* space in mmapped regions */
-  MALLINFO_FIELD_TYPE usmblks;  /* maximum total allocated space */
-  MALLINFO_FIELD_TYPE fsmblks;  /* always 0 */
-  MALLINFO_FIELD_TYPE uordblks; /* total allocated space */
-  MALLINFO_FIELD_TYPE fordblks; /* total free space */
-  MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */
-};
-
-#endif /* HAVE_USR_INCLUDE_MALLOC_H */
-#endif /* NO_MALLINFO */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if !ONLY_MSPACES
-
-/* ------------------- Declarations of public routines ------------------- */
-
-#ifndef USE_DL_PREFIX
-#define dlcalloc               calloc
-#define dlfree                 free
-#define dlmalloc               malloc
-#define dlmemalign             memalign
-#define dlrealloc              realloc
-#define dlvalloc               valloc
-#define dlpvalloc              pvalloc
-#define dlmallinfo             mallinfo
-#define dlmallopt              mallopt
-#define dlmalloc_trim          malloc_trim
-#define dlmalloc_stats         malloc_stats
-#define dlmalloc_usable_size   malloc_usable_size
-#define dlmalloc_footprint     malloc_footprint
-#define dlmalloc_max_footprint malloc_max_footprint
-#define dlindependent_calloc   independent_calloc
-#define dlindependent_comalloc independent_comalloc
-#endif /* USE_DL_PREFIX */
-
-
-/*
-  malloc(size_t n)
-  Returns a pointer to a newly allocated chunk of at least n bytes, or
-  null if no space is available, in which case errno is set to ENOMEM
-  on ANSI C systems.
-
-  If n is zero, malloc returns a minimum-sized chunk. (The minimum
-  size is 16 bytes on most 32bit systems, and 32 bytes on 64bit
-  systems.)  Note that size_t is an unsigned type, so calls with
-  arguments that would be negative if signed are interpreted as
-  requests for huge amounts of space, which will often fail. The
-  maximum supported value of n differs across systems, but is in all
-  cases less than the maximum representable value of a size_t.
-*/
-void* dlmalloc(size_t);
-
-/*
-  free(void* p)
-  Releases the chunk of memory pointed to by p, that had been previously
-  allocated using malloc or a related routine such as realloc.
-  It has no effect if p is null. If p was not malloced or already
-  freed, free(p) will by default cause the current program to abort.
-*/
-void  dlfree(void*);
-
-/*
-  calloc(size_t n_elements, size_t element_size);
-  Returns a pointer to n_elements * element_size bytes, with all locations
-  set to zero.
-*/
-void* dlcalloc(size_t, size_t);
-
-/*
-  realloc(void* p, size_t n)
-  Returns a pointer to a chunk of size n that contains the same data
-  as does chunk p up to the minimum of (n, p's size) bytes, or null
-  if no space is available.
-
-  The returned pointer may or may not be the same as p. The algorithm
-  prefers extending p in most cases when possible, otherwise it
-  employs the equivalent of a malloc-copy-free sequence.
-
-  If p is null, realloc is equivalent to malloc.
-
-  If space is not available, realloc returns null, errno is set (if on
-  ANSI) and p is NOT freed.
-
-  if n is for fewer bytes than already held by p, the newly unused
-  space is lopped off and freed if possible.  realloc with a size
-  argument of zero (re)allocates a minimum-sized chunk.
-
-  The old unix realloc convention of allowing the last-free'd chunk
-  to be used as an argument to realloc is not supported.
-*/
-
-void* dlrealloc(void*, size_t);
-
-/*
-  memalign(size_t alignment, size_t n);
-  Returns a pointer to a newly allocated chunk of n bytes, aligned
-  in accord with the alignment argument.
-
-  The alignment argument should be a power of two. If the argument is
-  not a power of two, the nearest greater power is used.
-  8-byte alignment is guaranteed by normal malloc calls, so don't
-  bother calling memalign with an argument of 8 or less.
-
-  Overreliance on memalign is a sure way to fragment space.
-*/
-void* dlmemalign(size_t, size_t);
-
-/*
-  valloc(size_t n);
-  Equivalent to memalign(pagesize, n), where pagesize is the page
-  size of the system. If the pagesize is unknown, 4096 is used.
-*/
-void* dlvalloc(size_t);
-
-/*
-  mallopt(int parameter_number, int parameter_value)
-  Sets tunable parameters The format is to provide a
-  (parameter-number, parameter-value) pair.  mallopt then sets the
-  corresponding parameter to the argument value if it can (i.e., so
-  long as the value is meaningful), and returns 1 if successful else
-  0.  SVID/XPG/ANSI defines four standard param numbers for mallopt,
-  normally defined in malloc.h.  None of these are use in this malloc,
-  so setting them has no effect. But this malloc also supports other
-  options in mallopt. See below for details.  Briefly, supported
-  parameters are as follows (listed defaults are for "typical"
-  configurations).
-
-  Symbol            param #  default    allowed param values
-  M_TRIM_THRESHOLD     -1   2*1024*1024   any   (MAX_SIZE_T disables)
-  M_GRANULARITY        -2     page size   any power of 2 >= page size
-  M_MMAP_THRESHOLD     -3      256*1024   any   (or 0 if no MMAP support)
-*/
-int dlmallopt(int, int);
-
-/*
-  malloc_footprint();
-  Returns the number of bytes obtained from the system.  The total
-  number of bytes allocated by malloc, realloc etc., is less than this
-  value. Unlike mallinfo, this function returns only a precomputed
-  result, so can be called frequently to monitor memory consumption.
-  Even if locks are otherwise defined, this function does not use them,
-  so results might not be up to date.
-*/
-size_t dlmalloc_footprint(void);
-
-/*
-  malloc_max_footprint();
-  Returns the maximum number of bytes obtained from the system. This
-  value will be greater than current footprint if deallocated space
-  has been reclaimed by the system. The peak number of bytes allocated
-  by malloc, realloc etc., is less than this value. Unlike mallinfo,
-  this function returns only a precomputed result, so can be called
-  frequently to monitor memory consumption.  Even if locks are
-  otherwise defined, this function does not use them, so results might
-  not be up to date.
-*/
-size_t dlmalloc_max_footprint(void);
-
-#if !NO_MALLINFO
-/*
-  mallinfo()
-  Returns (by copy) a struct containing various summary statistics:
-
-  arena:     current total non-mmapped bytes allocated from system
-  ordblks:   the number of free chunks
-  smblks:    always zero.
-  hblks:     current number of mmapped regions
-  hblkhd:    total bytes held in mmapped regions
-  usmblks:   the maximum total allocated space. This will be greater
-                than current total if trimming has occurred.
-  fsmblks:   always zero
-  uordblks:  current total allocated space (normal or mmapped)
-  fordblks:  total free space
-  keepcost:  the maximum number of bytes that could ideally be released
-               back to system via malloc_trim. ("ideally" means that
-               it ignores page restrictions etc.)
-
-  Because these fields are ints, but internal bookkeeping may
-  be kept as longs, the reported values may wrap around zero and
-  thus be inaccurate.
-*/
-struct mallinfo dlmallinfo(void);
-#endif /* NO_MALLINFO */
-
-/*
-  independent_calloc(size_t n_elements, size_t element_size, void* chunks[]);
-
-  independent_calloc is similar to calloc, but instead of returning a
-  single cleared space, it returns an array of pointers to n_elements
-  independent elements that can hold contents of size elem_size, each
-  of which starts out cleared, and can be independently freed,
-  realloc'ed etc. The elements are guaranteed to be adjacently
-  allocated (this is not guaranteed to occur with multiple callocs or
-  mallocs), which may also improve cache locality in some
-  applications.
-
-  The "chunks" argument is optional (i.e., may be null, which is
-  probably the most typical usage). If it is null, the returned array
-  is itself dynamically allocated and should also be freed when it is
-  no longer needed. Otherwise, the chunks array must be of at least
-  n_elements in length. It is filled in with the pointers to the
-  chunks.
-
-  In either case, independent_calloc returns this pointer array, or
-  null if the allocation failed.  If n_elements is zero and "chunks"
-  is null, it returns a chunk representing an array with zero elements
-  (which should be freed if not wanted).
-
-  Each element must be individually freed when it is no longer
-  needed. If you'd like to instead be able to free all at once, you
-  should instead use regular calloc and assign pointers into this
-  space to represent elements.  (In this case though, you cannot
-  independently free elements.)
-
-  independent_calloc simplifies and speeds up implementations of many
-  kinds of pools.  It may also be useful when constructing large data
-  structures that initially have a fixed number of fixed-sized nodes,
-  but the number is not known at compile time, and some of the nodes
-  may later need to be freed. For example:
-
-  struct Node { int item; struct Node* next; };
-
-  struct Node* build_list() {
-    struct Node** pool;
-    int n = read_number_of_nodes_needed();
-    if (n <= 0) return 0;
-    pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0);
-    if (pool == 0) die();
-    // organize into a linked list...
-    struct Node* first = pool[0];
-    for (i = 0; i < n-1; ++i)
-      pool[i]->next = pool[i+1];
-    free(pool);     // Can now free the array (or not, if it is needed later)
-    return first;
-  }
-*/
-void** dlindependent_calloc(size_t, size_t, void**);
-
-/*
-  independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]);
-
-  independent_comalloc allocates, all at once, a set of n_elements
-  chunks with sizes indicated in the "sizes" array.    It returns
-  an array of pointers to these elements, each of which can be
-  independently freed, realloc'ed etc. The elements are guaranteed to
-  be adjacently allocated (this is not guaranteed to occur with
-  multiple callocs or mallocs), which may also improve cache locality
-  in some applications.
-
-  The "chunks" argument is optional (i.e., may be null). If it is null
-  the returned array is itself dynamically allocated and should also
-  be freed when it is no longer needed. Otherwise, the chunks array
-  must be of at least n_elements in length. It is filled in with the
-  pointers to the chunks.
-
-  In either case, independent_comalloc returns this pointer array, or
-  null if the allocation failed.  If n_elements is zero and chunks is
-  null, it returns a chunk representing an array with zero elements
-  (which should be freed if not wanted).
-
-  Each element must be individually freed when it is no longer
-  needed. If you'd like to instead be able to free all at once, you
-  should instead use a single regular malloc, and assign pointers at
-  particular offsets in the aggregate space. (In this case though, you
-  cannot independently free elements.)
-
-  independent_comallac differs from independent_calloc in that each
-  element may have a different size, and also that it does not
-  automatically clear elements.
-
-  independent_comalloc can be used to speed up allocation in cases
-  where several structs or objects must always be allocated at the
-  same time.  For example:
-
-  struct Head { ... }
-  struct Foot { ... }
-
-  void send_message(char* msg) {
-    int msglen = strlen(msg);
-    size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) };
-    void* chunks[3];
-    if (independent_comalloc(3, sizes, chunks) == 0)
-      die();
-    struct Head* head = (struct Head*)(chunks[0]);
-    char*        body = (char*)(chunks[1]);
-    struct Foot* foot = (struct Foot*)(chunks[2]);
-    // ...
-  }
-
-  In general though, independent_comalloc is worth using only for
-  larger values of n_elements. For small values, you probably won't
-  detect enough difference from series of malloc calls to bother.
-
-  Overuse of independent_comalloc can increase overall memory usage,
-  since it cannot reuse existing noncontiguous small chunks that
-  might be available for some of the elements.
-*/
-void** dlindependent_comalloc(size_t, size_t*, void**);
-
-
-/*
-  pvalloc(size_t n);
-  Equivalent to valloc(minimum-page-that-holds(n)), that is,
-  round up n to nearest pagesize.
- */
-void*  dlpvalloc(size_t);
-
-/*
-  malloc_trim(size_t pad);
-
-  If possible, gives memory back to the system (via negative arguments
-  to sbrk) if there is unused memory at the `high' end of the malloc
-  pool or in unused MMAP segments. You can call this after freeing
-  large blocks of memory to potentially reduce the system-level memory
-  requirements of a program. However, it cannot guarantee to reduce
-  memory. Under some allocation patterns, some large free blocks of
-  memory will be locked between two used chunks, so they cannot be
-  given back to the system.
-
-  The `pad' argument to malloc_trim represents the amount of free
-  trailing space to leave untrimmed. If this argument is zero, only
-  the minimum amount of memory to maintain internal data structures
-  will be left. Non-zero arguments can be supplied to maintain enough
-  trailing space to service future expected allocations without having
-  to re-obtain memory from the system.
-
-  Malloc_trim returns 1 if it actually released any memory, else 0.
-*/
-int  dlmalloc_trim(size_t);
-
-/*
-  malloc_usable_size(void* p);
-
-  Returns the number of bytes you can actually use in
-  an allocated chunk, which may be more than you requested (although
-  often not) due to alignment and minimum size constraints.
-  You can use this many bytes without worrying about
-  overwriting other allocated objects. This is not a particularly great
-  programming practice. malloc_usable_size can be more useful in
-  debugging and assertions, for example:
-
-  p = malloc(n);
-  assert(malloc_usable_size(p) >= 256);
-*/
-size_t dlmalloc_usable_size(void*);
-
-/*
-  malloc_stats();
-  Prints on stderr the amount of space obtained from the system (both
-  via sbrk and mmap), the maximum amount (which may be more than
-  current if malloc_trim and/or munmap got called), and the current
-  number of bytes allocated via malloc (or realloc, etc) but not yet
-  freed. Note that this is the number of bytes allocated, not the
-  number requested. It will be larger than the number requested
-  because of alignment and bookkeeping overhead. Because it includes
-  alignment wastage as being in use, this figure may be greater than
-  zero even when no user-level chunks are allocated.
-
-  The reported current and maximum system memory can be inaccurate if
-  a program makes other calls to system memory allocation functions
-  (normally sbrk) outside of malloc.
-
-  malloc_stats prints only the most commonly interesting statistics.
-  More information can be obtained by calling mallinfo.
-*/
-void  dlmalloc_stats(void);
-
-#endif /* ONLY_MSPACES */
-
-#if MSPACES
-
-/*
-  mspace is an opaque type representing an independent
-  region of space that supports mspace_malloc, etc.
-*/
-typedef void* mspace;
-
-/*
-  create_mspace creates and returns a new independent space with the
-  given initial capacity, or, if 0, the default granularity size.  It
-  returns null if there is no system memory available to create the
-  space.  If argument locked is non-zero, the space uses a separate
-  lock to control access. The capacity of the space will grow
-  dynamically as needed to service mspace_malloc requests.  You can
-  control the sizes of incremental increases of this space by
-  compiling with a different DEFAULT_GRANULARITY or dynamically
-  setting with mallopt(M_GRANULARITY, value).
-*/
-mspace create_mspace(size_t capacity, int locked);
-
-/*
-  destroy_mspace destroys the given space, and attempts to return all
-  of its memory back to the system, returning the total number of
-  bytes freed. After destruction, the results of access to all memory
-  used by the space become undefined.
-*/
-size_t destroy_mspace(mspace msp);
-
-/*
-  create_mspace_with_base uses the memory supplied as the initial base
-  of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this
-  space is used for bookkeeping, so the capacity must be at least this
-  large. (Otherwise 0 is returned.) When this initial space is
-  exhausted, additional memory will be obtained from the system.
-  Destroying this space will deallocate all additionally allocated
-  space (if possible) but not the initial base.
-*/
-mspace create_mspace_with_base(void* base, size_t capacity, int locked);
-
-/*
-  mspace_malloc behaves as malloc, but operates within
-  the given space.
-*/
-void* mspace_malloc(mspace msp, size_t bytes);
-
-/*
-  mspace_free behaves as free, but operates within
-  the given space.
-
-  If compiled with FOOTERS==1, mspace_free is not actually needed.
-  free may be called instead of mspace_free because freed chunks from
-  any space are handled by their originating spaces.
-*/
-void mspace_free(mspace msp, void* mem);
-
-/*
-  mspace_realloc behaves as realloc, but operates within
-  the given space.
-
-  If compiled with FOOTERS==1, mspace_realloc is not actually
-  needed.  realloc may be called instead of mspace_realloc because
-  realloced chunks from any space are handled by their originating
-  spaces.
-*/
-void* mspace_realloc(mspace msp, void* mem, size_t newsize);
-
-/*
-  mspace_calloc behaves as calloc, but operates within
-  the given space.
-*/
-void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
-
-/*
-  mspace_memalign behaves as memalign, but operates within
-  the given space.
-*/
-void* mspace_memalign(mspace msp, size_t alignment, size_t bytes);
-
-/*
-  mspace_independent_calloc behaves as independent_calloc, but
-  operates within the given space.
-*/
-void** mspace_independent_calloc(mspace msp, size_t n_elements,
-                                 size_t elem_size, void* chunks[]);
-
-/*
-  mspace_independent_comalloc behaves as independent_comalloc, but
-  operates within the given space.
-*/
-void** mspace_independent_comalloc(mspace msp, size_t n_elements,
-                                   size_t sizes[], void* chunks[]);
-
-/*
-  mspace_footprint() returns the number of bytes obtained from the
-  system for this space.
-*/
-size_t mspace_footprint(mspace msp);
-
-/*
-  mspace_max_footprint() returns the peak number of bytes obtained from the
-  system for this space.
-*/
-size_t mspace_max_footprint(mspace msp);
-
-
-#if !NO_MALLINFO
-/*
-  mspace_mallinfo behaves as mallinfo, but reports properties of
-  the given space.
-*/
-struct mallinfo mspace_mallinfo(mspace msp);
-#endif /* NO_MALLINFO */
-
-/*
-  mspace_malloc_stats behaves as malloc_stats, but reports
-  properties of the given space.
-*/
-void mspace_malloc_stats(mspace msp);
-
-/*
-  mspace_trim behaves as malloc_trim, but
-  operates within the given space.
-*/
-int mspace_trim(mspace msp, size_t pad);
-
-/*
-  An alias for mallopt.
-*/
-int mspace_mallopt(int, int);
-
-#endif /* MSPACES */
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif /* __cplusplus */
-
-/*
-  ========================================================================
-  To make a fully customizable malloc.h header file, cut everything
-  above this line, put into file malloc.h, edit to suit, and #include it
-  on the next line, as well as in programs that use this malloc.
-  ========================================================================
-*/
-
-/* #include "malloc.h" */
-
-/*------------------------------ internal #includes ---------------------- */
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4146 ) /* no "unsigned" warnings */
-#endif /* _MSC_VER */
-
-#ifndef LACKS_STDIO_H
-#include <stdio.h>       /* for printing in malloc_stats */
-#endif
-
-#ifndef LACKS_ERRNO_H
-#include <errno.h>       /* for MALLOC_FAILURE_ACTION */
-#endif /* LACKS_ERRNO_H */
-#if FOOTERS
-#include <time.h>        /* for magic initialization */
-#endif /* FOOTERS */
-#ifndef LACKS_STDLIB_H
-#include <stdlib.h>      /* for abort() */
-#endif /* LACKS_STDLIB_H */
-#ifdef DEBUG
-#if ABORT_ON_ASSERT_FAILURE
-#define assert(x) if(!(x)) ABORT
-#else /* ABORT_ON_ASSERT_FAILURE */
-#include <assert.h>
-#endif /* ABORT_ON_ASSERT_FAILURE */
-#else  /* DEBUG */
-#define assert(x)
-#endif /* DEBUG */
-#ifndef LACKS_STRING_H
-#include <string.h>      /* for memset etc */
-#endif  /* LACKS_STRING_H */
-#if USE_BUILTIN_FFS
-#ifndef LACKS_STRINGS_H
-#include <strings.h>     /* for ffs */
-#endif /* LACKS_STRINGS_H */
-#endif /* USE_BUILTIN_FFS */
-#if HAVE_MMAP
-#ifndef LACKS_SYS_MMAN_H
-#include <sys/mman.h>    /* for mmap */
-#endif /* LACKS_SYS_MMAN_H */
-#ifndef LACKS_FCNTL_H
-#include <fcntl.h>
-#endif /* LACKS_FCNTL_H */
-#endif /* HAVE_MMAP */
-#if HAVE_MORECORE
-#ifndef LACKS_UNISTD_H
-#include <unistd.h>     /* for sbrk */
-#else /* LACKS_UNISTD_H */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-extern void*     sbrk(ptrdiff_t);
-#endif /* FreeBSD etc */
-#endif /* LACKS_UNISTD_H */
-#endif /* HAVE_MMAP */
-
-#ifndef WIN32
-#ifndef malloc_getpagesize
-#  ifdef _SC_PAGESIZE         /* some SVR4 systems omit an underscore */
-#    ifndef _SC_PAGE_SIZE
-#      define _SC_PAGE_SIZE _SC_PAGESIZE
-#    endif
-#  endif
-#  ifdef _SC_PAGE_SIZE
-#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
-#  else
-#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
-       extern size_t getpagesize();
-#      define malloc_getpagesize getpagesize()
-#    else
-#      ifdef WIN32 /* use supplied emulation of getpagesize */
-#        define malloc_getpagesize getpagesize()
-#      else
-#        ifndef LACKS_SYS_PARAM_H
-#          include <sys/param.h>
-#        endif
-#        ifdef EXEC_PAGESIZE
-#          define malloc_getpagesize EXEC_PAGESIZE
-#        else
-#          ifdef NBPG
-#            ifndef CLSIZE
-#              define malloc_getpagesize NBPG
-#            else
-#              define malloc_getpagesize (NBPG * CLSIZE)
-#            endif
-#          else
-#            ifdef NBPC
-#              define malloc_getpagesize NBPC
-#            else
-#              ifdef PAGESIZE
-#                define malloc_getpagesize PAGESIZE
-#              else /* just guess */
-#                define malloc_getpagesize ((size_t)4096U)
-#              endif
-#            endif
-#          endif
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-#endif
-
-/* ------------------- size_t and alignment properties -------------------- */
-
-/* The byte and bit size of a size_t */
-#define SIZE_T_SIZE         (sizeof(size_t))
-#define SIZE_T_BITSIZE      (sizeof(size_t) << 3)
-
-/* Some constants coerced to size_t */
-/* Annoying but necessary to avoid errors on some plaftorms */
-#define SIZE_T_ZERO         ((size_t)0)
-#define SIZE_T_ONE          ((size_t)1)
-#define SIZE_T_TWO          ((size_t)2)
-#define TWO_SIZE_T_SIZES    (SIZE_T_SIZE<<1)
-#define FOUR_SIZE_T_SIZES   (SIZE_T_SIZE<<2)
-#define SIX_SIZE_T_SIZES    (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES)
-#define HALF_MAX_SIZE_T     (MAX_SIZE_T / 2U)
-
-/* The bit mask value corresponding to MALLOC_ALIGNMENT */
-#define CHUNK_ALIGN_MASK    (MALLOC_ALIGNMENT - SIZE_T_ONE)
-
-/* True if address a has acceptable alignment */
-#define is_aligned(A)       (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0)
-
-/* the number of bytes to offset an address to align it */
-#define align_offset(A)\
- ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\
-  ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK))
-
-/* -------------------------- MMAP preliminaries ------------------------- */
-
-/*
-   If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and
-   checks to fail so compiler optimizer can delete code rather than
-   using so many "#if"s.
-*/
-
-
-/* MORECORE and MMAP must return MFAIL on failure */
-#define MFAIL                ((void*)(MAX_SIZE_T))
-#define CMFAIL               ((char*)(MFAIL)) /* defined for convenience */
-
-#if !HAVE_MMAP
-#define IS_MMAPPED_BIT       (SIZE_T_ZERO)
-#define USE_MMAP_BIT         (SIZE_T_ZERO)
-#define CALL_MMAP(s)         MFAIL
-#define CALL_MUNMAP(a, s)    (-1)
-#define DIRECT_MMAP(s)       MFAIL
-
-#else /* HAVE_MMAP */
-#define IS_MMAPPED_BIT       (SIZE_T_ONE)
-#define USE_MMAP_BIT         (SIZE_T_ONE)
-
-#ifndef WIN32
-#define CALL_MUNMAP(a, s)    munmap((a), (s))
-#define MMAP_PROT            (PROT_READ|PROT_WRITE)
-#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
-#define MAP_ANONYMOUS        MAP_ANON
-#endif /* MAP_ANON */
-#ifdef MAP_ANONYMOUS
-#define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS)
-#define CALL_MMAP(s)         mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
-#else /* MAP_ANONYMOUS */
-/*
-   Nearly all versions of mmap support MAP_ANONYMOUS, so the following
-   is unlikely to be needed, but is supplied just in case.
-*/
-#define MMAP_FLAGS           (MAP_PRIVATE)
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \
-           (dev_zero_fd = open("/dev/zero", O_RDWR), \
-            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \
-            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0))
-#endif /* MAP_ANONYMOUS */
-
-#define DIRECT_MMAP(s)       CALL_MMAP(s)
-#else /* WIN32 */
-
-/* Win32 MMAP via VirtualAlloc */
-static void* win32mmap(size_t size) {
-  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
-  return (ptr != 0)? ptr: MFAIL;
-}
-
-/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */
-static void* win32direct_mmap(size_t size) {
-  void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN,
-                           PAGE_READWRITE);
-  return (ptr != 0)? ptr: MFAIL;
-}
-
-/* This function supports releasing coalesed segments */
-static int win32munmap(void* ptr, size_t size) {
-  MEMORY_BASIC_INFORMATION minfo;
-  char* cptr = ptr;
-  while (size) {
-    if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
-      return -1;
-    if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
-        minfo.State != MEM_COMMIT || minfo.RegionSize > size)
-      return -1;
-    if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
-      return -1;
-    cptr += minfo.RegionSize;
-    size -= minfo.RegionSize;
-  }
-  return 0;
-}
-
-#define CALL_MMAP(s)         win32mmap(s)
-#define CALL_MUNMAP(a, s)    win32munmap((a), (s))
-#define DIRECT_MMAP(s)       win32direct_mmap(s)
-#endif /* WIN32 */
-#endif /* HAVE_MMAP */
-
-#if HAVE_MMAP && HAVE_MREMAP
-#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
-#else  /* HAVE_MMAP && HAVE_MREMAP */
-#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
-#endif /* HAVE_MMAP && HAVE_MREMAP */
-
-#if HAVE_MORECORE
-#define CALL_MORECORE(S)     MORECORE(S)
-#else  /* HAVE_MORECORE */
-#define CALL_MORECORE(S)     MFAIL
-#endif /* HAVE_MORECORE */
-
-/* mstate bit set if continguous morecore disabled or failed */
-#define USE_NONCONTIGUOUS_BIT (4U)
-
-/* segment bit set in create_mspace_with_base */
-#define EXTERN_BIT            (8U)
-
-
-/* --------------------------- Lock preliminaries ------------------------ */
-
-#if USE_LOCKS
-
-/*
-  When locks are defined, there are up to two global locks:
-
-  * If HAVE_MORECORE, morecore_mutex protects sequences of calls to
-    MORECORE.  In many cases sys_alloc requires two calls, that should
-    not be interleaved with calls by other threads.  This does not
-    protect against direct calls to MORECORE by other threads not
-    using this lock, so there is still code to cope the best we can on
-    interference.
-
-  * magic_init_mutex ensures that mparams.magic and other
-    unique mparams values are initialized only once.
-*/
-
-#ifndef WIN32
-/* By default use posix locks */
-#include <pthread.h>
-#define MLOCK_T pthread_mutex_t
-#define INITIAL_LOCK(l)      pthread_mutex_init(l, NULL)
-#define ACQUIRE_LOCK(l)      pthread_mutex_lock(l)
-#define RELEASE_LOCK(l)      pthread_mutex_unlock(l)
-
-#if HAVE_MORECORE
-static MLOCK_T morecore_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif /* HAVE_MORECORE */
-
-static MLOCK_T magic_init_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#else /* WIN32 */
-/*
-   Because lock-protected regions have bounded times, and there
-   are no recursive lock calls, we can use simple spinlocks.
-*/
-
-#define MLOCK_T long
-static int win32_acquire_lock (MLOCK_T *sl) {
-  for (;;) {
-#ifdef InterlockedCompareExchangePointer
-    if (!InterlockedCompareExchange(sl, 1, 0))
-      return 0;
-#else  /* Use older void* version */
-    if (!InterlockedCompareExchange((void**)sl, (void*)1, (void*)0))
-      return 0;
-#endif /* InterlockedCompareExchangePointer */
-    Sleep (0);
-  }
-}
-
-static void win32_release_lock (MLOCK_T *sl) {
-  InterlockedExchange (sl, 0);
-}
-
-#define INITIAL_LOCK(l)      *(l)=0
-#define ACQUIRE_LOCK(l)      win32_acquire_lock(l)
-#define RELEASE_LOCK(l)      win32_release_lock(l)
-#if HAVE_MORECORE
-static MLOCK_T morecore_mutex;
-#endif /* HAVE_MORECORE */
-static MLOCK_T magic_init_mutex;
-#endif /* WIN32 */
-
-#define USE_LOCK_BIT               (2U)
-#else  /* USE_LOCKS */
-#define USE_LOCK_BIT               (0U)
-#define INITIAL_LOCK(l)
-#endif /* USE_LOCKS */
-
-#if USE_LOCKS && HAVE_MORECORE
-#define ACQUIRE_MORECORE_LOCK()    ACQUIRE_LOCK(&morecore_mutex);
-#define RELEASE_MORECORE_LOCK()    RELEASE_LOCK(&morecore_mutex);
-#else /* USE_LOCKS && HAVE_MORECORE */
-#define ACQUIRE_MORECORE_LOCK()
-#define RELEASE_MORECORE_LOCK()
-#endif /* USE_LOCKS && HAVE_MORECORE */
-
-#if USE_LOCKS
-#define ACQUIRE_MAGIC_INIT_LOCK()  ACQUIRE_LOCK(&magic_init_mutex);
-#define RELEASE_MAGIC_INIT_LOCK()  RELEASE_LOCK(&magic_init_mutex);
-#else  /* USE_LOCKS */
-#define ACQUIRE_MAGIC_INIT_LOCK()
-#define RELEASE_MAGIC_INIT_LOCK()
-#endif /* USE_LOCKS */
-
-
-/* -----------------------  Chunk representations ------------------------ */
-
-/*
-  (The following includes lightly edited explanations by Colin Plumb.)
-
-  The malloc_chunk declaration below is misleading (but accurate and
-  necessary).  It declares a "view" into memory allowing access to
-  necessary fields at known offsets from a given base.
-
-  Chunks of memory are maintained using a `boundary tag' method as
-  originally described by Knuth.  (See the paper by Paul Wilson
-  ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such
-  techniques.)  Sizes of free chunks are stored both in the front of
-  each chunk and at the end.  This makes consolidating fragmented
-  chunks into bigger chunks fast.  The head fields also hold bits
-  representing whether chunks are free or in use.
-
-  Here are some pictures to make it clearer.  They are "exploded" to
-  show that the state of a chunk can be thought of as extending from
-  the high 31 bits of the head field of its header through the
-  prev_foot and PINUSE_BIT bit of the following chunk header.
-
-  A chunk that's in use looks like:
-
-   chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-           | Size of previous chunk (if P = 1)                             |
-           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
-         | Size of this chunk                                         1| +-+
-   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                                                               |
-         +-                                                             -+
-         |                                                               |
-         +-                                                             -+
-         |                                                               :
-         +-      size - sizeof(size_t) available payload bytes          -+
-         :                                                               |
- chunk-> +-                                                             -+
-         |                                                               |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1|
-       | Size of next chunk (may or may not be in use)               | +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-    And if it's free, it looks like this:
-
-   chunk-> +-                                                             -+
-           | User payload (must be in use, or we would have merged!)       |
-           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
-         | Size of this chunk                                         0| +-+
-   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         | Next pointer                                                  |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         | Prev pointer                                                  |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                                                               :
-         +-      size - sizeof(struct chunk) unused bytes               -+
-         :                                                               |
- chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         | Size of this chunk                                            |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0|
-       | Size of next chunk (must be in use, or we would have merged)| +-+
- mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-       |                                                               :
-       +- User payload                                                -+
-       :                                                               |
-       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-                                                                     |0|
-                                                                     +-+
-  Note that since we always merge adjacent free chunks, the chunks
-  adjacent to a free chunk must be in use.
-
-  Given a pointer to a chunk (which can be derived trivially from the
-  payload pointer) we can, in O(1) time, find out whether the adjacent
-  chunks are free, and if so, unlink them from the lists that they
-  are on and merge them with the current chunk.
-
-  Chunks always begin on even word boundaries, so the mem portion
-  (which is returned to the user) is also on an even word boundary, and
-  thus at least double-word aligned.
-
-  The P (PINUSE_BIT) bit, stored in the unused low-order bit of the
-  chunk size (which is always a multiple of two words), is an in-use
-  bit for the *previous* chunk.  If that bit is *clear*, then the
-  word before the current chunk size contains the previous chunk
-  size, and can be used to find the front of the previous chunk.
-  The very first chunk allocated always has this bit set, preventing
-  access to non-existent (or non-owned) memory. If pinuse is set for
-  any given chunk, then you CANNOT determine the size of the
-  previous chunk, and might even get a memory addressing fault when
-  trying to do so.
-
-  The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of
-  the chunk size redundantly records whether the current chunk is
-  inuse. This redundancy enables usage checks within free and realloc,
-  and reduces indirection when freeing and consolidating chunks.
-
-  Each freshly allocated chunk must have both cinuse and pinuse set.
-  That is, each allocated chunk borders either a previously allocated
-  and still in-use chunk, or the base of its memory arena. This is
-  ensured by making all allocations from the the `lowest' part of any
-  found chunk.  Further, no free chunk physically borders another one,
-  so each free chunk is known to be preceded and followed by either
-  inuse chunks or the ends of memory.
-
-  Note that the `foot' of the current chunk is actually represented
-  as the prev_foot of the NEXT chunk. This makes it easier to
-  deal with alignments etc but can be very confusing when trying
-  to extend or adapt this code.
-
-  The exceptions to all this are
-
-     1. The special chunk `top' is the top-most available chunk (i.e.,
-        the one bordering the end of available memory). It is treated
-        specially.  Top is never included in any bin, is used only if
-        no other chunk is available, and is released back to the
-        system if it is very large (see M_TRIM_THRESHOLD).  In effect,
-        the top chunk is treated as larger (and thus less well
-        fitting) than any other available chunk.  The top chunk
-        doesn't update its trailing size field since there is no next
-        contiguous chunk that would have to index off it. However,
-        space is still allocated for it (TOP_FOOT_SIZE) to enable
-        separation or merging when space is extended.
-
-     3. Chunks allocated via mmap, which have the lowest-order bit
-        (IS_MMAPPED_BIT) set in their prev_foot fields, and do not set
-        PINUSE_BIT in their head fields.  Because they are allocated
-        one-by-one, each must carry its own prev_foot field, which is
-        also used to hold the offset this chunk has within its mmapped
-        region, which is needed to preserve alignment. Each mmapped
-        chunk is trailed by the first two fields of a fake next-chunk
-        for sake of usage checks.
-
-*/
-
-struct malloc_chunk {
-  size_t               prev_foot;  /* Size of previous chunk (if free).  */
-  size_t               head;       /* Size and inuse bits. */
-  struct malloc_chunk* fd;         /* double links -- used only if free. */
-  struct malloc_chunk* bk;
-};
-
-typedef struct malloc_chunk  mchunk;
-typedef struct malloc_chunk* mchunkptr;
-typedef struct malloc_chunk* sbinptr;  /* The type of bins of chunks */
-typedef size_t bindex_t;               /* Described below */
-typedef unsigned int binmap_t;         /* Described below */
-typedef unsigned int flag_t;           /* The type of various bit flag sets */
-
-/* ------------------- Chunks sizes and alignments ----------------------- */
-
-#define MCHUNK_SIZE         (sizeof(mchunk))
-
-#if FOOTERS
-#define CHUNK_OVERHEAD      (TWO_SIZE_T_SIZES)
-#else /* FOOTERS */
-#define CHUNK_OVERHEAD      (SIZE_T_SIZE)
-#endif /* FOOTERS */
-
-/* MMapped chunks need a second word of overhead ... */
-#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES)
-/* ... and additional padding for fake next-chunk at foot */
-#define MMAP_FOOT_PAD       (FOUR_SIZE_T_SIZES)
-
-/* The smallest size we can malloc is an aligned minimal chunk */
-#define MIN_CHUNK_SIZE\
-  ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
-
-/* conversion from malloc headers to user pointers, and back */
-#define chunk2mem(p)        ((void*)((char*)(p)       + TWO_SIZE_T_SIZES))
-#define mem2chunk(mem)      ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES))
-/* chunk associated with aligned address A */
-#define align_as_chunk(A)   (mchunkptr)((A) + align_offset(chunk2mem(A)))
-
-/* Bounds on request (not chunk) sizes. */
-#define MAX_REQUEST         ((-MIN_CHUNK_SIZE) << 2)
-#define MIN_REQUEST         (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE)
-
-/* pad request bytes into a usable size */
-#define pad_request(req) \
-   (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
-
-/* pad request, checking for minimum (but not maximum) */
-#define request2size(req) \
-  (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req))
-
-
-/* ------------------ Operations on head and foot fields ----------------- */
-
-/*
-  The head field of a chunk is or'ed with PINUSE_BIT when previous
-  adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in
-  use. If the chunk was obtained with mmap, the prev_foot field has
-  IS_MMAPPED_BIT set, otherwise holding the offset of the base of the
-  mmapped region to the base of the chunk.
-*/
-
-#define PINUSE_BIT          (SIZE_T_ONE)
-#define CINUSE_BIT          (SIZE_T_TWO)
-#define INUSE_BITS          (PINUSE_BIT|CINUSE_BIT)
-
-/* Head value for fenceposts */
-#define FENCEPOST_HEAD      (INUSE_BITS|SIZE_T_SIZE)
-
-/* extraction of fields from head words */
-#define cinuse(p)           ((p)->head & CINUSE_BIT)
-#define pinuse(p)           ((p)->head & PINUSE_BIT)
-#define chunksize(p)        ((p)->head & ~(INUSE_BITS))
-
-#define clear_pinuse(p)     ((p)->head &= ~PINUSE_BIT)
-#define clear_cinuse(p)     ((p)->head &= ~CINUSE_BIT)
-
-/* Treat space at ptr +/- offset as a chunk */
-#define chunk_plus_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
-#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s)))
-
-/* Ptr to next or previous physical malloc_chunk. */
-#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~INUSE_BITS)))
-#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) ))
-
-/* extract next chunk's pinuse bit */
-#define next_pinuse(p)  ((next_chunk(p)->head) & PINUSE_BIT)
-
-/* Get/set size at footer */
-#define get_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot)
-#define set_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s))
-
-/* Set size, pinuse bit, and foot */
-#define set_size_and_pinuse_of_free_chunk(p, s)\
-  ((p)->head = (s|PINUSE_BIT), set_foot(p, s))
-
-/* Set size, pinuse bit, foot, and clear next pinuse */
-#define set_free_with_pinuse(p, s, n)\
-  (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s))
-
-#define is_mmapped(p)\
-  (!((p)->head & PINUSE_BIT) && ((p)->prev_foot & IS_MMAPPED_BIT))
-
-/* Get the internal overhead associated with chunk p */
-#define overhead_for(p)\
- (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD)
-
-/* Return true if malloced space is not necessarily cleared */
-#if MMAP_CLEARS
-#define calloc_must_clear(p) (!is_mmapped(p))
-#else /* MMAP_CLEARS */
-#define calloc_must_clear(p) (1)
-#endif /* MMAP_CLEARS */
-
-/* ---------------------- Overlaid data structures ----------------------- */
-
-/*
-  When chunks are not in use, they are treated as nodes of either
-  lists or trees.
-
-  "Small"  chunks are stored in circular doubly-linked lists, and look
-  like this:
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of previous chunk                            |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `head:' |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Forward pointer to next chunk in list             |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Back pointer to previous chunk in list            |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Unused space (may be 0 bytes long)                .
-            .                                                               .
-            .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `foot:' |             Size of chunk, in bytes                           |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-  Larger chunks are kept in a form of bitwise digital trees (aka
-  tries) keyed on chunksizes.  Because malloc_tree_chunks are only for
-  free chunks greater than 256 bytes, their size doesn't impose any
-  constraints on user chunk sizes.  Each node looks like:
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of previous chunk                            |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `head:' |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Forward pointer to next chunk of same size        |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Back pointer to previous chunk of same size       |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Pointer to left child (child[0])                  |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Pointer to right child (child[1])                 |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Pointer to parent                                 |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             bin index of this chunk                           |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Unused space                                      .
-            .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `foot:' |             Size of chunk, in bytes                           |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-  Each tree holding treenodes is a tree of unique chunk sizes.  Chunks
-  of the same size are arranged in a circularly-linked list, with only
-  the oldest chunk (the next to be used, in our FIFO ordering)
-  actually in the tree.  (Tree members are distinguished by a non-null
-  parent pointer.)  If a chunk with the same size an an existing node
-  is inserted, it is linked off the existing node using pointers that
-  work in the same way as fd/bk pointers of small chunks.
-
-  Each tree contains a power of 2 sized range of chunk sizes (the
-  smallest is 0x100 <= x < 0x180), which is is divided in half at each
-  tree level, with the chunks in the smaller half of the range (0x100
-  <= x < 0x140 for the top nose) in the left subtree and the larger
-  half (0x140 <= x < 0x180) in the right subtree.  This is, of course,
-  done by inspecting individual bits.
-
-  Using these rules, each node's left subtree contains all smaller
-  sizes than its right subtree.  However, the node at the root of each
-  subtree has no particular ordering relationship to either.  (The
-  dividing line between the subtree sizes is based on trie relation.)
-  If we remove the last chunk of a given size from the interior of the
-  tree, we need to replace it with a leaf node.  The tree ordering
-  rules permit a node to be replaced by any leaf below it.
-
-  The smallest chunk in a tree (a common operation in a best-fit
-  allocator) can be found by walking a path to the leftmost leaf in
-  the tree.  Unlike a usual binary tree, where we follow left child
-  pointers until we reach a null, here we follow the right child
-  pointer any time the left one is null, until we reach a leaf with
-  both child pointers null. The smallest chunk in the tree will be
-  somewhere along that path.
-
-  The worst case number of steps to add, find, or remove a node is
-  bounded by the number of bits differentiating chunks within
-  bins. Under current bin calculations, this ranges from 6 up to 21
-  (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case
-  is of course much better.
-*/
-
-struct malloc_tree_chunk {
-  /* The first four fields must be compatible with malloc_chunk */
-  size_t                    prev_foot;
-  size_t                    head;
-  struct malloc_tree_chunk* fd;
-  struct malloc_tree_chunk* bk;
-
-  struct malloc_tree_chunk* child[2];
-  struct malloc_tree_chunk* parent;
-  bindex_t                  index;
-};
-
-typedef struct malloc_tree_chunk  tchunk;
-typedef struct malloc_tree_chunk* tchunkptr;
-typedef struct malloc_tree_chunk* tbinptr; /* The type of bins of trees */
-
-/* A little helper macro for trees */
-#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1])
-
-/* ----------------------------- Segments -------------------------------- */
-
-/*
-  Each malloc space may include non-contiguous segments, held in a
-  list headed by an embedded malloc_segment record representing the
-  top-most space. Segments also include flags holding properties of
-  the space. Large chunks that are directly allocated by mmap are not
-  included in this list. They are instead independently created and
-  destroyed without otherwise keeping track of them.
-
-  Segment management mainly comes into play for spaces allocated by
-  MMAP.  Any call to MMAP might or might not return memory that is
-  adjacent to an existing segment.  MORECORE normally contiguously
-  extends the current space, so this space is almost always adjacent,
-  which is simpler and faster to deal with. (This is why MORECORE is
-  used preferentially to MMAP when both are available -- see
-  sys_alloc.)  When allocating using MMAP, we don't use any of the
-  hinting mechanisms (inconsistently) supported in various
-  implementations of unix mmap, or distinguish reserving from
-  committing memory. Instead, we just ask for space, and exploit
-  contiguity when we get it.  It is probably possible to do
-  better than this on some systems, but no general scheme seems
-  to be significantly better.
-
-  Management entails a simpler variant of the consolidation scheme
-  used for chunks to reduce fragmentation -- new adjacent memory is
-  normally prepended or appended to an existing segment. However,
-  there are limitations compared to chunk consolidation that mostly
-  reflect the fact that segment processing is relatively infrequent
-  (occurring only when getting memory from system) and that we
-  don't expect to have huge numbers of segments:
-
-  * Segments are not indexed, so traversal requires linear scans.  (It
-    would be possible to index these, but is not worth the extra
-    overhead and complexity for most programs on most platforms.)
-  * New segments are only appended to old ones when holding top-most
-    memory; if they cannot be prepended to others, they are held in
-    different segments.
-
-  Except for the top-most segment of an mstate, each segment record
-  is kept at the tail of its segment. Segments are added by pushing
-  segment records onto the list headed by &mstate.seg for the
-  containing mstate.
-
-  Segment flags control allocation/merge/deallocation policies:
-  * If EXTERN_BIT set, then we did not allocate this segment,
-    and so should not try to deallocate or merge with others.
-    (This currently holds only for the initial segment passed
-    into create_mspace_with_base.)
-  * If IS_MMAPPED_BIT set, the segment may be merged with
-    other surrounding mmapped segments and trimmed/de-allocated
-    using munmap.
-  * If neither bit is set, then the segment was obtained using
-    MORECORE so can be merged with surrounding MORECORE'd segments
-    and deallocated/trimmed using MORECORE with negative arguments.
-*/
-
-struct malloc_segment {
-  char*        base;             /* base address */
-  size_t       size;             /* allocated size */
-  struct malloc_segment* next;   /* ptr to next segment */
-  flag_t       sflags;           /* mmap and extern flag */
-};
-
-#define is_mmapped_segment(S)  ((S)->sflags & IS_MMAPPED_BIT)
-#define is_extern_segment(S)   ((S)->sflags & EXTERN_BIT)
-
-typedef struct malloc_segment  msegment;
-typedef struct malloc_segment* msegmentptr;
-
-/* ---------------------------- malloc_state ----------------------------- */
-
-/*
-   A malloc_state holds all of the bookkeeping for a space.
-   The main fields are:
-
-  Top
-    The topmost chunk of the currently active segment. Its size is
-    cached in topsize.  The actual size of topmost space is
-    topsize+TOP_FOOT_SIZE, which includes space reserved for adding
-    fenceposts and segment records if necessary when getting more
-    space from the system.  The size at which to autotrim top is
-    cached from mparams in trim_check, except that it is disabled if
-    an autotrim fails.
-
-  Designated victim (dv)
-    This is the preferred chunk for servicing small requests that
-    don't have exact fits.  It is normally the chunk split off most
-    recently to service another small request.  Its size is cached in
-    dvsize. The link fields of this chunk are not maintained since it
-    is not kept in a bin.
-
-  SmallBins
-    An array of bin headers for free chunks.  These bins hold chunks
-    with sizes less than MIN_LARGE_SIZE bytes. Each bin contains
-    chunks of all the same size, spaced 8 bytes apart.  To simplify
-    use in double-linked lists, each bin header acts as a malloc_chunk
-    pointing to the real first node, if it exists (else pointing to
-    itself).  This avoids special-casing for headers.  But to avoid
-    waste, we allocate only the fd/bk pointers of bins, and then use
-    repositioning tricks to treat these as the fields of a chunk.
-
-  TreeBins
-    Treebins are pointers to the roots of trees holding a range of
-    sizes. There are 2 equally spaced treebins for each power of two
-    from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything
-    larger.
-
-  Bin maps
-    There is one bit map for small bins ("smallmap") and one for
-    treebins ("treemap).  Each bin sets its bit when non-empty, and
-    clears the bit when empty.  Bit operations are then used to avoid
-    bin-by-bin searching -- nearly all "search" is done without ever
-    looking at bins that won't be selected.  The bit maps
-    conservatively use 32 bits per map word, even if on 64bit system.
-    For a good description of some of the bit-based techniques used
-    here, see Henry S. Warren Jr's book "Hacker's Delight" (and
-    supplement at http://hackersdelight.org/). Many of these are
-    intended to reduce the branchiness of paths through malloc etc, as
-    well as to reduce the number of memory locations read or written.
-
-  Segments
-    A list of segments headed by an embedded malloc_segment record
-    representing the initial space.
-
-  Address check support
-    The least_addr field is the least address ever obtained from
-    MORECORE or MMAP. Attempted frees and reallocs of any address less
-    than this are trapped (unless INSECURE is defined).
-
-  Magic tag
-    A cross-check field that should always hold same value as mparams.magic.
-
-  Flags
-    Bits recording whether to use MMAP, locks, or contiguous MORECORE
-
-  Statistics
-    Each space keeps track of current and maximum system memory
-    obtained via MORECORE or MMAP.
-
-  Locking
-    If USE_LOCKS is defined, the "mutex" lock is acquired and released
-    around every public call using this mspace.
-*/
-
-/* Bin types, widths and sizes */
-#define NSMALLBINS        (32U)
-#define NTREEBINS         (32U)
-#define SMALLBIN_SHIFT    (3U)
-#define SMALLBIN_WIDTH    (SIZE_T_ONE << SMALLBIN_SHIFT)
-#define TREEBIN_SHIFT     (8U)
-#define MIN_LARGE_SIZE    (SIZE_T_ONE << TREEBIN_SHIFT)
-#define MAX_SMALL_SIZE    (MIN_LARGE_SIZE - SIZE_T_ONE)
-#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD)
-
-struct malloc_state {
-  binmap_t   smallmap;
-  binmap_t   treemap;
-  size_t     dvsize;
-  size_t     topsize;
-  char*      least_addr;
-  mchunkptr  dv;
-  mchunkptr  top;
-  size_t     trim_check;
-  size_t     magic;
-  mchunkptr  smallbins[(NSMALLBINS+1)*2];
-  tbinptr    treebins[NTREEBINS];
-  size_t     footprint;
-  size_t     max_footprint;
-  flag_t     mflags;
-#if USE_LOCKS
-  MLOCK_T    mutex;     /* locate lock among fields that rarely change */
-#endif /* USE_LOCKS */
-  msegment   seg;
-};
-
-typedef struct malloc_state*    mstate;
-
-/* ------------- Global malloc_state and malloc_params ------------------- */
-
-/*
-  malloc_params holds global properties, including those that can be
-  dynamically set using mallopt. There is a single instance, mparams,
-  initialized in init_mparams.
-*/
-
-struct malloc_params {
-  size_t magic;
-  size_t page_size;
-  size_t granularity;
-  size_t mmap_threshold;
-  size_t trim_threshold;
-  flag_t default_mflags;
-};
-
-static struct malloc_params mparams;
-
-/* The global malloc_state used for all non-"mspace" calls */
-static struct malloc_state _gm_;
-#define gm                 (&_gm_)
-#define is_global(M)       ((M) == &_gm_)
-#define is_initialized(M)  ((M)->top != 0)
-
-/* -------------------------- system alloc setup ------------------------- */
-
-/* Operations on mflags */
-
-#define use_lock(M)           ((M)->mflags &   USE_LOCK_BIT)
-#define enable_lock(M)        ((M)->mflags |=  USE_LOCK_BIT)
-#define disable_lock(M)       ((M)->mflags &= ~USE_LOCK_BIT)
-
-#define use_mmap(M)           ((M)->mflags &   USE_MMAP_BIT)
-#define enable_mmap(M)        ((M)->mflags |=  USE_MMAP_BIT)
-#define disable_mmap(M)       ((M)->mflags &= ~USE_MMAP_BIT)
-
-#define use_noncontiguous(M)  ((M)->mflags &   USE_NONCONTIGUOUS_BIT)
-#define disable_contiguous(M) ((M)->mflags |=  USE_NONCONTIGUOUS_BIT)
-
-#define set_lock(M,L)\
- ((M)->mflags = (L)?\
-  ((M)->mflags | USE_LOCK_BIT) :\
-  ((M)->mflags & ~USE_LOCK_BIT))
-
-/* page-align a size */
-#define page_align(S)\
- (((S) + (mparams.page_size)) & ~(mparams.page_size - SIZE_T_ONE))
-
-/* granularity-align a size */
-#define granularity_align(S)\
-  (((S) + (mparams.granularity)) & ~(mparams.granularity - SIZE_T_ONE))
-
-#define is_page_aligned(S)\
-   (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0)
-#define is_granularity_aligned(S)\
-   (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0)
-
-/*  True if segment S holds address A */
-#define segment_holds(S, A)\
-  ((char*)(A) >= S->base && (char*)(A) < S->base + S->size)
-
-/* Return segment holding given address */
-static msegmentptr segment_holding(mstate m, char* addr) {
-  msegmentptr sp = &m->seg;
-  for (;;) {
-    if (addr >= sp->base && addr < sp->base + sp->size)
-      return sp;
-    if ((sp = sp->next) == 0)
-      return 0;
-  }
-}
-
-/* Return true if segment contains a segment link */
-static int has_segment_link(mstate m, msegmentptr ss) {
-  msegmentptr sp = &m->seg;
-  for (;;) {
-    if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size)
-      return 1;
-    if ((sp = sp->next) == 0)
-      return 0;
-  }
-}
-
-#ifndef MORECORE_CANNOT_TRIM
-#define should_trim(M,s)  ((s) > (M)->trim_check)
-#else  /* MORECORE_CANNOT_TRIM */
-#define should_trim(M,s)  (0)
-#endif /* MORECORE_CANNOT_TRIM */
-
-/*
-  TOP_FOOT_SIZE is padding at the end of a segment, including space
-  that may be needed to place segment records and fenceposts when new
-  noncontiguous segments are added.
-*/
-#define TOP_FOOT_SIZE\
-  (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
-
-
-/* -------------------------------  Hooks -------------------------------- */
-
-/*
-  PREACTION should be defined to return 0 on success, and nonzero on
-  failure. If you are not using locking, you can redefine these to do
-  anything you like.
-*/
-
-#if USE_LOCKS
-
-/* Ensure locks are initialized */
-#define GLOBALLY_INITIALIZE() (mparams.page_size == 0 && init_mparams())
-
-#define PREACTION(M)  ((GLOBALLY_INITIALIZE() || use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0)
-#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); }
-#else /* USE_LOCKS */
-
-#ifndef PREACTION
-#define PREACTION(M) (0)
-#endif  /* PREACTION */
-
-#ifndef POSTACTION
-#define POSTACTION(M)
-#endif  /* POSTACTION */
-
-#endif /* USE_LOCKS */
-
-/*
-  CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses.
-  USAGE_ERROR_ACTION is triggered on detected bad frees and
-  reallocs. The argument p is an address that might have triggered the
-  fault. It is ignored by the two predefined actions, but might be
-  useful in custom actions that try to help diagnose errors.
-*/
-
-#if PROCEED_ON_ERROR
-
-/* A count of the number of corruption errors causing resets */
-int malloc_corruption_error_count;
-
-/* default corruption action */
-static void reset_on_error(mstate m);
-
-#define CORRUPTION_ERROR_ACTION(m)  reset_on_error(m)
-#define USAGE_ERROR_ACTION(m, p)
-
-#else /* PROCEED_ON_ERROR */
-
-#ifndef CORRUPTION_ERROR_ACTION
-#define CORRUPTION_ERROR_ACTION(m) ABORT
-#endif /* CORRUPTION_ERROR_ACTION */
-
-#ifndef USAGE_ERROR_ACTION
-#define USAGE_ERROR_ACTION(m,p) ABORT
-#endif /* USAGE_ERROR_ACTION */
-
-#endif /* PROCEED_ON_ERROR */
-
-/* -------------------------- Debugging setup ---------------------------- */
-
-#if ! DEBUG
-
-#define check_free_chunk(M,P)
-#define check_inuse_chunk(M,P)
-#define check_malloced_chunk(M,P,N)
-#define check_mmapped_chunk(M,P)
-#define check_malloc_state(M)
-#define check_top_chunk(M,P)
-
-#else /* DEBUG */
-#define check_free_chunk(M,P)       do_check_free_chunk(M,P)
-#define check_inuse_chunk(M,P)      do_check_inuse_chunk(M,P)
-#define check_top_chunk(M,P)        do_check_top_chunk(M,P)
-#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N)
-#define check_mmapped_chunk(M,P)    do_check_mmapped_chunk(M,P)
-#define check_malloc_state(M)       do_check_malloc_state(M)
-
-static void   do_check_any_chunk(mstate m, mchunkptr p);
-static void   do_check_top_chunk(mstate m, mchunkptr p);
-static void   do_check_mmapped_chunk(mstate m, mchunkptr p);
-static void   do_check_inuse_chunk(mstate m, mchunkptr p);
-static void   do_check_free_chunk(mstate m, mchunkptr p);
-static void   do_check_malloced_chunk(mstate m, void* mem, size_t s);
-static void   do_check_tree(mstate m, tchunkptr t);
-static void   do_check_treebin(mstate m, bindex_t i);
-static void   do_check_smallbin(mstate m, bindex_t i);
-static void   do_check_malloc_state(mstate m);
-static int    bin_find(mstate m, mchunkptr x);
-static size_t traverse_and_check(mstate m);
-#endif /* DEBUG */
-
-/* ---------------------------- Indexing Bins ---------------------------- */
-
-#define is_small(s)         (((s) >> SMALLBIN_SHIFT) < NSMALLBINS)
-#define small_index(s)      ((s)  >> SMALLBIN_SHIFT)
-#define small_index2size(i) ((i)  << SMALLBIN_SHIFT)
-#define MIN_SMALL_INDEX     (small_index(MIN_CHUNK_SIZE))
-
-/* addressing by index. See above about smallbin repositioning */
-#define smallbin_at(M, i)   ((sbinptr)((char*)&((M)->smallbins[(i)<<1])))
-#define treebin_at(M,i)     (&((M)->treebins[i]))
-
-/* assign tree index for size S to variable I */
-#if defined(__GNUC__) && defined(i386)
-#define compute_tree_index(S, I)\
-{\
-  size_t X = S >> TREEBIN_SHIFT;\
-  if (X == 0)\
-    I = 0;\
-  else if (X > 0xFFFF)\
-    I = NTREEBINS-1;\
-  else {\
-    unsigned int K;\
-    __asm__("bsrl %1,%0\n\t" : "=r" (K) : "rm"  (X));\
-    I =  (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
-  }\
-}
-#else /* GNUC */
-#define compute_tree_index(S, I)\
-{\
-  size_t X = S >> TREEBIN_SHIFT;\
-  if (X == 0)\
-    I = 0;\
-  else if (X > 0xFFFF)\
-    I = NTREEBINS-1;\
-  else {\
-    unsigned int Y = (unsigned int)X;\
-    unsigned int N = ((Y - 0x100) >> 16) & 8;\
-    unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\
-    N += K;\
-    N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\
-    K = 14 - N + ((Y <<= K) >> 15);\
-    I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
-  }\
-}
-#endif /* GNUC */
-
-/* Bit representing maximum resolved size in a treebin at i */
-#define bit_for_tree_index(i) \
-   (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2)
-
-/* Shift placing maximum resolved bit in a treebin at i as sign bit */
-#define leftshift_for_tree_index(i) \
-   ((i == NTREEBINS-1)? 0 : \
-    ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2)))
-
-/* The size of the smallest chunk held in bin with index i */
-#define minsize_for_tree_index(i) \
-   ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) |  \
-   (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1)))
-
-
-/* ------------------------ Operations on bin maps ----------------------- */
-
-/* bit corresponding to given index */
-#define idx2bit(i)              ((binmap_t)(1) << (i))
-
-/* Mark/Clear bits with given index */
-#define mark_smallmap(M,i)      ((M)->smallmap |=  idx2bit(i))
-#define clear_smallmap(M,i)     ((M)->smallmap &= ~idx2bit(i))
-#define smallmap_is_marked(M,i) ((M)->smallmap &   idx2bit(i))
-
-#define mark_treemap(M,i)       ((M)->treemap  |=  idx2bit(i))
-#define clear_treemap(M,i)      ((M)->treemap  &= ~idx2bit(i))
-#define treemap_is_marked(M,i)  ((M)->treemap  &   idx2bit(i))
-
-/* index corresponding to given bit */
-
-#if defined(__GNUC__) && defined(i386)
-#define compute_bit2idx(X, I)\
-{\
-  unsigned int J;\
-  __asm__("bsfl %1,%0\n\t" : "=r" (J) : "rm" (X));\
-  I = (bindex_t)J;\
-}
-
-#else /* GNUC */
-#if  USE_BUILTIN_FFS
-#define compute_bit2idx(X, I) I = ffs(X)-1
-
-#else /* USE_BUILTIN_FFS */
-#define compute_bit2idx(X, I)\
-{\
-  unsigned int Y = X - 1;\
-  unsigned int K = Y >> (16-4) & 16;\
-  unsigned int N = K;        Y >>= K;\
-  N += K = Y >> (8-3) &  8;  Y >>= K;\
-  N += K = Y >> (4-2) &  4;  Y >>= K;\
-  N += K = Y >> (2-1) &  2;  Y >>= K;\
-  N += K = Y >> (1-0) &  1;  Y >>= K;\
-  I = (bindex_t)(N + Y);\
-}
-#endif /* USE_BUILTIN_FFS */
-#endif /* GNUC */
-
-/* isolate the least set bit of a bitmap */
-#define least_bit(x)         ((x) & -(x))
-
-/* mask with all bits to left of least bit of x on */
-#define left_bits(x)         ((x<<1) | -(x<<1))
-
-/* mask with all bits to left of or equal to least bit of x on */
-#define same_or_left_bits(x) ((x) | -(x))
-
-
-/* ----------------------- Runtime Check Support ------------------------- */
-
-/*
-  For security, the main invariant is that malloc/free/etc never
-  writes to a static address other than malloc_state, unless static
-  malloc_state itself has been corrupted, which cannot occur via
-  malloc (because of these checks). In essence this means that we
-  believe all pointers, sizes, maps etc held in malloc_state, but
-  check all of those linked or offsetted from other embedded data
-  structures.  These checks are interspersed with main code in a way
-  that tends to minimize their run-time cost.
-
-  When FOOTERS is defined, in addition to range checking, we also
-  verify footer fields of inuse chunks, which can be used guarantee
-  that the mstate controlling malloc/free is intact.  This is a
-  streamlined version of the approach described by William Robertson
-  et al in "Run-time Detection of Heap-based Overflows" LISA'03
-  http://www.usenix.org/events/lisa03/tech/robertson.html The footer
-  of an inuse chunk holds the xor of its mstate and a random seed,
-  that is checked upon calls to free() and realloc().  This is
-  (probablistically) unguessable from outside the program, but can be
-  computed by any code successfully malloc'ing any chunk, so does not
-  itself provide protection against code that has already broken
-  security through some other means.  Unlike Robertson et al, we
-  always dynamically check addresses of all offset chunks (previous,
-  next, etc). This turns out to be cheaper than relying on hashes.
-*/
-
-#if !INSECURE
-/* Check if address a is at least as high as any from MORECORE or MMAP */
-#define ok_address(M, a) ((char*)(a) >= (M)->least_addr)
-/* Check if address of next chunk n is higher than base chunk p */
-#define ok_next(p, n)    ((char*)(p) < (char*)(n))
-/* Check if p has its cinuse bit on */
-#define ok_cinuse(p)     cinuse(p)
-/* Check if p has its pinuse bit on */
-#define ok_pinuse(p)     pinuse(p)
-
-#else /* !INSECURE */
-#define ok_address(M, a) (1)
-#define ok_next(b, n)    (1)
-#define ok_cinuse(p)     (1)
-#define ok_pinuse(p)     (1)
-#endif /* !INSECURE */
-
-#if (FOOTERS && !INSECURE)
-/* Check if (alleged) mstate m has expected magic field */
-#define ok_magic(M)      ((M)->magic == mparams.magic)
-#else  /* (FOOTERS && !INSECURE) */
-#define ok_magic(M)      (1)
-#endif /* (FOOTERS && !INSECURE) */
-
-
-/* In gcc, use __builtin_expect to minimize impact of checks */
-#if !INSECURE
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define RTCHECK(e)  __builtin_expect(e, 1)
-#else /* GNUC */
-#define RTCHECK(e)  (e)
-#endif /* GNUC */
-#else /* !INSECURE */
-#define RTCHECK(e)  (1)
-#endif /* !INSECURE */
-
-/* macros to set up inuse chunks with or without footers */
-
-#if !FOOTERS
-
-#define mark_inuse_foot(M,p,s)
-
-/* Set cinuse bit and pinuse bit of next chunk */
-#define set_inuse(M,p,s)\
-  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
-  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
-
-/* Set cinuse and pinuse of this chunk and pinuse of next chunk */
-#define set_inuse_and_pinuse(M,p,s)\
-  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
-  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
-
-/* Set size, cinuse and pinuse bit of this chunk */
-#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
-  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT))
-
-#else /* FOOTERS */
-
-/* Set foot of inuse chunk to be xor of mstate and seed */
-#define mark_inuse_foot(M,p,s)\
-  (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic))
-
-#define get_mstate_for(p)\
-  ((mstate)(((mchunkptr)((char*)(p) +\
-    (chunksize(p))))->prev_foot ^ mparams.magic))
-
-#define set_inuse(M,p,s)\
-  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
-  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \
-  mark_inuse_foot(M,p,s))
-
-#define set_inuse_and_pinuse(M,p,s)\
-  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
-  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\
- mark_inuse_foot(M,p,s))
-
-#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
-  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
-  mark_inuse_foot(M, p, s))
-
-#endif /* !FOOTERS */
-
-/* ---------------------------- setting mparams -------------------------- */
-
-/* Initialize mparams */
-static int init_mparams(void) {
-  if (mparams.page_size == 0) {
-    size_t s;
-
-    mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
-    mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
-#if MORECORE_CONTIGUOUS
-    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT;
-#else  /* MORECORE_CONTIGUOUS */
-    mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT;
-#endif /* MORECORE_CONTIGUOUS */
-
-#if (FOOTERS && !INSECURE)
-    {
-#if USE_DEV_RANDOM
-      int fd;
-      unsigned char buf[sizeof(size_t)];
-      /* Try to use /dev/urandom, else fall back on using time */
-      if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
-          read(fd, buf, sizeof(buf)) == sizeof(buf)) {
-        s = *((size_t *) buf);
-        close(fd);
-      }
-      else
-#endif /* USE_DEV_RANDOM */
-        s = (size_t)(time(0) ^ (size_t)0x55555555U);
-
-      s |= (size_t)8U;    /* ensure nonzero */
-      s &= ~(size_t)7U;   /* improve chances of fault for bad values */
-
-    }
-#else /* (FOOTERS && !INSECURE) */
-    s = (size_t)0x58585858U;
-#endif /* (FOOTERS && !INSECURE) */
-    ACQUIRE_MAGIC_INIT_LOCK();
-    if (mparams.magic == 0) {
-      mparams.magic = s;
-      /* Set up lock for main malloc area */
-      INITIAL_LOCK(&gm->mutex);
-      gm->mflags = mparams.default_mflags;
-    }
-    RELEASE_MAGIC_INIT_LOCK();
-
-#ifndef WIN32
-    mparams.page_size = malloc_getpagesize;
-    mparams.granularity = ((DEFAULT_GRANULARITY != 0)?
-                           DEFAULT_GRANULARITY : mparams.page_size);
-#else /* WIN32 */
-    {
-      SYSTEM_INFO system_info;
-      GetSystemInfo(&system_info);
-      mparams.page_size = system_info.dwPageSize;
-      mparams.granularity = system_info.dwAllocationGranularity;
-    }
-#endif /* WIN32 */
-
-    /* Sanity-check configuration:
-       size_t must be unsigned and as wide as pointer type.
-       ints must be at least 4 bytes.
-       alignment must be at least 8.
-       Alignment, min chunk size, and page size must all be powers of 2.
-    */
-    if ((sizeof(size_t) != sizeof(char*)) ||
-        (MAX_SIZE_T < MIN_CHUNK_SIZE)  ||
-        (sizeof(int) < 4)  ||
-        (MALLOC_ALIGNMENT < (size_t)8U) ||
-        ((MALLOC_ALIGNMENT    & (MALLOC_ALIGNMENT-SIZE_T_ONE))    != 0) ||
-        ((MCHUNK_SIZE         & (MCHUNK_SIZE-SIZE_T_ONE))         != 0) ||
-        ((mparams.granularity & (mparams.granularity-SIZE_T_ONE)) != 0) ||
-        ((mparams.page_size   & (mparams.page_size-SIZE_T_ONE))   != 0))
-      ABORT;
-  }
-  return 0;
-}
-
-/* support for mallopt */
-static int change_mparam(int param_number, int value) {
-  size_t val = (size_t)value;
-  init_mparams();
-  switch(param_number) {
-  case M_TRIM_THRESHOLD:
-    mparams.trim_threshold = val;
-    return 1;
-  case M_GRANULARITY:
-    if (val >= mparams.page_size && ((val & (val-1)) == 0)) {
-      mparams.granularity = val;
-      return 1;
-    }
-    else
-      return 0;
-  case M_MMAP_THRESHOLD:
-    mparams.mmap_threshold = val;
-    return 1;
-  default:
-    return 0;
-  }
-}
-
-#if DEBUG
-/* ------------------------- Debugging Support --------------------------- */
-
-/* Check properties of any chunk, whether free, inuse, mmapped etc  */
-static void do_check_any_chunk(mstate m, mchunkptr p) {
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
-}
-
-/* Check properties of top chunk */
-static void do_check_top_chunk(mstate m, mchunkptr p) {
-  msegmentptr sp = segment_holding(m, (char*)p);
-  size_t  sz = chunksize(p);
-  assert(sp != 0);
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
-  assert(sz == m->topsize);
-  assert(sz > 0);
-  assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE);
-  assert(pinuse(p));
-  assert(!next_pinuse(p));
-}
-
-/* Check properties of (inuse) mmapped chunks */
-static void do_check_mmapped_chunk(mstate m, mchunkptr p) {
-  size_t  sz = chunksize(p);
-  size_t len = (sz + (p->prev_foot & ~IS_MMAPPED_BIT) + MMAP_FOOT_PAD);
-  assert(is_mmapped(p));
-  assert(use_mmap(m));
-  assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
-  assert(ok_address(m, p));
-  assert(!is_small(sz));
-  assert((len & (mparams.page_size-SIZE_T_ONE)) == 0);
-  assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
-  assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0);
-}
-
-/* Check properties of inuse chunks */
-static void do_check_inuse_chunk(mstate m, mchunkptr p) {
-  do_check_any_chunk(m, p);
-  assert(cinuse(p));
-  assert(next_pinuse(p));
-  /* If not pinuse and not mmapped, previous chunk has OK offset */
-  assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
-  if (is_mmapped(p))
-    do_check_mmapped_chunk(m, p);
-}
-
-/* Check properties of free chunks */
-static void do_check_free_chunk(mstate m, mchunkptr p) {
-  size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT);
-  mchunkptr next = chunk_plus_offset(p, sz);
-  do_check_any_chunk(m, p);
-  assert(!cinuse(p));
-  assert(!next_pinuse(p));
-  assert (!is_mmapped(p));
-  if (p != m->dv && p != m->top) {
-    if (sz >= MIN_CHUNK_SIZE) {
-      assert((sz & CHUNK_ALIGN_MASK) == 0);
-      assert(is_aligned(chunk2mem(p)));
-      assert(next->prev_foot == sz);
-      assert(pinuse(p));
-      assert (next == m->top || cinuse(next));
-      assert(p->fd->bk == p);
-      assert(p->bk->fd == p);
-    }
-    else  /* markers are always of size SIZE_T_SIZE */
-      assert(sz == SIZE_T_SIZE);
-  }
-}
-
-/* Check properties of malloced chunks at the point they are malloced */
-static void do_check_malloced_chunk(mstate m, void* mem, size_t s) {
-  if (mem != 0) {
-    mchunkptr p = mem2chunk(mem);
-    size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT);
-    do_check_inuse_chunk(m, p);
-    assert((sz & CHUNK_ALIGN_MASK) == 0);
-    assert(sz >= MIN_CHUNK_SIZE);
-    assert(sz >= s);
-    /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
-    assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
-  }
-}
-
-/* Check a tree and its subtrees.  */
-static void do_check_tree(mstate m, tchunkptr t) {
-  tchunkptr head = 0;
-  tchunkptr u = t;
-  bindex_t tindex = t->index;
-  size_t tsize = chunksize(t);
-  bindex_t idx;
-  compute_tree_index(tsize, idx);
-  assert(tindex == idx);
-  assert(tsize >= MIN_LARGE_SIZE);
-  assert(tsize >= minsize_for_tree_index(idx));
-  assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1))));
-
-  do { /* traverse through chain of same-sized nodes */
-    do_check_any_chunk(m, ((mchunkptr)u));
-    assert(u->index == tindex);
-    assert(chunksize(u) == tsize);
-    assert(!cinuse(u));
-    assert(!next_pinuse(u));
-    assert(u->fd->bk == u);
-    assert(u->bk->fd == u);
-    if (u->parent == 0) {
-      assert(u->child[0] == 0);
-      assert(u->child[1] == 0);
-    }
-    else {
-      assert(head == 0); /* only one node on chain has parent */
-      head = u;
-      assert(u->parent != u);
-      assert (u->parent->child[0] == u ||
-              u->parent->child[1] == u ||
-              *((tbinptr*)(u->parent)) == u);
-      if (u->child[0] != 0) {
-        assert(u->child[0]->parent == u);
-        assert(u->child[0] != u);
-        do_check_tree(m, u->child[0]);
-      }
-      if (u->child[1] != 0) {
-        assert(u->child[1]->parent == u);
-        assert(u->child[1] != u);
-        do_check_tree(m, u->child[1]);
-      }
-      if (u->child[0] != 0 && u->child[1] != 0) {
-        assert(chunksize(u->child[0]) < chunksize(u->child[1]));
-      }
-    }
-    u = u->fd;
-  } while (u != t);
-  assert(head != 0);
-}
-
-/*  Check all the chunks in a treebin.  */
-static void do_check_treebin(mstate m, bindex_t i) {
-  tbinptr* tb = treebin_at(m, i);
-  tchunkptr t = *tb;
-  int empty = (m->treemap & (1U << i)) == 0;
-  if (t == 0)
-    assert(empty);
-  if (!empty)
-    do_check_tree(m, t);
-}
-
-/*  Check all the chunks in a smallbin.  */
-static void do_check_smallbin(mstate m, bindex_t i) {
-  sbinptr b = smallbin_at(m, i);
-  mchunkptr p = b->bk;
-  unsigned int empty = (m->smallmap & (1U << i)) == 0;
-  if (p == b)
-    assert(empty);
-  if (!empty) {
-    for (; p != b; p = p->bk) {
-      size_t size = chunksize(p);
-      mchunkptr q;
-      /* each chunk claims to be free */
-      do_check_free_chunk(m, p);
-      /* chunk belongs in bin */
-      assert(small_index(size) == i);
-      assert(p->bk == b || chunksize(p->bk) == chunksize(p));
-      /* chunk is followed by an inuse chunk */
-      q = next_chunk(p);
-      if (q->head != FENCEPOST_HEAD)
-        do_check_inuse_chunk(m, q);
-    }
-  }
-}
-
-/* Find x in a bin. Used in other check functions. */
-static int bin_find(mstate m, mchunkptr x) {
-  size_t size = chunksize(x);
-  if (is_small(size)) {
-    bindex_t sidx = small_index(size);
-    sbinptr b = smallbin_at(m, sidx);
-    if (smallmap_is_marked(m, sidx)) {
-      mchunkptr p = b;
-      do {
-        if (p == x)
-          return 1;
-      } while ((p = p->fd) != b);
-    }
-  }
-  else {
-    bindex_t tidx;
-    compute_tree_index(size, tidx);
-    if (treemap_is_marked(m, tidx)) {
-      tchunkptr t = *treebin_at(m, tidx);
-      size_t sizebits = size << leftshift_for_tree_index(tidx);
-      while (t != 0 && chunksize(t) != size) {
-        t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
-        sizebits <<= 1;
-      }
-      if (t != 0) {
-        tchunkptr u = t;
-        do {
-          if (u == (tchunkptr)x)
-            return 1;
-        } while ((u = u->fd) != t);
-      }
-    }
-  }
-  return 0;
-}
-
-/* Traverse each chunk and check it; return total */
-static size_t traverse_and_check(mstate m) {
-  size_t sum = 0;
-  if (is_initialized(m)) {
-    msegmentptr s = &m->seg;
-    sum += m->topsize + TOP_FOOT_SIZE;
-    while (s != 0) {
-      mchunkptr q = align_as_chunk(s->base);
-      mchunkptr lastq = 0;
-      assert(pinuse(q));
-      while (segment_holds(s, q) &&
-             q != m->top && q->head != FENCEPOST_HEAD) {
-        sum += chunksize(q);
-        if (cinuse(q)) {
-          assert(!bin_find(m, q));
-          do_check_inuse_chunk(m, q);
-        }
-        else {
-          assert(q == m->dv || bin_find(m, q));
-          assert(lastq == 0 || cinuse(lastq)); /* Not 2 consecutive free */
-          do_check_free_chunk(m, q);
-        }
-        lastq = q;
-        q = next_chunk(q);
-      }
-      s = s->next;
-    }
-  }
-  return sum;
-}
-
-/* Check all properties of malloc_state. */
-static void do_check_malloc_state(mstate m) {
-  bindex_t i;
-  size_t total;
-  /* check bins */
-  for (i = 0; i < NSMALLBINS; ++i)
-    do_check_smallbin(m, i);
-  for (i = 0; i < NTREEBINS; ++i)
-    do_check_treebin(m, i);
-
-  if (m->dvsize != 0) { /* check dv chunk */
-    do_check_any_chunk(m, m->dv);
-    assert(m->dvsize == chunksize(m->dv));
-    assert(m->dvsize >= MIN_CHUNK_SIZE);
-    assert(bin_find(m, m->dv) == 0);
-  }
-
-  if (m->top != 0) {   /* check top chunk */
-    do_check_top_chunk(m, m->top);
-    assert(m->topsize == chunksize(m->top));
-    assert(m->topsize > 0);
-    assert(bin_find(m, m->top) == 0);
-  }
-
-  total = traverse_and_check(m);
-  assert(total <= m->footprint);
-  assert(m->footprint <= m->max_footprint);
-}
-#endif /* DEBUG */
-
-/* ----------------------------- statistics ------------------------------ */
-
-#if !NO_MALLINFO
-static struct mallinfo internal_mallinfo(mstate m) {
-  struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  if (!PREACTION(m)) {
-    check_malloc_state(m);
-    if (is_initialized(m)) {
-      size_t nfree = SIZE_T_ONE; /* top always free */
-      size_t mfree = m->topsize + TOP_FOOT_SIZE;
-      size_t sum = mfree;
-      msegmentptr s = &m->seg;
-      while (s != 0) {
-        mchunkptr q = align_as_chunk(s->base);
-        while (segment_holds(s, q) &&
-               q != m->top && q->head != FENCEPOST_HEAD) {
-          size_t sz = chunksize(q);
-          sum += sz;
-          if (!cinuse(q)) {
-            mfree += sz;
-            ++nfree;
-          }
-          q = next_chunk(q);
-        }
-        s = s->next;
-      }
-
-      nm.arena    = sum;
-      nm.ordblks  = nfree;
-      nm.hblkhd   = m->footprint - sum;
-      nm.usmblks  = m->max_footprint;
-      nm.uordblks = m->footprint - mfree;
-      nm.fordblks = mfree;
-      nm.keepcost = m->topsize;
-    }
-
-    POSTACTION(m);
-  }
-  return nm;
-}
-#endif /* !NO_MALLINFO */
-
-static void internal_malloc_stats(mstate m) {
-  if (!PREACTION(m)) {
-    size_t maxfp = 0;
-    size_t fp = 0;
-    size_t used = 0;
-    check_malloc_state(m);
-    if (is_initialized(m)) {
-      msegmentptr s = &m->seg;
-      maxfp = m->max_footprint;
-      fp = m->footprint;
-      used = fp - (m->topsize + TOP_FOOT_SIZE);
-
-      while (s != 0) {
-        mchunkptr q = align_as_chunk(s->base);
-        while (segment_holds(s, q) &&
-               q != m->top && q->head != FENCEPOST_HEAD) {
-          if (!cinuse(q))
-            used -= chunksize(q);
-          q = next_chunk(q);
-        }
-        s = s->next;
-      }
-    }
-
-#ifndef LACKS_STDIO_H
-    fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp));
-    fprintf(stderr, "system bytes     = %10lu\n", (unsigned long)(fp));
-    fprintf(stderr, "in use bytes     = %10lu\n", (unsigned long)(used));
-#endif
-
-    POSTACTION(m);
-  }
-}
-
-/* ----------------------- Operations on smallbins ----------------------- */
-
-/*
-  Various forms of linking and unlinking are defined as macros.  Even
-  the ones for trees, which are very long but have very short typical
-  paths.  This is ugly but reduces reliance on inlining support of
-  compilers.
-*/
-
-/* Link a free chunk into a smallbin  */
-#define insert_small_chunk(M, P, S) {\
-  bindex_t I  = small_index(S);\
-  mchunkptr B = smallbin_at(M, I);\
-  mchunkptr F = B;\
-  assert(S >= MIN_CHUNK_SIZE);\
-  if (!smallmap_is_marked(M, I))\
-    mark_smallmap(M, I);\
-  else if (RTCHECK(ok_address(M, B->fd)))\
-    F = B->fd;\
-  else {\
-    CORRUPTION_ERROR_ACTION(M);\
-  }\
-  B->fd = P;\
-  F->bk = P;\
-  P->fd = F;\
-  P->bk = B;\
-}
-
-/* Unlink a chunk from a smallbin  */
-#define unlink_small_chunk(M, P, S) {\
-  mchunkptr F = P->fd;\
-  mchunkptr B = P->bk;\
-  bindex_t I = small_index(S);\
-  assert(P != B);\
-  assert(P != F);\
-  assert(chunksize(P) == small_index2size(I));\
-  if (F == B)\
-    clear_smallmap(M, I);\
-  else if (RTCHECK((F == smallbin_at(M,I) || ok_address(M, F)) &&\
-                   (B == smallbin_at(M,I) || ok_address(M, B)))) {\
-    F->bk = B;\
-    B->fd = F;\
-  }\
-  else {\
-    CORRUPTION_ERROR_ACTION(M);\
-  }\
-}
-
-/* Unlink the first chunk from a smallbin */
-#define unlink_first_small_chunk(M, B, P, I) {\
-  mchunkptr F = P->fd;\
-  assert(P != B);\
-  assert(P != F);\
-  assert(chunksize(P) == small_index2size(I));\
-  if (B == F)\
-    clear_smallmap(M, I);\
-  else if (RTCHECK(ok_address(M, F))) {\
-    B->fd = F;\
-    F->bk = B;\
-  }\
-  else {\
-    CORRUPTION_ERROR_ACTION(M);\
-  }\
-}
-
-/* Replace dv node, binning the old one */
-/* Used only when dvsize known to be small */
-#define replace_dv(M, P, S) {\
-  size_t DVS = M->dvsize;\
-  if (DVS != 0) {\
-    mchunkptr DV = M->dv;\
-    assert(is_small(DVS));\
-    insert_small_chunk(M, DV, DVS);\
-  }\
-  M->dvsize = S;\
-  M->dv = P;\
-}
-
-/* ------------------------- Operations on trees ------------------------- */
-
-/* Insert chunk into tree */
-#define insert_large_chunk(M, X, S) {\
-  tbinptr* H;\
-  bindex_t I;\
-  compute_tree_index(S, I);\
-  H = treebin_at(M, I);\
-  X->index = I;\
-  X->child[0] = X->child[1] = 0;\
-  if (!treemap_is_marked(M, I)) {\
-    mark_treemap(M, I);\
-    *H = X;\
-    X->parent = (tchunkptr)H;\
-    X->fd = X->bk = X;\
-  }\
-  else {\
-    tchunkptr T = *H;\
-    size_t K = S << leftshift_for_tree_index(I);\
-    for (;;) {\
-      if (chunksize(T) != S) {\
-        tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\
-        K <<= 1;\
-        if (*C != 0)\
-          T = *C;\
-        else if (RTCHECK(ok_address(M, C))) {\
-          *C = X;\
-          X->parent = T;\
-          X->fd = X->bk = X;\
-          break;\
-        }\
-        else {\
-          CORRUPTION_ERROR_ACTION(M);\
-          break;\
-        }\
-      }\
-      else {\
-        tchunkptr F = T->fd;\
-        if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\
-          T->fd = F->bk = X;\
-          X->fd = F;\
-          X->bk = T;\
-          X->parent = 0;\
-          break;\
-        }\
-        else {\
-          CORRUPTION_ERROR_ACTION(M);\
-          break;\
-        }\
-      }\
-    }\
-  }\
-}
-
-/*
-  Unlink steps:
-
-  1. If x is a chained node, unlink it from its same-sized fd/bk links
-     and choose its bk node as its replacement.
-  2. If x was the last node of its size, but not a leaf node, it must
-     be replaced with a leaf node (not merely one with an open left or
-     right), to make sure that lefts and rights of descendents
-     correspond properly to bit masks.  We use the rightmost descendent
-     of x.  We could use any other leaf, but this is easy to locate and
-     tends to counteract removal of leftmosts elsewhere, and so keeps
-     paths shorter than minimally guaranteed.  This doesn't loop much
-     because on average a node in a tree is near the bottom.
-  3. If x is the base of a chain (i.e., has parent links) relink
-     x's parent and children to x's replacement (or null if none).
-*/
-
-#define unlink_large_chunk(M, X) {\
-  tchunkptr XP = X->parent;\
-  tchunkptr R;\
-  if (X->bk != X) {\
-    tchunkptr F = X->fd;\
-    R = X->bk;\
-    if (RTCHECK(ok_address(M, F))) {\
-      F->bk = R;\
-      R->fd = F;\
-    }\
-    else {\
-      CORRUPTION_ERROR_ACTION(M);\
-    }\
-  }\
-  else {\
-    tchunkptr* RP;\
-    if (((R = *(RP = &(X->child[1]))) != 0) ||\
-        ((R = *(RP = &(X->child[0]))) != 0)) {\
-      tchunkptr* CP;\
-      while ((*(CP = &(R->child[1])) != 0) ||\
-             (*(CP = &(R->child[0])) != 0)) {\
-        R = *(RP = CP);\
-      }\
-      if (RTCHECK(ok_address(M, RP)))\
-        *RP = 0;\
-      else {\
-        CORRUPTION_ERROR_ACTION(M);\
-      }\
-    }\
-  }\
-  if (XP != 0) {\
-    tbinptr* H = treebin_at(M, X->index);\
-    if (X == *H) {\
-      if ((*H = R) == 0) \
-        clear_treemap(M, X->index);\
-    }\
-    else if (RTCHECK(ok_address(M, XP))) {\
-      if (XP->child[0] == X) \
-        XP->child[0] = R;\
-      else \
-        XP->child[1] = R;\
-    }\
-    else\
-      CORRUPTION_ERROR_ACTION(M);\
-    if (R != 0) {\
-      if (RTCHECK(ok_address(M, R))) {\
-        tchunkptr C0, C1;\
-        R->parent = XP;\
-        if ((C0 = X->child[0]) != 0) {\
-          if (RTCHECK(ok_address(M, C0))) {\
-            R->child[0] = C0;\
-            C0->parent = R;\
-          }\
-          else\
-            CORRUPTION_ERROR_ACTION(M);\
-        }\
-        if ((C1 = X->child[1]) != 0) {\
-          if (RTCHECK(ok_address(M, C1))) {\
-            R->child[1] = C1;\
-            C1->parent = R;\
-          }\
-          else\
-            CORRUPTION_ERROR_ACTION(M);\
-        }\
-      }\
-      else\
-        CORRUPTION_ERROR_ACTION(M);\
-    }\
-  }\
-}
-
-/* Relays to large vs small bin operations */
-
-#define insert_chunk(M, P, S)\
-  if (is_small(S)) insert_small_chunk(M, P, S)\
-  else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
-
-#define unlink_chunk(M, P, S)\
-  if (is_small(S)) unlink_small_chunk(M, P, S)\
-  else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); }
-
-
-/* Relays to internal calls to malloc/free from realloc, memalign etc */
-
-#if ONLY_MSPACES
-#define internal_malloc(m, b) mspace_malloc(m, b)
-#define internal_free(m, mem) mspace_free(m,mem);
-#else /* ONLY_MSPACES */
-#if MSPACES
-#define internal_malloc(m, b)\
-   (m == gm)? dlmalloc(b) : mspace_malloc(m, b)
-#define internal_free(m, mem)\
-   if (m == gm) dlfree(mem); else mspace_free(m,mem);
-#else /* MSPACES */
-#define internal_malloc(m, b) dlmalloc(b)
-#define internal_free(m, mem) dlfree(mem)
-#endif /* MSPACES */
-#endif /* ONLY_MSPACES */
-
-/* -----------------------  Direct-mmapping chunks ----------------------- */
-
-/*
-  Directly mmapped chunks are set up with an offset to the start of
-  the mmapped region stored in the prev_foot field of the chunk. This
-  allows reconstruction of the required argument to MUNMAP when freed,
-  and also allows adjustment of the returned chunk to meet alignment
-  requirements (especially in memalign).  There is also enough space
-  allocated to hold a fake next chunk of size SIZE_T_SIZE to maintain
-  the PINUSE bit so frees can be checked.
-*/
-
-/* Malloc using mmap */
-static void* mmap_alloc(mstate m, size_t nb) {
-  size_t mmsize = granularity_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
-  if (mmsize > nb) {     /* Check for wrap around 0 */
-    char* mm = (char*)(DIRECT_MMAP(mmsize));
-    if (mm != CMFAIL) {
-      size_t offset = align_offset(chunk2mem(mm));
-      size_t psize = mmsize - offset - MMAP_FOOT_PAD;
-      mchunkptr p = (mchunkptr)(mm + offset);
-      p->prev_foot = offset | IS_MMAPPED_BIT;
-      (p)->head = (psize|CINUSE_BIT);
-      mark_inuse_foot(m, p, psize);
-      chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
-      chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0;
-
-      if (mm < m->least_addr)
-        m->least_addr = mm;
-      if ((m->footprint += mmsize) > m->max_footprint)
-        m->max_footprint = m->footprint;
-      assert(is_aligned(chunk2mem(p)));
-      check_mmapped_chunk(m, p);
-      return chunk2mem(p);
-    }
-  }
-  return 0;
-}
-
-/* Realloc using mmap */
-static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb) {
-  size_t oldsize = chunksize(oldp);
-  if (is_small(nb)) /* Can't shrink mmap regions below small size */
-    return 0;
-  /* Keep old chunk if big enough but not too big */
-  if (oldsize >= nb + SIZE_T_SIZE &&
-      (oldsize - nb) <= (mparams.granularity << 1))
-    return oldp;
-  else {
-    size_t offset = oldp->prev_foot & ~IS_MMAPPED_BIT;
-    size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
-    size_t newmmsize = granularity_align(nb + SIX_SIZE_T_SIZES +
-                                         CHUNK_ALIGN_MASK);
-    char* cp = (char*)CALL_MREMAP((char*)oldp - offset,
-                                  oldmmsize, newmmsize, 1);
-    if (cp != CMFAIL) {
-      mchunkptr newp = (mchunkptr)(cp + offset);
-      size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
-      newp->head = (psize|CINUSE_BIT);
-      mark_inuse_foot(m, newp, psize);
-      chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
-      chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0;
-
-      if (cp < m->least_addr)
-        m->least_addr = cp;
-      if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
-        m->max_footprint = m->footprint;
-      check_mmapped_chunk(m, newp);
-      return newp;
-    }
-  }
-  return 0;
-}
-
-/* -------------------------- mspace management -------------------------- */
-
-/* Initialize top chunk and its size */
-static void init_top(mstate m, mchunkptr p, size_t psize) {
-  /* Ensure alignment */
-  size_t offset = align_offset(chunk2mem(p));
-  p = (mchunkptr)((char*)p + offset);
-  psize -= offset;
-
-  m->top = p;
-  m->topsize = psize;
-  p->head = psize | PINUSE_BIT;
-  /* set size of fake trailing chunk holding overhead space only once */
-  chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
-  m->trim_check = mparams.trim_threshold; /* reset on each update */
-}
-
-/* Initialize bins for a new mstate that is otherwise zeroed out */
-static void init_bins(mstate m) {
-  /* Establish circular links for smallbins */
-  bindex_t i;
-  for (i = 0; i < NSMALLBINS; ++i) {
-    sbinptr bin = smallbin_at(m,i);
-    bin->fd = bin->bk = bin;
-  }
-}
-
-#if PROCEED_ON_ERROR
-
-/* default corruption action */
-static void reset_on_error(mstate m) {
-  int i;
-  ++malloc_corruption_error_count;
-  /* Reinitialize fields to forget about all memory */
-  m->smallbins = m->treebins = 0;
-  m->dvsize = m->topsize = 0;
-  m->seg.base = 0;
-  m->seg.size = 0;
-  m->seg.next = 0;
-  m->top = m->dv = 0;
-  for (i = 0; i < NTREEBINS; ++i)
-    *treebin_at(m, i) = 0;
-  init_bins(m);
-}
-#endif /* PROCEED_ON_ERROR */
-
-/* Allocate chunk and prepend remainder with chunk in successor base. */
-static void* prepend_alloc(mstate m, char* newbase, char* oldbase,
-                           size_t nb) {
-  mchunkptr p = align_as_chunk(newbase);
-  mchunkptr oldfirst = align_as_chunk(oldbase);
-  size_t psize = (char*)oldfirst - (char*)p;
-  mchunkptr q = chunk_plus_offset(p, nb);
-  size_t qsize = psize - nb;
-  set_size_and_pinuse_of_inuse_chunk(m, p, nb);
-
-  assert((char*)oldfirst > (char*)q);
-  assert(pinuse(oldfirst));
-  assert(qsize >= MIN_CHUNK_SIZE);
-
-  /* consolidate remainder with first chunk of old base */
-  if (oldfirst == m->top) {
-    size_t tsize = m->topsize += qsize;
-    m->top = q;
-    q->head = tsize | PINUSE_BIT;
-    check_top_chunk(m, q);
-  }
-  else if (oldfirst == m->dv) {
-    size_t dsize = m->dvsize += qsize;
-    m->dv = q;
-    set_size_and_pinuse_of_free_chunk(q, dsize);
-  }
-  else {
-    if (!cinuse(oldfirst)) {
-      size_t nsize = chunksize(oldfirst);
-      unlink_chunk(m, oldfirst, nsize);
-      oldfirst = chunk_plus_offset(oldfirst, nsize);
-      qsize += nsize;
-    }
-    set_free_with_pinuse(q, qsize, oldfirst);
-    insert_chunk(m, q, qsize);
-    check_free_chunk(m, q);
-  }
-
-  check_malloced_chunk(m, chunk2mem(p), nb);
-  return chunk2mem(p);
-}
-
-
-/* Add a segment to hold a new noncontiguous region */
-static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {
-  /* Determine locations and sizes of segment, fenceposts, old top */
-  char* old_top = (char*)m->top;
-  msegmentptr oldsp = segment_holding(m, old_top);
-  char* old_end = oldsp->base + oldsp->size;
-  size_t ssize = pad_request(sizeof(struct malloc_segment));
-  char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
-  size_t offset = align_offset(chunk2mem(rawsp));
-  char* asp = rawsp + offset;
-  char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp;
-  mchunkptr sp = (mchunkptr)csp;
-  msegmentptr ss = (msegmentptr)(chunk2mem(sp));
-  mchunkptr tnext = chunk_plus_offset(sp, ssize);
-  mchunkptr p = tnext;
-  int nfences = 0;
-
-  /* reset top to new space */
-  init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
-
-  /* Set up segment record */
-  assert(is_aligned(ss));
-  set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
-  *ss = m->seg; /* Push current record */
-  m->seg.base = tbase;
-  m->seg.size = tsize;
-  m->seg.sflags = mmapped;
-  m->seg.next = ss;
-
-  /* Insert trailing fenceposts */
-  for (;;) {
-    mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
-    p->head = FENCEPOST_HEAD;
-    ++nfences;
-    if ((char*)(&(nextp->head)) < old_end)
-      p = nextp;
-    else
-      break;
-  }
-  assert(nfences >= 2);
-
-  /* Insert the rest of old top into a bin as an ordinary free chunk */
-  if (csp != old_top) {
-    mchunkptr q = (mchunkptr)old_top;
-    size_t psize = csp - old_top;
-    mchunkptr tn = chunk_plus_offset(q, psize);
-    set_free_with_pinuse(q, psize, tn);
-    insert_chunk(m, q, psize);
-  }
-
-  check_top_chunk(m, m->top);
-}
-
-/* -------------------------- System allocation -------------------------- */
-
-/* Get memory from system using MORECORE or MMAP */
-static void* sys_alloc(mstate m, size_t nb) {
-  char* tbase = CMFAIL;
-  size_t tsize = 0;
-  flag_t mmap_flag = 0;
-
-  init_mparams();
-
-  /* Directly map large chunks */
-  if (use_mmap(m) && nb >= mparams.mmap_threshold) {
-    void* mem = mmap_alloc(m, nb);
-    if (mem != 0)
-      return mem;
-  }
-
-  /*
-    Try getting memory in any of three ways (in most-preferred to
-    least-preferred order):
-    1. A call to MORECORE that can normally contiguously extend memory.
-       (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
-       or main space is mmapped or a previous contiguous call failed)
-    2. A call to MMAP new space (disabled if not HAVE_MMAP).
-       Note that under the default settings, if MORECORE is unable to
-       fulfill a request, and HAVE_MMAP is true, then mmap is
-       used as a noncontiguous system allocator. This is a useful backup
-       strategy for systems with holes in address spaces -- in this case
-       sbrk cannot contiguously expand the heap, but mmap may be able to
-       find space.
-    3. A call to MORECORE that cannot usually contiguously extend memory.
-       (disabled if not HAVE_MORECORE)
-  */
-
-  if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
-    char* br = CMFAIL;
-    msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top);
-    size_t asize = 0;
-    ACQUIRE_MORECORE_LOCK();
-
-    if (ss == 0) {  /* First time through or recovery */
-      char* base = (char*)CALL_MORECORE(0);
-      if (base != CMFAIL) {
-        asize = granularity_align(nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE);
-        /* Adjust to end on a page boundary */
-        if (!is_page_aligned(base))
-          asize += (page_align((size_t)base) - (size_t)base);
-        /* Can't call MORECORE if size is negative when treated as signed */
-        if (asize < HALF_MAX_SIZE_T &&
-            (br = (char*)(CALL_MORECORE(asize))) == base) {
-          tbase = base;
-          tsize = asize;
-        }
-      }
-    }
-    else {
-      /* Subtract out existing available top space from MORECORE request. */
-      asize = granularity_align(nb - m->topsize + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE);
-      /* Use mem here only if it did continuously extend old space */
-      if (asize < HALF_MAX_SIZE_T &&
-          (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) {
-        tbase = br;
-        tsize = asize;
-      }
-    }
-
-    if (tbase == CMFAIL) {    /* Cope with partial failure */
-      if (br != CMFAIL) {    /* Try to use/extend the space we did get */
-        if (asize < HALF_MAX_SIZE_T &&
-            asize < nb + TOP_FOOT_SIZE + SIZE_T_ONE) {
-          size_t esize = granularity_align(nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE - asize);
-          if (esize < HALF_MAX_SIZE_T) {
-            char* end = (char*)CALL_MORECORE(esize);
-            if (end != CMFAIL)
-              asize += esize;
-            else {            /* Can't use; try to release */
-              end = (char*)CALL_MORECORE(-asize);
-              br = CMFAIL;
-            }
-          }
-        }
-      }
-      if (br != CMFAIL) {    /* Use the space we did get */
-        tbase = br;
-        tsize = asize;
-      }
-      else
-        disable_contiguous(m); /* Don't try contiguous path in the future */
-    }
-
-    RELEASE_MORECORE_LOCK();
-  }
-
-  if (HAVE_MMAP && tbase == CMFAIL) {  /* Try MMAP */
-    size_t req = nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE;
-    size_t rsize = granularity_align(req);
-    if (rsize > nb) { /* Fail if wraps around zero */
-      char* mp = (char*)(CALL_MMAP(rsize));
-      if (mp != CMFAIL) {
-        tbase = mp;
-        tsize = rsize;
-        mmap_flag = IS_MMAPPED_BIT;
-      }
-    }
-  }
-
-  if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */
-    size_t asize = granularity_align(nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE);
-    if (asize < HALF_MAX_SIZE_T) {
-      char* br = CMFAIL;
-      char* end = CMFAIL;
-      ACQUIRE_MORECORE_LOCK();
-      br = (char*)(CALL_MORECORE(asize));
-      end = (char*)(CALL_MORECORE(0));
-      RELEASE_MORECORE_LOCK();
-      if (br != CMFAIL && end != CMFAIL && br < end) {
-        size_t ssize = end - br;
-        if (ssize > nb + TOP_FOOT_SIZE) {
-          tbase = br;
-          tsize = ssize;
-        }
-      }
-    }
-  }
-
-  if (tbase != CMFAIL) {
-
-    if ((m->footprint += tsize) > m->max_footprint)
-      m->max_footprint = m->footprint;
-
-    if (!is_initialized(m)) { /* first-time initialization */
-      m->seg.base = m->least_addr = tbase;
-      m->seg.size = tsize;
-      m->seg.sflags = mmap_flag;
-      m->magic = mparams.magic;
-      init_bins(m);
-      if (is_global(m)) 
-        init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
-      else {
-        /* Offset top by embedded malloc_state */
-        mchunkptr mn = next_chunk(mem2chunk(m));
-        init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE);
-      }
-    }
-
-    else {
-      /* Try to merge with an existing segment */
-      msegmentptr sp = &m->seg;
-      while (sp != 0 && tbase != sp->base + sp->size)
-        sp = sp->next;
-      if (sp != 0 &&
-          !is_extern_segment(sp) &&
-          (sp->sflags & IS_MMAPPED_BIT) == mmap_flag &&
-          segment_holds(sp, m->top)) { /* append */
-        sp->size += tsize;
-        init_top(m, m->top, m->topsize + tsize);
-      }
-      else {
-        if (tbase < m->least_addr)
-          m->least_addr = tbase;
-        sp = &m->seg;
-        while (sp != 0 && sp->base != tbase + tsize)
-          sp = sp->next;
-        if (sp != 0 &&
-            !is_extern_segment(sp) &&
-            (sp->sflags & IS_MMAPPED_BIT) == mmap_flag) {
-          char* oldbase = sp->base;
-          sp->base = tbase;
-          sp->size += tsize;
-          return prepend_alloc(m, tbase, oldbase, nb);
-        }
-        else
-          add_segment(m, tbase, tsize, mmap_flag);
-      }
-    }
-
-    if (nb < m->topsize) { /* Allocate from new or extended top space */
-      size_t rsize = m->topsize -= nb;
-      mchunkptr p = m->top;
-      mchunkptr r = m->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(m, p, nb);
-      check_top_chunk(m, m->top);
-      check_malloced_chunk(m, chunk2mem(p), nb);
-      return chunk2mem(p);
-    }
-  }
-
-  MALLOC_FAILURE_ACTION;
-  return 0;
-}
-
-/* -----------------------  system deallocation -------------------------- */
-
-/* Unmap and unlink any mmapped segments that don't contain used chunks */
-static size_t release_unused_segments(mstate m) {
-  size_t released = 0;
-  msegmentptr pred = &m->seg;
-  msegmentptr sp = pred->next;
-  while (sp != 0) {
-    char* base = sp->base;
-    size_t size = sp->size;
-    msegmentptr next = sp->next;
-    if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
-      mchunkptr p = align_as_chunk(base);
-      size_t psize = chunksize(p);
-      /* Can unmap if first chunk holds entire segment and not pinned */
-      if (!cinuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) {
-        tchunkptr tp = (tchunkptr)p;
-        assert(segment_holds(sp, (char*)sp));
-        if (p == m->dv) {
-          m->dv = 0;
-          m->dvsize = 0;
-        }
-        else {
-          unlink_large_chunk(m, tp);
-        }
-        if (CALL_MUNMAP(base, size) == 0) {
-          released += size;
-          m->footprint -= size;
-          /* unlink obsoleted record */
-          sp = pred;
-          sp->next = next;
-        }
-        else { /* back out if cannot unmap */
-          insert_large_chunk(m, tp, psize);
-        }
-      }
-    }
-    pred = sp;
-    sp = next;
-  }
-  return released;
-}
-
-static int sys_trim(mstate m, size_t pad) {
-  size_t released = 0;
-  if (pad < MAX_REQUEST && is_initialized(m)) {
-    pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */
-
-    if (m->topsize > pad) {
-      /* Shrink top space in granularity-size units, keeping at least one */
-      size_t unit = mparams.granularity;
-      size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
-                      SIZE_T_ONE) * unit;
-      msegmentptr sp = segment_holding(m, (char*)m->top);
-
-      if (!is_extern_segment(sp)) {
-        if (is_mmapped_segment(sp)) {
-          if (HAVE_MMAP &&
-              sp->size >= extra &&
-              !has_segment_link(m, sp)) { /* can't shrink if pinned */
-            size_t newsize = sp->size - extra;
-            /* Prefer mremap, fall back to munmap */
-            if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) != MFAIL) ||
-                (CALL_MUNMAP(sp->base + newsize, extra) == 0)) {
-              released = extra;
-            }
-          }
-        }
-        else if (HAVE_MORECORE) {
-          if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */
-            extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
-          ACQUIRE_MORECORE_LOCK();
-          {
-            /* Make sure end of memory is where we last set it. */
-            char* old_br = (char*)(CALL_MORECORE(0));
-            if (old_br == sp->base + sp->size) {
-              char* rel_br = (char*)(CALL_MORECORE(-extra));
-              char* new_br = (char*)(CALL_MORECORE(0));
-              if (rel_br != CMFAIL && new_br < old_br)
-                released = old_br - new_br;
-            }
-          }
-          RELEASE_MORECORE_LOCK();
-        }
-      }
-
-      if (released != 0) {
-        sp->size -= released;
-        m->footprint -= released;
-        init_top(m, m->top, m->topsize - released);
-        check_top_chunk(m, m->top);
-      }
-    }
-
-    /* Unmap any unused mmapped segments */
-    if (HAVE_MMAP) 
-      released += release_unused_segments(m);
-
-    /* On failure, disable autotrim to avoid repeated failed future calls */
-    if (released == 0)
-      m->trim_check = MAX_SIZE_T;
-  }
-
-  return (released != 0)? 1 : 0;
-}
-
-/* ---------------------------- malloc support --------------------------- */
-
-/* allocate a large request from the best fitting chunk in a treebin */
-static void* tmalloc_large(mstate m, size_t nb) {
-  tchunkptr v = 0;
-  size_t rsize = -nb; /* Unsigned negation */
-  tchunkptr t;
-  bindex_t idx;
-  compute_tree_index(nb, idx);
-
-  if ((t = *treebin_at(m, idx)) != 0) {
-    /* Traverse tree for this bin looking for node with size == nb */
-    size_t sizebits = nb << leftshift_for_tree_index(idx);
-    tchunkptr rst = 0;  /* The deepest untaken right subtree */
-    for (;;) {
-      tchunkptr rt;
-      size_t trem = chunksize(t) - nb;
-      if (trem < rsize) {
-        v = t;
-        if ((rsize = trem) == 0)
-          break;
-      }
-      rt = t->child[1];
-      t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1];
-      if (rt != 0 && rt != t)
-        rst = rt;
-      if (t == 0) {
-        t = rst; /* set t to least subtree holding sizes > nb */
-        break;
-      }
-      sizebits <<= 1;
-    }
-  }
-
-  if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */
-    binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
-    if (leftbits != 0) {
-      bindex_t i;
-      binmap_t leastbit = least_bit(leftbits);
-      compute_bit2idx(leastbit, i);
-      t = *treebin_at(m, i);
-    }
-  }
-
-  while (t != 0) { /* find smallest of tree or subtree */
-    size_t trem = chunksize(t) - nb;
-    if (trem < rsize) {
-      rsize = trem;
-      v = t;
-    }
-    t = leftmost_child(t);
-  }
-
-  /*  If dv is a better fit, return 0 so malloc will use it */
-  if (v != 0 && rsize < (size_t)(m->dvsize - nb)) {
-    if (RTCHECK(ok_address(m, v))) { /* split */
-      mchunkptr r = chunk_plus_offset(v, nb);
-      assert(chunksize(v) == rsize + nb);
-      if (RTCHECK(ok_next(v, r))) {
-        unlink_large_chunk(m, v);
-        if (rsize < MIN_CHUNK_SIZE)
-          set_inuse_and_pinuse(m, v, (rsize + nb));
-        else {
-          set_size_and_pinuse_of_inuse_chunk(m, v, nb);
-          set_size_and_pinuse_of_free_chunk(r, rsize);
-          insert_chunk(m, r, rsize);
-        }
-        return chunk2mem(v);
-      }
-    }
-    CORRUPTION_ERROR_ACTION(m);
-  }
-  return 0;
-}
-
-/* allocate a small request from the best fitting chunk in a treebin */
-static void* tmalloc_small(mstate m, size_t nb) {
-  tchunkptr t, v;
-  size_t rsize;
-  bindex_t i;
-  binmap_t leastbit = least_bit(m->treemap);
-  compute_bit2idx(leastbit, i);
-
-  v = t = *treebin_at(m, i);
-  rsize = chunksize(t) - nb;
-
-  while ((t = leftmost_child(t)) != 0) {
-    size_t trem = chunksize(t) - nb;
-    if (trem < rsize) {
-      rsize = trem;
-      v = t;
-    }
-  }
-
-  if (RTCHECK(ok_address(m, v))) {
-    mchunkptr r = chunk_plus_offset(v, nb);
-    assert(chunksize(v) == rsize + nb);
-    if (RTCHECK(ok_next(v, r))) {
-      unlink_large_chunk(m, v);
-      if (rsize < MIN_CHUNK_SIZE)
-        set_inuse_and_pinuse(m, v, (rsize + nb));
-      else {
-        set_size_and_pinuse_of_inuse_chunk(m, v, nb);
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        replace_dv(m, r, rsize);
-      }
-      return chunk2mem(v);
-    }
-  }
-
-  CORRUPTION_ERROR_ACTION(m);
-  return 0;
-}
-
-/* --------------------------- realloc support --------------------------- */
-
-static void* internal_realloc(mstate m, void* oldmem, size_t bytes) {
-  if (bytes >= MAX_REQUEST) {
-    MALLOC_FAILURE_ACTION;
-    return 0;
-  }
-  if (!PREACTION(m)) {
-    mchunkptr oldp = mem2chunk(oldmem);
-    size_t oldsize = chunksize(oldp);
-    mchunkptr next = chunk_plus_offset(oldp, oldsize);
-    mchunkptr newp = 0;
-    void* extra = 0;
-
-    /* Try to either shrink or extend into top. Else malloc-copy-free */
-
-    if (RTCHECK(ok_address(m, oldp) && ok_cinuse(oldp) &&
-                ok_next(oldp, next) && ok_pinuse(next))) {
-      size_t nb = request2size(bytes);
-      if (is_mmapped(oldp))
-        newp = mmap_resize(m, oldp, nb);
-      else if (oldsize >= nb) { /* already big enough */
-        size_t rsize = oldsize - nb;
-        newp = oldp;
-        if (rsize >= MIN_CHUNK_SIZE) {
-          mchunkptr remainder = chunk_plus_offset(newp, nb);
-          set_inuse(m, newp, nb);
-          set_inuse(m, remainder, rsize);
-          extra = chunk2mem(remainder);
-        }
-      }
-      else if (next == m->top && oldsize + m->topsize > nb) {
-        /* Expand into top */
-        size_t newsize = oldsize + m->topsize;
-        size_t newtopsize = newsize - nb;
-        mchunkptr newtop = chunk_plus_offset(oldp, nb);
-        set_inuse(m, oldp, nb);
-        newtop->head = newtopsize |PINUSE_BIT;
-        m->top = newtop;
-        m->topsize = newtopsize;
-        newp = oldp;
-      }
-    }
-    else {
-      USAGE_ERROR_ACTION(m, oldmem);
-      POSTACTION(m);
-      return 0;
-    }
-
-    POSTACTION(m);
-
-    if (newp != 0) {
-      if (extra != 0) {
-        internal_free(m, extra);
-      }
-      check_inuse_chunk(m, newp);
-      return chunk2mem(newp);
-    }
-    else {
-      void* newmem = internal_malloc(m, bytes);
-      if (newmem != 0) {
-        size_t oc = oldsize - overhead_for(oldp);
-        memcpy(newmem, oldmem, (oc < bytes)? oc : bytes);
-        internal_free(m, oldmem);
-      }
-      return newmem;
-    }
-  }
-  return 0;
-}
-
-/* --------------------------- memalign support -------------------------- */
-
-static void* internal_memalign(mstate m, size_t alignment, size_t bytes) {
-  if (alignment <= MALLOC_ALIGNMENT)    /* Can just use malloc */
-    return internal_malloc(m, bytes);
-  if (alignment <  MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */
-    alignment = MIN_CHUNK_SIZE;
-  if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */
-    size_t a = MALLOC_ALIGNMENT << 1;
-    while (a < alignment) a <<= 1;
-    alignment = a;
-  }
-  
-  if (bytes >= MAX_REQUEST - alignment) {
-    if (m != 0)  { /* Test isn't needed but avoids compiler warning */
-      MALLOC_FAILURE_ACTION;
-    }
-  }
-  else {
-    size_t nb = request2size(bytes);
-    size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
-    char* mem = (char*)internal_malloc(m, req);
-    if (mem != 0) {
-      void* leader = 0;
-      void* trailer = 0;
-      mchunkptr p = mem2chunk(mem);
-
-      if (PREACTION(m)) return 0;
-      if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */
-        /*
-          Find an aligned spot inside chunk.  Since we need to give
-          back leading space in a chunk of at least MIN_CHUNK_SIZE, if
-          the first calculation places us at a spot with less than
-          MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
-          We've allocated enough total room so that this is always
-          possible.
-        */
-        char* br = (char*)mem2chunk((size_t)(((size_t)(mem +
-                                                       alignment -
-                                                       SIZE_T_ONE)) &
-                                             -alignment));
-        char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)?
-          br : br+alignment;
-        mchunkptr newp = (mchunkptr)pos;
-        size_t leadsize = pos - (char*)(p);
-        size_t newsize = chunksize(p) - leadsize;
-
-        if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */
-          newp->prev_foot = p->prev_foot + leadsize;
-          newp->head = (newsize|CINUSE_BIT);
-        }
-        else { /* Otherwise, give back leader, use the rest */
-          set_inuse(m, newp, newsize);
-          set_inuse(m, p, leadsize);
-          leader = chunk2mem(p);
-        }
-        p = newp;
-      }
-
-      /* Give back spare room at the end */
-      if (!is_mmapped(p)) {
-        size_t size = chunksize(p);
-        if (size > nb + MIN_CHUNK_SIZE) {
-          size_t remainder_size = size - nb;
-          mchunkptr remainder = chunk_plus_offset(p, nb);
-          set_inuse(m, p, nb);
-          set_inuse(m, remainder, remainder_size);
-          trailer = chunk2mem(remainder);
-        }
-      }
-
-      assert (chunksize(p) >= nb);
-      assert((((size_t)(chunk2mem(p))) % alignment) == 0);
-      check_inuse_chunk(m, p);
-      POSTACTION(m);
-      if (leader != 0) {
-        internal_free(m, leader);
-      }
-      if (trailer != 0) {
-        internal_free(m, trailer);
-      }
-      return chunk2mem(p);
-    }
-  }
-  return 0;
-}
-
-/* ------------------------ comalloc/coalloc support --------------------- */
-
-static void** ialloc(mstate m,
-                     size_t n_elements,
-                     size_t* sizes,
-                     int opts,
-                     void* chunks[]) {
-  /*
-    This provides common support for independent_X routines, handling
-    all of the combinations that can result.
-
-    The opts arg has:
-    bit 0 set if all elements are same size (using sizes[0])
-    bit 1 set if elements should be zeroed
-  */
-
-  size_t    element_size;   /* chunksize of each element, if all same */
-  size_t    contents_size;  /* total size of elements */
-  size_t    array_size;     /* request size of pointer array */
-  void*     mem;            /* malloced aggregate space */
-  mchunkptr p;              /* corresponding chunk */
-  size_t    remainder_size; /* remaining bytes while splitting */
-  void**    marray;         /* either "chunks" or malloced ptr array */
-  mchunkptr array_chunk;    /* chunk for malloced ptr array */
-  flag_t    was_enabled;    /* to disable mmap */
-  size_t    size;
-  size_t    i;
-
-  /* compute array length, if needed */
-  if (chunks != 0) {
-    if (n_elements == 0)
-      return chunks; /* nothing to do */
-    marray = chunks;
-    array_size = 0;
-  }
-  else {
-    /* if empty req, must still return chunk representing empty array */
-    if (n_elements == 0)
-      return (void**)internal_malloc(m, 0);
-    marray = 0;
-    array_size = request2size(n_elements * (sizeof(void*)));
-  }
-
-  /* compute total element size */
-  if (opts & 0x1) { /* all-same-size */
-    element_size = request2size(*sizes);
-    contents_size = n_elements * element_size;
-  }
-  else { /* add up all the sizes */
-    element_size = 0;
-    contents_size = 0;
-    for (i = 0; i != n_elements; ++i)
-      contents_size += request2size(sizes[i]);
-  }
-
-  size = contents_size + array_size;
-
-  /*
-     Allocate the aggregate chunk.  First disable direct-mmapping so
-     malloc won't use it, since we would not be able to later
-     free/realloc space internal to a segregated mmap region.
-  */
-  was_enabled = use_mmap(m);
-  disable_mmap(m);
-  mem = internal_malloc(m, size - CHUNK_OVERHEAD);
-  if (was_enabled)
-    enable_mmap(m);
-  if (mem == 0)
-    return 0;
-
-  if (PREACTION(m)) return 0;
-  p = mem2chunk(mem);
-  remainder_size = chunksize(p);
-
-  assert(!is_mmapped(p));
-
-  if (opts & 0x2) {       /* optionally clear the elements */
-    memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size);
-  }
-
-  /* If not provided, allocate the pointer array as final part of chunk */
-  if (marray == 0) {
-    size_t  array_chunk_size;
-    array_chunk = chunk_plus_offset(p, contents_size);
-    array_chunk_size = remainder_size - contents_size;
-    marray = (void**) (chunk2mem(array_chunk));
-    set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
-    remainder_size = contents_size;
-  }
-
-  /* split out elements */
-  for (i = 0; ; ++i) {
-    marray[i] = chunk2mem(p);
-    if (i != n_elements-1) {
-      if (element_size != 0)
-        size = element_size;
-      else
-        size = request2size(sizes[i]);
-      remainder_size -= size;
-      set_size_and_pinuse_of_inuse_chunk(m, p, size);
-      p = chunk_plus_offset(p, size);
-    }
-    else { /* the final element absorbs any overallocation slop */
-      set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
-      break;
-    }
-  }
-
-#if DEBUG
-  if (marray != chunks) {
-    /* final element must have exactly exhausted chunk */
-    if (element_size != 0) {
-      assert(remainder_size == element_size);
-    }
-    else {
-      assert(remainder_size == request2size(sizes[i]));
-    }
-    check_inuse_chunk(m, mem2chunk(marray));
-  }
-  for (i = 0; i != n_elements; ++i)
-    check_inuse_chunk(m, mem2chunk(marray[i]));
-
-#endif /* DEBUG */
-
-  POSTACTION(m);
-  return marray;
-}
-
-
-/* -------------------------- public routines ---------------------------- */
-
-#if !ONLY_MSPACES
-
-void* dlmalloc(size_t bytes) {
-  /*
-     Basic algorithm:
-     If a small request (< 256 bytes minus per-chunk overhead):
-       1. If one exists, use a remainderless chunk in associated smallbin.
-          (Remainderless means that there are too few excess bytes to
-          represent as a chunk.)
-       2. If it is big enough, use the dv chunk, which is normally the
-          chunk adjacent to the one used for the most recent small request.
-       3. If one exists, split the smallest available chunk in a bin,
-          saving remainder in dv.
-       4. If it is big enough, use the top chunk.
-       5. If available, get memory from system and use it
-     Otherwise, for a large request:
-       1. Find the smallest available binned chunk that fits, and use it
-          if it is better fitting than dv chunk, splitting if necessary.
-       2. If better fitting than any binned chunk, use the dv chunk.
-       3. If it is big enough, use the top chunk.
-       4. If request size >= mmap threshold, try to directly mmap this chunk.
-       5. If available, get memory from system and use it
-
-     The ugly goto's here ensure that postaction occurs along all paths.
-  */
-
-  if (!PREACTION(gm)) {
-    void* mem;
-    size_t nb;
-    if (bytes <= MAX_SMALL_REQUEST) {
-      bindex_t idx;
-      binmap_t smallbits;
-      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
-      idx = small_index(nb);
-      smallbits = gm->smallmap >> idx;
-
-      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
-        mchunkptr b, p;
-        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
-        b = smallbin_at(gm, idx);
-        p = b->fd;
-        assert(chunksize(p) == small_index2size(idx));
-        unlink_first_small_chunk(gm, b, p, idx);
-        set_inuse_and_pinuse(gm, p, small_index2size(idx));
-        mem = chunk2mem(p);
-        check_malloced_chunk(gm, mem, nb);
-        goto postaction;
-      }
-
-      else if (nb > gm->dvsize) {
-        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
-          mchunkptr b, p, r;
-          size_t rsize;
-          bindex_t i;
-          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
-          binmap_t leastbit = least_bit(leftbits);
-          compute_bit2idx(leastbit, i);
-          b = smallbin_at(gm, i);
-          p = b->fd;
-          assert(chunksize(p) == small_index2size(i));
-          unlink_first_small_chunk(gm, b, p, i);
-          rsize = small_index2size(i) - nb;
-          /* Fit here cannot be remainderless if 4byte sizes */
-          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
-            set_inuse_and_pinuse(gm, p, small_index2size(i));
-          else {
-            set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-            r = chunk_plus_offset(p, nb);
-            set_size_and_pinuse_of_free_chunk(r, rsize);
-            replace_dv(gm, r, rsize);
-          }
-          mem = chunk2mem(p);
-          check_malloced_chunk(gm, mem, nb);
-          goto postaction;
-        }
-
-        else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) {
-          check_malloced_chunk(gm, mem, nb);
-          goto postaction;
-        }
-      }
-    }
-    else if (bytes >= MAX_REQUEST)
-      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
-    else {
-      nb = pad_request(bytes);
-      if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
-        check_malloced_chunk(gm, mem, nb);
-        goto postaction;
-      }
-    }
-
-    if (nb <= gm->dvsize) {
-      size_t rsize = gm->dvsize - nb;
-      mchunkptr p = gm->dv;
-      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
-        mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
-        gm->dvsize = rsize;
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-      }
-      else { /* exhaust dv */
-        size_t dvs = gm->dvsize;
-        gm->dvsize = 0;
-        gm->dv = 0;
-        set_inuse_and_pinuse(gm, p, dvs);
-      }
-      mem = chunk2mem(p);
-      check_malloced_chunk(gm, mem, nb);
-      goto postaction;
-    }
-
-    else if (nb < gm->topsize) { /* Split top */
-      size_t rsize = gm->topsize -= nb;
-      mchunkptr p = gm->top;
-      mchunkptr r = gm->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
-      mem = chunk2mem(p);
-      check_top_chunk(gm, gm->top);
-      check_malloced_chunk(gm, mem, nb);
-      goto postaction;
-    }
-
-    mem = sys_alloc(gm, nb);
-
-  postaction:
-    POSTACTION(gm);
-    return mem;
-  }
-
-  return 0;
-}
-
-void dlfree(void* mem) {
-  /*
-     Consolidate freed chunks with preceeding or succeeding bordering
-     free chunks, if they exist, and then place in a bin.  Intermixed
-     with special cases for top, dv, mmapped chunks, and usage errors.
-  */
-
-  if (mem != 0) {
-    mchunkptr p  = mem2chunk(mem);
-#if FOOTERS
-    mstate fm = get_mstate_for(p);
-    if (!ok_magic(fm)) {
-      USAGE_ERROR_ACTION(fm, p);
-      return;
-    }
-#else /* FOOTERS */
-#define fm gm
-#endif /* FOOTERS */
-    if (!PREACTION(fm)) {
-      check_inuse_chunk(fm, p);
-      if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
-        size_t psize = chunksize(p);
-        mchunkptr next = chunk_plus_offset(p, psize);
-        if (!pinuse(p)) {
-          size_t prevsize = p->prev_foot;
-          if ((prevsize & IS_MMAPPED_BIT) != 0) {
-            prevsize &= ~IS_MMAPPED_BIT;
-            psize += prevsize + MMAP_FOOT_PAD;
-            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
-              fm->footprint -= psize;
-            goto postaction;
-          }
-          else {
-            mchunkptr prev = chunk_minus_offset(p, prevsize);
-            psize += prevsize;
-            p = prev;
-            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
-              if (p != fm->dv) {
-                unlink_chunk(fm, p, prevsize);
-              }
-              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
-                fm->dvsize = psize;
-                set_free_with_pinuse(p, psize, next);
-                goto postaction;
-              }
-            }
-            else
-              goto erroraction;
-          }
-        }
-
-        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
-          if (!cinuse(next)) {  /* consolidate forward */
-            if (next == fm->top) {
-              size_t tsize = fm->topsize += psize;
-              fm->top = p;
-              p->head = tsize | PINUSE_BIT;
-              if (p == fm->dv) {
-                fm->dv = 0;
-                fm->dvsize = 0;
-              }
-              if (should_trim(fm, tsize))
-                sys_trim(fm, 0);
-              goto postaction;
-            }
-            else if (next == fm->dv) {
-              size_t dsize = fm->dvsize += psize;
-              fm->dv = p;
-              set_size_and_pinuse_of_free_chunk(p, dsize);
-              goto postaction;
-            }
-            else {
-              size_t nsize = chunksize(next);
-              psize += nsize;
-              unlink_chunk(fm, next, nsize);
-              set_size_and_pinuse_of_free_chunk(p, psize);
-              if (p == fm->dv) {
-                fm->dvsize = psize;
-                goto postaction;
-              }
-            }
-          }
-          else
-            set_free_with_pinuse(p, psize, next);
-          insert_chunk(fm, p, psize);
-          check_free_chunk(fm, p);
-          goto postaction;
-        }
-      }
-    erroraction:
-      USAGE_ERROR_ACTION(fm, p);
-    postaction:
-      POSTACTION(fm);
-    }
-  }
-#if !FOOTERS
-#undef fm
-#endif /* FOOTERS */
-}
-
-void* dlcalloc(size_t n_elements, size_t elem_size) {
-  void* mem;
-  size_t req = 0;
-  if (n_elements != 0) {
-    req = n_elements * elem_size;
-    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
-        (req / n_elements != elem_size))
-      req = MAX_SIZE_T; /* force downstream failure on overflow */
-  }
-  mem = dlmalloc(req);
-  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
-    memset(mem, 0, req);
-  return mem;
-}
-
-void* dlrealloc(void* oldmem, size_t bytes) {
-  if (oldmem == 0)
-    return dlmalloc(bytes);
-#ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) {
-    dlfree(oldmem);
-    return 0;
-  }
-#endif /* REALLOC_ZERO_BYTES_FREES */
-  else {
-#if ! FOOTERS
-    mstate m = gm;
-#else /* FOOTERS */
-    mstate m = get_mstate_for(mem2chunk(oldmem));
-    if (!ok_magic(m)) {
-      USAGE_ERROR_ACTION(m, oldmem);
-      return 0;
-    }
-#endif /* FOOTERS */
-    return internal_realloc(m, oldmem, bytes);
-  }
-}
-
-void* dlmemalign(size_t alignment, size_t bytes) {
-  return internal_memalign(gm, alignment, bytes);
-}
-
-void** dlindependent_calloc(size_t n_elements, size_t elem_size,
-                                 void* chunks[]) {
-  size_t sz = elem_size; /* serves as 1-element array */
-  return ialloc(gm, n_elements, &sz, 3, chunks);
-}
-
-void** dlindependent_comalloc(size_t n_elements, size_t sizes[],
-                                   void* chunks[]) {
-  return ialloc(gm, n_elements, sizes, 0, chunks);
-}
-
-void* dlvalloc(size_t bytes) {
-  size_t pagesz;
-  init_mparams();
-  pagesz = mparams.page_size;
-  return dlmemalign(pagesz, bytes);
-}
-
-void* dlpvalloc(size_t bytes) {
-  size_t pagesz;
-  init_mparams();
-  pagesz = mparams.page_size;
-  return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
-}
-
-int dlmalloc_trim(size_t pad) {
-  int result = 0;
-  if (!PREACTION(gm)) {
-    result = sys_trim(gm, pad);
-    POSTACTION(gm);
-  }
-  return result;
-}
-
-size_t dlmalloc_footprint(void) {
-  return gm->footprint;
-}
-
-size_t dlmalloc_max_footprint(void) {
-  return gm->max_footprint;
-}
-
-#if !NO_MALLINFO
-struct mallinfo dlmallinfo(void) {
-  return internal_mallinfo(gm);
-}
-#endif /* NO_MALLINFO */
-
-void dlmalloc_stats() {
-  internal_malloc_stats(gm);
-}
-
-size_t dlmalloc_usable_size(void* mem) {
-  if (mem != 0) {
-    mchunkptr p = mem2chunk(mem);
-    if (cinuse(p))
-      return chunksize(p) - overhead_for(p);
-  }
-  return 0;
-}
-
-int dlmallopt(int param_number, int value) {
-  return change_mparam(param_number, value);
-}
-
-#endif /* !ONLY_MSPACES */
-
-/* ----------------------------- user mspaces ---------------------------- */
-
-#if MSPACES
-
-static mstate init_user_mstate(char* tbase, size_t tsize) {
-  size_t msize = pad_request(sizeof(struct malloc_state));
-  mchunkptr mn;
-  mchunkptr msp = align_as_chunk(tbase);
-  mstate m = (mstate)(chunk2mem(msp));
-  memset(m, 0, msize);
-  INITIAL_LOCK(&m->mutex);
-  msp->head = (msize|PINUSE_BIT|CINUSE_BIT);
-  m->seg.base = m->least_addr = tbase;
-  m->seg.size = m->footprint = m->max_footprint = tsize;
-  m->magic = mparams.magic;
-  m->mflags = mparams.default_mflags;
-  disable_contiguous(m);
-  init_bins(m);
-  mn = next_chunk(mem2chunk(m));
-  init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE);
-  check_top_chunk(m, m->top);
-  return m;
-}
-
-mspace create_mspace(size_t capacity, int locked) {
-  mstate m = 0;
-  size_t msize = pad_request(sizeof(struct malloc_state));
-  init_mparams(); /* Ensure pagesize etc initialized */
-
-  if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
-    size_t rs = ((capacity == 0)? mparams.granularity :
-                 (capacity + TOP_FOOT_SIZE + msize));
-    size_t tsize = granularity_align(rs);
-    char* tbase = (char*)(CALL_MMAP(tsize));
-    if (tbase != CMFAIL) {
-      m = init_user_mstate(tbase, tsize);
-      m->seg.sflags = IS_MMAPPED_BIT;
-      set_lock(m, locked);
-    }
-  }
-  return (mspace)m;
-}
-
-mspace create_mspace_with_base(void* base, size_t capacity, int locked) {
-  mstate m = 0;
-  size_t msize = pad_request(sizeof(struct malloc_state));
-  init_mparams(); /* Ensure pagesize etc initialized */
-
-  if (capacity > msize + TOP_FOOT_SIZE &&
-      capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) {
-    m = init_user_mstate((char*)base, capacity);
-    m->seg.sflags = EXTERN_BIT;
-    set_lock(m, locked);
-  }
-  return (mspace)m;
-}
-
-size_t destroy_mspace(mspace msp) {
-  size_t freed = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    msegmentptr sp = &ms->seg;
-    while (sp != 0) {
-      char* base = sp->base;
-      size_t size = sp->size;
-      flag_t flag = sp->sflags;
-      sp = sp->next;
-      if ((flag & IS_MMAPPED_BIT) && !(flag & EXTERN_BIT) &&
-          CALL_MUNMAP(base, size) == 0)
-        freed += size;
-    }
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return freed;
-}
-
-/*
-  mspace versions of routines are near-clones of the global
-  versions. This is not so nice but better than the alternatives.
-*/
-
-
-void* mspace_malloc(mspace msp, size_t bytes) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  if (!PREACTION(ms)) {
-    void* mem;
-    size_t nb;
-    if (bytes <= MAX_SMALL_REQUEST) {
-      bindex_t idx;
-      binmap_t smallbits;
-      nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes);
-      idx = small_index(nb);
-      smallbits = ms->smallmap >> idx;
-
-      if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */
-        mchunkptr b, p;
-        idx += ~smallbits & 1;       /* Uses next bin if idx empty */
-        b = smallbin_at(ms, idx);
-        p = b->fd;
-        assert(chunksize(p) == small_index2size(idx));
-        unlink_first_small_chunk(ms, b, p, idx);
-        set_inuse_and_pinuse(ms, p, small_index2size(idx));
-        mem = chunk2mem(p);
-        check_malloced_chunk(ms, mem, nb);
-        goto postaction;
-      }
-
-      else if (nb > ms->dvsize) {
-        if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
-          mchunkptr b, p, r;
-          size_t rsize;
-          bindex_t i;
-          binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
-          binmap_t leastbit = least_bit(leftbits);
-          compute_bit2idx(leastbit, i);
-          b = smallbin_at(ms, i);
-          p = b->fd;
-          assert(chunksize(p) == small_index2size(i));
-          unlink_first_small_chunk(ms, b, p, i);
-          rsize = small_index2size(i) - nb;
-          /* Fit here cannot be remainderless if 4byte sizes */
-          if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
-            set_inuse_and_pinuse(ms, p, small_index2size(i));
-          else {
-            set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-            r = chunk_plus_offset(p, nb);
-            set_size_and_pinuse_of_free_chunk(r, rsize);
-            replace_dv(ms, r, rsize);
-          }
-          mem = chunk2mem(p);
-          check_malloced_chunk(ms, mem, nb);
-          goto postaction;
-        }
-
-        else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) {
-          check_malloced_chunk(ms, mem, nb);
-          goto postaction;
-        }
-      }
-    }
-    else if (bytes >= MAX_REQUEST)
-      nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */
-    else {
-      nb = pad_request(bytes);
-      if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
-        check_malloced_chunk(ms, mem, nb);
-        goto postaction;
-      }
-    }
-
-    if (nb <= ms->dvsize) {
-      size_t rsize = ms->dvsize - nb;
-      mchunkptr p = ms->dv;
-      if (rsize >= MIN_CHUNK_SIZE) { /* split dv */
-        mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
-        ms->dvsize = rsize;
-        set_size_and_pinuse_of_free_chunk(r, rsize);
-        set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-      }
-      else { /* exhaust dv */
-        size_t dvs = ms->dvsize;
-        ms->dvsize = 0;
-        ms->dv = 0;
-        set_inuse_and_pinuse(ms, p, dvs);
-      }
-      mem = chunk2mem(p);
-      check_malloced_chunk(ms, mem, nb);
-      goto postaction;
-    }
-
-    else if (nb < ms->topsize) { /* Split top */
-      size_t rsize = ms->topsize -= nb;
-      mchunkptr p = ms->top;
-      mchunkptr r = ms->top = chunk_plus_offset(p, nb);
-      r->head = rsize | PINUSE_BIT;
-      set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
-      mem = chunk2mem(p);
-      check_top_chunk(ms, ms->top);
-      check_malloced_chunk(ms, mem, nb);
-      goto postaction;
-    }
-
-    mem = sys_alloc(ms, nb);
-
-  postaction:
-    POSTACTION(ms);
-    return mem;
-  }
-
-  return 0;
-}
-
-void mspace_free(mspace msp, void* mem) {
-  if (mem != 0) {
-    mchunkptr p  = mem2chunk(mem);
-#if FOOTERS
-    mstate fm = get_mstate_for(p);
-#else /* FOOTERS */
-    mstate fm = (mstate)msp;
-#endif /* FOOTERS */
-    if (!ok_magic(fm)) {
-      USAGE_ERROR_ACTION(fm, p);
-      return;
-    }
-    if (!PREACTION(fm)) {
-      check_inuse_chunk(fm, p);
-      if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
-        size_t psize = chunksize(p);
-        mchunkptr next = chunk_plus_offset(p, psize);
-        if (!pinuse(p)) {
-          size_t prevsize = p->prev_foot;
-          if ((prevsize & IS_MMAPPED_BIT) != 0) {
-            prevsize &= ~IS_MMAPPED_BIT;
-            psize += prevsize + MMAP_FOOT_PAD;
-            if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
-              fm->footprint -= psize;
-            goto postaction;
-          }
-          else {
-            mchunkptr prev = chunk_minus_offset(p, prevsize);
-            psize += prevsize;
-            p = prev;
-            if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */
-              if (p != fm->dv) {
-                unlink_chunk(fm, p, prevsize);
-              }
-              else if ((next->head & INUSE_BITS) == INUSE_BITS) {
-                fm->dvsize = psize;
-                set_free_with_pinuse(p, psize, next);
-                goto postaction;
-              }
-            }
-            else
-              goto erroraction;
-          }
-        }
-
-        if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
-          if (!cinuse(next)) {  /* consolidate forward */
-            if (next == fm->top) {
-              size_t tsize = fm->topsize += psize;
-              fm->top = p;
-              p->head = tsize | PINUSE_BIT;
-              if (p == fm->dv) {
-                fm->dv = 0;
-                fm->dvsize = 0;
-              }
-              if (should_trim(fm, tsize))
-                sys_trim(fm, 0);
-              goto postaction;
-            }
-            else if (next == fm->dv) {
-              size_t dsize = fm->dvsize += psize;
-              fm->dv = p;
-              set_size_and_pinuse_of_free_chunk(p, dsize);
-              goto postaction;
-            }
-            else {
-              size_t nsize = chunksize(next);
-              psize += nsize;
-              unlink_chunk(fm, next, nsize);
-              set_size_and_pinuse_of_free_chunk(p, psize);
-              if (p == fm->dv) {
-                fm->dvsize = psize;
-                goto postaction;
-              }
-            }
-          }
-          else
-            set_free_with_pinuse(p, psize, next);
-          insert_chunk(fm, p, psize);
-          check_free_chunk(fm, p);
-          goto postaction;
-        }
-      }
-    erroraction:
-      USAGE_ERROR_ACTION(fm, p);
-    postaction:
-      POSTACTION(fm);
-    }
-  }
-}
-
-void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) {
-  void* mem;
-  size_t req = 0;
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  if (n_elements != 0) {
-    req = n_elements * elem_size;
-    if (((n_elements | elem_size) & ~(size_t)0xffff) &&
-        (req / n_elements != elem_size))
-      req = MAX_SIZE_T; /* force downstream failure on overflow */
-  }
-  mem = internal_malloc(ms, req);
-  if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
-    memset(mem, 0, req);
-  return mem;
-}
-
-void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) {
-  if (oldmem == 0)
-    return mspace_malloc(msp, bytes);
-#ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) {
-    mspace_free(msp, oldmem);
-    return 0;
-  }
-#endif /* REALLOC_ZERO_BYTES_FREES */
-  else {
-#if FOOTERS
-    mchunkptr p  = mem2chunk(oldmem);
-    mstate ms = get_mstate_for(p);
-#else /* FOOTERS */
-    mstate ms = (mstate)msp;
-#endif /* FOOTERS */
-    if (!ok_magic(ms)) {
-      USAGE_ERROR_ACTION(ms,ms);
-      return 0;
-    }
-    return internal_realloc(ms, oldmem, bytes);
-  }
-}
-
-void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return internal_memalign(ms, alignment, bytes);
-}
-
-void** mspace_independent_calloc(mspace msp, size_t n_elements,
-                                 size_t elem_size, void* chunks[]) {
-  size_t sz = elem_size; /* serves as 1-element array */
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return ialloc(ms, n_elements, &sz, 3, chunks);
-}
-
-void** mspace_independent_comalloc(mspace msp, size_t n_elements,
-                                   size_t sizes[], void* chunks[]) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-    return 0;
-  }
-  return ialloc(ms, n_elements, sizes, 0, chunks);
-}
-
-int mspace_trim(mspace msp, size_t pad) {
-  int result = 0;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    if (!PREACTION(ms)) {
-      result = sys_trim(ms, pad);
-      POSTACTION(ms);
-    }
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return result;
-}
-
-void mspace_malloc_stats(mspace msp) {
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    internal_malloc_stats(ms);
-  }
-  else {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-}
-
-size_t mspace_footprint(mspace msp) {
-  size_t result;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    result = ms->footprint;
-  }
-  USAGE_ERROR_ACTION(ms,ms);
-  return result;
-}
-
-
-size_t mspace_max_footprint(mspace msp) {
-  size_t result;
-  mstate ms = (mstate)msp;
-  if (ok_magic(ms)) {
-    result = ms->max_footprint;
-  }
-  USAGE_ERROR_ACTION(ms,ms);
-  return result;
-}
-
-
-#if !NO_MALLINFO
-struct mallinfo mspace_mallinfo(mspace msp) {
-  mstate ms = (mstate)msp;
-  if (!ok_magic(ms)) {
-    USAGE_ERROR_ACTION(ms,ms);
-  }
-  return internal_mallinfo(ms);
-}
-#endif /* NO_MALLINFO */
-
-int mspace_mallopt(int param_number, int value) {
-  return change_mparam(param_number, value);
-}
-
-#endif /* MSPACES */
-
-/* -------------------- Alternative MORECORE functions ------------------- */
-
-/*
-  Guidelines for creating a custom version of MORECORE:
-
-  * For best performance, MORECORE should allocate in multiples of pagesize.
-  * MORECORE may allocate more memory than requested. (Or even less,
-      but this will usually result in a malloc failure.)
-  * MORECORE must not allocate memory when given argument zero, but
-      instead return one past the end address of memory from previous
-      nonzero call.
-  * For best performance, consecutive calls to MORECORE with positive
-      arguments should return increasing addresses, indicating that
-      space has been contiguously extended.
-  * Even though consecutive calls to MORECORE need not return contiguous
-      addresses, it must be OK for malloc'ed chunks to span multiple
-      regions in those cases where they do happen to be contiguous.
-  * MORECORE need not handle negative arguments -- it may instead
-      just return MFAIL when given negative arguments.
-      Negative arguments are always multiples of pagesize. MORECORE
-      must not misinterpret negative args as large positive unsigned
-      args. You can suppress all such calls from even occurring by defining
-      MORECORE_CANNOT_TRIM,
-
-  As an example alternative MORECORE, here is a custom allocator
-  kindly contributed for pre-OSX macOS.  It uses virtually but not
-  necessarily physically contiguous non-paged memory (locked in,
-  present and won't get swapped out).  You can use it by uncommenting
-  this section, adding some #includes, and setting up the appropriate
-  defines above:
-
-      #define MORECORE osMoreCore
-
-  There is also a shutdown routine that should somehow be called for
-  cleanup upon program exit.
-
-  #define MAX_POOL_ENTRIES 100
-  #define MINIMUM_MORECORE_SIZE  (64 * 1024U)
-  static int next_os_pool;
-  void *our_os_pools[MAX_POOL_ENTRIES];
-
-  void *osMoreCore(int size)
-  {
-    void *ptr = 0;
-    static void *sbrk_top = 0;
-
-    if (size > 0)
-    {
-      if (size < MINIMUM_MORECORE_SIZE)
-         size = MINIMUM_MORECORE_SIZE;
-      if (CurrentExecutionLevel() == kTaskLevel)
-         ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
-      if (ptr == 0)
-      {
-        return (void *) MFAIL;
-      }
-      // save ptrs so they can be freed during cleanup
-      our_os_pools[next_os_pool] = ptr;
-      next_os_pool++;
-      ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
-      sbrk_top = (char *) ptr + size;
-      return ptr;
-    }
-    else if (size < 0)
-    {
-      // we don't currently support shrink behavior
-      return (void *) MFAIL;
-    }
-    else
-    {
-      return sbrk_top;
-    }
-  }
-
-  // cleanup any allocated memory pools
-  // called as last thing before shutting down driver
-
-  void osCleanupMem(void)
-  {
-    void **ptr;
-
-    for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
-      if (*ptr)
-      {
-         PoolDeallocate(*ptr);
-         *ptr = 0;
-      }
-  }
-
-*/
-
-
-/* -----------------------------------------------------------------------
-History:
-    V2.8.3 Thu Sep 22 11:16:32 2005  Doug Lea  (dl at gee)
-      * Add max_footprint functions
-      * Ensure all appropriate literals are size_t
-      * Fix conditional compilation problem for some #define settings
-      * Avoid concatenating segments with the one provided
-        in create_mspace_with_base
-      * Rename some variables to avoid compiler shadowing warnings
-      * Use explicit lock initialization.
-      * Better handling of sbrk interference.
-      * Simplify and fix segment insertion, trimming and mspace_destroy
-      * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x
-      * Thanks especially to Dennis Flanagan for help on these.
-
-    V2.8.2 Sun Jun 12 16:01:10 2005  Doug Lea  (dl at gee)
-      * Fix memalign brace error.
-
-    V2.8.1 Wed Jun  8 16:11:46 2005  Doug Lea  (dl at gee)
-      * Fix improper #endif nesting in C++
-      * Add explicit casts needed for C++
-
-    V2.8.0 Mon May 30 14:09:02 2005  Doug Lea  (dl at gee)
-      * Use trees for large bins
-      * Support mspaces
-      * Use segments to unify sbrk-based and mmap-based system allocation,
-        removing need for emulation on most platforms without sbrk.
-      * Default safety checks
-      * Optional footer checks. Thanks to William Robertson for the idea.
-      * Internal code refactoring
-      * Incorporate suggestions and platform-specific changes.
-        Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas,
-        Aaron Bachmann,  Emery Berger, and others.
-      * Speed up non-fastbin processing enough to remove fastbins.
-      * Remove useless cfree() to avoid conflicts with other apps.
-      * Remove internal memcpy, memset. Compilers handle builtins better.
-      * Remove some options that no one ever used and rename others.
-
-    V2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
-      * Fix malloc_state bitmap array misdeclaration
-
-    V2.7.1 Thu Jul 25 10:58:03 2002  Doug Lea  (dl at gee)
-      * Allow tuning of FIRST_SORTED_BIN_SIZE
-      * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte.
-      * Better detection and support for non-contiguousness of MORECORE.
-        Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger
-      * Bypass most of malloc if no frees. Thanks To Emery Berger.
-      * Fix freeing of old top non-contiguous chunk im sysmalloc.
-      * Raised default trim and map thresholds to 256K.
-      * Fix mmap-related #defines. Thanks to Lubos Lunak.
-      * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield.
-      * Branch-free bin calculation
-      * Default trim and mmap thresholds now 256K.
-
-    V2.7.0 Sun Mar 11 14:14:06 2001  Doug Lea  (dl at gee)
-      * Introduce independent_comalloc and independent_calloc.
-        Thanks to Michael Pachos for motivation and help.
-      * Make optional .h file available
-      * Allow > 2GB requests on 32bit systems.
-      * new WIN32 sbrk, mmap, munmap, lock code from <Walter@GeNeSys-e.de>.
-        Thanks also to Andreas Mueller <a.mueller at paradatec.de>,
-        and Anonymous.
-      * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for
-        helping test this.)
-      * memalign: check alignment arg
-      * realloc: don't try to shift chunks backwards, since this
-        leads to  more fragmentation in some programs and doesn't
-        seem to help in any others.
-      * Collect all cases in malloc requiring system memory into sysmalloc
-      * Use mmap as backup to sbrk
-      * Place all internal state in malloc_state
-      * Introduce fastbins (although similar to 2.5.1)
-      * Many minor tunings and cosmetic improvements
-      * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK
-      * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS
-        Thanks to Tony E. Bennett <tbennett@nvidia.com> and others.
-      * Include errno.h to support default failure action.
-
-    V2.6.6 Sun Dec  5 07:42:19 1999  Doug Lea  (dl at gee)
-      * return null for negative arguments
-      * Added Several WIN32 cleanups from Martin C. Fong <mcfong at yahoo.com>
-         * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h'
-          (e.g. WIN32 platforms)
-         * Cleanup header file inclusion for WIN32 platforms
-         * Cleanup code to avoid Microsoft Visual C++ compiler complaints
-         * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing
-           memory allocation routines
-         * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
-         * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
-           usage of 'assert' in non-WIN32 code
-         * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
-           avoid infinite loop
-      * Always call 'fREe()' rather than 'free()'
-
-    V2.6.5 Wed Jun 17 15:57:31 1998  Doug Lea  (dl at gee)
-      * Fixed ordering problem with boundary-stamping
-
-    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
-      * Added pvalloc, as recommended by H.J. Liu
-      * Added 64bit pointer support mainly from Wolfram Gloger
-      * Added anonymously donated WIN32 sbrk emulation
-      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix mask error that caused wastage after
-        foreign sbrks
-      * Add linux mremap support code from HJ Liu
-
-    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
-      * Integrated most documentation with the code.
-      * Add support for mmap, with help from
-        Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Use last_remainder in more cases.
-      * Pack bins using idea from  colin@nyx10.cs.du.edu
-      * Use ordered bins instead of best-fit threshhold
-      * Eliminate block-local decls to simplify tracing and debugging.
-      * Support another case of realloc via move into top
-      * Fix error occuring when initial sbrk_base not word-aligned.
-      * Rely on page size for units instead of SBRK_UNIT to
-        avoid surprises about sbrk alignment conventions.
-      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
-        (raymond@es.ele.tue.nl) for the suggestion.
-      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
-      * More precautions for cases where other routines call sbrk,
-        courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Added macros etc., allowing use in linux libc from
-        H.J. Lu (hjl@gnu.ai.mit.edu)
-      * Inverted this history list
-
-    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
-      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
-      * Removed all preallocation code since under current scheme
-        the work required to undo bad preallocations exceeds
-        the work saved in good cases for most test programs.
-      * No longer use return list or unconsolidated bins since
-        no scheme using them consistently outperforms those that don't
-        given above changes.
-      * Use best fit for very large chunks to prevent some worst-cases.
-      * Added some support for debugging
-
-    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
-      * Removed footers when chunks are in use. Thanks to
-        Paul Wilson (wilson@cs.texas.edu) for the suggestion.
-
-    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
-      * Added malloc_trim, with help from Wolfram Gloger
-        (wmglo@Dent.MED.Uni-Muenchen.DE).
-
-    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
-
-    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
-      * realloc: try to expand in both directions
-      * malloc: swap order of clean-bin strategy;
-      * realloc: only conditionally expand backwards
-      * Try not to scavenge used bins
-      * Use bin counts as a guide to preallocation
-      * Occasionally bin return list chunks in first scan
-      * Add a few optimizations from colin@nyx10.cs.du.edu
-
-    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
-      * faster bin computation & slightly different binning
-      * merged all consolidations to one part of malloc proper
-         (eliminating old malloc_find_space & malloc_clean_bin)
-      * Scan 2 returns chunks (not just 1)
-      * Propagate failure in realloc if malloc returns 0
-      * Add stuff to allow compilation on non-ANSI compilers
-          from kpv@research.att.com
-
-    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
-      * removed potential for odd address access in prev_chunk
-      * removed dependency on getpagesize.h
-      * misc cosmetics and a bit more internal documentation
-      * anticosmetics: mangled names in macros to evade debugger strangeness
-      * tested on sparc, hp-700, dec-mips, rs6000
-          with gcc & native cc (hp, dec only) allowing
-          Detlefs & Zorn comparison study (in SIGPLAN Notices.)
-
-    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
-      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
-         structure of old version,  but most details differ.)
- 
-*/
-
-#endif /* !HAVE_MALLOC */
diff --git a/Externals/SDL/src/stdlib/SDL_string.c b/Externals/SDL/src/stdlib/SDL_string.c
deleted file mode 100644
index 28004064f1..0000000000
--- a/Externals/SDL/src/stdlib/SDL_string.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This file contains portable string manipulation functions for SDL */
-
-#include "SDL_stdinc.h"
-
-
-#define SDL_isupperhex(X)   (((X) >= 'A') && ((X) <= 'F'))
-#define SDL_islowerhex(X)   (((X) >= 'a') && ((X) <= 'f'))
-
-#if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOL)
-static size_t SDL_ScanLong(const char *text, int radix, long *valuep)
-{
-    const char *textstart = text;
-    long value = 0;
-    SDL_bool negative = SDL_FALSE;
-
-    if ( *text == '-' ) {
-        negative = SDL_TRUE;
-        ++text;
-    }
-    if ( radix == 16 && SDL_strncmp(text, "0x", 2) == 0 ) {
-        text += 2;
-    }
-    for ( ; ; ) {
-        int v;
-        if ( SDL_isdigit((unsigned char) *text) ) {
-            v = *text - '0';
-        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
-            v = 10 + (*text - 'A');
-        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
-            v = 10 + (*text - 'a');
-        } else {
-            break;
-        }
-        value *= radix;
-        value += v;
-        ++text;
-    }
-    if ( valuep ) {
-        if ( negative && value ) {
-            *valuep = -value;
-        } else {
-            *valuep = value;
-        }
-    }
-    return (text - textstart);
-}
-#endif
-
-#if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOUL) || !defined(HAVE_STRTOD)
-static size_t SDL_ScanUnsignedLong(const char *text, int radix, unsigned long *valuep)
-{
-    const char *textstart = text;
-    unsigned long value = 0;
-
-    if ( radix == 16 && SDL_strncmp(text, "0x", 2) == 0 ) {
-        text += 2;
-    }
-    for ( ; ; ) {
-        int v;
-        if ( SDL_isdigit((unsigned char) *text) ) {
-            v = *text - '0';
-        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
-            v = 10 + (*text - 'A');
-        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
-            v = 10 + (*text - 'a');
-        } else {
-            break;
-        }
-        value *= radix;
-        value += v;
-        ++text;
-    }
-    if ( valuep ) {
-        *valuep = value;
-    }
-    return (text - textstart);
-}
-#endif
-
-#ifndef HAVE_SSCANF
-static size_t SDL_ScanUintPtrT(const char *text, int radix, uintptr_t *valuep)
-{
-    const char *textstart = text;
-    uintptr_t value = 0;
-
-    if ( radix == 16 && SDL_strncmp(text, "0x", 2) == 0 ) {
-        text += 2;
-    }
-    for ( ; ; ) {
-        int v;
-        if ( SDL_isdigit((unsigned char) *text) ) {
-            v = *text - '0';
-        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
-            v = 10 + (*text - 'A');
-        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
-            v = 10 + (*text - 'a');
-        } else {
-            break;
-        }
-        value *= radix;
-        value += v;
-        ++text;
-    }
-    if ( valuep ) {
-        *valuep = value;
-    }
-    return (text - textstart);
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOLL)
-static size_t SDL_ScanLongLong(const char *text, int radix, Sint64 *valuep)
-{
-    const char *textstart = text;
-    Sint64 value = 0;
-    SDL_bool negative = SDL_FALSE;
-
-    if ( *text == '-' ) {
-        negative = SDL_TRUE;
-        ++text;
-    }
-    if ( radix == 16 && SDL_strncmp(text, "0x", 2) == 0 ) {
-        text += 2;
-    }
-    for ( ; ; ) {
-        int v;
-        if ( SDL_isdigit((unsigned char) *text) ) {
-            v = *text - '0';
-        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
-            v = 10 + (*text - 'A');
-        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
-            v = 10 + (*text - 'a');
-        } else {
-            break;
-        }
-        value *= radix;
-        value += v;
-        ++text;
-    }
-    if ( valuep ) {
-        if ( negative && value ) {
-            *valuep = -value;
-        } else {
-            *valuep = value;
-        }
-    }
-    return (text - textstart);
-}
-#endif
-
-#if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOULL)
-static size_t SDL_ScanUnsignedLongLong(const char *text, int radix, Uint64 *valuep)
-{
-    const char *textstart = text;
-    Uint64 value = 0;
-
-    if ( radix == 16 && SDL_strncmp(text, "0x", 2) == 0 ) {
-        text += 2;
-    }
-    for ( ; ; ) {
-        int v;
-        if ( SDL_isdigit((unsigned char) *text) ) {
-            v = *text - '0';
-        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
-            v = 10 + (*text - 'A');
-        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
-            v = 10 + (*text - 'a');
-        } else {
-            break;
-        }
-        value *= radix;
-        value += v;
-        ++text;
-    }
-    if ( valuep ) {
-        *valuep = value;
-    }
-    return (text - textstart);
-}
-#endif
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOD)
-static size_t SDL_ScanFloat(const char *text, double *valuep)
-{
-    const char *textstart = text;
-    unsigned long lvalue = 0;
-    double value = 0.0;
-    SDL_bool negative = SDL_FALSE;
-
-    if ( *text == '-' ) {
-        negative = SDL_TRUE;
-        ++text;
-    }
-    text += SDL_ScanUnsignedLong(text, 10, &lvalue);
-    value += lvalue;
-    if ( *text == '.' ) {
-        int mult = 10;
-        ++text;
-        while ( SDL_isdigit((unsigned char) *text) ) {
-            lvalue = *text - '0';
-            value += (double)lvalue / mult;
-            mult *= 10;
-            ++text;
-        }
-    }
-    if ( valuep ) {
-        if ( negative && value ) {
-            *valuep = -value;
-        } else {
-            *valuep = value;
-        }
-    }
-    return (text - textstart);
-}
-#endif
-
-#ifndef SDL_memset
-void *SDL_memset(void *dst, int c, size_t len)
-{
-    size_t left = (len % 4);
-    if ( len >= 4 ) {
-        Uint32 value = 0;
-        Uint32 *dstp = (Uint32 *)dst;
-        int i;
-        for (i = 0; i < 4; ++i) {
-            value <<= 8;
-            value |= c;
-        }
-        len /= 4;
-        while ( len-- ) {
-            *dstp++ = value;
-        }
-    }
-    if ( left > 0 ) {
-        Uint8 value = (Uint8)c;
-        Uint8 *dstp = (Uint8 *)dst;
-	switch(left) {
-	case 3:
-            *dstp++ = value;
-	case 2:
-            *dstp++ = value;
-	case 1:
-            *dstp++ = value;
-        }
-    }
-    return dst;
-}
-#endif
-
-#ifndef SDL_memcpy
-void *SDL_memcpy(void *dst, const void *src, size_t len)
-{
-    char *srcp = (char *)src;
-    char *dstp = (char *)dst;
-    while ( len-- ) {
-        *dstp++ = *srcp++;
-    }
-    return dst;
-}
-#endif
-
-#ifndef SDL_revcpy
-void *SDL_revcpy(void *dst, const void *src, size_t len)
-{
-    char *srcp = (char *)src;
-    char *dstp = (char *)dst;
-    srcp += len-1;
-    dstp += len-1;
-    while ( len-- ) {
-        *dstp-- = *srcp--;
-    }
-    return dst;
-}
-#endif
-
-#ifndef SDL_memcmp
-int SDL_memcmp(const void *s1, const void *s2, size_t len)
-{
-    char *s1p = (char *)s1;
-    char *s2p = (char *)s2;
-    while ( len-- ) {
-        if ( *s1p != *s2p ) {
-            return (*s1p - *s2p);
-    }
-    ++s1p;
-    ++s2p;
-    }
-    return 0;
-}
-#endif
-
-#ifndef HAVE_STRLEN
-size_t SDL_strlen(const char *string)
-{
-    size_t len = 0;
-    while ( *string++ ) {
-        ++len;
-    }
-    return len;
-}
-#endif
-
-#ifndef HAVE_STRLCPY
-size_t SDL_strlcpy(char *dst, const char *src, size_t maxlen)
-{
-    size_t srclen = SDL_strlen(src);
-    if ( maxlen > 0 ) {
-        size_t len = SDL_min(srclen, maxlen-1);
-        SDL_memcpy(dst, src, len);
-        dst[len] = '\0';
-    }
-    return srclen;
-}
-#endif
-
-#ifndef HAVE_STRLCAT
-size_t SDL_strlcat(char *dst, const char *src, size_t maxlen)
-{
-    size_t dstlen = SDL_strlen(dst);
-    size_t srclen = SDL_strlen(src);
-    if ( dstlen < maxlen ) {
-        SDL_strlcpy(dst+dstlen, src, maxlen-dstlen);
-    }
-    return dstlen+srclen;
-}
-#endif
-
-#ifndef HAVE_STRDUP
-char *SDL_strdup(const char *string)
-{
-    size_t len = SDL_strlen(string)+1;
-    char *newstr = SDL_malloc(len);
-    if ( newstr ) {
-        SDL_strlcpy(newstr, string, len);
-    }
-    return newstr;
-}
-#endif
-
-#ifndef HAVE__STRREV
-char *SDL_strrev(char *string)
-{
-    size_t len = SDL_strlen(string);
-    char *a = &string[0];
-    char *b = &string[len-1];
-    len /= 2;
-    while ( len-- ) {
-        char c = *a;
-        *a++ = *b;
-        *b-- = c;
-    }
-    return string;
-}
-#endif
-
-#ifndef HAVE__STRUPR
-char *SDL_strupr(char *string)
-{
-    char *bufp = string;
-    while ( *bufp ) {
-        *bufp = SDL_toupper((unsigned char) *bufp);
-	++bufp;
-    }
-    return string;
-}
-#endif
-
-#ifndef HAVE__STRLWR
-char *SDL_strlwr(char *string)
-{
-    char *bufp = string;
-    while ( *bufp ) {
-        *bufp = SDL_tolower((unsigned char) *bufp);
-	++bufp;
-    }
-    return string;
-}
-#endif
-
-#ifndef HAVE_STRCHR
-char *SDL_strchr(const char *string, int c)
-{
-    while ( *string ) {
-        if ( *string == c ) {
-            return (char *)string;
-        }
-	++string;
-    }
-    return NULL;
-}
-#endif
-
-#ifndef HAVE_STRRCHR
-char *SDL_strrchr(const char *string, int c)
-{
-    const char *bufp = string + SDL_strlen(string) - 1;
-    while ( bufp >= string ) {
-        if ( *bufp == c ) {
-            return (char *)bufp;
-        }
-	--bufp;
-    }
-    return NULL;
-}
-#endif
-
-#ifndef HAVE_STRSTR
-char *SDL_strstr(const char *haystack, const char *needle)
-{
-    size_t length = SDL_strlen(needle);
-    while ( *haystack ) {
-        if ( SDL_strncmp(haystack, needle, length) == 0 ) {
-            return (char *)haystack;
-        }
-	++haystack;
-    }
-    return NULL;
-}
-#endif
-
-#if !defined(HAVE__LTOA)  || !defined(HAVE__I64TOA) || \
-    !defined(HAVE__ULTOA) || !defined(HAVE__UI64TOA)
-static const char ntoa_table[] = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z'
-};
-#endif /* ntoa() conversion table */
-
-#ifndef HAVE__LTOA
-char *SDL_ltoa(long value, char *string, int radix)
-{
-    char *bufp = string;
-
-    if ( value < 0 ) {
-        *bufp++ = '-';
-        value = -value;
-    }
-    if ( value ) {
-        while ( value > 0 ) {
-            *bufp++ = ntoa_table[value % radix];
-            value /= radix;
-        }
-    } else {
-        *bufp++ = '0';
-    }
-    *bufp = '\0';
-
-    /* The numbers went into the string backwards. :) */
-    if ( *string == '-' ) {
-        SDL_strrev(string+1);
-    } else {
-        SDL_strrev(string);
-    }
-
-    return string;
-}
-#endif
-
-#ifndef HAVE__ULTOA
-char *SDL_ultoa(unsigned long value, char *string, int radix)
-{
-    char *bufp = string;
-
-    if ( value ) {
-        while ( value > 0 ) {
-            *bufp++ = ntoa_table[value % radix];
-            value /= radix;
-        }
-    } else {
-        *bufp++ = '0';
-    }
-    *bufp = '\0';
-
-    /* The numbers went into the string backwards. :) */
-    SDL_strrev(string);
-
-    return string;
-}
-#endif
-
-#ifndef HAVE_STRTOL
-long SDL_strtol(const char *string, char **endp, int base)
-{
-    size_t len;
-    long value;
-
-    if ( !base ) {
-        if ( (SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0) ) {
-            base = 16;
-        } else {
-            base = 10;
-        }
-    }
-
-    len = SDL_ScanLong(string, base, &value);
-    if ( endp ) {
-        *endp = (char *)string + len;
-    }
-    return value;
-}
-#endif
-
-#ifndef HAVE_STRTOUL
-unsigned long SDL_strtoul(const char *string, char **endp, int base)
-{
-    size_t len;
-    unsigned long value;
-
-    if ( !base ) {
-        if ( (SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0) ) {
-            base = 16;
-        } else {
-            base = 10;
-        }
-    }
-
-    len = SDL_ScanUnsignedLong(string, base, &value);
-    if ( endp ) {
-        *endp = (char *)string + len;
-    }
-    return value;
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifndef HAVE__I64TOA
-char *SDL_lltoa(Sint64 value, char *string, int radix)
-{
-    char *bufp = string;
-
-    if ( value < 0 ) {
-        *bufp++ = '-';
-        value = -value;
-    }
-    if ( value ) {
-        while ( value > 0 ) {
-            *bufp++ = ntoa_table[value % radix];
-            value /= radix;
-        }
-    } else {
-        *bufp++ = '0';
-    }
-    *bufp = '\0';
-
-    /* The numbers went into the string backwards. :) */
-    if ( *string == '-' ) {
-        SDL_strrev(string+1);
-    } else {
-        SDL_strrev(string);
-    }
-
-    return string;
-}
-#endif
-
-#ifndef HAVE__UI64TOA
-char *SDL_ulltoa(Uint64 value, char *string, int radix)
-{
-    char *bufp = string;
-
-    if ( value ) {
-        while ( value > 0 ) {
-            *bufp++ = ntoa_table[value % radix];
-            value /= radix;
-        }
-    } else {
-        *bufp++ = '0';
-    }
-    *bufp = '\0';
-
-    /* The numbers went into the string backwards. :) */
-    SDL_strrev(string);
-
-    return string;
-}
-#endif
-
-#ifndef HAVE_STRTOLL
-Sint64 SDL_strtoll(const char *string, char **endp, int base)
-{
-    size_t len;
-    Sint64 value;
-
-    if ( !base ) {
-        if ( (SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0) ) {
-            base = 16;
-        } else {
-            base = 10;
-        }
-    }
-
-    len = SDL_ScanLongLong(string, base, &value);
-    if ( endp ) {
-        *endp = (char *)string + len;
-    }
-    return value;
-}
-#endif
-
-#ifndef HAVE_STRTOULL
-Uint64 SDL_strtoull(const char *string, char **endp, int base)
-{
-    size_t len;
-    Uint64 value;
-
-    if ( !base ) {
-        if ( (SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0) ) {
-            base = 16;
-        } else {
-            base = 10;
-        }
-    }
-
-    len = SDL_ScanUnsignedLongLong(string, base, &value);
-    if ( endp ) {
-        *endp = (char *)string + len;
-    }
-    return value;
-}
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifndef HAVE_STRTOD
-double SDL_strtod(const char *string, char **endp)
-{
-    size_t len;
-    double value;
-
-    len = SDL_ScanFloat(string, &value);
-    if ( endp ) {
-        *endp = (char *)string + len;
-    }
-    return value;
-}
-#endif
-
-#ifndef HAVE_STRCMP
-int SDL_strcmp(const char *str1, const char *str2)
-{
-    while (*str1 && *str2) {
-        if ( *str1 != *str2 )
-            break;
-        ++str1;
-        ++str2;
-    }
-    return (int)((unsigned char)*str1 - (unsigned char)*str2);
-}
-#endif
-
-#ifndef HAVE_STRNCMP
-int SDL_strncmp(const char *str1, const char *str2, size_t maxlen)
-{
-    while ( *str1 && *str2 && maxlen ) {
-        if ( *str1 != *str2 )
-            break;
-        ++str1;
-        ++str2;
-        --maxlen;
-    }
-    if ( ! maxlen ) {
-        return 0;
-    }
-    return (int)((unsigned char)*str1 - (unsigned char)*str2);
-}
-#endif
-
-#if !defined(HAVE_STRCASECMP) && !defined(HAVE__STRICMP)
-int SDL_strcasecmp(const char *str1, const char *str2)
-{
-    char a = 0;
-    char b = 0;
-    while ( *str1 && *str2 ) {
-        a = SDL_tolower((unsigned char) *str1);
-        b = SDL_tolower((unsigned char) *str2);
-        if ( a != b )
-            break;
-        ++str1;
-        ++str2;
-    }
-    return (int)((unsigned char)a - (unsigned char)b);
-}
-#endif
-
-#if !defined(HAVE_STRNCASECMP) && !defined(HAVE__STRNICMP)
-int SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen)
-{
-    char a = 0;
-    char b = 0;
-    while ( *str1 && *str2 && maxlen ) {
-        a = SDL_tolower((unsigned char) *str1);
-        b = SDL_tolower((unsigned char) *str2);
-        if ( a != b )
-            break;
-        ++str1;
-        ++str2;
-        --maxlen;
-    }
-    return (int)((unsigned char)a - (unsigned char)b);
-}
-#endif
-
-#ifndef HAVE_SSCANF
-int SDL_sscanf(const char *text, const char *fmt, ...)
-{
-    va_list ap;
-    int retval = 0;
-
-    va_start(ap, fmt);
-    while ( *fmt ) {
-        if ( *fmt == ' ' ) {
-            while ( SDL_isspace((unsigned char) *text) ) {
-                ++text;
-            }
-            ++fmt;
-            continue;
-        }
-        if ( *fmt == '%' ) {
-            SDL_bool done = SDL_FALSE;
-            long count = 0;
-            int radix = 10;
-            enum {
-                DO_SHORT,
-                DO_INT,
-                DO_LONG,
-                DO_LONGLONG
-            } inttype = DO_INT;
-            SDL_bool suppress = SDL_FALSE;
-
-            ++fmt;
-            if ( *fmt == '%' ) {
-                if ( *text == '%' ) {
-                    ++text;
-                    ++fmt;
-                    continue;
-                }
-                break;
-            }
-            if ( *fmt == '*' ) {
-                suppress = SDL_TRUE;
-                ++fmt;
-            }
-            fmt += SDL_ScanLong(fmt, 10, &count);
-
-            if ( *fmt == 'c' ) {
-                if ( ! count ) {
-                    count = 1;
-                }
-                if ( suppress ) {
-                    while ( count-- ) {
-                        ++text;
-                    }
-                } else {
-                    char *valuep = va_arg(ap, char*);
-                    while ( count-- ) {
-                        *valuep++ = *text++;
-                    }
-                    ++retval;
-                }
-                continue;
-            }
-
-            while ( SDL_isspace((unsigned char) *text) ) {
-                ++text;
-            }
-
-            /* FIXME: implement more of the format specifiers */
-            while (!done) {
-                switch(*fmt) {
-                    case '*':
-                        suppress = SDL_TRUE;
-                        break;
-                    case 'h':
-                        if ( inttype > DO_SHORT ) {
-                            ++inttype;
-                        }
-                        break;
-                    case 'l':
-                        if ( inttype < DO_LONGLONG ) {
-                            ++inttype;
-                        }
-                        break;
-                    case 'I':
-                        if ( SDL_strncmp(fmt, "I64", 3) == 0 ) {
-                            fmt += 2;
-                            inttype = DO_LONGLONG;
-                        }
-                        break;
-                    case 'i':
-                        {
-                            int index = 0;
-                            if ( text[index] == '-' ) {
-                                ++index;
-                            }
-                            if ( text[index] == '0' ) {
-                                if ( SDL_tolower((unsigned char) text[index+1]) == 'x' ) {
-                                    radix = 16;
-                                } else {
-                                    radix = 8;
-                                }
-                            }
-                        }
-                        /* Fall through to %d handling */
-                    case 'd':
-#ifdef SDL_HAS_64BIT_TYPE
-                        if ( inttype == DO_LONGLONG ) {
-                            Sint64 value;
-                            text += SDL_ScanLongLong(text, radix, &value);
-                            if ( ! suppress ) {
-                                Sint64 *valuep = va_arg(ap, Sint64*);
-                                *valuep = value;
-                                ++retval;
-                            }
-                        }
-                        else
-#endif /* SDL_HAS_64BIT_TYPE */
-                        {
-                            long value;
-                            text += SDL_ScanLong(text, radix, &value);
-                            if ( ! suppress ) {
-                                switch (inttype) {
-                                    case DO_SHORT:
-                                        { short* valuep = va_arg(ap, short*);
-                                            *valuep = (short)value;
-                                        }
-                                        break;
-                                    case DO_INT:
-                                        { int* valuep = va_arg(ap, int*);
-                                            *valuep = (int)value;
-                                        }
-                                        break;
-                                    case DO_LONG:
-                                        { long* valuep = va_arg(ap, long*);
-                                            *valuep = value;
-                                        }
-                                        break;
-                                    case DO_LONGLONG:
-                                        /* Handled above */
-                                        break;
-                                }
-                                ++retval;
-                            }
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 'o':
-                        if ( radix == 10 ) {
-                            radix = 8;
-                        }
-                        /* Fall through to unsigned handling */
-                    case 'x':
-                    case 'X':
-                        if ( radix == 10 ) {
-                            radix = 16;
-                        }
-                        /* Fall through to unsigned handling */
-                    case 'u':
-#ifdef SDL_HAS_64BIT_TYPE
-                        if ( inttype == DO_LONGLONG ) {
-                            Uint64 value;
-                            text += SDL_ScanUnsignedLongLong(text, radix, &value);
-                            if ( ! suppress ) {
-                                Uint64 *valuep = va_arg(ap, Uint64*);
-                                *valuep = value;
-                                ++retval;
-                            }
-                        }
-                        else
-#endif /* SDL_HAS_64BIT_TYPE */
-                        {
-                            unsigned long value;
-                            text += SDL_ScanUnsignedLong(text, radix, &value);
-                            if ( ! suppress ) {
-                                switch (inttype) {
-                                    case DO_SHORT:
-                                        { short* valuep = va_arg(ap, short*);
-                                            *valuep = (short)value;
-                                        }
-                                        break;
-                                    case DO_INT:
-                                        { int* valuep = va_arg(ap, int*);
-                                            *valuep = (int)value;
-                                        }
-                                        break;
-                                    case DO_LONG:
-                                        { long* valuep = va_arg(ap, long*);
-                                            *valuep = value;
-                                        }
-                                        break;
-                                    case DO_LONGLONG:
-                                        /* Handled above */
-                                        break;
-                                }
-                                ++retval;
-                            }
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 'p':
-                        {
-                            uintptr_t value;
-                            text += SDL_ScanUintPtrT(text, 16, &value);
-                            if ( ! suppress ) {
-                                void** valuep = va_arg(ap, void**);
-                                *valuep = (void*)value;
-                                ++retval;
-                            }
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 'f':
-                        {
-                            double value;
-                            text += SDL_ScanFloat(text, &value);
-                            if ( ! suppress ) {
-                                float* valuep = va_arg(ap, float*);
-                                *valuep = (float)value;
-                                ++retval;
-                            }
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 's':
-                        if ( suppress ) {
-                            while ( !SDL_isspace((unsigned char) *text) ) {
-                                ++text;
-                                if ( count ) {
-                                    if ( --count == 0 ) {
-                                        break;
-                                    }
-                                }
-                            }
-                        } else {
-                            char *valuep = va_arg(ap, char*);
-                            while ( !SDL_isspace((unsigned char) *text) ) {
-                                *valuep++ = *text++;
-                                if ( count ) {
-                                    if ( --count == 0 ) {
-                                        break;
-                                    }
-                                }
-                            }
-                            *valuep = '\0';
-                            ++retval;
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    default:
-                        done = SDL_TRUE;
-                        break;
-                }
-                ++fmt;
-            }
-            continue;
-        }
-        if ( *text == *fmt ) {
-            ++text;
-            ++fmt;
-            continue;
-        }
-        /* Text didn't match format specifier */
-        break;
-    }
-    va_end(ap);
-
-    return retval;
-}
-#endif
-
-#ifndef HAVE_SNPRINTF
-int SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...)
-{
-    va_list ap;
-    int retval;
-
-    va_start(ap, fmt);
-    retval = SDL_vsnprintf(text, maxlen, fmt, ap);
-    va_end(ap);
-
-    return retval;
-}
-#endif
-
-#ifndef HAVE_VSNPRINTF
-static size_t SDL_PrintLong(char *text, long value, int radix, size_t maxlen)
-{
-    char num[130];
-    size_t size;
-
-    SDL_ltoa(value, num, radix);
-    size = SDL_strlen(num);
-    if ( size >= maxlen ) {
-        size = maxlen-1;
-    }
-    SDL_strlcpy(text, num, size+1);
-
-    return size;
-}
-static size_t SDL_PrintUnsignedLong(char *text, unsigned long value, int radix, size_t maxlen)
-{
-    char num[130];
-    size_t size;
-
-    SDL_ultoa(value, num, radix);
-    size = SDL_strlen(num);
-    if ( size >= maxlen ) {
-        size = maxlen-1;
-    }
-    SDL_strlcpy(text, num, size+1);
-
-    return size;
-}
-#ifdef SDL_HAS_64BIT_TYPE
-static size_t SDL_PrintLongLong(char *text, Sint64 value, int radix, size_t maxlen)
-{
-    char num[130];
-    size_t size;
-
-    SDL_lltoa(value, num, radix);
-    size = SDL_strlen(num);
-    if ( size >= maxlen ) {
-        size = maxlen-1;
-    }
-    SDL_strlcpy(text, num, size+1);
-
-    return size;
-}
-static size_t SDL_PrintUnsignedLongLong(char *text, Uint64 value, int radix, size_t maxlen)
-{
-    char num[130];
-    size_t size;
-
-    SDL_ulltoa(value, num, radix);
-    size = SDL_strlen(num);
-    if ( size >= maxlen ) {
-        size = maxlen-1;
-    }
-    SDL_strlcpy(text, num, size+1);
-
-    return size;
-}
-#endif /* SDL_HAS_64BIT_TYPE */
-static size_t SDL_PrintFloat(char *text, double arg, size_t maxlen)
-{
-    char *textstart = text;
-    if ( arg ) {
-        /* This isn't especially accurate, but hey, it's easy. :) */
-        const double precision = 0.00000001;
-        size_t len;
-        unsigned long value;
-
-        if ( arg < 0 ) {
-            *text++ = '-';
-            --maxlen;
-            arg = -arg;
-        }
-        value = (unsigned long)arg;
-        len = SDL_PrintUnsignedLong(text, value, 10, maxlen);
-        text += len;
-        maxlen -= len;
-        arg -= value;
-        if ( arg > precision && maxlen ) {
-            int mult = 10;
-            *text++ = '.';
-            while ( (arg > precision) && maxlen ) {
-                value = (unsigned long)(arg * mult);
-                len = SDL_PrintUnsignedLong(text, value, 10, maxlen);
-                text += len;
-                maxlen -= len;
-                arg -= (double)value / mult;
-                mult *= 10;
-            }
-        }
-    } else {
-        *text++ = '0';
-    }
-    return (text - textstart);
-}
-static size_t SDL_PrintString(char *text, const char *string, size_t maxlen)
-{
-    char *textstart = text;
-    while ( *string && maxlen-- ) {
-        *text++ = *string++;
-    }
-    return (text - textstart);
-}
-int SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
-{
-    char *textstart = text;
-    if ( maxlen <= 0 ) {
-        return 0;
-    }
-    --maxlen; /* For the trailing '\0' */
-    while ( *fmt && maxlen ) {
-        if ( *fmt == '%' ) {
-            SDL_bool done = SDL_FALSE;
-            size_t len = 0;
-            SDL_bool do_lowercase = SDL_FALSE;
-            int radix = 10;
-            enum {
-                DO_INT,
-                DO_LONG,
-                DO_LONGLONG
-            } inttype = DO_INT;
-
-            ++fmt;
-            /* FIXME: implement more of the format specifiers */
-            while ( *fmt == '.' || (*fmt >= '0' && *fmt <= '9') ) {
-                ++fmt;
-            }
-            while (!done) {
-                switch(*fmt) {
-                    case '%':
-                        *text = '%';
-                        len = 1;
-                        done = SDL_TRUE;
-                        break;
-                    case 'c':
-                        /* char is promoted to int when passed through (...) */
-                        *text = (char)va_arg(ap, int);
-                        len = 1;
-                        done = SDL_TRUE;
-                        break;
-                    case 'h':
-                        /* short is promoted to int when passed through (...) */
-                        break;
-                    case 'l':
-                        if ( inttype < DO_LONGLONG ) {
-                            ++inttype;
-                        }
-                        break;
-                    case 'I':
-                        if ( SDL_strncmp(fmt, "I64", 3) == 0 ) {
-                            fmt += 2;
-                            inttype = DO_LONGLONG;
-                        }
-                        break;
-                    case 'i':
-                    case 'd':
-                        switch (inttype) {
-                            case DO_INT:
-                                len = SDL_PrintLong(text, (long)va_arg(ap, int), radix, maxlen);
-                                break;
-                            case DO_LONG:
-                                len = SDL_PrintLong(text, va_arg(ap, long), radix, maxlen);
-                                break;
-                            case DO_LONGLONG:
-#ifdef SDL_HAS_64BIT_TYPE
-                                len = SDL_PrintLongLong(text, va_arg(ap, Sint64), radix, maxlen);
-#else
-                                len = SDL_PrintLong(text, va_arg(ap, long), radix, maxlen);
-#endif
-                                break;
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 'p':
-                    case 'x':
-                        do_lowercase = SDL_TRUE;
-                        /* Fall through to 'X' handling */
-                    case 'X':
-                        if ( radix == 10 ) {
-                            radix = 16;
-                        }
-                        if ( *fmt == 'p' ) {
-                            inttype = DO_LONG;
-                        }
-                        /* Fall through to unsigned handling */
-                    case 'o':
-                        if ( radix == 10 ) {
-                            radix = 8;
-                        }
-                        /* Fall through to unsigned handling */
-                    case 'u':
-                        switch (inttype) {
-                            case DO_INT:
-                                len = SDL_PrintUnsignedLong(text, (unsigned long)va_arg(ap, unsigned int), radix, maxlen);
-                                break;
-                            case DO_LONG:
-                                len = SDL_PrintUnsignedLong(text, va_arg(ap, unsigned long), radix, maxlen);
-                                break;
-                            case DO_LONGLONG:
-#ifdef SDL_HAS_64BIT_TYPE
-                                len = SDL_PrintUnsignedLongLong(text, va_arg(ap, Uint64), radix, maxlen);
-#else
-                                len = SDL_PrintUnsignedLong(text, va_arg(ap, unsigned long), radix, maxlen);
-#endif
-                                break;
-                        }
-                        if ( do_lowercase ) {
-                            SDL_strlwr(text);
-                        }
-                        done = SDL_TRUE;
-                        break;
-                    case 'f':
-                        len = SDL_PrintFloat(text, va_arg(ap, double), maxlen);
-                        done = SDL_TRUE;
-                        break;
-                    case 's':
-                        len = SDL_PrintString(text, va_arg(ap, char*), maxlen);
-                        done = SDL_TRUE;
-                        break;
-                    default:
-                        done = SDL_TRUE;
-                        break;
-                }
-                ++fmt;
-            }
-            text += len;
-            maxlen -= len;
-        } else {
-            *text++ = *fmt++;
-            --maxlen;
-        }
-    }
-    *text = '\0';
-
-    return (text - textstart);
-}
-#endif
diff --git a/Externals/SDL/win32/SDL.1.3.dll b/Externals/SDL/win32/SDL.1.3.dll
deleted file mode 100644
index 2e09512bee..0000000000
Binary files a/Externals/SDL/win32/SDL.1.3.dll and /dev/null differ
diff --git a/Externals/SDL/win32/SDL.1.3.lib b/Externals/SDL/win32/SDL.1.3.lib
deleted file mode 100644
index 0b64b9aea9..0000000000
Binary files a/Externals/SDL/win32/SDL.1.3.lib and /dev/null differ
diff --git a/Externals/SDL/win32/SDL.dll b/Externals/SDL/win32/SDL.dll
deleted file mode 100644
index ec6d2d845a..0000000000
Binary files a/Externals/SDL/win32/SDL.dll and /dev/null differ
diff --git a/Externals/SDL/win32/SDL.lib b/Externals/SDL/win32/SDL.lib
deleted file mode 100644
index eea0c81b21..0000000000
Binary files a/Externals/SDL/win32/SDL.lib and /dev/null differ
diff --git a/Externals/SDL/x64/SDL.dll b/Externals/SDL/x64/SDL.dll
deleted file mode 100644
index 0ee6467b6d..0000000000
Binary files a/Externals/SDL/x64/SDL.dll and /dev/null differ
diff --git a/Externals/SDL/x64/SDL.lib b/Externals/SDL/x64/SDL.lib
deleted file mode 100644
index 628ed345c1..0000000000
Binary files a/Externals/SDL/x64/SDL.lib and /dev/null differ
diff --git a/Externals/SFML/CMakeLists.txt b/Externals/SFML/CMakeLists.txt
index 86c086420d..0e82eae1ec 100644
--- a/Externals/SFML/CMakeLists.txt
+++ b/Externals/SFML/CMakeLists.txt
@@ -1,17 +1,27 @@
-include_directories(include)
+include_directories(BEFORE include src)
 
-set(SRCS	src/SFML/Network/Ftp.cpp
-			src/SFML/Network/Http.cpp
-			src/SFML/Network/IPAddress.cpp
-			src/SFML/Network/Packet.cpp
-			src/SFML/Network/SelectorBase.cpp
-			src/SFML/Network/SocketTCP.cpp
-			src/SFML/Network/SocketUDP.cpp)
+set(SRC_NETWORK
+	src/SFML/Network/Http.cpp
+	src/SFML/Network/IPAddress.cpp
+	src/SFML/Network/Packet.cpp
+	src/SFML/Network/Socket.cpp
+	src/SFML/Network/SocketSelector.cpp
+	src/SFML/Network/TcpListener.cpp
+	src/SFML/Network/TcpSocket.cpp
+	src/SFML/Network/UdpSocket.cpp
+)
 
-if(UNIX)
-	set(SRCS ${SRCS} src/SFML/Network/Unix/SocketHelper.cpp)
-elseif(WIN32)
-	set(SRCS ${SRCS} src/SFML/Network/Win32/SocketHelper.cpp)
+if(WIN32)
+	list(APPEND SRC_NETWORK src/SFML/Network/Win32/SocketImpl.cpp)
+else()
+	list(APPEND SRC_NETWORK src/SFML/Network/Unix/SocketImpl.cpp)
 endif()
 
-add_library(sfml-network ${SRCS})
+set(SRC_SYSTEM
+	src/SFML/System/Err.cpp
+	src/SFML/System/String.cpp
+	src/SFML/System/Time.cpp
+)
+
+add_library(sfml-network ${SRC_NETWORK})
+add_library(sfml-system ${SRC_SYSTEM})
diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj
index aeb2df601f..d1382d30bc 100644
--- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj
+++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj
@@ -1,26 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>
@@ -28,169 +12,72 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{93D73454-2512-424E-9CDA-4BB357FE13DD}</ProjectGuid>
-    <RootNamespace>SFML_Network</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_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="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_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="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_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="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\SFML\Network\Ftp.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\Http.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\IPAddress.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\Packet.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SelectorBase.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SocketTCP.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SocketUDP.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\Win32\SocketHelper.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\Socket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\SocketSelector.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\TcpListener.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\TcpSocket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\UdpSocket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\Win32\SocketImpl.cpp" />
+    <ClCompile Include="..\..\src\SFML\System\Err.cpp" />
+    <ClCompile Include="..\..\src\SFML\System\String.cpp" />
+    <ClCompile Include="..\..\src\SFML\System\Time.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SFML\Network\Ftp.hpp" />
+    <ClInclude Include="..\..\include\SFML\Config.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\Export.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\Http.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\IPAddress.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\Packet.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Selector.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SelectorBase.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketHelper.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Sockets.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketTCP.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketUDP.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Win32\SocketHelper.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\include\SFML\Network\Selector.inl" />
+    <ClInclude Include="..\..\include\SFML\Network\Socket.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\SocketHandle.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\SocketSelector.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\TcpListener.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\TcpSocket.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\UdpSocket.hpp" />
+    <ClInclude Include="..\..\include\SFML\System.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Err.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Export.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\NonCopyable.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\String.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Time.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Utf.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Utf.inl" />
+    <ClInclude Include="..\..\src\SFML\Network\SocketImpl.hpp" />
+    <ClInclude Include="..\..\src\SFML\Network\Win32\SocketImpl.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters b/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
index 000d4468cd..c80b82db38 100644
--- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
+++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
@@ -1,38 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\src\SFML\Network\Ftp.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\Http.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\IPAddress.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\Packet.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SelectorBase.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SocketTCP.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\SocketUDP.cpp" />
-    <ClCompile Include="..\..\src\SFML\Network\Win32\SocketHelper.cpp">
+    <ClCompile Include="..\..\src\SFML\Network\Socket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\SocketSelector.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\TcpListener.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\TcpSocket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\UdpSocket.cpp" />
+    <ClCompile Include="..\..\src\SFML\Network\Win32\SocketImpl.cpp">
       <Filter>Win32</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\SFML\System\Err.cpp" />
+    <ClCompile Include="..\..\src\SFML\System\String.cpp" />
+    <ClCompile Include="..\..\src\SFML\System\Time.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SFML\Network\Ftp.hpp" />
+    <ClInclude Include="..\..\include\SFML\Config.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\Export.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\Http.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\IPAddress.hpp" />
     <ClInclude Include="..\..\include\SFML\Network\Packet.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Selector.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SelectorBase.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketHelper.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Sockets.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketTCP.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\SocketUDP.hpp" />
-    <ClInclude Include="..\..\include\SFML\Network\Win32\SocketHelper.hpp">
+    <ClInclude Include="..\..\include\SFML\Network\Socket.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\SocketHandle.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\SocketSelector.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\TcpListener.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\TcpSocket.hpp" />
+    <ClInclude Include="..\..\include\SFML\Network\UdpSocket.hpp" />
+    <ClInclude Include="..\..\include\SFML\System.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Err.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Export.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\NonCopyable.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\String.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Time.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Utf.hpp" />
+    <ClInclude Include="..\..\include\SFML\System\Utf.inl" />
+    <ClInclude Include="..\..\src\SFML\Network\SocketImpl.hpp" />
+    <ClInclude Include="..\..\src\SFML\Network\Win32\SocketImpl.hpp">
       <Filter>Win32</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\include\SFML\Network\Selector.inl" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Win32">
       <UniqueIdentifier>{8280ecca-24fc-48a2-b7f5-6aca41826b66}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Externals/SFML/include/SFML/Config.hpp b/Externals/SFML/include/SFML/Config.hpp
index 2a8cf123b3..d825a5af85 100644
--- a/Externals/SFML/include/SFML/Config.hpp
+++ b/Externals/SFML/include/SFML/Config.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -25,6 +25,14 @@
 #ifndef SFML_CONFIG_HPP
 #define SFML_CONFIG_HPP
 
+
+////////////////////////////////////////////////////////////
+// Define the SFML version
+////////////////////////////////////////////////////////////
+#define SFML_VERSION_MAJOR 2
+#define SFML_VERSION_MINOR 1
+
+
 ////////////////////////////////////////////////////////////
 // Identify the operating system
 ////////////////////////////////////////////////////////////
@@ -32,9 +40,6 @@
 
     // Windows
     #define SFML_SYSTEM_WINDOWS
-    #ifndef WIN32_LEAN_AND_MEAN
-        #define WIN32_LEAN_AND_MEAN
-    #endif
     #ifndef NOMINMAX
         #define NOMINMAX
     #endif
@@ -49,8 +54,7 @@
     // MacOS
     #define SFML_SYSTEM_MACOS
 
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
-      defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
     // FreeBSD
     #define SFML_SYSTEM_FREEBSD
@@ -74,45 +78,47 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Define helpers to create portable import / export macros for each module
 ////////////////////////////////////////////////////////////
-#if defined(SFML_SYSTEM_WINDOWS)
+#if !defined(SFML_STATIC)
 
-    #ifdef SFML_DYNAMIC
+    #if defined(SFML_SYSTEM_WINDOWS)
 
-        // Windows platforms
-        #ifdef SFML_EXPORTS
+        // Windows compilers need specific (and different) keywords for export and import
+        #define SFML_API_EXPORT __declspec(dllexport)
+        #define SFML_API_IMPORT __declspec(dllimport)
 
-            // From DLL side, we must export
-            #define SFML_API __declspec(dllexport)
-
-        #else
-
-            // From client application side, we must import
-            #define SFML_API __declspec(dllimport)
-
-        #endif
-
-        // For Visual C++ compilers, we also need to turn off this annoying C4251 warning.
-        // You can read lots ot different things about it, but the point is the code will
-        // just work fine, and so the simplest way to get rid of this warning is to disable it
+        // For Visual C++ compilers, we also need to turn off this annoying C4251 warning
         #ifdef _MSC_VER
 
             #pragma warning(disable : 4251)
 
         #endif
 
-    #else
+    #else // Linux, FreeBSD, Mac OS X
 
-        // No specific directive needed for static build
-        #define SFML_API
+        #if __GNUC__ >= 4
+
+            // GCC 4 has special keywords for showing/hidding symbols,
+            // the same keyword is used for both importing and exporting
+            #define SFML_API_EXPORT __attribute__ ((__visibility__ ("default")))
+            #define SFML_API_IMPORT __attribute__ ((__visibility__ ("default")))
+
+        #else
+
+            // GCC < 4 has no mechanism to explicitely hide symbols, everything's exported
+            #define SFML_API_EXPORT
+            #define SFML_API_IMPORT
+
+        #endif
 
     #endif
 
 #else
 
-    // Other platforms don't need to define anything
-    #define SFML_API
+    // Static build doesn't need import/export macros
+    #define SFML_API_EXPORT
+    #define SFML_API_IMPORT
 
 #endif
 
@@ -120,44 +126,31 @@
 ////////////////////////////////////////////////////////////
 // Define portable fixed-size types
 ////////////////////////////////////////////////////////////
-#include <climits>
-
 namespace sf
 {
+    // All "common" platforms use the same size for char, short and int
+    // (basically there are 3 types for 3 sizes, so no other match is possible),
+    // we can use them without doing any kind of check
+
     // 8 bits integer types
-    #if UCHAR_MAX == 0xFF
-        typedef signed   char Int8;
-        typedef unsigned char Uint8;
-    #else
-        #error No 8 bits integer type for this platform
-    #endif
+    typedef signed   char Int8;
+    typedef unsigned char Uint8;
 
     // 16 bits integer types
-    #if USHRT_MAX == 0xFFFF
-        typedef signed   short Int16;
-        typedef unsigned short Uint16;
-    #elif UINT_MAX == 0xFFFF
-        typedef signed   int Int16;
-        typedef unsigned int Uint16;
-    #elif ULONG_MAX == 0xFFFF
-        typedef signed   long Int16;
-        typedef unsigned long Uint16;
-    #else
-        #error No 16 bits integer type for this platform
-    #endif
+    typedef signed   short Int16;
+    typedef unsigned short Uint16;
 
     // 32 bits integer types
-    #if USHRT_MAX == 0xFFFFFFFF
-        typedef signed   short Int32;
-        typedef unsigned short Uint32;
-    #elif UINT_MAX == 0xFFFFFFFF
-        typedef signed   int Int32;
-        typedef unsigned int Uint32;
-    #elif ULONG_MAX == 0xFFFFFFFF
-        typedef signed   long Int32;
-        typedef unsigned long Uint32;
+    typedef signed   int Int32;
+    typedef unsigned int Uint32;
+
+    // 64 bits integer types
+    #if defined(_MSC_VER)
+        typedef signed   __int64 Int64;
+        typedef unsigned __int64 Uint64;
     #else
-        #error No 32 bits integer type for this platform
+        typedef signed   long long Int64;
+        typedef unsigned long long Uint64;
     #endif
 
 } // namespace sf
diff --git a/Externals/SFML/include/SFML/Network.hpp b/Externals/SFML/include/SFML/Network.hpp
index b0ca47d2b1..62f1286e0e 100644
--- a/Externals/SFML/include/SFML/Network.hpp
+++ b/Externals/SFML/include/SFML/Network.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,13 +30,24 @@
 ////////////////////////////////////////////////////////////
 
 #include <SFML/System.hpp>
-#include <SFML/Network/Ftp.hpp>
+//#include <SFML/Network/Ftp.hpp>
 #include <SFML/Network/Http.hpp>
+
+// This file is "IpAddress.hpp" upstream
 #include <SFML/Network/IPAddress.hpp>
 #include <SFML/Network/Packet.hpp>
-#include <SFML/Network/Selector.hpp>
-#include <SFML/Network/SocketTCP.hpp>
-#include <SFML/Network/SocketUDP.hpp>
+#include <SFML/Network/SocketSelector.hpp>
+#include <SFML/Network/TcpListener.hpp>
+#include <SFML/Network/TcpSocket.hpp>
+#include <SFML/Network/UdpSocket.hpp>
 
 
 #endif // SFML_NETWORK_HPP
+
+////////////////////////////////////////////////////////////
+/// \defgroup network Network module
+///
+/// Socket-based communication, utilities and higher-level
+/// network protocols (HTTP, FTP).
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/Export.hpp b/Externals/SFML/include/SFML/Network/Export.hpp
new file mode 100644
index 0000000000..7dcd1d074f
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/Export.hpp
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_NETWORK_EXPORT_HPP
+#define SFML_NETWORK_EXPORT_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+
+////////////////////////////////////////////////////////////
+// Define portable import / export macros
+////////////////////////////////////////////////////////////
+#if defined(SFML_NETWORK_EXPORTS)
+
+    #define SFML_NETWORK_API SFML_API_EXPORT
+
+#else
+
+    #define SFML_NETWORK_API SFML_API_IMPORT
+
+#endif
+
+
+#endif // SFML_NETWORK_EXPORT_HPP
diff --git a/Externals/SFML/include/SFML/Network/Ftp.hpp b/Externals/SFML/include/SFML/Network/Ftp.hpp
deleted file mode 100644
index efc3a819b7..0000000000
--- a/Externals/SFML/include/SFML/Network/Ftp.hpp
+++ /dev/null
@@ -1,448 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_FTP_HPP
-#define SFML_FTP_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/NonCopyable.hpp>
-#include <SFML/Network/SocketTCP.hpp>
-#include <string>
-#include <vector>
-
-
-namespace sf
-{
-class IPAddress;
-
-////////////////////////////////////////////////////////////
-/// This class provides methods for manipulating the FTP
-/// protocol (described in RFC 959).
-/// It provides easy access and transfers to remote
-/// directories and files on a FTP server
-////////////////////////////////////////////////////////////
-class SFML_API Ftp : NonCopyable
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    /// Enumeration of transfer modes
-    ////////////////////////////////////////////////////////////
-    enum TransferMode
-    {
-        Binary, ///< Binary mode (file is transfered as a sequence of bytes)
-        Ascii,  ///< Text mode using ASCII encoding
-        Ebcdic  ///< Text mode using EBCDIC encoding
-    };
-
-    ////////////////////////////////////////////////////////////
-    /// This class wraps a FTP response, which is basically :
-    /// - a status code
-    /// - a message
-    ////////////////////////////////////////////////////////////
-    class SFML_API Response
-    {
-    public :
-
-        ////////////////////////////////////////////////////////////
-        /// Enumerate all the valid status codes returned in
-        /// a FTP response
-        ////////////////////////////////////////////////////////////
-        enum Status
-        {
-            // 1xx: the requested action is being initiated,
-            // expect another reply before proceeding with a new command
-            RestartMarkerReply          = 110, ///< Restart marker reply
-            ServiceReadySoon            = 120, ///< Service ready in N minutes
-            DataConnectionAlreadyOpened = 125, ///< Data connection already opened, transfer starting
-            OpeningDataConnection       = 150, ///< File status ok, about to open data connection
-
-            // 2xx: the requested action has been successfully completed
-            Ok                    = 200, ///< Command ok
-            PointlessCommand      = 202, ///< Command not implemented
-            SystemStatus          = 211, ///< System status, or system help reply
-            DirectoryStatus       = 212, ///< Directory status
-            FileStatus            = 213, ///< File status
-            HelpMessage           = 214, ///< Help message
-            SystemType            = 215, ///< NAME system type, where NAME is an official system name from the list in the Assigned Numbers document
-            ServiceReady          = 220, ///< Service ready for new user
-            ClosingConnection     = 221, ///< Service closing control connection
-            DataConnectionOpened  = 225, ///< Data connection open, no transfer in progress
-            ClosingDataConnection = 226, ///< Closing data connection, requested file action successful
-            EnteringPassiveMode   = 227, ///< Entering passive mode
-            LoggedIn              = 230, ///< User logged in, proceed. Logged out if appropriate
-            FileActionOk          = 250, ///< Requested file action ok
-            DirectoryOk           = 257, ///< PATHNAME created
-
-            // 3xx: the command has been accepted, but the requested action
-            // is dormant, pending receipt of further information
-            NeedPassword       = 331, ///< User name ok, need password
-            NeedAccountToLogIn = 332, ///< Need account for login
-            NeedInformation    = 350, ///< Requested file action pending further information
-
-            // 4xx: the command was not accepted and the requested action did not take place,
-            // but the error condition is temporary and the action may be requested again
-            ServiceUnavailable        = 421, ///< Service not available, closing control connection
-            DataConnectionUnavailable = 425, ///< Can't open data connection
-            TransferAborted           = 426, ///< Connection closed, transfer aborted
-            FileActionAborted         = 450, ///< Requested file action not taken
-            LocalError                = 451, ///< Requested action aborted, local error in processing
-            InsufficientStorageSpace  = 452, ///< Requested action not taken; insufficient storage space in system, file unavailable
-
-            // 5xx: the command was not accepted and
-            // the requested action did not take place
-            CommandUnknown          = 500, ///< Syntax error, command unrecognized
-            ParametersUnknown       = 501, ///< Syntax error in parameters or arguments
-            CommandNotImplemented   = 502, ///< Command not implemented
-            BadCommandSequence      = 503, ///< Bad sequence of commands
-            ParameterNotImplemented = 504, ///< Command not implemented for that parameter
-            NotLoggedIn             = 530, ///< Not logged in
-            NeedAccountToStore      = 532, ///< Need account for storing files
-            FileUnavailable         = 550, ///< Requested action not taken, file unavailable
-            PageTypeUnknown         = 551, ///< Requested action aborted, page type unknown
-            NotEnoughMemory         = 552, ///< Requested file action aborted, exceeded storage allocation
-            FilenameNotAllowed      = 553, ///< Requested action not taken, file name not allowed
-
-            // 10xx: SFML custom codes
-            InvalidResponse  = 1000, ///< Response is not a valid FTP one
-            ConnectionFailed = 1001, ///< Connection with server failed
-            ConnectionClosed = 1002, ///< Connection with server closed
-            InvalidFile      = 1003  ///< Invalid file to upload / download
-        };
-
-        ////////////////////////////////////////////////////////////
-        /// Default constructor
-        ///
-        /// \param Code :    Response status code (InvalidResponse by default)
-        /// \param Message : Response message (empty by default)
-        ///
-        ////////////////////////////////////////////////////////////
-        Response(Status Code = InvalidResponse, const std::string& Message = "");
-
-        ////////////////////////////////////////////////////////////
-        /// Convenience function to check if the response status code
-        /// means a success
-        ///
-        /// \return True if status is success (code < 400)
-        ///
-        ////////////////////////////////////////////////////////////
-        bool IsOk() const;
-
-        ////////////////////////////////////////////////////////////
-        /// Get the response status code
-        ///
-        /// \return Status code
-        ///
-        ////////////////////////////////////////////////////////////
-        Status GetStatus() const;
-
-        ////////////////////////////////////////////////////////////
-        /// Get the full message contained in the response
-        ///
-        /// \return The response message
-        ///
-        ////////////////////////////////////////////////////////////
-        const std::string& GetMessage() const;
-
-    private :
-
-        ////////////////////////////////////////////////////////////
-        // Member data
-        ////////////////////////////////////////////////////////////
-        Status      myStatus;  ///< Status code returned from the server
-        std::string myMessage; ///< Last message received from the server
-    };
-
-    ////////////////////////////////////////////////////////////
-    /// Specialization of FTP response returning a directory
-    ////////////////////////////////////////////////////////////
-    class SFML_API DirectoryResponse : public Response
-    {
-    public :
-
-        ////////////////////////////////////////////////////////////
-        /// Default constructor
-        ///
-        /// \param Resp : Source response
-        ///
-        ////////////////////////////////////////////////////////////
-        DirectoryResponse(Response Resp);
-
-        ////////////////////////////////////////////////////////////
-        /// Get the directory returned in the response
-        ///
-        /// \return Directory name
-        ///
-        ////////////////////////////////////////////////////////////
-        const std::string& GetDirectory() const;
-
-    private :
-
-        ////////////////////////////////////////////////////////////
-        // Member data
-        ////////////////////////////////////////////////////////////
-        std::string myDirectory; ///< Directory extracted from the response message
-    };
-
-
-    ////////////////////////////////////////////////////////////
-    /// Specialization of FTP response returning a filename lisiting
-    ////////////////////////////////////////////////////////////
-    class SFML_API ListingResponse : public Response
-    {
-    public :
-
-        ////////////////////////////////////////////////////////////
-        /// Default constructor
-        ///
-        /// \param Resp : Source response
-        /// \param Data : Data containing the raw listing
-        ///
-        ////////////////////////////////////////////////////////////
-        ListingResponse(Response Resp, const std::vector<char>& Data);
-
-        ////////////////////////////////////////////////////////////
-        /// Get the number of filenames in the listing
-        ///
-        /// \return Total number of filenames
-        ///
-        ////////////////////////////////////////////////////////////
-        std::size_t GetCount() const;
-
-        ////////////////////////////////////////////////////////////
-        /// Get the Index-th filename in the directory
-        ///
-        /// \param Index : Index of the filename to get
-        ///
-        /// \return Index-th filename
-        ///
-        ////////////////////////////////////////////////////////////
-        const std::string& GetFilename(std::size_t Index) const;
-
-    private :
-
-        ////////////////////////////////////////////////////////////
-        // Member data
-        ////////////////////////////////////////////////////////////
-        std::vector<std::string> myFilenames; ///< Filenames extracted from the data
-    };
-
-
-    ////////////////////////////////////////////////////////////
-    /// Destructor -- close the connection with the server
-    ///
-    ////////////////////////////////////////////////////////////
-    ~Ftp();
-
-    ////////////////////////////////////////////////////////////
-    /// Connect to the specified FTP server
-    ///
-    /// \param Server :  FTP server to connect to
-    /// \param Port :    Port used for connection (21 by default, standard FTP port)
-    /// \param Timeout : Maximum time to wait, in seconds (0 by default, means no timeout)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Connect(const IPAddress& Server, unsigned short Port = 21, float Timeout = 0.f);
-
-    ////////////////////////////////////////////////////////////
-    /// Log in using anonymous account
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Login();
-
-    ////////////////////////////////////////////////////////////
-    /// Log in using a username and a password
-    ///
-    /// \param UserName : User name
-    /// \param Password : Password
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Login(const std::string& UserName, const std::string& Password);
-
-    ////////////////////////////////////////////////////////////
-    /// Close the connection with FTP server
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Disconnect();
-
-    ////////////////////////////////////////////////////////////
-    /// Send a null command just to prevent from being disconnected
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response KeepAlive();
-
-    ////////////////////////////////////////////////////////////
-    /// Get the current working directory
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    DirectoryResponse GetWorkingDirectory();
-
-    ////////////////////////////////////////////////////////////
-    /// Get the contents of the given directory
-    /// (subdirectories and files)
-    ///
-    /// \param Directory : Directory to list ("" by default, the current one)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    ListingResponse GetDirectoryListing(const std::string& Directory = "");
-
-    ////////////////////////////////////////////////////////////
-    /// Change the current working directory
-    ///
-    /// \param Directory : New directory, relative to the current one
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response ChangeDirectory(const std::string& Directory);
-
-    ////////////////////////////////////////////////////////////
-    /// Go to the parent directory of the current one
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response ParentDirectory();
-
-    ////////////////////////////////////////////////////////////
-    /// Create a new directory
-    ///
-    /// \param Name : Name of the directory to create
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response MakeDirectory(const std::string& Name);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove an existing directory
-    ///
-    /// \param Name : Name of the directory to remove
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response DeleteDirectory(const std::string& Name);
-
-    ////////////////////////////////////////////////////////////
-    /// Rename a file
-    ///
-    /// \param File :    File to rename
-    /// \param NewName : New name
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response RenameFile(const std::string& File, const std::string& NewName);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove an existing file
-    ///
-    /// \param Name : File to remove
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response DeleteFile(const std::string& Name);
-
-    ////////////////////////////////////////////////////////////
-    /// Download a file from the server
-    ///
-    /// \param DistantFile : Path of the distant file to download
-    /// \param DestPath :    Where to put to file on the local computer
-    /// \param Mode :        Transfer mode (binary by default)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Download(const std::string& DistantFile, const std::string& DestPath, TransferMode Mode = Binary);
-
-    ////////////////////////////////////////////////////////////
-    /// Upload a file to the server
-    ///
-    /// \param LocalFile : Path of the local file to upload
-    /// \param DestPath :  Where to put to file on the server
-    /// \param Mode :      Transfer mode (binary by default)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response Upload(const std::string& LocalFile, const std::string& DestPath, TransferMode Mode = Binary);
-
-private :
-
-    ////////////////////////////////////////////////////////////
-    /// Send a command to the FTP server
-    ///
-    /// \param Command :   Command to send
-    /// \param Parameter : Command parameter ("" by default)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response SendCommand(const std::string& Command, const std::string& Parameter = "");
-
-    ////////////////////////////////////////////////////////////
-    /// Receive a response from the server
-    /// (usually after a command has been sent)
-    ///
-    /// \return Server response to the request
-    ///
-    ////////////////////////////////////////////////////////////
-    Response GetResponse();
-
-    ////////////////////////////////////////////////////////////
-    /// Utility class for exchanging datas with the server
-    /// on the data channel
-    ////////////////////////////////////////////////////////////
-    class DataChannel;
-
-    friend class DataChannel;
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    SocketTCP myCommandSocket; ///< Socket holding the control connection with the server
-};
-
-} // namespace sf
-
-
-#endif // SFML_FTP_HPP
diff --git a/Externals/SFML/include/SFML/Network/Http.hpp b/Externals/SFML/include/SFML/Network/Http.hpp
index 137bf97130..58299051b8 100644
--- a/Externals/SFML/include/SFML/Network/Http.hpp
+++ b/Externals/SFML/include/SFML/Network/Http.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -28,9 +28,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/NonCopyable.hpp>
+#include <SFML/Network/Export.hpp>
 #include <SFML/Network/IPAddress.hpp>
-#include <SFML/Network/SocketTCP.hpp>
+#include <SFML/Network/TcpSocket.hpp>
+#include <SFML/System/NonCopyable.hpp>
+#include <SFML/System/Time.hpp>
 #include <map>
 #include <string>
 
@@ -38,25 +40,24 @@
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// This class provides methods for manipulating the HTTP
-/// protocol (described in RFC 1945).
-/// It can connect to a website, get its files, send requests, etc.
+/// \brief A HTTP client
+///
 ////////////////////////////////////////////////////////////
-class SFML_API Http : NonCopyable
+class SFML_NETWORK_API Http : NonCopyable
 {
 public :
 
     ////////////////////////////////////////////////////////////
-    /// This class wraps an HTTP request, which is basically :
-    /// - a header with a method, a target URI, and a set of field/value pairs
-    /// - an optional body (for POST requests)
+    /// \brief Define a HTTP request
+    ///
     ////////////////////////////////////////////////////////////
-    class SFML_API Request
+    class SFML_NETWORK_API Request
     {
     public :
 
         ////////////////////////////////////////////////////////////
-        /// Enumerate the available HTTP methods for a request
+        /// \brief Enumerate the available HTTP methods for a request
+        ///
         ////////////////////////////////////////////////////////////
         enum Method
         {
@@ -66,83 +67,106 @@ public :
         };
 
         ////////////////////////////////////////////////////////////
-        /// Default constructor
+        /// \brief Default constructor
         ///
-        /// \param RequestMethod : Method to use for the request (Get by default)
-        /// \param URI :           Target URI ("/" by default -- index page)
-        /// \param Body :          Content of the request's body (empty by default)
+        /// This constructor creates a GET request, with the root
+        /// URI ("/") and an empty body.
+        ///
+        /// \param uri    Target URI
+        /// \param method Method to use for the request
+        /// \param body   Content of the request's body
         ///
         ////////////////////////////////////////////////////////////
-        Request(Method RequestMethod = Get, const std::string& URI = "/", const std::string& Body = "");
+        Request(const std::string& uri = "/", Method method = Get, const std::string& body = "");
 
         ////////////////////////////////////////////////////////////
-        /// Set the value of a field; the field is added if it doesn't exist
+        /// \brief Set the value of a field
         ///
-        /// \param Field : Name of the field to set (case-insensitive)
-        /// \param Value : Value of the field
+        /// The field is created if it doesn't exist. The name of
+        /// the field is case insensitive.
+        /// By default, a request doesn't contain any field (but the
+        /// mandatory fields are added later by the HTTP client when
+        /// sending the request).
+        ///
+        /// \param field Name of the field to set
+        /// \param value Value of the field
         ///
         ////////////////////////////////////////////////////////////
-        void SetField(const std::string& Field, const std::string& Value);
+        void setField(const std::string& field, const std::string& value);
 
         ////////////////////////////////////////////////////////////
-        /// Set the request method.
-        /// This parameter is Http::Request::Get by default
+        /// \brief Set the request method
         ///
-        /// \param RequestMethod : Method to use for the request
+        /// See the Method enumeration for a complete list of all
+        /// the availale methods.
+        /// The method is Http::Request::Get by default.
+        ///
+        /// \param method Method to use for the request
         ///
         ////////////////////////////////////////////////////////////
-        void SetMethod(Method RequestMethod);
+        void setMethod(Method method);
 
         ////////////////////////////////////////////////////////////
-        /// Set the target URI of the request.
-        /// This parameter is "/" by default
+        /// \brief Set the requested URI
         ///
-        /// \param URI : URI to request, local to the host
+        /// The URI is the resource (usually a web page or a file)
+        /// that you want to get or post.
+        /// The URI is "/" (the root page) by default.
+        ///
+        /// \param uri URI to request, relative to the host
         ///
         ////////////////////////////////////////////////////////////
-        void SetURI(const std::string& URI);
+        void setUri(const std::string& uri);
 
         ////////////////////////////////////////////////////////////
-        /// Set the HTTP version of the request.
-        /// This parameter is 1.0 by default
+        /// \brief Set the HTTP version for the request
         ///
-        /// \param Major : Major version number
-        /// \param Minor : Minor version number
+        /// The HTTP version is 1.0 by default.
+        ///
+        /// \param major Major HTTP version number
+        /// \param minor Minor HTTP version number
         ///
         ////////////////////////////////////////////////////////////
-        void SetHttpVersion(unsigned int Major, unsigned int Minor);
+        void setHttpVersion(unsigned int major, unsigned int minor);
 
         ////////////////////////////////////////////////////////////
-        /// Set the body of the request. This parameter is optional and
-        /// makes sense only for POST requests.
-        /// This parameter is empty by default
+        /// \brief Set the body of the request
         ///
-        /// \param Body : Content of the request body
+        /// The body of a request is optional and only makes sense
+        /// for POST requests. It is ignored for all other methods.
+        /// The body is empty by default.
+        ///
+        /// \param body Content of the body
         ///
         ////////////////////////////////////////////////////////////
-        void SetBody(const std::string& Body);
+        void setBody(const std::string& body);
 
     private :
 
         friend class Http;
 
         ////////////////////////////////////////////////////////////
-        /// Get the string representation of the request header
+        /// \brief Prepare the final request to send to the server
         ///
-        /// \return String containing the request
+        /// This is used internally by Http before sending the
+        /// request to the web server.
+        ///
+        /// \return String containing the request, ready to be sent
         ///
         ////////////////////////////////////////////////////////////
-        std::string ToString() const;
+        std::string prepare() const;
 
         ////////////////////////////////////////////////////////////
-        /// Check if the given field has been defined
+        /// \brief Check if the request defines a field
         ///
-        /// \param Field : Name of the field to check (case-insensitive)
+        /// This function uses case-insensitive comparisons.
         ///
-        /// \return True if the field exists
+        /// \param field Name of the field to test
+        ///
+        /// \return True if the field exists, false otherwise
         ///
         ////////////////////////////////////////////////////////////
-        bool HasField(const std::string& Field) const;
+        bool hasField(const std::string& field) const;
 
         ////////////////////////////////////////////////////////////
         // Types
@@ -152,34 +176,35 @@ public :
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        FieldTable   myFields;       ///< Fields of the header
-        Method       myMethod;       ///< Method to use for the request
-        std::string  myURI;          ///< Target URI of the request
-        unsigned int myMajorVersion; ///< Major HTTP version
-        unsigned int myMinorVersion; ///< Minor HTTP version
-        std::string  myBody;         ///< Body of the request
+        FieldTable   m_fields;       ///< Fields of the header associated to their value
+        Method       m_method;       ///< Method to use for the request
+        std::string  m_uri;          ///< Target URI of the request
+        unsigned int m_majorVersion; ///< Major HTTP version
+        unsigned int m_minorVersion; ///< Minor HTTP version
+        std::string  m_body;         ///< Body of the request
     };
 
     ////////////////////////////////////////////////////////////
-    /// This class wraps an HTTP response, which is basically :
-    /// - a header with a status code and a set of field/value pairs
-    /// - a body (the content of the requested resource)
+    /// \brief Define a HTTP response
+    ///
     ////////////////////////////////////////////////////////////
-    class SFML_API Response
+    class SFML_NETWORK_API Response
     {
     public :
 
         ////////////////////////////////////////////////////////////
-        /// Enumerate all the valid status codes returned in
-        /// a HTTP response
+        /// \brief Enumerate all the valid status codes for a response
+        ///
         ////////////////////////////////////////////////////////////
         enum Status
         {
             // 2xx: success
-            Ok        = 200, ///< Most common code returned when operation was successful
-            Created   = 201, ///< The resource has successfully been created
-            Accepted  = 202, ///< The request has been accepted, but will be processed later by the server
-            NoContent = 204, ///< Sent when the server didn't send any data in return
+            Ok             = 200, ///< Most common code returned when operation was successful
+            Created        = 201, ///< The resource has successfully been created
+            Accepted       = 202, ///< The request has been accepted, but will be processed later by the server
+            NoContent      = 204, ///< The server didn't send any data in return
+            ResetContent   = 205, ///< The server informs the client that it should clear the view (form) that caused the request to be sent
+            PartialContent = 206, ///< The server has sent a part of the resource, as a response to a partial GET request
 
             // 3xx: redirection
             MultipleChoices  = 300, ///< The requested page can be accessed from several locations
@@ -188,16 +213,19 @@ public :
             NotModified      = 304, ///< For conditionnal requests, means the requested page hasn't changed and doesn't need to be refreshed
 
             // 4xx: client error
-            BadRequest   = 400, ///< The server couldn't understand the request (syntax error)
-            Unauthorized = 401, ///< The requested page needs an authentification to be accessed
-            Forbidden    = 403, ///< The requested page cannot be accessed at all, even with authentification
-            NotFound     = 404, ///< The requested page doesn't exist
+            BadRequest          = 400, ///< The server couldn't understand the request (syntax error)
+            Unauthorized        = 401, ///< The requested page needs an authentification to be accessed
+            Forbidden           = 403, ///< The requested page cannot be accessed at all, even with authentification
+            NotFound            = 404, ///< The requested page doesn't exist
+            RangeNotSatisfiable = 407, ///< The server can't satisfy the partial GET request (with a "Range" header field)
 
             // 5xx: server error
             InternalServerError = 500, ///< The server encountered an unexpected error
             NotImplemented      = 501, ///< The server doesn't implement a requested feature
             BadGateway          = 502, ///< The gateway server has received an error from the source server
             ServiceNotAvailable = 503, ///< The server is temporarily unavailable (overloaded, in maintenance, ...)
+            GatewayTimeout      = 504, ///< The gateway server couldn't receive a response from the source server
+            VersionNotSupported = 505, ///< The server doesn't support the requested HTTP version
 
             // 10xx: SFML custom codes
             InvalidResponse  = 1000, ///< Response is not a valid HTTP one
@@ -205,68 +233,88 @@ public :
         };
 
         ////////////////////////////////////////////////////////////
-        /// Default constructor
+        /// \brief Default constructor
+        ///
+        /// Constructs an empty response.
         ///
         ////////////////////////////////////////////////////////////
         Response();
 
         ////////////////////////////////////////////////////////////
-        /// Get the value of a field
+        /// \brief Get the value of a field
         ///
-        /// \param Field : Name of the field to get (case-insensitive)
+        /// If the field \a field is not found in the response header,
+        /// the empty string is returned. This function uses
+        /// case-insensitive comparisons.
+        ///
+        /// \param field Name of the field to get
         ///
         /// \return Value of the field, or empty string if not found
         ///
         ////////////////////////////////////////////////////////////
-        const std::string& GetField(const std::string& Field) const;
+        const std::string& getField(const std::string& field) const;
 
         ////////////////////////////////////////////////////////////
-        /// Get the header's status code
+        /// \brief Get the response status code
         ///
-        /// \return Header's status code
+        /// The status code should be the first thing to be checked
+        /// after receiving a response, it defines whether it is a
+        /// success, a failure or anything else (see the Status
+        /// enumeration).
+        ///
+        /// \return Status code of the response
         ///
         ////////////////////////////////////////////////////////////
-        Status GetStatus() const;
+        Status getStatus() const;
 
         ////////////////////////////////////////////////////////////
-        /// Get the major HTTP version number of the response
+        /// \brief Get the major HTTP version number of the response
         ///
-        /// \return Major version number
+        /// \return Major HTTP version number
+        ///
+        /// \see getMinorHttpVersion
         ///
         ////////////////////////////////////////////////////////////
-        unsigned int GetMajorHttpVersion() const;
+        unsigned int getMajorHttpVersion() const;
 
         ////////////////////////////////////////////////////////////
-        /// Get the major HTTP version number of the response
+        /// \brief Get the minor HTTP version number of the response
         ///
-        /// \return Major version number
+        /// \return Minor HTTP version number
+        ///
+        /// \see getMajorHttpVersion
         ///
         ////////////////////////////////////////////////////////////
-        unsigned int GetMinorHttpVersion() const;
+        unsigned int getMinorHttpVersion() const;
 
         ////////////////////////////////////////////////////////////
-        /// Get the body of the response. The body can contain :
-        /// - the requested page (for GET requests)
-        /// - a response from the server (for POST requests)
-        /// - nothing (for HEAD requests)
-        /// - an error message (in case of an error)
+        /// \brief Get the body of the response
+        ///
+        /// The body of a response may contain:
+        /// \li the requested page (for GET requests)
+        /// \li a response from the server (for POST requests)
+        /// \li nothing (for HEAD requests)
+        /// \li an error message (in case of an error)
         ///
         /// \return The response body
         ///
         ////////////////////////////////////////////////////////////
-        const std::string& GetBody() const;
+        const std::string& getBody() const;
 
     private :
 
         friend class Http;
 
         ////////////////////////////////////////////////////////////
-        /// Construct the header from a response string
+        /// \brief Construct the header from a response string
         ///
-        /// \param Data : Content of the response's header to parse
+        /// This function is used by Http to build the response
+        /// of a request.
+        ///
+        /// \param data Content of the response to parse
         ///
         ////////////////////////////////////////////////////////////
-        void FromString(const std::string& Data);
+        void parse(const std::string& data);
 
         ////////////////////////////////////////////////////////////
         // Types
@@ -276,65 +324,144 @@ public :
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        FieldTable   myFields;       ///< Fields of the header
-        Status       myStatus;       ///< Status code
-        unsigned int myMajorVersion; ///< Major HTTP version
-        unsigned int myMinorVersion; ///< Minor HTTP version
-        std::string  myBody;         ///< Body of the response
+        FieldTable   m_fields;       ///< Fields of the header
+        Status       m_status;       ///< Status code
+        unsigned int m_majorVersion; ///< Major HTTP version
+        unsigned int m_minorVersion; ///< Minor HTTP version
+        std::string  m_body;         ///< Body of the response
     };
 
     ////////////////////////////////////////////////////////////
-    /// Default constructor
+    /// \brief Default constructor
     ///
     ////////////////////////////////////////////////////////////
     Http();
 
     ////////////////////////////////////////////////////////////
-    /// Construct the Http instance with the target host
+    /// \brief Construct the HTTP client with the target host
     ///
-    /// \param Host : Web server to connect to
-    /// \param Port : Port to use for connection (0 by default -- use the standard port of the protocol used)
+    /// This is equivalent to calling setHost(host, port).
+    /// The port has a default value of 0, which means that the
+    /// HTTP client will use the right port according to the
+    /// protocol used (80 for HTTP, 443 for HTTPS). You should
+    /// leave it like this unless you really need a port other
+    /// than the standard one, or use an unknown protocol.
+    ///
+    /// \param host Web server to connect to
+    /// \param port Port to use for connection
     ///
     ////////////////////////////////////////////////////////////
-    Http(const std::string& Host, unsigned short Port = 0);
+    Http(const std::string& host, unsigned short port = 0);
 
     ////////////////////////////////////////////////////////////
-    /// Set the target host
+    /// \brief Set the target host
     ///
-    /// \param Host : Web server to connect to
-    /// \param Port : Port to use for connection (0 by default -- use the standard port of the protocol used)
+    /// This function just stores the host address and port, it
+    /// doesn't actually connect to it until you send a request.
+    /// The port has a default value of 0, which means that the
+    /// HTTP client will use the right port according to the
+    /// protocol used (80 for HTTP, 443 for HTTPS). You should
+    /// leave it like this unless you really need a port other
+    /// than the standard one, or use an unknown protocol.
+    ///
+    /// \param host Web server to connect to
+    /// \param port Port to use for connection
     ///
     ////////////////////////////////////////////////////////////
-    void SetHost(const std::string& Host, unsigned short Port = 0);
+    void setHost(const std::string& host, unsigned short port = 0);
 
     ////////////////////////////////////////////////////////////
-    /// Send a HTTP request and return the server's response.
-    /// You must be connected to a host before sending requests.
-    /// Any missing mandatory header field will be added with an appropriate value.
-    /// Warning : this function waits for the server's response and may
+    /// \brief Send a HTTP request and return the server's response.
+    ///
+    /// You must have a valid host before sending a request (see setHost).
+    /// Any missing mandatory header field in the request will be added
+    /// with an appropriate value.
+    /// Warning: this function waits for the server's response and may
     /// not return instantly; use a thread if you don't want to block your
-    /// application.
+    /// application, or use a timeout to limit the time to wait. A value
+    /// of Time::Zero means that the client will use the system defaut timeout
+    /// (which is usually pretty long).
     ///
-    /// \param Req :     Request to send
-    /// \param Timeout : Maximum time to wait, in seconds (0 by default, means no timeout)
+    /// \param request Request to send
+    /// \param timeout Maximum time to wait
     ///
     /// \return Server's response
     ///
     ////////////////////////////////////////////////////////////
-    Response SendRequest(const Request& Req, float Timeout = 0.f);
+    Response sendRequest(const Request& request, Time timeout = Time::Zero);
 
 private :
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    SocketTCP      myConnection; ///< Connection to the host
-    IPAddress      myHost;       ///< Web host address
-    std::string    myHostName;   ///< Web host name
-    unsigned short myPort;       ///< Port used for connection with host
+    TcpSocket      m_connection; ///< Connection to the host
+    IpAddress      m_host;       ///< Web host address
+    std::string    m_hostName;   ///< Web host name
+    unsigned short m_port;       ///< Port used for connection with host
 };
 
 } // namespace sf
 
 
 #endif // SFML_HTTP_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::Http
+/// \ingroup network
+///
+/// sf::Http is a very simple HTTP client that allows you
+/// to communicate with a web server. You can retrieve
+/// web pages, send data to an interactive resource,
+/// download a remote file, etc.
+///
+/// The HTTP client is split into 3 classes:
+/// \li sf::Http::Request
+/// \li sf::Http::Response
+/// \li sf::Http
+///
+/// sf::Http::Request builds the request that will be
+/// sent to the server. A request is made of:
+/// \li a method (what you want to do)
+/// \li a target URI (usually the name of the web page or file)
+/// \li one or more header fields (options that you can pass to the server)
+/// \li an optional body (for POST requests)
+///
+/// sf::Http::Response parse the response from the web server
+/// and provides getters to read them. The response contains:
+/// \li a status code
+/// \li header fields (that may be answers to the ones that you requested)
+/// \li a body, which contains the contents of the requested resource
+///
+/// sf::Http provides a simple function, SendRequest, to send a
+/// sf::Http::Request and return the corresponding sf::Http::Response
+/// from the server.
+///
+/// Usage example:
+/// \code
+/// // Create a new HTTP client
+/// sf::Http http;
+///
+/// // We'll work on http://www.sfml-dev.org
+/// http.setHost("http://www.sfml-dev.org");
+///
+/// // Prepare a request to get the 'features.php' page
+/// sf::Http::Request request("features.php");
+///
+/// // Send the request
+/// sf::Http::Response response = http.sendRequest(request);
+///
+/// // Check the status code and display the result
+/// sf::Http::Response::Status status = response.getStatus();
+/// if (status == sf::Http::Response::Ok)
+/// {
+///     std::cout << response.getBody() << std::endl;
+/// }
+/// else
+/// {
+///     std::cout << "Error " << status << std::endl;
+/// }
+/// \endcode
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/IPAddress.hpp b/Externals/SFML/include/SFML/Network/IPAddress.hpp
index 0e560d9da3..d2fdda4321 100644
--- a/Externals/SFML/include/SFML/Network/IPAddress.hpp
+++ b/Externals/SFML/include/SFML/Network/IPAddress.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -28,7 +28,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include <SFML/Network/Export.hpp>
+#include <SFML/System/Time.hpp>
 #include <istream>
 #include <ostream>
 #include <string>
@@ -37,195 +38,279 @@
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// IPAddress provides easy manipulation of IP v4 addresses
+/// \brief Encapsulate an IPv4 network address
+///
 ////////////////////////////////////////////////////////////
-class SFML_API IPAddress
+class SFML_NETWORK_API IpAddress
 {
 public :
 
     ////////////////////////////////////////////////////////////
-    /// Default constructor -- constructs an invalid address
+    /// \brief Default constructor
+    ///
+    /// This constructor creates an empty (invalid) address
     ///
     ////////////////////////////////////////////////////////////
-    IPAddress();
+    IpAddress();
 
     ////////////////////////////////////////////////////////////
-    /// Construct the address from a string
+    /// \brief Construct the address from a string
     ///
-    /// \param Address : IP address ("xxx.xxx.xxx.xxx") or network name
+    /// Here \a address can be either a decimal address
+    /// (ex: "192.168.1.56") or a network name (ex: "localhost").
+    ///
+    /// \param address IP address or network name
     ///
     ////////////////////////////////////////////////////////////
-    IPAddress(const std::string& Address);
+    IpAddress(const std::string& address);
 
     ////////////////////////////////////////////////////////////
-    /// Construct the address from a C-style string ;
-    /// Needed for implicit conversions from literal strings to IPAddress to work
+    /// \brief Construct the address from a string
     ///
-    /// \param Address : IP address ("xxx.xxx.xxx.xxx") or network name
+    /// Here \a address can be either a decimal address
+    /// (ex: "192.168.1.56") or a network name (ex: "localhost").
+    /// This is equivalent to the constructor taking a std::string
+    /// parameter, it is defined for convenience so that the
+    /// implicit conversions from literal strings to IpAddress work.
+    ///
+    /// \param address IP address or network name
     ///
     ////////////////////////////////////////////////////////////
-    IPAddress(const char* Address);
+    IpAddress(const char* address);
 
     ////////////////////////////////////////////////////////////
-    /// Construct the address from 4 bytes
+    /// \brief Construct the address from 4 bytes
     ///
-    /// \param Byte0 : First byte of the address
-    /// \param Byte1 : Second byte of the address
-    /// \param Byte2 : Third byte of the address
-    /// \param Byte3 : Fourth byte of the address
+    /// Calling IpAddress(a, b, c, d) is equivalent to calling
+    /// IpAddress("a.b.c.d"), but safer as it doesn't have to
+    /// parse a string to get the address components.
+    ///
+    /// \param byte0 First byte of the address
+    /// \param byte1 Second byte of the address
+    /// \param byte2 Third byte of the address
+    /// \param byte3 Fourth byte of the address
     ///
     ////////////////////////////////////////////////////////////
-    IPAddress(Uint8 Byte0, Uint8 Byte1, Uint8 Byte2, Uint8 Byte3);
+    IpAddress(Uint8 byte0, Uint8 byte1, Uint8 byte2, Uint8 byte3);
 
     ////////////////////////////////////////////////////////////
-    /// Construct the address from a 32-bits integer
+    /// \brief Construct the address from a 32-bits integer
     ///
-    /// \param Address : 4 bytes of the address packed into a 32-bits integer
+    /// This constructor uses the internal representation of
+    /// the address directly. It should be used for optimization
+    /// purposes, and only if you got that representation from
+    /// IpAddress::ToInteger().
+    ///
+    /// \param address 4 bytes of the address packed into a 32-bits integer
+    ///
+    /// \see toInteger
     ///
     ////////////////////////////////////////////////////////////
-    IPAddress(Uint32 Address);
+    explicit IpAddress(Uint32 address);
 
     ////////////////////////////////////////////////////////////
-    /// Tell if the address is a valid one
+    /// \brief Get a string representation of the address
     ///
-    /// \return True if address has a valid syntax
+    /// The returned string is the decimal representation of the
+    /// IP address (like "192.168.1.56"), even if it was constructed
+    /// from a host name.
+    ///
+    /// \return String representation of the address
+    ///
+    /// \see toInteger
     ///
     ////////////////////////////////////////////////////////////
-    bool IsValid() const;
+    std::string toString() const;
 
     ////////////////////////////////////////////////////////////
-    /// Get a string representation of the address
+    /// \brief Get an integer representation of the address
     ///
-    /// \return String representation of the IP address ("xxx.xxx.xxx.xxx")
+    /// The returned number is the internal representation of the
+    /// address, and should be used for optimization purposes only
+    /// (like sending the address through a socket).
+    /// The integer produced by this function can then be converted
+    /// back to a sf::IpAddress with the proper constructor.
+    ///
+    /// \return 32-bits unsigned integer representation of the address
+    ///
+    /// \see toString
     ///
     ////////////////////////////////////////////////////////////
-    std::string ToString() const;
+    Uint32 toInteger() const;
 
     ////////////////////////////////////////////////////////////
-    /// Get an integer representation of the address
+    /// \brief Get the computer's local address
     ///
-    /// \return 32-bits integer containing the 4 bytes of the address, in system endianness
+    /// The local address is the address of the computer from the
+    /// LAN point of view, i.e. something like 192.168.1.56. It is
+    /// meaningful only for communications over the local network.
+    /// Unlike getPublicAddress, this function is fast and may be
+    /// used safely anywhere.
+    ///
+    /// \return Local IP address of the computer
+    ///
+    /// \see getPublicAddress
     ///
     ////////////////////////////////////////////////////////////
-    Uint32 ToInteger() const;
+    static IpAddress getLocalAddress();
 
     ////////////////////////////////////////////////////////////
-    /// Get the computer's local IP address (from the LAN point of view)
+    /// \brief Get the computer's public address
     ///
-    /// \return Local IP address
-    ///
-    ////////////////////////////////////////////////////////////
-    static IPAddress GetLocalAddress();
-
-    ////////////////////////////////////////////////////////////
-    /// Get the computer's public IP address (from the web point of view).
+    /// The public address is the address of the computer from the
+    /// internet point of view, i.e. something like 89.54.1.169.
+    /// It is necessary for communications over the world wide web.
     /// The only way to get a public address is to ask it to a
-    /// distant website ; as a consequence, this function may be
-    /// very slow -- use it as few as possible !
+    /// distant website; as a consequence, this function depends on
+    /// both your network connection and the server, and may be
+    /// very slow. You should use it as few as possible. Because
+    /// this function depends on the network connection and on a distant
+    /// server, you may use a time limit if you don't want your program
+    /// to be possibly stuck waiting in case there is a problem; this
+    /// limit is deactivated by default.
     ///
-    /// \param Timeout : Maximum time to wait, in seconds (0 by default : no timeout)
+    /// \param timeout Maximum time to wait
     ///
-    /// \return Public IP address
+    /// \return Public IP address of the computer
+    ///
+    /// \see getLocalAddress
     ///
     ////////////////////////////////////////////////////////////
-    static IPAddress GetPublicAddress(float Timeout = 0.f);
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator ==
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this == Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator ==(const IPAddress& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator !=
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this != Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator !=(const IPAddress& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator <
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this < Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator <(const IPAddress& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator >
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this > Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator >(const IPAddress& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator <=
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this <= Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator <=(const IPAddress& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator >=
-    ///
-    /// \param Other : Address to compare
-    ///
-    /// \return True if *this >= Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator >=(const IPAddress& Other) const;
+    static IpAddress getPublicAddress(Time timeout = Time::Zero);
 
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const IPAddress LocalHost; ///< Local host address (to connect to the same computer)
+    static const IpAddress None;      ///< Value representing an empty/invalid address
+    static const IpAddress LocalHost; ///< The "localhost" address (for connecting a computer to itself locally)
+    static const IpAddress Broadcast; ///< The "broadcast" address (for sending UDP messages to everyone on a local network)
 
 private :
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Uint32 myAddress; ///< Address stored as an unsigned 32 bits integer
+    Uint32 m_address; ///< Address stored as an unsigned 32 bits integer
 };
 
 ////////////////////////////////////////////////////////////
-/// Operator >> overload to extract an address from an input stream
+/// \brief Overload of == operator to compare two IP addresses
 ///
-/// \param Stream :  Input stream
-/// \param Address : Address to extract
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if both addresses are equal
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator ==(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of != operator to compare two IP addresses
+///
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if both addresses are different
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator !=(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of < operator to compare two IP addresses
+///
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if \a left is lesser than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator <(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of > operator to compare two IP addresses
+///
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if \a left is greater than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator >(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of <= operator to compare two IP addresses
+///
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if \a left is lesser or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator <=(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of >= operator to compare two IP addresses
+///
+/// \param left  Left operand (a IP address)
+/// \param right Right operand (a IP address)
+///
+/// \return True if \a left is greater or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_NETWORK_API bool operator >=(const IpAddress& left, const IpAddress& right);
+
+////////////////////////////////////////////////////////////
+/// \brief Overload of >> operator to extract an IP address from an input stream
+///
+/// \param stream  Input stream
+/// \param address IP address to extract
 ///
 /// \return Reference to the input stream
 ///
 ////////////////////////////////////////////////////////////
-SFML_API std::istream& operator >>(std::istream& Stream, IPAddress& Address);
+SFML_NETWORK_API std::istream& operator >>(std::istream& stream, IpAddress& address);
 
 ////////////////////////////////////////////////////////////
-/// Operator << overload to print an address to an output stream
+/// \brief Overload of << operator to print an IP address to an output stream
 ///
-/// \param Stream :  Output stream
-/// \param Address : Address to print
+/// \param stream  Output stream
+/// \param address IP address to print
 ///
 /// \return Reference to the output stream
 ///
 ////////////////////////////////////////////////////////////
-SFML_API std::ostream& operator <<(std::ostream& Stream, const IPAddress& Address);
+SFML_NETWORK_API std::ostream& operator <<(std::ostream& stream, const IpAddress& address);
 
 } // namespace sf
 
 
 #endif // SFML_IPADDRESS_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::IpAddress
+/// \ingroup network
+///
+/// sf::IpAddress is a utility class for manipulating network
+/// addresses. It provides a set a implicit constructors and
+/// conversion functions to easily build or transform an IP
+/// address from/to various representations.
+///
+/// Usage example:
+/// \code
+/// sf::IpAddress a0;                                     // an invalid address
+/// sf::IpAddress a1 = sf::IpAddress::None;               // an invalid address (same as a0)
+/// sf::IpAddress a2("127.0.0.1");                        // the local host address
+/// sf::IpAddress a3 = sf::IpAddress::Broadcast;          // the broadcast address
+/// sf::IpAddress a4(192, 168, 1, 56);                    // a local address
+/// sf::IpAddress a5("my_computer");                      // a local address created from a network name
+/// sf::IpAddress a6("89.54.1.169");                      // a distant address
+/// sf::IpAddress a7("www.google.com");                   // a distant address created from a network name
+/// sf::IpAddress a8 = sf::IpAddress::getLocalAddress();  // my address on the local network
+/// sf::IpAddress a9 = sf::IpAddress::getPublicAddress(); // my address on the internet
+/// \endcode
+///
+/// Note that sf::IpAddress currently doesn't support IPv6
+/// nor other types of network addresses.
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/Packet.hpp b/Externals/SFML/include/SFML/Network/Packet.hpp
index a4af131ae7..4b67852c18 100644
--- a/Externals/SFML/include/SFML/Network/Packet.hpp
+++ b/Externals/SFML/include/SFML/Network/Packet.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -28,160 +28,380 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include <SFML/Network/Export.hpp>
 #include <string>
 #include <vector>
 
 
 namespace sf
 {
+class String;
+class TcpSocket;
+class UdpSocket;
+
 ////////////////////////////////////////////////////////////
-/// Packet wraps data to send / to receive through the network
+/// \brief Utility class to build blocks of data to transfer
+///        over the network
+///
 ////////////////////////////////////////////////////////////
-class SFML_API Packet
+class SFML_NETWORK_API Packet
 {
+    // A bool-like type that cannot be converted to integer or pointer types
+    typedef bool (Packet::*BoolType)(std::size_t);
+
 public :
 
     ////////////////////////////////////////////////////////////
-    /// Default constructor
+    /// \brief Default constructor
+    ///
+    /// Creates an empty packet.
     ///
     ////////////////////////////////////////////////////////////
     Packet();
 
     ////////////////////////////////////////////////////////////
-    /// Virtual destructor
+    /// \brief Virtual destructor
     ///
     ////////////////////////////////////////////////////////////
     virtual ~Packet();
 
     ////////////////////////////////////////////////////////////
-    /// Append data to the end of the packet
+    /// \brief Append data to the end of the packet
     ///
-    /// \param Data :        Pointer to the bytes to append
-    /// \param SizeInBytes : Number of bytes to append
+    /// \param data        Pointer to the sequence of bytes to append
+    /// \param sizeInBytes Number of bytes to append
+    ///
+    /// \see clear
     ///
     ////////////////////////////////////////////////////////////
-    void Append(const void* Data, std::size_t SizeInBytes);
+    void append(const void* data, std::size_t sizeInBytes);
 
     ////////////////////////////////////////////////////////////
-    /// Clear the packet data
+    /// \brief Clear the packet
+    ///
+    /// After calling Clear, the packet is empty.
+    ///
+    /// \see append
     ///
     ////////////////////////////////////////////////////////////
-    void Clear();
+    void clear();
 
     ////////////////////////////////////////////////////////////
-    /// Get a pointer to the data contained in the packet
-    /// Warning : the returned pointer may be invalid after you
-    /// append data to the packet
+    /// \brief Get a pointer to the data contained in the packet
+    ///
+    /// Warning: the returned pointer may become invalid after
+    /// you append data to the packet, therefore it should never
+    /// be stored.
+    /// The return pointer is NULL if the packet is empty.
     ///
     /// \return Pointer to the data
     ///
+    /// \see getDataSize
+    ///
     ////////////////////////////////////////////////////////////
-    const char* GetData() const;
+    const void* getData() const;
 
     ////////////////////////////////////////////////////////////
-    /// Get the size of the data contained in the packet
+    /// \brief Get the size of the data contained in the packet
+    ///
+    /// This function returns the number of bytes pointed to by
+    /// what getData returns.
     ///
     /// \return Data size, in bytes
     ///
-    ////////////////////////////////////////////////////////////
-    std::size_t GetDataSize() const;
-
-    ////////////////////////////////////////////////////////////
-    /// Tell if the reading position has reached the end of the packet
-    ///
-    /// \return True if all data have been read into the packet
+    /// \see getData
     ///
     ////////////////////////////////////////////////////////////
-    bool EndOfPacket() const;
+    std::size_t getDataSize() const;
 
     ////////////////////////////////////////////////////////////
-    /// Return the validity of packet
+    /// \brief Tell if the reading position has reached the
+    ///        end of the packet
+    ///
+    /// This function is useful to know if there is some data
+    /// left to be read, without actually reading it.
+    ///
+    /// \return True if all data was read, false otherwise
+    ///
+    /// \see operator bool
+    ///
+    ////////////////////////////////////////////////////////////
+    bool endOfPacket() const;
+
+public:
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Test the validity of the packet, for reading
+    ///
+    /// This operator allows to test the packet as a boolean
+    /// variable, to check if a reading operation was successful.
+    ///
+    /// A packet will be in an invalid state if it has no more
+    /// data to read.
+    ///
+    /// This behaviour is the same as standard C++ streams.
+    ///
+    /// Usage example:
+    /// \code
+    /// float x;
+    /// packet >> x;
+    /// if (packet)
+    /// {
+    ///    // ok, x was extracted successfully
+    /// }
+    ///
+    /// // -- or --
+    ///
+    /// float x;
+    /// if (packet >> x)
+    /// {
+    ///    // ok, x was extracted successfully
+    /// }
+    /// \endcode
+    ///
+    /// Don't focus on the return type, it's equivalent to bool but
+    /// it disallows unwanted implicit conversions to integer or
+    /// pointer types.
     ///
     /// \return True if last data extraction from packet was successful
     ///
-    ////////////////////////////////////////////////////////////
-    operator bool() const;
-
-    ////////////////////////////////////////////////////////////
-    /// Operator >> overloads to extract data from the packet
+    /// \see endOfPacket
     ///
     ////////////////////////////////////////////////////////////
-    Packet& operator >>(bool&         Data);
-    Packet& operator >>(Int8&         Data);
-    Packet& operator >>(Uint8&        Data);
-    Packet& operator >>(Int16&        Data);
-    Packet& operator >>(Uint16&       Data);
-    Packet& operator >>(Int32&        Data);
-    Packet& operator >>(Uint32&       Data);
-    Packet& operator >>(float&        Data);
-    Packet& operator >>(double&       Data);
-    Packet& operator >>(char*         Data);
-    Packet& operator >>(std::string&  Data);
-    Packet& operator >>(wchar_t*      Data);
-    Packet& operator >>(std::wstring& Data);
+    operator BoolType() const;
 
     ////////////////////////////////////////////////////////////
-    /// Operator << overloads to put data into the packet
+    /// Overloads of operator >> to read data from the packet
     ///
     ////////////////////////////////////////////////////////////
-    Packet& operator <<(bool                Data);
-    Packet& operator <<(Int8                Data);
-    Packet& operator <<(Uint8               Data);
-    Packet& operator <<(Int16               Data);
-    Packet& operator <<(Uint16              Data);
-    Packet& operator <<(Int32               Data);
-    Packet& operator <<(Uint32              Data);
-    Packet& operator <<(float               Data);
-    Packet& operator <<(double              Data);
-    Packet& operator <<(const char*         Data);
-    Packet& operator <<(const std::string&  Data);
-    Packet& operator <<(const wchar_t*      Data);
-    Packet& operator <<(const std::wstring& Data);
-
-private :
-
-    friend class SocketTCP;
-    friend class SocketUDP;
+    Packet& operator >>(bool&         data);
+    Packet& operator >>(Int8&         data);
+    Packet& operator >>(Uint8&        data);
+    Packet& operator >>(Int16&        data);
+    Packet& operator >>(Uint16&       data);
+    Packet& operator >>(Int32&        data);
+    Packet& operator >>(Uint32&       data);
+    Packet& operator >>(float&        data);
+    Packet& operator >>(double&       data);
+    Packet& operator >>(char*         data);
+    Packet& operator >>(std::string&  data);
+    Packet& operator >>(wchar_t*      data);
+    Packet& operator >>(std::wstring& data);
+    Packet& operator >>(String&       data);
 
     ////////////////////////////////////////////////////////////
-    /// Check if the packet can extract a given size of bytes
-    ///
-    /// \param Size : Size to check
-    ///
-    /// \return True if Size bytes can be read from the packet's data
+    /// Overloads of operator << to write data into the packet
     ///
     ////////////////////////////////////////////////////////////
-    bool CheckSize(std::size_t Size);
+    Packet& operator <<(bool                data);
+    Packet& operator <<(Int8                data);
+    Packet& operator <<(Uint8               data);
+    Packet& operator <<(Int16               data);
+    Packet& operator <<(Uint16              data);
+    Packet& operator <<(Int32               data);
+    Packet& operator <<(Uint32              data);
+    Packet& operator <<(float               data);
+    Packet& operator <<(double              data);
+    Packet& operator <<(const char*         data);
+    Packet& operator <<(const std::string&  data);
+    Packet& operator <<(const wchar_t*      data);
+    Packet& operator <<(const std::wstring& data);
+    Packet& operator <<(const String&       data);
+
+protected:
+
+    friend class TcpSocket;
+    friend class UdpSocket;
 
     ////////////////////////////////////////////////////////////
-    /// Called before the packet is sent to the network
+    /// \brief Called before the packet is sent over the network
     ///
-    /// \param DataSize : Variable to fill with the size of data to send
+    /// This function can be defined by derived classes to
+    /// transform the data before it is sent; this can be
+    /// used for compression, encryption, etc.
+    /// The function must return a pointer to the modified data,
+    /// as well as the number of bytes pointed.
+    /// The default implementation provides the packet's data
+    /// without transforming it.
+    ///
+    /// \param size Variable to fill with the size of data to send
     ///
     /// \return Pointer to the array of bytes to send
     ///
+    /// \see onReceive
+    ///
     ////////////////////////////////////////////////////////////
-    virtual const char* OnSend(std::size_t& DataSize);
+    virtual const void* onSend(std::size_t& size);
 
     ////////////////////////////////////////////////////////////
-    /// Called after the packet has been received from the network
+    /// \brief Called after the packet is received over the network
     ///
-    /// \param Data :     Pointer to the array of received bytes
-    /// \param DataSize : Size of the array of bytes
+    /// This function can be defined by derived classes to
+    /// transform the data after it is received; this can be
+    /// used for uncompression, decryption, etc.
+    /// The function receives a pointer to the received data,
+    /// and must fill the packet with the transformed bytes.
+    /// The default implementation fills the packet directly
+    /// without transforming the data.
+    ///
+    /// \param data Pointer to the received bytes
+    /// \param size Number of bytes
+    ///
+    /// \see onSend
     ///
     ////////////////////////////////////////////////////////////
-    virtual void OnReceive(const char* Data, std::size_t DataSize);
+    virtual void onReceive(const void* data, std::size_t size);
+
+private :
+
+    ////////////////////////////////////////////////////////////
+    /// Disallow comparisons between packets
+    ///
+    ////////////////////////////////////////////////////////////
+    bool operator ==(const Packet& right) const;
+    bool operator !=(const Packet& right) const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Check if the packet can extract a given number of bytes
+    ///
+    /// This function updates accordingly the state of the packet.
+    ///
+    /// \param size Size to check
+    ///
+    /// \return True if \a size bytes can be read from the packet
+    ///
+    ////////////////////////////////////////////////////////////
+    bool checkSize(std::size_t size);
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<char> myData;    ///< Data stored in the packet
-    std::size_t       myReadPos; ///< Current reading position in the packet
-    bool              myIsValid; ///< Reading state of the packet
+    std::vector<char> m_data;    ///< Data stored in the packet
+    std::size_t       m_readPos; ///< Current reading position in the packet
+    bool              m_isValid; ///< Reading state of the packet
 };
 
 } // namespace sf
 
 
 #endif // SFML_PACKET_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::Packet
+/// \ingroup network
+///
+/// Packets provide a safe and easy way to serialize data,
+/// in order to send it over the network using sockets
+/// (sf::TcpSocket, sf::UdpSocket).
+///
+/// Packets solve 2 fundamental problems that arise when
+/// transfering data over the network:
+/// \li data is interpreted correctly according to the endianness
+/// \li the bounds of the packet are preserved (one send == one receive)
+///
+/// The sf::Packet class provides both input and output modes.
+/// It is designed to follow the behaviour of standard C++ streams,
+/// using operators >> and << to extract and insert data.
+///
+/// It is recommended to use only fixed-size types (like sf::Int32, etc.),
+/// to avoid possible differences between the sender and the receiver.
+/// Indeed, the native C++ types may have different sizes on two platforms
+/// and your data may be corrupted if that happens.
+///
+/// Usage example:
+/// \code
+/// sf::Uint32 x = 24;
+/// std::string s = "hello";
+/// double d = 5.89;
+///
+/// // Group the variables to send into a packet
+/// sf::Packet packet;
+/// packet << x << s << d;
+///
+/// // Send it over the network (socket is a valid sf::TcpSocket)
+/// socket.send(packet);
+///
+/// -----------------------------------------------------------------
+///
+/// // Receive the packet at the other end
+/// sf::Packet packet;
+/// socket.receive(packet);
+///
+/// // Extract the variables contained in the packet
+/// sf::Uint32 x;
+/// std::string s;
+/// double d;
+/// if (packet >> x >> s >> d)
+/// {
+///     // Data extracted successfully...
+/// }
+/// \endcode
+///
+/// Packets have built-in operator >> and << overloads for
+/// standard types:
+/// \li bool
+/// \li fixed-size integer types (sf::Int8/16/32, sf::Uint8/16/32)
+/// \li floating point numbers (float, double)
+/// \li string types (char*, wchar_t*, std::string, std::wstring, sf::String)
+///
+/// Like standard streams, it is also possible to define your own
+/// overloads of operators >> and << in order to handle your
+/// custom types.
+///
+/// \code
+/// struct MyStruct
+/// {
+///     float       number;
+///     sf::Int8    integer;
+///     std::string str;
+/// };
+///
+/// sf::Packet& operator <<(sf::Packet& packet, const MyStruct& m)
+/// {
+///     return packet << m.number << m.integer << m.str;
+/// }
+///
+/// sf::Packet& operator >>(sf::Packet& packet, MyStruct& m)
+/// {
+///     return packet >> m.number >> m.integer >> m.str;
+/// }
+/// \endcode
+///
+/// Packets also provide an extra feature that allows to apply
+/// custom transformations to the data before it is sent,
+/// and after it is received. This is typically used to
+/// handle automatic compression or encryption of the data.
+/// This is achieved by inheriting from sf::Packet, and overriding
+/// the onSend and onReceive functions.
+///
+/// Here is an example:
+/// \code
+/// class ZipPacket : public sf::Packet
+/// {
+///     virtual const void* onSend(std::size_t& size)
+///     {
+///         const void* srcData = getData();
+///         std::size_t srcSize = getDataSize();
+///
+///         return MySuperZipFunction(srcData, srcSize, &size);
+///     }
+///
+///     virtual void onReceive(const void* data, std::size_t size)
+///     {
+///         std::size_t dstSize;
+///         const void* dstData = MySuperUnzipFunction(data, size, &dstSize);
+///
+///         append(dstData, dstSize);
+///     }
+/// };
+///
+/// // Use like regular packets:
+/// ZipPacket packet;
+/// packet << x << s << d;
+/// ...
+/// \endcode
+///
+/// \see sf::TcpSocket, sf::UdpSocket
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/Selector.hpp b/Externals/SFML/include/SFML/Network/Selector.hpp
deleted file mode 100644
index 83c766eb7c..0000000000
--- a/Externals/SFML/include/SFML/Network/Selector.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SELECTOR_HPP
-#define SFML_SELECTOR_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketUDP.hpp>
-#include <SFML/Network/SocketTCP.hpp>
-#include <SFML/Network/SelectorBase.hpp>
-#include <map>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Selector allow reading from multiple sockets
-/// without blocking. It's a kind of multiplexer
-////////////////////////////////////////////////////////////
-template <typename Type>
-class Selector : private SelectorBase
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    /// Add a socket to watch
-    ///
-    /// \param Socket : Socket to add
-    ///
-    ////////////////////////////////////////////////////////////
-    void Add(Type Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove a socket
-    ///
-    /// \param Socket : Socket to remove
-    ///
-    ////////////////////////////////////////////////////////////
-    void Remove(Type Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove all sockets
-    ///
-    ////////////////////////////////////////////////////////////
-    void Clear();
-
-    ////////////////////////////////////////////////////////////
-    /// Wait and collect sockets which are ready for reading.
-    /// This functions will return either when at least one socket
-    /// is ready, or when the given time is out
-    ///
-    /// \param Timeout : Timeout, in seconds (0 by default : no timeout)
-    ///
-    /// \return Number of sockets ready to be read
-    ///
-    ////////////////////////////////////////////////////////////
-    unsigned int Wait(float Timeout = 0.f);
-
-    ////////////////////////////////////////////////////////////
-    /// After a call to Wait(), get the Index-th socket which is
-    /// ready for reading. The total number of sockets ready
-    /// is the integer returned by the previous call to Wait()
-    ///
-    /// \param Index : Index of the socket to get
-    ///
-    /// \return The Index-th socket
-    ///
-    ////////////////////////////////////////////////////////////
-    Type GetSocketReady(unsigned int Index);
-
-private :
-
-    ////////////////////////////////////////////////////////////
-    // Types
-    ////////////////////////////////////////////////////////////
-    typedef std::map<SocketHelper::SocketType, Type> SocketTable;
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    SocketTable mySockets; ///< Table matching the SFML socket instances with their low-level handles
-};
-
-#include <SFML/Network/Selector.inl>
-
-// Let's define the two only valid types of Selector
-typedef Selector<SocketUDP> SelectorUDP;
-typedef Selector<SocketTCP> SelectorTCP;
-
-} // namespace sf
-
-
-#endif // SFML_SELECTOR_HPP
diff --git a/Externals/SFML/include/SFML/Network/Selector.inl b/Externals/SFML/include/SFML/Network/Selector.inl
deleted file mode 100644
index e234a05bbb..0000000000
--- a/Externals/SFML/include/SFML/Network/Selector.inl
+++ /dev/null
@@ -1,97 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-/// Add a socket to watch
-////////////////////////////////////////////////////////////
-template <typename Type>
-void Selector<Type>::Add(Type Socket)
-{
-    if (Socket.IsValid())
-    {
-        SelectorBase::Add(Socket.mySocket);
-        mySockets[Socket.mySocket] = Socket;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove a socket
-////////////////////////////////////////////////////////////
-template <typename Type>
-void Selector<Type>::Remove(Type Socket)
-{
-    typename SocketTable::iterator It = mySockets.find(Socket.mySocket);
-    if (It != mySockets.end())
-    {
-        SelectorBase::Remove(Socket.mySocket);
-        mySockets.erase(It);
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove all sockets
-////////////////////////////////////////////////////////////
-template <typename Type>
-void Selector<Type>::Clear()
-{
-    SelectorBase::Clear();
-    mySockets.clear();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Wait and collect sockets which are ready for reading.
-/// This functions will return either when at least one socket
-/// is ready, or when the given time is out
-////////////////////////////////////////////////////////////
-template <typename Type>
-unsigned int Selector<Type>::Wait(float Timeout)
-{
-    // No socket in the selector : return 0
-    if (mySockets.empty())
-        return 0;
-
-    return SelectorBase::Wait(Timeout);
-}
-
-
-////////////////////////////////////////////////////////////
-/// After a call to Wait(), get the Index-th socket which is
-/// ready for reading. The total number of sockets ready
-/// is the integer returned by the previous call to Wait()
-////////////////////////////////////////////////////////////
-template <typename Type>
-Type Selector<Type>::GetSocketReady(unsigned int Index)
-{
-    SocketHelper::SocketType Socket = SelectorBase::GetSocketReady(Index);
-
-    typename SocketTable::const_iterator It = mySockets.find(Socket);
-    if (It != mySockets.end())
-        return It->second;
-    else
-        return Type(Socket);
-}
diff --git a/Externals/SFML/include/SFML/Network/SelectorBase.hpp b/Externals/SFML/include/SFML/Network/SelectorBase.hpp
deleted file mode 100644
index c85a4feec7..0000000000
--- a/Externals/SFML/include/SFML/Network/SelectorBase.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SELECTORBASE_HPP
-#define SFML_SELECTORBASE_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
-#include <SFML/Network/SocketHelper.hpp>
-#include <map>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Private base class for selectors.
-/// As Selector is a template class, this base is needed so that
-/// every system call get compiled in SFML (not inlined)
-////////////////////////////////////////////////////////////
-class SFML_API SelectorBase
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    /// Default constructor
-    ///
-    ////////////////////////////////////////////////////////////
-    SelectorBase();
-
-    ////////////////////////////////////////////////////////////
-    /// Add a socket to watch
-    ///
-    /// \param Socket : Socket to add
-    ///
-    ////////////////////////////////////////////////////////////
-    void Add(SocketHelper::SocketType Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove a socket
-    ///
-    /// \param Socket : Socket to remove
-    ///
-    ////////////////////////////////////////////////////////////
-    void Remove(SocketHelper::SocketType Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Remove all sockets
-    ///
-    ////////////////////////////////////////////////////////////
-    void Clear();
-
-    ////////////////////////////////////////////////////////////
-    /// Wait and collect sockets which are ready for reading.
-    /// This functions will return either when at least one socket
-    /// is ready, or when the given time is out
-    ///
-    /// \param Timeout : Timeout, in seconds (0 by default : no timeout)
-    ///
-    /// \return Number of sockets ready to be read
-    ///
-    ////////////////////////////////////////////////////////////
-    unsigned int Wait(float Timeout = 0.f);
-
-    ////////////////////////////////////////////////////////////
-    /// After a call to Wait(), get the Index-th socket which is
-    /// ready for reading. The total number of sockets ready
-    /// is the integer returned by the previous call to Wait()
-    ///
-    /// \param Index : Index of the socket to get
-    ///
-    /// \return The Index-th socket
-    ///
-    ////////////////////////////////////////////////////////////
-    SocketHelper::SocketType GetSocketReady(unsigned int Index);
-
-private :
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    fd_set mySet;       ///< Set of socket to watch
-    fd_set mySetReady;  ///< Set of socket which are ready for reading
-    int    myMaxSocket; ///< Maximum socket index
-};
-
-} // namespace sf
-
-
-#endif // SFML_SELECTORBASE_HPP
diff --git a/Externals/SFML/include/SFML/Network/Socket.hpp b/Externals/SFML/include/SFML/Network/Socket.hpp
new file mode 100644
index 0000000000..c58e8ad184
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/Socket.hpp
@@ -0,0 +1,218 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SOCKET_HPP
+#define SFML_SOCKET_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Export.hpp>
+#include <SFML/Network/SocketHandle.hpp>
+#include <SFML/System/NonCopyable.hpp>
+#include <vector>
+
+
+namespace sf
+{
+class SocketSelector;
+
+////////////////////////////////////////////////////////////
+/// \brief Base class for all the socket types
+///
+////////////////////////////////////////////////////////////
+class SFML_NETWORK_API Socket : NonCopyable
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Status codes that may be returned by socket functions
+    ///
+    ////////////////////////////////////////////////////////////
+    enum Status
+    {
+        Done,         ///< The socket has sent / received the data
+        NotReady,     ///< The socket is not ready to send / receive data yet
+        Disconnected, ///< The TCP socket has been disconnected
+        Error         ///< An unexpected error happened
+    };
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Some special values used by sockets
+    ///
+    ////////////////////////////////////////////////////////////
+    enum
+    {
+        AnyPort = 0 ///< Special value that tells the system to pick any available port
+    };
+
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Destructor
+    ///
+    ////////////////////////////////////////////////////////////
+    virtual ~Socket();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Set the blocking state of the socket
+    ///
+    /// In blocking mode, calls will not return until they have
+    /// completed their task. For example, a call to Receive in
+    /// blocking mode won't return until some data was actually
+    /// received.
+    /// In non-blocking mode, calls will always return immediately,
+    /// using the return code to signal whether there was data
+    /// available or not.
+    /// By default, all sockets are blocking.
+    ///
+    /// \param blocking True to set the socket as blocking, false for non-blocking
+    ///
+    /// \see isBlocking
+    ///
+    ////////////////////////////////////////////////////////////
+    void setBlocking(bool blocking);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Tell whether the socket is in blocking or non-blocking mode
+    ///
+    /// \return True if the socket is blocking, false otherwise
+    ///
+    /// \see setBlocking
+    ///
+    ////////////////////////////////////////////////////////////
+    bool isBlocking() const;
+
+protected :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Types of protocols that the socket can use
+    ///
+    ////////////////////////////////////////////////////////////
+    enum Type
+    {
+        Tcp, ///< TCP protocol
+        Udp  ///< UDP protocol
+    };
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    /// This constructor can only be accessed by derived classes.
+    ///
+    /// \param type Type of the socket (TCP or UDP)
+    ///
+    ////////////////////////////////////////////////////////////
+    Socket(Type type);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the internal handle of the socket
+    ///
+    /// The returned handle may be invalid if the socket
+    /// was not created yet (or already destroyed).
+    /// This function can only be accessed by derived classes.
+    ///
+    /// \return The internal (OS-specific) handle of the socket
+    ///
+    ////////////////////////////////////////////////////////////
+    SocketHandle getHandle() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Create the internal representation of the socket
+    ///
+    /// This function can only be accessed by derived classes.
+    ///
+    ////////////////////////////////////////////////////////////
+    void create();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Create the internal representation of the socket
+    ///        from a socket handle
+    ///
+    /// This function can only be accessed by derived classes.
+    ///
+    /// \param handle OS-specific handle of the socket to wrap
+    ///
+    ////////////////////////////////////////////////////////////
+    void create(SocketHandle handle);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Close the socket gracefully
+    ///
+    /// This function can only be accessed by derived classes.
+    ///
+    ////////////////////////////////////////////////////////////
+    void close();
+
+private :
+
+    friend class SocketSelector;
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    Type         m_type;       ///< Type of the socket (TCP or UDP)
+    SocketHandle m_socket;     ///< Socket descriptor
+    bool         m_isBlocking; ///< Current blocking mode of the socket
+};
+
+} // namespace sf
+
+
+#endif // SFML_SOCKET_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::Socket
+/// \ingroup network
+///
+/// This class mainly defines internal stuff to be used by
+/// derived classes.
+///
+/// The only public features that it defines, and which
+/// is therefore common to all the socket classes, is the
+/// blocking state. All sockets can be set as blocking or
+/// non-blocking.
+///
+/// In blocking mode, socket functions will hang until
+/// the operation completes, which means that the entire
+/// program (well, in fact the current thread if you use
+/// multiple ones) will be stuck waiting for your socket
+/// operation to complete.
+///
+/// In non-blocking mode, all the socket functions will
+/// return immediately. If the socket is not ready to complete
+/// the requested operation, the function simply returns
+/// the proper status code (Socket::NotReady).
+///
+/// The default mode, which is blocking, is the one that is
+/// generally used, in combination with threads or selectors.
+/// The non-blocking mode is rather used in real-time
+/// applications that run an endless loop that can poll
+/// the socket often enough, and cannot afford blocking
+/// this loop.
+///
+/// \see sf::TcpListener, sf::TcpSocket, sf::UdpSocket
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/SocketHandle.hpp b/Externals/SFML/include/SFML/Network/SocketHandle.hpp
new file mode 100644
index 0000000000..c05a6354cd
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/SocketHandle.hpp
@@ -0,0 +1,57 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SOCKETHANDLE_HPP
+#define SFML_SOCKETHANDLE_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+#if defined(SFML_SYSTEM_WINDOWS)
+    #include <basetsd.h>
+#endif
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+// Define the low-level socket handle type, specific to
+// each platform
+////////////////////////////////////////////////////////////
+#if defined(SFML_SYSTEM_WINDOWS)
+
+    typedef UINT_PTR SocketHandle;
+
+#else
+
+    typedef int SocketHandle;
+
+#endif
+
+} // namespace sf
+
+
+#endif // SFML_SOCKETHANDLE_HPP
diff --git a/Externals/SFML/include/SFML/Network/SocketHelper.hpp b/Externals/SFML/include/SFML/Network/SocketHelper.hpp
deleted file mode 100644
index a9fb8ed65a..0000000000
--- a/Externals/SFML/include/SFML/Network/SocketHelper.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETHELPER_HPP
-#define SFML_SOCKETHELPER_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
-
-
-namespace sf
-{
-namespace Socket
-{
-    ////////////////////////////////////////////////////////////
-    /// Enumeration of status returned by socket functions
-    ////////////////////////////////////////////////////////////
-    enum Status
-    {
-        Done,         ///< The socket has sent / received the data
-        NotReady,     ///< The socket is not ready to send / receive data yet
-        Disconnected, ///< The TCP socket has been disconnected
-        Error         ///< An unexpected error happened
-    };
-}
-
-} // namespace sf
-
-
-#ifdef SFML_SYSTEM_WINDOWS
-
-    #include <SFML/Network/Win32/SocketHelper.hpp>
-
-#else
-
-    #include <SFML/Network/Unix/SocketHelper.hpp>
-
-#endif
-
-
-#endif // SFML_SOCKETHELPER_HPP
diff --git a/Externals/SFML/include/SFML/Network/SocketSelector.hpp b/Externals/SFML/include/SFML/Network/SocketSelector.hpp
new file mode 100644
index 0000000000..668b59fb79
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/SocketSelector.hpp
@@ -0,0 +1,263 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SOCKETSELECTOR_HPP
+#define SFML_SOCKETSELECTOR_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Export.hpp>
+#include <SFML/System/Time.hpp>
+
+
+namespace sf
+{
+class Socket;
+
+////////////////////////////////////////////////////////////
+/// \brief Multiplexer that allows to read from multiple sockets
+///
+////////////////////////////////////////////////////////////
+class SFML_NETWORK_API SocketSelector
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    ////////////////////////////////////////////////////////////
+    SocketSelector();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Copy constructor
+    ///
+    /// \param copy Instance to copy
+    ///
+    ////////////////////////////////////////////////////////////
+    SocketSelector(const SocketSelector& copy);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Destructor
+    ///
+    ////////////////////////////////////////////////////////////
+    ~SocketSelector();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Add a new socket to the selector
+    ///
+    /// This function keeps a weak reference to the socket,
+    /// so you have to make sure that the socket is not destroyed
+    /// while it is stored in the selector.
+    /// This function does nothing if the socket is not valid.
+    ///
+    /// \param socket Reference to the socket to add
+    ///
+    /// \see remove, clear
+    ///
+    ////////////////////////////////////////////////////////////
+    void add(Socket& socket);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Remove a socket from the selector
+    ///
+    /// This function doesn't destroy the socket, it simply
+    /// removes the reference that the selector has to it.
+    ///
+    /// \param socket Reference to the socket to remove
+    ///
+    /// \see add, clear
+    ///
+    ////////////////////////////////////////////////////////////
+    void remove(Socket& socket);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Remove all the sockets stored in the selector
+    ///
+    /// This function doesn't destroy any instance, it simply
+    /// removes all the references that the selector has to
+    /// external sockets.
+    ///
+    /// \see add, remove
+    ///
+    ////////////////////////////////////////////////////////////
+    void clear();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Wait until one or more sockets are ready to receive
+    ///
+    /// This function returns as soon as at least one socket has
+    /// some data available to be received. To know which sockets are
+    /// ready, use the isReady function.
+    /// If you use a timeout and no socket is ready before the timeout
+    /// is over, the function returns false.
+    ///
+    /// \param timeout Maximum time to wait, (use Time::Zero for infinity)
+    ///
+    /// \return True if there are sockets ready, false otherwise
+    ///
+    /// \see isReady
+    ///
+    ////////////////////////////////////////////////////////////
+    bool wait(Time timeout = Time::Zero);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Test a socket to know if it is ready to receive data
+    ///
+    /// This function must be used after a call to Wait, to know
+    /// which sockets are ready to receive data. If a socket is
+    /// ready, a call to receive will never block because we know
+    /// that there is data available to read.
+    /// Note that if this function returns true for a TcpListener,
+    /// this means that it is ready to accept a new connection.
+    ///
+    /// \param socket Socket to test
+    ///
+    /// \return True if the socket is ready to read, false otherwise
+    ///
+    /// \see isReady
+    ///
+    ////////////////////////////////////////////////////////////
+    bool isReady(Socket& socket) const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Overload of assignment operator
+    ///
+    /// \param right Instance to assign
+    ///
+    /// \return Reference to self
+    ///
+    ////////////////////////////////////////////////////////////
+    SocketSelector& operator =(const SocketSelector& right);
+
+private :
+
+    struct SocketSelectorImpl;
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    SocketSelectorImpl* m_impl; ///< Opaque pointer to the implementation (which requires OS-specific types)
+};
+
+} // namespace sf
+
+
+#endif // SFML_SOCKETSELECTOR_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::SocketSelector
+/// \ingroup network
+///
+/// Socket selectors provide a way to wait until some data is
+/// available on a set of sockets, instead of just one. This
+/// is convenient when you have multiple sockets that may
+/// possibly receive data, but you don't know which one will
+/// be ready first. In particular, it avoids to use a thread
+/// for each socket; with selectors, a single thread can handle
+/// all the sockets.
+///
+/// All types of sockets can be used in a selector:
+/// \li sf::TcpListener
+/// \li sf::TcpSocket
+/// \li sf::UdpSocket
+///
+/// A selector doesn't store its own copies of the sockets
+/// (socket classes are not copyable anyway), it simply keeps
+/// a reference to the original sockets that you pass to the
+/// "add" function. Therefore, you can't use the selector as a
+/// socket container, you must store them oustide and make sure
+/// that they are alive as long as they are used in the selector.
+///
+/// Using a selector is simple:
+/// \li populate the selector with all the sockets that you want to observe
+/// \li make it wait until there is data available on any of the sockets
+/// \li test each socket to find out which ones are ready
+///
+/// Usage example:
+/// \code
+/// // Create a socket to listen to new connections
+/// sf::TcpListener listener;
+/// listener.listen(55001);
+///
+/// // Create a list to store the future clients
+/// std::list<sf::TcpSocket*> clients;
+///
+/// // Create a selector
+/// sf::SocketSelector selector;
+///
+/// // Add the listener to the selector
+/// selector.add(listener);
+///
+/// // Endless loop that waits for new connections
+/// while (running)
+/// {
+///     // Make the selector wait for data on any socket
+///     if (selector.wait())
+///     {
+///         // Test the listener
+///         if (selector.isReady(listener))
+///         {
+///             // The listener is ready: there is a pending connection
+///             sf::TcpSocket* client = new sf::TcpSocket;
+///             if (listener.accept(*client) == sf::Socket::Done)
+///             {
+///                 // Add the new client to the clients list
+///                 clients.push_back(client);
+///
+///                 // Add the new client to the selector so that we will
+///                 // be notified when he sends something
+///                 selector.add(*client);
+///             }
+///             else
+///             {
+///                 // Error, we won't get a new connection, delete the socket
+///                 delete client;
+///             }
+///         }
+///         else
+///         {
+///             // The listener socket is not ready, test all other sockets (the clients)
+///             for (std::list<sf::TcpSocket*>::iterator it = clients.begin(); it != clients.end(); ++it)
+///             {
+///                 sf::TcpSocket& client = **it;
+///                 if (selector.isReady(client))
+///                 {
+///                     // The client has sent some data, we can receive it
+///                     sf::Packet packet;
+///                     if (client.receive(packet) == sf::Socket::Done)
+///                     {
+///                         ...
+///                     }
+///                 }
+///             }
+///         }
+///     }
+/// }
+/// \endcode
+///
+/// \see sf::Socket
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/SocketTCP.hpp b/Externals/SFML/include/SFML/Network/SocketTCP.hpp
deleted file mode 100644
index 810a36b346..0000000000
--- a/Externals/SFML/include/SFML/Network/SocketTCP.hpp
+++ /dev/null
@@ -1,227 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETTCP_HPP
-#define SFML_SOCKETTCP_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketHelper.hpp>
-#include <vector>
-
-
-namespace sf
-{
-class Packet;
-class IPAddress;
-template <typename> class Selector;
-
-////////////////////////////////////////////////////////////
-/// SocketTCP wraps a socket using TCP protocol to
-/// send data safely (but a bit slower)
-////////////////////////////////////////////////////////////
-class SFML_API SocketTCP
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    /// Default constructor
-    ///
-    ////////////////////////////////////////////////////////////
-    SocketTCP();
-
-    ////////////////////////////////////////////////////////////
-    /// Change the blocking state of the socket.
-    /// The default behaviour of a socket is blocking
-    ///
-    /// \param Blocking : Pass true to set the socket as blocking, or false for non-blocking
-    ///
-    ////////////////////////////////////////////////////////////
-    void SetBlocking(bool Blocking);
-
-    ////////////////////////////////////////////////////////////
-    /// Connect to another computer on a specified port
-    ///
-    /// \param Port :        Port to use for transfers (warning : ports < 1024 are reserved)
-    /// \param HostAddress : IP Address of the host to connect to
-    /// \param Timeout :     Maximum time to wait, in seconds (0 by default : no timeout) (this parameter is ignored for non-blocking sockets)
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Connect(unsigned short Port, const IPAddress& HostAddress, float Timeout = 0.f);
-
-    ////////////////////////////////////////////////////////////
-    /// Listen to a specified port for incoming data or connections
-    ///
-    /// \param Port : Port to listen to
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    bool Listen(unsigned short Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Wait for a connection (must be listening to a port).
-    /// This function will block if the socket is blocking
-    ///
-    /// \param Connected : Socket containing the connection with the connected client
-    /// \param Address :   Pointer to an address to fill with client infos (NULL by default)
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Accept(SocketTCP& Connected, IPAddress* Address = NULL);
-
-    ////////////////////////////////////////////////////////////
-    /// Send an array of bytes to the host (must be connected first)
-    ///
-    /// \param Data : Pointer to the bytes to send
-    /// \param Size : Number of bytes to send
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Send(const char* Data, std::size_t Size);
-
-    ////////////////////////////////////////////////////////////
-    /// Receive an array of bytes from the host (must be connected first).
-    /// This function will block if the socket is blocking
-    ///
-    /// \param Data :         Pointer to a byte array to fill (make sure it is big enough)
-    /// \param MaxSize :      Maximum number of bytes to read
-    /// \param SizeReceived : Number of bytes received
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived);
-
-    ////////////////////////////////////////////////////////////
-    /// Send a packet of data to the host (must be connected first)
-    ///
-    /// \param PacketToSend : Packet to send
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Send(Packet& PacketToSend);
-
-    ////////////////////////////////////////////////////////////
-    /// Receive a packet from the host (must be connected first).
-    /// This function will block if the socket is blocking
-    ///
-    /// \param PacketToReceive : Packet to fill with received data
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Receive(Packet& PacketToReceive);
-
-    ////////////////////////////////////////////////////////////
-    /// Close the socket
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    bool Close();
-
-    ////////////////////////////////////////////////////////////
-    /// Check if the socket is in a valid state ; this function
-    /// can be called any time to check if the socket is OK
-    ///
-    /// \return True if the socket is valid
-    ///
-    ////////////////////////////////////////////////////////////
-    bool IsValid() const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator ==
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this == Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator ==(const SocketTCP& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator !=
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this != Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator !=(const SocketTCP& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator <.
-    /// Provided for compatibility with standard containers, as
-    /// comparing two sockets doesn't make much sense...
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this < Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator <(const SocketTCP& Other) const;
-
-private :
-
-    friend class Selector<SocketTCP>;
-
-    ////////////////////////////////////////////////////////////
-    /// Construct the socket from a socket descriptor
-    /// (for internal use only)
-    ///
-    /// \param Descriptor : Socket descriptor
-    ///
-    ////////////////////////////////////////////////////////////
-    SocketTCP(SocketHelper::SocketType Descriptor);
-
-    ////////////////////////////////////////////////////////////
-    /// Create the socket
-    ///
-    /// \param Descriptor : System socket descriptor to use (0 by default -- create a new socket)
-    ///
-    ////////////////////////////////////////////////////////////
-    void Create(SocketHelper::SocketType Descriptor = 0);
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    SocketHelper::SocketType mySocket;            ///< Socket descriptor
-    Uint32                   myPendingHeader;     ///< Data of the current pending packet header, if any
-    Uint32                   myPendingHeaderSize; ///< Size of the current pending packet header, if any
-    std::vector<char>        myPendingPacket;     ///< Data of the current pending packet, if any
-    Int32                    myPendingPacketSize; ///< Size of the current pending packet, if any
-    bool                     myIsBlocking;        ///< Is the socket blocking or non-blocking ?
-};
-
-} // namespace sf
-
-
-#endif // SFML_SOCKETTCP_HPP
diff --git a/Externals/SFML/include/SFML/Network/SocketUDP.hpp b/Externals/SFML/include/SFML/Network/SocketUDP.hpp
deleted file mode 100644
index 4653f56b91..0000000000
--- a/Externals/SFML/include/SFML/Network/SocketUDP.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETUDP_HPP
-#define SFML_SOCKETUDP_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketHelper.hpp>
-#include <vector>
-
-
-namespace sf
-{
-class Packet;
-class IPAddress;
-template <typename> class Selector;
-
-////////////////////////////////////////////////////////////
-/// SocketUDP wraps a socket using UDP protocol to
-/// send data fastly (but with less safety)
-////////////////////////////////////////////////////////////
-class SFML_API SocketUDP
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    /// Default constructor
-    ///
-    ////////////////////////////////////////////////////////////
-    SocketUDP();
-
-    ////////////////////////////////////////////////////////////
-    /// Change the blocking state of the socket.
-    /// The default behaviour of a socket is blocking
-    ///
-    /// \param Blocking : Pass true to set the socket as blocking, or false for non-blocking
-    ///
-    ////////////////////////////////////////////////////////////
-    void SetBlocking(bool Blocking);
-
-    ////////////////////////////////////////////////////////////
-    /// Bind the socket to a specific port
-    ///
-    /// \param Port : Port to bind the socket to
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    bool Bind(unsigned short Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Unbind the socket from its previous port, if any
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    bool Unbind();
-
-    ////////////////////////////////////////////////////////////
-    /// Send an array of bytes
-    ///
-    /// \param Data :    Pointer to the bytes to send
-    /// \param Size :    Number of bytes to send
-    /// \param Address : Address of the computer to send the packet to
-    /// \param Port :    Port to send the data to
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Send(const char* Data, std::size_t Size, const IPAddress& Address, unsigned short Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Receive an array of bytes.
-    /// This function will block if the socket is blocking
-    ///
-    /// \param Data :         Pointer to a byte array to fill (make sure it is big enough)
-    /// \param MaxSize :      Maximum number of bytes to read
-    /// \param SizeReceived : Number of bytes received
-    /// \param Address :      Address of the computer which sent the data
-    /// \param Port :         Port on which the remote computer sent the data
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived, IPAddress& Address, unsigned short& Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Send a packet of data
-    ///
-    /// \param PacketToSend : Packet to send
-    /// \param Address :      Address of the computer to send the packet to
-    /// \param Port :         Port to send the data to
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Send(Packet& PacketToSend, const IPAddress& Address, unsigned short Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Receive a packet.
-    /// This function will block if the socket is blocking
-    ///
-    /// \param PacketToReceive : Packet to fill with received data
-    /// \param Address :         Address of the computer which sent the packet
-    /// \param Port :            Port on which the remote computer sent the data
-    ///
-    /// \return Status code
-    ///
-    ////////////////////////////////////////////////////////////
-    Socket::Status Receive(Packet& PacketToReceive, IPAddress& Address, unsigned short& Port);
-
-    ////////////////////////////////////////////////////////////
-    /// Close the socket
-    ///
-    /// \return True if operation has been successful
-    ///
-    ////////////////////////////////////////////////////////////
-    bool Close();
-
-    ////////////////////////////////////////////////////////////
-    /// Check if the socket is in a valid state ; this function
-    /// can be called any time to check if the socket is OK
-    ///
-    /// \return True if the socket is valid
-    ///
-    ////////////////////////////////////////////////////////////
-    bool IsValid() const;
-
-    ////////////////////////////////////////////////////////////
-    /// Get the port the socket is currently bound to
-    ///
-    /// \return Current port (0 means the socket is not bound)
-    ///
-    ////////////////////////////////////////////////////////////
-    unsigned short GetPort() const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator ==
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this == Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator ==(const SocketUDP& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator !=
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this != Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator !=(const SocketUDP& Other) const;
-
-    ////////////////////////////////////////////////////////////
-    /// Comparison operator <.
-    /// Provided for compatibility with standard containers, as
-    /// comparing two sockets doesn't make much sense...
-    ///
-    /// \param Other : Socket to compare
-    ///
-    /// \return True if *this < Other
-    ///
-    ////////////////////////////////////////////////////////////
-    bool operator <(const SocketUDP& Other) const;
-
-private :
-
-    friend class Selector<SocketUDP>;
-
-    ////////////////////////////////////////////////////////////
-    /// Construct the socket from a socket descriptor
-    /// (for internal use only)
-    ///
-    /// \param Descriptor : Socket descriptor
-    ///
-    ////////////////////////////////////////////////////////////
-    SocketUDP(SocketHelper::SocketType Descriptor);
-
-    ////////////////////////////////////////////////////////////
-    /// Create the socket
-    ///
-    /// \param Descriptor : System socket descriptor to use (0 by default -- create a new socket)
-    ///
-    ////////////////////////////////////////////////////////////
-    void Create(SocketHelper::SocketType Descriptor = 0);
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    SocketHelper::SocketType mySocket;            ///< Socket identifier
-    unsigned short           myPort;              ///< Port to which the socket is bound
-    Uint32                   myPendingHeader;     ///< Data of the current pending packet header, if any
-    Uint32                   myPendingHeaderSize; ///< Size of the current pending packet header, if any
-    std::vector<char>        myPendingPacket;     ///< Data of the current pending packet, if any
-    Int32                    myPendingPacketSize; ///< Size of the current pending packet, if any
-    bool                     myIsBlocking;        ///< Is the socket blocking or non-blocking ?
-};
-
-} // namespace sf
-
-
-#endif // SFML_SOCKETUDP_HPP
diff --git a/Externals/SFML/include/SFML/Network/Sockets.hpp b/Externals/SFML/include/SFML/Network/Sockets.hpp
deleted file mode 100644
index 8c78d76ad6..0000000000
--- a/Externals/SFML/include/SFML/Network/Sockets.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETS_HPP
-#define SFML_SOCKETS_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
-
-
-#ifdef SFML_SYSTEM_WINDOWS
-
-    #include <SFML/Network/Win32/Sockets.hpp>
-
-#else
-
-    #include <SFML/Network/Unix/Sockets.hpp>
-
-#endif
-
-
-#endif // SFML_SOCKETS_HPP
diff --git a/Externals/SFML/include/SFML/Network/TcpListener.hpp b/Externals/SFML/include/SFML/Network/TcpListener.hpp
new file mode 100644
index 0000000000..c72facddaf
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/TcpListener.hpp
@@ -0,0 +1,162 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_TCPLISTENER_HPP
+#define SFML_TCPLISTENER_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Export.hpp>
+#include <SFML/Network/Socket.hpp>
+
+
+namespace sf
+{
+class TcpSocket;
+
+////////////////////////////////////////////////////////////
+/// \brief Socket that listens to new TCP connections
+///
+////////////////////////////////////////////////////////////
+class SFML_NETWORK_API TcpListener : public Socket
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    ////////////////////////////////////////////////////////////
+    TcpListener();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the port to which the socket is bound locally
+    ///
+    /// If the socket is not listening to a port, this function
+    /// returns 0.
+    ///
+    /// \return Port to which the socket is bound
+    ///
+    /// \see listen
+    ///
+    ////////////////////////////////////////////////////////////
+    unsigned short getLocalPort() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Start listening for connections
+    ///
+    /// This functions makes the socket listen to the specified
+    /// port, waiting for new connections.
+    /// If the socket was previously listening to another port,
+    /// it will be stopped first and bound to the new port.
+    ///
+    /// \param port Port to listen for new connections
+    ///
+    /// \return Status code
+    ///
+    /// \see accept, close
+    ///
+    ////////////////////////////////////////////////////////////
+    Status listen(unsigned short port);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Stop listening and close the socket
+    ///
+    /// This function gracefully stops the listener. If the
+    /// socket is not listening, this function has no effect.
+    ///
+    /// \see listen
+    ///
+    ////////////////////////////////////////////////////////////
+    void close();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Accept a new connection
+    ///
+    /// If the socket is in blocking mode, this function will
+    /// not return until a connection is actually received.
+    ///
+    /// \param socket Socket that will hold the new connection
+    ///
+    /// \return Status code
+    ///
+    /// \see listen
+    ///
+    ////////////////////////////////////////////////////////////
+    Status accept(TcpSocket& socket);
+};
+
+
+} // namespace sf
+
+
+#endif // SFML_TCPLISTENER_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::TcpListener
+/// \ingroup network
+///
+/// A listener socket is a special type of socket that listens to
+/// a given port and waits for connections on that port.
+/// This is all it can do.
+///
+/// When a new connection is received, you must call accept and
+/// the listener returns a new instance of sf::TcpSocket that
+/// is properly initialized and can be used to communicate with
+/// the new client.
+///
+/// Listener sockets are specific to the TCP protocol,
+/// UDP sockets are connectionless and can therefore communicate
+/// directly. As a consequence, a listener socket will always
+/// return the new connections as sf::TcpSocket instances.
+///
+/// A listener is automatically closed on destruction, like all
+/// other types of socket. However if you want to stop listening
+/// before the socket is destroyed, you can call its close()
+/// function.
+///
+/// Usage example:
+/// \code
+/// // Create a listener socket and make it wait for new
+/// // connections on port 55001
+/// sf::TcpListener listener;
+/// listener.listen(55001);
+///
+/// // Endless loop that waits for new connections
+/// while (running)
+/// {
+///     sf::TcpSocket client;
+///     if (listener.accept(client) == sf::Socket::Done)
+///     {
+///         // A new client just connected!
+///         std::cout << "New connection received from " << client.getRemoteAddress() << std::endl;
+///         doSomethingWith(client);
+///     }
+/// }
+/// \endcode
+///
+/// \see sf::TcpSocket, sf::Socket
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/TcpSocket.hpp b/Externals/SFML/include/SFML/Network/TcpSocket.hpp
new file mode 100644
index 0000000000..ff4ee95f25
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/TcpSocket.hpp
@@ -0,0 +1,292 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_TCPSOCKET_HPP
+#define SFML_TCPSOCKET_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Export.hpp>
+#include <SFML/Network/Socket.hpp>
+#include <SFML/System/Time.hpp>
+
+
+namespace sf
+{
+class TcpListener;
+class IpAddress;
+class Packet;
+
+////////////////////////////////////////////////////////////
+/// \brief Specialized socket using the TCP protocol
+///
+////////////////////////////////////////////////////////////
+class SFML_NETWORK_API TcpSocket : public Socket
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    ////////////////////////////////////////////////////////////
+    TcpSocket();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the port to which the socket is bound locally
+    ///
+    /// If the socket is not connected, this function returns 0.
+    ///
+    /// \return Port to which the socket is bound
+    ///
+    /// \see connect, getRemotePort
+    ///
+    ////////////////////////////////////////////////////////////
+    unsigned short getLocalPort() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the address of the connected peer
+    ///
+    /// It the socket is not connected, this function returns
+    /// sf::IpAddress::None.
+    ///
+    /// \return Address of the remote peer
+    ///
+    /// \see getRemotePort
+    ///
+    ////////////////////////////////////////////////////////////
+    IpAddress getRemoteAddress() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the port of the connected peer to which
+    ///        the socket is connected
+    ///
+    /// If the socket is not connected, this function returns 0.
+    ///
+    /// \return Remote port to which the socket is connected
+    ///
+    /// \see getRemoteAddress
+    ///
+    ////////////////////////////////////////////////////////////
+    unsigned short getRemotePort() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Connect the socket to a remote peer
+    ///
+    /// In blocking mode, this function may take a while, especially
+    /// if the remote peer is not reachable. The last parameter allows
+    /// you to stop trying to connect after a given timeout.
+    /// If the socket was previously connected, it is first disconnected.
+    ///
+    /// \param remoteAddress Address of the remote peer
+    /// \param remotePort    Port of the remote peer
+    /// \param timeout       Optional maximum time to wait
+    ///
+    /// \return Status code
+    ///
+    /// \see disconnect
+    ///
+    ////////////////////////////////////////////////////////////
+    Status connect(const IpAddress& remoteAddress, unsigned short remotePort, Time timeout = Time::Zero);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Disconnect the socket from its remote peer
+    ///
+    /// This function gracefully closes the connection. If the
+    /// socket is not connected, this function has no effect.
+    ///
+    /// \see connect
+    ///
+    ////////////////////////////////////////////////////////////
+    void disconnect();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Send raw data to the remote peer
+    ///
+    /// This function will fail if the socket is not connected.
+    ///
+    /// \param data Pointer to the sequence of bytes to send
+    /// \param size Number of bytes to send
+    ///
+    /// \return Status code
+    ///
+    /// \see receive
+    ///
+    ////////////////////////////////////////////////////////////
+    Status send(const void* data, std::size_t size);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Receive raw data from the remote peer
+    ///
+    /// In blocking mode, this function will wait until some
+    /// bytes are actually received.
+    /// This function will fail if the socket is not connected.
+    ///
+    /// \param data     Pointer to the array to fill with the received bytes
+    /// \param size     Maximum number of bytes that can be received
+    /// \param received This variable is filled with the actual number of bytes received
+    ///
+    /// \return Status code
+    ///
+    /// \see send
+    ///
+    ////////////////////////////////////////////////////////////
+    Status receive(void* data, std::size_t size, std::size_t& received);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Send a formatted packet of data to the remote peer
+    ///
+    /// This function will fail if the socket is not connected.
+    ///
+    /// \param packet Packet to send
+    ///
+    /// \return Status code
+    ///
+    /// \see receive
+    ///
+    ////////////////////////////////////////////////////////////
+    Status send(Packet& packet);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Receive a formatted packet of data from the remote peer
+    ///
+    /// In blocking mode, this function will wait until the whole packet
+    /// has been received.
+    /// This function will fail if the socket is not connected.
+    ///
+    /// \param packet Packet to fill with the received data
+    ///
+    /// \return Status code
+    ///
+    /// \see send
+    ///
+    ////////////////////////////////////////////////////////////
+    Status receive(Packet& packet);
+
+private:
+
+    friend class TcpListener;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Structure holding the data of a pending packet
+    ///
+    ////////////////////////////////////////////////////////////
+    struct PendingPacket
+    {
+        PendingPacket();
+
+        Uint32            Size;         ///< Data of packet size
+        std::size_t       SizeReceived; ///< Number of size bytes received so far
+        std::vector<char> Data;         ///< Data of the packet
+    };
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    PendingPacket m_pendingPacket; ///< Temporary data of the packet currently being received
+};
+
+} // namespace sf
+
+
+#endif // SFML_TCPSOCKET_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::TcpSocket
+/// \ingroup network
+///
+/// TCP is a connected protocol, which means that a TCP
+/// socket can only communicate with the host it is connected
+/// to. It can't send or receive anything if it is not connected.
+///
+/// The TCP protocol is reliable but adds a slight overhead.
+/// It ensures that your data will always be received in order
+/// and without errors (no data corrupted, lost or duplicated).
+///
+/// When a socket is connected to a remote host, you can
+/// retrieve informations about this host with the
+/// getRemoteAddress and getRemotePort functions. You can
+/// also get the local port to which the socket is bound
+/// (which is automatically chosen when the socket is connected),
+/// with the getLocalPort function.
+///
+/// Sending and receiving data can use either the low-level
+/// or the high-level functions. The low-level functions
+/// process a raw sequence of bytes, and cannot ensure that
+/// one call to Send will exactly match one call to Receive
+/// at the other end of the socket.
+///
+/// The high-level interface uses packets (see sf::Packet),
+/// which are easier to use and provide more safety regarding
+/// the data that is exchanged. You can look at the sf::Packet
+/// class to get more details about how they work.
+///
+/// The socket is automatically disconnected when it is destroyed,
+/// but if you want to explicitely close the connection while
+/// the socket instance is still alive, you can call disconnect.
+///
+/// Usage example:
+/// \code
+/// // ----- The client -----
+///
+/// // Create a socket and connect it to 192.168.1.50 on port 55001
+/// sf::TcpSocket socket;
+/// socket.connect("192.168.1.50", 55001);
+///
+/// // Send a message to the connected host
+/// std::string message = "Hi, I am a client";
+/// socket.send(message.c_str(), message.size() + 1);
+///
+/// // Receive an answer from the server
+/// char buffer[1024];
+/// std::size_t received = 0;
+/// socket.receive(buffer, sizeof(buffer), received);
+/// std::cout << "The server said: " << buffer << std::endl;
+///
+/// // ----- The server -----
+///
+/// // Create a listener to wait for incoming connections on port 55001
+/// sf::TcpListener listener;
+/// listener.listen(55001);
+///
+/// // Wait for a connection
+/// sf::TcpSocket socket;
+/// listener.accept(socket);
+/// std::cout << "New client connected: " << socket.getRemoteAddress() << std::endl;
+///
+/// // Receive a message from the client
+/// char buffer[1024];
+/// std::size_t received = 0;
+/// socket.receive(buffer, sizeof(buffer), received);
+/// std::cout << "The client said: " << buffer << std::endl;
+///
+/// // Send an answer
+/// std::string message = "Welcome, client";
+/// socket.send(message.c_str(), message.size() + 1);
+/// \endcode
+///
+/// \see sf::Socket, sf::UdpSocket, sf::Packet
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/UdpSocket.hpp b/Externals/SFML/include/SFML/Network/UdpSocket.hpp
new file mode 100644
index 0000000000..eab815123f
--- /dev/null
+++ b/Externals/SFML/include/SFML/Network/UdpSocket.hpp
@@ -0,0 +1,283 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_UDPSOCKET_HPP
+#define SFML_UDPSOCKET_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Export.hpp>
+#include <SFML/Network/Socket.hpp>
+#include <vector>
+
+
+namespace sf
+{
+class IpAddress;
+class Packet;
+
+////////////////////////////////////////////////////////////
+/// \brief Specialized socket using the UDP protocol
+///
+////////////////////////////////////////////////////////////
+class SFML_NETWORK_API UdpSocket : public Socket
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    // Constants
+    ////////////////////////////////////////////////////////////
+    enum
+    {
+        MaxDatagramSize = 65507 ///< The maximum number of bytes that can be sent in a single UDP datagram
+    };
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    ////////////////////////////////////////////////////////////
+    UdpSocket();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the port to which the socket is bound locally
+    ///
+    /// If the socket is not bound to a port, this function
+    /// returns 0.
+    ///
+    /// \return Port to which the socket is bound
+    ///
+    /// \see bind
+    ///
+    ////////////////////////////////////////////////////////////
+    unsigned short getLocalPort() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Bind the socket to a specific port
+    ///
+    /// Binding the socket to a port is necessary for being
+    /// able to receive data on that port.
+    /// You can use the special value Socket::AnyPort to tell the
+    /// system to automatically pick an available port, and then
+    /// call getLocalPort to retrieve the chosen port.
+    ///
+    /// \param port Port to bind the socket to
+    ///
+    /// \return Status code
+    ///
+    /// \see unbind, getLocalPort
+    ///
+    ////////////////////////////////////////////////////////////
+    Status bind(unsigned short port);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Unbind the socket from the local port to which it is bound
+    ///
+    /// The port that the socket was previously using is immediately
+    /// available after this function is called. If the
+    /// socket is not bound to a port, this function has no effect.
+    ///
+    /// \see bind
+    ///
+    ////////////////////////////////////////////////////////////
+    void unbind();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Send raw data to a remote peer
+    ///
+    /// Make sure that \a size is not greater than
+    /// UdpSocket::MaxDatagramSize, otherwise this function will
+    /// fail and no data will be sent.
+    ///
+    /// \param data          Pointer to the sequence of bytes to send
+    /// \param size          Number of bytes to send
+    /// \param remoteAddress Address of the receiver
+    /// \param remotePort    Port of the receiver to send the data to
+    ///
+    /// \return Status code
+    ///
+    /// \see receive
+    ///
+    ////////////////////////////////////////////////////////////
+    Status send(const void* data, std::size_t size, const IpAddress& remoteAddress, unsigned short remotePort);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Receive raw data from a remote peer
+    ///
+    /// In blocking mode, this function will wait until some
+    /// bytes are actually received.
+    /// Be careful to use a buffer which is large enough for
+    /// the data that you intend to receive, if it is too small
+    /// then an error will be returned and *all* the data will
+    /// be lost.
+    ///
+    /// \param data          Pointer to the array to fill with the received bytes
+    /// \param size          Maximum number of bytes that can be received
+    /// \param received      This variable is filled with the actual number of bytes received
+    /// \param remoteAddress Address of the peer that sent the data
+    /// \param remotePort    Port of the peer that sent the data
+    ///
+    /// \return Status code
+    ///
+    /// \see send
+    ///
+    ////////////////////////////////////////////////////////////
+    Status receive(void* data, std::size_t size, std::size_t& received, IpAddress& remoteAddress, unsigned short& remotePort);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Send a formatted packet of data to a remote peer
+    ///
+    /// Make sure that the packet size is not greater than
+    /// UdpSocket::MaxDatagramSize, otherwise this function will
+    /// fail and no data will be sent.
+    ///
+    /// \param packet        Packet to send
+    /// \param remoteAddress Address of the receiver
+    /// \param remotePort    Port of the receiver to send the data to
+    ///
+    /// \return Status code
+    ///
+    /// \see receive
+    ///
+    ////////////////////////////////////////////////////////////
+    Status send(Packet& packet, const IpAddress& remoteAddress, unsigned short remotePort);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Receive a formatted packet of data from a remote peer
+    ///
+    /// In blocking mode, this function will wait until the whole packet
+    /// has been received.
+    ///
+    /// \param packet        Packet to fill with the received data
+    /// \param remoteAddress Address of the peer that sent the data
+    /// \param remotePort    Port of the peer that sent the data
+    ///
+    /// \return Status code
+    ///
+    /// \see send
+    ///
+    ////////////////////////////////////////////////////////////
+    Status receive(Packet& packet, IpAddress& remoteAddress, unsigned short& remotePort);
+
+private:
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    std::vector<char> m_buffer; ///< Temporary buffer holding the received data in Receive(Packet)
+};
+
+} // namespace sf
+
+
+#endif // SFML_UDPSOCKET_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::UdpSocket
+/// \ingroup network
+///
+/// A UDP socket is a connectionless socket. Instead of
+/// connecting once to a remote host, like TCP sockets,
+/// it can send to and receive from any host at any time.
+///
+/// It is a datagram protocol: bounded blocks of data (datagrams)
+/// are transfered over the network rather than a continuous
+/// stream of data (TCP). Therefore, one call to send will always
+/// match one call to receive (if the datagram is not lost),
+/// with the same data that was sent.
+///
+/// The UDP protocol is lightweight but unreliable. Unreliable
+/// means that datagrams may be duplicated, be lost or
+/// arrive reordered. However, if a datagram arrives, its
+/// data is guaranteed to be valid.
+///
+/// UDP is generally used for real-time communication
+/// (audio or video streaming, real-time games, etc.) where
+/// speed is crucial and lost data doesn't matter much.
+///
+/// Sending and receiving data can use either the low-level
+/// or the high-level functions. The low-level functions
+/// process a raw sequence of bytes, whereas the high-level
+/// interface uses packets (see sf::Packet), which are easier
+/// to use and provide more safety regarding the data that is
+/// exchanged. You can look at the sf::Packet class to get
+/// more details about how they work.
+///
+/// It is important to note that UdpSocket is unable to send
+/// datagrams bigger than MaxDatagramSize. In this case, it
+/// returns an error and doesn't send anything. This applies
+/// to both raw data and packets. Indeed, even packets are
+/// unable to split and recompose data, due to the unreliability
+/// of the protocol (dropped, mixed or duplicated datagrams may
+/// lead to a big mess when trying to recompose a packet).
+///
+/// If the socket is bound to a port, it is automatically
+/// unbound from it when the socket is destroyed. However,
+/// you can unbind the socket explicitely with the Unbind
+/// function if necessary, to stop receiving messages or
+/// make the port available for other sockets.
+///
+/// Usage example:
+/// \code
+/// // ----- The client -----
+///
+/// // Create a socket and bind it to the port 55001
+/// sf::UdpSocket socket;
+/// socket.bind(55001);
+///
+/// // Send a message to 192.168.1.50 on port 55002
+/// std::string message = "Hi, I am " + sf::IpAddress::getLocalAddress().toString();
+/// socket.send(message.c_str(), message.size() + 1, "192.168.1.50", 55002);
+///
+/// // Receive an answer (most likely from 192.168.1.50, but could be anyone else)
+/// char buffer[1024];
+/// std::size_t received = 0;
+/// sf::IpAddress sender;
+/// unsigned short port;
+/// socket.receive(buffer, sizeof(buffer), received, sender, port);
+/// std::cout << sender.ToString() << " said: " << buffer << std::endl;
+///
+/// // ----- The server -----
+///
+/// // Create a socket and bind it to the port 55002
+/// sf::UdpSocket socket;
+/// socket.bind(55002);
+///
+/// // Receive a message from anyone
+/// char buffer[1024];
+/// std::size_t received = 0;
+/// sf::IpAddress sender;
+/// unsigned short port;
+/// socket.receive(buffer, sizeof(buffer), received, sender, port);
+/// std::cout << sender.ToString() << " said: " << buffer << std::endl;
+///
+/// // Send an answer
+/// std::string message = "Welcome " + sender.toString();
+/// socket.send(message.c_str(), message.size() + 1, sender, port);
+/// \endcode
+///
+/// \see sf::Socket, sf::TcpSocket, sf::Packet
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/Network/Unix/SocketHelper.hpp b/Externals/SFML/include/SFML/Network/Unix/SocketHelper.hpp
deleted file mode 100644
index 2f6d8965ee..0000000000
--- a/Externals/SFML/include/SFML/Network/Unix/SocketHelper.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETHELPERUNIX_HPP
-#define SFML_SOCKETHELPERUNIX_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// This class defines helper functions to do all the
-/// non-portable socket stuff. This class is meant for internal
-/// use only
-////////////////////////////////////////////////////////////
-class SFML_API SocketHelper
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    // Define some socket types
-    ////////////////////////////////////////////////////////////
-    typedef int       SocketType;
-    typedef socklen_t LengthType;
-
-    ////////////////////////////////////////////////////////////
-    /// Return the value of the invalid socket
-    ///
-    /// \return Unique value of the invalid socket
-    ///
-    ////////////////////////////////////////////////////////////
-    static SocketType InvalidSocket();
-
-    ////////////////////////////////////////////////////////////
-    /// Close / destroy a socket
-    ///
-    /// \param Socket : Socket to close
-    ///
-    /// \return True on success
-    ///
-    ////////////////////////////////////////////////////////////
-    static bool Close(SocketType Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Set a socket as blocking or non-blocking
-    ///
-    /// \param Socket : Socket to modify
-    /// \param Block :  New blocking state of the socket
-    ///
-    ////////////////////////////////////////////////////////////
-    static void SetBlocking(SocketType Socket, bool Block);
-
-    ////////////////////////////////////////////////////////////
-    /// Get the last socket error status
-    ///
-    /// \return Status corresponding to the last socket error
-    ///
-    ////////////////////////////////////////////////////////////
-    static Socket::Status GetErrorStatus();
-};
-
-} // namespace sf
-
-
-#endif // SFML_SOCKETHELPERUNIX_HPP
diff --git a/Externals/SFML/include/SFML/Network/Win32/SocketHelper.hpp b/Externals/SFML/include/SFML/Network/Win32/SocketHelper.hpp
deleted file mode 100644
index c02d990a83..0000000000
--- a/Externals/SFML/include/SFML/Network/Win32/SocketHelper.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_SOCKETHELPERWIN32_HPP
-#define SFML_SOCKETHELPERWIN32_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <winsock2.h>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// This class defines helper functions to do all the
-/// non-portable socket stuff. This class is meant for internal
-/// use only
-////////////////////////////////////////////////////////////
-class SFML_API SocketHelper
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    // Define some socket types
-    ////////////////////////////////////////////////////////////
-    typedef SOCKET SocketType;
-    typedef int    LengthType;
-
-    ////////////////////////////////////////////////////////////
-    /// Return the value of the invalid socket
-    ///
-    /// \return Unique value of the invalid socket
-    ///
-    ////////////////////////////////////////////////////////////
-    static SocketType InvalidSocket();
-
-    ////////////////////////////////////////////////////////////
-    /// Close / destroy a socket
-    ///
-    /// \param Socket : Socket to close
-    ///
-    /// \return True on success
-    ///
-    ////////////////////////////////////////////////////////////
-    static bool Close(SocketType Socket);
-
-    ////////////////////////////////////////////////////////////
-    /// Set a socket as blocking or non-blocking
-    ///
-    /// \param Socket : Socket to modify
-    /// \param Block :  New blocking state of the socket
-    ///
-    ////////////////////////////////////////////////////////////
-    static void SetBlocking(SocketType Socket, bool Block);
-
-    ////////////////////////////////////////////////////////////
-    /// Get the last socket error status
-    ///
-    /// \return Status corresponding to the last socket error
-    ///
-    ////////////////////////////////////////////////////////////
-    static Socket::Status GetErrorStatus();
-};
-
-} // namespace sf
-
-
-#endif // SFML_SOCKETHELPERWIN32_HPP
diff --git a/Externals/SFML/include/SFML/System.hpp b/Externals/SFML/include/SFML/System.hpp
index 4b2b938eec..6c2ee2eaa3 100644
--- a/Externals/SFML/include/SFML/System.hpp
+++ b/Externals/SFML/include/SFML/System.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,14 +30,27 @@
 ////////////////////////////////////////////////////////////
 
 #include <SFML/Config.hpp>
-// #include <SFML/System/Clock.hpp>
-// #include <SFML/System/Lock.hpp>
-// #include <SFML/System/Mutex.hpp>
-// #include <SFML/System/Randomizer.hpp>
-// #include <SFML/System/Sleep.hpp>
-// #include <SFML/System/Thread.hpp>
-// #include <SFML/System/Unicode.hpp>
-// #include <SFML/System/Vector2.hpp>
-// #include <SFML/System/Vector3.hpp>
+//#include <SFML/System/Clock.hpp>
+#include <SFML/System/Err.hpp>
+//#include <SFML/System/InputStream.hpp>
+//#include <SFML/System/Lock.hpp>
+//#include <SFML/System/Mutex.hpp>
+//#include <SFML/System/Sleep.hpp>
+#include <SFML/System/String.hpp>
+//#include <SFML/System/Thread.hpp>
+//#include <SFML/System/ThreadLocal.hpp>
+//#include <SFML/System/ThreadLocalPtr.hpp>
+#include <SFML/System/Utf.hpp>
+//#include <SFML/System/Vector2.hpp>
+//#include <SFML/System/Vector3.hpp>
 
 #endif // SFML_SYSTEM_HPP
+
+////////////////////////////////////////////////////////////
+/// \defgroup system System module
+///
+/// Base module of SFML, defining various utilities. It provides
+/// vector classes, unicode strings and conversion functions,
+/// threads and mutexes, timing classes.
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/Err.hpp b/Externals/SFML/include/SFML/System/Err.hpp
new file mode 100644
index 0000000000..590c635f4a
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/Err.hpp
@@ -0,0 +1,78 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_ERR_HPP
+#define SFML_ERR_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Export.hpp>
+#include <ostream>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+/// \brief Standard stream used by SFML to output warnings and errors
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API std::ostream& err();
+
+} // namespace sf
+
+
+#endif // SFML_ERR_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \fn sf::err
+/// \ingroup system
+///
+/// By default, sf::err() outputs to the same location as std::cerr,
+/// (-> the stderr descriptor) which is the console if there's
+/// one available.
+///
+/// It is a standard std::ostream instance, so it supports all the
+/// insertion operations defined by the STL
+/// (operator <<, manipulators, etc.).
+///
+/// sf::err() can be redirected to write to another output, independantly
+/// of std::cerr, by using the rdbuf() function provided by the
+/// std::ostream class.
+///
+/// Example:
+/// \code
+/// // Redirect to a file
+/// std::ofstream file("sfml-log.txt");
+/// std::streambuf* previous = sf::err().rdbuf(file.rdbuf());
+///
+/// // Redirect to nothing
+/// sf::err().rdbuf(NULL);
+///
+/// // Restore the original output
+/// sf::err().rdbuf(previous);
+/// \endcode
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/Export.hpp b/Externals/SFML/include/SFML/System/Export.hpp
new file mode 100644
index 0000000000..ec08fbe297
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/Export.hpp
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SYSTEM_EXPORT_HPP
+#define SFML_SYSTEM_EXPORT_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+
+////////////////////////////////////////////////////////////
+// Define portable import / export macros
+////////////////////////////////////////////////////////////
+#if defined(SFML_SYSTEM_EXPORTS)
+
+    #define SFML_SYSTEM_API SFML_API_EXPORT
+
+#else
+
+    #define SFML_SYSTEM_API SFML_API_IMPORT
+
+#endif
+
+
+#endif // SFML_SYSTEM_EXPORT_HPP
diff --git a/Externals/SFML/include/SFML/System/NonCopyable.hpp b/Externals/SFML/include/SFML/System/NonCopyable.hpp
index b61e989cca..b856ae952a 100644
--- a/Externals/SFML/include/SFML/System/NonCopyable.hpp
+++ b/Externals/SFML/include/SFML/System/NonCopyable.hpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -28,21 +28,26 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include <SFML/System/Export.hpp>
 
 
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// Utility base class to easily declare non-copyable classes.
-/// Just inherit from NonCopyable to get a non-copyable class
+/// \brief Utility class that makes any derived
+///        class non-copyable
+///
 ////////////////////////////////////////////////////////////
-struct SFML_API NonCopyable
+class SFML_SYSTEM_API NonCopyable
 {
 protected :
 
     ////////////////////////////////////////////////////////////
-    /// The default constructor won't be generated, so provide it
+    /// \brief Default constructor
+    ///
+    /// Because this class has a copy constructor, the compiler
+    /// will not automatically generate the default constructor.
+    /// That's why we must define it explicitely.
     ///
     ////////////////////////////////////////////////////////////
     NonCopyable() {}
@@ -50,15 +55,25 @@ protected :
 private :
 
     ////////////////////////////////////////////////////////////
-    /// Copy constructor : declare it private and don't implement
-    /// it to prevent from calling it
+    /// \brief Disabled copy constructor
+    ///
+    /// By making the copy constructor private, the compiler will
+    /// trigger an error if anyone outside tries to use it.
+    /// To prevent NonCopyable or friend classes from using it,
+    /// we also give no definition, so that the linker will
+    /// produce an error if the first protection was inefficient.
     ///
     ////////////////////////////////////////////////////////////
     NonCopyable(const NonCopyable&);
 
     ////////////////////////////////////////////////////////////
-    /// Assignment operator : declare it private and don't implement
-    /// it to prevent from calling it
+    /// \brief Disabled assignment operator
+    ///
+    /// By making the assignment operator private, the compiler will
+    /// trigger an error if anyone outside tries to use it.
+    /// To prevent NonCopyable or friend classes from using it,
+    /// we also give no definition, so that the linker will
+    /// produce an error if the first protection was inefficient.
     ///
     ////////////////////////////////////////////////////////////
     NonCopyable& operator =(const NonCopyable&);
@@ -68,3 +83,37 @@ private :
 
 
 #endif // SFML_NONCOPYABLE_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::NonCopyable
+/// \ingroup system
+///
+/// This class makes its instances non-copyable, by explicitely
+/// disabling its copy constructor and its assignment operator.
+///
+/// To create a non-copyable class, simply inherit from
+/// sf::NonCopyable.
+///
+/// The type of inheritance (public or private) doesn't matter,
+/// the copy constructor and assignment operator are declared private
+/// in sf::NonCopyable so they will end up being inaccessible in both
+/// cases. Thus you can use a shorter syntax for inheriting from it
+/// (see below).
+///
+/// Usage example:
+/// \code
+/// class MyNonCopyableClass : sf::NonCopyable
+/// {
+///     ...
+/// };
+/// \endcode
+///
+/// Deciding whether the instances of a class can be copied
+/// or not is a very important design choice. You are strongly
+/// encouraged to think about it before writing a class,
+/// and to use sf::NonCopyable when necessary to prevent
+/// many potential future errors when using it. This is also
+/// a very important indication to users of your class.
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/String.hpp b/Externals/SFML/include/SFML/System/String.hpp
new file mode 100644
index 0000000000..5eb52a0f9f
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/String.hpp
@@ -0,0 +1,543 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_STRING_HPP
+#define SFML_STRING_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Export.hpp>
+#include <locale>
+#include <string>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+/// \brief Utility string class that automatically handles
+///        conversions between types and encodings
+///
+////////////////////////////////////////////////////////////
+class SFML_SYSTEM_API String
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    // Types
+    ////////////////////////////////////////////////////////////
+    typedef std::basic_string<Uint32>::iterator       Iterator;      ///< Iterator type
+    typedef std::basic_string<Uint32>::const_iterator ConstIterator; ///< Constant iterator type
+
+    ////////////////////////////////////////////////////////////
+    // Static member data
+    ////////////////////////////////////////////////////////////
+    static const std::size_t InvalidPos; ///< Represents an invalid position in the string
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    /// This constructor creates an empty string.
+    ///
+    ////////////////////////////////////////////////////////////
+    String();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a single ANSI character and a locale
+    ///
+    /// The source character is converted to UTF-32 according
+    /// to the given locale.
+    ///
+    /// \param ansiChar ANSI character to convert
+    /// \param locale   Locale to use for conversion
+    ///
+    ////////////////////////////////////////////////////////////
+    String(char ansiChar, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from single wide character
+    ///
+    /// \param wideChar Wide character to convert
+    ///
+    ////////////////////////////////////////////////////////////
+    String(wchar_t wideChar);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from single UTF-32 character
+    ///
+    /// \param utf32Char UTF-32 character to convert
+    ///
+    ////////////////////////////////////////////////////////////
+    String(Uint32 utf32Char);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a null-terminated C-style ANSI string and a locale
+    ///
+    /// The source string is converted to UTF-32 according
+    /// to the given locale.
+    ///
+    /// \param ansiString ANSI string to convert
+    /// \param locale     Locale to use for conversion
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const char* ansiString, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from an ANSI string and a locale
+    ///
+    /// The source string is converted to UTF-32 according
+    /// to the given locale.
+    ///
+    /// \param ansiString ANSI string to convert
+    /// \param locale     Locale to use for conversion
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const std::string& ansiString, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from null-terminated C-style wide string
+    ///
+    /// \param wideString Wide string to convert
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const wchar_t* wideString);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a wide string
+    ///
+    /// \param wideString Wide string to convert
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const std::wstring& wideString);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a null-terminated C-style UTF-32 string
+    ///
+    /// \param utf32String UTF-32 string to assign
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const Uint32* utf32String);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from an UTF-32 string
+    ///
+    /// \param utf32String UTF-32 string to assign
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const std::basic_string<Uint32>& utf32String);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Copy constructor
+    ///
+    /// \param copy Instance to copy
+    ///
+    ////////////////////////////////////////////////////////////
+    String(const String& copy);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Implicit cast operator to std::string (ANSI string)
+    ///
+    /// The current global locale is used for conversion. If you
+    /// want to explicitely specify a locale, see toAnsiString.
+    /// Characters that do not fit in the target encoding are
+    /// discarded from the returned string.
+    /// This operator is defined for convenience, and is equivalent
+    /// to calling toAnsiString().
+    ///
+    /// \return Converted ANSI string
+    ///
+    /// \see toAnsiString, operator std::wstring
+    ///
+    ////////////////////////////////////////////////////////////
+    operator std::string() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Implicit cast operator to std::wstring (wide string)
+    ///
+    /// Characters that do not fit in the target encoding are
+    /// discarded from the returned string.
+    /// This operator is defined for convenience, and is equivalent
+    /// to calling toWideString().
+    ///
+    /// \return Converted wide string
+    ///
+    /// \see toWideString, operator std::string
+    ///
+    ////////////////////////////////////////////////////////////
+    operator std::wstring() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert the unicode string to an ANSI string
+    ///
+    /// The UTF-32 string is converted to an ANSI string in
+    /// the encoding defined by \a locale.
+    /// Characters that do not fit in the target encoding are
+    /// discarded from the returned string.
+    ///
+    /// \param locale Locale to use for conversion
+    ///
+    /// \return Converted ANSI string
+    ///
+    /// \see toWideString, operator std::string
+    ///
+    ////////////////////////////////////////////////////////////
+    std::string toAnsiString(const std::locale& locale = std::locale()) const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert the unicode string to a wide string
+    ///
+    /// Characters that do not fit in the target encoding are
+    /// discarded from the returned string.
+    ///
+    /// \return Converted wide string
+    ///
+    /// \see toAnsiString, operator std::wstring
+    ///
+    ////////////////////////////////////////////////////////////
+    std::wstring toWideString() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Overload of assignment operator
+    ///
+    /// \param right Instance to assign
+    ///
+    /// \return Reference to self
+    ///
+    ////////////////////////////////////////////////////////////
+    String& operator =(const String& right);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Overload of += operator to append an UTF-32 string
+    ///
+    /// \param right String to append
+    ///
+    /// \return Reference to self
+    ///
+    ////////////////////////////////////////////////////////////
+    String& operator +=(const String& right);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Overload of [] operator to access a character by its position
+    ///
+    /// This function provides read-only access to characters.
+    /// Note: this function doesn't throw if \a index is out of range.
+    ///
+    /// \param index Index of the character to get
+    ///
+    /// \return Character at position \a index
+    ///
+    ////////////////////////////////////////////////////////////
+    Uint32 operator [](std::size_t index) const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Overload of [] operator to access a character by its position
+    ///
+    /// This function provides read and write access to characters.
+    /// Note: this function doesn't throw if \a index is out of range.
+    ///
+    /// \param index Index of the character to get
+    ///
+    /// \return Reference to the character at position \a index
+    ///
+    ////////////////////////////////////////////////////////////
+    Uint32& operator [](std::size_t index);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Clear the string
+    ///
+    /// This function removes all the characters from the string.
+    ///
+    /// \see isEmpty, erase
+    ///
+    ////////////////////////////////////////////////////////////
+    void clear();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the size of the string
+    ///
+    /// \return Number of characters in the string
+    ///
+    /// \see isEmpty
+    ///
+    ////////////////////////////////////////////////////////////
+    std::size_t getSize() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Check whether the string is empty or not
+    ///
+    /// \return True if the string is empty (i.e. contains no character)
+    ///
+    /// \see clear, getSize
+    ///
+    ////////////////////////////////////////////////////////////
+    bool isEmpty() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Erase one or more characters from the string
+    ///
+    /// This function removes a sequence of \a count characters
+    /// starting from \a position.
+    ///
+    /// \param position Position of the first character to erase
+    /// \param count    Number of characters to erase
+    ///
+    ////////////////////////////////////////////////////////////
+    void erase(std::size_t position, std::size_t count = 1);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Insert one or more characters into the string
+    ///
+    /// This function inserts the characters of \a str
+    /// into the string, starting from \a position.
+    ///
+    /// \param position Position of insertion
+    /// \param str      Characters to insert
+    ///
+    ////////////////////////////////////////////////////////////
+    void insert(std::size_t position, const String& str);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Find a sequence of one or more characters in the string
+    ///
+    /// This function searches for the characters of \a str
+    /// into the string, starting from \a start.
+    ///
+    /// \param str   Characters to find
+    /// \param start Where to begin searching
+    ///
+    /// \return Position of \a str in the string, or String::InvalidPos if not found
+    ///
+    ////////////////////////////////////////////////////////////
+    std::size_t find(const String& str, std::size_t start = 0) const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Get a pointer to the C-style array of characters
+    ///
+    /// This functions provides a read-only access to a
+    /// null-terminated C-style representation of the string.
+    /// The returned pointer is temporary and is meant only for
+    /// immediate use, thus it is not recommended to store it.
+    ///
+    /// \return Read-only pointer to the array of characters
+    ///
+    ////////////////////////////////////////////////////////////
+    const Uint32* getData() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return an iterator to the beginning of the string
+    ///
+    /// \return Read-write iterator to the beginning of the string characters
+    ///
+    /// \see end
+    ///
+    ////////////////////////////////////////////////////////////
+    Iterator begin();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return an iterator to the beginning of the string
+    ///
+    /// \return Read-only iterator to the beginning of the string characters
+    ///
+    /// \see end
+    ///
+    ////////////////////////////////////////////////////////////
+    ConstIterator begin() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return an iterator to the beginning of the string
+    ///
+    /// The end iterator refers to 1 position past the last character;
+    /// thus it represents an invalid character and should never be
+    /// accessed.
+    ///
+    /// \return Read-write iterator to the end of the string characters
+    ///
+    /// \see begin
+    ///
+    ////////////////////////////////////////////////////////////
+    Iterator end();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return an iterator to the beginning of the string
+    ///
+    /// The end iterator refers to 1 position past the last character;
+    /// thus it represents an invalid character and should never be
+    /// accessed.
+    ///
+    /// \return Read-only iterator to the end of the string characters
+    ///
+    /// \see begin
+    ///
+    ////////////////////////////////////////////////////////////
+    ConstIterator end() const;
+
+private :
+
+    friend SFML_SYSTEM_API bool operator ==(const String& left, const String& right);
+    friend SFML_SYSTEM_API bool operator <(const String& left, const String& right);
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    std::basic_string<Uint32> m_string; ///< Internal string of UTF-32 characters
+};
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of == operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if both strings are equal
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator ==(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of != operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if both strings are different
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator !=(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of < operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if \a left is alphabetically lesser than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator <(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of > operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if \a left is alphabetically greater than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator >(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of <= operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if \a left is alphabetically lesser or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator <=(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of >= operator to compare two UTF-32 strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return True if \a left is alphabetically greater or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator >=(const String& left, const String& right);
+
+////////////////////////////////////////////////////////////
+/// \relates String
+/// \brief Overload of binary + operator to concatenate two strings
+///
+/// \param left  Left operand (a string)
+/// \param right Right operand (a string)
+///
+/// \return Concatenated string
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API String operator +(const String& left, const String& right);
+
+} // namespace sf
+
+
+#endif // SFML_STRING_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::String
+/// \ingroup system
+///
+/// sf::String is a utility string class defined mainly for
+/// convenience. It is a Unicode string (implemented using
+/// UTF-32), thus it can store any character in the world
+/// (european, chinese, arabic, hebrew, etc.).
+///
+/// It automatically handles conversions from/to ANSI and
+/// wide strings, so that you can work with standard string
+/// classes and still be compatible with functions taking a
+/// sf::String.
+///
+/// \code
+/// sf::String s;
+///
+/// std::string s1 = s;  // automatically converted to ANSI string
+/// std::wstring s2 = s; // automatically converted to wide string
+/// s = "hello";         // automatically converted from ANSI string
+/// s = L"hello";        // automatically converted from wide string
+/// s += 'a';            // automatically converted from ANSI string
+/// s += L'a';           // automatically converted from wide string
+/// \endcode
+///
+/// Conversions involving ANSI strings use the default user locale. However
+/// it is possible to use a custom locale if necessary:
+/// \code
+/// std::locale locale;
+/// sf::String s;
+/// ...
+/// std::string s1 = s.toAnsiString(locale);
+/// s = sf::String("hello", locale);
+/// \endcode
+///
+/// sf::String defines the most important functions of the
+/// standard std::string class: removing, random access, iterating,
+/// appending, comparing, etc. However it is a simple class
+/// provided for convenience, and you may have to consider using
+/// a more optimized class if your program requires complex string
+/// handling. The automatic conversion functions will then take
+/// care of converting your string to sf::String whenever SFML
+/// requires it.
+///
+/// Please note that SFML also defines a low-level, generic
+/// interface for Unicode handling, see the sf::Utf classes.
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/Time.hpp b/Externals/SFML/include/SFML/System/Time.hpp
new file mode 100644
index 0000000000..5043ae6c02
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/Time.hpp
@@ -0,0 +1,452 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_TIME_HPP
+#define SFML_TIME_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Export.hpp>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+/// \brief Represents a time value
+///
+////////////////////////////////////////////////////////////
+class SFML_SYSTEM_API Time
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    /// Sets the time value to zero.
+    ///
+    ////////////////////////////////////////////////////////////
+    Time();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the time value as a number of seconds
+    ///
+    /// \return Time in seconds
+    ///
+    /// \see asMilliseconds, asMicroseconds
+    ///
+    ////////////////////////////////////////////////////////////
+    float asSeconds() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the time value as a number of milliseconds
+    ///
+    /// \return Time in milliseconds
+    ///
+    /// \see asSeconds, asMicroseconds
+    ///
+    ////////////////////////////////////////////////////////////
+    Int32 asMilliseconds() const;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the time value as a number of microseconds
+    ///
+    /// \return Time in microseconds
+    ///
+    /// \see asSeconds, asMilliseconds
+    ///
+    ////////////////////////////////////////////////////////////
+    Int64 asMicroseconds() const;
+
+    ////////////////////////////////////////////////////////////
+    // Static member data
+    ////////////////////////////////////////////////////////////
+    static const Time Zero; ///< Predefined "zero" time value
+
+private :
+
+    friend SFML_SYSTEM_API Time seconds(float);
+    friend SFML_SYSTEM_API Time milliseconds(Int32);
+    friend SFML_SYSTEM_API Time microseconds(Int64);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a number of microseconds
+    ///
+    /// This function is internal. To construct time values,
+    /// use sf::seconds, sf::milliseconds or sf::microseconds instead.
+    ///
+    /// \param microseconds Number of microseconds
+    ///
+    ////////////////////////////////////////////////////////////
+    explicit Time(Int64 microseconds);
+
+private :
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    Int64 m_microseconds; ///< Time value stored as microseconds
+};
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Construct a time value from a number of seconds
+///
+/// \param amount Number of seconds
+///
+/// \return Time value constructed from the amount of seconds
+///
+/// \see milliseconds, microseconds
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time seconds(float amount);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Construct a time value from a number of milliseconds
+///
+/// \param amount Number of milliseconds
+///
+/// \return Time value constructed from the amount of milliseconds
+///
+/// \see seconds, microseconds
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time milliseconds(Int32 amount);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Construct a time value from a number of microseconds
+///
+/// \param amount Number of microseconds
+///
+/// \return Time value constructed from the amount of microseconds
+///
+/// \see seconds, milliseconds
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time microseconds(Int64 amount);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of == operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if both time values are equal
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator ==(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of != operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if both time values are different
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator !=(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of < operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if \a left is lesser than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator <(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of > operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if \a left is greater than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator >(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of <= operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if \a left is lesser or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator <=(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of >= operator to compare two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return True if \a left is greater or equal than \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API bool operator >=(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of unary - operator to negate a time value
+///
+/// \param right Right operand (a time)
+///
+/// \return Opposite of the time value
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator -(Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary + operator to add two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return Sum of the two times values
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator +(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary += operator to add/assign two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return Sum of the two times values
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator +=(Time& left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary - operator to subtract two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return Difference of the two times values
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator -(Time left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary -= operator to subtract/assign two time values
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a time)
+///
+/// \return Difference of the two times values
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator -=(Time& left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary * operator to scale a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator *(Time left, float right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary * operator to scale a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator *(Time left, Int64 right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary * operator to scale a time value
+///
+/// \param left  Left operand (a number)
+/// \param right Right operand (a time)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator *(float left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary * operator to scale a time value
+///
+/// \param left  Left operand (a number)
+/// \param right Right operand (a time)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator *(Int64 left, Time right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary *= operator to scale/assign a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator *=(Time& left, float right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary *= operator to scale/assign a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left multiplied by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator *=(Time& left, Int64 right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary / operator to scale a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left divided by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator /(Time left, float right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary / operator to scale a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left divided by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time operator /(Time left, Int64 right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary /= operator to scale/assign a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left divided by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator /=(Time& left, float right);
+
+////////////////////////////////////////////////////////////
+/// \relates Time
+/// \brief Overload of binary /= operator to scale/assign a time value
+///
+/// \param left  Left operand (a time)
+/// \param right Right operand (a number)
+///
+/// \return \a left divided by \a right
+///
+////////////////////////////////////////////////////////////
+SFML_SYSTEM_API Time& operator /=(Time& left, Int64 right);
+
+} // namespace sf
+
+
+#endif // SFML_TIME_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::Time
+/// \ingroup system
+///
+/// sf::Time encapsulates a time value in a flexible way.
+/// It allows to define a time value either as a number of
+/// seconds, milliseconds or microseconds. It also works the
+/// other way round: you can read a time value as either
+/// a number of seconds, milliseconds or microseconds.
+///
+/// By using such a flexible interface, the API doesn't
+/// impose any fixed type or resolution for time values,
+/// and let the user choose its own favorite representation.
+///
+/// Time values support the usual mathematical operations:
+/// you can add or subtract two times, multiply or divide
+/// a time by a number, compare two times, etc.
+///
+/// Since they represent a time span and not an absolute time
+/// value, times can also be negative.
+///
+/// Usage example:
+/// \code
+/// sf::Time t1 = sf::seconds(0.1f);
+/// Int32 milli = t1.asMilliseconds(); // 100
+///
+/// sf::Time t2 = sf::milliseconds(30);
+/// Int64 micro = t2.asMicroseconds(); // 30000
+///
+/// sf::Time t3 = sf::microseconds(-800000);
+/// float sec = t3.asSeconds(); // -0.8
+/// \endcode
+///
+/// \code
+/// void update(sf::Time elapsed)
+/// {
+///    position += speed * elapsed.asSeconds();
+/// }
+///
+/// update(sf::milliseconds(100));
+/// \endcode
+///
+/// \see sf::Clock
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/Utf.hpp b/Externals/SFML/include/SFML/System/Utf.hpp
new file mode 100644
index 0000000000..0b965dc91f
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/Utf.hpp
@@ -0,0 +1,763 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_UTF_HPP
+#define SFML_UTF_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+#include <algorithm>
+#include <locale>
+#include <string>
+#include <cstdlib>
+
+
+namespace sf
+{
+template <unsigned int N>
+class Utf;
+
+////////////////////////////////////////////////////////////
+/// \brief Specialization of the Utf template for UTF-8
+///
+////////////////////////////////////////////////////////////
+template <>
+class Utf<8>
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Decode a single UTF-8 character
+    ///
+    /// Decoding a character means finding its unique 32-bits
+    /// code (called the codepoint) in the Unicode standard.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Codepoint of the decoded UTF-8 character
+    /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In decode(In begin, In end, Uint32& output, Uint32 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Encode a single UTF-8 character
+    ///
+    /// Encoding a character means converting a unique 32-bits
+    /// code (called the codepoint) in the target encoding, UTF-8.
+    ///
+    /// \param input       Codepoint to encode as UTF-8
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to UTF-8 (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename Out>
+    static Out encode(Uint32 input, Out output, Uint8 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Advance to the next UTF-8 character
+    ///
+    /// This function is necessary for multi-elements encodings, as
+    /// a single character may use more than 1 storage element.
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In next(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Count the number of characters of a UTF-8 sequence
+    ///
+    /// This function is necessary for multi-elements encodings, as
+    /// a single character may use more than 1 storage element, thus the
+    /// total size can be different from (begin - end).
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static std::size_t count(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an ANSI characters range to UTF-8
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    /// \param locale Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromAnsi(In begin, In end, Out output, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a wide characters range to UTF-8
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromWide(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-8
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromLatin1(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-8 characters range to ANSI characters
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+    /// \param locale      Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-8 characters range to wide characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toWide(In begin, In end, Out output, wchar_t replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-8 characters range to latin-1 (ISO-5589-1) characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toLatin1(In begin, In end, Out output, char replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-8 characters range to UTF-8
+    ///
+    /// This functions does nothing more than a direct copy;
+    /// it is defined only to provide the same interface as other
+    /// specializations of the sf::Utf<> template, and allow
+    /// generic code to be written on top of it.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf8(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-8 characters range to UTF-16
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf16(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-8 characters range to UTF-32
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf32(In begin, In end, Out output);
+};
+
+////////////////////////////////////////////////////////////
+/// \brief Specialization of the Utf template for UTF-16
+///
+////////////////////////////////////////////////////////////
+template <>
+class Utf<16>
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Decode a single UTF-16 character
+    ///
+    /// Decoding a character means finding its unique 32-bits
+    /// code (called the codepoint) in the Unicode standard.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Codepoint of the decoded UTF-16 character
+    /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In decode(In begin, In end, Uint32& output, Uint32 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Encode a single UTF-16 character
+    ///
+    /// Encoding a character means converting a unique 32-bits
+    /// code (called the codepoint) in the target encoding, UTF-16.
+    ///
+    /// \param input       Codepoint to encode as UTF-16
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to UTF-16 (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename Out>
+    static Out encode(Uint32 input, Out output, Uint16 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Advance to the next UTF-16 character
+    ///
+    /// This function is necessary for multi-elements encodings, as
+    /// a single character may use more than 1 storage element.
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In next(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Count the number of characters of a UTF-16 sequence
+    ///
+    /// This function is necessary for multi-elements encodings, as
+    /// a single character may use more than 1 storage element, thus the
+    /// total size can be different from (begin - end).
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static std::size_t count(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an ANSI characters range to UTF-16
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    /// \param locale Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromAnsi(In begin, In end, Out output, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a wide characters range to UTF-16
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromWide(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-16
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromLatin1(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-16 characters range to ANSI characters
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+    /// \param locale      Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-16 characters range to wide characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toWide(In begin, In end, Out output, wchar_t replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toLatin1(In begin, In end, Out output, char replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-16 characters range to UTF-8
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf8(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-16 characters range to UTF-16
+    ///
+    /// This functions does nothing more than a direct copy;
+    /// it is defined only to provide the same interface as other
+    /// specializations of the sf::Utf<> template, and allow
+    /// generic code to be written on top of it.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf16(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-16 characters range to UTF-32
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf32(In begin, In end, Out output);
+};
+
+////////////////////////////////////////////////////////////
+/// \brief Specialization of the Utf template for UTF-32
+///
+////////////////////////////////////////////////////////////
+template <>
+class Utf<32>
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Decode a single UTF-32 character
+    ///
+    /// Decoding a character means finding its unique 32-bits
+    /// code (called the codepoint) in the Unicode standard.
+    /// For UTF-32, the character value is the same as the codepoint.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Codepoint of the decoded UTF-32 character
+    /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In decode(In begin, In end, Uint32& output, Uint32 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Encode a single UTF-32 character
+    ///
+    /// Encoding a character means converting a unique 32-bits
+    /// code (called the codepoint) in the target encoding, UTF-32.
+    /// For UTF-32, the codepoint is the same as the character value.
+    ///
+    /// \param input       Codepoint to encode as UTF-32
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to UTF-32 (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename Out>
+    static Out encode(Uint32 input, Out output, Uint32 replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Advance to the next UTF-32 character
+    ///
+    /// This function is trivial for UTF-32, which can store
+    /// every character in a single storage element.
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static In next(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Count the number of characters of a UTF-32 sequence
+    ///
+    /// This function is trivial for UTF-32, which can store
+    /// every character in a single storage element.
+    ///
+    /// \param begin Iterator pointing to the beginning of the input sequence
+    /// \param end   Iterator pointing to the end of the input sequence
+    ///
+    /// \return Iterator pointing to one past the last read element of the input sequence
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static std::size_t count(In begin, In end);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an ANSI characters range to UTF-32
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    /// \param locale Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromAnsi(In begin, In end, Out output, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a wide characters range to UTF-32
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromWide(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-32
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out fromLatin1(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-32 characters range to ANSI characters
+    ///
+    /// The current global locale will be used by default, unless you
+    /// pass a custom one in the \a locale parameter.
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+    /// \param locale      Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toAnsi(In begin, In end, Out output, char replacement = 0, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-32 characters range to wide characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toWide(In begin, In end, Out output, wchar_t replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
+    ///
+    /// \param begin       Iterator pointing to the beginning of the input sequence
+    /// \param end         Iterator pointing to the end of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toLatin1(In begin, In end, Out output, char replacement = 0);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-32 characters range to UTF-8
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf8(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-32 characters range to UTF-16
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf16(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Convert a UTF-32 characters range to UTF-32
+    ///
+    /// This functions does nothing more than a direct copy;
+    /// it is defined only to provide the same interface as other
+    /// specializations of the sf::Utf<> template, and allow
+    /// generic code to be written on top of it.
+    ///
+    /// \param begin  Iterator pointing to the beginning of the input sequence
+    /// \param end    Iterator pointing to the end of the input sequence
+    /// \param output Iterator pointing to the beginning of the output sequence
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In, typename Out>
+    static Out toUtf32(In begin, In end, Out output);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Decode a single ANSI character to UTF-32
+    ///
+    /// This function does not exist in other specializations
+    /// of sf::Utf<>, it is defined for convenience (it is used by
+    /// several other conversion functions).
+    ///
+    /// \param input  Input ANSI character
+    /// \param locale Locale to use for conversion
+    ///
+    /// \return Converted character
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static Uint32 decodeAnsi(In input, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Decode a single wide character to UTF-32
+    ///
+    /// This function does not exist in other specializations
+    /// of sf::Utf<>, it is defined for convenience (it is used by
+    /// several other conversion functions).
+    ///
+    /// \param input Input wide character
+    ///
+    /// \return Converted character
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename In>
+    static Uint32 decodeWide(In input);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Encode a single UTF-32 character to ANSI
+    ///
+    /// This function does not exist in other specializations
+    /// of sf::Utf<>, it is defined for convenience (it is used by
+    /// several other conversion functions).
+    ///
+    /// \param codepoint   Iterator pointing to the beginning of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement if the input character is not convertible to ANSI (use 0 to skip it)
+    /// \param locale      Locale to use for conversion
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename Out>
+    static Out encodeAnsi(Uint32 codepoint, Out output, char replacement = 0, const std::locale& locale = std::locale());
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Encode a single UTF-32 character to wide
+    ///
+    /// This function does not exist in other specializations
+    /// of sf::Utf<>, it is defined for convenience (it is used by
+    /// several other conversion functions).
+    ///
+    /// \param codepoint   Iterator pointing to the beginning of the input sequence
+    /// \param output      Iterator pointing to the beginning of the output sequence
+    /// \param replacement Replacement if the input character is not convertible to wide (use 0 to skip it)
+    ///
+    /// \return Iterator to the end of the output sequence which has been written
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename Out>
+    static Out encodeWide(Uint32 codepoint, Out output, wchar_t replacement = 0);
+};
+
+#include <SFML/System/Utf.inl>
+
+// Make typedefs to get rid of the template syntax
+typedef Utf<8>  Utf8;
+typedef Utf<16> Utf16;
+typedef Utf<32> Utf32;
+
+} // namespace sf
+
+
+#endif // SFML_UTF_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::Utf
+/// \ingroup system
+///
+/// Utility class providing generic functions for UTF conversions.
+///
+/// sf::Utf is a low-level, generic interface for counting, iterating,
+/// encoding and decoding Unicode characters and strings. It is able
+/// to handle ANSI, wide, latin-1, UTF-8, UTF-16 and UTF-32 encodings.
+///
+/// sf::Utf<X> functions are all static, these classes are not meant to
+/// be instanciated. All the functions are template, so that you
+/// can use any character / string type for a given encoding.
+///
+/// It has 3 specializations:
+/// \li sf::Utf<8> (typedef'd to sf::Utf8)
+/// \li sf::Utf<16> (typedef'd to sf::Utf16)
+/// \li sf::Utf<32> (typedef'd to sf::Utf32)
+///
+////////////////////////////////////////////////////////////
diff --git a/Externals/SFML/include/SFML/System/Utf.inl b/Externals/SFML/include/SFML/System/Utf.inl
new file mode 100644
index 0000000000..bf897dfee4
--- /dev/null
+++ b/Externals/SFML/include/SFML/System/Utf.inl
@@ -0,0 +1,752 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2012 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////
+// References :
+//
+// http://www.unicode.org/
+// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c
+// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.h
+// http://people.w3.org/rishida/scripts/uniview/conversion
+//
+////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<8>::decode(In begin, In end, Uint32& output, Uint32 replacement)
+{
+    // Some useful precomputed data
+    static const int trailing[256] =
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5
+    };
+    static const Uint32 offsets[6] =
+    {
+        0x00000000, 0x00003080, 0x000E2080, 0x03C82080, 0xFA082080, 0x82082080
+    };
+
+    // decode the character
+    int trailingBytes = trailing[static_cast<Uint8>(*begin)];
+    if (begin + trailingBytes < end)
+    {
+        output = 0;
+        switch (trailingBytes)
+        {
+            case 5 : output += static_cast<Uint8>(*begin++); output <<= 6;
+            case 4 : output += static_cast<Uint8>(*begin++); output <<= 6;
+            case 3 : output += static_cast<Uint8>(*begin++); output <<= 6;
+            case 2 : output += static_cast<Uint8>(*begin++); output <<= 6;
+            case 1 : output += static_cast<Uint8>(*begin++); output <<= 6;
+            case 0 : output += static_cast<Uint8>(*begin++);
+        }
+        output -= offsets[trailingBytes];
+    }
+    else
+    {
+        // Incomplete character
+        begin = end;
+        output = replacement;
+    }
+
+    return begin;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename Out>
+Out Utf<8>::encode(Uint32 input, Out output, Uint8 replacement)
+{
+    // Some useful precomputed data
+    static const Uint8 firstBytes[7] =
+    {
+        0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
+    };
+
+    // encode the character
+    if ((input > 0x0010FFFF) || ((input >= 0xD800) && (input <= 0xDBFF)))
+    {
+        // Invalid character
+        if (replacement)
+            *output++ = replacement;
+    }
+    else
+    {
+        // Valid character
+
+        // Get the number of bytes to write
+        std::size_t bytestoWrite = 1;
+        if      (input <  0x80)       bytestoWrite = 1;
+        else if (input <  0x800)      bytestoWrite = 2;
+        else if (input <  0x10000)    bytestoWrite = 3;
+        else if (input <= 0x0010FFFF) bytestoWrite = 4;
+
+        // Extract the bytes to write
+        Uint8 bytes[4];
+        switch (bytestoWrite)
+        {
+            case 4 : bytes[3] = static_cast<Uint8>((input | 0x80) & 0xBF); input >>= 6;
+            case 3 : bytes[2] = static_cast<Uint8>((input | 0x80) & 0xBF); input >>= 6;
+            case 2 : bytes[1] = static_cast<Uint8>((input | 0x80) & 0xBF); input >>= 6;
+            case 1 : bytes[0] = static_cast<Uint8> (input | firstBytes[bytestoWrite]);
+        }
+
+        // Add them to the output
+        output = std::copy(bytes, bytes + bytestoWrite, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<8>::next(In begin, In end)
+{
+    Uint32 codepoint;
+    return decode(begin, end, codepoint);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+std::size_t Utf<8>::count(In begin, In end)
+{
+    std::size_t length = 0;
+    while (begin < end)
+    {
+        begin = next(begin, end);
+        ++length;
+    }
+
+    return length;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::fromAnsi(In begin, In end, Out output, const std::locale& locale)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint = Utf<32>::decodeAnsi(*begin++, locale);
+        output = encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::fromWide(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint = Utf<32>::decodeWide(*begin++);
+        output = encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::fromLatin1(In begin, In end, Out output)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    while (begin < end)
+        output = encode(*begin++, output);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toAnsi(In begin, In end, Out output, char replacement, const std::locale& locale)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<32>::encodeAnsi(codepoint, output, replacement, locale);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toWide(In begin, In end, Out output, wchar_t replacement)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<32>::encodeWide(codepoint, output, replacement);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toLatin1(In begin, In end, Out output, char replacement)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        *output++ = codepoint < 256 ? static_cast<char>(codepoint) : replacement;
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toUtf8(In begin, In end, Out output)
+{
+    return std::copy(begin, end, output);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toUtf16(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<16>::encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<8>::toUtf32(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        *output++ = codepoint;
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<16>::decode(In begin, In end, Uint32& output, Uint32 replacement)
+{
+    Uint16 first = *begin++;
+
+    // If it's a surrogate pair, first convert to a single UTF-32 character
+    if ((first >= 0xD800) && (first <= 0xDBFF))
+    {
+        if (begin < end)
+        {
+            Uint32 second = *begin++;
+            if ((second >= 0xDC00) && (second <= 0xDFFF))
+            {
+                // The second element is valid: convert the two elements to a UTF-32 character
+                output = static_cast<Uint32>(((first - 0xD800) << 10) + (second - 0xDC00) + 0x0010000);
+            }
+            else
+            {
+                // Invalid character
+                output = replacement;
+            }
+        }
+        else
+        {
+            // Invalid character
+            begin = end;
+            output = replacement;
+        }
+    }
+    else
+    {
+        // We can make a direct copy
+        output = first;
+    }
+
+    return begin;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename Out>
+Out Utf<16>::encode(Uint32 input, Out output, Uint16 replacement)
+{
+    if (input < 0xFFFF)
+    {
+        // The character can be copied directly, we just need to check if it's in the valid range
+        if ((input >= 0xD800) && (input <= 0xDFFF))
+        {
+            // Invalid character (this range is reserved)
+            if (replacement)
+                *output++ = replacement;
+        }
+        else
+        {
+            // Valid character directly convertible to a single UTF-16 character
+            *output++ = static_cast<Uint16>(input);
+        }
+    }
+    else if (input > 0x0010FFFF)
+    {
+        // Invalid character (greater than the maximum unicode value)
+        if (replacement)
+            *output++ = replacement;
+    }
+    else
+    {
+        // The input character will be converted to two UTF-16 elements
+        input -= 0x0010000;
+        *output++ = static_cast<Uint16>((input >> 10)     + 0xD800);
+        *output++ = static_cast<Uint16>((input & 0x3FFUL) + 0xDC00);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<16>::next(In begin, In end)
+{
+    Uint32 codepoint;
+    return decode(begin, end, codepoint);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+std::size_t Utf<16>::count(In begin, In end)
+{
+    std::size_t length = 0;
+    while (begin < end)
+    {
+        begin = next(begin, end);
+        ++length;
+    }
+
+    return length;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::fromAnsi(In begin, In end, Out output, const std::locale& locale)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint = Utf<32>::decodeAnsi(*begin++, locale);
+        output = encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::fromWide(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint = Utf<32>::decodeWide(*begin++);
+        output = encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::fromLatin1(In begin, In end, Out output)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    return std::copy(begin, end, output);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toAnsi(In begin, In end, Out output, char replacement, const std::locale& locale)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<32>::encodeAnsi(codepoint, output, replacement, locale);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toWide(In begin, In end, Out output, wchar_t replacement)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<32>::encodeWide(codepoint, output, replacement);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toLatin1(In begin, In end, Out output, char replacement)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    while (begin < end)
+    {
+        *output++ = *begin < 256 ? static_cast<char>(*begin) : replacement;
+        begin++;
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toUtf8(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        output = Utf<8>::encode(codepoint, output);
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toUtf16(In begin, In end, Out output)
+{
+    return std::copy(begin, end, output);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<16>::toUtf32(In begin, In end, Out output)
+{
+    while (begin < end)
+    {
+        Uint32 codepoint;
+        begin = decode(begin, end, codepoint);
+        *output++ = codepoint;
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<32>::decode(In begin, In /*end*/, Uint32& output, Uint32 /*replacement*/)
+{
+    output = *begin++;
+    return begin;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename Out>
+Out Utf<32>::encode(Uint32 input, Out output, Uint32 /*replacement*/)
+{
+    *output++ = input;
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+In Utf<32>::next(In begin, In /*end*/)
+{
+    return ++begin;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+std::size_t Utf<32>::count(In begin, In end)
+{
+    return begin - end;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::fromAnsi(In begin, In end, Out output, const std::locale& locale)
+{
+    while (begin < end)
+        *output++ = decodeAnsi(*begin++, locale);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::fromWide(In begin, In end, Out output)
+{
+    while (begin < end)
+        *output++ = decodeWide(*begin++);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::fromLatin1(In begin, In end, Out output)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    return std::copy(begin, end, output);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toAnsi(In begin, In end, Out output, char replacement, const std::locale& locale)
+{
+    while (begin < end)
+        output = encodeAnsi(*begin++, output, replacement, locale);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toWide(In begin, In end, Out output, wchar_t replacement)
+{
+    while (begin < end)
+        output = encodeWide(*begin++, output, replacement);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toLatin1(In begin, In end, Out output, char replacement)
+{
+    // Latin-1 is directly compatible with Unicode encodings,
+    // and can thus be treated as (a sub-range of) UTF-32
+    while (begin < end)
+    {
+        *output++ = *begin < 256 ? static_cast<char>(*begin) : replacement;
+        begin++;
+    }
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toUtf8(In begin, In end, Out output)
+{
+    while (begin < end)
+        output = Utf<8>::encode(*begin++, output);
+
+    return output;
+}
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toUtf16(In begin, In end, Out output)
+{
+    while (begin < end)
+        output = Utf<16>::encode(*begin++, output);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In, typename Out>
+Out Utf<32>::toUtf32(In begin, In end, Out output)
+{
+    return std::copy(begin, end, output);
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+Uint32 Utf<32>::decodeAnsi(In input, const std::locale& locale)
+{
+    // On Windows, gcc's standard library (glibc++) has almost
+    // no support for Unicode stuff. As a consequence, in this
+    // context we can only use the default locale and ignore
+    // the one passed as parameter.
+
+    #if defined(SFML_SYSTEM_WINDOWS) &&                       /* if Windows ... */                          \
+       (defined(__GLIBCPP__) || defined (__GLIBCXX__)) &&     /* ... and standard library is glibc++ ... */ \
+      !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) /* ... and STLPort is not used on top of it */
+
+        (void)locale; // to avoid warnings
+
+        wchar_t character = 0;
+        mbtowc(&character, &input, 1);
+        return static_cast<Uint32>(character);
+
+    #else
+
+        // Get the facet of the locale which deals with character conversion
+        const std::ctype<wchar_t>& facet = std::use_facet< std::ctype<wchar_t> >(locale);
+
+        // Use the facet to convert each character of the input string
+        return static_cast<Uint32>(facet.widen(input));
+
+    #endif
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename In>
+Uint32 Utf<32>::decodeWide(In input)
+{
+    // The encoding of wide characters is not well defined and is left to the system;
+    // however we can safely assume that it is UCS-2 on Windows and
+    // UCS-4 on Unix systems.
+    // In both cases, a simple copy is enough (UCS-2 is a subset of UCS-4,
+    // and UCS-4 *is* UTF-32).
+
+    return input;
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename Out>
+Out Utf<32>::encodeAnsi(Uint32 codepoint, Out output, char replacement, const std::locale& locale)
+{
+    // On Windows, gcc's standard library (glibc++) has almost
+    // no support for Unicode stuff. As a consequence, in this
+    // context we can only use the default locale and ignore
+    // the one passed as parameter.
+
+    #if defined(SFML_SYSTEM_WINDOWS) &&                       /* if Windows ... */                          \
+       (defined(__GLIBCPP__) || defined (__GLIBCXX__)) &&     /* ... and standard library is glibc++ ... */ \
+      !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) /* ... and STLPort is not used on top of it */
+
+        (void)locale; // to avoid warnings
+
+        char character = 0;
+        if (wctomb(&character, static_cast<wchar_t>(codepoint)) >= 0)
+            *output++ = character;
+        else if (replacement)
+            *output++ = replacement;
+
+        return output;
+
+    #else
+
+        // Get the facet of the locale which deals with character conversion
+        const std::ctype<wchar_t>& facet = std::use_facet< std::ctype<wchar_t> >(locale);
+
+        // Use the facet to convert each character of the input string
+        *output++ = facet.narrow(static_cast<wchar_t>(codepoint), replacement);
+
+        return output;
+
+    #endif
+}
+
+
+////////////////////////////////////////////////////////////
+template <typename Out>
+Out Utf<32>::encodeWide(Uint32 codepoint, Out output, wchar_t replacement)
+{
+    // The encoding of wide characters is not well defined and is left to the system;
+    // however we can safely assume that it is UCS-2 on Windows and
+    // UCS-4 on Unix systems.
+    // For UCS-2 we need to check if the source characters fits in (UCS-2 is a subset of UCS-4).
+    // For UCS-4 we can do a direct copy (UCS-4 *is* UTF-32).
+
+    switch (sizeof(wchar_t))
+    {
+        case 4:
+        {
+            *output++ = static_cast<wchar_t>(codepoint);
+            break;
+        }
+
+        default:
+        {
+            if ((codepoint <= 0xFFFF) && ((codepoint < 0xD800) || (codepoint > 0xDFFF)))
+            {
+                *output++ = static_cast<wchar_t>(codepoint);
+            }
+            else if (replacement)
+            {
+                *output++ = replacement;
+            }
+            break;
+        }
+    }
+
+    return output;
+}
diff --git a/Externals/SFML/license.txt b/Externals/SFML/license.txt
new file mode 100644
index 0000000000..1d0ae1a38b
--- /dev/null
+++ b/Externals/SFML/license.txt
@@ -0,0 +1,24 @@
+SFML
+----
+
+SFML - Copyright (C) 2007-2013 Laurent Gomila - laurent.gom@gmail.com
+
+This software is provided 'as-is', without any express or
+implied warranty. In no event will the authors be held
+liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute
+it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented;
+   you must not claim that you wrote the original software.
+   If you use this software in a product, an acknowledgment
+   in the product documentation would be appreciated but
+   is not required.
+
+2. Altered source versions must be plainly marked as such,
+   and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any
+   source distribution.
diff --git a/Externals/SFML/src/SFML/Network/Ftp.cpp b/Externals/SFML/src/SFML/Network/Ftp.cpp
deleted file mode 100644
index 4cf93d5fb7..0000000000
--- a/Externals/SFML/src/SFML/Network/Ftp.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/Ftp.hpp>
-#include <SFML/Network/IPAddress.hpp>
-#include <algorithm>
-#include <fstream>
-#include <iterator>
-#include <sstream>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-// Utility class for exchanging stuff with the server
-// on the data channel
-////////////////////////////////////////////////////////////
-class Ftp::DataChannel : NonCopyable
-{
-public :
-
-    ////////////////////////////////////////////////////////////
-    // Constructor
-    ////////////////////////////////////////////////////////////
-    DataChannel(Ftp& Owner);
-
-    ////////////////////////////////////////////////////////////
-    // Destructor
-    ////////////////////////////////////////////////////////////
-    ~DataChannel();
-
-    ////////////////////////////////////////////////////////////
-    // Open the data channel using the specified mode and port
-    ////////////////////////////////////////////////////////////
-    Ftp::Response Open(Ftp::TransferMode Mode);
-
-    ////////////////////////////////////////////////////////////
-    // Send data on the data channel
-    ////////////////////////////////////////////////////////////
-    void Send(const std::vector<char>& Data);
-
-    ////////////////////////////////////////////////////////////
-    // Receive data on the data channel until it is closed
-    ////////////////////////////////////////////////////////////
-    void Receive(std::vector<char>& Data);
-
-private :
-
-    ////////////////////////////////////////////////////////////
-    // Member data
-    ////////////////////////////////////////////////////////////
-    Ftp&      myFtp;        ///< Reference to the owner Ftp instance
-    SocketTCP myDataSocket; ///< Socket used for data transfers
-};
-
-
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Ftp::Response::Response(Status Code, const std::string& Message) :
-myStatus (Code),
-myMessage(Message)
-{
-
-}
-
-
-////////////////////////////////////////////////////////////
-/// Convenience function to check if the response status code
-/// means a success
-////////////////////////////////////////////////////////////
-bool Ftp::Response::IsOk() const
-{
-    return myStatus < 400;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the response status code
-////////////////////////////////////////////////////////////
-Ftp::Response::Status Ftp::Response::GetStatus() const
-{
-    return myStatus;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the full message contained in the response
-////////////////////////////////////////////////////////////
-const std::string& Ftp::Response::GetMessage() const
-{
-    return myMessage;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Ftp::DirectoryResponse::DirectoryResponse(Ftp::Response Resp) :
-Ftp::Response(Resp)
-{
-    if (IsOk())
-    {
-        // Extract the directory from the server response
-        std::string::size_type Begin = Resp.GetMessage().find('"', 0);
-        std::string::size_type End   = Resp.GetMessage().find('"', Begin + 1);
-        myDirectory = Resp.GetMessage().substr(Begin + 1, End - Begin - 1);
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the directory returned in the response
-////////////////////////////////////////////////////////////
-const std::string& Ftp::DirectoryResponse::GetDirectory() const
-{
-    return myDirectory;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Ftp::ListingResponse::ListingResponse(Ftp::Response Resp, const std::vector<char>& Data) :
-Ftp::Response(Resp)
-{
-    if (IsOk())
-    {
-        // Fill the array of strings
-        std::string Paths(Data.begin(), Data.end());
-        std::string::size_type LastPos = 0;
-        for (std::string::size_type Pos = Paths.find("\r\n"); Pos != std::string::npos; Pos = Paths.find("\r\n", LastPos))
-        {
-            myFilenames.push_back(Paths.substr(LastPos, Pos - LastPos));
-            LastPos = Pos + 2;
-        }
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the number of filenames in the listing
-////////////////////////////////////////////////////////////
-std::size_t Ftp::ListingResponse::GetCount() const
-{
-    return myFilenames.size();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the Index-th filename in the directory
-////////////////////////////////////////////////////////////
-const std::string& Ftp::ListingResponse::GetFilename(std::size_t Index) const
-{
-    return myFilenames[Index];
-}
-
-
-////////////////////////////////////////////////////////////
-/// Destructor -- close the connection with the server
-////////////////////////////////////////////////////////////
-Ftp::~Ftp()
-{
-    Disconnect();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Connect to the specified FTP server
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Connect(const IPAddress& Server, unsigned short Port, float Timeout)
-{
-    // Connect to the server
-    if (myCommandSocket.Connect(Port, Server, Timeout) != Socket::Done)
-        return Response(Response::ConnectionFailed);
-
-    // Get the response to the connection
-    return GetResponse();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Log in using anonymous account
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Login()
-{
-    return Login("anonymous", "user@sfml-dev.org");
-}
-
-
-////////////////////////////////////////////////////////////
-/// Log in using a username and a password
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Login(const std::string& UserName, const std::string& Password)
-{
-    Response Resp = SendCommand("USER", UserName);
-    if (Resp.IsOk())
-        Resp = SendCommand("PASS", Password);
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Close the connection with FTP server
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Disconnect()
-{
-    // Send the exit command
-    Response Resp = SendCommand("QUIT");
-    if (Resp.IsOk())
-        myCommandSocket.Close();
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send a null command just to prevent from being disconnected
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::KeepAlive()
-{
-    return SendCommand("NOOP");
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the current working directory
-////////////////////////////////////////////////////////////
-Ftp::DirectoryResponse Ftp::GetWorkingDirectory()
-{
-    return DirectoryResponse(SendCommand("PWD"));
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the contents of the given directory
-/// (subdirectories and files)
-////////////////////////////////////////////////////////////
-Ftp::ListingResponse Ftp::GetDirectoryListing(const std::string& Directory)
-{
-    // Open a data channel on default port (20) using ASCII transfer mode
-    std::vector<char> DirData;
-    DataChannel Data(*this);
-    Response Resp = Data.Open(Ascii);
-    if (Resp.IsOk())
-    {
-        // Tell the server to send us the listing
-        Resp = SendCommand("NLST", Directory);
-        if (Resp.IsOk())
-        {
-            // Receive the listing
-            Data.Receive(DirData);
-
-            // Get the response from the server
-            Resp = GetResponse();
-        }
-    }
-
-    return ListingResponse(Resp, DirData);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Change the current working directory
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::ChangeDirectory(const std::string& Directory)
-{
-    return SendCommand("CWD", Directory);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Go to the parent directory of the current one
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::ParentDirectory()
-{
-    return SendCommand("CDUP");
-}
-
-
-////////////////////////////////////////////////////////////
-/// Create a new directory
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::MakeDirectory(const std::string& Name)
-{
-    return SendCommand("MKD", Name);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove an existing directory
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::DeleteDirectory(const std::string& Name)
-{
-    return SendCommand("RMD", Name);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Rename a file
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::RenameFile(const std::string& File, const std::string& NewName)
-{
-    Response Resp = SendCommand("RNFR", File);
-    if (Resp.IsOk())
-       Resp = SendCommand("RNTO", NewName);
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove an existing file
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::DeleteFile(const std::string& Name)
-{
-    return SendCommand("DELE", Name);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Download a file from the server
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Download(const std::string& DistantFile, const std::string& DestPath, TransferMode Mode)
-{
-    // Open a data channel using the given transfer mode
-    DataChannel Data(*this);
-    Response Resp = Data.Open(Mode);
-    if (Resp.IsOk())
-    {
-        // Tell the server to start the transfer
-        Resp = SendCommand("RETR", DistantFile);
-        if (Resp.IsOk())
-        {
-            // Receive the file data
-            std::vector<char> FileData;
-            Data.Receive(FileData);
-
-            // Get the response from the server
-            Resp = GetResponse();
-            if (Resp.IsOk())
-            {
-                // Extract the filename from the file path
-                std::string Filename = DistantFile;
-                std::string::size_type Pos = Filename.find_last_of("/\\");
-                if (Pos != std::string::npos)
-                    Filename = Filename.substr(Pos + 1);
-
-                // Make sure the destination path ends with a slash
-                std::string Path = DestPath;
-                if (!Path.empty() && (Path[Path.size() - 1] != '\\') && (Path[Path.size() - 1] != '/'))
-                    Path += "/";
-
-                // Create the file and copy the received data into it
-                std::ofstream File((Path + Filename).c_str(), std::ios_base::binary);
-                if (!File)
-                    return Response(Response::InvalidFile);
-                if (!FileData.empty())
-                    File.write(&FileData[0], static_cast<std::streamsize>(FileData.size()));
-            }
-        }
-    }
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Upload a file to the server
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::Upload(const std::string& LocalFile, const std::string& DestPath, TransferMode Mode)
-{
-    // Get the contents of the file to send
-    std::ifstream File(LocalFile.c_str(), std::ios_base::binary);
-    if (!File)
-        return Response(Response::InvalidFile);
-    File.seekg(0, std::ios::end);
-    std::size_t Length = File.tellg();
-    File.seekg(0, std::ios::beg);
-    std::vector<char> FileData(Length);
-    if (Length > 0)
-        File.read(&FileData[0], static_cast<std::streamsize>(Length));
-
-    // Extract the filename from the file path
-    std::string Filename = LocalFile;
-    std::string::size_type Pos = Filename.find_last_of("/\\");
-    if (Pos != std::string::npos)
-        Filename = Filename.substr(Pos + 1);
-
-    // Make sure the destination path ends with a slash
-    std::string Path = DestPath;
-    if (!Path.empty() && (Path[Path.size() - 1] != '\\') && (Path[Path.size() - 1] != '/'))
-        Path += "/";
-
-    // Open a data channel using the given transfer mode
-    DataChannel Data(*this);
-    Response Resp = Data.Open(Mode);
-    if (Resp.IsOk())
-    {
-        // Tell the server to start the transfer
-        Resp = SendCommand("STOR", Path + Filename);
-        if (Resp.IsOk())
-        {
-            // Send the file data
-            Data.Send(FileData);
-
-            // Get the response from the server
-            Resp = GetResponse();
-        }
-    }
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send a command to the FTP server
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::SendCommand(const std::string& Command, const std::string& Parameter)
-{
-    // Build the command string
-    std::string CommandStr;
-    if (Parameter != "")
-        CommandStr = Command + " " + Parameter + "\r\n";
-    else
-        CommandStr = Command + "\r\n";
-
-    // Send it to the server
-    if (myCommandSocket.Send(CommandStr.c_str(), CommandStr.length()) != sf::Socket::Done)
-        return Response(Response::ConnectionClosed);
-
-    // Get the response
-    return GetResponse();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive a response from the server
-/// (usually after a command has been sent)
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::GetResponse()
-{
-    // We'll use a variable to keep track of the last valid code.
-    // It is useful in case of multi-lines responses, because the end of such a response
-    // will start by the same code
-    unsigned int LastCode  = 0;
-    bool IsInsideMultiline = false;
-    std::string Message;
-
-    for (;;)
-    {
-        // Receive the response from the server
-        char Buffer[1024];
-        std::size_t Length;
-        if (myCommandSocket.Receive(Buffer, sizeof(Buffer), Length) != sf::Socket::Done)
-            return Response(Response::ConnectionClosed);
-
-        // There can be several lines inside the received buffer, extract them all
-        std::istringstream In(std::string(Buffer, Length), std::ios_base::binary);
-        while (In)
-        {
-            // Try to extract the code
-            unsigned int Code;
-            if (In >> Code)
-            {
-                // Extract the separator
-                char Sep = 0;
-                In.get(Sep);
-
-                // The '-' character means a multiline response
-                if ((Sep == '-') && !IsInsideMultiline)
-                {
-                    // Set the multiline flag
-                    IsInsideMultiline = true;
-
-                    // Keep track of the code
-                    if (LastCode == 0)
-                        LastCode = Code;
-
-                    // Extract the line
-                    std::getline(In, Message);
-
-                    // Remove the ending '\r' (all lines are terminated by "\r\n")
-                    Message.erase(Message.length() - 1);
-                    Message = Sep + Message + "\n";
-                }
-                else
-                {
-                    // We must make sure that the code is the same, otherwise it means
-                    // we haven't reached the end of the multiline response
-                    if ((Sep != '-') && ((Code == LastCode) || (LastCode == 0)))
-                    {
-                        // Clear the multiline flag
-                        IsInsideMultiline = false;
-
-                        // Extract the line
-                        std::string Line;
-                        std::getline(In, Line);
-
-                        // Remove the ending '\r' (all lines are terminated by "\r\n")
-                        Line.erase(Line.length() - 1);
-
-                        // Append it to the message
-                        if (Code == LastCode)
-                        {
-                            std::ostringstream Out;
-                            Out << Code << Sep << Line;
-                            Message += Out.str();
-                        }
-                        else
-                        {
-                            Message = Sep + Line;
-                        }
-
-                        // Return the response code and message
-                        return Response(static_cast<Response::Status>(Code), Message);
-                    }
-                    else
-                    {
-                        // The line we just read was actually not a response,
-                        // only a new part of the current multiline response
-
-                        // Extract the line
-                        std::string Line;
-                        std::getline(In, Line);
-
-                        if (!Line.empty())
-                        {
-                            // Remove the ending '\r' (all lines are terminated by "\r\n")
-                            Line.erase(Line.length() - 1);
-
-                            // Append it to the current message
-                            std::ostringstream Out;
-                            Out << Code << Sep << Line << "\n";
-                            Message += Out.str();
-                        }
-                    }
-                }
-            }
-            else if (LastCode != 0)
-            {
-                // It seems we are in the middle of a multiline response
-
-                // Clear the error bits of the stream
-                In.clear();
-
-                // Extract the line
-                std::string Line;
-                std::getline(In, Line);
-
-                if (!Line.empty())
-                {
-                    // Remove the ending '\r' (all lines are terminated by "\r\n")
-                    Line.erase(Line.length() - 1);
-
-                    // Append it to the current message
-                    Message += Line + "\n";
-                }
-            }
-            else
-            {
-                // Error : cannot extract the code, and we are not in a multiline response
-                return Response(Response::InvalidResponse);
-            }
-        }
-    }
-
-    // We never reach there
-}
-
-
-////////////////////////////////////////////////////////////
-/// Constructor
-////////////////////////////////////////////////////////////
-Ftp::DataChannel::DataChannel(Ftp& Owner) :
-myFtp(Owner)
-{
-
-}
-
-
-////////////////////////////////////////////////////////////
-/// Destructor
-////////////////////////////////////////////////////////////
-Ftp::DataChannel::~DataChannel()
-{
-    // Close the data socket
-    myDataSocket.Close();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Open the data channel using the specified mode and port
-////////////////////////////////////////////////////////////
-Ftp::Response Ftp::DataChannel::Open(Ftp::TransferMode Mode)
-{
-    // Open a data connection in active mode (we connect to the server)
-    Ftp::Response Resp = myFtp.SendCommand("PASV");
-    if (Resp.IsOk())
-    {
-        // Extract the connection address and port from the response
-        std::string::size_type begin = Resp.GetMessage().find_first_of("0123456789");
-        if (begin != std::string::npos)
-        {
-            sf::Uint8 Data[6] = {0, 0, 0, 0, 0, 0};
-            std::string Str = Resp.GetMessage().substr(begin);
-            std::size_t Index = 0;
-            for (int i = 0; i < 6; ++i)
-            {
-                // Extract the current number
-                while (isdigit(Str[Index]))
-                {
-                    Data[i] = Data[i] * 10 + (Str[Index] - '0');
-                    Index++;
-                }
-
-                // Skip separator
-                Index++;
-            }
-
-            // Reconstruct connection port and address
-            unsigned short Port = Data[4] * 256 + Data[5];
-            sf::IPAddress Address(static_cast<sf::Uint8>(Data[0]),
-                                  static_cast<sf::Uint8>(Data[1]),
-                                  static_cast<sf::Uint8>(Data[2]),
-                                  static_cast<sf::Uint8>(Data[3]));
-
-            // Connect the data channel to the server
-            if (myDataSocket.Connect(Port, Address) == Socket::Done)
-            {
-                // Translate the transfer mode to the corresponding FTP parameter
-                std::string ModeStr;
-                switch (Mode)
-                {
-                    case Ftp::Binary : ModeStr = "I"; break;
-                    case Ftp::Ascii :  ModeStr = "A"; break;
-                    case Ftp::Ebcdic : ModeStr = "E"; break;
-                }
-
-                // Set the transfer mode
-                Resp = myFtp.SendCommand("TYPE", ModeStr);
-            }
-            else
-            {
-                // Failed to connect to the server
-                Resp = Ftp::Response(Ftp::Response::ConnectionFailed);
-            }
-        }
-    }
-
-    return Resp;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive data on the data channel until it is closed
-////////////////////////////////////////////////////////////
-void Ftp::DataChannel::Receive(std::vector<char>& Data)
-{
-    // Receive data
-    Data.clear();
-    char Buffer[1024];
-    std::size_t Received;
-    while (myDataSocket.Receive(Buffer, sizeof(Buffer), Received) == sf::Socket::Done)
-    {
-        std::copy(Buffer, Buffer + Received, std::back_inserter(Data));
-    }
-
-    // Close the data socket
-    myDataSocket.Close();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send data on the data channel
-////////////////////////////////////////////////////////////
-void Ftp::DataChannel::Send(const std::vector<char>& Data)
-{
-    // Send data
-    if (!Data.empty())
-        myDataSocket.Send(&Data[0], Data.size());
-
-    // Close the data socket
-    myDataSocket.Close();
-}
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Http.cpp b/Externals/SFML/src/SFML/Network/Http.cpp
index e9bc403683..404a1ab259 100644
--- a/Externals/SFML/src/SFML/Network/Http.cpp
+++ b/Externals/SFML/src/SFML/Network/Http.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -26,7 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Http.hpp>
-#include <ctype.h>
+#include <cctype>
 #include <algorithm>
 #include <iterator>
 #include <sstream>
@@ -34,16 +34,12 @@
 
 namespace
 {
-    ////////////////////////////////////////////////////////////
-    // Convenience function to convert a string to lower case
-    ////////////////////////////////////////////////////////////
-    std::string ToLower(const std::string& Str)
+    // Convert a string to lower case
+    std::string toLower(std::string str)
     {
-        std::string Ret = Str;
-        for (std::string::iterator i = Ret.begin(); i != Ret.end(); ++i)
-            *i = static_cast<char>(tolower(*i));
-
-        return Ret;
+        for (std::string::iterator i = str.begin(); i != str.end(); ++i)
+            *i = static_cast<char>(std::tolower(*i));
+        return str;
     }
 }
 
@@ -51,382 +47,330 @@ namespace
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Http::Request::Request(Method RequestMethod, const std::string& URI, const std::string& Body)
+Http::Request::Request(const std::string& uri, Method method, const std::string& body)
 {
-    SetMethod(RequestMethod);
-    SetURI(URI);
-    SetHttpVersion(1, 0);
-    SetBody(Body);
+    setMethod(method);
+    setUri(uri);
+    setHttpVersion(1, 0);
+    setBody(body);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the value of a field; the field is added if it doesn't exist
-////////////////////////////////////////////////////////////
-void Http::Request::SetField(const std::string& Field, const std::string& Value)
+void Http::Request::setField(const std::string& field, const std::string& value)
 {
-    myFields[ToLower(Field)] = Value;
+    m_fields[toLower(field)] = value;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the request method.
-/// This parameter is Get by default
-////////////////////////////////////////////////////////////
-void Http::Request::SetMethod(Http::Request::Method RequestMethod)
+void Http::Request::setMethod(Http::Request::Method method)
 {
-    myMethod = RequestMethod;
+    m_method = method;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the target URI of the request.
-/// This parameter is "/" by default
-////////////////////////////////////////////////////////////
-void Http::Request::SetURI(const std::string& URI)
+void Http::Request::setUri(const std::string& uri)
 {
-    myURI = URI;
+    m_uri = uri;
 
     // Make sure it starts with a '/'
-    if (myURI.empty() || (myURI[0] != '/'))
-        myURI.insert(0, "/");
+    if (m_uri.empty() || (m_uri[0] != '/'))
+        m_uri.insert(0, "/");
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the HTTP version of the request.
-/// This parameter is 1.0 by default
-////////////////////////////////////////////////////////////
-void Http::Request::SetHttpVersion(unsigned int Major, unsigned int Minor)
+void Http::Request::setHttpVersion(unsigned int major, unsigned int minor)
 {
-    myMajorVersion = Major;
-    myMinorVersion = Minor;
+    m_majorVersion = major;
+    m_minorVersion = minor;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the body of the request. This parameter is optional and
-/// makes sense only for POST requests.
-/// This parameter is empty by default
-////////////////////////////////////////////////////////////
-void Http::Request::SetBody(const std::string& Body)
+void Http::Request::setBody(const std::string& body)
 {
-    myBody = Body;
+    m_body = body;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the string representation of a request header
-////////////////////////////////////////////////////////////
-std::string Http::Request::ToString() const
+std::string Http::Request::prepare() const
 {
-    std::ostringstream Out;
+    std::ostringstream out;
 
     // Convert the method to its string representation
-    std::string RequestMethod;
-    switch (myMethod)
+    std::string method;
+    switch (m_method)
     {
         default :
-        case Get :  RequestMethod = "GET";  break;
-        case Post : RequestMethod = "POST"; break;
-        case Head : RequestMethod = "HEAD"; break;
+        case Get :  method = "GET";  break;
+        case Post : method = "POST"; break;
+        case Head : method = "HEAD"; break;
     }
 
     // Write the first line containing the request type
-    Out << RequestMethod << " " << myURI << " ";
-    Out << "HTTP/" << myMajorVersion << "." << myMinorVersion << "\r\n";
+    out << method << " " << m_uri << " ";
+    out << "HTTP/" << m_majorVersion << "." << m_minorVersion << "\r\n";
 
     // Write fields
-    for (FieldTable::const_iterator i = myFields.begin(); i != myFields.end(); ++i)
+    for (FieldTable::const_iterator i = m_fields.begin(); i != m_fields.end(); ++i)
     {
-        Out << i->first << ": " << i->second << "\r\n";
+        out << i->first << ": " << i->second << "\r\n";
     }
 
     // Use an extra \r\n to separate the header from the body
-    Out << "\r\n";
+    out << "\r\n";
 
     // Add the body
-    Out << myBody;
+    out << m_body;
 
-    return Out.str();
+    return out.str();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Check if the given field has been defined
-////////////////////////////////////////////////////////////
-bool Http::Request::HasField(const std::string& Field) const
+bool Http::Request::hasField(const std::string& field) const
 {
-    return myFields.find(Field) != myFields.end();
+    return m_fields.find(toLower(field)) != m_fields.end();
 }
 
 
-////////////////////////////////////////////////////////////
-/// Default constructor
 ////////////////////////////////////////////////////////////
 Http::Response::Response() :
-myStatus      (ConnectionFailed),
-myMajorVersion(0),
-myMinorVersion(0)
+m_status      (ConnectionFailed),
+m_majorVersion(0),
+m_minorVersion(0)
 {
 
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the value of a field
-////////////////////////////////////////////////////////////
-const std::string& Http::Response::GetField(const std::string& Field) const
+const std::string& Http::Response::getField(const std::string& field) const
 {
-    FieldTable::const_iterator It = myFields.find(ToLower(Field));
-    if (It != myFields.end())
+    FieldTable::const_iterator it = m_fields.find(toLower(field));
+    if (it != m_fields.end())
     {
-        return It->second;
+        return it->second;
     }
     else
     {
-        static const std::string Empty = "";
-        return Empty;
+        static const std::string empty = "";
+        return empty;
     }
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the header's status code
-////////////////////////////////////////////////////////////
-Http::Response::Status Http::Response::GetStatus() const
+Http::Response::Status Http::Response::getStatus() const
 {
-    return myStatus;
+    return m_status;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the major HTTP version number of the response
-////////////////////////////////////////////////////////////
-unsigned int Http::Response::GetMajorHttpVersion() const
+unsigned int Http::Response::getMajorHttpVersion() const
 {
-    return myMajorVersion;
+    return m_majorVersion;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the major HTTP version number of the response
-////////////////////////////////////////////////////////////
-unsigned int Http::Response::GetMinorHttpVersion() const
+unsigned int Http::Response::getMinorHttpVersion() const
 {
-    return myMinorVersion;
+    return m_minorVersion;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the body of the response. The body can contain :
-/// - the requested page (for GET requests)
-/// - a response from the server (for POST requests)
-/// - nothing (for HEAD requests)
-/// - an error message (in case of an error)
-////////////////////////////////////////////////////////////
-const std::string& Http::Response::GetBody() const
+const std::string& Http::Response::getBody() const
 {
-    return myBody;
+    return m_body;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the header from a response string
-////////////////////////////////////////////////////////////
-void Http::Response::FromString(const std::string& Data)
+void Http::Response::parse(const std::string& data)
 {
-    std::istringstream In(Data);
+    std::istringstream in(data);
 
     // Extract the HTTP version from the first line
-    std::string Version;
-    if (In >> Version)
+    std::string version;
+    if (in >> version)
     {
-        if ((Version.size() >= 8) && (Version[6] == '.') &&
-            (ToLower(Version.substr(0, 5)) == "http/")   &&
-             isdigit(Version[5]) && isdigit(Version[7]))
+        if ((version.size() >= 8) && (version[6] == '.') &&
+            (toLower(version.substr(0, 5)) == "http/")   &&
+             isdigit(version[5]) && isdigit(version[7]))
         {
-            myMajorVersion = Version[5] - '0';
-            myMinorVersion = Version[7] - '0';
+            m_majorVersion = version[5] - '0';
+            m_minorVersion = version[7] - '0';
         }
         else
         {
             // Invalid HTTP version
-            myStatus = InvalidResponse;
+            m_status = InvalidResponse;
             return;
         }
     }
 
     // Extract the status code from the first line
-    int StatusCode = 0;
-    if (In >> StatusCode)
+    int status;
+    if (in >> status)
     {
-        myStatus = static_cast<Status>(StatusCode);
+        m_status = static_cast<Status>(status);
     }
     else
     {
         // Invalid status code
-        myStatus = InvalidResponse;
+        m_status = InvalidResponse;
         return;
     }
 
     // Ignore the end of the first line
-    In.ignore(10000, '\n');
+    in.ignore(10000, '\n');
 
     // Parse the other lines, which contain fields, one by one
-    std::string Line;
-    while (std::getline(In, Line) && (Line.size() > 2))
+    std::string line;
+    while (std::getline(in, line) && (line.size() > 2))
     {
-        std::string::size_type Pos = Line.find(": ");
-        if (Pos != std::string::npos)
+        std::string::size_type pos = line.find(": ");
+        if (pos != std::string::npos)
         {
             // Extract the field name and its value
-            std::string Field = Line.substr(0, Pos);
-            std::string Value = Line.substr(Pos + 2);
+            std::string field = line.substr(0, pos);
+            std::string value = line.substr(pos + 2);
 
             // Remove any trailing \r
-            if (!Value.empty() && (*Value.rbegin() == '\r'))
-                Value.erase(Value.size() - 1);
+            if (!value.empty() && (*value.rbegin() == '\r'))
+                value.erase(value.size() - 1);
 
             // Add the field
-            myFields[ToLower(Field)] = Value;
+            m_fields[toLower(field)] = value;
         }
     }
 
     // Finally extract the body
-    myBody.clear();
-    std::copy(std::istreambuf_iterator<char>(In), std::istreambuf_iterator<char>(), std::back_inserter(myBody));
+    m_body.clear();
+    std::copy(std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>(), std::back_inserter(m_body));
 }
 
 
-////////////////////////////////////////////////////////////
-/// Default constructor
 ////////////////////////////////////////////////////////////
 Http::Http() :
-myHost(),
-myPort(0)
+m_host(),
+m_port(0)
 {
 
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the Http instance with the target host
-////////////////////////////////////////////////////////////
-Http::Http(const std::string& Host, unsigned short Port)
+Http::Http(const std::string& host, unsigned short port)
 {
-    SetHost(Host, Port);
+    setHost(host, port);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Set the target host
-////////////////////////////////////////////////////////////
-void Http::SetHost(const std::string& Host, unsigned short Port)
+void Http::setHost(const std::string& host, unsigned short port)
 {
     // Detect the protocol used
-    std::string Protocol = ToLower(Host.substr(0, 8));
-    if (Protocol.substr(0, 7) == "http://")
+    std::string protocol = toLower(host.substr(0, 8));
+    if (protocol.substr(0, 7) == "http://")
     {
         // HTTP protocol
-        myHostName = Host.substr(7);
-        myPort     = (Port != 0 ? Port : 80);
+        m_hostName = host.substr(7);
+        m_port     = (port != 0 ? port : 80);
     }
-    else if (Protocol == "https://")
+    else if (protocol == "https://")
     {
         // HTTPS protocol
-        myHostName = Host.substr(8);
-        myPort     = (Port != 0 ? Port : 443);
+        m_hostName = host.substr(8);
+        m_port     = (port != 0 ? port : 443);
     }
     else
     {
         // Undefined protocol - use HTTP
-        myHostName = Host;
-        myPort     = (Port != 0 ? Port : 80);
+        m_hostName = host;
+        m_port     = (port != 0 ? port : 80);
     }
 
     // Remove any trailing '/' from the host name
-    if (!myHostName.empty() && (*myHostName.rbegin() == '/'))
-        myHostName.erase(myHostName.size() - 1);
+    if (!m_hostName.empty() && (*m_hostName.rbegin() == '/'))
+        m_hostName.erase(m_hostName.size() - 1);
 
-    myHost = sf::IPAddress(myHostName);
+    m_host = IpAddress(m_hostName);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Send a HTTP request and return the server's response.
-/// You must be connected to a host before sending requests.
-/// Any missing mandatory header field will be added with an appropriate value.
-/// Warning : this function waits for the server's response and may
-/// not return instantly; use a thread if you don't want to block your
-/// application.
-////////////////////////////////////////////////////////////
-Http::Response Http::SendRequest(const Http::Request& Req, float Timeout)
+Http::Response Http::sendRequest(const Http::Request& request, Time timeout)
 {
-    // First make sure the request is valid -- add missing mandatory fields
-    Request ToSend(Req);
-    if (!ToSend.HasField("From"))
+    // First make sure that the request is valid -- add missing mandatory fields
+    Request toSend(request);
+    if (!toSend.hasField("From"))
     {
-        ToSend.SetField("From", "user@sfml-dev.org");
+        toSend.setField("From", "user@sfml-dev.org");
     }
-    if (!ToSend.HasField("User-Agent"))
+    if (!toSend.hasField("User-Agent"))
     {
-        ToSend.SetField("User-Agent", "libsfml-network/1.x");
+        toSend.setField("User-Agent", "libsfml-network/2.x");
     }
-    if (!ToSend.HasField("Host"))
+    if (!toSend.hasField("Host"))
     {
-        ToSend.SetField("Host", myHostName);
+        toSend.setField("Host", m_hostName);
     }
-    if (!ToSend.HasField("Content-Length"))
+    if (!toSend.hasField("Content-Length"))
     {
-        std::ostringstream Out;
-        Out << ToSend.myBody.size();
-        ToSend.SetField("Content-Length", Out.str());
+        std::ostringstream out;
+        out << toSend.m_body.size();
+        toSend.setField("Content-Length", out.str());
     }
-    if ((ToSend.myMethod == Request::Post) && !ToSend.HasField("Content-Type"))
+    if ((toSend.m_method == Request::Post) && !toSend.hasField("Content-Type"))
     {
-        ToSend.SetField("Content-Type", "application/x-www-form-urlencoded");
+        toSend.setField("Content-Type", "application/x-www-form-urlencoded");
     }
-    if ((ToSend.myMajorVersion * 10 + ToSend.myMinorVersion >= 11) && !ToSend.HasField("Connection"))
+    if ((toSend.m_majorVersion * 10 + toSend.m_minorVersion >= 11) && !toSend.hasField("Connection"))
     {
-        ToSend.SetField("Connection", "close");
+        toSend.setField("Connection", "close");
     }
 
     // Prepare the response
-    Response Received;
+    Response received;
 
     // Connect the socket to the host
-    if (myConnection.Connect(myPort, myHost, Timeout) == Socket::Done)
+    if (m_connection.connect(m_host, m_port, timeout) == Socket::Done)
     {
         // Convert the request to string and send it through the connected socket
-        std::string RequestStr = ToSend.ToString();
+        std::string requestStr = toSend.prepare();
 
-        if (!RequestStr.empty())
+        if (!requestStr.empty())
         {
             // Send it through the socket
-            if (myConnection.Send(RequestStr.c_str(), RequestStr.size()) == sf::Socket::Done)
+            if (m_connection.send(requestStr.c_str(), requestStr.size()) == Socket::Done)
             {
                 // Wait for the server's response
-                std::string ReceivedStr;
-                std::size_t Size = 0;
-                char Buffer[1024];
-                while (myConnection.Receive(Buffer, sizeof(Buffer), Size) == sf::Socket::Done)
+                std::string receivedStr;
+                std::size_t size = 0;
+                char buffer[1024];
+                while (m_connection.receive(buffer, sizeof(buffer), size) == Socket::Done)
                 {
-                    ReceivedStr.append(Buffer, Buffer + Size);
+                    receivedStr.append(buffer, buffer + size);
                 }
 
                 // Build the Response object from the received data
-                Received.FromString(ReceivedStr);
+                received.parse(receivedStr);
             }
         }
 
         // Close the connection
-        myConnection.Close();
+        m_connection.disconnect();
     }
 
-    return Received;
+    return received;
 }
 
 } // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/IPAddress.cpp b/Externals/SFML/src/SFML/Network/IPAddress.cpp
index 18bf3dd967..def36b1933 100644
--- a/Externals/SFML/src/SFML/Network/IPAddress.cpp
+++ b/Externals/SFML/src/SFML/Network/IPAddress.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -27,272 +27,229 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/IPAddress.hpp>
 #include <SFML/Network/Http.hpp>
-#include <SFML/Network/SocketHelper.hpp>
-#include <string.h>
+#include <SFML/Network/SocketImpl.hpp>
+#include <cstring>
+
+
+namespace
+{
+    sf::Uint32 resolve(const std::string& address)
+    {
+        if (address == "255.255.255.255")
+        {
+            // The broadcast address needs to be handled explicitely,
+            // because it is also the value returned by inet_addr on error
+            return INADDR_BROADCAST;
+        }
+        else
+        {
+            // Try to convert the address as a byte representation ("xxx.xxx.xxx.xxx")
+            sf::Uint32 ip = inet_addr(address.c_str());
+            if (ip != INADDR_NONE)
+                return ip;
+
+            // Not a valid address, try to convert it as a host name
+            addrinfo hints;
+            std::memset(&hints, 0, sizeof(hints));
+            hints.ai_family = AF_INET;
+            addrinfo* result = NULL;
+            if (getaddrinfo(address.c_str(), NULL, &hints, &result) == 0)
+            {
+                if (result)
+                {
+                    ip = reinterpret_cast<sockaddr_in*>(result->ai_addr)->sin_addr.s_addr;
+                    freeaddrinfo(result);
+                    return ip;
+                }
+            }
+
+            // Not a valid address nor a host name
+            return 0;
+        }
+    }
+}
 
 
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// Static member data
-////////////////////////////////////////////////////////////
-const IPAddress IPAddress::LocalHost("127.0.0.1");
+const IpAddress IpAddress::None;
+const IpAddress IpAddress::LocalHost(127, 0, 0, 1);
+const IpAddress IpAddress::Broadcast(255, 255, 255, 255);
 
 
 ////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-IPAddress::IPAddress() :
-myAddress(INADDR_NONE)
+IpAddress::IpAddress() :
+m_address(0)
 {
-
+    // We're using 0 (INADDR_ANY) instead of INADDR_NONE to represent the invalid address,
+    // because the latter is also the broadcast address (255.255.255.255); it's ok because
+    // SFML doesn't publicly use INADDR_ANY (it is always used implicitely)
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the address from a string
-////////////////////////////////////////////////////////////
-IPAddress::IPAddress(const std::string& Address)
+IpAddress::IpAddress(const std::string& address) :
+m_address(resolve(address))
 {
-    // First try to convert it as a byte representation ("xxx.xxx.xxx.xxx")
-    myAddress = inet_addr(Address.c_str());
-
-    // If not successful, try to convert it as a host name
-    if (!IsValid())
-    {
-        hostent* Host = gethostbyname(Address.c_str());
-        if (Host)
-        {
-            // Host found, extract its IP address
-            myAddress = reinterpret_cast<in_addr*>(Host->h_addr)->s_addr;
-        }
-        else
-        {
-            // Host name not found on the network
-            myAddress = INADDR_NONE;
-        }
-    }
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the address from a C-style string ;
-/// Needed for implicit conversions from literal strings to IPAddress to work
-////////////////////////////////////////////////////////////
-IPAddress::IPAddress(const char* Address)
+IpAddress::IpAddress(const char* address) :
+m_address(resolve(address))
 {
-    // First try to convert it as a byte representation ("xxx.xxx.xxx.xxx")
-    myAddress = inet_addr(Address);
-
-    // If not successful, try to convert it as a host name
-    if (!IsValid())
-    {
-        hostent* Host = gethostbyname(Address);
-        if (Host)
-        {
-            // Host found, extract its IP address
-            myAddress = reinterpret_cast<in_addr*>(Host->h_addr)->s_addr;
-        }
-        else
-        {
-            // Host name not found on the network
-            myAddress = INADDR_NONE;
-        }
-    }
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the address from 4 bytes
-////////////////////////////////////////////////////////////
-IPAddress::IPAddress(Uint8 Byte0, Uint8 Byte1, Uint8 Byte2, Uint8 Byte3)
+IpAddress::IpAddress(Uint8 byte0, Uint8 byte1, Uint8 byte2, Uint8 byte3) :
+m_address(htonl((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3))
 {
-    myAddress = htonl((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Construct the address from a 32-bits integer
-////////////////////////////////////////////////////////////
-IPAddress::IPAddress(Uint32 Address)
+IpAddress::IpAddress(Uint32 address) :
+m_address(htonl(address))
 {
-    myAddress = htonl(Address);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Tell if the address is a valid one
-////////////////////////////////////////////////////////////
-bool IPAddress::IsValid() const
+std::string IpAddress::toString() const
 {
-    return myAddress != INADDR_NONE;
+    in_addr address;
+    address.s_addr = m_address;
+
+    return inet_ntoa(address);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get a string representation of the address
-////////////////////////////////////////////////////////////
-std::string IPAddress::ToString() const
+Uint32 IpAddress::toInteger() const
 {
-    in_addr InAddr;
-    InAddr.s_addr = myAddress;
-
-    return inet_ntoa(InAddr);
+    return ntohl(m_address);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get an integer representation of the address
-////////////////////////////////////////////////////////////
-Uint32 IPAddress::ToInteger() const
-{
-    return ntohl(myAddress);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the computer's local IP address (from the LAN point of view)
-////////////////////////////////////////////////////////////
-IPAddress IPAddress::GetLocalAddress()
+IpAddress IpAddress::getLocalAddress()
 {
     // The method here is to connect a UDP socket to anyone (here to localhost),
     // and get the local socket address with the getsockname function.
     // UDP connection will not send anything to the network, so this function won't cause any overhead.
 
-    IPAddress LocalAddress;
+    IpAddress localAddress;
 
     // Create the socket
-    SocketHelper::SocketType Socket = socket(PF_INET, SOCK_DGRAM, 0);
-    if (Socket == SocketHelper::InvalidSocket())
-        return LocalAddress;
+    SocketHandle sock = socket(PF_INET, SOCK_DGRAM, 0);
+    if (sock == priv::SocketImpl::invalidSocket())
+        return localAddress;
 
-    // Build the host address (use a random port)
-    sockaddr_in SockAddr;
-    memset(SockAddr.sin_zero, 0, sizeof(SockAddr.sin_zero));
-    SockAddr.sin_addr.s_addr = INADDR_LOOPBACK;
-    SockAddr.sin_family      = AF_INET;
-    SockAddr.sin_port        = htons(4567);
-
-    // Connect the socket
-    if (connect(Socket, reinterpret_cast<sockaddr*>(&SockAddr), sizeof(SockAddr)) == -1)
+    // Connect the socket to localhost on any port
+    sockaddr_in address = priv::SocketImpl::createAddress(ntohl(INADDR_LOOPBACK), 0);
+    if (connect(sock, reinterpret_cast<sockaddr*>(&address), sizeof(address)) == -1)
     {
-        SocketHelper::Close(Socket);
-        return LocalAddress;
+        priv::SocketImpl::close(sock);
+        return localAddress;
     }
- 
+
     // Get the local address of the socket connection
-    SocketHelper::LengthType Size = sizeof(SockAddr);
-    if (getsockname(Socket, reinterpret_cast<sockaddr*>(&SockAddr), &Size) == -1)
+    priv::SocketImpl::AddrLength size = sizeof(address);
+    if (getsockname(sock, reinterpret_cast<sockaddr*>(&address), &size) == -1)
     {
-        SocketHelper::Close(Socket);
-        return LocalAddress;
+        priv::SocketImpl::close(sock);
+        return localAddress;
     }
 
     // Close the socket
-    SocketHelper::Close(Socket);
+    priv::SocketImpl::close(sock);
 
     // Finally build the IP address
-    LocalAddress.myAddress = SockAddr.sin_addr.s_addr;
+    localAddress = IpAddress(ntohl(address.sin_addr.s_addr));
 
-    return LocalAddress;
+    return localAddress;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the computer's public IP address (from the web point of view)
-////////////////////////////////////////////////////////////
-IPAddress IPAddress::GetPublicAddress(float Timeout)
+IpAddress IpAddress::getPublicAddress(Time timeout)
 {
     // The trick here is more complicated, because the only way
     // to get our public IP address is to get it from a distant computer.
     // Here we get the web page from http://www.sfml-dev.org/ip-provider.php
     // and parse the result to extract our IP address
-    // (not very hard : the web page contains only our IP address).
+    // (not very hard: the web page contains only our IP address).
 
-    Http Server("www.sfml-dev.org");
-    Http::Request Request(Http::Request::Get, "/ip-provider.php");
-    Http::Response Page = Server.SendRequest(Request, Timeout);
-    if (Page.GetStatus() == Http::Response::Ok)
-        return IPAddress(Page.GetBody());
+    Http server("www.sfml-dev.org");
+    Http::Request request("/ip-provider.php", Http::Request::Get);
+    Http::Response page = server.sendRequest(request, timeout);
+    if (page.getStatus() == Http::Response::Ok)
+        return IpAddress(page.getBody());
 
     // Something failed: return an invalid address
-    return IPAddress();
+    return IpAddress();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator ==
-////////////////////////////////////////////////////////////
-bool IPAddress::operator ==(const IPAddress& Other) const
+bool operator ==(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress == Other.myAddress;
+    return left.toInteger() == right.toInteger();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator !=
-////////////////////////////////////////////////////////////
-bool IPAddress::operator !=(const IPAddress& Other) const
+bool operator !=(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress != Other.myAddress;
+    return !(left == right);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator <
-////////////////////////////////////////////////////////////
-bool IPAddress::operator <(const IPAddress& Other) const
+bool operator <(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress < Other.myAddress;
+    return left.toInteger() < right.toInteger();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator >
-////////////////////////////////////////////////////////////
-bool IPAddress::operator >(const IPAddress& Other) const
+bool operator >(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress > Other.myAddress;
+    return right < left;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator <=
-////////////////////////////////////////////////////////////
-bool IPAddress::operator <=(const IPAddress& Other) const
+bool operator <=(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress <= Other.myAddress;
+    return !(right < left);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Comparison operator >=
-////////////////////////////////////////////////////////////
-bool IPAddress::operator >=(const IPAddress& Other) const
+bool operator >=(const IpAddress& left, const IpAddress& right)
 {
-    return myAddress >= Other.myAddress;
+    return !(left < right);
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Operator >> overload to extract an address from an input stream
-////////////////////////////////////////////////////////////
-std::istream& operator >>(std::istream& Stream, IPAddress& Address)
+std::istream& operator >>(std::istream& stream, IpAddress& address)
 {
-    std::string Str;
-    Stream >> Str;
-    Address = IPAddress(Str);
+    std::string str;
+    stream >> str;
+    address = IpAddress(str);
 
-    return Stream;
+    return stream;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Operator << overload to print an address to an output stream
-////////////////////////////////////////////////////////////
-std::ostream& operator <<(std::ostream& Stream, const IPAddress& Address)
+std::ostream& operator <<(std::ostream& stream, const IpAddress& address)
 {
-    return Stream << Address.ToString();
+    return stream << address.toString();
 }
 
 } // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Packet.cpp b/Externals/SFML/src/SFML/Network/Packet.cpp
index 61edec100c..b4af9dccc5 100644
--- a/Externals/SFML/src/SFML/Network/Packet.cpp
+++ b/Externals/SFML/src/SFML/Network/Packet.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -26,25 +26,23 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Packet.hpp>
-#include <SFML/Network/SocketHelper.hpp>
-#include <string.h>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/String.hpp>
+#include <cstring>
+#include <cwchar>
 
 
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
 Packet::Packet() :
-myReadPos(0),
-myIsValid(true)
+m_readPos(0),
+m_isValid(true)
 {
 
 }
 
 
-////////////////////////////////////////////////////////////
-/// Virtual destructor
 ////////////////////////////////////////////////////////////
 Packet::~Packet()
 {
@@ -53,230 +51,250 @@ Packet::~Packet()
 
 
 ////////////////////////////////////////////////////////////
-/// Append data to the end of the packet
-////////////////////////////////////////////////////////////
-void Packet::Append(const void* Data, std::size_t SizeInBytes)
+void Packet::append(const void* data, std::size_t sizeInBytes)
 {
-    if (Data && (SizeInBytes > 0))
+    if (data && (sizeInBytes > 0))
     {
-        std::size_t Start = myData.size();
-        myData.resize(Start + SizeInBytes);
-        memcpy(&myData[Start], Data, SizeInBytes);
+        std::size_t start = m_data.size();
+        m_data.resize(start + sizeInBytes);
+        std::memcpy(&m_data[start], data, sizeInBytes);
     }
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Clear the packet data
-////////////////////////////////////////////////////////////
-void Packet::Clear()
+void Packet::clear()
 {
-    myData.clear();
-    myReadPos = 0;
-    myIsValid = true;
+    m_data.clear();
+    m_readPos = 0;
+    m_isValid = true;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get a pointer to the data contained in the packet
-/// Warning : the returned pointer may be invalid after you
-/// append data to the packet
-////////////////////////////////////////////////////////////
-const char* Packet::GetData() const
+const void* Packet::getData() const
 {
-    return !myData.empty() ? &myData[0] : NULL;
+    return !m_data.empty() ? &m_data[0] : NULL;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Get the size of the data contained in the packet
-////////////////////////////////////////////////////////////
-std::size_t Packet::GetDataSize() const
+std::size_t Packet::getDataSize() const
 {
-    return myData.size();
+    return m_data.size();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Tell if the reading position has reached the end of the packet
-////////////////////////////////////////////////////////////
-bool Packet::EndOfPacket() const
+bool Packet::endOfPacket() const
 {
-    return myReadPos >= myData.size();
+    return m_readPos >= m_data.size();
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Tell if the packet is valid for reading
-////////////////////////////////////////////////////////////
-Packet::operator bool() const
+Packet::operator BoolType() const
 {
-    return myIsValid;
+    return m_isValid ? &Packet::checkSize : NULL;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Operator >> overloads to extract data from the packet
-////////////////////////////////////////////////////////////
-Packet& Packet::operator >>(bool& Data)
+Packet& Packet::operator >>(bool& data)
 {
-    Uint8 Value;
-    if (*this >> Value)
-        Data = (Value != 0);
+    Uint8 value;
+    if (*this >> value)
+        data = (value != 0);
 
     return *this;
 }
-Packet& Packet::operator >>(Int8& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Int8& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = *reinterpret_cast<const Int8*>(GetData() + myReadPos);
-        myReadPos += sizeof(Data);
+        data = *reinterpret_cast<const Int8*>(&m_data[m_readPos]);
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(Uint8& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Uint8& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = *reinterpret_cast<const Uint8*>(GetData() + myReadPos);
-        myReadPos += sizeof(Data);
+        data = *reinterpret_cast<const Uint8*>(&m_data[m_readPos]);
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(Int16& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Int16& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = ntohs(*reinterpret_cast<const Int16*>(GetData() + myReadPos));
-        myReadPos += sizeof(Data);
+        data = ntohs(*reinterpret_cast<const Int16*>(&m_data[m_readPos]));
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(Uint16& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Uint16& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = ntohs(*reinterpret_cast<const Uint16*>(GetData() + myReadPos));
-        myReadPos += sizeof(Data);
+        data = ntohs(*reinterpret_cast<const Uint16*>(&m_data[m_readPos]));
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(Int32& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Int32& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = ntohl(*reinterpret_cast<const Int32*>(GetData() + myReadPos));
-        myReadPos += sizeof(Data);
+        data = ntohl(*reinterpret_cast<const Int32*>(&m_data[m_readPos]));
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(Uint32& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(Uint32& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = ntohl(*reinterpret_cast<const Uint32*>(GetData() + myReadPos));
-        myReadPos += sizeof(Data);
+        data = ntohl(*reinterpret_cast<const Uint32*>(&m_data[m_readPos]));
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(float& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(float& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = *reinterpret_cast<const float*>(GetData() + myReadPos);
-        myReadPos += sizeof(Data);
+        data = *reinterpret_cast<const float*>(&m_data[m_readPos]);
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(double& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(double& data)
 {
-    if (CheckSize(sizeof(Data)))
+    if (checkSize(sizeof(data)))
     {
-        Data = *reinterpret_cast<const double*>(GetData() + myReadPos);
-        myReadPos += sizeof(Data);
+        data = *reinterpret_cast<const double*>(&m_data[m_readPos]);
+        m_readPos += sizeof(data);
     }
 
     return *this;
 }
-Packet& Packet::operator >>(char* Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(char* data)
 {
     // First extract string length
-    Uint32 Length = 0;
-    *this >> Length;
+    Uint32 length = 0;
+    *this >> length;
 
-    if ((Length > 0) && CheckSize(Length))
+    if ((length > 0) && checkSize(length))
     {
         // Then extract characters
-        memcpy(Data, GetData() + myReadPos, Length);
-        Data[Length] = '\0';
+        std::memcpy(data, &m_data[m_readPos], length);
+        data[length] = '\0';
 
         // Update reading position
-        myReadPos += Length;
+        m_readPos += length;
     }
 
     return *this;
 }
-Packet& Packet::operator >>(std::string& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(std::string& data)
 {
     // First extract string length
-    Uint32 Length = 0;
-    *this >> Length;
+    Uint32 length = 0;
+    *this >> length;
 
-    Data.clear();
-    if ((Length > 0) && CheckSize(Length))
+    data.clear();
+    if ((length > 0) && checkSize(length))
     {
         // Then extract characters
-        Data.assign(GetData() + myReadPos, Length);
+        data.assign(&m_data[m_readPos], length);
 
         // Update reading position
-        myReadPos += Length;
+        m_readPos += length;
     }
 
     return *this;
 }
-Packet& Packet::operator >>(wchar_t* Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(wchar_t* data)
 {
     // First extract string length
-    Uint32 Length = 0;
-    *this >> Length;
+    Uint32 length = 0;
+    *this >> length;
 
-    if ((Length > 0) && CheckSize(Length * sizeof(Int32)))
+    if ((length > 0) && checkSize(length * sizeof(Uint32)))
     {
         // Then extract characters
-        for (Uint32 i = 0; i < Length; ++i)
+        for (Uint32 i = 0; i < length; ++i)
         {
-            Uint32 c = 0;
-            *this >> c;
-            Data[i] = static_cast<wchar_t>(c);
+            Uint32 character = 0;
+            *this >> character;
+            data[i] = static_cast<wchar_t>(character);
         }
-        Data[Length] = L'\0';
+        data[length] = L'\0';
     }
 
     return *this;
 }
-Packet& Packet::operator >>(std::wstring& Data)
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator >>(std::wstring& data)
 {
     // First extract string length
-    Uint32 Length = 0;
-    *this >> Length;
+    Uint32 length = 0;
+    *this >> length;
 
-    Data.clear();
-    if ((Length > 0) && CheckSize(Length * sizeof(Int32)))
+    data.clear();
+    if ((length > 0) && checkSize(length * sizeof(Uint32)))
     {
         // Then extract characters
-        for (Uint32 i = 0; i < Length; ++i)
+        for (Uint32 i = 0; i < length; ++i)
         {
-            Uint32 c = 0;
-            *this >> c;
-            Data += static_cast<wchar_t>(c);
+            Uint32 character = 0;
+            *this >> character;
+            data += static_cast<wchar_t>(character);
         }
     }
 
@@ -285,109 +303,22 @@ Packet& Packet::operator >>(std::wstring& Data)
 
 
 ////////////////////////////////////////////////////////////
-/// Operator << overloads to put data into the packet
-////////////////////////////////////////////////////////////
-Packet& Packet::operator <<(bool Data)
+Packet& Packet::operator >>(String& data)
 {
-    *this << static_cast<Uint8>(Data);
-    return *this;
-}
-Packet& Packet::operator <<(Int8 Data)
-{
-    Append(&Data, sizeof(Data));
-    return *this;
-}
-Packet& Packet::operator <<(Uint8 Data)
-{
-    Append(&Data, sizeof(Data));
-    return *this;
-}
-Packet& Packet::operator <<(Int16 Data)
-{
-    Int16 ToWrite = htons(Data);
-    Append(&ToWrite, sizeof(ToWrite));
-    return *this;
-}
-Packet& Packet::operator <<(Uint16 Data)
-{
-    Uint16 ToWrite = htons(Data);
-    Append(&ToWrite, sizeof(ToWrite));
-    return *this;
-}
-Packet& Packet::operator <<(Int32 Data)
-{
-    Int32 ToWrite = htonl(Data);
-    Append(&ToWrite, sizeof(ToWrite));
-    return *this;
-}
-Packet& Packet::operator <<(Uint32 Data)
-{
-    Uint32 ToWrite = htonl(Data);
-    Append(&ToWrite, sizeof(ToWrite));
-    return *this;
-}
-Packet& Packet::operator <<(float Data)
-{
-    Append(&Data, sizeof(Data));
-    return *this;
-}
-Packet& Packet::operator <<(double Data)
-{
-    Append(&Data, sizeof(Data));
-    return *this;
-}
-Packet& Packet::operator <<(const char* Data)
-{
-    // First insert string length
-    Uint32 Length = 0;
-    for (const char* c = Data; *c != '\0'; ++c)
-        ++Length;
-    *this << Length;
+    // First extract the string length
+    Uint32 length = 0;
+    *this >> length;
 
-    // Then insert characters
-    Append(Data, Length * sizeof(char));
-
-    return *this;
-}
-Packet& Packet::operator <<(const std::string& Data)
-{
-    // First insert string length
-    Uint32 Length = static_cast<Uint32>(Data.size());
-    *this << Length;
-
-    // Then insert characters
-    if (Length > 0)
+    data.clear();
+    if ((length > 0) && checkSize(length * sizeof(Uint32)))
     {
-        Append(Data.c_str(), Length * sizeof(std::string::value_type));
-    }
-
-    return *this;
-}
-Packet& Packet::operator <<(const wchar_t* Data)
-{
-    // First insert string length
-    Uint32 Length = 0;
-    for (const wchar_t* c = Data; *c != L'\0'; ++c)
-        ++Length;
-    *this << Length;
-
-    // Then insert characters
-    for (const wchar_t* c = Data; *c != L'\0'; ++c)
-        *this << static_cast<Int32>(*c);
-
-    return *this;
-}
-Packet& Packet::operator <<(const std::wstring& Data)
-{
-    // First insert string length
-    Uint32 Length = static_cast<Uint32>(Data.size());
-    *this << Length;
-
-    // Then insert characters
-    if (Length > 0)
-    {
-        for (std::wstring::const_iterator c = Data.begin(); c != Data.end(); ++c)
-            *this << static_cast<Int32>(*c);
+        // Then extract characters
+        for (Uint32 i = 0; i < length; ++i)
+        {
+            Uint32 character = 0;
+            *this >> character;
+            data += character;
+        }
     }
 
     return *this;
@@ -395,32 +326,182 @@ Packet& Packet::operator <<(const std::wstring& Data)
 
 
 ////////////////////////////////////////////////////////////
-/// Check if the packet can extract a given size of bytes
-////////////////////////////////////////////////////////////
-bool Packet::CheckSize(std::size_t Size)
+Packet& Packet::operator <<(bool data)
 {
-    myIsValid = myIsValid && (myReadPos + Size <= myData.size());
-
-    return myIsValid;
+    *this << static_cast<Uint8>(data);
+    return *this;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Called before the packet is sent to the network
-////////////////////////////////////////////////////////////
-const char* Packet::OnSend(std::size_t& DataSize)
+Packet& Packet::operator <<(Int8 data)
 {
-    DataSize = GetDataSize();
-    return GetData();
+    append(&data, sizeof(data));
+    return *this;
 }
 
 
 ////////////////////////////////////////////////////////////
-/// Called after the packet has been received from the network
-////////////////////////////////////////////////////////////
-void Packet::OnReceive(const char* Data, std::size_t DataSize)
+Packet& Packet::operator <<(Uint8 data)
 {
-    Append(Data, DataSize);
+    append(&data, sizeof(data));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(Int16 data)
+{
+    Int16 toWrite = htons(data);
+    append(&toWrite, sizeof(toWrite));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(Uint16 data)
+{
+    Uint16 toWrite = htons(data);
+    append(&toWrite, sizeof(toWrite));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(Int32 data)
+{
+    Int32 toWrite = htonl(data);
+    append(&toWrite, sizeof(toWrite));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(Uint32 data)
+{
+    Uint32 toWrite = htonl(data);
+    append(&toWrite, sizeof(toWrite));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(float data)
+{
+    append(&data, sizeof(data));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(double data)
+{
+    append(&data, sizeof(data));
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(const char* data)
+{
+    // First insert string length
+    Uint32 length = std::strlen(data);
+    *this << length;
+
+    // Then insert characters
+    append(data, length * sizeof(char));
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(const std::string& data)
+{
+    // First insert string length
+    Uint32 length = static_cast<Uint32>(data.size());
+    *this << length;
+
+    // Then insert characters
+    if (length > 0)
+        append(data.c_str(), length * sizeof(std::string::value_type));
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(const wchar_t* data)
+{
+    // First insert string length
+    Uint32 length = std::wcslen(data);
+    *this << length;
+
+    // Then insert characters
+    for (const wchar_t* c = data; *c != L'\0'; ++c)
+        *this << static_cast<Uint32>(*c);
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(const std::wstring& data)
+{
+    // First insert string length
+    Uint32 length = static_cast<Uint32>(data.size());
+    *this << length;
+
+    // Then insert characters
+    if (length > 0)
+    {
+        for (std::wstring::const_iterator c = data.begin(); c != data.end(); ++c)
+            *this << static_cast<Uint32>(*c);
+    }
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Packet& Packet::operator <<(const String& data)
+{
+    // First insert the string length
+    Uint32 length = static_cast<Uint32>(data.getSize());
+    *this << length;
+
+    // Then insert characters
+    if (length > 0)
+    {
+        for (String::ConstIterator c = data.begin(); c != data.end(); ++c)
+            *this << *c;
+    }
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+bool Packet::checkSize(std::size_t size)
+{
+    m_isValid = m_isValid && (m_readPos + size <= m_data.size());
+
+    return m_isValid;
+}
+
+
+////////////////////////////////////////////////////////////
+const void* Packet::onSend(std::size_t& size)
+{
+    size = getDataSize();
+    return getData();
+}
+
+
+////////////////////////////////////////////////////////////
+void Packet::onReceive(const void* data, std::size_t size)
+{
+    append(data, size);
 }
 
 } // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/SelectorBase.cpp b/Externals/SFML/src/SFML/Network/SelectorBase.cpp
deleted file mode 100644
index 4afb893493..0000000000
--- a/Externals/SFML/src/SFML/Network/SelectorBase.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifdef _MSC_VER
-    #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
-#endif
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SelectorBase.hpp>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-SelectorBase::SelectorBase() :
-myMaxSocket(0)
-{
-    Clear();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Add a socket to watch
-////////////////////////////////////////////////////////////
-void SelectorBase::Add(SocketHelper::SocketType Socket)
-{
-    FD_SET(Socket, &mySet);
-
-    int Size = static_cast<int>(Socket);
-    if (Size > myMaxSocket)
-        myMaxSocket = Size;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove a socket
-////////////////////////////////////////////////////////////
-void SelectorBase::Remove(SocketHelper::SocketType Socket)
-{
-    FD_CLR(Socket, &mySet);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Remove all sockets
-////////////////////////////////////////////////////////////
-void SelectorBase::Clear()
-{
-    FD_ZERO(&mySet);
-    FD_ZERO(&mySetReady);
-
-    myMaxSocket = 0;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Wait and collect sockets which are ready for reading.
-/// This functions will return either when at least one socket
-/// is ready, or when the given time is out
-////////////////////////////////////////////////////////////
-unsigned int SelectorBase::Wait(float Timeout)
-{
-    // Setup the timeout structure
-    timeval Time;
-    Time.tv_sec  = static_cast<long>(Timeout);
-    Time.tv_usec = (static_cast<long>(Timeout * 1000) % 1000) * 1000;
-
-    // Prepare the set of sockets to return
-    mySetReady = mySet;
-
-    // Wait until one of the sockets is ready for reading, or timeout is reached
-    int NbSockets = select(myMaxSocket + 1, &mySetReady, NULL, NULL, Timeout > 0 ? &Time : NULL);
-
-    return NbSockets >= 0 ? static_cast<unsigned int>(NbSockets) : 0;
-}
-
-
-////////////////////////////////////////////////////////////
-/// After a call to Wait(), get the Index-th socket which is
-/// ready for reading. The total number of sockets ready
-/// is the integer returned by the previous call to Wait()
-////////////////////////////////////////////////////////////
-SocketHelper::SocketType SelectorBase::GetSocketReady(unsigned int Index)
-{
-    // The standard FD_xxx interface doesn't define a direct access,
-    // so we must go through the whole set to find the socket we're looking for
-    for (int i = 0; i < myMaxSocket + 1; ++i)
-    {
-        if (FD_ISSET(i, &mySetReady))
-        {
-            // Current socket is ready, but is it the Index-th one ?
-            if (Index > 0)
-            {
-                Index--;
-            }
-            else
-            {
-                return static_cast<SocketHelper::SocketType>(i);
-            }
-        }
-    }
-
-    // Invalid index : return an invalid socket
-    return SocketHelper::InvalidSocket();
-}
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Socket.cpp b/Externals/SFML/src/SFML/Network/Socket.cpp
new file mode 100644
index 0000000000..89867c3faf
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/Socket.cpp
@@ -0,0 +1,144 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Socket.hpp>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/Err.hpp>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+Socket::Socket(Type type) :
+m_type      (type),
+m_socket    (priv::SocketImpl::invalidSocket()),
+m_isBlocking(true)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::~Socket()
+{
+    // Close the socket before it gets destructed
+    close();
+}
+
+
+////////////////////////////////////////////////////////////
+void Socket::setBlocking(bool blocking)
+{
+    // Apply if the socket is already created
+    if (m_socket != priv::SocketImpl::invalidSocket())
+        priv::SocketImpl::setBlocking(m_socket, blocking);
+
+    m_isBlocking = blocking;
+}
+
+
+////////////////////////////////////////////////////////////
+bool Socket::isBlocking() const
+{
+    return m_isBlocking;
+}
+
+
+////////////////////////////////////////////////////////////
+SocketHandle Socket::getHandle() const
+{
+    return m_socket;
+}
+
+
+////////////////////////////////////////////////////////////
+void Socket::create()
+{
+    // Don't create the socket if it already exists
+    if (m_socket == priv::SocketImpl::invalidSocket())
+    {
+        SocketHandle handle = socket(PF_INET, m_type == Tcp ? SOCK_STREAM : SOCK_DGRAM, 0);
+        create(handle);
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+void Socket::create(SocketHandle handle)
+{
+    // Don't create the socket if it already exists
+    if (m_socket == priv::SocketImpl::invalidSocket())
+    {
+        // Assign the new handle
+        m_socket = handle;
+
+        // Set the current blocking state
+        setBlocking(m_isBlocking);
+
+        if (m_type == Tcp)
+        {
+            // Disable the Nagle algorithm (ie. removes buffering of TCP packets)
+            int yes = 1;
+            if (setsockopt(m_socket, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&yes), sizeof(yes)) == -1)
+            {
+                err() << "Failed to set socket option \"TCP_NODELAY\" ; "
+                      << "all your TCP packets will be buffered" << std::endl;
+            }
+
+            // On Mac OS X, disable the SIGPIPE signal on disconnection
+            #ifdef SFML_SYSTEM_MACOS
+                if (setsockopt(m_socket, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char*>(&yes), sizeof(yes)) == -1)
+                {
+                    err() << "Failed to set socket option \"SO_NOSIGPIPE\"" << std::endl;
+                }
+            #endif
+        }
+        else
+        {
+            // Enable broadcast by default for UDP sockets
+            int yes = 1;
+            if (setsockopt(m_socket, SOL_SOCKET, SO_BROADCAST, reinterpret_cast<char*>(&yes), sizeof(yes)) == -1)
+            {
+                err() << "Failed to enable broadcast on UDP socket" << std::endl;
+            }
+        }
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+void Socket::close()
+{
+    // Close the socket
+    if (m_socket != priv::SocketImpl::invalidSocket())
+    {
+        priv::SocketImpl::close(m_socket);
+        m_socket = priv::SocketImpl::invalidSocket();
+    }
+}
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/SocketImpl.hpp b/Externals/SFML/src/SFML/Network/SocketImpl.hpp
new file mode 100644
index 0000000000..bcfb0598ab
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/SocketImpl.hpp
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+
+#if defined(SFML_SYSTEM_WINDOWS)
+
+    #include <SFML/Network/Win32/SocketImpl.hpp>
+
+#else
+
+    #include <SFML/Network/Unix/SocketImpl.hpp>
+
+#endif
diff --git a/Externals/SFML/src/SFML/Network/SocketSelector.cpp b/Externals/SFML/src/SFML/Network/SocketSelector.cpp
new file mode 100644
index 0000000000..9897e603cb
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/SocketSelector.cpp
@@ -0,0 +1,141 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/SocketSelector.hpp>
+#include <SFML/Network/Socket.hpp>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/Err.hpp>
+#include <utility>
+
+#ifdef _MSC_VER
+    #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
+#endif
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+struct SocketSelector::SocketSelectorImpl
+{
+    fd_set AllSockets;   ///< Set containing all the sockets handles
+    fd_set SocketsReady; ///< Set containing handles of the sockets that are ready
+    int    MaxSocket;    ///< Maximum socket handle
+};
+
+
+////////////////////////////////////////////////////////////
+SocketSelector::SocketSelector() :
+m_impl(new SocketSelectorImpl)
+{
+    clear();
+}
+
+
+////////////////////////////////////////////////////////////
+SocketSelector::SocketSelector(const SocketSelector& copy) :
+m_impl(new SocketSelectorImpl(*copy.m_impl))
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+SocketSelector::~SocketSelector()
+{
+    delete m_impl;
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketSelector::add(Socket& socket)
+{
+    SocketHandle handle = socket.getHandle();
+    if (handle != priv::SocketImpl::invalidSocket())
+    {
+        FD_SET(handle, &m_impl->AllSockets);
+
+        int size = static_cast<int>(handle);
+        if (size > m_impl->MaxSocket)
+            m_impl->MaxSocket = size;
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketSelector::remove(Socket& socket)
+{
+    FD_CLR(socket.getHandle(), &m_impl->AllSockets);
+    FD_CLR(socket.getHandle(), &m_impl->SocketsReady);
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketSelector::clear()
+{
+    FD_ZERO(&m_impl->AllSockets);
+    FD_ZERO(&m_impl->SocketsReady);
+
+    m_impl->MaxSocket = 0;
+}
+
+
+////////////////////////////////////////////////////////////
+bool SocketSelector::wait(Time timeout)
+{
+    // Setup the timeout
+    timeval time;
+    time.tv_sec  = static_cast<long>(timeout.asMicroseconds() / 1000000);
+    time.tv_usec = static_cast<long>(timeout.asMicroseconds() % 1000000);
+
+    // Initialize the set that will contain the sockets that are ready
+    m_impl->SocketsReady = m_impl->AllSockets;
+
+    // Wait until one of the sockets is ready for reading, or timeout is reached
+    int count = select(m_impl->MaxSocket + 1, &m_impl->SocketsReady, NULL, NULL, timeout != Time::Zero ? &time : NULL);
+
+    return count > 0;
+}
+
+
+////////////////////////////////////////////////////////////
+bool SocketSelector::isReady(Socket& socket) const
+{
+    return FD_ISSET(socket.getHandle(), &m_impl->SocketsReady) != 0;
+}
+
+
+////////////////////////////////////////////////////////////
+SocketSelector& SocketSelector::operator =(const SocketSelector& right)
+{
+    SocketSelector temp(right);
+
+    std::swap(m_impl, temp.m_impl);
+
+    return *this;
+}
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/SocketTCP.cpp b/Externals/SFML/src/SFML/Network/SocketTCP.cpp
deleted file mode 100644
index 8e9aa33f81..0000000000
--- a/Externals/SFML/src/SFML/Network/SocketTCP.cpp
+++ /dev/null
@@ -1,515 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketTCP.hpp>
-#include <SFML/Network/IPAddress.hpp>
-#include <SFML/Network/Packet.hpp>
-#include <SFML/Network/SocketHelper.hpp>
-#include <algorithm>
-#include <iostream>
-#include <string.h>
-
-
-#ifdef _MSC_VER
-    #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
-#endif
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-SocketTCP::SocketTCP()
-{
-    Create(SocketHelper::InvalidSocket());
-}
-
-
-////////////////////////////////////////////////////////////
-/// Change the blocking state of the socket
-////////////////////////////////////////////////////////////
-void SocketTCP::SetBlocking(bool Blocking)
-{
-    // Make sure our socket is valid
-    if (!IsValid())
-        Create();
-
-    SocketHelper::SetBlocking(mySocket, Blocking);
-    myIsBlocking = Blocking;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Connect to another computer on a specified port
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Connect(unsigned short Port, const IPAddress& HostAddress, float Timeout)
-{
-    // Make sure our socket is valid
-    if (!IsValid())
-        Create();
-
-    // Build the host address
-    sockaddr_in SockAddr;
-    memset(SockAddr.sin_zero, 0, sizeof(SockAddr.sin_zero));
-    SockAddr.sin_addr.s_addr = inet_addr(HostAddress.ToString().c_str());
-    SockAddr.sin_family      = AF_INET;
-    SockAddr.sin_port        = htons(Port);
-
-    if (Timeout <= 0)
-    {
-        // ----- We're not using a timeout : just try to connect -----
-
-        if (connect(mySocket, reinterpret_cast<sockaddr*>(&SockAddr), sizeof(SockAddr)) == -1)
-        {
-            // Failed to connect
-            return SocketHelper::GetErrorStatus();
-        }
-
-        // Connection succeeded
-        return Socket::Done;
-    }
-    else
-    {
-        // ----- We're using a timeout : we'll need a few tricks to make it work -----
-
-        // Save the previous blocking state
-        bool IsBlocking = myIsBlocking;
-
-        // Switch to non-blocking to enable our connection timeout
-        if (IsBlocking)
-            SetBlocking(false);
-
-        // Try to connect to host
-        if (connect(mySocket, reinterpret_cast<sockaddr*>(&SockAddr), sizeof(SockAddr)) >= 0)
-        {
-            // We got instantly connected! (it may no happen a lot...)
-            return Socket::Done;
-        }
-
-        // Get the error status
-        Socket::Status Status = SocketHelper::GetErrorStatus();
-
-        // If we were in non-blocking mode, return immediatly
-        if (!IsBlocking)
-            return Status;
-
-        // Otherwise, wait until something happens to our socket (success, timeout or error)
-        if (Status == Socket::NotReady)
-        {
-            // Setup the selector
-            fd_set Selector;
-            FD_ZERO(&Selector);
-            FD_SET(mySocket, &Selector);
-
-            // Setup the timeout
-            timeval Time;
-            Time.tv_sec  = static_cast<long>(Timeout);
-            Time.tv_usec = (static_cast<long>(Timeout * 1000) % 1000) * 1000;
-
-            // Wait for something to write on our socket (which means that the connection request has returned)
-            if (select(static_cast<int>(mySocket + 1), NULL, &Selector, NULL, &Time) > 0)
-            {
-                // At this point the connection may have been either accepted or refused.
-                // To know whether it's a success or a failure, we try to retrieve the name of the connected peer
-                SocketHelper::LengthType Size = sizeof(SockAddr);
-                if (getpeername(mySocket, reinterpret_cast<sockaddr*>(&SockAddr), &Size) != -1)
-                {
-                    // Connection accepted
-                    Status = Socket::Done;
-                }
-                else
-                {
-                    // Connection failed
-                    Status = SocketHelper::GetErrorStatus();
-                }
-            }
-            else
-            {
-                // Failed to connect before timeout is over
-                Status = SocketHelper::GetErrorStatus();
-            }
-        }
-
-        // Switch back to blocking mode
-        SetBlocking(true);
-
-        return Status;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Listen to a specified port for incoming data or connections
-////////////////////////////////////////////////////////////
-bool SocketTCP::Listen(unsigned short Port)
-{
-    // Make sure our socket is valid
-    if (!IsValid())
-        Create();
-
-    // Build the address
-    sockaddr_in SockAddr;
-    memset(SockAddr.sin_zero, 0, sizeof(SockAddr.sin_zero));
-    SockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    SockAddr.sin_family      = AF_INET;
-    SockAddr.sin_port        = htons(Port);
-
-    // Bind the socket to the specified port
-    if (bind(mySocket, reinterpret_cast<sockaddr*>(&SockAddr), sizeof(SockAddr)) == -1)
-    {
-        // Not likely to happen, but...
-        std::cerr << "Failed to bind socket to port " << Port << std::endl;
-        return false;
-    }
-
-    // Listen to the bound port
-    if (listen(mySocket, 0) == -1)
-    {
-        // Oops, socket is deaf
-        std::cerr << "Failed to listen to port " << Port << std::endl;
-        return false;
-    }
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Wait for a connection (must be listening to a port).
-/// This function will block if the socket is blocking
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Accept(SocketTCP& Connected, IPAddress* Address)
-{
-    // Address that will be filled with client informations
-    sockaddr_in ClientAddress;
-    SocketHelper::LengthType Length = sizeof(ClientAddress);
-
-    // Accept a new connection
-    Connected = accept(mySocket, reinterpret_cast<sockaddr*>(&ClientAddress), &Length);
-
-    // Check errors
-    if (!Connected.IsValid())
-    {
-        if (Address)
-            *Address = IPAddress();
-
-        return SocketHelper::GetErrorStatus();
-    }
-
-    // Fill address if requested
-    if (Address)
-        *Address = IPAddress(inet_ntoa(ClientAddress.sin_addr));
-
-    return Socket::Done;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send an array of bytes to the host (must be connected first)
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Send(const char* Data, std::size_t Size)
-{
-    // First check that socket is valid
-    if (!IsValid())
-        return Socket::Error;
-
-    // Check parameters
-    if (Data && Size)
-    {
-        // Loop until every byte has been sent
-        int Sent = 0;
-        int SizeToSend = static_cast<int>(Size);
-        for (int Length = 0; Length < SizeToSend; Length += Sent)
-        {
-            // Send a chunk of data
-            Sent = send(mySocket, Data + Length, SizeToSend - Length, 0);
-
-            // Check if an error occured
-            if (Sent <= 0)
-                return SocketHelper::GetErrorStatus();
-        }
-
-        return Socket::Done;
-    }
-    else
-    {
-        // Error...
-        std::cerr << "Cannot send data over the network (invalid parameters)" << std::endl;
-        return Socket::Error;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive an array of bytes from the host (must be connected first).
-/// This function will block if the socket is blocking
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived)
-{
-    // First clear the size received
-    SizeReceived = 0;
-
-    // Check that socket is valid
-    if (!IsValid())
-        return Socket::Error;
-
-    // Check parameters
-    if (Data && MaxSize)
-    {
-        // Receive a chunk of bytes
-        int Received = recv(mySocket, Data, static_cast<int>(MaxSize), 0);
-
-        // Check the number of bytes received
-        if (Received > 0)
-        {
-            SizeReceived = static_cast<std::size_t>(Received);
-            return Socket::Done;
-        }
-        else if (Received == 0)
-        {
-            return Socket::Disconnected;
-        }
-        else
-        {
-            return SocketHelper::GetErrorStatus();
-        }
-    }
-    else
-    {
-        // Error...
-        std::cerr << "Cannot receive data from the network (invalid parameters)" << std::endl;
-        return Socket::Error;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send a packet of data to the host (must be connected first)
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Send(Packet& PacketToSend)
-{
-    // Get the data to send from the packet
-    std::size_t DataSize = 0;
-    const char* Data = PacketToSend.OnSend(DataSize);
-
-    // Send the packet size
-    Uint32 PacketSize = htonl(static_cast<unsigned long>(DataSize));
-    Send(reinterpret_cast<const char*>(&PacketSize), sizeof(PacketSize));
-
-    // Send the packet data
-    if (PacketSize > 0)
-    {
-        return Send(Data, DataSize);
-    }
-    else
-    {
-        return Socket::Done;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive a packet from the host (must be connected first).
-/// This function will block if the socket is blocking
-////////////////////////////////////////////////////////////
-Socket::Status SocketTCP::Receive(Packet& PacketToReceive)
-{
-    // We start by getting the size of the incoming packet
-    Uint32      PacketSize = 0;
-    std::size_t Received   = 0;
-    if (myPendingPacketSize < 0)
-    {
-        // Loop until we've received the entire size of the packet
-        // (even a 4 bytes variable may be received in more than one call)
-        while (myPendingHeaderSize < sizeof(myPendingHeader))
-        {
-            char* Data = reinterpret_cast<char*>(&myPendingHeader) + myPendingHeaderSize;
-            Socket::Status Status = Receive(Data, sizeof(myPendingHeader) - myPendingHeaderSize, Received);
-            myPendingHeaderSize += Received;
-
-            if (Status != Socket::Done)
-                return Status;
-        }
-
-        PacketSize = ntohl(myPendingHeader);
-        myPendingHeaderSize = 0;
-    }
-    else
-    {
-        // There is a pending packet : we already know its size
-        PacketSize = myPendingPacketSize;
-    }
-
-    // Then loop until we receive all the packet data
-    char Buffer[1024];
-    while (myPendingPacket.size() < PacketSize)
-    {
-        // Receive a chunk of data
-        std::size_t SizeToGet = std::min(static_cast<std::size_t>(PacketSize - myPendingPacket.size()), sizeof(Buffer));
-        Socket::Status Status = Receive(Buffer, SizeToGet, Received);
-        if (Status != Socket::Done)
-        {
-            // We must save the size of the pending packet until we can receive its content
-            if (Status == Socket::NotReady)
-                myPendingPacketSize = PacketSize;
-            return Status;
-        }
-
-        // Append it into the packet
-        if (Received > 0)
-        {
-            myPendingPacket.resize(myPendingPacket.size() + Received);
-            char* Begin = &myPendingPacket[0] + myPendingPacket.size() - Received;
-            memcpy(Begin, Buffer, Received);
-        }
-    }
-
-    // We have received all the datas : we can copy it to the user packet, and clear our internal packet
-    PacketToReceive.Clear();
-    if (!myPendingPacket.empty())
-        PacketToReceive.OnReceive(&myPendingPacket[0], myPendingPacket.size());
-    myPendingPacket.clear();
-    myPendingPacketSize = -1;
-
-    return Socket::Done;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Close the socket
-////////////////////////////////////////////////////////////
-bool SocketTCP::Close()
-{
-    if (IsValid())
-    {
-        if (!SocketHelper::Close(mySocket))
-        {
-            std::cerr << "Failed to close socket" << std::endl;
-            return false;
-        }
-
-        mySocket = SocketHelper::InvalidSocket();
-    }
-
-    myIsBlocking = true;
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Check if the socket is in a valid state ; this function
-/// can be called any time to check if the socket is OK
-////////////////////////////////////////////////////////////
-bool SocketTCP::IsValid() const
-{
-    return mySocket != SocketHelper::InvalidSocket();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator ==
-////////////////////////////////////////////////////////////
-bool SocketTCP::operator ==(const SocketTCP& Other) const
-{
-    return mySocket == Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator !=
-////////////////////////////////////////////////////////////
-bool SocketTCP::operator !=(const SocketTCP& Other) const
-{
-    return mySocket != Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator <.
-/// Provided for compatibility with standard containers, as
-/// comparing two sockets doesn't make much sense...
-////////////////////////////////////////////////////////////
-bool SocketTCP::operator <(const SocketTCP& Other) const
-{
-    return mySocket < Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Construct the socket from a socket descriptor
-/// (for internal use only)
-////////////////////////////////////////////////////////////
-SocketTCP::SocketTCP(SocketHelper::SocketType Descriptor)
-{
-    Create(Descriptor);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Create the socket
-////////////////////////////////////////////////////////////
-void SocketTCP::Create(SocketHelper::SocketType Descriptor)
-{
-    // Use the given socket descriptor, or get a new one
-    mySocket = Descriptor ? Descriptor : socket(PF_INET, SOCK_STREAM, 0);
-    myIsBlocking = true;
-
-    // Reset the pending packet
-    myPendingHeaderSize = 0;
-    myPendingPacket.clear();
-    myPendingPacketSize = -1;
-
-    // Setup default options
-    if (IsValid())
-    {
-		/* We must disable this in order to detect if ports are being used by other apps, or 
-		   other instances of dolphin. This is also disabled in SFML 2.0, see
-		   http://www.sfml-dev.org/forum/viewtopic.php?t=3388
-        // To avoid the "Address already in use" error message when trying to bind to the same port
-        if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&Yes), sizeof(Yes)) == -1)
-        {
-            std::cerr << "Failed to set socket option \"SO_REUSEADDR\" ; "
-                      << "binding to a same port may fail if too fast" << std::endl;
-        }
-		*/
-
-		int Yes = 1;
-        // Disable the Nagle algorithm (ie. removes buffering of TCP packets)
-        if (setsockopt(mySocket, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&Yes), sizeof(Yes)) == -1)
-        {
-            std::cerr << "Failed to set socket option \"TCP_NODELAY\" ; "
-                      << "all your TCP packets will be buffered" << std::endl;
-        }
-
-        // Set blocking by default (should always be the case anyway)
-        SetBlocking(true);
-    }
-}
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/SocketUDP.cpp b/Externals/SFML/src/SFML/Network/SocketUDP.cpp
deleted file mode 100644
index ec46c65864..0000000000
--- a/Externals/SFML/src/SFML/Network/SocketUDP.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketUDP.hpp>
-#include <SFML/Network/IPAddress.hpp>
-#include <SFML/Network/Packet.hpp>
-#include <algorithm>
-#include <iostream>
-#include <string.h>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-SocketUDP::SocketUDP()
-{
-    Create();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Change the blocking state of the socket
-////////////////////////////////////////////////////////////
-void SocketUDP::SetBlocking(bool Blocking)
-{
-    // Make sure our socket is valid
-    if (!IsValid())
-        Create();
-
-    SocketHelper::SetBlocking(mySocket, Blocking);
-    myIsBlocking = Blocking;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Bind the socket to a specific port
-////////////////////////////////////////////////////////////
-bool SocketUDP::Bind(unsigned short Port)
-{
-    // Check if the socket is already bound to the specified port
-    if (myPort != Port)
-    {
-        // If the socket was previously bound to another port, we need to unbind it first
-        Unbind();
-
-        if (Port != 0)
-        {
-            // Build an address with the specified port
-            sockaddr_in Addr;
-            Addr.sin_family      = AF_INET;
-            Addr.sin_port        = htons(Port);
-            Addr.sin_addr.s_addr = INADDR_ANY;
-            memset(Addr.sin_zero, 0, sizeof(Addr.sin_zero));
-
-            // Bind the socket to the port
-            if (bind(mySocket, reinterpret_cast<sockaddr*>(&Addr), sizeof(Addr)) == -1)
-            {
-                std::cerr << "Failed to bind the socket to port " << Port << std::endl;
-                myPort = 0;
-                return false;
-            }
-        }
-
-        // Save the new port
-        myPort = Port;
-    }
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Unbind the socket to its previous port
-////////////////////////////////////////////////////////////
-bool SocketUDP::Unbind()
-{
-    // To unbind the socket, we just recreate it
-    if (myPort != 0)
-    {
-        Close();
-        Create();
-        myPort = 0;
-    }
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send an array of bytes
-////////////////////////////////////////////////////////////
-Socket::Status SocketUDP::Send(const char* Data, std::size_t Size, const IPAddress& Address, unsigned short Port)
-{
-    // Make sure the socket is valid
-    if (!IsValid())
-        Create();
-
-    // Check parameters
-    if (Data && Size)
-    {
-        // Build the target address
-        sockaddr_in Target;
-        Target.sin_family      = AF_INET;
-        Target.sin_port        = htons(Port);
-        Target.sin_addr.s_addr = inet_addr(Address.ToString().c_str());
-        memset(Target.sin_zero, 0, sizeof(Target.sin_zero));
-
-        // Loop until every byte has been sent
-        int Sent = 0;
-        int SizeToSend = static_cast<int>(Size);
-        for (int Length = 0; Length < SizeToSend; Length += Sent)
-        {
-            // Send a chunk of data
-            Sent = sendto(mySocket, Data + Length, SizeToSend - Length, 0, reinterpret_cast<sockaddr*>(&Target), sizeof(Target));
-
-            // Check errors
-            if (Sent <= 0)
-                return SocketHelper::GetErrorStatus();
-        }
-
-        return Socket::Done;
-    }
-    else
-    {
-        // Error...
-        std::cerr << "Cannot send data over the network (invalid parameters)" << std::endl;
-        return Socket::Error;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive an array of bytes.
-/// This function will block if the socket is blocking
-////////////////////////////////////////////////////////////
-Socket::Status SocketUDP::Receive(char* Data, std::size_t MaxSize, std::size_t& SizeReceived, IPAddress& Address, unsigned short& Port)
-{
-    // First clear the size received
-    SizeReceived = 0;
-
-    // Make sure the socket is bound to a port
-    if (myPort == 0)
-    {
-        std::cerr << "Failed to receive data ; the UDP socket first needs to be bound to a port" << std::endl;
-        return Socket::Error;
-    }
-
-    // Make sure the socket is valid
-    if (!IsValid())
-        Create();
-
-    // Check parameters
-    if (Data && MaxSize)
-    {
-        // Data that will be filled with the other computer's address
-        sockaddr_in Sender;
-        Sender.sin_family      = AF_INET;
-        Sender.sin_port        = 0;
-        Sender.sin_addr.s_addr = INADDR_ANY;
-        memset(Sender.sin_zero, 0, sizeof(Sender.sin_zero));
-        SocketHelper::LengthType SenderSize = sizeof(Sender);
-
-        // Receive a chunk of bytes
-        int Received = recvfrom(mySocket, Data, static_cast<int>(MaxSize), 0, reinterpret_cast<sockaddr*>(&Sender), &SenderSize);
-
-        // Check the number of bytes received
-        if (Received > 0)
-        {
-            Address = IPAddress(inet_ntoa(Sender.sin_addr));
-            Port = ntohs(Sender.sin_port);
-            SizeReceived = static_cast<std::size_t>(Received);
-            return Socket::Done;
-        }
-        else
-        {
-            Address = IPAddress();
-            Port = 0;
-            return Received == 0 ? Socket::Disconnected : SocketHelper::GetErrorStatus();
-        }
-    }
-    else
-    {
-        // Error...
-        std::cerr << "Cannot receive data from the network (invalid parameters)" << std::endl;
-        return Socket::Error;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Send a packet of data
-////////////////////////////////////////////////////////////
-Socket::Status SocketUDP::Send(Packet& PacketToSend, const IPAddress& Address, unsigned short Port)
-{
-    // Get the data to send from the packet
-    std::size_t DataSize = 0;
-    const char* Data = PacketToSend.OnSend(DataSize);
-
-    // Send the packet size
-    Uint32 PacketSize = htonl(static_cast<unsigned long>(DataSize));
-    Send(reinterpret_cast<const char*>(&PacketSize), sizeof(PacketSize), Address, Port);
-
-    // Send the packet data
-    if (PacketSize > 0)
-    {
-        return Send(Data, DataSize, Address, Port);
-    }
-    else
-    {
-        return Socket::Done;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Receive a packet.
-/// This function will block if the socket is blocking
-////////////////////////////////////////////////////////////
-Socket::Status SocketUDP::Receive(Packet& PacketToReceive, IPAddress& Address, unsigned short& Port)
-{
-    // We start by getting the size of the incoming packet
-    Uint32      PacketSize = 0;
-    std::size_t Received   = 0;
-    if (myPendingPacketSize < 0)
-    {
-        // Loop until we've received the entire size of the packet
-        // (even a 4 bytes variable may be received in more than one call)
-        while (myPendingHeaderSize < sizeof(myPendingHeader))
-        {
-            char* Data = reinterpret_cast<char*>(&myPendingHeader) + myPendingHeaderSize;
-            Socket::Status Status = Receive(Data, sizeof(myPendingHeader) - myPendingHeaderSize, Received, Address, Port);
-            myPendingHeaderSize += Received;
-
-            if (Status != Socket::Done)
-                return Status;
-        }
-
-        PacketSize = ntohl(myPendingHeader);
-        myPendingHeaderSize = 0;
-    }
-    else
-    {
-        // There is a pending packet : we already know its size
-        PacketSize = myPendingPacketSize;
-    }
-
-    // Use another address instance for receiving the packet data ;
-    // chunks of data coming from a different sender will be discarded (and lost...)
-    IPAddress Sender;
-    unsigned short SenderPort;
-
-    // Then loop until we receive all the packet data
-    char Buffer[1024];
-    while (myPendingPacket.size() < PacketSize)
-    {
-        // Receive a chunk of data
-        std::size_t SizeToGet = std::min(static_cast<std::size_t>(PacketSize - myPendingPacket.size()), sizeof(Buffer));
-        Socket::Status Status = Receive(Buffer, SizeToGet, Received, Sender, SenderPort);
-        if (Status != Socket::Done)
-        {
-            // We must save the size of the pending packet until we can receive its content
-            if (Status == Socket::NotReady)
-                myPendingPacketSize = PacketSize;
-            return Status;
-        }
-
-        // Append it into the packet
-        if ((Sender == Address) && (SenderPort == Port) && (Received > 0))
-        {
-            myPendingPacket.resize(myPendingPacket.size() + Received);
-            char* Begin = &myPendingPacket[0] + myPendingPacket.size() - Received;
-            memcpy(Begin, Buffer, Received);
-        }
-    }
-
-    // We have received all the datas : we can copy it to the user packet, and clear our internal packet
-    PacketToReceive.Clear();
-    if (!myPendingPacket.empty())
-        PacketToReceive.OnReceive(&myPendingPacket[0], myPendingPacket.size());
-    myPendingPacket.clear();
-    myPendingPacketSize = -1;
-
-    return Socket::Done;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Close the socket
-////////////////////////////////////////////////////////////
-bool SocketUDP::Close()
-{
-    if (IsValid())
-    {
-        if (!SocketHelper::Close(mySocket))
-        {
-            std::cerr << "Failed to close socket" << std::endl;
-            return false;
-        }
-
-        mySocket = SocketHelper::InvalidSocket();
-    }
-
-    myPort       = 0;
-    myIsBlocking = true;
-
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Check if the socket is in a valid state ; this function
-/// can be called any time to check if the socket is OK
-////////////////////////////////////////////////////////////
-bool SocketUDP::IsValid() const
-{
-    return mySocket != SocketHelper::InvalidSocket();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the port the socket is currently bound to
-////////////////////////////////////////////////////////////
-unsigned short SocketUDP::GetPort() const
-{
-    return myPort;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator ==
-////////////////////////////////////////////////////////////
-bool SocketUDP::operator ==(const SocketUDP& Other) const
-{
-    return mySocket == Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator !=
-////////////////////////////////////////////////////////////
-bool SocketUDP::operator !=(const SocketUDP& Other) const
-{
-    return mySocket != Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Comparison operator <.
-/// Provided for compatibility with standard containers, as
-/// comparing two sockets doesn't make much sense...
-////////////////////////////////////////////////////////////
-bool SocketUDP::operator <(const SocketUDP& Other) const
-{
-    return mySocket < Other.mySocket;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Construct the socket from a socket descriptor
-/// (for internal use only)
-////////////////////////////////////////////////////////////
-SocketUDP::SocketUDP(SocketHelper::SocketType Descriptor)
-{
-    Create(Descriptor);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Create the socket
-////////////////////////////////////////////////////////////
-void SocketUDP::Create(SocketHelper::SocketType Descriptor)
-{
-    // Use the given socket descriptor, or get a new one
-    mySocket = Descriptor ? Descriptor : socket(PF_INET, SOCK_DGRAM, 0);
-    myIsBlocking = true;
-
-    // Clear the last port used
-    myPort = 0;
-
-    // Reset the pending packet
-    myPendingHeaderSize = 0;
-    myPendingPacket.clear();
-    myPendingPacketSize = -1;
-
-    // Setup default options
-    if (IsValid())
-    {
-        // To avoid the "Address already in use" error message when trying to bind to the same port
-        int Yes = 1;
-        if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&Yes), sizeof(Yes)) == -1)
-        {
-            std::cerr << "Failed to set socket option \"reuse address\" ; "
-                      << "binding to a same port may fail if too fast" << std::endl;
-        }
-
-        // Enable broadcast by default
-        if (setsockopt(mySocket, SOL_SOCKET, SO_BROADCAST, reinterpret_cast<char*>(&Yes), sizeof(Yes)) == -1)
-        {
-            std::cerr << "Failed to enable broadcast on UDP socket" << std::endl;
-        }
-
-        // Set blocking by default (should always be the case anyway)
-        SetBlocking(true);
-    }
-}
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/TcpListener.cpp b/Externals/SFML/src/SFML/Network/TcpListener.cpp
new file mode 100644
index 0000000000..9519251350
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/TcpListener.cpp
@@ -0,0 +1,124 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/TcpListener.hpp>
+#include <SFML/Network/TcpSocket.hpp>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/Err.hpp>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+TcpListener::TcpListener() :
+Socket(Tcp)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+unsigned short TcpListener::getLocalPort() const
+{
+    if (getHandle() != priv::SocketImpl::invalidSocket())
+    {
+        // Retrieve informations about the local end of the socket
+        sockaddr_in address;
+        priv::SocketImpl::AddrLength size = sizeof(address);
+        if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
+        {
+            return ntohs(address.sin_port);
+        }
+    }
+
+    // We failed to retrieve the port
+    return 0;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpListener::listen(unsigned short port)
+{
+    // Create the internal socket if it doesn't exist
+    create();
+
+    // Bind the socket to the specified port
+    sockaddr_in address = priv::SocketImpl::createAddress(INADDR_ANY, port);
+    if (bind(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) == -1)
+    {
+        // Not likely to happen, but...
+        err() << "Failed to bind listener socket to port " << port << std::endl;
+        return Error;
+    }
+
+    // Listen to the bound port
+    if (::listen(getHandle(), 0) == -1)
+    {
+        // Oops, socket is deaf
+        err() << "Failed to listen to port " << port << std::endl;
+        return Error;
+    }
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+void TcpListener::close()
+{
+    // Simply close the socket
+    Socket::close();
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpListener::accept(TcpSocket& socket)
+{
+    // Make sure that we're listening
+    if (getHandle() == priv::SocketImpl::invalidSocket())
+    {
+        err() << "Failed to accept a new connection, the socket is not listening" << std::endl;
+        return Error;
+    }
+
+    // Accept a new connection
+    sockaddr_in address;
+    priv::SocketImpl::AddrLength length = sizeof(address);
+    SocketHandle remote = ::accept(getHandle(), reinterpret_cast<sockaddr*>(&address), &length);
+
+    // Check for errors
+    if (remote == priv::SocketImpl::invalidSocket())
+        return priv::SocketImpl::getErrorStatus();
+
+    // Initialize the new connected socket
+    socket.close();
+    socket.create(remote);
+
+    return Done;
+}
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/TcpSocket.cpp b/Externals/SFML/src/SFML/Network/TcpSocket.cpp
new file mode 100644
index 0000000000..b94e196c3b
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/TcpSocket.cpp
@@ -0,0 +1,381 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/TcpSocket.hpp>
+#include <SFML/Network/IPAddress.hpp>
+#include <SFML/Network/Packet.hpp>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/Err.hpp>
+#include <algorithm>
+#include <cstring>
+
+#ifdef _MSC_VER
+    #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
+#endif
+
+
+namespace
+{
+    // Define the low-level send/receive flags, which depend on the OS
+    #ifdef SFML_SYSTEM_LINUX
+        const int flags = MSG_NOSIGNAL;
+    #else
+        const int flags = 0;
+    #endif
+}
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+TcpSocket::TcpSocket() :
+Socket(Tcp)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+unsigned short TcpSocket::getLocalPort() const
+{
+    if (getHandle() != priv::SocketImpl::invalidSocket())
+    {
+        // Retrieve informations about the local end of the socket
+        sockaddr_in address;
+        priv::SocketImpl::AddrLength size = sizeof(address);
+        if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
+        {
+            return ntohs(address.sin_port);
+        }
+    }
+
+    // We failed to retrieve the port
+    return 0;
+}
+
+
+////////////////////////////////////////////////////////////
+IpAddress TcpSocket::getRemoteAddress() const
+{
+    if (getHandle() != priv::SocketImpl::invalidSocket())
+    {
+        // Retrieve informations about the remote end of the socket
+        sockaddr_in address;
+        priv::SocketImpl::AddrLength size = sizeof(address);
+        if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
+        {
+            return IpAddress(ntohl(address.sin_addr.s_addr));
+        }
+    }
+
+    // We failed to retrieve the address
+    return IpAddress::None;
+}
+
+
+////////////////////////////////////////////////////////////
+unsigned short TcpSocket::getRemotePort() const
+{
+    if (getHandle() != priv::SocketImpl::invalidSocket())
+    {
+        // Retrieve informations about the remote end of the socket
+        sockaddr_in address;
+        priv::SocketImpl::AddrLength size = sizeof(address);
+        if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
+        {
+            return ntohs(address.sin_port);
+        }
+    }
+
+    // We failed to retrieve the port
+    return 0;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpSocket::connect(const IpAddress& remoteAddress, unsigned short remotePort, Time timeout)
+{
+    // Create the internal socket if it doesn't exist
+    create();
+
+    // Create the remote address
+    sockaddr_in address = priv::SocketImpl::createAddress(remoteAddress.toInteger(), remotePort);
+
+    if (timeout <= Time::Zero)
+    {
+        // ----- We're not using a timeout: just try to connect -----
+
+        // Connect the socket
+        if (::connect(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) == -1)
+            return priv::SocketImpl::getErrorStatus();
+
+        // Connection succeeded
+        return Done;
+    }
+    else
+    {
+        // ----- We're using a timeout: we'll need a few tricks to make it work -----
+
+        // Save the previous blocking state
+        bool blocking = isBlocking();
+
+        // Switch to non-blocking to enable our connection timeout
+        if (blocking)
+            setBlocking(false);
+
+        // Try to connect to the remote address
+        if (::connect(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) >= 0)
+        {
+            // We got instantly connected! (it may no happen a lot...)
+            return Done;
+        }
+
+        // Get the error status
+        Status status = priv::SocketImpl::getErrorStatus();
+
+        // If we were in non-blocking mode, return immediatly
+        if (!blocking)
+            return status;
+
+        // Otherwise, wait until something happens to our socket (success, timeout or error)
+        if (status == Socket::NotReady)
+        {
+            // Setup the selector
+            fd_set selector;
+            FD_ZERO(&selector);
+            FD_SET(getHandle(), &selector);
+
+            // Setup the timeout
+            timeval time;
+            time.tv_sec  = static_cast<long>(timeout.asMicroseconds() / 1000000);
+            time.tv_usec = static_cast<long>(timeout.asMicroseconds() % 1000000);
+
+            // Wait for something to write on our socket (which means that the connection request has returned)
+            if (select(static_cast<int>(getHandle() + 1), NULL, &selector, NULL, &time) > 0)
+            {
+                // At this point the connection may have been either accepted or refused.
+                // To know whether it's a success or a failure, we must check the address of the connected peer
+                if (getRemoteAddress() != sf::IpAddress::None)
+                {
+                    // Connection accepted
+                    status = Done;
+                }
+                else
+                {
+                    // Connection refused
+                    status = priv::SocketImpl::getErrorStatus();
+                }
+            }
+            else
+            {
+                // Failed to connect before timeout is over
+                status = priv::SocketImpl::getErrorStatus();
+            }
+        }
+
+        // Switch back to blocking mode
+        setBlocking(true);
+
+        return status;
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+void TcpSocket::disconnect()
+{
+    // Close the socket
+    close();
+
+    // Reset the pending packet data
+    m_pendingPacket = PendingPacket();
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpSocket::send(const void* data, std::size_t size)
+{
+    // Check the parameters
+    if (!data || (size == 0))
+    {
+        err() << "Cannot send data over the network (no data to send)" << std::endl;
+        return Error;
+    }
+
+    // Loop until every byte has been sent
+    int sent = 0;
+    int sizeToSend = static_cast<int>(size);
+    for (int length = 0; length < sizeToSend; length += sent)
+    {
+        // Send a chunk of data
+        sent = ::send(getHandle(), static_cast<const char*>(data) + length, sizeToSend - length, flags);
+
+        // Check for errors
+        if (sent < 0)
+            return priv::SocketImpl::getErrorStatus();
+    }
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpSocket::receive(void* data, std::size_t size, std::size_t& received)
+{
+    // First clear the variables to fill
+    received = 0;
+
+    // Check the destination buffer
+    if (!data)
+    {
+        err() << "Cannot receive data from the network (the destination buffer is invalid)" << std::endl;
+        return Error;
+    }
+
+    // Receive a chunk of bytes
+    int sizeReceived = recv(getHandle(), static_cast<char*>(data), static_cast<int>(size), flags);
+
+    // Check the number of bytes received
+    if (sizeReceived > 0)
+    {
+        received = static_cast<std::size_t>(sizeReceived);
+        return Done;
+    }
+    else if (sizeReceived == 0)
+    {
+        return Socket::Disconnected;
+    }
+    else
+    {
+        return priv::SocketImpl::getErrorStatus();
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpSocket::send(Packet& packet)
+{
+    // TCP is a stream protocol, it doesn't preserve messages boundaries.
+    // This means that we have to send the packet size first, so that the
+    // receiver knows the actual end of the packet in the data stream.
+
+    // We allocate an extra memory block so that the size can be sent
+    // together with the data in a single call. This may seem inefficient,
+    // but it is actually required to avoid partial send, which could cause
+    // data corruption on the receiving end.
+
+    // Get the data to send from the packet
+    std::size_t size = 0;
+    const void* data = packet.onSend(size);
+
+    // First convert the packet size to network byte order
+    Uint32 packetSize = htonl(static_cast<Uint32>(size));
+
+    // Allocate memory for the data block to send
+    std::vector<char> blockToSend(sizeof(packetSize) + size);
+
+    // Copy the packet size and data into the block to send
+    std::memcpy(&blockToSend[0], &packetSize, sizeof(packetSize));
+    if (size > 0)
+        std::memcpy(&blockToSend[0] + sizeof(packetSize), data, size);
+
+    // Send the data block
+    return send(&blockToSend[0], blockToSend.size());
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status TcpSocket::receive(Packet& packet)
+{
+    // First clear the variables to fill
+    packet.clear();
+
+    // We start by getting the size of the incoming packet
+    Uint32 packetSize = 0;
+    std::size_t received = 0;
+    if (m_pendingPacket.SizeReceived < sizeof(m_pendingPacket.Size))
+    {
+        // Loop until we've received the entire size of the packet
+        // (even a 4 byte variable may be received in more than one call)
+        while (m_pendingPacket.SizeReceived < sizeof(m_pendingPacket.Size))
+        {
+            char* data = reinterpret_cast<char*>(&m_pendingPacket.Size) + m_pendingPacket.SizeReceived;
+            Status status = receive(data, sizeof(m_pendingPacket.Size) - m_pendingPacket.SizeReceived, received);
+            m_pendingPacket.SizeReceived += received;
+
+            if (status != Done)
+                return status;
+        }
+
+        // The packet size has been fully received
+        packetSize = ntohl(m_pendingPacket.Size);
+    }
+    else
+    {
+        // The packet size has already been received in a previous call
+        packetSize = ntohl(m_pendingPacket.Size);
+    }
+
+    // Loop until we receive all the packet data
+    char buffer[1024];
+    while (m_pendingPacket.Data.size() < packetSize)
+    {
+        // Receive a chunk of data
+        std::size_t sizeToGet = std::min(static_cast<std::size_t>(packetSize - m_pendingPacket.Data.size()), sizeof(buffer));
+        Status status = receive(buffer, sizeToGet, received);
+        if (status != Done)
+            return status;
+
+        // Append it into the packet
+        if (received > 0)
+        {
+            m_pendingPacket.Data.resize(m_pendingPacket.Data.size() + received);
+            char* begin = &m_pendingPacket.Data[0] + m_pendingPacket.Data.size() - received;
+            std::memcpy(begin, buffer, received);
+        }
+    }
+
+    // We have received all the packet data: we can copy it to the user packet
+    if (!m_pendingPacket.Data.empty())
+        packet.onReceive(&m_pendingPacket.Data[0], m_pendingPacket.Data.size());
+
+    // Clear the pending packet data
+    m_pendingPacket = PendingPacket();
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+TcpSocket::PendingPacket::PendingPacket() :
+Size        (0),
+SizeReceived(0),
+Data        ()
+{
+
+}
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/UdpSocket.cpp b/Externals/SFML/src/SFML/Network/UdpSocket.cpp
new file mode 100644
index 0000000000..4653b6607c
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/UdpSocket.cpp
@@ -0,0 +1,193 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/UdpSocket.hpp>
+#include <SFML/Network/IPAddress.hpp>
+#include <SFML/Network/Packet.hpp>
+#include <SFML/Network/SocketImpl.hpp>
+#include <SFML/System/Err.hpp>
+#include <algorithm>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+UdpSocket::UdpSocket() :
+Socket  (Udp),
+m_buffer(MaxDatagramSize)
+{
+
+}
+
+
+////////////////////////////////////////////////////////////
+unsigned short UdpSocket::getLocalPort() const
+{
+    if (getHandle() != priv::SocketImpl::invalidSocket())
+    {
+        // Retrieve informations about the local end of the socket
+        sockaddr_in address;
+        priv::SocketImpl::AddrLength size = sizeof(address);
+        if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
+        {
+            return ntohs(address.sin_port);
+        }
+    }
+
+    // We failed to retrieve the port
+    return 0;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status UdpSocket::bind(unsigned short port)
+{
+    // Create the internal socket if it doesn't exist
+    create();
+
+    // Bind the socket
+    sockaddr_in address = priv::SocketImpl::createAddress(INADDR_ANY, port);
+    if (::bind(getHandle(), reinterpret_cast<sockaddr*>(&address), sizeof(address)) == -1)
+    {
+        err() << "Failed to bind socket to port " << port << std::endl;
+        return Error;
+    }
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+void UdpSocket::unbind()
+{
+    // Simply close the socket
+    close();
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status UdpSocket::send(const void* data, std::size_t size, const IpAddress& remoteAddress, unsigned short remotePort)
+{
+    // Create the internal socket if it doesn't exist
+    create();
+
+    // Make sure that all the data will fit in one datagram
+    if (size > MaxDatagramSize)
+    {
+        err() << "Cannot send data over the network "
+              << "(the number of bytes to send is greater than sf::UdpSocket::MaxDatagramSize)" << std::endl;
+        return Error;
+    }
+
+    // Build the target address
+    sockaddr_in address = priv::SocketImpl::createAddress(remoteAddress.toInteger(), remotePort);
+
+    // Send the data (unlike TCP, all the data is always sent in one call)
+    int sent = sendto(getHandle(), static_cast<const char*>(data), static_cast<int>(size), 0, reinterpret_cast<sockaddr*>(&address), sizeof(address));
+
+    // Check for errors
+    if (sent < 0)
+        return priv::SocketImpl::getErrorStatus();
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status UdpSocket::receive(void* data, std::size_t size, std::size_t& received, IpAddress& remoteAddress, unsigned short& remotePort)
+{
+    // First clear the variables to fill
+    received      = 0;
+    remoteAddress = IpAddress();
+    remotePort    = 0;
+
+    // Check the destination buffer
+    if (!data)
+    {
+        err() << "Cannot receive data from the network (the destination buffer is invalid)" << std::endl;
+        return Error;
+    }
+
+    // Data that will be filled with the other computer's address
+    sockaddr_in address = priv::SocketImpl::createAddress(INADDR_ANY, 0);
+
+    // Receive a chunk of bytes
+    priv::SocketImpl::AddrLength addressSize = sizeof(address);
+    int sizeReceived = recvfrom(getHandle(), static_cast<char*>(data), static_cast<int>(size), 0, reinterpret_cast<sockaddr*>(&address), &addressSize);
+
+    // Check for errors
+    if (sizeReceived < 0)
+        return priv::SocketImpl::getErrorStatus();
+
+    // Fill the sender informations
+    received      = static_cast<std::size_t>(sizeReceived);
+    remoteAddress = IpAddress(ntohl(address.sin_addr.s_addr));
+    remotePort    = ntohs(address.sin_port);
+
+    return Done;
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status UdpSocket::send(Packet& packet, const IpAddress& remoteAddress, unsigned short remotePort)
+{
+    // UDP is a datagram-oriented protocol (as opposed to TCP which is a stream protocol).
+    // Sending one datagram is almost safe: it may be lost but if it's received, then its data
+    // is guaranteed to be ok. However, splitting a packet into multiple datagrams would be highly
+    // unreliable, since datagrams may be reordered, dropped or mixed between different sources.
+    // That's why SFML imposes a limit on packet size so that they can be sent in a single datagram.
+    // This also removes the overhead associated to packets -- there's no size to send in addition
+    // to the packet's data.
+
+    // Get the data to send from the packet
+    std::size_t size = 0;
+    const void* data = packet.onSend(size);
+
+    // Send it
+    return send(data, size, remoteAddress, remotePort);
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status UdpSocket::receive(Packet& packet, IpAddress& remoteAddress, unsigned short& remotePort)
+{
+    // See the detailed comment in send(Packet) above.
+
+    // Receive the datagram
+    std::size_t received = 0;
+    Status status = receive(&m_buffer[0], m_buffer.size(), received, remoteAddress, remotePort);
+
+    // If we received valid data, we can copy it to the user packet
+    packet.clear();
+    if ((status == Done) && (received > 0))
+        packet.onReceive(&m_buffer[0], received);
+
+    return status;
+}
+
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Unix/SocketHelper.cpp b/Externals/SFML/src/SFML/Network/Unix/SocketHelper.cpp
deleted file mode 100644
index 16df524027..0000000000
--- a/Externals/SFML/src/SFML/Network/Unix/SocketHelper.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketHelper.hpp>
-#include <errno.h>
-#include <fcntl.h>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Return the value of the invalid socket
-////////////////////////////////////////////////////////////
-SocketHelper::SocketType SocketHelper::InvalidSocket()
-{
-    return -1;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Close / destroy a socket
-////////////////////////////////////////////////////////////
-bool SocketHelper::Close(SocketHelper::SocketType Socket)
-{
-    return close(Socket) != -1;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Set a socket as blocking or non-blocking
-////////////////////////////////////////////////////////////
-void SocketHelper::SetBlocking(SocketHelper::SocketType Socket, bool Block)
-{
-    int Status = fcntl(Socket, F_GETFL);
-    if (Block)
-        fcntl(Socket, F_SETFL, Status & ~O_NONBLOCK);
-    else
-        fcntl(Socket, F_SETFL, Status | O_NONBLOCK);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the last socket error status
-////////////////////////////////////////////////////////////
-Socket::Status SocketHelper::GetErrorStatus()
-{
-    // The followings are sometimes equal to EWOULDBLOCK,
-    // so we have to make a special case for them in order
-    // to avoid having double values in the switch case
-    if ((errno == EAGAIN) || (errno == EINPROGRESS))
-        return Socket::NotReady;
-
-    switch (errno)
-    {
-        case EWOULDBLOCK :  return Socket::NotReady;
-        case ECONNABORTED : return Socket::Disconnected;
-        case ECONNRESET :   return Socket::Disconnected;
-        case ETIMEDOUT :    return Socket::Disconnected;
-        case ENETRESET :    return Socket::Disconnected;
-        case ENOTCONN :     return Socket::Disconnected;
-        default :           return Socket::Error;
-    }
-}
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Unix/SocketImpl.cpp b/Externals/SFML/src/SFML/Network/Unix/SocketImpl.cpp
new file mode 100644
index 0000000000..7c39ee1ccd
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/Unix/SocketImpl.cpp
@@ -0,0 +1,100 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Unix/SocketImpl.hpp>
+#include <errno.h>
+#include <fcntl.h>
+#include <cstring>
+
+
+namespace sf
+{
+namespace priv
+{
+////////////////////////////////////////////////////////////
+sockaddr_in SocketImpl::createAddress(Uint32 address, unsigned short port)
+{
+    sockaddr_in addr;
+    std::memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
+    addr.sin_addr.s_addr = htonl(address);
+    addr.sin_family      = AF_INET;
+    addr.sin_port        = htons(port);
+
+    return addr;
+}
+
+
+////////////////////////////////////////////////////////////
+SocketHandle SocketImpl::invalidSocket()
+{
+    return -1;
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketImpl::close(SocketHandle sock)
+{
+    ::close(sock);
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketImpl::setBlocking(SocketHandle sock, bool block)
+{
+    int status = fcntl(sock, F_GETFL);
+    if (block)
+        fcntl(sock, F_SETFL, status & ~O_NONBLOCK);
+    else
+        fcntl(sock, F_SETFL, status | O_NONBLOCK);
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status SocketImpl::getErrorStatus()
+{
+    // The followings are sometimes equal to EWOULDBLOCK,
+    // so we have to make a special case for them in order
+    // to avoid having double values in the switch case
+    if ((errno == EAGAIN) || (errno == EINPROGRESS))
+        return Socket::NotReady;
+
+    switch (errno)
+    {
+        case EWOULDBLOCK :  return Socket::NotReady;
+        case ECONNABORTED : return Socket::Disconnected;
+        case ECONNRESET :   return Socket::Disconnected;
+        case ETIMEDOUT :    return Socket::Disconnected;
+        case ENETRESET :    return Socket::Disconnected;
+        case ENOTCONN :     return Socket::Disconnected;
+        case EPIPE :        return Socket::Disconnected;
+        default :           return Socket::Error;
+    }
+}
+
+} // namespace priv
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Unix/SocketImpl.hpp b/Externals/SFML/src/SFML/Network/Unix/SocketImpl.hpp
new file mode 100644
index 0000000000..372fa3c675
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/Unix/SocketImpl.hpp
@@ -0,0 +1,109 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SOCKETIMPL_HPP
+#define SFML_SOCKETIMPL_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Socket.hpp>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+
+
+namespace sf
+{
+namespace priv
+{
+////////////////////////////////////////////////////////////
+/// \brief Helper class implementing all the non-portable
+///        socket stuff; this is the Unix version
+///
+////////////////////////////////////////////////////////////
+class SocketImpl
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    // Types
+    ////////////////////////////////////////////////////////////
+    typedef socklen_t AddrLength;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Create an internal sockaddr_in address
+    ///
+    /// \param address Target address
+    /// \param port    Target port
+    ///
+    /// \return sockaddr_in ready to be used by socket functions
+    ///
+    ////////////////////////////////////////////////////////////
+    static sockaddr_in createAddress(Uint32 address, unsigned short port);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the value of the invalid socket
+    ///
+    /// \return Special value of the invalid socket
+    ///
+    ////////////////////////////////////////////////////////////
+    static SocketHandle invalidSocket();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Close and destroy a socket
+    ///
+    /// \param sock Handle of the socket to close
+    ///
+    ////////////////////////////////////////////////////////////
+    static void close(SocketHandle sock);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Set a socket as blocking or non-blocking
+    ///
+    /// \param sock  Handle of the socket
+    /// \param block New blocking state of the socket
+    ///
+    ////////////////////////////////////////////////////////////
+    static void setBlocking(SocketHandle sock, bool block);
+
+    ////////////////////////////////////////////////////////////
+    /// Get the last socket error status
+    ///
+    /// \return Status corresponding to the last socket error
+    ///
+    ////////////////////////////////////////////////////////////
+    static Socket::Status getErrorStatus();
+};
+
+} // namespace priv
+
+} // namespace sf
+
+
+#endif // SFML_SOCKETIMPL_HPP
diff --git a/Externals/SFML/src/SFML/Network/Win32/SocketHelper.cpp b/Externals/SFML/src/SFML/Network/Win32/SocketHelper.cpp
deleted file mode 100644
index e4389f2e88..0000000000
--- a/Externals/SFML/src/SFML/Network/Win32/SocketHelper.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-//    you must not claim that you wrote the original software.
-//    If you use this software in a product, an acknowledgment
-//    in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-//    and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketHelper.hpp>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Return the value of the invalid socket
-////////////////////////////////////////////////////////////
-SocketHelper::SocketType SocketHelper::InvalidSocket()
-{
-    return INVALID_SOCKET;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Close / destroy a socket
-////////////////////////////////////////////////////////////
-bool SocketHelper::Close(SocketHelper::SocketType Socket)
-{
-    return closesocket(Socket) != -1;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Set a socket as blocking or non-blocking
-////////////////////////////////////////////////////////////
-void SocketHelper::SetBlocking(SocketHelper::SocketType Socket, bool Block)
-{
-    unsigned long Blocking = Block ? 0 : 1;
-    ioctlsocket(Socket, FIONBIO, &Blocking);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Get the last socket error status
-////////////////////////////////////////////////////////////
-Socket::Status SocketHelper::GetErrorStatus()
-{
-    switch (WSAGetLastError())
-    {
-        case WSAEWOULDBLOCK :  return Socket::NotReady;
-        case WSAECONNABORTED : return Socket::Disconnected;
-        case WSAECONNRESET :   return Socket::Disconnected;
-        case WSAETIMEDOUT :    return Socket::Disconnected;
-        case WSAENETRESET :    return Socket::Disconnected;
-        case WSAENOTCONN :     return Socket::Disconnected;
-        default :              return Socket::Error;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-// Windows needs some initialization and cleanup to get
-// sockets working properly... so let's create a class that will
-// do it automatically
-////////////////////////////////////////////////////////////
-struct SocketInitializer
-{
-    SocketInitializer()
-    {
-        WSADATA InitData;
-        WSAStartup(MAKEWORD(2,2), &InitData);
-    }
-
-    ~SocketInitializer()
-    {
-        WSACleanup();
-    }
-};
-
-SocketInitializer GlobalInitializer;
-
-} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Win32/SocketImpl.cpp b/Externals/SFML/src/SFML/Network/Win32/SocketImpl.cpp
new file mode 100644
index 0000000000..d6f633fad3
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/Win32/SocketImpl.cpp
@@ -0,0 +1,112 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Network/Win32/SocketImpl.hpp>
+#include <cstring>
+
+
+namespace sf
+{
+namespace priv
+{
+////////////////////////////////////////////////////////////
+sockaddr_in SocketImpl::createAddress(Uint32 address, unsigned short port)
+{
+    sockaddr_in addr;
+    std::memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
+    addr.sin_addr.s_addr = htonl(address);
+    addr.sin_family      = AF_INET;
+    addr.sin_port        = htons(port);
+
+    return addr;
+}
+
+
+////////////////////////////////////////////////////////////
+SocketHandle SocketImpl::invalidSocket()
+{
+    return INVALID_SOCKET;
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketImpl::close(SocketHandle sock)
+{
+    closesocket(sock);
+}
+
+
+////////////////////////////////////////////////////////////
+void SocketImpl::setBlocking(SocketHandle sock, bool block)
+{
+    u_long blocking = block ? 0 : 1;
+    ioctlsocket(sock, FIONBIO, &blocking);
+}
+
+
+////////////////////////////////////////////////////////////
+Socket::Status SocketImpl::getErrorStatus()
+{
+    switch (WSAGetLastError())
+    {
+        case WSAEWOULDBLOCK :  return Socket::NotReady;
+        case WSAEALREADY :     return Socket::NotReady;
+        case WSAECONNABORTED : return Socket::Disconnected;
+        case WSAECONNRESET :   return Socket::Disconnected;
+        case WSAETIMEDOUT :    return Socket::Disconnected;
+        case WSAENETRESET :    return Socket::Disconnected;
+        case WSAENOTCONN :     return Socket::Disconnected;
+        case WSAEISCONN :      return Socket::Done; // when connecting a non-blocking socket
+        default :              return Socket::Error;
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+// Windows needs some initialization and cleanup to get
+// sockets working properly... so let's create a class that will
+// do it automatically
+////////////////////////////////////////////////////////////
+struct SocketInitializer
+{
+    SocketInitializer()
+    {
+        WSADATA init;
+        WSAStartup(MAKEWORD(2, 2), &init);
+    }
+
+    ~SocketInitializer()
+    {
+        WSACleanup();
+    }
+};
+
+SocketInitializer globalInitializer;
+
+} // namespace priv
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/Network/Win32/SocketImpl.hpp b/Externals/SFML/src/SFML/Network/Win32/SocketImpl.hpp
new file mode 100644
index 0000000000..04feec4698
--- /dev/null
+++ b/Externals/SFML/src/SFML/Network/Win32/SocketImpl.hpp
@@ -0,0 +1,112 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_SOCKETIMPL_HPP
+#define SFML_SOCKETIMPL_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#ifdef _WIN32_WINDOWS
+    #undef _WIN32_WINDOWS
+#endif
+#ifdef _WIN32_WINNT
+    #undef _WIN32_WINNT
+#endif
+#define _WIN32_WINDOWS 0x0501
+#define _WIN32_WINNT   0x0501
+#include <SFML/Network/Socket.hpp>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+
+namespace sf
+{
+namespace priv
+{
+////////////////////////////////////////////////////////////
+/// \brief Helper class implementing all the non-portable
+///        socket stuff; this is the Windows version
+///
+////////////////////////////////////////////////////////////
+class SocketImpl
+{
+public :
+
+    ////////////////////////////////////////////////////////////
+    // Types
+    ////////////////////////////////////////////////////////////
+    typedef int AddrLength;
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Create an internal sockaddr_in address
+    ///
+    /// \param address Target address
+    /// \param port    Target port
+    ///
+    /// \return sockaddr_in ready to be used by socket functions
+    ///
+    ////////////////////////////////////////////////////////////
+    static sockaddr_in createAddress(Uint32 address, unsigned short port);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Return the value of the invalid socket
+    ///
+    /// \return Special value of the invalid socket
+    ///
+    ////////////////////////////////////////////////////////////
+    static SocketHandle invalidSocket();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Close and destroy a socket
+    ///
+    /// \param sock Handle of the socket to close
+    ///
+    ////////////////////////////////////////////////////////////
+    static void close(SocketHandle sock);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Set a socket as blocking or non-blocking
+    ///
+    /// \param sock  Handle of the socket
+    /// \param block New blocking state of the socket
+    ///
+    ////////////////////////////////////////////////////////////
+    static void setBlocking(SocketHandle sock, bool block);
+
+    ////////////////////////////////////////////////////////////
+    /// Get the last socket error status
+    ///
+    /// \return Status corresponding to the last socket error
+    ///
+    ////////////////////////////////////////////////////////////
+    static Socket::Status getErrorStatus();
+};
+
+} // namespace priv
+
+} // namespace sf
+
+
+#endif // SFML_SOCKETIMPL_HPP
diff --git a/Externals/SFML/src/SFML/System/Err.cpp b/Externals/SFML/src/SFML/System/Err.cpp
new file mode 100644
index 0000000000..2c95698edb
--- /dev/null
+++ b/Externals/SFML/src/SFML/System/Err.cpp
@@ -0,0 +1,110 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Err.hpp>
+#include <streambuf>
+#include <cstdio>
+
+
+namespace
+{
+// This class will be used as the default streambuf of sf::Err,
+// it outputs to stderr by default (to keep the default behaviour)
+class DefaultErrStreamBuf : public std::streambuf
+{
+public :
+
+    DefaultErrStreamBuf()
+    {
+        // Allocate the write buffer
+        static const int size = 64;
+        char* buffer = new char[size];
+        setp(buffer, buffer + size);
+    }
+
+    ~DefaultErrStreamBuf()
+    {
+        // Synchronize
+        sync();
+
+        // Delete the write buffer
+        delete[] pbase();
+    }
+
+private :
+
+    virtual int overflow(int character)
+    {
+        if ((character != EOF) && (pptr() != epptr()))
+        {
+            // Valid character
+            return sputc(static_cast<char>(character));
+        }
+        else if (character != EOF)
+        {
+            // Not enough space in the buffer: synchronize output and try again
+            sync();
+            return overflow(character);
+        }
+        else
+        {
+            // Invalid character: synchronize output
+            return sync();
+        }
+    }
+
+    virtual int sync()
+    {
+        // Check if there is something into the write buffer
+        if (pbase() != pptr())
+        {
+            // Print the contents of the write buffer into the standard error output
+            std::size_t size = static_cast<int>(pptr() - pbase());
+            fwrite(pbase(), 1, size, stderr);
+
+            // Reset the pointer position to the beginning of the write buffer
+            setp(pbase(), epptr());
+        }
+
+        return 0;
+    }
+};
+}
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+std::ostream& err()
+{
+    static DefaultErrStreamBuf buffer;
+    static std::ostream stream(&buffer);
+
+    return stream;
+}
+
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/System/String.cpp b/Externals/SFML/src/SFML/System/String.cpp
new file mode 100644
index 0000000000..dc191318ec
--- /dev/null
+++ b/Externals/SFML/src/SFML/System/String.cpp
@@ -0,0 +1,335 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/String.hpp>
+#include <SFML/System/Utf.hpp>
+#include <iterator>
+#include <cstring>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+const std::size_t String::InvalidPos = std::basic_string<Uint32>::npos;
+
+
+////////////////////////////////////////////////////////////
+String::String()
+{
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(char ansiChar, const std::locale& locale)
+{
+    m_string += Utf32::decodeAnsi(ansiChar, locale);
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(wchar_t wideChar)
+{
+    m_string += Utf32::decodeWide(wideChar);
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(Uint32 utf32Char)
+{
+    m_string += utf32Char;
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const char* ansiString, const std::locale& locale)
+{
+    if (ansiString)
+    {
+        std::size_t length = strlen(ansiString);
+        if (length > 0)
+        {
+            m_string.reserve(length + 1);
+            Utf32::fromAnsi(ansiString, ansiString + length, std::back_inserter(m_string), locale);
+        }
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const std::string& ansiString, const std::locale& locale)
+{
+    m_string.reserve(ansiString.length() + 1);
+    Utf32::fromAnsi(ansiString.begin(), ansiString.end(), std::back_inserter(m_string), locale);
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const wchar_t* wideString)
+{
+    if (wideString)
+    {
+        std::size_t length = std::wcslen(wideString);
+        if (length > 0)
+        {
+            m_string.reserve(length + 1);
+            Utf32::fromWide(wideString, wideString + length, std::back_inserter(m_string));
+        }
+    }
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const std::wstring& wideString)
+{
+    m_string.reserve(wideString.length() + 1);
+    Utf32::fromWide(wideString.begin(), wideString.end(), std::back_inserter(m_string));
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const Uint32* utf32String)
+{
+    if (utf32String)
+        m_string = utf32String;
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const std::basic_string<Uint32>& utf32String) :
+m_string(utf32String)
+{
+}
+
+
+////////////////////////////////////////////////////////////
+String::String(const String& copy) :
+m_string(copy.m_string)
+{
+}
+
+
+////////////////////////////////////////////////////////////
+String::operator std::string() const
+{
+    return toAnsiString();
+}
+
+
+////////////////////////////////////////////////////////////
+String::operator std::wstring() const
+{
+    return toWideString();
+}
+
+
+////////////////////////////////////////////////////////////
+std::string String::toAnsiString(const std::locale& locale) const
+{
+    // Prepare the output string
+    std::string output;
+    output.reserve(m_string.length() + 1);
+
+    // Convert
+    Utf32::toAnsi(m_string.begin(), m_string.end(), std::back_inserter(output), 0, locale);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+std::wstring String::toWideString() const
+{
+    // Prepare the output string
+    std::wstring output;
+    output.reserve(m_string.length() + 1);
+
+    // Convert
+    Utf32::toWide(m_string.begin(), m_string.end(), std::back_inserter(output), 0);
+
+    return output;
+}
+
+
+////////////////////////////////////////////////////////////
+String& String::operator =(const String& right)
+{
+    m_string = right.m_string;
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+String& String::operator +=(const String& right)
+{
+    m_string += right.m_string;
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Uint32 String::operator [](std::size_t index) const
+{
+    return m_string[index];
+}
+
+
+////////////////////////////////////////////////////////////
+Uint32& String::operator [](std::size_t index)
+{
+    return m_string[index];
+}
+
+
+////////////////////////////////////////////////////////////
+void String::clear()
+{
+    m_string.clear();
+}
+
+
+////////////////////////////////////////////////////////////
+std::size_t String::getSize() const
+{
+    return m_string.size();
+}
+
+
+////////////////////////////////////////////////////////////
+bool String::isEmpty() const
+{
+    return m_string.empty();
+}
+
+
+////////////////////////////////////////////////////////////
+void String::erase(std::size_t position, std::size_t count)
+{
+    m_string.erase(position, count);
+}
+
+
+////////////////////////////////////////////////////////////
+void String::insert(std::size_t position, const String& str)
+{
+    m_string.insert(position, str.m_string);
+}
+
+
+////////////////////////////////////////////////////////////
+std::size_t String::find(const String& str, std::size_t start) const
+{
+    return m_string.find(str.m_string, start);
+}
+
+
+////////////////////////////////////////////////////////////
+const Uint32* String::getData() const
+{
+    return m_string.c_str();
+}
+
+
+////////////////////////////////////////////////////////////
+String::Iterator String::begin()
+{
+    return m_string.begin();
+}
+
+
+////////////////////////////////////////////////////////////
+String::ConstIterator String::begin() const
+{
+    return m_string.begin();
+}
+
+
+////////////////////////////////////////////////////////////
+String::Iterator String::end()
+{
+    return m_string.end();
+}
+
+
+////////////////////////////////////////////////////////////
+String::ConstIterator String::end() const
+{
+    return m_string.end();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator ==(const String& left, const String& right)
+{
+    return left.m_string == right.m_string;
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator !=(const String& left, const String& right)
+{
+    return !(left == right);
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator <(const String& left, const String& right)
+{
+    return left.m_string < right.m_string;
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator >(const String& left, const String& right)
+{
+    return right < left;
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator <=(const String& left, const String& right)
+{
+    return !(right < left);
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator >=(const String& left, const String& right)
+{
+    return !(left < right);
+}
+
+
+////////////////////////////////////////////////////////////
+String operator +(const String& left, const String& right)
+{
+    String string = left;
+    string += right;
+
+    return string;
+}
+
+} // namespace sf
diff --git a/Externals/SFML/src/SFML/System/Time.cpp b/Externals/SFML/src/SFML/System/Time.cpp
new file mode 100644
index 0000000000..69fd78ef1a
--- /dev/null
+++ b/Externals/SFML/src/SFML/System/Time.cpp
@@ -0,0 +1,239 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Time.hpp>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+const Time Time::Zero;
+
+
+////////////////////////////////////////////////////////////
+Time::Time() :
+m_microseconds(0)
+{
+}
+
+
+////////////////////////////////////////////////////////////
+float Time::asSeconds() const
+{
+    return m_microseconds / 1000000.f;
+}
+
+
+////////////////////////////////////////////////////////////
+Int32 Time::asMilliseconds() const
+{
+    return static_cast<Int32>(m_microseconds / 1000);
+}
+
+
+////////////////////////////////////////////////////////////
+Int64 Time::asMicroseconds() const
+{
+    return m_microseconds;
+}
+
+
+////////////////////////////////////////////////////////////
+Time::Time(Int64 microseconds) :
+m_microseconds(microseconds)
+{
+}
+
+
+////////////////////////////////////////////////////////////
+Time seconds(float amount)
+{
+    return Time(static_cast<Int64>(amount * 1000000));
+}
+
+
+////////////////////////////////////////////////////////////
+Time milliseconds(Int32 amount)
+{
+    return Time(static_cast<Int64>(amount) * 1000);
+}
+
+
+////////////////////////////////////////////////////////////
+Time microseconds(Int64 amount)
+{
+    return Time(amount);
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator ==(Time left, Time right)
+{
+    return left.asMicroseconds() == right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator !=(Time left, Time right)
+{
+    return left.asMicroseconds() != right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator <(Time left, Time right)
+{
+    return left.asMicroseconds() < right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator >(Time left, Time right)
+{
+    return left.asMicroseconds() > right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator <=(Time left, Time right)
+{
+    return left.asMicroseconds() <= right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+bool operator >=(Time left, Time right)
+{
+    return left.asMicroseconds() >= right.asMicroseconds();
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator -(Time right)
+{
+    return microseconds(-right.asMicroseconds());
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator +(Time left, Time right)
+{
+    return microseconds(left.asMicroseconds() + right.asMicroseconds());
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator +=(Time& left, Time right)
+{
+    return left = left + right;
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator -(Time left, Time right)
+{
+    return microseconds(left.asMicroseconds() - right.asMicroseconds());
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator -=(Time& left, Time right)
+{
+    return left = left - right;
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator *(Time left, float right)
+{
+    return seconds(left.asSeconds() * right);
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator *(Time left, Int64 right)
+{
+    return microseconds(left.asMicroseconds() * right);
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator *(float left, Time right)
+{
+    return right * left;
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator *(Int64 left, Time right)
+{
+    return right * left;
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator *=(Time& left, float right)
+{
+    return left = left * right;
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator *=(Time& left, Int64 right)
+{
+    return left = left * right;
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator /(Time left, float right)
+{
+    return seconds(left.asSeconds() / right);
+}
+
+
+////////////////////////////////////////////////////////////
+Time operator /(Time left, Int64 right)
+{
+    return microseconds(left.asMicroseconds() / right);
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator /=(Time& left, float right)
+{
+    return left = left / right;
+}
+
+
+////////////////////////////////////////////////////////////
+Time& operator /=(Time& left, Int64 right)
+{
+    return left = left / right;
+}
+
+} // namespace sf
diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj
index 33f75bbaf9..77b61ff418 100644
--- a/Externals/SOIL/SOIL.vcxproj
+++ b/Externals/SOIL/SOIL.vcxproj
@@ -1,139 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}</ProjectGuid>
-    <RootNamespace>SOIL</RootNamespace>
+    <ProjectGuid>{B441CC62-877E-4B3F-93E0-0DE80544F705}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="image_DXT.c" />
     <ClCompile Include="image_helper.c" />
@@ -148,9 +51,6 @@
     <ClInclude Include="stbi_DDS_aug_c.h" />
     <ClInclude Include="stb_image_aug.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Externals/XAudio2_7/XAudio2.h b/Externals/XAudio2_7/XAudio2.h
new file mode 100644
index 0000000000..885b92f919
--- /dev/null
+++ b/Externals/XAudio2_7/XAudio2.h
@@ -0,0 +1,1282 @@
+/**************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation.  All rights reserved.
+ *
+ * File:    xaudio2.h
+ * Content: Declarations for the XAudio2 game audio API.
+ *
+ **************************************************************************/
+
+#ifndef __XAUDIO2_INCLUDED__
+#define __XAUDIO2_INCLUDED__
+
+
+/**************************************************************************
+ *
+ * XAudio2 COM object class and interface IDs.
+ *
+ **************************************************************************/
+
+#include <comdecl.h>        // For DEFINE_CLSID and DEFINE_IID
+
+// XAudio 2.0 (March 2008 SDK)
+//DEFINE_CLSID(XAudio2, fac23f48, 31f5, 45a8, b4, 9b, 52, 25, d6, 14, 01, aa);
+//DEFINE_CLSID(XAudio2_Debug, fac23f48, 31f5, 45a8, b4, 9b, 52, 25, d6, 14, 01, db);
+
+// XAudio 2.1 (June 2008 SDK)
+//DEFINE_CLSID(XAudio2, e21a7345, eb21, 468e, be, 50, 80, 4d, b9, 7c, f7, 08);
+//DEFINE_CLSID(XAudio2_Debug, f7a76c21, 53d4, 46bb, ac, 53, 8b, 45, 9c, ae, 46, bd);
+
+// XAudio 2.2 (August 2008 SDK)
+//DEFINE_CLSID(XAudio2, b802058a, 464a, 42db, bc, 10, b6, 50, d6, f2, 58, 6a);
+//DEFINE_CLSID(XAudio2_Debug, 97dfb7e7, 5161, 4015, 87, a9, c7, 9e, 6a, 19, 52, cc);
+
+// XAudio 2.3 (November 2008 SDK)
+//DEFINE_CLSID(XAudio2, 4c5e637a, 16c7, 4de3, 9c, 46, 5e, d2, 21, 81, 96, 2d);
+//DEFINE_CLSID(XAudio2_Debug, ef0aa05d, 8075, 4e5d, be, ad, 45, be, 0c, 3c, cb, b3);
+
+// XAudio 2.4 (March 2009 SDK)
+//DEFINE_CLSID(XAudio2, 03219e78, 5bc3, 44d1, b9, 2e, f6, 3d, 89, cc, 65, 26);
+//DEFINE_CLSID(XAudio2_Debug, 4256535c, 1ea4, 4d4b, 8a, d5, f9, db, 76, 2e, ca, 9e);
+
+// XAudio 2.5 (August 2009 SDK)
+//DEFINE_CLSID(XAudio2, 4c9b6dde, 6809, 46e6, a2, 78, 9b, 6a, 97, 58, 86, 70);
+//DEFINE_CLSID(XAudio2_Debug, 715bdd1a, aa82, 436b, b0, fa, 6a, ce, a3, 9b, d0, a1);
+
+// XAudio 2.6 (February 2010 SDK)
+//DEFINE_CLSID(XAudio2, 3eda9b49, 2085, 498b, 9b, b2, 39, a6, 77, 84, 93, de);
+//DEFINE_CLSID(XAudio2_Debug, 47199894, 7cc2, 444d, 98, 73, ce, d2, 56, 2c, c6, 0e);
+
+// XAudio 2.7 (June 2010 SDK)
+DEFINE_CLSID(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af);
+DEFINE_CLSID(XAudio2_Debug, db05ea35, 0329, 4d4b, a5, 3a, 6d, ea, d0, 3d, 38, 52);
+DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
+
+
+// Ignore the rest of this header if only the GUID definitions were requested
+#ifndef GUID_DEFS_ONLY
+
+#ifdef _XBOX
+    #include <xobjbase.h>   // Xbox COM declarations (IUnknown, etc)
+#else
+    #include <objbase.h>    // Windows COM declarations
+#endif
+
+#include <sal.h>            // Markers for documenting API semantics
+#include <audiodefs.h>      // Basic audio data types and constants
+#include <xma2defs.h>       // Data types and constants for XMA2 audio
+
+// All structures defined in this file use tight field packing
+#pragma pack(push, 1)
+
+
+/**************************************************************************
+ *
+ * XAudio2 constants, flags and error codes.
+ *
+ **************************************************************************/
+
+// Numeric boundary values
+#define XAUDIO2_MAX_BUFFER_BYTES        0x80000000    // Maximum bytes allowed in a source buffer
+#define XAUDIO2_MAX_QUEUED_BUFFERS      64            // Maximum buffers allowed in a voice queue
+#define XAUDIO2_MAX_BUFFERS_SYSTEM      2             // Maximum buffers allowed for system threads (Xbox 360 only)
+#define XAUDIO2_MAX_AUDIO_CHANNELS      64            // Maximum channels in an audio stream
+#define XAUDIO2_MIN_SAMPLE_RATE         1000          // Minimum audio sample rate supported
+#define XAUDIO2_MAX_SAMPLE_RATE         200000        // Maximum audio sample rate supported
+#define XAUDIO2_MAX_VOLUME_LEVEL        16777216.0f   // Maximum acceptable volume level (2^24)
+#define XAUDIO2_MIN_FREQ_RATIO          (1/1024.0f)   // Minimum SetFrequencyRatio argument
+#define XAUDIO2_MAX_FREQ_RATIO          1024.0f       // Maximum MaxFrequencyRatio argument
+#define XAUDIO2_DEFAULT_FREQ_RATIO      2.0f          // Default MaxFrequencyRatio argument
+#define XAUDIO2_MAX_FILTER_ONEOVERQ     1.5f          // Maximum XAUDIO2_FILTER_PARAMETERS.OneOverQ
+#define XAUDIO2_MAX_FILTER_FREQUENCY    1.0f          // Maximum XAUDIO2_FILTER_PARAMETERS.Frequency
+#define XAUDIO2_MAX_LOOP_COUNT          254           // Maximum non-infinite XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_MAX_INSTANCES           8             // Maximum simultaneous XAudio2 objects on Xbox 360
+
+// For XMA voices on Xbox 360 there is an additional restriction on the MaxFrequencyRatio
+// argument and the voice's sample rate: the product of these numbers cannot exceed 600000
+// for one-channel voices or 300000 for voices with more than one channel.
+#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MONO         600000
+#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MULTICHANNEL 300000
+
+// Numeric values with special meanings
+#define XAUDIO2_COMMIT_NOW              0             // Used as an OperationSet argument
+#define XAUDIO2_COMMIT_ALL              0             // Used in IXAudio2::CommitChanges
+#define XAUDIO2_INVALID_OPSET           (UINT32)(-1)  // Not allowed for OperationSet arguments
+#define XAUDIO2_NO_LOOP_REGION          0             // Used in XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_LOOP_INFINITE           255           // Used in XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_DEFAULT_CHANNELS        0             // Used in CreateMasteringVoice
+#define XAUDIO2_DEFAULT_SAMPLERATE      0             // Used in CreateMasteringVoice
+
+// Flags
+#define XAUDIO2_DEBUG_ENGINE            0x0001        // Used in XAudio2Create on Windows only
+#define XAUDIO2_VOICE_NOPITCH           0x0002        // Used in IXAudio2::CreateSourceVoice
+#define XAUDIO2_VOICE_NOSRC             0x0004        // Used in IXAudio2::CreateSourceVoice
+#define XAUDIO2_VOICE_USEFILTER         0x0008        // Used in IXAudio2::CreateSource/SubmixVoice
+#define XAUDIO2_VOICE_MUSIC             0x0010        // Used in IXAudio2::CreateSourceVoice
+#define XAUDIO2_PLAY_TAILS              0x0020        // Used in IXAudio2SourceVoice::Stop
+#define XAUDIO2_END_OF_STREAM           0x0040        // Used in XAUDIO2_BUFFER.Flags
+#define XAUDIO2_SEND_USEFILTER          0x0080        // Used in XAUDIO2_SEND_DESCRIPTOR.Flags
+
+// Default parameters for the built-in filter
+#define XAUDIO2_DEFAULT_FILTER_TYPE     LowPassFilter
+#define XAUDIO2_DEFAULT_FILTER_FREQUENCY XAUDIO2_MAX_FILTER_FREQUENCY
+#define XAUDIO2_DEFAULT_FILTER_ONEOVERQ 1.0f
+
+// Internal XAudio2 constants
+#ifdef _XBOX
+    #define XAUDIO2_QUANTUM_NUMERATOR   2             // On Xbox 360, XAudio2 processes audio
+    #define XAUDIO2_QUANTUM_DENOMINATOR 375           //  in 5.333ms chunks (= 2/375 seconds)
+#else
+    #define XAUDIO2_QUANTUM_NUMERATOR   1             // On Windows, XAudio2 processes audio
+    #define XAUDIO2_QUANTUM_DENOMINATOR 100           //  in 10ms chunks (= 1/100 seconds)
+#endif
+#define XAUDIO2_QUANTUM_MS (1000.0f * XAUDIO2_QUANTUM_NUMERATOR / XAUDIO2_QUANTUM_DENOMINATOR)
+
+// XAudio2 error codes
+#define FACILITY_XAUDIO2 0x896
+#define XAUDIO2_E_INVALID_CALL          0x88960001    // An API call or one of its arguments was illegal
+#define XAUDIO2_E_XMA_DECODER_ERROR     0x88960002    // The XMA hardware suffered an unrecoverable error
+#define XAUDIO2_E_XAPO_CREATION_FAILED  0x88960003    // XAudio2 failed to initialize an XAPO effect
+#define XAUDIO2_E_DEVICE_INVALIDATED    0x88960004    // An audio device became unusable (unplugged, etc)
+
+
+/**************************************************************************
+ *
+ * Forward declarations for the XAudio2 interfaces.
+ *
+ **************************************************************************/
+
+#ifdef __cplusplus
+    #define FWD_DECLARE(x) interface x
+#else
+    #define FWD_DECLARE(x) typedef interface x x
+#endif
+
+FWD_DECLARE(IXAudio2);
+FWD_DECLARE(IXAudio2Voice);
+FWD_DECLARE(IXAudio2SourceVoice);
+FWD_DECLARE(IXAudio2SubmixVoice);
+FWD_DECLARE(IXAudio2MasteringVoice);
+FWD_DECLARE(IXAudio2EngineCallback);
+FWD_DECLARE(IXAudio2VoiceCallback);
+
+
+/**************************************************************************
+ *
+ * XAudio2 structures and enumerations.
+ *
+ **************************************************************************/
+
+// Used in IXAudio2::Initialize
+#ifdef _XBOX
+    typedef enum XAUDIO2_XBOX_HWTHREAD_SPECIFIER
+    {
+        XboxThread0 = 0x01,
+        XboxThread1 = 0x02,
+        XboxThread2 = 0x04,
+        XboxThread3 = 0x08,
+        XboxThread4 = 0x10,
+        XboxThread5 = 0x20,
+        XAUDIO2_ANY_PROCESSOR = XboxThread4,
+        XAUDIO2_DEFAULT_PROCESSOR = XAUDIO2_ANY_PROCESSOR
+    } XAUDIO2_XBOX_HWTHREAD_SPECIFIER, XAUDIO2_PROCESSOR;
+#else
+    typedef enum XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER
+    {
+        Processor1  = 0x00000001,
+        Processor2  = 0x00000002,
+        Processor3  = 0x00000004,
+        Processor4  = 0x00000008,
+        Processor5  = 0x00000010,
+        Processor6  = 0x00000020,
+        Processor7  = 0x00000040,
+        Processor8  = 0x00000080,
+        Processor9  = 0x00000100,
+        Processor10 = 0x00000200,
+        Processor11 = 0x00000400,
+        Processor12 = 0x00000800,
+        Processor13 = 0x00001000,
+        Processor14 = 0x00002000,
+        Processor15 = 0x00004000,
+        Processor16 = 0x00008000,
+        Processor17 = 0x00010000,
+        Processor18 = 0x00020000,
+        Processor19 = 0x00040000,
+        Processor20 = 0x00080000,
+        Processor21 = 0x00100000,
+        Processor22 = 0x00200000,
+        Processor23 = 0x00400000,
+        Processor24 = 0x00800000,
+        Processor25 = 0x01000000,
+        Processor26 = 0x02000000,
+        Processor27 = 0x04000000,
+        Processor28 = 0x08000000,
+        Processor29 = 0x10000000,
+        Processor30 = 0x20000000,
+        Processor31 = 0x40000000,
+        Processor32 = 0x80000000,
+        XAUDIO2_ANY_PROCESSOR = 0xffffffff,
+        XAUDIO2_DEFAULT_PROCESSOR = XAUDIO2_ANY_PROCESSOR
+    } XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER, XAUDIO2_PROCESSOR;
+#endif
+
+// Used in XAUDIO2_DEVICE_DETAILS below to describe the types of applications
+// that the user has specified each device as a default for.  0 means that the
+// device isn't the default for any role.
+typedef enum XAUDIO2_DEVICE_ROLE
+{
+    NotDefaultDevice            = 0x0,
+    DefaultConsoleDevice        = 0x1,
+    DefaultMultimediaDevice     = 0x2,
+    DefaultCommunicationsDevice = 0x4,
+    DefaultGameDevice           = 0x8,
+    GlobalDefaultDevice         = 0xf,
+    InvalidDeviceRole = ~GlobalDefaultDevice
+} XAUDIO2_DEVICE_ROLE;
+
+// Returned by IXAudio2::GetDeviceDetails
+typedef struct XAUDIO2_DEVICE_DETAILS
+{
+    WCHAR DeviceID[256];                // String identifier for the audio device.
+    WCHAR DisplayName[256];             // Friendly name suitable for display to a human.
+    XAUDIO2_DEVICE_ROLE Role;           // Roles that the device should be used for.
+    WAVEFORMATEXTENSIBLE OutputFormat;  // The device's native PCM audio output format.
+} XAUDIO2_DEVICE_DETAILS;
+
+// Returned by IXAudio2Voice::GetVoiceDetails
+typedef struct XAUDIO2_VOICE_DETAILS
+{
+    UINT32 CreationFlags;               // Flags the voice was created with.
+    UINT32 InputChannels;               // Channels in the voice's input audio.
+    UINT32 InputSampleRate;             // Sample rate of the voice's input audio.
+} XAUDIO2_VOICE_DETAILS;
+
+// Used in XAUDIO2_VOICE_SENDS below
+typedef struct XAUDIO2_SEND_DESCRIPTOR
+{
+    UINT32 Flags;                       // Either 0 or XAUDIO2_SEND_USEFILTER.
+    IXAudio2Voice* pOutputVoice;        // This send's destination voice.
+} XAUDIO2_SEND_DESCRIPTOR;
+
+// Used in the voice creation functions and in IXAudio2Voice::SetOutputVoices
+typedef struct XAUDIO2_VOICE_SENDS
+{
+    UINT32 SendCount;                   // Number of sends from this voice.
+    XAUDIO2_SEND_DESCRIPTOR* pSends;    // Array of SendCount send descriptors.
+} XAUDIO2_VOICE_SENDS;
+
+// Used in XAUDIO2_EFFECT_CHAIN below
+typedef struct XAUDIO2_EFFECT_DESCRIPTOR
+{
+    IUnknown* pEffect;                  // Pointer to the effect object's IUnknown interface.
+    BOOL InitialState;                  // TRUE if the effect should begin in the enabled state.
+    UINT32 OutputChannels;              // How many output channels the effect should produce.
+} XAUDIO2_EFFECT_DESCRIPTOR;
+
+// Used in the voice creation functions and in IXAudio2Voice::SetEffectChain
+typedef struct XAUDIO2_EFFECT_CHAIN
+{
+    UINT32 EffectCount;                 // Number of effects in this voice's effect chain.
+    XAUDIO2_EFFECT_DESCRIPTOR* pEffectDescriptors; // Array of effect descriptors.
+} XAUDIO2_EFFECT_CHAIN;
+
+// Used in XAUDIO2_FILTER_PARAMETERS below
+typedef enum XAUDIO2_FILTER_TYPE
+{
+    LowPassFilter,                      // Attenuates frequencies above the cutoff frequency.
+    BandPassFilter,                     // Attenuates frequencies outside a given range.
+    HighPassFilter,                     // Attenuates frequencies below the cutoff frequency.
+    NotchFilter                         // Attenuates frequencies inside a given range.
+} XAUDIO2_FILTER_TYPE;
+
+// Used in IXAudio2Voice::Set/GetFilterParameters and Set/GetOutputFilterParameters
+typedef struct XAUDIO2_FILTER_PARAMETERS
+{
+    XAUDIO2_FILTER_TYPE Type;           // Low-pass, band-pass or high-pass.
+    float Frequency;                    // Radian frequency (2 * sin(pi*CutoffFrequency/SampleRate));
+                                        //  must be >= 0 and <= XAUDIO2_MAX_FILTER_FREQUENCY
+                                        //  (giving a maximum CutoffFrequency of SampleRate/6).
+    float OneOverQ;                     // Reciprocal of the filter's quality factor Q;
+                                        //  must be > 0 and <= XAUDIO2_MAX_FILTER_ONEOVERQ.
+} XAUDIO2_FILTER_PARAMETERS;
+
+// Used in IXAudio2SourceVoice::SubmitSourceBuffer
+typedef struct XAUDIO2_BUFFER
+{
+    UINT32 Flags;                       // Either 0 or XAUDIO2_END_OF_STREAM.
+    UINT32 AudioBytes;                  // Size of the audio data buffer in bytes.
+    const BYTE* pAudioData;             // Pointer to the audio data buffer.
+    UINT32 PlayBegin;                   // First sample in this buffer to be played.
+    UINT32 PlayLength;                  // Length of the region to be played in samples,
+                                        //  or 0 to play the whole buffer.
+    UINT32 LoopBegin;                   // First sample of the region to be looped.
+    UINT32 LoopLength;                  // Length of the desired loop region in samples,
+                                        //  or 0 to loop the entire buffer.
+    UINT32 LoopCount;                   // Number of times to repeat the loop region,
+                                        //  or XAUDIO2_LOOP_INFINITE to loop forever.
+    void* pContext;                     // Context value to be passed back in callbacks.
+} XAUDIO2_BUFFER;
+
+// Used in IXAudio2SourceVoice::SubmitSourceBuffer when submitting XWMA data.
+// NOTE: If an XWMA sound is submitted in more than one buffer, each buffer's
+// pDecodedPacketCumulativeBytes[PacketCount-1] value must be subtracted from
+// all the entries in the next buffer's pDecodedPacketCumulativeBytes array.
+// And whether a sound is submitted in more than one buffer or not, the final
+// buffer of the sound should use the XAUDIO2_END_OF_STREAM flag, or else the
+// client must call IXAudio2SourceVoice::Discontinuity after submitting it.
+typedef struct XAUDIO2_BUFFER_WMA
+{
+    const UINT32* pDecodedPacketCumulativeBytes; // Decoded packet's cumulative size array.
+                                                 //  Each element is the number of bytes accumulated
+                                                 //  when the corresponding XWMA packet is decoded in
+                                                 //  order.  The array must have PacketCount elements.
+    UINT32 PacketCount;                          // Number of XWMA packets submitted. Must be >= 1 and
+                                                 //  divide evenly into XAUDIO2_BUFFER.AudioBytes.
+} XAUDIO2_BUFFER_WMA;
+
+// Returned by IXAudio2SourceVoice::GetState
+typedef struct XAUDIO2_VOICE_STATE
+{
+    void* pCurrentBufferContext;        // The pContext value provided in the XAUDIO2_BUFFER
+                                        //  that is currently being processed, or NULL if
+                                        //  there are no buffers in the queue.
+    UINT32 BuffersQueued;               // Number of buffers currently queued on the voice
+                                        //  (including the one that is being processed).
+    UINT64 SamplesPlayed;               // Total number of samples produced by the voice since
+                                        //  it began processing the current audio stream.
+} XAUDIO2_VOICE_STATE;
+
+// Returned by IXAudio2::GetPerformanceData
+typedef struct XAUDIO2_PERFORMANCE_DATA
+{
+    // CPU usage information
+    UINT64 AudioCyclesSinceLastQuery;   // CPU cycles spent on audio processing since the
+                                        //  last call to StartEngine or GetPerformanceData.
+    UINT64 TotalCyclesSinceLastQuery;   // Total CPU cycles elapsed since the last call
+                                        //  (only counts the CPU XAudio2 is running on).
+    UINT32 MinimumCyclesPerQuantum;     // Fewest CPU cycles spent processing any one
+                                        //  audio quantum since the last call.
+    UINT32 MaximumCyclesPerQuantum;     // Most CPU cycles spent processing any one
+                                        //  audio quantum since the last call.
+
+    // Memory usage information
+    UINT32 MemoryUsageInBytes;          // Total heap space currently in use.
+
+    // Audio latency and glitching information
+    UINT32 CurrentLatencyInSamples;     // Minimum delay from when a sample is read from a
+                                        //  source buffer to when it reaches the speakers.
+    UINT32 GlitchesSinceEngineStarted;  // Audio dropouts since the engine was started.
+
+    // Data about XAudio2's current workload
+    UINT32 ActiveSourceVoiceCount;      // Source voices currently playing.
+    UINT32 TotalSourceVoiceCount;       // Source voices currently existing.
+    UINT32 ActiveSubmixVoiceCount;      // Submix voices currently playing/existing.
+
+    UINT32 ActiveResamplerCount;        // Resample xAPOs currently active.
+    UINT32 ActiveMatrixMixCount;        // MatrixMix xAPOs currently active.
+
+    // Usage of the hardware XMA decoder (Xbox 360 only)
+    UINT32 ActiveXmaSourceVoices;       // Number of source voices decoding XMA data.
+    UINT32 ActiveXmaStreams;            // A voice can use more than one XMA stream.
+} XAUDIO2_PERFORMANCE_DATA;
+
+// Used in IXAudio2::SetDebugConfiguration
+typedef struct XAUDIO2_DEBUG_CONFIGURATION
+{
+    UINT32 TraceMask;                   // Bitmap of enabled debug message types.
+    UINT32 BreakMask;                   // Message types that will break into the debugger.
+    BOOL LogThreadID;                   // Whether to log the thread ID with each message.
+    BOOL LogFileline;                   // Whether to log the source file and line number.
+    BOOL LogFunctionName;               // Whether to log the function name.
+    BOOL LogTiming;                     // Whether to log message timestamps.
+} XAUDIO2_DEBUG_CONFIGURATION;
+
+// Values for the TraceMask and BreakMask bitmaps.  Only ERRORS and WARNINGS
+// are valid in BreakMask.  WARNINGS implies ERRORS, DETAIL implies INFO, and
+// FUNC_CALLS implies API_CALLS.  By default, TraceMask is ERRORS and WARNINGS
+// and all the other settings are zero.
+#define XAUDIO2_LOG_ERRORS     0x0001   // For handled errors with serious effects.
+#define XAUDIO2_LOG_WARNINGS   0x0002   // For handled errors that may be recoverable.
+#define XAUDIO2_LOG_INFO       0x0004   // Informational chit-chat (e.g. state changes).
+#define XAUDIO2_LOG_DETAIL     0x0008   // More detailed chit-chat.
+#define XAUDIO2_LOG_API_CALLS  0x0010   // Public API function entries and exits.
+#define XAUDIO2_LOG_FUNC_CALLS 0x0020   // Internal function entries and exits.
+#define XAUDIO2_LOG_TIMING     0x0040   // Delays detected and other timing data.
+#define XAUDIO2_LOG_LOCKS      0x0080   // Usage of critical sections and mutexes.
+#define XAUDIO2_LOG_MEMORY     0x0100   // Memory heap usage information.
+#define XAUDIO2_LOG_STREAMING  0x1000   // Audio streaming information.
+
+
+/**************************************************************************
+ *
+ * IXAudio2: Top-level XAudio2 COM interface.
+ *
+ **************************************************************************/
+
+// Use default arguments if compiling as C++
+#ifdef __cplusplus
+    #define X2DEFAULT(x) =x
+#else
+    #define X2DEFAULT(x)
+#endif
+
+#undef INTERFACE
+#define INTERFACE IXAudio2
+DECLARE_INTERFACE_(IXAudio2, IUnknown)
+{
+    // NAME: IXAudio2::QueryInterface
+    // DESCRIPTION: Queries for a given COM interface on the XAudio2 object.
+    //              Only IID_IUnknown and IID_IXAudio2 are supported.
+    //
+    // ARGUMENTS:
+    //  riid - IID of the interface to be obtained.
+    //  ppvInterface - Returns a pointer to the requested interface.
+    //
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, __deref_out void** ppvInterface) PURE;
+
+    // NAME: IXAudio2::AddRef
+    // DESCRIPTION: Adds a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+
+    // NAME: IXAudio2::Release
+    // DESCRIPTION: Releases a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, Release) (THIS) PURE;
+
+    // NAME: IXAudio2::GetDeviceCount
+    // DESCRIPTION: Returns the number of audio output devices available.
+    //
+    // ARGUMENTS:
+    //  pCount - Returns the device count.
+    //
+    STDMETHOD(GetDeviceCount) (THIS_ __out UINT32* pCount) PURE;
+
+    // NAME: IXAudio2::GetDeviceDetails
+    // DESCRIPTION: Returns information about the device with the given index.
+    //
+    // ARGUMENTS:
+    //  Index - Index of the device to be queried.
+    //  pDeviceDetails - Returns the device details.
+    //
+    STDMETHOD(GetDeviceDetails) (THIS_ UINT32 Index, __out XAUDIO2_DEVICE_DETAILS* pDeviceDetails) PURE;
+
+    // NAME: IXAudio2::Initialize
+    // DESCRIPTION: Sets global XAudio2 parameters and prepares it for use.
+    //
+    // ARGUMENTS:
+    //  Flags - Flags specifying the XAudio2 object's behavior.  Currently unused.
+    //  XAudio2Processor - An XAUDIO2_PROCESSOR enumeration value that specifies
+    //  the hardware thread (Xbox) or processor (Windows) that XAudio2 will use.
+    //  The enumeration values are platform-specific; platform-independent code
+    //  can use XAUDIO2_DEFAULT_PROCESSOR to use the default on each platform.
+    //
+    STDMETHOD(Initialize) (THIS_ UINT32 Flags X2DEFAULT(0),
+                           XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)) PURE;
+
+    // NAME: IXAudio2::RegisterForCallbacks
+    // DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks.
+    //
+    // ARGUMENTS:
+    //  pCallback - Callback interface to be called during each processing pass.
+    //
+    STDMETHOD(RegisterForCallbacks) (__in IXAudio2EngineCallback* pCallback) PURE;
+
+    // NAME: IXAudio2::UnregisterForCallbacks
+    // DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks.
+    //
+    // ARGUMENTS:
+    //  pCallback - Previously registered callback interface to be removed.
+    //
+    STDMETHOD_(void, UnregisterForCallbacks) (__in IXAudio2EngineCallback* pCallback) PURE;
+
+    // NAME: IXAudio2::CreateSourceVoice
+    // DESCRIPTION: Creates and configures a source voice.
+    //
+    // ARGUMENTS:
+    //  ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface.
+    //  pSourceFormat - Format of the audio that will be fed to the voice.
+    //  Flags - XAUDIO2_VOICE flags specifying the source voice's behavior.
+    //  MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed.
+    //  pCallback - Optional pointer to a client-provided callback interface.
+    //  pSendList - Optional list of voices this voice should send audio to.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //
+    STDMETHOD(CreateSourceVoice) (THIS_ __deref_out IXAudio2SourceVoice** ppSourceVoice,
+                                  __in const WAVEFORMATEX* pSourceFormat,
+                                  UINT32 Flags X2DEFAULT(0),
+                                  float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
+                                  __in_opt IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
+                                  __in_opt const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+                                  __in_opt const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+
+    // NAME: IXAudio2::CreateSubmixVoice
+    // DESCRIPTION: Creates and configures a submix voice.
+    //
+    // ARGUMENTS:
+    //  ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface.
+    //  InputChannels - Number of channels in this voice's input audio data.
+    //  InputSampleRate - Sample rate of this voice's input audio data.
+    //  Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior.
+    //  ProcessingStage - Arbitrary number that determines the processing order.
+    //  pSendList - Optional list of voices this voice should send audio to.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //
+    STDMETHOD(CreateSubmixVoice) (THIS_ __deref_out IXAudio2SubmixVoice** ppSubmixVoice,
+                                  UINT32 InputChannels, UINT32 InputSampleRate,
+                                  UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
+                                  __in_opt const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+                                  __in_opt const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+
+
+    // NAME: IXAudio2::CreateMasteringVoice
+    // DESCRIPTION: Creates and configures a mastering voice.
+    //
+    // ARGUMENTS:
+    //  ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface.
+    //  InputChannels - Number of channels in this voice's input audio data.
+    //  InputSampleRate - Sample rate of this voice's input audio data.
+    //  Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior.
+    //  DeviceIndex - Identifier of the device to receive the output audio.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //
+    STDMETHOD(CreateMasteringVoice) (THIS_ __deref_out IXAudio2MasteringVoice** ppMasteringVoice,
+                                     UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
+                                     UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
+                                     UINT32 Flags X2DEFAULT(0), UINT32 DeviceIndex X2DEFAULT(0),
+                                     __in_opt const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+
+    // NAME: IXAudio2::StartEngine
+    // DESCRIPTION: Creates and starts the audio processing thread.
+    //
+    STDMETHOD(StartEngine) (THIS) PURE;
+
+    // NAME: IXAudio2::StopEngine
+    // DESCRIPTION: Stops and destroys the audio processing thread.
+    //
+    STDMETHOD_(void, StopEngine) (THIS) PURE;
+
+    // NAME: IXAudio2::CommitChanges
+    // DESCRIPTION: Atomically applies a set of operations previously tagged
+    //              with a given identifier.
+    //
+    // ARGUMENTS:
+    //  OperationSet - Identifier of the set of operations to be applied.
+    //
+    STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
+
+    // NAME: IXAudio2::GetPerformanceData
+    // DESCRIPTION: Returns current resource usage details: memory, CPU, etc.
+    //
+    // ARGUMENTS:
+    //  pPerfData - Returns the performance data structure.
+    //
+    STDMETHOD_(void, GetPerformanceData) (THIS_ __out XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
+
+    // NAME: IXAudio2::SetDebugConfiguration
+    // DESCRIPTION: Configures XAudio2's debug output (in debug builds only).
+    //
+    // ARGUMENTS:
+    //  pDebugConfiguration - Structure describing the debug output behavior.
+    //  pReserved - Optional parameter; must be NULL.
+    //
+    STDMETHOD_(void, SetDebugConfiguration) (THIS_ __in_opt const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
+                                             __in_opt __reserved void* pReserved X2DEFAULT(NULL)) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2Voice: Base voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2Voice
+DECLARE_INTERFACE(IXAudio2Voice)
+{
+    // These methods are declared in a macro so that the same declarations
+    // can be used in the derived voice types (IXAudio2SourceVoice, etc).
+
+    #define Declare_IXAudio2Voice_Methods() \
+    \
+    /* NAME: IXAudio2Voice::GetVoiceDetails
+    // DESCRIPTION: Returns the basic characteristics of this voice.
+    //
+    // ARGUMENTS:
+    //  pVoiceDetails - Returns the voice's details.
+    */\
+    STDMETHOD_(void, GetVoiceDetails) (THIS_ __out XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputVoices
+    // DESCRIPTION: Replaces the set of submix/mastering voices that receive
+    //              this voice's output.
+    //
+    // ARGUMENTS:
+    //  pSendList - Optional list of voices this voice should send audio to.
+    */\
+    STDMETHOD(SetOutputVoices) (THIS_ __in_opt const XAUDIO2_VOICE_SENDS* pSendList) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetEffectChain
+    // DESCRIPTION: Replaces this voice's current effect chain with a new one.
+    //
+    // ARGUMENTS:
+    //  pEffectChain - Structure describing the new effect chain to be used.
+    */\
+    STDMETHOD(SetEffectChain) (THIS_ __in_opt const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \
+    \
+    /* NAME: IXAudio2Voice::EnableEffect
+    // DESCRIPTION: Enables an effect in this voice's effect chain.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \
+                             UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::DisableEffect
+    // DESCRIPTION: Disables an effect in this voice's effect chain.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \
+                              UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetEffectState
+    // DESCRIPTION: Returns the running state of an effect.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pEnabled - Returns the enabled/disabled state of the given effect.
+    */\
+    STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, __out BOOL* pEnabled) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetEffectParameters
+    // DESCRIPTION: Sets effect-specific parameters.
+    //
+    // REMARKS: Unlike IXAPOParameters::SetParameters, this method may
+    //          be called from any thread.  XAudio2 implements
+    //          appropriate synchronization to copy the parameters to the
+    //          realtime audio processing thread.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pParameters - Pointer to an effect-specific parameters block.
+    //  ParametersByteSize - Size of the pParameters array  in bytes.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \
+                                    __in_bcount(ParametersByteSize) const void* pParameters, \
+                                    UINT32 ParametersByteSize, \
+                                    UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetEffectParameters
+    // DESCRIPTION: Obtains the current effect-specific parameters.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pParameters - Returns the current values of the effect-specific parameters.
+    //  ParametersByteSize - Size of the pParameters array in bytes.
+    */\
+    STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, \
+                                    __out_bcount(ParametersByteSize) void* pParameters, \
+                                    UINT32 ParametersByteSize) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetFilterParameters
+    // DESCRIPTION: Sets this voice's filter parameters.
+    //
+    // ARGUMENTS:
+    //  pParameters - Pointer to the filter's parameter structure.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetFilterParameters) (THIS_ __in const XAUDIO2_FILTER_PARAMETERS* pParameters, \
+                                    UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetFilterParameters
+    // DESCRIPTION: Returns this voice's current filter parameters.
+    //
+    // ARGUMENTS:
+    //  pParameters - Returns the filter parameters.
+    */\
+    STDMETHOD_(void, GetFilterParameters) (THIS_ __out XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputFilterParameters
+    // DESCRIPTION: Sets the filter parameters on one of this voice's sends.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - Destination voice of the send whose filter parameters will be set.
+    //  pParameters - Pointer to the filter's parameter structure.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetOutputFilterParameters) (THIS_ __in_opt IXAudio2Voice* pDestinationVoice, \
+                                          __in const XAUDIO2_FILTER_PARAMETERS* pParameters, \
+                                          UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetOutputFilterParameters
+    // DESCRIPTION: Returns the filter parameters from one of this voice's sends.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - Destination voice of the send whose filter parameters will be read.
+    //  pParameters - Returns the filter parameters.
+    */\
+    STDMETHOD_(void, GetOutputFilterParameters) (THIS_ __in_opt IXAudio2Voice* pDestinationVoice, \
+                                                 __out XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetVolume
+    // DESCRIPTION: Sets this voice's overall volume level.
+    //
+    // ARGUMENTS:
+    //  Volume - New overall volume level to be used, as an amplitude factor.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetVolume) (THIS_ float Volume, \
+                          UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetVolume
+    // DESCRIPTION: Obtains this voice's current overall volume level.
+    //
+    // ARGUMENTS:
+    //  pVolume: Returns the voice's current overall volume level.
+    */\
+    STDMETHOD_(void, GetVolume) (THIS_ __out float* pVolume) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetChannelVolumes
+    // DESCRIPTION: Sets this voice's per-channel volume levels.
+    //
+    // ARGUMENTS:
+    //  Channels - Used to confirm the voice's channel count.
+    //  pVolumes - Array of per-channel volume levels to be used.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, __in_ecount(Channels) const float* pVolumes, \
+                                  UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetChannelVolumes
+    // DESCRIPTION: Returns this voice's current per-channel volume levels.
+    //
+    // ARGUMENTS:
+    //  Channels - Used to confirm the voice's channel count.
+    //  pVolumes - Returns an array of the current per-channel volume levels.
+    */\
+    STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, __out_ecount(Channels) float* pVolumes) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputMatrix
+    // DESCRIPTION: Sets the volume levels used to mix from each channel of this
+    //              voice's output audio to each channel of a given destination
+    //              voice's input audio.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - The destination voice whose mix matrix to change.
+    //  SourceChannels - Used to confirm this voice's output channel count
+    //   (the number of channels produced by the last effect in the chain).
+    //  DestinationChannels - Confirms the destination voice's input channels.
+    //  pLevelMatrix - Array of [SourceChannels * DestinationChannels] send
+    //   levels.  The level used to send from source channel S to destination
+    //   channel D should be in pLevelMatrix[S + SourceChannels * D].
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetOutputMatrix) (THIS_ __in_opt IXAudio2Voice* pDestinationVoice, \
+                                UINT32 SourceChannels, UINT32 DestinationChannels, \
+                                __in_ecount(SourceChannels * DestinationChannels) const float* pLevelMatrix, \
+                                UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetOutputMatrix
+    // DESCRIPTION: Obtains the volume levels used to send each channel of this
+    //              voice's output audio to each channel of a given destination
+    //              voice's input audio.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - The destination voice whose mix matrix to obtain.
+    //  SourceChannels - Used to confirm this voice's output channel count
+    //   (the number of channels produced by the last effect in the chain).
+    //  DestinationChannels - Confirms the destination voice's input channels.
+    //  pLevelMatrix - Array of send levels, as above.
+    */\
+    STDMETHOD_(void, GetOutputMatrix) (THIS_ __in_opt IXAudio2Voice* pDestinationVoice, \
+                                       UINT32 SourceChannels, UINT32 DestinationChannels, \
+                                       __out_ecount(SourceChannels * DestinationChannels) float* pLevelMatrix) PURE; \
+    \
+    /* NAME: IXAudio2Voice::DestroyVoice
+    // DESCRIPTION: Destroys this voice, stopping it if necessary and removing
+    //              it from the XAudio2 graph.
+    */\
+    STDMETHOD_(void, DestroyVoice) (THIS) PURE
+
+    Declare_IXAudio2Voice_Methods();
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2SourceVoice: Source voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2SourceVoice
+DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // NAME: IXAudio2SourceVoice::Start
+    // DESCRIPTION: Makes this voice start consuming and processing audio.
+    //
+    // ARGUMENTS:
+    //  Flags - Flags controlling how the voice should be started.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::Stop
+    // DESCRIPTION: Makes this voice stop consuming audio.
+    //
+    // ARGUMENTS:
+    //  Flags - Flags controlling how the voice should be stopped.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::SubmitSourceBuffer
+    // DESCRIPTION: Adds a new audio buffer to this voice's input queue.
+    //
+    // ARGUMENTS:
+    //  pBuffer - Pointer to the buffer structure to be queued.
+    //  pBufferWMA - Additional structure used only when submitting XWMA data.
+    //
+    STDMETHOD(SubmitSourceBuffer) (THIS_ __in const XAUDIO2_BUFFER* pBuffer, __in_opt const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
+
+    // NAME: IXAudio2SourceVoice::FlushSourceBuffers
+    // DESCRIPTION: Removes all pending audio buffers from this voice's queue.
+    //
+    STDMETHOD(FlushSourceBuffers) (THIS) PURE;
+
+    // NAME: IXAudio2SourceVoice::Discontinuity
+    // DESCRIPTION: Notifies the voice of an intentional break in the stream of
+    //              audio buffers (e.g. the end of a sound), to prevent XAudio2
+    //              from interpreting an empty buffer queue as a glitch.
+    //
+    STDMETHOD(Discontinuity) (THIS) PURE;
+
+    // NAME: IXAudio2SourceVoice::ExitLoop
+    // DESCRIPTION: Breaks out of the current loop when its end is reached.
+    //
+    // ARGUMENTS:
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::GetState
+    // DESCRIPTION: Returns the number of buffers currently queued on this voice,
+    //              the pContext value associated with the currently processing
+    //              buffer (if any), and other voice state information.
+    //
+    // ARGUMENTS:
+    //  pVoiceState - Returns the state information.
+    //
+    STDMETHOD_(void, GetState) (THIS_ __out XAUDIO2_VOICE_STATE* pVoiceState) PURE;
+
+    // NAME: IXAudio2SourceVoice::SetFrequencyRatio
+    // DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch.
+    //
+    // ARGUMENTS:
+    //  Ratio - Frequency change, expressed as source frequency / target frequency.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
+                                  UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::GetFrequencyRatio
+    // DESCRIPTION: Returns this voice's current frequency adjustment ratio.
+    //
+    // ARGUMENTS:
+    //  pRatio - Returns the frequency adjustment.
+    //
+    STDMETHOD_(void, GetFrequencyRatio) (THIS_ __out float* pRatio) PURE;
+
+    // NAME: IXAudio2SourceVoice::SetSourceSampleRate
+    // DESCRIPTION: Reconfigures this voice to treat its source data as being
+    //              at a different sample rate than the original one specified
+    //              in CreateSourceVoice's pSourceFormat argument.
+    //
+    // ARGUMENTS:
+    //  UINT32 - The intended sample rate of further submitted source data.
+    //
+    STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2SubmixVoice: Submixing voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2SubmixVoice
+DECLARE_INTERFACE_(IXAudio2SubmixVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // There are currently no methods specific to submix voices.
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2MasteringVoice: Mastering voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2MasteringVoice
+DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // There are currently no methods specific to mastering voices.
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2EngineCallback: Client notification interface for engine events.
+ *
+ * REMARKS: Contains methods to notify the client when certain events happen
+ *          in the XAudio2 engine.  This interface should be implemented by
+ *          the client.  XAudio2 will call these methods via the interface
+ *          pointer provided by the client when it calls XAudio2Create or
+ *          IXAudio2::Initialize.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2EngineCallback
+DECLARE_INTERFACE(IXAudio2EngineCallback)
+{
+    // Called by XAudio2 just before an audio processing pass begins.
+    STDMETHOD_(void, OnProcessingPassStart) (THIS) PURE;
+
+    // Called just after an audio processing pass ends.
+    STDMETHOD_(void, OnProcessingPassEnd) (THIS) PURE;
+
+    // Called in the event of a critical system error which requires XAudio2
+    // to be closed down and restarted.  The error code is given in Error.
+    STDMETHOD_(void, OnCriticalError) (THIS_ HRESULT Error) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2VoiceCallback: Client notification interface for voice events.
+ *
+ * REMARKS: Contains methods to notify the client when certain events happen
+ *          in an XAudio2 voice.  This interface should be implemented by the
+ *          client.  XAudio2 will call these methods via an interface pointer
+ *          provided by the client in the IXAudio2::CreateSourceVoice call.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2VoiceCallback
+DECLARE_INTERFACE(IXAudio2VoiceCallback)
+{
+    // Called just before this voice's processing pass begins.
+    STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
+
+    // Called just after this voice's processing pass ends.
+    STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE;
+
+    // Called when this voice has just finished playing a buffer stream
+    // (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer).
+    STDMETHOD_(void, OnStreamEnd) (THIS) PURE;
+
+    // Called when this voice is about to start processing a new buffer.
+    STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) PURE;
+
+    // Called when this voice has just finished processing a buffer.
+    // The buffer can now be reused or destroyed.
+    STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext) PURE;
+
+    // Called when this voice has just reached the end position of a loop.
+    STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext) PURE;
+
+    // Called in the event of a critical error during voice processing,
+    // such as a failing xAPO or an error from the hardware XMA decoder.
+    // The voice may have to be destroyed and re-created to recover from
+    // the error.  The callback arguments report which buffer was being
+    // processed when the error occurred, and its HRESULT code.
+    STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * Macros to make it easier to use the XAudio2 COM interfaces in C code.
+ *
+ **************************************************************************/
+
+#ifndef __cplusplus
+
+// IXAudio2
+#define IXAudio2_QueryInterface(This,riid,ppvInterface) ((This)->lpVtbl->QueryInterface(This,riid,ppvInterface))
+#define IXAudio2_AddRef(This) ((This)->lpVtbl->AddRef(This))
+#define IXAudio2_Release(This) ((This)->lpVtbl->Release(This))
+#define IXAudio2_GetDeviceCount(This,puCount) ((This)->lpVtbl->GetDeviceCount(This,puCount))
+#define IXAudio2_GetDeviceDetails(This,Index,pDeviceDetails) ((This)->lpVtbl->GetDeviceDetails(This,Index,pDeviceDetails))
+#define IXAudio2_Initialize(This,Flags,XAudio2Processor) ((This)->lpVtbl->Initialize(This,Flags,XAudio2Processor))
+#define IXAudio2_CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) ((This)->lpVtbl->CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain))
+#define IXAudio2_CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain) ((This)->lpVtbl->CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain))
+#define IXAudio2_CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain) ((This)->lpVtbl->CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain))
+#define IXAudio2_StartEngine(This) ((This)->lpVtbl->StartEngine(This))
+#define IXAudio2_StopEngine(This) ((This)->lpVtbl->StopEngine(This))
+#define IXAudio2_CommitChanges(This,OperationSet) ((This)->lpVtbl->CommitChanges(This,OperationSet))
+#define IXAudio2_GetPerformanceData(This,pPerfData) ((This)->lpVtbl->GetPerformanceData(This,pPerfData))
+#define IXAudio2_SetDebugConfiguration(This,pDebugConfiguration,pReserved) ((This)->lpVtbl->SetDebugConfiguration(This,pDebugConfiguration,pReserved))
+
+// IXAudio2Voice
+#define IXAudio2Voice_GetVoiceDetails(This,pVoiceDetails) ((This)->lpVtbl->GetVoiceDetails(This,pVoiceDetails))
+#define IXAudio2Voice_SetOutputVoices(This,pSendList) ((This)->lpVtbl->SetOutputVoices(This,pSendList))
+#define IXAudio2Voice_SetEffectChain(This,pEffectChain) ((This)->lpVtbl->SetEffectChain(This,pEffectChain))
+#define IXAudio2Voice_EnableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->EnableEffect(This,EffectIndex,OperationSet))
+#define IXAudio2Voice_DisableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->DisableEffect(This,EffectIndex,OperationSet))
+#define IXAudio2Voice_GetEffectState(This,EffectIndex,pEnabled) ((This)->lpVtbl->GetEffectState(This,EffectIndex,pEnabled))
+#define IXAudio2Voice_SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize, OperationSet) ((This)->lpVtbl->SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize,OperationSet))
+#define IXAudio2Voice_GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize) ((This)->lpVtbl->GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize))
+#define IXAudio2Voice_SetFilterParameters(This,pParameters,OperationSet) ((This)->lpVtbl->SetFilterParameters(This,pParameters,OperationSet))
+#define IXAudio2Voice_GetFilterParameters(This,pParameters) ((This)->lpVtbl->GetFilterParameters(This,pParameters))
+#define IXAudio2Voice_SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet) ((This)->lpVtbl->SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet))
+#define IXAudio2Voice_GetOutputFilterParameters(This,pDestinationVoice,pParameters) ((This)->lpVtbl->GetOutputFilterParameters(This,pDestinationVoice,pParameters))
+#define IXAudio2Voice_SetVolume(This,Volume,OperationSet) ((This)->lpVtbl->SetVolume(This,Volume,OperationSet))
+#define IXAudio2Voice_GetVolume(This,pVolume) ((This)->lpVtbl->GetVolume(This,pVolume))
+#define IXAudio2Voice_SetChannelVolumes(This,Channels,pVolumes,OperationSet) ((This)->lpVtbl->SetChannelVolumes(This,Channels,pVolumes,OperationSet))
+#define IXAudio2Voice_GetChannelVolumes(This,Channels,pVolumes) ((This)->lpVtbl->GetChannelVolumes(This,Channels,pVolumes))
+#define IXAudio2Voice_SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet) ((This)->lpVtbl->SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet))
+#define IXAudio2Voice_GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix) ((This)->lpVtbl->GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix))
+#define IXAudio2Voice_DestroyVoice(This) ((This)->lpVtbl->DestroyVoice(This))
+
+// IXAudio2SourceVoice
+#define IXAudio2SourceVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2SourceVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2SourceVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2SourceVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2SourceVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2SourceVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2SourceVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2SourceVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2SourceVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2SourceVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2SourceVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2SourceVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2SourceVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2SourceVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2SourceVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2SourceVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2SourceVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2SourceVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2SourceVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+#define IXAudio2SourceVoice_Start(This,Flags,OperationSet) ((This)->lpVtbl->Start(This,Flags,OperationSet))
+#define IXAudio2SourceVoice_Stop(This,Flags,OperationSet) ((This)->lpVtbl->Stop(This,Flags,OperationSet))
+#define IXAudio2SourceVoice_SubmitSourceBuffer(This,pBuffer,pBufferWMA) ((This)->lpVtbl->SubmitSourceBuffer(This,pBuffer,pBufferWMA))
+#define IXAudio2SourceVoice_FlushSourceBuffers(This) ((This)->lpVtbl->FlushSourceBuffers(This))
+#define IXAudio2SourceVoice_Discontinuity(This) ((This)->lpVtbl->Discontinuity(This))
+#define IXAudio2SourceVoice_ExitLoop(This,OperationSet) ((This)->lpVtbl->ExitLoop(This,OperationSet))
+#define IXAudio2SourceVoice_GetState(This,pVoiceState) ((This)->lpVtbl->GetState(This,pVoiceState))
+#define IXAudio2SourceVoice_SetFrequencyRatio(This,Ratio,OperationSet) ((This)->lpVtbl->SetFrequencyRatio(This,Ratio,OperationSet))
+#define IXAudio2SourceVoice_GetFrequencyRatio(This,pRatio) ((This)->lpVtbl->GetFrequencyRatio(This,pRatio))
+#define IXAudio2SourceVoice_SetSourceSampleRate(This,NewSourceSampleRate) ((This)->lpVtbl->SetSourceSampleRate(This,NewSourceSampleRate))
+
+// IXAudio2SubmixVoice
+#define IXAudio2SubmixVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2SubmixVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2SubmixVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2SubmixVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2SubmixVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2SubmixVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2SubmixVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2SubmixVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2SubmixVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2SubmixVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2SubmixVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2SubmixVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2SubmixVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2SubmixVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2SubmixVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2SubmixVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2SubmixVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2SubmixVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2SubmixVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+
+// IXAudio2MasteringVoice
+#define IXAudio2MasteringVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2MasteringVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2MasteringVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2MasteringVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2MasteringVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2MasteringVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2MasteringVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2MasteringVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2MasteringVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2MasteringVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2MasteringVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2MasteringVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2MasteringVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2MasteringVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2MasteringVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2MasteringVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2MasteringVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2MasteringVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2MasteringVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+
+#endif // #ifndef __cplusplus
+
+
+/**************************************************************************
+ *
+ * Utility functions used to convert from pitch in semitones and volume
+ * in decibels to the frequency and amplitude ratio units used by XAudio2.
+ * These are only defined if the client #defines XAUDIO2_HELPER_FUNCTIONS
+ * prior to #including xaudio2.h.
+ *
+ **************************************************************************/
+
+#ifdef XAUDIO2_HELPER_FUNCTIONS
+
+#define _USE_MATH_DEFINES   // Make math.h define M_PI
+#include <math.h>           // For powf, log10f, sinf and asinf
+
+// Calculate the argument to SetVolume from a decibel value
+__inline float XAudio2DecibelsToAmplitudeRatio(float Decibels)
+{
+    return powf(10.0f, Decibels / 20.0f);
+}
+
+// Recover a volume in decibels from an amplitude factor
+__inline float XAudio2AmplitudeRatioToDecibels(float Volume)
+{
+    if (Volume == 0)
+    {
+        return -3.402823466e+38f; // Smallest float value (-FLT_MAX)
+    }
+    return 20.0f * log10f(Volume);
+}
+
+// Calculate the argument to SetFrequencyRatio from a semitone value
+__inline float XAudio2SemitonesToFrequencyRatio(float Semitones)
+{
+    // FrequencyRatio = 2 ^ Octaves
+    //                = 2 ^ (Semitones / 12)
+    return powf(2.0f, Semitones / 12.0f);
+}
+
+// Recover a pitch in semitones from a frequency ratio
+__inline float XAudio2FrequencyRatioToSemitones(float FrequencyRatio)
+{
+    // Semitones = 12 * log2(FrequencyRatio)
+    //           = 12 * log2(10) * log10(FrequencyRatio)
+    return 39.86313713864835f * log10f(FrequencyRatio);
+}
+
+// Convert from filter cutoff frequencies expressed in Hertz to the radian
+// frequency values used in XAUDIO2_FILTER_PARAMETERS.Frequency.  Note that
+// the highest CutoffFrequency supported is SampleRate/6.  Higher values of
+// CutoffFrequency will return XAUDIO2_MAX_FILTER_FREQUENCY.
+__inline float XAudio2CutoffFrequencyToRadians(float CutoffFrequency, UINT32 SampleRate)
+{
+    if ((UINT32)(CutoffFrequency * 6.0f) >= SampleRate)
+    {
+        return XAUDIO2_MAX_FILTER_FREQUENCY;
+    }
+    return 2.0f * sinf((float)M_PI * CutoffFrequency / SampleRate);
+}
+
+// Convert from radian frequencies back to absolute frequencies in Hertz
+__inline float XAudio2RadiansToCutoffFrequency(float Radians, float SampleRate)
+{
+    return SampleRate * asinf(Radians / 2.0f) / (float)M_PI;
+}
+#endif // #ifdef XAUDIO2_HELPER_FUNCTIONS
+
+
+/**************************************************************************
+ *
+ * XAudio2Create: Top-level function that creates an XAudio2 instance.
+ *
+ * On Windows this is just an inline function that calls CoCreateInstance
+ * and Initialize.  The arguments are described above, under Initialize,
+ * except that the XAUDIO2_DEBUG_ENGINE flag can be used here to select
+ * the debug version of XAudio2.
+ *
+ * On Xbox, this function is implemented in the XAudio2 library, and the
+ * XAUDIO2_DEBUG_ENGINE flag has no effect; the client must explicitly
+ * link with the debug version of the library to obtain debug behavior.
+ *
+ **************************************************************************/
+
+#ifdef _XBOX
+
+STDAPI XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
+                     XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR));
+
+#else // Windows
+
+__inline HRESULT XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
+                               XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR))
+{
+    // Instantiate the appropriate XAudio2 engine
+    IXAudio2* pXAudio2;
+
+    #ifdef __cplusplus
+
+        HRESULT hr = CoCreateInstance((Flags & XAUDIO2_DEBUG_ENGINE) ? __uuidof(XAudio2_Debug) : __uuidof(XAudio2),
+                                      NULL, CLSCTX_INPROC_SERVER, __uuidof(IXAudio2), (void**)&pXAudio2);
+        if (SUCCEEDED(hr))
+        {
+            hr = pXAudio2->Initialize(Flags, XAudio2Processor);
+
+            if (SUCCEEDED(hr))
+            {
+                *ppXAudio2 = pXAudio2;
+            }
+            else
+            {
+                pXAudio2->Release();
+            }
+        }
+
+    #else
+
+        HRESULT hr = CoCreateInstance((Flags & XAUDIO2_DEBUG_ENGINE) ? &CLSID_XAudio2_Debug : &CLSID_XAudio2,
+                                      NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
+        if (SUCCEEDED(hr))
+        {
+            hr = pXAudio2->lpVtbl->Initialize(pXAudio2, Flags, XAudio2Processor);
+
+            if (SUCCEEDED(hr))
+            {
+                *ppXAudio2 = pXAudio2;
+            }
+            else
+            {
+                pXAudio2->lpVtbl->Release(pXAudio2);
+            }
+        }
+
+    #endif // #ifdef __cplusplus
+
+    return hr;
+}
+
+#endif // #ifdef _XBOX
+
+
+// Undo the #pragma pack(push, 1) directive at the top of this file
+#pragma pack(pop)
+
+#endif // #ifndef GUID_DEFS_ONLY
+#endif // #ifndef __XAUDIO2_INCLUDED__
diff --git a/Externals/XAudio2_7/audiodefs.h b/Externals/XAudio2_7/audiodefs.h
new file mode 100644
index 0000000000..ff995ecc7d
--- /dev/null
+++ b/Externals/XAudio2_7/audiodefs.h
@@ -0,0 +1,263 @@
+/***************************************************************************
+ *
+ *  Copyright (c) Microsoft Corporation.  All rights reserved.
+ *
+ *  File:     audiodefs.h
+ *  Content:  Basic constants and data types for audio work.
+ *
+ *  Remarks:  This header file defines all of the audio format constants and
+ *            structures required for XAudio2 and XACT work.  Providing these
+ *            in a single location avoids certain dependency problems in the
+ *            legacy audio headers (mmreg.h, mmsystem.h, ksmedia.h).
+ *
+ *            NOTE: Including the legacy headers after this one may cause a
+ *            compilation error, because they define some of the same types
+ *            defined here without preprocessor guards to avoid multiple
+ *            definitions.  If a source file needs one of the old headers,
+ *            it must include it before including audiodefs.h.
+ *
+ ***************************************************************************/
+
+#ifndef __AUDIODEFS_INCLUDED__
+#define __AUDIODEFS_INCLUDED__
+
+#include <windef.h>  // For WORD, DWORD, etc.
+
+#pragma pack(push, 1)  // Pack structures to 1-byte boundaries
+
+
+/**************************************************************************
+ *
+ *  WAVEFORMATEX: Base structure for many audio formats.  Format-specific
+ *  extensions can be defined for particular formats by using a non-zero
+ *  cbSize value and adding extra fields to the end of this structure.
+ *
+ ***************************************************************************/
+
+#ifndef _WAVEFORMATEX_
+
+    #define _WAVEFORMATEX_
+    typedef struct tWAVEFORMATEX
+    {
+        WORD wFormatTag;        // Integer identifier of the format
+        WORD nChannels;         // Number of audio channels
+        DWORD nSamplesPerSec;   // Audio sample rate
+        DWORD nAvgBytesPerSec;  // Bytes per second (possibly approximate)
+        WORD nBlockAlign;       // Size in bytes of a sample block (all channels)
+        WORD wBitsPerSample;    // Size in bits of a single per-channel sample
+        WORD cbSize;            // Bytes of extra data appended to this struct
+    } WAVEFORMATEX;
+
+#endif
+
+// Defining pointer types outside of the #if block to make sure they are
+// defined even if mmreg.h or mmsystem.h is #included before this file
+
+typedef WAVEFORMATEX *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
+typedef const WAVEFORMATEX *PCWAVEFORMATEX, *LPCWAVEFORMATEX;
+
+
+/**************************************************************************
+ *
+ *  WAVEFORMATEXTENSIBLE: Extended version of WAVEFORMATEX that should be
+ *  used as a basis for all new audio formats.  The format tag is replaced
+ *  with a GUID, allowing new formats to be defined without registering a
+ *  format tag with Microsoft.  There are also new fields that can be used
+ *  to specify the spatial positions for each channel and the bit packing
+ *  used for wide samples (e.g. 24-bit PCM samples in 32-bit containers).
+ *
+ ***************************************************************************/
+
+#ifndef _WAVEFORMATEXTENSIBLE_
+
+    #define _WAVEFORMATEXTENSIBLE_
+    typedef struct
+    {
+        WAVEFORMATEX Format;          // Base WAVEFORMATEX data
+        union
+        {
+            WORD wValidBitsPerSample; // Valid bits in each sample container
+            WORD wSamplesPerBlock;    // Samples per block of audio data; valid
+                                      // if wBitsPerSample=0 (but rarely used).
+            WORD wReserved;           // Zero if neither case above applies.
+        } Samples;
+        DWORD dwChannelMask;          // Positions of the audio channels
+        GUID SubFormat;               // Format identifier GUID
+    } WAVEFORMATEXTENSIBLE;
+
+#endif
+
+typedef WAVEFORMATEXTENSIBLE *PWAVEFORMATEXTENSIBLE, *LPWAVEFORMATEXTENSIBLE;
+typedef const WAVEFORMATEXTENSIBLE *PCWAVEFORMATEXTENSIBLE, *LPCWAVEFORMATEXTENSIBLE;
+
+
+
+/**************************************************************************
+ *
+ *  Define the most common wave format tags used in WAVEFORMATEX formats.
+ *
+ ***************************************************************************/
+
+#ifndef WAVE_FORMAT_PCM  // Pulse Code Modulation
+
+    // If WAVE_FORMAT_PCM is not defined, we need to define some legacy types
+    // for compatibility with the Windows mmreg.h / mmsystem.h header files.
+
+    // Old general format structure (information common to all formats)
+    typedef struct waveformat_tag
+    {
+        WORD wFormatTag;
+        WORD nChannels;
+        DWORD nSamplesPerSec;
+        DWORD nAvgBytesPerSec;
+        WORD nBlockAlign;
+    } WAVEFORMAT, *PWAVEFORMAT, NEAR *NPWAVEFORMAT, FAR *LPWAVEFORMAT;
+
+    // Specific format structure for PCM data
+    typedef struct pcmwaveformat_tag
+    {
+        WAVEFORMAT wf;
+        WORD wBitsPerSample;
+    } PCMWAVEFORMAT, *PPCMWAVEFORMAT, NEAR *NPPCMWAVEFORMAT, FAR *LPPCMWAVEFORMAT;
+
+    #define WAVE_FORMAT_PCM 0x0001
+
+#endif
+
+#ifndef WAVE_FORMAT_ADPCM  // Microsoft Adaptive Differental PCM
+
+    // Replicate the Microsoft ADPCM type definitions from mmreg.h.
+
+    typedef struct adpcmcoef_tag
+    {
+        short iCoef1;
+        short iCoef2;
+    } ADPCMCOEFSET;
+
+    #pragma warning(push)
+    #pragma warning(disable:4200)  // Disable zero-sized array warnings
+
+    typedef struct adpcmwaveformat_tag {
+        WAVEFORMATEX wfx;
+        WORD wSamplesPerBlock;
+        WORD wNumCoef;
+        ADPCMCOEFSET aCoef[];  // Always 7 coefficient pairs for MS ADPCM
+    } ADPCMWAVEFORMAT;
+
+    #pragma warning(pop)
+
+    #define WAVE_FORMAT_ADPCM 0x0002
+
+#endif
+
+// Other frequently used format tags
+
+#ifndef WAVE_FORMAT_UNKNOWN
+    #define WAVE_FORMAT_UNKNOWN         0x0000 // Unknown or invalid format tag
+#endif
+
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+    #define WAVE_FORMAT_IEEE_FLOAT      0x0003 // 32-bit floating-point
+#endif
+
+#ifndef WAVE_FORMAT_MPEGLAYER3
+    #define WAVE_FORMAT_MPEGLAYER3      0x0055 // ISO/MPEG Layer3
+#endif
+
+#ifndef WAVE_FORMAT_DOLBY_AC3_SPDIF
+    #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 // Dolby Audio Codec 3 over S/PDIF
+#endif
+
+#ifndef WAVE_FORMAT_WMAUDIO2
+    #define WAVE_FORMAT_WMAUDIO2        0x0161 // Windows Media Audio
+#endif
+
+#ifndef WAVE_FORMAT_WMAUDIO3
+    #define WAVE_FORMAT_WMAUDIO3        0x0162 // Windows Media Audio Pro
+#endif
+
+#ifndef WAVE_FORMAT_WMASPDIF
+    #define WAVE_FORMAT_WMASPDIF        0x0164 // Windows Media Audio over S/PDIF
+#endif
+
+#ifndef WAVE_FORMAT_EXTENSIBLE
+    #define WAVE_FORMAT_EXTENSIBLE      0xFFFE // All WAVEFORMATEXTENSIBLE formats
+#endif
+
+
+/**************************************************************************
+ *
+ *  Define the most common wave format GUIDs used in WAVEFORMATEXTENSIBLE
+ *  formats.  Note that including the Windows ksmedia.h header after this
+ *  one will cause build problems; this cannot be avoided, since ksmedia.h
+ *  defines these macros without preprocessor guards.
+ *
+ ***************************************************************************/
+
+#ifdef __cplusplus // uuid() and __uuidof() are only available in C++
+
+    #ifndef KSDATAFORMAT_SUBTYPE_PCM
+        struct __declspec(uuid("00000001-0000-0010-8000-00aa00389b71")) KSDATAFORMAT_SUBTYPE_PCM_STRUCT;
+        #define KSDATAFORMAT_SUBTYPE_PCM __uuidof(KSDATAFORMAT_SUBTYPE_PCM_STRUCT)
+    #endif
+
+    #ifndef KSDATAFORMAT_SUBTYPE_ADPCM
+        struct __declspec(uuid("00000002-0000-0010-8000-00aa00389b71")) KSDATAFORMAT_SUBTYPE_ADPCM_STRUCT;
+        #define KSDATAFORMAT_SUBTYPE_ADPCM __uuidof(KSDATAFORMAT_SUBTYPE_ADPCM_STRUCT)
+    #endif
+
+    #ifndef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
+        struct __declspec(uuid("00000003-0000-0010-8000-00aa00389b71")) KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_STRUCT;
+        #define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT __uuidof(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_STRUCT)
+    #endif
+
+#endif
+
+
+/**************************************************************************
+ *
+ *  Speaker positions used in the WAVEFORMATEXTENSIBLE dwChannelMask field.
+ *
+ ***************************************************************************/
+
+#ifndef SPEAKER_FRONT_LEFT
+    #define SPEAKER_FRONT_LEFT            0x00000001
+    #define SPEAKER_FRONT_RIGHT           0x00000002
+    #define SPEAKER_FRONT_CENTER          0x00000004
+    #define SPEAKER_LOW_FREQUENCY         0x00000008
+    #define SPEAKER_BACK_LEFT             0x00000010
+    #define SPEAKER_BACK_RIGHT            0x00000020
+    #define SPEAKER_FRONT_LEFT_OF_CENTER  0x00000040
+    #define SPEAKER_FRONT_RIGHT_OF_CENTER 0x00000080
+    #define SPEAKER_BACK_CENTER           0x00000100
+    #define SPEAKER_SIDE_LEFT             0x00000200
+    #define SPEAKER_SIDE_RIGHT            0x00000400
+    #define SPEAKER_TOP_CENTER            0x00000800
+    #define SPEAKER_TOP_FRONT_LEFT        0x00001000
+    #define SPEAKER_TOP_FRONT_CENTER      0x00002000
+    #define SPEAKER_TOP_FRONT_RIGHT       0x00004000
+    #define SPEAKER_TOP_BACK_LEFT         0x00008000
+    #define SPEAKER_TOP_BACK_CENTER       0x00010000
+    #define SPEAKER_TOP_BACK_RIGHT        0x00020000
+    #define SPEAKER_RESERVED              0x7FFC0000
+    #define SPEAKER_ALL                   0x80000000
+    #define _SPEAKER_POSITIONS_
+#endif
+
+#ifndef SPEAKER_STEREO
+    #define SPEAKER_MONO             (SPEAKER_FRONT_CENTER)
+    #define SPEAKER_STEREO           (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT)
+    #define SPEAKER_2POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY)
+    #define SPEAKER_SURROUND         (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER)
+    #define SPEAKER_QUAD             (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
+    #define SPEAKER_4POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
+    #define SPEAKER_5POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
+    #define SPEAKER_7POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER)
+    #define SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT)
+    #define SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_SIDE_LEFT  | SPEAKER_SIDE_RIGHT)
+#endif
+
+
+#pragma pack(pop)
+
+#endif // #ifndef __AUDIODEFS_INCLUDED__
diff --git a/Externals/XAudio2_7/comdecl.h b/Externals/XAudio2_7/comdecl.h
new file mode 100644
index 0000000000..2ae9a961e9
--- /dev/null
+++ b/Externals/XAudio2_7/comdecl.h
@@ -0,0 +1,59 @@
+// comdecl.h: Macros to facilitate COM interface and GUID declarations.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+
+#ifndef _COMDECL_H_
+#define _COMDECL_H_
+
+#ifndef _XBOX
+    #include <basetyps.h>   // For standard COM interface macros
+#else
+    #pragma warning(push)
+    #pragma warning(disable:4061)
+    #include <xtl.h>        // Required by xobjbase.h
+    #include <xobjbase.h>   // Special definitions for Xbox build
+    #pragma warning(pop)
+#endif
+
+// The DEFINE_CLSID() and DEFINE_IID() macros defined below allow COM GUIDs to
+// be declared and defined in such a way that clients can obtain the GUIDs using
+// either the __uuidof() extension or the old-style CLSID_Foo / IID_IFoo names.
+// If using the latter approach, the client can also choose whether to get the
+// GUID definitions by defining the INITGUID preprocessor constant or by linking
+// to a GUID library.  This works in either C or C++.
+
+#ifdef __cplusplus
+
+    #define DECLSPEC_UUID_WRAPPER(x) __declspec(uuid(#x))
+    #ifdef INITGUID
+
+        #define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+            class DECLSPEC_UUID_WRAPPER(l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8) className; \
+            EXTERN_C const GUID DECLSPEC_SELECTANY CLSID_##className = __uuidof(className)
+
+        #define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+            interface DECLSPEC_UUID_WRAPPER(l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8) interfaceName; \
+            EXTERN_C const GUID DECLSPEC_SELECTANY IID_##interfaceName = __uuidof(interfaceName)
+
+    #else // INITGUID
+
+        #define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+            class DECLSPEC_UUID_WRAPPER(l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8) className; \
+            EXTERN_C const GUID CLSID_##className
+
+        #define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+            interface DECLSPEC_UUID_WRAPPER(l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8) interfaceName; \
+            EXTERN_C const GUID IID_##interfaceName
+
+    #endif // INITGUID
+
+#else // __cplusplus
+
+    #define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        DEFINE_GUID(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+
+    #define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        DEFINE_GUID(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+
+#endif // __cplusplus
+
+#endif // #ifndef _COMDECL_H_
diff --git a/Externals/XAudio2_7/dxsdkver.h b/Externals/XAudio2_7/dxsdkver.h
new file mode 100644
index 0000000000..7d88bbbb03
--- /dev/null
+++ b/Externals/XAudio2_7/dxsdkver.h
@@ -0,0 +1,18 @@
+/*==========================================================================;
+ *
+ *
+ *  File:   dxsdkver.h
+ *  Content:    DirectX SDK Version Include File
+ *
+ ****************************************************************************/
+
+#ifndef _DXSDKVER_H_
+#define _DXSDKVER_H_
+
+#define _DXSDK_PRODUCT_MAJOR  9     
+#define _DXSDK_PRODUCT_MINOR  29        
+#define _DXSDK_BUILD_MAJOR    1962        
+#define _DXSDK_BUILD_MINOR    0        
+
+#endif // _DXSDKVER_H_
+
diff --git a/Externals/XAudio2_7/xma2defs.h b/Externals/XAudio2_7/xma2defs.h
new file mode 100644
index 0000000000..13a4306cb8
--- /dev/null
+++ b/Externals/XAudio2_7/xma2defs.h
@@ -0,0 +1,718 @@
+/***************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation.  All rights reserved.
+ *
+ * File:     xma2defs.h
+ * Content:  Constants, data types and functions for XMA2 compressed audio.
+ *
+ ***************************************************************************/
+
+#ifndef __XMA2DEFS_INCLUDED__
+#define __XMA2DEFS_INCLUDED__
+
+#include <sal.h>        // Markers for documenting API semantics
+#include <winerror.h>   // For S_OK, E_FAIL
+#include <audiodefs.h>  // Basic data types and constants for audio work
+
+
+/***************************************************************************
+ *  Overview
+ ***************************************************************************/
+
+// A typical XMA2 file contains these RIFF chunks:
+//
+// 'fmt' or 'XMA2' chunk (or both): A description of the XMA data's structure
+// and characteristics (length, channels, sample rate, loops, block size, etc).
+//
+// 'seek' chunk: A seek table to help navigate the XMA data.
+//
+// 'data' chunk: The encoded XMA2 data.
+//
+// The encoded XMA2 data is structured as a set of BLOCKS, which contain PACKETS,
+// which contain FRAMES, which contain SUBFRAMES (roughly speaking).  The frames
+// in a file may also be divided into several subsets, called STREAMS.
+//
+// FRAME: A variable-sized segment of XMA data that decodes to exactly 512 mono
+//      or stereo PCM samples.  This is the smallest unit of XMA data that can
+//      be decoded in isolation.  Frames are an arbitrary number of bits in
+//      length, and need not be byte-aligned.  See "XMA frame structure" below.
+//
+// SUBFRAME: A region of bits in an XMA frame that decodes to 128 mono or stereo
+//      samples.  The XMA decoder cannot decode a subframe in isolation; it needs
+//      a whole frame to work with.  However, it can begin emitting the frame's
+//      decoded samples at any one of the four subframe boundaries.  Subframes
+//      can be addressed for seeking and looping purposes.
+//
+// PACKET: A 2Kb region containing a 32-bit header and some XMA frames.  Frames
+//      can (and usually do) span packets.  A packet's header includes the offset
+//      in bits of the first frame that begins within that packet.  All of the
+//      frames that begin in a given packet belong to the same "stream" (see the
+//      Multichannel Audio section below).
+//
+// STREAM: A set of packets within an XMA file that all contain data for the
+//      same mono or stereo component of a PCM file with more than two channels.
+//      The packets comprising a given stream may be interleaved with each other
+//      more or less arbitrarily; see Multichannel Audio.
+//
+// BLOCK: An array of XMA packets; or, to break it down differently, a series of
+//      consecutive XMA frames, padded at the end with reserved data.  A block
+//      must contain at least one 2Kb packet per stream, and it can hold up to
+//      4095 packets (8190Kb), but its size is typically in the 32Kb-128Kb range.
+//      (The size chosen involves a trade-off between memory use and efficiency
+//      of reading from permanent storage.)
+//
+//      XMA frames do not span blocks, so a block is guaranteed to begin with a
+//      set of complete frames, one per stream.  Also, a block in a multi-stream
+//      XMA2 file always contains the same number of samples for each stream;
+//      see Multichannel Audio.
+//
+// The 'data' chunk in an XMA2 file is an array of XMA2WAVEFORMAT.BlockCount XMA
+// blocks, all the same size (as specified in XMA2WAVEFORMAT.BlockSizeInBytes)
+// except for the last one, which may be shorter.
+
+
+// MULTICHANNEL AUDIO: the XMA decoder can only decode raw XMA data into either
+// mono or stereo PCM data.  In order to encode a 6-channel file (say), the file
+// must be deinterleaved into 3 stereo streams that are encoded independently,
+// producing 3 encoded XMA data streams.  Then the packets in these 3 streams
+// are interleaved to produce a single XMA2 file, and some information is added
+// to the file so that the original 6-channel audio can be reconstructed at
+// decode time.  This works using the concept of an XMA stream (see above).
+//
+// The frames for all the streams in an XMA file are interleaved in an arbitrary
+// order.  To locate a frame that belongs to a given stream in a given XMA block,
+// you must examine the first few packets in the block.  Here (and only here) the
+// packets are guaranteed to be presented in stream order, so that all frames
+// beginning in packet 0 belong to stream 0 (the first stereo pair), etc.
+//
+// (This means that when decoding multi-stream XMA files, only entire XMA blocks
+// should be submitted to the decoder; otherwise it cannot know which frames
+// belong to which stream.)
+//
+// Once you have one frame that belongs to a given stream, you can find the next
+// one by looking at the frame's 'NextFrameOffsetBits' value (which is stored in
+// its first 15 bits; see XMAFRAME below).  The GetXmaFrameBitPosition function
+// uses this technique.
+
+
+// SEEKING IN XMA2 FILES: Here is some pseudocode to find the byte position and
+// subframe in an XMA2 file which will contain sample S when decoded.
+//
+// 1. Traverse the seek table to find the XMA2 block containing sample S. The
+//    seek table is an array of big-endian DWORDs, one per block in the file.
+//    The Nth DWORD is the total number of PCM samples that would be obtained
+//    by decoding the entire XMA file up to the end of block N.  Hence, the
+//    block we want is the first one whose seek table entry is greater than S.
+//    (See the GetXmaBlockContainingSample helper function.)
+//
+// 2. Calculate which frame F within the block found above contains sample S.
+//    Since each frame decodes to 512 samples, this is straightforward.  The
+//    first frame in the block produces samples X to X + 512, where X is the
+//    seek table entry for the prior block.  So F is (S - X) / 512.
+//
+// 3. Find the bit offset within the block where frame F starts.  Since frames
+//    are variable-sized, this can only be done by traversing all the frames in
+//    the block until we reach frame F.  (See GetXmaFrameBitPosition.)
+//
+// 4. Frame F has four 128-sample subframes.  To find the subframe containing S,
+//    we can use the formula (S % 512) / 128.
+//
+// In the case of multi-stream XMA files, sample S is a multichannel sample with
+// parts coming from several frames, one per stream.  To find all these frames,
+// steps 2-4 need to be repeated for each stream N, using the knowledge that the
+// first packets in a block are presented in stream order.  The frame traversal
+// in step 3 must be started at the first frame in the Nth packet of the block,
+// which will be the first frame for stream N.  (And the packet header will tell
+// you the first frame's start position within the packet.)
+//
+// Step 1 can be performed using the GetXmaBlockContainingSample function below,
+// and steps 2-4 by calling GetXmaDecodePositionForSample once for each stream.
+
+
+
+/***************************************************************************
+ *  XMA constants
+ ***************************************************************************/
+
+// Size of the PCM samples produced by the XMA decoder
+#define XMA_OUTPUT_SAMPLE_BYTES         2u
+#define XMA_OUTPUT_SAMPLE_BITS          (XMA_OUTPUT_SAMPLE_BYTES * 8u)
+
+// Size of an XMA packet
+#define XMA_BYTES_PER_PACKET            2048u
+#define XMA_BITS_PER_PACKET             (XMA_BYTES_PER_PACKET * 8u)
+
+// Size of an XMA packet header
+#define XMA_PACKET_HEADER_BYTES         4u
+#define XMA_PACKET_HEADER_BITS          (XMA_PACKET_HEADER_BYTES * 8u)
+
+// Sample blocks in a decoded XMA frame
+#define XMA_SAMPLES_PER_FRAME           512u
+
+// Sample blocks in a decoded XMA subframe
+#define XMA_SAMPLES_PER_SUBFRAME        128u
+
+// Maximum encoded data that can be submitted to the XMA decoder at a time
+#define XMA_READBUFFER_MAX_PACKETS      4095u
+#define XMA_READBUFFER_MAX_BYTES        (XMA_READBUFFER_MAX_PACKETS * XMA_BYTES_PER_PACKET)
+
+// Maximum size allowed for the XMA decoder's output buffers
+#define XMA_WRITEBUFFER_MAX_BYTES       (31u * 256u)
+
+// Required byte alignment of the XMA decoder's output buffers
+#define XMA_WRITEBUFFER_BYTE_ALIGNMENT  256u
+
+// Decode chunk sizes for the XMA_PLAYBACK_INIT.subframesToDecode field
+#define XMA_MIN_SUBFRAMES_TO_DECODE     1u
+#define XMA_MAX_SUBFRAMES_TO_DECODE     8u
+#define XMA_OPTIMAL_SUBFRAMES_TO_DECODE 4u
+
+// LoopCount<255 means finite repetitions; LoopCount=255 means infinite looping
+#define XMA_MAX_LOOPCOUNT               254u
+#define XMA_INFINITE_LOOP               255u
+
+
+
+/***************************************************************************
+ *  XMA format structures
+ ***************************************************************************/
+
+// The currently recommended way to express format information for XMA2 files
+// is the XMA2WAVEFORMATEX structure.  This structure is fully compliant with
+// the WAVEFORMATEX standard and contains all the information needed to parse
+// and manage XMA2 files in a compact way.
+
+#define WAVE_FORMAT_XMA2 0x166
+
+typedef struct XMA2WAVEFORMATEX
+{
+    WAVEFORMATEX wfx;
+    // Meaning of the WAVEFORMATEX fields here:
+    //    wFormatTag;        // Audio format type; always WAVE_FORMAT_XMA2
+    //    nChannels;         // Channel count of the decoded audio
+    //    nSamplesPerSec;    // Sample rate of the decoded audio
+    //    nAvgBytesPerSec;   // Used internally by the XMA encoder
+    //    nBlockAlign;       // Decoded sample size; channels * wBitsPerSample / 8
+    //    wBitsPerSample;    // Bits per decoded mono sample; always 16 for XMA
+    //    cbSize;            // Size in bytes of the rest of this structure (34)
+
+    WORD  NumStreams;        // Number of audio streams (1 or 2 channels each)
+    DWORD ChannelMask;       // Spatial positions of the channels in this file,
+                             // stored as SPEAKER_xxx values (see audiodefs.h)
+    DWORD SamplesEncoded;    // Total number of PCM samples the file decodes to
+    DWORD BytesPerBlock;     // XMA block size (but the last one may be shorter)
+    DWORD PlayBegin;         // First valid sample in the decoded audio
+    DWORD PlayLength;        // Length of the valid part of the decoded audio
+    DWORD LoopBegin;         // Beginning of the loop region in decoded sample terms
+    DWORD LoopLength;        // Length of the loop region in decoded sample terms
+    BYTE  LoopCount;         // Number of loop repetitions; 255 = infinite
+    BYTE  EncoderVersion;    // Version of XMA encoder that generated the file
+    WORD  BlockCount;        // XMA blocks in file (and entries in its seek table)
+} XMA2WAVEFORMATEX, *PXMA2WAVEFORMATEX;
+
+
+// The legacy XMA format structures are described here for reference, but they
+// should not be used in new content.  XMAWAVEFORMAT was the structure used in
+// XMA version 1 files.  XMA2WAVEFORMAT was used in early XMA2 files; it is not
+// placed in the usual 'fmt' RIFF chunk but in its own 'XMA2' chunk.
+
+#ifndef WAVE_FORMAT_XMA
+#define WAVE_FORMAT_XMA 0x0165
+
+// Values used in the ChannelMask fields below.  Similar to the SPEAKER_xxx
+// values defined in audiodefs.h, but modified to fit in a single byte.
+#ifndef XMA_SPEAKER_LEFT
+    #define XMA_SPEAKER_LEFT            0x01
+    #define XMA_SPEAKER_RIGHT           0x02
+    #define XMA_SPEAKER_CENTER          0x04
+    #define XMA_SPEAKER_LFE             0x08
+    #define XMA_SPEAKER_LEFT_SURROUND   0x10
+    #define XMA_SPEAKER_RIGHT_SURROUND  0x20
+    #define XMA_SPEAKER_LEFT_BACK       0x40
+    #define XMA_SPEAKER_RIGHT_BACK      0x80
+#endif
+
+
+// Used in XMAWAVEFORMAT for per-stream data
+typedef struct XMASTREAMFORMAT
+{
+    DWORD PsuedoBytesPerSec; // Used by the XMA encoder (typo preserved for legacy reasons)
+    DWORD SampleRate;        // The stream's decoded sample rate (in XMA2 files,
+                             // this is the same for all streams in the file).
+    DWORD LoopStart;         // Bit offset of the frame containing the loop start
+                             // point, relative to the beginning of the stream.
+    DWORD LoopEnd;           // Bit offset of the frame containing the loop end.
+    BYTE  SubframeData;      // Two 4-bit numbers specifying the exact location of
+                             // the loop points within the frames that contain them.
+                             //   SubframeEnd: Subframe of the loop end frame where
+                             //                the loop ends.  Ranges from 0 to 3.
+                             //   SubframeSkip: Subframes to skip in the start frame to
+                             //                 reach the loop.  Ranges from 0 to 4.
+    BYTE  Channels;          // Number of channels in the stream (1 or 2)
+    WORD  ChannelMask;       // Spatial positions of the channels in the stream
+} XMASTREAMFORMAT;
+
+// Legacy XMA1 format structure
+typedef struct XMAWAVEFORMAT
+{
+    WORD FormatTag;          // Audio format type (always WAVE_FORMAT_XMA)
+    WORD BitsPerSample;      // Bit depth (currently required to be 16)
+    WORD EncodeOptions;      // Options for XMA encoder/decoder
+    WORD LargestSkip;        // Largest skip used in interleaving streams
+    WORD NumStreams;         // Number of interleaved audio streams
+    BYTE LoopCount;          // Number of loop repetitions; 255 = infinite
+    BYTE Version;            // XMA encoder version that generated the file.
+                             // Always 3 or higher for XMA2 files.
+    XMASTREAMFORMAT XmaStreams[1]; // Per-stream format information; the actual
+                                   // array length is in the NumStreams field.
+} XMAWAVEFORMAT;
+
+
+// Used in XMA2WAVEFORMAT for per-stream data
+typedef struct XMA2STREAMFORMAT
+{
+    BYTE Channels;           // Number of channels in the stream (1 or 2)
+    BYTE RESERVED;           // Reserved for future use
+    WORD ChannelMask;        // Spatial positions of the channels in the stream
+} XMA2STREAMFORMAT;
+
+// Legacy XMA2 format structure (big-endian byte ordering)
+typedef struct XMA2WAVEFORMAT
+{
+    BYTE  Version;           // XMA encoder version that generated the file.
+                             // Always 3 or higher for XMA2 files.
+    BYTE  NumStreams;        // Number of interleaved audio streams
+    BYTE  RESERVED;          // Reserved for future use
+    BYTE  LoopCount;         // Number of loop repetitions; 255 = infinite
+    DWORD LoopBegin;         // Loop begin point, in samples
+    DWORD LoopEnd;           // Loop end point, in samples
+    DWORD SampleRate;        // The file's decoded sample rate
+    DWORD EncodeOptions;     // Options for the XMA encoder/decoder
+    DWORD PsuedoBytesPerSec; // Used internally by the XMA encoder
+    DWORD BlockSizeInBytes;  // Size in bytes of this file's XMA blocks (except
+                             // possibly the last one).  Always a multiple of
+                             // 2Kb, since XMA blocks are arrays of 2Kb packets.
+    DWORD SamplesEncoded;    // Total number of PCM samples encoded in this file
+    DWORD SamplesInSource;   // Actual number of PCM samples in the source
+                             // material used to generate this file
+    DWORD BlockCount;        // Number of XMA blocks in this file (and hence
+                             // also the number of entries in its seek table)
+    XMA2STREAMFORMAT Streams[1]; // Per-stream format information; the actual
+                                 // array length is in the NumStreams field.
+} XMA2WAVEFORMAT;
+
+#endif // #ifndef WAVE_FORMAT_XMA
+
+
+
+/***************************************************************************
+ *  XMA packet structure (in big-endian form)
+ ***************************************************************************/
+
+typedef struct XMA2PACKET
+{
+    int FrameCount        :  6;  // Number of XMA frames that begin in this packet
+    int FrameOffsetInBits : 15;  // Bit of XmaData where the first complete frame begins
+    int PacketMetaData    :  3;  // Metadata stored in the packet (always 1 for XMA2)
+    int PacketSkipCount   :  8;  // How many packets belonging to other streams must be
+                                 // skipped to find the next packet belonging to this one
+    BYTE XmaData[XMA_BYTES_PER_PACKET - sizeof(DWORD)];  // XMA encoded data
+} XMA2PACKET;
+
+// E.g. if the first DWORD of a packet is 0x30107902:
+//
+// 001100 000001000001111 001 00000010
+//    |          |         |      |____ Skip 2 packets to find the next one for this stream
+//    |          |         |___________ XMA2 signature (always 001)
+//    |          |_____________________ First frame starts 527 bits into packet
+//    |________________________________ Packet contains 12 frames
+
+
+// Helper functions to extract the fields above from an XMA packet.  (Note that
+// the bitfields cannot be read directly on little-endian architectures such as
+// the Intel x86, as they are laid out in big-endian form.)
+
+__inline DWORD GetXmaPacketFrameCount(__in_bcount(1) const BYTE* pPacket)
+{
+    return (DWORD)(pPacket[0] >> 2);
+}
+
+__inline DWORD GetXmaPacketFirstFrameOffsetInBits(__in_bcount(3) const BYTE* pPacket)
+{
+    return ((DWORD)(pPacket[0] & 0x3) << 13) |
+           ((DWORD)(pPacket[1]) << 5) |
+           ((DWORD)(pPacket[2]) >> 3);
+}
+
+__inline DWORD GetXmaPacketMetadata(__in_bcount(3) const BYTE* pPacket)
+{
+    return (DWORD)(pPacket[2] & 0x7);
+}
+
+__inline DWORD GetXmaPacketSkipCount(__in_bcount(4) const BYTE* pPacket)
+{
+    return (DWORD)(pPacket[3]);
+}
+
+
+
+/***************************************************************************
+ *  XMA frame structure
+ ***************************************************************************/
+
+// There is no way to represent the XMA frame as a C struct, since it is a
+// variable-sized string of bits that need not be stored at a byte-aligned
+// position in memory.  This is the layout:
+//
+// XMAFRAME
+// {
+//    LengthInBits: A 15-bit number representing the length of this frame.
+//    XmaData: Encoded XMA data; its size in bits is (LengthInBits - 15).
+// }
+
+// Size in bits of the frame's initial LengthInBits field
+#define XMA_BITS_IN_FRAME_LENGTH_FIELD 15
+
+// Special LengthInBits value that marks an invalid final frame
+#define XMA_FINAL_FRAME_MARKER 0x7FFF
+
+
+
+/***************************************************************************
+ *  XMA helper functions
+ ***************************************************************************/
+
+// We define a local ASSERT macro to equal the global one if it exists.
+// You can define XMA2DEFS_ASSERT in advance to override this default.
+#ifndef XMA2DEFS_ASSERT
+    #ifdef ASSERT
+        #define XMA2DEFS_ASSERT ASSERT
+    #else
+        #define XMA2DEFS_ASSERT(a) /* No-op by default */
+    #endif
+#endif
+
+
+// GetXmaBlockContainingSample: Use a given seek table to find the XMA block
+// containing a given decoded sample.  Note that the seek table entries in an
+// XMA file are stored in big-endian form and may need to be converted prior
+// to calling this function.
+
+__inline HRESULT GetXmaBlockContainingSample
+(
+    DWORD nBlockCount,                      // Blocks in the file (= seek table entries)
+    __in_ecount(nBlockCount) const DWORD* pSeekTable,  // Pointer to the seek table data
+    DWORD nDesiredSample,                   // Decoded sample to locate
+    __out DWORD* pnBlockContainingSample,   // Index of the block containing the sample
+    __out DWORD* pnSampleOffsetWithinBlock  // Position of the sample in this block
+)
+{
+    DWORD nPreviousTotalSamples = 0;
+    DWORD nBlock;
+    DWORD nTotalSamplesSoFar;
+
+    XMA2DEFS_ASSERT(pSeekTable);
+    XMA2DEFS_ASSERT(pnBlockContainingSample);
+    XMA2DEFS_ASSERT(pnSampleOffsetWithinBlock);
+
+    for (nBlock = 0; nBlock < nBlockCount; ++nBlock)
+    {
+        nTotalSamplesSoFar = pSeekTable[nBlock];
+        if (nTotalSamplesSoFar > nDesiredSample)
+        {
+            *pnBlockContainingSample = nBlock;
+            *pnSampleOffsetWithinBlock = nDesiredSample - nPreviousTotalSamples;
+            return S_OK;
+        }
+        nPreviousTotalSamples = nTotalSamplesSoFar;
+    }
+
+    return E_FAIL;
+}
+
+
+// GetXmaFrameLengthInBits: Reads a given frame's LengthInBits field.
+
+__inline DWORD GetXmaFrameLengthInBits
+(
+    __in_bcount(nBitPosition / 8 + 3)
+    __in const BYTE* pPacket,  // Pointer to XMA packet[s] containing the frame
+    DWORD nBitPosition         // Bit offset of the frame within this packet
+)
+{
+    DWORD nRegion;
+    DWORD nBytePosition = nBitPosition / 8;
+    DWORD nBitOffset = nBitPosition % 8;
+
+    if (nBitOffset < 2) // Only need to read 2 bytes (and might not be safe to read more)
+    {
+        nRegion = (DWORD)(pPacket[nBytePosition+0]) << 8 |
+                  (DWORD)(pPacket[nBytePosition+1]);
+        return (nRegion >> (1 - nBitOffset)) & 0x7FFF;  // Last 15 bits
+    }
+    else // Need to read 3 bytes
+    {
+        nRegion = (DWORD)(pPacket[nBytePosition+0]) << 16 |
+                  (DWORD)(pPacket[nBytePosition+1]) << 8 |
+                  (DWORD)(pPacket[nBytePosition+2]);
+        return (nRegion >> (9 - nBitOffset)) & 0x7FFF;  // Last 15 bits
+    }
+}
+
+
+// GetXmaFrameBitPosition: Calculates the bit offset of a given frame within
+// an XMA block or set of blocks.  Returns 0 on failure.
+
+__inline DWORD GetXmaFrameBitPosition
+(
+    __in_bcount(nXmaDataBytes) const BYTE* pXmaData,  // Pointer to XMA block[s]
+    DWORD nXmaDataBytes,                              // Size of pXmaData in bytes
+    DWORD nStreamIndex,                               // Stream within which to seek
+    DWORD nDesiredFrame                               // Frame sought
+)
+{
+    const BYTE* pCurrentPacket;
+    DWORD nPacketsExamined = 0;
+    DWORD nFrameCountSoFar = 0;
+    DWORD nFramesToSkip;
+    DWORD nFrameBitOffset;
+
+    XMA2DEFS_ASSERT(pXmaData);
+    XMA2DEFS_ASSERT(nXmaDataBytes % XMA_BYTES_PER_PACKET == 0);
+
+    // Get the first XMA packet belonging to the desired stream, relying on the
+    // fact that the first packets for each stream are in consecutive order at
+    // the beginning of an XMA block.
+
+    pCurrentPacket = pXmaData + nStreamIndex * XMA_BYTES_PER_PACKET;
+    for (;;)
+    {
+        // If we have exceeded the size of the XMA data, return failure
+        if (pCurrentPacket + XMA_BYTES_PER_PACKET > pXmaData + nXmaDataBytes)
+        {
+            return 0;
+        }
+
+        // If the current packet contains the frame we are looking for...
+        if (nFrameCountSoFar + GetXmaPacketFrameCount(pCurrentPacket) > nDesiredFrame)
+        {
+            // See how many frames in this packet we need to skip to get to it
+            XMA2DEFS_ASSERT(nDesiredFrame >= nFrameCountSoFar);
+            nFramesToSkip = nDesiredFrame - nFrameCountSoFar;
+
+            // Get the bit offset of the first frame in this packet
+            nFrameBitOffset = XMA_PACKET_HEADER_BITS + GetXmaPacketFirstFrameOffsetInBits(pCurrentPacket);
+
+            // Advance nFrameBitOffset to the frame of interest
+            while (nFramesToSkip--)
+            {
+                nFrameBitOffset += GetXmaFrameLengthInBits(pCurrentPacket, nFrameBitOffset);
+            }
+
+            // The bit offset to return is the number of bits from pXmaData to
+            // pCurrentPacket plus the bit offset of the frame of interest
+            return (DWORD)(pCurrentPacket - pXmaData) * 8 + nFrameBitOffset;
+        }
+
+        // If we haven't found the right packet yet, advance our counters
+        ++nPacketsExamined;
+        nFrameCountSoFar += GetXmaPacketFrameCount(pCurrentPacket);
+
+        // And skip to the next packet belonging to the same stream
+        pCurrentPacket += XMA_BYTES_PER_PACKET * (GetXmaPacketSkipCount(pCurrentPacket) + 1);
+    }
+}
+
+
+// GetLastXmaFrameBitPosition: Calculates the bit offset of the last complete
+// frame in an XMA block or set of blocks.
+
+__inline DWORD GetLastXmaFrameBitPosition
+(
+    __in_bcount(nXmaDataBytes) const BYTE* pXmaData,  // Pointer to XMA block[s]
+    DWORD nXmaDataBytes,                              // Size of pXmaData in bytes
+    DWORD nStreamIndex                                // Stream within which to seek
+)
+{
+    const BYTE* pLastPacket;
+    DWORD nBytesToNextPacket;
+    DWORD nFrameBitOffset;
+    DWORD nFramesInLastPacket;
+
+    XMA2DEFS_ASSERT(pXmaData);
+    XMA2DEFS_ASSERT(nXmaDataBytes % XMA_BYTES_PER_PACKET == 0);
+    XMA2DEFS_ASSERT(nXmaDataBytes >= XMA_BYTES_PER_PACKET * (nStreamIndex + 1));
+
+    // Get the first XMA packet belonging to the desired stream, relying on the
+    // fact that the first packets for each stream are in consecutive order at
+    // the beginning of an XMA block.
+    pLastPacket = pXmaData + nStreamIndex * XMA_BYTES_PER_PACKET;
+
+    // Search for the last packet belonging to the desired stream
+    for (;;)
+    {
+        nBytesToNextPacket = XMA_BYTES_PER_PACKET * (GetXmaPacketSkipCount(pLastPacket) + 1);
+        XMA2DEFS_ASSERT(nBytesToNextPacket);
+        if (pLastPacket + nBytesToNextPacket + XMA_BYTES_PER_PACKET > pXmaData + nXmaDataBytes)
+        {
+            break;  // The next packet would extend beyond the end of pXmaData
+        }
+        pLastPacket += nBytesToNextPacket;
+    }
+
+    // The last packet can sometimes have no seekable frames, in which case we
+    // have to use the previous one
+    if (GetXmaPacketFrameCount(pLastPacket) == 0)
+    {
+        pLastPacket -= nBytesToNextPacket;
+    }
+
+    // Found the last packet.  Get the bit offset of its first frame.
+    nFrameBitOffset = XMA_PACKET_HEADER_BITS + GetXmaPacketFirstFrameOffsetInBits(pLastPacket);
+
+    // Traverse frames until we reach the last one
+    nFramesInLastPacket = GetXmaPacketFrameCount(pLastPacket);
+    while (--nFramesInLastPacket)
+    {
+        nFrameBitOffset += GetXmaFrameLengthInBits(pLastPacket, nFrameBitOffset);
+    }
+
+    // The bit offset to return is the number of bits from pXmaData to
+    // pLastPacket plus the offset of the last frame in this packet.
+    return (DWORD)(pLastPacket - pXmaData) * 8 + nFrameBitOffset;
+}
+
+
+// GetXmaDecodePositionForSample: Obtains the information needed to make the
+// decoder generate audio starting at a given sample position relative to the
+// beginning of the given XMA block: the bit offset of the appropriate frame,
+// and the right subframe within that frame.  This data can be passed directly
+// to the XMAPlaybackSetDecodePosition function.
+
+__inline HRESULT GetXmaDecodePositionForSample
+(
+    __in_bcount(nXmaDataBytes) const BYTE* pXmaData,  // Pointer to XMA block[s]
+    DWORD nXmaDataBytes,                              // Size of pXmaData in bytes
+    DWORD nStreamIndex,                               // Stream within which to seek
+    DWORD nDesiredSample,                             // Sample sought
+    __out DWORD* pnBitOffset,                         // Returns the bit offset within pXmaData of
+                                                      // the frame containing the sample sought
+    __out DWORD* pnSubFrame                           // Returns the subframe containing the sample
+)
+{
+    DWORD nDesiredFrame = nDesiredSample / XMA_SAMPLES_PER_FRAME;
+    DWORD nSubFrame = (nDesiredSample % XMA_SAMPLES_PER_FRAME) / XMA_SAMPLES_PER_SUBFRAME;
+    DWORD nBitOffset = GetXmaFrameBitPosition(pXmaData, nXmaDataBytes, nStreamIndex, nDesiredFrame);
+
+    XMA2DEFS_ASSERT(pnBitOffset);
+    XMA2DEFS_ASSERT(pnSubFrame);
+
+    if (nBitOffset)
+    {
+        *pnBitOffset = nBitOffset;
+        *pnSubFrame = nSubFrame;
+        return S_OK;
+    }
+    else
+    {
+        return E_FAIL;
+    }
+}
+
+
+// GetXmaSampleRate: Obtains the legal XMA sample rate (24, 32, 44.1 or 48Khz)
+// corresponding to a generic sample rate.
+
+__inline DWORD GetXmaSampleRate(DWORD dwGeneralRate)
+{
+    DWORD dwXmaRate = 48000; // Default XMA rate for all rates above 44100Hz
+
+    if (dwGeneralRate <= 24000)      dwXmaRate = 24000;
+    else if (dwGeneralRate <= 32000) dwXmaRate = 32000;
+    else if (dwGeneralRate <= 44100) dwXmaRate = 44100;
+
+    return dwXmaRate;
+}
+
+
+// Functions to convert between WAVEFORMATEXTENSIBLE channel masks (combinations
+// of the SPEAKER_xxx flags defined in audiodefs.h) and XMA channel masks (which
+// are limited to eight possible speaker positions: left, right, center, low
+// frequency, side left, side right, back left and back right).
+
+__inline DWORD GetStandardChannelMaskFromXmaMask(BYTE bXmaMask)
+{
+    DWORD dwStandardMask = 0;
+
+    if (bXmaMask & XMA_SPEAKER_LEFT)           dwStandardMask |= SPEAKER_FRONT_LEFT;
+    if (bXmaMask & XMA_SPEAKER_RIGHT)          dwStandardMask |= SPEAKER_FRONT_RIGHT;
+    if (bXmaMask & XMA_SPEAKER_CENTER)         dwStandardMask |= SPEAKER_FRONT_CENTER;
+    if (bXmaMask & XMA_SPEAKER_LFE)            dwStandardMask |= SPEAKER_LOW_FREQUENCY;
+    if (bXmaMask & XMA_SPEAKER_LEFT_SURROUND)  dwStandardMask |= SPEAKER_SIDE_LEFT;
+    if (bXmaMask & XMA_SPEAKER_RIGHT_SURROUND) dwStandardMask |= SPEAKER_SIDE_RIGHT;
+    if (bXmaMask & XMA_SPEAKER_LEFT_BACK)      dwStandardMask |= SPEAKER_BACK_LEFT;
+    if (bXmaMask & XMA_SPEAKER_RIGHT_BACK)     dwStandardMask |= SPEAKER_BACK_RIGHT;
+
+    return dwStandardMask;
+}
+
+__inline BYTE GetXmaChannelMaskFromStandardMask(DWORD dwStandardMask)
+{
+    BYTE bXmaMask = 0;
+
+    if (dwStandardMask & SPEAKER_FRONT_LEFT)    bXmaMask |= XMA_SPEAKER_LEFT;
+    if (dwStandardMask & SPEAKER_FRONT_RIGHT)   bXmaMask |= XMA_SPEAKER_RIGHT;
+    if (dwStandardMask & SPEAKER_FRONT_CENTER)  bXmaMask |= XMA_SPEAKER_CENTER;
+    if (dwStandardMask & SPEAKER_LOW_FREQUENCY) bXmaMask |= XMA_SPEAKER_LFE;
+    if (dwStandardMask & SPEAKER_SIDE_LEFT)     bXmaMask |= XMA_SPEAKER_LEFT_SURROUND;
+    if (dwStandardMask & SPEAKER_SIDE_RIGHT)    bXmaMask |= XMA_SPEAKER_RIGHT_SURROUND;
+    if (dwStandardMask & SPEAKER_BACK_LEFT)     bXmaMask |= XMA_SPEAKER_LEFT_BACK;
+    if (dwStandardMask & SPEAKER_BACK_RIGHT)    bXmaMask |= XMA_SPEAKER_RIGHT_BACK;
+
+    return bXmaMask;
+}
+
+
+// LocalizeXma2Format: Modifies a XMA2WAVEFORMATEX structure in place to comply
+// with the current platform's byte-ordering rules (little- or big-endian).
+
+__inline HRESULT LocalizeXma2Format(__inout XMA2WAVEFORMATEX* pXma2Format)
+{
+    #define XMASWAP2BYTES(n) ((WORD)(((n) >> 8) | (((n) & 0xff) << 8)))
+    #define XMASWAP4BYTES(n) ((DWORD)((n) >> 24 | (n) << 24 | ((n) & 0xff00) << 8 | ((n) & 0xff0000) >> 8))
+
+    if (pXma2Format->wfx.wFormatTag == WAVE_FORMAT_XMA2)
+    {
+        return S_OK;
+    }
+    else if (XMASWAP2BYTES(pXma2Format->wfx.wFormatTag) == WAVE_FORMAT_XMA2)
+    {
+        pXma2Format->wfx.wFormatTag      = XMASWAP2BYTES(pXma2Format->wfx.wFormatTag);
+        pXma2Format->wfx.nChannels       = XMASWAP2BYTES(pXma2Format->wfx.nChannels);
+        pXma2Format->wfx.nSamplesPerSec  = XMASWAP4BYTES(pXma2Format->wfx.nSamplesPerSec);
+        pXma2Format->wfx.nAvgBytesPerSec = XMASWAP4BYTES(pXma2Format->wfx.nAvgBytesPerSec);
+        pXma2Format->wfx.nBlockAlign     = XMASWAP2BYTES(pXma2Format->wfx.nBlockAlign);
+        pXma2Format->wfx.wBitsPerSample  = XMASWAP2BYTES(pXma2Format->wfx.wBitsPerSample);
+        pXma2Format->wfx.cbSize          = XMASWAP2BYTES(pXma2Format->wfx.cbSize);
+        pXma2Format->NumStreams          = XMASWAP2BYTES(pXma2Format->NumStreams);
+        pXma2Format->ChannelMask         = XMASWAP4BYTES(pXma2Format->ChannelMask);
+        pXma2Format->SamplesEncoded      = XMASWAP4BYTES(pXma2Format->SamplesEncoded);
+        pXma2Format->BytesPerBlock       = XMASWAP4BYTES(pXma2Format->BytesPerBlock);
+        pXma2Format->PlayBegin           = XMASWAP4BYTES(pXma2Format->PlayBegin);
+        pXma2Format->PlayLength          = XMASWAP4BYTES(pXma2Format->PlayLength);
+        pXma2Format->LoopBegin           = XMASWAP4BYTES(pXma2Format->LoopBegin);
+        pXma2Format->LoopLength          = XMASWAP4BYTES(pXma2Format->LoopLength);
+        pXma2Format->BlockCount          = XMASWAP2BYTES(pXma2Format->BlockCount);
+        return S_OK;
+    }
+    else
+    {
+        return E_FAIL; // Not a recognizable XMA2 format
+    }
+
+    #undef XMASWAP2BYTES
+    #undef XMASWAP4BYTES
+}
+
+
+#endif // #ifndef __XMA2DEFS_INCLUDED__
diff --git a/Externals/enet/CMakeLists.txt b/Externals/enet/CMakeLists.txt
new file mode 100644
index 0000000000..1fe2f1bbf3
--- /dev/null
+++ b/Externals/enet/CMakeLists.txt
@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(enet)
+
+# The "configure" step.
+include(CheckFunctionExists)
+include(CheckStructHasMember)
+include(CheckTypeSize)
+check_function_exists("fcntl" HAS_FCNTL)
+check_function_exists("poll" HAS_POLL)
+check_function_exists("getaddrinfo" HAS_GETADDRINFO)
+check_function_exists("getnameinfo" HAS_GETNAMEINFO)
+check_function_exists("gethostbyname_r" HAS_GETHOSTBYNAME_R)
+check_function_exists("gethostbyaddr_r" HAS_GETHOSTBYADDR_R)
+check_function_exists("inet_pton" HAS_INET_PTON)
+check_function_exists("inet_ntop" HAS_INET_NTOP)
+check_struct_has_member("struct msghdr" "msg_flags" "sys/types.h;sys/socket.h" HAS_MSGHDR_FLAGS)
+set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h" "sys/socket.h")
+check_type_size("socklen_t" HAS_SOCKLEN_T BUILTIN_TYPES_ONLY)
+unset(CMAKE_EXTRA_INCLUDE_FILES)
+ 
+if(HAS_FCNTL)
+    add_definitions(-DHAS_FCNTL=1)
+endif()
+if(HAS_POLL)
+    add_definitions(-DHAS_POLL=1)
+endif()
+if(HAS_GETNAMEINFO)
+    add_definitions(-DHAS_GETNAMEINFO=1)
+endif()
+if(HAS_GETADDRINFO)
+    add_definitions(-DHAS_GETADDRINFO=1)
+endif()
+if(HAS_GETHOSTBYNAME_R)
+    add_definitions(-DHAS_GETHOSTBYNAME_R=1)
+endif()
+if(HAS_GETHOSTBYADDR_R)
+    add_definitions(-DHAS_GETHOSTBYADDR_R=1)
+endif()
+if(HAS_INET_PTON)
+    add_definitions(-DHAS_INET_PTON=1)
+endif()
+if(HAS_INET_NTOP)
+    add_definitions(-DHAS_INET_NTOP=1)
+endif()
+if(HAS_MSGHDR_FLAGS)
+    add_definitions(-DHAS_MSGHDR_FLAGS=1)
+endif()
+if(HAS_SOCKLEN_T)
+    add_definitions(-DHAS_SOCKLEN_T=1)
+endif()
+ 
+include_directories(${PROJECT_SOURCE_DIR}/include)
+ 
+add_library(enet STATIC
+        callbacks.c
+        compress.c
+        host.c
+        list.c
+        packet.c
+        peer.c
+        protocol.c
+        unix.c
+        win32.c
+    )
diff --git a/Externals/enet/ChangeLog b/Externals/enet/ChangeLog
new file mode 100644
index 0000000000..663c7b731c
--- /dev/null
+++ b/Externals/enet/ChangeLog
@@ -0,0 +1,179 @@
+* use getaddrinfo and getnameinfo where available
+
+ENet 1.3.13 (April 30, 2015):
+
+* miscellaneous bug fixes
+* added premake and cmake support
+* miscellaneous documentation cleanups
+
+ENet 1.3.12 (April 24, 2014):
+
+* added maximumPacketSize and maximumWaitingData fields to ENetHost to limit the amount of 
+data waiting to be delivered on a peer (beware that the default maximumPacketSize is
+32MB and should be set higher if desired as should maximumWaitingData)
+
+ENet 1.3.11 (December 26, 2013):
+
+* allow an ENetHost to connect to itself
+* fixed possible bug with disconnect notifications during connect attempts
+* fixed some preprocessor definition bugs
+
+ENet 1.3.10 (October 23, 2013);
+
+* doubled maximum reliable window size
+* fixed RCVTIMEO/SNDTIMEO socket options and also added NODELAY
+
+ENet 1.3.9 (August 19, 2013):
+
+* added duplicatePeers option to ENetHost which can limit the number of peers from duplicate IPs
+* added enet_socket_get_option() and ENET_SOCKOPT_ERROR
+* added enet_host_random_seed() platform stub
+
+ENet 1.3.8 (June 2, 2013):
+
+* added enet_linked_version() for checking the linked version 
+* added enet_socket_get_address() for querying the local address of a socket
+* silenced some debugging prints unless ENET_DEBUG is defined during compilation
+* handle EINTR in enet_socket_wait() so that enet_host_service() doesn't propagate errors from signals
+* optimized enet_host_bandwidth_throttle() to be less expensive for large numbers of peers
+
+ENet 1.3.7 (March 6, 2013):
+
+* added ENET_PACKET_FLAG_SENT to indicate that a packet is being freed because it has been sent
+* added userData field to ENetPacket
+* changed how random seed is generated on Windows to avoid import warnings
+* fixed case where disconnects could be generated with no preceding connect event
+
+ENet 1.3.6 (December 11, 2012):
+
+* added support for intercept callback in ENetHost that can be used to process raw packets before ENet
+* added enet_socket_shutdown() for issuing shutdown on a socket
+* fixed enet_socket_connect() to not error on non-blocking connects
+* fixed bug in MTU negotiation during connections
+ 
+ENet 1.3.5 (July 31, 2012):
+
+* fixed bug in unreliable packet fragment queuing
+
+ENet 1.3.4 (May 29, 2012):
+
+* added enet_peer_ping_interval() for configuring per-peer ping intervals
+* added enet_peer_timeout() for configuring per-peer timeouts
+* added protocol packet size limits
+
+ENet 1.3.3 (June 28, 2011):
+
+* fixed bug with simultaneous disconnects not dispatching events
+
+ENet 1.3.2 (May 31, 2011):
+
+* added support for unreliable packet fragmenting via the packet flag
+ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT
+* fixed regression in unreliable packet queuing
+* added check against received port to limit some forms of IP-spoofing
+
+ENet 1.3.1 (February 10, 2011):
+
+* fixed bug in tracking of reliable data in transit
+* reliable data window size now scales with the throttle
+* fixed bug in fragment length calculation when checksums are used
+
+ENet 1.3.0 (June 5, 2010):
+
+* enet_host_create() now requires the channel limit to be specified as
+a parameter
+* enet_host_connect() now accepts a data parameter which is supplied 
+to the receiving receiving host in the event data field for a connect event
+* added an adaptive order-2 PPM range coder as a built-in compressor option
+which can be set with enet_host_compress_with_range_coder()
+* added support for packet compression configurable with a callback
+* improved session number handling to not rely on the packet checksum
+field, saving 4 bytes per packet unless the checksum option is used
+* removed the dependence on the rand callback for session number handling
+
+Caveats: This version is not protocol compatible with the 1.2 series or 
+earlier. The enet_host_connect and enet_host_create API functions require
+supplying additional parameters.
+
+ENet 1.2.5 (June 28, 2011):
+
+* fixed bug with simultaneous disconnects not dispatching events
+
+ENet 1.2.4 (May 31, 2011):
+
+* fixed regression in unreliable packet queuing
+* added check against received port to limit some forms of IP-spoofing
+
+ENet 1.2.3 (February 10, 2011):
+
+* fixed bug in tracking reliable data in transit
+
+ENet 1.2.2 (June 5, 2010):
+
+* checksum functionality is now enabled by setting a checksum callback
+inside ENetHost instead of being a configure script option
+* added totalSentData, totalSentPackets, totalReceivedData, and
+totalReceivedPackets counters inside ENetHost for getting usage
+statistics
+* added enet_host_channel_limit() for limiting the maximum number of
+channels allowed by connected peers
+* now uses dispatch queues for event dispatch rather than potentially
+unscalable array walking
+* added no_memory callback that is called when a malloc attempt fails,
+such that if no_memory returns rather than aborts (the default behavior),
+then the error is propagated to the return value of the API calls
+* now uses packed attribute for protocol structures on platforms with 
+strange alignment rules
+* improved autoconf build system contributed by Nathan Brink allowing 
+for easier building as a shared library
+
+Caveats: If you were using the compile-time option that enabled checksums,
+make sure to set the checksum callback inside ENetHost to enet_crc32 to
+regain the old behavior. The ENetCallbacks structure has added new fields,
+so make sure to clear the structure to zero before use if 
+using enet_initialize_with_callbacks().
+
+ENet 1.2.1 (November 12, 2009):
+
+* fixed bug that could cause disconnect events to be dropped
+* added thin wrapper around select() for portable usage
+* added ENET_SOCKOPT_REUSEADDR socket option
+* factored enet_socket_bind()/enet_socket_listen() out of enet_socket_create()
+* added contributed Code::Blocks build file
+
+ENet 1.2 (February 12, 2008):
+
+* fixed bug in VERIFY_CONNECT acknowledgement that could cause connect
+attempts to occasionally timeout
+* fixed acknowledgements to check both the outgoing and sent queues
+when removing acknowledged packets
+* fixed accidental bit rot in the MSVC project file
+* revised sequence number overflow handling to address some possible
+disconnect bugs
+* added enet_host_check_events() for getting only local queued events
+* factored out socket option setting into enet_socket_set_option() so
+that socket options are now set separately from enet_socket_create()
+
+Caveats: While this release is superficially protocol compatible with 1.1,
+differences in the sequence number overflow handling can potentially cause
+random disconnects.
+
+ENet 1.1 (June 6, 2007):
+
+* optional CRC32 just in case someone needs a stronger checksum than UDP 
+provides (--enable-crc32 configure option)
+* the size of packet headers are half the size they used to be (so less 
+overhead when sending small packets)
+* enet_peer_disconnect_later() that waits till all queued outgoing 
+packets get sent before issuing an actual disconnect
+* freeCallback field in individual packets for notification of when a 
+packet is about to be freed
+* ENET_PACKET_FLAG_NO_ALLOCATE for supplying pre-allocated data to a 
+packet (can be used in concert with freeCallback to support some custom 
+allocation schemes that the normal memory allocation callbacks would 
+normally not allow)
+* enet_address_get_host_ip() for printing address numbers
+* promoted the enet_socket_*() functions to be part of the API now
+* a few stability/crash fixes
+
+
diff --git a/Externals/enet/Doxyfile b/Externals/enet/Doxyfile
new file mode 100644
index 0000000000..597ef1af1c
--- /dev/null
+++ b/Externals/enet/Doxyfile
@@ -0,0 +1,2303 @@
+# Doxyfile 1.8.6
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "ENet"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = v1.3.13
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Reliable UDP networking library"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = docs
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = YES
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = YES
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = DoxygenLayout.xml
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  =
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c *.h *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = ${CMAKE_CURRENT_SOURCE_DIR}
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = NO
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 1
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 118
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 240
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 0
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = YES
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = ENET_CALLBACK= ENET_API=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro defi ENET_CALLBACK=nition that overrules the
+# definition found in the source  ENET_CALLBACK=code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/Externals/enet/DoxygenLayout.xml b/Externals/enet/DoxygenLayout.xml
new file mode 100644
index 0000000000..a9a9e5d4d3
--- /dev/null
+++ b/Externals/enet/DoxygenLayout.xml
@@ -0,0 +1,191 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.6 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title="Home"/>
+    <tab type="user" visible="yes" title="Features" url="@ref Features" />
+    <tab type="user" visible="yes" title="Downloads" url="@ref Downloads" />
+    <tab type="user" visible="yes" title="Installation" url="@ref Installation" />
+    <tab type="user" visible="yes" title="Tutorial" url="@ref Tutorial" />
+    <tab type="user" visible="yes" title="Mailing List" url="@ref MailingList" />
+    <tab type="user" visible="yes" title="IRC Channel" url="@ref IRCChannel" />
+    <tab type="user" visible="yes" title="FAQ" url="@ref FAQ" />
+    <tab type="user" visible="yes" title="License" url="@ref License" />
+    <tab type="usergroup" visible="yes" title="Documentation" briefdescription="Documentation">
+        <tab type="modules" visible="yes" title="Functions" intro=""/>
+        <tab type="classlist" visible="yes" title="Data Structures" intro=""/>
+        <tab type="filelist" visible="yes" title="Files" intro=""/>
+        <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/Externals/enet/LICENSE b/Externals/enet/LICENSE
new file mode 100644
index 0000000000..436053efda
--- /dev/null
+++ b/Externals/enet/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2002-2015 Lee Salzman
+
+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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Externals/enet/Makefile.am b/Externals/enet/Makefile.am
new file mode 100644
index 0000000000..e839463c41
--- /dev/null
+++ b/Externals/enet/Makefile.am
@@ -0,0 +1,22 @@
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = libenet.pc
+
+enetincludedir=$(includedir)/enet
+enetinclude_HEADERS = \
+	include/enet/callbacks.h \
+	include/enet/enet.h \
+	include/enet/list.h \
+	include/enet/protocol.h \
+	include/enet/time.h \
+	include/enet/types.h \
+	include/enet/unix.h \
+	include/enet/utility.h \
+	include/enet/win32.h
+
+lib_LTLIBRARIES = libenet.la
+libenet_la_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c protocol.c unix.c win32.c
+# see info '(libtool) Updating version info' before making a release
+libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:1:0
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+ACLOCAL_AMFLAGS = -Im4
diff --git a/Externals/enet/README b/Externals/enet/README
new file mode 100644
index 0000000000..54b2d21304
--- /dev/null
+++ b/Externals/enet/README
@@ -0,0 +1,15 @@
+Please visit the ENet homepage at http://enet.bespin.org for installation
+and usage instructions.
+
+If you obtained this package from github, the quick description on how to build
+is:
+
+# Generate the build system.
+
+autoreconf -vfi
+
+# Compile and install the library.
+
+./configure && make && make install
+
+
diff --git a/Externals/enet/callbacks.c b/Externals/enet/callbacks.c
new file mode 100644
index 0000000000..b3990af1fb
--- /dev/null
+++ b/Externals/enet/callbacks.c
@@ -0,0 +1,53 @@
+/** 
+ @file callbacks.c
+ @brief ENet callback functions
+*/
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+
+static ENetCallbacks callbacks = { malloc, free, abort };
+
+int
+enet_initialize_with_callbacks (ENetVersion version, const ENetCallbacks * inits)
+{
+   if (version < ENET_VERSION_CREATE (1, 3, 0))
+     return -1;
+
+   if (inits -> malloc != NULL || inits -> free != NULL)
+   {
+      if (inits -> malloc == NULL || inits -> free == NULL)
+        return -1;
+
+      callbacks.malloc = inits -> malloc;
+      callbacks.free = inits -> free;
+   }
+      
+   if (inits -> no_memory != NULL)
+     callbacks.no_memory = inits -> no_memory;
+
+   return enet_initialize ();
+}
+
+ENetVersion
+enet_linked_version (void)
+{
+    return ENET_VERSION;
+}
+           
+void *
+enet_malloc (size_t size)
+{
+   void * memory = callbacks.malloc (size);
+
+   if (memory == NULL)
+     callbacks.no_memory ();
+
+   return memory;
+}
+
+void
+enet_free (void * memory)
+{
+   callbacks.free (memory);
+}
+
diff --git a/Externals/enet/compress.c b/Externals/enet/compress.c
new file mode 100644
index 0000000000..784489a787
--- /dev/null
+++ b/Externals/enet/compress.c
@@ -0,0 +1,654 @@
+/** 
+ @file compress.c
+ @brief An adaptive order-2 PPM range coder
+*/
+#define ENET_BUILDING_LIB 1
+#include <string.h>
+#include "enet/enet.h"
+
+typedef struct _ENetSymbol
+{
+    /* binary indexed tree of symbols */
+    enet_uint8 value;
+    enet_uint8 count;
+    enet_uint16 under;
+    enet_uint16 left, right;
+
+    /* context defined by this symbol */
+    enet_uint16 symbols;
+    enet_uint16 escapes;
+    enet_uint16 total;
+    enet_uint16 parent; 
+} ENetSymbol;
+
+/* adaptation constants tuned aggressively for small packet sizes rather than large file compression */
+enum
+{
+    ENET_RANGE_CODER_TOP    = 1<<24,
+    ENET_RANGE_CODER_BOTTOM = 1<<16,
+
+    ENET_CONTEXT_SYMBOL_DELTA = 3,
+    ENET_CONTEXT_SYMBOL_MINIMUM = 1,
+    ENET_CONTEXT_ESCAPE_MINIMUM = 1,
+
+    ENET_SUBCONTEXT_ORDER = 2,
+    ENET_SUBCONTEXT_SYMBOL_DELTA = 2,
+    ENET_SUBCONTEXT_ESCAPE_DELTA = 5
+};
+
+/* context exclusion roughly halves compression speed, so disable for now */
+#undef ENET_CONTEXT_EXCLUSION
+
+typedef struct _ENetRangeCoder
+{
+    /* only allocate enough symbols for reasonable MTUs, would need to be larger for large file compression */
+    ENetSymbol symbols[4096];
+} ENetRangeCoder;
+
+void *
+enet_range_coder_create (void)
+{
+    ENetRangeCoder * rangeCoder = (ENetRangeCoder *) enet_malloc (sizeof (ENetRangeCoder));
+    if (rangeCoder == NULL)
+      return NULL;
+
+    return rangeCoder;
+}
+
+void
+enet_range_coder_destroy (void * context)
+{
+    ENetRangeCoder * rangeCoder = (ENetRangeCoder *) context;
+    if (rangeCoder == NULL)
+      return;
+
+    enet_free (rangeCoder);
+}
+
+#define ENET_SYMBOL_CREATE(symbol, value_, count_) \
+{ \
+    symbol = & rangeCoder -> symbols [nextSymbol ++]; \
+    symbol -> value = value_; \
+    symbol -> count = count_; \
+    symbol -> under = count_; \
+    symbol -> left = 0; \
+    symbol -> right = 0; \
+    symbol -> symbols = 0; \
+    symbol -> escapes = 0; \
+    symbol -> total = 0; \
+    symbol -> parent = 0; \
+}
+
+#define ENET_CONTEXT_CREATE(context, escapes_, minimum) \
+{ \
+    ENET_SYMBOL_CREATE (context, 0, 0); \
+    (context) -> escapes = escapes_; \
+    (context) -> total = escapes_ + 256*minimum; \
+    (context) -> symbols = 0; \
+}
+
+static enet_uint16
+enet_symbol_rescale (ENetSymbol * symbol)
+{
+    enet_uint16 total = 0;
+    for (;;)
+    {
+        symbol -> count -= symbol->count >> 1;
+        symbol -> under = symbol -> count;
+        if (symbol -> left)
+          symbol -> under += enet_symbol_rescale (symbol + symbol -> left);
+        total += symbol -> under;
+        if (! symbol -> right) break;
+        symbol += symbol -> right;
+    } 
+    return total;
+}
+
+#define ENET_CONTEXT_RESCALE(context, minimum) \
+{ \
+    (context) -> total = (context) -> symbols ? enet_symbol_rescale ((context) + (context) -> symbols) : 0; \
+    (context) -> escapes -= (context) -> escapes >> 1; \
+    (context) -> total += (context) -> escapes + 256*minimum; \
+}
+
+#define ENET_RANGE_CODER_OUTPUT(value) \
+{ \
+    if (outData >= outEnd) \
+      return 0; \
+    * outData ++ = value; \
+}
+
+#define ENET_RANGE_CODER_ENCODE(under, count, total) \
+{ \
+    encodeRange /= (total); \
+    encodeLow += (under) * encodeRange; \
+    encodeRange *= (count); \
+    for (;;) \
+    { \
+        if((encodeLow ^ (encodeLow + encodeRange)) >= ENET_RANGE_CODER_TOP) \
+        { \
+            if(encodeRange >= ENET_RANGE_CODER_BOTTOM) break; \
+            encodeRange = -encodeLow & (ENET_RANGE_CODER_BOTTOM - 1); \
+        } \
+        ENET_RANGE_CODER_OUTPUT (encodeLow >> 24); \
+        encodeRange <<= 8; \
+        encodeLow <<= 8; \
+    } \
+}
+
+#define ENET_RANGE_CODER_FLUSH \
+{ \
+    while (encodeLow) \
+    { \
+        ENET_RANGE_CODER_OUTPUT (encodeLow >> 24); \
+        encodeLow <<= 8; \
+    } \
+}
+
+#define ENET_RANGE_CODER_FREE_SYMBOLS \
+{ \
+    if (nextSymbol >= sizeof (rangeCoder -> symbols) / sizeof (ENetSymbol) - ENET_SUBCONTEXT_ORDER ) \
+    { \
+        nextSymbol = 0; \
+        ENET_CONTEXT_CREATE (root, ENET_CONTEXT_ESCAPE_MINIMUM, ENET_CONTEXT_SYMBOL_MINIMUM); \
+        predicted = 0; \
+        order = 0; \
+    } \
+}
+
+#define ENET_CONTEXT_ENCODE(context, symbol_, value_, under_, count_, update, minimum) \
+{ \
+    under_ = value*minimum; \
+    count_ = minimum; \
+    if (! (context) -> symbols) \
+    { \
+        ENET_SYMBOL_CREATE (symbol_, value_, update); \
+        (context) -> symbols = symbol_ - (context); \
+    } \
+    else \
+    { \
+        ENetSymbol * node = (context) + (context) -> symbols; \
+        for (;;) \
+        { \
+            if (value_ < node -> value) \
+            { \
+                node -> under += update; \
+                if (node -> left) { node += node -> left; continue; } \
+                ENET_SYMBOL_CREATE (symbol_, value_, update); \
+                node -> left = symbol_ - node; \
+            } \
+            else \
+            if (value_ > node -> value) \
+            { \
+                under_ += node -> under; \
+                if (node -> right) { node += node -> right; continue; } \
+                ENET_SYMBOL_CREATE (symbol_, value_, update); \
+                node -> right = symbol_ - node; \
+            } \
+            else \
+            { \
+                count_ += node -> count; \
+                under_ += node -> under - node -> count; \
+                node -> under += update; \
+                node -> count += update; \
+                symbol_ = node; \
+            } \
+            break; \
+        } \
+    } \
+}
+
+#ifdef ENET_CONTEXT_EXCLUSION
+static const ENetSymbol emptyContext = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+#define ENET_CONTEXT_WALK(context, body) \
+{ \
+    const ENetSymbol * node = (context) + (context) -> symbols; \
+    const ENetSymbol * stack [256]; \
+    size_t stackSize = 0; \
+    while (node -> left) \
+    { \
+        stack [stackSize ++] = node; \
+        node += node -> left; \
+    } \
+    for (;;) \
+    { \
+        body; \
+        if (node -> right) \
+        { \
+            node += node -> right; \
+            while (node -> left) \
+            { \
+                stack [stackSize ++] = node; \
+                node += node -> left; \
+            } \
+        } \
+        else \
+        if (stackSize <= 0) \
+            break; \
+        else \
+            node = stack [-- stackSize]; \
+    } \
+}
+
+#define ENET_CONTEXT_ENCODE_EXCLUDE(context, value_, under, total, minimum) \
+ENET_CONTEXT_WALK(context, { \
+    if (node -> value != value_) \
+    { \
+        enet_uint16 parentCount = rangeCoder -> symbols [node -> parent].count + minimum; \
+        if (node -> value < value_) \
+          under -= parentCount; \
+        total -= parentCount; \
+    } \
+})
+#endif
+
+size_t
+enet_range_coder_compress (void * context, const ENetBuffer * inBuffers, size_t inBufferCount, size_t inLimit, enet_uint8 * outData, size_t outLimit)
+{
+    ENetRangeCoder * rangeCoder = (ENetRangeCoder *) context;
+    enet_uint8 * outStart = outData, * outEnd = & outData [outLimit];
+    const enet_uint8 * inData, * inEnd;
+    enet_uint32 encodeLow = 0, encodeRange = ~0;
+    ENetSymbol * root;
+    enet_uint16 predicted = 0;
+    size_t order = 0, nextSymbol = 0;
+
+    if (rangeCoder == NULL || inBufferCount <= 0 || inLimit <= 0)
+      return 0;
+
+    inData = (const enet_uint8 *) inBuffers -> data;
+    inEnd = & inData [inBuffers -> dataLength];
+    inBuffers ++;
+    inBufferCount --;
+
+    ENET_CONTEXT_CREATE (root, ENET_CONTEXT_ESCAPE_MINIMUM, ENET_CONTEXT_SYMBOL_MINIMUM);
+
+    for (;;)
+    {
+        ENetSymbol * subcontext, * symbol;
+#ifdef ENET_CONTEXT_EXCLUSION
+        const ENetSymbol * childContext = & emptyContext;
+#endif
+        enet_uint8 value;
+        enet_uint16 count, under, * parent = & predicted, total;
+        if (inData >= inEnd)
+        {
+            if (inBufferCount <= 0)
+              break;
+            inData = (const enet_uint8 *) inBuffers -> data;
+            inEnd = & inData [inBuffers -> dataLength];
+            inBuffers ++;
+            inBufferCount --;
+        }
+        value = * inData ++;
+    
+        for (subcontext = & rangeCoder -> symbols [predicted]; 
+             subcontext != root; 
+#ifdef ENET_CONTEXT_EXCLUSION
+             childContext = subcontext, 
+#endif
+                subcontext = & rangeCoder -> symbols [subcontext -> parent])
+        {
+            ENET_CONTEXT_ENCODE (subcontext, symbol, value, under, count, ENET_SUBCONTEXT_SYMBOL_DELTA, 0);
+            * parent = symbol - rangeCoder -> symbols;
+            parent = & symbol -> parent;
+            total = subcontext -> total;
+#ifdef ENET_CONTEXT_EXCLUSION
+            if (childContext -> total > ENET_SUBCONTEXT_SYMBOL_DELTA + ENET_SUBCONTEXT_ESCAPE_DELTA)
+              ENET_CONTEXT_ENCODE_EXCLUDE (childContext, value, under, total, 0);
+#endif
+            if (count > 0)
+            {
+                ENET_RANGE_CODER_ENCODE (subcontext -> escapes + under, count, total);
+            }
+            else
+            {
+                if (subcontext -> escapes > 0 && subcontext -> escapes < total) 
+                    ENET_RANGE_CODER_ENCODE (0, subcontext -> escapes, total); 
+                subcontext -> escapes += ENET_SUBCONTEXT_ESCAPE_DELTA;
+                subcontext -> total += ENET_SUBCONTEXT_ESCAPE_DELTA;
+            }
+            subcontext -> total += ENET_SUBCONTEXT_SYMBOL_DELTA;
+            if (count > 0xFF - 2*ENET_SUBCONTEXT_SYMBOL_DELTA || subcontext -> total > ENET_RANGE_CODER_BOTTOM - 0x100)
+              ENET_CONTEXT_RESCALE (subcontext, 0);
+            if (count > 0) goto nextInput;
+        }
+
+        ENET_CONTEXT_ENCODE (root, symbol, value, under, count, ENET_CONTEXT_SYMBOL_DELTA, ENET_CONTEXT_SYMBOL_MINIMUM);
+        * parent = symbol - rangeCoder -> symbols;
+        parent = & symbol -> parent;
+        total = root -> total;
+#ifdef ENET_CONTEXT_EXCLUSION
+        if (childContext -> total > ENET_SUBCONTEXT_SYMBOL_DELTA + ENET_SUBCONTEXT_ESCAPE_DELTA)
+          ENET_CONTEXT_ENCODE_EXCLUDE (childContext, value, under, total, ENET_CONTEXT_SYMBOL_MINIMUM); 
+#endif
+        ENET_RANGE_CODER_ENCODE (root -> escapes + under, count, total);
+        root -> total += ENET_CONTEXT_SYMBOL_DELTA; 
+        if (count > 0xFF - 2*ENET_CONTEXT_SYMBOL_DELTA + ENET_CONTEXT_SYMBOL_MINIMUM || root -> total > ENET_RANGE_CODER_BOTTOM - 0x100)
+          ENET_CONTEXT_RESCALE (root, ENET_CONTEXT_SYMBOL_MINIMUM);
+
+    nextInput:
+        if (order >= ENET_SUBCONTEXT_ORDER) 
+          predicted = rangeCoder -> symbols [predicted].parent;
+        else 
+          order ++;
+        ENET_RANGE_CODER_FREE_SYMBOLS;
+    }
+
+    ENET_RANGE_CODER_FLUSH;
+
+    return (size_t) (outData - outStart);
+}
+
+#define ENET_RANGE_CODER_SEED \
+{ \
+    if (inData < inEnd) decodeCode |= * inData ++ << 24; \
+    if (inData < inEnd) decodeCode |= * inData ++ << 16; \
+    if (inData < inEnd) decodeCode |= * inData ++ << 8; \
+    if (inData < inEnd) decodeCode |= * inData ++; \
+}
+
+#define ENET_RANGE_CODER_READ(total) ((decodeCode - decodeLow) / (decodeRange /= (total)))
+
+#define ENET_RANGE_CODER_DECODE(under, count, total) \
+{ \
+    decodeLow += (under) * decodeRange; \
+    decodeRange *= (count); \
+    for (;;) \
+    { \
+        if((decodeLow ^ (decodeLow + decodeRange)) >= ENET_RANGE_CODER_TOP) \
+        { \
+            if(decodeRange >= ENET_RANGE_CODER_BOTTOM) break; \
+            decodeRange = -decodeLow & (ENET_RANGE_CODER_BOTTOM - 1); \
+        } \
+        decodeCode <<= 8; \
+        if (inData < inEnd) \
+          decodeCode |= * inData ++; \
+        decodeRange <<= 8; \
+        decodeLow <<= 8; \
+    } \
+}
+
+#define ENET_CONTEXT_DECODE(context, symbol_, code, value_, under_, count_, update, minimum, createRoot, visitNode, createRight, createLeft) \
+{ \
+    under_ = 0; \
+    count_ = minimum; \
+    if (! (context) -> symbols) \
+    { \
+        createRoot; \
+    } \
+    else \
+    { \
+        ENetSymbol * node = (context) + (context) -> symbols; \
+        for (;;) \
+        { \
+            enet_uint16 after = under_ + node -> under + (node -> value + 1)*minimum, before = node -> count + minimum; \
+            visitNode; \
+            if (code >= after) \
+            { \
+                under_ += node -> under; \
+                if (node -> right) { node += node -> right; continue; } \
+                createRight; \
+            } \
+            else \
+            if (code < after - before) \
+            { \
+                node -> under += update; \
+                if (node -> left) { node += node -> left; continue; } \
+                createLeft; \
+            } \
+            else \
+            { \
+                value_ = node -> value; \
+                count_ += node -> count; \
+                under_ = after - before; \
+                node -> under += update; \
+                node -> count += update; \
+                symbol_ = node; \
+            } \
+            break; \
+        } \
+    } \
+}
+
+#define ENET_CONTEXT_TRY_DECODE(context, symbol_, code, value_, under_, count_, update, minimum, exclude) \
+ENET_CONTEXT_DECODE (context, symbol_, code, value_, under_, count_, update, minimum, return 0, exclude (node -> value, after, before), return 0, return 0)
+
+#define ENET_CONTEXT_ROOT_DECODE(context, symbol_, code, value_, under_, count_, update, minimum, exclude) \
+ENET_CONTEXT_DECODE (context, symbol_, code, value_, under_, count_, update, minimum, \
+    { \
+        value_ = code / minimum; \
+        under_ = code - code%minimum; \
+        ENET_SYMBOL_CREATE (symbol_, value_, update); \
+        (context) -> symbols = symbol_ - (context); \
+    }, \
+    exclude (node -> value, after, before), \
+    { \
+        value_ = node->value + 1 + (code - after)/minimum; \
+        under_ = code - (code - after)%minimum; \
+        ENET_SYMBOL_CREATE (symbol_, value_, update); \
+        node -> right = symbol_ - node; \
+    }, \
+    { \
+        value_ = node->value - 1 - (after - before - code - 1)/minimum; \
+        under_ = code - (after - before - code - 1)%minimum; \
+        ENET_SYMBOL_CREATE (symbol_, value_, update); \
+        node -> left = symbol_ - node; \
+    }) \
+
+#ifdef ENET_CONTEXT_EXCLUSION
+typedef struct _ENetExclude
+{
+    enet_uint8 value;
+    enet_uint16 under;
+} ENetExclude;
+
+#define ENET_CONTEXT_DECODE_EXCLUDE(context, total, minimum) \
+{ \
+    enet_uint16 under = 0; \
+    nextExclude = excludes; \
+    ENET_CONTEXT_WALK (context, { \
+        under += rangeCoder -> symbols [node -> parent].count + minimum; \
+        nextExclude -> value = node -> value; \
+        nextExclude -> under = under; \
+        nextExclude ++; \
+    }); \
+    total -= under; \
+}
+
+#define ENET_CONTEXT_EXCLUDED(value_, after, before) \
+{ \
+    size_t low = 0, high = nextExclude - excludes; \
+    for(;;) \
+    { \
+        size_t mid = (low + high) >> 1; \
+        const ENetExclude * exclude = & excludes [mid]; \
+        if (value_ < exclude -> value) \
+        { \
+            if (low + 1 < high) \
+            { \
+                high = mid; \
+                continue; \
+            } \
+            if (exclude > excludes) \
+              after -= exclude [-1].under; \
+        } \
+        else \
+        { \
+            if (value_ > exclude -> value) \
+            { \
+                if (low + 1 < high) \
+                { \
+                    low = mid; \
+                    continue; \
+                } \
+            } \
+            else \
+              before = 0; \
+            after -= exclude -> under; \
+        } \
+        break; \
+    } \
+}
+#endif
+
+#define ENET_CONTEXT_NOT_EXCLUDED(value_, after, before)
+
+size_t
+enet_range_coder_decompress (void * context, const enet_uint8 * inData, size_t inLimit, enet_uint8 * outData, size_t outLimit)
+{
+    ENetRangeCoder * rangeCoder = (ENetRangeCoder *) context;
+    enet_uint8 * outStart = outData, * outEnd = & outData [outLimit];
+    const enet_uint8 * inEnd = & inData [inLimit];
+    enet_uint32 decodeLow = 0, decodeCode = 0, decodeRange = ~0;
+    ENetSymbol * root;
+    enet_uint16 predicted = 0;
+    size_t order = 0, nextSymbol = 0;
+#ifdef ENET_CONTEXT_EXCLUSION
+    ENetExclude excludes [256];
+    ENetExclude * nextExclude = excludes;
+#endif
+  
+    if (rangeCoder == NULL || inLimit <= 0)
+      return 0;
+
+    ENET_CONTEXT_CREATE (root, ENET_CONTEXT_ESCAPE_MINIMUM, ENET_CONTEXT_SYMBOL_MINIMUM);
+
+    ENET_RANGE_CODER_SEED;
+
+    for (;;)
+    {
+        ENetSymbol * subcontext, * symbol, * patch;
+#ifdef ENET_CONTEXT_EXCLUSION
+        const ENetSymbol * childContext = & emptyContext;
+#endif
+        enet_uint8 value = 0;
+        enet_uint16 code, under, count, bottom, * parent = & predicted, total;
+
+        for (subcontext = & rangeCoder -> symbols [predicted];
+             subcontext != root;
+#ifdef ENET_CONTEXT_EXCLUSION
+             childContext = subcontext, 
+#endif
+                subcontext = & rangeCoder -> symbols [subcontext -> parent])
+        {
+            if (subcontext -> escapes <= 0)
+              continue;
+            total = subcontext -> total;
+#ifdef ENET_CONTEXT_EXCLUSION
+            if (childContext -> total > 0) 
+              ENET_CONTEXT_DECODE_EXCLUDE (childContext, total, 0); 
+#endif
+            if (subcontext -> escapes >= total)
+              continue;
+            code = ENET_RANGE_CODER_READ (total);
+            if (code < subcontext -> escapes) 
+            {
+                ENET_RANGE_CODER_DECODE (0, subcontext -> escapes, total); 
+                continue;
+            }
+            code -= subcontext -> escapes;
+#ifdef ENET_CONTEXT_EXCLUSION
+            if (childContext -> total > 0)
+            {
+                ENET_CONTEXT_TRY_DECODE (subcontext, symbol, code, value, under, count, ENET_SUBCONTEXT_SYMBOL_DELTA, 0, ENET_CONTEXT_EXCLUDED); 
+            }
+            else
+#endif
+            {
+                ENET_CONTEXT_TRY_DECODE (subcontext, symbol, code, value, under, count, ENET_SUBCONTEXT_SYMBOL_DELTA, 0, ENET_CONTEXT_NOT_EXCLUDED); 
+            }
+            bottom = symbol - rangeCoder -> symbols;
+            ENET_RANGE_CODER_DECODE (subcontext -> escapes + under, count, total);
+            subcontext -> total += ENET_SUBCONTEXT_SYMBOL_DELTA;
+            if (count > 0xFF - 2*ENET_SUBCONTEXT_SYMBOL_DELTA || subcontext -> total > ENET_RANGE_CODER_BOTTOM - 0x100)
+              ENET_CONTEXT_RESCALE (subcontext, 0);
+            goto patchContexts;
+        }
+
+        total = root -> total;
+#ifdef ENET_CONTEXT_EXCLUSION
+        if (childContext -> total > 0)
+          ENET_CONTEXT_DECODE_EXCLUDE (childContext, total, ENET_CONTEXT_SYMBOL_MINIMUM);  
+#endif
+        code = ENET_RANGE_CODER_READ (total);
+        if (code < root -> escapes)
+        {
+            ENET_RANGE_CODER_DECODE (0, root -> escapes, total);
+            break;
+        }
+        code -= root -> escapes;
+#ifdef ENET_CONTEXT_EXCLUSION
+        if (childContext -> total > 0)
+        {
+            ENET_CONTEXT_ROOT_DECODE (root, symbol, code, value, under, count, ENET_CONTEXT_SYMBOL_DELTA, ENET_CONTEXT_SYMBOL_MINIMUM, ENET_CONTEXT_EXCLUDED); 
+        }
+        else
+#endif
+        {
+            ENET_CONTEXT_ROOT_DECODE (root, symbol, code, value, under, count, ENET_CONTEXT_SYMBOL_DELTA, ENET_CONTEXT_SYMBOL_MINIMUM, ENET_CONTEXT_NOT_EXCLUDED); 
+        }
+        bottom = symbol - rangeCoder -> symbols;
+        ENET_RANGE_CODER_DECODE (root -> escapes + under, count, total);
+        root -> total += ENET_CONTEXT_SYMBOL_DELTA;
+        if (count > 0xFF - 2*ENET_CONTEXT_SYMBOL_DELTA + ENET_CONTEXT_SYMBOL_MINIMUM || root -> total > ENET_RANGE_CODER_BOTTOM - 0x100)
+          ENET_CONTEXT_RESCALE (root, ENET_CONTEXT_SYMBOL_MINIMUM);
+
+    patchContexts:
+        for (patch = & rangeCoder -> symbols [predicted];
+             patch != subcontext;
+             patch = & rangeCoder -> symbols [patch -> parent])
+        {
+            ENET_CONTEXT_ENCODE (patch, symbol, value, under, count, ENET_SUBCONTEXT_SYMBOL_DELTA, 0);
+            * parent = symbol - rangeCoder -> symbols;
+            parent = & symbol -> parent;
+            if (count <= 0)
+            {
+                patch -> escapes += ENET_SUBCONTEXT_ESCAPE_DELTA;
+                patch -> total += ENET_SUBCONTEXT_ESCAPE_DELTA;
+            }
+            patch -> total += ENET_SUBCONTEXT_SYMBOL_DELTA; 
+            if (count > 0xFF - 2*ENET_SUBCONTEXT_SYMBOL_DELTA || patch -> total > ENET_RANGE_CODER_BOTTOM - 0x100)
+              ENET_CONTEXT_RESCALE (patch, 0);
+        }
+        * parent = bottom;
+
+        ENET_RANGE_CODER_OUTPUT (value);
+
+        if (order >= ENET_SUBCONTEXT_ORDER)
+          predicted = rangeCoder -> symbols [predicted].parent;
+        else
+          order ++;
+        ENET_RANGE_CODER_FREE_SYMBOLS;
+    }
+                        
+    return (size_t) (outData - outStart);
+}
+
+/** @defgroup host ENet host functions
+    @{
+*/
+
+/** Sets the packet compressor the host should use to the default range coder.
+    @param host host to enable the range coder for
+    @returns 0 on success, < 0 on failure
+*/
+int
+enet_host_compress_with_range_coder (ENetHost * host)
+{
+    ENetCompressor compressor;
+    memset (& compressor, 0, sizeof (compressor));
+    compressor.context = enet_range_coder_create();
+    if (compressor.context == NULL)
+      return -1;
+    compressor.compress = enet_range_coder_compress;
+    compressor.decompress = enet_range_coder_decompress;
+    compressor.destroy = enet_range_coder_destroy;
+    enet_host_compress (host, & compressor);
+    return 0;
+}
+    
+/** @} */
+    
+     
diff --git a/Externals/enet/configure.ac b/Externals/enet/configure.ac
new file mode 100644
index 0000000000..a4206dbcc3
--- /dev/null
+++ b/Externals/enet/configure.ac
@@ -0,0 +1,28 @@
+AC_INIT([libenet], [1.3.13])
+AC_CONFIG_SRCDIR([include/enet/enet.h])
+AM_INIT_AUTOMAKE([foreign])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAS_GETADDRINFO)])
+AC_CHECK_FUNC(getnameinfo, [AC_DEFINE(HAS_GETNAMEINFO)])
+AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
+AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
+AC_CHECK_FUNC(poll, [AC_DEFINE(HAS_POLL)])
+AC_CHECK_FUNC(fcntl, [AC_DEFINE(HAS_FCNTL)])
+AC_CHECK_FUNC(inet_pton, [AC_DEFINE(HAS_INET_PTON)])
+AC_CHECK_FUNC(inet_ntop, [AC_DEFINE(HAS_INET_NTOP)])
+
+AC_CHECK_MEMBER(struct msghdr.msg_flags, [AC_DEFINE(HAS_MSGHDR_FLAGS)], , [#include <sys/socket.h>])
+
+AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAS_SOCKLEN_T)], , 
+              #include <sys/types.h>
+              #include <sys/socket.h>
+)
+
+AC_CONFIG_FILES([Makefile
+	libenet.pc])
+AC_OUTPUT
diff --git a/Externals/enet/docs/FAQ.dox b/Externals/enet/docs/FAQ.dox
new file mode 100644
index 0000000000..c3f45fb2c4
--- /dev/null
+++ b/Externals/enet/docs/FAQ.dox
@@ -0,0 +1,24 @@
+/**
+ @page FAQ Frequently Answered Questions
+
+@section Q1 Is ENet thread-safe?
+
+ENet does not use any significant global variables, the vast majority
+of state is encapsulated in the ENetHost structure.  As such, as long
+as the application guards access to this structure, then ENet should
+operate fine in a multi-threaded environment.
+   
+@section Q2 Isn't ENet just re-inventing TCP?!  What's the point?
+
+In a perfect world, that would be true.  But as many have found, using
+TCP either in lieu of or in conjunction with UDP can lead to all kinds
+of nightmares.  TCP is a good, solid protocol, however it simply isn't
+up to the task of real-time games.  Too much of TCP's implementation
+dictates a policy that isn't practical for games.  If you want to use
+TCP, then do so -- this library is for people that either don't want
+to use TCP or have tried and ended up being discouraged with the
+performance.
+
+*/
+
+
diff --git a/Externals/enet/docs/design.dox b/Externals/enet/docs/design.dox
new file mode 100644
index 0000000000..f74a2bd70d
--- /dev/null
+++ b/Externals/enet/docs/design.dox
@@ -0,0 +1,126 @@
+/**
+@page Features Features and Architecture
+
+ENet evolved specifically as a UDP networking layer for the
+multiplayer first person shooter Cube. Cube necessitated low latency
+communication with data sent out very frequently, so TCP was an
+unsuitable choice due to its high latency and stream orientation. UDP,
+however, lacks many sometimes necessary features from TCP such as
+reliability, sequencing, unrestricted packet sizes, and connection
+management. So UDP by itself was not suitable as a network protocol
+either. No suitable freely available networking libraries existed at
+the time of ENet's creation to fill this niche.
+
+UDP and TCP could have been used together in Cube to benefit somewhat
+from both of their features, however, the resulting combinations of
+protocols still leaves much to be desired. TCP lacks multiple streams
+of communication without resorting to opening many sockets and
+complicates delineation of packets due to its buffering behavior. UDP
+lacks sequencing, connection management, management of bandwidth
+resources, and imposes limitations on the size of packets. A
+significant investment is required to integrate these two protocols,
+and the end result is worse off in features and performance than the
+uniform protocol presented by ENet.
+
+ENet thus attempts to address these issues and provide a single,
+uniform protocol layered over UDP to the developer with the best
+features of UDP and TCP as well as some useful features neither
+provide, with a much cleaner integration than any resulting from a
+mixture of UDP and TCP.
+
+@section CM Connection Management
+
+ENet provides a simple connection interface over which to communicate
+with a foreign host. The liveness of the connection is actively
+monitored by pinging the foreign host at frequent intervals, and also
+monitors the network conditions from the local host to the foreign
+host such as the mean round trip time and packet loss in this fashion.
+
+@section Sequencing Sequencing
+    
+Rather than a single byte stream that complicates the delineation of
+packets, ENet presents connections as multiple, properly sequenced
+packet streams that simplify the transfer of various types of data.
+
+ENet provides sequencing for all packets by assigning to each sent
+packet a sequence number that is incremented as packets are sent. ENet
+guarantees that no packet with a higher sequence number will be
+delivered before a packet with a lower sequence number, thus ensuring
+packets are delivered exactly in the order they are sent.
+
+For unreliable packets, ENet will simply discard the lower sequence
+number packet if a packet with a higher sequence number has already
+been delivered. This allows the packets to be dispatched immediately
+as they arrive, and reduce latency of unreliable packets to an
+absolute minimum.  For reliable packets, if a higher sequence number
+packet arrives, but the preceding packets in the sequence have not yet
+arrived, ENet will stall delivery of the higher sequence number
+packets until its predecessors have arrived.
+
+@section Channels Channels
+
+Since ENet will stall delivery of reliable packets to ensure proper
+sequencing, and consequently any packets of higher sequence number
+whether reliable or unreliable, in the event the reliable packet's
+predecessors have not yet arrived, this can introduce latency into the
+delivery of other packets which may not need to be as strictly ordered
+with respect to the packet that stalled their delivery.
+
+To combat this latency and reduce the ordering restrictions on
+packets, ENet provides multiple channels of communication over a given
+connection.  Each channel is independently sequenced, and so the
+delivery status of a packet in one channel will not stall the delivery
+of other packets in another channel.
+
+@section Reliability Reliability
+
+ENet provides optional reliability of packet delivery by ensuring the
+foreign host acknowledges receipt of all reliable packets. ENet will
+attempt to resend the packet up to a reasonable amount of times, if no
+acknowledgement of the packet's receipt happens within a specified
+timeout. Retry timeouts are progressive and become more lenient with
+every failed attempt to allow for temporary turbulence in network
+conditions.
+
+@section FaR Fragmentation and Reassembly
+
+ENet will send and deliver packets regardless of size. Large packets
+are fragmented into many smaller packets of suitable size, and
+reassembled on the foreign host to recover the original packet for
+delivery. The process is entirely transparent to the developer.
+
+@section Aggregation Aggregation
+
+ENet aggregates all protocol commands, including acknowledgements and
+packet transfer, into larger protocol packets to ensure the proper
+utilization of the connection and to limit the opportunities for
+packet loss that might otherwise result in further delivery latency.
+
+@section Adaptability Adaptability
+
+ENet provides an in-flight data window for reliable packets to ensure
+connections are not overwhelmed by volumes of packets. It also
+provides a static bandwidth allocation mechanism to ensure the total
+volume of packets sent and received to a host don't exceed the host's
+capabilities. Further, ENet also provides a dynamic throttle that
+responds to deviations from normal network connections to rectify
+various types of network congestion by further limiting the volume of
+packets sent.
+
+@section Portability Portability
+    
+ENet works on Windows and any other Unix or Unix-like platform
+providing a BSD sockets interface. The library has a small and stable
+code base that can easily be extended to support other platforms and
+integrates easily.  ENet makes no assumptions about the underlying
+platform's endianess or word size.
+
+@section Freedom Freedom
+
+ENet demands no royalties and doesn't carry a viral license that would
+restrict you in how you might use it in your programs. ENet is
+licensed under a short-and-sweet MIT-style license, which gives you
+the freedom to do anything you want with it (well, almost anything).
+
+*/
+
diff --git a/Externals/enet/docs/install.dox b/Externals/enet/docs/install.dox
new file mode 100644
index 0000000000..b9730d7413
--- /dev/null
+++ b/Externals/enet/docs/install.dox
@@ -0,0 +1,63 @@
+/**
+@page Installation Installation
+
+ENet should be trivially simple to integrate with most applications.
+First, make sure you download the latest source distribution at @ref Downloads.
+
+@section Unix Unix-like Operating Systems
+
+If you are using an ENet release, then you should simply be able to build it
+by doing the following:
+
+./configure && make && make install
+
+If you obtained the package from github, you must have automake and autoconf
+available to generate the build system first by doing the following command
+before using the above mentioned build procedure:
+
+autoreconf -vfi
+
+
+@subsection SolarisBSD Solaris and BSD
+
+When building ENet under Solaris, you must specify the -lsocket and
+-lnsl parameters to your compiler to ensure that the sockets library
+is linked in.
+
+@section Windows Microsoft Windows
+
+You may simply use the included "enet.lib" or "enet64.lib" static libraries. 
+However, if you wish to build the library yourself, then the following
+instructions apply:
+
+There is an included MSVC 6 project (enet.dsp) which you may use to
+build a suitable library file. Alternatively, you may simply drag all 
+the ENet source files into your main project.
+
+You will have to link to the Winsock2 libraries, so make sure to add
+ws2_32.lib and winmm.lib to your library list (Project Settings | Link |
+Object/library modules).
+
+@subsection enet.dsp Building with the included enet.dsp
+
+Load the included enet.dsp. MSVC may ask you to convert it if you
+are on a newer version of MSVC - just allow the conversion and save
+the resulting project as "enet" or similar. After you build this
+project, it will output an "enet.lib" file to either the "Debug/"
+or "Release/" directory, depending on which configuration you have
+selected to build. By default, it should produce "Debug/enet.lib".
+
+You may then copy the resulting "enet.lib" file and the header files
+found in the "include/" directory to your other projects and add it to 
+their library lists. Make sure to also link against "ws2_32.lib" and
+"winmm.lib" as described above.
+
+@subsection DLL DLL
+
+If you wish to build ENet as a DLL you must first define ENET_DLL
+within the project (Project Settings | C/C++ | Preprocessor |
+Preprocessor definitions) or, more invasively, simply define ENET_DLL
+at the top of enet.h.
+
+*/
+
diff --git a/Externals/enet/docs/license.dox b/Externals/enet/docs/license.dox
new file mode 100644
index 0000000000..924393bb91
--- /dev/null
+++ b/Externals/enet/docs/license.dox
@@ -0,0 +1,26 @@
+/**
+ @page License License
+ 
+Copyright (c) 2002-2015 Lee Salzman
+
+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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
diff --git a/Externals/enet/docs/mainpage.dox b/Externals/enet/docs/mainpage.dox
new file mode 100644
index 0000000000..7fbbee1d54
--- /dev/null
+++ b/Externals/enet/docs/mainpage.dox
@@ -0,0 +1,59 @@
+/** @mainpage ENet
+
+ENet's purpose is to provide a relatively thin, simple and robust
+network communication layer on top of UDP (User Datagram Protocol).
+The primary feature it provides is optional reliable, in-order
+delivery of packets.
+
+ENet omits certain higher level networking features such as authentication, 
+lobbying, server discovery, encryption, or other similar tasks that are
+particularly application specific so that the library remains flexible,
+portable, and easily embeddable.
+
+@ref Features
+
+@ref Downloads
+
+@ref Installation
+
+@ref Tutorial
+
+@ref MailingList
+
+@ref IRCChannel
+
+@ref FAQ
+
+@ref License
+
+<a class="el" href="usergroup0.html">Documentation</a>
+
+ */
+
+/**
+@page Downloads Downloads
+
+You can retrieve the source to ENet by downloading it in either .tar.gz form
+or accessing the github distribution directly.
+
+The most recent stable release (1.3.13) can be downloaded <a class="el" href="download/enet-1.3.13.tar.gz">here</a>. 
+The last release that is protocol compatible with the 1.2 series or earlier (1.2.5) can be downloaded <a class="el" href="download/enet-1.2.5.tar.gz">here</a>. 
+
+You can find the most recent ENet source at <a class="el" href="https://github.com/lsalzman/enet">the github repository</a>.
+
+*/
+
+/**
+@page MailingList Mailing List
+
+The <a class="el" href="http://lists.cubik.org/mailman/listinfo/enet-discuss">enet-discuss</a> list is for discussion of ENet, including bug reports or feature requests.
+
+*/
+
+/**
+@page IRCChannel IRC Channel
+
+Join the \#enet channel on the <a class="el" href="http://freenode.net">freenode IRC network (irc.freenode.net)</a> for real-time discussion about the ENet library.
+
+*/
+
diff --git a/Externals/enet/docs/tutorial.dox b/Externals/enet/docs/tutorial.dox
new file mode 100644
index 0000000000..e91eae825a
--- /dev/null
+++ b/Externals/enet/docs/tutorial.dox
@@ -0,0 +1,366 @@
+/**
+@page Tutorial Tutorial
+
+@ref Initialization
+
+@ref CreateServer
+
+@ref CreateClient
+
+@ref ManageHost
+
+@ref SendingPacket
+
+@ref Disconnecting
+
+@ref Connecting
+
+@section Initialization Initialization
+
+You should include the file <enet/enet.h> when using ENet. Do not
+include <enet.h> without the directory prefix, as this may cause
+file name conflicts on some systems.
+
+Before using ENet, you must call enet_initialize() to initialize the
+library. Upon program exit, you should call enet_deinitialize() so
+that the library may clean up any used resources.
+
+@code
+#include <enet/enet.h>
+
+int 
+main (int argc, char ** argv) 
+{
+    if (enet_initialize () != 0)
+    {
+        fprintf (stderr, "An error occurred while initializing ENet.\n");
+        return EXIT_FAILURE;
+    }
+    atexit (enet_deinitialize);
+    ...
+    ...
+    ...
+}
+@endcode
+        
+@section CreateServer Creating an ENet server
+
+Servers in ENet are constructed with enet_host_create(). You must
+specify an address on which to receive data and new connections, as
+well as the maximum allowable numbers of connected peers. You may
+optionally specify the incoming and outgoing bandwidth of the server
+in bytes per second so that ENet may try to statically manage
+bandwidth resources among connected peers in addition to its dynamic
+throttling algorithm; specifying 0 for these two options will cause
+ENet to rely entirely upon its dynamic throttling algorithm to manage
+bandwidth.
+
+When done with a host, the host may be destroyed with
+enet_host_destroy().  All connected peers to the host will be reset,
+and the resources used by the host will be freed.
+
+@code
+    ENetAddress address;
+    ENetHost * server;
+
+    /* Bind the server to the default localhost.     */
+    /* A specific host address can be specified by   */
+    /* enet_address_set_host (& address, "x.x.x.x"); */
+
+    address.host = ENET_HOST_ANY;
+    /* Bind the server to port 1234. */
+    address.port = 1234;
+
+    server = enet_host_create (& address /* the address to bind the server host to */, 
+                                 32      /* allow up to 32 clients and/or outgoing connections */,
+                                  2      /* allow up to 2 channels to be used, 0 and 1 */,
+                                  0      /* assume any amount of incoming bandwidth */,
+                                  0      /* assume any amount of outgoing bandwidth */);
+    if (server == NULL)
+    {
+        fprintf (stderr, 
+                 "An error occurred while trying to create an ENet server host.\n");
+        exit (EXIT_FAILURE);
+    }
+    ...
+    ...
+    ...
+    enet_host_destroy(server);
+@endcode
+
+@section CreateClient Creating an ENet client
+
+Clients in ENet are similarly constructed with enet_host_create() when
+no address is specified to bind the host to. Bandwidth may be
+specified for the client host as in the above example. The peer count
+controls the maximum number of connections to other server hosts that
+may be simultaneously open.
+
+@code
+    ENetHost * client;
+
+    client = enet_host_create (NULL /* create a client host */,
+                1 /* only allow 1 outgoing connection */,
+                2 /* allow up 2 channels to be used, 0 and 1 */,
+                57600 / 8 /* 56K modem with 56 Kbps downstream bandwidth */,
+                14400 / 8 /* 56K modem with 14 Kbps upstream bandwidth */);
+
+    if (client == NULL)
+    {
+        fprintf (stderr, 
+                 "An error occurred while trying to create an ENet client host.\n");
+        exit (EXIT_FAILURE);
+    }
+    ...
+    ...
+    ...
+    enet_host_destroy(client);
+@endcode
+
+@section ManageHost Managing an ENet host
+
+ENet uses a polled event model to notify the programmer of significant
+events. ENet hosts are polled for events with enet_host_service(),
+where an optional timeout value in milliseconds may be specified to
+control how long ENet will poll; if a timeout of 0 is specified,
+enet_host_service() will return immediately if there are no events to
+dispatch. enet_host_service() will return 1 if an event was dispatched
+within the specified timeout.
+
+Beware that most processing of the network with the ENet stack is done 
+inside enet_host_service(). Both hosts that make up the sides of a connection 
+must regularly call this function to ensure packets are actually sent and
+received. A common symptom of not actively calling enet_host_service()
+on both ends is that one side receives events while the other does not.
+The best way to schedule this activity to ensure adequate service is, for
+example, to call enet_host_service() with a 0 timeout (meaning non-blocking)
+at the beginning of every frame in a game loop.
+
+Currently there are only four types of significant events in ENet:
+
+An event of type ENET_EVENT_TYPE_NONE is returned if no event occurred
+within the specified time limit. enet_host_service() will return 0
+with this event.
+
+An event of type ENET_EVENT_TYPE_CONNECT is returned when either a new client
+host has connected to the server host or when an attempt to establish a 
+connection with a foreign host has succeeded. Only the "peer" field of the 
+event structure is valid for this event and contains the newly connected peer.
+
+An event of type ENET_EVENT_TYPE_RECEIVE is returned when a packet is received
+from a connected peer. The "peer" field contains the peer the packet was 
+received from, "channelID" is the channel on which the packet was sent, and 
+"packet" is the packet that was sent. The packet contained in the "packet" 
+field must be destroyed with enet_packet_destroy() when you are done 
+inspecting its contents.
+
+An event of type ENET_EVENT_TYPE_DISCONNECT is returned when a connected peer
+has either explicitly disconnected or timed out. Only the "peer" field of the
+event structure is valid for this event and contains the peer that 
+disconnected. Only the "data" field of the peer is still valid on a 
+disconnect event and must be explicitly reset.
+
+@code
+    ENetEvent event;
+    
+    /* Wait up to 1000 milliseconds for an event. */
+    while (enet_host_service (client, & event, 1000) > 0)
+    {
+        switch (event.type)
+        {
+        case ENET_EVENT_TYPE_CONNECT:
+            printf ("A new client connected from %x:%u.\n", 
+                    event.peer -> address.host,
+                    event.peer -> address.port);
+
+            /* Store any relevant client information here. */
+            event.peer -> data = "Client information";
+
+            break;
+
+        case ENET_EVENT_TYPE_RECEIVE:
+            printf ("A packet of length %u containing %s was received from %s on channel %u.\n",
+                    event.packet -> dataLength,
+                    event.packet -> data,
+                    event.peer -> data,
+                    event.channelID);
+
+            /* Clean up the packet now that we're done using it. */
+            enet_packet_destroy (event.packet);
+            
+            break;
+           
+        case ENET_EVENT_TYPE_DISCONNECT:
+            printf ("%s disconnected.\n", event.peer -> data);
+
+            /* Reset the peer's client information. */
+
+            event.peer -> data = NULL;
+        }
+    }
+    ...
+    ...
+    ...
+@endcode
+
+@section SendingPacket Sending a packet to an ENet peer            
+
+Packets in ENet are created with enet_packet_create(), where the size
+of the packet must be specified. Optionally, initial data may be
+specified to copy into the packet.
+
+Certain flags may also be supplied to enet_packet_create() to control
+various packet features:
+
+ENET_PACKET_FLAG_RELIABLE specifies that the packet must use reliable
+delivery.  A reliable packet is guaranteed to be delivered, and a
+number of retry attempts will be made until an acknowledgement is
+received from the foreign host the packet is sent to. If a certain
+number of retry attempts is reached without any acknowledgement, ENet
+will assume the peer has disconnected and forcefully reset the
+connection. If this flag is not specified, the packet is assumed an
+unreliable packet, and no retry attempts will be made nor
+acknowledgements generated.
+
+A packet may be resized (extended or truncated) with
+enet_packet_resize().
+
+A packet is sent to a foreign host with
+enet_peer_send(). enet_peer_send() accepts a channel id over which to
+send the packet to a given peer. Once the packet is handed over to
+ENet with enet_peer_send(), ENet will handle its deallocation and
+enet_packet_destroy() should not be used upon it.
+
+One may also use enet_host_broadcast() to send a packet to all
+connected peers on a given host over a specified channel id, as with
+enet_peer_send().
+
+Queued packets will be sent on a call to enet_host_service().
+Alternatively, enet_host_flush() will send out queued packets without
+dispatching any events.
+
+@code
+    /* Create a reliable packet of size 7 containing "packet\0" */
+    ENetPacket * packet = enet_packet_create ("packet", 
+                                              strlen ("packet") + 1, 
+                                              ENET_PACKET_FLAG_RELIABLE);
+
+    /* Extend the packet so and append the string "foo", so it now */
+    /* contains "packetfoo\0"                                      */
+    enet_packet_resize (packet, strlen ("packetfoo") + 1);
+    strcpy (& packet -> data [strlen ("packet")], "foo");
+    
+    /* Send the packet to the peer over channel id 0. */
+    /* One could also broadcast the packet by         */
+    /* enet_host_broadcast (host, 0, packet);         */
+    enet_peer_send (peer, 0, packet);
+    ...
+    ...
+    ...
+    /* One could just use enet_host_service() instead. */
+    enet_host_flush (host);
+@endcode
+
+@section Disconnecting Disconnecting an ENet peer
+
+Peers may be gently disconnected with enet_peer_disconnect(). A
+disconnect request will be sent to the foreign host, and ENet will
+wait for an acknowledgement from the foreign host before finally
+disconnecting. An event of type ENET_EVENT_TYPE_DISCONNECT will be
+generated once the disconnection succeeds. Normally timeouts apply to
+the disconnect acknowledgement, and so if no acknowledgement is
+received after a length of time the peer will be forcefully
+disconnected.
+
+enet_peer_reset() will forcefully disconnect a peer. The foreign host
+will get no notification of a disconnect and will time out on the
+foreign host. No event is generated.
+
+@code
+    ENetEvent event;
+    
+    enet_peer_disconnect (peer, 0);
+
+    /* Allow up to 3 seconds for the disconnect to succeed
+     * and drop any packets received packets.
+     */
+    while (enet_host_service (client, & event, 3000) > 0)
+    {
+        switch (event.type)
+        {
+        case ENET_EVENT_TYPE_RECEIVE:
+            enet_packet_destroy (event.packet);
+            break;
+
+        case ENET_EVENT_TYPE_DISCONNECT:
+            puts ("Disconnection succeeded.");
+            return;
+        ...
+        ...
+        ...
+        }
+    }
+    
+    /* We've arrived here, so the disconnect attempt didn't */
+    /* succeed yet.  Force the connection down.             */
+    enet_peer_reset (peer);
+    ...
+    ...
+    ...
+@endcode
+
+@section Connecting Connecting to an ENet host
+
+A connection to a foreign host is initiated with enet_host_connect().
+It accepts the address of a foreign host to connect to, and the number
+of channels that should be allocated for communication. If N channels
+are allocated for use, their channel ids will be numbered 0 through
+N-1.  A peer representing the connection attempt is returned, or NULL
+if there were no available peers over which to initiate the
+connection. When the connection attempt succeeds, an event of type
+ENET_EVENT_TYPE_CONNECT will be generated. If the connection attempt
+times out or otherwise fails, an event of type
+ENET_EVENT_TYPE_DISCONNECT will be generated.
+
+@code
+    ENetAddress address;
+    ENetEvent event;
+    ENetPeer *peer;
+
+    /* Connect to some.server.net:1234. */
+    enet_address_set_host (& address, "some.server.net");
+    address.port = 1234;
+
+    /* Initiate the connection, allocating the two channels 0 and 1. */
+    peer = enet_host_connect (client, & address, 2, 0);    
+    
+    if (peer == NULL)
+    {
+       fprintf (stderr, 
+                "No available peers for initiating an ENet connection.\n");
+       exit (EXIT_FAILURE);
+    }
+    
+    /* Wait up to 5 seconds for the connection attempt to succeed. */
+    if (enet_host_service (client, & event, 5000) > 0 &&
+        event.type == ENET_EVENT_TYPE_CONNECT)
+    {
+        puts ("Connection to some.server.net:1234 succeeded.");
+        ...
+        ...
+        ...
+    }
+    else
+    {
+        /* Either the 5 seconds are up or a disconnect event was */
+        /* received. Reset the peer in the event the 5 seconds   */
+        /* had run out without any significant event.            */
+        enet_peer_reset (peer);
+
+        puts ("Connection to some.server.net:1234 failed.");
+    }
+    ...
+    ...
+    ...
+@endcode
+*/
diff --git a/Externals/enet/enet.dsp b/Externals/enet/enet.dsp
new file mode 100644
index 0000000000..285c020cb2
--- /dev/null
+++ b/Externals/enet/enet.dsp
@@ -0,0 +1,168 @@
+# Microsoft Developer Studio Project File - Name="enet" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=enet - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "enet.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "enet.mak" CFG="enet - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "enet - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "enet - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "enet - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /O2 /I "include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "enet - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /ZI /Od /I "include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "enet - Win32 Release"
+# Name "enet - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\host.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\callbacks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\packet.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\peer.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\protocol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\unix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\include\enet\enet.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\callbacks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\time.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\types.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\unix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\utility.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\enet\win32.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj
new file mode 100644
index 0000000000..74a77d3a91
--- /dev/null
+++ b/Externals/enet/enet.vcxproj
@@ -0,0 +1,69 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\enet\callbacks.h" />
+    <ClInclude Include="include\enet\enet.h" />
+    <ClInclude Include="include\enet\list.h" />
+    <ClInclude Include="include\enet\protocol.h" />
+    <ClInclude Include="include\enet\time.h" />
+    <ClInclude Include="include\enet\types.h" />
+    <ClInclude Include="include\enet\unix.h" />
+    <ClInclude Include="include\enet\utility.h" />
+    <ClInclude Include="include\enet\win32.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="callbacks.c" />
+    <ClCompile Include="compress.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="list.c" />
+    <ClCompile Include="packet.c" />
+    <ClCompile Include="peer.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="unix.c" />
+    <ClCompile Include="win32.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
+    <None Include="README" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CBC76802-C128-4B17-BF6C-23B08C313E5E}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Externals/enet/enet.vcxproj.filters b/Externals/enet/enet.vcxproj.filters
new file mode 100644
index 0000000000..5ad022de37
--- /dev/null
+++ b/Externals/enet/enet.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{a5756b80-36f2-45f6-b1f1-b67082477376}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\enet\callbacks.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\enet.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\list.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\protocol.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\time.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\types.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\unix.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\utility.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\enet\win32.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="callbacks.c" />
+    <ClCompile Include="compress.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="list.c" />
+    <ClCompile Include="packet.c" />
+    <ClCompile Include="peer.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="unix.c" />
+    <ClCompile Include="win32.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
+    <None Include="README" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/enet/enet_dll.cbp b/Externals/enet/enet_dll.cbp
new file mode 100644
index 0000000000..961274c760
--- /dev/null
+++ b/Externals/enet/enet_dll.cbp
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="enet_dll" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin\Debug\libenet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug\" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin\Release\libenet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release\" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-DENET_DLL" />
+			<Add directory="include" />
+		</Compiler>
+		<Linker>
+			<Add library="ws2_32" />
+			<Add library="Winmm" />
+		</Linker>
+		<Unit filename="callbacks.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="compress.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="host.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="include\enet\callbacks.h" />
+		<Unit filename="include\enet\enet.h" />
+		<Unit filename="include\enet\list.h" />
+		<Unit filename="include\enet\protocol.h" />
+		<Unit filename="include\enet\time.h" />
+		<Unit filename="include\enet\types.h" />
+		<Unit filename="include\enet\unix.h" />
+		<Unit filename="include\enet\utility.h" />
+		<Unit filename="include\enet\win32.h" />
+		<Unit filename="list.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="packet.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="peer.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="protocol.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="unix.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="win32.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/Externals/enet/host.c b/Externals/enet/host.c
new file mode 100644
index 0000000000..3be6c0922c
--- /dev/null
+++ b/Externals/enet/host.c
@@ -0,0 +1,492 @@
+/** 
+ @file host.c
+ @brief ENet host management functions
+*/
+#define ENET_BUILDING_LIB 1
+#include <string.h>
+#include "enet/enet.h"
+
+/** @defgroup host ENet host functions
+    @{
+*/
+
+/** Creates a host for communicating to peers.  
+
+    @param address   the address at which other peers may connect to this host.  If NULL, then no peers may connect to the host.
+    @param peerCount the maximum number of peers that should be allocated for the host.
+    @param channelLimit the maximum number of channels allowed; if 0, then this is equivalent to ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT
+    @param incomingBandwidth downstream bandwidth of the host in bytes/second; if 0, ENet will assume unlimited bandwidth.
+    @param outgoingBandwidth upstream bandwidth of the host in bytes/second; if 0, ENet will assume unlimited bandwidth.
+
+    @returns the host on success and NULL on failure
+
+    @remarks ENet will strategically drop packets on specific sides of a connection between hosts
+    to ensure the host's bandwidth is not overwhelmed.  The bandwidth parameters also determine
+    the window size of a connection which limits the amount of reliable packets that may be in transit
+    at any given time.
+*/
+ENetHost *
+enet_host_create (const ENetAddress * address, size_t peerCount, size_t channelLimit, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth)
+{
+    ENetHost * host;
+    ENetPeer * currentPeer;
+
+    if (peerCount > ENET_PROTOCOL_MAXIMUM_PEER_ID)
+      return NULL;
+
+    host = (ENetHost *) enet_malloc (sizeof (ENetHost));
+    if (host == NULL)
+      return NULL;
+    memset (host, 0, sizeof (ENetHost));
+
+    host -> peers = (ENetPeer *) enet_malloc (peerCount * sizeof (ENetPeer));
+    if (host -> peers == NULL)
+    {
+       enet_free (host);
+
+       return NULL;
+    }
+    memset (host -> peers, 0, peerCount * sizeof (ENetPeer));
+
+    host -> socket = enet_socket_create (ENET_SOCKET_TYPE_DATAGRAM);
+    if (host -> socket == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind (host -> socket, address) < 0))
+    {
+       if (host -> socket != ENET_SOCKET_NULL)
+         enet_socket_destroy (host -> socket);
+
+       enet_free (host -> peers);
+       enet_free (host);
+
+       return NULL;
+    }
+
+    enet_socket_set_option (host -> socket, ENET_SOCKOPT_NONBLOCK, 1);
+    enet_socket_set_option (host -> socket, ENET_SOCKOPT_BROADCAST, 1);
+    enet_socket_set_option (host -> socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
+    enet_socket_set_option (host -> socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
+
+    if (address != NULL && enet_socket_get_address (host -> socket, & host -> address) < 0)   
+      host -> address = * address;
+
+    if (! channelLimit || channelLimit > ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT)
+      channelLimit = ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT;
+    else
+    if (channelLimit < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT)
+      channelLimit = ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT;
+
+    host -> randomSeed = (enet_uint32) (size_t) host;
+    host -> randomSeed += enet_host_random_seed ();
+    host -> randomSeed = (host -> randomSeed << 16) | (host -> randomSeed >> 16);
+    host -> channelLimit = channelLimit;
+    host -> incomingBandwidth = incomingBandwidth;
+    host -> outgoingBandwidth = outgoingBandwidth;
+    host -> bandwidthThrottleEpoch = 0;
+    host -> recalculateBandwidthLimits = 0;
+    host -> mtu = ENET_HOST_DEFAULT_MTU;
+    host -> peerCount = peerCount;
+    host -> commandCount = 0;
+    host -> bufferCount = 0;
+    host -> checksum = NULL;
+    host -> receivedAddress.host = ENET_HOST_ANY;
+    host -> receivedAddress.port = 0;
+    host -> receivedData = NULL;
+    host -> receivedDataLength = 0;
+     
+    host -> totalSentData = 0;
+    host -> totalSentPackets = 0;
+    host -> totalReceivedData = 0;
+    host -> totalReceivedPackets = 0;
+
+    host -> connectedPeers = 0;
+    host -> bandwidthLimitedPeers = 0;
+    host -> duplicatePeers = ENET_PROTOCOL_MAXIMUM_PEER_ID;
+    host -> maximumPacketSize = ENET_HOST_DEFAULT_MAXIMUM_PACKET_SIZE;
+    host -> maximumWaitingData = ENET_HOST_DEFAULT_MAXIMUM_WAITING_DATA;
+
+    host -> compressor.context = NULL;
+    host -> compressor.compress = NULL;
+    host -> compressor.decompress = NULL;
+    host -> compressor.destroy = NULL;
+
+    host -> intercept = NULL;
+
+    enet_list_clear (& host -> dispatchQueue);
+
+    for (currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+       currentPeer -> host = host;
+       currentPeer -> incomingPeerID = currentPeer - host -> peers;
+       currentPeer -> outgoingSessionID = currentPeer -> incomingSessionID = 0xFF;
+       currentPeer -> data = NULL;
+
+       enet_list_clear (& currentPeer -> acknowledgements);
+       enet_list_clear (& currentPeer -> sentReliableCommands);
+       enet_list_clear (& currentPeer -> sentUnreliableCommands);
+       enet_list_clear (& currentPeer -> outgoingReliableCommands);
+       enet_list_clear (& currentPeer -> outgoingUnreliableCommands);
+       enet_list_clear (& currentPeer -> dispatchedCommands);
+
+       enet_peer_reset (currentPeer);
+    }
+
+    return host;
+}
+
+/** Destroys the host and all resources associated with it.
+    @param host pointer to the host to destroy
+*/
+void
+enet_host_destroy (ENetHost * host)
+{
+    ENetPeer * currentPeer;
+
+    if (host == NULL)
+      return;
+
+    enet_socket_destroy (host -> socket);
+
+    for (currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+       enet_peer_reset (currentPeer);
+    }
+
+    if (host -> compressor.context != NULL && host -> compressor.destroy)
+      (* host -> compressor.destroy) (host -> compressor.context);
+
+    enet_free (host -> peers);
+    enet_free (host);
+}
+
+/** Initiates a connection to a foreign host.
+    @param host host seeking the connection
+    @param address destination for the connection
+    @param channelCount number of channels to allocate
+    @param data user data supplied to the receiving host 
+    @returns a peer representing the foreign host on success, NULL on failure
+    @remarks The peer returned will have not completed the connection until enet_host_service()
+    notifies of an ENET_EVENT_TYPE_CONNECT event for the peer.
+*/
+ENetPeer *
+enet_host_connect (ENetHost * host, const ENetAddress * address, size_t channelCount, enet_uint32 data)
+{
+    ENetPeer * currentPeer;
+    ENetChannel * channel;
+    ENetProtocol command;
+
+    if (channelCount < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT)
+      channelCount = ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT;
+    else
+    if (channelCount > ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT)
+      channelCount = ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT;
+
+    for (currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+       if (currentPeer -> state == ENET_PEER_STATE_DISCONNECTED)
+         break;
+    }
+
+    if (currentPeer >= & host -> peers [host -> peerCount])
+      return NULL;
+
+    currentPeer -> channels = (ENetChannel *) enet_malloc (channelCount * sizeof (ENetChannel));
+    if (currentPeer -> channels == NULL)
+      return NULL;
+    currentPeer -> channelCount = channelCount;
+    currentPeer -> state = ENET_PEER_STATE_CONNECTING;
+    currentPeer -> address = * address;
+    currentPeer -> connectID = ++ host -> randomSeed;
+
+    if (host -> outgoingBandwidth == 0)
+      currentPeer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+    else
+      currentPeer -> windowSize = (host -> outgoingBandwidth /
+                                    ENET_PEER_WINDOW_SIZE_SCALE) * 
+                                      ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+
+    if (currentPeer -> windowSize < ENET_PROTOCOL_MINIMUM_WINDOW_SIZE)
+      currentPeer -> windowSize = ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+    if (currentPeer -> windowSize > ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE)
+      currentPeer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+         
+    for (channel = currentPeer -> channels;
+         channel < & currentPeer -> channels [channelCount];
+         ++ channel)
+    {
+        channel -> outgoingReliableSequenceNumber = 0;
+        channel -> outgoingUnreliableSequenceNumber = 0;
+        channel -> incomingReliableSequenceNumber = 0;
+        channel -> incomingUnreliableSequenceNumber = 0;
+
+        enet_list_clear (& channel -> incomingReliableCommands);
+        enet_list_clear (& channel -> incomingUnreliableCommands);
+
+        channel -> usedReliableWindows = 0;
+        memset (channel -> reliableWindows, 0, sizeof (channel -> reliableWindows));
+    }
+        
+    command.header.command = ENET_PROTOCOL_COMMAND_CONNECT | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+    command.header.channelID = 0xFF;
+    command.connect.outgoingPeerID = ENET_HOST_TO_NET_16 (currentPeer -> incomingPeerID);
+    command.connect.incomingSessionID = currentPeer -> incomingSessionID;
+    command.connect.outgoingSessionID = currentPeer -> outgoingSessionID;
+    command.connect.mtu = ENET_HOST_TO_NET_32 (currentPeer -> mtu);
+    command.connect.windowSize = ENET_HOST_TO_NET_32 (currentPeer -> windowSize);
+    command.connect.channelCount = ENET_HOST_TO_NET_32 (channelCount);
+    command.connect.incomingBandwidth = ENET_HOST_TO_NET_32 (host -> incomingBandwidth);
+    command.connect.outgoingBandwidth = ENET_HOST_TO_NET_32 (host -> outgoingBandwidth);
+    command.connect.packetThrottleInterval = ENET_HOST_TO_NET_32 (currentPeer -> packetThrottleInterval);
+    command.connect.packetThrottleAcceleration = ENET_HOST_TO_NET_32 (currentPeer -> packetThrottleAcceleration);
+    command.connect.packetThrottleDeceleration = ENET_HOST_TO_NET_32 (currentPeer -> packetThrottleDeceleration);
+    command.connect.connectID = currentPeer -> connectID;
+    command.connect.data = ENET_HOST_TO_NET_32 (data);
+ 
+    enet_peer_queue_outgoing_command (currentPeer, & command, NULL, 0, 0);
+
+    return currentPeer;
+}
+
+/** Queues a packet to be sent to all peers associated with the host.
+    @param host host on which to broadcast the packet
+    @param channelID channel on which to broadcast
+    @param packet packet to broadcast
+*/
+void
+enet_host_broadcast (ENetHost * host, enet_uint8 channelID, ENetPacket * packet)
+{
+    ENetPeer * currentPeer;
+
+    for (currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+       if (currentPeer -> state != ENET_PEER_STATE_CONNECTED)
+         continue;
+
+       enet_peer_send (currentPeer, channelID, packet);
+    }
+
+    if (packet -> referenceCount == 0)
+      enet_packet_destroy (packet);
+}
+
+/** Sets the packet compressor the host should use to compress and decompress packets.
+    @param host host to enable or disable compression for
+    @param compressor callbacks for for the packet compressor; if NULL, then compression is disabled
+*/
+void
+enet_host_compress (ENetHost * host, const ENetCompressor * compressor)
+{
+    if (host -> compressor.context != NULL && host -> compressor.destroy)
+      (* host -> compressor.destroy) (host -> compressor.context);
+
+    if (compressor)
+      host -> compressor = * compressor;
+    else
+      host -> compressor.context = NULL;
+}
+
+/** Limits the maximum allowed channels of future incoming connections.
+    @param host host to limit
+    @param channelLimit the maximum number of channels allowed; if 0, then this is equivalent to ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT
+*/
+void
+enet_host_channel_limit (ENetHost * host, size_t channelLimit)
+{
+    if (! channelLimit || channelLimit > ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT)
+      channelLimit = ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT;
+    else
+    if (channelLimit < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT)
+      channelLimit = ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT;
+
+    host -> channelLimit = channelLimit;
+}
+
+
+/** Adjusts the bandwidth limits of a host.
+    @param host host to adjust
+    @param incomingBandwidth new incoming bandwidth
+    @param outgoingBandwidth new outgoing bandwidth
+    @remarks the incoming and outgoing bandwidth parameters are identical in function to those
+    specified in enet_host_create().
+*/
+void
+enet_host_bandwidth_limit (ENetHost * host, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth)
+{
+    host -> incomingBandwidth = incomingBandwidth;
+    host -> outgoingBandwidth = outgoingBandwidth;
+    host -> recalculateBandwidthLimits = 1;
+}
+
+void
+enet_host_bandwidth_throttle (ENetHost * host)
+{
+    enet_uint32 timeCurrent = enet_time_get (),
+           elapsedTime = timeCurrent - host -> bandwidthThrottleEpoch,
+           peersRemaining = (enet_uint32) host -> connectedPeers,
+           dataTotal = ~0,
+           bandwidth = ~0,
+           throttle = 0,
+           bandwidthLimit = 0;
+    int needsAdjustment = host -> bandwidthLimitedPeers > 0 ? 1 : 0;
+    ENetPeer * peer;
+    ENetProtocol command;
+
+    if (elapsedTime < ENET_HOST_BANDWIDTH_THROTTLE_INTERVAL)
+      return;
+
+    host -> bandwidthThrottleEpoch = timeCurrent;
+
+    if (peersRemaining == 0)
+      return;
+
+    if (host -> outgoingBandwidth != 0)
+    {
+        dataTotal = 0;
+        bandwidth = (host -> outgoingBandwidth * elapsedTime) / 1000;
+
+        for (peer = host -> peers;
+             peer < & host -> peers [host -> peerCount];
+            ++ peer)
+        {
+            if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+              continue;
+
+            dataTotal += peer -> outgoingDataTotal;
+        }
+    }
+
+    while (peersRemaining > 0 && needsAdjustment != 0)
+    {
+        needsAdjustment = 0;
+        
+        if (dataTotal <= bandwidth)
+          throttle = ENET_PEER_PACKET_THROTTLE_SCALE;
+        else
+          throttle = (bandwidth * ENET_PEER_PACKET_THROTTLE_SCALE) / dataTotal;
+
+        for (peer = host -> peers;
+             peer < & host -> peers [host -> peerCount];
+             ++ peer)
+        {
+            enet_uint32 peerBandwidth;
+            
+            if ((peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER) ||
+                peer -> incomingBandwidth == 0 ||
+                peer -> outgoingBandwidthThrottleEpoch == timeCurrent)
+              continue;
+
+            peerBandwidth = (peer -> incomingBandwidth * elapsedTime) / 1000;
+            if ((throttle * peer -> outgoingDataTotal) / ENET_PEER_PACKET_THROTTLE_SCALE <= peerBandwidth)
+              continue;
+
+            peer -> packetThrottleLimit = (peerBandwidth * 
+                                            ENET_PEER_PACKET_THROTTLE_SCALE) / peer -> outgoingDataTotal;
+            
+            if (peer -> packetThrottleLimit == 0)
+              peer -> packetThrottleLimit = 1;
+            
+            if (peer -> packetThrottle > peer -> packetThrottleLimit)
+              peer -> packetThrottle = peer -> packetThrottleLimit;
+
+            peer -> outgoingBandwidthThrottleEpoch = timeCurrent;
+
+            peer -> incomingDataTotal = 0;
+            peer -> outgoingDataTotal = 0;
+
+            needsAdjustment = 1;
+            -- peersRemaining;
+            bandwidth -= peerBandwidth;
+            dataTotal -= peerBandwidth;
+        }
+    }
+
+    if (peersRemaining > 0)
+    {
+        if (dataTotal <= bandwidth)
+          throttle = ENET_PEER_PACKET_THROTTLE_SCALE;
+        else
+          throttle = (bandwidth * ENET_PEER_PACKET_THROTTLE_SCALE) / dataTotal;
+
+        for (peer = host -> peers;
+             peer < & host -> peers [host -> peerCount];
+             ++ peer)
+        {
+            if ((peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER) ||
+                peer -> outgoingBandwidthThrottleEpoch == timeCurrent)
+              continue;
+
+            peer -> packetThrottleLimit = throttle;
+
+            if (peer -> packetThrottle > peer -> packetThrottleLimit)
+              peer -> packetThrottle = peer -> packetThrottleLimit;
+
+            peer -> incomingDataTotal = 0;
+            peer -> outgoingDataTotal = 0;
+        }
+    }
+
+    if (host -> recalculateBandwidthLimits)
+    {
+       host -> recalculateBandwidthLimits = 0;
+
+       peersRemaining = (enet_uint32) host -> connectedPeers;
+       bandwidth = host -> incomingBandwidth;
+       needsAdjustment = 1;
+
+       if (bandwidth == 0)
+         bandwidthLimit = 0;
+       else
+       while (peersRemaining > 0 && needsAdjustment != 0)
+       {
+           needsAdjustment = 0;
+           bandwidthLimit = bandwidth / peersRemaining;
+
+           for (peer = host -> peers;
+                peer < & host -> peers [host -> peerCount];
+                ++ peer)
+           {
+               if ((peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER) ||
+                   peer -> incomingBandwidthThrottleEpoch == timeCurrent)
+                 continue;
+
+               if (peer -> outgoingBandwidth > 0 &&
+                   peer -> outgoingBandwidth >= bandwidthLimit)
+                 continue;
+
+               peer -> incomingBandwidthThrottleEpoch = timeCurrent;
+ 
+               needsAdjustment = 1;
+               -- peersRemaining;
+               bandwidth -= peer -> outgoingBandwidth;
+           }
+       }
+
+       for (peer = host -> peers;
+            peer < & host -> peers [host -> peerCount];
+            ++ peer)
+       {
+           if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+             continue;
+
+           command.header.command = ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+           command.header.channelID = 0xFF;
+           command.bandwidthLimit.outgoingBandwidth = ENET_HOST_TO_NET_32 (host -> outgoingBandwidth);
+
+           if (peer -> incomingBandwidthThrottleEpoch == timeCurrent)
+             command.bandwidthLimit.incomingBandwidth = ENET_HOST_TO_NET_32 (peer -> outgoingBandwidth);
+           else
+             command.bandwidthLimit.incomingBandwidth = ENET_HOST_TO_NET_32 (bandwidthLimit);
+
+           enet_peer_queue_outgoing_command (peer, & command, NULL, 0, 0);
+       } 
+    }
+}
+    
+/** @} */
diff --git a/Externals/enet/include/enet/callbacks.h b/Externals/enet/include/enet/callbacks.h
new file mode 100644
index 0000000000..340a4a9896
--- /dev/null
+++ b/Externals/enet/include/enet/callbacks.h
@@ -0,0 +1,27 @@
+/** 
+ @file  callbacks.h
+ @brief ENet callbacks
+*/
+#ifndef __ENET_CALLBACKS_H__
+#define __ENET_CALLBACKS_H__
+
+#include <stdlib.h>
+
+typedef struct _ENetCallbacks
+{
+    void * (ENET_CALLBACK * malloc) (size_t size);
+    void (ENET_CALLBACK * free) (void * memory);
+    void (ENET_CALLBACK * no_memory) (void);
+} ENetCallbacks;
+
+/** @defgroup callbacks ENet internal callbacks
+    @{
+    @ingroup private
+*/
+extern void * enet_malloc (size_t);
+extern void   enet_free (void *);
+
+/** @} */
+
+#endif /* __ENET_CALLBACKS_H__ */
+
diff --git a/Externals/enet/include/enet/enet.h b/Externals/enet/include/enet/enet.h
new file mode 100644
index 0000000000..5e21ee8ea9
--- /dev/null
+++ b/Externals/enet/include/enet/enet.h
@@ -0,0 +1,592 @@
+/** 
+ @file  enet.h
+ @brief ENet public header file
+*/
+#ifndef __ENET_ENET_H__
+#define __ENET_ENET_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdlib.h>
+
+#ifdef _WIN32
+#include "enet/win32.h"
+#else
+#include "enet/unix.h"
+#endif
+
+#include "enet/types.h"
+#include "enet/protocol.h"
+#include "enet/list.h"
+#include "enet/callbacks.h"
+
+#define ENET_VERSION_MAJOR 1
+#define ENET_VERSION_MINOR 3
+#define ENET_VERSION_PATCH 13
+#define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
+#define ENET_VERSION_GET_MAJOR(version) (((version)>>16)&0xFF)
+#define ENET_VERSION_GET_MINOR(version) (((version)>>8)&0xFF)
+#define ENET_VERSION_GET_PATCH(version) ((version)&0xFF)
+#define ENET_VERSION ENET_VERSION_CREATE(ENET_VERSION_MAJOR, ENET_VERSION_MINOR, ENET_VERSION_PATCH)
+
+typedef enet_uint32 ENetVersion;
+
+struct _ENetHost;
+struct _ENetEvent;
+struct _ENetPacket;
+
+typedef enum _ENetSocketType
+{
+   ENET_SOCKET_TYPE_STREAM   = 1,
+   ENET_SOCKET_TYPE_DATAGRAM = 2
+} ENetSocketType;
+
+typedef enum _ENetSocketWait
+{
+   ENET_SOCKET_WAIT_NONE      = 0,
+   ENET_SOCKET_WAIT_SEND      = (1 << 0),
+   ENET_SOCKET_WAIT_RECEIVE   = (1 << 1),
+   ENET_SOCKET_WAIT_INTERRUPT = (1 << 2)
+} ENetSocketWait;
+
+typedef enum _ENetSocketOption
+{
+   ENET_SOCKOPT_NONBLOCK  = 1,
+   ENET_SOCKOPT_BROADCAST = 2,
+   ENET_SOCKOPT_RCVBUF    = 3,
+   ENET_SOCKOPT_SNDBUF    = 4,
+   ENET_SOCKOPT_REUSEADDR = 5,
+   ENET_SOCKOPT_RCVTIMEO  = 6,
+   ENET_SOCKOPT_SNDTIMEO  = 7,
+   ENET_SOCKOPT_ERROR     = 8,
+   ENET_SOCKOPT_NODELAY   = 9
+} ENetSocketOption;
+
+typedef enum _ENetSocketShutdown
+{
+    ENET_SOCKET_SHUTDOWN_READ       = 0,
+    ENET_SOCKET_SHUTDOWN_WRITE      = 1,
+    ENET_SOCKET_SHUTDOWN_READ_WRITE = 2
+} ENetSocketShutdown;
+
+#define ENET_HOST_ANY       0
+#define ENET_HOST_BROADCAST 0xFFFFFFFFU
+#define ENET_PORT_ANY       0
+
+/**
+ * Portable internet address structure. 
+ *
+ * The host must be specified in network byte-order, and the port must be in host 
+ * byte-order. The constant ENET_HOST_ANY may be used to specify the default 
+ * server host. The constant ENET_HOST_BROADCAST may be used to specify the
+ * broadcast address (255.255.255.255).  This makes sense for enet_host_connect,
+ * but not for enet_host_create.  Once a server responds to a broadcast, the
+ * address is updated from ENET_HOST_BROADCAST to the server's actual IP address.
+ */
+typedef struct _ENetAddress
+{
+   enet_uint32 host;
+   enet_uint16 port;
+} ENetAddress;
+
+/**
+ * Packet flag bit constants.
+ *
+ * The host must be specified in network byte-order, and the port must be in
+ * host byte-order. The constant ENET_HOST_ANY may be used to specify the
+ * default server host.
+ 
+   @sa ENetPacket
+*/
+typedef enum _ENetPacketFlag
+{
+   /** packet must be received by the target peer and resend attempts should be
+     * made until the packet is delivered */
+   ENET_PACKET_FLAG_RELIABLE    = (1 << 0),
+   /** packet will not be sequenced with other packets
+     * not supported for reliable packets
+     */
+   ENET_PACKET_FLAG_UNSEQUENCED = (1 << 1),
+   /** packet will not allocate data, and user must supply it instead */
+   ENET_PACKET_FLAG_NO_ALLOCATE = (1 << 2),
+   /** packet will be fragmented using unreliable (instead of reliable) sends
+     * if it exceeds the MTU */
+   ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT = (1 << 3),
+
+   /** whether the packet has been sent from all queues it has been entered into */
+   ENET_PACKET_FLAG_SENT = (1<<8)
+} ENetPacketFlag;
+
+typedef void (ENET_CALLBACK * ENetPacketFreeCallback) (struct _ENetPacket *);
+
+/**
+ * ENet packet structure.
+ *
+ * An ENet data packet that may be sent to or received from a peer. The shown 
+ * fields should only be read and never modified. The data field contains the 
+ * allocated data for the packet. The dataLength fields specifies the length 
+ * of the allocated data.  The flags field is either 0 (specifying no flags), 
+ * or a bitwise-or of any combination of the following flags:
+ *
+ *    ENET_PACKET_FLAG_RELIABLE - packet must be received by the target peer
+ *    and resend attempts should be made until the packet is delivered
+ *
+ *    ENET_PACKET_FLAG_UNSEQUENCED - packet will not be sequenced with other packets 
+ *    (not supported for reliable packets)
+ *
+ *    ENET_PACKET_FLAG_NO_ALLOCATE - packet will not allocate data, and user must supply it instead
+ 
+   @sa ENetPacketFlag
+ */
+typedef struct _ENetPacket
+{
+   size_t                   referenceCount;  /**< internal use only */
+   enet_uint32              flags;           /**< bitwise-or of ENetPacketFlag constants */
+   enet_uint8 *             data;            /**< allocated data for packet */
+   size_t                   dataLength;      /**< length of data */
+   ENetPacketFreeCallback   freeCallback;    /**< function to be called when the packet is no longer in use */
+   void *                   userData;        /**< application private data, may be freely modified */
+} ENetPacket;
+
+typedef struct _ENetAcknowledgement
+{
+   ENetListNode acknowledgementList;
+   enet_uint32  sentTime;
+   ENetProtocol command;
+} ENetAcknowledgement;
+
+typedef struct _ENetOutgoingCommand
+{
+   ENetListNode outgoingCommandList;
+   enet_uint16  reliableSequenceNumber;
+   enet_uint16  unreliableSequenceNumber;
+   enet_uint32  sentTime;
+   enet_uint32  roundTripTimeout;
+   enet_uint32  roundTripTimeoutLimit;
+   enet_uint32  fragmentOffset;
+   enet_uint16  fragmentLength;
+   enet_uint16  sendAttempts;
+   ENetProtocol command;
+   ENetPacket * packet;
+} ENetOutgoingCommand;
+
+typedef struct _ENetIncomingCommand
+{  
+   ENetListNode     incomingCommandList;
+   enet_uint16      reliableSequenceNumber;
+   enet_uint16      unreliableSequenceNumber;
+   ENetProtocol     command;
+   enet_uint32      fragmentCount;
+   enet_uint32      fragmentsRemaining;
+   enet_uint32 *    fragments;
+   ENetPacket *     packet;
+} ENetIncomingCommand;
+
+typedef enum _ENetPeerState
+{
+   ENET_PEER_STATE_DISCONNECTED                = 0,
+   ENET_PEER_STATE_CONNECTING                  = 1,
+   ENET_PEER_STATE_ACKNOWLEDGING_CONNECT       = 2,
+   ENET_PEER_STATE_CONNECTION_PENDING          = 3,
+   ENET_PEER_STATE_CONNECTION_SUCCEEDED        = 4,
+   ENET_PEER_STATE_CONNECTED                   = 5,
+   ENET_PEER_STATE_DISCONNECT_LATER            = 6,
+   ENET_PEER_STATE_DISCONNECTING               = 7,
+   ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT    = 8,
+   ENET_PEER_STATE_ZOMBIE                      = 9 
+} ENetPeerState;
+
+#ifndef ENET_BUFFER_MAXIMUM
+#define ENET_BUFFER_MAXIMUM (1 + 2 * ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS)
+#endif
+
+enum
+{
+   ENET_HOST_RECEIVE_BUFFER_SIZE          = 256 * 1024,
+   ENET_HOST_SEND_BUFFER_SIZE             = 256 * 1024,
+   ENET_HOST_BANDWIDTH_THROTTLE_INTERVAL  = 1000,
+   ENET_HOST_DEFAULT_MTU                  = 1400,
+   ENET_HOST_DEFAULT_MAXIMUM_PACKET_SIZE  = 32 * 1024 * 1024,
+   ENET_HOST_DEFAULT_MAXIMUM_WAITING_DATA = 32 * 1024 * 1024,
+
+   ENET_PEER_DEFAULT_ROUND_TRIP_TIME      = 500,
+   ENET_PEER_DEFAULT_PACKET_THROTTLE      = 32,
+   ENET_PEER_PACKET_THROTTLE_SCALE        = 32,
+   ENET_PEER_PACKET_THROTTLE_COUNTER      = 7, 
+   ENET_PEER_PACKET_THROTTLE_ACCELERATION = 2,
+   ENET_PEER_PACKET_THROTTLE_DECELERATION = 2,
+   ENET_PEER_PACKET_THROTTLE_INTERVAL     = 5000,
+   ENET_PEER_PACKET_LOSS_SCALE            = (1 << 16),
+   ENET_PEER_PACKET_LOSS_INTERVAL         = 10000,
+   ENET_PEER_WINDOW_SIZE_SCALE            = 64 * 1024,
+   ENET_PEER_TIMEOUT_LIMIT                = 32,
+   ENET_PEER_TIMEOUT_MINIMUM              = 5000,
+   ENET_PEER_TIMEOUT_MAXIMUM              = 30000,
+   ENET_PEER_PING_INTERVAL                = 500,
+   ENET_PEER_UNSEQUENCED_WINDOWS          = 64,
+   ENET_PEER_UNSEQUENCED_WINDOW_SIZE      = 1024,
+   ENET_PEER_FREE_UNSEQUENCED_WINDOWS     = 32,
+   ENET_PEER_RELIABLE_WINDOWS             = 16,
+   ENET_PEER_RELIABLE_WINDOW_SIZE         = 0x1000,
+   ENET_PEER_FREE_RELIABLE_WINDOWS        = 8
+};
+
+typedef struct _ENetChannel
+{
+   enet_uint16  outgoingReliableSequenceNumber;
+   enet_uint16  outgoingUnreliableSequenceNumber;
+   enet_uint16  usedReliableWindows;
+   enet_uint16  reliableWindows [ENET_PEER_RELIABLE_WINDOWS];
+   enet_uint16  incomingReliableSequenceNumber;
+   enet_uint16  incomingUnreliableSequenceNumber;
+   ENetList     incomingReliableCommands;
+   ENetList     incomingUnreliableCommands;
+} ENetChannel;
+
+/**
+ * An ENet peer which data packets may be sent or received from. 
+ *
+ * No fields should be modified unless otherwise specified. 
+ */
+typedef struct _ENetPeer
+{ 
+   ENetListNode  dispatchList;
+   struct _ENetHost * host;
+   enet_uint16   outgoingPeerID;
+   enet_uint16   incomingPeerID;
+   enet_uint32   connectID;
+   enet_uint8    outgoingSessionID;
+   enet_uint8    incomingSessionID;
+   ENetAddress   address;            /**< Internet address of the peer */
+   void *        data;               /**< Application private data, may be freely modified */
+   ENetPeerState state;
+   ENetChannel * channels;
+   size_t        channelCount;       /**< Number of channels allocated for communication with peer */
+   enet_uint32   incomingBandwidth;  /**< Downstream bandwidth of the client in bytes/second */
+   enet_uint32   outgoingBandwidth;  /**< Upstream bandwidth of the client in bytes/second */
+   enet_uint32   incomingBandwidthThrottleEpoch;
+   enet_uint32   outgoingBandwidthThrottleEpoch;
+   enet_uint32   incomingDataTotal;
+   enet_uint32   outgoingDataTotal;
+   enet_uint32   lastSendTime;
+   enet_uint32   lastReceiveTime;
+   enet_uint32   nextTimeout;
+   enet_uint32   earliestTimeout;
+   enet_uint32   packetLossEpoch;
+   enet_uint32   packetsSent;
+   enet_uint32   packetsLost;
+   enet_uint32   packetLoss;          /**< mean packet loss of reliable packets as a ratio with respect to the constant ENET_PEER_PACKET_LOSS_SCALE */
+   enet_uint32   packetLossVariance;
+   enet_uint32   packetThrottle;
+   enet_uint32   packetThrottleLimit;
+   enet_uint32   packetThrottleCounter;
+   enet_uint32   packetThrottleEpoch;
+   enet_uint32   packetThrottleAcceleration;
+   enet_uint32   packetThrottleDeceleration;
+   enet_uint32   packetThrottleInterval;
+   enet_uint32   pingInterval;
+   enet_uint32   timeoutLimit;
+   enet_uint32   timeoutMinimum;
+   enet_uint32   timeoutMaximum;
+   enet_uint32   lastRoundTripTime;
+   enet_uint32   lowestRoundTripTime;
+   enet_uint32   lastRoundTripTimeVariance;
+   enet_uint32   highestRoundTripTimeVariance;
+   enet_uint32   roundTripTime;            /**< mean round trip time (RTT), in milliseconds, between sending a reliable packet and receiving its acknowledgement */
+   enet_uint32   roundTripTimeVariance;
+   enet_uint32   mtu;
+   enet_uint32   windowSize;
+   enet_uint32   reliableDataInTransit;
+   enet_uint16   outgoingReliableSequenceNumber;
+   ENetList      acknowledgements;
+   ENetList      sentReliableCommands;
+   ENetList      sentUnreliableCommands;
+   ENetList      outgoingReliableCommands;
+   ENetList      outgoingUnreliableCommands;
+   ENetList      dispatchedCommands;
+   int           needsDispatch;
+   enet_uint16   incomingUnsequencedGroup;
+   enet_uint16   outgoingUnsequencedGroup;
+   enet_uint32   unsequencedWindow [ENET_PEER_UNSEQUENCED_WINDOW_SIZE / 32]; 
+   enet_uint32   eventData;
+   size_t        totalWaitingData;
+} ENetPeer;
+
+/** An ENet packet compressor for compressing UDP packets before socket sends or receives.
+ */
+typedef struct _ENetCompressor
+{
+   /** Context data for the compressor. Must be non-NULL. */
+   void * context;
+   /** Compresses from inBuffers[0:inBufferCount-1], containing inLimit bytes, to outData, outputting at most outLimit bytes. Should return 0 on failure. */
+   size_t (ENET_CALLBACK * compress) (void * context, const ENetBuffer * inBuffers, size_t inBufferCount, size_t inLimit, enet_uint8 * outData, size_t outLimit);
+   /** Decompresses from inData, containing inLimit bytes, to outData, outputting at most outLimit bytes. Should return 0 on failure. */
+   size_t (ENET_CALLBACK * decompress) (void * context, const enet_uint8 * inData, size_t inLimit, enet_uint8 * outData, size_t outLimit);
+   /** Destroys the context when compression is disabled or the host is destroyed. May be NULL. */
+   void (ENET_CALLBACK * destroy) (void * context);
+} ENetCompressor;
+
+/** Callback that computes the checksum of the data held in buffers[0:bufferCount-1] */
+typedef enet_uint32 (ENET_CALLBACK * ENetChecksumCallback) (const ENetBuffer * buffers, size_t bufferCount);
+
+/** Callback for intercepting received raw UDP packets. Should return 1 to intercept, 0 to ignore, or -1 to propagate an error. */
+typedef int (ENET_CALLBACK * ENetInterceptCallback) (struct _ENetHost * host, struct _ENetEvent * event);
+ 
+/** An ENet host for communicating with peers.
+  *
+  * No fields should be modified unless otherwise stated.
+
+    @sa enet_host_create()
+    @sa enet_host_destroy()
+    @sa enet_host_connect()
+    @sa enet_host_service()
+    @sa enet_host_flush()
+    @sa enet_host_broadcast()
+    @sa enet_host_compress()
+    @sa enet_host_compress_with_range_coder()
+    @sa enet_host_channel_limit()
+    @sa enet_host_bandwidth_limit()
+    @sa enet_host_bandwidth_throttle()
+  */
+typedef struct _ENetHost
+{
+   ENetSocket           socket;
+   ENetAddress          address;                     /**< Internet address of the host */
+   enet_uint32          incomingBandwidth;           /**< downstream bandwidth of the host */
+   enet_uint32          outgoingBandwidth;           /**< upstream bandwidth of the host */
+   enet_uint32          bandwidthThrottleEpoch;
+   enet_uint32          mtu;
+   enet_uint32          randomSeed;
+   int                  recalculateBandwidthLimits;
+   ENetPeer *           peers;                       /**< array of peers allocated for this host */
+   size_t               peerCount;                   /**< number of peers allocated for this host */
+   size_t               channelLimit;                /**< maximum number of channels allowed for connected peers */
+   enet_uint32          serviceTime;
+   ENetList             dispatchQueue;
+   int                  continueSending;
+   size_t               packetSize;
+   enet_uint16          headerFlags;
+   ENetProtocol         commands [ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS];
+   size_t               commandCount;
+   ENetBuffer           buffers [ENET_BUFFER_MAXIMUM];
+   size_t               bufferCount;
+   ENetChecksumCallback checksum;                    /**< callback the user can set to enable packet checksums for this host */
+   ENetCompressor       compressor;
+   enet_uint8           packetData [2][ENET_PROTOCOL_MAXIMUM_MTU];
+   ENetAddress          receivedAddress;
+   enet_uint8 *         receivedData;
+   size_t               receivedDataLength;
+   enet_uint32          totalSentData;               /**< total data sent, user should reset to 0 as needed to prevent overflow */
+   enet_uint32          totalSentPackets;            /**< total UDP packets sent, user should reset to 0 as needed to prevent overflow */
+   enet_uint32          totalReceivedData;           /**< total data received, user should reset to 0 as needed to prevent overflow */
+   enet_uint32          totalReceivedPackets;        /**< total UDP packets received, user should reset to 0 as needed to prevent overflow */
+   ENetInterceptCallback intercept;                  /**< callback the user can set to intercept received raw UDP packets */
+   size_t               connectedPeers;
+   size_t               bandwidthLimitedPeers;
+   size_t               duplicatePeers;              /**< optional number of allowed peers from duplicate IPs, defaults to ENET_PROTOCOL_MAXIMUM_PEER_ID */
+   size_t               maximumPacketSize;           /**< the maximum allowable packet size that may be sent or received on a peer */
+   size_t               maximumWaitingData;          /**< the maximum aggregate amount of buffer space a peer may use waiting for packets to be delivered */
+} ENetHost;
+
+/**
+ * An ENet event type, as specified in @ref ENetEvent.
+ */
+typedef enum _ENetEventType
+{
+   /** no event occurred within the specified time limit */
+   ENET_EVENT_TYPE_NONE       = 0,  
+
+   /** a connection request initiated by enet_host_connect has completed.  
+     * The peer field contains the peer which successfully connected. 
+     */
+   ENET_EVENT_TYPE_CONNECT    = 1,  
+
+   /** a peer has disconnected.  This event is generated on a successful 
+     * completion of a disconnect initiated by enet_pper_disconnect, if 
+     * a peer has timed out, or if a connection request intialized by 
+     * enet_host_connect has timed out.  The peer field contains the peer 
+     * which disconnected. The data field contains user supplied data 
+     * describing the disconnection, or 0, if none is available.
+     */
+   ENET_EVENT_TYPE_DISCONNECT = 2,  
+
+   /** a packet has been received from a peer.  The peer field specifies the
+     * peer which sent the packet.  The channelID field specifies the channel
+     * number upon which the packet was received.  The packet field contains
+     * the packet that was received; this packet must be destroyed with
+     * enet_packet_destroy after use.
+     */
+   ENET_EVENT_TYPE_RECEIVE    = 3
+} ENetEventType;
+
+/**
+ * An ENet event as returned by enet_host_service().
+   
+   @sa enet_host_service
+ */
+typedef struct _ENetEvent 
+{
+   ENetEventType        type;      /**< type of the event */
+   ENetPeer *           peer;      /**< peer that generated a connect, disconnect or receive event */
+   enet_uint8           channelID; /**< channel on the peer that generated the event, if appropriate */
+   enet_uint32          data;      /**< data associated with the event, if appropriate */
+   ENetPacket *         packet;    /**< packet associated with the event, if appropriate */
+} ENetEvent;
+
+/** @defgroup global ENet global functions
+    @{ 
+*/
+
+/** 
+  Initializes ENet globally.  Must be called prior to using any functions in
+  ENet.
+  @returns 0 on success, < 0 on failure
+*/
+ENET_API int enet_initialize (void);
+
+/** 
+  Initializes ENet globally and supplies user-overridden callbacks. Must be called prior to using any functions in ENet. Do not use enet_initialize() if you use this variant. Make sure the ENetCallbacks structure is zeroed out so that any additional callbacks added in future versions will be properly ignored.
+
+  @param version the constant ENET_VERSION should be supplied so ENet knows which version of ENetCallbacks struct to use
+  @param inits user-overridden callbacks where any NULL callbacks will use ENet's defaults
+  @returns 0 on success, < 0 on failure
+*/
+ENET_API int enet_initialize_with_callbacks (ENetVersion version, const ENetCallbacks * inits);
+
+/** 
+  Shuts down ENet globally.  Should be called when a program that has
+  initialized ENet exits.
+*/
+ENET_API void enet_deinitialize (void);
+
+/**
+  Gives the linked version of the ENet library.
+  @returns the version number 
+*/
+ENET_API ENetVersion enet_linked_version (void);
+
+/** @} */
+
+/** @defgroup private ENet private implementation functions */
+
+/**
+  Returns the wall-time in milliseconds.  Its initial value is unspecified
+  unless otherwise set.
+  */
+ENET_API enet_uint32 enet_time_get (void);
+/**
+  Sets the current wall-time in milliseconds.
+  */
+ENET_API void enet_time_set (enet_uint32);
+
+/** @defgroup socket ENet socket functions
+    @{
+*/
+ENET_API ENetSocket enet_socket_create (ENetSocketType);
+ENET_API int        enet_socket_bind (ENetSocket, const ENetAddress *);
+ENET_API int        enet_socket_get_address (ENetSocket, ENetAddress *);
+ENET_API int        enet_socket_listen (ENetSocket, int);
+ENET_API ENetSocket enet_socket_accept (ENetSocket, ENetAddress *);
+ENET_API int        enet_socket_connect (ENetSocket, const ENetAddress *);
+ENET_API int        enet_socket_send (ENetSocket, const ENetAddress *, const ENetBuffer *, size_t);
+ENET_API int        enet_socket_receive (ENetSocket, ENetAddress *, ENetBuffer *, size_t);
+ENET_API int        enet_socket_wait (ENetSocket, enet_uint32 *, enet_uint32);
+ENET_API int        enet_socket_set_option (ENetSocket, ENetSocketOption, int);
+ENET_API int        enet_socket_get_option (ENetSocket, ENetSocketOption, int *);
+ENET_API int        enet_socket_shutdown (ENetSocket, ENetSocketShutdown);
+ENET_API void       enet_socket_destroy (ENetSocket);
+ENET_API int        enet_socketset_select (ENetSocket, ENetSocketSet *, ENetSocketSet *, enet_uint32);
+
+/** @} */
+
+/** @defgroup Address ENet address functions
+    @{
+*/
+/** Attempts to resolve the host named by the parameter hostName and sets
+    the host field in the address parameter if successful.
+    @param address destination to store resolved address
+    @param hostName host name to lookup
+    @retval 0 on success
+    @retval < 0 on failure
+    @returns the address of the given hostName in address on success
+*/
+ENET_API int enet_address_set_host (ENetAddress * address, const char * hostName);
+
+/** Gives the printable form of the IP address specified in the address parameter.
+    @param address    address printed
+    @param hostName   destination for name, must not be NULL
+    @param nameLength maximum length of hostName.
+    @returns the null-terminated name of the host in hostName on success
+    @retval 0 on success
+    @retval < 0 on failure
+*/
+ENET_API int enet_address_get_host_ip (const ENetAddress * address, char * hostName, size_t nameLength);
+
+/** Attempts to do a reverse lookup of the host field in the address parameter.
+    @param address    address used for reverse lookup
+    @param hostName   destination for name, must not be NULL
+    @param nameLength maximum length of hostName.
+    @returns the null-terminated name of the host in hostName on success
+    @retval 0 on success
+    @retval < 0 on failure
+*/
+ENET_API int enet_address_get_host (const ENetAddress * address, char * hostName, size_t nameLength);
+
+/** @} */
+
+ENET_API ENetPacket * enet_packet_create (const void *, size_t, enet_uint32);
+ENET_API void         enet_packet_destroy (ENetPacket *);
+ENET_API int          enet_packet_resize  (ENetPacket *, size_t);
+ENET_API enet_uint32  enet_crc32 (const ENetBuffer *, size_t);
+                
+ENET_API ENetHost * enet_host_create (const ENetAddress *, size_t, size_t, enet_uint32, enet_uint32);
+ENET_API void       enet_host_destroy (ENetHost *);
+ENET_API ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, size_t, enet_uint32);
+ENET_API int        enet_host_check_events (ENetHost *, ENetEvent *);
+ENET_API int        enet_host_service (ENetHost *, ENetEvent *, enet_uint32);
+ENET_API void       enet_host_flush (ENetHost *);
+ENET_API void       enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *);
+ENET_API void       enet_host_compress (ENetHost *, const ENetCompressor *);
+ENET_API int        enet_host_compress_with_range_coder (ENetHost * host);
+ENET_API void       enet_host_channel_limit (ENetHost *, size_t);
+ENET_API void       enet_host_bandwidth_limit (ENetHost *, enet_uint32, enet_uint32);
+extern   void       enet_host_bandwidth_throttle (ENetHost *);
+extern  enet_uint32 enet_host_random_seed (void);
+
+ENET_API int                 enet_peer_send (ENetPeer *, enet_uint8, ENetPacket *);
+ENET_API ENetPacket *        enet_peer_receive (ENetPeer *, enet_uint8 * channelID);
+ENET_API void                enet_peer_ping (ENetPeer *);
+ENET_API void                enet_peer_ping_interval (ENetPeer *, enet_uint32);
+ENET_API void                enet_peer_timeout (ENetPeer *, enet_uint32, enet_uint32, enet_uint32);
+ENET_API void                enet_peer_reset (ENetPeer *);
+ENET_API void                enet_peer_disconnect (ENetPeer *, enet_uint32);
+ENET_API void                enet_peer_disconnect_now (ENetPeer *, enet_uint32);
+ENET_API void                enet_peer_disconnect_later (ENetPeer *, enet_uint32);
+ENET_API void                enet_peer_throttle_configure (ENetPeer *, enet_uint32, enet_uint32, enet_uint32);
+extern int                   enet_peer_throttle (ENetPeer *, enet_uint32);
+extern void                  enet_peer_reset_queues (ENetPeer *);
+extern void                  enet_peer_setup_outgoing_command (ENetPeer *, ENetOutgoingCommand *);
+extern ENetOutgoingCommand * enet_peer_queue_outgoing_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32, enet_uint16);
+extern ENetIncomingCommand * enet_peer_queue_incoming_command (ENetPeer *, const ENetProtocol *, const void *, size_t, enet_uint32, enet_uint32);
+extern ENetAcknowledgement * enet_peer_queue_acknowledgement (ENetPeer *, const ENetProtocol *, enet_uint16);
+extern void                  enet_peer_dispatch_incoming_unreliable_commands (ENetPeer *, ENetChannel *);
+extern void                  enet_peer_dispatch_incoming_reliable_commands (ENetPeer *, ENetChannel *);
+extern void                  enet_peer_on_connect (ENetPeer *);
+extern void                  enet_peer_on_disconnect (ENetPeer *);
+
+ENET_API void * enet_range_coder_create (void);
+ENET_API void   enet_range_coder_destroy (void *);
+ENET_API size_t enet_range_coder_compress (void *, const ENetBuffer *, size_t, size_t, enet_uint8 *, size_t);
+ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t, enet_uint8 *, size_t);
+   
+extern size_t enet_protocol_command_size (enet_uint8);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ENET_ENET_H__ */
+
diff --git a/Externals/enet/include/enet/list.h b/Externals/enet/include/enet/list.h
new file mode 100644
index 0000000000..d7b2600848
--- /dev/null
+++ b/Externals/enet/include/enet/list.h
@@ -0,0 +1,43 @@
+/** 
+ @file  list.h
+ @brief ENet list management 
+*/
+#ifndef __ENET_LIST_H__
+#define __ENET_LIST_H__
+
+#include <stdlib.h>
+
+typedef struct _ENetListNode
+{
+   struct _ENetListNode * next;
+   struct _ENetListNode * previous;
+} ENetListNode;
+
+typedef ENetListNode * ENetListIterator;
+
+typedef struct _ENetList
+{
+   ENetListNode sentinel;
+} ENetList;
+
+extern void enet_list_clear (ENetList *);
+
+extern ENetListIterator enet_list_insert (ENetListIterator, void *);
+extern void * enet_list_remove (ENetListIterator);
+extern ENetListIterator enet_list_move (ENetListIterator, void *, void *);
+
+extern size_t enet_list_size (ENetList *);
+
+#define enet_list_begin(list) ((list) -> sentinel.next)
+#define enet_list_end(list) (& (list) -> sentinel)
+
+#define enet_list_empty(list) (enet_list_begin (list) == enet_list_end (list))
+
+#define enet_list_next(iterator) ((iterator) -> next)
+#define enet_list_previous(iterator) ((iterator) -> previous)
+
+#define enet_list_front(list) ((void *) (list) -> sentinel.next)
+#define enet_list_back(list) ((void *) (list) -> sentinel.previous)
+
+#endif /* __ENET_LIST_H__ */
+
diff --git a/Externals/enet/include/enet/protocol.h b/Externals/enet/include/enet/protocol.h
new file mode 100644
index 0000000000..f8c73d8a66
--- /dev/null
+++ b/Externals/enet/include/enet/protocol.h
@@ -0,0 +1,198 @@
+/** 
+ @file  protocol.h
+ @brief ENet protocol
+*/
+#ifndef __ENET_PROTOCOL_H__
+#define __ENET_PROTOCOL_H__
+
+#include "enet/types.h"
+
+enum
+{
+   ENET_PROTOCOL_MINIMUM_MTU             = 576,
+   ENET_PROTOCOL_MAXIMUM_MTU             = 4096,
+   ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS = 32,
+   ENET_PROTOCOL_MINIMUM_WINDOW_SIZE     = 4096,
+   ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE     = 65536,
+   ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT   = 1,
+   ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT   = 255,
+   ENET_PROTOCOL_MAXIMUM_PEER_ID         = 0xFFF,
+   ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT  = 1024 * 1024
+};
+
+typedef enum _ENetProtocolCommand
+{
+   ENET_PROTOCOL_COMMAND_NONE               = 0,
+   ENET_PROTOCOL_COMMAND_ACKNOWLEDGE        = 1,
+   ENET_PROTOCOL_COMMAND_CONNECT            = 2,
+   ENET_PROTOCOL_COMMAND_VERIFY_CONNECT     = 3,
+   ENET_PROTOCOL_COMMAND_DISCONNECT         = 4,
+   ENET_PROTOCOL_COMMAND_PING               = 5,
+   ENET_PROTOCOL_COMMAND_SEND_RELIABLE      = 6,
+   ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE    = 7,
+   ENET_PROTOCOL_COMMAND_SEND_FRAGMENT      = 8,
+   ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED   = 9,
+   ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT    = 10,
+   ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE = 11,
+   ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT = 12,
+   ENET_PROTOCOL_COMMAND_COUNT              = 13,
+
+   ENET_PROTOCOL_COMMAND_MASK               = 0x0F
+} ENetProtocolCommand;
+
+typedef enum _ENetProtocolFlag
+{
+   ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE = (1 << 7),
+   ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED = (1 << 6),
+
+   ENET_PROTOCOL_HEADER_FLAG_COMPRESSED = (1 << 14),
+   ENET_PROTOCOL_HEADER_FLAG_SENT_TIME  = (1 << 15),
+   ENET_PROTOCOL_HEADER_FLAG_MASK       = ENET_PROTOCOL_HEADER_FLAG_COMPRESSED | ENET_PROTOCOL_HEADER_FLAG_SENT_TIME,
+
+   ENET_PROTOCOL_HEADER_SESSION_MASK    = (3 << 12),
+   ENET_PROTOCOL_HEADER_SESSION_SHIFT   = 12
+} ENetProtocolFlag;
+
+#ifdef _MSC_VER
+#pragma pack(push, 1)
+#define ENET_PACKED
+#elif defined(__GNUC__) || defined(__clang__)
+#define ENET_PACKED __attribute__ ((packed))
+#else
+#define ENET_PACKED
+#endif
+
+typedef struct _ENetProtocolHeader
+{
+   enet_uint16 peerID;
+   enet_uint16 sentTime;
+} ENET_PACKED ENetProtocolHeader;
+
+typedef struct _ENetProtocolCommandHeader
+{
+   enet_uint8 command;
+   enet_uint8 channelID;
+   enet_uint16 reliableSequenceNumber;
+} ENET_PACKED ENetProtocolCommandHeader;
+
+typedef struct _ENetProtocolAcknowledge
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 receivedReliableSequenceNumber;
+   enet_uint16 receivedSentTime;
+} ENET_PACKED ENetProtocolAcknowledge;
+
+typedef struct _ENetProtocolConnect
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 outgoingPeerID;
+   enet_uint8  incomingSessionID;
+   enet_uint8  outgoingSessionID;
+   enet_uint32 mtu;
+   enet_uint32 windowSize;
+   enet_uint32 channelCount;
+   enet_uint32 incomingBandwidth;
+   enet_uint32 outgoingBandwidth;
+   enet_uint32 packetThrottleInterval;
+   enet_uint32 packetThrottleAcceleration;
+   enet_uint32 packetThrottleDeceleration;
+   enet_uint32 connectID;
+   enet_uint32 data;
+} ENET_PACKED ENetProtocolConnect;
+
+typedef struct _ENetProtocolVerifyConnect
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 outgoingPeerID;
+   enet_uint8  incomingSessionID;
+   enet_uint8  outgoingSessionID;
+   enet_uint32 mtu;
+   enet_uint32 windowSize;
+   enet_uint32 channelCount;
+   enet_uint32 incomingBandwidth;
+   enet_uint32 outgoingBandwidth;
+   enet_uint32 packetThrottleInterval;
+   enet_uint32 packetThrottleAcceleration;
+   enet_uint32 packetThrottleDeceleration;
+   enet_uint32 connectID;
+} ENET_PACKED ENetProtocolVerifyConnect;
+
+typedef struct _ENetProtocolBandwidthLimit
+{
+   ENetProtocolCommandHeader header;
+   enet_uint32 incomingBandwidth;
+   enet_uint32 outgoingBandwidth;
+} ENET_PACKED ENetProtocolBandwidthLimit;
+
+typedef struct _ENetProtocolThrottleConfigure
+{
+   ENetProtocolCommandHeader header;
+   enet_uint32 packetThrottleInterval;
+   enet_uint32 packetThrottleAcceleration;
+   enet_uint32 packetThrottleDeceleration;
+} ENET_PACKED ENetProtocolThrottleConfigure;
+
+typedef struct _ENetProtocolDisconnect
+{
+   ENetProtocolCommandHeader header;
+   enet_uint32 data;
+} ENET_PACKED ENetProtocolDisconnect;
+
+typedef struct _ENetProtocolPing
+{
+   ENetProtocolCommandHeader header;
+} ENET_PACKED ENetProtocolPing;
+
+typedef struct _ENetProtocolSendReliable
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 dataLength;
+} ENET_PACKED ENetProtocolSendReliable;
+
+typedef struct _ENetProtocolSendUnreliable
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 unreliableSequenceNumber;
+   enet_uint16 dataLength;
+} ENET_PACKED ENetProtocolSendUnreliable;
+
+typedef struct _ENetProtocolSendUnsequenced
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 unsequencedGroup;
+   enet_uint16 dataLength;
+} ENET_PACKED ENetProtocolSendUnsequenced;
+
+typedef struct _ENetProtocolSendFragment
+{
+   ENetProtocolCommandHeader header;
+   enet_uint16 startSequenceNumber;
+   enet_uint16 dataLength;
+   enet_uint32 fragmentCount;
+   enet_uint32 fragmentNumber;
+   enet_uint32 totalLength;
+   enet_uint32 fragmentOffset;
+} ENET_PACKED ENetProtocolSendFragment;
+
+typedef union _ENetProtocol
+{
+   ENetProtocolCommandHeader header;
+   ENetProtocolAcknowledge acknowledge;
+   ENetProtocolConnect connect;
+   ENetProtocolVerifyConnect verifyConnect;
+   ENetProtocolDisconnect disconnect;
+   ENetProtocolPing ping;
+   ENetProtocolSendReliable sendReliable;
+   ENetProtocolSendUnreliable sendUnreliable;
+   ENetProtocolSendUnsequenced sendUnsequenced;
+   ENetProtocolSendFragment sendFragment;
+   ENetProtocolBandwidthLimit bandwidthLimit;
+   ENetProtocolThrottleConfigure throttleConfigure;
+} ENET_PACKED ENetProtocol;
+
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
+
+#endif /* __ENET_PROTOCOL_H__ */
+
diff --git a/Externals/enet/include/enet/time.h b/Externals/enet/include/enet/time.h
new file mode 100644
index 0000000000..c82a546035
--- /dev/null
+++ b/Externals/enet/include/enet/time.h
@@ -0,0 +1,18 @@
+/** 
+ @file  time.h
+ @brief ENet time constants and macros
+*/
+#ifndef __ENET_TIME_H__
+#define __ENET_TIME_H__
+
+#define ENET_TIME_OVERFLOW 86400000
+
+#define ENET_TIME_LESS(a, b) ((a) - (b) >= ENET_TIME_OVERFLOW)
+#define ENET_TIME_GREATER(a, b) ((b) - (a) >= ENET_TIME_OVERFLOW)
+#define ENET_TIME_LESS_EQUAL(a, b) (! ENET_TIME_GREATER (a, b))
+#define ENET_TIME_GREATER_EQUAL(a, b) (! ENET_TIME_LESS (a, b))
+
+#define ENET_TIME_DIFFERENCE(a, b) ((a) - (b) >= ENET_TIME_OVERFLOW ? (b) - (a) : (a) - (b))
+
+#endif /* __ENET_TIME_H__ */
+
diff --git a/Externals/enet/include/enet/types.h b/Externals/enet/include/enet/types.h
new file mode 100644
index 0000000000..ab010a4b13
--- /dev/null
+++ b/Externals/enet/include/enet/types.h
@@ -0,0 +1,13 @@
+/** 
+ @file  types.h
+ @brief type definitions for ENet
+*/
+#ifndef __ENET_TYPES_H__
+#define __ENET_TYPES_H__
+
+typedef unsigned char enet_uint8;       /**< unsigned 8-bit type  */
+typedef unsigned short enet_uint16;     /**< unsigned 16-bit type */
+typedef unsigned int enet_uint32;      /**< unsigned 32-bit type */
+
+#endif /* __ENET_TYPES_H__ */
+
diff --git a/Externals/enet/include/enet/unix.h b/Externals/enet/include/enet/unix.h
new file mode 100644
index 0000000000..a59e340606
--- /dev/null
+++ b/Externals/enet/include/enet/unix.h
@@ -0,0 +1,47 @@
+/** 
+ @file  unix.h
+ @brief ENet Unix header
+*/
+#ifndef __ENET_UNIX_H__
+#define __ENET_UNIX_H__
+
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <unistd.h>
+
+#ifdef MSG_MAXIOVLEN
+#define ENET_BUFFER_MAXIMUM MSG_MAXIOVLEN
+#endif
+
+typedef int ENetSocket;
+
+#define ENET_SOCKET_NULL -1
+
+#define ENET_HOST_TO_NET_16(value) (htons (value)) /**< macro that converts host to net byte-order of a 16-bit value */
+#define ENET_HOST_TO_NET_32(value) (htonl (value)) /**< macro that converts host to net byte-order of a 32-bit value */
+
+#define ENET_NET_TO_HOST_16(value) (ntohs (value)) /**< macro that converts net to host byte-order of a 16-bit value */
+#define ENET_NET_TO_HOST_32(value) (ntohl (value)) /**< macro that converts net to host byte-order of a 32-bit value */
+
+typedef struct
+{
+    void * data;
+    size_t dataLength;
+} ENetBuffer;
+
+#define ENET_CALLBACK
+
+#define ENET_API extern
+
+typedef fd_set ENetSocketSet;
+
+#define ENET_SOCKETSET_EMPTY(sockset)          FD_ZERO (& (sockset))
+#define ENET_SOCKETSET_ADD(sockset, socket)    FD_SET (socket, & (sockset))
+#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLR (socket, & (sockset))
+#define ENET_SOCKETSET_CHECK(sockset, socket)  FD_ISSET (socket, & (sockset))
+    
+#endif /* __ENET_UNIX_H__ */
+
diff --git a/Externals/enet/include/enet/utility.h b/Externals/enet/include/enet/utility.h
new file mode 100644
index 0000000000..e48a476be3
--- /dev/null
+++ b/Externals/enet/include/enet/utility.h
@@ -0,0 +1,12 @@
+/** 
+ @file  utility.h
+ @brief ENet utility header
+*/
+#ifndef __ENET_UTILITY_H__
+#define __ENET_UTILITY_H__
+
+#define ENET_MAX(x, y) ((x) > (y) ? (x) : (y))
+#define ENET_MIN(x, y) ((x) < (y) ? (x) : (y))
+
+#endif /* __ENET_UTILITY_H__ */
+
diff --git a/Externals/enet/include/enet/win32.h b/Externals/enet/include/enet/win32.h
new file mode 100644
index 0000000000..e73ca9d052
--- /dev/null
+++ b/Externals/enet/include/enet/win32.h
@@ -0,0 +1,57 @@
+/** 
+ @file  win32.h
+ @brief ENet Win32 header
+*/
+#ifndef __ENET_WIN32_H__
+#define __ENET_WIN32_H__
+
+#ifdef _MSC_VER
+#ifdef ENET_BUILDING_LIB
+#pragma warning (disable: 4267) // size_t to int conversion
+#pragma warning (disable: 4244) // 64bit to 32bit int
+#pragma warning (disable: 4018) // signed/unsigned mismatch
+#pragma warning (disable: 4146) // unary minus operator applied to unsigned type
+#endif
+#endif
+
+#include <stdlib.h>
+#include <winsock2.h>
+
+typedef SOCKET ENetSocket;
+
+#define ENET_SOCKET_NULL INVALID_SOCKET
+
+#define ENET_HOST_TO_NET_16(value) (htons (value))
+#define ENET_HOST_TO_NET_32(value) (htonl (value))
+
+#define ENET_NET_TO_HOST_16(value) (ntohs (value))
+#define ENET_NET_TO_HOST_32(value) (ntohl (value))
+
+typedef struct
+{
+    size_t dataLength;
+    void * data;
+} ENetBuffer;
+
+#define ENET_CALLBACK __cdecl
+
+#ifdef ENET_DLL
+#ifdef ENET_BUILDING_LIB
+#define ENET_API __declspec( dllexport )
+#else
+#define ENET_API __declspec( dllimport )
+#endif /* ENET_BUILDING_LIB */
+#else /* !ENET_DLL */
+#define ENET_API extern
+#endif /* ENET_DLL */
+
+typedef fd_set ENetSocketSet;
+
+#define ENET_SOCKETSET_EMPTY(sockset)          FD_ZERO (& (sockset))
+#define ENET_SOCKETSET_ADD(sockset, socket)    FD_SET (socket, & (sockset))
+#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLR (socket, & (sockset))
+#define ENET_SOCKETSET_CHECK(sockset, socket)  FD_ISSET (socket, & (sockset))
+
+#endif /* __ENET_WIN32_H__ */
+
+
diff --git a/Externals/enet/libenet.pc.in b/Externals/enet/libenet.pc.in
new file mode 100644
index 0000000000..7af85adbf4
--- /dev/null
+++ b/Externals/enet/libenet.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: Low-latency UDP networking library supporting optional reliability
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lenet
diff --git a/Externals/enet/list.c b/Externals/enet/list.c
new file mode 100644
index 0000000000..1c1a8dfaaf
--- /dev/null
+++ b/Externals/enet/list.c
@@ -0,0 +1,75 @@
+/** 
+ @file list.c
+ @brief ENet linked list functions
+*/
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+
+/** 
+    @defgroup list ENet linked list utility functions
+    @ingroup private
+    @{
+*/
+void
+enet_list_clear (ENetList * list)
+{
+   list -> sentinel.next = & list -> sentinel;
+   list -> sentinel.previous = & list -> sentinel;
+}
+
+ENetListIterator
+enet_list_insert (ENetListIterator position, void * data)
+{
+   ENetListIterator result = (ENetListIterator) data;
+
+   result -> previous = position -> previous;
+   result -> next = position;
+
+   result -> previous -> next = result;
+   position -> previous = result;
+
+   return result;
+}
+
+void *
+enet_list_remove (ENetListIterator position)
+{
+   position -> previous -> next = position -> next;
+   position -> next -> previous = position -> previous;
+
+   return position;
+}
+
+ENetListIterator
+enet_list_move (ENetListIterator position, void * dataFirst, void * dataLast)
+{
+   ENetListIterator first = (ENetListIterator) dataFirst,
+                    last = (ENetListIterator) dataLast;
+
+   first -> previous -> next = last -> next;
+   last -> next -> previous = first -> previous;
+
+   first -> previous = position -> previous;
+   last -> next = position;
+
+   first -> previous -> next = first;
+   position -> previous = last;
+    
+   return first;
+}
+
+size_t
+enet_list_size (ENetList * list)
+{
+   size_t size = 0;
+   ENetListIterator position;
+
+   for (position = enet_list_begin (list);
+        position != enet_list_end (list);
+        position = enet_list_next (position))
+     ++ size;
+   
+   return size;
+}
+
+/** @} */
diff --git a/Source/Android/jni/Android.mk b/Externals/enet/m4/.keep
similarity index 100%
rename from Source/Android/jni/Android.mk
rename to Externals/enet/m4/.keep
diff --git a/Externals/enet/packet.c b/Externals/enet/packet.c
new file mode 100644
index 0000000000..5fa78b28ae
--- /dev/null
+++ b/Externals/enet/packet.c
@@ -0,0 +1,165 @@
+/** 
+ @file  packet.c
+ @brief ENet packet management functions
+*/
+#include <string.h>
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+
+/** @defgroup Packet ENet packet functions 
+    @{ 
+*/
+
+/** Creates a packet that may be sent to a peer.
+    @param data         initial contents of the packet's data; the packet's data will remain uninitialized if data is NULL.
+    @param dataLength   size of the data allocated for this packet
+    @param flags        flags for this packet as described for the ENetPacket structure.
+    @returns the packet on success, NULL on failure
+*/
+ENetPacket *
+enet_packet_create (const void * data, size_t dataLength, enet_uint32 flags)
+{
+    ENetPacket * packet = (ENetPacket *) enet_malloc (sizeof (ENetPacket));
+    if (packet == NULL)
+      return NULL;
+
+    if (flags & ENET_PACKET_FLAG_NO_ALLOCATE)
+      packet -> data = (enet_uint8 *) data;
+    else
+    if (dataLength <= 0)
+      packet -> data = NULL;
+    else
+    {
+       packet -> data = (enet_uint8 *) enet_malloc (dataLength);
+       if (packet -> data == NULL)
+       {
+          enet_free (packet);
+          return NULL;
+       }
+
+       if (data != NULL)
+         memcpy (packet -> data, data, dataLength);
+    }
+
+    packet -> referenceCount = 0;
+    packet -> flags = flags;
+    packet -> dataLength = dataLength;
+    packet -> freeCallback = NULL;
+    packet -> userData = NULL;
+
+    return packet;
+}
+
+/** Destroys the packet and deallocates its data.
+    @param packet packet to be destroyed
+*/
+void
+enet_packet_destroy (ENetPacket * packet)
+{
+    if (packet == NULL)
+      return;
+
+    if (packet -> freeCallback != NULL)
+      (* packet -> freeCallback) (packet);
+    if (! (packet -> flags & ENET_PACKET_FLAG_NO_ALLOCATE) &&
+        packet -> data != NULL)
+      enet_free (packet -> data);
+    enet_free (packet);
+}
+
+/** Attempts to resize the data in the packet to length specified in the 
+    dataLength parameter 
+    @param packet packet to resize
+    @param dataLength new size for the packet data
+    @returns 0 on success, < 0 on failure
+*/
+int
+enet_packet_resize (ENetPacket * packet, size_t dataLength)
+{
+    enet_uint8 * newData;
+   
+    if (dataLength <= packet -> dataLength || (packet -> flags & ENET_PACKET_FLAG_NO_ALLOCATE))
+    {
+       packet -> dataLength = dataLength;
+
+       return 0;
+    }
+
+    newData = (enet_uint8 *) enet_malloc (dataLength);
+    if (newData == NULL)
+      return -1;
+
+    memcpy (newData, packet -> data, packet -> dataLength);
+    enet_free (packet -> data);
+    
+    packet -> data = newData;
+    packet -> dataLength = dataLength;
+
+    return 0;
+}
+
+static int initializedCRC32 = 0;
+static enet_uint32 crcTable [256];
+
+static enet_uint32 
+reflect_crc (int val, int bits)
+{
+    int result = 0, bit;
+
+    for (bit = 0; bit < bits; bit ++)
+    {
+        if(val & 1) result |= 1 << (bits - 1 - bit); 
+        val >>= 1;
+    }
+
+    return result;
+}
+
+static void 
+initialize_crc32 (void)
+{
+    int byte;
+
+    for (byte = 0; byte < 256; ++ byte)
+    {
+        enet_uint32 crc = reflect_crc (byte, 8) << 24;
+        int offset;
+
+        for(offset = 0; offset < 8; ++ offset)
+        {
+            if (crc & 0x80000000)
+                crc = (crc << 1) ^ 0x04c11db7;
+            else
+                crc <<= 1;
+        }
+
+        crcTable [byte] = reflect_crc (crc, 32);
+    }
+
+    initializedCRC32 = 1;
+}
+    
+enet_uint32
+enet_crc32 (const ENetBuffer * buffers, size_t bufferCount)
+{
+    enet_uint32 crc = 0xFFFFFFFF;
+    
+    if (! initializedCRC32) initialize_crc32 ();
+
+    while (bufferCount -- > 0)
+    {
+        const enet_uint8 * data = (const enet_uint8 *) buffers -> data,
+                         * dataEnd = & data [buffers -> dataLength];
+
+        while (data < dataEnd)
+        {
+            crc = (crc >> 8) ^ crcTable [(crc & 0xFF) ^ *data++];        
+        }
+
+        ++ buffers;
+    }
+
+    return ENET_HOST_TO_NET_32 (~ crc);
+}
+
+/** @} */
diff --git a/Externals/enet/peer.c b/Externals/enet/peer.c
new file mode 100644
index 0000000000..e2d0872bd3
--- /dev/null
+++ b/Externals/enet/peer.c
@@ -0,0 +1,1004 @@
+/** 
+ @file  peer.c
+ @brief ENet peer management functions
+*/
+#include <string.h>
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+
+/** @defgroup peer ENet peer functions 
+    @{
+*/
+
+/** Configures throttle parameter for a peer.
+
+    Unreliable packets are dropped by ENet in response to the varying conditions
+    of the Internet connection to the peer.  The throttle represents a probability
+    that an unreliable packet should not be dropped and thus sent by ENet to the peer.
+    The lowest mean round trip time from the sending of a reliable packet to the
+    receipt of its acknowledgement is measured over an amount of time specified by
+    the interval parameter in milliseconds.  If a measured round trip time happens to
+    be significantly less than the mean round trip time measured over the interval, 
+    then the throttle probability is increased to allow more traffic by an amount
+    specified in the acceleration parameter, which is a ratio to the ENET_PEER_PACKET_THROTTLE_SCALE
+    constant.  If a measured round trip time happens to be significantly greater than
+    the mean round trip time measured over the interval, then the throttle probability
+    is decreased to limit traffic by an amount specified in the deceleration parameter, which
+    is a ratio to the ENET_PEER_PACKET_THROTTLE_SCALE constant.  When the throttle has
+    a value of ENET_PEER_PACKET_THROTTLE_SCALE, no unreliable packets are dropped by 
+    ENet, and so 100% of all unreliable packets will be sent.  When the throttle has a
+    value of 0, all unreliable packets are dropped by ENet, and so 0% of all unreliable
+    packets will be sent.  Intermediate values for the throttle represent intermediate
+    probabilities between 0% and 100% of unreliable packets being sent.  The bandwidth
+    limits of the local and foreign hosts are taken into account to determine a 
+    sensible limit for the throttle probability above which it should not raise even in
+    the best of conditions.
+
+    @param peer peer to configure 
+    @param interval interval, in milliseconds, over which to measure lowest mean RTT; the default value is ENET_PEER_PACKET_THROTTLE_INTERVAL.
+    @param acceleration rate at which to increase the throttle probability as mean RTT declines
+    @param deceleration rate at which to decrease the throttle probability as mean RTT increases
+*/
+void
+enet_peer_throttle_configure (ENetPeer * peer, enet_uint32 interval, enet_uint32 acceleration, enet_uint32 deceleration)
+{
+    ENetProtocol command;
+
+    peer -> packetThrottleInterval = interval;
+    peer -> packetThrottleAcceleration = acceleration;
+    peer -> packetThrottleDeceleration = deceleration;
+
+    command.header.command = ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+    command.header.channelID = 0xFF;
+
+    command.throttleConfigure.packetThrottleInterval = ENET_HOST_TO_NET_32 (interval);
+    command.throttleConfigure.packetThrottleAcceleration = ENET_HOST_TO_NET_32 (acceleration);
+    command.throttleConfigure.packetThrottleDeceleration = ENET_HOST_TO_NET_32 (deceleration);
+
+    enet_peer_queue_outgoing_command (peer, & command, NULL, 0, 0);
+}
+
+int
+enet_peer_throttle (ENetPeer * peer, enet_uint32 rtt)
+{
+    if (peer -> lastRoundTripTime <= peer -> lastRoundTripTimeVariance)
+    {
+        peer -> packetThrottle = peer -> packetThrottleLimit;
+    }
+    else
+    if (rtt < peer -> lastRoundTripTime)
+    {
+        peer -> packetThrottle += peer -> packetThrottleAcceleration;
+
+        if (peer -> packetThrottle > peer -> packetThrottleLimit)
+          peer -> packetThrottle = peer -> packetThrottleLimit;
+
+        return 1;
+    }
+    else
+    if (rtt > peer -> lastRoundTripTime + 2 * peer -> lastRoundTripTimeVariance)
+    {
+        if (peer -> packetThrottle > peer -> packetThrottleDeceleration)
+          peer -> packetThrottle -= peer -> packetThrottleDeceleration;
+        else
+          peer -> packetThrottle = 0;
+
+        return -1;
+    }
+
+    return 0;
+}
+
+/** Queues a packet to be sent.
+    @param peer destination for the packet
+    @param channelID channel on which to send
+    @param packet packet to send
+    @retval 0 on success
+    @retval < 0 on failure
+*/
+int
+enet_peer_send (ENetPeer * peer, enet_uint8 channelID, ENetPacket * packet)
+{
+   ENetChannel * channel = & peer -> channels [channelID];
+   ENetProtocol command;
+   size_t fragmentLength;
+
+   if (peer -> state != ENET_PEER_STATE_CONNECTED ||
+       channelID >= peer -> channelCount ||
+       packet -> dataLength > peer -> host -> maximumPacketSize)
+     return -1;
+
+   fragmentLength = peer -> mtu - sizeof (ENetProtocolHeader) - sizeof (ENetProtocolSendFragment);
+   if (peer -> host -> checksum != NULL)
+     fragmentLength -= sizeof(enet_uint32);
+
+   if (packet -> dataLength > fragmentLength)
+   {
+      enet_uint32 fragmentCount = (packet -> dataLength + fragmentLength - 1) / fragmentLength,
+             fragmentNumber,
+             fragmentOffset;
+      enet_uint8 commandNumber;
+      enet_uint16 startSequenceNumber; 
+      ENetList fragments;
+      ENetOutgoingCommand * fragment;
+
+      if (fragmentCount > ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT)
+        return -1;
+
+      if ((packet -> flags & (ENET_PACKET_FLAG_RELIABLE | ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT)) == ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT &&
+          channel -> outgoingUnreliableSequenceNumber < 0xFFFF)
+      {
+         commandNumber = ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT;
+         startSequenceNumber = ENET_HOST_TO_NET_16 (channel -> outgoingUnreliableSequenceNumber + 1);
+      }
+      else
+      {
+         commandNumber = ENET_PROTOCOL_COMMAND_SEND_FRAGMENT | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+         startSequenceNumber = ENET_HOST_TO_NET_16 (channel -> outgoingReliableSequenceNumber + 1);
+      }
+        
+      enet_list_clear (& fragments);
+
+      for (fragmentNumber = 0,
+             fragmentOffset = 0;
+           fragmentOffset < packet -> dataLength;
+           ++ fragmentNumber,
+             fragmentOffset += fragmentLength)
+      {
+         if (packet -> dataLength - fragmentOffset < fragmentLength)
+           fragmentLength = packet -> dataLength - fragmentOffset;
+
+         fragment = (ENetOutgoingCommand *) enet_malloc (sizeof (ENetOutgoingCommand));
+         if (fragment == NULL)
+         {
+            while (! enet_list_empty (& fragments))
+            {
+               fragment = (ENetOutgoingCommand *) enet_list_remove (enet_list_begin (& fragments));
+               
+               enet_free (fragment);
+            }
+            
+            return -1;
+         }
+         
+         fragment -> fragmentOffset = fragmentOffset;
+         fragment -> fragmentLength = fragmentLength;
+         fragment -> packet = packet;
+         fragment -> command.header.command = commandNumber;
+         fragment -> command.header.channelID = channelID;
+         fragment -> command.sendFragment.startSequenceNumber = startSequenceNumber;
+         fragment -> command.sendFragment.dataLength = ENET_HOST_TO_NET_16 (fragmentLength);
+         fragment -> command.sendFragment.fragmentCount = ENET_HOST_TO_NET_32 (fragmentCount);
+         fragment -> command.sendFragment.fragmentNumber = ENET_HOST_TO_NET_32 (fragmentNumber);
+         fragment -> command.sendFragment.totalLength = ENET_HOST_TO_NET_32 (packet -> dataLength);
+         fragment -> command.sendFragment.fragmentOffset = ENET_NET_TO_HOST_32 (fragmentOffset);
+        
+         enet_list_insert (enet_list_end (& fragments), fragment);
+      }
+
+      packet -> referenceCount += fragmentNumber;
+
+      while (! enet_list_empty (& fragments))
+      {
+         fragment = (ENetOutgoingCommand *) enet_list_remove (enet_list_begin (& fragments));
+ 
+         enet_peer_setup_outgoing_command (peer, fragment);
+      }
+
+      return 0;
+   }
+
+   command.header.channelID = channelID;
+
+   if ((packet -> flags & (ENET_PACKET_FLAG_RELIABLE | ENET_PACKET_FLAG_UNSEQUENCED)) == ENET_PACKET_FLAG_UNSEQUENCED)
+   {
+      command.header.command = ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED | ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED;
+      command.sendUnsequenced.dataLength = ENET_HOST_TO_NET_16 (packet -> dataLength);
+   }
+   else 
+   if (packet -> flags & ENET_PACKET_FLAG_RELIABLE || channel -> outgoingUnreliableSequenceNumber >= 0xFFFF)
+   {
+      command.header.command = ENET_PROTOCOL_COMMAND_SEND_RELIABLE | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+      command.sendReliable.dataLength = ENET_HOST_TO_NET_16 (packet -> dataLength);
+   }
+   else
+   {
+      command.header.command = ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE;
+      command.sendUnreliable.dataLength = ENET_HOST_TO_NET_16 (packet -> dataLength);
+   }
+
+   if (enet_peer_queue_outgoing_command (peer, & command, packet, 0, packet -> dataLength) == NULL)
+     return -1;
+
+   return 0;
+}
+
+/** Attempts to dequeue any incoming queued packet.
+    @param peer peer to dequeue packets from
+    @param channelID holds the channel ID of the channel the packet was received on success
+    @returns a pointer to the packet, or NULL if there are no available incoming queued packets
+*/
+ENetPacket *
+enet_peer_receive (ENetPeer * peer, enet_uint8 * channelID)
+{
+   ENetIncomingCommand * incomingCommand;
+   ENetPacket * packet;
+   
+   if (enet_list_empty (& peer -> dispatchedCommands))
+     return NULL;
+
+   incomingCommand = (ENetIncomingCommand *) enet_list_remove (enet_list_begin (& peer -> dispatchedCommands));
+
+   if (channelID != NULL)
+     * channelID = incomingCommand -> command.header.channelID;
+
+   packet = incomingCommand -> packet;
+
+   -- packet -> referenceCount;
+
+   if (incomingCommand -> fragments != NULL)
+     enet_free (incomingCommand -> fragments);
+
+   enet_free (incomingCommand);
+
+   peer -> totalWaitingData -= packet -> dataLength;
+
+   return packet;
+}
+
+static void
+enet_peer_reset_outgoing_commands (ENetList * queue)
+{
+    ENetOutgoingCommand * outgoingCommand;
+
+    while (! enet_list_empty (queue))
+    {
+       outgoingCommand = (ENetOutgoingCommand *) enet_list_remove (enet_list_begin (queue));
+
+       if (outgoingCommand -> packet != NULL)
+       {
+          -- outgoingCommand -> packet -> referenceCount;
+
+          if (outgoingCommand -> packet -> referenceCount == 0)
+            enet_packet_destroy (outgoingCommand -> packet);
+       }
+
+       enet_free (outgoingCommand);
+    }
+}
+
+static void
+enet_peer_remove_incoming_commands (ENetList * queue, ENetListIterator startCommand, ENetListIterator endCommand)
+{
+    ENetListIterator currentCommand;    
+    
+    for (currentCommand = startCommand; currentCommand != endCommand; )
+    {
+       ENetIncomingCommand * incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+       currentCommand = enet_list_next (currentCommand);
+
+       enet_list_remove (& incomingCommand -> incomingCommandList);
+ 
+       if (incomingCommand -> packet != NULL)
+       {
+          -- incomingCommand -> packet -> referenceCount;
+
+          if (incomingCommand -> packet -> referenceCount == 0)
+            enet_packet_destroy (incomingCommand -> packet);
+       }
+
+       if (incomingCommand -> fragments != NULL)
+         enet_free (incomingCommand -> fragments);
+
+       enet_free (incomingCommand);
+    }
+}
+
+static void
+enet_peer_reset_incoming_commands (ENetList * queue)
+{
+    enet_peer_remove_incoming_commands(queue, enet_list_begin (queue), enet_list_end (queue));
+}
+ 
+void
+enet_peer_reset_queues (ENetPeer * peer)
+{
+    ENetChannel * channel;
+
+    if (peer -> needsDispatch)
+    {
+       enet_list_remove (& peer -> dispatchList);
+
+       peer -> needsDispatch = 0;
+    }
+
+    while (! enet_list_empty (& peer -> acknowledgements))
+      enet_free (enet_list_remove (enet_list_begin (& peer -> acknowledgements)));
+
+    enet_peer_reset_outgoing_commands (& peer -> sentReliableCommands);
+    enet_peer_reset_outgoing_commands (& peer -> sentUnreliableCommands);
+    enet_peer_reset_outgoing_commands (& peer -> outgoingReliableCommands);
+    enet_peer_reset_outgoing_commands (& peer -> outgoingUnreliableCommands);
+    enet_peer_reset_incoming_commands (& peer -> dispatchedCommands);
+
+    if (peer -> channels != NULL && peer -> channelCount > 0)
+    {
+        for (channel = peer -> channels;
+             channel < & peer -> channels [peer -> channelCount];
+             ++ channel)
+        {
+            enet_peer_reset_incoming_commands (& channel -> incomingReliableCommands);
+            enet_peer_reset_incoming_commands (& channel -> incomingUnreliableCommands);
+        }
+
+        enet_free (peer -> channels);
+    }
+
+    peer -> channels = NULL;
+    peer -> channelCount = 0;
+}
+
+void
+enet_peer_on_connect (ENetPeer * peer)
+{
+    if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+    {
+        if (peer -> incomingBandwidth != 0)
+          ++ peer -> host -> bandwidthLimitedPeers;
+
+        ++ peer -> host -> connectedPeers;
+    }
+}
+
+void
+enet_peer_on_disconnect (ENetPeer * peer)
+{
+    if (peer -> state == ENET_PEER_STATE_CONNECTED || peer -> state == ENET_PEER_STATE_DISCONNECT_LATER)
+    {
+        if (peer -> incomingBandwidth != 0)
+          -- peer -> host -> bandwidthLimitedPeers;
+
+        -- peer -> host -> connectedPeers;
+    }
+}
+
+/** Forcefully disconnects a peer.
+    @param peer peer to forcefully disconnect
+    @remarks The foreign host represented by the peer is not notified of the disconnection and will timeout
+    on its connection to the local host.
+*/
+void
+enet_peer_reset (ENetPeer * peer)
+{
+    enet_peer_on_disconnect (peer);
+        
+    peer -> outgoingPeerID = ENET_PROTOCOL_MAXIMUM_PEER_ID;
+    peer -> connectID = 0;
+
+    peer -> state = ENET_PEER_STATE_DISCONNECTED;
+
+    peer -> incomingBandwidth = 0;
+    peer -> outgoingBandwidth = 0;
+    peer -> incomingBandwidthThrottleEpoch = 0;
+    peer -> outgoingBandwidthThrottleEpoch = 0;
+    peer -> incomingDataTotal = 0;
+    peer -> outgoingDataTotal = 0;
+    peer -> lastSendTime = 0;
+    peer -> lastReceiveTime = 0;
+    peer -> nextTimeout = 0;
+    peer -> earliestTimeout = 0;
+    peer -> packetLossEpoch = 0;
+    peer -> packetsSent = 0;
+    peer -> packetsLost = 0;
+    peer -> packetLoss = 0;
+    peer -> packetLossVariance = 0;
+    peer -> packetThrottle = ENET_PEER_DEFAULT_PACKET_THROTTLE;
+    peer -> packetThrottleLimit = ENET_PEER_PACKET_THROTTLE_SCALE;
+    peer -> packetThrottleCounter = 0;
+    peer -> packetThrottleEpoch = 0;
+    peer -> packetThrottleAcceleration = ENET_PEER_PACKET_THROTTLE_ACCELERATION;
+    peer -> packetThrottleDeceleration = ENET_PEER_PACKET_THROTTLE_DECELERATION;
+    peer -> packetThrottleInterval = ENET_PEER_PACKET_THROTTLE_INTERVAL;
+    peer -> pingInterval = ENET_PEER_PING_INTERVAL;
+    peer -> timeoutLimit = ENET_PEER_TIMEOUT_LIMIT;
+    peer -> timeoutMinimum = ENET_PEER_TIMEOUT_MINIMUM;
+    peer -> timeoutMaximum = ENET_PEER_TIMEOUT_MAXIMUM;
+    peer -> lastRoundTripTime = ENET_PEER_DEFAULT_ROUND_TRIP_TIME;
+    peer -> lowestRoundTripTime = ENET_PEER_DEFAULT_ROUND_TRIP_TIME;
+    peer -> lastRoundTripTimeVariance = 0;
+    peer -> highestRoundTripTimeVariance = 0;
+    peer -> roundTripTime = ENET_PEER_DEFAULT_ROUND_TRIP_TIME;
+    peer -> roundTripTimeVariance = 0;
+    peer -> mtu = peer -> host -> mtu;
+    peer -> reliableDataInTransit = 0;
+    peer -> outgoingReliableSequenceNumber = 0;
+    peer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+    peer -> incomingUnsequencedGroup = 0;
+    peer -> outgoingUnsequencedGroup = 0;
+    peer -> eventData = 0;
+    peer -> totalWaitingData = 0;
+
+    memset (peer -> unsequencedWindow, 0, sizeof (peer -> unsequencedWindow));
+    
+    enet_peer_reset_queues (peer);
+}
+
+/** Sends a ping request to a peer.
+    @param peer destination for the ping request
+    @remarks ping requests factor into the mean round trip time as designated by the 
+    roundTripTime field in the ENetPeer structure.  ENet automatically pings all connected
+    peers at regular intervals, however, this function may be called to ensure more
+    frequent ping requests.
+*/
+void
+enet_peer_ping (ENetPeer * peer)
+{
+    ENetProtocol command;
+
+    if (peer -> state != ENET_PEER_STATE_CONNECTED)
+      return;
+
+    command.header.command = ENET_PROTOCOL_COMMAND_PING | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+    command.header.channelID = 0xFF;
+   
+    enet_peer_queue_outgoing_command (peer, & command, NULL, 0, 0);
+}
+
+/** Sets the interval at which pings will be sent to a peer. 
+    
+    Pings are used both to monitor the liveness of the connection and also to dynamically
+    adjust the throttle during periods of low traffic so that the throttle has reasonable
+    responsiveness during traffic spikes.
+
+    @param peer the peer to adjust
+    @param pingInterval the interval at which to send pings; defaults to ENET_PEER_PING_INTERVAL if 0
+*/
+void
+enet_peer_ping_interval (ENetPeer * peer, enet_uint32 pingInterval)
+{
+    peer -> pingInterval = pingInterval ? pingInterval : ENET_PEER_PING_INTERVAL;
+}
+
+/** Sets the timeout parameters for a peer.
+
+    The timeout parameter control how and when a peer will timeout from a failure to acknowledge
+    reliable traffic. Timeout values use an exponential backoff mechanism, where if a reliable
+    packet is not acknowledge within some multiple of the average RTT plus a variance tolerance, 
+    the timeout will be doubled until it reaches a set limit. If the timeout is thus at this
+    limit and reliable packets have been sent but not acknowledged within a certain minimum time 
+    period, the peer will be disconnected. Alternatively, if reliable packets have been sent
+    but not acknowledged for a certain maximum time period, the peer will be disconnected regardless
+    of the current timeout limit value.
+    
+    @param peer the peer to adjust
+    @param timeoutLimit the timeout limit; defaults to ENET_PEER_TIMEOUT_LIMIT if 0
+    @param timeoutMinimum the timeout minimum; defaults to ENET_PEER_TIMEOUT_MINIMUM if 0
+    @param timeoutMaximum the timeout maximum; defaults to ENET_PEER_TIMEOUT_MAXIMUM if 0
+*/
+
+void
+enet_peer_timeout (ENetPeer * peer, enet_uint32 timeoutLimit, enet_uint32 timeoutMinimum, enet_uint32 timeoutMaximum)
+{
+    peer -> timeoutLimit = timeoutLimit ? timeoutLimit : ENET_PEER_TIMEOUT_LIMIT;
+    peer -> timeoutMinimum = timeoutMinimum ? timeoutMinimum : ENET_PEER_TIMEOUT_MINIMUM;
+    peer -> timeoutMaximum = timeoutMaximum ? timeoutMaximum : ENET_PEER_TIMEOUT_MAXIMUM;
+}
+
+/** Force an immediate disconnection from a peer.
+    @param peer peer to disconnect
+    @param data data describing the disconnection
+    @remarks No ENET_EVENT_DISCONNECT event will be generated. The foreign peer is not
+    guaranteed to receive the disconnect notification, and is reset immediately upon
+    return from this function.
+*/
+void
+enet_peer_disconnect_now (ENetPeer * peer, enet_uint32 data)
+{
+    ENetProtocol command;
+
+    if (peer -> state == ENET_PEER_STATE_DISCONNECTED)
+      return;
+
+    if (peer -> state != ENET_PEER_STATE_ZOMBIE &&
+        peer -> state != ENET_PEER_STATE_DISCONNECTING)
+    {
+        enet_peer_reset_queues (peer);
+
+        command.header.command = ENET_PROTOCOL_COMMAND_DISCONNECT | ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED;
+        command.header.channelID = 0xFF;
+        command.disconnect.data = ENET_HOST_TO_NET_32 (data);
+
+        enet_peer_queue_outgoing_command (peer, & command, NULL, 0, 0);
+
+        enet_host_flush (peer -> host);
+    }
+
+    enet_peer_reset (peer);
+}
+
+/** Request a disconnection from a peer.
+    @param peer peer to request a disconnection
+    @param data data describing the disconnection
+    @remarks An ENET_EVENT_DISCONNECT event will be generated by enet_host_service()
+    once the disconnection is complete.
+*/
+void
+enet_peer_disconnect (ENetPeer * peer, enet_uint32 data)
+{
+    ENetProtocol command;
+
+    if (peer -> state == ENET_PEER_STATE_DISCONNECTING ||
+        peer -> state == ENET_PEER_STATE_DISCONNECTED ||
+        peer -> state == ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT ||
+        peer -> state == ENET_PEER_STATE_ZOMBIE)
+      return;
+
+    enet_peer_reset_queues (peer);
+
+    command.header.command = ENET_PROTOCOL_COMMAND_DISCONNECT;
+    command.header.channelID = 0xFF;
+    command.disconnect.data = ENET_HOST_TO_NET_32 (data);
+
+    if (peer -> state == ENET_PEER_STATE_CONNECTED || peer -> state == ENET_PEER_STATE_DISCONNECT_LATER)
+      command.header.command |= ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+    else
+      command.header.command |= ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED;      
+    
+    enet_peer_queue_outgoing_command (peer, & command, NULL, 0, 0);
+
+    if (peer -> state == ENET_PEER_STATE_CONNECTED || peer -> state == ENET_PEER_STATE_DISCONNECT_LATER)
+    {
+        enet_peer_on_disconnect (peer);
+
+        peer -> state = ENET_PEER_STATE_DISCONNECTING;
+    }
+    else
+    {
+        enet_host_flush (peer -> host);
+        enet_peer_reset (peer);
+    }
+}
+
+/** Request a disconnection from a peer, but only after all queued outgoing packets are sent.
+    @param peer peer to request a disconnection
+    @param data data describing the disconnection
+    @remarks An ENET_EVENT_DISCONNECT event will be generated by enet_host_service()
+    once the disconnection is complete.
+*/
+void
+enet_peer_disconnect_later (ENetPeer * peer, enet_uint32 data)
+{   
+    if ((peer -> state == ENET_PEER_STATE_CONNECTED || peer -> state == ENET_PEER_STATE_DISCONNECT_LATER) && 
+        ! (enet_list_empty (& peer -> outgoingReliableCommands) &&
+           enet_list_empty (& peer -> outgoingUnreliableCommands) && 
+           enet_list_empty (& peer -> sentReliableCommands)))
+    {
+        peer -> state = ENET_PEER_STATE_DISCONNECT_LATER;
+        peer -> eventData = data;
+    }
+    else
+      enet_peer_disconnect (peer, data);
+}
+
+ENetAcknowledgement *
+enet_peer_queue_acknowledgement (ENetPeer * peer, const ENetProtocol * command, enet_uint16 sentTime)
+{
+    ENetAcknowledgement * acknowledgement;
+
+    if (command -> header.channelID < peer -> channelCount)
+    {
+        ENetChannel * channel = & peer -> channels [command -> header.channelID];
+        enet_uint16 reliableWindow = command -> header.reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE,
+                    currentWindow = channel -> incomingReliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+
+        if (command -> header.reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+           reliableWindow += ENET_PEER_RELIABLE_WINDOWS;
+
+        if (reliableWindow >= currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS - 1 && reliableWindow <= currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS)
+          return NULL;
+    }
+
+    acknowledgement = (ENetAcknowledgement *) enet_malloc (sizeof (ENetAcknowledgement));
+    if (acknowledgement == NULL)
+      return NULL;
+
+    peer -> outgoingDataTotal += sizeof (ENetProtocolAcknowledge);
+
+    acknowledgement -> sentTime = sentTime;
+    acknowledgement -> command = * command;
+    
+    enet_list_insert (enet_list_end (& peer -> acknowledgements), acknowledgement);
+    
+    return acknowledgement;
+}
+
+void
+enet_peer_setup_outgoing_command (ENetPeer * peer, ENetOutgoingCommand * outgoingCommand)
+{
+    ENetChannel * channel = & peer -> channels [outgoingCommand -> command.header.channelID];
+    
+    peer -> outgoingDataTotal += enet_protocol_command_size (outgoingCommand -> command.header.command) + outgoingCommand -> fragmentLength;
+
+    if (outgoingCommand -> command.header.channelID == 0xFF)
+    {
+       ++ peer -> outgoingReliableSequenceNumber;
+
+       outgoingCommand -> reliableSequenceNumber = peer -> outgoingReliableSequenceNumber;
+       outgoingCommand -> unreliableSequenceNumber = 0;
+    }
+    else
+    if (outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE)
+    {
+       ++ channel -> outgoingReliableSequenceNumber;
+       channel -> outgoingUnreliableSequenceNumber = 0;
+
+       outgoingCommand -> reliableSequenceNumber = channel -> outgoingReliableSequenceNumber;
+       outgoingCommand -> unreliableSequenceNumber = 0;
+    }
+    else
+    if (outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED)
+    {
+       ++ peer -> outgoingUnsequencedGroup;
+
+       outgoingCommand -> reliableSequenceNumber = 0;
+       outgoingCommand -> unreliableSequenceNumber = 0;
+    }
+    else
+    {
+       if (outgoingCommand -> fragmentOffset == 0)
+         ++ channel -> outgoingUnreliableSequenceNumber;
+        
+       outgoingCommand -> reliableSequenceNumber = channel -> outgoingReliableSequenceNumber;
+       outgoingCommand -> unreliableSequenceNumber = channel -> outgoingUnreliableSequenceNumber;
+    }
+   
+    outgoingCommand -> sendAttempts = 0;
+    outgoingCommand -> sentTime = 0;
+    outgoingCommand -> roundTripTimeout = 0;
+    outgoingCommand -> roundTripTimeoutLimit = 0;
+    outgoingCommand -> command.header.reliableSequenceNumber = ENET_HOST_TO_NET_16 (outgoingCommand -> reliableSequenceNumber);
+
+    switch (outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK)
+    {
+    case ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE:
+        outgoingCommand -> command.sendUnreliable.unreliableSequenceNumber = ENET_HOST_TO_NET_16 (outgoingCommand -> unreliableSequenceNumber);
+        break;
+
+    case ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED:
+        outgoingCommand -> command.sendUnsequenced.unsequencedGroup = ENET_HOST_TO_NET_16 (peer -> outgoingUnsequencedGroup);
+        break;
+    
+    default:
+        break;
+    }
+
+    if (outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE)
+      enet_list_insert (enet_list_end (& peer -> outgoingReliableCommands), outgoingCommand);
+    else
+      enet_list_insert (enet_list_end (& peer -> outgoingUnreliableCommands), outgoingCommand);
+}
+
+ENetOutgoingCommand *
+enet_peer_queue_outgoing_command (ENetPeer * peer, const ENetProtocol * command, ENetPacket * packet, enet_uint32 offset, enet_uint16 length)
+{
+    ENetOutgoingCommand * outgoingCommand = (ENetOutgoingCommand *) enet_malloc (sizeof (ENetOutgoingCommand));
+    if (outgoingCommand == NULL)
+      return NULL;
+
+    outgoingCommand -> command = * command;
+    outgoingCommand -> fragmentOffset = offset;
+    outgoingCommand -> fragmentLength = length;
+    outgoingCommand -> packet = packet;
+    if (packet != NULL)
+      ++ packet -> referenceCount;
+
+    enet_peer_setup_outgoing_command (peer, outgoingCommand);
+
+    return outgoingCommand;
+}
+
+void
+enet_peer_dispatch_incoming_unreliable_commands (ENetPeer * peer, ENetChannel * channel)
+{
+    ENetListIterator droppedCommand, startCommand, currentCommand;
+
+    for (droppedCommand = startCommand = currentCommand = enet_list_begin (& channel -> incomingUnreliableCommands);
+         currentCommand != enet_list_end (& channel -> incomingUnreliableCommands);
+         currentCommand = enet_list_next (currentCommand))
+    {
+       ENetIncomingCommand * incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+       if ((incomingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK) == ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED)
+         continue;
+
+       if (incomingCommand -> reliableSequenceNumber == channel -> incomingReliableSequenceNumber)
+       {
+          if (incomingCommand -> fragmentsRemaining <= 0)
+          {
+             channel -> incomingUnreliableSequenceNumber = incomingCommand -> unreliableSequenceNumber;
+             continue;
+          }
+
+          if (startCommand != currentCommand)
+          {
+             enet_list_move (enet_list_end (& peer -> dispatchedCommands), startCommand, enet_list_previous (currentCommand));
+
+             if (! peer -> needsDispatch)
+             {
+                enet_list_insert (enet_list_end (& peer -> host -> dispatchQueue), & peer -> dispatchList);
+
+                peer -> needsDispatch = 1;
+             }
+
+             droppedCommand = currentCommand;
+          }
+          else
+          if (droppedCommand != currentCommand)
+            droppedCommand = enet_list_previous (currentCommand);
+       }
+       else 
+       {
+          enet_uint16 reliableWindow = incomingCommand -> reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE,
+                      currentWindow = channel -> incomingReliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+          if (incomingCommand -> reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+            reliableWindow += ENET_PEER_RELIABLE_WINDOWS;
+          if (reliableWindow >= currentWindow && reliableWindow < currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS - 1)
+            break;
+
+          droppedCommand = enet_list_next (currentCommand);
+
+          if (startCommand != currentCommand)
+          {
+             enet_list_move (enet_list_end (& peer -> dispatchedCommands), startCommand, enet_list_previous (currentCommand));
+
+             if (! peer -> needsDispatch)
+             {
+                enet_list_insert (enet_list_end (& peer -> host -> dispatchQueue), & peer -> dispatchList);
+
+                peer -> needsDispatch = 1;
+             }
+          }
+       }
+          
+       startCommand = enet_list_next (currentCommand);
+    }
+
+    if (startCommand != currentCommand)
+    {
+       enet_list_move (enet_list_end (& peer -> dispatchedCommands), startCommand, enet_list_previous (currentCommand));
+
+       if (! peer -> needsDispatch)
+       {
+           enet_list_insert (enet_list_end (& peer -> host -> dispatchQueue), & peer -> dispatchList);
+
+           peer -> needsDispatch = 1;
+       }
+
+       droppedCommand = currentCommand;
+    }
+
+    enet_peer_remove_incoming_commands (& channel -> incomingUnreliableCommands, enet_list_begin (& channel -> incomingUnreliableCommands), droppedCommand);
+}
+
+void
+enet_peer_dispatch_incoming_reliable_commands (ENetPeer * peer, ENetChannel * channel)
+{
+    ENetListIterator currentCommand;
+
+    for (currentCommand = enet_list_begin (& channel -> incomingReliableCommands);
+         currentCommand != enet_list_end (& channel -> incomingReliableCommands);
+         currentCommand = enet_list_next (currentCommand))
+    {
+       ENetIncomingCommand * incomingCommand = (ENetIncomingCommand *) currentCommand;
+         
+       if (incomingCommand -> fragmentsRemaining > 0 ||
+           incomingCommand -> reliableSequenceNumber != (enet_uint16) (channel -> incomingReliableSequenceNumber + 1))
+         break;
+
+       channel -> incomingReliableSequenceNumber = incomingCommand -> reliableSequenceNumber;
+
+       if (incomingCommand -> fragmentCount > 0)
+         channel -> incomingReliableSequenceNumber += incomingCommand -> fragmentCount - 1;
+    } 
+
+    if (currentCommand == enet_list_begin (& channel -> incomingReliableCommands))
+      return;
+
+    channel -> incomingUnreliableSequenceNumber = 0;
+
+    enet_list_move (enet_list_end (& peer -> dispatchedCommands), enet_list_begin (& channel -> incomingReliableCommands), enet_list_previous (currentCommand));
+
+    if (! peer -> needsDispatch)
+    {
+       enet_list_insert (enet_list_end (& peer -> host -> dispatchQueue), & peer -> dispatchList);
+
+       peer -> needsDispatch = 1;
+    }
+
+    if (! enet_list_empty (& channel -> incomingUnreliableCommands))
+       enet_peer_dispatch_incoming_unreliable_commands (peer, channel);
+}
+
+ENetIncomingCommand *
+enet_peer_queue_incoming_command (ENetPeer * peer, const ENetProtocol * command, const void * data, size_t dataLength, enet_uint32 flags, enet_uint32 fragmentCount)
+{
+    static ENetIncomingCommand dummyCommand;
+
+    ENetChannel * channel = & peer -> channels [command -> header.channelID];
+    enet_uint32 unreliableSequenceNumber = 0, reliableSequenceNumber = 0;
+    enet_uint16 reliableWindow, currentWindow;
+    ENetIncomingCommand * incomingCommand;
+    ENetListIterator currentCommand;
+    ENetPacket * packet = NULL;
+
+    if (peer -> state == ENET_PEER_STATE_DISCONNECT_LATER)
+      goto discardCommand;
+
+    if ((command -> header.command & ENET_PROTOCOL_COMMAND_MASK) != ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED)
+    {
+        reliableSequenceNumber = command -> header.reliableSequenceNumber;
+        reliableWindow = reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+        currentWindow = channel -> incomingReliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+
+        if (reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+           reliableWindow += ENET_PEER_RELIABLE_WINDOWS;
+
+        if (reliableWindow < currentWindow || reliableWindow >= currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS - 1)
+          goto discardCommand;
+    }
+                    
+    switch (command -> header.command & ENET_PROTOCOL_COMMAND_MASK)
+    {
+    case ENET_PROTOCOL_COMMAND_SEND_FRAGMENT:
+    case ENET_PROTOCOL_COMMAND_SEND_RELIABLE:
+       if (reliableSequenceNumber == channel -> incomingReliableSequenceNumber)
+         goto discardCommand;
+       
+       for (currentCommand = enet_list_previous (enet_list_end (& channel -> incomingReliableCommands));
+            currentCommand != enet_list_end (& channel -> incomingReliableCommands);
+            currentCommand = enet_list_previous (currentCommand))
+       {
+          incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+          if (reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+          {
+             if (incomingCommand -> reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+               continue;
+          }
+          else
+          if (incomingCommand -> reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+            break;
+
+          if (incomingCommand -> reliableSequenceNumber <= reliableSequenceNumber)
+          {
+             if (incomingCommand -> reliableSequenceNumber < reliableSequenceNumber)
+               break;
+
+             goto discardCommand;
+          }
+       }
+       break;
+
+    case ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE:
+    case ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT:
+       unreliableSequenceNumber = ENET_NET_TO_HOST_16 (command -> sendUnreliable.unreliableSequenceNumber);
+
+       if (reliableSequenceNumber == channel -> incomingReliableSequenceNumber && 
+           unreliableSequenceNumber <= channel -> incomingUnreliableSequenceNumber)
+         goto discardCommand;
+
+       for (currentCommand = enet_list_previous (enet_list_end (& channel -> incomingUnreliableCommands));
+            currentCommand != enet_list_end (& channel -> incomingUnreliableCommands);
+            currentCommand = enet_list_previous (currentCommand))
+       {
+          incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+          if ((command -> header.command & ENET_PROTOCOL_COMMAND_MASK) == ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED)
+            continue;
+
+          if (reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+          {
+             if (incomingCommand -> reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+               continue;
+          }
+          else
+          if (incomingCommand -> reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+            break;
+
+          if (incomingCommand -> reliableSequenceNumber < reliableSequenceNumber)
+            break;
+
+          if (incomingCommand -> reliableSequenceNumber > reliableSequenceNumber)
+            continue;
+
+          if (incomingCommand -> unreliableSequenceNumber <= unreliableSequenceNumber)
+          {
+             if (incomingCommand -> unreliableSequenceNumber < unreliableSequenceNumber)
+               break;
+
+             goto discardCommand;
+          }
+       }
+       break;
+
+    case ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED:
+       currentCommand = enet_list_end (& channel -> incomingUnreliableCommands);
+       break;
+
+    default:
+       goto discardCommand;
+    }
+
+    if (peer -> totalWaitingData >= peer -> host -> maximumWaitingData)
+      goto notifyError;
+
+    packet = enet_packet_create (data, dataLength, flags);
+    if (packet == NULL)
+      goto notifyError;
+
+    incomingCommand = (ENetIncomingCommand *) enet_malloc (sizeof (ENetIncomingCommand));
+    if (incomingCommand == NULL)
+      goto notifyError;
+
+    incomingCommand -> reliableSequenceNumber = command -> header.reliableSequenceNumber;
+    incomingCommand -> unreliableSequenceNumber = unreliableSequenceNumber & 0xFFFF;
+    incomingCommand -> command = * command;
+    incomingCommand -> fragmentCount = fragmentCount;
+    incomingCommand -> fragmentsRemaining = fragmentCount;
+    incomingCommand -> packet = packet;
+    incomingCommand -> fragments = NULL;
+    
+    if (fragmentCount > 0)
+    { 
+       if (fragmentCount <= ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT)
+         incomingCommand -> fragments = (enet_uint32 *) enet_malloc ((fragmentCount + 31) / 32 * sizeof (enet_uint32));
+       if (incomingCommand -> fragments == NULL)
+       {
+          enet_free (incomingCommand);
+
+          goto notifyError;
+       }
+       memset (incomingCommand -> fragments, 0, (fragmentCount + 31) / 32 * sizeof (enet_uint32));
+    }
+
+    if (packet != NULL)
+    {
+       ++ packet -> referenceCount;
+      
+       peer -> totalWaitingData += packet -> dataLength;
+    }
+
+    enet_list_insert (enet_list_next (currentCommand), incomingCommand);
+
+    switch (command -> header.command & ENET_PROTOCOL_COMMAND_MASK)
+    {
+    case ENET_PROTOCOL_COMMAND_SEND_FRAGMENT:
+    case ENET_PROTOCOL_COMMAND_SEND_RELIABLE:
+       enet_peer_dispatch_incoming_reliable_commands (peer, channel);
+       break;
+
+    default:
+       enet_peer_dispatch_incoming_unreliable_commands (peer, channel);
+       break;
+    }
+
+    return incomingCommand;
+
+discardCommand:
+    if (fragmentCount > 0)
+      goto notifyError;
+
+    if (packet != NULL && packet -> referenceCount == 0)
+      enet_packet_destroy (packet);
+
+    return & dummyCommand;
+
+notifyError:
+    if (packet != NULL && packet -> referenceCount == 0)
+      enet_packet_destroy (packet);
+
+    return NULL;
+}
+
+/** @} */
diff --git a/Externals/enet/premake4.lua b/Externals/enet/premake4.lua
new file mode 100644
index 0000000000..0e6e7adf6d
--- /dev/null
+++ b/Externals/enet/premake4.lua
@@ -0,0 +1,59 @@
+solution "enet"
+	configurations { "Debug", "Release" }
+	platforms { "x32", "x64" }
+
+	project "enet_static"
+		kind "StaticLib"
+		language "C"
+		
+		files { "*.c" }
+		
+		includedirs { "include/" }
+		
+		configuration "Debug"
+			targetsuffix "d"
+			
+			defines({ "DEBUG" })
+
+			flags { "Symbols" }
+		
+		configuration "Release"
+			defines({ "NDEBUG" })
+
+			flags { "Optimize" }
+			
+		configuration { "Debug", "x64" }
+			targetsuffix "64d"
+			
+		configuration { "Release", "x64" }
+			targetsuffix "64"
+
+	project "enet"
+		kind "SharedLib"
+		language "C"
+		
+		files { "*.c" }
+		
+		includedirs { "include/" }
+		
+		defines({"ENET_DLL=1" })
+		
+		configuration "Debug"
+			targetsuffix "d"
+			
+			defines({ "DEBUG" })
+
+			flags { "Symbols" }
+		
+		configuration "Release"
+			defines({ "NDEBUG" })
+
+			flags { "Optimize" }
+			
+		configuration { "Debug", "x64" }
+			targetsuffix "64d"
+			
+		configuration { "Release", "x64" }
+			targetsuffix "64"
+
+		
\ No newline at end of file
diff --git a/Externals/enet/protocol.c b/Externals/enet/protocol.c
new file mode 100644
index 0000000000..29d648732d
--- /dev/null
+++ b/Externals/enet/protocol.c
@@ -0,0 +1,1913 @@
+/** 
+ @file  protocol.c
+ @brief ENet protocol functions
+*/
+#include <stdio.h>
+#include <string.h>
+#define ENET_BUILDING_LIB 1
+#include "enet/utility.h"
+#include "enet/time.h"
+#include "enet/enet.h"
+
+static size_t commandSizes [ENET_PROTOCOL_COMMAND_COUNT] =
+{
+    0,
+    sizeof (ENetProtocolAcknowledge),
+    sizeof (ENetProtocolConnect),
+    sizeof (ENetProtocolVerifyConnect),
+    sizeof (ENetProtocolDisconnect),
+    sizeof (ENetProtocolPing),
+    sizeof (ENetProtocolSendReliable),
+    sizeof (ENetProtocolSendUnreliable),
+    sizeof (ENetProtocolSendFragment),
+    sizeof (ENetProtocolSendUnsequenced),
+    sizeof (ENetProtocolBandwidthLimit),
+    sizeof (ENetProtocolThrottleConfigure),
+    sizeof (ENetProtocolSendFragment)
+};
+
+size_t
+enet_protocol_command_size (enet_uint8 commandNumber)
+{
+    return commandSizes [commandNumber & ENET_PROTOCOL_COMMAND_MASK];
+}
+
+static void
+enet_protocol_change_state (ENetHost * host, ENetPeer * peer, ENetPeerState state)
+{
+    if (state == ENET_PEER_STATE_CONNECTED || state == ENET_PEER_STATE_DISCONNECT_LATER)
+      enet_peer_on_connect (peer);
+    else
+      enet_peer_on_disconnect (peer);
+
+    peer -> state = state;
+}
+
+static void
+enet_protocol_dispatch_state (ENetHost * host, ENetPeer * peer, ENetPeerState state)
+{
+    enet_protocol_change_state (host, peer, state);
+
+    if (! peer -> needsDispatch)
+    {
+       enet_list_insert (enet_list_end (& host -> dispatchQueue), & peer -> dispatchList);
+
+       peer -> needsDispatch = 1;
+    }
+}
+
+static int
+enet_protocol_dispatch_incoming_commands (ENetHost * host, ENetEvent * event)
+{
+    while (! enet_list_empty (& host -> dispatchQueue))
+    {
+       ENetPeer * peer = (ENetPeer *) enet_list_remove (enet_list_begin (& host -> dispatchQueue));
+
+       peer -> needsDispatch = 0;
+
+       switch (peer -> state)
+       {
+       case ENET_PEER_STATE_CONNECTION_PENDING:
+       case ENET_PEER_STATE_CONNECTION_SUCCEEDED:
+           enet_protocol_change_state (host, peer, ENET_PEER_STATE_CONNECTED);
+
+           event -> type = ENET_EVENT_TYPE_CONNECT;
+           event -> peer = peer;
+           event -> data = peer -> eventData;
+
+           return 1;
+           
+       case ENET_PEER_STATE_ZOMBIE:
+           host -> recalculateBandwidthLimits = 1;
+
+           event -> type = ENET_EVENT_TYPE_DISCONNECT;
+           event -> peer = peer;
+           event -> data = peer -> eventData;
+
+           enet_peer_reset (peer);
+
+           return 1;
+
+       case ENET_PEER_STATE_CONNECTED:
+           if (enet_list_empty (& peer -> dispatchedCommands))
+             continue;
+
+           event -> packet = enet_peer_receive (peer, & event -> channelID);
+           if (event -> packet == NULL)
+             continue;
+             
+           event -> type = ENET_EVENT_TYPE_RECEIVE;
+           event -> peer = peer;
+
+           if (! enet_list_empty (& peer -> dispatchedCommands))
+           {
+              peer -> needsDispatch = 1;
+         
+              enet_list_insert (enet_list_end (& host -> dispatchQueue), & peer -> dispatchList);
+           }
+
+           return 1;
+
+       default:
+           break;
+       }
+    }
+
+    return 0;
+}
+
+static void
+enet_protocol_notify_connect (ENetHost * host, ENetPeer * peer, ENetEvent * event)
+{
+    host -> recalculateBandwidthLimits = 1;
+
+    if (event != NULL)
+    {
+        enet_protocol_change_state (host, peer, ENET_PEER_STATE_CONNECTED);
+
+        event -> type = ENET_EVENT_TYPE_CONNECT;
+        event -> peer = peer;
+        event -> data = peer -> eventData;
+    }
+    else 
+        enet_protocol_dispatch_state (host, peer, peer -> state == ENET_PEER_STATE_CONNECTING ? ENET_PEER_STATE_CONNECTION_SUCCEEDED : ENET_PEER_STATE_CONNECTION_PENDING);
+}
+
+static void
+enet_protocol_notify_disconnect (ENetHost * host, ENetPeer * peer, ENetEvent * event)
+{
+    if (peer -> state >= ENET_PEER_STATE_CONNECTION_PENDING)
+       host -> recalculateBandwidthLimits = 1;
+
+    if (peer -> state != ENET_PEER_STATE_CONNECTING && peer -> state < ENET_PEER_STATE_CONNECTION_SUCCEEDED)
+        enet_peer_reset (peer);
+    else
+    if (event != NULL)
+    {
+        event -> type = ENET_EVENT_TYPE_DISCONNECT;
+        event -> peer = peer;
+        event -> data = 0;
+
+        enet_peer_reset (peer);
+    }
+    else 
+    {
+        peer -> eventData = 0;
+
+        enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
+    }
+}
+
+static void
+enet_protocol_remove_sent_unreliable_commands (ENetPeer * peer)
+{
+    ENetOutgoingCommand * outgoingCommand;
+
+    while (! enet_list_empty (& peer -> sentUnreliableCommands))
+    {
+        outgoingCommand = (ENetOutgoingCommand *) enet_list_front (& peer -> sentUnreliableCommands);
+        
+        enet_list_remove (& outgoingCommand -> outgoingCommandList);
+
+        if (outgoingCommand -> packet != NULL)
+        {
+           -- outgoingCommand -> packet -> referenceCount;
+
+           if (outgoingCommand -> packet -> referenceCount == 0)
+           {
+              outgoingCommand -> packet -> flags |= ENET_PACKET_FLAG_SENT;
+ 
+              enet_packet_destroy (outgoingCommand -> packet);
+           }
+        }
+
+        enet_free (outgoingCommand);
+    }
+}
+
+static ENetProtocolCommand
+enet_protocol_remove_sent_reliable_command (ENetPeer * peer, enet_uint16 reliableSequenceNumber, enet_uint8 channelID)
+{
+    ENetOutgoingCommand * outgoingCommand = NULL;
+    ENetListIterator currentCommand;
+    ENetProtocolCommand commandNumber;
+    int wasSent = 1;
+
+    for (currentCommand = enet_list_begin (& peer -> sentReliableCommands);
+         currentCommand != enet_list_end (& peer -> sentReliableCommands);
+         currentCommand = enet_list_next (currentCommand))
+    {
+       outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+        
+       if (outgoingCommand -> reliableSequenceNumber == reliableSequenceNumber &&
+           outgoingCommand -> command.header.channelID == channelID)
+         break;
+    }
+
+    if (currentCommand == enet_list_end (& peer -> sentReliableCommands))
+    {
+       for (currentCommand = enet_list_begin (& peer -> outgoingReliableCommands);
+            currentCommand != enet_list_end (& peer -> outgoingReliableCommands);
+            currentCommand = enet_list_next (currentCommand))
+       {
+          outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+
+          if (outgoingCommand -> sendAttempts < 1) return ENET_PROTOCOL_COMMAND_NONE;
+
+          if (outgoingCommand -> reliableSequenceNumber == reliableSequenceNumber &&
+              outgoingCommand -> command.header.channelID == channelID)
+            break;
+       }
+
+       if (currentCommand == enet_list_end (& peer -> outgoingReliableCommands))
+         return ENET_PROTOCOL_COMMAND_NONE;
+
+       wasSent = 0;
+    }
+
+    if (outgoingCommand == NULL)
+      return ENET_PROTOCOL_COMMAND_NONE;
+
+    if (channelID < peer -> channelCount)
+    {
+       ENetChannel * channel = & peer -> channels [channelID];
+       enet_uint16 reliableWindow = reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+       if (channel -> reliableWindows [reliableWindow] > 0)
+       {
+          -- channel -> reliableWindows [reliableWindow];
+          if (! channel -> reliableWindows [reliableWindow])
+            channel -> usedReliableWindows &= ~ (1 << reliableWindow);
+       }
+    }
+
+    commandNumber = (ENetProtocolCommand) (outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK);
+    
+    enet_list_remove (& outgoingCommand -> outgoingCommandList);
+
+    if (outgoingCommand -> packet != NULL)
+    {
+       if (wasSent)
+         peer -> reliableDataInTransit -= outgoingCommand -> fragmentLength;
+
+       -- outgoingCommand -> packet -> referenceCount;
+
+       if (outgoingCommand -> packet -> referenceCount == 0)
+       {
+          outgoingCommand -> packet -> flags |= ENET_PACKET_FLAG_SENT;
+
+          enet_packet_destroy (outgoingCommand -> packet);
+       }
+    }
+
+    enet_free (outgoingCommand);
+
+    if (enet_list_empty (& peer -> sentReliableCommands))
+      return commandNumber;
+    
+    outgoingCommand = (ENetOutgoingCommand *) enet_list_front (& peer -> sentReliableCommands);
+    
+    peer -> nextTimeout = outgoingCommand -> sentTime + outgoingCommand -> roundTripTimeout;
+
+    return commandNumber;
+} 
+
+static ENetPeer *
+enet_protocol_handle_connect (ENetHost * host, ENetProtocolHeader * header, ENetProtocol * command)
+{
+    enet_uint8 incomingSessionID, outgoingSessionID;
+    enet_uint32 mtu, windowSize;
+    ENetChannel * channel;
+    size_t channelCount, duplicatePeers = 0;
+    ENetPeer * currentPeer, * peer = NULL;
+    ENetProtocol verifyCommand;
+
+    channelCount = ENET_NET_TO_HOST_32 (command -> connect.channelCount);
+
+    if (channelCount < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT ||
+        channelCount > ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT)
+      return NULL;
+
+    for (currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+        if (currentPeer -> state == ENET_PEER_STATE_DISCONNECTED)
+        {
+            if (peer == NULL)
+              peer = currentPeer;
+        }
+        else 
+        if (currentPeer -> state != ENET_PEER_STATE_CONNECTING &&
+            currentPeer -> address.host == host -> receivedAddress.host)
+        {
+            if (currentPeer -> address.port == host -> receivedAddress.port &&
+                currentPeer -> connectID == command -> connect.connectID)
+              return NULL;
+
+            ++ duplicatePeers;
+        }
+    }
+
+    if (peer == NULL || duplicatePeers >= host -> duplicatePeers)
+      return NULL;
+
+    if (channelCount > host -> channelLimit)
+      channelCount = host -> channelLimit;
+    peer -> channels = (ENetChannel *) enet_malloc (channelCount * sizeof (ENetChannel));
+    if (peer -> channels == NULL)
+      return NULL;
+    peer -> channelCount = channelCount;
+    peer -> state = ENET_PEER_STATE_ACKNOWLEDGING_CONNECT;
+    peer -> connectID = command -> connect.connectID;
+    peer -> address = host -> receivedAddress;
+    peer -> outgoingPeerID = ENET_NET_TO_HOST_16 (command -> connect.outgoingPeerID);
+    peer -> incomingBandwidth = ENET_NET_TO_HOST_32 (command -> connect.incomingBandwidth);
+    peer -> outgoingBandwidth = ENET_NET_TO_HOST_32 (command -> connect.outgoingBandwidth);
+    peer -> packetThrottleInterval = ENET_NET_TO_HOST_32 (command -> connect.packetThrottleInterval);
+    peer -> packetThrottleAcceleration = ENET_NET_TO_HOST_32 (command -> connect.packetThrottleAcceleration);
+    peer -> packetThrottleDeceleration = ENET_NET_TO_HOST_32 (command -> connect.packetThrottleDeceleration);
+    peer -> eventData = ENET_NET_TO_HOST_32 (command -> connect.data);
+
+    incomingSessionID = command -> connect.incomingSessionID == 0xFF ? peer -> outgoingSessionID : command -> connect.incomingSessionID;
+    incomingSessionID = (incomingSessionID + 1) & (ENET_PROTOCOL_HEADER_SESSION_MASK >> ENET_PROTOCOL_HEADER_SESSION_SHIFT);
+    if (incomingSessionID == peer -> outgoingSessionID)
+      incomingSessionID = (incomingSessionID + 1) & (ENET_PROTOCOL_HEADER_SESSION_MASK >> ENET_PROTOCOL_HEADER_SESSION_SHIFT);
+    peer -> outgoingSessionID = incomingSessionID;
+
+    outgoingSessionID = command -> connect.outgoingSessionID == 0xFF ? peer -> incomingSessionID : command -> connect.outgoingSessionID;
+    outgoingSessionID = (outgoingSessionID + 1) & (ENET_PROTOCOL_HEADER_SESSION_MASK >> ENET_PROTOCOL_HEADER_SESSION_SHIFT);
+    if (outgoingSessionID == peer -> incomingSessionID)
+      outgoingSessionID = (outgoingSessionID + 1) & (ENET_PROTOCOL_HEADER_SESSION_MASK >> ENET_PROTOCOL_HEADER_SESSION_SHIFT);
+    peer -> incomingSessionID = outgoingSessionID;
+
+    for (channel = peer -> channels;
+         channel < & peer -> channels [channelCount];
+         ++ channel)
+    {
+        channel -> outgoingReliableSequenceNumber = 0;
+        channel -> outgoingUnreliableSequenceNumber = 0;
+        channel -> incomingReliableSequenceNumber = 0;
+        channel -> incomingUnreliableSequenceNumber = 0;
+
+        enet_list_clear (& channel -> incomingReliableCommands);
+        enet_list_clear (& channel -> incomingUnreliableCommands);
+
+        channel -> usedReliableWindows = 0;
+        memset (channel -> reliableWindows, 0, sizeof (channel -> reliableWindows));
+    }
+
+    mtu = ENET_NET_TO_HOST_32 (command -> connect.mtu);
+
+    if (mtu < ENET_PROTOCOL_MINIMUM_MTU)
+      mtu = ENET_PROTOCOL_MINIMUM_MTU;
+    else
+    if (mtu > ENET_PROTOCOL_MAXIMUM_MTU)
+      mtu = ENET_PROTOCOL_MAXIMUM_MTU;
+
+    peer -> mtu = mtu;
+
+    if (host -> outgoingBandwidth == 0 &&
+        peer -> incomingBandwidth == 0)
+      peer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+    else
+    if (host -> outgoingBandwidth == 0 ||
+        peer -> incomingBandwidth == 0)
+      peer -> windowSize = (ENET_MAX (host -> outgoingBandwidth, peer -> incomingBandwidth) /
+                                    ENET_PEER_WINDOW_SIZE_SCALE) *
+                                      ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+      peer -> windowSize = (ENET_MIN (host -> outgoingBandwidth, peer -> incomingBandwidth) /
+                                    ENET_PEER_WINDOW_SIZE_SCALE) * 
+                                      ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+
+    if (peer -> windowSize < ENET_PROTOCOL_MINIMUM_WINDOW_SIZE)
+      peer -> windowSize = ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+    if (peer -> windowSize > ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE)
+      peer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+
+    if (host -> incomingBandwidth == 0)
+      windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+    else
+      windowSize = (host -> incomingBandwidth / ENET_PEER_WINDOW_SIZE_SCALE) *
+                     ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+
+    if (windowSize > ENET_NET_TO_HOST_32 (command -> connect.windowSize))
+      windowSize = ENET_NET_TO_HOST_32 (command -> connect.windowSize);
+
+    if (windowSize < ENET_PROTOCOL_MINIMUM_WINDOW_SIZE)
+      windowSize = ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+    if (windowSize > ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE)
+      windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+
+    verifyCommand.header.command = ENET_PROTOCOL_COMMAND_VERIFY_CONNECT | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE;
+    verifyCommand.header.channelID = 0xFF;
+    verifyCommand.verifyConnect.outgoingPeerID = ENET_HOST_TO_NET_16 (peer -> incomingPeerID);
+    verifyCommand.verifyConnect.incomingSessionID = incomingSessionID;
+    verifyCommand.verifyConnect.outgoingSessionID = outgoingSessionID;
+    verifyCommand.verifyConnect.mtu = ENET_HOST_TO_NET_32 (peer -> mtu);
+    verifyCommand.verifyConnect.windowSize = ENET_HOST_TO_NET_32 (windowSize);
+    verifyCommand.verifyConnect.channelCount = ENET_HOST_TO_NET_32 (channelCount);
+    verifyCommand.verifyConnect.incomingBandwidth = ENET_HOST_TO_NET_32 (host -> incomingBandwidth);
+    verifyCommand.verifyConnect.outgoingBandwidth = ENET_HOST_TO_NET_32 (host -> outgoingBandwidth);
+    verifyCommand.verifyConnect.packetThrottleInterval = ENET_HOST_TO_NET_32 (peer -> packetThrottleInterval);
+    verifyCommand.verifyConnect.packetThrottleAcceleration = ENET_HOST_TO_NET_32 (peer -> packetThrottleAcceleration);
+    verifyCommand.verifyConnect.packetThrottleDeceleration = ENET_HOST_TO_NET_32 (peer -> packetThrottleDeceleration);
+    verifyCommand.verifyConnect.connectID = peer -> connectID;
+
+    enet_peer_queue_outgoing_command (peer, & verifyCommand, NULL, 0, 0);
+
+    return peer;
+}
+
+static int
+enet_protocol_handle_send_reliable (ENetHost * host, ENetPeer * peer, const ENetProtocol * command, enet_uint8 ** currentData)
+{
+    size_t dataLength;
+
+    if (command -> header.channelID >= peer -> channelCount ||
+        (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER))
+      return -1;
+
+    dataLength = ENET_NET_TO_HOST_16 (command -> sendReliable.dataLength);
+    * currentData += dataLength;
+    if (dataLength > host -> maximumPacketSize ||
+        * currentData < host -> receivedData ||
+        * currentData > & host -> receivedData [host -> receivedDataLength])
+      return -1;
+
+    if (enet_peer_queue_incoming_command (peer, command, (const enet_uint8 *) command + sizeof (ENetProtocolSendReliable), dataLength, ENET_PACKET_FLAG_RELIABLE, 0) == NULL)
+      return -1;
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_send_unsequenced (ENetHost * host, ENetPeer * peer, const ENetProtocol * command, enet_uint8 ** currentData)
+{
+    enet_uint32 unsequencedGroup, index;
+    size_t dataLength;
+
+    if (command -> header.channelID >= peer -> channelCount ||
+        (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER))
+      return -1;
+
+    dataLength = ENET_NET_TO_HOST_16 (command -> sendUnsequenced.dataLength);
+    * currentData += dataLength;
+    if (dataLength > host -> maximumPacketSize ||
+        * currentData < host -> receivedData ||
+        * currentData > & host -> receivedData [host -> receivedDataLength])
+      return -1; 
+
+    unsequencedGroup = ENET_NET_TO_HOST_16 (command -> sendUnsequenced.unsequencedGroup);
+    index = unsequencedGroup % ENET_PEER_UNSEQUENCED_WINDOW_SIZE;
+   
+    if (unsequencedGroup < peer -> incomingUnsequencedGroup)
+      unsequencedGroup += 0x10000;
+
+    if (unsequencedGroup >= (enet_uint32) peer -> incomingUnsequencedGroup + ENET_PEER_FREE_UNSEQUENCED_WINDOWS * ENET_PEER_UNSEQUENCED_WINDOW_SIZE)
+      return 0;
+
+    unsequencedGroup &= 0xFFFF;
+
+    if (unsequencedGroup - index != peer -> incomingUnsequencedGroup)
+    {
+        peer -> incomingUnsequencedGroup = unsequencedGroup - index;
+
+        memset (peer -> unsequencedWindow, 0, sizeof (peer -> unsequencedWindow));
+    }
+    else
+    if (peer -> unsequencedWindow [index / 32] & (1 << (index % 32)))
+      return 0;
+      
+    if (enet_peer_queue_incoming_command (peer, command, (const enet_uint8 *) command + sizeof (ENetProtocolSendUnsequenced), dataLength, ENET_PACKET_FLAG_UNSEQUENCED, 0) == NULL)
+      return -1;
+   
+    peer -> unsequencedWindow [index / 32] |= 1 << (index % 32);
+ 
+    return 0;
+}
+
+static int
+enet_protocol_handle_send_unreliable (ENetHost * host, ENetPeer * peer, const ENetProtocol * command, enet_uint8 ** currentData)
+{
+    size_t dataLength;
+
+    if (command -> header.channelID >= peer -> channelCount ||
+        (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER))
+      return -1;
+
+    dataLength = ENET_NET_TO_HOST_16 (command -> sendUnreliable.dataLength);
+    * currentData += dataLength;
+    if (dataLength > host -> maximumPacketSize ||
+        * currentData < host -> receivedData ||
+        * currentData > & host -> receivedData [host -> receivedDataLength])
+      return -1;
+
+    if (enet_peer_queue_incoming_command (peer, command, (const enet_uint8 *) command + sizeof (ENetProtocolSendUnreliable), dataLength, 0, 0) == NULL)
+      return -1;
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_send_fragment (ENetHost * host, ENetPeer * peer, const ENetProtocol * command, enet_uint8 ** currentData)
+{
+    enet_uint32 fragmentNumber,
+           fragmentCount,
+           fragmentOffset,
+           fragmentLength,
+           startSequenceNumber,
+           totalLength;
+    ENetChannel * channel;
+    enet_uint16 startWindow, currentWindow;
+    ENetListIterator currentCommand;
+    ENetIncomingCommand * startCommand = NULL;
+
+    if (command -> header.channelID >= peer -> channelCount ||
+        (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER))
+      return -1;
+
+    fragmentLength = ENET_NET_TO_HOST_16 (command -> sendFragment.dataLength);
+    * currentData += fragmentLength;
+    if (fragmentLength > host -> maximumPacketSize ||
+        * currentData < host -> receivedData ||
+        * currentData > & host -> receivedData [host -> receivedDataLength])
+      return -1;
+
+    channel = & peer -> channels [command -> header.channelID];
+    startSequenceNumber = ENET_NET_TO_HOST_16 (command -> sendFragment.startSequenceNumber);
+    startWindow = startSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+    currentWindow = channel -> incomingReliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+
+    if (startSequenceNumber < channel -> incomingReliableSequenceNumber)
+      startWindow += ENET_PEER_RELIABLE_WINDOWS;
+
+    if (startWindow < currentWindow || startWindow >= currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS - 1)
+      return 0;
+
+    fragmentNumber = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentNumber);
+    fragmentCount = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentCount);
+    fragmentOffset = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentOffset);
+    totalLength = ENET_NET_TO_HOST_32 (command -> sendFragment.totalLength);
+    
+    if (fragmentCount > ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT ||
+        fragmentNumber >= fragmentCount ||
+        totalLength > host -> maximumPacketSize ||
+        fragmentOffset >= totalLength ||
+        fragmentLength > totalLength - fragmentOffset)
+      return -1;
+ 
+    for (currentCommand = enet_list_previous (enet_list_end (& channel -> incomingReliableCommands));
+         currentCommand != enet_list_end (& channel -> incomingReliableCommands);
+         currentCommand = enet_list_previous (currentCommand))
+    {
+       ENetIncomingCommand * incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+       if (startSequenceNumber >= channel -> incomingReliableSequenceNumber)
+       {
+          if (incomingCommand -> reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+            continue;
+       }
+       else
+       if (incomingCommand -> reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+         break;
+
+       if (incomingCommand -> reliableSequenceNumber <= startSequenceNumber)
+       {
+          if (incomingCommand -> reliableSequenceNumber < startSequenceNumber)
+            break;
+        
+          if ((incomingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK) != ENET_PROTOCOL_COMMAND_SEND_FRAGMENT ||
+              totalLength != incomingCommand -> packet -> dataLength ||
+              fragmentCount != incomingCommand -> fragmentCount)
+            return -1;
+
+          startCommand = incomingCommand;
+          break;
+       }
+    }
+ 
+    if (startCommand == NULL)
+    {
+       ENetProtocol hostCommand = * command;
+
+       hostCommand.header.reliableSequenceNumber = startSequenceNumber;
+
+       startCommand = enet_peer_queue_incoming_command (peer, & hostCommand, NULL, totalLength, ENET_PACKET_FLAG_RELIABLE, fragmentCount);
+       if (startCommand == NULL)
+         return -1;
+    }
+    
+    if ((startCommand -> fragments [fragmentNumber / 32] & (1 << (fragmentNumber % 32))) == 0)
+    {
+       -- startCommand -> fragmentsRemaining;
+
+       startCommand -> fragments [fragmentNumber / 32] |= (1 << (fragmentNumber % 32));
+
+       if (fragmentOffset + fragmentLength > startCommand -> packet -> dataLength)
+         fragmentLength = startCommand -> packet -> dataLength - fragmentOffset;
+
+       memcpy (startCommand -> packet -> data + fragmentOffset,
+               (enet_uint8 *) command + sizeof (ENetProtocolSendFragment),
+               fragmentLength);
+
+        if (startCommand -> fragmentsRemaining <= 0)
+          enet_peer_dispatch_incoming_reliable_commands (peer, channel);
+    }
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_send_unreliable_fragment (ENetHost * host, ENetPeer * peer, const ENetProtocol * command, enet_uint8 ** currentData)
+{
+    enet_uint32 fragmentNumber,
+           fragmentCount,
+           fragmentOffset,
+           fragmentLength,
+           reliableSequenceNumber,
+           startSequenceNumber,
+           totalLength;
+    enet_uint16 reliableWindow, currentWindow;
+    ENetChannel * channel;
+    ENetListIterator currentCommand;
+    ENetIncomingCommand * startCommand = NULL;
+
+    if (command -> header.channelID >= peer -> channelCount ||
+        (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER))
+      return -1;
+
+    fragmentLength = ENET_NET_TO_HOST_16 (command -> sendFragment.dataLength);
+    * currentData += fragmentLength;
+    if (fragmentLength > host -> maximumPacketSize ||
+        * currentData < host -> receivedData ||
+        * currentData > & host -> receivedData [host -> receivedDataLength])
+      return -1;
+
+    channel = & peer -> channels [command -> header.channelID];
+    reliableSequenceNumber = command -> header.reliableSequenceNumber;
+    startSequenceNumber = ENET_NET_TO_HOST_16 (command -> sendFragment.startSequenceNumber);
+
+    reliableWindow = reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+    currentWindow = channel -> incomingReliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+
+    if (reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+      reliableWindow += ENET_PEER_RELIABLE_WINDOWS;
+
+    if (reliableWindow < currentWindow || reliableWindow >= currentWindow + ENET_PEER_FREE_RELIABLE_WINDOWS - 1)
+      return 0;
+
+    if (reliableSequenceNumber == channel -> incomingReliableSequenceNumber &&
+        startSequenceNumber <= channel -> incomingUnreliableSequenceNumber)
+      return 0;
+
+    fragmentNumber = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentNumber);
+    fragmentCount = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentCount);
+    fragmentOffset = ENET_NET_TO_HOST_32 (command -> sendFragment.fragmentOffset);
+    totalLength = ENET_NET_TO_HOST_32 (command -> sendFragment.totalLength);
+
+    if (fragmentCount > ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT ||
+        fragmentNumber >= fragmentCount ||
+        totalLength > host -> maximumPacketSize ||
+        fragmentOffset >= totalLength ||
+        fragmentLength > totalLength - fragmentOffset)
+      return -1;
+
+    for (currentCommand = enet_list_previous (enet_list_end (& channel -> incomingUnreliableCommands));
+         currentCommand != enet_list_end (& channel -> incomingUnreliableCommands);
+         currentCommand = enet_list_previous (currentCommand))
+    {
+       ENetIncomingCommand * incomingCommand = (ENetIncomingCommand *) currentCommand;
+
+       if (reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+       {
+          if (incomingCommand -> reliableSequenceNumber < channel -> incomingReliableSequenceNumber)
+            continue;
+       }
+       else
+       if (incomingCommand -> reliableSequenceNumber >= channel -> incomingReliableSequenceNumber)
+         break;
+
+       if (incomingCommand -> reliableSequenceNumber < reliableSequenceNumber)
+         break;
+
+       if (incomingCommand -> reliableSequenceNumber > reliableSequenceNumber)
+         continue;
+
+       if (incomingCommand -> unreliableSequenceNumber <= startSequenceNumber)
+       {
+          if (incomingCommand -> unreliableSequenceNumber < startSequenceNumber)
+            break;
+
+          if ((incomingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK) != ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT ||
+              totalLength != incomingCommand -> packet -> dataLength ||
+              fragmentCount != incomingCommand -> fragmentCount)
+            return -1;
+
+          startCommand = incomingCommand;
+          break;
+       }
+    }
+
+    if (startCommand == NULL)
+    {
+       startCommand = enet_peer_queue_incoming_command (peer, command, NULL, totalLength, ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT, fragmentCount);
+       if (startCommand == NULL)
+         return -1;
+    }
+
+    if ((startCommand -> fragments [fragmentNumber / 32] & (1 << (fragmentNumber % 32))) == 0)
+    {
+       -- startCommand -> fragmentsRemaining;
+
+       startCommand -> fragments [fragmentNumber / 32] |= (1 << (fragmentNumber % 32));
+
+       if (fragmentOffset + fragmentLength > startCommand -> packet -> dataLength)
+         fragmentLength = startCommand -> packet -> dataLength - fragmentOffset;
+
+       memcpy (startCommand -> packet -> data + fragmentOffset,
+               (enet_uint8 *) command + sizeof (ENetProtocolSendFragment),
+               fragmentLength);
+
+        if (startCommand -> fragmentsRemaining <= 0)
+          enet_peer_dispatch_incoming_unreliable_commands (peer, channel);
+    }
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_ping (ENetHost * host, ENetPeer * peer, const ENetProtocol * command)
+{
+    if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+      return -1;
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_bandwidth_limit (ENetHost * host, ENetPeer * peer, const ENetProtocol * command)
+{
+    if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+      return -1;
+
+    if (peer -> incomingBandwidth != 0)
+      -- host -> bandwidthLimitedPeers;
+
+    peer -> incomingBandwidth = ENET_NET_TO_HOST_32 (command -> bandwidthLimit.incomingBandwidth);
+    peer -> outgoingBandwidth = ENET_NET_TO_HOST_32 (command -> bandwidthLimit.outgoingBandwidth);
+
+    if (peer -> incomingBandwidth != 0)
+      ++ host -> bandwidthLimitedPeers;
+
+    if (peer -> incomingBandwidth == 0 && host -> outgoingBandwidth == 0)
+      peer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+    else
+    if (peer -> incomingBandwidth == 0 || host -> outgoingBandwidth == 0)
+      peer -> windowSize = (ENET_MAX (peer -> incomingBandwidth, host -> outgoingBandwidth) /
+                             ENET_PEER_WINDOW_SIZE_SCALE) * ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+      peer -> windowSize = (ENET_MIN (peer -> incomingBandwidth, host -> outgoingBandwidth) /
+                             ENET_PEER_WINDOW_SIZE_SCALE) * ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+
+    if (peer -> windowSize < ENET_PROTOCOL_MINIMUM_WINDOW_SIZE)
+      peer -> windowSize = ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+    else
+    if (peer -> windowSize > ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE)
+      peer -> windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_throttle_configure (ENetHost * host, ENetPeer * peer, const ENetProtocol * command)
+{
+    if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+      return -1;
+
+    peer -> packetThrottleInterval = ENET_NET_TO_HOST_32 (command -> throttleConfigure.packetThrottleInterval);
+    peer -> packetThrottleAcceleration = ENET_NET_TO_HOST_32 (command -> throttleConfigure.packetThrottleAcceleration);
+    peer -> packetThrottleDeceleration = ENET_NET_TO_HOST_32 (command -> throttleConfigure.packetThrottleDeceleration);
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_disconnect (ENetHost * host, ENetPeer * peer, const ENetProtocol * command)
+{
+    if (peer -> state == ENET_PEER_STATE_DISCONNECTED || peer -> state == ENET_PEER_STATE_ZOMBIE || peer -> state == ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT)
+      return 0;
+
+    enet_peer_reset_queues (peer);
+
+    if (peer -> state == ENET_PEER_STATE_CONNECTION_SUCCEEDED || peer -> state == ENET_PEER_STATE_DISCONNECTING || peer -> state == ENET_PEER_STATE_CONNECTING)
+        enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
+    else
+    if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)
+    {
+        if (peer -> state == ENET_PEER_STATE_CONNECTION_PENDING) host -> recalculateBandwidthLimits = 1;
+
+        enet_peer_reset (peer);
+    }
+    else
+    if (command -> header.command & ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE)
+      enet_protocol_change_state (host, peer, ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT);
+    else
+      enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
+
+    if (peer -> state != ENET_PEER_STATE_DISCONNECTED)
+      peer -> eventData = ENET_NET_TO_HOST_32 (command -> disconnect.data);
+
+    return 0;
+}
+
+static int
+enet_protocol_handle_acknowledge (ENetHost * host, ENetEvent * event, ENetPeer * peer, const ENetProtocol * command)
+{
+    enet_uint32 roundTripTime,
+           receivedSentTime,
+           receivedReliableSequenceNumber;
+    ENetProtocolCommand commandNumber;
+
+    if (peer -> state == ENET_PEER_STATE_DISCONNECTED || peer -> state == ENET_PEER_STATE_ZOMBIE)
+      return 0;
+
+    receivedSentTime = ENET_NET_TO_HOST_16 (command -> acknowledge.receivedSentTime);
+    receivedSentTime |= host -> serviceTime & 0xFFFF0000;
+    if ((receivedSentTime & 0x8000) > (host -> serviceTime & 0x8000))
+        receivedSentTime -= 0x10000;
+
+    if (ENET_TIME_LESS (host -> serviceTime, receivedSentTime))
+      return 0;
+
+    peer -> lastReceiveTime = host -> serviceTime;
+    peer -> earliestTimeout = 0;
+
+    roundTripTime = ENET_TIME_DIFFERENCE (host -> serviceTime, receivedSentTime);
+
+    enet_peer_throttle (peer, roundTripTime);
+
+    peer -> roundTripTimeVariance -= peer -> roundTripTimeVariance / 4;
+
+    if (roundTripTime >= peer -> roundTripTime)
+    {
+       peer -> roundTripTime += (roundTripTime - peer -> roundTripTime) / 8;
+       peer -> roundTripTimeVariance += (roundTripTime - peer -> roundTripTime) / 4;
+    }
+    else
+    {
+       peer -> roundTripTime -= (peer -> roundTripTime - roundTripTime) / 8;
+       peer -> roundTripTimeVariance += (peer -> roundTripTime - roundTripTime) / 4;
+    }
+
+    if (peer -> roundTripTime < peer -> lowestRoundTripTime)
+      peer -> lowestRoundTripTime = peer -> roundTripTime;
+
+    if (peer -> roundTripTimeVariance > peer -> highestRoundTripTimeVariance) 
+      peer -> highestRoundTripTimeVariance = peer -> roundTripTimeVariance;
+
+    if (peer -> packetThrottleEpoch == 0 ||
+        ENET_TIME_DIFFERENCE (host -> serviceTime, peer -> packetThrottleEpoch) >= peer -> packetThrottleInterval)
+    {
+        peer -> lastRoundTripTime = peer -> lowestRoundTripTime;
+        peer -> lastRoundTripTimeVariance = peer -> highestRoundTripTimeVariance;
+        peer -> lowestRoundTripTime = peer -> roundTripTime;
+        peer -> highestRoundTripTimeVariance = peer -> roundTripTimeVariance;
+        peer -> packetThrottleEpoch = host -> serviceTime;
+    }
+
+    receivedReliableSequenceNumber = ENET_NET_TO_HOST_16 (command -> acknowledge.receivedReliableSequenceNumber);
+
+    commandNumber = enet_protocol_remove_sent_reliable_command (peer, receivedReliableSequenceNumber, command -> header.channelID);
+
+    switch (peer -> state)
+    {
+    case ENET_PEER_STATE_ACKNOWLEDGING_CONNECT:
+       if (commandNumber != ENET_PROTOCOL_COMMAND_VERIFY_CONNECT)
+         return -1;
+
+       enet_protocol_notify_connect (host, peer, event);
+       break;
+
+    case ENET_PEER_STATE_DISCONNECTING:
+       if (commandNumber != ENET_PROTOCOL_COMMAND_DISCONNECT)
+         return -1;
+
+       enet_protocol_notify_disconnect (host, peer, event);
+       break;
+
+    case ENET_PEER_STATE_DISCONNECT_LATER:
+       if (enet_list_empty (& peer -> outgoingReliableCommands) &&
+           enet_list_empty (& peer -> outgoingUnreliableCommands) &&   
+           enet_list_empty (& peer -> sentReliableCommands))
+         enet_peer_disconnect (peer, peer -> eventData);
+       break;
+
+    default:
+       break;
+    }
+   
+    return 0;
+}
+
+static int
+enet_protocol_handle_verify_connect (ENetHost * host, ENetEvent * event, ENetPeer * peer, const ENetProtocol * command)
+{
+    enet_uint32 mtu, windowSize;
+    size_t channelCount;
+
+    if (peer -> state != ENET_PEER_STATE_CONNECTING)
+      return 0;
+
+    channelCount = ENET_NET_TO_HOST_32 (command -> verifyConnect.channelCount);
+
+    if (channelCount < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT || channelCount > ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT ||
+        ENET_NET_TO_HOST_32 (command -> verifyConnect.packetThrottleInterval) != peer -> packetThrottleInterval ||
+        ENET_NET_TO_HOST_32 (command -> verifyConnect.packetThrottleAcceleration) != peer -> packetThrottleAcceleration ||
+        ENET_NET_TO_HOST_32 (command -> verifyConnect.packetThrottleDeceleration) != peer -> packetThrottleDeceleration ||
+        command -> verifyConnect.connectID != peer -> connectID)
+    {
+        peer -> eventData = 0;
+
+        enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
+
+        return -1;
+    }
+
+    enet_protocol_remove_sent_reliable_command (peer, 1, 0xFF);
+    
+    if (channelCount < peer -> channelCount)
+      peer -> channelCount = channelCount;
+
+    peer -> outgoingPeerID = ENET_NET_TO_HOST_16 (command -> verifyConnect.outgoingPeerID);
+    peer -> incomingSessionID = command -> verifyConnect.incomingSessionID;
+    peer -> outgoingSessionID = command -> verifyConnect.outgoingSessionID;
+
+    mtu = ENET_NET_TO_HOST_32 (command -> verifyConnect.mtu);
+
+    if (mtu < ENET_PROTOCOL_MINIMUM_MTU)
+      mtu = ENET_PROTOCOL_MINIMUM_MTU;
+    else 
+    if (mtu > ENET_PROTOCOL_MAXIMUM_MTU)
+      mtu = ENET_PROTOCOL_MAXIMUM_MTU;
+
+    if (mtu < peer -> mtu)
+      peer -> mtu = mtu;
+
+    windowSize = ENET_NET_TO_HOST_32 (command -> verifyConnect.windowSize);
+
+    if (windowSize < ENET_PROTOCOL_MINIMUM_WINDOW_SIZE)
+      windowSize = ENET_PROTOCOL_MINIMUM_WINDOW_SIZE;
+
+    if (windowSize > ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE)
+      windowSize = ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE;
+
+    if (windowSize < peer -> windowSize)
+      peer -> windowSize = windowSize;
+
+    peer -> incomingBandwidth = ENET_NET_TO_HOST_32 (command -> verifyConnect.incomingBandwidth);
+    peer -> outgoingBandwidth = ENET_NET_TO_HOST_32 (command -> verifyConnect.outgoingBandwidth);
+
+    enet_protocol_notify_connect (host, peer, event);
+    return 0;
+}
+
+static int
+enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event)
+{
+    ENetProtocolHeader * header;
+    ENetProtocol * command;
+    ENetPeer * peer;
+    enet_uint8 * currentData;
+    size_t headerSize;
+    enet_uint16 peerID, flags;
+    enet_uint8 sessionID;
+
+    if (host -> receivedDataLength < (size_t) & ((ENetProtocolHeader *) 0) -> sentTime)
+      return 0;
+
+    header = (ENetProtocolHeader *) host -> receivedData;
+
+    peerID = ENET_NET_TO_HOST_16 (header -> peerID);
+    sessionID = (peerID & ENET_PROTOCOL_HEADER_SESSION_MASK) >> ENET_PROTOCOL_HEADER_SESSION_SHIFT;
+    flags = peerID & ENET_PROTOCOL_HEADER_FLAG_MASK;
+    peerID &= ~ (ENET_PROTOCOL_HEADER_FLAG_MASK | ENET_PROTOCOL_HEADER_SESSION_MASK);
+
+    headerSize = (flags & ENET_PROTOCOL_HEADER_FLAG_SENT_TIME ? sizeof (ENetProtocolHeader) : (size_t) & ((ENetProtocolHeader *) 0) -> sentTime);
+    if (host -> checksum != NULL)
+      headerSize += sizeof (enet_uint32);
+
+    if (peerID == ENET_PROTOCOL_MAXIMUM_PEER_ID)
+      peer = NULL;
+    else
+    if (peerID >= host -> peerCount)
+      return 0;
+    else
+    {
+       peer = & host -> peers [peerID];
+
+       if (peer -> state == ENET_PEER_STATE_DISCONNECTED ||
+           peer -> state == ENET_PEER_STATE_ZOMBIE ||
+           ((host -> receivedAddress.host != peer -> address.host ||
+             host -> receivedAddress.port != peer -> address.port) &&
+             peer -> address.host != ENET_HOST_BROADCAST) ||
+           (peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID &&
+            sessionID != peer -> incomingSessionID))
+         return 0;
+    }
+ 
+    if (flags & ENET_PROTOCOL_HEADER_FLAG_COMPRESSED)
+    {
+        size_t originalSize;
+        if (host -> compressor.context == NULL || host -> compressor.decompress == NULL)
+          return 0;
+
+        originalSize = host -> compressor.decompress (host -> compressor.context,
+                                    host -> receivedData + headerSize, 
+                                    host -> receivedDataLength - headerSize, 
+                                    host -> packetData [1] + headerSize, 
+                                    sizeof (host -> packetData [1]) - headerSize);
+        if (originalSize <= 0 || originalSize > sizeof (host -> packetData [1]) - headerSize)
+          return 0;
+
+        memcpy (host -> packetData [1], header, headerSize);
+        host -> receivedData = host -> packetData [1];
+        host -> receivedDataLength = headerSize + originalSize;
+    }
+
+    if (host -> checksum != NULL)
+    {
+        enet_uint32 * checksum = (enet_uint32 *) & host -> receivedData [headerSize - sizeof (enet_uint32)],
+                    desiredChecksum = * checksum;
+        ENetBuffer buffer;
+
+        * checksum = peer != NULL ? peer -> connectID : 0;
+
+        buffer.data = host -> receivedData;
+        buffer.dataLength = host -> receivedDataLength;
+
+        if (host -> checksum (& buffer, 1) != desiredChecksum)
+          return 0;
+    }
+       
+    if (peer != NULL)
+    {
+       peer -> address.host = host -> receivedAddress.host;
+       peer -> address.port = host -> receivedAddress.port;
+       peer -> incomingDataTotal += host -> receivedDataLength;
+    }
+    
+    currentData = host -> receivedData + headerSize;
+  
+    while (currentData < & host -> receivedData [host -> receivedDataLength])
+    {
+       enet_uint8 commandNumber;
+       size_t commandSize;
+
+       command = (ENetProtocol *) currentData;
+
+       if (currentData + sizeof (ENetProtocolCommandHeader) > & host -> receivedData [host -> receivedDataLength])
+         break;
+
+       commandNumber = command -> header.command & ENET_PROTOCOL_COMMAND_MASK;
+       if (commandNumber >= ENET_PROTOCOL_COMMAND_COUNT) 
+         break;
+       
+       commandSize = commandSizes [commandNumber];
+       if (commandSize == 0 || currentData + commandSize > & host -> receivedData [host -> receivedDataLength])
+         break;
+
+       currentData += commandSize;
+
+       if (peer == NULL && commandNumber != ENET_PROTOCOL_COMMAND_CONNECT)
+         break;
+         
+       command -> header.reliableSequenceNumber = ENET_NET_TO_HOST_16 (command -> header.reliableSequenceNumber);
+
+       switch (commandNumber)
+       {
+       case ENET_PROTOCOL_COMMAND_ACKNOWLEDGE:
+          if (enet_protocol_handle_acknowledge (host, event, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_CONNECT:
+          if (peer != NULL)
+            goto commandError;
+          peer = enet_protocol_handle_connect (host, header, command);
+          if (peer == NULL)
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_VERIFY_CONNECT:
+          if (enet_protocol_handle_verify_connect (host, event, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_DISCONNECT:
+          if (enet_protocol_handle_disconnect (host, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_PING:
+          if (enet_protocol_handle_ping (host, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_SEND_RELIABLE:
+          if (enet_protocol_handle_send_reliable (host, peer, command, & currentData))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE:
+          if (enet_protocol_handle_send_unreliable (host, peer, command, & currentData))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED:
+          if (enet_protocol_handle_send_unsequenced (host, peer, command, & currentData))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_SEND_FRAGMENT:
+          if (enet_protocol_handle_send_fragment (host, peer, command, & currentData))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT:
+          if (enet_protocol_handle_bandwidth_limit (host, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE:
+          if (enet_protocol_handle_throttle_configure (host, peer, command))
+            goto commandError;
+          break;
+
+       case ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT:
+          if (enet_protocol_handle_send_unreliable_fragment (host, peer, command, & currentData))
+            goto commandError;
+          break;
+
+       default:
+          goto commandError;
+       }
+
+       if (peer != NULL &&
+           (command -> header.command & ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE) != 0)
+       {
+           enet_uint16 sentTime;
+
+           if (! (flags & ENET_PROTOCOL_HEADER_FLAG_SENT_TIME))
+             break;
+
+           sentTime = ENET_NET_TO_HOST_16 (header -> sentTime);
+
+           switch (peer -> state)
+           {
+           case ENET_PEER_STATE_DISCONNECTING:
+           case ENET_PEER_STATE_ACKNOWLEDGING_CONNECT:
+           case ENET_PEER_STATE_DISCONNECTED:
+           case ENET_PEER_STATE_ZOMBIE:
+              break;
+
+           case ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT:
+              if ((command -> header.command & ENET_PROTOCOL_COMMAND_MASK) == ENET_PROTOCOL_COMMAND_DISCONNECT)
+                enet_peer_queue_acknowledgement (peer, command, sentTime);
+              break;
+
+           default:   
+              enet_peer_queue_acknowledgement (peer, command, sentTime);        
+              break;
+           }
+       }
+    }
+
+commandError:
+    if (event != NULL && event -> type != ENET_EVENT_TYPE_NONE)
+      return 1;
+
+    return 0;
+}
+ 
+static int
+enet_protocol_receive_incoming_commands (ENetHost * host, ENetEvent * event)
+{
+    int packets;
+
+    for (packets = 0; packets < 256; ++ packets)
+    {
+       int receivedLength;
+       ENetBuffer buffer;
+
+       buffer.data = host -> packetData [0];
+       buffer.dataLength = sizeof (host -> packetData [0]);
+
+       receivedLength = enet_socket_receive (host -> socket,
+                                             & host -> receivedAddress,
+                                             & buffer,
+                                             1);
+
+       if (receivedLength < 0)
+         return -1;
+
+       if (receivedLength == 0)
+         return 0;
+
+       host -> receivedData = host -> packetData [0];
+       host -> receivedDataLength = receivedLength;
+      
+       host -> totalReceivedData += receivedLength;
+       host -> totalReceivedPackets ++;
+
+       if (host -> intercept != NULL)
+       {
+          switch (host -> intercept (host, event))
+          {
+          case 1:
+             if (event != NULL && event -> type != ENET_EVENT_TYPE_NONE)
+               return 1;
+
+             continue;
+          
+          case -1:
+             return -1;
+        
+          default:
+             break;
+          }
+       }
+        
+       switch (enet_protocol_handle_incoming_commands (host, event))
+       {
+       case 1:
+          return 1;
+       
+       case -1:
+          return -1;
+
+       default:
+          break;
+       }
+    }
+
+    return -1;
+}
+
+static void
+enet_protocol_send_acknowledgements (ENetHost * host, ENetPeer * peer)
+{
+    ENetProtocol * command = & host -> commands [host -> commandCount];
+    ENetBuffer * buffer = & host -> buffers [host -> bufferCount];
+    ENetAcknowledgement * acknowledgement;
+    ENetListIterator currentAcknowledgement;
+    enet_uint16 reliableSequenceNumber;
+ 
+    currentAcknowledgement = enet_list_begin (& peer -> acknowledgements);
+         
+    while (currentAcknowledgement != enet_list_end (& peer -> acknowledgements))
+    {
+       if (command >= & host -> commands [sizeof (host -> commands) / sizeof (ENetProtocol)] ||
+           buffer >= & host -> buffers [sizeof (host -> buffers) / sizeof (ENetBuffer)] ||
+           peer -> mtu - host -> packetSize < sizeof (ENetProtocolAcknowledge))
+       {
+          host -> continueSending = 1;
+
+          break;
+       }
+
+       acknowledgement = (ENetAcknowledgement *) currentAcknowledgement;
+ 
+       currentAcknowledgement = enet_list_next (currentAcknowledgement);
+
+       buffer -> data = command;
+       buffer -> dataLength = sizeof (ENetProtocolAcknowledge);
+
+       host -> packetSize += buffer -> dataLength;
+
+       reliableSequenceNumber = ENET_HOST_TO_NET_16 (acknowledgement -> command.header.reliableSequenceNumber);
+  
+       command -> header.command = ENET_PROTOCOL_COMMAND_ACKNOWLEDGE;
+       command -> header.channelID = acknowledgement -> command.header.channelID;
+       command -> header.reliableSequenceNumber = reliableSequenceNumber;
+       command -> acknowledge.receivedReliableSequenceNumber = reliableSequenceNumber;
+       command -> acknowledge.receivedSentTime = ENET_HOST_TO_NET_16 (acknowledgement -> sentTime);
+  
+       if ((acknowledgement -> command.header.command & ENET_PROTOCOL_COMMAND_MASK) == ENET_PROTOCOL_COMMAND_DISCONNECT)
+         enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
+
+       enet_list_remove (& acknowledgement -> acknowledgementList);
+       enet_free (acknowledgement);
+
+       ++ command;
+       ++ buffer;
+    }
+
+    host -> commandCount = command - host -> commands;
+    host -> bufferCount = buffer - host -> buffers;
+}
+
+static void
+enet_protocol_send_unreliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
+{
+    ENetProtocol * command = & host -> commands [host -> commandCount];
+    ENetBuffer * buffer = & host -> buffers [host -> bufferCount];
+    ENetOutgoingCommand * outgoingCommand;
+    ENetListIterator currentCommand;
+
+    currentCommand = enet_list_begin (& peer -> outgoingUnreliableCommands);
+    
+    while (currentCommand != enet_list_end (& peer -> outgoingUnreliableCommands))
+    {
+       size_t commandSize;
+
+       outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+       commandSize = commandSizes [outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK];
+
+       if (command >= & host -> commands [sizeof (host -> commands) / sizeof (ENetProtocol)] ||
+           buffer + 1 >= & host -> buffers [sizeof (host -> buffers) / sizeof (ENetBuffer)] ||
+           peer -> mtu - host -> packetSize < commandSize ||
+           (outgoingCommand -> packet != NULL &&
+             peer -> mtu - host -> packetSize < commandSize + outgoingCommand -> fragmentLength))
+       {
+          host -> continueSending = 1;
+
+          break;
+       }
+
+       currentCommand = enet_list_next (currentCommand);
+
+       if (outgoingCommand -> packet != NULL && outgoingCommand -> fragmentOffset == 0)
+       {
+          peer -> packetThrottleCounter += ENET_PEER_PACKET_THROTTLE_COUNTER;
+          peer -> packetThrottleCounter %= ENET_PEER_PACKET_THROTTLE_SCALE;
+          
+          if (peer -> packetThrottleCounter > peer -> packetThrottle)
+          {
+             enet_uint16 reliableSequenceNumber = outgoingCommand -> reliableSequenceNumber,
+                         unreliableSequenceNumber = outgoingCommand -> unreliableSequenceNumber;
+             for (;;)
+             {
+                -- outgoingCommand -> packet -> referenceCount;
+
+                if (outgoingCommand -> packet -> referenceCount == 0)
+                  enet_packet_destroy (outgoingCommand -> packet);
+         
+                enet_list_remove (& outgoingCommand -> outgoingCommandList);
+                enet_free (outgoingCommand);
+
+                if (currentCommand == enet_list_end (& peer -> outgoingUnreliableCommands))
+                  break;
+
+                outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+                if (outgoingCommand -> reliableSequenceNumber != reliableSequenceNumber ||
+                    outgoingCommand -> unreliableSequenceNumber != unreliableSequenceNumber)
+                  break;
+
+                currentCommand = enet_list_next (currentCommand);
+             }
+           
+             continue;
+          }
+       }
+
+       buffer -> data = command;
+       buffer -> dataLength = commandSize;
+      
+       host -> packetSize += buffer -> dataLength;
+
+       * command = outgoingCommand -> command;
+       
+       enet_list_remove (& outgoingCommand -> outgoingCommandList);
+
+       if (outgoingCommand -> packet != NULL)
+       {
+          ++ buffer;
+          
+          buffer -> data = outgoingCommand -> packet -> data + outgoingCommand -> fragmentOffset;
+          buffer -> dataLength = outgoingCommand -> fragmentLength;
+
+          host -> packetSize += buffer -> dataLength;
+
+          enet_list_insert (enet_list_end (& peer -> sentUnreliableCommands), outgoingCommand);
+       }
+       else
+         enet_free (outgoingCommand);
+
+       ++ command;
+       ++ buffer;
+    } 
+
+    host -> commandCount = command - host -> commands;
+    host -> bufferCount = buffer - host -> buffers;
+
+    if (peer -> state == ENET_PEER_STATE_DISCONNECT_LATER && 
+        enet_list_empty (& peer -> outgoingReliableCommands) &&
+        enet_list_empty (& peer -> outgoingUnreliableCommands) && 
+        enet_list_empty (& peer -> sentReliableCommands))
+      enet_peer_disconnect (peer, peer -> eventData);
+}
+
+static int
+enet_protocol_check_timeouts (ENetHost * host, ENetPeer * peer, ENetEvent * event)
+{
+    ENetOutgoingCommand * outgoingCommand;
+    ENetListIterator currentCommand, insertPosition;
+
+    currentCommand = enet_list_begin (& peer -> sentReliableCommands);
+    insertPosition = enet_list_begin (& peer -> outgoingReliableCommands);
+
+    while (currentCommand != enet_list_end (& peer -> sentReliableCommands))
+    {
+       outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+
+       currentCommand = enet_list_next (currentCommand);
+
+       if (ENET_TIME_DIFFERENCE (host -> serviceTime, outgoingCommand -> sentTime) < outgoingCommand -> roundTripTimeout)
+         continue;
+
+       if (peer -> earliestTimeout == 0 ||
+           ENET_TIME_LESS (outgoingCommand -> sentTime, peer -> earliestTimeout))
+         peer -> earliestTimeout = outgoingCommand -> sentTime;
+
+       if (peer -> earliestTimeout != 0 &&
+             (ENET_TIME_DIFFERENCE (host -> serviceTime, peer -> earliestTimeout) >= peer -> timeoutMaximum ||
+               (outgoingCommand -> roundTripTimeout >= outgoingCommand -> roundTripTimeoutLimit &&
+                 ENET_TIME_DIFFERENCE (host -> serviceTime, peer -> earliestTimeout) >= peer -> timeoutMinimum)))
+       {
+          enet_protocol_notify_disconnect (host, peer, event);
+
+          return 1;
+       }
+
+       if (outgoingCommand -> packet != NULL)
+         peer -> reliableDataInTransit -= outgoingCommand -> fragmentLength;
+          
+       ++ peer -> packetsLost;
+
+       outgoingCommand -> roundTripTimeout *= 2;
+
+       enet_list_insert (insertPosition, enet_list_remove (& outgoingCommand -> outgoingCommandList));
+
+       if (currentCommand == enet_list_begin (& peer -> sentReliableCommands) &&
+           ! enet_list_empty (& peer -> sentReliableCommands))
+       {
+          outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+
+          peer -> nextTimeout = outgoingCommand -> sentTime + outgoingCommand -> roundTripTimeout;
+       }
+    }
+    
+    return 0;
+}
+
+static int
+enet_protocol_send_reliable_outgoing_commands (ENetHost * host, ENetPeer * peer)
+{
+    ENetProtocol * command = & host -> commands [host -> commandCount];
+    ENetBuffer * buffer = & host -> buffers [host -> bufferCount];
+    ENetOutgoingCommand * outgoingCommand;
+    ENetListIterator currentCommand;
+    ENetChannel *channel;
+    enet_uint16 reliableWindow;
+    size_t commandSize;
+    int windowExceeded = 0, windowWrap = 0, canPing = 1;
+
+    currentCommand = enet_list_begin (& peer -> outgoingReliableCommands);
+    
+    while (currentCommand != enet_list_end (& peer -> outgoingReliableCommands))
+    {
+       outgoingCommand = (ENetOutgoingCommand *) currentCommand;
+
+       channel = outgoingCommand -> command.header.channelID < peer -> channelCount ? & peer -> channels [outgoingCommand -> command.header.channelID] : NULL;
+       reliableWindow = outgoingCommand -> reliableSequenceNumber / ENET_PEER_RELIABLE_WINDOW_SIZE;
+       if (channel != NULL)
+       {
+           if (! windowWrap &&      
+               outgoingCommand -> sendAttempts < 1 && 
+               ! (outgoingCommand -> reliableSequenceNumber % ENET_PEER_RELIABLE_WINDOW_SIZE) &&
+               (channel -> reliableWindows [(reliableWindow + ENET_PEER_RELIABLE_WINDOWS - 1) % ENET_PEER_RELIABLE_WINDOWS] >= ENET_PEER_RELIABLE_WINDOW_SIZE ||
+                 channel -> usedReliableWindows & ((((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) << reliableWindow) | 
+                   (((1 << ENET_PEER_FREE_RELIABLE_WINDOWS) - 1) >> (ENET_PEER_RELIABLE_WINDOWS - reliableWindow)))))
+             windowWrap = 1;
+          if (windowWrap)
+          {
+             currentCommand = enet_list_next (currentCommand);
+ 
+             continue;
+          }
+       }
+ 
+       if (outgoingCommand -> packet != NULL)
+       {
+          if (! windowExceeded)
+          {
+             enet_uint32 windowSize = (peer -> packetThrottle * peer -> windowSize) / ENET_PEER_PACKET_THROTTLE_SCALE;
+             
+             if (peer -> reliableDataInTransit + outgoingCommand -> fragmentLength > ENET_MAX (windowSize, peer -> mtu))
+               windowExceeded = 1;
+          }
+          if (windowExceeded)
+          {
+             currentCommand = enet_list_next (currentCommand);
+
+             continue;
+          }
+       }
+
+       canPing = 0;
+
+       commandSize = commandSizes [outgoingCommand -> command.header.command & ENET_PROTOCOL_COMMAND_MASK];
+       if (command >= & host -> commands [sizeof (host -> commands) / sizeof (ENetProtocol)] ||
+           buffer + 1 >= & host -> buffers [sizeof (host -> buffers) / sizeof (ENetBuffer)] ||
+           peer -> mtu - host -> packetSize < commandSize ||
+           (outgoingCommand -> packet != NULL && 
+             (enet_uint16) (peer -> mtu - host -> packetSize) < (enet_uint16) (commandSize + outgoingCommand -> fragmentLength)))
+       {
+          host -> continueSending = 1;
+          
+          break;
+       }
+
+       currentCommand = enet_list_next (currentCommand);
+
+       if (channel != NULL && outgoingCommand -> sendAttempts < 1)
+       {
+          channel -> usedReliableWindows |= 1 << reliableWindow;
+          ++ channel -> reliableWindows [reliableWindow];
+       }
+
+       ++ outgoingCommand -> sendAttempts;
+ 
+       if (outgoingCommand -> roundTripTimeout == 0)
+       {
+          outgoingCommand -> roundTripTimeout = peer -> roundTripTime + 4 * peer -> roundTripTimeVariance;
+          outgoingCommand -> roundTripTimeoutLimit = peer -> timeoutLimit * outgoingCommand -> roundTripTimeout;
+       }
+
+       if (enet_list_empty (& peer -> sentReliableCommands))
+         peer -> nextTimeout = host -> serviceTime + outgoingCommand -> roundTripTimeout;
+
+       enet_list_insert (enet_list_end (& peer -> sentReliableCommands),
+                         enet_list_remove (& outgoingCommand -> outgoingCommandList));
+
+       outgoingCommand -> sentTime = host -> serviceTime;
+
+       buffer -> data = command;
+       buffer -> dataLength = commandSize;
+
+       host -> packetSize += buffer -> dataLength;
+       host -> headerFlags |= ENET_PROTOCOL_HEADER_FLAG_SENT_TIME;
+
+       * command = outgoingCommand -> command;
+
+       if (outgoingCommand -> packet != NULL)
+       {
+          ++ buffer;
+          
+          buffer -> data = outgoingCommand -> packet -> data + outgoingCommand -> fragmentOffset;
+          buffer -> dataLength = outgoingCommand -> fragmentLength;
+
+          host -> packetSize += outgoingCommand -> fragmentLength;
+
+          peer -> reliableDataInTransit += outgoingCommand -> fragmentLength;
+       }
+
+       ++ peer -> packetsSent;
+        
+       ++ command;
+       ++ buffer;
+    }
+
+    host -> commandCount = command - host -> commands;
+    host -> bufferCount = buffer - host -> buffers;
+
+    return canPing;
+}
+
+static int
+enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int checkForTimeouts)
+{
+    enet_uint8 headerData [sizeof (ENetProtocolHeader) + sizeof (enet_uint32)];
+    ENetProtocolHeader * header = (ENetProtocolHeader *) headerData;
+    ENetPeer * currentPeer;
+    int sentLength;
+    size_t shouldCompress = 0;
+ 
+    host -> continueSending = 1;
+
+    while (host -> continueSending)
+    for (host -> continueSending = 0,
+           currentPeer = host -> peers;
+         currentPeer < & host -> peers [host -> peerCount];
+         ++ currentPeer)
+    {
+        if (currentPeer -> state == ENET_PEER_STATE_DISCONNECTED ||
+            currentPeer -> state == ENET_PEER_STATE_ZOMBIE)
+          continue;
+
+        host -> headerFlags = 0;
+        host -> commandCount = 0;
+        host -> bufferCount = 1;
+        host -> packetSize = sizeof (ENetProtocolHeader);
+
+        if (! enet_list_empty (& currentPeer -> acknowledgements))
+          enet_protocol_send_acknowledgements (host, currentPeer);
+
+        if (checkForTimeouts != 0 &&
+            ! enet_list_empty (& currentPeer -> sentReliableCommands) &&
+            ENET_TIME_GREATER_EQUAL (host -> serviceTime, currentPeer -> nextTimeout) &&
+            enet_protocol_check_timeouts (host, currentPeer, event) == 1)
+        {
+            if (event != NULL && event -> type != ENET_EVENT_TYPE_NONE)
+              return 1;
+            else
+              continue;
+        }
+
+        if ((enet_list_empty (& currentPeer -> outgoingReliableCommands) ||
+              enet_protocol_send_reliable_outgoing_commands (host, currentPeer)) &&
+            enet_list_empty (& currentPeer -> sentReliableCommands) &&
+            ENET_TIME_DIFFERENCE (host -> serviceTime, currentPeer -> lastReceiveTime) >= currentPeer -> pingInterval &&
+            currentPeer -> mtu - host -> packetSize >= sizeof (ENetProtocolPing))
+        { 
+            enet_peer_ping (currentPeer);
+            enet_protocol_send_reliable_outgoing_commands (host, currentPeer);
+        }
+                      
+        if (! enet_list_empty (& currentPeer -> outgoingUnreliableCommands))
+          enet_protocol_send_unreliable_outgoing_commands (host, currentPeer);
+
+        if (host -> commandCount == 0)
+          continue;
+
+        if (currentPeer -> packetLossEpoch == 0)
+          currentPeer -> packetLossEpoch = host -> serviceTime;
+        else
+        if (ENET_TIME_DIFFERENCE (host -> serviceTime, currentPeer -> packetLossEpoch) >= ENET_PEER_PACKET_LOSS_INTERVAL &&
+            currentPeer -> packetsSent > 0)
+        {
+           enet_uint32 packetLoss = currentPeer -> packetsLost * ENET_PEER_PACKET_LOSS_SCALE / currentPeer -> packetsSent;
+
+#ifdef ENET_DEBUG
+           printf ("peer %u: %f%%+-%f%% packet loss, %u+-%u ms round trip time, %f%% throttle, %u/%u outgoing, %u/%u incoming\n", currentPeer -> incomingPeerID, currentPeer -> packetLoss / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> packetLossVariance / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> roundTripTime, currentPeer -> roundTripTimeVariance, currentPeer -> packetThrottle / (float) ENET_PEER_PACKET_THROTTLE_SCALE, enet_list_size (& currentPeer -> outgoingReliableCommands), enet_list_size (& currentPeer -> outgoingUnreliableCommands), currentPeer -> channels != NULL ? enet_list_size (& currentPeer -> channels -> incomingReliableCommands) : 0, currentPeer -> channels != NULL ? enet_list_size (& currentPeer -> channels -> incomingUnreliableCommands) : 0);
+#endif
+          
+           currentPeer -> packetLossVariance -= currentPeer -> packetLossVariance / 4;
+
+           if (packetLoss >= currentPeer -> packetLoss)
+           {
+              currentPeer -> packetLoss += (packetLoss - currentPeer -> packetLoss) / 8;
+              currentPeer -> packetLossVariance += (packetLoss - currentPeer -> packetLoss) / 4;
+           }
+           else
+           {
+              currentPeer -> packetLoss -= (currentPeer -> packetLoss - packetLoss) / 8;
+              currentPeer -> packetLossVariance += (currentPeer -> packetLoss - packetLoss) / 4;
+           }
+
+           currentPeer -> packetLossEpoch = host -> serviceTime;
+           currentPeer -> packetsSent = 0;
+           currentPeer -> packetsLost = 0;
+        }
+
+        host -> buffers -> data = headerData;
+        if (host -> headerFlags & ENET_PROTOCOL_HEADER_FLAG_SENT_TIME)
+        {
+            header -> sentTime = ENET_HOST_TO_NET_16 (host -> serviceTime & 0xFFFF);
+
+            host -> buffers -> dataLength = sizeof (ENetProtocolHeader);
+        }
+        else
+          host -> buffers -> dataLength = (size_t) & ((ENetProtocolHeader *) 0) -> sentTime;
+
+        shouldCompress = 0;
+        if (host -> compressor.context != NULL && host -> compressor.compress != NULL)
+        {
+            size_t originalSize = host -> packetSize - sizeof(ENetProtocolHeader),
+                   compressedSize = host -> compressor.compress (host -> compressor.context,
+                                        & host -> buffers [1], host -> bufferCount - 1,
+                                        originalSize,
+                                        host -> packetData [1],
+                                        originalSize);
+            if (compressedSize > 0 && compressedSize < originalSize)
+            {
+                host -> headerFlags |= ENET_PROTOCOL_HEADER_FLAG_COMPRESSED;
+                shouldCompress = compressedSize;
+#ifdef ENET_DEBUG_COMPRESS
+                printf ("peer %u: compressed %u -> %u (%u%%)\n", currentPeer -> incomingPeerID, originalSize, compressedSize, (compressedSize * 100) / originalSize);
+#endif
+            }
+        }
+
+        if (currentPeer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID)
+          host -> headerFlags |= currentPeer -> outgoingSessionID << ENET_PROTOCOL_HEADER_SESSION_SHIFT;
+        header -> peerID = ENET_HOST_TO_NET_16 (currentPeer -> outgoingPeerID | host -> headerFlags);
+        if (host -> checksum != NULL)
+        {
+            enet_uint32 * checksum = (enet_uint32 *) & headerData [host -> buffers -> dataLength];
+            * checksum = currentPeer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID ? currentPeer -> connectID : 0;
+            host -> buffers -> dataLength += sizeof (enet_uint32);
+            * checksum = host -> checksum (host -> buffers, host -> bufferCount);
+        }
+
+        if (shouldCompress > 0)
+        {
+            host -> buffers [1].data = host -> packetData [1];
+            host -> buffers [1].dataLength = shouldCompress;
+            host -> bufferCount = 2;
+        }
+
+        currentPeer -> lastSendTime = host -> serviceTime;
+
+        sentLength = enet_socket_send (host -> socket, & currentPeer -> address, host -> buffers, host -> bufferCount);
+
+        enet_protocol_remove_sent_unreliable_commands (currentPeer);
+
+        if (sentLength < 0)
+          return -1;
+
+        host -> totalSentData += sentLength;
+        host -> totalSentPackets ++;
+    }
+   
+    return 0;
+}
+
+/** Sends any queued packets on the host specified to its designated peers.
+
+    @param host   host to flush
+    @remarks this function need only be used in circumstances where one wishes to send queued packets earlier than in a call to enet_host_service().
+    @ingroup host
+*/
+void
+enet_host_flush (ENetHost * host)
+{
+    host -> serviceTime = enet_time_get ();
+
+    enet_protocol_send_outgoing_commands (host, NULL, 0);
+}
+
+/** Checks for any queued events on the host and dispatches one if available.
+
+    @param host    host to check for events
+    @param event   an event structure where event details will be placed if available
+    @retval > 0 if an event was dispatched
+    @retval 0 if no events are available
+    @retval < 0 on failure
+    @ingroup host
+*/
+int
+enet_host_check_events (ENetHost * host, ENetEvent * event)
+{
+    if (event == NULL) return -1;
+
+    event -> type = ENET_EVENT_TYPE_NONE;
+    event -> peer = NULL;
+    event -> packet = NULL;
+
+    return enet_protocol_dispatch_incoming_commands (host, event);
+}
+
+/** Waits for events on the host specified and shuttles packets between
+    the host and its peers.
+
+    @param host    host to service
+    @param event   an event structure where event details will be placed if one occurs
+                   if event == NULL then no events will be delivered
+    @param timeout number of milliseconds that ENet should wait for events
+    @retval > 0 if an event occurred within the specified time limit
+    @retval 0 if no event occurred
+    @retval < 0 on failure
+    @remarks enet_host_service should be called fairly regularly for adequate performance
+    @ingroup host
+*/
+int
+enet_host_service (ENetHost * host, ENetEvent * event, enet_uint32 timeout)
+{
+    enet_uint32 waitCondition;
+
+    if (event != NULL)
+    {
+        event -> type = ENET_EVENT_TYPE_NONE;
+        event -> peer = NULL;
+        event -> packet = NULL;
+
+        switch (enet_protocol_dispatch_incoming_commands (host, event))
+        {
+        case 1:
+            return 1;
+
+        case -1:
+#ifdef ENET_DEBUG
+            perror ("Error dispatching incoming packets");
+#endif
+
+            return -1;
+
+        default:
+            break;
+        }
+    }
+
+    host -> serviceTime = enet_time_get ();
+    
+    timeout += host -> serviceTime;
+
+    do
+    {
+       if (ENET_TIME_DIFFERENCE (host -> serviceTime, host -> bandwidthThrottleEpoch) >= ENET_HOST_BANDWIDTH_THROTTLE_INTERVAL)
+         enet_host_bandwidth_throttle (host);
+
+       switch (enet_protocol_send_outgoing_commands (host, event, 1))
+       {
+       case 1:
+          return 1;
+
+       case -1:
+#ifdef ENET_DEBUG
+          perror ("Error sending outgoing packets");
+#endif
+
+          return -1;
+
+       default:
+          break;
+       }
+
+       switch (enet_protocol_receive_incoming_commands (host, event))
+       {
+       case 1:
+          return 1;
+
+       case -1:
+#ifdef ENET_DEBUG
+          perror ("Error receiving incoming packets");
+#endif
+
+          return -1;
+
+       default:
+          break;
+       }
+
+       switch (enet_protocol_send_outgoing_commands (host, event, 1))
+       {
+       case 1:
+          return 1;
+
+       case -1:
+#ifdef ENET_DEBUG
+          perror ("Error sending outgoing packets");
+#endif
+
+          return -1;
+
+       default:
+          break;
+       }
+
+       if (event != NULL)
+       {
+          switch (enet_protocol_dispatch_incoming_commands (host, event))
+          {
+          case 1:
+             return 1;
+
+          case -1:
+#ifdef ENET_DEBUG
+             perror ("Error dispatching incoming packets");
+#endif
+
+             return -1;
+
+          default:
+             break;
+          }
+       }
+
+       if (ENET_TIME_GREATER_EQUAL (host -> serviceTime, timeout))
+         return 0;
+
+       do
+       {
+          host -> serviceTime = enet_time_get ();
+
+          if (ENET_TIME_GREATER_EQUAL (host -> serviceTime, timeout))
+            return 0;
+
+          waitCondition = ENET_SOCKET_WAIT_RECEIVE | ENET_SOCKET_WAIT_INTERRUPT;
+
+          if (enet_socket_wait (host -> socket, & waitCondition, ENET_TIME_DIFFERENCE (timeout, host -> serviceTime)) != 0)
+            return -1;
+       }
+       while (waitCondition & ENET_SOCKET_WAIT_INTERRUPT);
+
+       host -> serviceTime = enet_time_get ();
+    } while (waitCondition & ENET_SOCKET_WAIT_RECEIVE);
+
+    return 0; 
+}
+
diff --git a/Externals/enet/unix.c b/Externals/enet/unix.c
new file mode 100644
index 0000000000..90e55b146b
--- /dev/null
+++ b/Externals/enet/unix.c
@@ -0,0 +1,610 @@
+/** 
+ @file  unix.c
+ @brief ENet Unix system specific functions
+*/
+#ifndef _WIN32
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+
+#ifdef __APPLE__
+#ifdef HAS_POLL
+#undef HAS_POLL
+#endif
+#ifndef HAS_FCNTL
+#define HAS_FCNTL 1
+#endif
+#ifndef HAS_INET_PTON
+#define HAS_INET_PTON 1
+#endif
+#ifndef HAS_INET_NTOP
+#define HAS_INET_NTOP 1
+#endif
+#ifndef HAS_MSGHDR_FLAGS
+#define HAS_MSGHDR_FLAGS 1
+#endif
+#ifndef HAS_SOCKLEN_T
+#define HAS_SOCKLEN_T 1
+#endif
+#ifndef HAS_GETADDRINFO
+#define HAS_GETADDRINFO 1
+#endif
+#ifndef HAS_GETNAMEINFO
+#define HAS_GETNAMEINFO 1
+#endif
+#endif
+
+#ifdef HAS_FCNTL
+#include <fcntl.h>
+#endif
+
+#ifdef HAS_POLL
+#include <sys/poll.h>
+#endif
+
+#ifndef HAS_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+static enet_uint32 timeBase = 0;
+
+int
+enet_initialize (void)
+{
+    return 0;
+}
+
+void
+enet_deinitialize (void)
+{
+}
+
+enet_uint32
+enet_host_random_seed (void)
+{
+    return (enet_uint32) time (NULL);
+}
+
+enet_uint32
+enet_time_get (void)
+{
+    struct timeval timeVal;
+
+    gettimeofday (& timeVal, NULL);
+
+    return timeVal.tv_sec * 1000 + timeVal.tv_usec / 1000 - timeBase;
+}
+
+void
+enet_time_set (enet_uint32 newTimeBase)
+{
+    struct timeval timeVal;
+
+    gettimeofday (& timeVal, NULL);
+    
+    timeBase = timeVal.tv_sec * 1000 + timeVal.tv_usec / 1000 - newTimeBase;
+}
+
+int
+enet_address_set_host (ENetAddress * address, const char * name)
+{
+#ifdef HAS_GETADDRINFO
+    struct addrinfo hints, * resultList = NULL, * result = NULL;
+
+    memset (& hints, 0, sizeof (hints));
+    hints.ai_family = AF_INET;
+
+    if (getaddrinfo (name, NULL, NULL, & resultList) != 0)
+      return -1;
+
+    for (result = resultList; result != NULL; result = result -> ai_next)
+    {
+        if (result -> ai_family == AF_INET && result -> ai_addr != NULL && result -> ai_addrlen >= sizeof (struct sockaddr_in))
+        {
+            struct sockaddr_in * sin = (struct sockaddr_in *) result -> ai_addr;
+
+            address -> host = sin -> sin_addr.s_addr;
+
+            freeaddrinfo (resultList);
+
+            return 0;
+        }
+    }
+
+    if (resultList != NULL)
+      freeaddrinfo (resultList);
+#else
+    struct hostent * hostEntry = NULL;
+#ifdef HAS_GETHOSTBYNAME_R
+    struct hostent hostData;
+    char buffer [2048];
+    int errnum;
+
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+    gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
+#else
+    hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
+#endif
+#else
+    hostEntry = gethostbyname (name);
+#endif
+
+    if (hostEntry != NULL && hostEntry -> h_addrtype == AF_INET)
+    {
+        address -> host = * (enet_uint32 *) hostEntry -> h_addr_list [0];
+
+        return 0;
+    }
+#endif
+
+#ifdef HAS_INET_PTON
+    if (! inet_pton (AF_INET, name, & address -> host))
+#else
+    if (! inet_aton (name, (struct in_addr *) & address -> host))
+#endif
+        return -1;
+
+    return 0;
+}
+
+int
+enet_address_get_host_ip (const ENetAddress * address, char * name, size_t nameLength)
+{
+#ifdef HAS_INET_NTOP
+    if (inet_ntop (AF_INET, & address -> host, name, nameLength) == NULL)
+#else
+    char * addr = inet_ntoa (* (struct in_addr *) & address -> host);
+    if (addr != NULL)
+    {
+        size_t addrLen = strlen(addr);
+        if (addrLen >= nameLength)
+          return -1;
+        memcpy (name, addr, addrLen + 1);
+    } 
+    else
+#endif
+        return -1;
+    return 0;
+}
+
+int
+enet_address_get_host (const ENetAddress * address, char * name, size_t nameLength)
+{
+#ifdef HAS_GETNAMEINFO
+    struct sockaddr_in sin;
+    int err;
+
+    memset (& sin, 0, sizeof (struct sockaddr_in));
+
+    sin.sin_family = AF_INET;
+    sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+    sin.sin_addr.s_addr = address -> host;
+
+    err = getnameinfo ((struct sockaddr *) & sin, sizeof (sin), name, nameLength, NULL, 0, NI_NAMEREQD);
+    if (! err)
+    {
+        if (name != NULL && nameLength > 0 && ! memchr (name, '\0', nameLength))
+          return -1;
+        return 0;
+    }
+    if (err != EAI_NONAME)
+      return 0;
+#else
+    struct in_addr in;
+    struct hostent * hostEntry = NULL;
+#ifdef HAS_GETHOSTBYADDR_R
+    struct hostent hostData;
+    char buffer [2048];
+    int errnum;
+
+    in.s_addr = address -> host;
+
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+    gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
+#else
+    hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);
+#endif
+#else
+    in.s_addr = address -> host;
+
+    hostEntry = gethostbyaddr ((char *) & in, sizeof (struct in_addr), AF_INET);
+#endif
+
+    if (hostEntry != NULL)
+    {
+       size_t hostLen = strlen (hostEntry -> h_name);
+       if (hostLen >= nameLength)
+         return -1;
+       memcpy (name, hostEntry -> h_name, hostLen + 1);
+       return 0;
+    }
+#endif
+
+    return enet_address_get_host_ip (address, name, nameLength);
+}
+
+int
+enet_socket_bind (ENetSocket socket, const ENetAddress * address)
+{
+    struct sockaddr_in sin;
+
+    memset (& sin, 0, sizeof (struct sockaddr_in));
+
+    sin.sin_family = AF_INET;
+
+    if (address != NULL)
+    {
+       sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+       sin.sin_addr.s_addr = address -> host;
+    }
+    else
+    {
+       sin.sin_port = 0;
+       sin.sin_addr.s_addr = INADDR_ANY;
+    }
+
+    return bind (socket,
+                 (struct sockaddr *) & sin,
+                 sizeof (struct sockaddr_in)); 
+}
+
+int
+enet_socket_get_address (ENetSocket socket, ENetAddress * address)
+{
+    struct sockaddr_in sin;
+    socklen_t sinLength = sizeof (struct sockaddr_in);
+
+    if (getsockname (socket, (struct sockaddr *) & sin, & sinLength) == -1)
+      return -1;
+
+    address -> host = (enet_uint32) sin.sin_addr.s_addr;
+    address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+
+    return 0;
+}
+
+int 
+enet_socket_listen (ENetSocket socket, int backlog)
+{
+    return listen (socket, backlog < 0 ? SOMAXCONN : backlog);
+}
+
+ENetSocket
+enet_socket_create (ENetSocketType type)
+{
+    return socket (PF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
+}
+
+int
+enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value)
+{
+    int result = -1;
+    switch (option)
+    {
+        case ENET_SOCKOPT_NONBLOCK:
+#ifdef HAS_FCNTL
+            result = fcntl (socket, F_SETFL, (value ? O_NONBLOCK : 0) | (fcntl (socket, F_GETFL) & ~O_NONBLOCK));
+#else
+            result = ioctl (socket, FIONBIO, & value);
+#endif
+            break;
+
+        case ENET_SOCKOPT_BROADCAST:
+            result = setsockopt (socket, SOL_SOCKET, SO_BROADCAST, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_REUSEADDR:
+            result = setsockopt (socket, SOL_SOCKET, SO_REUSEADDR, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_RCVBUF:
+            result = setsockopt (socket, SOL_SOCKET, SO_RCVBUF, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_SNDBUF:
+            result = setsockopt (socket, SOL_SOCKET, SO_SNDBUF, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_RCVTIMEO:
+        {
+            struct timeval timeVal;
+            timeVal.tv_sec = value / 1000;
+            timeVal.tv_usec = (value % 1000) * 1000;
+            result = setsockopt (socket, SOL_SOCKET, SO_RCVTIMEO, (char *) & timeVal, sizeof (struct timeval));
+            break;
+        }
+
+        case ENET_SOCKOPT_SNDTIMEO:
+        {
+            struct timeval timeVal;
+            timeVal.tv_sec = value / 1000;
+            timeVal.tv_usec = (value % 1000) * 1000;
+            result = setsockopt (socket, SOL_SOCKET, SO_SNDTIMEO, (char *) & timeVal, sizeof (struct timeval));
+            break;
+        }
+
+        case ENET_SOCKOPT_NODELAY:
+            result = setsockopt (socket, IPPROTO_TCP, TCP_NODELAY, (char *) & value, sizeof (int));
+            break;
+
+        default:
+            break;
+    }
+    return result == -1 ? -1 : 0;
+}
+
+int
+enet_socket_get_option (ENetSocket socket, ENetSocketOption option, int * value)
+{
+    int result = -1;
+    socklen_t len;
+    switch (option)
+    {
+        case ENET_SOCKOPT_ERROR:
+            len = sizeof (int);
+            result = getsockopt (socket, SOL_SOCKET, SO_ERROR, value, & len);
+            break;
+
+        default:
+            break;
+    }
+    return result == -1 ? -1 : 0;
+}
+
+int
+enet_socket_connect (ENetSocket socket, const ENetAddress * address)
+{
+    struct sockaddr_in sin;
+    int result;
+
+    memset (& sin, 0, sizeof (struct sockaddr_in));
+
+    sin.sin_family = AF_INET;
+    sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+    sin.sin_addr.s_addr = address -> host;
+
+    result = connect (socket, (struct sockaddr *) & sin, sizeof (struct sockaddr_in));
+    if (result == -1 && errno == EINPROGRESS)
+      return 0;
+
+    return result;
+}
+
+ENetSocket
+enet_socket_accept (ENetSocket socket, ENetAddress * address)
+{
+    int result;
+    struct sockaddr_in sin;
+    socklen_t sinLength = sizeof (struct sockaddr_in);
+
+    result = accept (socket, 
+                     address != NULL ? (struct sockaddr *) & sin : NULL, 
+                     address != NULL ? & sinLength : NULL);
+    
+    if (result == -1)
+      return ENET_SOCKET_NULL;
+
+    if (address != NULL)
+    {
+        address -> host = (enet_uint32) sin.sin_addr.s_addr;
+        address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+    }
+
+    return result;
+} 
+    
+int
+enet_socket_shutdown (ENetSocket socket, ENetSocketShutdown how)
+{
+    return shutdown (socket, (int) how);
+}
+
+void
+enet_socket_destroy (ENetSocket socket)
+{
+    if (socket != -1)
+      close (socket);
+}
+
+int
+enet_socket_send (ENetSocket socket,
+                  const ENetAddress * address,
+                  const ENetBuffer * buffers,
+                  size_t bufferCount)
+{
+    struct msghdr msgHdr;
+    struct sockaddr_in sin;
+    int sentLength;
+
+    memset (& msgHdr, 0, sizeof (struct msghdr));
+
+    if (address != NULL)
+    {
+        memset (& sin, 0, sizeof (struct sockaddr_in));
+
+        sin.sin_family = AF_INET;
+        sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+        sin.sin_addr.s_addr = address -> host;
+
+        msgHdr.msg_name = & sin;
+        msgHdr.msg_namelen = sizeof (struct sockaddr_in);
+    }
+
+    msgHdr.msg_iov = (struct iovec *) buffers;
+    msgHdr.msg_iovlen = bufferCount;
+
+    sentLength = sendmsg (socket, & msgHdr, MSG_NOSIGNAL);
+    
+    if (sentLength == -1)
+    {
+       if (errno == EWOULDBLOCK)
+         return 0;
+
+       return -1;
+    }
+
+    return sentLength;
+}
+
+int
+enet_socket_receive (ENetSocket socket,
+                     ENetAddress * address,
+                     ENetBuffer * buffers,
+                     size_t bufferCount)
+{
+    struct msghdr msgHdr;
+    struct sockaddr_in sin;
+    int recvLength;
+
+    memset (& msgHdr, 0, sizeof (struct msghdr));
+
+    if (address != NULL)
+    {
+        msgHdr.msg_name = & sin;
+        msgHdr.msg_namelen = sizeof (struct sockaddr_in);
+    }
+
+    msgHdr.msg_iov = (struct iovec *) buffers;
+    msgHdr.msg_iovlen = bufferCount;
+
+    recvLength = recvmsg (socket, & msgHdr, MSG_NOSIGNAL);
+
+    if (recvLength == -1)
+    {
+       if (errno == EWOULDBLOCK)
+         return 0;
+
+       return -1;
+    }
+
+#ifdef HAS_MSGHDR_FLAGS
+    if (msgHdr.msg_flags & MSG_TRUNC)
+      return -1;
+#endif
+
+    if (address != NULL)
+    {
+        address -> host = (enet_uint32) sin.sin_addr.s_addr;
+        address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+    }
+
+    return recvLength;
+}
+
+int
+enet_socketset_select (ENetSocket maxSocket, ENetSocketSet * readSet, ENetSocketSet * writeSet, enet_uint32 timeout)
+{
+    struct timeval timeVal;
+
+    timeVal.tv_sec = timeout / 1000;
+    timeVal.tv_usec = (timeout % 1000) * 1000;
+
+    return select (maxSocket + 1, readSet, writeSet, NULL, & timeVal);
+}
+
+int
+enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeout)
+{
+#ifdef HAS_POLL
+    struct pollfd pollSocket;
+    int pollCount;
+    
+    pollSocket.fd = socket;
+    pollSocket.events = 0;
+
+    if (* condition & ENET_SOCKET_WAIT_SEND)
+      pollSocket.events |= POLLOUT;
+
+    if (* condition & ENET_SOCKET_WAIT_RECEIVE)
+      pollSocket.events |= POLLIN;
+
+    pollCount = poll (& pollSocket, 1, timeout);
+
+    if (pollCount < 0)
+    {
+        if (errno == EINTR && * condition & ENET_SOCKET_WAIT_INTERRUPT)
+        {
+            * condition = ENET_SOCKET_WAIT_INTERRUPT;
+
+            return 0;
+        }
+
+        return -1;
+    }
+
+    * condition = ENET_SOCKET_WAIT_NONE;
+
+    if (pollCount == 0)
+      return 0;
+
+    if (pollSocket.revents & POLLOUT)
+      * condition |= ENET_SOCKET_WAIT_SEND;
+    
+    if (pollSocket.revents & POLLIN)
+      * condition |= ENET_SOCKET_WAIT_RECEIVE;
+
+    return 0;
+#else
+    fd_set readSet, writeSet;
+    struct timeval timeVal;
+    int selectCount;
+
+    timeVal.tv_sec = timeout / 1000;
+    timeVal.tv_usec = (timeout % 1000) * 1000;
+
+    FD_ZERO (& readSet);
+    FD_ZERO (& writeSet);
+
+    if (* condition & ENET_SOCKET_WAIT_SEND)
+      FD_SET (socket, & writeSet);
+
+    if (* condition & ENET_SOCKET_WAIT_RECEIVE)
+      FD_SET (socket, & readSet);
+
+    selectCount = select (socket + 1, & readSet, & writeSet, NULL, & timeVal);
+
+    if (selectCount < 0)
+    {
+        if (errno == EINTR && * condition & ENET_SOCKET_WAIT_INTERRUPT)
+        {
+            * condition = ENET_SOCKET_WAIT_INTERRUPT;
+
+            return 0;
+        }
+      
+        return -1;
+    }
+
+    * condition = ENET_SOCKET_WAIT_NONE;
+
+    if (selectCount == 0)
+      return 0;
+
+    if (FD_ISSET (socket, & writeSet))
+      * condition |= ENET_SOCKET_WAIT_SEND;
+
+    if (FD_ISSET (socket, & readSet))
+      * condition |= ENET_SOCKET_WAIT_RECEIVE;
+
+    return 0;
+#endif
+}
+
+#endif
+
diff --git a/Externals/enet/win32.c b/Externals/enet/win32.c
new file mode 100644
index 0000000000..5cc167997c
--- /dev/null
+++ b/Externals/enet/win32.c
@@ -0,0 +1,422 @@
+/** 
+ @file  win32.c
+ @brief ENet Win32 system specific functions
+*/
+#ifdef _WIN32
+
+#define ENET_BUILDING_LIB 1
+#include "enet/enet.h"
+#include <windows.h>
+#include <mmsystem.h>
+
+static enet_uint32 timeBase = 0;
+
+int
+enet_initialize (void)
+{
+    WORD versionRequested = MAKEWORD (1, 1);
+    WSADATA wsaData;
+   
+    if (WSAStartup (versionRequested, & wsaData))
+       return -1;
+
+    if (LOBYTE (wsaData.wVersion) != 1||
+        HIBYTE (wsaData.wVersion) != 1)
+    {
+       WSACleanup ();
+       
+       return -1;
+    }
+
+    timeBeginPeriod (1);
+
+    return 0;
+}
+
+void
+enet_deinitialize (void)
+{
+    timeEndPeriod (1);
+
+    WSACleanup ();
+}
+
+enet_uint32
+enet_host_random_seed (void)
+{
+    return (enet_uint32) timeGetTime ();
+}
+
+enet_uint32
+enet_time_get (void)
+{
+    return (enet_uint32) timeGetTime () - timeBase;
+}
+
+void
+enet_time_set (enet_uint32 newTimeBase)
+{
+    timeBase = (enet_uint32) timeGetTime () - newTimeBase;
+}
+
+int
+enet_address_set_host (ENetAddress * address, const char * name)
+{
+    struct hostent * hostEntry;
+
+    hostEntry = gethostbyname (name);
+    if (hostEntry == NULL ||
+        hostEntry -> h_addrtype != AF_INET)
+    {
+        unsigned long host = inet_addr (name);
+        if (host == INADDR_NONE)
+            return -1;
+        address -> host = host;
+        return 0;
+    }
+
+    address -> host = * (enet_uint32 *) hostEntry -> h_addr_list [0];
+
+    return 0;
+}
+
+int
+enet_address_get_host_ip (const ENetAddress * address, char * name, size_t nameLength)
+{
+    char * addr = inet_ntoa (* (struct in_addr *) & address -> host);
+    if (addr == NULL)
+        return -1;
+    else
+    {
+        size_t addrLen = strlen(addr);
+        if (addrLen >= nameLength)
+          return -1;
+        memcpy (name, addr, addrLen + 1);
+    }
+    return 0;
+}
+
+int
+enet_address_get_host (const ENetAddress * address, char * name, size_t nameLength)
+{
+    struct in_addr in;
+    struct hostent * hostEntry;
+ 
+    in.s_addr = address -> host;
+    
+    hostEntry = gethostbyaddr ((char *) & in, sizeof (struct in_addr), AF_INET);
+    if (hostEntry == NULL)
+      return enet_address_get_host_ip (address, name, nameLength);
+    else
+    {
+       size_t hostLen = strlen (hostEntry -> h_name);
+       if (hostLen >= nameLength)
+         return -1;
+       memcpy (name, hostEntry -> h_name, hostLen + 1);
+    }
+
+    return 0;
+}
+
+int
+enet_socket_bind (ENetSocket socket, const ENetAddress * address)
+{
+    struct sockaddr_in sin;
+
+    memset (& sin, 0, sizeof (struct sockaddr_in));
+
+    sin.sin_family = AF_INET;
+
+    if (address != NULL)
+    {
+       sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+       sin.sin_addr.s_addr = address -> host;
+    }
+    else
+    {
+       sin.sin_port = 0;
+       sin.sin_addr.s_addr = INADDR_ANY;
+    }
+
+    return bind (socket,
+                 (struct sockaddr *) & sin,
+                 sizeof (struct sockaddr_in)) == SOCKET_ERROR ? -1 : 0;
+}
+
+int
+enet_socket_get_address (ENetSocket socket, ENetAddress * address)
+{
+    struct sockaddr_in sin;
+    int sinLength = sizeof (struct sockaddr_in);
+
+    if (getsockname (socket, (struct sockaddr *) & sin, & sinLength) == -1)
+      return -1;
+
+    address -> host = (enet_uint32) sin.sin_addr.s_addr;
+    address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+
+    return 0;
+}
+
+int
+enet_socket_listen (ENetSocket socket, int backlog)
+{
+    return listen (socket, backlog < 0 ? SOMAXCONN : backlog) == SOCKET_ERROR ? -1 : 0;
+}
+
+ENetSocket
+enet_socket_create (ENetSocketType type)
+{
+    return socket (PF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
+}
+
+int
+enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value)
+{
+    int result = SOCKET_ERROR;
+    switch (option)
+    {
+        case ENET_SOCKOPT_NONBLOCK:
+        {
+            u_long nonBlocking = (u_long) value;
+            result = ioctlsocket (socket, FIONBIO, & nonBlocking);
+            break;
+        }
+
+        case ENET_SOCKOPT_BROADCAST:
+            result = setsockopt (socket, SOL_SOCKET, SO_BROADCAST, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_REUSEADDR:
+            result = setsockopt (socket, SOL_SOCKET, SO_REUSEADDR, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_RCVBUF:
+            result = setsockopt (socket, SOL_SOCKET, SO_RCVBUF, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_SNDBUF:
+            result = setsockopt (socket, SOL_SOCKET, SO_SNDBUF, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_RCVTIMEO:
+            result = setsockopt (socket, SOL_SOCKET, SO_RCVTIMEO, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_SNDTIMEO:
+            result = setsockopt (socket, SOL_SOCKET, SO_SNDTIMEO, (char *) & value, sizeof (int));
+            break;
+
+        case ENET_SOCKOPT_NODELAY:
+            result = setsockopt (socket, IPPROTO_TCP, TCP_NODELAY, (char *) & value, sizeof (int));
+            break;
+
+        default:
+            break;
+    }
+    return result == SOCKET_ERROR ? -1 : 0;
+}
+
+int
+enet_socket_get_option (ENetSocket socket, ENetSocketOption option, int * value)
+{
+    int result = SOCKET_ERROR, len;
+    switch (option)
+    {
+        case ENET_SOCKOPT_ERROR:
+            len = sizeof(int);
+            result = getsockopt (socket, SOL_SOCKET, SO_ERROR, (char *) value, & len);
+            break;
+
+        default:
+            break;
+    }
+    return result == SOCKET_ERROR ? -1 : 0;
+}
+
+int
+enet_socket_connect (ENetSocket socket, const ENetAddress * address)
+{
+    struct sockaddr_in sin;
+    int result;
+
+    memset (& sin, 0, sizeof (struct sockaddr_in));
+
+    sin.sin_family = AF_INET;
+    sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+    sin.sin_addr.s_addr = address -> host;
+
+    result = connect (socket, (struct sockaddr *) & sin, sizeof (struct sockaddr_in));
+    if (result == SOCKET_ERROR && WSAGetLastError () != WSAEWOULDBLOCK)
+      return -1;
+
+    return 0;
+}
+
+ENetSocket
+enet_socket_accept (ENetSocket socket, ENetAddress * address)
+{
+    SOCKET result;
+    struct sockaddr_in sin;
+    int sinLength = sizeof (struct sockaddr_in);
+
+    result = accept (socket, 
+                     address != NULL ? (struct sockaddr *) & sin : NULL, 
+                     address != NULL ? & sinLength : NULL);
+
+    if (result == INVALID_SOCKET)
+      return ENET_SOCKET_NULL;
+
+    if (address != NULL)
+    {
+        address -> host = (enet_uint32) sin.sin_addr.s_addr;
+        address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+    }
+
+    return result;
+}
+
+int
+enet_socket_shutdown (ENetSocket socket, ENetSocketShutdown how)
+{
+    return shutdown (socket, (int) how) == SOCKET_ERROR ? -1 : 0;
+}
+
+void
+enet_socket_destroy (ENetSocket socket)
+{
+    if (socket != INVALID_SOCKET)
+      closesocket (socket);
+}
+
+int
+enet_socket_send (ENetSocket socket,
+                  const ENetAddress * address,
+                  const ENetBuffer * buffers,
+                  size_t bufferCount)
+{
+    struct sockaddr_in sin;
+    DWORD sentLength;
+
+    if (address != NULL)
+    {
+        memset (& sin, 0, sizeof (struct sockaddr_in));
+
+        sin.sin_family = AF_INET;
+        sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
+        sin.sin_addr.s_addr = address -> host;
+    }
+
+    if (WSASendTo (socket, 
+                   (LPWSABUF) buffers,
+                   (DWORD) bufferCount,
+                   & sentLength,
+                   0,
+                   address != NULL ? (struct sockaddr *) & sin : NULL,
+                   address != NULL ? sizeof (struct sockaddr_in) : 0,
+                   NULL,
+                   NULL) == SOCKET_ERROR)
+    {
+       if (WSAGetLastError () == WSAEWOULDBLOCK)
+         return 0;
+
+       return -1;
+    }
+
+    return (int) sentLength;
+}
+
+int
+enet_socket_receive (ENetSocket socket,
+                     ENetAddress * address,
+                     ENetBuffer * buffers,
+                     size_t bufferCount)
+{
+    INT sinLength = sizeof (struct sockaddr_in);
+    DWORD flags = 0,
+          recvLength;
+    struct sockaddr_in sin;
+
+    if (WSARecvFrom (socket,
+                     (LPWSABUF) buffers,
+                     (DWORD) bufferCount,
+                     & recvLength,
+                     & flags,
+                     address != NULL ? (struct sockaddr *) & sin : NULL,
+                     address != NULL ? & sinLength : NULL,
+                     NULL,
+                     NULL) == SOCKET_ERROR)
+    {
+       switch (WSAGetLastError ())
+       {
+       case WSAEWOULDBLOCK:
+       case WSAECONNRESET:
+          return 0;
+       }
+
+       return -1;
+    }
+
+    if (flags & MSG_PARTIAL)
+      return -1;
+
+    if (address != NULL)
+    {
+        address -> host = (enet_uint32) sin.sin_addr.s_addr;
+        address -> port = ENET_NET_TO_HOST_16 (sin.sin_port);
+    }
+
+    return (int) recvLength;
+}
+
+int
+enet_socketset_select (ENetSocket maxSocket, ENetSocketSet * readSet, ENetSocketSet * writeSet, enet_uint32 timeout)
+{
+    struct timeval timeVal;
+
+    timeVal.tv_sec = timeout / 1000;
+    timeVal.tv_usec = (timeout % 1000) * 1000;
+
+    return select (maxSocket + 1, readSet, writeSet, NULL, & timeVal);
+}
+
+int
+enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeout)
+{
+    fd_set readSet, writeSet;
+    struct timeval timeVal;
+    int selectCount;
+    
+    timeVal.tv_sec = timeout / 1000;
+    timeVal.tv_usec = (timeout % 1000) * 1000;
+    
+    FD_ZERO (& readSet);
+    FD_ZERO (& writeSet);
+
+    if (* condition & ENET_SOCKET_WAIT_SEND)
+      FD_SET (socket, & writeSet);
+
+    if (* condition & ENET_SOCKET_WAIT_RECEIVE)
+      FD_SET (socket, & readSet);
+
+    selectCount = select (socket + 1, & readSet, & writeSet, NULL, & timeVal);
+
+    if (selectCount < 0)
+      return -1;
+
+    * condition = ENET_SOCKET_WAIT_NONE;
+
+    if (selectCount == 0)
+      return 0;
+
+    if (FD_ISSET (socket, & writeSet))
+      * condition |= ENET_SOCKET_WAIT_SEND;
+    
+    if (FD_ISSET (socket, & readSet))
+      * condition |= ENET_SOCKET_WAIT_RECEIVE;
+
+    return 0;
+} 
+
+#endif
+
diff --git a/Externals/gtest/CMakeLists.txt b/Externals/gtest/CMakeLists.txt
new file mode 100644
index 0000000000..d51eb65b50
--- /dev/null
+++ b/Externals/gtest/CMakeLists.txt
@@ -0,0 +1,2 @@
+include_directories(.)
+add_library(gtest EXCLUDE_FROM_ALL src/gtest-all.cc src/gtest_main.cc)
diff --git a/Externals/gtest/include/gtest/gtest-death-test.h b/Externals/gtest/include/gtest/gtest-death-test.h
new file mode 100644
index 0000000000..957a69c6a9
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-death-test.h
@@ -0,0 +1,294 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the public API for death tests.  It is
+// #included by gtest.h so a user doesn't need to include this
+// directly.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+
+#include "gtest/internal/gtest-death-test-internal.h"
+
+namespace testing {
+
+// This flag controls the style of death tests.  Valid values are "threadsafe",
+// meaning that the death test child process will re-execute the test binary
+// from the start, running only a single death test, or "fast",
+// meaning that the child process will execute the test logic immediately
+// after forking.
+GTEST_DECLARE_string_(death_test_style);
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+GTEST_API_ bool InDeathTestChild();
+
+}  // namespace internal
+
+// The following macros are useful for writing death tests.
+
+// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
+// executed:
+//
+//   1. It generates a warning if there is more than one active
+//   thread.  This is because it's safe to fork() or clone() only
+//   when there is a single thread.
+//
+//   2. The parent process clone()s a sub-process and runs the death
+//   test in it; the sub-process exits with code 0 at the end of the
+//   death test, if it hasn't exited already.
+//
+//   3. The parent process waits for the sub-process to terminate.
+//
+//   4. The parent process checks the exit code and error message of
+//   the sub-process.
+//
+// Examples:
+//
+//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
+//   for (int i = 0; i < 5; i++) {
+//     EXPECT_DEATH(server.ProcessRequest(i),
+//                  "Invalid request .* in ProcessRequest()")
+//                  << "Failed to die on request " << i;
+//   }
+//
+//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
+//
+//   bool KilledBySIGHUP(int exit_code) {
+//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
+//   }
+//
+//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
+//
+// On the regular expressions used in death tests:
+//
+//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
+//   which uses the POSIX extended regex syntax.
+//
+//   On other platforms (e.g. Windows), we only support a simple regex
+//   syntax implemented as part of Google Test.  This limited
+//   implementation should be enough most of the time when writing
+//   death tests; though it lacks many features you can find in PCRE
+//   or POSIX extended regex syntax.  For example, we don't support
+//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
+//   repetition count ("x{5,7}"), among others.
+//
+//   Below is the syntax that we do support.  We chose it to be a
+//   subset of both PCRE and POSIX extended regex, so it's easy to
+//   learn wherever you come from.  In the following: 'A' denotes a
+//   literal character, period (.), or a single \\ escape sequence;
+//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
+//   natural numbers.
+//
+//     c     matches any literal character c
+//     \\d   matches any decimal digit
+//     \\D   matches any character that's not a decimal digit
+//     \\f   matches \f
+//     \\n   matches \n
+//     \\r   matches \r
+//     \\s   matches any ASCII whitespace, including \n
+//     \\S   matches any character that's not a whitespace
+//     \\t   matches \t
+//     \\v   matches \v
+//     \\w   matches any letter, _, or decimal digit
+//     \\W   matches any character that \\w doesn't match
+//     \\c   matches any literal character c, which must be a punctuation
+//     .     matches any single character except \n
+//     A?    matches 0 or 1 occurrences of A
+//     A*    matches 0 or many occurrences of A
+//     A+    matches 1 or many occurrences of A
+//     ^     matches the beginning of a string (not that of each line)
+//     $     matches the end of a string (not that of each line)
+//     xy    matches x followed by y
+//
+//   If you accidentally use PCRE or POSIX extended regex features
+//   not implemented by us, you will get a run-time failure.  In that
+//   case, please try to rewrite your regular expression within the
+//   above syntax.
+//
+//   This implementation is *not* meant to be as highly tuned or robust
+//   as a compiled regex library, but should perform well enough for a
+//   death test, which already incurs significant overhead by launching
+//   a child process.
+//
+// Known caveats:
+//
+//   A "threadsafe" style death test obtains the path to the test
+//   program from argv[0] and re-executes it in the sub-process.  For
+//   simplicity, the current implementation doesn't search the PATH
+//   when launching the sub-process.  This means that the user must
+//   invoke the test program via a path that contains at least one
+//   path separator (e.g. path/to/foo_test and
+//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
+//   is rarely a problem as people usually don't put the test binary
+//   directory in PATH.
+//
+// TODO(wan@google.com): make thread-safe death tests search the PATH.
+
+// Asserts that a given statement causes the program to exit, with an
+// integer exit status that satisfies predicate, and emitting error output
+// that matches regex.
+# define ASSERT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
+
+// Like ASSERT_EXIT, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
+
+// Asserts that a given statement causes the program to exit, either by
+// explicitly exiting with a nonzero exit code or being killed by a
+// signal, and emitting error output that matches regex.
+# define ASSERT_DEATH(statement, regex) \
+    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Like ASSERT_DEATH, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_DEATH(statement, regex) \
+    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
+
+// Tests that an exit code describes a normal exit with a given exit code.
+class GTEST_API_ ExitedWithCode {
+ public:
+  explicit ExitedWithCode(int exit_code);
+  bool operator()(int exit_status) const;
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ExitedWithCode& other);
+
+  const int exit_code_;
+};
+
+# if !GTEST_OS_WINDOWS
+// Tests that an exit code describes an exit due to termination by a
+// given signal.
+class GTEST_API_ KilledBySignal {
+ public:
+  explicit KilledBySignal(int signum);
+  bool operator()(int exit_status) const;
+ private:
+  const int signum_;
+};
+# endif  // !GTEST_OS_WINDOWS
+
+// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
+// The death testing framework causes this to have interesting semantics,
+// since the sideeffects of the call are only visible in opt mode, and not
+// in debug mode.
+//
+// In practice, this can be used to test functions that utilize the
+// LOG(DFATAL) macro using the following style:
+//
+// int DieInDebugOr12(int* sideeffect) {
+//   if (sideeffect) {
+//     *sideeffect = 12;
+//   }
+//   LOG(DFATAL) << "death";
+//   return 12;
+// }
+//
+// TEST(TestCase, TestDieOr12WorksInDgbAndOpt) {
+//   int sideeffect = 0;
+//   // Only asserts in dbg.
+//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
+//
+// #ifdef NDEBUG
+//   // opt-mode has sideeffect visible.
+//   EXPECT_EQ(12, sideeffect);
+// #else
+//   // dbg-mode no visible sideeffect.
+//   EXPECT_EQ(0, sideeffect);
+// #endif
+// }
+//
+// This will assert that DieInDebugReturn12InOpt() crashes in debug
+// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
+// appropriate fallback value (12 in this case) in opt mode. If you
+// need to test that a function has appropriate side-effects in opt
+// mode, include assertions against the side-effects.  A general
+// pattern for this is:
+//
+// EXPECT_DEBUG_DEATH({
+//   // Side-effects here will have an effect after this statement in
+//   // opt mode, but none in debug mode.
+//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
+// }, "death");
+//
+# ifdef NDEBUG
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+# else
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  EXPECT_DEATH(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  ASSERT_DEATH(statement, regex)
+
+# endif  // NDEBUG for EXPECT_DEBUG_DEATH
+#endif  // GTEST_HAS_DEATH_TEST
+
+// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
+// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
+// death tests are supported; otherwise they just issue a warning.  This is
+// useful when you are combining death test assertions with normal test
+// assertions in one test.
+#if GTEST_HAS_DEATH_TEST
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    EXPECT_DEATH(statement, regex)
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    ASSERT_DEATH(statement, regex)
+#else
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, )
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return)
+#endif
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
diff --git a/Externals/gtest/include/gtest/gtest-message.h b/Externals/gtest/include/gtest/gtest-message.h
new file mode 100644
index 0000000000..fe879bca79
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-message.h
@@ -0,0 +1,250 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the Message class.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+
+#include <limits>
+
+#include "gtest/internal/gtest-port.h"
+
+// Ensures that there is at least one operator<< in the global namespace.
+// See Message& operator<<(...) below for why.
+void operator<<(const testing::internal::Secret&, int);
+
+namespace testing {
+
+// The Message class works like an ostream repeater.
+//
+// Typical usage:
+//
+//   1. You stream a bunch of values to a Message object.
+//      It will remember the text in a stringstream.
+//   2. Then you stream the Message object to an ostream.
+//      This causes the text in the Message to be streamed
+//      to the ostream.
+//
+// For example;
+//
+//   testing::Message foo;
+//   foo << 1 << " != " << 2;
+//   std::cout << foo;
+//
+// will print "1 != 2".
+//
+// Message is not intended to be inherited from.  In particular, its
+// destructor is not virtual.
+//
+// Note that stringstream behaves differently in gcc and in MSVC.  You
+// can stream a NULL char pointer to it in the former, but not in the
+// latter (it causes an access violation if you do).  The Message
+// class hides this difference by treating a NULL char pointer as
+// "(null)".
+class GTEST_API_ Message {
+ private:
+  // The type of basic IO manipulators (endl, ends, and flush) for
+  // narrow streams.
+  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
+
+ public:
+  // Constructs an empty Message.
+  Message();
+
+  // Copy constructor.
+  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
+    *ss_ << msg.GetString();
+  }
+
+  // Constructs a Message from a C-string.
+  explicit Message(const char* str) : ss_(new ::std::stringstream) {
+    *ss_ << str;
+  }
+
+#if GTEST_OS_SYMBIAN
+  // Streams a value (either a pointer or not) to this object.
+  template <typename T>
+  inline Message& operator <<(const T& value) {
+    StreamHelper(typename internal::is_pointer<T>::type(), value);
+    return *this;
+  }
+#else
+  // Streams a non-pointer value to this object.
+  template <typename T>
+  inline Message& operator <<(const T& val) {
+    // Some libraries overload << for STL containers.  These
+    // overloads are defined in the global namespace instead of ::std.
+    //
+    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
+    // overloads are visible in either the std namespace or the global
+    // namespace, but not other namespaces, including the testing
+    // namespace which Google Test's Message class is in.
+    //
+    // To allow STL containers (and other types that has a << operator
+    // defined in the global namespace) to be used in Google Test
+    // assertions, testing::Message must access the custom << operator
+    // from the global namespace.  With this using declaration,
+    // overloads of << defined in the global namespace and those
+    // visible via Koenig lookup are both exposed in this function.
+    using ::operator <<;
+    *ss_ << val;
+    return *this;
+  }
+
+  // Streams a pointer value to this object.
+  //
+  // This function is an overload of the previous one.  When you
+  // stream a pointer to a Message, this definition will be used as it
+  // is more specialized.  (The C++ Standard, section
+  // [temp.func.order].)  If you stream a non-pointer, then the
+  // previous definition will be used.
+  //
+  // The reason for this overload is that streaming a NULL pointer to
+  // ostream is undefined behavior.  Depending on the compiler, you
+  // may get "0", "(nil)", "(null)", or an access violation.  To
+  // ensure consistent result across compilers, we always treat NULL
+  // as "(null)".
+  template <typename T>
+  inline Message& operator <<(T* const& pointer) {  // NOLINT
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+    return *this;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // Since the basic IO manipulators are overloaded for both narrow
+  // and wide streams, we have to provide this specialized definition
+  // of operator <<, even though its body is the same as the
+  // templatized version above.  Without this definition, streaming
+  // endl or other basic IO manipulators to Message will confuse the
+  // compiler.
+  Message& operator <<(BasicNarrowIoManip val) {
+    *ss_ << val;
+    return *this;
+  }
+
+  // Instead of 1/0, we want to see true/false for bool values.
+  Message& operator <<(bool b) {
+    return *this << (b ? "true" : "false");
+  }
+
+  // These two overloads allow streaming a wide C string to a Message
+  // using the UTF-8 encoding.
+  Message& operator <<(const wchar_t* wide_c_str);
+  Message& operator <<(wchar_t* wide_c_str);
+
+#if GTEST_HAS_STD_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::std::wstring& wstr);
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::wstring& wstr);
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+  // Gets the text streamed to this object so far as an std::string.
+  // Each '\0' character in the buffer is replaced with "\\0".
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  std::string GetString() const;
+
+ private:
+
+#if GTEST_OS_SYMBIAN
+  // These are needed as the Nokia Symbian Compiler cannot decide between
+  // const T& and const T* in a function template. The Nokia compiler _can_
+  // decide between class template specializations for T and T*, so a
+  // tr1::type_traits-like is_pointer works, and we can overload on that.
+  template <typename T>
+  inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) {
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+  }
+  template <typename T>
+  inline void StreamHelper(internal::false_type /*is_pointer*/,
+                           const T& value) {
+    // See the comments in Message& operator <<(const T&) above for why
+    // we need this using statement.
+    using ::operator <<;
+    *ss_ << value;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // We'll hold the text streamed to this object here.
+  const internal::scoped_ptr< ::std::stringstream> ss_;
+
+  // We declare (but don't implement) this to prevent the compiler
+  // from implementing the assignment operator.
+  void operator=(const Message&);
+};
+
+// Streams a Message to an ostream.
+inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
+  return os << sb.GetString();
+}
+
+namespace internal {
+
+// Converts a streamable value to an std::string.  A NULL pointer is
+// converted to "(null)".  When the input value is a ::string,
+// ::std::string, ::wstring, or ::std::wstring object, each NUL
+// character in it is replaced with "\\0".
+template <typename T>
+std::string StreamableToString(const T& streamable) {
+  return (Message() << streamable).GetString();
+}
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
diff --git a/Externals/gtest/include/gtest/gtest-param-test.h b/Externals/gtest/include/gtest/gtest-param-test.h
new file mode 100644
index 0000000000..d6702c8f16
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-param-test.h
@@ -0,0 +1,1421 @@
+// This file was GENERATED by command:
+//     pump.py gtest-param-test.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: vladl@google.com (Vlad Losev)
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing Framework (Google Test)
+//
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a  summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test case
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more then once) the first argument to the
+// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the
+// actual test case name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests
+// in the given test case, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_CASE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+
+#if !GTEST_OS_SYMBIAN
+# include <utility>
+#endif
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util-generated.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test case is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test case FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test case StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
+//
+// This instantiates tests from test case StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_CASE_P(CharSequence,
+//                         StlStringTest,
+//                         ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_CASE_P(CharSequence2,
+//                         CharTest,
+//                         ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
+      ::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test case BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three"));
+//
+// This instantiates tests from test case BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+// Currently, Values() supports from 1 to 50 parameters.
+//
+template <typename T1>
+internal::ValueArray1<T1> Values(T1 v1) {
+  return internal::ValueArray1<T1>(v1);
+}
+
+template <typename T1, typename T2>
+internal::ValueArray2<T1, T2> Values(T1 v1, T2 v2) {
+  return internal::ValueArray2<T1, T2>(v1, v2);
+}
+
+template <typename T1, typename T2, typename T3>
+internal::ValueArray3<T1, T2, T3> Values(T1 v1, T2 v2, T3 v3) {
+  return internal::ValueArray3<T1, T2, T3>(v1, v2, v3);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+internal::ValueArray4<T1, T2, T3, T4> Values(T1 v1, T2 v2, T3 v3, T4 v4) {
+  return internal::ValueArray4<T1, T2, T3, T4>(v1, v2, v3, v4);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+internal::ValueArray5<T1, T2, T3, T4, T5> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5) {
+  return internal::ValueArray5<T1, T2, T3, T4, T5>(v1, v2, v3, v4, v5);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+internal::ValueArray6<T1, T2, T3, T4, T5, T6> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6) {
+  return internal::ValueArray6<T1, T2, T3, T4, T5, T6>(v1, v2, v3, v4, v5, v6);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7) {
+  return internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7>(v1, v2, v3, v4, v5,
+      v6, v7);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8) {
+  return internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8>(v1, v2, v3, v4,
+      v5, v6, v7, v8);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9) {
+  return internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10) {
+  return internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+    T11> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11) {
+  return internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+      T11>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+    T12> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12) {
+  return internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+    T13> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13) {
+  return internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) {
+  return internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) {
+  return internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16) {
+  return internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17) {
+  return internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18) {
+  return internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19) {
+  return internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20) {
+  return internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21) {
+  return internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22) {
+  return internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23) {
+  return internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24) {
+  return internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25) {
+  return internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+    T26> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26) {
+  return internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+    T27> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27) {
+  return internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+    T28> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28) {
+  return internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29) {
+  return internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) {
+  return internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) {
+  return internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32) {
+  return internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33) {
+  return internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34) {
+  return internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35) {
+  return internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36) {
+  return internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37) {
+  return internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38) {
+  return internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32,
+      v33, v34, v35, v36, v37, v38);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38, T39 v39) {
+  return internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+      v32, v33, v34, v35, v36, v37, v38, v39);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27,
+    T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35,
+    T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) {
+  return internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29,
+      v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+    T41> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41) {
+  return internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28,
+      v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+    T42> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42) {
+  return internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41,
+      v42);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+    T43> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43) {
+  return internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40,
+      v41, v42, v43);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43, T44 v44) {
+  return internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39,
+      v40, v41, v42, v43, v44);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32,
+    T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40,
+    T41 v41, T42 v42, T43 v43, T44 v44, T45 v45) {
+  return internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38,
+      v39, v40, v41, v42, v43, v44, v45);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) {
+  return internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) {
+  return internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46, v47);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47,
+    T48 v48) {
+  return internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36,
+      v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38,
+    T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46,
+    T47 v47, T48 v48, T49 v49) {
+  return internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35,
+      v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49, T50> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37,
+    T38 v38, T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45,
+    T46 v46, T47 v47, T48 v48, T49 v49, T50 v50) {
+  return internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47,
+      v48, v49, v50);
+}
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test case FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+# if GTEST_HAS_COMBINE
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Combine can have up to 10 arguments. This number is currently limited
+// by the maximum number of elements in the tuple implementation used by Google
+// Test.
+//
+// Example:
+//
+// This will instantiate tests in test case AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest,
+//                         Combine(Values("cat", "dog"),
+//                                 Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest,
+//                         Combine(Bool(), Bool()));
+//
+template <typename Generator1, typename Generator2>
+internal::CartesianProductHolder2<Generator1, Generator2> Combine(
+    const Generator1& g1, const Generator2& g2) {
+  return internal::CartesianProductHolder2<Generator1, Generator2>(
+      g1, g2);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3>
+internal::CartesianProductHolder3<Generator1, Generator2, Generator3> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3) {
+  return internal::CartesianProductHolder3<Generator1, Generator2, Generator3>(
+      g1, g2, g3);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4>
+internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+    Generator4> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4) {
+  return internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+      Generator4>(
+      g1, g2, g3, g4);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5>
+internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+    Generator4, Generator5> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5) {
+  return internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+      Generator4, Generator5>(
+      g1, g2, g3, g4, g5);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6>
+internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6) {
+  return internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6>(
+      g1, g2, g3, g4, g5, g6);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7>
+internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7) {
+  return internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7>(
+      g1, g2, g3, g4, g5, g6, g7);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8>
+internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8) {
+  return internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8>(
+      g1, g2, g3, g4, g5, g6, g7, g8);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9>
+internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8,
+    Generator9> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9) {
+  return internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9,
+    typename Generator10>
+internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+    Generator10> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9,
+        const Generator10& g10) {
+  return internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+      Generator10>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9, g10);
+}
+# endif  // GTEST_HAS_COMBINE
+
+
+
+# define TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+    virtual void TestBody(); \
+   private: \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+                  #test_case_name, \
+                  #test_name, \
+                  new ::testing::internal::TestMetaFactory< \
+                      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
+  ::testing::internal::ParamGenerator<test_case_name::ParamType> \
+      gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
+  int gtest_##prefix##test_case_name##_dummy_ = \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\
+                  #prefix, \
+                  &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                  __FILE__, __LINE__)
+
+}  // namespace testing
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff --git a/Externals/gtest/include/gtest/gtest-param-test.h.pump b/Externals/gtest/include/gtest/gtest-param-test.h.pump
new file mode 100644
index 0000000000..2dc9303b5e
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-param-test.h.pump
@@ -0,0 +1,487 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of Values arguments we want to support.
+$var maxtuple = 10  $$ Maximum number of Combine arguments we want to support.
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: vladl@google.com (Vlad Losev)
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing Framework (Google Test)
+//
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a  summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test case
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more then once) the first argument to the
+// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the
+// actual test case name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests
+// in the given test case, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_CASE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+
+#if !GTEST_OS_SYMBIAN
+# include <utility>
+#endif
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util-generated.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test case is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test case FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test case StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
+//
+// This instantiates tests from test case StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_CASE_P(CharSequence,
+//                         StlStringTest,
+//                         ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_CASE_P(CharSequence2,
+//                         CharTest,
+//                         ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
+      ::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test case BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three"));
+//
+// This instantiates tests from test case BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+// Currently, Values() supports from 1 to $n parameters.
+//
+$range i 1..n
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename T$j]]>
+internal::ValueArray$i<$for j, [[T$j]]> Values($for j, [[T$j v$j]]) {
+  return internal::ValueArray$i<$for j, [[T$j]]>($for j, [[v$j]]);
+}
+
+]]
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test case FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+# if GTEST_HAS_COMBINE
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Combine can have up to $maxtuple arguments. This number is currently limited
+// by the maximum number of elements in the tuple implementation used by Google
+// Test.
+//
+// Example:
+//
+// This will instantiate tests in test case AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest,
+//                         Combine(Values("cat", "dog"),
+//                                 Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest,
+//                         Combine(Bool(), Bool()));
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename Generator$j]]>
+internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine(
+    $for j, [[const Generator$j& g$j]]) {
+  return internal::CartesianProductHolder$i<$for j, [[Generator$j]]>(
+      $for j, [[g$j]]);
+}
+
+]]
+# endif  // GTEST_HAS_COMBINE
+
+
+
+# define TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+    virtual void TestBody(); \
+   private: \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+                  #test_case_name, \
+                  #test_name, \
+                  new ::testing::internal::TestMetaFactory< \
+                      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
+  ::testing::internal::ParamGenerator<test_case_name::ParamType> \
+      gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
+  int gtest_##prefix##test_case_name##_dummy_ = \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\
+                  #prefix, \
+                  &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                  __FILE__, __LINE__)
+
+}  // namespace testing
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff --git a/Externals/gtest/include/gtest/gtest-printers.h b/Externals/gtest/include/gtest/gtest-printers.h
new file mode 100644
index 0000000000..852d44a701
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-printers.h
@@ -0,0 +1,901 @@
+// Copyright 2007, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// A user can teach this function how to print a class type T by
+// defining either operator<<() or PrintTo() in the namespace that
+// defines T.  More specifically, the FIRST defined function in the
+// following list will be used (assuming T is defined in namespace
+// foo):
+//
+//   1. foo::PrintTo(const T&, ostream*)
+//   2. operator<<(ostream&, const T&) defined in either foo or the
+//      global namespace.
+//
+// If none of the above is defined, it will print the debug string of
+// the value if it is a protocol buffer, or print the raw bytes in the
+// value otherwise.
+//
+// To aid debugging: when T is a reference type, the address of the
+// value is also printed; when T is a (const) char pointer, both the
+// pointer value and the NUL-terminated string it points to are
+// printed.
+//
+// We also provide some convenient wrappers:
+//
+//   // Prints a value to a string.  For a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   std::string ::testing::PrintToString(const T& value);
+//
+//   // Prints a value tersely: for a reference type, the referenced
+//   // value (but not the address) is printed; for a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
+//
+//   // Prints value using the type inferred by the compiler.  The difference
+//   // from UniversalTersePrint() is that this function prints both the
+//   // pointer and the NUL-terminated string for a (const or not) char pointer.
+//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
+//
+//   // Prints the fields of a tuple tersely to a string vector, one
+//   // element for each field. Tuple support must be enabled in
+//   // gtest-port.h.
+//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
+//       const Tuple& value);
+//
+// Known limitation:
+//
+// The print primitives print the elements of an STL-style container
+// using the compiler-inferred type of *iter where iter is a
+// const_iterator of the container.  When const_iterator is an input
+// iterator but not a forward iterator, this inferred type may not
+// match value_type, and the print output may be incorrect.  In
+// practice, this is rarely a problem as for most containers
+// const_iterator is a forward iterator.  We'll fix this if there's an
+// actual need for it.  Note that this fix cannot rely on value_type
+// being defined as many user-defined container types don't have
+// value_type.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-internal.h"
+
+#if GTEST_HAS_STD_TUPLE_
+# include <tuple>
+#endif
+
+namespace testing {
+
+// Definitions in the 'internal' and 'internal2' name spaces are
+// subject to change without notice.  DO NOT USE THEM IN USER CODE!
+namespace internal2 {
+
+// Prints the given number of bytes in the given object to the given
+// ostream.
+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
+                                     size_t count,
+                                     ::std::ostream* os);
+
+// For selecting which printer to use when a given type has neither <<
+// nor PrintTo().
+enum TypeKind {
+  kProtobuf,              // a protobuf type
+  kConvertibleToInteger,  // a type implicitly convertible to BiggestInt
+                          // (e.g. a named or unnamed enum type)
+  kOtherType              // anything else
+};
+
+// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
+// by the universal printer to print a value of type T when neither
+// operator<< nor PrintTo() is defined for T, where kTypeKind is the
+// "kind" of T as defined by enum TypeKind.
+template <typename T, TypeKind kTypeKind>
+class TypeWithoutFormatter {
+ public:
+  // This default version is called when kTypeKind is kOtherType.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    PrintBytesInObjectTo(reinterpret_cast<const unsigned char*>(&value),
+                         sizeof(value), os);
+  }
+};
+
+// We print a protobuf using its ShortDebugString() when the string
+// doesn't exceed this many characters; otherwise we print it using
+// DebugString() for better readability.
+const size_t kProtobufOneLinerMaxLength = 50;
+
+template <typename T>
+class TypeWithoutFormatter<T, kProtobuf> {
+ public:
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const ::testing::internal::string short_str = value.ShortDebugString();
+    const ::testing::internal::string pretty_str =
+        short_str.length() <= kProtobufOneLinerMaxLength ?
+        short_str : ("\n" + value.DebugString());
+    *os << ("<" + pretty_str + ">");
+  }
+};
+
+template <typename T>
+class TypeWithoutFormatter<T, kConvertibleToInteger> {
+ public:
+  // Since T has no << operator or PrintTo() but can be implicitly
+  // converted to BiggestInt, we print it as a BiggestInt.
+  //
+  // Most likely T is an enum type (either named or unnamed), in which
+  // case printing it as an integer is the desired behavior.  In case
+  // T is not an enum, printing it as an integer is the best we can do
+  // given that it has no user-defined printer.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const internal::BiggestInt kBigInt = value;
+    *os << kBigInt;
+  }
+};
+
+// Prints the given value to the given ostream.  If the value is a
+// protocol message, its debug string is printed; if it's an enum or
+// of a type implicitly convertible to BiggestInt, it's printed as an
+// integer; otherwise the bytes in the value are printed.  This is
+// what UniversalPrinter<T>::Print() does when it knows nothing about
+// type T and T has neither << operator nor PrintTo().
+//
+// A user can override this behavior for a class type Foo by defining
+// a << operator in the namespace where Foo is defined.
+//
+// We put this operator in namespace 'internal2' instead of 'internal'
+// to simplify the implementation, as much code in 'internal' needs to
+// use << in STL, which would conflict with our own << were it defined
+// in 'internal'.
+//
+// Note that this operator<< takes a generic std::basic_ostream<Char,
+// CharTraits> type instead of the more restricted std::ostream.  If
+// we define it to take an std::ostream instead, we'll get an
+// "ambiguous overloads" compiler error when trying to print a type
+// Foo that supports streaming to std::basic_ostream<Char,
+// CharTraits>, as the compiler cannot tell whether
+// operator<<(std::ostream&, const T&) or
+// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
+// specific.
+template <typename Char, typename CharTraits, typename T>
+::std::basic_ostream<Char, CharTraits>& operator<<(
+    ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
+  TypeWithoutFormatter<T,
+      (internal::IsAProtocolMessage<T>::value ? kProtobuf :
+       internal::ImplicitlyConvertible<const T&, internal::BiggestInt>::value ?
+       kConvertibleToInteger : kOtherType)>::PrintValue(x, &os);
+  return os;
+}
+
+}  // namespace internal2
+}  // namespace testing
+
+// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
+// magic needed for implementing UniversalPrinter won't work.
+namespace testing_internal {
+
+// Used to print a value that is not an STL-style container when the
+// user doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
+  // With the following statement, during unqualified name lookup,
+  // testing::internal2::operator<< appears as if it was declared in
+  // the nearest enclosing namespace that contains both
+  // ::testing_internal and ::testing::internal2, i.e. the global
+  // namespace.  For more details, refer to the C++ Standard section
+  // 7.3.4-1 [namespace.udir].  This allows us to fall back onto
+  // testing::internal2::operator<< in case T doesn't come with a <<
+  // operator.
+  //
+  // We cannot write 'using ::testing::internal2::operator<<;', which
+  // gcc 3.3 fails to compile due to a compiler bug.
+  using namespace ::testing::internal2;  // NOLINT
+
+  // Assuming T is defined in namespace foo, in the next statement,
+  // the compiler will consider all of:
+  //
+  //   1. foo::operator<< (thanks to Koenig look-up),
+  //   2. ::operator<< (as the current namespace is enclosed in ::),
+  //   3. testing::internal2::operator<< (thanks to the using statement above).
+  //
+  // The operator<< whose type matches T best will be picked.
+  //
+  // We deliberately allow #2 to be a candidate, as sometimes it's
+  // impossible to define #1 (e.g. when foo is ::std, defining
+  // anything in it is undefined behavior unless you are a compiler
+  // vendor.).
+  *os << value;
+}
+
+}  // namespace testing_internal
+
+namespace testing {
+namespace internal {
+
+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
+// value to the given ostream.  The caller must ensure that
+// 'ostream_ptr' is not NULL, or the behavior is undefined.
+//
+// We define UniversalPrinter as a class template (as opposed to a
+// function template), as we need to partially specialize it for
+// reference types, which cannot be done with function templates.
+template <typename T>
+class UniversalPrinter;
+
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os);
+
+// Used to print an STL-style container when the user doesn't define
+// a PrintTo() for it.
+template <typename C>
+void DefaultPrintTo(IsContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const C& container, ::std::ostream* os) {
+  const size_t kMaxCount = 32;  // The maximum number of elements to print.
+  *os << '{';
+  size_t count = 0;
+  for (typename C::const_iterator it = container.begin();
+       it != container.end(); ++it, ++count) {
+    if (count > 0) {
+      *os << ',';
+      if (count == kMaxCount) {  // Enough has been printed.
+        *os << " ...";
+        break;
+      }
+    }
+    *os << ' ';
+    // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
+    // handle *it being a native array.
+    internal::UniversalPrint(*it, os);
+  }
+
+  if (count > 0) {
+    *os << ' ';
+  }
+  *os << '}';
+}
+
+// Used to print a pointer that is neither a char pointer nor a member
+// pointer, when the user doesn't define PrintTo() for it.  (A member
+// variable pointer or member function pointer doesn't really point to
+// a location in the address space.  Their representation is
+// implementation-defined.  Therefore they will be printed as raw
+// bytes.)
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    true_type /* is a pointer */,
+                    T* p, ::std::ostream* os) {
+  if (p == NULL) {
+    *os << "NULL";
+  } else {
+    // C++ doesn't allow casting from a function pointer to any object
+    // pointer.
+    //
+    // IsTrue() silences warnings: "Condition is always true",
+    // "unreachable code".
+    if (IsTrue(ImplicitlyConvertible<T*, const void*>::value)) {
+      // T is not a function type.  We just call << to print p,
+      // relying on ADL to pick up user-defined << for their pointer
+      // types, if any.
+      *os << p;
+    } else {
+      // T is a function type, so '*os << p' doesn't do what we want
+      // (it just prints p as bool).  We want to print p as a const
+      // void*.  However, we cannot cast it to const void* directly,
+      // even using reinterpret_cast, as earlier versions of gcc
+      // (e.g. 3.4.5) cannot compile the cast when p is a function
+      // pointer.  Casting to UInt64 first solves the problem.
+      *os << reinterpret_cast<const void*>(
+          reinterpret_cast<internal::UInt64>(p));
+    }
+  }
+}
+
+// Used to print a non-container, non-pointer value when the user
+// doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const T& value, ::std::ostream* os) {
+  ::testing_internal::DefaultPrintNonContainerTo(value, os);
+}
+
+// Prints the given value using the << operator if it has one;
+// otherwise prints the bytes in it.  This is what
+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
+// or overloaded for type T.
+//
+// A user can override this behavior for a class type Foo by defining
+// an overload of PrintTo() in the namespace where Foo is defined.  We
+// give the user this option as sometimes defining a << operator for
+// Foo is not desirable (e.g. the coding style may prevent doing it,
+// or there is already a << operator but it doesn't do what the user
+// wants).
+template <typename T>
+void PrintTo(const T& value, ::std::ostream* os) {
+  // DefaultPrintTo() is overloaded.  The type of its first two
+  // arguments determine which version will be picked.  If T is an
+  // STL-style container, the version for container will be called; if
+  // T is a pointer, the pointer version will be called; otherwise the
+  // generic version will be called.
+  //
+  // Note that we check for container types here, prior to we check
+  // for protocol message types in our operator<<.  The rationale is:
+  //
+  // For protocol messages, we want to give people a chance to
+  // override Google Mock's format by defining a PrintTo() or
+  // operator<<.  For STL containers, other formats can be
+  // incompatible with Google Mock's format for the container
+  // elements; therefore we check for container types here to ensure
+  // that our format is used.
+  //
+  // The second argument of DefaultPrintTo() is needed to bypass a bug
+  // in Symbian's C++ compiler that prevents it from picking the right
+  // overload between:
+  //
+  //   PrintTo(const T& x, ...);
+  //   PrintTo(T* x, ...);
+  DefaultPrintTo(IsContainerTest<T>(0), is_pointer<T>(), value, os);
+}
+
+// The following list of PrintTo() overloads tells
+// UniversalPrinter<T>::Print() how to print standard types (built-in
+// types, strings, plain arrays, and pointers).
+
+// Overloads for various char types.
+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
+inline void PrintTo(char c, ::std::ostream* os) {
+  // When printing a plain char, we always treat it as unsigned.  This
+  // way, the output won't be affected by whether the compiler thinks
+  // char is signed or not.
+  PrintTo(static_cast<unsigned char>(c), os);
+}
+
+// Overloads for other simple built-in types.
+inline void PrintTo(bool x, ::std::ostream* os) {
+  *os << (x ? "true" : "false");
+}
+
+// Overload for wchar_t type.
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its decimal code (except for L'\0').
+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
+// as signed integer when wchar_t is implemented by the compiler
+// as a signed type and is printed as an unsigned integer when wchar_t
+// is implemented as an unsigned type.
+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
+
+// Overloads for C strings.
+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
+inline void PrintTo(char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char*>(s), os);
+}
+
+// signed/unsigned char is often used for representing binary data, so
+// we print pointers to it as void* to be safe.
+inline void PrintTo(const signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+
+// MSVC can be configured to define wchar_t as a typedef of unsigned
+// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
+// type.  When wchar_t is a typedef, defining an overload for const
+// wchar_t* would cause unsigned short* be printed as a wide string,
+// possibly causing invalid memory accesses.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Overloads for wide C strings
+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
+}
+#endif
+
+// Overload for C arrays.  Multi-dimensional arrays are printed
+// properly.
+
+// Prints the given number of elements in an array, without printing
+// the curly braces.
+template <typename T>
+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
+  UniversalPrint(a[0], os);
+  for (size_t i = 1; i != count; i++) {
+    *os << ", ";
+    UniversalPrint(a[i], os);
+  }
+}
+
+// Overloads for ::string and ::std::string.
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os);
+inline void PrintTo(const ::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+
+// Overloads for ::wstring and ::std::wstring.
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T& t, ::std::ostream* os);
+#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+
+#if GTEST_HAS_TR1_TUPLE
+// Overload for ::std::tr1::tuple.  Needed for printing function arguments,
+// which are packed as tuples.
+
+// Overloaded PrintTo() for tuples of various arities.  We support
+// tuples of up-to 10 fields.  The following implementation works
+// regardless of whether tr1::tuple is implemented using the
+// non-standard variadic template feature or not.
+
+inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1>
+void PrintTo(const ::std::tr1::tuple<T1>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2>
+void PrintTo(const ::std::tr1::tuple<T1, T2>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9, typename T10>
+void PrintTo(
+    const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& t,
+    ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+template <typename... Types>
+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_STD_TUPLE_
+
+// Overload for std::pair.
+template <typename T1, typename T2>
+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
+  *os << '(';
+  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
+  // a reference type.  The same for printing value.second.
+  UniversalPrinter<T1>::Print(value.first, os);
+  *os << ", ";
+  UniversalPrinter<T2>::Print(value.second, os);
+  *os << ')';
+}
+
+// Implements printing a non-reference type T by letting the compiler
+// pick the right overload of PrintTo() for T.
+template <typename T>
+class UniversalPrinter {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4180)  // Temporarily disables warning 4180.
+#endif  // _MSC_VER
+
+  // Note: we deliberately don't call this PrintTo(), as that name
+  // conflicts with ::testing::internal::PrintTo in the body of the
+  // function.
+  static void Print(const T& value, ::std::ostream* os) {
+    // By default, ::testing::internal::PrintTo() is used for printing
+    // the value.
+    //
+    // Thanks to Koenig look-up, if T is a class and has its own
+    // PrintTo() function defined in its namespace, that function will
+    // be visible here.  Since it is more specific than the generic ones
+    // in ::testing::internal, it will be picked by the compiler in the
+    // following statement - exactly what we want.
+    PrintTo(value, os);
+  }
+
+#ifdef _MSC_VER
+# pragma warning(pop)           // Restores the warning state.
+#endif  // _MSC_VER
+};
+
+// UniversalPrintArray(begin, len, os) prints an array of 'len'
+// elements, starting at address 'begin'.
+template <typename T>
+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
+  if (len == 0) {
+    *os << "{}";
+  } else {
+    *os << "{ ";
+    const size_t kThreshold = 18;
+    const size_t kChunkSize = 8;
+    // If the array has more than kThreshold elements, we'll have to
+    // omit some details by printing only the first and the last
+    // kChunkSize elements.
+    // TODO(wan@google.com): let the user control the threshold using a flag.
+    if (len <= kThreshold) {
+      PrintRawArrayTo(begin, len, os);
+    } else {
+      PrintRawArrayTo(begin, kChunkSize, os);
+      *os << ", ..., ";
+      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
+    }
+    *os << " }";
+  }
+}
+// This overload prints a (const) char array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const char* begin, size_t len, ::std::ostream* os);
+
+// This overload prints a (const) wchar_t array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const wchar_t* begin, size_t len, ::std::ostream* os);
+
+// Implements printing an array type T[N].
+template <typename T, size_t N>
+class UniversalPrinter<T[N]> {
+ public:
+  // Prints the given array, omitting some elements when there are too
+  // many.
+  static void Print(const T (&a)[N], ::std::ostream* os) {
+    UniversalPrintArray(a, N, os);
+  }
+};
+
+// Implements printing a reference type T&.
+template <typename T>
+class UniversalPrinter<T&> {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4180)  // Temporarily disables warning 4180.
+#endif  // _MSC_VER
+
+  static void Print(const T& value, ::std::ostream* os) {
+    // Prints the address of the value.  We use reinterpret_cast here
+    // as static_cast doesn't compile when T is a function type.
+    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
+
+    // Then prints the value itself.
+    UniversalPrint(value, os);
+  }
+
+#ifdef _MSC_VER
+# pragma warning(pop)           // Restores the warning state.
+#endif  // _MSC_VER
+};
+
+// Prints a value tersely: for a reference type, the referenced value
+// (but not the address) is printed; for a (const) char pointer, the
+// NUL-terminated string (but not the pointer) is printed.
+
+template <typename T>
+class UniversalTersePrinter {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T>
+class UniversalTersePrinter<T&> {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T, size_t N>
+class UniversalTersePrinter<T[N]> {
+ public:
+  static void Print(const T (&value)[N], ::std::ostream* os) {
+    UniversalPrinter<T[N]>::Print(value, os);
+  }
+};
+template <>
+class UniversalTersePrinter<const char*> {
+ public:
+  static void Print(const char* str, ::std::ostream* os) {
+    if (str == NULL) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char*> {
+ public:
+  static void Print(char* str, ::std::ostream* os) {
+    UniversalTersePrinter<const char*>::Print(str, os);
+  }
+};
+
+#if GTEST_HAS_STD_WSTRING
+template <>
+class UniversalTersePrinter<const wchar_t*> {
+ public:
+  static void Print(const wchar_t* str, ::std::ostream* os) {
+    if (str == NULL) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::wstring(str), os);
+    }
+  }
+};
+#endif
+
+template <>
+class UniversalTersePrinter<wchar_t*> {
+ public:
+  static void Print(wchar_t* str, ::std::ostream* os) {
+    UniversalTersePrinter<const wchar_t*>::Print(str, os);
+  }
+};
+
+template <typename T>
+void UniversalTersePrint(const T& value, ::std::ostream* os) {
+  UniversalTersePrinter<T>::Print(value, os);
+}
+
+// Prints a value using the type inferred by the compiler.  The
+// difference between this and UniversalTersePrint() is that for a
+// (const) char pointer, this prints both the pointer and the
+// NUL-terminated string.
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os) {
+  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // UniversalPrinter with T directly.
+  typedef T T1;
+  UniversalPrinter<T1>::Print(value, os);
+}
+
+typedef ::std::vector<string> Strings;
+
+// TuplePolicy<TupleT> must provide:
+// - tuple_size
+//     size of tuple TupleT.
+// - get<size_t I>(const TupleT& t)
+//     static function extracting element I of tuple TupleT.
+// - tuple_element<size_t I>::type
+//     type of element I of tuple TupleT.
+template <typename TupleT>
+struct TuplePolicy;
+
+#if GTEST_HAS_TR1_TUPLE
+template <typename TupleT>
+struct TuplePolicy {
+  typedef TupleT Tuple;
+  static const size_t tuple_size = ::std::tr1::tuple_size<Tuple>::value;
+
+  template <size_t I>
+  struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {};
+
+  template <size_t I>
+  static typename AddReference<
+      const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
+      const Tuple& tuple) {
+    return ::std::tr1::get<I>(tuple);
+  }
+};
+template <typename TupleT>
+const size_t TuplePolicy<TupleT>::tuple_size;
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+template <typename... Types>
+struct TuplePolicy< ::std::tuple<Types...> > {
+  typedef ::std::tuple<Types...> Tuple;
+  static const size_t tuple_size = ::std::tuple_size<Tuple>::value;
+
+  template <size_t I>
+  struct tuple_element : ::std::tuple_element<I, Tuple> {};
+
+  template <size_t I>
+  static const typename ::std::tuple_element<I, Tuple>::type& get(
+      const Tuple& tuple) {
+    return ::std::get<I>(tuple);
+  }
+};
+template <typename... Types>
+const size_t TuplePolicy< ::std::tuple<Types...> >::tuple_size;
+#endif  // GTEST_HAS_STD_TUPLE_
+
+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+// This helper template allows PrintTo() for tuples and
+// UniversalTersePrintTupleFieldsToStrings() to be defined by
+// induction on the number of tuple fields.  The idea is that
+// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
+// fields in tuple t, and can be defined in terms of
+// TuplePrefixPrinter<N - 1>.
+//
+// The inductive case.
+template <size_t N>
+struct TuplePrefixPrinter {
+  // Prints the first N fields of a tuple.
+  template <typename Tuple>
+  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
+    TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
+    GTEST_INTENTIONAL_CONST_COND_PUSH_
+    if (N > 1) {
+    GTEST_INTENTIONAL_CONST_COND_POP_
+      *os << ", ";
+    }
+    UniversalPrinter<
+        typename TuplePolicy<Tuple>::template tuple_element<N - 1>::type>
+        ::Print(TuplePolicy<Tuple>::template get<N - 1>(t), os);
+  }
+
+  // Tersely prints the first N fields of a tuple to a string vector,
+  // one element for each field.
+  template <typename Tuple>
+  static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
+    TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
+    ::std::stringstream ss;
+    UniversalTersePrint(TuplePolicy<Tuple>::template get<N - 1>(t), &ss);
+    strings->push_back(ss.str());
+  }
+};
+
+// Base case.
+template <>
+struct TuplePrefixPrinter<0> {
+  template <typename Tuple>
+  static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
+
+  template <typename Tuple>
+  static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
+};
+
+// Helper function for printing a tuple.
+// Tuple must be either std::tr1::tuple or std::tuple type.
+template <typename Tuple>
+void PrintTupleTo(const Tuple& t, ::std::ostream* os) {
+  *os << "(";
+  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::PrintPrefixTo(t, os);
+  *os << ")";
+}
+
+// Prints the fields of a tuple tersely to a string vector, one
+// element for each field.  See the comment before
+// UniversalTersePrint() for how we define "tersely".
+template <typename Tuple>
+Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
+  Strings result;
+  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::
+      TersePrintPrefixToStrings(value, &result);
+  return result;
+}
+#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+
+}  // namespace internal
+
+template <typename T>
+::std::string PrintToString(const T& value) {
+  ::std::stringstream ss;
+  internal::UniversalTersePrinter<T>::Print(value, &ss);
+  return ss.str();
+}
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff --git a/Externals/gtest/include/gtest/gtest-spi.h b/Externals/gtest/include/gtest/gtest-spi.h
new file mode 100644
index 0000000000..f63fa9a1b2
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-spi.h
@@ -0,0 +1,232 @@
+// Copyright 2007, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Utilities for testing Google Test itself and code that uses Google Test
+// (e.g. frameworks built on top of Google Test).
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// This helper class can be used to mock out Google Test failure reporting
+// so that we can test Google Test or code that builds on Google Test.
+//
+// An object of this class appends a TestPartResult object to the
+// TestPartResultArray object given in the constructor whenever a Google Test
+// failure is reported. It can either intercept only failures that are
+// generated in the same thread that created this object or it can intercept
+// all generated failures. The scope of this mock object can be controlled with
+// the second argument to the two arguments constructor.
+class GTEST_API_ ScopedFakeTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  // The two possible mocking modes of this object.
+  enum InterceptMode {
+    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
+    INTERCEPT_ALL_THREADS           // Intercepts all failures.
+  };
+
+  // The c'tor sets this object as the test part result reporter used
+  // by Google Test.  The 'result' parameter specifies where to report the
+  // results. This reporter will only catch failures generated in the current
+  // thread. DEPRECATED
+  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
+
+  // Same as above, but you can choose the interception scope of this object.
+  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
+                                   TestPartResultArray* result);
+
+  // The d'tor restores the previous test part result reporter.
+  virtual ~ScopedFakeTestPartResultReporter();
+
+  // Appends the TestPartResult object to the TestPartResultArray
+  // received in the constructor.
+  //
+  // This method is from the TestPartResultReporterInterface
+  // interface.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+ private:
+  void Init();
+
+  const InterceptMode intercept_mode_;
+  TestPartResultReporterInterface* old_reporter_;
+  TestPartResultArray* const result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+};
+
+namespace internal {
+
+// A helper class for implementing EXPECT_FATAL_FAILURE() and
+// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+class GTEST_API_ SingleFailureChecker {
+ public:
+  // The constructor remembers the arguments.
+  SingleFailureChecker(const TestPartResultArray* results,
+                       TestPartResult::Type type,
+                       const string& substr);
+  ~SingleFailureChecker();
+ private:
+  const TestPartResultArray* const results_;
+  const TestPartResult::Type type_;
+  const string substr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+// A set of macros for testing Google Test assertions or code that's expected
+// to generate Google Test fatal failures.  It verifies that the given
+// statement will cause exactly one fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - 'statement' cannot reference local non-static variables or
+//     non-static members of the current object.
+//   - 'statement' cannot return a value.
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
+// gtest_unittest.cc will fail to compile if we do that.
+#define EXPECT_FATAL_FAILURE(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ALL_THREADS, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+// A macro for testing Google Test assertions or code that's expected to
+// generate Google Test non-fatal failures.  It asserts that the given
+// statement will cause exactly one non-fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// 'statement' is allowed to reference local variables and members of
+// the current object.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  If we do that, the code won't compile when the user gives
+// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
+// expands to code containing an unprotected comma.  The
+// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
+// catches that.
+//
+// For the same reason, we have to write
+//   if (::testing::internal::AlwaysTrue()) { statement; }
+// instead of
+//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+// to avoid an MSVC warning on unreachable code.
+#define EXPECT_NONFATAL_FAILURE(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
+          &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_SPI_H_
diff --git a/Externals/gtest/include/gtest/gtest-test-part.h b/Externals/gtest/include/gtest/gtest-test-part.h
new file mode 100644
index 0000000000..77eb844839
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-test-part.h
@@ -0,0 +1,179 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+
+#include <iosfwd>
+#include <vector>
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+
+// A copyable object representing the result of a test part (i.e. an
+// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
+//
+// Don't inherit from TestPartResult as its destructor is not virtual.
+class GTEST_API_ TestPartResult {
+ public:
+  // The possible outcomes of a test part (i.e. an assertion or an
+  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
+  enum Type {
+    kSuccess,          // Succeeded.
+    kNonFatalFailure,  // Failed but the test can continue.
+    kFatalFailure      // Failed and the test should be terminated.
+  };
+
+  // C'tor.  TestPartResult does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestPartResult object.
+  TestPartResult(Type a_type,
+                 const char* a_file_name,
+                 int a_line_number,
+                 const char* a_message)
+      : type_(a_type),
+        file_name_(a_file_name == NULL ? "" : a_file_name),
+        line_number_(a_line_number),
+        summary_(ExtractSummary(a_message)),
+        message_(a_message) {
+  }
+
+  // Gets the outcome of the test part.
+  Type type() const { return type_; }
+
+  // Gets the name of the source file where the test part took place, or
+  // NULL if it's unknown.
+  const char* file_name() const {
+    return file_name_.empty() ? NULL : file_name_.c_str();
+  }
+
+  // Gets the line in the source file where the test part took place,
+  // or -1 if it's unknown.
+  int line_number() const { return line_number_; }
+
+  // Gets the summary of the failure message.
+  const char* summary() const { return summary_.c_str(); }
+
+  // Gets the message associated with the test part.
+  const char* message() const { return message_.c_str(); }
+
+  // Returns true iff the test part passed.
+  bool passed() const { return type_ == kSuccess; }
+
+  // Returns true iff the test part failed.
+  bool failed() const { return type_ != kSuccess; }
+
+  // Returns true iff the test part non-fatally failed.
+  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
+
+  // Returns true iff the test part fatally failed.
+  bool fatally_failed() const { return type_ == kFatalFailure; }
+
+ private:
+  Type type_;
+
+  // Gets the summary of the failure message by omitting the stack
+  // trace in it.
+  static std::string ExtractSummary(const char* message);
+
+  // The name of the source file where the test part took place, or
+  // "" if the source file is unknown.
+  std::string file_name_;
+  // The line in the source file where the test part took place, or -1
+  // if the line number is unknown.
+  int line_number_;
+  std::string summary_;  // The test failure summary.
+  std::string message_;  // The test failure message.
+};
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
+
+// An array of TestPartResult objects.
+//
+// Don't inherit from TestPartResultArray as its destructor is not
+// virtual.
+class GTEST_API_ TestPartResultArray {
+ public:
+  TestPartResultArray() {}
+
+  // Appends the given TestPartResult to the array.
+  void Append(const TestPartResult& result);
+
+  // Returns the TestPartResult at the given index (0-based).
+  const TestPartResult& GetTestPartResult(int index) const;
+
+  // Returns the number of TestPartResult objects in the array.
+  int size() const;
+
+ private:
+  std::vector<TestPartResult> array_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
+};
+
+// This interface knows how to report a test part result.
+class TestPartResultReporterInterface {
+ public:
+  virtual ~TestPartResultReporterInterface() {}
+
+  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
+};
+
+namespace internal {
+
+// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
+// statement generates new fatal failures. To do so it registers itself as the
+// current test part result reporter. Besides checking if fatal failures were
+// reported, it only delegates the reporting to the former result reporter.
+// The original result reporter is restored in the destructor.
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+class GTEST_API_ HasNewFatalFailureHelper
+    : public TestPartResultReporterInterface {
+ public:
+  HasNewFatalFailureHelper();
+  virtual ~HasNewFatalFailureHelper();
+  virtual void ReportTestPartResult(const TestPartResult& result);
+  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
+ private:
+  bool has_new_fatal_failure_;
+  TestPartResultReporterInterface* original_reporter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
diff --git a/Externals/gtest/include/gtest/gtest-typed-test.h b/Externals/gtest/include/gtest/gtest-typed-test.h
new file mode 100644
index 0000000000..fe1e83b274
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest-typed-test.h
@@ -0,0 +1,259 @@
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+
+// This header implements typed tests and type-parameterized tests.
+
+// Typed (aka type-driven) tests repeat the same test for types in a
+// list.  You must know which types you want to test with when writing
+// typed tests. Here's how you do it:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+
+// Next, associate a list of types with the test case, which will be
+// repeated for each type in the list.  The typedef is necessary for
+// the macro to parse correctly.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   TYPED_TEST_CASE(FooTest, int);
+
+// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
+// tests for this test case as you want.
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  // Since we are inside a derived class template, C++ requires use to
+  // visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the TestFixture::
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the "typename
+  // TestFixture::" prefix.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+
+#endif  // 0
+
+// Type-parameterized tests are abstract test patterns parameterized
+// by a type.  Compared with typed tests, type-parameterized tests
+// allow you to define the test pattern without knowing what the type
+// parameters are.  The defined pattern can be instantiated with
+// different types any number of times, in any number of translation
+// units.
+//
+// If you are designing an interface or concept, you can define a
+// suite of type-parameterized tests to verify properties that any
+// valid implementation of the interface/concept should have.  Then,
+// each implementation can easily instantiate the test suite to verify
+// that it conforms to the requirements, without having to write
+// similar tests repeatedly.  Here's an example:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+  ...
+};
+
+// Next, declare that you will define a type-parameterized test case
+// (the _P suffix is for "parameterized" or "pattern", whichever you
+// prefer):
+TYPED_TEST_CASE_P(FooTest);
+
+// Then, use TYPED_TEST_P() to define as many type-parameterized tests
+// for this type-parameterized test case as you want.
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+
+// Now the tricky part: you need to register all test patterns before
+// you can instantiate them.  The first argument of the macro is the
+// test case name; the rest are the names of the tests in this test
+// case.
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+
+// Finally, you are free to instantiate the pattern with the types you
+// want.  If you put the above code in a header file, you can #include
+// it in multiple C++ source files and instantiate it multiple times.
+//
+// To distinguish different instances of the pattern, the first
+// argument to the INSTANTIATE_* macro is a prefix that will be added
+// to the actual test case name.  Remember to pick unique prefixes for
+// different instances.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Implements typed tests.
+
+#if GTEST_HAS_TYPED_TEST
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the typedef for the type parameters of the
+// given test case.
+# define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_
+
+// The 'Types' template argument below must have spaces around it
+// since some compilers may choke on '>>' when passing a template
+// instance (e.g. Types<int>)
+# define TYPED_TEST_CASE(CaseName, Types) \
+  typedef ::testing::internal::TypeList< Types >::type \
+      GTEST_TYPE_PARAMS_(CaseName)
+
+# define TYPED_TEST(CaseName, TestName) \
+  template <typename gtest_TypeParam_> \
+  class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \
+      : public CaseName<gtest_TypeParam_> { \
+   private: \
+    typedef CaseName<gtest_TypeParam_> TestFixture; \
+    typedef gtest_TypeParam_ TypeParam; \
+    virtual void TestBody(); \
+  }; \
+  bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::internal::TypeParameterizedTest< \
+          CaseName, \
+          ::testing::internal::TemplateSel< \
+              GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \
+          GTEST_TYPE_PARAMS_(CaseName)>::Register(\
+              "", #CaseName, #TestName, 0); \
+  template <typename gtest_TypeParam_> \
+  void GTEST_TEST_CLASS_NAME_(CaseName, TestName)<gtest_TypeParam_>::TestBody()
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+// Implements type-parameterized tests.
+
+#if GTEST_HAS_TYPED_TEST_P
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the namespace name that the type-parameterized tests for
+// the given type-parameterized test case are defined in.  The exact
+// name of the namespace is subject to change without notice.
+# define GTEST_CASE_NAMESPACE_(TestCaseName) \
+  gtest_case_##TestCaseName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the variable used to remember the names of
+// the defined tests in the given test case.
+# define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \
+  gtest_typed_test_case_p_state_##TestCaseName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
+//
+// Expands to the name of the variable used to remember the names of
+// the registered tests in the given test case.
+# define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \
+  gtest_registered_test_names_##TestCaseName##_
+
+// The variables defined in the type-parameterized test macros are
+// static as typically these macros are used in a .h file that can be
+// #included in multiple translation units linked together.
+# define TYPED_TEST_CASE_P(CaseName) \
+  static ::testing::internal::TypedTestCasePState \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName)
+
+# define TYPED_TEST_P(CaseName, TestName) \
+  namespace GTEST_CASE_NAMESPACE_(CaseName) { \
+  template <typename gtest_TypeParam_> \
+  class TestName : public CaseName<gtest_TypeParam_> { \
+   private: \
+    typedef CaseName<gtest_TypeParam_> TestFixture; \
+    typedef gtest_TypeParam_ TypeParam; \
+    virtual void TestBody(); \
+  }; \
+  static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).AddTestName(\
+          __FILE__, __LINE__, #CaseName, #TestName); \
+  } \
+  template <typename gtest_TypeParam_> \
+  void GTEST_CASE_NAMESPACE_(CaseName)::TestName<gtest_TypeParam_>::TestBody()
+
+# define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \
+  namespace GTEST_CASE_NAMESPACE_(CaseName) { \
+  typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
+  } \
+  static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\
+          __FILE__, __LINE__, #__VA_ARGS__)
+
+// The 'Types' template argument below must have spaces around it
+// since some compilers may choke on '>>' when passing a template
+// instance (e.g. Types<int>)
+# define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types) \
+  bool gtest_##Prefix##_##CaseName GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::internal::TypeParameterizedTestCase<CaseName, \
+          GTEST_CASE_NAMESPACE_(CaseName)::gtest_AllTests_, \
+          ::testing::internal::TypeList< Types >::type>::Register(\
+              #Prefix, #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName))
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
diff --git a/Externals/gtest/include/gtest/gtest.h b/Externals/gtest/include/gtest/gtest.h
new file mode 100644
index 0000000000..6fa0a3925e
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest.h
@@ -0,0 +1,2291 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the public API for Google Test.  It should be
+// included by any test program that uses Google Test.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+//
+// Acknowledgment: Google Test borrowed the idea of automatic test
+// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
+// easyUnit framework.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_H_
+
+#include <limits>
+#include <ostream>
+#include <vector>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/gtest-death-test.h"
+#include "gtest/gtest-message.h"
+#include "gtest/gtest-param-test.h"
+#include "gtest/gtest-printers.h"
+#include "gtest/gtest_prod.h"
+#include "gtest/gtest-test-part.h"
+#include "gtest/gtest-typed-test.h"
+
+// Depending on the platform, different string classes are available.
+// On Linux, in addition to ::std::string, Google also makes use of
+// class ::string, which has the same interface as ::std::string, but
+// has a different implementation.
+//
+// The user can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
+// ::string is available AND is a distinct type to ::std::string, or
+// define it to 0 to indicate otherwise.
+//
+// If the user's ::std::string and ::string are the same class due to
+// aliasing, he should define GTEST_HAS_GLOBAL_STRING to 0.
+//
+// If the user doesn't define GTEST_HAS_GLOBAL_STRING, it is defined
+// heuristically.
+
+namespace testing {
+
+// Declares the flags.
+
+// This flag temporary enables the disabled tests.
+GTEST_DECLARE_bool_(also_run_disabled_tests);
+
+// This flag brings the debugger on an assertion failure.
+GTEST_DECLARE_bool_(break_on_failure);
+
+// This flag controls whether Google Test catches all test-thrown exceptions
+// and logs them as failures.
+GTEST_DECLARE_bool_(catch_exceptions);
+
+// This flag enables using colors in terminal output. Available values are
+// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
+// to let Google Test decide.
+GTEST_DECLARE_string_(color);
+
+// This flag sets up the filter to select by name using a glob pattern
+// the tests to run. If the filter is not given all tests are executed.
+GTEST_DECLARE_string_(filter);
+
+// This flag causes the Google Test to list tests. None of the tests listed
+// are actually run if the flag is provided.
+GTEST_DECLARE_bool_(list_tests);
+
+// This flag controls whether Google Test emits a detailed XML report to a file
+// in addition to its normal textual output.
+GTEST_DECLARE_string_(output);
+
+// This flags control whether Google Test prints the elapsed time for each
+// test.
+GTEST_DECLARE_bool_(print_time);
+
+// This flag specifies the random number seed.
+GTEST_DECLARE_int32_(random_seed);
+
+// This flag sets how many times the tests are repeated. The default value
+// is 1. If the value is -1 the tests are repeating forever.
+GTEST_DECLARE_int32_(repeat);
+
+// This flag controls whether Google Test includes Google Test internal
+// stack frames in failure stack traces.
+GTEST_DECLARE_bool_(show_internal_stack_frames);
+
+// When this flag is specified, tests' order is randomized on every iteration.
+GTEST_DECLARE_bool_(shuffle);
+
+// This flag specifies the maximum number of stack frames to be
+// printed in a failure message.
+GTEST_DECLARE_int32_(stack_trace_depth);
+
+// When this flag is specified, a failed assertion will throw an
+// exception if exceptions are enabled, or exit the program with a
+// non-zero code otherwise.
+GTEST_DECLARE_bool_(throw_on_failure);
+
+// When this flag is set with a "host:port" string, on supported
+// platforms test results are streamed to the specified port on
+// the specified host machine.
+GTEST_DECLARE_string_(stream_result_to);
+
+// The upper limit for valid stack trace depths.
+const int kMaxStackTraceDepth = 100;
+
+namespace internal {
+
+class AssertHelper;
+class DefaultGlobalTestPartResultReporter;
+class ExecDeathTest;
+class NoExecDeathTest;
+class FinalSuccessChecker;
+class GTestFlagSaver;
+class StreamingListenerTest;
+class TestResultAccessor;
+class TestEventListenersAccessor;
+class TestEventRepeater;
+class UnitTestRecordPropertyTestHelper;
+class WindowsDeathTest;
+class UnitTestImpl* GetUnitTestImpl();
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message);
+
+}  // namespace internal
+
+// The friend relationship of some of these classes is cyclic.
+// If we don't forward declare them the compiler might confuse the classes
+// in friendship clauses with same named classes on the scope.
+class Test;
+class TestCase;
+class TestInfo;
+class UnitTest;
+
+// A class for indicating whether an assertion was successful.  When
+// the assertion wasn't successful, the AssertionResult object
+// remembers a non-empty message that describes how it failed.
+//
+// To create an instance of this class, use one of the factory functions
+// (AssertionSuccess() and AssertionFailure()).
+//
+// This class is useful for two purposes:
+//   1. Defining predicate functions to be used with Boolean test assertions
+//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
+//   2. Defining predicate-format functions to be
+//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
+//
+// For example, if you define IsEven predicate:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
+// will print the message
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false (5 is odd)
+//   Expected: true
+//
+// instead of a more opaque
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false
+//   Expected: true
+//
+// in case IsEven is a simple Boolean predicate.
+//
+// If you expect your predicate to be reused and want to support informative
+// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
+// about half as often as positive ones in our tests), supply messages for
+// both success and failure cases:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess() << n << " is even";
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
+//
+//   Value of: IsEven(Fib(6))
+//     Actual: true (8 is even)
+//   Expected: false
+//
+// NB: Predicates that support negative Boolean assertions have reduced
+// performance in positive ones so be careful not to use them in tests
+// that have lots (tens of thousands) of positive Boolean assertions.
+//
+// To use this class with EXPECT_PRED_FORMAT assertions such as:
+//
+//   // Verifies that Foo() returns an even number.
+//   EXPECT_PRED_FORMAT1(IsEven, Foo());
+//
+// you need to define:
+//
+//   testing::AssertionResult IsEven(const char* expr, int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure()
+//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
+//   }
+//
+// If Foo() returns 5, you will see the following message:
+//
+//   Expected: Foo() is even
+//     Actual: it's 5
+//
+class GTEST_API_ AssertionResult {
+ public:
+  // Copy constructor.
+  // Used in EXPECT_TRUE/FALSE(assertion_result).
+  AssertionResult(const AssertionResult& other);
+  // Used in the EXPECT_TRUE/FALSE(bool_expression).
+  explicit AssertionResult(bool success) : success_(success) {}
+
+  // Returns true iff the assertion succeeded.
+  operator bool() const { return success_; }  // NOLINT
+
+  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+  AssertionResult operator!() const;
+
+  // Returns the text streamed into this AssertionResult. Test assertions
+  // use it when they fail (i.e., the predicate's outcome doesn't match the
+  // assertion's expectation). When nothing has been streamed into the
+  // object, returns an empty string.
+  const char* message() const {
+    return message_.get() != NULL ?  message_->c_str() : "";
+  }
+  // TODO(vladl@google.com): Remove this after making sure no clients use it.
+  // Deprecated; please use message() instead.
+  const char* failure_message() const { return message(); }
+
+  // Streams a custom failure message into this object.
+  template <typename T> AssertionResult& operator<<(const T& value) {
+    AppendMessage(Message() << value);
+    return *this;
+  }
+
+  // Allows streaming basic output manipulators such as endl or flush into
+  // this object.
+  AssertionResult& operator<<(
+      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
+    AppendMessage(Message() << basic_manipulator);
+    return *this;
+  }
+
+ private:
+  // Appends the contents of message to message_.
+  void AppendMessage(const Message& a_message) {
+    if (message_.get() == NULL)
+      message_.reset(new ::std::string);
+    message_->append(a_message.GetString().c_str());
+  }
+
+  // Stores result of the assertion predicate.
+  bool success_;
+  // Stores the message describing the condition in case the expectation
+  // construct is not satisfied with the predicate's outcome.
+  // Referenced via a pointer to avoid taking too much stack frame space
+  // with test assertions.
+  internal::scoped_ptr< ::std::string> message_;
+
+  GTEST_DISALLOW_ASSIGN_(AssertionResult);
+};
+
+// Makes a successful assertion result.
+GTEST_API_ AssertionResult AssertionSuccess();
+
+// Makes a failed assertion result.
+GTEST_API_ AssertionResult AssertionFailure();
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << msg.
+GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
+
+// The abstract class that all tests inherit from.
+//
+// In Google Test, a unit test program contains one or many TestCases, and
+// each TestCase contains one or many Tests.
+//
+// When you define a test using the TEST macro, you don't need to
+// explicitly derive from Test - the TEST macro automatically does
+// this for you.
+//
+// The only time you derive from Test is when defining a test fixture
+// to be used a TEST_F.  For example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     virtual void SetUp() { ... }
+//     virtual void TearDown() { ... }
+//     ...
+//   };
+//
+//   TEST_F(FooTest, Bar) { ... }
+//   TEST_F(FooTest, Baz) { ... }
+//
+// Test is not copyable.
+class GTEST_API_ Test {
+ public:
+  friend class TestInfo;
+
+  // Defines types for pointers to functions that set up and tear down
+  // a test case.
+  typedef internal::SetUpTestCaseFunc SetUpTestCaseFunc;
+  typedef internal::TearDownTestCaseFunc TearDownTestCaseFunc;
+
+  // The d'tor is virtual as we intend to inherit from Test.
+  virtual ~Test();
+
+  // Sets up the stuff shared by all tests in this test case.
+  //
+  // Google Test will call Foo::SetUpTestCase() before running the first
+  // test in test case Foo.  Hence a sub-class can define its own
+  // SetUpTestCase() method to shadow the one defined in the super
+  // class.
+  static void SetUpTestCase() {}
+
+  // Tears down the stuff shared by all tests in this test case.
+  //
+  // Google Test will call Foo::TearDownTestCase() after running the last
+  // test in test case Foo.  Hence a sub-class can define its own
+  // TearDownTestCase() method to shadow the one defined in the super
+  // class.
+  static void TearDownTestCase() {}
+
+  // Returns true iff the current test has a fatal failure.
+  static bool HasFatalFailure();
+
+  // Returns true iff the current test has a non-fatal failure.
+  static bool HasNonfatalFailure();
+
+  // Returns true iff the current test has a (either fatal or
+  // non-fatal) failure.
+  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
+
+  // Logs a property for the current test, test case, or for the entire
+  // invocation of the test program when used outside of the context of a
+  // test case.  Only the last value for a given key is remembered.  These
+  // are public static so they can be called from utility functions that are
+  // not members of the test fixture.  Calls to RecordProperty made during
+  // lifespan of the test (from the moment its constructor starts to the
+  // moment its destructor finishes) will be output in XML as attributes of
+  // the <testcase> element.  Properties recorded from fixture's
+  // SetUpTestCase or TearDownTestCase are logged as attributes of the
+  // corresponding <testsuite> element.  Calls to RecordProperty made in the
+  // global context (before or after invocation of RUN_ALL_TESTS and from
+  // SetUp/TearDown method of Environment objects registered with Google
+  // Test) will be output as attributes of the <testsuites> element.
+  static void RecordProperty(const std::string& key, const std::string& value);
+  static void RecordProperty(const std::string& key, int value);
+
+ protected:
+  // Creates a Test object.
+  Test();
+
+  // Sets up the test fixture.
+  virtual void SetUp();
+
+  // Tears down the test fixture.
+  virtual void TearDown();
+
+ private:
+  // Returns true iff the current test has the same fixture class as
+  // the first test in the current test case.
+  static bool HasSameFixtureClass();
+
+  // Runs the test after the test fixture has been set up.
+  //
+  // A sub-class must implement this to define the test logic.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
+  // Instead, use the TEST or TEST_F macro.
+  virtual void TestBody() = 0;
+
+  // Sets up, executes, and tears down the test.
+  void Run();
+
+  // Deletes self.  We deliberately pick an unusual name for this
+  // internal method to avoid clashing with names used in user TESTs.
+  void DeleteSelf_() { delete this; }
+
+  // Uses a GTestFlagSaver to save and restore all Google Test flags.
+  const internal::GTestFlagSaver* const gtest_flag_saver_;
+
+  // Often a user mis-spells SetUp() as Setup() and spends a long time
+  // wondering why it is never called by Google Test.  The declaration of
+  // the following method is solely for catching such an error at
+  // compile time:
+  //
+  //   - The return type is deliberately chosen to be not void, so it
+  //   will be a conflict if a user declares void Setup() in his test
+  //   fixture.
+  //
+  //   - This method is private, so it will be another compiler error
+  //   if a user calls it from his test fixture.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION.
+  //
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; }
+
+  // We disallow copying Tests.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
+};
+
+typedef internal::TimeInMillis TimeInMillis;
+
+// A copyable object representing a user specified test property which can be
+// output as a key/value string pair.
+//
+// Don't inherit from TestProperty as its destructor is not virtual.
+class TestProperty {
+ public:
+  // C'tor.  TestProperty does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestProperty object.
+  TestProperty(const std::string& a_key, const std::string& a_value) :
+    key_(a_key), value_(a_value) {
+  }
+
+  // Gets the user supplied key.
+  const char* key() const {
+    return key_.c_str();
+  }
+
+  // Gets the user supplied value.
+  const char* value() const {
+    return value_.c_str();
+  }
+
+  // Sets a new value, overriding the one supplied in the constructor.
+  void SetValue(const std::string& new_value) {
+    value_ = new_value;
+  }
+
+ private:
+  // The key supplied by the user.
+  std::string key_;
+  // The value supplied by the user.
+  std::string value_;
+};
+
+// The result of a single Test.  This includes a list of
+// TestPartResults, a list of TestProperties, a count of how many
+// death tests there are in the Test, and how much time it took to run
+// the Test.
+//
+// TestResult is not copyable.
+class GTEST_API_ TestResult {
+ public:
+  // Creates an empty TestResult.
+  TestResult();
+
+  // D'tor.  Do not inherit from TestResult.
+  ~TestResult();
+
+  // Gets the number of all test parts.  This is the sum of the number
+  // of successful test parts and the number of failed test parts.
+  int total_part_count() const;
+
+  // Returns the number of the test properties.
+  int test_property_count() const;
+
+  // Returns true iff the test passed (i.e. no test part failed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the test failed.
+  bool Failed() const;
+
+  // Returns true iff the test fatally failed.
+  bool HasFatalFailure() const;
+
+  // Returns true iff the test has a non-fatal failure.
+  bool HasNonfatalFailure() const;
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns the i-th test part result among all the results. i can range
+  // from 0 to test_property_count() - 1. If i is not in that range, aborts
+  // the program.
+  const TestPartResult& GetTestPartResult(int i) const;
+
+  // Returns the i-th test property. i can range from 0 to
+  // test_property_count() - 1. If i is not in that range, aborts the
+  // program.
+  const TestProperty& GetTestProperty(int i) const;
+
+ private:
+  friend class TestInfo;
+  friend class TestCase;
+  friend class UnitTest;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::ExecDeathTest;
+  friend class internal::TestResultAccessor;
+  friend class internal::UnitTestImpl;
+  friend class internal::WindowsDeathTest;
+
+  // Gets the vector of TestPartResults.
+  const std::vector<TestPartResult>& test_part_results() const {
+    return test_part_results_;
+  }
+
+  // Gets the vector of TestProperties.
+  const std::vector<TestProperty>& test_properties() const {
+    return test_properties_;
+  }
+
+  // Sets the elapsed time.
+  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
+
+  // Adds a test property to the list. The property is validated and may add
+  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
+  // key names). If a property is already recorded for the same key, the
+  // value will be updated, rather than storing multiple values for the same
+  // key.  xml_element specifies the element for which the property is being
+  // recorded and is used for validation.
+  void RecordProperty(const std::string& xml_element,
+                      const TestProperty& test_property);
+
+  // Adds a failure if the key is a reserved attribute of Google Test
+  // testcase tags.  Returns true if the property is valid.
+  // TODO(russr): Validate attribute names are legal and human readable.
+  static bool ValidateTestProperty(const std::string& xml_element,
+                                   const TestProperty& test_property);
+
+  // Adds a test part result to the list.
+  void AddTestPartResult(const TestPartResult& test_part_result);
+
+  // Returns the death test count.
+  int death_test_count() const { return death_test_count_; }
+
+  // Increments the death test count, returning the new count.
+  int increment_death_test_count() { return ++death_test_count_; }
+
+  // Clears the test part results.
+  void ClearTestPartResults();
+
+  // Clears the object.
+  void Clear();
+
+  // Protects mutable state of the property vector and of owned
+  // properties, whose values may be updated.
+  internal::Mutex test_properites_mutex_;
+
+  // The vector of TestPartResults
+  std::vector<TestPartResult> test_part_results_;
+  // The vector of TestProperties
+  std::vector<TestProperty> test_properties_;
+  // Running count of death tests.
+  int death_test_count_;
+  // The elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+  // We disallow copying TestResult.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
+};  // class TestResult
+
+// A TestInfo object stores the following information about a test:
+//
+//   Test case name
+//   Test name
+//   Whether the test should be run
+//   A function pointer that creates the test object when invoked
+//   Test result
+//
+// The constructor of TestInfo registers itself with the UnitTest
+// singleton such that the RUN_ALL_TESTS() macro knows which tests to
+// run.
+class GTEST_API_ TestInfo {
+ public:
+  // Destructs a TestInfo object.  This function is not virtual, so
+  // don't inherit from TestInfo.
+  ~TestInfo();
+
+  // Returns the test case name.
+  const char* test_case_name() const { return test_case_name_.c_str(); }
+
+  // Returns the test name.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a typed
+  // or a type-parameterized test.
+  const char* type_param() const {
+    if (type_param_.get() != NULL)
+      return type_param_->c_str();
+    return NULL;
+  }
+
+  // Returns the text representation of the value parameter, or NULL if this
+  // is not a value-parameterized test.
+  const char* value_param() const {
+    if (value_param_.get() != NULL)
+      return value_param_->c_str();
+    return NULL;
+  }
+
+  // Returns true if this test should run, that is if the test is not
+  // disabled (or it is disabled but the also_run_disabled_tests flag has
+  // been specified) and its full name matches the user-specified filter.
+  //
+  // Google Test allows the user to filter the tests by their full names.
+  // The full name of a test Bar in test case Foo is defined as
+  // "Foo.Bar".  Only the tests that match the filter will run.
+  //
+  // A filter is a colon-separated list of glob (not regex) patterns,
+  // optionally followed by a '-' and a colon-separated list of
+  // negative patterns (tests to exclude).  A test is run if it
+  // matches one of the positive patterns and does not match any of
+  // the negative patterns.
+  //
+  // For example, *A*:Foo.* is a filter that matches any string that
+  // contains the character 'A' or starts with "Foo.".
+  bool should_run() const { return should_run_; }
+
+  // Returns true iff this test will appear in the XML report.
+  bool is_reportable() const {
+    // For now, the XML report includes all tests matching the filter.
+    // In the future, we may trim tests that are excluded because of
+    // sharding.
+    return matches_filter_;
+  }
+
+  // Returns the result of the test.
+  const TestResult* result() const { return &result_; }
+
+ private:
+#if GTEST_HAS_DEATH_TEST
+  friend class internal::DefaultDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+  friend class Test;
+  friend class TestCase;
+  friend class internal::UnitTestImpl;
+  friend class internal::StreamingListenerTest;
+  friend TestInfo* internal::MakeAndRegisterTestInfo(
+      const char* test_case_name,
+      const char* name,
+      const char* type_param,
+      const char* value_param,
+      internal::TypeId fixture_class_id,
+      Test::SetUpTestCaseFunc set_up_tc,
+      Test::TearDownTestCaseFunc tear_down_tc,
+      internal::TestFactoryBase* factory);
+
+  // Constructs a TestInfo object. The newly constructed instance assumes
+  // ownership of the factory object.
+  TestInfo(const std::string& test_case_name,
+           const std::string& name,
+           const char* a_type_param,   // NULL if not a type-parameterized test
+           const char* a_value_param,  // NULL if not a value-parameterized test
+           internal::TypeId fixture_class_id,
+           internal::TestFactoryBase* factory);
+
+  // Increments the number of death tests encountered in this test so
+  // far.
+  int increment_death_test_count() {
+    return result_.increment_death_test_count();
+  }
+
+  // Creates the test object, runs it, records its result, and then
+  // deletes it.
+  void Run();
+
+  static void ClearTestResult(TestInfo* test_info) {
+    test_info->result_.Clear();
+  }
+
+  // These fields are immutable properties of the test.
+  const std::string test_case_name_;     // Test case name
+  const std::string name_;               // Test name
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const internal::scoped_ptr<const ::std::string> type_param_;
+  // Text representation of the value parameter, or NULL if this is not a
+  // value-parameterized test.
+  const internal::scoped_ptr<const ::std::string> value_param_;
+  const internal::TypeId fixture_class_id_;   // ID of the test fixture class
+  bool should_run_;                 // True iff this test should run
+  bool is_disabled_;                // True iff this test is disabled
+  bool matches_filter_;             // True if this test matches the
+                                    // user-specified filter.
+  internal::TestFactoryBase* const factory_;  // The factory that creates
+                                              // the test object
+
+  // This field is mutable and needs to be reset before running the
+  // test for the second time.
+  TestResult result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
+};
+
+// A test case, which consists of a vector of TestInfos.
+//
+// TestCase is not copyable.
+class GTEST_API_ TestCase {
+ public:
+  // Creates a TestCase with the given name.
+  //
+  // TestCase does NOT have a default constructor.  Always use this
+  // constructor to create a TestCase object.
+  //
+  // Arguments:
+  //
+  //   name:         name of the test case
+  //   a_type_param: the name of the test's type parameter, or NULL if
+  //                 this is not a type-parameterized test.
+  //   set_up_tc:    pointer to the function that sets up the test case
+  //   tear_down_tc: pointer to the function that tears down the test case
+  TestCase(const char* name, const char* a_type_param,
+           Test::SetUpTestCaseFunc set_up_tc,
+           Test::TearDownTestCaseFunc tear_down_tc);
+
+  // Destructor of TestCase.
+  virtual ~TestCase();
+
+  // Gets the name of the TestCase.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a
+  // type-parameterized test case.
+  const char* type_param() const {
+    if (type_param_.get() != NULL)
+      return type_param_->c_str();
+    return NULL;
+  }
+
+  // Returns true if any test in this test case should run.
+  bool should_run() const { return should_run_; }
+
+  // Gets the number of successful tests in this test case.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests in this test case.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests in this test case.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Get the number of tests in this test case that should run.
+  int test_to_run_count() const;
+
+  // Gets the number of all tests in this test case.
+  int total_test_count() const;
+
+  // Returns true iff the test case passed.
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the test case failed.
+  bool Failed() const { return failed_test_count() > 0; }
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  const TestInfo* GetTestInfo(int i) const;
+
+  // Returns the TestResult that holds test properties recorded during
+  // execution of SetUpTestCase and TearDownTestCase.
+  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
+
+ private:
+  friend class Test;
+  friend class internal::UnitTestImpl;
+
+  // Gets the (mutable) vector of TestInfos in this TestCase.
+  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
+
+  // Gets the (immutable) vector of TestInfos in this TestCase.
+  const std::vector<TestInfo*>& test_info_list() const {
+    return test_info_list_;
+  }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  TestInfo* GetMutableTestInfo(int i);
+
+  // Sets the should_run member.
+  void set_should_run(bool should) { should_run_ = should; }
+
+  // Adds a TestInfo to this test case.  Will delete the TestInfo upon
+  // destruction of the TestCase object.
+  void AddTestInfo(TestInfo * test_info);
+
+  // Clears the results of all tests in this test case.
+  void ClearResult();
+
+  // Clears the results of all tests in the given test case.
+  static void ClearTestCaseResult(TestCase* test_case) {
+    test_case->ClearResult();
+  }
+
+  // Runs every test in this TestCase.
+  void Run();
+
+  // Runs SetUpTestCase() for this TestCase.  This wrapper is needed
+  // for catching exceptions thrown from SetUpTestCase().
+  void RunSetUpTestCase() { (*set_up_tc_)(); }
+
+  // Runs TearDownTestCase() for this TestCase.  This wrapper is
+  // needed for catching exceptions thrown from TearDownTestCase().
+  void RunTearDownTestCase() { (*tear_down_tc_)(); }
+
+  // Returns true iff test passed.
+  static bool TestPassed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Passed();
+  }
+
+  // Returns true iff test failed.
+  static bool TestFailed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Failed();
+  }
+
+  // Returns true iff the test is disabled and will be reported in the XML
+  // report.
+  static bool TestReportableDisabled(const TestInfo* test_info) {
+    return test_info->is_reportable() && test_info->is_disabled_;
+  }
+
+  // Returns true iff test is disabled.
+  static bool TestDisabled(const TestInfo* test_info) {
+    return test_info->is_disabled_;
+  }
+
+  // Returns true iff this test will appear in the XML report.
+  static bool TestReportable(const TestInfo* test_info) {
+    return test_info->is_reportable();
+  }
+
+  // Returns true if the given test should run.
+  static bool ShouldRunTest(const TestInfo* test_info) {
+    return test_info->should_run();
+  }
+
+  // Shuffles the tests in this test case.
+  void ShuffleTests(internal::Random* random);
+
+  // Restores the test order to before the first shuffle.
+  void UnshuffleTests();
+
+  // Name of the test case.
+  std::string name_;
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const internal::scoped_ptr<const ::std::string> type_param_;
+  // The vector of TestInfos in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestInfo*> test_info_list_;
+  // Provides a level of indirection for the test list to allow easy
+  // shuffling and restoring the test order.  The i-th element in this
+  // vector is the index of the i-th test in the shuffled test list.
+  std::vector<int> test_indices_;
+  // Pointer to the function that sets up the test case.
+  Test::SetUpTestCaseFunc set_up_tc_;
+  // Pointer to the function that tears down the test case.
+  Test::TearDownTestCaseFunc tear_down_tc_;
+  // True iff any test in this test case should run.
+  bool should_run_;
+  // Elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+  // Holds test properties recorded during execution of SetUpTestCase and
+  // TearDownTestCase.
+  TestResult ad_hoc_test_result_;
+
+  // We disallow copying TestCases.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestCase);
+};
+
+// An Environment object is capable of setting up and tearing down an
+// environment.  The user should subclass this to define his own
+// environment(s).
+//
+// An Environment object does the set-up and tear-down in virtual
+// methods SetUp() and TearDown() instead of the constructor and the
+// destructor, as:
+//
+//   1. You cannot safely throw from a destructor.  This is a problem
+//      as in some cases Google Test is used where exceptions are enabled, and
+//      we may want to implement ASSERT_* using exceptions where they are
+//      available.
+//   2. You cannot use ASSERT_* directly in a constructor or
+//      destructor.
+class Environment {
+ public:
+  // The d'tor is virtual as we need to subclass Environment.
+  virtual ~Environment() {}
+
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+ private:
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; }
+};
+
+// The interface for tracing execution of tests. The methods are organized in
+// the order the corresponding events are fired.
+class TestEventListener {
+ public:
+  virtual ~TestEventListener() {}
+
+  // Fired before any test activity starts.
+  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
+
+  // Fired before each iteration of tests starts.  There may be more than
+  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
+  // index, starting from 0.
+  virtual void OnTestIterationStart(const UnitTest& unit_test,
+                                    int iteration) = 0;
+
+  // Fired before environment set-up for each iteration of tests starts.
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment set-up for each iteration of tests ends.
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
+
+  // Fired before the test case starts.
+  virtual void OnTestCaseStart(const TestCase& test_case) = 0;
+
+  // Fired before the test starts.
+  virtual void OnTestStart(const TestInfo& test_info) = 0;
+
+  // Fired after a failed assertion or a SUCCEED() invocation.
+  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
+
+  // Fired after the test ends.
+  virtual void OnTestEnd(const TestInfo& test_info) = 0;
+
+  // Fired after the test case ends.
+  virtual void OnTestCaseEnd(const TestCase& test_case) = 0;
+
+  // Fired before environment tear-down for each iteration of tests starts.
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment tear-down for each iteration of tests ends.
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
+
+  // Fired after each iteration of tests finishes.
+  virtual void OnTestIterationEnd(const UnitTest& unit_test,
+                                  int iteration) = 0;
+
+  // Fired after all test activities have ended.
+  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
+};
+
+// The convenience class for users who need to override just one or two
+// methods and are not concerned that a possible change to a signature of
+// the methods they override will not be caught during the build.  For
+// comments about each method please see the definition of TestEventListener
+// above.
+class EmptyTestEventListener : public TestEventListener {
+ public:
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                                    int /*iteration*/) {}
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
+  virtual void OnTestStart(const TestInfo& /*test_info*/) {}
+  virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {}
+  virtual void OnTestEnd(const TestInfo& /*test_info*/) {}
+  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                                  int /*iteration*/) {}
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
+};
+
+// TestEventListeners lets users add listeners to track events in Google Test.
+class GTEST_API_ TestEventListeners {
+ public:
+  TestEventListeners();
+  ~TestEventListeners();
+
+  // Appends an event listener to the end of the list. Google Test assumes
+  // the ownership of the listener (i.e. it will delete the listener when
+  // the test program finishes).
+  void Append(TestEventListener* listener);
+
+  // Removes the given event listener from the list and returns it.  It then
+  // becomes the caller's responsibility to delete the listener. Returns
+  // NULL if the listener is not found in the list.
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Returns the standard listener responsible for the default console
+  // output.  Can be removed from the listeners list to shut down default
+  // console output.  Note that removing this object from the listener list
+  // with Release transfers its ownership to the caller and makes this
+  // function return NULL the next time.
+  TestEventListener* default_result_printer() const {
+    return default_result_printer_;
+  }
+
+  // Returns the standard listener responsible for the default XML output
+  // controlled by the --gtest_output=xml flag.  Can be removed from the
+  // listeners list by users who want to shut down the default XML output
+  // controlled by this flag and substitute it with custom one.  Note that
+  // removing this object from the listener list with Release transfers its
+  // ownership to the caller and makes this function return NULL the next
+  // time.
+  TestEventListener* default_xml_generator() const {
+    return default_xml_generator_;
+  }
+
+ private:
+  friend class TestCase;
+  friend class TestInfo;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::NoExecDeathTest;
+  friend class internal::TestEventListenersAccessor;
+  friend class internal::UnitTestImpl;
+
+  // Returns repeater that broadcasts the TestEventListener events to all
+  // subscribers.
+  TestEventListener* repeater();
+
+  // Sets the default_result_printer attribute to the provided listener.
+  // The listener is also added to the listener list and previous
+  // default_result_printer is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultResultPrinter(TestEventListener* listener);
+
+  // Sets the default_xml_generator attribute to the provided listener.  The
+  // listener is also added to the listener list and previous
+  // default_xml_generator is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultXmlGenerator(TestEventListener* listener);
+
+  // Controls whether events will be forwarded by the repeater to the
+  // listeners in the list.
+  bool EventForwardingEnabled() const;
+  void SuppressEventForwarding();
+
+  // The actual list of listeners.
+  internal::TestEventRepeater* repeater_;
+  // Listener responsible for the standard result output.
+  TestEventListener* default_result_printer_;
+  // Listener responsible for the creation of the XML output file.
+  TestEventListener* default_xml_generator_;
+
+  // We disallow copying TestEventListeners.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
+};
+
+// A UnitTest consists of a vector of TestCases.
+//
+// This is a singleton class.  The only instance of UnitTest is
+// created when UnitTest::GetInstance() is first called.  This
+// instance is never deleted.
+//
+// UnitTest is not copyable.
+//
+// This class is thread-safe as long as the methods are called
+// according to their specification.
+class GTEST_API_ UnitTest {
+ public:
+  // Gets the singleton UnitTest object.  The first time this method
+  // is called, a UnitTest object is constructed and returned.
+  // Consecutive calls will return the same object.
+  static UnitTest* GetInstance();
+
+  // Runs all tests in this UnitTest object and prints the result.
+  // Returns 0 if successful, or 1 otherwise.
+  //
+  // This method can only be called from the main thread.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  int Run() GTEST_MUST_USE_RESULT_;
+
+  // Returns the working directory when the first TEST() or TEST_F()
+  // was executed.  The UnitTest object owns the string.
+  const char* original_working_dir() const;
+
+  // Returns the TestCase object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestCase* current_test_case() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the TestInfo object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestInfo* current_test_info() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the random seed used at the start of the current test run.
+  int random_seed() const;
+
+#if GTEST_HAS_PARAM_TEST
+  // Returns the ParameterizedTestCaseRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  internal::ParameterizedTestCaseRegistry& parameterized_test_registry()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Gets the number of successful test cases.
+  int successful_test_case_count() const;
+
+  // Gets the number of failed test cases.
+  int failed_test_case_count() const;
+
+  // Gets the number of all test cases.
+  int total_test_case_count() const;
+
+  // Gets the number of all test cases that contain at least one test
+  // that should run.
+  int test_case_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const;
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const;
+
+  // Returns true iff the unit test passed (i.e. all test cases passed).
+  bool Passed() const;
+
+  // Returns true iff the unit test failed (i.e. some test case failed
+  // or something outside of all tests failed).
+  bool Failed() const;
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  const TestCase* GetTestCase(int i) const;
+
+  // Returns the TestResult containing information on test failures and
+  // properties logged outside of individual test cases.
+  const TestResult& ad_hoc_test_result() const;
+
+  // Returns the list of event listeners that can be used to track events
+  // inside Google Test.
+  TestEventListeners& listeners();
+
+ private:
+  // Registers and returns a global test environment.  When a test
+  // program is run, all global test environments will be set-up in
+  // the order they were registered.  After all tests in the program
+  // have finished, all global test environments will be torn-down in
+  // the *reverse* order they were registered.
+  //
+  // The UnitTest object takes ownership of the given environment.
+  //
+  // This method can only be called from the main thread.
+  Environment* AddEnvironment(Environment* env);
+
+  // Adds a TestPartResult to the current TestResult object.  All
+  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
+  // eventually call this to report their results.  The user code
+  // should use the assertion macros instead of calling this directly.
+  void AddTestPartResult(TestPartResult::Type result_type,
+                         const char* file_name,
+                         int line_number,
+                         const std::string& message,
+                         const std::string& os_stack_trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Adds a TestProperty to the current TestResult object when invoked from
+  // inside a test, to current TestCase's ad_hoc_test_result_ when invoked
+  // from SetUpTestCase or TearDownTestCase, or to the global property set
+  // when invoked elsewhere.  If the result already contains a property with
+  // the same key, the value will be updated.
+  void RecordProperty(const std::string& key, const std::string& value);
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  TestCase* GetMutableTestCase(int i);
+
+  // Accessors for the implementation object.
+  internal::UnitTestImpl* impl() { return impl_; }
+  const internal::UnitTestImpl* impl() const { return impl_; }
+
+  // These classes and funcions are friends as they need to access private
+  // members of UnitTest.
+  friend class Test;
+  friend class internal::AssertHelper;
+  friend class internal::ScopedTrace;
+  friend class internal::StreamingListenerTest;
+  friend class internal::UnitTestRecordPropertyTestHelper;
+  friend Environment* AddGlobalTestEnvironment(Environment* env);
+  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
+  friend void internal::ReportFailureInUnknownLocation(
+      TestPartResult::Type result_type,
+      const std::string& message);
+
+  // Creates an empty UnitTest.
+  UnitTest();
+
+  // D'tor
+  virtual ~UnitTest();
+
+  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+  // Google Test trace stack.
+  void PushGTestTrace(const internal::TraceInfo& trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Pops a trace from the per-thread Google Test trace stack.
+  void PopGTestTrace()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Protects mutable state in *impl_.  This is mutable as some const
+  // methods need to lock it too.
+  mutable internal::Mutex mutex_;
+
+  // Opaque implementation object.  This field is never changed once
+  // the object is constructed.  We don't mark it as const here, as
+  // doing so will cause a warning in the constructor of UnitTest.
+  // Mutable state in *impl_ is protected by mutex_.
+  internal::UnitTestImpl* impl_;
+
+  // We disallow copying UnitTest.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
+};
+
+// A convenient wrapper for adding an environment for the test
+// program.
+//
+// You should call this before RUN_ALL_TESTS() is called, probably in
+// main().  If you use gtest_main, you need to call this before main()
+// starts for it to take effect.  For example, you can define a global
+// variable like this:
+//
+//   testing::Environment* const foo_env =
+//       testing::AddGlobalTestEnvironment(new FooEnvironment);
+//
+// However, we strongly recommend you to write your own main() and
+// call AddGlobalTestEnvironment() there, as relying on initialization
+// of global variables makes the code harder to read and may cause
+// problems when you register multiple environments from different
+// translation units and the environments have dependencies among them
+// (remember that the compiler doesn't guarantee the order in which
+// global variables from different translation units are initialized).
+inline Environment* AddGlobalTestEnvironment(Environment* env) {
+  return UnitTest::GetInstance()->AddEnvironment(env);
+}
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+GTEST_API_ void InitGoogleTest(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
+
+namespace internal {
+
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
+#endif
+
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename T1, typename T2>
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
+}
+
+// The helper function for {ASSERT|EXPECT}_EQ.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQ(const char* expected_expression,
+                            const char* actual_expression,
+                            const T1& expected,
+                            const T2& actual) {
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4389)  // Temporarily disables warning on
+                                // signed/unsigned mismatch.
+#endif
+
+  if (expected == actual) {
+    return AssertionSuccess();
+  }
+
+#ifdef _MSC_VER
+# pragma warning(pop)          // Restores the warning state.
+#endif
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   FormatForComparisonFailureMessage(expected, actual),
+                   FormatForComparisonFailureMessage(actual, expected),
+                   false);
+}
+
+// With this overloaded version, we allow anonymous enums to be used
+// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
+// can be implicitly cast to BiggestInt.
+GTEST_API_ AssertionResult CmpHelperEQ(const char* expected_expression,
+                                       const char* actual_expression,
+                                       BiggestInt expected,
+                                       BiggestInt actual);
+
+// The helper class for {ASSERT|EXPECT}_EQ.  The template argument
+// lhs_is_null_literal is true iff the first argument to ASSERT_EQ()
+// is a null pointer literal.  The following default implementation is
+// for lhs_is_null_literal being false.
+template <bool lhs_is_null_literal>
+class EqHelper {
+ public:
+  // This templatized version is for the general case.
+  template <typename T1, typename T2>
+  static AssertionResult Compare(const char* expected_expression,
+                                 const char* actual_expression,
+                                 const T1& expected,
+                                 const T2& actual) {
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
+  }
+
+  // With this overloaded version, we allow anonymous enums to be used
+  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
+  // enums can be implicitly cast to BiggestInt.
+  //
+  // Even though its body looks the same as the above version, we
+  // cannot merge the two, as it will make anonymous enums unhappy.
+  static AssertionResult Compare(const char* expected_expression,
+                                 const char* actual_expression,
+                                 BiggestInt expected,
+                                 BiggestInt actual) {
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
+  }
+};
+
+// This specialization is used when the first argument to ASSERT_EQ()
+// is a null pointer literal, like NULL, false, or 0.
+template <>
+class EqHelper<true> {
+ public:
+  // We define two overloaded versions of Compare().  The first
+  // version will be picked when the second argument to ASSERT_EQ() is
+  // NOT a pointer, e.g. ASSERT_EQ(0, AnIntFunction()) or
+  // EXPECT_EQ(false, a_bool).
+  template <typename T1, typename T2>
+  static AssertionResult Compare(
+      const char* expected_expression,
+      const char* actual_expression,
+      const T1& expected,
+      const T2& actual,
+      // The following line prevents this overload from being considered if T2
+      // is not a pointer type.  We need this because ASSERT_EQ(NULL, my_ptr)
+      // expands to Compare("", "", NULL, my_ptr), which requires a conversion
+      // to match the Secret* in the other overload, which would otherwise make
+      // this template match better.
+      typename EnableIf<!is_pointer<T2>::value>::type* = 0) {
+    return CmpHelperEQ(expected_expression, actual_expression, expected,
+                       actual);
+  }
+
+  // This version will be picked when the second argument to ASSERT_EQ() is a
+  // pointer, e.g. ASSERT_EQ(NULL, a_pointer).
+  template <typename T>
+  static AssertionResult Compare(
+      const char* expected_expression,
+      const char* actual_expression,
+      // We used to have a second template parameter instead of Secret*.  That
+      // template parameter would deduce to 'long', making this a better match
+      // than the first overload even without the first overload's EnableIf.
+      // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to
+      // non-pointer argument" (even a deduced integral argument), so the old
+      // implementation caused warnings in user code.
+      Secret* /* expected (NULL) */,
+      T* actual) {
+    // We already know that 'expected' is a null pointer.
+    return CmpHelperEQ(expected_expression, actual_expression,
+                       static_cast<T*>(NULL), actual);
+  }
+};
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
+// of similar code.
+//
+// For each templatized helper function, we also define an overloaded
+// version for BiggestInt in order to reduce code bloat and allow
+// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled
+// with gcc 4.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+template <typename T1, typename T2>\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   const T1& val1, const T2& val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return AssertionFailure() \
+        << "Expected: (" << expr1 << ") " #op " (" << expr2\
+        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
+        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
+  }\
+}\
+GTEST_API_ AssertionResult CmpHelper##op_name(\
+    const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2)
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// Implements the helper function for {ASSERT|EXPECT}_NE
+GTEST_IMPL_CMP_HELPER_(NE, !=);
+// Implements the helper function for {ASSERT|EXPECT}_LE
+GTEST_IMPL_CMP_HELPER_(LE, <=);
+// Implements the helper function for {ASSERT|EXPECT}_LT
+GTEST_IMPL_CMP_HELPER_(LT, <);
+// Implements the helper function for {ASSERT|EXPECT}_GE
+GTEST_IMPL_CMP_HELPER_(GE, >=);
+// Implements the helper function for {ASSERT|EXPECT}_GT
+GTEST_IMPL_CMP_HELPER_(GT, >);
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                                          const char* actual_expression,
+                                          const char* expected,
+                                          const char* actual);
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
+                                              const char* actual_expression,
+                                              const char* expected,
+                                              const char* actual);
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+
+// Helper function for *_STREQ on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                                          const char* actual_expression,
+                                          const wchar_t* expected,
+                                          const wchar_t* actual);
+
+// Helper function for *_STRNE on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+}  // namespace internal
+
+// IsSubstring() and IsNotSubstring() are intended to be used as the
+// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
+// themselves.  They check whether needle is a substring of haystack
+// (NULL is considered a substring of itself only), and return an
+// appropriate error message when they fail.
+//
+// The {needle,haystack}_expr arguments are the stringified
+// expressions that generated the two real arguments.
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+// Helper template function for comparing floating-points.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename RawType>
+AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression,
+                                         const char* actual_expression,
+                                         RawType expected,
+                                         RawType actual) {
+  const FloatingPoint<RawType> lhs(expected), rhs(actual);
+
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  ::std::stringstream expected_ss;
+  expected_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+              << expected;
+
+  ::std::stringstream actual_ss;
+  actual_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+            << actual;
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   StringStreamToString(&expected_ss),
+                   StringStreamToString(&actual_ss),
+                   false);
+}
+
+// Helper function for implementing ASSERT_NEAR.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
+                                                const char* expr2,
+                                                const char* abs_error_expr,
+                                                double val1,
+                                                double val2,
+                                                double abs_error);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// A class that enables one to stream messages to assertion macros
+class GTEST_API_ AssertHelper {
+ public:
+  // Constructor.
+  AssertHelper(TestPartResult::Type type,
+               const char* file,
+               int line,
+               const char* message);
+  ~AssertHelper();
+
+  // Message assignment is a semantic trick to enable assertion
+  // streaming; see the GTEST_MESSAGE_ macro below.
+  void operator=(const Message& message) const;
+
+ private:
+  // We put our data in a struct so that the size of the AssertHelper class can
+  // be as small as possible.  This is important because gcc is incapable of
+  // re-using stack space even for temporary variables, so every EXPECT_EQ
+  // reserves stack space for another AssertHelper.
+  struct AssertHelperData {
+    AssertHelperData(TestPartResult::Type t,
+                     const char* srcfile,
+                     int line_num,
+                     const char* msg)
+        : type(t), file(srcfile), line(line_num), message(msg) { }
+
+    TestPartResult::Type const type;
+    const char* const file;
+    int const line;
+    std::string const message;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
+  };
+
+  AssertHelperData* const data_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
+};
+
+}  // namespace internal
+
+#if GTEST_HAS_PARAM_TEST
+// The pure interface class that all value-parameterized tests inherit from.
+// A value-parameterized class must inherit from both ::testing::Test and
+// ::testing::WithParamInterface. In most cases that just means inheriting
+// from ::testing::TestWithParam, but more complicated test hierarchies
+// may need to inherit from Test and WithParamInterface at different levels.
+//
+// This interface has support for accessing the test parameter value via
+// the GetParam() method.
+//
+// Use it with one of the parameter generator defining functions, like Range(),
+// Values(), ValuesIn(), Bool(), and Combine().
+//
+// class FooTest : public ::testing::TestWithParam<int> {
+//  protected:
+//   FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   virtual ~FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   virtual void SetUp() {
+//     // Can use GetParam() here.
+//   }
+//   virtual void TearDown {
+//     // Can use GetParam() here.
+//   }
+// };
+// TEST_P(FooTest, DoesBar) {
+//   // Can use GetParam() method here.
+//   Foo foo;
+//   ASSERT_TRUE(foo.DoesBar(GetParam()));
+// }
+// INSTANTIATE_TEST_CASE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
+
+template <typename T>
+class WithParamInterface {
+ public:
+  typedef T ParamType;
+  virtual ~WithParamInterface() {}
+
+  // The current parameter value. Is also available in the test fixture's
+  // constructor. This member function is non-static, even though it only
+  // references static data, to reduce the opportunity for incorrect uses
+  // like writing 'WithParamInterface<bool>::GetParam()' for a test that
+  // uses a fixture whose parameter type is int.
+  const ParamType& GetParam() const {
+    GTEST_CHECK_(parameter_ != NULL)
+        << "GetParam() can only be called inside a value-parameterized test "
+        << "-- did you intend to write TEST_P instead of TEST_F?";
+    return *parameter_;
+  }
+
+ private:
+  // Sets parameter value. The caller is responsible for making sure the value
+  // remains alive and unchanged throughout the current test.
+  static void SetParam(const ParamType* parameter) {
+    parameter_ = parameter;
+  }
+
+  // Static value used for accessing parameter during a test lifetime.
+  static const ParamType* parameter_;
+
+  // TestClass must be a subclass of WithParamInterface<T> and Test.
+  template <class TestClass> friend class internal::ParameterizedTestFactory;
+};
+
+template <typename T>
+const T* WithParamInterface<T>::parameter_ = NULL;
+
+// Most value-parameterized classes can ignore the existence of
+// WithParamInterface, and can just inherit from ::testing::TestWithParam.
+
+template <typename T>
+class TestWithParam : public Test, public WithParamInterface<T> {
+};
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+// Macros for indicating success/failure in test code.
+
+// ADD_FAILURE unconditionally adds a failure to the current test.
+// SUCCEED generates a success - it doesn't automatically make the
+// current test successful, as a test is only successful when it has
+// no failure.
+//
+// EXPECT_* verifies that a certain condition is satisfied.  If not,
+// it behaves like ADD_FAILURE.  In particular:
+//
+//   EXPECT_TRUE  verifies that a Boolean condition is true.
+//   EXPECT_FALSE verifies that a Boolean condition is false.
+//
+// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
+// that they will also abort the current function on failure.  People
+// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
+// writing data-driven tests often find themselves using ADD_FAILURE
+// and EXPECT_* more.
+
+// Generates a nonfatal failure with a generic message.
+#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
+
+// Generates a nonfatal failure at the given source file location with
+// a generic message.
+#define ADD_FAILURE_AT(file, line) \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kNonFatalFailure)
+
+// Generates a fatal failure with a generic message.
+#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
+
+// Define this macro to 1 to omit the definition of FAIL(), which is a
+// generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_FAIL
+# define FAIL() GTEST_FAIL()
+#endif
+
+// Generates a success with a generic message.
+#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
+
+// Define this macro to 1 to omit the definition of SUCCEED(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_SUCCEED
+# define SUCCEED() GTEST_SUCCEED()
+#endif
+
+// Macros for testing exceptions.
+//
+//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
+//         Tests that the statement throws the expected exception.
+//    * {ASSERT|EXPECT}_NO_THROW(statement):
+//         Tests that the statement doesn't throw any exception.
+//    * {ASSERT|EXPECT}_ANY_THROW(statement):
+//         Tests that the statement throws an exception.
+
+#define EXPECT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
+#define ASSERT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
+#define ASSERT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
+
+// Boolean assertions. Condition can be either a Boolean expression or an
+// AssertionResult. For more information on how to use AssertionResult with
+// these macros see comments on that class.
+#define EXPECT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_NONFATAL_FAILURE_)
+#define EXPECT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_NONFATAL_FAILURE_)
+#define ASSERT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_FATAL_FAILURE_)
+#define ASSERT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_FATAL_FAILURE_)
+
+// Includes the auto-generated header that implements a family of
+// generic predicate assertion macros.
+#include "gtest/gtest_pred_impl.h"
+
+// Macros for testing equalities and inequalities.
+//
+//    * {ASSERT|EXPECT}_EQ(expected, actual): Tests that expected == actual
+//    * {ASSERT|EXPECT}_NE(v1, v2):           Tests that v1 != v2
+//    * {ASSERT|EXPECT}_LT(v1, v2):           Tests that v1 < v2
+//    * {ASSERT|EXPECT}_LE(v1, v2):           Tests that v1 <= v2
+//    * {ASSERT|EXPECT}_GT(v1, v2):           Tests that v1 > v2
+//    * {ASSERT|EXPECT}_GE(v1, v2):           Tests that v1 >= v2
+//
+// When they are not, Google Test prints both the tested expressions and
+// their actual values.  The values must be compatible built-in types,
+// or you will get a compiler error.  By "compatible" we mean that the
+// values can be compared by the respective operator.
+//
+// Note:
+//
+//   1. It is possible to make a user-defined type work with
+//   {ASSERT|EXPECT}_??(), but that requires overloading the
+//   comparison operators and is thus discouraged by the Google C++
+//   Usage Guide.  Therefore, you are advised to use the
+//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
+//   equal.
+//
+//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
+//   pointers (in particular, C strings).  Therefore, if you use it
+//   with two C strings, you are testing how their locations in memory
+//   are related, not how their content is related.  To compare two C
+//   strings by content, use {ASSERT|EXPECT}_STR*().
+//
+//   3. {ASSERT|EXPECT}_EQ(expected, actual) is preferred to
+//   {ASSERT|EXPECT}_TRUE(expected == actual), as the former tells you
+//   what the actual value is when it fails, and similarly for the
+//   other comparisons.
+//
+//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
+//   evaluate their arguments, which is undefined.
+//
+//   5. These macros evaluate their arguments exactly once.
+//
+// Examples:
+//
+//   EXPECT_NE(5, Foo());
+//   EXPECT_EQ(NULL, a_pointer);
+//   ASSERT_LT(i, array_size);
+//   ASSERT_GT(records.size(), 0) << "There is no record left.";
+
+#define EXPECT_EQ(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal:: \
+                      EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
+                      expected, actual)
+#define EXPECT_NE(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, expected, actual)
+#define EXPECT_LE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define EXPECT_LT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define EXPECT_GE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define EXPECT_GT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+#define GTEST_ASSERT_EQ(expected, actual) \
+  ASSERT_PRED_FORMAT2(::testing::internal:: \
+                      EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
+                      expected, actual)
+#define GTEST_ASSERT_NE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define GTEST_ASSERT_LE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define GTEST_ASSERT_LT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define GTEST_ASSERT_GE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define GTEST_ASSERT_GT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
+// ASSERT_XY(), which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_ASSERT_EQ
+# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_NE
+# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LE
+# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LT
+# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GE
+# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GT
+# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
+#endif
+
+// C-string Comparisons.  All tests treat NULL and any non-NULL string
+// as different.  Two NULLs are equal.
+//
+//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
+//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
+//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
+//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
+//
+// For wide or narrow string objects, you can use the
+// {ASSERT|EXPECT}_??() macros.
+//
+// Don't depend on the order in which the arguments are evaluated,
+// which is undefined.
+//
+// These macros evaluate their arguments exactly once.
+
+#define EXPECT_STREQ(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
+#define EXPECT_STRNE(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define EXPECT_STRCASEEQ(expected, actual) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
+#define EXPECT_STRCASENE(s1, s2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+#define ASSERT_STREQ(expected, actual) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
+#define ASSERT_STRNE(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define ASSERT_STRCASEEQ(expected, actual) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
+#define ASSERT_STRCASENE(s1, s2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+// Macros for comparing floating-point numbers.
+//
+//    * {ASSERT|EXPECT}_FLOAT_EQ(expected, actual):
+//         Tests that two float values are almost equal.
+//    * {ASSERT|EXPECT}_DOUBLE_EQ(expected, actual):
+//         Tests that two double values are almost equal.
+//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
+//         Tests that v1 and v2 are within the given distance to each other.
+//
+// Google Test uses ULP-based comparison to automatically pick a default
+// error bound that is appropriate for the operands.  See the
+// FloatingPoint template class in gtest-internal.h if you are
+// interested in the implementation details.
+
+#define EXPECT_FLOAT_EQ(expected, actual)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      expected, actual)
+
+#define EXPECT_DOUBLE_EQ(expected, actual)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      expected, actual)
+
+#define ASSERT_FLOAT_EQ(expected, actual)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      expected, actual)
+
+#define ASSERT_DOUBLE_EQ(expected, actual)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      expected, actual)
+
+#define EXPECT_NEAR(val1, val2, abs_error)\
+  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+#define ASSERT_NEAR(val1, val2, abs_error)\
+  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+// These predicate format functions work on floating-point values, and
+// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
+//
+//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
+                                   float val1, float val2);
+GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                                    double val1, double val2);
+
+
+#if GTEST_OS_WINDOWS
+
+// Macros that test for HRESULT failure and success, these are only useful
+// on Windows, and rely on Windows SDK macros and APIs to compile.
+//
+//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
+//
+// When expr unexpectedly fails or succeeds, Google Test prints the
+// expected result and the actual result with both a human-readable
+// string representation of the error, if available, as well as the
+// hex result code.
+# define EXPECT_HRESULT_SUCCEEDED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define ASSERT_HRESULT_SUCCEEDED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define EXPECT_HRESULT_FAILED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+# define ASSERT_HRESULT_FAILED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+#endif  // GTEST_OS_WINDOWS
+
+// Macros that execute statement and check that it doesn't generate new fatal
+// failures in the current thread.
+//
+//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
+//
+// Examples:
+//
+//   EXPECT_NO_FATAL_FAILURE(Process());
+//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
+//
+#define ASSERT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
+#define EXPECT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
+
+// Causes a trace (including the source file path, the current line
+// number, and the given message) to be included in every test failure
+// message generated by code in the current scope.  The effect is
+// undone when the control leaves the current scope.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// In the implementation, we include the current line number as part
+// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
+// to appear in the same block - as long as they are on different
+// lines.
+#define SCOPED_TRACE(message) \
+  ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
+    __FILE__, __LINE__, ::testing::Message() << (message))
+
+// Compile-time assertion for type equality.
+// StaticAssertTypeEq<type1, type2>() compiles iff type1 and type2 are
+// the same type.  The value it returns is not interesting.
+//
+// Instead of making StaticAssertTypeEq a class template, we make it a
+// function template that invokes a helper class template.  This
+// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
+// defining objects of that type.
+//
+// CAVEAT:
+//
+// When used inside a method of a class template,
+// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
+// instantiated.  For example, given:
+//
+//   template <typename T> class Foo {
+//    public:
+//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
+//   };
+//
+// the code:
+//
+//   void Test1() { Foo<bool> foo; }
+//
+// will NOT generate a compiler error, as Foo<bool>::Bar() is never
+// actually instantiated.  Instead, you need:
+//
+//   void Test2() { Foo<bool> foo; foo.Bar(); }
+//
+// to cause a compiler error.
+template <typename T1, typename T2>
+bool StaticAssertTypeEq() {
+  (void)internal::StaticAssertTypeEqHelper<T1, T2>();
+  return true;
+}
+
+// Defines a test.
+//
+// The first parameter is the name of the test case, and the second
+// parameter is the name of the test within the test case.
+//
+// The convention is to end the test case name with "Test".  For
+// example, a test case for the Foo class can be named FooTest.
+//
+// The user should put his test code between braces after using this
+// macro.  Example:
+//
+//   TEST(FooTest, InitializesCorrectly) {
+//     Foo foo;
+//     EXPECT_TRUE(foo.StatusIsOK());
+//   }
+
+// Note that we call GetTestTypeId() instead of GetTypeId<
+// ::testing::Test>() here to get the type ID of testing::Test.  This
+// is to work around a suspected linker bug when using Google Test as
+// a framework on Mac OS X.  The bug causes GetTypeId<
+// ::testing::Test>() to return different values depending on whether
+// the call is from the Google Test framework itself or from user test
+// code.  GetTestTypeId() is guaranteed to always return the same
+// value, as it always calls GetTypeId<>() from the Google Test
+// framework.
+#define GTEST_TEST(test_case_name, test_name)\
+  GTEST_TEST_(test_case_name, test_name, \
+              ::testing::Test, ::testing::internal::GetTestTypeId())
+
+// Define this macro to 1 to omit the definition of TEST(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_TEST
+# define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name)
+#endif
+
+// Defines a test that uses a test fixture.
+//
+// The first parameter is the name of the test fixture class, which
+// also doubles as the test case name.  The second parameter is the
+// name of the test within the test case.
+//
+// A test fixture class must be declared earlier.  The user should put
+// his test code between braces after using this macro.  Example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     virtual void SetUp() { b_.AddElement(3); }
+//
+//     Foo a_;
+//     Foo b_;
+//   };
+//
+//   TEST_F(FooTest, InitializesCorrectly) {
+//     EXPECT_TRUE(a_.StatusIsOK());
+//   }
+//
+//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
+//     EXPECT_EQ(0, a_.size());
+//     EXPECT_EQ(1, b_.size());
+//   }
+
+#define TEST_F(test_fixture, test_name)\
+  GTEST_TEST_(test_fixture, test_name, test_fixture, \
+              ::testing::internal::GetTypeId<test_fixture>())
+
+}  // namespace testing
+
+// Use this function in main() to run all tests.  It returns 0 if all
+// tests are successful, or 1 otherwise.
+//
+// RUN_ALL_TESTS() should be invoked after the command line has been
+// parsed by InitGoogleTest().
+//
+// This function was formerly a macro; thus, it is in the global
+// namespace and has an all-caps name.
+int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
+
+inline int RUN_ALL_TESTS() {
+  return ::testing::UnitTest::GetInstance()->Run();
+}
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
diff --git a/Externals/gtest/include/gtest/gtest_pred_impl.h b/Externals/gtest/include/gtest/gtest_pred_impl.h
new file mode 100644
index 0000000000..30ae712f50
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest_pred_impl.h
@@ -0,0 +1,358 @@
+// Copyright 2006, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+
+// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command
+// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
+//
+// Implements a family of generic predicate assertion macros.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+// Makes sure this header is not included before gtest.h.
+#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
+# error Do not include gtest_pred_impl.h directly.  Include gtest.h instead.
+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
+
+// This header implements a family of generic predicate assertion
+// macros:
+//
+//   ASSERT_PRED_FORMAT1(pred_format, v1)
+//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
+//   ...
+//
+// where pred_format is a function or functor that takes n (in the
+// case of ASSERT_PRED_FORMATn) values and their source expression
+// text, and returns a testing::AssertionResult.  See the definition
+// of ASSERT_EQ in gtest.h for an example.
+//
+// If you don't care about formatting, you can use the more
+// restrictive version:
+//
+//   ASSERT_PRED1(pred, v1)
+//   ASSERT_PRED2(pred, v1, v2)
+//   ...
+//
+// where pred is an n-ary function or functor that returns bool,
+// and the values v1, v2, ..., must support the << operator for
+// streaming to std::ostream.
+//
+// We also define the EXPECT_* variations.
+//
+// For now we only support predicates whose arity is at most 5.
+// Please email googletestframework@googlegroups.com if you need
+// support for higher arities.
+
+// GTEST_ASSERT_ is the basic statement to which all of the assertions
+// in this file reduce.  Don't use this in your code.
+
+#define GTEST_ASSERT_(expression, on_failure) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar = (expression)) \
+    ; \
+  else \
+    on_failure(gtest_ar.failure_message())
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1>
+AssertionResult AssertPred1Helper(const char* pred_text,
+                                  const char* e1,
+                                  Pred pred,
+                                  const T1& v1) {
+  if (pred(v1)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, v1), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+#define GTEST_PRED1_(pred, v1, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
+                                             #v1, \
+                                             pred, \
+                                             v1), on_failure)
+
+// Unary predicate assertion macros.
+#define EXPECT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2>
+AssertionResult AssertPred2Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2) {
+  if (pred(v1, v2)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+#define GTEST_PRED2_(pred, v1, v2, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             pred, \
+                                             v1, \
+                                             v2), on_failure)
+
+// Binary predicate assertion macros.
+#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3>
+AssertionResult AssertPred3Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3) {
+  if (pred(v1, v2, v3)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3), on_failure)
+
+// Ternary predicate assertion macros.
+#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4>
+AssertionResult AssertPred4Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4) {
+  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ", "
+                            << e4 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3
+                            << "\n" << e4 << " evaluates to " << v4;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4), on_failure)
+
+// 4-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4,
+          typename T5>
+AssertionResult AssertPred5Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  const char* e5,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4,
+                                  const T5& v5) {
+  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ", "
+                            << e4 << ", "
+                            << e5 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3
+                            << "\n" << e4 << " evaluates to " << v4
+                            << "\n" << e5 << " evaluates to " << v5;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             #v5, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4, \
+                                             v5), on_failure)
+
+// 5-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+
+
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
diff --git a/Externals/gtest/include/gtest/gtest_prod.h b/Externals/gtest/include/gtest/gtest_prod.h
new file mode 100644
index 0000000000..da80ddc6c7
--- /dev/null
+++ b/Externals/gtest/include/gtest/gtest_prod.h
@@ -0,0 +1,58 @@
+// Copyright 2006, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Google C++ Testing Framework definitions useful in production code.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_
+
+// When you need to test the private or protected members of a class,
+// use the FRIEND_TEST macro to declare your tests as friends of the
+// class.  For example:
+//
+// class MyClass {
+//  private:
+//   void MyMethod();
+//   FRIEND_TEST(MyClassTest, MyMethod);
+// };
+//
+// class MyClassTest : public testing::Test {
+//   // ...
+// };
+//
+// TEST_F(MyClassTest, MyMethod) {
+//   // Can call MyClass::MyMethod() here.
+// }
+
+#define FRIEND_TEST(test_case_name, test_name)\
+friend class test_case_name##_##test_name##_Test
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PROD_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-death-test-internal.h b/Externals/gtest/include/gtest/internal/gtest-death-test-internal.h
new file mode 100644
index 0000000000..2b3a78f5bf
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-death-test-internal.h
@@ -0,0 +1,319 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines internal utilities needed for implementing
+// death tests.  They are subject to change without notice.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+
+#include "gtest/internal/gtest-internal.h"
+
+#include <stdio.h>
+
+namespace testing {
+namespace internal {
+
+GTEST_DECLARE_string_(internal_run_death_test);
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kDeathTestStyleFlag[] = "death_test_style";
+const char kDeathTestUseFork[] = "death_test_use_fork";
+const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
+
+#if GTEST_HAS_DEATH_TEST
+
+// DeathTest is a class that hides much of the complexity of the
+// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
+// returns a concrete class that depends on the prevailing death test
+// style, as defined by the --gtest_death_test_style and/or
+// --gtest_internal_run_death_test flags.
+
+// In describing the results of death tests, these terms are used with
+// the corresponding definitions:
+//
+// exit status:  The integer exit information in the format specified
+//               by wait(2)
+// exit code:    The integer code passed to exit(3), _exit(2), or
+//               returned from main()
+class GTEST_API_ DeathTest {
+ public:
+  // Create returns false if there was an error determining the
+  // appropriate action to take for the current death test; for example,
+  // if the gtest_death_test_style flag is set to an invalid value.
+  // The LastMessage method will return a more detailed message in that
+  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
+  // argument is set.  If the death test should be skipped, the pointer
+  // is set to NULL; otherwise, it is set to the address of a new concrete
+  // DeathTest object that controls the execution of the current test.
+  static bool Create(const char* statement, const RE* regex,
+                     const char* file, int line, DeathTest** test);
+  DeathTest();
+  virtual ~DeathTest() { }
+
+  // A helper class that aborts a death test when it's deleted.
+  class ReturnSentinel {
+   public:
+    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
+    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
+   private:
+    DeathTest* const test_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
+  } GTEST_ATTRIBUTE_UNUSED_;
+
+  // An enumeration of possible roles that may be taken when a death
+  // test is encountered.  EXECUTE means that the death test logic should
+  // be executed immediately.  OVERSEE means that the program should prepare
+  // the appropriate environment for a child process to execute the death
+  // test, then wait for it to complete.
+  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
+
+  // An enumeration of the three reasons that a test might be aborted.
+  enum AbortReason {
+    TEST_ENCOUNTERED_RETURN_STATEMENT,
+    TEST_THREW_EXCEPTION,
+    TEST_DID_NOT_DIE
+  };
+
+  // Assumes one of the above roles.
+  virtual TestRole AssumeRole() = 0;
+
+  // Waits for the death test to finish and returns its status.
+  virtual int Wait() = 0;
+
+  // Returns true if the death test passed; that is, the test process
+  // exited during the test, its exit status matches a user-supplied
+  // predicate, and its stderr output matches a user-supplied regular
+  // expression.
+  // The user-supplied predicate may be a macro expression rather
+  // than a function pointer or functor, or else Wait and Passed could
+  // be combined.
+  virtual bool Passed(bool exit_status_ok) = 0;
+
+  // Signals that the death test did not die as expected.
+  virtual void Abort(AbortReason reason) = 0;
+
+  // Returns a human-readable outcome message regarding the outcome of
+  // the last death test.
+  static const char* LastMessage();
+
+  static void set_last_death_test_message(const std::string& message);
+
+ private:
+  // A string containing a description of the outcome of the last death test.
+  static std::string last_death_test_message_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
+};
+
+// Factory interface for death tests.  May be mocked out for testing.
+class DeathTestFactory {
+ public:
+  virtual ~DeathTestFactory() { }
+  virtual bool Create(const char* statement, const RE* regex,
+                      const char* file, int line, DeathTest** test) = 0;
+};
+
+// A concrete DeathTestFactory implementation for normal use.
+class DefaultDeathTestFactory : public DeathTestFactory {
+ public:
+  virtual bool Create(const char* statement, const RE* regex,
+                      const char* file, int line, DeathTest** test);
+};
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
+
+// Traps C++ exceptions escaping statement and reports them as test
+// failures. Note that trapping SEH exceptions is not implemented here.
+# if GTEST_HAS_EXCEPTIONS
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  try { \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } catch (const ::std::exception& gtest_exception) { \
+    fprintf(\
+        stderr, \
+        "\n%s: Caught std::exception-derived exception escaping the " \
+        "death test statement. Exception message: %s\n", \
+        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
+        gtest_exception.what()); \
+    fflush(stderr); \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  } catch (...) { \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  }
+
+# else
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+
+# endif
+
+// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
+// ASSERT_EXIT*, and EXPECT_EXIT*.
+# define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    const ::testing::internal::RE& gtest_regex = (regex); \
+    ::testing::internal::DeathTest* gtest_dt; \
+    if (!::testing::internal::DeathTest::Create(#statement, &gtest_regex, \
+        __FILE__, __LINE__, &gtest_dt)) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \
+    } \
+    if (gtest_dt != NULL) { \
+      ::testing::internal::scoped_ptr< ::testing::internal::DeathTest> \
+          gtest_dt_ptr(gtest_dt); \
+      switch (gtest_dt->AssumeRole()) { \
+        case ::testing::internal::DeathTest::OVERSEE_TEST: \
+          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \
+            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \
+          } \
+          break; \
+        case ::testing::internal::DeathTest::EXECUTE_TEST: { \
+          ::testing::internal::DeathTest::ReturnSentinel \
+              gtest_sentinel(gtest_dt); \
+          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt); \
+          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \
+          break; \
+        } \
+        default: \
+          break; \
+      } \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__): \
+      fail(::testing::internal::DeathTest::LastMessage())
+// The symbol "fail" here expands to something into which a message
+// can be streamed.
+
+// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
+// NDEBUG mode. In this case we need the statements to be executed, the regex is
+// ignored, and the macro must accept a streamed message even though the message
+// is never printed.
+# define GTEST_EXECUTE_STATEMENT_(statement, regex) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+     GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } else \
+    ::testing::Message()
+
+// A class representing the parsed contents of the
+// --gtest_internal_run_death_test flag, as it existed when
+// RUN_ALL_TESTS was called.
+class InternalRunDeathTestFlag {
+ public:
+  InternalRunDeathTestFlag(const std::string& a_file,
+                           int a_line,
+                           int an_index,
+                           int a_write_fd)
+      : file_(a_file), line_(a_line), index_(an_index),
+        write_fd_(a_write_fd) {}
+
+  ~InternalRunDeathTestFlag() {
+    if (write_fd_ >= 0)
+      posix::Close(write_fd_);
+  }
+
+  const std::string& file() const { return file_; }
+  int line() const { return line_; }
+  int index() const { return index_; }
+  int write_fd() const { return write_fd_; }
+
+ private:
+  std::string file_;
+  int line_;
+  int index_;
+  int write_fd_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
+};
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
+
+#else  // GTEST_HAS_DEATH_TEST
+
+// This macro is used for implementing macros such as
+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
+// death tests are not supported. Those macros must compile on such systems
+// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on
+// systems that support death tests. This allows one to write such a macro
+// on a system that does not support death tests and be sure that it will
+// compile on a death-test supporting system.
+//
+// Parameters:
+//   statement -  A statement that a macro such as EXPECT_DEATH would test
+//                for program termination. This macro has to make sure this
+//                statement is compiled but not executed, to ensure that
+//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
+//                parameter iff EXPECT_DEATH compiles with it.
+//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
+//                the output of statement.  This parameter has to be
+//                compiled but not evaluated by this macro, to ensure that
+//                this macro only accepts expressions that a macro such as
+//                EXPECT_DEATH would accept.
+//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
+//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
+//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
+//                compile inside functions where ASSERT_DEATH doesn't
+//                compile.
+//
+//  The branch that has an always false condition is used to ensure that
+//  statement and regex are compiled (and thus syntactically correct) but
+//  never executed. The unreachable code macro protects the terminator
+//  statement from generating an 'unreachable code' warning in case
+//  statement unconditionally returns or throws. The Message constructor at
+//  the end allows the syntax of streaming additional messages into the
+//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
+# define GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, terminator) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::AlwaysTrue()) { \
+      GTEST_LOG_(WARNING) \
+          << "Death tests are not supported on this platform.\n" \
+          << "Statement '" #statement "' cannot be verified."; \
+    } else if (::testing::internal::AlwaysFalse()) { \
+      ::testing::internal::RE::PartialMatch(".*", (regex)); \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+      terminator; \
+    } else \
+      ::testing::Message()
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-filepath.h b/Externals/gtest/include/gtest/internal/gtest-filepath.h
new file mode 100644
index 0000000000..7a13b4b0de
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-filepath.h
@@ -0,0 +1,206 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: keith.ray@gmail.com (Keith Ray)
+//
+// Google Test filepath utilities
+//
+// This header file declares classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included in <gtest/internal/gtest-internal.h>.
+// Do not include this header file separately!
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+namespace internal {
+
+// FilePath - a class for file and directory pathname manipulation which
+// handles platform-specific conventions (like the pathname separator).
+// Used for helper functions for naming files in a directory for xml output.
+// Except for Set methods, all methods are const or static, which provides an
+// "immutable value object" -- useful for peace of mind.
+// A FilePath with a value ending in a path separator ("like/this/") represents
+// a directory, otherwise it is assumed to represent a file. In either case,
+// it may or may not represent an actual file or directory in the file system.
+// Names are NOT checked for syntax correctness -- no checking for illegal
+// characters, malformed paths, etc.
+
+class GTEST_API_ FilePath {
+ public:
+  FilePath() : pathname_("") { }
+  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
+
+  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
+    Normalize();
+  }
+
+  FilePath& operator=(const FilePath& rhs) {
+    Set(rhs);
+    return *this;
+  }
+
+  void Set(const FilePath& rhs) {
+    pathname_ = rhs.pathname_;
+  }
+
+  const std::string& string() const { return pathname_; }
+  const char* c_str() const { return pathname_.c_str(); }
+
+  // Returns the current working directory, or "" if unsuccessful.
+  static FilePath GetCurrentDir();
+
+  // Given directory = "dir", base_name = "test", number = 0,
+  // extension = "xml", returns "dir/test.xml". If number is greater
+  // than zero (e.g., 12), returns "dir/test_12.xml".
+  // On Windows platform, uses \ as the separator rather than /.
+  static FilePath MakeFileName(const FilePath& directory,
+                               const FilePath& base_name,
+                               int number,
+                               const char* extension);
+
+  // Given directory = "dir", relative_path = "test.xml",
+  // returns "dir/test.xml".
+  // On Windows, uses \ as the separator rather than /.
+  static FilePath ConcatPaths(const FilePath& directory,
+                              const FilePath& relative_path);
+
+  // Returns a pathname for a file that does not currently exist. The pathname
+  // will be directory/base_name.extension or
+  // directory/base_name_<number>.extension if directory/base_name.extension
+  // already exists. The number will be incremented until a pathname is found
+  // that does not already exist.
+  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+  // There could be a race condition if two or more processes are calling this
+  // function at the same time -- they could both pick the same filename.
+  static FilePath GenerateUniqueFileName(const FilePath& directory,
+                                         const FilePath& base_name,
+                                         const char* extension);
+
+  // Returns true iff the path is "".
+  bool IsEmpty() const { return pathname_.empty(); }
+
+  // If input name has a trailing separator character, removes it and returns
+  // the name, otherwise return the name string unmodified.
+  // On Windows platform, uses \ as the separator, other platforms use /.
+  FilePath RemoveTrailingPathSeparator() const;
+
+  // Returns a copy of the FilePath with the directory part removed.
+  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
+  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
+  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
+  // returns an empty FilePath ("").
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveDirectoryName() const;
+
+  // RemoveFileName returns the directory path with the filename removed.
+  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveFileName() const;
+
+  // Returns a copy of the FilePath with the case-insensitive extension removed.
+  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+  // FilePath("dir/file"). If a case-insensitive extension is not
+  // found, returns a copy of the original FilePath.
+  FilePath RemoveExtension(const char* extension) const;
+
+  // Creates directories so that path exists. Returns true if successful or if
+  // the directories already exist; returns false if unable to create
+  // directories for any reason. Will also return false if the FilePath does
+  // not represent a directory (that is, it doesn't end with a path separator).
+  bool CreateDirectoriesRecursively() const;
+
+  // Create the directory so that path exists. Returns true if successful or
+  // if the directory already exists; returns false if unable to create the
+  // directory for any reason, including if the parent directory does not
+  // exist. Not named "CreateDirectory" because that's a macro on Windows.
+  bool CreateFolder() const;
+
+  // Returns true if FilePath describes something in the file-system,
+  // either a file, directory, or whatever, and that something exists.
+  bool FileOrDirectoryExists() const;
+
+  // Returns true if pathname describes a directory in the file-system
+  // that exists.
+  bool DirectoryExists() const;
+
+  // Returns true if FilePath ends with a path separator, which indicates that
+  // it is intended to represent a directory. Returns false otherwise.
+  // This does NOT check that a directory (or file) actually exists.
+  bool IsDirectory() const;
+
+  // Returns true if pathname describes a root directory. (Windows has one
+  // root directory per disk drive.)
+  bool IsRootDirectory() const;
+
+  // Returns true if pathname describes an absolute path.
+  bool IsAbsolutePath() const;
+
+ private:
+  // Replaces multiple consecutive separators with a single separator.
+  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+  // redundancies that might be in a pathname involving "." or "..".
+  //
+  // A pathname with multiple consecutive separators may occur either through
+  // user error or as a result of some scripts or APIs that generate a pathname
+  // with a trailing separator. On other platforms the same API or script
+  // may NOT generate a pathname with a trailing "/". Then elsewhere that
+  // pathname may have another "/" and pathname components added to it,
+  // without checking for the separator already being there.
+  // The script language and operating system may allow paths like "foo//bar"
+  // but some of the functions in FilePath will not handle that correctly. In
+  // particular, RemoveTrailingPathSeparator() only removes one separator, and
+  // it is called in CreateDirectoriesRecursively() assuming that it will change
+  // a pathname from directory syntax (trailing separator) to filename syntax.
+  //
+  // On Windows this method also replaces the alternate path separator '/' with
+  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
+  // "bar\\foo".
+
+  void Normalize();
+
+  // Returns a pointer to the last occurence of a valid path separator in
+  // the FilePath. On Windows, for example, both '/' and '\' are valid path
+  // separators. Returns NULL if no path separator was found.
+  const char* FindLastPathSeparator() const;
+
+  std::string pathname_;
+};  // class FilePath
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-internal.h b/Externals/gtest/include/gtest/internal/gtest-internal.h
new file mode 100644
index 0000000000..f58f65f620
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-internal.h
@@ -0,0 +1,1158 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file declares functions and macros used internally by
+// Google Test.  They are subject to change without notice.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_OS_LINUX
+# include <stdlib.h>
+# include <sys/types.h>
+# include <sys/wait.h>
+# include <unistd.h>
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#include <ctype.h>
+#include <float.h>
+#include <string.h>
+#include <iomanip>
+#include <limits>
+#include <set>
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Due to C++ preprocessor weirdness, we need double indirection to
+// concatenate two tokens when one of them is __LINE__.  Writing
+//
+//   foo ## __LINE__
+//
+// will result in the token foo__LINE__, instead of foo followed by
+// the current line number.  For more details, see
+// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
+#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
+#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
+
+class ProtocolMessage;
+namespace proto2 { class Message; }
+
+namespace testing {
+
+// Forward declarations.
+
+class AssertionResult;                 // Result of an assertion.
+class Message;                         // Represents a failure message.
+class Test;                            // Represents a test.
+class TestInfo;                        // Information about a test.
+class TestPartResult;                  // Result of a test part.
+class UnitTest;                        // A collection of test cases.
+
+template <typename T>
+::std::string PrintToString(const T& value);
+
+namespace internal {
+
+struct TraceInfo;                      // Information about a trace point.
+class ScopedTrace;                     // Implements scoped trace.
+class TestInfoImpl;                    // Opaque implementation of TestInfo
+class UnitTestImpl;                    // Opaque implementation of UnitTest
+
+// How many times InitGoogleTest() has been called.
+GTEST_API_ extern int g_init_gtest_count;
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+GTEST_API_ extern const char kStackTraceMarker[];
+
+// Two overloaded helpers for checking at compile time whether an
+// expression is a null pointer literal (i.e. NULL or any 0-valued
+// compile-time integral constant).  Their return values have
+// different sizes, so we can use sizeof() to test which version is
+// picked by the compiler.  These helpers have no implementations, as
+// we only need their signatures.
+//
+// Given IsNullLiteralHelper(x), the compiler will pick the first
+// version if x can be implicitly converted to Secret*, and pick the
+// second version otherwise.  Since Secret is a secret and incomplete
+// type, the only expression a user can write that has type Secret* is
+// a null pointer literal.  Therefore, we know that x is a null
+// pointer literal if and only if the first version is picked by the
+// compiler.
+char IsNullLiteralHelper(Secret* p);
+char (&IsNullLiteralHelper(...))[2];  // NOLINT
+
+// A compile-time bool constant that is true if and only if x is a
+// null pointer literal (i.e. NULL or any 0-valued compile-time
+// integral constant).
+#ifdef GTEST_ELLIPSIS_NEEDS_POD_
+// We lose support for NULL detection where the compiler doesn't like
+// passing non-POD classes through ellipsis (...).
+# define GTEST_IS_NULL_LITERAL_(x) false
+#else
+# define GTEST_IS_NULL_LITERAL_(x) \
+    (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1)
+#endif  // GTEST_ELLIPSIS_NEEDS_POD_
+
+// Appends the user-supplied message to the Google-Test-generated message.
+GTEST_API_ std::string AppendUserMessage(
+    const std::string& gtest_msg, const Message& user_msg);
+
+#if GTEST_HAS_EXCEPTIONS
+
+// This exception is thrown by (and only by) a failed Google Test
+// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
+// are enabled).  We derive it from std::runtime_error, which is for
+// errors presumably detectable only at run time.  Since
+// std::runtime_error inherits from std::exception, many testing
+// frameworks know how to extract and print the message inside it.
+class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
+ public:
+  explicit GoogleTestFailureException(const TestPartResult& failure);
+};
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// A helper class for creating scoped traces in user programs.
+class GTEST_API_ ScopedTrace {
+ public:
+  // The c'tor pushes the given source file location and message onto
+  // a trace stack maintained by Google Test.
+  ScopedTrace(const char* file, int line, const Message& message);
+
+  // The d'tor pops the info pushed by the c'tor.
+  //
+  // Note that the d'tor is not virtual in order to be efficient.
+  // Don't inherit from ScopedTrace!
+  ~ScopedTrace();
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
+} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
+                            // c'tor and d'tor.  Therefore it doesn't
+                            // need to be used otherwise.
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   expected_expression: "foo"
+//   actual_expression:   "bar"
+//   expected_value:      "5"
+//   actual_value:        "6"
+//
+// The ignoring_case parameter is true iff the assertion is a
+// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
+// be inserted into the message.
+GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
+                                     const char* actual_expression,
+                                     const std::string& expected_value,
+                                     const std::string& actual_value,
+                                     bool ignoring_case);
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+GTEST_API_ std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value);
+
+// This template class represents an IEEE floating-point number
+// (either single-precision or double-precision, depending on the
+// template parameters).
+//
+// The purpose of this class is to do more sophisticated number
+// comparison.  (Due to round-off error, etc, it's very unlikely that
+// two floating-points will be equal exactly.  Hence a naive
+// comparison by the == operation often doesn't work.)
+//
+// Format of IEEE floating-point:
+//
+//   The most-significant bit being the leftmost, an IEEE
+//   floating-point looks like
+//
+//     sign_bit exponent_bits fraction_bits
+//
+//   Here, sign_bit is a single bit that designates the sign of the
+//   number.
+//
+//   For float, there are 8 exponent bits and 23 fraction bits.
+//
+//   For double, there are 11 exponent bits and 52 fraction bits.
+//
+//   More details can be found at
+//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+template <typename RawType>
+class FloatingPoint {
+ public:
+  // Defines the unsigned integer type that has the same size as the
+  // floating point number.
+  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
+
+  // Constants.
+
+  // # of bits in a number.
+  static const size_t kBitCount = 8*sizeof(RawType);
+
+  // # of fraction bits in a number.
+  static const size_t kFractionBitCount =
+    std::numeric_limits<RawType>::digits - 1;
+
+  // # of exponent bits in a number.
+  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
+
+  // The mask for the sign bit.
+  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
+
+  // The mask for the fraction bits.
+  static const Bits kFractionBitMask =
+    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
+
+  // The mask for the exponent bits.
+  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
+
+  // How many ULP's (Units in the Last Place) we want to tolerate when
+  // comparing two numbers.  The larger the value, the more error we
+  // allow.  A 0 value means that two numbers must be exactly the same
+  // to be considered equal.
+  //
+  // The maximum error of a single floating-point operation is 0.5
+  // units in the last place.  On Intel CPU's, all floating-point
+  // calculations are done with 80-bit precision, while double has 64
+  // bits.  Therefore, 4 should be enough for ordinary use.
+  //
+  // See the following article for more details on ULP:
+  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
+  static const size_t kMaxUlps = 4;
+
+  // Constructs a FloatingPoint from a raw floating-point number.
+  //
+  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
+  // around may change its bits, although the new value is guaranteed
+  // to be also a NAN.  Therefore, don't expect this constructor to
+  // preserve the bits in x when x is a NAN.
+  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
+
+  // Static methods
+
+  // Reinterprets a bit pattern as a floating-point number.
+  //
+  // This function is needed to test the AlmostEquals() method.
+  static RawType ReinterpretBits(const Bits bits) {
+    FloatingPoint fp(0);
+    fp.u_.bits_ = bits;
+    return fp.u_.value_;
+  }
+
+  // Returns the floating-point number that represent positive infinity.
+  static RawType Infinity() {
+    return ReinterpretBits(kExponentBitMask);
+  }
+
+  // Returns the maximum representable finite floating-point number.
+  static RawType Max();
+
+  // Non-static methods
+
+  // Returns the bits that represents this number.
+  const Bits &bits() const { return u_.bits_; }
+
+  // Returns the exponent bits of this number.
+  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
+
+  // Returns the fraction bits of this number.
+  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
+
+  // Returns the sign bit of this number.
+  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
+
+  // Returns true iff this is NAN (not a number).
+  bool is_nan() const {
+    // It's a NAN if the exponent bits are all ones and the fraction
+    // bits are not entirely zeros.
+    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
+  }
+
+  // Returns true iff this number is at most kMaxUlps ULP's away from
+  // rhs.  In particular, this function:
+  //
+  //   - returns false if either number is (or both are) NAN.
+  //   - treats really large numbers as almost equal to infinity.
+  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
+  bool AlmostEquals(const FloatingPoint& rhs) const {
+    // The IEEE standard says that any comparison operation involving
+    // a NAN must return false.
+    if (is_nan() || rhs.is_nan()) return false;
+
+    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
+        <= kMaxUlps;
+  }
+
+ private:
+  // The data type used to store the actual floating-point number.
+  union FloatingPointUnion {
+    RawType value_;  // The raw floating-point number.
+    Bits bits_;      // The bits that represent the number.
+  };
+
+  // Converts an integer from the sign-and-magnitude representation to
+  // the biased representation.  More precisely, let N be 2 to the
+  // power of (kBitCount - 1), an integer x is represented by the
+  // unsigned number x + N.
+  //
+  // For instance,
+  //
+  //   -N + 1 (the most negative number representable using
+  //          sign-and-magnitude) is represented by 1;
+  //   0      is represented by N; and
+  //   N - 1  (the biggest number representable using
+  //          sign-and-magnitude) is represented by 2N - 1.
+  //
+  // Read http://en.wikipedia.org/wiki/Signed_number_representations
+  // for more details on signed number representations.
+  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
+    if (kSignBitMask & sam) {
+      // sam represents a negative number.
+      return ~sam + 1;
+    } else {
+      // sam represents a positive number.
+      return kSignBitMask | sam;
+    }
+  }
+
+  // Given two numbers in the sign-and-magnitude representation,
+  // returns the distance between them as an unsigned number.
+  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
+                                                     const Bits &sam2) {
+    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
+    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
+    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
+  }
+
+  FloatingPointUnion u_;
+};
+
+// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
+// macro defined by <windows.h>.
+template <>
+inline float FloatingPoint<float>::Max() { return FLT_MAX; }
+template <>
+inline double FloatingPoint<double>::Max() { return DBL_MAX; }
+
+// Typedefs the instances of the FloatingPoint template class that we
+// care to use.
+typedef FloatingPoint<float> Float;
+typedef FloatingPoint<double> Double;
+
+// In order to catch the mistake of putting tests that use different
+// test fixture classes in the same test case, we need to assign
+// unique IDs to fixture classes and compare them.  The TypeId type is
+// used to hold such IDs.  The user should treat TypeId as an opaque
+// type: the only operation allowed on TypeId values is to compare
+// them for equality using the == operator.
+typedef const void* TypeId;
+
+template <typename T>
+class TypeIdHelper {
+ public:
+  // dummy_ must not have a const type.  Otherwise an overly eager
+  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
+  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
+  static bool dummy_;
+};
+
+template <typename T>
+bool TypeIdHelper<T>::dummy_ = false;
+
+// GetTypeId<T>() returns the ID of type T.  Different values will be
+// returned for different types.  Calling the function twice with the
+// same type argument is guaranteed to return the same ID.
+template <typename T>
+TypeId GetTypeId() {
+  // The compiler is required to allocate a different
+  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
+  // the template.  Therefore, the address of dummy_ is guaranteed to
+  // be unique.
+  return &(TypeIdHelper<T>::dummy_);
+}
+
+// Returns the type ID of ::testing::Test.  Always call this instead
+// of GetTypeId< ::testing::Test>() to get the type ID of
+// ::testing::Test, as the latter may give the wrong result due to a
+// suspected linker bug when compiling Google Test as a Mac OS X
+// framework.
+GTEST_API_ TypeId GetTestTypeId();
+
+// Defines the abstract factory interface that creates instances
+// of a Test object.
+class TestFactoryBase {
+ public:
+  virtual ~TestFactoryBase() {}
+
+  // Creates a test instance to run. The instance is both created and destroyed
+  // within TestInfoImpl::Run()
+  virtual Test* CreateTest() = 0;
+
+ protected:
+  TestFactoryBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
+};
+
+// This class provides implementation of TeastFactoryBase interface.
+// It is used in TEST and TEST_F macros.
+template <class TestClass>
+class TestFactoryImpl : public TestFactoryBase {
+ public:
+  virtual Test* CreateTest() { return new TestClass; }
+};
+
+#if GTEST_OS_WINDOWS
+
+// Predicate-formatters for implementing the HRESULT checking macros
+// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
+// We pass a long instead of HRESULT to avoid causing an
+// include dependency for the HRESULT type.
+GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
+                                            long hr);  // NOLINT
+GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
+                                            long hr);  // NOLINT
+
+#endif  // GTEST_OS_WINDOWS
+
+// Types of SetUpTestCase() and TearDownTestCase() functions.
+typedef void (*SetUpTestCaseFunc)();
+typedef void (*TearDownTestCaseFunc)();
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_case_name:   name of the test case
+//   name:             name of the test
+//   type_param        the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param       text representation of the test's value parameter,
+//                     or NULL if this is not a type-parameterized test.
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test case
+//   tear_down_tc:     pointer to the function that tears down the test case
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
+    const char* test_case_name,
+    const char* name,
+    const char* type_param,
+    const char* value_param,
+    TypeId fixture_class_id,
+    SetUpTestCaseFunc set_up_tc,
+    TearDownTestCaseFunc tear_down_tc,
+    TestFactoryBase* factory);
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// State of the definition of a type-parameterized test case.
+class GTEST_API_ TypedTestCasePState {
+ public:
+  TypedTestCasePState() : registered_(false) {}
+
+  // Adds the given test name to defined_test_names_ and return true
+  // if the test case hasn't been registered; otherwise aborts the
+  // program.
+  bool AddTestName(const char* file, int line, const char* case_name,
+                   const char* test_name) {
+    if (registered_) {
+      fprintf(stderr, "%s Test %s must be defined before "
+              "REGISTER_TYPED_TEST_CASE_P(%s, ...).\n",
+              FormatFileLocation(file, line).c_str(), test_name, case_name);
+      fflush(stderr);
+      posix::Abort();
+    }
+    defined_test_names_.insert(test_name);
+    return true;
+  }
+
+  // Verifies that registered_tests match the test names in
+  // defined_test_names_; returns registered_tests if successful, or
+  // aborts the program otherwise.
+  const char* VerifyRegisteredTestNames(
+      const char* file, int line, const char* registered_tests);
+
+ private:
+  bool registered_;
+  ::std::set<const char*> defined_test_names_;
+};
+
+// Skips to the first non-space char after the first comma in 'str';
+// returns NULL if no comma is found in 'str'.
+inline const char* SkipComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  if (comma == NULL) {
+    return NULL;
+  }
+  while (IsSpace(*(++comma))) {}
+  return comma;
+}
+
+// Returns the prefix of 'str' before the first comma in it; returns
+// the entire string if it contains no comma.
+inline std::string GetPrefixUntilComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  return comma == NULL ? str : std::string(str, comma);
+}
+
+// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
+// registers a list of type-parameterized tests with Google Test.  The
+// return value is insignificant - we just need to return something
+// such that we can call this function in a namespace scope.
+//
+// Implementation note: The GTEST_TEMPLATE_ macro declares a template
+// template parameter.  It's defined in gtest-type-util.h.
+template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
+class TypeParameterizedTest {
+ public:
+  // 'index' is the index of the test in the type list 'Types'
+  // specified in INSTANTIATE_TYPED_TEST_CASE_P(Prefix, TestCase,
+  // Types).  Valid values for 'index' are [0, N - 1] where N is the
+  // length of Types.
+  static bool Register(const char* prefix, const char* case_name,
+                       const char* test_names, int index) {
+    typedef typename Types::Head Type;
+    typedef Fixture<Type> FixtureClass;
+    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
+
+    // First, registers the first type-parameterized test in the type
+    // list.
+    MakeAndRegisterTestInfo(
+        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + "/"
+         + StreamableToString(index)).c_str(),
+        GetPrefixUntilComma(test_names).c_str(),
+        GetTypeName<Type>().c_str(),
+        NULL,  // No value parameter.
+        GetTypeId<FixtureClass>(),
+        TestClass::SetUpTestCase,
+        TestClass::TearDownTestCase,
+        new TestFactoryImpl<TestClass>);
+
+    // Next, recurses (at compile time) with the tail of the type list.
+    return TypeParameterizedTest<Fixture, TestSel, typename Types::Tail>
+        ::Register(prefix, case_name, test_names, index + 1);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, class TestSel>
+class TypeParameterizedTest<Fixture, TestSel, Types0> {
+ public:
+  static bool Register(const char* /*prefix*/, const char* /*case_name*/,
+                       const char* /*test_names*/, int /*index*/) {
+    return true;
+  }
+};
+
+// TypeParameterizedTestCase<Fixture, Tests, Types>::Register()
+// registers *all combinations* of 'Tests' and 'Types' with Google
+// Test.  The return value is insignificant - we just need to return
+// something such that we can call this function in a namespace scope.
+template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
+class TypeParameterizedTestCase {
+ public:
+  static bool Register(const char* prefix, const char* case_name,
+                       const char* test_names) {
+    typedef typename Tests::Head Head;
+
+    // First, register the first test in 'Test' for each type in 'Types'.
+    TypeParameterizedTest<Fixture, Head, Types>::Register(
+        prefix, case_name, test_names, 0);
+
+    // Next, recurses (at compile time) with the tail of the test list.
+    return TypeParameterizedTestCase<Fixture, typename Tests::Tail, Types>
+        ::Register(prefix, case_name, SkipComma(test_names));
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, typename Types>
+class TypeParameterizedTestCase<Fixture, Templates0, Types> {
+ public:
+  static bool Register(const char* /*prefix*/, const char* /*case_name*/,
+                       const char* /*test_names*/) {
+    return true;
+  }
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
+    UnitTest* unit_test, int skip_count);
+
+// Helpers for suppressing warnings on unreachable code or constant
+// condition.
+
+// Always returns true.
+GTEST_API_ bool AlwaysTrue();
+
+// Always returns false.
+inline bool AlwaysFalse() { return !AlwaysTrue(); }
+
+// Helper for suppressing false warning from Clang on a const char*
+// variable declared in a conditional expression always being NULL in
+// the else branch.
+struct GTEST_API_ ConstCharPtr {
+  ConstCharPtr(const char* str) : value(str) {}
+  operator bool() const { return true; }
+  const char* value;
+};
+
+// A simple Linear Congruential Generator for generating random
+// numbers with a uniform distribution.  Unlike rand() and srand(), it
+// doesn't use global state (and therefore can't interfere with user
+// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
+// but it's good enough for our purposes.
+class GTEST_API_ Random {
+ public:
+  static const UInt32 kMaxRange = 1u << 31;
+
+  explicit Random(UInt32 seed) : state_(seed) {}
+
+  void Reseed(UInt32 seed) { state_ = seed; }
+
+  // Generates a random number from [0, range).  Crashes if 'range' is
+  // 0 or greater than kMaxRange.
+  UInt32 Generate(UInt32 range);
+
+ private:
+  UInt32 state_;
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
+};
+
+// Defining a variable of type CompileAssertTypesEqual<T1, T2> will cause a
+// compiler error iff T1 and T2 are different types.
+template <typename T1, typename T2>
+struct CompileAssertTypesEqual;
+
+template <typename T>
+struct CompileAssertTypesEqual<T, T> {
+};
+
+// Removes the reference from a type if it is a reference type,
+// otherwise leaves it unchanged.  This is the same as
+// tr1::remove_reference, which is not widely available yet.
+template <typename T>
+struct RemoveReference { typedef T type; };  // NOLINT
+template <typename T>
+struct RemoveReference<T&> { typedef T type; };  // NOLINT
+
+// A handy wrapper around RemoveReference that works when the argument
+// T depends on template parameters.
+#define GTEST_REMOVE_REFERENCE_(T) \
+    typename ::testing::internal::RemoveReference<T>::type
+
+// Removes const from a type if it is a const type, otherwise leaves
+// it unchanged.  This is the same as tr1::remove_const, which is not
+// widely available yet.
+template <typename T>
+struct RemoveConst { typedef T type; };  // NOLINT
+template <typename T>
+struct RemoveConst<const T> { typedef T type; };  // NOLINT
+
+// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above
+// definition to fail to remove the const in 'const int[3]' and 'const
+// char[3][4]'.  The following specialization works around the bug.
+template <typename T, size_t N>
+struct RemoveConst<const T[N]> {
+  typedef typename RemoveConst<T>::type type[N];
+};
+
+#if defined(_MSC_VER) && _MSC_VER < 1400
+// This is the only specialization that allows VC++ 7.1 to remove const in
+// 'const int[3] and 'const int[3][4]'.  However, it causes trouble with GCC
+// and thus needs to be conditionally compiled.
+template <typename T, size_t N>
+struct RemoveConst<T[N]> {
+  typedef typename RemoveConst<T>::type type[N];
+};
+#endif
+
+// A handy wrapper around RemoveConst that works when the argument
+// T depends on template parameters.
+#define GTEST_REMOVE_CONST_(T) \
+    typename ::testing::internal::RemoveConst<T>::type
+
+// Turns const U&, U&, const U, and U all into U.
+#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
+    GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
+
+// Adds reference to a type if it is not a reference type,
+// otherwise leaves it unchanged.  This is the same as
+// tr1::add_reference, which is not widely available yet.
+template <typename T>
+struct AddReference { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddReference<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper around AddReference that works when the argument T
+// depends on template parameters.
+#define GTEST_ADD_REFERENCE_(T) \
+    typename ::testing::internal::AddReference<T>::type
+
+// Adds a reference to const on top of T as necessary.  For example,
+// it transforms
+//
+//   char         ==> const char&
+//   const char   ==> const char&
+//   char&        ==> const char&
+//   const char&  ==> const char&
+//
+// The argument T must depend on some template parameters.
+#define GTEST_REFERENCE_TO_CONST_(T) \
+    GTEST_ADD_REFERENCE_(const GTEST_REMOVE_REFERENCE_(T))
+
+// ImplicitlyConvertible<From, To>::value is a compile-time bool
+// constant that's true iff type From can be implicitly converted to
+// type To.
+template <typename From, typename To>
+class ImplicitlyConvertible {
+ private:
+  // We need the following helper functions only for their types.
+  // They have no implementations.
+
+  // MakeFrom() is an expression whose type is From.  We cannot simply
+  // use From(), as the type From may not have a public default
+  // constructor.
+  static typename AddReference<From>::type MakeFrom();
+
+  // These two functions are overloaded.  Given an expression
+  // Helper(x), the compiler will pick the first version if x can be
+  // implicitly converted to type To; otherwise it will pick the
+  // second version.
+  //
+  // The first version returns a value of size 1, and the second
+  // version returns a value of size 2.  Therefore, by checking the
+  // size of Helper(x), which can be done at compile time, we can tell
+  // which version of Helper() is used, and hence whether x can be
+  // implicitly converted to type To.
+  static char Helper(To);
+  static char (&Helper(...))[2];  // NOLINT
+
+  // We have to put the 'public' section after the 'private' section,
+  // or MSVC refuses to compile the code.
+ public:
+  // MSVC warns about implicitly converting from double to int for
+  // possible loss of data, so we need to temporarily disable the
+  // warning.
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4244)  // Temporarily disables warning 4244.
+
+  static const bool value =
+      sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1;
+# pragma warning(pop)           // Restores the warning state.
+#elif defined(__BORLANDC__)
+  // C++Builder cannot use member overload resolution during template
+  // instantiation.  The simplest workaround is to use its C++0x type traits
+  // functions (C++Builder 2009 and above only).
+  static const bool value = __is_convertible(From, To);
+#else
+  static const bool value =
+      sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1;
+#endif  // _MSV_VER
+};
+template <typename From, typename To>
+const bool ImplicitlyConvertible<From, To>::value;
+
+// IsAProtocolMessage<T>::value is a compile-time bool constant that's
+// true iff T is type ProtocolMessage, proto2::Message, or a subclass
+// of those.
+template <typename T>
+struct IsAProtocolMessage
+    : public bool_constant<
+  ImplicitlyConvertible<const T*, const ::ProtocolMessage*>::value ||
+  ImplicitlyConvertible<const T*, const ::proto2::Message*>::value> {
+};
+
+// When the compiler sees expression IsContainerTest<C>(0), if C is an
+// STL-style container class, the first overload of IsContainerTest
+// will be viable (since both C::iterator* and C::const_iterator* are
+// valid types and NULL can be implicitly converted to them).  It will
+// be picked over the second overload as 'int' is a perfect match for
+// the type of argument 0.  If C::iterator or C::const_iterator is not
+// a valid type, the first overload is not viable, and the second
+// overload will be picked.  Therefore, we can determine whether C is
+// a container class by checking the type of IsContainerTest<C>(0).
+// The value of the expression is insignificant.
+//
+// Note that we look for both C::iterator and C::const_iterator.  The
+// reason is that C++ injects the name of a class as a member of the
+// class itself (e.g. you can refer to class iterator as either
+// 'iterator' or 'iterator::iterator').  If we look for C::iterator
+// only, for example, we would mistakenly think that a class named
+// iterator is an STL container.
+//
+// Also note that the simpler approach of overloading
+// IsContainerTest(typename C::const_iterator*) and
+// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
+typedef int IsContainer;
+template <class C>
+IsContainer IsContainerTest(int /* dummy */,
+                            typename C::iterator* /* it */ = NULL,
+                            typename C::const_iterator* /* const_it */ = NULL) {
+  return 0;
+}
+
+typedef char IsNotContainer;
+template <class C>
+IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
+
+// EnableIf<condition>::type is void when 'Cond' is true, and
+// undefined when 'Cond' is false.  To use SFINAE to make a function
+// overload only apply when a particular expression is true, add
+// "typename EnableIf<expression>::type* = 0" as the last parameter.
+template<bool> struct EnableIf;
+template<> struct EnableIf<true> { typedef void type; };  // NOLINT
+
+// Utilities for native arrays.
+
+// ArrayEq() compares two k-dimensional native arrays using the
+// elements' operator==, where k can be any integer >= 0.  When k is
+// 0, ArrayEq() degenerates into comparing a single pair of values.
+
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
+  return internal::ArrayEq(lhs, N, rhs);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous ArrayEq() function, arrays with different sizes would
+// lead to different copies of the template code.
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
+  for (size_t i = 0; i != size; i++) {
+    if (!internal::ArrayEq(lhs[i], rhs[i]))
+      return false;
+  }
+  return true;
+}
+
+// Finds the first element in the iterator range [begin, end) that
+// equals elem.  Element may be a native array type itself.
+template <typename Iter, typename Element>
+Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
+  for (Iter it = begin; it != end; ++it) {
+    if (internal::ArrayEq(*it, elem))
+      return it;
+  }
+  return end;
+}
+
+// CopyArray() copies a k-dimensional native array using the elements'
+// operator=, where k can be any integer >= 0.  When k is 0,
+// CopyArray() degenerates into copying a single value.
+
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline void CopyArray(const T& from, U* to) { *to = from; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline void CopyArray(const T(&from)[N], U(*to)[N]) {
+  internal::CopyArray(from, N, *to);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous CopyArray() function, arrays with different sizes
+// would lead to different copies of the template code.
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to) {
+  for (size_t i = 0; i != size; i++) {
+    internal::CopyArray(from[i], to + i);
+  }
+}
+
+// The relation between an NativeArray object (see below) and the
+// native array it represents.
+enum RelationToSource {
+  kReference,  // The NativeArray references the native array.
+  kCopy        // The NativeArray makes a copy of the native array and
+               // owns the copy.
+};
+
+// Adapts a native array to a read-only STL-style container.  Instead
+// of the complete STL container concept, this adaptor only implements
+// members useful for Google Mock's container matchers.  New members
+// should be added as needed.  To simplify the implementation, we only
+// support Element being a raw type (i.e. having no top-level const or
+// reference modifier).  It's the client's responsibility to satisfy
+// this requirement.  Element can be an array type itself (hence
+// multi-dimensional arrays are supported).
+template <typename Element>
+class NativeArray {
+ public:
+  // STL-style container typedefs.
+  typedef Element value_type;
+  typedef Element* iterator;
+  typedef const Element* const_iterator;
+
+  // Constructs from a native array.
+  NativeArray(const Element* array, size_t count, RelationToSource relation) {
+    Init(array, count, relation);
+  }
+
+  // Copy constructor.
+  NativeArray(const NativeArray& rhs) {
+    Init(rhs.array_, rhs.size_, rhs.relation_to_source_);
+  }
+
+  ~NativeArray() {
+    // Ensures that the user doesn't instantiate NativeArray with a
+    // const or reference type.
+    static_cast<void>(StaticAssertTypeEqHelper<Element,
+        GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>());
+    if (relation_to_source_ == kCopy)
+      delete[] array_;
+  }
+
+  // STL-style container methods.
+  size_t size() const { return size_; }
+  const_iterator begin() const { return array_; }
+  const_iterator end() const { return array_ + size_; }
+  bool operator==(const NativeArray& rhs) const {
+    return size() == rhs.size() &&
+        ArrayEq(begin(), size(), rhs.begin());
+  }
+
+ private:
+  // Initializes this object; makes a copy of the input array if
+  // 'relation' is kCopy.
+  void Init(const Element* array, size_t a_size, RelationToSource relation) {
+    if (relation == kReference) {
+      array_ = array;
+    } else {
+      Element* const copy = new Element[a_size];
+      CopyArray(array, a_size, copy);
+      array_ = copy;
+    }
+    size_ = a_size;
+    relation_to_source_ = relation;
+  }
+
+  const Element* array_;
+  size_t size_;
+  RelationToSource relation_to_source_;
+
+  GTEST_DISALLOW_ASSIGN_(NativeArray);
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
+  ::testing::internal::AssertHelper(result_type, file, line, message) \
+    = ::testing::Message()
+
+#define GTEST_MESSAGE_(message, result_type) \
+  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
+
+#define GTEST_FATAL_FAILURE_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
+
+#define GTEST_NONFATAL_FAILURE_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
+
+#define GTEST_SUCCESS_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
+
+// Suppresses MSVC warnings 4072 (unreachable code) for the code following
+// statement if it returns or throws (or doesn't return or throw in some
+// situations).
+#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
+  if (::testing::internal::AlwaysTrue()) { statement; }
+
+#define GTEST_TEST_THROW_(statement, expected_exception, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::ConstCharPtr gtest_msg = "") { \
+    bool gtest_caught_expected = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (expected_exception const&) { \
+      gtest_caught_expected = true; \
+    } \
+    catch (...) { \
+      gtest_msg.value = \
+          "Expected: " #statement " throws an exception of type " \
+          #expected_exception ".\n  Actual: it throws a different type."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
+    } \
+    if (!gtest_caught_expected) { \
+      gtest_msg.value = \
+          "Expected: " #statement " throws an exception of type " \
+          #expected_exception ".\n  Actual: it throws nothing."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
+      fail(gtest_msg.value)
+
+#define GTEST_TEST_NO_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
+      fail("Expected: " #statement " doesn't throw an exception.\n" \
+           "  Actual: it throws.")
+
+#define GTEST_TEST_ANY_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    bool gtest_caught_any = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      gtest_caught_any = true; \
+    } \
+    if (!gtest_caught_any) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
+      fail("Expected: " #statement " throws an exception.\n" \
+           "  Actual: it doesn't.")
+
+
+// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
+// either a boolean expression or an AssertionResult. text is a textual
+// represenation of expression as it was passed into the EXPECT_TRUE.
+#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar_ = \
+      ::testing::AssertionResult(expression)) \
+    ; \
+  else \
+    fail(::testing::internal::GetBoolAssertionFailureMessage(\
+        gtest_ar_, text, #actual, #expected).c_str())
+
+#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
+      fail("Expected: " #statement " doesn't generate new fatal " \
+           "failures in the current thread.\n" \
+           "  Actual: it does.")
+
+// Expands to the name of the class that implements the given test.
+#define GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+  test_case_name##_##test_name##_Test
+
+// Helper macro for defining tests.
+#define GTEST_TEST_(test_case_name, test_name, parent_class, parent_id)\
+class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
+ public:\
+  GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
+ private:\
+  virtual void TestBody();\
+  static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
+};\
+\
+::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\
+  ::test_info_ =\
+    ::testing::internal::MakeAndRegisterTestInfo(\
+        #test_case_name, #test_name, NULL, NULL, \
+        (parent_id), \
+        parent_class::SetUpTestCase, \
+        parent_class::TearDownTestCase, \
+        new ::testing::internal::TestFactoryImpl<\
+            GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
+void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-linked_ptr.h b/Externals/gtest/include/gtest/internal/gtest-linked_ptr.h
new file mode 100644
index 0000000000..b1362cd002
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-linked_ptr.h
@@ -0,0 +1,233 @@
+// Copyright 2003 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: Dan Egnor (egnor@google.com)
+//
+// A "smart" pointer type with reference tracking.  Every pointer to a
+// particular object is kept on a circular linked list.  When the last pointer
+// to an object is destroyed or reassigned, the object is deleted.
+//
+// Used properly, this deletes the object when the last reference goes away.
+// There are several caveats:
+// - Like all reference counting schemes, cycles lead to leaks.
+// - Each smart pointer is actually two pointers (8 bytes instead of 4).
+// - Every time a pointer is assigned, the entire list of pointers to that
+//   object is traversed.  This class is therefore NOT SUITABLE when there
+//   will often be more than two or three pointers to a particular object.
+// - References are only tracked as long as linked_ptr<> objects are copied.
+//   If a linked_ptr<> is converted to a raw pointer and back, BAD THINGS
+//   will happen (double deletion).
+//
+// A good use of this class is storing object references in STL containers.
+// You can safely put linked_ptr<> in a vector<>.
+// Other uses may not be as good.
+//
+// Note: If you use an incomplete type with linked_ptr<>, the class
+// *containing* linked_ptr<> must have a constructor and destructor (even
+// if they do nothing!).
+//
+// Bill Gibbons suggested we use something like this.
+//
+// Thread Safety:
+//   Unlike other linked_ptr implementations, in this implementation
+//   a linked_ptr object is thread-safe in the sense that:
+//     - it's safe to copy linked_ptr objects concurrently,
+//     - it's safe to copy *from* a linked_ptr and read its underlying
+//       raw pointer (e.g. via get()) concurrently, and
+//     - it's safe to write to two linked_ptrs that point to the same
+//       shared object concurrently.
+// TODO(wan@google.com): rename this to safe_linked_ptr to avoid
+// confusion with normal linked_ptr.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// Protects copying of all linked_ptr objects.
+GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex);
+
+// This is used internally by all instances of linked_ptr<>.  It needs to be
+// a non-template class because different types of linked_ptr<> can refer to
+// the same object (linked_ptr<Superclass>(obj) vs linked_ptr<Subclass>(obj)).
+// So, it needs to be possible for different types of linked_ptr to participate
+// in the same circular linked list, so we need a single class type here.
+//
+// DO NOT USE THIS CLASS DIRECTLY YOURSELF.  Use linked_ptr<T>.
+class linked_ptr_internal {
+ public:
+  // Create a new circle that includes only this instance.
+  void join_new() {
+    next_ = this;
+  }
+
+  // Many linked_ptr operations may change p.link_ for some linked_ptr
+  // variable p in the same circle as this object.  Therefore we need
+  // to prevent two such operations from occurring concurrently.
+  //
+  // Note that different types of linked_ptr objects can coexist in a
+  // circle (e.g. linked_ptr<Base>, linked_ptr<Derived1>, and
+  // linked_ptr<Derived2>).  Therefore we must use a single mutex to
+  // protect all linked_ptr objects.  This can create serious
+  // contention in production code, but is acceptable in a testing
+  // framework.
+
+  // Join an existing circle.
+  void join(linked_ptr_internal const* ptr)
+      GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
+    MutexLock lock(&g_linked_ptr_mutex);
+
+    linked_ptr_internal const* p = ptr;
+    while (p->next_ != ptr) p = p->next_;
+    p->next_ = this;
+    next_ = ptr;
+  }
+
+  // Leave whatever circle we're part of.  Returns true if we were the
+  // last member of the circle.  Once this is done, you can join() another.
+  bool depart()
+      GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
+    MutexLock lock(&g_linked_ptr_mutex);
+
+    if (next_ == this) return true;
+    linked_ptr_internal const* p = next_;
+    while (p->next_ != this) p = p->next_;
+    p->next_ = next_;
+    return false;
+  }
+
+ private:
+  mutable linked_ptr_internal const* next_;
+};
+
+template <typename T>
+class linked_ptr {
+ public:
+  typedef T element_type;
+
+  // Take over ownership of a raw pointer.  This should happen as soon as
+  // possible after the object is created.
+  explicit linked_ptr(T* ptr = NULL) { capture(ptr); }
+  ~linked_ptr() { depart(); }
+
+  // Copy an existing linked_ptr<>, adding ourselves to the list of references.
+  template <typename U> linked_ptr(linked_ptr<U> const& ptr) { copy(&ptr); }
+  linked_ptr(linked_ptr const& ptr) {  // NOLINT
+    assert(&ptr != this);
+    copy(&ptr);
+  }
+
+  // Assignment releases the old value and acquires the new.
+  template <typename U> linked_ptr& operator=(linked_ptr<U> const& ptr) {
+    depart();
+    copy(&ptr);
+    return *this;
+  }
+
+  linked_ptr& operator=(linked_ptr const& ptr) {
+    if (&ptr != this) {
+      depart();
+      copy(&ptr);
+    }
+    return *this;
+  }
+
+  // Smart pointer members.
+  void reset(T* ptr = NULL) {
+    depart();
+    capture(ptr);
+  }
+  T* get() const { return value_; }
+  T* operator->() const { return value_; }
+  T& operator*() const { return *value_; }
+
+  bool operator==(T* p) const { return value_ == p; }
+  bool operator!=(T* p) const { return value_ != p; }
+  template <typename U>
+  bool operator==(linked_ptr<U> const& ptr) const {
+    return value_ == ptr.get();
+  }
+  template <typename U>
+  bool operator!=(linked_ptr<U> const& ptr) const {
+    return value_ != ptr.get();
+  }
+
+ private:
+  template <typename U>
+  friend class linked_ptr;
+
+  T* value_;
+  linked_ptr_internal link_;
+
+  void depart() {
+    if (link_.depart()) delete value_;
+  }
+
+  void capture(T* ptr) {
+    value_ = ptr;
+    link_.join_new();
+  }
+
+  template <typename U> void copy(linked_ptr<U> const* ptr) {
+    value_ = ptr->get();
+    if (value_)
+      link_.join(&ptr->link_);
+    else
+      link_.join_new();
+  }
+};
+
+template<typename T> inline
+bool operator==(T* ptr, const linked_ptr<T>& x) {
+  return ptr == x.get();
+}
+
+template<typename T> inline
+bool operator!=(T* ptr, const linked_ptr<T>& x) {
+  return ptr != x.get();
+}
+
+// A function to convert T* into linked_ptr<T>
+// Doing e.g. make_linked_ptr(new FooBarBaz<type>(arg)) is a shorter notation
+// for linked_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
+template <typename T>
+linked_ptr<T> make_linked_ptr(T* ptr) {
+  return linked_ptr<T>(ptr);
+}
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h
new file mode 100644
index 0000000000..e80548592c
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h
@@ -0,0 +1,5143 @@
+// This file was GENERATED by command:
+//     pump.py gtest-param-util-generated.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently Google Test supports at most 50 arguments in Values,
+// and at most 10 arguments in Combine. Please contact
+// googletestframework@googlegroups.com if you need more.
+// Please note that the number of arguments to Combine is limited
+// by the maximum arity of the implementation of tr1::tuple which is
+// currently set at 10.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end);
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+
+// Used in the Values() function to provide polymorphic capabilities.
+template <typename T1>
+class ValueArray1 {
+ public:
+  explicit ValueArray1(T1 v1) : v1_(v1) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const { return ValuesIn(&v1_, &v1_ + 1); }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray1& other);
+
+  const T1 v1_;
+};
+
+template <typename T1, typename T2>
+class ValueArray2 {
+ public:
+  ValueArray2(T1 v1, T2 v2) : v1_(v1), v2_(v2) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray2& other);
+
+  const T1 v1_;
+  const T2 v2_;
+};
+
+template <typename T1, typename T2, typename T3>
+class ValueArray3 {
+ public:
+  ValueArray3(T1 v1, T2 v2, T3 v3) : v1_(v1), v2_(v2), v3_(v3) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray3& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4>
+class ValueArray4 {
+ public:
+  ValueArray4(T1 v1, T2 v2, T3 v3, T4 v4) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray4& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+class ValueArray5 {
+ public:
+  ValueArray5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray5& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+class ValueArray6 {
+ public:
+  ValueArray6(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray6& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+class ValueArray7 {
+ public:
+  ValueArray7(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray7& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+class ValueArray8 {
+ public:
+  ValueArray8(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+      T8 v8) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray8& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+class ValueArray9 {
+ public:
+  ValueArray9(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+      T9 v9) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray9& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+class ValueArray10 {
+ public:
+  ValueArray10(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray10& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+class ValueArray11 {
+ public:
+  ValueArray11(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray11& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+class ValueArray12 {
+ public:
+  ValueArray12(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray12& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+class ValueArray13 {
+ public:
+  ValueArray13(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray13& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+class ValueArray14 {
+ public:
+  ValueArray14(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray14& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+class ValueArray15 {
+ public:
+  ValueArray15(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray15& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+class ValueArray16 {
+ public:
+  ValueArray16(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray16& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+class ValueArray17 {
+ public:
+  ValueArray17(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+      T17 v17) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray17& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+class ValueArray18 {
+ public:
+  ValueArray18(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray18& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+class ValueArray19 {
+ public:
+  ValueArray19(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray19& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+class ValueArray20 {
+ public:
+  ValueArray20(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray20& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+class ValueArray21 {
+ public:
+  ValueArray21(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray21& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+class ValueArray22 {
+ public:
+  ValueArray22(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray22& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+class ValueArray23 {
+ public:
+  ValueArray23(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray23& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+class ValueArray24 {
+ public:
+  ValueArray24(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray24& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+class ValueArray25 {
+ public:
+  ValueArray25(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+      T25 v25) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray25& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+class ValueArray26 {
+ public:
+  ValueArray26(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray26& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+class ValueArray27 {
+ public:
+  ValueArray27(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray27& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+class ValueArray28 {
+ public:
+  ValueArray28(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray28& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+class ValueArray29 {
+ public:
+  ValueArray29(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray29& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+class ValueArray30 {
+ public:
+  ValueArray30(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray30& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+class ValueArray31 {
+ public:
+  ValueArray31(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray31& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+class ValueArray32 {
+ public:
+  ValueArray32(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray32& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+class ValueArray33 {
+ public:
+  ValueArray33(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32,
+      T33 v33) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray33& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+class ValueArray34 {
+ public:
+  ValueArray34(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray34& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+class ValueArray35 {
+ public:
+  ValueArray35(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31),
+      v32_(v32), v33_(v33), v34_(v34), v35_(v35) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray35& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+class ValueArray36 {
+ public:
+  ValueArray36(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30),
+      v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray36& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+class ValueArray37 {
+ public:
+  ValueArray37(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29),
+      v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35),
+      v36_(v36), v37_(v37) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray37& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+class ValueArray38 {
+ public:
+  ValueArray38(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray38& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+class ValueArray39 {
+ public:
+  ValueArray39(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray39& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+class ValueArray40 {
+ public:
+  ValueArray40(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33),
+      v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39),
+      v40_(v40) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray40& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+class ValueArray41 {
+ public:
+  ValueArray41(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40,
+      T41 v41) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray41& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+class ValueArray42 {
+ public:
+  ValueArray42(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray42& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+class ValueArray43 {
+ public:
+  ValueArray43(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31),
+      v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37),
+      v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray43& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+class ValueArray44 {
+ public:
+  ValueArray44(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30),
+      v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36),
+      v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42),
+      v43_(v43), v44_(v44) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray44& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+class ValueArray45 {
+ public:
+  ValueArray45(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29),
+      v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35),
+      v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41),
+      v42_(v42), v43_(v43), v44_(v44), v45_(v45) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray45& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+class ValueArray46 {
+ public:
+  ValueArray46(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40),
+      v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray46& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+class ValueArray47 {
+ public:
+  ValueArray47(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40),
+      v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46),
+      v47_(v47) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray47& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+class ValueArray48 {
+ public:
+  ValueArray48(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33),
+      v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39),
+      v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45),
+      v46_(v46), v47_(v47), v48_(v48) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray48& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+class ValueArray49 {
+ public:
+  ValueArray49(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48,
+      T49 v49) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44),
+      v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_), static_cast<T>(v49_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray49& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+  const T49 v49_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+class ValueArray50 {
+ public:
+  ValueArray50(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, T49 v49,
+      T50 v50) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44),
+      v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49), v50_(v50) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_), static_cast<T>(v49_), static_cast<T>(v50_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray50& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+  const T49 v49_;
+  const T50 v50_;
+};
+
+# if GTEST_HAS_COMBINE
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Generates values from the Cartesian product of values produced
+// by the argument generators.
+//
+template <typename T1, typename T2>
+class CartesianProductGenerator2
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2> ParamType;
+
+  CartesianProductGenerator2(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2)
+      : g1_(g1), g2_(g2) {}
+  virtual ~CartesianProductGenerator2() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current2_;
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator2::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator2& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+};  // class CartesianProductGenerator2
+
+
+template <typename T1, typename T2, typename T3>
+class CartesianProductGenerator3
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3> ParamType;
+
+  CartesianProductGenerator3(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3)
+      : g1_(g1), g2_(g2), g3_(g3) {}
+  virtual ~CartesianProductGenerator3() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current3_;
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator3::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator3& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+};  // class CartesianProductGenerator3
+
+
+template <typename T1, typename T2, typename T3, typename T4>
+class CartesianProductGenerator4
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4> ParamType;
+
+  CartesianProductGenerator4(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
+  virtual ~CartesianProductGenerator4() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current4_;
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator4::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator4& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+};  // class CartesianProductGenerator4
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+class CartesianProductGenerator5
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5> ParamType;
+
+  CartesianProductGenerator5(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
+  virtual ~CartesianProductGenerator5() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current5_;
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator5::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator5& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+};  // class CartesianProductGenerator5
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+class CartesianProductGenerator6
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5,
+        T6> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> ParamType;
+
+  CartesianProductGenerator6(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
+  virtual ~CartesianProductGenerator6() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current6_;
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator6::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator6& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+};  // class CartesianProductGenerator6
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+class CartesianProductGenerator7
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
+        T7> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
+
+  CartesianProductGenerator7(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
+  virtual ~CartesianProductGenerator7() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current7_;
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator7::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator7& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+};  // class CartesianProductGenerator7
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+class CartesianProductGenerator8
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
+
+  CartesianProductGenerator8(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7),
+          g8_(g8) {}
+  virtual ~CartesianProductGenerator8() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current8_;
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator8::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator8& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+};  // class CartesianProductGenerator8
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+class CartesianProductGenerator9
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8, T9> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
+
+  CartesianProductGenerator9(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8, const ParamGenerator<T9>& g9)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9) {}
+  virtual ~CartesianProductGenerator9() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end(), g9_, g9_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8,
+      const ParamGenerator<T9>& g9,
+      const typename ParamGenerator<T9>::iterator& current9)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8),
+          begin9_(g9.begin()), end9_(g9.end()), current9_(current9)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current9_;
+      if (current9_ == end9_) {
+        current9_ = begin9_;
+        ++current8_;
+      }
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_ &&
+          current9_ == typed_other->current9_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_),
+        begin9_(other.begin9_),
+        end9_(other.end9_),
+        current9_(other.current9_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_,
+            *current9_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_ ||
+          current9_ == end9_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    const typename ParamGenerator<T9>::iterator begin9_;
+    const typename ParamGenerator<T9>::iterator end9_;
+    typename ParamGenerator<T9>::iterator current9_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator9::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator9& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+  const ParamGenerator<T9> g9_;
+};  // class CartesianProductGenerator9
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+class CartesianProductGenerator10
+    : public ParamGeneratorInterface< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8, T9, T10> > {
+ public:
+  typedef ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
+
+  CartesianProductGenerator10(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8, const ParamGenerator<T9>& g9,
+      const ParamGenerator<T10>& g10)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9), g10_(g10) {}
+  virtual ~CartesianProductGenerator10() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin(), g10_, g10_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end(), g9_, g9_.end(), g10_, g10_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8,
+      const ParamGenerator<T9>& g9,
+      const typename ParamGenerator<T9>::iterator& current9,
+      const ParamGenerator<T10>& g10,
+      const typename ParamGenerator<T10>::iterator& current10)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8),
+          begin9_(g9.begin()), end9_(g9.end()), current9_(current9),
+          begin10_(g10.begin()), end10_(g10.end()), current10_(current10)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current10_;
+      if (current10_ == end10_) {
+        current10_ = begin10_;
+        ++current9_;
+      }
+      if (current9_ == end9_) {
+        current9_ = begin9_;
+        ++current8_;
+      }
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_ &&
+          current9_ == typed_other->current9_ &&
+          current10_ == typed_other->current10_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_),
+        begin9_(other.begin9_),
+        end9_(other.end9_),
+        current9_(other.current9_),
+        begin10_(other.begin10_),
+        end10_(other.end10_),
+        current10_(other.current10_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_,
+            *current9_, *current10_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_ ||
+          current9_ == end9_ ||
+          current10_ == end10_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    const typename ParamGenerator<T9>::iterator begin9_;
+    const typename ParamGenerator<T9>::iterator end9_;
+    typename ParamGenerator<T9>::iterator current9_;
+    const typename ParamGenerator<T10>::iterator begin10_;
+    const typename ParamGenerator<T10>::iterator end10_;
+    typename ParamGenerator<T10>::iterator current10_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator10::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator10& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+  const ParamGenerator<T9> g9_;
+  const ParamGenerator<T10> g10_;
+};  // class CartesianProductGenerator10
+
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Helper classes providing Combine() with polymorphic features. They allow
+// casting CartesianProductGeneratorN<T> to ParamGenerator<U> if T is
+// convertible to U.
+//
+template <class Generator1, class Generator2>
+class CartesianProductHolder2 {
+ public:
+CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
+      : g1_(g1), g2_(g2) {}
+  template <typename T1, typename T2>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2> >(
+        new CartesianProductGenerator2<T1, T2>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder2& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+};  // class CartesianProductHolder2
+
+template <class Generator1, class Generator2, class Generator3>
+class CartesianProductHolder3 {
+ public:
+CartesianProductHolder3(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3)
+      : g1_(g1), g2_(g2), g3_(g3) {}
+  template <typename T1, typename T2, typename T3>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3> >(
+        new CartesianProductGenerator3<T1, T2, T3>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder3& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+};  // class CartesianProductHolder3
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4>
+class CartesianProductHolder4 {
+ public:
+CartesianProductHolder4(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
+  template <typename T1, typename T2, typename T3, typename T4>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4> >(
+        new CartesianProductGenerator4<T1, T2, T3, T4>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder4& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+};  // class CartesianProductHolder4
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5>
+class CartesianProductHolder5 {
+ public:
+CartesianProductHolder5(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5> >(
+        new CartesianProductGenerator5<T1, T2, T3, T4, T5>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder5& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+};  // class CartesianProductHolder5
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6>
+class CartesianProductHolder6 {
+ public:
+CartesianProductHolder6(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6> >(
+        new CartesianProductGenerator6<T1, T2, T3, T4, T5, T6>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder6& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+};  // class CartesianProductHolder6
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7>
+class CartesianProductHolder7 {
+ public:
+CartesianProductHolder7(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6,
+      T7> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7> >(
+        new CartesianProductGenerator7<T1, T2, T3, T4, T5, T6, T7>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder7& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+};  // class CartesianProductHolder7
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8>
+class CartesianProductHolder8 {
+ public:
+CartesianProductHolder8(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7),
+          g8_(g8) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7,
+      T8> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
+        new CartesianProductGenerator8<T1, T2, T3, T4, T5, T6, T7, T8>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder8& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+};  // class CartesianProductHolder8
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8, class Generator9>
+class CartesianProductHolder9 {
+ public:
+CartesianProductHolder9(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8,
+    const Generator9& g9)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8, typename T9>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+      T9> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+        T9> >(
+        new CartesianProductGenerator9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_),
+        static_cast<ParamGenerator<T9> >(g9_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder9& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+  const Generator9 g9_;
+};  // class CartesianProductHolder9
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8, class Generator9, class Generator10>
+class CartesianProductHolder10 {
+ public:
+CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8,
+    const Generator9& g9, const Generator10& g10)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9), g10_(g10) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8, typename T9, typename T10>
+  operator ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+      T9, T10> >() const {
+    return ParamGenerator< ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+        T9, T10> >(
+        new CartesianProductGenerator10<T1, T2, T3, T4, T5, T6, T7, T8, T9,
+            T10>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_),
+        static_cast<ParamGenerator<T9> >(g9_),
+        static_cast<ParamGenerator<T10> >(g10_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder10& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+  const Generator9 g9_;
+  const Generator10 g10_;
+};  // class CartesianProductHolder10
+
+# endif  // GTEST_HAS_COMBINE
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
new file mode 100644
index 0000000000..009206fd31
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
@@ -0,0 +1,301 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of Values arguments we want to support.
+$var maxtuple = 10  $$ Maximum number of Combine arguments we want to support.
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently Google Test supports at most $n arguments in Values,
+// and at most $maxtuple arguments in Combine. Please contact
+// googletestframework@googlegroups.com if you need more.
+// Please note that the number of arguments to Combine is limited
+// by the maximum arity of the implementation of tr1::tuple which is
+// currently set at $maxtuple.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end);
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+
+// Used in the Values() function to provide polymorphic capabilities.
+template <typename T1>
+class ValueArray1 {
+ public:
+  explicit ValueArray1(T1 v1) : v1_(v1) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const { return ValuesIn(&v1_, &v1_ + 1); }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray1& other);
+
+  const T1 v1_;
+};
+
+$range i 2..n
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename T$j]]>
+class ValueArray$i {
+ public:
+  ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {$for j, [[static_cast<T>(v$(j)_)]]};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray$i& other);
+
+$for j [[
+
+  const T$j v$(j)_;
+]]
+
+};
+
+]]
+
+# if GTEST_HAS_COMBINE
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Generates values from the Cartesian product of values produced
+// by the argument generators.
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+$range k 2..i
+
+template <$for j, [[typename T$j]]>
+class CartesianProductGenerator$i
+    : public ParamGeneratorInterface< ::std::tr1::tuple<$for j, [[T$j]]> > {
+ public:
+  typedef ::std::tr1::tuple<$for j, [[T$j]]> ParamType;
+
+  CartesianProductGenerator$i($for j, [[const ParamGenerator<T$j>& g$j]])
+      : $for j, [[g$(j)_(g$j)]] {}
+  virtual ~CartesianProductGenerator$i() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, $for j, [[g$(j)_, g$(j)_.begin()]]);
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, $for j, [[g$(j)_, g$(j)_.end()]]);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base, $for j, [[
+
+      const ParamGenerator<T$j>& g$j,
+      const typename ParamGenerator<T$j>::iterator& current$(j)]])
+        : base_(base),
+$for j, [[
+
+          begin$(j)_(g$j.begin()), end$(j)_(g$j.end()), current$(j)_(current$j)
+]]    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current$(i)_;
+
+$for k [[
+      if (current$(i+2-k)_ == end$(i+2-k)_) {
+        current$(i+2-k)_ = begin$(i+2-k)_;
+        ++current$(i+2-k-1)_;
+      }
+
+]]
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         ($for j  && [[
+
+          current$(j)_ == typed_other->current$(j)_
+]]);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_), $for j, [[
+
+        begin$(j)_(other.begin$(j)_),
+        end$(j)_(other.end$(j)_),
+        current$(j)_(other.current$(j)_)
+]] {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType($for j, [[*current$(j)_]]);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+$for j  || [[
+
+          current$(j)_ == end$(j)_
+]];
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+$for j [[
+
+    const typename ParamGenerator<T$j>::iterator begin$(j)_;
+    const typename ParamGenerator<T$j>::iterator end$(j)_;
+    typename ParamGenerator<T$j>::iterator current$(j)_;
+]]
+
+    ParamType current_value_;
+  };  // class CartesianProductGenerator$i::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator$i& other);
+
+
+$for j [[
+  const ParamGenerator<T$j> g$(j)_;
+
+]]
+};  // class CartesianProductGenerator$i
+
+
+]]
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Helper classes providing Combine() with polymorphic features. They allow
+// casting CartesianProductGeneratorN<T> to ParamGenerator<U> if T is
+// convertible to U.
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+
+template <$for j, [[class Generator$j]]>
+class CartesianProductHolder$i {
+ public:
+CartesianProductHolder$i($for j, [[const Generator$j& g$j]])
+      : $for j, [[g$(j)_(g$j)]] {}
+  template <$for j, [[typename T$j]]>
+  operator ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >() const {
+    return ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >(
+        new CartesianProductGenerator$i<$for j, [[T$j]]>(
+$for j,[[
+
+        static_cast<ParamGenerator<T$j> >(g$(j)_)
+]]));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder$i& other);
+
+
+$for j [[
+  const Generator$j g$(j)_;
+
+]]
+};  // class CartesianProductHolder$i
+
+]]
+
+# endif  // GTEST_HAS_COMBINE
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util.h b/Externals/gtest/include/gtest/internal/gtest-param-util.h
new file mode 100644
index 0000000000..d5e1028b0c
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-param-util.h
@@ -0,0 +1,619 @@
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+
+#include <iterator>
+#include <utility>
+#include <vector>
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-linked_ptr.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-printers.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+namespace internal {
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Outputs a message explaining invalid registration of different
+// fixture class for the same test case. This may happen when
+// TEST_P macro is used to define two tests with the same name
+// but in different namespaces.
+GTEST_API_ void ReportInvalidTestCaseType(const char* test_case_name,
+                                          const char* file, int line);
+
+template <typename> class ParamGeneratorInterface;
+template <typename> class ParamGenerator;
+
+// Interface for iterating over elements provided by an implementation
+// of ParamGeneratorInterface<T>.
+template <typename T>
+class ParamIteratorInterface {
+ public:
+  virtual ~ParamIteratorInterface() {}
+  // A pointer to the base generator instance.
+  // Used only for the purposes of iterator comparison
+  // to make sure that two iterators belong to the same generator.
+  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
+  // Advances iterator to point to the next element
+  // provided by the generator. The caller is responsible
+  // for not calling Advance() on an iterator equal to
+  // BaseGenerator()->End().
+  virtual void Advance() = 0;
+  // Clones the iterator object. Used for implementing copy semantics
+  // of ParamIterator<T>.
+  virtual ParamIteratorInterface* Clone() const = 0;
+  // Dereferences the current iterator and provides (read-only) access
+  // to the pointed value. It is the caller's responsibility not to call
+  // Current() on an iterator equal to BaseGenerator()->End().
+  // Used for implementing ParamGenerator<T>::operator*().
+  virtual const T* Current() const = 0;
+  // Determines whether the given iterator and other point to the same
+  // element in the sequence generated by the generator.
+  // Used for implementing ParamGenerator<T>::operator==().
+  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
+};
+
+// Class iterating over elements provided by an implementation of
+// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
+// and implements the const forward iterator concept.
+template <typename T>
+class ParamIterator {
+ public:
+  typedef T value_type;
+  typedef const T& reference;
+  typedef ptrdiff_t difference_type;
+
+  // ParamIterator assumes ownership of the impl_ pointer.
+  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
+  ParamIterator& operator=(const ParamIterator& other) {
+    if (this != &other)
+      impl_.reset(other.impl_->Clone());
+    return *this;
+  }
+
+  const T& operator*() const { return *impl_->Current(); }
+  const T* operator->() const { return impl_->Current(); }
+  // Prefix version of operator++.
+  ParamIterator& operator++() {
+    impl_->Advance();
+    return *this;
+  }
+  // Postfix version of operator++.
+  ParamIterator operator++(int /*unused*/) {
+    ParamIteratorInterface<T>* clone = impl_->Clone();
+    impl_->Advance();
+    return ParamIterator(clone);
+  }
+  bool operator==(const ParamIterator& other) const {
+    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
+  }
+  bool operator!=(const ParamIterator& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  friend class ParamGenerator<T>;
+  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
+  scoped_ptr<ParamIteratorInterface<T> > impl_;
+};
+
+// ParamGeneratorInterface<T> is the binary interface to access generators
+// defined in other translation units.
+template <typename T>
+class ParamGeneratorInterface {
+ public:
+  typedef T ParamType;
+
+  virtual ~ParamGeneratorInterface() {}
+
+  // Generator interface definition
+  virtual ParamIteratorInterface<T>* Begin() const = 0;
+  virtual ParamIteratorInterface<T>* End() const = 0;
+};
+
+// Wraps ParamGeneratorInterface<T> and provides general generator syntax
+// compatible with the STL Container concept.
+// This class implements copy initialization semantics and the contained
+// ParamGeneratorInterface<T> instance is shared among all copies
+// of the original object. This is possible because that instance is immutable.
+template<typename T>
+class ParamGenerator {
+ public:
+  typedef ParamIterator<T> iterator;
+
+  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
+  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
+
+  ParamGenerator& operator=(const ParamGenerator& other) {
+    impl_ = other.impl_;
+    return *this;
+  }
+
+  iterator begin() const { return iterator(impl_->Begin()); }
+  iterator end() const { return iterator(impl_->End()); }
+
+ private:
+  linked_ptr<const ParamGeneratorInterface<T> > impl_;
+};
+
+// Generates values from a range of two comparable values. Can be used to
+// generate sequences of user-defined types that implement operator+() and
+// operator<().
+// This class is used in the Range() function.
+template <typename T, typename IncrementT>
+class RangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  RangeGenerator(T begin, T end, IncrementT step)
+      : begin_(begin), end_(end),
+        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
+  virtual ~RangeGenerator() {}
+
+  virtual ParamIteratorInterface<T>* Begin() const {
+    return new Iterator(this, begin_, 0, step_);
+  }
+  virtual ParamIteratorInterface<T>* End() const {
+    return new Iterator(this, end_, end_index_, step_);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
+             IncrementT step)
+        : base_(base), value_(value), index_(index), step_(step) {}
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<T>* BaseGenerator() const {
+      return base_;
+    }
+    virtual void Advance() {
+      value_ = value_ + step_;
+      index_++;
+    }
+    virtual ParamIteratorInterface<T>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const T* Current() const { return &value_; }
+    virtual bool Equals(const ParamIteratorInterface<T>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const int other_index =
+          CheckedDowncastToActualType<const Iterator>(&other)->index_;
+      return index_ == other_index;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : ParamIteratorInterface<T>(),
+          base_(other.base_), value_(other.value_), index_(other.index_),
+          step_(other.step_) {}
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<T>* const base_;
+    T value_;
+    int index_;
+    const IncrementT step_;
+  };  // class RangeGenerator::Iterator
+
+  static int CalculateEndIndex(const T& begin,
+                               const T& end,
+                               const IncrementT& step) {
+    int end_index = 0;
+    for (T i = begin; i < end; i = i + step)
+      end_index++;
+    return end_index;
+  }
+
+  // No implementation - assignment is unsupported.
+  void operator=(const RangeGenerator& other);
+
+  const T begin_;
+  const T end_;
+  const IncrementT step_;
+  // The index for the end() iterator. All the elements in the generated
+  // sequence are indexed (0-based) to aid iterator comparison.
+  const int end_index_;
+};  // class RangeGenerator
+
+
+// Generates values from a pair of STL-style iterators. Used in the
+// ValuesIn() function. The elements are copied from the source range
+// since the source can be located on the stack, and the generator
+// is likely to persist beyond that stack frame.
+template <typename T>
+class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  template <typename ForwardIterator>
+  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
+      : container_(begin, end) {}
+  virtual ~ValuesInIteratorRangeGenerator() {}
+
+  virtual ParamIteratorInterface<T>* Begin() const {
+    return new Iterator(this, container_.begin());
+  }
+  virtual ParamIteratorInterface<T>* End() const {
+    return new Iterator(this, container_.end());
+  }
+
+ private:
+  typedef typename ::std::vector<T> ContainerType;
+
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base,
+             typename ContainerType::const_iterator iterator)
+        : base_(base), iterator_(iterator) {}
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<T>* BaseGenerator() const {
+      return base_;
+    }
+    virtual void Advance() {
+      ++iterator_;
+      value_.reset();
+    }
+    virtual ParamIteratorInterface<T>* Clone() const {
+      return new Iterator(*this);
+    }
+    // We need to use cached value referenced by iterator_ because *iterator_
+    // can return a temporary object (and of type other then T), so just
+    // having "return &*iterator_;" doesn't work.
+    // value_ is updated here and not in Advance() because Advance()
+    // can advance iterator_ beyond the end of the range, and we cannot
+    // detect that fact. The client code, on the other hand, is
+    // responsible for not calling Current() on an out-of-range iterator.
+    virtual const T* Current() const {
+      if (value_.get() == NULL)
+        value_.reset(new T(*iterator_));
+      return value_.get();
+    }
+    virtual bool Equals(const ParamIteratorInterface<T>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      return iterator_ ==
+          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+          // The explicit constructor call suppresses a false warning
+          // emitted by gcc when supplied with the -Wextra option.
+        : ParamIteratorInterface<T>(),
+          base_(other.base_),
+          iterator_(other.iterator_) {}
+
+    const ParamGeneratorInterface<T>* const base_;
+    typename ContainerType::const_iterator iterator_;
+    // A cached value of *iterator_. We keep it here to allow access by
+    // pointer in the wrapping iterator's operator->().
+    // value_ needs to be mutable to be accessed in Current().
+    // Use of scoped_ptr helps manage cached value's lifetime,
+    // which is bound by the lifespan of the iterator itself.
+    mutable scoped_ptr<const T> value_;
+  };  // class ValuesInIteratorRangeGenerator::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const ValuesInIteratorRangeGenerator& other);
+
+  const ContainerType container_;
+};  // class ValuesInIteratorRangeGenerator
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Stores a parameter value and later creates tests parameterized with that
+// value.
+template <class TestClass>
+class ParameterizedTestFactory : public TestFactoryBase {
+ public:
+  typedef typename TestClass::ParamType ParamType;
+  explicit ParameterizedTestFactory(ParamType parameter) :
+      parameter_(parameter) {}
+  virtual Test* CreateTest() {
+    TestClass::SetParam(&parameter_);
+    return new TestClass();
+  }
+
+ private:
+  const ParamType parameter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactoryBase is a base class for meta-factories that create
+// test factories for passing into MakeAndRegisterTestInfo function.
+template <class ParamType>
+class TestMetaFactoryBase {
+ public:
+  virtual ~TestMetaFactoryBase() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactory creates test factories for passing into
+// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
+// ownership of test factory pointer, same factory object cannot be passed
+// into that method twice. But ParameterizedTestCaseInfo is going to call
+// it for each Test/Parameter value combination. Thus it needs meta factory
+// creator class.
+template <class TestCase>
+class TestMetaFactory
+    : public TestMetaFactoryBase<typename TestCase::ParamType> {
+ public:
+  typedef typename TestCase::ParamType ParamType;
+
+  TestMetaFactory() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) {
+    return new ParameterizedTestFactory<TestCase>(parameter);
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseInfoBase is a generic interface
+// to ParameterizedTestCaseInfo classes. ParameterizedTestCaseInfoBase
+// accumulates test information provided by TEST_P macro invocations
+// and generators provided by INSTANTIATE_TEST_CASE_P macro invocations
+// and uses that information to register all resulting test instances
+// in RegisterTests method. The ParameterizeTestCaseRegistry class holds
+// a collection of pointers to the ParameterizedTestCaseInfo objects
+// and calls RegisterTests() on each of them when asked.
+class ParameterizedTestCaseInfoBase {
+ public:
+  virtual ~ParameterizedTestCaseInfoBase() {}
+
+  // Base part of test case name for display purposes.
+  virtual const string& GetTestCaseName() const = 0;
+  // Test case id to verify identity.
+  virtual TypeId GetTestCaseTypeId() const = 0;
+  // UnitTest class invokes this method to register tests in this
+  // test case right before running them in RUN_ALL_TESTS macro.
+  // This method should not be called more then once on any single
+  // instance of a ParameterizedTestCaseInfoBase derived class.
+  virtual void RegisterTests() = 0;
+
+ protected:
+  ParameterizedTestCaseInfoBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfoBase);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseInfo accumulates tests obtained from TEST_P
+// macro invocations for a particular test case and generators
+// obtained from INSTANTIATE_TEST_CASE_P macro invocations for that
+// test case. It registers tests with all values generated by all
+// generators when asked.
+template <class TestCase>
+class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
+ public:
+  // ParamType and GeneratorCreationFunc are private types but are required
+  // for declarations of public methods AddTestPattern() and
+  // AddTestCaseInstantiation().
+  typedef typename TestCase::ParamType ParamType;
+  // A function that returns an instance of appropriate generator type.
+  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
+
+  explicit ParameterizedTestCaseInfo(const char* name)
+      : test_case_name_(name) {}
+
+  // Test case base name for display purposes.
+  virtual const string& GetTestCaseName() const { return test_case_name_; }
+  // Test case id to verify identity.
+  virtual TypeId GetTestCaseTypeId() const { return GetTypeId<TestCase>(); }
+  // TEST_P macro uses AddTestPattern() to record information
+  // about a single test in a LocalTestInfo structure.
+  // test_case_name is the base name of the test case (without invocation
+  // prefix). test_base_name is the name of an individual test without
+  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
+  // test case base name and DoBar is test base name.
+  void AddTestPattern(const char* test_case_name,
+                      const char* test_base_name,
+                      TestMetaFactoryBase<ParamType>* meta_factory) {
+    tests_.push_back(linked_ptr<TestInfo>(new TestInfo(test_case_name,
+                                                       test_base_name,
+                                                       meta_factory)));
+  }
+  // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information
+  // about a generator.
+  int AddTestCaseInstantiation(const string& instantiation_name,
+                               GeneratorCreationFunc* func,
+                               const char* /* file */,
+                               int /* line */) {
+    instantiations_.push_back(::std::make_pair(instantiation_name, func));
+    return 0;  // Return value used only to run this method in namespace scope.
+  }
+  // UnitTest class invokes this method to register tests in this test case
+  // test cases right before running tests in RUN_ALL_TESTS macro.
+  // This method should not be called more then once on any single
+  // instance of a ParameterizedTestCaseInfoBase derived class.
+  // UnitTest has a guard to prevent from calling this method more then once.
+  virtual void RegisterTests() {
+    for (typename TestInfoContainer::iterator test_it = tests_.begin();
+         test_it != tests_.end(); ++test_it) {
+      linked_ptr<TestInfo> test_info = *test_it;
+      for (typename InstantiationContainer::iterator gen_it =
+               instantiations_.begin(); gen_it != instantiations_.end();
+               ++gen_it) {
+        const string& instantiation_name = gen_it->first;
+        ParamGenerator<ParamType> generator((*gen_it->second)());
+
+        string test_case_name;
+        if ( !instantiation_name.empty() )
+          test_case_name = instantiation_name + "/";
+        test_case_name += test_info->test_case_base_name;
+
+        int i = 0;
+        for (typename ParamGenerator<ParamType>::iterator param_it =
+                 generator.begin();
+             param_it != generator.end(); ++param_it, ++i) {
+          Message test_name_stream;
+          test_name_stream << test_info->test_base_name << "/" << i;
+          MakeAndRegisterTestInfo(
+              test_case_name.c_str(),
+              test_name_stream.GetString().c_str(),
+              NULL,  // No type parameter.
+              PrintToString(*param_it).c_str(),
+              GetTestCaseTypeId(),
+              TestCase::SetUpTestCase,
+              TestCase::TearDownTestCase,
+              test_info->test_meta_factory->CreateTestFactory(*param_it));
+        }  // for param_it
+      }  // for gen_it
+    }  // for test_it
+  }  // RegisterTests
+
+ private:
+  // LocalTestInfo structure keeps information about a single test registered
+  // with TEST_P macro.
+  struct TestInfo {
+    TestInfo(const char* a_test_case_base_name,
+             const char* a_test_base_name,
+             TestMetaFactoryBase<ParamType>* a_test_meta_factory) :
+        test_case_base_name(a_test_case_base_name),
+        test_base_name(a_test_base_name),
+        test_meta_factory(a_test_meta_factory) {}
+
+    const string test_case_base_name;
+    const string test_base_name;
+    const scoped_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
+  };
+  typedef ::std::vector<linked_ptr<TestInfo> > TestInfoContainer;
+  // Keeps pairs of <Instantiation name, Sequence generator creation function>
+  // received from INSTANTIATE_TEST_CASE_P macros.
+  typedef ::std::vector<std::pair<string, GeneratorCreationFunc*> >
+      InstantiationContainer;
+
+  const string test_case_name_;
+  TestInfoContainer tests_;
+  InstantiationContainer instantiations_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfo);
+};  // class ParameterizedTestCaseInfo
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseRegistry contains a map of ParameterizedTestCaseInfoBase
+// classes accessed by test case names. TEST_P and INSTANTIATE_TEST_CASE_P
+// macros use it to locate their corresponding ParameterizedTestCaseInfo
+// descriptors.
+class ParameterizedTestCaseRegistry {
+ public:
+  ParameterizedTestCaseRegistry() {}
+  ~ParameterizedTestCaseRegistry() {
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      delete *it;
+    }
+  }
+
+  // Looks up or creates and returns a structure containing information about
+  // tests and instantiations of a particular test case.
+  template <class TestCase>
+  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
+      const char* test_case_name,
+      const char* file,
+      int line) {
+    ParameterizedTestCaseInfo<TestCase>* typed_test_info = NULL;
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      if ((*it)->GetTestCaseName() == test_case_name) {
+        if ((*it)->GetTestCaseTypeId() != GetTypeId<TestCase>()) {
+          // Complain about incorrect usage of Google Test facilities
+          // and terminate the program since we cannot guaranty correct
+          // test case setup and tear-down in this case.
+          ReportInvalidTestCaseType(test_case_name,  file, line);
+          posix::Abort();
+        } else {
+          // At this point we are sure that the object we found is of the same
+          // type we are looking for, so we downcast it to that type
+          // without further checks.
+          typed_test_info = CheckedDowncastToActualType<
+              ParameterizedTestCaseInfo<TestCase> >(*it);
+        }
+        break;
+      }
+    }
+    if (typed_test_info == NULL) {
+      typed_test_info = new ParameterizedTestCaseInfo<TestCase>(test_case_name);
+      test_case_infos_.push_back(typed_test_info);
+    }
+    return typed_test_info;
+  }
+  void RegisterTests() {
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      (*it)->RegisterTests();
+    }
+  }
+
+ private:
+  typedef ::std::vector<ParameterizedTestCaseInfoBase*> TestCaseInfoContainer;
+
+  TestCaseInfoContainer test_case_infos_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseRegistry);
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-port.h b/Externals/gtest/include/gtest/internal/gtest-port.h
new file mode 100644
index 0000000000..a1176760c3
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-port.h
@@ -0,0 +1,2096 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: wan@google.com (Zhanyong Wan)
+//
+// Low-level types and utilities for porting Google Test to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Test's public API and can be used by
+// code outside Google Test.
+//
+// This file is fundamental to Google Test.  All other Google Test source
+// files are expected to #include this.  Therefore, it cannot #include
+// any other Google Test header.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+
+// Environment-describing macros
+// -----------------------------
+//
+// Google Test can be used in many different environments.  Macros in
+// this section tell Google Test what kind of environment it is being
+// used in, such that Google Test can provide environment-specific
+// features and implementations.
+//
+// Google Test tries to automatically detect the properties of its
+// environment, so users usually don't need to worry about these
+// macros.  However, the automatic detection is not perfect.
+// Sometimes it's necessary for a user to define some of the following
+// macros in the build script to override Google Test's decisions.
+//
+// If the user doesn't define a macro in the list, Google Test will
+// provide a default definition.  After this header is #included, all
+// macros in this list will be defined to either 1 or 0.
+//
+// Notes to maintainers:
+//   - Each macro here is a user-tweakable knob; do not grow the list
+//     lightly.
+//   - Use #if to key off these macros.  Don't use #ifdef or "#if
+//     defined(...)", which will not work as these macros are ALWAYS
+//     defined.
+//
+//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
+//                              is/isn't available.
+//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
+//                              are enabled.
+//   GTEST_HAS_GLOBAL_STRING  - Define it to 1/0 to indicate that ::string
+//                              is/isn't available (some systems define
+//                              ::string, which is different to std::string).
+//   GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::string
+//                              is/isn't available (some systems define
+//                              ::wstring, which is different to std::wstring).
+//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
+//                              expressions are/aren't available.
+//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
+//                              is/isn't available.
+//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
+//                              enabled.
+//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
+//                              std::wstring does/doesn't work (Google Test can
+//                              be used where std::wstring is unavailable).
+//   GTEST_HAS_TR1_TUPLE      - Define it to 1/0 to indicate tr1::tuple
+//                              is/isn't available.
+//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
+//                              compiler supports Microsoft's "Structured
+//                              Exception Handling".
+//   GTEST_HAS_STREAM_REDIRECTION
+//                            - Define it to 1/0 to indicate whether the
+//                              platform supports I/O stream redirection using
+//                              dup() and dup2().
+//   GTEST_USE_OWN_TR1_TUPLE  - Define it to 1/0 to indicate whether Google
+//                              Test's own tr1 tuple implementation should be
+//                              used.  Unused when the user sets
+//                              GTEST_HAS_TR1_TUPLE to 0.
+//   GTEST_LANG_CXX11         - Define it to 1/0 to indicate that Google Test
+//                              is building in C++11/C++98 mode.
+//   GTEST_LINKED_AS_SHARED_LIBRARY
+//                            - Define to 1 when compiling tests that use
+//                              Google Test as a shared library (known as
+//                              DLL on Windows).
+//   GTEST_CREATE_SHARED_LIBRARY
+//                            - Define to 1 when compiling Google Test itself
+//                              as a shared library.
+
+// Platform-indicating macros
+// --------------------------
+//
+// Macros indicating the platform on which Google Test is being used
+// (a macro is defined to 1 if compiled on the given platform;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+//   GTEST_OS_AIX      - IBM AIX
+//   GTEST_OS_CYGWIN   - Cygwin
+//   GTEST_OS_HPUX     - HP-UX
+//   GTEST_OS_LINUX    - Linux
+//     GTEST_OS_LINUX_ANDROID - Google Android
+//   GTEST_OS_MAC      - Mac OS X
+//     GTEST_OS_IOS    - iOS
+//       GTEST_OS_IOS_SIMULATOR - iOS simulator
+//   GTEST_OS_NACL     - Google Native Client (NaCl)
+//   GTEST_OS_OPENBSD  - OpenBSD
+//   GTEST_OS_QNX      - QNX
+//   GTEST_OS_SOLARIS  - Sun Solaris
+//   GTEST_OS_SYMBIAN  - Symbian
+//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
+//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
+//     GTEST_OS_WINDOWS_MINGW    - MinGW
+//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
+//   GTEST_OS_ZOS      - z/OS
+//
+// Among the platforms, Cygwin, Linux, Max OS X, and Windows have the
+// most stable support.  Since core members of the Google Test project
+// don't have access to other platforms, support for them may be less
+// stable.  If you notice any problems on your platform, please notify
+// googletestframework@googlegroups.com (patches for fixing them are
+// even more welcome!).
+//
+// It is possible that none of the GTEST_OS_* macros are defined.
+
+// Feature-indicating macros
+// -------------------------
+//
+// Macros indicating which Google Test features are available (a macro
+// is defined to 1 if the corresponding feature is supported;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+// These macros are public so that portable tests can be written.
+// Such tests typically surround code using a feature with an #if
+// which controls that code.  For example:
+//
+// #if GTEST_HAS_DEATH_TEST
+//   EXPECT_DEATH(DoSomethingDeadly());
+// #endif
+//
+//   GTEST_HAS_COMBINE      - the Combine() function (for value-parameterized
+//                            tests)
+//   GTEST_HAS_DEATH_TEST   - death tests
+//   GTEST_HAS_PARAM_TEST   - value-parameterized tests
+//   GTEST_HAS_TYPED_TEST   - typed tests
+//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
+//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
+//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
+//                            GTEST_HAS_POSIX_RE (see above) which users can
+//                            define themselves.
+//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
+//                            the above two are mutually exclusive.
+//   GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ().
+
+// Misc public macros
+// ------------------
+//
+//   GTEST_FLAG(flag_name)  - references the variable corresponding to
+//                            the given Google Test flag.
+
+// Internal utilities
+// ------------------
+//
+// The following macros and utilities are for Google Test's INTERNAL
+// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
+//
+// Macros for basic C++ coding:
+//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
+//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
+//                              variable don't have to be used.
+//   GTEST_DISALLOW_ASSIGN_   - disables operator=.
+//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
+//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
+//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
+//                                        suppressed (constant conditional).
+//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
+//                                        is suppressed.
+//
+// C++11 feature wrappers:
+//
+//   GTEST_MOVE_          - portability wrapper for std::move.
+//
+// Synchronization:
+//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
+//                            - synchronization primitives.
+//
+// Template meta programming:
+//   is_pointer     - as in TR1; needed on Symbian and IBM XL C/C++ only.
+//   IteratorTraits - partial implementation of std::iterator_traits, which
+//                    is not available in libCstd when compiled with Sun C++.
+//
+// Smart pointers:
+//   scoped_ptr     - as in TR2.
+//
+// Regular expressions:
+//   RE             - a simple regular expression class using the POSIX
+//                    Extended Regular Expression syntax on UNIX-like
+//                    platforms, or a reduced regular exception syntax on
+//                    other platforms, including Windows.
+//
+// Logging:
+//   GTEST_LOG_()   - logs messages at the specified severity level.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+//
+// Stdout and stderr capturing:
+//   CaptureStdout()     - starts capturing stdout.
+//   GetCapturedStdout() - stops capturing stdout and returns the captured
+//                         string.
+//   CaptureStderr()     - starts capturing stderr.
+//   GetCapturedStderr() - stops capturing stderr and returns the captured
+//                         string.
+//
+// Integer types:
+//   TypeWithSize   - maps an integer to a int type.
+//   Int32, UInt32, Int64, UInt64, TimeInMillis
+//                  - integers of known sizes.
+//   BiggestInt     - the biggest signed integer type.
+//
+// Command-line utilities:
+//   GTEST_DECLARE_*()  - declares a flag.
+//   GTEST_DEFINE_*()   - defines a flag.
+//   GetInjectableArgvs() - returns the command line as a vector of strings.
+//
+// Environment variable utilities:
+//   GetEnv()             - gets the value of an environment variable.
+//   BoolFromGTestEnv()   - parses a bool environment variable.
+//   Int32FromGTestEnv()  - parses an Int32 environment variable.
+//   StringFromGTestEnv() - parses a string environment variable.
+
+#include <ctype.h>   // for isspace, etc
+#include <stddef.h>  // for ptrdiff_t
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifndef _WIN32_WCE
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif  // !_WIN32_WCE
+
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+# include <TargetConditionals.h>
+#endif
+
+#include <iostream>  // NOLINT
+#include <sstream>  // NOLINT
+#include <string>  // NOLINT
+#include <utility>
+
+#define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
+#define GTEST_FLAG_PREFIX_ "gtest_"
+#define GTEST_FLAG_PREFIX_DASH_ "gtest-"
+#define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
+#define GTEST_NAME_ "Google Test"
+#define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/"
+
+// Determines the version of gcc that is used to compile this.
+#ifdef __GNUC__
+// 40302 means version 4.3.2.
+# define GTEST_GCC_VER_ \
+    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#endif  // __GNUC__
+
+// Determines the platform on which Google Test is compiled.
+#ifdef __CYGWIN__
+# define GTEST_OS_CYGWIN 1
+#elif defined __SYMBIAN32__
+# define GTEST_OS_SYMBIAN 1
+#elif defined _WIN32
+# define GTEST_OS_WINDOWS 1
+# ifdef _WIN32_WCE
+#  define GTEST_OS_WINDOWS_MOBILE 1
+# elif defined(__MINGW__) || defined(__MINGW32__)
+#  define GTEST_OS_WINDOWS_MINGW 1
+# else
+#  define GTEST_OS_WINDOWS_DESKTOP 1
+# endif  // _WIN32_WCE
+#elif defined __APPLE__
+# define GTEST_OS_MAC 1
+# if TARGET_OS_IPHONE
+#  define GTEST_OS_IOS 1
+#  if TARGET_IPHONE_SIMULATOR
+#   define GTEST_OS_IOS_SIMULATOR 1
+#  endif
+# endif
+#elif defined __linux__
+# define GTEST_OS_LINUX 1
+# if defined __ANDROID__
+#  define GTEST_OS_LINUX_ANDROID 1
+# endif
+#elif defined __MVS__
+# define GTEST_OS_ZOS 1
+#elif defined(__sun) && defined(__SVR4)
+# define GTEST_OS_SOLARIS 1
+#elif defined(_AIX)
+# define GTEST_OS_AIX 1
+#elif defined(__hpux)
+# define GTEST_OS_HPUX 1
+#elif defined __native_client__
+# define GTEST_OS_NACL 1
+#elif defined __OpenBSD__
+# define GTEST_OS_OPENBSD 1
+#elif defined __QNX__
+# define GTEST_OS_QNX 1
+#endif  // __CYGWIN__
+
+#ifndef GTEST_LANG_CXX11
+// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when
+// -std={c,gnu}++{0x,11} is passed.  The C++11 standard specifies a
+// value for __cplusplus, and recent versions of clang, gcc, and
+// probably other compilers set that too in C++11 mode.
+# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L
+// Compiling in at least C++11 mode.
+#  define GTEST_LANG_CXX11 1
+# else
+#  define GTEST_LANG_CXX11 0
+# endif
+#endif
+
+// C++11 specifies that <initializer_list> provides std::initializer_list. Use
+// that if gtest is used in C++11 mode and libstdc++ isn't very old (binaries
+// targeting OS X 10.6 can build with clang but need to use gcc4.2's
+// libstdc++).
+#if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
+# define GTEST_HAS_STD_INITIALIZER_LIST_ 1
+#endif
+
+// C++11 specifies that <tuple> provides std::tuple.
+// Some platforms still might not have it, however.
+#if GTEST_LANG_CXX11
+# define GTEST_HAS_STD_TUPLE_ 1
+# if defined(__clang__)
+// Inspired by http://clang.llvm.org/docs/LanguageExtensions.html#__has_include
+#  if defined(__has_include) && !__has_include(<tuple>)
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# elif defined(_MSC_VER)
+// Inspired by boost/config/stdlib/dinkumware.hpp
+#  if defined(_CPPLIB_VER) && _CPPLIB_VER < 520
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# elif defined(__GLIBCXX__)
+// Inspired by boost/config/stdlib/libstdcpp3.hpp,
+// http://gcc.gnu.org/gcc-4.2/changes.html and
+// http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x
+#  if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# endif
+#endif
+
+// Brings in definitions for functions used in the testing::internal::posix
+// namespace (read, write, close, chdir, isatty, stat). We do not currently
+// use them on Windows Mobile.
+#if !GTEST_OS_WINDOWS
+// This assumes that non-Windows OSes provide unistd.h. For OSes where this
+// is not the case, we need to include headers that provide the functions
+// mentioned above.
+# include <unistd.h>
+# include <strings.h>
+#elif !GTEST_OS_WINDOWS_MOBILE
+# include <direct.h>
+# include <io.h>
+#endif
+
+#if GTEST_OS_LINUX_ANDROID
+// Used to define __ANDROID_API__ matching the target NDK API level.
+#  include <android/api-level.h>  // NOLINT
+#endif
+
+// Defines this to true iff Google Test can use POSIX regular expressions.
+#ifndef GTEST_HAS_POSIX_RE
+# if GTEST_OS_LINUX_ANDROID
+// On Android, <regex.h> is only available starting with Gingerbread.
+#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
+# else
+#  define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
+# endif
+#endif
+
+#if GTEST_HAS_POSIX_RE
+
+// On some platforms, <regex.h> needs someone to define size_t, and
+// won't compile otherwise.  We can #include it here as we already
+// included <stdlib.h>, which is guaranteed to define size_t through
+// <stddef.h>.
+# include <regex.h>  // NOLINT
+
+# define GTEST_USES_POSIX_RE 1
+
+#elif GTEST_OS_WINDOWS
+
+// <regex.h> is not available on Windows.  Use our own simple regex
+// implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#else
+
+// <regex.h> may not be available on this platform.  Use our own
+// simple regex implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#endif  // GTEST_HAS_POSIX_RE
+
+#ifndef GTEST_HAS_EXCEPTIONS
+// The user didn't tell us whether exceptions are enabled, so we need
+// to figure it out.
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC's and C++Builder's implementations of the STL use the _HAS_EXCEPTIONS
+// macro to enable exceptions, so we'll do the same.
+// Assumes that exceptions are enabled by default.
+#  ifndef _HAS_EXCEPTIONS
+#   define _HAS_EXCEPTIONS 1
+#  endif  // _HAS_EXCEPTIONS
+#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
+# elif defined(__GNUC__) && __EXCEPTIONS
+// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__SUNPRO_CC)
+// Sun Pro CC supports exceptions.  However, there is no compile-time way of
+// detecting whether they are enabled or not.  Therefore, we assume that
+// they are enabled unless the user tells us otherwise.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__IBMCPP__) && __EXCEPTIONS
+// xlC defines __EXCEPTIONS to 1 iff exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__HP_aCC)
+// Exception handling is in effect by default in HP aCC compiler. It has to
+// be turned of by +noeh compiler option if desired.
+#  define GTEST_HAS_EXCEPTIONS 1
+# else
+// For other compilers, we assume exceptions are disabled to be
+// conservative.
+#  define GTEST_HAS_EXCEPTIONS 0
+# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#if !defined(GTEST_HAS_STD_STRING)
+// Even though we don't use this macro any longer, we keep it in case
+// some clients still depend on it.
+# define GTEST_HAS_STD_STRING 1
+#elif !GTEST_HAS_STD_STRING
+// The user told us that ::std::string isn't available.
+# error "Google Test cannot be used where ::std::string isn't available."
+#endif  // !defined(GTEST_HAS_STD_STRING)
+
+#ifndef GTEST_HAS_GLOBAL_STRING
+// The user didn't tell us whether ::string is available, so we need
+// to figure it out.
+
+# define GTEST_HAS_GLOBAL_STRING 0
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+#ifndef GTEST_HAS_STD_WSTRING
+// The user didn't tell us whether ::std::wstring is available, so we need
+// to figure it out.
+// TODO(wan@google.com): uses autoconf to detect whether ::std::wstring
+//   is available.
+
+// Cygwin 1.7 and below doesn't support ::std::wstring.
+// Solaris' libc++ doesn't support it either.  Android has
+// no support for it at least as recent as Froyo (2.2).
+# define GTEST_HAS_STD_WSTRING \
+    (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS))
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+#ifndef GTEST_HAS_GLOBAL_WSTRING
+// The user didn't tell us whether ::wstring is available, so we need
+// to figure it out.
+# define GTEST_HAS_GLOBAL_WSTRING \
+    (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING)
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// Determines whether RTTI is available.
+#ifndef GTEST_HAS_RTTI
+// The user didn't tell us whether RTTI is enabled, so we need to
+// figure it out.
+
+# ifdef _MSC_VER
+
+#  ifdef _CPPRTTI  // MSVC defines this macro iff RTTI is enabled.
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+// Starting with version 4.3.2, gcc defines __GXX_RTTI iff RTTI is enabled.
+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302)
+
+#  ifdef __GXX_RTTI
+// When building against STLport with the Android NDK and with
+// -frtti -fno-exceptions, the build fails at link time with undefined
+// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
+// so disable RTTI when detected.
+#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
+       !defined(__EXCEPTIONS)
+#    define GTEST_HAS_RTTI 0
+#   else
+#    define GTEST_HAS_RTTI 1
+#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif  // __GXX_RTTI
+
+// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
+// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
+// first version with C++ support.
+# elif defined(__clang__)
+
+#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
+
+// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
+// both the typeid and dynamic_cast features are present.
+# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
+
+#  ifdef __RTTI_ALL__
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+# else
+
+// For all other compilers, we assume RTTI is enabled.
+#  define GTEST_HAS_RTTI 1
+
+# endif  // _MSC_VER
+
+#endif  // GTEST_HAS_RTTI
+
+// It's this header's responsibility to #include <typeinfo> when RTTI
+// is enabled.
+#if GTEST_HAS_RTTI
+# include <typeinfo>
+#endif
+
+// Determines whether Google Test can use the pthreads library.
+#ifndef GTEST_HAS_PTHREAD
+// The user didn't tell us explicitly, so we assume pthreads support is
+// available on Linux and Mac.
+//
+// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+// to your compiler flags.
+# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
+    || GTEST_OS_QNX)
+#endif  // GTEST_HAS_PTHREAD
+
+#if GTEST_HAS_PTHREAD
+// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
+// true.
+# include <pthread.h>  // NOLINT
+
+// For timespec and nanosleep, used below.
+# include <time.h>  // NOLINT
+#endif
+
+// Determines whether Google Test can use tr1/tuple.  You can define
+// this macro to 0 to prevent Google Test from using tuple (any
+// feature depending on tuple with be disabled in this mode).
+#ifndef GTEST_HAS_TR1_TUPLE
+# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR)
+// STLport, provided with the Android NDK, has neither <tr1/tuple> or <tuple>.
+#  define GTEST_HAS_TR1_TUPLE 0
+# else
+// The user didn't tell us not to do it, so we assume it's OK.
+#  define GTEST_HAS_TR1_TUPLE 1
+# endif
+#endif  // GTEST_HAS_TR1_TUPLE
+
+// Determines whether Google Test's own tr1 tuple implementation
+// should be used.
+#ifndef GTEST_USE_OWN_TR1_TUPLE
+// The user didn't tell us, so we need to figure it out.
+
+// We use our own TR1 tuple if we aren't sure the user has an
+// implementation of it already.  At this time, libstdc++ 4.0.0+ and
+// MSVC 2010 are the only mainstream standard libraries that come
+// with a TR1 tuple implementation.  NVIDIA's CUDA NVCC compiler
+// pretends to be GCC by defining __GNUC__ and friends, but cannot
+// compile GCC's tuple implementation.  MSVC 2008 (9.0) provides TR1
+// tuple in a 323 MB Feature Pack download, which we cannot assume the
+// user has.  QNX's QCC compiler is a modified GCC but it doesn't
+// support TR1 tuple.  libc++ only provides std::tuple, in C++11 mode,
+// and it can be used with some compilers that define __GNUC__.
+# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \
+      && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600
+#  define GTEST_ENV_HAS_TR1_TUPLE_ 1
+# endif
+
+// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
+// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
+// can build with clang but need to use gcc4.2's libstdc++).
+# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
+#  define GTEST_ENV_HAS_STD_TUPLE_ 1
+# endif
+
+# if GTEST_ENV_HAS_TR1_TUPLE_ || GTEST_ENV_HAS_STD_TUPLE_
+#  define GTEST_USE_OWN_TR1_TUPLE 0
+# else
+#  define GTEST_USE_OWN_TR1_TUPLE 1
+# endif
+
+#endif  // GTEST_USE_OWN_TR1_TUPLE
+
+// To avoid conditional compilation everywhere, we make it
+// gtest-port.h's responsibility to #include the header implementing
+// tr1/tuple.
+#if GTEST_HAS_TR1_TUPLE
+
+# if GTEST_USE_OWN_TR1_TUPLE
+#  include "gtest/internal/gtest-tuple.h"
+# elif GTEST_ENV_HAS_STD_TUPLE_
+#  include <tuple>
+// C++11 puts its tuple into the ::std namespace rather than
+// ::std::tr1.  gtest expects tuple to live in ::std::tr1, so put it there.
+// This causes undefined behavior, but supported compilers react in
+// the way we intend.
+namespace std {
+namespace tr1 {
+using ::std::get;
+using ::std::make_tuple;
+using ::std::tuple;
+using ::std::tuple_element;
+using ::std::tuple_size;
+}
+}
+
+# elif GTEST_OS_SYMBIAN
+
+// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
+// use STLport's tuple implementation, which unfortunately doesn't
+// work as the copy of STLport distributed with Symbian is incomplete.
+// By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to
+// use its own tuple implementation.
+#  ifdef BOOST_HAS_TR1_TUPLE
+#   undef BOOST_HAS_TR1_TUPLE
+#  endif  // BOOST_HAS_TR1_TUPLE
+
+// This prevents <boost/tr1/detail/config.hpp>, which defines
+// BOOST_HAS_TR1_TUPLE, from being #included by Boost's <tuple>.
+#  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
+#  include <tuple>
+
+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
+// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
+// not conform to the TR1 spec, which requires the header to be <tuple>.
+
+#  if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
+// Until version 4.3.2, gcc has a bug that causes <tr1/functional>,
+// which is #included by <tr1/tuple>, to not compile when RTTI is
+// disabled.  _TR1_FUNCTIONAL is the header guard for
+// <tr1/functional>.  Hence the following #define is a hack to prevent
+// <tr1/functional> from being included.
+#   define _TR1_FUNCTIONAL 1
+#   include <tr1/tuple>
+#   undef _TR1_FUNCTIONAL  // Allows the user to #include
+                        // <tr1/functional> if he chooses to.
+#  else
+#   include <tr1/tuple>  // NOLINT
+#  endif  // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
+
+# else
+// If the compiler is not GCC 4.0+, we assume the user is using a
+// spec-conforming TR1 implementation.
+#  include <tuple>  // NOLINT
+# endif  // GTEST_USE_OWN_TR1_TUPLE
+
+#endif  // GTEST_HAS_TR1_TUPLE
+
+// Determines whether clone(2) is supported.
+// Usually it will only be available on Linux, excluding
+// Linux on the Itanium architecture.
+// Also see http://linux.die.net/man/2/clone.
+#ifndef GTEST_HAS_CLONE
+// The user didn't tell us, so we need to figure it out.
+
+# if GTEST_OS_LINUX && !defined(__ia64__)
+#  if GTEST_OS_LINUX_ANDROID
+// On Android, clone() is only available on ARM starting with Gingerbread.
+#    if defined(__arm__) && __ANDROID_API__ >= 9
+#     define GTEST_HAS_CLONE 1
+#    else
+#     define GTEST_HAS_CLONE 0
+#    endif
+#  else
+#   define GTEST_HAS_CLONE 1
+#  endif
+# else
+#  define GTEST_HAS_CLONE 0
+# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+
+#endif  // GTEST_HAS_CLONE
+
+// Determines whether to support stream redirection. This is used to test
+// output correctness and to implement death tests.
+#ifndef GTEST_HAS_STREAM_REDIRECTION
+// By default, we assume that stream redirection is supported on all
+// platforms except known mobile ones.
+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN
+#  define GTEST_HAS_STREAM_REDIRECTION 0
+# else
+#  define GTEST_HAS_STREAM_REDIRECTION 1
+# endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Determines whether to support death tests.
+// Google Test does not support death tests for VC 7.1 and earlier as
+// abort() in a VC 7.1 application compiled as GUI in debug config
+// pops up a dialog window that cannot be suppressed programmatically.
+#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+     (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
+     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
+     GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
+     GTEST_OS_OPENBSD || GTEST_OS_QNX)
+# define GTEST_HAS_DEATH_TEST 1
+# include <vector>  // NOLINT
+#endif
+
+// We don't support MSVC 7.1 with exceptions disabled now.  Therefore
+// all the compilers we care about are adequate for supporting
+// value-parameterized tests.
+#define GTEST_HAS_PARAM_TEST 1
+
+// Determines whether to support type-driven tests.
+
+// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
+// Sun Pro CC, IBM Visual Age, and HP aCC support.
+#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__SUNPRO_CC) || \
+    defined(__IBMCPP__) || defined(__HP_aCC)
+# define GTEST_HAS_TYPED_TEST 1
+# define GTEST_HAS_TYPED_TEST_P 1
+#endif
+
+// Determines whether to support Combine(). This only makes sense when
+// value-parameterized tests are enabled.  The implementation doesn't
+// work on Sun Studio since it doesn't understand templated conversion
+// operators.
+#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC)
+# define GTEST_HAS_COMBINE 1
+#endif
+
+// Determines whether the system compiler uses UTF-16 for encoding wide strings.
+#define GTEST_WIDE_STRING_USES_UTF16_ \
+    (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
+
+// Determines whether test results can be streamed to a socket.
+#if GTEST_OS_LINUX
+# define GTEST_CAN_STREAM_RESULTS_ 1
+#endif
+
+// Defines some utility macros.
+
+// The GNU compiler emits a warning if nested "if" statements are followed by
+// an "else" statement and braces are not used to explicitly disambiguate the
+// "else" binding.  This leads to problems with code like:
+//
+//   if (gate)
+//     ASSERT_*(condition) << "Some message";
+//
+// The "switch (0) case 0:" idiom is used to suppress this.
+#ifdef __INTEL_COMPILER
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
+#else
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
+#endif
+
+// Use this annotation at the end of a struct/class definition to
+// prevent the compiler from optimizing away instances that are never
+// used.  This is useful when all interesting logic happens inside the
+// c'tor and / or d'tor.  Example:
+//
+//   struct Foo {
+//     Foo() { ... }
+//   } GTEST_ATTRIBUTE_UNUSED_;
+//
+// Also use it after a variable or parameter declaration to tell the
+// compiler the variable/parameter does not have to be used.
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+#else
+# define GTEST_ATTRIBUTE_UNUSED_
+#endif
+
+// A macro to disallow operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_ASSIGN_(type)\
+  void operator=(type const &)
+
+// A macro to disallow copy constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\
+  type(type const &);\
+  GTEST_DISALLOW_ASSIGN_(type)
+
+// Tell the compiler to warn about unused return values for functions declared
+// with this macro.  The macro should be used on function declarations
+// following the argument list:
+//
+//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
+#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && !defined(COMPILER_ICC)
+# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
+#else
+# define GTEST_MUST_USE_RESULT_
+#endif  // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC
+
+#if GTEST_LANG_CXX11
+# define GTEST_MOVE_(x) ::std::move(x)  // NOLINT
+#else
+# define GTEST_MOVE_(x) x
+#endif
+
+// MS C++ compiler emits warning when a conditional expression is compile time
+// constant. In some contexts this warning is false positive and needs to be
+// suppressed. Use the following two macros in such cases:
+//
+// GTEST_INTENTIONAL_CONST_COND_PUSH_
+// while (true) {
+// GTEST_INTENTIONAL_CONST_COND_POP_
+// }
+#if defined(_MSC_VER)
+# define GTEST_INTENTIONAL_CONST_COND_PUSH_ \
+    __pragma(warning(push)) \
+    __pragma(warning(disable: 4127))
+# define GTEST_INTENTIONAL_CONST_COND_POP_ \
+    __pragma(warning(pop))
+#else
+# define GTEST_INTENTIONAL_CONST_COND_PUSH_
+# define GTEST_INTENTIONAL_CONST_COND_POP_
+#endif
+
+// Determine whether the compiler supports Microsoft's Structured Exception
+// Handling.  This is supported by several Windows compilers but generally
+// does not exist on any other system.
+#ifndef GTEST_HAS_SEH
+// The user didn't tell us, so we need to figure it out.
+
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// These two compilers are known to support SEH.
+#  define GTEST_HAS_SEH 1
+# else
+// Assume no SEH.
+#  define GTEST_HAS_SEH 0
+# endif
+
+#endif  // GTEST_HAS_SEH
+
+#ifdef _MSC_VER
+
+# if GTEST_LINKED_AS_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllimport)
+# elif GTEST_CREATE_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllexport)
+# endif
+
+#endif  // _MSC_VER
+
+#ifndef GTEST_API_
+# define GTEST_API_
+#endif
+
+#ifdef __GNUC__
+// Ask the compiler to never inline a given function.
+# define GTEST_NO_INLINE_ __attribute__((noinline))
+#else
+# define GTEST_NO_INLINE_
+#endif
+
+// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
+#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
+# define GTEST_HAS_CXXABI_H_ 1
+#else
+# define GTEST_HAS_CXXABI_H_ 0
+#endif
+
+// A function level attribute to disable checking for use of uninitialized
+// memory when built with MemorySanitizer.
+#if defined(__clang__)
+# if __has_feature(memory_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
+       __attribute__((no_sanitize_memory))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+# endif  // __has_feature(memory_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif  // __clang__
+
+// A function level attribute to disable AddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(address_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
+       __attribute__((no_sanitize_address))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+# endif  // __has_feature(address_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif  // __clang__
+
+namespace testing {
+
+class Message;
+
+namespace internal {
+
+// A secret type that Google Test users don't know about.  It has no
+// definition on purpose.  Therefore it's impossible to create a
+// Secret object, which is what we want.
+class Secret;
+
+// The GTEST_COMPILE_ASSERT_ macro can be used to verify that a compile time
+// expression is true. For example, you could use it to verify the
+// size of a static array:
+//
+//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
+//                         names_incorrect_size);
+//
+// or to make sure a struct is smaller than a certain size:
+//
+//   GTEST_COMPILE_ASSERT_(sizeof(foo) < 128, foo_too_large);
+//
+// The second argument to the macro is the name of the variable. If
+// the expression is false, most compilers will issue a warning/error
+// containing the name of the variable.
+
+template <bool>
+struct CompileAssert {
+};
+
+#define GTEST_COMPILE_ASSERT_(expr, msg) \
+  typedef ::testing::internal::CompileAssert<(static_cast<bool>(expr))> \
+      msg[static_cast<bool>(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_
+
+// Implementation details of GTEST_COMPILE_ASSERT_:
+//
+// - GTEST_COMPILE_ASSERT_ works by defining an array type that has -1
+//   elements (and thus is invalid) when the expression is false.
+//
+// - The simpler definition
+//
+//    #define GTEST_COMPILE_ASSERT_(expr, msg) typedef char msg[(expr) ? 1 : -1]
+//
+//   does not work, as gcc supports variable-length arrays whose sizes
+//   are determined at run-time (this is gcc's extension and not part
+//   of the C++ standard).  As a result, gcc fails to reject the
+//   following code with the simple definition:
+//
+//     int foo;
+//     GTEST_COMPILE_ASSERT_(foo, msg); // not supposed to compile as foo is
+//                                      // not a compile-time constant.
+//
+// - By using the type CompileAssert<(bool(expr))>, we ensures that
+//   expr is a compile-time constant.  (Template arguments must be
+//   determined at compile-time.)
+//
+// - The outter parentheses in CompileAssert<(bool(expr))> are necessary
+//   to work around a bug in gcc 3.4.4 and 4.0.1.  If we had written
+//
+//     CompileAssert<bool(expr)>
+//
+//   instead, these compilers will refuse to compile
+//
+//     GTEST_COMPILE_ASSERT_(5 > 0, some_message);
+//
+//   (They seem to think the ">" in "5 > 0" marks the end of the
+//   template argument list.)
+//
+// - The array size is (bool(expr) ? 1 : -1), instead of simply
+//
+//     ((expr) ? 1 : -1).
+//
+//   This is to avoid running into a bug in MS VC 7.1, which
+//   causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
+
+// StaticAssertTypeEqHelper is used by StaticAssertTypeEq defined in gtest.h.
+//
+// This template is declared, but intentionally undefined.
+template <typename T1, typename T2>
+struct StaticAssertTypeEqHelper;
+
+template <typename T>
+struct StaticAssertTypeEqHelper<T, T> {};
+
+// Evaluates to the number of elements in 'array'.
+#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0]))
+
+#if GTEST_HAS_GLOBAL_STRING
+typedef ::string string;
+#else
+typedef ::std::string string;
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+typedef ::wstring wstring;
+#elif GTEST_HAS_STD_WSTRING
+typedef ::std::wstring wstring;
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// A helper for suppressing warnings on constant condition.  It just
+// returns 'condition'.
+GTEST_API_ bool IsTrue(bool condition);
+
+// Defines scoped_ptr.
+
+// This implementation of scoped_ptr is PARTIAL - it only contains
+// enough stuff to satisfy Google Test's need.
+template <typename T>
+class scoped_ptr {
+ public:
+  typedef T element_type;
+
+  explicit scoped_ptr(T* p = NULL) : ptr_(p) {}
+  ~scoped_ptr() { reset(); }
+
+  T& operator*() const { return *ptr_; }
+  T* operator->() const { return ptr_; }
+  T* get() const { return ptr_; }
+
+  T* release() {
+    T* const ptr = ptr_;
+    ptr_ = NULL;
+    return ptr;
+  }
+
+  void reset(T* p = NULL) {
+    if (p != ptr_) {
+      if (IsTrue(sizeof(T) > 0)) {  // Makes sure T is a complete type.
+        delete ptr_;
+      }
+      ptr_ = p;
+    }
+  }
+
+ private:
+  T* ptr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(scoped_ptr);
+};
+
+// Defines RE.
+
+// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
+// Regular Expression syntax.
+class GTEST_API_ RE {
+ public:
+  // A copy constructor is required by the Standard to initialize object
+  // references from r-values.
+  RE(const RE& other) { Init(other.pattern()); }
+
+  // Constructs an RE from a string.
+  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+#if GTEST_HAS_GLOBAL_STRING
+
+  RE(const ::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  RE(const char* regex) { Init(regex); }  // NOLINT
+  ~RE();
+
+  // Returns the string representation of the regex.
+  const char* pattern() const { return pattern_; }
+
+  // FullMatch(str, re) returns true iff regular expression re matches
+  // the entire str.
+  // PartialMatch(str, re) returns true iff regular expression re
+  // matches a substring of str (including str itself).
+  //
+  // TODO(wan@google.com): make FullMatch() and PartialMatch() work
+  // when str contains NUL characters.
+  static bool FullMatch(const ::std::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::std::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+#if GTEST_HAS_GLOBAL_STRING
+
+  static bool FullMatch(const ::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  static bool FullMatch(const char* str, const RE& re);
+  static bool PartialMatch(const char* str, const RE& re);
+
+ private:
+  void Init(const char* regex);
+
+  // We use a const char* instead of an std::string, as Google Test used to be
+  // used where std::string is not available.  TODO(wan@google.com): change to
+  // std::string.
+  const char* pattern_;
+  bool is_valid_;
+
+#if GTEST_USES_POSIX_RE
+
+  regex_t full_regex_;     // For FullMatch().
+  regex_t partial_regex_;  // For PartialMatch().
+
+#else  // GTEST_USES_SIMPLE_RE
+
+  const char* full_pattern_;  // For FullMatch();
+
+#endif
+
+  GTEST_DISALLOW_ASSIGN_(RE);
+};
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
+                                                               int line);
+
+// Defines logging utilities:
+//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
+//                          message itself is streamed into the macro.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+
+enum GTestLogSeverity {
+  GTEST_INFO,
+  GTEST_WARNING,
+  GTEST_ERROR,
+  GTEST_FATAL
+};
+
+// Formats log entry severity, provides a stream object for streaming the
+// log message, and terminates the message with a newline when going out of
+// scope.
+class GTEST_API_ GTestLog {
+ public:
+  GTestLog(GTestLogSeverity severity, const char* file, int line);
+
+  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+  ~GTestLog();
+
+  ::std::ostream& GetStream() { return ::std::cerr; }
+
+ private:
+  const GTestLogSeverity severity_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
+};
+
+#define GTEST_LOG_(severity) \
+    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
+                                  __FILE__, __LINE__).GetStream()
+
+inline void LogToStderr() {}
+inline void FlushInfoLog() { fflush(NULL); }
+
+// INTERNAL IMPLEMENTATION - DO NOT USE.
+//
+// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
+// is not satisfied.
+//  Synopsys:
+//    GTEST_CHECK_(boolean_condition);
+//     or
+//    GTEST_CHECK_(boolean_condition) << "Additional message";
+//
+//    This checks the condition and if the condition is not satisfied
+//    it prints message about the condition violation, including the
+//    condition itself, plus additional message streamed into it, if any,
+//    and then it aborts the program. It aborts the program irrespective of
+//    whether it is built in the debug mode or not.
+#define GTEST_CHECK_(condition) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::IsTrue(condition)) \
+      ; \
+    else \
+      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
+
+// An all-mode assert to verify that the given POSIX-style function
+// call returns 0 (indicating success).  Known limitation: this
+// doesn't expand to a balanced 'if' statement, so enclose the macro
+// in {} if you need to use it as the only statement in an 'if'
+// branch.
+#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
+  if (const int gtest_error = (posix_call)) \
+    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
+                      << gtest_error
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Use ImplicitCast_ as a safe version of static_cast for upcasting in
+// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
+// const Foo*).  When you use ImplicitCast_, the compiler checks that
+// the cast is safe.  Such explicit ImplicitCast_s are necessary in
+// surprisingly many situations where C++ demands an exact type match
+// instead of an argument type convertable to a target type.
+//
+// The syntax for using ImplicitCast_ is the same as for static_cast:
+//
+//   ImplicitCast_<ToType>(expr)
+//
+// ImplicitCast_ would have been part of the C++ standard library,
+// but the proposal was submitted too late.  It will probably make
+// its way into the language in the future.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., implicit_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To>
+inline To ImplicitCast_(To x) { return x; }
+
+// When you upcast (that is, cast a pointer from type Foo to type
+// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
+// always succeed.  When you downcast (that is, cast a pointer from
+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
+// how do you know the pointer is really of type SubclassOfFoo?  It
+// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
+// when you downcast, you should use this macro.  In debug mode, we
+// use dynamic_cast<> to double-check the downcast is legal (we die
+// if it's not).  In normal mode, we do the efficient static_cast<>
+// instead.  Thus, it's important to test in debug mode to make sure
+// the cast is legal!
+//    This is the only place in the code we should use dynamic_cast<>.
+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
+// do RTTI (eg code like this:
+//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
+//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
+// You should design the code some other way not to need this.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., down_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
+inline To DownCast_(From* f) {  // so we only accept pointers
+  // Ensures that To is a sub-type of From *.  This test is here only
+  // for compile-time type checking, and has no overhead in an
+  // optimized build at run-time, as it will be optimized away
+  // completely.
+  GTEST_INTENTIONAL_CONST_COND_PUSH_
+  if (false) {
+  GTEST_INTENTIONAL_CONST_COND_POP_
+    const To to = NULL;
+    ::testing::internal::ImplicitCast_<From*>(to);
+  }
+
+#if GTEST_HAS_RTTI
+  // RTTI: debug mode only!
+  GTEST_CHECK_(f == NULL || dynamic_cast<To>(f) != NULL);
+#endif
+  return static_cast<To>(f);
+}
+
+// Downcasts the pointer of type Base to Derived.
+// Derived must be a subclass of Base. The parameter MUST
+// point to a class of type Derived, not any subclass of it.
+// When RTTI is available, the function performs a runtime
+// check to enforce this.
+template <class Derived, class Base>
+Derived* CheckedDowncastToActualType(Base* base) {
+#if GTEST_HAS_RTTI
+  GTEST_CHECK_(typeid(*base) == typeid(Derived));
+  return dynamic_cast<Derived*>(base);  // NOLINT
+#else
+  return static_cast<Derived*>(base);  // Poor man's downcast.
+#endif
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Defines the stderr capturer:
+//   CaptureStdout     - starts capturing stdout.
+//   GetCapturedStdout - stops capturing stdout and returns the captured string.
+//   CaptureStderr     - starts capturing stderr.
+//   GetCapturedStderr - stops capturing stderr and returns the captured string.
+//
+GTEST_API_ void CaptureStdout();
+GTEST_API_ std::string GetCapturedStdout();
+GTEST_API_ void CaptureStderr();
+GTEST_API_ std::string GetCapturedStderr();
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+
+#if GTEST_HAS_DEATH_TEST
+
+const ::std::vector<testing::internal::string>& GetInjectableArgvs();
+void SetInjectableArgvs(const ::std::vector<testing::internal::string>*
+                             new_argvs);
+
+// A copy of all command line arguments.  Set by InitGoogleTest().
+extern ::std::vector<testing::internal::string> g_argvs;
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Defines synchronization primitives.
+
+#if GTEST_HAS_PTHREAD
+
+// Sleeps for (roughly) n milli-seconds.  This function is only for
+// testing Google Test's own constructs.  Don't use it in user tests,
+// either directly or indirectly.
+inline void SleepMilliseconds(int n) {
+  const timespec time = {
+    0,                  // 0 seconds.
+    n * 1000L * 1000L,  // And n ms.
+  };
+  nanosleep(&time, NULL);
+}
+
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class Notification {
+ public:
+  Notification() : notified_(false) {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
+  }
+  ~Notification() {
+    pthread_mutex_destroy(&mutex_);
+  }
+
+  // Notifies all threads created with this notification to start. Must
+  // be called from the controller thread.
+  void Notify() {
+    pthread_mutex_lock(&mutex_);
+    notified_ = true;
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  // Blocks until the controller thread notifies. Must be called from a test
+  // thread.
+  void WaitForNotification() {
+    for (;;) {
+      pthread_mutex_lock(&mutex_);
+      const bool notified = notified_;
+      pthread_mutex_unlock(&mutex_);
+      if (notified)
+        break;
+      SleepMilliseconds(10);
+    }
+  }
+
+ private:
+  pthread_mutex_t mutex_;
+  bool notified_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+
+// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
+// Consequently, it cannot select a correct instantiation of ThreadWithParam
+// in order to call its Run(). Introducing ThreadWithParamBase as a
+// non-templated base class for ThreadWithParam allows us to bypass this
+// problem.
+class ThreadWithParamBase {
+ public:
+  virtual ~ThreadWithParamBase() {}
+  virtual void Run() = 0;
+};
+
+// pthread_create() accepts a pointer to a function type with the C linkage.
+// According to the Standard (7.5/1), function types with different linkages
+// are different even if they are otherwise identical.  Some compilers (for
+// example, SunStudio) treat them as different types.  Since class methods
+// cannot be defined with C-linkage we need to define a free C-function to
+// pass into pthread_create().
+extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
+  static_cast<ThreadWithParamBase*>(thread)->Run();
+  return NULL;
+}
+
+// Helper class for testing Google Test's multi-threading constructs.
+// To use it, write:
+//
+//   void ThreadFunc(int param) { /* Do things with param */ }
+//   Notification thread_can_start;
+//   ...
+//   // The thread_can_start parameter is optional; you can supply NULL.
+//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
+//   thread_can_start.Notify();
+//
+// These classes are only for testing Google Test's own constructs. Do
+// not use them in user tests, either directly or indirectly.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void (*UserThreadFunc)(T);
+
+  ThreadWithParam(
+      UserThreadFunc func, T param, Notification* thread_can_start)
+      : func_(func),
+        param_(param),
+        thread_can_start_(thread_can_start),
+        finished_(false) {
+    ThreadWithParamBase* const base = this;
+    // The thread can be created only after all fields except thread_
+    // have been initialized.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_create(&thread_, 0, &ThreadFuncWithCLinkage, base));
+  }
+  ~ThreadWithParam() { Join(); }
+
+  void Join() {
+    if (!finished_) {
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, 0));
+      finished_ = true;
+    }
+  }
+
+  virtual void Run() {
+    if (thread_can_start_ != NULL)
+      thread_can_start_->WaitForNotification();
+    func_(param_);
+  }
+
+ private:
+  const UserThreadFunc func_;  // User-supplied thread function.
+  const T param_;  // User-supplied parameter to the thread function.
+  // When non-NULL, used to block execution until the controller thread
+  // notifies.
+  Notification* const thread_can_start_;
+  bool finished_;  // true iff we know that the thread function has finished.
+  pthread_t thread_;  // The native thread object.
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+
+// MutexBase and Mutex implement mutex on pthreads-based platforms. They
+// are used in conjunction with class MutexLock:
+//
+//   Mutex mutex;
+//   ...
+//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the end
+//                            // of the current scope.
+//
+// MutexBase implements behavior for both statically and dynamically
+// allocated mutexes.  Do not use MutexBase directly.  Instead, write
+// the following to define a static mutex:
+//
+//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
+//
+// You can forward declare a static mutex like this:
+//
+//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
+//
+// To create a dynamic mutex, just define an object of type Mutex.
+class MutexBase {
+ public:
+  // Acquires this mutex.
+  void Lock() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
+    owner_ = pthread_self();
+    has_owner_ = true;
+  }
+
+  // Releases this mutex.
+  void Unlock() {
+    // Since the lock is being released the owner_ field should no longer be
+    // considered valid. We don't protect writing to has_owner_ here, as it's
+    // the caller's responsibility to ensure that the current thread holds the
+    // mutex when this is called.
+    has_owner_ = false;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
+  }
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld() const {
+    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
+        << "The current thread is not holding the mutex @" << this;
+  }
+
+  // A static mutex may be used before main() is entered.  It may even
+  // be used before the dynamic initialization stage.  Therefore we
+  // must be able to initialize a static mutex object at link time.
+  // This means MutexBase has to be a POD and its member variables
+  // have to be public.
+ public:
+  pthread_mutex_t mutex_;  // The underlying pthread mutex.
+  // has_owner_ indicates whether the owner_ field below contains a valid thread
+  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
+  // accesses to the owner_ field should be protected by a check of this field.
+  // An alternative might be to memset() owner_ to all zeros, but there's no
+  // guarantee that a zero'd pthread_t is necessarily invalid or even different
+  // from pthread_self().
+  bool has_owner_;
+  pthread_t owner_;  // The thread holding the mutex.
+};
+
+// Forward-declares a static mutex.
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+    extern ::testing::internal::MutexBase mutex
+
+// Defines and statically (i.e. at link time) initializes a static mutex.
+// The initialization list here does not explicitly initialize each field,
+// instead relying on default initialization for the unspecified fields. In
+// particular, the owner_ field (a pthread_t) is not explicitly initialized.
+// This allows initialization to work whether pthread_t is a scalar or struct.
+// The flag -Wmissing-field-initializers must not be specified for this to work.
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+    ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
+
+// The Mutex class can only be used for mutexes created at runtime. It
+// shares its API with MutexBase otherwise.
+class Mutex : public MutexBase {
+ public:
+  Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
+    has_owner_ = false;
+  }
+  ~Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+// We cannot name this class MutexLock as the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms.  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(MutexBase* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  MutexBase* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Helpers for ThreadLocal.
+
+// pthread_key_create() requires DeleteThreadLocalValue() to have
+// C-linkage.  Therefore it cannot be templatized to access
+// ThreadLocal<T>.  Hence the need for class
+// ThreadLocalValueHolderBase.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Called by pthread to delete thread-local data stored by
+// pthread_setspecific().
+extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
+  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
+}
+
+// Implements thread-local storage on pthreads-based systems.
+//
+//   // Thread 1
+//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
+//
+//   // Thread 2
+//   tl.set(150);  // Changes the value for thread 2 only.
+//   EXPECT_EQ(150, tl.get());
+//
+//   // Thread 1
+//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
+//   tl.set(200);
+//   EXPECT_EQ(200, tl.get());
+//
+// The template type argument T must have a public copy constructor.
+// In addition, the default ThreadLocal constructor requires T to have
+// a public default constructor.
+//
+// An object managed for a thread by a ThreadLocal instance is deleted
+// when the thread exits.  Or, if the ThreadLocal instance dies in
+// that thread, when the ThreadLocal dies.  It's the user's
+// responsibility to ensure that all other threads using a ThreadLocal
+// have exited when it dies, or the per-thread objects for those
+// threads will not be deleted.
+//
+// Google Test only uses global ThreadLocal objects.  That means they
+// will die after main() has returned.  Therefore, no per-thread
+// object managed by Google Test will be leaked as long as all threads
+// using Google Test have exited when main() returns.
+template <typename T>
+class ThreadLocal {
+ public:
+  ThreadLocal() : key_(CreateKey()),
+                  default_() {}
+  explicit ThreadLocal(const T& value) : key_(CreateKey()),
+                                         default_(value) {}
+
+  ~ThreadLocal() {
+    // Destroys the managed object for the current thread, if any.
+    DeleteThreadLocalValue(pthread_getspecific(key_));
+
+    // Releases resources associated with the key.  This will *not*
+    // delete managed objects for other threads.
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
+  }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of type T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+  static pthread_key_t CreateKey() {
+    pthread_key_t key;
+    // When a thread exits, DeleteThreadLocalValue() will be called on
+    // the object managed for that thread.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_key_create(&key, &DeleteThreadLocalValue));
+    return key;
+  }
+
+  T* GetOrCreateValue() const {
+    ThreadLocalValueHolderBase* const holder =
+        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
+    if (holder != NULL) {
+      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
+    }
+
+    ValueHolder* const new_holder = new ValueHolder(default_);
+    ThreadLocalValueHolderBase* const holder_base = new_holder;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
+    return new_holder->pointer();
+  }
+
+  // A key pthreads uses for looking up per-thread values.
+  const pthread_key_t key_;
+  const T default_;  // The default value for each thread.
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# define GTEST_IS_THREADSAFE 1
+
+#else  // GTEST_HAS_PTHREAD
+
+// A dummy implementation of synchronization primitives (mutex, lock,
+// and thread-local variable).  Necessary for compiling Google Test where
+// mutex is not supported - using Google Test in multiple threads is not
+// supported on such platforms.
+
+class Mutex {
+ public:
+  Mutex() {}
+  void Lock() {}
+  void Unlock() {}
+  void AssertHeld() const {}
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
+
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex*) {}  // NOLINT
+};
+
+typedef GTestMutexLock MutexLock;
+
+template <typename T>
+class ThreadLocal {
+ public:
+  ThreadLocal() : value_() {}
+  explicit ThreadLocal(const T& value) : value_(value) {}
+  T* pointer() { return &value_; }
+  const T* pointer() const { return &value_; }
+  const T& get() const { return value_; }
+  void set(const T& value) { value_ = value; }
+ private:
+  T value_;
+};
+
+// The above synchronization primitives have dummy implementations.
+// Therefore Google Test is not thread-safe.
+# define GTEST_IS_THREADSAFE 0
+
+#endif  // GTEST_HAS_PTHREAD
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+GTEST_API_ size_t GetThreadCount();
+
+// Passing non-POD classes through ellipsis (...) crashes the ARM
+// compiler and generates a warning in Sun Studio.  The Nokia Symbian
+// and the IBM XL C/C++ compiler try to instantiate a copy constructor
+// for objects passed through ellipsis (...), failing for uncopyable
+// objects.  We define this to ensure that only POD is passed through
+// ellipsis on these systems.
+#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
+// We lose support for NULL detection where the compiler doesn't like
+// passing non-POD classes through ellipsis (...).
+# define GTEST_ELLIPSIS_NEEDS_POD_ 1
+#else
+# define GTEST_CAN_COMPARE_NULL 1
+#endif
+
+// The Nokia Symbian and IBM XL C/C++ compilers cannot decide between
+// const T& and const T* in a function template.  These compilers
+// _can_ decide between class template specializations for T and T*,
+// so a tr1::type_traits-like is_pointer works.
+#if defined(__SYMBIAN32__) || defined(__IBMCPP__)
+# define GTEST_NEEDS_IS_POINTER_ 1
+#endif
+
+template <bool bool_value>
+struct bool_constant {
+  typedef bool_constant<bool_value> type;
+  static const bool value = bool_value;
+};
+template <bool bool_value> const bool bool_constant<bool_value>::value;
+
+typedef bool_constant<false> false_type;
+typedef bool_constant<true> true_type;
+
+template <typename T>
+struct is_pointer : public false_type {};
+
+template <typename T>
+struct is_pointer<T*> : public true_type {};
+
+template <typename Iterator>
+struct IteratorTraits {
+  typedef typename Iterator::value_type value_type;
+};
+
+template <typename T>
+struct IteratorTraits<T*> {
+  typedef T value_type;
+};
+
+template <typename T>
+struct IteratorTraits<const T*> {
+  typedef T value_type;
+};
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_SEP_ "\\"
+# define GTEST_HAS_ALT_PATH_SEP_ 1
+// The biggest signed integer type the compiler supports.
+typedef __int64 BiggestInt;
+#else
+# define GTEST_PATH_SEP_ "/"
+# define GTEST_HAS_ALT_PATH_SEP_ 0
+typedef long long BiggestInt;  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+// Utilities for char.
+
+// isspace(int ch) and friends accept an unsigned char or EOF.  char
+// may be signed, depending on the compiler (or compiler flags).
+// Therefore we need to cast a char to unsigned char before calling
+// isspace(), etc.
+
+inline bool IsAlpha(char ch) {
+  return isalpha(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsAlNum(char ch) {
+  return isalnum(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsDigit(char ch) {
+  return isdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsLower(char ch) {
+  return islower(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsSpace(char ch) {
+  return isspace(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsUpper(char ch) {
+  return isupper(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(char ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(wchar_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+
+inline char ToLower(char ch) {
+  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+}
+inline char ToUpper(char ch) {
+  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
+}
+
+// The testing::internal::posix namespace holds wrappers for common
+// POSIX functions.  These wrappers hide the differences between
+// Windows/MSVC and POSIX systems.  Since some compilers define these
+// standard functions as macros, the wrapper cannot have the same name
+// as the wrapped function.
+
+namespace posix {
+
+// Functions with a different name on Windows.
+
+#if GTEST_OS_WINDOWS
+
+typedef struct _stat StatStruct;
+
+# ifdef __BORLANDC__
+inline int IsATTY(int fd) { return isatty(fd); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+# else  // !__BORLANDC__
+#  if GTEST_OS_WINDOWS_MOBILE
+inline int IsATTY(int /* fd */) { return 0; }
+#  else
+inline int IsATTY(int fd) { return _isatty(fd); }
+#  endif  // GTEST_OS_WINDOWS_MOBILE
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return _stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return _strdup(src); }
+# endif  // __BORLANDC__
+
+# if GTEST_OS_WINDOWS_MOBILE
+inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
+// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
+// time and thus not defined there.
+# else
+inline int FileNo(FILE* file) { return _fileno(file); }
+inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
+inline int RmDir(const char* dir) { return _rmdir(dir); }
+inline bool IsDir(const StatStruct& st) {
+  return (_S_IFDIR & st.st_mode) != 0;
+}
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+#else
+
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int IsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#endif  // GTEST_OS_WINDOWS
+
+// Functions deprecated by MSVC 8.0.
+
+#ifdef _MSC_VER
+// Temporarily disable warning 4996 (deprecated function).
+# pragma warning(push)
+# pragma warning(disable:4996)
+#endif
+
+inline const char* StrNCpy(char* dest, const char* src, size_t n) {
+  return strncpy(dest, src, n);
+}
+
+// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
+// StrError() aren't needed on Windows CE at this time and thus not
+// defined there.
+
+#if !GTEST_OS_WINDOWS_MOBILE
+inline int ChDir(const char* dir) { return chdir(dir); }
+#endif
+inline FILE* FOpen(const char* path, const char* mode) {
+  return fopen(path, mode);
+}
+#if !GTEST_OS_WINDOWS_MOBILE
+inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
+  return freopen(path, mode, stream);
+}
+inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
+#endif
+inline int FClose(FILE* fp) { return fclose(fp); }
+#if !GTEST_OS_WINDOWS_MOBILE
+inline int Read(int fd, void* buf, unsigned int count) {
+  return static_cast<int>(read(fd, buf, count));
+}
+inline int Write(int fd, const void* buf, unsigned int count) {
+  return static_cast<int>(write(fd, buf, count));
+}
+inline int Close(int fd) { return close(fd); }
+inline const char* StrError(int errnum) { return strerror(errnum); }
+#endif
+inline const char* GetEnv(const char* name) {
+#if GTEST_OS_WINDOWS_MOBILE
+  // We are on Windows CE, which has no environment variables.
+  return NULL;
+#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+  // Environment variables which we programmatically clear will be set to the
+  // empty string rather than unset (NULL).  Handle that case.
+  const char* const env = getenv(name);
+  return (env != NULL && env[0] != '\0') ? env : NULL;
+#else
+  return getenv(name);
+#endif
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)  // Restores the warning state.
+#endif
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Windows CE has no C library. The abort() function is used in
+// several places in Google Test. This implementation provides a reasonable
+// imitation of standard behaviour.
+void Abort();
+#else
+inline void Abort() { abort(); }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+}  // namespace posix
+
+// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
+// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
+// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
+// function in order to achieve that.  We use macro definition here because
+// snprintf is a variadic function.
+#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
+// MSVC 2005 and above support variadic macros.
+# define GTEST_SNPRINTF_(buffer, size, format, ...) \
+     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
+#elif defined(_MSC_VER)
+// Windows CE does not define _snprintf_s and MSVC prior to 2005 doesn't
+// complain about _snprintf.
+# define GTEST_SNPRINTF_ _snprintf
+#else
+# define GTEST_SNPRINTF_ snprintf
+#endif
+
+// The maximum number a BiggestInt can represent.  This definition
+// works no matter BiggestInt is represented in one's complement or
+// two's complement.
+//
+// We cannot rely on numeric_limits in STL, as __int64 and long long
+// are not part of standard C++ and numeric_limits doesn't need to be
+// defined for them.
+const BiggestInt kMaxBiggestInt =
+    ~(static_cast<BiggestInt>(1) << (8*sizeof(BiggestInt) - 1));
+
+// This template class serves as a compile-time function from size to
+// type.  It maps a size in bytes to a primitive type with that
+// size. e.g.
+//
+//   TypeWithSize<4>::UInt
+//
+// is typedef-ed to be unsigned int (unsigned integer made up of 4
+// bytes).
+//
+// Such functionality should belong to STL, but I cannot find it
+// there.
+//
+// Google Test uses this class in the implementation of floating-point
+// comparison.
+//
+// For now it only handles UInt (unsigned int) as that's all Google Test
+// needs.  Other types can be easily added in the future if need
+// arises.
+template <size_t size>
+class TypeWithSize {
+ public:
+  // This prevents the user from using TypeWithSize<N> with incorrect
+  // values of N.
+  typedef void UInt;
+};
+
+// The specialization for size 4.
+template <>
+class TypeWithSize<4> {
+ public:
+  // unsigned int has size 4 in both gcc and MSVC.
+  //
+  // As base/basictypes.h doesn't compile on Windows, we cannot use
+  // uint32, uint64, and etc here.
+  typedef int Int;
+  typedef unsigned int UInt;
+};
+
+// The specialization for size 8.
+template <>
+class TypeWithSize<8> {
+ public:
+#if GTEST_OS_WINDOWS
+  typedef __int64 Int;
+  typedef unsigned __int64 UInt;
+#else
+  typedef long long Int;  // NOLINT
+  typedef unsigned long long UInt;  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+};
+
+// Integer types of known sizes.
+typedef TypeWithSize<4>::Int Int32;
+typedef TypeWithSize<4>::UInt UInt32;
+typedef TypeWithSize<8>::Int Int64;
+typedef TypeWithSize<8>::UInt UInt64;
+typedef TypeWithSize<8>::Int TimeInMillis;  // Represents time in milliseconds.
+
+// Utilities for command line flags and environment variables.
+
+// Macro for referencing flags.
+#define GTEST_FLAG(name) FLAGS_gtest_##name
+
+// Macros for declaring flags.
+#define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
+#define GTEST_DECLARE_int32_(name) \
+    GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name)
+#define GTEST_DECLARE_string_(name) \
+    GTEST_API_ extern ::std::string GTEST_FLAG(name)
+
+// Macros for defining flags.
+#define GTEST_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
+#define GTEST_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val)
+#define GTEST_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
+
+// Thread annotations
+#define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+#define GTEST_LOCK_EXCLUDED_(locks)
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
+// to *value and returns true; otherwise leaves *value unchanged and returns
+// false.
+// TODO(chandlerc): Find a better way to refactor flag and environment parsing
+// out of both gtest-port.cc and gtest.cc to avoid exporting this utility
+// function.
+bool ParseInt32(const Message& src_text, const char* str, Int32* value);
+
+// Parses a bool/Int32/string from the environment variable
+// corresponding to the given Google Test flag.
+bool BoolFromGTestEnv(const char* flag, bool default_val);
+GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val);
+const char* StringFromGTestEnv(const char* flag, const char* default_val);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-string.h b/Externals/gtest/include/gtest/internal/gtest-string.h
new file mode 100644
index 0000000000..97f1a7fdd2
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-string.h
@@ -0,0 +1,167 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file declares the String class and functions used internally by
+// Google Test.  They are subject to change without notice. They should not used
+// by code external to Google Test.
+//
+// This header file is #included by <gtest/internal/gtest-internal.h>.
+// It should not be #included by other files.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+
+#ifdef __BORLANDC__
+// string.h is not guaranteed to provide strcpy on C++ Builder.
+# include <mem.h>
+#endif
+
+#include <string.h>
+#include <string>
+
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// String - an abstract class holding static string utilities.
+class GTEST_API_ String {
+ public:
+  // Static utility methods
+
+  // Clones a 0-terminated C string, allocating memory using new.  The
+  // caller is responsible for deleting the return value using
+  // delete[].  Returns the cloned string, or NULL if the input is
+  // NULL.
+  //
+  // This is different from strdup() in string.h, which allocates
+  // memory using malloc().
+  static const char* CloneCString(const char* c_str);
+
+#if GTEST_OS_WINDOWS_MOBILE
+  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
+  // able to pass strings to Win32 APIs on CE we need to convert them
+  // to 'Unicode', UTF-16.
+
+  // Creates a UTF-16 wide string from the given ANSI string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the wide string, or NULL if the
+  // input is NULL.
+  //
+  // The wide string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static LPCWSTR AnsiToUtf16(const char* c_str);
+
+  // Creates an ANSI string from the given wide string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the ANSI string, or NULL if the
+  // input is NULL.
+  //
+  // The returned string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
+#endif
+
+  // Compares two C strings.  Returns true iff they have the same content.
+  //
+  // Unlike strcmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CStringEquals(const char* lhs, const char* rhs);
+
+  // Converts a wide C string to a String using the UTF-8 encoding.
+  // NULL will be converted to "(null)".  If an error occurred during
+  // the conversion, "(failed to convert from wide string)" is
+  // returned.
+  static std::string ShowWideCString(const wchar_t* wide_c_str);
+
+  // Compares two wide C strings.  Returns true iff they have the same
+  // content.
+  //
+  // Unlike wcscmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
+
+  // Compares two C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike strcasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CaseInsensitiveCStringEquals(const char* lhs,
+                                           const char* rhs);
+
+  // Compares two wide C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                               const wchar_t* rhs);
+
+  // Returns true iff the given string ends with the given suffix, ignoring
+  // case. Any string is considered to end with an empty suffix.
+  static bool EndsWithCaseInsensitive(
+      const std::string& str, const std::string& suffix);
+
+  // Formats an int value as "%02d".
+  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
+
+  // Formats an int value as "%X".
+  static std::string FormatHexInt(int value);
+
+  // Formats a byte as "%02X".
+  static std::string FormatByte(unsigned char value);
+
+ private:
+  String();  // Not meant to be instantiated.
+};  // class String
+
+// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
+// character in the buffer is replaced with "\\0".
+GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-tuple.h b/Externals/gtest/include/gtest/internal/gtest-tuple.h
new file mode 100644
index 0000000000..e9b405340a
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-tuple.h
@@ -0,0 +1,1020 @@
+// This file was GENERATED by command:
+//     pump.py gtest-tuple.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2009 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements a subset of TR1 tuple needed by Google Test and Google Mock.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+
+#include <utility>  // For ::std::pair.
+
+// The compiler used in Symbian has a bug that prevents us from declaring the
+// tuple template as a friend (it complains that tuple is redefined).  This
+// hack bypasses the bug by declaring the members that should otherwise be
+// private as public.
+// Sun Studio versions < 12 also have the above bug.
+#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
+#else
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
+    template <GTEST_10_TYPENAMES_(U)> friend class tuple; \
+   private:
+#endif
+
+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
+// with our own definitions. Therefore using our own tuple does not work on
+// those compilers.
+#if defined(_MSC_VER) && _MSC_VER >= 1600  /* 1600 is Visual Studio 2010 */
+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
+#endif
+
+// GTEST_n_TUPLE_(T) is the type of an n-tuple.
+#define GTEST_0_TUPLE_(T) tuple<>
+#define GTEST_1_TUPLE_(T) tuple<T##0, void, void, void, void, void, void, \
+    void, void, void>
+#define GTEST_2_TUPLE_(T) tuple<T##0, T##1, void, void, void, void, void, \
+    void, void, void>
+#define GTEST_3_TUPLE_(T) tuple<T##0, T##1, T##2, void, void, void, void, \
+    void, void, void>
+#define GTEST_4_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, void, void, void, \
+    void, void, void>
+#define GTEST_5_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, void, void, \
+    void, void, void>
+#define GTEST_6_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, void, \
+    void, void, void>
+#define GTEST_7_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    void, void, void>
+#define GTEST_8_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, void, void>
+#define GTEST_9_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, T##8, void>
+#define GTEST_10_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, T##8, T##9>
+
+// GTEST_n_TYPENAMES_(T) declares a list of n typenames.
+#define GTEST_0_TYPENAMES_(T)
+#define GTEST_1_TYPENAMES_(T) typename T##0
+#define GTEST_2_TYPENAMES_(T) typename T##0, typename T##1
+#define GTEST_3_TYPENAMES_(T) typename T##0, typename T##1, typename T##2
+#define GTEST_4_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3
+#define GTEST_5_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4
+#define GTEST_6_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5
+#define GTEST_7_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6
+#define GTEST_8_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, typename T##7
+#define GTEST_9_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, \
+    typename T##7, typename T##8
+#define GTEST_10_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, \
+    typename T##7, typename T##8, typename T##9
+
+// In theory, defining stuff in the ::std namespace is undefined
+// behavior.  We can do this as we are playing the role of a standard
+// library vendor.
+namespace std {
+namespace tr1 {
+
+template <typename T0 = void, typename T1 = void, typename T2 = void,
+    typename T3 = void, typename T4 = void, typename T5 = void,
+    typename T6 = void, typename T7 = void, typename T8 = void,
+    typename T9 = void>
+class tuple;
+
+// Anything in namespace gtest_internal is Google Test's INTERNAL
+// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code.
+namespace gtest_internal {
+
+// ByRef<T>::type is T if T is a reference; otherwise it's const T&.
+template <typename T>
+struct ByRef { typedef const T& type; };  // NOLINT
+template <typename T>
+struct ByRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for ByRef.
+#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef<T>::type
+
+// AddRef<T>::type is T if T is a reference; otherwise it's T&.  This
+// is the same as tr1::add_reference<T>::type.
+template <typename T>
+struct AddRef { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for AddRef.
+#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef<T>::type
+
+// A helper for implementing get<k>().
+template <int k> class Get;
+
+// A helper for implementing tuple_element<k, T>.  kIndexValid is true
+// iff k < the number of fields in tuple type T.
+template <bool kIndexValid, int kIndex, class Tuple>
+struct TupleElement;
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 0, GTEST_10_TUPLE_(T) > {
+  typedef T0 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 1, GTEST_10_TUPLE_(T) > {
+  typedef T1 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 2, GTEST_10_TUPLE_(T) > {
+  typedef T2 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 3, GTEST_10_TUPLE_(T) > {
+  typedef T3 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 4, GTEST_10_TUPLE_(T) > {
+  typedef T4 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 5, GTEST_10_TUPLE_(T) > {
+  typedef T5 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 6, GTEST_10_TUPLE_(T) > {
+  typedef T6 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 7, GTEST_10_TUPLE_(T) > {
+  typedef T7 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 8, GTEST_10_TUPLE_(T) > {
+  typedef T8 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 9, GTEST_10_TUPLE_(T) > {
+  typedef T9 type;
+};
+
+}  // namespace gtest_internal
+
+template <>
+class tuple<> {
+ public:
+  tuple() {}
+  tuple(const tuple& /* t */)  {}
+  tuple& operator=(const tuple& /* t */) { return *this; }
+};
+
+template <GTEST_1_TYPENAMES_(T)>
+class GTEST_1_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0) : f0_(f0) {}
+
+  tuple(const tuple& t) : f0_(t.f0_) {}
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple(const GTEST_1_TUPLE_(U)& t) : f0_(t.f0_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_1_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_1_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    return *this;
+  }
+
+  T0 f0_;
+};
+
+template <GTEST_2_TYPENAMES_(T)>
+class GTEST_2_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1) : f0_(f0),
+      f1_(f1) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_) {}
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple(const GTEST_2_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_) {}
+  template <typename U0, typename U1>
+  tuple(const ::std::pair<U0, U1>& p) : f0_(p.first), f1_(p.second) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_2_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+  template <typename U0, typename U1>
+  tuple& operator=(const ::std::pair<U0, U1>& p) {
+    f0_ = p.first;
+    f1_ = p.second;
+    return *this;
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_2_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+};
+
+template <GTEST_3_TYPENAMES_(T)>
+class GTEST_3_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2) : f0_(f0), f1_(f1), f2_(f2) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {}
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple(const GTEST_3_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_3_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_3_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+};
+
+template <GTEST_4_TYPENAMES_(T)>
+class GTEST_4_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_) {}
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple(const GTEST_4_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_4_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_4_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+};
+
+template <GTEST_5_TYPENAMES_(T)>
+class GTEST_5_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3,
+      GTEST_BY_REF_(T4) f4) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_) {}
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple(const GTEST_5_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_5_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_5_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+};
+
+template <GTEST_6_TYPENAMES_(T)>
+class GTEST_6_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_) {}
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple(const GTEST_6_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_6_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_6_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+};
+
+template <GTEST_7_TYPENAMES_(T)>
+class GTEST_7_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3), f4_(f4), f5_(f5), f6_(f6) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {}
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple(const GTEST_7_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_7_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_7_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+};
+
+template <GTEST_8_TYPENAMES_(T)>
+class GTEST_8_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6,
+      GTEST_BY_REF_(T7) f7) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5), f6_(f6), f7_(f7) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {}
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple(const GTEST_8_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_8_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_8_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+};
+
+template <GTEST_9_TYPENAMES_(T)>
+class GTEST_9_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7,
+      GTEST_BY_REF_(T8) f8) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5), f6_(f6), f7_(f7), f8_(f8) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {}
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple(const GTEST_9_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_9_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_9_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    f8_ = t.f8_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+  T8 f8_;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+class tuple {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_(),
+      f9_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7,
+      GTEST_BY_REF_(T8) f8, GTEST_BY_REF_(T9) f9) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3), f4_(f4), f5_(f5), f6_(f6), f7_(f7), f8_(f8), f9_(f9) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), f9_(t.f9_) {}
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple(const GTEST_10_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_),
+      f9_(t.f9_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_10_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_10_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    f8_ = t.f8_;
+    f9_ = t.f9_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+  T8 f8_;
+  T9 f9_;
+};
+
+// 6.1.3.2 Tuple creation functions.
+
+// Known limitations: we don't support passing an
+// std::tr1::reference_wrapper<T> to make_tuple().  And we don't
+// implement tie().
+
+inline tuple<> make_tuple() { return tuple<>(); }
+
+template <GTEST_1_TYPENAMES_(T)>
+inline GTEST_1_TUPLE_(T) make_tuple(const T0& f0) {
+  return GTEST_1_TUPLE_(T)(f0);
+}
+
+template <GTEST_2_TYPENAMES_(T)>
+inline GTEST_2_TUPLE_(T) make_tuple(const T0& f0, const T1& f1) {
+  return GTEST_2_TUPLE_(T)(f0, f1);
+}
+
+template <GTEST_3_TYPENAMES_(T)>
+inline GTEST_3_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2) {
+  return GTEST_3_TUPLE_(T)(f0, f1, f2);
+}
+
+template <GTEST_4_TYPENAMES_(T)>
+inline GTEST_4_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3) {
+  return GTEST_4_TUPLE_(T)(f0, f1, f2, f3);
+}
+
+template <GTEST_5_TYPENAMES_(T)>
+inline GTEST_5_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4) {
+  return GTEST_5_TUPLE_(T)(f0, f1, f2, f3, f4);
+}
+
+template <GTEST_6_TYPENAMES_(T)>
+inline GTEST_6_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5) {
+  return GTEST_6_TUPLE_(T)(f0, f1, f2, f3, f4, f5);
+}
+
+template <GTEST_7_TYPENAMES_(T)>
+inline GTEST_7_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6) {
+  return GTEST_7_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6);
+}
+
+template <GTEST_8_TYPENAMES_(T)>
+inline GTEST_8_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7) {
+  return GTEST_8_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7);
+}
+
+template <GTEST_9_TYPENAMES_(T)>
+inline GTEST_9_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7,
+    const T8& f8) {
+  return GTEST_9_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8);
+}
+
+template <GTEST_10_TYPENAMES_(T)>
+inline GTEST_10_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7,
+    const T8& f8, const T9& f9) {
+  return GTEST_10_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8, f9);
+}
+
+// 6.1.3.3 Tuple helper classes.
+
+template <typename Tuple> struct tuple_size;
+
+template <GTEST_0_TYPENAMES_(T)>
+struct tuple_size<GTEST_0_TUPLE_(T) > {
+  static const int value = 0;
+};
+
+template <GTEST_1_TYPENAMES_(T)>
+struct tuple_size<GTEST_1_TUPLE_(T) > {
+  static const int value = 1;
+};
+
+template <GTEST_2_TYPENAMES_(T)>
+struct tuple_size<GTEST_2_TUPLE_(T) > {
+  static const int value = 2;
+};
+
+template <GTEST_3_TYPENAMES_(T)>
+struct tuple_size<GTEST_3_TUPLE_(T) > {
+  static const int value = 3;
+};
+
+template <GTEST_4_TYPENAMES_(T)>
+struct tuple_size<GTEST_4_TUPLE_(T) > {
+  static const int value = 4;
+};
+
+template <GTEST_5_TYPENAMES_(T)>
+struct tuple_size<GTEST_5_TUPLE_(T) > {
+  static const int value = 5;
+};
+
+template <GTEST_6_TYPENAMES_(T)>
+struct tuple_size<GTEST_6_TUPLE_(T) > {
+  static const int value = 6;
+};
+
+template <GTEST_7_TYPENAMES_(T)>
+struct tuple_size<GTEST_7_TUPLE_(T) > {
+  static const int value = 7;
+};
+
+template <GTEST_8_TYPENAMES_(T)>
+struct tuple_size<GTEST_8_TUPLE_(T) > {
+  static const int value = 8;
+};
+
+template <GTEST_9_TYPENAMES_(T)>
+struct tuple_size<GTEST_9_TUPLE_(T) > {
+  static const int value = 9;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct tuple_size<GTEST_10_TUPLE_(T) > {
+  static const int value = 10;
+};
+
+template <int k, class Tuple>
+struct tuple_element {
+  typedef typename gtest_internal::TupleElement<
+      k < (tuple_size<Tuple>::value), k, Tuple>::type type;
+};
+
+#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element<k, Tuple >::type
+
+// 6.1.3.4 Element access.
+
+namespace gtest_internal {
+
+template <>
+class Get<0> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple))
+  Field(Tuple& t) { return t.f0_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple))
+  ConstField(const Tuple& t) { return t.f0_; }
+};
+
+template <>
+class Get<1> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple))
+  Field(Tuple& t) { return t.f1_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple))
+  ConstField(const Tuple& t) { return t.f1_; }
+};
+
+template <>
+class Get<2> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple))
+  Field(Tuple& t) { return t.f2_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple))
+  ConstField(const Tuple& t) { return t.f2_; }
+};
+
+template <>
+class Get<3> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple))
+  Field(Tuple& t) { return t.f3_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple))
+  ConstField(const Tuple& t) { return t.f3_; }
+};
+
+template <>
+class Get<4> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple))
+  Field(Tuple& t) { return t.f4_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple))
+  ConstField(const Tuple& t) { return t.f4_; }
+};
+
+template <>
+class Get<5> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple))
+  Field(Tuple& t) { return t.f5_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple))
+  ConstField(const Tuple& t) { return t.f5_; }
+};
+
+template <>
+class Get<6> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple))
+  Field(Tuple& t) { return t.f6_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple))
+  ConstField(const Tuple& t) { return t.f6_; }
+};
+
+template <>
+class Get<7> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple))
+  Field(Tuple& t) { return t.f7_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple))
+  ConstField(const Tuple& t) { return t.f7_; }
+};
+
+template <>
+class Get<8> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple))
+  Field(Tuple& t) { return t.f8_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple))
+  ConstField(const Tuple& t) { return t.f8_; }
+};
+
+template <>
+class Get<9> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple))
+  Field(Tuple& t) { return t.f9_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple))
+  ConstField(const Tuple& t) { return t.f9_; }
+};
+
+}  // namespace gtest_internal
+
+template <int k, GTEST_10_TYPENAMES_(T)>
+GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T)))
+get(GTEST_10_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::Field(t);
+}
+
+template <int k, GTEST_10_TYPENAMES_(T)>
+GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k,  GTEST_10_TUPLE_(T)))
+get(const GTEST_10_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::ConstField(t);
+}
+
+// 6.1.3.5 Relational operators
+
+// We only implement == and !=, as we don't have a need for the rest yet.
+
+namespace gtest_internal {
+
+// SameSizeTuplePrefixComparator<k, k>::Eq(t1, t2) returns true if the
+// first k fields of t1 equals the first k fields of t2.
+// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if
+// k1 != k2.
+template <int kSize1, int kSize2>
+struct SameSizeTuplePrefixComparator;
+
+template <>
+struct SameSizeTuplePrefixComparator<0, 0> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) {
+    return true;
+  }
+};
+
+template <int k>
+struct SameSizeTuplePrefixComparator<k, k> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& t1, const Tuple2& t2) {
+    return SameSizeTuplePrefixComparator<k - 1, k - 1>::Eq(t1, t2) &&
+        ::std::tr1::get<k - 1>(t1) == ::std::tr1::get<k - 1>(t2);
+  }
+};
+
+}  // namespace gtest_internal
+
+template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
+inline bool operator==(const GTEST_10_TUPLE_(T)& t,
+                       const GTEST_10_TUPLE_(U)& u) {
+  return gtest_internal::SameSizeTuplePrefixComparator<
+      tuple_size<GTEST_10_TUPLE_(T) >::value,
+      tuple_size<GTEST_10_TUPLE_(U) >::value>::Eq(t, u);
+}
+
+template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
+inline bool operator!=(const GTEST_10_TUPLE_(T)& t,
+                       const GTEST_10_TUPLE_(U)& u) { return !(t == u); }
+
+// 6.1.4 Pairs.
+// Unimplemented.
+
+}  // namespace tr1
+}  // namespace std
+
+#undef GTEST_0_TUPLE_
+#undef GTEST_1_TUPLE_
+#undef GTEST_2_TUPLE_
+#undef GTEST_3_TUPLE_
+#undef GTEST_4_TUPLE_
+#undef GTEST_5_TUPLE_
+#undef GTEST_6_TUPLE_
+#undef GTEST_7_TUPLE_
+#undef GTEST_8_TUPLE_
+#undef GTEST_9_TUPLE_
+#undef GTEST_10_TUPLE_
+
+#undef GTEST_0_TYPENAMES_
+#undef GTEST_1_TYPENAMES_
+#undef GTEST_2_TYPENAMES_
+#undef GTEST_3_TYPENAMES_
+#undef GTEST_4_TYPENAMES_
+#undef GTEST_5_TYPENAMES_
+#undef GTEST_6_TYPENAMES_
+#undef GTEST_7_TYPENAMES_
+#undef GTEST_8_TYPENAMES_
+#undef GTEST_9_TYPENAMES_
+#undef GTEST_10_TYPENAMES_
+
+#undef GTEST_DECLARE_TUPLE_AS_FRIEND_
+#undef GTEST_BY_REF_
+#undef GTEST_ADD_REF_
+#undef GTEST_TUPLE_ELEMENT_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-tuple.h.pump b/Externals/gtest/include/gtest/internal/gtest-tuple.h.pump
new file mode 100644
index 0000000000..429ddfeeca
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-tuple.h.pump
@@ -0,0 +1,347 @@
+$$ -*- mode: c++; -*-
+$var n = 10  $$ Maximum number of tuple fields we want to support.
+$$ This meta comment fixes auto-indentation in Emacs. }}
+// Copyright 2009 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements a subset of TR1 tuple needed by Google Test and Google Mock.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+
+#include <utility>  // For ::std::pair.
+
+// The compiler used in Symbian has a bug that prevents us from declaring the
+// tuple template as a friend (it complains that tuple is redefined).  This
+// hack bypasses the bug by declaring the members that should otherwise be
+// private as public.
+// Sun Studio versions < 12 also have the above bug.
+#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
+#else
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
+    template <GTEST_$(n)_TYPENAMES_(U)> friend class tuple; \
+   private:
+#endif
+
+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
+// with our own definitions. Therefore using our own tuple does not work on
+// those compilers.
+#if defined(_MSC_VER) && _MSC_VER >= 1600  /* 1600 is Visual Studio 2010 */
+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
+#endif
+
+
+$range i 0..n-1
+$range j 0..n
+$range k 1..n
+// GTEST_n_TUPLE_(T) is the type of an n-tuple.
+#define GTEST_0_TUPLE_(T) tuple<>
+
+$for k [[
+$range m 0..k-1
+$range m2 k..n-1
+#define GTEST_$(k)_TUPLE_(T) tuple<$for m, [[T##$m]]$for m2 [[, void]]>
+
+]]
+
+// GTEST_n_TYPENAMES_(T) declares a list of n typenames.
+
+$for j [[
+$range m 0..j-1
+#define GTEST_$(j)_TYPENAMES_(T) $for m, [[typename T##$m]]
+
+
+]]
+
+// In theory, defining stuff in the ::std namespace is undefined
+// behavior.  We can do this as we are playing the role of a standard
+// library vendor.
+namespace std {
+namespace tr1 {
+
+template <$for i, [[typename T$i = void]]>
+class tuple;
+
+// Anything in namespace gtest_internal is Google Test's INTERNAL
+// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code.
+namespace gtest_internal {
+
+// ByRef<T>::type is T if T is a reference; otherwise it's const T&.
+template <typename T>
+struct ByRef { typedef const T& type; };  // NOLINT
+template <typename T>
+struct ByRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for ByRef.
+#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef<T>::type
+
+// AddRef<T>::type is T if T is a reference; otherwise it's T&.  This
+// is the same as tr1::add_reference<T>::type.
+template <typename T>
+struct AddRef { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for AddRef.
+#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef<T>::type
+
+// A helper for implementing get<k>().
+template <int k> class Get;
+
+// A helper for implementing tuple_element<k, T>.  kIndexValid is true
+// iff k < the number of fields in tuple type T.
+template <bool kIndexValid, int kIndex, class Tuple>
+struct TupleElement;
+
+
+$for i [[
+template <GTEST_$(n)_TYPENAMES_(T)>
+struct TupleElement<true, $i, GTEST_$(n)_TUPLE_(T) > {
+  typedef T$i type;
+};
+
+
+]]
+}  // namespace gtest_internal
+
+template <>
+class tuple<> {
+ public:
+  tuple() {}
+  tuple(const tuple& /* t */)  {}
+  tuple& operator=(const tuple& /* t */) { return *this; }
+};
+
+
+$for k [[
+$range m 0..k-1
+template <GTEST_$(k)_TYPENAMES_(T)>
+class $if k < n [[GTEST_$(k)_TUPLE_(T)]] $else [[tuple]] {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : $for m, [[f$(m)_()]] {}
+
+  explicit tuple($for m, [[GTEST_BY_REF_(T$m) f$m]]) : [[]]
+$for m, [[f$(m)_(f$m)]] {}
+
+  tuple(const tuple& t) : $for m, [[f$(m)_(t.f$(m)_)]] {}
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple(const GTEST_$(k)_TUPLE_(U)& t) : $for m, [[f$(m)_(t.f$(m)_)]] {}
+
+$if k == 2 [[
+  template <typename U0, typename U1>
+  tuple(const ::std::pair<U0, U1>& p) : f0_(p.first), f1_(p.second) {}
+
+]]
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_$(k)_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+$if k == 2 [[
+  template <typename U0, typename U1>
+  tuple& operator=(const ::std::pair<U0, U1>& p) {
+    f0_ = p.first;
+    f1_ = p.second;
+    return *this;
+  }
+
+]]
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_$(k)_TUPLE_(U)& t) {
+
+$for m [[
+    f$(m)_ = t.f$(m)_;
+
+]]
+    return *this;
+  }
+
+
+$for m [[
+  T$m f$(m)_;
+
+]]
+};
+
+
+]]
+// 6.1.3.2 Tuple creation functions.
+
+// Known limitations: we don't support passing an
+// std::tr1::reference_wrapper<T> to make_tuple().  And we don't
+// implement tie().
+
+inline tuple<> make_tuple() { return tuple<>(); }
+
+$for k [[
+$range m 0..k-1
+
+template <GTEST_$(k)_TYPENAMES_(T)>
+inline GTEST_$(k)_TUPLE_(T) make_tuple($for m, [[const T$m& f$m]]) {
+  return GTEST_$(k)_TUPLE_(T)($for m, [[f$m]]);
+}
+
+]]
+
+// 6.1.3.3 Tuple helper classes.
+
+template <typename Tuple> struct tuple_size;
+
+
+$for j [[
+template <GTEST_$(j)_TYPENAMES_(T)>
+struct tuple_size<GTEST_$(j)_TUPLE_(T) > {
+  static const int value = $j;
+};
+
+
+]]
+template <int k, class Tuple>
+struct tuple_element {
+  typedef typename gtest_internal::TupleElement<
+      k < (tuple_size<Tuple>::value), k, Tuple>::type type;
+};
+
+#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element<k, Tuple >::type
+
+// 6.1.3.4 Element access.
+
+namespace gtest_internal {
+
+
+$for i [[
+template <>
+class Get<$i> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple))
+  Field(Tuple& t) { return t.f$(i)_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple))
+  ConstField(const Tuple& t) { return t.f$(i)_; }
+};
+
+
+]]
+}  // namespace gtest_internal
+
+template <int k, GTEST_$(n)_TYPENAMES_(T)>
+GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T)))
+get(GTEST_$(n)_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::Field(t);
+}
+
+template <int k, GTEST_$(n)_TYPENAMES_(T)>
+GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k,  GTEST_$(n)_TUPLE_(T)))
+get(const GTEST_$(n)_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::ConstField(t);
+}
+
+// 6.1.3.5 Relational operators
+
+// We only implement == and !=, as we don't have a need for the rest yet.
+
+namespace gtest_internal {
+
+// SameSizeTuplePrefixComparator<k, k>::Eq(t1, t2) returns true if the
+// first k fields of t1 equals the first k fields of t2.
+// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if
+// k1 != k2.
+template <int kSize1, int kSize2>
+struct SameSizeTuplePrefixComparator;
+
+template <>
+struct SameSizeTuplePrefixComparator<0, 0> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) {
+    return true;
+  }
+};
+
+template <int k>
+struct SameSizeTuplePrefixComparator<k, k> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& t1, const Tuple2& t2) {
+    return SameSizeTuplePrefixComparator<k - 1, k - 1>::Eq(t1, t2) &&
+        ::std::tr1::get<k - 1>(t1) == ::std::tr1::get<k - 1>(t2);
+  }
+};
+
+}  // namespace gtest_internal
+
+template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
+inline bool operator==(const GTEST_$(n)_TUPLE_(T)& t,
+                       const GTEST_$(n)_TUPLE_(U)& u) {
+  return gtest_internal::SameSizeTuplePrefixComparator<
+      tuple_size<GTEST_$(n)_TUPLE_(T) >::value,
+      tuple_size<GTEST_$(n)_TUPLE_(U) >::value>::Eq(t, u);
+}
+
+template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
+inline bool operator!=(const GTEST_$(n)_TUPLE_(T)& t,
+                       const GTEST_$(n)_TUPLE_(U)& u) { return !(t == u); }
+
+// 6.1.4 Pairs.
+// Unimplemented.
+
+}  // namespace tr1
+}  // namespace std
+
+
+$for j [[
+#undef GTEST_$(j)_TUPLE_
+
+]]
+
+
+$for j [[
+#undef GTEST_$(j)_TYPENAMES_
+
+]]
+
+#undef GTEST_DECLARE_TUPLE_AS_FRIEND_
+#undef GTEST_BY_REF_
+#undef GTEST_ADD_REF_
+#undef GTEST_TUPLE_ELEMENT_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-type-util.h b/Externals/gtest/include/gtest/internal/gtest-type-util.h
new file mode 100644
index 0000000000..e46f7cfcb4
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-type-util.h
@@ -0,0 +1,3331 @@
+// This file was GENERATED by command:
+//     pump.py gtest-type-util.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently we support at most 50 types in a list, and at most 50
+// type-parameterized tests in one type-parameterized test case.
+// Please contact googletestframework@googlegroups.com if you need
+// more.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// GetTypeName<T>() returns a human-readable name of type T.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+# if GTEST_HAS_RTTI
+
+  const char* const name = typeid(T).name();
+#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#   if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#   endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, 0, 0, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return name_str;
+#  else
+  return name;
+#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+
+# else
+
+  return "<type>";
+
+# endif  // GTEST_HAS_RTTI
+}
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
+// type.  This can be used as a compile-time assertion to ensure that
+// two types are equal.
+
+template <typename T1, typename T2>
+struct AssertTypeEq;
+
+template <typename T>
+struct AssertTypeEq<T, T> {
+  typedef bool type;
+};
+
+// A unique type used as the default value for the arguments of class
+// template Types.  This allows us to simulate variadic templates
+// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
+// support directly.
+struct None {};
+
+// The following family of struct and struct templates are used to
+// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
+// represents a type list with N types (T1, T2, ..., and TN) in it.
+// Except for Types0, every struct in the family has two member types:
+// Head for the first type in the list, and Tail for the rest of the
+// list.
+
+// The empty type list.
+struct Types0 {};
+
+// Type lists of length 1, 2, 3, and so on.
+
+template <typename T1>
+struct Types1 {
+  typedef T1 Head;
+  typedef Types0 Tail;
+};
+template <typename T1, typename T2>
+struct Types2 {
+  typedef T1 Head;
+  typedef Types1<T2> Tail;
+};
+
+template <typename T1, typename T2, typename T3>
+struct Types3 {
+  typedef T1 Head;
+  typedef Types2<T2, T3> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4>
+struct Types4 {
+  typedef T1 Head;
+  typedef Types3<T2, T3, T4> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+struct Types5 {
+  typedef T1 Head;
+  typedef Types4<T2, T3, T4, T5> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+struct Types6 {
+  typedef T1 Head;
+  typedef Types5<T2, T3, T4, T5, T6> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+struct Types7 {
+  typedef T1 Head;
+  typedef Types6<T2, T3, T4, T5, T6, T7> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+struct Types8 {
+  typedef T1 Head;
+  typedef Types7<T2, T3, T4, T5, T6, T7, T8> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+struct Types9 {
+  typedef T1 Head;
+  typedef Types8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+struct Types10 {
+  typedef T1 Head;
+  typedef Types9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+struct Types11 {
+  typedef T1 Head;
+  typedef Types10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+struct Types12 {
+  typedef T1 Head;
+  typedef Types11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+struct Types13 {
+  typedef T1 Head;
+  typedef Types12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+struct Types14 {
+  typedef T1 Head;
+  typedef Types13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+struct Types15 {
+  typedef T1 Head;
+  typedef Types14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+struct Types16 {
+  typedef T1 Head;
+  typedef Types15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+struct Types17 {
+  typedef T1 Head;
+  typedef Types16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+struct Types18 {
+  typedef T1 Head;
+  typedef Types17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+struct Types19 {
+  typedef T1 Head;
+  typedef Types18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+struct Types20 {
+  typedef T1 Head;
+  typedef Types19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+struct Types21 {
+  typedef T1 Head;
+  typedef Types20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+struct Types22 {
+  typedef T1 Head;
+  typedef Types21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+struct Types23 {
+  typedef T1 Head;
+  typedef Types22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+struct Types24 {
+  typedef T1 Head;
+  typedef Types23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+struct Types25 {
+  typedef T1 Head;
+  typedef Types24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+struct Types26 {
+  typedef T1 Head;
+  typedef Types25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+struct Types27 {
+  typedef T1 Head;
+  typedef Types26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+struct Types28 {
+  typedef T1 Head;
+  typedef Types27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+struct Types29 {
+  typedef T1 Head;
+  typedef Types28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+struct Types30 {
+  typedef T1 Head;
+  typedef Types29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+struct Types31 {
+  typedef T1 Head;
+  typedef Types30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+struct Types32 {
+  typedef T1 Head;
+  typedef Types31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+struct Types33 {
+  typedef T1 Head;
+  typedef Types32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+struct Types34 {
+  typedef T1 Head;
+  typedef Types33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+struct Types35 {
+  typedef T1 Head;
+  typedef Types34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+struct Types36 {
+  typedef T1 Head;
+  typedef Types35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+struct Types37 {
+  typedef T1 Head;
+  typedef Types36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+struct Types38 {
+  typedef T1 Head;
+  typedef Types37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+struct Types39 {
+  typedef T1 Head;
+  typedef Types38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+struct Types40 {
+  typedef T1 Head;
+  typedef Types39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+struct Types41 {
+  typedef T1 Head;
+  typedef Types40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+struct Types42 {
+  typedef T1 Head;
+  typedef Types41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+struct Types43 {
+  typedef T1 Head;
+  typedef Types42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+struct Types44 {
+  typedef T1 Head;
+  typedef Types43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+struct Types45 {
+  typedef T1 Head;
+  typedef Types44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+struct Types46 {
+  typedef T1 Head;
+  typedef Types45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+struct Types47 {
+  typedef T1 Head;
+  typedef Types46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+struct Types48 {
+  typedef T1 Head;
+  typedef Types47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+struct Types49 {
+  typedef T1 Head;
+  typedef Types48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48, T49> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+struct Types50 {
+  typedef T1 Head;
+  typedef Types49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48, T49, T50> Tail;
+};
+
+
+}  // namespace internal
+
+// We don't want to require the users to write TypesN<...> directly,
+// as that would require them to count the length.  Types<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Types<int>
+// will appear as Types<int, None, None, ..., None> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Types<T1, ..., TN>, and Google Test will translate
+// that to TypesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Types template.
+template <typename T1 = internal::None, typename T2 = internal::None,
+    typename T3 = internal::None, typename T4 = internal::None,
+    typename T5 = internal::None, typename T6 = internal::None,
+    typename T7 = internal::None, typename T8 = internal::None,
+    typename T9 = internal::None, typename T10 = internal::None,
+    typename T11 = internal::None, typename T12 = internal::None,
+    typename T13 = internal::None, typename T14 = internal::None,
+    typename T15 = internal::None, typename T16 = internal::None,
+    typename T17 = internal::None, typename T18 = internal::None,
+    typename T19 = internal::None, typename T20 = internal::None,
+    typename T21 = internal::None, typename T22 = internal::None,
+    typename T23 = internal::None, typename T24 = internal::None,
+    typename T25 = internal::None, typename T26 = internal::None,
+    typename T27 = internal::None, typename T28 = internal::None,
+    typename T29 = internal::None, typename T30 = internal::None,
+    typename T31 = internal::None, typename T32 = internal::None,
+    typename T33 = internal::None, typename T34 = internal::None,
+    typename T35 = internal::None, typename T36 = internal::None,
+    typename T37 = internal::None, typename T38 = internal::None,
+    typename T39 = internal::None, typename T40 = internal::None,
+    typename T41 = internal::None, typename T42 = internal::None,
+    typename T43 = internal::None, typename T44 = internal::None,
+    typename T45 = internal::None, typename T46 = internal::None,
+    typename T47 = internal::None, typename T48 = internal::None,
+    typename T49 = internal::None, typename T50 = internal::None>
+struct Types {
+  typedef internal::Types50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
+};
+
+template <>
+struct Types<internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types0 type;
+};
+template <typename T1>
+struct Types<T1, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types1<T1> type;
+};
+template <typename T1, typename T2>
+struct Types<T1, T2, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types2<T1, T2> type;
+};
+template <typename T1, typename T2, typename T3>
+struct Types<T1, T2, T3, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types3<T1, T2, T3> type;
+};
+template <typename T1, typename T2, typename T3, typename T4>
+struct Types<T1, T2, T3, T4, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types4<T1, T2, T3, T4> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+struct Types<T1, T2, T3, T4, T5, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types5<T1, T2, T3, T4, T5> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+struct Types<T1, T2, T3, T4, T5, T6, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types6<T1, T2, T3, T4, T5, T6> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+struct Types<T1, T2, T3, T4, T5, T6, T7, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types7<T1, T2, T3, T4, T5, T6, T7> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types8<T1, T2, T3, T4, T5, T6, T7, T8> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, internal::None, internal::None, internal::None> {
+  typedef internal::Types47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, T48, internal::None, internal::None> {
+  typedef internal::Types48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, T48, T49, internal::None> {
+  typedef internal::Types49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49> type;
+};
+
+namespace internal {
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+// A unique struct template used as the default value for the
+// arguments of class template Templates.  This allows us to simulate
+// variadic templates (e.g. Templates<int>, Templates<int, double>,
+// and etc), which C++ doesn't support directly.
+template <typename T>
+struct NoneT {};
+
+// The following family of struct and struct templates are used to
+// represent template lists.  In particular, TemplatesN<T1, T2, ...,
+// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
+// for Templates0, every struct in the family has two member types:
+// Head for the selector of the first template in the list, and Tail
+// for the rest of the list.
+
+// The empty template list.
+struct Templates0 {};
+
+// Template lists of length 1, 2, 3, and so on.
+
+template <GTEST_TEMPLATE_ T1>
+struct Templates1 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates0 Tail;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
+struct Templates2 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates1<T2> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
+struct Templates3 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates2<T2, T3> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4>
+struct Templates4 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates3<T2, T3, T4> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
+struct Templates5 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates4<T2, T3, T4, T5> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
+struct Templates6 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates5<T2, T3, T4, T5, T6> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7>
+struct Templates7 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates6<T2, T3, T4, T5, T6, T7> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
+struct Templates8 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates7<T2, T3, T4, T5, T6, T7, T8> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
+struct Templates9 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10>
+struct Templates10 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
+struct Templates11 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
+struct Templates12 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13>
+struct Templates13 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
+struct Templates14 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
+struct Templates15 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16>
+struct Templates16 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
+struct Templates17 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
+struct Templates18 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19>
+struct Templates19 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
+struct Templates20 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
+struct Templates21 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22>
+struct Templates22 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
+struct Templates23 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
+struct Templates24 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25>
+struct Templates25 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
+struct Templates26 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
+struct Templates27 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28>
+struct Templates28 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
+struct Templates29 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
+struct Templates30 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31>
+struct Templates31 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
+struct Templates32 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
+struct Templates33 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34>
+struct Templates34 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
+struct Templates35 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
+struct Templates36 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37>
+struct Templates37 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
+struct Templates38 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
+struct Templates39 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40>
+struct Templates40 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
+struct Templates41 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
+struct Templates42 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43>
+struct Templates43 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
+struct Templates44 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
+struct Templates45 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46>
+struct Templates46 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
+struct Templates47 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
+struct Templates48 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49>
+struct Templates49 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48, T49> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49, GTEST_TEMPLATE_ T50>
+struct Templates50 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48, T49, T50> Tail;
+};
+
+
+// We don't want to require the users to write TemplatesN<...> directly,
+// as that would require them to count the length.  Templates<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Templates<list>
+// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Templates<T1, ..., TN>, and Google Test will translate
+// that to TemplatesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Templates template.
+template <GTEST_TEMPLATE_ T1 = NoneT, GTEST_TEMPLATE_ T2 = NoneT,
+    GTEST_TEMPLATE_ T3 = NoneT, GTEST_TEMPLATE_ T4 = NoneT,
+    GTEST_TEMPLATE_ T5 = NoneT, GTEST_TEMPLATE_ T6 = NoneT,
+    GTEST_TEMPLATE_ T7 = NoneT, GTEST_TEMPLATE_ T8 = NoneT,
+    GTEST_TEMPLATE_ T9 = NoneT, GTEST_TEMPLATE_ T10 = NoneT,
+    GTEST_TEMPLATE_ T11 = NoneT, GTEST_TEMPLATE_ T12 = NoneT,
+    GTEST_TEMPLATE_ T13 = NoneT, GTEST_TEMPLATE_ T14 = NoneT,
+    GTEST_TEMPLATE_ T15 = NoneT, GTEST_TEMPLATE_ T16 = NoneT,
+    GTEST_TEMPLATE_ T17 = NoneT, GTEST_TEMPLATE_ T18 = NoneT,
+    GTEST_TEMPLATE_ T19 = NoneT, GTEST_TEMPLATE_ T20 = NoneT,
+    GTEST_TEMPLATE_ T21 = NoneT, GTEST_TEMPLATE_ T22 = NoneT,
+    GTEST_TEMPLATE_ T23 = NoneT, GTEST_TEMPLATE_ T24 = NoneT,
+    GTEST_TEMPLATE_ T25 = NoneT, GTEST_TEMPLATE_ T26 = NoneT,
+    GTEST_TEMPLATE_ T27 = NoneT, GTEST_TEMPLATE_ T28 = NoneT,
+    GTEST_TEMPLATE_ T29 = NoneT, GTEST_TEMPLATE_ T30 = NoneT,
+    GTEST_TEMPLATE_ T31 = NoneT, GTEST_TEMPLATE_ T32 = NoneT,
+    GTEST_TEMPLATE_ T33 = NoneT, GTEST_TEMPLATE_ T34 = NoneT,
+    GTEST_TEMPLATE_ T35 = NoneT, GTEST_TEMPLATE_ T36 = NoneT,
+    GTEST_TEMPLATE_ T37 = NoneT, GTEST_TEMPLATE_ T38 = NoneT,
+    GTEST_TEMPLATE_ T39 = NoneT, GTEST_TEMPLATE_ T40 = NoneT,
+    GTEST_TEMPLATE_ T41 = NoneT, GTEST_TEMPLATE_ T42 = NoneT,
+    GTEST_TEMPLATE_ T43 = NoneT, GTEST_TEMPLATE_ T44 = NoneT,
+    GTEST_TEMPLATE_ T45 = NoneT, GTEST_TEMPLATE_ T46 = NoneT,
+    GTEST_TEMPLATE_ T47 = NoneT, GTEST_TEMPLATE_ T48 = NoneT,
+    GTEST_TEMPLATE_ T49 = NoneT, GTEST_TEMPLATE_ T50 = NoneT>
+struct Templates {
+  typedef Templates50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
+};
+
+template <>
+struct Templates<NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates0 type;
+};
+template <GTEST_TEMPLATE_ T1>
+struct Templates<T1, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates1<T1> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
+struct Templates<T1, T2, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates2<T1, T2> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
+struct Templates<T1, T2, T3, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates3<T1, T2, T3> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4>
+struct Templates<T1, T2, T3, T4, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates4<T1, T2, T3, T4> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
+struct Templates<T1, T2, T3, T4, T5, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates5<T1, T2, T3, T4, T5> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
+struct Templates<T1, T2, T3, T4, T5, T6, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates6<T1, T2, T3, T4, T5, T6> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates7<T1, T2, T3, T4, T5, T6, T7> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates8<T1, T2, T3, T4, T5, T6, T7, T8> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, NoneT, NoneT, NoneT> {
+  typedef Templates47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, T48, NoneT, NoneT> {
+  typedef Templates48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, T48, T49, NoneT> {
+  typedef Templates49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48, T49> type;
+};
+
+// The TypeList template makes it possible to use either a single type
+// or a Types<...> list in TYPED_TEST_CASE() and
+// INSTANTIATE_TYPED_TEST_CASE_P().
+
+template <typename T>
+struct TypeList {
+  typedef Types1<T> type;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+struct TypeList<Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49, T50> > {
+  typedef typename Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>::type type;
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff --git a/Externals/gtest/include/gtest/internal/gtest-type-util.h.pump b/Externals/gtest/include/gtest/internal/gtest-type-util.h.pump
new file mode 100644
index 0000000000..251fdf025b
--- /dev/null
+++ b/Externals/gtest/include/gtest/internal/gtest-type-util.h.pump
@@ -0,0 +1,297 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of type lists we want to support.
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently we support at most $n types in a list, and at most $n
+// type-parameterized tests in one type-parameterized test case.
+// Please contact googletestframework@googlegroups.com if you need
+// more.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// GetTypeName<T>() returns a human-readable name of type T.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+# if GTEST_HAS_RTTI
+
+  const char* const name = typeid(T).name();
+#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#   if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#   endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, 0, 0, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return name_str;
+#  else
+  return name;
+#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+
+# else
+
+  return "<type>";
+
+# endif  // GTEST_HAS_RTTI
+}
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
+// type.  This can be used as a compile-time assertion to ensure that
+// two types are equal.
+
+template <typename T1, typename T2>
+struct AssertTypeEq;
+
+template <typename T>
+struct AssertTypeEq<T, T> {
+  typedef bool type;
+};
+
+// A unique type used as the default value for the arguments of class
+// template Types.  This allows us to simulate variadic templates
+// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
+// support directly.
+struct None {};
+
+// The following family of struct and struct templates are used to
+// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
+// represents a type list with N types (T1, T2, ..., and TN) in it.
+// Except for Types0, every struct in the family has two member types:
+// Head for the first type in the list, and Tail for the rest of the
+// list.
+
+// The empty type list.
+struct Types0 {};
+
+// Type lists of length 1, 2, 3, and so on.
+
+template <typename T1>
+struct Types1 {
+  typedef T1 Head;
+  typedef Types0 Tail;
+};
+
+$range i 2..n
+
+$for i [[
+$range j 1..i
+$range k 2..i
+template <$for j, [[typename T$j]]>
+struct Types$i {
+  typedef T1 Head;
+  typedef Types$(i-1)<$for k, [[T$k]]> Tail;
+};
+
+
+]]
+
+}  // namespace internal
+
+// We don't want to require the users to write TypesN<...> directly,
+// as that would require them to count the length.  Types<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Types<int>
+// will appear as Types<int, None, None, ..., None> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Types<T1, ..., TN>, and Google Test will translate
+// that to TypesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Types template.
+
+$range i 1..n
+template <$for i, [[typename T$i = internal::None]]>
+struct Types {
+  typedef internal::Types$n<$for i, [[T$i]]> type;
+};
+
+template <>
+struct Types<$for i, [[internal::None]]> {
+  typedef internal::Types0 type;
+};
+
+$range i 1..n-1
+$for i [[
+$range j 1..i
+$range k i+1..n
+template <$for j, [[typename T$j]]>
+struct Types<$for j, [[T$j]]$for k[[, internal::None]]> {
+  typedef internal::Types$i<$for j, [[T$j]]> type;
+};
+
+]]
+
+namespace internal {
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+// A unique struct template used as the default value for the
+// arguments of class template Templates.  This allows us to simulate
+// variadic templates (e.g. Templates<int>, Templates<int, double>,
+// and etc), which C++ doesn't support directly.
+template <typename T>
+struct NoneT {};
+
+// The following family of struct and struct templates are used to
+// represent template lists.  In particular, TemplatesN<T1, T2, ...,
+// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
+// for Templates0, every struct in the family has two member types:
+// Head for the selector of the first template in the list, and Tail
+// for the rest of the list.
+
+// The empty template list.
+struct Templates0 {};
+
+// Template lists of length 1, 2, 3, and so on.
+
+template <GTEST_TEMPLATE_ T1>
+struct Templates1 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates0 Tail;
+};
+
+$range i 2..n
+
+$for i [[
+$range j 1..i
+$range k 2..i
+template <$for j, [[GTEST_TEMPLATE_ T$j]]>
+struct Templates$i {
+  typedef TemplateSel<T1> Head;
+  typedef Templates$(i-1)<$for k, [[T$k]]> Tail;
+};
+
+
+]]
+
+// We don't want to require the users to write TemplatesN<...> directly,
+// as that would require them to count the length.  Templates<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Templates<list>
+// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Templates<T1, ..., TN>, and Google Test will translate
+// that to TemplatesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Templates template.
+
+$range i 1..n
+template <$for i, [[GTEST_TEMPLATE_ T$i = NoneT]]>
+struct Templates {
+  typedef Templates$n<$for i, [[T$i]]> type;
+};
+
+template <>
+struct Templates<$for i, [[NoneT]]> {
+  typedef Templates0 type;
+};
+
+$range i 1..n-1
+$for i [[
+$range j 1..i
+$range k i+1..n
+template <$for j, [[GTEST_TEMPLATE_ T$j]]>
+struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> {
+  typedef Templates$i<$for j, [[T$j]]> type;
+};
+
+]]
+
+// The TypeList template makes it possible to use either a single type
+// or a Types<...> list in TYPED_TEST_CASE() and
+// INSTANTIATE_TYPED_TEST_CASE_P().
+
+template <typename T>
+struct TypeList {
+  typedef Types1<T> type;
+};
+
+
+$range i 1..n
+template <$for i, [[typename T$i]]>
+struct TypeList<Types<$for i, [[T$i]]> > {
+  typedef typename Types<$for i, [[T$i]]>::type type;
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff --git a/Externals/gtest/src/gtest-all.cc b/Externals/gtest/src/gtest-all.cc
new file mode 100644
index 0000000000..0a9cee5223
--- /dev/null
+++ b/Externals/gtest/src/gtest-all.cc
@@ -0,0 +1,48 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// Sometimes it's desirable to build Google Test by compiling a single file.
+// This file serves this purpose.
+
+// This line ensures that gtest.h can be compiled on its own, even
+// when it's fused.
+#include "gtest/gtest.h"
+
+// The following lines pull in the real gtest *.cc files.
+#include "src/gtest.cc"
+#include "src/gtest-death-test.cc"
+#include "src/gtest-filepath.cc"
+#include "src/gtest-port.cc"
+#include "src/gtest-printers.cc"
+#include "src/gtest-test-part.cc"
+#include "src/gtest-typed-test.cc"
diff --git a/Externals/gtest/src/gtest-death-test.cc b/Externals/gtest/src/gtest-death-test.cc
new file mode 100644
index 0000000000..a6023fce4f
--- /dev/null
+++ b/Externals/gtest/src/gtest-death-test.cc
@@ -0,0 +1,1344 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
+//
+// This file implements death tests.
+
+#include "gtest/gtest-death-test.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_OS_MAC
+#  include <crt_externs.h>
+# endif  // GTEST_OS_MAC
+
+# include <errno.h>
+# include <fcntl.h>
+# include <limits.h>
+
+# if GTEST_OS_LINUX
+#  include <signal.h>
+# endif  // GTEST_OS_LINUX
+
+# include <stdarg.h>
+
+# if GTEST_OS_WINDOWS
+#  include <windows.h>
+# else
+#  include <sys/mman.h>
+#  include <sys/wait.h>
+# endif  // GTEST_OS_WINDOWS
+
+# if GTEST_OS_QNX
+#  include <spawn.h>
+# endif  // GTEST_OS_QNX
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-string.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+
+// Constants.
+
+// The default death test style.
+static const char kDefaultDeathTestStyle[] = "fast";
+
+GTEST_DEFINE_string_(
+    death_test_style,
+    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
+    "Indicates how to run a death test in a forked child process: "
+    "\"threadsafe\" (child process re-executes the test binary "
+    "from the beginning, running only the specific death test) or "
+    "\"fast\" (child process runs the death test immediately "
+    "after forking).");
+
+GTEST_DEFINE_bool_(
+    death_test_use_fork,
+    internal::BoolFromGTestEnv("death_test_use_fork", false),
+    "Instructs to use fork()/_exit() instead of clone() in death tests. "
+    "Ignored and always uses fork() on POSIX systems where clone() is not "
+    "implemented. Useful when running under valgrind or similar tools if "
+    "those do not support clone(). Valgrind 3.3.1 will just fail if "
+    "it sees an unsupported combination of clone() flags. "
+    "It is not recommended to use this flag w/o valgrind though it will "
+    "work in 99% of the cases. Once valgrind is fixed, this flag will "
+    "most likely be removed.");
+
+namespace internal {
+GTEST_DEFINE_string_(
+    internal_run_death_test, "",
+    "Indicates the file, line number, temporal index of "
+    "the single death test to run, and a file descriptor to "
+    "which a success code may be sent, all separated by "
+    "the '|' characters.  This flag is specified if and only if the current "
+    "process is a sub-process launched for running a thread-safe "
+    "death test.  FOR INTERNAL USE ONLY.");
+}  // namespace internal
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Valid only for fast death tests. Indicates the code is running in the
+// child process of a fast style death test.
+static bool g_in_fast_death_test_child = false;
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+bool InDeathTestChild() {
+# if GTEST_OS_WINDOWS
+
+  // On Windows, death tests are thread-safe regardless of the value of the
+  // death_test_style flag.
+  return !GTEST_FLAG(internal_run_death_test).empty();
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe")
+    return !GTEST_FLAG(internal_run_death_test).empty();
+  else
+    return g_in_fast_death_test_child;
+#endif
+}
+
+}  // namespace internal
+
+// ExitedWithCode constructor.
+ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
+}
+
+// ExitedWithCode function-call operator.
+bool ExitedWithCode::operator()(int exit_status) const {
+# if GTEST_OS_WINDOWS
+
+  return exit_status == exit_code_;
+
+# else
+
+  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
+
+# endif  // GTEST_OS_WINDOWS
+}
+
+# if !GTEST_OS_WINDOWS
+// KilledBySignal constructor.
+KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
+}
+
+// KilledBySignal function-call operator.
+bool KilledBySignal::operator()(int exit_status) const {
+  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
+}
+# endif  // !GTEST_OS_WINDOWS
+
+namespace internal {
+
+// Utilities needed for death tests.
+
+// Generates a textual description of a given exit code, in the format
+// specified by wait(2).
+static std::string ExitSummary(int exit_code) {
+  Message m;
+
+# if GTEST_OS_WINDOWS
+
+  m << "Exited with exit status " << exit_code;
+
+# else
+
+  if (WIFEXITED(exit_code)) {
+    m << "Exited with exit status " << WEXITSTATUS(exit_code);
+  } else if (WIFSIGNALED(exit_code)) {
+    m << "Terminated by signal " << WTERMSIG(exit_code);
+  }
+#  ifdef WCOREDUMP
+  if (WCOREDUMP(exit_code)) {
+    m << " (core dumped)";
+  }
+#  endif
+# endif  // GTEST_OS_WINDOWS
+
+  return m.GetString();
+}
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+bool ExitedUnsuccessfully(int exit_status) {
+  return !ExitedWithCode(0)(exit_status);
+}
+
+# if !GTEST_OS_WINDOWS
+// Generates a textual failure message when a death test finds more than
+// one thread running, or cannot determine the number of threads, prior
+// to executing the given statement.  It is the responsibility of the
+// caller not to pass a thread_count of 1.
+static std::string DeathTestThreadWarning(size_t thread_count) {
+  Message msg;
+  msg << "Death tests use fork(), which is unsafe particularly"
+      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
+  if (thread_count == 0)
+    msg << "couldn't detect the number of threads.";
+  else
+    msg << "detected " << thread_count << " threads.";
+  return msg.GetString();
+}
+# endif  // !GTEST_OS_WINDOWS
+
+// Flag characters for reporting a death test that did not die.
+static const char kDeathTestLived = 'L';
+static const char kDeathTestReturned = 'R';
+static const char kDeathTestThrew = 'T';
+static const char kDeathTestInternalError = 'I';
+
+// An enumeration describing all of the possible ways that a death test can
+// conclude.  DIED means that the process died while executing the test
+// code; LIVED means that process lived beyond the end of the test code;
+// RETURNED means that the test statement attempted to execute a return
+// statement, which is not allowed; THREW means that the test statement
+// returned control by throwing an exception.  IN_PROGRESS means the test
+// has not yet concluded.
+// TODO(vladl@google.com): Unify names and possibly values for
+// AbortReason, DeathTestOutcome, and flag characters above.
+enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
+
+// Routine for aborting the program which is safe to call from an
+// exec-style death test child process, in which case the error
+// message is propagated back to the parent process.  Otherwise, the
+// message is simply printed to stderr.  In either case, the program
+// then exits with status 1.
+void DeathTestAbort(const std::string& message) {
+  // On a POSIX system, this function may be called from a threadsafe-style
+  // death test child process, which operates on a very small stack.  Use
+  // the heap for any additional non-minuscule memory requirements.
+  const InternalRunDeathTestFlag* const flag =
+      GetUnitTestImpl()->internal_run_death_test_flag();
+  if (flag != NULL) {
+    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
+    fputc(kDeathTestInternalError, parent);
+    fprintf(parent, "%s", message.c_str());
+    fflush(parent);
+    _exit(1);
+  } else {
+    fprintf(stderr, "%s", message.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// A replacement for CHECK that calls DeathTestAbort if the assertion
+// fails.
+# define GTEST_DEATH_TEST_CHECK_(expression) \
+  do { \
+    if (!::testing::internal::IsTrue(expression)) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
+// evaluating any system call that fulfills two conditions: it must return
+// -1 on failure, and set errno to EINTR when it is interrupted and
+// should be tried again.  The macro expands to a loop that repeatedly
+// evaluates the expression as long as it evaluates to -1 and sets
+// errno to EINTR.  If the expression evaluates to -1 but errno is
+// something other than EINTR, DeathTestAbort is called.
+# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
+  do { \
+    int gtest_retval; \
+    do { \
+      gtest_retval = (expression); \
+    } while (gtest_retval == -1 && errno == EINTR); \
+    if (gtest_retval == -1) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression + " != -1"); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// Returns the message describing the last system error in errno.
+std::string GetLastErrnoDescription() {
+    return errno == 0 ? "" : posix::StrError(errno);
+}
+
+// This is called from a death test parent process to read a failure
+// message from the death test child process and log it with the FATAL
+// severity. On Windows, the message is read from a pipe handle. On other
+// platforms, it is read from a file descriptor.
+static void FailFromInternalError(int fd) {
+  Message error;
+  char buffer[256];
+  int num_read;
+
+  do {
+    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
+      buffer[num_read] = '\0';
+      error << buffer;
+    }
+  } while (num_read == -1 && errno == EINTR);
+
+  if (num_read == 0) {
+    GTEST_LOG_(FATAL) << error.GetString();
+  } else {
+    const int last_error = errno;
+    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
+                      << GetLastErrnoDescription() << " [" << last_error << "]";
+  }
+}
+
+// Death test constructor.  Increments the running death test count
+// for the current test.
+DeathTest::DeathTest() {
+  TestInfo* const info = GetUnitTestImpl()->current_test_info();
+  if (info == NULL) {
+    DeathTestAbort("Cannot run a death test outside of a TEST or "
+                   "TEST_F construct");
+  }
+}
+
+// Creates and returns a death test by dispatching to the current
+// death test factory.
+bool DeathTest::Create(const char* statement, const RE* regex,
+                       const char* file, int line, DeathTest** test) {
+  return GetUnitTestImpl()->death_test_factory()->Create(
+      statement, regex, file, line, test);
+}
+
+const char* DeathTest::LastMessage() {
+  return last_death_test_message_.c_str();
+}
+
+void DeathTest::set_last_death_test_message(const std::string& message) {
+  last_death_test_message_ = message;
+}
+
+std::string DeathTest::last_death_test_message_;
+
+// Provides cross platform implementation for some death functionality.
+class DeathTestImpl : public DeathTest {
+ protected:
+  DeathTestImpl(const char* a_statement, const RE* a_regex)
+      : statement_(a_statement),
+        regex_(a_regex),
+        spawned_(false),
+        status_(-1),
+        outcome_(IN_PROGRESS),
+        read_fd_(-1),
+        write_fd_(-1) {}
+
+  // read_fd_ is expected to be closed and cleared by a derived class.
+  ~DeathTestImpl() { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
+
+  void Abort(AbortReason reason);
+  virtual bool Passed(bool status_ok);
+
+  const char* statement() const { return statement_; }
+  const RE* regex() const { return regex_; }
+  bool spawned() const { return spawned_; }
+  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
+  int status() const { return status_; }
+  void set_status(int a_status) { status_ = a_status; }
+  DeathTestOutcome outcome() const { return outcome_; }
+  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
+  int read_fd() const { return read_fd_; }
+  void set_read_fd(int fd) { read_fd_ = fd; }
+  int write_fd() const { return write_fd_; }
+  void set_write_fd(int fd) { write_fd_ = fd; }
+
+  // Called in the parent process only. Reads the result code of the death
+  // test child process via a pipe, interprets it to set the outcome_
+  // member, and closes read_fd_.  Outputs diagnostics and terminates in
+  // case of unexpected codes.
+  void ReadAndInterpretStatusByte();
+
+ private:
+  // The textual content of the code this object is testing.  This class
+  // doesn't own this string and should not attempt to delete it.
+  const char* const statement_;
+  // The regular expression which test output must match.  DeathTestImpl
+  // doesn't own this object and should not attempt to delete it.
+  const RE* const regex_;
+  // True if the death test child process has been successfully spawned.
+  bool spawned_;
+  // The exit status of the child process.
+  int status_;
+  // How the death test concluded.
+  DeathTestOutcome outcome_;
+  // Descriptor to the read end of the pipe to the child process.  It is
+  // always -1 in the child process.  The child keeps its write end of the
+  // pipe in write_fd_.
+  int read_fd_;
+  // Descriptor to the child's write end of the pipe to the parent process.
+  // It is always -1 in the parent process.  The parent keeps its end of the
+  // pipe in read_fd_.
+  int write_fd_;
+};
+
+// Called in the parent process only. Reads the result code of the death
+// test child process via a pipe, interprets it to set the outcome_
+// member, and closes read_fd_.  Outputs diagnostics and terminates in
+// case of unexpected codes.
+void DeathTestImpl::ReadAndInterpretStatusByte() {
+  char flag;
+  int bytes_read;
+
+  // The read() here blocks until data is available (signifying the
+  // failure of the death test) or until the pipe is closed (signifying
+  // its success), so it's okay to call this in the parent before
+  // the child process has exited.
+  do {
+    bytes_read = posix::Read(read_fd(), &flag, 1);
+  } while (bytes_read == -1 && errno == EINTR);
+
+  if (bytes_read == 0) {
+    set_outcome(DIED);
+  } else if (bytes_read == 1) {
+    switch (flag) {
+      case kDeathTestReturned:
+        set_outcome(RETURNED);
+        break;
+      case kDeathTestThrew:
+        set_outcome(THREW);
+        break;
+      case kDeathTestLived:
+        set_outcome(LIVED);
+        break;
+      case kDeathTestInternalError:
+        FailFromInternalError(read_fd());  // Does not return.
+        break;
+      default:
+        GTEST_LOG_(FATAL) << "Death test child process reported "
+                          << "unexpected status byte ("
+                          << static_cast<unsigned int>(flag) << ")";
+    }
+  } else {
+    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
+                      << GetLastErrnoDescription();
+  }
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
+  set_read_fd(-1);
+}
+
+// Signals that the death test code which should have exited, didn't.
+// Should be called only in a death test child process.
+// Writes a status byte to the child's status file descriptor, then
+// calls _exit(1).
+void DeathTestImpl::Abort(AbortReason reason) {
+  // The parent process considers the death test to be a failure if
+  // it finds any data in our pipe.  So, here we write a single flag byte
+  // to the pipe, then exit.
+  const char status_ch =
+      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
+      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
+
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
+  // We are leaking the descriptor here because on some platforms (i.e.,
+  // when built as Windows DLL), destructors of global objects will still
+  // run after calling _exit(). On such systems, write_fd_ will be
+  // indirectly closed from the destructor of UnitTestImpl, causing double
+  // close if it is also closed here. On debug configurations, double close
+  // may assert. As there are no in-process buffers to flush here, we are
+  // relying on the OS to close the descriptor after the process terminates
+  // when the destructors are not run.
+  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
+}
+
+// Returns an indented copy of stderr output for a death test.
+// This makes distinguishing death test output lines from regular log lines
+// much easier.
+static ::std::string FormatDeathTestOutput(const ::std::string& output) {
+  ::std::string ret;
+  for (size_t at = 0; ; ) {
+    const size_t line_end = output.find('\n', at);
+    ret += "[  DEATH   ] ";
+    if (line_end == ::std::string::npos) {
+      ret += output.substr(at);
+      break;
+    }
+    ret += output.substr(at, line_end + 1 - at);
+    at = line_end + 1;
+  }
+  return ret;
+}
+
+// Assesses the success or failure of a death test, using both private
+// members which have previously been set, and one argument:
+//
+// Private data members:
+//   outcome:  An enumeration describing how the death test
+//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
+//             fails in the latter three cases.
+//   status:   The exit status of the child process. On *nix, it is in the
+//             in the format specified by wait(2). On Windows, this is the
+//             value supplied to the ExitProcess() API or a numeric code
+//             of the exception that terminated the program.
+//   regex:    A regular expression object to be applied to
+//             the test's captured standard error output; the death test
+//             fails if it does not match.
+//
+// Argument:
+//   status_ok: true if exit_status is acceptable in the context of
+//              this particular death test, which fails if it is false
+//
+// Returns true iff all of the above conditions are met.  Otherwise, the
+// first failing condition, in the order given above, is the one that is
+// reported. Also sets the last death test message string.
+bool DeathTestImpl::Passed(bool status_ok) {
+  if (!spawned())
+    return false;
+
+  const std::string error_message = GetCapturedStderr();
+
+  bool success = false;
+  Message buffer;
+
+  buffer << "Death test: " << statement() << "\n";
+  switch (outcome()) {
+    case LIVED:
+      buffer << "    Result: failed to die.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case THREW:
+      buffer << "    Result: threw an exception.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case RETURNED:
+      buffer << "    Result: illegal return in test statement.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case DIED:
+      if (status_ok) {
+        const bool matched = RE::PartialMatch(error_message.c_str(), *regex());
+        if (matched) {
+          success = true;
+        } else {
+          buffer << "    Result: died but not with expected error.\n"
+                 << "  Expected: " << regex()->pattern() << "\n"
+                 << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+        }
+      } else {
+        buffer << "    Result: died but not with expected exit code:\n"
+               << "            " << ExitSummary(status()) << "\n"
+               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+      }
+      break;
+    case IN_PROGRESS:
+    default:
+      GTEST_LOG_(FATAL)
+          << "DeathTest::Passed somehow called before conclusion of test";
+  }
+
+  DeathTest::set_last_death_test_message(buffer.GetString());
+  return success;
+}
+
+# if GTEST_OS_WINDOWS
+// WindowsDeathTest implements death tests on Windows. Due to the
+// specifics of starting new processes on Windows, death tests there are
+// always threadsafe, and Google Test considers the
+// --gtest_death_test_style=fast setting to be equivalent to
+// --gtest_death_test_style=threadsafe there.
+//
+// A few implementation notes:  Like the Linux version, the Windows
+// implementation uses pipes for child-to-parent communication. But due to
+// the specifics of pipes on Windows, some extra steps are required:
+//
+// 1. The parent creates a communication pipe and stores handles to both
+//    ends of it.
+// 2. The parent starts the child and provides it with the information
+//    necessary to acquire the handle to the write end of the pipe.
+// 3. The child acquires the write end of the pipe and signals the parent
+//    using a Windows event.
+// 4. Now the parent can release the write end of the pipe on its side. If
+//    this is done before step 3, the object's reference count goes down to
+//    0 and it is destroyed, preventing the child from acquiring it. The
+//    parent now has to release it, or read operations on the read end of
+//    the pipe will not return when the child terminates.
+// 5. The parent reads child's output through the pipe (outcome code and
+//    any possible error messages) from the pipe, and its stderr and then
+//    determines whether to fail the test.
+//
+// Note: to distinguish Win32 API calls from the local method and function
+// calls, the former are explicitly resolved in the global namespace.
+//
+class WindowsDeathTest : public DeathTestImpl {
+ public:
+  WindowsDeathTest(const char* a_statement,
+                   const RE* a_regex,
+                   const char* file,
+                   int line)
+      : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+  virtual TestRole AssumeRole();
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // Handle to the write end of the pipe to the child process.
+  AutoHandle write_handle_;
+  // Child process handle.
+  AutoHandle child_handle_;
+  // Event the child process uses to signal the parent that it has
+  // acquired the handle to the write end of the pipe. After seeing this
+  // event the parent can release its own handles to make sure its
+  // ReadFile() calls return when the child terminates.
+  AutoHandle event_handle_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int WindowsDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  // Wait until the child either signals that it has acquired the write end
+  // of the pipe or it dies.
+  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
+  switch (::WaitForMultipleObjects(2,
+                                   wait_handles,
+                                   FALSE,  // Waits for any of the handles.
+                                   INFINITE)) {
+    case WAIT_OBJECT_0:
+    case WAIT_OBJECT_0 + 1:
+      break;
+    default:
+      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
+  }
+
+  // The child has acquired the write end of the pipe or exited.
+  // We release the handle on our side and continue.
+  write_handle_.Reset();
+  event_handle_.Reset();
+
+  ReadAndInterpretStatusByte();
+
+  // Waits for the child process to exit if it haven't already. This
+  // returns immediately if the child has already exited, regardless of
+  // whether previous calls to WaitForMultipleObjects synchronized on this
+  // handle or not.
+  GTEST_DEATH_TEST_CHECK_(
+      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
+                                             INFINITE));
+  DWORD status_code;
+  GTEST_DEATH_TEST_CHECK_(
+      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
+  child_handle_.Reset();
+  set_status(static_cast<int>(status_code));
+  return status();
+}
+
+// The AssumeRole process for a Windows death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole WindowsDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != NULL) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  // WindowsDeathTest uses an anonymous pipe to communicate results of
+  // a death test.
+  SECURITY_ATTRIBUTES handles_are_inheritable = {
+    sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
+  HANDLE read_handle, write_handle;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
+                   0)  // Default buffer size.
+      != FALSE);
+  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
+                                O_RDONLY));
+  write_handle_.Reset(write_handle);
+  event_handle_.Reset(::CreateEvent(
+      &handles_are_inheritable,
+      TRUE,    // The event will automatically reset to non-signaled state.
+      FALSE,   // The initial state is non-signalled.
+      NULL));  // The even is unnamed.
+  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL);
+  const std::string filter_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" +
+      info->test_case_name() + "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
+      "=" + file_ + "|" + StreamableToString(line_) + "|" +
+      StreamableToString(death_test_index) + "|" +
+      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
+      // size_t has the same width as pointers on both 32-bit and 64-bit
+      // Windows platforms.
+      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
+      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
+      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
+
+  char executable_path[_MAX_PATH + 1];  // NOLINT
+  GTEST_DEATH_TEST_CHECK_(
+      _MAX_PATH + 1 != ::GetModuleFileNameA(NULL,
+                                            executable_path,
+                                            _MAX_PATH));
+
+  std::string command_line =
+      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
+      internal_flag + "\"";
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // The child process will share the standard handles with the parent.
+  STARTUPINFOA startup_info;
+  memset(&startup_info, 0, sizeof(STARTUPINFO));
+  startup_info.dwFlags = STARTF_USESTDHANDLES;
+  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
+  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
+  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
+
+  PROCESS_INFORMATION process_info;
+  GTEST_DEATH_TEST_CHECK_(::CreateProcessA(
+      executable_path,
+      const_cast<char*>(command_line.c_str()),
+      NULL,   // Retuned process handle is not inheritable.
+      NULL,   // Retuned thread handle is not inheritable.
+      TRUE,   // Child inherits all inheritable handles (for write_handle_).
+      0x0,    // Default creation flags.
+      NULL,   // Inherit the parent's environment.
+      UnitTest::GetInstance()->original_working_dir(),
+      &startup_info,
+      &process_info) != FALSE);
+  child_handle_.Reset(process_info.hProcess);
+  ::CloseHandle(process_info.hThread);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+# else  // We are not on Windows.
+
+// ForkingDeathTest provides implementations for most of the abstract
+// methods of the DeathTest interface.  Only the AssumeRole method is
+// left undefined.
+class ForkingDeathTest : public DeathTestImpl {
+ public:
+  ForkingDeathTest(const char* statement, const RE* regex);
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+
+ protected:
+  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
+
+ private:
+  // PID of child process during death test; 0 in the child process itself.
+  pid_t child_pid_;
+};
+
+// Constructs a ForkingDeathTest.
+ForkingDeathTest::ForkingDeathTest(const char* a_statement, const RE* a_regex)
+    : DeathTestImpl(a_statement, a_regex),
+      child_pid_(-1) {}
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int ForkingDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  ReadAndInterpretStatusByte();
+
+  int status_value;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
+  set_status(status_value);
+  return status_value;
+}
+
+// A concrete death test class that forks, then immediately runs the test
+// in the child process.
+class NoExecDeathTest : public ForkingDeathTest {
+ public:
+  NoExecDeathTest(const char* a_statement, const RE* a_regex) :
+      ForkingDeathTest(a_statement, a_regex) { }
+  virtual TestRole AssumeRole();
+};
+
+// The AssumeRole process for a fork-and-run death test.  It implements a
+// straightforward fork, with a simple pipe to transmit the status byte.
+DeathTest::TestRole NoExecDeathTest::AssumeRole() {
+  const size_t thread_count = GetThreadCount();
+  if (thread_count != 1) {
+    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+
+  DeathTest::set_last_death_test_message("");
+  CaptureStderr();
+  // When we fork the process below, the log file buffers are copied, but the
+  // file descriptors are shared.  We flush all log files here so that closing
+  // the file descriptors in the child process doesn't throw off the
+  // synchronization between descriptors and buffers in the parent process.
+  // This is as close to the fork as possible to avoid a race condition in case
+  // there are multiple threads running before the death test, and another
+  // thread writes to the log file.
+  FlushInfoLog();
+
+  const pid_t child_pid = fork();
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  set_child_pid(child_pid);
+  if (child_pid == 0) {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
+    set_write_fd(pipe_fd[1]);
+    // Redirects all logging to stderr in the child process to prevent
+    // concurrent writes to the log files.  We capture stderr in the parent
+    // process and append the child process' output to a log.
+    LogToStderr();
+    // Event forwarding to the listeners of event listener API mush be shut
+    // down in death test subprocesses.
+    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
+    g_in_fast_death_test_child = true;
+    return EXECUTE_TEST;
+  } else {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+    set_read_fd(pipe_fd[0]);
+    set_spawned(true);
+    return OVERSEE_TEST;
+  }
+}
+
+// A concrete death test class that forks and re-executes the main
+// program from the beginning, with command-line flags set that cause
+// only this specific death test to be run.
+class ExecDeathTest : public ForkingDeathTest {
+ public:
+  ExecDeathTest(const char* a_statement, const RE* a_regex,
+                const char* file, int line) :
+      ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { }
+  virtual TestRole AssumeRole();
+ private:
+  static ::std::vector<testing::internal::string>
+  GetArgvsForDeathTestChildProcess() {
+    ::std::vector<testing::internal::string> args = GetInjectableArgvs();
+    return args;
+  }
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() {
+    args_.push_back(NULL);
+  }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// A struct that encompasses the arguments to the child process of a
+// threadsafe-style death test process.
+struct ExecDeathTestArgs {
+  char* const* argv;  // Command-line arguments for the child's call to exec
+  int close_fd;       // File descriptor to close; the read end of a pipe
+};
+
+#  if GTEST_OS_MAC
+inline char** GetEnviron() {
+  // When Google Test is built as a framework on MacOS X, the environ variable
+  // is unavailable. Apple's documentation (man environ) recommends using
+  // _NSGetEnviron() instead.
+  return *_NSGetEnviron();
+}
+#  else
+// Some POSIX platforms expect you to declare environ. extern "C" makes
+// it reside in the global namespace.
+extern "C" char** environ;
+inline char** GetEnviron() { return environ; }
+#  endif  // GTEST_OS_MAC
+
+#  if !GTEST_OS_QNX
+// The main function for a threadsafe-style death test child process.
+// This function is called in a clone()-ed process and thus must avoid
+// any potentially unsafe operations like malloc or libc functions.
+static int ExecDeathTestChildMain(void* child_arg) {
+  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
+
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  // We can safely call execve() as it's a direct system call.  We
+  // cannot use execvp() as it's a libc function and thus potentially
+  // unsafe.  Since execve() doesn't search the PATH, the user must
+  // invoke the test program via a valid path that contains at least
+  // one path separator.
+  execve(args->argv[0], args->argv, GetEnviron());
+  DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
+                 original_dir + " failed: " +
+                 GetLastErrnoDescription());
+  return EXIT_FAILURE;
+}
+#  endif  // !GTEST_OS_QNX
+
+// Two utility routines that together determine the direction the stack
+// grows.
+// This could be accomplished more elegantly by a single recursive
+// function, but we want to guard against the unlikely possibility of
+// a smart compiler optimizing the recursion away.
+//
+// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
+// StackLowerThanAddress into StackGrowsDown, which then doesn't give
+// correct answer.
+void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_;
+void StackLowerThanAddress(const void* ptr, bool* result) {
+  int dummy;
+  *result = (&dummy < ptr);
+}
+
+bool StackGrowsDown() {
+  int dummy;
+  bool result;
+  StackLowerThanAddress(&dummy, &result);
+  return result;
+}
+
+// Spawns a child process with the same executable as the current process in
+// a thread-safe manner and instructs it to run the death test.  The
+// implementation uses fork(2) + exec.  On systems where clone(2) is
+// available, it is used instead, being slightly more thread-safe.  On QNX,
+// fork supports only single-threaded environments, so this function uses
+// spawn(2) there instead.  The function dies with an error message if
+// anything goes wrong.
+static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
+  ExecDeathTestArgs args = { argv, close_fd };
+  pid_t child_pid = -1;
+
+#  if GTEST_OS_QNX
+  // Obtains the current directory and sets it to be closed in the child
+  // process.
+  const int cwd_fd = open(".", O_RDONLY);
+  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  int fd_flags;
+  // Set close_fd to be closed after spawn.
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
+                                        fd_flags | FD_CLOEXEC));
+  struct inheritance inherit = {0};
+  // spawn is a system call.
+  child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron());
+  // Restores the current working directory.
+  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
+
+#  else   // GTEST_OS_QNX
+#   if GTEST_OS_LINUX
+  // When a SIGPROF signal is received while fork() or clone() are executing,
+  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
+  // it after the call to fork()/clone() is complete.
+  struct sigaction saved_sigprof_action;
+  struct sigaction ignore_sigprof_action;
+  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
+  sigemptyset(&ignore_sigprof_action.sa_mask);
+  ignore_sigprof_action.sa_handler = SIG_IGN;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
+      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
+#   endif  // GTEST_OS_LINUX
+
+#   if GTEST_HAS_CLONE
+  const bool use_fork = GTEST_FLAG(death_test_use_fork);
+
+  if (!use_fork) {
+    static const bool stack_grows_down = StackGrowsDown();
+    const size_t stack_size = getpagesize();
+    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+    void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
+                             MAP_ANON | MAP_PRIVATE, -1, 0);
+    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
+
+    // Maximum stack alignment in bytes:  For a downward-growing stack, this
+    // amount is subtracted from size of the stack space to get an address
+    // that is within the stack space and is aligned on all systems we care
+    // about.  As far as I know there is no ABI with stack alignment greater
+    // than 64.  We assume stack and stack_size already have alignment of
+    // kMaxStackAlignment.
+    const size_t kMaxStackAlignment = 64;
+    void* const stack_top =
+        static_cast<char*>(stack) +
+            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
+    GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment &&
+        reinterpret_cast<intptr_t>(stack_top) % kMaxStackAlignment == 0);
+
+    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
+
+    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
+  }
+#   else
+  const bool use_fork = true;
+#   endif  // GTEST_HAS_CLONE
+
+  if (use_fork && (child_pid = fork()) == 0) {
+      ExecDeathTestChildMain(&args);
+      _exit(0);
+  }
+#  endif  // GTEST_OS_QNX
+#  if GTEST_OS_LINUX
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(
+      sigaction(SIGPROF, &saved_sigprof_action, NULL));
+#  endif  // GTEST_OS_LINUX
+
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  return child_pid;
+}
+
+// The AssumeRole process for a fork-and-exec death test.  It re-executes the
+// main program from the beginning, setting the --gtest_filter
+// and --gtest_internal_run_death_test flags to cause only the current
+// death test to be re-run.
+DeathTest::TestRole ExecDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != NULL) {
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+  // Clear the close-on-exec flag on the write end of the pipe, lest
+  // it be closed when the child process does an exec:
+  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
+
+  const std::string filter_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "="
+      + info->test_case_name() + "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|" + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index) + "|"
+      + StreamableToString(pipe_fd[1]);
+  Arguments args;
+  args.AddArguments(GetArgvsForDeathTestChildProcess());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // See the comment in NoExecDeathTest::AssumeRole for why the next line
+  // is necessary.
+  FlushInfoLog();
+
+  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+  set_child_pid(child_pid);
+  set_read_fd(pipe_fd[0]);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# endif  // !GTEST_OS_WINDOWS
+
+// Creates a concrete DeathTest-derived class that depends on the
+// --gtest_death_test_style flag, and sets the pointer pointed to
+// by the "test" argument to its address.  If the test should be
+// skipped, sets that pointer to NULL.  Returns true, unless the
+// flag is set to an invalid value.
+bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex,
+                                     const char* file, int line,
+                                     DeathTest** test) {
+  UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const int death_test_index = impl->current_test_info()
+      ->increment_death_test_count();
+
+  if (flag != NULL) {
+    if (death_test_index > flag->index()) {
+      DeathTest::set_last_death_test_message(
+          "Death test count (" + StreamableToString(death_test_index)
+          + ") somehow exceeded expected maximum ("
+          + StreamableToString(flag->index()) + ")");
+      return false;
+    }
+
+    if (!(flag->file() == file && flag->line() == line &&
+          flag->index() == death_test_index)) {
+      *test = NULL;
+      return true;
+    }
+  }
+
+# if GTEST_OS_WINDOWS
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new WindowsDeathTest(statement, regex, file, line);
+  }
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe") {
+    *test = new ExecDeathTest(statement, regex, file, line);
+  } else if (GTEST_FLAG(death_test_style) == "fast") {
+    *test = new NoExecDeathTest(statement, regex);
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
+    DeathTest::set_last_death_test_message(
+        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
+        + "\" encountered");
+    return false;
+  }
+
+  return true;
+}
+
+// Splits a given string on a given delimiter, populating a given
+// vector with the fields.  GTEST_HAS_DEATH_TEST implies that we have
+// ::std::string, so we can use it here.
+static void SplitString(const ::std::string& str, char delimiter,
+                        ::std::vector< ::std::string>* dest) {
+  ::std::vector< ::std::string> parsed;
+  ::std::string::size_type pos = 0;
+  while (::testing::internal::AlwaysTrue()) {
+    const ::std::string::size_type colon = str.find(delimiter, pos);
+    if (colon == ::std::string::npos) {
+      parsed.push_back(str.substr(pos));
+      break;
+    } else {
+      parsed.push_back(str.substr(pos, colon - pos));
+      pos = colon + 1;
+    }
+  }
+  dest->swap(parsed);
+}
+
+# if GTEST_OS_WINDOWS
+// Recreates the pipe and event handles from the provided parameters,
+// signals the event, and returns a file descriptor wrapped around the pipe
+// handle. This function is called in the child process only.
+int GetStatusFileDescriptor(unsigned int parent_process_id,
+                            size_t write_handle_as_size_t,
+                            size_t event_handle_as_size_t) {
+  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
+                                                   FALSE,  // Non-inheritable.
+                                                   parent_process_id));
+  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
+    DeathTestAbort("Unable to open parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  // TODO(vladl@google.com): Replace the following check with a
+  // compile-time assertion when available.
+  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
+
+  const HANDLE write_handle =
+      reinterpret_cast<HANDLE>(write_handle_as_size_t);
+  HANDLE dup_write_handle;
+
+  // The newly initialized handle is accessible only in in the parent
+  // process. To obtain one accessible within the child, we need to use
+  // DuplicateHandle.
+  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
+                         ::GetCurrentProcess(), &dup_write_handle,
+                         0x0,    // Requested privileges ignored since
+                                 // DUPLICATE_SAME_ACCESS is used.
+                         FALSE,  // Request non-inheritable handler.
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
+  HANDLE dup_event_handle;
+
+  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
+                         ::GetCurrentProcess(), &dup_event_handle,
+                         0x0,
+                         FALSE,
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the event handle " +
+                   StreamableToString(event_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const int write_fd =
+      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
+  if (write_fd == -1) {
+    DeathTestAbort("Unable to convert pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " to a file descriptor");
+  }
+
+  // Signals the parent that the write end of the pipe has been acquired
+  // so the parent can release its own write end.
+  ::SetEvent(dup_event_handle);
+
+  return write_fd;
+}
+# endif  // GTEST_OS_WINDOWS
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
+  if (GTEST_FLAG(internal_run_death_test) == "") return NULL;
+
+  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
+  // can use it here.
+  int line = -1;
+  int index = -1;
+  ::std::vector< ::std::string> fields;
+  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
+  int write_fd = -1;
+
+# if GTEST_OS_WINDOWS
+
+  unsigned int parent_process_id = 0;
+  size_t write_handle_as_size_t = 0;
+  size_t event_handle_as_size_t = 0;
+
+  if (fields.size() != 6
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &parent_process_id)
+      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
+      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
+                   GTEST_FLAG(internal_run_death_test));
+  }
+  write_fd = GetStatusFileDescriptor(parent_process_id,
+                                     write_handle_as_size_t,
+                                     event_handle_as_size_t);
+# else
+
+  if (fields.size() != 4
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &write_fd)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
+}
+
+}  // namespace internal
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest-filepath.cc b/Externals/gtest/src/gtest-filepath.cc
new file mode 100644
index 0000000000..d221cfdec1
--- /dev/null
+++ b/Externals/gtest/src/gtest-filepath.cc
@@ -0,0 +1,380 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Authors: keith.ray@gmail.com (Keith Ray)
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/internal/gtest-port.h"
+
+#include <stdlib.h>
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>
+#elif GTEST_OS_WINDOWS
+# include <direct.h>
+# include <io.h>
+#elif GTEST_OS_SYMBIAN
+// Symbian OpenC has PATH_MAX in sys/syslimits.h
+# include <sys/syslimits.h>
+#else
+# include <limits.h>
+# include <climits>  // Some Linux distributions define PATH_MAX here.
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_MAX_ _MAX_PATH
+#elif defined(PATH_MAX)
+# define GTEST_PATH_MAX_ PATH_MAX
+#elif defined(_XOPEN_PATH_MAX)
+# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
+#else
+# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
+#endif  // GTEST_OS_WINDOWS
+
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+// On Windows, '\\' is the standard path separator, but many tools and the
+// Windows API also accept '/' as an alternate path separator. Unless otherwise
+// noted, a file path can contain either kind of path separators, or a mixture
+// of them.
+const char kPathSeparator = '\\';
+const char kAlternatePathSeparator = '/';
+const char kAlternatePathSeparatorString[] = "/";
+# if GTEST_OS_WINDOWS_MOBILE
+// Windows CE doesn't have a current directory. You should not use
+// the current directory in tests on Windows CE, but this at least
+// provides a reasonable fallback.
+const char kCurrentDirectoryString[] = "\\";
+// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
+const DWORD kInvalidFileAttributes = 0xffffffff;
+# else
+const char kCurrentDirectoryString[] = ".\\";
+# endif  // GTEST_OS_WINDOWS_MOBILE
+#else
+const char kPathSeparator = '/';
+const char kCurrentDirectoryString[] = "./";
+#endif  // GTEST_OS_WINDOWS
+
+// Returns whether the given character is a valid path separator.
+static bool IsPathSeparator(char c) {
+#if GTEST_HAS_ALT_PATH_SEP_
+  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
+#else
+  return c == kPathSeparator;
+#endif
+}
+
+// Returns the current working directory, or "" if unsuccessful.
+FilePath FilePath::GetCurrentDir() {
+#if GTEST_OS_WINDOWS_MOBILE
+  // Windows CE doesn't have a current directory, so we just return
+  // something reasonable.
+  return FilePath(kCurrentDirectoryString);
+#elif GTEST_OS_WINDOWS
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd);
+#else
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  return FilePath(getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns a copy of the FilePath with the case-insensitive extension removed.
+// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+// FilePath("dir/file"). If a case-insensitive extension is not
+// found, returns a copy of the original FilePath.
+FilePath FilePath::RemoveExtension(const char* extension) const {
+  const std::string dot_extension = std::string(".") + extension;
+  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
+    return FilePath(pathname_.substr(
+        0, pathname_.length() - dot_extension.length()));
+  }
+  return *this;
+}
+
+// Returns a pointer to the last occurence of a valid path separator in
+// the FilePath. On Windows, for example, both '/' and '\' are valid path
+// separators. Returns NULL if no path separator was found.
+const char* FilePath::FindLastPathSeparator() const {
+  const char* const last_sep = strrchr(c_str(), kPathSeparator);
+#if GTEST_HAS_ALT_PATH_SEP_
+  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
+  // Comparing two pointers of which only one is NULL is undefined.
+  if (last_alt_sep != NULL &&
+      (last_sep == NULL || last_alt_sep > last_sep)) {
+    return last_alt_sep;
+  }
+#endif
+  return last_sep;
+}
+
+// Returns a copy of the FilePath with the directory part removed.
+// Example: FilePath("path/to/file").RemoveDirectoryName() returns
+// FilePath("file"). If there is no directory part ("just_a_file"), it returns
+// the FilePath unmodified. If there is no file part ("just_a_dir/") it
+// returns an empty FilePath ("").
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveDirectoryName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  return last_sep ? FilePath(last_sep + 1) : *this;
+}
+
+// RemoveFileName returns the directory path with the filename removed.
+// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveFileName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  std::string dir;
+  if (last_sep) {
+    dir = std::string(c_str(), last_sep + 1 - c_str());
+  } else {
+    dir = kCurrentDirectoryString;
+  }
+  return FilePath(dir);
+}
+
+// Helper functions for naming files in a directory for xml output.
+
+// Given directory = "dir", base_name = "test", number = 0,
+// extension = "xml", returns "dir/test.xml". If number is greater
+// than zero (e.g., 12), returns "dir/test_12.xml".
+// On Windows platform, uses \ as the separator rather than /.
+FilePath FilePath::MakeFileName(const FilePath& directory,
+                                const FilePath& base_name,
+                                int number,
+                                const char* extension) {
+  std::string file;
+  if (number == 0) {
+    file = base_name.string() + "." + extension;
+  } else {
+    file = base_name.string() + "_" + StreamableToString(number)
+        + "." + extension;
+  }
+  return ConcatPaths(directory, FilePath(file));
+}
+
+// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
+// On Windows, uses \ as the separator rather than /.
+FilePath FilePath::ConcatPaths(const FilePath& directory,
+                               const FilePath& relative_path) {
+  if (directory.IsEmpty())
+    return relative_path;
+  const FilePath dir(directory.RemoveTrailingPathSeparator());
+  return FilePath(dir.string() + kPathSeparator + relative_path.string());
+}
+
+// Returns true if pathname describes something findable in the file-system,
+// either a file, directory, or whatever.
+bool FilePath::FileOrDirectoryExists() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  return attributes != kInvalidFileAttributes;
+#else
+  posix::StatStruct file_stat;
+  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns true if pathname describes a directory in the file-system
+// that exists.
+bool FilePath::DirectoryExists() const {
+  bool result = false;
+#if GTEST_OS_WINDOWS
+  // Don't strip off trailing separator if path is a root directory on
+  // Windows (like "C:\\").
+  const FilePath& path(IsRootDirectory() ? *this :
+                                           RemoveTrailingPathSeparator());
+#else
+  const FilePath& path(*this);
+#endif
+
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  if ((attributes != kInvalidFileAttributes) &&
+      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+    result = true;
+  }
+#else
+  posix::StatStruct file_stat;
+  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
+      posix::IsDir(file_stat);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  return result;
+}
+
+// Returns true if pathname describes a root directory. (Windows has one
+// root directory per disk drive.)
+bool FilePath::IsRootDirectory() const {
+#if GTEST_OS_WINDOWS
+  // TODO(wan@google.com): on Windows a network share like
+  // \\server\share can be a root directory, although it cannot be the
+  // current directory.  Handle this properly.
+  return pathname_.length() == 3 && IsAbsolutePath();
+#else
+  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
+#endif
+}
+
+// Returns true if pathname describes an absolute path.
+bool FilePath::IsAbsolutePath() const {
+  const char* const name = pathname_.c_str();
+#if GTEST_OS_WINDOWS
+  return pathname_.length() >= 3 &&
+     ((name[0] >= 'a' && name[0] <= 'z') ||
+      (name[0] >= 'A' && name[0] <= 'Z')) &&
+     name[1] == ':' &&
+     IsPathSeparator(name[2]);
+#else
+  return IsPathSeparator(name[0]);
+#endif
+}
+
+// Returns a pathname for a file that does not currently exist. The pathname
+// will be directory/base_name.extension or
+// directory/base_name_<number>.extension if directory/base_name.extension
+// already exists. The number will be incremented until a pathname is found
+// that does not already exist.
+// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+// There could be a race condition if two or more processes are calling this
+// function at the same time -- they could both pick the same filename.
+FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
+                                          const FilePath& base_name,
+                                          const char* extension) {
+  FilePath full_pathname;
+  int number = 0;
+  do {
+    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
+  } while (full_pathname.FileOrDirectoryExists());
+  return full_pathname;
+}
+
+// Returns true if FilePath ends with a path separator, which indicates that
+// it is intended to represent a directory. Returns false otherwise.
+// This does NOT check that a directory (or file) actually exists.
+bool FilePath::IsDirectory() const {
+  return !pathname_.empty() &&
+         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
+}
+
+// Create directories so that path exists. Returns true if successful or if
+// the directories already exist; returns false if unable to create directories
+// for any reason.
+bool FilePath::CreateDirectoriesRecursively() const {
+  if (!this->IsDirectory()) {
+    return false;
+  }
+
+  if (pathname_.length() == 0 || this->DirectoryExists()) {
+    return true;
+  }
+
+  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
+  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
+}
+
+// Create the directory so that path exists. Returns true if successful or
+// if the directory already exists; returns false if unable to create the
+// directory for any reason, including if the parent directory does not
+// exist. Not named "CreateDirectory" because that's a macro on Windows.
+bool FilePath::CreateFolder() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  FilePath removed_sep(this->RemoveTrailingPathSeparator());
+  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
+  int result = CreateDirectory(unicode, NULL) ? 0 : -1;
+  delete [] unicode;
+#elif GTEST_OS_WINDOWS
+  int result = _mkdir(pathname_.c_str());
+#else
+  int result = mkdir(pathname_.c_str(), 0777);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  if (result == -1) {
+    return this->DirectoryExists();  // An error is OK if the directory exists.
+  }
+  return true;  // No error.
+}
+
+// If input name has a trailing separator character, remove it and return the
+// name, otherwise return the name string unmodified.
+// On Windows platform, uses \ as the separator, other platforms use /.
+FilePath FilePath::RemoveTrailingPathSeparator() const {
+  return IsDirectory()
+      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
+      : *this;
+}
+
+// Removes any redundant separators that might be in the pathname.
+// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+// redundancies that might be in a pathname involving "." or "..".
+// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share).
+void FilePath::Normalize() {
+  if (pathname_.c_str() == NULL) {
+    pathname_ = "";
+    return;
+  }
+  const char* src = pathname_.c_str();
+  char* const dest = new char[pathname_.length() + 1];
+  char* dest_ptr = dest;
+  memset(dest_ptr, 0, pathname_.length() + 1);
+
+  while (*src != '\0') {
+    *dest_ptr = *src;
+    if (!IsPathSeparator(*src)) {
+      src++;
+    } else {
+#if GTEST_HAS_ALT_PATH_SEP_
+      if (*dest_ptr == kAlternatePathSeparator) {
+        *dest_ptr = kPathSeparator;
+      }
+#endif
+      while (IsPathSeparator(*src))
+        src++;
+    }
+    dest_ptr++;
+  }
+  *dest_ptr = '\0';
+  pathname_ = dest;
+  delete[] dest;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest-internal-inl.h b/Externals/gtest/src/gtest-internal-inl.h
new file mode 100644
index 0000000000..35df303cca
--- /dev/null
+++ b/Externals/gtest/src/gtest-internal-inl.h
@@ -0,0 +1,1218 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+
+// Utility functions and classes used by the Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// This file contains purely Google Test's internal implementation.  Please
+// DO NOT #INCLUDE IT IN A USER PROGRAM.
+
+#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
+#define GTEST_SRC_GTEST_INTERNAL_INL_H_
+
+// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is
+// part of Google Test's implementation; otherwise it's undefined.
+#if !GTEST_IMPLEMENTATION_
+// A user is trying to include this from his code - just say no.
+# error "gtest-internal-inl.h is part of Google Test's internal implementation."
+# error "It must not be included except by Google Test itself."
+#endif  // GTEST_IMPLEMENTATION_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif  // !_WIN32_WCE
+#include <stddef.h>
+#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
+#include <string.h>  // For memmove.
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+#endif
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+#include "gtest/gtest.h"  // NOLINT
+#include "gtest/gtest-spi.h"
+
+namespace testing {
+
+// Declares the flags.
+//
+// We don't want the users to modify this flag in the code, but want
+// Google Test's own unit tests to be able to access it. Therefore we
+// declare it here as opposed to in gtest.h.
+GTEST_DECLARE_bool_(death_test_use_fork);
+
+namespace internal {
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
+const char kBreakOnFailureFlag[] = "break_on_failure";
+const char kCatchExceptionsFlag[] = "catch_exceptions";
+const char kColorFlag[] = "color";
+const char kFilterFlag[] = "filter";
+const char kListTestsFlag[] = "list_tests";
+const char kOutputFlag[] = "output";
+const char kPrintTimeFlag[] = "print_time";
+const char kRandomSeedFlag[] = "random_seed";
+const char kRepeatFlag[] = "repeat";
+const char kShuffleFlag[] = "shuffle";
+const char kStackTraceDepthFlag[] = "stack_trace_depth";
+const char kStreamResultToFlag[] = "stream_result_to";
+const char kThrowOnFailureFlag[] = "throw_on_failure";
+
+// A valid random seed must be in [1, kMaxRandomSeed].
+const int kMaxRandomSeed = 99999;
+
+// g_help_flag is true iff the --help flag or an equivalent form is
+// specified on the command line.
+GTEST_API_ extern bool g_help_flag;
+
+// Returns the current time in milliseconds.
+GTEST_API_ TimeInMillis GetTimeInMillis();
+
+// Returns true iff Google Test should use colors in the output.
+GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
+
+// Formats the given time in milliseconds as seconds.
+GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
+
+// Converts the given time in milliseconds to a date string in the ISO 8601
+// format, without the timezone information.  N.B.: due to the use the
+// non-reentrant localtime() function, this function is not thread safe.  Do
+// not use it in any code that can be called from multiple threads.
+GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
+
+// Parses a string for an Int32 flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+GTEST_API_ bool ParseInt32Flag(
+    const char* str, const char* flag, Int32* value);
+
+// Returns a random seed in range [1, kMaxRandomSeed] based on the
+// given --gtest_random_seed flag value.
+inline int GetRandomSeedFromFlag(Int32 random_seed_flag) {
+  const unsigned int raw_seed = (random_seed_flag == 0) ?
+      static_cast<unsigned int>(GetTimeInMillis()) :
+      static_cast<unsigned int>(random_seed_flag);
+
+  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
+  // it's easy to type.
+  const int normalized_seed =
+      static_cast<int>((raw_seed - 1U) %
+                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
+  return normalized_seed;
+}
+
+// Returns the first valid random seed after 'seed'.  The behavior is
+// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
+// considered to be 1.
+inline int GetNextRandomSeed(int seed) {
+  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
+      << "Invalid random seed " << seed << " - must be in [1, "
+      << kMaxRandomSeed << "].";
+  const int next_seed = seed + 1;
+  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
+}
+
+// This class saves the values of all Google Test flags in its c'tor, and
+// restores them in its d'tor.
+class GTestFlagSaver {
+ public:
+  // The c'tor.
+  GTestFlagSaver() {
+    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
+    break_on_failure_ = GTEST_FLAG(break_on_failure);
+    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
+    color_ = GTEST_FLAG(color);
+    death_test_style_ = GTEST_FLAG(death_test_style);
+    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
+    filter_ = GTEST_FLAG(filter);
+    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
+    list_tests_ = GTEST_FLAG(list_tests);
+    output_ = GTEST_FLAG(output);
+    print_time_ = GTEST_FLAG(print_time);
+    random_seed_ = GTEST_FLAG(random_seed);
+    repeat_ = GTEST_FLAG(repeat);
+    shuffle_ = GTEST_FLAG(shuffle);
+    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
+    stream_result_to_ = GTEST_FLAG(stream_result_to);
+    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
+  }
+
+  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
+  ~GTestFlagSaver() {
+    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
+    GTEST_FLAG(break_on_failure) = break_on_failure_;
+    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
+    GTEST_FLAG(color) = color_;
+    GTEST_FLAG(death_test_style) = death_test_style_;
+    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
+    GTEST_FLAG(filter) = filter_;
+    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
+    GTEST_FLAG(list_tests) = list_tests_;
+    GTEST_FLAG(output) = output_;
+    GTEST_FLAG(print_time) = print_time_;
+    GTEST_FLAG(random_seed) = random_seed_;
+    GTEST_FLAG(repeat) = repeat_;
+    GTEST_FLAG(shuffle) = shuffle_;
+    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
+    GTEST_FLAG(stream_result_to) = stream_result_to_;
+    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
+  }
+
+ private:
+  // Fields for saving the original values of flags.
+  bool also_run_disabled_tests_;
+  bool break_on_failure_;
+  bool catch_exceptions_;
+  std::string color_;
+  std::string death_test_style_;
+  bool death_test_use_fork_;
+  std::string filter_;
+  std::string internal_run_death_test_;
+  bool list_tests_;
+  std::string output_;
+  bool print_time_;
+  internal::Int32 random_seed_;
+  internal::Int32 repeat_;
+  bool shuffle_;
+  internal::Int32 stack_trace_depth_;
+  std::string stream_result_to_;
+  bool throw_on_failure_;
+} GTEST_ATTRIBUTE_UNUSED_;
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+GTEST_API_ std::string CodePointToUtf8(UInt32 code_point);
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded();
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (e.g., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+GTEST_API_ bool ShouldShard(const char* total_shards_str,
+                            const char* shard_index_str,
+                            bool in_subprocess_for_death_test);
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error and
+// and aborts.
+GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val);
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true iff the test should be run on this shard. The test id is
+// some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+GTEST_API_ bool ShouldRunTestOnShard(
+    int total_shards, int shard_index, int test_id);
+
+// STL container utilities.
+
+// Returns the number of elements in the given container that satisfy
+// the given predicate.
+template <class Container, typename Predicate>
+inline int CountIf(const Container& c, Predicate predicate) {
+  // Implemented as an explicit loop since std::count_if() in libCstd on
+  // Solaris has a non-standard signature.
+  int count = 0;
+  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
+    if (predicate(*it))
+      ++count;
+  }
+  return count;
+}
+
+// Applies a function/functor to each element in the container.
+template <class Container, typename Functor>
+void ForEach(const Container& c, Functor functor) {
+  std::for_each(c.begin(), c.end(), functor);
+}
+
+// Returns the i-th element of the vector, or default_value if i is not
+// in range [0, v.size()).
+template <typename E>
+inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
+  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value : v[i];
+}
+
+// Performs an in-place shuffle of a range of the vector's elements.
+// 'begin' and 'end' are element indices as an STL-style range;
+// i.e. [begin, end) are shuffled, where 'end' == size() means to
+// shuffle to the end of the vector.
+template <typename E>
+void ShuffleRange(internal::Random* random, int begin, int end,
+                  std::vector<E>* v) {
+  const int size = static_cast<int>(v->size());
+  GTEST_CHECK_(0 <= begin && begin <= size)
+      << "Invalid shuffle range start " << begin << ": must be in range [0, "
+      << size << "].";
+  GTEST_CHECK_(begin <= end && end <= size)
+      << "Invalid shuffle range finish " << end << ": must be in range ["
+      << begin << ", " << size << "].";
+
+  // Fisher-Yates shuffle, from
+  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
+  for (int range_width = end - begin; range_width >= 2; range_width--) {
+    const int last_in_range = begin + range_width - 1;
+    const int selected = begin + random->Generate(range_width);
+    std::swap((*v)[selected], (*v)[last_in_range]);
+  }
+}
+
+// Performs an in-place shuffle of the vector's elements.
+template <typename E>
+inline void Shuffle(internal::Random* random, std::vector<E>* v) {
+  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
+}
+
+// A function for deleting an object.  Handy for being used as a
+// functor.
+template <typename T>
+static void Delete(T* x) {
+  delete x;
+}
+
+// A predicate that checks the key of a TestProperty against a known key.
+//
+// TestPropertyKeyIs is copyable.
+class TestPropertyKeyIs {
+ public:
+  // Constructor.
+  //
+  // TestPropertyKeyIs has NO default constructor.
+  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
+
+  // Returns true iff the test name of test property matches on key_.
+  bool operator()(const TestProperty& test_property) const {
+    return test_property.key() == key_;
+  }
+
+ private:
+  std::string key_;
+};
+
+// Class UnitTestOptions.
+//
+// This class contains functions for processing options the user
+// specifies when running the tests.  It has only static members.
+//
+// In most cases, the user can specify an option using either an
+// environment variable or a command line flag.  E.g. you can set the
+// test filter using either GTEST_FILTER or --gtest_filter.  If both
+// the variable and the flag are present, the latter overrides the
+// former.
+class GTEST_API_ UnitTestOptions {
+ public:
+  // Functions for processing the gtest_output flag.
+
+  // Returns the output format, or "" for normal printed output.
+  static std::string GetOutputFormat();
+
+  // Returns the absolute path of the requested output file, or the
+  // default (test_detail.xml in the original working directory) if
+  // none was explicitly specified.
+  static std::string GetAbsolutePathToOutputFile();
+
+  // Functions for processing the gtest_filter flag.
+
+  // Returns true iff the wildcard pattern matches the string.  The
+  // first ':' or '\0' character in pattern marks the end of it.
+  //
+  // This recursive algorithm isn't very efficient, but is clear and
+  // works well enough for matching test names, which are short.
+  static bool PatternMatchesString(const char *pattern, const char *str);
+
+  // Returns true iff the user-specified filter matches the test case
+  // name and the test name.
+  static bool FilterMatchesTest(const std::string &test_case_name,
+                                const std::string &test_name);
+
+#if GTEST_OS_WINDOWS
+  // Function for supporting the gtest_catch_exception flag.
+
+  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+  // This function is useful as an __except condition.
+  static int GTestShouldProcessSEH(DWORD exception_code);
+#endif  // GTEST_OS_WINDOWS
+
+  // Returns true if "name" matches the ':' separated list of glob-style
+  // filters in "filter".
+  static bool MatchesFilter(const std::string& name, const char* filter);
+};
+
+// Returns the current application's name, removing directory path if that
+// is present.  Used by UnitTestOptions::GetOutputFile.
+GTEST_API_ FilePath GetCurrentExecutableName();
+
+// The role interface for getting the OS stack trace as a string.
+class OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetterInterface() {}
+  virtual ~OsStackTraceGetterInterface() {}
+
+  // Returns the current OS stack trace as an std::string.  Parameters:
+  //
+  //   max_depth  - the maximum number of stack frames to be included
+  //                in the trace.
+  //   skip_count - the number of top frames to be skipped; doesn't count
+  //                against max_depth.
+  virtual string CurrentStackTrace(int max_depth, int skip_count) = 0;
+
+  // UponLeavingGTest() should be called immediately before Google Test calls
+  // user code. It saves some information about the current stack that
+  // CurrentStackTrace() will use to find and hide Google Test stack frames.
+  virtual void UponLeavingGTest() = 0;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
+};
+
+// A working implementation of the OsStackTraceGetterInterface interface.
+class OsStackTraceGetter : public OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetter() : caller_frame_(NULL) {}
+
+  virtual string CurrentStackTrace(int max_depth, int skip_count)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  virtual void UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // This string is inserted in place of stack frames that are part of
+  // Google Test's implementation.
+  static const char* const kElidedFramesMarker;
+
+ private:
+  Mutex mutex_;  // protects all internal state
+
+  // We save the stack frame below the frame that calls user code.
+  // We do this because the address of the frame immediately below
+  // the user code changes between the call to UponLeavingGTest()
+  // and any calls to CurrentStackTrace() from within the user code.
+  void* caller_frame_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
+};
+
+// Information about a Google Test trace point.
+struct TraceInfo {
+  const char* file;
+  int line;
+  std::string message;
+};
+
+// This is the default global test part result reporter used in UnitTestImpl.
+// This class should only be used by UnitTestImpl.
+class DefaultGlobalTestPartResultReporter
+  : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. Reports the test part
+  // result in the current test.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
+};
+
+// This is the default per thread test part result reporter used in
+// UnitTestImpl. This class should only be used by UnitTestImpl.
+class DefaultPerThreadTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. The implementation just
+  // delegates to the current global test part result reporter of *unit_test_.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
+};
+
+// The private implementation of the UnitTest class.  We don't protect
+// the methods under a mutex, as this class is not accessible by a
+// user and the UnitTest class that delegates work to this class does
+// proper locking.
+class GTEST_API_ UnitTestImpl {
+ public:
+  explicit UnitTestImpl(UnitTest* parent);
+  virtual ~UnitTestImpl();
+
+  // There are two different ways to register your own TestPartResultReporter.
+  // You can register your own repoter to listen either only for test results
+  // from the current thread or for results from all threads.
+  // By default, each per-thread test result repoter just passes a new
+  // TestPartResult to the global test result reporter, which registers the
+  // test part result for the currently running test.
+
+  // Returns the global test part result reporter.
+  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
+
+  // Sets the global test part result reporter.
+  void SetGlobalTestPartResultReporter(
+      TestPartResultReporterInterface* reporter);
+
+  // Returns the test part result reporter for the current thread.
+  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
+
+  // Sets the test part result reporter for the current thread.
+  void SetTestPartResultReporterForCurrentThread(
+      TestPartResultReporterInterface* reporter);
+
+  // Gets the number of successful test cases.
+  int successful_test_case_count() const;
+
+  // Gets the number of failed test cases.
+  int failed_test_case_count() const;
+
+  // Gets the number of all test cases.
+  int total_test_case_count() const;
+
+  // Gets the number of all test cases that contain at least one test
+  // that should run.
+  int test_case_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns true iff the unit test passed (i.e. all test cases passed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the unit test failed (i.e. some test case failed
+  // or something outside of all tests failed).
+  bool Failed() const {
+    return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed();
+  }
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  const TestCase* GetTestCase(int i) const {
+    const int index = GetElementOr(test_case_indices_, i, -1);
+    return index < 0 ? NULL : test_cases_[i];
+  }
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  TestCase* GetMutableTestCase(int i) {
+    const int index = GetElementOr(test_case_indices_, i, -1);
+    return index < 0 ? NULL : test_cases_[index];
+  }
+
+  // Provides access to the event listener list.
+  TestEventListeners* listeners() { return &listeners_; }
+
+  // Returns the TestResult for the test that's currently running, or
+  // the TestResult for the ad hoc test if no test is running.
+  TestResult* current_test_result();
+
+  // Returns the TestResult for the ad hoc test.
+  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
+
+  // Sets the OS stack trace getter.
+  //
+  // Does nothing if the input and the current OS stack trace getter
+  // are the same; otherwise, deletes the old getter and makes the
+  // input the current getter.
+  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
+
+  // Returns the current OS stack trace getter if it is not NULL;
+  // otherwise, creates an OsStackTraceGetter, makes it the current
+  // getter, and returns it.
+  OsStackTraceGetterInterface* os_stack_trace_getter();
+
+  // Returns the current OS stack trace as an std::string.
+  //
+  // The maximum number of stack frames to be included is specified by
+  // the gtest_stack_trace_depth flag.  The skip_count parameter
+  // specifies the number of top frames to be skipped, which doesn't
+  // count against the number of frames to be included.
+  //
+  // For example, if Foo() calls Bar(), which in turn calls
+  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
+
+  // Finds and returns a TestCase with the given name.  If one doesn't
+  // exist, creates one and returns it.
+  //
+  // Arguments:
+  //
+  //   test_case_name: name of the test case
+  //   type_param:     the name of the test's type parameter, or NULL if
+  //                   this is not a typed or a type-parameterized test.
+  //   set_up_tc:      pointer to the function that sets up the test case
+  //   tear_down_tc:   pointer to the function that tears down the test case
+  TestCase* GetTestCase(const char* test_case_name,
+                        const char* type_param,
+                        Test::SetUpTestCaseFunc set_up_tc,
+                        Test::TearDownTestCaseFunc tear_down_tc);
+
+  // Adds a TestInfo to the unit test.
+  //
+  // Arguments:
+  //
+  //   set_up_tc:    pointer to the function that sets up the test case
+  //   tear_down_tc: pointer to the function that tears down the test case
+  //   test_info:    the TestInfo object
+  void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc,
+                   Test::TearDownTestCaseFunc tear_down_tc,
+                   TestInfo* test_info) {
+    // In order to support thread-safe death tests, we need to
+    // remember the original working directory when the test program
+    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
+    // the user may have changed the current directory before calling
+    // RUN_ALL_TESTS().  Therefore we capture the current directory in
+    // AddTestInfo(), which is called to register a TEST or TEST_F
+    // before main() is reached.
+    if (original_working_dir_.IsEmpty()) {
+      original_working_dir_.Set(FilePath::GetCurrentDir());
+      GTEST_CHECK_(!original_working_dir_.IsEmpty())
+          << "Failed to get the current working directory.";
+    }
+
+    GetTestCase(test_info->test_case_name(),
+                test_info->type_param(),
+                set_up_tc,
+                tear_down_tc)->AddTestInfo(test_info);
+  }
+
+#if GTEST_HAS_PARAM_TEST
+  // Returns ParameterizedTestCaseRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  internal::ParameterizedTestCaseRegistry& parameterized_test_registry() {
+    return parameterized_test_registry_;
+  }
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Sets the TestCase object for the test that's currently running.
+  void set_current_test_case(TestCase* a_current_test_case) {
+    current_test_case_ = a_current_test_case;
+  }
+
+  // Sets the TestInfo object for the test that's currently running.  If
+  // current_test_info is NULL, the assertion results will be stored in
+  // ad_hoc_test_result_.
+  void set_current_test_info(TestInfo* a_current_test_info) {
+    current_test_info_ = a_current_test_info;
+  }
+
+  // Registers all parameterized tests defined using TEST_P and
+  // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter
+  // combination. This method can be called more then once; it has guards
+  // protecting from registering the tests more then once.  If
+  // value-parameterized tests are disabled, RegisterParameterizedTests is
+  // present but does nothing.
+  void RegisterParameterizedTests();
+
+  // Runs all tests in this UnitTest object, prints the result, and
+  // returns true if all tests are successful.  If any exception is
+  // thrown during a test, this test is considered to be failed, but
+  // the rest of the tests will still be run.
+  bool RunAllTests();
+
+  // Clears the results of all tests, except the ad hoc tests.
+  void ClearNonAdHocTestResult() {
+    ForEach(test_cases_, TestCase::ClearTestCaseResult);
+  }
+
+  // Clears the results of ad-hoc test assertions.
+  void ClearAdHocTestResult() {
+    ad_hoc_test_result_.Clear();
+  }
+
+  // Adds a TestProperty to the current TestResult object when invoked in a
+  // context of a test or a test case, or to the global property set. If the
+  // result already contains a property with the same key, the value will be
+  // updated.
+  void RecordProperty(const TestProperty& test_property);
+
+  enum ReactionToSharding {
+    HONOR_SHARDING_PROTOCOL,
+    IGNORE_SHARDING_PROTOCOL
+  };
+
+  // Matches the full name of each test against the user-specified
+  // filter to decide whether the test should run, then records the
+  // result in each TestCase and TestInfo object.
+  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
+  // based on sharding variables in the environment.
+  // Returns the number of tests that should run.
+  int FilterTests(ReactionToSharding shard_tests);
+
+  // Prints the names of the tests matching the user-specified filter flag.
+  void ListTestsMatchingFilter();
+
+  const TestCase* current_test_case() const { return current_test_case_; }
+  TestInfo* current_test_info() { return current_test_info_; }
+  const TestInfo* current_test_info() const { return current_test_info_; }
+
+  // Returns the vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*>& environments() { return environments_; }
+
+  // Getters for the per-thread Google Test trace stack.
+  std::vector<TraceInfo>& gtest_trace_stack() {
+    return *(gtest_trace_stack_.pointer());
+  }
+  const std::vector<TraceInfo>& gtest_trace_stack() const {
+    return gtest_trace_stack_.get();
+  }
+
+#if GTEST_HAS_DEATH_TEST
+  void InitDeathTestSubprocessControlInfo() {
+    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
+  }
+  // Returns a pointer to the parsed --gtest_internal_run_death_test
+  // flag, or NULL if that flag was not specified.
+  // This information is useful only in a death test child process.
+  // Must not be called before a call to InitGoogleTest.
+  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
+    return internal_run_death_test_flag_.get();
+  }
+
+  // Returns a pointer to the current death test factory.
+  internal::DeathTestFactory* death_test_factory() {
+    return death_test_factory_.get();
+  }
+
+  void SuppressTestEventsIfInSubprocess();
+
+  friend class ReplaceDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // Initializes the event listener performing XML output as specified by
+  // UnitTestOptions. Must not be called before InitGoogleTest.
+  void ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+  // Initializes the event listener for streaming test results to a socket.
+  // Must not be called before InitGoogleTest.
+  void ConfigureStreamingOutput();
+#endif
+
+  // Performs initialization dependent upon flag values obtained in
+  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+  // this function is also called from RunAllTests.  Since this function can be
+  // called more than once, it has to be idempotent.
+  void PostFlagParsingInit();
+
+  // Gets the random seed used at the start of the current test iteration.
+  int random_seed() const { return random_seed_; }
+
+  // Gets the random number generator.
+  internal::Random* random() { return &random_; }
+
+  // Shuffles all test cases, and the tests within each test case,
+  // making sure that death tests are still run first.
+  void ShuffleTests();
+
+  // Restores the test cases and tests to their order before the first shuffle.
+  void UnshuffleTests();
+
+  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
+  // UnitTest::Run() starts.
+  bool catch_exceptions() const { return catch_exceptions_; }
+
+ private:
+  friend class ::testing::UnitTest;
+
+  // Used by UnitTest::Run() to capture the state of
+  // GTEST_FLAG(catch_exceptions) at the moment it starts.
+  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
+
+  // The UnitTest object that owns this implementation object.
+  UnitTest* const parent_;
+
+  // The working directory when the first TEST() or TEST_F() was
+  // executed.
+  internal::FilePath original_working_dir_;
+
+  // The default test part result reporters.
+  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
+  DefaultPerThreadTestPartResultReporter
+      default_per_thread_test_part_result_reporter_;
+
+  // Points to (but doesn't own) the global test part result reporter.
+  TestPartResultReporterInterface* global_test_part_result_repoter_;
+
+  // Protects read and write access to global_test_part_result_reporter_.
+  internal::Mutex global_test_part_result_reporter_mutex_;
+
+  // Points to (but doesn't own) the per-thread test part result reporter.
+  internal::ThreadLocal<TestPartResultReporterInterface*>
+      per_thread_test_part_result_reporter_;
+
+  // The vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*> environments_;
+
+  // The vector of TestCases in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestCase*> test_cases_;
+
+  // Provides a level of indirection for the test case list to allow
+  // easy shuffling and restoring the test case order.  The i-th
+  // element of this vector is the index of the i-th test case in the
+  // shuffled order.
+  std::vector<int> test_case_indices_;
+
+#if GTEST_HAS_PARAM_TEST
+  // ParameterizedTestRegistry object used to register value-parameterized
+  // tests.
+  internal::ParameterizedTestCaseRegistry parameterized_test_registry_;
+
+  // Indicates whether RegisterParameterizedTests() has been called already.
+  bool parameterized_tests_registered_;
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Index of the last death test case registered.  Initially -1.
+  int last_death_test_case_;
+
+  // This points to the TestCase for the currently running test.  It
+  // changes as Google Test goes through one test case after another.
+  // When no test is running, this is set to NULL and Google Test
+  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestCase* current_test_case_;
+
+  // This points to the TestInfo for the currently running test.  It
+  // changes as Google Test goes through one test after another.  When
+  // no test is running, this is set to NULL and Google Test stores
+  // assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestInfo* current_test_info_;
+
+  // Normally, a user only writes assertions inside a TEST or TEST_F,
+  // or inside a function called by a TEST or TEST_F.  Since Google
+  // Test keeps track of which test is current running, it can
+  // associate such an assertion with the test it belongs to.
+  //
+  // If an assertion is encountered when no TEST or TEST_F is running,
+  // Google Test attributes the assertion result to an imaginary "ad hoc"
+  // test, and records the result in ad_hoc_test_result_.
+  TestResult ad_hoc_test_result_;
+
+  // The list of event listeners that can be used to track events inside
+  // Google Test.
+  TestEventListeners listeners_;
+
+  // The OS stack trace getter.  Will be deleted when the UnitTest
+  // object is destructed.  By default, an OsStackTraceGetter is used,
+  // but the user can set this field to use a custom getter if that is
+  // desired.
+  OsStackTraceGetterInterface* os_stack_trace_getter_;
+
+  // True iff PostFlagParsingInit() has been called.
+  bool post_flag_parse_init_performed_;
+
+  // The random number seed used at the beginning of the test run.
+  int random_seed_;
+
+  // Our random number generator.
+  internal::Random random_;
+
+  // The time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp_;
+
+  // How long the test took to run, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+#if GTEST_HAS_DEATH_TEST
+  // The decomposed components of the gtest_internal_run_death_test flag,
+  // parsed when RUN_ALL_TESTS is called.
+  internal::scoped_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
+  internal::scoped_ptr<internal::DeathTestFactory> death_test_factory_;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
+  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
+
+  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
+  // starts.
+  bool catch_exceptions_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
+};  // class UnitTestImpl
+
+// Convenience function for accessing the global UnitTest
+// implementation object.
+inline UnitTestImpl* GetUnitTestImpl() {
+  return UnitTest::GetInstance()->impl();
+}
+
+#if GTEST_USES_SIMPLE_RE
+
+// Internal helper functions for implementing the simple regular
+// expression matcher.
+GTEST_API_ bool IsInSet(char ch, const char* str);
+GTEST_API_ bool IsAsciiDigit(char ch);
+GTEST_API_ bool IsAsciiPunct(char ch);
+GTEST_API_ bool IsRepeat(char ch);
+GTEST_API_ bool IsAsciiWhiteSpace(char ch);
+GTEST_API_ bool IsAsciiWordChar(char ch);
+GTEST_API_ bool IsValidEscape(char ch);
+GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
+GTEST_API_ bool ValidateRegex(const char* regex);
+GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
+GTEST_API_ bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char ch, char repeat, const char* regex, const char* str);
+GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
+
+#endif  // GTEST_USES_SIMPLE_RE
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
+
+#if GTEST_HAS_DEATH_TEST
+
+// Returns the message describing the last system error, regardless of the
+// platform.
+GTEST_API_ std::string GetLastErrnoDescription();
+
+# if GTEST_OS_WINDOWS
+// Provides leak-safe Windows kernel handle ownership.
+class AutoHandle {
+ public:
+  AutoHandle() : handle_(INVALID_HANDLE_VALUE) {}
+  explicit AutoHandle(HANDLE handle) : handle_(handle) {}
+
+  ~AutoHandle() { Reset(); }
+
+  HANDLE Get() const { return handle_; }
+  void Reset() { Reset(INVALID_HANDLE_VALUE); }
+  void Reset(HANDLE handle) {
+    if (handle != handle_) {
+      if (handle_ != INVALID_HANDLE_VALUE)
+        ::CloseHandle(handle_);
+      handle_ = handle;
+    }
+  }
+
+ private:
+  HANDLE handle_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
+};
+# endif  // GTEST_OS_WINDOWS
+
+// Attempts to parse a string into a positive integer pointed to by the
+// number parameter.  Returns true if that is possible.
+// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
+// it here.
+template <typename Integer>
+bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
+  // Fail fast if the given string does not begin with a digit;
+  // this bypasses strtoXXX's "optional leading whitespace and plus
+  // or minus sign" semantics, which are undesirable here.
+  if (str.empty() || !IsDigit(str[0])) {
+    return false;
+  }
+  errno = 0;
+
+  char* end;
+  // BiggestConvertible is the largest integer type that system-provided
+  // string-to-number conversion routines can return.
+
+# if GTEST_OS_WINDOWS && !defined(__GNUC__)
+
+  // MSVC and C++ Builder define __int64 instead of the standard long long.
+  typedef unsigned __int64 BiggestConvertible;
+  const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
+
+# else
+
+  typedef unsigned long long BiggestConvertible;  // NOLINT
+  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
+
+# endif  // GTEST_OS_WINDOWS && !defined(__GNUC__)
+
+  const bool parse_success = *end == '\0' && errno == 0;
+
+  // TODO(vladl@google.com): Convert this to compile time assertion when it is
+  // available.
+  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
+
+  const Integer result = static_cast<Integer>(parsed);
+  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
+    *number = result;
+    return true;
+  }
+  return false;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// TestResult contains some private methods that should be hidden from
+// Google Test user but are required for testing. This class allow our tests
+// to access them.
+//
+// This class is supplied only for the purpose of testing Google Test's own
+// constructs. Do not use it in user tests, either directly or indirectly.
+class TestResultAccessor {
+ public:
+  static void RecordProperty(TestResult* test_result,
+                             const std::string& xml_element,
+                             const TestProperty& property) {
+    test_result->RecordProperty(xml_element, property);
+  }
+
+  static void ClearTestPartResults(TestResult* test_result) {
+    test_result->ClearTestPartResults();
+  }
+
+  static const std::vector<testing::TestPartResult>& test_part_results(
+      const TestResult& test_result) {
+    return test_result.test_part_results();
+  }
+};
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Streams test results to the given port on the given host machine.
+class StreamingListener : public EmptyTestEventListener {
+ public:
+  // Abstract base class for writing strings to a socket.
+  class AbstractSocketWriter {
+   public:
+    virtual ~AbstractSocketWriter() {}
+
+    // Sends a string to the socket.
+    virtual void Send(const string& message) = 0;
+
+    // Closes the socket.
+    virtual void CloseConnection() {}
+
+    // Sends a string and a newline to the socket.
+    void SendLn(const string& message) {
+      Send(message + "\n");
+    }
+  };
+
+  // Concrete class for actually writing strings to a socket.
+  class SocketWriter : public AbstractSocketWriter {
+   public:
+    SocketWriter(const string& host, const string& port)
+        : sockfd_(-1), host_name_(host), port_num_(port) {
+      MakeConnection();
+    }
+
+    virtual ~SocketWriter() {
+      if (sockfd_ != -1)
+        CloseConnection();
+    }
+
+    // Sends a string to the socket.
+    virtual void Send(const string& message) {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "Send() can be called only when there is a connection.";
+
+      const int len = static_cast<int>(message.length());
+      if (write(sockfd_, message.c_str(), len) != len) {
+        GTEST_LOG_(WARNING)
+            << "stream_result_to: failed to stream to "
+            << host_name_ << ":" << port_num_;
+      }
+    }
+
+   private:
+    // Creates a client socket and connects to the server.
+    void MakeConnection();
+
+    // Closes the socket.
+    void CloseConnection() {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "CloseConnection() can be called only when there is a connection.";
+
+      close(sockfd_);
+      sockfd_ = -1;
+    }
+
+    int sockfd_;  // socket file descriptor
+    const string host_name_;
+    const string port_num_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
+  };  // class SocketWriter
+
+  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
+  static string UrlEncode(const char* str);
+
+  StreamingListener(const string& host, const string& port)
+      : socket_writer_(new SocketWriter(host, port)) { Start(); }
+
+  explicit StreamingListener(AbstractSocketWriter* socket_writer)
+      : socket_writer_(socket_writer) { Start(); }
+
+  void OnTestProgramStart(const UnitTest& /* unit_test */) {
+    SendLn("event=TestProgramStart");
+  }
+
+  void OnTestProgramEnd(const UnitTest& unit_test) {
+    // Note that Google Test current only report elapsed time for each
+    // test iteration, not for the entire test program.
+    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
+
+    // Notify the streaming server to stop.
+    socket_writer_->CloseConnection();
+  }
+
+  void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) {
+    SendLn("event=TestIterationStart&iteration=" +
+           StreamableToString(iteration));
+  }
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) {
+    SendLn("event=TestIterationEnd&passed=" +
+           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
+           StreamableToString(unit_test.elapsed_time()) + "ms");
+  }
+
+  void OnTestCaseStart(const TestCase& test_case) {
+    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
+  }
+
+  void OnTestCaseEnd(const TestCase& test_case) {
+    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed())
+           + "&elapsed_time=" + StreamableToString(test_case.elapsed_time())
+           + "ms");
+  }
+
+  void OnTestStart(const TestInfo& test_info) {
+    SendLn(std::string("event=TestStart&name=") + test_info.name());
+  }
+
+  void OnTestEnd(const TestInfo& test_info) {
+    SendLn("event=TestEnd&passed=" +
+           FormatBool((test_info.result())->Passed()) +
+           "&elapsed_time=" +
+           StreamableToString((test_info.result())->elapsed_time()) + "ms");
+  }
+
+  void OnTestPartResult(const TestPartResult& test_part_result) {
+    const char* file_name = test_part_result.file_name();
+    if (file_name == NULL)
+      file_name = "";
+    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
+           "&line=" + StreamableToString(test_part_result.line_number()) +
+           "&message=" + UrlEncode(test_part_result.message()));
+  }
+
+ private:
+  // Sends the given message and a newline to the socket.
+  void SendLn(const string& message) { socket_writer_->SendLn(message); }
+
+  // Called at the start of streaming to notify the receiver what
+  // protocol we are using.
+  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
+
+  string FormatBool(bool value) { return value ? "1" : "0"; }
+
+  const scoped_ptr<AbstractSocketWriter> socket_writer_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
+};  // class StreamingListener
+
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_SRC_GTEST_INTERNAL_INL_H_
diff --git a/Externals/gtest/src/gtest-port.cc b/Externals/gtest/src/gtest-port.cc
new file mode 100644
index 0000000000..0c4df5f29a
--- /dev/null
+++ b/Externals/gtest/src/gtest-port.cc
@@ -0,0 +1,805 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/internal/gtest-port.h"
+
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>  // For TerminateProcess()
+#elif GTEST_OS_WINDOWS
+# include <io.h>
+# include <sys/stat.h>
+#else
+# include <unistd.h>
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+#if GTEST_OS_MAC
+# include <mach/mach_init.h>
+# include <mach/task.h>
+# include <mach/vm_map.h>
+#endif  // GTEST_OS_MAC
+
+#if GTEST_OS_QNX
+# include <devctl.h>
+# include <sys/procfs.h>
+#endif  // GTEST_OS_QNX
+
+#include "gtest/gtest-spi.h"
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+namespace internal {
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+const int kStdOutFileno = 1;
+const int kStdErrFileno = 2;
+#else
+const int kStdOutFileno = STDOUT_FILENO;
+const int kStdErrFileno = STDERR_FILENO;
+#endif  // _MSC_VER
+
+#if GTEST_OS_MAC
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  const task_t task = mach_task_self();
+  mach_msg_type_number_t thread_count;
+  thread_act_array_t thread_list;
+  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
+  if (status == KERN_SUCCESS) {
+    // task_threads allocates resources in thread_list and we need to free them
+    // to avoid leaks.
+    vm_deallocate(task,
+                  reinterpret_cast<vm_address_t>(thread_list),
+                  sizeof(thread_t) * thread_count);
+    return static_cast<size_t>(thread_count);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_QNX
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  const int fd = open("/proc/self/as", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+  procfs_info process_info;
+  const int status =
+      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL);
+  close(fd);
+  if (status == EOK) {
+    return static_cast<size_t>(process_info.num_threads);
+  } else {
+    return 0;
+  }
+}
+
+#else
+
+size_t GetThreadCount() {
+  // There's no portable way to detect the number of threads, so we just
+  // return 0 to indicate that we cannot detect it.
+  return 0;
+}
+
+#endif  // GTEST_OS_MAC
+
+#if GTEST_USES_POSIX_RE
+
+// Implements RE.  Currently only needed for death tests.
+
+RE::~RE() {
+  if (is_valid_) {
+    // regfree'ing an invalid regex might crash because the content
+    // of the regex is undefined. Since the regex's are essentially
+    // the same, one cannot be valid (or invalid) without the other
+    // being so too.
+    regfree(&partial_regex_);
+    regfree(&full_regex_);
+  }
+  free(const_cast<char*>(pattern_));
+}
+
+// Returns true iff regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
+}
+
+// Returns true iff regular expression re matches a substring of str
+// (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = posix::StrDup(regex);
+
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match.
+  const size_t full_regex_len = strlen(regex) + 10;
+  char* const full_pattern = new char[full_regex_len];
+
+  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
+  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
+  // We want to call regcomp(&partial_regex_, ...) even if the
+  // previous expression returns false.  Otherwise partial_regex_ may
+  // not be properly initialized can may cause trouble when it's
+  // freed.
+  //
+  // Some implementation of POSIX regex (e.g. on at least some
+  // versions of Cygwin) doesn't accept the empty string as a valid
+  // regex.  We change it to an equivalent form "()" to be safe.
+  if (is_valid_) {
+    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
+    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
+  }
+  EXPECT_TRUE(is_valid_)
+      << "Regular expression \"" << regex
+      << "\" is not a valid POSIX Extended regular expression.";
+
+  delete[] full_pattern;
+}
+
+#elif GTEST_USES_SIMPLE_RE
+
+// Returns true iff ch appears anywhere in str (excluding the
+// terminating '\0' character).
+bool IsInSet(char ch, const char* str) {
+  return ch != '\0' && strchr(str, ch) != NULL;
+}
+
+// Returns true iff ch belongs to the given classification.  Unlike
+// similar functions in <ctype.h>, these aren't affected by the
+// current locale.
+bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
+bool IsAsciiPunct(char ch) {
+  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
+}
+bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
+bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
+bool IsAsciiWordChar(char ch) {
+  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
+      ('0' <= ch && ch <= '9') || ch == '_';
+}
+
+// Returns true iff "\\c" is a supported escape sequence.
+bool IsValidEscape(char c) {
+  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
+}
+
+// Returns true iff the given atom (specified by escaped and pattern)
+// matches ch.  The result is undefined if the atom is invalid.
+bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
+  if (escaped) {  // "\\p" where p is pattern_char.
+    switch (pattern_char) {
+      case 'd': return IsAsciiDigit(ch);
+      case 'D': return !IsAsciiDigit(ch);
+      case 'f': return ch == '\f';
+      case 'n': return ch == '\n';
+      case 'r': return ch == '\r';
+      case 's': return IsAsciiWhiteSpace(ch);
+      case 'S': return !IsAsciiWhiteSpace(ch);
+      case 't': return ch == '\t';
+      case 'v': return ch == '\v';
+      case 'w': return IsAsciiWordChar(ch);
+      case 'W': return !IsAsciiWordChar(ch);
+    }
+    return IsAsciiPunct(pattern_char) && pattern_char == ch;
+  }
+
+  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
+}
+
+// Helper function used by ValidateRegex() to format error messages.
+std::string FormatRegexSyntaxError(const char* regex, int index) {
+  return (Message() << "Syntax error at index " << index
+          << " in simple regular expression \"" << regex << "\": ").GetString();
+}
+
+// Generates non-fatal failures and returns false if regex is invalid;
+// otherwise returns true.
+bool ValidateRegex(const char* regex) {
+  if (regex == NULL) {
+    // TODO(wan@google.com): fix the source file location in the
+    // assertion failures to match where the regex is used in user
+    // code.
+    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
+    return false;
+  }
+
+  bool is_valid = true;
+
+  // True iff ?, *, or + can follow the previous atom.
+  bool prev_repeatable = false;
+  for (int i = 0; regex[i]; i++) {
+    if (regex[i] == '\\') {  // An escape sequence
+      i++;
+      if (regex[i] == '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "'\\' cannot appear at the end.";
+        return false;
+      }
+
+      if (!IsValidEscape(regex[i])) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "invalid escape sequence \"\\" << regex[i] << "\".";
+        is_valid = false;
+      }
+      prev_repeatable = true;
+    } else {  // Not an escape sequence.
+      const char ch = regex[i];
+
+      if (ch == '^' && i > 0) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'^' can only appear at the beginning.";
+        is_valid = false;
+      } else if (ch == '$' && regex[i + 1] != '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'$' can only appear at the end.";
+        is_valid = false;
+      } else if (IsInSet(ch, "()[]{}|")) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' is unsupported.";
+        is_valid = false;
+      } else if (IsRepeat(ch) && !prev_repeatable) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' can only follow a repeatable token.";
+        is_valid = false;
+      }
+
+      prev_repeatable = !IsInSet(ch, "^$?*+");
+    }
+  }
+
+  return is_valid;
+}
+
+// Matches a repeated regex atom followed by a valid simple regular
+// expression.  The regex atom is defined as c if escaped is false,
+// or \c otherwise.  repeat is the repetition meta character (?, *,
+// or +).  The behavior is undefined if str contains too many
+// characters to be indexable by size_t, in which case the test will
+// probably time out anyway.  We are fine with this limitation as
+// std::string has it too.
+bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char c, char repeat, const char* regex,
+    const char* str) {
+  const size_t min_count = (repeat == '+') ? 1 : 0;
+  const size_t max_count = (repeat == '?') ? 1 :
+      static_cast<size_t>(-1) - 1;
+  // We cannot call numeric_limits::max() as it conflicts with the
+  // max() macro on Windows.
+
+  for (size_t i = 0; i <= max_count; ++i) {
+    // We know that the atom matches each of the first i characters in str.
+    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
+      // We have enough matches at the head, and the tail matches too.
+      // Since we only care about *whether* the pattern matches str
+      // (as opposed to *how* it matches), there is no need to find a
+      // greedy match.
+      return true;
+    }
+    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
+      return false;
+  }
+  return false;
+}
+
+// Returns true iff regex matches a prefix of str.  regex must be a
+// valid simple regular expression and not start with "^", or the
+// result is undefined.
+bool MatchRegexAtHead(const char* regex, const char* str) {
+  if (*regex == '\0')  // An empty regex matches a prefix of anything.
+    return true;
+
+  // "$" only matches the end of a string.  Note that regex being
+  // valid guarantees that there's nothing after "$" in it.
+  if (*regex == '$')
+    return *str == '\0';
+
+  // Is the first thing in regex an escape sequence?
+  const bool escaped = *regex == '\\';
+  if (escaped)
+    ++regex;
+  if (IsRepeat(regex[1])) {
+    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
+    // here's an indirect recursion.  It terminates as the regex gets
+    // shorter in each recursion.
+    return MatchRepetitionAndRegexAtHead(
+        escaped, regex[0], regex[1], regex + 2, str);
+  } else {
+    // regex isn't empty, isn't "$", and doesn't start with a
+    // repetition.  We match the first atom of regex with the first
+    // character of str and recurse.
+    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
+        MatchRegexAtHead(regex + 1, str + 1);
+  }
+}
+
+// Returns true iff regex matches any substring of str.  regex must be
+// a valid simple regular expression, or the result is undefined.
+//
+// The algorithm is recursive, but the recursion depth doesn't exceed
+// the regex length, so we won't need to worry about running out of
+// stack space normally.  In rare cases the time complexity can be
+// exponential with respect to the regex length + the string length,
+// but usually it's must faster (often close to linear).
+bool MatchRegexAnywhere(const char* regex, const char* str) {
+  if (regex == NULL || str == NULL)
+    return false;
+
+  if (*regex == '^')
+    return MatchRegexAtHead(regex + 1, str);
+
+  // A successful match can be anywhere in str.
+  do {
+    if (MatchRegexAtHead(regex, str))
+      return true;
+  } while (*str++ != '\0');
+  return false;
+}
+
+// Implements the RE class.
+
+RE::~RE() {
+  free(const_cast<char*>(pattern_));
+  free(const_cast<char*>(full_pattern_));
+}
+
+// Returns true iff regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
+}
+
+// Returns true iff regular expression re matches a substring of str
+// (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = full_pattern_ = NULL;
+  if (regex != NULL) {
+    pattern_ = posix::StrDup(regex);
+  }
+
+  is_valid_ = ValidateRegex(regex);
+  if (!is_valid_) {
+    // No need to calculate the full pattern when the regex is invalid.
+    return;
+  }
+
+  const size_t len = strlen(regex);
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match: we need space to prepend a '^', append a '$', and
+  // terminate the string with '\0'.
+  char* buffer = static_cast<char*>(malloc(len + 3));
+  full_pattern_ = buffer;
+
+  if (*regex != '^')
+    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
+
+  // We don't use snprintf or strncpy, as they trigger a warning when
+  // compiled with VC++ 8.0.
+  memcpy(buffer, regex, len);
+  buffer += len;
+
+  if (len == 0 || regex[len - 1] != '$')
+    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
+
+  *buffer = '\0';
+}
+
+#endif  // GTEST_USES_POSIX_RE
+
+const char kUnknownFile[] = "unknown file";
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
+  const std::string file_name(file == NULL ? kUnknownFile : file);
+
+  if (line < 0) {
+    return file_name + ":";
+  }
+#ifdef _MSC_VER
+  return file_name + "(" + StreamableToString(line) + "):";
+#else
+  return file_name + ":" + StreamableToString(line) + ":";
+#endif  // _MSC_VER
+}
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+// Note that FormatCompilerIndependentFileLocation() does NOT append colon
+// to the file location it produces, unlike FormatFileLocation().
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
+    const char* file, int line) {
+  const std::string file_name(file == NULL ? kUnknownFile : file);
+
+  if (line < 0)
+    return file_name;
+  else
+    return file_name + ":" + StreamableToString(line);
+}
+
+
+GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
+    : severity_(severity) {
+  const char* const marker =
+      severity == GTEST_INFO ?    "[  INFO ]" :
+      severity == GTEST_WARNING ? "[WARNING]" :
+      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
+  GetStream() << ::std::endl << marker << " "
+              << FormatFileLocation(file, line).c_str() << ": ";
+}
+
+// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+GTestLog::~GTestLog() {
+  GetStream() << ::std::endl;
+  if (severity_ == GTEST_FATAL) {
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+// Disable Microsoft deprecation warnings for POSIX functions called from
+// this class (creat, dup, dup2, and close)
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4996)
+#endif  // _MSC_VER
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Object that captures an output stream (stdout/stderr).
+class CapturedStream {
+ public:
+  // The ctor redirects the stream to a temporary file.
+  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
+# if GTEST_OS_WINDOWS
+    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+
+    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
+    const UINT success = ::GetTempFileNameA(temp_dir_path,
+                                            "gtest_redir",
+                                            0,  // Generate unique file name.
+                                            temp_file_path);
+    GTEST_CHECK_(success != 0)
+        << "Unable to create a temporary file in " << temp_dir_path;
+    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
+    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
+                                    << temp_file_path;
+    filename_ = temp_file_path;
+# else
+    // There's no guarantee that a test has write access to the current
+    // directory, so we create the temporary file in the /tmp directory
+    // instead. We use /tmp on most systems, and /sdcard on Android.
+    // That's because Android doesn't have /tmp.
+#  if GTEST_OS_LINUX_ANDROID
+    // Note: Android applications are expected to call the framework's
+    // Context.getExternalStorageDirectory() method through JNI to get
+    // the location of the world-writable SD Card directory. However,
+    // this requires a Context handle, which cannot be retrieved
+    // globally from native code. Doing so also precludes running the
+    // code as part of a regular standalone executable, which doesn't
+    // run in a Dalvik process (e.g. when running it through 'adb shell').
+    //
+    // The location /sdcard is directly accessible from native code
+    // and is the only location (unofficially) supported by the Android
+    // team. It's generally a symlink to the real SD Card mount point
+    // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or
+    // other OEM-customized locations. Never rely on these, and always
+    // use /sdcard.
+    char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX";
+#  else
+    char name_template[] = "/tmp/captured_stream.XXXXXX";
+#  endif  // GTEST_OS_LINUX_ANDROID
+    const int captured_fd = mkstemp(name_template);
+    filename_ = name_template;
+# endif  // GTEST_OS_WINDOWS
+    fflush(NULL);
+    dup2(captured_fd, fd_);
+    close(captured_fd);
+  }
+
+  ~CapturedStream() {
+    remove(filename_.c_str());
+  }
+
+  std::string GetCapturedString() {
+    if (uncaptured_fd_ != -1) {
+      // Restores the original stream.
+      fflush(NULL);
+      dup2(uncaptured_fd_, fd_);
+      close(uncaptured_fd_);
+      uncaptured_fd_ = -1;
+    }
+
+    FILE* const file = posix::FOpen(filename_.c_str(), "r");
+    const std::string content = ReadEntireFile(file);
+    posix::FClose(file);
+    return content;
+  }
+
+ private:
+  // Reads the entire content of a file as an std::string.
+  static std::string ReadEntireFile(FILE* file);
+
+  // Returns the size (in bytes) of a file.
+  static size_t GetFileSize(FILE* file);
+
+  const int fd_;  // A stream to capture.
+  int uncaptured_fd_;
+  // Name of the temporary file holding the stderr output.
+  ::std::string filename_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
+};
+
+// Returns the size (in bytes) of a file.
+size_t CapturedStream::GetFileSize(FILE* file) {
+  fseek(file, 0, SEEK_END);
+  return static_cast<size_t>(ftell(file));
+}
+
+// Reads the entire content of a file as a string.
+std::string CapturedStream::ReadEntireFile(FILE* file) {
+  const size_t file_size = GetFileSize(file);
+  char* const buffer = new char[file_size];
+
+  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
+  size_t bytes_read = 0;       // # of bytes read so far
+
+  fseek(file, 0, SEEK_SET);
+
+  // Keeps reading the file until we cannot read further or the
+  // pre-determined file size is reached.
+  do {
+    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
+    bytes_read += bytes_last_read;
+  } while (bytes_last_read > 0 && bytes_read < file_size);
+
+  const std::string content(buffer, bytes_read);
+  delete[] buffer;
+
+  return content;
+}
+
+# ifdef _MSC_VER
+#  pragma warning(pop)
+# endif  // _MSC_VER
+
+static CapturedStream* g_captured_stderr = NULL;
+static CapturedStream* g_captured_stdout = NULL;
+
+// Starts capturing an output stream (stdout/stderr).
+void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) {
+  if (*stream != NULL) {
+    GTEST_LOG_(FATAL) << "Only one " << stream_name
+                      << " capturer can exist at a time.";
+  }
+  *stream = new CapturedStream(fd);
+}
+
+// Stops capturing the output stream and returns the captured string.
+std::string GetCapturedStream(CapturedStream** captured_stream) {
+  const std::string content = (*captured_stream)->GetCapturedString();
+
+  delete *captured_stream;
+  *captured_stream = NULL;
+
+  return content;
+}
+
+// Starts capturing stdout.
+void CaptureStdout() {
+  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
+}
+
+// Starts capturing stderr.
+void CaptureStderr() {
+  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
+}
+
+// Stops capturing stdout and returns the captured string.
+std::string GetCapturedStdout() {
+  return GetCapturedStream(&g_captured_stdout);
+}
+
+// Stops capturing stderr and returns the captured string.
+std::string GetCapturedStderr() {
+  return GetCapturedStream(&g_captured_stderr);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+#if GTEST_HAS_DEATH_TEST
+
+// A copy of all command line arguments.  Set by InitGoogleTest().
+::std::vector<testing::internal::string> g_argvs;
+
+static const ::std::vector<testing::internal::string>* g_injected_test_argvs =
+                                        NULL;  // Owned.
+
+void SetInjectableArgvs(const ::std::vector<testing::internal::string>* argvs) {
+  if (g_injected_test_argvs != argvs)
+    delete g_injected_test_argvs;
+  g_injected_test_argvs = argvs;
+}
+
+const ::std::vector<testing::internal::string>& GetInjectableArgvs() {
+  if (g_injected_test_argvs != NULL) {
+    return *g_injected_test_argvs;
+  }
+  return g_argvs;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+#if GTEST_OS_WINDOWS_MOBILE
+namespace posix {
+void Abort() {
+  DebugBreak();
+  TerminateProcess(GetCurrentProcess(), 1);
+}
+}  // namespace posix
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Returns the name of the environment variable corresponding to the
+// given flag.  For example, FlagToEnvVar("foo") will return
+// "GTEST_FOO" in the open-source version.
+static std::string FlagToEnvVar(const char* flag) {
+  const std::string full_flag =
+      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
+
+  Message env_var;
+  for (size_t i = 0; i != full_flag.length(); i++) {
+    env_var << ToUpper(full_flag.c_str()[i]);
+  }
+
+  return env_var.GetString();
+}
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes
+// the result to *value and returns true; otherwise leaves *value
+// unchanged and returns false.
+bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
+  // Parses the environment variable as a decimal integer.
+  char* end = NULL;
+  const long long_value = strtol(str, &end, 10);  // NOLINT
+
+  // Has strtol() consumed all characters in the string?
+  if (*end != '\0') {
+    // No - an invalid character was encountered.
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value \"" << str << "\".\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  // Is the parsed value in the range of an Int32?
+  const Int32 result = static_cast<Int32>(long_value);
+  if (long_value == LONG_MAX || long_value == LONG_MIN ||
+      // The parsed value overflows as a long.  (strtol() returns
+      // LONG_MAX or LONG_MIN when the input overflows.)
+      result != long_value
+      // The parsed value overflows as an Int32.
+      ) {
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value " << str << ", which overflows.\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  *value = result;
+  return true;
+}
+
+// Reads and returns the Boolean environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+//
+// The value is considered true iff it's not "0".
+bool BoolFromGTestEnv(const char* flag, bool default_value) {
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  return string_value == NULL ?
+      default_value : strcmp(string_value, "0") != 0;
+}
+
+// Reads and returns a 32-bit integer stored in the environment
+// variable corresponding to the given flag; if it isn't set or
+// doesn't represent a valid 32-bit integer, returns default_value.
+Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  if (string_value == NULL) {
+    // The environment variable is not set.
+    return default_value;
+  }
+
+  Int32 result = default_value;
+  if (!ParseInt32(Message() << "Environment variable " << env_var,
+                  string_value, &result)) {
+    printf("The default value %s is used.\n",
+           (Message() << default_value).GetString().c_str());
+    fflush(stdout);
+    return default_value;
+  }
+
+  return result;
+}
+
+// Reads and returns the string environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+const char* StringFromGTestEnv(const char* flag, const char* default_value) {
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const value = posix::GetEnv(env_var.c_str());
+  return value == NULL ? default_value : value;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest-printers.cc b/Externals/gtest/src/gtest-printers.cc
new file mode 100644
index 0000000000..29c799a59a
--- /dev/null
+++ b/Externals/gtest/src/gtest-printers.cc
@@ -0,0 +1,369 @@
+// Copyright 2007, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// It uses the << operator when possible, and prints the bytes in the
+// object otherwise.  A user can override its behavior for a class
+// type Foo by defining either operator<<(::std::ostream&, const Foo&)
+// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
+// defines Foo.
+
+#include "gtest/gtest-printers.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <ostream>  // NOLINT
+#include <string>
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+
+namespace {
+
+using ::std::ostream;
+
+// Prints a segment of bytes in the given object.
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
+                                size_t count, ostream* os) {
+  char text[5] = "";
+  for (size_t i = 0; i != count; i++) {
+    const size_t j = start + i;
+    if (i != 0) {
+      // Organizes the bytes into groups of 2 for easy parsing by
+      // human.
+      if ((j % 2) == 0)
+        *os << ' ';
+      else
+        *os << '-';
+    }
+    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
+    *os << text;
+  }
+}
+
+// Prints the bytes in the given value to the given ostream.
+void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
+                              ostream* os) {
+  // Tells the user how big the object is.
+  *os << count << "-byte object <";
+
+  const size_t kThreshold = 132;
+  const size_t kChunkSize = 64;
+  // If the object size is bigger than kThreshold, we'll have to omit
+  // some details by printing only the first and the last kChunkSize
+  // bytes.
+  // TODO(wan): let the user control the threshold using a flag.
+  if (count < kThreshold) {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
+  } else {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
+    *os << " ... ";
+    // Rounds up to 2-byte boundary.
+    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
+    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
+  }
+  *os << ">";
+}
+
+}  // namespace
+
+namespace internal2 {
+
+// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
+// given object.  The delegation simplifies the implementation, which
+// uses the << operator and thus is easier done outside of the
+// ::testing::internal namespace, which contains a << operator that
+// sometimes conflicts with the one in STL.
+void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
+                          ostream* os) {
+  PrintBytesInObjectToImpl(obj_bytes, count, os);
+}
+
+}  // namespace internal2
+
+namespace internal {
+
+// Depending on the value of a char (or wchar_t), we print it in one
+// of three formats:
+//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
+//   - as a hexidecimal escape sequence (e.g. '\x7F'), or
+//   - as a special escape sequence (e.g. '\r', '\n').
+enum CharFormat {
+  kAsIs,
+  kHexEscape,
+  kSpecialEscape
+};
+
+// Returns true if c is a printable ASCII character.  We test the
+// value of c directly instead of calling isprint(), which is buggy on
+// Windows Mobile.
+inline bool IsPrintableAscii(wchar_t c) {
+  return 0x20 <= c && c <= 0x7E;
+}
+
+// Prints a wide or narrow char c as a character literal without the
+// quotes, escaping it when necessary; returns how c was formatted.
+// The template argument UnsignedChar is the unsigned version of Char,
+// which is the type of c.
+template <typename UnsignedChar, typename Char>
+static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
+  switch (static_cast<wchar_t>(c)) {
+    case L'\0':
+      *os << "\\0";
+      break;
+    case L'\'':
+      *os << "\\'";
+      break;
+    case L'\\':
+      *os << "\\\\";
+      break;
+    case L'\a':
+      *os << "\\a";
+      break;
+    case L'\b':
+      *os << "\\b";
+      break;
+    case L'\f':
+      *os << "\\f";
+      break;
+    case L'\n':
+      *os << "\\n";
+      break;
+    case L'\r':
+      *os << "\\r";
+      break;
+    case L'\t':
+      *os << "\\t";
+      break;
+    case L'\v':
+      *os << "\\v";
+      break;
+    default:
+      if (IsPrintableAscii(c)) {
+        *os << static_cast<char>(c);
+        return kAsIs;
+      } else {
+        *os << "\\x" + String::FormatHexInt(static_cast<UnsignedChar>(c));
+        return kHexEscape;
+      }
+  }
+  return kSpecialEscape;
+}
+
+// Prints a wchar_t c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
+  switch (c) {
+    case L'\'':
+      *os << "'";
+      return kAsIs;
+    case L'"':
+      *os << "\\\"";
+      return kSpecialEscape;
+    default:
+      return PrintAsCharLiteralTo<wchar_t>(c, os);
+  }
+}
+
+// Prints a char c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
+  return PrintAsStringLiteralTo(
+      static_cast<wchar_t>(static_cast<unsigned char>(c)), os);
+}
+
+// Prints a wide or narrow character c and its code.  '\0' is printed
+// as "'\\0'", other unprintable characters are also properly escaped
+// using the standard C++ escape sequence.  The template argument
+// UnsignedChar is the unsigned version of Char, which is the type of c.
+template <typename UnsignedChar, typename Char>
+void PrintCharAndCodeTo(Char c, ostream* os) {
+  // First, print c as a literal in the most readable form we can find.
+  *os << ((sizeof(c) > 1) ? "L'" : "'");
+  const CharFormat format = PrintAsCharLiteralTo<UnsignedChar>(c, os);
+  *os << "'";
+
+  // To aid user debugging, we also print c's code in decimal, unless
+  // it's 0 (in which case c was printed as '\\0', making the code
+  // obvious).
+  if (c == 0)
+    return;
+  *os << " (" << static_cast<int>(c);
+
+  // For more convenience, we print c's code again in hexidecimal,
+  // unless c was already printed in the form '\x##' or the code is in
+  // [1, 9].
+  if (format == kHexEscape || (1 <= c && c <= 9)) {
+    // Do nothing.
+  } else {
+    *os << ", 0x" << String::FormatHexInt(static_cast<UnsignedChar>(c));
+  }
+  *os << ")";
+}
+
+void PrintTo(unsigned char c, ::std::ostream* os) {
+  PrintCharAndCodeTo<unsigned char>(c, os);
+}
+void PrintTo(signed char c, ::std::ostream* os) {
+  PrintCharAndCodeTo<unsigned char>(c, os);
+}
+
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
+void PrintTo(wchar_t wc, ostream* os) {
+  PrintCharAndCodeTo<wchar_t>(wc, os);
+}
+
+// Prints the given array of characters to the ostream.  CharType must be either
+// char or wchar_t.
+// The array starts at begin, the length is len, it may include '\0' characters
+// and may not be NUL-terminated.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+static void PrintCharsAsStringTo(
+    const CharType* begin, size_t len, ostream* os) {
+  const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\"";
+  *os << kQuoteBegin;
+  bool is_previous_hex = false;
+  for (size_t index = 0; index < len; ++index) {
+    const CharType cur = begin[index];
+    if (is_previous_hex && IsXDigit(cur)) {
+      // Previous character is of '\x..' form and this character can be
+      // interpreted as another hexadecimal digit in its number. Break string to
+      // disambiguate.
+      *os << "\" " << kQuoteBegin;
+    }
+    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
+  }
+  *os << "\"";
+}
+
+// Prints a (const) char/wchar_t array of 'len' elements, starting at address
+// 'begin'.  CharType must be either char or wchar_t.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+static void UniversalPrintCharArray(
+    const CharType* begin, size_t len, ostream* os) {
+  // The code
+  //   const char kFoo[] = "foo";
+  // generates an array of 4, not 3, elements, with the last one being '\0'.
+  //
+  // Therefore when printing a char array, we don't print the last element if
+  // it's '\0', such that the output matches the string literal as it's
+  // written in the source code.
+  if (len > 0 && begin[len - 1] == '\0') {
+    PrintCharsAsStringTo(begin, len - 1, os);
+    return;
+  }
+
+  // If, however, the last element in the array is not '\0', e.g.
+  //    const char kFoo[] = { 'f', 'o', 'o' };
+  // we must print the entire array.  We also print a message to indicate
+  // that the array is not NUL-terminated.
+  PrintCharsAsStringTo(begin, len, os);
+  *os << " (no terminating NUL)";
+}
+
+// Prints a (const) char array of 'len' elements, starting at address 'begin'.
+void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) wchar_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints the given C string to the ostream.
+void PrintTo(const char* s, ostream* os) {
+  if (s == NULL) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, strlen(s), os);
+  }
+}
+
+// MSVC compiler can be configured to define whar_t as a typedef
+// of unsigned short. Defining an overload for const wchar_t* in that case
+// would cause pointers to unsigned shorts be printed as wide strings,
+// possibly accessing more memory than intended and causing invalid
+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
+// wchar_t is implemented as a native type.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Prints the given wide C string to the ostream.
+void PrintTo(const wchar_t* s, ostream* os) {
+  if (s == NULL) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, wcslen(s), os);
+  }
+}
+#endif  // wchar_t is native
+
+// Prints a ::string object.
+#if GTEST_HAS_GLOBAL_STRING
+void PrintStringTo(const ::string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+void PrintStringTo(const ::std::string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+// Prints a ::wstring object.
+#if GTEST_HAS_GLOBAL_WSTRING
+void PrintWideStringTo(const ::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+}  // namespace internal
+
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest-test-part.cc b/Externals/gtest/src/gtest-test-part.cc
new file mode 100644
index 0000000000..c60eef3ab3
--- /dev/null
+++ b/Externals/gtest/src/gtest-test-part.cc
@@ -0,0 +1,110 @@
+// Copyright 2008, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+// The Google C++ Testing Framework (Google Test)
+
+#include "gtest/gtest-test-part.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+
+using internal::GetUnitTestImpl;
+
+// Gets the summary of the failure message by omitting the stack trace
+// in it.
+std::string TestPartResult::ExtractSummary(const char* message) {
+  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
+  return stack_trace == NULL ? message :
+      std::string(message, stack_trace);
+}
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
+  return os
+      << result.file_name() << ":" << result.line_number() << ": "
+      << (result.type() == TestPartResult::kSuccess ? "Success" :
+          result.type() == TestPartResult::kFatalFailure ? "Fatal failure" :
+          "Non-fatal failure") << ":\n"
+      << result.message() << std::endl;
+}
+
+// Appends a TestPartResult to the array.
+void TestPartResultArray::Append(const TestPartResult& result) {
+  array_.push_back(result);
+}
+
+// Returns the TestPartResult at the given index (0-based).
+const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
+  if (index < 0 || index >= size()) {
+    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
+    internal::posix::Abort();
+  }
+
+  return array_[index];
+}
+
+// Returns the number of TestPartResult objects in the array.
+int TestPartResultArray::size() const {
+  return static_cast<int>(array_.size());
+}
+
+namespace internal {
+
+HasNewFatalFailureHelper::HasNewFatalFailureHelper()
+    : has_new_fatal_failure_(false),
+      original_reporter_(GetUnitTestImpl()->
+                         GetTestPartResultReporterForCurrentThread()) {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
+}
+
+HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
+      original_reporter_);
+}
+
+void HasNewFatalFailureHelper::ReportTestPartResult(
+    const TestPartResult& result) {
+  if (result.fatally_failed())
+    has_new_fatal_failure_ = true;
+  original_reporter_->ReportTestPartResult(result);
+}
+
+}  // namespace internal
+
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest-typed-test.cc b/Externals/gtest/src/gtest-typed-test.cc
new file mode 100644
index 0000000000..f0079f407c
--- /dev/null
+++ b/Externals/gtest/src/gtest-typed-test.cc
@@ -0,0 +1,110 @@
+// Copyright 2008 Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest-typed-test.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+#if GTEST_HAS_TYPED_TEST_P
+
+// Skips to the first non-space char in str. Returns an empty string if str
+// contains only whitespace characters.
+static const char* SkipSpaces(const char* str) {
+  while (IsSpace(*str))
+    str++;
+  return str;
+}
+
+// Verifies that registered_tests match the test names in
+// defined_test_names_; returns registered_tests if successful, or
+// aborts the program otherwise.
+const char* TypedTestCasePState::VerifyRegisteredTestNames(
+    const char* file, int line, const char* registered_tests) {
+  typedef ::std::set<const char*>::const_iterator DefinedTestIter;
+  registered_ = true;
+
+  // Skip initial whitespace in registered_tests since some
+  // preprocessors prefix stringizied literals with whitespace.
+  registered_tests = SkipSpaces(registered_tests);
+
+  Message errors;
+  ::std::set<std::string> tests;
+  for (const char* names = registered_tests; names != NULL;
+       names = SkipComma(names)) {
+    const std::string name = GetPrefixUntilComma(names);
+    if (tests.count(name) != 0) {
+      errors << "Test " << name << " is listed more than once.\n";
+      continue;
+    }
+
+    bool found = false;
+    for (DefinedTestIter it = defined_test_names_.begin();
+         it != defined_test_names_.end();
+         ++it) {
+      if (name == *it) {
+        found = true;
+        break;
+      }
+    }
+
+    if (found) {
+      tests.insert(name);
+    } else {
+      errors << "No test named " << name
+             << " can be found in this test case.\n";
+    }
+  }
+
+  for (DefinedTestIter it = defined_test_names_.begin();
+       it != defined_test_names_.end();
+       ++it) {
+    if (tests.count(*it) == 0) {
+      errors << "You forgot to list test " << *it << ".\n";
+    }
+  }
+
+  const std::string& errors_str = errors.GetString();
+  if (errors_str != "") {
+    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
+            errors_str.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+
+  return registered_tests;
+}
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest.cc b/Externals/gtest/src/gtest.cc
new file mode 100644
index 0000000000..6de53dd019
--- /dev/null
+++ b/Externals/gtest/src/gtest.cc
@@ -0,0 +1,5015 @@
+// Copyright 2005, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+#include <ctype.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#include <algorithm>
+#include <iomanip>
+#include <limits>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <vector>
+
+#if GTEST_OS_LINUX
+
+// TODO(kenton@google.com): Use autoconf to detect availability of
+// gettimeofday().
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+
+# include <fcntl.h>  // NOLINT
+# include <limits.h>  // NOLINT
+# include <sched.h>  // NOLINT
+// Declares vsnprintf().  This header is not available on Windows.
+# include <strings.h>  // NOLINT
+# include <sys/mman.h>  // NOLINT
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+# include <string>
+
+#elif GTEST_OS_SYMBIAN
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+# include <sys/time.h>  // NOLINT
+
+#elif GTEST_OS_ZOS
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+# include <sys/time.h>  // NOLINT
+
+// On z/OS we additionally need strings.h for strcasecmp.
+# include <strings.h>  // NOLINT
+
+#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
+
+# include <windows.h>  // NOLINT
+
+#elif GTEST_OS_WINDOWS  // We are on Windows proper.
+
+# include <io.h>  // NOLINT
+# include <sys/timeb.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+# include <sys/stat.h>  // NOLINT
+
+# if GTEST_OS_WINDOWS_MINGW
+// MinGW has gettimeofday() but not _ftime64().
+// TODO(kenton@google.com): Use autoconf to detect availability of
+//   gettimeofday().
+// TODO(kenton@google.com): There are other ways to get the time on
+//   Windows, like GetTickCount() or GetSystemTimeAsFileTime().  MinGW
+//   supports these.  consider using them instead.
+#  define GTEST_HAS_GETTIMEOFDAY_ 1
+#  include <sys/time.h>  // NOLINT
+# endif  // GTEST_OS_WINDOWS_MINGW
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <windows.h>  // NOLINT
+
+#else
+
+// Assume other platforms have gettimeofday().
+// TODO(kenton@google.com): Use autoconf to detect availability of
+//   gettimeofday().
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+#endif
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#if GTEST_OS_WINDOWS
+# define vsnprintf _vsnprintf
+#endif  // GTEST_OS_WINDOWS
+
+namespace testing {
+
+using internal::CountIf;
+using internal::ForEach;
+using internal::GetElementOr;
+using internal::Shuffle;
+
+// Constants.
+
+// A test whose test case name or test name matches this filter is
+// disabled and not run.
+static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
+
+// A test case whose name matches this filter is considered a death
+// test case and will be run before test cases whose name doesn't
+// match this filter.
+static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*";
+
+// A test filter that matches everything.
+static const char kUniversalFilter[] = "*";
+
+// The default output file for XML output.
+static const char kDefaultOutputFile[] = "test_detail.xml";
+
+// The environment variable name for the test shard index.
+static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
+// The environment variable name for the total number of test shards.
+static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
+// The environment variable name for the test shard status file.
+static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
+
+namespace internal {
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+const char kStackTraceMarker[] = "\nStack trace:\n";
+
+// g_help_flag is true iff the --help flag or an equivalent form is
+// specified on the command line.
+bool g_help_flag = false;
+
+}  // namespace internal
+
+static const char* GetDefaultFilter() {
+  return kUniversalFilter;
+}
+
+GTEST_DEFINE_bool_(
+    also_run_disabled_tests,
+    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
+    "Run disabled tests too, in addition to the tests normally being run.");
+
+GTEST_DEFINE_bool_(
+    break_on_failure,
+    internal::BoolFromGTestEnv("break_on_failure", false),
+    "True iff a failed assertion should be a debugger break-point.");
+
+GTEST_DEFINE_bool_(
+    catch_exceptions,
+    internal::BoolFromGTestEnv("catch_exceptions", true),
+    "True iff " GTEST_NAME_
+    " should catch exceptions and treat them as test failures.");
+
+GTEST_DEFINE_string_(
+    color,
+    internal::StringFromGTestEnv("color", "auto"),
+    "Whether to use colors in the output.  Valid values: yes, no, "
+    "and auto.  'auto' means to use colors if the output is "
+    "being sent to a terminal and the TERM environment variable "
+    "is set to a terminal type that supports colors.");
+
+GTEST_DEFINE_string_(
+    filter,
+    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
+    "A colon-separated list of glob (not regex) patterns "
+    "for filtering the tests to run, optionally followed by a "
+    "'-' and a : separated list of negative patterns (tests to "
+    "exclude).  A test is run if it matches one of the positive "
+    "patterns and does not match any of the negative patterns.");
+
+GTEST_DEFINE_bool_(list_tests, false,
+                   "List all tests without running them.");
+
+GTEST_DEFINE_string_(
+    output,
+    internal::StringFromGTestEnv("output", ""),
+    "A format (currently must be \"xml\"), optionally followed "
+    "by a colon and an output file name or directory. A directory "
+    "is indicated by a trailing pathname separator. "
+    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
+    "If a directory is specified, output files will be created "
+    "within that directory, with file-names based on the test "
+    "executable's name and, if necessary, made unique by adding "
+    "digits.");
+
+GTEST_DEFINE_bool_(
+    print_time,
+    internal::BoolFromGTestEnv("print_time", true),
+    "True iff " GTEST_NAME_
+    " should display elapsed time in text output.");
+
+GTEST_DEFINE_int32_(
+    random_seed,
+    internal::Int32FromGTestEnv("random_seed", 0),
+    "Random number seed to use when shuffling test orders.  Must be in range "
+    "[1, 99999], or 0 to use a seed based on the current time.");
+
+GTEST_DEFINE_int32_(
+    repeat,
+    internal::Int32FromGTestEnv("repeat", 1),
+    "How many times to repeat each test.  Specify a negative number "
+    "for repeating forever.  Useful for shaking out flaky tests.");
+
+GTEST_DEFINE_bool_(
+    show_internal_stack_frames, false,
+    "True iff " GTEST_NAME_ " should include internal stack frames when "
+    "printing test failure stack traces.");
+
+GTEST_DEFINE_bool_(
+    shuffle,
+    internal::BoolFromGTestEnv("shuffle", false),
+    "True iff " GTEST_NAME_
+    " should randomize tests' order on every run.");
+
+GTEST_DEFINE_int32_(
+    stack_trace_depth,
+    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
+    "The maximum number of stack frames to print when an "
+    "assertion fails.  The valid range is 0 through 100, inclusive.");
+
+GTEST_DEFINE_string_(
+    stream_result_to,
+    internal::StringFromGTestEnv("stream_result_to", ""),
+    "This flag specifies the host name and the port number on which to stream "
+    "test results. Example: \"localhost:555\". The flag is effective only on "
+    "Linux.");
+
+GTEST_DEFINE_bool_(
+    throw_on_failure,
+    internal::BoolFromGTestEnv("throw_on_failure", false),
+    "When this flag is specified, a failed assertion will throw an exception "
+    "if exceptions are enabled or exit the program with a non-zero code "
+    "otherwise.");
+
+namespace internal {
+
+// Generates a random number from [0, range), using a Linear
+// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
+// than kMaxRange.
+UInt32 Random::Generate(UInt32 range) {
+  // These constants are the same as are used in glibc's rand(3).
+  state_ = (1103515245U*state_ + 12345U) % kMaxRange;
+
+  GTEST_CHECK_(range > 0)
+      << "Cannot generate a number in the range [0, 0).";
+  GTEST_CHECK_(range <= kMaxRange)
+      << "Generation of a number in [0, " << range << ") was requested, "
+      << "but this can only generate numbers in [0, " << kMaxRange << ").";
+
+  // Converting via modulus introduces a bit of downward bias, but
+  // it's simple, and a linear congruential generator isn't too good
+  // to begin with.
+  return state_ % range;
+}
+
+// GTestIsInitialized() returns true iff the user has initialized
+// Google Test.  Useful for catching the user mistake of not initializing
+// Google Test before calling RUN_ALL_TESTS().
+//
+// A user must call testing::InitGoogleTest() to initialize Google
+// Test.  g_init_gtest_count is set to the number of times
+// InitGoogleTest() has been called.  We don't protect this variable
+// under a mutex as it is only accessed in the main thread.
+GTEST_API_ int g_init_gtest_count = 0;
+static bool GTestIsInitialized() { return g_init_gtest_count != 0; }
+
+// Iterates over a vector of TestCases, keeping a running sum of the
+// results of calling a given int-returning method on each.
+// Returns the sum.
+static int SumOverTestCaseList(const std::vector<TestCase*>& case_list,
+                               int (TestCase::*method)() const) {
+  int sum = 0;
+  for (size_t i = 0; i < case_list.size(); i++) {
+    sum += (case_list[i]->*method)();
+  }
+  return sum;
+}
+
+// Returns true iff the test case passed.
+static bool TestCasePassed(const TestCase* test_case) {
+  return test_case->should_run() && test_case->Passed();
+}
+
+// Returns true iff the test case failed.
+static bool TestCaseFailed(const TestCase* test_case) {
+  return test_case->should_run() && test_case->Failed();
+}
+
+// Returns true iff test_case contains at least one test that should
+// run.
+static bool ShouldRunTestCase(const TestCase* test_case) {
+  return test_case->should_run();
+}
+
+// AssertHelper constructor.
+AssertHelper::AssertHelper(TestPartResult::Type type,
+                           const char* file,
+                           int line,
+                           const char* message)
+    : data_(new AssertHelperData(type, file, line, message)) {
+}
+
+AssertHelper::~AssertHelper() {
+  delete data_;
+}
+
+// Message assignment, for assertion streaming support.
+void AssertHelper::operator=(const Message& message) const {
+  UnitTest::GetInstance()->
+    AddTestPartResult(data_->type, data_->file, data_->line,
+                      AppendUserMessage(data_->message, message),
+                      UnitTest::GetInstance()->impl()
+                      ->CurrentOsStackTraceExceptTop(1)
+                      // Skips the stack frame for this function itself.
+                      );  // NOLINT
+}
+
+// Mutex for linked pointers.
+GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
+
+// Application pathname gotten in InitGoogleTest.
+std::string g_executable_path;
+
+// Returns the current application's name, removing directory path if that
+// is present.
+FilePath GetCurrentExecutableName() {
+  FilePath result;
+
+#if GTEST_OS_WINDOWS
+  result.Set(FilePath(g_executable_path).RemoveExtension("exe"));
+#else
+  result.Set(FilePath(g_executable_path));
+#endif  // GTEST_OS_WINDOWS
+
+  return result.RemoveDirectoryName();
+}
+
+// Functions for processing the gtest_output flag.
+
+// Returns the output format, or "" for normal printed output.
+std::string UnitTestOptions::GetOutputFormat() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  if (gtest_output_flag == NULL) return std::string("");
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  return (colon == NULL) ?
+      std::string(gtest_output_flag) :
+      std::string(gtest_output_flag, colon - gtest_output_flag);
+}
+
+// Returns the name of the requested output file, or the default if none
+// was explicitly specified.
+std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  if (gtest_output_flag == NULL)
+    return "";
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  if (colon == NULL)
+    return internal::FilePath::ConcatPaths(
+        internal::FilePath(
+            UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(kDefaultOutputFile)).string();
+
+  internal::FilePath output_name(colon + 1);
+  if (!output_name.IsAbsolutePath())
+    // TODO(wan@google.com): on Windows \some\path is not an absolute
+    // path (as its meaning depends on the current drive), yet the
+    // following logic for turning it into an absolute path is wrong.
+    // Fix it.
+    output_name = internal::FilePath::ConcatPaths(
+        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(colon + 1));
+
+  if (!output_name.IsDirectory())
+    return output_name.string();
+
+  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
+      output_name, internal::GetCurrentExecutableName(),
+      GetOutputFormat().c_str()));
+  return result.string();
+}
+
+// Returns true iff the wildcard pattern matches the string.  The
+// first ':' or '\0' character in pattern marks the end of it.
+//
+// This recursive algorithm isn't very efficient, but is clear and
+// works well enough for matching test names, which are short.
+bool UnitTestOptions::PatternMatchesString(const char *pattern,
+                                           const char *str) {
+  switch (*pattern) {
+    case '\0':
+    case ':':  // Either ':' or '\0' marks the end of the pattern.
+      return *str == '\0';
+    case '?':  // Matches any single character.
+      return *str != '\0' && PatternMatchesString(pattern + 1, str + 1);
+    case '*':  // Matches any string (possibly empty) of characters.
+      return (*str != '\0' && PatternMatchesString(pattern, str + 1)) ||
+          PatternMatchesString(pattern + 1, str);
+    default:  // Non-special character.  Matches itself.
+      return *pattern == *str &&
+          PatternMatchesString(pattern + 1, str + 1);
+  }
+}
+
+bool UnitTestOptions::MatchesFilter(
+    const std::string& name, const char* filter) {
+  const char *cur_pattern = filter;
+  for (;;) {
+    if (PatternMatchesString(cur_pattern, name.c_str())) {
+      return true;
+    }
+
+    // Finds the next pattern in the filter.
+    cur_pattern = strchr(cur_pattern, ':');
+
+    // Returns if no more pattern can be found.
+    if (cur_pattern == NULL) {
+      return false;
+    }
+
+    // Skips the pattern separater (the ':' character).
+    cur_pattern++;
+  }
+}
+
+// Returns true iff the user-specified filter matches the test case
+// name and the test name.
+bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name,
+                                        const std::string &test_name) {
+  const std::string& full_name = test_case_name + "." + test_name.c_str();
+
+  // Split --gtest_filter at '-', if there is one, to separate into
+  // positive filter and negative filter portions
+  const char* const p = GTEST_FLAG(filter).c_str();
+  const char* const dash = strchr(p, '-');
+  std::string positive;
+  std::string negative;
+  if (dash == NULL) {
+    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
+    negative = "";
+  } else {
+    positive = std::string(p, dash);   // Everything up to the dash
+    negative = std::string(dash + 1);  // Everything after the dash
+    if (positive.empty()) {
+      // Treat '-test1' as the same as '*-test1'
+      positive = kUniversalFilter;
+    }
+  }
+
+  // A filter is a colon-separated list of patterns.  It matches a
+  // test if any pattern in it matches the test.
+  return (MatchesFilter(full_name, positive.c_str()) &&
+          !MatchesFilter(full_name, negative.c_str()));
+}
+
+#if GTEST_HAS_SEH
+// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+// This function is useful as an __except condition.
+int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
+  // Google Test should handle a SEH exception if:
+  //   1. the user wants it to, AND
+  //   2. this is not a breakpoint exception, AND
+  //   3. this is not a C++ exception (VC++ implements them via SEH,
+  //      apparently).
+  //
+  // SEH exception code for C++ exceptions.
+  // (see http://support.microsoft.com/kb/185294 for more information).
+  const DWORD kCxxExceptionCode = 0xe06d7363;
+
+  bool should_handle = true;
+
+  if (!GTEST_FLAG(catch_exceptions))
+    should_handle = false;
+  else if (exception_code == EXCEPTION_BREAKPOINT)
+    should_handle = false;
+  else if (exception_code == kCxxExceptionCode)
+    should_handle = false;
+
+  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+}
+#endif  // GTEST_HAS_SEH
+
+}  // namespace internal
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results. Intercepts only failures from the current thread.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    TestPartResultArray* result)
+    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
+      result_(result) {
+  Init();
+}
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    InterceptMode intercept_mode, TestPartResultArray* result)
+    : intercept_mode_(intercept_mode),
+      result_(result) {
+  Init();
+}
+
+void ScopedFakeTestPartResultReporter::Init() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    old_reporter_ = impl->GetGlobalTestPartResultReporter();
+    impl->SetGlobalTestPartResultReporter(this);
+  } else {
+    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
+    impl->SetTestPartResultReporterForCurrentThread(this);
+  }
+}
+
+// The d'tor restores the test part result reporter used by Google Test
+// before.
+ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    impl->SetGlobalTestPartResultReporter(old_reporter_);
+  } else {
+    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
+  }
+}
+
+// Increments the test part result count and remembers the result.
+// This method is from the TestPartResultReporterInterface interface.
+void ScopedFakeTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  result_->Append(result);
+}
+
+namespace internal {
+
+// Returns the type ID of ::testing::Test.  We should always call this
+// instead of GetTypeId< ::testing::Test>() to get the type ID of
+// testing::Test.  This is to work around a suspected linker bug when
+// using Google Test as a framework on Mac OS X.  The bug causes
+// GetTypeId< ::testing::Test>() to return different values depending
+// on whether the call is from the Google Test framework itself or
+// from user test code.  GetTestTypeId() is guaranteed to always
+// return the same value, as it always calls GetTypeId<>() from the
+// gtest.cc, which is within the Google Test framework.
+TypeId GetTestTypeId() {
+  return GetTypeId<Test>();
+}
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
+
+// This predicate-formatter checks that 'results' contains a test part
+// failure of the given type and that the failure message contains the
+// given substring.
+AssertionResult HasOneFailure(const char* /* results_expr */,
+                              const char* /* type_expr */,
+                              const char* /* substr_expr */,
+                              const TestPartResultArray& results,
+                              TestPartResult::Type type,
+                              const string& substr) {
+  const std::string expected(type == TestPartResult::kFatalFailure ?
+                        "1 fatal failure" :
+                        "1 non-fatal failure");
+  Message msg;
+  if (results.size() != 1) {
+    msg << "Expected: " << expected << "\n"
+        << "  Actual: " << results.size() << " failures";
+    for (int i = 0; i < results.size(); i++) {
+      msg << "\n" << results.GetTestPartResult(i);
+    }
+    return AssertionFailure() << msg;
+  }
+
+  const TestPartResult& r = results.GetTestPartResult(0);
+  if (r.type() != type) {
+    return AssertionFailure() << "Expected: " << expected << "\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  if (strstr(r.message(), substr.c_str()) == NULL) {
+    return AssertionFailure() << "Expected: " << expected << " containing \""
+                              << substr << "\"\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  return AssertionSuccess();
+}
+
+// The constructor of SingleFailureChecker remembers where to look up
+// test part results, what type of failure we expect, and what
+// substring the failure message should contain.
+SingleFailureChecker:: SingleFailureChecker(
+    const TestPartResultArray* results,
+    TestPartResult::Type type,
+    const string& substr)
+    : results_(results),
+      type_(type),
+      substr_(substr) {}
+
+// The destructor of SingleFailureChecker verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+SingleFailureChecker::~SingleFailureChecker() {
+  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
+}
+
+DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->current_test_result()->AddTestPartResult(result);
+  unit_test_->listeners()->repeater()->OnTestPartResult(result);
+}
+
+DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
+}
+
+// Returns the global test part result reporter.
+TestPartResultReporterInterface*
+UnitTestImpl::GetGlobalTestPartResultReporter() {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  return global_test_part_result_repoter_;
+}
+
+// Sets the global test part result reporter.
+void UnitTestImpl::SetGlobalTestPartResultReporter(
+    TestPartResultReporterInterface* reporter) {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  global_test_part_result_repoter_ = reporter;
+}
+
+// Returns the test part result reporter for the current thread.
+TestPartResultReporterInterface*
+UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
+  return per_thread_test_part_result_reporter_.get();
+}
+
+// Sets the test part result reporter for the current thread.
+void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
+    TestPartResultReporterInterface* reporter) {
+  per_thread_test_part_result_reporter_.set(reporter);
+}
+
+// Gets the number of successful test cases.
+int UnitTestImpl::successful_test_case_count() const {
+  return CountIf(test_cases_, TestCasePassed);
+}
+
+// Gets the number of failed test cases.
+int UnitTestImpl::failed_test_case_count() const {
+  return CountIf(test_cases_, TestCaseFailed);
+}
+
+// Gets the number of all test cases.
+int UnitTestImpl::total_test_case_count() const {
+  return static_cast<int>(test_cases_.size());
+}
+
+// Gets the number of all test cases that contain at least one test
+// that should run.
+int UnitTestImpl::test_case_to_run_count() const {
+  return CountIf(test_cases_, ShouldRunTestCase);
+}
+
+// Gets the number of successful tests.
+int UnitTestImpl::successful_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count);
+}
+
+// Gets the number of failed tests.
+int UnitTestImpl::failed_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTestImpl::reportable_disabled_test_count() const {
+  return SumOverTestCaseList(test_cases_,
+                             &TestCase::reportable_disabled_test_count);
+}
+
+// Gets the number of disabled tests.
+int UnitTestImpl::disabled_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTestImpl::reportable_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count);
+}
+
+// Gets the number of all tests.
+int UnitTestImpl::total_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::total_test_count);
+}
+
+// Gets the number of tests that should run.
+int UnitTestImpl::test_to_run_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count);
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
+  (void)skip_count;
+  return "";
+}
+
+// Returns the current time in milliseconds.
+TimeInMillis GetTimeInMillis() {
+#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__)
+  // Difference between 1970-01-01 and 1601-01-01 in milliseconds.
+  // http://analogous.blogspot.com/2005/04/epoch.html
+  const TimeInMillis kJavaEpochToWinFileTimeDelta =
+    static_cast<TimeInMillis>(116444736UL) * 100000UL;
+  const DWORD kTenthMicrosInMilliSecond = 10000;
+
+  SYSTEMTIME now_systime;
+  FILETIME now_filetime;
+  ULARGE_INTEGER now_int64;
+  // TODO(kenton@google.com): Shouldn't this just use
+  //   GetSystemTimeAsFileTime()?
+  GetSystemTime(&now_systime);
+  if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
+    now_int64.LowPart = now_filetime.dwLowDateTime;
+    now_int64.HighPart = now_filetime.dwHighDateTime;
+    now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) -
+      kJavaEpochToWinFileTimeDelta;
+    return now_int64.QuadPart;
+  }
+  return 0;
+#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
+  __timeb64 now;
+
+# ifdef _MSC_VER
+
+  // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
+  // (deprecated function) there.
+  // TODO(kenton@google.com): Use GetTickCount()?  Or use
+  //   SystemTimeToFileTime()
+#  pragma warning(push)          // Saves the current warning state.
+#  pragma warning(disable:4996)  // Temporarily disables warning 4996.
+  _ftime64(&now);
+#  pragma warning(pop)           // Restores the warning state.
+# else
+
+  _ftime64(&now);
+
+# endif  // _MSC_VER
+
+  return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm;
+#elif GTEST_HAS_GETTIMEOFDAY_
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return static_cast<TimeInMillis>(now.tv_sec) * 1000 + now.tv_usec / 1000;
+#else
+# error "Don't know how to get the current time on your system."
+#endif
+}
+
+// Utilities
+
+// class String.
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Creates a UTF-16 wide string from the given ANSI string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the wide string, or NULL if the
+// input is NULL.
+LPCWSTR String::AnsiToUtf16(const char* ansi) {
+  if (!ansi) return NULL;
+  const int length = strlen(ansi);
+  const int unicode_length =
+      MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                          NULL, 0);
+  WCHAR* unicode = new WCHAR[unicode_length + 1];
+  MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                      unicode, unicode_length);
+  unicode[unicode_length] = 0;
+  return unicode;
+}
+
+// Creates an ANSI string from the given wide string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the ANSI string, or NULL if the
+// input is NULL.
+const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
+  if (!utf16_str) return NULL;
+  const int ansi_length =
+      WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
+                          NULL, 0, NULL, NULL);
+  char* ansi = new char[ansi_length + 1];
+  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
+                      ansi, ansi_length, NULL, NULL);
+  ansi[ansi_length] = 0;
+  return ansi;
+}
+
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Compares two C strings.  Returns true iff they have the same content.
+//
+// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CStringEquals(const char * lhs, const char * rhs) {
+  if ( lhs == NULL ) return rhs == NULL;
+
+  if ( rhs == NULL ) return false;
+
+  return strcmp(lhs, rhs) == 0;
+}
+
+#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
+
+// Converts an array of wide chars to a narrow string using the UTF-8
+// encoding, and streams the result to the given Message object.
+static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
+                                     Message* msg) {
+  for (size_t i = 0; i != length; ) {  // NOLINT
+    if (wstr[i] != L'\0') {
+      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
+      while (i != length && wstr[i] != L'\0')
+        i++;
+    } else {
+      *msg << '\0';
+      i++;
+    }
+  }
+}
+
+#endif  // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
+
+}  // namespace internal
+
+// Constructs an empty Message.
+// We allocate the stringstream separately because otherwise each use of
+// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
+// stack frame leading to huge stack frames in some cases; gcc does not reuse
+// the stack space.
+Message::Message() : ss_(new ::std::stringstream) {
+  // By default, we want there to be enough precision when printing
+  // a double to a Message.
+  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
+}
+
+// These two overloads allow streaming a wide C string to a Message
+// using the UTF-8 encoding.
+Message& Message::operator <<(const wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+Message& Message::operator <<(wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::std::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// Gets the text streamed to this object so far as an std::string.
+// Each '\0' character in the buffer is replaced with "\\0".
+std::string Message::GetString() const {
+  return internal::StringStreamToString(ss_.get());
+}
+
+// AssertionResult constructors.
+// Used in EXPECT_TRUE/FALSE(assertion_result).
+AssertionResult::AssertionResult(const AssertionResult& other)
+    : success_(other.success_),
+      message_(other.message_.get() != NULL ?
+               new ::std::string(*other.message_) :
+               static_cast< ::std::string*>(NULL)) {
+}
+
+// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+AssertionResult AssertionResult::operator!() const {
+  AssertionResult negation(!success_);
+  if (message_.get() != NULL)
+    negation << *message_;
+  return negation;
+}
+
+// Makes a successful assertion result.
+AssertionResult AssertionSuccess() {
+  return AssertionResult(true);
+}
+
+// Makes a failed assertion result.
+AssertionResult AssertionFailure() {
+  return AssertionResult(false);
+}
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << message.
+AssertionResult AssertionFailure(const Message& message) {
+  return AssertionFailure() << message;
+}
+
+namespace internal {
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   expected_expression: "foo"
+//   actual_expression:   "bar"
+//   expected_value:      "5"
+//   actual_value:        "6"
+//
+// The ignoring_case parameter is true iff the assertion is a
+// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
+// be inserted into the message.
+AssertionResult EqFailure(const char* expected_expression,
+                          const char* actual_expression,
+                          const std::string& expected_value,
+                          const std::string& actual_value,
+                          bool ignoring_case) {
+  Message msg;
+  msg << "Value of: " << actual_expression;
+  if (actual_value != actual_expression) {
+    msg << "\n  Actual: " << actual_value;
+  }
+
+  msg << "\nExpected: " << expected_expression;
+  if (ignoring_case) {
+    msg << " (ignoring case)";
+  }
+  if (expected_value != expected_expression) {
+    msg << "\nWhich is: " << expected_value;
+  }
+
+  return AssertionFailure() << msg;
+}
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value) {
+  const char* actual_message = assertion_result.message();
+  Message msg;
+  msg << "Value of: " << expression_text
+      << "\n  Actual: " << actual_predicate_value;
+  if (actual_message[0] != '\0')
+    msg << " (" << actual_message << ")";
+  msg << "\nExpected: " << expected_predicate_value;
+  return msg.GetString();
+}
+
+// Helper function for implementing ASSERT_NEAR.
+AssertionResult DoubleNearPredFormat(const char* expr1,
+                                     const char* expr2,
+                                     const char* abs_error_expr,
+                                     double val1,
+                                     double val2,
+                                     double abs_error) {
+  const double diff = fabs(val1 - val2);
+  if (diff <= abs_error) return AssertionSuccess();
+
+  // TODO(wan): do not print the value of an expression if it's
+  // already a literal.
+  return AssertionFailure()
+      << "The difference between " << expr1 << " and " << expr2
+      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
+      << expr1 << " evaluates to " << val1 << ",\n"
+      << expr2 << " evaluates to " << val2 << ", and\n"
+      << abs_error_expr << " evaluates to " << abs_error << ".";
+}
+
+
+// Helper template for implementing FloatLE() and DoubleLE().
+template <typename RawType>
+AssertionResult FloatingPointLE(const char* expr1,
+                                const char* expr2,
+                                RawType val1,
+                                RawType val2) {
+  // Returns success if val1 is less than val2,
+  if (val1 < val2) {
+    return AssertionSuccess();
+  }
+
+  // or if val1 is almost equal to val2.
+  const FloatingPoint<RawType> lhs(val1), rhs(val2);
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  // Note that the above two checks will both fail if either val1 or
+  // val2 is NaN, as the IEEE floating-point standard requires that
+  // any predicate involving a NaN must return false.
+
+  ::std::stringstream val1_ss;
+  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val1;
+
+  ::std::stringstream val2_ss;
+  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val2;
+
+  return AssertionFailure()
+      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
+      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
+      << StringStreamToString(&val2_ss);
+}
+
+}  // namespace internal
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult FloatLE(const char* expr1, const char* expr2,
+                        float val1, float val2) {
+  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
+}
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                         double val1, double val2) {
+  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
+}
+
+namespace internal {
+
+// The helper function for {ASSERT|EXPECT}_EQ with int or enum
+// arguments.
+AssertionResult CmpHelperEQ(const char* expected_expression,
+                            const char* actual_expression,
+                            BiggestInt expected,
+                            BiggestInt actual) {
+  if (expected == actual) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   FormatForComparisonFailureMessage(expected, actual),
+                   FormatForComparisonFailureMessage(actual, expected),
+                   false);
+}
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_?? with integer or enum arguments.  It is here
+// just to avoid copy-and-paste of similar code.
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   BiggestInt val1, BiggestInt val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return AssertionFailure() \
+        << "Expected: (" << expr1 << ") " #op " (" << expr2\
+        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
+        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
+  }\
+}
+
+// Implements the helper function for {ASSERT|EXPECT}_NE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(NE, !=)
+// Implements the helper function for {ASSERT|EXPECT}_LE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(LE, <=)
+// Implements the helper function for {ASSERT|EXPECT}_LT with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(LT, < )
+// Implements the helper function for {ASSERT|EXPECT}_GE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(GE, >=)
+// Implements the helper function for {ASSERT|EXPECT}_GT with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(GT, > )
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                               const char* actual_expression,
+                               const char* expected,
+                               const char* actual) {
+  if (String::CStringEquals(expected, actual)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   PrintToString(expected),
+                   PrintToString(actual),
+                   false);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
+                                   const char* actual_expression,
+                                   const char* expected,
+                                   const char* actual) {
+  if (String::CaseInsensitiveCStringEquals(expected, actual)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   PrintToString(expected),
+                   PrintToString(actual),
+                   true);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const char* s1,
+                               const char* s2) {
+  if (!String::CStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                              << s2_expression << "), actual: \""
+                              << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                   const char* s2_expression,
+                                   const char* s1,
+                                   const char* s2) {
+  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure()
+        << "Expected: (" << s1_expression << ") != ("
+        << s2_expression << ") (ignoring case), actual: \""
+        << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+}  // namespace internal
+
+namespace {
+
+// Helper functions for implementing IsSubString() and IsNotSubstring().
+
+// This group of overloaded functions return true iff needle is a
+// substring of haystack.  NULL is considered a substring of itself
+// only.
+
+bool IsSubstringPred(const char* needle, const char* haystack) {
+  if (needle == NULL || haystack == NULL)
+    return needle == haystack;
+
+  return strstr(haystack, needle) != NULL;
+}
+
+bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
+  if (needle == NULL || haystack == NULL)
+    return needle == haystack;
+
+  return wcsstr(haystack, needle) != NULL;
+}
+
+// StringType here can be either ::std::string or ::std::wstring.
+template <typename StringType>
+bool IsSubstringPred(const StringType& needle,
+                     const StringType& haystack) {
+  return haystack.find(needle) != StringType::npos;
+}
+
+// This function implements either IsSubstring() or IsNotSubstring(),
+// depending on the value of the expected_to_be_substring parameter.
+// StringType here can be const char*, const wchar_t*, ::std::string,
+// or ::std::wstring.
+template <typename StringType>
+AssertionResult IsSubstringImpl(
+    bool expected_to_be_substring,
+    const char* needle_expr, const char* haystack_expr,
+    const StringType& needle, const StringType& haystack) {
+  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
+    return AssertionSuccess();
+
+  const bool is_wide_string = sizeof(needle[0]) > 1;
+  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
+  return AssertionFailure()
+      << "Value of: " << needle_expr << "\n"
+      << "  Actual: " << begin_string_quote << needle << "\"\n"
+      << "Expected: " << (expected_to_be_substring ? "" : "not ")
+      << "a substring of " << haystack_expr << "\n"
+      << "Which is: " << begin_string_quote << haystack << "\"";
+}
+
+}  // namespace
+
+// IsSubstring() and IsNotSubstring() check whether needle is a
+// substring of haystack (NULL is considered a substring of itself
+// only), and return an appropriate error message when they fail.
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+#if GTEST_HAS_STD_WSTRING
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+
+namespace {
+
+// Helper function for IsHRESULT{SuccessFailure} predicates
+AssertionResult HRESULTFailureHelper(const char* expr,
+                                     const char* expected,
+                                     long hr) {  // NOLINT
+# if GTEST_OS_WINDOWS_MOBILE
+
+  // Windows CE doesn't support FormatMessage.
+  const char error_text[] = "";
+
+# else
+
+  // Looks up the human-readable system message for the HRESULT code
+  // and since we're not passing any params to FormatMessage, we don't
+  // want inserts expanded.
+  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS;
+  const DWORD kBufSize = 4096;
+  // Gets the system's human readable message string for this HRESULT.
+  char error_text[kBufSize] = { '\0' };
+  DWORD message_length = ::FormatMessageA(kFlags,
+                                          0,  // no source, we're asking system
+                                          hr,  // the error
+                                          0,  // no line width restrictions
+                                          error_text,  // output buffer
+                                          kBufSize,  // buf size
+                                          NULL);  // no arguments for inserts
+  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
+  for (; message_length && IsSpace(error_text[message_length - 1]);
+          --message_length) {
+    error_text[message_length - 1] = '\0';
+  }
+
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+  const std::string error_hex("0x" + String::FormatHexInt(hr));
+  return ::testing::AssertionFailure()
+      << "Expected: " << expr << " " << expected << ".\n"
+      << "  Actual: " << error_hex << " " << error_text << "\n";
+}
+
+}  // namespace
+
+AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
+  if (SUCCEEDED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "succeeds", hr);
+}
+
+AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
+  if (FAILED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "fails", hr);
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+// Utility functions for encoding Unicode text (wide strings) in
+// UTF-8.
+
+// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
+// like this:
+//
+// Code-point length   Encoding
+//   0 -  7 bits       0xxxxxxx
+//   8 - 11 bits       110xxxxx 10xxxxxx
+//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
+//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+
+// The maximum code-point a one-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) <<  7) - 1;
+
+// The maximum code-point a two-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5 + 6)) - 1;
+
+// The maximum code-point a three-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4 + 2*6)) - 1;
+
+// The maximum code-point a four-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3 + 3*6)) - 1;
+
+// Chops off the n lowest bits from a bit pattern.  Returns the n
+// lowest bits.  As a side effect, the original bit pattern will be
+// shifted to the right by n bits.
+inline UInt32 ChopLowBits(UInt32* bits, int n) {
+  const UInt32 low_bits = *bits & ((static_cast<UInt32>(1) << n) - 1);
+  *bits >>= n;
+  return low_bits;
+}
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+std::string CodePointToUtf8(UInt32 code_point) {
+  if (code_point > kMaxCodePoint4) {
+    return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")";
+  }
+
+  char str[5];  // Big enough for the largest valid code point.
+  if (code_point <= kMaxCodePoint1) {
+    str[1] = '\0';
+    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
+  } else if (code_point <= kMaxCodePoint2) {
+    str[2] = '\0';
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
+  } else if (code_point <= kMaxCodePoint3) {
+    str[3] = '\0';
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
+  } else {  // code_point <= kMaxCodePoint4
+    str[4] = '\0';
+    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
+  }
+  return str;
+}
+
+// The following two functions only make sense if the the system
+// uses UTF-16 for wide string encoding. All supported systems
+// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
+
+// Determines if the arguments constitute UTF-16 surrogate pair
+// and thus should be combined into a single Unicode code point
+// using CreateCodePointFromUtf16SurrogatePair.
+inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
+  return sizeof(wchar_t) == 2 &&
+      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
+}
+
+// Creates a Unicode code point from UTF16 surrogate pair.
+inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
+                                                    wchar_t second) {
+  const UInt32 mask = (1 << 10) - 1;
+  return (sizeof(wchar_t) == 2) ?
+      (((first & mask) << 10) | (second & mask)) + 0x10000 :
+      // This function should not be called when the condition is
+      // false, but we provide a sensible default in case it is.
+      static_cast<UInt32>(first);
+}
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
+  if (num_chars == -1)
+    num_chars = static_cast<int>(wcslen(str));
+
+  ::std::stringstream stream;
+  for (int i = 0; i < num_chars; ++i) {
+    UInt32 unicode_code_point;
+
+    if (str[i] == L'\0') {
+      break;
+    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
+      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
+                                                                 str[i + 1]);
+      i++;
+    } else {
+      unicode_code_point = static_cast<UInt32>(str[i]);
+    }
+
+    stream << CodePointToUtf8(unicode_code_point);
+  }
+  return StringStreamToString(&stream);
+}
+
+// Converts a wide C string to an std::string using the UTF-8 encoding.
+// NULL will be converted to "(null)".
+std::string String::ShowWideCString(const wchar_t * wide_c_str) {
+  if (wide_c_str == NULL)  return "(null)";
+
+  return internal::WideStringToUtf8(wide_c_str, -1);
+}
+
+// Compares two wide C strings.  Returns true iff they have the same
+// content.
+//
+// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
+  if (lhs == NULL) return rhs == NULL;
+
+  if (rhs == NULL) return false;
+
+  return wcscmp(lhs, rhs) == 0;
+}
+
+// Helper function for *_STREQ on wide strings.
+AssertionResult CmpHelperSTREQ(const char* expected_expression,
+                               const char* actual_expression,
+                               const wchar_t* expected,
+                               const wchar_t* actual) {
+  if (String::WideCStringEquals(expected, actual)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(expected_expression,
+                   actual_expression,
+                   PrintToString(expected),
+                   PrintToString(actual),
+                   false);
+}
+
+// Helper function for *_STRNE on wide strings.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const wchar_t* s1,
+                               const wchar_t* s2) {
+  if (!String::WideCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  }
+
+  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                            << s2_expression << "), actual: "
+                            << PrintToString(s1)
+                            << " vs " << PrintToString(s2);
+}
+
+// Compares two C strings, ignoring case.  Returns true iff they have
+// the same content.
+//
+// Unlike strcasecmp(), this function can handle NULL argument(s).  A
+// NULL C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == NULL)
+    return rhs == NULL;
+  if (rhs == NULL)
+    return false;
+  return posix::StrCaseCmp(lhs, rhs) == 0;
+}
+
+  // Compares two wide C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                              const wchar_t* rhs) {
+  if (lhs == NULL) return rhs == NULL;
+
+  if (rhs == NULL) return false;
+
+#if GTEST_OS_WINDOWS
+  return _wcsicmp(lhs, rhs) == 0;
+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
+  return wcscasecmp(lhs, rhs) == 0;
+#else
+  // Android, Mac OS X and Cygwin don't define wcscasecmp.
+  // Other unknown OSes may not define it either.
+  wint_t left, right;
+  do {
+    left = towlower(*lhs++);
+    right = towlower(*rhs++);
+  } while (left && left == right);
+  return left == right;
+#endif  // OS selector
+}
+
+// Returns true iff str ends with the given suffix, ignoring case.
+// Any string is considered to end with an empty suffix.
+bool String::EndsWithCaseInsensitive(
+    const std::string& str, const std::string& suffix) {
+  const size_t str_len = str.length();
+  const size_t suffix_len = suffix.length();
+  return (str_len >= suffix_len) &&
+         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
+                                      suffix.c_str());
+}
+
+// Formats an int value as "%02d".
+std::string String::FormatIntWidth2(int value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexInt(int value) {
+  std::stringstream ss;
+  ss << std::hex << std::uppercase << value;
+  return ss.str();
+}
+
+// Formats a byte as "%02X".
+std::string String::FormatByte(unsigned char value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
+     << static_cast<unsigned int>(value);
+  return ss.str();
+}
+
+// Converts the buffer in a stringstream to an std::string, converting NUL
+// bytes to "\\0" along the way.
+std::string StringStreamToString(::std::stringstream* ss) {
+  const ::std::string& str = ss->str();
+  const char* const start = str.c_str();
+  const char* const end = start + str.length();
+
+  std::string result;
+  result.reserve(2 * (end - start));
+  for (const char* ch = start; ch != end; ++ch) {
+    if (*ch == '\0') {
+      result += "\\0";  // Replaces NUL with "\\0";
+    } else {
+      result += *ch;
+    }
+  }
+
+  return result;
+}
+
+// Appends the user-supplied message to the Google-Test-generated message.
+std::string AppendUserMessage(const std::string& gtest_msg,
+                              const Message& user_msg) {
+  // Appends the user message if it's non-empty.
+  const std::string user_msg_string = user_msg.GetString();
+  if (user_msg_string.empty()) {
+    return gtest_msg;
+  }
+
+  return gtest_msg + "\n" + user_msg_string;
+}
+
+}  // namespace internal
+
+// class TestResult
+
+// Creates an empty TestResult.
+TestResult::TestResult()
+    : death_test_count_(0),
+      elapsed_time_(0) {
+}
+
+// D'tor.
+TestResult::~TestResult() {
+}
+
+// Returns the i-th test part result among all the results. i can
+// range from 0 to total_part_count() - 1. If i is not in that range,
+// aborts the program.
+const TestPartResult& TestResult::GetTestPartResult(int i) const {
+  if (i < 0 || i >= total_part_count())
+    internal::posix::Abort();
+  return test_part_results_.at(i);
+}
+
+// Returns the i-th test property. i can range from 0 to
+// test_property_count() - 1. If i is not in that range, aborts the
+// program.
+const TestProperty& TestResult::GetTestProperty(int i) const {
+  if (i < 0 || i >= test_property_count())
+    internal::posix::Abort();
+  return test_properties_.at(i);
+}
+
+// Clears the test part results.
+void TestResult::ClearTestPartResults() {
+  test_part_results_.clear();
+}
+
+// Adds a test part result to the list.
+void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
+  test_part_results_.push_back(test_part_result);
+}
+
+// Adds a test property to the list. If a property with the same key as the
+// supplied property is already represented, the value of this test_property
+// replaces the old value for that key.
+void TestResult::RecordProperty(const std::string& xml_element,
+                                const TestProperty& test_property) {
+  if (!ValidateTestProperty(xml_element, test_property)) {
+    return;
+  }
+  internal::MutexLock lock(&test_properites_mutex_);
+  const std::vector<TestProperty>::iterator property_with_matching_key =
+      std::find_if(test_properties_.begin(), test_properties_.end(),
+                   internal::TestPropertyKeyIs(test_property.key()));
+  if (property_with_matching_key == test_properties_.end()) {
+    test_properties_.push_back(test_property);
+    return;
+  }
+  property_with_matching_key->SetValue(test_property.value());
+}
+
+// The list of reserved attributes used in the <testsuites> element of XML
+// output.
+static const char* const kReservedTestSuitesAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "random_seed",
+  "tests",
+  "time",
+  "timestamp"
+};
+
+// The list of reserved attributes used in the <testsuite> element of XML
+// output.
+static const char* const kReservedTestSuiteAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "tests",
+  "time"
+};
+
+// The list of reserved attributes used in the <testcase> element of XML output.
+static const char* const kReservedTestCaseAttributes[] = {
+  "classname",
+  "name",
+  "status",
+  "time",
+  "type_param",
+  "value_param"
+};
+
+template <int kSize>
+std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
+  return std::vector<std::string>(array, array + kSize);
+}
+
+static std::vector<std::string> GetReservedAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+static std::string FormatWordList(const std::vector<std::string>& words) {
+  Message word_list;
+  for (size_t i = 0; i < words.size(); ++i) {
+    if (i > 0 && words.size() > 2) {
+      word_list << ", ";
+    }
+    if (i == words.size() - 1) {
+      word_list << "and ";
+    }
+    word_list << "'" << words[i] << "'";
+  }
+  return word_list.GetString();
+}
+
+bool ValidateTestPropertyName(const std::string& property_name,
+                              const std::vector<std::string>& reserved_names) {
+  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
+          reserved_names.end()) {
+    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
+                  << " (" << FormatWordList(reserved_names)
+                  << " are reserved by " << GTEST_NAME_ << ")";
+    return false;
+  }
+  return true;
+}
+
+// Adds a failure if the key is a reserved attribute of the element named
+// xml_element.  Returns true if the property is valid.
+bool TestResult::ValidateTestProperty(const std::string& xml_element,
+                                      const TestProperty& test_property) {
+  return ValidateTestPropertyName(test_property.key(),
+                                  GetReservedAttributesForElement(xml_element));
+}
+
+// Clears the object.
+void TestResult::Clear() {
+  test_part_results_.clear();
+  test_properties_.clear();
+  death_test_count_ = 0;
+  elapsed_time_ = 0;
+}
+
+// Returns true iff the test failed.
+bool TestResult::Failed() const {
+  for (int i = 0; i < total_part_count(); ++i) {
+    if (GetTestPartResult(i).failed())
+      return true;
+  }
+  return false;
+}
+
+// Returns true iff the test part fatally failed.
+static bool TestPartFatallyFailed(const TestPartResult& result) {
+  return result.fatally_failed();
+}
+
+// Returns true iff the test fatally failed.
+bool TestResult::HasFatalFailure() const {
+  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
+}
+
+// Returns true iff the test part non-fatally failed.
+static bool TestPartNonfatallyFailed(const TestPartResult& result) {
+  return result.nonfatally_failed();
+}
+
+// Returns true iff the test has a non-fatal failure.
+bool TestResult::HasNonfatalFailure() const {
+  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
+}
+
+// Gets the number of all test parts.  This is the sum of the number
+// of successful test parts and the number of failed test parts.
+int TestResult::total_part_count() const {
+  return static_cast<int>(test_part_results_.size());
+}
+
+// Returns the number of the test properties.
+int TestResult::test_property_count() const {
+  return static_cast<int>(test_properties_.size());
+}
+
+// class Test
+
+// Creates a Test object.
+
+// The c'tor saves the values of all Google Test flags.
+Test::Test()
+    : gtest_flag_saver_(new internal::GTestFlagSaver) {
+}
+
+// The d'tor restores the values of all Google Test flags.
+Test::~Test() {
+  delete gtest_flag_saver_;
+}
+
+// Sets up the test fixture.
+//
+// A sub-class may override this.
+void Test::SetUp() {
+}
+
+// Tears down the test fixture.
+//
+// A sub-class may override this.
+void Test::TearDown() {
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, const std::string& value) {
+  UnitTest::GetInstance()->RecordProperty(key, value);
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, int value) {
+  Message value_message;
+  value_message << value;
+  RecordProperty(key, value_message.GetString().c_str());
+}
+
+namespace internal {
+
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message) {
+  // This function is a friend of UnitTest and as such has access to
+  // AddTestPartResult.
+  UnitTest::GetInstance()->AddTestPartResult(
+      result_type,
+      NULL,  // No info about the source file where the exception occurred.
+      -1,    // We have no info on which line caused the exception.
+      message,
+      "");   // No stack trace, either.
+}
+
+}  // namespace internal
+
+// Google Test requires all tests in the same test case to use the same test
+// fixture class.  This function checks if the current test has the
+// same fixture class as the first test in the current test case.  If
+// yes, it returns true; otherwise it generates a Google Test failure and
+// returns false.
+bool Test::HasSameFixtureClass() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  const TestCase* const test_case = impl->current_test_case();
+
+  // Info about the first test in the current test case.
+  const TestInfo* const first_test_info = test_case->test_info_list()[0];
+  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
+  const char* const first_test_name = first_test_info->name();
+
+  // Info about the current test.
+  const TestInfo* const this_test_info = impl->current_test_info();
+  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
+  const char* const this_test_name = this_test_info->name();
+
+  if (this_fixture_id != first_fixture_id) {
+    // Is the first test defined using TEST?
+    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
+    // Is this test defined using TEST?
+    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
+
+    if (first_is_TEST || this_is_TEST) {
+      // The user mixed TEST and TEST_F in this test case - we'll tell
+      // him/her how to fix it.
+
+      // Gets the name of the TEST and the name of the TEST_F.  Note
+      // that first_is_TEST and this_is_TEST cannot both be true, as
+      // the fixture IDs are different for the two tests.
+      const char* const TEST_name =
+          first_is_TEST ? first_test_name : this_test_name;
+      const char* const TEST_F_name =
+          first_is_TEST ? this_test_name : first_test_name;
+
+      ADD_FAILURE()
+          << "All tests in the same test case must use the same test fixture\n"
+          << "class, so mixing TEST_F and TEST in the same test case is\n"
+          << "illegal.  In test case " << this_test_info->test_case_name()
+          << ",\n"
+          << "test " << TEST_F_name << " is defined using TEST_F but\n"
+          << "test " << TEST_name << " is defined using TEST.  You probably\n"
+          << "want to change the TEST to TEST_F or move it to another test\n"
+          << "case.";
+    } else {
+      // The user defined two fixture classes with the same name in
+      // two namespaces - we'll tell him/her how to fix it.
+      ADD_FAILURE()
+          << "All tests in the same test case must use the same test fixture\n"
+          << "class.  However, in test case "
+          << this_test_info->test_case_name() << ",\n"
+          << "you defined test " << first_test_name
+          << " and test " << this_test_name << "\n"
+          << "using two different test fixture classes.  This can happen if\n"
+          << "the two classes are from different namespaces or translation\n"
+          << "units and have the same name.  You should probably rename one\n"
+          << "of the classes to put the tests into different test cases.";
+    }
+    return false;
+  }
+
+  return true;
+}
+
+#if GTEST_HAS_SEH
+
+// Adds an "exception thrown" fatal failure to the current test.  This
+// function returns its result via an output parameter pointer because VC++
+// prohibits creation of objects with destructors on stack in functions
+// using __try (see error C2712).
+static std::string* FormatSehExceptionMessage(DWORD exception_code,
+                                              const char* location) {
+  Message message;
+  message << "SEH exception with code 0x" << std::setbase(16) <<
+    exception_code << std::setbase(10) << " thrown in " << location << ".";
+
+  return new std::string(message.GetString());
+}
+
+#endif  // GTEST_HAS_SEH
+
+namespace internal {
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Adds an "exception thrown" fatal failure to the current test.
+static std::string FormatCxxExceptionMessage(const char* description,
+                                             const char* location) {
+  Message message;
+  if (description != NULL) {
+    message << "C++ exception with description \"" << description << "\"";
+  } else {
+    message << "Unknown C++ exception";
+  }
+  message << " thrown in " << location << ".";
+
+  return message.GetString();
+}
+
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result);
+
+GoogleTestFailureException::GoogleTestFailureException(
+    const TestPartResult& failure)
+    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// We put these helper functions in the internal namespace as IBM's xlC
+// compiler rejects the code if they were declared static.
+
+// Runs the given method and handles SEH exceptions it throws, when
+// SEH is supported; returns the 0-value for type Result in case of an
+// SEH exception.  (Microsoft compilers cannot handle SEH and C++
+// exceptions in the same function.  Therefore, we provide a separate
+// wrapper function for handling SEH exceptions.)
+template <class T, typename Result>
+Result HandleSehExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+#if GTEST_HAS_SEH
+  __try {
+    return (object->*method)();
+  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
+      GetExceptionCode())) {
+    // We create the exception message on the heap because VC++ prohibits
+    // creation of objects with destructors on stack in functions using __try
+    // (see error C2712).
+    std::string* exception_message = FormatSehExceptionMessage(
+        GetExceptionCode(), location);
+    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
+                                             *exception_message);
+    delete exception_message;
+    return static_cast<Result>(0);
+  }
+#else
+  (void)location;
+  return (object->*method)();
+#endif  // GTEST_HAS_SEH
+}
+
+// Runs the given method and catches and reports C++ and/or SEH-style
+// exceptions, if they are supported; returns the 0-value for type
+// Result in case of an SEH exception.
+template <class T, typename Result>
+Result HandleExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+  // NOTE: The user code can affect the way in which Google Test handles
+  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
+  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
+  // after the exception is caught and either report or re-throw the
+  // exception based on the flag's value:
+  //
+  // try {
+  //   // Perform the test method.
+  // } catch (...) {
+  //   if (GTEST_FLAG(catch_exceptions))
+  //     // Report the exception as failure.
+  //   else
+  //     throw;  // Re-throws the original exception.
+  // }
+  //
+  // However, the purpose of this flag is to allow the program to drop into
+  // the debugger when the exception is thrown. On most platforms, once the
+  // control enters the catch block, the exception origin information is
+  // lost and the debugger will stop the program at the point of the
+  // re-throw in this function -- instead of at the point of the original
+  // throw statement in the code under test.  For this reason, we perform
+  // the check early, sacrificing the ability to affect Google Test's
+  // exception handling in the method where the exception is thrown.
+  if (internal::GetUnitTestImpl()->catch_exceptions()) {
+#if GTEST_HAS_EXCEPTIONS
+    try {
+      return HandleSehExceptionsInMethodIfSupported(object, method, location);
+    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
+      // This exception type can only be thrown by a failed Google
+      // Test assertion with the intention of letting another testing
+      // framework catch it.  Therefore we just re-throw it.
+      throw;
+    } catch (const std::exception& e) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(e.what(), location));
+    } catch (...) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(NULL, location));
+    }
+    return static_cast<Result>(0);
+#else
+    return HandleSehExceptionsInMethodIfSupported(object, method, location);
+#endif  // GTEST_HAS_EXCEPTIONS
+  } else {
+    return (object->*method)();
+  }
+}
+
+}  // namespace internal
+
+// Runs the test and updates the test result.
+void Test::Run() {
+  if (!HasSameFixtureClass()) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
+  // We will run the test only if SetUp() was successful.
+  if (!HasFatalFailure()) {
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        this, &Test::TestBody, "the test body");
+  }
+
+  // However, we want to clean up as much as possible.  Hence we will
+  // always call TearDown(), even if SetUp() or the test body has
+  // failed.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &Test::TearDown, "TearDown()");
+}
+
+// Returns true iff the current test has a fatal failure.
+bool Test::HasFatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
+}
+
+// Returns true iff the current test has a non-fatal failure.
+bool Test::HasNonfatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->
+      HasNonfatalFailure();
+}
+
+// class TestInfo
+
+// Constructs a TestInfo object. It assumes ownership of the test factory
+// object.
+TestInfo::TestInfo(const std::string& a_test_case_name,
+                   const std::string& a_name,
+                   const char* a_type_param,
+                   const char* a_value_param,
+                   internal::TypeId fixture_class_id,
+                   internal::TestFactoryBase* factory)
+    : test_case_name_(a_test_case_name),
+      name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : NULL),
+      value_param_(a_value_param ? new std::string(a_value_param) : NULL),
+      fixture_class_id_(fixture_class_id),
+      should_run_(false),
+      is_disabled_(false),
+      matches_filter_(false),
+      factory_(factory),
+      result_() {}
+
+// Destructs a TestInfo object.
+TestInfo::~TestInfo() { delete factory_; }
+
+namespace internal {
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_case_name:   name of the test case
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a value-parameterized test.
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test case
+//   tear_down_tc:     pointer to the function that tears down the test case
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+TestInfo* MakeAndRegisterTestInfo(
+    const char* test_case_name,
+    const char* name,
+    const char* type_param,
+    const char* value_param,
+    TypeId fixture_class_id,
+    SetUpTestCaseFunc set_up_tc,
+    TearDownTestCaseFunc tear_down_tc,
+    TestFactoryBase* factory) {
+  TestInfo* const test_info =
+      new TestInfo(test_case_name, name, type_param, value_param,
+                   fixture_class_id, factory);
+  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
+  return test_info;
+}
+
+#if GTEST_HAS_PARAM_TEST
+void ReportInvalidTestCaseType(const char* test_case_name,
+                               const char* file, int line) {
+  Message errors;
+  errors
+      << "Attempted redefinition of test case " << test_case_name << ".\n"
+      << "All tests in the same test case must use the same test fixture\n"
+      << "class.  However, in test case " << test_case_name << ", you tried\n"
+      << "to define a test using a fixture class different from the one\n"
+      << "used earlier. This can happen if the two fixture classes are\n"
+      << "from different namespaces and have the same name. You should\n"
+      << "probably rename one of the classes to put the tests into different\n"
+      << "test cases.";
+
+  fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
+          errors.GetString().c_str());
+}
+#endif  // GTEST_HAS_PARAM_TEST
+
+}  // namespace internal
+
+namespace {
+
+// A predicate that checks the test name of a TestInfo against a known
+// value.
+//
+// This is used for implementation of the TestCase class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestNameIs is copyable.
+class TestNameIs {
+ public:
+  // Constructor.
+  //
+  // TestNameIs has NO default constructor.
+  explicit TestNameIs(const char* name)
+      : name_(name) {}
+
+  // Returns true iff the test name of test_info matches name_.
+  bool operator()(const TestInfo * test_info) const {
+    return test_info && test_info->name() == name_;
+  }
+
+ private:
+  std::string name_;
+};
+
+}  // namespace
+
+namespace internal {
+
+// This method expands all parameterized tests registered with macros TEST_P
+// and INSTANTIATE_TEST_CASE_P into regular tests and registers those.
+// This will be done just once during the program runtime.
+void UnitTestImpl::RegisterParameterizedTests() {
+#if GTEST_HAS_PARAM_TEST
+  if (!parameterized_tests_registered_) {
+    parameterized_test_registry_.RegisterTests();
+    parameterized_tests_registered_ = true;
+  }
+#endif
+}
+
+}  // namespace internal
+
+// Creates the test object, runs it, records its result, and then
+// deletes it.
+void TestInfo::Run() {
+  if (!should_run_) return;
+
+  // Tells UnitTest where to store test result.
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  const TimeInMillis start = internal::GetTimeInMillis();
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+
+  // Creates the test object.
+  Test* const test = internal::HandleExceptionsInMethodIfSupported(
+      factory_, &internal::TestFactoryBase::CreateTest,
+      "the test fixture's constructor");
+
+  // Runs the test only if the test object was created and its
+  // constructor didn't generate a fatal failure.
+  if ((test != NULL) && !Test::HasFatalFailure()) {
+    // This doesn't throw as all user code that can throw are wrapped into
+    // exception handling code.
+    test->Run();
+  }
+
+  // Deletes the test object.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      test, &Test::DeleteSelf_, "the test fixture's destructor");
+
+  result_.set_elapsed_time(internal::GetTimeInMillis() - start);
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+
+  // Tells UnitTest to stop associating assertion results to this
+  // test.
+  impl->set_current_test_info(NULL);
+}
+
+// class TestCase
+
+// Gets the number of successful tests in this test case.
+int TestCase::successful_test_count() const {
+  return CountIf(test_info_list_, TestPassed);
+}
+
+// Gets the number of failed tests in this test case.
+int TestCase::failed_test_count() const {
+  return CountIf(test_info_list_, TestFailed);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int TestCase::reportable_disabled_test_count() const {
+  return CountIf(test_info_list_, TestReportableDisabled);
+}
+
+// Gets the number of disabled tests in this test case.
+int TestCase::disabled_test_count() const {
+  return CountIf(test_info_list_, TestDisabled);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int TestCase::reportable_test_count() const {
+  return CountIf(test_info_list_, TestReportable);
+}
+
+// Get the number of tests in this test case that should run.
+int TestCase::test_to_run_count() const {
+  return CountIf(test_info_list_, ShouldRunTest);
+}
+
+// Gets the number of all tests.
+int TestCase::total_test_count() const {
+  return static_cast<int>(test_info_list_.size());
+}
+
+// Creates a TestCase with the given name.
+//
+// Arguments:
+//
+//   name:         name of the test case
+//   a_type_param: the name of the test case's type parameter, or NULL if
+//                 this is not a typed or a type-parameterized test case.
+//   set_up_tc:    pointer to the function that sets up the test case
+//   tear_down_tc: pointer to the function that tears down the test case
+TestCase::TestCase(const char* a_name, const char* a_type_param,
+                   Test::SetUpTestCaseFunc set_up_tc,
+                   Test::TearDownTestCaseFunc tear_down_tc)
+    : name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : NULL),
+      set_up_tc_(set_up_tc),
+      tear_down_tc_(tear_down_tc),
+      should_run_(false),
+      elapsed_time_(0) {
+}
+
+// Destructor of TestCase.
+TestCase::~TestCase() {
+  // Deletes every Test in the collection.
+  ForEach(test_info_list_, internal::Delete<TestInfo>);
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+const TestInfo* TestCase::GetTestInfo(int i) const {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? NULL : test_info_list_[index];
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+TestInfo* TestCase::GetMutableTestInfo(int i) {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? NULL : test_info_list_[index];
+}
+
+// Adds a test to this test case.  Will delete the test upon
+// destruction of the TestCase object.
+void TestCase::AddTestInfo(TestInfo * test_info) {
+  test_info_list_.push_back(test_info);
+  test_indices_.push_back(static_cast<int>(test_indices_.size()));
+}
+
+// Runs every test in this TestCase.
+void TestCase::Run() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_case(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  repeater->OnTestCaseStart(*this);
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestCase::RunSetUpTestCase, "SetUpTestCase()");
+
+  const internal::TimeInMillis start = internal::GetTimeInMillis();
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Run();
+  }
+  elapsed_time_ = internal::GetTimeInMillis() - start;
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestCase::RunTearDownTestCase, "TearDownTestCase()");
+
+  repeater->OnTestCaseEnd(*this);
+  impl->set_current_test_case(NULL);
+}
+
+// Clears the results of all tests in this test case.
+void TestCase::ClearResult() {
+  ad_hoc_test_result_.Clear();
+  ForEach(test_info_list_, TestInfo::ClearTestResult);
+}
+
+// Shuffles the tests in this test case.
+void TestCase::ShuffleTests(internal::Random* random) {
+  Shuffle(random, &test_indices_);
+}
+
+// Restores the test order to before the first shuffle.
+void TestCase::UnshuffleTests() {
+  for (size_t i = 0; i < test_indices_.size(); i++) {
+    test_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Formats a countable noun.  Depending on its quantity, either the
+// singular form or the plural form is used. e.g.
+//
+// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
+// FormatCountableNoun(5, "book", "books") returns "5 books".
+static std::string FormatCountableNoun(int count,
+                                       const char * singular_form,
+                                       const char * plural_form) {
+  return internal::StreamableToString(count) + " " +
+      (count == 1 ? singular_form : plural_form);
+}
+
+// Formats the count of tests.
+static std::string FormatTestCount(int test_count) {
+  return FormatCountableNoun(test_count, "test", "tests");
+}
+
+// Formats the count of test cases.
+static std::string FormatTestCaseCount(int test_case_count) {
+  return FormatCountableNoun(test_case_count, "test case", "test cases");
+}
+
+// Converts a TestPartResult::Type enum to human-friendly string
+// representation.  Both kNonFatalFailure and kFatalFailure are translated
+// to "Failure", as the user usually doesn't care about the difference
+// between the two when viewing the test result.
+static const char * TestPartResultTypeToString(TestPartResult::Type type) {
+  switch (type) {
+    case TestPartResult::kSuccess:
+      return "Success";
+
+    case TestPartResult::kNonFatalFailure:
+    case TestPartResult::kFatalFailure:
+#ifdef _MSC_VER
+      return "error: ";
+#else
+      return "Failure\n";
+#endif
+    default:
+      return "Unknown result type";
+  }
+}
+
+namespace internal {
+
+// Prints a TestPartResult to an std::string.
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result) {
+  return (Message()
+          << internal::FormatFileLocation(test_part_result.file_name(),
+                                          test_part_result.line_number())
+          << " " << TestPartResultTypeToString(test_part_result.type())
+          << test_part_result.message()).GetString();
+}
+
+// Prints a TestPartResult.
+static void PrintTestPartResult(const TestPartResult& test_part_result) {
+  const std::string& result =
+      PrintTestPartResultToString(test_part_result);
+  printf("%s\n", result.c_str());
+  fflush(stdout);
+  // If the test program runs in Visual Studio or a debugger, the
+  // following statements add the test part result message to the Output
+  // window such that the user can double-click on it to jump to the
+  // corresponding source code location; otherwise they do nothing.
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  // We don't call OutputDebugString*() on Windows Mobile, as printing
+  // to stdout is done by OutputDebugString() there already - we don't
+  // want the same message printed twice.
+  ::OutputDebugStringA(result.c_str());
+  ::OutputDebugStringA("\n");
+#endif
+}
+
+// class PrettyUnitTestResultPrinter
+
+enum GTestColor {
+  COLOR_DEFAULT,
+  COLOR_RED,
+  COLOR_GREEN,
+  COLOR_YELLOW
+};
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+
+// Returns the character attribute for the given color.
+WORD GetColorAttribute(GTestColor color) {
+  switch (color) {
+    case COLOR_RED:    return FOREGROUND_RED;
+    case COLOR_GREEN:  return FOREGROUND_GREEN;
+    case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN;
+    default:           return 0;
+  }
+}
+
+#else
+
+// Returns the ANSI color code for the given color.  COLOR_DEFAULT is
+// an invalid input.
+const char* GetAnsiColorCode(GTestColor color) {
+  switch (color) {
+    case COLOR_RED:     return "1";
+    case COLOR_GREEN:   return "2";
+    case COLOR_YELLOW:  return "3";
+    default:            return NULL;
+  };
+}
+
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+
+// Returns true iff Google Test should use colors in the output.
+bool ShouldUseColor(bool stdout_is_tty) {
+  const char* const gtest_color = GTEST_FLAG(color).c_str();
+
+  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
+#if GTEST_OS_WINDOWS
+    // On Windows the TERM variable is usually not set, but the
+    // console there does support colors.
+    return stdout_is_tty;
+#else
+    // On non-Windows platforms, we rely on the TERM variable.
+    const char* const term = posix::GetEnv("TERM");
+    const bool term_supports_color =
+        String::CStringEquals(term, "xterm") ||
+        String::CStringEquals(term, "xterm-color") ||
+        String::CStringEquals(term, "xterm-256color") ||
+        String::CStringEquals(term, "screen") ||
+        String::CStringEquals(term, "screen-256color") ||
+        String::CStringEquals(term, "linux") ||
+        String::CStringEquals(term, "cygwin");
+    return stdout_is_tty && term_supports_color;
+#endif  // GTEST_OS_WINDOWS
+  }
+
+  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
+      String::CStringEquals(gtest_color, "1");
+  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
+  // value is neither one of these nor "auto", we treat it as "no" to
+  // be conservative.
+}
+
+// Helpers for printing colored strings to stdout. Note that on Windows, we
+// cannot simply emit special characters and have the terminal change colors.
+// This routine must actually emit the characters rather than return a string
+// that would be colored when printed, as can be done on Linux.
+void ColoredPrintf(GTestColor color, const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || GTEST_OS_IOS
+  const bool use_color = false;
+#else
+  static const bool in_color_mode =
+      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
+  const bool use_color = in_color_mode && (color != COLOR_DEFAULT);
+#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS
+  // The '!= 0' comparison is necessary to satisfy MSVC 7.1.
+
+  if (!use_color) {
+    vprintf(fmt, args);
+    va_end(args);
+    return;
+  }
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+  // Gets the current text color.
+  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
+  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
+  const WORD old_color_attrs = buffer_info.wAttributes;
+
+  // We need to flush the stream buffers into the console before each
+  // SetConsoleTextAttribute call lest it affect the text that is already
+  // printed but has not yet reached the console.
+  fflush(stdout);
+  SetConsoleTextAttribute(stdout_handle,
+                          GetColorAttribute(color) | FOREGROUND_INTENSITY);
+  vprintf(fmt, args);
+
+  fflush(stdout);
+  // Restores the text color.
+  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
+#else
+  printf("\033[0;3%sm", GetAnsiColorCode(color));
+  vprintf(fmt, args);
+  printf("\033[m");  // Resets the terminal to default.
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  va_end(args);
+}
+
+// Text printed in Google Test's text output and --gunit_list_tests
+// output to label the type parameter and value parameter for a test.
+static const char kTypeParamLabel[] = "TypeParam";
+static const char kValueParamLabel[] = "GetParam()";
+
+void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
+  const char* const type_param = test_info.type_param();
+  const char* const value_param = test_info.value_param();
+
+  if (type_param != NULL || value_param != NULL) {
+    printf(", where ");
+    if (type_param != NULL) {
+      printf("%s = %s", kTypeParamLabel, type_param);
+      if (value_param != NULL)
+        printf(" and ");
+    }
+    if (value_param != NULL) {
+      printf("%s = %s", kValueParamLabel, value_param);
+    }
+  }
+}
+
+// This class implements the TestEventListener interface.
+//
+// Class PrettyUnitTestResultPrinter is copyable.
+class PrettyUnitTestResultPrinter : public TestEventListener {
+ public:
+  PrettyUnitTestResultPrinter() {}
+  static void PrintTestName(const char * test_case, const char * test) {
+    printf("%s.%s", test_case, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestCaseStart(const TestCase& test_case);
+  virtual void OnTestStart(const TestInfo& test_info);
+  virtual void OnTestPartResult(const TestPartResult& result);
+  virtual void OnTestEnd(const TestInfo& test_info);
+  virtual void OnTestCaseEnd(const TestCase& test_case);
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
+
+ private:
+  static void PrintFailedTests(const UnitTest& unit_test);
+};
+
+  // Fired before each iteration of tests starts.
+void PrettyUnitTestResultPrinter::OnTestIterationStart(
+    const UnitTest& unit_test, int iteration) {
+  if (GTEST_FLAG(repeat) != 1)
+    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
+
+  const char* const filter = GTEST_FLAG(filter).c_str();
+
+  // Prints the filter if it's not *.  This reminds the user that some
+  // tests may be skipped.
+  if (!String::CStringEquals(filter, kUniversalFilter)) {
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: %s filter = %s\n", GTEST_NAME_, filter);
+  }
+
+  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
+    const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: This is test shard %d of %s.\n",
+                  static_cast<int>(shard_index) + 1,
+                  internal::posix::GetEnv(kTestTotalShards));
+  }
+
+  if (GTEST_FLAG(shuffle)) {
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: Randomizing tests' orders with a seed of %d .\n",
+                  unit_test.random_seed());
+  }
+
+  ColoredPrintf(COLOR_GREEN,  "[==========] ");
+  printf("Running %s from %s.\n",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(COLOR_GREEN,  "[----------] ");
+  printf("Global test environment set-up.\n");
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(COLOR_GREEN, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_case.name());
+  if (test_case.type_param() == NULL) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
+  }
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
+  ColoredPrintf(COLOR_GREEN,  "[ RUN      ] ");
+  PrintTestName(test_info.test_case_name(), test_info.name());
+  printf("\n");
+  fflush(stdout);
+}
+
+// Called after an assertion failure.
+void PrettyUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  // If the test part succeeded, we don't need to do anything.
+  if (result.type() == TestPartResult::kSuccess)
+    return;
+
+  // Print failure message from the assertion (e.g. expected this and got that).
+  PrintTestPartResult(result);
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Passed()) {
+    ColoredPrintf(COLOR_GREEN, "[       OK ] ");
+  } else {
+    ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
+  }
+  PrintTestName(test_info.test_case_name(), test_info.name());
+  if (test_info.result()->Failed())
+    PrintFullTestCommentIfPresent(test_info);
+
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms)\n", internal::StreamableToString(
+           test_info.result()->elapsed_time()).c_str());
+  } else {
+    printf("\n");
+  }
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(COLOR_GREEN, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n",
+         counts.c_str(), test_case.name(),
+         internal::StreamableToString(test_case.elapsed_time()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(COLOR_GREEN,  "[----------] ");
+  printf("Global test environment tear-down\n");
+  fflush(stdout);
+}
+
+// Internal helper for printing the list of failed tests.
+void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
+  const int failed_test_count = unit_test.failed_test_count();
+  if (failed_test_count == 0) {
+    return;
+  }
+
+  for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+    const TestCase& test_case = *unit_test.GetTestCase(i);
+    if (!test_case.should_run() || (test_case.failed_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_case.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_case.GetTestInfo(j);
+      if (!test_info.should_run() || test_info.result()->Passed()) {
+        continue;
+      }
+      ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
+      printf("%s.%s", test_case.name(), test_info.name());
+      PrintFullTestCommentIfPresent(test_info);
+      printf("\n");
+    }
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                     int /*iteration*/) {
+  ColoredPrintf(COLOR_GREEN,  "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(COLOR_GREEN,  "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  int num_failures = unit_test.failed_test_count();
+  if (!unit_test.Passed()) {
+    const int failed_test_count = unit_test.failed_test_count();
+    ColoredPrintf(COLOR_RED,  "[  FAILED  ] ");
+    printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
+    PrintFailedTests(unit_test);
+    printf("\n%2d FAILED %s\n", num_failures,
+                        num_failures == 1 ? "TEST" : "TESTS");
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (!num_failures) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(COLOR_YELLOW,
+                  "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled,
+                  num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End PrettyUnitTestResultPrinter
+
+// class TestEventRepeater
+//
+// This class forwards events to other event listeners.
+class TestEventRepeater : public TestEventListener {
+ public:
+  TestEventRepeater() : forwarding_enabled_(true) {}
+  virtual ~TestEventRepeater();
+  void Append(TestEventListener *listener);
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled() const { return forwarding_enabled_; }
+  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
+
+  virtual void OnTestProgramStart(const UnitTest& unit_test);
+  virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test);
+  virtual void OnTestCaseStart(const TestCase& test_case);
+  virtual void OnTestStart(const TestInfo& test_info);
+  virtual void OnTestPartResult(const TestPartResult& result);
+  virtual void OnTestEnd(const TestInfo& test_info);
+  virtual void OnTestCaseEnd(const TestCase& test_case);
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test);
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+  virtual void OnTestProgramEnd(const UnitTest& unit_test);
+
+ private:
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled_;
+  // The list of listeners that receive events.
+  std::vector<TestEventListener*> listeners_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
+};
+
+TestEventRepeater::~TestEventRepeater() {
+  ForEach(listeners_, Delete<TestEventListener>);
+}
+
+void TestEventRepeater::Append(TestEventListener *listener) {
+  listeners_.push_back(listener);
+}
+
+// TODO(vladl@google.com): Factor the search functionality into Vector::Find.
+TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
+  for (size_t i = 0; i < listeners_.size(); ++i) {
+    if (listeners_[i] == listener) {
+      listeners_.erase(listeners_.begin() + i);
+      return listener;
+    }
+  }
+
+  return NULL;
+}
+
+// Since most methods are very similar, use macros to reduce boilerplate.
+// This defines a member that forwards the call to all listeners.
+#define GTEST_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (size_t i = 0; i < listeners_.size(); i++) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+// This defines a member that forwards the call to all listeners in reverse
+// order.
+#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (int i = static_cast<int>(listeners_.size()) - 1; i >= 0; i--) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+
+GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase)
+GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
+GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
+GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
+
+#undef GTEST_REPEATER_METHOD_
+#undef GTEST_REVERSE_REPEATER_METHOD_
+
+void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
+                                             int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = 0; i < listeners_.size(); i++) {
+      listeners_[i]->OnTestIterationStart(unit_test, iteration);
+    }
+  }
+}
+
+void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
+                                           int iteration) {
+  if (forwarding_enabled_) {
+    for (int i = static_cast<int>(listeners_.size()) - 1; i >= 0; i--) {
+      listeners_[i]->OnTestIterationEnd(unit_test, iteration);
+    }
+  }
+}
+
+// End TestEventRepeater
+
+// This class generates an XML output file.
+class XmlUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit XmlUnitTestResultPrinter(const char* output_file);
+
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+
+ private:
+  // Is c a whitespace character that is normalized to a space character
+  // when it appears in an XML attribute value?
+  static bool IsNormalizableWhitespace(char c) {
+    return c == 0x9 || c == 0xA || c == 0xD;
+  }
+
+  // May c appear in a well-formed XML document?
+  static bool IsValidXmlCharacter(char c) {
+    return IsNormalizableWhitespace(c) || c >= 0x20;
+  }
+
+  // Returns an XML-escaped copy of the input string str.  If
+  // is_attribute is true, the text is meant to appear as an attribute
+  // value, and normalizable whitespace is preserved by replacing it
+  // with character references.
+  static std::string EscapeXml(const std::string& str, bool is_attribute);
+
+  // Returns the given string with all characters invalid in XML removed.
+  static std::string RemoveInvalidXmlCharacters(const std::string& str);
+
+  // Convenience wrapper around EscapeXml when str is an attribute value.
+  static std::string EscapeXmlAttribute(const std::string& str) {
+    return EscapeXml(str, true);
+  }
+
+  // Convenience wrapper around EscapeXml when str is not an attribute value.
+  static std::string EscapeXmlText(const char* str) {
+    return EscapeXml(str, false);
+  }
+
+  // Verifies that the given attribute belongs to the given element and
+  // streams the attribute as XML.
+  static void OutputXmlAttribute(std::ostream* stream,
+                                 const std::string& element_name,
+                                 const std::string& name,
+                                 const std::string& value);
+
+  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
+
+  // Streams an XML representation of a TestInfo object.
+  static void OutputXmlTestInfo(::std::ostream* stream,
+                                const char* test_case_name,
+                                const TestInfo& test_info);
+
+  // Prints an XML representation of a TestCase object
+  static void PrintXmlTestCase(::std::ostream* stream,
+                               const TestCase& test_case);
+
+  // Prints an XML summary of unit_test to output stream out.
+  static void PrintXmlUnitTest(::std::ostream* stream,
+                               const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as space
+  // delimited XML attributes based on the property key="value" pairs.
+  // When the std::string is not empty, it includes a space at the beginning,
+  // to delimit this attribute from prior attributes.
+  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
+};
+
+// Creates a new XmlUnitTestResultPrinter.
+XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.c_str() == NULL || output_file_.empty()) {
+    fprintf(stderr, "XML output file may not be null\n");
+    fflush(stderr);
+    exit(EXIT_FAILURE);
+  }
+}
+
+// Called after the unit test ends.
+void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* xmlout = NULL;
+  FilePath output_file(output_file_);
+  FilePath output_dir(output_file.RemoveFileName());
+
+  if (output_dir.CreateDirectoriesRecursively()) {
+    xmlout = posix::FOpen(output_file_.c_str(), "w");
+  }
+  if (xmlout == NULL) {
+    // TODO(wan): report the reason of the failure.
+    //
+    // We don't do it for now as:
+    //
+    //   1. There is no urgent need for it.
+    //   2. It's a bit involved to make the errno variable thread-safe on
+    //      all three operating systems (Linux, Windows, and Mac OS).
+    //   3. To interpret the meaning of errno in a thread-safe way,
+    //      we need the strerror_r() function, which is not available on
+    //      Windows.
+    fprintf(stderr,
+            "Unable to open file \"%s\"\n",
+            output_file_.c_str());
+    fflush(stderr);
+    exit(EXIT_FAILURE);
+  }
+  std::stringstream stream;
+  PrintXmlUnitTest(&stream, unit_test);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+// Returns an XML-escaped copy of the input string str.  If is_attribute
+// is true, the text is meant to appear as an attribute value, and
+// normalizable whitespace is preserved by replacing it with character
+// references.
+//
+// Invalid XML characters in str, if any, are stripped from the output.
+// It is expected that most, if not all, of the text processed by this
+// module will consist of ordinary English text.
+// If this module is ever modified to produce version 1.1 XML output,
+// most invalid characters can be retained using character references.
+// TODO(wan): It might be nice to have a minimally invasive, human-readable
+// escaping scheme for invalid characters, rather than dropping them.
+std::string XmlUnitTestResultPrinter::EscapeXml(
+    const std::string& str, bool is_attribute) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '<':
+        m << "&lt;";
+        break;
+      case '>':
+        m << "&gt;";
+        break;
+      case '&':
+        m << "&amp;";
+        break;
+      case '\'':
+        if (is_attribute)
+          m << "&apos;";
+        else
+          m << '\'';
+        break;
+      case '"':
+        if (is_attribute)
+          m << "&quot;";
+        else
+          m << '"';
+        break;
+      default:
+        if (IsValidXmlCharacter(ch)) {
+          if (is_attribute && IsNormalizableWhitespace(ch))
+            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
+              << ";";
+          else
+            m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// Returns the given string with all characters invalid in XML removed.
+// Currently invalid characters are dropped from the string. An
+// alternative is to replace them with certain characters such as . or ?.
+std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
+    const std::string& str) {
+  std::string output;
+  output.reserve(str.size());
+  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+    if (IsValidXmlCharacter(*it))
+      output.push_back(*it);
+
+  return output;
+}
+
+// The following routines generate an XML representation of a UnitTest
+// object.
+//
+// This is how Google Test concepts map to the DTD:
+//
+// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
+//   <testsuite name="testcase-name">  <-- corresponds to a TestCase object
+//     <testcase name="test-name">     <-- corresponds to a TestInfo object
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//                                     <-- individual assertion failures
+//     </testcase>
+//   </testsuite>
+// </testsuites>
+
+// Formats the given time in milliseconds as seconds.
+std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << ms/1000.0;
+  return ss.str();
+}
+
+// Converts the given epoch time in milliseconds to a date string in the ISO
+// 8601 format, without the timezone information.
+std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
+  // Using non-reentrant version as localtime_r is not portable.
+  time_t seconds = static_cast<time_t>(ms / 1000);
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4996)  // Temporarily disables warning 4996
+                                // (function or variable may be unsafe).
+  const struct tm* const time_struct = localtime(&seconds);  // NOLINT
+# pragma warning(pop)           // Restores the warning state again.
+#else
+  const struct tm* const time_struct = localtime(&seconds);  // NOLINT
+#endif
+  if (time_struct == NULL)
+    return "";  // Invalid ms value
+
+  // YYYY-MM-DDThh:mm:ss
+  return StreamableToString(time_struct->tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct->tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct->tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct->tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct->tm_min) + ":" +
+      String::FormatIntWidth2(time_struct->tm_sec);
+}
+
+// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
+                                                     const char* data) {
+  const char* segment = data;
+  *stream << "<![CDATA[";
+  for (;;) {
+    const char* const next_segment = strstr(segment, "]]>");
+    if (next_segment != NULL) {
+      stream->write(
+          segment, static_cast<std::streamsize>(next_segment - segment));
+      *stream << "]]>]]&gt;<![CDATA[";
+      segment = next_segment + strlen("]]>");
+    } else {
+      *stream << segment;
+      break;
+    }
+  }
+  *stream << "]]>";
+}
+
+void XmlUnitTestResultPrinter::OutputXmlAttribute(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Attribute " << name << " is not allowed for element <" << element_name
+      << ">.";
+
+  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
+}
+
+// Prints an XML representation of a TestInfo object.
+// TODO(wan): There is also value in printing properties with the plain printer.
+void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
+                                                 const char* test_case_name,
+                                                 const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestcase = "testcase";
+
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, kTestcase, "name", test_info.name());
+
+  if (test_info.value_param() != NULL) {
+    OutputXmlAttribute(stream, kTestcase, "value_param",
+                       test_info.value_param());
+  }
+  if (test_info.type_param() != NULL) {
+    OutputXmlAttribute(stream, kTestcase, "type_param", test_info.type_param());
+  }
+
+  OutputXmlAttribute(stream, kTestcase, "status",
+                     test_info.should_run() ? "run" : "notrun");
+  OutputXmlAttribute(stream, kTestcase, "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(stream, kTestcase, "classname", test_case_name);
+  *stream << TestPropertiesAsXmlAttributes(result);
+
+  int failures = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      if (++failures == 1) {
+        *stream << ">\n";
+      }
+      const string location = internal::FormatCompilerIndependentFileLocation(
+          part.file_name(), part.line_number());
+      const string summary = location + "\n" + part.summary();
+      *stream << "      <failure message=\""
+              << EscapeXmlAttribute(summary.c_str())
+              << "\" type=\"\">";
+      const string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</failure>\n";
+    }
+  }
+
+  if (failures == 0)
+    *stream << " />\n";
+  else
+    *stream << "    </testcase>\n";
+}
+
+// Prints an XML representation of a TestCase object
+void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream,
+                                                const TestCase& test_case) {
+  const std::string kTestsuite = "testsuite";
+  *stream << "  <" << kTestsuite;
+  OutputXmlAttribute(stream, kTestsuite, "name", test_case.name());
+  OutputXmlAttribute(stream, kTestsuite, "tests",
+                     StreamableToString(test_case.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuite, "failures",
+                     StreamableToString(test_case.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuite, "disabled",
+      StreamableToString(test_case.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuite, "errors", "0");
+  OutputXmlAttribute(stream, kTestsuite, "time",
+                     FormatTimeInMillisAsSeconds(test_case.elapsed_time()));
+  *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result())
+          << ">\n";
+
+  for (int i = 0; i < test_case.total_test_count(); ++i) {
+    if (test_case.GetTestInfo(i)->is_reportable())
+      OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i));
+  }
+  *stream << "  </" << kTestsuite << ">\n";
+}
+
+// Prints an XML summary of unit_test to output stream out.
+void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
+                                                const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(unit_test.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "failures",
+                     StreamableToString(unit_test.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "disabled",
+      StreamableToString(unit_test.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
+  OutputXmlAttribute(
+      stream, kTestsuites, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
+  OutputXmlAttribute(stream, kTestsuites, "time",
+                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
+
+  if (GTEST_FLAG(shuffle)) {
+    OutputXmlAttribute(stream, kTestsuites, "random_seed",
+                       StreamableToString(unit_test.random_seed()));
+  }
+
+  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
+
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+    if (unit_test.GetTestCase(i)->reportable_test_count() > 0)
+      PrintXmlTestCase(stream, *unit_test.GetTestCase(i));
+  }
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+// Produces a string representing the test properties in a result as space
+// delimited XML attributes based on the property key="value" pairs.
+std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
+    const TestResult& result) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << " " << property.key() << "="
+        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+// End XmlUnitTestResultPrinter
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
+// replaces them by "%xx" where xx is their hexadecimal value. For
+// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
+// in both time and space -- important as the input str may contain an
+// arbitrarily long test failure message and stack trace.
+string StreamingListener::UrlEncode(const char* str) {
+  string result;
+  result.reserve(strlen(str) + 1);
+  for (char ch = *str; ch != '\0'; ch = *++str) {
+    switch (ch) {
+      case '%':
+      case '=':
+      case '&':
+      case '\n':
+        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        break;
+      default:
+        result.push_back(ch);
+        break;
+    }
+  }
+  return result;
+}
+
+void StreamingListener::SocketWriter::MakeConnection() {
+  GTEST_CHECK_(sockfd_ == -1)
+      << "MakeConnection() can't be called when there is already a connection.";
+
+  addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
+  hints.ai_socktype = SOCK_STREAM;
+  addrinfo* servinfo = NULL;
+
+  // Use the getaddrinfo() to get a linked list of IP addresses for
+  // the given host name.
+  const int error_num = getaddrinfo(
+      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
+  if (error_num != 0) {
+    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
+                        << gai_strerror(error_num);
+  }
+
+  // Loop through all the results and connect to the first we can.
+  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL;
+       cur_addr = cur_addr->ai_next) {
+    sockfd_ = socket(
+        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
+    if (sockfd_ != -1) {
+      // Connect the client socket to the server socket.
+      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
+        close(sockfd_);
+        sockfd_ = -1;
+      }
+    }
+  }
+
+  freeaddrinfo(servinfo);  // all done with this structure
+
+  if (sockfd_ == -1) {
+    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
+                        << host_name_ << ":" << port_num_;
+  }
+}
+
+// End of class Streaming Listener
+#endif  // GTEST_CAN_STREAM_RESULTS__
+
+// Class ScopedTrace
+
+// Pushes the given source file location and message onto a per-thread
+// trace stack maintained by Google Test.
+ScopedTrace::ScopedTrace(const char* file, int line, const Message& message)
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  TraceInfo trace;
+  trace.file = file;
+  trace.line = line;
+  trace.message = message.GetString();
+
+  UnitTest::GetInstance()->PushGTestTrace(trace);
+}
+
+// Pops the info pushed by the c'tor.
+ScopedTrace::~ScopedTrace()
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  UnitTest::GetInstance()->PopGTestTrace();
+}
+
+
+// class OsStackTraceGetter
+
+// Returns the current OS stack trace as an std::string.  Parameters:
+//
+//   max_depth  - the maximum number of stack frames to be included
+//                in the trace.
+//   skip_count - the number of top frames to be skipped; doesn't count
+//                against max_depth.
+//
+string OsStackTraceGetter::CurrentStackTrace(int /* max_depth */,
+                                             int /* skip_count */)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  return "";
+}
+
+void OsStackTraceGetter::UponLeavingGTest()
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+}
+
+const char* const
+OsStackTraceGetter::kElidedFramesMarker =
+    "... " GTEST_NAME_ " internal frames ...";
+
+// A helper class that creates the premature-exit file in its
+// constructor and deletes the file in its destructor.
+class ScopedPrematureExitFile {
+ public:
+  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
+      : premature_exit_filepath_(premature_exit_filepath) {
+    // If a path to the premature-exit file is specified...
+    if (premature_exit_filepath != NULL && *premature_exit_filepath != '\0') {
+      // create the file with a single "0" character in it.  I/O
+      // errors are ignored as there's nothing better we can do and we
+      // don't want to fail the test because of this.
+      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
+      fwrite("0", 1, 1, pfile);
+      fclose(pfile);
+    }
+  }
+
+  ~ScopedPrematureExitFile() {
+    if (premature_exit_filepath_ != NULL && *premature_exit_filepath_ != '\0') {
+      remove(premature_exit_filepath_);
+    }
+  }
+
+ private:
+  const char* const premature_exit_filepath_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
+};
+
+}  // namespace internal
+
+// class TestEventListeners
+
+TestEventListeners::TestEventListeners()
+    : repeater_(new internal::TestEventRepeater()),
+      default_result_printer_(NULL),
+      default_xml_generator_(NULL) {
+}
+
+TestEventListeners::~TestEventListeners() { delete repeater_; }
+
+// Returns the standard listener responsible for the default console
+// output.  Can be removed from the listeners list to shut down default
+// console output.  Note that removing this object from the listener list
+// with Release transfers its ownership to the user.
+void TestEventListeners::Append(TestEventListener* listener) {
+  repeater_->Append(listener);
+}
+
+// Removes the given event listener from the list and returns it.  It then
+// becomes the caller's responsibility to delete the listener. Returns
+// NULL if the listener is not found in the list.
+TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
+  if (listener == default_result_printer_)
+    default_result_printer_ = NULL;
+  else if (listener == default_xml_generator_)
+    default_xml_generator_ = NULL;
+  return repeater_->Release(listener);
+}
+
+// Returns repeater that broadcasts the TestEventListener events to all
+// subscribers.
+TestEventListener* TestEventListeners::repeater() { return repeater_; }
+
+// Sets the default_result_printer attribute to the provided listener.
+// The listener is also added to the listener list and previous
+// default_result_printer is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
+  if (default_result_printer_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_result_printer_);
+    default_result_printer_ = listener;
+    if (listener != NULL)
+      Append(listener);
+  }
+}
+
+// Sets the default_xml_generator attribute to the provided listener.  The
+// listener is also added to the listener list and previous
+// default_xml_generator is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
+  if (default_xml_generator_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_xml_generator_);
+    default_xml_generator_ = listener;
+    if (listener != NULL)
+      Append(listener);
+  }
+}
+
+// Controls whether events will be forwarded by the repeater to the
+// listeners in the list.
+bool TestEventListeners::EventForwardingEnabled() const {
+  return repeater_->forwarding_enabled();
+}
+
+void TestEventListeners::SuppressEventForwarding() {
+  repeater_->set_forwarding_enabled(false);
+}
+
+// class UnitTest
+
+// Gets the singleton UnitTest object.  The first time this method is
+// called, a UnitTest object is constructed and returned.  Consecutive
+// calls will return the same object.
+//
+// We don't protect this under mutex_ as a user is not supposed to
+// call this before main() starts, from which point on the return
+// value will never change.
+UnitTest* UnitTest::GetInstance() {
+  // When compiled with MSVC 7.1 in optimized mode, destroying the
+  // UnitTest object upon exiting the program messes up the exit code,
+  // causing successful tests to appear failed.  We have to use a
+  // different implementation in this case to bypass the compiler bug.
+  // This implementation makes the compiler happy, at the cost of
+  // leaking the UnitTest object.
+
+  // CodeGear C++Builder insists on a public destructor for the
+  // default implementation.  Use this implementation to keep good OO
+  // design with private destructor.
+
+#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
+  static UnitTest* const instance = new UnitTest;
+  return instance;
+#else
+  static UnitTest instance;
+  return &instance;
+#endif  // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
+}
+
+// Gets the number of successful test cases.
+int UnitTest::successful_test_case_count() const {
+  return impl()->successful_test_case_count();
+}
+
+// Gets the number of failed test cases.
+int UnitTest::failed_test_case_count() const {
+  return impl()->failed_test_case_count();
+}
+
+// Gets the number of all test cases.
+int UnitTest::total_test_case_count() const {
+  return impl()->total_test_case_count();
+}
+
+// Gets the number of all test cases that contain at least one test
+// that should run.
+int UnitTest::test_case_to_run_count() const {
+  return impl()->test_case_to_run_count();
+}
+
+// Gets the number of successful tests.
+int UnitTest::successful_test_count() const {
+  return impl()->successful_test_count();
+}
+
+// Gets the number of failed tests.
+int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTest::reportable_disabled_test_count() const {
+  return impl()->reportable_disabled_test_count();
+}
+
+// Gets the number of disabled tests.
+int UnitTest::disabled_test_count() const {
+  return impl()->disabled_test_count();
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTest::reportable_test_count() const {
+  return impl()->reportable_test_count();
+}
+
+// Gets the number of all tests.
+int UnitTest::total_test_count() const { return impl()->total_test_count(); }
+
+// Gets the number of tests that should run.
+int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
+
+// Gets the time of the test program start, in ms from the start of the
+// UNIX epoch.
+internal::TimeInMillis UnitTest::start_timestamp() const {
+    return impl()->start_timestamp();
+}
+
+// Gets the elapsed time, in milliseconds.
+internal::TimeInMillis UnitTest::elapsed_time() const {
+  return impl()->elapsed_time();
+}
+
+// Returns true iff the unit test passed (i.e. all test cases passed).
+bool UnitTest::Passed() const { return impl()->Passed(); }
+
+// Returns true iff the unit test failed (i.e. some test case failed
+// or something outside of all tests failed).
+bool UnitTest::Failed() const { return impl()->Failed(); }
+
+// Gets the i-th test case among all the test cases. i can range from 0 to
+// total_test_case_count() - 1. If i is not in that range, returns NULL.
+const TestCase* UnitTest::GetTestCase(int i) const {
+  return impl()->GetTestCase(i);
+}
+
+// Returns the TestResult containing information on test failures and
+// properties logged outside of individual test cases.
+const TestResult& UnitTest::ad_hoc_test_result() const {
+  return *impl()->ad_hoc_test_result();
+}
+
+// Gets the i-th test case among all the test cases. i can range from 0 to
+// total_test_case_count() - 1. If i is not in that range, returns NULL.
+TestCase* UnitTest::GetMutableTestCase(int i) {
+  return impl()->GetMutableTestCase(i);
+}
+
+// Returns the list of event listeners that can be used to track events
+// inside Google Test.
+TestEventListeners& UnitTest::listeners() {
+  return *impl()->listeners();
+}
+
+// Registers and returns a global test environment.  When a test
+// program is run, all global test environments will be set-up in the
+// order they were registered.  After all tests in the program have
+// finished, all global test environments will be torn-down in the
+// *reverse* order they were registered.
+//
+// The UnitTest object takes ownership of the given environment.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+Environment* UnitTest::AddEnvironment(Environment* env) {
+  if (env == NULL) {
+    return NULL;
+  }
+
+  impl_->environments().push_back(env);
+  return env;
+}
+
+// Adds a TestPartResult to the current TestResult object.  All Google Test
+// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
+// this to report their results.  The user code should use the
+// assertion macros instead of calling this directly.
+void UnitTest::AddTestPartResult(
+    TestPartResult::Type result_type,
+    const char* file_name,
+    int line_number,
+    const std::string& message,
+    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
+  Message msg;
+  msg << message;
+
+  internal::MutexLock lock(&mutex_);
+  if (impl_->gtest_trace_stack().size() > 0) {
+    msg << "\n" << GTEST_NAME_ << " trace:";
+
+    for (int i = static_cast<int>(impl_->gtest_trace_stack().size());
+         i > 0; --i) {
+      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
+      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
+          << " " << trace.message;
+    }
+  }
+
+  if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) {
+    msg << internal::kStackTraceMarker << os_stack_trace;
+  }
+
+  const TestPartResult result =
+    TestPartResult(result_type, file_name, line_number,
+                   msg.GetString().c_str());
+  impl_->GetTestPartResultReporterForCurrentThread()->
+      ReportTestPartResult(result);
+
+  if (result_type != TestPartResult::kSuccess) {
+    // gtest_break_on_failure takes precedence over
+    // gtest_throw_on_failure.  This allows a user to set the latter
+    // in the code (perhaps in order to use Google Test assertions
+    // with another testing framework) and specify the former on the
+    // command line for debugging.
+    if (GTEST_FLAG(break_on_failure)) {
+#if GTEST_OS_WINDOWS
+      // Using DebugBreak on Windows allows gtest to still break into a debugger
+      // when a failure happens and both the --gtest_break_on_failure and
+      // the --gtest_catch_exceptions flags are specified.
+      DebugBreak();
+#else
+      // Dereference NULL through a volatile pointer to prevent the compiler
+      // from removing. We use this rather than abort() or __builtin_trap() for
+      // portability: Symbian doesn't implement abort() well, and some debuggers
+      // don't correctly trap abort().
+      *static_cast<volatile int*>(NULL) = 1;
+#endif  // GTEST_OS_WINDOWS
+    } else if (GTEST_FLAG(throw_on_failure)) {
+#if GTEST_HAS_EXCEPTIONS
+      throw internal::GoogleTestFailureException(result);
+#else
+      // We cannot call abort() as it generates a pop-up in debug mode
+      // that cannot be suppressed in VC 7.1 or below.
+      exit(1);
+#endif
+    }
+  }
+}
+
+// Adds a TestProperty to the current TestResult object when invoked from
+// inside a test, to current TestCase's ad_hoc_test_result_ when invoked
+// from SetUpTestCase or TearDownTestCase, or to the global property set
+// when invoked elsewhere.  If the result already contains a property with
+// the same key, the value will be updated.
+void UnitTest::RecordProperty(const std::string& key,
+                              const std::string& value) {
+  impl_->RecordProperty(TestProperty(key, value));
+}
+
+// Runs all tests in this UnitTest object and prints the result.
+// Returns 0 if successful, or 1 otherwise.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+int UnitTest::Run() {
+  const bool in_death_test_child_process =
+      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
+
+  // Google Test implements this protocol for catching that a test
+  // program exits before returning control to Google Test:
+  //
+  //   1. Upon start, Google Test creates a file whose absolute path
+  //      is specified by the environment variable
+  //      TEST_PREMATURE_EXIT_FILE.
+  //   2. When Google Test has finished its work, it deletes the file.
+  //
+  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
+  // running a Google-Test-based test program and check the existence
+  // of the file at the end of the test execution to see if it has
+  // exited prematurely.
+
+  // If we are in the child process of a death test, don't
+  // create/delete the premature exit file, as doing so is unnecessary
+  // and will confuse the parent process.  Otherwise, create/delete
+  // the file upon entering/leaving this function.  If the program
+  // somehow exits before this function has a chance to return, the
+  // premature-exit file will be left undeleted, causing a test runner
+  // that understands the premature-exit-file protocol to report the
+  // test as having failed.
+  const internal::ScopedPrematureExitFile premature_exit_file(
+      in_death_test_child_process ?
+      NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
+
+  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
+  // used for the duration of the program.
+  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
+
+#if GTEST_HAS_SEH
+  // Either the user wants Google Test to catch exceptions thrown by the
+  // tests or this is executing in the context of death test child
+  // process. In either case the user does not want to see pop-up dialogs
+  // about crashes - they are expected.
+  if (impl()->catch_exceptions() || in_death_test_child_process) {
+# if !GTEST_OS_WINDOWS_MOBILE
+    // SetErrorMode doesn't exist on CE.
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
+                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+
+# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
+    // Death test children can be terminated with _abort().  On Windows,
+    // _abort() can show a dialog with a warning message.  This forces the
+    // abort message to go to stderr instead.
+    _set_error_mode(_OUT_TO_STDERR);
+# endif
+
+# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
+    // In the debug version, Visual Studio pops up a separate dialog
+    // offering a choice to debug the aborted program. We need to suppress
+    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
+    // executed. Google Test will notify the user of any unexpected
+    // failure via stderr.
+    //
+    // VC++ doesn't define _set_abort_behavior() prior to the version 8.0.
+    // Users of prior VC versions shall suffer the agony and pain of
+    // clicking through the countless debug dialogs.
+    // TODO(vladl@google.com): find a way to suppress the abort dialog() in the
+    // debug mode when compiled with VC 7.1 or lower.
+    if (!GTEST_FLAG(break_on_failure))
+      _set_abort_behavior(
+          0x0,                                    // Clear the following flags:
+          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
+# endif
+  }
+#endif  // GTEST_HAS_SEH
+
+  return internal::HandleExceptionsInMethodIfSupported(
+      impl(),
+      &internal::UnitTestImpl::RunAllTests,
+      "auxiliary test code (environments or event listeners)") ? 0 : 1;
+}
+
+// Returns the working directory when the first TEST() or TEST_F() was
+// executed.
+const char* UnitTest::original_working_dir() const {
+  return impl_->original_working_dir_.c_str();
+}
+
+// Returns the TestCase object for the test that's currently running,
+// or NULL if no test is running.
+const TestCase* UnitTest::current_test_case() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_case();
+}
+
+// Returns the TestInfo object for the test that's currently running,
+// or NULL if no test is running.
+const TestInfo* UnitTest::current_test_info() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_info();
+}
+
+// Returns the random seed used at the start of the current test run.
+int UnitTest::random_seed() const { return impl_->random_seed(); }
+
+#if GTEST_HAS_PARAM_TEST
+// Returns ParameterizedTestCaseRegistry object used to keep track of
+// value-parameterized tests and instantiate and register them.
+internal::ParameterizedTestCaseRegistry&
+    UnitTest::parameterized_test_registry()
+        GTEST_LOCK_EXCLUDED_(mutex_) {
+  return impl_->parameterized_test_registry();
+}
+#endif  // GTEST_HAS_PARAM_TEST
+
+// Creates an empty UnitTest.
+UnitTest::UnitTest() {
+  impl_ = new internal::UnitTestImpl(this);
+}
+
+// Destructor of UnitTest.
+UnitTest::~UnitTest() {
+  delete impl_;
+}
+
+// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+// Google Test trace stack.
+void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().push_back(trace);
+}
+
+// Pops a trace from the per-thread Google Test trace stack.
+void UnitTest::PopGTestTrace()
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().pop_back();
+}
+
+namespace internal {
+
+UnitTestImpl::UnitTestImpl(UnitTest* parent)
+    : parent_(parent),
+#ifdef _MSC_VER
+# pragma warning(push)                    // Saves the current warning state.
+# pragma warning(disable:4355)            // Temporarily disables warning 4355
+                                         // (using this in initializer).
+      default_global_test_part_result_reporter_(this),
+      default_per_thread_test_part_result_reporter_(this),
+# pragma warning(pop)                     // Restores the warning state again.
+#else
+      default_global_test_part_result_reporter_(this),
+      default_per_thread_test_part_result_reporter_(this),
+#endif  // _MSC_VER
+      global_test_part_result_repoter_(
+          &default_global_test_part_result_reporter_),
+      per_thread_test_part_result_reporter_(
+          &default_per_thread_test_part_result_reporter_),
+#if GTEST_HAS_PARAM_TEST
+      parameterized_test_registry_(),
+      parameterized_tests_registered_(false),
+#endif  // GTEST_HAS_PARAM_TEST
+      last_death_test_case_(-1),
+      current_test_case_(NULL),
+      current_test_info_(NULL),
+      ad_hoc_test_result_(),
+      os_stack_trace_getter_(NULL),
+      post_flag_parse_init_performed_(false),
+      random_seed_(0),  // Will be overridden by the flag before first use.
+      random_(0),  // Will be reseeded before first use.
+      start_timestamp_(0),
+      elapsed_time_(0),
+#if GTEST_HAS_DEATH_TEST
+      death_test_factory_(new DefaultDeathTestFactory),
+#endif
+      // Will be overridden by the flag before first use.
+      catch_exceptions_(false) {
+  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
+}
+
+UnitTestImpl::~UnitTestImpl() {
+  // Deletes every TestCase.
+  ForEach(test_cases_, internal::Delete<TestCase>);
+
+  // Deletes every Environment.
+  ForEach(environments_, internal::Delete<Environment>);
+
+  delete os_stack_trace_getter_;
+}
+
+// Adds a TestProperty to the current TestResult object when invoked in a
+// context of a test, to current test case's ad_hoc_test_result when invoke
+// from SetUpTestCase/TearDownTestCase, or to the global property set
+// otherwise.  If the result already contains a property with the same key,
+// the value will be updated.
+void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
+  std::string xml_element;
+  TestResult* test_result;  // TestResult appropriate for property recording.
+
+  if (current_test_info_ != NULL) {
+    xml_element = "testcase";
+    test_result = &(current_test_info_->result_);
+  } else if (current_test_case_ != NULL) {
+    xml_element = "testsuite";
+    test_result = &(current_test_case_->ad_hoc_test_result_);
+  } else {
+    xml_element = "testsuites";
+    test_result = &ad_hoc_test_result_;
+  }
+  test_result->RecordProperty(xml_element, test_property);
+}
+
+#if GTEST_HAS_DEATH_TEST
+// Disables event forwarding if the control is currently in a death test
+// subprocess. Must not be called before InitGoogleTest.
+void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
+  if (internal_run_death_test_flag_.get() != NULL)
+    listeners()->SuppressEventForwarding();
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Initializes event listeners performing XML output as specified by
+// UnitTestOptions. Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureXmlOutput() {
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml") {
+    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format != "") {
+    printf("WARNING: unrecognized output format \"%s\" ignored.\n",
+           output_format.c_str());
+    fflush(stdout);
+  }
+}
+
+#if GTEST_CAN_STREAM_RESULTS_
+// Initializes event listeners for streaming test results in string form.
+// Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureStreamingOutput() {
+  const std::string& target = GTEST_FLAG(stream_result_to);
+  if (!target.empty()) {
+    const size_t pos = target.find(':');
+    if (pos != std::string::npos) {
+      listeners()->Append(new StreamingListener(target.substr(0, pos),
+                                                target.substr(pos+1)));
+    } else {
+      printf("WARNING: unrecognized streaming target \"%s\" ignored.\n",
+             target.c_str());
+      fflush(stdout);
+    }
+  }
+}
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+// Performs initialization dependent upon flag values obtained in
+// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+// this function is also called from RunAllTests.  Since this function can be
+// called more than once, it has to be idempotent.
+void UnitTestImpl::PostFlagParsingInit() {
+  // Ensures that this function does not execute more than once.
+  if (!post_flag_parse_init_performed_) {
+    post_flag_parse_init_performed_ = true;
+
+#if GTEST_HAS_DEATH_TEST
+    InitDeathTestSubprocessControlInfo();
+    SuppressTestEventsIfInSubprocess();
+#endif  // GTEST_HAS_DEATH_TEST
+
+    // Registers parameterized tests. This makes parameterized tests
+    // available to the UnitTest reflection API without running
+    // RUN_ALL_TESTS.
+    RegisterParameterizedTests();
+
+    // Configures listeners for XML output. This makes it possible for users
+    // to shut down the default XML output before invoking RUN_ALL_TESTS.
+    ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+    // Configures listeners for streaming test results to the specified server.
+    ConfigureStreamingOutput();
+#endif  // GTEST_CAN_STREAM_RESULTS_
+  }
+}
+
+// A predicate that checks the name of a TestCase against a known
+// value.
+//
+// This is used for implementation of the UnitTest class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestCaseNameIs is copyable.
+class TestCaseNameIs {
+ public:
+  // Constructor.
+  explicit TestCaseNameIs(const std::string& name)
+      : name_(name) {}
+
+  // Returns true iff the name of test_case matches name_.
+  bool operator()(const TestCase* test_case) const {
+    return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0;
+  }
+
+ private:
+  std::string name_;
+};
+
+// Finds and returns a TestCase with the given name.  If one doesn't
+// exist, creates one and returns it.  It's the CALLER'S
+// RESPONSIBILITY to ensure that this function is only called WHEN THE
+// TESTS ARE NOT SHUFFLED.
+//
+// Arguments:
+//
+//   test_case_name: name of the test case
+//   type_param:     the name of the test case's type parameter, or NULL if
+//                   this is not a typed or a type-parameterized test case.
+//   set_up_tc:      pointer to the function that sets up the test case
+//   tear_down_tc:   pointer to the function that tears down the test case
+TestCase* UnitTestImpl::GetTestCase(const char* test_case_name,
+                                    const char* type_param,
+                                    Test::SetUpTestCaseFunc set_up_tc,
+                                    Test::TearDownTestCaseFunc tear_down_tc) {
+  // Can we find a TestCase with the given name?
+  const std::vector<TestCase*>::const_iterator test_case =
+      std::find_if(test_cases_.begin(), test_cases_.end(),
+                   TestCaseNameIs(test_case_name));
+
+  if (test_case != test_cases_.end())
+    return *test_case;
+
+  // No.  Let's create one.
+  TestCase* const new_test_case =
+      new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc);
+
+  // Is this a death test case?
+  if (internal::UnitTestOptions::MatchesFilter(test_case_name,
+                                               kDeathTestCaseFilter)) {
+    // Yes.  Inserts the test case after the last death test case
+    // defined so far.  This only works when the test cases haven't
+    // been shuffled.  Otherwise we may end up running a death test
+    // after a non-death test.
+    ++last_death_test_case_;
+    test_cases_.insert(test_cases_.begin() + last_death_test_case_,
+                       new_test_case);
+  } else {
+    // No.  Appends to the end of the list.
+    test_cases_.push_back(new_test_case);
+  }
+
+  test_case_indices_.push_back(static_cast<int>(test_case_indices_.size()));
+  return new_test_case;
+}
+
+// Helpers for setting up / tearing down the given environment.  They
+// are for use in the ForEach() function.
+static void SetUpEnvironment(Environment* env) { env->SetUp(); }
+static void TearDownEnvironment(Environment* env) { env->TearDown(); }
+
+// Runs all tests in this UnitTest object, prints the result, and
+// returns true if all tests are successful.  If any exception is
+// thrown during a test, the test is considered to be failed, but the
+// rest of the tests will still be run.
+//
+// When parameterized tests are enabled, it expands and registers
+// parameterized tests first in RegisterParameterizedTests().
+// All other functions called from RunAllTests() may safely assume that
+// parameterized tests are ready to be counted and run.
+bool UnitTestImpl::RunAllTests() {
+  // Makes sure InitGoogleTest() was called.
+  if (!GTestIsInitialized()) {
+    printf("%s",
+           "\nThis test program did NOT call ::testing::InitGoogleTest "
+           "before calling RUN_ALL_TESTS().  Please fix it.\n");
+    return false;
+  }
+
+  // Do not run any test if the --help flag was specified.
+  if (g_help_flag)
+    return true;
+
+  // Repeats the call to the post-flag parsing initialization in case the
+  // user didn't call InitGoogleTest.
+  PostFlagParsingInit();
+
+  // Even if sharding is not on, test runners may want to use the
+  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
+  // protocol.
+  internal::WriteToShardStatusFileIfNeeded();
+
+  // True iff we are in a subprocess for running a thread-safe-style
+  // death test.
+  bool in_subprocess_for_death_test = false;
+
+#if GTEST_HAS_DEATH_TEST
+  in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL);
+#endif  // GTEST_HAS_DEATH_TEST
+
+  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
+                                        in_subprocess_for_death_test);
+
+  // Compares the full test names with the filter to decide which
+  // tests to run.
+  const bool has_tests_to_run = FilterTests(should_shard
+                                              ? HONOR_SHARDING_PROTOCOL
+                                              : IGNORE_SHARDING_PROTOCOL) > 0;
+
+  // Lists the tests and exits if the --gtest_list_tests flag was specified.
+  if (GTEST_FLAG(list_tests)) {
+    // This must be called *after* FilterTests() has been called.
+    ListTestsMatchingFilter();
+    return true;
+  }
+
+  random_seed_ = GTEST_FLAG(shuffle) ?
+      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
+
+  // True iff at least one test has failed.
+  bool failed = false;
+
+  TestEventListener* repeater = listeners()->repeater();
+
+  start_timestamp_ = GetTimeInMillis();
+  repeater->OnTestProgramStart(*parent_);
+
+  // How many times to repeat the tests?  We don't want to repeat them
+  // when we are inside the subprocess of a death test.
+  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
+  // Repeats forever if the repeat count is negative.
+  const bool forever = repeat < 0;
+  for (int i = 0; forever || i != repeat; i++) {
+    // We want to preserve failures generated by ad-hoc test
+    // assertions executed before RUN_ALL_TESTS().
+    ClearNonAdHocTestResult();
+
+    const TimeInMillis start = GetTimeInMillis();
+
+    // Shuffles test cases and tests if requested.
+    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
+      random()->Reseed(random_seed_);
+      // This should be done before calling OnTestIterationStart(),
+      // such that a test event listener can see the actual test order
+      // in the event.
+      ShuffleTests();
+    }
+
+    // Tells the unit test event listeners that the tests are about to start.
+    repeater->OnTestIterationStart(*parent_, i);
+
+    // Runs each test case if there is at least one test to run.
+    if (has_tests_to_run) {
+      // Sets up all environments beforehand.
+      repeater->OnEnvironmentsSetUpStart(*parent_);
+      ForEach(environments_, SetUpEnvironment);
+      repeater->OnEnvironmentsSetUpEnd(*parent_);
+
+      // Runs the tests only if there was no fatal failure during global
+      // set-up.
+      if (!Test::HasFatalFailure()) {
+        for (int test_index = 0; test_index < total_test_case_count();
+             test_index++) {
+          GetMutableTestCase(test_index)->Run();
+        }
+      }
+
+      // Tears down all environments in reverse order afterwards.
+      repeater->OnEnvironmentsTearDownStart(*parent_);
+      std::for_each(environments_.rbegin(), environments_.rend(),
+                    TearDownEnvironment);
+      repeater->OnEnvironmentsTearDownEnd(*parent_);
+    }
+
+    elapsed_time_ = GetTimeInMillis() - start;
+
+    // Tells the unit test event listener that the tests have just finished.
+    repeater->OnTestIterationEnd(*parent_, i);
+
+    // Gets the result and clears it.
+    if (!Passed()) {
+      failed = true;
+    }
+
+    // Restores the original test order after the iteration.  This
+    // allows the user to quickly repro a failure that happens in the
+    // N-th iteration without repeating the first (N - 1) iterations.
+    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
+    // case the user somehow changes the value of the flag somewhere
+    // (it's always safe to unshuffle the tests).
+    UnshuffleTests();
+
+    if (GTEST_FLAG(shuffle)) {
+      // Picks a new random seed for each iteration.
+      random_seed_ = GetNextRandomSeed(random_seed_);
+    }
+  }
+
+  repeater->OnTestProgramEnd(*parent_);
+
+  return !failed;
+}
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded() {
+  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
+  if (test_shard_file != NULL) {
+    FILE* const file = posix::FOpen(test_shard_file, "w");
+    if (file == NULL) {
+      ColoredPrintf(COLOR_RED,
+                    "Could not write to the test shard status file \"%s\" "
+                    "specified by the %s environment variable.\n",
+                    test_shard_file, kTestShardStatusFile);
+      fflush(stdout);
+      exit(EXIT_FAILURE);
+    }
+    fclose(file);
+  }
+}
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (i.e., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+bool ShouldShard(const char* total_shards_env,
+                 const char* shard_index_env,
+                 bool in_subprocess_for_death_test) {
+  if (in_subprocess_for_death_test) {
+    return false;
+  }
+
+  const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1);
+  const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1);
+
+  if (total_shards == -1 && shard_index == -1) {
+    return false;
+  } else if (total_shards == -1 && shard_index != -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestShardIndex << " = " << shard_index
+      << ", but have left " << kTestTotalShards << " unset.\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (total_shards != -1 && shard_index == -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestTotalShards << " = " << total_shards
+      << ", but have left " << kTestShardIndex << " unset.\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (shard_index < 0 || shard_index >= total_shards) {
+    const Message msg = Message()
+      << "Invalid environment variables: we require 0 <= "
+      << kTestShardIndex << " < " << kTestTotalShards
+      << ", but you have " << kTestShardIndex << "=" << shard_index
+      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  }
+
+  return total_shards > 1;
+}
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error
+// and aborts.
+Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
+  const char* str_val = posix::GetEnv(var);
+  if (str_val == NULL) {
+    return default_val;
+  }
+
+  Int32 result;
+  if (!ParseInt32(Message() << "The value of environment variable " << var,
+                  str_val, &result)) {
+    exit(EXIT_FAILURE);
+  }
+  return result;
+}
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true iff the test should be run on this shard. The test id is
+// some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
+  return (test_id % total_shards) == shard_index;
+}
+
+// Compares the name of each test with the user-specified filter to
+// decide whether the test should be run, then records the result in
+// each TestCase and TestInfo object.
+// If shard_tests == true, further filters tests based on sharding
+// variables in the environment - see
+// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide.
+// Returns the number of tests that should run.
+int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
+  const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
+  const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
+
+  // num_runnable_tests are the number of tests that will
+  // run across all shards (i.e., match filter and are not disabled).
+  // num_selected_tests are the number of tests to be run on
+  // this shard.
+  int num_runnable_tests = 0;
+  int num_selected_tests = 0;
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    TestCase* const test_case = test_cases_[i];
+    const std::string &test_case_name = test_case->name();
+    test_case->set_should_run(false);
+
+    for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
+      TestInfo* const test_info = test_case->test_info_list()[j];
+      const std::string test_name(test_info->name());
+      // A test is disabled if test case name or test name matches
+      // kDisableTestFilter.
+      const bool is_disabled =
+          internal::UnitTestOptions::MatchesFilter(test_case_name,
+                                                   kDisableTestFilter) ||
+          internal::UnitTestOptions::MatchesFilter(test_name,
+                                                   kDisableTestFilter);
+      test_info->is_disabled_ = is_disabled;
+
+      const bool matches_filter =
+          internal::UnitTestOptions::FilterMatchesTest(test_case_name,
+                                                       test_name);
+      test_info->matches_filter_ = matches_filter;
+
+      const bool is_runnable =
+          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
+          matches_filter;
+
+      const bool is_selected = is_runnable &&
+          (shard_tests == IGNORE_SHARDING_PROTOCOL ||
+           ShouldRunTestOnShard(total_shards, shard_index,
+                                num_runnable_tests));
+
+      num_runnable_tests += is_runnable;
+      num_selected_tests += is_selected;
+
+      test_info->should_run_ = is_selected;
+      test_case->set_should_run(test_case->should_run() || is_selected);
+    }
+  }
+  return num_selected_tests;
+}
+
+// Prints the given C-string on a single line by replacing all '\n'
+// characters with string "\\n".  If the output takes more than
+// max_length characters, only prints the first max_length characters
+// and "...".
+static void PrintOnOneLine(const char* str, int max_length) {
+  if (str != NULL) {
+    for (int i = 0; *str != '\0'; ++str) {
+      if (i >= max_length) {
+        printf("...");
+        break;
+      }
+      if (*str == '\n') {
+        printf("\\n");
+        i += 2;
+      } else {
+        printf("%c", *str);
+        ++i;
+      }
+    }
+  }
+}
+
+// Prints the names of the tests matching the user-specified filter flag.
+void UnitTestImpl::ListTestsMatchingFilter() {
+  // Print at most this many characters for each type/value parameter.
+  const int kMaxParamLength = 250;
+
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    const TestCase* const test_case = test_cases_[i];
+    bool printed_test_case_name = false;
+
+    for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
+      const TestInfo* const test_info =
+          test_case->test_info_list()[j];
+      if (test_info->matches_filter_) {
+        if (!printed_test_case_name) {
+          printed_test_case_name = true;
+          printf("%s.", test_case->name());
+          if (test_case->type_param() != NULL) {
+            printf("  # %s = ", kTypeParamLabel);
+            // We print the type parameter on a single line to make
+            // the output easy to parse by a program.
+            PrintOnOneLine(test_case->type_param(), kMaxParamLength);
+          }
+          printf("\n");
+        }
+        printf("  %s", test_info->name());
+        if (test_info->value_param() != NULL) {
+          printf("  # %s = ", kValueParamLabel);
+          // We print the value parameter on a single line to make the
+          // output easy to parse by a program.
+          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
+        }
+        printf("\n");
+      }
+    }
+  }
+  fflush(stdout);
+}
+
+// Sets the OS stack trace getter.
+//
+// Does nothing if the input and the current OS stack trace getter are
+// the same; otherwise, deletes the old getter and makes the input the
+// current getter.
+void UnitTestImpl::set_os_stack_trace_getter(
+    OsStackTraceGetterInterface* getter) {
+  if (os_stack_trace_getter_ != getter) {
+    delete os_stack_trace_getter_;
+    os_stack_trace_getter_ = getter;
+  }
+}
+
+// Returns the current OS stack trace getter if it is not NULL;
+// otherwise, creates an OsStackTraceGetter, makes it the current
+// getter, and returns it.
+OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
+  if (os_stack_trace_getter_ == NULL) {
+    os_stack_trace_getter_ = new OsStackTraceGetter;
+  }
+
+  return os_stack_trace_getter_;
+}
+
+// Returns the TestResult for the test that's currently running, or
+// the TestResult for the ad hoc test if no test is running.
+TestResult* UnitTestImpl::current_test_result() {
+  return current_test_info_ ?
+      &(current_test_info_->result_) : &ad_hoc_test_result_;
+}
+
+// Shuffles all test cases, and the tests within each test case,
+// making sure that death tests are still run first.
+void UnitTestImpl::ShuffleTests() {
+  // Shuffles the death test cases.
+  ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_);
+
+  // Shuffles the non-death test cases.
+  ShuffleRange(random(), last_death_test_case_ + 1,
+               static_cast<int>(test_cases_.size()), &test_case_indices_);
+
+  // Shuffles the tests inside each test case.
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    test_cases_[i]->ShuffleTests(random());
+  }
+}
+
+// Restores the test cases and tests to their order before the first shuffle.
+void UnitTestImpl::UnshuffleTests() {
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    // Unshuffles the tests in each test case.
+    test_cases_[i]->UnshuffleTests();
+    // Resets the index of each test case.
+    test_case_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
+                                            int skip_count) {
+  // We pass skip_count + 1 to skip this wrapper function in addition
+  // to what the user really wants to skip.
+  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
+}
+
+// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
+// suppress unreachable code warnings.
+namespace {
+class ClassUniqueToAlwaysTrue {};
+}
+
+bool IsTrue(bool condition) { return condition; }
+
+bool AlwaysTrue() {
+#if GTEST_HAS_EXCEPTIONS
+  // This condition is always false so AlwaysTrue() never actually throws,
+  // but it makes the compiler think that it may throw.
+  if (IsTrue(false))
+    throw ClassUniqueToAlwaysTrue();
+#endif  // GTEST_HAS_EXCEPTIONS
+  return true;
+}
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+bool SkipPrefix(const char* prefix, const char** pstr) {
+  const size_t prefix_len = strlen(prefix);
+  if (strncmp(*pstr, prefix, prefix_len) == 0) {
+    *pstr += prefix_len;
+    return true;
+  }
+  return false;
+}
+
+// Parses a string as a command line flag.  The string should have
+// the format "--flag=value".  When def_optional is true, the "=value"
+// part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+const char* ParseFlagValue(const char* str,
+                           const char* flag,
+                           bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == NULL || flag == NULL) return NULL;
+
+  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
+  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return NULL;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a bool flag, in the form of either
+// "--flag=value" or "--flag".
+//
+// In the former case, the value is taken as true as long as it does
+// not start with '0', 'f', or 'F'.
+//
+// In the latter case, the value is taken as true.
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for an Int32 flag, in the form of
+// "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Sets *value to the value of the flag.
+  return ParseInt32(Message() << "The value of flag --" << flag,
+                    value_str, value);
+}
+
+// Parses a string for a string flag, in the form of
+// "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseStringFlag(const char* str, const char* flag, std::string* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+// Determines whether a string has a prefix that Google Test uses for its
+// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
+// If Google Test detects that a command line flag has its prefix but is not
+// recognized, it will print its help message. Flags starting with
+// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
+// internal flags and do not trigger the help message.
+static bool HasGoogleTestFlagPrefix(const char* str) {
+  return (SkipPrefix("--", &str) ||
+          SkipPrefix("-", &str) ||
+          SkipPrefix("/", &str)) &&
+         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
+         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
+          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
+}
+
+// Prints a string containing code-encoded text.  The following escape
+// sequences can be used in the string to control the text color:
+//
+//   @@    prints a single '@' character.
+//   @R    changes the color to red.
+//   @G    changes the color to green.
+//   @Y    changes the color to yellow.
+//   @D    changes to the default terminal text color.
+//
+// TODO(wan@google.com): Write tests for this once we add stdout
+// capturing to Google Test.
+static void PrintColorEncoded(const char* str) {
+  GTestColor color = COLOR_DEFAULT;  // The current color.
+
+  // Conceptually, we split the string into segments divided by escape
+  // sequences.  Then we print one segment at a time.  At the end of
+  // each iteration, the str pointer advances to the beginning of the
+  // next segment.
+  for (;;) {
+    const char* p = strchr(str, '@');
+    if (p == NULL) {
+      ColoredPrintf(color, "%s", str);
+      return;
+    }
+
+    ColoredPrintf(color, "%s", std::string(str, p).c_str());
+
+    const char ch = p[1];
+    str = p + 2;
+    if (ch == '@') {
+      ColoredPrintf(color, "@");
+    } else if (ch == 'D') {
+      color = COLOR_DEFAULT;
+    } else if (ch == 'R') {
+      color = COLOR_RED;
+    } else if (ch == 'G') {
+      color = COLOR_GREEN;
+    } else if (ch == 'Y') {
+      color = COLOR_YELLOW;
+    } else {
+      --str;
+    }
+  }
+}
+
+static const char kColorEncodedHelpMessage[] =
+"This program contains tests written using " GTEST_NAME_ ". You can use the\n"
+"following command line flags to control its behavior:\n"
+"\n"
+"Test Selection:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n"
+"      List the names of all tests instead of running them. The name of\n"
+"      TEST(Foo, Bar) is \"Foo.Bar\".\n"
+"  @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS"
+    "[@G-@YNEGATIVE_PATTERNS]@D\n"
+"      Run only the tests whose name matches one of the positive patterns but\n"
+"      none of the negative patterns. '?' matches any single character; '*'\n"
+"      matches any substring; ':' separates two patterns.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n"
+"      Run all disabled tests too.\n"
+"\n"
+"Test Execution:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n"
+"      Run the tests repeatedly; use a negative count to repeat forever.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n"
+"      Randomize tests' orders on every iteration.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n"
+"      Random number seed to use for shuffling test orders (between 1 and\n"
+"      99999, or 0 to use a seed based on the current time).\n"
+"\n"
+"Test Output:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
+"      Enable/disable colored output. The default is @Gauto@D.\n"
+"  -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
+"      Don't print the elapsed time of each test.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G"
+    GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
+"      Generate an XML report in the given directory or with the given file\n"
+"      name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n"
+#if GTEST_CAN_STREAM_RESULTS_
+"  @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
+"      Stream test results to the given server.\n"
+#endif  // GTEST_CAN_STREAM_RESULTS_
+"\n"
+"Assertion Behavior:\n"
+#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+"  @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
+"      Set the default death test style.\n"
+#endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+"  @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
+"      Turn assertion failures into debugger break-points.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
+"      Turn assertion failures into C++ exceptions.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
+"      Do not report exceptions as test failures. Instead, allow them\n"
+"      to crash the program or throw a pop-up (on Windows).\n"
+"\n"
+"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
+    "the corresponding\n"
+"environment variable of a flag (all letters in upper-case). For example, to\n"
+"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_
+    "color=no@D or set\n"
+"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n"
+"\n"
+"For more information, please read the " GTEST_NAME_ " documentation at\n"
+"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n"
+"(not one in your own code or tests), please report it to\n"
+"@G<" GTEST_DEV_EMAIL_ ">@D.\n";
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.  The type parameter CharType can be
+// instantiated to either char or wchar_t.
+template <typename CharType>
+void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
+  for (int i = 1; i < *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    using internal::ParseBoolFlag;
+    using internal::ParseInt32Flag;
+    using internal::ParseStringFlag;
+
+    // Do we see a Google Test flag?
+    if (ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
+                      &GTEST_FLAG(also_run_disabled_tests)) ||
+        ParseBoolFlag(arg, kBreakOnFailureFlag,
+                      &GTEST_FLAG(break_on_failure)) ||
+        ParseBoolFlag(arg, kCatchExceptionsFlag,
+                      &GTEST_FLAG(catch_exceptions)) ||
+        ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
+        ParseStringFlag(arg, kDeathTestStyleFlag,
+                        &GTEST_FLAG(death_test_style)) ||
+        ParseBoolFlag(arg, kDeathTestUseFork,
+                      &GTEST_FLAG(death_test_use_fork)) ||
+        ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
+        ParseStringFlag(arg, kInternalRunDeathTestFlag,
+                        &GTEST_FLAG(internal_run_death_test)) ||
+        ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
+        ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
+        ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
+        ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
+        ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
+        ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
+        ParseInt32Flag(arg, kStackTraceDepthFlag,
+                       &GTEST_FLAG(stack_trace_depth)) ||
+        ParseStringFlag(arg, kStreamResultToFlag,
+                        &GTEST_FLAG(stream_result_to)) ||
+        ParseBoolFlag(arg, kThrowOnFailureFlag,
+                      &GTEST_FLAG(throw_on_failure))
+        ) {
+      // Yes.  Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    } else if (arg_string == "--help" || arg_string == "-h" ||
+               arg_string == "-?" || arg_string == "/?" ||
+               HasGoogleTestFlagPrefix(arg)) {
+      // Both help flag and unrecognized Google Test flags (excluding
+      // internal ones) trigger help display.
+      g_help_flag = true;
+    }
+  }
+
+  if (g_help_flag) {
+    // We print the help here instead of in RUN_ALL_TESTS(), as the
+    // latter may not be called at all if the user is using Google
+    // Test with another testing framework.
+    PrintColorEncoded(kColorEncodedHelpMessage);
+  }
+}
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+
+// The internal implementation of InitGoogleTest().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleTestImpl(int* argc, CharType** argv) {
+  g_init_gtest_count++;
+
+  // We don't want to run the initialization code twice.
+  if (g_init_gtest_count != 1) return;
+
+  if (*argc <= 0) return;
+
+  internal::g_executable_path = internal::StreamableToString(argv[0]);
+
+#if GTEST_HAS_DEATH_TEST
+
+  g_argvs.clear();
+  for (int i = 0; i != *argc; i++) {
+    g_argvs.push_back(StreamableToString(argv[i]));
+  }
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+  ParseGoogleTestFlagsOnly(argc, argv);
+  GetUnitTestImpl()->PostFlagParsingInit();
+}
+
+}  // namespace internal
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+void InitGoogleTest(int* argc, char** argv) {
+  internal::InitGoogleTestImpl(argc, argv);
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+void InitGoogleTest(int* argc, wchar_t** argv) {
+  internal::InitGoogleTestImpl(argc, argv);
+}
+
+}  // namespace testing
diff --git a/Externals/gtest/src/gtest_main.cc b/Externals/gtest/src/gtest_main.cc
new file mode 100644
index 0000000000..f302822552
--- /dev/null
+++ b/Externals/gtest/src/gtest_main.cc
@@ -0,0 +1,38 @@
+// Copyright 2006, Google Inc.
+// 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors 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.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from gtest_main.cc\n");
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/Externals/libjpeg/jconfig.h b/Externals/libjpeg/jconfig.h
deleted file mode 100644
index 679404da4e..0000000000
--- a/Externals/libjpeg/jconfig.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
-/* see jconfig.txt for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-/* #define void char */
-/* #define const */
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
-#undef NEED_SHORT_EXTERNAL_NAMES
-#undef INCOMPLETE_TYPES_BROKEN
-
-/* Define "boolean" as unsigned char, not int, per Windows custom */
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#define TWO_FILE_COMMANDLINE	/* optional */
-#define USE_SETMODE		/* Microsoft has setmode() */
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-#undef PROGRESS_REPORT		/* optional */
-
-#endif /* JPEG_CJPEG_DJPEG */
diff --git a/Externals/libjpeg/jmorecfg.h b/Externals/libjpeg/jmorecfg.h
deleted file mode 100644
index 928d052c83..0000000000
--- a/Externals/libjpeg/jmorecfg.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * jmorecfg.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2009 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains additional configuration options that customize the
- * JPEG software for special applications or support machine-dependent
- * optimizations.  Most users will not need to touch this file.
- */
-
-
-/*
- * Define BITS_IN_JSAMPLE as either
- *   8   for 8-bit sample values (the usual setting)
- *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
- */
-
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-
-/*
- * Maximum number of components (color channels) allowed in JPEG image.
- * To meet the letter of the JPEG spec, set this to 255.  However, darn
- * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
- * really short on memory.  (Each allowed component costs a hundred or so
- * bytes of storage, whether actually used in an image or not.)
- */
-
-#define MAX_COMPONENTS  10	/* maximum number of image components */
-
-
-/*
- * Basic data types.
- * You may need to change these if you have a machine with unusual data
- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
- * but it had better be at least 16.
- */
-
-/* Representation of a single sample (pixel element value).
- * We frequently allocate large arrays of these, so it's important to keep
- * them small.  But if you have memory to burn and access to char or short
- * arrays is very slow on your hardware, you might want to change these.
- */
-
-#if BITS_IN_JSAMPLE == 8
-/* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JSAMPLE;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJSAMPLE(value)  ((int) (value))
-#else
-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-#define MAXJSAMPLE	255
-#define CENTERJSAMPLE	128
-
-#endif /* BITS_IN_JSAMPLE == 8 */
-
-
-#if BITS_IN_JSAMPLE == 12
-/* JSAMPLE should be the smallest type that will hold the values 0..4095.
- * On nearly all machines "short" will do nicely.
- */
-
-typedef short JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#define MAXJSAMPLE	4095
-#define CENTERJSAMPLE	2048
-
-#endif /* BITS_IN_JSAMPLE == 12 */
-
-
-/* Representation of a DCT frequency coefficient.
- * This should be a signed value of at least 16 bits; "short" is usually OK.
- * Again, we allocate large arrays of these, but you can change to int
- * if you have memory to burn and "short" is really slow.
- */
-
-typedef short JCOEF;
-
-
-/* Compressed datastreams are represented as arrays of JOCTET.
- * These must be EXACTLY 8 bits wide, at least once they are written to
- * external storage.  Note that when using the stdio data source/destination
- * managers, this is also the data type passed to fread/fwrite.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JOCTET;
-#define GETJOCTET(value)  (value)
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JOCTET;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJOCTET(value)  (value)
-#else
-#define GETJOCTET(value)  ((value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-
-/* These typedefs are used for various table entries and so forth.
- * They must be at least as wide as specified; but making them too big
- * won't cost a huge amount of memory, so we don't provide special
- * extraction code like we did for JSAMPLE.  (In other words, these
- * typedefs live at a different point on the speed/space tradeoff curve.)
- */
-
-/* UINT8 must hold at least the values 0..255. */
-
-#ifdef HAVE_UNSIGNED_CHAR
-typedef unsigned char UINT8;
-#else /* not HAVE_UNSIGNED_CHAR */
-#ifdef CHAR_IS_UNSIGNED
-typedef char UINT8;
-#else /* not CHAR_IS_UNSIGNED */
-typedef short UINT8;
-#endif /* CHAR_IS_UNSIGNED */
-#endif /* HAVE_UNSIGNED_CHAR */
-
-/* UINT16 must hold at least the values 0..65535. */
-
-#ifdef HAVE_UNSIGNED_SHORT
-typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
-
-/* INT16 must hold at least the values -32768..32767. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
-typedef short INT16;
-#endif
-
-/* INT32 must hold at least signed 32-bit values. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
-#ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
-#ifndef _BASETSD_H		/* MinGW is slightly different */
-#ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
-typedef long INT32;
-#endif
-#endif
-#endif
-#endif
-
-/* Datatype used for image dimensions.  The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
- * "unsigned int" is sufficient on all machines.  However, if you need to
- * handle larger images and you don't mind deviating from the spec, you
- * can change this datatype.
- */
-
-typedef unsigned int JDIMENSION;
-
-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
-
-
-/* These macros are used in all function definitions and extern declarations.
- * You could modify them if you need to change function linkage conventions;
- * in particular, you'll need to do that to make the library a Windows DLL.
- * Another application is to make all functions global for use with debuggers
- * or code profilers that require it.
- */
-
-/* a function called through method pointers: */
-#define METHODDEF(type)		static type
-/* a function used only in its module: */
-#define LOCAL(type)		static type
-/* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
-/* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type
-
-
-/* This macro is used to declare a "method", that is, a function pointer.
- * We want to supply prototype parameters if the compiler can cope.
- * Note that the arglist parameter must be parenthesized!
- * Again, you can customize this if you need special linkage keywords.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
-#endif
-
-
-/* Here is the pseudo-keyword for declaring pointers that must be "far"
- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
- * by just saying "FAR *" where such a pointer is needed.  In a few places
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
-#ifndef FAR
-#ifdef NEED_FAR_POINTERS
-#define FAR  far
-#else
-#define FAR
-#endif
-#endif
-
-
-/*
- * On a few systems, type boolean and/or its values FALSE, TRUE may appear
- * in standard header files.  Or you may have conflicts with application-
- * specific header files that you want to include together with these files.
- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
- */
-
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
-#ifndef FALSE			/* in case these macros already exist */
-#define FALSE	0		/* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-
-/*
- * The remaining options affect code selection within the JPEG library,
- * but they don't need to be visible to most applications using the library.
- * To minimize application namespace pollution, the symbols won't be
- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
- */
-
-#ifdef JPEG_INTERNALS
-#define JPEG_INTERNAL_OPTIONS
-#endif
-
-#ifdef JPEG_INTERNAL_OPTIONS
-
-
-/*
- * These defines indicate whether to include various optional functions.
- * Undefining some of these symbols will produce a smaller but less capable
- * library.  Note that you can leave certain source files out of the
- * compilation/linking process if you've #undef'd the corresponding symbols.
- * (You may HAVE to do that if your compiler doesn't like null source files.)
- */
-
-/* Capability options common to encoder and decoder: */
-
-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
-
-/* Encoder capability options: */
-
-#define C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define DCT_SCALING_SUPPORTED	    /* Input rescaling via DCT? (Requires DCT_ISLOW)*/
-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
- * The exact same statements apply for progressive JPEG: the default tables
- * don't work for progressive mode.  (This may get fixed, however.)
- */
-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
-
-/* Decoder capability options: */
-
-#define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
-
-/* more capability options later, no doubt */
-
-
-/*
- * Ordering of RGB data in scanlines passed to or from the application.
- * If your application wants to deal with data in the order B,G,R, just
- * change these macros.  You can also deal with formats such as R,G,B,X
- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
- * the offsets will also change the order in which colormap data is organized.
- * RESTRICTIONS:
- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
- *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
- * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
- *    is not 3 (they don't understand about dummy color components!).  So you
- *    can't use color quantization if you change that value.
- */
-
-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
-#define RGB_GREEN	1	/* Offset of Green */
-#define RGB_BLUE	2	/* Offset of Blue */
-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
-
-
-/* Definitions for speed-related optimizations. */
-
-
-/* If your compiler supports inline functions, define INLINE
- * as the inline keyword; otherwise define it as empty.
- */
-
-#ifndef INLINE
-#ifdef __GNUC__			/* for instance, GNU C knows about inline */
-#define INLINE __inline__
-#endif
-#ifndef INLINE
-#define INLINE			/* default is to define it as empty */
-#endif
-#endif
-
-
-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
- */
-
-#ifndef MULTIPLIER
-#define MULTIPLIER  int		/* type for fastest integer multiply */
-#endif
-
-
-/* FAST_FLOAT should be either float or double, whichever is done faster
- * by your compiler.  (Note that this type is only used in the floating point
- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
- * Typically, float is faster in ANSI C compilers, while double is faster in
- * pre-ANSI compilers (because they insist on converting to double anyway).
- * The code below therefore chooses float if we have ANSI-style prototypes.
- */
-
-#ifndef FAST_FLOAT
-#ifdef HAVE_PROTOTYPES
-#define FAST_FLOAT  float
-#else
-#define FAST_FLOAT  double
-#endif
-#endif
-
-#endif /* JPEG_INTERNAL_OPTIONS */
diff --git a/Externals/libjpeg/jpeglib.h b/Externals/libjpeg/jpeglib.h
deleted file mode 100644
index 1eb1fac033..0000000000
--- a/Externals/libjpeg/jpeglib.h
+++ /dev/null
@@ -1,1160 +0,0 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2010 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-extern "C" {
-#endif
-#endif
-
-/* Version IDs for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
- */
-
-#define JPEG_LIB_VERSION        80	/* Compatibility version 8.0 */
-#define JPEG_LIB_VERSION_MAJOR  8
-#define JPEG_LIB_VERSION_MINOR  3
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
-				/* length k bits; bits[0] is unused */
-  UINT8 huffval[256];		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info[] */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-  
-  /* Remaining fields should be treated as private by applications. */
-  
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples,
-   * reflecting any scaling we choose to apply during the DCT step.
-   * Values from 1 to 16 are supported.
-   * Note that different components may receive different DCT scalings.
-   */
-  int DCT_h_scaled_size;
-  int DCT_v_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface);
-   * DCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_h_scaled_size/DCTSIZE)
-   * and similarly for height.
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;	/* MCU width in samples: MCU_width * DCT_h_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data[] */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  JDIMENSION jpeg_width;	/* scaled JPEG image width */
-  JDIMENSION jpeg_height;	/* scaled JPEG image height */
-  /* Dimensions of actual JPEG image that will be written to file,
-   * derived from input dimensions by scaling factors above.
-   * These fields are computed by jpeg_start_compress().
-   * You can also use jpeg_calc_jpeg_dimensions() to determine these values
-   * in advance of calling jpeg_start_compress().
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  int q_scale_factor[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined,
-   * and corresponding scale factors (percentage, initialized 100).
-   */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-  
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-  
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-  
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-  
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order;	/* natural-order position array */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  boolean buffered_image;	/* TRUE=multiple output passes */
-  boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  boolean enable_external_quant;/* enable future use of external colormap */
-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bits[c][i] indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  boolean is_baseline;		/* TRUE if Baseline SOF0 encountered */
-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_h_scaled_size;	/* smallest DCT_h_scaled_size of any component */
-  int min_DCT_v_scaled_size;	/* smallest DCT_v_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_v_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* These fields are derived from Se of first SOS marker.
-   */
-  int block_size;		/* the basic DCT block size: 1..16 */
-  const int * natural_order; /* natural-order position array for entropy decode */
-  int lim_Se;			/* min( Se, DCTSIZE2-1 ) for entropy decode */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-  
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i[8];
-    char s[JMSG_STR_PARM_MAX];
-  } msg_parm;
-  
-  /* Standard state variables for error facility */
-  
-  int trace_level;		/* max msg_level that will be displayed */
-  
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15 
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_mem_dest		jMemDest
-#define jpeg_mem_src		jMemSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_default_qtables	jDefQTables
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_calc_jpeg_dimensions	jCjpegDimensions
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_core_output_dimensions	jCoreDimensions
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Data source and destination managers: memory buffers. */
-EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo,
-			       unsigned char ** outbuffer,
-			       unsigned long * outsize));
-EXTERN(void) jpeg_mem_src JPP((j_decompress_ptr cinfo,
-			      unsigned char * inbuffer,
-			      unsigned long insize));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  boolean force_baseline));
-EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,
-				       boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Precalculate JPEG dimensions for current compression parameters. */
-EXTERN(void) jpeg_calc_jpeg_dimensions JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.txt concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_core_output_dimensions JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#ifdef __cplusplus
-#ifndef DONT_USE_EXTERN_C
-}
-#endif
-#endif
-
-#endif /* JPEGLIB_H */
diff --git a/Externals/libjpeg/libjpeg.lib b/Externals/libjpeg/libjpeg.lib
deleted file mode 100644
index a75d080166..0000000000
Binary files a/Externals/libjpeg/libjpeg.lib and /dev/null differ
diff --git a/Externals/libjpeg/libjpeg64.lib b/Externals/libjpeg/libjpeg64.lib
deleted file mode 100644
index 9211ddea4a..0000000000
Binary files a/Externals/libjpeg/libjpeg64.lib and /dev/null differ
diff --git a/Externals/libpng/CMakeLists.txt b/Externals/libpng/CMakeLists.txt
index b30749ee86..122007c7c5 100644
--- a/Externals/libpng/CMakeLists.txt
+++ b/Externals/libpng/CMakeLists.txt
@@ -18,4 +18,5 @@ set(SRCS
   pngwtran.c
   pngwutil.c
 )
+add_definitions(-Wno-self-assign)
 add_library(png STATIC ${SRCS})
diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj
index e272b07452..e629708347 100644
--- a/Externals/libpng/png/png.vcxproj
+++ b/Externals/libpng/png/png.vcxproj
@@ -1,37 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <None Include="..\CMakeLists.txt" />
+    <Text Include="..\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\png.c" />
     <ClCompile Include="..\pngerror.c" />
+    <ClCompile Include="..\pnggccrd.c" />
     <ClCompile Include="..\pngget.c" />
     <ClCompile Include="..\pngmem.c" />
     <ClCompile Include="..\pngpread.c" />
@@ -41,6 +50,7 @@
     <ClCompile Include="..\pngrutil.c" />
     <ClCompile Include="..\pngset.c" />
     <ClCompile Include="..\pngtrans.c" />
+    <ClCompile Include="..\pngvcrd.c" />
     <ClCompile Include="..\pngwio.c" />
     <ClCompile Include="..\pngwrite.c" />
     <ClCompile Include="..\pngwtran.c" />
@@ -55,153 +65,11 @@
     <ClInclude Include="..\pngpriv.h" />
     <ClInclude Include="..\pngstruct.h" />
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{01573C36-AC6E-49F6-94BA-572517EB9740}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>png</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_DebugFast.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="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Externals/libpng/png/png.vcxproj.filters b/Externals/libpng/png/png.vcxproj.filters
deleted file mode 100644
index 5bccb29842..0000000000
--- a/Externals/libpng/png/png.vcxproj.filters
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <None Include="..\CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\png.c" />
-    <ClCompile Include="..\pngerror.c" />
-    <ClCompile Include="..\pngget.c" />
-    <ClCompile Include="..\pngmem.c" />
-    <ClCompile Include="..\pngpread.c" />
-    <ClCompile Include="..\pngread.c" />
-    <ClCompile Include="..\pngrio.c" />
-    <ClCompile Include="..\pngrtran.c" />
-    <ClCompile Include="..\pngrutil.c" />
-    <ClCompile Include="..\pngset.c" />
-    <ClCompile Include="..\pngtrans.c" />
-    <ClCompile Include="..\pngwio.c" />
-    <ClCompile Include="..\pngwrite.c" />
-    <ClCompile Include="..\pngwtran.c" />
-    <ClCompile Include="..\pngwutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\png.h" />
-    <ClInclude Include="..\pngconf.h" />
-    <ClInclude Include="..\pngdebug.h" />
-    <ClInclude Include="..\pnginfo.h" />
-    <ClInclude Include="..\pnglibconf.h" />
-    <ClInclude Include="..\pngpriv.h" />
-    <ClInclude Include="..\pngstruct.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/libusb/AUTHORS b/Externals/libusb/AUTHORS
new file mode 100644
index 0000000000..95b116286c
--- /dev/null
+++ b/Externals/libusb/AUTHORS
@@ -0,0 +1,78 @@
+Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
+Copyright © 2010-2012 Peter Stuge <peter@stuge.se>
+Copyright © 2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
+Copyright © 2009-2013 Pete Batard <pete@akeo.ie>
+Copyright © 2009-2013 Ludovic Rousseau <ludovic.rousseau@gmail.com>
+Copyright © 2010-2012 Michael Plante <michael.plante@gmail.com>
+Copyright © 2011-2013 Hans de Goede <hdegoede@redhat.com>
+Copyright © 2012-2013 Martin Pieuchot <mpi@openbsd.org>
+Copyright © 2012-2013 Toby Gray <toby.gray@realvnc.com>
+
+Other contributors:
+Alan Ott
+Alan Stern
+Alex Vatchenko
+Andrew Fernandes
+Anthony Clay
+Artem Egorkine
+Aurelien Jarno
+Bastien Nocera
+Bei Zhang
+Benjamin Dobell
+Carl Karsten
+Chris Dickens
+Colin Walters
+Dave Camarillo
+David Engraf
+David Moore
+Davidlohr Bueso
+Federico Manzan
+Felipe Balbi
+Florian Albrechtskirchinger
+Francesco Montorsi
+Francisco Facioni
+Graeme Gill
+Gustavo Zacarias
+Hans Ulrich Niedermann
+Hector Martin
+Hoi-Ho Chan
+Ilya Konstantinov
+James Hanko
+John Sheu
+Joshua Blake
+Justin Bischoff
+Karsten Koenig
+Konrad Rzepecki
+Kuangye Guo
+Lars Kanis
+Lars Wirzenius
+Luca Longinotti
+Markus Heidelberg
+Martin Koegler
+Matthias Bolte
+Mike Frysinger
+Mikhail Gusarov
+Moritz Fischer
+Ларионов Даниил
+Nicholas Corgan
+Omri Iluz
+Orin Eman
+Paul Fertser
+Pekka Nikander
+Rob Walker
+Sean McBride
+Sebastian Pipping
+Simon Haggett
+Thomas Röfer
+Tim Roberts
+Toby Peterson
+Trygve Laugstøl
+Uri Lublin
+Vasily Khoruzhick
+Vegard Storheil Eriksen
+Vitali Lovich
+Xiaofan Chen
+Zoltán Kovács
+Роман Донченко
+xantares
diff --git a/Externals/libusb/COPYING b/Externals/libusb/COPYING
new file mode 100644
index 0000000000..5ab7695ab8
--- /dev/null
+++ b/Externals/libusb/COPYING
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/Externals/libusb/ChangeLog b/Externals/libusb/ChangeLog
new file mode 100644
index 0000000000..30a346d4c5
--- /dev/null
+++ b/Externals/libusb/ChangeLog
@@ -0,0 +1,211 @@
+For detailed information about the changes below, please see the git log or
+visit: http://log.libusb.info
+
+2014-05-30: v1.0.19
+* Add support for USB bulk streams on Linux and Mac OS X (#11)
+* Windows: Add AMD and Intel USB-3.0 root hub support
+* Windows: Fix USB 3.0 speed detection on Windows 8 or later (#10)
+* Added Russian translation for libusb_strerror strings
+* All: Various small fixes and cleanups
+The (#xx) numbers are libusb issue numbers, see ie:
+https://github.com/libusb/libusb/issues/11
+
+2014-01-25: v1.0.18
+* Fix multiple memory leaks
+* Fix a crash when HID transfers return no data on Windows
+* Ensure all pending events are consumed
+* Improve Android and ucLinux support
+* Multiple Windows improvements (error logging, VS2013, VIA xHCI support)
+* Multiple OS X improvements (broken compilation, SIGFPE, 64bit support)
+
+2013-09-06: v1.0.17
+* Hotplug callbacks now always get passed a libusb_context, even if it is
+  the default context. Previously NULL would be passed for the default context,
+  but since the first context created is the default context, and most apps
+  use only 1 context, this meant that apps explicitly creating a context would
+  still get passed NULL
+* Android: Add .mk files to build with the Android NDK
+* Darwin: Add Xcode project
+* Darwin: Fix crash on unplug (#121)
+* Linux: Fix hang (deadlock) on libusb_exit
+* Linux: Fix libusb build failure with --disable-udev (#124)
+* Linux: Fix libusb_get_device_list() hang with --disable-udev (#130)
+* OpenBSD: Update OpenBSD backend with support for control transfers to
+  non-ugen(4) devices and make get_configuration() no longer generate I/O.
+  Note that using this libusb version on OpenBSD requires using
+  OpenBSD 5.3-current or later. Users of older OpenBSD versions are advised
+  to stay with the libusb shipped with OpenBSD (mpi)
+* Windows: fix libusb_dll_2010.vcxproj link errors (#129)
+* Various other bug fixes and improvements
+
+2013-07-11: v1.0.16
+* Add hotplug support for Darwin and Linux (#9)
+* Add superspeed endpoint companion descriptor support (#15)
+* Add BOS descriptor support (#15)
+* Make descriptor parsing code more robust
+* New libusb_get_port_numbers API, this is libusb_get_port_path without
+  the unnecessary context parameter, libusb_get_port_path is now deprecated
+* New libusb_strerror API (#14)
+* New libusb_set_auto_detach_kernel_driver API (#17)
+* Improve topology API docs (#95)
+* Logging now use a single write call per log-message, avoiding log-message
+  "interlacing" when using multiple threads.
+* Android: use Android logging when building on Android (#101)
+* Darwin: make libusb_reset reenumerate device on descriptors change (#89)
+* Darwin: add support for the LIBUSB_TRANSFER_ADD_ZERO_PACKET flag (#91)
+* Darwin: add a device cache (#112, #114)
+* Examples: Add sam3u_benchmark isochronous example by Harald Welte (#109)
+* Many other bug fixes and improvements
+The (#xx) numbers are libusbx issue numbers, see ie:
+https://github.com/libusbx/libusbx/issues/9
+
+2013-04-15: v1.0.15
+* Improve transfer cancellation and avoid short read failures on broken descriptors
+* Filter out 8-bit characters in libusb_get_string_descriptor_ascii()
+* Add WinCE support
+* Add library stress tests
+* Add Cypress FX3 firmware upload support for fxload sample
+* Add HID and kernel driver detach support capabilities detection
+* Add SuperSpeed detection on OS X
+* Fix bInterval value interpretation on OS X
+* Fix issues with autoclaim, composite HID devices, interface autoclaim and
+  early abort in libusb_close() on Windows. Also add VS2012 solution files.
+* Improve fd event handling on Linux
+* Other bug fixes and improvements
+
+2012-09-26: v1.0.14
+* Reverts the previous API change with regards to bMaxPower.
+  If this doesn't matter to you, you are encouraged to keep using v1.0.13,
+  as it will use the same attribute as v2.0, to be released soon.
+* Note that LIBUSB_API_VERSION is *decreased* to 0x010000FF and the previous
+  guidelines with regards to concurrent use of MaxPower/bMaxPower still apply.
+
+2012-09-20: v1.0.13
+* [MAJOR] Fix a typo in the API with struct libusb_config_descriptor where
+  MaxPower was used instead of bMaxPower, as defined in the specs. If your 
+  application was accessing the MaxPower attribute, and you need to maintain
+  compatibility with libusb or older versions, see APPENDIX A below.
+* Fix broken support for the 0.1 -> 1.0 libusb-compat layer
+* Fix unwanted cancellation of pending timeouts as well as major timeout related bugs
+* Fix handling of HID and composite devices on Windows
+* Introduce LIBUSB_API_VERSION macro
+* Add Cypress FX/FX2 firmware upload sample, based on fxload from
+  http://linux-hotplug.sourceforge.net
+* Add libusb0 (libusb-win32) and libusbK driver support on Windows. Note that while
+  the drivers allow it, isochronous transfers are not supported yet in libusb. Also
+  not supported yet is the use of libusb-win32 filter drivers on composite interfaces
+* Add support for the new get_capabilities ioctl on Linux and avoid unnecessary
+  splitting of bulk transfers
+* Improve support for newer Intel and Renesas USB 3.0 controllers on Windows
+* Harmonize the device number for root hubs across platforms
+* Other bug fixes and improvements
+
+2012-06-15: v1.0.12
+* Fix a potential major regression with pthread on Linux
+* Fix missing thread ID from debug log output on cygwin
+* Fix possible crash when using longjmp and MinGW's gcc 4.6
+* Add topology calls: libusb_get_port_number(), libusb_get_parent() & libusb_get_port_path()
+* Add toggleable debug, using libusb_set_debug() or the LIBUSB_DEBUG environment variable
+* Define log levels in libusb.h and set timestamp origin to first libusb_init() call
+* All logging is now sent to to stderr (info was sent to stdout previously)
+* Update log messages severity and avoid polluting log output on OS-X
+* Add HID driver support on Windows
+* Enable interchangeability of MSVC and MinGW DLLs
+* Additional bug fixes and improvements
+
+2012-05-08: v1.0.11
+* Revert removal of critical Windows event handling that was introduced in 1.0.10
+* Fix a possible deadlock in Windows when submitting transfers
+* Add timestamped logging
+* Add NetBSD support (experimental) and BSD libusb_get_device_speed() data
+* Add bootstrap.sh alongside autogen.sh (bootstrap.sh doesn't invoke configure)
+* Search for device nodes in /dev for Android support
+* Other bug fixes
+
+2012-04-17: v1.0.10
+* Public release
+* Add libusb_get_version
+* Add Visual Studio 2010 project files
+* Some Windows code cleanup
+* Fix xusb sample warnings 
+
+2012-04-02: v1.0.9
+* First libusbx release
+* Add libusb_get_device_speed (all, except BSD) and libusb_error_name
+* Add Windows support (WinUSB driver only)
+* Add OpenBSD support
+* Add xusb sample
+* Tons of bug fixes
+
+2010-05-07: v1.0.8
+* Bug fixes
+
+2010-04-19: v1.0.7
+* Bug fixes and documentation tweaks
+* Add more interface class definitions
+
+2009-11-22: v1.0.6
+* Bug fixes
+* Increase libusb_handle_events() timeout to 60s for powersaving
+
+2009-11-15: v1.0.5
+ * Use timerfd when available for timer management
+ * Small fixes/updates
+
+2009-11-06: v1.0.4 release
+ * Bug fixes including transfer locking to fix some potential threading races
+ * More flexibility with clock types on Linux
+ * Use new bulk continuation tracking in Linux 2.6.32 for improved handling
+   of short/failed transfers
+
+2009-08-27: v1.0.3 release
+ * Bug fixes
+ * Add libusb_get_max_iso_packet_size()
+
+2009-06-13: v1.0.2 release
+ * Bug fixes
+
+2009-05-12: v1.0.1 release
+ * Bug fixes
+ * Darwin backend
+
+2008-12-13: v1.0.0 release
+ * Bug fixes
+
+2008-11-21: v0.9.4 release
+ * Bug fixes
+ * Add libusb_attach_kernel_driver()
+
+2008-08-23: v0.9.3 release
+ * Bug fixes
+
+2008-07-19: v0.9.2 release
+ * Bug fixes
+
+2008-06-28: v0.9.1 release
+ * Bug fixes
+ * Introduce contexts to the API
+ * Compatibility with new Linux kernel features
+
+2008-05-25: v0.9.0 release
+ * First libusb-1.0 beta release
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+APPENDIX A - How to maintain code compatibility with versions of libusb and
+libusb that use MaxPower:
+
+If you must to maintain compatibility with versions of the library that aren't
+using the bMaxPower attribute in struct libusb_config_descriptor, the 
+recommended way is to use the new LIBUSB_API_VERSION macro with an #ifdef.
+For instance, if your code was written as follows:
+
+  if (dev->config[0].MaxPower < 250)
+
+Then you should modify it to have:
+
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000100)
+  if (dev->config[0].bMaxPower < 250)
+#else
+  if (dev->config[0].MaxPower < 250)
+#endif
diff --git a/Externals/libusb/DOLPHIN b/Externals/libusb/DOLPHIN
new file mode 100644
index 0000000000..785cfff64f
--- /dev/null
+++ b/Externals/libusb/DOLPHIN
@@ -0,0 +1,7 @@
+Dolphin-specific changes (as of 2015-02-12)
+-------------------------------------------
+
+- removed all toplevel directories save msvc/ & libusb/
+- removed all files save AUTHORS, Changelog, COPYING, INSTALL, NEWS,
+  PORTING, README and TODO
+- patched the VS project file to insert dolphin-specific props
diff --git a/Externals/libusb/INSTALL b/Externals/libusb/INSTALL
new file mode 100644
index 0000000000..5458714e1e
--- /dev/null
+++ b/Externals/libusb/INSTALL
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Externals/libusb/NEWS b/Externals/libusb/NEWS
new file mode 100644
index 0000000000..07695abc1e
--- /dev/null
+++ b/Externals/libusb/NEWS
@@ -0,0 +1,2 @@
+For the latest libusb news, please refer to the ChangeLog file, or visit:
+http://libusb.info
diff --git a/Externals/libusb/PORTING b/Externals/libusb/PORTING
new file mode 100644
index 0000000000..fa9ec1e58d
--- /dev/null
+++ b/Externals/libusb/PORTING
@@ -0,0 +1,94 @@
+PORTING LIBUSB TO OTHER PLATFORMS
+
+Introduction
+============
+
+This document is aimed at developers wishing to port libusb to unsupported
+platforms. I believe the libusb API is OS-independent, so by supporting
+multiple operating systems we pave the way for cross-platform USB device
+drivers.
+
+Implementation-wise, the basic idea is that you provide an interface to
+libusb's internal "backend" API, which performs the appropriate operations on
+your target platform.
+
+In terms of USB I/O, your backend provides functionality to submit
+asynchronous transfers (synchronous transfers are implemented in the higher
+layers, based on the async interface). Your backend must also provide
+functionality to cancel those transfers.
+
+Your backend must also provide an event handling function to "reap" ongoing
+transfers and process their results.
+
+The backend must also provide standard functions for other USB operations,
+e.g. setting configuration, obtaining descriptors, etc.
+
+
+File descriptors for I/O polling
+================================
+
+For libusb to work, your event handling function obviously needs to be called
+at various points in time. Your backend must provide a set of file descriptors
+which libusb and its users can pass to poll() or select() to determine when
+it is time to call the event handling function.
+
+On Linux, this is easy: the usbfs kernel interface exposes a file descriptor
+which can be passed to poll(). If something similar is not true for your
+platform, you can emulate this using an internal library thread to reap I/O as
+necessary, and a pipe() with the main library to raise events. The file
+descriptor of the pipe can then be provided to libusb as an event source.
+
+
+Interface semantics and documentation
+=====================================
+
+Documentation of the backend interface can be found in libusbi.h inside the
+usbi_os_backend structure definition.
+
+Your implementations of these functions will need to call various internal
+libusb functions, prefixed with "usbi_". Documentation for these functions
+can be found in the .c files where they are implemented.
+
+You probably want to skim over *all* the documentation before starting your
+implementation. For example, you probably need to allocate and store private
+OS-specific data for device handles, but the documentation for the mechanism
+for doing so is probably not the first thing you will see.
+
+The Linux backend acts as a good example - view it as a reference
+implementation which you should try to match the behaviour of.
+
+
+Getting started
+===============
+
+1. Modify configure.ac to detect your platform appropriately (see the OS_LINUX
+stuff for an example).
+
+2. Implement your backend in the libusb/os/ directory, modifying
+libusb/os/Makefile.am appropriately.
+
+3. Add preprocessor logic to the top of libusb/core.c to statically assign the
+right usbi_backend for your platform.
+
+4. Produce and test your implementation.
+
+5. Send your implementation to libusb-devel mailing list.
+
+
+Implementation difficulties? Questions?
+=======================================
+
+If you encounter difficulties porting libusb to your platform, please raise
+these issues on the libusb-devel mailing list. Where possible and sensible, I
+am interested in solving problems preventing libusb from operating on other
+platforms.
+
+The libusb-devel mailing list is also a good place to ask questions and
+make suggestions about the internal API. Hopefully we can produce some
+better documentation based on your questions and other input.
+
+You are encouraged to get involved in the process; if the library needs
+some infrastructure additions/modifications to better support your platform,
+you are encouraged to make such changes (in cleanly distinct patch
+submissions). Even if you do not make such changes yourself, please do raise
+the issues on the mailing list at the very minimum.
diff --git a/Externals/libusb/README b/Externals/libusb/README
new file mode 100644
index 0000000000..715c416a37
--- /dev/null
+++ b/Externals/libusb/README
@@ -0,0 +1,27 @@
+libusb
+======
+
+libusb is a library for USB device access from Linux, Mac OS X,
+Windows and OpenBSD/NetBSD userspace.
+It is written in C and licensed under the GNU Lesser General Public
+License version 2.1 or, at your option, any later version (see COPYING).
+
+libusb is abstracted internally in such a way that it can hopefully
+be ported to other operating systems. Please see the PORTING file
+for more information.
+
+libusb homepage:
+http://libusb.info/
+
+Developers will wish to consult the API documentation:
+http://api.libusb.info
+
+Use the mailing list for questions, comments, etc:
+http://mailing-list.libusb.info
+
+- Pete Batard <pete@akeo.ie>
+- Hans de Goede <hdegoede@redhat.com>
+- Xiaofan Chen <xiaofanc@gmail.com>
+- Ludovic Rousseau <ludovic.rousseau@gmail.com>
+- Nathan Hjelm <hjelmn@users.sourceforge.net>
+(Please use the mailing list rather than mailing developers directly)
diff --git a/Externals/libusb/TODO b/Externals/libusb/TODO
new file mode 100644
index 0000000000..19dd1d0e6f
--- /dev/null
+++ b/Externals/libusb/TODO
@@ -0,0 +1,2 @@
+Please see the libusb roadmap by visiting:
+https://github.com/libusb/libusb/issues/milestones?direction=asc&sort=due_date
diff --git a/Externals/libusb/include/libusb.h b/Externals/libusb/include/libusb.h
deleted file mode 100644
index 2e2bb7012f..0000000000
--- a/Externals/libusb/include/libusb.h
+++ /dev/null
@@ -1,1445 +0,0 @@
-/*
- * Public libusb header file
- * Copyright (C) 2007-2008 Daniel Drake <dsd@gentoo.org>
- * Copyright (c) 2001 Johannes Erdfelt <johannes@erdfelt.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef LIBUSB_H
-#define LIBUSB_H
-
-#ifdef _MSC_VER
-/* on MS environments, the inline keyword is available in C++ only */
-#if !defined(inline)
-#define inline __inline
-#endif
-/* ssize_t is also not available (copy/paste from MinGW) */
-#ifndef _SSIZE_T_DEFINED
-#define _SSIZE_T_DEFINED
-#undef ssize_t
-#ifdef _WIN64
-  typedef __int64 ssize_t;
-#else
-  typedef int ssize_t;
-#endif /* _WIN64 */
-#endif /* _SSIZE_T_DEFINED */
-#endif /* _MSC_VER */
-
-/* stdint.h is also not usually available on MS */
-#if defined(_MSC_VER) && (_MSC_VER < 1600) && (!defined(_STDINT)) && (!defined(_STDINT_H))
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-#else
-#include <stdint.h>
-#endif
-
-#include <sys/types.h>
-#include <time.h>
-#include <limits.h>
-
-#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
-#include <sys/time.h>
-#endif
-
-/* 'interface' might be defined as a macro on Windows, so we need to
- * undefine it so as not to break the current libusb API, because
- * libusb_config_descriptor has an 'interface' member
- * As this can be problematic if you include windows.h after libusb.h
- * in your sources, we force windows.h to be included first. */
-#if defined(_WIN32) || defined(__CYGWIN__)
-#include <windows.h>
-#if defined(interface)
-#undef interface
-#endif
-#endif
-
-/** \def LIBUSB_CALL
- * \ingroup misc
- * libusb's Windows calling convention.
- *
- * Under Windows, the selection of available compilers and configurations
- * means that, unlike other platforms, there is not <em>one true calling
- * convention</em> (calling convention: the manner in which parameters are
- * passed to funcions in the generated assembly code).
- *
- * Matching the Windows API itself, libusb uses the WINAPI convention (which
- * translates to the <tt>stdcall</tt> convention) and guarantees that the
- * library is compiled in this way. The public header file also includes
- * appropriate annotations so that your own software will use the right
- * convention, even if another convention is being used by default within
- * your codebase.
- *
- * The one consideration that you must apply in your software is to mark
- * all functions which you use as libusb callbacks with this LIBUSB_CALL
- * annotation, so that they too get compiled for the correct calling
- * convention.
- *
- * On non-Windows operating systems, this macro is defined as nothing. This
- * means that you can apply it to your code without worrying about
- * cross-platform compatibility.
- */
-/* LIBUSB_CALL must be defined on both definition and declaration of libusb
- * functions. You'd think that declaration would be enough, but cygwin will
- * complain about conflicting types unless both are marked this way.
- * The placement of this macro is important too; it must appear after the
- * return type, before the function name. See internal documentation for
- * API_EXPORTED.
- */
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define LIBUSB_CALL WINAPI
-#else
-#define LIBUSB_CALL
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \def libusb_cpu_to_le16
- * \ingroup misc
- * Convert a 16-bit value from host-endian to little-endian format. On
- * little endian systems, this function does nothing. On big endian systems,
- * the bytes are swapped.
- * \param x the host-endian value to convert
- * \returns the value in little-endian byte order
- */
-static inline uint16_t libusb_cpu_to_le16(const uint16_t x)
-{
-	union {
-		uint8_t  b8[2];
-		uint16_t b16;
-	} _tmp;
-	_tmp.b8[1] = x >> 8;
-	_tmp.b8[0] = x & 0xff;
-	return _tmp.b16;
-}
-
-/** \def libusb_le16_to_cpu
- * \ingroup misc
- * Convert a 16-bit value from little-endian to host-endian format. On
- * little endian systems, this function does nothing. On big endian systems,
- * the bytes are swapped.
- * \param x the little-endian value to convert
- * \returns the value in host-endian byte order
- */
-#define libusb_le16_to_cpu libusb_cpu_to_le16
-
-/* standard USB stuff */
-
-/** \ingroup desc
- * Device and/or Interface Class codes */
-enum libusb_class_code {
-	/** In the context of a \ref libusb_device_descriptor "device descriptor",
-	 * this bDeviceClass value indicates that each interface specifies its
-	 * own class information and all interfaces operate independently.
-	 */
-	LIBUSB_CLASS_PER_INTERFACE = 0,
-
-	/** Audio class */
-	LIBUSB_CLASS_AUDIO = 1,
-
-	/** Communications class */
-	LIBUSB_CLASS_COMM = 2,
-
-	/** Human Interface Device class */
-	LIBUSB_CLASS_HID = 3,
-
-	/** Physical */
-	LIBUSB_CLASS_PHYSICAL = 5,
-
-	/** Printer class */
-	LIBUSB_CLASS_PRINTER = 7,
-
-	/** Image class */
-	LIBUSB_CLASS_PTP = 6, /* legacy name from libusb-0.1 usb.h */
-	LIBUSB_CLASS_IMAGE = 6,
-
-	/** Mass storage class */
-	LIBUSB_CLASS_MASS_STORAGE = 8,
-
-	/** Hub class */
-	LIBUSB_CLASS_HUB = 9,
-
-	/** Data class */
-	LIBUSB_CLASS_DATA = 10,
-
-	/** Smart Card */
-	LIBUSB_CLASS_SMART_CARD = 0x0b,
-
-	/** Content Security */
-	LIBUSB_CLASS_CONTENT_SECURITY = 0x0d,
-
-	/** Video */
-	LIBUSB_CLASS_VIDEO = 0x0e,
-
-	/** Personal Healthcare */
-	LIBUSB_CLASS_PERSONAL_HEALTHCARE = 0x0f,
-
-	/** Diagnostic Device */
-	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
-
-	/** Wireless class */
-	LIBUSB_CLASS_WIRELESS = 0xe0,
-
-	/** Application class */
-	LIBUSB_CLASS_APPLICATION = 0xfe,
-
-	/** Class is vendor-specific */
-	LIBUSB_CLASS_VENDOR_SPEC = 0xff
-};
-
-/** \ingroup desc
- * Descriptor types as defined by the USB specification. */
-enum libusb_descriptor_type {
-	/** Device descriptor. See libusb_device_descriptor. */
-	LIBUSB_DT_DEVICE = 0x01,
-
-	/** Configuration descriptor. See libusb_config_descriptor. */
-	LIBUSB_DT_CONFIG = 0x02,
-
-	/** String descriptor */
-	LIBUSB_DT_STRING = 0x03,
-
-	/** Interface descriptor. See libusb_interface_descriptor. */
-	LIBUSB_DT_INTERFACE = 0x04,
-
-	/** Endpoint descriptor. See libusb_endpoint_descriptor. */
-	LIBUSB_DT_ENDPOINT = 0x05,
-
-	/** HID descriptor */
-	LIBUSB_DT_HID = 0x21,
-
-	/** HID report descriptor */
-	LIBUSB_DT_REPORT = 0x22,
-
-	/** Physical descriptor */
-	LIBUSB_DT_PHYSICAL = 0x23,
-
-	/** Hub descriptor */
-	LIBUSB_DT_HUB = 0x29,
-};
-
-/* Descriptor sizes per descriptor type */
-#define LIBUSB_DT_DEVICE_SIZE			18
-#define LIBUSB_DT_CONFIG_SIZE			9
-#define LIBUSB_DT_INTERFACE_SIZE		9
-#define LIBUSB_DT_ENDPOINT_SIZE		7
-#define LIBUSB_DT_ENDPOINT_AUDIO_SIZE	9	/* Audio extension */
-#define LIBUSB_DT_HUB_NONVAR_SIZE		7
-
-#define LIBUSB_ENDPOINT_ADDRESS_MASK	0x0f    /* in bEndpointAddress */
-#define LIBUSB_ENDPOINT_DIR_MASK		0x80
-
-/** \ingroup desc
- * Endpoint direction. Values for bit 7 of the
- * \ref libusb_endpoint_descriptor::bEndpointAddress "endpoint address" scheme.
- */
-enum libusb_endpoint_direction {
-	/** In: device-to-host */
-	LIBUSB_ENDPOINT_IN = 0x80,
-
-	/** Out: host-to-device */
-	LIBUSB_ENDPOINT_OUT = 0x00
-};
-
-#define LIBUSB_TRANSFER_TYPE_MASK			0x03    /* in bmAttributes */
-
-/** \ingroup desc
- * Endpoint transfer type. Values for bits 0:1 of the
- * \ref libusb_endpoint_descriptor::bmAttributes "endpoint attributes" field.
- */
-enum libusb_transfer_type {
-	/** Control endpoint */
-	LIBUSB_TRANSFER_TYPE_CONTROL = 0,
-
-	/** Isochronous endpoint */
-	LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1,
-
-	/** Bulk endpoint */
-	LIBUSB_TRANSFER_TYPE_BULK = 2,
-
-	/** Interrupt endpoint */
-	LIBUSB_TRANSFER_TYPE_INTERRUPT = 3
-};
-
-/** \ingroup misc
- * Standard requests, as defined in table 9-3 of the USB2 specifications */
-enum libusb_standard_request {
-	/** Request status of the specific recipient */
-	LIBUSB_REQUEST_GET_STATUS = 0x00,
-
-	/** Clear or disable a specific feature */
-	LIBUSB_REQUEST_CLEAR_FEATURE = 0x01,
-
-	/* 0x02 is reserved */
-
-	/** Set or enable a specific feature */
-	LIBUSB_REQUEST_SET_FEATURE = 0x03,
-
-	/* 0x04 is reserved */
-
-	/** Set device address for all future accesses */
-	LIBUSB_REQUEST_SET_ADDRESS = 0x05,
-
-	/** Get the specified descriptor */
-	LIBUSB_REQUEST_GET_DESCRIPTOR = 0x06,
-
-	/** Used to update existing descriptors or add new descriptors */
-	LIBUSB_REQUEST_SET_DESCRIPTOR = 0x07,
-
-	/** Get the current device configuration value */
-	LIBUSB_REQUEST_GET_CONFIGURATION = 0x08,
-
-	/** Set device configuration */
-	LIBUSB_REQUEST_SET_CONFIGURATION = 0x09,
-
-	/** Return the selected alternate setting for the specified interface */
-	LIBUSB_REQUEST_GET_INTERFACE = 0x0A,
-
-	/** Select an alternate interface for the specified interface */
-	LIBUSB_REQUEST_SET_INTERFACE = 0x0B,
-
-	/** Set then report an endpoint's synchronization frame */
-	LIBUSB_REQUEST_SYNCH_FRAME = 0x0C,
-};
-
-/** \ingroup misc
- * Request type bits of the
- * \ref libusb_control_setup::bmRequestType "bmRequestType" field in control
- * transfers. */
-enum libusb_request_type {
-	/** Standard */
-	LIBUSB_REQUEST_TYPE_STANDARD = (0x00 << 5),
-
-	/** Class */
-	LIBUSB_REQUEST_TYPE_CLASS = (0x01 << 5),
-
-	/** Vendor */
-	LIBUSB_REQUEST_TYPE_VENDOR = (0x02 << 5),
-
-	/** Reserved */
-	LIBUSB_REQUEST_TYPE_RESERVED = (0x03 << 5)
-};
-
-/** \ingroup misc
- * Recipient bits of the
- * \ref libusb_control_setup::bmRequestType "bmRequestType" field in control
- * transfers. Values 4 through 31 are reserved. */
-enum libusb_request_recipient {
-	/** Device */
-	LIBUSB_RECIPIENT_DEVICE = 0x00,
-
-	/** Interface */
-	LIBUSB_RECIPIENT_INTERFACE = 0x01,
-
-	/** Endpoint */
-	LIBUSB_RECIPIENT_ENDPOINT = 0x02,
-
-	/** Other */
-	LIBUSB_RECIPIENT_OTHER = 0x03,
-};
-
-#define LIBUSB_ISO_SYNC_TYPE_MASK		0x0C
-
-/** \ingroup desc
- * Synchronization type for isochronous endpoints. Values for bits 2:3 of the
- * \ref libusb_endpoint_descriptor::bmAttributes "bmAttributes" field in
- * libusb_endpoint_descriptor.
- */
-enum libusb_iso_sync_type {
-	/** No synchronization */
-	LIBUSB_ISO_SYNC_TYPE_NONE = 0,
-
-	/** Asynchronous */
-	LIBUSB_ISO_SYNC_TYPE_ASYNC = 1,
-
-	/** Adaptive */
-	LIBUSB_ISO_SYNC_TYPE_ADAPTIVE = 2,
-
-	/** Synchronous */
-	LIBUSB_ISO_SYNC_TYPE_SYNC = 3
-};
-
-#define LIBUSB_ISO_USAGE_TYPE_MASK 0x30
-
-/** \ingroup desc
- * Usage type for isochronous endpoints. Values for bits 4:5 of the
- * \ref libusb_endpoint_descriptor::bmAttributes "bmAttributes" field in
- * libusb_endpoint_descriptor.
- */
-enum libusb_iso_usage_type {
-	/** Data endpoint */
-	LIBUSB_ISO_USAGE_TYPE_DATA = 0,
-
-	/** Feedback endpoint */
-	LIBUSB_ISO_USAGE_TYPE_FEEDBACK = 1,
-
-	/** Implicit feedback Data endpoint */
-	LIBUSB_ISO_USAGE_TYPE_IMPLICIT = 2,
-};
-
-/** \ingroup desc
- * A structure representing the standard USB device descriptor. This
- * descriptor is documented in section 9.6.1 of the USB 2.0 specification.
- * All multiple-byte fields are represented in host-endian format.
- */
-struct libusb_device_descriptor {
-	/** Size of this descriptor (in bytes) */
-	uint8_t  bLength;
-
-	/** Descriptor type. Will have value
-	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE LIBUSB_DT_DEVICE in this
-	 * context. */
-	uint8_t  bDescriptorType;
-
-	/** USB specification release number in binary-coded decimal. A value of
-	 * 0x0200 indicates USB 2.0, 0x0110 indicates USB 1.1, etc. */
-	uint16_t bcdUSB;
-
-	/** USB-IF class code for the device. See \ref libusb_class_code. */
-	uint8_t  bDeviceClass;
-
-	/** USB-IF subclass code for the device, qualified by the bDeviceClass
-	 * value */
-	uint8_t  bDeviceSubClass;
-
-	/** USB-IF protocol code for the device, qualified by the bDeviceClass and
-	 * bDeviceSubClass values */
-	uint8_t  bDeviceProtocol;
-
-	/** Maximum packet size for endpoint 0 */
-	uint8_t  bMaxPacketSize0;
-
-	/** USB-IF vendor ID */
-	uint16_t idVendor;
-
-	/** USB-IF product ID */
-	uint16_t idProduct;
-
-	/** Device release number in binary-coded decimal */
-	uint16_t bcdDevice;
-
-	/** Index of string descriptor describing manufacturer */
-	uint8_t  iManufacturer;
-
-	/** Index of string descriptor describing product */
-	uint8_t  iProduct;
-
-	/** Index of string descriptor containing device serial number */
-	uint8_t  iSerialNumber;
-
-	/** Number of possible configurations */
-	uint8_t  bNumConfigurations;
-};
-
-/** \ingroup desc
- * A structure representing the standard USB endpoint descriptor. This
- * descriptor is documented in section 9.6.3 of the USB 2.0 specification.
- * All multiple-byte fields are represented in host-endian format.
- */
-struct libusb_endpoint_descriptor {
-	/** Size of this descriptor (in bytes) */
-	uint8_t  bLength;
-
-	/** Descriptor type. Will have value
-	 * \ref libusb_descriptor_type::LIBUSB_DT_ENDPOINT LIBUSB_DT_ENDPOINT in
-	 * this context. */
-	uint8_t  bDescriptorType;
-
-	/** The address of the endpoint described by this descriptor. Bits 0:3 are
-	 * the endpoint number. Bits 4:6 are reserved. Bit 7 indicates direction,
-	 * see \ref libusb_endpoint_direction.
-	 */
-	uint8_t  bEndpointAddress;
-
-	/** Attributes which apply to the endpoint when it is configured using
-	 * the bConfigurationValue. Bits 0:1 determine the transfer type and
-	 * correspond to \ref libusb_transfer_type. Bits 2:3 are only used for
-	 * isochronous endpoints and correspond to \ref libusb_iso_sync_type.
-	 * Bits 4:5 are also only used for isochronous endpoints and correspond to
-	 * \ref libusb_iso_usage_type. Bits 6:7 are reserved.
-	 */
-	uint8_t  bmAttributes;
-
-	/** Maximum packet size this endpoint is capable of sending/receiving. */
-	uint16_t wMaxPacketSize;
-
-	/** Interval for polling endpoint for data transfers. */
-	uint8_t  bInterval;
-
-	/** For audio devices only: the rate at which synchronization feedback
-	 * is provided. */
-	uint8_t  bRefresh;
-
-	/** For audio devices only: the address if the synch endpoint */
-	uint8_t  bSynchAddress;
-
-	/** Extra descriptors. If libusb encounters unknown endpoint descriptors,
-	 * it will store them here, should you wish to parse them. */
-	const unsigned char *extra;
-
-	/** Length of the extra descriptors, in bytes. */
-	int extra_length;
-};
-
-/** \ingroup desc
- * A structure representing the standard USB interface descriptor. This
- * descriptor is documented in section 9.6.5 of the USB 2.0 specification.
- * All multiple-byte fields are represented in host-endian format.
- */
-struct libusb_interface_descriptor {
-	/** Size of this descriptor (in bytes) */
-	uint8_t  bLength;
-
-	/** Descriptor type. Will have value
-	 * \ref libusb_descriptor_type::LIBUSB_DT_INTERFACE LIBUSB_DT_INTERFACE
-	 * in this context. */
-	uint8_t  bDescriptorType;
-
-	/** Number of this interface */
-	uint8_t  bInterfaceNumber;
-
-	/** Value used to select this alternate setting for this interface */
-	uint8_t  bAlternateSetting;
-
-	/** Number of endpoints used by this interface (excluding the control
-	 * endpoint). */
-	uint8_t  bNumEndpoints;
-
-	/** USB-IF class code for this interface. See \ref libusb_class_code. */
-	uint8_t  bInterfaceClass;
-
-	/** USB-IF subclass code for this interface, qualified by the
-	 * bInterfaceClass value */
-	uint8_t  bInterfaceSubClass;
-
-	/** USB-IF protocol code for this interface, qualified by the
-	 * bInterfaceClass and bInterfaceSubClass values */
-	uint8_t  bInterfaceProtocol;
-
-	/** Index of string descriptor describing this interface */
-	uint8_t  iInterface;
-
-	/** Array of endpoint descriptors. This length of this array is determined
-	 * by the bNumEndpoints field. */
-	const struct libusb_endpoint_descriptor *endpoint;
-
-	/** Extra descriptors. If libusb encounters unknown interface descriptors,
-	 * it will store them here, should you wish to parse them. */
-	const unsigned char *extra;
-
-	/** Length of the extra descriptors, in bytes. */
-	int extra_length;
-};
-
-/** \ingroup desc
- * A collection of alternate settings for a particular USB interface.
- */
-struct libusb_interface {
-	/** Array of interface descriptors. The length of this array is determined
-	 * by the num_altsetting field. */
-	const struct libusb_interface_descriptor *altsetting;
-
-	/** The number of alternate settings that belong to this interface */
-	int num_altsetting;
-};
-
-/** \ingroup desc
- * A structure representing the standard USB configuration descriptor. This
- * descriptor is documented in section 9.6.3 of the USB 2.0 specification.
- * All multiple-byte fields are represented in host-endian format.
- */
-struct libusb_config_descriptor {
-	/** Size of this descriptor (in bytes) */
-	uint8_t  bLength;
-
-	/** Descriptor type. Will have value
-	 * \ref libusb_descriptor_type::LIBUSB_DT_CONFIG LIBUSB_DT_CONFIG
-	 * in this context. */
-	uint8_t  bDescriptorType;
-
-	/** Total length of data returned for this configuration */
-	uint16_t wTotalLength;
-
-	/** Number of interfaces supported by this configuration */
-	uint8_t  bNumInterfaces;
-
-	/** Identifier value for this configuration */
-	uint8_t  bConfigurationValue;
-
-	/** Index of string descriptor describing this configuration */
-	uint8_t  iConfiguration;
-
-	/** Configuration characteristics */
-	uint8_t  bmAttributes;
-
-	/** Maximum power consumption of the USB device from this bus in this
-	 * configuration when the device is fully opreation. Expressed in units
-	 * of 2 mA. */
-	uint8_t  MaxPower;
-
-	/** Array of interfaces supported by this configuration. The length of
-	 * this array is determined by the bNumInterfaces field. */
-	const struct libusb_interface *interface;
-
-	/** Extra descriptors. If libusb encounters unknown configuration
-	 * descriptors, it will store them here, should you wish to parse them. */
-	const unsigned char *extra;
-
-	/** Length of the extra descriptors, in bytes. */
-	int extra_length;
-};
-
-/** \ingroup asyncio
- * Setup packet for control transfers. */
-struct libusb_control_setup {
-	/** Request type. Bits 0:4 determine recipient, see
-	 * \ref libusb_request_recipient. Bits 5:6 determine type, see
-	 * \ref libusb_request_type. Bit 7 determines data transfer direction, see
-	 * \ref libusb_endpoint_direction.
-	 */
-	uint8_t  bmRequestType;
-
-	/** Request. If the type bits of bmRequestType are equal to
-	 * \ref libusb_request_type::LIBUSB_REQUEST_TYPE_STANDARD
-	 * "LIBUSB_REQUEST_TYPE_STANDARD" then this field refers to
-	 * \ref libusb_standard_request. For other cases, use of this field is
-	 * application-specific. */
-	uint8_t  bRequest;
-
-	/** Value. Varies according to request */
-	uint16_t wValue;
-
-	/** Index. Varies according to request, typically used to pass an index
-	 * or offset */
-	uint16_t wIndex;
-
-	/** Number of bytes to transfer */
-	uint16_t wLength;
-};
-
-#define LIBUSB_CONTROL_SETUP_SIZE (sizeof(struct libusb_control_setup))
-
-/* libusb */
-
-struct libusb_context;
-struct libusb_device;
-struct libusb_device_handle;
-
-/** \ingroup lib
- * Structure representing the libusb version.
- */
-struct libusb_version {
-	/** Library major version. */
-	const uint16_t major;
-
-	/** Library minor version. */
-	const uint16_t minor;
-
-	/** Library micro version. */
-	const uint16_t micro;
-
-	/** Library nano version. This field is only nonzero on Windows. */
-	const uint16_t nano;
-
-	/** Library release candidate suffix string, e.g. "-rc4". */
-	const char *rc;
-
-	/** Output of `git describe --tags` at library build time. */
-	const char *describe;
-};
-
-/** \ingroup lib
- * Structure representing a libusb session. The concept of individual libusb
- * sessions allows for your program to use two libraries (or dynamically
- * load two modules) which both independently use libusb. This will prevent
- * interference between the individual libusb users - for example
- * libusb_set_debug() will not affect the other user of the library, and
- * libusb_exit() will not destroy resources that the other user is still
- * using.
- *
- * Sessions are created by libusb_init() and destroyed through libusb_exit().
- * If your application is guaranteed to only ever include a single libusb
- * user (i.e. you), you do not have to worry about contexts: pass NULL in
- * every function call where a context is required. The default context
- * will be used.
- *
- * For more information, see \ref contexts.
- */
-typedef struct libusb_context libusb_context;
-
-/** \ingroup dev
- * Structure representing a USB device detected on the system. This is an
- * opaque type for which you are only ever provided with a pointer, usually
- * originating from libusb_get_device_list().
- *
- * Certain operations can be performed on a device, but in order to do any
- * I/O you will have to first obtain a device handle using libusb_open().
- *
- * Devices are reference counted with libusb_device_ref() and
- * libusb_device_unref(), and are freed when the reference count reaches 0.
- * New devices presented by libusb_get_device_list() have a reference count of
- * 1, and libusb_free_device_list() can optionally decrease the reference count
- * on all devices in the list. libusb_open() adds another reference which is
- * later destroyed by libusb_close().
- */
-typedef struct libusb_device libusb_device;
-
-
-/** \ingroup dev
- * Structure representing a handle on a USB device. This is an opaque type for
- * which you are only ever provided with a pointer, usually originating from
- * libusb_open().
- *
- * A device handle is used to perform I/O and other operations. When finished
- * with a device handle, you should call libusb_close().
- */
-typedef struct libusb_device_handle libusb_device_handle;
-
-/** \ingroup dev
- * Speed codes. Indicates the speed at which the device is operating.
- */
-enum libusb_speed {
-    /** The OS doesn't report or know the device speed. */
-    LIBUSB_SPEED_UNKNOWN = 0,
-
-    /** The device is operating at low speed (1.5MBit/s). */
-    LIBUSB_SPEED_LOW = 1,
-
-    /** The device is operating at full speed (12MBit/s). */
-    LIBUSB_SPEED_FULL = 2,
-
-    /** The device is operating at high speed (480MBit/s). */
-    LIBUSB_SPEED_HIGH = 3,
-
-    /** The device is operating at super speed (5000MBit/s). */
-    LIBUSB_SPEED_SUPER = 4,
-};
-
-/** \ingroup misc
- * Error codes. Most libusb functions return 0 on success or one of these
- * codes on failure.
- * You can call \ref libusb_error_name() to retrieve a string representation
- * of an error code.
- */
-enum libusb_error {
-	/** Success (no error) */
-	LIBUSB_SUCCESS = 0,
-
-	/** Input/output error */
-	LIBUSB_ERROR_IO = -1,
-
-	/** Invalid parameter */
-	LIBUSB_ERROR_INVALID_PARAM = -2,
-
-	/** Access denied (insufficient permissions) */
-	LIBUSB_ERROR_ACCESS = -3,
-
-	/** No such device (it may have been disconnected) */
-	LIBUSB_ERROR_NO_DEVICE = -4,
-
-	/** Entity not found */
-	LIBUSB_ERROR_NOT_FOUND = -5,
-
-	/** Resource busy */
-	LIBUSB_ERROR_BUSY = -6,
-
-	/** Operation timed out */
-	LIBUSB_ERROR_TIMEOUT = -7,
-
-	/** Overflow */
-	LIBUSB_ERROR_OVERFLOW = -8,
-
-	/** Pipe error */
-	LIBUSB_ERROR_PIPE = -9,
-
-	/** System call interrupted (perhaps due to signal) */
-	LIBUSB_ERROR_INTERRUPTED = -10,
-
-	/** Insufficient memory */
-	LIBUSB_ERROR_NO_MEM = -11,
-
-	/** Operation not supported or unimplemented on this platform */
-	LIBUSB_ERROR_NOT_SUPPORTED = -12,
-
-	/* NB! Remember to update libusb_error_name()
-	   when adding new error codes here. */
-
-	/** Other error */
-	LIBUSB_ERROR_OTHER = -99,
-};
-
-/** \ingroup asyncio
- * Transfer status codes */
-enum libusb_transfer_status {
-	/** Transfer completed without error. Note that this does not indicate
-	 * that the entire amount of requested data was transferred. */
-	LIBUSB_TRANSFER_COMPLETED,
-
-	/** Transfer failed */
-	LIBUSB_TRANSFER_ERROR,
-
-	/** Transfer timed out */
-	LIBUSB_TRANSFER_TIMED_OUT,
-
-	/** Transfer was cancelled */
-	LIBUSB_TRANSFER_CANCELLED,
-
-	/** For bulk/interrupt endpoints: halt condition detected (endpoint
-	 * stalled). For control endpoints: control request not supported. */
-	LIBUSB_TRANSFER_STALL,
-
-	/** Device was disconnected */
-	LIBUSB_TRANSFER_NO_DEVICE,
-
-	/** Device sent more data than requested */
-	LIBUSB_TRANSFER_OVERFLOW,
-};
-
-/** \ingroup asyncio
- * libusb_transfer.flags values */
-enum libusb_transfer_flags {
-	/** Report short frames as errors */
-	LIBUSB_TRANSFER_SHORT_NOT_OK = 1<<0,
-
-	/** Automatically free() transfer buffer during libusb_free_transfer() */
-	LIBUSB_TRANSFER_FREE_BUFFER = 1<<1,
-
-	/** Automatically call libusb_free_transfer() after callback returns.
-	 * If this flag is set, it is illegal to call libusb_free_transfer()
-	 * from your transfer callback, as this will result in a double-free
-	 * when this flag is acted upon. */
-	LIBUSB_TRANSFER_FREE_TRANSFER = 1<<2,
-
-	/** Terminate transfers that are a multiple of the endpoint's
-	 * wMaxPacketSize with an extra zero length packet. This is useful
-	 * when a device protocol mandates that each logical request is
-	 * terminated by an incomplete packet (i.e. the logical requests are
-	 * not separated by other means).
-	 *
-	 * This flag only affects host-to-device transfers to bulk and interrupt
-	 * endpoints. In other situations, it is ignored.
-	 *
-	 * This flag only affects transfers with a length that is a multiple of
-	 * the endpoint's wMaxPacketSize. On transfers of other lengths, this
-	 * flag has no effect. Therefore, if you are working with a device that
-	 * needs a ZLP whenever the end of the logical request falls on a packet
-	 * boundary, then it is sensible to set this flag on <em>every</em>
-	 * transfer (you do not have to worry about only setting it on transfers
-	 * that end on the boundary).
-	 *
-	 * This flag is currently only supported on Linux.
-	 * On other systems, libusb_submit_transfer() will return
-	 * LIBUSB_ERROR_NOT_SUPPORTED for every transfer where this flag is set.
-	 *
-	 * Available since libusb-1.0.9.
-	 */
-	LIBUSB_TRANSFER_ADD_ZERO_PACKET = 1 << 3,
-};
-
-/** \ingroup asyncio
- * Isochronous packet descriptor. */
-struct libusb_iso_packet_descriptor {
-	/** Length of data to request in this packet */
-	unsigned int length;
-
-	/** Amount of data that was actually transferred */
-	unsigned int actual_length;
-
-	/** Status code for this packet */
-	enum libusb_transfer_status status;
-};
-
-struct libusb_transfer;
-
-/** \ingroup asyncio
- * Asynchronous transfer callback function type. When submitting asynchronous
- * transfers, you pass a pointer to a callback function of this type via the
- * \ref libusb_transfer::callback "callback" member of the libusb_transfer
- * structure. libusb will call this function later, when the transfer has
- * completed or failed. See \ref asyncio for more information.
- * \param transfer The libusb_transfer struct the callback function is being
- * notified about.
- */
-typedef void (LIBUSB_CALL *libusb_transfer_cb_fn)(struct libusb_transfer *transfer);
-
-/** \ingroup asyncio
- * The generic USB transfer structure. The user populates this structure and
- * then submits it in order to request a transfer. After the transfer has
- * completed, the library populates the transfer with the results and passes
- * it back to the user.
- */
-struct libusb_transfer {
-	/** Handle of the device that this transfer will be submitted to */
-	libusb_device_handle *dev_handle;
-
-	/** A bitwise OR combination of \ref libusb_transfer_flags. */
-	uint8_t flags;
-
-	/** Address of the endpoint where this transfer will be sent. */
-	unsigned char endpoint;
-
-	/** Type of the endpoint from \ref libusb_transfer_type */
-	unsigned char type;
-
-	/** Timeout for this transfer in millseconds. A value of 0 indicates no
-	 * timeout. */
-	unsigned int timeout;
-
-	/** The status of the transfer. Read-only, and only for use within
-	 * transfer callback function.
-	 *
-	 * If this is an isochronous transfer, this field may read COMPLETED even
-	 * if there were errors in the frames. Use the
-	 * \ref libusb_iso_packet_descriptor::status "status" field in each packet
-	 * to determine if errors occurred. */
-	enum libusb_transfer_status status;
-
-	/** Length of the data buffer */
-	int length;
-
-	/** Actual length of data that was transferred. Read-only, and only for
-	 * use within transfer callback function. Not valid for isochronous
-	 * endpoint transfers. */
-	int actual_length;
-
-	/** Callback function. This will be invoked when the transfer completes,
-	 * fails, or is cancelled. */
-	libusb_transfer_cb_fn callback;
-
-	/** User context data to pass to the callback function. */
-	void *user_data;
-
-	/** Data buffer */
-	unsigned char *buffer;
-
-	/** Number of isochronous packets. Only used for I/O with isochronous
-	 * endpoints. */
-	int num_iso_packets;
-
-	/** Isochronous packet descriptors, for isochronous transfers only. */
-	struct libusb_iso_packet_descriptor iso_packet_desc
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-	[] /* valid C99 code */
-#else
-	[0] /* non-standard, but usually working code */
-#endif
-	;
-};
-
-/** \ingroup misc
- * Capabilities supported by this instance of libusb. Test if the loaded
- * library supports a given capability by calling
- * \ref libusb_has_capability().
- */
-enum libusb_capability {
-	/** The libusb_has_capability() API is available. */
-	LIBUSB_CAP_HAS_CAPABILITY = 0,
-};
-
-int LIBUSB_CALL libusb_init(libusb_context **ctx);
-void LIBUSB_CALL libusb_exit(libusb_context *ctx);
-void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
-const struct libusb_version * LIBUSB_CALL libusb_get_version(void);
-int LIBUSB_CALL libusb_has_capability(uint32_t capability);
-const char * LIBUSB_CALL libusb_error_name(int errcode);
-
-ssize_t LIBUSB_CALL libusb_get_device_list(libusb_context *ctx,
-	libusb_device ***list);
-void LIBUSB_CALL libusb_free_device_list(libusb_device **list,
-	int unref_devices);
-libusb_device * LIBUSB_CALL libusb_ref_device(libusb_device *dev);
-void LIBUSB_CALL libusb_unref_device(libusb_device *dev);
-
-int LIBUSB_CALL libusb_get_configuration(libusb_device_handle *dev,
-	int *config);
-int LIBUSB_CALL libusb_get_device_descriptor(libusb_device *dev,
-	struct libusb_device_descriptor *desc);
-int LIBUSB_CALL libusb_get_active_config_descriptor(libusb_device *dev,
-	struct libusb_config_descriptor **config);
-int LIBUSB_CALL libusb_get_config_descriptor(libusb_device *dev,
-	uint8_t config_index, struct libusb_config_descriptor **config);
-int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev,
-	uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
-void LIBUSB_CALL libusb_free_config_descriptor(
-	struct libusb_config_descriptor *config);
-uint8_t LIBUSB_CALL libusb_get_bus_number(libusb_device *dev);
-uint8_t LIBUSB_CALL libusb_get_device_address(libusb_device *dev);
-int LIBUSB_CALL libusb_get_device_speed(libusb_device *dev);
-int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev,
-	unsigned char endpoint);
-int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev,
-	unsigned char endpoint);
-
-int LIBUSB_CALL libusb_open(libusb_device *dev, libusb_device_handle **handle);
-void LIBUSB_CALL libusb_close(libusb_device_handle *dev_handle);
-libusb_device * LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle);
-
-int LIBUSB_CALL libusb_set_configuration(libusb_device_handle *dev,
-	int configuration);
-int LIBUSB_CALL libusb_claim_interface(libusb_device_handle *dev,
-	int interface_number);
-int LIBUSB_CALL libusb_release_interface(libusb_device_handle *dev,
-	int interface_number);
-
-libusb_device_handle * LIBUSB_CALL libusb_open_device_with_vid_pid(
-	libusb_context *ctx, uint16_t vendor_id, uint16_t product_id);
-
-int LIBUSB_CALL libusb_set_interface_alt_setting(libusb_device_handle *dev,
-	int interface_number, int alternate_setting);
-int LIBUSB_CALL libusb_clear_halt(libusb_device_handle *dev,
-	unsigned char endpoint);
-int LIBUSB_CALL libusb_reset_device(libusb_device_handle *dev);
-
-int LIBUSB_CALL libusb_kernel_driver_active(libusb_device_handle *dev,
-	int interface_number);
-int LIBUSB_CALL libusb_detach_kernel_driver(libusb_device_handle *dev,
-	int interface_number);
-int LIBUSB_CALL libusb_attach_kernel_driver(libusb_device_handle *dev,
-	int interface_number);
-
-/* async I/O */
-
-/** \ingroup asyncio
- * Get the data section of a control transfer. This convenience function is here
- * to remind you that the data does not start until 8 bytes into the actual
- * buffer, as the setup packet comes first.
- *
- * Calling this function only makes sense from a transfer callback function,
- * or situations where you have already allocated a suitably sized buffer at
- * transfer->buffer.
- *
- * \param transfer a transfer
- * \returns pointer to the first byte of the data section
- */
-static inline unsigned char *libusb_control_transfer_get_data(
-	struct libusb_transfer *transfer)
-{
-	return transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
-}
-
-/** \ingroup asyncio
- * Get the control setup packet of a control transfer. This convenience
- * function is here to remind you that the control setup occupies the first
- * 8 bytes of the transfer data buffer.
- *
- * Calling this function only makes sense from a transfer callback function,
- * or situations where you have already allocated a suitably sized buffer at
- * transfer->buffer.
- *
- * \param transfer a transfer
- * \returns a casted pointer to the start of the transfer data buffer
- */
-static inline struct libusb_control_setup *libusb_control_transfer_get_setup(
-	struct libusb_transfer *transfer)
-{
-	return (struct libusb_control_setup *) transfer->buffer;
-}
-
-/** \ingroup asyncio
- * Helper function to populate the setup packet (first 8 bytes of the data
- * buffer) for a control transfer. The wIndex, wValue and wLength values should
- * be given in host-endian byte order.
- *
- * \param buffer buffer to output the setup packet into
- * \param bmRequestType see the
- * \ref libusb_control_setup::bmRequestType "bmRequestType" field of
- * \ref libusb_control_setup
- * \param bRequest see the
- * \ref libusb_control_setup::bRequest "bRequest" field of
- * \ref libusb_control_setup
- * \param wValue see the
- * \ref libusb_control_setup::wValue "wValue" field of
- * \ref libusb_control_setup
- * \param wIndex see the
- * \ref libusb_control_setup::wIndex "wIndex" field of
- * \ref libusb_control_setup
- * \param wLength see the
- * \ref libusb_control_setup::wLength "wLength" field of
- * \ref libusb_control_setup
- */
-static inline void libusb_fill_control_setup(unsigned char *buffer,
-	uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
-	uint16_t wLength)
-{
-	struct libusb_control_setup *setup = (struct libusb_control_setup *) buffer;
-	setup->bmRequestType = bmRequestType;
-	setup->bRequest = bRequest;
-	setup->wValue = libusb_cpu_to_le16(wValue);
-	setup->wIndex = libusb_cpu_to_le16(wIndex);
-	setup->wLength = libusb_cpu_to_le16(wLength);
-}
-
-struct libusb_transfer * LIBUSB_CALL libusb_alloc_transfer(int iso_packets);
-int LIBUSB_CALL libusb_submit_transfer(struct libusb_transfer *transfer);
-int LIBUSB_CALL libusb_cancel_transfer(struct libusb_transfer *transfer);
-void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer);
-
-/** \ingroup asyncio
- * Helper function to populate the required \ref libusb_transfer fields
- * for a control transfer.
- *
- * If you pass a transfer buffer to this function, the first 8 bytes will
- * be interpreted as a control setup packet, and the wLength field will be
- * used to automatically populate the \ref libusb_transfer::length "length"
- * field of the transfer. Therefore the recommended approach is:
- * -# Allocate a suitably sized data buffer (including space for control setup)
- * -# Call libusb_fill_control_setup()
- * -# If this is a host-to-device transfer with a data stage, put the data
- *    in place after the setup packet
- * -# Call this function
- * -# Call libusb_submit_transfer()
- *
- * It is also legal to pass a NULL buffer to this function, in which case this
- * function will not attempt to populate the length field. Remember that you
- * must then populate the buffer and length fields later.
- *
- * \param transfer the transfer to populate
- * \param dev_handle handle of the device that will handle the transfer
- * \param buffer data buffer. If provided, this function will interpret the
- * first 8 bytes as a setup packet and infer the transfer length from that.
- * \param callback callback function to be invoked on transfer completion
- * \param user_data user data to pass to callback function
- * \param timeout timeout for the transfer in milliseconds
- */
-static inline void libusb_fill_control_transfer(
-	struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
-	unsigned char *buffer, libusb_transfer_cb_fn callback, void *user_data,
-	unsigned int timeout)
-{
-	struct libusb_control_setup *setup = (struct libusb_control_setup *) buffer;
-	transfer->dev_handle = dev_handle;
-	transfer->endpoint = 0;
-	transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL;
-	transfer->timeout = timeout;
-	transfer->buffer = buffer;
-	if (setup)
-		transfer->length = LIBUSB_CONTROL_SETUP_SIZE
-			+ libusb_le16_to_cpu(setup->wLength);
-	transfer->user_data = user_data;
-	transfer->callback = callback;
-}
-
-/** \ingroup asyncio
- * Helper function to populate the required \ref libusb_transfer fields
- * for a bulk transfer.
- *
- * \param transfer the transfer to populate
- * \param dev_handle handle of the device that will handle the transfer
- * \param endpoint address of the endpoint where this transfer will be sent
- * \param buffer data buffer
- * \param length length of data buffer
- * \param callback callback function to be invoked on transfer completion
- * \param user_data user data to pass to callback function
- * \param timeout timeout for the transfer in milliseconds
- */
-static inline void libusb_fill_bulk_transfer(struct libusb_transfer *transfer,
-	libusb_device_handle *dev_handle, unsigned char endpoint,
-	unsigned char *buffer, int length, libusb_transfer_cb_fn callback,
-	void *user_data, unsigned int timeout)
-{
-	transfer->dev_handle = dev_handle;
-	transfer->endpoint = endpoint;
-	transfer->type = LIBUSB_TRANSFER_TYPE_BULK;
-	transfer->timeout = timeout;
-	transfer->buffer = buffer;
-	transfer->length = length;
-	transfer->user_data = user_data;
-	transfer->callback = callback;
-}
-
-/** \ingroup asyncio
- * Helper function to populate the required \ref libusb_transfer fields
- * for an interrupt transfer.
- *
- * \param transfer the transfer to populate
- * \param dev_handle handle of the device that will handle the transfer
- * \param endpoint address of the endpoint where this transfer will be sent
- * \param buffer data buffer
- * \param length length of data buffer
- * \param callback callback function to be invoked on transfer completion
- * \param user_data user data to pass to callback function
- * \param timeout timeout for the transfer in milliseconds
- */
-static inline void libusb_fill_interrupt_transfer(
-	struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
-	unsigned char endpoint, unsigned char *buffer, int length,
-	libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout)
-{
-	transfer->dev_handle = dev_handle;
-	transfer->endpoint = endpoint;
-	transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT;
-	transfer->timeout = timeout;
-	transfer->buffer = buffer;
-	transfer->length = length;
-	transfer->user_data = user_data;
-	transfer->callback = callback;
-}
-
-/** \ingroup asyncio
- * Helper function to populate the required \ref libusb_transfer fields
- * for an isochronous transfer.
- *
- * \param transfer the transfer to populate
- * \param dev_handle handle of the device that will handle the transfer
- * \param endpoint address of the endpoint where this transfer will be sent
- * \param buffer data buffer
- * \param length length of data buffer
- * \param num_iso_packets the number of isochronous packets
- * \param callback callback function to be invoked on transfer completion
- * \param user_data user data to pass to callback function
- * \param timeout timeout for the transfer in milliseconds
- */
-static inline void libusb_fill_iso_transfer(struct libusb_transfer *transfer,
-	libusb_device_handle *dev_handle, unsigned char endpoint,
-	unsigned char *buffer, int length, int num_iso_packets,
-	libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout)
-{
-	transfer->dev_handle = dev_handle;
-	transfer->endpoint = endpoint;
-	transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS;
-	transfer->timeout = timeout;
-	transfer->buffer = buffer;
-	transfer->length = length;
-	transfer->num_iso_packets = num_iso_packets;
-	transfer->user_data = user_data;
-	transfer->callback = callback;
-}
-
-/** \ingroup asyncio
- * Convenience function to set the length of all packets in an isochronous
- * transfer, based on the num_iso_packets field in the transfer structure.
- *
- * \param transfer a transfer
- * \param length the length to set in each isochronous packet descriptor
- * \see libusb_get_max_packet_size()
- */
-static inline void libusb_set_iso_packet_lengths(
-	struct libusb_transfer *transfer, unsigned int length)
-{
-	int i;
-	for (i = 0; i < transfer->num_iso_packets; i++)
-		transfer->iso_packet_desc[i].length = length;
-}
-
-/** \ingroup asyncio
- * Convenience function to locate the position of an isochronous packet
- * within the buffer of an isochronous transfer.
- *
- * This is a thorough function which loops through all preceding packets,
- * accumulating their lengths to find the position of the specified packet.
- * Typically you will assign equal lengths to each packet in the transfer,
- * and hence the above method is sub-optimal. You may wish to use
- * libusb_get_iso_packet_buffer_simple() instead.
- *
- * \param transfer a transfer
- * \param packet the packet to return the address of
- * \returns the base address of the packet buffer inside the transfer buffer,
- * or NULL if the packet does not exist.
- * \see libusb_get_iso_packet_buffer_simple()
- */
-static inline unsigned char *libusb_get_iso_packet_buffer(
-	struct libusb_transfer *transfer, unsigned int packet)
-{
-	int i;
-	size_t offset = 0;
-	int _packet;
-
-	/* oops..slight bug in the API. packet is an unsigned int, but we use
-	 * signed integers almost everywhere else. range-check and convert to
-	 * signed to avoid compiler warnings. FIXME for libusb-2. */
-	if (packet > INT_MAX)
-		return NULL;
-	_packet = packet;
-
-	if (_packet >= transfer->num_iso_packets)
-		return NULL;
-
-	for (i = 0; i < _packet; i++)
-		offset += transfer->iso_packet_desc[i].length;
-
-	return transfer->buffer + offset;
-}
-
-/** \ingroup asyncio
- * Convenience function to locate the position of an isochronous packet
- * within the buffer of an isochronous transfer, for transfers where each
- * packet is of identical size.
- *
- * This function relies on the assumption that every packet within the transfer
- * is of identical size to the first packet. Calculating the location of
- * the packet buffer is then just a simple calculation:
- * <tt>buffer + (packet_size * packet)</tt>
- *
- * Do not use this function on transfers other than those that have identical
- * packet lengths for each packet.
- *
- * \param transfer a transfer
- * \param packet the packet to return the address of
- * \returns the base address of the packet buffer inside the transfer buffer,
- * or NULL if the packet does not exist.
- * \see libusb_get_iso_packet_buffer()
- */
-static inline unsigned char *libusb_get_iso_packet_buffer_simple(
-	struct libusb_transfer *transfer, unsigned int packet)
-{
-	int _packet;
-
-	/* oops..slight bug in the API. packet is an unsigned int, but we use
-	 * signed integers almost everywhere else. range-check and convert to
-	 * signed to avoid compiler warnings. FIXME for libusb-2. */
-	if (packet > INT_MAX)
-		return NULL;
-	_packet = packet;
-
-	if (_packet >= transfer->num_iso_packets)
-		return NULL;
-
-	return transfer->buffer + (transfer->iso_packet_desc[0].length * _packet);
-}
-
-/* sync I/O */
-
-int LIBUSB_CALL libusb_control_transfer(libusb_device_handle *dev_handle,
-	uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
-	unsigned char *data, uint16_t wLength, unsigned int timeout);
-
-int LIBUSB_CALL libusb_bulk_transfer(libusb_device_handle *dev_handle,
-	unsigned char endpoint, unsigned char *data, int length,
-	int *actual_length, unsigned int timeout);
-
-int LIBUSB_CALL libusb_interrupt_transfer(libusb_device_handle *dev_handle,
-	unsigned char endpoint, unsigned char *data, int length,
-	int *actual_length, unsigned int timeout);
-
-/** \ingroup desc
- * Retrieve a descriptor from the default control pipe.
- * This is a convenience function which formulates the appropriate control
- * message to retrieve the descriptor.
- *
- * \param dev a device handle
- * \param desc_type the descriptor type, see \ref libusb_descriptor_type
- * \param desc_index the index of the descriptor to retrieve
- * \param data output buffer for descriptor
- * \param length size of data buffer
- * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
- */
-static inline int libusb_get_descriptor(libusb_device_handle *dev,
-	uint8_t desc_type, uint8_t desc_index, unsigned char *data, int length)
-{
-	return libusb_control_transfer(dev, LIBUSB_ENDPOINT_IN,
-		LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data,
-		(uint16_t) length, 1000);
-}
-
-/** \ingroup desc
- * Retrieve a descriptor from a device.
- * This is a convenience function which formulates the appropriate control
- * message to retrieve the descriptor. The string returned is Unicode, as
- * detailed in the USB specifications.
- *
- * \param dev a device handle
- * \param desc_index the index of the descriptor to retrieve
- * \param langid the language ID for the string descriptor
- * \param data output buffer for descriptor
- * \param length size of data buffer
- * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
- * \see libusb_get_string_descriptor_ascii()
- */
-static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
-	uint8_t desc_index, uint16_t langid, unsigned char *data, int length)
-{
-	return libusb_control_transfer(dev, LIBUSB_ENDPOINT_IN,
-		LIBUSB_REQUEST_GET_DESCRIPTOR, (uint16_t)((LIBUSB_DT_STRING << 8) | desc_index),
-		langid, data, (uint16_t) length, 1000);
-}
-
-int LIBUSB_CALL libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
-	uint8_t desc_index, unsigned char *data, int length);
-
-/* polling and timeouts */
-
-int LIBUSB_CALL libusb_try_lock_events(libusb_context *ctx);
-void LIBUSB_CALL libusb_lock_events(libusb_context *ctx);
-void LIBUSB_CALL libusb_unlock_events(libusb_context *ctx);
-int LIBUSB_CALL libusb_event_handling_ok(libusb_context *ctx);
-int LIBUSB_CALL libusb_event_handler_active(libusb_context *ctx);
-void LIBUSB_CALL libusb_lock_event_waiters(libusb_context *ctx);
-void LIBUSB_CALL libusb_unlock_event_waiters(libusb_context *ctx);
-int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
-
-int LIBUSB_CALL libusb_handle_events_timeout(libusb_context *ctx,
-	struct timeval *tv);
-int LIBUSB_CALL libusb_handle_events_timeout_completed(libusb_context *ctx,
-	struct timeval *tv, int *completed);
-int LIBUSB_CALL libusb_handle_events(libusb_context *ctx);
-int LIBUSB_CALL libusb_handle_events_completed(libusb_context *ctx, int *completed);
-int LIBUSB_CALL libusb_handle_events_locked(libusb_context *ctx,
-	struct timeval *tv);
-int LIBUSB_CALL libusb_pollfds_handle_timeouts(libusb_context *ctx);
-int LIBUSB_CALL libusb_get_next_timeout(libusb_context *ctx,
-	struct timeval *tv);
-
-/** \ingroup poll
- * File descriptor for polling
- */
-struct libusb_pollfd {
-	/** Numeric file descriptor */
-	int fd;
-
-	/** Event flags to poll for from <poll.h>. POLLIN indicates that you
-	 * should monitor this file descriptor for becoming ready to read from,
-	 * and POLLOUT indicates that you should monitor this file descriptor for
-	 * nonblocking write readiness. */
-	short events;
-};
-
-/** \ingroup poll
- * Callback function, invoked when a new file descriptor should be added
- * to the set of file descriptors monitored for events.
- * \param fd the new file descriptor
- * \param events events to monitor for, see \ref libusb_pollfd for a
- * description
- * \param user_data User data pointer specified in
- * libusb_set_pollfd_notifiers() call
- * \see libusb_set_pollfd_notifiers()
- */
-typedef void (LIBUSB_CALL *libusb_pollfd_added_cb)(int fd, short events,
-	void *user_data);
-
-/** \ingroup poll
- * Callback function, invoked when a file descriptor should be removed from
- * the set of file descriptors being monitored for events. After returning
- * from this callback, do not use that file descriptor again.
- * \param fd the file descriptor to stop monitoring
- * \param user_data User data pointer specified in
- * libusb_set_pollfd_notifiers() call
- * \see libusb_set_pollfd_notifiers()
- */
-typedef void (LIBUSB_CALL *libusb_pollfd_removed_cb)(int fd, void *user_data);
-
-const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
-	libusb_context *ctx);
-void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
-	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
-	void *user_data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Externals/libusb/libusb/Makefile.am b/Externals/libusb/libusb/Makefile.am
new file mode 100644
index 0000000000..80e3705e52
--- /dev/null
+++ b/Externals/libusb/libusb/Makefile.am
@@ -0,0 +1,75 @@
+all: libusb-1.0.la libusb-1.0.dll
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+lib_LTLIBRARIES = libusb-1.0.la
+
+POSIX_POLL_SRC = os/poll_posix.c
+LINUX_USBFS_SRC = os/linux_usbfs.c
+DARWIN_USB_SRC = os/darwin_usb.c
+OPENBSD_USB_SRC = os/openbsd_usb.c
+NETBSD_USB_SRC = os/netbsd_usb.c
+WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def
+WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h
+
+EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
+	$(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \
+	$(POSIX_POLL_SRC) \
+	os/threads_posix.c os/threads_windows.c \
+	os/linux_udev.c os/linux_netlink.c
+
+if OS_LINUX
+
+if USE_UDEV
+OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
+	os/linux_udev.c
+else
+OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
+	os/linux_netlink.c
+endif
+
+endif
+
+if OS_DARWIN
+OS_SRC = $(DARWIN_USB_SRC) $(POSIX_POLL_SRC)
+AM_CFLAGS_EXT = -no-cpp-precomp
+endif
+
+if OS_OPENBSD
+OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC)
+endif
+
+if OS_NETBSD
+OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC)
+endif
+
+if OS_WINDOWS
+OS_SRC = $(WINDOWS_USB_SRC)
+
+.rc.lo:
+	$(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@
+
+libusb-1.0.rc: version.h version_nano.h
+endif
+
+libusb-1.0.dll: libusb-1.0.def libusb-1.0.la
+if CREATE_IMPORT_LIB
+# Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged
+	$(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a
+endif
+
+if THREADS_POSIX
+THREADS_SRC = os/threads_posix.h os/threads_posix.c
+else
+THREADS_SRC = os/threads_windows.h os/threads_windows.c
+endif
+
+libusb_1_0_la_CFLAGS = $(AM_CFLAGS)
+libusb_1_0_la_LDFLAGS = $(LTLDFLAGS)
+libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \
+	os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h os/windows_common.h \
+	hotplug.h hotplug.c $(THREADS_SRC) $(OS_SRC) \
+	os/poll_posix.h os/poll_windows.h
+
+hdrdir = $(includedir)/libusb-1.0
+hdr_HEADERS = libusb.h
diff --git a/Externals/libusb/libusb/Makefile.in b/Externals/libusb/libusb/Makefile.in
new file mode 100644
index 0000000000..0fcff7781a
--- /dev/null
+++ b/Externals/libusb/libusb/Makefile.in
@@ -0,0 +1,914 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = libusb
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(hdr_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/libusb/version.h $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(hdrdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libusb_1_0_la_LIBADD =
+am__libusb_1_0_la_SOURCES_DIST = libusbi.h core.c descriptor.c io.c \
+	strerror.c sync.c os/linux_usbfs.h os/darwin_usb.h \
+	os/windows_usb.h os/windows_common.h hotplug.h hotplug.c \
+	os/threads_windows.h os/threads_windows.c os/threads_posix.h \
+	os/threads_posix.c os/darwin_usb.c os/poll_posix.c \
+	os/linux_usbfs.c os/linux_netlink.c os/linux_udev.c \
+	os/netbsd_usb.c os/openbsd_usb.c os/poll_windows.c \
+	os/windows_usb.c libusb-1.0.rc libusb-1.0.def os/poll_posix.h \
+	os/poll_windows.h
+am__dirstamp = $(am__leading_dot)dirstamp
+@THREADS_POSIX_FALSE@am__objects_1 =  \
+@THREADS_POSIX_FALSE@	os/libusb_1_0_la-threads_windows.lo
+@THREADS_POSIX_TRUE@am__objects_1 = os/libusb_1_0_la-threads_posix.lo
+am__objects_2 = os/libusb_1_0_la-darwin_usb.lo
+am__objects_3 = os/libusb_1_0_la-poll_posix.lo
+am__objects_4 = os/libusb_1_0_la-linux_usbfs.lo
+am__objects_5 = os/libusb_1_0_la-netbsd_usb.lo
+am__objects_6 = os/libusb_1_0_la-openbsd_usb.lo
+am__objects_7 = os/libusb_1_0_la-poll_windows.lo \
+	os/libusb_1_0_la-windows_usb.lo libusb-1.0.lo
+@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_WINDOWS_TRUE@am__objects_8 = $(am__objects_7)
+@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@am__objects_8 = $(am__objects_6) \
+@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@	$(am__objects_3)
+@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@am__objects_8 = $(am__objects_5) \
+@OS_DARWIN_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@	$(am__objects_3)
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@am__objects_8 = $(am__objects_4) \
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@	$(am__objects_3) \
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@	os/libusb_1_0_la-linux_netlink.lo
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@am__objects_8 = $(am__objects_4) \
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@	$(am__objects_3) \
+@OS_DARWIN_FALSE@@OS_LINUX_TRUE@@USE_UDEV_TRUE@	os/libusb_1_0_la-linux_udev.lo
+@OS_DARWIN_TRUE@am__objects_8 = $(am__objects_2) $(am__objects_3)
+am_libusb_1_0_la_OBJECTS = libusb_1_0_la-core.lo \
+	libusb_1_0_la-descriptor.lo libusb_1_0_la-io.lo \
+	libusb_1_0_la-strerror.lo libusb_1_0_la-sync.lo \
+	libusb_1_0_la-hotplug.lo $(am__objects_1) $(am__objects_8)
+libusb_1_0_la_OBJECTS = $(am_libusb_1_0_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libusb_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libusb_1_0_la_CFLAGS) \
+	$(CFLAGS) $(libusb_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libusb_1_0_la_SOURCES)
+DIST_SOURCES = $(am__libusb_1_0_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(hdr_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLDFLAGS = @LTLDFLAGS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS_DARWIN = @OS_DARWIN@
+OS_LINUX = @OS_LINUX@
+OS_NETBSD = @OS_NETBSD@
+OS_OPENBSD = @OS_OPENBSD@
+OS_WINDOWS = @OS_WINDOWS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+RC = @RC@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_UDEV = @USE_UDEV@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = subdir-objects
+lib_LTLIBRARIES = libusb-1.0.la
+POSIX_POLL_SRC = os/poll_posix.c
+LINUX_USBFS_SRC = os/linux_usbfs.c
+DARWIN_USB_SRC = os/darwin_usb.c
+OPENBSD_USB_SRC = os/openbsd_usb.c
+NETBSD_USB_SRC = os/netbsd_usb.c
+WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def
+WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h
+EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
+	$(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \
+	$(POSIX_POLL_SRC) \
+	os/threads_posix.c os/threads_windows.c \
+	os/linux_udev.c os/linux_netlink.c
+
+@OS_DARWIN_TRUE@OS_SRC = $(DARWIN_USB_SRC) $(POSIX_POLL_SRC)
+@OS_LINUX_TRUE@@USE_UDEV_FALSE@OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
+@OS_LINUX_TRUE@@USE_UDEV_FALSE@	os/linux_netlink.c
+
+@OS_LINUX_TRUE@@USE_UDEV_TRUE@OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
+@OS_LINUX_TRUE@@USE_UDEV_TRUE@	os/linux_udev.c
+
+@OS_NETBSD_TRUE@OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC)
+@OS_OPENBSD_TRUE@OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC)
+@OS_WINDOWS_TRUE@OS_SRC = $(WINDOWS_USB_SRC)
+@OS_DARWIN_TRUE@AM_CFLAGS_EXT = -no-cpp-precomp
+@THREADS_POSIX_FALSE@THREADS_SRC = os/threads_windows.h os/threads_windows.c
+@THREADS_POSIX_TRUE@THREADS_SRC = os/threads_posix.h os/threads_posix.c
+libusb_1_0_la_CFLAGS = $(AM_CFLAGS)
+libusb_1_0_la_LDFLAGS = $(LTLDFLAGS)
+libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \
+	os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h os/windows_common.h \
+	hotplug.h hotplug.c $(THREADS_SRC) $(OS_SRC) \
+	os/poll_posix.h os/poll_windows.h
+
+hdrdir = $(includedir)/libusb-1.0
+hdr_HEADERS = libusb.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libusb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libusb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+os/$(am__dirstamp):
+	@$(MKDIR_P) os
+	@: > os/$(am__dirstamp)
+os/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) os/$(DEPDIR)
+	@: > os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-threads_windows.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-threads_posix.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-darwin_usb.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-poll_posix.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-linux_usbfs.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-linux_netlink.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-linux_udev.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-netbsd_usb.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-openbsd_usb.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-poll_windows.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+os/libusb_1_0_la-windows_usb.lo: os/$(am__dirstamp) \
+	os/$(DEPDIR)/$(am__dirstamp)
+
+libusb-1.0.la: $(libusb_1_0_la_OBJECTS) $(libusb_1_0_la_DEPENDENCIES) $(EXTRA_libusb_1_0_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libusb_1_0_la_LINK) -rpath $(libdir) $(libusb_1_0_la_OBJECTS) $(libusb_1_0_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f os/*.$(OBJEXT)
+	-rm -f os/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-descriptor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-hotplug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-strerror.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb_1_0_la-sync.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_udev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-poll_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-poll_windows.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-threads_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-threads_windows.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/libusb_1_0_la-windows_usb.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libusb_1_0_la-core.lo: core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-core.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-core.Tpo -c -o libusb_1_0_la-core.lo `test -f 'core.c' || echo '$(srcdir)/'`core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-core.Tpo $(DEPDIR)/libusb_1_0_la-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='core.c' object='libusb_1_0_la-core.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-core.lo `test -f 'core.c' || echo '$(srcdir)/'`core.c
+
+libusb_1_0_la-descriptor.lo: descriptor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-descriptor.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-descriptor.Tpo -c -o libusb_1_0_la-descriptor.lo `test -f 'descriptor.c' || echo '$(srcdir)/'`descriptor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-descriptor.Tpo $(DEPDIR)/libusb_1_0_la-descriptor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='descriptor.c' object='libusb_1_0_la-descriptor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-descriptor.lo `test -f 'descriptor.c' || echo '$(srcdir)/'`descriptor.c
+
+libusb_1_0_la-io.lo: io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-io.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-io.Tpo -c -o libusb_1_0_la-io.lo `test -f 'io.c' || echo '$(srcdir)/'`io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-io.Tpo $(DEPDIR)/libusb_1_0_la-io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='io.c' object='libusb_1_0_la-io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-io.lo `test -f 'io.c' || echo '$(srcdir)/'`io.c
+
+libusb_1_0_la-strerror.lo: strerror.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-strerror.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-strerror.Tpo -c -o libusb_1_0_la-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-strerror.Tpo $(DEPDIR)/libusb_1_0_la-strerror.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strerror.c' object='libusb_1_0_la-strerror.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-strerror.lo `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c
+
+libusb_1_0_la-sync.lo: sync.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-sync.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-sync.Tpo -c -o libusb_1_0_la-sync.lo `test -f 'sync.c' || echo '$(srcdir)/'`sync.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-sync.Tpo $(DEPDIR)/libusb_1_0_la-sync.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sync.c' object='libusb_1_0_la-sync.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-sync.lo `test -f 'sync.c' || echo '$(srcdir)/'`sync.c
+
+libusb_1_0_la-hotplug.lo: hotplug.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT libusb_1_0_la-hotplug.lo -MD -MP -MF $(DEPDIR)/libusb_1_0_la-hotplug.Tpo -c -o libusb_1_0_la-hotplug.lo `test -f 'hotplug.c' || echo '$(srcdir)/'`hotplug.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libusb_1_0_la-hotplug.Tpo $(DEPDIR)/libusb_1_0_la-hotplug.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotplug.c' object='libusb_1_0_la-hotplug.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o libusb_1_0_la-hotplug.lo `test -f 'hotplug.c' || echo '$(srcdir)/'`hotplug.c
+
+os/libusb_1_0_la-threads_windows.lo: os/threads_windows.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-threads_windows.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-threads_windows.Tpo -c -o os/libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-threads_windows.Tpo os/$(DEPDIR)/libusb_1_0_la-threads_windows.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/threads_windows.c' object='os/libusb_1_0_la-threads_windows.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-threads_windows.lo `test -f 'os/threads_windows.c' || echo '$(srcdir)/'`os/threads_windows.c
+
+os/libusb_1_0_la-threads_posix.lo: os/threads_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-threads_posix.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-threads_posix.Tpo -c -o os/libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-threads_posix.Tpo os/$(DEPDIR)/libusb_1_0_la-threads_posix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/threads_posix.c' object='os/libusb_1_0_la-threads_posix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-threads_posix.lo `test -f 'os/threads_posix.c' || echo '$(srcdir)/'`os/threads_posix.c
+
+os/libusb_1_0_la-darwin_usb.lo: os/darwin_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-darwin_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo -c -o os/libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-darwin_usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/darwin_usb.c' object='os/libusb_1_0_la-darwin_usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-darwin_usb.lo `test -f 'os/darwin_usb.c' || echo '$(srcdir)/'`os/darwin_usb.c
+
+os/libusb_1_0_la-poll_posix.lo: os/poll_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-poll_posix.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-poll_posix.Tpo -c -o os/libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-poll_posix.Tpo os/$(DEPDIR)/libusb_1_0_la-poll_posix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/poll_posix.c' object='os/libusb_1_0_la-poll_posix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-poll_posix.lo `test -f 'os/poll_posix.c' || echo '$(srcdir)/'`os/poll_posix.c
+
+os/libusb_1_0_la-linux_usbfs.lo: os/linux_usbfs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_usbfs.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo -c -o os/libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_usbfs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/linux_usbfs.c' object='os/libusb_1_0_la-linux_usbfs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_usbfs.lo `test -f 'os/linux_usbfs.c' || echo '$(srcdir)/'`os/linux_usbfs.c
+
+os/libusb_1_0_la-linux_netlink.lo: os/linux_netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_netlink.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo -c -o os/libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_netlink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/linux_netlink.c' object='os/libusb_1_0_la-linux_netlink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_netlink.lo `test -f 'os/linux_netlink.c' || echo '$(srcdir)/'`os/linux_netlink.c
+
+os/libusb_1_0_la-linux_udev.lo: os/linux_udev.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-linux_udev.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-linux_udev.Tpo -c -o os/libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-linux_udev.Tpo os/$(DEPDIR)/libusb_1_0_la-linux_udev.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/linux_udev.c' object='os/libusb_1_0_la-linux_udev.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-linux_udev.lo `test -f 'os/linux_udev.c' || echo '$(srcdir)/'`os/linux_udev.c
+
+os/libusb_1_0_la-netbsd_usb.lo: os/netbsd_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-netbsd_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Tpo -c -o os/libusb_1_0_la-netbsd_usb.lo `test -f 'os/netbsd_usb.c' || echo '$(srcdir)/'`os/netbsd_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-netbsd_usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/netbsd_usb.c' object='os/libusb_1_0_la-netbsd_usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-netbsd_usb.lo `test -f 'os/netbsd_usb.c' || echo '$(srcdir)/'`os/netbsd_usb.c
+
+os/libusb_1_0_la-openbsd_usb.lo: os/openbsd_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-openbsd_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo -c -o os/libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-openbsd_usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/openbsd_usb.c' object='os/libusb_1_0_la-openbsd_usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-openbsd_usb.lo `test -f 'os/openbsd_usb.c' || echo '$(srcdir)/'`os/openbsd_usb.c
+
+os/libusb_1_0_la-poll_windows.lo: os/poll_windows.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-poll_windows.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-poll_windows.Tpo -c -o os/libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-poll_windows.Tpo os/$(DEPDIR)/libusb_1_0_la-poll_windows.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/poll_windows.c' object='os/libusb_1_0_la-poll_windows.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-poll_windows.lo `test -f 'os/poll_windows.c' || echo '$(srcdir)/'`os/poll_windows.c
+
+os/libusb_1_0_la-windows_usb.lo: os/windows_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -MT os/libusb_1_0_la-windows_usb.lo -MD -MP -MF os/$(DEPDIR)/libusb_1_0_la-windows_usb.Tpo -c -o os/libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) os/$(DEPDIR)/libusb_1_0_la-windows_usb.Tpo os/$(DEPDIR)/libusb_1_0_la-windows_usb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='os/windows_usb.c' object='os/libusb_1_0_la-windows_usb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libusb_1_0_la_CFLAGS) $(CFLAGS) -c -o os/libusb_1_0_la-windows_usb.lo `test -f 'os/windows_usb.c' || echo '$(srcdir)/'`os/windows_usb.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf os/.libs os/_libs
+install-hdrHEADERS: $(hdr_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(hdr_HEADERS)'; test -n "$(hdrdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(hdrdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(hdrdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(hdrdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(hdrdir)" || exit $$?; \
+	done
+
+uninstall-hdrHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(hdr_HEADERS)'; test -n "$(hdrdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(hdrdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(hdrdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f os/$(DEPDIR)/$(am__dirstamp)
+	-rm -f os/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) os/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-hdrHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) os/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-hdrHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-hdrHEADERS install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-hdrHEADERS \
+	uninstall-libLTLIBRARIES
+
+all: libusb-1.0.la libusb-1.0.dll
+
+@OS_WINDOWS_TRUE@.rc.lo:
+@OS_WINDOWS_TRUE@	$(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@
+
+@OS_WINDOWS_TRUE@libusb-1.0.rc: version.h version_nano.h
+
+libusb-1.0.dll: libusb-1.0.def libusb-1.0.la
+# Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged
+@CREATE_IMPORT_LIB_TRUE@	$(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Externals/libusb/libusb/core.c b/Externals/libusb/libusb/core.c
new file mode 100644
index 0000000000..f3d7ece652
--- /dev/null
+++ b/Externals/libusb/libusb/core.c
@@ -0,0 +1,2334 @@
+/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
+/*
+ * Core functions for libusb
+ * Copyright © 2012-2013 Nathan Hjelm <hjelmn@cs.unm.edu>
+ * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
+
+#include "libusbi.h"
+#include "hotplug.h"
+
+#if defined(OS_LINUX)
+const struct usbi_os_backend * const usbi_backend = &linux_usbfs_backend;
+#elif defined(OS_DARWIN)
+const struct usbi_os_backend * const usbi_backend = &darwin_backend;
+#elif defined(OS_OPENBSD)
+const struct usbi_os_backend * const usbi_backend = &openbsd_backend;
+#elif defined(OS_NETBSD)
+const struct usbi_os_backend * const usbi_backend = &netbsd_backend;
+#elif defined(OS_WINDOWS)
+const struct usbi_os_backend * const usbi_backend = &windows_backend;
+#elif defined(OS_WINCE)
+const struct usbi_os_backend * const usbi_backend = &wince_backend;
+#else
+#error "Unsupported OS"
+#endif
+
+struct libusb_context *usbi_default_context = NULL;
+static const struct libusb_version libusb_version_internal =
+	{ LIBUSB_MAJOR, LIBUSB_MINOR, LIBUSB_MICRO, LIBUSB_NANO,
+	  LIBUSB_RC, "http://libusb.info" };
+static int default_context_refcnt = 0;
+static usbi_mutex_static_t default_context_lock = USBI_MUTEX_INITIALIZER;
+static struct timeval timestamp_origin = { 0, 0 };
+
+usbi_mutex_static_t active_contexts_lock = USBI_MUTEX_INITIALIZER;
+struct list_head active_contexts_list;
+
+/**
+ * \mainpage libusb-1.0 API Reference
+ *
+ * \section intro Introduction
+ *
+ * libusb is an open source library that allows you to communicate with USB
+ * devices from userspace. For more info, see the
+ * <a href="http://libusb.info">libusb homepage</a>.
+ *
+ * This documentation is aimed at application developers wishing to
+ * communicate with USB peripherals from their own software. After reviewing
+ * this documentation, feedback and questions can be sent to the
+ * <a href="http://mailing-list.libusb.info">libusb-devel mailing list</a>.
+ *
+ * This documentation assumes knowledge of how to operate USB devices from
+ * a software standpoint (descriptors, configurations, interfaces, endpoints,
+ * control/bulk/interrupt/isochronous transfers, etc). Full information
+ * can be found in the <a href="http://www.usb.org/developers/docs/">USB 3.0
+ * Specification</a> which is available for free download. You can probably
+ * find less verbose introductions by searching the web.
+ *
+ * \section features Library features
+ *
+ * - All transfer types supported (control/bulk/interrupt/isochronous)
+ * - 2 transfer interfaces:
+ *    -# Synchronous (simple)
+ *    -# Asynchronous (more complicated, but more powerful)
+ * - Thread safe (although the asynchronous interface means that you
+ *   usually won't need to thread)
+ * - Lightweight with lean API
+ * - Compatible with libusb-0.1 through the libusb-compat-0.1 translation layer
+ * - Hotplug support (on some platforms). See \ref hotplug.
+ *
+ * \section gettingstarted Getting Started
+ *
+ * To begin reading the API documentation, start with the Modules page which
+ * links to the different categories of libusb's functionality.
+ *
+ * One decision you will have to make is whether to use the synchronous
+ * or the asynchronous data transfer interface. The \ref io documentation
+ * provides some insight into this topic.
+ *
+ * Some example programs can be found in the libusb source distribution under
+ * the "examples" subdirectory. The libusb homepage includes a list of
+ * real-life project examples which use libusb.
+ *
+ * \section errorhandling Error handling
+ *
+ * libusb functions typically return 0 on success or a negative error code
+ * on failure. These negative error codes relate to LIBUSB_ERROR constants
+ * which are listed on the \ref misc "miscellaneous" documentation page.
+ *
+ * \section msglog Debug message logging
+ *
+ * libusb uses stderr for all logging. By default, logging is set to NONE,
+ * which means that no output will be produced. However, unless the library
+ * has been compiled with logging disabled, then any application calls to
+ * libusb_set_debug(), or the setting of the environmental variable
+ * LIBUSB_DEBUG outside of the application, can result in logging being
+ * produced. Your application should therefore not close stderr, but instead
+ * direct it to the null device if its output is undesireable.
+ *
+ * The libusb_set_debug() function can be used to enable logging of certain
+ * messages. Under standard configuration, libusb doesn't really log much
+ * so you are advised to use this function to enable all error/warning/
+ * informational messages. It will help debug problems with your software.
+ *
+ * The logged messages are unstructured. There is no one-to-one correspondence
+ * between messages being logged and success or failure return codes from
+ * libusb functions. There is no format to the messages, so you should not
+ * try to capture or parse them. They are not and will not be localized.
+ * These messages are not intended to being passed to your application user;
+ * instead, you should interpret the error codes returned from libusb functions
+ * and provide appropriate notification to the user. The messages are simply
+ * there to aid you as a programmer, and if you're confused because you're
+ * getting a strange error code from a libusb function, enabling message
+ * logging may give you a suitable explanation.
+ *
+ * The LIBUSB_DEBUG environment variable can be used to enable message logging
+ * at run-time. This environment variable should be set to a log level number,
+ * which is interpreted the same as the libusb_set_debug() parameter. When this
+ * environment variable is set, the message logging verbosity level is fixed
+ * and libusb_set_debug() effectively does nothing.
+ *
+ * libusb can be compiled without any logging functions, useful for embedded
+ * systems. In this case, libusb_set_debug() and the LIBUSB_DEBUG environment
+ * variable have no effects.
+ *
+ * libusb can also be compiled with verbose debugging messages always. When
+ * the library is compiled in this way, all messages of all verbosities are
+ * always logged. libusb_set_debug() and the LIBUSB_DEBUG environment variable
+ * have no effects.
+ *
+ * \section remarks Other remarks
+ *
+ * libusb does have imperfections. The \ref caveats "caveats" page attempts
+ * to document these.
+ */
+
+/**
+ * \page caveats Caveats
+ *
+ * \section devresets Device resets
+ *
+ * The libusb_reset_device() function allows you to reset a device. If your
+ * program has to call such a function, it should obviously be aware that
+ * the reset will cause device state to change (e.g. register values may be
+ * reset).
+ *
+ * The problem is that any other program could reset the device your program
+ * is working with, at any time. libusb does not offer a mechanism to inform
+ * you when this has happened, so if someone else resets your device it will
+ * not be clear to your own program why the device state has changed.
+ *
+ * Ultimately, this is a limitation of writing drivers in userspace.
+ * Separation from the USB stack in the underlying kernel makes it difficult
+ * for the operating system to deliver such notifications to your program.
+ * The Linux kernel USB stack allows such reset notifications to be delivered
+ * to in-kernel USB drivers, but it is not clear how such notifications could
+ * be delivered to second-class drivers that live in userspace.
+ *
+ * \section blockonly Blocking-only functionality
+ *
+ * The functionality listed below is only available through synchronous,
+ * blocking functions. There are no asynchronous/non-blocking alternatives,
+ * and no clear ways of implementing these.
+ *
+ * - Configuration activation (libusb_set_configuration())
+ * - Interface/alternate setting activation (libusb_set_interface_alt_setting())
+ * - Releasing of interfaces (libusb_release_interface())
+ * - Clearing of halt/stall condition (libusb_clear_halt())
+ * - Device resets (libusb_reset_device())
+ *
+ * \section configsel Configuration selection and handling
+ *
+ * When libusb presents a device handle to an application, there is a chance
+ * that the corresponding device may be in unconfigured state. For devices
+ * with multiple configurations, there is also a chance that the configuration
+ * currently selected is not the one that the application wants to use.
+ *
+ * The obvious solution is to add a call to libusb_set_configuration() early
+ * on during your device initialization routines, but there are caveats to
+ * be aware of:
+ * -# If the device is already in the desired configuration, calling
+ *    libusb_set_configuration() using the same configuration value will cause
+ *    a lightweight device reset. This may not be desirable behaviour.
+ * -# libusb will be unable to change configuration if the device is in
+ *    another configuration and other programs or drivers have claimed
+ *    interfaces under that configuration.
+ * -# In the case where the desired configuration is already active, libusb
+ *    may not even be able to perform a lightweight device reset. For example,
+ *    take my USB keyboard with fingerprint reader: I'm interested in driving
+ *    the fingerprint reader interface through libusb, but the kernel's
+ *    USB-HID driver will almost always have claimed the keyboard interface.
+ *    Because the kernel has claimed an interface, it is not even possible to
+ *    perform the lightweight device reset, so libusb_set_configuration() will
+ *    fail. (Luckily the device in question only has a single configuration.)
+ *
+ * One solution to some of the above problems is to consider the currently
+ * active configuration. If the configuration we want is already active, then
+ * we don't have to select any configuration:
+\code
+cfg = libusb_get_configuration(dev);
+if (cfg != desired)
+	libusb_set_configuration(dev, desired);
+\endcode
+ *
+ * This is probably suitable for most scenarios, but is inherently racy:
+ * another application or driver may change the selected configuration
+ * <em>after</em> the libusb_get_configuration() call.
+ *
+ * Even in cases where libusb_set_configuration() succeeds, consider that other
+ * applications or drivers may change configuration after your application
+ * calls libusb_set_configuration().
+ *
+ * One possible way to lock your device into a specific configuration is as
+ * follows:
+ * -# Set the desired configuration (or use the logic above to realise that
+ *    it is already in the desired configuration)
+ * -# Claim the interface that you wish to use
+ * -# Check that the currently active configuration is the one that you want
+ *    to use.
+ *
+ * The above method works because once an interface is claimed, no application
+ * or driver is able to select another configuration.
+ *
+ * \section earlycomp Early transfer completion
+ *
+ * NOTE: This section is currently Linux-centric. I am not sure if any of these
+ * considerations apply to Darwin or other platforms.
+ *
+ * When a transfer completes early (i.e. when less data is received/sent in
+ * any one packet than the transfer buffer allows for) then libusb is designed
+ * to terminate the transfer immediately, not transferring or receiving any
+ * more data unless other transfers have been queued by the user.
+ *
+ * On legacy platforms, libusb is unable to do this in all situations. After
+ * the incomplete packet occurs, "surplus" data may be transferred. For recent
+ * versions of libusb, this information is kept (the data length of the
+ * transfer is updated) and, for device-to-host transfers, any surplus data was
+ * added to the buffer. Still, this is not a nice solution because it loses the
+ * information about the end of the short packet, and the user probably wanted
+ * that surplus data to arrive in the next logical transfer.
+ *
+ *
+ * \section zlp Zero length packets
+ *
+ * - libusb is able to send a packet of zero length to an endpoint simply by
+ * submitting a transfer of zero length.
+ * - The \ref libusb_transfer_flags::LIBUSB_TRANSFER_ADD_ZERO_PACKET
+ * "LIBUSB_TRANSFER_ADD_ZERO_PACKET" flag is currently only supported on Linux.
+ */
+
+/**
+ * \page contexts Contexts
+ *
+ * It is possible that libusb may be used simultaneously from two independent
+ * libraries linked into the same executable. For example, if your application
+ * has a plugin-like system which allows the user to dynamically load a range
+ * of modules into your program, it is feasible that two independently
+ * developed modules may both use libusb.
+ *
+ * libusb is written to allow for these multiple user scenarios. The two
+ * "instances" of libusb will not interfere: libusb_set_debug() calls
+ * from one user will not affect the same settings for other users, other
+ * users can continue using libusb after one of them calls libusb_exit(), etc.
+ *
+ * This is made possible through libusb's <em>context</em> concept. When you
+ * call libusb_init(), you are (optionally) given a context. You can then pass
+ * this context pointer back into future libusb functions.
+ *
+ * In order to keep things simple for more simplistic applications, it is
+ * legal to pass NULL to all functions requiring a context pointer (as long as
+ * you're sure no other code will attempt to use libusb from the same process).
+ * When you pass NULL, the default context will be used. The default context
+ * is created the first time a process calls libusb_init() when no other
+ * context is alive. Contexts are destroyed during libusb_exit().
+ *
+ * The default context is reference-counted and can be shared. That means that
+ * if libusb_init(NULL) is called twice within the same process, the two
+ * users end up sharing the same context. The deinitialization and freeing of
+ * the default context will only happen when the last user calls libusb_exit().
+ * In other words, the default context is created and initialized when its
+ * reference count goes from 0 to 1, and is deinitialized and destroyed when
+ * its reference count goes from 1 to 0.
+ *
+ * You may be wondering why only a subset of libusb functions require a
+ * context pointer in their function definition. Internally, libusb stores
+ * context pointers in other objects (e.g. libusb_device instances) and hence
+ * can infer the context from those objects.
+ */
+
+/**
+ * @defgroup lib Library initialization/deinitialization
+ * This page details how to initialize and deinitialize libusb. Initialization
+ * must be performed before using any libusb functionality, and similarly you
+ * must not call any libusb functions after deinitialization.
+ */
+
+/**
+ * @defgroup dev Device handling and enumeration
+ * The functionality documented below is designed to help with the following
+ * operations:
+ * - Enumerating the USB devices currently attached to the system
+ * - Choosing a device to operate from your software
+ * - Opening and closing the chosen device
+ *
+ * \section nutshell In a nutshell...
+ *
+ * The description below really makes things sound more complicated than they
+ * actually are. The following sequence of function calls will be suitable
+ * for almost all scenarios and does not require you to have such a deep
+ * understanding of the resource management issues:
+ * \code
+// discover devices
+libusb_device **list;
+libusb_device *found = NULL;
+ssize_t cnt = libusb_get_device_list(NULL, &list);
+ssize_t i = 0;
+int err = 0;
+if (cnt < 0)
+	error();
+
+for (i = 0; i < cnt; i++) {
+	libusb_device *device = list[i];
+	if (is_interesting(device)) {
+		found = device;
+		break;
+	}
+}
+
+if (found) {
+	libusb_device_handle *handle;
+
+	err = libusb_open(found, &handle);
+	if (err)
+		error();
+	// etc
+}
+
+libusb_free_device_list(list, 1);
+\endcode
+ *
+ * The two important points:
+ * - You asked libusb_free_device_list() to unreference the devices (2nd
+ *   parameter)
+ * - You opened the device before freeing the list and unreferencing the
+ *   devices
+ *
+ * If you ended up with a handle, you can now proceed to perform I/O on the
+ * device.
+ *
+ * \section devshandles Devices and device handles
+ * libusb has a concept of a USB device, represented by the
+ * \ref libusb_device opaque type. A device represents a USB device that
+ * is currently or was previously connected to the system. Using a reference
+ * to a device, you can determine certain information about the device (e.g.
+ * you can read the descriptor data).
+ *
+ * The libusb_get_device_list() function can be used to obtain a list of
+ * devices currently connected to the system. This is known as device
+ * discovery.
+ *
+ * Just because you have a reference to a device does not mean it is
+ * necessarily usable. The device may have been unplugged, you may not have
+ * permission to operate such device, or another program or driver may be
+ * using the device.
+ *
+ * When you've found a device that you'd like to operate, you must ask
+ * libusb to open the device using the libusb_open() function. Assuming
+ * success, libusb then returns you a <em>device handle</em>
+ * (a \ref libusb_device_handle pointer). All "real" I/O operations then
+ * operate on the handle rather than the original device pointer.
+ *
+ * \section devref Device discovery and reference counting
+ *
+ * Device discovery (i.e. calling libusb_get_device_list()) returns a
+ * freshly-allocated list of devices. The list itself must be freed when
+ * you are done with it. libusb also needs to know when it is OK to free
+ * the contents of the list - the devices themselves.
+ *
+ * To handle these issues, libusb provides you with two separate items:
+ * - A function to free the list itself
+ * - A reference counting system for the devices inside
+ *
+ * New devices presented by the libusb_get_device_list() function all have a
+ * reference count of 1. You can increase and decrease reference count using
+ * libusb_ref_device() and libusb_unref_device(). A device is destroyed when
+ * its reference count reaches 0.
+ *
+ * With the above information in mind, the process of opening a device can
+ * be viewed as follows:
+ * -# Discover devices using libusb_get_device_list().
+ * -# Choose the device that you want to operate, and call libusb_open().
+ * -# Unref all devices in the discovered device list.
+ * -# Free the discovered device list.
+ *
+ * The order is important - you must not unreference the device before
+ * attempting to open it, because unreferencing it may destroy the device.
+ *
+ * For convenience, the libusb_free_device_list() function includes a
+ * parameter to optionally unreference all the devices in the list before
+ * freeing the list itself. This combines steps 3 and 4 above.
+ *
+ * As an implementation detail, libusb_open() actually adds a reference to
+ * the device in question. This is because the device remains available
+ * through the handle via libusb_get_device(). The reference is deleted during
+ * libusb_close().
+ */
+
+/** @defgroup misc Miscellaneous */
+
+/* we traverse usbfs without knowing how many devices we are going to find.
+ * so we create this discovered_devs model which is similar to a linked-list
+ * which grows when required. it can be freed once discovery has completed,
+ * eliminating the need for a list node in the libusb_device structure
+ * itself. */
+#define DISCOVERED_DEVICES_SIZE_STEP 8
+
+static struct discovered_devs *discovered_devs_alloc(void)
+{
+	struct discovered_devs *ret =
+		malloc(sizeof(*ret) + (sizeof(void *) * DISCOVERED_DEVICES_SIZE_STEP));
+
+	if (ret) {
+		ret->len = 0;
+		ret->capacity = DISCOVERED_DEVICES_SIZE_STEP;
+	}
+	return ret;
+}
+
+/* append a device to the discovered devices collection. may realloc itself,
+ * returning new discdevs. returns NULL on realloc failure. */
+struct discovered_devs *discovered_devs_append(
+	struct discovered_devs *discdevs, struct libusb_device *dev)
+{
+	size_t len = discdevs->len;
+	size_t capacity;
+
+	/* if there is space, just append the device */
+	if (len < discdevs->capacity) {
+		discdevs->devices[len] = libusb_ref_device(dev);
+		discdevs->len++;
+		return discdevs;
+	}
+
+	/* exceeded capacity, need to grow */
+	usbi_dbg("need to increase capacity");
+	capacity = discdevs->capacity + DISCOVERED_DEVICES_SIZE_STEP;
+	discdevs = usbi_reallocf(discdevs,
+		sizeof(*discdevs) + (sizeof(void *) * capacity));
+	if (discdevs) {
+		discdevs->capacity = capacity;
+		discdevs->devices[len] = libusb_ref_device(dev);
+		discdevs->len++;
+	}
+
+	return discdevs;
+}
+
+static void discovered_devs_free(struct discovered_devs *discdevs)
+{
+	size_t i;
+
+	for (i = 0; i < discdevs->len; i++)
+		libusb_unref_device(discdevs->devices[i]);
+
+	free(discdevs);
+}
+
+/* Allocate a new device with a specific session ID. The returned device has
+ * a reference count of 1. */
+struct libusb_device *usbi_alloc_device(struct libusb_context *ctx,
+	unsigned long session_id)
+{
+	size_t priv_size = usbi_backend->device_priv_size;
+	struct libusb_device *dev = calloc(1, sizeof(*dev) + priv_size);
+	int r;
+
+	if (!dev)
+		return NULL;
+
+	r = usbi_mutex_init(&dev->lock, NULL);
+	if (r) {
+		free(dev);
+		return NULL;
+	}
+
+	dev->ctx = ctx;
+	dev->refcnt = 1;
+	dev->session_data = session_id;
+	dev->speed = LIBUSB_SPEED_UNKNOWN;
+
+	if (!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+		usbi_connect_device (dev);
+	}
+
+	return dev;
+}
+
+void usbi_connect_device(struct libusb_device *dev)
+{
+	libusb_hotplug_message message;
+	ssize_t ret;
+
+	memset(&message, 0, sizeof(message));
+	message.event = LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED;
+	message.device = dev;
+	dev->attached = 1;
+
+	usbi_mutex_lock(&dev->ctx->usb_devs_lock);
+	list_add(&dev->list, &dev->ctx->usb_devs);
+	usbi_mutex_unlock(&dev->ctx->usb_devs_lock);
+
+	/* Signal that an event has occurred for this device if we support hotplug AND
+	 * the hotplug pipe is ready. This prevents an event from getting raised during
+	 * initial enumeration. */
+	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) && dev->ctx->hotplug_pipe[1] > 0) {
+		ret = usbi_write(dev->ctx->hotplug_pipe[1], &message, sizeof(message));
+		if (sizeof (message) != ret) {
+			usbi_err(DEVICE_CTX(dev), "error writing hotplug message");
+		}
+	}
+}
+
+void usbi_disconnect_device(struct libusb_device *dev)
+{
+	libusb_hotplug_message message;
+	struct libusb_context *ctx = dev->ctx;
+	ssize_t ret;
+
+	memset(&message, 0, sizeof(message));
+	message.event = LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT;
+	message.device = dev;
+	usbi_mutex_lock(&dev->lock);
+	dev->attached = 0;
+	usbi_mutex_unlock(&dev->lock);
+
+	usbi_mutex_lock(&ctx->usb_devs_lock);
+	list_del(&dev->list);
+	usbi_mutex_unlock(&ctx->usb_devs_lock);
+
+	/* Signal that an event has occurred for this device if we support hotplug AND
+	 * the hotplug pipe is ready. This prevents an event from getting raised during
+	 * initial enumeration. libusb_handle_events will take care of dereferencing the
+	 * device. */
+	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) && dev->ctx->hotplug_pipe[1] > 0) {
+		ret = usbi_write(dev->ctx->hotplug_pipe[1], &message, sizeof(message));
+		if (sizeof(message) != ret) {
+			usbi_err(DEVICE_CTX(dev), "error writing hotplug message");
+		}
+	}
+}
+
+/* Perform some final sanity checks on a newly discovered device. If this
+ * function fails (negative return code), the device should not be added
+ * to the discovered device list. */
+int usbi_sanitize_device(struct libusb_device *dev)
+{
+	int r;
+	uint8_t num_configurations;
+
+	r = usbi_device_cache_descriptor(dev);
+	if (r < 0)
+		return r;
+
+	num_configurations = dev->device_descriptor.bNumConfigurations;
+	if (num_configurations > USB_MAXCONFIG) {
+		usbi_err(DEVICE_CTX(dev), "too many configurations");
+		return LIBUSB_ERROR_IO;
+	} else if (0 == num_configurations)
+		usbi_dbg("zero configurations, maybe an unauthorized device");
+
+	dev->num_configurations = num_configurations;
+	return 0;
+}
+
+/* Examine libusb's internal list of known devices, looking for one with
+ * a specific session ID. Returns the matching device if it was found, and
+ * NULL otherwise. */
+struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx,
+	unsigned long session_id)
+{
+	struct libusb_device *dev;
+	struct libusb_device *ret = NULL;
+
+	usbi_mutex_lock(&ctx->usb_devs_lock);
+	list_for_each_entry(dev, &ctx->usb_devs, list, struct libusb_device)
+		if (dev->session_data == session_id) {
+			ret = libusb_ref_device(dev);
+			break;
+		}
+	usbi_mutex_unlock(&ctx->usb_devs_lock);
+
+	return ret;
+}
+
+/** @ingroup dev
+ * Returns a list of USB devices currently attached to the system. This is
+ * your entry point into finding a USB device to operate.
+ *
+ * You are expected to unreference all the devices when you are done with
+ * them, and then free the list with libusb_free_device_list(). Note that
+ * libusb_free_device_list() can unref all the devices for you. Be careful
+ * not to unreference a device you are about to open until after you have
+ * opened it.
+ *
+ * This return value of this function indicates the number of devices in
+ * the resultant list. The list is actually one element larger, as it is
+ * NULL-terminated.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param list output location for a list of devices. Must be later freed with
+ * libusb_free_device_list().
+ * \returns the number of devices in the outputted list, or any
+ * \ref libusb_error according to errors encountered by the backend.
+ */
+ssize_t API_EXPORTED libusb_get_device_list(libusb_context *ctx,
+	libusb_device ***list)
+{
+	struct discovered_devs *discdevs = discovered_devs_alloc();
+	struct libusb_device **ret;
+	int r = 0;
+	ssize_t i, len;
+	USBI_GET_CONTEXT(ctx);
+	usbi_dbg("");
+
+	if (!discdevs)
+		return LIBUSB_ERROR_NO_MEM;
+
+	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+		/* backend provides hotplug support */
+		struct libusb_device *dev;
+
+		if (usbi_backend->hotplug_poll)
+			usbi_backend->hotplug_poll();
+
+		usbi_mutex_lock(&ctx->usb_devs_lock);
+		list_for_each_entry(dev, &ctx->usb_devs, list, struct libusb_device) {
+			discdevs = discovered_devs_append(discdevs, dev);
+
+			if (!discdevs) {
+				r = LIBUSB_ERROR_NO_MEM;
+				break;
+			}
+		}
+		usbi_mutex_unlock(&ctx->usb_devs_lock);
+	} else {
+		/* backend does not provide hotplug support */
+		r = usbi_backend->get_device_list(ctx, &discdevs);
+	}
+
+	if (r < 0) {
+		len = r;
+		goto out;
+	}
+
+	/* convert discovered_devs into a list */
+	len = discdevs->len;
+	ret = calloc(len + 1, sizeof(struct libusb_device *));
+	if (!ret) {
+		len = LIBUSB_ERROR_NO_MEM;
+		goto out;
+	}
+
+	ret[len] = NULL;
+	for (i = 0; i < len; i++) {
+		struct libusb_device *dev = discdevs->devices[i];
+		ret[i] = libusb_ref_device(dev);
+	}
+	*list = ret;
+
+out:
+	discovered_devs_free(discdevs);
+	return len;
+}
+
+/** \ingroup dev
+ * Frees a list of devices previously discovered using
+ * libusb_get_device_list(). If the unref_devices parameter is set, the
+ * reference count of each device in the list is decremented by 1.
+ * \param list the list to free
+ * \param unref_devices whether to unref the devices in the list
+ */
+void API_EXPORTED libusb_free_device_list(libusb_device **list,
+	int unref_devices)
+{
+	if (!list)
+		return;
+
+	if (unref_devices) {
+		int i = 0;
+		struct libusb_device *dev;
+
+		while ((dev = list[i++]) != NULL)
+			libusb_unref_device(dev);
+	}
+	free(list);
+}
+
+/** \ingroup dev
+ * Get the number of the bus that a device is connected to.
+ * \param dev a device
+ * \returns the bus number
+ */
+uint8_t API_EXPORTED libusb_get_bus_number(libusb_device *dev)
+{
+	return dev->bus_number;
+}
+
+/** \ingroup dev
+ * Get the number of the port that a device is connected to.
+ * Unless the OS does something funky, or you are hot-plugging USB extension cards,
+ * the port number returned by this call is usually guaranteed to be uniquely tied
+ * to a physical port, meaning that different devices plugged on the same physical
+ * port should return the same port number.
+ *
+ * But outside of this, there is no guarantee that the port number returned by this
+ * call will remain the same, or even match the order in which ports have been
+ * numbered by the HUB/HCD manufacturer.
+ *
+ * \param dev a device
+ * \returns the port number (0 if not available)
+ */
+uint8_t API_EXPORTED libusb_get_port_number(libusb_device *dev)
+{
+	return dev->port_number;
+}
+
+/** \ingroup dev
+ * Get the list of all port numbers from root for the specified device
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ * \param dev a device
+ * \param port_numbers the array that should contain the port numbers
+ * \param port_numbers_len the maximum length of the array. As per the USB 3.0
+ * specs, the current maximum limit for the depth is 7.
+ * \returns the number of elements filled
+ * \returns LIBUSB_ERROR_OVERFLOW if the array is too small
+ */
+int API_EXPORTED libusb_get_port_numbers(libusb_device *dev,
+	uint8_t* port_numbers, int port_numbers_len)
+{
+	int i = port_numbers_len;
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+
+	if (port_numbers_len <= 0)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	// HCDs can be listed as devices with port #0
+	while((dev) && (dev->port_number != 0)) {
+		if (--i < 0) {
+			usbi_warn(ctx, "port numbers array is too small");
+			return LIBUSB_ERROR_OVERFLOW;
+		}
+		port_numbers[i] = dev->port_number;
+		dev = dev->parent_dev;
+	}
+	if (i < port_numbers_len)
+		memmove(port_numbers, &port_numbers[i], port_numbers_len - i);
+	return port_numbers_len - i;
+}
+
+/** \ingroup dev
+ * Deprecated please use libusb_get_port_numbers instead.
+ */
+int API_EXPORTED libusb_get_port_path(libusb_context *ctx, libusb_device *dev,
+	uint8_t* port_numbers, uint8_t port_numbers_len)
+{
+	UNUSED(ctx);
+
+	return libusb_get_port_numbers(dev, port_numbers, port_numbers_len);
+}
+
+/** \ingroup dev
+ * Get the the parent from the specified device.
+ * \param dev a device
+ * \returns the device parent or NULL if not available
+ * You should issue a \ref libusb_get_device_list() before calling this
+ * function and make sure that you only access the parent before issuing
+ * \ref libusb_free_device_list(). The reason is that libusb currently does
+ * not maintain a permanent list of device instances, and therefore can
+ * only guarantee that parents are fully instantiated within a 
+ * libusb_get_device_list() - libusb_free_device_list() block.
+ */
+DEFAULT_VISIBILITY
+libusb_device * LIBUSB_CALL libusb_get_parent(libusb_device *dev)
+{
+	return dev->parent_dev;
+}
+
+/** \ingroup dev
+ * Get the address of the device on the bus it is connected to.
+ * \param dev a device
+ * \returns the device address
+ */
+uint8_t API_EXPORTED libusb_get_device_address(libusb_device *dev)
+{
+	return dev->device_address;
+}
+
+/** \ingroup dev
+ * Get the negotiated connection speed for a device.
+ * \param dev a device
+ * \returns a \ref libusb_speed code, where LIBUSB_SPEED_UNKNOWN means that
+ * the OS doesn't know or doesn't support returning the negotiated speed.
+ */
+int API_EXPORTED libusb_get_device_speed(libusb_device *dev)
+{
+	return dev->speed;
+}
+
+static const struct libusb_endpoint_descriptor *find_endpoint(
+	struct libusb_config_descriptor *config, unsigned char endpoint)
+{
+	int iface_idx;
+	for (iface_idx = 0; iface_idx < config->bNumInterfaces; iface_idx++) {
+		const struct libusb_interface *iface = &config->interface[iface_idx];
+		int altsetting_idx;
+
+		for (altsetting_idx = 0; altsetting_idx < iface->num_altsetting;
+				altsetting_idx++) {
+			const struct libusb_interface_descriptor *altsetting
+				= &iface->altsetting[altsetting_idx];
+			int ep_idx;
+
+			for (ep_idx = 0; ep_idx < altsetting->bNumEndpoints; ep_idx++) {
+				const struct libusb_endpoint_descriptor *ep =
+					&altsetting->endpoint[ep_idx];
+				if (ep->bEndpointAddress == endpoint)
+					return ep;
+			}
+		}
+	}
+	return NULL;
+}
+
+/** \ingroup dev
+ * Convenience function to retrieve the wMaxPacketSize value for a particular
+ * endpoint in the active device configuration.
+ *
+ * This function was originally intended to be of assistance when setting up
+ * isochronous transfers, but a design mistake resulted in this function
+ * instead. It simply returns the wMaxPacketSize value without considering
+ * its contents. If you're dealing with isochronous transfers, you probably
+ * want libusb_get_max_iso_packet_size() instead.
+ *
+ * \param dev a device
+ * \param endpoint address of the endpoint in question
+ * \returns the wMaxPacketSize value
+ * \returns LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
+ * \returns LIBUSB_ERROR_OTHER on other failure
+ */
+int API_EXPORTED libusb_get_max_packet_size(libusb_device *dev,
+	unsigned char endpoint)
+{
+	struct libusb_config_descriptor *config;
+	const struct libusb_endpoint_descriptor *ep;
+	int r;
+
+	r = libusb_get_active_config_descriptor(dev, &config);
+	if (r < 0) {
+		usbi_err(DEVICE_CTX(dev),
+			"could not retrieve active config descriptor");
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	ep = find_endpoint(config, endpoint);
+	if (!ep) {
+		r = LIBUSB_ERROR_NOT_FOUND;
+		goto out;
+	}
+
+	r = ep->wMaxPacketSize;
+
+out:
+	libusb_free_config_descriptor(config);
+	return r;
+}
+
+/** \ingroup dev
+ * Calculate the maximum packet size which a specific endpoint is capable is
+ * sending or receiving in the duration of 1 microframe
+ *
+ * Only the active configuration is examined. The calculation is based on the
+ * wMaxPacketSize field in the endpoint descriptor as described in section
+ * 9.6.6 in the USB 2.0 specifications.
+ *
+ * If acting on an isochronous or interrupt endpoint, this function will
+ * multiply the value found in bits 0:10 by the number of transactions per
+ * microframe (determined by bits 11:12). Otherwise, this function just
+ * returns the numeric value found in bits 0:10.
+ *
+ * This function is useful for setting up isochronous transfers, for example
+ * you might pass the return value from this function to
+ * libusb_set_iso_packet_lengths() in order to set the length field of every
+ * isochronous packet in a transfer.
+ *
+ * Since v1.0.3.
+ *
+ * \param dev a device
+ * \param endpoint address of the endpoint in question
+ * \returns the maximum packet size which can be sent/received on this endpoint
+ * \returns LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
+ * \returns LIBUSB_ERROR_OTHER on other failure
+ */
+int API_EXPORTED libusb_get_max_iso_packet_size(libusb_device *dev,
+	unsigned char endpoint)
+{
+	struct libusb_config_descriptor *config;
+	const struct libusb_endpoint_descriptor *ep;
+	enum libusb_transfer_type ep_type;
+	uint16_t val;
+	int r;
+
+	r = libusb_get_active_config_descriptor(dev, &config);
+	if (r < 0) {
+		usbi_err(DEVICE_CTX(dev),
+			"could not retrieve active config descriptor");
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	ep = find_endpoint(config, endpoint);
+	if (!ep) {
+		r = LIBUSB_ERROR_NOT_FOUND;
+		goto out;
+	}
+
+	val = ep->wMaxPacketSize;
+	ep_type = (enum libusb_transfer_type) (ep->bmAttributes & 0x3);
+
+	r = val & 0x07ff;
+	if (ep_type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS
+			|| ep_type == LIBUSB_TRANSFER_TYPE_INTERRUPT)
+		r *= (1 + ((val >> 11) & 3));
+
+out:
+	libusb_free_config_descriptor(config);
+	return r;
+}
+
+/** \ingroup dev
+ * Increment the reference count of a device.
+ * \param dev the device to reference
+ * \returns the same device
+ */
+DEFAULT_VISIBILITY
+libusb_device * LIBUSB_CALL libusb_ref_device(libusb_device *dev)
+{
+	usbi_mutex_lock(&dev->lock);
+	dev->refcnt++;
+	usbi_mutex_unlock(&dev->lock);
+	return dev;
+}
+
+/** \ingroup dev
+ * Decrement the reference count of a device. If the decrement operation
+ * causes the reference count to reach zero, the device shall be destroyed.
+ * \param dev the device to unreference
+ */
+void API_EXPORTED libusb_unref_device(libusb_device *dev)
+{
+	int refcnt;
+
+	if (!dev)
+		return;
+
+	usbi_mutex_lock(&dev->lock);
+	refcnt = --dev->refcnt;
+	usbi_mutex_unlock(&dev->lock);
+
+	if (refcnt == 0) {
+		usbi_dbg("destroy device %d.%d", dev->bus_number, dev->device_address);
+
+		libusb_unref_device(dev->parent_dev);
+
+		if (usbi_backend->destroy_device)
+			usbi_backend->destroy_device(dev);
+
+		if (!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+			/* backend does not support hotplug */
+			usbi_disconnect_device(dev);
+		}
+
+		usbi_mutex_destroy(&dev->lock);
+		free(dev);
+	}
+}
+
+/*
+ * Interrupt the iteration of the event handling thread, so that it picks
+ * up the new fd.
+ */
+void usbi_fd_notification(struct libusb_context *ctx)
+{
+	unsigned char dummy = 1;
+	ssize_t r;
+
+	if (ctx == NULL)
+		return;
+
+	/* record that we are messing with poll fds */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	ctx->pollfd_modify++;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+
+	/* write some data on control pipe to interrupt event handlers */
+	r = usbi_write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
+	if (r <= 0) {
+		usbi_warn(ctx, "internal signalling write failed");
+		usbi_mutex_lock(&ctx->pollfd_modify_lock);
+		ctx->pollfd_modify--;
+		usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+		return;
+	}
+
+	/* take event handling lock */
+	libusb_lock_events(ctx);
+
+	/* read the dummy data */
+	r = usbi_read(ctx->ctrl_pipe[0], &dummy, sizeof(dummy));
+	if (r <= 0)
+		usbi_warn(ctx, "internal signalling read failed");
+
+	/* we're done with modifying poll fds */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	ctx->pollfd_modify--;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+
+	/* Release event handling lock and wake up event waiters */
+	libusb_unlock_events(ctx);
+}
+
+/** \ingroup dev
+ * Open a device and obtain a device handle. A handle allows you to perform
+ * I/O on the device in question.
+ *
+ * Internally, this function adds a reference to the device and makes it
+ * available to you through libusb_get_device(). This reference is removed
+ * during libusb_close().
+ *
+ * This is a non-blocking function; no requests are sent over the bus.
+ *
+ * \param dev the device to open
+ * \param handle output location for the returned device handle pointer. Only
+ * populated when the return code is 0.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NO_MEM on memory allocation failure
+ * \returns LIBUSB_ERROR_ACCESS if the user has insufficient permissions
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_open(libusb_device *dev,
+	libusb_device_handle **handle)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	struct libusb_device_handle *_handle;
+	size_t priv_size = usbi_backend->device_handle_priv_size;
+	int r;
+	usbi_dbg("open %d.%d", dev->bus_number, dev->device_address);
+
+	if (!dev->attached) {
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	_handle = malloc(sizeof(*_handle) + priv_size);
+	if (!_handle)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = usbi_mutex_init(&_handle->lock, NULL);
+	if (r) {
+		free(_handle);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	_handle->dev = libusb_ref_device(dev);
+	_handle->auto_detach_kernel_driver = 0;
+	_handle->claimed_interfaces = 0;
+	memset(&_handle->os_priv, 0, priv_size);
+
+	r = usbi_backend->open(_handle);
+	if (r < 0) {
+		usbi_dbg("open %d.%d returns %d", dev->bus_number, dev->device_address, r);
+		libusb_unref_device(dev);
+		usbi_mutex_destroy(&_handle->lock);
+		free(_handle);
+		return r;
+	}
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	list_add(&_handle->list, &ctx->open_devs);
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+	*handle = _handle;
+
+	/* At this point, we want to interrupt any existing event handlers so
+	 * that they realise the addition of the new device's poll fd. One
+	 * example when this is desirable is if the user is running a separate
+	 * dedicated libusb events handling thread, which is running with a long
+	 * or infinite timeout. We want to interrupt that iteration of the loop,
+	 * so that it picks up the new fd, and then continues. */
+	usbi_fd_notification(ctx);
+
+	return 0;
+}
+
+/** \ingroup dev
+ * Convenience function for finding a device with a particular
+ * <tt>idVendor</tt>/<tt>idProduct</tt> combination. This function is intended
+ * for those scenarios where you are using libusb to knock up a quick test
+ * application - it allows you to avoid calling libusb_get_device_list() and
+ * worrying about traversing/freeing the list.
+ *
+ * This function has limitations and is hence not intended for use in real
+ * applications: if multiple devices have the same IDs it will only
+ * give you the first one, etc.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param vendor_id the idVendor value to search for
+ * \param product_id the idProduct value to search for
+ * \returns a handle for the first found device, or NULL on error or if the
+ * device could not be found. */
+DEFAULT_VISIBILITY
+libusb_device_handle * LIBUSB_CALL libusb_open_device_with_vid_pid(
+	libusb_context *ctx, uint16_t vendor_id, uint16_t product_id)
+{
+	struct libusb_device **devs;
+	struct libusb_device *found = NULL;
+	struct libusb_device *dev;
+	struct libusb_device_handle *handle = NULL;
+	size_t i = 0;
+	int r;
+
+	if (libusb_get_device_list(ctx, &devs) < 0)
+		return NULL;
+
+	while ((dev = devs[i++]) != NULL) {
+		struct libusb_device_descriptor desc;
+		r = libusb_get_device_descriptor(dev, &desc);
+		if (r < 0)
+			goto out;
+		if (desc.idVendor == vendor_id && desc.idProduct == product_id) {
+			found = dev;
+			break;
+		}
+	}
+
+	if (found) {
+		r = libusb_open(found, &handle);
+		if (r < 0)
+			handle = NULL;
+	}
+
+out:
+	libusb_free_device_list(devs, 1);
+	return handle;
+}
+
+static void do_close(struct libusb_context *ctx,
+	struct libusb_device_handle *dev_handle)
+{
+	struct usbi_transfer *itransfer;
+	struct usbi_transfer *tmp;
+
+	libusb_lock_events(ctx);
+
+	/* remove any transfers in flight that are for this device */
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+
+	/* safe iteration because transfers may be being deleted */
+	list_for_each_entry_safe(itransfer, tmp, &ctx->flying_transfers, list, struct usbi_transfer) {
+		struct libusb_transfer *transfer =
+			USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+		if (transfer->dev_handle != dev_handle)
+			continue;
+
+		if (!(itransfer->flags & USBI_TRANSFER_DEVICE_DISAPPEARED)) {
+			usbi_err(ctx, "Device handle closed while transfer was still being processed, but the device is still connected as far as we know");
+
+			if (itransfer->flags & USBI_TRANSFER_CANCELLING)
+				usbi_warn(ctx, "A cancellation for an in-flight transfer hasn't completed but closing the device handle");
+			else
+				usbi_err(ctx, "A cancellation hasn't even been scheduled on the transfer for which the device is closing");
+		}
+
+		/* remove from the list of in-flight transfers and make sure
+		 * we don't accidentally use the device handle in the future
+		 * (or that such accesses will be easily caught and identified as a crash)
+		 */
+		usbi_mutex_lock(&itransfer->lock);
+		list_del(&itransfer->list);
+		transfer->dev_handle = NULL;
+		usbi_mutex_unlock(&itransfer->lock);
+
+		/* it is up to the user to free up the actual transfer struct.  this is
+		 * just making sure that we don't attempt to process the transfer after
+		 * the device handle is invalid
+		 */
+		usbi_dbg("Removed transfer %p from the in-flight list because device handle %p closed",
+			 transfer, dev_handle);
+	}
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+
+	libusb_unlock_events(ctx);
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	list_del(&dev_handle->list);
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+
+	usbi_backend->close(dev_handle);
+	libusb_unref_device(dev_handle->dev);
+	usbi_mutex_destroy(&dev_handle->lock);
+	free(dev_handle);
+}
+
+/** \ingroup dev
+ * Close a device handle. Should be called on all open handles before your
+ * application exits.
+ *
+ * Internally, this function destroys the reference that was added by
+ * libusb_open() on the given device.
+ *
+ * This is a non-blocking function; no requests are sent over the bus.
+ *
+ * \param dev_handle the handle to close
+ */
+void API_EXPORTED libusb_close(libusb_device_handle *dev_handle)
+{
+	struct libusb_context *ctx;
+	unsigned char dummy = 1;
+	ssize_t r;
+
+	if (!dev_handle)
+		return;
+	usbi_dbg("");
+
+	ctx = HANDLE_CTX(dev_handle);
+
+	/* Similarly to libusb_open(), we want to interrupt all event handlers
+	 * at this point. More importantly, we want to perform the actual close of
+	 * the device while holding the event handling lock (preventing any other
+	 * thread from doing event handling) because we will be removing a file
+	 * descriptor from the polling loop. */
+
+	/* record that we are messing with poll fds */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	ctx->pollfd_modify++;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+
+	/* write some data on control pipe to interrupt event handlers */
+	r = usbi_write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
+	if (r <= 0) {
+		usbi_warn(ctx, "internal signalling write failed, closing anyway");
+		do_close(ctx, dev_handle);
+		usbi_mutex_lock(&ctx->pollfd_modify_lock);
+		ctx->pollfd_modify--;
+		usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+		return;
+	}
+
+	/* take event handling lock */
+	libusb_lock_events(ctx);
+
+	/* read the dummy data */
+	r = usbi_read(ctx->ctrl_pipe[0], &dummy, sizeof(dummy));
+	if (r <= 0)
+		usbi_warn(ctx, "internal signalling read failed, closing anyway");
+
+	/* Close the device */
+	do_close(ctx, dev_handle);
+
+	/* we're done with modifying poll fds */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	ctx->pollfd_modify--;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+
+	/* Release event handling lock and wake up event waiters */
+	libusb_unlock_events(ctx);
+}
+
+/** \ingroup dev
+ * Get the underlying device for a handle. This function does not modify
+ * the reference count of the returned device, so do not feel compelled to
+ * unreference it when you are done.
+ * \param dev_handle a device handle
+ * \returns the underlying device
+ */
+DEFAULT_VISIBILITY
+libusb_device * LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle)
+{
+	return dev_handle->dev;
+}
+
+/** \ingroup dev
+ * Determine the bConfigurationValue of the currently active configuration.
+ *
+ * You could formulate your own control request to obtain this information,
+ * but this function has the advantage that it may be able to retrieve the
+ * information from operating system caches (no I/O involved).
+ *
+ * If the OS does not cache this information, then this function will block
+ * while a control transfer is submitted to retrieve the information.
+ *
+ * This function will return a value of 0 in the <tt>config</tt> output
+ * parameter if the device is in unconfigured state.
+ *
+ * \param dev a device handle
+ * \param config output location for the bConfigurationValue of the active
+ * configuration (only valid for return code 0)
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_get_configuration(libusb_device_handle *dev,
+	int *config)
+{
+	int r = LIBUSB_ERROR_NOT_SUPPORTED;
+
+	usbi_dbg("");
+	if (usbi_backend->get_configuration)
+		r = usbi_backend->get_configuration(dev, config);
+
+	if (r == LIBUSB_ERROR_NOT_SUPPORTED) {
+		uint8_t tmp = 0;
+		usbi_dbg("falling back to control message");
+		r = libusb_control_transfer(dev, LIBUSB_ENDPOINT_IN,
+			LIBUSB_REQUEST_GET_CONFIGURATION, 0, 0, &tmp, 1, 1000);
+		if (r == 0) {
+			usbi_err(HANDLE_CTX(dev), "zero bytes returned in ctrl transfer?");
+			r = LIBUSB_ERROR_IO;
+		} else if (r == 1) {
+			r = 0;
+			*config = tmp;
+		} else {
+			usbi_dbg("control failed, error %d", r);
+		}
+	}
+
+	if (r == 0)
+		usbi_dbg("active config %d", *config);
+
+	return r;
+}
+
+/** \ingroup dev
+ * Set the active configuration for a device.
+ *
+ * The operating system may or may not have already set an active
+ * configuration on the device. It is up to your application to ensure the
+ * correct configuration is selected before you attempt to claim interfaces
+ * and perform other operations.
+ *
+ * If you call this function on a device already configured with the selected
+ * configuration, then this function will act as a lightweight device reset:
+ * it will issue a SET_CONFIGURATION request using the current configuration,
+ * causing most USB-related device state to be reset (altsetting reset to zero,
+ * endpoint halts cleared, toggles reset).
+ *
+ * You cannot change/reset configuration if your application has claimed
+ * interfaces. It is advised to set the desired configuration before claiming
+ * interfaces.
+ *
+ * Alternatively you can call libusb_release_interface() first. Note if you
+ * do things this way you must ensure that auto_detach_kernel_driver for
+ * <tt>dev</tt> is 0, otherwise the kernel driver will be re-attached when you
+ * release the interface(s).
+ *
+ * You cannot change/reset configuration if other applications or drivers have
+ * claimed interfaces.
+ *
+ * A configuration value of -1 will put the device in unconfigured state.
+ * The USB specifications state that a configuration value of 0 does this,
+ * however buggy devices exist which actually have a configuration 0.
+ *
+ * You should always use this function rather than formulating your own
+ * SET_CONFIGURATION control request. This is because the underlying operating
+ * system needs to know when such changes happen.
+ *
+ * This is a blocking function.
+ *
+ * \param dev a device handle
+ * \param configuration the bConfigurationValue of the configuration you
+ * wish to activate, or -1 if you wish to put the device in unconfigured state
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the requested configuration does not exist
+ * \returns LIBUSB_ERROR_BUSY if interfaces are currently claimed
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ * \see libusb_set_auto_detach_kernel_driver()
+ */
+int API_EXPORTED libusb_set_configuration(libusb_device_handle *dev,
+	int configuration)
+{
+	usbi_dbg("configuration %d", configuration);
+	return usbi_backend->set_configuration(dev, configuration);
+}
+
+/** \ingroup dev
+ * Claim an interface on a given device handle. You must claim the interface
+ * you wish to use before you can perform I/O on any of its endpoints.
+ *
+ * It is legal to attempt to claim an already-claimed interface, in which
+ * case libusb just returns 0 without doing anything.
+ *
+ * If auto_detach_kernel_driver is set to 1 for <tt>dev</tt>, the kernel driver
+ * will be detached if necessary, on failure the detach error is returned.
+ *
+ * Claiming of interfaces is a purely logical operation; it does not cause
+ * any requests to be sent over the bus. Interface claiming is used to
+ * instruct the underlying operating system that your application wishes
+ * to take ownership of the interface.
+ *
+ * This is a non-blocking function.
+ *
+ * \param dev a device handle
+ * \param interface_number the <tt>bInterfaceNumber</tt> of the interface you
+ * wish to claim
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the requested interface does not exist
+ * \returns LIBUSB_ERROR_BUSY if another program or driver has claimed the
+ * interface
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns a LIBUSB_ERROR code on other failure
+ * \see libusb_set_auto_detach_kernel_driver()
+ */
+int API_EXPORTED libusb_claim_interface(libusb_device_handle *dev,
+	int interface_number)
+{
+	int r = 0;
+
+	usbi_dbg("interface %d", interface_number);
+	if (interface_number >= USB_MAXINTERFACES)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	usbi_mutex_lock(&dev->lock);
+	if (dev->claimed_interfaces & (1 << interface_number))
+		goto out;
+
+	r = usbi_backend->claim_interface(dev, interface_number);
+	if (r == 0)
+		dev->claimed_interfaces |= 1 << interface_number;
+
+out:
+	usbi_mutex_unlock(&dev->lock);
+	return r;
+}
+
+/** \ingroup dev
+ * Release an interface previously claimed with libusb_claim_interface(). You
+ * should release all claimed interfaces before closing a device handle.
+ *
+ * This is a blocking function. A SET_INTERFACE control request will be sent
+ * to the device, resetting interface state to the first alternate setting.
+ *
+ * If auto_detach_kernel_driver is set to 1 for <tt>dev</tt>, the kernel
+ * driver will be re-attached after releasing the interface.
+ *
+ * \param dev a device handle
+ * \param interface_number the <tt>bInterfaceNumber</tt> of the
+ * previously-claimed interface
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the interface was not claimed
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ * \see libusb_set_auto_detach_kernel_driver()
+ */
+int API_EXPORTED libusb_release_interface(libusb_device_handle *dev,
+	int interface_number)
+{
+	int r;
+
+	usbi_dbg("interface %d", interface_number);
+	if (interface_number >= USB_MAXINTERFACES)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	usbi_mutex_lock(&dev->lock);
+	if (!(dev->claimed_interfaces & (1 << interface_number))) {
+		r = LIBUSB_ERROR_NOT_FOUND;
+		goto out;
+	}
+
+	r = usbi_backend->release_interface(dev, interface_number);
+	if (r == 0)
+		dev->claimed_interfaces &= ~(1 << interface_number);
+
+out:
+	usbi_mutex_unlock(&dev->lock);
+	return r;
+}
+
+/** \ingroup dev
+ * Activate an alternate setting for an interface. The interface must have
+ * been previously claimed with libusb_claim_interface().
+ *
+ * You should always use this function rather than formulating your own
+ * SET_INTERFACE control request. This is because the underlying operating
+ * system needs to know when such changes happen.
+ *
+ * This is a blocking function.
+ *
+ * \param dev a device handle
+ * \param interface_number the <tt>bInterfaceNumber</tt> of the
+ * previously-claimed interface
+ * \param alternate_setting the <tt>bAlternateSetting</tt> of the alternate
+ * setting to activate
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the interface was not claimed, or the
+ * requested alternate setting does not exist
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_set_interface_alt_setting(libusb_device_handle *dev,
+	int interface_number, int alternate_setting)
+{
+	usbi_dbg("interface %d altsetting %d",
+		interface_number, alternate_setting);
+	if (interface_number >= USB_MAXINTERFACES)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	usbi_mutex_lock(&dev->lock);
+	if (!dev->dev->attached) {
+		usbi_mutex_unlock(&dev->lock);
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	if (!(dev->claimed_interfaces & (1 << interface_number))) {
+		usbi_mutex_unlock(&dev->lock);
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+	usbi_mutex_unlock(&dev->lock);
+
+	return usbi_backend->set_interface_altsetting(dev, interface_number,
+		alternate_setting);
+}
+
+/** \ingroup dev
+ * Clear the halt/stall condition for an endpoint. Endpoints with halt status
+ * are unable to receive or transmit data until the halt condition is stalled.
+ *
+ * You should cancel all pending transfers before attempting to clear the halt
+ * condition.
+ *
+ * This is a blocking function.
+ *
+ * \param dev a device handle
+ * \param endpoint the endpoint to clear halt status
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_clear_halt(libusb_device_handle *dev,
+	unsigned char endpoint)
+{
+	usbi_dbg("endpoint %x", endpoint);
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	return usbi_backend->clear_halt(dev, endpoint);
+}
+
+/** \ingroup dev
+ * Perform a USB port reset to reinitialize a device. The system will attempt
+ * to restore the previous configuration and alternate settings after the
+ * reset has completed.
+ *
+ * If the reset fails, the descriptors change, or the previous state cannot be
+ * restored, the device will appear to be disconnected and reconnected. This
+ * means that the device handle is no longer valid (you should close it) and
+ * rediscover the device. A return code of LIBUSB_ERROR_NOT_FOUND indicates
+ * when this is the case.
+ *
+ * This is a blocking function which usually incurs a noticeable delay.
+ *
+ * \param dev a handle of the device to reset
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if re-enumeration is required, or if the
+ * device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_reset_device(libusb_device_handle *dev)
+{
+	usbi_dbg("");
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	return usbi_backend->reset_device(dev);
+}
+
+/** \ingroup asyncio
+ * Allocate up to num_streams usb bulk streams on the specified endpoints. This
+ * function takes an array of endpoints rather then a single endpoint because
+ * some protocols require that endpoints are setup with similar stream ids.
+ * All endpoints passed in must belong to the same interface.
+ *
+ * Note this function may return less streams then requested. Also note that the
+ * same number of streams are allocated for each endpoint in the endpoint array.
+ *
+ * Stream id 0 is reserved, and should not be used to communicate with devices.
+ * If libusb_alloc_streams() returns with a value of N, you may use stream ids
+ * 1 to N.
+ *
+ * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103
+ *
+ * \param dev a device handle
+ * \param num_streams number of streams to try to allocate
+ * \param endpoints array of endpoints to allocate streams on
+ * \param num_endpoints length of the endpoints array
+ * \returns number of streams allocated, or a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_alloc_streams(libusb_device_handle *dev,
+	uint32_t num_streams, unsigned char *endpoints, int num_endpoints)
+{
+	usbi_dbg("streams %u eps %d", (unsigned) num_streams, num_endpoints);
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	if (usbi_backend->alloc_streams)
+		return usbi_backend->alloc_streams(dev, num_streams, endpoints,
+						   num_endpoints);
+	else
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+/** \ingroup asyncio
+ * Free usb bulk streams allocated with libusb_alloc_streams().
+ *
+ * Note streams are automatically free-ed when releasing an interface.
+ *
+ * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103
+ *
+ * \param dev a device handle
+ * \param endpoints array of endpoints to free streams on
+ * \param num_endpoints length of the endpoints array
+ * \returns LIBUSB_SUCCESS, or a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_free_streams(libusb_device_handle *dev,
+	unsigned char *endpoints, int num_endpoints)
+{
+	usbi_dbg("eps %d", num_endpoints);
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	if (usbi_backend->free_streams)
+		return usbi_backend->free_streams(dev, endpoints,
+						  num_endpoints);
+	else
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+/** \ingroup dev
+ * Determine if a kernel driver is active on an interface. If a kernel driver
+ * is active, you cannot claim the interface, and libusb will be unable to
+ * perform I/O.
+ *
+ * This functionality is not available on Windows.
+ *
+ * \param dev a device handle
+ * \param interface_number the interface to check
+ * \returns 0 if no kernel driver is active
+ * \returns 1 if a kernel driver is active
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns LIBUSB_ERROR_NOT_SUPPORTED on platforms where the functionality
+ * is not available
+ * \returns another LIBUSB_ERROR code on other failure
+ * \see libusb_detach_kernel_driver()
+ */
+int API_EXPORTED libusb_kernel_driver_active(libusb_device_handle *dev,
+	int interface_number)
+{
+	usbi_dbg("interface %d", interface_number);
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	if (usbi_backend->kernel_driver_active)
+		return usbi_backend->kernel_driver_active(dev, interface_number);
+	else
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+/** \ingroup dev
+ * Detach a kernel driver from an interface. If successful, you will then be
+ * able to claim the interface and perform I/O.
+ *
+ * This functionality is not available on Darwin or Windows.
+ *
+ * Note that libusb itself also talks to the device through a special kernel
+ * driver, if this driver is already attached to the device, this call will
+ * not detach it and return LIBUSB_ERROR_NOT_FOUND.
+ *
+ * \param dev a device handle
+ * \param interface_number the interface to detach the driver from
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if no kernel driver was active
+ * \returns LIBUSB_ERROR_INVALID_PARAM if the interface does not exist
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns LIBUSB_ERROR_NOT_SUPPORTED on platforms where the functionality
+ * is not available
+ * \returns another LIBUSB_ERROR code on other failure
+ * \see libusb_kernel_driver_active()
+ */
+int API_EXPORTED libusb_detach_kernel_driver(libusb_device_handle *dev,
+	int interface_number)
+{
+	usbi_dbg("interface %d", interface_number);
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	if (usbi_backend->detach_kernel_driver)
+		return usbi_backend->detach_kernel_driver(dev, interface_number);
+	else
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+/** \ingroup dev
+ * Re-attach an interface's kernel driver, which was previously detached
+ * using libusb_detach_kernel_driver(). This call is only effective on
+ * Linux and returns LIBUSB_ERROR_NOT_SUPPORTED on all other platforms.
+ *
+ * This functionality is not available on Darwin or Windows.
+ *
+ * \param dev a device handle
+ * \param interface_number the interface to attach the driver from
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if no kernel driver was active
+ * \returns LIBUSB_ERROR_INVALID_PARAM if the interface does not exist
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns LIBUSB_ERROR_NOT_SUPPORTED on platforms where the functionality
+ * is not available
+ * \returns LIBUSB_ERROR_BUSY if the driver cannot be attached because the
+ * interface is claimed by a program or driver
+ * \returns another LIBUSB_ERROR code on other failure
+ * \see libusb_kernel_driver_active()
+ */
+int API_EXPORTED libusb_attach_kernel_driver(libusb_device_handle *dev,
+	int interface_number)
+{
+	usbi_dbg("interface %d", interface_number);
+
+	if (!dev->dev->attached)
+		return LIBUSB_ERROR_NO_DEVICE;
+
+	if (usbi_backend->attach_kernel_driver)
+		return usbi_backend->attach_kernel_driver(dev, interface_number);
+	else
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+/** \ingroup dev
+ * Enable/disable libusb's automatic kernel driver detachment. When this is
+ * enabled libusb will automatically detach the kernel driver on an interface
+ * when claiming the interface, and attach it when releasing the interface.
+ *
+ * Automatic kernel driver detachment is disabled on newly opened device
+ * handles by default.
+ *
+ * On platforms which do not have LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER
+ * this function will return LIBUSB_ERROR_NOT_SUPPORTED, and libusb will
+ * continue as if this function was never called.
+ *
+ * \param dev a device handle
+ * \param enable whether to enable or disable auto kernel driver detachment
+ *
+ * \returns LIBUSB_SUCCESS on success
+ * \returns LIBUSB_ERROR_NOT_SUPPORTED on platforms where the functionality
+ * is not available
+ * \see libusb_claim_interface()
+ * \see libusb_release_interface()
+ * \see libusb_set_configuration()
+ */
+int API_EXPORTED libusb_set_auto_detach_kernel_driver(
+	libusb_device_handle *dev, int enable)
+{
+	if (!(usbi_backend->caps & USBI_CAP_SUPPORTS_DETACH_KERNEL_DRIVER))
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+
+	dev->auto_detach_kernel_driver = enable;
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup lib
+ * Set log message verbosity.
+ *
+ * The default level is LIBUSB_LOG_LEVEL_NONE, which means no messages are ever
+ * printed. If you choose to increase the message verbosity level, ensure
+ * that your application does not close the stdout/stderr file descriptors.
+ *
+ * You are advised to use level LIBUSB_LOG_LEVEL_WARNING. libusb is conservative
+ * with its message logging and most of the time, will only log messages that
+ * explain error conditions and other oddities. This will help you debug
+ * your software.
+ *
+ * If the LIBUSB_DEBUG environment variable was set when libusb was
+ * initialized, this function does nothing: the message verbosity is fixed
+ * to the value in the environment variable.
+ *
+ * If libusb was compiled without any message logging, this function does
+ * nothing: you'll never get any messages.
+ *
+ * If libusb was compiled with verbose debug message logging, this function
+ * does nothing: you'll always get messages from all levels.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param level debug level to set
+ */
+void API_EXPORTED libusb_set_debug(libusb_context *ctx, int level)
+{
+	USBI_GET_CONTEXT(ctx);
+	if (!ctx->debug_fixed)
+		ctx->debug = level;
+}
+
+/** \ingroup lib
+ * Initialize libusb. This function must be called before calling any other
+ * libusb function.
+ *
+ * If you do not provide an output location for a context pointer, a default
+ * context will be created. If there was already a default context, it will
+ * be reused (and nothing will be initialized/reinitialized).
+ *
+ * \param context Optional output location for context pointer.
+ * Only valid on return code 0.
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ * \see contexts
+ */
+int API_EXPORTED libusb_init(libusb_context **context)
+{
+	struct libusb_device *dev, *next;
+	char *dbg = getenv("LIBUSB_DEBUG");
+	struct libusb_context *ctx;
+	static int first_init = 1;
+	int r = 0;
+
+	usbi_mutex_static_lock(&default_context_lock);
+
+	if (!timestamp_origin.tv_sec) {
+		usbi_gettimeofday(&timestamp_origin, NULL);
+	}
+
+	if (!context && usbi_default_context) {
+		usbi_dbg("reusing default context");
+		default_context_refcnt++;
+		usbi_mutex_static_unlock(&default_context_lock);
+		return 0;
+	}
+
+	ctx = calloc(1, sizeof(*ctx));
+	if (!ctx) {
+		r = LIBUSB_ERROR_NO_MEM;
+		goto err_unlock;
+	}
+
+#ifdef ENABLE_DEBUG_LOGGING
+	ctx->debug = LIBUSB_LOG_LEVEL_DEBUG;
+#endif
+
+	if (dbg) {
+		ctx->debug = atoi(dbg);
+		if (ctx->debug)
+			ctx->debug_fixed = 1;
+	}
+
+	/* default context should be initialized before calling usbi_dbg */
+	if (!usbi_default_context) {
+		usbi_default_context = ctx;
+		default_context_refcnt++;
+		usbi_dbg("created default context");
+	}
+
+	usbi_dbg("libusb v%d.%d.%d.%d", libusb_version_internal.major, libusb_version_internal.minor,
+		libusb_version_internal.micro, libusb_version_internal.nano);
+
+	usbi_mutex_init(&ctx->usb_devs_lock, NULL);
+	usbi_mutex_init(&ctx->open_devs_lock, NULL);
+	usbi_mutex_init(&ctx->hotplug_cbs_lock, NULL);
+	list_init(&ctx->usb_devs);
+	list_init(&ctx->open_devs);
+	list_init(&ctx->hotplug_cbs);
+
+	usbi_mutex_static_lock(&active_contexts_lock);
+	if (first_init) {
+		first_init = 0;
+		list_init (&active_contexts_list);
+	}
+	list_add (&ctx->list, &active_contexts_list);
+	usbi_mutex_static_unlock(&active_contexts_lock);
+
+	if (usbi_backend->init) {
+		r = usbi_backend->init(ctx);
+		if (r)
+			goto err_free_ctx;
+	}
+
+	r = usbi_io_init(ctx);
+	if (r < 0)
+		goto err_backend_exit;
+
+	usbi_mutex_static_unlock(&default_context_lock);
+
+	if (context)
+		*context = ctx;
+
+	return 0;
+
+err_backend_exit:
+	if (usbi_backend->exit)
+		usbi_backend->exit();
+err_free_ctx:
+	if (ctx == usbi_default_context)
+		usbi_default_context = NULL;
+
+	usbi_mutex_static_lock(&active_contexts_lock);
+	list_del (&ctx->list);
+	usbi_mutex_static_unlock(&active_contexts_lock);
+
+	usbi_mutex_lock(&ctx->usb_devs_lock);
+	list_for_each_entry_safe(dev, next, &ctx->usb_devs, list, struct libusb_device) {
+		list_del(&dev->list);
+		libusb_unref_device(dev);
+	}
+	usbi_mutex_unlock(&ctx->usb_devs_lock);
+
+	usbi_mutex_destroy(&ctx->open_devs_lock);
+	usbi_mutex_destroy(&ctx->usb_devs_lock);
+	usbi_mutex_destroy(&ctx->hotplug_cbs_lock);
+
+	free(ctx);
+err_unlock:
+	usbi_mutex_static_unlock(&default_context_lock);
+	return r;
+}
+
+/** \ingroup lib
+ * Deinitialize libusb. Should be called after closing all open devices and
+ * before your application terminates.
+ * \param ctx the context to deinitialize, or NULL for the default context
+ */
+void API_EXPORTED libusb_exit(struct libusb_context *ctx)
+{
+	struct libusb_device *dev, *next;
+	struct timeval tv = { 0, 0 };
+
+	usbi_dbg("");
+	USBI_GET_CONTEXT(ctx);
+
+	/* if working with default context, only actually do the deinitialization
+	 * if we're the last user */
+	usbi_mutex_static_lock(&default_context_lock);
+	if (ctx == usbi_default_context) {
+		if (--default_context_refcnt > 0) {
+			usbi_dbg("not destroying default context");
+			usbi_mutex_static_unlock(&default_context_lock);
+			return;
+		}
+		usbi_dbg("destroying default context");
+		usbi_default_context = NULL;
+	}
+	usbi_mutex_static_unlock(&default_context_lock);
+
+	usbi_mutex_static_lock(&active_contexts_lock);
+	list_del (&ctx->list);
+	usbi_mutex_static_unlock(&active_contexts_lock);
+
+	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+		usbi_hotplug_deregister_all(ctx);
+
+		/*
+		 * Ensure any pending unplug events are read from the hotplug
+		 * pipe. The usb_device-s hold in the events are no longer part
+		 * of usb_devs, but the events still hold a reference!
+		 *
+		 * Note we don't do this if the application has left devices
+		 * open (which implies a buggy app) to avoid packet completion
+		 * handlers running when the app does not expect them to run.
+		 */
+		if (list_empty(&ctx->open_devs))
+			libusb_handle_events_timeout(ctx, &tv);
+
+		usbi_mutex_lock(&ctx->usb_devs_lock);
+		list_for_each_entry_safe(dev, next, &ctx->usb_devs, list, struct libusb_device) {
+			list_del(&dev->list);
+			libusb_unref_device(dev);
+		}
+		usbi_mutex_unlock(&ctx->usb_devs_lock);
+	}
+
+	/* a few sanity checks. don't bother with locking because unless
+	 * there is an application bug, nobody will be accessing these. */
+	if (!list_empty(&ctx->usb_devs))
+		usbi_warn(ctx, "some libusb_devices were leaked");
+	if (!list_empty(&ctx->open_devs))
+		usbi_warn(ctx, "application left some devices open");
+
+	usbi_io_exit(ctx);
+	if (usbi_backend->exit)
+		usbi_backend->exit();
+
+	usbi_mutex_destroy(&ctx->open_devs_lock);
+	usbi_mutex_destroy(&ctx->usb_devs_lock);
+	usbi_mutex_destroy(&ctx->hotplug_cbs_lock);
+	free(ctx);
+}
+
+/** \ingroup misc
+ * Check at runtime if the loaded library has a given capability.
+ * This call should be performed after \ref libusb_init(), to ensure the
+ * backend has updated its capability set.
+ *
+ * \param capability the \ref libusb_capability to check for
+ * \returns nonzero if the running library has the capability, 0 otherwise
+ */
+int API_EXPORTED libusb_has_capability(uint32_t capability)
+{
+	switch (capability) {
+	case LIBUSB_CAP_HAS_CAPABILITY:
+		return 1;
+	case LIBUSB_CAP_HAS_HOTPLUG:
+		return !(usbi_backend->get_device_list);
+	case LIBUSB_CAP_HAS_HID_ACCESS:
+		return (usbi_backend->caps & USBI_CAP_HAS_HID_ACCESS);
+	case LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER:
+		return (usbi_backend->caps & USBI_CAP_SUPPORTS_DETACH_KERNEL_DRIVER);
+	}
+	return 0;
+}
+
+/* this is defined in libusbi.h if needed */
+#ifdef LIBUSB_GETTIMEOFDAY_WIN32
+/*
+ * gettimeofday
+ * Implementation according to:
+ * The Open Group Base Specifications Issue 6
+ * IEEE Std 1003.1, 2004 Edition
+ */
+
+/*
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  Contributed by:
+ *  Danny Smith <dannysmith@users.sourceforge.net>
+ */
+
+/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
+#define _W32_FT_OFFSET (116444736000000000)
+
+int usbi_gettimeofday(struct timeval *tp, void *tzp)
+{
+	union {
+		unsigned __int64 ns100; /* Time since 1 Jan 1601, in 100ns units */
+		FILETIME ft;
+	} _now;
+	UNUSED(tzp);
+
+	if(tp) {
+#if defined(OS_WINCE)
+		SYSTEMTIME st;
+		GetSystemTime(&st);
+		SystemTimeToFileTime(&st, &_now.ft);
+#else
+		GetSystemTimeAsFileTime (&_now.ft);
+#endif
+		tp->tv_usec=(long)((_now.ns100 / 10) % 1000000 );
+		tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000);
+	}
+	/* Always return 0 as per Open Group Base Specifications Issue 6.
+	   Do not set errno on error.  */
+	return 0;
+}
+#endif
+
+static void usbi_log_str(struct libusb_context *ctx,
+	enum libusb_log_level level, const char * str)
+{
+#if defined(USE_SYSTEM_LOGGING_FACILITY)
+#if defined(OS_WINDOWS) || defined(OS_WINCE)
+	/* Windows CE only supports the Unicode version of OutputDebugString. */
+	WCHAR wbuf[USBI_MAX_LOG_LEN];
+	MultiByteToWideChar(CP_UTF8, 0, str, -1, wbuf, sizeof(wbuf));
+	OutputDebugStringW(wbuf);
+#elif defined(__ANDROID__)
+	int priority = ANDROID_LOG_UNKNOWN;
+	switch (level) {
+	case LIBUSB_LOG_LEVEL_INFO: priority = ANDROID_LOG_INFO; break;
+	case LIBUSB_LOG_LEVEL_WARNING: priority = ANDROID_LOG_WARN; break;
+	case LIBUSB_LOG_LEVEL_ERROR: priority = ANDROID_LOG_ERROR; break;
+	case LIBUSB_LOG_LEVEL_DEBUG: priority = ANDROID_LOG_DEBUG; break;
+	}
+	__android_log_write(priority, "libusb", str);
+#elif defined(HAVE_SYSLOG_FUNC)
+	int syslog_level = LOG_INFO;
+	switch (level) {
+	case LIBUSB_LOG_LEVEL_INFO: syslog_level = LOG_INFO; break;
+	case LIBUSB_LOG_LEVEL_WARNING: syslog_level = LOG_WARNING; break;
+	case LIBUSB_LOG_LEVEL_ERROR: syslog_level = LOG_ERR; break;
+	case LIBUSB_LOG_LEVEL_DEBUG: syslog_level = LOG_DEBUG; break;
+	}
+	syslog(syslog_level, "%s", str);
+#else /* All of gcc, Clang, XCode seem to use #warning */
+#warning System logging is not supported on this platform. Logging to stderr will be used instead.
+	fputs(str, stderr);
+#endif
+#else
+	fputs(str, stderr);
+#endif /* USE_SYSTEM_LOGGING_FACILITY */
+	UNUSED(ctx);
+	UNUSED(level);
+}
+
+void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level,
+	const char *function, const char *format, va_list args)
+{
+	const char *prefix = "";
+	char buf[USBI_MAX_LOG_LEN];
+	struct timeval now;
+	int global_debug, header_len, text_len;
+	static int has_debug_header_been_displayed = 0;
+
+#ifdef ENABLE_DEBUG_LOGGING
+	global_debug = 1;
+	UNUSED(ctx);
+#else
+	int ctx_level = 0;
+
+	USBI_GET_CONTEXT(ctx);
+	if (ctx) {
+		ctx_level = ctx->debug;
+	} else {
+		char *dbg = getenv("LIBUSB_DEBUG");
+		if (dbg)
+			ctx_level = atoi(dbg);
+	}
+	global_debug = (ctx_level == LIBUSB_LOG_LEVEL_DEBUG);
+	if (!ctx_level)
+		return;
+	if (level == LIBUSB_LOG_LEVEL_WARNING && ctx_level < LIBUSB_LOG_LEVEL_WARNING)
+		return;
+	if (level == LIBUSB_LOG_LEVEL_INFO && ctx_level < LIBUSB_LOG_LEVEL_INFO)
+		return;
+	if (level == LIBUSB_LOG_LEVEL_DEBUG && ctx_level < LIBUSB_LOG_LEVEL_DEBUG)
+		return;
+#endif
+
+	usbi_gettimeofday(&now, NULL);
+	if ((global_debug) && (!has_debug_header_been_displayed)) {
+		has_debug_header_been_displayed = 1;
+		usbi_log_str(ctx, LIBUSB_LOG_LEVEL_DEBUG, "[timestamp] [threadID] facility level [function call] <message>\n");
+		usbi_log_str(ctx, LIBUSB_LOG_LEVEL_DEBUG, "--------------------------------------------------------------------------------\n");
+	}
+	if (now.tv_usec < timestamp_origin.tv_usec) {
+		now.tv_sec--;
+		now.tv_usec += 1000000;
+	}
+	now.tv_sec -= timestamp_origin.tv_sec;
+	now.tv_usec -= timestamp_origin.tv_usec;
+
+	switch (level) {
+	case LIBUSB_LOG_LEVEL_INFO:
+		prefix = "info";
+		break;
+	case LIBUSB_LOG_LEVEL_WARNING:
+		prefix = "warning";
+		break;
+	case LIBUSB_LOG_LEVEL_ERROR:
+		prefix = "error";
+		break;
+	case LIBUSB_LOG_LEVEL_DEBUG:
+		prefix = "debug";
+		break;
+	case LIBUSB_LOG_LEVEL_NONE:
+		return;
+	default:
+		prefix = "unknown";
+		break;
+	}
+
+	if (global_debug) {
+		header_len = snprintf(buf, sizeof(buf),
+			"[%2d.%06d] [%08x] libusb: %s [%s] ",
+			(int)now.tv_sec, (int)now.tv_usec, usbi_get_tid(), prefix, function);
+	} else {
+		header_len = snprintf(buf, sizeof(buf),
+			"libusb: %s [%s] ", prefix, function);
+	}
+
+	if (header_len < 0 || header_len >= sizeof(buf)) {
+		/* Somehow snprintf failed to write to the buffer,
+		 * remove the header so something useful is output. */
+		header_len = 0;
+	}
+	/* Make sure buffer is NUL terminated */
+	buf[header_len] = '\0';
+	text_len = vsnprintf(buf + header_len, sizeof(buf) - header_len,
+		format, args);
+	if (text_len < 0 || text_len + header_len >= sizeof(buf)) {
+		/* Truncated log output. On some platforms a -1 return value means
+		 * that the output was truncated. */
+		text_len = sizeof(buf) - header_len;
+	}
+	if (header_len + text_len + sizeof(USBI_LOG_LINE_END) >= sizeof(buf)) {
+		/* Need to truncate the text slightly to fit on the terminator. */
+		text_len -= (header_len + text_len + sizeof(USBI_LOG_LINE_END)) - sizeof(buf);
+	}
+	strcpy(buf + header_len + text_len, USBI_LOG_LINE_END);
+
+	usbi_log_str(ctx, level, buf);
+}
+
+void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+	const char *function, const char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	usbi_log_v(ctx, level, function, format, args);
+	va_end (args);
+}
+
+/** \ingroup misc
+ * Returns a constant NULL-terminated string with the ASCII name of a libusb
+ * error or transfer status code. The caller must not free() the returned
+ * string.
+ *
+ * \param error_code The \ref libusb_error or libusb_transfer_status code to
+ * return the name of.
+ * \returns The error name, or the string **UNKNOWN** if the value of
+ * error_code is not a known error / status code.
+ */
+DEFAULT_VISIBILITY const char * LIBUSB_CALL libusb_error_name(int error_code)
+{
+	switch (error_code) {
+	case LIBUSB_ERROR_IO:
+		return "LIBUSB_ERROR_IO";
+	case LIBUSB_ERROR_INVALID_PARAM:
+		return "LIBUSB_ERROR_INVALID_PARAM";
+	case LIBUSB_ERROR_ACCESS:
+		return "LIBUSB_ERROR_ACCESS";
+	case LIBUSB_ERROR_NO_DEVICE:
+		return "LIBUSB_ERROR_NO_DEVICE";
+	case LIBUSB_ERROR_NOT_FOUND:
+		return "LIBUSB_ERROR_NOT_FOUND";
+	case LIBUSB_ERROR_BUSY:
+		return "LIBUSB_ERROR_BUSY";
+	case LIBUSB_ERROR_TIMEOUT:
+		return "LIBUSB_ERROR_TIMEOUT";
+	case LIBUSB_ERROR_OVERFLOW:
+		return "LIBUSB_ERROR_OVERFLOW";
+	case LIBUSB_ERROR_PIPE:
+		return "LIBUSB_ERROR_PIPE";
+	case LIBUSB_ERROR_INTERRUPTED:
+		return "LIBUSB_ERROR_INTERRUPTED";
+	case LIBUSB_ERROR_NO_MEM:
+		return "LIBUSB_ERROR_NO_MEM";
+	case LIBUSB_ERROR_NOT_SUPPORTED:
+		return "LIBUSB_ERROR_NOT_SUPPORTED";
+	case LIBUSB_ERROR_OTHER:
+		return "LIBUSB_ERROR_OTHER";
+
+	case LIBUSB_TRANSFER_ERROR:
+		return "LIBUSB_TRANSFER_ERROR";
+	case LIBUSB_TRANSFER_TIMED_OUT:
+		return "LIBUSB_TRANSFER_TIMED_OUT";
+	case LIBUSB_TRANSFER_CANCELLED:
+		return "LIBUSB_TRANSFER_CANCELLED";
+	case LIBUSB_TRANSFER_STALL:
+		return "LIBUSB_TRANSFER_STALL";
+	case LIBUSB_TRANSFER_NO_DEVICE:
+		return "LIBUSB_TRANSFER_NO_DEVICE";
+	case LIBUSB_TRANSFER_OVERFLOW:
+		return "LIBUSB_TRANSFER_OVERFLOW";
+
+	case 0:
+		return "LIBUSB_SUCCESS / LIBUSB_TRANSFER_COMPLETED";
+	default:
+		return "**UNKNOWN**";
+	}
+}
+
+/** \ingroup misc
+ * Returns a pointer to const struct libusb_version with the version
+ * (major, minor, micro, nano and rc) of the running library.
+ */
+DEFAULT_VISIBILITY
+const struct libusb_version * LIBUSB_CALL libusb_get_version(void)
+{
+	return &libusb_version_internal;
+}
diff --git a/Externals/libusb/libusb/descriptor.c b/Externals/libusb/libusb/descriptor.c
new file mode 100644
index 0000000000..93d34ced50
--- /dev/null
+++ b/Externals/libusb/libusb/descriptor.c
@@ -0,0 +1,1199 @@
+/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
+/*
+ * USB descriptor handling functions for libusb
+ * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "libusbi.h"
+
+#define DESC_HEADER_LENGTH		2
+#define DEVICE_DESC_LENGTH		18
+#define CONFIG_DESC_LENGTH		9
+#define INTERFACE_DESC_LENGTH		9
+#define ENDPOINT_DESC_LENGTH		7
+#define ENDPOINT_AUDIO_DESC_LENGTH	9
+
+/** @defgroup desc USB descriptors
+ * This page details how to examine the various standard USB descriptors
+ * for detected devices
+ */
+
+/* set host_endian if the w values are already in host endian format,
+ * as opposed to bus endian. */
+int usbi_parse_descriptor(const unsigned char *source, const char *descriptor,
+	void *dest, int host_endian)
+{
+	const unsigned char *sp = source;
+	unsigned char *dp = dest;
+	uint16_t w;
+	const char *cp;
+	uint32_t d;
+
+	for (cp = descriptor; *cp; cp++) {
+		switch (*cp) {
+			case 'b':	/* 8-bit byte */
+				*dp++ = *sp++;
+				break;
+			case 'w':	/* 16-bit word, convert from little endian to CPU */
+				dp += ((uintptr_t)dp & 1);	/* Align to word boundary */
+
+				if (host_endian) {
+					memcpy(dp, sp, 2);
+				} else {
+					w = (sp[1] << 8) | sp[0];
+					*((uint16_t *)dp) = w;
+				}
+				sp += 2;
+				dp += 2;
+				break;
+			case 'd':	/* 32-bit word, convert from little endian to CPU */
+				dp += ((uintptr_t)dp & 1);	/* Align to word boundary */
+
+				if (host_endian) {
+					memcpy(dp, sp, 4);
+				} else {
+					d = (sp[3] << 24) | (sp[2] << 16) |
+						(sp[1] << 8) | sp[0];
+					*((uint32_t *)dp) = d;
+				}
+				sp += 4;
+				dp += 4;
+				break;
+			case 'u':	/* 16 byte UUID */
+				memcpy(dp, sp, 16);
+				sp += 16;
+				dp += 16;
+				break;
+		}
+	}
+
+	return (int) (sp - source);
+}
+
+static void clear_endpoint(struct libusb_endpoint_descriptor *endpoint)
+{
+	if (endpoint->extra)
+		free((unsigned char *) endpoint->extra);
+}
+
+static int parse_endpoint(struct libusb_context *ctx,
+	struct libusb_endpoint_descriptor *endpoint, unsigned char *buffer,
+	int size, int host_endian)
+{
+	struct usb_descriptor_header header;
+	unsigned char *extra;
+	unsigned char *begin;
+	int parsed = 0;
+	int len;
+
+	if (size < DESC_HEADER_LENGTH) {
+		usbi_err(ctx, "short endpoint descriptor read %d/%d",
+			 size, DESC_HEADER_LENGTH);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(buffer, "bb", &header, 0);
+	if (header.bDescriptorType != LIBUSB_DT_ENDPOINT) {
+		usbi_err(ctx, "unexpected descriptor %x (expected %x)",
+			header.bDescriptorType, LIBUSB_DT_ENDPOINT);
+		return parsed;
+	}
+	if (header.bLength > size) {
+		usbi_warn(ctx, "short endpoint descriptor read %d/%d",
+			  size, header.bLength);
+		return parsed;
+	}
+	if (header.bLength >= ENDPOINT_AUDIO_DESC_LENGTH)
+		usbi_parse_descriptor(buffer, "bbbbwbbb", endpoint, host_endian);
+	else if (header.bLength >= ENDPOINT_DESC_LENGTH)
+		usbi_parse_descriptor(buffer, "bbbbwb", endpoint, host_endian);
+	else {
+		usbi_err(ctx, "invalid endpoint bLength (%d)", header.bLength);
+		return LIBUSB_ERROR_IO;
+	}
+
+	buffer += header.bLength;
+	size -= header.bLength;
+	parsed += header.bLength;
+
+	/* Skip over the rest of the Class Specific or Vendor Specific */
+	/*  descriptors */
+	begin = buffer;
+	while (size >= DESC_HEADER_LENGTH) {
+		usbi_parse_descriptor(buffer, "bb", &header, 0);
+		if (header.bLength < DESC_HEADER_LENGTH) {
+			usbi_err(ctx, "invalid extra ep desc len (%d)",
+				 header.bLength);
+			return LIBUSB_ERROR_IO;
+		} else if (header.bLength > size) {
+			usbi_warn(ctx, "short extra ep desc read %d/%d",
+				  size, header.bLength);
+			return parsed;
+		}
+
+		/* If we find another "proper" descriptor then we're done  */
+		if ((header.bDescriptorType == LIBUSB_DT_ENDPOINT) ||
+				(header.bDescriptorType == LIBUSB_DT_INTERFACE) ||
+				(header.bDescriptorType == LIBUSB_DT_CONFIG) ||
+				(header.bDescriptorType == LIBUSB_DT_DEVICE))
+			break;
+
+		usbi_dbg("skipping descriptor %x", header.bDescriptorType);
+		buffer += header.bLength;
+		size -= header.bLength;
+		parsed += header.bLength;
+	}
+
+	/* Copy any unknown descriptors into a storage area for drivers */
+	/*  to later parse */
+	len = (int)(buffer - begin);
+	if (!len) {
+		endpoint->extra = NULL;
+		endpoint->extra_length = 0;
+		return parsed;
+	}
+
+	extra = malloc(len);
+	endpoint->extra = extra;
+	if (!extra) {
+		endpoint->extra_length = 0;
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	memcpy(extra, begin, len);
+	endpoint->extra_length = len;
+
+	return parsed;
+}
+
+static void clear_interface(struct libusb_interface *usb_interface)
+{
+	int i;
+	int j;
+
+	if (usb_interface->altsetting) {
+		for (i = 0; i < usb_interface->num_altsetting; i++) {
+			struct libusb_interface_descriptor *ifp =
+				(struct libusb_interface_descriptor *)
+				usb_interface->altsetting + i;
+			if (ifp->extra)
+				free((void *) ifp->extra);
+			if (ifp->endpoint) {
+				for (j = 0; j < ifp->bNumEndpoints; j++)
+					clear_endpoint((struct libusb_endpoint_descriptor *)
+						ifp->endpoint + j);
+				free((void *) ifp->endpoint);
+			}
+		}
+		free((void *) usb_interface->altsetting);
+		usb_interface->altsetting = NULL;
+	}
+
+}
+
+static int parse_interface(libusb_context *ctx,
+	struct libusb_interface *usb_interface, unsigned char *buffer, int size,
+	int host_endian)
+{
+	int i;
+	int len;
+	int r;
+	int parsed = 0;
+	int interface_number = -1;
+	size_t tmp;
+	struct usb_descriptor_header header;
+	struct libusb_interface_descriptor *ifp;
+	unsigned char *begin;
+
+	usb_interface->num_altsetting = 0;
+
+	while (size >= INTERFACE_DESC_LENGTH) {
+		struct libusb_interface_descriptor *altsetting =
+			(struct libusb_interface_descriptor *) usb_interface->altsetting;
+		altsetting = usbi_reallocf(altsetting,
+			sizeof(struct libusb_interface_descriptor) *
+			(usb_interface->num_altsetting + 1));
+		if (!altsetting) {
+			r = LIBUSB_ERROR_NO_MEM;
+			goto err;
+		}
+		usb_interface->altsetting = altsetting;
+
+		ifp = altsetting + usb_interface->num_altsetting;
+		usbi_parse_descriptor(buffer, "bbbbbbbbb", ifp, 0);
+		if (ifp->bDescriptorType != LIBUSB_DT_INTERFACE) {
+			usbi_err(ctx, "unexpected descriptor %x (expected %x)",
+				 ifp->bDescriptorType, LIBUSB_DT_INTERFACE);
+			return parsed;
+		}
+		if (ifp->bLength < INTERFACE_DESC_LENGTH) {
+			usbi_err(ctx, "invalid interface bLength (%d)",
+				 ifp->bLength);
+			r = LIBUSB_ERROR_IO;
+			goto err;
+		}
+		if (ifp->bLength > size) {
+			usbi_warn(ctx, "short intf descriptor read %d/%d",
+				 size, ifp->bLength);
+			return parsed;
+		}
+		if (ifp->bNumEndpoints > USB_MAXENDPOINTS) {
+			usbi_err(ctx, "too many endpoints (%d)", ifp->bNumEndpoints);
+			r = LIBUSB_ERROR_IO;
+			goto err;
+		}
+
+		usb_interface->num_altsetting++;
+		ifp->extra = NULL;
+		ifp->extra_length = 0;
+		ifp->endpoint = NULL;
+
+		if (interface_number == -1)
+			interface_number = ifp->bInterfaceNumber;
+
+		/* Skip over the interface */
+		buffer += ifp->bLength;
+		parsed += ifp->bLength;
+		size -= ifp->bLength;
+
+		begin = buffer;
+
+		/* Skip over any interface, class or vendor descriptors */
+		while (size >= DESC_HEADER_LENGTH) {
+			usbi_parse_descriptor(buffer, "bb", &header, 0);
+			if (header.bLength < DESC_HEADER_LENGTH) {
+				usbi_err(ctx,
+					 "invalid extra intf desc len (%d)",
+					 header.bLength);
+				r = LIBUSB_ERROR_IO;
+				goto err;
+			} else if (header.bLength > size) {
+				usbi_warn(ctx,
+					  "short extra intf desc read %d/%d",
+					  size, header.bLength);
+				return parsed;
+			}
+
+			/* If we find another "proper" descriptor then we're done */
+			if ((header.bDescriptorType == LIBUSB_DT_INTERFACE) ||
+					(header.bDescriptorType == LIBUSB_DT_ENDPOINT) ||
+					(header.bDescriptorType == LIBUSB_DT_CONFIG) ||
+					(header.bDescriptorType == LIBUSB_DT_DEVICE))
+				break;
+
+			buffer += header.bLength;
+			parsed += header.bLength;
+			size -= header.bLength;
+		}
+
+		/* Copy any unknown descriptors into a storage area for */
+		/*  drivers to later parse */
+		len = (int)(buffer - begin);
+		if (len) {
+			ifp->extra = malloc(len);
+			if (!ifp->extra) {
+				r = LIBUSB_ERROR_NO_MEM;
+				goto err;
+			}
+			memcpy((unsigned char *) ifp->extra, begin, len);
+			ifp->extra_length = len;
+		}
+
+		if (ifp->bNumEndpoints > 0) {
+			struct libusb_endpoint_descriptor *endpoint;
+			tmp = ifp->bNumEndpoints * sizeof(struct libusb_endpoint_descriptor);
+			endpoint = malloc(tmp);
+			ifp->endpoint = endpoint;
+			if (!endpoint) {
+				r = LIBUSB_ERROR_NO_MEM;
+				goto err;
+			}
+
+			memset(endpoint, 0, tmp);
+			for (i = 0; i < ifp->bNumEndpoints; i++) {
+				r = parse_endpoint(ctx, endpoint + i, buffer, size,
+					host_endian);
+				if (r < 0)
+					goto err;
+				if (r == 0) {
+					ifp->bNumEndpoints = (uint8_t)i;
+					break;;
+				}
+
+				buffer += r;
+				parsed += r;
+				size -= r;
+			}
+		}
+
+		/* We check to see if it's an alternate to this one */
+		ifp = (struct libusb_interface_descriptor *) buffer;
+		if (size < LIBUSB_DT_INTERFACE_SIZE ||
+				ifp->bDescriptorType != LIBUSB_DT_INTERFACE ||
+				ifp->bInterfaceNumber != interface_number)
+			return parsed;
+	}
+
+	return parsed;
+err:
+	clear_interface(usb_interface);
+	return r;
+}
+
+static void clear_configuration(struct libusb_config_descriptor *config)
+{
+	if (config->interface) {
+		int i;
+		for (i = 0; i < config->bNumInterfaces; i++)
+			clear_interface((struct libusb_interface *)
+				config->interface + i);
+		free((void *) config->interface);
+	}
+	if (config->extra)
+		free((void *) config->extra);
+}
+
+static int parse_configuration(struct libusb_context *ctx,
+	struct libusb_config_descriptor *config, unsigned char *buffer,
+	int size, int host_endian)
+{
+	int i;
+	int r;
+	size_t tmp;
+	struct usb_descriptor_header header;
+	struct libusb_interface *usb_interface;
+
+	if (size < LIBUSB_DT_CONFIG_SIZE) {
+		usbi_err(ctx, "short config descriptor read %d/%d",
+			 size, LIBUSB_DT_CONFIG_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(buffer, "bbwbbbbb", config, host_endian);
+	if (config->bDescriptorType != LIBUSB_DT_CONFIG) {
+		usbi_err(ctx, "unexpected descriptor %x (expected %x)",
+			 config->bDescriptorType, LIBUSB_DT_CONFIG);
+		return LIBUSB_ERROR_IO;
+	}
+	if (config->bLength < LIBUSB_DT_CONFIG_SIZE) {
+		usbi_err(ctx, "invalid config bLength (%d)", config->bLength);
+		return LIBUSB_ERROR_IO;
+	}
+	if (config->bLength > size) {
+		usbi_err(ctx, "short config descriptor read %d/%d",
+			 size, config->bLength);
+		return LIBUSB_ERROR_IO;
+	}
+	if (config->bNumInterfaces > USB_MAXINTERFACES) {
+		usbi_err(ctx, "too many interfaces (%d)", config->bNumInterfaces);
+		return LIBUSB_ERROR_IO;
+	}
+
+	tmp = config->bNumInterfaces * sizeof(struct libusb_interface);
+	usb_interface = malloc(tmp);
+	config->interface = usb_interface;
+	if (!config->interface)
+		return LIBUSB_ERROR_NO_MEM;
+
+	memset(usb_interface, 0, tmp);
+	buffer += config->bLength;
+	size -= config->bLength;
+
+	config->extra = NULL;
+	config->extra_length = 0;
+
+	for (i = 0; i < config->bNumInterfaces; i++) {
+		int len;
+		unsigned char *begin;
+
+		/* Skip over the rest of the Class Specific or Vendor */
+		/*  Specific descriptors */
+		begin = buffer;
+		while (size >= DESC_HEADER_LENGTH) {
+			usbi_parse_descriptor(buffer, "bb", &header, 0);
+
+			if (header.bLength < DESC_HEADER_LENGTH) {
+				usbi_err(ctx,
+					 "invalid extra config desc len (%d)",
+					 header.bLength);
+				r = LIBUSB_ERROR_IO;
+				goto err;
+			} else if (header.bLength > size) {
+				usbi_warn(ctx,
+					  "short extra config desc read %d/%d",
+					  size, header.bLength);
+				config->bNumInterfaces = (uint8_t)i;
+				return size;
+			}
+
+			/* If we find another "proper" descriptor then we're done */
+			if ((header.bDescriptorType == LIBUSB_DT_ENDPOINT) ||
+					(header.bDescriptorType == LIBUSB_DT_INTERFACE) ||
+					(header.bDescriptorType == LIBUSB_DT_CONFIG) ||
+					(header.bDescriptorType == LIBUSB_DT_DEVICE))
+				break;
+
+			usbi_dbg("skipping descriptor 0x%x\n", header.bDescriptorType);
+			buffer += header.bLength;
+			size -= header.bLength;
+		}
+
+		/* Copy any unknown descriptors into a storage area for */
+		/*  drivers to later parse */
+		len = (int)(buffer - begin);
+		if (len) {
+			/* FIXME: We should realloc and append here */
+			if (!config->extra_length) {
+				config->extra = malloc(len);
+				if (!config->extra) {
+					r = LIBUSB_ERROR_NO_MEM;
+					goto err;
+				}
+
+				memcpy((unsigned char *) config->extra, begin, len);
+				config->extra_length = len;
+			}
+		}
+
+		r = parse_interface(ctx, usb_interface + i, buffer, size, host_endian);
+		if (r < 0)
+			goto err;
+		if (r == 0) {
+			config->bNumInterfaces = (uint8_t)i;
+			break;
+		}
+
+		buffer += r;
+		size -= r;
+	}
+
+	return size;
+
+err:
+	clear_configuration(config);
+	return r;
+}
+
+static int raw_desc_to_config(struct libusb_context *ctx,
+	unsigned char *buf, int size, int host_endian,
+	struct libusb_config_descriptor **config)
+{
+	struct libusb_config_descriptor *_config = malloc(sizeof(*_config));
+	int r;
+	
+	if (!_config)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = parse_configuration(ctx, _config, buf, size, host_endian);
+	if (r < 0) {
+		usbi_err(ctx, "parse_configuration failed with error %d", r);
+		free(_config);
+		return r;
+	} else if (r > 0) {
+		usbi_warn(ctx, "still %d bytes of descriptor data left", r);
+	}
+	
+	*config = _config;
+	return LIBUSB_SUCCESS;
+}
+
+int usbi_device_cache_descriptor(libusb_device *dev)
+{
+	int r, host_endian = 0;
+
+	r = usbi_backend->get_device_descriptor(dev, (unsigned char *) &dev->device_descriptor,
+						&host_endian);
+	if (r < 0)
+		return r;
+
+	if (!host_endian) {
+		dev->device_descriptor.bcdUSB = libusb_le16_to_cpu(dev->device_descriptor.bcdUSB);
+		dev->device_descriptor.idVendor = libusb_le16_to_cpu(dev->device_descriptor.idVendor);
+		dev->device_descriptor.idProduct = libusb_le16_to_cpu(dev->device_descriptor.idProduct);
+		dev->device_descriptor.bcdDevice = libusb_le16_to_cpu(dev->device_descriptor.bcdDevice);
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup desc
+ * Get the USB device descriptor for a given device.
+ *
+ * This is a non-blocking function; the device descriptor is cached in memory.
+ *
+ * Note since libusb-1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102, this
+ * function always succeeds.
+ *
+ * \param dev the device
+ * \param desc output location for the descriptor data
+ * \returns 0 on success or a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_get_device_descriptor(libusb_device *dev,
+	struct libusb_device_descriptor *desc)
+{
+	usbi_dbg("");
+	memcpy((unsigned char *) desc, (unsigned char *) &dev->device_descriptor,
+	       sizeof (dev->device_descriptor));
+	return 0;
+}
+
+/** \ingroup desc
+ * Get the USB configuration descriptor for the currently active configuration.
+ * This is a non-blocking function which does not involve any requests being
+ * sent to the device.
+ *
+ * \param dev a device
+ * \param config output location for the USB configuration descriptor. Only
+ * valid if 0 was returned. Must be freed with libusb_free_config_descriptor()
+ * after use.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the device is in unconfigured state
+ * \returns another LIBUSB_ERROR code on error
+ * \see libusb_get_config_descriptor
+ */
+int API_EXPORTED libusb_get_active_config_descriptor(libusb_device *dev,
+	struct libusb_config_descriptor **config)
+{
+	struct libusb_config_descriptor _config;
+	unsigned char tmp[LIBUSB_DT_CONFIG_SIZE];
+	unsigned char *buf = NULL;
+	int host_endian = 0;
+	int r;
+
+	r = usbi_backend->get_active_config_descriptor(dev, tmp,
+		LIBUSB_DT_CONFIG_SIZE, &host_endian);
+	if (r < 0)
+		return r;
+	if (r < LIBUSB_DT_CONFIG_SIZE) {
+		usbi_err(dev->ctx, "short config descriptor read %d/%d",
+			 r, LIBUSB_DT_CONFIG_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(tmp, "bbw", &_config, host_endian);
+	buf = malloc(_config.wTotalLength);
+	if (!buf)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = usbi_backend->get_active_config_descriptor(dev, buf,
+		_config.wTotalLength, &host_endian);
+	if (r >= 0)
+		r = raw_desc_to_config(dev->ctx, buf, r, host_endian, config);
+
+	free(buf);
+	return r;
+}
+
+/** \ingroup desc
+ * Get a USB configuration descriptor based on its index.
+ * This is a non-blocking function which does not involve any requests being
+ * sent to the device.
+ *
+ * \param dev a device
+ * \param config_index the index of the configuration you wish to retrieve
+ * \param config output location for the USB configuration descriptor. Only
+ * valid if 0 was returned. Must be freed with libusb_free_config_descriptor()
+ * after use.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the configuration does not exist
+ * \returns another LIBUSB_ERROR code on error
+ * \see libusb_get_active_config_descriptor()
+ * \see libusb_get_config_descriptor_by_value()
+ */
+int API_EXPORTED libusb_get_config_descriptor(libusb_device *dev,
+	uint8_t config_index, struct libusb_config_descriptor **config)
+{
+	struct libusb_config_descriptor _config;
+	unsigned char tmp[LIBUSB_DT_CONFIG_SIZE];
+	unsigned char *buf = NULL;
+	int host_endian = 0;
+	int r;
+
+	usbi_dbg("index %d", config_index);
+	if (config_index >= dev->num_configurations)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	r = usbi_backend->get_config_descriptor(dev, config_index, tmp,
+		LIBUSB_DT_CONFIG_SIZE, &host_endian);
+	if (r < 0)
+		return r;
+	if (r < LIBUSB_DT_CONFIG_SIZE) {
+		usbi_err(dev->ctx, "short config descriptor read %d/%d",
+			 r, LIBUSB_DT_CONFIG_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(tmp, "bbw", &_config, host_endian);
+	buf = malloc(_config.wTotalLength);
+	if (!buf)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = usbi_backend->get_config_descriptor(dev, config_index, buf,
+		_config.wTotalLength, &host_endian);
+	if (r >= 0)
+		r = raw_desc_to_config(dev->ctx, buf, r, host_endian, config);
+
+	free(buf);
+	return r;
+}
+
+/* iterate through all configurations, returning the index of the configuration
+ * matching a specific bConfigurationValue in the idx output parameter, or -1
+ * if the config was not found.
+ * returns 0 on success or a LIBUSB_ERROR code
+ */
+int usbi_get_config_index_by_value(struct libusb_device *dev,
+	uint8_t bConfigurationValue, int *idx)
+{
+	uint8_t i;
+
+	usbi_dbg("value %d", bConfigurationValue);
+	for (i = 0; i < dev->num_configurations; i++) {
+		unsigned char tmp[6];
+		int host_endian;
+		int r = usbi_backend->get_config_descriptor(dev, i, tmp, sizeof(tmp),
+			&host_endian);
+		if (r < 0) {
+			*idx = -1;
+			return r;
+		}
+		if (tmp[5] == bConfigurationValue) {
+			*idx = i;
+			return 0;
+		}
+	}
+
+	*idx = -1;
+	return 0;
+}
+
+/** \ingroup desc
+ * Get a USB configuration descriptor with a specific bConfigurationValue.
+ * This is a non-blocking function which does not involve any requests being
+ * sent to the device.
+ *
+ * \param dev a device
+ * \param bConfigurationValue the bConfigurationValue of the configuration you
+ * wish to retrieve
+ * \param config output location for the USB configuration descriptor. Only
+ * valid if 0 was returned. Must be freed with libusb_free_config_descriptor()
+ * after use.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the configuration does not exist
+ * \returns another LIBUSB_ERROR code on error
+ * \see libusb_get_active_config_descriptor()
+ * \see libusb_get_config_descriptor()
+ */
+int API_EXPORTED libusb_get_config_descriptor_by_value(libusb_device *dev,
+	uint8_t bConfigurationValue, struct libusb_config_descriptor **config)
+{
+	int r, idx, host_endian;
+	unsigned char *buf = NULL;
+
+	if (usbi_backend->get_config_descriptor_by_value) {
+		r = usbi_backend->get_config_descriptor_by_value(dev,
+			bConfigurationValue, &buf, &host_endian);
+		if (r < 0)
+			return r;
+		return raw_desc_to_config(dev->ctx, buf, r, host_endian, config);
+	}
+
+	r = usbi_get_config_index_by_value(dev, bConfigurationValue, &idx);
+	if (r < 0)
+		return r;
+	else if (idx == -1)
+		return LIBUSB_ERROR_NOT_FOUND;
+	else
+		return libusb_get_config_descriptor(dev, (uint8_t) idx, config);
+}
+
+/** \ingroup desc
+ * Free a configuration descriptor obtained from
+ * libusb_get_active_config_descriptor() or libusb_get_config_descriptor().
+ * It is safe to call this function with a NULL config parameter, in which
+ * case the function simply returns.
+ *
+ * \param config the configuration descriptor to free
+ */
+void API_EXPORTED libusb_free_config_descriptor(
+	struct libusb_config_descriptor *config)
+{
+	if (!config)
+		return;
+
+	clear_configuration(config);
+	free(config);
+}
+
+/** \ingroup desc
+ * Get an endpoints superspeed endpoint companion descriptor (if any)
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param endpoint endpoint descriptor from which to get the superspeed
+ * endpoint companion descriptor
+ * \param ep_comp output location for the superspeed endpoint companion
+ * descriptor. Only valid if 0 was returned. Must be freed with
+ * libusb_free_ss_endpoint_companion_descriptor() after use.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the configuration does not exist
+ * \returns another LIBUSB_ERROR code on error
+ */
+int API_EXPORTED libusb_get_ss_endpoint_companion_descriptor(
+	struct libusb_context *ctx,
+	const struct libusb_endpoint_descriptor *endpoint,
+	struct libusb_ss_endpoint_companion_descriptor **ep_comp)
+{
+	struct usb_descriptor_header header;
+	int size = endpoint->extra_length;
+	const unsigned char *buffer = endpoint->extra;
+
+	*ep_comp = NULL;
+
+	while (size >= DESC_HEADER_LENGTH) {
+		usbi_parse_descriptor(buffer, "bb", &header, 0);
+		if (header.bLength < 2 || header.bLength > size) {
+			usbi_err(ctx, "invalid descriptor length %d",
+				 header.bLength);
+			return LIBUSB_ERROR_IO;
+		}
+		if (header.bDescriptorType != LIBUSB_DT_SS_ENDPOINT_COMPANION) {
+			buffer += header.bLength;
+			size -= header.bLength;
+			continue;
+		}
+		if (header.bLength < LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE) {
+			usbi_err(ctx, "invalid ss-ep-comp-desc length %d",
+				 header.bLength);
+			return LIBUSB_ERROR_IO;
+		}
+		*ep_comp = malloc(sizeof(**ep_comp));
+		if (*ep_comp == NULL)
+			return LIBUSB_ERROR_NO_MEM;
+		usbi_parse_descriptor(buffer, "bbbbw", *ep_comp, 0);
+		return LIBUSB_SUCCESS;
+	}
+	return LIBUSB_ERROR_NOT_FOUND;
+}
+
+/** \ingroup desc
+ * Free a superspeed endpoint companion descriptor obtained from
+ * libusb_get_ss_endpoint_companion_descriptor().
+ * It is safe to call this function with a NULL ep_comp parameter, in which
+ * case the function simply returns.
+ *
+ * \param ep_comp the superspeed endpoint companion descriptor to free
+ */
+void API_EXPORTED libusb_free_ss_endpoint_companion_descriptor(
+	struct libusb_ss_endpoint_companion_descriptor *ep_comp)
+{
+	free(ep_comp);
+}
+
+static int parse_bos(struct libusb_context *ctx,
+	struct libusb_bos_descriptor **bos,
+	unsigned char *buffer, int size, int host_endian)
+{
+	struct libusb_bos_descriptor bos_header, *_bos;
+	struct libusb_bos_dev_capability_descriptor dev_cap;
+	int i;
+
+	if (size < LIBUSB_DT_BOS_SIZE) {
+		usbi_err(ctx, "short bos descriptor read %d/%d",
+			 size, LIBUSB_DT_BOS_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(buffer, "bbwb", &bos_header, host_endian);
+	if (bos_header.bDescriptorType != LIBUSB_DT_BOS) {
+		usbi_err(ctx, "unexpected descriptor %x (expected %x)",
+			 bos_header.bDescriptorType, LIBUSB_DT_BOS);
+		return LIBUSB_ERROR_IO;
+	}
+	if (bos_header.bLength < LIBUSB_DT_BOS_SIZE) {
+		usbi_err(ctx, "invalid bos bLength (%d)", bos_header.bLength);
+		return LIBUSB_ERROR_IO;
+	}
+	if (bos_header.bLength > size) {
+		usbi_err(ctx, "short bos descriptor read %d/%d",
+			 size, bos_header.bLength);
+		return LIBUSB_ERROR_IO;
+	}
+
+	_bos = calloc (1,
+		sizeof(*_bos) + bos_header.bNumDeviceCaps * sizeof(void *));
+	if (!_bos)
+		return LIBUSB_ERROR_NO_MEM;
+
+	usbi_parse_descriptor(buffer, "bbwb", _bos, host_endian);
+	buffer += bos_header.bLength;
+	size -= bos_header.bLength;
+
+	/* Get the device capability descriptors */
+	for (i = 0; i < bos_header.bNumDeviceCaps; i++) {
+		if (size < LIBUSB_DT_DEVICE_CAPABILITY_SIZE) {
+			usbi_warn(ctx, "short dev-cap descriptor read %d/%d",
+				  size, LIBUSB_DT_DEVICE_CAPABILITY_SIZE);
+			break;
+		}
+		usbi_parse_descriptor(buffer, "bbb", &dev_cap, host_endian);
+		if (dev_cap.bDescriptorType != LIBUSB_DT_DEVICE_CAPABILITY) {
+			usbi_warn(ctx, "unexpected descriptor %x (expected %x)",
+				  dev_cap.bDescriptorType, LIBUSB_DT_DEVICE_CAPABILITY);
+			break;
+		}
+		if (dev_cap.bLength < LIBUSB_DT_DEVICE_CAPABILITY_SIZE) {
+			usbi_err(ctx, "invalid dev-cap bLength (%d)",
+				 dev_cap.bLength);
+			libusb_free_bos_descriptor(_bos);
+			return LIBUSB_ERROR_IO;
+		}
+		if (dev_cap.bLength > size) {
+			usbi_warn(ctx, "short dev-cap descriptor read %d/%d",
+				  size, dev_cap.bLength);
+			break;
+		}
+
+		_bos->dev_capability[i] = malloc(dev_cap.bLength);
+		if (!_bos->dev_capability[i]) {
+			libusb_free_bos_descriptor(_bos);
+			return LIBUSB_ERROR_NO_MEM;
+		}
+		memcpy(_bos->dev_capability[i], buffer, dev_cap.bLength);
+		buffer += dev_cap.bLength;
+		size -= dev_cap.bLength;
+	}
+	_bos->bNumDeviceCaps = (uint8_t)i;
+	*bos = _bos;
+
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup desc
+ * Get a Binary Object Store (BOS) descriptor
+ * This is a BLOCKING function, which will send requests to the device.
+ *
+ * \param handle the handle of an open libusb device
+ * \param bos output location for the BOS descriptor. Only valid if 0 was returned.
+ * Must be freed with \ref libusb_free_bos_descriptor() after use.
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the device doesn't have a BOS descriptor
+ * \returns another LIBUSB_ERROR code on error
+ */
+int API_EXPORTED libusb_get_bos_descriptor(libusb_device_handle *handle,
+	struct libusb_bos_descriptor **bos)
+{
+	struct libusb_bos_descriptor _bos;
+	uint8_t bos_header[LIBUSB_DT_BOS_SIZE] = {0};
+	unsigned char *bos_data = NULL;
+	const int host_endian = 0;
+	int r;
+
+	/* Read the BOS. This generates 2 requests on the bus,
+	 * one for the header, and one for the full BOS */
+	r = libusb_get_descriptor(handle, LIBUSB_DT_BOS, 0, bos_header,
+				  LIBUSB_DT_BOS_SIZE);
+	if (r < 0) {
+		if (r != LIBUSB_ERROR_PIPE)
+			usbi_err(handle->dev->ctx, "failed to read BOS (%d)", r);
+		return r;
+	}
+	if (r < LIBUSB_DT_BOS_SIZE) {
+		usbi_err(handle->dev->ctx, "short BOS read %d/%d",
+			 r, LIBUSB_DT_BOS_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(bos_header, "bbwb", &_bos, host_endian);
+	usbi_dbg("found BOS descriptor: size %d bytes, %d capabilities",
+		 _bos.wTotalLength, _bos.bNumDeviceCaps);
+	bos_data = calloc(_bos.wTotalLength, 1);
+	if (bos_data == NULL)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = libusb_get_descriptor(handle, LIBUSB_DT_BOS, 0, bos_data,
+				  _bos.wTotalLength);
+	if (r >= 0)
+		r = parse_bos(handle->dev->ctx, bos, bos_data, r, host_endian);
+	else
+		usbi_err(handle->dev->ctx, "failed to read BOS (%d)", r);
+
+	free(bos_data);
+	return r;
+}
+
+/** \ingroup desc
+ * Free a BOS descriptor obtained from libusb_get_bos_descriptor().
+ * It is safe to call this function with a NULL bos parameter, in which
+ * case the function simply returns.
+ *
+ * \param bos the BOS descriptor to free
+ */
+void API_EXPORTED libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos)
+{
+	int i;
+
+	if (!bos)
+		return;
+
+	for (i = 0; i < bos->bNumDeviceCaps; i++)
+		free(bos->dev_capability[i]);
+	free(bos);
+}
+
+/** \ingroup desc
+ * Get an USB 2.0 Extension descriptor
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param dev_cap Device Capability descriptor with a bDevCapabilityType of
+ * \ref libusb_capability_type::LIBUSB_BT_USB_2_0_EXTENSION
+ * LIBUSB_BT_USB_2_0_EXTENSION
+ * \param usb_2_0_extension output location for the USB 2.0 Extension
+ * descriptor. Only valid if 0 was returned. Must be freed with
+ * libusb_free_usb_2_0_extension_descriptor() after use.
+ * \returns 0 on success
+ * \returns a LIBUSB_ERROR code on error
+ */
+int API_EXPORTED libusb_get_usb_2_0_extension_descriptor(
+	struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_usb_2_0_extension_descriptor **usb_2_0_extension)
+{
+	struct libusb_usb_2_0_extension_descriptor *_usb_2_0_extension;
+	const int host_endian = 0;
+
+	if (dev_cap->bDevCapabilityType != LIBUSB_BT_USB_2_0_EXTENSION) {
+		usbi_err(ctx, "unexpected bDevCapabilityType %x (expected %x)",
+			 dev_cap->bDevCapabilityType,
+			 LIBUSB_BT_USB_2_0_EXTENSION);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+	if (dev_cap->bLength < LIBUSB_BT_USB_2_0_EXTENSION_SIZE) {
+		usbi_err(ctx, "short dev-cap descriptor read %d/%d",
+			 dev_cap->bLength, LIBUSB_BT_USB_2_0_EXTENSION_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	_usb_2_0_extension = malloc(sizeof(*_usb_2_0_extension));
+	if (!_usb_2_0_extension)
+		return LIBUSB_ERROR_NO_MEM;
+
+	usbi_parse_descriptor((unsigned char *)dev_cap, "bbbd",
+			      _usb_2_0_extension, host_endian);
+
+	*usb_2_0_extension = _usb_2_0_extension;
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup desc
+ * Free a USB 2.0 Extension descriptor obtained from
+ * libusb_get_usb_2_0_extension_descriptor().
+ * It is safe to call this function with a NULL usb_2_0_extension parameter,
+ * in which case the function simply returns.
+ *
+ * \param usb_2_0_extension the USB 2.0 Extension descriptor to free
+ */
+void API_EXPORTED libusb_free_usb_2_0_extension_descriptor(
+	struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension)
+{
+	free(usb_2_0_extension);
+}
+
+/** \ingroup desc
+ * Get a SuperSpeed USB Device Capability descriptor
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param dev_cap Device Capability descriptor with a bDevCapabilityType of
+ * \ref libusb_capability_type::LIBUSB_BT_SS_USB_DEVICE_CAPABILITY
+ * LIBUSB_BT_SS_USB_DEVICE_CAPABILITY
+ * \param ss_usb_device_cap output location for the SuperSpeed USB Device
+ * Capability descriptor. Only valid if 0 was returned. Must be freed with
+ * libusb_free_ss_usb_device_capability_descriptor() after use.
+ * \returns 0 on success
+ * \returns a LIBUSB_ERROR code on error
+ */
+int API_EXPORTED libusb_get_ss_usb_device_capability_descriptor(
+	struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_ss_usb_device_capability_descriptor **ss_usb_device_cap)
+{
+	struct libusb_ss_usb_device_capability_descriptor *_ss_usb_device_cap;
+	const int host_endian = 0;
+
+	if (dev_cap->bDevCapabilityType != LIBUSB_BT_SS_USB_DEVICE_CAPABILITY) {
+		usbi_err(ctx, "unexpected bDevCapabilityType %x (expected %x)",
+			 dev_cap->bDevCapabilityType,
+			 LIBUSB_BT_SS_USB_DEVICE_CAPABILITY);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+	if (dev_cap->bLength < LIBUSB_BT_SS_USB_DEVICE_CAPABILITY_SIZE) {
+		usbi_err(ctx, "short dev-cap descriptor read %d/%d",
+			 dev_cap->bLength, LIBUSB_BT_SS_USB_DEVICE_CAPABILITY_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	_ss_usb_device_cap = malloc(sizeof(*_ss_usb_device_cap));
+	if (!_ss_usb_device_cap)
+		return LIBUSB_ERROR_NO_MEM;
+
+	usbi_parse_descriptor((unsigned char *)dev_cap, "bbbbwbbw",
+			      _ss_usb_device_cap, host_endian);
+
+	*ss_usb_device_cap = _ss_usb_device_cap;
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup desc
+ * Free a SuperSpeed USB Device Capability descriptor obtained from
+ * libusb_get_ss_usb_device_capability_descriptor().
+ * It is safe to call this function with a NULL ss_usb_device_cap
+ * parameter, in which case the function simply returns.
+ *
+ * \param ss_usb_device_cap the USB 2.0 Extension descriptor to free
+ */
+void API_EXPORTED libusb_free_ss_usb_device_capability_descriptor(
+	struct libusb_ss_usb_device_capability_descriptor *ss_usb_device_cap)
+{
+	free(ss_usb_device_cap);
+}
+
+/** \ingroup desc
+ * Get a Container ID descriptor
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param dev_cap Device Capability descriptor with a bDevCapabilityType of
+ * \ref libusb_capability_type::LIBUSB_BT_CONTAINER_ID
+ * LIBUSB_BT_CONTAINER_ID
+ * \param container_id output location for the Container ID descriptor.
+ * Only valid if 0 was returned. Must be freed with
+ * libusb_free_container_id_descriptor() after use.
+ * \returns 0 on success
+ * \returns a LIBUSB_ERROR code on error
+ */
+int API_EXPORTED libusb_get_container_id_descriptor(struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_container_id_descriptor **container_id)
+{
+	struct libusb_container_id_descriptor *_container_id;
+	const int host_endian = 0;
+
+	if (dev_cap->bDevCapabilityType != LIBUSB_BT_CONTAINER_ID) {
+		usbi_err(ctx, "unexpected bDevCapabilityType %x (expected %x)",
+			 dev_cap->bDevCapabilityType,
+			 LIBUSB_BT_CONTAINER_ID);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+	if (dev_cap->bLength < LIBUSB_BT_CONTAINER_ID_SIZE) {
+		usbi_err(ctx, "short dev-cap descriptor read %d/%d",
+			 dev_cap->bLength, LIBUSB_BT_CONTAINER_ID_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	_container_id = malloc(sizeof(*_container_id));
+	if (!_container_id)
+		return LIBUSB_ERROR_NO_MEM;
+
+	usbi_parse_descriptor((unsigned char *)dev_cap, "bbbbu",
+			      _container_id, host_endian);
+
+	*container_id = _container_id;
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup desc
+ * Free a Container ID descriptor obtained from
+ * libusb_get_container_id_descriptor().
+ * It is safe to call this function with a NULL container_id parameter,
+ * in which case the function simply returns.
+ *
+ * \param container_id the USB 2.0 Extension descriptor to free
+ */
+void API_EXPORTED libusb_free_container_id_descriptor(
+	struct libusb_container_id_descriptor *container_id)
+{
+	free(container_id);
+}
+
+/** \ingroup desc
+ * Retrieve a string descriptor in C style ASCII.
+ *
+ * Wrapper around libusb_get_string_descriptor(). Uses the first language
+ * supported by the device.
+ *
+ * \param dev a device handle
+ * \param desc_index the index of the descriptor to retrieve
+ * \param data output buffer for ASCII string descriptor
+ * \param length size of data buffer
+ * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
+	uint8_t desc_index, unsigned char *data, int length)
+{
+	unsigned char tbuf[255]; /* Some devices choke on size > 255 */
+	int r, si, di;
+	uint16_t langid;
+
+	/* Asking for the zero'th index is special - it returns a string
+	 * descriptor that contains all the language IDs supported by the
+	 * device. Typically there aren't many - often only one. Language
+	 * IDs are 16 bit numbers, and they start at the third byte in the
+	 * descriptor. There's also no point in trying to read descriptor 0
+	 * with this function. See USB 2.0 specification section 9.6.7 for
+	 * more information.
+	 */
+
+	if (desc_index == 0)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	r = libusb_get_string_descriptor(dev, 0, 0, tbuf, sizeof(tbuf));
+	if (r < 0)
+		return r;
+
+	if (r < 4)
+		return LIBUSB_ERROR_IO;
+
+	langid = tbuf[2] | (tbuf[3] << 8);
+
+	r = libusb_get_string_descriptor(dev, desc_index, langid, tbuf,
+		sizeof(tbuf));
+	if (r < 0)
+		return r;
+
+	if (tbuf[1] != LIBUSB_DT_STRING)
+		return LIBUSB_ERROR_IO;
+
+	if (tbuf[0] > r)
+		return LIBUSB_ERROR_IO;
+
+	for (di = 0, si = 2; si < tbuf[0]; si += 2) {
+		if (di >= (length - 1))
+			break;
+
+		if ((tbuf[si] & 0x80) || (tbuf[si + 1])) /* non-ASCII */
+			data[di++] = '?';
+		else
+			data[di++] = tbuf[si];
+	}
+
+	data[di] = 0;
+	return di;
+}
diff --git a/Externals/libusb/libusb/hotplug.c b/Externals/libusb/libusb/hotplug.c
new file mode 100644
index 0000000000..eba8f98b5e
--- /dev/null
+++ b/Externals/libusb/libusb/hotplug.c
@@ -0,0 +1,327 @@
+/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
+/*
+ * Hotplug functions for libusb
+ * Copyright © 2012-2013 Nathan Hjelm <hjelmn@mac.com>
+ * Copyright © 2012-2013 Peter Stuge <peter@stuge.se>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <assert.h>
+
+#include "libusbi.h"
+#include "hotplug.h"
+
+/**
+ * @defgroup hotplug  Device hotplug event notification
+ * This page details how to use the libusb hotplug interface, where available.
+ *
+ * Be mindful that not all platforms currently implement hotplug notification and
+ * that you should first call on \ref libusb_has_capability() with parameter
+ * \ref LIBUSB_CAP_HAS_HOTPLUG to confirm that hotplug support is available.
+ *
+ * \page hotplug Device hotplug event notification
+ *
+ * \section intro Introduction
+ *
+ * Version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102, has added support
+ * for hotplug events on <b>some</b> platforms (you should test if your platform
+ * supports hotplug notification by calling \ref libusb_has_capability() with
+ * parameter \ref LIBUSB_CAP_HAS_HOTPLUG). 
+ *
+ * This interface allows you to request notification for the arrival and departure
+ * of matching USB devices.
+ *
+ * To receive hotplug notification you register a callback by calling
+ * \ref libusb_hotplug_register_callback(). This function will optionally return
+ * a handle that can be passed to \ref libusb_hotplug_deregister_callback().
+ *
+ * A callback function must return an int (0 or 1) indicating whether the callback is
+ * expecting additional events. Returning 0 will rearm the callback and 1 will cause
+ * the callback to be deregistered. Note that when callbacks are called from
+ * libusb_hotplug_register_callback() because of the \ref LIBUSB_HOTPLUG_ENUMERATE
+ * flag, the callback return value is ignored, iow you cannot cause a callback
+ * to be deregistered by returning 1 when it is called from
+ * libusb_hotplug_register_callback().
+ *
+ * Callbacks for a particular context are automatically deregistered by libusb_exit().
+ *
+ * As of 1.0.16 there are two supported hotplug events:
+ *  - LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED: A device has arrived and is ready to use
+ *  - LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT: A device has left and is no longer available
+ *
+ * A hotplug event can listen for either or both of these events.
+ *
+ * Note: If you receive notification that a device has left and you have any
+ * a libusb_device_handles for the device it is up to you to call libusb_close()
+ * on each handle to free up any remaining resources associated with the device.
+ * Once a device has left any libusb_device_handle associated with the device
+ * are invalid and will remain so even if the device comes back.
+ *
+ * When handling a LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED event it is considered
+ * safe to call any libusb function that takes a libusb_device. On the other hand,
+ * when handling a LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT event the only safe function
+ * is libusb_get_device_descriptor().
+ *
+ * The following code provides an example of the usage of the hotplug interface:
+\code
+#include <stdio.h>
+#include <stdlib.h>
+#include <libusb.h>
+
+static int count = 0;
+
+int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev,
+                     libusb_hotplug_event event, void *user_data) {
+  static libusb_device_handle *handle = NULL;
+  struct libusb_device_descriptor desc;
+  int rc;
+
+  (void)libusb_get_device_descriptor(dev, &desc);
+
+  if (LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED == event) {
+    rc = libusb_open(dev, &handle);
+    if (LIBUSB_SUCCESS != rc) {
+      printf("Could not open USB device\n");
+    }
+  } else if (LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT == event) {
+    if (handle) {
+      libusb_close(handle);
+      handle = NULL;
+    }
+  } else {
+    printf("Unhandled event %d\n", event);
+  }
+  count++;
+
+  return 0;
+}
+
+int main (void) {
+  libusb_hotplug_callback_handle handle;
+  int rc;
+
+  libusb_init(NULL);
+
+  rc = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
+                                        LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, 0, 0x045a, 0x5005,
+                                        LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, NULL,
+                                        &handle);
+  if (LIBUSB_SUCCESS != rc) {
+    printf("Error creating a hotplug callback\n");
+    libusb_exit(NULL);
+    return EXIT_FAILURE;
+  }
+
+  while (count < 2) {
+    libusb_handle_events_completed(NULL, NULL);
+    usleep(10000);
+  }
+
+  libusb_hotplug_deregister_callback(NULL, handle);
+  libusb_exit(NULL);
+
+  return 0;
+}
+\endcode
+ */
+
+static int usbi_hotplug_match_cb (struct libusb_context *ctx,
+	struct libusb_device *dev, libusb_hotplug_event event,
+	struct libusb_hotplug_callback *hotplug_cb)
+{
+	/* Handle lazy deregistration of callback */
+	if (hotplug_cb->needs_free) {
+		/* Free callback */
+		return 1;
+	}
+
+	if (!(hotplug_cb->events & event)) {
+		return 0;
+	}
+
+	if (LIBUSB_HOTPLUG_MATCH_ANY != hotplug_cb->vendor_id &&
+	    hotplug_cb->vendor_id != dev->device_descriptor.idVendor) {
+		return 0;
+	}
+
+	if (LIBUSB_HOTPLUG_MATCH_ANY != hotplug_cb->product_id &&
+	    hotplug_cb->product_id != dev->device_descriptor.idProduct) {
+		return 0;
+	}
+
+	if (LIBUSB_HOTPLUG_MATCH_ANY != hotplug_cb->dev_class &&
+	    hotplug_cb->dev_class != dev->device_descriptor.bDeviceClass) {
+		return 0;
+	}
+
+	return hotplug_cb->cb (ctx, dev, event, hotplug_cb->user_data);
+}
+
+void usbi_hotplug_match(struct libusb_context *ctx, struct libusb_device *dev,
+	libusb_hotplug_event event)
+{
+	struct libusb_hotplug_callback *hotplug_cb, *next;
+	int ret;
+
+	usbi_mutex_lock(&ctx->hotplug_cbs_lock);
+
+	list_for_each_entry_safe(hotplug_cb, next, &ctx->hotplug_cbs, list, struct libusb_hotplug_callback) {
+		usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
+		ret = usbi_hotplug_match_cb (ctx, dev, event, hotplug_cb);
+		usbi_mutex_lock(&ctx->hotplug_cbs_lock);
+
+		if (ret) {
+			list_del(&hotplug_cb->list);
+			free(hotplug_cb);
+		}
+	}
+
+	usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
+
+	/* the backend is expected to call the callback for each active transfer */
+}
+
+int API_EXPORTED libusb_hotplug_register_callback(libusb_context *ctx,
+	libusb_hotplug_event events, libusb_hotplug_flag flags,
+	int vendor_id, int product_id, int dev_class,
+	libusb_hotplug_callback_fn cb_fn, void *user_data,
+	libusb_hotplug_callback_handle *handle)
+{
+	libusb_hotplug_callback *new_callback;
+	static int handle_id = 1;
+
+	/* check for hotplug support */
+	if (!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	}
+
+	/* check for sane values */
+	if ((LIBUSB_HOTPLUG_MATCH_ANY != vendor_id && (~0xffff & vendor_id)) ||
+	    (LIBUSB_HOTPLUG_MATCH_ANY != product_id && (~0xffff & product_id)) ||
+	    (LIBUSB_HOTPLUG_MATCH_ANY != dev_class && (~0xff & dev_class)) ||
+	    !cb_fn) {
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	USBI_GET_CONTEXT(ctx);
+
+	new_callback = (libusb_hotplug_callback *)calloc(1, sizeof (*new_callback));
+	if (!new_callback) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	new_callback->ctx = ctx;
+	new_callback->vendor_id = vendor_id;
+	new_callback->product_id = product_id;
+	new_callback->dev_class = dev_class;
+	new_callback->flags = flags;
+	new_callback->events = events;
+	new_callback->cb = cb_fn;
+	new_callback->user_data = user_data;
+	new_callback->needs_free = 0;
+
+	usbi_mutex_lock(&ctx->hotplug_cbs_lock);
+
+	/* protect the handle by the context hotplug lock. it doesn't matter if the same handle
+	 * is used for different contexts only that the handle is unique for this context */
+	new_callback->handle = handle_id++;
+
+	list_add(&new_callback->list, &ctx->hotplug_cbs);
+
+	usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
+
+
+	if (flags & LIBUSB_HOTPLUG_ENUMERATE) {
+		int i, len;
+		struct libusb_device **devs;
+
+		len = (int) libusb_get_device_list(ctx, &devs);
+		if (len < 0) {
+			libusb_hotplug_deregister_callback(ctx,
+							new_callback->handle);
+			return len;
+		}
+
+		for (i = 0; i < len; i++) {
+			usbi_hotplug_match_cb(ctx, devs[i],
+					LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED,
+					new_callback);
+		}
+
+		libusb_free_device_list(devs, 1);
+	}
+
+
+	if (handle) {
+		*handle = new_callback->handle;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+void API_EXPORTED libusb_hotplug_deregister_callback (struct libusb_context *ctx,
+	libusb_hotplug_callback_handle handle)
+{
+	struct libusb_hotplug_callback *hotplug_cb;
+	libusb_hotplug_message message;
+	ssize_t ret;
+
+	/* check for hotplug support */
+	if (!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+		return;
+	}
+
+	USBI_GET_CONTEXT(ctx);
+
+	usbi_mutex_lock(&ctx->hotplug_cbs_lock);
+	list_for_each_entry(hotplug_cb, &ctx->hotplug_cbs, list,
+			    struct libusb_hotplug_callback) {
+		if (handle == hotplug_cb->handle) {
+			/* Mark this callback for deregistration */
+			hotplug_cb->needs_free = 1;
+		}
+	}
+	usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
+
+	/* wakeup handle_events to do the actual free */
+	memset(&message, 0, sizeof(message));
+	ret = usbi_write(ctx->hotplug_pipe[1], &message, sizeof(message));
+	if (sizeof(message) != ret) {
+		usbi_err(ctx, "error writing hotplug message");
+	}
+}
+
+void usbi_hotplug_deregister_all(struct libusb_context *ctx) {
+	struct libusb_hotplug_callback *hotplug_cb, *next;
+
+	usbi_mutex_lock(&ctx->hotplug_cbs_lock);
+	list_for_each_entry_safe(hotplug_cb, next, &ctx->hotplug_cbs, list,
+				 struct libusb_hotplug_callback) {
+		list_del(&hotplug_cb->list);
+		free(hotplug_cb);
+	}
+
+	usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
+}
diff --git a/Externals/libusb/libusb/hotplug.h b/Externals/libusb/libusb/hotplug.h
new file mode 100644
index 0000000000..321a0a8630
--- /dev/null
+++ b/Externals/libusb/libusb/hotplug.h
@@ -0,0 +1,82 @@
+/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
+/*
+ * Hotplug support for libusb
+ * Copyright © 2012-2013 Nathan Hjelm <hjelmn@mac.com>
+ * Copyright © 2012-2013 Peter Stuge <peter@stuge.se>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if !defined(USBI_HOTPLUG_H)
+#define USBI_HOTPLUG_H
+
+#ifndef LIBUSBI_H
+#include "libusbi.h"
+#endif
+
+/** \ingroup hotplug
+ * The hotplug callback structure. The user populates this structure with
+ * libusb_hotplug_prepare_callback() and then calls libusb_hotplug_register_callback()
+ * to receive notification of hotplug events.
+ */
+struct libusb_hotplug_callback {
+	/** Context this callback is associated with */
+	struct libusb_context *ctx;
+
+	/** Vendor ID to match or LIBUSB_HOTPLUG_MATCH_ANY */
+	int vendor_id;
+
+	/** Product ID to match or LIBUSB_HOTPLUG_MATCH_ANY */
+	int product_id;
+
+	/** Device class to match or LIBUSB_HOTPLUG_MATCH_ANY */
+	int dev_class;
+
+	/** Hotplug callback flags */
+	libusb_hotplug_flag flags;
+
+	/** Event(s) that will trigger this callback */
+	libusb_hotplug_event events;
+
+	/** Callback function to invoke for matching event/device */
+	libusb_hotplug_callback_fn cb;
+
+	/** Handle for this callback (used to match on deregister) */
+	libusb_hotplug_callback_handle handle;
+
+	/** User data that will be passed to the callback function */
+	void *user_data;
+
+	/** Callback is marked for deletion */
+	int needs_free;
+
+	/** List this callback is registered in (ctx->hotplug_cbs) */
+	struct list_head list;
+};
+
+typedef struct libusb_hotplug_callback libusb_hotplug_callback;
+
+struct libusb_hotplug_message {
+	libusb_hotplug_event event;
+	struct libusb_device *device;
+};
+
+typedef struct libusb_hotplug_message libusb_hotplug_message;
+
+void usbi_hotplug_deregister_all(struct libusb_context *ctx);
+void usbi_hotplug_match(struct libusb_context *ctx, struct libusb_device *dev,
+			libusb_hotplug_event event);
+
+#endif
diff --git a/Externals/libusb/libusb/io.c b/Externals/libusb/libusb/io.c
new file mode 100644
index 0000000000..b9ca767d76
--- /dev/null
+++ b/Externals/libusb/libusb/io.c
@@ -0,0 +1,2618 @@
+/* -*- Mode: C; indent-tabs-mode:t ; c-basic-offset:8 -*- */
+/*
+ * I/O functions for libusb
+ * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef USBI_TIMERFD_AVAILABLE
+#include <sys/timerfd.h>
+#endif
+
+#include "libusbi.h"
+#include "hotplug.h"
+
+/**
+ * \page io Synchronous and asynchronous device I/O
+ *
+ * \section intro Introduction
+ *
+ * If you're using libusb in your application, you're probably wanting to
+ * perform I/O with devices - you want to perform USB data transfers.
+ *
+ * libusb offers two separate interfaces for device I/O. This page aims to
+ * introduce the two in order to help you decide which one is more suitable
+ * for your application. You can also choose to use both interfaces in your
+ * application by considering each transfer on a case-by-case basis.
+ *
+ * Once you have read through the following discussion, you should consult the
+ * detailed API documentation pages for the details:
+ * - \ref syncio
+ * - \ref asyncio
+ *
+ * \section theory Transfers at a logical level
+ *
+ * At a logical level, USB transfers typically happen in two parts. For
+ * example, when reading data from a endpoint:
+ * -# A request for data is sent to the device
+ * -# Some time later, the incoming data is received by the host
+ *
+ * or when writing data to an endpoint:
+ *
+ * -# The data is sent to the device
+ * -# Some time later, the host receives acknowledgement from the device that
+ *    the data has been transferred.
+ *
+ * There may be an indefinite delay between the two steps. Consider a
+ * fictional USB input device with a button that the user can press. In order
+ * to determine when the button is pressed, you would likely submit a request
+ * to read data on a bulk or interrupt endpoint and wait for data to arrive.
+ * Data will arrive when the button is pressed by the user, which is
+ * potentially hours later.
+ *
+ * libusb offers both a synchronous and an asynchronous interface to performing
+ * USB transfers. The main difference is that the synchronous interface
+ * combines both steps indicated above into a single function call, whereas
+ * the asynchronous interface separates them.
+ *
+ * \section sync The synchronous interface
+ *
+ * The synchronous I/O interface allows you to perform a USB transfer with
+ * a single function call. When the function call returns, the transfer has
+ * completed and you can parse the results.
+ *
+ * If you have used the libusb-0.1 before, this I/O style will seem familar to
+ * you. libusb-0.1 only offered a synchronous interface.
+ *
+ * In our input device example, to read button presses you might write code
+ * in the following style:
+\code
+unsigned char data[4];
+int actual_length;
+int r = libusb_bulk_transfer(handle, LIBUSB_ENDPOINT_IN, data, sizeof(data), &actual_length, 0);
+if (r == 0 && actual_length == sizeof(data)) {
+	// results of the transaction can now be found in the data buffer
+	// parse them here and report button press
+} else {
+	error();
+}
+\endcode
+ *
+ * The main advantage of this model is simplicity: you did everything with
+ * a single simple function call.
+ *
+ * However, this interface has its limitations. Your application will sleep
+ * inside libusb_bulk_transfer() until the transaction has completed. If it
+ * takes the user 3 hours to press the button, your application will be
+ * sleeping for that long. Execution will be tied up inside the library -
+ * the entire thread will be useless for that duration.
+ *
+ * Another issue is that by tieing up the thread with that single transaction
+ * there is no possibility of performing I/O with multiple endpoints and/or
+ * multiple devices simultaneously, unless you resort to creating one thread
+ * per transaction.
+ *
+ * Additionally, there is no opportunity to cancel the transfer after the
+ * request has been submitted.
+ *
+ * For details on how to use the synchronous API, see the
+ * \ref syncio "synchronous I/O API documentation" pages.
+ *
+ * \section async The asynchronous interface
+ *
+ * Asynchronous I/O is the most significant new feature in libusb-1.0.
+ * Although it is a more complex interface, it solves all the issues detailed
+ * above.
+ *
+ * Instead of providing which functions that block until the I/O has complete,
+ * libusb's asynchronous interface presents non-blocking functions which
+ * begin a transfer and then return immediately. Your application passes a
+ * callback function pointer to this non-blocking function, which libusb will
+ * call with the results of the transaction when it has completed.
+ *
+ * Transfers which have been submitted through the non-blocking functions
+ * can be cancelled with a separate function call.
+ *
+ * The non-blocking nature of this interface allows you to be simultaneously
+ * performing I/O to multiple endpoints on multiple devices, without having
+ * to use threads.
+ *
+ * This added flexibility does come with some complications though:
+ * - In the interest of being a lightweight library, libusb does not create
+ * threads and can only operate when your application is calling into it. Your
+ * application must call into libusb from it's main loop when events are ready
+ * to be handled, or you must use some other scheme to allow libusb to
+ * undertake whatever work needs to be done.
+ * - libusb also needs to be called into at certain fixed points in time in
+ * order to accurately handle transfer timeouts.
+ * - Memory handling becomes more complex. You cannot use stack memory unless
+ * the function with that stack is guaranteed not to return until the transfer
+ * callback has finished executing.
+ * - You generally lose some linearity from your code flow because submitting
+ * the transfer request is done in a separate function from where the transfer
+ * results are handled. This becomes particularly obvious when you want to
+ * submit a second transfer based on the results of an earlier transfer.
+ *
+ * Internally, libusb's synchronous interface is expressed in terms of function
+ * calls to the asynchronous interface.
+ *
+ * For details on how to use the asynchronous API, see the
+ * \ref asyncio "asynchronous I/O API" documentation pages.
+ */
+
+
+/**
+ * \page packetoverflow Packets and overflows
+ *
+ * \section packets Packet abstraction
+ *
+ * The USB specifications describe how data is transmitted in packets, with
+ * constraints on packet size defined by endpoint descriptors. The host must
+ * not send data payloads larger than the endpoint's maximum packet size.
+ *
+ * libusb and the underlying OS abstract out the packet concept, allowing you
+ * to request transfers of any size. Internally, the request will be divided
+ * up into correctly-sized packets. You do not have to be concerned with
+ * packet sizes, but there is one exception when considering overflows.
+ *
+ * \section overflow Bulk/interrupt transfer overflows
+ *
+ * When requesting data on a bulk endpoint, libusb requires you to supply a
+ * buffer and the maximum number of bytes of data that libusb can put in that
+ * buffer. However, the size of the buffer is not communicated to the device -
+ * the device is just asked to send any amount of data.
+ *
+ * There is no problem if the device sends an amount of data that is less than
+ * or equal to the buffer size. libusb reports this condition to you through
+ * the \ref libusb_transfer::actual_length "libusb_transfer.actual_length"
+ * field.
+ *
+ * Problems may occur if the device attempts to send more data than can fit in
+ * the buffer. libusb reports LIBUSB_TRANSFER_OVERFLOW for this condition but
+ * other behaviour is largely undefined: actual_length may or may not be
+ * accurate, the chunk of data that can fit in the buffer (before overflow)
+ * may or may not have been transferred.
+ *
+ * Overflows are nasty, but can be avoided. Even though you were told to
+ * ignore packets above, think about the lower level details: each transfer is
+ * split into packets (typically small, with a maximum size of 512 bytes).
+ * Overflows can only happen if the final packet in an incoming data transfer
+ * is smaller than the actual packet that the device wants to transfer.
+ * Therefore, you will never see an overflow if your transfer buffer size is a
+ * multiple of the endpoint's packet size: the final packet will either
+ * fill up completely or will be only partially filled.
+ */
+
+/**
+ * @defgroup asyncio Asynchronous device I/O
+ *
+ * This page details libusb's asynchronous (non-blocking) API for USB device
+ * I/O. This interface is very powerful but is also quite complex - you will
+ * need to read this page carefully to understand the necessary considerations
+ * and issues surrounding use of this interface. Simplistic applications
+ * may wish to consider the \ref syncio "synchronous I/O API" instead.
+ *
+ * The asynchronous interface is built around the idea of separating transfer
+ * submission and handling of transfer completion (the synchronous model
+ * combines both of these into one). There may be a long delay between
+ * submission and completion, however the asynchronous submission function
+ * is non-blocking so will return control to your application during that
+ * potentially long delay.
+ *
+ * \section asyncabstraction Transfer abstraction
+ *
+ * For the asynchronous I/O, libusb implements the concept of a generic
+ * transfer entity for all types of I/O (control, bulk, interrupt,
+ * isochronous). The generic transfer object must be treated slightly
+ * differently depending on which type of I/O you are performing with it.
+ *
+ * This is represented by the public libusb_transfer structure type.
+ *
+ * \section asynctrf Asynchronous transfers
+ *
+ * We can view asynchronous I/O as a 5 step process:
+ * -# <b>Allocation</b>: allocate a libusb_transfer
+ * -# <b>Filling</b>: populate the libusb_transfer instance with information
+ *    about the transfer you wish to perform
+ * -# <b>Submission</b>: ask libusb to submit the transfer
+ * -# <b>Completion handling</b>: examine transfer results in the
+ *    libusb_transfer structure
+ * -# <b>Deallocation</b>: clean up resources
+ *
+ *
+ * \subsection asyncalloc Allocation
+ *
+ * This step involves allocating memory for a USB transfer. This is the
+ * generic transfer object mentioned above. At this stage, the transfer
+ * is "blank" with no details about what type of I/O it will be used for.
+ *
+ * Allocation is done with the libusb_alloc_transfer() function. You must use
+ * this function rather than allocating your own transfers.
+ *
+ * \subsection asyncfill Filling
+ *
+ * This step is where you take a previously allocated transfer and fill it
+ * with information to determine the message type and direction, data buffer,
+ * callback function, etc.
+ *
+ * You can either fill the required fields yourself or you can use the
+ * helper functions: libusb_fill_control_transfer(), libusb_fill_bulk_transfer()
+ * and libusb_fill_interrupt_transfer().
+ *
+ * \subsection asyncsubmit Submission
+ *
+ * When you have allocated a transfer and filled it, you can submit it using
+ * libusb_submit_transfer(). This function returns immediately but can be
+ * regarded as firing off the I/O request in the background.
+ *
+ * \subsection asynccomplete Completion handling
+ *
+ * After a transfer has been submitted, one of four things can happen to it:
+ *
+ * - The transfer completes (i.e. some data was transferred)
+ * - The transfer has a timeout and the timeout expires before all data is
+ * transferred
+ * - The transfer fails due to an error
+ * - The transfer is cancelled
+ *
+ * Each of these will cause the user-specified transfer callback function to
+ * be invoked. It is up to the callback function to determine which of the
+ * above actually happened and to act accordingly.
+ *
+ * The user-specified callback is passed a pointer to the libusb_transfer
+ * structure which was used to setup and submit the transfer. At completion
+ * time, libusb has populated this structure with results of the transfer:
+ * success or failure reason, number of bytes of data transferred, etc. See
+ * the libusb_transfer structure documentation for more information.
+ *
+ * \subsection Deallocation
+ *
+ * When a transfer has completed (i.e. the callback function has been invoked),
+ * you are advised to free the transfer (unless you wish to resubmit it, see
+ * below). Transfers are deallocated with libusb_free_transfer().
+ *
+ * It is undefined behaviour to free a transfer which has not completed.
+ *
+ * \section asyncresubmit Resubmission
+ *
+ * You may be wondering why allocation, filling, and submission are all
+ * separated above where they could reasonably be combined into a single
+ * operation.
+ *
+ * The reason for separation is to allow you to resubmit transfers without
+ * having to allocate new ones every time. This is especially useful for
+ * common situations dealing with interrupt endpoints - you allocate one
+ * transfer, fill and submit it, and when it returns with results you just
+ * resubmit it for the next interrupt.
+ *
+ * \section asynccancel Cancellation
+ *
+ * Another advantage of using the asynchronous interface is that you have
+ * the ability to cancel transfers which have not yet completed. This is
+ * done by calling the libusb_cancel_transfer() function.
+ *
+ * libusb_cancel_transfer() is asynchronous/non-blocking in itself. When the
+ * cancellation actually completes, the transfer's callback function will
+ * be invoked, and the callback function should check the transfer status to
+ * determine that it was cancelled.
+ *
+ * Freeing the transfer after it has been cancelled but before cancellation
+ * has completed will result in undefined behaviour.
+ *
+ * When a transfer is cancelled, some of the data may have been transferred.
+ * libusb will communicate this to you in the transfer callback. Do not assume
+ * that no data was transferred.
+ *
+ * \section bulk_overflows Overflows on device-to-host bulk/interrupt endpoints
+ *
+ * If your device does not have predictable transfer sizes (or it misbehaves),
+ * your application may submit a request for data on an IN endpoint which is
+ * smaller than the data that the device wishes to send. In some circumstances
+ * this will cause an overflow, which is a nasty condition to deal with. See
+ * the \ref packetoverflow page for discussion.
+ *
+ * \section asyncctrl Considerations for control transfers
+ *
+ * The <tt>libusb_transfer</tt> structure is generic and hence does not
+ * include specific fields for the control-specific setup packet structure.
+ *
+ * In order to perform a control transfer, you must place the 8-byte setup
+ * packet at the start of the data buffer. To simplify this, you could
+ * cast the buffer pointer to type struct libusb_control_setup, or you can
+ * use the helper function libusb_fill_control_setup().
+ *
+ * The wLength field placed in the setup packet must be the length you would
+ * expect to be sent in the setup packet: the length of the payload that
+ * follows (or the expected maximum number of bytes to receive). However,
+ * the length field of the libusb_transfer object must be the length of
+ * the data buffer - i.e. it should be wLength <em>plus</em> the size of
+ * the setup packet (LIBUSB_CONTROL_SETUP_SIZE).
+ *
+ * If you use the helper functions, this is simplified for you:
+ * -# Allocate a buffer of size LIBUSB_CONTROL_SETUP_SIZE plus the size of the
+ * data you are sending/requesting.
+ * -# Call libusb_fill_control_setup() on the data buffer, using the transfer
+ * request size as the wLength value (i.e. do not include the extra space you
+ * allocated for the control setup).
+ * -# If this is a host-to-device transfer, place the data to be transferred
+ * in the data buffer, starting at offset LIBUSB_CONTROL_SETUP_SIZE.
+ * -# Call libusb_fill_control_transfer() to associate the data buffer with
+ * the transfer (and to set the remaining details such as callback and timeout).
+ *   - Note that there is no parameter to set the length field of the transfer.
+ *     The length is automatically inferred from the wLength field of the setup
+ *     packet.
+ * -# Submit the transfer.
+ *
+ * The multi-byte control setup fields (wValue, wIndex and wLength) must
+ * be given in little-endian byte order (the endianness of the USB bus).
+ * Endianness conversion is transparently handled by
+ * libusb_fill_control_setup() which is documented to accept host-endian
+ * values.
+ *
+ * Further considerations are needed when handling transfer completion in
+ * your callback function:
+ * - As you might expect, the setup packet will still be sitting at the start
+ * of the data buffer.
+ * - If this was a device-to-host transfer, the received data will be sitting
+ * at offset LIBUSB_CONTROL_SETUP_SIZE into the buffer.
+ * - The actual_length field of the transfer structure is relative to the
+ * wLength of the setup packet, rather than the size of the data buffer. So,
+ * if your wLength was 4, your transfer's <tt>length</tt> was 12, then you
+ * should expect an <tt>actual_length</tt> of 4 to indicate that the data was
+ * transferred in entirity.
+ *
+ * To simplify parsing of setup packets and obtaining the data from the
+ * correct offset, you may wish to use the libusb_control_transfer_get_data()
+ * and libusb_control_transfer_get_setup() functions within your transfer
+ * callback.
+ *
+ * Even though control endpoints do not halt, a completed control transfer
+ * may have a LIBUSB_TRANSFER_STALL status code. This indicates the control
+ * request was not supported.
+ *
+ * \section asyncintr Considerations for interrupt transfers
+ *
+ * All interrupt transfers are performed using the polling interval presented
+ * by the bInterval value of the endpoint descriptor.
+ *
+ * \section asynciso Considerations for isochronous transfers
+ *
+ * Isochronous transfers are more complicated than transfers to
+ * non-isochronous endpoints.
+ *
+ * To perform I/O to an isochronous endpoint, allocate the transfer by calling
+ * libusb_alloc_transfer() with an appropriate number of isochronous packets.
+ *
+ * During filling, set \ref libusb_transfer::type "type" to
+ * \ref libusb_transfer_type::LIBUSB_TRANSFER_TYPE_ISOCHRONOUS
+ * "LIBUSB_TRANSFER_TYPE_ISOCHRONOUS", and set
+ * \ref libusb_transfer::num_iso_packets "num_iso_packets" to a value less than
+ * or equal to the number of packets you requested during allocation.
+ * libusb_alloc_transfer() does not set either of these fields for you, given
+ * that you might not even use the transfer on an isochronous endpoint.
+ *
+ * Next, populate the length field for the first num_iso_packets entries in
+ * the \ref libusb_transfer::iso_packet_desc "iso_packet_desc" array. Section
+ * 5.6.3 of the USB2 specifications describe how the maximum isochronous
+ * packet length is determined by the wMaxPacketSize field in the endpoint
+ * descriptor.
+ * Two functions can help you here:
+ *
+ * - libusb_get_max_iso_packet_size() is an easy way to determine the max
+ *   packet size for an isochronous endpoint. Note that the maximum packet
+ *   size is actually the maximum number of bytes that can be transmitted in
+ *   a single microframe, therefore this function multiplies the maximum number
+ *   of bytes per transaction by the number of transaction opportunities per
+ *   microframe.
+ * - libusb_set_iso_packet_lengths() assigns the same length to all packets
+ *   within a transfer, which is usually what you want.
+ *
+ * For outgoing transfers, you'll obviously fill the buffer and populate the
+ * packet descriptors in hope that all the data gets transferred. For incoming
+ * transfers, you must ensure the buffer has sufficient capacity for
+ * the situation where all packets transfer the full amount of requested data.
+ *
+ * Completion handling requires some extra consideration. The
+ * \ref libusb_transfer::actual_length "actual_length" field of the transfer
+ * is meaningless and should not be examined; instead you must refer to the
+ * \ref libusb_iso_packet_descriptor::actual_length "actual_length" field of
+ * each individual packet.
+ *
+ * The \ref libusb_transfer::status "status" field of the transfer is also a
+ * little misleading:
+ *  - If the packets were submitted and the isochronous data microframes
+ *    completed normally, status will have value
+ *    \ref libusb_transfer_status::LIBUSB_TRANSFER_COMPLETED
+ *    "LIBUSB_TRANSFER_COMPLETED". Note that bus errors and software-incurred
+ *    delays are not counted as transfer errors; the transfer.status field may
+ *    indicate COMPLETED even if some or all of the packets failed. Refer to
+ *    the \ref libusb_iso_packet_descriptor::status "status" field of each
+ *    individual packet to determine packet failures.
+ *  - The status field will have value
+ *    \ref libusb_transfer_status::LIBUSB_TRANSFER_ERROR
+ *    "LIBUSB_TRANSFER_ERROR" only when serious errors were encountered.
+ *  - Other transfer status codes occur with normal behaviour.
+ *
+ * The data for each packet will be found at an offset into the buffer that
+ * can be calculated as if each prior packet completed in full. The
+ * libusb_get_iso_packet_buffer() and libusb_get_iso_packet_buffer_simple()
+ * functions may help you here.
+ *
+ * \section asyncmem Memory caveats
+ *
+ * In most circumstances, it is not safe to use stack memory for transfer
+ * buffers. This is because the function that fired off the asynchronous
+ * transfer may return before libusb has finished using the buffer, and when
+ * the function returns it's stack gets destroyed. This is true for both
+ * host-to-device and device-to-host transfers.
+ *
+ * The only case in which it is safe to use stack memory is where you can
+ * guarantee that the function owning the stack space for the buffer does not
+ * return until after the transfer's callback function has completed. In every
+ * other case, you need to use heap memory instead.
+ *
+ * \section asyncflags Fine control
+ *
+ * Through using this asynchronous interface, you may find yourself repeating
+ * a few simple operations many times. You can apply a bitwise OR of certain
+ * flags to a transfer to simplify certain things:
+ * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_SHORT_NOT_OK
+ *   "LIBUSB_TRANSFER_SHORT_NOT_OK" results in transfers which transferred
+ *   less than the requested amount of data being marked with status
+ *   \ref libusb_transfer_status::LIBUSB_TRANSFER_ERROR "LIBUSB_TRANSFER_ERROR"
+ *   (they would normally be regarded as COMPLETED)
+ * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_BUFFER
+ *   "LIBUSB_TRANSFER_FREE_BUFFER" allows you to ask libusb to free the transfer
+ *   buffer when freeing the transfer.
+ * - \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_TRANSFER
+ *   "LIBUSB_TRANSFER_FREE_TRANSFER" causes libusb to automatically free the
+ *   transfer after the transfer callback returns.
+ *
+ * \section asyncevent Event handling
+ *
+ * An asynchronous model requires that libusb perform work at various
+ * points in time - namely processing the results of previously-submitted
+ * transfers and invoking the user-supplied callback function.
+ *
+ * This gives rise to the libusb_handle_events() function which your
+ * application must call into when libusb has work do to. This gives libusb
+ * the opportunity to reap pending transfers, invoke callbacks, etc.
+ *
+ * There are 2 different approaches to dealing with libusb_handle_events:
+ *
+ * -# Repeatedly call libusb_handle_events() in blocking mode from a dedicated
+ *    thread.
+ * -# Integrate libusb with your application's main event loop. libusb
+ *    exposes a set of file descriptors which allow you to do this.
+ *
+ * The first approach has the big advantage that it will also work on Windows
+ * were libusb' poll API for select / poll integration is not available. So
+ * if you want to support Windows and use the async API, you must use this
+ * approach, see the \ref eventthread "Using an event handling thread" section
+ * below for details.
+ *
+ * If you prefer a single threaded approach with a single central event loop,
+ * see the \ref poll "polling and timing" section for how to integrate libusb
+ * into your application's main event loop.
+ *
+ * \section eventthread Using an event handling thread
+ *
+ * Lets begin with stating the obvious: If you're going to use a separate
+ * thread for libusb event handling, your callback functions MUST be
+ * threadsafe.
+ *
+ * Other then that doing event handling from a separate thread, is mostly
+ * simple. You can use an event thread function as follows:
+\code
+void *event_thread_func(void *ctx)
+{
+    while (event_thread_run)
+        libusb_handle_events(ctx);
+
+    return NULL;
+}
+\endcode
+ *
+ * There is one caveat though, stopping this thread requires setting the
+ * event_thread_run variable to 0, and after that libusb_handle_events() needs
+ * to return control to event_thread_func. But unless some event happens,
+ * libusb_handle_events() will not return.
+ *
+ * There are 2 different ways of dealing with this, depending on if your
+ * application uses libusb' \ref hotplug "hotplug" support or not.
+ *
+ * Applications which do not use hotplug support, should not start the event
+ * thread until after their first call to libusb_open(), and should stop the
+ * thread when closing the last open device as follows:
+\code
+void my_close_handle(libusb_device_handle *handle)
+{
+    if (open_devs == 1)
+        event_thread_run = 0;
+
+    libusb_close(handle); // This wakes up libusb_handle_events()
+
+    if (open_devs == 1)
+        pthread_join(event_thread);
+
+    open_devs--;
+}
+\endcode
+ *
+ * Applications using hotplug support should start the thread at program init,
+ * after having successfully called libusb_hotplug_register_callback(), and
+ * should stop the thread at program exit as follows:
+\code
+void my_libusb_exit(void)
+{ 
+    event_thread_run = 0;
+    libusb_hotplug_deregister_callback(ctx, hotplug_cb_handle); // This wakes up libusb_handle_events()
+    pthread_join(event_thread);
+    libusb_exit(ctx);
+}
+\endcode
+ */
+
+/**
+ * @defgroup poll Polling and timing
+ *
+ * This page documents libusb's functions for polling events and timing.
+ * These functions are only necessary for users of the
+ * \ref asyncio "asynchronous API". If you are only using the simpler
+ * \ref syncio "synchronous API" then you do not need to ever call these
+ * functions.
+ *
+ * The justification for the functionality described here has already been
+ * discussed in the \ref asyncevent "event handling" section of the
+ * asynchronous API documentation. In summary, libusb does not create internal
+ * threads for event processing and hence relies on your application calling
+ * into libusb at certain points in time so that pending events can be handled.
+ *
+ * Your main loop is probably already calling poll() or select() or a
+ * variant on a set of file descriptors for other event sources (e.g. keyboard
+ * button presses, mouse movements, network sockets, etc). You then add
+ * libusb's file descriptors to your poll()/select() calls, and when activity
+ * is detected on such descriptors you know it is time to call
+ * libusb_handle_events().
+ *
+ * There is one final event handling complication. libusb supports
+ * asynchronous transfers which time out after a specified time period.
+ *
+ * On some platforms a timerfd is used, so the timeout handling is just another
+ * fd, on other platforms this requires that libusb is called into at or after
+ * the timeout to handle it. So, in addition to considering libusb's file
+ * descriptors in your main event loop, you must also consider that libusb
+ * sometimes needs to be called into at fixed points in time even when there
+ * is no file descriptor activity, see \ref polltime details.
+ * 
+ * In order to know precisely when libusb needs to be called into, libusb
+ * offers you a set of pollable file descriptors and information about when
+ * the next timeout expires.
+ *
+ * If you are using the asynchronous I/O API, you must take one of the two
+ * following options, otherwise your I/O will not complete.
+ *
+ * \section pollsimple The simple option
+ *
+ * If your application revolves solely around libusb and does not need to
+ * handle other event sources, you can have a program structure as follows:
+\code
+// initialize libusb
+// find and open device
+// maybe fire off some initial async I/O
+
+while (user_has_not_requested_exit)
+	libusb_handle_events(ctx);
+
+// clean up and exit
+\endcode
+ *
+ * With such a simple main loop, you do not have to worry about managing
+ * sets of file descriptors or handling timeouts. libusb_handle_events() will
+ * handle those details internally.
+ *
+ * \section pollmain The more advanced option
+ *
+ * \note This functionality is currently only available on Unix-like platforms.
+ * On Windows, libusb_get_pollfds() simply returns NULL. Applications which
+ * want to support Windows are advised to use an \ref eventthread
+ * "event handling thread" instead.
+ *
+ * In more advanced applications, you will already have a main loop which
+ * is monitoring other event sources: network sockets, X11 events, mouse
+ * movements, etc. Through exposing a set of file descriptors, libusb is
+ * designed to cleanly integrate into such main loops.
+ *
+ * In addition to polling file descriptors for the other event sources, you
+ * take a set of file descriptors from libusb and monitor those too. When you
+ * detect activity on libusb's file descriptors, you call
+ * libusb_handle_events_timeout() in non-blocking mode.
+ *
+ * What's more, libusb may also need to handle events at specific moments in
+ * time. No file descriptor activity is generated at these times, so your
+ * own application needs to be continually aware of when the next one of these
+ * moments occurs (through calling libusb_get_next_timeout()), and then it
+ * needs to call libusb_handle_events_timeout() in non-blocking mode when
+ * these moments occur. This means that you need to adjust your
+ * poll()/select() timeout accordingly.
+ *
+ * libusb provides you with a set of file descriptors to poll and expects you
+ * to poll all of them, treating them as a single entity. The meaning of each
+ * file descriptor in the set is an internal implementation detail,
+ * platform-dependent and may vary from release to release. Don't try and
+ * interpret the meaning of the file descriptors, just do as libusb indicates,
+ * polling all of them at once.
+ *
+ * In pseudo-code, you want something that looks like:
+\code
+// initialise libusb
+
+libusb_get_pollfds(ctx)
+while (user has not requested application exit) {
+	libusb_get_next_timeout(ctx);
+	poll(on libusb file descriptors plus any other event sources of interest,
+		using a timeout no larger than the value libusb just suggested)
+	if (poll() indicated activity on libusb file descriptors)
+		libusb_handle_events_timeout(ctx, &zero_tv);
+	if (time has elapsed to or beyond the libusb timeout)
+		libusb_handle_events_timeout(ctx, &zero_tv);
+	// handle events from other sources here
+}
+
+// clean up and exit
+\endcode
+ *
+ * \subsection polltime Notes on time-based events
+ *
+ * The above complication with having to track time and call into libusb at
+ * specific moments is a bit of a headache. For maximum compatibility, you do
+ * need to write your main loop as above, but you may decide that you can
+ * restrict the supported platforms of your application and get away with
+ * a more simplistic scheme.
+ *
+ * These time-based event complications are \b not required on the following
+ * platforms:
+ *  - Darwin
+ *  - Linux, provided that the following version requirements are satisfied:
+ *   - Linux v2.6.27 or newer, compiled with timerfd support
+ *   - glibc v2.9 or newer
+ *   - libusb v1.0.5 or newer
+ *
+ * Under these configurations, libusb_get_next_timeout() will \em always return
+ * 0, so your main loop can be simplified to:
+\code
+// initialise libusb
+
+libusb_get_pollfds(ctx)
+while (user has not requested application exit) {
+	poll(on libusb file descriptors plus any other event sources of interest,
+		using any timeout that you like)
+	if (poll() indicated activity on libusb file descriptors)
+		libusb_handle_events_timeout(ctx, &zero_tv);
+	// handle events from other sources here
+}
+
+// clean up and exit
+\endcode
+ *
+ * Do remember that if you simplify your main loop to the above, you will
+ * lose compatibility with some platforms (including legacy Linux platforms,
+ * and <em>any future platforms supported by libusb which may have time-based
+ * event requirements</em>). The resultant problems will likely appear as
+ * strange bugs in your application.
+ *
+ * You can use the libusb_pollfds_handle_timeouts() function to do a runtime
+ * check to see if it is safe to ignore the time-based event complications.
+ * If your application has taken the shortcut of ignoring libusb's next timeout
+ * in your main loop, then you are advised to check the return value of
+ * libusb_pollfds_handle_timeouts() during application startup, and to abort
+ * if the platform does suffer from these timing complications.
+ *
+ * \subsection fdsetchange Changes in the file descriptor set
+ *
+ * The set of file descriptors that libusb uses as event sources may change
+ * during the life of your application. Rather than having to repeatedly
+ * call libusb_get_pollfds(), you can set up notification functions for when
+ * the file descriptor set changes using libusb_set_pollfd_notifiers().
+ *
+ * \subsection mtissues Multi-threaded considerations
+ *
+ * Unfortunately, the situation is complicated further when multiple threads
+ * come into play. If two threads are monitoring the same file descriptors,
+ * the fact that only one thread will be woken up when an event occurs causes
+ * some headaches.
+ *
+ * The events lock, event waiters lock, and libusb_handle_events_locked()
+ * entities are added to solve these problems. You do not need to be concerned
+ * with these entities otherwise.
+ *
+ * See the extra documentation: \ref mtasync
+ */
+
+/** \page mtasync Multi-threaded applications and asynchronous I/O
+ *
+ * libusb is a thread-safe library, but extra considerations must be applied
+ * to applications which interact with libusb from multiple threads.
+ *
+ * The underlying issue that must be addressed is that all libusb I/O
+ * revolves around monitoring file descriptors through the poll()/select()
+ * system calls. This is directly exposed at the
+ * \ref asyncio "asynchronous interface" but it is important to note that the
+ * \ref syncio "synchronous interface" is implemented on top of the
+ * asynchonrous interface, therefore the same considerations apply.
+ *
+ * The issue is that if two or more threads are concurrently calling poll()
+ * or select() on libusb's file descriptors then only one of those threads
+ * will be woken up when an event arrives. The others will be completely
+ * oblivious that anything has happened.
+ *
+ * Consider the following pseudo-code, which submits an asynchronous transfer
+ * then waits for its completion. This style is one way you could implement a
+ * synchronous interface on top of the asynchronous interface (and libusb
+ * does something similar, albeit more advanced due to the complications
+ * explained on this page).
+ *
+\code
+void cb(struct libusb_transfer *transfer)
+{
+	int *completed = transfer->user_data;
+	*completed = 1;
+}
+
+void myfunc() {
+	struct libusb_transfer *transfer;
+	unsigned char buffer[LIBUSB_CONTROL_SETUP_SIZE] __attribute__ ((aligned (2)));
+	int completed = 0;
+
+	transfer = libusb_alloc_transfer(0);
+	libusb_fill_control_setup(buffer,
+		LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, 0x04, 0x01, 0, 0);
+	libusb_fill_control_transfer(transfer, dev, buffer, cb, &completed, 1000);
+	libusb_submit_transfer(transfer);
+
+	while (!completed) {
+		poll(libusb file descriptors, 120*1000);
+		if (poll indicates activity)
+			libusb_handle_events_timeout(ctx, &zero_tv);
+	}
+	printf("completed!");
+	// other code here
+}
+\endcode
+ *
+ * Here we are <em>serializing</em> completion of an asynchronous event
+ * against a condition - the condition being completion of a specific transfer.
+ * The poll() loop has a long timeout to minimize CPU usage during situations
+ * when nothing is happening (it could reasonably be unlimited).
+ *
+ * If this is the only thread that is polling libusb's file descriptors, there
+ * is no problem: there is no danger that another thread will swallow up the
+ * event that we are interested in. On the other hand, if there is another
+ * thread polling the same descriptors, there is a chance that it will receive
+ * the event that we were interested in. In this situation, <tt>myfunc()</tt>
+ * will only realise that the transfer has completed on the next iteration of
+ * the loop, <em>up to 120 seconds later.</em> Clearly a two-minute delay is
+ * undesirable, and don't even think about using short timeouts to circumvent
+ * this issue!
+ *
+ * The solution here is to ensure that no two threads are ever polling the
+ * file descriptors at the same time. A naive implementation of this would
+ * impact the capabilities of the library, so libusb offers the scheme
+ * documented below to ensure no loss of functionality.
+ *
+ * Before we go any further, it is worth mentioning that all libusb-wrapped
+ * event handling procedures fully adhere to the scheme documented below.
+ * This includes libusb_handle_events() and its variants, and all the
+ * synchronous I/O functions - libusb hides this headache from you.
+ *
+ * \section Using libusb_handle_events() from multiple threads
+ *
+ * Even when only using libusb_handle_events() and synchronous I/O functions,
+ * you can still have a race condition. You might be tempted to solve the
+ * above with libusb_handle_events() like so:
+ *
+\code
+	libusb_submit_transfer(transfer);
+
+	while (!completed) {
+		libusb_handle_events(ctx);
+	}
+	printf("completed!");
+\endcode
+ *
+ * This however has a race between the checking of completed and
+ * libusb_handle_events() acquiring the events lock, so another thread
+ * could have completed the transfer, resulting in this thread hanging
+ * until either a timeout or another event occurs. See also commit
+ * 6696512aade99bb15d6792af90ae329af270eba6 which fixes this in the
+ * synchronous API implementation of libusb.
+ *
+ * Fixing this race requires checking the variable completed only after
+ * taking the event lock, which defeats the concept of just calling
+ * libusb_handle_events() without worrying about locking. This is why
+ * libusb-1.0.9 introduces the new libusb_handle_events_timeout_completed()
+ * and libusb_handle_events_completed() functions, which handles doing the
+ * completion check for you after they have acquired the lock:
+ *
+\code
+	libusb_submit_transfer(transfer);
+
+	while (!completed) {
+		libusb_handle_events_completed(ctx, &completed);
+	}
+	printf("completed!");
+\endcode
+ *
+ * This nicely fixes the race in our example. Note that if all you want to
+ * do is submit a single transfer and wait for its completion, then using
+ * one of the synchronous I/O functions is much easier.
+ *
+ * \section eventlock The events lock
+ *
+ * The problem is when we consider the fact that libusb exposes file
+ * descriptors to allow for you to integrate asynchronous USB I/O into
+ * existing main loops, effectively allowing you to do some work behind
+ * libusb's back. If you do take libusb's file descriptors and pass them to
+ * poll()/select() yourself, you need to be aware of the associated issues.
+ *
+ * The first concept to be introduced is the events lock. The events lock
+ * is used to serialize threads that want to handle events, such that only
+ * one thread is handling events at any one time.
+ *
+ * You must take the events lock before polling libusb file descriptors,
+ * using libusb_lock_events(). You must release the lock as soon as you have
+ * aborted your poll()/select() loop, using libusb_unlock_events().
+ *
+ * \section threadwait Letting other threads do the work for you
+ *
+ * Although the events lock is a critical part of the solution, it is not
+ * enough on it's own. You might wonder if the following is sufficient...
+\code
+	libusb_lock_events(ctx);
+	while (!completed) {
+		poll(libusb file descriptors, 120*1000);
+		if (poll indicates activity)
+			libusb_handle_events_timeout(ctx, &zero_tv);
+	}
+	libusb_unlock_events(ctx);
+\endcode
+ * ...and the answer is that it is not. This is because the transfer in the
+ * code shown above may take a long time (say 30 seconds) to complete, and
+ * the lock is not released until the transfer is completed.
+ *
+ * Another thread with similar code that wants to do event handling may be
+ * working with a transfer that completes after a few milliseconds. Despite
+ * having such a quick completion time, the other thread cannot check that
+ * status of its transfer until the code above has finished (30 seconds later)
+ * due to contention on the lock.
+ *
+ * To solve this, libusb offers you a mechanism to determine when another
+ * thread is handling events. It also offers a mechanism to block your thread
+ * until the event handling thread has completed an event (and this mechanism
+ * does not involve polling of file descriptors).
+ *
+ * After determining that another thread is currently handling events, you
+ * obtain the <em>event waiters</em> lock using libusb_lock_event_waiters().
+ * You then re-check that some other thread is still handling events, and if
+ * so, you call libusb_wait_for_event().
+ *
+ * libusb_wait_for_event() puts your application to sleep until an event
+ * occurs, or until a thread releases the events lock. When either of these
+ * things happen, your thread is woken up, and should re-check the condition
+ * it was waiting on. It should also re-check that another thread is handling
+ * events, and if not, it should start handling events itself.
+ *
+ * This looks like the following, as pseudo-code:
+\code
+retry:
+if (libusb_try_lock_events(ctx) == 0) {
+	// we obtained the event lock: do our own event handling
+	while (!completed) {
+		if (!libusb_event_handling_ok(ctx)) {
+			libusb_unlock_events(ctx);
+			goto retry;
+		}
+		poll(libusb file descriptors, 120*1000);
+		if (poll indicates activity)
+			libusb_handle_events_locked(ctx, 0);
+	}
+	libusb_unlock_events(ctx);
+} else {
+	// another thread is doing event handling. wait for it to signal us that
+	// an event has completed
+	libusb_lock_event_waiters(ctx);
+
+	while (!completed) {
+		// now that we have the event waiters lock, double check that another
+		// thread is still handling events for us. (it may have ceased handling
+		// events in the time it took us to reach this point)
+		if (!libusb_event_handler_active(ctx)) {
+			// whoever was handling events is no longer doing so, try again
+			libusb_unlock_event_waiters(ctx);
+			goto retry;
+		}
+
+		libusb_wait_for_event(ctx, NULL);
+	}
+	libusb_unlock_event_waiters(ctx);
+}
+printf("completed!\n");
+\endcode
+ *
+ * A naive look at the above code may suggest that this can only support
+ * one event waiter (hence a total of 2 competing threads, the other doing
+ * event handling), because the event waiter seems to have taken the event
+ * waiters lock while waiting for an event. However, the system does support
+ * multiple event waiters, because libusb_wait_for_event() actually drops
+ * the lock while waiting, and reaquires it before continuing.
+ *
+ * We have now implemented code which can dynamically handle situations where
+ * nobody is handling events (so we should do it ourselves), and it can also
+ * handle situations where another thread is doing event handling (so we can
+ * piggyback onto them). It is also equipped to handle a combination of
+ * the two, for example, another thread is doing event handling, but for
+ * whatever reason it stops doing so before our condition is met, so we take
+ * over the event handling.
+ *
+ * Four functions were introduced in the above pseudo-code. Their importance
+ * should be apparent from the code shown above.
+ * -# libusb_try_lock_events() is a non-blocking function which attempts
+ *    to acquire the events lock but returns a failure code if it is contended.
+ * -# libusb_event_handling_ok() checks that libusb is still happy for your
+ *    thread to be performing event handling. Sometimes, libusb needs to
+ *    interrupt the event handler, and this is how you can check if you have
+ *    been interrupted. If this function returns 0, the correct behaviour is
+ *    for you to give up the event handling lock, and then to repeat the cycle.
+ *    The following libusb_try_lock_events() will fail, so you will become an
+ *    events waiter. For more information on this, read \ref fullstory below.
+ * -# libusb_handle_events_locked() is a variant of
+ *    libusb_handle_events_timeout() that you can call while holding the
+ *    events lock. libusb_handle_events_timeout() itself implements similar
+ *    logic to the above, so be sure not to call it when you are
+ *    "working behind libusb's back", as is the case here.
+ * -# libusb_event_handler_active() determines if someone is currently
+ *    holding the events lock
+ *
+ * You might be wondering why there is no function to wake up all threads
+ * blocked on libusb_wait_for_event(). This is because libusb can do this
+ * internally: it will wake up all such threads when someone calls
+ * libusb_unlock_events() or when a transfer completes (at the point after its
+ * callback has returned).
+ *
+ * \subsection fullstory The full story
+ *
+ * The above explanation should be enough to get you going, but if you're
+ * really thinking through the issues then you may be left with some more
+ * questions regarding libusb's internals. If you're curious, read on, and if
+ * not, skip to the next section to avoid confusing yourself!
+ *
+ * The immediate question that may spring to mind is: what if one thread
+ * modifies the set of file descriptors that need to be polled while another
+ * thread is doing event handling?
+ *
+ * There are 2 situations in which this may happen.
+ * -# libusb_open() will add another file descriptor to the poll set,
+ *    therefore it is desirable to interrupt the event handler so that it
+ *    restarts, picking up the new descriptor.
+ * -# libusb_close() will remove a file descriptor from the poll set. There
+ *    are all kinds of race conditions that could arise here, so it is
+ *    important that nobody is doing event handling at this time.
+ *
+ * libusb handles these issues internally, so application developers do not
+ * have to stop their event handlers while opening/closing devices. Here's how
+ * it works, focusing on the libusb_close() situation first:
+ *
+ * -# During initialization, libusb opens an internal pipe, and it adds the read
+ *    end of this pipe to the set of file descriptors to be polled.
+ * -# During libusb_close(), libusb writes some dummy data on this control pipe.
+ *    This immediately interrupts the event handler. libusb also records
+ *    internally that it is trying to interrupt event handlers for this
+ *    high-priority event.
+ * -# At this point, some of the functions described above start behaving
+ *    differently:
+ *   - libusb_event_handling_ok() starts returning 1, indicating that it is NOT
+ *     OK for event handling to continue.
+ *   - libusb_try_lock_events() starts returning 1, indicating that another
+ *     thread holds the event handling lock, even if the lock is uncontended.
+ *   - libusb_event_handler_active() starts returning 1, indicating that
+ *     another thread is doing event handling, even if that is not true.
+ * -# The above changes in behaviour result in the event handler stopping and
+ *    giving up the events lock very quickly, giving the high-priority
+ *    libusb_close() operation a "free ride" to acquire the events lock. All
+ *    threads that are competing to do event handling become event waiters.
+ * -# With the events lock held inside libusb_close(), libusb can safely remove
+ *    a file descriptor from the poll set, in the safety of knowledge that
+ *    nobody is polling those descriptors or trying to access the poll set.
+ * -# After obtaining the events lock, the close operation completes very
+ *    quickly (usually a matter of milliseconds) and then immediately releases
+ *    the events lock.
+ * -# At the same time, the behaviour of libusb_event_handling_ok() and friends
+ *    reverts to the original, documented behaviour.
+ * -# The release of the events lock causes the threads that are waiting for
+ *    events to be woken up and to start competing to become event handlers
+ *    again. One of them will succeed; it will then re-obtain the list of poll
+ *    descriptors, and USB I/O will then continue as normal.
+ *
+ * libusb_open() is similar, and is actually a more simplistic case. Upon a
+ * call to libusb_open():
+ *
+ * -# The device is opened and a file descriptor is added to the poll set.
+ * -# libusb sends some dummy data on the control pipe, and records that it
+ *    is trying to modify the poll descriptor set.
+ * -# The event handler is interrupted, and the same behaviour change as for
+ *    libusb_close() takes effect, causing all event handling threads to become
+ *    event waiters.
+ * -# The libusb_open() implementation takes its free ride to the events lock.
+ * -# Happy that it has successfully paused the events handler, libusb_open()
+ *    releases the events lock.
+ * -# The event waiter threads are all woken up and compete to become event
+ *    handlers again. The one that succeeds will obtain the list of poll
+ *    descriptors again, which will include the addition of the new device.
+ *
+ * \subsection concl Closing remarks
+ *
+ * The above may seem a little complicated, but hopefully I have made it clear
+ * why such complications are necessary. Also, do not forget that this only
+ * applies to applications that take libusb's file descriptors and integrate
+ * them into their own polling loops.
+ *
+ * You may decide that it is OK for your multi-threaded application to ignore
+ * some of the rules and locks detailed above, because you don't think that
+ * two threads can ever be polling the descriptors at the same time. If that
+ * is the case, then that's good news for you because you don't have to worry.
+ * But be careful here; remember that the synchronous I/O functions do event
+ * handling internally. If you have one thread doing event handling in a loop
+ * (without implementing the rules and locking semantics documented above)
+ * and another trying to send a synchronous USB transfer, you will end up with
+ * two threads monitoring the same descriptors, and the above-described
+ * undesirable behaviour occuring. The solution is for your polling thread to
+ * play by the rules; the synchronous I/O functions do so, and this will result
+ * in them getting along in perfect harmony.
+ *
+ * If you do have a dedicated thread doing event handling, it is perfectly
+ * legal for it to take the event handling lock for long periods of time. Any
+ * synchronous I/O functions you call from other threads will transparently
+ * fall back to the "event waiters" mechanism detailed above. The only
+ * consideration that your event handling thread must apply is the one related
+ * to libusb_event_handling_ok(): you must call this before every poll(), and
+ * give up the events lock if instructed.
+ */
+
+int usbi_io_init(struct libusb_context *ctx)
+{
+	int r;
+
+	usbi_mutex_init(&ctx->flying_transfers_lock, NULL);
+	usbi_mutex_init(&ctx->pollfds_lock, NULL);
+	usbi_mutex_init(&ctx->pollfd_modify_lock, NULL);
+	usbi_mutex_init_recursive(&ctx->events_lock, NULL);
+	usbi_mutex_init(&ctx->event_waiters_lock, NULL);
+	usbi_cond_init(&ctx->event_waiters_cond, NULL);
+	list_init(&ctx->flying_transfers);
+	list_init(&ctx->pollfds);
+
+	/* FIXME should use an eventfd on kernels that support it */
+	r = usbi_pipe(ctx->ctrl_pipe);
+	if (r < 0) {
+		r = LIBUSB_ERROR_OTHER;
+		goto err;
+	}
+
+	r = usbi_add_pollfd(ctx, ctx->ctrl_pipe[0], POLLIN);
+	if (r < 0)
+		goto err_close_pipe;
+
+	/* create hotplug pipe */
+	r = usbi_pipe(ctx->hotplug_pipe);
+	if (r < 0) {
+		r = LIBUSB_ERROR_OTHER;
+		goto err;
+	}
+
+	r = usbi_add_pollfd(ctx, ctx->hotplug_pipe[0], POLLIN);
+	if (r < 0)
+		goto err_close_hp_pipe;
+
+#ifdef USBI_TIMERFD_AVAILABLE
+	ctx->timerfd = timerfd_create(usbi_backend->get_timerfd_clockid(),
+		TFD_NONBLOCK);
+	if (ctx->timerfd >= 0) {
+		usbi_dbg("using timerfd for timeouts");
+		r = usbi_add_pollfd(ctx, ctx->timerfd, POLLIN);
+		if (r < 0) {
+			usbi_remove_pollfd(ctx, ctx->ctrl_pipe[0]);
+			close(ctx->timerfd);
+			goto err_close_hp_pipe;
+		}
+	} else {
+		usbi_dbg("timerfd not available (code %d error %d)", ctx->timerfd, errno);
+		ctx->timerfd = -1;
+	}
+#endif
+
+	return 0;
+
+err_close_hp_pipe:
+	usbi_close(ctx->hotplug_pipe[0]);
+	usbi_close(ctx->hotplug_pipe[1]);
+err_close_pipe:
+	usbi_close(ctx->ctrl_pipe[0]);
+	usbi_close(ctx->ctrl_pipe[1]);
+err:
+	usbi_mutex_destroy(&ctx->flying_transfers_lock);
+	usbi_mutex_destroy(&ctx->pollfds_lock);
+	usbi_mutex_destroy(&ctx->pollfd_modify_lock);
+	usbi_mutex_destroy(&ctx->events_lock);
+	usbi_mutex_destroy(&ctx->event_waiters_lock);
+	usbi_cond_destroy(&ctx->event_waiters_cond);
+	return r;
+}
+
+void usbi_io_exit(struct libusb_context *ctx)
+{
+	usbi_remove_pollfd(ctx, ctx->ctrl_pipe[0]);
+	usbi_close(ctx->ctrl_pipe[0]);
+	usbi_close(ctx->ctrl_pipe[1]);
+	usbi_remove_pollfd(ctx, ctx->hotplug_pipe[0]);
+	usbi_close(ctx->hotplug_pipe[0]);
+	usbi_close(ctx->hotplug_pipe[1]);
+#ifdef USBI_TIMERFD_AVAILABLE
+	if (usbi_using_timerfd(ctx)) {
+		usbi_remove_pollfd(ctx, ctx->timerfd);
+		close(ctx->timerfd);
+	}
+#endif
+	usbi_mutex_destroy(&ctx->flying_transfers_lock);
+	usbi_mutex_destroy(&ctx->pollfds_lock);
+	usbi_mutex_destroy(&ctx->pollfd_modify_lock);
+	usbi_mutex_destroy(&ctx->events_lock);
+	usbi_mutex_destroy(&ctx->event_waiters_lock);
+	usbi_cond_destroy(&ctx->event_waiters_cond);
+}
+
+static int calculate_timeout(struct usbi_transfer *transfer)
+{
+	int r;
+	struct timespec current_time;
+	unsigned int timeout =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout;
+
+	if (!timeout)
+		return 0;
+
+	r = usbi_backend->clock_gettime(USBI_CLOCK_MONOTONIC, &current_time);
+	if (r < 0) {
+		usbi_err(ITRANSFER_CTX(transfer),
+			"failed to read monotonic clock, errno=%d", errno);
+		return r;
+	}
+
+	current_time.tv_sec += timeout / 1000;
+	current_time.tv_nsec += (timeout % 1000) * 1000000;
+
+	while (current_time.tv_nsec >= 1000000000) {
+		current_time.tv_nsec -= 1000000000;
+		current_time.tv_sec++;
+	}
+
+	TIMESPEC_TO_TIMEVAL(&transfer->timeout, &current_time);
+	return 0;
+}
+
+/* add a transfer to the (timeout-sorted) active transfers list.
+ * Callers of this function must hold the flying_transfers_lock.
+ * This function *always* adds the transfer to the flying_transfers list,
+ * it will return non 0 if it fails to update the timer, but even then the
+ * transfer is added to the flying_transfers list. */
+static int add_to_flying_list(struct usbi_transfer *transfer)
+{
+	struct usbi_transfer *cur;
+	struct timeval *timeout = &transfer->timeout;
+	struct libusb_context *ctx = ITRANSFER_CTX(transfer);
+	int r = 0;
+	int first = 1;
+
+	/* if we have no other flying transfers, start the list with this one */
+	if (list_empty(&ctx->flying_transfers)) {
+		list_add(&transfer->list, &ctx->flying_transfers);
+		goto out;
+	}
+
+	/* if we have infinite timeout, append to end of list */
+	if (!timerisset(timeout)) {
+		list_add_tail(&transfer->list, &ctx->flying_transfers);
+		/* first is irrelevant in this case */
+		goto out;
+	}
+
+	/* otherwise, find appropriate place in list */
+	list_for_each_entry(cur, &ctx->flying_transfers, list, struct usbi_transfer) {
+		/* find first timeout that occurs after the transfer in question */
+		struct timeval *cur_tv = &cur->timeout;
+
+		if (!timerisset(cur_tv) || (cur_tv->tv_sec > timeout->tv_sec) ||
+				(cur_tv->tv_sec == timeout->tv_sec &&
+					cur_tv->tv_usec > timeout->tv_usec)) {
+			list_add_tail(&transfer->list, &cur->list);
+			goto out;
+		}
+		first = 0;
+	}
+	/* first is 0 at this stage (list not empty) */
+
+	/* otherwise we need to be inserted at the end */
+	list_add_tail(&transfer->list, &ctx->flying_transfers);
+out:
+#ifdef USBI_TIMERFD_AVAILABLE
+	if (first && usbi_using_timerfd(ctx) && timerisset(timeout)) {
+		/* if this transfer has the lowest timeout of all active transfers,
+		 * rearm the timerfd with this transfer's timeout */
+		const struct itimerspec it = { {0, 0},
+			{ timeout->tv_sec, timeout->tv_usec * 1000 } };
+		usbi_dbg("arm timerfd for timeout in %dms (first in line)",
+			USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout);
+		r = timerfd_settime(ctx->timerfd, TFD_TIMER_ABSTIME, &it, NULL);
+		if (r < 0) {
+			usbi_warn(ctx, "failed to arm first timerfd (errno %d)", errno);
+			r = LIBUSB_ERROR_OTHER;
+		}
+	}
+#else
+	UNUSED(first);
+#endif
+
+	return r;
+}
+
+/** \ingroup asyncio
+ * Allocate a libusb transfer with a specified number of isochronous packet
+ * descriptors. The returned transfer is pre-initialized for you. When the new
+ * transfer is no longer needed, it should be freed with
+ * libusb_free_transfer().
+ *
+ * Transfers intended for non-isochronous endpoints (e.g. control, bulk,
+ * interrupt) should specify an iso_packets count of zero.
+ *
+ * For transfers intended for isochronous endpoints, specify an appropriate
+ * number of packet descriptors to be allocated as part of the transfer.
+ * The returned transfer is not specially initialized for isochronous I/O;
+ * you are still required to set the
+ * \ref libusb_transfer::num_iso_packets "num_iso_packets" and
+ * \ref libusb_transfer::type "type" fields accordingly.
+ *
+ * It is safe to allocate a transfer with some isochronous packets and then
+ * use it on a non-isochronous endpoint. If you do this, ensure that at time
+ * of submission, num_iso_packets is 0 and that type is set appropriately.
+ *
+ * \param iso_packets number of isochronous packet descriptors to allocate
+ * \returns a newly allocated transfer, or NULL on error
+ */
+DEFAULT_VISIBILITY
+struct libusb_transfer * LIBUSB_CALL libusb_alloc_transfer(
+	int iso_packets)
+{
+	size_t os_alloc_size = usbi_backend->transfer_priv_size
+		+ (usbi_backend->add_iso_packet_size * iso_packets);
+	size_t alloc_size = sizeof(struct usbi_transfer)
+		+ sizeof(struct libusb_transfer)
+		+ (sizeof(struct libusb_iso_packet_descriptor) * iso_packets)
+		+ os_alloc_size;
+	struct usbi_transfer *itransfer = calloc(1, alloc_size);
+	if (!itransfer)
+		return NULL;
+
+	itransfer->num_iso_packets = iso_packets;
+	usbi_mutex_init(&itransfer->lock, NULL);
+	return USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+}
+
+/** \ingroup asyncio
+ * Free a transfer structure. This should be called for all transfers
+ * allocated with libusb_alloc_transfer().
+ *
+ * If the \ref libusb_transfer_flags::LIBUSB_TRANSFER_FREE_BUFFER
+ * "LIBUSB_TRANSFER_FREE_BUFFER" flag is set and the transfer buffer is
+ * non-NULL, this function will also free the transfer buffer using the
+ * standard system memory allocator (e.g. free()).
+ *
+ * It is legal to call this function with a NULL transfer. In this case,
+ * the function will simply return safely.
+ *
+ * It is not legal to free an active transfer (one which has been submitted
+ * and has not yet completed).
+ *
+ * \param transfer the transfer to free
+ */
+void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
+{
+	struct usbi_transfer *itransfer;
+	if (!transfer)
+		return;
+
+	if (transfer->flags & LIBUSB_TRANSFER_FREE_BUFFER && transfer->buffer)
+		free(transfer->buffer);
+
+	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+	usbi_mutex_destroy(&itransfer->lock);
+	free(itransfer);
+}
+
+#ifdef USBI_TIMERFD_AVAILABLE
+static int disarm_timerfd(struct libusb_context *ctx)
+{
+	const struct itimerspec disarm_timer = { { 0, 0 }, { 0, 0 } };
+	int r;
+
+	usbi_dbg("");
+	r = timerfd_settime(ctx->timerfd, 0, &disarm_timer, NULL);
+	if (r < 0)
+		return LIBUSB_ERROR_OTHER;
+	else
+		return 0;
+}
+
+/* iterates through the flying transfers, and rearms the timerfd based on the
+ * next upcoming timeout.
+ * must be called with flying_list locked.
+ * returns 0 if there was no timeout to arm, 1 if the next timeout was armed,
+ * or a LIBUSB_ERROR code on failure.
+ */
+static int arm_timerfd_for_next_timeout(struct libusb_context *ctx)
+{
+	struct usbi_transfer *transfer;
+
+	list_for_each_entry(transfer, &ctx->flying_transfers, list, struct usbi_transfer) {
+		struct timeval *cur_tv = &transfer->timeout;
+
+		/* if we've reached transfers of infinite timeout, then we have no
+		 * arming to do */
+		if (!timerisset(cur_tv))
+			goto disarm;
+
+		/* act on first transfer that is not already cancelled */
+		if (!(transfer->flags & USBI_TRANSFER_TIMED_OUT)) {
+			int r;
+			const struct itimerspec it = { {0, 0},
+				{ cur_tv->tv_sec, cur_tv->tv_usec * 1000 } };
+			usbi_dbg("next timeout originally %dms", USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)->timeout);
+			r = timerfd_settime(ctx->timerfd, TFD_TIMER_ABSTIME, &it, NULL);
+			if (r < 0)
+				return LIBUSB_ERROR_OTHER;
+			return 1;
+		}
+	}
+
+disarm:
+	return disarm_timerfd(ctx);
+}
+#else
+static int arm_timerfd_for_next_timeout(struct libusb_context *ctx)
+{
+	(void)ctx;
+	return 0;
+}
+#endif
+
+/** \ingroup asyncio
+ * Submit a transfer. This function will fire off the USB transfer and then
+ * return immediately.
+ *
+ * \param transfer the transfer to submit
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns LIBUSB_ERROR_BUSY if the transfer has already been submitted.
+ * \returns LIBUSB_ERROR_NOT_SUPPORTED if the transfer flags are not supported
+ * by the operating system.
+ * \returns another LIBUSB_ERROR code on other failure
+ */
+int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+{
+	struct libusb_context *ctx = TRANSFER_CTX(transfer);
+	struct usbi_transfer *itransfer =
+		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+	int r;
+	int updated_fds;
+
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+	usbi_mutex_lock(&itransfer->lock);
+	itransfer->transferred = 0;
+	itransfer->flags = 0;
+	r = calculate_timeout(itransfer);
+	if (r < 0) {
+		r = LIBUSB_ERROR_OTHER;
+		goto out;
+	}
+
+	r = add_to_flying_list(itransfer);
+	if (r == LIBUSB_SUCCESS) {
+		r = usbi_backend->submit_transfer(itransfer);
+	}
+	if (r != LIBUSB_SUCCESS) {
+		list_del(&itransfer->list);
+		arm_timerfd_for_next_timeout(ctx);
+	} else {
+		/* keep a reference to this device */
+		libusb_ref_device(transfer->dev_handle->dev);
+	}
+out:
+	updated_fds = (itransfer->flags & USBI_TRANSFER_UPDATED_FDS);
+	usbi_mutex_unlock(&itransfer->lock);
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+	if (updated_fds)
+		usbi_fd_notification(ctx);
+	return r;
+}
+
+/** \ingroup asyncio
+ * Asynchronously cancel a previously submitted transfer.
+ * This function returns immediately, but this does not indicate cancellation
+ * is complete. Your callback function will be invoked at some later time
+ * with a transfer status of
+ * \ref libusb_transfer_status::LIBUSB_TRANSFER_CANCELLED
+ * "LIBUSB_TRANSFER_CANCELLED."
+ *
+ * \param transfer the transfer to cancel
+ * \returns 0 on success
+ * \returns LIBUSB_ERROR_NOT_FOUND if the transfer is already complete or
+ * cancelled.
+ * \returns a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_cancel_transfer(struct libusb_transfer *transfer)
+{
+	struct usbi_transfer *itransfer =
+		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+	int r;
+
+	usbi_dbg("");
+	usbi_mutex_lock(&itransfer->lock);
+	r = usbi_backend->cancel_transfer(itransfer);
+	if (r < 0) {
+		if (r != LIBUSB_ERROR_NOT_FOUND &&
+		    r != LIBUSB_ERROR_NO_DEVICE)
+			usbi_err(TRANSFER_CTX(transfer),
+				"cancel transfer failed error %d", r);
+		else
+			usbi_dbg("cancel transfer failed error %d", r);
+
+		if (r == LIBUSB_ERROR_NO_DEVICE)
+			itransfer->flags |= USBI_TRANSFER_DEVICE_DISAPPEARED;
+	}
+
+	itransfer->flags |= USBI_TRANSFER_CANCELLING;
+
+	usbi_mutex_unlock(&itransfer->lock);
+	return r;
+}
+
+/** \ingroup asyncio
+ * Set a transfers bulk stream id. Note users are advised to use
+ * libusb_fill_bulk_stream_transfer() instead of calling this function
+ * directly.
+ *
+ * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103
+ *
+ * \param transfer the transfer to set the stream id for
+ * \param stream_id the stream id to set
+ * \see libusb_alloc_streams()
+ */
+void API_EXPORTED libusb_transfer_set_stream_id(
+	struct libusb_transfer *transfer, uint32_t stream_id)
+{
+	struct usbi_transfer *itransfer =
+		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+
+	itransfer->stream_id = stream_id;
+}
+
+/** \ingroup asyncio
+ * Get a transfers bulk stream id.
+ *
+ * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103
+ *
+ * \param transfer the transfer to get the stream id for
+ * \returns the stream id for the transfer
+ */
+uint32_t API_EXPORTED libusb_transfer_get_stream_id(
+	struct libusb_transfer *transfer)
+{
+	struct usbi_transfer *itransfer =
+		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+
+	return itransfer->stream_id;
+}
+
+/* Handle completion of a transfer (completion might be an error condition).
+ * This will invoke the user-supplied callback function, which may end up
+ * freeing the transfer. Therefore you cannot use the transfer structure
+ * after calling this function, and you should free all backend-specific
+ * data before calling it.
+ * Do not call this function with the usbi_transfer lock held. User-specified
+ * callback functions may attempt to directly resubmit the transfer, which
+ * will attempt to take the lock. */
+int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+	enum libusb_transfer_status status)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = TRANSFER_CTX(transfer);
+	struct libusb_device_handle *handle = transfer->dev_handle;
+	uint8_t flags;
+	int r = 0;
+
+	/* FIXME: could be more intelligent with the timerfd here. we don't need
+	 * to disarm the timerfd if there was no timer running, and we only need
+	 * to rearm the timerfd if the transfer that expired was the one with
+	 * the shortest timeout. */
+
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+	list_del(&itransfer->list);
+	if (usbi_using_timerfd(ctx))
+		r = arm_timerfd_for_next_timeout(ctx);
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+	if (usbi_using_timerfd(ctx) && (r < 0))
+		return r;
+
+	if (status == LIBUSB_TRANSFER_COMPLETED
+			&& transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) {
+		int rqlen = transfer->length;
+		if (transfer->type == LIBUSB_TRANSFER_TYPE_CONTROL)
+			rqlen -= LIBUSB_CONTROL_SETUP_SIZE;
+		if (rqlen != itransfer->transferred) {
+			usbi_dbg("interpreting short transfer as error");
+			status = LIBUSB_TRANSFER_ERROR;
+		}
+	}
+
+	flags = transfer->flags;
+	transfer->status = status;
+	transfer->actual_length = itransfer->transferred;
+	usbi_dbg("transfer %p has callback %p", transfer, transfer->callback);
+	if (transfer->callback)
+		transfer->callback(transfer);
+	/* transfer might have been freed by the above call, do not use from
+	 * this point. */
+	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
+		libusb_free_transfer(transfer);
+	usbi_mutex_lock(&ctx->event_waiters_lock);
+	usbi_cond_broadcast(&ctx->event_waiters_cond);
+	usbi_mutex_unlock(&ctx->event_waiters_lock);
+	libusb_unref_device(handle->dev);
+	return 0;
+}
+
+/* Similar to usbi_handle_transfer_completion() but exclusively for transfers
+ * that were asynchronously cancelled. The same concerns w.r.t. freeing of
+ * transfers exist here.
+ * Do not call this function with the usbi_transfer lock held. User-specified
+ * callback functions may attempt to directly resubmit the transfer, which
+ * will attempt to take the lock. */
+int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer)
+{
+	/* if the URB was cancelled due to timeout, report timeout to the user */
+	if (transfer->flags & USBI_TRANSFER_TIMED_OUT) {
+		usbi_dbg("detected timeout cancellation");
+		return usbi_handle_transfer_completion(transfer, LIBUSB_TRANSFER_TIMED_OUT);
+	}
+
+	/* otherwise its a normal async cancel */
+	return usbi_handle_transfer_completion(transfer, LIBUSB_TRANSFER_CANCELLED);
+}
+
+/** \ingroup poll
+ * Attempt to acquire the event handling lock. This lock is used to ensure that
+ * only one thread is monitoring libusb event sources at any one time.
+ *
+ * You only need to use this lock if you are developing an application
+ * which calls poll() or select() on libusb's file descriptors directly.
+ * If you stick to libusb's event handling loop functions (e.g.
+ * libusb_handle_events()) then you do not need to be concerned with this
+ * locking.
+ *
+ * While holding this lock, you are trusted to actually be handling events.
+ * If you are no longer handling events, you must call libusb_unlock_events()
+ * as soon as possible.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns 0 if the lock was obtained successfully
+ * \returns 1 if the lock was not obtained (i.e. another thread holds the lock)
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_try_lock_events(libusb_context *ctx)
+{
+	int r;
+	unsigned int ru;
+	USBI_GET_CONTEXT(ctx);
+
+	/* is someone else waiting to modify poll fds? if so, don't let this thread
+	 * start event handling */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	ru = ctx->pollfd_modify;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+	if (ru) {
+		usbi_dbg("someone else is modifying poll fds");
+		return 1;
+	}
+
+	r = usbi_mutex_trylock(&ctx->events_lock);
+	if (r)
+		return 1;
+
+	ctx->event_handler_active = 1;
+	return 0;
+}
+
+/** \ingroup poll
+ * Acquire the event handling lock, blocking until successful acquisition if
+ * it is contended. This lock is used to ensure that only one thread is
+ * monitoring libusb event sources at any one time.
+ *
+ * You only need to use this lock if you are developing an application
+ * which calls poll() or select() on libusb's file descriptors directly.
+ * If you stick to libusb's event handling loop functions (e.g.
+ * libusb_handle_events()) then you do not need to be concerned with this
+ * locking.
+ *
+ * While holding this lock, you are trusted to actually be handling events.
+ * If you are no longer handling events, you must call libusb_unlock_events()
+ * as soon as possible.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \ref mtasync
+ */
+void API_EXPORTED libusb_lock_events(libusb_context *ctx)
+{
+	USBI_GET_CONTEXT(ctx);
+	usbi_mutex_lock(&ctx->events_lock);
+	ctx->event_handler_active = 1;
+}
+
+/** \ingroup poll
+ * Release the lock previously acquired with libusb_try_lock_events() or
+ * libusb_lock_events(). Releasing this lock will wake up any threads blocked
+ * on libusb_wait_for_event().
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \ref mtasync
+ */
+void API_EXPORTED libusb_unlock_events(libusb_context *ctx)
+{
+	USBI_GET_CONTEXT(ctx);
+	ctx->event_handler_active = 0;
+	usbi_mutex_unlock(&ctx->events_lock);
+
+	/* FIXME: perhaps we should be a bit more efficient by not broadcasting
+	 * the availability of the events lock when we are modifying pollfds
+	 * (check ctx->pollfd_modify)? */
+	usbi_mutex_lock(&ctx->event_waiters_lock);
+	usbi_cond_broadcast(&ctx->event_waiters_cond);
+	usbi_mutex_unlock(&ctx->event_waiters_lock);
+}
+
+/** \ingroup poll
+ * Determine if it is still OK for this thread to be doing event handling.
+ *
+ * Sometimes, libusb needs to temporarily pause all event handlers, and this
+ * is the function you should use before polling file descriptors to see if
+ * this is the case.
+ *
+ * If this function instructs your thread to give up the events lock, you
+ * should just continue the usual logic that is documented in \ref mtasync.
+ * On the next iteration, your thread will fail to obtain the events lock,
+ * and will hence become an event waiter.
+ *
+ * This function should be called while the events lock is held: you don't
+ * need to worry about the results of this function if your thread is not
+ * the current event handler.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns 1 if event handling can start or continue
+ * \returns 0 if this thread must give up the events lock
+ * \ref fullstory "Multi-threaded I/O: the full story"
+ */
+int API_EXPORTED libusb_event_handling_ok(libusb_context *ctx)
+{
+	unsigned int r;
+	USBI_GET_CONTEXT(ctx);
+
+	/* is someone else waiting to modify poll fds? if so, don't let this thread
+	 * continue event handling */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	r = ctx->pollfd_modify;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+	if (r) {
+		usbi_dbg("someone else is modifying poll fds");
+		return 0;
+	}
+
+	return 1;
+}
+
+
+/** \ingroup poll
+ * Determine if an active thread is handling events (i.e. if anyone is holding
+ * the event handling lock).
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns 1 if a thread is handling events
+ * \returns 0 if there are no threads currently handling events
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_event_handler_active(libusb_context *ctx)
+{
+	unsigned int r;
+	USBI_GET_CONTEXT(ctx);
+
+	/* is someone else waiting to modify poll fds? if so, don't let this thread
+	 * start event handling -- indicate that event handling is happening */
+	usbi_mutex_lock(&ctx->pollfd_modify_lock);
+	r = ctx->pollfd_modify;
+	usbi_mutex_unlock(&ctx->pollfd_modify_lock);
+	if (r) {
+		usbi_dbg("someone else is modifying poll fds");
+		return 1;
+	}
+
+	return ctx->event_handler_active;
+}
+
+/** \ingroup poll
+ * Acquire the event waiters lock. This lock is designed to be obtained under
+ * the situation where you want to be aware when events are completed, but
+ * some other thread is event handling so calling libusb_handle_events() is not
+ * allowed.
+ *
+ * You then obtain this lock, re-check that another thread is still handling
+ * events, then call libusb_wait_for_event().
+ *
+ * You only need to use this lock if you are developing an application
+ * which calls poll() or select() on libusb's file descriptors directly,
+ * <b>and</b> may potentially be handling events from 2 threads simultaenously.
+ * If you stick to libusb's event handling loop functions (e.g.
+ * libusb_handle_events()) then you do not need to be concerned with this
+ * locking.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \ref mtasync
+ */
+void API_EXPORTED libusb_lock_event_waiters(libusb_context *ctx)
+{
+	USBI_GET_CONTEXT(ctx);
+	usbi_mutex_lock(&ctx->event_waiters_lock);
+}
+
+/** \ingroup poll
+ * Release the event waiters lock.
+ * \param ctx the context to operate on, or NULL for the default context
+ * \ref mtasync
+ */
+void API_EXPORTED libusb_unlock_event_waiters(libusb_context *ctx)
+{
+	USBI_GET_CONTEXT(ctx);
+	usbi_mutex_unlock(&ctx->event_waiters_lock);
+}
+
+/** \ingroup poll
+ * Wait for another thread to signal completion of an event. Must be called
+ * with the event waiters lock held, see libusb_lock_event_waiters().
+ *
+ * This function will block until any of the following conditions are met:
+ * -# The timeout expires
+ * -# A transfer completes
+ * -# A thread releases the event handling lock through libusb_unlock_events()
+ *
+ * Condition 1 is obvious. Condition 2 unblocks your thread <em>after</em>
+ * the callback for the transfer has completed. Condition 3 is important
+ * because it means that the thread that was previously handling events is no
+ * longer doing so, so if any events are to complete, another thread needs to
+ * step up and start event handling.
+ *
+ * This function releases the event waiters lock before putting your thread
+ * to sleep, and reacquires the lock as it is being woken up.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param tv maximum timeout for this blocking function. A NULL value
+ * indicates unlimited timeout.
+ * \returns 0 after a transfer completes or another thread stops event handling
+ * \returns 1 if the timeout expired
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_wait_for_event(libusb_context *ctx, struct timeval *tv)
+{
+	struct timespec timeout;
+	int r;
+
+	USBI_GET_CONTEXT(ctx);
+	if (tv == NULL) {
+		usbi_cond_wait(&ctx->event_waiters_cond, &ctx->event_waiters_lock);
+		return 0;
+	}
+
+	r = usbi_backend->clock_gettime(USBI_CLOCK_REALTIME, &timeout);
+	if (r < 0) {
+		usbi_err(ctx, "failed to read realtime clock, error %d", errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	timeout.tv_sec += tv->tv_sec;
+	timeout.tv_nsec += tv->tv_usec * 1000;
+	while (timeout.tv_nsec >= 1000000000) {
+		timeout.tv_nsec -= 1000000000;
+		timeout.tv_sec++;
+	}
+
+	r = usbi_cond_timedwait(&ctx->event_waiters_cond,
+		&ctx->event_waiters_lock, &timeout);
+	return (r == ETIMEDOUT);
+}
+
+static void handle_timeout(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	int r;
+
+	itransfer->flags |= USBI_TRANSFER_TIMED_OUT;
+	r = libusb_cancel_transfer(transfer);
+	if (r < 0)
+		usbi_warn(TRANSFER_CTX(transfer),
+			"async cancel failed %d errno=%d", r, errno);
+}
+
+static int handle_timeouts_locked(struct libusb_context *ctx)
+{
+	int r;
+	struct timespec systime_ts;
+	struct timeval systime;
+	struct usbi_transfer *transfer;
+
+	if (list_empty(&ctx->flying_transfers))
+		return 0;
+
+	/* get current time */
+	r = usbi_backend->clock_gettime(USBI_CLOCK_MONOTONIC, &systime_ts);
+	if (r < 0)
+		return r;
+
+	TIMESPEC_TO_TIMEVAL(&systime, &systime_ts);
+
+	/* iterate through flying transfers list, finding all transfers that
+	 * have expired timeouts */
+	list_for_each_entry(transfer, &ctx->flying_transfers, list, struct usbi_transfer) {
+		struct timeval *cur_tv = &transfer->timeout;
+
+		/* if we've reached transfers of infinite timeout, we're all done */
+		if (!timerisset(cur_tv))
+			return 0;
+
+		/* ignore timeouts we've already handled */
+		if (transfer->flags & (USBI_TRANSFER_TIMED_OUT | USBI_TRANSFER_OS_HANDLES_TIMEOUT))
+			continue;
+
+		/* if transfer has non-expired timeout, nothing more to do */
+		if ((cur_tv->tv_sec > systime.tv_sec) ||
+				(cur_tv->tv_sec == systime.tv_sec &&
+					cur_tv->tv_usec > systime.tv_usec))
+			return 0;
+
+		/* otherwise, we've got an expired timeout to handle */
+		handle_timeout(transfer);
+	}
+	return 0;
+}
+
+static int handle_timeouts(struct libusb_context *ctx)
+{
+	int r;
+	USBI_GET_CONTEXT(ctx);
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+	r = handle_timeouts_locked(ctx);
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+	return r;
+}
+
+#ifdef USBI_TIMERFD_AVAILABLE
+static int handle_timerfd_trigger(struct libusb_context *ctx)
+{
+	int r;
+
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+
+	/* process the timeout that just happened */
+	r = handle_timeouts_locked(ctx);
+	if (r < 0)
+		goto out;
+
+	/* arm for next timeout*/
+	r = arm_timerfd_for_next_timeout(ctx);
+
+out:
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+	return r;
+}
+#endif
+
+/* do the actual event handling. assumes that no other thread is concurrently
+ * doing the same thing. */
+static int handle_events(struct libusb_context *ctx, struct timeval *tv)
+{
+	int r;
+	struct usbi_pollfd *ipollfd;
+	POLL_NFDS_TYPE nfds = 0;
+	struct pollfd *fds = NULL;
+	int i = -1;
+	int timeout_ms;
+	int special_event;
+
+	usbi_mutex_lock(&ctx->pollfds_lock);
+	list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd)
+		nfds++;
+
+	/* TODO: malloc when number of fd's changes, not on every poll */
+	if (nfds != 0)
+		fds = malloc(sizeof(*fds) * nfds);
+	if (!fds) {
+		usbi_mutex_unlock(&ctx->pollfds_lock);
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd) {
+		struct libusb_pollfd *pollfd = &ipollfd->pollfd;
+		int fd = pollfd->fd;
+		i++;
+		fds[i].fd = fd;
+		fds[i].events = pollfd->events;
+		fds[i].revents = 0;
+	}
+	usbi_mutex_unlock(&ctx->pollfds_lock);
+
+	timeout_ms = (int)(tv->tv_sec * 1000) + (tv->tv_usec / 1000);
+
+	/* round up to next millisecond */
+	if (tv->tv_usec % 1000)
+		timeout_ms++;
+
+redo_poll:
+	usbi_dbg("poll() %d fds with timeout in %dms", nfds, timeout_ms);
+	r = usbi_poll(fds, nfds, timeout_ms);
+	usbi_dbg("poll() returned %d", r);
+	if (r == 0) {
+		free(fds);
+		return handle_timeouts(ctx);
+	} else if (r == -1 && errno == EINTR) {
+		free(fds);
+		return LIBUSB_ERROR_INTERRUPTED;
+	} else if (r < 0) {
+		free(fds);
+		usbi_err(ctx, "poll failed %d err=%d\n", r, errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	special_event = 0;
+
+	/* fd[0] is always the ctrl pipe */
+	if (fds[0].revents) {
+		/* another thread wanted to interrupt event handling, and it succeeded!
+		 * handle any other events that cropped up at the same time, and
+		 * simply return */
+		usbi_dbg("caught a fish on the control pipe");
+
+		if (r == 1) {
+			r = 0;
+			goto handled;
+		} else {
+			/* prevent OS backend from trying to handle events on ctrl pipe */
+			fds[0].revents = 0;
+			r--;
+		}
+	}
+
+	/* fd[1] is always the hotplug pipe */
+	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) && fds[1].revents) {
+		libusb_hotplug_message message;
+		ssize_t ret;
+
+		usbi_dbg("caught a fish on the hotplug pipe");
+		special_event = 1;
+
+		/* read the message from the hotplug thread */
+		ret = usbi_read(ctx->hotplug_pipe[0], &message, sizeof (message));
+		if (ret != sizeof(message)) {
+			usbi_err(ctx, "hotplug pipe read error %d != %u",
+				 ret, sizeof(message));
+			r = LIBUSB_ERROR_OTHER;
+			goto handled;
+		}
+
+		usbi_hotplug_match(ctx, message.device, message.event);
+
+		/* the device left. dereference the device */
+		if (LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT == message.event)
+			libusb_unref_device(message.device);
+
+		fds[1].revents = 0;
+		if (1 == r--)
+			goto handled;
+	} /* else there shouldn't be anything on this pipe */
+
+#ifdef USBI_TIMERFD_AVAILABLE
+	/* on timerfd configurations, fds[2] is the timerfd */
+	if (usbi_using_timerfd(ctx) && fds[2].revents) {
+		/* timerfd indicates that a timeout has expired */
+		int ret;
+		usbi_dbg("timerfd triggered");
+		special_event = 1;
+
+		ret = handle_timerfd_trigger(ctx);
+		if (ret < 0) {
+			/* return error code */
+			r = ret;
+			goto handled;
+		} else if (r == 1) {
+			/* no more active file descriptors, nothing more to do */
+			r = 0;
+			goto handled;
+		} else {
+			/* more events pending...
+			 * prevent OS backend from trying to handle events on timerfd */
+			fds[2].revents = 0;
+			r--;
+		}
+	}
+#endif
+
+	r = usbi_backend->handle_events(ctx, fds, nfds, r);
+	if (r)
+		usbi_err(ctx, "backend handle_events failed with error %d", r);
+
+handled:
+        if (r == 0 && special_event) {
+                timeout_ms = 0;
+                goto redo_poll;
+        }
+
+	free(fds);
+	return r;
+}
+
+/* returns the smallest of:
+ *  1. timeout of next URB
+ *  2. user-supplied timeout
+ * returns 1 if there is an already-expired timeout, otherwise returns 0
+ * and populates out
+ */
+static int get_next_timeout(libusb_context *ctx, struct timeval *tv,
+	struct timeval *out)
+{
+	struct timeval timeout;
+	int r = libusb_get_next_timeout(ctx, &timeout);
+	if (r) {
+		/* timeout already expired? */
+		if (!timerisset(&timeout))
+			return 1;
+
+		/* choose the smallest of next URB timeout or user specified timeout */
+		if (timercmp(&timeout, tv, <))
+			*out = timeout;
+		else
+			*out = *tv;
+	} else {
+		*out = *tv;
+	}
+	return 0;
+}
+
+/** \ingroup poll
+ * Handle any pending events.
+ *
+ * libusb determines "pending events" by checking if any timeouts have expired
+ * and by checking the set of file descriptors for activity.
+ *
+ * If a zero timeval is passed, this function will handle any already-pending
+ * events and then immediately return in non-blocking style.
+ *
+ * If a non-zero timeval is passed and no events are currently pending, this
+ * function will block waiting for events to handle up until the specified
+ * timeout. If an event arrives or a signal is raised, this function will
+ * return early.
+ *
+ * If the parameter completed is not NULL then <em>after obtaining the event
+ * handling lock</em> this function will return immediately if the integer
+ * pointed to is not 0. This allows for race free waiting for the completion
+ * of a specific transfer.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param tv the maximum time to block waiting for events, or an all zero
+ * timeval struct for non-blocking mode
+ * \param completed pointer to completion integer to check, or NULL
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_handle_events_timeout_completed(libusb_context *ctx,
+	struct timeval *tv, int *completed)
+{
+	int r;
+	struct timeval poll_timeout;
+
+	USBI_GET_CONTEXT(ctx);
+	r = get_next_timeout(ctx, tv, &poll_timeout);
+	if (r) {
+		/* timeout already expired */
+		return handle_timeouts(ctx);
+	}
+
+retry:
+	if (libusb_try_lock_events(ctx) == 0) {
+		if (completed == NULL || !*completed) {
+			/* we obtained the event lock: do our own event handling */
+			usbi_dbg("doing our own event handling");
+			r = handle_events(ctx, &poll_timeout);
+		}
+		libusb_unlock_events(ctx);
+		return r;
+	}
+
+	/* another thread is doing event handling. wait for thread events that
+	 * notify event completion. */
+	libusb_lock_event_waiters(ctx);
+
+	if (completed && *completed)
+		goto already_done;
+
+	if (!libusb_event_handler_active(ctx)) {
+		/* we hit a race: whoever was event handling earlier finished in the
+		 * time it took us to reach this point. try the cycle again. */
+		libusb_unlock_event_waiters(ctx);
+		usbi_dbg("event handler was active but went away, retrying");
+		goto retry;
+	}
+
+	usbi_dbg("another thread is doing event handling");
+	r = libusb_wait_for_event(ctx, &poll_timeout);
+
+already_done:
+	libusb_unlock_event_waiters(ctx);
+
+	if (r < 0)
+		return r;
+	else if (r == 1)
+		return handle_timeouts(ctx);
+	else
+		return 0;
+}
+
+/** \ingroup poll
+ * Handle any pending events
+ *
+ * Like libusb_handle_events_timeout_completed(), but without the completed
+ * parameter, calling this function is equivalent to calling
+ * libusb_handle_events_timeout_completed() with a NULL completed parameter.
+ *
+ * This function is kept primarily for backwards compatibility.
+ * All new code should call libusb_handle_events_completed() or
+ * libusb_handle_events_timeout_completed() to avoid race conditions.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param tv the maximum time to block waiting for events, or an all zero
+ * timeval struct for non-blocking mode
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_handle_events_timeout(libusb_context *ctx,
+	struct timeval *tv)
+{
+	return libusb_handle_events_timeout_completed(ctx, tv, NULL);
+}
+
+/** \ingroup poll
+ * Handle any pending events in blocking mode. There is currently a timeout
+ * hardcoded at 60 seconds but we plan to make it unlimited in future. For
+ * finer control over whether this function is blocking or non-blocking, or
+ * for control over the timeout, use libusb_handle_events_timeout_completed()
+ * instead.
+ *
+ * This function is kept primarily for backwards compatibility.
+ * All new code should call libusb_handle_events_completed() or
+ * libusb_handle_events_timeout_completed() to avoid race conditions.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ */
+int API_EXPORTED libusb_handle_events(libusb_context *ctx)
+{
+	struct timeval tv;
+	tv.tv_sec = 60;
+	tv.tv_usec = 0;
+	return libusb_handle_events_timeout_completed(ctx, &tv, NULL);
+}
+
+/** \ingroup poll
+ * Handle any pending events in blocking mode.
+ *
+ * Like libusb_handle_events(), with the addition of a completed parameter
+ * to allow for race free waiting for the completion of a specific transfer.
+ *
+ * See libusb_handle_events_timeout_completed() for details on the completed
+ * parameter.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param completed pointer to completion integer to check, or NULL
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_handle_events_completed(libusb_context *ctx,
+	int *completed)
+{
+	struct timeval tv;
+	tv.tv_sec = 60;
+	tv.tv_usec = 0;
+	return libusb_handle_events_timeout_completed(ctx, &tv, completed);
+}
+
+/** \ingroup poll
+ * Handle any pending events by polling file descriptors, without checking if
+ * any other threads are already doing so. Must be called with the event lock
+ * held, see libusb_lock_events().
+ *
+ * This function is designed to be called under the situation where you have
+ * taken the event lock and are calling poll()/select() directly on libusb's
+ * file descriptors (as opposed to using libusb_handle_events() or similar).
+ * You detect events on libusb's descriptors, so you then call this function
+ * with a zero timeout value (while still holding the event lock).
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param tv the maximum time to block waiting for events, or zero for
+ * non-blocking mode
+ * \returns 0 on success, or a LIBUSB_ERROR code on failure
+ * \ref mtasync
+ */
+int API_EXPORTED libusb_handle_events_locked(libusb_context *ctx,
+	struct timeval *tv)
+{
+	int r;
+	struct timeval poll_timeout;
+
+	USBI_GET_CONTEXT(ctx);
+	r = get_next_timeout(ctx, tv, &poll_timeout);
+	if (r) {
+		/* timeout already expired */
+		return handle_timeouts(ctx);
+	}
+
+	return handle_events(ctx, &poll_timeout);
+}
+
+/** \ingroup poll
+ * Determines whether your application must apply special timing considerations
+ * when monitoring libusb's file descriptors.
+ *
+ * This function is only useful for applications which retrieve and poll
+ * libusb's file descriptors in their own main loop (\ref pollmain).
+ *
+ * Ordinarily, libusb's event handler needs to be called into at specific
+ * moments in time (in addition to times when there is activity on the file
+ * descriptor set). The usual approach is to use libusb_get_next_timeout()
+ * to learn about when the next timeout occurs, and to adjust your
+ * poll()/select() timeout accordingly so that you can make a call into the
+ * library at that time.
+ *
+ * Some platforms supported by libusb do not come with this baggage - any
+ * events relevant to timing will be represented by activity on the file
+ * descriptor set, and libusb_get_next_timeout() will always return 0.
+ * This function allows you to detect whether you are running on such a
+ * platform.
+ *
+ * Since v1.0.5.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns 0 if you must call into libusb at times determined by
+ * libusb_get_next_timeout(), or 1 if all timeout events are handled internally
+ * or through regular activity on the file descriptors.
+ * \ref pollmain "Polling libusb file descriptors for event handling"
+ */
+int API_EXPORTED libusb_pollfds_handle_timeouts(libusb_context *ctx)
+{
+#if defined(USBI_TIMERFD_AVAILABLE)
+	USBI_GET_CONTEXT(ctx);
+	return usbi_using_timerfd(ctx);
+#else
+	(void)ctx;
+	return 0;
+#endif
+}
+
+/** \ingroup poll
+ * Determine the next internal timeout that libusb needs to handle. You only
+ * need to use this function if you are calling poll() or select() or similar
+ * on libusb's file descriptors yourself - you do not need to use it if you
+ * are calling libusb_handle_events() or a variant directly.
+ *
+ * You should call this function in your main loop in order to determine how
+ * long to wait for select() or poll() to return results. libusb needs to be
+ * called into at this timeout, so you should use it as an upper bound on
+ * your select() or poll() call.
+ *
+ * When the timeout has expired, call into libusb_handle_events_timeout()
+ * (perhaps in non-blocking mode) so that libusb can handle the timeout.
+ *
+ * This function may return 1 (success) and an all-zero timeval. If this is
+ * the case, it indicates that libusb has a timeout that has already expired
+ * so you should call libusb_handle_events_timeout() or similar immediately.
+ * A return code of 0 indicates that there are no pending timeouts.
+ *
+ * On some platforms, this function will always returns 0 (no pending
+ * timeouts). See \ref polltime.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param tv output location for a relative time against the current
+ * clock in which libusb must be called into in order to process timeout events
+ * \returns 0 if there are no pending timeouts, 1 if a timeout was returned,
+ * or LIBUSB_ERROR_OTHER on failure
+ */
+int API_EXPORTED libusb_get_next_timeout(libusb_context *ctx,
+	struct timeval *tv)
+{
+	struct usbi_transfer *transfer;
+	struct timespec cur_ts;
+	struct timeval cur_tv;
+	struct timeval *next_timeout;
+	int r;
+	int found = 0;
+
+	USBI_GET_CONTEXT(ctx);
+	if (usbi_using_timerfd(ctx))
+		return 0;
+
+	usbi_mutex_lock(&ctx->flying_transfers_lock);
+	if (list_empty(&ctx->flying_transfers)) {
+		usbi_mutex_unlock(&ctx->flying_transfers_lock);
+		usbi_dbg("no URBs, no timeout!");
+		return 0;
+	}
+
+	/* find next transfer which hasn't already been processed as timed out */
+	list_for_each_entry(transfer, &ctx->flying_transfers, list, struct usbi_transfer) {
+		if (transfer->flags & (USBI_TRANSFER_TIMED_OUT | USBI_TRANSFER_OS_HANDLES_TIMEOUT))
+			continue;
+
+		/* no timeout for this transfer? */
+		if (!timerisset(&transfer->timeout))
+			continue;
+
+		found = 1;
+		break;
+	}
+	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+
+	if (!found) {
+		usbi_dbg("no URB with timeout or all handled by OS; no timeout!");
+		return 0;
+	}
+
+	next_timeout = &transfer->timeout;
+
+	r = usbi_backend->clock_gettime(USBI_CLOCK_MONOTONIC, &cur_ts);
+	if (r < 0) {
+		usbi_err(ctx, "failed to read monotonic clock, errno=%d", errno);
+		return 0;
+	}
+	TIMESPEC_TO_TIMEVAL(&cur_tv, &cur_ts);
+
+	if (!timercmp(&cur_tv, next_timeout, <)) {
+		usbi_dbg("first timeout already expired");
+		timerclear(tv);
+	} else {
+		timersub(next_timeout, &cur_tv, tv);
+		usbi_dbg("next timeout in %d.%06ds", tv->tv_sec, tv->tv_usec);
+	}
+
+	return 1;
+}
+
+/** \ingroup poll
+ * Register notification functions for file descriptor additions/removals.
+ * These functions will be invoked for every new or removed file descriptor
+ * that libusb uses as an event source.
+ *
+ * To remove notifiers, pass NULL values for the function pointers.
+ *
+ * Note that file descriptors may have been added even before you register
+ * these notifiers (e.g. at libusb_init() time).
+ *
+ * Additionally, note that the removal notifier may be called during
+ * libusb_exit() (e.g. when it is closing file descriptors that were opened
+ * and added to the poll set at libusb_init() time). If you don't want this,
+ * remove the notifiers immediately before calling libusb_exit().
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \param added_cb pointer to function for addition notifications
+ * \param removed_cb pointer to function for removal notifications
+ * \param user_data User data to be passed back to callbacks (useful for
+ * passing context information)
+ */
+void API_EXPORTED libusb_set_pollfd_notifiers(libusb_context *ctx,
+	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
+	void *user_data)
+{
+	USBI_GET_CONTEXT(ctx);
+	ctx->fd_added_cb = added_cb;
+	ctx->fd_removed_cb = removed_cb;
+	ctx->fd_cb_user_data = user_data;
+}
+
+/* Add a file descriptor to the list of file descriptors to be monitored.
+ * events should be specified as a bitmask of events passed to poll(), e.g.
+ * POLLIN and/or POLLOUT. */
+int usbi_add_pollfd(struct libusb_context *ctx, int fd, short events)
+{
+	struct usbi_pollfd *ipollfd = malloc(sizeof(*ipollfd));
+	if (!ipollfd)
+		return LIBUSB_ERROR_NO_MEM;
+
+	usbi_dbg("add fd %d events %d", fd, events);
+	ipollfd->pollfd.fd = fd;
+	ipollfd->pollfd.events = events;
+	usbi_mutex_lock(&ctx->pollfds_lock);
+	list_add_tail(&ipollfd->list, &ctx->pollfds);
+	usbi_mutex_unlock(&ctx->pollfds_lock);
+
+	if (ctx->fd_added_cb)
+		ctx->fd_added_cb(fd, events, ctx->fd_cb_user_data);
+	return 0;
+}
+
+/* Remove a file descriptor from the list of file descriptors to be polled. */
+void usbi_remove_pollfd(struct libusb_context *ctx, int fd)
+{
+	struct usbi_pollfd *ipollfd;
+	int found = 0;
+
+	usbi_dbg("remove fd %d", fd);
+	usbi_mutex_lock(&ctx->pollfds_lock);
+	list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd)
+		if (ipollfd->pollfd.fd == fd) {
+			found = 1;
+			break;
+		}
+
+	if (!found) {
+		usbi_dbg("couldn't find fd %d to remove", fd);
+		usbi_mutex_unlock(&ctx->pollfds_lock);
+		return;
+	}
+
+	list_del(&ipollfd->list);
+	usbi_mutex_unlock(&ctx->pollfds_lock);
+	free(ipollfd);
+	if (ctx->fd_removed_cb)
+		ctx->fd_removed_cb(fd, ctx->fd_cb_user_data);
+}
+
+/** \ingroup poll
+ * Retrieve a list of file descriptors that should be polled by your main loop
+ * as libusb event sources.
+ *
+ * The returned list is NULL-terminated and should be freed with free() when
+ * done. The actual list contents must not be touched.
+ *
+ * As file descriptors are a Unix-specific concept, this function is not
+ * available on Windows and will always return NULL.
+ *
+ * \param ctx the context to operate on, or NULL for the default context
+ * \returns a NULL-terminated list of libusb_pollfd structures
+ * \returns NULL on error
+ * \returns NULL on platforms where the functionality is not available
+ */
+DEFAULT_VISIBILITY
+const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
+	libusb_context *ctx)
+{
+#ifndef OS_WINDOWS
+	struct libusb_pollfd **ret = NULL;
+	struct usbi_pollfd *ipollfd;
+	size_t i = 0;
+	size_t cnt = 0;
+	USBI_GET_CONTEXT(ctx);
+
+	usbi_mutex_lock(&ctx->pollfds_lock);
+	list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd)
+		cnt++;
+
+	ret = calloc(cnt + 1, sizeof(struct libusb_pollfd *));
+	if (!ret)
+		goto out;
+
+	list_for_each_entry(ipollfd, &ctx->pollfds, list, struct usbi_pollfd)
+		ret[i++] = (struct libusb_pollfd *) ipollfd;
+	ret[cnt] = NULL;
+
+out:
+	usbi_mutex_unlock(&ctx->pollfds_lock);
+	return (const struct libusb_pollfd **) ret;
+#else
+	usbi_err(ctx, "external polling of libusb's internal descriptors "\
+		"is not yet supported on Windows platforms");
+	return NULL;
+#endif
+}
+
+/* Backends may call this from handle_events to report disconnection of a
+ * device. This function ensures transfers get cancelled appropriately.
+ * Callers of this function must hold the events_lock.
+ */
+void usbi_handle_disconnect(struct libusb_device_handle *handle)
+{
+	struct usbi_transfer *cur;
+	struct usbi_transfer *to_cancel;
+
+	usbi_dbg("device %d.%d",
+		handle->dev->bus_number, handle->dev->device_address);
+
+	/* terminate all pending transfers with the LIBUSB_TRANSFER_NO_DEVICE
+	 * status code.
+	 *
+	 * this is a bit tricky because:
+	 * 1. we can't do transfer completion while holding flying_transfers_lock
+	 *    because the completion handler may try to re-submit the transfer
+	 * 2. the transfers list can change underneath us - if we were to build a
+	 *    list of transfers to complete (while holding lock), the situation
+	 *    might be different by the time we come to free them
+	 *
+	 * so we resort to a loop-based approach as below
+	 *
+	 * This is safe because transfers are only removed from the
+	 * flying_transfer list by usbi_handle_transfer_completion and
+	 * libusb_close, both of which hold the events_lock while doing so,
+	 * so usbi_handle_disconnect cannot be running at the same time.
+	 *
+	 * Note that libusb_submit_transfer also removes the transfer from
+	 * the flying_transfer list on submission failure, but it keeps the
+	 * flying_transfer list locked between addition and removal, so
+	 * usbi_handle_disconnect never sees such transfers.
+	 */
+
+	while (1) {
+		usbi_mutex_lock(&HANDLE_CTX(handle)->flying_transfers_lock);
+		to_cancel = NULL;
+		list_for_each_entry(cur, &HANDLE_CTX(handle)->flying_transfers, list, struct usbi_transfer)
+			if (USBI_TRANSFER_TO_LIBUSB_TRANSFER(cur)->dev_handle == handle) {
+				to_cancel = cur;
+				break;
+			}
+		usbi_mutex_unlock(&HANDLE_CTX(handle)->flying_transfers_lock);
+
+		if (!to_cancel)
+			break;
+
+		usbi_dbg("cancelling transfer %p from disconnect",
+			 USBI_TRANSFER_TO_LIBUSB_TRANSFER(to_cancel));
+
+		usbi_backend->clear_transfer_priv(to_cancel);
+		usbi_handle_transfer_completion(to_cancel, LIBUSB_TRANSFER_NO_DEVICE);
+	}
+
+}
diff --git a/Externals/libusb/libusb/libusb-1.0.def b/Externals/libusb/libusb/libusb-1.0.def
new file mode 100644
index 0000000000..d45cfc55a2
--- /dev/null
+++ b/Externals/libusb/libusb/libusb-1.0.def
@@ -0,0 +1,166 @@
+LIBRARY "libusb-1.0.dll"
+EXPORTS
+  libusb_alloc_streams
+  libusb_alloc_streams@16 = libusb_alloc_streams
+  libusb_alloc_transfer
+  libusb_alloc_transfer@4 = libusb_alloc_transfer
+  libusb_attach_kernel_driver
+  libusb_attach_kernel_driver@8 = libusb_attach_kernel_driver
+  libusb_bulk_transfer
+  libusb_bulk_transfer@24 = libusb_bulk_transfer
+  libusb_cancel_transfer
+  libusb_cancel_transfer@4 = libusb_cancel_transfer
+  libusb_claim_interface
+  libusb_claim_interface@8 = libusb_claim_interface
+  libusb_clear_halt
+  libusb_clear_halt@8 = libusb_clear_halt
+  libusb_close
+  libusb_close@4 = libusb_close
+  libusb_control_transfer
+  libusb_control_transfer@32 = libusb_control_transfer
+  libusb_detach_kernel_driver
+  libusb_detach_kernel_driver@8 = libusb_detach_kernel_driver
+  libusb_error_name
+  libusb_error_name@4 = libusb_error_name
+  libusb_event_handler_active
+  libusb_event_handler_active@4 = libusb_event_handler_active
+  libusb_event_handling_ok
+  libusb_event_handling_ok@4 = libusb_event_handling_ok
+  libusb_exit
+  libusb_exit@4 = libusb_exit
+  libusb_free_bos_descriptor
+  libusb_free_bos_descriptor@4 = libusb_free_bos_descriptor
+  libusb_free_config_descriptor
+  libusb_free_config_descriptor@4 = libusb_free_config_descriptor
+  libusb_free_container_id_descriptor
+  libusb_free_container_id_descriptor@4 = libusb_free_container_id_descriptor
+  libusb_free_device_list
+  libusb_free_device_list@8 = libusb_free_device_list
+  libusb_free_ss_endpoint_companion_descriptor
+  libusb_free_ss_endpoint_companion_descriptor@4 = libusb_free_ss_endpoint_companion_descriptor
+  libusb_free_ss_usb_device_capability_descriptor
+  libusb_free_ss_usb_device_capability_descriptor@4 = libusb_free_ss_usb_device_capability_descriptor
+  libusb_free_streams
+  libusb_free_streams@12 = libusb_free_streams
+  libusb_free_transfer
+  libusb_free_transfer@4 = libusb_free_transfer
+  libusb_free_usb_2_0_extension_descriptor
+  libusb_free_usb_2_0_extension_descriptor@4 = libusb_free_usb_2_0_extension_descriptor
+  libusb_get_active_config_descriptor
+  libusb_get_active_config_descriptor@8 = libusb_get_active_config_descriptor
+  libusb_get_bos_descriptor
+  libusb_get_bos_descriptor@8 = libusb_get_bos_descriptor
+  libusb_get_bus_number
+  libusb_get_bus_number@4 = libusb_get_bus_number
+  libusb_get_config_descriptor
+  libusb_get_config_descriptor@12 = libusb_get_config_descriptor
+  libusb_get_config_descriptor_by_value
+  libusb_get_config_descriptor_by_value@12 = libusb_get_config_descriptor_by_value
+  libusb_get_configuration
+  libusb_get_configuration@8 = libusb_get_configuration
+  libusb_get_container_id_descriptor
+  libusb_get_container_id_descriptor@12 = libusb_get_container_id_descriptor
+  libusb_get_device
+  libusb_get_device@4 = libusb_get_device
+  libusb_get_device_address
+  libusb_get_device_address@4 = libusb_get_device_address
+  libusb_get_device_descriptor
+  libusb_get_device_descriptor@8 = libusb_get_device_descriptor
+  libusb_get_device_list
+  libusb_get_device_list@8 = libusb_get_device_list
+  libusb_get_device_speed
+  libusb_get_device_speed@4 = libusb_get_device_speed
+  libusb_get_max_iso_packet_size
+  libusb_get_max_iso_packet_size@8 = libusb_get_max_iso_packet_size
+  libusb_get_max_packet_size
+  libusb_get_max_packet_size@8 = libusb_get_max_packet_size
+  libusb_get_next_timeout
+  libusb_get_next_timeout@8 = libusb_get_next_timeout
+  libusb_get_parent
+  libusb_get_parent@4 = libusb_get_parent
+  libusb_get_pollfds
+  libusb_get_pollfds@4 = libusb_get_pollfds
+  libusb_get_port_number
+  libusb_get_port_number@4 = libusb_get_port_number
+  libusb_get_port_numbers
+  libusb_get_port_numbers@12 = libusb_get_port_numbers
+  libusb_get_port_path
+  libusb_get_port_path@16 = libusb_get_port_path
+  libusb_get_ss_endpoint_companion_descriptor
+  libusb_get_ss_endpoint_companion_descriptor@12 = libusb_get_ss_endpoint_companion_descriptor
+  libusb_get_ss_usb_device_capability_descriptor
+  libusb_get_ss_usb_device_capability_descriptor@12 = libusb_get_ss_usb_device_capability_descriptor
+  libusb_get_string_descriptor_ascii
+  libusb_get_string_descriptor_ascii@16 = libusb_get_string_descriptor_ascii
+  libusb_get_usb_2_0_extension_descriptor
+  libusb_get_usb_2_0_extension_descriptor@12 = libusb_get_usb_2_0_extension_descriptor
+  libusb_get_version
+  libusb_get_version@0 = libusb_get_version
+  libusb_handle_events
+  libusb_handle_events@4 = libusb_handle_events
+  libusb_handle_events_completed
+  libusb_handle_events_completed@8 = libusb_handle_events_completed
+  libusb_handle_events_locked
+  libusb_handle_events_locked@8 = libusb_handle_events_locked
+  libusb_handle_events_timeout
+  libusb_handle_events_timeout@8 = libusb_handle_events_timeout
+  libusb_handle_events_timeout_completed
+  libusb_handle_events_timeout_completed@12 = libusb_handle_events_timeout_completed
+  libusb_has_capability
+  libusb_has_capability@4 = libusb_has_capability
+  libusb_hotplug_deregister_callback
+  libusb_hotplug_deregister_callback@8 = libusb_hotplug_deregister_callback
+  libusb_hotplug_register_callback
+  libusb_hotplug_register_callback@36 = libusb_hotplug_register_callback
+  libusb_init
+  libusb_init@4 = libusb_init
+  libusb_interrupt_transfer
+  libusb_interrupt_transfer@24 = libusb_interrupt_transfer
+  libusb_kernel_driver_active
+  libusb_kernel_driver_active@8 = libusb_kernel_driver_active
+  libusb_lock_event_waiters
+  libusb_lock_event_waiters@4 = libusb_lock_event_waiters
+  libusb_lock_events
+  libusb_lock_events@4 = libusb_lock_events
+  libusb_open
+  libusb_open@8 = libusb_open
+  libusb_open_device_with_vid_pid
+  libusb_open_device_with_vid_pid@12 = libusb_open_device_with_vid_pid
+  libusb_pollfds_handle_timeouts
+  libusb_pollfds_handle_timeouts@4 = libusb_pollfds_handle_timeouts
+  libusb_ref_device
+  libusb_ref_device@4 = libusb_ref_device
+  libusb_release_interface
+  libusb_release_interface@8 = libusb_release_interface
+  libusb_reset_device
+  libusb_reset_device@4 = libusb_reset_device
+  libusb_set_auto_detach_kernel_driver
+  libusb_set_auto_detach_kernel_driver@8 = libusb_set_auto_detach_kernel_driver
+  libusb_set_configuration
+  libusb_set_configuration@8 = libusb_set_configuration
+  libusb_set_debug
+  libusb_set_debug@8 = libusb_set_debug
+  libusb_set_interface_alt_setting
+  libusb_set_interface_alt_setting@12 = libusb_set_interface_alt_setting
+  libusb_set_pollfd_notifiers
+  libusb_set_pollfd_notifiers@16 = libusb_set_pollfd_notifiers
+  libusb_setlocale
+  libusb_setlocale@4 = libusb_setlocale
+  libusb_strerror
+  libusb_strerror@4 = libusb_strerror
+  libusb_submit_transfer
+  libusb_submit_transfer@4 = libusb_submit_transfer
+  libusb_transfer_get_stream_id
+  libusb_transfer_get_stream_id@4 = libusb_transfer_get_stream_id
+  libusb_transfer_set_stream_id
+  libusb_transfer_set_stream_id@8 = libusb_transfer_set_stream_id
+  libusb_try_lock_events
+  libusb_try_lock_events@4 = libusb_try_lock_events
+  libusb_unlock_event_waiters
+  libusb_unlock_event_waiters@4 = libusb_unlock_event_waiters
+  libusb_unlock_events
+  libusb_unlock_events@4 = libusb_unlock_events
+  libusb_unref_device
+  libusb_unref_device@4 = libusb_unref_device
+  libusb_wait_for_event
+  libusb_wait_for_event@8 = libusb_wait_for_event
diff --git a/Externals/libusb/libusb/libusb-1.0.rc b/Externals/libusb/libusb/libusb-1.0.rc
new file mode 100644
index 0000000000..3dce6d5a91
--- /dev/null
+++ b/Externals/libusb/libusb/libusb-1.0.rc
@@ -0,0 +1,61 @@
+/*
+ * For Windows: input this file to the Resoure Compiler to produce a binary
+ * .res file. This is then embedded in the resultant library (like any other
+ * compilation object).
+ * The information can then be queried using standard APIs and can also be
+ * viewed with utilities such as Windows Explorer.
+ */
+#ifndef _WIN32_WCE
+#include "winresrc.h"
+#endif
+
+#include "version.h"
+#ifndef LIBUSB_VERSIONSTRING
+#define LU_STR(s) #s
+#define LU_XSTR(s) LU_STR(s)
+#if LIBUSB_NANO > 0
+#define LIBUSB_VERSIONSTRING \
+	LU_XSTR(LIBUSB_MAJOR) "." LU_XSTR(LIBUSB_MINOR) "." \
+	LU_XSTR(LIBUSB_MICRO) "." LU_XSTR(LIBUSB_NANO) LIBUSB_RC "\0"
+#else
+#define LIBUSB_VERSIONSTRING \
+	LU_XSTR(LIBUSB_MAJOR) "." LU_XSTR(LIBUSB_MINOR) "." \
+	LU_XSTR(LIBUSB_MICRO) LIBUSB_RC "\0"
+#endif
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION LIBUSB_MAJOR,LIBUSB_MINOR,LIBUSB_MICRO,LIBUSB_NANO
+ PRODUCTVERSION LIBUSB_MAJOR,LIBUSB_MINOR,LIBUSB_MICRO,LIBUSB_NANO
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "libusb.info\0"
+			VALUE "FileDescription", "C library for writing portable USB drivers in userspace\0"
+			VALUE "FileVersion", LIBUSB_VERSIONSTRING
+			VALUE "InternalName", "libusb\0"
+			VALUE "LegalCopyright", "See individual source files, GNU LGPL v2.1 or later.\0"
+			VALUE "LegalTrademarks", "http://www.gnu.org/licenses/lgpl-2.1.html\0"
+			VALUE "OriginalFilename", "libusb-1.0.dll\0"
+			VALUE "PrivateBuild", "\0"
+			VALUE "ProductName", "libusb-1.0\0"
+			VALUE "ProductVersion", LIBUSB_VERSIONSTRING
+			VALUE "SpecialBuild", "\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1200
+	END
+END
diff --git a/Externals/libusb/libusb/libusb.h b/Externals/libusb/libusb/libusb.h
new file mode 100644
index 0000000000..a19ab3488e
--- /dev/null
+++ b/Externals/libusb/libusb/libusb.h
@@ -0,0 +1,1998 @@
+/*
+ * Public libusb header file
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2012 Pete Batard <pete@akeo.ie>
+ * Copyright © 2012 Nathan Hjelm <hjelmn@cs.unm.edu>
+ * For more information, please visit: http://libusb.info
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBUSB_H
+#define LIBUSB_H
+
+#ifdef _MSC_VER
+/* on MS environments, the inline keyword is available in C++ only */
+#if !defined(__cplusplus)
+#define inline __inline
+#endif
+/* ssize_t is also not available (copy/paste from MinGW) */
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+#undef ssize_t
+#ifdef _WIN64
+  typedef __int64 ssize_t;
+#else
+  typedef int ssize_t;
+#endif /* _WIN64 */
+#endif /* _SSIZE_T_DEFINED */
+#endif /* _MSC_VER */
+
+/* stdint.h is not available on older MSVC */
+#if defined(_MSC_VER) && (_MSC_VER < 1600) && (!defined(_STDINT)) && (!defined(_STDINT_H))
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+#else
+#include <stdint.h>
+#endif
+
+#if !defined(_WIN32_WCE)
+#include <sys/types.h>
+#endif
+
+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+#include <sys/time.h>
+#endif
+
+#include <time.h>
+#include <limits.h>
+
+/* 'interface' might be defined as a macro on Windows, so we need to
+ * undefine it so as not to break the current libusb API, because
+ * libusb_config_descriptor has an 'interface' member
+ * As this can be problematic if you include windows.h after libusb.h
+ * in your sources, we force windows.h to be included first. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+#include <windows.h>
+#if defined(interface)
+#undef interface
+#endif
+#if !defined(__CYGWIN__)
+#include <winsock.h>
+#endif
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#define LIBUSB_DEPRECATED_FOR(f) \
+  __attribute__((deprecated("Use " #f " instead")))
+#else
+#define LIBUSB_DEPRECATED_FOR(f)
+#endif /* __GNUC__ */
+
+/** \def LIBUSB_CALL
+ * \ingroup misc
+ * libusb's Windows calling convention.
+ *
+ * Under Windows, the selection of available compilers and configurations
+ * means that, unlike other platforms, there is not <em>one true calling
+ * convention</em> (calling convention: the manner in which parameters are
+ * passed to funcions in the generated assembly code).
+ *
+ * Matching the Windows API itself, libusb uses the WINAPI convention (which
+ * translates to the <tt>stdcall</tt> convention) and guarantees that the
+ * library is compiled in this way. The public header file also includes
+ * appropriate annotations so that your own software will use the right
+ * convention, even if another convention is being used by default within
+ * your codebase.
+ *
+ * The one consideration that you must apply in your software is to mark
+ * all functions which you use as libusb callbacks with this LIBUSB_CALL
+ * annotation, so that they too get compiled for the correct calling
+ * convention.
+ *
+ * On non-Windows operating systems, this macro is defined as nothing. This
+ * means that you can apply it to your code without worrying about
+ * cross-platform compatibility.
+ */
+/* LIBUSB_CALL must be defined on both definition and declaration of libusb
+ * functions. You'd think that declaration would be enough, but cygwin will
+ * complain about conflicting types unless both are marked this way.
+ * The placement of this macro is important too; it must appear after the
+ * return type, before the function name. See internal documentation for
+ * API_EXPORTED.
+ */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+#define LIBUSB_CALL WINAPI
+#else
+#define LIBUSB_CALL
+#endif
+
+/** \def LIBUSB_API_VERSION
+ * \ingroup misc
+ * libusb's API version.
+ *
+ * Since version 1.0.13, to help with feature detection, libusb defines
+ * a LIBUSB_API_VERSION macro that gets increased every time there is a
+ * significant change to the API, such as the introduction of a new call,
+ * the definition of a new macro/enum member, or any other element that
+ * libusb applications may want to detect at compilation time.
+ *
+ * The macro is typically used in an application as follows:
+ * \code
+ * #if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01001234)
+ * // Use one of the newer features from the libusb API
+ * #endif
+ * \endcode
+ *
+ * Another feature of LIBUSB_API_VERSION is that it can be used to detect
+ * whether you are compiling against the libusb or the libusb library.
+ *
+ * Internally, LIBUSB_API_VERSION is defined as follows:
+ * (libusb major << 24) | (libusb minor << 16) | (16 bit incremental)
+ */
+#define LIBUSB_API_VERSION 0x01000103
+
+/* The following is kept for compatibility, but will be deprecated in the future */
+#define LIBUSBX_API_VERSION LIBUSB_API_VERSION
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \ingroup misc
+ * Convert a 16-bit value from host-endian to little-endian format. On
+ * little endian systems, this function does nothing. On big endian systems,
+ * the bytes are swapped.
+ * \param x the host-endian value to convert
+ * \returns the value in little-endian byte order
+ */
+static inline uint16_t libusb_cpu_to_le16(const uint16_t x)
+{
+	union {
+		uint8_t  b8[2];
+		uint16_t b16;
+	} _tmp;
+	_tmp.b8[1] = (uint8_t) (x >> 8);
+	_tmp.b8[0] = (uint8_t) (x & 0xff);
+	return _tmp.b16;
+}
+
+/** \def libusb_le16_to_cpu
+ * \ingroup misc
+ * Convert a 16-bit value from little-endian to host-endian format. On
+ * little endian systems, this function does nothing. On big endian systems,
+ * the bytes are swapped.
+ * \param x the little-endian value to convert
+ * \returns the value in host-endian byte order
+ */
+#define libusb_le16_to_cpu libusb_cpu_to_le16
+
+/* standard USB stuff */
+
+/** \ingroup desc
+ * Device and/or Interface Class codes */
+enum libusb_class_code {
+	/** In the context of a \ref libusb_device_descriptor "device descriptor",
+	 * this bDeviceClass value indicates that each interface specifies its
+	 * own class information and all interfaces operate independently.
+	 */
+	LIBUSB_CLASS_PER_INTERFACE = 0,
+
+	/** Audio class */
+	LIBUSB_CLASS_AUDIO = 1,
+
+	/** Communications class */
+	LIBUSB_CLASS_COMM = 2,
+
+	/** Human Interface Device class */
+	LIBUSB_CLASS_HID = 3,
+
+	/** Physical */
+	LIBUSB_CLASS_PHYSICAL = 5,
+
+	/** Printer class */
+	LIBUSB_CLASS_PRINTER = 7,
+
+	/** Image class */
+	LIBUSB_CLASS_PTP = 6, /* legacy name from libusb-0.1 usb.h */
+	LIBUSB_CLASS_IMAGE = 6,
+
+	/** Mass storage class */
+	LIBUSB_CLASS_MASS_STORAGE = 8,
+
+	/** Hub class */
+	LIBUSB_CLASS_HUB = 9,
+
+	/** Data class */
+	LIBUSB_CLASS_DATA = 10,
+
+	/** Smart Card */
+	LIBUSB_CLASS_SMART_CARD = 0x0b,
+
+	/** Content Security */
+	LIBUSB_CLASS_CONTENT_SECURITY = 0x0d,
+
+	/** Video */
+	LIBUSB_CLASS_VIDEO = 0x0e,
+
+	/** Personal Healthcare */
+	LIBUSB_CLASS_PERSONAL_HEALTHCARE = 0x0f,
+
+	/** Diagnostic Device */
+	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+
+	/** Wireless class */
+	LIBUSB_CLASS_WIRELESS = 0xe0,
+
+	/** Application class */
+	LIBUSB_CLASS_APPLICATION = 0xfe,
+
+	/** Class is vendor-specific */
+	LIBUSB_CLASS_VENDOR_SPEC = 0xff
+};
+
+/** \ingroup desc
+ * Descriptor types as defined by the USB specification. */
+enum libusb_descriptor_type {
+	/** Device descriptor. See libusb_device_descriptor. */
+	LIBUSB_DT_DEVICE = 0x01,
+
+	/** Configuration descriptor. See libusb_config_descriptor. */
+	LIBUSB_DT_CONFIG = 0x02,
+
+	/** String descriptor */
+	LIBUSB_DT_STRING = 0x03,
+
+	/** Interface descriptor. See libusb_interface_descriptor. */
+	LIBUSB_DT_INTERFACE = 0x04,
+
+	/** Endpoint descriptor. See libusb_endpoint_descriptor. */
+	LIBUSB_DT_ENDPOINT = 0x05,
+
+	/** BOS descriptor */
+	LIBUSB_DT_BOS = 0x0f,
+
+	/** Device Capability descriptor */
+	LIBUSB_DT_DEVICE_CAPABILITY = 0x10,
+
+	/** HID descriptor */
+	LIBUSB_DT_HID = 0x21,
+
+	/** HID report descriptor */
+	LIBUSB_DT_REPORT = 0x22,
+
+	/** Physical descriptor */
+	LIBUSB_DT_PHYSICAL = 0x23,
+
+	/** Hub descriptor */
+	LIBUSB_DT_HUB = 0x29,
+
+	/** SuperSpeed Hub descriptor */
+	LIBUSB_DT_SUPERSPEED_HUB = 0x2a,
+
+	/** SuperSpeed Endpoint Companion descriptor */
+	LIBUSB_DT_SS_ENDPOINT_COMPANION = 0x30
+};
+
+/* Descriptor sizes per descriptor type */
+#define LIBUSB_DT_DEVICE_SIZE			18
+#define LIBUSB_DT_CONFIG_SIZE			9
+#define LIBUSB_DT_INTERFACE_SIZE		9
+#define LIBUSB_DT_ENDPOINT_SIZE			7
+#define LIBUSB_DT_ENDPOINT_AUDIO_SIZE		9	/* Audio extension */
+#define LIBUSB_DT_HUB_NONVAR_SIZE		7
+#define LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE	6
+#define LIBUSB_DT_BOS_SIZE			5
+#define LIBUSB_DT_DEVICE_CAPABILITY_SIZE	3
+
+/* BOS descriptor sizes */
+#define LIBUSB_BT_USB_2_0_EXTENSION_SIZE	7
+#define LIBUSB_BT_SS_USB_DEVICE_CAPABILITY_SIZE	10
+#define LIBUSB_BT_CONTAINER_ID_SIZE		20
+
+/* We unwrap the BOS => define its max size */
+#define LIBUSB_DT_BOS_MAX_SIZE		((LIBUSB_DT_BOS_SIZE)     +\
+					(LIBUSB_BT_USB_2_0_EXTENSION_SIZE)       +\
+					(LIBUSB_BT_SS_USB_DEVICE_CAPABILITY_SIZE) +\
+					(LIBUSB_BT_CONTAINER_ID_SIZE))
+
+#define LIBUSB_ENDPOINT_ADDRESS_MASK	0x0f    /* in bEndpointAddress */
+#define LIBUSB_ENDPOINT_DIR_MASK		0x80
+
+/** \ingroup desc
+ * Endpoint direction. Values for bit 7 of the
+ * \ref libusb_endpoint_descriptor::bEndpointAddress "endpoint address" scheme.
+ */
+enum libusb_endpoint_direction {
+	/** In: device-to-host */
+	LIBUSB_ENDPOINT_IN = 0x80,
+
+	/** Out: host-to-device */
+	LIBUSB_ENDPOINT_OUT = 0x00
+};
+
+#define LIBUSB_TRANSFER_TYPE_MASK			0x03    /* in bmAttributes */
+
+/** \ingroup desc
+ * Endpoint transfer type. Values for bits 0:1 of the
+ * \ref libusb_endpoint_descriptor::bmAttributes "endpoint attributes" field.
+ */
+enum libusb_transfer_type {
+	/** Control endpoint */
+	LIBUSB_TRANSFER_TYPE_CONTROL = 0,
+
+	/** Isochronous endpoint */
+	LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1,
+
+	/** Bulk endpoint */
+	LIBUSB_TRANSFER_TYPE_BULK = 2,
+
+	/** Interrupt endpoint */
+	LIBUSB_TRANSFER_TYPE_INTERRUPT = 3,
+
+	/** Stream endpoint */
+	LIBUSB_TRANSFER_TYPE_BULK_STREAM = 4,
+};
+
+/** \ingroup misc
+ * Standard requests, as defined in table 9-5 of the USB 3.0 specifications */
+enum libusb_standard_request {
+	/** Request status of the specific recipient */
+	LIBUSB_REQUEST_GET_STATUS = 0x00,
+
+	/** Clear or disable a specific feature */
+	LIBUSB_REQUEST_CLEAR_FEATURE = 0x01,
+
+	/* 0x02 is reserved */
+
+	/** Set or enable a specific feature */
+	LIBUSB_REQUEST_SET_FEATURE = 0x03,
+
+	/* 0x04 is reserved */
+
+	/** Set device address for all future accesses */
+	LIBUSB_REQUEST_SET_ADDRESS = 0x05,
+
+	/** Get the specified descriptor */
+	LIBUSB_REQUEST_GET_DESCRIPTOR = 0x06,
+
+	/** Used to update existing descriptors or add new descriptors */
+	LIBUSB_REQUEST_SET_DESCRIPTOR = 0x07,
+
+	/** Get the current device configuration value */
+	LIBUSB_REQUEST_GET_CONFIGURATION = 0x08,
+
+	/** Set device configuration */
+	LIBUSB_REQUEST_SET_CONFIGURATION = 0x09,
+
+	/** Return the selected alternate setting for the specified interface */
+	LIBUSB_REQUEST_GET_INTERFACE = 0x0A,
+
+	/** Select an alternate interface for the specified interface */
+	LIBUSB_REQUEST_SET_INTERFACE = 0x0B,
+
+	/** Set then report an endpoint's synchronization frame */
+	LIBUSB_REQUEST_SYNCH_FRAME = 0x0C,
+
+	/** Sets both the U1 and U2 Exit Latency */
+	LIBUSB_REQUEST_SET_SEL = 0x30,
+
+	/** Delay from the time a host transmits a packet to the time it is
+	  * received by the device. */
+	LIBUSB_SET_ISOCH_DELAY = 0x31,
+};
+
+/** \ingroup misc
+ * Request type bits of the
+ * \ref libusb_control_setup::bmRequestType "bmRequestType" field in control
+ * transfers. */
+enum libusb_request_type {
+	/** Standard */
+	LIBUSB_REQUEST_TYPE_STANDARD = (0x00 << 5),
+
+	/** Class */
+	LIBUSB_REQUEST_TYPE_CLASS = (0x01 << 5),
+
+	/** Vendor */
+	LIBUSB_REQUEST_TYPE_VENDOR = (0x02 << 5),
+
+	/** Reserved */
+	LIBUSB_REQUEST_TYPE_RESERVED = (0x03 << 5)
+};
+
+/** \ingroup misc
+ * Recipient bits of the
+ * \ref libusb_control_setup::bmRequestType "bmRequestType" field in control
+ * transfers. Values 4 through 31 are reserved. */
+enum libusb_request_recipient {
+	/** Device */
+	LIBUSB_RECIPIENT_DEVICE = 0x00,
+
+	/** Interface */
+	LIBUSB_RECIPIENT_INTERFACE = 0x01,
+
+	/** Endpoint */
+	LIBUSB_RECIPIENT_ENDPOINT = 0x02,
+
+	/** Other */
+	LIBUSB_RECIPIENT_OTHER = 0x03,
+};
+
+#define LIBUSB_ISO_SYNC_TYPE_MASK		0x0C
+
+/** \ingroup desc
+ * Synchronization type for isochronous endpoints. Values for bits 2:3 of the
+ * \ref libusb_endpoint_descriptor::bmAttributes "bmAttributes" field in
+ * libusb_endpoint_descriptor.
+ */
+enum libusb_iso_sync_type {
+	/** No synchronization */
+	LIBUSB_ISO_SYNC_TYPE_NONE = 0,
+
+	/** Asynchronous */
+	LIBUSB_ISO_SYNC_TYPE_ASYNC = 1,
+
+	/** Adaptive */
+	LIBUSB_ISO_SYNC_TYPE_ADAPTIVE = 2,
+
+	/** Synchronous */
+	LIBUSB_ISO_SYNC_TYPE_SYNC = 3
+};
+
+#define LIBUSB_ISO_USAGE_TYPE_MASK 0x30
+
+/** \ingroup desc
+ * Usage type for isochronous endpoints. Values for bits 4:5 of the
+ * \ref libusb_endpoint_descriptor::bmAttributes "bmAttributes" field in
+ * libusb_endpoint_descriptor.
+ */
+enum libusb_iso_usage_type {
+	/** Data endpoint */
+	LIBUSB_ISO_USAGE_TYPE_DATA = 0,
+
+	/** Feedback endpoint */
+	LIBUSB_ISO_USAGE_TYPE_FEEDBACK = 1,
+
+	/** Implicit feedback Data endpoint */
+	LIBUSB_ISO_USAGE_TYPE_IMPLICIT = 2,
+};
+
+/** \ingroup desc
+ * A structure representing the standard USB device descriptor. This
+ * descriptor is documented in section 9.6.1 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_device_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE LIBUSB_DT_DEVICE in this
+	 * context. */
+	uint8_t  bDescriptorType;
+
+	/** USB specification release number in binary-coded decimal. A value of
+	 * 0x0200 indicates USB 2.0, 0x0110 indicates USB 1.1, etc. */
+	uint16_t bcdUSB;
+
+	/** USB-IF class code for the device. See \ref libusb_class_code. */
+	uint8_t  bDeviceClass;
+
+	/** USB-IF subclass code for the device, qualified by the bDeviceClass
+	 * value */
+	uint8_t  bDeviceSubClass;
+
+	/** USB-IF protocol code for the device, qualified by the bDeviceClass and
+	 * bDeviceSubClass values */
+	uint8_t  bDeviceProtocol;
+
+	/** Maximum packet size for endpoint 0 */
+	uint8_t  bMaxPacketSize0;
+
+	/** USB-IF vendor ID */
+	uint16_t idVendor;
+
+	/** USB-IF product ID */
+	uint16_t idProduct;
+
+	/** Device release number in binary-coded decimal */
+	uint16_t bcdDevice;
+
+	/** Index of string descriptor describing manufacturer */
+	uint8_t  iManufacturer;
+
+	/** Index of string descriptor describing product */
+	uint8_t  iProduct;
+
+	/** Index of string descriptor containing device serial number */
+	uint8_t  iSerialNumber;
+
+	/** Number of possible configurations */
+	uint8_t  bNumConfigurations;
+};
+
+/** \ingroup desc
+ * A structure representing the standard USB endpoint descriptor. This
+ * descriptor is documented in section 9.6.6 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_endpoint_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_ENDPOINT LIBUSB_DT_ENDPOINT in
+	 * this context. */
+	uint8_t  bDescriptorType;
+
+	/** The address of the endpoint described by this descriptor. Bits 0:3 are
+	 * the endpoint number. Bits 4:6 are reserved. Bit 7 indicates direction,
+	 * see \ref libusb_endpoint_direction.
+	 */
+	uint8_t  bEndpointAddress;
+
+	/** Attributes which apply to the endpoint when it is configured using
+	 * the bConfigurationValue. Bits 0:1 determine the transfer type and
+	 * correspond to \ref libusb_transfer_type. Bits 2:3 are only used for
+	 * isochronous endpoints and correspond to \ref libusb_iso_sync_type.
+	 * Bits 4:5 are also only used for isochronous endpoints and correspond to
+	 * \ref libusb_iso_usage_type. Bits 6:7 are reserved.
+	 */
+	uint8_t  bmAttributes;
+
+	/** Maximum packet size this endpoint is capable of sending/receiving. */
+	uint16_t wMaxPacketSize;
+
+	/** Interval for polling endpoint for data transfers. */
+	uint8_t  bInterval;
+
+	/** For audio devices only: the rate at which synchronization feedback
+	 * is provided. */
+	uint8_t  bRefresh;
+
+	/** For audio devices only: the address if the synch endpoint */
+	uint8_t  bSynchAddress;
+
+	/** Extra descriptors. If libusb encounters unknown endpoint descriptors,
+	 * it will store them here, should you wish to parse them. */
+	const unsigned char *extra;
+
+	/** Length of the extra descriptors, in bytes. */
+	int extra_length;
+};
+
+/** \ingroup desc
+ * A structure representing the standard USB interface descriptor. This
+ * descriptor is documented in section 9.6.5 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_interface_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_INTERFACE LIBUSB_DT_INTERFACE
+	 * in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Number of this interface */
+	uint8_t  bInterfaceNumber;
+
+	/** Value used to select this alternate setting for this interface */
+	uint8_t  bAlternateSetting;
+
+	/** Number of endpoints used by this interface (excluding the control
+	 * endpoint). */
+	uint8_t  bNumEndpoints;
+
+	/** USB-IF class code for this interface. See \ref libusb_class_code. */
+	uint8_t  bInterfaceClass;
+
+	/** USB-IF subclass code for this interface, qualified by the
+	 * bInterfaceClass value */
+	uint8_t  bInterfaceSubClass;
+
+	/** USB-IF protocol code for this interface, qualified by the
+	 * bInterfaceClass and bInterfaceSubClass values */
+	uint8_t  bInterfaceProtocol;
+
+	/** Index of string descriptor describing this interface */
+	uint8_t  iInterface;
+
+	/** Array of endpoint descriptors. This length of this array is determined
+	 * by the bNumEndpoints field. */
+	const struct libusb_endpoint_descriptor *endpoint;
+
+	/** Extra descriptors. If libusb encounters unknown interface descriptors,
+	 * it will store them here, should you wish to parse them. */
+	const unsigned char *extra;
+
+	/** Length of the extra descriptors, in bytes. */
+	int extra_length;
+};
+
+/** \ingroup desc
+ * A collection of alternate settings for a particular USB interface.
+ */
+struct libusb_interface {
+	/** Array of interface descriptors. The length of this array is determined
+	 * by the num_altsetting field. */
+	const struct libusb_interface_descriptor *altsetting;
+
+	/** The number of alternate settings that belong to this interface */
+	int num_altsetting;
+};
+
+/** \ingroup desc
+ * A structure representing the standard USB configuration descriptor. This
+ * descriptor is documented in section 9.6.3 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_config_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_CONFIG LIBUSB_DT_CONFIG
+	 * in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Total length of data returned for this configuration */
+	uint16_t wTotalLength;
+
+	/** Number of interfaces supported by this configuration */
+	uint8_t  bNumInterfaces;
+
+	/** Identifier value for this configuration */
+	uint8_t  bConfigurationValue;
+
+	/** Index of string descriptor describing this configuration */
+	uint8_t  iConfiguration;
+
+	/** Configuration characteristics */
+	uint8_t  bmAttributes;
+
+	/** Maximum power consumption of the USB device from this bus in this
+	 * configuration when the device is fully opreation. Expressed in units
+	 * of 2 mA. */
+	uint8_t  MaxPower;
+
+	/** Array of interfaces supported by this configuration. The length of
+	 * this array is determined by the bNumInterfaces field. */
+	const struct libusb_interface *interface;
+
+	/** Extra descriptors. If libusb encounters unknown configuration
+	 * descriptors, it will store them here, should you wish to parse them. */
+	const unsigned char *extra;
+
+	/** Length of the extra descriptors, in bytes. */
+	int extra_length;
+};
+
+/** \ingroup desc
+ * A structure representing the superspeed endpoint companion
+ * descriptor. This descriptor is documented in section 9.6.7 of
+ * the USB 3.0 specification. All multiple-byte fields are represented in
+ * host-endian format.
+ */
+struct libusb_ss_endpoint_companion_descriptor {
+
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_SS_ENDPOINT_COMPANION in
+	 * this context. */
+	uint8_t  bDescriptorType;
+
+
+	/** The maximum number of packets the endpoint can send or
+	 *  recieve as part of a burst. */
+	uint8_t  bMaxBurst;
+
+	/** In bulk EP:	bits 4:0 represents the	maximum	number of
+	 *  streams the	EP supports. In	isochronous EP:	bits 1:0
+	 *  represents the Mult	- a zero based value that determines
+	 *  the	maximum	number of packets within a service interval  */
+	uint8_t  bmAttributes;
+
+	/** The	total number of bytes this EP will transfer every
+	 *  service interval. valid only for periodic EPs. */
+	uint16_t wBytesPerInterval;
+};
+
+/** \ingroup desc
+ * A generic representation of a BOS Device Capability descriptor. It is
+ * advised to check bDevCapabilityType and call the matching
+ * libusb_get_*_descriptor function to get a structure fully matching the type.
+ */
+struct libusb_bos_dev_capability_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t bLength;
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE_CAPABILITY
+	 * LIBUSB_DT_DEVICE_CAPABILITY in this context. */
+	uint8_t bDescriptorType;
+	/** Device Capability type */
+	uint8_t bDevCapabilityType;
+	/** Device Capability data (bLength - 3 bytes) */
+	uint8_t dev_capability_data
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+/** \ingroup desc
+ * A structure representing the Binary Device Object Store (BOS) descriptor.
+ * This descriptor is documented in section 9.6.2 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_bos_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_BOS LIBUSB_DT_BOS
+	 * in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Length of this descriptor and all of its sub descriptors */
+	uint16_t wTotalLength;
+
+	/** The number of separate device capability descriptors in
+	 * the BOS */
+	uint8_t  bNumDeviceCaps;
+
+	/** bNumDeviceCap Device Capability Descriptors */
+	struct libusb_bos_dev_capability_descriptor *dev_capability
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+/** \ingroup desc
+ * A structure representing the USB 2.0 Extension descriptor
+ * This descriptor is documented in section 9.6.2.1 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_usb_2_0_extension_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE_CAPABILITY
+	 * LIBUSB_DT_DEVICE_CAPABILITY in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Capability type. Will have value
+	 * \ref libusb_capability_type::LIBUSB_BT_USB_2_0_EXTENSION
+	 * LIBUSB_BT_USB_2_0_EXTENSION in this context. */
+	uint8_t  bDevCapabilityType;
+
+	/** Bitmap encoding of supported device level features.
+	 * A value of one in a bit location indicates a feature is
+	 * supported; a value of zero indicates it is not supported.
+	 * See \ref libusb_usb_2_0_extension_attributes. */
+	uint32_t  bmAttributes;
+};
+
+/** \ingroup desc
+ * A structure representing the SuperSpeed USB Device Capability descriptor
+ * This descriptor is documented in section 9.6.2.2 of the USB 3.0 specification.
+ * All multiple-byte fields are represented in host-endian format.
+ */
+struct libusb_ss_usb_device_capability_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE_CAPABILITY
+	 * LIBUSB_DT_DEVICE_CAPABILITY in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Capability type. Will have value
+	 * \ref libusb_capability_type::LIBUSB_BT_SS_USB_DEVICE_CAPABILITY
+	 * LIBUSB_BT_SS_USB_DEVICE_CAPABILITY in this context. */
+	uint8_t  bDevCapabilityType;
+
+	/** Bitmap encoding of supported device level features.
+	 * A value of one in a bit location indicates a feature is
+	 * supported; a value of zero indicates it is not supported.
+	 * See \ref libusb_ss_usb_device_capability_attributes. */
+	uint8_t  bmAttributes;
+
+	/** Bitmap encoding of the speed supported by this device when
+	 * operating in SuperSpeed mode. See \ref libusb_supported_speed. */
+	uint16_t wSpeedSupported;
+
+	/** The lowest speed at which all the functionality supported
+	 * by the device is available to the user. For example if the
+	 * device supports all its functionality when connected at
+	 * full speed and above then it sets this value to 1. */
+	uint8_t  bFunctionalitySupport;
+
+	/** U1 Device Exit Latency. */
+	uint8_t  bU1DevExitLat;
+
+	/** U2 Device Exit Latency. */
+	uint16_t bU2DevExitLat;
+};
+
+/** \ingroup desc
+ * A structure representing the Container ID descriptor.
+ * This descriptor is documented in section 9.6.2.3 of the USB 3.0 specification.
+ * All multiple-byte fields, except UUIDs, are represented in host-endian format.
+ */
+struct libusb_container_id_descriptor {
+	/** Size of this descriptor (in bytes) */
+	uint8_t  bLength;
+
+	/** Descriptor type. Will have value
+	 * \ref libusb_descriptor_type::LIBUSB_DT_DEVICE_CAPABILITY
+	 * LIBUSB_DT_DEVICE_CAPABILITY in this context. */
+	uint8_t  bDescriptorType;
+
+	/** Capability type. Will have value
+	 * \ref libusb_capability_type::LIBUSB_BT_CONTAINER_ID
+	 * LIBUSB_BT_CONTAINER_ID in this context. */
+	uint8_t  bDevCapabilityType;
+
+	/** Reserved field */
+	uint8_t bReserved;
+
+	/** 128 bit UUID */
+	uint8_t  ContainerID[16];
+};
+
+/** \ingroup asyncio
+ * Setup packet for control transfers. */
+struct libusb_control_setup {
+	/** Request type. Bits 0:4 determine recipient, see
+	 * \ref libusb_request_recipient. Bits 5:6 determine type, see
+	 * \ref libusb_request_type. Bit 7 determines data transfer direction, see
+	 * \ref libusb_endpoint_direction.
+	 */
+	uint8_t  bmRequestType;
+
+	/** Request. If the type bits of bmRequestType are equal to
+	 * \ref libusb_request_type::LIBUSB_REQUEST_TYPE_STANDARD
+	 * "LIBUSB_REQUEST_TYPE_STANDARD" then this field refers to
+	 * \ref libusb_standard_request. For other cases, use of this field is
+	 * application-specific. */
+	uint8_t  bRequest;
+
+	/** Value. Varies according to request */
+	uint16_t wValue;
+
+	/** Index. Varies according to request, typically used to pass an index
+	 * or offset */
+	uint16_t wIndex;
+
+	/** Number of bytes to transfer */
+	uint16_t wLength;
+};
+
+#define LIBUSB_CONTROL_SETUP_SIZE (sizeof(struct libusb_control_setup))
+
+/* libusb */
+
+struct libusb_context;
+struct libusb_device;
+struct libusb_device_handle;
+struct libusb_hotplug_callback;
+
+/** \ingroup lib
+ * Structure providing the version of the libusb runtime
+ */
+struct libusb_version {
+	/** Library major version. */
+	const uint16_t major;
+
+	/** Library minor version. */
+	const uint16_t minor;
+
+	/** Library micro version. */
+	const uint16_t micro;
+
+	/** Library nano version. */
+	const uint16_t nano;
+
+	/** Library release candidate suffix string, e.g. "-rc4". */
+	const char *rc;
+
+	/** For ABI compatibility only. */
+	const char* describe;
+};
+
+/** \ingroup lib
+ * Structure representing a libusb session. The concept of individual libusb
+ * sessions allows for your program to use two libraries (or dynamically
+ * load two modules) which both independently use libusb. This will prevent
+ * interference between the individual libusb users - for example
+ * libusb_set_debug() will not affect the other user of the library, and
+ * libusb_exit() will not destroy resources that the other user is still
+ * using.
+ *
+ * Sessions are created by libusb_init() and destroyed through libusb_exit().
+ * If your application is guaranteed to only ever include a single libusb
+ * user (i.e. you), you do not have to worry about contexts: pass NULL in
+ * every function call where a context is required. The default context
+ * will be used.
+ *
+ * For more information, see \ref contexts.
+ */
+typedef struct libusb_context libusb_context;
+
+/** \ingroup dev
+ * Structure representing a USB device detected on the system. This is an
+ * opaque type for which you are only ever provided with a pointer, usually
+ * originating from libusb_get_device_list().
+ *
+ * Certain operations can be performed on a device, but in order to do any
+ * I/O you will have to first obtain a device handle using libusb_open().
+ *
+ * Devices are reference counted with libusb_ref_device() and
+ * libusb_unref_device(), and are freed when the reference count reaches 0.
+ * New devices presented by libusb_get_device_list() have a reference count of
+ * 1, and libusb_free_device_list() can optionally decrease the reference count
+ * on all devices in the list. libusb_open() adds another reference which is
+ * later destroyed by libusb_close().
+ */
+typedef struct libusb_device libusb_device;
+
+
+/** \ingroup dev
+ * Structure representing a handle on a USB device. This is an opaque type for
+ * which you are only ever provided with a pointer, usually originating from
+ * libusb_open().
+ *
+ * A device handle is used to perform I/O and other operations. When finished
+ * with a device handle, you should call libusb_close().
+ */
+typedef struct libusb_device_handle libusb_device_handle;
+
+/** \ingroup dev
+ * Speed codes. Indicates the speed at which the device is operating.
+ */
+enum libusb_speed {
+	/** The OS doesn't report or know the device speed. */
+	LIBUSB_SPEED_UNKNOWN = 0,
+
+	/** The device is operating at low speed (1.5MBit/s). */
+	LIBUSB_SPEED_LOW = 1,
+
+	/** The device is operating at full speed (12MBit/s). */
+	LIBUSB_SPEED_FULL = 2,
+
+	/** The device is operating at high speed (480MBit/s). */
+	LIBUSB_SPEED_HIGH = 3,
+
+	/** The device is operating at super speed (5000MBit/s). */
+	LIBUSB_SPEED_SUPER = 4,
+};
+
+/** \ingroup dev
+ * Supported speeds (wSpeedSupported) bitfield. Indicates what
+ * speeds the device supports.
+ */
+enum libusb_supported_speed {
+	/** Low speed operation supported (1.5MBit/s). */
+	LIBUSB_LOW_SPEED_OPERATION   = 1,
+
+	/** Full speed operation supported (12MBit/s). */
+	LIBUSB_FULL_SPEED_OPERATION  = 2,
+
+	/** High speed operation supported (480MBit/s). */
+	LIBUSB_HIGH_SPEED_OPERATION  = 4,
+
+	/** Superspeed operation supported (5000MBit/s). */
+	LIBUSB_SUPER_SPEED_OPERATION = 8,
+};
+
+/** \ingroup dev
+ * Masks for the bits of the
+ * \ref libusb_usb_2_0_extension_descriptor::bmAttributes "bmAttributes" field
+ * of the USB 2.0 Extension descriptor.
+ */
+enum libusb_usb_2_0_extension_attributes {
+	/** Supports Link Power Management (LPM) */
+	LIBUSB_BM_LPM_SUPPORT = 2,
+};
+
+/** \ingroup dev
+ * Masks for the bits of the
+ * \ref libusb_ss_usb_device_capability_descriptor::bmAttributes "bmAttributes" field
+ * field of the SuperSpeed USB Device Capability descriptor.
+ */
+enum libusb_ss_usb_device_capability_attributes {
+	/** Supports Latency Tolerance Messages (LTM) */
+	LIBUSB_BM_LTM_SUPPORT = 2,
+};
+
+/** \ingroup dev
+ * USB capability types
+ */
+enum libusb_bos_type {
+	/** Wireless USB device capability */
+	LIBUSB_BT_WIRELESS_USB_DEVICE_CAPABILITY	= 1,
+
+	/** USB 2.0 extensions */
+	LIBUSB_BT_USB_2_0_EXTENSION			= 2,
+
+	/** SuperSpeed USB device capability */
+	LIBUSB_BT_SS_USB_DEVICE_CAPABILITY		= 3,
+
+	/** Container ID type */
+	LIBUSB_BT_CONTAINER_ID				= 4,
+};
+
+/** \ingroup misc
+ * Error codes. Most libusb functions return 0 on success or one of these
+ * codes on failure.
+ * You can call libusb_error_name() to retrieve a string representation of an
+ * error code or libusb_strerror() to get an end-user suitable description of
+ * an error code.
+ */
+enum libusb_error {
+	/** Success (no error) */
+	LIBUSB_SUCCESS = 0,
+
+	/** Input/output error */
+	LIBUSB_ERROR_IO = -1,
+
+	/** Invalid parameter */
+	LIBUSB_ERROR_INVALID_PARAM = -2,
+
+	/** Access denied (insufficient permissions) */
+	LIBUSB_ERROR_ACCESS = -3,
+
+	/** No such device (it may have been disconnected) */
+	LIBUSB_ERROR_NO_DEVICE = -4,
+
+	/** Entity not found */
+	LIBUSB_ERROR_NOT_FOUND = -5,
+
+	/** Resource busy */
+	LIBUSB_ERROR_BUSY = -6,
+
+	/** Operation timed out */
+	LIBUSB_ERROR_TIMEOUT = -7,
+
+	/** Overflow */
+	LIBUSB_ERROR_OVERFLOW = -8,
+
+	/** Pipe error */
+	LIBUSB_ERROR_PIPE = -9,
+
+	/** System call interrupted (perhaps due to signal) */
+	LIBUSB_ERROR_INTERRUPTED = -10,
+
+	/** Insufficient memory */
+	LIBUSB_ERROR_NO_MEM = -11,
+
+	/** Operation not supported or unimplemented on this platform */
+	LIBUSB_ERROR_NOT_SUPPORTED = -12,
+
+	/* NB: Remember to update LIBUSB_ERROR_COUNT below as well as the
+	   message strings in strerror.c when adding new error codes here. */
+
+	/** Other error */
+	LIBUSB_ERROR_OTHER = -99,
+};
+
+/* Total number of error codes in enum libusb_error */
+#define LIBUSB_ERROR_COUNT 14
+
+/** \ingroup asyncio
+ * Transfer status codes */
+enum libusb_transfer_status {
+	/** Transfer completed without error. Note that this does not indicate
+	 * that the entire amount of requested data was transferred. */
+	LIBUSB_TRANSFER_COMPLETED,
+
+	/** Transfer failed */
+	LIBUSB_TRANSFER_ERROR,
+
+	/** Transfer timed out */
+	LIBUSB_TRANSFER_TIMED_OUT,
+
+	/** Transfer was cancelled */
+	LIBUSB_TRANSFER_CANCELLED,
+
+	/** For bulk/interrupt endpoints: halt condition detected (endpoint
+	 * stalled). For control endpoints: control request not supported. */
+	LIBUSB_TRANSFER_STALL,
+
+	/** Device was disconnected */
+	LIBUSB_TRANSFER_NO_DEVICE,
+
+	/** Device sent more data than requested */
+	LIBUSB_TRANSFER_OVERFLOW,
+
+	/* NB! Remember to update libusb_error_name()
+	   when adding new status codes here. */
+};
+
+/** \ingroup asyncio
+ * libusb_transfer.flags values */
+enum libusb_transfer_flags {
+	/** Report short frames as errors */
+	LIBUSB_TRANSFER_SHORT_NOT_OK = 1<<0,
+
+	/** Automatically free() transfer buffer during libusb_free_transfer() */
+	LIBUSB_TRANSFER_FREE_BUFFER = 1<<1,
+
+	/** Automatically call libusb_free_transfer() after callback returns.
+	 * If this flag is set, it is illegal to call libusb_free_transfer()
+	 * from your transfer callback, as this will result in a double-free
+	 * when this flag is acted upon. */
+	LIBUSB_TRANSFER_FREE_TRANSFER = 1<<2,
+
+	/** Terminate transfers that are a multiple of the endpoint's
+	 * wMaxPacketSize with an extra zero length packet. This is useful
+	 * when a device protocol mandates that each logical request is
+	 * terminated by an incomplete packet (i.e. the logical requests are
+	 * not separated by other means).
+	 *
+	 * This flag only affects host-to-device transfers to bulk and interrupt
+	 * endpoints. In other situations, it is ignored.
+	 *
+	 * This flag only affects transfers with a length that is a multiple of
+	 * the endpoint's wMaxPacketSize. On transfers of other lengths, this
+	 * flag has no effect. Therefore, if you are working with a device that
+	 * needs a ZLP whenever the end of the logical request falls on a packet
+	 * boundary, then it is sensible to set this flag on <em>every</em>
+	 * transfer (you do not have to worry about only setting it on transfers
+	 * that end on the boundary).
+	 *
+	 * This flag is currently only supported on Linux.
+	 * On other systems, libusb_submit_transfer() will return
+	 * LIBUSB_ERROR_NOT_SUPPORTED for every transfer where this flag is set.
+	 *
+	 * Available since libusb-1.0.9.
+	 */
+	LIBUSB_TRANSFER_ADD_ZERO_PACKET = 1 << 3,
+};
+
+/** \ingroup asyncio
+ * Isochronous packet descriptor. */
+struct libusb_iso_packet_descriptor {
+	/** Length of data to request in this packet */
+	unsigned int length;
+
+	/** Amount of data that was actually transferred */
+	unsigned int actual_length;
+
+	/** Status code for this packet */
+	enum libusb_transfer_status status;
+};
+
+struct libusb_transfer;
+
+/** \ingroup asyncio
+ * Asynchronous transfer callback function type. When submitting asynchronous
+ * transfers, you pass a pointer to a callback function of this type via the
+ * \ref libusb_transfer::callback "callback" member of the libusb_transfer
+ * structure. libusb will call this function later, when the transfer has
+ * completed or failed. See \ref asyncio for more information.
+ * \param transfer The libusb_transfer struct the callback function is being
+ * notified about.
+ */
+typedef void (LIBUSB_CALL *libusb_transfer_cb_fn)(struct libusb_transfer *transfer);
+
+/** \ingroup asyncio
+ * The generic USB transfer structure. The user populates this structure and
+ * then submits it in order to request a transfer. After the transfer has
+ * completed, the library populates the transfer with the results and passes
+ * it back to the user.
+ */
+struct libusb_transfer {
+	/** Handle of the device that this transfer will be submitted to */
+	libusb_device_handle *dev_handle;
+
+	/** A bitwise OR combination of \ref libusb_transfer_flags. */
+	uint8_t flags;
+
+	/** Address of the endpoint where this transfer will be sent. */
+	unsigned char endpoint;
+
+	/** Type of the endpoint from \ref libusb_transfer_type */
+	unsigned char type;
+
+	/** Timeout for this transfer in millseconds. A value of 0 indicates no
+	 * timeout. */
+	unsigned int timeout;
+
+	/** The status of the transfer. Read-only, and only for use within
+	 * transfer callback function.
+	 *
+	 * If this is an isochronous transfer, this field may read COMPLETED even
+	 * if there were errors in the frames. Use the
+	 * \ref libusb_iso_packet_descriptor::status "status" field in each packet
+	 * to determine if errors occurred. */
+	enum libusb_transfer_status status;
+
+	/** Length of the data buffer */
+	int length;
+
+	/** Actual length of data that was transferred. Read-only, and only for
+	 * use within transfer callback function. Not valid for isochronous
+	 * endpoint transfers. */
+	int actual_length;
+
+	/** Callback function. This will be invoked when the transfer completes,
+	 * fails, or is cancelled. */
+	libusb_transfer_cb_fn callback;
+
+	/** User context data to pass to the callback function. */
+	void *user_data;
+
+	/** Data buffer */
+	unsigned char *buffer;
+
+	/** Number of isochronous packets. Only used for I/O with isochronous
+	 * endpoints. */
+	int num_iso_packets;
+
+	/** Isochronous packet descriptors, for isochronous transfers only. */
+	struct libusb_iso_packet_descriptor iso_packet_desc
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+/** \ingroup misc
+ * Capabilities supported by an instance of libusb on the current running
+ * platform. Test if the loaded library supports a given capability by calling
+ * \ref libusb_has_capability().
+ */
+enum libusb_capability {
+	/** The libusb_has_capability() API is available. */
+	LIBUSB_CAP_HAS_CAPABILITY = 0x0000,
+	/** Hotplug support is available on this platform. */
+	LIBUSB_CAP_HAS_HOTPLUG = 0x0001,
+	/** The library can access HID devices without requiring user intervention.
+	 * Note that before being able to actually access an HID device, you may
+	 * still have to call additional libusb functions such as
+	 * \ref libusb_detach_kernel_driver(). */
+	LIBUSB_CAP_HAS_HID_ACCESS = 0x0100,
+	/** The library supports detaching of the default USB driver, using 
+	 * \ref libusb_detach_kernel_driver(), if one is set by the OS kernel */
+	LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER = 0x0101
+};
+
+/** \ingroup lib
+ *  Log message levels.
+ *  - LIBUSB_LOG_LEVEL_NONE (0)    : no messages ever printed by the library (default)
+ *  - LIBUSB_LOG_LEVEL_ERROR (1)   : error messages are printed to stderr
+ *  - LIBUSB_LOG_LEVEL_WARNING (2) : warning and error messages are printed to stderr
+ *  - LIBUSB_LOG_LEVEL_INFO (3)    : informational messages are printed to stdout, warning
+ *    and error messages are printed to stderr
+ *  - LIBUSB_LOG_LEVEL_DEBUG (4)   : debug and informational messages are printed to stdout,
+ *    warnings and errors to stderr
+ */
+enum libusb_log_level {
+	LIBUSB_LOG_LEVEL_NONE = 0,
+	LIBUSB_LOG_LEVEL_ERROR,
+	LIBUSB_LOG_LEVEL_WARNING,
+	LIBUSB_LOG_LEVEL_INFO,
+	LIBUSB_LOG_LEVEL_DEBUG,
+};
+
+int LIBUSB_CALL libusb_init(libusb_context **ctx);
+void LIBUSB_CALL libusb_exit(libusb_context *ctx);
+void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
+const struct libusb_version * LIBUSB_CALL libusb_get_version(void);
+int LIBUSB_CALL libusb_has_capability(uint32_t capability);
+const char * LIBUSB_CALL libusb_error_name(int errcode);
+int LIBUSB_CALL libusb_setlocale(const char *locale);
+const char * LIBUSB_CALL libusb_strerror(enum libusb_error errcode);
+
+ssize_t LIBUSB_CALL libusb_get_device_list(libusb_context *ctx,
+	libusb_device ***list);
+void LIBUSB_CALL libusb_free_device_list(libusb_device **list,
+	int unref_devices);
+libusb_device * LIBUSB_CALL libusb_ref_device(libusb_device *dev);
+void LIBUSB_CALL libusb_unref_device(libusb_device *dev);
+
+int LIBUSB_CALL libusb_get_configuration(libusb_device_handle *dev,
+	int *config);
+int LIBUSB_CALL libusb_get_device_descriptor(libusb_device *dev,
+	struct libusb_device_descriptor *desc);
+int LIBUSB_CALL libusb_get_active_config_descriptor(libusb_device *dev,
+	struct libusb_config_descriptor **config);
+int LIBUSB_CALL libusb_get_config_descriptor(libusb_device *dev,
+	uint8_t config_index, struct libusb_config_descriptor **config);
+int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev,
+	uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
+void LIBUSB_CALL libusb_free_config_descriptor(
+	struct libusb_config_descriptor *config);
+int LIBUSB_CALL libusb_get_ss_endpoint_companion_descriptor(
+	struct libusb_context *ctx,
+	const struct libusb_endpoint_descriptor *endpoint,
+	struct libusb_ss_endpoint_companion_descriptor **ep_comp);
+void LIBUSB_CALL libusb_free_ss_endpoint_companion_descriptor(
+	struct libusb_ss_endpoint_companion_descriptor *ep_comp);
+int LIBUSB_CALL libusb_get_bos_descriptor(libusb_device_handle *handle,
+	struct libusb_bos_descriptor **bos);
+void LIBUSB_CALL libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos);
+int LIBUSB_CALL libusb_get_usb_2_0_extension_descriptor(
+	struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_usb_2_0_extension_descriptor **usb_2_0_extension);
+void LIBUSB_CALL libusb_free_usb_2_0_extension_descriptor(
+	struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension);
+int LIBUSB_CALL libusb_get_ss_usb_device_capability_descriptor(
+	struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_ss_usb_device_capability_descriptor **ss_usb_device_cap);
+void LIBUSB_CALL libusb_free_ss_usb_device_capability_descriptor(
+	struct libusb_ss_usb_device_capability_descriptor *ss_usb_device_cap);
+int LIBUSB_CALL libusb_get_container_id_descriptor(struct libusb_context *ctx,
+	struct libusb_bos_dev_capability_descriptor *dev_cap,
+	struct libusb_container_id_descriptor **container_id);
+void LIBUSB_CALL libusb_free_container_id_descriptor(
+	struct libusb_container_id_descriptor *container_id);
+uint8_t LIBUSB_CALL libusb_get_bus_number(libusb_device *dev);
+uint8_t LIBUSB_CALL libusb_get_port_number(libusb_device *dev);
+int LIBUSB_CALL libusb_get_port_numbers(libusb_device *dev, uint8_t* port_numbers, int port_numbers_len);
+LIBUSB_DEPRECATED_FOR(libusb_get_port_numbers)
+int LIBUSB_CALL libusb_get_port_path(libusb_context *ctx, libusb_device *dev, uint8_t* path, uint8_t path_length);
+libusb_device * LIBUSB_CALL libusb_get_parent(libusb_device *dev);
+uint8_t LIBUSB_CALL libusb_get_device_address(libusb_device *dev);
+int LIBUSB_CALL libusb_get_device_speed(libusb_device *dev);
+int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev,
+	unsigned char endpoint);
+int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev,
+	unsigned char endpoint);
+
+int LIBUSB_CALL libusb_open(libusb_device *dev, libusb_device_handle **handle);
+void LIBUSB_CALL libusb_close(libusb_device_handle *dev_handle);
+libusb_device * LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle);
+
+int LIBUSB_CALL libusb_set_configuration(libusb_device_handle *dev,
+	int configuration);
+int LIBUSB_CALL libusb_claim_interface(libusb_device_handle *dev,
+	int interface_number);
+int LIBUSB_CALL libusb_release_interface(libusb_device_handle *dev,
+	int interface_number);
+
+libusb_device_handle * LIBUSB_CALL libusb_open_device_with_vid_pid(
+	libusb_context *ctx, uint16_t vendor_id, uint16_t product_id);
+
+int LIBUSB_CALL libusb_set_interface_alt_setting(libusb_device_handle *dev,
+	int interface_number, int alternate_setting);
+int LIBUSB_CALL libusb_clear_halt(libusb_device_handle *dev,
+	unsigned char endpoint);
+int LIBUSB_CALL libusb_reset_device(libusb_device_handle *dev);
+
+int LIBUSB_CALL libusb_alloc_streams(libusb_device_handle *dev,
+	uint32_t num_streams, unsigned char *endpoints, int num_endpoints);
+int LIBUSB_CALL libusb_free_streams(libusb_device_handle *dev,
+	unsigned char *endpoints, int num_endpoints);
+
+int LIBUSB_CALL libusb_kernel_driver_active(libusb_device_handle *dev,
+	int interface_number);
+int LIBUSB_CALL libusb_detach_kernel_driver(libusb_device_handle *dev,
+	int interface_number);
+int LIBUSB_CALL libusb_attach_kernel_driver(libusb_device_handle *dev,
+	int interface_number);
+int LIBUSB_CALL libusb_set_auto_detach_kernel_driver(
+	libusb_device_handle *dev, int enable);
+
+/* async I/O */
+
+/** \ingroup asyncio
+ * Get the data section of a control transfer. This convenience function is here
+ * to remind you that the data does not start until 8 bytes into the actual
+ * buffer, as the setup packet comes first.
+ *
+ * Calling this function only makes sense from a transfer callback function,
+ * or situations where you have already allocated a suitably sized buffer at
+ * transfer->buffer.
+ *
+ * \param transfer a transfer
+ * \returns pointer to the first byte of the data section
+ */
+static inline unsigned char *libusb_control_transfer_get_data(
+	struct libusb_transfer *transfer)
+{
+	return transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
+}
+
+/** \ingroup asyncio
+ * Get the control setup packet of a control transfer. This convenience
+ * function is here to remind you that the control setup occupies the first
+ * 8 bytes of the transfer data buffer.
+ *
+ * Calling this function only makes sense from a transfer callback function,
+ * or situations where you have already allocated a suitably sized buffer at
+ * transfer->buffer.
+ *
+ * \param transfer a transfer
+ * \returns a casted pointer to the start of the transfer data buffer
+ */
+static inline struct libusb_control_setup *libusb_control_transfer_get_setup(
+	struct libusb_transfer *transfer)
+{
+	return (struct libusb_control_setup *)(void *) transfer->buffer;
+}
+
+/** \ingroup asyncio
+ * Helper function to populate the setup packet (first 8 bytes of the data
+ * buffer) for a control transfer. The wIndex, wValue and wLength values should
+ * be given in host-endian byte order.
+ *
+ * \param buffer buffer to output the setup packet into
+ * This pointer must be aligned to at least 2 bytes boundary.
+ * \param bmRequestType see the
+ * \ref libusb_control_setup::bmRequestType "bmRequestType" field of
+ * \ref libusb_control_setup
+ * \param bRequest see the
+ * \ref libusb_control_setup::bRequest "bRequest" field of
+ * \ref libusb_control_setup
+ * \param wValue see the
+ * \ref libusb_control_setup::wValue "wValue" field of
+ * \ref libusb_control_setup
+ * \param wIndex see the
+ * \ref libusb_control_setup::wIndex "wIndex" field of
+ * \ref libusb_control_setup
+ * \param wLength see the
+ * \ref libusb_control_setup::wLength "wLength" field of
+ * \ref libusb_control_setup
+ */
+static inline void libusb_fill_control_setup(unsigned char *buffer,
+	uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
+	uint16_t wLength)
+{
+	struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer;
+	setup->bmRequestType = bmRequestType;
+	setup->bRequest = bRequest;
+	setup->wValue = libusb_cpu_to_le16(wValue);
+	setup->wIndex = libusb_cpu_to_le16(wIndex);
+	setup->wLength = libusb_cpu_to_le16(wLength);
+}
+
+struct libusb_transfer * LIBUSB_CALL libusb_alloc_transfer(int iso_packets);
+int LIBUSB_CALL libusb_submit_transfer(struct libusb_transfer *transfer);
+int LIBUSB_CALL libusb_cancel_transfer(struct libusb_transfer *transfer);
+void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer);
+void LIBUSB_CALL libusb_transfer_set_stream_id(
+	struct libusb_transfer *transfer, uint32_t stream_id);
+uint32_t LIBUSB_CALL libusb_transfer_get_stream_id(
+	struct libusb_transfer *transfer);
+
+/** \ingroup asyncio
+ * Helper function to populate the required \ref libusb_transfer fields
+ * for a control transfer.
+ *
+ * If you pass a transfer buffer to this function, the first 8 bytes will
+ * be interpreted as a control setup packet, and the wLength field will be
+ * used to automatically populate the \ref libusb_transfer::length "length"
+ * field of the transfer. Therefore the recommended approach is:
+ * -# Allocate a suitably sized data buffer (including space for control setup)
+ * -# Call libusb_fill_control_setup()
+ * -# If this is a host-to-device transfer with a data stage, put the data
+ *    in place after the setup packet
+ * -# Call this function
+ * -# Call libusb_submit_transfer()
+ *
+ * It is also legal to pass a NULL buffer to this function, in which case this
+ * function will not attempt to populate the length field. Remember that you
+ * must then populate the buffer and length fields later.
+ *
+ * \param transfer the transfer to populate
+ * \param dev_handle handle of the device that will handle the transfer
+ * \param buffer data buffer. If provided, this function will interpret the
+ * first 8 bytes as a setup packet and infer the transfer length from that.
+ * This pointer must be aligned to at least 2 bytes boundary.
+ * \param callback callback function to be invoked on transfer completion
+ * \param user_data user data to pass to callback function
+ * \param timeout timeout for the transfer in milliseconds
+ */
+static inline void libusb_fill_control_transfer(
+	struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
+	unsigned char *buffer, libusb_transfer_cb_fn callback, void *user_data,
+	unsigned int timeout)
+{
+	struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer;
+	transfer->dev_handle = dev_handle;
+	transfer->endpoint = 0;
+	transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL;
+	transfer->timeout = timeout;
+	transfer->buffer = buffer;
+	if (setup)
+		transfer->length = (int) (LIBUSB_CONTROL_SETUP_SIZE
+			+ libusb_le16_to_cpu(setup->wLength));
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+/** \ingroup asyncio
+ * Helper function to populate the required \ref libusb_transfer fields
+ * for a bulk transfer.
+ *
+ * \param transfer the transfer to populate
+ * \param dev_handle handle of the device that will handle the transfer
+ * \param endpoint address of the endpoint where this transfer will be sent
+ * \param buffer data buffer
+ * \param length length of data buffer
+ * \param callback callback function to be invoked on transfer completion
+ * \param user_data user data to pass to callback function
+ * \param timeout timeout for the transfer in milliseconds
+ */
+static inline void libusb_fill_bulk_transfer(struct libusb_transfer *transfer,
+	libusb_device_handle *dev_handle, unsigned char endpoint,
+	unsigned char *buffer, int length, libusb_transfer_cb_fn callback,
+	void *user_data, unsigned int timeout)
+{
+	transfer->dev_handle = dev_handle;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_BULK;
+	transfer->timeout = timeout;
+	transfer->buffer = buffer;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+/** \ingroup asyncio
+ * Helper function to populate the required \ref libusb_transfer fields
+ * for a bulk transfer using bulk streams.
+ *
+ * Since version 1.0.19, \ref LIBUSB_API_VERSION >= 0x01000103
+ *
+ * \param transfer the transfer to populate
+ * \param dev_handle handle of the device that will handle the transfer
+ * \param endpoint address of the endpoint where this transfer will be sent
+ * \param stream_id bulk stream id for this transfer
+ * \param buffer data buffer
+ * \param length length of data buffer
+ * \param callback callback function to be invoked on transfer completion
+ * \param user_data user data to pass to callback function
+ * \param timeout timeout for the transfer in milliseconds
+ */
+static inline void libusb_fill_bulk_stream_transfer(
+	struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
+	unsigned char endpoint, uint32_t stream_id,
+	unsigned char *buffer, int length, libusb_transfer_cb_fn callback,
+	void *user_data, unsigned int timeout)
+{
+	libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer,
+				  length, callback, user_data, timeout);
+	transfer->type = LIBUSB_TRANSFER_TYPE_BULK_STREAM;
+	libusb_transfer_set_stream_id(transfer, stream_id);
+}
+
+/** \ingroup asyncio
+ * Helper function to populate the required \ref libusb_transfer fields
+ * for an interrupt transfer.
+ *
+ * \param transfer the transfer to populate
+ * \param dev_handle handle of the device that will handle the transfer
+ * \param endpoint address of the endpoint where this transfer will be sent
+ * \param buffer data buffer
+ * \param length length of data buffer
+ * \param callback callback function to be invoked on transfer completion
+ * \param user_data user data to pass to callback function
+ * \param timeout timeout for the transfer in milliseconds
+ */
+static inline void libusb_fill_interrupt_transfer(
+	struct libusb_transfer *transfer, libusb_device_handle *dev_handle,
+	unsigned char endpoint, unsigned char *buffer, int length,
+	libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout)
+{
+	transfer->dev_handle = dev_handle;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT;
+	transfer->timeout = timeout;
+	transfer->buffer = buffer;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+/** \ingroup asyncio
+ * Helper function to populate the required \ref libusb_transfer fields
+ * for an isochronous transfer.
+ *
+ * \param transfer the transfer to populate
+ * \param dev_handle handle of the device that will handle the transfer
+ * \param endpoint address of the endpoint where this transfer will be sent
+ * \param buffer data buffer
+ * \param length length of data buffer
+ * \param num_iso_packets the number of isochronous packets
+ * \param callback callback function to be invoked on transfer completion
+ * \param user_data user data to pass to callback function
+ * \param timeout timeout for the transfer in milliseconds
+ */
+static inline void libusb_fill_iso_transfer(struct libusb_transfer *transfer,
+	libusb_device_handle *dev_handle, unsigned char endpoint,
+	unsigned char *buffer, int length, int num_iso_packets,
+	libusb_transfer_cb_fn callback, void *user_data, unsigned int timeout)
+{
+	transfer->dev_handle = dev_handle;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS;
+	transfer->timeout = timeout;
+	transfer->buffer = buffer;
+	transfer->length = length;
+	transfer->num_iso_packets = num_iso_packets;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+/** \ingroup asyncio
+ * Convenience function to set the length of all packets in an isochronous
+ * transfer, based on the num_iso_packets field in the transfer structure.
+ *
+ * \param transfer a transfer
+ * \param length the length to set in each isochronous packet descriptor
+ * \see libusb_get_max_packet_size()
+ */
+static inline void libusb_set_iso_packet_lengths(
+	struct libusb_transfer *transfer, unsigned int length)
+{
+	int i;
+	for (i = 0; i < transfer->num_iso_packets; i++)
+		transfer->iso_packet_desc[i].length = length;
+}
+
+/** \ingroup asyncio
+ * Convenience function to locate the position of an isochronous packet
+ * within the buffer of an isochronous transfer.
+ *
+ * This is a thorough function which loops through all preceding packets,
+ * accumulating their lengths to find the position of the specified packet.
+ * Typically you will assign equal lengths to each packet in the transfer,
+ * and hence the above method is sub-optimal. You may wish to use
+ * libusb_get_iso_packet_buffer_simple() instead.
+ *
+ * \param transfer a transfer
+ * \param packet the packet to return the address of
+ * \returns the base address of the packet buffer inside the transfer buffer,
+ * or NULL if the packet does not exist.
+ * \see libusb_get_iso_packet_buffer_simple()
+ */
+static inline unsigned char *libusb_get_iso_packet_buffer(
+	struct libusb_transfer *transfer, unsigned int packet)
+{
+	int i;
+	size_t offset = 0;
+	int _packet;
+
+	/* oops..slight bug in the API. packet is an unsigned int, but we use
+	 * signed integers almost everywhere else. range-check and convert to
+	 * signed to avoid compiler warnings. FIXME for libusb-2. */
+	if (packet > INT_MAX)
+		return NULL;
+	_packet = (int) packet;
+
+	if (_packet >= transfer->num_iso_packets)
+		return NULL;
+
+	for (i = 0; i < _packet; i++)
+		offset += transfer->iso_packet_desc[i].length;
+
+	return transfer->buffer + offset;
+}
+
+/** \ingroup asyncio
+ * Convenience function to locate the position of an isochronous packet
+ * within the buffer of an isochronous transfer, for transfers where each
+ * packet is of identical size.
+ *
+ * This function relies on the assumption that every packet within the transfer
+ * is of identical size to the first packet. Calculating the location of
+ * the packet buffer is then just a simple calculation:
+ * <tt>buffer + (packet_size * packet)</tt>
+ *
+ * Do not use this function on transfers other than those that have identical
+ * packet lengths for each packet.
+ *
+ * \param transfer a transfer
+ * \param packet the packet to return the address of
+ * \returns the base address of the packet buffer inside the transfer buffer,
+ * or NULL if the packet does not exist.
+ * \see libusb_get_iso_packet_buffer()
+ */
+static inline unsigned char *libusb_get_iso_packet_buffer_simple(
+	struct libusb_transfer *transfer, unsigned int packet)
+{
+	int _packet;
+
+	/* oops..slight bug in the API. packet is an unsigned int, but we use
+	 * signed integers almost everywhere else. range-check and convert to
+	 * signed to avoid compiler warnings. FIXME for libusb-2. */
+	if (packet > INT_MAX)
+		return NULL;
+	_packet = (int) packet;
+
+	if (_packet >= transfer->num_iso_packets)
+		return NULL;
+
+	return transfer->buffer + ((int) transfer->iso_packet_desc[0].length * _packet);
+}
+
+/* sync I/O */
+
+int LIBUSB_CALL libusb_control_transfer(libusb_device_handle *dev_handle,
+	uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
+	unsigned char *data, uint16_t wLength, unsigned int timeout);
+
+int LIBUSB_CALL libusb_bulk_transfer(libusb_device_handle *dev_handle,
+	unsigned char endpoint, unsigned char *data, int length,
+	int *actual_length, unsigned int timeout);
+
+int LIBUSB_CALL libusb_interrupt_transfer(libusb_device_handle *dev_handle,
+	unsigned char endpoint, unsigned char *data, int length,
+	int *actual_length, unsigned int timeout);
+
+/** \ingroup desc
+ * Retrieve a descriptor from the default control pipe.
+ * This is a convenience function which formulates the appropriate control
+ * message to retrieve the descriptor.
+ *
+ * \param dev a device handle
+ * \param desc_type the descriptor type, see \ref libusb_descriptor_type
+ * \param desc_index the index of the descriptor to retrieve
+ * \param data output buffer for descriptor
+ * \param length size of data buffer
+ * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
+ */
+static inline int libusb_get_descriptor(libusb_device_handle *dev,
+	uint8_t desc_type, uint8_t desc_index, unsigned char *data, int length)
+{
+	return libusb_control_transfer(dev, LIBUSB_ENDPOINT_IN,
+		LIBUSB_REQUEST_GET_DESCRIPTOR, (uint16_t) ((desc_type << 8) | desc_index),
+		0, data, (uint16_t) length, 1000);
+}
+
+/** \ingroup desc
+ * Retrieve a descriptor from a device.
+ * This is a convenience function which formulates the appropriate control
+ * message to retrieve the descriptor. The string returned is Unicode, as
+ * detailed in the USB specifications.
+ *
+ * \param dev a device handle
+ * \param desc_index the index of the descriptor to retrieve
+ * \param langid the language ID for the string descriptor
+ * \param data output buffer for descriptor
+ * \param length size of data buffer
+ * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
+ * \see libusb_get_string_descriptor_ascii()
+ */
+static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
+	uint8_t desc_index, uint16_t langid, unsigned char *data, int length)
+{
+	return libusb_control_transfer(dev, LIBUSB_ENDPOINT_IN,
+		LIBUSB_REQUEST_GET_DESCRIPTOR, (uint16_t)((LIBUSB_DT_STRING << 8) | desc_index),
+		langid, data, (uint16_t) length, 1000);
+}
+
+int LIBUSB_CALL libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
+	uint8_t desc_index, unsigned char *data, int length);
+
+/* polling and timeouts */
+
+int LIBUSB_CALL libusb_try_lock_events(libusb_context *ctx);
+void LIBUSB_CALL libusb_lock_events(libusb_context *ctx);
+void LIBUSB_CALL libusb_unlock_events(libusb_context *ctx);
+int LIBUSB_CALL libusb_event_handling_ok(libusb_context *ctx);
+int LIBUSB_CALL libusb_event_handler_active(libusb_context *ctx);
+void LIBUSB_CALL libusb_lock_event_waiters(libusb_context *ctx);
+void LIBUSB_CALL libusb_unlock_event_waiters(libusb_context *ctx);
+int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
+
+int LIBUSB_CALL libusb_handle_events_timeout(libusb_context *ctx,
+	struct timeval *tv);
+int LIBUSB_CALL libusb_handle_events_timeout_completed(libusb_context *ctx,
+	struct timeval *tv, int *completed);
+int LIBUSB_CALL libusb_handle_events(libusb_context *ctx);
+int LIBUSB_CALL libusb_handle_events_completed(libusb_context *ctx, int *completed);
+int LIBUSB_CALL libusb_handle_events_locked(libusb_context *ctx,
+	struct timeval *tv);
+int LIBUSB_CALL libusb_pollfds_handle_timeouts(libusb_context *ctx);
+int LIBUSB_CALL libusb_get_next_timeout(libusb_context *ctx,
+	struct timeval *tv);
+
+/** \ingroup poll
+ * File descriptor for polling
+ */
+struct libusb_pollfd {
+	/** Numeric file descriptor */
+	int fd;
+
+	/** Event flags to poll for from <poll.h>. POLLIN indicates that you
+	 * should monitor this file descriptor for becoming ready to read from,
+	 * and POLLOUT indicates that you should monitor this file descriptor for
+	 * nonblocking write readiness. */
+	short events;
+};
+
+/** \ingroup poll
+ * Callback function, invoked when a new file descriptor should be added
+ * to the set of file descriptors monitored for events.
+ * \param fd the new file descriptor
+ * \param events events to monitor for, see \ref libusb_pollfd for a
+ * description
+ * \param user_data User data pointer specified in
+ * libusb_set_pollfd_notifiers() call
+ * \see libusb_set_pollfd_notifiers()
+ */
+typedef void (LIBUSB_CALL *libusb_pollfd_added_cb)(int fd, short events,
+	void *user_data);
+
+/** \ingroup poll
+ * Callback function, invoked when a file descriptor should be removed from
+ * the set of file descriptors being monitored for events. After returning
+ * from this callback, do not use that file descriptor again.
+ * \param fd the file descriptor to stop monitoring
+ * \param user_data User data pointer specified in
+ * libusb_set_pollfd_notifiers() call
+ * \see libusb_set_pollfd_notifiers()
+ */
+typedef void (LIBUSB_CALL *libusb_pollfd_removed_cb)(int fd, void *user_data);
+
+const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
+	libusb_context *ctx);
+void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
+	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
+	void *user_data);
+
+/** \ingroup hotplug
+ * Callback handle.
+ *
+ * Callbacks handles are generated by libusb_hotplug_register_callback()
+ * and can be used to deregister callbacks. Callback handles are unique
+ * per libusb_context and it is safe to call libusb_hotplug_deregister_callback()
+ * on an already deregisted callback.
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * For more information, see \ref hotplug.
+ */
+typedef int libusb_hotplug_callback_handle;
+
+/** \ingroup hotplug
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * Flags for hotplug events */
+typedef enum {
+	/** Arm the callback and fire it for all matching currently attached devices. */
+	LIBUSB_HOTPLUG_ENUMERATE = 1,
+} libusb_hotplug_flag;
+
+/** \ingroup hotplug
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * Hotplug events */
+typedef enum {
+	/** A device has been plugged in and is ready to use */
+	LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED = 0x01,
+
+	/** A device has left and is no longer available.
+	 * It is the user's responsibility to call libusb_close on any handle associated with a disconnected device.
+	 * It is safe to call libusb_get_device_descriptor on a device that has left */
+	LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT    = 0x02,
+} libusb_hotplug_event;
+
+/** \ingroup hotplug
+ * Wildcard matching for hotplug events */
+#define LIBUSB_HOTPLUG_MATCH_ANY -1
+
+/** \ingroup hotplug
+ * Hotplug callback function type. When requesting hotplug event notifications,
+ * you pass a pointer to a callback function of this type.
+ *
+ * This callback may be called by an internal event thread and as such it is
+ * recommended the callback do minimal processing before returning.
+ *
+ * libusb will call this function later, when a matching event had happened on
+ * a matching device. See \ref hotplug for more information.
+ *
+ * It is safe to call either libusb_hotplug_register_callback() or
+ * libusb_hotplug_deregister_callback() from within a callback function.
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * \param ctx            context of this notification
+ * \param device         libusb_device this event occurred on
+ * \param event          event that occurred
+ * \param user_data      user data provided when this callback was registered
+ * \returns bool whether this callback is finished processing events.
+ *                       returning 1 will cause this callback to be deregistered
+ */
+typedef int (LIBUSB_CALL *libusb_hotplug_callback_fn)(libusb_context *ctx,
+						libusb_device *device,
+						libusb_hotplug_event event,
+						void *user_data);
+
+/** \ingroup hotplug
+ * Register a hotplug callback function
+ *
+ * Register a callback with the libusb_context. The callback will fire
+ * when a matching event occurs on a matching device. The callback is
+ * armed until either it is deregistered with libusb_hotplug_deregister_callback()
+ * or the supplied callback returns 1 to indicate it is finished processing events.
+ *
+ * If the \ref LIBUSB_HOTPLUG_ENUMERATE is passed the callback will be
+ * called with a \ref LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED for all devices
+ * already plugged into the machine. Note that libusb modifies its internal
+ * device list from a separate thread, while calling hotplug callbacks from
+ * libusb_handle_events(), so it is possible for a device to already be present
+ * on, or removed from, its internal device list, while the hotplug callbacks
+ * still need to be dispatched. This means that when using \ref
+ * LIBUSB_HOTPLUG_ENUMERATE, your callback may be called twice for the arrival
+ * of the same device, once from libusb_hotplug_register_callback() and once
+ * from libusb_handle_events(); and/or your callback may be called for the
+ * removal of a device for which an arrived call was never made.
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * \param[in] ctx context to register this callback with
+ * \param[in] events bitwise or of events that will trigger this callback. See \ref
+ *            libusb_hotplug_event
+ * \param[in] flags hotplug callback flags. See \ref libusb_hotplug_flag
+ * \param[in] vendor_id the vendor id to match or \ref LIBUSB_HOTPLUG_MATCH_ANY
+ * \param[in] product_id the product id to match or \ref LIBUSB_HOTPLUG_MATCH_ANY
+ * \param[in] dev_class the device class to match or \ref LIBUSB_HOTPLUG_MATCH_ANY
+ * \param[in] cb_fn the function to be invoked on a matching event/device
+ * \param[in] user_data user data to pass to the callback function
+ * \param[out] handle pointer to store the handle of the allocated callback (can be NULL)
+ * \returns LIBUSB_SUCCESS on success LIBUSB_ERROR code on failure
+ */
+int LIBUSB_CALL libusb_hotplug_register_callback(libusb_context *ctx,
+						libusb_hotplug_event events,
+						libusb_hotplug_flag flags,
+						int vendor_id, int product_id,
+						int dev_class,
+						libusb_hotplug_callback_fn cb_fn,
+						void *user_data,
+						libusb_hotplug_callback_handle *handle);
+
+/** \ingroup hotplug
+ * Deregisters a hotplug callback.
+ *
+ * Deregister a callback from a libusb_context. This function is safe to call from within
+ * a hotplug callback.
+ *
+ * Since version 1.0.16, \ref LIBUSB_API_VERSION >= 0x01000102
+ *
+ * \param[in] ctx context this callback is registered with
+ * \param[in] handle the handle of the callback to deregister
+ */
+void LIBUSB_CALL libusb_hotplug_deregister_callback(libusb_context *ctx,
+						libusb_hotplug_callback_handle handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Externals/libusb/libusb/libusbi.h b/Externals/libusb/libusb/libusbi.h
new file mode 100644
index 0000000000..a36482c933
--- /dev/null
+++ b/Externals/libusb/libusb/libusbi.h
@@ -0,0 +1,1025 @@
+/*
+ * Internal header for libusb
+ * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBUSBI_H
+#define LIBUSBI_H
+
+#include "config.h"
+
+#include <stdlib.h>
+
+#include <stddef.h>
+#include <stdint.h>
+#include <time.h>
+#include <stdarg.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_MISSING_H
+#include "missing.h"
+#endif
+#include "libusb.h"
+#include "version.h"
+
+/* Inside the libusb code, mark all public functions as follows:
+ *   return_type API_EXPORTED function_name(params) { ... }
+ * But if the function returns a pointer, mark it as follows:
+ *   DEFAULT_VISIBILITY return_type * LIBUSB_CALL function_name(params) { ... }
+ * In the libusb public header, mark all declarations as:
+ *   return_type LIBUSB_CALL function_name(params);
+ */
+#define API_EXPORTED LIBUSB_CALL DEFAULT_VISIBILITY
+
+#define DEVICE_DESC_LENGTH		18
+
+#define USB_MAXENDPOINTS	32
+#define USB_MAXINTERFACES	32
+#define USB_MAXCONFIG		8
+
+/* Backend specific capabilities */
+#define USBI_CAP_HAS_HID_ACCESS					0x00010000
+#define USBI_CAP_SUPPORTS_DETACH_KERNEL_DRIVER	0x00020000
+
+/* Maximum number of bytes in a log line */
+#define USBI_MAX_LOG_LEN	1024
+/* Terminator for log lines */
+#define USBI_LOG_LINE_END	"\n"
+
+/* The following is used to silence warnings for unused variables */
+#define UNUSED(var)			do { (void)(var); } while(0)
+
+#if !defined(ARRAYSIZE)
+#define ARRAYSIZE(array) (sizeof(array)/sizeof(array[0]))
+#endif
+
+struct list_head {
+	struct list_head *prev, *next;
+};
+
+/* Get an entry from the list
+ *  ptr - the address of this list_head element in "type"
+ *  type - the data type that contains "member"
+ *  member - the list_head element in "type"
+ */
+#define list_entry(ptr, type, member) \
+	((type *)((uintptr_t)(ptr) - (uintptr_t)offsetof(type, member)))
+
+/* Get each entry from a list
+ *  pos - A structure pointer has a "member" element
+ *  head - list head
+ *  member - the list_head element in "pos"
+ *  type - the type of the first parameter
+ */
+#define list_for_each_entry(pos, head, member, type)			\
+	for (pos = list_entry((head)->next, type, member);			\
+		 &pos->member != (head);								\
+		 pos = list_entry(pos->member.next, type, member))
+
+#define list_for_each_entry_safe(pos, n, head, member, type)	\
+	for (pos = list_entry((head)->next, type, member),			\
+		 n = list_entry(pos->member.next, type, member);		\
+		 &pos->member != (head);								\
+		 pos = n, n = list_entry(n->member.next, type, member))
+
+#define list_empty(entry) ((entry)->next == (entry))
+
+static inline void list_init(struct list_head *entry)
+{
+	entry->prev = entry->next = entry;
+}
+
+static inline void list_add(struct list_head *entry, struct list_head *head)
+{
+	entry->next = head->next;
+	entry->prev = head;
+
+	head->next->prev = entry;
+	head->next = entry;
+}
+
+static inline void list_add_tail(struct list_head *entry,
+	struct list_head *head)
+{
+	entry->next = head;
+	entry->prev = head->prev;
+
+	head->prev->next = entry;
+	head->prev = entry;
+}
+
+static inline void list_del(struct list_head *entry)
+{
+	entry->next->prev = entry->prev;
+	entry->prev->next = entry->next;
+	entry->next = entry->prev = NULL;
+}
+
+static inline void *usbi_reallocf(void *ptr, size_t size)
+{
+	void *ret = realloc(ptr, size);
+	if (!ret)
+		free(ptr);
+	return ret;
+}
+
+#define container_of(ptr, type, member) ({                      \
+        const typeof( ((type *)0)->member ) *mptr = (ptr);    \
+        (type *)( (char *)mptr - offsetof(type,member) );})
+
+#define MIN(a, b)	((a) < (b) ? (a) : (b))
+#define MAX(a, b)	((a) > (b) ? (a) : (b))
+
+#define TIMESPEC_IS_SET(ts) ((ts)->tv_sec != 0 || (ts)->tv_nsec != 0)
+
+/* Some platforms don't have this define */
+#ifndef TIMESPEC_TO_TIMEVAL
+#define TIMESPEC_TO_TIMEVAL(tv, ts)                                     \
+        do {                                                            \
+                (tv)->tv_sec = (ts)->tv_sec;                            \
+                (tv)->tv_usec = (ts)->tv_nsec / 1000;                   \
+        } while (0)
+#endif
+
+void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+	const char *function, const char *format, ...);
+
+void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level,
+	const char *function, const char *format, va_list args);
+
+#if !defined(_MSC_VER) || _MSC_VER >= 1400
+
+#ifdef ENABLE_LOGGING
+#define _usbi_log(ctx, level, ...) usbi_log(ctx, level, __FUNCTION__, __VA_ARGS__)
+#define usbi_dbg(...) _usbi_log(NULL, LIBUSB_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#else
+#define _usbi_log(ctx, level, ...) do { (void)(ctx); } while(0)
+#define usbi_dbg(...) do {} while(0)
+#endif
+
+#define usbi_info(ctx, ...) _usbi_log(ctx, LIBUSB_LOG_LEVEL_INFO, __VA_ARGS__)
+#define usbi_warn(ctx, ...) _usbi_log(ctx, LIBUSB_LOG_LEVEL_WARNING, __VA_ARGS__)
+#define usbi_err(ctx, ...) _usbi_log(ctx, LIBUSB_LOG_LEVEL_ERROR, __VA_ARGS__)
+
+#else /* !defined(_MSC_VER) || _MSC_VER >= 1400 */
+
+#ifdef ENABLE_LOGGING
+#define LOG_BODY(ctxt, level) \
+{                             \
+	va_list args;             \
+	va_start (args, format);  \
+	usbi_log_v(ctxt, level, "", format, args); \
+	va_end(args);             \
+}
+#else
+#define LOG_BODY(ctxt, level) do { (void)(ctxt); } while(0)
+#endif
+
+static inline void usbi_info(struct libusb_context *ctx, const char *format,
+	...)
+	LOG_BODY(ctx,LIBUSB_LOG_LEVEL_INFO)
+static inline void usbi_warn(struct libusb_context *ctx, const char *format,
+	...)
+	LOG_BODY(ctx,LIBUSB_LOG_LEVEL_WARNING)
+static inline void usbi_err( struct libusb_context *ctx, const char *format,
+	...)
+	LOG_BODY(ctx,LIBUSB_LOG_LEVEL_ERROR)
+
+static inline void usbi_dbg(const char *format, ...)
+	LOG_BODY(NULL,LIBUSB_LOG_LEVEL_DEBUG)
+
+#endif /* !defined(_MSC_VER) || _MSC_VER >= 1400 */
+
+#define USBI_GET_CONTEXT(ctx) if (!(ctx)) (ctx) = usbi_default_context
+#define DEVICE_CTX(dev) ((dev)->ctx)
+#define HANDLE_CTX(handle) (DEVICE_CTX((handle)->dev))
+#define TRANSFER_CTX(transfer) (HANDLE_CTX((transfer)->dev_handle))
+#define ITRANSFER_CTX(transfer) \
+	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer)))
+
+#define IS_EPIN(ep) (0 != ((ep) & LIBUSB_ENDPOINT_IN))
+#define IS_EPOUT(ep) (!IS_EPIN(ep))
+#define IS_XFERIN(xfer) (0 != ((xfer)->endpoint & LIBUSB_ENDPOINT_IN))
+#define IS_XFEROUT(xfer) (!IS_XFERIN(xfer))
+
+/* Internal abstraction for thread synchronization */
+#if defined(THREADS_POSIX)
+#include "os/threads_posix.h"
+#elif defined(OS_WINDOWS) || defined(OS_WINCE)
+#include <os/threads_windows.h>
+#endif
+
+extern struct libusb_context *usbi_default_context;
+
+struct libusb_context {
+	int debug;
+	int debug_fixed;
+
+	/* internal control pipe, used for interrupting event handling when
+	 * something needs to modify poll fds. */
+	int ctrl_pipe[2];
+
+	struct list_head usb_devs;
+	usbi_mutex_t usb_devs_lock;
+
+	/* A list of open handles. Backends are free to traverse this if required.
+	 */
+	struct list_head open_devs;
+	usbi_mutex_t open_devs_lock;
+
+	/* A list of registered hotplug callbacks */
+	struct list_head hotplug_cbs;
+	usbi_mutex_t hotplug_cbs_lock;
+	int hotplug_pipe[2];
+
+	/* this is a list of in-flight transfer handles, sorted by timeout
+	 * expiration. URBs to timeout the soonest are placed at the beginning of
+	 * the list, URBs that will time out later are placed after, and urbs with
+	 * infinite timeout are always placed at the very end. */
+	struct list_head flying_transfers;
+	usbi_mutex_t flying_transfers_lock;
+
+	/* list of poll fds */
+	struct list_head pollfds;
+	usbi_mutex_t pollfds_lock;
+
+	/* a counter that is set when we want to interrupt event handling, in order
+	 * to modify the poll fd set. and a lock to protect it. */
+	unsigned int pollfd_modify;
+	usbi_mutex_t pollfd_modify_lock;
+
+	/* user callbacks for pollfd changes */
+	libusb_pollfd_added_cb fd_added_cb;
+	libusb_pollfd_removed_cb fd_removed_cb;
+	void *fd_cb_user_data;
+
+	/* ensures that only one thread is handling events at any one time */
+	usbi_mutex_t events_lock;
+
+	/* used to see if there is an active thread doing event handling */
+	int event_handler_active;
+
+	/* used to wait for event completion in threads other than the one that is
+	 * event handling */
+	usbi_mutex_t event_waiters_lock;
+	usbi_cond_t event_waiters_cond;
+
+#ifdef USBI_TIMERFD_AVAILABLE
+	/* used for timeout handling, if supported by OS.
+	 * this timerfd is maintained to trigger on the next pending timeout */
+	int timerfd;
+#endif
+
+	struct list_head list;
+};
+
+#ifdef USBI_TIMERFD_AVAILABLE
+#define usbi_using_timerfd(ctx) ((ctx)->timerfd >= 0)
+#else
+#define usbi_using_timerfd(ctx) (0)
+#endif
+
+struct libusb_device {
+	/* lock protects refcnt, everything else is finalized at initialization
+	 * time */
+	usbi_mutex_t lock;
+	int refcnt;
+
+	struct libusb_context *ctx;
+
+	uint8_t bus_number;
+	uint8_t port_number;
+	struct libusb_device* parent_dev;
+	uint8_t device_address;
+	uint8_t num_configurations;
+	enum libusb_speed speed;
+
+	struct list_head list;
+	unsigned long session_data;
+
+	struct libusb_device_descriptor device_descriptor;
+	int attached;
+
+	unsigned char os_priv
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+struct libusb_device_handle {
+	/* lock protects claimed_interfaces */
+	usbi_mutex_t lock;
+	unsigned long claimed_interfaces;
+
+	struct list_head list;
+	struct libusb_device *dev;
+	int auto_detach_kernel_driver;
+	unsigned char os_priv
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+enum {
+  USBI_CLOCK_MONOTONIC,
+  USBI_CLOCK_REALTIME
+};
+
+/* in-memory transfer layout:
+ *
+ * 1. struct usbi_transfer
+ * 2. struct libusb_transfer (which includes iso packets) [variable size]
+ * 3. os private data [variable size]
+ *
+ * from a libusb_transfer, you can get the usbi_transfer by rewinding the
+ * appropriate number of bytes.
+ * the usbi_transfer includes the number of allocated packets, so you can
+ * determine the size of the transfer and hence the start and length of the
+ * OS-private data.
+ */
+
+struct usbi_transfer {
+	int num_iso_packets;
+	struct list_head list;
+	struct timeval timeout;
+	int transferred;
+	uint32_t stream_id;
+	uint8_t flags;
+
+	/* this lock is held during libusb_submit_transfer() and
+	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
+	 * cancellation, submission-during-cancellation, etc). the OS backend
+	 * should also take this lock in the handle_events path, to prevent the user
+	 * cancelling the transfer from another thread while you are processing
+	 * its completion (presumably there would be races within your OS backend
+	 * if this were possible). */
+	usbi_mutex_t lock;
+};
+
+enum usbi_transfer_flags {
+	/* The transfer has timed out */
+	USBI_TRANSFER_TIMED_OUT = 1 << 0,
+
+	/* Set by backend submit_transfer() if the OS handles timeout */
+	USBI_TRANSFER_OS_HANDLES_TIMEOUT = 1 << 1,
+
+	/* Cancellation was requested via libusb_cancel_transfer() */
+	USBI_TRANSFER_CANCELLING = 1 << 2,
+
+	/* Operation on the transfer failed because the device disappeared */
+	USBI_TRANSFER_DEVICE_DISAPPEARED = 1 << 3,
+
+	/* Set by backend submit_transfer() if the fds in use have been updated */
+	USBI_TRANSFER_UPDATED_FDS = 1 << 4,
+};
+
+#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \
+	((struct libusb_transfer *)(((unsigned char *)(transfer)) \
+		+ sizeof(struct usbi_transfer)))
+#define LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \
+	((struct usbi_transfer *)(((unsigned char *)(transfer)) \
+		- sizeof(struct usbi_transfer)))
+
+static inline void *usbi_transfer_get_os_priv(struct usbi_transfer *transfer)
+{
+	return ((unsigned char *)transfer) + sizeof(struct usbi_transfer)
+		+ sizeof(struct libusb_transfer)
+		+ (transfer->num_iso_packets
+			* sizeof(struct libusb_iso_packet_descriptor));
+}
+
+/* bus structures */
+
+/* All standard descriptors have these 2 fields in common */
+struct usb_descriptor_header {
+	uint8_t  bLength;
+	uint8_t  bDescriptorType;
+};
+
+/* shared data and functions */
+
+int usbi_io_init(struct libusb_context *ctx);
+void usbi_io_exit(struct libusb_context *ctx);
+
+struct libusb_device *usbi_alloc_device(struct libusb_context *ctx,
+	unsigned long session_id);
+struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx,
+	unsigned long session_id);
+int usbi_sanitize_device(struct libusb_device *dev);
+void usbi_handle_disconnect(struct libusb_device_handle *handle);
+
+int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+	enum libusb_transfer_status status);
+int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer);
+
+int usbi_parse_descriptor(const unsigned char *source, const char *descriptor,
+	void *dest, int host_endian);
+int usbi_device_cache_descriptor(libusb_device *dev);
+int usbi_get_config_index_by_value(struct libusb_device *dev,
+	uint8_t bConfigurationValue, int *idx);
+
+void usbi_connect_device (struct libusb_device *dev);
+void usbi_disconnect_device (struct libusb_device *dev);
+
+/* Internal abstraction for poll (needs struct usbi_transfer on Windows) */
+#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_OPENBSD) || defined(OS_NETBSD)
+#include <unistd.h>
+#include "os/poll_posix.h"
+#elif defined(OS_WINDOWS) || defined(OS_WINCE)
+#include "os/poll_windows.h"
+#endif
+
+#if (defined(OS_WINDOWS) || defined(OS_WINCE)) && !defined(__GNUC__)
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+int usbi_gettimeofday(struct timeval *tp, void *tzp);
+#define LIBUSB_GETTIMEOFDAY_WIN32
+#define HAVE_USBI_GETTIMEOFDAY
+#else
+#ifdef HAVE_GETTIMEOFDAY
+#define usbi_gettimeofday(tv, tz) gettimeofday((tv), (tz))
+#define HAVE_USBI_GETTIMEOFDAY
+#endif
+#endif
+
+struct usbi_pollfd {
+	/* must come first */
+	struct libusb_pollfd pollfd;
+
+	struct list_head list;
+};
+
+int usbi_add_pollfd(struct libusb_context *ctx, int fd, short events);
+void usbi_remove_pollfd(struct libusb_context *ctx, int fd);
+void usbi_fd_notification(struct libusb_context *ctx);
+
+/* device discovery */
+
+/* we traverse usbfs without knowing how many devices we are going to find.
+ * so we create this discovered_devs model which is similar to a linked-list
+ * which grows when required. it can be freed once discovery has completed,
+ * eliminating the need for a list node in the libusb_device structure
+ * itself. */
+struct discovered_devs {
+	size_t len;
+	size_t capacity;
+	struct libusb_device *devices
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	[] /* valid C99 code */
+#else
+	[0] /* non-standard, but usually working code */
+#endif
+	;
+};
+
+struct discovered_devs *discovered_devs_append(
+	struct discovered_devs *discdevs, struct libusb_device *dev);
+
+/* OS abstraction */
+
+/* This is the interface that OS backends need to implement.
+ * All fields are mandatory, except ones explicitly noted as optional. */
+struct usbi_os_backend {
+	/* A human-readable name for your backend, e.g. "Linux usbfs" */
+	const char *name;
+
+	/* Binary mask for backend specific capabilities */
+	uint32_t caps;
+
+	/* Perform initialization of your backend. You might use this function
+	 * to determine specific capabilities of the system, allocate required
+	 * data structures for later, etc.
+	 *
+	 * This function is called when a libusb user initializes the library
+	 * prior to use.
+	 *
+	 * Return 0 on success, or a LIBUSB_ERROR code on failure.
+	 */
+	int (*init)(struct libusb_context *ctx);
+
+	/* Deinitialization. Optional. This function should destroy anything
+	 * that was set up by init.
+	 *
+	 * This function is called when the user deinitializes the library.
+	 */
+	void (*exit)(void);
+
+	/* Enumerate all the USB devices on the system, returning them in a list
+	 * of discovered devices.
+	 *
+	 * Your implementation should enumerate all devices on the system,
+	 * regardless of whether they have been seen before or not.
+	 *
+	 * When you have found a device, compute a session ID for it. The session
+	 * ID should uniquely represent that particular device for that particular
+	 * connection session since boot (i.e. if you disconnect and reconnect a
+	 * device immediately after, it should be assigned a different session ID).
+	 * If your OS cannot provide a unique session ID as described above,
+	 * presenting a session ID of (bus_number << 8 | device_address) should
+	 * be sufficient. Bus numbers and device addresses wrap and get reused,
+	 * but that is an unlikely case.
+	 *
+	 * After computing a session ID for a device, call
+	 * usbi_get_device_by_session_id(). This function checks if libusb already
+	 * knows about the device, and if so, it provides you with a reference
+	 * to a libusb_device structure for it.
+	 *
+	 * If usbi_get_device_by_session_id() returns NULL, it is time to allocate
+	 * a new device structure for the device. Call usbi_alloc_device() to
+	 * obtain a new libusb_device structure with reference count 1. Populate
+	 * the bus_number and device_address attributes of the new device, and
+	 * perform any other internal backend initialization you need to do. At
+	 * this point, you should be ready to provide device descriptors and so
+	 * on through the get_*_descriptor functions. Finally, call
+	 * usbi_sanitize_device() to perform some final sanity checks on the
+	 * device. Assuming all of the above succeeded, we can now continue.
+	 * If any of the above failed, remember to unreference the device that
+	 * was returned by usbi_alloc_device().
+	 *
+	 * At this stage we have a populated libusb_device structure (either one
+	 * that was found earlier, or one that we have just allocated and
+	 * populated). This can now be added to the discovered devices list
+	 * using discovered_devs_append(). Note that discovered_devs_append()
+	 * may reallocate the list, returning a new location for it, and also
+	 * note that reallocation can fail. Your backend should handle these
+	 * error conditions appropriately.
+	 *
+	 * This function should not generate any bus I/O and should not block.
+	 * If I/O is required (e.g. reading the active configuration value), it is
+	 * OK to ignore these suggestions :)
+	 *
+	 * This function is executed when the user wishes to retrieve a list
+	 * of USB devices connected to the system.
+	 *
+	 * If the backend has hotplug support, this function is not used!
+	 *
+	 * Return 0 on success, or a LIBUSB_ERROR code on failure.
+	 */
+	int (*get_device_list)(struct libusb_context *ctx,
+		struct discovered_devs **discdevs);
+
+	/* Apps which were written before hotplug support, may listen for
+	 * hotplug events on their own and call libusb_get_device_list on
+	 * device addition. In this case libusb_get_device_list will likely
+	 * return a list without the new device in there, as the hotplug
+	 * event thread will still be busy enumerating the device, which may
+	 * take a while, or may not even have seen the event yet.
+	 *
+	 * To avoid this libusb_get_device_list will call this optional
+	 * function for backends with hotplug support before copying
+	 * ctx->usb_devs to the user. In this function the backend should
+	 * ensure any pending hotplug events are fully processed before
+	 * returning.
+	 *
+	 * Optional, should be implemented by backends with hotplug support.
+	 */
+	void (*hotplug_poll)(void);
+
+	/* Open a device for I/O and other USB operations. The device handle
+	 * is preallocated for you, you can retrieve the device in question
+	 * through handle->dev.
+	 *
+	 * Your backend should allocate any internal resources required for I/O
+	 * and other operations so that those operations can happen (hopefully)
+	 * without hiccup. This is also a good place to inform libusb that it
+	 * should monitor certain file descriptors related to this device -
+	 * see the usbi_add_pollfd() function.
+	 *
+	 * This function should not generate any bus I/O and should not block.
+	 *
+	 * This function is called when the user attempts to obtain a device
+	 * handle for a device.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_ACCESS if the user has insufficient permissions
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since
+	 *   discovery
+	 * - another LIBUSB_ERROR code on other failure
+	 *
+	 * Do not worry about freeing the handle on failed open, the upper layers
+	 * do this for you.
+	 */
+	int (*open)(struct libusb_device_handle *handle);
+
+	/* Close a device such that the handle cannot be used again. Your backend
+	 * should destroy any resources that were allocated in the open path.
+	 * This may also be a good place to call usbi_remove_pollfd() to inform
+	 * libusb of any file descriptors associated with this device that should
+	 * no longer be monitored.
+	 *
+	 * This function is called when the user closes a device handle.
+	 */
+	void (*close)(struct libusb_device_handle *handle);
+
+	/* Retrieve the device descriptor from a device.
+	 *
+	 * The descriptor should be retrieved from memory, NOT via bus I/O to the
+	 * device. This means that you may have to cache it in a private structure
+	 * during get_device_list enumeration. Alternatively, you may be able
+	 * to retrieve it from a kernel interface (some Linux setups can do this)
+	 * still without generating bus I/O.
+	 *
+	 * This function is expected to write DEVICE_DESC_LENGTH (18) bytes into
+	 * buffer, which is guaranteed to be big enough.
+	 *
+	 * This function is called when sanity-checking a device before adding
+	 * it to the list of discovered devices, and also when the user requests
+	 * to read the device descriptor.
+	 *
+	 * This function is expected to return the descriptor in bus-endian format
+	 * (LE). If it returns the multi-byte values in host-endian format,
+	 * set the host_endian output parameter to "1".
+	 *
+	 * Return 0 on success or a LIBUSB_ERROR code on failure.
+	 */
+	int (*get_device_descriptor)(struct libusb_device *device,
+		unsigned char *buffer, int *host_endian);
+
+	/* Get the ACTIVE configuration descriptor for a device.
+	 *
+	 * The descriptor should be retrieved from memory, NOT via bus I/O to the
+	 * device. This means that you may have to cache it in a private structure
+	 * during get_device_list enumeration. You may also have to keep track
+	 * of which configuration is active when the user changes it.
+	 *
+	 * This function is expected to write len bytes of data into buffer, which
+	 * is guaranteed to be big enough. If you can only do a partial write,
+	 * return an error code.
+	 *
+	 * This function is expected to return the descriptor in bus-endian format
+	 * (LE). If it returns the multi-byte values in host-endian format,
+	 * set the host_endian output parameter to "1".
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if the device is in unconfigured state
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*get_active_config_descriptor)(struct libusb_device *device,
+		unsigned char *buffer, size_t len, int *host_endian);
+
+	/* Get a specific configuration descriptor for a device.
+	 *
+	 * The descriptor should be retrieved from memory, NOT via bus I/O to the
+	 * device. This means that you may have to cache it in a private structure
+	 * during get_device_list enumeration.
+	 *
+	 * The requested descriptor is expressed as a zero-based index (i.e. 0
+	 * indicates that we are requesting the first descriptor). The index does
+	 * not (necessarily) equal the bConfigurationValue of the configuration
+	 * being requested.
+	 *
+	 * This function is expected to write len bytes of data into buffer, which
+	 * is guaranteed to be big enough. If you can only do a partial write,
+	 * return an error code.
+	 *
+	 * This function is expected to return the descriptor in bus-endian format
+	 * (LE). If it returns the multi-byte values in host-endian format,
+	 * set the host_endian output parameter to "1".
+	 *
+	 * Return the length read on success or a LIBUSB_ERROR code on failure.
+	 */
+	int (*get_config_descriptor)(struct libusb_device *device,
+		uint8_t config_index, unsigned char *buffer, size_t len,
+		int *host_endian);
+
+	/* Like get_config_descriptor but then by bConfigurationValue instead
+	 * of by index.
+	 *
+	 * Optional, if not present the core will call get_config_descriptor
+	 * for all configs until it finds the desired bConfigurationValue.
+	 *
+	 * Returns a pointer to the raw-descriptor in *buffer, this memory
+	 * is valid as long as device is valid.
+	 *
+	 * Returns the length of the returned raw-descriptor on success,
+	 * or a LIBUSB_ERROR code on failure.
+	 */
+	int (*get_config_descriptor_by_value)(struct libusb_device *device,
+		uint8_t bConfigurationValue, unsigned char **buffer,
+		int *host_endian);
+
+	/* Get the bConfigurationValue for the active configuration for a device.
+	 * Optional. This should only be implemented if you can retrieve it from
+	 * cache (don't generate I/O).
+	 *
+	 * If you cannot retrieve this from cache, either do not implement this
+	 * function, or return LIBUSB_ERROR_NOT_SUPPORTED. This will cause
+	 * libusb to retrieve the information through a standard control transfer.
+	 *
+	 * This function must be non-blocking.
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - LIBUSB_ERROR_NOT_SUPPORTED if the value cannot be retrieved without
+	 *   blocking
+	 * - another LIBUSB_ERROR code on other failure.
+	 */
+	int (*get_configuration)(struct libusb_device_handle *handle, int *config);
+
+	/* Set the active configuration for a device.
+	 *
+	 * A configuration value of -1 should put the device in unconfigured state.
+	 *
+	 * This function can block.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if the configuration does not exist
+	 * - LIBUSB_ERROR_BUSY if interfaces are currently claimed (and hence
+	 *   configuration cannot be changed)
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure.
+	 */
+	int (*set_configuration)(struct libusb_device_handle *handle, int config);
+
+	/* Claim an interface. When claimed, the application can then perform
+	 * I/O to an interface's endpoints.
+	 *
+	 * This function should not generate any bus I/O and should not block.
+	 * Interface claiming is a logical operation that simply ensures that
+	 * no other drivers/applications are using the interface, and after
+	 * claiming, no other drivers/applicatiosn can use the interface because
+	 * we now "own" it.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if the interface does not exist
+	 * - LIBUSB_ERROR_BUSY if the interface is in use by another driver/app
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*claim_interface)(struct libusb_device_handle *handle, int interface_number);
+
+	/* Release a previously claimed interface.
+	 *
+	 * This function should also generate a SET_INTERFACE control request,
+	 * resetting the alternate setting of that interface to 0. It's OK for
+	 * this function to block as a result.
+	 *
+	 * You will only ever be asked to release an interface which was
+	 * successfully claimed earlier.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*release_interface)(struct libusb_device_handle *handle, int interface_number);
+
+	/* Set the alternate setting for an interface.
+	 *
+	 * You will only ever be asked to set the alternate setting for an
+	 * interface which was successfully claimed earlier.
+	 *
+	 * It's OK for this function to block.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if the alternate setting does not exist
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*set_interface_altsetting)(struct libusb_device_handle *handle,
+		int interface_number, int altsetting);
+
+	/* Clear a halt/stall condition on an endpoint.
+	 *
+	 * It's OK for this function to block.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*clear_halt)(struct libusb_device_handle *handle,
+		unsigned char endpoint);
+
+	/* Perform a USB port reset to reinitialize a device.
+	 *
+	 * If possible, the handle should still be usable after the reset
+	 * completes, assuming that the device descriptors did not change during
+	 * reset and all previous interface state can be restored.
+	 *
+	 * If something changes, or you cannot easily locate/verify the resetted
+	 * device, return LIBUSB_ERROR_NOT_FOUND. This prompts the application
+	 * to close the old handle and re-enumerate the device.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if re-enumeration is required, or if the device
+	 *   has been disconnected since it was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*reset_device)(struct libusb_device_handle *handle);
+
+	/* Alloc num_streams usb3 bulk streams on the passed in endpoints */
+	int (*alloc_streams)(struct libusb_device_handle *handle,
+		uint32_t num_streams, unsigned char *endpoints, int num_endpoints);
+
+	/* Free usb3 bulk streams allocated with alloc_streams */
+	int (*free_streams)(struct libusb_device_handle *handle,
+		unsigned char *endpoints, int num_endpoints);
+
+	/* Determine if a kernel driver is active on an interface. Optional.
+	 *
+	 * The presence of a kernel driver on an interface indicates that any
+	 * calls to claim_interface would fail with the LIBUSB_ERROR_BUSY code.
+	 *
+	 * Return:
+	 * - 0 if no driver is active
+	 * - 1 if a driver is active
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*kernel_driver_active)(struct libusb_device_handle *handle,
+		int interface_number);
+
+	/* Detach a kernel driver from an interface. Optional.
+	 *
+	 * After detaching a kernel driver, the interface should be available
+	 * for claim.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if no kernel driver was active
+	 * - LIBUSB_ERROR_INVALID_PARAM if the interface does not exist
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*detach_kernel_driver)(struct libusb_device_handle *handle,
+		int interface_number);
+
+	/* Attach a kernel driver to an interface. Optional.
+	 *
+	 * Reattach a kernel driver to the device.
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NOT_FOUND if no kernel driver was active
+	 * - LIBUSB_ERROR_INVALID_PARAM if the interface does not exist
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected since it
+	 *   was opened
+	 * - LIBUSB_ERROR_BUSY if a program or driver has claimed the interface,
+	 *   preventing reattachment
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*attach_kernel_driver)(struct libusb_device_handle *handle,
+		int interface_number);
+
+	/* Destroy a device. Optional.
+	 *
+	 * This function is called when the last reference to a device is
+	 * destroyed. It should free any resources allocated in the get_device_list
+	 * path.
+	 */
+	void (*destroy_device)(struct libusb_device *dev);
+
+	/* Submit a transfer. Your implementation should take the transfer,
+	 * morph it into whatever form your platform requires, and submit it
+	 * asynchronously.
+	 *
+	 * This function must not block.
+	 *
+	 * This function gets called with the flying_transfers_lock locked!
+	 *
+	 * Return:
+	 * - 0 on success
+	 * - LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+	 * - another LIBUSB_ERROR code on other failure
+	 */
+	int (*submit_transfer)(struct usbi_transfer *itransfer);
+
+	/* Cancel a previously submitted transfer.
+	 *
+	 * This function must not block. The transfer cancellation must complete
+	 * later, resulting in a call to usbi_handle_transfer_cancellation()
+	 * from the context of handle_events.
+	 */
+	int (*cancel_transfer)(struct usbi_transfer *itransfer);
+
+	/* Clear a transfer as if it has completed or cancelled, but do not
+	 * report any completion/cancellation to the library. You should free
+	 * all private data from the transfer as if you were just about to report
+	 * completion or cancellation.
+	 *
+	 * This function might seem a bit out of place. It is used when libusb
+	 * detects a disconnected device - it calls this function for all pending
+	 * transfers before reporting completion (with the disconnect code) to
+	 * the user. Maybe we can improve upon this internal interface in future.
+	 */
+	void (*clear_transfer_priv)(struct usbi_transfer *itransfer);
+
+	/* Handle any pending events. This involves monitoring any active
+	 * transfers and processing their completion or cancellation.
+	 *
+	 * The function is passed an array of pollfd structures (size nfds)
+	 * as a result of the poll() system call. The num_ready parameter
+	 * indicates the number of file descriptors that have reported events
+	 * (i.e. the poll() return value). This should be enough information
+	 * for you to determine which actions need to be taken on the currently
+	 * active transfers.
+	 *
+	 * For any cancelled transfers, call usbi_handle_transfer_cancellation().
+	 * For completed transfers, call usbi_handle_transfer_completion().
+	 * For control/bulk/interrupt transfers, populate the "transferred"
+	 * element of the appropriate usbi_transfer structure before calling the
+	 * above functions. For isochronous transfers, populate the status and
+	 * transferred fields of the iso packet descriptors of the transfer.
+	 *
+	 * This function should also be able to detect disconnection of the
+	 * device, reporting that situation with usbi_handle_disconnect().
+	 *
+	 * When processing an event related to a transfer, you probably want to
+	 * take usbi_transfer.lock to prevent races. See the documentation for
+	 * the usbi_transfer structure.
+	 *
+	 * Return 0 on success, or a LIBUSB_ERROR code on failure.
+	 */
+	int (*handle_events)(struct libusb_context *ctx,
+		struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready);
+
+	/* Get time from specified clock. At least two clocks must be implemented
+	   by the backend: USBI_CLOCK_REALTIME, and USBI_CLOCK_MONOTONIC.
+
+	   Description of clocks:
+	     USBI_CLOCK_REALTIME : clock returns time since system epoch.
+	     USBI_CLOCK_MONOTONIC: clock returns time since unspecified start
+	                             time (usually boot).
+	 */
+	int (*clock_gettime)(int clkid, struct timespec *tp);
+
+#ifdef USBI_TIMERFD_AVAILABLE
+	/* clock ID of the clock that should be used for timerfd */
+	clockid_t (*get_timerfd_clockid)(void);
+#endif
+
+	/* Number of bytes to reserve for per-device private backend data.
+	 * This private data area is accessible through the "os_priv" field of
+	 * struct libusb_device. */
+	size_t device_priv_size;
+
+	/* Number of bytes to reserve for per-handle private backend data.
+	 * This private data area is accessible through the "os_priv" field of
+	 * struct libusb_device. */
+	size_t device_handle_priv_size;
+
+	/* Number of bytes to reserve for per-transfer private backend data.
+	 * This private data area is accessible by calling
+	 * usbi_transfer_get_os_priv() on the appropriate usbi_transfer instance.
+	 */
+	size_t transfer_priv_size;
+
+	/* Mumber of additional bytes for os_priv for each iso packet.
+	 * Can your backend use this? */
+	/* FIXME: linux can't use this any more. if other OS's cannot either,
+	 * then remove this */
+	size_t add_iso_packet_size;
+};
+
+extern const struct usbi_os_backend * const usbi_backend;
+
+extern const struct usbi_os_backend linux_usbfs_backend;
+extern const struct usbi_os_backend darwin_backend;
+extern const struct usbi_os_backend openbsd_backend;
+extern const struct usbi_os_backend netbsd_backend;
+extern const struct usbi_os_backend windows_backend;
+extern const struct usbi_os_backend wince_backend;
+
+extern struct list_head active_contexts_list;
+extern usbi_mutex_static_t active_contexts_lock;
+
+#endif
diff --git a/Externals/libusb/libusb/os/darwin_usb.c b/Externals/libusb/libusb/os/darwin_usb.c
new file mode 100644
index 0000000000..19174b131c
--- /dev/null
+++ b/Externals/libusb/libusb/os/darwin_usb.c
@@ -0,0 +1,2009 @@
+/* -*- Mode: C; indent-tabs-mode:nil -*- */
+/*
+ * darwin backend for libusb 1.0
+ * Copyright © 2008-2014 Nathan Hjelm <hjelmn@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include <ctype.h>
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <libkern/OSAtomic.h>
+
+#include <mach/clock.h>
+#include <mach/clock_types.h>
+#include <mach/mach_host.h>
+#include <mach/mach_port.h>
+
+#include <AvailabilityMacros.h>
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+  #include <objc/objc-auto.h>
+#endif
+
+#include "darwin_usb.h"
+
+/* async event thread */
+static pthread_mutex_t libusb_darwin_at_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t  libusb_darwin_at_cond = PTHREAD_COND_INITIALIZER;
+
+static clock_serv_t clock_realtime;
+static clock_serv_t clock_monotonic;
+
+static CFRunLoopRef libusb_darwin_acfl = NULL; /* event cf loop */
+static volatile int32_t initCount = 0;
+
+static usbi_mutex_t darwin_cached_devices_lock = PTHREAD_MUTEX_INITIALIZER;
+static struct list_head darwin_cached_devices = {&darwin_cached_devices, &darwin_cached_devices};
+
+#define DARWIN_CACHED_DEVICE(a) ((struct darwin_cached_device *) (((struct darwin_device_priv *)((a)->os_priv))->dev))
+
+/* async event thread */
+static pthread_t libusb_darwin_at;
+
+static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian);
+static int darwin_claim_interface(struct libusb_device_handle *dev_handle, int iface);
+static int darwin_release_interface(struct libusb_device_handle *dev_handle, int iface);
+static int darwin_reset_device(struct libusb_device_handle *dev_handle);
+static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0);
+
+static int darwin_scan_devices(struct libusb_context *ctx);
+static int process_new_device (struct libusb_context *ctx, io_service_t service);
+
+#if defined(ENABLE_LOGGING)
+static const char *darwin_error_str (int result) {
+  static char string_buffer[50];
+  switch (result) {
+  case kIOReturnSuccess:
+    return "no error";
+  case kIOReturnNotOpen:
+    return "device not opened for exclusive access";
+  case kIOReturnNoDevice:
+    return "no connection to an IOService";
+  case kIOUSBNoAsyncPortErr:
+    return "no async port has been opened for interface";
+  case kIOReturnExclusiveAccess:
+    return "another process has device opened for exclusive access";
+  case kIOUSBPipeStalled:
+    return "pipe is stalled";
+  case kIOReturnError:
+    return "could not establish a connection to the Darwin kernel";
+  case kIOUSBTransactionTimeout:
+    return "transaction timed out";
+  case kIOReturnBadArgument:
+    return "invalid argument";
+  case kIOReturnAborted:
+    return "transaction aborted";
+  case kIOReturnNotResponding:
+    return "device not responding";
+  case kIOReturnOverrun:
+    return "data overrun";
+  case kIOReturnCannotWire:
+    return "physical memory can not be wired down";
+  case kIOReturnNoResources:
+    return "out of resources";
+  case kIOUSBHighSpeedSplitError:
+    return "high speed split error";
+  default:
+    snprintf(string_buffer, sizeof(string_buffer), "unknown error (0x%x)", result);
+    return string_buffer;
+  }
+}
+#endif
+
+static int darwin_to_libusb (int result) {
+  switch (result) {
+  case kIOReturnUnderrun:
+  case kIOReturnSuccess:
+    return LIBUSB_SUCCESS;
+  case kIOReturnNotOpen:
+  case kIOReturnNoDevice:
+    return LIBUSB_ERROR_NO_DEVICE;
+  case kIOReturnExclusiveAccess:
+    return LIBUSB_ERROR_ACCESS;
+  case kIOUSBPipeStalled:
+    return LIBUSB_ERROR_PIPE;
+  case kIOReturnBadArgument:
+    return LIBUSB_ERROR_INVALID_PARAM;
+  case kIOUSBTransactionTimeout:
+    return LIBUSB_ERROR_TIMEOUT;
+  case kIOReturnNotResponding:
+  case kIOReturnAborted:
+  case kIOReturnError:
+  case kIOUSBNoAsyncPortErr:
+  default:
+    return LIBUSB_ERROR_OTHER;
+  }
+}
+
+/* this function must be called with the darwin_cached_devices_lock held */
+static void darwin_deref_cached_device(struct darwin_cached_device *cached_dev) {
+  cached_dev->refcount--;
+  /* free the device and remove it from the cache */
+  if (0 == cached_dev->refcount) {
+    list_del(&cached_dev->list);
+
+    (*(cached_dev->device))->Release(cached_dev->device);
+    free (cached_dev);
+  }
+}
+
+static void darwin_ref_cached_device(struct darwin_cached_device *cached_dev) {
+  cached_dev->refcount++;
+}
+
+static int ep_to_pipeRef(struct libusb_device_handle *dev_handle, uint8_t ep, uint8_t *pipep, uint8_t *ifcp, struct darwin_interface **interface_out) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+
+  /* current interface */
+  struct darwin_interface *cInterface;
+
+  int8_t i, iface;
+
+  usbi_dbg ("converting ep address 0x%02x to pipeRef and interface", ep);
+
+  for (iface = 0 ; iface < USB_MAXINTERFACES ; iface++) {
+    cInterface = &priv->interfaces[iface];
+
+    if (dev_handle->claimed_interfaces & (1 << iface)) {
+      for (i = 0 ; i < cInterface->num_endpoints ; i++) {
+        if (cInterface->endpoint_addrs[i] == ep) {
+          *pipep = i + 1;
+
+          if (ifcp)
+            *ifcp = iface;
+
+          if (interface_out)
+            *interface_out = cInterface;
+
+          usbi_dbg ("pipe %d on interface %d matches", *pipep, iface);
+          return 0;
+        }
+      }
+    }
+  }
+
+  /* No pipe found with the correct endpoint address */
+  usbi_warn (HANDLE_CTX(dev_handle), "no pipeRef found with endpoint address 0x%02x.", ep);
+
+  return LIBUSB_ERROR_NOT_FOUND;
+}
+
+static int usb_setup_device_iterator (io_iterator_t *deviceIterator, UInt32 location) {
+  CFMutableDictionaryRef matchingDict = IOServiceMatching(kIOUSBDeviceClassName);
+
+  if (!matchingDict)
+    return kIOReturnError;
+
+  if (location) {
+    CFMutableDictionaryRef propertyMatchDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
+                                                                         &kCFTypeDictionaryKeyCallBacks,
+                                                                         &kCFTypeDictionaryValueCallBacks);
+
+    if (propertyMatchDict) {
+      /* there are no unsigned CFNumber types so treat the value as signed. the os seems to do this
+         internally (CFNumberType of locationID is 3) */
+      CFTypeRef locationCF = CFNumberCreate (NULL, kCFNumberSInt32Type, &location);
+
+      CFDictionarySetValue (propertyMatchDict, CFSTR(kUSBDevicePropertyLocationID), locationCF);
+      /* release our reference to the CFNumber (CFDictionarySetValue retains it) */
+      CFRelease (locationCF);
+
+      CFDictionarySetValue (matchingDict, CFSTR(kIOPropertyMatchKey), propertyMatchDict);
+      /* release out reference to the CFMutableDictionaryRef (CFDictionarySetValue retains it) */
+      CFRelease (propertyMatchDict);
+    }
+    /* else we can still proceed as long as the caller accounts for the possibility of other devices in the iterator */
+  }
+
+  return IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, deviceIterator);
+}
+
+/* Returns 1 on success, 0 on failure. */
+static int get_ioregistry_value_number (io_service_t service, CFStringRef property, CFNumberType type, void *p) {
+  CFTypeRef cfNumber = IORegistryEntryCreateCFProperty (service, property, kCFAllocatorDefault, 0);
+  int ret = 0;
+
+  if (cfNumber) {
+    if (CFGetTypeID(cfNumber) == CFNumberGetTypeID()) {
+      ret = CFNumberGetValue(cfNumber, type, p);
+    }
+
+    CFRelease (cfNumber);
+  }
+
+  return ret;
+}
+
+static usb_device_t **darwin_device_from_service (io_service_t service)
+{
+  io_cf_plugin_ref_t *plugInInterface = NULL;
+  usb_device_t **device;
+  kern_return_t result;
+  SInt32 score;
+
+  result = IOCreatePlugInInterfaceForService(service, kIOUSBDeviceUserClientTypeID,
+                                             kIOCFPlugInInterfaceID, &plugInInterface,
+                                             &score);
+
+  if (kIOReturnSuccess != result || !plugInInterface) {
+    usbi_dbg ("could not set up plugin for service: %s\n", darwin_error_str (result));
+    return NULL;
+  }
+
+  (void)(*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(DeviceInterfaceID),
+                                           (LPVOID)&device);
+  /* Use release instead of IODestroyPlugInInterface to avoid stopping IOServices associated with this device */
+  (*plugInInterface)->Release (plugInInterface);
+
+  return device;
+}
+
+static void darwin_devices_attached (void *ptr, io_iterator_t add_devices) {
+  struct libusb_context *ctx;
+  io_service_t service;
+
+  usbi_mutex_lock(&active_contexts_lock);
+
+  while ((service = IOIteratorNext(add_devices))) {
+    /* add this device to each active context's device list */
+    list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) {
+      process_new_device (ctx, service);;
+    }
+
+    IOObjectRelease(service);
+  }
+
+  usbi_mutex_unlock(&active_contexts_lock);
+}
+
+static void darwin_devices_detached (void *ptr, io_iterator_t rem_devices) {
+  struct libusb_device *dev = NULL;
+  struct libusb_context *ctx;
+
+  io_service_t device;
+  UInt64 session;
+  int ret;
+
+  usbi_mutex_lock(&active_contexts_lock);
+
+  while ((device = IOIteratorNext (rem_devices)) != 0) {
+    /* get the location from the i/o registry */
+    ret = get_ioregistry_value_number (device, CFSTR("sessionID"), kCFNumberSInt64Type, &session);
+    IOObjectRelease (device);
+    if (!ret)
+      continue;
+
+    list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) {
+      usbi_dbg ("notifying context %p of device disconnect", ctx);
+
+      dev = usbi_get_device_by_session_id(ctx, (unsigned long) session);
+      if (dev) {
+        /* signal the core that this device has been disconnected. the core will tear down this device
+           when the reference count reaches 0 */
+        usbi_disconnect_device(dev);
+        libusb_unref_device(dev);
+      }
+    }
+  }
+
+  usbi_mutex_unlock(&active_contexts_lock);
+}
+
+static void darwin_hotplug_poll (void)
+{
+  /* not sure if 5 seconds will be too long/short but it should work ok */
+  mach_timespec_t timeout = {.tv_sec = 5, .tv_nsec = 0};
+
+  /* since a kernel thread may nodify the IOInterators used for
+   * hotplug notidication we can't just clear the iterators.
+   * instead just wait until all IOService providers are quiet */
+  (void) IOKitWaitQuiet (kIOMasterPortDefault, &timeout);
+}
+
+static void darwin_clear_iterator (io_iterator_t iter) {
+  io_service_t device;
+
+  while ((device = IOIteratorNext (iter)) != 0)
+    IOObjectRelease (device);
+}
+
+static void *darwin_event_thread_main (void *arg0) {
+  IOReturn kresult;
+  struct libusb_context *ctx = (struct libusb_context *)arg0;
+  CFRunLoopRef runloop;
+
+  /* Set this thread's name, so it can be seen in the debugger
+     and crash reports. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+  pthread_setname_np ("org.libusb.device-hotplug");
+
+  /* Tell the Objective-C garbage collector about this thread.
+     This is required because, unlike NSThreads, pthreads are
+     not automatically registered. Although we don't use
+     Objective-C, we use CoreFoundation, which does. */
+  objc_registerThreadWithCollector();
+#endif
+
+  /* hotplug (device arrival/removal) sources */
+  CFRunLoopSourceRef     libusb_notification_cfsource;
+  io_notification_port_t libusb_notification_port;
+  io_iterator_t          libusb_rem_device_iterator;
+  io_iterator_t          libusb_add_device_iterator;
+
+  usbi_dbg ("creating hotplug event source");
+
+  runloop = CFRunLoopGetCurrent ();
+  CFRetain (runloop);
+
+  /* add the notification port to the run loop */
+  libusb_notification_port     = IONotificationPortCreate (kIOMasterPortDefault);
+  libusb_notification_cfsource = IONotificationPortGetRunLoopSource (libusb_notification_port);
+  CFRunLoopAddSource(runloop, libusb_notification_cfsource, kCFRunLoopDefaultMode);
+
+  /* create notifications for removed devices */
+  kresult = IOServiceAddMatchingNotification (libusb_notification_port, kIOTerminatedNotification,
+                                              IOServiceMatching(kIOUSBDeviceClassName),
+                                              darwin_devices_detached,
+                                              ctx, &libusb_rem_device_iterator);
+
+  if (kresult != kIOReturnSuccess) {
+    usbi_err (ctx, "could not add hotplug event source: %s", darwin_error_str (kresult));
+
+    pthread_exit (NULL);
+  }
+
+  /* create notifications for attached devices */
+  kresult = IOServiceAddMatchingNotification(libusb_notification_port, kIOFirstMatchNotification,
+                                              IOServiceMatching(kIOUSBDeviceClassName),
+                                              darwin_devices_attached,
+                                              ctx, &libusb_add_device_iterator);
+
+  if (kresult != kIOReturnSuccess) {
+    usbi_err (ctx, "could not add hotplug event source: %s", darwin_error_str (kresult));
+
+    pthread_exit (NULL);
+  }
+
+  /* arm notifiers */
+  darwin_clear_iterator (libusb_rem_device_iterator);
+  darwin_clear_iterator (libusb_add_device_iterator);
+
+  usbi_dbg ("darwin event thread ready to receive events");
+
+  /* signal the main thread that the hotplug runloop has been created. */
+  pthread_mutex_lock (&libusb_darwin_at_mutex);
+  libusb_darwin_acfl = runloop;
+  pthread_cond_signal (&libusb_darwin_at_cond);
+  pthread_mutex_unlock (&libusb_darwin_at_mutex);
+
+  /* run the runloop */
+  CFRunLoopRun();
+
+  usbi_dbg ("darwin event thread exiting");
+
+  /* remove the notification cfsource */
+  CFRunLoopRemoveSource(runloop, libusb_notification_cfsource, kCFRunLoopDefaultMode);
+
+  /* delete notification port */
+  IONotificationPortDestroy (libusb_notification_port);
+
+  /* delete iterators */
+  IOObjectRelease (libusb_rem_device_iterator);
+  IOObjectRelease (libusb_add_device_iterator);
+
+  CFRelease (runloop);
+
+  libusb_darwin_acfl = NULL;
+
+  pthread_exit (NULL);
+}
+
+/* cleanup function to destroy cached devices */
+static void __attribute__((destructor)) _darwin_finalize(void) {
+  struct darwin_cached_device *dev, *next;
+
+  usbi_mutex_lock(&darwin_cached_devices_lock);
+  list_for_each_entry_safe(dev, next, &darwin_cached_devices, list, struct darwin_cached_device) {
+    darwin_deref_cached_device(dev);
+  }
+  usbi_mutex_unlock(&darwin_cached_devices_lock);
+}
+
+static int darwin_init(struct libusb_context *ctx) {
+  host_name_port_t host_self;
+  int rc;
+
+  rc = darwin_scan_devices (ctx);
+  if (LIBUSB_SUCCESS != rc) {
+    return rc;
+  }
+
+  if (OSAtomicIncrement32Barrier(&initCount) == 1) {
+    /* create the clocks that will be used */
+
+    host_self = mach_host_self();
+    host_get_clock_service(host_self, CALENDAR_CLOCK, &clock_realtime);
+    host_get_clock_service(host_self, SYSTEM_CLOCK, &clock_monotonic);
+    mach_port_deallocate(mach_task_self(), host_self);
+
+    pthread_create (&libusb_darwin_at, NULL, darwin_event_thread_main, ctx);
+
+    pthread_mutex_lock (&libusb_darwin_at_mutex);
+    while (!libusb_darwin_acfl)
+      pthread_cond_wait (&libusb_darwin_at_cond, &libusb_darwin_at_mutex);
+    pthread_mutex_unlock (&libusb_darwin_at_mutex);
+  }
+
+  return rc;
+}
+
+static void darwin_exit (void) {
+  if (OSAtomicDecrement32Barrier(&initCount) == 0) {
+    mach_port_deallocate(mach_task_self(), clock_realtime);
+    mach_port_deallocate(mach_task_self(), clock_monotonic);
+
+    /* stop the event runloop and wait for the thread to terminate. */
+    CFRunLoopStop (libusb_darwin_acfl);
+    pthread_join (libusb_darwin_at, NULL);
+  }
+}
+
+static int darwin_get_device_descriptor(struct libusb_device *dev, unsigned char *buffer, int *host_endian) {
+  struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
+
+  /* return cached copy */
+  memmove (buffer, &(priv->dev_descriptor), DEVICE_DESC_LENGTH);
+
+  *host_endian = 0;
+
+  return 0;
+}
+
+static int get_configuration_index (struct libusb_device *dev, int config_value) {
+  struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
+  UInt8 i, numConfig;
+  IOUSBConfigurationDescriptorPtr desc;
+  IOReturn kresult;
+
+  /* is there a simpler way to determine the index? */
+  kresult = (*(priv->device))->GetNumberOfConfigurations (priv->device, &numConfig);
+  if (kresult != kIOReturnSuccess)
+    return darwin_to_libusb (kresult);
+
+  for (i = 0 ; i < numConfig ; i++) {
+    (*(priv->device))->GetConfigurationDescriptorPtr (priv->device, i, &desc);
+
+    if (desc->bConfigurationValue == config_value)
+      return i;
+  }
+
+  /* configuration not found */
+  return LIBUSB_ERROR_NOT_FOUND;
+}
+
+static int darwin_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len, int *host_endian) {
+  struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
+  int config_index;
+
+  if (0 == priv->active_config)
+    return LIBUSB_ERROR_NOT_FOUND;
+
+  config_index = get_configuration_index (dev, priv->active_config);
+  if (config_index < 0)
+    return config_index;
+
+  return darwin_get_config_descriptor (dev, config_index, buffer, len, host_endian);
+}
+
+static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian) {
+  struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
+  IOUSBConfigurationDescriptorPtr desc;
+  IOReturn kresult;
+  int ret;
+
+  if (!priv || !priv->device)
+    return LIBUSB_ERROR_OTHER;
+
+  kresult = (*priv->device)->GetConfigurationDescriptorPtr (priv->device, config_index, &desc);
+  if (kresult == kIOReturnSuccess) {
+    /* copy descriptor */
+    if (libusb_le16_to_cpu(desc->wTotalLength) < len)
+      len = libusb_le16_to_cpu(desc->wTotalLength);
+
+    memmove (buffer, desc, len);
+
+    /* GetConfigurationDescriptorPtr returns the descriptor in USB bus order */
+    *host_endian = 0;
+  }
+
+  ret = darwin_to_libusb (kresult);
+  if (ret != LIBUSB_SUCCESS)
+    return ret;
+
+  return (int) len;
+}
+
+/* check whether the os has configured the device */
+static int darwin_check_configuration (struct libusb_context *ctx, struct darwin_cached_device *dev) {
+  usb_device_t **darwin_device = dev->device;
+
+  IOUSBConfigurationDescriptorPtr configDesc;
+  IOUSBFindInterfaceRequest request;
+  kern_return_t             kresult;
+  io_iterator_t             interface_iterator;
+  io_service_t              firstInterface;
+
+  if (dev->dev_descriptor.bNumConfigurations < 1) {
+    usbi_err (ctx, "device has no configurations");
+    return LIBUSB_ERROR_OTHER; /* no configurations at this speed so we can't use it */
+  }
+
+  /* find the first configuration */
+  kresult = (*darwin_device)->GetConfigurationDescriptorPtr (darwin_device, 0, &configDesc);
+  dev->first_config = (kIOReturnSuccess == kresult) ? configDesc->bConfigurationValue : 1;
+
+  /* check if the device is already configured. there is probably a better way than iterating over the
+     to accomplish this (the trick is we need to avoid a call to GetConfigurations since buggy devices
+     might lock up on the device request) */
+
+  /* Setup the Interface Request */
+  request.bInterfaceClass    = kIOUSBFindInterfaceDontCare;
+  request.bInterfaceSubClass = kIOUSBFindInterfaceDontCare;
+  request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;
+  request.bAlternateSetting  = kIOUSBFindInterfaceDontCare;
+
+  kresult = (*(darwin_device))->CreateInterfaceIterator(darwin_device, &request, &interface_iterator);
+  if (kresult)
+    return darwin_to_libusb (kresult);
+
+  /* iterate once */
+  firstInterface = IOIteratorNext(interface_iterator);
+
+  /* done with the interface iterator */
+  IOObjectRelease(interface_iterator);
+
+  if (firstInterface) {
+    IOObjectRelease (firstInterface);
+
+    /* device is configured */
+    if (dev->dev_descriptor.bNumConfigurations == 1)
+      /* to avoid problems with some devices get the configurations value from the configuration descriptor */
+      dev->active_config = dev->first_config;
+    else
+      /* devices with more than one configuration should work with GetConfiguration */
+      (*darwin_device)->GetConfiguration (darwin_device, &dev->active_config);
+  } else
+    /* not configured */
+    dev->active_config = 0;
+  
+  usbi_dbg ("active config: %u, first config: %u", dev->active_config, dev->first_config);
+
+  return 0;
+}
+
+static int darwin_request_descriptor (usb_device_t **device, UInt8 desc, UInt8 desc_index, void *buffer, size_t buffer_size) {
+  IOUSBDevRequestTO req;
+
+  memset (buffer, 0, buffer_size);
+
+  /* Set up request for descriptor/ */
+  req.bmRequestType = USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);
+  req.bRequest      = kUSBRqGetDescriptor;
+  req.wValue        = desc << 8;
+  req.wIndex        = desc_index;
+  req.wLength       = buffer_size;
+  req.pData         = buffer;
+  req.noDataTimeout = 20;
+  req.completionTimeout = 100;
+
+  return (*device)->DeviceRequestTO (device, &req);
+}
+
+static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct darwin_cached_device *dev) {
+  usb_device_t **device = dev->device;
+  int retries = 1, delay = 30000;
+  int unsuspended = 0, try_unsuspend = 1, try_reconfigure = 1;
+  int is_open = 0;
+  int ret = 0, ret2;
+  UInt8 bDeviceClass;
+  UInt16 idProduct, idVendor;
+
+  dev->can_enumerate = 0;
+
+  (*device)->GetDeviceClass (device, &bDeviceClass);
+  (*device)->GetDeviceProduct (device, &idProduct);
+  (*device)->GetDeviceVendor (device, &idVendor);
+
+  /* According to Apple's documentation the device must be open for DeviceRequest but we may not be able to open some
+   * devices and Apple's USB Prober doesn't bother to open the device before issuing a descriptor request.  Still,
+   * to follow the spec as closely as possible, try opening the device */
+  is_open = ((*device)->USBDeviceOpenSeize(device) == kIOReturnSuccess);
+
+  do {
+    /**** retrieve device descriptor ****/
+    ret = darwin_request_descriptor (device, kUSBDeviceDesc, 0, &dev->dev_descriptor, sizeof(dev->dev_descriptor));
+
+    if (kIOReturnOverrun == ret && kUSBDeviceDesc == dev->dev_descriptor.bDescriptorType)
+      /* received an overrun error but we still received a device descriptor */
+      ret = kIOReturnSuccess;
+
+    if (kIOUSBVendorIDAppleComputer == idVendor) {
+      /* NTH: don't bother retrying or unsuspending Apple devices */
+      break;
+    }
+
+    if (kIOReturnSuccess == ret && (0 == dev->dev_descriptor.bNumConfigurations ||
+                                    0 == dev->dev_descriptor.bcdUSB)) {
+      /* work around for incorrectly configured devices */
+      if (try_reconfigure && is_open) {
+        usbi_dbg("descriptor appears to be invalid. resetting configuration before trying again...");
+
+        /* set the first configuration */
+        (*device)->SetConfiguration(device, 1);
+
+        /* don't try to reconfigure again */
+        try_reconfigure = 0;
+      }
+
+      ret = kIOUSBPipeStalled;
+    }
+
+    if (kIOReturnSuccess != ret && is_open && try_unsuspend) {
+      /* device may be suspended. unsuspend it and try again */
+#if DeviceVersion >= 320
+      UInt32 info = 0;
+
+      /* IOUSBFamily 320+ provides a way to detect device suspension but earlier versions do not */
+      (void)(*device)->GetUSBDeviceInformation (device, &info);
+
+      /* note that the device was suspended */
+      if (info & (1 << kUSBInformationDeviceIsSuspendedBit) || 0 == info)
+        try_unsuspend = 1;
+#endif
+
+      if (try_unsuspend) {
+        /* try to unsuspend the device */
+        ret2 = (*device)->USBDeviceSuspend (device, 0);
+        if (kIOReturnSuccess != ret2) {
+          /* prevent log spew from poorly behaving devices.  this indicates the
+             os actually had trouble communicating with the device */
+          usbi_dbg("could not retrieve device descriptor. failed to unsuspend: %s",darwin_error_str(ret2));
+        } else
+          unsuspended = 1;
+
+        try_unsuspend = 0;
+      }
+    }
+
+    if (kIOReturnSuccess != ret) {
+      usbi_dbg("kernel responded with code: 0x%08x. sleeping for %d ms before trying again", ret, delay/1000);
+      /* sleep for a little while before trying again */
+      usleep (delay);
+    }
+  } while (kIOReturnSuccess != ret && retries--);
+
+  if (unsuspended)
+    /* resuspend the device */
+    (void)(*device)->USBDeviceSuspend (device, 1);
+
+  if (is_open)
+    (void) (*device)->USBDeviceClose (device);
+
+  if (ret != kIOReturnSuccess) {
+    /* a debug message was already printed out for this error */
+    if (LIBUSB_CLASS_HUB == bDeviceClass)
+      usbi_dbg ("could not retrieve device descriptor %.4x:%.4x: %s (%x). skipping device",
+                idVendor, idProduct, darwin_error_str (ret), ret);
+    else
+      usbi_warn (ctx, "could not retrieve device descriptor %.4x:%.4x: %s (%x). skipping device",
+                 idVendor, idProduct, darwin_error_str (ret), ret);
+    return darwin_to_libusb (ret);
+  }
+
+  /* catch buggy hubs (which appear to be virtual). Apple's own USB prober has problems with these devices. */
+  if (libusb_le16_to_cpu (dev->dev_descriptor.idProduct) != idProduct) {
+    /* not a valid device */
+    usbi_warn (ctx, "idProduct from iokit (%04x) does not match idProduct in descriptor (%04x). skipping device",
+               idProduct, libusb_le16_to_cpu (dev->dev_descriptor.idProduct));
+    return LIBUSB_ERROR_NO_DEVICE;
+  }
+
+  usbi_dbg ("cached device descriptor:");
+  usbi_dbg ("  bDescriptorType:    0x%02x", dev->dev_descriptor.bDescriptorType);
+  usbi_dbg ("  bcdUSB:             0x%04x", dev->dev_descriptor.bcdUSB);
+  usbi_dbg ("  bDeviceClass:       0x%02x", dev->dev_descriptor.bDeviceClass);
+  usbi_dbg ("  bDeviceSubClass:    0x%02x", dev->dev_descriptor.bDeviceSubClass);
+  usbi_dbg ("  bDeviceProtocol:    0x%02x", dev->dev_descriptor.bDeviceProtocol);
+  usbi_dbg ("  bMaxPacketSize0:    0x%02x", dev->dev_descriptor.bMaxPacketSize0);
+  usbi_dbg ("  idVendor:           0x%04x", dev->dev_descriptor.idVendor);
+  usbi_dbg ("  idProduct:          0x%04x", dev->dev_descriptor.idProduct);
+  usbi_dbg ("  bcdDevice:          0x%04x", dev->dev_descriptor.bcdDevice);
+  usbi_dbg ("  iManufacturer:      0x%02x", dev->dev_descriptor.iManufacturer);
+  usbi_dbg ("  iProduct:           0x%02x", dev->dev_descriptor.iProduct);
+  usbi_dbg ("  iSerialNumber:      0x%02x", dev->dev_descriptor.iSerialNumber);
+  usbi_dbg ("  bNumConfigurations: 0x%02x", dev->dev_descriptor.bNumConfigurations);
+
+  dev->can_enumerate = 1;
+
+  return LIBUSB_SUCCESS;
+}
+
+static int darwin_get_cached_device(struct libusb_context *ctx, io_service_t service,
+                                    struct darwin_cached_device **cached_out) {
+  struct darwin_cached_device *new_device;
+  UInt64 sessionID = 0, parent_sessionID = 0;
+  int ret = LIBUSB_SUCCESS;
+  usb_device_t **device;
+  io_service_t parent;
+  kern_return_t result;
+  UInt8 port = 0;
+
+  /* get some info from the io registry */
+  (void) get_ioregistry_value_number (service, CFSTR("sessionID"), kCFNumberSInt64Type, &sessionID);
+  (void) get_ioregistry_value_number (service, CFSTR("PortNum"), kCFNumberSInt8Type, &port);
+
+  usbi_dbg("finding cached device for sessionID 0x%" PRIx64, sessionID);
+
+  result = IORegistryEntryGetParentEntry (service, kIOUSBPlane, &parent);
+
+  if (kIOReturnSuccess == result) {
+    (void) get_ioregistry_value_number (parent, CFSTR("sessionID"), kCFNumberSInt64Type, &parent_sessionID);
+    IOObjectRelease(parent);
+  }
+
+  usbi_mutex_lock(&darwin_cached_devices_lock);
+  do {
+    *cached_out = NULL;
+
+    list_for_each_entry(new_device, &darwin_cached_devices, list, struct darwin_cached_device) {
+      usbi_dbg("matching sessionID 0x%" PRIx64 " against cached device with sessionID 0x%" PRIx64, sessionID, new_device->session);
+      if (new_device->session == sessionID) {
+        usbi_dbg("using cached device for device");
+        *cached_out = new_device;
+        break;
+      }
+    }
+
+    if (*cached_out)
+      break;
+
+    usbi_dbg("caching new device with sessionID 0x%" PRIx64, sessionID);
+
+    device = darwin_device_from_service (service);
+    if (!device) {
+      ret = LIBUSB_ERROR_NO_DEVICE;
+      break;
+    }
+
+    new_device = calloc (1, sizeof (*new_device));
+    if (!new_device) {
+      ret = LIBUSB_ERROR_NO_MEM;
+      break;
+    }
+
+    /* add this device to the cached device list */
+    list_add(&new_device->list, &darwin_cached_devices);
+
+    (*device)->GetDeviceAddress (device, (USBDeviceAddress *)&new_device->address);
+
+    /* keep a reference to this device */
+    darwin_ref_cached_device(new_device);
+
+    new_device->device = device;
+    new_device->session = sessionID;
+    (*device)->GetLocationID (device, &new_device->location);
+    new_device->port = port;
+    new_device->parent_session = parent_sessionID;
+
+    /* cache the device descriptor */
+    ret = darwin_cache_device_descriptor(ctx, new_device);
+    if (ret)
+      break;
+
+    if (new_device->can_enumerate) {
+      snprintf(new_device->sys_path, 20, "%03i-%04x-%04x-%02x-%02x", new_device->address,
+               new_device->dev_descriptor.idVendor, new_device->dev_descriptor.idProduct,
+               new_device->dev_descriptor.bDeviceClass, new_device->dev_descriptor.bDeviceSubClass);
+    }
+  } while (0);
+
+  usbi_mutex_unlock(&darwin_cached_devices_lock);
+
+  /* keep track of devices regardless of if we successfully enumerate them to
+     prevent them from being enumerated multiple times */
+
+  *cached_out = new_device;
+
+  return ret;
+}
+
+static int process_new_device (struct libusb_context *ctx, io_service_t service) {
+  struct darwin_device_priv *priv;
+  struct libusb_device *dev = NULL;
+  struct darwin_cached_device *cached_device;
+  UInt8 devSpeed;
+  int ret = 0;
+
+  do {
+    ret = darwin_get_cached_device (ctx, service, &cached_device);
+
+    if (ret < 0 || !cached_device->can_enumerate) {
+      return ret;
+    }
+
+    /* check current active configuration (and cache the first configuration value--
+       which may be used by claim_interface) */
+    ret = darwin_check_configuration (ctx, cached_device);
+    if (ret)
+      break;
+
+    usbi_dbg ("allocating new device in context %p for with session 0x%" PRIx64,
+              ctx, cached_device->session);
+
+    dev = usbi_alloc_device(ctx, (unsigned long) cached_device->session);
+    if (!dev) {
+      return LIBUSB_ERROR_NO_MEM;
+    }
+
+    priv = (struct darwin_device_priv *)dev->os_priv;
+
+    priv->dev = cached_device;
+    darwin_ref_cached_device (priv->dev);
+
+    if (cached_device->parent_session > 0) {
+      dev->parent_dev = usbi_get_device_by_session_id (ctx, (unsigned long) cached_device->parent_session);
+    } else {
+      dev->parent_dev = NULL;
+    }
+    dev->port_number    = cached_device->port;
+    dev->bus_number     = cached_device->location >> 24;
+    dev->device_address = cached_device->address;
+
+    (*(priv->dev->device))->GetDeviceSpeed (priv->dev->device, &devSpeed);
+
+    switch (devSpeed) {
+    case kUSBDeviceSpeedLow: dev->speed = LIBUSB_SPEED_LOW; break;
+    case kUSBDeviceSpeedFull: dev->speed = LIBUSB_SPEED_FULL; break;
+    case kUSBDeviceSpeedHigh: dev->speed = LIBUSB_SPEED_HIGH; break;
+#if DeviceVersion >= 500
+    case kUSBDeviceSpeedSuper: dev->speed = LIBUSB_SPEED_SUPER; break;
+#endif
+    default:
+      usbi_warn (ctx, "Got unknown device speed %d", devSpeed);
+    }
+
+    ret = usbi_sanitize_device (dev);
+    if (ret < 0)
+      break;
+
+    usbi_dbg ("found device with address %d port = %d parent = %p at %p", dev->device_address,
+              dev->port_number, (void *) dev->parent_dev, priv->dev->sys_path);
+  } while (0);
+
+  if (0 == ret) {
+    usbi_connect_device (dev);
+  } else {
+    libusb_unref_device (dev);
+  }
+
+  return ret;
+}
+
+static int darwin_scan_devices(struct libusb_context *ctx) {
+  io_iterator_t deviceIterator;
+  io_service_t service;
+  kern_return_t kresult;
+
+  kresult = usb_setup_device_iterator (&deviceIterator, 0);
+  if (kresult != kIOReturnSuccess)
+    return darwin_to_libusb (kresult);
+
+  while ((service = IOIteratorNext (deviceIterator))) {
+    (void) process_new_device (ctx, service);
+
+    IOObjectRelease(service);
+  }
+
+  IOObjectRelease(deviceIterator);
+
+  return 0;
+}
+
+static int darwin_open (struct libusb_device_handle *dev_handle) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  IOReturn kresult;
+
+  if (0 == dpriv->open_count) {
+    /* try to open the device */
+    kresult = (*(dpriv->device))->USBDeviceOpenSeize (dpriv->device);
+    if (kresult != kIOReturnSuccess) {
+      usbi_warn (HANDLE_CTX (dev_handle), "USBDeviceOpen: %s", darwin_error_str(kresult));
+
+      if (kIOReturnExclusiveAccess != kresult) {
+        return darwin_to_libusb (kresult);
+      }
+
+      /* it is possible to perform some actions on a device that is not open so do not return an error */
+      priv->is_open = 0;
+    } else {
+      priv->is_open = 1;
+    }
+
+    /* create async event source */
+    kresult = (*(dpriv->device))->CreateDeviceAsyncEventSource (dpriv->device, &priv->cfSource);
+    if (kresult != kIOReturnSuccess) {
+      usbi_err (HANDLE_CTX (dev_handle), "CreateDeviceAsyncEventSource: %s", darwin_error_str(kresult));
+
+      if (priv->is_open) {
+        (*(dpriv->device))->USBDeviceClose (dpriv->device);
+      }
+
+      priv->is_open = 0;
+
+      return darwin_to_libusb (kresult);
+    }
+
+    CFRetain (libusb_darwin_acfl);
+
+    /* add the cfSource to the aync run loop */
+    CFRunLoopAddSource(libusb_darwin_acfl, priv->cfSource, kCFRunLoopCommonModes);
+  }
+
+  /* device opened successfully */
+  dpriv->open_count++;
+
+  /* create a file descriptor for notifications */
+  pipe (priv->fds);
+
+  /* set the pipe to be non-blocking */
+  fcntl (priv->fds[1], F_SETFD, O_NONBLOCK);
+
+  usbi_add_pollfd(HANDLE_CTX(dev_handle), priv->fds[0], POLLIN);
+
+  usbi_dbg ("device open for access");
+
+  return 0;
+}
+
+static void darwin_close (struct libusb_device_handle *dev_handle) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  IOReturn kresult;
+  int i;
+
+  if (dpriv->open_count == 0) {
+    /* something is probably very wrong if this is the case */
+    usbi_err (HANDLE_CTX (dev_handle), "Close called on a device that was not open!\n");
+    return;
+  }
+
+  dpriv->open_count--;
+
+  /* make sure all interfaces are released */
+  for (i = 0 ; i < USB_MAXINTERFACES ; i++)
+    if (dev_handle->claimed_interfaces & (1 << i))
+      libusb_release_interface (dev_handle, i);
+
+  if (0 == dpriv->open_count) {
+    /* delete the device's async event source */
+    if (priv->cfSource) {
+      CFRunLoopRemoveSource (libusb_darwin_acfl, priv->cfSource, kCFRunLoopDefaultMode);
+      CFRelease (priv->cfSource);
+      priv->cfSource = NULL;
+      CFRelease (libusb_darwin_acfl);
+    }
+
+    if (priv->is_open) {
+      /* close the device */
+      kresult = (*(dpriv->device))->USBDeviceClose(dpriv->device);
+      if (kresult) {
+        /* Log the fact that we had a problem closing the file, however failing a
+         * close isn't really an error, so return success anyway */
+        usbi_warn (HANDLE_CTX (dev_handle), "USBDeviceClose: %s", darwin_error_str(kresult));
+      }
+    }
+  }
+
+  /* file descriptors are maintained per-instance */
+  usbi_remove_pollfd (HANDLE_CTX (dev_handle), priv->fds[0]);
+  close (priv->fds[1]);
+  close (priv->fds[0]);
+
+  priv->fds[0] = priv->fds[1] = -1;
+}
+
+static int darwin_get_configuration(struct libusb_device_handle *dev_handle, int *config) {
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+
+  *config = (int) dpriv->active_config;
+
+  return 0;
+}
+
+static int darwin_set_configuration(struct libusb_device_handle *dev_handle, int config) {
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  IOReturn kresult;
+  int i;
+
+  /* Setting configuration will invalidate the interface, so we need
+     to reclaim it. First, dispose of existing interfaces, if any. */
+  for (i = 0 ; i < USB_MAXINTERFACES ; i++)
+    if (dev_handle->claimed_interfaces & (1 << i))
+      darwin_release_interface (dev_handle, i);
+
+  kresult = (*(dpriv->device))->SetConfiguration (dpriv->device, config);
+  if (kresult != kIOReturnSuccess)
+    return darwin_to_libusb (kresult);
+
+  /* Reclaim any interfaces. */
+  for (i = 0 ; i < USB_MAXINTERFACES ; i++)
+    if (dev_handle->claimed_interfaces & (1 << i))
+      darwin_claim_interface (dev_handle, i);
+
+  dpriv->active_config = config;
+
+  return 0;
+}
+
+static int darwin_get_interface (usb_device_t **darwin_device, uint8_t ifc, io_service_t *usbInterfacep) {
+  IOUSBFindInterfaceRequest request;
+  kern_return_t             kresult;
+  io_iterator_t             interface_iterator;
+  UInt8                     bInterfaceNumber;
+  int                       ret;
+
+  *usbInterfacep = IO_OBJECT_NULL;
+
+  /* Setup the Interface Request */
+  request.bInterfaceClass    = kIOUSBFindInterfaceDontCare;
+  request.bInterfaceSubClass = kIOUSBFindInterfaceDontCare;
+  request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;
+  request.bAlternateSetting  = kIOUSBFindInterfaceDontCare;
+
+  kresult = (*(darwin_device))->CreateInterfaceIterator(darwin_device, &request, &interface_iterator);
+  if (kresult)
+    return kresult;
+
+  while ((*usbInterfacep = IOIteratorNext(interface_iterator))) {
+    /* find the interface number */
+    ret = get_ioregistry_value_number (*usbInterfacep, CFSTR("bInterfaceNumber"), kCFNumberSInt8Type,
+                                       &bInterfaceNumber);
+
+    if (ret && bInterfaceNumber == ifc) {
+      break;
+    }
+
+    (void) IOObjectRelease (*usbInterfacep);
+  }
+
+  /* done with the interface iterator */
+  IOObjectRelease(interface_iterator);
+
+  return 0;
+}
+
+static int get_endpoints (struct libusb_device_handle *dev_handle, int iface) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+
+  /* current interface */
+  struct darwin_interface *cInterface = &priv->interfaces[iface];
+
+  kern_return_t kresult;
+
+  u_int8_t numep, direction, number;
+  u_int8_t dont_care1, dont_care3;
+  u_int16_t dont_care2;
+  int i;
+
+  usbi_dbg ("building table of endpoints.");
+
+  /* retrieve the total number of endpoints on this interface */
+  kresult = (*(cInterface->interface))->GetNumEndpoints(cInterface->interface, &numep);
+  if (kresult) {
+    usbi_err (HANDLE_CTX (dev_handle), "can't get number of endpoints for interface: %s", darwin_error_str(kresult));
+    return darwin_to_libusb (kresult);
+  }
+
+  /* iterate through pipe references */
+  for (i = 1 ; i <= numep ; i++) {
+    kresult = (*(cInterface->interface))->GetPipeProperties(cInterface->interface, i, &direction, &number, &dont_care1,
+                                                            &dont_care2, &dont_care3);
+
+    if (kresult != kIOReturnSuccess) {
+      usbi_err (HANDLE_CTX (dev_handle), "error getting pipe information for pipe %d: %s", i, darwin_error_str(kresult));
+
+      return darwin_to_libusb (kresult);
+    }
+
+    usbi_dbg ("interface: %i pipe %i: dir: %i number: %i", iface, i, direction, number);
+
+    cInterface->endpoint_addrs[i - 1] = (((kUSBIn == direction) << kUSBRqDirnShift) | (number & LIBUSB_ENDPOINT_ADDRESS_MASK));
+  }
+
+  cInterface->num_endpoints = numep;
+
+  return 0;
+}
+
+static int darwin_claim_interface(struct libusb_device_handle *dev_handle, int iface) {
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+  io_service_t          usbInterface = IO_OBJECT_NULL;
+  IOReturn kresult;
+  IOCFPlugInInterface **plugInInterface = NULL;
+  SInt32                score;
+
+  /* current interface */
+  struct darwin_interface *cInterface = &priv->interfaces[iface];
+
+  kresult = darwin_get_interface (dpriv->device, iface, &usbInterface);
+  if (kresult != kIOReturnSuccess)
+    return darwin_to_libusb (kresult);
+
+  /* make sure we have an interface */
+  if (!usbInterface && dpriv->first_config != 0) {
+    usbi_info (HANDLE_CTX (dev_handle), "no interface found; setting configuration: %d", dpriv->first_config);
+
+    /* set the configuration */
+    kresult = darwin_set_configuration (dev_handle, dpriv->first_config);
+    if (kresult != LIBUSB_SUCCESS) {
+      usbi_err (HANDLE_CTX (dev_handle), "could not set configuration");
+      return kresult;
+    }
+
+    kresult = darwin_get_interface (dpriv->device, iface, &usbInterface);
+    if (kresult) {
+      usbi_err (HANDLE_CTX (dev_handle), "darwin_get_interface: %s", darwin_error_str(kresult));
+      return darwin_to_libusb (kresult);
+    }
+  }
+
+  if (!usbInterface) {
+    usbi_err (HANDLE_CTX (dev_handle), "interface not found");
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  /* get an interface to the device's interface */
+  kresult = IOCreatePlugInInterfaceForService (usbInterface, kIOUSBInterfaceUserClientTypeID,
+                                               kIOCFPlugInInterfaceID, &plugInInterface, &score);
+
+  /* ignore release error */
+  (void)IOObjectRelease (usbInterface);
+
+  if (kresult) {
+    usbi_err (HANDLE_CTX (dev_handle), "IOCreatePlugInInterfaceForService: %s", darwin_error_str(kresult));
+    return darwin_to_libusb (kresult);
+  }
+
+  if (!plugInInterface) {
+    usbi_err (HANDLE_CTX (dev_handle), "plugin interface not found");
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  /* Do the actual claim */
+  kresult = (*plugInInterface)->QueryInterface(plugInInterface,
+                                               CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID),
+                                               (LPVOID)&cInterface->interface);
+  /* We no longer need the intermediate plug-in */
+  /* Use release instead of IODestroyPlugInInterface to avoid stopping IOServices associated with this device */
+  (*plugInInterface)->Release (plugInInterface);
+  if (kresult || !cInterface->interface) {
+    usbi_err (HANDLE_CTX (dev_handle), "QueryInterface: %s", darwin_error_str(kresult));
+    return darwin_to_libusb (kresult);
+  }
+
+  /* claim the interface */
+  kresult = (*(cInterface->interface))->USBInterfaceOpen(cInterface->interface);
+  if (kresult) {
+    usbi_err (HANDLE_CTX (dev_handle), "USBInterfaceOpen: %s", darwin_error_str(kresult));
+    return darwin_to_libusb (kresult);
+  }
+
+  /* update list of endpoints */
+  kresult = get_endpoints (dev_handle, iface);
+  if (kresult) {
+    /* this should not happen */
+    darwin_release_interface (dev_handle, iface);
+    usbi_err (HANDLE_CTX (dev_handle), "could not build endpoint table");
+    return kresult;
+  }
+
+  cInterface->cfSource = NULL;
+
+  /* create async event source */
+  kresult = (*(cInterface->interface))->CreateInterfaceAsyncEventSource (cInterface->interface, &cInterface->cfSource);
+  if (kresult != kIOReturnSuccess) {
+    usbi_err (HANDLE_CTX (dev_handle), "could not create async event source");
+
+    /* can't continue without an async event source */
+    (void)darwin_release_interface (dev_handle, iface);
+
+    return darwin_to_libusb (kresult);
+  }
+
+  /* add the cfSource to the async thread's run loop */
+  CFRunLoopAddSource(libusb_darwin_acfl, cInterface->cfSource, kCFRunLoopDefaultMode);
+
+  usbi_dbg ("interface opened");
+
+  return 0;
+}
+
+static int darwin_release_interface(struct libusb_device_handle *dev_handle, int iface) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+  IOReturn kresult;
+
+  /* current interface */
+  struct darwin_interface *cInterface = &priv->interfaces[iface];
+
+  /* Check to see if an interface is open */
+  if (!cInterface->interface)
+    return LIBUSB_SUCCESS;
+
+  /* clean up endpoint data */
+  cInterface->num_endpoints = 0;
+
+  /* delete the interface's async event source */
+  if (cInterface->cfSource) {
+    CFRunLoopRemoveSource (libusb_darwin_acfl, cInterface->cfSource, kCFRunLoopDefaultMode);
+    CFRelease (cInterface->cfSource);
+  }
+
+  kresult = (*(cInterface->interface))->USBInterfaceClose(cInterface->interface);
+  if (kresult)
+    usbi_warn (HANDLE_CTX (dev_handle), "USBInterfaceClose: %s", darwin_error_str(kresult));
+
+  kresult = (*(cInterface->interface))->Release(cInterface->interface);
+  if (kresult != kIOReturnSuccess)
+    usbi_warn (HANDLE_CTX (dev_handle), "Release: %s", darwin_error_str(kresult));
+
+  cInterface->interface = IO_OBJECT_NULL;
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting) {
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)dev_handle->os_priv;
+  IOReturn kresult;
+
+  /* current interface */
+  struct darwin_interface *cInterface = &priv->interfaces[iface];
+
+  if (!cInterface->interface)
+    return LIBUSB_ERROR_NO_DEVICE;
+
+  kresult = (*(cInterface->interface))->SetAlternateInterface (cInterface->interface, altsetting);
+  if (kresult != kIOReturnSuccess)
+    darwin_reset_device (dev_handle);
+
+  /* update list of endpoints */
+  kresult = get_endpoints (dev_handle, iface);
+  if (kresult) {
+    /* this should not happen */
+    darwin_release_interface (dev_handle, iface);
+    usbi_err (HANDLE_CTX (dev_handle), "could not build endpoint table");
+    return kresult;
+  }
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint) {
+  /* current interface */
+  struct darwin_interface *cInterface;
+  IOReturn kresult;
+  uint8_t pipeRef;
+
+  /* determine the interface/endpoint to use */
+  if (ep_to_pipeRef (dev_handle, endpoint, &pipeRef, NULL, &cInterface) != 0) {
+    usbi_err (HANDLE_CTX (dev_handle), "endpoint not found on any open interface");
+
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  /* newer versions of darwin support clearing additional bits on the device's endpoint */
+  kresult = (*(cInterface->interface))->ClearPipeStallBothEnds(cInterface->interface, pipeRef);
+  if (kresult)
+    usbi_warn (HANDLE_CTX (dev_handle), "ClearPipeStall: %s", darwin_error_str (kresult));
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_reset_device(struct libusb_device_handle *dev_handle) {
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  IOUSBDeviceDescriptor descriptor;
+  IOUSBConfigurationDescriptorPtr cached_configuration;
+  IOUSBConfigurationDescriptor configuration;
+  bool reenumerate = false;
+  IOReturn kresult;
+  int i;
+
+  kresult = (*(dpriv->device))->ResetDevice (dpriv->device);
+  if (kresult) {
+    usbi_err (HANDLE_CTX (dev_handle), "ResetDevice: %s", darwin_error_str (kresult));
+    return darwin_to_libusb (kresult);
+  }
+
+  do {
+    usbi_dbg ("darwin/reset_device: checking if device descriptor changed");
+
+    /* ignore return code. if we can't get a descriptor it might be worthwhile re-enumerating anway */
+    (void) darwin_request_descriptor (dpriv->device, kUSBDeviceDesc, 0, &descriptor, sizeof (descriptor));
+
+    /* check if the device descriptor has changed */
+    if (0 != memcmp (&dpriv->dev_descriptor, &descriptor, sizeof (descriptor))) {
+      reenumerate = true;
+      break;
+    }
+
+    /* check if any configuration descriptor has changed */
+    for (i = 0 ; i < descriptor.bNumConfigurations ; ++i) {
+      usbi_dbg ("darwin/reset_device: checking if configuration descriptor %d changed", i);
+
+      (void) darwin_request_descriptor (dpriv->device, kUSBConfDesc, i, &configuration, sizeof (configuration));
+      (*(dpriv->device))->GetConfigurationDescriptorPtr (dpriv->device, i, &cached_configuration);
+
+      if (!cached_configuration || 0 != memcmp (cached_configuration, &configuration, sizeof (configuration))) {
+        reenumerate = true;
+        break;
+      }
+    }
+  } while (0);
+
+  if (reenumerate) {
+    usbi_dbg ("darwin/reset_device: device requires reenumeration");
+    (void) (*(dpriv->device))->USBDeviceReEnumerate (dpriv->device, 0);
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  usbi_dbg ("darwin/reset_device: device reset complete");
+
+  return LIBUSB_SUCCESS;
+}
+
+static int darwin_kernel_driver_active(struct libusb_device_handle *dev_handle, int interface) {
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(dev_handle->dev);
+  io_service_t usbInterface;
+  CFTypeRef driver;
+  IOReturn kresult;
+
+  kresult = darwin_get_interface (dpriv->device, interface, &usbInterface);
+  if (kresult) {
+    usbi_err (HANDLE_CTX (dev_handle), "darwin_get_interface: %s", darwin_error_str(kresult));
+
+    return darwin_to_libusb (kresult);
+  }
+
+  driver = IORegistryEntryCreateCFProperty (usbInterface, kIOBundleIdentifierKey, kCFAllocatorDefault, 0);
+  IOObjectRelease (usbInterface);
+
+  if (driver) {
+    CFRelease (driver);
+
+    return 1;
+  }
+
+  /* no driver */
+  return 0;
+}
+
+/* attaching/detaching kernel drivers is not currently supported (maybe in the future?) */
+static int darwin_attach_kernel_driver (struct libusb_device_handle *dev_handle, int interface) {
+  (void)dev_handle;
+  (void)interface;
+  return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static int darwin_detach_kernel_driver (struct libusb_device_handle *dev_handle, int interface) {
+  (void)dev_handle;
+  (void)interface;
+  return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static void darwin_destroy_device(struct libusb_device *dev) {
+  struct darwin_device_priv *dpriv = (struct darwin_device_priv *) dev->os_priv;
+
+  if (dpriv->dev) {
+    /* need to hold the lock in case this is the last reference to the device */
+    usbi_mutex_lock(&darwin_cached_devices_lock);
+    darwin_deref_cached_device (dpriv->dev);
+    dpriv->dev = NULL;
+    usbi_mutex_unlock(&darwin_cached_devices_lock);
+  }
+}
+
+static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+  IOReturn               ret;
+  uint8_t                transferType;
+  /* None of the values below are used in libusbx for bulk transfers */
+  uint8_t                direction, number, interval, pipeRef;
+  uint16_t               maxPacketSize;
+
+  struct darwin_interface *cInterface;
+
+  if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) {
+    usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface");
+
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  ret = (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
+                                                       &transferType, &maxPacketSize, &interval);
+
+  if (ret) {
+    usbi_err (TRANSFER_CTX (transfer), "bulk transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out",
+              darwin_error_str(ret), ret);
+    return darwin_to_libusb (ret);
+  }
+
+  if (0 != (transfer->length % maxPacketSize)) {
+    /* do not need a zero packet */
+    transfer->flags &= ~LIBUSB_TRANSFER_ADD_ZERO_PACKET;
+  }
+
+  /* submit the request */
+  /* timeouts are unavailable on interrupt endpoints */
+  if (transferType == kUSBInterrupt) {
+    if (IS_XFERIN(transfer))
+      ret = (*(cInterface->interface))->ReadPipeAsync(cInterface->interface, pipeRef, transfer->buffer,
+                                                      transfer->length, darwin_async_io_callback, itransfer);
+    else
+      ret = (*(cInterface->interface))->WritePipeAsync(cInterface->interface, pipeRef, transfer->buffer,
+                                                       transfer->length, darwin_async_io_callback, itransfer);
+  } else {
+    itransfer->flags |= USBI_TRANSFER_OS_HANDLES_TIMEOUT;
+
+    if (IS_XFERIN(transfer))
+      ret = (*(cInterface->interface))->ReadPipeAsyncTO(cInterface->interface, pipeRef, transfer->buffer,
+                                                        transfer->length, transfer->timeout, transfer->timeout,
+                                                        darwin_async_io_callback, (void *)itransfer);
+    else
+      ret = (*(cInterface->interface))->WritePipeAsyncTO(cInterface->interface, pipeRef, transfer->buffer,
+                                                         transfer->length, transfer->timeout, transfer->timeout,
+                                                         darwin_async_io_callback, (void *)itransfer);
+  }
+
+  if (ret)
+    usbi_err (TRANSFER_CTX (transfer), "bulk transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out",
+               darwin_error_str(ret), ret);
+
+  return darwin_to_libusb (ret);
+}
+
+#if InterfaceVersion >= 550
+static int submit_stream_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_interface *cInterface;
+  uint8_t pipeRef;
+  IOReturn ret;
+
+  if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) {
+    usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface");
+
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  itransfer->flags |= USBI_TRANSFER_OS_HANDLES_TIMEOUT;
+
+  if (IS_XFERIN(transfer))
+    ret = (*(cInterface->interface))->ReadStreamsPipeAsyncTO(cInterface->interface, pipeRef, itransfer->stream_id,
+                                                             transfer->buffer, transfer->length, transfer->timeout,
+                                                             transfer->timeout, darwin_async_io_callback, (void *)itransfer);
+  else
+    ret = (*(cInterface->interface))->WriteStreamsPipeAsyncTO(cInterface->interface, pipeRef, itransfer->stream_id,
+                                                              transfer->buffer, transfer->length, transfer->timeout,
+                                                              transfer->timeout, darwin_async_io_callback, (void *)itransfer);
+
+  if (ret)
+    usbi_err (TRANSFER_CTX (transfer), "bulk stream transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out",
+               darwin_error_str(ret), ret);
+
+  return darwin_to_libusb (ret);
+}
+#endif
+
+static int submit_iso_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+
+  IOReturn kresult;
+  uint8_t direction, number, interval, pipeRef, transferType;
+  uint16_t maxPacketSize;
+  UInt64 frame;
+  AbsoluteTime atTime;
+  int i;
+
+  struct darwin_interface *cInterface;
+
+  /* construct an array of IOUSBIsocFrames, reuse the old one if possible */
+  if (tpriv->isoc_framelist && tpriv->num_iso_packets != transfer->num_iso_packets) {
+    free(tpriv->isoc_framelist);
+    tpriv->isoc_framelist = NULL;
+  }
+
+  if (!tpriv->isoc_framelist) {
+    tpriv->num_iso_packets = transfer->num_iso_packets;
+    tpriv->isoc_framelist = (IOUSBIsocFrame*) calloc (transfer->num_iso_packets, sizeof(IOUSBIsocFrame));
+    if (!tpriv->isoc_framelist)
+      return LIBUSB_ERROR_NO_MEM;
+  }
+
+  /* copy the frame list from the libusb descriptor (the structures differ only is member order) */
+  for (i = 0 ; i < transfer->num_iso_packets ; i++)
+    tpriv->isoc_framelist[i].frReqCount = transfer->iso_packet_desc[i].length;
+
+  /* determine the interface/endpoint to use */
+  if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) {
+    usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface");
+
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  /* determine the properties of this endpoint and the speed of the device */
+  (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
+                                                 &transferType, &maxPacketSize, &interval);
+
+  /* Last but not least we need the bus frame number */
+  kresult = (*(cInterface->interface))->GetBusFrameNumber(cInterface->interface, &frame, &atTime);
+  if (kresult) {
+    usbi_err (TRANSFER_CTX (transfer), "failed to get bus frame number: %d", kresult);
+    free(tpriv->isoc_framelist);
+    tpriv->isoc_framelist = NULL;
+
+    return darwin_to_libusb (kresult);
+  }
+
+  (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
+                                                 &transferType, &maxPacketSize, &interval);
+
+  /* schedule for a frame a little in the future */
+  frame += 4;
+
+  if (cInterface->frames[transfer->endpoint] && frame < cInterface->frames[transfer->endpoint])
+    frame = cInterface->frames[transfer->endpoint];
+
+  /* submit the request */
+  if (IS_XFERIN(transfer))
+    kresult = (*(cInterface->interface))->ReadIsochPipeAsync(cInterface->interface, pipeRef, transfer->buffer, frame,
+                                                             transfer->num_iso_packets, tpriv->isoc_framelist, darwin_async_io_callback,
+                                                             itransfer);
+  else
+    kresult = (*(cInterface->interface))->WriteIsochPipeAsync(cInterface->interface, pipeRef, transfer->buffer, frame,
+                                                              transfer->num_iso_packets, tpriv->isoc_framelist, darwin_async_io_callback,
+                                                              itransfer);
+
+  if (LIBUSB_SPEED_FULL == transfer->dev_handle->dev->speed)
+    /* Full speed */
+    cInterface->frames[transfer->endpoint] = frame + transfer->num_iso_packets * (1 << (interval - 1));
+  else
+    /* High/super speed */
+    cInterface->frames[transfer->endpoint] = frame + transfer->num_iso_packets * (1 << (interval - 1)) / 8;
+
+  if (kresult != kIOReturnSuccess) {
+    usbi_err (TRANSFER_CTX (transfer), "isochronous transfer failed (dir: %s): %s", IS_XFERIN(transfer) ? "In" : "Out",
+               darwin_error_str(kresult));
+    free (tpriv->isoc_framelist);
+    tpriv->isoc_framelist = NULL;
+  }
+
+  return darwin_to_libusb (kresult);
+}
+
+static int submit_control_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct libusb_control_setup *setup = (struct libusb_control_setup *) transfer->buffer;
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(transfer->dev_handle->dev);
+  struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+
+  IOReturn               kresult;
+
+  bzero(&tpriv->req, sizeof(tpriv->req));
+
+  /* IOUSBDeviceInterface expects the request in cpu endianess */
+  tpriv->req.bmRequestType     = setup->bmRequestType;
+  tpriv->req.bRequest          = setup->bRequest;
+  /* these values should be in bus order from libusb_fill_control_setup */
+  tpriv->req.wValue            = OSSwapLittleToHostInt16 (setup->wValue);
+  tpriv->req.wIndex            = OSSwapLittleToHostInt16 (setup->wIndex);
+  tpriv->req.wLength           = OSSwapLittleToHostInt16 (setup->wLength);
+  /* data is stored after the libusb control block */
+  tpriv->req.pData             = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
+  tpriv->req.completionTimeout = transfer->timeout;
+  tpriv->req.noDataTimeout     = transfer->timeout;
+
+  itransfer->flags |= USBI_TRANSFER_OS_HANDLES_TIMEOUT;
+
+  /* all transfers in libusb-1.0 are async */
+
+  if (transfer->endpoint) {
+    struct darwin_interface *cInterface;
+    uint8_t                 pipeRef;
+
+    if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface) != 0) {
+      usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface");
+
+      return LIBUSB_ERROR_NOT_FOUND;
+    }
+
+    kresult = (*(cInterface->interface))->ControlRequestAsyncTO (cInterface->interface, pipeRef, &(tpriv->req), darwin_async_io_callback, itransfer);
+  } else
+    /* control request on endpoint 0 */
+    kresult = (*(dpriv->device))->DeviceRequestAsyncTO(dpriv->device, &(tpriv->req), darwin_async_io_callback, itransfer);
+
+  if (kresult != kIOReturnSuccess)
+    usbi_err (TRANSFER_CTX (transfer), "control request failed: %s", darwin_error_str(kresult));
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_submit_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+  switch (transfer->type) {
+  case LIBUSB_TRANSFER_TYPE_CONTROL:
+    return submit_control_transfer(itransfer);
+  case LIBUSB_TRANSFER_TYPE_BULK:
+  case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+    return submit_bulk_transfer(itransfer);
+  case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+    return submit_iso_transfer(itransfer);
+  case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+#if InterfaceVersion >= 550
+    return submit_stream_transfer(itransfer);
+#else
+    usbi_err (TRANSFER_CTX(transfer), "IOUSBFamily version does not support bulk stream transfers");
+    return LIBUSB_ERROR_NOT_SUPPORTED;
+#endif
+  default:
+    usbi_err (TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type);
+    return LIBUSB_ERROR_INVALID_PARAM;
+  }
+}
+
+static int cancel_control_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(transfer->dev_handle->dev);
+  IOReturn kresult;
+
+  usbi_warn (ITRANSFER_CTX (itransfer), "aborting all transactions control pipe");
+
+  if (!dpriv->device)
+    return LIBUSB_ERROR_NO_DEVICE;
+
+  kresult = (*(dpriv->device))->USBDeviceAbortPipeZero (dpriv->device);
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_abort_transfers (struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_cached_device *dpriv = DARWIN_CACHED_DEVICE(transfer->dev_handle->dev);
+  struct darwin_interface *cInterface;
+  uint8_t pipeRef, iface;
+  IOReturn kresult;
+
+  if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface, &cInterface) != 0) {
+    usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface");
+
+    return LIBUSB_ERROR_NOT_FOUND;
+  }
+
+  if (!dpriv->device)
+    return LIBUSB_ERROR_NO_DEVICE;
+
+  usbi_warn (ITRANSFER_CTX (itransfer), "aborting all transactions on interface %d pipe %d", iface, pipeRef);
+
+  /* abort transactions */
+#if InterfaceVersion >= 550
+  if (LIBUSB_TRANSFER_TYPE_BULK_STREAM == transfer->type)
+    (*(cInterface->interface))->AbortStreamsPipe (cInterface->interface, pipeRef, itransfer->stream_id);
+  else
+#endif
+    (*(cInterface->interface))->AbortPipe (cInterface->interface, pipeRef);
+
+  usbi_dbg ("calling clear pipe stall to clear the data toggle bit");
+
+  /* newer versions of darwin support clearing additional bits on the device's endpoint */
+  kresult = (*(cInterface->interface))->ClearPipeStallBothEnds(cInterface->interface, pipeRef);
+
+  return darwin_to_libusb (kresult);
+}
+
+static int darwin_cancel_transfer(struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+  switch (transfer->type) {
+  case LIBUSB_TRANSFER_TYPE_CONTROL:
+    return cancel_control_transfer(itransfer);
+  case LIBUSB_TRANSFER_TYPE_BULK:
+  case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+  case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+    return darwin_abort_transfers (itransfer);
+  default:
+    usbi_err (TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type);
+    return LIBUSB_ERROR_INVALID_PARAM;
+  }
+}
+
+static void darwin_clear_transfer_priv (struct usbi_transfer *itransfer) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+
+  if (transfer->type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS && tpriv->isoc_framelist) {
+    free (tpriv->isoc_framelist);
+    tpriv->isoc_framelist = NULL;
+  }
+}
+
+static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0) {
+  struct usbi_transfer *itransfer = (struct usbi_transfer *)refcon;
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv;
+  struct darwin_msg_async_io_complete message = {.itransfer = itransfer, .result = result,
+                                                 .size = (UInt32) (uintptr_t) arg0};
+
+  usbi_dbg ("an async io operation has completed");
+
+  /* if requested write a zero packet */
+  if (kIOReturnSuccess == result && IS_XFEROUT(transfer) && transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) {
+    struct darwin_interface *cInterface;
+    uint8_t pipeRef;
+
+    (void) ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, NULL, &cInterface);
+
+    (*(cInterface->interface))->WritePipe (cInterface->interface, pipeRef, transfer->buffer, 0);
+  }
+
+  /* send a completion message to the device's file descriptor */
+  write (priv->fds[1], &message, sizeof (message));
+}
+
+static int darwin_transfer_status (struct usbi_transfer *itransfer, kern_return_t result) {
+  if (itransfer->flags & USBI_TRANSFER_TIMED_OUT)
+    result = kIOUSBTransactionTimeout;
+
+  switch (result) {
+  case kIOReturnUnderrun:
+  case kIOReturnSuccess:
+    return LIBUSB_TRANSFER_COMPLETED;
+  case kIOReturnAborted:
+    return LIBUSB_TRANSFER_CANCELLED;
+  case kIOUSBPipeStalled:
+    usbi_dbg ("transfer error: pipe is stalled");
+    return LIBUSB_TRANSFER_STALL;
+  case kIOReturnOverrun:
+    usbi_warn (ITRANSFER_CTX (itransfer), "transfer error: data overrun");
+    return LIBUSB_TRANSFER_OVERFLOW;
+  case kIOUSBTransactionTimeout:
+    usbi_warn (ITRANSFER_CTX (itransfer), "transfer error: timed out");
+    itransfer->flags |= USBI_TRANSFER_TIMED_OUT;
+    return LIBUSB_TRANSFER_TIMED_OUT;
+  default:
+    usbi_warn (ITRANSFER_CTX (itransfer), "transfer error: %s (value = 0x%08x)", darwin_error_str (result), result);
+    return LIBUSB_TRANSFER_ERROR;
+  }
+}
+
+static void darwin_handle_callback (struct usbi_transfer *itransfer, kern_return_t result, UInt32 io_size) {
+  struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+  struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+  int isIsoc      = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS == transfer->type;
+  int isBulk      = LIBUSB_TRANSFER_TYPE_BULK == transfer->type;
+  int isControl   = LIBUSB_TRANSFER_TYPE_CONTROL == transfer->type;
+  int isInterrupt = LIBUSB_TRANSFER_TYPE_INTERRUPT == transfer->type;
+  int i;
+
+  if (!isIsoc && !isBulk && !isControl && !isInterrupt) {
+    usbi_err (TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type);
+    return;
+  }
+
+  usbi_dbg ("handling %s completion with kernel status %d",
+             isControl ? "control" : isBulk ? "bulk" : isIsoc ? "isoc" : "interrupt", result);
+
+  if (kIOReturnSuccess == result || kIOReturnUnderrun == result) {
+    if (isIsoc && tpriv->isoc_framelist) {
+      /* copy isochronous results back */
+
+      for (i = 0; i < transfer->num_iso_packets ; i++) {
+        struct libusb_iso_packet_descriptor *lib_desc = &transfer->iso_packet_desc[i];
+        lib_desc->status = darwin_to_libusb (tpriv->isoc_framelist[i].frStatus);
+        lib_desc->actual_length = tpriv->isoc_framelist[i].frActCount;
+      }
+    } else if (!isIsoc)
+      itransfer->transferred += io_size;
+  }
+
+  /* it is ok to handle cancelled transfers without calling usbi_handle_transfer_cancellation (we catch timeout transfers) */
+  usbi_handle_transfer_completion (itransfer, darwin_transfer_status (itransfer, result));
+}
+
+static int op_handle_events(struct libusb_context *ctx, struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready) {
+  struct darwin_msg_async_io_complete message;
+  POLL_NFDS_TYPE i = 0;
+  ssize_t ret;
+
+  usbi_mutex_lock(&ctx->open_devs_lock);
+
+  for (i = 0; i < nfds && num_ready > 0; i++) {
+    struct pollfd *pollfd = &fds[i];
+
+    usbi_dbg ("checking fd %i with revents = %x", pollfd->fd, pollfd->revents);
+
+    if (!pollfd->revents)
+      continue;
+
+    num_ready--;
+
+    if (pollfd->revents & POLLERR) {
+      /* this probably will never happen so ignore the error an move on. */
+      continue;
+    }
+
+    /* there is only one type of message */
+    ret = read (pollfd->fd, &message, sizeof (message));
+    if (ret < (ssize_t) sizeof (message)) {
+      usbi_dbg ("WARNING: short read on async io completion pipe\n");
+      continue;
+    }
+
+    darwin_handle_callback (message.itransfer, message.result, message.size);
+  }
+
+  usbi_mutex_unlock(&ctx->open_devs_lock);
+
+  return 0;
+}
+
+static int darwin_clock_gettime(int clk_id, struct timespec *tp) {
+  mach_timespec_t sys_time;
+  clock_serv_t clock_ref;
+
+  switch (clk_id) {
+  case USBI_CLOCK_REALTIME:
+    /* CLOCK_REALTIME represents time since the epoch */
+    clock_ref = clock_realtime;
+    break;
+  case USBI_CLOCK_MONOTONIC:
+    /* use system boot time as reference for the monotonic clock */
+    clock_ref = clock_monotonic;
+    break;
+  default:
+    return LIBUSB_ERROR_INVALID_PARAM;
+  }
+
+  clock_get_time (clock_ref, &sys_time);
+
+  tp->tv_sec  = sys_time.tv_sec;
+  tp->tv_nsec = sys_time.tv_nsec;
+
+  return 0;
+}
+
+#if InterfaceVersion >= 550
+static int darwin_alloc_streams (struct libusb_device_handle *dev_handle, uint32_t num_streams, unsigned char *endpoints,
+                                 int num_endpoints) {
+  struct darwin_interface *cInterface;
+  UInt32 supportsStreams;
+  uint8_t pipeRef;
+  int rc, i;
+
+  /* find the mimimum number of supported streams on the endpoint list */
+  for (i = 0 ; i < num_endpoints ; ++i) {
+    if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface))) {
+      return rc;
+    }
+
+    (*(cInterface->interface))->SupportsStreams (cInterface->interface, pipeRef, &supportsStreams);
+    if (num_streams > supportsStreams)
+      num_streams = supportsStreams;
+  }
+
+  /* it is an error if any endpoint in endpoints does not support streams */
+  if (0 == num_streams)
+    return LIBUSB_ERROR_INVALID_PARAM;
+
+  /* create the streams */
+  for (i = 0 ; i < num_endpoints ; ++i) {
+    (void) ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface);
+
+    rc = (*(cInterface->interface))->CreateStreams (cInterface->interface, pipeRef, num_streams);
+    if (kIOReturnSuccess != rc)
+      return darwin_to_libusb(rc);
+  }
+
+  return num_streams;
+}
+
+static int darwin_free_streams (struct libusb_device_handle *dev_handle, unsigned char *endpoints, int num_endpoints) {
+  struct darwin_interface *cInterface;
+  UInt32 supportsStreams;
+  uint8_t pipeRef;
+  int rc;
+
+  for (int i = 0 ; i < num_endpoints ; ++i) {
+    if (0 != (rc = ep_to_pipeRef (dev_handle, endpoints[i], &pipeRef, NULL, &cInterface)))
+      return rc;
+
+    (*(cInterface->interface))->SupportsStreams (cInterface->interface, pipeRef, &supportsStreams);
+    if (0 == supportsStreams)
+      return LIBUSB_ERROR_INVALID_PARAM;
+
+    rc = (*(cInterface->interface))->CreateStreams (cInterface->interface, pipeRef, 0);
+    if (kIOReturnSuccess != rc)
+      return darwin_to_libusb(rc);
+  }
+
+  return LIBUSB_SUCCESS;
+}
+#endif
+
+const struct usbi_os_backend darwin_backend = {
+        .name = "Darwin",
+        .caps = 0,
+        .init = darwin_init,
+        .exit = darwin_exit,
+        .get_device_list = NULL, /* not needed */
+        .get_device_descriptor = darwin_get_device_descriptor,
+        .get_active_config_descriptor = darwin_get_active_config_descriptor,
+        .get_config_descriptor = darwin_get_config_descriptor,
+        .hotplug_poll = darwin_hotplug_poll,
+
+        .open = darwin_open,
+        .close = darwin_close,
+        .get_configuration = darwin_get_configuration,
+        .set_configuration = darwin_set_configuration,
+        .claim_interface = darwin_claim_interface,
+        .release_interface = darwin_release_interface,
+
+        .set_interface_altsetting = darwin_set_interface_altsetting,
+        .clear_halt = darwin_clear_halt,
+        .reset_device = darwin_reset_device,
+
+#if InterfaceVersion >= 550
+        .alloc_streams = darwin_alloc_streams,
+        .free_streams = darwin_free_streams,
+#endif
+
+        .kernel_driver_active = darwin_kernel_driver_active,
+        .detach_kernel_driver = darwin_detach_kernel_driver,
+        .attach_kernel_driver = darwin_attach_kernel_driver,
+
+        .destroy_device = darwin_destroy_device,
+
+        .submit_transfer = darwin_submit_transfer,
+        .cancel_transfer = darwin_cancel_transfer,
+        .clear_transfer_priv = darwin_clear_transfer_priv,
+
+        .handle_events = op_handle_events,
+
+        .clock_gettime = darwin_clock_gettime,
+
+        .device_priv_size = sizeof(struct darwin_device_priv),
+        .device_handle_priv_size = sizeof(struct darwin_device_handle_priv),
+        .transfer_priv_size = sizeof(struct darwin_transfer_priv),
+        .add_iso_packet_size = 0,
+};
diff --git a/Externals/libusb/libusb/os/darwin_usb.h b/Externals/libusb/libusb/os/darwin_usb.h
new file mode 100644
index 0000000000..8838881958
--- /dev/null
+++ b/Externals/libusb/libusb/os/darwin_usb.h
@@ -0,0 +1,162 @@
+/*
+ * darwin backend for libusb 1.0
+ * Copyright © 2008-2013 Nathan Hjelm <hjelmn@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if !defined(LIBUSB_DARWIN_H)
+#define LIBUSB_DARWIN_H
+
+#include "libusbi.h"
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOCFBundle.h>
+#include <IOKit/usb/IOUSBLib.h>
+#include <IOKit/IOCFPlugIn.h>
+
+/* IOUSBInterfaceInferface */
+#if defined (kIOUSBInterfaceInterfaceID550)
+
+#define usb_interface_t IOUSBInterfaceInterface550
+#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID550
+#define InterfaceVersion 550
+
+#elif defined (kIOUSBInterfaceInterfaceID500)
+
+#define usb_interface_t IOUSBInterfaceInterface500
+#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID500
+#define InterfaceVersion 500
+
+#elif defined (kIOUSBInterfaceInterfaceID300)
+
+#define usb_interface_t IOUSBInterfaceInterface300
+#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID300
+#define InterfaceVersion 300
+
+#elif defined (kIOUSBInterfaceInterfaceID245)
+
+#define usb_interface_t IOUSBInterfaceInterface245
+#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID245
+#define InterfaceVersion 245
+
+#elif defined (kIOUSBInterfaceInterfaceID220)
+
+#define usb_interface_t IOUSBInterfaceInterface220
+#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID220
+#define InterfaceVersion 220
+
+#else
+
+#error "IOUSBFamily is too old. Please upgrade your OS"
+
+#endif
+
+/* IOUSBDeviceInterface */
+#if defined (kIOUSBDeviceInterfaceID500)
+
+#define usb_device_t    IOUSBDeviceInterface500
+#define DeviceInterfaceID kIOUSBDeviceInterfaceID500
+#define DeviceVersion 500
+
+#elif defined (kIOUSBDeviceInterfaceID320)
+
+#define usb_device_t    IOUSBDeviceInterface320
+#define DeviceInterfaceID kIOUSBDeviceInterfaceID320
+#define DeviceVersion 320
+
+#elif defined (kIOUSBDeviceInterfaceID300)
+
+#define usb_device_t    IOUSBDeviceInterface300
+#define DeviceInterfaceID kIOUSBDeviceInterfaceID300
+#define DeviceVersion 300
+
+#elif defined (kIOUSBDeviceInterfaceID245)
+
+#define usb_device_t    IOUSBDeviceInterface245
+#define DeviceInterfaceID kIOUSBDeviceInterfaceID245
+#define DeviceVersion 245
+
+#elif defined (kIOUSBDeviceInterfaceID220)
+#define usb_device_t    IOUSBDeviceInterface197
+#define DeviceInterfaceID kIOUSBDeviceInterfaceID197
+#define DeviceVersion 197
+
+#else
+
+#error "IOUSBFamily is too old. Please upgrade your OS"
+
+#endif
+
+#if !defined(IO_OBJECT_NULL)
+#define IO_OBJECT_NULL ((io_object_t) 0)
+#endif
+
+typedef IOCFPlugInInterface *io_cf_plugin_ref_t;
+typedef IONotificationPortRef io_notification_port_t;
+
+/* private structures */
+struct darwin_cached_device {
+  struct list_head      list;
+  IOUSBDeviceDescriptor dev_descriptor;
+  UInt32                location;
+  UInt64                parent_session;
+  UInt64                session;
+  UInt16                address;
+  char                  sys_path[21];
+  usb_device_t        **device;
+  int                   open_count;
+  UInt8                 first_config, active_config, port;  
+  int                   can_enumerate;
+  int                   refcount;
+};
+
+struct darwin_device_priv {
+  struct darwin_cached_device *dev;
+};
+
+struct darwin_device_handle_priv {
+  int                  is_open;
+  CFRunLoopSourceRef   cfSource;
+  int                  fds[2];
+
+  struct darwin_interface {
+    usb_interface_t    **interface;
+    uint8_t              num_endpoints;
+    CFRunLoopSourceRef   cfSource;
+    uint64_t             frames[256];
+    uint8_t              endpoint_addrs[USB_MAXENDPOINTS];
+  } interfaces[USB_MAXINTERFACES];
+};
+
+struct darwin_transfer_priv {
+  /* Isoc */
+  IOUSBIsocFrame *isoc_framelist;
+  int num_iso_packets;
+
+  /* Control */
+  IOUSBDevRequestTO req;
+
+  /* Bulk */
+};
+
+/* structure for signaling io completion */
+struct darwin_msg_async_io_complete {
+  struct usbi_transfer *itransfer;
+  IOReturn result;
+  UInt32 size;
+};
+
+#endif
diff --git a/Externals/libusb/libusb/os/linux_netlink.c b/Externals/libusb/libusb/os/linux_netlink.c
new file mode 100644
index 0000000000..306f0b4524
--- /dev/null
+++ b/Externals/libusb/libusb/os/linux_netlink.c
@@ -0,0 +1,369 @@
+/* -*- Mode: C; c-basic-offset:8 ; indent-tabs-mode:t -*- */
+/*
+ * Linux usbfs backend for libusb
+ * Copyright (C) 2007-2009 Daniel Drake <dsd@gentoo.org>
+ * Copyright (c) 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ * Copyright (c) 2013 Nathan Hjelm <hjelmn@mac.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libusb.h"
+#include "libusbi.h"
+#include "linux_usbfs.h"
+
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#ifdef HAVE_ASM_TYPES_H
+#include <asm/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#include <arpa/inet.h>
+
+#ifdef HAVE_LINUX_NETLINK_H
+#include <linux/netlink.h>
+#endif
+
+#ifdef HAVE_LINUX_FILTER_H
+#include <linux/filter.h>
+#endif
+
+#define KERNEL 1
+
+static int linux_netlink_socket = -1;
+static int netlink_control_pipe[2] = { -1, -1 };
+static pthread_t libusb_linux_event_thread;
+
+static void *linux_netlink_event_thread_main(void *arg);
+
+struct sockaddr_nl snl = { .nl_family=AF_NETLINK, .nl_groups=KERNEL };
+
+static int set_fd_cloexec_nb (int fd)
+{
+	int flags;
+
+#if defined(FD_CLOEXEC)
+	flags = fcntl (linux_netlink_socket, F_GETFD);
+	if (0 > flags) {
+		return -1;
+	}
+
+	if (!(flags & FD_CLOEXEC)) {
+		fcntl (linux_netlink_socket, F_SETFD, flags | FD_CLOEXEC);
+	}
+#endif
+
+	flags = fcntl (linux_netlink_socket, F_GETFL);
+	if (0 > flags) {
+		return -1;
+	}
+
+	if (!(flags & O_NONBLOCK)) {
+		fcntl (linux_netlink_socket, F_SETFL, flags | O_NONBLOCK);
+	}
+
+	return 0;
+}
+
+int linux_netlink_start_event_monitor(void)
+{
+	int socktype = SOCK_RAW;
+	int ret;
+
+	snl.nl_groups = KERNEL;
+
+#if defined(SOCK_CLOEXEC)
+	socktype |= SOCK_CLOEXEC;
+#endif
+#if defined(SOCK_NONBLOCK)
+	socktype |= SOCK_NONBLOCK;
+#endif
+
+	linux_netlink_socket = socket(PF_NETLINK, socktype, NETLINK_KOBJECT_UEVENT);
+	if (-1 == linux_netlink_socket && EINVAL == errno) {
+		linux_netlink_socket = socket(PF_NETLINK, SOCK_RAW, NETLINK_KOBJECT_UEVENT);
+	}
+
+	if (-1 == linux_netlink_socket) {
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	ret = set_fd_cloexec_nb (linux_netlink_socket);
+	if (0 != ret) {
+		close (linux_netlink_socket);
+		linux_netlink_socket = -1;
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	ret = bind(linux_netlink_socket, (struct sockaddr *) &snl, sizeof(snl));
+	if (0 != ret) {
+	        close(linux_netlink_socket);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	/* TODO -- add authentication */
+	/* setsockopt(linux_netlink_socket, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)); */
+
+	ret = usbi_pipe(netlink_control_pipe);
+	if (ret) {
+		usbi_err(NULL, "could not create netlink control pipe");
+	        close(linux_netlink_socket);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	ret = pthread_create(&libusb_linux_event_thread, NULL, linux_netlink_event_thread_main, NULL);
+	if (0 != ret) {
+        	close(netlink_control_pipe[0]);
+        	close(netlink_control_pipe[1]);
+	        close(linux_netlink_socket);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+int linux_netlink_stop_event_monitor(void)
+{
+	int r;
+	char dummy = 1;
+
+	if (-1 == linux_netlink_socket) {
+		/* already closed. nothing to do */
+		return LIBUSB_SUCCESS;
+	}
+
+	/* Write some dummy data to the control pipe and
+	 * wait for the thread to exit */
+	r = usbi_write(netlink_control_pipe[1], &dummy, sizeof(dummy));
+	if (r <= 0) {
+		usbi_warn(NULL, "netlink control pipe signal failed");
+	}
+	pthread_join(libusb_linux_event_thread, NULL);
+
+	close(linux_netlink_socket);
+	linux_netlink_socket = -1;
+
+	/* close and reset control pipe */
+	close(netlink_control_pipe[0]);
+	close(netlink_control_pipe[1]);
+	netlink_control_pipe[0] = -1;
+	netlink_control_pipe[1] = -1;
+
+	return LIBUSB_SUCCESS;
+}
+
+static const char *netlink_message_parse (const char *buffer, size_t len, const char *key)
+{
+	size_t keylen = strlen(key);
+	size_t offset;
+
+	for (offset = 0 ; offset < len && '\0' != buffer[offset] ; offset += strlen(buffer + offset) + 1) {
+		if (0 == strncmp(buffer + offset, key, keylen) &&
+		    '=' == buffer[offset + keylen]) {
+			return buffer + offset + keylen + 1;
+		}
+	}
+
+	return NULL;
+}
+
+/* parse parts of netlink message common to both libudev and the kernel */
+static int linux_netlink_parse(char *buffer, size_t len, int *detached, const char **sys_name,
+			       uint8_t *busnum, uint8_t *devaddr) {
+	const char *tmp;
+	int i;
+
+	errno = 0;
+
+	*sys_name = NULL;
+	*detached = 0;
+	*busnum   = 0;
+	*devaddr  = 0;
+
+	tmp = netlink_message_parse((const char *) buffer, len, "ACTION");
+	if (tmp == NULL)
+		return -1;
+	if (0 == strcmp(tmp, "remove")) {
+		*detached = 1;
+	} else if (0 != strcmp(tmp, "add")) {
+		usbi_dbg("unknown device action %s", tmp);
+		return -1;
+	}
+
+	/* check that this is a usb message */
+	tmp = netlink_message_parse(buffer, len, "SUBSYSTEM");
+	if (NULL == tmp || 0 != strcmp(tmp, "usb")) {
+		/* not usb. ignore */
+		return -1;
+	}
+
+	tmp = netlink_message_parse(buffer, len, "BUSNUM");
+	if (NULL == tmp) {
+		/* no bus number. try "DEVICE" */
+		tmp = netlink_message_parse(buffer, len, "DEVICE");
+		if (NULL == tmp) {
+			/* not usb. ignore */
+			return -1;
+		}
+		
+		/* Parse a device path such as /dev/bus/usb/003/004 */
+		char *pLastSlash = (char*)strrchr(tmp,'/');
+		if(NULL == pLastSlash) {
+			return -1;
+		}
+
+		*devaddr = strtoul(pLastSlash + 1, NULL, 10);
+		if (errno) {
+			errno = 0;
+			return -1;
+		}
+		
+		*busnum = strtoul(pLastSlash - 3, NULL, 10);
+		if (errno) {
+			errno = 0;
+			return -1;
+		}
+		
+		return 0;
+	}
+
+	*busnum = (uint8_t)(strtoul(tmp, NULL, 10) & 0xff);
+	if (errno) {
+		errno = 0;
+		return -1;
+	}
+
+	tmp = netlink_message_parse(buffer, len, "DEVNUM");
+	if (NULL == tmp) {
+		return -1;
+	}
+
+	*devaddr = (uint8_t)(strtoul(tmp, NULL, 10) & 0xff);
+	if (errno) {
+		errno = 0;
+		return -1;
+	}
+
+	tmp = netlink_message_parse(buffer, len, "DEVPATH");
+	if (NULL == tmp) {
+		return -1;
+	}
+
+	for (i = strlen(tmp) - 1 ; i ; --i) {
+		if ('/' ==tmp[i]) {
+			*sys_name = tmp + i + 1;
+			break;
+		}
+	}
+
+	/* found a usb device */
+	return 0;
+}
+
+static int linux_netlink_read_message(void)
+{
+	unsigned char buffer[1024];
+	struct iovec iov = {.iov_base = buffer, .iov_len = sizeof(buffer)};
+	struct msghdr meh = { .msg_iov=&iov, .msg_iovlen=1,
+			     .msg_name=&snl, .msg_namelen=sizeof(snl) };
+	const char *sys_name = NULL;
+	uint8_t busnum, devaddr;
+	int detached, r;
+	size_t len;
+
+	/* read netlink message */
+	memset(buffer, 0, sizeof(buffer));
+	len = recvmsg(linux_netlink_socket, &meh, 0);
+	if (len < 32) {
+		if (errno != EAGAIN)
+			usbi_dbg("error recieving message from netlink");
+		return -1;
+	}
+
+	/* TODO -- authenticate this message is from the kernel or udevd */
+
+	r = linux_netlink_parse(buffer, len, &detached, &sys_name,
+				&busnum, &devaddr);
+	if (r)
+		return r;
+
+	usbi_dbg("netlink hotplug found device busnum: %hhu, devaddr: %hhu, sys_name: %s, removed: %s",
+		 busnum, devaddr, sys_name, detached ? "yes" : "no");
+
+	/* signal device is available (or not) to all contexts */
+	if (detached)
+		linux_device_disconnected(busnum, devaddr, sys_name);
+	else
+		linux_hotplug_enumerate(busnum, devaddr, sys_name);
+
+	return 0;
+}
+
+static void *linux_netlink_event_thread_main(void *arg)
+{
+	char dummy;
+	int r;
+	struct pollfd fds[] = {
+		{ .fd = netlink_control_pipe[0],
+		  .events = POLLIN },
+		{ .fd = linux_netlink_socket,
+		  .events = POLLIN },
+	};
+
+	/* silence compiler warning */
+	(void) arg;
+
+	while (poll(fds, 2, -1) >= 0) {
+		if (fds[0].revents & POLLIN) {
+			/* activity on control pipe, read the byte and exit */
+			r = usbi_read(netlink_control_pipe[0], &dummy, sizeof(dummy));
+			if (r <= 0) {
+				usbi_warn(NULL, "netlink control pipe read failed");
+			}
+			break;
+		}
+		if (fds[1].revents & POLLIN) {
+        		usbi_mutex_static_lock(&linux_hotplug_lock);
+	        	linux_netlink_read_message();
+	        	usbi_mutex_static_unlock(&linux_hotplug_lock);
+		}
+	}
+
+	return NULL;
+}
+
+void linux_netlink_hotplug_poll(void)
+{
+	int r;
+
+	usbi_mutex_static_lock(&linux_hotplug_lock);
+	do {
+		r = linux_netlink_read_message();
+	} while (r == 0);
+	usbi_mutex_static_unlock(&linux_hotplug_lock);
+}
diff --git a/Externals/libusb/libusb/os/linux_udev.c b/Externals/libusb/libusb/os/linux_udev.c
new file mode 100644
index 0000000000..0394048ab7
--- /dev/null
+++ b/Externals/libusb/libusb/os/linux_udev.c
@@ -0,0 +1,307 @@
+/* -*- Mode: C; c-basic-offset:8 ; indent-tabs-mode:t -*- */
+/*
+ * Linux usbfs backend for libusb
+ * Copyright (C) 2007-2009 Daniel Drake <dsd@gentoo.org>
+ * Copyright (c) 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ * Copyright (c) 2012-2013 Nathan Hjelm <hjelmn@mac.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <libudev.h>
+
+#include "libusb.h"
+#include "libusbi.h"
+#include "linux_usbfs.h"
+
+/* udev context */
+static struct udev *udev_ctx = NULL;
+static int udev_monitor_fd = -1;
+static int udev_control_pipe[2] = {-1, -1};
+static struct udev_monitor *udev_monitor = NULL;
+static pthread_t linux_event_thread;
+
+static void udev_hotplug_event(struct udev_device* udev_dev);
+static void *linux_udev_event_thread_main(void *arg);
+
+int linux_udev_start_event_monitor(void)
+{
+	int r;
+
+	assert(udev_ctx == NULL);
+	udev_ctx = udev_new();
+	if (!udev_ctx) {
+		usbi_err(NULL, "could not create udev context");
+		goto err;
+	}
+
+	udev_monitor = udev_monitor_new_from_netlink(udev_ctx, "udev");
+	if (!udev_monitor) {
+		usbi_err(NULL, "could not initialize udev monitor");
+		goto err_free_ctx;
+	}
+
+	r = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "usb", 0);
+	if (r) {
+		usbi_err(NULL, "could not initialize udev monitor filter for \"usb\" subsystem");
+		goto err_free_monitor;
+	}
+
+	if (udev_monitor_enable_receiving(udev_monitor)) {
+		usbi_err(NULL, "failed to enable the udev monitor");
+		goto err_free_monitor;
+	}
+
+	udev_monitor_fd = udev_monitor_get_fd(udev_monitor);
+
+	/* Some older versions of udev are not non-blocking by default,
+	 * so make sure this is set */
+	r = fcntl(udev_monitor_fd, F_GETFL);
+	if (r == -1) {
+		usbi_err(NULL, "getting udev monitor fd flags (%d)", errno);
+		goto err_free_monitor;
+	}
+	r = fcntl(udev_monitor_fd, F_SETFL, r | O_NONBLOCK);
+	if (r) {
+		usbi_err(NULL, "setting udev monitor fd flags (%d)", errno);
+		goto err_free_monitor;
+	}
+
+	r = usbi_pipe(udev_control_pipe);
+	if (r) {
+		usbi_err(NULL, "could not create udev control pipe");
+		goto err_free_monitor;
+	}
+
+	r = pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL);
+	if (r) {
+		usbi_err(NULL, "creating hotplug event thread (%d)", r);
+		goto err_close_pipe;
+	}
+
+	return LIBUSB_SUCCESS;
+
+err_close_pipe:
+	close(udev_control_pipe[0]);
+	close(udev_control_pipe[1]);
+err_free_monitor:
+	udev_monitor_unref(udev_monitor);
+	udev_monitor = NULL;
+	udev_monitor_fd = -1;
+err_free_ctx:
+	udev_unref(udev_ctx);
+err:
+	udev_ctx = NULL;
+	return LIBUSB_ERROR_OTHER;
+}
+
+int linux_udev_stop_event_monitor(void)
+{
+	char dummy = 1;
+	int r;
+
+	assert(udev_ctx != NULL);
+	assert(udev_monitor != NULL);
+	assert(udev_monitor_fd != -1);
+
+	/* Write some dummy data to the control pipe and
+	 * wait for the thread to exit */
+	r = usbi_write(udev_control_pipe[1], &dummy, sizeof(dummy));
+	if (r <= 0) {
+		usbi_warn(NULL, "udev control pipe signal failed");
+	}
+	pthread_join(linux_event_thread, NULL);
+
+	/* Release the udev monitor */
+	udev_monitor_unref(udev_monitor);
+	udev_monitor = NULL;
+	udev_monitor_fd = -1;
+
+	/* Clean up the udev context */
+	udev_unref(udev_ctx);
+	udev_ctx = NULL;
+
+	/* close and reset control pipe */
+	close(udev_control_pipe[0]);
+	close(udev_control_pipe[1]);
+	udev_control_pipe[0] = -1;
+	udev_control_pipe[1] = -1;
+
+	return LIBUSB_SUCCESS;
+}
+
+static void *linux_udev_event_thread_main(void *arg)
+{
+	char dummy;
+	int r;
+	struct udev_device* udev_dev;
+	struct pollfd fds[] = {
+		{.fd = udev_control_pipe[0],
+		 .events = POLLIN},
+		{.fd = udev_monitor_fd,
+		 .events = POLLIN},
+	};
+
+	usbi_dbg("udev event thread entering.");
+
+	while (poll(fds, 2, -1) >= 0) {
+		if (fds[0].revents & POLLIN) {
+			/* activity on control pipe, read the byte and exit */
+			r = usbi_read(udev_control_pipe[0], &dummy, sizeof(dummy));
+			if (r <= 0) {
+				usbi_warn(NULL, "udev control pipe read failed");
+			}
+			break;
+		}
+		if (fds[1].revents & POLLIN) {
+			usbi_mutex_static_lock(&linux_hotplug_lock);
+			udev_dev = udev_monitor_receive_device(udev_monitor);
+			if (udev_dev)
+				udev_hotplug_event(udev_dev);
+			usbi_mutex_static_unlock(&linux_hotplug_lock);
+		}
+	}
+
+	usbi_dbg("udev event thread exiting");
+
+	return NULL;
+}
+
+static int udev_device_info(struct libusb_context *ctx, int detached,
+			    struct udev_device *udev_dev, uint8_t *busnum,
+			    uint8_t *devaddr, const char **sys_name) {
+	const char *dev_node;
+
+	dev_node = udev_device_get_devnode(udev_dev);
+	if (!dev_node) {
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	*sys_name = udev_device_get_sysname(udev_dev);
+	if (!*sys_name) {
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return linux_get_device_address(ctx, detached, busnum, devaddr,
+					dev_node, *sys_name);
+}
+
+static void udev_hotplug_event(struct udev_device* udev_dev)
+{
+	const char* udev_action;
+	const char* sys_name = NULL;
+	uint8_t busnum = 0, devaddr = 0;
+	int detached;
+	int r;
+
+	do {
+		udev_action = udev_device_get_action(udev_dev);
+		if (!udev_action) {
+			break;
+		}
+
+		detached = !strncmp(udev_action, "remove", 6);
+
+		r = udev_device_info(NULL, detached, udev_dev, &busnum, &devaddr, &sys_name);
+		if (LIBUSB_SUCCESS != r) {
+			break;
+		}
+
+		usbi_dbg("udev hotplug event. action: %s.", udev_action);
+
+		if (strncmp(udev_action, "add", 3) == 0) {
+			linux_hotplug_enumerate(busnum, devaddr, sys_name);
+		} else if (detached) {
+			linux_device_disconnected(busnum, devaddr, sys_name);
+		} else {
+			usbi_err(NULL, "ignoring udev action %s", udev_action);
+		}
+	} while (0);
+
+	udev_device_unref(udev_dev);
+}
+
+int linux_udev_scan_devices(struct libusb_context *ctx)
+{
+	struct udev_enumerate *enumerator;
+	struct udev_list_entry *devices, *entry;
+	struct udev_device *udev_dev;
+	const char *sys_name;
+	int r;
+
+	assert(udev_ctx != NULL);
+
+	enumerator = udev_enumerate_new(udev_ctx);
+	if (NULL == enumerator) {
+		usbi_err(ctx, "error creating udev enumerator");
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	udev_enumerate_add_match_subsystem(enumerator, "usb");
+	udev_enumerate_scan_devices(enumerator);
+	devices = udev_enumerate_get_list_entry(enumerator);
+
+	udev_list_entry_foreach(entry, devices) {
+		const char *path = udev_list_entry_get_name(entry);
+		uint8_t busnum = 0, devaddr = 0;
+
+		udev_dev = udev_device_new_from_syspath(udev_ctx, path);
+
+		r = udev_device_info(ctx, 0, udev_dev, &busnum, &devaddr, &sys_name);
+		if (r) {
+			udev_device_unref(udev_dev);
+			continue;
+		}
+
+		linux_enumerate_device(ctx, busnum, devaddr, sys_name);
+		udev_device_unref(udev_dev);
+	}
+
+	udev_enumerate_unref(enumerator);
+
+	return LIBUSB_SUCCESS;
+}
+
+void linux_udev_hotplug_poll(void)
+{
+	struct udev_device* udev_dev;
+
+	usbi_mutex_static_lock(&linux_hotplug_lock);
+	do {
+		udev_dev = udev_monitor_receive_device(udev_monitor);
+		if (udev_dev) {
+			usbi_dbg("Handling hotplug event from hotplug_poll");
+			udev_hotplug_event(udev_dev);
+		}
+	} while (udev_dev);
+	usbi_mutex_static_unlock(&linux_hotplug_lock);
+}
diff --git a/Externals/libusb/libusb/os/linux_usbfs.c b/Externals/libusb/libusb/os/linux_usbfs.c
new file mode 100644
index 0000000000..db21710101
--- /dev/null
+++ b/Externals/libusb/libusb/os/linux_usbfs.c
@@ -0,0 +1,2695 @@
+/* -*- Mode: C; c-basic-offset:8 ; indent-tabs-mode:t -*- */
+/*
+ * Linux usbfs backend for libusb
+ * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ * Copyright © 2013 Nathan Hjelm <hjelmn@mac.com>
+ * Copyright © 2012-2013 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <unistd.h>
+
+#include "libusb.h"
+#include "libusbi.h"
+#include "linux_usbfs.h"
+
+/* sysfs vs usbfs:
+ * opening a usbfs node causes the device to be resumed, so we attempt to
+ * avoid this during enumeration.
+ *
+ * sysfs allows us to read the kernel's in-memory copies of device descriptors
+ * and so forth, avoiding the need to open the device:
+ *  - The binary "descriptors" file contains all config descriptors since
+ *    2.6.26, commit 217a9081d8e69026186067711131b77f0ce219ed
+ *  - The binary "descriptors" file was added in 2.6.23, commit
+ *    69d42a78f935d19384d1f6e4f94b65bb162b36df, but it only contains the
+ *    active config descriptors
+ *  - The "busnum" file was added in 2.6.22, commit
+ *    83f7d958eab2fbc6b159ee92bf1493924e1d0f72
+ *  - The "devnum" file has been present since pre-2.6.18
+ *  - the "bConfigurationValue" file has been present since pre-2.6.18
+ *
+ * If we have bConfigurationValue, busnum, and devnum, then we can determine
+ * the active configuration without having to open the usbfs node in RDWR mode.
+ * The busnum file is important as that is the only way we can relate sysfs
+ * devices to usbfs nodes.
+ *
+ * If we also have all descriptors, we can obtain the device descriptor and
+ * configuration without touching usbfs at all.
+ */
+
+/* endianness for multi-byte fields:
+ *
+ * Descriptors exposed by usbfs have the multi-byte fields in the device
+ * descriptor as host endian. Multi-byte fields in the other descriptors are
+ * bus-endian. The kernel documentation says otherwise, but it is wrong.
+ *
+ * In sysfs all descriptors are bus-endian.
+ */
+
+static const char *usbfs_path = NULL;
+
+/* use usbdev*.* device names in /dev instead of the usbfs bus directories */
+static int usbdev_names = 0;
+
+/* Linux 2.6.32 adds support for a bulk continuation URB flag. this basically
+ * allows us to mark URBs as being part of a specific logical transfer when
+ * we submit them to the kernel. then, on any error except a cancellation, all
+ * URBs within that transfer will be cancelled and no more URBs will be
+ * accepted for the transfer, meaning that no more data can creep in.
+ *
+ * The BULK_CONTINUATION flag must be set on all URBs within a bulk transfer
+ * (in either direction) except the first.
+ * For IN transfers, we must also set SHORT_NOT_OK on all URBs except the
+ * last; it means that the kernel should treat a short reply as an error.
+ * For OUT transfers, SHORT_NOT_OK must not be set. it isn't needed (OUT
+ * transfers can't be short unless there's already some sort of error), and
+ * setting this flag is disallowed (a kernel with USB debugging enabled will
+ * reject such URBs).
+ */
+static int supports_flag_bulk_continuation = -1;
+
+/* Linux 2.6.31 fixes support for the zero length packet URB flag. This
+ * allows us to mark URBs that should be followed by a zero length data
+ * packet, which can be required by device- or class-specific protocols.
+ */
+static int supports_flag_zero_packet = -1;
+
+/* clock ID for monotonic clock, as not all clock sources are available on all
+ * systems. appropriate choice made at initialization time. */
+static clockid_t monotonic_clkid = -1;
+
+/* Linux 2.6.22 (commit 83f7d958eab2fbc6b159ee92bf1493924e1d0f72) adds a busnum
+ * to sysfs, so we can relate devices. This also implies that we can read
+ * the active configuration through bConfigurationValue */
+static int sysfs_can_relate_devices = -1;
+
+/* Linux 2.6.26 (commit 217a9081d8e69026186067711131b77f0ce219ed) adds all
+ * config descriptors (rather then just the active config) to the sysfs
+ * descriptors file, so from then on we can use them. */
+static int sysfs_has_descriptors = -1;
+
+/* how many times have we initted (and not exited) ? */
+static int init_count = 0;
+
+/* Serialize hotplug start/stop */
+usbi_mutex_static_t linux_hotplug_startstop_lock = USBI_MUTEX_INITIALIZER;
+/* Serialize scan-devices, event-thread, and poll */
+usbi_mutex_static_t linux_hotplug_lock = USBI_MUTEX_INITIALIZER;
+
+static int linux_start_event_monitor(void);
+static int linux_stop_event_monitor(void);
+static int linux_scan_devices(struct libusb_context *ctx);
+static int sysfs_scan_device(struct libusb_context *ctx, const char *devname);
+static int detach_kernel_driver_and_claim(struct libusb_device_handle *, int);
+
+#if !defined(USE_UDEV)
+static int linux_default_scan_devices (struct libusb_context *ctx);
+#endif
+
+struct linux_device_priv {
+	char *sysfs_dir;
+	unsigned char *descriptors;
+	int descriptors_len;
+	int active_config; /* cache val for !sysfs_can_relate_devices  */
+};
+
+struct linux_device_handle_priv {
+	int fd;
+	uint32_t caps;
+};
+
+enum reap_action {
+	NORMAL = 0,
+	/* submission failed after the first URB, so await cancellation/completion
+	 * of all the others */
+	SUBMIT_FAILED,
+
+	/* cancelled by user or timeout */
+	CANCELLED,
+
+	/* completed multi-URB transfer in non-final URB */
+	COMPLETED_EARLY,
+
+	/* one or more urbs encountered a low-level error */
+	ERROR,
+};
+
+struct linux_transfer_priv {
+	union {
+		struct usbfs_urb *urbs;
+		struct usbfs_urb **iso_urbs;
+	};
+
+	enum reap_action reap_action;
+	int num_urbs;
+	int num_retired;
+	enum libusb_transfer_status reap_status;
+
+	/* next iso packet in user-supplied transfer to be populated */
+	int iso_packet_offset;
+};
+
+static int _get_usbfs_fd(struct libusb_device *dev, mode_t mode, int silent)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	char path[PATH_MAX];
+	int fd;
+	int delay = 10000;
+
+	if (usbdev_names)
+		snprintf(path, PATH_MAX, "%s/usbdev%d.%d",
+			usbfs_path, dev->bus_number, dev->device_address);
+	else
+		snprintf(path, PATH_MAX, "%s/%03d/%03d",
+			usbfs_path, dev->bus_number, dev->device_address);
+
+	fd = open(path, mode);
+	if (fd != -1)
+		return fd; /* Success */
+
+	if (errno == ENOENT) {
+		if (!silent) 
+			usbi_err(ctx, "File doesn't exist, wait %d ms and try again\n", delay/1000);
+   
+		/* Wait 10ms for USB device path creation.*/
+		usleep(delay);
+
+		fd = open(path, mode);
+		if (fd != -1)
+			return fd; /* Success */
+	}
+	
+	if (!silent) {
+		usbi_err(ctx, "libusb couldn't open USB device %s: %s",
+			 path, strerror(errno));
+		if (errno == EACCES && mode == O_RDWR)
+			usbi_err(ctx, "libusb requires write access to USB "
+				      "device nodes.");
+	}
+
+	if (errno == EACCES)
+		return LIBUSB_ERROR_ACCESS;
+	if (errno == ENOENT)
+		return LIBUSB_ERROR_NO_DEVICE;
+	return LIBUSB_ERROR_IO;
+}
+
+static struct linux_device_priv *_device_priv(struct libusb_device *dev)
+{
+	return (struct linux_device_priv *) dev->os_priv;
+}
+
+static struct linux_device_handle_priv *_device_handle_priv(
+	struct libusb_device_handle *handle)
+{
+	return (struct linux_device_handle_priv *) handle->os_priv;
+}
+
+/* check dirent for a /dev/usbdev%d.%d name
+ * optionally return bus/device on success */
+static int _is_usbdev_entry(struct dirent *entry, int *bus_p, int *dev_p)
+{
+	int busnum, devnum;
+
+	if (sscanf(entry->d_name, "usbdev%d.%d", &busnum, &devnum) != 2)
+		return 0;
+
+	usbi_dbg("found: %s", entry->d_name);
+	if (bus_p != NULL)
+		*bus_p = busnum;
+	if (dev_p != NULL)
+		*dev_p = devnum;
+	return 1;
+}
+
+static int check_usb_vfs(const char *dirname)
+{
+	DIR *dir;
+	struct dirent *entry;
+	int found = 0;
+
+	dir = opendir(dirname);
+	if (!dir)
+		return 0;
+
+	while ((entry = readdir(dir)) != NULL) {
+		if (entry->d_name[0] == '.')
+			continue;
+
+		/* We assume if we find any files that it must be the right place */
+		found = 1;
+		break;
+	}
+
+	closedir(dir);
+	return found;
+}
+
+static const char *find_usbfs_path(void)
+{
+	const char *path = "/dev/bus/usb";
+	const char *ret = NULL;
+
+	if (check_usb_vfs(path)) {
+		ret = path;
+	} else {
+		path = "/proc/bus/usb";
+		if (check_usb_vfs(path))
+			ret = path;
+	}
+
+	/* look for /dev/usbdev*.* if the normal places fail */
+	if (ret == NULL) {
+		struct dirent *entry;
+		DIR *dir;
+
+		path = "/dev";
+		dir = opendir(path);
+		if (dir != NULL) {
+			while ((entry = readdir(dir)) != NULL) {
+				if (_is_usbdev_entry(entry, NULL, NULL)) {
+					/* found one; that's enough */
+					ret = path;
+					usbdev_names = 1;
+					break;
+				}
+			}
+			closedir(dir);
+		}
+	}
+
+	if (ret != NULL)
+		usbi_dbg("found usbfs at %s", ret);
+
+	return ret;
+}
+
+/* the monotonic clock is not usable on all systems (e.g. embedded ones often
+ * seem to lack it). fall back to REALTIME if we have to. */
+static clockid_t find_monotonic_clock(void)
+{
+#ifdef CLOCK_MONOTONIC
+	struct timespec ts;
+	int r;
+
+	/* Linux 2.6.28 adds CLOCK_MONOTONIC_RAW but we don't use it
+	 * because it's not available through timerfd */
+	r = clock_gettime(CLOCK_MONOTONIC, &ts);
+	if (r == 0)
+		return CLOCK_MONOTONIC;
+	usbi_dbg("monotonic clock doesn't work, errno %d", errno);
+#endif
+
+	return CLOCK_REALTIME;
+}
+
+static int kernel_version_ge(int major, int minor, int sublevel)
+{
+	struct utsname uts;
+	int atoms, kmajor, kminor, ksublevel;
+
+	if (uname(&uts) < 0)
+		return -1;
+	atoms = sscanf(uts.release, "%d.%d.%d", &kmajor, &kminor, &ksublevel);
+	if (atoms < 1)
+		return -1;
+
+	if (kmajor > major)
+		return 1;
+	if (kmajor < major)
+		return 0;
+
+	/* kmajor == major */
+	if (atoms < 2)
+		return 0 == minor && 0 == sublevel;
+	if (kminor > minor)
+		return 1;
+	if (kminor < minor)
+		return 0;
+
+	/* kminor == minor */
+	if (atoms < 3)
+		return 0 == sublevel;
+
+	return ksublevel >= sublevel;
+}
+
+static int op_init(struct libusb_context *ctx)
+{
+	struct stat statbuf;
+	int r;
+
+	usbfs_path = find_usbfs_path();
+	if (!usbfs_path) {
+		usbi_err(ctx, "could not find usbfs");
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	if (monotonic_clkid == -1)
+		monotonic_clkid = find_monotonic_clock();
+
+	if (supports_flag_bulk_continuation == -1) {
+		/* bulk continuation URB flag available from Linux 2.6.32 */
+		supports_flag_bulk_continuation = kernel_version_ge(2,6,32);
+		if (supports_flag_bulk_continuation == -1) {
+			usbi_err(ctx, "error checking for bulk continuation support");
+			return LIBUSB_ERROR_OTHER;
+		}
+	}
+
+	if (supports_flag_bulk_continuation)
+		usbi_dbg("bulk continuation flag supported");
+
+	if (-1 == supports_flag_zero_packet) {
+		/* zero length packet URB flag fixed since Linux 2.6.31 */
+		supports_flag_zero_packet = kernel_version_ge(2,6,31);
+		if (-1 == supports_flag_zero_packet) {
+			usbi_err(ctx, "error checking for zero length packet support");
+			return LIBUSB_ERROR_OTHER;
+		}
+	}
+
+	if (supports_flag_zero_packet)
+		usbi_dbg("zero length packet flag supported");
+
+	if (-1 == sysfs_has_descriptors) {
+		/* sysfs descriptors has all descriptors since Linux 2.6.26 */
+		sysfs_has_descriptors = kernel_version_ge(2,6,26);
+		if (-1 == sysfs_has_descriptors) {
+			usbi_err(ctx, "error checking for sysfs descriptors");
+			return LIBUSB_ERROR_OTHER;
+		}
+	}
+
+	if (-1 == sysfs_can_relate_devices) {
+		/* sysfs has busnum since Linux 2.6.22 */
+		sysfs_can_relate_devices = kernel_version_ge(2,6,22);
+		if (-1 == sysfs_can_relate_devices) {
+			usbi_err(ctx, "error checking for sysfs busnum");
+			return LIBUSB_ERROR_OTHER;
+		}
+	}
+
+	if (sysfs_can_relate_devices || sysfs_has_descriptors) {
+		r = stat(SYSFS_DEVICE_PATH, &statbuf);
+		if (r != 0 || !S_ISDIR(statbuf.st_mode)) {
+			usbi_warn(ctx, "sysfs not mounted");
+			sysfs_can_relate_devices = 0;
+			sysfs_has_descriptors = 0;
+		}
+	}
+
+	if (sysfs_can_relate_devices)
+		usbi_dbg("sysfs can relate devices");
+
+	if (sysfs_has_descriptors)
+		usbi_dbg("sysfs has complete descriptors");
+
+	usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
+	r = LIBUSB_SUCCESS;
+	if (init_count == 0) {
+		/* start up hotplug event handler */
+		r = linux_start_event_monitor();
+	}
+	if (r == LIBUSB_SUCCESS) {
+		r = linux_scan_devices(ctx);
+		if (r == LIBUSB_SUCCESS)
+			init_count++;
+		else if (init_count == 0)
+			linux_stop_event_monitor();
+	} else
+		usbi_err(ctx, "error starting hotplug event monitor");
+	usbi_mutex_static_unlock(&linux_hotplug_startstop_lock);
+
+	return r;
+}
+
+static void op_exit(void)
+{
+	usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
+	assert(init_count != 0);
+	if (!--init_count) {
+		/* tear down event handler */
+		(void)linux_stop_event_monitor();
+	}
+	usbi_mutex_static_unlock(&linux_hotplug_startstop_lock);
+}
+
+static int linux_start_event_monitor(void)
+{
+#if defined(USE_UDEV)
+	return linux_udev_start_event_monitor();
+#else
+	return linux_netlink_start_event_monitor();
+#endif
+}
+
+static int linux_stop_event_monitor(void)
+{
+#if defined(USE_UDEV)
+	return linux_udev_stop_event_monitor();
+#else
+	return linux_netlink_stop_event_monitor();
+#endif
+}
+
+static int linux_scan_devices(struct libusb_context *ctx)
+{
+	int ret;
+
+	usbi_mutex_static_lock(&linux_hotplug_lock);
+
+#if defined(USE_UDEV)
+	ret = linux_udev_scan_devices(ctx);
+#else
+	ret = linux_default_scan_devices(ctx);
+#endif
+
+	usbi_mutex_static_unlock(&linux_hotplug_lock);
+
+	return ret;
+}
+
+static void op_hotplug_poll(void)
+{
+#if defined(USE_UDEV)
+	linux_udev_hotplug_poll();
+#else
+	linux_netlink_hotplug_poll();
+#endif
+}
+
+static int _open_sysfs_attr(struct libusb_device *dev, const char *attr)
+{
+	struct linux_device_priv *priv = _device_priv(dev);
+	char filename[PATH_MAX];
+	int fd;
+
+	snprintf(filename, PATH_MAX, "%s/%s/%s",
+		SYSFS_DEVICE_PATH, priv->sysfs_dir, attr);
+	fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		usbi_err(DEVICE_CTX(dev),
+			"open %s failed ret=%d errno=%d", filename, fd, errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	return fd;
+}
+
+/* Note only suitable for attributes which always read >= 0, < 0 is error */
+static int __read_sysfs_attr(struct libusb_context *ctx,
+	const char *devname, const char *attr)
+{
+	char filename[PATH_MAX];
+	FILE *f;
+	int r, value;
+
+	snprintf(filename, PATH_MAX, "%s/%s/%s", SYSFS_DEVICE_PATH,
+		 devname, attr);
+	f = fopen(filename, "r");
+	if (f == NULL) {
+		if (errno == ENOENT) {
+			/* File doesn't exist. Assume the device has been
+			   disconnected (see trac ticket #70). */
+			return LIBUSB_ERROR_NO_DEVICE;
+		}
+		usbi_err(ctx, "open %s failed errno=%d", filename, errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	r = fscanf(f, "%d", &value);
+	fclose(f);
+	if (r != 1) {
+		usbi_err(ctx, "fscanf %s returned %d, errno=%d", attr, r, errno);
+		return LIBUSB_ERROR_NO_DEVICE; /* For unplug race (trac #70) */
+	}
+	if (value < 0) {
+		usbi_err(ctx, "%s contains a negative value", filename);
+		return LIBUSB_ERROR_IO;
+	}
+
+	return value;
+}
+
+static int op_get_device_descriptor(struct libusb_device *dev,
+	unsigned char *buffer, int *host_endian)
+{
+	struct linux_device_priv *priv = _device_priv(dev);
+
+	*host_endian = sysfs_has_descriptors ? 0 : 1;
+	memcpy(buffer, priv->descriptors, DEVICE_DESC_LENGTH);
+
+	return 0;
+}
+
+/* read the bConfigurationValue for a device */
+static int sysfs_get_active_config(struct libusb_device *dev, int *config)
+{
+	char *endptr;
+	char tmp[5] = {0, 0, 0, 0, 0};
+	long num;
+	int fd;
+	ssize_t r;
+
+	fd = _open_sysfs_attr(dev, "bConfigurationValue");
+	if (fd < 0)
+		return fd;
+
+	r = read(fd, tmp, sizeof(tmp));
+	close(fd);
+	if (r < 0) {
+		usbi_err(DEVICE_CTX(dev),
+			"read bConfigurationValue failed ret=%d errno=%d", r, errno);
+		return LIBUSB_ERROR_IO;
+	} else if (r == 0) {
+		usbi_dbg("device unconfigured");
+		*config = -1;
+		return 0;
+	}
+
+	if (tmp[sizeof(tmp) - 1] != 0) {
+		usbi_err(DEVICE_CTX(dev), "not null-terminated?");
+		return LIBUSB_ERROR_IO;
+	} else if (tmp[0] == 0) {
+		usbi_err(DEVICE_CTX(dev), "no configuration value?");
+		return LIBUSB_ERROR_IO;
+	}
+
+	num = strtol(tmp, &endptr, 10);
+	if (endptr == tmp) {
+		usbi_err(DEVICE_CTX(dev), "error converting '%s' to integer", tmp);
+		return LIBUSB_ERROR_IO;
+	}
+
+	*config = (int) num;
+	return 0;
+}
+
+int linux_get_device_address (struct libusb_context *ctx, int detached,
+	uint8_t *busnum, uint8_t *devaddr,const char *dev_node,
+	const char *sys_name)
+{
+	int sysfs_attr;
+
+	usbi_dbg("getting address for device: %s detached: %d", sys_name, detached);
+	/* can't use sysfs to read the bus and device number if the
+	 * device has been detached */
+	if (!sysfs_can_relate_devices || detached || NULL == sys_name) {
+		if (NULL == dev_node) {
+			return LIBUSB_ERROR_OTHER;
+		}
+
+		/* will this work with all supported kernel versions? */
+		if (!strncmp(dev_node, "/dev/bus/usb", 12)) {
+			sscanf (dev_node, "/dev/bus/usb/%hhd/%hhd", busnum, devaddr);
+		} else if (!strncmp(dev_node, "/proc/bus/usb", 13)) {
+			sscanf (dev_node, "/proc/bus/usb/%hhd/%hhd", busnum, devaddr);
+		}
+
+		return LIBUSB_SUCCESS;
+	}
+
+	usbi_dbg("scan %s", sys_name);
+
+	sysfs_attr = __read_sysfs_attr(ctx, sys_name, "busnum");
+	if (0 > sysfs_attr)
+		return sysfs_attr;
+	if (sysfs_attr > 255)
+		return LIBUSB_ERROR_INVALID_PARAM;
+	*busnum = (uint8_t) sysfs_attr;
+
+	sysfs_attr = __read_sysfs_attr(ctx, sys_name, "devnum");
+	if (0 > sysfs_attr)
+		return sysfs_attr;
+	if (sysfs_attr > 255)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	*devaddr = (uint8_t) sysfs_attr;
+
+	usbi_dbg("bus=%d dev=%d", *busnum, *devaddr);
+
+	return LIBUSB_SUCCESS;
+}
+
+/* Return offset of the next descriptor with the given type */
+static int seek_to_next_descriptor(struct libusb_context *ctx,
+	uint8_t descriptor_type, unsigned char *buffer, int size)
+{
+	struct usb_descriptor_header header;
+	int i;
+
+	for (i = 0; size >= 0; i += header.bLength, size -= header.bLength) {
+		if (size == 0)
+			return LIBUSB_ERROR_NOT_FOUND;
+
+		if (size < 2) {
+			usbi_err(ctx, "short descriptor read %d/2", size);
+			return LIBUSB_ERROR_IO;
+		}
+		usbi_parse_descriptor(buffer + i, "bb", &header, 0);
+
+		if (i && header.bDescriptorType == descriptor_type)
+			return i;
+	}
+	usbi_err(ctx, "bLength overflow by %d bytes", -size);
+	return LIBUSB_ERROR_IO;
+}
+
+/* Return offset to next config */
+static int seek_to_next_config(struct libusb_context *ctx,
+	unsigned char *buffer, int size)
+{
+	struct libusb_config_descriptor config;
+
+	if (size == 0)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	if (size < LIBUSB_DT_CONFIG_SIZE) {
+		usbi_err(ctx, "short descriptor read %d/%d",
+			 size, LIBUSB_DT_CONFIG_SIZE);
+		return LIBUSB_ERROR_IO;
+	}
+
+	usbi_parse_descriptor(buffer, "bbwbbbbb", &config, 0);
+	if (config.bDescriptorType != LIBUSB_DT_CONFIG) {
+		usbi_err(ctx, "descriptor is not a config desc (type 0x%02x)",
+			 config.bDescriptorType);
+		return LIBUSB_ERROR_IO;
+	}
+
+	/*
+	 * In usbfs the config descriptors are config.wTotalLength bytes apart,
+	 * with any short reads from the device appearing as holes in the file.
+	 *
+	 * In sysfs wTotalLength is ignored, instead the kernel returns a
+	 * config descriptor with verified bLength fields, with descriptors
+	 * with an invalid bLength removed.
+	 */
+	if (sysfs_has_descriptors) {
+		int next = seek_to_next_descriptor(ctx, LIBUSB_DT_CONFIG,
+						   buffer, size);
+		if (next == LIBUSB_ERROR_NOT_FOUND)
+			next = size;
+		if (next < 0)
+			return next;
+
+		if (next != config.wTotalLength)
+			usbi_warn(ctx, "config length mismatch wTotalLength "
+				  "%d real %d", config.wTotalLength, next);
+		return next;
+	} else {
+		if (config.wTotalLength < LIBUSB_DT_CONFIG_SIZE) {
+			usbi_err(ctx, "invalid wTotalLength %d",
+				 config.wTotalLength);
+			return LIBUSB_ERROR_IO;
+		} else if (config.wTotalLength > size) {
+			usbi_warn(ctx, "short descriptor read %d/%d",
+				  size, config.wTotalLength);
+			return size;
+		} else
+			return config.wTotalLength;
+	}
+}
+
+static int op_get_config_descriptor_by_value(struct libusb_device *dev,
+	uint8_t value, unsigned char **buffer, int *host_endian)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	struct linux_device_priv *priv = _device_priv(dev);
+	unsigned char *descriptors = priv->descriptors;
+	int size = priv->descriptors_len;
+	struct libusb_config_descriptor *config;
+
+	*buffer = NULL;
+	/* Unlike the device desc. config descs. are always in raw format */
+	*host_endian = 0;
+
+	/* Skip device header */
+	descriptors += DEVICE_DESC_LENGTH;
+	size -= DEVICE_DESC_LENGTH;
+
+	/* Seek till the config is found, or till "EOF" */
+	while (1) {
+		int next = seek_to_next_config(ctx, descriptors, size);
+		if (next < 0)
+			return next;
+		config = (struct libusb_config_descriptor *)descriptors;
+		if (config->bConfigurationValue == value) {
+			*buffer = descriptors;
+			return next;
+		}
+		size -= next;
+		descriptors += next;
+	}
+}
+
+static int op_get_active_config_descriptor(struct libusb_device *dev,
+	unsigned char *buffer, size_t len, int *host_endian)
+{
+	int r, config;
+	unsigned char *config_desc;
+
+	if (sysfs_can_relate_devices) {
+		r = sysfs_get_active_config(dev, &config);
+		if (r < 0)
+			return r;
+	} else {
+		/* Use cached bConfigurationValue */
+		struct linux_device_priv *priv = _device_priv(dev);
+		config = priv->active_config;
+	}
+	if (config == -1)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	r = op_get_config_descriptor_by_value(dev, config, &config_desc,
+					      host_endian);
+	if (r < 0)
+		return r;
+
+	len = MIN(len, r);
+	memcpy(buffer, config_desc, len);
+	return len;
+}
+
+static int op_get_config_descriptor(struct libusb_device *dev,
+	uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
+{
+	struct linux_device_priv *priv = _device_priv(dev);
+	unsigned char *descriptors = priv->descriptors;
+	int i, r, size = priv->descriptors_len;
+
+	/* Unlike the device desc. config descs. are always in raw format */
+	*host_endian = 0;
+
+	/* Skip device header */
+	descriptors += DEVICE_DESC_LENGTH;
+	size -= DEVICE_DESC_LENGTH;
+
+	/* Seek till the config is found, or till "EOF" */
+	for (i = 0; ; i++) {
+		r = seek_to_next_config(DEVICE_CTX(dev), descriptors, size);
+		if (r < 0)
+			return r;
+		if (i == config_index)
+			break;
+		size -= r;
+		descriptors += r;
+	}
+
+	len = MIN(len, r);
+	memcpy(buffer, descriptors, len);
+	return len;
+}
+
+/* send a control message to retrieve active configuration */
+static int usbfs_get_active_config(struct libusb_device *dev, int fd)
+{
+	unsigned char active_config = 0;
+	int r;
+
+	struct usbfs_ctrltransfer ctrl = {
+		.bmRequestType = LIBUSB_ENDPOINT_IN,
+		.bRequest = LIBUSB_REQUEST_GET_CONFIGURATION,
+		.wValue = 0,
+		.wIndex = 0,
+		.wLength = 1,
+		.timeout = 1000,
+		.data = &active_config
+	};
+
+	r = ioctl(fd, IOCTL_USBFS_CONTROL, &ctrl);
+	if (r < 0) {
+		if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		/* we hit this error path frequently with buggy devices :( */
+		usbi_warn(DEVICE_CTX(dev),
+			"get_configuration failed ret=%d errno=%d", r, errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	return active_config;
+}
+
+static int initialize_device(struct libusb_device *dev, uint8_t busnum,
+	uint8_t devaddr, const char *sysfs_dir)
+{
+	struct linux_device_priv *priv = _device_priv(dev);
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	int descriptors_size = 512; /* Begin with a 1024 byte alloc */
+	int fd, speed;
+	ssize_t r;
+
+	dev->bus_number = busnum;
+	dev->device_address = devaddr;
+
+	if (sysfs_dir) {
+		priv->sysfs_dir = malloc(strlen(sysfs_dir) + 1);
+		if (!priv->sysfs_dir)
+			return LIBUSB_ERROR_NO_MEM;
+		strcpy(priv->sysfs_dir, sysfs_dir);
+
+		/* Note speed can contain 1.5, in this case __read_sysfs_attr
+		   will stop parsing at the '.' and return 1 */
+		speed = __read_sysfs_attr(DEVICE_CTX(dev), sysfs_dir, "speed");
+		if (speed >= 0) {
+			switch (speed) {
+			case     1: dev->speed = LIBUSB_SPEED_LOW; break;
+			case    12: dev->speed = LIBUSB_SPEED_FULL; break;
+			case   480: dev->speed = LIBUSB_SPEED_HIGH; break;
+			case  5000: dev->speed = LIBUSB_SPEED_SUPER; break;
+			default:
+				usbi_warn(DEVICE_CTX(dev), "Unknown device speed: %d Mbps", speed);
+			}
+		}
+	}
+
+	/* cache descriptors in memory */
+	if (sysfs_has_descriptors)
+		fd = _open_sysfs_attr(dev, "descriptors");
+	else
+		fd = _get_usbfs_fd(dev, O_RDONLY, 0);
+	if (fd < 0)
+		return fd;
+
+	do {
+		descriptors_size *= 2;
+		priv->descriptors = usbi_reallocf(priv->descriptors,
+						  descriptors_size);
+		if (!priv->descriptors) {
+			close(fd);
+			return LIBUSB_ERROR_NO_MEM;
+		}
+		/* usbfs has holes in the file */
+		if (!sysfs_has_descriptors) {
+			memset(priv->descriptors + priv->descriptors_len,
+			       0, descriptors_size - priv->descriptors_len);
+		}
+		r = read(fd, priv->descriptors + priv->descriptors_len,
+			 descriptors_size - priv->descriptors_len);
+		if (r < 0) {
+			usbi_err(ctx, "read descriptor failed ret=%d errno=%d",
+				 fd, errno);
+			close(fd);
+			return LIBUSB_ERROR_IO;
+		}
+		priv->descriptors_len += r;
+	} while (priv->descriptors_len == descriptors_size);
+
+	close(fd);
+
+	if (priv->descriptors_len < DEVICE_DESC_LENGTH) {
+		usbi_err(ctx, "short descriptor read (%d)",
+			 priv->descriptors_len);
+		return LIBUSB_ERROR_IO;
+	}
+
+	if (sysfs_can_relate_devices)
+		return LIBUSB_SUCCESS;
+
+	/* cache active config */
+	fd = _get_usbfs_fd(dev, O_RDWR, 1);
+	if (fd < 0) {
+		/* cannot send a control message to determine the active
+		 * config. just assume the first one is active. */
+		usbi_warn(ctx, "Missing rw usbfs access; cannot determine "
+			       "active configuration descriptor");
+		if (priv->descriptors_len >=
+				(DEVICE_DESC_LENGTH + LIBUSB_DT_CONFIG_SIZE)) {
+			struct libusb_config_descriptor config;
+			usbi_parse_descriptor(
+				priv->descriptors + DEVICE_DESC_LENGTH,
+				"bbwbbbbb", &config, 0);
+			priv->active_config = config.bConfigurationValue;
+		} else
+			priv->active_config = -1; /* No config dt */
+
+		return LIBUSB_SUCCESS;
+	}
+
+	r = usbfs_get_active_config(dev, fd);
+	if (r > 0) {
+		priv->active_config = r;
+		r = LIBUSB_SUCCESS;
+	} else if (r == 0) {
+		/* some buggy devices have a configuration 0, but we're
+		 * reaching into the corner of a corner case here, so let's
+		 * not support buggy devices in these circumstances.
+		 * stick to the specs: a configuration value of 0 means
+		 * unconfigured. */
+		usbi_dbg("active cfg 0? assuming unconfigured device");
+		priv->active_config = -1;
+		r = LIBUSB_SUCCESS;
+	} else if (r == LIBUSB_ERROR_IO) {
+		/* buggy devices sometimes fail to report their active config.
+		 * assume unconfigured and continue the probing */
+		usbi_warn(ctx, "couldn't query active configuration, assuming"
+			       " unconfigured");
+		priv->active_config = -1;
+		r = LIBUSB_SUCCESS;
+	} /* else r < 0, just return the error code */
+
+	close(fd);
+	return r;
+}
+
+static int linux_get_parent_info(struct libusb_device *dev, const char *sysfs_dir)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	struct libusb_device *it;
+	char *parent_sysfs_dir, *tmp;
+	int ret, add_parent = 1;
+
+	/* XXX -- can we figure out the topology when using usbfs? */
+	if (NULL == sysfs_dir || 0 == strncmp(sysfs_dir, "usb", 3)) {
+		/* either using usbfs or finding the parent of a root hub */
+		return LIBUSB_SUCCESS;
+	}
+
+	parent_sysfs_dir = strdup(sysfs_dir);
+	if (NULL != (tmp = strrchr(parent_sysfs_dir, '.')) ||
+	    NULL != (tmp = strrchr(parent_sysfs_dir, '-'))) {
+	        dev->port_number = atoi(tmp + 1);
+		*tmp = '\0';
+	} else {
+		usbi_warn(ctx, "Can not parse sysfs_dir: %s, no parent info",
+			  parent_sysfs_dir);
+		free (parent_sysfs_dir);
+		return LIBUSB_SUCCESS;
+	}
+
+	/* is the parent a root hub? */
+	if (NULL == strchr(parent_sysfs_dir, '-')) {
+		tmp = parent_sysfs_dir;
+		ret = asprintf (&parent_sysfs_dir, "usb%s", tmp);
+		free (tmp);
+		if (0 > ret) {
+			return LIBUSB_ERROR_NO_MEM;
+		}
+	}
+
+retry:
+	/* find the parent in the context */
+	usbi_mutex_lock(&ctx->usb_devs_lock);
+	list_for_each_entry(it, &ctx->usb_devs, list, struct libusb_device) {
+		struct linux_device_priv *priv = _device_priv(it);
+		if (0 == strcmp (priv->sysfs_dir, parent_sysfs_dir)) {
+			dev->parent_dev = libusb_ref_device(it);
+			break;
+		}
+	}
+	usbi_mutex_unlock(&ctx->usb_devs_lock);
+
+	if (!dev->parent_dev && add_parent) {
+		usbi_dbg("parent_dev %s not enumerated yet, enumerating now",
+			 parent_sysfs_dir);
+		sysfs_scan_device(ctx, parent_sysfs_dir);
+		add_parent = 0;
+		goto retry;
+	}
+
+	usbi_dbg("Dev %p (%s) has parent %p (%s) port %d", dev, sysfs_dir,
+		 dev->parent_dev, parent_sysfs_dir, dev->port_number);
+
+	free (parent_sysfs_dir);
+
+	return LIBUSB_SUCCESS;
+}
+
+int linux_enumerate_device(struct libusb_context *ctx,
+	uint8_t busnum, uint8_t devaddr, const char *sysfs_dir)
+{
+	unsigned long session_id;
+	struct libusb_device *dev;
+	int r = 0;
+
+	/* FIXME: session ID is not guaranteed unique as addresses can wrap and
+	 * will be reused. instead we should add a simple sysfs attribute with
+	 * a session ID. */
+	session_id = busnum << 8 | devaddr;
+	usbi_dbg("busnum %d devaddr %d session_id %ld", busnum, devaddr,
+		session_id);
+
+	dev = usbi_get_device_by_session_id(ctx, session_id);
+	if (dev) {
+		/* device already exists in the context */
+		usbi_dbg("session_id %ld already exists", session_id);
+		libusb_unref_device(dev);
+		return LIBUSB_SUCCESS;
+	}
+
+	usbi_dbg("allocating new device for %d/%d (session %ld)",
+		 busnum, devaddr, session_id);
+	dev = usbi_alloc_device(ctx, session_id);
+	if (!dev)
+		return LIBUSB_ERROR_NO_MEM;
+
+	r = initialize_device(dev, busnum, devaddr, sysfs_dir);
+	if (r < 0)
+		goto out;
+	r = usbi_sanitize_device(dev);
+	if (r < 0)
+		goto out;
+
+	r = linux_get_parent_info(dev, sysfs_dir);
+	if (r < 0)
+		goto out;
+out:
+	if (r < 0)
+		libusb_unref_device(dev);
+	else
+		usbi_connect_device(dev);
+
+	return r;
+}
+
+void linux_hotplug_enumerate(uint8_t busnum, uint8_t devaddr, const char *sys_name)
+{
+	struct libusb_context *ctx;
+
+	usbi_mutex_static_lock(&active_contexts_lock);
+	list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) {
+		linux_enumerate_device(ctx, busnum, devaddr, sys_name);
+	}
+	usbi_mutex_static_unlock(&active_contexts_lock);
+}
+
+void linux_device_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name)
+{
+	struct libusb_context *ctx;
+	struct libusb_device *dev;
+	unsigned long session_id = busnum << 8 | devaddr;
+
+	usbi_mutex_static_lock(&active_contexts_lock);
+	list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) {
+		dev = usbi_get_device_by_session_id (ctx, session_id);
+		if (NULL != dev) {
+			usbi_disconnect_device (dev);
+			libusb_unref_device(dev);
+		} else {
+			usbi_dbg("device not found for session %x", session_id);
+		}
+	}
+	usbi_mutex_static_unlock(&active_contexts_lock);
+}
+
+#if !defined(USE_UDEV)
+/* open a bus directory and adds all discovered devices to the context */
+static int usbfs_scan_busdir(struct libusb_context *ctx, uint8_t busnum)
+{
+	DIR *dir;
+	char dirpath[PATH_MAX];
+	struct dirent *entry;
+	int r = LIBUSB_ERROR_IO;
+
+	snprintf(dirpath, PATH_MAX, "%s/%03d", usbfs_path, busnum);
+	usbi_dbg("%s", dirpath);
+	dir = opendir(dirpath);
+	if (!dir) {
+		usbi_err(ctx, "opendir '%s' failed, errno=%d", dirpath, errno);
+		/* FIXME: should handle valid race conditions like hub unplugged
+		 * during directory iteration - this is not an error */
+		return r;
+	}
+
+	while ((entry = readdir(dir))) {
+		int devaddr;
+
+		if (entry->d_name[0] == '.')
+			continue;
+
+		devaddr = atoi(entry->d_name);
+		if (devaddr == 0) {
+			usbi_dbg("unknown dir entry %s", entry->d_name);
+			continue;
+		}
+
+		if (linux_enumerate_device(ctx, busnum, (uint8_t) devaddr, NULL)) {
+			usbi_dbg("failed to enumerate dir entry %s", entry->d_name);
+			continue;
+		}
+
+		r = 0;
+	}
+
+	closedir(dir);
+	return r;
+}
+
+static int usbfs_get_device_list(struct libusb_context *ctx)
+{
+	struct dirent *entry;
+	DIR *buses = opendir(usbfs_path);
+	int r = 0;
+
+	if (!buses) {
+		usbi_err(ctx, "opendir buses failed errno=%d", errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	while ((entry = readdir(buses))) {
+		int busnum;
+
+		if (entry->d_name[0] == '.')
+			continue;
+
+		if (usbdev_names) {
+			int devaddr;
+			if (!_is_usbdev_entry(entry, &busnum, &devaddr))
+				continue;
+
+			r = linux_enumerate_device(ctx, busnum, (uint8_t) devaddr, NULL);
+			if (r < 0) {
+				usbi_dbg("failed to enumerate dir entry %s", entry->d_name);
+				continue;
+			}
+		} else {
+			busnum = atoi(entry->d_name);
+			if (busnum == 0) {
+				usbi_dbg("unknown dir entry %s", entry->d_name);
+				continue;
+			}
+
+			r = usbfs_scan_busdir(ctx, busnum);
+			if (r < 0)
+				break;
+		}
+	}
+
+	closedir(buses);
+	return r;
+
+}
+#endif
+
+static int sysfs_scan_device(struct libusb_context *ctx, const char *devname)
+{
+	uint8_t busnum, devaddr;
+	int ret;
+
+	ret = linux_get_device_address (ctx, 0, &busnum, &devaddr, NULL, devname);
+	if (LIBUSB_SUCCESS != ret) {
+		return ret;
+	}
+
+	return linux_enumerate_device(ctx, busnum & 0xff, devaddr & 0xff,
+		devname);
+}
+
+#if !defined(USE_UDEV)
+static int sysfs_get_device_list(struct libusb_context *ctx)
+{
+	DIR *devices = opendir(SYSFS_DEVICE_PATH);
+	struct dirent *entry;
+	int r = LIBUSB_ERROR_IO;
+
+	if (!devices) {
+		usbi_err(ctx, "opendir devices failed errno=%d", errno);
+		return r;
+	}
+
+	while ((entry = readdir(devices))) {
+		if ((!isdigit(entry->d_name[0]) && strncmp(entry->d_name, "usb", 3))
+				|| strchr(entry->d_name, ':'))
+			continue;
+
+		if (sysfs_scan_device(ctx, entry->d_name)) {
+			usbi_dbg("failed to enumerate dir entry %s", entry->d_name);
+			continue;
+		}
+
+		r = 0;
+	}
+
+	closedir(devices);
+	return r;
+}
+
+static int linux_default_scan_devices (struct libusb_context *ctx)
+{
+	/* we can retrieve device list and descriptors from sysfs or usbfs.
+	 * sysfs is preferable, because if we use usbfs we end up resuming
+	 * any autosuspended USB devices. however, sysfs is not available
+	 * everywhere, so we need a usbfs fallback too.
+	 *
+	 * as described in the "sysfs vs usbfs" comment at the top of this
+	 * file, sometimes we have sysfs but not enough information to
+	 * relate sysfs devices to usbfs nodes.  op_init() determines the
+	 * adequacy of sysfs and sets sysfs_can_relate_devices.
+	 */
+	if (sysfs_can_relate_devices != 0)
+		return sysfs_get_device_list(ctx);
+	else
+		return usbfs_get_device_list(ctx);
+}
+#endif
+
+static int op_open(struct libusb_device_handle *handle)
+{
+	struct linux_device_handle_priv *hpriv = _device_handle_priv(handle);
+	int r;
+
+	hpriv->fd = _get_usbfs_fd(handle->dev, O_RDWR, 0);
+	if (hpriv->fd < 0) {
+		if (hpriv->fd == LIBUSB_ERROR_NO_DEVICE) {
+			/* device will still be marked as attached if hotplug monitor thread
+			 * hasn't processed remove event yet */
+			usbi_mutex_static_lock(&linux_hotplug_lock);
+			if (handle->dev->attached) {
+				usbi_dbg("open failed with no device, but device still attached");
+				linux_device_disconnected(handle->dev->bus_number,
+						handle->dev->device_address, NULL);
+			}
+			usbi_mutex_static_unlock(&linux_hotplug_lock);
+		}
+		return hpriv->fd;
+	}
+
+	r = ioctl(hpriv->fd, IOCTL_USBFS_GET_CAPABILITIES, &hpriv->caps);
+	if (r < 0) {
+		if (errno == ENOTTY)
+			usbi_dbg("getcap not available");
+		else
+			usbi_err(HANDLE_CTX(handle), "getcap failed (%d)", errno);
+		hpriv->caps = 0;
+		if (supports_flag_zero_packet)
+			hpriv->caps |= USBFS_CAP_ZERO_PACKET;
+		if (supports_flag_bulk_continuation)
+			hpriv->caps |= USBFS_CAP_BULK_CONTINUATION;
+	}
+
+	return usbi_add_pollfd(HANDLE_CTX(handle), hpriv->fd, POLLOUT);
+}
+
+static void op_close(struct libusb_device_handle *dev_handle)
+{
+	int fd = _device_handle_priv(dev_handle)->fd;
+	usbi_remove_pollfd(HANDLE_CTX(dev_handle), fd);
+	close(fd);
+}
+
+static int op_get_configuration(struct libusb_device_handle *handle,
+	int *config)
+{
+	int r;
+
+	if (sysfs_can_relate_devices) {
+		r = sysfs_get_active_config(handle->dev, config);
+	} else {
+		r = usbfs_get_active_config(handle->dev,
+					    _device_handle_priv(handle)->fd);
+	}
+	if (r < 0)
+		return r;
+
+	if (*config == -1) {
+		usbi_err(HANDLE_CTX(handle), "device unconfigured");
+		*config = 0;
+	}
+
+	return 0;
+}
+
+static int op_set_configuration(struct libusb_device_handle *handle, int config)
+{
+	struct linux_device_priv *priv = _device_priv(handle->dev);
+	int fd = _device_handle_priv(handle)->fd;
+	int r = ioctl(fd, IOCTL_USBFS_SETCONFIG, &config);
+	if (r) {
+		if (errno == EINVAL)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == EBUSY)
+			return LIBUSB_ERROR_BUSY;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle), "failed, error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	/* update our cached active config descriptor */
+	priv->active_config = config;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int claim_interface(struct libusb_device_handle *handle, int iface)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	int r = ioctl(fd, IOCTL_USBFS_CLAIMINTF, &iface);
+	if (r) {
+		if (errno == ENOENT)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == EBUSY)
+			return LIBUSB_ERROR_BUSY;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"claim interface failed, error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+	return 0;
+}
+
+static int release_interface(struct libusb_device_handle *handle, int iface)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	int r = ioctl(fd, IOCTL_USBFS_RELEASEINTF, &iface);
+	if (r) {
+		if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"release interface failed, error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+	return 0;
+}
+
+static int op_set_interface(struct libusb_device_handle *handle, int iface,
+	int altsetting)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	struct usbfs_setinterface setintf;
+	int r;
+
+	setintf.interface = iface;
+	setintf.altsetting = altsetting;
+	r = ioctl(fd, IOCTL_USBFS_SETINTF, &setintf);
+	if (r) {
+		if (errno == EINVAL)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"setintf failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return 0;
+}
+
+static int op_clear_halt(struct libusb_device_handle *handle,
+	unsigned char endpoint)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	unsigned int _endpoint = endpoint;
+	int r = ioctl(fd, IOCTL_USBFS_CLEAR_HALT, &_endpoint);
+	if (r) {
+		if (errno == ENOENT)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"clear_halt failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return 0;
+}
+
+static int op_reset_device(struct libusb_device_handle *handle)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	int i, r, ret = 0;
+
+	/* Doing a device reset will cause the usbfs driver to get unbound
+	   from any interfaces it is bound to. By voluntarily unbinding
+	   the usbfs driver ourself, we stop the kernel from rebinding
+	   the interface after reset (which would end up with the interface
+	   getting bound to the in kernel driver if any). */
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if (handle->claimed_interfaces & (1L << i)) {
+			release_interface(handle, i);
+		}
+	}
+
+	usbi_mutex_lock(&handle->lock);
+	r = ioctl(fd, IOCTL_USBFS_RESET, NULL);
+	if (r) {
+		if (errno == ENODEV) {
+			ret = LIBUSB_ERROR_NOT_FOUND;
+			goto out;
+		}
+
+		usbi_err(HANDLE_CTX(handle),
+			"reset failed error %d errno %d", r, errno);
+		ret = LIBUSB_ERROR_OTHER;
+		goto out;
+	}
+
+	/* And re-claim any interfaces which were claimed before the reset */
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if (handle->claimed_interfaces & (1L << i)) {
+			/*
+			 * A driver may have completed modprobing during
+			 * IOCTL_USBFS_RESET, and bound itself as soon as
+			 * IOCTL_USBFS_RESET released the device lock
+			 */
+			r = detach_kernel_driver_and_claim(handle, i);
+			if (r) {
+				usbi_warn(HANDLE_CTX(handle),
+					"failed to re-claim interface %d after reset: %s",
+					i, libusb_error_name(r));
+				handle->claimed_interfaces &= ~(1L << i);
+				ret = LIBUSB_ERROR_NOT_FOUND;
+			}
+		}
+	}
+out:
+	usbi_mutex_unlock(&handle->lock);
+	return ret;
+}
+
+static int do_streams_ioctl(struct libusb_device_handle *handle, long req,
+	uint32_t num_streams, unsigned char *endpoints, int num_endpoints)
+{
+	int r, fd = _device_handle_priv(handle)->fd;
+	struct usbfs_streams *streams;
+
+	if (num_endpoints > 30) /* Max 15 in + 15 out eps */
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	streams = malloc(sizeof(struct usbfs_streams) + num_endpoints);
+	if (!streams)
+		return LIBUSB_ERROR_NO_MEM;
+
+	streams->num_streams = num_streams;
+	streams->num_eps = num_endpoints;
+	memcpy(streams->eps, endpoints, num_endpoints);
+
+	r = ioctl(fd, req, streams);
+
+	free(streams);
+
+	if (r < 0) {
+		if (errno == ENOTTY)
+			return LIBUSB_ERROR_NOT_SUPPORTED;
+		else if (errno == EINVAL)
+			return LIBUSB_ERROR_INVALID_PARAM;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"streams-ioctl failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+	return r;
+}
+
+static int op_alloc_streams(struct libusb_device_handle *handle,
+	uint32_t num_streams, unsigned char *endpoints, int num_endpoints)
+{
+	return do_streams_ioctl(handle, IOCTL_USBFS_ALLOC_STREAMS,
+				num_streams, endpoints, num_endpoints);
+}
+
+static int op_free_streams(struct libusb_device_handle *handle,
+		unsigned char *endpoints, int num_endpoints)
+{
+	return do_streams_ioctl(handle, IOCTL_USBFS_FREE_STREAMS, 0,
+				endpoints, num_endpoints);
+}
+
+static int op_kernel_driver_active(struct libusb_device_handle *handle,
+	int interface)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	struct usbfs_getdriver getdrv;
+	int r;
+
+	getdrv.interface = interface;
+	r = ioctl(fd, IOCTL_USBFS_GETDRIVER, &getdrv);
+	if (r) {
+		if (errno == ENODATA)
+			return 0;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"get driver failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return (strcmp(getdrv.driver, "usbfs") == 0) ? 0 : 1;
+}
+
+static int op_detach_kernel_driver(struct libusb_device_handle *handle,
+	int interface)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	struct usbfs_ioctl command;
+	struct usbfs_getdriver getdrv;
+	int r;
+
+	command.ifno = interface;
+	command.ioctl_code = IOCTL_USBFS_DISCONNECT;
+	command.data = NULL;
+
+	getdrv.interface = interface;
+	r = ioctl(fd, IOCTL_USBFS_GETDRIVER, &getdrv);
+	if (r == 0 && strcmp(getdrv.driver, "usbfs") == 0)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	r = ioctl(fd, IOCTL_USBFS_IOCTL, &command);
+	if (r) {
+		if (errno == ENODATA)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == EINVAL)
+			return LIBUSB_ERROR_INVALID_PARAM;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle),
+			"detach failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	return 0;
+}
+
+static int op_attach_kernel_driver(struct libusb_device_handle *handle,
+	int interface)
+{
+	int fd = _device_handle_priv(handle)->fd;
+	struct usbfs_ioctl command;
+	int r;
+
+	command.ifno = interface;
+	command.ioctl_code = IOCTL_USBFS_CONNECT;
+	command.data = NULL;
+
+	r = ioctl(fd, IOCTL_USBFS_IOCTL, &command);
+	if (r < 0) {
+		if (errno == ENODATA)
+			return LIBUSB_ERROR_NOT_FOUND;
+		else if (errno == EINVAL)
+			return LIBUSB_ERROR_INVALID_PARAM;
+		else if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+		else if (errno == EBUSY)
+			return LIBUSB_ERROR_BUSY;
+
+		usbi_err(HANDLE_CTX(handle),
+			"attach failed error %d errno %d", r, errno);
+		return LIBUSB_ERROR_OTHER;
+	} else if (r == 0) {
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	return 0;
+}
+
+static int detach_kernel_driver_and_claim(struct libusb_device_handle *handle,
+	int interface)
+{
+	struct usbfs_disconnect_claim dc;
+	int r, fd = _device_handle_priv(handle)->fd;
+
+	dc.interface = interface;
+	strcpy(dc.driver, "usbfs");
+	dc.flags = USBFS_DISCONNECT_CLAIM_EXCEPT_DRIVER;
+	r = ioctl(fd, IOCTL_USBFS_DISCONNECT_CLAIM, &dc);
+	if (r == 0 || (r != 0 && errno != ENOTTY)) {
+		if (r == 0)
+			return 0;
+
+		switch (errno) {
+		case EBUSY:
+			return LIBUSB_ERROR_BUSY;
+		case EINVAL:
+			return LIBUSB_ERROR_INVALID_PARAM;
+		case ENODEV:
+			return LIBUSB_ERROR_NO_DEVICE;
+		}
+		usbi_err(HANDLE_CTX(handle),
+			"disconnect-and-claim failed errno %d", errno);
+		return LIBUSB_ERROR_OTHER;
+	}
+
+	/* Fallback code for kernels which don't support the
+	   disconnect-and-claim ioctl */
+	r = op_detach_kernel_driver(handle, interface);
+	if (r != 0 && r != LIBUSB_ERROR_NOT_FOUND)
+		return r;
+
+	return claim_interface(handle, interface);
+}
+
+static int op_claim_interface(struct libusb_device_handle *handle, int iface)
+{
+	if (handle->auto_detach_kernel_driver)
+		return detach_kernel_driver_and_claim(handle, iface);
+	else
+		return claim_interface(handle, iface);
+}
+
+static int op_release_interface(struct libusb_device_handle *handle, int iface)
+{
+	int r;
+
+	r = release_interface(handle, iface);
+	if (r)
+		return r;
+
+	if (handle->auto_detach_kernel_driver)
+		op_attach_kernel_driver(handle, iface);
+
+	return 0;
+}
+
+static void op_destroy_device(struct libusb_device *dev)
+{
+	struct linux_device_priv *priv = _device_priv(dev);
+	if (priv->descriptors)
+		free(priv->descriptors);
+	if (priv->sysfs_dir)
+		free(priv->sysfs_dir);
+}
+
+/* URBs are discarded in reverse order of submission to avoid races. */
+static int discard_urbs(struct usbi_transfer *itransfer, int first, int last_plus_one)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_transfer_priv *tpriv =
+		usbi_transfer_get_os_priv(itransfer);
+	struct linux_device_handle_priv *dpriv =
+		_device_handle_priv(transfer->dev_handle);
+	int i, ret = 0;
+	struct usbfs_urb *urb;
+
+	for (i = last_plus_one - 1; i >= first; i--) {
+		if (LIBUSB_TRANSFER_TYPE_ISOCHRONOUS == transfer->type)
+			urb = tpriv->iso_urbs[i];
+		else
+			urb = &tpriv->urbs[i];
+
+		if (0 == ioctl(dpriv->fd, IOCTL_USBFS_DISCARDURB, urb))
+			continue;
+
+		if (EINVAL == errno) {
+			usbi_dbg("URB not found --> assuming ready to be reaped");
+			if (i == (last_plus_one - 1))
+				ret = LIBUSB_ERROR_NOT_FOUND;
+		} else if (ENODEV == errno) {
+			usbi_dbg("Device not found for URB --> assuming ready to be reaped");
+			ret = LIBUSB_ERROR_NO_DEVICE;
+		} else {
+			usbi_warn(TRANSFER_CTX(transfer),
+				"unrecognised discard errno %d", errno);
+			ret = LIBUSB_ERROR_OTHER;
+		}
+	}
+	return ret;
+}
+
+static void free_iso_urbs(struct linux_transfer_priv *tpriv)
+{
+	int i;
+	for (i = 0; i < tpriv->num_urbs; i++) {
+		struct usbfs_urb *urb = tpriv->iso_urbs[i];
+		if (!urb)
+			break;
+		free(urb);
+	}
+
+	free(tpriv->iso_urbs);
+	tpriv->iso_urbs = NULL;
+}
+
+static int submit_bulk_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	struct linux_device_handle_priv *dpriv =
+		_device_handle_priv(transfer->dev_handle);
+	struct usbfs_urb *urbs;
+	int is_out = (transfer->endpoint & LIBUSB_ENDPOINT_DIR_MASK)
+		== LIBUSB_ENDPOINT_OUT;
+	int bulk_buffer_len, use_bulk_continuation;
+	int r;
+	int i;
+	size_t alloc_size;
+
+	if (tpriv->urbs)
+		return LIBUSB_ERROR_BUSY;
+
+	if (is_out && (transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) &&
+			!(dpriv->caps & USBFS_CAP_ZERO_PACKET))
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+
+	/*
+	 * Older versions of usbfs place a 16kb limit on bulk URBs. We work
+	 * around this by splitting large transfers into 16k blocks, and then
+	 * submit all urbs at once. it would be simpler to submit one urb at
+	 * a time, but there is a big performance gain doing it this way.
+	 *
+	 * Newer versions lift the 16k limit (USBFS_CAP_NO_PACKET_SIZE_LIM),
+	 * using arbritary large transfers can still be a bad idea though, as
+	 * the kernel needs to allocate physical contiguous memory for this,
+	 * which may fail for large buffers.
+	 *
+	 * The kernel solves this problem by splitting the transfer into
+	 * blocks itself when the host-controller is scatter-gather capable
+	 * (USBFS_CAP_BULK_SCATTER_GATHER), which most controllers are.
+	 *
+	 * Last, there is the issue of short-transfers when splitting, for
+	 * short split-transfers to work reliable USBFS_CAP_BULK_CONTINUATION
+	 * is needed, but this is not always available.
+	 */
+	if (dpriv->caps & USBFS_CAP_BULK_SCATTER_GATHER) {
+		/* Good! Just submit everything in one go */
+		bulk_buffer_len = transfer->length ? transfer->length : 1;
+		use_bulk_continuation = 0;
+	} else if (dpriv->caps & USBFS_CAP_BULK_CONTINUATION) {
+		/* Split the transfers and use bulk-continuation to
+		   avoid issues with short-transfers */
+		bulk_buffer_len = MAX_BULK_BUFFER_LENGTH;
+		use_bulk_continuation = 1;
+	} else if (dpriv->caps & USBFS_CAP_NO_PACKET_SIZE_LIM) {
+		/* Don't split, assume the kernel can alloc the buffer
+		   (otherwise the submit will fail with -ENOMEM) */
+		bulk_buffer_len = transfer->length ? transfer->length : 1;
+		use_bulk_continuation = 0;
+	} else {
+		/* Bad, splitting without bulk-continuation, short transfers
+		   which end before the last urb will not work reliable! */
+		/* Note we don't warn here as this is "normal" on kernels <
+		   2.6.32 and not a problem for most applications */
+		bulk_buffer_len = MAX_BULK_BUFFER_LENGTH;
+		use_bulk_continuation = 0;
+	}
+
+	int num_urbs = transfer->length / bulk_buffer_len;
+	int last_urb_partial = 0;
+
+	if (transfer->length == 0) {
+		num_urbs = 1;
+	} else if ((transfer->length % bulk_buffer_len) > 0) {
+		last_urb_partial = 1;
+		num_urbs++;
+	}
+	usbi_dbg("need %d urbs for new transfer with length %d", num_urbs,
+		transfer->length);
+	alloc_size = num_urbs * sizeof(struct usbfs_urb);
+	urbs = calloc(1, alloc_size);
+	if (!urbs)
+		return LIBUSB_ERROR_NO_MEM;
+	tpriv->urbs = urbs;
+	tpriv->num_urbs = num_urbs;
+	tpriv->num_retired = 0;
+	tpriv->reap_action = NORMAL;
+	tpriv->reap_status = LIBUSB_TRANSFER_COMPLETED;
+
+	for (i = 0; i < num_urbs; i++) {
+		struct usbfs_urb *urb = &urbs[i];
+		urb->usercontext = itransfer;
+		switch (transfer->type) {
+		case LIBUSB_TRANSFER_TYPE_BULK:
+			urb->type = USBFS_URB_TYPE_BULK;
+			urb->stream_id = 0;
+			break;
+		case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+			urb->type = USBFS_URB_TYPE_BULK;
+			urb->stream_id = itransfer->stream_id;
+			break;
+		case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+			urb->type = USBFS_URB_TYPE_INTERRUPT;
+			break;
+		}
+		urb->endpoint = transfer->endpoint;
+		urb->buffer = transfer->buffer + (i * bulk_buffer_len);
+		/* don't set the short not ok flag for the last URB */
+		if (use_bulk_continuation && !is_out && (i < num_urbs - 1))
+			urb->flags = USBFS_URB_SHORT_NOT_OK;
+		if (i == num_urbs - 1 && last_urb_partial)
+			urb->buffer_length = transfer->length % bulk_buffer_len;
+		else if (transfer->length == 0)
+			urb->buffer_length = 0;
+		else
+			urb->buffer_length = bulk_buffer_len;
+
+		if (i > 0 && use_bulk_continuation)
+			urb->flags |= USBFS_URB_BULK_CONTINUATION;
+
+		/* we have already checked that the flag is supported */
+		if (is_out && i == num_urbs - 1 &&
+		    transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET)
+			urb->flags |= USBFS_URB_ZERO_PACKET;
+
+		r = ioctl(dpriv->fd, IOCTL_USBFS_SUBMITURB, urb);
+		if (r < 0) {
+			if (errno == ENODEV) {
+				r = LIBUSB_ERROR_NO_DEVICE;
+			} else {
+				usbi_err(TRANSFER_CTX(transfer),
+					"submiturb failed error %d errno=%d", r, errno);
+				r = LIBUSB_ERROR_IO;
+			}
+
+			/* if the first URB submission fails, we can simply free up and
+			 * return failure immediately. */
+			if (i == 0) {
+				usbi_dbg("first URB failed, easy peasy");
+				free(urbs);
+				tpriv->urbs = NULL;
+				return r;
+			}
+
+			/* if it's not the first URB that failed, the situation is a bit
+			 * tricky. we may need to discard all previous URBs. there are
+			 * complications:
+			 *  - discarding is asynchronous - discarded urbs will be reaped
+			 *    later. the user must not have freed the transfer when the
+			 *    discarded URBs are reaped, otherwise libusb will be using
+			 *    freed memory.
+			 *  - the earlier URBs may have completed successfully and we do
+			 *    not want to throw away any data.
+			 *  - this URB failing may be no error; EREMOTEIO means that
+			 *    this transfer simply didn't need all the URBs we submitted
+			 * so, we report that the transfer was submitted successfully and
+			 * in case of error we discard all previous URBs. later when
+			 * the final reap completes we can report error to the user,
+			 * or success if an earlier URB was completed successfully.
+			 */
+			tpriv->reap_action = EREMOTEIO == errno ? COMPLETED_EARLY : SUBMIT_FAILED;
+
+			/* The URBs we haven't submitted yet we count as already
+			 * retired. */
+			tpriv->num_retired += num_urbs - i;
+
+			/* If we completed short then don't try to discard. */
+			if (COMPLETED_EARLY == tpriv->reap_action)
+				return 0;
+
+			discard_urbs(itransfer, 0, i);
+
+			usbi_dbg("reporting successful submission but waiting for %d "
+				"discards before reporting error", i);
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
+static int submit_iso_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	struct linux_device_handle_priv *dpriv =
+		_device_handle_priv(transfer->dev_handle);
+	struct usbfs_urb **urbs;
+	size_t alloc_size;
+	int num_packets = transfer->num_iso_packets;
+	int i;
+	int this_urb_len = 0;
+	int num_urbs = 1;
+	int packet_offset = 0;
+	unsigned int packet_len;
+	unsigned char *urb_buffer = transfer->buffer;
+
+	if (tpriv->iso_urbs)
+		return LIBUSB_ERROR_BUSY;
+
+	/* usbfs places a 32kb limit on iso URBs. we divide up larger requests
+	 * into smaller units to meet such restriction, then fire off all the
+	 * units at once. it would be simpler if we just fired one unit at a time,
+	 * but there is a big performance gain through doing it this way.
+	 *
+	 * Newer kernels lift the 32k limit (USBFS_CAP_NO_PACKET_SIZE_LIM),
+	 * using arbritary large transfers is still be a bad idea though, as
+	 * the kernel needs to allocate physical contiguous memory for this,
+	 * which may fail for large buffers.
+	 */
+
+	/* calculate how many URBs we need */
+	for (i = 0; i < num_packets; i++) {
+		unsigned int space_remaining = MAX_ISO_BUFFER_LENGTH - this_urb_len;
+		packet_len = transfer->iso_packet_desc[i].length;
+
+		if (packet_len > space_remaining) {
+			num_urbs++;
+			this_urb_len = packet_len;
+		} else {
+			this_urb_len += packet_len;
+		}
+	}
+	usbi_dbg("need %d 32k URBs for transfer", num_urbs);
+
+	alloc_size = num_urbs * sizeof(*urbs);
+	urbs = calloc(1, alloc_size);
+	if (!urbs)
+		return LIBUSB_ERROR_NO_MEM;
+
+	tpriv->iso_urbs = urbs;
+	tpriv->num_urbs = num_urbs;
+	tpriv->num_retired = 0;
+	tpriv->reap_action = NORMAL;
+	tpriv->iso_packet_offset = 0;
+
+	/* allocate + initialize each URB with the correct number of packets */
+	for (i = 0; i < num_urbs; i++) {
+		struct usbfs_urb *urb;
+		unsigned int space_remaining_in_urb = MAX_ISO_BUFFER_LENGTH;
+		int urb_packet_offset = 0;
+		unsigned char *urb_buffer_orig = urb_buffer;
+		int j;
+		int k;
+
+		/* swallow up all the packets we can fit into this URB */
+		while (packet_offset < transfer->num_iso_packets) {
+			packet_len = transfer->iso_packet_desc[packet_offset].length;
+			if (packet_len <= space_remaining_in_urb) {
+				/* throw it in */
+				urb_packet_offset++;
+				packet_offset++;
+				space_remaining_in_urb -= packet_len;
+				urb_buffer += packet_len;
+			} else {
+				/* it can't fit, save it for the next URB */
+				break;
+			}
+		}
+
+		alloc_size = sizeof(*urb)
+			+ (urb_packet_offset * sizeof(struct usbfs_iso_packet_desc));
+		urb = calloc(1, alloc_size);
+		if (!urb) {
+			free_iso_urbs(tpriv);
+			return LIBUSB_ERROR_NO_MEM;
+		}
+		urbs[i] = urb;
+
+		/* populate packet lengths */
+		for (j = 0, k = packet_offset - urb_packet_offset;
+				k < packet_offset; k++, j++) {
+			packet_len = transfer->iso_packet_desc[k].length;
+			urb->iso_frame_desc[j].length = packet_len;
+		}
+
+		urb->usercontext = itransfer;
+		urb->type = USBFS_URB_TYPE_ISO;
+		/* FIXME: interface for non-ASAP data? */
+		urb->flags = USBFS_URB_ISO_ASAP;
+		urb->endpoint = transfer->endpoint;
+		urb->number_of_packets = urb_packet_offset;
+		urb->buffer = urb_buffer_orig;
+	}
+
+	/* submit URBs */
+	for (i = 0; i < num_urbs; i++) {
+		int r = ioctl(dpriv->fd, IOCTL_USBFS_SUBMITURB, urbs[i]);
+		if (r < 0) {
+			if (errno == ENODEV) {
+				r = LIBUSB_ERROR_NO_DEVICE;
+			} else {
+				usbi_err(TRANSFER_CTX(transfer),
+					"submiturb failed error %d errno=%d", r, errno);
+				r = LIBUSB_ERROR_IO;
+			}
+
+			/* if the first URB submission fails, we can simply free up and
+			 * return failure immediately. */
+			if (i == 0) {
+				usbi_dbg("first URB failed, easy peasy");
+				free_iso_urbs(tpriv);
+				return r;
+			}
+
+			/* if it's not the first URB that failed, the situation is a bit
+			 * tricky. we must discard all previous URBs. there are
+			 * complications:
+			 *  - discarding is asynchronous - discarded urbs will be reaped
+			 *    later. the user must not have freed the transfer when the
+			 *    discarded URBs are reaped, otherwise libusb will be using
+			 *    freed memory.
+			 *  - the earlier URBs may have completed successfully and we do
+			 *    not want to throw away any data.
+			 * so, in this case we discard all the previous URBs BUT we report
+			 * that the transfer was submitted successfully. then later when
+			 * the final discard completes we can report error to the user.
+			 */
+			tpriv->reap_action = SUBMIT_FAILED;
+
+			/* The URBs we haven't submitted yet we count as already
+			 * retired. */
+			tpriv->num_retired = num_urbs - i;
+			discard_urbs(itransfer, 0, i);
+
+			usbi_dbg("reporting successful submission but waiting for %d "
+				"discards before reporting error", i);
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
+static int submit_control_transfer(struct usbi_transfer *itransfer)
+{
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_device_handle_priv *dpriv =
+		_device_handle_priv(transfer->dev_handle);
+	struct usbfs_urb *urb;
+	int r;
+
+	if (tpriv->urbs)
+		return LIBUSB_ERROR_BUSY;
+
+	if (transfer->length - LIBUSB_CONTROL_SETUP_SIZE > MAX_CTRL_BUFFER_LENGTH)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	urb = calloc(1, sizeof(struct usbfs_urb));
+	if (!urb)
+		return LIBUSB_ERROR_NO_MEM;
+	tpriv->urbs = urb;
+	tpriv->num_urbs = 1;
+	tpriv->reap_action = NORMAL;
+
+	urb->usercontext = itransfer;
+	urb->type = USBFS_URB_TYPE_CONTROL;
+	urb->endpoint = transfer->endpoint;
+	urb->buffer = transfer->buffer;
+	urb->buffer_length = transfer->length;
+
+	r = ioctl(dpriv->fd, IOCTL_USBFS_SUBMITURB, urb);
+	if (r < 0) {
+		free(urb);
+		tpriv->urbs = NULL;
+		if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(TRANSFER_CTX(transfer),
+			"submiturb failed error %d errno=%d", r, errno);
+		return LIBUSB_ERROR_IO;
+	}
+	return 0;
+}
+
+static int op_submit_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		return submit_control_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		return submit_bulk_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		return submit_bulk_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		return submit_iso_transfer(itransfer);
+	default:
+		usbi_err(TRANSFER_CTX(transfer),
+			"unknown endpoint type %d", transfer->type);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+static int op_cancel_transfer(struct usbi_transfer *itransfer)
+{
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		if (tpriv->reap_action == ERROR)
+			break;
+		/* else, fall through */
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		tpriv->reap_action = CANCELLED;
+		break;
+	default:
+		usbi_err(TRANSFER_CTX(transfer),
+			"unknown endpoint type %d", transfer->type);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	if (!tpriv->urbs)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	return discard_urbs(itransfer, 0, tpriv->num_urbs);
+}
+
+static void op_clear_transfer_priv(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+
+	/* urbs can be freed also in submit_transfer so lock mutex first */
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		usbi_mutex_lock(&itransfer->lock);
+		if (tpriv->urbs)
+			free(tpriv->urbs);
+		tpriv->urbs = NULL;
+		usbi_mutex_unlock(&itransfer->lock);
+		break;
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		usbi_mutex_lock(&itransfer->lock);
+		if (tpriv->iso_urbs)
+			free_iso_urbs(tpriv);
+		usbi_mutex_unlock(&itransfer->lock);
+		break;
+	default:
+		usbi_err(TRANSFER_CTX(transfer),
+			"unknown endpoint type %d", transfer->type);
+	}
+}
+
+static int handle_bulk_completion(struct usbi_transfer *itransfer,
+	struct usbfs_urb *urb)
+{
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	int urb_idx = urb - tpriv->urbs;
+
+	usbi_mutex_lock(&itransfer->lock);
+	usbi_dbg("handling completion status %d of bulk urb %d/%d", urb->status,
+		urb_idx + 1, tpriv->num_urbs);
+
+	tpriv->num_retired++;
+
+	if (tpriv->reap_action != NORMAL) {
+		/* cancelled, submit_fail, or completed early */
+		usbi_dbg("abnormal reap: urb status %d", urb->status);
+
+		/* even though we're in the process of cancelling, it's possible that
+		 * we may receive some data in these URBs that we don't want to lose.
+		 * examples:
+		 * 1. while the kernel is cancelling all the packets that make up an
+		 *    URB, a few of them might complete. so we get back a successful
+		 *    cancellation *and* some data.
+		 * 2. we receive a short URB which marks the early completion condition,
+		 *    so we start cancelling the remaining URBs. however, we're too
+		 *    slow and another URB completes (or at least completes partially).
+		 *    (this can't happen since we always use BULK_CONTINUATION.)
+		 *
+		 * When this happens, our objectives are not to lose any "surplus" data,
+		 * and also to stick it at the end of the previously-received data
+		 * (closing any holes), so that libusb reports the total amount of
+		 * transferred data and presents it in a contiguous chunk.
+		 */
+		if (urb->actual_length > 0) {
+			unsigned char *target = transfer->buffer + itransfer->transferred;
+			usbi_dbg("received %d bytes of surplus data", urb->actual_length);
+			if (urb->buffer != target) {
+				usbi_dbg("moving surplus data from offset %d to offset %d",
+					(unsigned char *) urb->buffer - transfer->buffer,
+					target - transfer->buffer);
+				memmove(target, urb->buffer, urb->actual_length);
+			}
+			itransfer->transferred += urb->actual_length;
+		}
+
+		if (tpriv->num_retired == tpriv->num_urbs) {
+			usbi_dbg("abnormal reap: last URB handled, reporting");
+			if (tpriv->reap_action != COMPLETED_EARLY &&
+			    tpriv->reap_status == LIBUSB_TRANSFER_COMPLETED)
+				tpriv->reap_status = LIBUSB_TRANSFER_ERROR;
+			goto completed;
+		}
+		goto out_unlock;
+	}
+
+	itransfer->transferred += urb->actual_length;
+
+	/* Many of these errors can occur on *any* urb of a multi-urb
+	 * transfer.  When they do, we tear down the rest of the transfer.
+	 */
+	switch (urb->status) {
+	case 0:
+		break;
+	case -EREMOTEIO: /* short transfer */
+		break;
+	case -ENOENT: /* cancelled */
+	case -ECONNRESET:
+		break;
+	case -ENODEV:
+	case -ESHUTDOWN:
+		usbi_dbg("device removed");
+		tpriv->reap_status = LIBUSB_TRANSFER_NO_DEVICE;
+		goto cancel_remaining;
+	case -EPIPE:
+		usbi_dbg("detected endpoint stall");
+		if (tpriv->reap_status == LIBUSB_TRANSFER_COMPLETED)
+			tpriv->reap_status = LIBUSB_TRANSFER_STALL;
+		goto cancel_remaining;
+	case -EOVERFLOW:
+		/* overflow can only ever occur in the last urb */
+		usbi_dbg("overflow, actual_length=%d", urb->actual_length);
+		if (tpriv->reap_status == LIBUSB_TRANSFER_COMPLETED)
+			tpriv->reap_status = LIBUSB_TRANSFER_OVERFLOW;
+		goto completed;
+	case -ETIME:
+	case -EPROTO:
+	case -EILSEQ:
+	case -ECOMM:
+	case -ENOSR:
+		usbi_dbg("low level error %d", urb->status);
+		tpriv->reap_action = ERROR;
+		goto cancel_remaining;
+	default:
+		usbi_warn(ITRANSFER_CTX(itransfer),
+			"unrecognised urb status %d", urb->status);
+		tpriv->reap_action = ERROR;
+		goto cancel_remaining;
+	}
+
+	/* if we're the last urb or we got less data than requested then we're
+	 * done */
+	if (urb_idx == tpriv->num_urbs - 1) {
+		usbi_dbg("last URB in transfer --> complete!");
+		goto completed;
+	} else if (urb->actual_length < urb->buffer_length) {
+		usbi_dbg("short transfer %d/%d --> complete!",
+			urb->actual_length, urb->buffer_length);
+		if (tpriv->reap_action == NORMAL)
+			tpriv->reap_action = COMPLETED_EARLY;
+	} else
+		goto out_unlock;
+
+cancel_remaining:
+	if (ERROR == tpriv->reap_action && LIBUSB_TRANSFER_COMPLETED == tpriv->reap_status)
+		tpriv->reap_status = LIBUSB_TRANSFER_ERROR;
+
+	if (tpriv->num_retired == tpriv->num_urbs) /* nothing to cancel */
+		goto completed;
+
+	/* cancel remaining urbs and wait for their completion before
+	 * reporting results */
+	discard_urbs(itransfer, urb_idx + 1, tpriv->num_urbs);
+
+out_unlock:
+	usbi_mutex_unlock(&itransfer->lock);
+	return 0;
+
+completed:
+	free(tpriv->urbs);
+	tpriv->urbs = NULL;
+	usbi_mutex_unlock(&itransfer->lock);
+	return CANCELLED == tpriv->reap_action ?
+		usbi_handle_transfer_cancellation(itransfer) :
+		usbi_handle_transfer_completion(itransfer, tpriv->reap_status);
+}
+
+static int handle_iso_completion(struct usbi_transfer *itransfer,
+	struct usbfs_urb *urb)
+{
+	struct libusb_transfer *transfer =
+		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	int num_urbs = tpriv->num_urbs;
+	int urb_idx = 0;
+	int i;
+	enum libusb_transfer_status status = LIBUSB_TRANSFER_COMPLETED;
+
+	usbi_mutex_lock(&itransfer->lock);
+	for (i = 0; i < num_urbs; i++) {
+		if (urb == tpriv->iso_urbs[i]) {
+			urb_idx = i + 1;
+			break;
+		}
+	}
+	if (urb_idx == 0) {
+		usbi_err(TRANSFER_CTX(transfer), "could not locate urb!");
+		usbi_mutex_unlock(&itransfer->lock);
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_dbg("handling completion status %d of iso urb %d/%d", urb->status,
+		urb_idx, num_urbs);
+
+	/* copy isochronous results back in */
+
+	for (i = 0; i < urb->number_of_packets; i++) {
+		struct usbfs_iso_packet_desc *urb_desc = &urb->iso_frame_desc[i];
+		struct libusb_iso_packet_descriptor *lib_desc =
+			&transfer->iso_packet_desc[tpriv->iso_packet_offset++];
+		lib_desc->status = LIBUSB_TRANSFER_COMPLETED;
+		switch (urb_desc->status) {
+		case 0:
+			break;
+		case -ENOENT: /* cancelled */
+		case -ECONNRESET:
+			break;
+		case -ENODEV:
+		case -ESHUTDOWN:
+			usbi_dbg("device removed");
+			lib_desc->status = LIBUSB_TRANSFER_NO_DEVICE;
+			break;
+		case -EPIPE:
+			usbi_dbg("detected endpoint stall");
+			lib_desc->status = LIBUSB_TRANSFER_STALL;
+			break;
+		case -EOVERFLOW:
+			usbi_dbg("overflow error");
+			lib_desc->status = LIBUSB_TRANSFER_OVERFLOW;
+			break;
+		case -ETIME:
+		case -EPROTO:
+		case -EILSEQ:
+		case -ECOMM:
+		case -ENOSR:
+		case -EXDEV:
+			usbi_dbg("low-level USB error %d", urb_desc->status);
+			lib_desc->status = LIBUSB_TRANSFER_ERROR;
+			break;
+		default:
+			usbi_warn(TRANSFER_CTX(transfer),
+				"unrecognised urb status %d", urb_desc->status);
+			lib_desc->status = LIBUSB_TRANSFER_ERROR;
+			break;
+		}
+		lib_desc->actual_length = urb_desc->actual_length;
+	}
+
+	tpriv->num_retired++;
+
+	if (tpriv->reap_action != NORMAL) { /* cancelled or submit_fail */
+		usbi_dbg("CANCEL: urb status %d", urb->status);
+
+		if (tpriv->num_retired == num_urbs) {
+			usbi_dbg("CANCEL: last URB handled, reporting");
+			free_iso_urbs(tpriv);
+			if (tpriv->reap_action == CANCELLED) {
+				usbi_mutex_unlock(&itransfer->lock);
+				return usbi_handle_transfer_cancellation(itransfer);
+			} else {
+				usbi_mutex_unlock(&itransfer->lock);
+				return usbi_handle_transfer_completion(itransfer,
+					LIBUSB_TRANSFER_ERROR);
+			}
+		}
+		goto out;
+	}
+
+	switch (urb->status) {
+	case 0:
+		break;
+	case -ENOENT: /* cancelled */
+	case -ECONNRESET:
+		break;
+	case -ESHUTDOWN:
+		usbi_dbg("device removed");
+		status = LIBUSB_TRANSFER_NO_DEVICE;
+		break;
+	default:
+		usbi_warn(TRANSFER_CTX(transfer),
+			"unrecognised urb status %d", urb->status);
+		status = LIBUSB_TRANSFER_ERROR;
+		break;
+	}
+
+	/* if we're the last urb then we're done */
+	if (urb_idx == num_urbs) {
+		usbi_dbg("last URB in transfer --> complete!");
+		free_iso_urbs(tpriv);
+		usbi_mutex_unlock(&itransfer->lock);
+		return usbi_handle_transfer_completion(itransfer, status);
+	}
+
+out:
+	usbi_mutex_unlock(&itransfer->lock);
+	return 0;
+}
+
+static int handle_control_completion(struct usbi_transfer *itransfer,
+	struct usbfs_urb *urb)
+{
+	struct linux_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
+	int status;
+
+	usbi_mutex_lock(&itransfer->lock);
+	usbi_dbg("handling completion status %d", urb->status);
+
+	itransfer->transferred += urb->actual_length;
+
+	if (tpriv->reap_action == CANCELLED) {
+		if (urb->status != 0 && urb->status != -ENOENT)
+			usbi_warn(ITRANSFER_CTX(itransfer),
+				"cancel: unrecognised urb status %d", urb->status);
+		free(tpriv->urbs);
+		tpriv->urbs = NULL;
+		usbi_mutex_unlock(&itransfer->lock);
+		return usbi_handle_transfer_cancellation(itransfer);
+	}
+
+	switch (urb->status) {
+	case 0:
+		status = LIBUSB_TRANSFER_COMPLETED;
+		break;
+	case -ENOENT: /* cancelled */
+		status = LIBUSB_TRANSFER_CANCELLED;
+		break;
+	case -ENODEV:
+	case -ESHUTDOWN:
+		usbi_dbg("device removed");
+		status = LIBUSB_TRANSFER_NO_DEVICE;
+		break;
+	case -EPIPE:
+		usbi_dbg("unsupported control request");
+		status = LIBUSB_TRANSFER_STALL;
+		break;
+	case -EOVERFLOW:
+		usbi_dbg("control overflow error");
+		status = LIBUSB_TRANSFER_OVERFLOW;
+		break;
+	case -ETIME:
+	case -EPROTO:
+	case -EILSEQ:
+	case -ECOMM:
+	case -ENOSR:
+		usbi_dbg("low-level bus error occurred");
+		status = LIBUSB_TRANSFER_ERROR;
+		break;
+	default:
+		usbi_warn(ITRANSFER_CTX(itransfer),
+			"unrecognised urb status %d", urb->status);
+		status = LIBUSB_TRANSFER_ERROR;
+		break;
+	}
+
+	free(tpriv->urbs);
+	tpriv->urbs = NULL;
+	usbi_mutex_unlock(&itransfer->lock);
+	return usbi_handle_transfer_completion(itransfer, status);
+}
+
+static int reap_for_handle(struct libusb_device_handle *handle)
+{
+	struct linux_device_handle_priv *hpriv = _device_handle_priv(handle);
+	int r;
+	struct usbfs_urb *urb;
+	struct usbi_transfer *itransfer;
+	struct libusb_transfer *transfer;
+
+	r = ioctl(hpriv->fd, IOCTL_USBFS_REAPURBNDELAY, &urb);
+	if (r == -1 && errno == EAGAIN)
+		return 1;
+	if (r < 0) {
+		if (errno == ENODEV)
+			return LIBUSB_ERROR_NO_DEVICE;
+
+		usbi_err(HANDLE_CTX(handle), "reap failed error %d errno=%d",
+			r, errno);
+		return LIBUSB_ERROR_IO;
+	}
+
+	itransfer = urb->usercontext;
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	usbi_dbg("urb type=%d status=%d transferred=%d", urb->type, urb->status,
+		urb->actual_length);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		return handle_iso_completion(itransfer, urb);
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		return handle_bulk_completion(itransfer, urb);
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		return handle_control_completion(itransfer, urb);
+	default:
+		usbi_err(HANDLE_CTX(handle), "unrecognised endpoint type %x",
+			transfer->type);
+		return LIBUSB_ERROR_OTHER;
+	}
+}
+
+static int op_handle_events(struct libusb_context *ctx,
+	struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready)
+{
+	int r;
+	unsigned int i = 0;
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	for (i = 0; i < nfds && num_ready > 0; i++) {
+		struct pollfd *pollfd = &fds[i];
+		struct libusb_device_handle *handle;
+		struct linux_device_handle_priv *hpriv = NULL;
+
+		if (!pollfd->revents)
+			continue;
+
+		num_ready--;
+		list_for_each_entry(handle, &ctx->open_devs, list, struct libusb_device_handle) {
+			hpriv = _device_handle_priv(handle);
+			if (hpriv->fd == pollfd->fd)
+				break;
+		}
+
+		if (!hpriv || hpriv->fd != pollfd->fd) {
+			usbi_err(ctx, "cannot find handle for fd %d\n",
+				 pollfd->fd);
+			continue;
+		}
+
+		if (pollfd->revents & POLLERR) {
+			usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->fd);
+			usbi_handle_disconnect(handle);
+			/* device will still be marked as attached if hotplug monitor thread
+			 * hasn't processed remove event yet */
+			usbi_mutex_static_lock(&linux_hotplug_lock);
+			if (handle->dev->attached)
+				linux_device_disconnected(handle->dev->bus_number,
+						handle->dev->device_address, NULL);
+			usbi_mutex_static_unlock(&linux_hotplug_lock);
+			continue;
+		}
+
+		do {
+			r = reap_for_handle(handle);
+		} while (r == 0);
+		if (r == 1 || r == LIBUSB_ERROR_NO_DEVICE)
+			continue;
+		else if (r < 0)
+			goto out;
+	}
+
+	r = 0;
+out:
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+	return r;
+}
+
+static int op_clock_gettime(int clk_id, struct timespec *tp)
+{
+	switch (clk_id) {
+	case USBI_CLOCK_MONOTONIC:
+		return clock_gettime(monotonic_clkid, tp);
+	case USBI_CLOCK_REALTIME:
+		return clock_gettime(CLOCK_REALTIME, tp);
+	default:
+		return LIBUSB_ERROR_INVALID_PARAM;
+  }
+}
+
+#ifdef USBI_TIMERFD_AVAILABLE
+static clockid_t op_get_timerfd_clockid(void)
+{
+	return monotonic_clkid;
+
+}
+#endif
+
+const struct usbi_os_backend linux_usbfs_backend = {
+	.name = "Linux usbfs",
+	.caps = USBI_CAP_HAS_HID_ACCESS|USBI_CAP_SUPPORTS_DETACH_KERNEL_DRIVER,
+	.init = op_init,
+	.exit = op_exit,
+	.get_device_list = NULL,
+	.hotplug_poll = op_hotplug_poll,
+	.get_device_descriptor = op_get_device_descriptor,
+	.get_active_config_descriptor = op_get_active_config_descriptor,
+	.get_config_descriptor = op_get_config_descriptor,
+	.get_config_descriptor_by_value = op_get_config_descriptor_by_value,
+
+	.open = op_open,
+	.close = op_close,
+	.get_configuration = op_get_configuration,
+	.set_configuration = op_set_configuration,
+	.claim_interface = op_claim_interface,
+	.release_interface = op_release_interface,
+
+	.set_interface_altsetting = op_set_interface,
+	.clear_halt = op_clear_halt,
+	.reset_device = op_reset_device,
+
+	.alloc_streams = op_alloc_streams,
+	.free_streams = op_free_streams,
+
+	.kernel_driver_active = op_kernel_driver_active,
+	.detach_kernel_driver = op_detach_kernel_driver,
+	.attach_kernel_driver = op_attach_kernel_driver,
+
+	.destroy_device = op_destroy_device,
+
+	.submit_transfer = op_submit_transfer,
+	.cancel_transfer = op_cancel_transfer,
+	.clear_transfer_priv = op_clear_transfer_priv,
+
+	.handle_events = op_handle_events,
+
+	.clock_gettime = op_clock_gettime,
+
+#ifdef USBI_TIMERFD_AVAILABLE
+	.get_timerfd_clockid = op_get_timerfd_clockid,
+#endif
+
+	.device_priv_size = sizeof(struct linux_device_priv),
+	.device_handle_priv_size = sizeof(struct linux_device_handle_priv),
+	.transfer_priv_size = sizeof(struct linux_transfer_priv),
+	.add_iso_packet_size = 0,
+};
diff --git a/Externals/libusb/libusb/os/linux_usbfs.h b/Externals/libusb/libusb/os/linux_usbfs.h
new file mode 100644
index 0000000000..f2404abf58
--- /dev/null
+++ b/Externals/libusb/libusb/os/linux_usbfs.h
@@ -0,0 +1,192 @@
+/*
+ * usbfs header structures
+ * Copyright © 2007 Daniel Drake <dsd@gentoo.org>
+ * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBUSB_USBFS_H
+#define LIBUSB_USBFS_H
+
+#include <linux/types.h>
+
+#define SYSFS_DEVICE_PATH "/sys/bus/usb/devices"
+
+struct usbfs_ctrltransfer {
+	/* keep in sync with usbdevice_fs.h:usbdevfs_ctrltransfer */
+	uint8_t  bmRequestType;
+	uint8_t  bRequest;
+	uint16_t wValue;
+	uint16_t wIndex;
+	uint16_t wLength;
+
+	uint32_t timeout;	/* in milliseconds */
+
+	/* pointer to data */
+	void *data;
+};
+
+struct usbfs_bulktransfer {
+	/* keep in sync with usbdevice_fs.h:usbdevfs_bulktransfer */
+	unsigned int ep;
+	unsigned int len;
+	unsigned int timeout;	/* in milliseconds */
+
+	/* pointer to data */
+	void *data;
+};
+
+struct usbfs_setinterface {
+	/* keep in sync with usbdevice_fs.h:usbdevfs_setinterface */
+	unsigned int interface;
+	unsigned int altsetting;
+};
+
+#define USBFS_MAXDRIVERNAME 255
+
+struct usbfs_getdriver {
+	unsigned int interface;
+	char driver[USBFS_MAXDRIVERNAME + 1];
+};
+
+#define USBFS_URB_SHORT_NOT_OK		0x01
+#define USBFS_URB_ISO_ASAP			0x02
+#define USBFS_URB_BULK_CONTINUATION	0x04
+#define USBFS_URB_QUEUE_BULK		0x10
+#define USBFS_URB_ZERO_PACKET		0x40
+
+enum usbfs_urb_type {
+	USBFS_URB_TYPE_ISO = 0,
+	USBFS_URB_TYPE_INTERRUPT = 1,
+	USBFS_URB_TYPE_CONTROL = 2,
+	USBFS_URB_TYPE_BULK = 3,
+};
+
+struct usbfs_iso_packet_desc {
+	unsigned int length;
+	unsigned int actual_length;
+	unsigned int status;
+};
+
+#define MAX_ISO_BUFFER_LENGTH		32768
+#define MAX_BULK_BUFFER_LENGTH		16384
+#define MAX_CTRL_BUFFER_LENGTH		4096
+
+struct usbfs_urb {
+	unsigned char type;
+	unsigned char endpoint;
+	int status;
+	unsigned int flags;
+	void *buffer;
+	int buffer_length;
+	int actual_length;
+	int start_frame;
+	union {
+		int number_of_packets;	/* Only used for isoc urbs */
+		unsigned int stream_id;	/* Only used with bulk streams */
+	};
+	int error_count;
+	unsigned int signr;
+	void *usercontext;
+	struct usbfs_iso_packet_desc iso_frame_desc[0];
+};
+
+struct usbfs_connectinfo {
+	unsigned int devnum;
+	unsigned char slow;
+};
+
+struct usbfs_ioctl {
+	int ifno;	/* interface 0..N ; negative numbers reserved */
+	int ioctl_code;	/* MUST encode size + direction of data so the
+			 * macros in <asm/ioctl.h> give correct values */
+	void *data;	/* param buffer (in, or out) */
+};
+
+struct usbfs_hub_portinfo {
+	unsigned char numports;
+	unsigned char port[127];	/* port to device num mapping */
+};
+
+#define USBFS_CAP_ZERO_PACKET		0x01
+#define USBFS_CAP_BULK_CONTINUATION	0x02
+#define USBFS_CAP_NO_PACKET_SIZE_LIM	0x04
+#define USBFS_CAP_BULK_SCATTER_GATHER	0x08
+
+#define USBFS_DISCONNECT_CLAIM_IF_DRIVER	0x01
+#define USBFS_DISCONNECT_CLAIM_EXCEPT_DRIVER	0x02
+
+struct usbfs_disconnect_claim {
+	unsigned int interface;
+	unsigned int flags;
+	char driver[USBFS_MAXDRIVERNAME + 1];
+};
+
+struct usbfs_streams {
+	unsigned int num_streams; /* Not used by USBDEVFS_FREE_STREAMS */
+	unsigned int num_eps;
+	unsigned char eps[0];
+};
+
+#define IOCTL_USBFS_CONTROL	_IOWR('U', 0, struct usbfs_ctrltransfer)
+#define IOCTL_USBFS_BULK		_IOWR('U', 2, struct usbfs_bulktransfer)
+#define IOCTL_USBFS_RESETEP	_IOR('U', 3, unsigned int)
+#define IOCTL_USBFS_SETINTF	_IOR('U', 4, struct usbfs_setinterface)
+#define IOCTL_USBFS_SETCONFIG	_IOR('U', 5, unsigned int)
+#define IOCTL_USBFS_GETDRIVER	_IOW('U', 8, struct usbfs_getdriver)
+#define IOCTL_USBFS_SUBMITURB	_IOR('U', 10, struct usbfs_urb)
+#define IOCTL_USBFS_DISCARDURB	_IO('U', 11)
+#define IOCTL_USBFS_REAPURB	_IOW('U', 12, void *)
+#define IOCTL_USBFS_REAPURBNDELAY	_IOW('U', 13, void *)
+#define IOCTL_USBFS_CLAIMINTF	_IOR('U', 15, unsigned int)
+#define IOCTL_USBFS_RELEASEINTF	_IOR('U', 16, unsigned int)
+#define IOCTL_USBFS_CONNECTINFO	_IOW('U', 17, struct usbfs_connectinfo)
+#define IOCTL_USBFS_IOCTL         _IOWR('U', 18, struct usbfs_ioctl)
+#define IOCTL_USBFS_HUB_PORTINFO	_IOR('U', 19, struct usbfs_hub_portinfo)
+#define IOCTL_USBFS_RESET		_IO('U', 20)
+#define IOCTL_USBFS_CLEAR_HALT	_IOR('U', 21, unsigned int)
+#define IOCTL_USBFS_DISCONNECT	_IO('U', 22)
+#define IOCTL_USBFS_CONNECT	_IO('U', 23)
+#define IOCTL_USBFS_CLAIM_PORT	_IOR('U', 24, unsigned int)
+#define IOCTL_USBFS_RELEASE_PORT	_IOR('U', 25, unsigned int)
+#define IOCTL_USBFS_GET_CAPABILITIES	_IOR('U', 26, __u32)
+#define IOCTL_USBFS_DISCONNECT_CLAIM	_IOR('U', 27, struct usbfs_disconnect_claim)
+#define IOCTL_USBFS_ALLOC_STREAMS	_IOR('U', 28, struct usbfs_streams)
+#define IOCTL_USBFS_FREE_STREAMS	_IOR('U', 29, struct usbfs_streams)
+
+extern usbi_mutex_static_t linux_hotplug_lock;
+
+#if defined(HAVE_LIBUDEV)
+int linux_udev_start_event_monitor(void);
+int linux_udev_stop_event_monitor(void);
+int linux_udev_scan_devices(struct libusb_context *ctx);
+void linux_udev_hotplug_poll(void);
+#else
+int linux_netlink_start_event_monitor(void);
+int linux_netlink_stop_event_monitor(void);
+void linux_netlink_hotplug_poll(void);
+#endif
+
+void linux_hotplug_enumerate(uint8_t busnum, uint8_t devaddr, const char *sys_name);
+void linux_device_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys_name);
+
+int linux_get_device_address (struct libusb_context *ctx, int detached,
+	uint8_t *busnum, uint8_t *devaddr, const char *dev_node,
+	const char *sys_name);
+int linux_enumerate_device(struct libusb_context *ctx,
+	uint8_t busnum, uint8_t devaddr, const char *sysfs_dir);
+
+#endif
diff --git a/Externals/libusb/libusb/os/netbsd_usb.c b/Externals/libusb/libusb/os/netbsd_usb.c
new file mode 100644
index 0000000000..ed4f50e6de
--- /dev/null
+++ b/Externals/libusb/libusb/os/netbsd_usb.c
@@ -0,0 +1,738 @@
+/*
+ * Copyright © 2011 Martin Pieuchot <mpi@openbsd.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <dev/usb/usb.h>
+
+#include "libusb.h"
+#include "libusbi.h"
+
+struct device_priv {
+	char devnode[16];
+	int fd;
+
+	unsigned char *cdesc;			/* active config descriptor */
+	usb_device_descriptor_t ddesc;		/* usb device descriptor */
+};
+
+struct handle_priv {
+	int pipe[2];				/* for event notification */
+	int endpoints[USB_MAX_ENDPOINTS];
+};
+
+/*
+ * Backend functions
+ */
+static int netbsd_get_device_list(struct libusb_context *,
+    struct discovered_devs **);
+static int netbsd_open(struct libusb_device_handle *);
+static void netbsd_close(struct libusb_device_handle *);
+
+static int netbsd_get_device_descriptor(struct libusb_device *, unsigned char *,
+    int *);
+static int netbsd_get_active_config_descriptor(struct libusb_device *,
+    unsigned char *, size_t, int *);
+static int netbsd_get_config_descriptor(struct libusb_device *, uint8_t,
+    unsigned char *, size_t, int *);
+
+static int netbsd_get_configuration(struct libusb_device_handle *, int *);
+static int netbsd_set_configuration(struct libusb_device_handle *, int);
+
+static int netbsd_claim_interface(struct libusb_device_handle *, int);
+static int netbsd_release_interface(struct libusb_device_handle *, int);
+
+static int netbsd_set_interface_altsetting(struct libusb_device_handle *, int,
+    int);
+static int netbsd_clear_halt(struct libusb_device_handle *, unsigned char);
+static int netbsd_reset_device(struct libusb_device_handle *);
+static void netbsd_destroy_device(struct libusb_device *);
+
+static int netbsd_submit_transfer(struct usbi_transfer *);
+static int netbsd_cancel_transfer(struct usbi_transfer *);
+static void netbsd_clear_transfer_priv(struct usbi_transfer *);
+static int netbsd_handle_events(struct libusb_context *ctx, struct pollfd *,
+    nfds_t, int);
+static int netbsd_clock_gettime(int, struct timespec *);
+
+/*
+ * Private functions
+ */
+static int _errno_to_libusb(int);
+static int _cache_active_config_descriptor(struct libusb_device *, int);
+static int _sync_control_transfer(struct usbi_transfer *);
+static int _sync_gen_transfer(struct usbi_transfer *);
+static int _access_endpoint(struct libusb_transfer *);
+
+const struct usbi_os_backend netbsd_backend = {
+	"Synchronous NetBSD backend",
+	0,
+	NULL,				/* init() */
+	NULL,				/* exit() */
+	netbsd_get_device_list,
+	NULL,				/* hotplug_poll */
+	netbsd_open,
+	netbsd_close,
+
+	netbsd_get_device_descriptor,
+	netbsd_get_active_config_descriptor,
+	netbsd_get_config_descriptor,
+	NULL,				/* get_config_descriptor_by_value() */
+
+	netbsd_get_configuration,
+	netbsd_set_configuration,
+
+	netbsd_claim_interface,
+	netbsd_release_interface,
+
+	netbsd_set_interface_altsetting,
+	netbsd_clear_halt,
+	netbsd_reset_device,
+
+	NULL,				/* alloc_streams */
+	NULL,				/* free_streams */
+
+	NULL,				/* kernel_driver_active() */
+	NULL,				/* detach_kernel_driver() */
+	NULL,				/* attach_kernel_driver() */
+
+	netbsd_destroy_device,
+
+	netbsd_submit_transfer,
+	netbsd_cancel_transfer,
+	netbsd_clear_transfer_priv,
+
+	netbsd_handle_events,
+
+	netbsd_clock_gettime,
+	sizeof(struct device_priv),
+	sizeof(struct handle_priv),
+	0,				/* transfer_priv_size */
+	0,				/* add_iso_packet_size */
+};
+
+int
+netbsd_get_device_list(struct libusb_context * ctx,
+	struct discovered_devs **discdevs)
+{
+	struct libusb_device *dev;
+	struct device_priv *dpriv;
+	struct usb_device_info di;
+	unsigned long session_id;
+	char devnode[16];
+	int fd, err, i;
+
+	usbi_dbg("");
+
+	/* Only ugen(4) is supported */
+	for (i = 0; i < USB_MAX_DEVICES; i++) {
+		/* Control endpoint is always .00 */
+		snprintf(devnode, sizeof(devnode), "/dev/ugen%d.00", i);
+
+		if ((fd = open(devnode, O_RDONLY)) < 0) {
+			if (errno != ENOENT && errno != ENXIO)
+				usbi_err(ctx, "could not open %s", devnode);
+			continue;
+		}
+
+		if (ioctl(fd, USB_GET_DEVICEINFO, &di) < 0)
+			continue;
+
+		session_id = (di.udi_bus << 8 | di.udi_addr);
+		dev = usbi_get_device_by_session_id(ctx, session_id);
+
+		if (dev == NULL) {
+			dev = usbi_alloc_device(ctx, session_id);
+			if (dev == NULL)
+				return (LIBUSB_ERROR_NO_MEM);
+
+			dev->bus_number = di.udi_bus;
+			dev->device_address = di.udi_addr;
+			dev->speed = di.udi_speed;
+
+			dpriv = (struct device_priv *)dev->os_priv;
+			strlcpy(dpriv->devnode, devnode, sizeof(devnode));
+			dpriv->fd = -1;
+
+			if (ioctl(fd, USB_GET_DEVICE_DESC, &dpriv->ddesc) < 0) {
+				err = errno;
+				goto error;
+			}
+
+			dpriv->cdesc = NULL;
+			if (_cache_active_config_descriptor(dev, fd)) {
+				err = errno;
+				goto error;
+			}
+
+			if ((err = usbi_sanitize_device(dev)))
+				goto error;
+		}
+		close(fd);
+
+		if (discovered_devs_append(*discdevs, dev) == NULL)
+			return (LIBUSB_ERROR_NO_MEM);
+
+		libusb_unref_device(dev);
+	}
+
+	return (LIBUSB_SUCCESS);
+
+error:
+	close(fd);
+	libusb_unref_device(dev);
+	return _errno_to_libusb(err);
+}
+
+int
+netbsd_open(struct libusb_device_handle *handle)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	dpriv->fd = open(dpriv->devnode, O_RDWR);
+	if (dpriv->fd < 0) {
+		dpriv->fd = open(dpriv->devnode, O_RDONLY);
+		if (dpriv->fd < 0)
+			return _errno_to_libusb(errno);
+	}
+
+	usbi_dbg("open %s: fd %d", dpriv->devnode, dpriv->fd);
+
+	if (pipe(hpriv->pipe) < 0)
+		return _errno_to_libusb(errno);
+
+	return usbi_add_pollfd(HANDLE_CTX(handle), hpriv->pipe[0], POLLIN);
+}
+
+void
+netbsd_close(struct libusb_device_handle *handle)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	usbi_dbg("close: fd %d", dpriv->fd);
+
+	close(dpriv->fd);
+	dpriv->fd = -1;
+
+	usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]);
+
+	close(hpriv->pipe[0]);
+	close(hpriv->pipe[1]);
+}
+
+int
+netbsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
+    int *host_endian)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+
+	usbi_dbg("");
+
+	memcpy(buf, &dpriv->ddesc, DEVICE_DESC_LENGTH);
+
+	*host_endian = 0;
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_get_active_config_descriptor(struct libusb_device *dev,
+    unsigned char *buf, size_t len, int *host_endian)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+	usb_config_descriptor_t *ucd;
+
+	ucd = (usb_config_descriptor_t *) dpriv->cdesc;
+	len = MIN(len, UGETW(ucd->wTotalLength));
+
+	usbi_dbg("len %d", len);
+
+	memcpy(buf, dpriv->cdesc, len);
+
+	*host_endian = 0;
+
+	return len;
+}
+
+int
+netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
+    unsigned char *buf, size_t len, int *host_endian)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+	struct usb_full_desc ufd;
+	int fd, err;
+
+	usbi_dbg("index %d, len %d", idx, len);
+
+	/* A config descriptor may be requested before opening the device */
+	if (dpriv->fd >= 0) {
+		fd = dpriv->fd;
+	} else {
+		fd = open(dpriv->devnode, O_RDONLY);
+		if (fd < 0)
+			return _errno_to_libusb(errno);
+	}
+
+	ufd.ufd_config_index = idx;
+	ufd.ufd_size = len;
+	ufd.ufd_data = buf;
+
+	if ((ioctl(fd, USB_GET_FULL_DESC, &ufd)) < 0) {
+		err = errno;
+		if (dpriv->fd < 0)
+			close(fd);
+		return _errno_to_libusb(err);
+	}
+
+	if (dpriv->fd < 0)
+		close(fd);
+
+	*host_endian = 0;
+
+	return len;
+}
+
+int
+netbsd_get_configuration(struct libusb_device_handle *handle, int *config)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	usbi_dbg("");
+
+	if (ioctl(dpriv->fd, USB_GET_CONFIG, config) < 0)
+		return _errno_to_libusb(errno);
+
+	usbi_dbg("configuration %d", *config);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_set_configuration(struct libusb_device_handle *handle, int config)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	usbi_dbg("configuration %d", config);
+
+	if (ioctl(dpriv->fd, USB_SET_CONFIG, &config) < 0)
+		return _errno_to_libusb(errno);
+
+	return _cache_active_config_descriptor(handle->dev, dpriv->fd);
+}
+
+int
+netbsd_claim_interface(struct libusb_device_handle *handle, int iface)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	int i;
+
+	for (i = 0; i < USB_MAX_ENDPOINTS; i++)
+		hpriv->endpoints[i] = -1;
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_release_interface(struct libusb_device_handle *handle, int iface)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	int i;
+
+	for (i = 0; i < USB_MAX_ENDPOINTS; i++)
+		if (hpriv->endpoints[i] >= 0)
+			close(hpriv->endpoints[i]);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface,
+    int altsetting)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+	struct usb_alt_interface intf;
+
+	usbi_dbg("iface %d, setting %d", iface, altsetting);
+
+	memset(&intf, 0, sizeof(intf));
+
+	intf.uai_interface_index = iface;
+	intf.uai_alt_no = altsetting;
+
+	if (ioctl(dpriv->fd, USB_SET_ALTINTERFACE, &intf) < 0)
+		return _errno_to_libusb(errno);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+	struct usb_ctl_request req;
+
+	usbi_dbg("");
+
+	req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT;
+	req.ucr_request.bRequest = UR_CLEAR_FEATURE;
+	USETW(req.ucr_request.wValue, UF_ENDPOINT_HALT);
+	USETW(req.ucr_request.wIndex, endpoint);
+	USETW(req.ucr_request.wLength, 0);
+
+	if (ioctl(dpriv->fd, USB_DO_REQUEST, &req) < 0)
+		return _errno_to_libusb(errno);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_reset_device(struct libusb_device_handle *handle)
+{
+	usbi_dbg("");
+
+	return (LIBUSB_ERROR_NOT_SUPPORTED);
+}
+
+void
+netbsd_destroy_device(struct libusb_device *dev)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+
+	usbi_dbg("");
+
+	free(dpriv->cdesc);
+}
+
+int
+netbsd_submit_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	struct handle_priv *hpriv;
+	int err = 0;
+
+	usbi_dbg("");
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		err = _sync_control_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		if (IS_XFEROUT(transfer)) {
+			/* Isochronous write is not supported */
+			err = LIBUSB_ERROR_NOT_SUPPORTED;
+			break;
+		}
+		err = _sync_gen_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		if (IS_XFEROUT(transfer) &&
+		    transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) {
+			err = LIBUSB_ERROR_NOT_SUPPORTED;
+			break;
+		}
+		err = _sync_gen_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		err = LIBUSB_ERROR_NOT_SUPPORTED;
+		break;
+	}
+
+	if (err)
+		return (err);
+
+	if (write(hpriv->pipe[1], &itransfer, sizeof(itransfer)) < 0)
+		return _errno_to_libusb(errno);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_cancel_transfer(struct usbi_transfer *itransfer)
+{
+	usbi_dbg("");
+
+	return (LIBUSB_ERROR_NOT_SUPPORTED);
+}
+
+void
+netbsd_clear_transfer_priv(struct usbi_transfer *itransfer)
+{
+	usbi_dbg("");
+
+	/* Nothing to do */
+}
+
+int
+netbsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds,
+    int num_ready)
+{
+	struct libusb_device_handle *handle;
+	struct handle_priv *hpriv = NULL;
+	struct usbi_transfer *itransfer;
+	struct pollfd *pollfd;
+	int i, err = 0;
+
+	usbi_dbg("");
+
+	pthread_mutex_lock(&ctx->open_devs_lock);
+	for (i = 0; i < nfds && num_ready > 0; i++) {
+		pollfd = &fds[i];
+
+		if (!pollfd->revents)
+			continue;
+
+		hpriv = NULL;
+		num_ready--;
+		list_for_each_entry(handle, &ctx->open_devs, list,
+		    struct libusb_device_handle) {
+			hpriv = (struct handle_priv *)handle->os_priv;
+
+			if (hpriv->pipe[0] == pollfd->fd)
+				break;
+
+			hpriv = NULL;
+		}
+
+		if (NULL == hpriv) {
+			usbi_dbg("fd %d is not an event pipe!", pollfd->fd);
+			err = ENOENT;
+			break;
+		}
+
+		if (pollfd->revents & POLLERR) {
+			usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]);
+			usbi_handle_disconnect(handle);
+			continue;
+		}
+
+		if (read(hpriv->pipe[0], &itransfer, sizeof(itransfer)) < 0) {
+			err = errno;
+			break;
+		}
+
+		if ((err = usbi_handle_transfer_completion(itransfer,
+		    LIBUSB_TRANSFER_COMPLETED)))
+			break;
+	}
+	pthread_mutex_unlock(&ctx->open_devs_lock);
+
+	if (err)
+		return _errno_to_libusb(err);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+netbsd_clock_gettime(int clkid, struct timespec *tp)
+{
+	usbi_dbg("clock %d", clkid);
+
+	if (clkid == USBI_CLOCK_REALTIME)
+		return clock_gettime(CLOCK_REALTIME, tp);
+
+	if (clkid == USBI_CLOCK_MONOTONIC)
+		return clock_gettime(CLOCK_MONOTONIC, tp);
+
+	return (LIBUSB_ERROR_INVALID_PARAM);
+}
+
+int
+_errno_to_libusb(int err)
+{
+	switch (err) {
+	case EIO:
+		return (LIBUSB_ERROR_IO);
+	case EACCES:
+		return (LIBUSB_ERROR_ACCESS);
+	case ENOENT:
+		return (LIBUSB_ERROR_NO_DEVICE);
+	case ENOMEM:
+		return (LIBUSB_ERROR_NO_MEM);
+	}
+
+	usbi_dbg("error: %s", strerror(err));
+
+	return (LIBUSB_ERROR_OTHER);
+}
+
+int
+_cache_active_config_descriptor(struct libusb_device *dev, int fd)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+	struct usb_config_desc ucd;
+	struct usb_full_desc ufd;
+	unsigned char* buf;
+	int len;
+
+	usbi_dbg("fd %d", fd);
+
+	ucd.ucd_config_index = USB_CURRENT_CONFIG_INDEX;
+
+	if ((ioctl(fd, USB_GET_CONFIG_DESC, &ucd)) < 0)
+		return _errno_to_libusb(errno);
+
+	usbi_dbg("active bLength %d", ucd.ucd_desc.bLength);
+
+	len = UGETW(ucd.ucd_desc.wTotalLength);
+	buf = malloc(len);
+	if (buf == NULL)
+		return (LIBUSB_ERROR_NO_MEM);
+
+	ufd.ufd_config_index = ucd.ucd_config_index;
+	ufd.ufd_size = len;
+	ufd.ufd_data = buf;
+
+	usbi_dbg("index %d, len %d", ufd.ufd_config_index, len);
+
+	if ((ioctl(fd, USB_GET_FULL_DESC, &ufd)) < 0) {
+		free(buf);
+		return _errno_to_libusb(errno);
+	}
+
+	if (dpriv->cdesc)
+		free(dpriv->cdesc);
+	dpriv->cdesc = buf;
+
+	return (0);
+}
+
+int
+_sync_control_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	struct libusb_control_setup *setup;
+	struct device_priv *dpriv;
+	struct usb_ctl_request req;
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv;
+	setup = (struct libusb_control_setup *)transfer->buffer;
+
+	usbi_dbg("type %d request %d value %d index %d length %d timeout %d",
+	    setup->bmRequestType, setup->bRequest,
+	    libusb_le16_to_cpu(setup->wValue),
+	    libusb_le16_to_cpu(setup->wIndex),
+	    libusb_le16_to_cpu(setup->wLength), transfer->timeout);
+
+	req.ucr_request.bmRequestType = setup->bmRequestType;
+	req.ucr_request.bRequest = setup->bRequest;
+	/* Don't use USETW, libusb already deals with the endianness */
+	(*(uint16_t *)req.ucr_request.wValue) = setup->wValue;
+	(*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex;
+	(*(uint16_t *)req.ucr_request.wLength) = setup->wLength;
+	req.ucr_data = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
+
+	if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0)
+		req.ucr_flags = USBD_SHORT_XFER_OK;
+
+	if ((ioctl(dpriv->fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0)
+		return _errno_to_libusb(errno);
+
+	if ((ioctl(dpriv->fd, USB_DO_REQUEST, &req)) < 0)
+		return _errno_to_libusb(errno);
+
+	itransfer->transferred = req.ucr_actlen;
+
+	usbi_dbg("transferred %d", itransfer->transferred);
+
+	return (0);
+}
+
+int
+_access_endpoint(struct libusb_transfer *transfer)
+{
+	struct handle_priv *hpriv;
+	struct device_priv *dpriv;
+	char *s, devnode[16];
+	int fd, endpt;
+	mode_t mode;
+
+	hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
+	dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv;
+
+	endpt = UE_GET_ADDR(transfer->endpoint);
+	mode = IS_XFERIN(transfer) ? O_RDONLY : O_WRONLY;
+
+	usbi_dbg("endpoint %d mode %d", endpt, mode);
+
+	if (hpriv->endpoints[endpt] < 0) {
+		/* Pick the right node given the control one */
+		strlcpy(devnode, dpriv->devnode, sizeof(devnode));
+		s = strchr(devnode, '.');
+		snprintf(s, 4, ".%02d", endpt);
+
+		/* We may need to read/write to the same endpoint later. */
+		if (((fd = open(devnode, O_RDWR)) < 0) && (errno == ENXIO))
+			if ((fd = open(devnode, mode)) < 0)
+				return (-1);
+
+		hpriv->endpoints[endpt] = fd;
+	}
+
+	return (hpriv->endpoints[endpt]);
+}
+
+int
+_sync_gen_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	int fd, nr = 1;
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	/*
+	 * Bulk, Interrupt or Isochronous transfer depends on the
+	 * endpoint and thus the node to open.
+	 */
+	if ((fd = _access_endpoint(transfer)) < 0)
+		return _errno_to_libusb(errno);
+
+	if ((ioctl(fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0)
+		return _errno_to_libusb(errno);
+
+	if (IS_XFERIN(transfer)) {
+		if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0)
+			if ((ioctl(fd, USB_SET_SHORT_XFER, &nr)) < 0)
+				return _errno_to_libusb(errno);
+
+		nr = read(fd, transfer->buffer, transfer->length);
+	} else {
+		nr = write(fd, transfer->buffer, transfer->length);
+	}
+
+	if (nr < 0)
+		return _errno_to_libusb(errno);
+
+	itransfer->transferred = nr;
+
+	return (0);
+}
diff --git a/Externals/libusb/libusb/os/openbsd_usb.c b/Externals/libusb/libusb/os/openbsd_usb.c
new file mode 100644
index 0000000000..ff470bead5
--- /dev/null
+++ b/Externals/libusb/libusb/os/openbsd_usb.c
@@ -0,0 +1,832 @@
+/*
+ * Copyright © 2011-2013 Martin Pieuchot <mpi@openbsd.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <dev/usb/usb.h>
+
+#include "libusb.h"
+#include "libusbi.h"
+
+struct device_priv {
+	char *devname;				/* name of the ugen(4) node */
+	int fd;					/* device file descriptor */
+
+	unsigned char *cdesc;			/* active config descriptor */
+	usb_device_descriptor_t ddesc;		/* usb device descriptor */
+};
+
+struct handle_priv {
+	int pipe[2];				/* for event notification */
+	int endpoints[USB_MAX_ENDPOINTS];
+};
+
+/*
+ * Backend functions
+ */
+static int obsd_get_device_list(struct libusb_context *,
+    struct discovered_devs **);
+static int obsd_open(struct libusb_device_handle *);
+static void obsd_close(struct libusb_device_handle *);
+
+static int obsd_get_device_descriptor(struct libusb_device *, unsigned char *,
+    int *);
+static int obsd_get_active_config_descriptor(struct libusb_device *,
+    unsigned char *, size_t, int *);
+static int obsd_get_config_descriptor(struct libusb_device *, uint8_t,
+    unsigned char *, size_t, int *);
+
+static int obsd_get_configuration(struct libusb_device_handle *, int *);
+static int obsd_set_configuration(struct libusb_device_handle *, int);
+
+static int obsd_claim_interface(struct libusb_device_handle *, int);
+static int obsd_release_interface(struct libusb_device_handle *, int);
+
+static int obsd_set_interface_altsetting(struct libusb_device_handle *, int,
+    int);
+static int obsd_clear_halt(struct libusb_device_handle *, unsigned char);
+static int obsd_reset_device(struct libusb_device_handle *);
+static void obsd_destroy_device(struct libusb_device *);
+
+static int obsd_submit_transfer(struct usbi_transfer *);
+static int obsd_cancel_transfer(struct usbi_transfer *);
+static void obsd_clear_transfer_priv(struct usbi_transfer *);
+static int obsd_handle_events(struct libusb_context *ctx, struct pollfd *,
+    nfds_t, int);
+static int obsd_clock_gettime(int, struct timespec *);
+
+/*
+ * Private functions
+ */
+static int _errno_to_libusb(int);
+static int _cache_active_config_descriptor(struct libusb_device *);
+static int _sync_control_transfer(struct usbi_transfer *);
+static int _sync_gen_transfer(struct usbi_transfer *);
+static int _access_endpoint(struct libusb_transfer *);
+
+static int _bus_open(int);
+
+
+const struct usbi_os_backend openbsd_backend = {
+	"Synchronous OpenBSD backend",
+	0,
+	NULL,				/* init() */
+	NULL,				/* exit() */
+	obsd_get_device_list,
+	NULL,				/* hotplug_poll */
+	obsd_open,
+	obsd_close,
+
+	obsd_get_device_descriptor,
+	obsd_get_active_config_descriptor,
+	obsd_get_config_descriptor,
+	NULL,				/* get_config_descriptor_by_value() */
+
+	obsd_get_configuration,
+	obsd_set_configuration,
+
+	obsd_claim_interface,
+	obsd_release_interface,
+
+	obsd_set_interface_altsetting,
+	obsd_clear_halt,
+	obsd_reset_device,
+
+	NULL,				/* alloc_streams */
+	NULL,				/* free_streams */
+
+	NULL,				/* kernel_driver_active() */
+	NULL,				/* detach_kernel_driver() */
+	NULL,				/* attach_kernel_driver() */
+
+	obsd_destroy_device,
+
+	obsd_submit_transfer,
+	obsd_cancel_transfer,
+	obsd_clear_transfer_priv,
+
+	obsd_handle_events,
+
+	obsd_clock_gettime,
+	sizeof(struct device_priv),
+	sizeof(struct handle_priv),
+	0,				/* transfer_priv_size */
+	0,				/* add_iso_packet_size */
+};
+
+#define DEVPATH	"/dev/"
+#define USBDEV	DEVPATH "usb"
+
+int
+obsd_get_device_list(struct libusb_context * ctx,
+	struct discovered_devs **discdevs)
+{
+	struct discovered_devs *ddd;
+	struct libusb_device *dev;
+	struct device_priv *dpriv;
+	struct usb_device_info di;
+	struct usb_device_ddesc dd;
+	unsigned long session_id;
+	char devices[USB_MAX_DEVICES];
+	char busnode[16];
+	char *udevname;
+	int fd, addr, i, j;
+
+	usbi_dbg("");
+
+	for (i = 0; i < 8; i++) {
+		snprintf(busnode, sizeof(busnode), USBDEV "%d", i);
+
+		if ((fd = open(busnode, O_RDWR)) < 0) {
+			if (errno != ENOENT && errno != ENXIO)
+				usbi_err(ctx, "could not open %s", busnode);
+			continue;
+		}
+
+		bzero(devices, sizeof(devices));
+		for (addr = 1; addr < USB_MAX_DEVICES; addr++) {
+			if (devices[addr])
+				continue;
+
+			di.udi_addr = addr;
+			if (ioctl(fd, USB_DEVICEINFO, &di) < 0)
+				continue;
+
+			/*
+			 * XXX If ugen(4) is attached to the USB device
+			 * it will be used.
+			 */
+			udevname = NULL;
+			for (j = 0; j < USB_MAX_DEVNAMES; j++)
+				if (!strncmp("ugen", di.udi_devnames[j], 4)) {
+					udevname = strdup(di.udi_devnames[j]);
+					break;
+				}
+
+			session_id = (di.udi_bus << 8 | di.udi_addr);
+			dev = usbi_get_device_by_session_id(ctx, session_id);
+
+			if (dev == NULL) {
+				dev = usbi_alloc_device(ctx, session_id);
+				if (dev == NULL) {
+					close(fd);
+					return (LIBUSB_ERROR_NO_MEM);
+				}
+
+				dev->bus_number = di.udi_bus;
+				dev->device_address = di.udi_addr;
+				dev->speed = di.udi_speed;
+
+				dpriv = (struct device_priv *)dev->os_priv;
+				dpriv->fd = -1;
+				dpriv->cdesc = NULL;
+				dpriv->devname = udevname;
+
+				dd.udd_bus = di.udi_bus;
+				dd.udd_addr = di.udi_addr;
+				if (ioctl(fd, USB_DEVICE_GET_DDESC, &dd) < 0) {
+					libusb_unref_device(dev);
+					continue;
+				}
+				dpriv->ddesc = dd.udd_desc;
+
+				if (_cache_active_config_descriptor(dev)) {
+					libusb_unref_device(dev);
+					continue;
+				}
+
+				if (usbi_sanitize_device(dev)) {
+					libusb_unref_device(dev);
+					continue;
+				}
+			}
+
+			ddd = discovered_devs_append(*discdevs, dev);
+			if (ddd == NULL) {
+				close(fd);
+				return (LIBUSB_ERROR_NO_MEM);
+			}
+			libusb_unref_device(dev);
+
+			*discdevs = ddd;
+			devices[addr] = 1;
+		}
+
+		close(fd);
+	}
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_open(struct libusb_device_handle *handle)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+	char devnode[16];
+
+	if (dpriv->devname) {
+		/*
+		 * Only open ugen(4) attached devices read-write, all
+		 * read-only operations are done through the bus node.
+		 */
+		snprintf(devnode, sizeof(devnode), DEVPATH "%s.00",
+		    dpriv->devname);
+		dpriv->fd = open(devnode, O_RDWR);
+		if (dpriv->fd < 0)
+			return _errno_to_libusb(errno);
+
+		usbi_dbg("open %s: fd %d", devnode, dpriv->fd);
+	}
+
+	if (pipe(hpriv->pipe) < 0)
+		return _errno_to_libusb(errno);
+
+	return usbi_add_pollfd(HANDLE_CTX(handle), hpriv->pipe[0], POLLIN);
+}
+
+void
+obsd_close(struct libusb_device_handle *handle)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	if (dpriv->devname) {
+		usbi_dbg("close: fd %d", dpriv->fd);
+
+		close(dpriv->fd);
+		dpriv->fd = -1;
+	}
+
+	usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]);
+
+	close(hpriv->pipe[0]);
+	close(hpriv->pipe[1]);
+}
+
+int
+obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
+    int *host_endian)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+
+	usbi_dbg("");
+
+	memcpy(buf, &dpriv->ddesc, DEVICE_DESC_LENGTH);
+
+	*host_endian = 0;
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_get_active_config_descriptor(struct libusb_device *dev,
+    unsigned char *buf, size_t len, int *host_endian)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+	usb_config_descriptor_t *ucd = (usb_config_descriptor_t *)dpriv->cdesc;
+
+	len = MIN(len, UGETW(ucd->wTotalLength));
+
+	usbi_dbg("len %d", len);
+
+	memcpy(buf, dpriv->cdesc, len);
+
+	*host_endian = 0;
+
+	return (len);
+}
+
+int
+obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
+    unsigned char *buf, size_t len, int *host_endian)
+{
+	struct usb_device_fdesc udf;
+	int fd, err;
+
+	if ((fd = _bus_open(dev->bus_number)) < 0)
+		return _errno_to_libusb(errno);
+
+	udf.udf_bus = dev->bus_number;
+	udf.udf_addr = dev->device_address;
+	udf.udf_config_index = idx;
+	udf.udf_size = len;
+	udf.udf_data = buf;
+
+	usbi_dbg("index %d, len %d", udf.udf_config_index, len);
+
+	if (ioctl(fd, USB_DEVICE_GET_FDESC, &udf) < 0) {
+		err = errno;
+		close(fd);
+		return _errno_to_libusb(err);
+	}
+	close(fd);
+
+	*host_endian = 0;
+
+	return (len);
+}
+
+int
+obsd_get_configuration(struct libusb_device_handle *handle, int *config)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+	usb_config_descriptor_t *ucd = (usb_config_descriptor_t *)dpriv->cdesc;
+
+	*config = ucd->bConfigurationValue;
+
+	usbi_dbg("bConfigurationValue %d", *config);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_set_configuration(struct libusb_device_handle *handle, int config)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+
+	if (dpriv->devname == NULL)
+		return (LIBUSB_ERROR_NOT_SUPPORTED);
+
+	usbi_dbg("bConfigurationValue %d", config);
+
+	if (ioctl(dpriv->fd, USB_SET_CONFIG, &config) < 0)
+		return _errno_to_libusb(errno);
+
+	return _cache_active_config_descriptor(handle->dev);
+}
+
+int
+obsd_claim_interface(struct libusb_device_handle *handle, int iface)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	int i;
+
+	for (i = 0; i < USB_MAX_ENDPOINTS; i++)
+		hpriv->endpoints[i] = -1;
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_release_interface(struct libusb_device_handle *handle, int iface)
+{
+	struct handle_priv *hpriv = (struct handle_priv *)handle->os_priv;
+	int i;
+
+	for (i = 0; i < USB_MAX_ENDPOINTS; i++)
+		if (hpriv->endpoints[i] >= 0)
+			close(hpriv->endpoints[i]);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_set_interface_altsetting(struct libusb_device_handle *handle, int iface,
+    int altsetting)
+{
+	struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
+	struct usb_alt_interface intf;
+
+	if (dpriv->devname == NULL)
+		return (LIBUSB_ERROR_NOT_SUPPORTED);
+
+	usbi_dbg("iface %d, setting %d", iface, altsetting);
+
+	memset(&intf, 0, sizeof(intf));
+
+	intf.uai_interface_index = iface;
+	intf.uai_alt_no = altsetting;
+
+	if (ioctl(dpriv->fd, USB_SET_ALTINTERFACE, &intf) < 0)
+		return _errno_to_libusb(errno);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
+{
+	struct usb_ctl_request req;
+	int fd, err;
+
+	if ((fd = _bus_open(handle->dev->bus_number)) < 0)
+		return _errno_to_libusb(errno);
+
+	usbi_dbg("");
+
+	req.ucr_addr = handle->dev->device_address;
+	req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT;
+	req.ucr_request.bRequest = UR_CLEAR_FEATURE;
+	USETW(req.ucr_request.wValue, UF_ENDPOINT_HALT);
+	USETW(req.ucr_request.wIndex, endpoint);
+	USETW(req.ucr_request.wLength, 0);
+
+	if (ioctl(fd, USB_REQUEST, &req) < 0) {
+		err = errno;
+		close(fd);
+		return _errno_to_libusb(err);
+	}
+	close(fd);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_reset_device(struct libusb_device_handle *handle)
+{
+	usbi_dbg("");
+
+	return (LIBUSB_ERROR_NOT_SUPPORTED);
+}
+
+void
+obsd_destroy_device(struct libusb_device *dev)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+
+	usbi_dbg("");
+
+	free(dpriv->cdesc);
+	free(dpriv->devname);
+}
+
+int
+obsd_submit_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	struct handle_priv *hpriv;
+	int err = 0;
+
+	usbi_dbg("");
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		err = _sync_control_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		if (IS_XFEROUT(transfer)) {
+			/* Isochronous write is not supported */
+			err = LIBUSB_ERROR_NOT_SUPPORTED;
+			break;
+		}
+		err = _sync_gen_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		if (IS_XFEROUT(transfer) &&
+		    transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) {
+			err = LIBUSB_ERROR_NOT_SUPPORTED;
+			break;
+		}
+		err = _sync_gen_transfer(itransfer);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		err = LIBUSB_ERROR_NOT_SUPPORTED;
+		break;
+	}
+
+	if (err)
+		return (err);
+
+	if (write(hpriv->pipe[1], &itransfer, sizeof(itransfer)) < 0)
+		return _errno_to_libusb(errno);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_cancel_transfer(struct usbi_transfer *itransfer)
+{
+	usbi_dbg("");
+
+	return (LIBUSB_ERROR_NOT_SUPPORTED);
+}
+
+void
+obsd_clear_transfer_priv(struct usbi_transfer *itransfer)
+{
+	usbi_dbg("");
+
+	/* Nothing to do */
+}
+
+int
+obsd_handle_events(struct libusb_context *ctx, struct pollfd *fds, nfds_t nfds,
+    int num_ready)
+{
+	struct libusb_device_handle *handle;
+	struct handle_priv *hpriv = NULL;
+	struct usbi_transfer *itransfer;
+	struct pollfd *pollfd;
+	int i, err = 0;
+
+	usbi_dbg("");
+
+	pthread_mutex_lock(&ctx->open_devs_lock);
+	for (i = 0; i < nfds && num_ready > 0; i++) {
+		pollfd = &fds[i];
+
+		if (!pollfd->revents)
+			continue;
+
+		hpriv = NULL;
+		num_ready--;
+		list_for_each_entry(handle, &ctx->open_devs, list,
+		    struct libusb_device_handle) {
+			hpriv = (struct handle_priv *)handle->os_priv;
+
+			if (hpriv->pipe[0] == pollfd->fd)
+				break;
+
+			hpriv = NULL;
+		}
+
+		if (NULL == hpriv) {
+			usbi_dbg("fd %d is not an event pipe!", pollfd->fd);
+			err = ENOENT;
+			break;
+		}
+
+		if (pollfd->revents & POLLERR) {
+			usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->pipe[0]);
+			usbi_handle_disconnect(handle);
+			continue;
+		}
+
+		if (read(hpriv->pipe[0], &itransfer, sizeof(itransfer)) < 0) {
+			err = errno;
+			break;
+		}
+
+		if ((err = usbi_handle_transfer_completion(itransfer,
+		    LIBUSB_TRANSFER_COMPLETED)))
+			break;
+	}
+	pthread_mutex_unlock(&ctx->open_devs_lock);
+
+	if (err)
+		return _errno_to_libusb(err);
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+obsd_clock_gettime(int clkid, struct timespec *tp)
+{
+	usbi_dbg("clock %d", clkid);
+
+	if (clkid == USBI_CLOCK_REALTIME)
+		return clock_gettime(CLOCK_REALTIME, tp);
+
+	if (clkid == USBI_CLOCK_MONOTONIC)
+		return clock_gettime(CLOCK_MONOTONIC, tp);
+
+	return (LIBUSB_ERROR_INVALID_PARAM);
+}
+
+int
+_errno_to_libusb(int err)
+{
+	usbi_dbg("error: %s (%d)", strerror(err), err);
+
+	switch (err) {
+	case EIO:
+		return (LIBUSB_ERROR_IO);
+	case EACCES:
+		return (LIBUSB_ERROR_ACCESS);
+	case ENOENT:
+		return (LIBUSB_ERROR_NO_DEVICE);
+	case ENOMEM:
+		return (LIBUSB_ERROR_NO_MEM);
+	case ETIMEDOUT:
+		return (LIBUSB_ERROR_TIMEOUT);
+	}
+
+	return (LIBUSB_ERROR_OTHER);
+}
+
+int
+_cache_active_config_descriptor(struct libusb_device *dev)
+{
+	struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
+	struct usb_device_cdesc udc;
+	struct usb_device_fdesc udf;
+	unsigned char* buf;
+	int fd, len, err;
+
+	if ((fd = _bus_open(dev->bus_number)) < 0)
+		return _errno_to_libusb(errno);
+
+	usbi_dbg("fd %d, addr %d", fd, dev->device_address);
+
+	udc.udc_bus = dev->bus_number;
+	udc.udc_addr = dev->device_address;
+	udc.udc_config_index = USB_CURRENT_CONFIG_INDEX;
+	if (ioctl(fd, USB_DEVICE_GET_CDESC, &udc) < 0) {
+		err = errno;
+		close(fd);
+		return _errno_to_libusb(errno);
+	}
+
+	usbi_dbg("active bLength %d", udc.udc_desc.bLength);
+
+	len = UGETW(udc.udc_desc.wTotalLength);
+	buf = malloc(len);
+	if (buf == NULL)
+		return (LIBUSB_ERROR_NO_MEM);
+
+	udf.udf_bus = dev->bus_number;
+	udf.udf_addr = dev->device_address;
+	udf.udf_config_index = udc.udc_config_index;
+	udf.udf_size = len;
+	udf.udf_data = buf;
+
+	usbi_dbg("index %d, len %d", udf.udf_config_index, len);
+
+	if (ioctl(fd, USB_DEVICE_GET_FDESC, &udf) < 0) {
+		err = errno;
+		close(fd);
+		free(buf);
+		return _errno_to_libusb(err);
+	}
+	close(fd);
+
+	if (dpriv->cdesc)
+		free(dpriv->cdesc);
+	dpriv->cdesc = buf;
+
+	return (LIBUSB_SUCCESS);
+}
+
+int
+_sync_control_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	struct libusb_control_setup *setup;
+	struct device_priv *dpriv;
+	struct usb_ctl_request req;
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv;
+	setup = (struct libusb_control_setup *)transfer->buffer;
+
+	usbi_dbg("type %x request %x value %x index %d length %d timeout %d",
+	    setup->bmRequestType, setup->bRequest,
+	    libusb_le16_to_cpu(setup->wValue),
+	    libusb_le16_to_cpu(setup->wIndex),
+	    libusb_le16_to_cpu(setup->wLength), transfer->timeout);
+
+	req.ucr_addr = transfer->dev_handle->dev->device_address;
+	req.ucr_request.bmRequestType = setup->bmRequestType;
+	req.ucr_request.bRequest = setup->bRequest;
+	/* Don't use USETW, libusb already deals with the endianness */
+	(*(uint16_t *)req.ucr_request.wValue) = setup->wValue;
+	(*(uint16_t *)req.ucr_request.wIndex) = setup->wIndex;
+	(*(uint16_t *)req.ucr_request.wLength) = setup->wLength;
+	req.ucr_data = transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE;
+
+	if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0)
+		req.ucr_flags = USBD_SHORT_XFER_OK;
+
+	if (dpriv->devname == NULL) {
+		/*
+		 * XXX If the device is not attached to ugen(4) it is
+		 * XXX still possible to submit a control transfer but
+		 * XXX with the default timeout only.
+		 */
+		int fd, err;
+
+		if ((fd = _bus_open(transfer->dev_handle->dev->bus_number)) < 0)
+			return _errno_to_libusb(errno);
+
+		if ((ioctl(fd, USB_REQUEST, &req)) < 0) {
+			err = errno;
+			close(fd);
+			return _errno_to_libusb(err);
+		}
+		close(fd);
+	} else {
+		if ((ioctl(dpriv->fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0)
+			return _errno_to_libusb(errno);
+
+		if ((ioctl(dpriv->fd, USB_DO_REQUEST, &req)) < 0)
+			return _errno_to_libusb(errno);
+	}
+
+	itransfer->transferred = req.ucr_actlen;
+
+	usbi_dbg("transferred %d", itransfer->transferred);
+
+	return (0);
+}
+
+int
+_access_endpoint(struct libusb_transfer *transfer)
+{
+	struct handle_priv *hpriv;
+	struct device_priv *dpriv;
+	char devnode[16];
+	int fd, endpt;
+	mode_t mode;
+
+	hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
+	dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv;
+
+	endpt = UE_GET_ADDR(transfer->endpoint);
+	mode = IS_XFERIN(transfer) ? O_RDONLY : O_WRONLY;
+
+	usbi_dbg("endpoint %d mode %d", endpt, mode);
+
+	if (hpriv->endpoints[endpt] < 0) {
+		/* Pick the right endpoint node */
+		snprintf(devnode, sizeof(devnode), DEVPATH "%s.%02d",
+		    dpriv->devname, endpt);
+
+		/* We may need to read/write to the same endpoint later. */
+		if (((fd = open(devnode, O_RDWR)) < 0) && (errno == ENXIO))
+			if ((fd = open(devnode, mode)) < 0)
+				return (-1);
+
+		hpriv->endpoints[endpt] = fd;
+	}
+
+	return (hpriv->endpoints[endpt]);
+}
+
+int
+_sync_gen_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer;
+	struct device_priv *dpriv;
+	int fd, nr = 1;
+
+	transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	dpriv = (struct device_priv *)transfer->dev_handle->dev->os_priv;
+
+	if (dpriv->devname == NULL)
+		return (LIBUSB_ERROR_NOT_SUPPORTED);
+
+	/*
+	 * Bulk, Interrupt or Isochronous transfer depends on the
+	 * endpoint and thus the node to open.
+	 */
+	if ((fd = _access_endpoint(transfer)) < 0)
+		return _errno_to_libusb(errno);
+
+	if ((ioctl(fd, USB_SET_TIMEOUT, &transfer->timeout)) < 0)
+		return _errno_to_libusb(errno);
+
+	if (IS_XFERIN(transfer)) {
+		if ((transfer->flags & LIBUSB_TRANSFER_SHORT_NOT_OK) == 0)
+			if ((ioctl(fd, USB_SET_SHORT_XFER, &nr)) < 0)
+				return _errno_to_libusb(errno);
+
+		nr = read(fd, transfer->buffer, transfer->length);
+	} else {
+		nr = write(fd, transfer->buffer, transfer->length);
+	}
+
+	if (nr < 0)
+		return _errno_to_libusb(errno);
+
+	itransfer->transferred = nr;
+
+	return (0);
+}
+
+int
+_bus_open(int number)
+{
+	char busnode[16];
+
+	snprintf(busnode, sizeof(busnode), USBDEV "%d", number);
+
+	return open(busnode, O_RDWR);
+}
diff --git a/Externals/libusb/libusb/os/poll_posix.c b/Externals/libusb/libusb/os/poll_posix.c
new file mode 100644
index 0000000000..eeaf5dce49
--- /dev/null
+++ b/Externals/libusb/libusb/os/poll_posix.c
@@ -0,0 +1,51 @@
+/*
+ * poll_posix: poll compatibility wrapper for POSIX systems
+ * Copyright © 2013 RealVNC Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "libusbi.h"
+
+int usbi_pipe(int pipefd[2])
+{
+	int ret = pipe(pipefd);
+	if (ret != 0) {
+		return ret;
+	}
+	ret = fcntl(pipefd[1], F_GETFL);
+	if (ret == -1) {
+		usbi_dbg("Failed to get pipe fd flags: %d", errno);
+		goto err_close_pipe;
+	}
+	ret = fcntl(pipefd[1], F_SETFL, ret | O_NONBLOCK);
+	if (ret != 0) {
+		usbi_dbg("Failed to set non-blocking on new pipe: %d", errno);
+		goto err_close_pipe;
+	}
+
+	return 0;
+
+err_close_pipe:
+	usbi_close(pipefd[0]);
+	usbi_close(pipefd[1]);
+	return ret;
+}
diff --git a/Externals/libusb/libusb/os/poll_posix.h b/Externals/libusb/libusb/os/poll_posix.h
new file mode 100644
index 0000000000..5b4b2c905e
--- /dev/null
+++ b/Externals/libusb/libusb/os/poll_posix.h
@@ -0,0 +1,11 @@
+#ifndef LIBUSB_POLL_POSIX_H
+#define LIBUSB_POLL_POSIX_H
+
+#define usbi_write write
+#define usbi_read read
+#define usbi_close close
+#define usbi_poll poll
+
+int usbi_pipe(int pipefd[2]);
+
+#endif /* LIBUSB_POLL_POSIX_H */
diff --git a/Externals/libusb/libusb/os/poll_windows.c b/Externals/libusb/libusb/os/poll_windows.c
new file mode 100644
index 0000000000..2a75c5e7e6
--- /dev/null
+++ b/Externals/libusb/libusb/os/poll_windows.c
@@ -0,0 +1,726 @@
+/*
+ * poll_windows: poll compatibility wrapper for Windows
+ * Copyright © 2012-2013 RealVNC Ltd.
+ * Copyright © 2009-2010 Pete Batard <pete@akeo.ie>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of poll implementation from libusb-win32, by Stephan Meyer et al.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+/*
+ * poll() and pipe() Windows compatibility layer for libusb 1.0
+ *
+ * The way this layer works is by using OVERLAPPED with async I/O transfers, as
+ * OVERLAPPED have an associated event which is flagged for I/O completion.
+ *
+ * For USB pollable async I/O, you would typically:
+ * - obtain a Windows HANDLE to a file or device that has been opened in
+ *   OVERLAPPED mode
+ * - call usbi_create_fd with this handle to obtain a custom fd.
+ *   Note that if you need simultaneous R/W access, you need to call create_fd
+ *   twice, once in RW_READ and once in RW_WRITE mode to obtain 2 separate
+ *   pollable fds
+ * - leave the core functions call the poll routine and flag POLLIN/POLLOUT
+ *
+ * The pipe pollable synchronous I/O works using the overlapped event associated
+ * with a fake pipe. The read/write functions are only meant to be used in that
+ * context.
+ */
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "libusbi.h"
+
+// Uncomment to debug the polling layer
+//#define DEBUG_POLL_WINDOWS
+#if defined(DEBUG_POLL_WINDOWS)
+#define poll_dbg usbi_dbg
+#else
+// MSVC++ < 2005 cannot use a variadic argument and non MSVC
+// compilers produce warnings if parenthesis are ommitted.
+#if defined(_MSC_VER) && (_MSC_VER < 1400)
+#define poll_dbg
+#else
+#define poll_dbg(...)
+#endif
+#endif
+
+#if defined(_PREFAST_)
+#pragma warning(disable:28719)
+#endif
+
+#define CHECK_INIT_POLLING do {if(!is_polling_set) init_polling();} while(0)
+
+// public fd data
+const struct winfd INVALID_WINFD = {-1, INVALID_HANDLE_VALUE, NULL, NULL, NULL, RW_NONE};
+struct winfd poll_fd[MAX_FDS];
+// internal fd data
+struct {
+	CRITICAL_SECTION mutex; // lock for fds
+	// Additional variables for XP CancelIoEx partial emulation
+	HANDLE original_handle;
+	DWORD thread_id;
+} _poll_fd[MAX_FDS];
+
+// globals
+BOOLEAN is_polling_set = FALSE;
+LONG pipe_number = 0;
+static volatile LONG compat_spinlock = 0;
+
+#if !defined(_WIN32_WCE)
+// CancelIoEx, available on Vista and later only, provides the ability to cancel
+// a single transfer (OVERLAPPED) when used. As it may not be part of any of the
+// platform headers, we hook into the Kernel32 system DLL directly to seek it.
+static BOOL (__stdcall *pCancelIoEx)(HANDLE, LPOVERLAPPED) = NULL;
+#define Use_Duplicate_Handles (pCancelIoEx == NULL)
+
+static inline void setup_cancel_io(void)
+{
+	HMODULE hKernel32 = GetModuleHandleA("KERNEL32");
+	if (hKernel32 != NULL) {
+		pCancelIoEx = (BOOL (__stdcall *)(HANDLE,LPOVERLAPPED))
+			GetProcAddress(hKernel32, "CancelIoEx");
+	}
+	usbi_dbg("Will use CancelIo%s for I/O cancellation",
+		Use_Duplicate_Handles?"":"Ex");
+}
+
+static inline BOOL cancel_io(int _index)
+{
+	if ((_index < 0) || (_index >= MAX_FDS)) {
+		return FALSE;
+	}
+
+	if ( (poll_fd[_index].fd < 0) || (poll_fd[_index].handle == INVALID_HANDLE_VALUE)
+	  || (poll_fd[_index].handle == 0) || (poll_fd[_index].overlapped == NULL) ) {
+		return TRUE;
+	}
+	if (poll_fd[_index].itransfer && poll_fd[_index].cancel_fn) {
+		// Cancel outstanding transfer via the specific callback
+		(*poll_fd[_index].cancel_fn)(poll_fd[_index].itransfer);
+		return TRUE;
+	}
+	if (pCancelIoEx != NULL) {
+		return (*pCancelIoEx)(poll_fd[_index].handle, poll_fd[_index].overlapped);
+	}
+	if (_poll_fd[_index].thread_id == GetCurrentThreadId()) {
+		return CancelIo(poll_fd[_index].handle);
+	}
+	usbi_warn(NULL, "Unable to cancel I/O that was started from another thread");
+	return FALSE;
+}
+#else
+#define Use_Duplicate_Handles FALSE
+
+static __inline void setup_cancel_io()
+{
+	// No setup needed on WinCE
+}
+
+static __inline BOOL cancel_io(int _index)
+{
+	if ((_index < 0) || (_index >= MAX_FDS)) {
+		return FALSE;
+	}
+	if ( (poll_fd[_index].fd < 0) || (poll_fd[_index].handle == INVALID_HANDLE_VALUE)
+	  || (poll_fd[_index].handle == 0) || (poll_fd[_index].overlapped == NULL) ) {
+		return TRUE;
+	}
+	if (poll_fd[_index].itransfer && poll_fd[_index].cancel_fn) {
+		// Cancel outstanding transfer via the specific callback
+		(*poll_fd[_index].cancel_fn)(poll_fd[_index].itransfer);
+	}
+	return TRUE;
+}
+#endif
+
+// Init
+void init_polling(void)
+{
+	int i;
+
+	while (InterlockedExchange((LONG *)&compat_spinlock, 1) == 1) {
+		SleepEx(0, TRUE);
+	}
+	if (!is_polling_set) {
+		setup_cancel_io();
+		for (i=0; i<MAX_FDS; i++) {
+			poll_fd[i] = INVALID_WINFD;
+			_poll_fd[i].original_handle = INVALID_HANDLE_VALUE;
+			_poll_fd[i].thread_id = 0;
+			InitializeCriticalSection(&_poll_fd[i].mutex);
+		}
+		is_polling_set = TRUE;
+	}
+	InterlockedExchange((LONG *)&compat_spinlock, 0);
+}
+
+// Internal function to retrieve the table index (and lock the fd mutex)
+static int _fd_to_index_and_lock(int fd)
+{
+	int i;
+
+	if (fd < 0)
+		return -1;
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].fd == fd) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have changed before we got to critical
+			if (poll_fd[i].fd != fd) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+			return i;
+		}
+	}
+	return -1;
+}
+
+static OVERLAPPED *create_overlapped(void)
+{
+	OVERLAPPED *overlapped = (OVERLAPPED*) calloc(1, sizeof(OVERLAPPED));
+	if (overlapped == NULL) {
+		return NULL;
+	}
+	overlapped->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+	if(overlapped->hEvent == NULL) {
+		free (overlapped);
+		return NULL;
+	}
+	return overlapped;
+}
+
+static void free_overlapped(OVERLAPPED *overlapped)
+{
+	if (overlapped == NULL)
+		return;
+
+	if ( (overlapped->hEvent != 0)
+	  && (overlapped->hEvent != INVALID_HANDLE_VALUE) ) {
+		CloseHandle(overlapped->hEvent);
+	}
+	free(overlapped);
+}
+
+void exit_polling(void)
+{
+	int i;
+
+	while (InterlockedExchange((LONG *)&compat_spinlock, 1) == 1) {
+		SleepEx(0, TRUE);
+	}
+	if (is_polling_set) {
+		is_polling_set = FALSE;
+
+		for (i=0; i<MAX_FDS; i++) {
+			// Cancel any async I/O (handle can be invalid)
+			cancel_io(i);
+			// If anything was pending on that I/O, it should be
+			// terminating, and we should be able to access the fd
+			// mutex lock before too long
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			free_overlapped(poll_fd[i].overlapped);
+			if (Use_Duplicate_Handles) {
+				// Close duplicate handle
+				if (_poll_fd[i].original_handle != INVALID_HANDLE_VALUE) {
+					CloseHandle(poll_fd[i].handle);
+				}
+			}
+			poll_fd[i] = INVALID_WINFD;
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			DeleteCriticalSection(&_poll_fd[i].mutex);
+		}
+	}
+	InterlockedExchange((LONG *)&compat_spinlock, 0);
+}
+
+/*
+ * Create a fake pipe.
+ * As libusb only uses pipes for signaling, all we need from a pipe is an
+ * event. To that extent, we create a single wfd and overlapped as a means
+ * to access that event.
+ */
+int usbi_pipe(int filedes[2])
+{
+	int i;
+	OVERLAPPED* overlapped;
+
+	CHECK_INIT_POLLING;
+
+	overlapped = create_overlapped();
+
+	if (overlapped == NULL) {
+		return -1;
+	}
+	// The overlapped must have status pending for signaling to work in poll
+	overlapped->Internal = STATUS_PENDING;
+	overlapped->InternalHigh = 0;
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].fd < 0) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have been allocated before we got to critical
+			if (poll_fd[i].fd >= 0) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+
+			// Use index as the unique fd number
+			poll_fd[i].fd = i;
+			// Read end of the "pipe"
+			filedes[0] = poll_fd[i].fd;
+			// We can use the same handle for both ends
+			filedes[1] = filedes[0];
+
+			poll_fd[i].handle = DUMMY_HANDLE;
+			poll_fd[i].overlapped = overlapped;
+			// There's no polling on the write end, so we just use READ for our needs
+			poll_fd[i].rw = RW_READ;
+			_poll_fd[i].original_handle = INVALID_HANDLE_VALUE;
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			return 0;
+		}
+	}
+	free_overlapped(overlapped);
+	return -1;
+}
+
+/*
+ * Create both an fd and an OVERLAPPED from an open Windows handle, so that
+ * it can be used with our polling function
+ * The handle MUST support overlapped transfers (usually requires CreateFile
+ * with FILE_FLAG_OVERLAPPED)
+ * Return a pollable file descriptor struct, or INVALID_WINFD on error
+ *
+ * Note that the fd returned by this function is a per-transfer fd, rather
+ * than a per-session fd and cannot be used for anything else but our
+ * custom functions (the fd itself points to the NUL: device)
+ * if you plan to do R/W on the same handle, you MUST create 2 fds: one for
+ * read and one for write. Using a single R/W fd is unsupported and will
+ * produce unexpected results
+ */
+struct winfd usbi_create_fd(HANDLE handle, int access_mode, struct usbi_transfer *itransfer, cancel_transfer *cancel_fn)
+{
+	int i;
+	struct winfd wfd = INVALID_WINFD;
+	OVERLAPPED* overlapped = NULL;
+
+	CHECK_INIT_POLLING;
+
+	if ((handle == 0) || (handle == INVALID_HANDLE_VALUE)) {
+		return INVALID_WINFD;
+	}
+
+	wfd.itransfer = itransfer;
+	wfd.cancel_fn = cancel_fn;
+
+	if ((access_mode != RW_READ) && (access_mode != RW_WRITE)) {
+		usbi_warn(NULL, "only one of RW_READ or RW_WRITE are supported.\n"
+			"If you want to poll for R/W simultaneously, create multiple fds from the same handle.");
+		return INVALID_WINFD;
+	}
+	if (access_mode == RW_READ) {
+		wfd.rw = RW_READ;
+	} else {
+		wfd.rw = RW_WRITE;
+	}
+
+	overlapped = create_overlapped();
+	if(overlapped == NULL) {
+		return INVALID_WINFD;
+	}
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].fd < 0) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have been removed before we got to critical
+			if (poll_fd[i].fd >= 0) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+			// Use index as the unique fd number
+			wfd.fd = i;
+			// Attempt to emulate some of the CancelIoEx behaviour on platforms
+			// that don't have it
+			if (Use_Duplicate_Handles) {
+				_poll_fd[i].thread_id = GetCurrentThreadId();
+				if (!DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(),
+					&wfd.handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) {
+					usbi_dbg("could not duplicate handle for CancelIo - using original one");
+					wfd.handle = handle;
+					// Make sure we won't close the original handle on fd deletion then
+					_poll_fd[i].original_handle = INVALID_HANDLE_VALUE;
+				} else {
+					_poll_fd[i].original_handle = handle;
+				}
+			} else {
+				wfd.handle = handle;
+			}
+			wfd.overlapped = overlapped;
+			memcpy(&poll_fd[i], &wfd, sizeof(struct winfd));
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			return wfd;
+		}
+	}
+	free_overlapped(overlapped);
+	return INVALID_WINFD;
+}
+
+static void _free_index(int _index)
+{
+	// Cancel any async IO (Don't care about the validity of our handles for this)
+	cancel_io(_index);
+	// close the duplicate handle (if we have an actual duplicate)
+	if (Use_Duplicate_Handles) {
+		if (_poll_fd[_index].original_handle != INVALID_HANDLE_VALUE) {
+			CloseHandle(poll_fd[_index].handle);
+		}
+		_poll_fd[_index].original_handle = INVALID_HANDLE_VALUE;
+		_poll_fd[_index].thread_id = 0;
+	}
+	free_overlapped(poll_fd[_index].overlapped);
+	poll_fd[_index] = INVALID_WINFD;
+}
+
+/*
+ * Release a pollable file descriptor.
+ *
+ * Note that the associated Windows handle is not closed by this call
+ */
+void usbi_free_fd(struct winfd *wfd)
+{
+	int _index;
+
+	CHECK_INIT_POLLING;
+
+	_index = _fd_to_index_and_lock(wfd->fd);
+	if (_index < 0) {
+		return;
+	}
+	_free_index(_index);
+	*wfd = INVALID_WINFD;
+	LeaveCriticalSection(&_poll_fd[_index].mutex);
+}
+
+/*
+ * The functions below perform various conversions between fd, handle and OVERLAPPED
+ */
+struct winfd fd_to_winfd(int fd)
+{
+	int i;
+	struct winfd wfd;
+
+	CHECK_INIT_POLLING;
+
+	if (fd < 0)
+		return INVALID_WINFD;
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].fd == fd) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have been deleted before we got to critical
+			if (poll_fd[i].fd != fd) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+			memcpy(&wfd, &poll_fd[i], sizeof(struct winfd));
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			return wfd;
+		}
+	}
+	return INVALID_WINFD;
+}
+
+struct winfd handle_to_winfd(HANDLE handle)
+{
+	int i;
+	struct winfd wfd;
+
+	CHECK_INIT_POLLING;
+
+	if ((handle == 0) || (handle == INVALID_HANDLE_VALUE))
+		return INVALID_WINFD;
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].handle == handle) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have been deleted before we got to critical
+			if (poll_fd[i].handle != handle) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+			memcpy(&wfd, &poll_fd[i], sizeof(struct winfd));
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			return wfd;
+		}
+	}
+	return INVALID_WINFD;
+}
+
+struct winfd overlapped_to_winfd(OVERLAPPED* overlapped)
+{
+	int i;
+	struct winfd wfd;
+
+	CHECK_INIT_POLLING;
+
+	if (overlapped == NULL)
+		return INVALID_WINFD;
+
+	for (i=0; i<MAX_FDS; i++) {
+		if (poll_fd[i].overlapped == overlapped) {
+			EnterCriticalSection(&_poll_fd[i].mutex);
+			// fd might have been deleted before we got to critical
+			if (poll_fd[i].overlapped != overlapped) {
+				LeaveCriticalSection(&_poll_fd[i].mutex);
+				continue;
+			}
+			memcpy(&wfd, &poll_fd[i], sizeof(struct winfd));
+			LeaveCriticalSection(&_poll_fd[i].mutex);
+			return wfd;
+		}
+	}
+	return INVALID_WINFD;
+}
+
+/*
+ * POSIX poll equivalent, using Windows OVERLAPPED
+ * Currently, this function only accepts one of POLLIN or POLLOUT per fd
+ * (but you can create multiple fds from the same handle for read and write)
+ */
+int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout)
+{
+	unsigned i;
+	int _index, object_index, triggered;
+	HANDLE *handles_to_wait_on;
+	int *handle_to_index;
+	DWORD nb_handles_to_wait_on = 0;
+	DWORD ret;
+
+	CHECK_INIT_POLLING;
+
+	triggered = 0;
+	handles_to_wait_on = (HANDLE*) calloc(nfds+1, sizeof(HANDLE));	// +1 for fd_update
+	handle_to_index = (int*) calloc(nfds, sizeof(int));
+	if ((handles_to_wait_on == NULL) || (handle_to_index == NULL)) {
+		errno = ENOMEM;
+		triggered = -1;
+		goto poll_exit;
+	}
+
+	for (i = 0; i < nfds; ++i) {
+		fds[i].revents = 0;
+
+		// Only one of POLLIN or POLLOUT can be selected with this version of poll (not both)
+		if ((fds[i].events & ~POLLIN) && (!(fds[i].events & POLLOUT))) {
+			fds[i].revents |= POLLERR;
+			errno = EACCES;
+			usbi_warn(NULL, "unsupported set of events");
+			triggered = -1;
+			goto poll_exit;
+		}
+
+		_index = _fd_to_index_and_lock(fds[i].fd);
+		poll_dbg("fd[%d]=%d: (overlapped=%p) got events %04X", i, poll_fd[_index].fd, poll_fd[_index].overlapped, fds[i].events);
+
+		if ( (_index < 0) || (poll_fd[_index].handle == INVALID_HANDLE_VALUE)
+		  || (poll_fd[_index].handle == 0) || (poll_fd[_index].overlapped == NULL)) {
+			fds[i].revents |= POLLNVAL | POLLERR;
+			errno = EBADF;
+			if (_index >= 0) {
+				LeaveCriticalSection(&_poll_fd[_index].mutex);
+			}
+			usbi_warn(NULL, "invalid fd");
+			triggered = -1;
+			goto poll_exit;
+		}
+
+		// IN or OUT must match our fd direction
+		if ((fds[i].events & POLLIN) && (poll_fd[_index].rw != RW_READ)) {
+			fds[i].revents |= POLLNVAL | POLLERR;
+			errno = EBADF;
+			usbi_warn(NULL, "attempted POLLIN on fd without READ access");
+			LeaveCriticalSection(&_poll_fd[_index].mutex);
+			triggered = -1;
+			goto poll_exit;
+		}
+
+		if ((fds[i].events & POLLOUT) && (poll_fd[_index].rw != RW_WRITE)) {
+			fds[i].revents |= POLLNVAL | POLLERR;
+			errno = EBADF;
+			usbi_warn(NULL, "attempted POLLOUT on fd without WRITE access");
+			LeaveCriticalSection(&_poll_fd[_index].mutex);
+			triggered = -1;
+			goto poll_exit;
+		}
+
+		// The following macro only works if overlapped I/O was reported pending
+		if ( (HasOverlappedIoCompleted(poll_fd[_index].overlapped))
+		  || (HasOverlappedIoCompletedSync(poll_fd[_index].overlapped)) ) {
+			poll_dbg("  completed");
+			// checks above should ensure this works:
+			fds[i].revents = fds[i].events;
+			triggered++;
+		} else {
+			handles_to_wait_on[nb_handles_to_wait_on] = poll_fd[_index].overlapped->hEvent;
+			handle_to_index[nb_handles_to_wait_on] = i;
+			nb_handles_to_wait_on++;
+		}
+		LeaveCriticalSection(&_poll_fd[_index].mutex);
+	}
+
+	// If nothing was triggered, wait on all fds that require it
+	if ((timeout != 0) && (triggered == 0) && (nb_handles_to_wait_on != 0)) {
+		if (timeout < 0) {
+			poll_dbg("starting infinite wait for %d handles...", (int)nb_handles_to_wait_on);
+		} else {
+			poll_dbg("starting %d ms wait for %d handles...", timeout, (int)nb_handles_to_wait_on);
+		}
+		ret = WaitForMultipleObjects(nb_handles_to_wait_on, handles_to_wait_on,
+			FALSE, (timeout<0)?INFINITE:(DWORD)timeout);
+		object_index = ret-WAIT_OBJECT_0;
+		if ((object_index >= 0) && ((DWORD)object_index < nb_handles_to_wait_on)) {
+			poll_dbg("  completed after wait");
+			i = handle_to_index[object_index];
+			_index = _fd_to_index_and_lock(fds[i].fd);
+			fds[i].revents = fds[i].events;
+			triggered++;
+			if (_index >= 0) {
+				LeaveCriticalSection(&_poll_fd[_index].mutex);
+			}
+		} else if (ret == WAIT_TIMEOUT) {
+			poll_dbg("  timed out");
+			triggered = 0;	// 0 = timeout
+		} else {
+			errno = EIO;
+			triggered = -1;	// error
+		}
+	}
+
+poll_exit:
+	if (handles_to_wait_on != NULL) {
+		free(handles_to_wait_on);
+	}
+	if (handle_to_index != NULL) {
+		free(handle_to_index);
+	}
+	return triggered;
+}
+
+/*
+ * close a fake pipe fd
+ */
+int usbi_close(int fd)
+{
+	int _index;
+	int r = -1;
+
+	CHECK_INIT_POLLING;
+
+	_index = _fd_to_index_and_lock(fd);
+
+	if (_index < 0) {
+		errno = EBADF;
+	} else {
+		free_overlapped(poll_fd[_index].overlapped);
+		poll_fd[_index] = INVALID_WINFD;
+		LeaveCriticalSection(&_poll_fd[_index].mutex);
+	}
+	return r;
+}
+
+/*
+ * synchronous write for fake "pipe" signaling
+ */
+ssize_t usbi_write(int fd, const void *buf, size_t count)
+{
+	int _index;
+	UNUSED(buf);
+
+	CHECK_INIT_POLLING;
+
+	if (count != sizeof(unsigned char)) {
+		usbi_err(NULL, "this function should only used for signaling");
+		return -1;
+	}
+
+	_index = _fd_to_index_and_lock(fd);
+
+	if ( (_index < 0) || (poll_fd[_index].overlapped == NULL) ) {
+		errno = EBADF;
+		if (_index >= 0) {
+			LeaveCriticalSection(&_poll_fd[_index].mutex);
+		}
+		return -1;
+	}
+
+	poll_dbg("set pipe event (fd = %d, thread = %08X)", _index, GetCurrentThreadId());
+	SetEvent(poll_fd[_index].overlapped->hEvent);
+	poll_fd[_index].overlapped->Internal = STATUS_WAIT_0;
+	// If two threads write on the pipe at the same time, we need to
+	// process two separate reads => use the overlapped as a counter
+	poll_fd[_index].overlapped->InternalHigh++;
+
+	LeaveCriticalSection(&_poll_fd[_index].mutex);
+	return sizeof(unsigned char);
+}
+
+/*
+ * synchronous read for fake "pipe" signaling
+ */
+ssize_t usbi_read(int fd, void *buf, size_t count)
+{
+	int _index;
+	ssize_t r = -1;
+	UNUSED(buf);
+
+	CHECK_INIT_POLLING;
+
+	if (count != sizeof(unsigned char)) {
+		usbi_err(NULL, "this function should only used for signaling");
+		return -1;
+	}
+
+	_index = _fd_to_index_and_lock(fd);
+
+	if (_index < 0) {
+		errno = EBADF;
+		return -1;
+	}
+
+	if (WaitForSingleObject(poll_fd[_index].overlapped->hEvent, INFINITE) != WAIT_OBJECT_0) {
+		usbi_warn(NULL, "waiting for event failed: %d", (int)GetLastError());
+		errno = EIO;
+		goto out;
+	}
+
+	poll_dbg("clr pipe event (fd = %d, thread = %08X)", _index, GetCurrentThreadId());
+	poll_fd[_index].overlapped->InternalHigh--;
+	// Don't reset unless we don't have any more events to process
+	if (poll_fd[_index].overlapped->InternalHigh <= 0) {
+		ResetEvent(poll_fd[_index].overlapped->hEvent);
+		poll_fd[_index].overlapped->Internal = STATUS_PENDING;
+	}
+
+	r = sizeof(unsigned char);
+
+out:
+	LeaveCriticalSection(&_poll_fd[_index].mutex);
+	return r;
+}
diff --git a/Externals/libusb/libusb/os/poll_windows.h b/Externals/libusb/libusb/os/poll_windows.h
new file mode 100644
index 0000000000..aa4c985dae
--- /dev/null
+++ b/Externals/libusb/libusb/os/poll_windows.h
@@ -0,0 +1,131 @@
+/*
+ * Windows compat: POSIX compatibility wrapper
+ * Copyright © 2012-2013 RealVNC Ltd.
+ * Copyright © 2009-2010 Pete Batard <pete@akeo.ie>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of poll implementation from libusb-win32, by Stephan Meyer et al.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+#pragma once
+
+#if defined(_MSC_VER)
+// disable /W4 MSVC warnings that are benign
+#pragma warning(disable:4127) // conditional expression is constant
+#endif
+
+// Handle synchronous completion through the overlapped structure
+#if !defined(STATUS_REPARSE)	// reuse the REPARSE status code
+#define STATUS_REPARSE ((LONG)0x00000104L)
+#endif
+#define STATUS_COMPLETED_SYNCHRONOUSLY	STATUS_REPARSE
+#if defined(_WIN32_WCE)
+// WinCE doesn't have a HasOverlappedIoCompleted() macro, so attempt to emulate it
+#define HasOverlappedIoCompleted(lpOverlapped) (((DWORD)(lpOverlapped)->Internal) != STATUS_PENDING)
+#endif
+#define HasOverlappedIoCompletedSync(lpOverlapped)	(((DWORD)(lpOverlapped)->Internal) == STATUS_COMPLETED_SYNCHRONOUSLY)
+
+#define DUMMY_HANDLE ((HANDLE)(LONG_PTR)-2)
+
+/* Windows versions */
+enum windows_version {
+	WINDOWS_CE = -2,
+	WINDOWS_UNDEFINED = -1,
+	WINDOWS_UNSUPPORTED = 0,
+	WINDOWS_XP = 0x51,
+	WINDOWS_2003 = 0x52,	// Also XP x64
+	WINDOWS_VISTA = 0x60,
+	WINDOWS_7 = 0x61,
+	WINDOWS_8 = 0x62,
+	WINDOWS_8_1_OR_LATER = 0x63,
+	WINDOWS_MAX
+};
+extern int windows_version;
+
+#define MAX_FDS     256
+
+#define POLLIN      0x0001    /* There is data to read */
+#define POLLPRI     0x0002    /* There is urgent data to read */
+#define POLLOUT     0x0004    /* Writing now will not block */
+#define POLLERR     0x0008    /* Error condition */
+#define POLLHUP     0x0010    /* Hung up */
+#define POLLNVAL    0x0020    /* Invalid request: fd not open */
+
+struct pollfd {
+    int fd;           /* file descriptor */
+    short events;     /* requested events */
+    short revents;    /* returned events */
+};
+
+// access modes
+enum rw_type {
+	RW_NONE,
+	RW_READ,
+	RW_WRITE,
+};
+
+// fd struct that can be used for polling on Windows
+typedef int cancel_transfer(struct usbi_transfer *itransfer);
+
+struct winfd {
+	int fd;							// what's exposed to libusb core
+	HANDLE handle;					// what we need to attach overlapped to the I/O op, so we can poll it
+	OVERLAPPED* overlapped;			// what will report our I/O status
+	struct usbi_transfer *itransfer;		// Associated transfer, or NULL if completed
+	cancel_transfer *cancel_fn;		// Function pointer to cancel transfer API
+	enum rw_type rw;				// I/O transfer direction: read *XOR* write (NOT BOTH)
+};
+extern const struct winfd INVALID_WINFD;
+
+int usbi_pipe(int pipefd[2]);
+int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout);
+ssize_t usbi_write(int fd, const void *buf, size_t count);
+ssize_t usbi_read(int fd, void *buf, size_t count);
+int usbi_close(int fd);
+
+void init_polling(void);
+void exit_polling(void);
+struct winfd usbi_create_fd(HANDLE handle, int access_mode, 
+	struct usbi_transfer *transfer, cancel_transfer *cancel_fn);
+void usbi_free_fd(struct winfd* winfd);
+struct winfd fd_to_winfd(int fd);
+struct winfd handle_to_winfd(HANDLE handle);
+struct winfd overlapped_to_winfd(OVERLAPPED* overlapped);
+
+/*
+ * Timeval operations
+ */
+#if defined(DDKBUILD)
+#include <winsock.h>	// defines timeval functions on DDK
+#endif
+
+#if !defined(TIMESPEC_TO_TIMEVAL)
+#define TIMESPEC_TO_TIMEVAL(tv, ts) {                   \
+	(tv)->tv_sec = (long)(ts)->tv_sec;                  \
+	(tv)->tv_usec = (long)(ts)->tv_nsec / 1000;         \
+}
+#endif
+#if !defined(timersub)
+#define timersub(a, b, result)                          \
+do {                                                    \
+	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;       \
+	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;    \
+	if ((result)->tv_usec < 0) {                        \
+		--(result)->tv_sec;                             \
+		(result)->tv_usec += 1000000;                   \
+	}                                                   \
+} while (0)
+#endif
diff --git a/Externals/libusb/libusb/os/threads_posix.c b/Externals/libusb/libusb/os/threads_posix.c
new file mode 100644
index 0000000000..95c1027fa8
--- /dev/null
+++ b/Externals/libusb/libusb/os/threads_posix.c
@@ -0,0 +1,82 @@
+/*
+ * libusb synchronization using POSIX Threads
+ *
+ * Copyright © 2011 Vitali Lovich <vlovich@aliph.com>
+ * Copyright © 2011 Peter Stuge <peter@stuge.se>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if defined(__linux__) || defined(__OpenBSD__)
+# if defined(__linux__)
+#  define _GNU_SOURCE
+# else
+#  define _BSD_SOURCE
+# endif
+# include <unistd.h>
+# include <sys/syscall.h>
+#elif defined(__APPLE__)
+# include <mach/mach.h>
+#elif defined(__CYGWIN__)
+# include <windows.h>
+#endif
+
+#include "threads_posix.h"
+
+int usbi_mutex_init_recursive(pthread_mutex_t *mutex, pthread_mutexattr_t *attr)
+{
+	int err;
+	pthread_mutexattr_t stack_attr;
+	if (!attr) {
+		attr = &stack_attr;
+		err = pthread_mutexattr_init(&stack_attr);
+		if (err != 0)
+			return err;
+	}
+
+	/* mutexattr_settype requires _GNU_SOURCE or _XOPEN_SOURCE >= 500 on Linux */
+	err = pthread_mutexattr_settype(attr, PTHREAD_MUTEX_RECURSIVE);
+	if (err != 0)
+		goto finish;
+
+	err = pthread_mutex_init(mutex, attr);
+
+finish:
+	if (attr == &stack_attr)
+		pthread_mutexattr_destroy(&stack_attr);
+
+	return err;
+}
+
+int usbi_get_tid(void)
+{
+	int ret = -1;
+#if defined(__ANDROID__)
+	ret = gettid();
+#elif defined(__linux__)
+	ret = syscall(SYS_gettid);
+#elif defined(__OpenBSD__)
+	/* The following only works with OpenBSD > 5.1 as it requires
+	   real thread support. For 5.1 and earlier, -1 is returned. */
+	ret = syscall(SYS_getthrid);
+#elif defined(__APPLE__)
+	ret = mach_thread_self();
+	mach_port_deallocate(mach_task_self(), ret);
+#elif defined(__CYGWIN__)
+	ret = GetCurrentThreadId();
+#endif
+/* TODO: NetBSD thread ID support */
+	return ret;
+}
diff --git a/Externals/libusb/libusb/os/threads_posix.h b/Externals/libusb/libusb/os/threads_posix.h
new file mode 100644
index 0000000000..d7a5d215fe
--- /dev/null
+++ b/Externals/libusb/libusb/os/threads_posix.h
@@ -0,0 +1,50 @@
+/*
+ * libusb synchronization using POSIX Threads
+ *
+ * Copyright © 2010 Peter Stuge <peter@stuge.se>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBUSB_THREADS_POSIX_H
+#define LIBUSB_THREADS_POSIX_H
+
+#include <pthread.h>
+
+#define usbi_mutex_static_t		pthread_mutex_t
+#define USBI_MUTEX_INITIALIZER		PTHREAD_MUTEX_INITIALIZER
+#define usbi_mutex_static_lock		pthread_mutex_lock
+#define usbi_mutex_static_unlock	pthread_mutex_unlock
+
+#define usbi_mutex_t			pthread_mutex_t
+#define usbi_mutex_init			pthread_mutex_init
+#define usbi_mutex_lock			pthread_mutex_lock
+#define usbi_mutex_unlock		pthread_mutex_unlock
+#define usbi_mutex_trylock		pthread_mutex_trylock
+#define usbi_mutex_destroy		pthread_mutex_destroy
+
+#define usbi_cond_t			pthread_cond_t
+#define usbi_cond_init			pthread_cond_init
+#define usbi_cond_wait			pthread_cond_wait
+#define usbi_cond_timedwait		pthread_cond_timedwait
+#define usbi_cond_broadcast		pthread_cond_broadcast
+#define usbi_cond_destroy		pthread_cond_destroy
+#define usbi_cond_signal		pthread_cond_signal
+
+extern int usbi_mutex_init_recursive(pthread_mutex_t *mutex, pthread_mutexattr_t *attr);
+
+int usbi_get_tid(void);
+
+#endif /* LIBUSB_THREADS_POSIX_H */
diff --git a/Externals/libusb/libusb/os/threads_windows.c b/Externals/libusb/libusb/os/threads_windows.c
new file mode 100644
index 0000000000..ac12738c7c
--- /dev/null
+++ b/Externals/libusb/libusb/os/threads_windows.c
@@ -0,0 +1,212 @@
+/*
+ * libusb synchronization on Microsoft Windows
+ *
+ * Copyright © 2010 Michael Plante <michael.plante@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+#include <objbase.h>
+#include <errno.h>
+#include <stdarg.h>
+
+#include "libusbi.h"
+
+extern const uint64_t epoch_time;
+
+int usbi_mutex_init(usbi_mutex_t *mutex,
+					const usbi_mutexattr_t *attr) {
+	UNUSED(attr);
+	if(! mutex) return ((errno=EINVAL));
+	*mutex = CreateMutex(NULL, FALSE, NULL);
+	if(!*mutex) return ((errno=ENOMEM));
+	return 0;
+}
+int usbi_mutex_destroy(usbi_mutex_t *mutex) {
+	// It is not clear if CloseHandle failure is due to failure to unlock.
+	//   If so, this should be errno=EBUSY.
+	if(!mutex || !CloseHandle(*mutex)) return ((errno=EINVAL));
+	*mutex = NULL;
+	return 0;
+}
+int usbi_mutex_trylock(usbi_mutex_t *mutex) {
+	DWORD result;
+	if(!mutex) return ((errno=EINVAL));
+	result = WaitForSingleObject(*mutex, 0);
+	if(result == WAIT_OBJECT_0 || result == WAIT_ABANDONED)
+		return 0; // acquired (ToDo: check that abandoned is ok)
+	if(result == WAIT_TIMEOUT)
+		return ((errno=EBUSY));
+	return ((errno=EINVAL)); // don't know how this would happen
+							 //   so don't know proper errno
+}
+int usbi_mutex_lock(usbi_mutex_t *mutex) {
+	DWORD result;
+	if(!mutex) return ((errno=EINVAL));
+	result = WaitForSingleObject(*mutex, INFINITE);
+	if(result == WAIT_OBJECT_0 || result == WAIT_ABANDONED)
+		return 0; // acquired (ToDo: check that abandoned is ok)
+	return ((errno=EINVAL)); // don't know how this would happen
+							 //   so don't know proper errno
+}
+int usbi_mutex_unlock(usbi_mutex_t *mutex) {
+	if(!mutex)                return ((errno=EINVAL));
+	if(!ReleaseMutex(*mutex)) return ((errno=EPERM ));
+	return 0;
+}
+
+int usbi_mutex_static_lock(usbi_mutex_static_t *mutex) {
+	if(!mutex)               return ((errno=EINVAL));
+	while (InterlockedExchange((LONG *)mutex, 1) == 1) {
+		SleepEx(0, TRUE);
+	}
+	return 0;
+}
+int usbi_mutex_static_unlock(usbi_mutex_static_t *mutex) {
+	if(!mutex)               return ((errno=EINVAL));
+	*mutex = 0;
+	return 0;
+}
+
+int usbi_cond_init(usbi_cond_t *cond,
+				   const usbi_condattr_t *attr) {
+	UNUSED(attr);
+	if(!cond)           return ((errno=EINVAL));
+	list_init(&cond->waiters    );
+	list_init(&cond->not_waiting);
+	return 0;
+}
+int usbi_cond_destroy(usbi_cond_t *cond) {
+	// This assumes no one is using this anymore.  The check MAY NOT BE safe.
+	struct usbi_cond_perthread *pos, *next_pos = NULL;
+	if(!cond) return ((errno=EINVAL));
+	if(!list_empty(&cond->waiters)) return ((errno=EBUSY )); // (!see above!)
+	list_for_each_entry_safe(pos, next_pos, &cond->not_waiting, list, struct usbi_cond_perthread) {
+		CloseHandle(pos->event);
+		list_del(&pos->list);
+		free(pos);
+	}
+
+	return 0;
+}
+
+int usbi_cond_broadcast(usbi_cond_t *cond) {
+	// Assumes mutex is locked; this is not in keeping with POSIX spec, but
+	//   libusb does this anyway, so we simplify by not adding more sync
+	//   primitives to the CV definition!
+	int fail = 0;
+	struct usbi_cond_perthread *pos;
+	if(!cond)                      return ((errno=EINVAL));
+	list_for_each_entry(pos, &cond->waiters, list, struct usbi_cond_perthread) {
+		if(!SetEvent(pos->event))
+			fail = 1;
+	}
+	// The wait function will remove its respective item from the list.
+	return fail ? ((errno=EINVAL)) : 0;
+}
+int usbi_cond_signal(usbi_cond_t *cond) {
+	// Assumes mutex is locked; this is not in keeping with POSIX spec, but
+	//   libusb does this anyway, so we simplify by not adding more sync
+	//   primitives to the CV definition!
+	struct usbi_cond_perthread *pos;
+	if(!cond)                      return ((errno=EINVAL));
+	if(list_empty(&cond->waiters)) return 0; // no one to wakeup.
+	pos = list_entry(&cond->waiters.next, struct usbi_cond_perthread, list);
+	// The wait function will remove its respective item from the list.
+	return SetEvent(pos->event) ? 0 : ((errno=EINVAL));
+}
+__inline static int usbi_cond_intwait(usbi_cond_t *cond,
+									  usbi_mutex_t *mutex,
+									  DWORD timeout_ms) {
+	struct usbi_cond_perthread *pos;
+	int found = 0, r;
+	DWORD r2,tid = GetCurrentThreadId();
+	if(!cond || !mutex) return ((errno=EINVAL));
+	list_for_each_entry(pos, &cond->not_waiting, list, struct usbi_cond_perthread) {
+		if(tid == pos->tid) {
+			found = 1;
+			break;
+		}
+	}
+	if(!found) {
+		pos      = (struct usbi_cond_perthread*) calloc(1, sizeof(struct usbi_cond_perthread));
+		if(!pos) return ((errno=ENOMEM)); // This errno is not POSIX-allowed.
+		pos->tid = tid;
+		pos->event = CreateEvent(NULL, FALSE, FALSE, NULL); // auto-reset.
+		if(!pos->event) {
+			free(pos);
+			return      ((errno=ENOMEM));
+		}
+		list_add(&pos->list, &cond->not_waiting);
+	}
+
+	list_del(&pos->list); // remove from not_waiting list.
+	list_add(&pos->list, &cond->waiters);
+
+	r  = usbi_mutex_unlock(mutex);
+	if(r) return r;
+	r2 = WaitForSingleObject(pos->event, timeout_ms);
+	r  = usbi_mutex_lock(mutex);
+	if(r) return r;
+
+	list_del(&pos->list);
+	list_add(&pos->list, &cond->not_waiting);
+
+	if(r2 == WAIT_TIMEOUT) return ((errno=ETIMEDOUT));
+
+	return 0;
+}
+// N.B.: usbi_cond_*wait() can also return ENOMEM, even though pthread_cond_*wait cannot!
+int usbi_cond_wait(usbi_cond_t *cond, usbi_mutex_t *mutex) {
+	return usbi_cond_intwait(cond, mutex, INFINITE);
+}
+int usbi_cond_timedwait(usbi_cond_t *cond,
+						usbi_mutex_t *mutex,
+						const struct timespec *abstime) {
+	FILETIME filetime;
+	ULARGE_INTEGER rtime;
+	struct timeval targ_time, cur_time, delta_time;
+	struct timespec cur_time_ns;
+	DWORD millis;
+
+	// GetSystemTimeAsFileTime() is not available on CE
+	SYSTEMTIME st;
+	GetSystemTime(&st);
+	SystemTimeToFileTime(&st, &filetime);
+	rtime.LowPart   = filetime.dwLowDateTime;
+	rtime.HighPart  = filetime.dwHighDateTime;
+	rtime.QuadPart -= epoch_time;
+	cur_time_ns.tv_sec = (long)(rtime.QuadPart / 10000000);
+	cur_time_ns.tv_nsec = (long)((rtime.QuadPart % 10000000)*100);
+	TIMESPEC_TO_TIMEVAL(&cur_time, &cur_time_ns);
+
+	TIMESPEC_TO_TIMEVAL(&targ_time, abstime);
+	timersub(&targ_time, &cur_time, &delta_time);
+	if(delta_time.tv_sec < 0) // abstime already passed?
+		millis = 0;
+	else {
+		millis  = delta_time.tv_usec/1000;
+		millis += delta_time.tv_sec *1000;
+		if (delta_time.tv_usec % 1000) // round up to next millisecond
+			millis++;
+	}
+
+	return usbi_cond_intwait(cond, mutex, millis);
+}
+
+int usbi_get_tid(void) {
+	return GetCurrentThreadId();
+}
diff --git a/Externals/libusb/libusb/os/threads_windows.h b/Externals/libusb/libusb/os/threads_windows.h
new file mode 100644
index 0000000000..2b829253b4
--- /dev/null
+++ b/Externals/libusb/libusb/os/threads_windows.h
@@ -0,0 +1,87 @@
+/*
+ * libusb synchronization on Microsoft Windows
+ *
+ * Copyright © 2010 Michael Plante <michael.plante@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBUSB_THREADS_WINDOWS_H
+#define LIBUSB_THREADS_WINDOWS_H
+
+#define usbi_mutex_static_t     volatile LONG
+#define USBI_MUTEX_INITIALIZER  0
+
+#define usbi_mutex_t            HANDLE
+
+struct usbi_cond_perthread {
+	struct list_head list;
+	DWORD            tid;
+	HANDLE           event;
+};
+struct usbi_cond_t_ {
+	// Every time a thread touches the CV, it winds up in one of these lists.
+	//   It stays there until the CV is destroyed, even if the thread
+	//   terminates.
+	struct list_head waiters;
+	struct list_head not_waiting;
+};
+typedef struct usbi_cond_t_ usbi_cond_t;
+
+// We *were* getting timespec from pthread.h:
+#if (!defined(HAVE_STRUCT_TIMESPEC) && !defined(_TIMESPEC_DEFINED))
+#define HAVE_STRUCT_TIMESPEC 1
+#define _TIMESPEC_DEFINED 1
+struct timespec {
+		long tv_sec;
+		long tv_nsec;
+};
+#endif /* HAVE_STRUCT_TIMESPEC | _TIMESPEC_DEFINED */
+
+// We *were* getting ETIMEDOUT from pthread.h:
+#ifndef ETIMEDOUT
+#  define ETIMEDOUT 10060     /* This is the value in winsock.h. */
+#endif
+
+#define usbi_mutexattr_t void
+#define usbi_condattr_t  void
+
+// all Windows mutexes are recursive
+#define usbi_mutex_init_recursive(mutex, attr) usbi_mutex_init((mutex), (attr))
+
+int usbi_mutex_static_lock(usbi_mutex_static_t *mutex);
+int usbi_mutex_static_unlock(usbi_mutex_static_t *mutex);
+
+
+int usbi_mutex_init(usbi_mutex_t *mutex,
+					const usbi_mutexattr_t *attr);
+int usbi_mutex_lock(usbi_mutex_t *mutex);
+int usbi_mutex_unlock(usbi_mutex_t *mutex);
+int usbi_mutex_trylock(usbi_mutex_t *mutex);
+int usbi_mutex_destroy(usbi_mutex_t *mutex);
+
+int usbi_cond_init(usbi_cond_t *cond,
+				   const usbi_condattr_t *attr);
+int usbi_cond_destroy(usbi_cond_t *cond);
+int usbi_cond_wait(usbi_cond_t *cond, usbi_mutex_t *mutex);
+int usbi_cond_timedwait(usbi_cond_t *cond,
+						usbi_mutex_t *mutex,
+						const struct timespec *abstime);
+int usbi_cond_broadcast(usbi_cond_t *cond);
+int usbi_cond_signal(usbi_cond_t *cond);
+
+int usbi_get_tid(void);
+
+#endif /* LIBUSB_THREADS_WINDOWS_H */
diff --git a/Externals/libusb/libusb/os/wince_usb.c b/Externals/libusb/libusb/os/wince_usb.c
new file mode 100644
index 0000000000..4d9b3ccc25
--- /dev/null
+++ b/Externals/libusb/libusb/os/wince_usb.c
@@ -0,0 +1,1032 @@
+/*
+ * Windows CE backend for libusb 1.0
+ * Copyright © 2011-2013 RealVNC Ltd.
+ * Large portions taken from Windows backend, which is
+ * Copyright © 2009-2010 Pete Batard <pbatard@gmail.com>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
+ * Major code testing contribution by Xiaofan Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <libusbi.h>
+
+#include <stdint.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include "wince_usb.h"
+
+// Forward declares
+static int wince_clock_gettime(int clk_id, struct timespec *tp);
+unsigned __stdcall wince_clock_gettime_threaded(void* param);
+
+// Global variables
+uint64_t hires_frequency, hires_ticks_to_ps;
+int errno;
+const uint64_t epoch_time = UINT64_C(116444736000000000);       // 1970.01.01 00:00:000 in MS Filetime
+int windows_version = WINDOWS_CE;
+static int concurrent_usage = -1;
+// Timer thread
+// NB: index 0 is for monotonic and 1 is for the thread exit event
+HANDLE timer_thread = NULL;
+HANDLE timer_mutex = NULL;
+struct timespec timer_tp;
+volatile LONG request_count[2] = {0, 1};	// last one must be > 0
+HANDLE timer_request[2] = { NULL, NULL };
+HANDLE timer_response = NULL;
+HANDLE driver_handle = INVALID_HANDLE_VALUE;
+
+/*
+ * Converts a windows error to human readable string
+ * uses retval as errorcode, or, if 0, use GetLastError()
+ */
+#if defined(ENABLE_LOGGING)
+static char* windows_error_str(uint32_t retval)
+{
+	static TCHAR wErr_string[ERR_BUFFER_SIZE];
+	static char err_string[ERR_BUFFER_SIZE];
+
+	DWORD size;
+	size_t i;
+	uint32_t error_code, format_error;
+
+	error_code = retval?retval:GetLastError();
+	
+	safe_stprintf(wErr_string, ERR_BUFFER_SIZE, _T("[%d] "), error_code);
+	
+	size = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code,
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &wErr_string[safe_tcslen(wErr_string)],
+		ERR_BUFFER_SIZE - (DWORD)safe_tcslen(wErr_string), NULL);
+	if (size == 0) {
+		format_error = GetLastError();
+		if (format_error)
+			safe_stprintf(wErr_string, ERR_BUFFER_SIZE,
+				_T("Windows error code %u (FormatMessage error code %u)"), error_code, format_error);
+		else
+			safe_stprintf(wErr_string, ERR_BUFFER_SIZE, _T("Unknown error code %u"), error_code);
+	} else {
+		// Remove CR/LF terminators
+		for (i=safe_tcslen(wErr_string)-1; ((wErr_string[i]==0x0A) || (wErr_string[i]==0x0D)); i--) {
+			wErr_string[i] = 0;
+		}
+	}
+	if (WideCharToMultiByte(CP_ACP, 0, wErr_string, -1, err_string, ERR_BUFFER_SIZE, NULL, NULL) < 0)
+	{
+		strcpy(err_string, "Unable to convert error string");
+	}
+	return err_string;
+}
+#endif
+
+static struct wince_device_priv *_device_priv(struct libusb_device *dev)
+{
+        return (struct wince_device_priv *) dev->os_priv;
+}
+
+// ceusbkwrapper to libusb error code mapping
+static int translate_driver_error(int error) 
+{
+	switch (error) {
+		case ERROR_INVALID_PARAMETER:
+			return LIBUSB_ERROR_INVALID_PARAM;
+		case ERROR_CALL_NOT_IMPLEMENTED:
+		case ERROR_NOT_SUPPORTED:
+			return LIBUSB_ERROR_NOT_SUPPORTED;
+		case ERROR_NOT_ENOUGH_MEMORY:
+			return LIBUSB_ERROR_NO_MEM;
+		case ERROR_INVALID_HANDLE:
+			return LIBUSB_ERROR_NO_DEVICE;
+		case ERROR_BUSY:
+			return LIBUSB_ERROR_BUSY;
+
+		// Error codes that are either unexpected, or have 
+		// no suitable LIBUSB_ERROR equivilant.
+		case ERROR_CANCELLED:
+		case ERROR_INTERNAL_ERROR:
+		default:
+			return LIBUSB_ERROR_OTHER;
+	}
+}
+
+static int init_dllimports()
+{
+	DLL_LOAD(ceusbkwrapper.dll, UkwOpenDriver, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwGetDeviceList, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwReleaseDeviceList, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwGetDeviceAddress, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwGetDeviceDescriptor, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwGetConfigDescriptor, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwCloseDriver, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwCancelTransfer, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwIssueControlTransfer, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwClaimInterface, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwReleaseInterface, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwSetInterfaceAlternateSetting, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwClearHaltHost, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwClearHaltDevice, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwGetConfig, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwSetConfig, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwResetDevice, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwKernelDriverActive, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwAttachKernelDriver, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwDetachKernelDriver, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwIssueBulkTransfer, TRUE);
+	DLL_LOAD(ceusbkwrapper.dll, UkwIsPipeHalted, TRUE);
+	return LIBUSB_SUCCESS;
+}
+
+static int init_device(struct libusb_device *dev, UKW_DEVICE drv_dev,
+					   unsigned char bus_addr, unsigned char dev_addr)
+{
+	struct wince_device_priv *priv = _device_priv(dev);
+	int r = LIBUSB_SUCCESS;
+
+	dev->bus_number = bus_addr;
+	dev->device_address = dev_addr;
+	priv->dev = drv_dev;
+
+	if (!UkwGetDeviceDescriptor(priv->dev, &(priv->desc))) {
+		r = translate_driver_error(GetLastError());
+	}
+	return r;
+}
+
+// Internal API functions
+static int wince_init(struct libusb_context *ctx)
+{
+	int i, r = LIBUSB_ERROR_OTHER;
+	HANDLE semaphore;
+	TCHAR sem_name[11+1+8]; // strlen(libusb_init)+'\0'+(32-bit hex PID)
+
+	_stprintf(sem_name, _T("libusb_init%08X"), (unsigned int)GetCurrentProcessId()&0xFFFFFFFF);
+	semaphore = CreateSemaphore(NULL, 1, 1, sem_name);
+	if (semaphore == NULL) {
+		usbi_err(ctx, "could not create semaphore: %s", windows_error_str(0));
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// A successful wait brings our semaphore count to 0 (unsignaled)
+	// => any concurent wait stalls until the semaphore's release
+	if (WaitForSingleObject(semaphore, INFINITE) != WAIT_OBJECT_0) {
+		usbi_err(ctx, "failure to access semaphore: %s", windows_error_str(0));
+		CloseHandle(semaphore);
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// NB: concurrent usage supposes that init calls are equally balanced with
+	// exit calls. If init is called more than exit, we will not exit properly
+	if ( ++concurrent_usage == 0 ) {	// First init?
+		// Initialize pollable file descriptors
+		init_polling();
+
+		// Load DLL imports
+		if (init_dllimports() != LIBUSB_SUCCESS) {
+			usbi_err(ctx, "could not resolve DLL functions");
+			r = LIBUSB_ERROR_NOT_SUPPORTED;
+			goto init_exit;
+		}
+
+		// try to open a handle to the driver
+		driver_handle = UkwOpenDriver();
+		if (driver_handle == INVALID_HANDLE_VALUE) {
+			usbi_err(ctx, "could not connect to driver");
+			r = LIBUSB_ERROR_NOT_SUPPORTED;
+			goto init_exit;
+		}
+
+		// Windows CE doesn't have a way of specifying thread affinity, so this code
+		// just has  to hope QueryPerformanceCounter doesn't report different values when
+		// running on different cores.
+		r = LIBUSB_ERROR_NO_MEM;
+		for (i = 0; i < 2; i++) {
+			timer_request[i] = CreateEvent(NULL, TRUE, FALSE, NULL);
+			if (timer_request[i] == NULL) {
+				usbi_err(ctx, "could not create timer request event %d - aborting", i);
+				goto init_exit;
+			}
+		}
+		timer_response = CreateSemaphore(NULL, 0, MAX_TIMER_SEMAPHORES, NULL);
+		if (timer_response == NULL) {
+			usbi_err(ctx, "could not create timer response semaphore - aborting");
+			goto init_exit;
+		}
+		timer_mutex = CreateMutex(NULL, FALSE, NULL);
+		if (timer_mutex == NULL) {
+			usbi_err(ctx, "could not create timer mutex - aborting");
+			goto init_exit;
+		}
+		timer_thread = CreateThread(NULL, 0, wince_clock_gettime_threaded, NULL, 0, NULL);
+		if (timer_thread == NULL) {
+			usbi_err(ctx, "Unable to create timer thread - aborting");
+			goto init_exit;
+		}
+
+		// Wait for timer thread to init before continuing.
+		if (WaitForSingleObject(timer_response, INFINITE) != WAIT_OBJECT_0) {
+			usbi_err(ctx, "Failed to wait for timer thread to become ready - aborting");
+			goto init_exit;
+		}
+	}
+	// At this stage, either we went through full init successfully, or didn't need to
+	r = LIBUSB_SUCCESS;
+
+init_exit: // Holds semaphore here.
+	if (!concurrent_usage && r != LIBUSB_SUCCESS) { // First init failed?
+		if (driver_handle != INVALID_HANDLE_VALUE) {
+			UkwCloseDriver(driver_handle);
+			driver_handle = INVALID_HANDLE_VALUE;
+		}
+		if (timer_thread) {
+			SetEvent(timer_request[1]); // actually the signal to quit the thread.
+			if (WAIT_OBJECT_0 != WaitForSingleObject(timer_thread, INFINITE)) {
+				usbi_warn(ctx, "could not wait for timer thread to quit");
+				TerminateThread(timer_thread, 1); // shouldn't happen, but we're destroying
+												  // all objects it might have held anyway.
+			}
+			CloseHandle(timer_thread);
+			timer_thread = NULL;
+		}
+		for (i = 0; i < 2; i++) {
+			if (timer_request[i]) {
+				CloseHandle(timer_request[i]);
+				timer_request[i] = NULL;
+			}
+		}
+		if (timer_response) {
+			CloseHandle(timer_response);
+			timer_response = NULL;
+		}
+		if (timer_mutex) {
+			CloseHandle(timer_mutex);
+			timer_mutex = NULL;
+		}
+	}
+
+	if (r != LIBUSB_SUCCESS)
+		--concurrent_usage; // Not expected to call libusb_exit if we failed.
+
+	ReleaseSemaphore(semaphore, 1, NULL);	// increase count back to 1
+	CloseHandle(semaphore);
+	return r;
+}
+
+static void wince_exit(void)
+{
+	int i;
+	HANDLE semaphore;
+	TCHAR sem_name[11+1+8]; // strlen(libusb_init)+'\0'+(32-bit hex PID)
+
+	_stprintf(sem_name, _T("libusb_init%08X"), (unsigned int)GetCurrentProcessId()&0xFFFFFFFF);
+	semaphore = CreateSemaphore(NULL, 1, 1, sem_name);
+	if (semaphore == NULL) {
+		return;
+	}
+
+	// A successful wait brings our semaphore count to 0 (unsignaled)
+	// => any concurent wait stalls until the semaphore release
+	if (WaitForSingleObject(semaphore, INFINITE) != WAIT_OBJECT_0) {
+		CloseHandle(semaphore);
+		return;
+	}
+
+	// Only works if exits and inits are balanced exactly
+	if (--concurrent_usage < 0) {	// Last exit
+		exit_polling();
+
+		if (timer_thread) {
+			SetEvent(timer_request[1]); // actually the signal to quit the thread.
+			if (WAIT_OBJECT_0 != WaitForSingleObject(timer_thread, INFINITE)) {
+				usbi_dbg("could not wait for timer thread to quit");
+				TerminateThread(timer_thread, 1);
+			}
+			CloseHandle(timer_thread);
+			timer_thread = NULL;
+		}
+		for (i = 0; i < 2; i++) {
+			if (timer_request[i]) {
+				CloseHandle(timer_request[i]);
+				timer_request[i] = NULL;
+			}
+		}
+		if (timer_response) {
+			CloseHandle(timer_response);
+			timer_response = NULL;
+		}
+		if (timer_mutex) {
+			CloseHandle(timer_mutex);
+			timer_mutex = NULL;
+		}
+		if (driver_handle != INVALID_HANDLE_VALUE) {
+			UkwCloseDriver(driver_handle);
+			driver_handle = INVALID_HANDLE_VALUE;
+		}
+	}
+
+	ReleaseSemaphore(semaphore, 1, NULL);	// increase count back to 1
+	CloseHandle(semaphore);
+}
+
+static int wince_get_device_list(
+	struct libusb_context *ctx,
+	struct discovered_devs **discdevs)
+{
+	UKW_DEVICE devices[MAX_DEVICE_COUNT];
+	struct discovered_devs * new_devices = *discdevs;
+	DWORD count = 0, i;
+	struct libusb_device *dev = NULL;
+	unsigned char bus_addr, dev_addr;
+	unsigned long session_id;
+	BOOL success;
+	DWORD release_list_offset = 0;
+	int r = LIBUSB_SUCCESS;
+
+	success = UkwGetDeviceList(driver_handle, devices, MAX_DEVICE_COUNT, &count);
+	if (!success) {
+		int libusbErr = translate_driver_error(GetLastError());
+		usbi_err(ctx, "could not get devices: %s", windows_error_str(0));
+		return libusbErr;
+	}
+	for(i = 0; i < count; ++i) {
+		release_list_offset = i;
+		success = UkwGetDeviceAddress(devices[i], &bus_addr, &dev_addr, &session_id);
+		if (!success) {
+			r = translate_driver_error(GetLastError());
+			usbi_err(ctx, "could not get device address for %d: %s", i, windows_error_str(0));
+			goto err_out;
+		}
+		dev = usbi_get_device_by_session_id(ctx, session_id);
+		if (dev) {
+			usbi_dbg("using existing device for %d/%d (session %ld)",
+					bus_addr, dev_addr, session_id);
+			// Release just this element in the device list (as we already hold a 
+			// reference to it).
+			UkwReleaseDeviceList(driver_handle, &devices[i], 1);
+			release_list_offset++;
+		} else {
+			usbi_dbg("allocating new device for %d/%d (session %ld)",
+					bus_addr, dev_addr, session_id);
+			dev = usbi_alloc_device(ctx, session_id);
+			if (!dev) {
+				r = LIBUSB_ERROR_NO_MEM;
+				goto err_out;
+			}
+			r = init_device(dev, devices[i], bus_addr, dev_addr);
+			if (r < 0)
+				goto err_out;
+			r = usbi_sanitize_device(dev);
+			if (r < 0)
+				goto err_out;
+		}
+		new_devices = discovered_devs_append(new_devices, dev);
+		if (!discdevs) {
+			r = LIBUSB_ERROR_NO_MEM;
+			goto err_out;
+		}
+		safe_unref_device(dev);
+	}
+	*discdevs = new_devices;
+	return r;
+err_out:
+	*discdevs = new_devices;
+	safe_unref_device(dev);
+	// Release the remainder of the unprocessed device list.
+	// The devices added to new_devices already will still be passed up to libusb, 
+	// which can dispose of them at its leisure.
+	UkwReleaseDeviceList(driver_handle, &devices[release_list_offset], count - release_list_offset);
+	return r;
+}
+
+static int wince_open(struct libusb_device_handle *handle)
+{
+	// Nothing to do to open devices as a handle to it has
+	// been retrieved by wince_get_device_list
+	return LIBUSB_SUCCESS;
+}
+
+static void wince_close(struct libusb_device_handle *handle)
+{
+	// Nothing to do as wince_open does nothing.
+}
+
+static int wince_get_device_descriptor(
+   struct libusb_device *device,
+   unsigned char *buffer, int *host_endian)
+{
+	struct wince_device_priv *priv = _device_priv(device);
+
+	*host_endian = 1;
+	memcpy(buffer, &priv->desc, DEVICE_DESC_LENGTH);
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_get_active_config_descriptor(
+	struct libusb_device *device,
+	unsigned char *buffer, size_t len, int *host_endian)
+{
+	struct wince_device_priv *priv = _device_priv(device);
+	DWORD actualSize = len;
+	*host_endian = 0;
+	if (!UkwGetConfigDescriptor(priv->dev, UKW_ACTIVE_CONFIGURATION, buffer, len, &actualSize)) {
+		return translate_driver_error(GetLastError());
+	}
+	return actualSize;
+}
+
+static int wince_get_config_descriptor(
+	struct libusb_device *device,
+	uint8_t config_index,
+	unsigned char *buffer, size_t len, int *host_endian)
+{
+	struct wince_device_priv *priv = _device_priv(device);
+	DWORD actualSize = len;
+	*host_endian = 0;
+	if (!UkwGetConfigDescriptor(priv->dev, config_index, buffer, len, &actualSize)) {
+		return translate_driver_error(GetLastError());
+	}
+	return actualSize;
+}
+
+static int wince_get_configuration(
+   struct libusb_device_handle *handle,
+   int *config)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	UCHAR cv = 0;
+	if (!UkwGetConfig(priv->dev, &cv)) {
+		return translate_driver_error(GetLastError());
+	}
+	(*config) = cv;
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_set_configuration(
+	struct libusb_device_handle *handle,
+	int config)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	// Setting configuration 0 places the device in Address state.
+	// This should correspond to the "unconfigured state" required by
+	// libusb when the specified configuration is -1.
+	UCHAR cv = (config < 0) ? 0 : config;
+	if (!UkwSetConfig(priv->dev, cv)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_claim_interface(
+	struct libusb_device_handle *handle,
+	int interface_number)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwClaimInterface(priv->dev, interface_number)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_release_interface(
+	struct libusb_device_handle *handle,
+	int interface_number)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwSetInterfaceAlternateSetting(priv->dev, interface_number, 0)) {
+		return translate_driver_error(GetLastError());
+	}
+	if (!UkwReleaseInterface(priv->dev, interface_number)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_set_interface_altsetting(
+	struct libusb_device_handle *handle,
+	int interface_number, int altsetting)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwSetInterfaceAlternateSetting(priv->dev, interface_number, altsetting)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_clear_halt(
+	struct libusb_device_handle *handle,
+	unsigned char endpoint)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwClearHaltHost(priv->dev, endpoint)) {
+		return translate_driver_error(GetLastError());
+	}
+	if (!UkwClearHaltDevice(priv->dev, endpoint)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_reset_device(
+	struct libusb_device_handle *handle)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwResetDevice(priv->dev)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_kernel_driver_active(
+	struct libusb_device_handle *handle,
+	int interface_number)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	BOOL result = FALSE;
+	if (!UkwKernelDriverActive(priv->dev, interface_number, &result)) {
+		return translate_driver_error(GetLastError());
+	}
+	return result ? 1 : 0;
+}
+
+static int wince_detach_kernel_driver(
+	struct libusb_device_handle *handle,
+	int interface_number)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwDetachKernelDriver(priv->dev, interface_number)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_attach_kernel_driver(
+	struct libusb_device_handle *handle,
+	int interface_number)
+{
+	struct wince_device_priv *priv = _device_priv(handle->dev);
+	if (!UkwAttachKernelDriver(priv->dev, interface_number)) {
+		return translate_driver_error(GetLastError());
+	}	
+	return LIBUSB_SUCCESS;
+}
+
+static void wince_destroy_device(
+	struct libusb_device *dev)
+{
+	struct wince_device_priv *priv = _device_priv(dev);
+	UkwReleaseDeviceList(driver_handle, &priv->dev, 1);
+}
+
+static void wince_clear_transfer_priv(
+	struct usbi_transfer *itransfer)
+{
+	struct wince_transfer_priv *transfer_priv = (struct wince_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct winfd wfd = fd_to_winfd(transfer_priv->pollable_fd.fd);
+	// No need to cancel transfer as it is either complete or abandoned
+	wfd.itransfer = NULL;
+	CloseHandle(wfd.handle);
+	usbi_free_fd(&transfer_priv->pollable_fd);
+}
+
+static int wince_cancel_transfer(
+	struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct wince_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	struct wince_transfer_priv *transfer_priv = (struct wince_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	
+	if (!UkwCancelTransfer(priv->dev, transfer_priv->pollable_fd.overlapped, UKW_TF_NO_WAIT)) {
+		return translate_driver_error(GetLastError());
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_submit_control_or_bulk_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct wince_transfer_priv *transfer_priv = (struct wince_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct wince_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	BOOL direction_in, ret;
+	struct winfd wfd;
+	DWORD flags;
+	HANDLE eventHandle;
+	PUKW_CONTROL_HEADER setup = NULL;
+	const BOOL control_transfer = transfer->type == LIBUSB_TRANSFER_TYPE_CONTROL;
+
+	transfer_priv->pollable_fd = INVALID_WINFD;
+	if (control_transfer) {
+		setup = (PUKW_CONTROL_HEADER) transfer->buffer;
+		direction_in = setup->bmRequestType & LIBUSB_ENDPOINT_IN;
+	} else {
+		direction_in = transfer->endpoint & LIBUSB_ENDPOINT_IN;
+	}
+	flags = direction_in ? UKW_TF_IN_TRANSFER : UKW_TF_OUT_TRANSFER;
+	flags |= UKW_TF_SHORT_TRANSFER_OK;
+
+	eventHandle = CreateEvent(NULL, FALSE, FALSE, NULL);
+	if (eventHandle == NULL) {
+		usbi_err(ctx, "Failed to create event for async transfer");
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	wfd = usbi_create_fd(eventHandle, direction_in ? RW_READ : RW_WRITE, itransfer, &wince_cancel_transfer);
+	if (wfd.fd < 0) {
+		CloseHandle(eventHandle);
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	transfer_priv->pollable_fd = wfd;
+	if (control_transfer) {
+		// Split out control setup header and data buffer
+		DWORD bufLen = transfer->length - sizeof(UKW_CONTROL_HEADER);
+		PVOID buf = (PVOID) &transfer->buffer[sizeof(UKW_CONTROL_HEADER)];
+
+		ret = UkwIssueControlTransfer(priv->dev, flags, setup, buf, bufLen, &transfer->actual_length, wfd.overlapped);
+	} else {
+		ret = UkwIssueBulkTransfer(priv->dev, flags, transfer->endpoint, transfer->buffer, 
+			transfer->length, &transfer->actual_length, wfd.overlapped);
+	}
+	if (!ret) {
+		int libusbErr = translate_driver_error(GetLastError());
+		usbi_err(ctx, "UkwIssue%sTransfer failed: error %d",
+			control_transfer ? "Control" : "Bulk", GetLastError());
+		wince_clear_transfer_priv(itransfer);
+		return libusbErr;
+	}
+	usbi_add_pollfd(ctx, transfer_priv->pollable_fd.fd, direction_in ? POLLIN : POLLOUT);
+	itransfer->flags |= USBI_TRANSFER_UPDATED_FDS;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int wince_submit_iso_transfer(struct usbi_transfer *itransfer)
+{
+	return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static int wince_submit_transfer(
+	struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		return wince_submit_control_or_bulk_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		return wince_submit_iso_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	default:
+		usbi_err(TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+static void wince_transfer_callback(struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct wince_transfer_priv *transfer_priv = (struct wince_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct wince_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int status;
+
+	usbi_dbg("handling I/O completion with errcode %d", io_result);
+
+	if (io_result == ERROR_NOT_SUPPORTED && 
+		transfer->type != LIBUSB_TRANSFER_TYPE_CONTROL) {
+		/* For functional stalls, the WinCE USB layer (and therefore the USB Kernel Wrapper 
+		 * Driver) will report USB_ERROR_STALL/ERROR_NOT_SUPPORTED in situations where the 
+		 * endpoint isn't actually stalled.
+		 *
+		 * One example of this is that some devices will occasionally fail to reply to an IN
+		 * token. The WinCE USB layer carries on with the transaction until it is completed
+		 * (or cancelled) but then completes it with USB_ERROR_STALL.
+		 *
+		 * This code therefore needs to confirm that there really is a stall error, by both
+		 * checking the pipe status and requesting the endpoint status from the device.
+		 */
+		BOOL halted = FALSE;
+		usbi_dbg("checking I/O completion with errcode ERROR_NOT_SUPPORTED is really a stall");
+		if (UkwIsPipeHalted(priv->dev, transfer->endpoint, &halted)) {
+			/* Pipe status retrieved, so now request endpoint status by sending a GET_STATUS
+			 * control request to the device. This is done synchronously, which is a bit 
+			 * naughty, but this is a special corner case.
+			 */
+			WORD wStatus = 0;
+			DWORD written = 0;
+			UKW_CONTROL_HEADER ctrlHeader;
+			ctrlHeader.bmRequestType = LIBUSB_REQUEST_TYPE_STANDARD |
+				LIBUSB_ENDPOINT_IN | LIBUSB_RECIPIENT_ENDPOINT;
+			ctrlHeader.bRequest = LIBUSB_REQUEST_GET_STATUS;
+			ctrlHeader.wValue = 0;
+			ctrlHeader.wIndex = transfer->endpoint;
+			ctrlHeader.wLength = sizeof(wStatus);
+			if (UkwIssueControlTransfer(priv->dev,
+					UKW_TF_IN_TRANSFER | UKW_TF_SEND_TO_ENDPOINT,
+					&ctrlHeader, &wStatus, sizeof(wStatus), &written, NULL)) {
+				if (written == sizeof(wStatus) &&
+						(wStatus & STATUS_HALT_FLAG) == 0) {
+					if (!halted || UkwClearHaltHost(priv->dev, transfer->endpoint)) {
+						usbi_dbg("Endpoint doesn't appear to be stalled, overriding error with success");
+						io_result = ERROR_SUCCESS;
+					} else {
+						usbi_dbg("Endpoint doesn't appear to be stalled, but the host is halted, changing error");
+						io_result = ERROR_IO_DEVICE;
+					}
+				}
+			}
+		}
+	}
+
+	switch(io_result) {
+	case ERROR_SUCCESS:
+		itransfer->transferred += io_size;
+		status = LIBUSB_TRANSFER_COMPLETED;
+		break;
+	case ERROR_CANCELLED:
+		usbi_dbg("detected transfer cancel");
+		status = LIBUSB_TRANSFER_CANCELLED;
+		break;
+	case ERROR_NOT_SUPPORTED:
+	case ERROR_GEN_FAILURE:
+		usbi_dbg("detected endpoint stall");
+		status = LIBUSB_TRANSFER_STALL;
+		break;
+	case ERROR_SEM_TIMEOUT:
+		usbi_dbg("detected semaphore timeout");
+		status = LIBUSB_TRANSFER_TIMED_OUT;
+		break;
+	case ERROR_OPERATION_ABORTED:
+		if (itransfer->flags & USBI_TRANSFER_TIMED_OUT) {
+			usbi_dbg("detected timeout");
+			status = LIBUSB_TRANSFER_TIMED_OUT;
+		} else {
+			usbi_dbg("detected operation aborted");
+			status = LIBUSB_TRANSFER_CANCELLED;
+		}
+		break;
+	default:
+		usbi_err(ITRANSFER_CTX(itransfer), "detected I/O error: %s", windows_error_str(io_result));
+		status = LIBUSB_TRANSFER_ERROR;
+		break;
+	}
+	wince_clear_transfer_priv(itransfer);
+	if (status == LIBUSB_TRANSFER_CANCELLED) {
+		usbi_handle_transfer_cancellation(itransfer);
+	} else {
+		usbi_handle_transfer_completion(itransfer, (enum libusb_transfer_status)status);
+	}
+}
+
+static void wince_handle_callback (struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		wince_transfer_callback (itransfer, io_result, io_size);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	default:
+		usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type);
+	}
+}
+
+static int wince_handle_events(
+	struct libusb_context *ctx,
+	struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready)
+{
+	struct wince_transfer_priv* transfer_priv = NULL;
+	POLL_NFDS_TYPE i = 0;
+	BOOL found = FALSE;
+	struct usbi_transfer *transfer;
+	DWORD io_size, io_result;
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	for (i = 0; i < nfds && num_ready > 0; i++) {
+
+		usbi_dbg("checking fd %d with revents = %04x", fds[i].fd, fds[i].revents);
+
+		if (!fds[i].revents) {
+			continue;
+		}
+
+		num_ready--;
+
+		// Because a Windows OVERLAPPED is used for poll emulation,
+		// a pollable fd is created and stored with each transfer
+		usbi_mutex_lock(&ctx->flying_transfers_lock);
+		list_for_each_entry(transfer, &ctx->flying_transfers, list, struct usbi_transfer) {
+			transfer_priv = usbi_transfer_get_os_priv(transfer);
+			if (transfer_priv->pollable_fd.fd == fds[i].fd) {
+				found = TRUE;
+				break;
+			}
+		}
+		usbi_mutex_unlock(&ctx->flying_transfers_lock);
+
+		if (found && HasOverlappedIoCompleted(transfer_priv->pollable_fd.overlapped)) {
+			io_result = (DWORD)transfer_priv->pollable_fd.overlapped->Internal;
+			io_size = (DWORD)transfer_priv->pollable_fd.overlapped->InternalHigh;
+			usbi_remove_pollfd(ctx, transfer_priv->pollable_fd.fd);
+			// let handle_callback free the event using the transfer wfd
+			// If you don't use the transfer wfd, you run a risk of trying to free a
+			// newly allocated wfd that took the place of the one from the transfer.
+			wince_handle_callback(transfer, io_result, io_size);
+		} else if (found) {
+			usbi_err(ctx, "matching transfer for fd %x has not completed", fds[i]);
+			return LIBUSB_ERROR_OTHER;
+		} else {
+			usbi_err(ctx, "could not find a matching transfer for fd %x", fds[i]);
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	}
+
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * Monotonic and real time functions
+ */
+unsigned __stdcall wince_clock_gettime_threaded(void* param)
+{
+	LARGE_INTEGER hires_counter, li_frequency;
+	LONG nb_responses;
+	int timer_index;
+
+	// Init - find out if we have access to a monotonic (hires) timer
+	if (!QueryPerformanceFrequency(&li_frequency)) {
+		usbi_dbg("no hires timer available on this platform");
+		hires_frequency = 0;
+		hires_ticks_to_ps = UINT64_C(0);
+	} else {
+		hires_frequency = li_frequency.QuadPart;
+		// The hires frequency can go as high as 4 GHz, so we'll use a conversion
+		// to picoseconds to compute the tv_nsecs part in clock_gettime
+		hires_ticks_to_ps = UINT64_C(1000000000000) / hires_frequency;
+		usbi_dbg("hires timer available (Frequency: %"PRIu64" Hz)", hires_frequency);
+	}
+
+	// Signal wince_init() that we're ready to service requests
+	if (ReleaseSemaphore(timer_response, 1, NULL) == 0) {
+		usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0));
+	}
+
+	// Main loop - wait for requests
+	while (1) {
+		timer_index = WaitForMultipleObjects(2, timer_request, FALSE, INFINITE) - WAIT_OBJECT_0;
+		if ( (timer_index != 0) && (timer_index != 1) ) {
+			usbi_dbg("failure to wait on requests: %s", windows_error_str(0));
+			continue;
+		}
+		if (request_count[timer_index] == 0) {
+			// Request already handled
+			ResetEvent(timer_request[timer_index]);
+			// There's still a possiblity that a thread sends a request between the
+			// time we test request_count[] == 0 and we reset the event, in which case
+			// the request would be ignored. The simple solution to that is to test
+			// request_count again and process requests if non zero.
+			if (request_count[timer_index] == 0)
+				continue;
+		}
+		switch (timer_index) {
+		case 0:
+			WaitForSingleObject(timer_mutex, INFINITE);
+			// Requests to this thread are for hires always
+			if (QueryPerformanceCounter(&hires_counter) != 0) {
+				timer_tp.tv_sec = (long)(hires_counter.QuadPart / hires_frequency);
+				timer_tp.tv_nsec = (long)(((hires_counter.QuadPart % hires_frequency)/1000) * hires_ticks_to_ps);
+			} else {
+				// Fallback to real-time if we can't get monotonic value
+				// Note that real-time clock does not wait on the mutex or this thread.
+				wince_clock_gettime(USBI_CLOCK_REALTIME, &timer_tp);
+			}
+			ReleaseMutex(timer_mutex);
+
+			nb_responses = InterlockedExchange((LONG*)&request_count[0], 0);
+			if ( (nb_responses)
+			  && (ReleaseSemaphore(timer_response, nb_responses, NULL) == 0) ) {
+				usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0));
+			}
+			continue;
+		case 1: // time to quit
+			usbi_dbg("timer thread quitting");
+			return 0;
+		}
+	}
+	usbi_dbg("ERROR: broken timer thread");
+	return 1;
+}
+
+static int wince_clock_gettime(int clk_id, struct timespec *tp)
+{
+	FILETIME filetime;
+	ULARGE_INTEGER rtime;
+	DWORD r;
+	SYSTEMTIME st;
+	switch(clk_id) {
+	case USBI_CLOCK_MONOTONIC:
+		if (hires_frequency != 0) {
+			while (1) {
+				InterlockedIncrement((LONG*)&request_count[0]);
+				SetEvent(timer_request[0]);
+				r = WaitForSingleObject(timer_response, TIMER_REQUEST_RETRY_MS);
+				switch(r) {
+				case WAIT_OBJECT_0:
+					WaitForSingleObject(timer_mutex, INFINITE);
+					*tp = timer_tp;
+					ReleaseMutex(timer_mutex);
+					return LIBUSB_SUCCESS;
+				case WAIT_TIMEOUT:
+					usbi_dbg("could not obtain a timer value within reasonable timeframe - too much load?");
+					break; // Retry until successful
+				default:
+					usbi_dbg("WaitForSingleObject failed: %s", windows_error_str(0));
+					return LIBUSB_ERROR_OTHER;
+				}
+			}
+		}
+		// Fall through and return real-time if monotonic was not detected @ timer init
+	case USBI_CLOCK_REALTIME:
+		// We follow http://msdn.microsoft.com/en-us/library/ms724928%28VS.85%29.aspx
+		// with a predef epoch_time to have an epoch that starts at 1970.01.01 00:00
+		// Note however that our resolution is bounded by the Windows system time
+		// functions and is at best of the order of 1 ms (or, usually, worse)
+		GetSystemTime(&st);
+		SystemTimeToFileTime(&st, &filetime);
+		rtime.LowPart = filetime.dwLowDateTime;
+		rtime.HighPart = filetime.dwHighDateTime;
+		rtime.QuadPart -= epoch_time;
+		tp->tv_sec = (long)(rtime.QuadPart / 10000000);
+		tp->tv_nsec = (long)((rtime.QuadPart % 10000000)*100);
+		return LIBUSB_SUCCESS;
+	default:
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+const struct usbi_os_backend wince_backend = {
+        "Windows CE",
+        0,
+        wince_init,
+        wince_exit,
+
+        wince_get_device_list,
+	NULL,				/* hotplug_poll */
+        wince_open,
+        wince_close,
+
+        wince_get_device_descriptor,
+        wince_get_active_config_descriptor,
+        wince_get_config_descriptor,
+	NULL,				/* get_config_descriptor_by_value() */
+
+        wince_get_configuration,
+        wince_set_configuration,
+        wince_claim_interface,
+        wince_release_interface,
+
+        wince_set_interface_altsetting,
+        wince_clear_halt,
+        wince_reset_device,
+
+	NULL,				/* alloc_streams */
+	NULL,				/* free_streams */
+
+        wince_kernel_driver_active,
+        wince_detach_kernel_driver,
+        wince_attach_kernel_driver,
+
+        wince_destroy_device,
+
+        wince_submit_transfer,
+        wince_cancel_transfer,
+        wince_clear_transfer_priv,
+
+        wince_handle_events,
+
+        wince_clock_gettime,
+        sizeof(struct wince_device_priv),
+        sizeof(struct wince_device_handle_priv),
+        sizeof(struct wince_transfer_priv),
+        0,
+};
diff --git a/Externals/libusb/libusb/os/wince_usb.h b/Externals/libusb/libusb/os/wince_usb.h
new file mode 100644
index 0000000000..bc61b5c103
--- /dev/null
+++ b/Externals/libusb/libusb/os/wince_usb.h
@@ -0,0 +1,131 @@
+/*
+ * Windows CE backend for libusb 1.0
+ * Copyright © 2011-2013 RealVNC Ltd.
+ * Portions taken from Windows backend, which is
+ * Copyright © 2009-2010 Pete Batard <pbatard@gmail.com>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
+ * Major code testing contribution by Xiaofan Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#pragma once
+
+#include "windows_common.h"
+
+#include <windows.h>
+#include "poll_windows.h"
+
+#define MAX_DEVICE_COUNT            256
+
+// This is a modified dump of the types in the ceusbkwrapper.h library header
+// with functions transformed into extern pointers.
+//
+// This backend dynamically loads ceusbkwrapper.dll and doesn't include
+// ceusbkwrapper.h directly to simplify the build process. The kernel
+// side wrapper driver is built using the platform image build tools,
+// which makes it difficult to reference directly from the libusb build
+// system.
+struct UKW_DEVICE_PRIV;
+typedef struct UKW_DEVICE_PRIV *UKW_DEVICE;
+typedef UKW_DEVICE *PUKW_DEVICE, *LPUKW_DEVICE;
+
+typedef struct {
+	UINT8 bLength;
+	UINT8 bDescriptorType;
+	UINT16 bcdUSB;
+	UINT8 bDeviceClass;
+	UINT8 bDeviceSubClass;
+	UINT8 bDeviceProtocol;
+	UINT8 bMaxPacketSize0;
+	UINT16 idVendor;
+	UINT16 idProduct;
+	UINT16 bcdDevice;
+	UINT8 iManufacturer;
+	UINT8 iProduct;
+	UINT8 iSerialNumber;
+	UINT8 bNumConfigurations;
+} UKW_DEVICE_DESCRIPTOR, *PUKW_DEVICE_DESCRIPTOR, *LPUKW_DEVICE_DESCRIPTOR;
+
+typedef struct {
+	UINT8 bmRequestType;
+	UINT8 bRequest;
+	UINT16 wValue;
+	UINT16 wIndex;
+	UINT16 wLength;
+} UKW_CONTROL_HEADER, *PUKW_CONTROL_HEADER, *LPUKW_CONTROL_HEADER;
+
+// Collection of flags which can be used when issuing transfer requests
+/* Indicates that the transfer direction is 'in' */
+#define UKW_TF_IN_TRANSFER        0x00000001
+/* Indicates that the transfer direction is 'out' */
+#define UKW_TF_OUT_TRANSFER       0x00000000
+/* Specifies that the transfer should complete as soon as possible,
+ * even if no OVERLAPPED structure has been provided. */
+#define UKW_TF_NO_WAIT            0x00000100
+/* Indicates that transfers shorter than the buffer are ok */
+#define UKW_TF_SHORT_TRANSFER_OK  0x00000200
+#define UKW_TF_SEND_TO_DEVICE     0x00010000
+#define UKW_TF_SEND_TO_INTERFACE  0x00020000
+#define UKW_TF_SEND_TO_ENDPOINT   0x00040000
+/* Don't block when waiting for memory allocations */
+#define UKW_TF_DONT_BLOCK_FOR_MEM 0x00080000
+
+/* Value to use when dealing with configuration values, such as UkwGetConfigDescriptor, 
+ * to specify the currently active configuration for the device. */
+#define UKW_ACTIVE_CONFIGURATION -1
+
+DLL_DECLARE(WINAPI, HANDLE, UkwOpenDriver, ());
+DLL_DECLARE(WINAPI, BOOL, UkwGetDeviceList, (HANDLE, LPUKW_DEVICE, DWORD, LPDWORD));
+DLL_DECLARE(WINAPI, void, UkwReleaseDeviceList, (HANDLE, LPUKW_DEVICE, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwGetDeviceAddress, (UKW_DEVICE, unsigned char*, unsigned char*, unsigned long*));
+DLL_DECLARE(WINAPI, BOOL, UkwGetDeviceDescriptor, (UKW_DEVICE, LPUKW_DEVICE_DESCRIPTOR));
+DLL_DECLARE(WINAPI, BOOL, UkwGetConfigDescriptor, (UKW_DEVICE, DWORD, LPVOID, DWORD, LPDWORD));
+DLL_DECLARE(WINAPI, void, UkwCloseDriver, (HANDLE));
+DLL_DECLARE(WINAPI, BOOL, UkwCancelTransfer, (UKW_DEVICE, LPOVERLAPPED, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwIssueControlTransfer, (UKW_DEVICE, DWORD, LPUKW_CONTROL_HEADER, LPVOID, DWORD, LPDWORD, LPOVERLAPPED));
+DLL_DECLARE(WINAPI, BOOL, UkwClaimInterface, (UKW_DEVICE, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwReleaseInterface, (UKW_DEVICE, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwSetInterfaceAlternateSetting, (UKW_DEVICE, DWORD, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwClearHaltHost, (UKW_DEVICE, UCHAR));
+DLL_DECLARE(WINAPI, BOOL, UkwClearHaltDevice, (UKW_DEVICE, UCHAR));
+DLL_DECLARE(WINAPI, BOOL, UkwGetConfig, (UKW_DEVICE, PUCHAR));
+DLL_DECLARE(WINAPI, BOOL, UkwSetConfig, (UKW_DEVICE, UCHAR));
+DLL_DECLARE(WINAPI, BOOL, UkwResetDevice, (UKW_DEVICE));
+DLL_DECLARE(WINAPI, BOOL, UkwKernelDriverActive, (UKW_DEVICE, DWORD, PBOOL));
+DLL_DECLARE(WINAPI, BOOL, UkwAttachKernelDriver, (UKW_DEVICE, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwDetachKernelDriver, (UKW_DEVICE, DWORD));
+DLL_DECLARE(WINAPI, BOOL, UkwIssueBulkTransfer, (UKW_DEVICE, DWORD, UCHAR, LPVOID, DWORD, LPDWORD, LPOVERLAPPED));
+DLL_DECLARE(WINAPI, BOOL, UkwIsPipeHalted, (UKW_DEVICE, UCHAR, LPBOOL));
+
+// Used to determine if an endpoint status really is halted on a failed transfer.
+#define STATUS_HALT_FLAG 0x1
+
+struct wince_device_priv {
+	UKW_DEVICE dev;
+	UKW_DEVICE_DESCRIPTOR desc;
+};
+
+struct wince_device_handle_priv {
+	// This member isn't used, but only exists to avoid an empty structure
+	// for private data for the device handle.
+	int reserved;
+};
+
+struct wince_transfer_priv {
+	struct winfd pollable_fd;
+	uint8_t interface_number;
+};
+
diff --git a/Externals/libusb/libusb/os/windows_common.h b/Externals/libusb/libusb/os/windows_common.h
new file mode 100644
index 0000000000..fe95d79d2d
--- /dev/null
+++ b/Externals/libusb/libusb/os/windows_common.h
@@ -0,0 +1,108 @@
+/*
+ * Windows backend common header for libusb 1.0
+ *
+ * This file brings together header code common between
+ * the desktop Windows and Windows CE backends.
+ * Copyright © 2012-2013 RealVNC Ltd.
+ * Copyright © 2009-2012 Pete Batard <pete@akeo.ie>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
+ * Major code testing contribution by Xiaofan Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+// Windows API default is uppercase - ugh!
+#if !defined(bool)
+#define bool BOOL
+#endif
+#if !defined(true)
+#define true TRUE
+#endif
+#if !defined(false)
+#define false FALSE
+#endif
+
+#define safe_free(p) do {if (p != NULL) {free((void*)p); p = NULL;}} while(0)
+#define safe_closehandle(h) do {if (h != INVALID_HANDLE_VALUE) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0)
+#define safe_min(a, b) min((size_t)(a), (size_t)(b))
+#define safe_strcp(dst, dst_max, src, count) do {memcpy(dst, src, safe_min(count, dst_max)); \
+	((char*)dst)[safe_min(count, dst_max)-1] = 0;} while(0)
+#define safe_strcpy(dst, dst_max, src) safe_strcp(dst, dst_max, src, safe_strlen(src)+1)
+#define safe_strncat(dst, dst_max, src, count) strncat(dst, src, safe_min(count, dst_max - safe_strlen(dst) - 1))
+#define safe_strcat(dst, dst_max, src) safe_strncat(dst, dst_max, src, safe_strlen(src)+1)
+#define safe_strcmp(str1, str2) strcmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2))
+#define safe_stricmp(str1, str2) _stricmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2))
+#define safe_strncmp(str1, str2, count) strncmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2), count)
+#define safe_strlen(str) ((str==NULL)?0:strlen(str))
+#define safe_sprintf(dst, count, ...) do {_snprintf(dst, count, __VA_ARGS__); (dst)[(count)-1] = 0; } while(0)
+#define safe_stprintf _sntprintf
+#define safe_tcslen(str) ((str==NULL)?0:_tcslen(str))
+#define safe_unref_device(dev) do {if (dev != NULL) {libusb_unref_device(dev); dev = NULL;}} while(0)
+#define wchar_to_utf8_ms(wstr, str, strlen) WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, strlen, NULL, NULL)
+#ifndef ARRAYSIZE
+#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
+#endif
+
+#define ERR_BUFFER_SIZE             256
+#define TIMER_REQUEST_RETRY_MS      100
+#define MAX_TIMER_SEMAPHORES        128
+
+
+/*
+ * API macros - from libusb-win32 1.x
+ */
+#define DLL_DECLARE_PREFIXNAME(api, ret, prefixname, name, args)    \
+	typedef ret (api * __dll_##name##_t)args;                       \
+	static __dll_##name##_t prefixname = NULL
+
+#ifndef _WIN32_WCE
+#define DLL_STRINGIFY(dll) #dll
+#define DLL_GET_MODULE_HANDLE(dll) GetModuleHandleA(DLL_STRINGIFY(dll))
+#define DLL_LOAD_LIBRARY(dll) LoadLibraryA(DLL_STRINGIFY(dll))
+#else
+#define DLL_STRINGIFY(dll) L#dll
+#define DLL_GET_MODULE_HANDLE(dll) GetModuleHandle(DLL_STRINGIFY(dll))
+#define DLL_LOAD_LIBRARY(dll) LoadLibrary(DLL_STRINGIFY(dll))
+#endif
+
+#define DLL_LOAD_PREFIXNAME(dll, prefixname, name, ret_on_failure) \
+	do {                                                           \
+		HMODULE h = DLL_GET_MODULE_HANDLE(dll);                    \
+	if (!h)                                                        \
+		h = DLL_LOAD_LIBRARY(dll);                                 \
+	if (!h) {                                                      \
+		if (ret_on_failure) { return LIBUSB_ERROR_NOT_FOUND; }     \
+		else { break; }                                            \
+	}                                                              \
+	prefixname = (__dll_##name##_t)GetProcAddress(h,               \
+	                        DLL_STRINGIFY(name));                  \
+	if (prefixname) break;                                         \
+	prefixname = (__dll_##name##_t)GetProcAddress(h,               \
+	                        DLL_STRINGIFY(name) DLL_STRINGIFY(A)); \
+	if (prefixname) break;                                         \
+	prefixname = (__dll_##name##_t)GetProcAddress(h,               \
+	                        DLL_STRINGIFY(name) DLL_STRINGIFY(W)); \
+	if (prefixname) break;                                         \
+	if(ret_on_failure)                                             \
+		return LIBUSB_ERROR_NOT_FOUND;                             \
+	} while(0)
+
+#define DLL_DECLARE(api, ret, name, args)   DLL_DECLARE_PREFIXNAME(api, ret, name, name, args)
+#define DLL_LOAD(dll, name, ret_on_failure) DLL_LOAD_PREFIXNAME(dll, name, name, ret_on_failure)
+#define DLL_DECLARE_PREFIXED(api, ret, prefix, name, args)   DLL_DECLARE_PREFIXNAME(api, ret, prefix##name, name, args)
+#define DLL_LOAD_PREFIXED(dll, prefix, name, ret_on_failure) DLL_LOAD_PREFIXNAME(dll, prefix##name, name, ret_on_failure)
diff --git a/Externals/libusb/libusb/os/windows_usb.c b/Externals/libusb/libusb/os/windows_usb.c
new file mode 100644
index 0000000000..6c4297184c
--- /dev/null
+++ b/Externals/libusb/libusb/os/windows_usb.c
@@ -0,0 +1,4557 @@
+/*
+ * windows backend for libusb 1.0
+ * Copyright © 2009-2012 Pete Batard <pete@akeo.ie>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
+ * HID Reports IOCTLs inspired from HIDAPI by Alan Ott, Signal 11 Software
+ * Hash table functions adapted from glibc, by Ulrich Drepper et al.
+ * Major code testing contribution by Xiaofan Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+#include <windows.h>
+#include <setupapi.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <process.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <objbase.h>
+#include <winioctl.h>
+
+#include "libusbi.h"
+#include "poll_windows.h"
+#include "windows_usb.h"
+
+// The 2 macros below are used in conjunction with safe loops.
+#define LOOP_CHECK(fcall) { r=fcall; if (r != LIBUSB_SUCCESS) continue; }
+#define LOOP_BREAK(err) { r=err; continue; }
+
+// Helper prototypes
+static int windows_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len, int *host_endian);
+static int windows_clock_gettime(int clk_id, struct timespec *tp);
+unsigned __stdcall windows_clock_gettime_threaded(void* param);
+// Common calls
+static int common_configure_endpoints(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+
+// WinUSB-like API prototypes
+static int winusbx_init(int sub_api, struct libusb_context *ctx);
+static int winusbx_exit(int sub_api);
+static int winusbx_open(int sub_api, struct libusb_device_handle *dev_handle);
+static void winusbx_close(int sub_api, struct libusb_device_handle *dev_handle);
+static int winusbx_configure_endpoints(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int winusbx_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int winusbx_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int winusbx_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int winusbx_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting);
+static int winusbx_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int winusbx_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint);
+static int winusbx_abort_transfers(int sub_api, struct usbi_transfer *itransfer);
+static int winusbx_abort_control(int sub_api, struct usbi_transfer *itransfer);
+static int winusbx_reset_device(int sub_api, struct libusb_device_handle *dev_handle);
+static int winusbx_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size);
+// HID API prototypes
+static int hid_init(int sub_api, struct libusb_context *ctx);
+static int hid_exit(int sub_api);
+static int hid_open(int sub_api, struct libusb_device_handle *dev_handle);
+static void hid_close(int sub_api, struct libusb_device_handle *dev_handle);
+static int hid_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int hid_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int hid_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting);
+static int hid_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int hid_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int hid_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint);
+static int hid_abort_transfers(int sub_api, struct usbi_transfer *itransfer);
+static int hid_reset_device(int sub_api, struct libusb_device_handle *dev_handle);
+static int hid_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size);
+// Composite API prototypes
+static int composite_init(int sub_api, struct libusb_context *ctx);
+static int composite_exit(int sub_api);
+static int composite_open(int sub_api, struct libusb_device_handle *dev_handle);
+static void composite_close(int sub_api, struct libusb_device_handle *dev_handle);
+static int composite_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int composite_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting);
+static int composite_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+static int composite_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int composite_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int composite_submit_iso_transfer(int sub_api, struct usbi_transfer *itransfer);
+static int composite_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint);
+static int composite_abort_transfers(int sub_api, struct usbi_transfer *itransfer);
+static int composite_abort_control(int sub_api, struct usbi_transfer *itransfer);
+static int composite_reset_device(int sub_api, struct libusb_device_handle *dev_handle);
+static int composite_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size);
+
+
+// Global variables
+uint64_t hires_frequency, hires_ticks_to_ps;
+const uint64_t epoch_time = UINT64_C(116444736000000000);	// 1970.01.01 00:00:000 in MS Filetime
+int windows_version = WINDOWS_UNDEFINED;
+static char windows_version_str[128] = "Windows Undefined";
+// Concurrency
+static int concurrent_usage = -1;
+usbi_mutex_t autoclaim_lock;
+// Timer thread
+// NB: index 0 is for monotonic and 1 is for the thread exit event
+HANDLE timer_thread = NULL;
+HANDLE timer_mutex = NULL;
+struct timespec timer_tp;
+volatile LONG request_count[2] = {0, 1};	// last one must be > 0
+HANDLE timer_request[2] = { NULL, NULL };
+HANDLE timer_response = NULL;
+// API globals
+#define CHECK_WINUSBX_AVAILABLE(sub_api) do { if (sub_api == SUB_API_NOTSET) sub_api = priv->sub_api; \
+	if (!WinUSBX[sub_api].initialized) return LIBUSB_ERROR_ACCESS; } while(0)
+static struct winusb_interface WinUSBX[SUB_API_MAX];
+const char* sub_api_name[SUB_API_MAX] = WINUSBX_DRV_NAMES;
+bool api_hid_available = false;
+#define CHECK_HID_AVAILABLE do { if (!api_hid_available) return LIBUSB_ERROR_ACCESS; } while (0)
+
+static inline BOOLEAN guid_eq(const GUID *guid1, const GUID *guid2) {
+	if ((guid1 != NULL) && (guid2 != NULL)) {
+		return (memcmp(guid1, guid2, sizeof(GUID)) == 0);
+	}
+	return false;
+}
+
+#if defined(ENABLE_LOGGING)
+static char* guid_to_string(const GUID* guid)
+{
+	static char guid_string[MAX_GUID_STRING_LENGTH];
+
+	if (guid == NULL) return NULL;
+	sprintf(guid_string, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+		(unsigned int)guid->Data1, guid->Data2, guid->Data3,
+		guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+		guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
+	return guid_string;
+}
+#endif
+
+/*
+ * Converts a windows error to human readable string
+ * uses retval as errorcode, or, if 0, use GetLastError()
+ */
+#if defined(ENABLE_LOGGING)
+static char *windows_error_str(uint32_t retval)
+{
+static char err_string[ERR_BUFFER_SIZE];
+
+	DWORD size;
+	ssize_t i;
+	uint32_t error_code, format_error;
+
+	error_code = retval?retval:GetLastError();
+
+	safe_sprintf(err_string, ERR_BUFFER_SIZE, "[%u] ", error_code);
+
+	// Translate codes returned by SetupAPI. The ones we are dealing with are either
+	// in 0x0000xxxx or 0xE000xxxx and can be distinguished from standard error codes.
+	// See http://msdn.microsoft.com/en-us/library/windows/hardware/ff545011.aspx
+	switch (error_code & 0xE0000000) {
+	case 0:
+		error_code = HRESULT_FROM_WIN32(error_code);	// Still leaves ERROR_SUCCESS unmodified
+		break;
+	case 0xE0000000:
+		error_code =  0x80000000 | (FACILITY_SETUPAPI << 16) | (error_code & 0x0000FFFF);
+		break;
+	default:
+		break;
+	}
+
+	size = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code,
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &err_string[safe_strlen(err_string)],
+		ERR_BUFFER_SIZE - (DWORD)safe_strlen(err_string), NULL);
+	if (size == 0) {
+		format_error = GetLastError();
+		if (format_error)
+			safe_sprintf(err_string, ERR_BUFFER_SIZE,
+				"Windows error code %u (FormatMessage error code %u)", error_code, format_error);
+		else
+			safe_sprintf(err_string, ERR_BUFFER_SIZE, "Unknown error code %u", error_code);
+	} else {
+		// Remove CR/LF terminators
+		for (i=safe_strlen(err_string)-1; (i>=0) && ((err_string[i]==0x0A) || (err_string[i]==0x0D)); i--) {
+			err_string[i] = 0;
+		}
+	}
+	return err_string;
+}
+#endif
+
+/*
+ * Sanitize Microsoft's paths: convert to uppercase, add prefix and fix backslashes.
+ * Return an allocated sanitized string or NULL on error.
+ */
+static char* sanitize_path(const char* path)
+{
+	const char root_prefix[] = "\\\\.\\";
+	size_t j, size, root_size;
+	char* ret_path = NULL;
+	size_t add_root = 0;
+
+	if (path == NULL)
+		return NULL;
+
+	size = safe_strlen(path)+1;
+	root_size = sizeof(root_prefix)-1;
+
+	// Microsoft indiscriminately uses '\\?\', '\\.\', '##?#" or "##.#" for root prefixes.
+	if (!((size > 3) && (((path[0] == '\\') && (path[1] == '\\') && (path[3] == '\\')) ||
+		((path[0] == '#') && (path[1] == '#') && (path[3] == '#'))))) {
+		add_root = root_size;
+		size += add_root;
+	}
+
+	if ((ret_path = (char*) calloc(size, 1)) == NULL)
+		return NULL;
+
+	safe_strcpy(&ret_path[add_root], size-add_root, path);
+
+	// Ensure consistency with root prefix
+	for (j=0; j<root_size; j++)
+		ret_path[j] = root_prefix[j];
+
+	// Same goes for '\' and '#' after the root prefix. Ensure '#' is used
+	for(j=root_size; j<size; j++) {
+		ret_path[j] = (char)toupper((int)ret_path[j]);	// Fix case too
+		if (ret_path[j] == '\\')
+			ret_path[j] = '#';
+	}
+
+	return ret_path;
+}
+
+/*
+ * Cfgmgr32, OLE32 and SetupAPI DLL functions
+ */
+static int init_dlls(void)
+{
+	DLL_LOAD(Cfgmgr32.dll, CM_Get_Parent, TRUE);
+	DLL_LOAD(Cfgmgr32.dll, CM_Get_Child, TRUE);
+	DLL_LOAD(Cfgmgr32.dll, CM_Get_Sibling, TRUE);
+	DLL_LOAD(Cfgmgr32.dll, CM_Get_Device_IDA, TRUE);
+	// Prefixed to avoid conflict with header files
+	DLL_LOAD_PREFIXED(OLE32.dll, p, CLSIDFromString, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiGetClassDevsA, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiEnumDeviceInfo, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiEnumDeviceInterfaces, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiGetDeviceInterfaceDetailA, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiDestroyDeviceInfoList, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiOpenDevRegKey, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiGetDeviceRegistryPropertyA, TRUE);
+	DLL_LOAD_PREFIXED(SetupAPI.dll, p, SetupDiOpenDeviceInterfaceRegKey, TRUE);
+	DLL_LOAD_PREFIXED(AdvAPI32.dll, p, RegQueryValueExW, TRUE);
+	DLL_LOAD_PREFIXED(AdvAPI32.dll, p, RegCloseKey, TRUE);
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * enumerate interfaces for the whole USB class
+ *
+ * Parameters:
+ * dev_info: a pointer to a dev_info list
+ * dev_info_data: a pointer to an SP_DEVINFO_DATA to be filled (or NULL if not needed)
+ * usb_class: the generic USB class for which to retrieve interface details
+ * index: zero based index of the interface in the device info list
+ *
+ * Note: it is the responsibility of the caller to free the DEVICE_INTERFACE_DETAIL_DATA
+ * structure returned and call this function repeatedly using the same guid (with an
+ * incremented index starting at zero) until all interfaces have been returned.
+ */
+static bool get_devinfo_data(struct libusb_context *ctx,
+	HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const char* usb_class, unsigned _index)
+{
+	if (_index <= 0) {
+		*dev_info = pSetupDiGetClassDevsA(NULL, usb_class, NULL, DIGCF_PRESENT|DIGCF_ALLCLASSES);
+		if (*dev_info == INVALID_HANDLE_VALUE) {
+			return false;
+		}
+	}
+
+	dev_info_data->cbSize = sizeof(SP_DEVINFO_DATA);
+	if (!pSetupDiEnumDeviceInfo(*dev_info, _index, dev_info_data)) {
+		if (GetLastError() != ERROR_NO_MORE_ITEMS) {
+			usbi_err(ctx, "Could not obtain device info data for index %u: %s",
+				_index, windows_error_str(0));
+		}
+		pSetupDiDestroyDeviceInfoList(*dev_info);
+		*dev_info = INVALID_HANDLE_VALUE;
+		return false;
+	}
+	return true;
+}
+
+/*
+ * enumerate interfaces for a specific GUID
+ *
+ * Parameters:
+ * dev_info: a pointer to a dev_info list
+ * dev_info_data: a pointer to an SP_DEVINFO_DATA to be filled (or NULL if not needed)
+ * guid: the GUID for which to retrieve interface details
+ * index: zero based index of the interface in the device info list
+ *
+ * Note: it is the responsibility of the caller to free the DEVICE_INTERFACE_DETAIL_DATA
+ * structure returned and call this function repeatedly using the same guid (with an
+ * incremented index starting at zero) until all interfaces have been returned.
+ */
+static SP_DEVICE_INTERFACE_DETAIL_DATA_A *get_interface_details(struct libusb_context *ctx,
+	HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const GUID* guid, unsigned _index)
+{
+	SP_DEVICE_INTERFACE_DATA dev_interface_data;
+	SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL;
+	DWORD size;
+
+	if (_index <= 0) {
+		*dev_info = pSetupDiGetClassDevsA(guid, NULL, NULL, DIGCF_PRESENT|DIGCF_DEVICEINTERFACE);
+	}
+
+	if (dev_info_data != NULL) {
+		dev_info_data->cbSize = sizeof(SP_DEVINFO_DATA);
+		if (!pSetupDiEnumDeviceInfo(*dev_info, _index, dev_info_data)) {
+			if (GetLastError() != ERROR_NO_MORE_ITEMS) {
+				usbi_err(ctx, "Could not obtain device info data for index %u: %s",
+					_index, windows_error_str(0));
+			}
+			pSetupDiDestroyDeviceInfoList(*dev_info);
+			*dev_info = INVALID_HANDLE_VALUE;
+			return NULL;
+		}
+	}
+
+	dev_interface_data.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+	if (!pSetupDiEnumDeviceInterfaces(*dev_info, NULL, guid, _index, &dev_interface_data)) {
+		if (GetLastError() != ERROR_NO_MORE_ITEMS) {
+			usbi_err(ctx, "Could not obtain interface data for index %u: %s",
+				_index, windows_error_str(0));
+		}
+		pSetupDiDestroyDeviceInfoList(*dev_info);
+		*dev_info = INVALID_HANDLE_VALUE;
+		return NULL;
+	}
+
+	// Read interface data (dummy + actual) to access the device path
+	if (!pSetupDiGetDeviceInterfaceDetailA(*dev_info, &dev_interface_data, NULL, 0, &size, NULL)) {
+		// The dummy call should fail with ERROR_INSUFFICIENT_BUFFER
+		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+			usbi_err(ctx, "could not access interface data (dummy) for index %u: %s",
+				_index, windows_error_str(0));
+			goto err_exit;
+		}
+	} else {
+		usbi_err(ctx, "program assertion failed - http://msdn.microsoft.com/en-us/library/ms792901.aspx is wrong.");
+		goto err_exit;
+	}
+
+	if ((dev_interface_details = (SP_DEVICE_INTERFACE_DETAIL_DATA_A*) calloc(size, 1)) == NULL) {
+		usbi_err(ctx, "could not allocate interface data for index %u.", _index);
+		goto err_exit;
+	}
+
+	dev_interface_details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A);
+	if (!pSetupDiGetDeviceInterfaceDetailA(*dev_info, &dev_interface_data,
+		dev_interface_details, size, &size, NULL)) {
+		usbi_err(ctx, "could not access interface data (actual) for index %u: %s",
+			_index, windows_error_str(0));
+	}
+
+	return dev_interface_details;
+
+err_exit:
+	pSetupDiDestroyDeviceInfoList(*dev_info);
+	*dev_info = INVALID_HANDLE_VALUE;
+	return NULL;
+}
+
+/* For libusb0 filter */
+static SP_DEVICE_INTERFACE_DETAIL_DATA_A *get_interface_details_filter(struct libusb_context *ctx,
+	HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const GUID* guid, unsigned _index, char* filter_path){
+	SP_DEVICE_INTERFACE_DATA dev_interface_data;
+	SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL;
+	DWORD size;
+	if (_index <= 0) {
+		*dev_info = pSetupDiGetClassDevsA(guid, NULL, NULL, DIGCF_PRESENT|DIGCF_DEVICEINTERFACE);
+	}
+	if (dev_info_data != NULL) {
+		dev_info_data->cbSize = sizeof(SP_DEVINFO_DATA);
+		if (!pSetupDiEnumDeviceInfo(*dev_info, _index, dev_info_data)) {
+			if (GetLastError() != ERROR_NO_MORE_ITEMS) {
+				usbi_err(ctx, "Could not obtain device info data for index %u: %s",
+					_index, windows_error_str(0));
+			}
+			pSetupDiDestroyDeviceInfoList(*dev_info);
+			*dev_info = INVALID_HANDLE_VALUE;
+			return NULL;
+		}
+	}
+	dev_interface_data.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+	if (!pSetupDiEnumDeviceInterfaces(*dev_info, NULL, guid, _index, &dev_interface_data)) {
+		if (GetLastError() != ERROR_NO_MORE_ITEMS) {
+			usbi_err(ctx, "Could not obtain interface data for index %u: %s",
+				_index, windows_error_str(0));
+		}
+		pSetupDiDestroyDeviceInfoList(*dev_info);
+		*dev_info = INVALID_HANDLE_VALUE;
+		return NULL;
+	}
+	// Read interface data (dummy + actual) to access the device path
+	if (!pSetupDiGetDeviceInterfaceDetailA(*dev_info, &dev_interface_data, NULL, 0, &size, NULL)) {
+		// The dummy call should fail with ERROR_INSUFFICIENT_BUFFER
+		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+			usbi_err(ctx, "could not access interface data (dummy) for index %u: %s",
+				_index, windows_error_str(0));
+			goto err_exit;
+		}
+	} else {
+		usbi_err(ctx, "program assertion failed - http://msdn.microsoft.com/en-us/library/ms792901.aspx is wrong.");
+		goto err_exit;
+	}
+	if ((dev_interface_details = malloc(size)) == NULL) {
+		usbi_err(ctx, "could not allocate interface data for index %u.", _index);
+		goto err_exit;
+	}
+	dev_interface_details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A);
+	if (!pSetupDiGetDeviceInterfaceDetailA(*dev_info, &dev_interface_data,
+		dev_interface_details, size, &size, NULL)) {
+		usbi_err(ctx, "could not access interface data (actual) for index %u: %s",
+			_index, windows_error_str(0));
+	}
+	// [trobinso] lookup the libusb0 symbolic index.
+	if (dev_interface_details) {
+		HKEY hkey_device_interface=pSetupDiOpenDeviceInterfaceRegKey(*dev_info,&dev_interface_data,0,KEY_READ);
+		if (hkey_device_interface != INVALID_HANDLE_VALUE) {
+			DWORD libusb0_symboliclink_index=0;
+			DWORD value_length=sizeof(DWORD);
+			DWORD value_type=0;
+			LONG status;
+			status = pRegQueryValueExW(hkey_device_interface, L"LUsb0", NULL, &value_type,
+				(LPBYTE) &libusb0_symboliclink_index, &value_length);
+			if (status == ERROR_SUCCESS) {
+				if (libusb0_symboliclink_index < 256) {
+					// libusb0.sys is connected to this device instance.
+					// If the the device interface guid is {F9F3FF14-AE21-48A0-8A25-8011A7A931D9} then it's a filter.
+					safe_sprintf(filter_path, sizeof("\\\\.\\libusb0-0000"), "\\\\.\\libusb0-%04d", libusb0_symboliclink_index);
+					usbi_dbg("assigned libusb0 symbolic link %s", filter_path);
+				} else {
+					// libusb0.sys was connected to this device instance at one time; but not anymore.
+				}
+			}
+			pRegCloseKey(hkey_device_interface);
+		}
+	}
+	return dev_interface_details;
+err_exit:
+	pSetupDiDestroyDeviceInfoList(*dev_info);
+	*dev_info = INVALID_HANDLE_VALUE;
+	return NULL;}
+
+/* Hash table functions - modified From glibc 2.3.2:
+   [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
+   [Knuth]            The Art of Computer Programming, part 3 (6.4)  */
+typedef struct htab_entry {
+	unsigned long used;
+	char* str;
+} htab_entry;
+htab_entry* htab_table = NULL;
+usbi_mutex_t htab_write_mutex = NULL;
+unsigned long htab_size, htab_filled;
+
+/* For the used double hash method the table size has to be a prime. To
+   correct the user given table size we need a prime test.  This trivial
+   algorithm is adequate because the code is called only during init and
+   the number is likely to be small  */
+static int isprime(unsigned long number)
+{
+	// no even number will be passed
+	unsigned int divider = 3;
+
+	while((divider * divider < number) && (number % divider != 0))
+		divider += 2;
+
+	return (number % divider != 0);
+}
+
+/* Before using the hash table we must allocate memory for it.
+   We allocate one element more as the found prime number says.
+   This is done for more effective indexing as explained in the
+   comment for the hash function.  */
+static int htab_create(struct libusb_context *ctx, unsigned long nel)
+{
+	if (htab_table != NULL) {
+		usbi_err(ctx, "hash table already allocated");
+	}
+
+	// Create a mutex
+	usbi_mutex_init(&htab_write_mutex, NULL);
+
+	// Change nel to the first prime number not smaller as nel.
+	nel |= 1;
+	while(!isprime(nel))
+		nel += 2;
+
+	htab_size = nel;
+	usbi_dbg("using %d entries hash table", nel);
+	htab_filled = 0;
+
+	// allocate memory and zero out.
+	htab_table = (htab_entry*) calloc(htab_size + 1, sizeof(htab_entry));
+	if (htab_table == NULL) {
+		usbi_err(ctx, "could not allocate space for hash table");
+		return 0;
+	}
+
+	return 1;
+}
+
+/* After using the hash table it has to be destroyed.  */
+static void htab_destroy(void)
+{
+	size_t i;
+	if (htab_table == NULL) {
+		return;
+	}
+
+	for (i=0; i<htab_size; i++) {
+		if (htab_table[i].used) {
+			safe_free(htab_table[i].str);
+		}
+	}
+	usbi_mutex_destroy(&htab_write_mutex);
+	safe_free(htab_table);
+}
+
+/* This is the search function. It uses double hashing with open addressing.
+   We use an trick to speed up the lookup. The table is created with one
+   more element available. This enables us to use the index zero special.
+   This index will never be used because we store the first hash index in
+   the field used where zero means not used. Every other value means used.
+   The used field can be used as a first fast comparison for equality of
+   the stored and the parameter value. This helps to prevent unnecessary
+   expensive calls of strcmp.  */
+static unsigned long htab_hash(char* str)
+{
+	unsigned long hval, hval2;
+	unsigned long idx;
+	unsigned long r = 5381;
+	int c;
+	char* sz = str;
+
+	if (str == NULL)
+		return 0;
+
+	// Compute main hash value (algorithm suggested by Nokia)
+	while ((c = *sz++) != 0)
+		r = ((r << 5) + r) + c;
+	if (r == 0)
+		++r;
+
+	// compute table hash: simply take the modulus
+	hval = r % htab_size;
+	if (hval == 0)
+		++hval;
+
+	// Try the first index
+	idx = hval;
+
+	if (htab_table[idx].used) {
+		if ( (htab_table[idx].used == hval)
+		  && (safe_strcmp(str, htab_table[idx].str) == 0) ) {
+			// existing hash
+			return idx;
+		}
+		usbi_dbg("hash collision ('%s' vs '%s')", str, htab_table[idx].str);
+
+		// Second hash function, as suggested in [Knuth]
+		hval2 = 1 + hval % (htab_size - 2);
+
+		do {
+			// Because size is prime this guarantees to step through all available indexes
+			if (idx <= hval2) {
+				idx = htab_size + idx - hval2;
+			} else {
+				idx -= hval2;
+			}
+
+			// If we visited all entries leave the loop unsuccessfully
+			if (idx == hval) {
+				break;
+			}
+
+			// If entry is found use it.
+			if ( (htab_table[idx].used == hval)
+			  && (safe_strcmp(str, htab_table[idx].str) == 0) ) {
+				return idx;
+			}
+		}
+		while (htab_table[idx].used);
+	}
+
+	// Not found => New entry
+
+	// If the table is full return an error
+	if (htab_filled >= htab_size) {
+		usbi_err(NULL, "hash table is full (%d entries)", htab_size);
+		return 0;
+	}
+
+	// Concurrent threads might be storing the same entry at the same time
+	// (eg. "simultaneous" enums from different threads) => use a mutex
+	usbi_mutex_lock(&htab_write_mutex);
+	// Just free any previously allocated string (which should be the same as
+	// new one). The possibility of concurrent threads storing a collision
+	// string (same hash, different string) at the same time is extremely low
+	safe_free(htab_table[idx].str);
+	htab_table[idx].used = hval;
+	htab_table[idx].str = (char*) malloc(safe_strlen(str)+1);
+	if (htab_table[idx].str == NULL) {
+		usbi_err(NULL, "could not duplicate string for hash table");
+		usbi_mutex_unlock(&htab_write_mutex);
+		return 0;
+	}
+	memcpy(htab_table[idx].str, str, safe_strlen(str)+1);
+	++htab_filled;
+	usbi_mutex_unlock(&htab_write_mutex);
+
+	return idx;
+}
+
+/*
+ * Returns the session ID of a device's nth level ancestor
+ * If there's no device at the nth level, return 0
+ */
+static unsigned long get_ancestor_session_id(DWORD devinst, unsigned level)
+{
+	DWORD parent_devinst;
+	unsigned long session_id = 0;
+	char* sanitized_path = NULL;
+	char path[MAX_PATH_LENGTH];
+	unsigned i;
+
+	if (level < 1) return 0;
+	for (i = 0; i<level; i++) {
+		if (CM_Get_Parent(&parent_devinst, devinst, 0) != CR_SUCCESS) {
+			return 0;
+		}
+		devinst = parent_devinst;
+	}
+	if (CM_Get_Device_IDA(devinst, path, MAX_PATH_LENGTH, 0) != CR_SUCCESS) {
+		return 0;
+	}
+	// TODO: (post hotplug): try without sanitizing
+	sanitized_path = sanitize_path(path);
+	if (sanitized_path == NULL) {
+		return 0;
+	}
+	session_id = htab_hash(sanitized_path);
+	safe_free(sanitized_path);
+	return session_id;
+}
+
+/*
+ * Populate the endpoints addresses of the device_priv interface helper structs
+ */
+static int windows_assign_endpoints(struct libusb_device_handle *dev_handle, int iface, int altsetting)
+{
+	int i, r;
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct libusb_config_descriptor *conf_desc;
+	const struct libusb_interface_descriptor *if_desc;
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+
+	r = libusb_get_config_descriptor(dev_handle->dev, 0, &conf_desc);
+	if (r != LIBUSB_SUCCESS) {
+		usbi_warn(ctx, "could not read config descriptor: error %d", r);
+		return r;
+	}
+
+	if_desc = &conf_desc->interface[iface].altsetting[altsetting];
+	safe_free(priv->usb_interface[iface].endpoint);
+
+	if (if_desc->bNumEndpoints == 0) {
+		usbi_dbg("no endpoints found for interface %d", iface);
+		return LIBUSB_SUCCESS;
+	}
+
+	priv->usb_interface[iface].endpoint = (uint8_t*) malloc(if_desc->bNumEndpoints);
+	if (priv->usb_interface[iface].endpoint == NULL) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	priv->usb_interface[iface].nb_endpoints = if_desc->bNumEndpoints;
+	for (i=0; i<if_desc->bNumEndpoints; i++) {
+		priv->usb_interface[iface].endpoint[i] = if_desc->endpoint[i].bEndpointAddress;
+		usbi_dbg("(re)assigned endpoint %02X to interface %d", priv->usb_interface[iface].endpoint[i], iface);
+	}
+	libusb_free_config_descriptor(conf_desc);
+
+	// Extra init may be required to configure endpoints
+	return priv->apib->configure_endpoints(SUB_API_NOTSET, dev_handle, iface);
+}
+
+// Lookup for a match in the list of API driver names
+// return -1 if not found, driver match number otherwise
+static int get_sub_api(char* driver, int api){
+	int i;
+	const char sep_str[2] = {LIST_SEPARATOR, 0};
+	char *tok, *tmp_str;
+	size_t len = safe_strlen(driver);
+
+	if (len == 0) return SUB_API_NOTSET;
+	tmp_str = (char*) calloc(len+1, 1);
+	if (tmp_str == NULL) return SUB_API_NOTSET;
+	memcpy(tmp_str, driver, len+1);
+	tok = strtok(tmp_str, sep_str);
+	while (tok != NULL) {
+		for (i=0; i<usb_api_backend[api].nb_driver_names; i++) {
+			if (safe_stricmp(tok, usb_api_backend[api].driver_name_list[i]) == 0) {
+				free(tmp_str);
+				return i;
+			}
+		}
+		tok = strtok(NULL, sep_str);
+	}
+	free (tmp_str);
+	return SUB_API_NOTSET;
+}
+
+/*
+ * auto-claiming and auto-release helper functions
+ */
+static int auto_claim(struct libusb_transfer *transfer, int *interface_number, int api_type)
+{
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(
+		transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int current_interface = *interface_number;
+	int r = LIBUSB_SUCCESS;
+
+	switch(api_type) {
+	case USB_API_WINUSBX:
+	case USB_API_HID:
+		break;
+	default:
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	usbi_mutex_lock(&autoclaim_lock);
+	if (current_interface < 0)	// No serviceable interface was found
+	{
+		for (current_interface=0; current_interface<USB_MAXINTERFACES; current_interface++) {
+			// Must claim an interface of the same API type
+			if ( (priv->usb_interface[current_interface].apib->id == api_type)
+			  && (libusb_claim_interface(transfer->dev_handle, current_interface) == LIBUSB_SUCCESS) ) {
+				usbi_dbg("auto-claimed interface %d for control request", current_interface);
+				if (handle_priv->autoclaim_count[current_interface] != 0) {
+					usbi_warn(ctx, "program assertion failed - autoclaim_count was nonzero");
+				}
+				handle_priv->autoclaim_count[current_interface]++;
+				break;
+			}
+		}
+		if (current_interface == USB_MAXINTERFACES) {
+			usbi_err(ctx, "could not auto-claim any interface");
+			r = LIBUSB_ERROR_NOT_FOUND;
+		}
+	} else {
+		// If we have a valid interface that was autoclaimed, we must increment
+		// its autoclaim count so that we can prevent an early release.
+		if (handle_priv->autoclaim_count[current_interface] != 0) {
+			handle_priv->autoclaim_count[current_interface]++;
+		}
+	}
+	usbi_mutex_unlock(&autoclaim_lock);
+
+	*interface_number = current_interface;
+	return r;
+
+}
+
+static void auto_release(struct usbi_transfer *itransfer)
+{
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	libusb_device_handle *dev_handle = transfer->dev_handle;
+	struct windows_device_handle_priv* handle_priv = _device_handle_priv(dev_handle);
+	int r;
+
+	usbi_mutex_lock(&autoclaim_lock);
+	if (handle_priv->autoclaim_count[transfer_priv->interface_number] > 0) {
+		handle_priv->autoclaim_count[transfer_priv->interface_number]--;
+		if (handle_priv->autoclaim_count[transfer_priv->interface_number] == 0) {
+			r = libusb_release_interface(dev_handle, transfer_priv->interface_number);
+			if (r == LIBUSB_SUCCESS) {
+				usbi_dbg("auto-released interface %d", transfer_priv->interface_number);
+			} else {
+				usbi_dbg("failed to auto-release interface %d (%s)",
+					transfer_priv->interface_number, libusb_error_name((enum libusb_error)r));
+			}
+		}
+	}
+	usbi_mutex_unlock(&autoclaim_lock);
+}
+
+/* Windows version dtection */
+static BOOL is_x64(void)
+{
+	BOOL ret = FALSE;
+	// Detect if we're running a 32 or 64 bit system
+	if (sizeof(uintptr_t) < 8) {
+		DLL_LOAD_PREFIXED(Kernel32.dll, p, IsWow64Process, FALSE);
+		if (pIsWow64Process != NULL) {
+			(*pIsWow64Process)(GetCurrentProcess(), &ret);
+		}
+	} else {
+		ret = TRUE;
+	}
+	return ret;
+}
+
+static void get_windows_version(void)
+{
+	OSVERSIONINFOEXA vi, vi2;
+	const char* w = 0;
+	const char* w64 = "32 bit";
+	char* vptr;
+	size_t vlen;
+	unsigned major, minor;
+	ULONGLONG major_equal, minor_equal;
+	BOOL ws;
+
+	memset(&vi, 0, sizeof(vi));
+	vi.dwOSVersionInfoSize = sizeof(vi);
+	if (!GetVersionExA((OSVERSIONINFOA *)&vi)) {
+		memset(&vi, 0, sizeof(vi));
+		vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
+		if (!GetVersionExA((OSVERSIONINFOA *)&vi))
+			return;
+	}
+
+	if (vi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+
+		if (vi.dwMajorVersion > 6 || (vi.dwMajorVersion == 6 && vi.dwMinorVersion >= 2)) {
+			// Starting with Windows 8.1 Preview, GetVersionEx() does no longer report the actual OS version
+			// See: http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx
+
+			major_equal = VerSetConditionMask(0, VER_MAJORVERSION, VER_EQUAL);
+			for (major = vi.dwMajorVersion; major <= 9; major++) {
+				memset(&vi2, 0, sizeof(vi2));
+				vi2.dwOSVersionInfoSize = sizeof(vi2); vi2.dwMajorVersion = major;
+				if (!VerifyVersionInfoA(&vi2, VER_MAJORVERSION, major_equal))
+					continue;
+				if (vi.dwMajorVersion < major) {
+					vi.dwMajorVersion = major; vi.dwMinorVersion = 0;
+				}
+
+				minor_equal = VerSetConditionMask(0, VER_MINORVERSION, VER_EQUAL);
+				for (minor = vi.dwMinorVersion; minor <= 9; minor++) {
+					memset(&vi2, 0, sizeof(vi2)); vi2.dwOSVersionInfoSize = sizeof(vi2);
+					vi2.dwMinorVersion = minor;
+					if (!VerifyVersionInfoA(&vi2, VER_MINORVERSION, minor_equal))
+						continue;
+					vi.dwMinorVersion = minor;
+					break;
+				}
+
+				break;
+			}
+		}
+
+		if (vi.dwMajorVersion <= 0xf && vi.dwMinorVersion <= 0xf) {
+			ws = (vi.wProductType <= VER_NT_WORKSTATION);
+			windows_version = vi.dwMajorVersion << 4 | vi.dwMinorVersion;
+			switch (windows_version) {
+			case 0x50: w = "2000";
+				break;
+			case 0x51: w = "XP";
+				break;
+			case 0x52: w = ("2003");
+				break;
+			case 0x60: w = (ws?"Vista":"2008");
+				break;
+			case 0x61: w = (ws?"7":"2008_R2");
+				break;
+			case 0x62: w = (ws?"8":"2012");
+				break;
+			case 0x63: w = (ws?"8.1":"2012_R2");
+				break;
+			case 0x64: w = (ws?"8.2":"2012_R3");
+				break;
+			default:
+				if (windows_version < 0x50)
+					windows_version = WINDOWS_UNSUPPORTED;
+				else
+					w = "9 or later";
+				break;
+			}
+		}
+	}
+
+	if (is_x64())
+		w64 = "64-bit";
+
+	vptr = &windows_version_str[sizeof("Windows ") - 1];
+	vlen = sizeof(windows_version_str) - sizeof("Windows ") - 1;
+	if (!w)
+		safe_sprintf(vptr, vlen, "%s %u.%u %s", (vi.dwPlatformId==VER_PLATFORM_WIN32_NT?"NT":"??"),
+			(unsigned)vi.dwMajorVersion, (unsigned)vi.dwMinorVersion, w64);
+	else if (vi.wServicePackMinor)
+		safe_sprintf(vptr, vlen, "%s SP%u.%u %s", w, vi.wServicePackMajor, vi.wServicePackMinor, w64);
+	else if (vi.wServicePackMajor)
+		safe_sprintf(vptr, vlen, "%s SP%u %s", w, vi.wServicePackMajor, w64);
+	else
+		safe_sprintf(vptr, vlen, "%s %s", w, w64);
+}
+
+/*
+ * init: libusb backend init function
+ *
+ * This function enumerates the HCDs (Host Controller Drivers) and populates our private HCD list
+ * In our implementation, we equate Windows' "HCD" to libusb's "bus". Note that bus is zero indexed.
+ * HCDs are not expected to change after init (might not hold true for hot pluggable USB PCI card?)
+ */
+static int windows_init(struct libusb_context *ctx)
+{
+	int i, r = LIBUSB_ERROR_OTHER;
+	HANDLE semaphore;
+	char sem_name[11+1+8]; // strlen(libusb_init)+'\0'+(32-bit hex PID)
+
+	sprintf(sem_name, "libusb_init%08X", (unsigned int)GetCurrentProcessId()&0xFFFFFFFF);
+	semaphore = CreateSemaphoreA(NULL, 1, 1, sem_name);
+	if (semaphore == NULL) {
+		usbi_err(ctx, "could not create semaphore: %s", windows_error_str(0));
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// A successful wait brings our semaphore count to 0 (unsignaled)
+	// => any concurent wait stalls until the semaphore's release
+	if (WaitForSingleObject(semaphore, INFINITE) != WAIT_OBJECT_0) {
+		usbi_err(ctx, "failure to access semaphore: %s", windows_error_str(0));
+		CloseHandle(semaphore);
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// NB: concurrent usage supposes that init calls are equally balanced with
+	// exit calls. If init is called more than exit, we will not exit properly
+	if ( ++concurrent_usage == 0 ) {	// First init?
+		get_windows_version();
+		usbi_dbg(windows_version_str);
+		if (windows_version == WINDOWS_UNSUPPORTED) {
+			usbi_err(ctx, "This version of Windows is NOT supported");
+			r = LIBUSB_ERROR_NOT_SUPPORTED;
+			goto init_exit;
+		}
+
+		// We need a lock for proper auto-release
+		usbi_mutex_init(&autoclaim_lock, NULL);
+
+		// Initialize pollable file descriptors
+		init_polling();
+
+		// Load DLL imports
+		if (init_dlls() != LIBUSB_SUCCESS) {
+			usbi_err(ctx, "could not resolve DLL functions");
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+
+		// Initialize the low level APIs (we don't care about errors at this stage)
+		for (i=0; i<USB_API_MAX; i++) {
+			usb_api_backend[i].init(SUB_API_NOTSET, ctx);
+		}
+
+		// Because QueryPerformanceCounter might report different values when
+		// running on different cores, we create a separate thread for the timer
+		// calls, which we glue to the first core always to prevent timing discrepancies.
+		r = LIBUSB_ERROR_NO_MEM;
+		for (i = 0; i < 2; i++) {
+			timer_request[i] = CreateEvent(NULL, TRUE, FALSE, NULL);
+			if (timer_request[i] == NULL) {
+				usbi_err(ctx, "could not create timer request event %d - aborting", i);
+				goto init_exit;
+			}
+		}
+		timer_response = CreateSemaphore(NULL, 0, MAX_TIMER_SEMAPHORES, NULL);
+		if (timer_response == NULL) {
+			usbi_err(ctx, "could not create timer response semaphore - aborting");
+			goto init_exit;
+		}
+		timer_mutex = CreateMutex(NULL, FALSE, NULL);
+		if (timer_mutex == NULL) {
+			usbi_err(ctx, "could not create timer mutex - aborting");
+			goto init_exit;
+		}
+		timer_thread = (HANDLE)_beginthreadex(NULL, 0, windows_clock_gettime_threaded, NULL, 0, NULL);
+		if (timer_thread == NULL) {
+			usbi_err(ctx, "Unable to create timer thread - aborting");
+			goto init_exit;
+		}
+		SetThreadAffinityMask(timer_thread, 0);
+
+		// Wait for timer thread to init before continuing.
+		if (WaitForSingleObject(timer_response, INFINITE) != WAIT_OBJECT_0) {
+			usbi_err(ctx, "Failed to wait for timer thread to become ready - aborting");
+			goto init_exit;
+		}
+
+		// Create a hash table to store session ids. Second parameter is better if prime
+		htab_create(ctx, HTAB_SIZE);
+	}
+	// At this stage, either we went through full init successfully, or didn't need to
+	r = LIBUSB_SUCCESS;
+
+init_exit: // Holds semaphore here.
+	if (!concurrent_usage && r != LIBUSB_SUCCESS) { // First init failed?
+		if (timer_thread) {
+			SetEvent(timer_request[1]); // actually the signal to quit the thread.
+			if (WAIT_OBJECT_0 != WaitForSingleObject(timer_thread, INFINITE)) {
+				usbi_warn(ctx, "could not wait for timer thread to quit");
+				TerminateThread(timer_thread, 1); // shouldn't happen, but we're destroying
+												  // all objects it might have held anyway.
+			}
+			CloseHandle(timer_thread);
+			timer_thread = NULL;
+		}
+		for (i = 0; i < 2; i++) {
+			if (timer_request[i]) {
+				CloseHandle(timer_request[i]);
+				timer_request[i] = NULL;
+			}
+		}
+		if (timer_response) {
+			CloseHandle(timer_response);
+			timer_response = NULL;
+		}
+		if (timer_mutex) {
+			CloseHandle(timer_mutex);
+			timer_mutex = NULL;
+		}
+		htab_destroy();
+	}
+
+	if (r != LIBUSB_SUCCESS)
+		--concurrent_usage; // Not expected to call libusb_exit if we failed.
+
+	ReleaseSemaphore(semaphore, 1, NULL);	// increase count back to 1
+	CloseHandle(semaphore);
+	return r;
+}
+
+/*
+ * HCD (root) hubs need to have their device descriptor manually populated
+ *
+ * Note that, like Microsoft does in the device manager, we populate the
+ * Vendor and Device ID for HCD hubs with the ones from the PCI HCD device.
+ */
+static int force_hcd_device_descriptor(struct libusb_device *dev)
+{
+	struct windows_device_priv *parent_priv, *priv = _device_priv(dev);
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	int vid, pid;
+
+	dev->num_configurations = 1;
+	priv->dev_descriptor.bLength = sizeof(USB_DEVICE_DESCRIPTOR);
+	priv->dev_descriptor.bDescriptorType = USB_DEVICE_DESCRIPTOR_TYPE;
+	priv->dev_descriptor.bNumConfigurations = 1;
+	priv->active_config = 1;
+
+	if (priv->parent_dev == NULL) {
+		usbi_err(ctx, "program assertion failed - HCD hub has no parent");
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+	parent_priv = _device_priv(priv->parent_dev);
+	if (sscanf(parent_priv->path, "\\\\.\\PCI#VEN_%04x&DEV_%04x%*s", &vid, &pid) == 2) {
+		priv->dev_descriptor.idVendor = (uint16_t)vid;
+		priv->dev_descriptor.idProduct = (uint16_t)pid;
+	} else {
+		usbi_warn(ctx, "could not infer VID/PID of HCD hub from '%s'", parent_priv->path);
+		priv->dev_descriptor.idVendor = 0x1d6b;		// Linux Foundation root hub
+		priv->dev_descriptor.idProduct = 1;
+	}
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * fetch and cache all the config descriptors through I/O
+ */
+static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle, char* device_id)
+{
+	DWORD size, ret_size;
+	struct libusb_context *ctx = DEVICE_CTX(dev);
+	struct windows_device_priv *priv = _device_priv(dev);
+	int r;
+	uint8_t i;
+
+	USB_CONFIGURATION_DESCRIPTOR_SHORT cd_buf_short;    // dummy request
+	PUSB_DESCRIPTOR_REQUEST cd_buf_actual = NULL;       // actual request
+	PUSB_CONFIGURATION_DESCRIPTOR cd_data = NULL;
+
+	if (dev->num_configurations == 0)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	priv->config_descriptor = (unsigned char**) calloc(dev->num_configurations, sizeof(unsigned char*));
+	if (priv->config_descriptor == NULL)
+		return LIBUSB_ERROR_NO_MEM;
+	for (i=0; i<dev->num_configurations; i++)
+		priv->config_descriptor[i] = NULL;
+
+	for (i=0, r=LIBUSB_SUCCESS; ; i++)
+	{
+		// safe loop: release all dynamic resources
+		safe_free(cd_buf_actual);
+
+		// safe loop: end of loop condition
+		if ((i >= dev->num_configurations) || (r != LIBUSB_SUCCESS))
+			break;
+
+		size = sizeof(USB_CONFIGURATION_DESCRIPTOR_SHORT);
+		memset(&cd_buf_short, 0, size);
+
+		cd_buf_short.req.ConnectionIndex = (ULONG)priv->port;
+		cd_buf_short.req.SetupPacket.bmRequest = LIBUSB_ENDPOINT_IN;
+		cd_buf_short.req.SetupPacket.bRequest = USB_REQUEST_GET_DESCRIPTOR;
+		cd_buf_short.req.SetupPacket.wValue = (USB_CONFIGURATION_DESCRIPTOR_TYPE << 8) | i;
+		cd_buf_short.req.SetupPacket.wIndex = i;
+		cd_buf_short.req.SetupPacket.wLength = (USHORT)(size - sizeof(USB_DESCRIPTOR_REQUEST));
+
+		// Dummy call to get the required data size. Initial failures are reported as info rather
+		// than error as they can occur for non-penalizing situations, such as with some hubs.
+		// coverity[tainted_data_argument]
+		if (!DeviceIoControl(hub_handle, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, &cd_buf_short, size,
+			&cd_buf_short, size, &ret_size, NULL)) {
+			usbi_info(ctx, "could not access configuration descriptor (dummy) for '%s': %s", device_id, windows_error_str(0));
+			LOOP_BREAK(LIBUSB_ERROR_IO);
+		}
+
+		if ((ret_size != size) || (cd_buf_short.data.wTotalLength < sizeof(USB_CONFIGURATION_DESCRIPTOR))) {
+			usbi_info(ctx, "unexpected configuration descriptor size (dummy) for '%s'.", device_id);
+			LOOP_BREAK(LIBUSB_ERROR_IO);
+		}
+
+		size = sizeof(USB_DESCRIPTOR_REQUEST) + cd_buf_short.data.wTotalLength;
+		if ((cd_buf_actual = (PUSB_DESCRIPTOR_REQUEST) calloc(1, size)) == NULL) {
+			usbi_err(ctx, "could not allocate configuration descriptor buffer for '%s'.", device_id);
+			LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+		}
+		memset(cd_buf_actual, 0, size);
+
+		// Actual call
+		cd_buf_actual->ConnectionIndex = (ULONG)priv->port;
+		cd_buf_actual->SetupPacket.bmRequest = LIBUSB_ENDPOINT_IN;
+		cd_buf_actual->SetupPacket.bRequest = USB_REQUEST_GET_DESCRIPTOR;
+		cd_buf_actual->SetupPacket.wValue = (USB_CONFIGURATION_DESCRIPTOR_TYPE << 8) | i;
+		cd_buf_actual->SetupPacket.wIndex = i;
+		cd_buf_actual->SetupPacket.wLength = (USHORT)(size - sizeof(USB_DESCRIPTOR_REQUEST));
+
+		if (!DeviceIoControl(hub_handle, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, cd_buf_actual, size,
+			cd_buf_actual, size, &ret_size, NULL)) {
+			usbi_err(ctx, "could not access configuration descriptor (actual) for '%s': %s", device_id, windows_error_str(0));
+			LOOP_BREAK(LIBUSB_ERROR_IO);
+		}
+
+		cd_data = (PUSB_CONFIGURATION_DESCRIPTOR)((UCHAR*)cd_buf_actual+sizeof(USB_DESCRIPTOR_REQUEST));
+
+		if ((size != ret_size) || (cd_data->wTotalLength != cd_buf_short.data.wTotalLength)) {
+			usbi_err(ctx, "unexpected configuration descriptor size (actual) for '%s'.", device_id);
+			LOOP_BREAK(LIBUSB_ERROR_IO);
+		}
+
+		if (cd_data->bDescriptorType != USB_CONFIGURATION_DESCRIPTOR_TYPE) {
+			usbi_err(ctx, "not a configuration descriptor for '%s'", device_id);
+			LOOP_BREAK(LIBUSB_ERROR_IO);
+		}
+
+		usbi_dbg("cached config descriptor %d (bConfigurationValue=%d, %d bytes)",
+			i, cd_data->bConfigurationValue, cd_data->wTotalLength);
+
+		// Cache the descriptor
+		priv->config_descriptor[i] = (unsigned char*) malloc(cd_data->wTotalLength);
+		if (priv->config_descriptor[i] == NULL)
+			LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+		memcpy(priv->config_descriptor[i], cd_data, cd_data->wTotalLength);
+	}
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * Populate a libusb device structure
+ */
+static int init_device(struct libusb_device* dev, struct libusb_device* parent_dev,
+					   uint8_t port_number, char* device_id, DWORD devinst)
+{
+	HANDLE handle;
+	DWORD size;
+	USB_NODE_CONNECTION_INFORMATION_EX conn_info;
+	USB_NODE_CONNECTION_INFORMATION_EX_V2 conn_info_v2;
+	struct windows_device_priv *priv, *parent_priv;
+	struct libusb_context *ctx;
+	struct libusb_device* tmp_dev;
+	unsigned i;
+
+	if ((dev == NULL) || (parent_dev == NULL)) {
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+	ctx = DEVICE_CTX(dev);
+	priv = _device_priv(dev);
+	parent_priv = _device_priv(parent_dev);
+	if (parent_priv->apib->id != USB_API_HUB) {
+		usbi_warn(ctx, "parent for device '%s' is not a hub", device_id);
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	// It is possible for the parent hub not to have been initialized yet
+	// If that's the case, lookup the ancestors to set the bus number
+	if (parent_dev->bus_number == 0) {
+		for (i=2; ; i++) {
+			tmp_dev = usbi_get_device_by_session_id(ctx, get_ancestor_session_id(devinst, i));
+			if (tmp_dev == NULL) break;
+			if (tmp_dev->bus_number != 0) {
+				usbi_dbg("got bus number from ancestor #%d", i);
+				parent_dev->bus_number = tmp_dev->bus_number;
+				libusb_unref_device(tmp_dev);
+				break;
+			}
+			libusb_unref_device(tmp_dev);
+		}
+	}
+	if (parent_dev->bus_number == 0) {
+		usbi_err(ctx, "program assertion failed: unable to find ancestor bus number for '%s'", device_id);
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+	dev->bus_number = parent_dev->bus_number;
+	priv->port = port_number;
+	dev->port_number = port_number;
+	priv->depth = parent_priv->depth + 1;
+	priv->parent_dev = parent_dev;
+	dev->parent_dev = parent_dev;
+
+	// If the device address is already set, we can stop here
+	if (dev->device_address != 0) {
+		return LIBUSB_SUCCESS;
+	}
+	memset(&conn_info, 0, sizeof(conn_info));
+	if (priv->depth != 0) {	// Not a HCD hub
+		handle = CreateFileA(parent_priv->path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+			FILE_FLAG_OVERLAPPED, NULL);
+		if (handle == INVALID_HANDLE_VALUE) {
+			usbi_warn(ctx, "could not open hub %s: %s", parent_priv->path, windows_error_str(0));
+			return LIBUSB_ERROR_ACCESS;
+		}
+		size = sizeof(conn_info);
+		conn_info.ConnectionIndex = (ULONG)port_number;
+		// coverity[tainted_data_argument]
+		if (!DeviceIoControl(handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, &conn_info, size,
+			&conn_info, size, &size, NULL)) {
+			usbi_warn(ctx, "could not get node connection information for device '%s': %s",
+				device_id, windows_error_str(0));
+			safe_closehandle(handle);
+			return LIBUSB_ERROR_NO_DEVICE;
+		}
+		if (conn_info.ConnectionStatus == NoDeviceConnected) {
+			usbi_err(ctx, "device '%s' is no longer connected!", device_id);
+			safe_closehandle(handle);
+			return LIBUSB_ERROR_NO_DEVICE;
+		}
+		memcpy(&priv->dev_descriptor, &(conn_info.DeviceDescriptor), sizeof(USB_DEVICE_DESCRIPTOR));
+		dev->num_configurations = priv->dev_descriptor.bNumConfigurations;
+		priv->active_config = conn_info.CurrentConfigurationValue;
+		usbi_dbg("found %d configurations (active conf: %d)", dev->num_configurations, priv->active_config);
+		// If we can't read the config descriptors, just set the number of confs to zero
+		if (cache_config_descriptors(dev, handle, device_id) != LIBUSB_SUCCESS) {
+			dev->num_configurations = 0;
+			priv->dev_descriptor.bNumConfigurations = 0;
+		}
+
+		// In their great wisdom, Microsoft decided to BREAK the USB speed report between Windows 7 and Windows 8
+		if (windows_version >= WINDOWS_8) {
+			memset(&conn_info_v2, 0, sizeof(conn_info_v2));
+			size = sizeof(conn_info_v2);
+			conn_info_v2.ConnectionIndex = (ULONG)port_number;
+			conn_info_v2.Length = size;
+			conn_info_v2.SupportedUsbProtocols.Usb300 = 1;
+			if (!DeviceIoControl(handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2,
+				&conn_info_v2, size, &conn_info_v2, size, &size, NULL)) {
+				usbi_warn(ctx, "could not get node connection information (V2) for device '%s': %s",
+					device_id,  windows_error_str(0));
+			} else if (conn_info_v2.Flags.DeviceIsOperatingAtSuperSpeedOrHigher) {
+				conn_info.Speed = 3;
+			}
+		}
+
+		safe_closehandle(handle);
+
+		if (conn_info.DeviceAddress > UINT8_MAX) {
+			usbi_err(ctx, "program assertion failed: device address overflow");
+		}
+		dev->device_address = (uint8_t)conn_info.DeviceAddress + 1;
+		if (dev->device_address == 1) {
+			usbi_err(ctx, "program assertion failed: device address collision with root hub");
+		}
+		switch (conn_info.Speed) {
+		case 0: dev->speed = LIBUSB_SPEED_LOW; break;
+		case 1: dev->speed = LIBUSB_SPEED_FULL; break;
+		case 2: dev->speed = LIBUSB_SPEED_HIGH; break;
+		case 3: dev->speed = LIBUSB_SPEED_SUPER; break;
+		default:
+			usbi_warn(ctx, "Got unknown device speed %d", conn_info.Speed);
+			break;
+		}
+	} else {
+		dev->device_address = 1;	// root hubs are set to use device number 1
+		force_hcd_device_descriptor(dev);
+	}
+
+	usbi_sanitize_device(dev);
+
+	usbi_dbg("(bus: %d, addr: %d, depth: %d, port: %d): '%s'",
+		dev->bus_number, dev->device_address, priv->depth, priv->port, device_id);
+
+	return LIBUSB_SUCCESS;
+}
+
+// Returns the api type, or 0 if not found/unsupported
+static void get_api_type(struct libusb_context *ctx, HDEVINFO *dev_info,
+	SP_DEVINFO_DATA *dev_info_data, int *api, int *sub_api)
+{
+	// Precedence for filter drivers vs driver is in the order of this array
+	struct driver_lookup lookup[3] = {
+		{"\0\0", SPDRP_SERVICE, "driver"},
+		{"\0\0", SPDRP_UPPERFILTERS, "upper filter driver"},
+		{"\0\0", SPDRP_LOWERFILTERS, "lower filter driver"}
+	};
+	DWORD size, reg_type;
+	unsigned k, l;
+	int i, j;
+
+	*api = USB_API_UNSUPPORTED;
+	*sub_api = SUB_API_NOTSET;
+	// Check the service & filter names to know the API we should use
+	for (k=0; k<3; k++) {
+		if (pSetupDiGetDeviceRegistryPropertyA(*dev_info, dev_info_data, lookup[k].reg_prop,
+			&reg_type, (BYTE*)lookup[k].list, MAX_KEY_LENGTH, &size)) {
+			// Turn the REG_SZ SPDRP_SERVICE into REG_MULTI_SZ
+			if (lookup[k].reg_prop == SPDRP_SERVICE) {
+				// our buffers are MAX_KEY_LENGTH+1 so we can overflow if needed
+				lookup[k].list[safe_strlen(lookup[k].list)+1] = 0;
+			}
+			// MULTI_SZ is a pain to work with. Turn it into something much more manageable
+			// NB: none of the driver names we check against contain LIST_SEPARATOR,
+			// (currently ';'), so even if an unsuported one does, it's not an issue
+			for (l=0; (lookup[k].list[l] != 0) || (lookup[k].list[l+1] != 0); l++) {
+				if (lookup[k].list[l] == 0) {
+					lookup[k].list[l] = LIST_SEPARATOR;
+				}
+			}
+			usbi_dbg("%s(s): %s", lookup[k].designation, lookup[k].list);
+		} else {
+			if (GetLastError() != ERROR_INVALID_DATA) {
+				usbi_dbg("could not access %s: %s", lookup[k].designation, windows_error_str(0));
+			}
+			lookup[k].list[0] = 0;
+		}
+	}
+
+	for (i=1; i<USB_API_MAX; i++) {
+		for (k=0; k<3; k++) {
+			j = get_sub_api(lookup[k].list, i);
+			if (j >= 0) {
+				usbi_dbg("matched %s name against %s",
+					lookup[k].designation, (i!=USB_API_WINUSBX)?usb_api_backend[i].designation:sub_api_name[j]);
+				*api = i;
+				*sub_api = j;
+				return;
+			}
+		}
+	}
+}
+
+static int set_composite_interface(struct libusb_context* ctx, struct libusb_device* dev,
+							char* dev_interface_path, char* device_id, int api, int sub_api)
+{
+	unsigned i;
+	struct windows_device_priv *priv = _device_priv(dev);
+	int interface_number;
+
+	if (priv->apib->id != USB_API_COMPOSITE) {
+		usbi_err(ctx, "program assertion failed: '%s' is not composite", device_id);
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	// Because MI_## are not necessarily in sequential order (some composite
+	// devices will have only MI_00 & MI_03 for instance), we retrieve the actual
+	// interface number from the path's MI value
+	interface_number = 0;
+	for (i=0; device_id[i] != 0; ) {
+		if ( (device_id[i++] == 'M') && (device_id[i++] == 'I')
+		  && (device_id[i++] == '_') ) {
+			interface_number = (device_id[i++] - '0')*10;
+			interface_number += device_id[i] - '0';
+			break;
+		}
+	}
+
+	if (device_id[i] == 0) {
+		usbi_warn(ctx, "failure to read interface number for %s. Using default value %d",
+			device_id, interface_number);
+	}
+
+	if (priv->usb_interface[interface_number].path != NULL) {
+		if (api == USB_API_HID) {
+			// HID devices can have multiple collections (COL##) for each MI_## interface
+			usbi_dbg("interface[%d] already set - ignoring HID collection: %s",
+				interface_number, device_id);
+			return LIBUSB_ERROR_ACCESS;
+		}
+		// In other cases, just use the latest data
+		safe_free(priv->usb_interface[interface_number].path);
+	}
+
+	usbi_dbg("interface[%d] = %s", interface_number, dev_interface_path);
+	priv->usb_interface[interface_number].path = dev_interface_path;
+	priv->usb_interface[interface_number].apib = &usb_api_backend[api];
+	priv->usb_interface[interface_number].sub_api = sub_api;
+	if ((api == USB_API_HID) && (priv->hid == NULL)) {
+		priv->hid = (struct hid_device_priv*) calloc(1, sizeof(struct hid_device_priv));
+		if (priv->hid == NULL)
+			return LIBUSB_ERROR_NO_MEM;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static int set_hid_interface(struct libusb_context* ctx, struct libusb_device* dev,
+							char* dev_interface_path)
+{
+	int i;
+	struct windows_device_priv *priv = _device_priv(dev);
+
+	if (priv->hid == NULL) {
+		usbi_err(ctx, "program assertion failed: parent is not HID");
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+	if (priv->hid->nb_interfaces == USB_MAXINTERFACES) {
+		usbi_err(ctx, "program assertion failed: max USB interfaces reached for HID device");
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+	for (i=0; i<priv->hid->nb_interfaces; i++) {
+		if (safe_strcmp(priv->usb_interface[i].path, dev_interface_path) == 0) {
+			usbi_dbg("interface[%d] already set to %s", i, dev_interface_path);
+			return LIBUSB_SUCCESS;
+		}
+	}
+
+	priv->usb_interface[priv->hid->nb_interfaces].path = dev_interface_path;
+	priv->usb_interface[priv->hid->nb_interfaces].apib = &usb_api_backend[USB_API_HID];
+	usbi_dbg("interface[%d] = %s", priv->hid->nb_interfaces, dev_interface_path);
+	priv->hid->nb_interfaces++;
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * get_device_list: libusb backend device enumeration function
+ */
+static int windows_get_device_list(struct libusb_context *ctx, struct discovered_devs **_discdevs)
+{
+	struct discovered_devs *discdevs;
+	HDEVINFO dev_info = { 0 };
+	const char* usb_class[] = {"USB", "NUSB3", "IUSB3"};
+	SP_DEVINFO_DATA dev_info_data = { 0 };
+	SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL;
+	GUID hid_guid;
+#define MAX_ENUM_GUIDS 64
+	const GUID* guid[MAX_ENUM_GUIDS];
+#define HCD_PASS 0
+#define HUB_PASS 1
+#define GEN_PASS 2
+#define DEV_PASS 3
+#define HID_PASS 4
+	int r = LIBUSB_SUCCESS;
+	int api, sub_api;
+	size_t class_index = 0;
+	unsigned int nb_guids, pass, i, j, ancestor;
+	char path[MAX_PATH_LENGTH];
+	char strbuf[MAX_PATH_LENGTH];
+	struct libusb_device *dev, *parent_dev;
+	struct windows_device_priv *priv, *parent_priv;
+	char* dev_interface_path = NULL;
+	char* dev_id_path = NULL;
+	unsigned long session_id;
+	DWORD size, reg_type, port_nr, install_state;
+	HKEY key;
+	WCHAR guid_string_w[MAX_GUID_STRING_LENGTH];
+	GUID* if_guid;
+	LONG s;
+	// Keep a list of newly allocated devs to unref
+	libusb_device** unref_list;
+	unsigned int unref_size = 64;
+	unsigned int unref_cur = 0;
+
+	// PASS 1 : (re)enumerate HCDs (allows for HCD hotplug)
+	// PASS 2 : (re)enumerate HUBS
+	// PASS 3 : (re)enumerate generic USB devices (including driverless)
+	//           and list additional USB device interface GUIDs to explore
+	// PASS 4 : (re)enumerate master USB devices that have a device interface
+	// PASS 5+: (re)enumerate device interfaced GUIDs (including HID) and
+	//           set the device interfaces.
+
+	// Init the GUID table
+	guid[HCD_PASS] = &GUID_DEVINTERFACE_USB_HOST_CONTROLLER;
+	guid[HUB_PASS] = &GUID_DEVINTERFACE_USB_HUB;
+	guid[GEN_PASS] = NULL;
+	guid[DEV_PASS] = &GUID_DEVINTERFACE_USB_DEVICE;
+	HidD_GetHidGuid(&hid_guid);
+	guid[HID_PASS] = &hid_guid;
+	nb_guids = HID_PASS+1;
+
+	unref_list = (libusb_device**) calloc(unref_size, sizeof(libusb_device*));
+	if (unref_list == NULL) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	for (pass = 0; ((pass < nb_guids) && (r == LIBUSB_SUCCESS)); pass++) {
+//#define ENUM_DEBUG
+#ifdef ENUM_DEBUG
+		const char *passname[] = { "HCD", "HUB", "GEN", "DEV", "HID", "EXT" };
+		usbi_dbg("\n#### PROCESSING %ss %s", passname[(pass<=HID_PASS)?pass:HID_PASS+1],
+			(pass!=GEN_PASS)?guid_to_string(guid[pass]):"");
+#endif
+		for (i = 0; ; i++) {
+			// safe loop: free up any (unprotected) dynamic resource
+			// NB: this is always executed before breaking the loop
+			safe_free(dev_interface_details);
+			safe_free(dev_interface_path);
+			safe_free(dev_id_path);
+			priv = parent_priv = NULL;
+			dev = parent_dev = NULL;
+
+			// Safe loop: end of loop conditions
+			if (r != LIBUSB_SUCCESS) {
+				break;
+			}
+			if ((pass == HCD_PASS) && (i == UINT8_MAX)) {
+				usbi_warn(ctx, "program assertion failed - found more than %d buses, skipping the rest.", UINT8_MAX);
+				break;
+			}
+			if (pass != GEN_PASS) {
+				// Except for GEN, all passes deal with device interfaces
+				dev_interface_details = get_interface_details(ctx, &dev_info, &dev_info_data, guid[pass], i);
+				if (dev_interface_details == NULL) {
+					break;
+				} else {
+					dev_interface_path = sanitize_path(dev_interface_details->DevicePath);
+					if (dev_interface_path == NULL) {
+						usbi_warn(ctx, "could not sanitize device interface path for '%s'", dev_interface_details->DevicePath);
+						continue;
+					}
+				}
+			} else {
+				// Workaround for a Nec/Renesas USB 3.0 driver bug where root hubs are
+				// being listed under the "NUSB3" PnP Symbolic Name rather than "USB".
+				// The Intel USB 3.0 driver behaves similar, but uses "IUSB3"
+				for (; class_index < ARRAYSIZE(usb_class); class_index++) {
+					if (get_devinfo_data(ctx, &dev_info, &dev_info_data, usb_class[class_index], i))
+						break;
+					i = 0;
+				}
+				if (class_index >= ARRAYSIZE(usb_class))
+					break;
+			}
+
+			// Read the Device ID path. This is what we'll use as UID
+			// Note that if the device is plugged in a different port or hub, the Device ID changes
+			if (CM_Get_Device_IDA(dev_info_data.DevInst, path, sizeof(path), 0) != CR_SUCCESS) {
+				usbi_warn(ctx, "could not read the device id path for devinst %X, skipping",
+					dev_info_data.DevInst);
+				continue;
+			}
+			dev_id_path = sanitize_path(path);
+			if (dev_id_path == NULL) {
+				usbi_warn(ctx, "could not sanitize device id path for devinst %X, skipping",
+					dev_info_data.DevInst);
+				continue;
+			}
+#ifdef ENUM_DEBUG
+			usbi_dbg("PRO: %s", dev_id_path);
+#endif
+
+			// The SPDRP_ADDRESS for USB devices is the device port number on the hub
+			port_nr = 0;
+			if ((pass >= HUB_PASS) && (pass <= GEN_PASS)) {
+				if ( (!pSetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_ADDRESS,
+					&reg_type, (BYTE*)&port_nr, 4, &size))
+				  || (size != 4) ) {
+					usbi_warn(ctx, "could not retrieve port number for device '%s', skipping: %s",
+						dev_id_path, windows_error_str(0));
+					continue;
+				}
+			}
+
+			// Set API to use or get additional data from generic pass
+			api = USB_API_UNSUPPORTED;
+			sub_api = SUB_API_NOTSET;
+			switch (pass) {
+			case HCD_PASS:
+				break;
+			case GEN_PASS:
+				// We use the GEN pass to detect driverless devices...
+				size = sizeof(strbuf);
+				if (!pSetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_DRIVER,
+					&reg_type, (BYTE*)strbuf, size, &size)) {
+						usbi_info(ctx, "The following device has no driver: '%s'", dev_id_path);
+						usbi_info(ctx, "libusb will not be able to access it.");
+				}
+				// ...and to add the additional device interface GUIDs
+				key = pSetupDiOpenDevRegKey(dev_info, &dev_info_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ);
+				if (key != INVALID_HANDLE_VALUE) {
+					size = sizeof(guid_string_w);
+					s = pRegQueryValueExW(key, L"DeviceInterfaceGUIDs", NULL, &reg_type,
+						(BYTE*)guid_string_w, &size);
+					pRegCloseKey(key);
+					if (s == ERROR_SUCCESS) {
+						if (nb_guids >= MAX_ENUM_GUIDS) {
+							// If this assert is ever reported, grow a GUID table dynamically
+							usbi_err(ctx, "program assertion failed: too many GUIDs");
+							LOOP_BREAK(LIBUSB_ERROR_OVERFLOW);
+						}
+						if_guid = (GUID*) calloc(1, sizeof(GUID));
+						pCLSIDFromString(guid_string_w, if_guid);
+						guid[nb_guids++] = if_guid;
+						usbi_dbg("extra GUID: %s", guid_to_string(if_guid));
+					}
+				}
+				break;
+			case HID_PASS:
+				api = USB_API_HID;
+				break;
+			default:
+				// Get the API type (after checking that the driver installation is OK)
+				if ( (!pSetupDiGetDeviceRegistryPropertyA(dev_info, &dev_info_data, SPDRP_INSTALL_STATE,
+					&reg_type, (BYTE*)&install_state, 4, &size))
+				  || (size != 4) ){
+					usbi_warn(ctx, "could not detect installation state of driver for '%s': %s",
+						dev_id_path, windows_error_str(0));
+				} else if (install_state != 0) {
+					usbi_warn(ctx, "driver for device '%s' is reporting an issue (code: %d) - skipping",
+						dev_id_path, install_state);
+					continue;
+				}
+				get_api_type(ctx, &dev_info, &dev_info_data, &api, &sub_api);
+				break;
+			}
+
+			// Find parent device (for the passes that need it)
+			switch (pass) {
+			case HCD_PASS:
+			case DEV_PASS:
+			case HUB_PASS:
+				break;
+			default:
+				// Go through the ancestors until we see a face we recognize
+				parent_dev = NULL;
+				for (ancestor = 1; parent_dev == NULL; ancestor++) {
+					session_id = get_ancestor_session_id(dev_info_data.DevInst, ancestor);
+					if (session_id == 0) {
+						break;
+					}
+					parent_dev = usbi_get_device_by_session_id(ctx, session_id);
+				}
+				if (parent_dev == NULL) {
+					usbi_dbg("unlisted ancestor for '%s' (non USB HID, newly connected, etc.) - ignoring", dev_id_path);
+					continue;
+				}
+				parent_priv = _device_priv(parent_dev);
+				// virtual USB devices are also listed during GEN - don't process these yet
+				if ( (pass == GEN_PASS) && (parent_priv->apib->id != USB_API_HUB) ) {
+					libusb_unref_device(parent_dev);
+					continue;
+				}
+				break;
+			}
+
+			// Create new or match existing device, using the (hashed) device_id as session id
+			if (pass <= DEV_PASS) {	// For subsequent passes, we'll lookup the parent
+				// These are the passes that create "new" devices
+				session_id = htab_hash(dev_id_path);
+				dev = usbi_get_device_by_session_id(ctx, session_id);
+				if (dev == NULL) {
+					if (pass == DEV_PASS) {
+						// This can occur if the OS only reports a newly plugged device after we started enum
+						usbi_warn(ctx, "'%s' was only detected in late pass (newly connected device?)"
+							" - ignoring", dev_id_path);
+						continue;
+					}
+					usbi_dbg("allocating new device for session [%X]", session_id);
+					if ((dev = usbi_alloc_device(ctx, session_id)) == NULL) {
+						LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+					}
+					windows_device_priv_init(dev);
+				} else {
+					usbi_dbg("found existing device for session [%X] (%d.%d)",
+						session_id, dev->bus_number, dev->device_address);
+				}
+				// Keep track of devices that need unref
+				unref_list[unref_cur++] = dev;
+				if (unref_cur >= unref_size) {
+					unref_size += 64;
+					unref_list = usbi_reallocf(unref_list, unref_size*sizeof(libusb_device*));
+					if (unref_list == NULL) {
+						usbi_err(ctx, "could not realloc list for unref - aborting.");
+						LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+					}
+				}
+				priv = _device_priv(dev);
+			}
+
+			// Setup device
+			switch (pass) {
+			case HCD_PASS:
+				dev->bus_number = (uint8_t)(i + 1);	// bus 0 is reserved for disconnected
+				dev->device_address = 0;
+				dev->num_configurations = 0;
+				priv->apib = &usb_api_backend[USB_API_HUB];
+				priv->sub_api = SUB_API_NOTSET;
+				priv->depth = UINT8_MAX;	// Overflow to 0 for HCD Hubs
+				priv->path = dev_interface_path; dev_interface_path = NULL;
+				break;
+			case HUB_PASS:
+			case DEV_PASS:
+				// If the device has already been setup, don't do it again
+				if (priv->path != NULL)
+					break;
+				// Take care of API initialization
+				priv->path = dev_interface_path; dev_interface_path = NULL;
+				priv->apib = &usb_api_backend[api];
+				priv->sub_api = sub_api;
+				switch(api) {
+				case USB_API_COMPOSITE:
+				case USB_API_HUB:
+					break;
+				case USB_API_HID:
+					priv->hid = calloc(1, sizeof(struct hid_device_priv));
+					if (priv->hid == NULL) {
+						LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+					}
+					priv->hid->nb_interfaces = 0;
+					break;
+				default:
+					// For other devices, the first interface is the same as the device
+					priv->usb_interface[0].path = (char*) calloc(safe_strlen(priv->path)+1, 1);
+					if (priv->usb_interface[0].path != NULL) {
+						safe_strcpy(priv->usb_interface[0].path, safe_strlen(priv->path)+1, priv->path);
+					} else {
+						usbi_warn(ctx, "could not duplicate interface path '%s'", priv->path);
+					}
+					// The following is needed if we want API calls to work for both simple
+					// and composite devices.
+					for(j=0; j<USB_MAXINTERFACES; j++) {
+						priv->usb_interface[j].apib = &usb_api_backend[api];
+					}
+					break;
+				}
+				break;
+			case GEN_PASS:
+				r = init_device(dev, parent_dev, (uint8_t)port_nr, dev_id_path, dev_info_data.DevInst);
+				if (r == LIBUSB_SUCCESS) {
+					// Append device to the list of discovered devices
+					discdevs = discovered_devs_append(*_discdevs, dev);
+					if (!discdevs) {
+						LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
+					}
+					*_discdevs = discdevs;
+				} else if (r == LIBUSB_ERROR_NO_DEVICE) {
+					// This can occur if the device was disconnected but Windows hasn't
+					// refreshed its enumeration yet - in that case, we ignore the device
+					r = LIBUSB_SUCCESS;
+				}
+				break;
+			default:	// HID_PASS and later
+				if (parent_priv->apib->id == USB_API_HID) {
+					usbi_dbg("setting HID interface for [%lX]:", parent_dev->session_data);
+					r = set_hid_interface(ctx, parent_dev, dev_interface_path);
+					if (r != LIBUSB_SUCCESS) LOOP_BREAK(r);
+					dev_interface_path = NULL;
+				} else if (parent_priv->apib->id == USB_API_COMPOSITE) {
+					usbi_dbg("setting composite interface for [%lX]:", parent_dev->session_data);
+					switch (set_composite_interface(ctx, parent_dev, dev_interface_path, dev_id_path, api, sub_api)) {
+					case LIBUSB_SUCCESS:
+						dev_interface_path = NULL;
+						break;
+					case LIBUSB_ERROR_ACCESS:
+						// interface has already been set => make sure dev_interface_path is freed then
+						break;
+					default:
+						LOOP_BREAK(r);
+						break;
+					}
+				}
+				libusb_unref_device(parent_dev);
+				break;
+			}
+		}
+	}
+
+	// Free any additional GUIDs
+	for (pass = HID_PASS+1; pass < nb_guids; pass++) {
+		safe_free(guid[pass]);
+	}
+
+	// Unref newly allocated devs
+	if (unref_list != NULL) {
+		for (i=0; i<unref_cur; i++) {
+			safe_unref_device(unref_list[i]);
+		}
+		free(unref_list);
+	}
+
+	return r;
+}
+
+/*
+ * exit: libusb backend deinitialization function
+ */
+static void windows_exit(void)
+{
+	int i;
+	HANDLE semaphore;
+	char sem_name[11+1+8]; // strlen(libusb_init)+'\0'+(32-bit hex PID)
+
+	sprintf(sem_name, "libusb_init%08X", (unsigned int)GetCurrentProcessId()&0xFFFFFFFF);
+	semaphore = CreateSemaphoreA(NULL, 1, 1, sem_name);
+	if (semaphore == NULL) {
+		return;
+	}
+
+	// A successful wait brings our semaphore count to 0 (unsignaled)
+	// => any concurent wait stalls until the semaphore release
+	if (WaitForSingleObject(semaphore, INFINITE) != WAIT_OBJECT_0) {
+		CloseHandle(semaphore);
+		return;
+	}
+
+	// Only works if exits and inits are balanced exactly
+	if (--concurrent_usage < 0) {	// Last exit
+		for (i=0; i<USB_API_MAX; i++) {
+			usb_api_backend[i].exit(SUB_API_NOTSET);
+		}
+		exit_polling();
+
+		if (timer_thread) {
+			SetEvent(timer_request[1]); // actually the signal to quit the thread.
+			if (WAIT_OBJECT_0 != WaitForSingleObject(timer_thread, INFINITE)) {
+				usbi_dbg("could not wait for timer thread to quit");
+				TerminateThread(timer_thread, 1);
+			}
+			CloseHandle(timer_thread);
+			timer_thread = NULL;
+		}
+		for (i = 0; i < 2; i++) {
+			if (timer_request[i]) {
+				CloseHandle(timer_request[i]);
+				timer_request[i] = NULL;
+			}
+		}
+		if (timer_response) {
+			CloseHandle(timer_response);
+			timer_response = NULL;
+		}
+		if (timer_mutex) {
+			CloseHandle(timer_mutex);
+			timer_mutex = NULL;
+		}
+		htab_destroy();
+	}
+
+	ReleaseSemaphore(semaphore, 1, NULL);	// increase count back to 1
+	CloseHandle(semaphore);
+}
+
+static int windows_get_device_descriptor(struct libusb_device *dev, unsigned char *buffer, int *host_endian)
+{
+	struct windows_device_priv *priv = _device_priv(dev);
+
+	memcpy(buffer, &(priv->dev_descriptor), DEVICE_DESC_LENGTH);
+	*host_endian = 0;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int windows_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
+{
+	struct windows_device_priv *priv = _device_priv(dev);
+	PUSB_CONFIGURATION_DESCRIPTOR config_header;
+	size_t size;
+
+	// config index is zero based
+	if (config_index >= dev->num_configurations)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	if ((priv->config_descriptor == NULL) || (priv->config_descriptor[config_index] == NULL))
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	config_header = (PUSB_CONFIGURATION_DESCRIPTOR)priv->config_descriptor[config_index];
+
+	size = min(config_header->wTotalLength, len);
+	memcpy(buffer, priv->config_descriptor[config_index], size);
+	*host_endian = 0;
+
+	return (int)size;
+}
+
+/*
+ * return the cached copy of the active config descriptor
+ */
+static int windows_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len, int *host_endian)
+{
+	struct windows_device_priv *priv = _device_priv(dev);
+
+	if (priv->active_config == 0)
+		return LIBUSB_ERROR_NOT_FOUND;
+
+	// config index is zero based
+	return windows_get_config_descriptor(dev, (uint8_t)(priv->active_config-1), buffer, len, host_endian);
+}
+
+static int windows_open(struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+
+	if (priv->apib == NULL) {
+		usbi_err(ctx, "program assertion failed - device is not initialized");
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	return priv->apib->open(SUB_API_NOTSET, dev_handle);
+}
+
+static void windows_close(struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	priv->apib->close(SUB_API_NOTSET, dev_handle);
+}
+
+static int windows_get_configuration(struct libusb_device_handle *dev_handle, int *config)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	if (priv->active_config == 0) {
+		*config = 0;
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	*config = priv->active_config;
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * from http://msdn.microsoft.com/en-us/library/ms793522.aspx: "The port driver
+ * does not currently expose a service that allows higher-level drivers to set
+ * the configuration."
+ */
+static int windows_set_configuration(struct libusb_device_handle *dev_handle, int config)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	int r = LIBUSB_SUCCESS;
+
+	if (config >= USB_MAXCONFIG)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	r = libusb_control_transfer(dev_handle, LIBUSB_ENDPOINT_OUT |
+		LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE,
+		LIBUSB_REQUEST_SET_CONFIGURATION, (uint16_t)config,
+		0, NULL, 0, 1000);
+
+	if (r == LIBUSB_SUCCESS) {
+		priv->active_config = (uint8_t)config;
+	}
+	return r;
+}
+
+static int windows_claim_interface(struct libusb_device_handle *dev_handle, int iface)
+{
+	int r = LIBUSB_SUCCESS;
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	if (iface >= USB_MAXINTERFACES)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	safe_free(priv->usb_interface[iface].endpoint);
+	priv->usb_interface[iface].nb_endpoints= 0;
+
+	r = priv->apib->claim_interface(SUB_API_NOTSET, dev_handle, iface);
+
+	if (r == LIBUSB_SUCCESS) {
+		r = windows_assign_endpoints(dev_handle, iface, 0);
+	}
+
+	return r;
+}
+
+static int windows_set_interface_altsetting(struct libusb_device_handle *dev_handle, int iface, int altsetting)
+{
+	int r = LIBUSB_SUCCESS;
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	safe_free(priv->usb_interface[iface].endpoint);
+	priv->usb_interface[iface].nb_endpoints= 0;
+
+	r = priv->apib->set_interface_altsetting(SUB_API_NOTSET, dev_handle, iface, altsetting);
+
+	if (r == LIBUSB_SUCCESS) {
+		r = windows_assign_endpoints(dev_handle, iface, altsetting);
+	}
+
+	return r;
+}
+
+static int windows_release_interface(struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	return priv->apib->release_interface(SUB_API_NOTSET, dev_handle, iface);
+}
+
+static int windows_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	return priv->apib->clear_halt(SUB_API_NOTSET, dev_handle, endpoint);
+}
+
+static int windows_reset_device(struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	return priv->apib->reset_device(SUB_API_NOTSET, dev_handle);
+}
+
+// The 3 functions below are unlikely to ever get supported on Windows
+static int windows_kernel_driver_active(struct libusb_device_handle *dev_handle, int iface)
+{
+	return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static int windows_attach_kernel_driver(struct libusb_device_handle *dev_handle, int iface)
+{
+	return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static int windows_detach_kernel_driver(struct libusb_device_handle *dev_handle, int iface)
+{
+	return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
+static void windows_destroy_device(struct libusb_device *dev)
+{
+	windows_device_priv_release(dev);
+}
+
+static void windows_clear_transfer_priv(struct usbi_transfer *itransfer)
+{
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+
+	usbi_free_fd(&transfer_priv->pollable_fd);
+	safe_free(transfer_priv->hid_buffer);
+	// When auto claim is in use, attempt to release the auto-claimed interface
+	auto_release(itransfer);
+}
+
+static int submit_bulk_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int r;
+
+	r = priv->apib->submit_bulk_transfer(SUB_API_NOTSET, itransfer);
+	if (r != LIBUSB_SUCCESS) {
+		return r;
+	}
+
+	usbi_add_pollfd(ctx, transfer_priv->pollable_fd.fd,
+		(short)(IS_XFERIN(transfer) ? POLLIN : POLLOUT));
+
+	itransfer->flags |= USBI_TRANSFER_UPDATED_FDS;
+	return LIBUSB_SUCCESS;
+}
+
+static int submit_iso_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int r;
+
+	r = priv->apib->submit_iso_transfer(SUB_API_NOTSET, itransfer);
+	if (r != LIBUSB_SUCCESS) {
+		return r;
+	}
+
+	usbi_add_pollfd(ctx, transfer_priv->pollable_fd.fd,
+		(short)(IS_XFERIN(transfer) ? POLLIN : POLLOUT));
+
+	itransfer->flags |= USBI_TRANSFER_UPDATED_FDS;
+	return LIBUSB_SUCCESS;
+}
+
+static int submit_control_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int r;
+
+	r = priv->apib->submit_control_transfer(SUB_API_NOTSET, itransfer);
+	if (r != LIBUSB_SUCCESS) {
+		return r;
+	}
+
+	usbi_add_pollfd(ctx, transfer_priv->pollable_fd.fd, POLLIN);
+
+	itransfer->flags |= USBI_TRANSFER_UPDATED_FDS;
+	return LIBUSB_SUCCESS;
+
+}
+
+static int windows_submit_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		return submit_control_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+		if (IS_XFEROUT(transfer) &&
+		    transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET)
+			return LIBUSB_ERROR_NOT_SUPPORTED;
+		return submit_bulk_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		return submit_iso_transfer(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	default:
+		usbi_err(TRANSFER_CTX(transfer), "unknown endpoint type %d", transfer->type);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+static int windows_abort_control(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+
+	return priv->apib->abort_control(SUB_API_NOTSET, itransfer);
+}
+
+static int windows_abort_transfers(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+
+	return priv->apib->abort_transfers(SUB_API_NOTSET, itransfer);
+}
+
+static int windows_cancel_transfer(struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+		return windows_abort_control(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		return windows_abort_transfers(itransfer);
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	default:
+		usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int status, istatus;
+
+	usbi_dbg("handling I/O completion with errcode %d, size %d", io_result, io_size);
+
+	switch(io_result) {
+	case NO_ERROR:
+		status = priv->apib->copy_transfer_data(SUB_API_NOTSET, itransfer, io_size);
+		break;
+	case ERROR_GEN_FAILURE:
+		usbi_dbg("detected endpoint stall");
+		status = LIBUSB_TRANSFER_STALL;
+		break;
+	case ERROR_SEM_TIMEOUT:
+		usbi_dbg("detected semaphore timeout");
+		status = LIBUSB_TRANSFER_TIMED_OUT;
+		break;
+	case ERROR_OPERATION_ABORTED:
+		istatus = priv->apib->copy_transfer_data(SUB_API_NOTSET, itransfer, io_size);
+		if (istatus != LIBUSB_TRANSFER_COMPLETED) {
+			usbi_dbg("Failed to copy partial data in aborted operation: %d", istatus);
+		}
+		if (itransfer->flags & USBI_TRANSFER_TIMED_OUT) {
+			usbi_dbg("detected timeout");
+			status = LIBUSB_TRANSFER_TIMED_OUT;
+		} else {
+			usbi_dbg("detected operation aborted");
+			status = LIBUSB_TRANSFER_CANCELLED;
+		}
+		break;
+	default:
+		usbi_err(ITRANSFER_CTX(itransfer), "detected I/O error %d: %s", io_result, windows_error_str(io_result));
+		status = LIBUSB_TRANSFER_ERROR;
+		break;
+	}
+	windows_clear_transfer_priv(itransfer);	// Cancel polling
+	usbi_handle_transfer_completion(itransfer, (enum libusb_transfer_status)status);
+}
+
+static void windows_handle_callback (struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+
+	switch (transfer->type) {
+	case LIBUSB_TRANSFER_TYPE_CONTROL:
+	case LIBUSB_TRANSFER_TYPE_BULK:
+	case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
+		windows_transfer_callback (itransfer, io_result, io_size);
+		break;
+	case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
+		usbi_warn(ITRANSFER_CTX(itransfer), "bulk stream transfers are not yet supported on this platform");
+		break;
+	default:
+		usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type);
+	}
+}
+
+static int windows_handle_events(struct libusb_context *ctx, struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready)
+{
+	struct windows_transfer_priv* transfer_priv = NULL;
+	POLL_NFDS_TYPE i = 0;
+	bool found = false;
+	struct usbi_transfer *transfer;
+	DWORD io_size, io_result;
+
+	usbi_mutex_lock(&ctx->open_devs_lock);
+	for (i = 0; i < nfds && num_ready > 0; i++) {
+
+		usbi_dbg("checking fd %d with revents = %04x", fds[i].fd, fds[i].revents);
+
+		if (!fds[i].revents) {
+			continue;
+		}
+
+		num_ready--;
+
+		// Because a Windows OVERLAPPED is used for poll emulation,
+		// a pollable fd is created and stored with each transfer
+		usbi_mutex_lock(&ctx->flying_transfers_lock);
+		list_for_each_entry(transfer, &ctx->flying_transfers, list, struct usbi_transfer) {
+			transfer_priv = usbi_transfer_get_os_priv(transfer);
+			if (transfer_priv->pollable_fd.fd == fds[i].fd) {
+				found = true;
+				break;
+			}
+		}
+		usbi_mutex_unlock(&ctx->flying_transfers_lock);
+
+		if (found) {
+			// Handle async requests that completed synchronously first
+			if (HasOverlappedIoCompletedSync(transfer_priv->pollable_fd.overlapped)) {
+				io_result = NO_ERROR;
+				io_size = (DWORD)transfer_priv->pollable_fd.overlapped->InternalHigh;
+			// Regular async overlapped
+			} else if (GetOverlappedResult(transfer_priv->pollable_fd.handle,
+				transfer_priv->pollable_fd.overlapped, &io_size, false)) {
+				io_result = NO_ERROR;
+			} else {
+				io_result = GetLastError();
+			}
+			usbi_remove_pollfd(ctx, transfer_priv->pollable_fd.fd);
+			// let handle_callback free the event using the transfer wfd
+			// If you don't use the transfer wfd, you run a risk of trying to free a
+			// newly allocated wfd that took the place of the one from the transfer.
+			windows_handle_callback(transfer, io_result, io_size);
+		} else {
+			usbi_err(ctx, "could not find a matching transfer for fd %x", fds[i]);
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	}
+
+	usbi_mutex_unlock(&ctx->open_devs_lock);
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * Monotonic and real time functions
+ */
+unsigned __stdcall windows_clock_gettime_threaded(void* param)
+{
+	LARGE_INTEGER hires_counter, li_frequency;
+	LONG nb_responses;
+	int timer_index;
+
+	// Init - find out if we have access to a monotonic (hires) timer
+	if (!QueryPerformanceFrequency(&li_frequency)) {
+		usbi_dbg("no hires timer available on this platform");
+		hires_frequency = 0;
+		hires_ticks_to_ps = UINT64_C(0);
+	} else {
+		hires_frequency = li_frequency.QuadPart;
+		// The hires frequency can go as high as 4 GHz, so we'll use a conversion
+		// to picoseconds to compute the tv_nsecs part in clock_gettime
+		hires_ticks_to_ps = UINT64_C(1000000000000) / hires_frequency;
+		usbi_dbg("hires timer available (Frequency: %"PRIu64" Hz)", hires_frequency);
+	}
+
+	// Signal windows_init() that we're ready to service requests
+	if (ReleaseSemaphore(timer_response, 1, NULL) == 0) {
+		usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0));
+	}
+
+	// Main loop - wait for requests
+	while (1) {
+		timer_index = WaitForMultipleObjects(2, timer_request, FALSE, INFINITE) - WAIT_OBJECT_0;
+		if ( (timer_index != 0) && (timer_index != 1) ) {
+			usbi_dbg("failure to wait on requests: %s", windows_error_str(0));
+			continue;
+		}
+		if (request_count[timer_index] == 0) {
+			// Request already handled
+			ResetEvent(timer_request[timer_index]);
+			// There's still a possiblity that a thread sends a request between the
+			// time we test request_count[] == 0 and we reset the event, in which case
+			// the request would be ignored. The simple solution to that is to test
+			// request_count again and process requests if non zero.
+			if (request_count[timer_index] == 0)
+				continue;
+		}
+		switch (timer_index) {
+		case 0:
+			WaitForSingleObject(timer_mutex, INFINITE);
+			// Requests to this thread are for hires always
+			if ((QueryPerformanceCounter(&hires_counter) != 0) && (hires_frequency != 0)) {
+				timer_tp.tv_sec = (long)(hires_counter.QuadPart / hires_frequency);
+				timer_tp.tv_nsec = (long)(((hires_counter.QuadPart % hires_frequency)/1000) * hires_ticks_to_ps);
+			} else {
+				// Fallback to real-time if we can't get monotonic value
+				// Note that real-time clock does not wait on the mutex or this thread.
+				windows_clock_gettime(USBI_CLOCK_REALTIME, &timer_tp);
+			}
+			ReleaseMutex(timer_mutex);
+
+			nb_responses = InterlockedExchange((LONG*)&request_count[0], 0);
+			if ( (nb_responses)
+			  && (ReleaseSemaphore(timer_response, nb_responses, NULL) == 0) ) {
+				usbi_dbg("unable to release timer semaphore: %s", windows_error_str(0));
+			}
+			continue;
+		case 1: // time to quit
+			usbi_dbg("timer thread quitting");
+			return 0;
+		}
+	}
+}
+
+static int windows_clock_gettime(int clk_id, struct timespec *tp)
+{
+	FILETIME filetime;
+	ULARGE_INTEGER rtime;
+	DWORD r;
+	switch(clk_id) {
+	case USBI_CLOCK_MONOTONIC:
+		if (hires_frequency != 0) {
+			while (1) {
+				InterlockedIncrement((LONG*)&request_count[0]);
+				SetEvent(timer_request[0]);
+				r = WaitForSingleObject(timer_response, TIMER_REQUEST_RETRY_MS);
+				switch(r) {
+				case WAIT_OBJECT_0:
+					WaitForSingleObject(timer_mutex, INFINITE);
+					*tp = timer_tp;
+					ReleaseMutex(timer_mutex);
+					return LIBUSB_SUCCESS;
+				case WAIT_TIMEOUT:
+					usbi_dbg("could not obtain a timer value within reasonable timeframe - too much load?");
+					break; // Retry until successful
+				default:
+					usbi_dbg("WaitForSingleObject failed: %s", windows_error_str(0));
+					return LIBUSB_ERROR_OTHER;
+				}
+			}
+		}
+		// Fall through and return real-time if monotonic was not detected @ timer init
+	case USBI_CLOCK_REALTIME:
+		// We follow http://msdn.microsoft.com/en-us/library/ms724928%28VS.85%29.aspx
+		// with a predef epoch_time to have an epoch that starts at 1970.01.01 00:00
+		// Note however that our resolution is bounded by the Windows system time
+		// functions and is at best of the order of 1 ms (or, usually, worse)
+		GetSystemTimeAsFileTime(&filetime);
+		rtime.LowPart = filetime.dwLowDateTime;
+		rtime.HighPart = filetime.dwHighDateTime;
+		rtime.QuadPart -= epoch_time;
+		tp->tv_sec = (long)(rtime.QuadPart / 10000000);
+		tp->tv_nsec = (long)((rtime.QuadPart % 10000000)*100);
+		return LIBUSB_SUCCESS;
+	default:
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+}
+
+
+// NB: MSVC6 does not support named initializers.
+const struct usbi_os_backend windows_backend = {
+	"Windows",
+	USBI_CAP_HAS_HID_ACCESS,
+	windows_init,
+	windows_exit,
+
+	windows_get_device_list,
+	NULL,				/* hotplug_poll */
+	windows_open,
+	windows_close,
+
+	windows_get_device_descriptor,
+	windows_get_active_config_descriptor,
+	windows_get_config_descriptor,
+	NULL,				/* get_config_descriptor_by_value() */
+
+	windows_get_configuration,
+	windows_set_configuration,
+	windows_claim_interface,
+	windows_release_interface,
+
+	windows_set_interface_altsetting,
+	windows_clear_halt,
+	windows_reset_device,
+
+	NULL,				/* alloc_streams */
+	NULL,				/* free_streams */
+
+	windows_kernel_driver_active,
+	windows_detach_kernel_driver,
+	windows_attach_kernel_driver,
+
+	windows_destroy_device,
+
+	windows_submit_transfer,
+	windows_cancel_transfer,
+	windows_clear_transfer_priv,
+
+	windows_handle_events,
+
+	windows_clock_gettime,
+#if defined(USBI_TIMERFD_AVAILABLE)
+	NULL,
+#endif
+	sizeof(struct windows_device_priv),
+	sizeof(struct windows_device_handle_priv),
+	sizeof(struct windows_transfer_priv),
+	0,
+};
+
+
+/*
+ * USB API backends
+ */
+static int unsupported_init(int sub_api, struct libusb_context *ctx) {
+	return LIBUSB_SUCCESS;
+}
+static int unsupported_exit(int sub_api) {
+	return LIBUSB_SUCCESS;
+}
+static int unsupported_open(int sub_api, struct libusb_device_handle *dev_handle) {
+	PRINT_UNSUPPORTED_API(open);
+}
+static void unsupported_close(int sub_api, struct libusb_device_handle *dev_handle) {
+	usbi_dbg("unsupported API call for 'close'");
+}
+static int unsupported_configure_endpoints(int sub_api, struct libusb_device_handle *dev_handle, int iface) {
+	PRINT_UNSUPPORTED_API(configure_endpoints);
+}
+static int unsupported_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface) {
+	PRINT_UNSUPPORTED_API(claim_interface);
+}
+static int unsupported_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting) {
+	PRINT_UNSUPPORTED_API(set_interface_altsetting);
+}
+static int unsupported_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface) {
+	PRINT_UNSUPPORTED_API(release_interface);
+}
+static int unsupported_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint) {
+	PRINT_UNSUPPORTED_API(clear_halt);
+}
+static int unsupported_reset_device(int sub_api, struct libusb_device_handle *dev_handle) {
+	PRINT_UNSUPPORTED_API(reset_device);
+}
+static int unsupported_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	PRINT_UNSUPPORTED_API(submit_bulk_transfer);
+}
+static int unsupported_submit_iso_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	PRINT_UNSUPPORTED_API(submit_iso_transfer);
+}
+static int unsupported_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	PRINT_UNSUPPORTED_API(submit_control_transfer);
+}
+static int unsupported_abort_control(int sub_api, struct usbi_transfer *itransfer) {
+	PRINT_UNSUPPORTED_API(abort_control);
+}
+static int unsupported_abort_transfers(int sub_api, struct usbi_transfer *itransfer) {
+	PRINT_UNSUPPORTED_API(abort_transfers);
+}
+static int unsupported_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size) {
+	PRINT_UNSUPPORTED_API(copy_transfer_data);
+}
+static int common_configure_endpoints(int sub_api, struct libusb_device_handle *dev_handle, int iface) {
+	return LIBUSB_SUCCESS;
+}
+// These names must be uppercase
+const char* hub_driver_names[] = {"USBHUB", "USBHUB3", "USB3HUB", "NUSB3HUB", "RUSB3HUB", "FLXHCIH", "TIHUB3", "ETRONHUB3", "VIAHUB3", "ASMTHUB3", "IUSB3HUB", "VUSB3HUB", "AMDHUB30"};
+const char* composite_driver_names[] = {"USBCCGP"};
+const char* winusbx_driver_names[] = WINUSBX_DRV_NAMES;
+const char* hid_driver_names[] = {"HIDUSB", "MOUHID", "KBDHID"};
+const struct windows_usb_api_backend usb_api_backend[USB_API_MAX] = {
+	{
+		USB_API_UNSUPPORTED,
+		"Unsupported API",
+		NULL,
+		0,
+		unsupported_init,
+		unsupported_exit,
+		unsupported_open,
+		unsupported_close,
+		unsupported_configure_endpoints,
+		unsupported_claim_interface,
+		unsupported_set_interface_altsetting,
+		unsupported_release_interface,
+		unsupported_clear_halt,
+		unsupported_reset_device,
+		unsupported_submit_bulk_transfer,
+		unsupported_submit_iso_transfer,
+		unsupported_submit_control_transfer,
+		unsupported_abort_control,
+		unsupported_abort_transfers,
+		unsupported_copy_transfer_data,
+	}, {
+		USB_API_HUB,
+		"HUB API",
+		hub_driver_names,
+		ARRAYSIZE(hub_driver_names),
+		unsupported_init,
+		unsupported_exit,
+		unsupported_open,
+		unsupported_close,
+		unsupported_configure_endpoints,
+		unsupported_claim_interface,
+		unsupported_set_interface_altsetting,
+		unsupported_release_interface,
+		unsupported_clear_halt,
+		unsupported_reset_device,
+		unsupported_submit_bulk_transfer,
+		unsupported_submit_iso_transfer,
+		unsupported_submit_control_transfer,
+		unsupported_abort_control,
+		unsupported_abort_transfers,
+		unsupported_copy_transfer_data,
+	}, {
+		USB_API_COMPOSITE,
+		"Composite API",
+		composite_driver_names,
+		ARRAYSIZE(composite_driver_names),
+		composite_init,
+		composite_exit,
+		composite_open,
+		composite_close,
+		common_configure_endpoints,
+		composite_claim_interface,
+		composite_set_interface_altsetting,
+		composite_release_interface,
+		composite_clear_halt,
+		composite_reset_device,
+		composite_submit_bulk_transfer,
+		composite_submit_iso_transfer,
+		composite_submit_control_transfer,
+		composite_abort_control,
+		composite_abort_transfers,
+		composite_copy_transfer_data,
+	}, {
+		USB_API_WINUSBX,
+		"WinUSB-like APIs",
+		winusbx_driver_names,
+		ARRAYSIZE(winusbx_driver_names),
+		winusbx_init,
+		winusbx_exit,
+		winusbx_open,
+		winusbx_close,
+		winusbx_configure_endpoints,
+		winusbx_claim_interface,
+		winusbx_set_interface_altsetting,
+		winusbx_release_interface,
+		winusbx_clear_halt,
+		winusbx_reset_device,
+		winusbx_submit_bulk_transfer,
+		unsupported_submit_iso_transfer,
+		winusbx_submit_control_transfer,
+		winusbx_abort_control,
+		winusbx_abort_transfers,
+		winusbx_copy_transfer_data,
+	}, {
+		USB_API_HID,
+		"HID API",
+		hid_driver_names,
+		ARRAYSIZE(hid_driver_names),
+		hid_init,
+		hid_exit,
+		hid_open,
+		hid_close,
+		common_configure_endpoints,
+		hid_claim_interface,
+		hid_set_interface_altsetting,
+		hid_release_interface,
+		hid_clear_halt,
+		hid_reset_device,
+		hid_submit_bulk_transfer,
+		unsupported_submit_iso_transfer,
+		hid_submit_control_transfer,
+		hid_abort_transfers,
+		hid_abort_transfers,
+		hid_copy_transfer_data,
+	},
+};
+
+
+/*
+ * WinUSB-like (WinUSB, libusb0/libusbK through libusbk DLL) API functions
+ */
+#define WinUSBX_Set(fn) do { if (native_winusb) WinUSBX[i].fn = (WinUsb_##fn##_t) GetProcAddress(h, "WinUsb_" #fn); \
+	else pLibK_GetProcAddress((PVOID*)&WinUSBX[i].fn, i, KUSB_FNID_##fn); } while (0)
+
+static int winusbx_init(int sub_api, struct libusb_context *ctx)
+{
+	HMODULE h = NULL;
+	bool native_winusb = false;
+	int i;
+	KLIB_VERSION LibK_Version;
+	LibK_GetProcAddress_t pLibK_GetProcAddress = NULL;
+	LibK_GetVersion_t pLibK_GetVersion = NULL;
+
+	h = GetModuleHandleA("libusbK");
+	if (h == NULL) {
+		h = LoadLibraryA("libusbK");
+	}
+	if (h == NULL) {
+		usbi_info(ctx, "libusbK DLL is not available, will use native WinUSB");
+		h = GetModuleHandleA("WinUSB");
+		if (h == NULL) {
+			h = LoadLibraryA("WinUSB");
+		}		if (h == NULL) {
+			usbi_warn(ctx, "WinUSB DLL is not available either,\n"
+				"you will not be able to access devices outside of enumeration");
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	} else {
+		usbi_dbg("using libusbK DLL for universal access");
+		pLibK_GetVersion = (LibK_GetVersion_t) GetProcAddress(h, "LibK_GetVersion");
+		if (pLibK_GetVersion != NULL) {
+			pLibK_GetVersion(&LibK_Version);
+			usbi_dbg("libusbK version: %d.%d.%d.%d", LibK_Version.Major, LibK_Version.Minor,
+				LibK_Version.Micro, LibK_Version.Nano);
+		}
+		pLibK_GetProcAddress = (LibK_GetProcAddress_t) GetProcAddress(h, "LibK_GetProcAddress");
+		if (pLibK_GetProcAddress == NULL) {
+			usbi_err(ctx, "LibK_GetProcAddress() not found in libusbK DLL");
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	}
+	native_winusb = (pLibK_GetProcAddress == NULL);
+	for (i=SUB_API_LIBUSBK; i<SUB_API_MAX; i++) {
+		WinUSBX_Set(AbortPipe);
+		WinUSBX_Set(ControlTransfer);
+		WinUSBX_Set(FlushPipe);
+		WinUSBX_Set(Free);
+		WinUSBX_Set(GetAssociatedInterface);
+		WinUSBX_Set(GetCurrentAlternateSetting);
+		WinUSBX_Set(GetDescriptor);
+		WinUSBX_Set(GetOverlappedResult);
+		WinUSBX_Set(GetPipePolicy);
+		WinUSBX_Set(GetPowerPolicy);
+		WinUSBX_Set(Initialize);
+		WinUSBX_Set(QueryDeviceInformation);
+		WinUSBX_Set(QueryInterfaceSettings);
+		WinUSBX_Set(QueryPipe);
+		WinUSBX_Set(ReadPipe);
+		WinUSBX_Set(ResetPipe);
+		WinUSBX_Set(SetCurrentAlternateSetting);
+		WinUSBX_Set(SetPipePolicy);
+		WinUSBX_Set(SetPowerPolicy);
+		WinUSBX_Set(WritePipe);
+		if (!native_winusb) {
+			WinUSBX_Set(ResetDevice);
+		}
+		if (WinUSBX[i].Initialize != NULL) {
+			WinUSBX[i].initialized = true;
+			usbi_dbg("initalized sub API %s", sub_api_name[i]);
+		} else {
+			usbi_warn(ctx, "Failed to initalize sub API %s", sub_api_name[i]);
+			WinUSBX[i].initialized = false;
+		}
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_exit(int sub_api)
+{
+	return LIBUSB_SUCCESS;
+}
+
+// NB: open and close must ensure that they only handle interface of
+// the right API type, as these functions can be called wholesale from
+// composite_open(), with interfaces belonging to different APIs
+static int winusbx_open(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+
+	HANDLE file_handle;
+	int i;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	// WinUSB requires a seperate handle for each interface
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if ( (priv->usb_interface[i].path != NULL)
+		  && (priv->usb_interface[i].apib->id == USB_API_WINUSBX) ) {
+			file_handle = CreateFileA(priv->usb_interface[i].path, GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ,
+				NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+			if (file_handle == INVALID_HANDLE_VALUE) {
+				usbi_err(ctx, "could not open device %s (interface %d): %s", priv->usb_interface[i].path, i, windows_error_str(0));
+				switch(GetLastError()) {
+				case ERROR_FILE_NOT_FOUND:	// The device was disconnected
+					return LIBUSB_ERROR_NO_DEVICE;
+				case ERROR_ACCESS_DENIED:
+					return LIBUSB_ERROR_ACCESS;
+				default:
+					return LIBUSB_ERROR_IO;
+				}
+			}
+			handle_priv->interface_handle[i].dev_handle = file_handle;
+		}
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static void winusbx_close(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE file_handle;
+	int i;
+
+	if (sub_api == SUB_API_NOTSET)
+		sub_api = priv->sub_api;
+	if (!WinUSBX[sub_api].initialized)
+		return;
+
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if (priv->usb_interface[i].apib->id == USB_API_WINUSBX) {
+			file_handle = handle_priv->interface_handle[i].dev_handle;
+			if ( (file_handle != 0) && (file_handle != INVALID_HANDLE_VALUE)) {
+				CloseHandle(file_handle);
+			}
+		}
+	}
+}
+
+static int winusbx_configure_endpoints(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE winusb_handle = handle_priv->interface_handle[iface].api_handle;
+	UCHAR policy;
+	ULONG timeout = 0;
+	uint8_t endpoint_address;
+	int i;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	// With handle and enpoints set (in parent), we can setup the default pipe properties
+	// see http://download.microsoft.com/download/D/1/D/D1DD7745-426B-4CC3-A269-ABBBE427C0EF/DVC-T705_DDC08.pptx
+	for (i=-1; i<priv->usb_interface[iface].nb_endpoints; i++) {
+		endpoint_address =(i==-1)?0:priv->usb_interface[iface].endpoint[i];
+		if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address,
+			PIPE_TRANSFER_TIMEOUT, sizeof(ULONG), &timeout)) {
+			usbi_dbg("failed to set PIPE_TRANSFER_TIMEOUT for control endpoint %02X", endpoint_address);
+		}
+		if ((i == -1) || (sub_api == SUB_API_LIBUSB0)) {
+			continue;	// Other policies don't apply to control endpoint or libusb0
+		}
+		policy = false;
+		if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address,
+			SHORT_PACKET_TERMINATE, sizeof(UCHAR), &policy)) {
+			usbi_dbg("failed to disable SHORT_PACKET_TERMINATE for endpoint %02X", endpoint_address);
+		}
+		if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address,
+			IGNORE_SHORT_PACKETS, sizeof(UCHAR), &policy)) {
+			usbi_dbg("failed to disable IGNORE_SHORT_PACKETS for endpoint %02X", endpoint_address);
+		}
+		policy = true;
+		/* ALLOW_PARTIAL_READS must be enabled due to likely libusbK bug. See:
+		   https://sourceforge.net/mailarchive/message.php?msg_id=29736015 */
+		if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address,
+			ALLOW_PARTIAL_READS, sizeof(UCHAR), &policy)) {
+			usbi_dbg("failed to enable ALLOW_PARTIAL_READS for endpoint %02X", endpoint_address);
+		}
+		if (!WinUSBX[sub_api].SetPipePolicy(winusb_handle, endpoint_address,
+			AUTO_CLEAR_STALL, sizeof(UCHAR), &policy)) {
+			usbi_dbg("failed to enable AUTO_CLEAR_STALL for endpoint %02X", endpoint_address);
+		}
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	bool is_using_usbccgp = (priv->apib->id == USB_API_COMPOSITE);
+	HANDLE file_handle, winusb_handle;
+	DWORD err;
+	int i;
+	SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL;
+	HDEVINFO dev_info = INVALID_HANDLE_VALUE;
+	SP_DEVINFO_DATA dev_info_data;
+	char* dev_path_no_guid = NULL;
+	char filter_path[] = "\\\\.\\libusb0-0000";
+	bool found_filter = false;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	// If the device is composite, but using the default Windows composite parent driver (usbccgp)
+	// or if it's the first WinUSB-like interface, we get a handle through Initialize().
+	if ((is_using_usbccgp) || (iface == 0)) {
+		// composite device (independent interfaces) or interface 0
+		file_handle = handle_priv->interface_handle[iface].dev_handle;
+		if ((file_handle == 0) || (file_handle == INVALID_HANDLE_VALUE)) {
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+
+		if (!WinUSBX[sub_api].Initialize(file_handle, &winusb_handle)) {
+			handle_priv->interface_handle[iface].api_handle = INVALID_HANDLE_VALUE;
+			err = GetLastError();
+			switch(err) {
+			case ERROR_BAD_COMMAND:
+				// The device was disconnected
+				usbi_err(ctx, "could not access interface %d: %s", iface, windows_error_str(0));
+				return LIBUSB_ERROR_NO_DEVICE;
+			default:
+				// it may be that we're using the libusb0 filter driver.
+				// TODO: can we move this whole business into the K/0 DLL?
+				for (i = 0; ; i++) {
+					safe_free(dev_interface_details);
+					safe_free(dev_path_no_guid);
+					dev_interface_details = get_interface_details_filter(ctx, &dev_info, &dev_info_data, &GUID_DEVINTERFACE_LIBUSB0_FILTER, i, filter_path);
+					if ((found_filter) || (dev_interface_details == NULL)) {
+						break;
+					}
+					// ignore GUID part
+					dev_path_no_guid = sanitize_path(strtok(dev_interface_details->DevicePath, "{"));
+					if (safe_strncmp(dev_path_no_guid, priv->usb_interface[iface].path, safe_strlen(dev_path_no_guid)) == 0) {
+						file_handle = CreateFileA(filter_path, GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ,
+							NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+						if (file_handle == INVALID_HANDLE_VALUE) {
+							usbi_err(ctx, "could not open device %s: %s", filter_path, windows_error_str(0));
+						} else {
+							WinUSBX[sub_api].Free(winusb_handle);
+							if (WinUSBX[sub_api].Initialize(file_handle, &winusb_handle))
+								found_filter = true;
+							else
+								usbi_err(ctx, "could not initialize filter driver for %s", filter_path);
+						}
+					}
+				}
+				if (!found_filter) {
+					usbi_err(ctx, "could not access interface %d: %s", iface, windows_error_str(err));
+					return LIBUSB_ERROR_ACCESS;
+				}
+			}
+		}
+		handle_priv->interface_handle[iface].api_handle = winusb_handle;
+	} else {
+		// For all other interfaces, use GetAssociatedInterface()
+		winusb_handle = handle_priv->interface_handle[0].api_handle;
+		// It is a requirement for multiple interface devices on Windows that, to you
+		// must first claim the first interface before you claim the others
+		if ((winusb_handle == 0) || (winusb_handle == INVALID_HANDLE_VALUE)) {
+			file_handle = handle_priv->interface_handle[0].dev_handle;
+			if (WinUSBX[sub_api].Initialize(file_handle, &winusb_handle)) {
+				handle_priv->interface_handle[0].api_handle = winusb_handle;
+				usbi_warn(ctx, "auto-claimed interface 0 (required to claim %d with WinUSB)", iface);
+			} else {
+				usbi_warn(ctx, "failed to auto-claim interface 0 (required to claim %d with WinUSB): %s", iface, windows_error_str(0));
+				return LIBUSB_ERROR_ACCESS;
+			}
+		}
+		if (!WinUSBX[sub_api].GetAssociatedInterface(winusb_handle, (UCHAR)(iface-1),
+			&handle_priv->interface_handle[iface].api_handle)) {
+			handle_priv->interface_handle[iface].api_handle = INVALID_HANDLE_VALUE;
+			switch(GetLastError()) {
+			case ERROR_NO_MORE_ITEMS:   // invalid iface
+				return LIBUSB_ERROR_NOT_FOUND;
+			case ERROR_BAD_COMMAND:     // The device was disconnected
+				return LIBUSB_ERROR_NO_DEVICE;
+			case ERROR_ALREADY_EXISTS:  // already claimed
+				return LIBUSB_ERROR_BUSY;
+			default:
+				usbi_err(ctx, "could not claim interface %d: %s", iface, windows_error_str(0));
+				return LIBUSB_ERROR_ACCESS;
+			}
+		}
+	}
+	usbi_dbg("claimed interface %d", iface);
+	handle_priv->active_interface = iface;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE winusb_handle;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	winusb_handle = handle_priv->interface_handle[iface].api_handle;
+	if ((winusb_handle == 0) || (winusb_handle == INVALID_HANDLE_VALUE)) {
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	WinUSBX[sub_api].Free(winusb_handle);
+	handle_priv->interface_handle[iface].api_handle = INVALID_HANDLE_VALUE;
+
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * Return the first valid interface (of the same API type), for control transfers
+ */
+static int get_valid_interface(struct libusb_device_handle *dev_handle, int api_id)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	int i;
+
+	if ((api_id < USB_API_WINUSBX) || (api_id > USB_API_HID)) {
+		usbi_dbg("unsupported API ID");
+		return -1;
+	}
+
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		if ( (handle_priv->interface_handle[i].dev_handle != 0)
+		  && (handle_priv->interface_handle[i].dev_handle != INVALID_HANDLE_VALUE)
+		  && (handle_priv->interface_handle[i].api_handle != 0)
+		  && (handle_priv->interface_handle[i].api_handle != INVALID_HANDLE_VALUE)
+		  && (priv->usb_interface[i].apib->id == api_id) ) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+/*
+ * Lookup interface by endpoint address. -1 if not found
+ */
+static int interface_by_endpoint(struct windows_device_priv *priv,
+	struct windows_device_handle_priv *handle_priv, uint8_t endpoint_address)
+{
+	int i, j;
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		if (handle_priv->interface_handle[i].api_handle == INVALID_HANDLE_VALUE)
+			continue;
+		if (handle_priv->interface_handle[i].api_handle == 0)
+			continue;
+		if (priv->usb_interface[i].endpoint == NULL)
+			continue;
+		for (j=0; j<priv->usb_interface[i].nb_endpoints; j++) {
+			if (priv->usb_interface[i].endpoint[j] == endpoint_address) {
+				return i;
+			}
+		}
+	}
+	return -1;
+}
+
+static int winusbx_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(
+		transfer->dev_handle);
+	WINUSB_SETUP_PACKET *setup = (WINUSB_SETUP_PACKET *) transfer->buffer;
+	ULONG size;
+	HANDLE winusb_handle;
+	int current_interface;
+	struct winfd wfd;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	transfer_priv->pollable_fd = INVALID_WINFD;
+	size = transfer->length - LIBUSB_CONTROL_SETUP_SIZE;
+
+	if (size > MAX_CTRL_BUFFER_LENGTH)
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	current_interface = get_valid_interface(transfer->dev_handle, USB_API_WINUSBX);
+	if (current_interface < 0) {
+		if (auto_claim(transfer, &current_interface, USB_API_WINUSBX) != LIBUSB_SUCCESS) {
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	}
+
+	usbi_dbg("will use interface %d", current_interface);
+	winusb_handle = handle_priv->interface_handle[current_interface].api_handle;
+
+	wfd = usbi_create_fd(winusb_handle, RW_READ, NULL, NULL);
+	// Always use the handle returned from usbi_create_fd (wfd.handle)
+	if (wfd.fd < 0) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// Sending of set configuration control requests from WinUSB creates issues
+	if ( ((setup->request_type & (0x03 << 5)) == LIBUSB_REQUEST_TYPE_STANDARD)
+	  && (setup->request == LIBUSB_REQUEST_SET_CONFIGURATION) ) {
+		if (setup->value != priv->active_config) {
+			usbi_warn(ctx, "cannot set configuration other than the default one");
+			usbi_free_fd(&wfd);
+			return LIBUSB_ERROR_INVALID_PARAM;
+		}
+		wfd.overlapped->Internal = STATUS_COMPLETED_SYNCHRONOUSLY;
+		wfd.overlapped->InternalHigh = 0;
+	} else {
+		if (!WinUSBX[sub_api].ControlTransfer(wfd.handle, *setup, transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE, size, NULL, wfd.overlapped)) {
+			if(GetLastError() != ERROR_IO_PENDING) {
+				usbi_warn(ctx, "ControlTransfer failed: %s", windows_error_str(0));
+				usbi_free_fd(&wfd);
+				return LIBUSB_ERROR_IO;
+			}
+		} else {
+			wfd.overlapped->Internal = STATUS_COMPLETED_SYNCHRONOUSLY;
+			wfd.overlapped->InternalHigh = (DWORD)size;
+		}
+	}
+
+	// Use priv_transfer to store data needed for async polling
+	transfer_priv->pollable_fd = wfd;
+	transfer_priv->interface_number = (uint8_t)current_interface;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE winusb_handle;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	if (altsetting > 255) {
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	winusb_handle = handle_priv->interface_handle[iface].api_handle;
+	if ((winusb_handle == 0) || (winusb_handle == INVALID_HANDLE_VALUE)) {
+		usbi_err(ctx, "interface must be claimed first");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	if (!WinUSBX[sub_api].SetCurrentAlternateSetting(winusb_handle, (UCHAR)altsetting)) {
+		usbi_err(ctx, "SetCurrentAlternateSetting failed: %s", windows_error_str(0));
+		return LIBUSB_ERROR_IO;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	HANDLE winusb_handle;
+	bool ret;
+	int current_interface;
+	struct winfd wfd;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	transfer_priv->pollable_fd = INVALID_WINFD;
+
+	current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cancelling transfer");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_dbg("matched endpoint %02X with interface %d", transfer->endpoint, current_interface);
+
+	winusb_handle = handle_priv->interface_handle[current_interface].api_handle;
+
+	wfd = usbi_create_fd(winusb_handle, IS_XFERIN(transfer) ? RW_READ : RW_WRITE, NULL, NULL);
+	// Always use the handle returned from usbi_create_fd (wfd.handle)
+	if (wfd.fd < 0) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	if (IS_XFERIN(transfer)) {
+		usbi_dbg("reading %d bytes", transfer->length);
+		ret = WinUSBX[sub_api].ReadPipe(wfd.handle, transfer->endpoint, transfer->buffer, transfer->length, NULL, wfd.overlapped);
+	} else {
+		usbi_dbg("writing %d bytes", transfer->length);
+		ret = WinUSBX[sub_api].WritePipe(wfd.handle, transfer->endpoint, transfer->buffer, transfer->length, NULL, wfd.overlapped);
+	}
+	if (!ret) {
+		if(GetLastError() != ERROR_IO_PENDING) {
+			usbi_err(ctx, "ReadPipe/WritePipe failed: %s", windows_error_str(0));
+			usbi_free_fd(&wfd);
+			return LIBUSB_ERROR_IO;
+		}
+	} else {
+		wfd.overlapped->Internal = STATUS_COMPLETED_SYNCHRONOUSLY;
+		wfd.overlapped->InternalHigh = (DWORD)transfer->length;
+	}
+
+	transfer_priv->pollable_fd = wfd;
+	transfer_priv->interface_number = (uint8_t)current_interface;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE winusb_handle;
+	int current_interface;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	current_interface = interface_by_endpoint(priv, handle_priv, endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cannot clear");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_dbg("matched endpoint %02X with interface %d", endpoint, current_interface);
+	winusb_handle = handle_priv->interface_handle[current_interface].api_handle;
+
+	if (!WinUSBX[sub_api].ResetPipe(winusb_handle, endpoint)) {
+		usbi_err(ctx, "ResetPipe failed: %s", windows_error_str(0));
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * from http://www.winvistatips.com/winusb-bugchecks-t335323.html (confirmed
+ * through testing as well):
+ * "You can not call WinUsb_AbortPipe on control pipe. You can possibly cancel
+ * the control transfer using CancelIo"
+ */
+static int winusbx_abort_control(int sub_api, struct usbi_transfer *itransfer)
+{
+	// Cancelling of the I/O is done in the parent
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_abort_transfers(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	HANDLE winusb_handle;
+	int current_interface;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	current_interface = transfer_priv->interface_number;
+	if ((current_interface < 0) || (current_interface >= USB_MAXINTERFACES)) {
+		usbi_err(ctx, "program assertion failed: invalid interface_number");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+	usbi_dbg("will use interface %d", current_interface);
+
+	winusb_handle = handle_priv->interface_handle[current_interface].api_handle;
+
+	if (!WinUSBX[sub_api].AbortPipe(winusb_handle, transfer->endpoint)) {
+		usbi_err(ctx, "AbortPipe failed: %s", windows_error_str(0));
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+/*
+ * from the "How to Use WinUSB to Communicate with a USB Device" Microsoft white paper
+ * (http://www.microsoft.com/whdc/connect/usb/winusb_howto.mspx):
+ * "WinUSB does not support host-initiated reset port and cycle port operations" and
+ * IOCTL_INTERNAL_USB_CYCLE_PORT is only available in kernel mode and the
+ * IOCTL_USB_HUB_CYCLE_PORT ioctl was removed from Vista => the best we can do is
+ * cycle the pipes (and even then, the control pipe can not be reset using WinUSB)
+ */
+// TODO: (post hotplug): see if we can force eject the device and redetect it (reuse hotplug?)
+static int winusbx_reset_device(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct winfd wfd;
+	HANDLE winusb_handle;
+	int i, j;
+
+	CHECK_WINUSBX_AVAILABLE(sub_api);
+
+	// Reset any available pipe (except control)
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		winusb_handle = handle_priv->interface_handle[i].api_handle;
+		for (wfd = handle_to_winfd(winusb_handle); wfd.fd > 0;)
+		{
+			// Cancel any pollable I/O
+			usbi_remove_pollfd(ctx, wfd.fd);
+			usbi_free_fd(&wfd);
+			wfd = handle_to_winfd(winusb_handle);
+		}
+
+		if ( (winusb_handle != 0) && (winusb_handle != INVALID_HANDLE_VALUE)) {
+			for (j=0; j<priv->usb_interface[i].nb_endpoints; j++) {
+				usbi_dbg("resetting ep %02X", priv->usb_interface[i].endpoint[j]);
+				if (!WinUSBX[sub_api].AbortPipe(winusb_handle, priv->usb_interface[i].endpoint[j])) {
+					usbi_err(ctx, "AbortPipe (pipe address %02X) failed: %s",
+						priv->usb_interface[i].endpoint[j], windows_error_str(0));
+				}
+				// FlushPipe seems to fail on OUT pipes
+				if (IS_EPIN(priv->usb_interface[i].endpoint[j])
+				  && (!WinUSBX[sub_api].FlushPipe(winusb_handle, priv->usb_interface[i].endpoint[j])) ) {
+					usbi_err(ctx, "FlushPipe (pipe address %02X) failed: %s",
+						priv->usb_interface[i].endpoint[j], windows_error_str(0));
+				}
+				if (!WinUSBX[sub_api].ResetPipe(winusb_handle, priv->usb_interface[i].endpoint[j])) {
+					usbi_err(ctx, "ResetPipe (pipe address %02X) failed: %s",
+						priv->usb_interface[i].endpoint[j], windows_error_str(0));
+				}
+			}
+		}
+	}
+
+	// libusbK & libusb0 have the ability to issue an actual device reset
+	if (WinUSBX[sub_api].ResetDevice != NULL) {
+		winusb_handle = handle_priv->interface_handle[0].api_handle;
+		if ( (winusb_handle != 0) && (winusb_handle != INVALID_HANDLE_VALUE)) {
+			WinUSBX[sub_api].ResetDevice(winusb_handle);
+		}
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int winusbx_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size)
+{
+	itransfer->transferred += io_size;
+	return LIBUSB_TRANSFER_COMPLETED;
+}
+
+/*
+ * Internal HID Support functions (from libusb-win32)
+ * Note that functions that complete data transfer synchronously must return
+ * LIBUSB_COMPLETED instead of LIBUSB_SUCCESS
+ */
+static int _hid_get_hid_descriptor(struct hid_device_priv* dev, void *data, size_t *size);
+static int _hid_get_report_descriptor(struct hid_device_priv* dev, void *data, size_t *size);
+
+static int _hid_wcslen(WCHAR *str)
+{
+	int i = 0;
+	while (str[i] && (str[i] != 0x409)) {
+		i++;
+	}
+	return i;
+}
+
+static int _hid_get_device_descriptor(struct hid_device_priv* dev, void *data, size_t *size)
+{
+	struct libusb_device_descriptor d;
+
+	d.bLength = LIBUSB_DT_DEVICE_SIZE;
+	d.bDescriptorType = LIBUSB_DT_DEVICE;
+	d.bcdUSB = 0x0200; /* 2.00 */
+	d.bDeviceClass = 0;
+	d.bDeviceSubClass = 0;
+	d.bDeviceProtocol = 0;
+	d.bMaxPacketSize0 = 64; /* fix this! */
+	d.idVendor = (uint16_t)dev->vid;
+	d.idProduct = (uint16_t)dev->pid;
+	d.bcdDevice = 0x0100;
+	d.iManufacturer = dev->string_index[0];
+	d.iProduct = dev->string_index[1];
+	d.iSerialNumber = dev->string_index[2];
+	d.bNumConfigurations = 1;
+
+	if (*size > LIBUSB_DT_DEVICE_SIZE)
+		*size = LIBUSB_DT_DEVICE_SIZE;
+	memcpy(data, &d, *size);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_get_config_descriptor(struct hid_device_priv* dev, void *data, size_t *size)
+{
+	char num_endpoints = 0;
+	size_t config_total_len = 0;
+	char tmp[HID_MAX_CONFIG_DESC_SIZE];
+	struct libusb_config_descriptor *cd;
+	struct libusb_interface_descriptor *id;
+	struct libusb_hid_descriptor *hd;
+	struct libusb_endpoint_descriptor *ed;
+	size_t tmp_size;
+
+	if (dev->input_report_size)
+		num_endpoints++;
+	if (dev->output_report_size)
+		num_endpoints++;
+
+	config_total_len = LIBUSB_DT_CONFIG_SIZE + LIBUSB_DT_INTERFACE_SIZE
+		+ LIBUSB_DT_HID_SIZE + num_endpoints * LIBUSB_DT_ENDPOINT_SIZE;
+
+
+	cd = (struct libusb_config_descriptor *)tmp;
+	id = (struct libusb_interface_descriptor *)(tmp + LIBUSB_DT_CONFIG_SIZE);
+	hd = (struct libusb_hid_descriptor *)(tmp + LIBUSB_DT_CONFIG_SIZE
+		+ LIBUSB_DT_INTERFACE_SIZE);
+	ed = (struct libusb_endpoint_descriptor *)(tmp + LIBUSB_DT_CONFIG_SIZE
+		+ LIBUSB_DT_INTERFACE_SIZE
+		+ LIBUSB_DT_HID_SIZE);
+
+	cd->bLength = LIBUSB_DT_CONFIG_SIZE;
+	cd->bDescriptorType = LIBUSB_DT_CONFIG;
+	cd->wTotalLength = (uint16_t) config_total_len;
+	cd->bNumInterfaces = 1;
+	cd->bConfigurationValue = 1;
+	cd->iConfiguration = 0;
+	cd->bmAttributes = 1 << 7; /* bus powered */
+	cd->MaxPower = 50;
+
+	id->bLength = LIBUSB_DT_INTERFACE_SIZE;
+	id->bDescriptorType = LIBUSB_DT_INTERFACE;
+	id->bInterfaceNumber = 0;
+	id->bAlternateSetting = 0;
+	id->bNumEndpoints = num_endpoints;
+	id->bInterfaceClass = 3;
+	id->bInterfaceSubClass = 0;
+	id->bInterfaceProtocol = 0;
+	id->iInterface = 0;
+
+	tmp_size = LIBUSB_DT_HID_SIZE;
+	_hid_get_hid_descriptor(dev, hd, &tmp_size);
+
+	if (dev->input_report_size) {
+		ed->bLength = LIBUSB_DT_ENDPOINT_SIZE;
+		ed->bDescriptorType = LIBUSB_DT_ENDPOINT;
+		ed->bEndpointAddress = HID_IN_EP;
+		ed->bmAttributes = 3;
+		ed->wMaxPacketSize = dev->input_report_size - 1;
+		ed->bInterval = 10;
+		ed = (struct libusb_endpoint_descriptor *)((char*)ed + LIBUSB_DT_ENDPOINT_SIZE);
+	}
+
+	if (dev->output_report_size) {
+		ed->bLength = LIBUSB_DT_ENDPOINT_SIZE;
+		ed->bDescriptorType = LIBUSB_DT_ENDPOINT;
+		ed->bEndpointAddress = HID_OUT_EP;
+		ed->bmAttributes = 3;
+		ed->wMaxPacketSize = dev->output_report_size - 1;
+		ed->bInterval = 10;
+	}
+
+	if (*size > config_total_len)
+		*size = config_total_len;
+	memcpy(data, tmp, *size);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_get_string_descriptor(struct hid_device_priv* dev, int _index,
+									  void *data, size_t *size)
+{
+	void *tmp = NULL;
+	size_t tmp_size = 0;
+	int i;
+
+	/* language ID, EN-US */
+	char string_langid[] = {
+		0x09,
+		0x04
+	};
+
+	if ((*size < 2) || (*size > 255)) {
+		return LIBUSB_ERROR_OVERFLOW;
+	}
+
+	if (_index == 0) {
+		tmp = string_langid;
+		tmp_size = sizeof(string_langid)+2;
+	} else {
+		for (i=0; i<3; i++) {
+			if (_index == (dev->string_index[i])) {
+				tmp = dev->string[i];
+				tmp_size = (_hid_wcslen(dev->string[i])+1) * sizeof(WCHAR);
+				break;
+			}
+		}
+		if (i == 3) {	// not found
+			return LIBUSB_ERROR_INVALID_PARAM;
+		}
+	}
+
+	if(!tmp_size) {
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	if (tmp_size < *size) {
+		*size = tmp_size;
+	}
+	// 2 byte header
+	((uint8_t*)data)[0] = (uint8_t)*size;
+	((uint8_t*)data)[1] = LIBUSB_DT_STRING;
+	memcpy((uint8_t*)data+2, tmp, *size-2);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_get_hid_descriptor(struct hid_device_priv* dev, void *data, size_t *size)
+{
+	struct libusb_hid_descriptor d;
+	uint8_t tmp[MAX_HID_DESCRIPTOR_SIZE];
+	size_t report_len = MAX_HID_DESCRIPTOR_SIZE;
+
+	_hid_get_report_descriptor(dev, tmp, &report_len);
+
+	d.bLength = LIBUSB_DT_HID_SIZE;
+	d.bDescriptorType = LIBUSB_DT_HID;
+	d.bcdHID = 0x0110; /* 1.10 */
+	d.bCountryCode = 0;
+	d.bNumDescriptors = 1;
+	d.bClassDescriptorType = LIBUSB_DT_REPORT;
+	d.wClassDescriptorLength = (uint16_t)report_len;
+
+	if (*size > LIBUSB_DT_HID_SIZE)
+		*size = LIBUSB_DT_HID_SIZE;
+	memcpy(data, &d, *size);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_get_report_descriptor(struct hid_device_priv* dev, void *data, size_t *size)
+{
+	uint8_t d[MAX_HID_DESCRIPTOR_SIZE];
+	size_t i = 0;
+
+	/* usage page (0xFFA0 == vendor defined) */
+	d[i++] = 0x06; d[i++] = 0xA0; d[i++] = 0xFF;
+	/* usage (vendor defined) */
+	d[i++] = 0x09; d[i++] = 0x01;
+	/* start collection (application) */
+	d[i++] = 0xA1; d[i++] = 0x01;
+	/* input report */
+	if (dev->input_report_size) {
+		/* usage (vendor defined) */
+		d[i++] = 0x09; d[i++] = 0x01;
+		/* logical minimum (0) */
+		d[i++] = 0x15; d[i++] = 0x00;
+		/* logical maximum (255) */
+		d[i++] = 0x25; d[i++] = 0xFF;
+		/* report size (8 bits) */
+		d[i++] = 0x75; d[i++] = 0x08;
+		/* report count */
+		d[i++] = 0x95; d[i++] = (uint8_t)dev->input_report_size - 1;
+		/* input (data, variable, absolute) */
+		d[i++] = 0x81; d[i++] = 0x00;
+	}
+	/* output report */
+	if (dev->output_report_size) {
+		/* usage (vendor defined) */
+		d[i++] = 0x09; d[i++] = 0x02;
+		/* logical minimum (0) */
+		d[i++] = 0x15; d[i++] = 0x00;
+		/* logical maximum (255) */
+		d[i++] = 0x25; d[i++] = 0xFF;
+		/* report size (8 bits) */
+		d[i++] = 0x75; d[i++] = 0x08;
+		/* report count */
+		d[i++] = 0x95; d[i++] = (uint8_t)dev->output_report_size - 1;
+		/* output (data, variable, absolute) */
+		d[i++] = 0x91; d[i++] = 0x00;
+	}
+	/* feature report */
+	if (dev->feature_report_size) {
+		/* usage (vendor defined) */
+		d[i++] = 0x09; d[i++] = 0x03;
+		/* logical minimum (0) */
+		d[i++] = 0x15; d[i++] = 0x00;
+		/* logical maximum (255) */
+		d[i++] = 0x25; d[i++] = 0xFF;
+		/* report size (8 bits) */
+		d[i++] = 0x75; d[i++] = 0x08;
+		/* report count */
+		d[i++] = 0x95; d[i++] = (uint8_t)dev->feature_report_size - 1;
+		/* feature (data, variable, absolute) */
+		d[i++] = 0xb2; d[i++] = 0x02; d[i++] = 0x01;
+	}
+
+	/* end collection */
+	d[i++] = 0xC0;
+
+	if (*size > i)
+		*size = i;
+	memcpy(data, d, *size);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_get_descriptor(struct hid_device_priv* dev, HANDLE hid_handle, int recipient,
+							   int type, int _index, void *data, size_t *size)
+{
+	switch(type) {
+	case LIBUSB_DT_DEVICE:
+		usbi_dbg("LIBUSB_DT_DEVICE");
+		return _hid_get_device_descriptor(dev, data, size);
+	case LIBUSB_DT_CONFIG:
+		usbi_dbg("LIBUSB_DT_CONFIG");
+		if (!_index)
+			return _hid_get_config_descriptor(dev, data, size);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	case LIBUSB_DT_STRING:
+		usbi_dbg("LIBUSB_DT_STRING");
+		return _hid_get_string_descriptor(dev, _index, data, size);
+	case LIBUSB_DT_HID:
+		usbi_dbg("LIBUSB_DT_HID");
+		if (!_index)
+			return _hid_get_hid_descriptor(dev, data, size);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	case LIBUSB_DT_REPORT:
+		usbi_dbg("LIBUSB_DT_REPORT");
+		if (!_index)
+			return _hid_get_report_descriptor(dev, data, size);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	case LIBUSB_DT_PHYSICAL:
+		usbi_dbg("LIBUSB_DT_PHYSICAL");
+		if (HidD_GetPhysicalDescriptor(hid_handle, data, (ULONG)*size))
+			return LIBUSB_COMPLETED;
+		return LIBUSB_ERROR_OTHER;
+	}
+	usbi_dbg("unsupported");
+	return LIBUSB_ERROR_INVALID_PARAM;
+}
+
+static int _hid_get_report(struct hid_device_priv* dev, HANDLE hid_handle, int id, void *data,
+						   struct windows_transfer_priv *tp, size_t *size, OVERLAPPED* overlapped,
+						   int report_type)
+{
+	uint8_t *buf;
+	DWORD ioctl_code, read_size, expected_size = (DWORD)*size;
+	int r = LIBUSB_SUCCESS;
+
+	if (tp->hid_buffer != NULL) {
+		usbi_dbg("program assertion failed: hid_buffer is not NULL");
+	}
+
+	if ((*size == 0) || (*size > MAX_HID_REPORT_SIZE)) {
+		usbi_dbg("invalid size (%d)", *size);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	switch (report_type) {
+		case HID_REPORT_TYPE_INPUT:
+			ioctl_code = IOCTL_HID_GET_INPUT_REPORT;
+			break;
+		case HID_REPORT_TYPE_FEATURE:
+			ioctl_code = IOCTL_HID_GET_FEATURE;
+			break;
+		default:
+			usbi_dbg("unknown HID report type %d", report_type);
+			return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	// Add a trailing byte to detect overflows
+	buf = (uint8_t*)calloc(expected_size+1, 1);
+	if (buf == NULL) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+	buf[0] = (uint8_t)id;	// Must be set always
+	usbi_dbg("report ID: 0x%02X", buf[0]);
+
+	tp->hid_expected_size = expected_size;
+	read_size = expected_size;
+
+	// NB: The size returned by DeviceIoControl doesn't include report IDs when not in use (0)
+	if (!DeviceIoControl(hid_handle, ioctl_code, buf, expected_size+1,
+		buf, expected_size+1, &read_size, overlapped)) {
+		if (GetLastError() != ERROR_IO_PENDING) {
+			usbi_dbg("Failed to Read HID Report: %s", windows_error_str(0));
+			safe_free(buf);
+			return LIBUSB_ERROR_IO;
+		}
+		// Asynchronous wait
+		tp->hid_buffer = buf;
+		tp->hid_dest = (uint8_t*)data; // copy dest, as not necessarily the start of the transfer buffer
+		return LIBUSB_SUCCESS;
+	}
+
+	// Transfer completed synchronously => copy and discard extra buffer
+	if (read_size == 0) {
+		usbi_warn(NULL, "program assertion failed - read completed synchronously, but no data was read");
+		*size = 0;
+	} else {
+		if (buf[0] != id) {
+			usbi_warn(NULL, "mismatched report ID (data is %02X, parameter is %02X)", buf[0], id);
+		}
+		if ((size_t)read_size > expected_size) {
+			r = LIBUSB_ERROR_OVERFLOW;
+			usbi_dbg("OVERFLOW!");
+		} else {
+			r = LIBUSB_COMPLETED;
+		}
+
+		*size = MIN((size_t)read_size, *size);
+		if (id == 0) {
+			// Discard report ID
+			memcpy(data, buf+1, *size);
+		} else {
+			memcpy(data, buf, *size);
+		}
+	}
+	safe_free(buf);
+	return r;
+}
+
+static int _hid_set_report(struct hid_device_priv* dev, HANDLE hid_handle, int id, void *data,
+						   struct windows_transfer_priv *tp, size_t *size, OVERLAPPED* overlapped,
+						   int report_type)
+{
+	uint8_t *buf = NULL;
+	DWORD ioctl_code, write_size= (DWORD)*size;
+
+	if (tp->hid_buffer != NULL) {
+		usbi_dbg("program assertion failed: hid_buffer is not NULL");
+	}
+
+	if ((*size == 0) || (*size > MAX_HID_REPORT_SIZE)) {
+		usbi_dbg("invalid size (%d)", *size);
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	switch (report_type) {
+		case HID_REPORT_TYPE_OUTPUT:
+			ioctl_code = IOCTL_HID_SET_OUTPUT_REPORT;
+			break;
+		case HID_REPORT_TYPE_FEATURE:
+			ioctl_code = IOCTL_HID_SET_FEATURE;
+			break;
+		default:
+			usbi_dbg("unknown HID report type %d", report_type);
+			return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	usbi_dbg("report ID: 0x%02X", id);
+	// When report IDs are not used (i.e. when id == 0), we must add
+	// a null report ID. Otherwise, we just use original data buffer
+	if (id == 0) {
+		write_size++;
+	}
+	buf = (uint8_t*) malloc(write_size);
+	if (buf == NULL) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+	if (id == 0) {
+		buf[0] = 0;
+		memcpy(buf + 1, data, *size);
+	} else {
+		// This seems like a waste, but if we don't duplicate the
+		// data, we'll get issues when freeing hid_buffer
+		memcpy(buf, data, *size);
+		if (buf[0] != id) {
+			usbi_warn(NULL, "mismatched report ID (data is %02X, parameter is %02X)", buf[0], id);
+		}
+	}
+
+	// NB: The size returned by DeviceIoControl doesn't include report IDs when not in use (0)
+	if (!DeviceIoControl(hid_handle, ioctl_code, buf, write_size,
+		buf, write_size, &write_size, overlapped)) {
+		if (GetLastError() != ERROR_IO_PENDING) {
+			usbi_dbg("Failed to Write HID Output Report: %s", windows_error_str(0));
+			safe_free(buf);
+			return LIBUSB_ERROR_IO;
+		}
+		tp->hid_buffer = buf;
+		tp->hid_dest = NULL;
+		return LIBUSB_SUCCESS;
+	}
+
+	// Transfer completed synchronously
+	*size = write_size;
+	if (write_size == 0) {
+		usbi_dbg("program assertion failed - write completed synchronously, but no data was written");
+	}
+	safe_free(buf);
+	return LIBUSB_COMPLETED;
+}
+
+static int _hid_class_request(struct hid_device_priv* dev, HANDLE hid_handle, int request_type,
+							  int request, int value, int _index, void *data, struct windows_transfer_priv *tp,
+							  size_t *size, OVERLAPPED* overlapped)
+{
+	int report_type = (value >> 8) & 0xFF;
+	int report_id = value & 0xFF;
+
+	if ( (LIBUSB_REQ_RECIPIENT(request_type) != LIBUSB_RECIPIENT_INTERFACE)
+	  && (LIBUSB_REQ_RECIPIENT(request_type) != LIBUSB_RECIPIENT_DEVICE) )
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	if (LIBUSB_REQ_OUT(request_type) && request == HID_REQ_SET_REPORT)
+		return _hid_set_report(dev, hid_handle, report_id, data, tp, size, overlapped, report_type);
+
+	if (LIBUSB_REQ_IN(request_type) && request == HID_REQ_GET_REPORT)
+		return _hid_get_report(dev, hid_handle, report_id, data, tp, size, overlapped, report_type);
+
+	return LIBUSB_ERROR_INVALID_PARAM;
+}
+
+
+/*
+ * HID API functions
+ */
+static int hid_init(int sub_api, struct libusb_context *ctx)
+{
+	DLL_LOAD(hid.dll, HidD_GetAttributes, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetHidGuid, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetPreparsedData, TRUE);
+	DLL_LOAD(hid.dll, HidD_FreePreparsedData, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetManufacturerString, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetProductString, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetSerialNumberString, TRUE);
+	DLL_LOAD(hid.dll, HidP_GetCaps, TRUE);
+	DLL_LOAD(hid.dll, HidD_SetNumInputBuffers, TRUE);
+	DLL_LOAD(hid.dll, HidD_SetFeature, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetFeature, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetPhysicalDescriptor, TRUE);
+	DLL_LOAD(hid.dll, HidD_GetInputReport, FALSE);
+	DLL_LOAD(hid.dll, HidD_SetOutputReport, FALSE);
+	DLL_LOAD(hid.dll, HidD_FlushQueue, TRUE);
+	DLL_LOAD(hid.dll, HidP_GetValueCaps, TRUE);
+
+	api_hid_available = true;
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_exit(int sub_api)
+{
+	return LIBUSB_SUCCESS;
+}
+
+// NB: open and close must ensure that they only handle interface of
+// the right API type, as these functions can be called wholesale from
+// composite_open(), with interfaces belonging to different APIs
+static int hid_open(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+
+	HIDD_ATTRIBUTES hid_attributes;
+	PHIDP_PREPARSED_DATA preparsed_data = NULL;
+	HIDP_CAPS capabilities;
+	HIDP_VALUE_CAPS *value_caps;
+
+	HANDLE hid_handle = INVALID_HANDLE_VALUE;
+	int i, j;
+	// report IDs handling
+	ULONG size[3];
+	const char* type[3] = {"input", "output", "feature"};
+	int nb_ids[2];	// zero and nonzero report IDs
+
+	CHECK_HID_AVAILABLE;
+	if (priv->hid == NULL) {
+		usbi_err(ctx, "program assertion failed - private HID structure is unitialized");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if ( (priv->usb_interface[i].path != NULL)
+		  && (priv->usb_interface[i].apib->id == USB_API_HID) ) {
+			hid_handle = CreateFileA(priv->usb_interface[i].path, GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ,
+				NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+			/*
+			 * http://www.lvr.com/hidfaq.htm: Why do I receive "Access denied" when attempting to access my HID?
+			 * "Windows 2000 and later have exclusive read/write access to HIDs that are configured as a system
+			 * keyboards or mice. An application can obtain a handle to a system keyboard or mouse by not
+			 * requesting READ or WRITE access with CreateFile. Applications can then use HidD_SetFeature and
+			 * HidD_GetFeature (if the device supports Feature reports)."
+			 */
+			if (hid_handle == INVALID_HANDLE_VALUE) {
+				usbi_warn(ctx, "could not open HID device in R/W mode (keyboard or mouse?) - trying without");
+				hid_handle = CreateFileA(priv->usb_interface[i].path, 0, FILE_SHARE_WRITE | FILE_SHARE_READ,
+					NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+				if (hid_handle == INVALID_HANDLE_VALUE) {
+					usbi_err(ctx, "could not open device %s (interface %d): %s", priv->path, i, windows_error_str(0));
+					switch(GetLastError()) {
+					case ERROR_FILE_NOT_FOUND:	// The device was disconnected
+						return LIBUSB_ERROR_NO_DEVICE;
+					case ERROR_ACCESS_DENIED:
+						return LIBUSB_ERROR_ACCESS;
+					default:
+						return LIBUSB_ERROR_IO;
+					}
+				}
+				priv->usb_interface[i].restricted_functionality = true;
+			}
+			handle_priv->interface_handle[i].api_handle = hid_handle;
+		}
+	}
+
+	hid_attributes.Size = sizeof(hid_attributes);
+	do {
+		if (!HidD_GetAttributes(hid_handle, &hid_attributes)) {
+			usbi_err(ctx, "could not gain access to HID top collection (HidD_GetAttributes)");
+			break;
+		}
+
+		priv->hid->vid = hid_attributes.VendorID;
+		priv->hid->pid = hid_attributes.ProductID;
+
+		// Set the maximum available input buffer size
+		for (i=32; HidD_SetNumInputBuffers(hid_handle, i); i*=2);
+		usbi_dbg("set maximum input buffer size to %d", i/2);
+
+		// Get the maximum input and output report size
+		if (!HidD_GetPreparsedData(hid_handle, &preparsed_data) || !preparsed_data) {
+			usbi_err(ctx, "could not read HID preparsed data (HidD_GetPreparsedData)");
+			break;
+		}
+		if (HidP_GetCaps(preparsed_data, &capabilities) != HIDP_STATUS_SUCCESS) {
+			usbi_err(ctx, "could not parse HID capabilities (HidP_GetCaps)");
+			break;
+		}
+
+		// Find out if interrupt will need report IDs
+		size[0] = capabilities.NumberInputValueCaps;
+		size[1] = capabilities.NumberOutputValueCaps;
+		size[2] = capabilities.NumberFeatureValueCaps;
+		for (j=HidP_Input; j<=HidP_Feature; j++) {
+			usbi_dbg("%d HID %s report value(s) found", size[j], type[j]);
+			priv->hid->uses_report_ids[j] = false;
+			if (size[j] > 0) {
+				value_caps = (HIDP_VALUE_CAPS*) calloc(size[j], sizeof(HIDP_VALUE_CAPS));
+				if ( (value_caps != NULL)
+				  && (HidP_GetValueCaps((HIDP_REPORT_TYPE)j, value_caps, &size[j], preparsed_data) == HIDP_STATUS_SUCCESS)
+				  && (size[j] >= 1) ) {
+					nb_ids[0] = 0;
+					nb_ids[1] = 0;
+					for (i=0; i<(int)size[j]; i++) {
+						usbi_dbg("  Report ID: 0x%02X", value_caps[i].ReportID);
+						if (value_caps[i].ReportID != 0) {
+							nb_ids[1]++;
+						} else {
+							nb_ids[0]++;
+						}
+					}
+					if (nb_ids[1] != 0) {
+						if (nb_ids[0] != 0) {
+							usbi_warn(ctx, "program assertion failed: zero and nonzero report IDs used for %s",
+								type[j]);
+						}
+						priv->hid->uses_report_ids[j] = true;
+					}
+				} else {
+					usbi_warn(ctx, "  could not process %s report IDs", type[j]);
+				}
+				safe_free(value_caps);
+			}
+		}
+
+		// Set the report sizes
+		priv->hid->input_report_size = capabilities.InputReportByteLength;
+		priv->hid->output_report_size = capabilities.OutputReportByteLength;
+		priv->hid->feature_report_size = capabilities.FeatureReportByteLength;
+
+		// Fetch string descriptors
+		priv->hid->string_index[0] = priv->dev_descriptor.iManufacturer;
+		if (priv->hid->string_index[0] != 0) {
+			HidD_GetManufacturerString(hid_handle, priv->hid->string[0],
+				sizeof(priv->hid->string[0]));
+		} else {
+			priv->hid->string[0][0] = 0;
+		}
+		priv->hid->string_index[1] = priv->dev_descriptor.iProduct;
+		if (priv->hid->string_index[1] != 0) {
+			HidD_GetProductString(hid_handle, priv->hid->string[1],
+				sizeof(priv->hid->string[1]));
+		} else {
+			priv->hid->string[1][0] = 0;
+		}
+		priv->hid->string_index[2] = priv->dev_descriptor.iSerialNumber;
+		if (priv->hid->string_index[2] != 0) {
+			HidD_GetSerialNumberString(hid_handle, priv->hid->string[2],
+				sizeof(priv->hid->string[2]));
+		} else {
+			priv->hid->string[2][0] = 0;
+		}
+	} while(0);
+
+	if (preparsed_data) {
+		HidD_FreePreparsedData(preparsed_data);
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static void hid_close(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	HANDLE file_handle;
+	int i;
+
+	if (!api_hid_available)
+		return;
+
+	for (i = 0; i < USB_MAXINTERFACES; i++) {
+		if (priv->usb_interface[i].apib->id == USB_API_HID) {
+			file_handle = handle_priv->interface_handle[i].api_handle;
+			if ( (file_handle != 0) && (file_handle != INVALID_HANDLE_VALUE)) {
+				CloseHandle(file_handle);
+			}
+		}
+	}
+}
+
+static int hid_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	CHECK_HID_AVAILABLE;
+
+	// NB: Disconnection detection is not possible in this function
+	if (priv->usb_interface[iface].path == NULL) {
+		return LIBUSB_ERROR_NOT_FOUND;	// invalid iface
+	}
+
+	// We use dev_handle as a flag for interface claimed
+	if (handle_priv->interface_handle[iface].dev_handle == INTERFACE_CLAIMED) {
+		return LIBUSB_ERROR_BUSY;	// already claimed
+	}
+
+	handle_priv->interface_handle[iface].dev_handle = INTERFACE_CLAIMED;
+
+	usbi_dbg("claimed interface %d", iface);
+	handle_priv->active_interface = iface;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+
+	CHECK_HID_AVAILABLE;
+
+	if (priv->usb_interface[iface].path == NULL) {
+		return LIBUSB_ERROR_NOT_FOUND;	// invalid iface
+	}
+
+	if (handle_priv->interface_handle[iface].dev_handle != INTERFACE_CLAIMED) {
+		return LIBUSB_ERROR_NOT_FOUND;	// invalid iface
+	}
+
+	handle_priv->interface_handle[iface].dev_handle = INVALID_HANDLE_VALUE;
+
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+
+	CHECK_HID_AVAILABLE;
+
+	if (altsetting > 255) {
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	if (altsetting != 0) {
+		usbi_err(ctx, "set interface altsetting not supported for altsetting >0");
+		return LIBUSB_ERROR_NOT_SUPPORTED;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	WINUSB_SETUP_PACKET *setup = (WINUSB_SETUP_PACKET *) transfer->buffer;
+	HANDLE hid_handle;
+	struct winfd wfd;
+	int current_interface, config;
+	size_t size;
+	int r = LIBUSB_ERROR_INVALID_PARAM;
+
+	CHECK_HID_AVAILABLE;
+
+	transfer_priv->pollable_fd = INVALID_WINFD;
+	safe_free(transfer_priv->hid_buffer);
+	transfer_priv->hid_dest = NULL;
+	size = transfer->length - LIBUSB_CONTROL_SETUP_SIZE;
+
+	if (size > MAX_CTRL_BUFFER_LENGTH) {
+		return LIBUSB_ERROR_INVALID_PARAM;
+	}
+
+	current_interface = get_valid_interface(transfer->dev_handle, USB_API_HID);
+	if (current_interface < 0) {
+		if (auto_claim(transfer, &current_interface, USB_API_HID) != LIBUSB_SUCCESS) {
+			return LIBUSB_ERROR_NOT_FOUND;
+		}
+	}
+
+	usbi_dbg("will use interface %d", current_interface);
+	hid_handle = handle_priv->interface_handle[current_interface].api_handle;
+	// Always use the handle returned from usbi_create_fd (wfd.handle)
+	wfd = usbi_create_fd(hid_handle, RW_READ, NULL, NULL);
+	if (wfd.fd < 0) {
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	switch(LIBUSB_REQ_TYPE(setup->request_type)) {
+	case LIBUSB_REQUEST_TYPE_STANDARD:
+		switch(setup->request) {
+		case LIBUSB_REQUEST_GET_DESCRIPTOR:
+			r = _hid_get_descriptor(priv->hid, wfd.handle, LIBUSB_REQ_RECIPIENT(setup->request_type),
+				(setup->value >> 8) & 0xFF, setup->value & 0xFF, transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE, &size);
+			break;
+		case LIBUSB_REQUEST_GET_CONFIGURATION:
+			r = windows_get_configuration(transfer->dev_handle, &config);
+			if (r == LIBUSB_SUCCESS) {
+				size = 1;
+				((uint8_t*)transfer->buffer)[LIBUSB_CONTROL_SETUP_SIZE] = (uint8_t)config;
+				r = LIBUSB_COMPLETED;
+			}
+			break;
+		case LIBUSB_REQUEST_SET_CONFIGURATION:
+			if (setup->value == priv->active_config) {
+				r = LIBUSB_COMPLETED;
+			} else {
+				usbi_warn(ctx, "cannot set configuration other than the default one");
+				r = LIBUSB_ERROR_INVALID_PARAM;
+			}
+			break;
+		case LIBUSB_REQUEST_GET_INTERFACE:
+			size = 1;
+			((uint8_t*)transfer->buffer)[LIBUSB_CONTROL_SETUP_SIZE] = 0;
+			r = LIBUSB_COMPLETED;
+			break;
+		case LIBUSB_REQUEST_SET_INTERFACE:
+			r = hid_set_interface_altsetting(0, transfer->dev_handle, setup->index, setup->value);
+			if (r == LIBUSB_SUCCESS) {
+				r = LIBUSB_COMPLETED;
+			}
+			break;
+		default:
+			usbi_warn(ctx, "unsupported HID control request");
+			r = LIBUSB_ERROR_INVALID_PARAM;
+			break;
+		}
+		break;
+	case LIBUSB_REQUEST_TYPE_CLASS:
+		r =_hid_class_request(priv->hid, wfd.handle, setup->request_type, setup->request, setup->value,
+			setup->index, transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE, transfer_priv,
+			&size, wfd.overlapped);
+		break;
+	default:
+		usbi_warn(ctx, "unsupported HID control request");
+		r = LIBUSB_ERROR_INVALID_PARAM;
+		break;
+	}
+
+	if (r == LIBUSB_COMPLETED) {
+		// Force request to be completed synchronously. Transferred size has been set by previous call
+		wfd.overlapped->Internal = STATUS_COMPLETED_SYNCHRONOUSLY;
+		// http://msdn.microsoft.com/en-us/library/ms684342%28VS.85%29.aspx
+		// set InternalHigh to the number of bytes transferred
+		wfd.overlapped->InternalHigh = (DWORD)size;
+		r = LIBUSB_SUCCESS;
+	}
+
+	if (r == LIBUSB_SUCCESS) {
+		// Use priv_transfer to store data needed for async polling
+		transfer_priv->pollable_fd = wfd;
+		transfer_priv->interface_number = (uint8_t)current_interface;
+	} else {
+		usbi_free_fd(&wfd);
+	}
+
+	return r;
+}
+
+static int hid_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	struct winfd wfd;
+	HANDLE hid_handle;
+	bool direction_in, ret;
+	int current_interface, length;
+	DWORD size;
+	int r = LIBUSB_SUCCESS;
+
+	CHECK_HID_AVAILABLE;
+
+	transfer_priv->pollable_fd = INVALID_WINFD;
+	transfer_priv->hid_dest = NULL;
+	safe_free(transfer_priv->hid_buffer);
+
+	current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cancelling transfer");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_dbg("matched endpoint %02X with interface %d", transfer->endpoint, current_interface);
+
+	hid_handle = handle_priv->interface_handle[current_interface].api_handle;
+	direction_in = transfer->endpoint & LIBUSB_ENDPOINT_IN;
+
+	wfd = usbi_create_fd(hid_handle, direction_in?RW_READ:RW_WRITE, NULL, NULL);
+	// Always use the handle returned from usbi_create_fd (wfd.handle)
+	if (wfd.fd < 0) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	// If report IDs are not in use, an extra prefix byte must be added
+	if ( ((direction_in) && (!priv->hid->uses_report_ids[0]))
+	  || ((!direction_in) && (!priv->hid->uses_report_ids[1])) ) {
+		length = transfer->length+1;
+	} else {
+		length = transfer->length;
+	}
+	// Add a trailing byte to detect overflows on input
+	transfer_priv->hid_buffer = (uint8_t*)calloc(length+1, 1);
+	if (transfer_priv->hid_buffer == NULL) {
+		return LIBUSB_ERROR_NO_MEM;
+	}
+	transfer_priv->hid_expected_size = length;
+
+	if (direction_in) {
+		transfer_priv->hid_dest = transfer->buffer;
+		usbi_dbg("reading %d bytes (report ID: 0x00)", length);
+		ret = ReadFile(wfd.handle, transfer_priv->hid_buffer, length+1, &size, wfd.overlapped);
+	} else {
+		if (!priv->hid->uses_report_ids[1]) {
+			memcpy(transfer_priv->hid_buffer+1, transfer->buffer, transfer->length);
+		} else {
+			// We could actually do without the calloc and memcpy in this case
+			memcpy(transfer_priv->hid_buffer, transfer->buffer, transfer->length);
+		}
+		usbi_dbg("writing %d bytes (report ID: 0x%02X)", length, transfer_priv->hid_buffer[0]);
+		ret = WriteFile(wfd.handle, transfer_priv->hid_buffer, length, &size, wfd.overlapped);
+	}
+	if (!ret) {
+		if (GetLastError() != ERROR_IO_PENDING) {
+			usbi_err(ctx, "HID transfer failed: %s", windows_error_str(0));
+			usbi_free_fd(&wfd);
+			safe_free(transfer_priv->hid_buffer);
+			return LIBUSB_ERROR_IO;
+		}
+	} else {
+		// Only write operations that completed synchronously need to free up
+		// hid_buffer. For reads, copy_transfer_data() handles that process.
+		if (!direction_in) {
+			safe_free(transfer_priv->hid_buffer);
+		}
+		if (size == 0) {
+			usbi_err(ctx, "program assertion failed - no data was transferred");
+			size = 1;
+		}
+		if (size > (size_t)length) {
+			usbi_err(ctx, "OVERFLOW!");
+			r = LIBUSB_ERROR_OVERFLOW;
+		}
+		wfd.overlapped->Internal = STATUS_COMPLETED_SYNCHRONOUSLY;
+		wfd.overlapped->InternalHigh = size;
+	}
+
+	transfer_priv->pollable_fd = wfd;
+	transfer_priv->interface_number = (uint8_t)current_interface;
+
+	return r;
+}
+
+static int hid_abort_transfers(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	HANDLE hid_handle;
+	int current_interface;
+
+	CHECK_HID_AVAILABLE;
+
+	current_interface = transfer_priv->interface_number;
+	hid_handle = handle_priv->interface_handle[current_interface].api_handle;
+	CancelIo(hid_handle);
+
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_reset_device(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	HANDLE hid_handle;
+	int current_interface;
+
+	CHECK_HID_AVAILABLE;
+
+	// Flushing the queues on all interfaces is the best we can achieve
+	for (current_interface = 0; current_interface < USB_MAXINTERFACES; current_interface++) {
+		hid_handle = handle_priv->interface_handle[current_interface].api_handle;
+		if ((hid_handle != 0) && (hid_handle != INVALID_HANDLE_VALUE)) {
+			HidD_FlushQueue(hid_handle);
+		}
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int hid_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	HANDLE hid_handle;
+	int current_interface;
+
+	CHECK_HID_AVAILABLE;
+
+	current_interface = interface_by_endpoint(priv, handle_priv, endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cannot clear");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_dbg("matched endpoint %02X with interface %d", endpoint, current_interface);
+	hid_handle = handle_priv->interface_handle[current_interface].api_handle;
+
+	// No endpoint selection with Microsoft's implementation, so we try to flush the
+	// whole interface. Should be OK for most case scenarios
+	if (!HidD_FlushQueue(hid_handle)) {
+		usbi_err(ctx, "Flushing of HID queue failed: %s", windows_error_str(0));
+		// Device was probably disconnected
+		return LIBUSB_ERROR_NO_DEVICE;
+	}
+
+	return LIBUSB_SUCCESS;
+}
+
+// This extra function is only needed for HID
+static int hid_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size) {
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+	int r = LIBUSB_TRANSFER_COMPLETED;
+	uint32_t corrected_size = io_size;
+
+	if (transfer_priv->hid_buffer != NULL) {
+		// If we have a valid hid_buffer, it means the transfer was async
+		if (transfer_priv->hid_dest != NULL) {	// Data readout
+			if (corrected_size > 0) {
+				// First, check for overflow
+				if (corrected_size > transfer_priv->hid_expected_size) {
+					usbi_err(ctx, "OVERFLOW!");
+					corrected_size = (uint32_t)transfer_priv->hid_expected_size;
+					r = LIBUSB_TRANSFER_OVERFLOW;
+				}
+
+				if (transfer_priv->hid_buffer[0] == 0) {
+					// Discard the 1 byte report ID prefix
+					corrected_size--;
+					memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer+1, corrected_size);
+				} else {
+					memcpy(transfer_priv->hid_dest, transfer_priv->hid_buffer, corrected_size);
+				}
+			}
+			transfer_priv->hid_dest = NULL;
+		}
+		// For write, we just need to free the hid buffer
+		safe_free(transfer_priv->hid_buffer);
+	}
+	itransfer->transferred += corrected_size;
+	return r;
+}
+
+
+/*
+ * Composite API functions
+ */
+static int composite_init(int sub_api, struct libusb_context *ctx)
+{
+	return LIBUSB_SUCCESS;
+}
+
+static int composite_exit(int sub_api)
+{
+	return LIBUSB_SUCCESS;
+}
+
+static int composite_open(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	int r = LIBUSB_ERROR_NOT_FOUND;
+	uint8_t i;
+	// SUB_API_MAX+1 as the SUB_API_MAX pos is used to indicate availability of HID
+	bool available[SUB_API_MAX+1] = {0};
+
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		switch (priv->usb_interface[i].apib->id) {
+		case USB_API_WINUSBX:
+			if (priv->usb_interface[i].sub_api != SUB_API_NOTSET)
+				available[priv->usb_interface[i].sub_api] = true;
+			break;
+		case USB_API_HID:
+			available[SUB_API_MAX] = true;
+			break;
+		default:
+			break;
+		}
+	}
+
+	for (i=0; i<SUB_API_MAX; i++) {	// WinUSB-like drivers
+		if (available[i]) {
+			r = usb_api_backend[USB_API_WINUSBX].open(i, dev_handle);
+			if (r != LIBUSB_SUCCESS) {
+				return r;
+			}
+		}
+	}
+	if (available[SUB_API_MAX]) {	// HID driver
+		r = hid_open(SUB_API_NOTSET, dev_handle);
+	}
+	return r;
+}
+
+static void composite_close(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	uint8_t i;
+	bool available[SUB_API_MAX];
+
+	for (i = 0; i<SUB_API_MAX; i++) {
+		available[i] = false;
+	}
+
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		if ( (priv->usb_interface[i].apib->id == USB_API_WINUSBX)
+		  && (priv->usb_interface[i].sub_api != SUB_API_NOTSET) ) {
+			available[priv->usb_interface[i].sub_api] = true;
+		}
+	}
+
+	for (i=0; i<SUB_API_MAX; i++) {
+		if (available[i]) {
+			usb_api_backend[USB_API_WINUSBX].close(i, dev_handle);
+		}
+	}
+}
+
+static int composite_claim_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	return priv->usb_interface[iface].apib->
+		claim_interface(priv->usb_interface[iface].sub_api, dev_handle, iface);
+}
+
+static int composite_set_interface_altsetting(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	return priv->usb_interface[iface].apib->
+		set_interface_altsetting(priv->usb_interface[iface].sub_api, dev_handle, iface, altsetting);
+}
+
+static int composite_release_interface(int sub_api, struct libusb_device_handle *dev_handle, int iface)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	return priv->usb_interface[iface].apib->
+		release_interface(priv->usb_interface[iface].sub_api, dev_handle, iface);
+}
+
+static int composite_submit_control_transfer(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int i, pass;
+
+	// Interface shouldn't matter for control, but it does in practice, with Windows'
+	// restrictions with regards to accessing HID keyboards and mice. Try a 2 pass approach
+	for (pass = 0; pass < 2; pass++) {
+		for (i=0; i<USB_MAXINTERFACES; i++) {
+			if (priv->usb_interface[i].path != NULL) {
+				if ((pass == 0) && (priv->usb_interface[i].restricted_functionality)) {
+					usbi_dbg("trying to skip restricted interface #%d (HID keyboard or mouse?)", i);
+					continue;
+				}
+				usbi_dbg("using interface %d", i);
+				return priv->usb_interface[i].apib->submit_control_transfer(priv->usb_interface[i].sub_api, itransfer);
+			}
+		}
+	}
+
+	usbi_err(ctx, "no libusb supported interfaces to complete request");
+	return LIBUSB_ERROR_NOT_FOUND;
+}
+
+static int composite_submit_bulk_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int current_interface;
+
+	current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cancelling transfer");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	return priv->usb_interface[current_interface].apib->
+		submit_bulk_transfer(priv->usb_interface[current_interface].sub_api, itransfer);}
+
+static int composite_submit_iso_transfer(int sub_api, struct usbi_transfer *itransfer) {
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(transfer->dev_handle);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+	int current_interface;
+
+	current_interface = interface_by_endpoint(priv, handle_priv, transfer->endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cancelling transfer");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	return priv->usb_interface[current_interface].apib->
+		submit_iso_transfer(priv->usb_interface[current_interface].sub_api, itransfer);}
+
+static int composite_clear_halt(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint)
+{
+	struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);
+	struct windows_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	int current_interface;
+
+	current_interface = interface_by_endpoint(priv, handle_priv, endpoint);
+	if (current_interface < 0) {
+		usbi_err(ctx, "unable to match endpoint to an open interface - cannot clear");
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	return priv->usb_interface[current_interface].apib->
+		clear_halt(priv->usb_interface[current_interface].sub_api, dev_handle, endpoint);}
+
+static int composite_abort_control(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+
+	return priv->usb_interface[transfer_priv->interface_number].apib->
+		abort_control(priv->usb_interface[transfer_priv->interface_number].sub_api, itransfer);}
+
+static int composite_abort_transfers(int sub_api, struct usbi_transfer *itransfer)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+
+	return priv->usb_interface[transfer_priv->interface_number].apib->
+		abort_transfers(priv->usb_interface[transfer_priv->interface_number].sub_api, itransfer);}
+
+static int composite_reset_device(int sub_api, struct libusb_device_handle *dev_handle)
+{
+	struct windows_device_priv *priv = _device_priv(dev_handle->dev);
+	int r;
+	uint8_t i; 
+	bool available[SUB_API_MAX];
+	for (i = 0; i<SUB_API_MAX; i++) {
+		available[i] = false;
+	}
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		if ( (priv->usb_interface[i].apib->id == USB_API_WINUSBX)
+		  && (priv->usb_interface[i].sub_api != SUB_API_NOTSET) ) {
+			available[priv->usb_interface[i].sub_api] = true;
+		}
+	}
+	for (i=0; i<SUB_API_MAX; i++) {
+		if (available[i]) {
+			r = usb_api_backend[USB_API_WINUSBX].reset_device(i, dev_handle);
+			if (r != LIBUSB_SUCCESS) {
+				return r;
+			}
+		}
+	}
+	return LIBUSB_SUCCESS;
+}
+
+static int composite_copy_transfer_data(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size)
+{
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+	struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+	struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
+
+	return priv->usb_interface[transfer_priv->interface_number].apib->
+		copy_transfer_data(priv->usb_interface[transfer_priv->interface_number].sub_api, itransfer, io_size);
+}
diff --git a/Externals/libusb/libusb/os/windows_usb.h b/Externals/libusb/libusb/os/windows_usb.h
new file mode 100644
index 0000000000..413adfc492
--- /dev/null
+++ b/Externals/libusb/libusb/os/windows_usb.h
@@ -0,0 +1,958 @@
+/*
+ * Windows backend for libusb 1.0
+ * Copyright © 2009-2012 Pete Batard <pete@akeo.ie>
+ * With contributions from Michael Plante, Orin Eman et al.
+ * Parts of this code adapted from libusb-win32-v1 by Stephan Meyer
+ * Major code testing contribution by Xiaofan Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#include "windows_common.h"
+
+#if defined(_MSC_VER)
+// disable /W4 MSVC warnings that are benign
+#pragma warning(disable:4127) // conditional expression is constant
+#pragma warning(disable:4100) // unreferenced formal parameter
+#pragma warning(disable:4214) // bit field types other than int
+#pragma warning(disable:4201) // nameless struct/union
+#endif
+
+// Missing from MSVC6 setupapi.h
+#if !defined(SPDRP_ADDRESS)
+#define SPDRP_ADDRESS	28
+#endif
+#if !defined(SPDRP_INSTALL_STATE)
+#define SPDRP_INSTALL_STATE	34
+#endif
+
+// Missing from MinGW
+#if !defined(FACILITY_SETUPAPI)
+#define FACILITY_SETUPAPI	15
+#endif
+
+#if defined(__CYGWIN__ )
+#define _stricmp stricmp
+// cygwin produces a warning unless these prototypes are defined
+extern int _snprintf(char *buffer, size_t count, const char *format, ...);
+extern char *_strdup(const char *strSource);
+// _beginthreadex is MSVCRT => unavailable for cygwin. Fallback to using CreateThread
+#define _beginthreadex(a, b, c, d, e, f) CreateThread(a, b, (LPTHREAD_START_ROUTINE)c, d, e, f)
+#endif
+
+#define MAX_CTRL_BUFFER_LENGTH      4096
+#define MAX_USB_DEVICES             256
+#define MAX_USB_STRING_LENGTH       128
+#define MAX_HID_REPORT_SIZE         1024
+#define MAX_HID_DESCRIPTOR_SIZE     256
+#define MAX_GUID_STRING_LENGTH      40
+#define MAX_PATH_LENGTH             128
+#define MAX_KEY_LENGTH              256
+#define LIST_SEPARATOR              ';'
+#define HTAB_SIZE                   1021
+
+// Handle code for HID interface that have been claimed ("dibs")
+#define INTERFACE_CLAIMED           ((HANDLE)(intptr_t)0xD1B5)
+// Additional return code for HID operations that completed synchronously
+#define LIBUSB_COMPLETED            (LIBUSB_SUCCESS + 1)
+
+// http://msdn.microsoft.com/en-us/library/ff545978.aspx
+// http://msdn.microsoft.com/en-us/library/ff545972.aspx
+// http://msdn.microsoft.com/en-us/library/ff545982.aspx
+#if !defined(GUID_DEVINTERFACE_USB_HOST_CONTROLLER)
+const GUID GUID_DEVINTERFACE_USB_HOST_CONTROLLER = { 0x3ABF6F2D, 0x71C4, 0x462A, {0x8A, 0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27} };
+#endif
+#if !defined(GUID_DEVINTERFACE_USB_DEVICE)
+const GUID GUID_DEVINTERFACE_USB_DEVICE = { 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED} };
+#endif
+#if !defined(GUID_DEVINTERFACE_USB_HUB)
+const GUID GUID_DEVINTERFACE_USB_HUB = { 0xF18A0E88, 0xC30C, 0x11D0, {0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8} };
+#endif
+#if !defined(GUID_DEVINTERFACE_LIBUSB0_FILTER)
+const GUID GUID_DEVINTERFACE_LIBUSB0_FILTER = { 0xF9F3FF14, 0xAE21, 0x48A0, {0x8A, 0x25, 0x80, 0x11, 0xA7, 0xA9, 0x31, 0xD9} };
+#endif
+
+
+/*
+ * Multiple USB API backend support
+ */
+#define USB_API_UNSUPPORTED 0
+#define USB_API_HUB         1
+#define USB_API_COMPOSITE   2
+#define USB_API_WINUSBX     3
+#define USB_API_HID         4
+#define USB_API_MAX         5
+// The following is used to indicate if the HID or composite extra props have already been set.
+#define USB_API_SET         (1<<USB_API_MAX) 
+
+// Sub-APIs for WinUSB-like driver APIs (WinUSB, libusbK, libusb-win32 through the libusbK DLL)
+// Must have the same values as the KUSB_DRVID enum from libusbk.h
+#define SUB_API_NOTSET      -1
+#define SUB_API_LIBUSBK     0
+#define SUB_API_LIBUSB0     1
+#define SUB_API_WINUSB      2
+#define SUB_API_MAX         3
+
+#define WINUSBX_DRV_NAMES   { "libusbK", "libusb0", "WinUSB"}
+
+struct windows_usb_api_backend {
+	const uint8_t id;
+	const char* designation;
+	const char **driver_name_list; // Driver name, without .sys, e.g. "usbccgp"
+	const uint8_t nb_driver_names;
+	int (*init)(int sub_api, struct libusb_context *ctx);
+	int (*exit)(int sub_api);
+	int (*open)(int sub_api, struct libusb_device_handle *dev_handle);
+	void (*close)(int sub_api, struct libusb_device_handle *dev_handle);
+	int (*configure_endpoints)(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+	int (*claim_interface)(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+	int (*set_interface_altsetting)(int sub_api, struct libusb_device_handle *dev_handle, int iface, int altsetting);
+	int (*release_interface)(int sub_api, struct libusb_device_handle *dev_handle, int iface);
+	int (*clear_halt)(int sub_api, struct libusb_device_handle *dev_handle, unsigned char endpoint);
+	int (*reset_device)(int sub_api, struct libusb_device_handle *dev_handle);
+	int (*submit_bulk_transfer)(int sub_api, struct usbi_transfer *itransfer);
+	int (*submit_iso_transfer)(int sub_api, struct usbi_transfer *itransfer);
+	int (*submit_control_transfer)(int sub_api, struct usbi_transfer *itransfer);
+	int (*abort_control)(int sub_api, struct usbi_transfer *itransfer);
+	int (*abort_transfers)(int sub_api, struct usbi_transfer *itransfer);
+	int (*copy_transfer_data)(int sub_api, struct usbi_transfer *itransfer, uint32_t io_size);
+};
+
+extern const struct windows_usb_api_backend usb_api_backend[USB_API_MAX];
+
+#define PRINT_UNSUPPORTED_API(fname)              \
+	usbi_dbg("unsupported API call for '"         \
+		#fname "' (unrecognized device driver)"); \
+	return LIBUSB_ERROR_NOT_SUPPORTED;
+
+/*
+ * private structures definition
+ * with inline pseudo constructors/destructors
+ */
+
+// TODO (v2+): move hid desc to libusb.h?
+struct libusb_hid_descriptor {
+	uint8_t  bLength;
+	uint8_t  bDescriptorType;
+	uint16_t bcdHID;
+	uint8_t  bCountryCode;
+	uint8_t  bNumDescriptors;
+	uint8_t  bClassDescriptorType;
+	uint16_t wClassDescriptorLength;
+};
+#define LIBUSB_DT_HID_SIZE              9
+#define HID_MAX_CONFIG_DESC_SIZE (LIBUSB_DT_CONFIG_SIZE + LIBUSB_DT_INTERFACE_SIZE \
+	+ LIBUSB_DT_HID_SIZE + 2 * LIBUSB_DT_ENDPOINT_SIZE)
+#define HID_MAX_REPORT_SIZE             1024
+#define HID_IN_EP                       0x81
+#define HID_OUT_EP                      0x02
+#define LIBUSB_REQ_RECIPIENT(request_type) ((request_type) & 0x1F)
+#define LIBUSB_REQ_TYPE(request_type) ((request_type) & (0x03 << 5))
+#define LIBUSB_REQ_IN(request_type) ((request_type) & LIBUSB_ENDPOINT_IN)
+#define LIBUSB_REQ_OUT(request_type) (!LIBUSB_REQ_IN(request_type))
+
+// The following are used for HID reports IOCTLs
+#define HID_CTL_CODE(id) \
+  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_NEITHER, FILE_ANY_ACCESS)
+#define HID_BUFFER_CTL_CODE(id) \
+  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define HID_IN_CTL_CODE(id) \
+  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_IN_DIRECT, FILE_ANY_ACCESS)
+#define HID_OUT_CTL_CODE(id) \
+  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
+
+#define IOCTL_HID_GET_FEATURE                 HID_OUT_CTL_CODE(100)
+#define IOCTL_HID_GET_INPUT_REPORT            HID_OUT_CTL_CODE(104)
+#define IOCTL_HID_SET_FEATURE                 HID_IN_CTL_CODE(100)
+#define IOCTL_HID_SET_OUTPUT_REPORT           HID_IN_CTL_CODE(101)
+
+enum libusb_hid_request_type {
+	HID_REQ_GET_REPORT = 0x01,
+	HID_REQ_GET_IDLE = 0x02,
+	HID_REQ_GET_PROTOCOL = 0x03,
+	HID_REQ_SET_REPORT = 0x09,
+	HID_REQ_SET_IDLE = 0x0A,
+	HID_REQ_SET_PROTOCOL = 0x0B
+};
+
+enum libusb_hid_report_type {
+	HID_REPORT_TYPE_INPUT = 0x01,
+	HID_REPORT_TYPE_OUTPUT = 0x02,
+	HID_REPORT_TYPE_FEATURE = 0x03
+};
+
+struct hid_device_priv {
+	uint16_t vid;
+	uint16_t pid;
+	uint8_t config;
+	uint8_t nb_interfaces;
+	bool uses_report_ids[3];	// input, ouptput, feature
+	uint16_t input_report_size;
+	uint16_t output_report_size;
+	uint16_t feature_report_size;
+	WCHAR string[3][MAX_USB_STRING_LENGTH];
+	uint8_t string_index[3];	// man, prod, ser
+};
+
+typedef struct libusb_device_descriptor USB_DEVICE_DESCRIPTOR, *PUSB_DEVICE_DESCRIPTOR;
+struct windows_device_priv {
+	uint8_t depth;						// distance to HCD
+	uint8_t port;						// port number on the hub
+	uint8_t active_config;
+	struct libusb_device *parent_dev;	// access to parent is required for usermode ops
+	struct windows_usb_api_backend const *apib;
+	char *path;							// device interface path
+	int sub_api;						// for WinUSB-like APIs
+	struct {
+		char *path;						// each interface needs a device interface path,
+		struct windows_usb_api_backend const *apib; // an API backend (multiple drivers support),
+		int sub_api;
+		int8_t nb_endpoints;			// and a set of endpoint addresses (USB_MAXENDPOINTS)
+		uint8_t *endpoint;
+		bool restricted_functionality;	// indicates if the interface functionality is restricted
+										// by Windows (eg. HID keyboards or mice cannot do R/W)
+	} usb_interface[USB_MAXINTERFACES];
+	struct hid_device_priv *hid;
+	USB_DEVICE_DESCRIPTOR dev_descriptor;
+	unsigned char **config_descriptor;	// list of pointers to the cached config descriptors
+};
+
+static inline struct windows_device_priv *_device_priv(struct libusb_device *dev) {
+	return (struct windows_device_priv *)dev->os_priv;
+}
+
+static inline void windows_device_priv_init(libusb_device* dev) {
+	struct windows_device_priv* p = _device_priv(dev);
+	int i;
+	p->depth = 0;
+	p->port = 0;
+	p->parent_dev = NULL;
+	p->path = NULL;
+	p->apib = &usb_api_backend[USB_API_UNSUPPORTED];
+	p->sub_api = SUB_API_NOTSET;
+	p->hid = NULL;
+	p->active_config = 0;
+	p->config_descriptor = NULL;
+	memset(&(p->dev_descriptor), 0, sizeof(USB_DEVICE_DESCRIPTOR));
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		p->usb_interface[i].path = NULL;
+		p->usb_interface[i].apib = &usb_api_backend[USB_API_UNSUPPORTED];
+		p->usb_interface[i].sub_api = SUB_API_NOTSET;
+		p->usb_interface[i].nb_endpoints = 0;
+		p->usb_interface[i].endpoint = NULL;
+		p->usb_interface[i].restricted_functionality = false;
+	}
+}
+
+static inline void windows_device_priv_release(libusb_device* dev) {
+	struct windows_device_priv* p = _device_priv(dev);
+	int i;
+	safe_free(p->path);
+	if ((dev->num_configurations > 0) && (p->config_descriptor != NULL)) {
+		for (i=0; i < dev->num_configurations; i++)
+			safe_free(p->config_descriptor[i]);
+	}
+	safe_free(p->config_descriptor);
+	safe_free(p->hid);
+	for (i=0; i<USB_MAXINTERFACES; i++) {
+		safe_free(p->usb_interface[i].path);
+		safe_free(p->usb_interface[i].endpoint);
+	}
+}
+
+struct interface_handle_t {
+	HANDLE dev_handle; // WinUSB needs an extra handle for the file
+	HANDLE api_handle; // used by the API to communicate with the device
+};
+
+struct windows_device_handle_priv {
+	int active_interface;
+	struct interface_handle_t interface_handle[USB_MAXINTERFACES];
+	int autoclaim_count[USB_MAXINTERFACES]; // For auto-release
+};
+
+static inline struct windows_device_handle_priv *_device_handle_priv(
+	struct libusb_device_handle *handle)
+{
+	return (struct windows_device_handle_priv *) handle->os_priv;
+}
+
+// used for async polling functions
+struct windows_transfer_priv {
+	struct winfd pollable_fd;
+	uint8_t interface_number;
+	uint8_t *hid_buffer; // 1 byte extended data buffer, required for HID
+	uint8_t *hid_dest;   // transfer buffer destination, required for HID
+	size_t hid_expected_size;
+};
+
+// used to match a device driver (including filter drivers) against a supported API
+struct driver_lookup {
+	char list[MAX_KEY_LENGTH+1];// REG_MULTI_SZ list of services (driver) names
+	const DWORD reg_prop;		// SPDRP registry key to use to retreive list
+	const char* designation;	// internal designation (for debug output)
+};
+
+/* OLE32 dependency */
+DLL_DECLARE_PREFIXED(WINAPI, HRESULT, p, CLSIDFromString, (LPCOLESTR, LPCLSID));
+
+/* This call is only available from XP SP2 */
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, IsWow64Process, (HANDLE, PBOOL));
+
+/* SetupAPI dependencies */
+DLL_DECLARE_PREFIXED(WINAPI, HDEVINFO, p, SetupDiGetClassDevsA, (const GUID*, PCSTR, HWND, DWORD));
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiEnumDeviceInfo, (HDEVINFO, DWORD, PSP_DEVINFO_DATA));
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiEnumDeviceInterfaces, (HDEVINFO, PSP_DEVINFO_DATA,
+			const GUID*, DWORD, PSP_DEVICE_INTERFACE_DATA));
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiGetDeviceInterfaceDetailA, (HDEVINFO, PSP_DEVICE_INTERFACE_DATA,
+			PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA));
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiDestroyDeviceInfoList, (HDEVINFO));
+DLL_DECLARE_PREFIXED(WINAPI, HKEY, p, SetupDiOpenDevRegKey, (HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM));
+DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiGetDeviceRegistryPropertyA, (HDEVINFO,
+			PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD));
+DLL_DECLARE_PREFIXED(WINAPI, HKEY, p, SetupDiOpenDeviceInterfaceRegKey, (HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, DWORD));
+DLL_DECLARE_PREFIXED(WINAPI, LONG, p, RegQueryValueExW, (HKEY, LPCWSTR, LPDWORD, LPDWORD, LPBYTE, LPDWORD));
+DLL_DECLARE_PREFIXED(WINAPI, LONG, p, RegCloseKey, (HKEY));
+
+/*
+ * Windows DDK API definitions. Most of it copied from MinGW's includes
+ */
+typedef DWORD DEVNODE, DEVINST;
+typedef DEVNODE *PDEVNODE, *PDEVINST;
+typedef DWORD RETURN_TYPE;
+typedef RETURN_TYPE CONFIGRET;
+
+#define CR_SUCCESS                              0x00000000
+#define CR_NO_SUCH_DEVNODE                      0x0000000D
+
+#define USB_DEVICE_DESCRIPTOR_TYPE              LIBUSB_DT_DEVICE
+#define USB_CONFIGURATION_DESCRIPTOR_TYPE       LIBUSB_DT_CONFIG
+#define USB_STRING_DESCRIPTOR_TYPE              LIBUSB_DT_STRING
+#define USB_INTERFACE_DESCRIPTOR_TYPE           LIBUSB_DT_INTERFACE
+#define USB_ENDPOINT_DESCRIPTOR_TYPE            LIBUSB_DT_ENDPOINT
+
+#define USB_REQUEST_GET_STATUS                  LIBUSB_REQUEST_GET_STATUS
+#define USB_REQUEST_CLEAR_FEATURE               LIBUSB_REQUEST_CLEAR_FEATURE
+#define USB_REQUEST_SET_FEATURE                 LIBUSB_REQUEST_SET_FEATURE
+#define USB_REQUEST_SET_ADDRESS                 LIBUSB_REQUEST_SET_ADDRESS
+#define USB_REQUEST_GET_DESCRIPTOR              LIBUSB_REQUEST_GET_DESCRIPTOR
+#define USB_REQUEST_SET_DESCRIPTOR              LIBUSB_REQUEST_SET_DESCRIPTOR
+#define USB_REQUEST_GET_CONFIGURATION           LIBUSB_REQUEST_GET_CONFIGURATION
+#define USB_REQUEST_SET_CONFIGURATION           LIBUSB_REQUEST_SET_CONFIGURATION
+#define USB_REQUEST_GET_INTERFACE               LIBUSB_REQUEST_GET_INTERFACE
+#define USB_REQUEST_SET_INTERFACE               LIBUSB_REQUEST_SET_INTERFACE
+#define USB_REQUEST_SYNC_FRAME                  LIBUSB_REQUEST_SYNCH_FRAME
+
+#define USB_GET_NODE_INFORMATION                258
+#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260
+#define USB_GET_NODE_CONNECTION_NAME            261
+#define USB_GET_HUB_CAPABILITIES                271
+#if !defined(USB_GET_NODE_CONNECTION_INFORMATION_EX)
+#define USB_GET_NODE_CONNECTION_INFORMATION_EX  274
+#endif
+#if !defined(USB_GET_HUB_CAPABILITIES_EX)
+#define USB_GET_HUB_CAPABILITIES_EX             276
+#endif
+#if !defined(USB_GET_NODE_CONNECTION_INFORMATION_EX_V2)
+#define USB_GET_NODE_CONNECTION_INFORMATION_EX_V2 279
+#endif
+
+#ifndef METHOD_BUFFERED
+#define METHOD_BUFFERED                         0
+#endif
+#ifndef FILE_ANY_ACCESS
+#define FILE_ANY_ACCESS                         0x00000000
+#endif
+#ifndef FILE_DEVICE_UNKNOWN
+#define FILE_DEVICE_UNKNOWN                     0x00000022
+#endif
+#ifndef FILE_DEVICE_USB
+#define FILE_DEVICE_USB                         FILE_DEVICE_UNKNOWN
+#endif
+
+#ifndef CTL_CODE
+#define CTL_CODE(DeviceType, Function, Method, Access)( \
+  ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
+#endif
+
+typedef enum USB_CONNECTION_STATUS {
+	NoDeviceConnected,
+	DeviceConnected,
+	DeviceFailedEnumeration,
+	DeviceGeneralFailure,
+	DeviceCausedOvercurrent,
+	DeviceNotEnoughPower,
+	DeviceNotEnoughBandwidth,
+	DeviceHubNestedTooDeeply,
+	DeviceInLegacyHub
+} USB_CONNECTION_STATUS, *PUSB_CONNECTION_STATUS;
+
+typedef enum USB_HUB_NODE {
+	UsbHub,
+	UsbMIParent
+} USB_HUB_NODE;
+
+/* Cfgmgr32.dll interface */
+DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Parent, (PDEVINST, DEVINST, ULONG));
+DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Child, (PDEVINST, DEVINST, ULONG));
+DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Sibling, (PDEVINST, DEVINST, ULONG));
+DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Device_IDA, (DEVINST, PCHAR, ULONG, ULONG));
+
+#define IOCTL_USB_GET_HUB_CAPABILITIES_EX \
+  CTL_CODE( FILE_DEVICE_USB, USB_GET_HUB_CAPABILITIES_EX, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_HUB_CAPABILITIES \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_HUB_CAPABILITIES, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_ROOT_HUB_NAME \
+  CTL_CODE(FILE_DEVICE_USB, HCD_GET_ROOT_HUB_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_NODE_INFORMATION \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_INFORMATION, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2 \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_NODE_CONNECTION_ATTRIBUTES \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_ATTRIBUTES, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_USB_GET_NODE_CONNECTION_NAME \
+  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+// Most of the structures below need to be packed
+#pragma pack(push, 1)
+
+typedef struct USB_INTERFACE_DESCRIPTOR {
+  UCHAR  bLength;
+  UCHAR  bDescriptorType;
+  UCHAR  bInterfaceNumber;
+  UCHAR  bAlternateSetting;
+  UCHAR  bNumEndpoints;
+  UCHAR  bInterfaceClass;
+  UCHAR  bInterfaceSubClass;
+  UCHAR  bInterfaceProtocol;
+  UCHAR  iInterface;
+} USB_INTERFACE_DESCRIPTOR, *PUSB_INTERFACE_DESCRIPTOR;
+
+typedef struct USB_CONFIGURATION_DESCRIPTOR {
+  UCHAR  bLength;
+  UCHAR  bDescriptorType;
+  USHORT wTotalLength;
+  UCHAR  bNumInterfaces;
+  UCHAR  bConfigurationValue;
+  UCHAR  iConfiguration;
+  UCHAR  bmAttributes;
+  UCHAR  MaxPower;
+} USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR;
+
+typedef struct USB_CONFIGURATION_DESCRIPTOR_SHORT {
+	struct {
+		ULONG ConnectionIndex;
+		struct {
+			UCHAR bmRequest;
+			UCHAR bRequest;
+			USHORT wValue;
+			USHORT wIndex;
+			USHORT wLength;
+		} SetupPacket;
+	} req;
+	USB_CONFIGURATION_DESCRIPTOR data;
+} USB_CONFIGURATION_DESCRIPTOR_SHORT;
+
+typedef struct USB_ENDPOINT_DESCRIPTOR {
+  UCHAR  bLength;
+  UCHAR  bDescriptorType;
+  UCHAR  bEndpointAddress;
+  UCHAR  bmAttributes;
+  USHORT  wMaxPacketSize;
+  UCHAR  bInterval;
+} USB_ENDPOINT_DESCRIPTOR, *PUSB_ENDPOINT_DESCRIPTOR;
+
+typedef struct USB_DESCRIPTOR_REQUEST {
+	ULONG  ConnectionIndex;
+	struct {
+		UCHAR  bmRequest;
+		UCHAR  bRequest;
+		USHORT  wValue;
+		USHORT  wIndex;
+		USHORT  wLength;
+	} SetupPacket;
+//	UCHAR  Data[0];
+} USB_DESCRIPTOR_REQUEST, *PUSB_DESCRIPTOR_REQUEST;
+
+typedef struct USB_HUB_DESCRIPTOR {
+	UCHAR  bDescriptorLength;
+	UCHAR  bDescriptorType;
+	UCHAR  bNumberOfPorts;
+	USHORT  wHubCharacteristics;
+	UCHAR  bPowerOnToPowerGood;
+	UCHAR  bHubControlCurrent;
+	UCHAR  bRemoveAndPowerMask[64];
+} USB_HUB_DESCRIPTOR, *PUSB_HUB_DESCRIPTOR;
+
+typedef struct USB_ROOT_HUB_NAME {
+	ULONG  ActualLength;
+	WCHAR  RootHubName[1];
+} USB_ROOT_HUB_NAME, *PUSB_ROOT_HUB_NAME;
+
+typedef struct USB_ROOT_HUB_NAME_FIXED {
+	ULONG ActualLength;
+	WCHAR RootHubName[MAX_PATH_LENGTH];
+} USB_ROOT_HUB_NAME_FIXED;
+
+typedef struct USB_NODE_CONNECTION_NAME {
+	ULONG  ConnectionIndex;
+	ULONG  ActualLength;
+	WCHAR  NodeName[1];
+} USB_NODE_CONNECTION_NAME, *PUSB_NODE_CONNECTION_NAME;
+
+typedef struct USB_NODE_CONNECTION_NAME_FIXED {
+	ULONG ConnectionIndex;
+	ULONG ActualLength;
+	WCHAR NodeName[MAX_PATH_LENGTH];
+} USB_NODE_CONNECTION_NAME_FIXED;
+
+typedef struct USB_HUB_NAME_FIXED {
+	union {
+		USB_ROOT_HUB_NAME_FIXED root;
+		USB_NODE_CONNECTION_NAME_FIXED node;
+	} u;
+} USB_HUB_NAME_FIXED;
+
+typedef struct USB_HUB_INFORMATION {
+	USB_HUB_DESCRIPTOR  HubDescriptor;
+	BOOLEAN  HubIsBusPowered;
+} USB_HUB_INFORMATION, *PUSB_HUB_INFORMATION;
+
+typedef struct USB_MI_PARENT_INFORMATION {
+  ULONG  NumberOfInterfaces;
+} USB_MI_PARENT_INFORMATION, *PUSB_MI_PARENT_INFORMATION;
+
+typedef struct USB_NODE_INFORMATION {
+	USB_HUB_NODE  NodeType;
+	union {
+		USB_HUB_INFORMATION  HubInformation;
+		USB_MI_PARENT_INFORMATION  MiParentInformation;
+	} u;
+} USB_NODE_INFORMATION, *PUSB_NODE_INFORMATION;
+
+typedef struct USB_PIPE_INFO {
+	USB_ENDPOINT_DESCRIPTOR  EndpointDescriptor;
+	ULONG  ScheduleOffset;
+} USB_PIPE_INFO, *PUSB_PIPE_INFO;
+
+typedef struct USB_NODE_CONNECTION_INFORMATION_EX {
+	ULONG  ConnectionIndex;
+	USB_DEVICE_DESCRIPTOR  DeviceDescriptor;
+	UCHAR  CurrentConfigurationValue;
+	UCHAR  Speed;
+	BOOLEAN  DeviceIsHub;
+	USHORT  DeviceAddress;
+	ULONG  NumberOfOpenPipes;
+	USB_CONNECTION_STATUS  ConnectionStatus;
+//	USB_PIPE_INFO  PipeList[0];
+} USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX;
+
+typedef union _USB_PROTOCOLS {
+	ULONG  ul;
+	struct {
+		ULONG Usb110:1;
+		ULONG Usb200:1;
+		ULONG Usb300:1;
+		ULONG ReservedMBZ:29;
+	};
+} USB_PROTOCOLS, *PUSB_PROTOCOLS;
+
+typedef union _USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS {
+	ULONG ul;
+	struct {
+		ULONG DeviceIsOperatingAtSuperSpeedOrHigher:1;
+		ULONG DeviceIsSuperSpeedCapableOrHigher:1;
+		ULONG ReservedMBZ:30;
+	};
+} USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS;
+
+typedef struct _USB_NODE_CONNECTION_INFORMATION_EX_V2 {
+	ULONG ConnectionIndex;
+	ULONG Length;
+	USB_PROTOCOLS SupportedUsbProtocols;
+	USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS Flags;
+} USB_NODE_CONNECTION_INFORMATION_EX_V2, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2;
+
+typedef struct USB_HUB_CAP_FLAGS {
+	ULONG HubIsHighSpeedCapable:1;
+	ULONG HubIsHighSpeed:1;
+	ULONG HubIsMultiTtCapable:1;
+	ULONG HubIsMultiTt:1;
+	ULONG HubIsRoot:1;
+	ULONG HubIsArmedWakeOnConnect:1;
+	ULONG ReservedMBZ:26;
+} USB_HUB_CAP_FLAGS, *PUSB_HUB_CAP_FLAGS;
+
+typedef struct USB_HUB_CAPABILITIES {
+  ULONG  HubIs2xCapable : 1;
+} USB_HUB_CAPABILITIES, *PUSB_HUB_CAPABILITIES;
+
+typedef struct USB_HUB_CAPABILITIES_EX {
+	USB_HUB_CAP_FLAGS CapabilityFlags;
+} USB_HUB_CAPABILITIES_EX, *PUSB_HUB_CAPABILITIES_EX;
+
+#pragma pack(pop)
+
+/* winusb.dll interface */
+
+#define SHORT_PACKET_TERMINATE  0x01
+#define AUTO_CLEAR_STALL        0x02
+#define PIPE_TRANSFER_TIMEOUT   0x03
+#define IGNORE_SHORT_PACKETS    0x04
+#define ALLOW_PARTIAL_READS     0x05
+#define AUTO_FLUSH              0x06
+#define RAW_IO                  0x07
+#define MAXIMUM_TRANSFER_SIZE   0x08
+#define AUTO_SUSPEND            0x81
+#define SUSPEND_DELAY           0x83
+#define DEVICE_SPEED            0x01
+#define LowSpeed                0x01
+#define FullSpeed               0x02
+#define HighSpeed               0x03
+
+typedef enum USBD_PIPE_TYPE {
+	UsbdPipeTypeControl,
+	UsbdPipeTypeIsochronous,
+	UsbdPipeTypeBulk,
+	UsbdPipeTypeInterrupt
+} USBD_PIPE_TYPE;
+
+typedef struct {
+  USBD_PIPE_TYPE PipeType;
+  UCHAR          PipeId;
+  USHORT         MaximumPacketSize;
+  UCHAR          Interval;
+} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION;
+
+#pragma pack(1)
+typedef struct {
+  UCHAR  request_type;
+  UCHAR  request;
+  USHORT value;
+  USHORT index;
+  USHORT length;
+} WINUSB_SETUP_PACKET, *PWINUSB_SETUP_PACKET;
+#pragma pack()
+
+typedef void *WINUSB_INTERFACE_HANDLE, *PWINUSB_INTERFACE_HANDLE;
+
+typedef BOOL (WINAPI *WinUsb_AbortPipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID
+);
+typedef BOOL (WINAPI *WinUsb_ControlTransfer_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	WINUSB_SETUP_PACKET SetupPacket,
+	PUCHAR Buffer,
+	ULONG BufferLength,
+	PULONG LengthTransferred,
+	LPOVERLAPPED Overlapped
+);
+typedef BOOL (WINAPI *WinUsb_FlushPipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID
+);
+typedef BOOL (WINAPI *WinUsb_Free_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle
+);
+typedef BOOL (WINAPI *WinUsb_GetAssociatedInterface_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR AssociatedInterfaceIndex,
+	PWINUSB_INTERFACE_HANDLE AssociatedInterfaceHandle
+);
+typedef BOOL (WINAPI *WinUsb_GetCurrentAlternateSetting_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	PUCHAR AlternateSetting
+);
+typedef BOOL (WINAPI *WinUsb_GetDescriptor_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR DescriptorType,
+	UCHAR Index,
+	USHORT LanguageID,
+	PUCHAR Buffer,
+	ULONG BufferLength,
+	PULONG LengthTransferred
+);
+typedef BOOL (WINAPI *WinUsb_GetOverlappedResult_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	LPOVERLAPPED lpOverlapped,
+	LPDWORD lpNumberOfBytesTransferred,
+	BOOL bWait
+);
+typedef BOOL (WINAPI *WinUsb_GetPipePolicy_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID,
+	ULONG PolicyType,
+	PULONG ValueLength,
+	PVOID Value
+);
+typedef BOOL (WINAPI *WinUsb_GetPowerPolicy_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	ULONG PolicyType,
+	PULONG ValueLength,
+	PVOID Value
+);
+typedef BOOL (WINAPI *WinUsb_Initialize_t)(
+	HANDLE DeviceHandle,
+	PWINUSB_INTERFACE_HANDLE InterfaceHandle
+);
+typedef BOOL (WINAPI *WinUsb_QueryDeviceInformation_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	ULONG InformationType,
+	PULONG BufferLength,
+	PVOID Buffer
+);
+typedef BOOL (WINAPI *WinUsb_QueryInterfaceSettings_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR AlternateSettingNumber,
+	PUSB_INTERFACE_DESCRIPTOR UsbAltInterfaceDescriptor
+);
+typedef BOOL (WINAPI *WinUsb_QueryPipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR AlternateInterfaceNumber,
+	UCHAR PipeIndex,
+	PWINUSB_PIPE_INFORMATION PipeInformation
+);
+typedef BOOL (WINAPI *WinUsb_ReadPipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID,
+	PUCHAR Buffer,
+	ULONG BufferLength,
+	PULONG LengthTransferred,
+	LPOVERLAPPED Overlapped
+);
+typedef BOOL (WINAPI *WinUsb_ResetPipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID
+);
+typedef BOOL (WINAPI *WinUsb_SetCurrentAlternateSetting_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR AlternateSetting
+);
+typedef BOOL (WINAPI *WinUsb_SetPipePolicy_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID,
+	ULONG PolicyType,
+	ULONG ValueLength,
+	PVOID Value
+);
+typedef BOOL (WINAPI *WinUsb_SetPowerPolicy_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	ULONG PolicyType,
+	ULONG ValueLength,
+	PVOID Value
+);
+typedef BOOL (WINAPI *WinUsb_WritePipe_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle,
+	UCHAR PipeID,
+	PUCHAR Buffer,
+	ULONG BufferLength,
+	PULONG LengthTransferred,
+	LPOVERLAPPED Overlapped
+);
+typedef BOOL (WINAPI *WinUsb_ResetDevice_t)(
+	WINUSB_INTERFACE_HANDLE InterfaceHandle
+);
+
+/* /!\ These must match the ones from the official libusbk.h */
+typedef enum _KUSB_FNID
+{
+	KUSB_FNID_Init,
+	KUSB_FNID_Free,
+	KUSB_FNID_ClaimInterface,
+	KUSB_FNID_ReleaseInterface,
+	KUSB_FNID_SetAltInterface,
+	KUSB_FNID_GetAltInterface,
+	KUSB_FNID_GetDescriptor,
+	KUSB_FNID_ControlTransfer,
+	KUSB_FNID_SetPowerPolicy,
+	KUSB_FNID_GetPowerPolicy,
+	KUSB_FNID_SetConfiguration,
+	KUSB_FNID_GetConfiguration,
+	KUSB_FNID_ResetDevice,
+	KUSB_FNID_Initialize,
+	KUSB_FNID_SelectInterface,
+	KUSB_FNID_GetAssociatedInterface,
+	KUSB_FNID_Clone,
+	KUSB_FNID_QueryInterfaceSettings,
+	KUSB_FNID_QueryDeviceInformation,
+	KUSB_FNID_SetCurrentAlternateSetting,
+	KUSB_FNID_GetCurrentAlternateSetting,
+	KUSB_FNID_QueryPipe,
+	KUSB_FNID_SetPipePolicy,
+	KUSB_FNID_GetPipePolicy,
+	KUSB_FNID_ReadPipe,
+	KUSB_FNID_WritePipe,
+	KUSB_FNID_ResetPipe,
+	KUSB_FNID_AbortPipe,
+	KUSB_FNID_FlushPipe,
+	KUSB_FNID_IsoReadPipe,
+	KUSB_FNID_IsoWritePipe,
+	KUSB_FNID_GetCurrentFrameNumber,
+	KUSB_FNID_GetOverlappedResult,
+	KUSB_FNID_GetProperty,
+	KUSB_FNID_COUNT,
+} KUSB_FNID; 
+
+typedef struct _KLIB_VERSION {
+	INT Major;
+	INT Minor;
+	INT Micro;
+	INT Nano;
+} KLIB_VERSION;
+typedef KLIB_VERSION* PKLIB_VERSION;
+
+typedef BOOL (WINAPI *LibK_GetProcAddress_t)(
+	PVOID* ProcAddress,
+	ULONG DriverID,
+	ULONG FunctionID
+);
+
+typedef VOID (WINAPI *LibK_GetVersion_t)(
+	PKLIB_VERSION Version
+);
+
+struct winusb_interface {
+	bool initialized;
+	WinUsb_AbortPipe_t AbortPipe;
+	WinUsb_ControlTransfer_t ControlTransfer;
+	WinUsb_FlushPipe_t FlushPipe;
+	WinUsb_Free_t Free;
+	WinUsb_GetAssociatedInterface_t GetAssociatedInterface;
+	WinUsb_GetCurrentAlternateSetting_t GetCurrentAlternateSetting;
+	WinUsb_GetDescriptor_t GetDescriptor;
+	WinUsb_GetOverlappedResult_t GetOverlappedResult;
+	WinUsb_GetPipePolicy_t GetPipePolicy;
+	WinUsb_GetPowerPolicy_t GetPowerPolicy;
+	WinUsb_Initialize_t Initialize;
+	WinUsb_QueryDeviceInformation_t QueryDeviceInformation;
+	WinUsb_QueryInterfaceSettings_t QueryInterfaceSettings;
+	WinUsb_QueryPipe_t QueryPipe;
+	WinUsb_ReadPipe_t ReadPipe;
+	WinUsb_ResetPipe_t ResetPipe;
+	WinUsb_SetCurrentAlternateSetting_t SetCurrentAlternateSetting;
+	WinUsb_SetPipePolicy_t SetPipePolicy;
+	WinUsb_SetPowerPolicy_t SetPowerPolicy;
+	WinUsb_WritePipe_t WritePipe;
+	WinUsb_ResetDevice_t ResetDevice;
+};
+
+/* hid.dll interface */
+
+#define HIDP_STATUS_SUCCESS  0x110000
+typedef void* PHIDP_PREPARSED_DATA;
+
+#pragma pack(1)
+typedef struct {
+	ULONG Size;
+	USHORT VendorID;
+	USHORT ProductID;
+	USHORT VersionNumber;
+} HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
+#pragma pack()
+
+typedef USHORT USAGE;
+typedef struct {
+  USAGE Usage;
+  USAGE UsagePage;
+  USHORT InputReportByteLength;
+  USHORT OutputReportByteLength;
+  USHORT FeatureReportByteLength;
+  USHORT Reserved[17];
+  USHORT NumberLinkCollectionNodes;
+  USHORT NumberInputButtonCaps;
+  USHORT NumberInputValueCaps;
+  USHORT NumberInputDataIndices;
+  USHORT NumberOutputButtonCaps;
+  USHORT NumberOutputValueCaps;
+  USHORT NumberOutputDataIndices;
+  USHORT NumberFeatureButtonCaps;
+  USHORT NumberFeatureValueCaps;
+  USHORT NumberFeatureDataIndices;
+} HIDP_CAPS, *PHIDP_CAPS;
+
+typedef enum _HIDP_REPORT_TYPE {
+  HidP_Input,
+  HidP_Output,
+  HidP_Feature
+} HIDP_REPORT_TYPE;
+
+typedef struct _HIDP_VALUE_CAPS {
+  USAGE  UsagePage;
+  UCHAR  ReportID;
+  BOOLEAN  IsAlias;
+  USHORT  BitField;
+  USHORT  LinkCollection;
+  USAGE  LinkUsage;
+  USAGE  LinkUsagePage;
+  BOOLEAN  IsRange;
+  BOOLEAN  IsStringRange;
+  BOOLEAN  IsDesignatorRange;
+  BOOLEAN  IsAbsolute;
+  BOOLEAN  HasNull;
+  UCHAR  Reserved;
+  USHORT  BitSize;
+  USHORT  ReportCount;
+  USHORT  Reserved2[5];
+  ULONG  UnitsExp;
+  ULONG  Units;
+  LONG  LogicalMin, LogicalMax;
+  LONG  PhysicalMin, PhysicalMax;
+	union {
+	  struct {
+		USAGE  UsageMin, UsageMax;
+		USHORT  StringMin, StringMax;
+		USHORT  DesignatorMin, DesignatorMax;
+		USHORT  DataIndexMin, DataIndexMax;
+	  } Range;
+	  struct {
+		USAGE  Usage, Reserved1;
+		USHORT  StringIndex, Reserved2;
+		USHORT  DesignatorIndex, Reserved3;
+		USHORT  DataIndex, Reserved4;
+	  } NotRange;
+	} u;
+} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
+
+DLL_DECLARE(WINAPI, BOOL, HidD_GetAttributes, (HANDLE, PHIDD_ATTRIBUTES));
+DLL_DECLARE(WINAPI, VOID, HidD_GetHidGuid, (LPGUID));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetPreparsedData, (HANDLE, PHIDP_PREPARSED_DATA *));
+DLL_DECLARE(WINAPI, BOOL, HidD_FreePreparsedData, (PHIDP_PREPARSED_DATA));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetManufacturerString, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetProductString, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetSerialNumberString, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, LONG, HidP_GetCaps, (PHIDP_PREPARSED_DATA, PHIDP_CAPS));
+DLL_DECLARE(WINAPI, BOOL, HidD_SetNumInputBuffers, (HANDLE, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_SetFeature, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetFeature, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetPhysicalDescriptor, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_GetInputReport, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_SetOutputReport, (HANDLE, PVOID, ULONG));
+DLL_DECLARE(WINAPI, BOOL, HidD_FlushQueue, (HANDLE));
+DLL_DECLARE(WINAPI, BOOL, HidP_GetValueCaps, (HIDP_REPORT_TYPE, PHIDP_VALUE_CAPS, PULONG, PHIDP_PREPARSED_DATA));
diff --git a/Externals/libusb/libusb/strerror.c b/Externals/libusb/libusb/strerror.c
new file mode 100644
index 0000000000..7fba0e4725
--- /dev/null
+++ b/Externals/libusb/libusb/strerror.c
@@ -0,0 +1,199 @@
+/*
+ * libusb strerror code
+ * Copyright © 2013 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "config.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "libusb.h"
+#include "libusbi.h"
+
+#if defined(_MSC_VER)
+#define strncasecmp _strnicmp
+#endif
+
+static size_t usbi_locale = 0;
+
+/** \ingroup misc
+ * How to add a new \ref libusb_strerror() translation:
+ * <ol>
+ * <li> Download the latest \c strerror.c from:<br>
+ *      https://raw.github.com/libusb/libusb/master/libusb/sterror.c </li>
+ * <li> Open the file in an UTF-8 capable editor </li>
+ * <li> Add the 2 letter <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">ISO 639-1</a>
+ *      code for your locale at the end of \c usbi_locale_supported[]<br>
+ *    Eg. for Chinese, you would add "zh" so that:
+ *    \code... usbi_locale_supported[] = { "en", "nl", "fr" };\endcode
+ *    becomes:
+ *    \code... usbi_locale_supported[] = { "en", "nl", "fr", "zh" };\endcode </li>
+ * <li> Copy the <tt>{ / * English (en) * / ... }</tt> section and add it at the end of \c usbi_localized_errors<br>
+ *    Eg. for Chinese, the last section of \c usbi_localized_errors could look like:
+ *    \code
+ *     }, { / * Chinese (zh) * /
+ *         "Success",
+ *         ...
+ *         "Other error",
+ *     }
+ * };\endcode </li>
+ * <li> Translate each of the English messages from the section you copied into your language </li>
+ * <li> Save the file (in UTF-8 format) and send it to \c libusb-devel\@lists.sourceforge.net </li>
+ * </ol>
+ */
+
+static const char* usbi_locale_supported[] = { "en", "nl", "fr", "ru" };
+static const char* usbi_localized_errors[ARRAYSIZE(usbi_locale_supported)][LIBUSB_ERROR_COUNT] = {
+	{ /* English (en) */
+		"Success",
+		"Input/Output Error",
+		"Invalid parameter",
+		"Access denied (insufficient permissions)",
+		"No such device (it may have been disconnected)",
+		"Entity not found",
+		"Resource busy",
+		"Operation timed out",
+		"Overflow",
+		"Pipe error",
+		"System call interrupted (perhaps due to signal)",
+		"Insufficient memory",
+		"Operation not supported or unimplemented on this platform",
+		"Other error",
+	}, { /* Dutch (nl) */
+		"Gelukt",
+		"Invoer-/uitvoerfout",
+		"Ongeldig argument",
+		"Toegang geweigerd (onvoldoende toegangsrechten)",
+		"Apparaat bestaat niet (verbinding met apparaat verbroken?)",
+		"Niet gevonden",
+		"Apparaat of hulpbron is bezig",
+		"Bewerking verlopen",
+		"Waarde is te groot",
+		"Gebroken pijp",
+		"Onderbroken systeemaanroep",
+		"Onvoldoende geheugen beschikbaar",
+		"Bewerking wordt niet ondersteund",
+		"Andere fout",
+	}, { /* French (fr) */
+		"Succès",
+		"Erreur d'entrée/sortie",
+		"Paramètre invalide",
+		"Accès refusé (permissions insuffisantes)",
+		"Périphérique introuvable (peut-être déconnecté)",
+		"Elément introuvable",
+		"Resource déjà occupée",
+		"Operation expirée",
+		"Débordement",
+		"Erreur de pipe",
+		"Appel système abandonné (peut-être à cause d’un signal)",
+		"Mémoire insuffisante",
+		"Opération non supportée or non implémentée sur cette plateforme",
+		"Autre erreur",
+	}, { /* Russian (ru) */
+		"Успех",
+		"Ошибка ввода/вывода",
+		"Неверный параметр",
+		"Доступ запрещён (не хватает прав)",
+		"Устройство отсутствует (возможно, оно было отсоединено)",
+		"Элемент не найден",
+		"Ресурс занят",
+		"Истекло время ожидания операции",
+		"Переполнение",
+		"Ошибка канала",
+		"Системный вызов прерван (возможно, сигналом)",
+		"Память исчерпана",
+		"Операция не поддерживается данной платформой",
+		"Неизвестная ошибка"
+	}
+};
+
+/** \ingroup misc
+ * Set the language, and only the language, not the encoding! used for
+ * translatable libusb messages.
+ *
+ * This takes a locale string in the default setlocale format: lang[-region]
+ * or lang[_country_region][.codeset]. Only the lang part of the string is
+ * used, and only 2 letter ISO 639-1 codes are accepted for it, such as "de".
+ * The optional region, country_region or codeset parts are ignored. This
+ * means that functions which return translatable strings will NOT honor the
+ * specified encoding. 
+ * All strings returned are encoded as UTF-8 strings.
+ *
+ * If libusb_setlocale() is not called, all messages will be in English.
+ *
+ * The following functions return translatable strings: libusb_strerror().
+ * Note that the libusb log messages controlled through libusb_set_debug()
+ * are not translated, they are always in English.
+ *
+ * For POSIX UTF-8 environments if you want libusb to follow the standard
+ * locale settings, call libusb_setlocale(setlocale(LC_MESSAGES, NULL)),
+ * after your app has done its locale setup.
+ *
+ * \param locale locale-string in the form of lang[_country_region][.codeset]
+ * or lang[-region], where lang is a 2 letter ISO 639-1 code
+ * \returns LIBUSB_SUCCESS on success
+ * \returns LIBUSB_ERROR_INVALID_PARAM if the locale doesn't meet the requirements
+ * \returns LIBUSB_ERROR_NOT_FOUND if the requested language is not supported
+ * \returns a LIBUSB_ERROR code on other errors
+ */
+
+int API_EXPORTED libusb_setlocale(const char *locale)
+{
+	size_t i;
+
+	if ( (locale == NULL) || (strlen(locale) < 2)
+	  || ((strlen(locale) > 2) && (locale[2] != '-') && (locale[2] != '_') && (locale[2] != '.')) )
+		return LIBUSB_ERROR_INVALID_PARAM;
+
+	for (i=0; i<ARRAYSIZE(usbi_locale_supported); i++) {
+		if (strncasecmp(usbi_locale_supported[i], locale, 2) == 0)
+			break;
+	}
+	if (i >= ARRAYSIZE(usbi_locale_supported)) {
+		return LIBUSB_ERROR_NOT_FOUND;
+	}
+
+	usbi_locale = i;
+
+	return LIBUSB_SUCCESS;
+}
+
+/** \ingroup misc
+ * Returns a constant string with a short description of the given error code,
+ * this description is intended for displaying to the end user and will be in
+ * the language set by libusb_setlocale().
+ *
+ * The returned string is encoded in UTF-8.
+ *
+ * The messages always start with a capital letter and end without any dot.
+ * The caller must not free() the returned string.
+ *
+ * \param errcode the error code whose description is desired
+ * \returns a short description of the error code in UTF-8 encoding
+ */
+DEFAULT_VISIBILITY const char* LIBUSB_CALL libusb_strerror(enum libusb_error errcode)
+{
+	int errcode_index = -errcode;
+
+	if ((errcode_index < 0) || (errcode_index >= LIBUSB_ERROR_COUNT)) {
+		/* "Other Error", which should always be our last message, is returned */
+		errcode_index = LIBUSB_ERROR_COUNT - 1;
+	}
+
+	return usbi_localized_errors[usbi_locale][errcode_index];
+}
diff --git a/Externals/libusb/libusb/sync.c b/Externals/libusb/libusb/sync.c
new file mode 100644
index 0000000000..d87032d01d
--- /dev/null
+++ b/Externals/libusb/libusb/sync.c
@@ -0,0 +1,307 @@
+/*
+ * Synchronous I/O functions for libusb
+ * Copyright © 2007-2008 Daniel Drake <dsd@gentoo.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "libusbi.h"
+
+/**
+ * @defgroup syncio Synchronous device I/O
+ *
+ * This page documents libusb's synchronous (blocking) API for USB device I/O.
+ * This interface is easy to use but has some limitations. More advanced users
+ * may wish to consider using the \ref asyncio "asynchronous I/O API" instead.
+ */
+
+static void LIBUSB_CALL sync_transfer_cb(struct libusb_transfer *transfer)
+{
+	int *completed = transfer->user_data;
+	*completed = 1;
+	usbi_dbg("actual_length=%d", transfer->actual_length);
+	/* caller interprets result and frees transfer */
+}
+
+static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer)
+{
+	int r, *completed = transfer->user_data;
+	struct libusb_context *ctx = HANDLE_CTX(transfer->dev_handle);
+
+	while (!*completed) {
+		r = libusb_handle_events_completed(ctx, completed);
+		if (r < 0) {
+			if (r == LIBUSB_ERROR_INTERRUPTED)
+				continue;
+			usbi_err(ctx, "libusb_handle_events failed: %s, cancelling transfer and retrying",
+				 libusb_error_name(r));
+			libusb_cancel_transfer(transfer);
+			continue;
+		}
+	}
+}
+
+/** \ingroup syncio
+ * Perform a USB control transfer.
+ *
+ * The direction of the transfer is inferred from the bmRequestType field of
+ * the setup packet.
+ *
+ * The wValue, wIndex and wLength fields values should be given in host-endian
+ * byte order.
+ *
+ * \param dev_handle a handle for the device to communicate with
+ * \param bmRequestType the request type field for the setup packet
+ * \param bRequest the request field for the setup packet
+ * \param wValue the value field for the setup packet
+ * \param wIndex the index field for the setup packet
+ * \param data a suitably-sized data buffer for either input or output
+ * (depending on direction bits within bmRequestType)
+ * \param wLength the length field for the setup packet. The data buffer should
+ * be at least this size.
+ * \param timeout timeout (in millseconds) that this function should wait
+ * before giving up due to no response being received. For an unlimited
+ * timeout, use value 0.
+ * \returns on success, the number of bytes actually transferred
+ * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out
+ * \returns LIBUSB_ERROR_PIPE if the control request was not supported by the
+ * device
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failures
+ */
+int API_EXPORTED libusb_control_transfer(libusb_device_handle *dev_handle,
+	uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
+	unsigned char *data, uint16_t wLength, unsigned int timeout)
+{
+	struct libusb_transfer *transfer = libusb_alloc_transfer(0);
+	unsigned char *buffer;
+	int completed = 0;
+	int r;
+
+	if (!transfer)
+		return LIBUSB_ERROR_NO_MEM;
+
+	buffer = (unsigned char*) malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength);
+	if (!buffer) {
+		libusb_free_transfer(transfer);
+		return LIBUSB_ERROR_NO_MEM;
+	}
+
+	libusb_fill_control_setup(buffer, bmRequestType, bRequest, wValue, wIndex,
+		wLength);
+	if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT)
+		memcpy(buffer + LIBUSB_CONTROL_SETUP_SIZE, data, wLength);
+
+	libusb_fill_control_transfer(transfer, dev_handle, buffer,
+		sync_transfer_cb, &completed, timeout);
+	transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER;
+	r = libusb_submit_transfer(transfer);
+	if (r < 0) {
+		libusb_free_transfer(transfer);
+		return r;
+	}
+
+	sync_transfer_wait_for_completion(transfer);
+
+	if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN)
+		memcpy(data, libusb_control_transfer_get_data(transfer),
+			transfer->actual_length);
+
+	switch (transfer->status) {
+	case LIBUSB_TRANSFER_COMPLETED:
+		r = transfer->actual_length;
+		break;
+	case LIBUSB_TRANSFER_TIMED_OUT:
+		r = LIBUSB_ERROR_TIMEOUT;
+		break;
+	case LIBUSB_TRANSFER_STALL:
+		r = LIBUSB_ERROR_PIPE;
+		break;
+	case LIBUSB_TRANSFER_NO_DEVICE:
+		r = LIBUSB_ERROR_NO_DEVICE;
+		break;
+	case LIBUSB_TRANSFER_OVERFLOW:
+		r = LIBUSB_ERROR_OVERFLOW;
+		break;
+	case LIBUSB_TRANSFER_ERROR:
+	case LIBUSB_TRANSFER_CANCELLED:
+		r = LIBUSB_ERROR_IO;
+		break;
+	default:
+		usbi_warn(HANDLE_CTX(dev_handle),
+			"unrecognised status code %d", transfer->status);
+		r = LIBUSB_ERROR_OTHER;
+	}
+
+	libusb_free_transfer(transfer);
+	return r;
+}
+
+static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
+	unsigned char endpoint, unsigned char *buffer, int length,
+	int *transferred, unsigned int timeout, unsigned char type)
+{
+	struct libusb_transfer *transfer = libusb_alloc_transfer(0);
+	int completed = 0;
+	int r;
+
+	if (!transfer)
+		return LIBUSB_ERROR_NO_MEM;
+
+	libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer, length,
+		sync_transfer_cb, &completed, timeout);
+	transfer->type = type;
+
+	r = libusb_submit_transfer(transfer);
+	if (r < 0) {
+		libusb_free_transfer(transfer);
+		return r;
+	}
+
+	sync_transfer_wait_for_completion(transfer);
+
+	*transferred = transfer->actual_length;
+	switch (transfer->status) {
+	case LIBUSB_TRANSFER_COMPLETED:
+		r = 0;
+		break;
+	case LIBUSB_TRANSFER_TIMED_OUT:
+		r = LIBUSB_ERROR_TIMEOUT;
+		break;
+	case LIBUSB_TRANSFER_STALL:
+		r = LIBUSB_ERROR_PIPE;
+		break;
+	case LIBUSB_TRANSFER_OVERFLOW:
+		r = LIBUSB_ERROR_OVERFLOW;
+		break;
+	case LIBUSB_TRANSFER_NO_DEVICE:
+		r = LIBUSB_ERROR_NO_DEVICE;
+		break;
+	case LIBUSB_TRANSFER_ERROR:
+	case LIBUSB_TRANSFER_CANCELLED:
+		r = LIBUSB_ERROR_IO;
+		break;
+	default:
+		usbi_warn(HANDLE_CTX(dev_handle),
+			"unrecognised status code %d", transfer->status);
+		r = LIBUSB_ERROR_OTHER;
+	}
+
+	libusb_free_transfer(transfer);
+	return r;
+}
+
+/** \ingroup syncio
+ * Perform a USB bulk transfer. The direction of the transfer is inferred from
+ * the direction bits of the endpoint address.
+ *
+ * For bulk reads, the <tt>length</tt> field indicates the maximum length of
+ * data you are expecting to receive. If less data arrives than expected,
+ * this function will return that data, so be sure to check the
+ * <tt>transferred</tt> output parameter.
+ *
+ * You should also check the <tt>transferred</tt> parameter for bulk writes.
+ * Not all of the data may have been written.
+ *
+ * Also check <tt>transferred</tt> when dealing with a timeout error code.
+ * libusb may have to split your transfer into a number of chunks to satisfy
+ * underlying O/S requirements, meaning that the timeout may expire after
+ * the first few chunks have completed. libusb is careful not to lose any data
+ * that may have been transferred; do not assume that timeout conditions
+ * indicate a complete lack of I/O.
+ *
+ * \param dev_handle a handle for the device to communicate with
+ * \param endpoint the address of a valid endpoint to communicate with
+ * \param data a suitably-sized data buffer for either input or output
+ * (depending on endpoint)
+ * \param length for bulk writes, the number of bytes from data to be sent. for
+ * bulk reads, the maximum number of bytes to receive into the data buffer.
+ * \param transferred output location for the number of bytes actually
+ * transferred.
+ * \param timeout timeout (in millseconds) that this function should wait
+ * before giving up due to no response being received. For an unlimited
+ * timeout, use value 0.
+ *
+ * \returns 0 on success (and populates <tt>transferred</tt>)
+ * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out (and populates
+ * <tt>transferred</tt>)
+ * \returns LIBUSB_ERROR_PIPE if the endpoint halted
+ * \returns LIBUSB_ERROR_OVERFLOW if the device offered more data, see
+ * \ref packetoverflow
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other failures
+ */
+int API_EXPORTED libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
+	unsigned char endpoint, unsigned char *data, int length, int *transferred,
+	unsigned int timeout)
+{
+	return do_sync_bulk_transfer(dev_handle, endpoint, data, length,
+		transferred, timeout, LIBUSB_TRANSFER_TYPE_BULK);
+}
+
+/** \ingroup syncio
+ * Perform a USB interrupt transfer. The direction of the transfer is inferred
+ * from the direction bits of the endpoint address.
+ *
+ * For interrupt reads, the <tt>length</tt> field indicates the maximum length
+ * of data you are expecting to receive. If less data arrives than expected,
+ * this function will return that data, so be sure to check the
+ * <tt>transferred</tt> output parameter.
+ *
+ * You should also check the <tt>transferred</tt> parameter for interrupt
+ * writes. Not all of the data may have been written.
+ *
+ * Also check <tt>transferred</tt> when dealing with a timeout error code.
+ * libusb may have to split your transfer into a number of chunks to satisfy
+ * underlying O/S requirements, meaning that the timeout may expire after
+ * the first few chunks have completed. libusb is careful not to lose any data
+ * that may have been transferred; do not assume that timeout conditions
+ * indicate a complete lack of I/O.
+ *
+ * The default endpoint bInterval value is used as the polling interval.
+ *
+ * \param dev_handle a handle for the device to communicate with
+ * \param endpoint the address of a valid endpoint to communicate with
+ * \param data a suitably-sized data buffer for either input or output
+ * (depending on endpoint)
+ * \param length for bulk writes, the number of bytes from data to be sent. for
+ * bulk reads, the maximum number of bytes to receive into the data buffer.
+ * \param transferred output location for the number of bytes actually
+ * transferred.
+ * \param timeout timeout (in millseconds) that this function should wait
+ * before giving up due to no response being received. For an unlimited
+ * timeout, use value 0.
+ *
+ * \returns 0 on success (and populates <tt>transferred</tt>)
+ * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out
+ * \returns LIBUSB_ERROR_PIPE if the endpoint halted
+ * \returns LIBUSB_ERROR_OVERFLOW if the device offered more data, see
+ * \ref packetoverflow
+ * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
+ * \returns another LIBUSB_ERROR code on other error
+ */
+int API_EXPORTED libusb_interrupt_transfer(
+	struct libusb_device_handle *dev_handle, unsigned char endpoint,
+	unsigned char *data, int length, int *transferred, unsigned int timeout)
+{
+	return do_sync_bulk_transfer(dev_handle, endpoint, data, length,
+		transferred, timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT);
+}
diff --git a/Externals/libusb/libusb/version.h b/Externals/libusb/libusb/version.h
new file mode 100644
index 0000000000..3305765561
--- /dev/null
+++ b/Externals/libusb/libusb/version.h
@@ -0,0 +1,18 @@
+/* This file is parsed by m4 and windres and RC.EXE so please keep it simple. */
+#include "version_nano.h"
+#ifndef LIBUSB_MAJOR
+#define LIBUSB_MAJOR 1
+#endif
+#ifndef LIBUSB_MINOR
+#define LIBUSB_MINOR 0
+#endif
+#ifndef LIBUSB_MICRO
+#define LIBUSB_MICRO 19
+#endif
+#ifndef LIBUSB_NANO
+#define LIBUSB_NANO 0
+#endif
+/* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
+#ifndef LIBUSB_RC
+#define LIBUSB_RC ""
+#endif
diff --git a/Externals/libusb/libusb/version_nano.h b/Externals/libusb/libusb/version_nano.h
new file mode 100644
index 0000000000..8c4063a317
--- /dev/null
+++ b/Externals/libusb/libusb/version_nano.h
@@ -0,0 +1 @@
+#define LIBUSB_NANO 10903
diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj
new file mode 100644
index 0000000000..9e0711de55
--- /dev/null
+++ b/Externals/libusb/libusb_static_2013.vcxproj
@@ -0,0 +1,70 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>libusb-1.0</ProjectName>
+    <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <!-- Ensure libusb sees it's own config.h first... -->
+      <AdditionalIncludeDirectories>.\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="libusb\core.c" />
+    <ClCompile Include="libusb\descriptor.c" />
+    <ClCompile Include="libusb\hotplug.c" />
+    <ClCompile Include="libusb\io.c" />
+    <ClCompile Include="libusb\os\poll_windows.c" />
+    <ClCompile Include="libusb\os\threads_windows.c" />
+    <ClCompile Include="libusb\os\windows_usb.c" />
+    <ClCompile Include="libusb\sync.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libusb\hotplug.h" />
+    <ClInclude Include="libusb\libusb.h" />
+    <ClInclude Include="libusb\libusbi.h" />
+    <ClInclude Include="libusb\os\poll_windows.h" />
+    <ClInclude Include="libusb\os\threads_windows.h" />
+    <ClInclude Include="libusb\os\windows_common.h" />
+    <ClInclude Include="libusb\os\windows_usb.h" />
+    <ClInclude Include="libusb\version.h" />
+    <ClInclude Include="libusb\version_nano.h" />
+    <ClInclude Include="msvc\config.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Externals/libusb/msvc/config.h b/Externals/libusb/msvc/config.h
new file mode 100644
index 0000000000..4b418db11d
--- /dev/null
+++ b/Externals/libusb/msvc/config.h
@@ -0,0 +1,42 @@
+/* config.h.  Manual config for MSVC.  */
+
+#ifndef _MSC_VER
+#warn "msvc/config.h shouldn't be included for your development environment."
+#error "Please make sure the msvc/ directory is removed from your build path."
+#endif
+
+/* Disable: warning C4200: nonstandard extension used : zero-sized array in struct/union */
+#pragma warning(disable:4200)
+/* Disable: warning C6258: Using TerminateThread does not allow proper thread clean up */
+#pragma warning(disable: 6258)
+#if defined(_PREFAST_)
+/* Disable "Banned API" errors when using the MS's WDK OACR/Prefast */
+#pragma warning(disable:28719)
+/* Disable "The function 'InitializeCriticalSection' must be called from within a try/except block" */
+#pragma warning(disable:28125)
+#endif
+
+/* Default visibility */
+#define DEFAULT_VISIBILITY /**/
+
+/* Enable global message logging */
+#define ENABLE_LOGGING 1
+
+/* Uncomment to start with debug message logging enabled */
+// #define ENABLE_DEBUG_LOGGING 1
+
+/* Uncomment to enabling logging to system log */
+// #define USE_SYSTEM_LOGGING_FACILITY
+
+/* type of second poll() argument */
+#define POLL_NFDS_TYPE unsigned int
+
+/* Windows/WinCE backend */
+#if defined(_WIN32_WCE)
+#define OS_WINCE 1
+#define HAVE_MISSING_H
+#else
+#define OS_WINDOWS 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_SYS_TYPES_H 1
+#endif
diff --git a/Externals/libusb/msvc/ddk_build.cmd b/Externals/libusb/msvc/ddk_build.cmd
new file mode 100644
index 0000000000..aadab502e4
--- /dev/null
+++ b/Externals/libusb/msvc/ddk_build.cmd
@@ -0,0 +1,175 @@
+@echo off
+::# default builds static library. 
+::# you can pass the following arguments (case insensitive):
+::# - "DLL" to build a DLL instead of a static library
+::# - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)
+
+if Test%BUILD_ALT_DIR%==Test goto usage
+
+::# process commandline parameters
+set TARGET=LIBRARY
+set STATIC_LIBC=
+set version=1.0
+set PWD=%~dp0
+set BUILD_CMD=build -bcwgZ -M2
+
+if "%1" == "" goto no_more_args
+::# /I for case insensitive
+if /I Test%1==TestDLL set TARGET=DYNLINK
+if /I Test%1==Test/MT set STATIC_LIBC=1
+:no_more_args
+
+cd ..\libusb\os
+echo TARGETTYPE=%TARGET% > target
+copy target+..\..\msvc\libusb_sources sources >NUL 2>&1
+del target
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set cpudir=i386
+set destType=Win32
+if %_BUILDARCH%==x86 goto isI386
+set cpudir=amd64
+set destType=x64
+:isI386
+
+set srcPath=libusb\os\obj%BUILD_ALT_DIR%\%cpudir%
+
+set dstPath=%destType%\Debug
+if %DDKBUILDENV%==chk goto isDebug
+set dstPath=%destType%\Release
+:isDebug
+
+if exist %destType% goto md2
+mkdir %destType%
+:md2
+if exist %dstPath% goto md3
+mkdir %dstPath%
+:md3
+if exist %dstPath%\dll goto md4
+mkdir %dstPath%\dll
+:md4
+if exist %dstPath%\lib goto md5
+md %dstPath%\lib
+:md5
+if exist %dstPath%\examples goto md6
+md %dstPath%\examples
+:md6
+@echo on
+
+@if /I NOT Test%1==TestDLL goto copylib
+copy %srcPath%\libusb-%version%.dll %dstPath%\dll
+copy %srcPath%\libusb-%version%.pdb %dstPath%\dll
+:copylib
+copy %srcPath%\libusb-%version%.lib %dstPath%\lib
+
+@echo off
+
+if exist examples\listdevs_ddkbuild goto md7
+md examples\listdevs_ddkbuild
+:md7
+
+cd examples\listdevs_ddkbuild
+copy ..\..\msvc\listdevs_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+@echo on
+
+copy %srcPath%\listdevs.exe %dstPath%\examples
+copy %srcPath%\listdevs.pdb %dstPath%\examples
+
+@echo off
+
+if exist examples\xusb_ddkbuild goto md8
+md examples\xusb_ddkbuild
+:md8
+
+cd examples\xusb_ddkbuild
+copy ..\..\msvc\xusb_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+@echo on
+
+copy %srcPath%\xusb.exe %dstPath%\examples
+copy %srcPath%\xusb.pdb %dstPath%\examples
+
+@echo off
+
+if exist examples\getopt\getopt_ddkbuild goto md9
+md examples\getopt\getopt_ddkbuild
+:md9
+
+cd examples\getopt\getopt_ddkbuild
+copy ..\..\..\msvc\getopt_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..\..
+
+if exist examples\fxload_ddkbuild goto md10
+md examples\fxload_ddkbuild
+:md10
+
+cd examples\fxload_ddkbuild
+copy ..\..\msvc\fxload_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set srcPath=examples\fxload_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+@echo on
+
+copy %srcPath%\fxload.exe %dstPath%\examples
+copy %srcPath%\fxload.pdb %dstPath%\examples
+
+@echo off
+
+if exist examples\hotplugtest_ddkbuild goto md11
+md examples\hotplugtest_ddkbuild
+:md11
+
+cd examples\hotplugtest_ddkbuild
+copy ..\..\msvc\hotplugtest_sources sources >NUL 2>&1
+@echo on
+%BUILD_CMD%
+@echo off
+if errorlevel 1 goto builderror
+cd ..\..
+
+set srcPath=examples\hotplugtest_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+@echo on
+
+copy %srcPath%\hotplugtest.exe %dstPath%\examples
+copy %srcPath%\hotplugtest.pdb %dstPath%\examples
+
+@echo off
+
+cd msvc
+goto done
+
+:usage
+echo ddk_build must be run in a WDK build environment
+pause
+goto done
+
+:builderror
+echo Build failed
+
+:done
+cd %PWD%
diff --git a/Externals/libusb/msvc/errno.h b/Externals/libusb/msvc/errno.h
new file mode 100644
index 0000000000..07d15e3d44
--- /dev/null
+++ b/Externals/libusb/msvc/errno.h
@@ -0,0 +1,102 @@
+/* 
+ * errno.h
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is a part of the mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within the package.
+ *
+ * Error numbers and access to error reporting.
+ *
+ */
+
+#ifndef _ERRNO_H_
+#define	_ERRNO_H_
+
+#include <crtdefs.h>
+
+/*
+ * Error numbers.
+ * TODO: Can't be sure of some of these assignments, I guessed from the
+ * names given by strerror and the defines in the Cygnus errno.h. A lot
+ * of the names from the Cygnus errno.h are not represented, and a few
+ * of the descriptions returned by strerror do not obviously match
+ * their error naming.
+ */
+#define EPERM		1	/* Operation not permitted */
+#define	ENOFILE		2	/* No such file or directory */
+#define	ENOENT		2
+#define	ESRCH		3	/* No such process */
+#define	EINTR		4	/* Interrupted function call */
+#define	EIO		5	/* Input/output error */
+#define	ENXIO		6	/* No such device or address */
+#define	E2BIG		7	/* Arg list too long */
+#define	ENOEXEC		8	/* Exec format error */
+#define	EBADF		9	/* Bad file descriptor */
+#define	ECHILD		10	/* No child processes */
+#define	EAGAIN		11	/* Resource temporarily unavailable */
+#define	ENOMEM		12	/* Not enough space */
+#define	EACCES		13	/* Permission denied */
+#define	EFAULT		14	/* Bad address */
+/* 15 - Unknown Error */
+#define	EBUSY		16	/* strerror reports "Resource device" */
+#define	EEXIST		17	/* File exists */
+#define	EXDEV		18	/* Improper link (cross-device link?) */
+#define	ENODEV		19	/* No such device */
+#define	ENOTDIR		20	/* Not a directory */
+#define	EISDIR		21	/* Is a directory */
+#define	EINVAL		22	/* Invalid argument */
+#define	ENFILE		23	/* Too many open files in system */
+#define	EMFILE		24	/* Too many open files */
+#define	ENOTTY		25	/* Inappropriate I/O control operation */
+/* 26 - Unknown Error */
+#define	EFBIG		27	/* File too large */
+#define	ENOSPC		28	/* No space left on device */
+#define	ESPIPE		29	/* Invalid seek (seek on a pipe?) */
+#define	EROFS		30	/* Read-only file system */
+#define	EMLINK		31	/* Too many links */
+#define	EPIPE		32	/* Broken pipe */
+#define	EDOM		33	/* Domain error (math functions) */
+#define	ERANGE		34	/* Result too large (possibly too small) */
+/* 35 - Unknown Error */
+#define	EDEADLOCK	36	/* Resource deadlock avoided (non-Cyg) */
+#define	EDEADLK		36
+#if 0
+/* 37 - Unknown Error */
+#define	ENAMETOOLONG	38	/* Filename too long (91 in Cyg?) */
+#define	ENOLCK		39	/* No locks available (46 in Cyg?) */
+#define	ENOSYS		40	/* Function not implemented (88 in Cyg?) */
+#define	ENOTEMPTY	41	/* Directory not empty (90 in Cyg?) */
+#define	EILSEQ		42	/* Illegal byte sequence */
+#endif
+
+/*
+ * NOTE: ENAMETOOLONG and ENOTEMPTY conflict with definitions in the
+ *       sockets.h header provided with windows32api-0.1.2.
+ *       You should go and put an #if 0 ... #endif around the whole block
+ *       of errors (look at the comment above them).
+ */
+
+#ifndef	RC_INVOKED
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * Definitions of errno. For _doserrno, sys_nerr and * sys_errlist, see
+ * stdlib.h.
+ */
+#if defined(_UWIN) || defined(_WIN32_WCE)
+#undef errno
+extern int errno;
+#else
+_CRTIMP int* __cdecl _errno(void);
+#define	errno		(*_errno())
+#endif
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* Not RC_INVOKED */
+
+#endif	/* Not _ERRNO_H_ */
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_2010.vcxproj b/Externals/libusb/msvc/fxload_2010.vcxproj
new file mode 100644
index 0000000000..56e585303c
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_2010.vcxproj
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>fxload</ProjectName>
+    <ProjectGuid>{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\ezusb.c" />
+    <ClCompile Include="..\examples\fxload.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="getopt_2010.vcxproj">
+      <Project>{ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\ezusb.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_2010.vcxproj.filters b/Externals/libusb/msvc/fxload_2010.vcxproj.filters
new file mode 100644
index 0000000000..824ae40362
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_2010.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{651ff73d-037b-4903-8dd3-56e9950be25c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\fxload.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\examples\ezusb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\ezusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_2012.vcxproj b/Externals/libusb/msvc/fxload_2012.vcxproj
new file mode 100644
index 0000000000..fb53a43d55
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_2012.vcxproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>fxload</ProjectName>
+    <ProjectGuid>{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\ezusb.c" />
+    <ClCompile Include="..\examples\fxload.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2012.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="getopt_2012.vcxproj">
+      <Project>{ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\ezusb.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_2012.vcxproj.filters b/Externals/libusb/msvc/fxload_2012.vcxproj.filters
new file mode 100644
index 0000000000..824ae40362
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_2012.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{651ff73d-037b-4903-8dd3-56e9950be25c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\fxload.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\examples\ezusb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\ezusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_2013.vcxproj b/Externals/libusb/msvc/fxload_2013.vcxproj
new file mode 100644
index 0000000000..74a0d28247
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_2013.vcxproj
@@ -0,0 +1,174 @@
+<?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">
+    <ProjectName>fxload</ProjectName>
+    <ProjectGuid>{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\ezusb.c" />
+    <ClCompile Include="..\examples\fxload.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="getopt_2013.vcxproj">
+      <Project>{ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\ezusb.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/fxload_sources b/Externals/libusb/msvc/fxload_sources
new file mode 100644
index 0000000000..d6e31d691b
--- /dev/null
+++ b/Externals/libusb/msvc/fxload_sources
@@ -0,0 +1,23 @@
+TARGETNAME=fxload
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\msvc;..\..\libusb;..\getopt;$(DDK_INC_PATH)
+C_DEFINES=$(C_DEFINES) /D__GNU_LIBRARY__
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib \
+       ..\getopt\getopt_ddkbuild\obj$(BUILD_ALT_DIR)\*\getopt.lib
+SOURCES=..\ezusb.c \
+        ..\fxload.c
diff --git a/Externals/libusb/msvc/getopt_2005.vcproj b/Externals/libusb/msvc/getopt_2005.vcproj
new file mode 100644
index 0000000000..a98a0a805f
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2005.vcproj
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="getopt"
+	ProjectGUID="{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}"
+	RootNamespace="getopt"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\getopt"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\getopt"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\getopt"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				PreprocessorDefinitions="HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\getopt"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\getopt\getopt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\examples\getopt\getopt1.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\examples\getopt\getopt.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/getopt_2010.vcxproj b/Externals/libusb/msvc/getopt_2010.vcxproj
new file mode 100644
index 0000000000..66c5e44144
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2010.vcxproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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>{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}</ProjectGuid>
+    <RootNamespace>getopt</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\getopt\getopt.c" />
+    <ClCompile Include="..\examples\getopt\getopt1.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\getopt\getopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/getopt_2010.vcxproj.filters b/Externals/libusb/msvc/getopt_2010.vcxproj.filters
new file mode 100644
index 0000000000..7cf095b2ce
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2010.vcxproj.filters
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\getopt\getopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\examples\getopt\getopt1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/getopt_2012.vcxproj b/Externals/libusb/msvc/getopt_2012.vcxproj
new file mode 100644
index 0000000000..01b792832e
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2012.vcxproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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>{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}</ProjectGuid>
+    <RootNamespace>getopt</RootNamespace>
+    <ProjectName>getopt</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\getopt\getopt.c" />
+    <ClCompile Include="..\examples\getopt\getopt1.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\getopt\getopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/getopt_2012.vcxproj.filters b/Externals/libusb/msvc/getopt_2012.vcxproj.filters
new file mode 100644
index 0000000000..7cf095b2ce
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2012.vcxproj.filters
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\getopt\getopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\examples\getopt\getopt1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/getopt_2013.vcxproj b/Externals/libusb/msvc/getopt_2013.vcxproj
new file mode 100644
index 0000000000..ee36fd405d
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_2013.vcxproj
@@ -0,0 +1,136 @@
+<?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>{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}</ProjectGuid>
+    <RootNamespace>getopt</RootNamespace>
+    <ProjectName>getopt</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\getopt\getopt.c" />
+    <ClCompile Include="..\examples\getopt\getopt1.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\getopt\getopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/getopt_sources b/Externals/libusb/msvc/getopt_sources
new file mode 100644
index 0000000000..b9adc1b75a
--- /dev/null
+++ b/Externals/libusb/msvc/getopt_sources
@@ -0,0 +1,20 @@
+TARGETTYPE=LIBRARY
+TARGETNAME=getopt
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+USE_MSVCRT=1
+
+INCLUDES=$(DDK_INC_PATH)
+C_DEFINES = $(C_DEFINES) /DDDKBUILD /DHAVE_STRING_H
+
+TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
+           $(SDK_LIB_PATH)\user32.lib
+
+SOURCES=..\getopt1.c \
+        ..\getopt.c
diff --git a/Externals/libusb/msvc/hotplugtest_2010.vcxproj b/Externals/libusb/msvc/hotplugtest_2010.vcxproj
new file mode 100644
index 0000000000..ae4afeb336
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_2010.vcxproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>hotplugtest</ProjectName>
+    <ProjectGuid>{99D2AC64-DC66-4422-91CE-6715C403C9E5}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\hotplugtest.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters b/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters
new file mode 100644
index 0000000000..125ac1be48
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\hotplugtest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/hotplugtest_2012.vcxproj b/Externals/libusb/msvc/hotplugtest_2012.vcxproj
new file mode 100644
index 0000000000..4460e364e1
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_2012.vcxproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>hotplugtest</ProjectName>
+    <ProjectGuid>{99D2AC64-DC66-4422-91CE-6715C403C9E5}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\hotplugtest.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2012.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters b/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters
new file mode 100644
index 0000000000..125ac1be48
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_2012.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\hotplugtest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/hotplugtest_2013.vcxproj b/Externals/libusb/msvc/hotplugtest_2013.vcxproj
new file mode 100644
index 0000000000..578c6fff34
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_2013.vcxproj
@@ -0,0 +1,167 @@
+<?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">
+    <ProjectName>hotplugtest</ProjectName>
+    <ProjectGuid>{99D2AC64-DC66-4422-91CE-6715C403C9E5}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\hotplugtest.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/hotplugtest_sources b/Externals/libusb/msvc/hotplugtest_sources
new file mode 100644
index 0000000000..1b27cad913
--- /dev/null
+++ b/Externals/libusb/msvc/hotplugtest_sources
@@ -0,0 +1,20 @@
+TARGETNAME=hotplugtest
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH)
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
+SOURCES=..\hotplugtest.c
diff --git a/Externals/libusb/msvc/inttypes.h b/Externals/libusb/msvc/inttypes.h
new file mode 100644
index 0000000000..289bb50b4d
--- /dev/null
+++ b/Externals/libusb/msvc/inttypes.h
@@ -0,0 +1,295 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file was original part of the w64 mingw-runtime package.
+ */
+
+/*
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  Modified for libusb/MSVC: Pete Batard <pbatard@gmail.com>
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  Date: 2010-04-02
+ */
+
+#ifndef _MSC_VER
+#error This header should only be used with Microsoft compilers
+#endif
+
+/* 7.8 Format conversion of integer types <inttypes.h> */
+
+#ifndef _INTTYPES_H_
+#define _INTTYPES_H_
+
+#include <stdint.h>
+
+#ifdef	__cplusplus
+extern	"C"	{
+#endif
+
+typedef struct {
+	intmax_t quot;
+	intmax_t rem;
+	} imaxdiv_t;
+
+
+/* 7.8.1 Macros for format specifiers
+ *
+ * MS runtime does not yet understand C9x standard "ll"
+ * length specifier. It appears to treat "ll" as "l".
+ * The non-standard I64 length specifier causes warning in GCC,
+ * but understood by MS runtime functions.
+ */
+
+/* fprintf macros for signed types */
+#define PRId8 "d"
+#define PRId16 "d"
+#define PRId32 "d"
+#define PRId64 "I64d"
+
+#define PRIdLEAST8 "d"
+#define PRIdLEAST16 "d"
+#define PRIdLEAST32 "d"
+#define PRIdLEAST64 "I64d"
+
+#define PRIdFAST8 "d"
+#define PRIdFAST16 "d"
+#define PRIdFAST32 "d"
+#define PRIdFAST64 "I64d"
+
+#define PRIdMAX "I64d"
+
+#define PRIi8 "i"
+#define PRIi16 "i"
+#define PRIi32 "i"
+#define PRIi64 "I64i"
+
+#define PRIiLEAST8 "i"
+#define PRIiLEAST16 "i"
+#define PRIiLEAST32 "i"
+#define PRIiLEAST64 "I64i"
+
+#define PRIiFAST8 "i"
+#define PRIiFAST16 "i"
+#define PRIiFAST32 "i"
+#define PRIiFAST64 "I64i"
+
+#define PRIiMAX "I64i"
+
+#define PRIo8 "o"
+#define PRIo16 "o"
+#define PRIo32 "o"
+#define PRIo64 "I64o"
+
+#define PRIoLEAST8 "o"
+#define PRIoLEAST16 "o"
+#define PRIoLEAST32 "o"
+#define PRIoLEAST64 "I64o"
+
+#define PRIoFAST8 "o"
+#define PRIoFAST16 "o"
+#define PRIoFAST32 "o"
+#define PRIoFAST64 "I64o"
+
+#define PRIoMAX "I64o"
+
+/* fprintf macros for unsigned types */
+#define PRIu8 "u"
+#define PRIu16 "u"
+#define PRIu32 "u"
+#define PRIu64 "I64u"
+
+
+#define PRIuLEAST8 "u"
+#define PRIuLEAST16 "u"
+#define PRIuLEAST32 "u"
+#define PRIuLEAST64 "I64u"
+
+#define PRIuFAST8 "u"
+#define PRIuFAST16 "u"
+#define PRIuFAST32 "u"
+#define PRIuFAST64 "I64u"
+
+#define PRIuMAX "I64u"
+
+#define PRIx8 "x"
+#define PRIx16 "x"
+#define PRIx32 "x"
+#define PRIx64 "I64x"
+
+#define PRIxLEAST8 "x"
+#define PRIxLEAST16 "x"
+#define PRIxLEAST32 "x"
+#define PRIxLEAST64 "I64x"
+
+#define PRIxFAST8 "x"
+#define PRIxFAST16 "x"
+#define PRIxFAST32 "x"
+#define PRIxFAST64 "I64x"
+
+#define PRIxMAX "I64x"
+
+#define PRIX8 "X"
+#define PRIX16 "X"
+#define PRIX32 "X"
+#define PRIX64 "I64X"
+
+#define PRIXLEAST8 "X"
+#define PRIXLEAST16 "X"
+#define PRIXLEAST32 "X"
+#define PRIXLEAST64 "I64X"
+
+#define PRIXFAST8 "X"
+#define PRIXFAST16 "X"
+#define PRIXFAST32 "X"
+#define PRIXFAST64 "I64X"
+
+#define PRIXMAX "I64X"
+
+/*
+ *   fscanf macros for signed int types
+ *   NOTE: if 32-bit int is used for int_fast8_t and int_fast16_t
+ *   (see stdint.h, 7.18.1.3), FAST8 and FAST16 should have
+ *   no length identifiers
+ */
+
+#define SCNd16 "hd"
+#define SCNd32 "d"
+#define SCNd64 "I64d"
+
+#define SCNdLEAST16 "hd"
+#define SCNdLEAST32 "d"
+#define SCNdLEAST64 "I64d"
+
+#define SCNdFAST16 "hd"
+#define SCNdFAST32 "d"
+#define SCNdFAST64 "I64d"
+
+#define SCNdMAX "I64d"
+
+#define SCNi16 "hi"
+#define SCNi32 "i"
+#define SCNi64 "I64i"
+
+#define SCNiLEAST16 "hi"
+#define SCNiLEAST32 "i"
+#define SCNiLEAST64 "I64i"
+
+#define SCNiFAST16 "hi"
+#define SCNiFAST32 "i"
+#define SCNiFAST64 "I64i"
+
+#define SCNiMAX "I64i"
+
+#define SCNo16 "ho"
+#define SCNo32 "o"
+#define SCNo64 "I64o"
+
+#define SCNoLEAST16 "ho"
+#define SCNoLEAST32 "o"
+#define SCNoLEAST64 "I64o"
+
+#define SCNoFAST16 "ho"
+#define SCNoFAST32 "o"
+#define SCNoFAST64 "I64o"
+
+#define SCNoMAX "I64o"
+
+#define SCNx16 "hx"
+#define SCNx32 "x"
+#define SCNx64 "I64x"
+
+#define SCNxLEAST16 "hx"
+#define SCNxLEAST32 "x"
+#define SCNxLEAST64 "I64x"
+
+#define SCNxFAST16 "hx"
+#define SCNxFAST32 "x"
+#define SCNxFAST64 "I64x"
+
+#define SCNxMAX "I64x"
+
+/* fscanf macros for unsigned int types */
+
+#define SCNu16 "hu"
+#define SCNu32 "u"
+#define SCNu64 "I64u"
+
+#define SCNuLEAST16 "hu"
+#define SCNuLEAST32 "u"
+#define SCNuLEAST64 "I64u"
+
+#define SCNuFAST16 "hu"
+#define SCNuFAST32 "u"
+#define SCNuFAST64 "I64u"
+
+#define SCNuMAX "I64u"
+
+#ifdef _WIN64
+#define PRIdPTR "I64d"
+#define PRIiPTR "I64i"
+#define PRIoPTR "I64o"
+#define PRIuPTR "I64u"
+#define PRIxPTR "I64x"
+#define PRIXPTR "I64X"
+#define SCNdPTR "I64d"
+#define SCNiPTR "I64i"
+#define SCNoPTR "I64o"
+#define SCNxPTR "I64x"
+#define SCNuPTR "I64u"
+#else
+#define PRIdPTR "d"
+#define PRIiPTR "i"
+#define PRIoPTR "o"
+#define PRIuPTR "u"
+#define PRIxPTR "x"
+#define PRIXPTR "X"
+#define SCNdPTR "d"
+#define SCNiPTR "i"
+#define SCNoPTR "o"
+#define SCNxPTR "x"
+ #define SCNuPTR "u"
+#endif
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+/*
+ * no length modifier for char types prior to C9x
+ * MS runtime  scanf appears to treat "hh" as "h"
+ */
+
+/* signed char */
+#define SCNd8 "hhd"
+#define SCNdLEAST8 "hhd"
+#define SCNdFAST8 "hhd"
+
+#define SCNi8 "hhi"
+#define SCNiLEAST8 "hhi"
+#define SCNiFAST8 "hhi"
+
+#define SCNo8 "hho"
+#define SCNoLEAST8 "hho"
+#define SCNoFAST8 "hho"
+
+#define SCNx8 "hhx"
+#define SCNxLEAST8 "hhx"
+#define SCNxFAST8 "hhx"
+
+/* unsigned char */
+#define SCNu8 "hhu"
+#define SCNuLEAST8 "hhu"
+#define SCNuFAST8 "hhu"
+#endif /* __STDC_VERSION__ >= 199901 */
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* ndef _INTTYPES_H */
diff --git a/Externals/libusb/msvc/libusb.dsw b/Externals/libusb/msvc/libusb.dsw
new file mode 100644
index 0000000000..4e2652e3d4
--- /dev/null
+++ b/Externals/libusb/msvc/libusb.dsw
@@ -0,0 +1,71 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libusb_dll"=".\libusb_dll.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libusb_static"=".\libusb_static.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "listdevs"=".\listdevs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libusb_static
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xusb"=".\xusb.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libusb_static
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/Externals/libusb/msvc/libusb_2005.sln b/Externals/libusb/msvc/libusb_2005.sln
new file mode 100644
index 0000000000..c1dc4421da
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_2005.sln
@@ -0,0 +1,95 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2005.vcproj", "{5AB6B770-1925-48D5-ABC2-930F3259C020}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2005.vcproj", "{8224C054-5968-4238-832C-167155E7ECC3}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2005.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2005.vcproj", "{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2005.vcproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020}
+	EndProjectSection
+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
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|Win32.Build.0 = Debug|Win32
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|x64.ActiveCfg = Debug|x64
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Debug|x64.Build.0 = Debug|x64
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.ActiveCfg = Release|Win32
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|Win32.Build.0 = Release|Win32
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|x64.ActiveCfg = Release|x64
+		{5AB6B770-1925-48D5-ABC2-930F3259C020}.Release|x64.Build.0 = Release|x64
+		{8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8224C054-5968-4238-832C-167155E7ECC3}.Debug|Win32.Build.0 = Debug|Win32
+		{8224C054-5968-4238-832C-167155E7ECC3}.Debug|x64.ActiveCfg = Debug|x64
+		{8224C054-5968-4238-832C-167155E7ECC3}.Debug|x64.Build.0 = Debug|x64
+		{8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.ActiveCfg = Release|Win32
+		{8224C054-5968-4238-832C-167155E7ECC3}.Release|Win32.Build.0 = Release|Win32
+		{8224C054-5968-4238-832C-167155E7ECC3}.Release|x64.ActiveCfg = Release|x64
+		{8224C054-5968-4238-832C-167155E7ECC3}.Release|x64.Build.0 = Release|x64
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|Win32.Build.0 = Debug|Win32
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|x64.ActiveCfg = Debug|x64
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Debug|x64.Build.0 = Debug|x64
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.ActiveCfg = Release|Win32
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|Win32.Build.0 = Release|Win32
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|x64.ActiveCfg = Release|x64
+		{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}.Release|x64.Build.0 = Release|x64
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|Win32.Build.0 = Debug|Win32
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|x64.ActiveCfg = Debug|x64
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Debug|x64.Build.0 = Debug|x64
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.ActiveCfg = Release|Win32
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|Win32.Build.0 = Release|Win32
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|x64.ActiveCfg = Release|x64
+		{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}.Release|x64.Build.0 = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Externals/libusb/msvc/libusb_2010.sln b/Externals/libusb/msvc/libusb_2010.sln
new file mode 100644
index 0000000000..25da8671f6
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_2010.sln
@@ -0,0 +1,94 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2010.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2010.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2010.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2010.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2010.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2010.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2010.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2010.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}"
+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
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Externals/libusb/msvc/libusb_2012.sln b/Externals/libusb/msvc/libusb_2012.sln
new file mode 100644
index 0000000000..d1e3e93932
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_2012.sln
@@ -0,0 +1,94 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_2012.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2012.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2012.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2012.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2012.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2012.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2012.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2012.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}"
+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
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Externals/libusb/msvc/libusb_2013.sln b/Externals/libusb/msvc/libusb_2013.sln
new file mode 100644
index 0000000000..58cc316162
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_2013.sln
@@ -0,0 +1,100 @@
+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}") = "libusb-1.0 (static)", "libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_2013.vcxproj", "{349EE8FA-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_2013.vcxproj", "{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_2013.vcxproj", "{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fxload", "fxload_2013.vcxproj", "{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} = {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt_2013.vcxproj", "{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_2013.vcxproj", "{53942EFF-C810-458D-B3CB-EE5CE9F1E781}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotplugtest", "hotplugtest_2013.vcxproj", "{99D2AC64-DC66-4422-91CE-6715C403C9E5}"
+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
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.ActiveCfg = Debug|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|Win32.Build.0 = Debug|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.ActiveCfg = Release|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|Win32.Build.0 = Release|Win32
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{349EE8FA-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|Win32.Build.0 = Debug|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.ActiveCfg = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Debug|x64.Build.0 = Debug|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.ActiveCfg = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|Win32.Build.0 = Release|Win32
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.ActiveCfg = Release|x64
+		{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}.Release|x64.Build.0 = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Debug|x64.Build.0 = Debug|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.ActiveCfg = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|Win32.Build.0 = Release|Win32
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.ActiveCfg = Release|x64
+		{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}.Release|x64.Build.0 = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|Win32.Build.0 = Debug|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.ActiveCfg = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Debug|x64.Build.0 = Debug|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.ActiveCfg = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|Win32.Build.0 = Release|Win32
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.ActiveCfg = Release|x64
+		{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}.Release|x64.Build.0 = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|Win32.Build.0 = Debug|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.ActiveCfg = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|Win32.Build.0 = Release|Win32
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64
+		{AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|Win32.Build.0 = Debug|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.ActiveCfg = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Debug|x64.Build.0 = Debug|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.ActiveCfg = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|Win32.Build.0 = Release|Win32
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.ActiveCfg = Release|x64
+		{53942EFF-C810-458D-B3CB-EE5CE9F1E781}.Release|x64.Build.0 = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|Win32.Build.0 = Debug|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.ActiveCfg = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Debug|x64.Build.0 = Debug|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.ActiveCfg = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|Win32.Build.0 = Release|Win32
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.ActiveCfg = Release|x64
+		{99D2AC64-DC66-4422-91CE-6715C403C9E5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Externals/libusb/msvc/libusb_dll.dsp b/Externals/libusb/msvc/libusb_dll.dsp
new file mode 100644
index 0000000000..34f4bdaedc
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll.dsp
@@ -0,0 +1,194 @@
+# Microsoft Developer Studio Project File - Name="libusb_dll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libusb_dll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libusb_dll.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libusb_dll.mak" CFG="libusb_dll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libusb_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libusb_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libusb_dll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Win32/Release/dll"
+# PROP Intermediate_Dir "../Win32/Release/dll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Win32/Release/dll/libusb-1.0.dll"
+
+!ELSEIF  "$(CFG)" == "libusb_dll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Win32/Debug/dll"
+# PROP Intermediate_Dir "../Win32/Debug/dll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /n
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Win32/Debug/dll/libusb-1.0.dll"
+# SUBTRACT LINK32 /pdb:none /incremental:no
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libusb_dll - Win32 Release"
+# Name "libusb_dll - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libusb\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\darwin_usb.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\descriptor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\io.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\libusb\libusb-1.0.rc"
+# End Source File
+# Begin Source File
+
+SOURCE="..\libusb\libusb-1.0.def"
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\linux_usbfs.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_windows.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\sync.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_windows.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_usb.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\darwin_usb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\libusb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\libusbi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\linux_usbfs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_posix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_windows.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_posix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_windows.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_usb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_common.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/Externals/libusb/msvc/libusb_dll_2005.vcproj b/Externals/libusb/msvc/libusb_dll_2005.vcproj
new file mode 100644
index 0000000000..347aa9591c
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2005.vcproj
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libusb-1.0 (dll)"
+	ProjectGUID="{8224C054-5968-4238-832C-167155E7ECC3}"
+	RootNamespace="libusbdll"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\libusb\libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\libusb\core.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\descriptor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\io.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\strerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\sync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_usb.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusbi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_usb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\libusb\libusb-1.0.def"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb-1.0.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/libusb_dll_2010.vcxproj b/Externals/libusb/msvc/libusb_dll_2010.vcxproj
new file mode 100644
index 0000000000..89433d59be
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2010.vcxproj
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>libusb-1.0 (dll)</ProjectName>
+    <ProjectGuid>{349EE8FA-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusbdll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\libusb\libusb-1.0.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\libusb\libusb-1.0.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters b/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters
new file mode 100644
index 0000000000..c3714de399
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2010.vcxproj.filters
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{d81e81ca-b13e-4a15-b54b-b12b41361e6b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\descriptor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\hotplug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\io.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\poll_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\strerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\sync.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\threads_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\windows_usb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\hotplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusbi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\poll_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\threads_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_usb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\libusb\libusb-1.0.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\libusb\libusb-1.0.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_dll_2012.vcxproj b/Externals/libusb/msvc/libusb_dll_2012.vcxproj
new file mode 100644
index 0000000000..a26d240700
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2012.vcxproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>libusb-1.0 (dll)</ProjectName>
+    <ProjectGuid>{349EE8FA-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusbdll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\version.h" />
+    <ClInclude Include="..\libusb\version_nano.h" />
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\libusb\libusb-1.0.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\libusb\libusb-1.0.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters b/Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters
new file mode 100644
index 0000000000..f00a0d098a
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2012.vcxproj.filters
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{d81e81ca-b13e-4a15-b54b-b12b41361e6b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\descriptor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\io.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\poll_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\strerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\sync.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\threads_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\windows_usb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\hotplug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusbi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\poll_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\threads_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_usb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version_nano.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\hotplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\libusb\libusb-1.0.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\libusb\libusb-1.0.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_dll_2013.vcxproj b/Externals/libusb/msvc/libusb_dll_2013.vcxproj
new file mode 100644
index 0000000000..5881c6dfee
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_2013.vcxproj
@@ -0,0 +1,175 @@
+<?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">
+    <ProjectName>libusb-1.0 (dll)</ProjectName>
+    <ProjectGuid>{349EE8FA-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusbdll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\dll\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)libusb-1.0.dll</OutputFile>
+      <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
+      <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\version.h" />
+    <ClInclude Include="..\libusb\version_nano.h" />
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\libusb\libusb-1.0.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\libusb\libusb-1.0.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_dll_wince.vcproj b/Externals/libusb/msvc/libusb_dll_wince.vcproj
new file mode 100644
index 0000000000..77b1858b03
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_dll_wince.vcproj
@@ -0,0 +1,1243 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libusb-1.0 (dll)"
+	ProjectGUID="{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}"
+	RootNamespace="libusb"
+	>
+	<Platforms>
+		<Platform
+			Name="STANDARDSDK_500 (ARMV4I)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (SH4)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (x86)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\lsusb"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\dll"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\dll\libusb-1.0"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\libusb-1.0.dll"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				ModuleDefinitionFile="../libusb/libusb-1.0.def"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\libusb\core.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\descriptor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\io.c"
+				>
+			</File>
+			<File
+				RelativePath="missing.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\strerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\sync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\wince_usb.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="config.h"
+				>
+			</File>
+			<File
+				RelativePath="errno.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusbi.h"
+				>
+			</File>
+			<File
+				RelativePath="missing.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\wince_usb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\libusb\libusb-1.0.def"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb-1.0.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/libusb_sources b/Externals/libusb/msvc/libusb_sources
new file mode 100644
index 0000000000..308a6663f3
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_sources
@@ -0,0 +1,38 @@
+#TARGETTYPE is not defined, to allow selection between static lib or DLL with ddk_build
+TARGETNAME=libusb-1.0
+DLLDEF=..\libusb-1.0.def
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+INCLUDES=..;..\..\msvc;$(DDK_INC_PATH)
+C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD
+
+# http://jpassing.com/2009/10/21/ltcg-issues-with-the-win7amd64-environment-of-wdk-7600/
+# prevents the following error when using the 64 bit static lib with Visual Studio 2010:
+# "fatal error C1001: An internal error has occurred in the compiler.
+# (compiler file 'f:\dd\vctools\compiler\utc\src\p2\p2symtab.c', line 1823)"
+# and the following with Visual Studio 2010:
+# "fatal error C1047: The object or library file 'libusb-1.0.lib' was created with
+#  an older compiler than other objects; rebuild old objects and libraries"
+USER_C_FLAGS=/GL-
+
+TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib
+
+SOURCES=..\core.c \
+	..\descriptor.c \
+	..\io.c \
+	..\strerror.c \
+	..\sync.c \
+	..\hotplug.c \
+	threads_windows.c \
+	poll_windows.c \
+	windows_usb.c \
+	..\libusb-1.0.rc
diff --git a/Externals/libusb/msvc/libusb_static.dsp b/Externals/libusb/msvc/libusb_static.dsp
new file mode 100644
index 0000000000..d703a58ef3
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static.dsp
@@ -0,0 +1,174 @@
+# Microsoft Developer Studio Project File - Name="libusb_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libusb_static - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libusb_static.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libusb_static.mak" CFG="libusb_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libusb_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libusb_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libusb_static - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Win32/Release/lib"
+# PROP Intermediate_Dir "../Win32/Release/lib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /D "WIN32" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_LIB" /FR /FD /EHsc /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../Win32/Release/lib/libusb-1.0.lib"
+
+!ELSEIF  "$(CFG)" == "libusb_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Win32/Debug/lib"
+# PROP Intermediate_Dir "../Win32/Debug/lib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /D "WIN32" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /D "_LIB" /FR /FD /GZ /EHsc /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /n
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../Win32/Debug/lib/libusb-1.0.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libusb_static - Win32 Release"
+# Name "libusb_static - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libusb\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\darwin_usb.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\descriptor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\io.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\linux_usbfs.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_windows.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\sync.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_windows.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_usb.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\darwin_usb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\libusb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\libusbi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\linux_usbfs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_posix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\poll_windows.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_posix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\threads_windows.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_usb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libusb\os\windows_common.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/Externals/libusb/msvc/libusb_static_2005.vcproj b/Externals/libusb/msvc/libusb_static_2005.vcproj
new file mode 100644
index 0000000000..18f92f9a1b
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2005.vcproj
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libusb-1.0 (static)"
+	ProjectGUID="{5AB6B770-1925-48D5-ABC2-930F3259C020}"
+	RootNamespace="libusb"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\libusb\core.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\descriptor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\io.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\strerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\sync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_usb.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusbi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_usb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/libusb_static_2010.vcxproj b/Externals/libusb/msvc/libusb_static_2010.vcxproj
new file mode 100644
index 0000000000..c6fea1b415
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2010.vcxproj
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>libusb-1.0 (static)</ProjectName>
+    <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusb</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\version.h" />
+    <ClInclude Include="..\libusb\version_nano.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_static_2010.vcxproj.filters b/Externals/libusb/msvc/libusb_static_2010.vcxproj.filters
new file mode 100644
index 0000000000..62770c5f40
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2010.vcxproj.filters
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\descriptor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\io.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\poll_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\strerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\sync.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\threads_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\windows_usb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\hotplug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusbi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\poll_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\threads_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_usb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version_nano.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\hotplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_static_2012.vcxproj b/Externals/libusb/msvc/libusb_static_2012.vcxproj
new file mode 100644
index 0000000000..7bd8c6851a
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2012.vcxproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>libusb-1.0 (static)</ProjectName>
+    <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusb</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\version.h" />
+    <ClInclude Include="..\libusb\version_nano.h" />
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_static_2012.vcxproj.filters b/Externals/libusb/msvc/libusb_static_2012.vcxproj.filters
new file mode 100644
index 0000000000..62770c5f40
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2012.vcxproj.filters
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\descriptor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\io.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\poll_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\strerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\sync.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\threads_windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\os\windows_usb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libusb\hotplug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\libusbi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\poll_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\threads_windows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_usb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\os\windows_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version_nano.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libusb\hotplug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_static_2013.vcxproj b/Externals/libusb/msvc/libusb_static_2013.vcxproj
new file mode 100644
index 0000000000..0f71d7fd5d
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_2013.vcxproj
@@ -0,0 +1,160 @@
+<?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">
+    <ProjectName>libusb-1.0 (static)</ProjectName>
+    <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <RootNamespace>libusb</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libusb\core.c" />
+    <ClCompile Include="..\libusb\descriptor.c" />
+    <ClCompile Include="..\libusb\hotplug.c" />
+    <ClCompile Include="..\libusb\io.c" />
+    <ClCompile Include="..\libusb\os\poll_windows.c" />
+    <ClCompile Include="..\libusb\strerror.c" />
+    <ClCompile Include="..\libusb\sync.c" />
+    <ClCompile Include="..\libusb\os\threads_windows.c" />
+    <ClCompile Include="..\libusb\os\windows_usb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\hotplug.h" />
+    <ClInclude Include="..\libusb\version.h" />
+    <ClInclude Include="..\libusb\version_nano.h" />
+    <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
+    <ClInclude Include="..\libusb\libusbi.h" />
+    <ClInclude Include="..\libusb\os\poll_windows.h" />
+    <ClInclude Include="..\libusb\os\threads_windows.h" />
+    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_common.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/libusb_static_wince.vcproj b/Externals/libusb/msvc/libusb_static_wince.vcproj
new file mode 100644
index 0000000000..57db8cd40b
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_static_wince.vcproj
@@ -0,0 +1,1185 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libusb-1.0 (static)"
+	ProjectGUID="{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}"
+	RootNamespace="libusb"
+	>
+	<Platforms>
+		<Platform
+			Name="STANDARDSDK_500 (ARMV4I)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (SH4)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (x86)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\lsusb"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\lib"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\lib\libusb-1.0"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="WINCE;_WIN32_WCE"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libusb-1.0.lib"
+				AdditionalOptions="/subsystem:$(CESubsystem)"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\libusb\core.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\descriptor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\hotplug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\io.c"
+				>
+			</File>
+			<File
+				RelativePath="missing.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\strerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\sync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\wince_usb.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="config.h"
+				>
+			</File>
+			<File
+				RelativePath="errno.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusbi.h"
+				>
+			</File>
+			<File
+				RelativePath="missing.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\poll_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\threads_windows.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\wince_usb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\os\windows_common.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\libusb\libusb-1.0.def"
+				>
+			</File>
+			<File
+				RelativePath="..\libusb\libusb-1.0.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/libusb_wince.sln b/Externals/libusb/msvc/libusb_wince.sln
new file mode 100644
index 0000000000..51c310d310
--- /dev/null
+++ b/Externals/libusb/msvc/libusb_wince.sln
@@ -0,0 +1,246 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_dll_wince.vcproj", "{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs_wince.vcproj", "{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb_wince.vcproj", "{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "libusb_static_wince.vcproj", "{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress_wince.vcproj", "{61476624-3354-48C8-9334-85AC0D624640}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|STANDARDSDK_500 (ARMV4I) = Debug|STANDARDSDK_500 (ARMV4I)
+		Debug|STANDARDSDK_500 (MIPSII) = Debug|STANDARDSDK_500 (MIPSII)
+		Debug|STANDARDSDK_500 (MIPSII_FP) = Debug|STANDARDSDK_500 (MIPSII_FP)
+		Debug|STANDARDSDK_500 (MIPSIV) = Debug|STANDARDSDK_500 (MIPSIV)
+		Debug|STANDARDSDK_500 (MIPSIV_FP) = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		Debug|STANDARDSDK_500 (SH4) = Debug|STANDARDSDK_500 (SH4)
+		Debug|STANDARDSDK_500 (x86) = Debug|STANDARDSDK_500 (x86)
+		Release|STANDARDSDK_500 (ARMV4I) = Release|STANDARDSDK_500 (ARMV4I)
+		Release|STANDARDSDK_500 (MIPSII) = Release|STANDARDSDK_500 (MIPSII)
+		Release|STANDARDSDK_500 (MIPSII_FP) = Release|STANDARDSDK_500 (MIPSII_FP)
+		Release|STANDARDSDK_500 (MIPSIV) = Release|STANDARDSDK_500 (MIPSIV)
+		Release|STANDARDSDK_500 (MIPSIV_FP) = Release|STANDARDSDK_500 (MIPSIV_FP)
+		Release|STANDARDSDK_500 (SH4) = Release|STANDARDSDK_500 (SH4)
+		Release|STANDARDSDK_500 (x86) = Release|STANDARDSDK_500 (x86)
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86)
+		{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86)
+		{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86)
+		{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86)
+		{CE67BEFB-37EA-4F5C-A60E-F2D0CC91B6AA}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).ActiveCfg = Debug|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).Build.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (ARMV4I).Deploy.0 = Debug|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).Build.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).Build.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Debug|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).ActiveCfg = Debug|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).Build.0 = Debug|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (SH4).Deploy.0 = Debug|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).ActiveCfg = Debug|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).Build.0 = Debug|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Debug|STANDARDSDK_500 (x86).Deploy.0 = Debug|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).ActiveCfg = Release|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).Build.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (ARMV4I).Deploy.0 = Release|STANDARDSDK_500 (ARMV4I)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).ActiveCfg = Release|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).Build.0 = Release|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII).Deploy.0 = Release|STANDARDSDK_500 (MIPSII)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).Build.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSII_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSII_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).Build.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).ActiveCfg = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).Build.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (MIPSIV_FP).Deploy.0 = Release|STANDARDSDK_500 (MIPSIV_FP)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).ActiveCfg = Release|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).Build.0 = Release|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (SH4).Deploy.0 = Release|STANDARDSDK_500 (SH4)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).ActiveCfg = Release|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).Build.0 = Release|STANDARDSDK_500 (x86)
+		{61476624-3354-48C8-9334-85AC0D624640}.Release|STANDARDSDK_500 (x86).Deploy.0 = Release|STANDARDSDK_500 (x86)
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Externals/libusb/msvc/listdevs.dsp b/Externals/libusb/msvc/listdevs.dsp
new file mode 100644
index 0000000000..2ed8aec31a
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs.dsp
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="listdevs" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=listdevs - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "listdevs.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "listdevs.mak" CFG="listdevs - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "listdevs - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "listdevs - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "listdevs - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Win32/Release/examples"
+# PROP Intermediate_Dir "../Win32/Release/examples/listdevs"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /EHsc /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "listdevs - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Win32/Debug/examples"
+# PROP Intermediate_Dir "../Win32/Debug/examples/listdevs"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /GZ /EHsc /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/threads_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "listdevs - Win32 Release"
+# Name "listdevs - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\listdevs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/Externals/libusb/msvc/listdevs_2005.vcproj b/Externals/libusb/msvc/listdevs_2005.vcproj
new file mode 100644
index 0000000000..cff754e0e3
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2005.vcproj
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="listdevs"
+	ProjectGUID="{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
+	RootNamespace="examples"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\listdevs.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/listdevs_2010.vcxproj b/Externals/libusb/msvc/listdevs_2010.vcxproj
new file mode 100644
index 0000000000..173af38dd1
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2010.vcxproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>listdevs</ProjectName>
+    <ProjectGuid>{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\listdevs.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/listdevs_2010.vcxproj.filters b/Externals/libusb/msvc/listdevs_2010.vcxproj.filters
new file mode 100644
index 0000000000..1378e296c8
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\listdevs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/listdevs_2012.vcxproj b/Externals/libusb/msvc/listdevs_2012.vcxproj
new file mode 100644
index 0000000000..4ecc865e4f
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2012.vcxproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>listdevs</ProjectName>
+    <ProjectGuid>{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\listdevs.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2012.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/listdevs_2012.vcxproj.filters b/Externals/libusb/msvc/listdevs_2012.vcxproj.filters
new file mode 100644
index 0000000000..1378e296c8
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2012.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\listdevs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/listdevs_2013.vcxproj b/Externals/libusb/msvc/listdevs_2013.vcxproj
new file mode 100644
index 0000000000..7289504c9d
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_2013.vcxproj
@@ -0,0 +1,169 @@
+<?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">
+    <ProjectName>listdevs</ProjectName>
+    <ProjectGuid>{F4938DB0-3DE7-4737-9C5A-EAD1BE819F87}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\listdevs.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/listdevs_sources b/Externals/libusb/msvc/listdevs_sources
new file mode 100644
index 0000000000..97a5723e4c
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_sources
@@ -0,0 +1,19 @@
+TARGETNAME=listdevs
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\libusb;$(DDK_INC_PATH)
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
+SOURCES=..\listdevs.c
diff --git a/Externals/libusb/msvc/listdevs_wince.vcproj b/Externals/libusb/msvc/listdevs_wince.vcproj
new file mode 100644
index 0000000000..1bb6c6dca7
--- /dev/null
+++ b/Externals/libusb/msvc/listdevs_wince.vcproj
@@ -0,0 +1,1120 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="listdevs"
+	ProjectGUID="{960C3BC3-26D6-49C7-ACE4-0AE65CC049E6}"
+	RootNamespace="listdevs"
+	>
+	<Platforms>
+		<Platform
+			Name="STANDARDSDK_500 (ARMV4I)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (SH4)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (x86)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\listdevs"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}"
+			RelativePathToProject=".\libusb-1.0.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\listdevs.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/missing.c b/Externals/libusb/msvc/missing.c
new file mode 100644
index 0000000000..85d9d6f344
--- /dev/null
+++ b/Externals/libusb/msvc/missing.c
@@ -0,0 +1,80 @@
+/*
+ * Source file for missing WinCE functionality
+ * Copyright © 2012 RealVNC Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "missing.h"
+
+#include <config.h>
+#include <libusbi.h>
+
+#include <windows.h>
+
+// The registry path to store environment variables
+#define ENVIRONMENT_REG_PATH _T("Software\\libusb\\environment")
+
+/* Workaround getenv not being available on WinCE.
+ * Instead look in HKLM\Software\libusb\environment */
+char *getenv(const char *name)
+{
+	static char value[MAX_PATH];
+	TCHAR wValue[MAX_PATH];
+	WCHAR wName[MAX_PATH];
+	DWORD dwType, dwData;
+	HKEY hkey;
+	LONG rc;
+
+	if (!name)
+		return NULL;
+
+	if (MultiByteToWideChar(CP_UTF8, 0, name, -1, wName, MAX_PATH) <= 0) {
+		usbi_dbg("Failed to convert environment variable name to wide string");
+		return NULL;
+	}
+	wName[MAX_PATH - 1] = 0; // Be sure it's NUL terminated
+
+	rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ENVIRONMENT_REG_PATH, 0, KEY_QUERY_VALUE, &hkey);
+	if (rc != ERROR_SUCCESS) {
+		usbi_dbg("Failed to open registry key for getenv with error %d", rc);
+		return NULL;
+	}
+
+	// Attempt to read the key
+	dwData = sizeof(wValue);
+	rc = RegQueryValueEx(hkey, wName, NULL, &dwType,
+		(LPBYTE)&wValue, &dwData);
+	RegCloseKey(hkey);
+	if (rc != ERROR_SUCCESS) {
+		usbi_dbg("Failed to read registry key value for getenv with error %d", rc);
+		return NULL;
+	}
+	if (dwType != REG_SZ) {
+		usbi_dbg("Registry value was of type %d instead of REG_SZ", dwType);
+		return NULL;
+	}
+
+	// Success in reading the key, convert from WCHAR to char
+	if (WideCharToMultiByte(CP_UTF8, 0,
+			wValue, dwData / sizeof(*wValue),
+			value, MAX_PATH,
+			NULL, NULL) <= 0) {
+		usbi_dbg("Failed to convert environment variable value to narrow string");
+		return NULL;
+	}
+	value[MAX_PATH - 1] = 0; // Be sure it's NUL terminated
+	return value;
+}
diff --git a/Externals/libusb/msvc/missing.h b/Externals/libusb/msvc/missing.h
new file mode 100644
index 0000000000..183b9d35a2
--- /dev/null
+++ b/Externals/libusb/msvc/missing.h
@@ -0,0 +1,32 @@
+/*
+ * Header file for missing WinCE functionality
+ * Copyright © 2012-2013 RealVNC Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef MISSING_H
+#define MISSING_H
+
+/* Windows CE doesn't have SleepEx() - Fallback to Sleep() */
+#define SleepEx(m, a) Sleep(m)
+
+/* Windows CE doesn't have any APIs to query environment variables.
+ *
+ * This contains a registry based implementation of getenv.
+ */
+char *getenv(const char *name);
+
+#endif
diff --git a/Externals/libusb/msvc/stdint.h b/Externals/libusb/msvc/stdint.h
new file mode 100644
index 0000000000..00988d9bba
--- /dev/null
+++ b/Externals/libusb/msvc/stdint.h
@@ -0,0 +1,256 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file was originally part of the w64 mingw-runtime package.
+ */
+
+/* ISO C9x  7.18  Integer types <stdint.h>
+ * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
+ *
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
+ *  Modified for libusb/MSVC: Pete Batard <pbatard@gmail.com>
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  Date: 2010-04-02
+ */
+
+#ifndef _MSC_VER
+#error This header should only be used with Microsoft compilers
+#endif
+
+#ifndef _STDINT_H
+#define _STDINT_H
+
+#ifndef _INTPTR_T_DEFINED
+#define _INTPTR_T_DEFINED
+#ifndef __intptr_t_defined
+#define __intptr_t_defined
+#undef intptr_t
+#ifdef _WIN64
+  typedef __int64 intptr_t;
+#else
+  typedef int intptr_t;
+#endif /* _WIN64 */
+#endif /* __intptr_t_defined */
+#endif /* _INTPTR_T_DEFINED */
+
+#ifndef _UINTPTR_T_DEFINED
+#define _UINTPTR_T_DEFINED
+#ifndef __uintptr_t_defined
+#define __uintptr_t_defined
+#undef uintptr_t
+#ifdef _WIN64
+  typedef unsigned __int64 uintptr_t;
+#else
+  typedef unsigned int uintptr_t;
+#endif /* _WIN64 */
+#endif /* __uintptr_t_defined */
+#endif /* _UINTPTR_T_DEFINED */
+
+#ifndef _PTRDIFF_T_DEFINED
+#define _PTRDIFF_T_DEFINED
+#ifndef _PTRDIFF_T_
+#define _PTRDIFF_T_
+#undef ptrdiff_t
+#ifdef _WIN64
+  typedef __int64 ptrdiff_t;
+#else
+  typedef int ptrdiff_t;
+#endif /* _WIN64 */
+#endif /* _PTRDIFF_T_ */
+#endif /* _PTRDIFF_T_DEFINED */
+
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
+#ifndef __cplusplus
+  typedef unsigned short wchar_t;
+#endif /* C++ */
+#endif /* _WCHAR_T_DEFINED */
+
+#ifndef _WCTYPE_T_DEFINED
+#define _WCTYPE_T_DEFINED
+#ifndef _WINT_T
+#define _WINT_T
+  typedef unsigned short wint_t;
+  typedef unsigned short wctype_t;
+#endif /* _WINT_T */
+#endif /* _WCTYPE_T_DEFINED */
+
+/* 7.18.1.1  Exact-width integer types */
+typedef __int8 int8_t;
+typedef unsigned __int8   uint8_t;
+typedef __int16  int16_t;
+typedef unsigned __int16  uint16_t;
+typedef __int32  int32_t;
+typedef unsigned __int32  uint32_t;
+typedef __int64  int64_t;
+typedef unsigned __int64   uint64_t;
+
+/* 7.18.1.2  Minimum-width integer types */
+typedef signed char int_least8_t;
+typedef unsigned char   uint_least8_t;
+typedef short  int_least16_t;
+typedef unsigned short  uint_least16_t;
+typedef int  int_least32_t;
+typedef unsigned   uint_least32_t;
+typedef __int64  int_least64_t;
+typedef unsigned __int64   uint_least64_t;
+
+/*  7.18.1.3  Fastest minimum-width integer types
+ *  Not actually guaranteed to be fastest for all purposes
+ *  Here we use the exact-width types for 8 and 16-bit ints.
+ */
+typedef __int8 int_fast8_t;
+typedef unsigned __int8 uint_fast8_t;
+typedef __int16  int_fast16_t;
+typedef unsigned __int16  uint_fast16_t;
+typedef __int32  int_fast32_t;
+typedef unsigned  __int32  uint_fast32_t;
+typedef __int64  int_fast64_t;
+typedef unsigned __int64   uint_fast64_t;
+
+/* 7.18.1.5  Greatest-width integer types */
+typedef __int64  intmax_t;
+typedef unsigned __int64   uintmax_t;
+
+/* 7.18.2  Limits of specified-width integer types */
+
+/* 7.18.2.1  Limits of exact-width integer types */
+#define INT8_MIN (-128)
+#define INT16_MIN (-32768)
+#define INT32_MIN (-2147483647 - 1)
+#define INT64_MIN  (-9223372036854775807LL - 1)
+
+#define INT8_MAX 127
+#define INT16_MAX 32767
+#define INT32_MAX 2147483647
+#define INT64_MAX 9223372036854775807LL
+
+#define UINT8_MAX 255
+#define UINT16_MAX 65535
+#define UINT32_MAX 0xffffffffU  /* 4294967295U */
+#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
+
+/* 7.18.2.2  Limits of minimum-width integer types */
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST64_MIN INT64_MIN
+
+#define INT_LEAST8_MAX INT8_MAX
+#define INT_LEAST16_MAX INT16_MAX
+#define INT_LEAST32_MAX INT32_MAX
+#define INT_LEAST64_MAX INT64_MAX
+
+#define UINT_LEAST8_MAX UINT8_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
+
+/* 7.18.2.3  Limits of fastest minimum-width integer types */
+#define INT_FAST8_MIN INT8_MIN
+#define INT_FAST16_MIN INT16_MIN
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST64_MIN INT64_MIN
+
+#define INT_FAST8_MAX INT8_MAX
+#define INT_FAST16_MAX INT16_MAX
+#define INT_FAST32_MAX INT32_MAX
+#define INT_FAST64_MAX INT64_MAX
+
+#define UINT_FAST8_MAX UINT8_MAX
+#define UINT_FAST16_MAX UINT16_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+#define UINT_FAST64_MAX UINT64_MAX
+
+/* 7.18.2.4  Limits of integer types capable of holding
+    object pointers */
+#ifdef _WIN64
+#define INTPTR_MIN INT64_MIN
+#define INTPTR_MAX INT64_MAX
+#define UINTPTR_MAX UINT64_MAX
+#else
+#define INTPTR_MIN INT32_MIN
+#define INTPTR_MAX INT32_MAX
+#define UINTPTR_MAX UINT32_MAX
+#endif
+
+/* 7.18.2.5  Limits of greatest-width integer types */
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
+
+/* 7.18.3  Limits of other integer types */
+#ifdef _WIN64
+#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MAX INT64_MAX
+#else
+#define PTRDIFF_MIN INT32_MIN
+#define PTRDIFF_MAX INT32_MAX
+#endif
+
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
+
+#ifndef SIZE_MAX
+#ifdef _WIN64
+#define SIZE_MAX UINT64_MAX
+#else
+#define SIZE_MAX UINT32_MAX
+#endif
+#endif
+
+#ifndef WCHAR_MIN  /* also in wchar.h */
+#define WCHAR_MIN 0U
+#define WCHAR_MAX 0xffffU
+#endif
+
+/*
+ * wint_t is unsigned short for compatibility with MS runtime
+ */
+#define WINT_MIN 0U
+#define WINT_MAX 0xffffU
+
+
+/* 7.18.4  Macros for integer constants */
+
+/* 7.18.4.1  Macros for minimum-width integer constants
+
+    Accoding to Douglas Gwyn <gwyn@arl.mil>:
+	"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
+	9899:1999 as initially published, the expansion was required
+	to be an integer constant of precisely matching type, which
+	is impossible to accomplish for the shorter types on most
+	platforms, because C99 provides no standard way to designate
+	an integer constant with width less than that of type int.
+	TC1 changed this to require just an integer constant
+	*expression* with *promoted* type."
+
+	The trick used here is from Clive D W Feather.
+*/
+
+#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val))
+#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val))
+#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val))
+/*  The 'trick' doesn't work in C89 for long long because, without
+    suffix, (val) will be evaluated as int, not intmax_t */
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val) (val)
+#define UINT16_C(val) (val)
+#define UINT32_C(val) (val##i32)
+#define UINT64_C(val) val##ui64
+
+/* 7.18.4.2  Macros for greatest-width integer constants */
+#define INTMAX_C(val) val##i64
+#define UINTMAX_C(val) val##ui64
+
+#endif
diff --git a/Externals/libusb/msvc/stress_2005.vcproj b/Externals/libusb/msvc/stress_2005.vcproj
new file mode 100644
index 0000000000..ca59d1b97a
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2005.vcproj
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="stress"
+	ProjectGUID="{53942EFF-C810-458D-B3CB-EE5CE9F1E781}"
+	RootNamespace="tests"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\tests"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\tests\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\tests"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\tests\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\tests"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\tests\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\tests"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\tests\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\tests\testlib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tests\stress.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\tests\libusb_testlib.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/stress_2010.vcxproj b/Externals/libusb/msvc/stress_2010.vcxproj
new file mode 100644
index 0000000000..b6d6b85125
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2010.vcxproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>stress</ProjectName>
+    <ProjectGuid>{53942EFF-C810-458D-B3CB-EE5CE9F1E781}</ProjectGuid>
+    <RootNamespace>tests</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\stress.c" />
+    <ClCompile Include="..\tests\testlib.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\libusb_testlib.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/stress_2010.vcxproj.filters b/Externals/libusb/msvc/stress_2010.vcxproj.filters
new file mode 100644
index 0000000000..fca1eb6352
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2010.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{28b6220e-d087-4f48-bd69-ffe0ac5bcc7a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\stress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tests\testlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\libusb_testlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/stress_2012.vcxproj b/Externals/libusb/msvc/stress_2012.vcxproj
new file mode 100644
index 0000000000..c3cdea1bea
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2012.vcxproj
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>stress</ProjectName>
+    <ProjectGuid>{53942EFF-C810-458D-B3CB-EE5CE9F1E781}</ProjectGuid>
+    <RootNamespace>tests</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\stress.c" />
+    <ClCompile Include="..\tests\testlib.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2012.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\libusb_testlib.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/stress_2012.vcxproj.filters b/Externals/libusb/msvc/stress_2012.vcxproj.filters
new file mode 100644
index 0000000000..fca1eb6352
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2012.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{28b6220e-d087-4f48-bd69-ffe0ac5bcc7a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\stress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tests\testlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\libusb_testlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/stress_2013.vcxproj b/Externals/libusb/msvc/stress_2013.vcxproj
new file mode 100644
index 0000000000..df1b586360
--- /dev/null
+++ b/Externals/libusb/msvc/stress_2013.vcxproj
@@ -0,0 +1,171 @@
+<?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">
+    <ProjectName>stress</ProjectName>
+    <ProjectGuid>{53942EFF-C810-458D-B3CB-EE5CE9F1E781}</ProjectGuid>
+    <RootNamespace>tests</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\tests\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\stress.c" />
+    <ClCompile Include="..\tests\testlib.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\libusb_testlib.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/stress_wince.vcproj b/Externals/libusb/msvc/stress_wince.vcproj
new file mode 100644
index 0000000000..a0bf46905b
--- /dev/null
+++ b/Externals/libusb/msvc/stress_wince.vcproj
@@ -0,0 +1,1128 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="stress"
+	ProjectGUID="{61476624-3354-48C8-9334-85AC0D624640}"
+	RootNamespace="stress"
+	>
+	<Platforms>
+		<Platform
+			Name="STANDARDSDK_500 (ARMV4I)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (SH4)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (x86)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\stress"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\tests"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\tests\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}"
+			RelativePathToProject=".\libusb_dll.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\tests\stress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\testlib.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\tests\libusb_testlib.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/xusb.dsp b/Externals/libusb/msvc/xusb.dsp
new file mode 100644
index 0000000000..a99178ccd7
--- /dev/null
+++ b/Externals/libusb/msvc/xusb.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="xusb" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xusb - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xusb.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xusb.mak" CFG="xusb - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xusb - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xusb - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xusb - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Win32/Release/examples"
+# PROP Intermediate_Dir "../Win32/Release/examples/xusb"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /EHsc /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "xusb - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "xusb___Win32_Debug"
+# PROP BASE Intermediate_Dir "xusb___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Win32/Debug/examples"
+# PROP Intermediate_Dir "../Win32/Debug/examples/xusb"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /U "_MBCS" /FR /FD /GZ /EHsc /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /n "../Win32/Debug/dll/core.sbr" "../Win32/Debug/dll/descriptor.sbr" "../Win32/Debug/dll/io.sbr" "../Win32/Debug/dll/sync.sbr" "../Win32/Debug/dll/poll_windows.sbr" "../Win32/Debug/dll/threads_windows.sbr" "../Win32/Debug/dll/windows_usb.sbr"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xusb - Win32 Release"
+# Name "xusb - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\examples\xusb.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/Externals/libusb/msvc/xusb_2005.vcproj b/Externals/libusb/msvc/xusb_2005.vcproj
new file mode 100644
index 0000000000..b12f5c13df
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2005.vcproj
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="xusb"
+	ProjectGUID="{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}"
+	RootNamespace="examples"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+			IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\libusb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\xusb.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/msvc/xusb_2010.vcxproj b/Externals/libusb/msvc/xusb_2010.vcxproj
new file mode 100644
index 0000000000..7c4811d9f7
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2010.vcxproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>xusb</ProjectName>
+    <ProjectGuid>{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2010.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/xusb_2010.vcxproj.filters b/Externals/libusb/msvc/xusb_2010.vcxproj.filters
new file mode 100644
index 0000000000..f71902f455
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/xusb_2012.vcxproj b/Externals/libusb/msvc/xusb_2012.vcxproj
new file mode 100644
index 0000000000..7d64df51d9
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2012.vcxproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="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">
+    <ProjectName>xusb</ProjectName>
+    <ProjectGuid>{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2012.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/xusb_2012.vcxproj.filters b/Externals/libusb/msvc/xusb_2012.vcxproj.filters
new file mode 100644
index 0000000000..f71902f455
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2012.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/xusb_2013.vcxproj b/Externals/libusb/msvc/xusb_2013.vcxproj
new file mode 100644
index 0000000000..3fd53ad69b
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_2013.vcxproj
@@ -0,0 +1,167 @@
+<?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">
+    <ProjectName>xusb</ProjectName>
+    <ProjectGuid>{3F3138D0-7AB7-4268-9BF3-1A3EA5503A11}</ProjectGuid>
+    <RootNamespace>examples</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)$(ProjectName).htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\xusb.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include=".\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/libusb/msvc/xusb_sources b/Externals/libusb/msvc/xusb_sources
new file mode 100644
index 0000000000..b43f94f683
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_sources
@@ -0,0 +1,20 @@
+TARGETNAME=xusb
+TARGETTYPE=PROGRAM
+386_STDCALL=0
+
+_NT_TARGET_VERSION= $(_NT_TARGET_VERSION_WINXP)
+
+!IFNDEF MSC_WARNING_LEVEL
+MSC_WARNING_LEVEL=/W3
+!ENDIF
+
+!IFDEF STATIC_LIBC
+USE_LIBCMT=1
+!ELSE
+USE_MSVCRT=1
+!ENDIF
+
+UMTYPE=console
+INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH)
+UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
+SOURCES=..\xusb.c
diff --git a/Externals/libusb/msvc/xusb_wince.vcproj b/Externals/libusb/msvc/xusb_wince.vcproj
new file mode 100644
index 0000000000..f994678013
--- /dev/null
+++ b/Externals/libusb/msvc/xusb_wince.vcproj
@@ -0,0 +1,1120 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="xusb"
+	ProjectGUID="{93F53A7E-6DEF-469A-ABD4-A5AD02A0A511}"
+	RootNamespace="xusb"
+	>
+	<Platforms>
+		<Platform
+			Name="STANDARDSDK_500 (ARMV4I)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSII_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (MIPSIV_FP)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (SH4)"
+		/>
+		<Platform
+			Name="STANDARDSDK_500 (x86)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\xusb"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (ARMV4I)"
+			OutputDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\ARMV4I\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII)"
+			OutputDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSII_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSII_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (MIPSIV_FP)"
+			OutputDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\MIPSIV_FP\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (SH4)"
+			OutputDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\SH4\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|STANDARDSDK_500 (x86)"
+			OutputDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples"
+			IntermediateDirectory="$(SolutionDir)..\x86\$(ConfigurationName)\examples\$(TargetName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="..\libusb;."
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				SubSystem="9"
+				IgnoreDefaultLibraryNames="oldnames.lib,libc.lib"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="mainACRTStartup"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{6A49B75F-FB1C-45C0-B7C3-A7698255E7E9}"
+			RelativePathToProject=".\libusb-1.0.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\examples\xusb.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Externals/libusb/win32/libusb-1.0.lib b/Externals/libusb/win32/libusb-1.0.lib
deleted file mode 100644
index 0434d5ebde..0000000000
Binary files a/Externals/libusb/win32/libusb-1.0.lib and /dev/null differ
diff --git a/Externals/libusb/x64/libusb-1.0.lib b/Externals/libusb/x64/libusb-1.0.lib
deleted file mode 100644
index 8f67e7d1c2..0000000000
Binary files a/Externals/libusb/x64/libusb-1.0.lib and /dev/null differ
diff --git a/Externals/licenses.md b/Externals/licenses.md
new file mode 100644
index 0000000000..8aa94f1305
--- /dev/null
+++ b/Externals/licenses.md
@@ -0,0 +1,70 @@
+Dolphin includes or links code of the following third-party software projects:
+
+- [ALSA](http://www.alsa-project.org/):
+   [LGPLv2.1+](http://git.alsa-project.org/?p=alsa-lib.git;a=blob;f=COPYING)
+- [BlueZ](http://www.bluez.org/):
+   [LGPLv2.1+](https://git.kernel.org/cgit/bluetooth/bluez.git/tree/COPYING.LIB)
+- [Bochs](http://bochs.sourceforge.net/):
+   [LGPLv2.1+](http://bochs.sourceforge.net/cgi-bin/lxr/source/COPYING)
+- [ENet](http://enet.bespin.org/):
+   [MIT](http://enet.bespin.org/License.html)
+- [GCEmu](http://sourceforge.net/projects/gcemu-project/):
+   GPLv2+
+- [gettext](https://www.gnu.org/software/gettext/):
+   [GPLv3+](http://git.savannah.gnu.org/cgit/gettext.git/tree/COPYING)
+- [googletest](https://code.google.com/p/googletest/):
+   [3-clause BSD](https://code.google.com/p/googletest/source/browse/trunk/LICENSE)
+- [libao](https://www.xiph.org/ao/):
+   [GPLv2+](https://trac.xiph.org/browser/trunk/ao/README)
+- [libav](https://libav.org/):
+   [GPLv2+](https://libav.org/legal.html)
+- [libcdio](https://www.gnu.org/software/libcdio/):
+   [GPLv3+](http://git.savannah.gnu.org/gitweb/?p=libcdio.git;a=blob_plain;f=COPYING)
+- [libiconv](https://www.gnu.org/software/libiconv/):
+   [LGPLv2+](http://git.savannah.gnu.org/cgit/libiconv.git/tree/COPYING.LIB)
+- [libpng](http://www.libpng.org/pub/png/libpng.html):
+   [libpng license](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt)
+- [libusb](http://libusb.info/):
+   [LGPLv2.1+](https://github.com/libusb/libusb/blob/master/COPYING)
+- [LLVM](http://llvm.org/):
+   [University of Illinois/NCSA Open Source license](http://llvm.org/docs/DeveloperPolicy.html#license)
+- [LZO](http://www.oberhumer.com/opensource/lzo/):
+   [GPLv2+](http://www.oberhumer.com/opensource/gpl.html)
+- [MiniUPnPc](http://miniupnp.free.fr/):
+   [3-clause BSD](https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/LICENSE)
+- [Microsoft Visual C++ Runtime Library](http://www.microsoft.com/en-us/download/details.aspx?id=40784):
+   [System Library if not distributed](https://www.gnu.org/licenses/gpl-faq.html#WindowsRuntimeAndGPL)
+- [OpenAL Soft](http://kcat.strangesoft.net/openal.html):
+   [LGPLv2+](http://repo.or.cz/w/openal-soft.git/blob/HEAD:/COPYING)
+- [OpenGL Header (MESA)](http://mesa3d.org/):
+   [MIT](http://cgit.freedesktop.org/mesa/mesa/tree/include/GL/gl.h)
+- [OpenGL Extension Header (Khronos)](https://www.opengl.org/registry/#headers):
+   [MIT](https://www.opengl.org/registry/api/GL/glext.h)
+- [PearPC](http://pearpc.sourceforge.net/):
+   [GPLv2](http://pearpc.cvs.sourceforge.net/viewvc/pearpc/pearpc/COPYING?view=markup) (with permission by the author to license under GPLv2+)
+- [PolarSSL](https://polarssl.org/):
+   [GPLv2+](https://github.com/polarssl/polarssl/blob/development/LICENSE)
+- [PortAudio](http://www.portaudio.com/):
+   [MIT](http://www.portaudio.com/license.html)
+- [PulseAudio](http://www.freedesktop.org/wiki/Software/PulseAudio/):
+   [LGPLv2.1+](http://cgit.freedesktop.org/pulseaudio/pulseaudio/tree/LICENSE)
+- [Qt5](http://qt-project.org/):
+   [LGPLv3 and other licenses](http://doc.qt.io/qt-5/licensing.html)
+- [SDL](https://www.libsdl.org/):
+   [zlib license](http://hg.libsdl.org/SDL/file/tip/COPYING.txt)
+- [SFML](http://www.sfml-dev.org/):
+   [zlib license](http://www.sfml-dev.org/license.php)
+- [SOIL](http://www.lonesock.net/soil.html):
+   [public domain](http://www.lonesock.net/soil.html)
+- [SoundTouch](http://www.surina.net/soundtouch/):
+   [LGPLv2+](http://www.surina.net/soundtouch/license.html)
+- [TAP-Windows](https://openvpn.net/):
+   header only
+- [wxWidgets](https://www.wxwidgets.org/):
+   [wxWindows Library License](https://www.wxwidgets.org/about/licence/) (LGPLv2+-like)
+- [XAudio2](http://msdn.microsoft.com/en-us/library/windows/desktop/hh405049.aspx):
+   headers only
+- [xxHash](https://github.com/Cyan4973/xxHash):
+   [2-clause BSD](https://github.com/Cyan4973/xxHash/blob/master/LICENSE)
+- [zlib](http://www.zlib.net/):
+   [zlib license](http://www.zlib.net/zlib_license.html)
diff --git a/Externals/miniupnpc/CMakeLists.txt b/Externals/miniupnpc/CMakeLists.txt
index 404ef65b94..334488bd48 100644
--- a/Externals/miniupnpc/CMakeLists.txt
+++ b/Externals/miniupnpc/CMakeLists.txt
@@ -14,7 +14,7 @@ elseif(WIN32)
 	set(LDLIBS ${WINSOCK2_LIBRARY} ${IPHLPAPI_LIBRARY} ${LDLIBS})
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if(APPLE)
 	add_definitions(-DMACOSX -D_DARWIN_C_SOURCE)
 endif()
 
diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj
index db92cd61f9..7f832784a9 100644
--- a/Externals/miniupnpc/miniupnpc.vcxproj
+++ b/Externals/miniupnpc/miniupnpc.vcxproj
@@ -1,164 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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>{A680190D-0764-485B-9CF3-A82C5EDD5715}</ProjectGuid>
-    <RootNamespace>miniupnpc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\bsdqueue.h" />
-    <ClInclude Include="src\codelength.h" />
-    <ClInclude Include="src\connecthostport.h" />
-    <ClInclude Include="src\declspec.h" />
-    <ClInclude Include="src\igd_desc_parse.h" />
-    <ClInclude Include="src\minisoap.h" />
-    <ClInclude Include="src\minissdpc.h" />
-    <ClInclude Include="src\miniupnpc.h" />
-    <ClInclude Include="src\miniupnpcstrings.h" />
-    <ClInclude Include="src\miniupnpctypes.h" />
-    <ClInclude Include="src\miniwget.h" />
-    <ClInclude Include="src\minixml.h" />
-    <ClInclude Include="src\portlistingparse.h" />
-    <ClInclude Include="src\receivedata.h" />
-    <ClInclude Include="src\upnpcommands.h" />
-    <ClInclude Include="src\upnperrors.h" />
-    <ClInclude Include="src\upnpreplyparse.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\connecthostport.c" />
-    <ClCompile Include="src\igd_desc_parse.c" />
-    <ClCompile Include="src\minisoap.c" />
-    <ClCompile Include="src\miniupnpc.c" />
-    <ClCompile Include="src\miniwget.c" />
-    <ClCompile Include="src\minixml.c" />
-    <ClCompile Include="src\portlistingparse.c" />
-    <ClCompile Include="src\receivedata.c" />
-    <ClCompile Include="src\upnpc.c" />
-    <ClCompile Include="src\upnpcommands.c" />
-    <ClCompile Include="src\upnperrors.c" />
-    <ClCompile Include="src\upnpreplyparse.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{31643FDB-1BB8-4965-9DE7-000FC88D35AE}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClInclude Include="src\bsdqueue.h" />
+    <ClInclude Include="src\codelength.h" />
+    <ClInclude Include="src\connecthostport.h" />
+    <ClInclude Include="src\declspec.h" />
+    <ClInclude Include="src\igd_desc_parse.h" />
+    <ClInclude Include="src\minisoap.h" />
+    <ClInclude Include="src\minissdpc.h" />
+    <ClInclude Include="src\miniupnpc.h" />
+    <ClInclude Include="src\miniupnpcstrings.h" />
+    <ClInclude Include="src\miniupnpctypes.h" />
+    <ClInclude Include="src\miniwget.h" />
+    <ClInclude Include="src\minixml.h" />
+    <ClInclude Include="src\portlistingparse.h" />
+    <ClInclude Include="src\receivedata.h" />
+    <ClInclude Include="src\upnpcommands.h" />
+    <ClInclude Include="src\upnperrors.h" />
+    <ClInclude Include="src\upnpreplyparse.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\connecthostport.c" />
+    <ClCompile Include="src\igd_desc_parse.c" />
+    <ClCompile Include="src\minisoap.c" />
+    <ClCompile Include="src\miniupnpc.c" />
+    <ClCompile Include="src\miniwget.c" />
+    <ClCompile Include="src\minixml.c" />
+    <ClCompile Include="src\portlistingparse.c" />
+    <ClCompile Include="src\receivedata.c" />
+    <ClCompile Include="src\upnpcommands.c" />
+    <ClCompile Include="src\upnperrors.c" />
+    <ClCompile Include="src\upnpreplyparse.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
+    <None Include="README" />
+    <None Include="src\miniupnpc.def" />
+    <None Include="VERSION" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="apiversions.txt" />
+    <Text Include="Changelog.txt" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Externals/miniupnpc/miniupnpc.vcxproj.filters b/Externals/miniupnpc/miniupnpc.vcxproj.filters
deleted file mode 100644
index 1b4bfa312a..0000000000
--- a/Externals/miniupnpc/miniupnpc.vcxproj.filters
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\bsdqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\codelength.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\connecthostport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\declspec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\igd_desc_parse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\minisoap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\minissdpc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\miniupnpc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\miniupnpcstrings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\miniupnpctypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\miniwget.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\minixml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\portlistingparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\receivedata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\upnpcommands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\upnperrors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\upnpreplyparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\igd_desc_parse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\minisoap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\miniupnpc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\miniwget.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\minixml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\portlistingparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\receivedata.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\upnpc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\upnpcommands.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\upnperrors.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\upnpreplyparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\connecthostport.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/msvcrt/Win32/vcomp100.dll b/Externals/msvcrt/Win32/vcomp100.dll
deleted file mode 100644
index 579e4381ff..0000000000
Binary files a/Externals/msvcrt/Win32/vcomp100.dll and /dev/null differ
diff --git a/Externals/msvcrt/x64/msvcp120.dll b/Externals/msvcrt/x64/msvcp120.dll
new file mode 100644
index 0000000000..4ea1efa734
Binary files /dev/null and b/Externals/msvcrt/x64/msvcp120.dll differ
diff --git a/Externals/msvcrt/x64/msvcr120.dll b/Externals/msvcrt/x64/msvcr120.dll
new file mode 100644
index 0000000000..d711c92232
Binary files /dev/null and b/Externals/msvcrt/x64/msvcr120.dll differ
diff --git a/Externals/msvcrt/x64/vcomp100.dll b/Externals/msvcrt/x64/vcomp100.dll
deleted file mode 100644
index 15ab393e85..0000000000
Binary files a/Externals/msvcrt/x64/vcomp100.dll and /dev/null differ
diff --git a/Externals/polarssl/CMakeLists.txt b/Externals/polarssl/CMakeLists.txt
index 54aa012fdb..6f607e76c4 100644
--- a/Externals/polarssl/CMakeLists.txt
+++ b/Externals/polarssl/CMakeLists.txt
@@ -1,37 +1,2 @@
-cmake_minimum_required(VERSION 2.6)
-project(POLARSSL C)
-
-if(CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wall -Wextra -W -Wdeclaration-after-statement")
-  set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
-  set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 -fprofile-arcs -ftest-coverage -lgcov")
-endif(CMAKE_COMPILER_IS_GNUCC)
- 
-if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
-  if(CMAKE_COMPILER_IS_GNUCC)
-    set(CMAKE_SHARED_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
-  endif(CMAKE_COMPILER_IS_GNUCC)
-endif(CMAKE_BUILD_TYPE STREQUAL "Coverage")
-
-option(USE_PKCS11_HELPER_LIBRARY "Build PolarSSL with the pkcs11-helper library." OFF)
-
-option(ENABLE_ZLIB_SUPPORT "Build PolarSSL with zlib library." OFF)
-
-if(LIB_INSTALL_DIR)
-else()
-set(LIB_INSTALL_DIR lib)
-endif()
-
 include_directories(include/)
-
-if(ENABLE_ZLIB_SUPPORT)
-  find_package(ZLIB)
-
-  if(ZLIB_FOUND)
-    include_directories(ZLIB_INCLUDE_DIR)
-  endif(ZLIB_FOUND)
-endif(ENABLE_ZLIB_SUPPORT)
-
 add_subdirectory(library)
-
-                  
diff --git a/Externals/polarssl/ChangeLog b/Externals/polarssl/ChangeLog
index 21c91df93b..163bdb796e 100644
--- a/Externals/polarssl/ChangeLog
+++ b/Externals/polarssl/ChangeLog
@@ -1,4 +1,478 @@
-PolarSSL ChangeLog
+PolarSSL ChangeLog (Sorted per branch, date)
+
+= PolarSSL 1.3.8 released 2014-07-11
+Security
+   * Fix length checking for AEAD ciphersuites (found by Codenomicon).
+     It was possible to crash the server (and client) using crafted messages
+     when a GCM suite was chosen.
+
+Features
+   * Add CCM module and cipher mode to Cipher Layer
+   * Support for CCM and CCM_8 ciphersuites
+   * Support for parsing and verifying RSASSA-PSS signatures in the X.509
+     modules (certificates, CRLs and CSRs).
+   * Blowfish in the cipher layer now supports variable length keys.
+   * Add example config.h for PSK with CCM, optimized for low RAM usage.
+   * Optimize for RAM usage in example config.h for NSA Suite B profile.
+   * Add POLARSSL_REMOVE_ARC4_CIPHERSUITES to allow removing RC4 ciphersuites
+     from the default list (inactive by default).
+   * Add server-side enforcement of sent renegotiation requests
+     (ssl_set_renegotiation_enforced())
+   * Add SSL_CIPHERSUITES config.h flag to allow specifying a list of
+     ciphersuites to use and save some memory if the list is small.
+
+Changes
+   * Add LINK_WITH_PTHREAD option in CMake for explicit linking that is
+     required on some platforms (e.g. OpenBSD)
+   * Migrate zeroizing of data to polarssl_zeroize() instead of memset()
+     against unwanted compiler optimizations
+   * md_list() now returns hashes strongest first
+   * Selection of hash for signing ServerKeyExchange in TLS 1.2 now picks
+     strongest offered by client.
+   * All public contexts have _init() and _free() functions now for simpler
+     usage pattern
+
+Bugfix
+   * Fix in debug_print_msg()
+   * Enforce alignment in the buffer allocator even if buffer is not aligned
+   * Remove less-than-zero checks on unsigned numbers
+   * Stricter check on SSL ClientHello internal sizes compared to actual packet
+     size (found by TrustInSoft)
+   * Fix WSAStartup() return value check (found by Peter Vaskovic)
+   * Other minor issues (found by Peter Vaskovic)
+   * Fix symlink command for cross compiling with CMake (found by Andre
+     Heinecke)
+   * Fix DER output of gen_key app (found by Gergely Budai)
+   * Very small records were incorrectly rejected when truncated HMAC was in
+     use with some ciphersuites and versions (RC4 in all versions, CBC with
+     versions < TLS 1.1).
+   * Very large records using more than 224 bytes of padding were incorrectly
+     rejected with CBC-based ciphersuites and TLS >= 1.1
+   * Very large records using less padding could cause a buffer overread of up
+     to 32 bytes with CBC-based ciphersuites and TLS >= 1.1
+   * Restore ability to use a v1 cert as a CA if trusted locally. (This had
+     been removed in 1.3.6.)
+   * Restore ability to locally trust a self-signed cert that is not a proper
+     CA for use as an end entity certificate. (This had been removed in
+     1.3.6.)
+   * Fix preprocessor checks for bn_mul PPC asm (found by Barry K. Nathan).
+   * Use \n\t rather than semicolons for bn_mul asm, since some assemblers
+     interpret semicolons as comment delimiters (found by Barry K. Nathan).
+   * Fix off-by-one error in parsing Supported Point Format extension that
+     caused some handshakes to fail.
+   * Fix possible miscomputation of the premaster secret with DHE-PSK key
+     exchange that caused some handshakes to fail with other implementations.
+     (Failure rate <= 1/255 with common DHM moduli.)
+   * Disable broken Sparc64 bn_mul assembly (found by Florian Obser).
+   * Fix base64_decode() to return and check length correctly (in case of
+     tight buffers)
+   * Fix mpi_write_string() to write "00" as hex output for empty MPI (found
+     by Hui Dong)
+
+= PolarSSL 1.3.7 released on 2014-05-02
+Features
+   * debug_set_log_mode() added to determine raw or full logging
+   * debug_set_threshold() added to ignore messages over threshold level
+   * version_check_feature() added to check for compile-time options at
+     run-time
+
+Changes
+   * POLARSSL_CONFIG_OPTIONS has been removed. All values are individually
+     checked and filled in the relevant module headers
+   * Debug module only outputs full lines instead of parts
+   * Better support for the different Attribute Types from IETF PKIX (RFC 5280)
+   * AES-NI now compiles with "old" assemblers too
+   * Ciphersuites based on RC4 now have the lowest priority by default
+
+Bugfix
+   * Only iterate over actual certificates in ssl_write_certificate_request()
+     (found by Matthew Page)
+   * Typos in platform.c and pkcs11.c (found by Daniel Phillips and Steffan
+     Karger)
+   * cert_write app should use subject of issuer certificate as issuer of cert
+   * Fix false reject in padding check in ssl_decrypt_buf() for CBC
+     ciphersuites, for full SSL frames of data.
+   * Improve interoperability by not writing extension length in ClientHello /
+     ServerHello when no extensions are present (found by Matthew Page)
+   * rsa_check_pubkey() now allows an E up to N
+   * On OpenBSD, use arc4random_buf() instead of rand() to prevent warnings
+   * mpi_fill_random() was creating numbers larger than requested on
+     big-endian platform when size was not an integer number of limbs
+   * Fix dependencies issues in X.509 test suite.
+   * Some parts of ssl_tls.c were compiled even when the module was disabled.
+   * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer)
+   * Fix detection of Clang on some Apple platforms with CMake
+     (found by Barry K. Nathan)
+
+= PolarSSL 1.3.6 released on 2014-04-11
+
+Features
+   * Support for the ALPN SSL extension
+   * Add option 'use_dev_random' to gen_key application
+   * Enable verification of the keyUsage extension for CA and leaf
+     certificates (POLARSSL_X509_CHECK_KEY_USAGE)
+   * Enable verification of the extendedKeyUsage extension
+     (POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+
+Changes
+   * x509_crt_info() now prints information about parsed extensions as well
+   * pk_verify() now returns a specific error code when the signature is valid
+     but shorter than the supplied length.
+   * Use UTC time to check certificate validity.
+   * Reject certificates with times not in UTC, per RFC 5280.
+
+Security
+   * Avoid potential timing leak in ecdsa_sign() by blinding modular division.
+     (Found by Watson Ladd.)
+   * The notAfter date of some certificates was no longer checked since 1.3.5.
+     This affects certificates in the user-supplied chain except the top
+     certificate. If the user-supplied chain contains only one certificates,
+     it is not affected (ie, its notAfter date is properly checked).
+   * Prevent potential NULL pointer dereference in ssl_read_record() (found by
+     TrustInSoft)
+
+Bugfix
+   * The length of various ClientKeyExchange messages was not properly checked.
+   * Some example server programs were not sending the close_notify alert.
+   * Potential memory leak in mpi_exp_mod() when error occurs during
+     calculation of RR.
+   * Fixed malloc/free default #define in platform.c (found by Gergely Budai).
+   * Fixed type which made POLARSSL_ENTROPY_FORCE_SHA256 uneffective (found by
+     Gergely Budai).
+   * Fix #include path in ecdsa.h which wasn't accepted by some compilers.
+     (found by Gergely Budai)
+   * Fix compile errors when POLARSSL_ERROR_STRERROR_BC is undefined (found by
+     Shuo Chen).
+   * oid_get_numeric_string() used to truncate the output without returning an
+     error if the output buffer was just 1 byte too small.
+   * dhm_parse_dhm() (hence dhm_parse_dhmfile()) did not set dhm->len.
+   * Calling pk_debug() on an RSA-alt key would segfault.
+   * pk_get_size() and pk_get_len() were off by a factor 8 for RSA-alt keys.
+   * Potential buffer overwrite in pem_write_buffer() because of low length
+     indication (found by Thijs Alkemade)
+   * EC curves constants, which should be only in ROM since 1.3.3, were also
+     stored in RAM due to missing 'const's (found by Gergely Budai).
+
+= PolarSSL 1.3.5 released on 2014-03-26
+Features
+   * HMAC-DRBG as a separate module
+   * Option to set the Curve preference order (disabled by default)
+   * Single Platform compatilibity layer (for memory / printf / fprintf)
+   * Ability to provide alternate timing implementation
+   * Ability to force the entropy module to use SHA-256 as its basis
+     (POLARSSL_ENTROPY_FORCE_SHA256)
+   * Testing script ssl-opt.sh added for testing 'live' ssl option
+     interoperability against OpenSSL and PolarSSL
+   * Support for reading EC keys that use SpecifiedECDomain in some cases.
+   * Entropy module now supports seed writing and reading
+
+Changes
+   * Deprecated the Memory layer
+   * entropy_add_source(), entropy_update_manual() and entropy_gather()
+     now thread-safe if POLARSSL_THREADING_C defined
+   * Improvements to the CMake build system, contributed by Julian Ospald.
+   * Work around a bug of the version of Clang shipped by Apple with Mavericks
+     that prevented bignum.c from compiling. (Reported by Rafael Baptista.)
+   * Revamped the compat.sh interoperatibility script to include support for
+     testing against GnuTLS
+   * Deprecated ssl_set_own_cert_rsa() and ssl_set_own_cert_rsa_alt()
+   * Improvements to tests/Makefile, contributed by Oden Eriksson.
+
+Security
+   * Forbid change of server certificate during renegotiation to prevent
+     "triple handshake" attack when authentication mode is 'optional' (the
+     attack was already impossible when authentication is required).
+   * Check notBefore timestamp of certificates and CRLs from the future.
+   * Forbid sequence number wrapping
+   * Fixed possible buffer overflow with overlong PSK
+   * Possible remotely-triggered out-of-bounds memory access fixed (found by
+     TrustInSoft)
+
+Bugfix
+   * ecp_gen_keypair() does more tries to prevent failure because of
+     statistics
+   * Fixed bug in RSA PKCS#1 v1.5 "reversed" operations
+   * Fixed testing with out-of-source builds using cmake
+   * Fixed version-major intolerance in server
+   * Fixed CMake symlinking on out-of-source builds
+   * Fixed dependency issues in test suite
+   * Programs rsa_sign_pss and rsa_verify_pss were not using PSS since 1.3.0
+   * Bignum's MIPS-32 assembly was used on MIPS-64, causing chaos. (Found by
+     Alex Wilson.)
+   * ssl_cache was creating entries when max_entries=0 if TIMING_C was enabled.
+   * m_sleep() was sleeping twice too long on most Unix platforms.
+   * Fixed bug with session tickets and non-blocking I/O in the unlikely case
+     send() would return an EAGAIN error when sending the ticket.
+   * ssl_cache was leaking memory when reusing a timed out entry containing a
+     client certificate.
+   * ssl_srv was leaking memory when client presented a timed out ticket
+     containing a client certificate
+   * ssl_init() was leaving a dirty pointer in ssl_context if malloc of
+     out_ctr failed
+   * ssl_handshake_init() was leaving dirty pointers in subcontexts if malloc
+     of one of them failed
+   * Fix typo in rsa_copy() that impacted PKCS#1 v2 contexts
+   * x509_get_current_time() uses localtime_r() to prevent thread issues
+
+= PolarSSL 1.3.4 released on 2014-01-27
+Features
+   * Support for the Koblitz curves: secp192k1, secp224k1, secp256k1
+   * Support for RIPEMD-160
+   * Support for AES CFB8 mode
+   * Support for deterministic ECDSA (RFC 6979)
+
+Bugfix
+   * Potential memory leak in bignum_selftest()
+   * Replaced expired test certificate
+   * ssl_mail_client now terminates lines with CRLF, instead of LF
+   * net module handles timeouts on blocking sockets better (found by Tilman
+     Sauerbeck)
+   * Assembly format fixes in bn_mul.h
+
+Security
+   * Missing MPI_CHK calls added around unguarded mpi calls (found by
+     TrustInSoft)
+
+= PolarSSL 1.3.3 released on 2013-12-31
+Features
+   * EC key generation support in gen_key app
+   * Support for adhering to client ciphersuite order preference
+     (POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE)
+   * Support for Curve25519
+   * Support for ECDH-RSA and ECDH-ECDSA key exchanges and ciphersuites
+   * Support for IPv6 in the NET module
+   * AES-NI support for AES, AES-GCM and AES key scheduling
+   * SSL Pthread-based server example added (ssl_pthread_server)
+
+Changes
+   * gen_prime() speedup
+   * Speedup of ECP multiplication operation
+   * Relaxed some SHA2 ciphersuite's version requirements
+   * Dropped use of readdir_r() instead of readdir() with threading support
+   * More constant-time checks in the RSA module
+   * Split off curves from ecp.c into ecp_curves.c
+   * Curves are now stored fully in ROM
+   * Memory usage optimizations in ECP module
+   * Removed POLARSSL_THREADING_DUMMY
+
+Bugfix
+   * Fixed bug in mpi_set_bit() on platforms where t_uint is wider than int
+   * Fixed X.509 hostname comparison (with non-regular characters)
+   * SSL now gracefully handles missing RNG
+   * Missing defines / cases for RSA_PSK key exchange
+   * crypt_and_hash app checks MAC before final decryption
+   * Potential memory leak in ssl_ticket_keys_init()
+   * Memory leak in benchmark application
+   * Fixed x509_crt_parse_path() bug on Windows platforms
+   * Added missing MPI_CHK() around some statements in mpi_div_mpi() (found by
+     TrustInSoft)
+   * Fixed potential overflow in certificate size verification in
+     ssl_write_certificate() (found by TrustInSoft)
+
+Security
+   * Possible remotely-triggered out-of-bounds memory access fixed (found by
+     TrustInSoft)
+
+= PolarSSL 1.3.2 released on 2013-11-04
+Features
+   * PK tests added to test framework
+   * Added optional optimization for NIST MODP curves (POLARSSL_ECP_NIST_OPTIM)
+   * Support for Camellia-GCM mode and ciphersuites
+
+Changes
+   * Padding checks in cipher layer are now constant-time
+   * Value comparisons in SSL layer are now constant-time
+   * Support for serialNumber, postalAddress and postalCode in X509 names
+   * SSL Renegotiation was refactored
+
+Bugfix
+   * More stringent checks in cipher layer
+   * Server does not send out extensions not advertised by client
+   * Prevent possible alignment warnings on casting from char * to 'aligned *'
+   * Misc fixes and additions to dependency checks
+   * Const correctness
+   * cert_write with selfsign should use issuer_name as subject_name
+   * Fix ECDSA corner case: missing reduction mod N (found by DualTachyon)
+   * Defines to handle UEFI environment under MSVC
+   * Server-side initiated renegotiations send HelloRequest
+
+= PolarSSL 1.3.1 released on 2013-10-15
+Features
+   * Support for Brainpool curves and TLS ciphersuites (RFC 7027)
+   * Support for ECDHE-PSK key-exchange and ciphersuites
+   * Support for RSA-PSK key-exchange and ciphersuites
+
+Changes
+   * RSA blinding locks for a smaller amount of time
+   * TLS compression only allocates working buffer once
+   * Introduced POLARSSL_HAVE_READDIR_R for systems without it
+   * config.h is more script-friendly
+
+Bugfix
+   * Missing MSVC defines added
+   * Compile errors with POLARSSL_RSA_NO_CRT
+   * Header files with 'polarssl/'
+   * Const correctness
+   * Possible naming collision in dhm_context
+   * Better support for MSVC
+   * threading_set_alt() name
+   * Added missing x509write_crt_set_version()
+
+= PolarSSL 1.3.0 released on 2013-10-01
+Features
+   * Elliptic Curve Cryptography module added
+   * Elliptic Curve Diffie Hellman module added
+   * Ephemeral Elliptic Curve Diffie Hellman support for SSL/TLS
+    (ECDHE-based ciphersuites)
+   * Ephemeral Elliptic Curve Digital Signature Algorithm support for SSL/TLS
+    (ECDSA-based ciphersuites)
+   * Ability to specify allowed ciphersuites based on the protocol version.
+   * PSK and DHE-PSK based ciphersuites added
+   * Memory allocation abstraction layer added
+   * Buffer-based memory allocator added (no malloc() / free() / HEAP usage)
+   * Threading abstraction layer added (dummy / pthread / alternate)
+   * Public Key abstraction layer added
+   * Parsing Elliptic Curve keys
+   * Parsing Elliptic Curve certificates
+   * Support for max_fragment_length extension (RFC 6066)
+   * Support for truncated_hmac extension (RFC 6066)
+   * Support for zeros-and-length (ANSI X.923) padding, one-and-zeros
+     (ISO/IEC 7816-4) padding and zero padding in the cipher layer
+   * Support for session tickets (RFC 5077)
+   * Certificate Request (CSR) generation with extensions (key_usage,
+     ns_cert_type)
+   * X509 Certificate writing with extensions (basic_constraints,
+     issuer_key_identifier, etc)
+   * Optional blinding for RSA, DHM and EC
+   * Support for multiple active certificate / key pairs in SSL servers for
+   	 the same host (Not to be confused with SNI!)
+
+Changes
+   * Ability to enable / disable SSL v3 / TLS 1.0 / TLS 1.1 / TLS 1.2
+     individually
+   * Introduced separate SSL Ciphersuites module that is based on
+     Cipher and MD information
+   * Internals for SSL module adapted to have separate IV pointer that is
+     dynamically set (Better support for hardware acceleration)
+   * Moved all OID functionality to a separate module. RSA function
+     prototypes for the RSA sign and verify functions changed as a result
+   * Split up the GCM module into a starts/update/finish cycle
+   * Client and server now filter sent and accepted ciphersuites on minimum
+     and maximum protocol version
+   * Ability to disable server_name extension (RFC 6066)
+   * Renamed error_strerror() to the less conflicting polarssl_strerror()
+     (Ability to keep old as well with POLARSSL_ERROR_STRERROR_BC)
+   * SHA2 renamed to SHA256, SHA4 renamed to SHA512 and functions accordingly
+   * All RSA operations require a random generator for blinding purposes
+   * X509 core refactored
+   * x509_crt_verify() now case insensitive for cn (RFC 6125 6.4)
+   * Also compiles / runs without time-based functions (!POLARSSL_HAVE_TIME)
+   * Support faulty X509 v1 certificates with extensions
+     (POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3)
+
+Bugfix
+   * Fixed parse error in ssl_parse_certificate_request()
+   * zlib compression/decompression skipped on empty blocks
+   * Support for AIX header locations in net.c module
+   * Fixed file descriptor leaks
+
+Security
+   * RSA blinding on CRT operations to counter timing attacks
+     (found by Cyril Arnaud and Pierre-Alain Fouque)
+
+= Version 1.2.11 released 2014-07-11
+Features
+   * Entropy module now supports seed writing and reading
+
+Changes
+   * Introduced POLARSSL_HAVE_READDIR_R for systems without it
+   * Improvements to the CMake build system, contributed by Julian Ospald.
+   * Work around a bug of the version of Clang shipped by Apple with Mavericks
+     that prevented bignum.c from compiling. (Reported by Rafael Baptista.)
+   * Improvements to tests/Makefile, contributed by Oden Eriksson.
+   * Use UTC time to check certificate validity.
+   * Reject certificates with times not in UTC, per RFC 5280.
+   * Migrate zeroizing of data to polarssl_zeroize() instead of memset()
+     against unwanted compiler optimizations
+
+Security
+   * Forbid change of server certificate during renegotiation to prevent
+     "triple handshake" attack when authentication mode is optional (the
+     attack was already impossible when authentication is required).
+   * Check notBefore timestamp of certificates and CRLs from the future.
+   * Forbid sequence number wrapping
+   * Prevent potential NULL pointer dereference in ssl_read_record() (found by
+     TrustInSoft)
+   * Fix length checking for AEAD ciphersuites (found by Codenomicon).
+     It was possible to crash the server (and client) using crafted messages
+     when a GCM suite was chosen.
+
+Bugfix
+   * Fixed X.509 hostname comparison (with non-regular characters)
+   * SSL now gracefully handles missing RNG
+   * crypt_and_hash app checks MAC before final decryption
+   * Fixed x509_crt_parse_path() bug on Windows platforms
+   * Added missing MPI_CHK() around some statements in mpi_div_mpi() (found by
+     TrustInSoft)
+   * Fixed potential overflow in certificate size verification in
+     ssl_write_certificate() (found by TrustInSoft)
+   * Fix ASM format in bn_mul.h
+   * Potential memory leak in bignum_selftest()
+   * Replaced expired test certificate
+   * ssl_mail_client now terminates lines with CRLF, instead of LF
+   * Fix bug in RSA PKCS#1 v1.5 "reversed" operations
+   * Fixed testing with out-of-source builds using cmake
+   * Fixed version-major intolerance in server
+   * Fixed CMake symlinking on out-of-source builds
+   * Bignum's MIPS-32 assembly was used on MIPS-64, causing chaos. (Found by
+     Alex Wilson.)
+   * ssl_init() was leaving a dirty pointer in ssl_context if malloc of
+     out_ctr failed
+   * ssl_handshake_init() was leaving dirty pointers in subcontexts if malloc
+     of one of them failed
+   * x509_get_current_time() uses localtime_r() to prevent thread issues
+   * Some example server programs were not sending the close_notify alert.
+   * Potential memory leak in mpi_exp_mod() when error occurs during
+     calculation of RR.
+   * Improve interoperability by not writing extension length in ClientHello
+     when no extensions are present (found by Matthew Page)
+   * rsa_check_pubkey() now allows an E up to N
+   * On OpenBSD, use arc4random_buf() instead of rand() to prevent warnings
+   * mpi_fill_random() was creating numbers larger than requested on
+     big-endian platform when size was not an integer number of limbs
+   * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer)
+   * Stricter check on SSL ClientHello internal sizes compared to actual packet
+     size (found by TrustInSoft)
+   * Fix preprocessor checks for bn_mul PPC asm (found by Barry K. Nathan).
+   * Use \n\t rather than semicolons for bn_mul asm, since some assemblers
+     interpret semicolons as comment delimiters (found by Barry K. Nathan).
+   * Disable broken Sparc64 bn_mul assembly (found by Florian Obser).
+   * Fix base64_decode() to return and check length correctly (in case of
+     tight buffers)
+
+= Version 1.2.10 released 2013-10-07
+Changes
+   * Changed RSA blinding to a slower but thread-safe version
+
+Bugfix
+   * Fixed memory leak in RSA as a result of introduction of blinding
+   * Fixed ssl_pkcs11_decrypt() prototype
+   * Fixed MSVC project files
+
+= Version 1.2.9 released 2013-10-01
+Changes
+   * x509_verify() now case insensitive for cn (RFC 6125 6.4)
+
+Bugfix
+   * Fixed potential memory leak when failing to resume a session
+   * Fixed potential file descriptor leaks (found by Remi Gacogne)
+   * Minor fixes
+
+Security
+   * Fixed potential heap buffer overflow on large hostname setting
+   * Fixed potential negative value misinterpretation in load_file()
+   * RSA blinding on CRT operations to counter timing attacks
+     (found by Cyril Arnaud and Pierre-Alain Fouque)
 
 = Version 1.2.8 released 2013-06-19
 Features
@@ -90,6 +564,8 @@ Security
 
 = Version 1.2.4 released 2013-01-25
 Changes
+   * More advanced SSL ciphersuite representation and moved to more dynamic
+     SSL core
    * Added ssl_handshake_step() to allow single stepping the handshake process
 
 Bugfix
@@ -194,6 +670,49 @@ Security
    * Fixed potential memory zeroization on miscrafted RSA key (found by Eloi
      Vanderbeken)
 
+= Version 1.1.8 released on 2013-10-01
+Bugfix
+   * Fixed potential memory leak when failing to resume a session
+   * Fixed potential file descriptor leaks
+
+Security
+   * Potential buffer-overflow for ssl_read_record() (independently found by
+     both TrustInSoft and Paul Brodeur of Leviathan Security Group)
+   * Potential negative value misinterpretation in load_file()
+   * Potential heap buffer overflow on large hostname setting
+
+= Version 1.1.7 released on 2013-06-19
+Changes
+   * HAVEGE random generator disabled by default
+
+Bugfix
+   * x509parse_crt() now better handles PEM error situations
+   * ssl_parse_certificate() now calls x509parse_crt_der() directly
+     instead of the x509parse_crt() wrapper that can also parse PEM
+	 certificates
+   * Fixed values for 2-key Triple DES in cipher layer
+   * ssl_write_certificate_request() can handle empty ca_chain
+
+Security
+   * A possible DoS during the SSL Handshake, due to faulty parsing of
+     PEM-encoded certificates has been fixed (found by Jack Lloyd)
+
+= Version 1.1.6 released on 2013-03-11
+Bugfix
+   * Fixed net_bind() for specified IP addresses on little endian systems
+
+Changes
+   * Allow enabling of dummy error_strerror() to support some use-cases
+   * Debug messages about padding errors during SSL message decryption are
+     disabled by default and can be enabled with POLARSSL_SSL_DEBUG_ALL
+
+Security
+   * Removed timing differences during SSL message decryption in
+     ssl_decrypt_buf()
+   * Removed timing differences due to bad padding from
+     rsa_rsaes_pkcs1_v15_decrypt() and rsa_pkcs1_decrypt() for PKCS#1 v1.5
+     operations
+
 = Version 1.1.5 released on 2013-01-16
 Bugfix
    * Fixed MPI assembly for SPARC64 platform
@@ -480,7 +999,7 @@ Changes
      in a function to allow easy future expansion
    * Changed symmetric cipher functions to
      identical interface (returning int result values)
-   * Changed ARC4 to use seperate input/output buffer
+   * Changed ARC4 to use separate input/output buffer
    * Added reset function for HMAC context as speed-up
      for specific use-cases
 
@@ -720,7 +1239,7 @@ XySSL ChangeLog
     * Multiple fixes to enhance the compatibility with g++,
       thanks to Xosé Antón Otero Ferreira
     * Fixed a bug in the CBC code, thanks to dowst; also,
-      the bignum code is no longer dependant on long long
+      the bignum code is no longer dependent on long long
     * Updated rsa_pkcs1_sign to handle arbitrary large inputs
     * Updated timing.c for improved compatibility with i386
       and 486 processors, thanks to Arnaud Cornet
diff --git a/Externals/polarssl/README b/Externals/polarssl/README
deleted file mode 100644
index 7f7d0b66db..0000000000
--- a/Externals/polarssl/README
+++ /dev/null
@@ -1,40 +0,0 @@
-README for PolarSSL
-
--- COMPILING
-There are currently three active build systems within the PolarSSL releases:
- - Make
- - CMake
- - Microsoft Visual Studio
-
-The main system used for development is CMake. That system is always the most up-to-date. The others should reflect all changes present in the CMake build system, but some features are not ported there by default.
-
---- Make
-In order to build the source using Make, just enter at the command line:
-make
-
-In order to run the tests, enter:
-make check
-
---- CMake
-In order to build the source using CMake, just enter at the command line:
-cmake .
-make
-
-There are 3 different active build modes specified within the CMake buildsystem:
- - Release
-   This generates the default code without any unnecessary information in the binary files.
- - Debug
-   This generates debug information and disables optimization of the code.
- - Coverage
-   This generates code coverage information in addition to debug information.
-
-Switching build modes in CMake is simple. For debug mode, enter at the command line:
-cmake -D CMAKE_BUILD_TYPE:String="Debug" .
-
-In order to run the tests, enter:
-make test
-
---- Microsoft Visual Studio
-The build files for Microsoft Visual Studio are generated for Visual Studio 6.0 all future Visual Studio's should be able to open and use this older version of the build files.
-
-The workspace 'polarssl.dsw' contains all the basic projects needed to build the library and all the programs. The files in tests are not generated and compiled, as these need a perl environment as well.
diff --git a/Externals/polarssl/include/polarssl/aes.h b/Externals/polarssl/include/polarssl/aes.h
index 30fdf617a6..2e9092f95c 100644
--- a/Externals/polarssl/include/polarssl/aes.h
+++ b/Externals/polarssl/include/polarssl/aes.h
@@ -3,7 +3,7 @@
  *
  * \brief AES block cipher
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,17 +27,22 @@
 #ifndef POLARSSL_AES_H
 #define POLARSSL_AES_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
 #include <inttypes.h>
 #endif
 
+/* padlock.c and aesni.c rely on these values! */
 #define AES_ENCRYPT     1
 #define AES_DECRYPT     0
 
@@ -48,8 +53,17 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          AES context structure
+ *
+ * \note           buf is able to hold 32 extra bytes, which can be used:
+ *                 - for alignment purposes if VIA padlock is used, and/or
+ *                 - to simplify key expansion in the 256-bit case by
+ *                 generating an extra round key
  */
 typedef struct
 {
@@ -59,9 +73,19 @@ typedef struct
 }
 aes_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize AES context
+ *
+ * \param ctx      AES context to be initialized
+ */
+void aes_init( aes_context *ctx );
+
+/**
+ * \brief          Clear AES context
+ *
+ * \param ctx      AES context to be cleared
+ */
+void aes_free( aes_context *ctx );
 
 /**
  * \brief          AES key schedule (encryption)
@@ -72,7 +96,8 @@ extern "C" {
  *
  * \return         0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
  */
-int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int keysize );
+int aes_setkey_enc( aes_context *ctx, const unsigned char *key,
+                    unsigned int keysize );
 
 /**
  * \brief          AES key schedule (decryption)
@@ -83,7 +108,8 @@ int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int key
  *
  * \return         0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
  */
-int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int keysize );
+int aes_setkey_dec( aes_context *ctx, const unsigned char *key,
+                    unsigned int keysize );
 
 /**
  * \brief          AES-ECB block encryption/decryption
@@ -100,6 +126,7 @@ int aes_crypt_ecb( aes_context *ctx,
                     const unsigned char input[16],
                     unsigned char output[16] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          AES-CBC buffer encryption/decryption
  *                 Length should be a multiple of the block
@@ -120,7 +147,9 @@ int aes_crypt_cbc( aes_context *ctx,
                     unsigned char iv[16],
                     const unsigned char *input,
                     unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
+#if defined(POLARSSL_CIPHER_MODE_CFB)
 /**
  * \brief          AES-CFB128 buffer encryption/decryption.
  *
@@ -128,7 +157,6 @@ int aes_crypt_cbc( aes_context *ctx,
  * both encryption and decryption. So a context initialized with
  * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
  *
- * both 
  * \param ctx      AES context
  * \param mode     AES_ENCRYPT or AES_DECRYPT
  * \param length   length of the input data
@@ -147,6 +175,31 @@ int aes_crypt_cfb128( aes_context *ctx,
                        const unsigned char *input,
                        unsigned char *output );
 
+/**
+ * \brief          AES-CFB8 buffer encryption/decryption.
+ *
+ * Note: Due to the nature of CFB you should use the same key schedule for
+ * both encryption and decryption. So a context initialized with
+ * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
+ *
+ * \param ctx      AES context
+ * \param mode     AES_ENCRYPT or AES_DECRYPT
+ * \param length   length of the input data
+ * \param iv       initialization vector (updated after use)
+ * \param input    buffer holding the input data
+ * \param output   buffer holding the output data
+ *
+ * \return         0 if successful
+ */
+int aes_crypt_cfb8( aes_context *ctx,
+                    int mode,
+                    size_t length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output );
+#endif /*POLARSSL_CIPHER_MODE_CFB */
+
+#if defined(POLARSSL_CIPHER_MODE_CTR)
 /**
  * \brief               AES-CTR buffer encryption/decryption
  *
@@ -156,6 +209,7 @@ int aes_crypt_cfb128( aes_context *ctx,
  * both encryption and decryption. So a context initialized with
  * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
  *
+ * \param ctx           AES context
  * \param length        The length of the data
  * \param nc_off        The offset in the current stream_block (for resuming
  *                      within current cipher stream). The offset pointer to
@@ -175,6 +229,7 @@ int aes_crypt_ctr( aes_context *ctx,
                        unsigned char stream_block[16],
                        const unsigned char *input,
                        unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/aesni.h b/Externals/polarssl/include/polarssl/aesni.h
new file mode 100644
index 0000000000..92b23cd6b9
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/aesni.h
@@ -0,0 +1,107 @@
+/**
+ * \file aesni.h
+ *
+ * \brief AES-NI for hardware AES acceleration on some Intel processors
+ *
+ *  Copyright (C) 2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_AESNI_H
+#define POLARSSL_AESNI_H
+
+#include "aes.h"
+
+#define POLARSSL_AESNI_AES      0x02000000u
+#define POLARSSL_AESNI_CLMUL    0x00000002u
+
+#if defined(POLARSSL_HAVE_ASM) && defined(__GNUC__) &&  \
+    ( defined(__amd64__) || defined(__x86_64__) )   &&  \
+    ! defined(POLARSSL_HAVE_X86_64)
+#define POLARSSL_HAVE_X86_64
+#endif
+
+#if defined(POLARSSL_HAVE_X86_64)
+
+/**
+ * \brief          AES-NI features detection routine
+ *
+ * \param what     The feature to detect
+ *                 (POLARSSL_AESNI_AES or POLARSSL_AESNI_CLMUL)
+ *
+ * \return         1 if CPU has support for the feature, 0 otherwise
+ */
+int aesni_supports( unsigned int what );
+
+/**
+ * \brief          AES-NI AES-ECB block en(de)cryption
+ *
+ * \param ctx      AES context
+ * \param mode     AES_ENCRYPT or AES_DECRYPT
+ * \param input    16-byte input block
+ * \param output   16-byte output block
+ *
+ * \return         0 on success (cannot fail)
+ */
+int aesni_crypt_ecb( aes_context *ctx,
+                     int mode,
+                     const unsigned char input[16],
+                     unsigned char output[16] );
+
+/**
+ * \brief          GCM multiplication: c = a * b in GF(2^128)
+ *
+ * \param c        Result
+ * \param a        First operand
+ * \param b        Second operand
+ *
+ * \note           Both operands and result are bit strings interpreted as
+ *                 elements of GF(2^128) as per the GCM spec.
+ */
+void aesni_gcm_mult( unsigned char c[16],
+                     const unsigned char a[16],
+                     const unsigned char b[16] );
+
+/**
+ * \brief           Compute decryption round keys from encryption round keys
+ *
+ * \param invkey    Round keys for the equivalent inverse cipher
+ * \param fwdkey    Original round keys (for encryption)
+ * \param nr        Number of rounds (that is, number of round keys minus one)
+ */
+void aesni_inverse_key( unsigned char *invkey,
+                        const unsigned char *fwdkey, int nr );
+
+/**
+ * \brief           Perform key expansion (for encryption)
+ *
+ * \param rk        Destination buffer where the round keys are written
+ * \param key       Encryption key
+ * \param bits      Key size in bits (must be 128, 192 or 256)
+ *
+ * \return          0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
+ */
+int aesni_setkey_enc( unsigned char *rk,
+                      const unsigned char *key,
+                      size_t bits );
+
+#endif /* POLARSSL_HAVE_X86_64 */
+
+#endif /* POLARSSL_AESNI_H */
diff --git a/Externals/polarssl/include/polarssl/arc4.h b/Externals/polarssl/include/polarssl/arc4.h
index 1672fa2334..555f54fab3 100644
--- a/Externals/polarssl/include/polarssl/arc4.h
+++ b/Externals/polarssl/include/polarssl/arc4.h
@@ -3,7 +3,7 @@
  *
  * \brief The ARCFOUR stream cipher
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
 #ifndef POLARSSL_ARC4_H
 #define POLARSSL_ARC4_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
@@ -35,6 +39,10 @@
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          ARC4 context structure
  */
@@ -46,18 +54,29 @@ typedef struct
 }
 arc4_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize ARC4 context
+ *
+ * \param ctx      ARC4 context to be initialized
+ */
+void arc4_init( arc4_context *ctx );
+
+/**
+ * \brief          Clear ARC4 context
+ *
+ * \param ctx      ARC4 context to be cleared
+ */
+void arc4_free( arc4_context *ctx );
 
 /**
  * \brief          ARC4 key schedule
  *
- * \param ctx      ARC4 context to be initialized
+ * \param ctx      ARC4 context to be setup
  * \param key      the secret key
- * \param keylen   length of the key
+ * \param keylen   length of the key, in bytes
  */
-void arc4_setup( arc4_context *ctx, const unsigned char *key, unsigned int keylen );
+void arc4_setup( arc4_context *ctx, const unsigned char *key,
+                 unsigned int keylen );
 
 /**
  * \brief          ARC4 cipher function
diff --git a/Externals/polarssl/include/polarssl/asn1.h b/Externals/polarssl/include/polarssl/asn1.h
index 893292dfa6..eacdd082bd 100644
--- a/Externals/polarssl/include/polarssl/asn1.h
+++ b/Externals/polarssl/include/polarssl/asn1.h
@@ -3,7 +3,7 @@
  *
  * \brief Generic ASN.1 parsing
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
 #ifndef POLARSSL_ASN1_H
 #define POLARSSL_ASN1_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_BIGNUM_C)
 #include "bignum.h"
@@ -35,15 +39,15 @@
 
 #include <string.h>
 
-/** 
+/**
  * \addtogroup asn1_module
- * \{ 
+ * \{
  */
- 
+
 /**
  * \name ASN1 Error codes
  * These error codes are OR'ed to X509 error codes for
- * higher error granularity. 
+ * higher error granularity.
  * ASN1 is a standard to specify data structures.
  * \{
  */
@@ -93,6 +97,18 @@
 /** Returns the size of the binary string, without the trailing \\0 */
 #define OID_SIZE(x) (sizeof(x) - 1)
 
+/**
+ * Compares an asn1_buf structure to a reference OID.
+ *
+ * Only works for 'defined' oid_str values (OID_HMAC_SHA1), you cannot use a
+ * 'unsigned char *oid' here!
+ *
+ * Warning: returns true when the OIDs are equal (unlike memcmp)!
+ */
+#define OID_CMP(oid_str, oid_buf)                                   \
+        ( ( OID_SIZE(oid_str) == (oid_buf)->len ) &&                \
+          memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) == 0 )
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -135,8 +151,19 @@ typedef struct _asn1_sequence
 asn1_sequence;
 
 /**
- * Get the length of an ASN.1 element.
- * Updates the pointer to immediately behind the length.
+ * Container for a sequence or list of 'named' ASN.1 data items
+ */
+typedef struct _asn1_named_data
+{
+    asn1_buf oid;                   /**< The object identifier. */
+    asn1_buf val;                   /**< The named value. */
+    struct _asn1_named_data *next;  /**< The next entry in the sequence. */
+}
+asn1_named_data;
+
+/**
+ * \brief       Get the length of an ASN.1 element.
+ *              Updates the pointer to immediately behind the length.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -151,8 +178,8 @@ int asn1_get_len( unsigned char **p,
                   size_t *len );
 
 /**
- * Get the tag and length of the tag. Check for the requested tag.
- * Updates the pointer to immediately behind the tag and length.
+ * \brief       Get the tag and length of the tag. Check for the requested tag.
+ *              Updates the pointer to immediately behind the tag and length.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -167,8 +194,8 @@ int asn1_get_tag( unsigned char **p,
                   size_t *len, int tag );
 
 /**
- * Retrieve a boolean ASN.1 tag and its value.
- * Updates the pointer to immediately behind the full tag.
+ * \brief       Retrieve a boolean ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -181,8 +208,8 @@ int asn1_get_bool( unsigned char **p,
                    int *val );
 
 /**
- * Retrieve an integer ASN.1 tag and its value.
- * Updates the pointer to immediately behind the full tag.
+ * \brief       Retrieve an integer ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -195,8 +222,8 @@ int asn1_get_int( unsigned char **p,
                   int *val );
 
 /**
- * Retrieve a bitstring ASN.1 tag and its value.
- * Updates the pointer to immediately behind the full tag.
+ * \brief       Retrieve a bitstring ASN.1 tag and its value.
+ *              Updates the pointer to immediately behind the full tag.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -208,8 +235,22 @@ int asn1_get_bitstring( unsigned char **p, const unsigned char *end,
                         asn1_bitstring *bs);
 
 /**
- * Parses and splits an ASN.1 "SEQUENCE OF <tag>"
- * Updated the pointer to immediately behind the full sequence tag.
+ * \brief       Retrieve a bitstring ASN.1 tag without unused bits and its
+ *              value.
+ *              Updates the pointer to the beginning of the bit/octet string.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param len   Length of the actual bit/octect string in bytes
+ *
+ * \return      0 if successful or a specific ASN.1 error code.
+ */
+int asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
+                             size_t *len );
+
+/**
+ * \brief       Parses and splits an ASN.1 "SEQUENCE OF <tag>"
+ *              Updated the pointer to immediately behind the full sequence tag.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -225,8 +266,8 @@ int asn1_get_sequence_of( unsigned char **p,
 
 #if defined(POLARSSL_BIGNUM_C)
 /**
- * Retrieve a MPI value from an integer ASN.1 tag.
- * Updates the pointer to immediately behind the full tag.
+ * \brief       Retrieve a MPI value from an integer ASN.1 tag.
+ *              Updates the pointer to immediately behind the full tag.
  *
  * \param p     The position in the ASN.1 data
  * \param end   End of data
@@ -237,7 +278,67 @@ int asn1_get_sequence_of( unsigned char **p,
 int asn1_get_mpi( unsigned char **p,
                   const unsigned char *end,
                   mpi *X );
-#endif
+#endif /* POLARSSL_BIGNUM_C */
+
+/**
+ * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence.
+ *              Updates the pointer to immediately behind the full
+ *              AlgorithmIdentifier.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param alg   The buffer to receive the OID
+ * \param params The buffer to receive the params (if any)
+ *
+ * \return      0 if successful or a specific ASN.1 or MPI error code.
+ */
+int asn1_get_alg( unsigned char **p,
+                  const unsigned char *end,
+                  asn1_buf *alg, asn1_buf *params );
+
+/**
+ * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence with NULL or no
+ *              params.
+ *              Updates the pointer to immediately behind the full
+ *              AlgorithmIdentifier.
+ *
+ * \param p     The position in the ASN.1 data
+ * \param end   End of data
+ * \param alg   The buffer to receive the OID
+ *
+ * \return      0 if successful or a specific ASN.1 or MPI error code.
+ */
+int asn1_get_alg_null( unsigned char **p,
+                       const unsigned char *end,
+                       asn1_buf *alg );
+
+/**
+ * \brief       Find a specific named_data entry in a sequence or list based on
+ *              the OID.
+ *
+ * \param list  The list to seek through
+ * \param oid   The OID to look for
+ * \param len   Size of the OID
+ *
+ * \return      NULL if not found, or a pointer to the existing entry.
+ */
+asn1_named_data *asn1_find_named_data( asn1_named_data *list,
+                                       const char *oid, size_t len );
+
+/**
+ * \brief       Free a asn1_named_data entry
+ *
+ * \param entry The named data entry to free
+ */
+void asn1_free_named_data( asn1_named_data *entry );
+
+/**
+ * \brief       Free all entries in a asn1_named_data list
+ *              Head will be set to NULL
+ *
+ * \param head  Pointer to the head of the list of named data entries to free
+ */
+void asn1_free_named_data_list( asn1_named_data **head );
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/asn1write.h b/Externals/polarssl/include/polarssl/asn1write.h
index 52b9baa96a..7a7fbf7b3f 100644
--- a/Externals/polarssl/include/polarssl/asn1write.h
+++ b/Externals/polarssl/include/polarssl/asn1write.h
@@ -3,7 +3,7 @@
  *
  * \brief ASN.1 buffer writing functionality
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,18 +29,215 @@
 
 #include "asn1.h"
 
-#define ASN1_CHK_ADD(g, f) if( ( ret = f ) < 0 ) return( ret ); else g += ret
+#define ASN1_CHK_ADD(g, f) do { if( ( ret = f ) < 0 ) return( ret ); else   \
+                                g += ret; } while( 0 )
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief           Write a length field in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param len       the length to write
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_len( unsigned char **p, unsigned char *start, size_t len );
-int asn1_write_tag( unsigned char **p, unsigned char *start, unsigned char tag );
+
+/**
+ * \brief           Write a ASN.1 tag in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param tag       the tag to write
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_tag( unsigned char **p, unsigned char *start,
+                    unsigned char tag );
+
+/**
+ * \brief           Write raw buffer data
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       data buffer to write
+ * \param size      length of the data buffer
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
+                           const unsigned char *buf, size_t size );
+
+#if defined(POLARSSL_BIGNUM_C)
+/**
+ * \brief           Write a big number (ASN1_INTEGER) in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param X         the MPI to write
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X );
+#endif /* POLARSSL_BIGNUM_C */
+
+/**
+ * \brief           Write a NULL tag (ASN1_NULL) with zero data in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_null( unsigned char **p, unsigned char *start );
-int asn1_write_oid( unsigned char **p, unsigned char *start, char *oid );
-int asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start, char *algorithm_oid );
+
+/**
+ * \brief           Write an OID tag (ASN1_OID) and data in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param oid       the OID to write
+ * \param oid_len   length of the OID
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_oid( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len );
+
+/**
+ * \brief           Write an AlgorithmIdentifier sequence in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param oid       the OID of the algorithm
+ * \param oid_len   length of the OID
+ * \param par_len   length of parameters, which must be already written.
+ *                  If 0, NULL parameters are added
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
+                                     const char *oid, size_t oid_len,
+                                     size_t par_len );
+
+/**
+ * \brief           Write a boolean tag (ASN1_BOOLEAN) and value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param boolean   0 or 1
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_bool( unsigned char **p, unsigned char *start, int boolean );
+
+/**
+ * \brief           Write an int tag (ASN1_INTEGER) and value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param val       the integer value
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_int( unsigned char **p, unsigned char *start, int val );
+
+/**
+ * \brief           Write a printable string tag (ASN1_PRINTABLE_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param text      the text to write
+ * \param text_len  length of the text
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_printable_string( unsigned char **p, unsigned char *start,
-                                 char *text );
+                                 const char *text, size_t text_len );
+
+/**
+ * \brief           Write an IA5 string tag (ASN1_IA5_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param text      the text to write
+ * \param text_len  length of the text
+ *
+ * \return          the length written or a negative error code
+ */
 int asn1_write_ia5_string( unsigned char **p, unsigned char *start,
-                                 char *text );
+                           const char *text, size_t text_len );
+
+/**
+ * \brief           Write a bitstring tag (ASN1_BIT_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       the bitstring
+ * \param bits      the total number of bits in the bitstring
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_bitstring( unsigned char **p, unsigned char *start,
+                          const unsigned char *buf, size_t bits );
+
+/**
+ * \brief           Write an octet string tag (ASN1_OCTET_STRING) and
+ *                  value in ASN.1 format
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param buf       data buffer to write
+ * \param size      length of the data buffer
+ *
+ * \return          the length written or a negative error code
+ */
+int asn1_write_octet_string( unsigned char **p, unsigned char *start,
+                             const unsigned char *buf, size_t size );
+
+/**
+ * \brief           Create or find a specific named_data entry for writing in a
+ *                  sequence or list based on the OID. If not already in there,
+ *                  a new entry is added to the head of the list.
+ *                  Warning: Destructive behaviour for the val data!
+ *
+ * \param list      Pointer to the location of the head of the list to seek
+ *                  through (will be updated in case of a new entry)
+ * \param oid       The OID to look for
+ * \param oid_len   Size of the OID
+ * \param val       Data to store (can be NULL if you want to fill it by hand)
+ * \param val_len   Minimum length of the data buffer needed
+ *
+ * \return      NULL if if there was a memory allocation error, or a pointer
+ *              to the new / existing entry.
+ */
+asn1_named_data *asn1_store_named_data( asn1_named_data **list,
+                                        const char *oid, size_t oid_len,
+                                        const unsigned char *val,
+                                        size_t val_len );
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* POLARSSL_ASN1_WRITE_H */
diff --git a/Externals/polarssl/include/polarssl/base64.h b/Externals/polarssl/include/polarssl/base64.h
index fb0d753a2e..d04149344e 100644
--- a/Externals/polarssl/include/polarssl/base64.h
+++ b/Externals/polarssl/include/polarssl/base64.h
@@ -3,7 +3,7 @@
  *
  * \brief RFC 1521 base64 encoding/decoding
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -57,7 +57,7 @@ int base64_encode( unsigned char *dst, size_t *dlen,
 /**
  * \brief          Decode a base64-formatted buffer
  *
- * \param dst      destination buffer
+ * \param dst      destination buffer (can be NULL for checking size)
  * \param dlen     size of the buffer
  * \param src      source buffer
  * \param slen     amount of data to be decoded
@@ -67,8 +67,8 @@ int base64_encode( unsigned char *dst, size_t *dlen,
  *                 not correct. *dlen is always updated to reflect the amount
  *                 of data that has (or would have) been written.
  *
- * \note           Call this function with *dlen = 0 to obtain the
- *                 required buffer size in *dlen
+ * \note           Call this function with *dst = NULL or *dlen = 0 to obtain
+ *                 the required buffer size in *dlen
  */
 int base64_decode( unsigned char *dst, size_t *dlen,
                    const unsigned char *src, size_t slen );
diff --git a/Externals/polarssl/include/polarssl/bignum.h b/Externals/polarssl/include/polarssl/bignum.h
index afa9e61d87..cd7592c4fb 100644
--- a/Externals/polarssl/include/polarssl/bignum.h
+++ b/Externals/polarssl/include/polarssl/bignum.h
@@ -3,7 +3,7 @@
  *
  * \brief  Multi-precision integer library
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -30,9 +30,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 #if (_MSC_VER <= 1200)
 typedef   signed short  int16_t;
@@ -47,7 +51,7 @@ typedef UINT32 uint32_t;
 typedef UINT64 uint64_t;
 #else
 #include <inttypes.h>
-#endif
+#endif /* _MSC_VER && !EFIX64 && !EFI32 */
 
 #define POLARSSL_ERR_MPI_FILE_IO_ERROR                     -0x0002  /**< An error occurred while reading from or writing to a file. */
 #define POLARSSL_ERR_MPI_BAD_INPUT_DATA                    -0x0004  /**< Bad input parameters to function. */
@@ -58,14 +62,14 @@ typedef UINT64 uint64_t;
 #define POLARSSL_ERR_MPI_NOT_ACCEPTABLE                    -0x000E  /**< The input arguments are not acceptable. */
 #define POLARSSL_ERR_MPI_MALLOC_FAILED                     -0x0010  /**< Memory allocation failed. */
 
-#define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup
+#define MPI_CHK(f) do { if( ( ret = f ) != 0 ) goto cleanup; } while( 0 )
 
 /*
  * Maximum size MPIs are allowed to grow to in number of limbs.
  */
 #define POLARSSL_MPI_MAX_LIMBS                             10000
 
-#if !defined(POLARSSL_CONFIG_OPTIONS)
+#if !defined(POLARSSL_MPI_WINDOW_SIZE)
 /*
  * Maximum window size used for modular exponentiation. Default: 6
  * Minimum value: 1. Maximum value: 6.
@@ -76,7 +80,9 @@ typedef UINT64 uint64_t;
  * Reduction in size, reduces speed.
  */
 #define POLARSSL_MPI_WINDOW_SIZE                           6        /**< Maximum windows size used. */
+#endif /* !POLARSSL_MPI_WINDOW_SIZE */
 
+#if !defined(POLARSSL_MPI_MAX_SIZE)
 /*
  * Maximum size of MPIs allowed in bits and bytes for user-MPIs.
  * ( Default: 512 bytes => 4096 bits, Maximum tested: 2048 bytes => 16384 bits )
@@ -85,8 +91,7 @@ typedef UINT64 uint64_t;
  * of limbs required (POLARSSL_MPI_MAX_LIMBS) is higher.
  */
 #define POLARSSL_MPI_MAX_SIZE                              512      /**< Maximum number of bytes for usable MPIs. */
-
-#endif /* !POLARSSL_CONFIG_OPTIONS */
+#endif /* !POLARSSL_MPI_MAX_SIZE */
 
 #define POLARSSL_MPI_MAX_BITS                              ( 8 * POLARSSL_MPI_MAX_SIZE )    /**< Maximum number of bits for usable MPIs. */
 
@@ -127,21 +132,30 @@ typedef uint16_t t_uint;
 typedef uint32_t t_udbl;
 #define POLARSSL_HAVE_UDBL
 #else
-  #if ( defined(_MSC_VER) && defined(_M_AMD64) )
+  /*
+   * 32-bit integers can be forced on 64-bit arches (eg. for testing purposes)
+   * by defining POLARSSL_HAVE_INT32 and undefining POLARSSL_HAVE_ASM
+   */
+  #if ( ! defined(POLARSSL_HAVE_INT32) && \
+          defined(_MSC_VER) && defined(_M_AMD64) )
+    #define POLARSSL_HAVE_INT64
     typedef  int64_t t_sint;
     typedef uint64_t t_uint;
   #else
-    #if ( defined(__GNUC__) && (                          \
+    #if ( ! defined(POLARSSL_HAVE_INT32) &&               \
+          defined(__GNUC__) && (                          \
           defined(__amd64__) || defined(__x86_64__)    || \
           defined(__ppc64__) || defined(__powerpc64__) || \
           defined(__ia64__)  || defined(__alpha__)     || \
           (defined(__sparc__) && defined(__arch64__))  || \
           defined(__s390x__) ) )
+       #define POLARSSL_HAVE_INT64
        typedef  int64_t t_sint;
        typedef uint64_t t_uint;
        typedef unsigned int t_udbl __attribute__((mode(TI)));
        #define POLARSSL_HAVE_UDBL
     #else
+       #define POLARSSL_HAVE_INT32
        typedef  int32_t t_sint;
        typedef uint32_t t_uint;
        #if ( defined(_MSC_VER) && defined(_M_IX86) )
@@ -153,11 +167,15 @@ typedef uint32_t t_udbl;
            #define POLARSSL_HAVE_UDBL
          #endif
        #endif
-    #endif
-  #endif
+    #endif /* !POLARSSL_HAVE_INT32 && __GNUC__ && 64-bit platform */
+  #endif /* !POLARSSL_HAVE_INT32 && _MSC_VER && _M_AMD64 */
 #endif /* POLARSSL_HAVE_INT16 */
 #endif /* POLARSSL_HAVE_INT8  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          MPI structure
  */
@@ -169,10 +187,6 @@ typedef struct
 }
 mpi;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief           Initialize one MPI
  *
@@ -198,6 +212,17 @@ void mpi_free( mpi *X );
  */
 int mpi_grow( mpi *X, size_t nblimbs );
 
+/**
+ * \brief          Resize down, keeping at least the specified number of limbs
+ *
+ * \param X        MPI to shrink
+ * \param nblimbs  The minimum number of limbs to keep
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ */
+int mpi_shrink( mpi *X, size_t nblimbs );
+
 /**
  * \brief          Copy the contents of Y into X
  *
@@ -217,6 +242,44 @@ int mpi_copy( mpi *X, const mpi *Y );
  */
 void mpi_swap( mpi *X, mpi *Y );
 
+/**
+ * \brief          Safe conditional assignement X = Y if assign is 1
+ *
+ * \param X        MPI to conditionally assign to
+ * \param Y        Value to be assigned
+ * \param assign   1: perform the assignment, 0: keep X's original value
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
+ *
+ * \note           This function is equivalent to
+ *                      if( assign ) mpi_copy( X, Y );
+ *                 except that it avoids leaking any information about whether
+ *                 the assignment was done or not (the above code may leak
+ *                 information through branch prediction and/or memory access
+ *                 patterns analysis).
+ */
+int mpi_safe_cond_assign( mpi *X, const mpi *Y, unsigned char assign );
+
+/**
+ * \brief          Safe conditional swap X <-> Y if swap is 1
+ *
+ * \param X        First mpi value
+ * \param Y        Second mpi value
+ * \param assign   1: perform the swap, 0: keep X and Y's original values
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
+ *
+ * \note           This function is equivalent to
+ *                      if( assign ) mpi_swap( X, Y );
+ *                 except that it avoids leaking any information about whether
+ *                 the assignment was done or not (the above code may leak
+ *                 information through branch prediction and/or memory access
+ *                 patterns analysis).
+ */
+int mpi_safe_cond_swap( mpi *X, mpi *Y, unsigned char assign );
+
 /**
  * \brief          Set value from integer
  *
@@ -351,7 +414,9 @@ int mpi_write_file( const char *p, const mpi *X, int radix, FILE *fout );
 int mpi_read_binary( mpi *X, const unsigned char *buf, size_t buflen );
 
 /**
- * \brief          Export X into unsigned binary data, big endian
+ * \brief          Export X into unsigned binary data, big endian.
+ *                 Always fills the whole buffer, which will start with zeros
+ *                 if the number is smaller.
  *
  * \param X        Source MPI
  * \param buf      Output buffer
@@ -433,7 +498,7 @@ int mpi_cmp_int( const mpi *X, t_sint z );
 int mpi_add_abs( mpi *X, const mpi *A, const mpi *B );
 
 /**
- * \brief          Unsigned substraction: X = |A| - |B|
+ * \brief          Unsigned subtraction: X = |A| - |B|
  *
  * \param X        Destination MPI
  * \param A        Left-hand MPI
@@ -457,7 +522,7 @@ int mpi_sub_abs( mpi *X, const mpi *A, const mpi *B );
 int mpi_add_mpi( mpi *X, const mpi *A, const mpi *B );
 
 /**
- * \brief          Signed substraction: X = A - B
+ * \brief          Signed subtraction: X = A - B
  *
  * \param X        Destination MPI
  * \param A        Left-hand MPI
@@ -481,7 +546,7 @@ int mpi_sub_mpi( mpi *X, const mpi *A, const mpi *B );
 int mpi_add_int( mpi *X, const mpi *A, t_sint b );
 
 /**
- * \brief          Signed substraction: X = A - b
+ * \brief          Signed subtraction: X = A - b
  *
  * \param X        Destination MPI
  * \param A        Left-hand MPI
@@ -506,8 +571,9 @@ int mpi_mul_mpi( mpi *X, const mpi *A, const mpi *B );
 
 /**
  * \brief          Baseline multiplication: X = A * b
- *                 Note: b is an unsigned integer type, thus
- *                 Negative values of b are ignored.
+ *                 Note: despite the functon signature, b is treated as a
+ *                 t_uint.  Negative values of b are treated as large positive
+ *                 values.
  *
  * \param X        Destination MPI
  * \param A        Left-hand MPI
@@ -581,7 +647,7 @@ int mpi_mod_int( t_uint *r, const mpi *A, t_sint b );
 /**
  * \brief          Sliding-window exponentiation: X = A^E mod N
  *
- * \param X        Destination MPI 
+ * \param X        Destination MPI
  * \param A        Left-hand MPI
  * \param E        Exponent MPI
  * \param N        Modular MPI
@@ -589,8 +655,8 @@ int mpi_mod_int( t_uint *r, const mpi *A, t_sint b );
  *
  * \return         0 if successful,
  *                 POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
- *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or even or if
- *                 E is negative
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or even or
+ *                 if E is negative
  *
  * \note           _RR is used to avoid re-computing R*R mod N across
  *                 multiple calls, which speeds up things a bit. It can
@@ -658,7 +724,8 @@ int mpi_is_prime( mpi *X,
  * \brief          Prime number generation
  *
  * \param X        Destination MPI
- * \param nbits    Required size of X in bits ( 3 <= nbits <= POLARSSL_MPI_MAX_BITS )
+ * \param nbits    Required size of X in bits
+ *                 ( 3 <= nbits <= POLARSSL_MPI_MAX_BITS )
  * \param dh_flag  If 1, then (X-1)/2 will be prime too
  * \param f_rng    RNG function
  * \param p_rng    RNG parameter
diff --git a/Externals/polarssl/include/polarssl/blowfish.h b/Externals/polarssl/include/polarssl/blowfish.h
index 9b269b71cb..c652b463d1 100644
--- a/Externals/polarssl/include/polarssl/blowfish.h
+++ b/Externals/polarssl/include/polarssl/blowfish.h
@@ -3,7 +3,7 @@
  *
  * \brief Blowfish block cipher
  *
- *  Copyright (C) 2012-2013, Brainspark B.V.
+ *  Copyright (C) 2012-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_BLOWFISH_H
 #define POLARSSL_BLOWFISH_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -42,7 +46,7 @@ typedef UINT32 uint32_t;
 #define BLOWFISH_DECRYPT     0
 #define BLOWFISH_MAX_KEY     448
 #define BLOWFISH_MIN_KEY     32
-#define BLOWFISH_ROUNDS      16         /* when increasing this value, make sure to extend the initialisation vectors */
+#define BLOWFISH_ROUNDS      16         /**< Rounds to use. When increasing this value, make sure to extend the initialisation vectors */
 #define BLOWFISH_BLOCKSIZE   8          /* Blowfish uses 64 bit blocks */
 
 #define POLARSSL_ERR_BLOWFISH_INVALID_KEY_LENGTH                -0x0016  /**< Invalid key length. */
@@ -52,6 +56,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          Blowfish context structure
  */
@@ -62,9 +70,19 @@ typedef struct
 }
 blowfish_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize Blowfish context
+ *
+ * \param ctx      Blowfish context to be initialized
+ */
+void blowfish_init( blowfish_context *ctx );
+
+/**
+ * \brief          Clear Blowfish context
+ *
+ * \param ctx      Blowfish context to be cleared
+ */
+void blowfish_free( blowfish_context *ctx );
 
 /**
  * \brief          Blowfish key schedule
@@ -75,7 +93,8 @@ extern "C" {
  *
  * \return         0 if successful, or POLARSSL_ERR_BLOWFISH_INVALID_KEY_LENGTH
  */
-int blowfish_setkey( blowfish_context *ctx, const unsigned char *key, unsigned int keysize );
+int blowfish_setkey( blowfish_context *ctx, const unsigned char *key,
+                     unsigned int keysize );
 
 /**
  * \brief          Blowfish-ECB block encryption/decryption
@@ -92,6 +111,7 @@ int blowfish_crypt_ecb( blowfish_context *ctx,
                         const unsigned char input[BLOWFISH_BLOCKSIZE],
                         unsigned char output[BLOWFISH_BLOCKSIZE] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          Blowfish-CBC buffer encryption/decryption
  *                 Length should be a multiple of the block
@@ -104,7 +124,8 @@ int blowfish_crypt_ecb( blowfish_context *ctx,
  * \param input    buffer holding the input data
  * \param output   buffer holding the output data
  *
- * \return         0 if successful, or POLARSSL_ERR_BLOWFISH_INVALID_INPUT_LENGTH
+ * \return         0 if successful, or
+ *                 POLARSSL_ERR_BLOWFISH_INVALID_INPUT_LENGTH
  */
 int blowfish_crypt_cbc( blowfish_context *ctx,
                         int mode,
@@ -112,11 +133,12 @@ int blowfish_crypt_cbc( blowfish_context *ctx,
                         unsigned char iv[BLOWFISH_BLOCKSIZE],
                         const unsigned char *input,
                         unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
+#if defined(POLARSSL_CIPHER_MODE_CFB)
 /**
  * \brief          Blowfish CFB buffer encryption/decryption.
  *
- * both 
  * \param ctx      Blowfish context
  * \param mode     BLOWFISH_ENCRYPT or BLOWFISH_DECRYPT
  * \param length   length of the input data
@@ -134,12 +156,15 @@ int blowfish_crypt_cfb64( blowfish_context *ctx,
                           unsigned char iv[BLOWFISH_BLOCKSIZE],
                           const unsigned char *input,
                           unsigned char *output );
+#endif /*POLARSSL_CIPHER_MODE_CFB */
 
+#if defined(POLARSSL_CIPHER_MODE_CTR)
 /**
  * \brief               Blowfish-CTR buffer encryption/decryption
  *
  * Warning: You have to keep the maximum use of your counter in mind!
  *
+ * \param ctx           Blowfish context
  * \param length        The length of the data
  * \param nc_off        The offset in the current stream_block (for resuming
  *                      within current cipher stream). The offset pointer to
@@ -159,6 +184,7 @@ int blowfish_crypt_ctr( blowfish_context *ctx,
                         unsigned char stream_block[BLOWFISH_BLOCKSIZE],
                         const unsigned char *input,
                         unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/bn_mul.h b/Externals/polarssl/include/polarssl/bn_mul.h
index 1c2da136ab..64b59ff1e3 100644
--- a/Externals/polarssl/include/polarssl/bn_mul.h
+++ b/Externals/polarssl/include/polarssl/bn_mul.h
@@ -48,102 +48,95 @@
 #if defined(__GNUC__)
 #if defined(__i386__)
 
-#define MULADDC_INIT                \
-    asm( "                          \
-        movl   %%ebx, %0;           \
-        movl   %5, %%esi;           \
-        movl   %6, %%edi;           \
-        movl   %7, %%ecx;           \
-        movl   %8, %%ebx;           \
-        "
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "movl   %%ebx, %0           \n\t"   \
+        "movl   %5, %%esi           \n\t"   \
+        "movl   %6, %%edi           \n\t"   \
+        "movl   %7, %%ecx           \n\t"   \
+        "movl   %8, %%ebx           \n\t"
 
-#define MULADDC_CORE                \
-        "                           \
-        lodsl;                      \
-        mull   %%ebx;               \
-        addl   %%ecx,   %%eax;      \
-        adcl   $0,      %%edx;      \
-        addl   (%%edi), %%eax;      \
-        adcl   $0,      %%edx;      \
-        movl   %%edx,   %%ecx;      \
-        stosl;                      \
-        "
+#define MULADDC_CORE                        \
+        "lodsl                      \n\t"   \
+        "mull   %%ebx               \n\t"   \
+        "addl   %%ecx,   %%eax      \n\t"   \
+        "adcl   $0,      %%edx      \n\t"   \
+        "addl   (%%edi), %%eax      \n\t"   \
+        "adcl   $0,      %%edx      \n\t"   \
+        "movl   %%edx,   %%ecx      \n\t"   \
+        "stosl                      \n\t"
 
 #if defined(POLARSSL_HAVE_SSE2)
 
-#define MULADDC_HUIT                    \
-        "                               \
-        movd     %%ecx,     %%mm1;      \
-        movd     %%ebx,     %%mm0;      \
-        movd     (%%edi),   %%mm3;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     (%%esi),   %%mm2;      \
-        pmuludq  %%mm0,     %%mm2;      \
-        movd     4(%%esi),  %%mm4;      \
-        pmuludq  %%mm0,     %%mm4;      \
-        movd     8(%%esi),  %%mm6;      \
-        pmuludq  %%mm0,     %%mm6;      \
-        movd     12(%%esi), %%mm7;      \
-        pmuludq  %%mm0,     %%mm7;      \
-        paddq    %%mm2,     %%mm1;      \
-        movd     4(%%edi),  %%mm3;      \
-        paddq    %%mm4,     %%mm3;      \
-        movd     8(%%edi),  %%mm5;      \
-        paddq    %%mm6,     %%mm5;      \
-        movd     12(%%edi), %%mm4;      \
-        paddq    %%mm4,     %%mm7;      \
-        movd     %%mm1,     (%%edi);    \
-        movd     16(%%esi), %%mm2;      \
-        pmuludq  %%mm0,     %%mm2;      \
-        psrlq    $32,       %%mm1;      \
-        movd     20(%%esi), %%mm4;      \
-        pmuludq  %%mm0,     %%mm4;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     24(%%esi), %%mm6;      \
-        pmuludq  %%mm0,     %%mm6;      \
-        movd     %%mm1,     4(%%edi);   \
-        psrlq    $32,       %%mm1;      \
-        movd     28(%%esi), %%mm3;      \
-        pmuludq  %%mm0,     %%mm3;      \
-        paddq    %%mm5,     %%mm1;      \
-        movd     16(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm2;      \
-        movd     %%mm1,     8(%%edi);   \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm7,     %%mm1;      \
-        movd     20(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm4;      \
-        movd     %%mm1,     12(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm2,     %%mm1;      \
-        movd     24(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm6;      \
-        movd     %%mm1,     16(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm4,     %%mm1;      \
-        movd     28(%%edi), %%mm5;      \
-        paddq    %%mm5,     %%mm3;      \
-        movd     %%mm1,     20(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm6,     %%mm1;      \
-        movd     %%mm1,     24(%%edi);  \
-        psrlq    $32,       %%mm1;      \
-        paddq    %%mm3,     %%mm1;      \
-        movd     %%mm1,     28(%%edi);  \
-        addl     $32,       %%edi;      \
-        addl     $32,       %%esi;      \
-        psrlq    $32,       %%mm1;      \
-        movd     %%mm1,     %%ecx;      \
-        "
+#define MULADDC_HUIT                            \
+        "movd     %%ecx,     %%mm1      \n\t"   \
+        "movd     %%ebx,     %%mm0      \n\t"   \
+        "movd     (%%edi),   %%mm3      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     (%%esi),   %%mm2      \n\t"   \
+        "pmuludq  %%mm0,     %%mm2      \n\t"   \
+        "movd     4(%%esi),  %%mm4      \n\t"   \
+        "pmuludq  %%mm0,     %%mm4      \n\t"   \
+        "movd     8(%%esi),  %%mm6      \n\t"   \
+        "pmuludq  %%mm0,     %%mm6      \n\t"   \
+        "movd     12(%%esi), %%mm7      \n\t"   \
+        "pmuludq  %%mm0,     %%mm7      \n\t"   \
+        "paddq    %%mm2,     %%mm1      \n\t"   \
+        "movd     4(%%edi),  %%mm3      \n\t"   \
+        "paddq    %%mm4,     %%mm3      \n\t"   \
+        "movd     8(%%edi),  %%mm5      \n\t"   \
+        "paddq    %%mm6,     %%mm5      \n\t"   \
+        "movd     12(%%edi), %%mm4      \n\t"   \
+        "paddq    %%mm4,     %%mm7      \n\t"   \
+        "movd     %%mm1,     (%%edi)    \n\t"   \
+        "movd     16(%%esi), %%mm2      \n\t"   \
+        "pmuludq  %%mm0,     %%mm2      \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     20(%%esi), %%mm4      \n\t"   \
+        "pmuludq  %%mm0,     %%mm4      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     24(%%esi), %%mm6      \n\t"   \
+        "pmuludq  %%mm0,     %%mm6      \n\t"   \
+        "movd     %%mm1,     4(%%edi)   \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     28(%%esi), %%mm3      \n\t"   \
+        "pmuludq  %%mm0,     %%mm3      \n\t"   \
+        "paddq    %%mm5,     %%mm1      \n\t"   \
+        "movd     16(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm2      \n\t"   \
+        "movd     %%mm1,     8(%%edi)   \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm7,     %%mm1      \n\t"   \
+        "movd     20(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm4      \n\t"   \
+        "movd     %%mm1,     12(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm2,     %%mm1      \n\t"   \
+        "movd     24(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm6      \n\t"   \
+        "movd     %%mm1,     16(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm4,     %%mm1      \n\t"   \
+        "movd     28(%%edi), %%mm5      \n\t"   \
+        "paddq    %%mm5,     %%mm3      \n\t"   \
+        "movd     %%mm1,     20(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm6,     %%mm1      \n\t"   \
+        "movd     %%mm1,     24(%%edi)  \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "paddq    %%mm3,     %%mm1      \n\t"   \
+        "movd     %%mm1,     28(%%edi)  \n\t"   \
+        "addl     $32,       %%edi      \n\t"   \
+        "addl     $32,       %%esi      \n\t"   \
+        "psrlq    $32,       %%mm1      \n\t"   \
+        "movd     %%mm1,     %%ecx      \n\t"
 
-#define MULADDC_STOP            \
-        "                       \
-        emms;                   \
-        movl   %4, %%ebx;       \
-        movl   %%ecx, %1;       \
-        movl   %%edi, %2;       \
-        movl   %%esi, %3;       \
-        "                       \
+#define MULADDC_STOP                    \
+        "emms                   \n\t"   \
+        "movl   %4, %%ebx       \n\t"   \
+        "movl   %%ecx, %1       \n\t"   \
+        "movl   %%edi, %2       \n\t"   \
+        "movl   %%esi, %3       \n\t"   \
         : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
         : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
         : "eax", "ecx", "edx", "esi", "edi"             \
@@ -151,13 +144,11 @@
 
 #else
 
-#define MULADDC_STOP            \
-        "                       \
-        movl   %4, %%ebx;       \
-        movl   %%ecx, %1;       \
-        movl   %%edi, %2;       \
-        movl   %%esi, %3;       \
-        "                       \
+#define MULADDC_STOP                    \
+        "movl   %4, %%ebx       \n\t"   \
+        "movl   %%ecx, %1       \n\t"   \
+        "movl   %%edi, %2       \n\t"   \
+        "movl   %%esi, %3       \n\t"   \
         : "=m" (t), "=m" (c), "=m" (d), "=m" (s)        \
         : "m" (t), "m" (s), "m" (d), "m" (c), "m" (b)   \
         : "eax", "ecx", "edx", "esi", "edi"             \
@@ -167,266 +158,287 @@
 
 #if defined(__amd64__) || defined (__x86_64__)
 
-#define MULADDC_INIT                            \
-    asm( "movq   %0, %%rsi      " :: "m" (s));  \
-    asm( "movq   %0, %%rdi      " :: "m" (d));  \
-    asm( "movq   %0, %%rcx      " :: "m" (c));  \
-    asm( "movq   %0, %%rbx      " :: "m" (b));  \
-    asm( "xorq   %r8, %r8       " );
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "movq   %3, %%rsi           \n\t"   \
+        "movq   %4, %%rdi           \n\t"   \
+        "movq   %5, %%rcx           \n\t"   \
+        "movq   %6, %%rbx           \n\t"   \
+        "xorq   %%r8, %%r8          \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "movq  (%rsi),%rax     " );            \
-    asm( "mulq   %rbx           " );            \
-    asm( "addq   $8,   %rsi     " );            \
-    asm( "addq   %rcx, %rax     " );            \
-    asm( "movq   %r8,  %rcx     " );            \
-    asm( "adcq   $0,   %rdx     " );            \
-    asm( "nop                   " );            \
-    asm( "addq   %rax, (%rdi)   " );            \
-    asm( "adcq   %rdx, %rcx     " );            \
-    asm( "addq   $8,   %rdi     " );
+#define MULADDC_CORE                        \
+        "movq   (%%rsi), %%rax      \n\t"   \
+        "mulq   %%rbx               \n\t"   \
+        "addq   $8,      %%rsi      \n\t"   \
+        "addq   %%rcx,   %%rax      \n\t"   \
+        "movq   %%r8,    %%rcx      \n\t"   \
+        "adcq   $0,      %%rdx      \n\t"   \
+        "nop                        \n\t"   \
+        "addq   %%rax,   (%%rdi)    \n\t"   \
+        "adcq   %%rdx,   %%rcx      \n\t"   \
+        "addq   $8,      %%rdi      \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "movq   %%rcx, %0      " : "=m" (c));  \
-    asm( "movq   %%rdi, %0      " : "=m" (d));  \
-    asm( "movq   %%rsi, %0      " : "=m" (s) :: \
-    "rax", "rcx", "rdx", "rbx", "rsi", "rdi", "r8" );
+#define MULADDC_STOP                        \
+        "movq   %%rcx, %0           \n\t"   \
+        "movq   %%rdi, %1           \n\t"   \
+        "movq   %%rsi, %2           \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)                      \
+        : "m" (s), "m" (d), "m" (c), "m" (b)                \
+        : "rax", "rcx", "rdx", "rbx", "rsi", "rdi", "r8"    \
+    );
 
 #endif /* AMD64 */
 
 #if defined(__mc68020__) || defined(__mcpu32__)
 
-#define MULADDC_INIT                            \
-    asm( "movl   %0, %%a2       " :: "m" (s));  \
-    asm( "movl   %0, %%a3       " :: "m" (d));  \
-    asm( "movl   %0, %%d3       " :: "m" (c));  \
-    asm( "movl   %0, %%d2       " :: "m" (b));  \
-    asm( "moveq  #0, %d0        " );
+#define MULADDC_INIT                    \
+    asm(                                \
+        "movl   %3, %%a2        \n\t"   \
+        "movl   %4, %%a3        \n\t"   \
+        "movl   %5, %%d3        \n\t"   \
+        "movl   %6, %%d2        \n\t"   \
+        "moveq  #0, %%d0        \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addl   %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "moveq  #0,  %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "addxl  %d4, %d3       " );
+#define MULADDC_CORE                    \
+        "movel  %%a2@+, %%d1    \n\t"   \
+        "mulul  %%d2, %%d4:%%d1 \n\t"   \
+        "addl   %%d3, %%d1      \n\t"   \
+        "addxl  %%d0, %%d4      \n\t"   \
+        "moveq  #0,   %%d3      \n\t"   \
+        "addl   %%d1, %%a3@+    \n\t"   \
+        "addxl  %%d4, %%d3      \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "movl   %%d3, %0       " : "=m" (c));  \
-    asm( "movl   %%a3, %0       " : "=m" (d));  \
-    asm( "movl   %%a2, %0       " : "=m" (s) :: \
-    "d0", "d1", "d2", "d3", "d4", "a2", "a3" );
+#define MULADDC_STOP                    \
+        "movl   %%d3, %0        \n\t"   \
+        "movl   %%a3, %1        \n\t"   \
+        "movl   %%a2, %2        \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "d0", "d1", "d2", "d3", "d4", "a2", "a3"  \
+    );
 
-#define MULADDC_HUIT                            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d4:%d1   " );            \
-    asm( "addxl  %d3, %d1       " );            \
-    asm( "addxl  %d0, %d4       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "movel  %a2@+, %d1     " );            \
-    asm( "mulul  %d2, %d3:%d1   " );            \
-    asm( "addxl  %d4, %d1       " );            \
-    asm( "addxl  %d0, %d3       " );            \
-    asm( "addl   %d1, %a3@+     " );            \
-    asm( "addxl  %d0, %d3       " );
+#define MULADDC_HUIT                        \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d4:%%d1  \n\t"   \
+        "addxl  %%d3,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d4       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "movel  %%a2@+,  %%d1       \n\t"   \
+        "mulul  %%d2,    %%d3:%%d1  \n\t"   \
+        "addxl  %%d4,    %%d1       \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"   \
+        "addl   %%d1,    %%a3@+     \n\t"   \
+        "addxl  %%d0,    %%d3       \n\t"
 
 #endif /* MC68000 */
 
-#if defined(__powerpc__)   || defined(__ppc__)
 #if defined(__powerpc64__) || defined(__ppc64__)
 
 #if defined(__MACH__) && defined(__APPLE__)
 
-#define MULADDC_INIT                            \
-    asm( "ld     r3, %0         " :: "m" (s));  \
-    asm( "ld     r4, %0         " :: "m" (d));  \
-    asm( "ld     r5, %0         " :: "m" (c));  \
-    asm( "ld     r6, %0         " :: "m" (b));  \
-    asm( "addi   r3, r3, -8     " );            \
-    asm( "addi   r4, r4, -8     " );            \
-    asm( "addic  r5, r5,  0     " );
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "ld     r3, %3              \n\t"   \
+        "ld     r4, %4              \n\t"   \
+        "ld     r5, %5              \n\t"   \
+        "ld     r6, %6              \n\t"   \
+        "addi   r3, r3, -8          \n\t"   \
+        "addi   r4, r4, -8          \n\t"   \
+        "addic  r5, r5,  0          \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "ldu    r7, 8(r3)      " );            \
-    asm( "mulld  r8, r7, r6     " );            \
-    asm( "mulhdu r9, r7, r6     " );            \
-    asm( "adde   r8, r8, r5     " );            \
-    asm( "ld     r7, 8(r4)      " );            \
-    asm( "addze  r5, r9         " );            \
-    asm( "addc   r8, r8, r7     " );            \
-    asm( "stdu   r8, 8(r4)      " );
+#define MULADDC_CORE                        \
+        "ldu    r7, 8(r3)           \n\t"   \
+        "mulld  r8, r7, r6          \n\t"   \
+        "mulhdu r9, r7, r6          \n\t"   \
+        "adde   r8, r8, r5          \n\t"   \
+        "ld     r7, 8(r4)           \n\t"   \
+        "addze  r5, r9              \n\t"   \
+        "addc   r8, r8, r7          \n\t"   \
+        "stdu   r8, 8(r4)           \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "addze  r5, r5         " );            \
-    asm( "addi   r4, r4, 8      " );            \
-    asm( "addi   r3, r3, 8      " );            \
-    asm( "std    r5, %0         " : "=m" (c));  \
-    asm( "std    r4, %0         " : "=m" (d));  \
-    asm( "std    r3, %0         " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+#define MULADDC_STOP                        \
+        "addze  r5, r5              \n\t"   \
+        "addi   r4, r4, 8           \n\t"   \
+        "addi   r3, r3, 8           \n\t"   \
+        "std    r5, %0              \n\t"   \
+        "std    r4, %1              \n\t"   \
+        "std    r3, %2              \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
 
-#else
 
-#define MULADDC_INIT                            \
-    asm( "ld     %%r3, %0       " :: "m" (s));  \
-    asm( "ld     %%r4, %0       " :: "m" (d));  \
-    asm( "ld     %%r5, %0       " :: "m" (c));  \
-    asm( "ld     %%r6, %0       " :: "m" (b));  \
-    asm( "addi   %r3, %r3, -8   " );            \
-    asm( "addi   %r4, %r4, -8   " );            \
-    asm( "addic  %r5, %r5,  0   " );
+#else /* __MACH__ && __APPLE__ */
 
-#define MULADDC_CORE                            \
-    asm( "ldu    %r7, 8(%r3)    " );            \
-    asm( "mulld  %r8, %r7, %r6  " );            \
-    asm( "mulhdu %r9, %r7, %r6  " );            \
-    asm( "adde   %r8, %r8, %r5  " );            \
-    asm( "ld     %r7, 8(%r4)    " );            \
-    asm( "addze  %r5, %r9       " );            \
-    asm( "addc   %r8, %r8, %r7  " );            \
-    asm( "stdu   %r8, 8(%r4)    " );
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "ld     %%r3, %3            \n\t"   \
+        "ld     %%r4, %4            \n\t"   \
+        "ld     %%r5, %5            \n\t"   \
+        "ld     %%r6, %6            \n\t"   \
+        "addi   %%r3, %%r3, -8      \n\t"   \
+        "addi   %%r4, %%r4, -8      \n\t"   \
+        "addic  %%r5, %%r5,  0      \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "addze  %r5, %r5       " );            \
-    asm( "addi   %r4, %r4, 8    " );            \
-    asm( "addi   %r3, %r3, 8    " );            \
-    asm( "std    %%r5, %0       " : "=m" (c));  \
-    asm( "std    %%r4, %0       " : "=m" (d));  \
-    asm( "std    %%r3, %0       " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+#define MULADDC_CORE                        \
+        "ldu    %%r7, 8(%%r3)       \n\t"   \
+        "mulld  %%r8, %%r7, %%r6    \n\t"   \
+        "mulhdu %%r9, %%r7, %%r6    \n\t"   \
+        "adde   %%r8, %%r8, %%r5    \n\t"   \
+        "ld     %%r7, 8(%%r4)       \n\t"   \
+        "addze  %%r5, %%r9          \n\t"   \
+        "addc   %%r8, %%r8, %%r7    \n\t"   \
+        "stdu   %%r8, 8(%%r4)       \n\t"
 
-#endif
+#define MULADDC_STOP                        \
+        "addze  %%r5, %%r5          \n\t"   \
+        "addi   %%r4, %%r4, 8       \n\t"   \
+        "addi   %%r3, %%r3, 8       \n\t"   \
+        "std    %%r5, %0            \n\t"   \
+        "std    %%r4, %1            \n\t"   \
+        "std    %%r3, %2            \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
 
-#else /* PPC32 */
+#endif /* __MACH__ && __APPLE__ */
+
+#elif defined(__powerpc__) || defined(__ppc__) /* end PPC64/begin PPC32  */
 
 #if defined(__MACH__) && defined(__APPLE__)
 
-#define MULADDC_INIT                            \
-    asm( "lwz    r3, %0         " :: "m" (s));  \
-    asm( "lwz    r4, %0         " :: "m" (d));  \
-    asm( "lwz    r5, %0         " :: "m" (c));  \
-    asm( "lwz    r6, %0         " :: "m" (b));  \
-    asm( "addi   r3, r3, -4     " );            \
-    asm( "addi   r4, r4, -4     " );            \
-    asm( "addic  r5, r5,  0     " );
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lwz    r3, %3          \n\t"   \
+        "lwz    r4, %4          \n\t"   \
+        "lwz    r5, %5          \n\t"   \
+        "lwz    r6, %6          \n\t"   \
+        "addi   r3, r3, -4      \n\t"   \
+        "addi   r4, r4, -4      \n\t"   \
+        "addic  r5, r5,  0      \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "lwzu   r7, 4(r3)      " );            \
-    asm( "mullw  r8, r7, r6     " );            \
-    asm( "mulhwu r9, r7, r6     " );            \
-    asm( "adde   r8, r8, r5     " );            \
-    asm( "lwz    r7, 4(r4)      " );            \
-    asm( "addze  r5, r9         " );            \
-    asm( "addc   r8, r8, r7     " );            \
-    asm( "stwu   r8, 4(r4)      " );
+#define MULADDC_CORE                    \
+        "lwzu   r7, 4(r3)       \n\t"   \
+        "mullw  r8, r7, r6      \n\t"   \
+        "mulhwu r9, r7, r6      \n\t"   \
+        "adde   r8, r8, r5      \n\t"   \
+        "lwz    r7, 4(r4)       \n\t"   \
+        "addze  r5, r9          \n\t"   \
+        "addc   r8, r8, r7      \n\t"   \
+        "stwu   r8, 4(r4)       \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "addze  r5, r5         " );            \
-    asm( "addi   r4, r4, 4      " );            \
-    asm( "addi   r3, r3, 4      " );            \
-    asm( "stw    r5, %0         " : "=m" (c));  \
-    asm( "stw    r4, %0         " : "=m" (d));  \
-    asm( "stw    r3, %0         " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+#define MULADDC_STOP                    \
+        "addze  r5, r5          \n\t"   \
+        "addi   r4, r4, 4       \n\t"   \
+        "addi   r3, r3, 4       \n\t"   \
+        "stw    r5, %0          \n\t"   \
+        "stw    r4, %1          \n\t"   \
+        "stw    r3, %2          \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
 
-#else
+#else /* __MACH__ && __APPLE__ */
 
-#define MULADDC_INIT                            \
-    asm( "lwz    %%r3, %0       " :: "m" (s));  \
-    asm( "lwz    %%r4, %0       " :: "m" (d));  \
-    asm( "lwz    %%r5, %0       " :: "m" (c));  \
-    asm( "lwz    %%r6, %0       " :: "m" (b));  \
-    asm( "addi   %r3, %r3, -4   " );            \
-    asm( "addi   %r4, %r4, -4   " );            \
-    asm( "addic  %r5, %r5,  0   " );
+#define MULADDC_INIT                        \
+    asm(                                    \
+        "lwz    %%r3, %3            \n\t"   \
+        "lwz    %%r4, %4            \n\t"   \
+        "lwz    %%r5, %5            \n\t"   \
+        "lwz    %%r6, %6            \n\t"   \
+        "addi   %%r3, %%r3, -4      \n\t"   \
+        "addi   %%r4, %%r4, -4      \n\t"   \
+        "addic  %%r5, %%r5,  0      \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "lwzu   %r7, 4(%r3)    " );            \
-    asm( "mullw  %r8, %r7, %r6  " );            \
-    asm( "mulhwu %r9, %r7, %r6  " );            \
-    asm( "adde   %r8, %r8, %r5  " );            \
-    asm( "lwz    %r7, 4(%r4)    " );            \
-    asm( "addze  %r5, %r9       " );            \
-    asm( "addc   %r8, %r8, %r7  " );            \
-    asm( "stwu   %r8, 4(%r4)    " );
+#define MULADDC_CORE                        \
+        "lwzu   %%r7, 4(%%r3)       \n\t"   \
+        "mullw  %%r8, %%r7, %%r6    \n\t"   \
+        "mulhwu %%r9, %%r7, %%r6    \n\t"   \
+        "adde   %%r8, %%r8, %%r5    \n\t"   \
+        "lwz    %%r7, 4(%%r4)       \n\t"   \
+        "addze  %%r5, %%r9          \n\t"   \
+        "addc   %%r8, %%r8, %%r7    \n\t"   \
+        "stwu   %%r8, 4(%%r4)       \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "addze  %r5, %r5       " );            \
-    asm( "addi   %r4, %r4, 4    " );            \
-    asm( "addi   %r3, %r3, 4    " );            \
-    asm( "stw    %%r5, %0       " : "=m" (c));  \
-    asm( "stw    %%r4, %0       " : "=m" (d));  \
-    asm( "stw    %%r3, %0       " : "=m" (s) :: \
-    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+#define MULADDC_STOP                        \
+        "addze  %%r5, %%r5          \n\t"   \
+        "addi   %%r4, %%r4, 4       \n\t"   \
+        "addi   %%r3, %%r3, 4       \n\t"   \
+        "stw    %%r5, %0            \n\t"   \
+        "stw    %%r4, %1            \n\t"   \
+        "stw    %%r3, %2            \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4", "r5", "r6", "r7", "r8", "r9"  \
+    );
 
-#endif
+#endif /* __MACH__ && __APPLE__ */
 
 #endif /* PPC32 */
-#endif /* PPC64 */
 
-#if defined(__sparc__) && defined(__sparc64__)
+/*
+ * The Sparc64 assembly is reported to be broken.
+ * Disable it for now, until we're able to fix it.
+ */
+#if 0 && defined(__sparc__) && defined(__sparc64__)
 
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-                ldx     %3, %%o0;               \
-                ldx     %4, %%o1;               \
-                ld      %5, %%o2;               \
-                ld      %6, %%o3;               \
-         "
+#define MULADDC_INIT                                    \
+    asm(                                                \
+                "ldx     %3, %%o0               \n\t"   \
+                "ldx     %4, %%o1               \n\t"   \
+                "ld      %5, %%o2               \n\t"   \
+                "ld      %6, %%o3               \n\t"
 
-#define MULADDC_CORE                            \
-         "                                      \
-                ld      [%%o0], %%o4;           \
-                inc     4, %%o0;                \
-                ld      [%%o1], %%o5;           \
-                umul    %%o3, %%o4, %%o4;       \
-                addcc   %%o4, %%o2, %%o4;       \
-                rd      %%y, %%g1;              \
-                addx    %%g1, 0, %%g1;          \
-                addcc   %%o4, %%o5, %%o4;       \
-                st      %%o4, [%%o1];           \
-                addx    %%g1, 0, %%o2;          \
-                inc     4, %%o1;                \
-        "
+#define MULADDC_CORE                                    \
+                "ld      [%%o0], %%o4           \n\t"   \
+                "inc     4, %%o0                \n\t"   \
+                "ld      [%%o1], %%o5           \n\t"   \
+                "umul    %%o3, %%o4, %%o4       \n\t"   \
+                "addcc   %%o4, %%o2, %%o4       \n\t"   \
+                "rd      %%y, %%g1              \n\t"   \
+                "addx    %%g1, 0, %%g1          \n\t"   \
+                "addcc   %%o4, %%o5, %%o4       \n\t"   \
+                "st      %%o4, [%%o1]           \n\t"   \
+                "addx    %%g1, 0, %%o2          \n\t"   \
+                "inc     4, %%o1                \n\t"
 
-#define MULADDC_STOP                            \
-        "                                       \
-                st      %%o2, %0;               \
-                stx     %%o1, %1;               \
-                stx     %%o0, %2;               \
-        "                                       \
+        #define MULADDC_STOP                            \
+                "st      %%o2, %0               \n\t"   \
+                "stx     %%o1, %1               \n\t"   \
+                "stx     %%o0, %2               \n\t"   \
         : "=m" (c), "=m" (d), "=m" (s)          \
         : "m" (s), "m" (d), "m" (c), "m" (b)    \
         : "g1", "o0", "o1", "o2", "o3", "o4",   \
@@ -436,36 +448,30 @@
 
 #if defined(__sparc__) && !defined(__sparc64__)
 
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-                ld      %3, %%o0;               \
-                ld      %4, %%o1;               \
-                ld      %5, %%o2;               \
-                ld      %6, %%o3;               \
-         "
+#define MULADDC_INIT                                    \
+    asm(                                                \
+                "ld      %3, %%o0               \n\t"   \
+                "ld      %4, %%o1               \n\t"   \
+                "ld      %5, %%o2               \n\t"   \
+                "ld      %6, %%o3               \n\t"
 
-#define MULADDC_CORE                            \
-         "                                      \
-                ld      [%%o0], %%o4;           \
-                inc     4, %%o0;                \
-                ld      [%%o1], %%o5;           \
-                umul    %%o3, %%o4, %%o4;       \
-                addcc   %%o4, %%o2, %%o4;       \
-                rd      %%y, %%g1;              \
-                addx    %%g1, 0, %%g1;          \
-                addcc   %%o4, %%o5, %%o4;       \
-                st      %%o4, [%%o1];           \
-                addx    %%g1, 0, %%o2;          \
-                inc     4, %%o1;                \
-        "
+#define MULADDC_CORE                                    \
+                "ld      [%%o0], %%o4           \n\t"   \
+                "inc     4, %%o0                \n\t"   \
+                "ld      [%%o1], %%o5           \n\t"   \
+                "umul    %%o3, %%o4, %%o4       \n\t"   \
+                "addcc   %%o4, %%o2, %%o4       \n\t"   \
+                "rd      %%y, %%g1              \n\t"   \
+                "addx    %%g1, 0, %%g1          \n\t"   \
+                "addcc   %%o4, %%o5, %%o4       \n\t"   \
+                "st      %%o4, [%%o1]           \n\t"   \
+                "addx    %%g1, 0, %%o2          \n\t"   \
+                "inc     4, %%o1                \n\t"
 
-#define MULADDC_STOP                            \
-        "                                       \
-                st      %%o2, %0;               \
-                st      %%o1, %1;               \
-                st      %%o0, %2;               \
-        "                                       \
+#define MULADDC_STOP                                    \
+                "st      %%o2, %0               \n\t"   \
+                "st      %%o1, %1               \n\t"   \
+                "st      %%o0, %2               \n\t"   \
         : "=m" (c), "=m" (d), "=m" (s)          \
         : "m" (s), "m" (d), "m" (c), "m" (b)    \
         : "g1", "o0", "o1", "o2", "o3", "o4",   \
@@ -476,73 +482,81 @@
 
 #if defined(__microblaze__) || defined(microblaze)
 
-#define MULADDC_INIT                            \
-    asm( "lwi   r3,   %0        " :: "m" (s));  \
-    asm( "lwi   r4,   %0        " :: "m" (d));  \
-    asm( "lwi   r5,   %0        " :: "m" (c));  \
-    asm( "lwi   r6,   %0        " :: "m" (b));  \
-    asm( "andi  r7,   r6, 0xffff" );            \
-    asm( "bsrli r6,   r6, 16    " );
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lwi   r3,   %3         \n\t"   \
+        "lwi   r4,   %4         \n\t"   \
+        "lwi   r5,   %5         \n\t"   \
+        "lwi   r6,   %6         \n\t"   \
+        "andi  r7,   r6, 0xffff \n\t"   \
+        "bsrli r6,   r6, 16     \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "lhui  r8,   r3,   0   " );            \
-    asm( "addi  r3,   r3,   2   " );            \
-    asm( "lhui  r9,   r3,   0   " );            \
-    asm( "addi  r3,   r3,   2   " );            \
-    asm( "mul   r10,  r9,  r6   " );            \
-    asm( "mul   r11,  r8,  r7   " );            \
-    asm( "mul   r12,  r9,  r7   " );            \
-    asm( "mul   r13,  r8,  r6   " );            \
-    asm( "bsrli  r8, r10,  16   " );            \
-    asm( "bsrli  r9, r11,  16   " );            \
-    asm( "add   r13, r13,  r8   " );            \
-    asm( "add   r13, r13,  r9   " );            \
-    asm( "bslli r10, r10,  16   " );            \
-    asm( "bslli r11, r11,  16   " );            \
-    asm( "add   r12, r12, r10   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "add   r12, r12, r11   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "lwi   r10,  r4,   0   " );            \
-    asm( "add   r12, r12, r10   " );            \
-    asm( "addc  r13, r13,  r0   " );            \
-    asm( "add   r12, r12,  r5   " );            \
-    asm( "addc   r5, r13,  r0   " );            \
-    asm( "swi   r12,  r4,   0   " );            \
-    asm( "addi   r4,  r4,   4   " );
+#define MULADDC_CORE                    \
+        "lhui  r8,   r3,   0    \n\t"   \
+        "addi  r3,   r3,   2    \n\t"   \
+        "lhui  r9,   r3,   0    \n\t"   \
+        "addi  r3,   r3,   2    \n\t"   \
+        "mul   r10,  r9,  r6    \n\t"   \
+        "mul   r11,  r8,  r7    \n\t"   \
+        "mul   r12,  r9,  r7    \n\t"   \
+        "mul   r13,  r8,  r6    \n\t"   \
+        "bsrli  r8, r10,  16    \n\t"   \
+        "bsrli  r9, r11,  16    \n\t"   \
+        "add   r13, r13,  r8    \n\t"   \
+        "add   r13, r13,  r9    \n\t"   \
+        "bslli r10, r10,  16    \n\t"   \
+        "bslli r11, r11,  16    \n\t"   \
+        "add   r12, r12, r10    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "add   r12, r12, r11    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "lwi   r10,  r4,   0    \n\t"   \
+        "add   r12, r12, r10    \n\t"   \
+        "addc  r13, r13,  r0    \n\t"   \
+        "add   r12, r12,  r5    \n\t"   \
+        "addc   r5, r13,  r0    \n\t"   \
+        "swi   r12,  r4,   0    \n\t"   \
+        "addi   r4,  r4,   4    \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "swi   r5,   %0        " : "=m" (c));  \
-    asm( "swi   r4,   %0        " : "=m" (d));  \
-    asm( "swi   r3,   %0        " : "=m" (s) :: \
-     "r3", "r4" , "r5" , "r6" , "r7" , "r8" ,   \
-     "r9", "r10", "r11", "r12", "r13" );
+#define MULADDC_STOP                    \
+        "swi   r5,   %0         \n\t"   \
+        "swi   r4,   %1         \n\t"   \
+        "swi   r3,   %2         \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "r3", "r4"  "r5", "r6", "r7", "r8",       \
+          "r9", "r10", "r11", "r12", "r13"          \
+    );
 
 #endif /* MicroBlaze */
 
 #if defined(__tricore__)
 
 #define MULADDC_INIT                            \
-    asm( "ld.a   %%a2, %0       " :: "m" (s));  \
-    asm( "ld.a   %%a3, %0       " :: "m" (d));  \
-    asm( "ld.w   %%d4, %0       " :: "m" (c));  \
-    asm( "ld.w   %%d1, %0       " :: "m" (b));  \
-    asm( "xor    %d5, %d5       " );
+    asm(                                        \
+        "ld.a   %%a2, %3                \n\t"   \
+        "ld.a   %%a3, %4                \n\t"   \
+        "ld.w   %%d4, %5                \n\t"   \
+        "ld.w   %%d1, %6                \n\t"   \
+        "xor    %%d5, %%d5              \n\t"
 
 #define MULADDC_CORE                            \
-    asm( "ld.w   %d0,   [%a2+]      " );        \
-    asm( "madd.u %e2, %e4, %d0, %d1 " );        \
-    asm( "ld.w   %d0,   [%a3]       " );        \
-    asm( "addx   %d2,    %d2,  %d0  " );        \
-    asm( "addc   %d3,    %d3,    0  " );        \
-    asm( "mov    %d4,    %d3        " );        \
-    asm( "st.w  [%a3+],  %d2        " );
+        "ld.w   %%d0,   [%%a2+]         \n\t"   \
+        "madd.u %%e2, %%e4, %%d0, %%d1  \n\t"   \
+        "ld.w   %%d0,   [%%a3]          \n\t"   \
+        "addx   %%d2,    %%d2,  %%d0    \n\t"   \
+        "addc   %%d3,    %%d3,    0     \n\t"   \
+        "mov    %%d4,    %%d3           \n\t"   \
+        "st.w  [%%a3+],  %%d2           \n\t"
 
 #define MULADDC_STOP                            \
-    asm( "st.w   %0, %%d4       " : "=m" (c));  \
-    asm( "st.a   %0, %%a3       " : "=m" (d));  \
-    asm( "st.a   %0, %%a2       " : "=m" (s) :: \
-    "d0", "d1", "e2", "d4", "a2", "a3" );
+        "st.w   %0, %%d4                \n\t"   \
+        "st.a   %1, %%a3                \n\t"   \
+        "st.a   %2, %%a2                \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)          \
+        : "m" (s), "m" (d), "m" (c), "m" (b)    \
+        : "d0", "d1", "e2", "d4", "a2", "a3"    \
+    );
 
 #endif /* TriCore */
 
@@ -550,59 +564,53 @@
 
 #if defined(__thumb__) && !defined(__thumb2__)
 
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                      \
-            ldr    r0, %3;                      \
-            ldr    r1, %4;                      \
-            ldr    r2, %5;                      \
-            ldr    r3, %6;                      \
-            lsr    r7, r3, #16;                 \
-            mov    r9, r7;                      \
-            lsl    r7, r3, #16;                 \
-            lsr    r7, r7, #16;                 \
-            mov    r8, r7;                      \
-         "
+#define MULADDC_INIT                                    \
+    asm(                                                \
+            "ldr    r0, %3                      \n\t"   \
+            "ldr    r1, %4                      \n\t"   \
+            "ldr    r2, %5                      \n\t"   \
+            "ldr    r3, %6                      \n\t"   \
+            "lsr    r7, r3, #16                 \n\t"   \
+            "mov    r9, r7                      \n\t"   \
+            "lsl    r7, r3, #16                 \n\t"   \
+            "lsr    r7, r7, #16                 \n\t"   \
+            "mov    r8, r7                      \n\t"
 
-#define MULADDC_CORE                            \
-         "                                      \
-            ldmia  r0!, {r6};                   \
-            lsr    r7, r6, #16;                 \
-            lsl    r6, r6, #16;                 \
-            lsr    r6, r6, #16;                 \
-            mov    r4, r8;                      \
-            mul    r4, r6;                      \
-            mov    r3, r9;                      \
-            mul    r6, r3;                      \
-            mov    r5, r9;                      \
-            mul    r5, r7;                      \
-            mov    r3, r8;                      \
-            mul    r7, r3;                      \
-            lsr    r3, r6, #16;                 \
-            add    r5, r5, r3;                  \
-            lsr    r3, r7, #16;                 \
-            add    r5, r5, r3;                  \
-            add    r4, r4, r2;                  \
-            mov    r2, #0;                      \
-            adc    r5, r2;                      \
-            lsl    r3, r6, #16;                 \
-            add    r4, r4, r3;                  \
-            adc    r5, r2;                      \
-            lsl    r3, r7, #16;                 \
-            add    r4, r4, r3;                  \
-            adc    r5, r2;                      \
-            ldr    r3, [r1];                    \
-            add    r4, r4, r3;                  \
-            adc    r2, r5;                      \
-            stmia  r1!, {r4};                   \
-         "
+#define MULADDC_CORE                                    \
+            "ldmia  r0!, {r6}                   \n\t"   \
+            "lsr    r7, r6, #16                 \n\t"   \
+            "lsl    r6, r6, #16                 \n\t"   \
+            "lsr    r6, r6, #16                 \n\t"   \
+            "mov    r4, r8                      \n\t"   \
+            "mul    r4, r6                      \n\t"   \
+            "mov    r3, r9                      \n\t"   \
+            "mul    r6, r3                      \n\t"   \
+            "mov    r5, r9                      \n\t"   \
+            "mul    r5, r7                      \n\t"   \
+            "mov    r3, r8                      \n\t"   \
+            "mul    r7, r3                      \n\t"   \
+            "lsr    r3, r6, #16                 \n\t"   \
+            "add    r5, r5, r3                  \n\t"   \
+            "lsr    r3, r7, #16                 \n\t"   \
+            "add    r5, r5, r3                  \n\t"   \
+            "add    r4, r4, r2                  \n\t"   \
+            "mov    r2, #0                      \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "lsl    r3, r6, #16                 \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "lsl    r3, r7, #16                 \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r5, r2                      \n\t"   \
+            "ldr    r3, [r1]                    \n\t"   \
+            "add    r4, r4, r3                  \n\t"   \
+            "adc    r2, r5                      \n\t"   \
+            "stmia  r1!, {r4}                   \n\t"
 
-#define MULADDC_STOP                            \
-         "                                      \
-            str    r2, %0;                      \
-            str    r1, %1;                      \
-            str    r0, %2;                      \
-         "                                      \
+#define MULADDC_STOP                                    \
+            "str    r2, %0                      \n\t"   \
+            "str    r1, %1                      \n\t"   \
+            "str    r0, %2                      \n\t"   \
          : "=m" (c),  "=m" (d), "=m" (s)        \
          : "m" (s), "m" (d), "m" (c), "m" (b)   \
          : "r0", "r1", "r2", "r3", "r4", "r5",  \
@@ -611,32 +619,26 @@
 
 #else
 
-#define MULADDC_INIT                            \
-    asm(                                        \
-         "                                     \
-            ldr    r0, %3;                      \
-            ldr    r1, %4;                      \
-            ldr    r2, %5;                      \
-            ldr    r3, %6;                      \
-         "
+#define MULADDC_INIT                                    \
+    asm(                                                \
+            "ldr    r0, %3                      \n\t"   \
+            "ldr    r1, %4                      \n\t"   \
+            "ldr    r2, %5                      \n\t"   \
+            "ldr    r3, %6                      \n\t"
 
-#define MULADDC_CORE                            \
-         "                                      \
-            ldr    r4, [r0], #4;                \
-            mov    r5, #0;                      \
-            ldr    r6, [r1];                    \
-            umlal  r2, r5, r3, r4;              \
-            adds   r7, r6, r2;                  \
-            adc    r2, r5, #0;                  \
-            str    r7, [r1], #4;                \
-         "
+#define MULADDC_CORE                                    \
+            "ldr    r4, [r0], #4                \n\t"   \
+            "mov    r5, #0                      \n\t"   \
+            "ldr    r6, [r1]                    \n\t"   \
+            "umlal  r2, r5, r3, r4              \n\t"   \
+            "adds   r7, r6, r2                  \n\t"   \
+            "adc    r2, r5, #0                  \n\t"   \
+            "str    r7, [r1], #4                \n\t"
 
-#define MULADDC_STOP                            \
-         "                                      \
-            str    r2, %0;                      \
-            str    r1, %1;                      \
-            str    r0, %2;                      \
-         "                                      \
+#define MULADDC_STOP                                    \
+            "str    r2, %0                      \n\t"   \
+            "str    r1, %1                      \n\t"   \
+            "str    r0, %2                      \n\t"   \
          : "=m" (c),  "=m" (d), "=m" (s)        \
          : "m" (s), "m" (d), "m" (c), "m" (b)   \
          : "r0", "r1", "r2", "r3", "r4", "r5",  \
@@ -649,64 +651,71 @@
 
 #if defined(__alpha__)
 
-#define MULADDC_INIT                            \
-    asm( "ldq    $1, %0         " :: "m" (s));  \
-    asm( "ldq    $2, %0         " :: "m" (d));  \
-    asm( "ldq    $3, %0         " :: "m" (c));  \
-    asm( "ldq    $4, %0         " :: "m" (b));
+#define MULADDC_INIT                    \
+    asm(                                \
+        "ldq    $1, %3          \n\t"   \
+        "ldq    $2, %4          \n\t"   \
+        "ldq    $3, %5          \n\t"   \
+        "ldq    $4, %6          \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "ldq    $6,  0($1)     " );            \
-    asm( "addq   $1,  8, $1     " );            \
-    asm( "mulq   $6, $4, $7     " );            \
-    asm( "umulh  $6, $4, $6     " );            \
-    asm( "addq   $7, $3, $7     " );            \
-    asm( "cmpult $7, $3, $3     " );            \
-    asm( "ldq    $5,  0($2)     " );            \
-    asm( "addq   $7, $5, $7     " );            \
-    asm( "cmpult $7, $5, $5     " );            \
-    asm( "stq    $7,  0($2)     " );            \
-    asm( "addq   $2,  8, $2     " );            \
-    asm( "addq   $6, $3, $3     " );            \
-    asm( "addq   $5, $3, $3     " );
-
-#define MULADDC_STOP                            \
-    asm( "stq    $3, %0         " : "=m" (c));  \
-    asm( "stq    $2, %0         " : "=m" (d));  \
-    asm( "stq    $1, %0         " : "=m" (s) :: \
-    "$1", "$2", "$3", "$4", "$5", "$6", "$7" );
+#define MULADDC_CORE                    \
+        "ldq    $6,  0($1)      \n\t"   \
+        "addq   $1,  8, $1      \n\t"   \
+        "mulq   $6, $4, $7      \n\t"   \
+        "umulh  $6, $4, $6      \n\t"   \
+        "addq   $7, $3, $7      \n\t"   \
+        "cmpult $7, $3, $3      \n\t"   \
+        "ldq    $5,  0($2)      \n\t"   \
+        "addq   $7, $5, $7      \n\t"   \
+        "cmpult $7, $5, $5      \n\t"   \
+        "stq    $7,  0($2)      \n\t"   \
+        "addq   $2,  8, $2      \n\t"   \
+        "addq   $6, $3, $3      \n\t"   \
+        "addq   $5, $3, $3      \n\t"
 
+#define MULADDC_STOP                                    \
+        "stq    $3, %0          \n\t"   \
+        "stq    $2, %1          \n\t"   \
+        "stq    $1, %2          \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)              \
+        : "m" (s), "m" (d), "m" (c), "m" (b)        \
+        : "$1", "$2", "$3", "$4", "$5", "$6", "$7"  \
+    );
 #endif /* Alpha */
 
-#if defined(__mips__)
+#if defined(__mips__) && !defined(__mips64__)
 
-#define MULADDC_INIT                            \
-    asm( "lw     $10, %0        " :: "m" (s));  \
-    asm( "lw     $11, %0        " :: "m" (d));  \
-    asm( "lw     $12, %0        " :: "m" (c));  \
-    asm( "lw     $13, %0        " :: "m" (b));
+#define MULADDC_INIT                    \
+    asm(                                \
+        "lw     $10, %3         \n\t"   \
+        "lw     $11, %4         \n\t"   \
+        "lw     $12, %5         \n\t"   \
+        "lw     $13, %6         \n\t"
 
-#define MULADDC_CORE                            \
-    asm( "lw     $14, 0($10)    " );            \
-    asm( "multu  $13, $14       " );            \
-    asm( "addi   $10, $10, 4    " );            \
-    asm( "mflo   $14            " );            \
-    asm( "mfhi   $9             " );            \
-    asm( "addu   $14, $12, $14  " );            \
-    asm( "lw     $15, 0($11)    " );            \
-    asm( "sltu   $12, $14, $12  " );            \
-    asm( "addu   $15, $14, $15  " );            \
-    asm( "sltu   $14, $15, $14  " );            \
-    asm( "addu   $12, $12, $9   " );            \
-    asm( "sw     $15, 0($11)    " );            \
-    asm( "addu   $12, $12, $14  " );            \
-    asm( "addi   $11, $11, 4    " );
+#define MULADDC_CORE                    \
+        "lw     $14, 0($10)     \n\t"   \
+        "multu  $13, $14        \n\t"   \
+        "addi   $10, $10, 4     \n\t"   \
+        "mflo   $14             \n\t"   \
+        "mfhi   $9              \n\t"   \
+        "addu   $14, $12, $14   \n\t"   \
+        "lw     $15, 0($11)     \n\t"   \
+        "sltu   $12, $14, $12   \n\t"   \
+        "addu   $15, $14, $15   \n\t"   \
+        "sltu   $14, $15, $14   \n\t"   \
+        "addu   $12, $12, $9    \n\t"   \
+        "sw     $15, 0($11)     \n\t"   \
+        "addu   $12, $12, $14   \n\t"   \
+        "addi   $11, $11, 4     \n\t"
 
-#define MULADDC_STOP                            \
-    asm( "sw     $12, %0        " : "=m" (c));  \
-    asm( "sw     $11, %0        " : "=m" (d));  \
-    asm( "sw     $10, %0        " : "=m" (s) :: \
-    "$9", "$10", "$11", "$12", "$13", "$14", "$15" );
+#define MULADDC_STOP                    \
+        "sw     $12, %0         \n\t"   \
+        "sw     $11, %1         \n\t"   \
+        "sw     $10, %2         \n\t"   \
+        : "=m" (c), "=m" (d), "=m" (s)                      \
+        : "m" (s), "m" (d), "m" (c), "m" (b)                \
+        : "$9", "$10", "$11", "$12", "$13", "$14", "$15"    \
+    );
 
 #endif /* MIPS */
 #endif /* GNUC */
diff --git a/Externals/polarssl/include/polarssl/camellia.h b/Externals/polarssl/include/polarssl/camellia.h
index 050c6cdb8b..8488d1df83 100644
--- a/Externals/polarssl/include/polarssl/camellia.h
+++ b/Externals/polarssl/include/polarssl/camellia.h
@@ -3,7 +3,7 @@
  *
  * \brief Camellia block cipher
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_CAMELLIA_H
 #define POLARSSL_CAMELLIA_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -48,6 +52,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          CAMELLIA context structure
  */
@@ -58,9 +66,19 @@ typedef struct
 }
 camellia_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize CAMELLIA context
+ *
+ * \param ctx      CAMELLIA context to be initialized
+ */
+void camellia_init( camellia_context *ctx );
+
+/**
+ * \brief          Clear CAMELLIA context
+ *
+ * \param ctx      CAMELLIA context to be cleared
+ */
+void camellia_free( camellia_context *ctx );
 
 /**
  * \brief          CAMELLIA key schedule (encryption)
@@ -68,10 +86,11 @@ extern "C" {
  * \param ctx      CAMELLIA context to be initialized
  * \param key      encryption key
  * \param keysize  must be 128, 192 or 256
- * 
+ *
  * \return         0 if successful, or POLARSSL_ERR_CAMELLIA_INVALID_KEY_LENGTH
  */
-int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsigned int keysize );
+int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key,
+                         unsigned int keysize );
 
 /**
  * \brief          CAMELLIA key schedule (decryption)
@@ -79,10 +98,11 @@ int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsign
  * \param ctx      CAMELLIA context to be initialized
  * \param key      decryption key
  * \param keysize  must be 128, 192 or 256
- * 
+ *
  * \return         0 if successful, or POLARSSL_ERR_CAMELLIA_INVALID_KEY_LENGTH
  */
-int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, unsigned int keysize );
+int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key,
+                         unsigned int keysize );
 
 /**
  * \brief          CAMELLIA-ECB block encryption/decryption
@@ -91,7 +111,7 @@ int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, unsign
  * \param mode     CAMELLIA_ENCRYPT or CAMELLIA_DECRYPT
  * \param input    16-byte input block
  * \param output   16-byte output block
- * 
+ *
  * \return         0 if successful
  */
 int camellia_crypt_ecb( camellia_context *ctx,
@@ -99,6 +119,7 @@ int camellia_crypt_ecb( camellia_context *ctx,
                     const unsigned char input[16],
                     unsigned char output[16] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          CAMELLIA-CBC buffer encryption/decryption
  *                 Length should be a multiple of the block
@@ -110,8 +131,9 @@ int camellia_crypt_ecb( camellia_context *ctx,
  * \param iv       initialization vector (updated after use)
  * \param input    buffer holding the input data
  * \param output   buffer holding the output data
- * 
- * \return         0 if successful, or POLARSSL_ERR_CAMELLIA_INVALID_INPUT_LENGTH
+ *
+ * \return         0 if successful, or
+ *                 POLARSSL_ERR_CAMELLIA_INVALID_INPUT_LENGTH
  */
 int camellia_crypt_cbc( camellia_context *ctx,
                     int mode,
@@ -119,7 +141,9 @@ int camellia_crypt_cbc( camellia_context *ctx,
                     unsigned char iv[16],
                     const unsigned char *input,
                     unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
+#if defined(POLARSSL_CIPHER_MODE_CFB)
 /**
  * \brief          CAMELLIA-CFB128 buffer encryption/decryption
  *
@@ -134,8 +158,9 @@ int camellia_crypt_cbc( camellia_context *ctx,
  * \param iv       initialization vector (updated after use)
  * \param input    buffer holding the input data
  * \param output   buffer holding the output data
- * 
- * \return         0 if successful, or POLARSSL_ERR_CAMELLIA_INVALID_INPUT_LENGTH
+ *
+ * \return         0 if successful, or
+ *                 POLARSSL_ERR_CAMELLIA_INVALID_INPUT_LENGTH
  */
 int camellia_crypt_cfb128( camellia_context *ctx,
                        int mode,
@@ -144,7 +169,9 @@ int camellia_crypt_cfb128( camellia_context *ctx,
                        unsigned char iv[16],
                        const unsigned char *input,
                        unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CFB */
 
+#if defined(POLARSSL_CIPHER_MODE_CTR)
 /**
  * \brief               CAMELLIA-CTR buffer encryption/decryption
  *
@@ -154,6 +181,7 @@ int camellia_crypt_cfb128( camellia_context *ctx,
  * both encryption and decryption. So a context initialized with
  * camellia_setkey_enc() for both CAMELLIA_ENCRYPT and CAMELLIA_DECRYPT.
  *
+ * \param ctx           CAMELLIA context
  * \param length        The length of the data
  * \param nc_off        The offset in the current stream_block (for resuming
  *                      within current cipher stream). The offset pointer to
@@ -173,6 +201,7 @@ int camellia_crypt_ctr( camellia_context *ctx,
                        unsigned char stream_block[16],
                        const unsigned char *input,
                        unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/ccm.h b/Externals/polarssl/include/polarssl/ccm.h
new file mode 100644
index 0000000000..439152f9f0
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ccm.h
@@ -0,0 +1,134 @@
+/**
+ * \file ccm.h
+ *
+ * \brief Counter with CBC-MAC (CCM) for 128-bit block ciphers
+ *
+ *  Copyright (C) 2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_CCM_H
+#define POLARSSL_CCM_H
+
+#include "cipher.h"
+
+#define POLARSSL_ERR_CCM_BAD_INPUT      -0x000D /**< Bad input parameters to function. */
+#define POLARSSL_ERR_CCM_AUTH_FAILED    -0x000F /**< Authenticated decryption failed. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          CCM context structure
+ */
+typedef struct {
+    cipher_context_t cipher_ctx;    /*!< cipher context used */
+}
+ccm_context;
+
+/**
+ * \brief           CCM initialization (encryption and decryption)
+ *
+ * \param ctx       CCM context to be initialized
+ * \param cipher    cipher to use (a 128-bit block cipher)
+ * \param key       encryption key
+ * \param keysize   key size in bits (must be acceptable by the cipher)
+ *
+ * \return          0 if successful, or a cipher specific error code
+ */
+int ccm_init( ccm_context *ctx, cipher_id_t cipher,
+              const unsigned char *key, unsigned int keysize );
+
+/**
+ * \brief           Free a CCM context and underlying cipher sub-context
+ *
+ * \param ctx       CCM context to free
+ */
+void ccm_free( ccm_context *ctx );
+
+/**
+ * \brief           CCM buffer encryption
+ *
+ * \param ctx       CCM context
+ * \param length    length of the input data in bytes
+ * \param iv        nonce (initialization vector)
+ * \param iv_len    length of IV in bytes
+ *                  must be 2, 3, 4, 5, 6, 7 or 8
+ * \param add       additional data
+ * \param add_len   length of additional data in bytes
+ *                  must be less than 2^16 - 2^8
+ * \param input     buffer holding the input data
+ * \param output    buffer for holding the output data
+ *                  must be at least 'length' bytes wide
+ * \param tag       buffer for holding the tag
+ * \param tag_len   length of the tag to generate in bytes
+ *                  must be 4, 6, 8, 10, 14 or 16
+ *
+ * \note            The tag is written to a separate buffer. To get the tag
+ *                  concatenated with the output as in the CCM spec, use
+ *                  tag = output + length and make sure the output buffer is
+ *                  at least length + tag_len wide.
+ *
+ * \return          0 if successful
+ */
+int ccm_encrypt_and_tag( ccm_context *ctx, size_t length,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *add, size_t add_len,
+                         const unsigned char *input, unsigned char *output,
+                         unsigned char *tag, size_t tag_len );
+
+/**
+ * \brief           CCM buffer authenticated decryption
+ *
+ * \param ctx       CCM context
+ * \param length    length of the input data
+ * \param iv        initialization vector
+ * \param iv_len    length of IV
+ * \param add       additional data
+ * \param add_len   length of additional data
+ * \param input     buffer holding the input data
+ * \param output    buffer for holding the output data
+ * \param tag       buffer holding the tag
+ * \param tag_len   length of the tag
+ *
+ * \return         0 if successful and authenticated,
+ *                 POLARSSL_ERR_CCM_AUTH_FAILED if tag does not match
+ */
+int ccm_auth_decrypt( ccm_context *ctx, size_t length,
+                      const unsigned char *iv, size_t iv_len,
+                      const unsigned char *add, size_t add_len,
+                      const unsigned char *input, unsigned char *output,
+                      const unsigned char *tag, size_t tag_len );
+
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int ccm_self_test( int verbose );
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* POLARSSL_CGM_H */
diff --git a/Externals/polarssl/include/polarssl/certs.h b/Externals/polarssl/include/polarssl/certs.h
index 5399e326d2..ba7c028afa 100644
--- a/Externals/polarssl/include/polarssl/certs.h
+++ b/Externals/polarssl/include/polarssl/certs.h
@@ -31,14 +31,44 @@
 extern "C" {
 #endif
 
-extern const char test_ca_crt[];
-extern const char test_ca_key[];
-extern const char test_ca_pwd[];
-extern const char test_srv_crt[];
-extern const char test_srv_key[];
-extern const char test_cli_crt[];
-extern const char test_cli_key[];
+/* Concatenation of all available CA certificates */
+extern const char test_ca_list[];
+
+/*
+ * Convenience for users who just want a certificate:
+ * RSA by default, or ECDSA if RSA i not available
+ */
+extern const char *test_ca_crt;
+extern const char *test_ca_key;
+extern const char *test_ca_pwd;
+extern const char *test_srv_crt;
+extern const char *test_srv_key;
+extern const char *test_cli_crt;
+extern const char *test_cli_key;
+
+#if defined(POLARSSL_ECDSA_C)
+extern const char test_ca_crt_ec[];
+extern const char test_ca_key_ec[];
+extern const char test_ca_pwd_ec[];
+extern const char test_srv_crt_ec[];
+extern const char test_srv_key_ec[];
+extern const char test_cli_crt_ec[];
+extern const char test_cli_key_ec[];
+#endif
+
+#if defined(POLARSSL_RSA_C)
+extern const char test_ca_crt_rsa[];
+extern const char test_ca_key_rsa[];
+extern const char test_ca_pwd_rsa[];
+extern const char test_srv_crt_rsa[];
+extern const char test_srv_key_rsa[];
+extern const char test_cli_crt_rsa[];
+extern const char test_cli_key_rsa[];
+#endif
+
+#if defined(POLARSSL_DHM_C)
 extern const char test_dhm_params[];
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/check_config.h b/Externals/polarssl/include/polarssl/check_config.h
new file mode 100644
index 0000000000..328b881ea3
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/check_config.h
@@ -0,0 +1,326 @@
+/**
+ * \file check_config.h
+ *
+ * \brief Consistency checks for configuration options
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * It is recommended to include this file from your config.h
+ * in order to catch dependency issues early.
+ */
+
+#ifndef POLARSSL_CHECK_CONFIG_H
+#define POLARSSL_CHECK_CONFIG_H
+
+#if defined(POLARSSL_AESNI_C) && !defined(POLARSSL_HAVE_ASM)
+#error "POLARSSL_AESNI_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_CERTS_C) && !defined(POLARSSL_PEM_PARSE_C)
+#error "POLARSSL_CERTS_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_CTR_DRBG_C) && !defined(POLARSSL_AES_C)
+#error "POLARSSL_CTR_DRBG_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_DHM_C) && !defined(POLARSSL_BIGNUM_C)
+#error "POLARSSL_DHM_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_ECDH_C) && !defined(POLARSSL_ECP_C)
+#error "POLARSSL_ECDH_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_ECDSA_C) &&            \
+    ( !defined(POLARSSL_ECP_C) ||           \
+      !defined(POLARSSL_ASN1_PARSE_C) ||    \
+      !defined(POLARSSL_ASN1_WRITE_C) )
+#error "POLARSSL_ECDSA_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC) && !defined(POLARSSL_HMAC_DRBG_C)
+#error "POLARSSL_ECDSA_DETERMINISTIC defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_ECP_C) && ( !defined(POLARSSL_BIGNUM_C) || (   \
+    !defined(POLARSSL_ECP_DP_SECP192R1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP224R1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP256R1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP384R1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP521R1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_BP256R1_ENABLED)   &&                  \
+    !defined(POLARSSL_ECP_DP_BP384R1_ENABLED)   &&                  \
+    !defined(POLARSSL_ECP_DP_BP512R1_ENABLED)   &&                  \
+    !defined(POLARSSL_ECP_DP_SECP192K1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP224K1_ENABLED) &&                  \
+    !defined(POLARSSL_ECP_DP_SECP256K1_ENABLED) ) )
+#error "POLARSSL_ECP_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_ENTROPY_C) && (!defined(POLARSSL_SHA512_C) &&      \
+                                    !defined(POLARSSL_SHA256_C))
+#error "POLARSSL_ENTROPY_C defined, but not all prerequisites"
+#endif
+#if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_SHA512_C) &&         \
+    defined(CTR_DRBG_ENTROPY_LEN) && (CTR_DRBG_ENTROPY_LEN > 64)
+#error "CTR_DRBG_ENTROPY_LEN value too high"
+#endif
+#if defined(POLARSSL_ENTROPY_C) &&                                            \
+    ( !defined(POLARSSL_SHA512_C) || defined(POLARSSL_ENTROPY_FORCE_SHA256) ) \
+    && defined(CTR_DRBG_ENTROPY_LEN) && (CTR_DRBG_ENTROPY_LEN > 32)
+#error "CTR_DRBG_ENTROPY_LEN value too high"
+#endif
+#if defined(POLARSSL_ENTROPY_C) && \
+    defined(POLARSSL_ENTROPY_FORCE_SHA256) && !defined(POLARSSL_SHA256_C)
+#error "POLARSSL_ENTROPY_FORCE_SHA256 defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_GCM_C) && (                                        \
+        !defined(POLARSSL_AES_C) && !defined(POLARSSL_CAMELLIA_C) )
+#error "POLARSSL_GCM_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_HAVEGE_C) && !defined(POLARSSL_TIMING_C)
+#error "POLARSSL_HAVEGE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_HMAC_DRBG) && !defined(POLARSSL_MD_C)
+#error "POLARSSL_HMAC_DRBG_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) &&                 \
+    ( !defined(POLARSSL_ECDH_C) || !defined(POLARSSL_X509_CRT_PARSE_C) )
+#error "POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) &&                 \
+    ( !defined(POLARSSL_ECDH_C) || !defined(POLARSSL_X509_CRT_PARSE_C) )
+#error "POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) && !defined(POLARSSL_DHM_C)
+#error "POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED) &&                     \
+    !defined(POLARSSL_ECDH_C)
+#error "POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) &&                   \
+    ( !defined(POLARSSL_DHM_C) || !defined(POLARSSL_RSA_C) ||           \
+      !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_PKCS1_V15) )
+#error "POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) &&                 \
+    ( !defined(POLARSSL_ECDH_C) || !defined(POLARSSL_RSA_C) ||          \
+      !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_PKCS1_V15) )
+#error "POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) &&                 \
+    ( !defined(POLARSSL_ECDH_C) || !defined(POLARSSL_ECDSA_C) ||          \
+      !defined(POLARSSL_X509_CRT_PARSE_C) )
+#error "POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED) &&                   \
+    ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) ||\
+      !defined(POLARSSL_PKCS1_V15) )
+#error "POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) &&                       \
+    ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) ||\
+      !defined(POLARSSL_PKCS1_V15) )
+#error "POLARSSL_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) &&                          \
+    ( !defined(POLARSSL_PLATFORM_C) || !defined(POLARSSL_PLATFORM_MEMORY) )
+#error "POLARSSL_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PADLOCK_C) && !defined(POLARSSL_HAVE_ASM)
+#error "POLARSSL_PADLOCK_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PBKDF2_C) && !defined(POLARSSL_MD_C)
+#error "POLARSSL_PBKDF2_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PEM_PARSE_C) && !defined(POLARSSL_BASE64_C)
+#error "POLARSSL_PEM_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PEM_WRITE_C) && !defined(POLARSSL_BASE64_C)
+#error "POLARSSL_PEM_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PK_PARSE_C) && !defined(POLARSSL_PK_C)
+#error "POLARSSL_PK_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PK_WRITE_C) && !defined(POLARSSL_PK_C)
+#error "POLARSSL_PK_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_PKCS11_C) && !defined(POLARSSL_PK_C)
+#error "POLARSSL_PKCS11_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_RSA_C) && ( !defined(POLARSSL_BIGNUM_C) ||         \
+    !defined(POLARSSL_OID_C) )
+#error "POLARSSL_RSA_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT) &&                        \
+    ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_PKCS1_V21) )
+#error "POLARSSL_X509_RSASSA_PSS_SUPPORT defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) && ( !defined(POLARSSL_MD5_C) ||     \
+    !defined(POLARSSL_SHA1_C) )
+#error "POLARSSL_SSL_PROTO_SSL3 defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_PROTO_TLS1) && ( !defined(POLARSSL_MD5_C) ||     \
+    !defined(POLARSSL_SHA1_C) )
+#error "POLARSSL_SSL_PROTO_TLS1 defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_1) && ( !defined(POLARSSL_MD5_C) ||     \
+    !defined(POLARSSL_SHA1_C) )
+#error "POLARSSL_SSL_PROTO_TLS1_1 defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2) && ( !defined(POLARSSL_SHA1_C) &&     \
+    !defined(POLARSSL_SHA256_C) && !defined(POLARSSL_SHA512_C) )
+#error "POLARSSL_SSL_PROTO_TLS1_2 defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_CLI_C) && !defined(POLARSSL_SSL_TLS_C)
+#error "POLARSSL_SSL_CLI_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C) && ( !defined(POLARSSL_CIPHER_C) ||     \
+    !defined(POLARSSL_MD_C) )
+#error "POLARSSL_SSL_TLS_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_SRV_C) && !defined(POLARSSL_SSL_TLS_C)
+#error "POLARSSL_SSL_SRV_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C) && (!defined(POLARSSL_SSL_PROTO_SSL3) && \
+    !defined(POLARSSL_SSL_PROTO_TLS1) && !defined(POLARSSL_SSL_PROTO_TLS1_1) && \
+    !defined(POLARSSL_SSL_PROTO_TLS1_2))
+#error "POLARSSL_SSL_TLS_C defined, but no protocols are active"
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C) && (defined(POLARSSL_SSL_PROTO_SSL3) && \
+    defined(POLARSSL_SSL_PROTO_TLS1_1) && !defined(POLARSSL_SSL_PROTO_TLS1))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C) && (defined(POLARSSL_SSL_PROTO_TLS1) && \
+    defined(POLARSSL_SSL_PROTO_TLS1_2) && !defined(POLARSSL_SSL_PROTO_TLS1_1))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C) && (defined(POLARSSL_SSL_PROTO_SSL3) && \
+    defined(POLARSSL_SSL_PROTO_TLS1_2) && (!defined(POLARSSL_SSL_PROTO_TLS1) || \
+    !defined(POLARSSL_SSL_PROTO_TLS1_1)))
+#error "Illegal protocol selection"
+#endif
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS) && defined(POLARSSL_SSL_TLS_C) && \
+    ( !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA256_C) ||            \
+      !defined(POLARSSL_CIPHER_MODE_CBC) )
+#error "POLARSSL_SSL_SESSION_TICKETS_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION) && \
+        !defined(POLARSSL_X509_CRT_PARSE_C)
+#error "POLARSSL_SSL_SERVER_NAME_INDICATION defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_THREADING_PTHREAD)
+#if !defined(POLARSSL_THREADING_C) || defined(POLARSSL_THREADING_IMPL)
+#error "POLARSSL_THREADING_PTHREAD defined, but not all prerequisites"
+#endif
+#define POLARSSL_THREADING_IMPL
+#endif
+
+#if defined(POLARSSL_THREADING_ALT)
+#if !defined(POLARSSL_THREADING_C) || defined(POLARSSL_THREADING_IMPL)
+#error "POLARSSL_THREADING_ALT defined, but not all prerequisites"
+#endif
+#define POLARSSL_THREADING_IMPL
+#endif
+
+#if defined(POLARSSL_THREADING_C) && !defined(POLARSSL_THREADING_IMPL)
+#error "POLARSSL_THREADING_C defined, single threading implementation required"
+#endif
+#undef POLARSSL_THREADING_IMPL
+
+#if defined(POLARSSL_VERSION_FEATURES) && !defined(POLARSSL_VERSION_C)
+#error "POLARSSL_VERSION_FEATURES defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_USE_C) && ( !defined(POLARSSL_BIGNUM_C) ||  \
+    !defined(POLARSSL_OID_C) || !defined(POLARSSL_ASN1_PARSE_C) ||      \
+    !defined(POLARSSL_PK_PARSE_C) )
+#error "POLARSSL_X509_USE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CREATE_C) && ( !defined(POLARSSL_BIGNUM_C) ||  \
+    !defined(POLARSSL_OID_C) || !defined(POLARSSL_ASN1_WRITE_C) ||       \
+    !defined(POLARSSL_PK_WRITE_C) )
+#error "POLARSSL_X509_CREATE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C) && ( !defined(POLARSSL_X509_USE_C) )
+#error "POLARSSL_X509_CRT_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CRL_PARSE_C) && ( !defined(POLARSSL_X509_USE_C) )
+#error "POLARSSL_X509_CRL_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CSR_PARSE_C) && ( !defined(POLARSSL_X509_USE_C) )
+#error "POLARSSL_X509_CSR_PARSE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CRT_WRITE_C) && ( !defined(POLARSSL_X509_CREATE_C) )
+#error "POLARSSL_X509_CRT_WRITE_C defined, but not all prerequisites"
+#endif
+
+#if defined(POLARSSL_X509_CSR_WRITE_C) && ( !defined(POLARSSL_X509_CREATE_C) )
+#error "POLARSSL_X509_CSR_WRITE_C defined, but not all prerequisites"
+#endif
+
+#endif /* POLARSSL_CHECK_CONFIG_H */
diff --git a/Externals/polarssl/include/polarssl/cipher.h b/Externals/polarssl/include/polarssl/cipher.h
index 8224128e3d..087e590680 100644
--- a/Externals/polarssl/include/polarssl/cipher.h
+++ b/Externals/polarssl/include/polarssl/cipher.h
@@ -1,11 +1,11 @@
 /**
  * \file cipher.h
- * 
+ *
  * \brief Generic cipher wrapper.
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -30,6 +30,20 @@
 #ifndef POLARSSL_CIPHER_H
 #define POLARSSL_CIPHER_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_GCM_C) || defined(POLARSSL_CCM_C)
+#define POLARSSL_CIPHER_MODE_AEAD
+#endif
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#define POLARSSL_CIPHER_MODE_WITH_PADDING
+#endif
+
 #include <string.h>
 
 #if defined(_MSC_VER) && !defined(inline)
@@ -45,6 +59,14 @@
 #define POLARSSL_ERR_CIPHER_ALLOC_FAILED                   -0x6180  /**< Failed to allocate memory. */
 #define POLARSSL_ERR_CIPHER_INVALID_PADDING                -0x6200  /**< Input data contains invalid padding and is rejected. */
 #define POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED            -0x6280  /**< Decryption of block requires a full block. */
+#define POLARSSL_ERR_CIPHER_AUTH_FAILED                    -0x6300  /**< Authentication failed (for AEAD modes). */
+
+#define POLARSSL_CIPHER_VARIABLE_IV_LEN     0x01    /**< Cipher accepts IVs of variable length */
+#define POLARSSL_CIPHER_VARIABLE_KEY_LEN    0x02    /**< Cipher accepts keys of variable length */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef enum {
     POLARSSL_CIPHER_ID_NONE = 0,
@@ -54,11 +76,15 @@ typedef enum {
     POLARSSL_CIPHER_ID_3DES,
     POLARSSL_CIPHER_ID_CAMELLIA,
     POLARSSL_CIPHER_ID_BLOWFISH,
+    POLARSSL_CIPHER_ID_ARC4,
 } cipher_id_t;
 
 typedef enum {
     POLARSSL_CIPHER_NONE = 0,
     POLARSSL_CIPHER_NULL,
+    POLARSSL_CIPHER_AES_128_ECB,
+    POLARSSL_CIPHER_AES_192_ECB,
+    POLARSSL_CIPHER_AES_256_ECB,
     POLARSSL_CIPHER_AES_128_CBC,
     POLARSSL_CIPHER_AES_192_CBC,
     POLARSSL_CIPHER_AES_256_CBC,
@@ -68,6 +94,12 @@ typedef enum {
     POLARSSL_CIPHER_AES_128_CTR,
     POLARSSL_CIPHER_AES_192_CTR,
     POLARSSL_CIPHER_AES_256_CTR,
+    POLARSSL_CIPHER_AES_128_GCM,
+    POLARSSL_CIPHER_AES_192_GCM,
+    POLARSSL_CIPHER_AES_256_GCM,
+    POLARSSL_CIPHER_CAMELLIA_128_ECB,
+    POLARSSL_CIPHER_CAMELLIA_192_ECB,
+    POLARSSL_CIPHER_CAMELLIA_256_ECB,
     POLARSSL_CIPHER_CAMELLIA_128_CBC,
     POLARSSL_CIPHER_CAMELLIA_192_CBC,
     POLARSSL_CIPHER_CAMELLIA_256_CBC,
@@ -77,23 +109,48 @@ typedef enum {
     POLARSSL_CIPHER_CAMELLIA_128_CTR,
     POLARSSL_CIPHER_CAMELLIA_192_CTR,
     POLARSSL_CIPHER_CAMELLIA_256_CTR,
+    POLARSSL_CIPHER_CAMELLIA_128_GCM,
+    POLARSSL_CIPHER_CAMELLIA_192_GCM,
+    POLARSSL_CIPHER_CAMELLIA_256_GCM,
+    POLARSSL_CIPHER_DES_ECB,
     POLARSSL_CIPHER_DES_CBC,
+    POLARSSL_CIPHER_DES_EDE_ECB,
     POLARSSL_CIPHER_DES_EDE_CBC,
+    POLARSSL_CIPHER_DES_EDE3_ECB,
     POLARSSL_CIPHER_DES_EDE3_CBC,
+    POLARSSL_CIPHER_BLOWFISH_ECB,
     POLARSSL_CIPHER_BLOWFISH_CBC,
     POLARSSL_CIPHER_BLOWFISH_CFB64,
     POLARSSL_CIPHER_BLOWFISH_CTR,
+    POLARSSL_CIPHER_ARC4_128,
+    POLARSSL_CIPHER_AES_128_CCM,
+    POLARSSL_CIPHER_AES_192_CCM,
+    POLARSSL_CIPHER_AES_256_CCM,
+    POLARSSL_CIPHER_CAMELLIA_128_CCM,
+    POLARSSL_CIPHER_CAMELLIA_192_CCM,
+    POLARSSL_CIPHER_CAMELLIA_256_CCM,
 } cipher_type_t;
 
 typedef enum {
     POLARSSL_MODE_NONE = 0,
-    POLARSSL_MODE_NULL,
+    POLARSSL_MODE_ECB,
     POLARSSL_MODE_CBC,
     POLARSSL_MODE_CFB,
-    POLARSSL_MODE_OFB,
+    POLARSSL_MODE_OFB, /* Unused! */
     POLARSSL_MODE_CTR,
+    POLARSSL_MODE_GCM,
+    POLARSSL_MODE_STREAM,
+    POLARSSL_MODE_CCM,
 } cipher_mode_t;
 
+typedef enum {
+    POLARSSL_PADDING_PKCS7 = 0,     /**< PKCS7 padding (default)        */
+    POLARSSL_PADDING_ONE_AND_ZEROS, /**< ISO/IEC 7816-4 padding         */
+    POLARSSL_PADDING_ZEROS_AND_LEN, /**< ANSI X.923 padding             */
+    POLARSSL_PADDING_ZEROS,         /**< zero padding (not reversible!) */
+    POLARSSL_PADDING_NONE,          /**< never pad (full blocks only)   */
+} cipher_padding_t;
+
 typedef enum {
     POLARSSL_OPERATION_NONE = -1,
     POLARSSL_DECRYPT = 0,
@@ -109,10 +166,13 @@ enum {
     POLARSSL_KEY_LENGTH_DES_EDE = 128,
     /** Key length, in bits (including parity), for DES in three-key EDE */
     POLARSSL_KEY_LENGTH_DES_EDE3 = 192,
-    /** Maximum length of any IV, in bytes */
-    POLARSSL_MAX_IV_LENGTH = 16,
 };
 
+/** Maximum length of any IV, in bytes */
+#define POLARSSL_MAX_IV_LENGTH      16
+/** Maximum block size of any cipher, in bytes */
+#define POLARSSL_MAX_BLOCK_LENGTH   16
+
 /**
  * Base cipher information. The non-mode specific functions and values.
  */
@@ -121,23 +181,36 @@ typedef struct {
     /** Base Cipher type (e.g. POLARSSL_CIPHER_ID_AES) */
     cipher_id_t cipher;
 
+    /** Encrypt using ECB */
+    int (*ecb_func)( void *ctx, operation_t mode,
+                     const unsigned char *input, unsigned char *output );
+
     /** Encrypt using CBC */
-    int (*cbc_func)( void *ctx, operation_t mode, size_t length, unsigned char *iv,
-            const unsigned char *input, unsigned char *output );
+    int (*cbc_func)( void *ctx, operation_t mode, size_t length,
+                     unsigned char *iv, const unsigned char *input,
+                     unsigned char *output );
 
     /** Encrypt using CFB (Full length) */
     int (*cfb_func)( void *ctx, operation_t mode, size_t length, size_t *iv_off,
-            unsigned char *iv, const unsigned char *input, unsigned char *output );
+                     unsigned char *iv, const unsigned char *input,
+                     unsigned char *output );
 
     /** Encrypt using CTR */
-    int (*ctr_func)( void *ctx, size_t length, size_t *nc_off, unsigned char *nonce_counter,
-            unsigned char *stream_block, const unsigned char *input, unsigned char *output );
+    int (*ctr_func)( void *ctx, size_t length, size_t *nc_off,
+                     unsigned char *nonce_counter, unsigned char *stream_block,
+                     const unsigned char *input, unsigned char *output );
+
+    /** Encrypt using STREAM */
+    int (*stream_func)( void *ctx, size_t length,
+                        const unsigned char *input, unsigned char *output );
 
     /** Set key for encryption purposes */
-    int (*setkey_enc_func)( void *ctx, const unsigned char *key, unsigned int key_length);
+    int (*setkey_enc_func)( void *ctx, const unsigned char *key,
+                            unsigned int key_length );
 
     /** Set key for decryption purposes */
-    int (*setkey_dec_func)( void *ctx, const unsigned char *key, unsigned int key_length);
+    int (*setkey_dec_func)( void *ctx, const unsigned char *key,
+                            unsigned int key_length);
 
     /** Allocate a new context */
     void * (*ctx_alloc_func)( void );
@@ -164,9 +237,13 @@ typedef struct {
     /** Name of the cipher */
     const char * name;
 
-    /** IV size, in bytes */
+    /** IV/NONCE size, in bytes.
+     *  For cipher that accept many sizes: recommended size */
     unsigned int iv_size;
 
+    /** Flags for variable IV size, variable key size, etc. */
+    int flags;
+
     /** block size, in bytes */
     unsigned int block_size;
 
@@ -188,8 +265,12 @@ typedef struct {
     /** Operation that the context's key has been initialised for */
     operation_t operation;
 
+    /** Padding functions to use, if relevant for cipher mode */
+    void (*add_padding)( unsigned char *output, size_t olen, size_t data_len );
+    int (*get_padding)( unsigned char *input, size_t ilen, size_t *data_len );
+
     /** Buffer for data that hasn't been encrypted yet */
-    unsigned char unprocessed_data[POLARSSL_MAX_IV_LENGTH];
+    unsigned char unprocessed_data[POLARSSL_MAX_BLOCK_LENGTH];
 
     /** Number of bytes that still need processing */
     size_t unprocessed_len;
@@ -197,14 +278,13 @@ typedef struct {
     /** Current IV or NONCE_COUNTER for CTR-mode */
     unsigned char iv[POLARSSL_MAX_IV_LENGTH];
 
+    /** IV size in bytes (for ciphers with variable-length IVs) */
+    size_t iv_size;
+
     /** Cipher-specific context */
     void *cipher_ctx;
 } cipher_context_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief Returns the list of ciphers supported by the generic cipher module.
  *
@@ -235,16 +315,48 @@ const cipher_info_t *cipher_info_from_string( const char *cipher_name );
  */
 const cipher_info_t *cipher_info_from_type( const cipher_type_t cipher_type );
 
+/**
+ * \brief               Returns the cipher information structure associated
+ *                      with the given cipher id, key size and mode.
+ *
+ * \param cipher_id     Id of the cipher to search for
+ *                      (e.g. POLARSSL_CIPHER_ID_AES)
+ * \param key_length    Length of the key in bits
+ * \param mode          Cipher mode (e.g. POLARSSL_MODE_CBC)
+ *
+ * \return              the cipher information structure associated with the
+ *                      given cipher_type, or NULL if not found.
+ */
+const cipher_info_t *cipher_info_from_values( const cipher_id_t cipher_id,
+                                              int key_length,
+                                              const cipher_mode_t mode );
+
+/**
+ * \brief               Initialize a cipher_context (as NONE)
+ */
+void cipher_init( cipher_context_t *ctx );
+
+/**
+ * \brief               Free and clear the cipher-specific context of ctx.
+ *                      Freeing ctx itself remains the responsibility of the
+ *                      caller.
+ */
+void cipher_free( cipher_context_t *ctx );
+
 /**
  * \brief               Initialises and fills the cipher context structure with
  *                      the appropriate values.
  *
+ * \note                Currently also clears structure. In future versions you
+ *                      will be required to call cipher_init() on the structure
+ *                      first.
+ *
  * \param ctx           context to initialise. May not be NULL.
  * \param cipher_info   cipher to use.
  *
- * \return              \c 0 on success,
- *                      \c POLARSSL_ERR_CIPHER_BAD_INPUT_DATA on parameter failure,
- *                      \c POLARSSL_ERR_CIPHER_ALLOC_FAILED if allocation of the
+ * \return              0 on success,
+ *                      POLARSSL_ERR_CIPHER_BAD_INPUT_DATA on parameter failure,
+ *                      POLARSSL_ERR_CIPHER_ALLOC_FAILED if allocation of the
  *                      cipher-specific context failed.
  */
 int cipher_init_ctx( cipher_context_t *ctx, const cipher_info_t *cipher_info );
@@ -253,10 +365,11 @@ int cipher_init_ctx( cipher_context_t *ctx, const cipher_info_t *cipher_info );
  * \brief               Free the cipher-specific context of ctx. Freeing ctx
  *                      itself remains the responsibility of the caller.
  *
+ * \note                Deprecated: Redirects to cipher_free()
+ *
  * \param ctx           Free the cipher-specific context
  *
- * \returns             0 on success, POLARSSL_ERR_CIPHER_BAD_INPUT_DATA if
- *                      parameter verification fails.
+ * \returns             0
  */
 int cipher_free_ctx( cipher_context_t *ctx );
 
@@ -294,18 +407,22 @@ static inline cipher_mode_t cipher_get_cipher_mode( const cipher_context_t *ctx
 }
 
 /**
- * \brief               Returns the size of the cipher's IV.
+ * \brief               Returns the size of the cipher's IV/NONCE in bytes.
  *
  * \param ctx           cipher's context. Must have been initialised.
  *
- * \return              size of the cipher's IV, or 0 if ctx has not been
- *                      initialised.
+ * \return              If IV has not been set yet: (recommended) IV size
+ *                      (0 for ciphers not using IV/NONCE).
+ *                      If IV has already been set: actual size.
  */
 static inline int cipher_get_iv_size( const cipher_context_t *ctx )
 {
     if( NULL == ctx || NULL == ctx->cipher_info )
         return 0;
 
+    if( ctx->iv_size != 0 )
+        return (int) ctx->iv_size;
+
     return ctx->cipher_info->iv_size;
 }
 
@@ -351,10 +468,10 @@ static inline const char *cipher_get_name( const cipher_context_t *ctx )
  */
 static inline int cipher_get_key_size ( const cipher_context_t *ctx )
 {
-    if( NULL == ctx )
+    if( NULL == ctx || NULL == ctx->cipher_info )
         return POLARSSL_KEY_LENGTH_NONE;
 
-    return ctx->key_length;
+    return ctx->cipher_info->key_length;
 }
 
 /**
@@ -389,19 +506,66 @@ static inline operation_t cipher_get_operation( const cipher_context_t *ctx )
  *                      parameter verification fails or a cipher specific
  *                      error code.
  */
-int cipher_setkey( cipher_context_t *ctx, const unsigned char *key, int key_length,
-        const operation_t operation );
+int cipher_setkey( cipher_context_t *ctx, const unsigned char *key,
+                   int key_length, const operation_t operation );
 
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
 /**
- * \brief               Reset the given context, setting the IV to iv
+ * \brief               Set padding mode, for cipher modes that use padding.
+ *                      (Default: PKCS7 padding.)
+ *
+ * \param ctx           generic cipher context
+ * \param mode          padding mode
+ *
+ * \returns             0 on success, POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE
+ *                      if selected padding mode is not supported, or
+ *                      POLARSSL_ERR_CIPHER_BAD_INPUT_DATA if the cipher mode
+ *                      does not support padding.
+ */
+int cipher_set_padding_mode( cipher_context_t *ctx, cipher_padding_t mode );
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
+
+/**
+ * \brief               Set the initialization vector (IV) or nonce
+ *
+ * \param ctx           generic cipher context
+ * \param iv            IV to use (or NONCE_COUNTER for CTR-mode ciphers)
+ * \param iv_len        IV length for ciphers with variable-size IV;
+ *                      discarded by ciphers with fixed-size IV.
+ *
+ * \returns             0 on success, or POLARSSL_ERR_CIPHER_BAD_INPUT_DATA
+ *
+ * \note                Some ciphers don't use IVs nor NONCE. For these
+ *                      ciphers, this function has no effect.
+ */
+int cipher_set_iv( cipher_context_t *ctx,
+                   const unsigned char *iv, size_t iv_len );
+
+/**
+ * \brief               Finish preparation of the given context
  *
  * \param ctx           generic cipher context
- * \param iv            IV to use or NONCE_COUNTER in the case of a CTR-mode cipher
  *
  * \returns             0 on success, POLARSSL_ERR_CIPHER_BAD_INPUT_DATA
  *                      if parameter verification fails.
  */
-int cipher_reset( cipher_context_t *ctx, const unsigned char *iv );
+int cipher_reset( cipher_context_t *ctx );
+
+#if defined(POLARSSL_GCM_C)
+/**
+ * \brief               Add additional data (for AEAD ciphers).
+ *                      Currently only supported with GCM.
+ *                      Must be called exactly once, after cipher_reset().
+ *
+ * \param ctx           generic cipher context
+ * \param ad            Additional data to use.
+ * \param ad_len        Length of ad.
+ *
+ * \return              0 on success, or a specific error code.
+ */
+int cipher_update_ad( cipher_context_t *ctx,
+                      const unsigned char *ad, size_t ad_len );
+#endif /* POLARSSL_GCM_C */
 
 /**
  * \brief               Generic cipher update function. Encrypts/decrypts
@@ -410,6 +574,8 @@ int cipher_reset( cipher_context_t *ctx, const unsigned char *iv );
  *                      that cannot be written immediately will either be added
  *                      to the next block, or flushed when cipher_final is
  *                      called.
+ *                      Exception: for POLARSSL_MODE_ECB, expects single block
+ *                                 in size (e.g. 16 bytes for AES)
  *
  * \param ctx           generic cipher context
  * \param input         buffer holding the input data
@@ -425,9 +591,13 @@ int cipher_reset( cipher_context_t *ctx, const unsigned char *iv );
  *                      POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE on an
  *                      unsupported mode for a cipher or a cipher specific
  *                      error code.
+ *
+ * \note                If the underlying cipher is GCM, all calls to this
+ *                      function, except the last one before cipher_finish(),
+ *                      must have ilen a multiple of the block size.
  */
-int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ilen,
-        unsigned char *output, size_t *olen );
+int cipher_update( cipher_context_t *ctx, const unsigned char *input,
+                   size_t ilen, unsigned char *output, size_t *olen );
 
 /**
  * \brief               Generic cipher finalisation function. If data still
@@ -436,7 +606,7 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
  *                      the last block, and written to the output buffer.
  *
  * \param ctx           Generic cipher context
- * \param output        buffer to write data to. Needs block_size data available.
+ * \param output        buffer to write data to. Needs block_size available.
  * \param olen          length of the data written to the output buffer.
  *
  * \returns             0 on success, POLARSSL_ERR_CIPHER_BAD_INPUT_DATA if
@@ -446,8 +616,135 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
  *                      POLARSSL_ERR_CIPHER_INVALID_PADDING on invalid padding
  *                      while decrypting or a cipher specific error code.
  */
-int cipher_finish( cipher_context_t *ctx, unsigned char *output, size_t *olen);
+int cipher_finish( cipher_context_t *ctx,
+                   unsigned char *output, size_t *olen );
 
+#if defined(POLARSSL_GCM_C)
+/**
+ * \brief               Write tag for AEAD ciphers.
+ *                      Currently only supported with GCM.
+ *                      Must be called after cipher_finish().
+ *
+ * \param ctx           Generic cipher context
+ * \param tag           buffer to write the tag
+ * \param tag_len       Length of the tag to write
+ *
+ * \return              0 on success, or a specific error code.
+ */
+int cipher_write_tag( cipher_context_t *ctx,
+                      unsigned char *tag, size_t tag_len );
+
+/**
+ * \brief               Check tag for AEAD ciphers.
+ *                      Currently only supported with GCM.
+ *                      Must be called after cipher_finish().
+ *
+ * \param ctx           Generic cipher context
+ * \param tag           Buffer holding the tag
+ * \param tag_len       Length of the tag to check
+ *
+ * \return              0 on success, or a specific error code.
+ */
+int cipher_check_tag( cipher_context_t *ctx,
+                      const unsigned char *tag, size_t tag_len );
+#endif /* POLARSSL_GCM_C */
+
+/**
+ * \brief               Generic all-in-one encryption/decryption
+ *                      (for all ciphers except AEAD constructs).
+ *
+ * \param ctx           generic cipher context
+ * \param iv            IV to use (or NONCE_COUNTER for CTR-mode ciphers)
+ * \param iv_len        IV length for ciphers with variable-size IV;
+ *                      discarded by ciphers with fixed-size IV.
+ * \param input         buffer holding the input data
+ * \param ilen          length of the input data
+ * \param output        buffer for the output data. Should be able to hold at
+ *                      least ilen + block_size. Cannot be the same buffer as
+ *                      input!
+ * \param olen          length of the output data, will be filled with the
+ *                      actual number of bytes written.
+ *
+ * \note                Some ciphers don't use IVs nor NONCE. For these
+ *                      ciphers, use iv = NULL and iv_len = 0.
+ *
+ * \returns             0 on success, or
+ *                      POLARSSL_ERR_CIPHER_BAD_INPUT_DATA, or
+ *                      POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED if decryption
+ *                      expected a full block but was not provided one, or
+ *                      POLARSSL_ERR_CIPHER_INVALID_PADDING on invalid padding
+ *                      while decrypting, or
+ *                      a cipher specific error code.
+ */
+int cipher_crypt( cipher_context_t *ctx,
+                  const unsigned char *iv, size_t iv_len,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char *output, size_t *olen );
+
+#if defined(POLARSSL_CIPHER_MODE_AEAD)
+/**
+ * \brief               Generic autenticated encryption (AEAD ciphers).
+ *
+ * \param ctx           generic cipher context
+ * \param iv            IV to use (or NONCE_COUNTER for CTR-mode ciphers)
+ * \param iv_len        IV length for ciphers with variable-size IV;
+ *                      discarded by ciphers with fixed-size IV.
+ * \param ad            Additional data to authenticate.
+ * \param ad_len        Length of ad.
+ * \param input         buffer holding the input data
+ * \param ilen          length of the input data
+ * \param output        buffer for the output data.
+ *                      Should be able to hold at least ilen.
+ * \param olen          length of the output data, will be filled with the
+ *                      actual number of bytes written.
+ * \param tag           buffer for the authentication tag
+ * \param tag_len       desired tag length
+ *
+ * \returns             0 on success, or
+ *                      POLARSSL_ERR_CIPHER_BAD_INPUT_DATA, or
+ *                      a cipher specific error code.
+ */
+int cipher_auth_encrypt( cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         unsigned char *tag, size_t tag_len );
+
+/**
+ * \brief               Generic autenticated decryption (AEAD ciphers).
+ *
+ * \param ctx           generic cipher context
+ * \param iv            IV to use (or NONCE_COUNTER for CTR-mode ciphers)
+ * \param iv_len        IV length for ciphers with variable-size IV;
+ *                      discarded by ciphers with fixed-size IV.
+ * \param ad            Additional data to be authenticated.
+ * \param ad_len        Length of ad.
+ * \param input         buffer holding the input data
+ * \param ilen          length of the input data
+ * \param output        buffer for the output data.
+ *                      Should be able to hold at least ilen.
+ * \param olen          length of the output data, will be filled with the
+ *                      actual number of bytes written.
+ * \param tag           buffer holding the authentication tag
+ * \param tag_len       length of the authentication tag
+ *
+ * \returns             0 on success, or
+ *                      POLARSSL_ERR_CIPHER_BAD_INPUT_DATA, or
+ *                      POLARSSL_ERR_CIPHER_AUTH_FAILED if data isn't authentic,
+ *                      or a cipher specific error code.
+ *
+ * \note                If the data is not authentic, then the output buffer
+ *                      is zeroed out to prevent the unauthentic plaintext to
+ *                      be used by mistake, making this interface safer.
+ */
+int cipher_auth_decrypt( cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         const unsigned char *tag, size_t tag_len );
+#endif /* POLARSSL_CIPHER_MODE_AEAD */
 
 /**
  * \brief          Checkup routine
@@ -460,4 +757,4 @@ int cipher_self_test( int verbose );
 }
 #endif
 
-#endif /* POLARSSL_MD_H */
+#endif /* POLARSSL_CIPHER_H */
diff --git a/Externals/polarssl/include/polarssl/cipher_wrap.h b/Externals/polarssl/include/polarssl/cipher_wrap.h
index 4abbc4ef29..46bc757a8e 100644
--- a/Externals/polarssl/include/polarssl/cipher_wrap.h
+++ b/Externals/polarssl/include/polarssl/cipher_wrap.h
@@ -1,11 +1,11 @@
 /**
  * \file cipher_wrap.h
- * 
+ *
  * \brief Cipher wrappers.
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,76 +29,26 @@
 #ifndef POLARSSL_CIPHER_WRAP_H
 #define POLARSSL_CIPHER_WRAP_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 #include "cipher.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(POLARSSL_AES_C)
+typedef struct
+{
+    cipher_type_t type;
+    const cipher_info_t *info;
+} cipher_definition_t;
 
-extern const cipher_info_t aes_128_cbc_info;
-extern const cipher_info_t aes_192_cbc_info;
-extern const cipher_info_t aes_256_cbc_info;
+extern const cipher_definition_t cipher_definitions[];
 
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-extern const cipher_info_t aes_128_cfb128_info;
-extern const cipher_info_t aes_192_cfb128_info;
-extern const cipher_info_t aes_256_cfb128_info;
-#endif /* POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-extern const cipher_info_t aes_128_ctr_info;
-extern const cipher_info_t aes_192_ctr_info;
-extern const cipher_info_t aes_256_ctr_info;
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-#endif /* defined(POLARSSL_AES_C) */
-
-#if defined(POLARSSL_CAMELLIA_C)
-
-extern const cipher_info_t camellia_128_cbc_info;
-extern const cipher_info_t camellia_192_cbc_info;
-extern const cipher_info_t camellia_256_cbc_info;
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-extern const cipher_info_t camellia_128_cfb128_info;
-extern const cipher_info_t camellia_192_cfb128_info;
-extern const cipher_info_t camellia_256_cfb128_info;
-#endif /* POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-extern const cipher_info_t camellia_128_ctr_info;
-extern const cipher_info_t camellia_192_ctr_info;
-extern const cipher_info_t camellia_256_ctr_info;
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-
-#endif /* defined(POLARSSL_CAMELLIA_C) */
-
-#if defined(POLARSSL_DES_C)
-
-extern const cipher_info_t des_cbc_info;
-extern const cipher_info_t des_ede_cbc_info;
-extern const cipher_info_t des_ede3_cbc_info;
-
-#endif /* defined(POLARSSL_DES_C) */
-
-#if defined(POLARSSL_BLOWFISH_C)
-extern const cipher_info_t blowfish_cbc_info;
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-extern const cipher_info_t blowfish_cfb64_info;
-#endif /* POLARSSL_CIPHER_MODE_CFB */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-extern const cipher_info_t blowfish_ctr_info;
-#endif /* POLARSSL_CIPHER_MODE_CTR */
-#endif /* defined(POLARSSL_BLOWFISH_C) */
-
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-extern const cipher_info_t null_cipher_info;
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
+extern int supported_ciphers[];
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/compat-1.2.h b/Externals/polarssl/include/polarssl/compat-1.2.h
new file mode 100644
index 0000000000..15b5aa1f2a
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/compat-1.2.h
@@ -0,0 +1,389 @@
+/**
+ * \file compat-1.2.h
+ *
+ * \brief Backwards compatibility header for PolarSSL-1.2 from PolarSSL-1.3
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_COMPAT_1_2_H
+#define POLARSSL_COMPAT_1_2_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+// Comment out to disable prototype change warnings
+#define SHOW_PROTOTYPE_CHANGE_WARNINGS
+
+#if defined(_MSC_VER) && !defined(inline)
+#define inline _inline
+#else
+#if defined(__ARMCC_VERSION) && !defined(inline)
+#define inline __inline
+#endif /* __ARMCC_VERSION */
+#endif /* _MSC_VER */
+
+#if defined(_MSC_VER)
+// MSVC does not support #warning
+#undef SHOW_PROTOTYPE_CHANGE_WARNINGS
+#endif
+
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "You can disable these warnings by commenting SHOW_PROTOTYPE_CHANGE_WARNINGS in compat-1.2.h"
+#endif
+
+#if defined(POLARSSL_SHA256_C)
+#define POLARSSL_SHA2_C
+#include "sha256.h"
+
+/*
+ * SHA-2 -> SHA-256
+ */
+typedef sha256_context sha2_context;
+
+static inline void sha2_starts( sha256_context *ctx, int is224 ) {
+    sha256_starts( ctx, is224 );
+}
+static inline void sha2_update( sha256_context *ctx, const unsigned char *input,
+                         size_t ilen ) {
+    sha256_update( ctx, input, ilen );
+}
+static inline void sha2_finish( sha256_context *ctx, unsigned char output[32] ) {
+    sha256_finish( ctx, output );
+}
+static inline int sha2_file( const char *path, unsigned char output[32], int is224 ) {
+    return sha256_file( path, output, is224 );
+}
+static inline void sha2( const unsigned char *input, size_t ilen,
+                  unsigned char output[32], int is224 ) {
+    sha256( input, ilen, output, is224 );
+}
+static inline void sha2_hmac_starts( sha256_context *ctx, const unsigned char *key,
+                              size_t keylen, int is224 ) {
+    sha256_hmac_starts( ctx, key, keylen, is224 );
+}
+static inline void sha2_hmac_update( sha256_context *ctx, const unsigned char *input, size_t ilen ) {
+    sha256_hmac_update( ctx, input, ilen );
+}
+static inline void sha2_hmac_finish( sha256_context *ctx, unsigned char output[32] ) {
+    sha256_hmac_finish( ctx, output );
+}
+static inline void sha2_hmac_reset( sha256_context *ctx ) {
+    sha256_hmac_reset( ctx );
+}
+static inline void sha2_hmac( const unsigned char *key, size_t keylen,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char output[32], int is224 ) {
+    sha256_hmac( key, keylen, input, ilen, output, is224 );
+}
+static inline int sha2_self_test( int verbose ) {
+    return sha256_self_test( verbose );
+}
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+#define POLARSSL_SHA4_C
+#include "sha512.h"
+
+/*
+ * SHA-4 -> SHA-512
+ */
+typedef sha512_context sha4_context;
+
+static inline void sha4_starts( sha512_context *ctx, int is384 ) {
+    sha512_starts( ctx, is384 );
+}
+static inline void sha4_update( sha512_context *ctx, const unsigned char *input,
+                         size_t ilen ) {
+    sha512_update( ctx, input, ilen );
+}
+static inline void sha4_finish( sha512_context *ctx, unsigned char output[64] ) {
+    sha512_finish( ctx, output );
+}
+static inline int sha4_file( const char *path, unsigned char output[64], int is384 ) {
+    return sha512_file( path, output, is384 );
+}
+static inline void sha4( const unsigned char *input, size_t ilen,
+                  unsigned char output[32], int is384 ) {
+    sha512( input, ilen, output, is384 );
+}
+static inline void sha4_hmac_starts( sha512_context *ctx, const unsigned char *key,
+                              size_t keylen, int is384 ) {
+    sha512_hmac_starts( ctx, key, keylen, is384 );
+}
+static inline void sha4_hmac_update( sha512_context *ctx, const unsigned char *input, size_t ilen ) {
+    sha512_hmac_update( ctx, input, ilen );
+}
+static inline void sha4_hmac_finish( sha512_context *ctx, unsigned char output[64] ) {
+    sha512_hmac_finish( ctx, output );
+}
+static inline void sha4_hmac_reset( sha512_context *ctx ) {
+    sha512_hmac_reset( ctx );
+}
+static inline void sha4_hmac( const unsigned char *key, size_t keylen,
+                       const unsigned char *input, size_t ilen,
+                       unsigned char output[64], int is384 ) {
+    sha512_hmac( key, keylen, input, ilen, output, is384 );
+}
+static inline int sha4_self_test( int verbose ) {
+    return sha512_self_test( verbose );
+}
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_CIPHER_C)
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "cipher_reset() prototype changed. Manual change required if used"
+#endif
+#endif
+
+#if defined(POLARSSL_RSA_C)
+#define SIG_RSA_RAW     POLARSSL_MD_NONE
+#define SIG_RSA_MD2     POLARSSL_MD_MD2
+#define SIG_RSA_MD4     POLARSSL_MD_MD4
+#define SIG_RSA_MD5     POLARSSL_MD_MD5
+#define SIG_RSA_SHA1    POLARSSL_MD_SHA1
+#define SIG_RSA_SHA224  POLARSSL_MD_SHA224
+#define SIG_RSA_SHA256  POLARSSL_MD_SHA256
+#define SIG_RSA_SHA384  POLARSSL_MD_SHA384
+#define SIG_RSA_SHA512  POLARSSL_MD_SHA512
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "rsa_pkcs1_verify() prototype changed. Manual change required if used"
+#warning "rsa_pkcs1_decrypt() prototype changed. Manual change required if used"
+#endif
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_DHM_C)
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "dhm_calc_secret() prototype changed. Manual change required if used"
+#endif
+#endif
+
+#if defined(POLARSSL_GCM_C)
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "gcm_init() prototype changed. Manual change required if used"
+#endif
+#endif
+
+#if defined(POLARSSL_SSL_CLI_C)
+#if defined(SHOW_PROTOTYPE_CHANGE_WARNINGS)
+#warning "ssl_set_own_cert() prototype changed. Change to ssl_set_own_cert_rsa(). Manual change required if used"
+#endif
+#endif
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
+#include "x509.h"
+
+#define POLARSSL_ERR_X509_CERT_INVALID_FORMAT POLARSSL_ERR_X509_INVALID_FORMAT
+#define POLARSSL_ERR_X509_CERT_INVALID_VERSION POLARSSL_ERR_X509_INVALID_VERSION
+#define POLARSSL_ERR_X509_CERT_INVALID_ALG POLARSSL_ERR_X509_INVALID_ALG
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG POLARSSL_ERR_X509_UNKNOWN_SIG_ALG
+#define POLARSSL_ERR_X509_CERT_INVALID_NAME POLARSSL_ERR_X509_INVALID_NAME
+#define POLARSSL_ERR_X509_CERT_INVALID_DATE POLARSSL_ERR_X509_INVALID_DATE
+#define POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS POLARSSL_ERR_X509_INVALID_EXTENSIONS
+#define POLARSSL_ERR_X509_CERT_SIG_MISMATCH POLARSSL_ERR_X509_SIG_MISMATCH
+#define POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE POLARSSL_ERR_X509_INVALID_SIGNATURE
+#define POLARSSL_ERR_X509_CERT_INVALID_SERIAL POLARSSL_ERR_X509_INVALID_SERIAL
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION POLARSSL_ERR_X509_UNKNOWN_VERSION
+
+static inline int x509parse_serial_gets( char *buf, size_t size, const x509_buf *serial ) {
+    return x509_serial_gets( buf, size, serial );
+}
+static inline int x509parse_dn_gets( char *buf, size_t size, const x509_name *dn ) {
+    return x509_dn_gets( buf, size, dn );
+}
+static inline int x509parse_time_expired( const x509_time *time ) {
+    return x509_time_expired( time );
+}
+#endif /* POLARSSL_X509_USE_C || POLARSSL_X509_CREATE_C */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+#define POLARSSL_X509_PARSE_C
+#include "x509_crt.h"
+typedef x509_crt x509_cert;
+
+static inline int x509parse_crt_der( x509_cert *chain, const unsigned char *buf,
+                              size_t buflen ) {
+    return x509_crt_parse_der( chain, buf, buflen );
+}
+static inline int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen ) {
+    return x509_crt_parse( chain, buf, buflen );
+}
+static inline int x509parse_crtfile( x509_cert *chain, const char *path ) {
+    return x509_crt_parse_file( chain, path );
+}
+static inline int x509parse_crtpath( x509_cert *chain, const char *path ) {
+    return x509_crt_parse_path( chain, path );
+}
+static inline int x509parse_cert_info( char *buf, size_t size, const char *prefix,
+                                const x509_cert *crt ) {
+    return x509_crt_info( buf, size, prefix, crt );
+}
+static inline int x509parse_verify( x509_cert *crt, x509_cert *trust_ca,
+                             x509_crl *ca_crl, const char *cn, int *flags,
+                             int (*f_vrfy)(void *, x509_cert *, int, int *),
+                             void *p_vrfy ) {
+    return x509_crt_verify( crt, trust_ca, ca_crl, cn, flags, f_vrfy, p_vrfy );
+}
+static inline int x509parse_revoked( const x509_cert *crt, const x509_crl *crl ) {
+    return x509_crt_revoked( crt, crl );
+}
+static inline void x509_free( x509_cert *crt ) {
+    x509_crt_free( crt );
+}
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+#define POLARSSL_X509_PARSE_C
+#include "x509_crl.h"
+static inline int x509parse_crl( x509_crl *chain, const unsigned char *buf, size_t buflen ) {
+    return x509_crl_parse( chain, buf, buflen );
+}
+static inline int x509parse_crlfile( x509_crl *chain, const char *path ) {
+    return x509_crl_parse_file( chain, path );
+}
+static inline int x509parse_crl_info( char *buf, size_t size, const char *prefix,
+                               const x509_crl *crl ) {
+    return x509_crl_info( buf, size, prefix, crl );
+}
+#endif /* POLARSSL_X509_CRL_PARSE_C */
+
+#if defined(POLARSSL_X509_CSR_PARSE_C)
+#define POLARSSL_X509_PARSE_C
+#include "x509_csr.h"
+static inline int x509parse_csr( x509_csr *csr, const unsigned char *buf, size_t buflen ) {
+    return x509_csr_parse( csr, buf, buflen );
+}
+static inline int x509parse_csrfile( x509_csr *csr, const char *path ) {
+    return x509_csr_parse_file( csr, path );
+}
+static inline int x509parse_csr_info( char *buf, size_t size, const char *prefix,
+                               const x509_csr *csr ) {
+    return x509_csr_info( buf, size, prefix, csr );
+}
+#endif /* POLARSSL_X509_CSR_PARSE_C */
+
+#if defined(POLARSSL_SSL_TLS_C)
+#include "ssl_ciphersuites.h"
+
+#define ssl_default_ciphersuites ssl_list_ciphersuites()
+#endif
+
+#if defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_RSA_C)
+#include "rsa.h"
+#include "pk.h"
+
+#define POLARSSL_ERR_X509_PASSWORD_MISMATCH POLARSSL_ERR_PK_PASSWORD_MISMATCH
+#define POLARSSL_ERR_X509_KEY_INVALID_FORMAT POLARSSL_ERR_PK_KEY_INVALID_FORMAT
+#define POLARSSL_ERR_X509_UNKNOWN_PK_ALG POLARSSL_ERR_PK_UNKNOWN_PK_ALG
+#define POLARSSL_ERR_X509_CERT_INVALID_PUBKEY POLARSSL_ERR_PK_INVALID_PUBKEY
+
+#if defined(POLARSSL_FS_IO)
+static inline int x509parse_keyfile( rsa_context *rsa, const char *path,
+                              const char *pwd ) {
+    int ret;
+    pk_context pk;
+    pk_init( &pk );
+    ret = pk_parse_keyfile( &pk, path, pwd );
+    if( ret == 0 && ! pk_can_do( &pk, POLARSSL_PK_RSA ) )
+        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+    if( ret == 0 )
+        rsa_copy( rsa, pk_rsa( pk ) );
+    else
+        rsa_free( rsa );
+    pk_free( &pk );
+    return( ret );
+}
+static inline int x509parse_public_keyfile( rsa_context *rsa, const char *path ) {
+    int ret;
+    pk_context pk;
+    pk_init( &pk );
+    ret = pk_parse_public_keyfile( &pk, path );
+    if( ret == 0 && ! pk_can_do( &pk, POLARSSL_PK_RSA ) )
+        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+    if( ret == 0 )
+        rsa_copy( rsa, pk_rsa( pk ) );
+    else
+        rsa_free( rsa );
+    pk_free( &pk );
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+
+static inline int x509parse_key( rsa_context *rsa, const unsigned char *key,
+                          size_t keylen,
+                          const unsigned char *pwd, size_t pwdlen ) {
+    int ret;
+    pk_context pk;
+    pk_init( &pk );
+    ret = pk_parse_key( &pk, key, keylen, pwd, pwdlen );
+    if( ret == 0 && ! pk_can_do( &pk, POLARSSL_PK_RSA ) )
+        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+    if( ret == 0 )
+        rsa_copy( rsa, pk_rsa( pk ) );
+    else
+        rsa_free( rsa );
+    pk_free( &pk );
+    return( ret );
+}
+
+static inline int x509parse_public_key( rsa_context *rsa,
+                                 const unsigned char *key, size_t keylen )
+{
+    int ret;
+    pk_context pk;
+    pk_init( &pk );
+    ret = pk_parse_public_key( &pk, key, keylen );
+    if( ret == 0 && ! pk_can_do( &pk, POLARSSL_PK_RSA ) )
+        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+    if( ret == 0 )
+        rsa_copy( rsa, pk_rsa( pk ) );
+    else
+        rsa_free( rsa );
+    pk_free( &pk );
+    return( ret );
+}
+#endif /* POLARSSL_PK_PARSE_C && POLARSSL_RSA_C */
+
+#if defined(POLARSSL_PK_WRITE_C) && defined(POLARSSL_RSA_C)
+#include "pk.h"
+static inline int x509_write_pubkey_der( unsigned char *buf, size_t len, rsa_context *rsa ) {
+    int ret;
+    pk_context ctx;
+    if( ( ret = pk_init_ctx( &ctx, pk_info_from_type( POLARSSL_PK_RSA ) ) ) != 0 ) return( ret );
+    if( ( ret = rsa_copy( pk_rsa( ctx ), rsa ) ) != 0 ) return( ret );
+    ret = pk_write_pubkey_der( &ctx, buf, len );
+    pk_free( &ctx );
+    return( ret );
+}
+static inline int x509_write_key_der( unsigned char *buf, size_t len, rsa_context *rsa ) {
+    int ret;
+    pk_context ctx;
+    if( ( ret = pk_init_ctx( &ctx, pk_info_from_type( POLARSSL_PK_RSA ) ) ) != 0 ) return( ret );
+    if( ( ret = rsa_copy( pk_rsa( ctx ), rsa ) ) != 0 ) return( ret );
+    ret = pk_write_key_der( &ctx, buf, len );
+    pk_free( &ctx );
+    return( ret );
+}
+#endif /* POLARSSL_PK_WRITE_C && POLARSSL_RSA_C */
+#endif /* compat-1.2.h */
diff --git a/Externals/polarssl/include/polarssl/config.h b/Externals/polarssl/include/polarssl/config.h
index e6eb6d579f..d43365ff5e 100644
--- a/Externals/polarssl/include/polarssl/config.h
+++ b/Externals/polarssl/include/polarssl/config.h
@@ -3,7 +3,7 @@
  *
  * \brief Configuration options (set of defines)
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -48,8 +48,8 @@
  * The system uses 8-bit wide native integers.
  *
  * Uncomment if native integers are 8-bit wide.
-#define POLARSSL_HAVE_INT8
  */
+//#define POLARSSL_HAVE_INT8
 
 /**
  * \def POLARSSL_HAVE_INT16
@@ -57,8 +57,8 @@
  * The system uses 16-bit wide native integers.
  *
  * Uncomment if native integers are 16-bit wide.
-#define POLARSSL_HAVE_INT16
  */
+//#define POLARSSL_HAVE_INT16
 
 /**
  * \def POLARSSL_HAVE_LONGLONG
@@ -71,9 +71,7 @@
 /**
  * \def POLARSSL_HAVE_ASM
  *
- * The compiler has support for asm()
- *
- * Uncomment to enable the use of assembly code.
+ * The compiler has support for asm().
  *
  * Requires support for asm() in compiler.
  *
@@ -82,6 +80,7 @@
  *      library/padlock.c
  *      include/polarssl/bn_mul.h
  *
+ * Comment to disable the use of assembly code.
  */
 #define POLARSSL_HAVE_ASM
 
@@ -91,10 +90,84 @@
  * CPU supports SSE2 instruction set.
  *
  * Uncomment if the CPU supports SSE2 (IA-32 specific).
- *
-#define POLARSSL_HAVE_SSE2
  */
-/* \} name */
+//#define POLARSSL_HAVE_SSE2
+
+/**
+ * \def POLARSSL_HAVE_TIME
+ *
+ * System has time.h and time() / localtime()  / gettimeofday().
+ *
+ * Comment if your system does not support time functions
+ */
+#define POLARSSL_HAVE_TIME
+
+/**
+ * \def POLARSSL_HAVE_IPV6
+ *
+ * System supports the basic socket interface for IPv6 (RFC 3493),
+ * specifically getaddrinfo(), freeaddrinfo() and struct sockaddr_storage.
+ *
+ * Note: on Windows/MingW, XP or higher is required.
+ *
+ * Comment if your system does not support the IPv6 socket interface
+ */
+#define POLARSSL_HAVE_IPV6
+
+/**
+ * \def POLARSSL_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default PolarSSL uses the system-provided malloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling POLARSSL_PLATFORM_MEMORY will provide "platform_set_malloc_free()"
+ * to allow you to set an alternative malloc() and free() function pointer.
+ *
+ * Requires: POLARSSL_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define POLARSSL_PLATFORM_MEMORY
+
+/**
+ * \def POLARSSL_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. malloc() to
+ * POLARSSL_PLATFORM_STD_MALLOC and printf() to POLARSSL_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the POLARSSL_PLATFORM_STD_XXX defines.
+ *
+ * Requires: POLARSSL_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define POLARSSL_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def POLARSSL_PLATFORM_XXX_ALT
+ *
+ * Uncomment a macro to let PolarSSL support the function in the platform
+ * abstraction layer.
+ *
+ * Example: In case you uncomment POLARSSL_PLATFORM_PRINTF_ALT, PolarSSL will
+ * provide a function "platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require POLARSSL_PLATFORM_C to be defined!
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define POLARSSL_PLATFORM_PRINTF_ALT
+//#define POLARSSL_PLATFORM_FPRINTF_ALT
+/* \} name SECTION: System support */
 
 /**
  * \name SECTION: PolarSSL feature support
@@ -104,6 +177,19 @@
  * \{
  */
 
+/**
+ * \def POLARSSL_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for hardclock(),
+ * get_timer(), set_alarm() and m_sleep().
+ *
+ * Only works if you have POLARSSL_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define POLARSSL_TIMING_ALT
+
 /**
  * \def POLARSSL_XXX_ALT
  *
@@ -119,19 +205,20 @@
  *
  * Uncomment a macro to enable alternate implementation for core algorithm
  * functions
-#define POLARSSL_AES_ALT
-#define POLARSSL_ARC4_ALT
-#define POLARSSL_BLOWFISH_ALT
-#define POLARSSL_CAMELLIA_ALT
-#define POLARSSL_DES_ALT
-#define POLARSSL_XTEA_ALT
-#define POLARSSL_MD2_ALT
-#define POLARSSL_MD4_ALT
-#define POLARSSL_MD5_ALT
-#define POLARSSL_SHA1_ALT
-#define POLARSSL_SHA2_ALT
-#define POLARSSL_SHA4_ALT
  */
+//#define POLARSSL_AES_ALT
+//#define POLARSSL_ARC4_ALT
+//#define POLARSSL_BLOWFISH_ALT
+//#define POLARSSL_CAMELLIA_ALT
+//#define POLARSSL_DES_ALT
+//#define POLARSSL_XTEA_ALT
+//#define POLARSSL_MD2_ALT
+//#define POLARSSL_MD4_ALT
+//#define POLARSSL_MD5_ALT
+//#define POLARSSL_RIPEMD160_ALT
+//#define POLARSSL_SHA1_ALT
+//#define POLARSSL_SHA256_ALT
+//#define POLARSSL_SHA512_ALT
 
 /**
  * \def POLARSSL_AES_ROM_TABLES
@@ -140,8 +227,15 @@
  *
  * Uncomment this macro to store the AES tables in ROM.
  *
-#define POLARSSL_AES_ROM_TABLES
  */
+//#define POLARSSL_AES_ROM_TABLES
+
+/**
+ * \def POLARSSL_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+#define POLARSSL_CIPHER_MODE_CBC
 
 /**
  * \def POLARSSL_CIPHER_MODE_CFB
@@ -166,18 +260,49 @@
  *
  * Requires POLARSSL_ENABLE_WEAK_CIPHERSUITES as well to enable
  * the following ciphersuites:
- *      TLS_RSA_WITH_NULL_MD5
- *      TLS_RSA_WITH_NULL_SHA
+ *      TLS_ECDH_ECDSA_WITH_NULL_SHA
+ *      TLS_ECDH_RSA_WITH_NULL_SHA
+ *      TLS_ECDHE_ECDSA_WITH_NULL_SHA
+ *      TLS_ECDHE_RSA_WITH_NULL_SHA
+ *      TLS_ECDHE_PSK_WITH_NULL_SHA384
+ *      TLS_ECDHE_PSK_WITH_NULL_SHA256
+ *      TLS_ECDHE_PSK_WITH_NULL_SHA
+ *      TLS_DHE_PSK_WITH_NULL_SHA384
+ *      TLS_DHE_PSK_WITH_NULL_SHA256
+ *      TLS_DHE_PSK_WITH_NULL_SHA
  *      TLS_RSA_WITH_NULL_SHA256
+ *      TLS_RSA_WITH_NULL_SHA
+ *      TLS_RSA_WITH_NULL_MD5
+ *      TLS_RSA_PSK_WITH_NULL_SHA384
+ *      TLS_RSA_PSK_WITH_NULL_SHA256
+ *      TLS_RSA_PSK_WITH_NULL_SHA
+ *      TLS_PSK_WITH_NULL_SHA384
+ *      TLS_PSK_WITH_NULL_SHA256
+ *      TLS_PSK_WITH_NULL_SHA
  *
  * Uncomment this macro to enable the NULL cipher and ciphersuites
-#define POLARSSL_CIPHER_NULL_CIPHER
  */
+//#define POLARSSL_CIPHER_NULL_CIPHER
+
+/**
+ * \def POLARSSL_CIPHER_PADDING_XXX
+ *
+ * Uncomment or comment macros to add support for specific padding modes
+ * in the cipher layer with cipher modes that support padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+#define POLARSSL_CIPHER_PADDING_PKCS7
+#define POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS
+#define POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN
+#define POLARSSL_CIPHER_PADDING_ZEROS
 
 /**
  * \def POLARSSL_ENABLE_WEAK_CIPHERSUITES
  *
- * Enable weak ciphersuites in SSL / TLS
+ * Enable weak ciphersuites in SSL / TLS.
  * Warning: Only do so when you know what you are doing. This allows for
  * channels with virtually no security at all!
  *
@@ -186,26 +311,362 @@
  *      TLS_DHE_RSA_WITH_DES_CBC_SHA
  *
  * Uncomment this macro to enable weak ciphersuites
-#define POLARSSL_ENABLE_WEAK_CIPHERSUITES
  */
+//#define POLARSSL_ENABLE_WEAK_CIPHERSUITES
+
+/**
+ * \def POLARSSL_REMOVE_ARC4_CIPHERSUITES
+ *
+ * Remove RC4 ciphersuites by default in SSL / TLS.
+ * This flag removes the ciphersuites based on RC4 from the default list as
+ * returned by ssl_list_ciphersuites(). However, it is still possible to
+ * enable (some of) them with ssl_set_ciphersuites() by including them
+ * explicitly.
+ *
+ * Uncomment this macro to remove RC4 ciphersuites by default.
+ */
+//#define POLARSSL_REMOVE_ARC4_CIPHERSUITES
+
+/**
+ * \def POLARSSL_ECP_XXXX_ENABLED
+ *
+ * Enables specific curves within the Elliptic Curve module.
+ * By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+#define POLARSSL_ECP_DP_SECP192R1_ENABLED
+#define POLARSSL_ECP_DP_SECP224R1_ENABLED
+#define POLARSSL_ECP_DP_SECP256R1_ENABLED
+#define POLARSSL_ECP_DP_SECP384R1_ENABLED
+#define POLARSSL_ECP_DP_SECP521R1_ENABLED
+#define POLARSSL_ECP_DP_SECP192K1_ENABLED
+#define POLARSSL_ECP_DP_SECP224K1_ENABLED
+#define POLARSSL_ECP_DP_SECP256K1_ENABLED
+#define POLARSSL_ECP_DP_BP256R1_ENABLED
+#define POLARSSL_ECP_DP_BP384R1_ENABLED
+#define POLARSSL_ECP_DP_BP512R1_ENABLED
+//#define POLARSSL_ECP_DP_M221_ENABLED  // Not implemented yet!
+#define POLARSSL_ECP_DP_M255_ENABLED
+//#define POLARSSL_ECP_DP_M383_ENABLED  // Not implemented yet!
+//#define POLARSSL_ECP_DP_M511_ENABLED  // Not implemented yet!
+
+/**
+ * \def POLARSSL_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+#define POLARSSL_ECP_NIST_OPTIM
+
+/**
+ * \def POLARSSL_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: POLARSSL_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+#define POLARSSL_ECDSA_DETERMINISTIC
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
+ *
+ * Enable the PSK based ciphersuite modes in SSL / TLS.
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_PSK_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
+ *
+ * Enable the DHE-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_DHM_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_DHE_PSK_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+ *
+ * Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_ECDH_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
+ *
+ * Enable the RSA-PSK based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
+ *           POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_RSA_PSK_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
+ *
+ * Enable the RSA-only based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
+ *           POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_RSA_WITH_AES_256_CBC_SHA256
+ *      TLS_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      TLS_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      TLS_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_RSA_WITH_RC4_128_SHA
+ *      TLS_RSA_WITH_RC4_128_MD5
+ */
+#define POLARSSL_KEY_EXCHANGE_RSA_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
+ *
+ * Enable the DHE-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_DHM_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
+ *           POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+ *
+ * Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_ECDH_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
+ *           POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+ *
+ * Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_ECDH_C, POLARSSL_ECDSA_C, POLARSSL_X509_CRT_PARSE_C,
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
+ */
+#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+ *
+ * Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_ECDH_C, POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDH_ECDSA_WITH_RC4_128_SHA
+ *      TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ */
+#define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+
+/**
+ * \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
+ *
+ * Enable the ECDH-RSA based ciphersuite modes in SSL / TLS.
+ *
+ * Requires: POLARSSL_ECDH_C, POLARSSL_X509_CRT_PARSE_C
+ *
+ * This enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDH_RSA_WITH_RC4_128_SHA
+ *      TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ */
+#define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
+
+/**
+ * \def POLARSSL_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+#define POLARSSL_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def POLARSSL_ERROR_STRERROR_BC
+ *
+ * Make available the backward compatible error_strerror() next to the
+ * current polarssl_strerror().
+ *
+ * For new code, it is recommended to use polarssl_strerror() instead and
+ * disable this.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * error_strerror()
+ */
+#define POLARSSL_ERROR_STRERROR_BC
 
 /**
  * \def POLARSSL_ERROR_STRERROR_DUMMY
  *
- * Enable a dummy error function to make use of error_strerror() in
- * third party libraries easier.
+ * Enable a dummy error function to make use of polarssl_strerror() in
+ * third party libraries easier when POLARSSL_ERROR_C is disabled
+ * (no effect when POLARSSL_ERROR_C is enabled).
+ *
+ * You can safely disable this if POLARSSL_ERROR_C is enabled, or if you're
+ * not using polarssl_strerror() or error_strerror() in your application.
  *
  * Disable if you run into name conflicts and want to really remove the
- * error_strerror()
+ * polarssl_strerror()
  */
 #define POLARSSL_ERROR_STRERROR_DUMMY
 
 /**
  * \def POLARSSL_GENPRIME
  *
- * Requires: POLARSSL_BIGNUM_C, POLARSSL_RSA_C
+ * Enable the prime-number generation code.
  *
- * Enable the RSA prime-number generation code.
+ * Requires: POLARSSL_BIGNUM_C
  */
 #define POLARSSL_GENPRIME
 
@@ -222,12 +683,12 @@
  * Do not add default entropy sources. These are the platform specific,
  * hardclock and HAVEGE based poll functions.
  *
- * This is useful to have more control over the added entropy sources in an 
+ * This is useful to have more control over the added entropy sources in an
  * application.
  *
  * Uncomment this macro to prevent loading of default entropy functions.
-#define POLARSSL_NO_DEFAULT_ENTROPY_SOURCES
  */
+//#define POLARSSL_NO_DEFAULT_ENTROPY_SOURCES
 
 /**
  * \def POLARSSL_NO_PLATFORM_ENTROPY
@@ -237,15 +698,68 @@
  * standards like the /dev/urandom or Windows CryptoAPI.
  *
  * Uncomment this macro to disable the built-in platform entropy functions.
-#define POLARSSL_NO_PLATFORM_ENTROPY
  */
+//#define POLARSSL_NO_PLATFORM_ENTROPY
+
+/**
+ * \def POLARSSL_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: POLARSSL_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both POLARSSL_SHA256_C and
+ * POLARSSL_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define POLARSSL_ENTROPY_FORCE_SHA256
+
+/**
+ * \def POLARSSL_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: POLARSSL_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define POLARSSL_MEMORY_DEBUG
+
+/**
+ * \def POLARSSL_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: POLARSSL_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define POLARSSL_MEMORY_BACKTRACE
+
+/**
+ * \def POLARSSL_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: POLARSSL_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+#define POLARSSL_PKCS1_V15
 
 /**
  * \def POLARSSL_PKCS1_V21
  *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
  * Requires: POLARSSL_MD_C, POLARSSL_RSA_C
  *
- * Enable support for PKCS#1 v2.1 encoding.
  * This enables support for RSAES-OAEP and RSASSA-PSS operations.
  */
 #define POLARSSL_PKCS1_V21
@@ -257,8 +771,8 @@
  *
  * Uncomment this macro to disable the use of CRT in RSA.
  *
-#define POLARSSL_RSA_NO_CRT
  */
+//#define POLARSSL_RSA_NO_CRT
 
 /**
  * \def POLARSSL_SELF_TEST
@@ -294,8 +808,8 @@
  * Uncomment this macro to report all debug messages on errors introducing
  * a timing side-channel.
  *
-#define POLARSSL_SSL_DEBUG_ALL
  */
+//#define POLARSSL_SSL_DEBUG_ALL
 
 /**
  * \def POLARSSL_SSL_HW_RECORD_ACCEL
@@ -304,19 +818,186 @@
  * individual records.
  *
  * Uncomment this macro to enable hooking functions.
-#define POLARSSL_SSL_HW_RECORD_ACCEL
  */
+//#define POLARSSL_SSL_HW_RECORD_ACCEL
 
 /**
  * \def POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
  *
  * Enable support for receiving and parsing SSLv2 Client Hello messages for the
- * SSL Server module (POLARSSL_SSL_SRV_C)
+ * SSL Server module (POLARSSL_SSL_SRV_C).
  *
  * Comment this macro to disable support for SSLv2 Client Hello messages.
  */
 #define POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
 
+/**
+ * \def POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE
+ *
+ * Pick the ciphersuite according to the client's preferences rather than ours
+ * in the SSL Server module (POLARSSL_SSL_SRV_C).
+ *
+ * Uncomment this macro to respect client's ciphersuite order
+ */
+//#define POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE
+
+/**
+ * \def POLARSSL_SSL_MAX_FRAGMENT_LENGTH
+ *
+ * Enable support for RFC 6066 max_fragment_length extension in SSL.
+ *
+ * Comment this macro to disable support for the max_fragment_length extension
+ */
+#define POLARSSL_SSL_MAX_FRAGMENT_LENGTH
+
+/**
+ * \def POLARSSL_SSL_PROTO_SSL3
+ *
+ * Enable support for SSL 3.0.
+ *
+ * Requires: POLARSSL_MD5_C
+ *           POLARSSL_SHA1_C
+ *
+ * Comment this macro to disable support for SSL 3.0
+ */
+#define POLARSSL_SSL_PROTO_SSL3
+
+/**
+ * \def POLARSSL_SSL_PROTO_TLS1
+ *
+ * Enable support for TLS 1.0.
+ *
+ * Requires: POLARSSL_MD5_C
+ *           POLARSSL_SHA1_C
+ *
+ * Comment this macro to disable support for TLS 1.0
+ */
+#define POLARSSL_SSL_PROTO_TLS1
+
+/**
+ * \def POLARSSL_SSL_PROTO_TLS1_1
+ *
+ * Enable support for TLS 1.1.
+ *
+ * Requires: POLARSSL_MD5_C
+ *           POLARSSL_SHA1_C
+ *
+ * Comment this macro to disable support for TLS 1.1
+ */
+#define POLARSSL_SSL_PROTO_TLS1_1
+
+/**
+ * \def POLARSSL_SSL_PROTO_TLS1_2
+ *
+ * Enable support for TLS 1.2.
+ *
+ * Requires: POLARSSL_SHA1_C or POLARSSL_SHA256_C or POLARSSL_SHA512_C
+ *           (Depends on ciphersuites)
+ *
+ * Comment this macro to disable support for TLS 1.2
+ */
+#define POLARSSL_SSL_PROTO_TLS1_2
+
+/**
+ * \def POLARSSL_SSL_ALPN
+ *
+ * Enable support for Application Layer Protocol Negotiation.
+ * draft-ietf-tls-applayerprotoneg-05
+ *
+ * Comment this macro to disable support for ALPN.
+ */
+#define POLARSSL_SSL_ALPN
+
+/**
+ * \def POLARSSL_SSL_SESSION_TICKETS
+ *
+ * Enable support for RFC 5077 session tickets in SSL.
+ *
+ * Requires: POLARSSL_AES_C
+ *           POLARSSL_SHA256_C
+ *           POLARSSL_CIPHER_MODE_CBC
+ *
+ * Comment this macro to disable support for SSL session tickets
+ */
+#define POLARSSL_SSL_SESSION_TICKETS
+
+/**
+ * \def POLARSSL_SSL_SERVER_NAME_INDICATION
+ *
+ * Enable support for RFC 6066 server name indication (SNI) in SSL.
+ *
+ * Comment this macro to disable support for server name indication in SSL
+ */
+#define POLARSSL_SSL_SERVER_NAME_INDICATION
+
+/**
+ * \def POLARSSL_SSL_TRUNCATED_HMAC
+ *
+ * Enable support for RFC 6066 truncated HMAC in SSL.
+ *
+ * Comment this macro to disable support for truncated HMAC in SSL
+ */
+#define POLARSSL_SSL_TRUNCATED_HMAC
+
+/**
+ * \def POLARSSL_SSL_SET_CURVES
+ *
+ * Enable ssl_set_curves().
+ *
+ * This is disabled by default since it breaks binary compatibility with the
+ * 1.3.x line. If you choose to enable it, you will need to rebuild your
+ * application against the new header files, relinking will not be enough.
+ * It will be enabled by default, or no longer an option, in the 1.4 branch.
+ *
+ * Uncomment to make ssl_set_curves() available.
+ */
+//#define POLARSSL_SSL_SET_CURVES
+
+/**
+ * \def POLARSSL_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: POLARSSL_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define POLARSSL_THREADING_ALT
+
+/**
+ * \def POLARSSL_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: POLARSSL_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define POLARSSL_THREADING_PTHREAD
+
+/**
+ * \def POLARSSL_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via version_check_feature().
+ *
+ * Requires: POLARSSL_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+#define POLARSSL_VERSION_FEATURES
+
+/**
+ * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
+ *
+ * If set, the X509 parser will not break-off when parsing an X509 certificate
+ * and encountering an extension in a v1 or v2 certificate.
+ *
+ * Uncomment to prevent an error.
+ */
+//#define POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
+
 /**
  * \def POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
  *
@@ -324,9 +1005,45 @@
  * and encountering an unknown critical extension.
  *
  * Uncomment to prevent an error.
- *
-#define POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
  */
+//#define POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
+
+/**
+ * \def POLARSSL_X509_CHECK_KEY_USAGE
+ *
+ * Enable verification of the keyUsage extension (CA and leaf certificates).
+ *
+ * Disabling this avoids problems with mis-issued and/or misused
+ * (intermediate) CA and leaf certificates.
+ *
+ * \warning Depending on your PKI use, disabling this can be a security risk!
+ *
+ * Comment to skip keyUsage checking for both CA and leaf certificates.
+ */
+#define POLARSSL_X509_CHECK_KEY_USAGE
+
+/**
+ * \def POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE
+ *
+ * Enable verification of the extendedKeyUsage extension (leaf certificates).
+ *
+ * Disabling this avoids problems with mis-issued and/or misused certificates.
+ *
+ * \warning Depending on your PKI use, disabling this can be a security risk!
+ *
+ * Comment to skip extendedKeyUsage checking for certificates.
+ */
+#define POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE
+
+/**
+ * \def POLARSSL_X509_RSASSA_PSS_SUPPORT
+ *
+ * Enable parsing and verification of X.509 certificates, CRLs and CSRS
+ * signed with RSASSA-PSS (aka PKCS#1 v2.1).
+ *
+ * Comment this macro to disallow using RSASSA-PSS in certificates.
+ */
+#define POLARSSL_X509_RSASSA_PSS_SUPPORT
 
 /**
  * \def POLARSSL_ZLIB_SUPPORT
@@ -334,6 +1051,10 @@
  * If set, the SSL/TLS module uses ZLIB to support compression and
  * decompression of packet data.
  *
+ * \warning TLS-level compression MAY REDUCE SECURITY! See for example the
+ * CRIME attack. Before enabling this option, you should examine with care if
+ * CRIME or similar exploits may be a applicable to your use case.
+ *
  * Used in: library/ssl_tls.c
  *          library/ssl_cli.c
  *          library/ssl_srv.c
@@ -341,9 +1062,9 @@
  * This feature requires zlib library and headers to be present.
  *
  * Uncomment to enable use of ZLIB
-#define POLARSSL_ZLIB_SUPPORT
  */
-/* \} name */
+//#define POLARSSL_ZLIB_SUPPORT
+/* \} name SECTION: PolarSSL feature support */
 
 /**
  * \name SECTION: PolarSSL modules
@@ -352,6 +1073,20 @@
  * \{
  */
 
+/**
+ * \def POLARSSL_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: POLARSSL_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+#define POLARSSL_AESNI_C
+
 /**
  * \def POLARSSL_AES_C
  *
@@ -364,18 +1099,66 @@
  *
  * This module enables the following ciphersuites (if other requisites are
  * enabled as well):
- *      TLS_RSA_WITH_AES_128_CBC_SHA
- *      TLS_RSA_WITH_AES_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
  *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA
  *      TLS_RSA_WITH_AES_256_GCM_SHA384
+ *      TLS_RSA_WITH_AES_256_CBC_SHA256
+ *      TLS_RSA_WITH_AES_256_CBC_SHA
+ *      TLS_RSA_WITH_AES_128_GCM_SHA256
+ *      TLS_RSA_WITH_AES_128_CBC_SHA256
+ *      TLS_RSA_WITH_AES_128_CBC_SHA
+ *      TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA
+ *      TLS_PSK_WITH_AES_256_GCM_SHA384
+ *      TLS_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_PSK_WITH_AES_128_CBC_SHA
  *
- * PEM uses AES for decrypting encrypted keys.
+ * PEM_PARSE uses AES for decrypting encrypted keys.
  */
 #define POLARSSL_AES_C
 
@@ -387,9 +1170,18 @@
  * Module:  library/arc4.c
  * Caller:  library/ssl_tls.c
  *
- * This module enables the following ciphersuites:
- *      TLS_RSA_WITH_RC4_128_MD5
+ * This module enables the following ciphersuites (if other requisites are
+ * enabled as well):
+ *      TLS_ECDH_ECDSA_WITH_RC4_128_SHA
+ *      TLS_ECDH_RSA_WITH_RC4_128_SHA
+ *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
+ *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
+ *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
+ *      TLS_DHE_PSK_WITH_RC4_128_SHA
  *      TLS_RSA_WITH_RC4_128_SHA
+ *      TLS_RSA_WITH_RC4_128_MD5
+ *      TLS_RSA_PSK_WITH_RC4_128_SHA
+ *      TLS_PSK_WITH_RC4_128_SHA
  */
 #define POLARSSL_ARC4_C
 
@@ -399,7 +1191,11 @@
  * Enable the generic ASN1 parser.
  *
  * Module:  library/asn1.c
- * Caller:  library/x509parse.c
+ * Caller:  library/x509.c
+ *          library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
  */
 #define POLARSSL_ASN1_PARSE_C
 
@@ -409,6 +1205,11 @@
  * Enable the generic ASN1 writer.
  *
  * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ *          library/x509_create.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
  */
 #define POLARSSL_ASN1_WRITE_C
 
@@ -431,11 +1232,12 @@
  *
  * Module:  library/bignum.c
  * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
  *          library/rsa.c
  *          library/ssl_tls.c
- *          library/x509parse.c
  *
- * This module is required for RSA and DHM support.
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
  */
 #define POLARSSL_BIGNUM_C
 
@@ -458,17 +1260,65 @@
  *
  * This module enables the following ciphersuites (if other requisites are
  * enabled as well):
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384
  *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
+ *      TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
+ *      TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ *      TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384
+ *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
+ *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
+ *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
  */
 #define POLARSSL_CAMELLIA_C
 
+/**
+ * \def POLARSSL_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: POLARSSL_AES_C or POLARSSL_CAMELLIA_C
+ *
+ * This module enables the AES-CCM ciphersuites, if other requisites are
+ * enabled as well.
+ */
+#define POLARSSL_CCM_C
+
 /**
  * \def POLARSSL_CERTS_C
  *
@@ -477,6 +1327,8 @@
  * Module:  library/certs.c
  * Caller:
  *
+ * Requires: POLARSSL_PEM_PARSE_C
+ *
  * This module is used for testing (ssl_client/server).
  */
 #define POLARSSL_CERTS_C
@@ -487,7 +1339,7 @@
  * Enable the generic cipher layer.
  *
  * Module:  library/cipher.c
- * Caller:
+ * Caller:  library/ssl_tls.c
  *
  * Uncomment to enable generic cipher wrappers.
  */
@@ -496,7 +1348,7 @@
 /**
  * \def POLARSSL_CTR_DRBG_C
  *
- * Enable the CTR_DRBG AES-256-based random generator
+ * Enable the CTR_DRBG AES-256-based random generator.
  *
  * Module:  library/ctr_drbg.c
  * Caller:
@@ -532,39 +1384,79 @@
  *
  * This module enables the following ciphersuites (if other requisites are
  * enabled as well):
- *      TLS_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
  *      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_RSA_WITH_3DES_EDE_CBC_SHA
+ *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
+ *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
  *
- * PEM uses DES/3DES for decrypting encrypted keys.
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
  */
 #define POLARSSL_DES_C
 
 /**
  * \def POLARSSL_DHM_C
  *
- * Enable the Diffie-Hellman-Merkle key exchange.
+ * Enable the Diffie-Hellman-Merkle module.
  *
  * Module:  library/dhm.c
  * Caller:  library/ssl_cli.c
  *          library/ssl_srv.c
  *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_DHE_RSA_WITH_DES_CBC_SHA
- *      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
- *      TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
- *      TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
- *      TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
  */
 #define POLARSSL_DHM_C
 
+/**
+ * \def POLARSSL_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: POLARSSL_ECP_C
+ */
+#define POLARSSL_ECDH_C
+
+/**
+ * \def POLARSSL_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
+ */
+#define POLARSSL_ECDSA_C
+
+/**
+ * \def POLARSSL_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *
+ * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
+ */
+#define POLARSSL_ECP_C
+
 /**
  * \def POLARSSL_ENTROPY_C
  *
@@ -573,7 +1465,7 @@
  * Module:  library/entropy.c
  * Caller:
  *
- * Requires: POLARSSL_SHA4_C
+ * Requires: POLARSSL_SHA512_C or POLARSSL_SHA256_C
  *
  * This module provides a generic entropy pool
  */
@@ -587,23 +1479,21 @@
  * Module:  library/error.c
  * Caller:
  *
- * This module enables err_strerror().
+ * This module enables polarssl_strerror().
  */
 #define POLARSSL_ERROR_C
 
 /**
  * \def POLARSSL_GCM_C
  *
- * Enable the Galois/Counter Mode (GCM) for AES
+ * Enable the Galois/Counter Mode (GCM) for AES.
  *
  * Module:  library/gcm.c
  *
- * Requires: POLARSSL_AES_C
+ * Requires: POLARSSL_AES_C or POLARSSL_CAMELLIA_C
  *
- * This module enables the following ciphersuites (if other requisites are
- * enabled as well):
- *      TLS_RSA_WITH_AES_128_GCM_SHA256
- *      TLS_RSA_WITH_AES_256_GCM_SHA384
+ * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
+ * requisites are enabled as well.
  */
 #define POLARSSL_GCM_C
 
@@ -628,7 +1518,21 @@
  *
  * Uncomment to enable the HAVEGE random generator.
  */
-#define POLARSSL_HAVEGE_C
+//#define POLARSSL_HAVEGE_C
+
+/**
+ * \def POLARSSL_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: POLARSSL_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+#define POLARSSL_HMAC_DRBG_C
 
 /**
  * \def POLARSSL_MD_C
@@ -645,56 +1549,98 @@
 /**
  * \def POLARSSL_MD2_C
  *
- * Enable the MD2 hash algorithm
+ * Enable the MD2 hash algorithm.
  *
  * Module:  library/md2.c
- * Caller:  library/x509parse.c
+ * Caller:
  *
  * Uncomment to enable support for (rare) MD2-signed X.509 certs.
- *
-#define POLARSSL_MD2_C
  */
+//#define POLARSSL_MD2_C
 
 /**
  * \def POLARSSL_MD4_C
  *
- * Enable the MD4 hash algorithm
+ * Enable the MD4 hash algorithm.
  *
  * Module:  library/md4.c
- * Caller:  library/x509parse.c
+ * Caller:
  *
  * Uncomment to enable support for (rare) MD4-signed X.509 certs.
- *
-#define POLARSSL_MD4_C
  */
+//#define POLARSSL_MD4_C
 
 /**
  * \def POLARSSL_MD5_C
  *
- * Enable the MD5 hash algorithm
+ * Enable the MD5 hash algorithm.
  *
  * Module:  library/md5.c
- * Caller:  library/pem.c
+ * Caller:  library/md.c
+ *          library/pem.c
  *          library/ssl_tls.c
- *          library/x509parse.c
  *
  * This module is required for SSL/TLS and X.509.
- * PEM uses MD5 for decrypting encrypted keys.
+ * PEM_PARSE uses MD5 for decrypting encrypted keys.
  */
 #define POLARSSL_MD5_C
 
+/**
+ * \def POLARSSL_MEMORY_C
+ * Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
+ */
+//#define POLARSSL_MEMORY_C
+
+/**
+ * \def POLARSSL_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces malloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: POLARSSL_PLATFORM_C
+ *           POLARSSL_PLATFORM_MEMORY (to use it within PolarSSL)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define POLARSSL_MEMORY_BUFFER_ALLOC_C
+
 /**
  * \def POLARSSL_NET_C
  *
  * Enable the TCP/IP networking routines.
  *
  * Module:  library/net.c
- * Caller:
  *
  * This module provides TCP/IP networking routines.
  */
 #define POLARSSL_NET_C
 
+/**
+ * \def POLARSSL_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *          library/x509.c
+ *          library/x509_create.c
+ *          library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+#define POLARSSL_OID_C
+
 /**
  * \def POLARSSL_PADLOCK_C
  *
@@ -703,6 +1649,8 @@
  * Module:  library/padlock.c
  * Caller:  library/aes.c
  *
+ * Requires: POLARSSL_HAVE_ASM
+ *
  * This modules adds support for the VIA PadLock on x86.
  */
 #define POLARSSL_PADLOCK_C
@@ -710,7 +1658,7 @@
 /**
  * \def POLARSSL_PBKDF2_C
  *
- * Enable PKCS#5 PBKDF2 key derivation function
+ * Enable PKCS#5 PBKDF2 key derivation function.
  * DEPRECATED: Use POLARSSL_PKCS5_C instead
  *
  * Module:  library/pbkdf2.c
@@ -718,27 +1666,92 @@
  * Requires: POLARSSL_PKCS5_C
  *
  * This module adds support for the PKCS#5 PBKDF2 key derivation function.
-#define POLARSSL_PBKDF2_C
  */
+#define POLARSSL_PBKDF2_C
 
 /**
- * \def POLARSSL_PEM_C
+ * \def POLARSSL_PEM_PARSE_C
  *
- * Enable PEM decoding
+ * Enable PEM decoding / parsing.
  *
  * Module:  library/pem.c
- * Caller:  library/x509parse.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *          library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
  *
  * Requires: POLARSSL_BASE64_C
  *
- * This modules adds support for decoding PEM files.
+ * This modules adds support for decoding / parsing PEM files.
  */
-#define POLARSSL_PEM_C
+#define POLARSSL_PEM_PARSE_C
+
+/**
+ * \def POLARSSL_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *          library/x509write_crt.c
+ *          library/x509write_csr.c
+ *
+ * Requires: POLARSSL_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+#define POLARSSL_PEM_WRITE_C
+
+/**
+ * \def POLARSSL_PK_C
+ *
+ * Enable the generic public (asymetric) key layer.
+ *
+ * Module:  library/pk.c
+ * Caller:  library/ssl_tls.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * Requires: POLARSSL_RSA_C or POLARSSL_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+#define POLARSSL_PK_C
+
+/**
+ * \def POLARSSL_PK_PARSE_C
+ *
+ * Enable the generic public (asymetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ * Caller:  library/x509_crt.c
+ *          library/x509_csr.c
+ *
+ * Requires: POLARSSL_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+#define POLARSSL_PK_PARSE_C
+
+/**
+ * \def POLARSSL_PK_WRITE_C
+ *
+ * Enable the generic public (asymetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ * Caller:  library/x509write.c
+ *
+ * Requires: POLARSSL_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+#define POLARSSL_PK_WRITE_C
 
 /**
  * \def POLARSSL_PKCS5_C
  *
- * Enable PKCS#5 functions
+ * Enable PKCS#5 functions.
  *
  * Module:  library/pkcs5.c
  *
@@ -753,25 +1766,24 @@
  *
  * Enable wrapper for PKCS#11 smartcard support.
  *
- * Module:  library/ssl_srv.c
- * Caller:  library/ssl_cli.c
- *          library/ssl_srv.c
+ * Module:  library/pkcs11.c
+ * Caller:  library/pk.c
  *
- * Requires: POLARSSL_SSL_TLS_C
+ * Requires: POLARSSL_PK_C
  *
  * This module enables SSL/TLS PKCS #11 smartcard support.
  * Requires the presence of the PKCS#11 helper library (libpkcs11-helper)
-#define POLARSSL_PKCS11_C
  */
+//#define POLARSSL_PKCS11_C
 
 /**
  * \def POLARSSL_PKCS12_C
  *
- * Enable PKCS#12 PBE functions
+ * Enable PKCS#12 PBE functions.
  * Adds algorithms for parsing PKCS#8 encrypted private keys
  *
  * Module:  library/pkcs12.c
- * Caller:  library/x509parse.c
+ * Caller:  library/pkparse.c
  *
  * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_CIPHER_C, POLARSSL_MD_C
  * Can use:  POLARSSL_ARC4_C
@@ -780,6 +1792,30 @@
  */
 #define POLARSSL_PKCS12_C
 
+/**
+ * \def POLARSSL_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like malloc(), free(), printf(), fprintf()
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+#define POLARSSL_PLATFORM_C
+
+/**
+ * \def POLARSSL_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+#define POLARSSL_RIPEMD160_C
+
 /**
  * \def POLARSSL_RSA_C
  *
@@ -791,9 +1827,10 @@
  *          library/ssl_tls.c
  *          library/x509.c
  *
- * Requires: POLARSSL_BIGNUM_C
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
  *
- * This module is required for SSL/TLS and MD5-signed certificates.
+ * Requires: POLARSSL_BIGNUM_C, POLARSSL_OID_C
  */
 #define POLARSSL_RSA_C
 
@@ -803,41 +1840,49 @@
  * Enable the SHA1 cryptographic hash algorithm.
  *
  * Module:  library/sha1.c
- * Caller:  library/ssl_cli.c
+ * Caller:  library/md.c
+ *          library/ssl_cli.c
  *          library/ssl_srv.c
  *          library/ssl_tls.c
- *          library/x509parse.c
+ *          library/x509write_crt.c
  *
  * This module is required for SSL/TLS and SHA1-signed certificates.
  */
 #define POLARSSL_SHA1_C
 
 /**
- * \def POLARSSL_SHA2_C
+ * \def POLARSSL_SHA256_C
  *
  * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ * (Used to be POLARSSL_SHA2_C)
  *
- * Module:  library/sha2.c
- * Caller:  library/md_wrap.c
- *          library/x509parse.c
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
  *
  * This module adds support for SHA-224 and SHA-256.
  * This module is required for the SSL/TLS 1.2 PRF function.
  */
-#define POLARSSL_SHA2_C
+#define POLARSSL_SHA256_C
 
 /**
- * \def POLARSSL_SHA4_C
+ * \def POLARSSL_SHA512_C
  *
  * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ * (Used to be POLARSSL_SHA4_C)
  *
- * Module:  library/sha4.c
- * Caller:  library/md_wrap.c
- *          library/x509parse.c
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
  *
  * This module adds support for SHA-384 and SHA-512.
  */
-#define POLARSSL_SHA4_C
+#define POLARSSL_SHA512_C
 
 /**
  * \def POLARSSL_SSL_CACHE_C
@@ -877,7 +1922,7 @@
  *
  * This module is required for SSL/TLS server support.
  */
-//#define POLARSSL_SSL_SRV_C
+#define POLARSSL_SSL_SRV_C
 
 /**
  * \def POLARSSL_SSL_TLS_C
@@ -888,12 +1933,34 @@
  * Caller:  library/ssl_cli.c
  *          library/ssl_srv.c
  *
- * Requires: POLARSSL_MD5_C, POLARSSL_SHA1_C, POLARSSL_X509_PARSE_C
+ * Requires: POLARSSL_CIPHER_C, POLARSSL_MD_C
+ *           and at least one of the POLARSSL_SSL_PROTO_* defines
  *
  * This module is required for SSL/TLS.
  */
 #define POLARSSL_SSL_TLS_C
 
+/**
+ * \def POLARSSL_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default PolarSSL assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions.
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either POLARSSL_THREADING_ALT or
+ * POLARSSL_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within PolarSSL
+ */
+//#define POLARSSL_THREADING_C
+
 /**
  * \def POLARSSL_TIMING_C
  *
@@ -918,33 +1985,104 @@
 #define POLARSSL_VERSION_C
 
 /**
- * \def POLARSSL_X509_PARSE_C
+ * \def POLARSSL_X509_USE_C
+ *
+ * Enable X.509 core for using certificates.
+ *
+ * Module:  library/x509.c
+ * Caller:  library/x509_crl.c
+ *          library/x509_crt.c
+ *          library/x509_csr.c
+ *
+ * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_BIGNUM_C, POLARSSL_OID_C,
+ *           POLARSSL_PK_PARSE_C
+ *
+ * This module is required for the X.509 parsing modules.
+ */
+#define POLARSSL_X509_USE_C
+
+/**
+ * \def POLARSSL_X509_CRT_PARSE_C
  *
  * Enable X.509 certificate parsing.
  *
- * Module:  library/x509parse.c
+ * Module:  library/x509_crt.c
  * Caller:  library/ssl_cli.c
  *          library/ssl_srv.c
  *          library/ssl_tls.c
  *
- * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_BIGNUM_C, POLARSSL_RSA_C
+ * Requires: POLARSSL_X509_USE_C
  *
  * This module is required for X.509 certificate parsing.
  */
-#define POLARSSL_X509_PARSE_C
+#define POLARSSL_X509_CRT_PARSE_C
 
 /**
- * \def POLARSSL_X509_WRITE_C
+ * \def POLARSSL_X509_CRL_PARSE_C
  *
- * Enable X.509 buffer writing.
+ * Enable X.509 CRL parsing.
  *
- * Module:  library/x509write.c
+ * Module:  library/x509_crl.c
+ * Caller:  library/x509_crt.c
  *
- * Requires: POLARSSL_BIGNUM_C, POLARSSL_RSA_C
+ * Requires: POLARSSL_X509_USE_C
+ *
+ * This module is required for X.509 CRL parsing.
+ */
+#define POLARSSL_X509_CRL_PARSE_C
+
+/**
+ * \def POLARSSL_X509_CSR_PARSE_C
+ *
+ * Enable X.509 Certificate Signing Request (CSR) parsing.
+ *
+ * Module:  library/x509_csr.c
+ * Caller:  library/x509_crt_write.c
+ *
+ * Requires: POLARSSL_X509_USE_C
+ *
+ * This module is used for reading X.509 certificate request.
+ */
+#define POLARSSL_X509_CSR_PARSE_C
+
+/**
+ * \def POLARSSL_X509_CREATE_C
+ *
+ * Enable X.509 core for creating certificates.
+ *
+ * Module:  library/x509_create.c
+ *
+ * Requires: POLARSSL_BIGNUM_C, POLARSSL_OID_C, POLARSSL_PK_WRITE_C
+ *
+ * This module is the basis for creating X.509 certificates and CSRs.
+ */
+#define POLARSSL_X509_CREATE_C
+
+/**
+ * \def POLARSSL_X509_CRT_WRITE_C
+ *
+ * Enable creating X.509 certificates.
+ *
+ * Module:  library/x509_crt_write.c
+ *
+ * Requires: POLARSSL_CREATE_C
+ *
+ * This module is required for X.509 certificate creation.
+ */
+#define POLARSSL_X509_CRT_WRITE_C
+
+/**
+ * \def POLARSSL_X509_CSR_WRITE_C
+ *
+ * Enable creating X.509 Certificate Signing Requests (CSR).
+ *
+ * Module:  library/x509_csr_write.c
+ *
+ * Requires: POLARSSL_CREATE_C
  *
  * This module is required for X.509 certificate request writing.
  */
-#define POLARSSL_X509_WRITE_C
+#define POLARSSL_X509_CSR_WRITE_C
 
 /**
  * \def POLARSSL_XTEA_C
@@ -955,7 +2093,8 @@
  * Caller:
  */
 #define POLARSSL_XTEA_C
-/* \} name */
+
+/* \} name SECTION: PolarSSL modules */
 
 /**
  * \name SECTION: Module configuration options
@@ -963,50 +2102,79 @@
  * This section allows for the setting of module specific sizes and
  * configuration options. The default values are already present in the
  * relevant header files and should suffice for the regular use cases.
- * Our advice is to enable POLARSSL_CONFIG_OPTIONS and change values here
- * only if you have a good reason and know the consequences.
  *
- * If POLARSSL_CONFIG_OPTIONS is undefined here the options in the module
- * header file take precedence.
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
  *
  * Please check the respective header file for documentation on these
  * parameters (to prevent duplicate documentation).
- *
- * Uncomment POLARSSL_CONFIG_OPTIONS to enable using the values defined here.
  * \{
  */
-//#define POLARSSL_CONFIG_OPTIONS   /**< Enable config.h module value configuration */
 
-#if defined(POLARSSL_CONFIG_OPTIONS)
+/* MPI / BIGNUM options */
+//#define POLARSSL_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define POLARSSL_MPI_MAX_SIZE             512 /**< Maximum number of bytes for usable MPIs. */
 
-// MPI / BIGNUM options
-//
-#define POLARSSL_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
-#define POLARSSL_MPI_MAX_SIZE             512 /**< Maximum number of bytes for usable MPIs. */
+/* CTR_DRBG options */
+//#define CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
 
-// CTR_DRBG options
-//
-#define CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default */
-#define CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
-#define CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
-#define CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
-#define CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+/* HMAC_DRBG options */
+//#define POLARSSL_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define POLARSSL_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define POLARSSL_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define POLARSSL_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
 
-// Entropy options
-//
-#define ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
-#define ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+/* ECP options */
+//#define POLARSSL_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define POLARSSL_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define POLARSSL_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
 
-// SSL Cache options
-//
-#define SSL_CACHE_DEFAULT_TIMEOUT       86400 /**< 1 day  */
-#define SSL_CACHE_DEFAULT_MAX_ENTRIES      50 /**< Maximum entries in cache */
+/* Entropy options */
+//#define ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
 
-// SSL options
-//
-#define SSL_MAX_CONTENT_LEN             16384 /**< Size of the input / output buffer */
+/* Memory buffer allocator options */
+//#define POLARSSL_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
 
-#endif /* POLARSSL_CONFIG_OPTIONS */
+/* Platform options */
+//#define POLARSSL_PLATFORM_STD_MEM_HDR <stdlib.h> /**< Header to include if POLARSSL_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define POLARSSL_PLATFORM_STD_MALLOC   malloc /**< Default allocator to use, can be undefined */
+//#define POLARSSL_PLATFORM_STD_FREE       free /**< Default free to use, can be undefined */
+//#define POLARSSL_PLATFORM_STD_PRINTF   printf /**< Default printf to use, can be undefined */
+//#define POLARSSL_PLATFORM_STD_FPRINTF fprintf /**< Default fprintf to use, can be undefined */
 
-/* \} name */
-#endif /* config.h */
+/* SSL Cache options */
+//#define SSL_CACHE_DEFAULT_TIMEOUT       86400 /**< 1 day  */
+//#define SSL_CACHE_DEFAULT_MAX_ENTRIES      50 /**< Maximum entries in cache */
+
+/* SSL options */
+//#define SSL_MAX_CONTENT_LEN             16384 /**< Size of the input / output buffer */
+//#define SSL_DEFAULT_TICKET_LIFETIME     86400 /**< Lifetime of session tickets (if enabled) */
+//#define POLARSSL_PSK_MAX_LEN               32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */
+
+/**
+ * Complete list of ciphersuites to use, in order of preference.
+ *
+ * \warning No dependency checking is done on that field! This option can only
+ * be used to restrict the set of available ciphersuites. It is your
+ * responsibility to make sure the needed modules are active.
+ *
+ * Use this to save a few hundred bytes of ROM (default ordering of all
+ * available ciphersuites) and a few to a few hundred bytes of RAM.
+ *
+ * The value below is only an example, not the default.
+ */
+//#define SSL_CIPHERSUITES TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+
+/* Debug options */
+//#define POLARSSL_DEBUG_DFL_MODE POLARSSL_DEBUG_LOG_FULL /**< Default log: Full or Raw */
+
+/* \} name SECTION: Module configuration options */
+
+#include "check_config.h"
+
+#endif /* POLARSSL_CONFIG_H */
diff --git a/Externals/polarssl/include/polarssl/ctr_drbg.h b/Externals/polarssl/include/polarssl/ctr_drbg.h
index 5a26cdee10..bebbfe9311 100644
--- a/Externals/polarssl/include/polarssl/ctr_drbg.h
+++ b/Externals/polarssl/include/polarssl/ctr_drbg.h
@@ -3,7 +3,7 @@
  *
  * \brief CTR_DRBG based on AES-256 (NIST SP 800-90)
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -42,13 +42,39 @@
 #define CTR_DRBG_SEEDLEN            ( CTR_DRBG_KEYSIZE + CTR_DRBG_BLOCKSIZE )
                                             /**< The seed length (counter + AES key)            */
 
-#if !defined(POLARSSL_CONFIG_OPTIONS)
-#define CTR_DRBG_ENTROPY_LEN        48      /**< Amount of entropy used per seed by default */
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(CTR_DRBG_ENTROPY_LEN)
+#if defined(POLARSSL_SHA512_C) && !defined(POLARSSL_ENTROPY_FORCE_SHA256)
+#define CTR_DRBG_ENTROPY_LEN        48      /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+#else
+#define CTR_DRBG_ENTROPY_LEN        32      /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+#endif
+#endif
+
+#if !defined(CTR_DRBG_RESEED_INTERVAL)
 #define CTR_DRBG_RESEED_INTERVAL    10000   /**< Interval before reseed is performed by default */
+#endif
+
+#if !defined(CTR_DRBG_MAX_INPUT)
 #define CTR_DRBG_MAX_INPUT          256     /**< Maximum number of additional input bytes */
+#endif
+
+#if !defined(CTR_DRBG_MAX_REQUEST)
 #define CTR_DRBG_MAX_REQUEST        1024    /**< Maximum number of requested bytes per call */
+#endif
+
+#if !defined(CTR_DRBG_MAX_SEED_INPUT)
 #define CTR_DRBG_MAX_SEED_INPUT     384     /**< Maximum size of (re)seed buffer */
-#endif /* !POLARSSL_CONFIG_OPTIONS */
+#endif
+
+/* \} name SECTION: Module settings */
 
 #define CTR_DRBG_PR_OFF             0       /**< No prediction resistance       */
 #define CTR_DRBG_PR_ON              1       /**< Prediction resistance enabled  */
@@ -65,8 +91,9 @@ typedef struct
     unsigned char counter[16];  /*!<  counter (V)       */
     int reseed_counter;         /*!<  reseed counter    */
     int prediction_resistance;  /*!<  enable prediction resistance (Automatic
-                                      reseed before every random generation)        */
-    size_t entropy_len;         /*!<  amount of entropy grabbed on each (re)seed    */
+                                      reseed before every random generation)  */
+    size_t entropy_len;         /*!<  amount of entropy grabbed on each
+                                      (re)seed          */
     int reseed_interval;        /*!<  reseed interval   */
 
     aes_context aes_ctx;        /*!<  AES context       */
@@ -82,7 +109,7 @@ ctr_drbg_context;
 
 /**
  * \brief               CTR_DRBG initialization
- * 
+ *
  * Note: Personalization data can be provided in addition to the more generic
  *       entropy source to make this instantiation as unique as possible.
  *
@@ -103,6 +130,13 @@ int ctr_drbg_init( ctr_drbg_context *ctx,
                    const unsigned char *custom,
                    size_t len );
 
+/**
+ * \brief               Clear CTR_CRBG context data
+ *
+ * \param ctx           CTR_DRBG context to clear
+ */
+void ctr_drbg_free( ctr_drbg_context *ctx );
+
 /**
  * \brief               Enable / disable prediction resistance (Default: Off)
  *
@@ -137,7 +171,7 @@ void ctr_drbg_set_reseed_interval( ctr_drbg_context *ctx,
 
 /**
  * \brief               CTR_DRBG reseeding (extracts data from entropy source)
- * 
+ *
  * \param ctx           CTR_DRBG context
  * \param additional    Additional data to add to state (Can be NULL)
  * \param len           Length of additional data
@@ -197,9 +231,11 @@ int ctr_drbg_random( void *p_rng,
 /**
  * \brief               Write a seed file
  *
+ * \param ctx           CTR_DRBG context
  * \param path          Name of the file
  *
- * \return              0 if successful, 1 on file error, or
+ * \return              0 if successful,
+ *                      POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR on file error, or
  *                      POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED
  */
 int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path );
@@ -208,14 +244,16 @@ int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path );
  * \brief               Read and update a seed file. Seed is added to this
  *                      instance
  *
+ * \param ctx           CTR_DRBG context
  * \param path          Name of the file
  *
- * \return              0 if successful, 1 on file error,
+ * \return              0 if successful,
+ *                      POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR on file error,
  *                      POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED or
  *                      POLARSSL_ERR_CTR_DRBG_INPUT_TOO_BIG
  */
 int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path );
-#endif
+#endif /* POLARSSL_FS_IO */
 
 /**
  * \brief               Checkup routine
@@ -224,6 +262,11 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path );
  */
 int ctr_drbg_self_test( int verbose );
 
+/* Internal functions (do not call directly) */
+int ctr_drbg_init_entropy_len( ctr_drbg_context *,
+                               int (*)(void *, unsigned char *, size_t), void *,
+                               const unsigned char *, size_t, size_t );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/debug.h b/Externals/polarssl/include/polarssl/debug.h
index 511e926eb6..0dd79d52f0 100644
--- a/Externals/polarssl/include/polarssl/debug.h
+++ b/Externals/polarssl/include/polarssl/debug.h
@@ -27,11 +27,36 @@
 #ifndef POLARSSL_DEBUG_H
 #define POLARSSL_DEBUG_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 #include "ssl.h"
+#if defined(POLARSSL_ECP_C)
+#include "ecp.h"
+#endif
 
 #if defined(POLARSSL_DEBUG_C)
 
+#define POLARSSL_DEBUG_LOG_FULL         0 /**< Include file:line in log lines */
+#define POLARSSL_DEBUG_LOG_RAW          1 /**< Only log raw debug lines */
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(POLARSSL_DEBUG_DFL_MODE)
+#define POLARSSL_DEBUG_DFL_MODE POLARSSL_DEBUG_LOG_FULL /**< Default log: Full or Raw */
+#endif
+
+/* \} name SECTION: Module settings */
+
+
 #define SSL_DEBUG_MSG( level, args )                    \
     debug_print_msg( ssl, level, __FILE__, __LINE__, debug_fmt args );
 
@@ -41,26 +66,54 @@
 #define SSL_DEBUG_BUF( level, text, buf, len )           \
     debug_print_buf( ssl, level, __FILE__, __LINE__, text, buf, len );
 
+#if defined(POLARSSL_BIGNUM_C)
 #define SSL_DEBUG_MPI( level, text, X )                  \
     debug_print_mpi( ssl, level, __FILE__, __LINE__, text, X );
+#endif
 
+#if defined(POLARSSL_ECP_C)
+#define SSL_DEBUG_ECP( level, text, X )                  \
+    debug_print_ecp( ssl, level, __FILE__, __LINE__, text, X );
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 #define SSL_DEBUG_CRT( level, text, crt )                \
     debug_print_crt( ssl, level, __FILE__, __LINE__, text, crt );
+#endif
 
-#else
+#else /* POLARSSL_DEBUG_C */
 
 #define SSL_DEBUG_MSG( level, args )            do { } while( 0 )
 #define SSL_DEBUG_RET( level, text, ret )       do { } while( 0 )
 #define SSL_DEBUG_BUF( level, text, buf, len )  do { } while( 0 )
 #define SSL_DEBUG_MPI( level, text, X )         do { } while( 0 )
+#define SSL_DEBUG_ECP( level, text, X )         do { } while( 0 )
 #define SSL_DEBUG_CRT( level, text, crt )       do { } while( 0 )
 
-#endif
+#endif /* POLARSSL_DEBUG_C */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ * \brief   Set the log mode for the debug functions globally
+ *          (Default value: POLARSSL_DEBUG_DFL_MODE)
+ *
+ * \param log_mode      The log mode to use (POLARSSL_DEBUG_LOG_FULL or
+ *                                           POLARSSL_DEBUG_LOG_RAW)
+ */
+void debug_set_log_mode( int log_mode );
+
+/**
+ * \brief   Set the level threshold to handle globally. Messages that have a
+ *          level over the threshold value are ignored.
+ *          (Default value: 0 (No debug))
+ *
+ * \param threshold     maximum level of messages to pass on
+ */
+void debug_set_threshold( int threshold );
+
 char *debug_fmt( const char *format, ... );
 
 void debug_print_msg( const ssl_context *ssl, int level,
@@ -74,13 +127,23 @@ void debug_print_buf( const ssl_context *ssl, int level,
                       const char *file, int line, const char *text,
                       unsigned char *buf, size_t len );
 
+#if defined(POLARSSL_BIGNUM_C)
 void debug_print_mpi( const ssl_context *ssl, int level,
                       const char *file, int line,
                       const char *text, const mpi *X );
+#endif
 
+#if defined(POLARSSL_ECP_C)
+void debug_print_ecp( const ssl_context *ssl, int level,
+                      const char *file, int line,
+                      const char *text, const ecp_point *X );
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 void debug_print_crt( const ssl_context *ssl, int level,
                       const char *file, int line,
-                      const char *text, const x509_cert *crt );
+                      const char *text, const x509_crt *crt );
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/des.h b/Externals/polarssl/include/polarssl/des.h
index d78b568c84..89bb394e01 100644
--- a/Externals/polarssl/include/polarssl/des.h
+++ b/Externals/polarssl/include/polarssl/des.h
@@ -3,7 +3,7 @@
  *
  * \brief DES block cipher
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_DES_H
 #define POLARSSL_DES_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -49,6 +53,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          DES context structure
  */
@@ -69,9 +77,33 @@ typedef struct
 }
 des3_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize DES context
+ *
+ * \param ctx      DES context to be initialized
+ */
+void des_init( des_context *ctx );
+
+/**
+ * \brief          Clear DES context
+ *
+ * \param ctx      DES context to be cleared
+ */
+void des_free( des_context *ctx );
+
+/**
+ * \brief          Initialize Triple-DES context
+ *
+ * \param ctx      DES3 context to be initialized
+ */
+void des3_init( des3_context *ctx );
+
+/**
+ * \brief          Clear Triple-DES context
+ *
+ * \param ctx      DES3 context to be cleared
+ */
+void des3_free( des3_context *ctx );
 
 /**
  * \brief          Set key parity on the given key to odd.
@@ -132,7 +164,8 @@ int des_setkey_dec( des_context *ctx, const unsigned char key[DES_KEY_SIZE] );
  *
  * \return         0
  */
-int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
+int des3_set2key_enc( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 2] );
 
 /**
  * \brief          Triple-DES key schedule (112-bit, decryption)
@@ -142,7 +175,8 @@ int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE *
  *
  * \return         0
  */
-int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] );
+int des3_set2key_dec( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 2] );
 
 /**
  * \brief          Triple-DES key schedule (168-bit, encryption)
@@ -152,7 +186,8 @@ int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE *
  *
  * \return         0
  */
-int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
+int des3_set3key_enc( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 3] );
 
 /**
  * \brief          Triple-DES key schedule (168-bit, decryption)
@@ -162,7 +197,8 @@ int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE *
  *
  * \return         0
  */
-int des3_set3key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] );
+int des3_set3key_dec( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 3] );
 
 /**
  * \brief          DES-ECB block encryption/decryption
@@ -177,6 +213,7 @@ int des_crypt_ecb( des_context *ctx,
                     const unsigned char input[8],
                     unsigned char output[8] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          DES-CBC buffer encryption/decryption
  *
@@ -193,6 +230,7 @@ int des_crypt_cbc( des_context *ctx,
                     unsigned char iv[8],
                     const unsigned char *input,
                     unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 /**
  * \brief          3DES-ECB block encryption/decryption
@@ -207,6 +245,7 @@ int des3_crypt_ecb( des3_context *ctx,
                      const unsigned char input[8],
                      unsigned char output[8] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          3DES-CBC buffer encryption/decryption
  *
@@ -225,6 +264,7 @@ int des3_crypt_cbc( des3_context *ctx,
                      unsigned char iv[8],
                      const unsigned char *input,
                      unsigned char *output );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/dhm.h b/Externals/polarssl/include/polarssl/dhm.h
index 48d926856d..064472f358 100644
--- a/Externals/polarssl/include/polarssl/dhm.h
+++ b/Externals/polarssl/include/polarssl/dhm.h
@@ -3,7 +3,7 @@
  *
  * \brief Diffie-Hellman-Merkle key exchange
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -38,8 +38,13 @@
 #define POLARSSL_ERR_DHM_READ_PUBLIC_FAILED                -0x3200  /**< Reading of the public values failed. */
 #define POLARSSL_ERR_DHM_MAKE_PUBLIC_FAILED                -0x3280  /**< Making of the public value failed. */
 #define POLARSSL_ERR_DHM_CALC_SECRET_FAILED                -0x3300  /**< Calculation of the DHM secret failed. */
+#define POLARSSL_ERR_DHM_INVALID_FORMAT                    -0x3380  /**< The ASN.1 data is not formatted correctly. */
+#define POLARSSL_ERR_DHM_MALLOC_FAILED                     -0x3400  /**< Allocation of memory failed. */
+#define POLARSSL_ERR_DHM_FILE_IO_ERROR                     -0x3480  /**< Read/write of file failed. */
 
 /**
+ * RFC 2409 defines a number of standardized Diffie-Hellman groups
+ * that can be used.
  * RFC 3526 defines a number of standardized Diffie-Hellman groups
  * for IKE.
  * RFC 5114 defines a number of standardized Diffie-Hellman groups
@@ -48,11 +53,22 @@
  * Some are included here for convenience.
  *
  * Included are:
+ *  RFC 2409 6.2.  1024-bit MODP Group (Second Oakley Group)
  *  RFC 3526 3.    2048-bit MODP Group
  *  RFC 3526 4.    3072-bit MODP Group
  *  RFC 5114 2.1.  1024-bit MODP Group with 160-bit Prime Order Subgroup
  *  RFC 5114 2.2.  2048-bit MODP Group with 224-bit Prime Order Subgroup
  */
+#define POLARSSL_DHM_RFC2409_MODP_1024_P               \
+    "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
+    "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
+    "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \
+    "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \
+    "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \
+    "FFFFFFFFFFFFFFFF"
+
+#define POLARSSL_DHM_RFC2409_MODP_1024_G          "02"
+
 #define POLARSSL_DHM_RFC3526_MODP_2048_P               \
     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
     "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
@@ -130,6 +146,10 @@
     "EDFE72FE9B6AA4BD7B5A0F1C71CFFF4C19C418E1F6EC0179"\
     "81BC087F2A7065B384B890D3191F2BFA"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          DHM context structure
  */
@@ -143,12 +163,18 @@ typedef struct
     mpi GY;     /*!<  peer = G^Y mod P  */
     mpi K;      /*!<  key = GY^X mod P  */
     mpi RP;     /*!<  cached R^2 mod P  */
+    mpi Vi;     /*!<  blinding value    */
+    mpi Vf;     /*!<  un-blinding value */
+    mpi pX;     /*!<  previous X        */
 }
 dhm_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize DHM context
+ *
+ * \param ctx      DHM context to be initialized
+ */
+void dhm_init( dhm_context *ctx );
 
 /**
  * \brief          Parse the ServerKeyExchange parameters
@@ -218,18 +244,59 @@ int dhm_make_public( dhm_context *ctx, int x_size,
  *
  * \param ctx      DHM context
  * \param output   destination buffer
- * \param olen     number of chars written
+ * \param olen     on entry, must hold the size of the destination buffer
+ *                 on exit, holds the actual number of bytes written
+ * \param f_rng    RNG function, for blinding purposes
+ * \param p_rng    RNG parameter
  *
  * \return         0 if successful, or an POLARSSL_ERR_DHM_XXX error code
+ *
+ * \note           If non-NULL, f_rng is used to blind the input as
+ *                 countermeasure against timing attacks. Blinding is
+ *                 automatically used if and only if our secret value X is
+ *                 re-used and costs nothing otherwise, so it is recommended
+ *                 to always pass a non-NULL f_rng argument.
  */
 int dhm_calc_secret( dhm_context *ctx,
-                     unsigned char *output, size_t *olen );
+                     unsigned char *output, size_t *olen,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
 
 /**
- * \brief          Free the components of a DHM key
+ * \brief          Free and clear the components of a DHM key
+ *
+ * \param ctx      DHM context to free and clear
  */
 void dhm_free( dhm_context *ctx );
 
+#if defined(POLARSSL_ASN1_PARSE_C)
+/** \ingroup x509_module */
+/**
+ * \brief          Parse DHM parameters
+ *
+ * \param dhm      DHM context to be initialized
+ * \param dhmin    input buffer
+ * \param dhminlen size of the buffer
+ *
+ * \return         0 if successful, or a specific DHM or PEM error code
+ */
+int dhm_parse_dhm( dhm_context *dhm, const unsigned char *dhmin,
+                   size_t dhminlen );
+
+#if defined(POLARSSL_FS_IO)
+/** \ingroup x509_module */
+/**
+ * \brief          Load and parse DHM parameters
+ *
+ * \param dhm      DHM context to be initialized
+ * \param path     filename to read the DHM Parameters from
+ *
+ * \return         0 if successful, or a specific DHM or PEM error code
+ */
+int dhm_parse_dhmfile( dhm_context *dhm, const char *path );
+#endif /* POLARSSL_FS_IO */
+#endif /* POLARSSL_ASN1_PARSE_C */
+
 /**
  * \brief          Checkup routine
  *
@@ -241,4 +308,4 @@ int dhm_self_test( int verbose );
 }
 #endif
 
-#endif
+#endif /* dhm.h */
diff --git a/Externals/polarssl/include/polarssl/ecdh.h b/Externals/polarssl/include/polarssl/ecdh.h
new file mode 100644
index 0000000000..525cade982
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ecdh.h
@@ -0,0 +1,225 @@
+/**
+ * \file ecdh.h
+ *
+ * \brief Elliptic curve Diffie-Hellman
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_ECDH_H
+#define POLARSSL_ECDH_H
+
+#include "ecp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * When importing from an EC key, select if it is our key or the peer's key
+ */
+typedef enum
+{
+    POLARSSL_ECDH_OURS,
+    POLARSSL_ECDH_THEIRS,
+} ecdh_side;
+
+/**
+ * \brief           ECDH context structure
+ */
+typedef struct
+{
+    ecp_group grp;      /*!<  elliptic curve used                           */
+    mpi d;              /*!<  our secret value (private key)                */
+    ecp_point Q;        /*!<  our public value (public key)                 */
+    ecp_point Qp;       /*!<  peer's public value (public key)              */
+    mpi z;              /*!<  shared secret                                 */
+    int point_format;   /*!<  format for point export in TLS messages       */
+    ecp_point Vi;       /*!<  blinding value (for later)                    */
+    ecp_point Vf;       /*!<  un-blinding value (for later)                 */
+    mpi _d;             /*!<  previous d (for later)                        */
+}
+ecdh_context;
+
+/**
+ * \brief           Generate a public key.
+ *                  Raw function that only does the core computation.
+ *
+ * \param grp       ECP group
+ * \param d         Destination MPI (secret exponent, aka private key)
+ * \param Q         Destination point (public key)
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ */
+int ecdh_gen_public( ecp_group *grp, mpi *d, ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
+
+/**
+ * \brief           Compute shared secret
+ *                  Raw function that only does the core computation.
+ *
+ * \param grp       ECP group
+ * \param z         Destination MPI (shared secret)
+ * \param Q         Public key from other party
+ * \param d         Our secret exponent (private key)
+ * \param f_rng     RNG function (see notes)
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ *
+ * \note            If f_rng is not NULL, it is used to implement
+ *                  countermeasures against potential elaborate timing
+ *                  attacks, see \c ecp_mul() for details.
+ */
+int ecdh_compute_shared( ecp_group *grp, mpi *z,
+                         const ecp_point *Q, const mpi *d,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng );
+
+/**
+ * \brief           Initialize context
+ *
+ * \param ctx       Context to initialize
+ */
+void ecdh_init( ecdh_context *ctx );
+
+/**
+ * \brief           Free context
+ *
+ * \param ctx       Context to free
+ */
+void ecdh_free( ecdh_context *ctx );
+
+/**
+ * \brief           Generate a public key and a TLS ServerKeyExchange payload.
+ *                  (First function used by a TLS server for ECDHE.)
+ *
+ * \param ctx       ECDH context
+ * \param olen      number of chars written
+ * \param buf       destination buffer
+ * \param blen      length of buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            This function assumes that ctx->grp has already been
+ *                  properly set (for example using ecp_use_known_dp).
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_make_params( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng );
+
+/**
+ * \brief           Parse and procress a TLS ServerKeyExhange payload.
+ *                  (First function used by a TLS client for ECDHE.)
+ *
+ * \param ctx       ECDH context
+ * \param buf       pointer to start of input buffer
+ * \param end       one past end of buffer
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_read_params( ecdh_context *ctx,
+                      const unsigned char **buf, const unsigned char *end );
+
+/**
+ * \brief           Setup an ECDH context from an EC key.
+ *                  (Used by clients and servers in place of the
+ *                  ServerKeyEchange for static ECDH: import ECDH parameters
+ *                  from a certificate's EC key information.)
+ *
+ * \param ctx       ECDH constext to set
+ * \param key       EC key to use
+ * \param side      Is it our key (1) or the peer's key (0) ?
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_get_params( ecdh_context *ctx, const ecp_keypair *key,
+                     ecdh_side side );
+
+/**
+ * \brief           Generate a public key and a TLS ClientKeyExchange payload.
+ *                  (Second function used by a TLS client for ECDH(E).)
+ *
+ * \param ctx       ECDH context
+ * \param olen      number of bytes actually written
+ * \param buf       destination buffer
+ * \param blen      size of destination buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_make_public( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng );
+
+/**
+ * \brief           Parse and process a TLS ClientKeyExchange payload.
+ *                  (Second function used by a TLS server for ECDH(E).)
+ *
+ * \param ctx       ECDH context
+ * \param buf       start of input buffer
+ * \param blen      length of input buffer
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_read_public( ecdh_context *ctx,
+                      const unsigned char *buf, size_t blen );
+
+/**
+ * \brief           Derive and export the shared secret.
+ *                  (Last function used by both TLS client en servers.)
+ *
+ * \param ctx       ECDH context
+ * \param olen      number of bytes written
+ * \param buf       destination buffer
+ * \param blen      buffer length
+ * \param f_rng     RNG function, see notes for \c ecdh_compute_shared()
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful, or an POLARSSL_ERR_ECP_XXX error code
+ */
+int ecdh_calc_secret( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int ecdh_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ecdh.h */
diff --git a/Externals/polarssl/include/polarssl/ecdsa.h b/Externals/polarssl/include/polarssl/ecdsa.h
new file mode 100644
index 0000000000..d99a17a289
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ecdsa.h
@@ -0,0 +1,236 @@
+/**
+ * \file ecdsa.h
+ *
+ * \brief Elliptic curve DSA
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_ECDSA_H
+#define POLARSSL_ECDSA_H
+
+#include "ecp.h"
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+#include "md.h"
+#endif
+
+/**
+ * \brief           ECDSA context structure
+ *
+ * \note Purposefully begins with the same members as struct ecp_keypair.
+ */
+typedef struct
+{
+    ecp_group grp;      /*!<  elliptic curve used           */
+    mpi d;              /*!<  secret signature key          */
+    ecp_point Q;        /*!<  public signature key          */
+    mpi r;              /*!<  first integer from signature  */
+    mpi s;              /*!<  second integer from signature */
+}
+ecdsa_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief           Compute ECDSA signature of a previously hashed message
+ *
+ * \param grp       ECP group
+ * \param r         First output integer
+ * \param s         Second output integer
+ * \param d         Private signing key
+ * \param buf       Message hash
+ * \param blen      Length of buf
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ */
+int ecdsa_sign( ecp_group *grp, mpi *r, mpi *s,
+                const mpi *d, const unsigned char *buf, size_t blen,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+/**
+ * \brief           Compute ECDSA signature of a previously hashed message
+ *                  (deterministic version)
+ *
+ * \param grp       ECP group
+ * \param r         First output integer
+ * \param s         Second output integer
+ * \param d         Private signing key
+ * \param buf       Message hash
+ * \param blen      Length of buf
+ * \param md_alg    MD algorithm used to hash the message
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ */
+int ecdsa_sign_det( ecp_group *grp, mpi *r, mpi *s,
+                    const mpi *d, const unsigned char *buf, size_t blen,
+                    md_type_t md_alg );
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+
+/**
+ * \brief           Verify ECDSA signature of a previously hashed message
+ *
+ * \param grp       ECP group
+ * \param buf       Message hash
+ * \param blen      Length of buf
+ * \param Q         Public key to use for verification
+ * \param r         First integer of the signature
+ * \param s         Second integer of the signature
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_ECP_BAD_INPUT_DATA if signature is invalid
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ */
+int ecdsa_verify( ecp_group *grp,
+                  const unsigned char *buf, size_t blen,
+                  const ecp_point *Q, const mpi *r, const mpi *s);
+
+/**
+ * \brief           Compute ECDSA signature and write it to buffer,
+ *                  serialized as defined in RFC 4492 page 20.
+ *                  (Not thread-safe to use same context in multiple threads)
+ *
+ * \param ctx       ECDSA context
+ * \param hash      Message hash
+ * \param hlen      Length of hash
+ * \param sig       Buffer that will hold the signature
+ * \param slen      Length of the signature written
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            The "sig" buffer must be at least as large as twice the
+ *                  size of the curve used, plus 7 (eg. 71 bytes if a 256-bit
+ *                  curve is used).
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP, POLARSSL_ERR_MPI or
+ *                  POLARSSL_ERR_ASN1 error code
+ */
+int ecdsa_write_signature( ecdsa_context *ctx,
+                           const unsigned char *hash, size_t hlen,
+                           unsigned char *sig, size_t *slen,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng );
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+/**
+ * \brief           Compute ECDSA signature and write it to buffer,
+ *                  serialized as defined in RFC 4492 page 20.
+ *                  Deterministic version, RFC 6979.
+ *                  (Not thread-safe to use same context in multiple threads)
+ *
+ * \param ctx       ECDSA context
+ * \param hash      Message hash
+ * \param hlen      Length of hash
+ * \param sig       Buffer that will hold the signature
+ * \param slen      Length of the signature written
+ * \param md_alg    MD algorithm used to hash the message
+ *
+ * \note            The "sig" buffer must be at least as large as twice the
+ *                  size of the curve used, plus 7 (eg. 71 bytes if a 256-bit
+ *                  curve is used).
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP, POLARSSL_ERR_MPI or
+ *                  POLARSSL_ERR_ASN1 error code
+ */
+int ecdsa_write_signature_det( ecdsa_context *ctx,
+                               const unsigned char *hash, size_t hlen,
+                               unsigned char *sig, size_t *slen,
+                               md_type_t md_alg );
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+
+/**
+ * \brief           Read and verify an ECDSA signature
+ *
+ * \param ctx       ECDSA context
+ * \param hash      Message hash
+ * \param hlen      Size of hash
+ * \param sig       Signature to read and verify
+ * \param slen      Size of sig
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_ECP_BAD_INPUT_DATA if signature is invalid,
+ *                  POLARSSL_ERR_ECP_SIG_LEN_MISTMATCH if the signature is
+ *                  valid but its actual length is less than siglen,
+ *                  or a POLARSSL_ERR_ECP or POLARSSL_ERR_MPI error code
+ */
+int ecdsa_read_signature( ecdsa_context *ctx,
+                          const unsigned char *hash, size_t hlen,
+                          const unsigned char *sig, size_t slen );
+
+/**
+ * \brief           Generate an ECDSA keypair on the given curve
+ *
+ * \param ctx       ECDSA context in which the keypair should be stored
+ * \param gid       Group (elliptic curve) to use. One of the various
+ *                  POLARSSL_ECP_DP_XXX macros depending on configuration.
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 on success, or a POLARSSL_ERR_ECP code.
+ */
+int ecdsa_genkey( ecdsa_context *ctx, ecp_group_id gid,
+                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Set an ECDSA context from an EC key pair
+ *
+ * \param ctx       ECDSA context to set
+ * \param key       EC key to use
+ *
+ * \return          0 on success, or a POLARSSL_ERR_ECP code.
+ */
+int ecdsa_from_keypair( ecdsa_context *ctx, const ecp_keypair *key );
+
+/**
+ * \brief           Initialize context
+ *
+ * \param ctx       Context to initialize
+ */
+void ecdsa_init( ecdsa_context *ctx );
+
+/**
+ * \brief           Free context
+ *
+ * \param ctx       Context to free
+ */
+void ecdsa_free( ecdsa_context *ctx );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int ecdsa_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ecdsa.h */
diff --git a/Externals/polarssl/include/polarssl/ecp.h b/Externals/polarssl/include/polarssl/ecp.h
new file mode 100644
index 0000000000..7192f1e6c3
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ecp.h
@@ -0,0 +1,651 @@
+/**
+ * \file ecp.h
+ *
+ * \brief Elliptic curves over GF(p)
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_ECP_H
+#define POLARSSL_ECP_H
+
+#include "bignum.h"
+
+/*
+ * ECP error codes
+ */
+#define POLARSSL_ERR_ECP_BAD_INPUT_DATA                    -0x4F80  /**< Bad input parameters to function. */
+#define POLARSSL_ERR_ECP_BUFFER_TOO_SMALL                  -0x4F00  /**< The buffer is too small to write to. */
+#define POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE               -0x4E80  /**< Requested curve not available. */
+#define POLARSSL_ERR_ECP_VERIFY_FAILED                     -0x4E00  /**< The signature is not valid. */
+#define POLARSSL_ERR_ECP_MALLOC_FAILED                     -0x4D80  /**< Memory allocation failed. */
+#define POLARSSL_ERR_ECP_RANDOM_FAILED                     -0x4D00  /**< Generation of random value, such as (ephemeral) key, failed. */
+#define POLARSSL_ERR_ECP_INVALID_KEY                       -0x4C80  /**< Invalid private or public key. */
+#define POLARSSL_ERR_ECP_SIG_LEN_MISMATCH                  -0x4C00  /**< Signature is valid but shorter than the user-supplied length. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Domain parameters (curve, subgroup and generator) identifiers.
+ *
+ * Only curves over prime fields are supported.
+ *
+ * \warning This library does not support validation of arbitrary domain
+ * parameters. Therefore, only well-known domain parameters from trusted
+ * sources should be used. See ecp_use_known_dp().
+ */
+typedef enum
+{
+    POLARSSL_ECP_DP_NONE = 0,
+    POLARSSL_ECP_DP_SECP192R1,      /*!< 192-bits NIST curve  */
+    POLARSSL_ECP_DP_SECP224R1,      /*!< 224-bits NIST curve  */
+    POLARSSL_ECP_DP_SECP256R1,      /*!< 256-bits NIST curve  */
+    POLARSSL_ECP_DP_SECP384R1,      /*!< 384-bits NIST curve  */
+    POLARSSL_ECP_DP_SECP521R1,      /*!< 521-bits NIST curve  */
+    POLARSSL_ECP_DP_BP256R1,        /*!< 256-bits Brainpool curve */
+    POLARSSL_ECP_DP_BP384R1,        /*!< 384-bits Brainpool curve */
+    POLARSSL_ECP_DP_BP512R1,        /*!< 512-bits Brainpool curve */
+    POLARSSL_ECP_DP_M221,           /*!< (not implemented yet)    */
+    POLARSSL_ECP_DP_M255,           /*!< Curve25519               */
+    POLARSSL_ECP_DP_M383,           /*!< (not implemented yet)    */
+    POLARSSL_ECP_DP_M511,           /*!< (not implemented yet)    */
+    POLARSSL_ECP_DP_SECP192K1,      /*!< 192-bits "Koblitz" curve */
+    POLARSSL_ECP_DP_SECP224K1,      /*!< 224-bits "Koblitz" curve */
+    POLARSSL_ECP_DP_SECP256K1,      /*!< 256-bits "Koblitz" curve */
+} ecp_group_id;
+
+/**
+ * Number of supported curves (plus one for NONE).
+ *
+ * (Montgomery curves excluded for now.)
+ */
+#define POLARSSL_ECP_DP_MAX     12
+
+/**
+ * Curve information for use by other modules
+ */
+typedef struct
+{
+    ecp_group_id grp_id;    /*!< Internal identifier        */
+    uint16_t tls_id;        /*!< TLS NamedCurve identifier  */
+    uint16_t size;          /*!< Curve size in bits         */
+    const char *name;       /*!< Human-friendly name        */
+} ecp_curve_info;
+
+/**
+ * \brief           ECP point structure (jacobian coordinates)
+ *
+ * \note            All functions expect and return points satisfying
+ *                  the following condition: Z == 0 or Z == 1. (Other
+ *                  values of Z are used by internal functions only.)
+ *                  The point is zero, or "at infinity", if Z == 0.
+ *                  Otherwise, X and Y are its standard (affine) coordinates.
+ */
+typedef struct
+{
+    mpi X;          /*!<  the point's X coordinate  */
+    mpi Y;          /*!<  the point's Y coordinate  */
+    mpi Z;          /*!<  the point's Z coordinate  */
+}
+ecp_point;
+
+/**
+ * \brief           ECP group structure
+ *
+ * We consider two types of curves equations:
+ * 1. Short Weierstrass y^2 = x^3 + A x + B     mod P   (SEC1 + RFC 4492)
+ * 2. Montgomery,       y^2 = x^3 + A x^2 + x   mod P   (M255 + draft)
+ * In both cases, a generator G for a prime-order subgroup is fixed. In the
+ * short weierstrass, this subgroup is actually the whole curve, and its
+ * cardinal is denoted by N.
+ *
+ * In the case of Short Weierstrass curves, our code requires that N is an odd
+ * prime. (Use odd in ecp_mul() and prime in ecdsa_sign() for blinding.)
+ *
+ * In the case of Montgomery curves, we don't store A but (A + 2) / 4 which is
+ * the quantity actually used in the formulas. Also, nbits is not the size of N
+ * but the required size for private keys.
+ *
+ * If modp is NULL, reduction modulo P is done using a generic algorithm.
+ * Otherwise, it must point to a function that takes an mpi in the range
+ * 0..2^(2*pbits)-1 and transforms it in-place in an integer of little more
+ * than pbits, so that the integer may be efficiently brought in the 0..P-1
+ * range by a few additions or substractions. It must return 0 on success and
+ * non-zero on failure.
+ */
+typedef struct
+{
+    ecp_group_id id;    /*!<  internal group identifier                     */
+    mpi P;              /*!<  prime modulus of the base field               */
+    mpi A;              /*!<  1. A in the equation, or 2. (A + 2) / 4       */
+    mpi B;              /*!<  1. B in the equation, or 2. unused            */
+    ecp_point G;        /*!<  generator of the (sub)group used              */
+    mpi N;              /*!<  1. the order of G, or 2. unused               */
+    size_t pbits;       /*!<  number of bits in P                           */
+    size_t nbits;       /*!<  number of bits in 1. P, or 2. private keys    */
+    unsigned int h;     /*!<  internal: 1 if the constants are static       */
+    int (*modp)(mpi *); /*!<  function for fast reduction mod P             */
+    int (*t_pre)(ecp_point *, void *);  /*!< unused                         */
+    int (*t_post)(ecp_point *, void *); /*!< unused                         */
+    void *t_data;                       /*!< unused                         */
+    ecp_point *T;       /*!<  pre-computed points for ecp_mul_comb()        */
+    size_t T_size;      /*!<  number for pre-computed points                */
+}
+ecp_group;
+
+/**
+ * \brief           ECP key pair structure
+ *
+ * A generic key pair that could be used for ECDSA, fixed ECDH, etc.
+ *
+ * \note Members purposefully in the same order as struc ecdsa_context.
+ */
+typedef struct
+{
+    ecp_group grp;      /*!<  Elliptic curve and base point     */
+    mpi d;              /*!<  our secret value                  */
+    ecp_point Q;        /*!<  our public value                  */
+}
+ecp_keypair;
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(POLARSSL_ECP_MAX_BITS)
+/**
+ * Maximum size of the groups (that is, of N and P)
+ */
+#define POLARSSL_ECP_MAX_BITS     521   /**< Maximum bit size of groups */
+#endif
+
+#define POLARSSL_ECP_MAX_BYTES    ( ( POLARSSL_ECP_MAX_BITS + 7 ) / 8 )
+#define POLARSSL_ECP_MAX_PT_LEN   ( 2 * POLARSSL_ECP_MAX_BYTES + 1 )
+
+#if !defined(POLARSSL_ECP_WINDOW_SIZE)
+/*
+ * Maximum "window" size used for point multiplication.
+ * Default: 6.
+ * Minimum value: 2. Maximum value: 7.
+ *
+ * Result is an array of at most ( 1 << ( POLARSSL_ECP_WINDOW_SIZE - 1 ) )
+ * points used for point multiplication. This value is directly tied to EC
+ * peak memory usage, so decreasing it by one should roughly cut memory usage
+ * by two (if large curves are in use).
+ *
+ * Reduction in size may reduce speed, but larger curves are impacted first.
+ * Sample performances (in ECDHE handshakes/s, with FIXED_POINT_OPTIM = 1):
+ *      w-size:     6       5       4       3       2
+ *      521       145     141     135     120      97
+ *      384       214     209     198     177     146
+ *      256       320     320     303     262     226
+
+ *      224       475     475     453     398     342
+ *      192       640     640     633     587     476
+ */
+#define POLARSSL_ECP_WINDOW_SIZE    6   /**< Maximum window size used */
+#endif /* POLARSSL_ECP_WINDOW_SIZE */
+
+#if !defined(POLARSSL_ECP_FIXED_POINT_OPTIM)
+/*
+ * Trade memory for speed on fixed-point multiplication.
+ *
+ * This speeds up repeated multiplication of the generator (that is, the
+ * multiplication in ECDSA signatures, and half of the multiplications in
+ * ECDSA verification and ECDHE) by a factor roughly 3 to 4.
+ *
+ * The cost is increasing EC peak memory usage by a factor roughly 2.
+ *
+ * Change this value to 0 to reduce peak memory usage.
+ */
+#define POLARSSL_ECP_FIXED_POINT_OPTIM  1   /**< Enable fixed-point speed-up */
+#endif /* POLARSSL_ECP_FIXED_POINT_OPTIM */
+
+/* \} name SECTION: Module settings */
+
+/*
+ * Point formats, from RFC 4492's enum ECPointFormat
+ */
+#define POLARSSL_ECP_PF_UNCOMPRESSED    0   /**< Uncompressed point format */
+#define POLARSSL_ECP_PF_COMPRESSED      1   /**< Compressed point format */
+
+/*
+ * Some other constants from RFC 4492
+ */
+#define POLARSSL_ECP_TLS_NAMED_CURVE    3   /**< ECCurveType's named_curve */
+
+/**
+ * \brief           Get the list of supported curves in order of preferrence
+ *                  (full information)
+ *
+ * \return          A statically allocated array, the last entry is 0.
+ */
+const ecp_curve_info *ecp_curve_list( void );
+
+/**
+ * \brief           Get the list of supported curves in order of preferrence
+ *                  (grp_id only)
+ *
+ * \return          A statically allocated array,
+ *                  terminated with POLARSSL_ECP_DP_NONE.
+ */
+const ecp_group_id *ecp_grp_id_list( void );
+
+/**
+ * \brief           Get curve information from an internal group identifier
+ *
+ * \param grp_id    A POLARSSL_ECP_DP_XXX value
+ *
+ * \return          The associated curve information or NULL
+ */
+const ecp_curve_info *ecp_curve_info_from_grp_id( ecp_group_id grp_id );
+
+/**
+ * \brief           Get curve information from a TLS NamedCurve value
+ *
+ * \param tls_id    A POLARSSL_ECP_DP_XXX value
+ *
+ * \return          The associated curve information or NULL
+ */
+const ecp_curve_info *ecp_curve_info_from_tls_id( uint16_t tls_id );
+
+/**
+ * \brief           Get curve information from a human-readable name
+ *
+ * \param name      The name
+ *
+ * \return          The associated curve information or NULL
+ */
+const ecp_curve_info *ecp_curve_info_from_name( const char *name );
+
+/**
+ * \brief           Initialize a point (as zero)
+ */
+void ecp_point_init( ecp_point *pt );
+
+/**
+ * \brief           Initialize a group (to something meaningless)
+ */
+void ecp_group_init( ecp_group *grp );
+
+/**
+ * \brief           Initialize a key pair (as an invalid one)
+ */
+void ecp_keypair_init( ecp_keypair *key );
+
+/**
+ * \brief           Free the components of a point
+ */
+void ecp_point_free( ecp_point *pt );
+
+/**
+ * \brief           Free the components of an ECP group
+ */
+void ecp_group_free( ecp_group *grp );
+
+/**
+ * \brief           Free the components of a key pair
+ */
+void ecp_keypair_free( ecp_keypair *key );
+
+/**
+ * \brief           Copy the contents of point Q into P
+ *
+ * \param P         Destination point
+ * \param Q         Source point
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ */
+int ecp_copy( ecp_point *P, const ecp_point *Q );
+
+/**
+ * \brief           Copy the contents of a group object
+ *
+ * \param dst       Destination group
+ * \param src       Source group
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ */
+int ecp_group_copy( ecp_group *dst, const ecp_group *src );
+
+/**
+ * \brief           Set a point to zero
+ *
+ * \param pt        Destination point
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ */
+int ecp_set_zero( ecp_point *pt );
+
+/**
+ * \brief           Tell if a point is zero
+ *
+ * \param pt        Point to test
+ *
+ * \return          1 if point is zero, 0 otherwise
+ */
+int ecp_is_zero( ecp_point *pt );
+
+/**
+ * \brief           Import a non-zero point from two ASCII strings
+ *
+ * \param P         Destination point
+ * \param radix     Input numeric base
+ * \param x         First affine coordinate as a null-terminated string
+ * \param y         Second affine coordinate as a null-terminated string
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_MPI_XXX error code
+ */
+int ecp_point_read_string( ecp_point *P, int radix,
+                           const char *x, const char *y );
+
+/**
+ * \brief           Export a point into unsigned binary data
+ *
+ * \param grp       Group to which the point should belong
+ * \param P         Point to export
+ * \param format    Point format, should be a POLARSSL_ECP_PF_XXX macro
+ * \param olen      Length of the actual output
+ * \param buf       Output buffer
+ * \param buflen    Length of the output buffer
+ *
+ * \return          0 if successful,
+ *                  or POLARSSL_ERR_ECP_BAD_INPUT_DATA
+ *                  or POLARSSL_ERR_ECP_BUFFER_TOO_SMALL
+ */
+int ecp_point_write_binary( const ecp_group *grp, const ecp_point *P,
+                            int format, size_t *olen,
+                            unsigned char *buf, size_t buflen );
+
+/**
+ * \brief           Import a point from unsigned binary data
+ *
+ * \param grp       Group to which the point should belong
+ * \param P         Point to import
+ * \param buf       Input buffer
+ * \param ilen      Actual length of input
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_ECP_BAD_INPUT_DATA if input is invalid,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed,
+ *                  POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE if the point format
+ *                  is not implemented.
+ *
+ * \note            This function does NOT check that the point actually
+ *                  belongs to the given group, see ecp_check_pubkey() for
+ *                  that.
+ */
+int ecp_point_read_binary( const ecp_group *grp, ecp_point *P,
+                           const unsigned char *buf, size_t ilen );
+
+/**
+ * \brief           Import a point from a TLS ECPoint record
+ *
+ * \param grp       ECP group used
+ * \param pt        Destination point
+ * \param buf       $(Start of input buffer)
+ * \param len       Buffer length
+ *
+ * \return          O if successful,
+ *                  POLARSSL_ERR_MPI_XXX if initialization failed
+ *                  POLARSSL_ERR_ECP_BAD_INPUT_DATA if input is invalid
+ */
+int ecp_tls_read_point( const ecp_group *grp, ecp_point *pt,
+                        const unsigned char **buf, size_t len );
+
+/**
+ * \brief           Export a point as a TLS ECPoint record
+ *
+ * \param grp       ECP group used
+ * \param pt        Point to export
+ * \param format    Export format
+ * \param olen      length of data written
+ * \param buf       Buffer to write to
+ * \param blen      Buffer length
+ *
+ * \return          0 if successful,
+ *                  or POLARSSL_ERR_ECP_BAD_INPUT_DATA
+ *                  or POLARSSL_ERR_ECP_BUFFER_TOO_SMALL
+ */
+int ecp_tls_write_point( const ecp_group *grp, const ecp_point *pt,
+                         int format, size_t *olen,
+                         unsigned char *buf, size_t blen );
+
+/**
+ * \brief           Import an ECP group from null-terminated ASCII strings
+ *
+ * \param grp       Destination group
+ * \param radix     Input numeric base
+ * \param p         Prime modulus of the base field
+ * \param b         Constant term in the equation
+ * \param gx        The generator's X coordinate
+ * \param gy        The generator's Y coordinate
+ * \param n         The generator's order
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_MPI_XXX error code
+ *
+ * \note            Sets all fields except modp.
+ */
+int ecp_group_read_string( ecp_group *grp, int radix,
+                           const char *p, const char *b,
+                           const char *gx, const char *gy, const char *n);
+
+/**
+ * \brief           Set a group using well-known domain parameters
+ *
+ * \param grp       Destination group
+ * \param index     Index in the list of well-known domain parameters
+ *
+ * \return          O if successful,
+ *                  POLARSSL_ERR_MPI_XXX if initialization failed
+ *                  POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE for unkownn groups
+ *
+ * \note            Index should be a value of RFC 4492's enum NamdeCurve,
+ *                  possibly in the form of a POLARSSL_ECP_DP_XXX macro.
+ */
+int ecp_use_known_dp( ecp_group *grp, ecp_group_id index );
+
+/**
+ * \brief           Set a group from a TLS ECParameters record
+ *
+ * \param grp       Destination group
+ * \param buf       &(Start of input buffer)
+ * \param len       Buffer length
+ *
+ * \return          O if successful,
+ *                  POLARSSL_ERR_MPI_XXX if initialization failed
+ *                  POLARSSL_ERR_ECP_BAD_INPUT_DATA if input is invalid
+ */
+int ecp_tls_read_group( ecp_group *grp, const unsigned char **buf, size_t len );
+
+/**
+ * \brief           Write the TLS ECParameters record for a group
+ *
+ * \param grp       ECP group used
+ * \param olen      Number of bytes actually written
+ * \param buf       Buffer to write to
+ * \param blen      Buffer length
+ *
+ * \return          0 if successful,
+ *                  or POLARSSL_ERR_ECP_BUFFER_TOO_SMALL
+ */
+int ecp_tls_write_group( const ecp_group *grp, size_t *olen,
+                         unsigned char *buf, size_t blen );
+
+/**
+ * \brief           Addition: R = P + Q
+ *
+ * \param grp       ECP group
+ * \param R         Destination point
+ * \param P         Left-hand point
+ * \param Q         Right-hand point
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ *
+ * \note            This function does not support Montgomery curves, such as
+ *                  Curve25519.
+ */
+int ecp_add( const ecp_group *grp, ecp_point *R,
+             const ecp_point *P, const ecp_point *Q );
+
+/**
+ * \brief           Subtraction: R = P - Q
+ *
+ * \param grp       ECP group
+ * \param R         Destination point
+ * \param P         Left-hand point
+ * \param Q         Right-hand point
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ *
+ * \note            This function does not support Montgomery curves, such as
+ *                  Curve25519.
+ */
+int ecp_sub( const ecp_group *grp, ecp_point *R,
+             const ecp_point *P, const ecp_point *Q );
+
+/**
+ * \brief           Multiplication by an integer: R = m * P
+ *                  (Not thread-safe to use same group in multiple threads)
+ *
+ * \param grp       ECP group
+ * \param R         Destination point
+ * \param m         Integer by which to multiply
+ * \param P         Point to multiply
+ * \param f_rng     RNG function (see notes)
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  POLARSSL_ERR_ECP_INVALID_KEY if m is not a valid privkey
+ *                  or P is not a valid pubkey,
+ *                  POLARSSL_ERR_MPI_MALLOC_FAILED if memory allocation failed
+ *
+ * \note            In order to prevent timing attacks, this function
+ *                  executes the exact same sequence of (base field)
+ *                  operations for any valid m. It avoids any if-branch or
+ *                  array index depending on the value of m.
+ *
+ * \note            If f_rng is not NULL, it is used to randomize intermediate
+ *                  results in order to prevent potential timing attacks
+ *                  targeting these results. It is recommended to always
+ *                  provide a non-NULL f_rng (the overhead is negligible).
+ */
+int ecp_mul( ecp_group *grp, ecp_point *R,
+             const mpi *m, const ecp_point *P,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Check that a point is a valid public key on this curve
+ *
+ * \param grp       Curve/group the point should belong to
+ * \param pt        Point to check
+ *
+ * \return          0 if point is a valid public key,
+ *                  POLARSSL_ERR_ECP_INVALID_KEY otherwise.
+ *
+ * \note            This function only checks the point is non-zero, has valid
+ *                  coordinates and lies on the curve, but not that it is
+ *                  indeed a multiple of G. This is additional check is more
+ *                  expensive, isn't required by standards, and shouldn't be
+ *                  necessary if the group used has a small cofactor. In
+ *                  particular, it is useless for the NIST groups which all
+ *                  have a cofactor of 1.
+ *
+ * \note            Uses bare components rather than an ecp_keypair structure
+ *                  in order to ease use with other structures such as
+ *                  ecdh_context of ecdsa_context.
+ */
+int ecp_check_pubkey( const ecp_group *grp, const ecp_point *pt );
+
+/**
+ * \brief           Check that an mpi is a valid private key for this curve
+ *
+ * \param grp       Group used
+ * \param d         Integer to check
+ *
+ * \return          0 if point is a valid private key,
+ *                  POLARSSL_ERR_ECP_INVALID_KEY otherwise.
+ *
+ * \note            Uses bare components rather than an ecp_keypair structure
+ *                  in order to ease use with other structures such as
+ *                  ecdh_context of ecdsa_context.
+ */
+int ecp_check_privkey( const ecp_group *grp, const mpi *d );
+
+/**
+ * \brief           Generate a keypair
+ *
+ * \param grp       ECP group
+ * \param d         Destination MPI (secret part)
+ * \param Q         Destination point (public part)
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ *
+ * \note            Uses bare components rather than an ecp_keypair structure
+ *                  in order to ease use with other structures such as
+ *                  ecdh_context of ecdsa_context.
+ */
+int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng );
+
+/**
+ * \brief           Generate a keypair
+ *
+ * \param grp_id    ECP group identifier
+ * \param key       Destination keypair
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 if successful,
+ *                  or a POLARSSL_ERR_ECP_XXX or POLARSSL_MPI_XXX error code
+ */
+int ecp_gen_key( ecp_group_id grp_id, ecp_keypair *key,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+#if defined(POLARSSL_SELF_TEST)
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int ecp_self_test( int verbose );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ecp.h */
diff --git a/Externals/polarssl/include/polarssl/entropy.h b/Externals/polarssl/include/polarssl/entropy.h
index 039f5cd6ba..f5fa92808f 100644
--- a/Externals/polarssl/include/polarssl/entropy.h
+++ b/Externals/polarssl/include/polarssl/entropy.h
@@ -3,7 +3,7 @@
  *
  * \brief Entropy accumulator implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,9 +29,26 @@
 
 #include <string.h>
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_SHA512_C) && !defined(POLARSSL_ENTROPY_FORCE_SHA256)
+#include "sha512.h"
+#define POLARSSL_ENTROPY_SHA512_ACCUMULATOR
+#else
+#if defined(POLARSSL_SHA256_C)
+#define POLARSSL_ENTROPY_SHA256_ACCUMULATOR
+#include "sha256.h"
+#endif
+#endif
+
+#if defined(POLARSSL_THREADING_C)
+#include "threading.h"
+#endif
 
-#include "sha4.h"
 #if defined(POLARSSL_HAVEGE_C)
 #include "havege.h"
 #endif
@@ -39,14 +56,33 @@
 #define POLARSSL_ERR_ENTROPY_SOURCE_FAILED                 -0x003C  /**< Critical entropy source failure. */
 #define POLARSSL_ERR_ENTROPY_MAX_SOURCES                   -0x003E  /**< No more sources can be added. */
 #define POLARSSL_ERR_ENTROPY_NO_SOURCES_DEFINED            -0x0040  /**< No sources have been added to poll. */
+#define POLARSSL_ERR_ENTROPY_FILE_IO_ERROR                 -0x0058  /**< Read/write error in file. */
 
-#if !defined(POLARSSL_CONFIG_OPTIONS)
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(ENTROPY_MAX_SOURCES)
 #define ENTROPY_MAX_SOURCES     20      /**< Maximum number of sources supported */
+#endif
+
+#if !defined(ENTROPY_MAX_GATHER)
 #define ENTROPY_MAX_GATHER      128     /**< Maximum amount requested from entropy sources */
-#endif /* !POLARSSL_CONFIG_OPTIONS  */
+#endif
 
+/* \} name SECTION: Module settings */
+
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
 #define ENTROPY_BLOCK_SIZE      64      /**< Block size of entropy accumulator (SHA-512) */
+#else
+#define ENTROPY_BLOCK_SIZE      32      /**< Block size of entropy accumulator (SHA-256) */
+#endif
 
+#define ENTROPY_MAX_SEED_SIZE   1024    /**< Maximum size of seed we read from seed file */
 #define ENTROPY_SOURCE_MANUAL   ENTROPY_MAX_SOURCES
 
 #ifdef __cplusplus
@@ -64,7 +100,8 @@ extern "C" {
  * \return          0 if no critical failures occurred,
  *                  POLARSSL_ERR_ENTROPY_SOURCE_FAILED otherwise
  */
-typedef int (*f_source_ptr)(void *, unsigned char *, size_t, size_t *);
+typedef int (*f_source_ptr)(void *data, unsigned char *output, size_t len,
+                            size_t *olen);
 
 /**
  * \brief           Entropy source state
@@ -81,14 +118,21 @@ source_state;
 /**
  * \brief           Entropy context structure
  */
-typedef struct 
+typedef struct
 {
-    sha4_context    accumulator;
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
+    sha512_context  accumulator;
+#else
+    sha256_context  accumulator;
+#endif
     int             source_count;
     source_state    source[ENTROPY_MAX_SOURCES];
 #if defined(POLARSSL_HAVEGE_C)
     havege_state    havege_data;
 #endif
+#if defined(POLARSSL_THREADING_C)
+    threading_mutex_t mutex;    /*!< mutex                  */
+#endif
 }
 entropy_context;
 
@@ -99,8 +143,16 @@ entropy_context;
  */
 void entropy_init( entropy_context *ctx );
 
+/**
+ * \brief           Free the data in the context
+ *
+ * \param ctx       Entropy context to free
+ */
+void entropy_free( entropy_context *ctx );
+
 /**
  * \brief           Adds an entropy source to poll
+ *                  (Thread-safe if POLARSSL_THREADING_C is enabled)
  *
  * \param ctx       Entropy context
  * \param f_source  Entropy function
@@ -116,6 +168,7 @@ int entropy_add_source( entropy_context *ctx,
 
 /**
  * \brief           Trigger an extra gather poll for the accumulator
+ *                  (Thread-safe if POLARSSL_THREADING_C is enabled)
  *
  * \param ctx       Entropy context
  *
@@ -124,11 +177,13 @@ int entropy_add_source( entropy_context *ctx,
 int entropy_gather( entropy_context *ctx );
 
 /**
- * \brief           Retrieve entropy from the accumulator (Max ENTROPY_BLOCK_SIZE)
+ * \brief           Retrieve entropy from the accumulator
+ *                  (Maximum length: ENTROPY_BLOCK_SIZE)
+ *                  (Thread-safe if POLARSSL_THREADING_C is enabled)
  *
  * \param data      Entropy context
  * \param output    Buffer to fill
- * \param len       Length of buffer
+ * \param len       Number of bytes desired, must be at most ENTROPY_BLOCK_SIZE
  *
  * \return          0 if successful, or POLARSSL_ERR_ENTROPY_SOURCE_FAILED
  */
@@ -136,7 +191,8 @@ int entropy_func( void *data, unsigned char *output, size_t len );
 
 /**
  * \brief           Add data to the accumulator manually
- * 
+ *                  (Thread-safe if POLARSSL_THREADING_C is enabled)
+ *
  * \param ctx       Entropy context
  * \param data      Data to add
  * \param len       Length of data
@@ -146,6 +202,43 @@ int entropy_func( void *data, unsigned char *output, size_t len );
 int entropy_update_manual( entropy_context *ctx,
                            const unsigned char *data, size_t len );
 
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief               Write a seed file
+ *
+ * \param ctx           Entropy context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful,
+ *                      POLARSSL_ERR_ENTROPY_FILE_IO_ERROR on file error, or
+ *                      POLARSSL_ERR_ENTROPY_SOURCE_FAILED
+ */
+int entropy_write_seed_file( entropy_context *ctx, const char *path );
+
+/**
+ * \brief               Read and update a seed file. Seed is added to this
+ *                      instance. No more than ENTROPY_MAX_SEED_SIZE bytes are
+ *                      read from the seed file. The rest is ignored.
+ *
+ * \param ctx           Entropy context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful,
+ *                      POLARSSL_ERR_ENTROPY_FILE_IO_ERROR on file error,
+ *                      POLARSSL_ERR_ENTROPY_SOURCE_FAILED
+ */
+int entropy_update_seed_file( entropy_context *ctx, const char *path );
+#endif /* POLARSSL_FS_IO */
+
+#if defined(POLARSSL_SELF_TEST)
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int entropy_self_test( int verbose );
+#endif /* POLARSSL_SELF_TEST */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/entropy_poll.h b/Externals/polarssl/include/polarssl/entropy_poll.h
index 0116598290..92efa0045b 100644
--- a/Externals/polarssl/include/polarssl/entropy_poll.h
+++ b/Externals/polarssl/include/polarssl/entropy_poll.h
@@ -29,7 +29,11 @@
 
 #include <string.h>
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Externals/polarssl/include/polarssl/error.h b/Externals/polarssl/include/polarssl/error.h
index 94c73a8f2d..cdee952e06 100644
--- a/Externals/polarssl/include/polarssl/error.h
+++ b/Externals/polarssl/include/polarssl/error.h
@@ -3,7 +3,7 @@
  *
  * \brief Error to string translation
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -41,49 +41,60 @@
  *
  * 16 bit error code bit-segmentation
  *
- * 1 bit  - Intentionally not used
+ * 1 bit  - Sign bit
  * 3 bits - High level module ID
  * 5 bits - Module-dependent error code
- * 6 bits - Low level module errors
- * 1 bit  - Intentionally not used
+ * 7 bits - Low level module errors
  *
- * Low-level module errors (0x007E-0x0002)
+ * For historical reasons, low-level error codes are divided in even and odd,
+ * even codes were assigned first, and -1 is reserved for other errors.
  *
- * Module   Nr  Codes assigned 
+ * Low-level module errors (0x0002-0x007E, 0x0003-0x007F)
+ *
+ * Module   Nr  Codes assigned
  * MPI       7  0x0002-0x0010
  * GCM       2  0x0012-0x0014
  * BLOWFISH  2  0x0016-0x0018
+ * THREADING 3  0x001A-0x001E
  * AES       2  0x0020-0x0022
  * CAMELLIA  2  0x0024-0x0026
  * XTEA      1  0x0028-0x0028
  * BASE64    2  0x002A-0x002C
+ * OID       1  0x002E-0x002E   0x000B-0x000B
  * PADLOCK   1  0x0030-0x0030
  * DES       1  0x0032-0x0032
- * CTR_DBRG  3  0x0034-0x003A
+ * CTR_DBRG  4  0x0034-0x003A
  * ENTROPY   3  0x003C-0x0040
  * NET      11  0x0042-0x0056
+ * ENTROPY   1  0x0058-0x0058
  * ASN1      7  0x0060-0x006C
  * MD2       1  0x0070-0x0070
  * MD4       1  0x0072-0x0072
  * MD5       1  0x0074-0x0074
  * SHA1      1  0x0076-0x0076
- * SHA2      1  0x0078-0x0078
- * SHA4      1  0x007A-0x007A
+ * SHA256    1  0x0078-0x0078
+ * SHA512    1  0x007A-0x007A
+ * PBKDF2    1  0x007C-0x007C
+ * RIPEMD160 1  0x007E-0x007E
+ * HMAC_DRBG 4  0x0003-0x0009
+ * CCM       2                  0x000D-0x000F
  *
- * High-level module nr (3 bits - 0x1...-0x8...)
- * Name     ID  Nr of Errors
- * PEM      1   9
- * PKCS#12  1   4 (Started from top)
- * X509     2   23
- * DHM      3   6
- * PKCS5    3   4 (Started from top)
- * RSA      4   9
- * MD       5   4
- * CIPHER   6   5
- * SSL      6   2 (Started from top)
- * SSL      7   31
+ * High-level module nr (3 bits - 0x0...-0x7...)
+ * Name      ID  Nr of Errors
+ * PEM       1   9
+ * PKCS#12   1   4 (Started from top)
+ * X509      2   18
+ * PK        2   14 (Started from top, plus 0x2000)
+ * DHM       3   9
+ * PKCS5     3   4 (Started from top)
+ * RSA       4   9
+ * ECP       4   8 (Started from top)
+ * MD        5   4
+ * CIPHER    6   6
+ * SSL       6   9 (Started from top)
+ * SSL       7   31
  *
- * Module dependent error code (5 bits 0x.08.-0x.F8.)
+ * Module dependent error code (5 bits 0x.00.-0x.F8.)
  */
 
 #ifdef __cplusplus
@@ -99,7 +110,11 @@ extern "C" {
  * \param buffer    buffer to place representation in
  * \param buflen    length of the buffer
  */
+void polarssl_strerror( int errnum, char *buffer, size_t buflen );
+
+#if defined(POLARSSL_ERROR_STRERROR_BC)
 void error_strerror( int errnum, char *buffer, size_t buflen );
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/gcm.h b/Externals/polarssl/include/polarssl/gcm.h
index 77baa17565..c2829a0092 100644
--- a/Externals/polarssl/include/polarssl/gcm.h
+++ b/Externals/polarssl/include/polarssl/gcm.h
@@ -1,9 +1,9 @@
 /**
  * \file gcm.h
  *
- * \brief Galois/Counter mode for AES
+ * \brief Galois/Counter mode for 128-bit block ciphers
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,10 +27,11 @@
 #ifndef POLARSSL_GCM_H
 #define POLARSSL_GCM_H
 
-#include "aes.h"
+#include "cipher.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
+typedef UINT32 uint32_t;
 typedef UINT64 uint64_t;
 #else
 #include <stdint.h>
@@ -42,33 +43,41 @@ typedef UINT64 uint64_t;
 #define POLARSSL_ERR_GCM_AUTH_FAILED                       -0x0012  /**< Authenticated decryption failed. */
 #define POLARSSL_ERR_GCM_BAD_INPUT                         -0x0014  /**< Bad input parameters to function. */
 
-/**
- * \brief          GCM context structure
- */
-typedef struct {
-    aes_context aes_ctx;        /*!< AES context used */
-    uint64_t HL[16];            /*!< Precalculated HTable */
-    uint64_t HH[16];            /*!< Precalculated HTable */
-}
-gcm_context;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ * \brief          GCM context structure
+ */
+typedef struct {
+    cipher_context_t cipher_ctx;/*!< cipher context used */
+    uint64_t HL[16];            /*!< Precalculated HTable */
+    uint64_t HH[16];            /*!< Precalculated HTable */
+    uint64_t len;               /*!< Total data length */
+    uint64_t add_len;           /*!< Total add length */
+    unsigned char base_ectr[16];/*!< First ECTR for tag */
+    unsigned char y[16];        /*!< Y working value */
+    unsigned char buf[16];      /*!< buf working value */
+    int mode;                   /*!< Encrypt or Decrypt */
+}
+gcm_context;
+
 /**
  * \brief           GCM initialization (encryption)
  *
  * \param ctx       GCM context to be initialized
+ * \param cipher    cipher to use (a 128-bit block cipher)
  * \param key       encryption key
  * \param keysize   must be 128, 192 or 256
  *
- * \return          0 if successful, or POLARSSL_ERR_AES_INVALID_KEY_LENGTH
+ * \return          0 if successful, or a cipher specific error code
  */
-int gcm_init( gcm_context *ctx, const unsigned char *key, unsigned int keysize );
+int gcm_init( gcm_context *ctx, cipher_id_t cipher, const unsigned char *key,
+              unsigned int keysize );
 
 /**
- * \brief           GCM buffer encryption/decryption using AES
+ * \brief           GCM buffer encryption/decryption using a block cipher
  *
  * \note On encryption, the output buffer can be the same as the input buffer.
  *       On decryption, the output buffer cannot be the same as input buffer.
@@ -102,7 +111,7 @@ int gcm_crypt_and_tag( gcm_context *ctx,
                        unsigned char *tag );
 
 /**
- * \brief           GCM buffer authenticated decryption using AES
+ * \brief           GCM buffer authenticated decryption using a block cipher
  *
  * \note On decryption, the output buffer cannot be the same as input buffer.
  *       If buffers overlap, the output buffer must trail at least 8 bytes
@@ -115,7 +124,7 @@ int gcm_crypt_and_tag( gcm_context *ctx,
  * \param add       additional data
  * \param add_len   length of additional data
  * \param tag       buffer holding the tag
- * \param tag_len   length of the tag 
+ * \param tag_len   length of the tag
  * \param input     buffer holding the input data
  * \param output    buffer for holding the output data
  *
@@ -128,11 +137,74 @@ int gcm_auth_decrypt( gcm_context *ctx,
                       size_t iv_len,
                       const unsigned char *add,
                       size_t add_len,
-                      const unsigned char *tag, 
+                      const unsigned char *tag,
                       size_t tag_len,
                       const unsigned char *input,
                       unsigned char *output );
 
+/**
+ * \brief           Generic GCM stream start function
+ *
+ * \param ctx       GCM context
+ * \param mode      GCM_ENCRYPT or GCM_DECRYPT
+ * \param iv        initialization vector
+ * \param iv_len    length of IV
+ * \param add       additional data (or NULL if length is 0)
+ * \param add_len   length of additional data
+ *
+ * \return         0 if successful
+ */
+int gcm_starts( gcm_context *ctx,
+                int mode,
+                const unsigned char *iv,
+                size_t iv_len,
+                const unsigned char *add,
+                size_t add_len );
+
+/**
+ * \brief           Generic GCM update function. Encrypts/decrypts using the
+ *                  given GCM context. Expects input to be a multiple of 16
+ *                  bytes! Only the last call before gcm_finish() can be less
+ *                  than 16 bytes!
+ *
+ * \note On decryption, the output buffer cannot be the same as input buffer.
+ *       If buffers overlap, the output buffer must trail at least 8 bytes
+ *       behind the input buffer.
+ *
+ * \param ctx       GCM context
+ * \param length    length of the input data
+ * \param input     buffer holding the input data
+ * \param output    buffer for holding the output data
+ *
+ * \return         0 if successful or POLARSSL_ERR_GCM_BAD_INPUT
+ */
+int gcm_update( gcm_context *ctx,
+                size_t length,
+                const unsigned char *input,
+                unsigned char *output );
+
+/**
+ * \brief           Generic GCM finalisation function. Wraps up the GCM stream
+ *                  and generates the tag. The tag can have a maximum length of
+ *                  16 bytes.
+ *
+ * \param ctx       GCM context
+ * \param tag       buffer for holding the tag (may be NULL if tag_len is 0)
+ * \param tag_len   length of the tag to generate
+ *
+ * \return          0 if successful or POLARSSL_ERR_GCM_BAD_INPUT
+ */
+int gcm_finish( gcm_context *ctx,
+                unsigned char *tag,
+                size_t tag_len );
+
+/**
+ * \brief           Free a GCM context and underlying cipher sub-context
+ *
+ * \param ctx       GCM context to free
+ */
+void gcm_free( gcm_context *ctx );
+
 /**
  * \brief          Checkup routine
  *
diff --git a/Externals/polarssl/include/polarssl/havege.h b/Externals/polarssl/include/polarssl/havege.h
index 53c4f38cf6..536eb08822 100644
--- a/Externals/polarssl/include/polarssl/havege.h
+++ b/Externals/polarssl/include/polarssl/havege.h
@@ -3,7 +3,7 @@
  *
  * \brief HAVEGE: HArdware Volatile Entropy Gathering and Expansion
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -31,6 +31,10 @@
 
 #define COLLECT_SIZE 1024
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          HAVEGE state structure
  */
@@ -42,10 +46,6 @@ typedef struct
 }
 havege_state;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief          HAVEGE initialization
  *
@@ -53,6 +53,13 @@ extern "C" {
  */
 void havege_init( havege_state *hs );
 
+/**
+ * \brief          Clear HAVEGE state
+ *
+ * \param hs       HAVEGE state to be cleared
+ */
+void havege_free( havege_state *hs );
+
 /**
  * \brief          HAVEGE rand function
  *
diff --git a/Externals/polarssl/include/polarssl/hmac_drbg.h b/Externals/polarssl/include/polarssl/hmac_drbg.h
new file mode 100644
index 0000000000..2d765d5193
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/hmac_drbg.h
@@ -0,0 +1,284 @@
+/**
+ * \file hmac_drbg.h
+ *
+ * \brief HMAC_DRBG (NIST SP 800-90A)
+ *
+ *  Copyright (C) 2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_HMAC_DRBG_H
+#define POLARSSL_HMAC_DRBG_H
+
+#include "md.h"
+
+/*
+ * Error codes
+ */
+#define POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG              -0x0003  /**< Too many random requested in single call. */
+#define POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG                -0x0005  /**< Input too large (Entropy + additional). */
+#define POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR                -0x0007  /**< Read/write error in file. */
+#define POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED        -0x0009  /**< The entropy source failed. */
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(POLARSSL_HMAC_DRBG_RESEED_INTERVAL)
+#define POLARSSL_HMAC_DRBG_RESEED_INTERVAL   10000   /**< Interval before reseed is performed by default */
+#endif
+
+#if !defined(POLARSSL_HMAC_DRBG_MAX_INPUT)
+#define POLARSSL_HMAC_DRBG_MAX_INPUT         256     /**< Maximum number of additional input bytes */
+#endif
+
+#if !defined(POLARSSL_HMAC_DRBG_MAX_REQUEST)
+#define POLARSSL_HMAC_DRBG_MAX_REQUEST       1024    /**< Maximum number of requested bytes per call */
+#endif
+
+#if !defined(POLARSSL_HMAC_DRBG_MAX_SEED_INPUT)
+#define POLARSSL_HMAC_DRBG_MAX_SEED_INPUT    384     /**< Maximum size of (re)seed buffer */
+#endif
+
+/* \} name SECTION: Module settings */
+
+#define POLARSSL_HMAC_DRBG_PR_OFF   0   /**< No prediction resistance       */
+#define POLARSSL_HMAC_DRBG_PR_ON    1   /**< Prediction resistance enabled  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * HMAC_DRBG context.
+ */
+typedef struct
+{
+    /* Working state: the key K is not stored explicitely,
+     * but is implied by the HMAC context */
+    md_context_t md_ctx;                    /*!< HMAC context (inc. K)  */
+    unsigned char V[POLARSSL_MD_MAX_SIZE];  /*!< V in the spec          */
+    int reseed_counter;                     /*!< reseed counter         */
+
+    /* Administrative state */
+    size_t entropy_len;         /*!< entropy bytes grabbed on each (re)seed */
+    int prediction_resistance;  /*!< enable prediction resistance (Automatic
+                                     reseed before every random generation) */
+    int reseed_interval;        /*!< reseed interval   */
+
+    /* Callbacks */
+    int (*f_entropy)(void *, unsigned char *, size_t); /*!< entropy function */
+    void *p_entropy;            /*!< context for the entropy function        */
+} hmac_drbg_context;
+
+/**
+ * \brief               HMAC_DRBG initialisation
+ *
+ * \param ctx           HMAC_DRBG context to be initialised
+ * \param md_info       MD algorithm to use for HMAC_DRBG
+ * \param f_entropy     Entropy callback (p_entropy, buffer to fill, buffer
+ *                      length)
+ * \param p_entropy     Entropy context
+ * \param custom        Personalization data (Device specific identifiers)
+ *                      (Can be NULL)
+ * \param len           Length of personalization data
+ *
+ * \note                The "security strength" as defined by NIST is set to:
+ *                      128 bits if md_alg is SHA-1,
+ *                      192 bits if md_alg is SHA-224,
+ *                      256 bits if md_alg is SHA-256 or higher.
+ *                      Note that SHA-256 is just as efficient as SHA-224.
+ *
+ * \return              0 if successful, or
+ *                      POLARSSL_ERR_MD_BAD_INPUT_DATA, or
+ *                      POLARSSL_ERR_MD_ALLOC_FAILED, or
+ *                      POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED.
+ */
+int hmac_drbg_init( hmac_drbg_context *ctx,
+                    const md_info_t * md_info,
+                    int (*f_entropy)(void *, unsigned char *, size_t),
+                    void *p_entropy,
+                    const unsigned char *custom,
+                    size_t len );
+
+/**
+ * \brief               Initilisation of simpified HMAC_DRBG (never reseeds).
+ *                      (For use with deterministic ECDSA.)
+ *
+ * \param ctx           HMAC_DRBG context to be initialised
+ * \param md_info       MD algorithm to use for HMAC_DRBG
+ * \param data          Concatenation of entropy string and additional data
+ * \param data_len      Length of data in bytes
+ *
+ * \return              0 if successful, or
+ *                      POLARSSL_ERR_MD_BAD_INPUT_DATA, or
+ *                      POLARSSL_ERR_MD_ALLOC_FAILED.
+ */
+int hmac_drbg_init_buf( hmac_drbg_context *ctx,
+                        const md_info_t * md_info,
+                        const unsigned char *data, size_t data_len );
+
+/**
+ * \brief               Enable / disable prediction resistance (Default: Off)
+ *
+ * Note: If enabled, entropy is used for ctx->entropy_len before each call!
+ *       Only use this if you have ample supply of good entropy!
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param resistance    POLARSSL_HMAC_DRBG_PR_ON or POLARSSL_HMAC_DRBG_PR_OFF
+ */
+void hmac_drbg_set_prediction_resistance( hmac_drbg_context *ctx,
+                                          int resistance );
+
+/**
+ * \brief               Set the amount of entropy grabbed on each reseed
+ *                      (Default: given by the security strength, which
+ *                      depends on the hash used, see \c hmac_drbg_init() )
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param len           Amount of entropy to grab, in bytes
+ */
+void hmac_drbg_set_entropy_len( hmac_drbg_context *ctx,
+                                size_t len );
+
+/**
+ * \brief               Set the reseed interval
+ *                      (Default: POLARSSL_HMAC_DRBG_RESEED_INTERVAL)
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param interval      Reseed interval
+ */
+void hmac_drbg_set_reseed_interval( hmac_drbg_context *ctx,
+                                    int interval );
+
+/**
+ * \brief               HMAC_DRBG update state
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param additional    Additional data to update state with, or NULL
+ * \param add_len       Length of additional data, or 0
+ *
+ * \note                Additional data is optional, pass NULL and 0 as second
+ *                      third argument if no additional data is being used.
+ */
+void hmac_drbg_update( hmac_drbg_context *ctx,
+                       const unsigned char *additional, size_t add_len );
+
+/**
+ * \brief               HMAC_DRBG reseeding (extracts data from entropy source)
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param additional    Additional data to add to state (Can be NULL)
+ * \param len           Length of additional data
+ *
+ * \return              0 if successful, or
+ *                      POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED
+ */
+int hmac_drbg_reseed( hmac_drbg_context *ctx,
+                      const unsigned char *additional, size_t len );
+
+/**
+ * \brief               HMAC_DRBG generate random with additional update input
+ *
+ * Note: Automatically reseeds if reseed_counter is reached or PR is enabled.
+ *
+ * \param p_rng         HMAC_DRBG context
+ * \param output        Buffer to fill
+ * \param output_len    Length of the buffer
+ * \param additional    Additional data to update with (can be NULL)
+ * \param add_len       Length of additional data (can be 0)
+ *
+ * \return              0 if successful, or
+ *                      POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or
+ *                      POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG, or
+ *                      POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG.
+ */
+int hmac_drbg_random_with_add( void *p_rng,
+                               unsigned char *output, size_t output_len,
+                               const unsigned char *additional,
+                               size_t add_len );
+
+/**
+ * \brief               HMAC_DRBG generate random
+ *
+ * Note: Automatically reseeds if reseed_counter is reached or PR is enabled.
+ *
+ * \param p_rng         HMAC_DRBG context
+ * \param output        Buffer to fill
+ * \param out_len       Length of the buffer
+ *
+ * \return              0 if successful, or
+ *                      POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED, or
+ *                      POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG
+ */
+int hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len );
+
+/**
+ * \brief               Free an HMAC_DRBG context
+ *
+ * \param ctx           HMAC_DRBG context to free.
+ */
+void hmac_drbg_free( hmac_drbg_context *ctx );
+
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief               Write a seed file
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful, 1 on file error, or
+ *                      POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED
+ */
+int hmac_drbg_write_seed_file( hmac_drbg_context *ctx, const char *path );
+
+/**
+ * \brief               Read and update a seed file. Seed is added to this
+ *                      instance
+ *
+ * \param ctx           HMAC_DRBG context
+ * \param path          Name of the file
+ *
+ * \return              0 if successful, 1 on file error,
+ *                      POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED or
+ *                      POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG
+ */
+int hmac_drbg_update_seed_file( hmac_drbg_context *ctx, const char *path );
+#endif /* POLARSSL_FS_IO */
+
+
+#if defined(POLARSSL_SELF_TEST)
+/**
+ * \brief               Checkup routine
+ *
+ * \return              0 if successful, or 1 if the test failed
+ */
+int hmac_drbg_self_test( int verbose );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* hmac_drbg.h */
diff --git a/Externals/polarssl/include/polarssl/md.h b/Externals/polarssl/include/polarssl/md.h
index 6a1bdd4113..81d8a2e5c2 100644
--- a/Externals/polarssl/include/polarssl/md.h
+++ b/Externals/polarssl/include/polarssl/md.h
@@ -1,11 +1,11 @@
 /**
  * \file md.h
- * 
+ *
  * \brief Generic message digest wrapper
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -44,6 +44,10 @@
 #define POLARSSL_ERR_MD_ALLOC_FAILED                       -0x5180  /**< Failed to allocate memory. */
 #define POLARSSL_ERR_MD_FILE_IO_ERROR                      -0x5200  /**< Opening or reading of file failed. */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
     POLARSSL_MD_NONE=0,
     POLARSSL_MD_MD2,
@@ -54,9 +58,14 @@ typedef enum {
     POLARSSL_MD_SHA256,
     POLARSSL_MD_SHA384,
     POLARSSL_MD_SHA512,
+    POLARSSL_MD_RIPEMD160,
 } md_type_t;
 
+#if defined(POLARSSL_SHA512_C)
 #define POLARSSL_MD_MAX_SIZE         64  /* longest known is SHA512 */
+#else
+#define POLARSSL_MD_MAX_SIZE         32  /* longest known is SHA256 or less */
+#endif
 
 /**
  * Message digest information. Allows message digest functions to be called
@@ -83,16 +92,18 @@ typedef struct {
 
     /** Generic digest function */
     void (*digest_func)( const unsigned char *input, size_t ilen,
-                            unsigned char *output );
+                         unsigned char *output );
 
     /** Generic file digest function */
     int (*file_func)( const char *path, unsigned char *output );
 
     /** HMAC Initialisation function */
-    void (*hmac_starts_func)( void *ctx, const unsigned char *key, size_t keylen );
+    void (*hmac_starts_func)( void *ctx, const unsigned char *key,
+                              size_t keylen );
 
     /** HMAC update function */
-    void (*hmac_update_func)( void *ctx, const unsigned char *input, size_t ilen );
+    void (*hmac_update_func)( void *ctx, const unsigned char *input,
+                              size_t ilen );
 
     /** HMAC finalisation function */
     void (*hmac_finish_func)( void *ctx, unsigned char *output);
@@ -102,8 +113,8 @@ typedef struct {
 
     /** Generic HMAC function */
     void (*hmac_func)( const unsigned char *key, size_t keylen,
-                    const unsigned char *input, size_t ilen,
-                    unsigned char *output );
+                       const unsigned char *input, size_t ilen,
+                       unsigned char *output );
 
     /** Allocate a new context */
     void * (*ctx_alloc_func)( void );
@@ -111,6 +122,8 @@ typedef struct {
     /** Free the given context */
     void (*ctx_free_func)( void *ctx );
 
+    /** Internal use only */
+    void (*process_func)( void *ctx, const unsigned char *input );
 } md_info_t;
 
 /**
@@ -129,10 +142,6 @@ typedef struct {
     NULL, /* md_ctx */ \
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief Returns the list of digests supported by the generic digest module.
  *
@@ -164,8 +173,24 @@ const md_info_t *md_info_from_string( const char *md_name );
 const md_info_t *md_info_from_type( md_type_t md_type );
 
 /**
- * \brief          Initialises and fills the message digest context structure with
- *                 the appropriate values.
+ * \brief               Initialize a md_context (as NONE)
+ */
+void md_init( md_context_t *ctx );
+
+/**
+ * \brief               Free and clear the message-specific context of ctx.
+ *                      Freeing ctx itself remains the responsibility of the
+ *                      caller.
+ */
+void md_free( md_context_t *ctx );
+
+/**
+ * \brief          Initialises and fills the message digest context structure
+ *                 with the appropriate values.
+ *
+ * \note           Currently also clears structure. In future versions you
+ *                 will be required to call md_init() on the structure
+ *                 first.
  *
  * \param ctx      context to initialise. May not be NULL. The
  *                 digest-specific context (ctx->md_ctx) must be NULL. It will
@@ -182,10 +207,11 @@ int md_init_ctx( md_context_t *ctx, const md_info_t *md_info );
  * \brief          Free the message-specific context of ctx. Freeing ctx itself
  *                 remains the responsibility of the caller.
  *
+ * \note           Deprecated: Redirects to md_free()
+ *
  * \param ctx      Free the message-specific context
  *
- * \returns        0 on success, POLARSSL_ERR_MD_BAD_INPUT_DATA if parameter
- *                 verification fails.
+ * \returns        0
  */
 int md_free_ctx( md_context_t *ctx );
 
@@ -292,7 +318,8 @@ int md( const md_info_t *md_info, const unsigned char *input, size_t ilen,
  *                 failed, POLARSSL_ERR_MD_FILE_READ_FAILED if fread failed,
  *                 POLARSSL_ERR_MD_BAD_INPUT_DATA if md_info was NULL.
  */
-int md_file( const md_info_t *md_info, const char *path, unsigned char *output );
+int md_file( const md_info_t *md_info, const char *path,
+             unsigned char *output );
 
 /**
  * \brief          Generic HMAC context setup
@@ -304,7 +331,8 @@ int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
  * \returns        0 on success, POLARSSL_ERR_MD_BAD_INPUT_DATA if parameter
  *                 verification fails.
  */
-int md_hmac_starts( md_context_t *ctx, const unsigned char *key, size_t keylen );
+int md_hmac_starts( md_context_t *ctx, const unsigned char *key,
+                    size_t keylen );
 
 /**
  * \brief          Generic HMAC process buffer
@@ -316,7 +344,8 @@ int md_hmac_starts( md_context_t *ctx, const unsigned char *key, size_t keylen )
  * \returns        0 on success, POLARSSL_ERR_MD_BAD_INPUT_DATA if parameter
  *                 verification fails.
  */
-int md_hmac_update( md_context_t *ctx, const unsigned char *input, size_t ilen );
+int md_hmac_update( md_context_t *ctx, const unsigned char *input,
+                    size_t ilen );
 
 /**
  * \brief          Generic HMAC final digest
@@ -356,6 +385,9 @@ int md_hmac( const md_info_t *md_info, const unsigned char *key, size_t keylen,
                 const unsigned char *input, size_t ilen,
                 unsigned char *output );
 
+/* Internal use */
+int md_process( md_context_t *ctx, const unsigned char *data );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/md2.h b/Externals/polarssl/include/polarssl/md2.h
index 94f19fce3a..952b0bfceb 100644
--- a/Externals/polarssl/include/polarssl/md2.h
+++ b/Externals/polarssl/include/polarssl/md2.h
@@ -3,7 +3,7 @@
  *
  * \brief MD2 message digest algorithm (hash function)
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
 #ifndef POLARSSL_MD2_H
 #define POLARSSL_MD2_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
@@ -37,6 +41,10 @@
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          MD2 context structure
  */
@@ -52,9 +60,19 @@ typedef struct
 }
 md2_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize MD2 context
+ *
+ * \param ctx      MD2 context to be initialized
+ */
+void md2_init( md2_context *ctx );
+
+/**
+ * \brief          Clear MD2 context
+ *
+ * \param ctx      MD2 context to be cleared
+ */
+void md2_free( md2_context *ctx );
 
 /**
  * \brief          MD2 context setup
@@ -118,7 +136,8 @@ int md2_file( const char *path, unsigned char output[16] );
  * \param key      HMAC secret key
  * \param keylen   length of the HMAC key
  */
-void md2_hmac_starts( md2_context *ctx, const unsigned char *key, size_t keylen );
+void md2_hmac_starts( md2_context *ctx, const unsigned char *key,
+                      size_t keylen );
 
 /**
  * \brief          MD2 HMAC process buffer
@@ -127,7 +146,8 @@ void md2_hmac_starts( md2_context *ctx, const unsigned char *key, size_t keylen
  * \param input    buffer holding the  data
  * \param ilen     length of the input data
  */
-void md2_hmac_update( md2_context *ctx, const unsigned char *input, size_t ilen );
+void md2_hmac_update( md2_context *ctx, const unsigned char *input,
+                      size_t ilen );
 
 /**
  * \brief          MD2 HMAC final digest
@@ -164,6 +184,9 @@ void md2_hmac( const unsigned char *key, size_t keylen,
  */
 int md2_self_test( int verbose );
 
+/* Internal use */
+void md2_process( md2_context *ctx );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/md4.h b/Externals/polarssl/include/polarssl/md4.h
index 56fba2fcb7..fc5a5cd27a 100644
--- a/Externals/polarssl/include/polarssl/md4.h
+++ b/Externals/polarssl/include/polarssl/md4.h
@@ -3,7 +3,7 @@
  *
  * \brief MD4 message digest algorithm (hash function)
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_MD4_H
 #define POLARSSL_MD4_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -44,6 +48,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          MD4 context structure
  */
@@ -58,9 +66,19 @@ typedef struct
 }
 md4_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize MD4 context
+ *
+ * \param ctx      MD4 context to be initialized
+ */
+void md4_init( md4_context *ctx );
+
+/**
+ * \brief          Clear MD4 context
+ *
+ * \param ctx      MD4 context to be cleared
+ */
+void md4_free( md4_context *ctx );
 
 /**
  * \brief          MD4 context setup
@@ -124,7 +142,8 @@ int md4_file( const char *path, unsigned char output[16] );
  * \param key      HMAC secret key
  * \param keylen   length of the HMAC key
  */
-void md4_hmac_starts( md4_context *ctx, const unsigned char *key, size_t keylen );
+void md4_hmac_starts( md4_context *ctx, const unsigned char *key,
+                      size_t keylen );
 
 /**
  * \brief          MD4 HMAC process buffer
@@ -133,7 +152,8 @@ void md4_hmac_starts( md4_context *ctx, const unsigned char *key, size_t keylen
  * \param input    buffer holding the  data
  * \param ilen     length of the input data
  */
-void md4_hmac_update( md4_context *ctx, const unsigned char *input, size_t ilen );
+void md4_hmac_update( md4_context *ctx, const unsigned char *input,
+                      size_t ilen );
 
 /**
  * \brief          MD4 HMAC final digest
@@ -170,6 +190,9 @@ void md4_hmac( const unsigned char *key, size_t keylen,
  */
 int md4_self_test( int verbose );
 
+/* Internal use */
+void md4_process( md4_context *ctx, const unsigned char data[64] );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/md5.h b/Externals/polarssl/include/polarssl/md5.h
index c90789d6aa..2f378f6cd7 100644
--- a/Externals/polarssl/include/polarssl/md5.h
+++ b/Externals/polarssl/include/polarssl/md5.h
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_MD5_H
 #define POLARSSL_MD5_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -44,6 +48,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          MD5 context structure
  */
@@ -58,9 +66,19 @@ typedef struct
 }
 md5_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize MD5 context
+ *
+ * \param ctx      MD5 context to be initialized
+ */
+void md5_init( md5_context *ctx );
+
+/**
+ * \brief          Clear MD5 context
+ *
+ * \param ctx      MD5 context to be cleared
+ */
+void md5_free( md5_context *ctx );
 
 /**
  * \brief          MD5 context setup
diff --git a/Externals/polarssl/include/polarssl/md_wrap.h b/Externals/polarssl/include/polarssl/md_wrap.h
index 46849d0334..eb1db0f1ef 100644
--- a/Externals/polarssl/include/polarssl/md_wrap.h
+++ b/Externals/polarssl/include/polarssl/md_wrap.h
@@ -1,6 +1,6 @@
 /**
  * \file md_wrap.h
- * 
+ *
  * \brief Message digest wrappers.
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
@@ -29,7 +29,11 @@
 #ifndef POLARSSL_MD_WRAP_H
 #define POLARSSL_MD_WRAP_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 #include "md.h"
 
 #ifdef __cplusplus
@@ -45,14 +49,17 @@ extern const md_info_t md4_info;
 #if defined(POLARSSL_MD5_C)
 extern const md_info_t md5_info;
 #endif
+#if defined(POLARSSL_RIPEMD160_C)
+extern const md_info_t ripemd160_info;
+#endif
 #if defined(POLARSSL_SHA1_C)
 extern const md_info_t sha1_info;
 #endif
-#if defined(POLARSSL_SHA2_C)
+#if defined(POLARSSL_SHA256_C)
 extern const md_info_t sha224_info;
 extern const md_info_t sha256_info;
 #endif
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
 extern const md_info_t sha384_info;
 extern const md_info_t sha512_info;
 #endif
diff --git a/Externals/polarssl/include/polarssl/memory.h b/Externals/polarssl/include/polarssl/memory.h
new file mode 100644
index 0000000000..3af39511b4
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/memory.h
@@ -0,0 +1,52 @@
+/**
+ * \file memory.h
+ *
+ * \brief Memory allocation layer (Deprecated to platform layer)
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_MEMORY_H
+#define POLARSSL_MEMORY_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <stdlib.h>
+
+#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY)
+#define POLARSSL_PLATFORM_MEMORY
+#endif
+
+#include "platform.h"
+#include "memory_buffer_alloc.h"
+
+int memory_set_own( void * (*malloc_func)( size_t ),
+                    void (*free_func)( void * ) )
+{
+    return platform_set_malloc_free( malloc_func, free_func );
+}
+
+
+#endif /* memory.h */
diff --git a/Externals/polarssl/include/polarssl/memory_buffer_alloc.h b/Externals/polarssl/include/polarssl/memory_buffer_alloc.h
new file mode 100644
index 0000000000..c449752587
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/memory_buffer_alloc.h
@@ -0,0 +1,122 @@
+/**
+ * \file memory_buffer_alloc.h
+ *
+ * \brief Buffer-based memory allocator
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_MEMORY_BUFFER_ALLOC_H
+#define POLARSSL_MEMORY_BUFFER_ALLOC_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <stdlib.h>
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(POLARSSL_MEMORY_ALIGN_MULTIPLE)
+#define POLARSSL_MEMORY_ALIGN_MULTIPLE       4 /**< Align on multiples of this value */
+#endif
+
+/* \} name SECTION: Module settings */
+
+#define MEMORY_VERIFY_NONE         0
+#define MEMORY_VERIFY_ALLOC        (1 << 0)
+#define MEMORY_VERIFY_FREE         (1 << 1)
+#define MEMORY_VERIFY_ALWAYS       (MEMORY_VERIFY_ALLOC | MEMORY_VERIFY_FREE)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief   Initialize use of stack-based memory allocator.
+ *          The stack-based allocator does memory management inside the
+ *          presented buffer and does not call malloc() and free().
+ *          It sets the global polarssl_malloc() and polarssl_free() pointers
+ *          to its own functions.
+ *          (Provided polarssl_malloc() and polarssl_free() are thread-safe if
+ *           POLARSSL_THREADING_C is defined)
+ *
+ * \note    This code is not optimized and provides a straight-forward
+ *          implementation of a stack-based memory allocator.
+ *
+ * \param buf   buffer to use as heap
+ * \param len   size of the buffer
+ *
+ * \return              0 if successful
+ */
+int memory_buffer_alloc_init( unsigned char *buf, size_t len );
+
+/**
+ * \brief   Free the mutex for thread-safety and clear remaining memory
+ */
+void memory_buffer_alloc_free( void );
+
+/**
+ * \brief   Determine when the allocator should automatically verify the state
+ *          of the entire chain of headers / meta-data.
+ *          (Default: MEMORY_VERIFY_NONE)
+ *
+ * \param verify    One of MEMORY_VERIFY_NONE, MEMORY_VERIFY_ALLOC,
+ *                  MEMORY_VERIFY_FREE or MEMORY_VERIFY_ALWAYS
+ */
+void memory_buffer_set_verify( int verify );
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+/**
+ * \brief   Print out the status of the allocated memory (primarily for use
+ *          after a program should have de-allocated all memory)
+ *          Prints out a list of 'still allocated' blocks and their stack
+ *          trace if POLARSSL_MEMORY_BACKTRACE is defined.
+ */
+void memory_buffer_alloc_status( void );
+#endif /* POLARSSL_MEMORY_DEBUG */
+
+/**
+ * \brief   Verifies that all headers in the memory buffer are correct
+ *          and contain sane values. Helps debug buffer-overflow errors.
+ *
+ *          Prints out first failure if POLARSSL_MEMORY_DEBUG is defined.
+ *          Prints out full header information if POLARSSL_MEMORY_DEBUG_HEADERS
+ *          is defined. (Includes stack trace information for each block if
+ *          POLARSSL_MEMORY_BACKTRACE is defined as well).
+ *
+ * \returns             0 if verified, 1 otherwise
+ */
+int memory_buffer_alloc_verify( void );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* memory_buffer_alloc.h */
diff --git a/Externals/polarssl/include/polarssl/net.h b/Externals/polarssl/include/polarssl/net.h
index 88302ac0a7..22698b4ce4 100644
--- a/Externals/polarssl/include/polarssl/net.h
+++ b/Externals/polarssl/include/polarssl/net.h
@@ -82,9 +82,10 @@ int net_bind( int *fd, const char *bind_ip, int port );
  * \param bind_fd   Relevant socket
  * \param client_fd Will contain the connected client socket
  * \param client_ip Will contain the client IP address
+ *                  Must be at least 4 bytes, or 16 if IPv6 is supported
  *
  * \return          0 if successful, POLARSSL_ERR_NET_ACCEPT_FAILED, or
- *                  POLARSSL_ERR_NET_WOULD_BLOCK is bind_fd was set to
+ *                  POLARSSL_ERR_NET_WANT_READ is bind_fd was set to
  *                  non-blocking and accept() is blocking.
  */
 int net_accept( int bind_fd, int *client_fd, void *client_ip );
diff --git a/Externals/polarssl/include/polarssl/oid.h b/Externals/polarssl/include/polarssl/oid.h
new file mode 100644
index 0000000000..c4d5c3fba1
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/oid.h
@@ -0,0 +1,570 @@
+/**
+ * \file oid.h
+ *
+ * \brief Object Identifier (OID) database
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_OID_H
+#define POLARSSL_OID_H
+
+#include <string.h>
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+#include "asn1.h"
+#include "pk.h"
+#if defined(POLARSSL_CIPHER_C)
+#include "cipher.h"
+#endif
+
+#if defined(POLARSSL_MD_C)
+#include "md.h"
+#endif
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
+#include "x509.h"
+#endif
+
+#define POLARSSL_ERR_OID_NOT_FOUND                         -0x002E  /**< OID is not found. */
+#define POLARSSL_ERR_OID_BUF_TOO_SMALL                     -0x000B  /**< output buffer is too small */
+
+/*
+ * Top level OID tuples
+ */
+#define OID_ISO_MEMBER_BODIES           "\x2a"          /* {iso(1) member-body(2)} */
+#define OID_ISO_IDENTIFIED_ORG          "\x2b"          /* {iso(1) identified-organization(3)} */
+#define OID_ISO_CCITT_DS                "\x55"          /* {joint-iso-ccitt(2) ds(5)} */
+#define OID_ISO_ITU_COUNTRY             "\x60"          /* {joint-iso-itu-t(2) country(16)} */
+
+/*
+ * ISO Member bodies OID parts
+ */
+#define OID_COUNTRY_US                  "\x86\x48"      /* {us(840)} */
+#define OID_ORG_RSA_DATA_SECURITY       "\x86\xf7\x0d"  /* {rsadsi(113549)} */
+#define OID_RSA_COMPANY                 OID_ISO_MEMBER_BODIES OID_COUNTRY_US \
+                                        OID_ORG_RSA_DATA_SECURITY /* {iso(1) member-body(2) us(840) rsadsi(113549)} */
+#define OID_ORG_ANSI_X9_62              "\xce\x3d" /* ansi-X9-62(10045) */
+#define OID_ANSI_X9_62                  OID_ISO_MEMBER_BODIES OID_COUNTRY_US \
+                                        OID_ORG_ANSI_X9_62
+
+/*
+ * ISO Identified organization OID parts
+ */
+#define OID_ORG_DOD                     "\x06"          /* {dod(6)} */
+#define OID_ORG_OIW                     "\x0e"
+#define OID_OIW_SECSIG                  OID_ORG_OIW "\x03"
+#define OID_OIW_SECSIG_ALG              OID_OIW_SECSIG "\x02"
+#define OID_OIW_SECSIG_SHA1             OID_OIW_SECSIG_ALG "\x1a"
+#define OID_ORG_CERTICOM                "\x81\x04"  /* certicom(132) */
+#define OID_CERTICOM                    OID_ISO_IDENTIFIED_ORG OID_ORG_CERTICOM
+#define OID_ORG_TELETRUST               "\x24" /* teletrust(36) */
+#define OID_TELETRUST                   OID_ISO_IDENTIFIED_ORG OID_ORG_TELETRUST
+
+/*
+ * ISO ITU OID parts
+ */
+#define OID_ORGANIZATION                "\x01"          /* {organization(1)} */
+#define OID_ISO_ITU_US_ORG              OID_ISO_ITU_COUNTRY OID_COUNTRY_US OID_ORGANIZATION /* {joint-iso-itu-t(2) country(16) us(840) organization(1)} */
+
+#define OID_ORG_GOV                     "\x65"          /* {gov(101)} */
+#define OID_GOV                         OID_ISO_ITU_US_ORG OID_ORG_GOV /* {joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101)} */
+
+#define OID_ORG_NETSCAPE                "\x86\xF8\x42"  /* {netscape(113730)} */
+#define OID_NETSCAPE                    OID_ISO_ITU_US_ORG OID_ORG_NETSCAPE /* Netscape OID {joint-iso-itu-t(2) country(16) us(840) organization(1) netscape(113730)} */
+
+/* ISO arc for standard certificate and CRL extensions */
+#define OID_ID_CE                       OID_ISO_CCITT_DS "\x1D" /**< id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29} */
+
+/**
+ * Private Internet Extensions
+ * { iso(1) identified-organization(3) dod(6) internet(1)
+ *                      security(5) mechanisms(5) pkix(7) }
+ */
+#define OID_PKIX                        OID_ISO_IDENTIFIED_ORG OID_ORG_DOD "\x01\x05\x05\x07"
+
+/*
+ * Arc for standard naming attributes
+ */
+#define OID_AT                          OID_ISO_CCITT_DS "\x04" /**< id-at OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4} */
+#define OID_AT_CN                       OID_AT "\x03" /**< id-at-commonName AttributeType:= {id-at 3} */
+#define OID_AT_SUR_NAME                 OID_AT "\x04" /**< id-at-surName AttributeType:= {id-at 4} */
+#define OID_AT_SERIAL_NUMBER            OID_AT "\x05" /**< id-at-serialNumber AttributeType:= {id-at 5} */
+#define OID_AT_COUNTRY                  OID_AT "\x06" /**< id-at-countryName AttributeType:= {id-at 6} */
+#define OID_AT_LOCALITY                 OID_AT "\x07" /**< id-at-locality AttributeType:= {id-at 7} */
+#define OID_AT_STATE                    OID_AT "\x08" /**< id-at-state AttributeType:= {id-at 8} */
+#define OID_AT_ORGANIZATION             OID_AT "\x0A" /**< id-at-organizationName AttributeType:= {id-at 10} */
+#define OID_AT_ORG_UNIT                 OID_AT "\x0B" /**< id-at-organizationalUnitName AttributeType:= {id-at 11} */
+#define OID_AT_TITLE                    OID_AT "\x0C" /**< id-at-title AttributeType:= {id-at 12} */
+#define OID_AT_POSTAL_ADDRESS           OID_AT "\x10" /**< id-at-postalAddress AttributeType:= {id-at 16} */
+#define OID_AT_POSTAL_CODE              OID_AT "\x11" /**< id-at-postalCode AttributeType:= {id-at 17} */
+#define OID_AT_GIVEN_NAME               OID_AT "\x2A" /**< id-at-givenName AttributeType:= {id-at 42} */
+#define OID_AT_INITIALS                 OID_AT "\x2B" /**< id-at-initials AttributeType:= {id-at 43} */
+#define OID_AT_GENERATION_QUALIFIER     OID_AT "\x2C" /**< id-at-generationQualifier AttributeType:= {id-at 44} */
+#define OID_AT_DN_QUALIFIER             OID_AT "\x2E" /**< id-at-dnQualifier AttributeType:= {id-at 46} */
+#define OID_AT_PSEUDONYM                OID_AT "\x41" /**< id-at-pseudonym AttributeType:= {id-at 65} */
+
+#define OID_DOMAIN_COMPONENT            "\x09\x92\x26\x89\x93\xF2\x2C\x64\x01\x19" /** id-domainComponent AttributeType:= {itu-t(0) data(9) pss(2342) ucl(19200300) pilot(100) pilotAttributeType(1) domainComponent(25)} */
+
+/*
+ * OIDs for standard certificate extensions
+ */
+#define OID_AUTHORITY_KEY_IDENTIFIER    OID_ID_CE "\x23" /**< id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 } */
+#define OID_SUBJECT_KEY_IDENTIFIER      OID_ID_CE "\x0E" /**< id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 } */
+#define OID_KEY_USAGE                   OID_ID_CE "\x0F" /**< id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 } */
+#define OID_CERTIFICATE_POLICIES        OID_ID_CE "\x20" /**< id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 } */
+#define OID_POLICY_MAPPINGS             OID_ID_CE "\x21" /**< id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 } */
+#define OID_SUBJECT_ALT_NAME            OID_ID_CE "\x11" /**< id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 } */
+#define OID_ISSUER_ALT_NAME             OID_ID_CE "\x12" /**< id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 } */
+#define OID_SUBJECT_DIRECTORY_ATTRS     OID_ID_CE "\x09" /**< id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 } */
+#define OID_BASIC_CONSTRAINTS           OID_ID_CE "\x13" /**< id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 } */
+#define OID_NAME_CONSTRAINTS            OID_ID_CE "\x1E" /**< id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 } */
+#define OID_POLICY_CONSTRAINTS          OID_ID_CE "\x24" /**< id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 } */
+#define OID_EXTENDED_KEY_USAGE          OID_ID_CE "\x25" /**< id-ce-extKeyUsage OBJECT IDENTIFIER ::= { id-ce 37 } */
+#define OID_CRL_DISTRIBUTION_POINTS     OID_ID_CE "\x1F" /**< id-ce-cRLDistributionPoints OBJECT IDENTIFIER ::=  { id-ce 31 } */
+#define OID_INIHIBIT_ANYPOLICY          OID_ID_CE "\x36" /**< id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 } */
+#define OID_FRESHEST_CRL                OID_ID_CE "\x2E" /**< id-ce-freshestCRL OBJECT IDENTIFIER ::=  { id-ce 46 } */
+
+/*
+ * Netscape certificate extensions
+ */
+#define OID_NS_CERT                 OID_NETSCAPE "\x01"
+#define OID_NS_CERT_TYPE            OID_NS_CERT  "\x01"
+#define OID_NS_BASE_URL             OID_NS_CERT  "\x02"
+#define OID_NS_REVOCATION_URL       OID_NS_CERT  "\x03"
+#define OID_NS_CA_REVOCATION_URL    OID_NS_CERT  "\x04"
+#define OID_NS_RENEWAL_URL          OID_NS_CERT  "\x07"
+#define OID_NS_CA_POLICY_URL        OID_NS_CERT  "\x08"
+#define OID_NS_SSL_SERVER_NAME      OID_NS_CERT  "\x0C"
+#define OID_NS_COMMENT              OID_NS_CERT  "\x0D"
+#define OID_NS_DATA_TYPE            OID_NETSCAPE "\x02"
+#define OID_NS_CERT_SEQUENCE        OID_NS_DATA_TYPE "\x05"
+
+/*
+ * OIDs for CRL extensions
+ */
+#define OID_PRIVATE_KEY_USAGE_PERIOD    OID_ID_CE "\x10"
+#define OID_CRL_NUMBER                  OID_ID_CE "\x14" /**< id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 } */
+
+/*
+ * X.509 v3 Extended key usage OIDs
+ */
+#define OID_ANY_EXTENDED_KEY_USAGE      OID_EXTENDED_KEY_USAGE "\x00" /**< anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 } */
+
+#define OID_KP                          OID_PKIX "\x03" /**< id-kp OBJECT IDENTIFIER ::= { id-pkix 3 } */
+#define OID_SERVER_AUTH                 OID_KP "\x01" /**< id-kp-serverAuth OBJECT IDENTIFIER ::= { id-kp 1 } */
+#define OID_CLIENT_AUTH                 OID_KP "\x02" /**< id-kp-clientAuth OBJECT IDENTIFIER ::= { id-kp 2 } */
+#define OID_CODE_SIGNING                OID_KP "\x03" /**< id-kp-codeSigning OBJECT IDENTIFIER ::= { id-kp 3 } */
+#define OID_EMAIL_PROTECTION            OID_KP "\x04" /**< id-kp-emailProtection OBJECT IDENTIFIER ::= { id-kp 4 } */
+#define OID_TIME_STAMPING               OID_KP "\x08" /**< id-kp-timeStamping OBJECT IDENTIFIER ::= { id-kp 8 } */
+#define OID_OCSP_SIGNING                OID_KP "\x09" /**< id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } */
+
+/*
+ * PKCS definition OIDs
+ */
+
+#define OID_PKCS                OID_RSA_COMPANY "\x01" /**< pkcs OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) 1 } */
+#define OID_PKCS1               OID_PKCS "\x01" /**< pkcs-1 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 } */
+#define OID_PKCS5               OID_PKCS "\x05" /**< pkcs-5 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 5 } */
+#define OID_PKCS9               OID_PKCS "\x09" /**< pkcs-9 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 } */
+#define OID_PKCS12              OID_PKCS "\x0c" /**< pkcs-12 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 12 } */
+
+/*
+ * PKCS#1 OIDs
+ */
+#define OID_PKCS1_RSA           OID_PKCS1 "\x01" /**< rsaEncryption OBJECT IDENTIFIER ::= { pkcs-1 1 } */
+#define OID_PKCS1_MD2           OID_PKCS1 "\x02" /**< md2WithRSAEncryption ::= { pkcs-1 2 } */
+#define OID_PKCS1_MD4           OID_PKCS1 "\x03" /**< md4WithRSAEncryption ::= { pkcs-1 3 } */
+#define OID_PKCS1_MD5           OID_PKCS1 "\x04" /**< md5WithRSAEncryption ::= { pkcs-1 4 } */
+#define OID_PKCS1_SHA1          OID_PKCS1 "\x05" /**< sha1WithRSAEncryption ::= { pkcs-1 5 } */
+#define OID_PKCS1_SHA224        OID_PKCS1 "\x0e" /**< sha224WithRSAEncryption ::= { pkcs-1 14 } */
+#define OID_PKCS1_SHA256        OID_PKCS1 "\x0b" /**< sha256WithRSAEncryption ::= { pkcs-1 11 } */
+#define OID_PKCS1_SHA384        OID_PKCS1 "\x0c" /**< sha384WithRSAEncryption ::= { pkcs-1 12 } */
+#define OID_PKCS1_SHA512        OID_PKCS1 "\x0d" /**< sha512WithRSAEncryption ::= { pkcs-1 13 } */
+
+#define OID_RSA_SHA_OBS         "\x2B\x0E\x03\x02\x1D"
+
+#define OID_PKCS9_EMAIL         OID_PKCS9 "\x01" /**< emailAddress AttributeType ::= { pkcs-9 1 } */
+
+/* RFC 4055 */
+#define OID_RSASSA_PSS          OID_PKCS1 "\x0a" /**< id-RSASSA-PSS ::= { pkcs-1 10 } */
+#define OID_MGF1                OID_PKCS1 "\x08" /**< id-mgf1 ::= { pkcs-1 8 } */
+
+/*
+ * Digest algorithms
+ */
+#define OID_DIGEST_ALG_MD2              OID_RSA_COMPANY "\x02\x02" /**< id-md2 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 2 } */
+#define OID_DIGEST_ALG_MD4              OID_RSA_COMPANY "\x02\x04" /**< id-md4 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 4 } */
+#define OID_DIGEST_ALG_MD5              OID_RSA_COMPANY "\x02\x05" /**< id-md5 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 5 } */
+#define OID_DIGEST_ALG_SHA1             OID_ISO_IDENTIFIED_ORG OID_OIW_SECSIG_SHA1 /**< id-sha1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithms(2) 26 } */
+#define OID_DIGEST_ALG_SHA224           OID_GOV "\x03\x04\x02\x04" /**< id-sha224 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 4 } */
+#define OID_DIGEST_ALG_SHA256           OID_GOV "\x03\x04\x02\x01" /**< id-sha256 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 1 } */
+
+#define OID_DIGEST_ALG_SHA384           OID_GOV "\x03\x04\x02\x02" /**< id-sha384 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 2 } */
+
+#define OID_DIGEST_ALG_SHA512           OID_GOV "\x03\x04\x02\x03" /**< id-sha512 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) nistalgorithm(4) hashalgs(2) 3 } */
+
+#define OID_HMAC_SHA1                   OID_RSA_COMPANY "\x02\x07" /**< id-hmacWithSHA1 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2) 7 } */
+
+/*
+ * Encryption algorithms
+ */
+#define OID_DES_CBC                     OID_ISO_IDENTIFIED_ORG OID_OIW_SECSIG_ALG "\x07" /**< desCBC OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithms(2) 7 } */
+#define OID_DES_EDE3_CBC                OID_RSA_COMPANY "\x03\x07" /**< des-ede3-cbc OBJECT IDENTIFIER ::= { iso(1) member-body(2) -- us(840) rsadsi(113549) encryptionAlgorithm(3) 7 } */
+
+/*
+ * PKCS#5 OIDs
+ */
+#define OID_PKCS5_PBKDF2                OID_PKCS5 "\x0c" /**< id-PBKDF2 OBJECT IDENTIFIER ::= {pkcs-5 12} */
+#define OID_PKCS5_PBES2                 OID_PKCS5 "\x0d" /**< id-PBES2 OBJECT IDENTIFIER ::= {pkcs-5 13} */
+#define OID_PKCS5_PBMAC1                OID_PKCS5 "\x0e" /**< id-PBMAC1 OBJECT IDENTIFIER ::= {pkcs-5 14} */
+
+/*
+ * PKCS#5 PBES1 algorithms
+ */
+#define OID_PKCS5_PBE_MD2_DES_CBC       OID_PKCS5 "\x01" /**< pbeWithMD2AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 1} */
+#define OID_PKCS5_PBE_MD2_RC2_CBC       OID_PKCS5 "\x04" /**< pbeWithMD2AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 4} */
+#define OID_PKCS5_PBE_MD5_DES_CBC       OID_PKCS5 "\x03" /**< pbeWithMD5AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 3} */
+#define OID_PKCS5_PBE_MD5_RC2_CBC       OID_PKCS5 "\x06" /**< pbeWithMD5AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 6} */
+#define OID_PKCS5_PBE_SHA1_DES_CBC      OID_PKCS5 "\x0a" /**< pbeWithSHA1AndDES-CBC OBJECT IDENTIFIER ::= {pkcs-5 10} */
+#define OID_PKCS5_PBE_SHA1_RC2_CBC      OID_PKCS5 "\x0b" /**< pbeWithSHA1AndRC2-CBC OBJECT IDENTIFIER ::= {pkcs-5 11} */
+
+/*
+ * PKCS#8 OIDs
+ */
+#define OID_PKCS9_CSR_EXT_REQ           OID_PKCS9 "\x0e" /**< extensionRequest OBJECT IDENTIFIER ::= {pkcs-9 14} */
+
+/*
+ * PKCS#12 PBE OIDs
+ */
+#define OID_PKCS12_PBE                      OID_PKCS12 "\x01" /**< pkcs-12PbeIds OBJECT IDENTIFIER ::= {pkcs-12 1} */
+
+#define OID_PKCS12_PBE_SHA1_RC4_128         OID_PKCS12_PBE "\x01" /**< pbeWithSHAAnd128BitRC4 OBJECT IDENTIFIER ::= {pkcs-12PbeIds 1} */
+#define OID_PKCS12_PBE_SHA1_RC4_40          OID_PKCS12_PBE "\x02" /**< pbeWithSHAAnd40BitRC4 OBJECT IDENTIFIER ::= {pkcs-12PbeIds 2} */
+#define OID_PKCS12_PBE_SHA1_DES3_EDE_CBC    OID_PKCS12_PBE "\x03" /**< pbeWithSHAAnd3-KeyTripleDES-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 3} */
+#define OID_PKCS12_PBE_SHA1_DES2_EDE_CBC    OID_PKCS12_PBE "\x04" /**< pbeWithSHAAnd2-KeyTripleDES-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 4} */
+#define OID_PKCS12_PBE_SHA1_RC2_128_CBC     OID_PKCS12_PBE "\x05" /**< pbeWithSHAAnd128BitRC2-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 5} */
+#define OID_PKCS12_PBE_SHA1_RC2_40_CBC      OID_PKCS12_PBE "\x06" /**< pbeWithSHAAnd40BitRC2-CBC OBJECT IDENTIFIER ::= {pkcs-12PbeIds 6} */
+
+/*
+ * EC key algorithms from RFC 5480
+ */
+
+/* id-ecPublicKey OBJECT IDENTIFIER ::= {
+ *       iso(1) member-body(2) us(840) ansi-X9-62(10045) keyType(2) 1 } */
+#define OID_EC_ALG_UNRESTRICTED         OID_ANSI_X9_62 "\x02\01"
+
+/*   id-ecDH OBJECT IDENTIFIER ::= {
+ *     iso(1) identified-organization(3) certicom(132)
+ *     schemes(1) ecdh(12) } */
+#define OID_EC_ALG_ECDH                 OID_CERTICOM "\x01\x0c"
+
+/*
+ * ECParameters namedCurve identifiers, from RFC 5480, RFC 5639, and SEC2
+ */
+
+/* secp192r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3) prime(1) 1 } */
+#define OID_EC_GRP_SECP192R1        OID_ANSI_X9_62 "\x03\x01\x01"
+
+/* secp224r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 33 } */
+#define OID_EC_GRP_SECP224R1        OID_CERTICOM "\x00\x21"
+
+/* secp256r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3) prime(1) 7 } */
+#define OID_EC_GRP_SECP256R1        OID_ANSI_X9_62 "\x03\x01\x07"
+
+/* secp384r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 34 } */
+#define OID_EC_GRP_SECP384R1        OID_CERTICOM "\x00\x22"
+
+/* secp521r1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 35 } */
+#define OID_EC_GRP_SECP521R1        OID_CERTICOM "\x00\x23"
+
+/* secp192k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 31 } */
+#define OID_EC_GRP_SECP192K1        OID_CERTICOM "\x00\x1f"
+
+/* secp224k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 32 } */
+#define OID_EC_GRP_SECP224K1        OID_CERTICOM "\x00\x20"
+
+/* secp256k1 OBJECT IDENTIFIER ::= {
+ *   iso(1) identified-organization(3) certicom(132) curve(0) 10 } */
+#define OID_EC_GRP_SECP256K1        OID_CERTICOM "\x00\x0a"
+
+/* RFC 5639 4.1
+ * ecStdCurvesAndGeneration OBJECT IDENTIFIER::= {iso(1)
+ * identified-organization(3) teletrust(36) algorithm(3) signature-
+ * algorithm(3) ecSign(2) 8}
+ * ellipticCurve OBJECT IDENTIFIER ::= {ecStdCurvesAndGeneration 1}
+ * versionOne OBJECT IDENTIFIER ::= {ellipticCurve 1} */
+#define OID_EC_BRAINPOOL_V1         OID_TELETRUST "\x03\x03\x02\x08\x01\x01"
+
+/* brainpoolP256r1 OBJECT IDENTIFIER ::= {versionOne 7} */
+#define OID_EC_GRP_BP256R1          OID_EC_BRAINPOOL_V1 "\x07"
+
+/* brainpoolP384r1 OBJECT IDENTIFIER ::= {versionOne 11} */
+#define OID_EC_GRP_BP384R1          OID_EC_BRAINPOOL_V1 "\x0B"
+
+/* brainpoolP512r1 OBJECT IDENTIFIER ::= {versionOne 13} */
+#define OID_EC_GRP_BP512R1          OID_EC_BRAINPOOL_V1 "\x0D"
+
+/*
+ * SEC1 C.1
+ *
+ * prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
+ * id-fieldType OBJECT IDENTIFIER ::= { ansi-X9-62 fieldType(1)}
+ */
+#define OID_ANSI_X9_62_FIELD_TYPE   OID_ANSI_X9_62 "\x01"
+#define OID_ANSI_X9_62_PRIME_FIELD  OID_ANSI_X9_62_FIELD_TYPE "\x01"
+
+/*
+ * ECDSA signature identifiers, from RFC 5480
+ */
+#define OID_ANSI_X9_62_SIG          OID_ANSI_X9_62 "\x04" /* signatures(4) */
+#define OID_ANSI_X9_62_SIG_SHA2     OID_ANSI_X9_62_SIG "\x03" /* ecdsa-with-SHA2(3) */
+
+/* ecdsa-with-SHA1 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4) 1 } */
+#define OID_ECDSA_SHA1              OID_ANSI_X9_62_SIG "\x01"
+
+/* ecdsa-with-SHA224 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 1 } */
+#define OID_ECDSA_SHA224            OID_ANSI_X9_62_SIG_SHA2 "\x01"
+
+/* ecdsa-with-SHA256 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 2 } */
+#define OID_ECDSA_SHA256            OID_ANSI_X9_62_SIG_SHA2 "\x02"
+
+/* ecdsa-with-SHA384 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 3 } */
+#define OID_ECDSA_SHA384            OID_ANSI_X9_62_SIG_SHA2 "\x03"
+
+/* ecdsa-with-SHA512 OBJECT IDENTIFIER ::= {
+ *   iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4)
+ *   ecdsa-with-SHA2(3) 4 } */
+#define OID_ECDSA_SHA512            OID_ANSI_X9_62_SIG_SHA2 "\x04"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Base OID descriptor structure
+ */
+typedef struct {
+    const char *asn1;               /*!< OID ASN.1 representation       */
+    size_t asn1_len;                /*!< length of asn1                 */
+    const char *name;               /*!< official name (e.g. from RFC)  */
+    const char *description;        /*!< human friendly description     */
+} oid_descriptor_t;
+
+/**
+ * \brief           Translate an ASN.1 OID into its numeric representation
+ *                  (e.g. "\x2A\x86\x48\x86\xF7\x0D" into "1.2.840.113549")
+ *
+ * \param buf       buffer to put representation in
+ * \param size      size of the buffer
+ * \param oid       OID to translate
+ *
+ * \return          Length of the string written (excluding final NULL) or
+ *                  POLARSSL_ERR_OID_BUF_TO_SMALL in case of error
+ */
+int oid_get_numeric_string( char *buf, size_t size, const asn1_buf *oid );
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
+/**
+ * \brief          Translate an X.509 extension OID into local values
+ *
+ * \param oid      OID to use
+ * \param ext_type place to store the extension type
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_x509_ext_type( const asn1_buf *oid, int *ext_type );
+#endif
+
+/**
+ * \brief          Translate an X.509 attribute type OID into the short name
+ *                 (e.g. the OID for an X520 Common Name into "CN")
+ *
+ * \param oid      OID to use
+ * \param short_name    place to store the string pointer
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_attr_short_name( const asn1_buf *oid, const char **short_name );
+
+/**
+ * \brief          Translate PublicKeyAlgorithm OID into pk_type
+ *
+ * \param oid      OID to use
+ * \param pk_alg   place to store public key algorithm
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_pk_alg( const asn1_buf *oid, pk_type_t *pk_alg );
+
+/**
+ * \brief          Translate pk_type into PublicKeyAlgorithm OID
+ *
+ * \param pk_alg   Public key type to look for
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_oid_by_pk_alg( pk_type_t pk_alg,
+                           const char **oid, size_t *olen );
+
+#if defined(POLARSSL_ECP_C)
+/**
+ * \brief          Translate NamedCurve OID into an EC group identifier
+ *
+ * \param oid      OID to use
+ * \param grp_id   place to store group id
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_ec_grp( const asn1_buf *oid, ecp_group_id *grp_id );
+
+/**
+ * \brief          Translate EC group identifier into NamedCurve OID
+ *
+ * \param grp_id   EC group identifier
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_oid_by_ec_grp( ecp_group_id grp_id,
+                           const char **oid, size_t *olen );
+#endif /* POLARSSL_ECP_C */
+
+#if defined(POLARSSL_MD_C)
+/**
+ * \brief          Translate SignatureAlgorithm OID into md_type and pk_type
+ *
+ * \param oid      OID to use
+ * \param md_alg   place to store message digest algorithm
+ * \param pk_alg   place to store public key algorithm
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_sig_alg( const asn1_buf *oid,
+                     md_type_t *md_alg, pk_type_t *pk_alg );
+
+/**
+ * \brief          Translate SignatureAlgorithm OID into description
+ *
+ * \param oid      OID to use
+ * \param desc     place to store string pointer
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_sig_alg_desc( const asn1_buf *oid, const char **desc );
+
+/**
+ * \brief          Translate md_type and pk_type into SignatureAlgorithm OID
+ *
+ * \param md_alg   message digest algorithm
+ * \param pk_alg   public key algorithm
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_oid_by_sig_alg( pk_type_t pk_alg, md_type_t md_alg,
+                            const char **oid, size_t *olen );
+
+/**
+ * \brief          Translate hash algorithm OID into md_type
+ *
+ * \param oid      OID to use
+ * \param md_alg   place to store message digest algorithm
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_md_alg( const asn1_buf *oid, md_type_t *md_alg );
+#endif /* POLARSSL_MD_C */
+
+/**
+ * \brief          Translate Extended Key Usage OID into description
+ *
+ * \param oid      OID to use
+ * \param desc     place to store string pointer
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_extended_key_usage( const asn1_buf *oid, const char **desc );
+
+/**
+ * \brief          Translate md_type into hash algorithm OID
+ *
+ * \param md_alg   message digest algorithm
+ * \param oid      place to store ASN.1 OID string pointer
+ * \param olen     length of the OID
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_oid_by_md( md_type_t md_alg, const char **oid, size_t *olen );
+
+#if defined(POLARSSL_CIPHER_C)
+/**
+ * \brief          Translate encryption algorithm OID into cipher_type
+ *
+ * \param oid           OID to use
+ * \param cipher_alg    place to store cipher algorithm
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_cipher_alg( const asn1_buf *oid, cipher_type_t *cipher_alg );
+#endif /* POLARSSL_CIPHER_C */
+
+#if defined(POLARSSL_PKCS12_C)
+/**
+ * \brief          Translate PKCS#12 PBE algorithm OID into md_type and
+ *                 cipher_type
+ *
+ * \param oid           OID to use
+ * \param md_alg        place to store message digest algorithm
+ * \param cipher_alg    place to store cipher algorithm
+ *
+ * \return         0 if successful, or POLARSSL_ERR_OID_NOT_FOUND
+ */
+int oid_get_pkcs12_pbe_alg( const asn1_buf *oid, md_type_t *md_alg,
+                            cipher_type_t *cipher_alg );
+#endif /* POLARSSL_PKCS12_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* oid.h */
diff --git a/Externals/polarssl/include/polarssl/openssl.h b/Externals/polarssl/include/polarssl/openssl.h
index 62609a2973..b77e7dacb7 100644
--- a/Externals/polarssl/include/polarssl/openssl.h
+++ b/Externals/polarssl/include/polarssl/openssl.h
@@ -62,6 +62,10 @@
 #define AES_cbc_encrypt( INPUT, OUTPUT, LEN, CTX, IV, MODE ) \
         aes_crypt_cbc( (CTX), (MODE), (LEN), (IV), (INPUT), (OUTPUT) )
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * RSA stuff follows. TODO: needs cleanup
  */
@@ -76,7 +80,7 @@ inline rsa_context* d2i_RSA_PUBKEY( void *ignore, unsigned char **bufptr,
 {
     unsigned char *buffer = *(unsigned char **) bufptr;
     rsa_context *rsa;
-    
+
     /*
      * Not a general-purpose parser: only parses public key from *exactly*
      *   openssl genrsa -out privkey.pem 512 (or 1024)
@@ -94,7 +98,7 @@ inline rsa_context* d2i_RSA_PUBKEY( void *ignore, unsigned char **bufptr,
 
     memset( rsa, 0, sizeof( rsa_context ) );
 
-    if( ( len ==  94 && 
+    if( ( len ==  94 &&
           mpi_read_binary( &rsa->N, &buffer[ 25],  64 ) == 0 &&
           mpi_read_binary( &rsa->E, &buffer[ 91],   3 ) == 0 ) ||
         ( len == 162 &&
diff --git a/Externals/polarssl/include/polarssl/padlock.h b/Externals/polarssl/include/polarssl/padlock.h
index 9df75cc7dd..3c5f7258b4 100644
--- a/Externals/polarssl/include/polarssl/padlock.h
+++ b/Externals/polarssl/include/polarssl/padlock.h
@@ -1,9 +1,10 @@
 /**
  * \file padlock.h
  *
- * \brief VIA PadLock ACE for HW encryption/decryption supported by some processors
+ * \brief VIA PadLock ACE for HW encryption/decryption supported by some
+ *        processors
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -37,7 +38,7 @@
 #define POLARSSL_HAVE_X86
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef INT32 int32_t;
 #else
@@ -59,7 +60,7 @@ extern "C" {
 /**
  * \brief          PadLock detection routine
  *
- * \param          The feature to detect
+ * \param feature  The feature to detect
  *
  * \return         1 if CPU has support for the feature, 0 otherwise
  */
diff --git a/Externals/polarssl/include/polarssl/pbkdf2.h b/Externals/polarssl/include/polarssl/pbkdf2.h
index e2e61b5f1d..5ccb2fa9f2 100644
--- a/Externals/polarssl/include/polarssl/pbkdf2.h
+++ b/Externals/polarssl/include/polarssl/pbkdf2.h
@@ -34,7 +34,7 @@
 
 #include "md.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
diff --git a/Externals/polarssl/include/polarssl/pem.h b/Externals/polarssl/include/polarssl/pem.h
index e95dc10a0b..e606cf08eb 100644
--- a/Externals/polarssl/include/polarssl/pem.h
+++ b/Externals/polarssl/include/polarssl/pem.h
@@ -46,6 +46,11 @@
 #define POLARSSL_ERR_PEM_BAD_INPUT_DATA                    -0x1480  /**< Bad input parameters to function. */
 /* \} name */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(POLARSSL_PEM_PARSE_C)
 /**
  * \brief       PEM context structure
  */
@@ -57,10 +62,6 @@ typedef struct
 }
 pem_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief       PEM context setup
  *
@@ -84,9 +85,13 @@ void pem_init( pem_context *ctx );
  *                  POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT, use_len is
  *                  the length to skip)
  *
- * \return          0 on success, ior a specific PEM error code
+ * \note            Attempts to check password correctness by verifying if
+ *                  the decrypted text starts with an ASN.1 sequence of
+ *                  appropriate length
+ *
+ * \return          0 on success, or a specific PEM error code
  */
-int pem_read_buffer( pem_context *ctx, char *header, char *footer,
+int pem_read_buffer( pem_context *ctx, const char *header, const char *footer,
                      const unsigned char *data,
                      const unsigned char *pwd,
                      size_t pwdlen, size_t *use_len );
@@ -97,6 +102,29 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer,
  * \param ctx   context to be freed
  */
 void pem_free( pem_context *ctx );
+#endif /* POLARSSL_PEM_PARSE_C */
+
+#if defined(POLARSSL_PEM_WRITE_C)
+/**
+ * \brief           Write a buffer of PEM information from a DER encoded
+ *                  buffer.
+ *
+ * \param header    header string to write
+ * \param footer    footer string to write
+ * \param der_data  DER data to write
+ * \param der_len   length of the DER data
+ * \param buf       buffer to write to
+ * \param buf_len   length of output buffer
+ * \param olen      total length written / required (if buf_len is not enough)
+ *
+ * \return          0 on success, or a specific PEM or BASE64 error code. On
+ *                  POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL olen is the required
+ *                  size.
+ */
+int pem_write_buffer( const char *header, const char *footer,
+                      const unsigned char *der_data, size_t der_len,
+                      unsigned char *buf, size_t buf_len, size_t *olen );
+#endif /* POLARSSL_PEM_WRITE_C */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/pk.h b/Externals/polarssl/include/polarssl/pk.h
new file mode 100644
index 0000000000..754dda2190
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/pk.h
@@ -0,0 +1,632 @@
+/**
+ * \file pk.h
+ *
+ * \brief Public Key abstraction layer
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef POLARSSL_PK_H
+#define POLARSSL_PK_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include "md.h"
+
+#if defined(POLARSSL_RSA_C)
+#include "rsa.h"
+#endif
+
+#if defined(POLARSSL_ECP_C)
+#include "ecp.h"
+#endif
+
+#if defined(POLARSSL_ECDSA_C)
+#include "ecdsa.h"
+#endif
+
+#define POLARSSL_ERR_PK_MALLOC_FAILED       -0x2F80  /**< Memory alloation failed. */
+#define POLARSSL_ERR_PK_TYPE_MISMATCH       -0x2F00  /**< Type mismatch, eg attempt to encrypt with an ECDSA key */
+#define POLARSSL_ERR_PK_BAD_INPUT_DATA      -0x2E80  /**< Bad input parameters to function. */
+#define POLARSSL_ERR_PK_FILE_IO_ERROR       -0x2E00  /**< Read/write of file failed. */
+#define POLARSSL_ERR_PK_KEY_INVALID_VERSION -0x2D80  /**< Unsupported key version */
+#define POLARSSL_ERR_PK_KEY_INVALID_FORMAT  -0x2D00  /**< Invalid key tag or value. */
+#define POLARSSL_ERR_PK_UNKNOWN_PK_ALG      -0x2C80  /**< Key algorithm is unsupported (only RSA and EC are supported). */
+#define POLARSSL_ERR_PK_PASSWORD_REQUIRED   -0x2C00  /**< Private key password can't be empty. */
+#define POLARSSL_ERR_PK_PASSWORD_MISMATCH   -0x2B80  /**< Given private key password does not allow for correct decryption. */
+#define POLARSSL_ERR_PK_INVALID_PUBKEY      -0x2B00  /**< The pubkey tag or value is invalid (only RSA and EC are supported). */
+#define POLARSSL_ERR_PK_INVALID_ALG         -0x2A80  /**< The algorithm tag or value is invalid. */
+#define POLARSSL_ERR_PK_UNKNOWN_NAMED_CURVE -0x2A00  /**< Elliptic curve is unsupported (only NIST curves are supported). */
+#define POLARSSL_ERR_PK_FEATURE_UNAVAILABLE -0x2980  /**< Unavailable feature, e.g. RSA disabled for RSA key. */
+#define POLARSSL_ERR_PK_SIG_LEN_MISMATCH    -0x2000  /**< The signature is valid but its length is less than expected. */
+
+
+#if defined(POLARSSL_RSA_C)
+/**
+ * Quick access to an RSA context inside a PK context.
+ *
+ * \warning You must make sure the PK context actually holds an RSA context
+ * before using this macro!
+ */
+#define pk_rsa( pk )        ( (rsa_context *) (pk).pk_ctx )
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+/**
+ * Quick access to an EC context inside a PK context.
+ *
+ * \warning You must make sure the PK context actually holds an EC context
+ * before using this macro!
+ */
+#define pk_ec( pk )         ( (ecp_keypair *) (pk).pk_ctx )
+#endif /* POLARSSL_ECP_C */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Public key types
+ */
+typedef enum {
+    POLARSSL_PK_NONE=0,
+    POLARSSL_PK_RSA,
+    POLARSSL_PK_ECKEY,
+    POLARSSL_PK_ECKEY_DH,
+    POLARSSL_PK_ECDSA,
+    POLARSSL_PK_RSA_ALT,
+    POLARSSL_PK_RSASSA_PSS,
+} pk_type_t;
+
+/**
+ * \brief           Options for RSASSA-PSS signature verification.
+ *                  See \c rsa_rsassa_pss_verify_ext()
+ */
+typedef struct
+{
+    md_type_t mgf1_hash_id;
+    int expected_salt_len;
+
+} pk_rsassa_pss_options;
+
+/**
+ * \brief           Types for interfacing with the debug module
+ */
+typedef enum
+{
+    POLARSSL_PK_DEBUG_NONE = 0,
+    POLARSSL_PK_DEBUG_MPI,
+    POLARSSL_PK_DEBUG_ECP,
+} pk_debug_type;
+
+/**
+ * \brief           Item to send to the debug module
+ */
+typedef struct
+{
+    pk_debug_type type;
+    const char *name;
+    void *value;
+} pk_debug_item;
+
+/** Maximum number of item send for debugging, plus 1 */
+#define POLARSSL_PK_DEBUG_MAX_ITEMS 3
+
+/**
+ * \brief           Public key information and operations
+ */
+typedef struct
+{
+    /** Public key type */
+    pk_type_t type;
+
+    /** Type name */
+    const char *name;
+
+    /** Get key size in bits */
+    size_t (*get_size)( const void * );
+
+    /** Tell if the context implements this type (e.g. ECKEY can do ECDSA) */
+    int (*can_do)( pk_type_t type );
+
+    /** Verify signature */
+    int (*verify_func)( void *ctx, md_type_t md_alg,
+                        const unsigned char *hash, size_t hash_len,
+                        const unsigned char *sig, size_t sig_len );
+
+    /** Make signature */
+    int (*sign_func)( void *ctx, md_type_t md_alg,
+                      const unsigned char *hash, size_t hash_len,
+                      unsigned char *sig, size_t *sig_len,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng );
+
+    /** Decrypt message */
+    int (*decrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen, size_t osize,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng );
+
+    /** Encrypt message */
+    int (*encrypt_func)( void *ctx, const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen, size_t osize,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng );
+
+    /** Allocate a new context */
+    void * (*ctx_alloc_func)( void );
+
+    /** Free the given context */
+    void (*ctx_free_func)( void *ctx );
+
+    /** Interface with the debug module */
+    void (*debug_func)( const void *ctx, pk_debug_item *items );
+
+} pk_info_t;
+
+/**
+ * \brief           Public key container
+ */
+typedef struct
+{
+    const pk_info_t *   pk_info;    /**< Public key informations        */
+    void *              pk_ctx;     /**< Underlying public key context  */
+} pk_context;
+
+/**
+ * \brief           Types for RSA-alt abstraction
+ */
+typedef int (*pk_rsa_alt_decrypt_func)( void *ctx, int mode, size_t *olen,
+                    const unsigned char *input, unsigned char *output,
+                    size_t output_max_len );
+typedef int (*pk_rsa_alt_sign_func)( void *ctx,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
+                    int mode, md_type_t md_alg, unsigned int hashlen,
+                    const unsigned char *hash, unsigned char *sig );
+typedef size_t (*pk_rsa_alt_key_len_func)( void *ctx );
+
+/**
+ * \brief           Return information associated with the given PK type
+ *
+ * \param pk_type   PK type to search for.
+ *
+ * \return          The PK info associated with the type or NULL if not found.
+ */
+const pk_info_t *pk_info_from_type( pk_type_t pk_type );
+
+/**
+ * \brief           Initialize a pk_context (as NONE)
+ */
+void pk_init( pk_context *ctx );
+
+/**
+ * \brief           Free a pk_context
+ */
+void pk_free( pk_context *ctx );
+
+/**
+ * \brief           Initialize a PK context with the information given
+ *                  and allocates the type-specific PK subcontext.
+ *
+ * \param ctx       Context to initialize. Must be empty (type NONE).
+ * \param info      Information to use
+ *
+ * \return          0 on success,
+ *                  POLARSSL_ERR_PK_BAD_INPUT_DATA on invalid input,
+ *                  POLARSSL_ERR_PK_MALLOC_FAILED on allocation failure.
+ *
+ * \note            For contexts holding an RSA-alt key, use
+ *                  \c pk_init_ctx_rsa_alt() instead.
+ */
+int pk_init_ctx( pk_context *ctx, const pk_info_t *info );
+
+/**
+ * \brief           Initialize an RSA-alt context
+ *
+ * \param ctx       Context to initialize. Must be empty (type NONE).
+ * \param key       RSA key pointer
+ * \param decrypt_func  Decryption function
+ * \param sign_func     Signing function
+ * \param key_len_func  Function returning key length in bytes
+ *
+ * \return          0 on success, or POLARSSL_ERR_PK_BAD_INPUT_DATA if the
+ *                  context wasn't already initialized as RSA_ALT.
+ *
+ * \note            This function replaces \c pk_init_ctx() for RSA-alt.
+ */
+int pk_init_ctx_rsa_alt( pk_context *ctx, void * key,
+                         pk_rsa_alt_decrypt_func decrypt_func,
+                         pk_rsa_alt_sign_func sign_func,
+                         pk_rsa_alt_key_len_func key_len_func );
+
+/**
+ * \brief           Get the size in bits of the underlying key
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Key size in bits, or 0 on error
+ */
+size_t pk_get_size( const pk_context *ctx );
+
+/**
+ * \brief           Get the length in bytes of the underlying key
+ * \param ctx       Context to use
+ *
+ * \return          Key length in bytes, or 0 on error
+ */
+static inline size_t pk_get_len( const pk_context *ctx )
+{
+    return( ( pk_get_size( ctx ) + 7 ) / 8 );
+}
+
+/**
+ * \brief           Tell if a context can do the operation given by type
+ *
+ * \param ctx       Context to test
+ * \param type      Target type
+ *
+ * \return          0 if context can't do the operations,
+ *                  1 otherwise.
+ */
+int pk_can_do( pk_context *ctx, pk_type_t type );
+
+/**
+ * \brief           Verify signature (including padding if relevant).
+ *
+ * \param ctx       PK context to use
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Signature to verify
+ * \param sig_len   Signature length
+ *
+ * \return          0 on success (signature is valid),
+ *                  POLARSSL_ERR_PK_SIG_LEN_MISMATCH if the signature is
+ *                  valid but its actual length is less than sig_len,
+ *                  or a specific error code.
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *                  Use \c pk_verify_ext( POLARSSL_PK_RSASSA_PSS, ... )
+ *                  to verify RSASSA_PSS signatures.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            md_alg may be POLARSSL_MD_NONE, only if hash_len != 0
+ */
+int pk_verify( pk_context *ctx, md_type_t md_alg,
+               const unsigned char *hash, size_t hash_len,
+               const unsigned char *sig, size_t sig_len );
+
+/**
+ * \brief           Verify signature, with options.
+ *                  (Includes verification of the padding depending on type.)
+ *
+ * \param type      Signature type (inc. possible padding type) to verify
+ * \param options   Pointer to type-specific options, or NULL
+ * \param ctx       PK context to use
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Signature to verify
+ * \param sig_len   Signature length
+ *
+ * \return          0 on success (signature is valid),
+ *                  POLARSSL_ERR_PK_TYPE_MISMATCH if the PK context can't be
+ *                  used for this type of signatures,
+ *                  POLARSSL_ERR_PK_SIG_LEN_MISMATCH if the signature is
+ *                  valid but its actual length is less than sig_len,
+ *                  or a specific error code.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            md_alg may be POLARSSL_MD_NONE, only if hash_len != 0
+ *
+ * \note            If type is POLARSSL_PK_RSASSA_PSS, then options must point
+ *                  to a pk_rsassa_pss_options structure,
+ *                  otherwise it must be NULL.
+ */
+int pk_verify_ext( pk_type_t type, const void *options,
+                   pk_context *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len );
+
+/**
+ * \brief           Make signature, including padding if relevant.
+ *
+ * \param ctx       PK context to use
+ * \param md_alg    Hash algorithm used (see notes)
+ * \param hash      Hash of the message to sign
+ * \param hash_len  Hash length or 0 (see notes)
+ * \param sig       Place to write the signature
+ * \param sig_len   Number of bytes written
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 on success, or a specific error code.
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *                  There is no interface in the PK module to make RSASSA-PSS
+ *                  signatures yet.
+ *
+ * \note            If hash_len is 0, then the length associated with md_alg
+ *                  is used instead, or an error returned if it is invalid.
+ *
+ * \note            md_alg may be POLARSSL_MD_NONE, only if hash_len != 0
+ */
+int pk_sign( pk_context *ctx, md_type_t md_alg,
+             const unsigned char *hash, size_t hash_len,
+             unsigned char *sig, size_t *sig_len,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Decrypt message (including padding if relevant).
+ *
+ * \param ctx       PK context to use
+ * \param input     Input to decrypt
+ * \param ilen      Input size
+ * \param output    Decrypted output
+ * \param olen      Decrypted message length
+ * \param osize     Size of the output buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *
+ * \return          0 on success, or a specific error code.
+ */
+int pk_decrypt( pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Encrypt message (including padding if relevant).
+ *
+ * \param ctx       PK context to use
+ * \param input     Message to encrypt
+ * \param ilen      Message size
+ * \param output    Encrypted output
+ * \param olen      Encrypted output length
+ * \param osize     Size of the output buffer
+ * \param f_rng     RNG function
+ * \param p_rng     RNG parameter
+ *
+ * \note            For RSA keys, the default padding type is PKCS#1 v1.5.
+ *
+ * \return          0 on success, or a specific error code.
+ */
+int pk_encrypt( pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+/**
+ * \brief           Export debug information
+ *
+ * \param ctx       Context to use
+ * \param items     Place to write debug items
+ *
+ * \return          0 on success or POLARSSL_ERR_PK_BAD_INPUT_DATA
+ */
+int pk_debug( const pk_context *ctx, pk_debug_item *items );
+
+/**
+ * \brief           Access the type name
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Type name on success, or "invalid PK"
+ */
+const char * pk_get_name( const pk_context *ctx );
+
+/**
+ * \brief           Get the key type
+ *
+ * \param ctx       Context to use
+ *
+ * \return          Type on success, or POLARSSL_PK_NONE
+ */
+pk_type_t pk_get_type( const pk_context *ctx );
+
+#if defined(POLARSSL_PK_PARSE_C)
+/** \ingroup pk_module */
+/**
+ * \brief           Parse a private key
+ *
+ * \param ctx       key to be initialized
+ * \param key       input buffer
+ * \param keylen    size of the buffer
+ * \param pwd       password for decryption (optional)
+ * \param pwdlen    size of the password
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with pk_init() or reset with pk_free(). If you need a
+ *                  specific key type, check the result with pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int pk_parse_key( pk_context *ctx,
+                  const unsigned char *key, size_t keylen,
+                  const unsigned char *pwd, size_t pwdlen );
+
+/** \ingroup pk_module */
+/**
+ * \brief           Parse a public key
+ *
+ * \param ctx       key to be initialized
+ * \param key       input buffer
+ * \param keylen    size of the buffer
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with pk_init() or reset with pk_free(). If you need a
+ *                  specific key type, check the result with pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int pk_parse_public_key( pk_context *ctx,
+                         const unsigned char *key, size_t keylen );
+
+#if defined(POLARSSL_FS_IO)
+/** \ingroup pk_module */
+/**
+ * \brief           Load and parse a private key
+ *
+ * \param ctx       key to be initialized
+ * \param path      filename to read the private key from
+ * \param password  password to decrypt the file (can be NULL)
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with pk_init() or reset with pk_free(). If you need a
+ *                  specific key type, check the result with pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int pk_parse_keyfile( pk_context *ctx,
+                      const char *path, const char *password );
+
+/** \ingroup pk_module */
+/**
+ * \brief           Load and parse a public key
+ *
+ * \param ctx       key to be initialized
+ * \param path      filename to read the private key from
+ *
+ * \note            On entry, ctx must be empty, either freshly initialised
+ *                  with pk_init() or reset with pk_free(). If you need a
+ *                  specific key type, check the result with pk_can_do().
+ *
+ * \note            The key is also checked for correctness.
+ *
+ * \return          0 if successful, or a specific PK or PEM error code
+ */
+int pk_parse_public_keyfile( pk_context *ctx, const char *path );
+#endif /* POLARSSL_FS_IO */
+#endif /* POLARSSL_PK_PARSE_C */
+
+#if defined(POLARSSL_PK_WRITE_C)
+/**
+ * \brief           Write a private key to a PKCS#1 or SEC1 DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       private to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ */
+int pk_write_key_der( pk_context *ctx, unsigned char *buf, size_t size );
+
+/**
+ * \brief           Write a public key to a SubjectPublicKeyInfo DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       public key to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ */
+int pk_write_pubkey_der( pk_context *ctx, unsigned char *buf, size_t size );
+
+#if defined(POLARSSL_PEM_WRITE_C)
+/**
+ * \brief           Write a public key to a PEM string
+ *
+ * \param ctx       public key to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          0 successful, or a specific error code
+ */
+int pk_write_pubkey_pem( pk_context *ctx, unsigned char *buf, size_t size );
+
+/**
+ * \brief           Write a private key to a PKCS#1 or SEC1 PEM string
+ *
+ * \param ctx       private to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ *
+ * \return          0 successful, or a specific error code
+ */
+int pk_write_key_pem( pk_context *ctx, unsigned char *buf, size_t size );
+#endif /* POLARSSL_PEM_WRITE_C */
+#endif /* POLARSSL_PK_WRITE_C */
+
+/*
+ * WARNING: Low-level functions. You probably do not want to use these unless
+ *          you are certain you do ;)
+ */
+
+#if defined(POLARSSL_PK_PARSE_C)
+/**
+ * \brief           Parse a SubjectPublicKeyInfo DER structure
+ *
+ * \param p         the position in the ASN.1 data
+ * \param end       end of the buffer
+ * \param pk        the key to fill
+ *
+ * \return          0 if successful, or a specific PK error code
+ */
+int pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        pk_context *pk );
+#endif /* POLARSSL_PK_PARSE_C */
+
+#if defined(POLARSSL_PK_WRITE_C)
+/**
+ * \brief           Write a subjectPublicKey to ASN.1 data
+ *                  Note: function works backwards in data buffer
+ *
+ * \param p         reference to current position pointer
+ * \param start     start of the buffer (for bounds-checking)
+ * \param key       public key to write away
+ *
+ * \return          the length written or a negative error code
+ */
+int pk_write_pubkey( unsigned char **p, unsigned char *start,
+                     const pk_context *key );
+#endif /* POLARSSL_PK_WRITE_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* POLARSSL_PK_H */
diff --git a/Externals/polarssl/include/polarssl/pk_wrap.h b/Externals/polarssl/include/polarssl/pk_wrap.h
new file mode 100644
index 0000000000..7baafb95da
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/pk_wrap.h
@@ -0,0 +1,63 @@
+/**
+ * \file pk.h
+ *
+ * \brief Public Key abstraction layer: wrapper functions
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef POLARSSL_PK_WRAP_H
+#define POLARSSL_PK_WRAP_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include "pk.h"
+
+/* Container for RSA-alt */
+typedef struct
+{
+    void *key;
+    pk_rsa_alt_decrypt_func decrypt_func;
+    pk_rsa_alt_sign_func sign_func;
+    pk_rsa_alt_key_len_func key_len_func;
+} rsa_alt_context;
+
+#if defined(POLARSSL_RSA_C)
+extern const pk_info_t rsa_info;
+#endif
+
+#if defined(POLARSSL_ECP_C)
+extern const pk_info_t eckey_info;
+extern const pk_info_t eckeydh_info;
+#endif
+
+#if defined(POLARSSL_ECDSA_C)
+extern const pk_info_t ecdsa_info;
+#endif
+
+extern const pk_info_t rsa_alt_info;
+
+#endif /* POLARSSL_PK_WRAP_H */
diff --git a/Externals/polarssl/include/polarssl/pkcs11.h b/Externals/polarssl/include/polarssl/pkcs11.h
index 003d3f52df..84f862dd90 100644
--- a/Externals/polarssl/include/polarssl/pkcs11.h
+++ b/Externals/polarssl/include/polarssl/pkcs11.h
@@ -5,7 +5,7 @@
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,11 +29,15 @@
 #ifndef POLARSSL_PKCS11_H
 #define POLARSSL_PKCS11_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_PKCS11_C)
 
-#include "x509.h"
+#include "x509_crt.h"
 
 #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
 
@@ -45,6 +49,10 @@
 #endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Context for PKCS #11 private keys.
  */
@@ -61,7 +69,7 @@ typedef struct {
  *
  * \return              0 on success.
  */
-int pkcs11_x509_cert_init( x509_cert *cert, pkcs11h_certificate_t pkcs11h_cert );
+int pkcs11_x509_cert_init( x509_crt *cert, pkcs11h_certificate_t pkcs11h_cert );
 
 /**
  * Initialise a pkcs11_context, storing the given certificate. Note that the
@@ -85,7 +93,8 @@ int pkcs11_priv_key_init( pkcs11_context *priv_key,
 void pkcs11_priv_key_free( pkcs11_context *priv_key );
 
 /**
- * \brief          Do an RSA private key decrypt, then remove the message padding
+ * \brief          Do an RSA private key decrypt, then remove the message
+ *                 padding
  *
  * \param ctx      PKCS #11 context
  * \param mode     must be RSA_PRIVATE, for compatibility with rsa.c's signature
@@ -111,8 +120,8 @@ int pkcs11_decrypt( pkcs11_context *ctx,
  *
  * \param ctx      PKCS #11 context
  * \param mode     must be RSA_PRIVATE, for compatibility with rsa.c's signature
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer that will hold the ciphertext
  *
@@ -124,7 +133,7 @@ int pkcs11_decrypt( pkcs11_context *ctx,
  */
 int pkcs11_sign( pkcs11_context *ctx,
                     int mode,
-                    int hash_id,
+                    md_type_t md_alg,
                     unsigned int hashlen,
                     const unsigned char *hash,
                     unsigned char *sig );
@@ -140,14 +149,14 @@ static inline int ssl_pkcs11_decrypt( void *ctx, int mode, size_t *olen,
                            output_max_len );
 }
 
-static inline int ssl_pkcs11_sign( void *ctx, 
+static inline int ssl_pkcs11_sign( void *ctx,
                      int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
-                     int mode, int hash_id, unsigned int hashlen,
+                     int mode, md_type_t md_alg, unsigned int hashlen,
                      const unsigned char *hash, unsigned char *sig )
 {
     ((void) f_rng);
     ((void) p_rng);
-    return pkcs11_sign( (pkcs11_context *) ctx, mode, hash_id,
+    return pkcs11_sign( (pkcs11_context *) ctx, mode, md_alg,
                         hashlen, hash, sig );
 }
 
@@ -156,6 +165,10 @@ static inline size_t ssl_pkcs11_key_len( void *ctx )
     return ( (pkcs11_context *) ctx )->len;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* POLARSSL_PKCS11_C */
 
 #endif /* POLARSSL_PKCS11_H */
diff --git a/Externals/polarssl/include/polarssl/pkcs12.h b/Externals/polarssl/include/polarssl/pkcs12.h
index 9a4577173e..4bd5018af5 100644
--- a/Externals/polarssl/include/polarssl/pkcs12.h
+++ b/Externals/polarssl/include/polarssl/pkcs12.h
@@ -38,21 +38,13 @@
 #define POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT             -0x1E80  /**< PBE ASN.1 data not as expected. */
 #define POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH              -0x1E00  /**< Given private key password does not allow for correct decryption. */
 
-#define PKCS12_DERIVE_KEY       1   /*< encryption/decryption key */
-#define PKCS12_DERIVE_IV        2   /*< initialization vector     */
-#define PKCS12_DERIVE_MAC_KEY   3   /*< integrity / MAC key       */
+#define PKCS12_DERIVE_KEY       1   /**< encryption/decryption key */
+#define PKCS12_DERIVE_IV        2   /**< initialization vector     */
+#define PKCS12_DERIVE_MAC_KEY   3   /**< integrity / MAC key       */
 
 #define PKCS12_PBE_DECRYPT      0
 #define PKCS12_PBE_ENCRYPT      1
 
-/*
- * PKCS#12 PBE types
- */
-#define OID_PKCS12               "\x2a\x86\x48\x86\xf7\x0d\x01\x0c"
-#define OID_PKCS12_PBE_SHA1_RC4_128         OID_PKCS12 "\x01\x01"
-#define OID_PKCS12_PBE_SHA1_DES3_EDE_CBC    OID_PKCS12 "\x01\x03"
-#define OID_PKCS12_PBE_SHA1_DES2_EDE_CBC    OID_PKCS12 "\x01\x04"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/Externals/polarssl/include/polarssl/pkcs5.h b/Externals/polarssl/include/polarssl/pkcs5.h
index b8c742e97c..34e824b73f 100644
--- a/Externals/polarssl/include/polarssl/pkcs5.h
+++ b/Externals/polarssl/include/polarssl/pkcs5.h
@@ -1,5 +1,5 @@
 /**
- * \file pkcs#5.h
+ * \file pkcs5.h
  *
  * \brief PKCS#5 functions
  *
@@ -34,7 +34,7 @@
 #include "asn1.h"
 #include "md.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -49,24 +49,6 @@ typedef UINT32 uint32_t;
 #define PKCS5_DECRYPT      0
 #define PKCS5_ENCRYPT      1
 
-/*
- * PKCS#5 OIDs
- */
-#define OID_PKCS5               "\x2a\x86\x48\x86\xf7\x0d\x01\x05"
-#define OID_PKCS5_PBES2         OID_PKCS5 "\x0d"
-#define OID_PKCS5_PBKDF2        OID_PKCS5 "\x0c"
-
-/*
- * Encryption Algorithm OIDs
- */
-#define OID_DES_CBC             "\x2b\x0e\x03\x02\x07"
-#define OID_DES_EDE3_CBC        "\x2a\x86\x48\x86\xf7\x0d\x03\x07"
-
-/*
- * Digest Algorithm OIDs
- */
-#define OID_HMAC_SHA1           "\x2a\x86\x48\x86\xf7\x0d\x02\x07"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -77,7 +59,7 @@ extern "C" {
  * \param pbe_params the ASN.1 algorithm parameters
  * \param mode       either PKCS5_DECRYPT or PKCS5_ENCRYPT
  * \param pwd        password to use when generating key
- * \param plen       length of password
+ * \param pwdlen     length of password
  * \param data       data to process
  * \param datalen    length of data
  * \param output     output buffer
diff --git a/Externals/polarssl/include/polarssl/platform.h b/Externals/polarssl/include/polarssl/platform.h
new file mode 100644
index 0000000000..eae887afc7
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/platform.h
@@ -0,0 +1,128 @@
+/**
+ * \file platform.h
+ *
+ * \brief PolarSSL Platform abstraction layer
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_PLATFORM_H
+#define POLARSSL_PLATFORM_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(POLARSSL_PLATFORM_NO_STD_FUNCTIONS)
+#include <stdlib.h>
+#if !defined(POLARSSL_PLATFORM_STD_PRINTF)
+#define POLARSSL_PLATFORM_STD_PRINTF   printf /**< Default printf to use  */
+#endif
+#if !defined(POLARSSL_PLATFORM_STD_FPRINTF)
+#define POLARSSL_PLATFORM_STD_FPRINTF fprintf /**< Default fprintf to use */
+#endif
+#if !defined(POLARSSL_PLATFORM_STD_MALLOC)
+#define POLARSSL_PLATFORM_STD_MALLOC   malloc /**< Default allocator to use */
+#endif
+#if !defined(POLARSSL_PLATFORM_STD_FREE)
+#define POLARSSL_PLATFORM_STD_FREE       free /**< Default free to use */
+#endif
+#else /* POLARSSL_PLATFORM_NO_STD_FUNCTIONS */
+#if defined(POLARSSL_PLATFORM_STD_MEM_HDR)
+#include POLARSSL_PLATFORM_STD_MEM_HDR
+#endif
+#endif /* POLARSSL_PLATFORM_NO_STD_FUNCTIONS */
+
+/* \} name SECTION: Module settings */
+
+/*
+ * The function pointers for malloc and free
+ */
+#if defined(POLARSSL_PLATFORM_MEMORY)
+extern void * (*polarssl_malloc)( size_t len );
+extern void (*polarssl_free)( void *ptr );
+
+/**
+ * \brief   Set your own memory implementation function pointers
+ *
+ * \param malloc_func   the malloc function implementation
+ * \param free_func     the free function implementation
+ *
+ * \return              0 if successful
+ */
+int platform_set_malloc_free( void * (*malloc_func)( size_t ),
+                              void (*free_func)( void * ) );
+#else /* POLARSSL_PLATFORM_ENTROPY */
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif /* POLARSSL_PLATFORM_ENTROPY */
+
+/*
+ * The function pointers for printf
+ */
+#if defined(POLARSSL_PLATFORM_PRINTF_ALT)
+extern int (*polarssl_printf)( const char *format, ... );
+
+/**
+ * \brief   Set your own printf function pointer
+ *
+ * \param printf_func   the printf function implementation
+ *
+ * \return              0
+ */
+int platform_set_printf( int (*printf_func)( const char *, ... ) );
+#else /* POLARSSL_PLATFORM_PRINTF_ALT */
+#define polarssl_printf     printf
+#endif /* POLARSSL_PLATFORM_PRINTF_ALT */
+
+/*
+ * The function pointers for fprintf
+ */
+#if defined(POLARSSL_PLATFORM_FPRINTF_ALT)
+extern int (*polarssl_fprintf)( FILE *stream, const char *format, ... );
+
+int platform_set_fprintf( int (*fprintf_func)( FILE *stream, const char *,
+                                               ... ) );
+#else
+#define polarssl_fprintf    fprintf
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* platform.h */
diff --git a/Externals/polarssl/include/polarssl/ripemd160.h b/Externals/polarssl/include/polarssl/ripemd160.h
new file mode 100644
index 0000000000..e3b66c90f6
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ripemd160.h
@@ -0,0 +1,204 @@
+/**
+ * \file ripemd160.h
+ *
+ * \brief RIPE MD-160 message digest
+ *
+ *  Copyright (C) 2014-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_RIPEMD160_H
+#define POLARSSL_RIPEMD160_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <string.h>
+
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
+#include <basetsd.h>
+typedef UINT32 uint32_t;
+#else
+#include <inttypes.h>
+#endif
+
+#define POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR              -0x007E  /**< Read/write error in file. */
+
+#if !defined(POLARSSL_RIPEMD160_ALT)
+// Regular implementation
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          RIPEMD-160 context structure
+ */
+typedef struct
+{
+    uint32_t total[2];          /*!< number of bytes processed  */
+    uint32_t state[5];          /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
+
+    unsigned char ipad[64];     /*!< HMAC: inner padding        */
+    unsigned char opad[64];     /*!< HMAC: outer padding        */
+}
+ripemd160_context;
+
+/**
+ * \brief          Initialize RIPEMD-160 context
+ *
+ * \param ctx      RIPEMD-160 context to be initialized
+ */
+void ripemd160_init( ripemd160_context *ctx );
+
+/**
+ * \brief          Clear RIPEMD-160 context
+ *
+ * \param ctx      RIPEMD-160 context to be cleared
+ */
+void ripemd160_free( ripemd160_context *ctx );
+
+/**
+ * \brief          RIPEMD-160 context setup
+ *
+ * \param ctx      context to be initialized
+ */
+void ripemd160_starts( ripemd160_context *ctx );
+
+/**
+ * \brief          RIPEMD-160 process buffer
+ *
+ * \param ctx      RIPEMD-160 context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void ripemd160_update( ripemd160_context *ctx,
+                       const unsigned char *input, size_t ilen );
+
+/**
+ * \brief          RIPEMD-160 final digest
+ *
+ * \param ctx      RIPEMD-160 context
+ * \param output   RIPEMD-160 checksum result
+ */
+void ripemd160_finish( ripemd160_context *ctx, unsigned char output[20] );
+
+/* Internal use */
+void ripemd160_process( ripemd160_context *ctx, const unsigned char data[64] );
+
+#ifdef __cplusplus
+}
+#endif
+
+#else  /* POLARSSL_RIPEMD160_ALT */
+#include "ripemd160.h"
+#endif /* POLARSSL_RIPEMD160_ALT */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Output = RIPEMD-160( input buffer )
+ *
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   RIPEMD-160 checksum result
+ */
+void ripemd160( const unsigned char *input, size_t ilen,
+                unsigned char output[20] );
+
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief          Output = RIPEMD-160( file contents )
+ *
+ * \param path     input file name
+ * \param output   RIPEMD-160 checksum result
+ *
+ * \return         0 if successful, or POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR
+ */
+int ripemd160_file( const char *path, unsigned char output[20] );
+#endif /* POLARSSL_FS_IO */
+
+/**
+ * \brief          RIPEMD-160 HMAC context setup
+ *
+ * \param ctx      HMAC context to be initialized
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ */
+void ripemd160_hmac_starts( ripemd160_context *ctx,
+                            const unsigned char *key, size_t keylen );
+
+/**
+ * \brief          RIPEMD-160 HMAC process buffer
+ *
+ * \param ctx      HMAC context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void ripemd160_hmac_update( ripemd160_context *ctx,
+                            const unsigned char *input, size_t ilen );
+
+/**
+ * \brief          RIPEMD-160 HMAC final digest
+ *
+ * \param ctx      HMAC context
+ * \param output   RIPEMD-160 HMAC checksum result
+ */
+void ripemd160_hmac_finish( ripemd160_context *ctx, unsigned char output[20] );
+
+/**
+ * \brief          RIPEMD-160 HMAC context reset
+ *
+ * \param ctx      HMAC context to be reset
+ */
+void ripemd160_hmac_reset( ripemd160_context *ctx );
+
+/**
+ * \brief          Output = HMAC-RIPEMD-160( hmac key, input buffer )
+ *
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   HMAC-RIPEMD-160 result
+ */
+void ripemd160_hmac( const unsigned char *key, size_t keylen,
+                     const unsigned char *input, size_t ilen,
+                     unsigned char output[20] );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int ripemd160_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ripemd160.h */
diff --git a/Externals/polarssl/include/polarssl/rsa.h b/Externals/polarssl/include/polarssl/rsa.h
index f9a022026d..c06c7d5050 100644
--- a/Externals/polarssl/include/polarssl/rsa.h
+++ b/Externals/polarssl/include/polarssl/rsa.h
@@ -3,7 +3,7 @@
  *
  * \brief The RSA public-key cryptosystem
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,18 @@
 #ifndef POLARSSL_RSA_H
 #define POLARSSL_RSA_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
 #include "bignum.h"
+#include "md.h"
+
+#if defined(POLARSSL_THREADING_C)
+#include "threading.h"
+#endif
 
 /*
  * RSA Error codes
@@ -43,18 +54,8 @@
 #define POLARSSL_ERR_RSA_RNG_FAILED                        -0x4480  /**< The random generator failed to generate non-zeros. */
 
 /*
- * PKCS#1 constants
+ * RSA constants
  */
-#define SIG_RSA_RAW     0
-#define SIG_RSA_MD2     2
-#define SIG_RSA_MD4     3
-#define SIG_RSA_MD5     4
-#define SIG_RSA_SHA1    5
-#define SIG_RSA_SHA224 14
-#define SIG_RSA_SHA256 11
-#define SIG_RSA_SHA384 12
-#define SIG_RSA_SHA512 13
-
 #define RSA_PUBLIC      0
 #define RSA_PRIVATE     1
 
@@ -64,70 +65,17 @@
 #define RSA_SIGN        1
 #define RSA_CRYPT       2
 
-#define ASN1_STR_CONSTRUCTED_SEQUENCE   "\x30"
-#define ASN1_STR_NULL                   "\x05"
-#define ASN1_STR_OID                    "\x06"
-#define ASN1_STR_OCTET_STRING           "\x04"
-
-#define OID_DIGEST_ALG_MDX              "\x2A\x86\x48\x86\xF7\x0D\x02\x00"
-#define OID_HASH_ALG_SHA1               "\x2b\x0e\x03\x02\x1a"
-#define OID_HASH_ALG_SHA2X              "\x60\x86\x48\x01\x65\x03\x04\x02\x00"
-
-#define OID_ISO_MEMBER_BODIES           "\x2a"
-#define OID_ISO_IDENTIFIED_ORG          "\x2b"
+#define RSA_SALT_LEN_ANY    -1
 
 /*
- * ISO Member bodies OID parts
+ * The above constants may be used even if the RSA module is compile out,
+ * eg for alternative (PKCS#11) RSA implemenations in the PK layers.
  */
-#define OID_COUNTRY_US                  "\x86\x48"
-#define OID_RSA_DATA_SECURITY           "\x86\xf7\x0d"
+#if defined(POLARSSL_RSA_C)
 
-/*
- * ISO Identified organization OID parts
- */
-#define OID_OIW_SECSIG_SHA1             "\x0e\x03\x02\x1a"
-
-/*
- * DigestInfo ::= SEQUENCE {
- *   digestAlgorithm DigestAlgorithmIdentifier,
- *   digest Digest }
- *
- * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
- *
- * Digest ::= OCTET STRING
- */
-#define ASN1_HASH_MDX                           \
-(                                               \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x20"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x0C"      \
-        ASN1_STR_OID "\x08"                     \
-      OID_DIGEST_ALG_MDX                        \
-    ASN1_STR_NULL "\x00"                        \
-      ASN1_STR_OCTET_STRING "\x10"              \
-)
-
-#define ASN1_HASH_SHA1                          \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x21"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x09"      \
-        ASN1_STR_OID "\x05"                     \
-      OID_HASH_ALG_SHA1                         \
-        ASN1_STR_NULL "\x00"                    \
-      ASN1_STR_OCTET_STRING "\x14"
-
-#define ASN1_HASH_SHA1_ALT                      \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x1F"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x07"      \
-        ASN1_STR_OID "\x05"                     \
-      OID_HASH_ALG_SHA1                         \
-      ASN1_STR_OCTET_STRING "\x14"
-
-#define ASN1_HASH_SHA2X                         \
-    ASN1_STR_CONSTRUCTED_SEQUENCE "\x11"        \
-      ASN1_STR_CONSTRUCTED_SEQUENCE "\x0d"      \
-        ASN1_STR_OID "\x09"                     \
-      OID_HASH_ALG_SHA2X                        \
-        ASN1_STR_NULL "\x00"                    \
-      ASN1_STR_OCTET_STRING "\x00"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * \brief          RSA context structure
@@ -151,19 +99,23 @@ typedef struct
     mpi RP;                     /*!<  cached R^2 mod P  */
     mpi RQ;                     /*!<  cached R^2 mod Q  */
 
+#if !defined(POLARSSL_RSA_NO_CRT)
+    mpi Vi;                     /*!<  cached blinding value     */
+    mpi Vf;                     /*!<  cached un-blinding value  */
+#endif
+
     int padding;                /*!<  RSA_PKCS_V15 for 1.5 padding and
                                       RSA_PKCS_v21 for OAEP/PSS         */
     int hash_id;                /*!<  Hash identifier of md_type_t as
                                       specified in the md.h header file
                                       for the EME-OAEP and EMSA-PSS
                                       encoding                          */
+#if defined(POLARSSL_THREADING_C)
+    threading_mutex_t mutex;    /*!<  Thread-safety mutex       */
+#endif
 }
 rsa_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * \brief          Initialize an RSA context
  *
@@ -176,11 +128,32 @@ extern "C" {
  *
  * \note           The hash_id parameter is actually ignored
  *                 when using RSA_PKCS_V15 padding.
+ *
+ * \note           Choice of padding mode is strictly enforced for private key
+ *                 operations, since there might be security concerns in
+ *                 mixing padding modes. For public key operations it's merely
+ *                 a default value, which can be overriden by calling specific
+ *                 rsa_rsaes_xxx or rsa_rsassa_xxx functions.
+ *
+ * \note           The chosen hash is always used for OEAP encryption.
+ *                 For PSS signatures, it's always used for making signatures,
+ *                 but can be overriden (and always is, if set to
+ *                 POLARSSL_MD_NONE) for verifying them.
  */
 void rsa_init( rsa_context *ctx,
                int padding,
                int hash_id);
 
+/**
+ * \brief          Set padding for an already initialized RSA context
+ *                 See \c rsa_init() for details.
+ *
+ * \param ctx      RSA context to be set
+ * \param padding  RSA_PKCS_V15 or RSA_PKCS_V21
+ * \param hash_id  RSA_PKCS_V21 hash identifier
+ */
+void rsa_set_padding( rsa_context *ctx, int padding, int hash_id);
+
 /**
  * \brief          Generate an RSA keypair
  *
@@ -242,6 +215,8 @@ int rsa_public( rsa_context *ctx,
  * \brief          Do an RSA private key operation
  *
  * \param ctx      RSA context
+ * \param f_rng    RNG function (Needed for blinding)
+ * \param p_rng    RNG parameter
  * \param input    input buffer
  * \param output   output buffer
  *
@@ -251,6 +226,8 @@ int rsa_public( rsa_context *ctx,
  *                 enough (eg. 128 bytes if RSA-1024 is used).
  */
 int rsa_private( rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t),
+                 void *p_rng,
                  const unsigned char *input,
                  unsigned char *output );
 
@@ -260,7 +237,8 @@ int rsa_private( rsa_context *ctx,
  *                 RSA operation.
  *
  * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding)
+ * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding
+ *                               and RSA_PRIVATE)
  * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param ilen     contains the plaintext length
@@ -283,7 +261,7 @@ int rsa_pkcs1_encrypt( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v1.5 encryption (RSAES-PKCS1-v1_5-ENCRYPT)
  *
  * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding)
+ * \param f_rng    RNG function (Needed for padding and RSA_PRIVATE)
  * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param ilen     contains the plaintext length
@@ -306,7 +284,8 @@ int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v2.1 OAEP encryption (RSAES-OAEP-ENCRYPT)
  *
  * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding)
+ * \param f_rng    RNG function (Needed for padding and PKCS#1 v2.1 encoding
+ *                               and RSA_PRIVATE)
  * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param label    buffer holding the custom label to use
@@ -335,6 +314,8 @@ int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
  *                 the message padding
  *
  * \param ctx      RSA context
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param olen     will contain the plaintext length
  * \param input    buffer holding the encrypted data
@@ -348,6 +329,8 @@ int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
  *                 an error is thrown.
  */
 int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
                        int mode, size_t *olen,
                        const unsigned char *input,
                        unsigned char *output,
@@ -357,6 +340,8 @@ int rsa_pkcs1_decrypt( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v1.5 decryption (RSAES-PKCS1-v1_5-DECRYPT)
  *
  * \param ctx      RSA context
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param olen     will contain the plaintext length
  * \param input    buffer holding the encrypted data
@@ -370,6 +355,8 @@ int rsa_pkcs1_decrypt( rsa_context *ctx,
  *                 an error is thrown.
  */
 int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
                                  int mode, size_t *olen,
                                  const unsigned char *input,
                                  unsigned char *output,
@@ -379,6 +366,8 @@ int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v2.1 OAEP decryption (RSAES-OAEP-DECRYPT)
  *
  * \param ctx      RSA context
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
  * \param label    buffer holding the custom label to use
  * \param label_len contains the label length
@@ -394,6 +383,8 @@ int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
  *                 an error is thrown.
  */
 int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
                             int mode,
                             const unsigned char *label, size_t label_len,
                             size_t *olen,
@@ -407,11 +398,12 @@ int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
  *                 a message digest
  *
  * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding)
+ * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding and for
+ *                               RSA_PRIVATE)
  * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer that will hold the ciphertext
  *
@@ -421,17 +413,14 @@ int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
  * \note           The "sig" buffer must be as large as the size
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 encoding. hash_id in the function call is the type of hash
- *                 that is encoded. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
+ * \note           In case of PKCS#1 v2.1 encoding, see comments on
+ * \note           \c rsa_rsassa_pss_sign() for details on md_alg and hash_id.
  */
 int rsa_pkcs1_sign( rsa_context *ctx,
                     int (*f_rng)(void *, unsigned char *, size_t),
                     void *p_rng,
                     int mode,
-                    int hash_id,
+                    md_type_t md_alg,
                     unsigned int hashlen,
                     const unsigned char *hash,
                     unsigned char *sig );
@@ -440,9 +429,11 @@ int rsa_pkcs1_sign( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v1.5 signature (RSASSA-PKCS1-v1_5-SIGN)
  *
  * \param ctx      RSA context
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer that will hold the ciphertext
  *
@@ -453,8 +444,10 @@ int rsa_pkcs1_sign( rsa_context *ctx,
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  */
 int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
                                int mode,
-                               int hash_id,
+                               md_type_t md_alg,
                                unsigned int hashlen,
                                const unsigned char *hash,
                                unsigned char *sig );
@@ -463,11 +456,12 @@ int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
  * \brief          Perform a PKCS#1 v2.1 PSS signature (RSASSA-PSS-SIGN)
  *
  * \param ctx      RSA context
- * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding)
+ * \param f_rng    RNG function (Needed for PKCS#1 v2.1 encoding and for
+ *                               RSA_PRIVATE)
  * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer that will hold the ciphertext
  *
@@ -477,9 +471,8 @@ int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
  * \note           The "sig" buffer must be as large as the size
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 encoding. hash_id in the function call is the type of hash
+ * \note           The hash_id in the RSA context is the one used for the
+ *                 encoding. md_alg in the function call is the type of hash
  *                 that is encoded. According to RFC 3447 it is advised to
  *                 keep both hashes the same.
  */
@@ -487,7 +480,7 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
                          int (*f_rng)(void *, unsigned char *, size_t),
                          void *p_rng,
                          int mode,
-                         int hash_id,
+                         md_type_t md_alg,
                          unsigned int hashlen,
                          const unsigned char *hash,
                          unsigned char *sig );
@@ -498,9 +491,11 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
  *                 the message digest
  *
  * \param ctx      points to an RSA public key
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer holding the ciphertext
  *
@@ -510,26 +505,27 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
  * \note           The "sig" buffer must be as large as the size
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 verification. hash_id in the function call is the type of hash
- *                 that is verified. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
+ * \note           In case of PKCS#1 v2.1 encoding, see comments on
+ *                 \c rsa_rsassa_pss_verify() about md_alg and hash_id.
  */
 int rsa_pkcs1_verify( rsa_context *ctx,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng,
                       int mode,
-                      int hash_id,
+                      md_type_t md_alg,
                       unsigned int hashlen,
                       const unsigned char *hash,
-                      unsigned char *sig );
+                      const unsigned char *sig );
 
 /**
  * \brief          Perform a PKCS#1 v1.5 verification (RSASSA-PKCS1-v1_5-VERIFY)
  *
  * \param ctx      points to an RSA public key
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer holding the ciphertext
  *
@@ -540,20 +536,24 @@ int rsa_pkcs1_verify( rsa_context *ctx,
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  */
 int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
                                  int mode,
-                                 int hash_id,
+                                 md_type_t md_alg,
                                  unsigned int hashlen,
                                  const unsigned char *hash,
-                                 unsigned char *sig );
+                                 const unsigned char *sig );
 
 /**
  * \brief          Perform a PKCS#1 v2.1 PSS verification (RSASSA-PSS-VERIFY)
- * \brief          Do a public RSA and check the message digest
+ *                 (This is the "simple" version.)
  *
  * \param ctx      points to an RSA public key
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
  * \param mode     RSA_PUBLIC or RSA_PRIVATE
- * \param hash_id  SIG_RSA_RAW, SIG_RSA_MD{2,4,5} or SIG_RSA_SHA{1,224,256,384,512}
- * \param hashlen  message digest length (for SIG_RSA_RAW only)
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
  * \param hash     buffer holding the message digest
  * \param sig      buffer holding the ciphertext
  *
@@ -563,18 +563,66 @@ int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
  * \note           The "sig" buffer must be as large as the size
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  *
- * \note           In case of PKCS#1 v2.1 encoding keep in mind that
- *                 the hash_id in the RSA context is the one used for the
- *                 verification. hash_id in the function call is the type of hash
- *                 that is verified. According to RFC 3447 it is advised to
- *                 keep both hashes the same.
+ * \note           The hash_id in the RSA context is the one used for the
+ *                 verification. md_alg in the function call is the type of
+ *                 hash that is verified. According to RFC 3447 it is advised to
+ *                 keep both hashes the same. If hash_id in the RSA context is
+ *                 unset, the md_alg from the function call is used.
  */
 int rsa_rsassa_pss_verify( rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
                            int mode,
-                           int hash_id,
+                           md_type_t md_alg,
                            unsigned int hashlen,
                            const unsigned char *hash,
-                           unsigned char *sig );
+                           const unsigned char *sig );
+
+/**
+ * \brief          Perform a PKCS#1 v2.1 PSS verification (RSASSA-PSS-VERIFY)
+ *                 (This is the version with "full" options.)
+ *
+ * \param ctx      points to an RSA public key
+ * \param f_rng    RNG function (Only needed for RSA_PRIVATE)
+ * \param p_rng    RNG parameter
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param md_alg   a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
+ * \param hashlen  message digest length (for POLARSSL_MD_NONE only)
+ * \param hash     buffer holding the message digest
+ * \param mgf1_hash_id message digest used for mask generation
+ * \param expected_salt_len Length of the salt used in padding, use
+ *                 RSA_SALT_LEN_ANY to accept any salt length
+ * \param sig      buffer holding the ciphertext
+ *
+ * \return         0 if the verify operation was successful,
+ *                 or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The "sig" buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ *
+ * \note           The hash_id in the RSA context is ignored.
+ */
+int rsa_rsassa_pss_verify_ext( rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               md_type_t mgf1_hash_id,
+                               int expected_salt_len,
+                               const unsigned char *sig );
+
+/**
+ * \brief          Copy the components of an RSA context
+ *
+ * \param dst      Destination context
+ * \param src      Source context
+ *
+ * \return         O on success,
+ *                 POLARSSL_ERR_MPI_MALLOC_FAILED on memory allocation failure
+ */
+int rsa_copy( rsa_context *dst, const rsa_context *src );
 
 /**
  * \brief          Free the components of an RSA key
@@ -594,4 +642,6 @@ int rsa_self_test( int verbose );
 }
 #endif
 
+#endif /* POLARSSL_RSA_C */
+
 #endif /* rsa.h */
diff --git a/Externals/polarssl/include/polarssl/sha1.h b/Externals/polarssl/include/polarssl/sha1.h
index 81ea77d978..cb0c4367f9 100644
--- a/Externals/polarssl/include/polarssl/sha1.h
+++ b/Externals/polarssl/include/polarssl/sha1.h
@@ -3,7 +3,7 @@
  *
  * \brief SHA-1 cryptographic hash function
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_SHA1_H
 #define POLARSSL_SHA1_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -44,6 +48,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          SHA-1 context structure
  */
@@ -58,9 +66,19 @@ typedef struct
 }
 sha1_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize SHA-1 context
+ *
+ * \param ctx      SHA-1 context to be initialized
+ */
+void sha1_init( sha1_context *ctx );
+
+/**
+ * \brief          Clear SHA-1 context
+ *
+ * \param ctx      SHA-1 context to be cleared
+ */
+void sha1_free( sha1_context *ctx );
 
 /**
  * \brief          SHA-1 context setup
@@ -127,7 +145,8 @@ int sha1_file( const char *path, unsigned char output[20] );
  * \param key      HMAC secret key
  * \param keylen   length of the HMAC key
  */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, size_t keylen );
+void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key,
+                       size_t keylen );
 
 /**
  * \brief          SHA-1 HMAC process buffer
@@ -136,7 +155,8 @@ void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, size_t keyle
  * \param input    buffer holding the  data
  * \param ilen     length of the input data
  */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input, size_t ilen );
+void sha1_hmac_update( sha1_context *ctx, const unsigned char *input,
+                       size_t ilen );
 
 /**
  * \brief          SHA-1 HMAC final digest
diff --git a/Externals/polarssl/include/polarssl/sha2.h b/Externals/polarssl/include/polarssl/sha2.h
deleted file mode 100644
index 795299ee69..0000000000
--- a/Externals/polarssl/include/polarssl/sha2.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * \file sha2.h
- *
- * \brief SHA-224 and SHA-256 cryptographic hash function
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_SHA2_H
-#define POLARSSL_SHA2_H
-
-#include "config.h"
-
-#include <string.h>
-
-#ifdef _MSC_VER
-#include <basetsd.h>
-typedef UINT32 uint32_t;
-#else
-#include <inttypes.h>
-#endif
-
-#define POLARSSL_ERR_SHA2_FILE_IO_ERROR                -0x0078  /**< Read/write error in file. */
-
-#if !defined(POLARSSL_SHA2_ALT)
-// Regular implementation
-//
-
-/**
- * \brief          SHA-256 context structure
- */
-typedef struct
-{
-    uint32_t total[2];          /*!< number of bytes processed  */
-    uint32_t state[8];          /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-
-    unsigned char ipad[64];     /*!< HMAC: inner padding        */
-    unsigned char opad[64];     /*!< HMAC: outer padding        */
-    int is224;                  /*!< 0 => SHA-256, else SHA-224 */
-}
-sha2_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          SHA-256 context setup
- *
- * \param ctx      context to be initialized
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void sha2_starts( sha2_context *ctx, int is224 );
-
-/**
- * \brief          SHA-256 process buffer
- *
- * \param ctx      SHA-256 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen );
-
-/**
- * \brief          SHA-256 final digest
- *
- * \param ctx      SHA-256 context
- * \param output   SHA-224/256 checksum result
- */
-void sha2_finish( sha2_context *ctx, unsigned char output[32] );
-
-/* Internal use */
-void sha2_process( sha2_context *ctx, const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* POLARSSL_SHA2_ALT */
-#include "sha2_alt.h"
-#endif /* POLARSSL_SHA2_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Output = SHA-256( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-224/256 checksum result
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void sha2( const unsigned char *input, size_t ilen,
-           unsigned char output[32], int is224 );
-
-/**
- * \brief          Output = SHA-256( file contents )
- *
- * \param path     input file name
- * \param output   SHA-224/256 checksum result
- * \param is224    0 = use SHA256, 1 = use SHA224
- *
- * \return         0 if successful, or POLARSSL_ERR_SHA2_FILE_IO_ERROR
- */
-int sha2_file( const char *path, unsigned char output[32], int is224 );
-
-/**
- * \brief          SHA-256 HMAC context setup
- *
- * \param ctx      HMAC context to be initialized
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keylen,
-                       int is224 );
-
-/**
- * \brief          SHA-256 HMAC process buffer
- *
- * \param ctx      HMAC context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha2_hmac_update( sha2_context *ctx, const unsigned char *input, size_t ilen );
-
-/**
- * \brief          SHA-256 HMAC final digest
- *
- * \param ctx      HMAC context
- * \param output   SHA-224/256 HMAC checksum result
- */
-void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] );
-
-/**
- * \brief          SHA-256 HMAC context reset
- *
- * \param ctx      HMAC context to be reset
- */
-void sha2_hmac_reset( sha2_context *ctx );
-
-/**
- * \brief          Output = HMAC-SHA-256( hmac key, input buffer )
- *
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   HMAC-SHA-224/256 result
- * \param is224    0 = use SHA256, 1 = use SHA224
- */
-void sha2_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[32], int is224 );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int sha2_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* sha2.h */
diff --git a/Externals/polarssl/include/polarssl/sha256.h b/Externals/polarssl/include/polarssl/sha256.h
new file mode 100644
index 0000000000..b143674100
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/sha256.h
@@ -0,0 +1,208 @@
+/**
+ * \file sha256.h
+ *
+ * \brief SHA-224 and SHA-256 cryptographic hash function
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_SHA256_H
+#define POLARSSL_SHA256_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <string.h>
+
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
+#include <basetsd.h>
+typedef UINT32 uint32_t;
+#else
+#include <inttypes.h>
+#endif
+
+#define POLARSSL_ERR_SHA256_FILE_IO_ERROR              -0x0078  /**< Read/write error in file. */
+
+#if !defined(POLARSSL_SHA256_ALT)
+// Regular implementation
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          SHA-256 context structure
+ */
+typedef struct
+{
+    uint32_t total[2];          /*!< number of bytes processed  */
+    uint32_t state[8];          /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
+
+    unsigned char ipad[64];     /*!< HMAC: inner padding        */
+    unsigned char opad[64];     /*!< HMAC: outer padding        */
+    int is224;                  /*!< 0 => SHA-256, else SHA-224 */
+}
+sha256_context;
+
+/**
+ * \brief          Initialize SHA-256 context
+ *
+ * \param ctx      SHA-256 context to be initialized
+ */
+void sha256_init( sha256_context *ctx );
+
+/**
+ * \brief          Clear SHA-256 context
+ *
+ * \param ctx      SHA-256 context to be cleared
+ */
+void sha256_free( sha256_context *ctx );
+
+/**
+ * \brief          SHA-256 context setup
+ *
+ * \param ctx      context to be initialized
+ * \param is224    0 = use SHA256, 1 = use SHA224
+ */
+void sha256_starts( sha256_context *ctx, int is224 );
+
+/**
+ * \brief          SHA-256 process buffer
+ *
+ * \param ctx      SHA-256 context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha256_update( sha256_context *ctx, const unsigned char *input,
+                    size_t ilen );
+
+/**
+ * \brief          SHA-256 final digest
+ *
+ * \param ctx      SHA-256 context
+ * \param output   SHA-224/256 checksum result
+ */
+void sha256_finish( sha256_context *ctx, unsigned char output[32] );
+
+/* Internal use */
+void sha256_process( sha256_context *ctx, const unsigned char data[64] );
+
+#ifdef __cplusplus
+}
+#endif
+
+#else  /* POLARSSL_SHA256_ALT */
+#include "sha256_alt.h"
+#endif /* POLARSSL_SHA256_ALT */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Output = SHA-256( input buffer )
+ *
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   SHA-224/256 checksum result
+ * \param is224    0 = use SHA256, 1 = use SHA224
+ */
+void sha256( const unsigned char *input, size_t ilen,
+           unsigned char output[32], int is224 );
+
+/**
+ * \brief          Output = SHA-256( file contents )
+ *
+ * \param path     input file name
+ * \param output   SHA-224/256 checksum result
+ * \param is224    0 = use SHA256, 1 = use SHA224
+ *
+ * \return         0 if successful, or POLARSSL_ERR_SHA256_FILE_IO_ERROR
+ */
+int sha256_file( const char *path, unsigned char output[32], int is224 );
+
+/**
+ * \brief          SHA-256 HMAC context setup
+ *
+ * \param ctx      HMAC context to be initialized
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param is224    0 = use SHA256, 1 = use SHA224
+ */
+void sha256_hmac_starts( sha256_context *ctx, const unsigned char *key,
+                         size_t keylen, int is224 );
+
+/**
+ * \brief          SHA-256 HMAC process buffer
+ *
+ * \param ctx      HMAC context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha256_hmac_update( sha256_context *ctx, const unsigned char *input,
+                         size_t ilen );
+
+/**
+ * \brief          SHA-256 HMAC final digest
+ *
+ * \param ctx      HMAC context
+ * \param output   SHA-224/256 HMAC checksum result
+ */
+void sha256_hmac_finish( sha256_context *ctx, unsigned char output[32] );
+
+/**
+ * \brief          SHA-256 HMAC context reset
+ *
+ * \param ctx      HMAC context to be reset
+ */
+void sha256_hmac_reset( sha256_context *ctx );
+
+/**
+ * \brief          Output = HMAC-SHA-256( hmac key, input buffer )
+ *
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   HMAC-SHA-224/256 result
+ * \param is224    0 = use SHA256, 1 = use SHA224
+ */
+void sha256_hmac( const unsigned char *key, size_t keylen,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char output[32], int is224 );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int sha256_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* sha256.h */
diff --git a/Externals/polarssl/include/polarssl/sha4.h b/Externals/polarssl/include/polarssl/sha4.h
deleted file mode 100644
index 7b0cdf66f7..0000000000
--- a/Externals/polarssl/include/polarssl/sha4.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * \file sha4.h
- *
- * \brief SHA-384 and SHA-512 cryptographic hash function
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_SHA4_H
-#define POLARSSL_SHA4_H
-
-#include "config.h"
-
-#include <string.h>
-
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-  #define UL64(x) x##ui64
-  typedef unsigned __int64 uint64_t;
-#else
-  #include <inttypes.h>
-  #define UL64(x) x##ULL
-#endif
-
-#define POLARSSL_ERR_SHA4_FILE_IO_ERROR                -0x007A  /**< Read/write error in file. */
-
-#if !defined(POLARSSL_SHA1_ALT)
-// Regular implementation
-//
-
-/**
- * \brief          SHA-512 context structure
- */
-typedef struct
-{
-    uint64_t total[2];          /*!< number of bytes processed  */
-    uint64_t state[8];          /*!< intermediate digest state  */
-    unsigned char buffer[128];  /*!< data block being processed */
-
-    unsigned char ipad[128];    /*!< HMAC: inner padding        */
-    unsigned char opad[128];    /*!< HMAC: outer padding        */
-    int is384;                  /*!< 0 => SHA-512, else SHA-384 */
-}
-sha4_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          SHA-512 context setup
- *
- * \param ctx      context to be initialized
- * \param is384    0 = use SHA512, 1 = use SHA384
- */
-void sha4_starts( sha4_context *ctx, int is384 );
-
-/**
- * \brief          SHA-512 process buffer
- *
- * \param ctx      SHA-512 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen );
-
-/**
- * \brief          SHA-512 final digest
- *
- * \param ctx      SHA-512 context
- * \param output   SHA-384/512 checksum result
- */
-void sha4_finish( sha4_context *ctx, unsigned char output[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#else  /* POLARSSL_SHA4_ALT */
-#include "sha4_alt.h"
-#endif /* POLARSSL_SHA4_ALT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          Output = SHA-512( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-384/512 checksum result
- * \param is384    0 = use SHA512, 1 = use SHA384
- */
-void sha4( const unsigned char *input, size_t ilen,
-           unsigned char output[64], int is384 );
-
-/**
- * \brief          Output = SHA-512( file contents )
- *
- * \param path     input file name
- * \param output   SHA-384/512 checksum result
- * \param is384    0 = use SHA512, 1 = use SHA384
- *
- * \return         0 if successful, or POLARSSL_ERR_SHA4_FILE_IO_ERROR
- */
-int sha4_file( const char *path, unsigned char output[64], int is384 );
-
-/**
- * \brief          SHA-512 HMAC context setup
- *
- * \param ctx      HMAC context to be initialized
- * \param is384    0 = use SHA512, 1 = use SHA384
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- */
-void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keylen,
-                       int is384 );
-
-/**
- * \brief          SHA-512 HMAC process buffer
- *
- * \param ctx      HMAC context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha4_hmac_update( sha4_context *ctx, const unsigned char *input, size_t ilen );
-
-/**
- * \brief          SHA-512 HMAC final digest
- *
- * \param ctx      HMAC context
- * \param output   SHA-384/512 HMAC checksum result
- */
-void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] );
-
-/**
- * \brief          SHA-512 HMAC context reset
- *
- * \param ctx      HMAC context to be reset
- */
-void sha4_hmac_reset( sha4_context *ctx );
-
-/**
- * \brief          Output = HMAC-SHA-512( hmac key, input buffer )
- *
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   HMAC-SHA-384/512 result
- * \param is384    0 = use SHA512, 1 = use SHA384
- */
-void sha4_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[64], int is384 );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int sha4_self_test( int verbose );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* sha4.h */
diff --git a/Externals/polarssl/include/polarssl/sha512.h b/Externals/polarssl/include/polarssl/sha512.h
new file mode 100644
index 0000000000..dfbae4a734
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/sha512.h
@@ -0,0 +1,209 @@
+/**
+ * \file sha512.h
+ *
+ * \brief SHA-384 and SHA-512 cryptographic hash function
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_SHA512_H
+#define POLARSSL_SHA512_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <string.h>
+
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+  #define UL64(x) x##ui64
+  typedef unsigned __int64 uint64_t;
+#else
+  #include <inttypes.h>
+  #define UL64(x) x##ULL
+#endif
+
+#define POLARSSL_ERR_SHA512_FILE_IO_ERROR              -0x007A  /**< Read/write error in file. */
+
+#if !defined(POLARSSL_SHA512_ALT)
+// Regular implementation
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          SHA-512 context structure
+ */
+typedef struct
+{
+    uint64_t total[2];          /*!< number of bytes processed  */
+    uint64_t state[8];          /*!< intermediate digest state  */
+    unsigned char buffer[128];  /*!< data block being processed */
+
+    unsigned char ipad[128];    /*!< HMAC: inner padding        */
+    unsigned char opad[128];    /*!< HMAC: outer padding        */
+    int is384;                  /*!< 0 => SHA-512, else SHA-384 */
+}
+sha512_context;
+
+/**
+ * \brief          Initialize SHA-512 context
+ *
+ * \param ctx      SHA-512 context to be initialized
+ */
+void sha512_init( sha512_context *ctx );
+
+/**
+ * \brief          Clear SHA-512 context
+ *
+ * \param ctx      SHA-512 context to be cleared
+ */
+void sha512_free( sha512_context *ctx );
+
+/**
+ * \brief          SHA-512 context setup
+ *
+ * \param ctx      context to be initialized
+ * \param is384    0 = use SHA512, 1 = use SHA384
+ */
+void sha512_starts( sha512_context *ctx, int is384 );
+
+/**
+ * \brief          SHA-512 process buffer
+ *
+ * \param ctx      SHA-512 context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha512_update( sha512_context *ctx, const unsigned char *input,
+                    size_t ilen );
+
+/**
+ * \brief          SHA-512 final digest
+ *
+ * \param ctx      SHA-512 context
+ * \param output   SHA-384/512 checksum result
+ */
+void sha512_finish( sha512_context *ctx, unsigned char output[64] );
+
+#ifdef __cplusplus
+}
+#endif
+
+#else  /* POLARSSL_SHA512_ALT */
+#include "sha512_alt.h"
+#endif /* POLARSSL_SHA512_ALT */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Output = SHA-512( input buffer )
+ *
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   SHA-384/512 checksum result
+ * \param is384    0 = use SHA512, 1 = use SHA384
+ */
+void sha512( const unsigned char *input, size_t ilen,
+             unsigned char output[64], int is384 );
+
+/**
+ * \brief          Output = SHA-512( file contents )
+ *
+ * \param path     input file name
+ * \param output   SHA-384/512 checksum result
+ * \param is384    0 = use SHA512, 1 = use SHA384
+ *
+ * \return         0 if successful, or POLARSSL_ERR_SHA512_FILE_IO_ERROR
+ */
+int sha512_file( const char *path, unsigned char output[64], int is384 );
+
+/**
+ * \brief          SHA-512 HMAC context setup
+ *
+ * \param ctx      HMAC context to be initialized
+ * \param is384    0 = use SHA512, 1 = use SHA384
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ */
+void sha512_hmac_starts( sha512_context *ctx, const unsigned char *key,
+                         size_t keylen, int is384 );
+
+/**
+ * \brief          SHA-512 HMAC process buffer
+ *
+ * \param ctx      HMAC context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha512_hmac_update( sha512_context *ctx, const unsigned char *input,
+                         size_t ilen );
+
+/**
+ * \brief          SHA-512 HMAC final digest
+ *
+ * \param ctx      HMAC context
+ * \param output   SHA-384/512 HMAC checksum result
+ */
+void sha512_hmac_finish( sha512_context *ctx, unsigned char output[64] );
+
+/**
+ * \brief          SHA-512 HMAC context reset
+ *
+ * \param ctx      HMAC context to be reset
+ */
+void sha512_hmac_reset( sha512_context *ctx );
+
+/**
+ * \brief          Output = HMAC-SHA-512( hmac key, input buffer )
+ *
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   HMAC-SHA-384/512 result
+ * \param is384    0 = use SHA512, 1 = use SHA384
+ */
+void sha512_hmac( const unsigned char *key, size_t keylen,
+                const unsigned char *input, size_t ilen,
+                unsigned char output[64], int is384 );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int sha512_self_test( int verbose );
+
+/* Internal use */
+void sha512_process( sha512_context *ctx, const unsigned char data[128] );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* sha512.h */
diff --git a/Externals/polarssl/include/polarssl/ssl.h b/Externals/polarssl/include/polarssl/ssl.h
index fa644fe958..bd7f1f775b 100644
--- a/Externals/polarssl/include/polarssl/ssl.h
+++ b/Externals/polarssl/include/polarssl/ssl.h
@@ -3,7 +3,7 @@
  *
  * \brief SSL/TLS functions.
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,25 +27,73 @@
 #ifndef POLARSSL_SSL_H
 #define POLARSSL_SSL_H
 
-#include <time.h>
-
-#include "net.h"
-#include "rsa.h"
-#include "md5.h"
-#include "sha1.h"
-#include "sha2.h"
-#include "sha4.h"
-#include "x509.h"
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+#include "net.h"
+#include "bignum.h"
+#include "ecp.h"
+
+#include "ssl_ciphersuites.h"
+
+#if defined(POLARSSL_MD5_C)
+#include "md5.h"
+#endif
+
+#if defined(POLARSSL_SHA1_C)
+#include "sha1.h"
+#endif
+
+#if defined(POLARSSL_SHA256_C)
+#include "sha256.h"
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+#include "sha512.h"
+#endif
+
+// for session tickets
+#if defined(POLARSSL_AES_C)
+#include "aes.h"
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+#include "x509_crt.h"
+#include "x509_crl.h"
+#endif
 
 #if defined(POLARSSL_DHM_C)
 #include "dhm.h"
 #endif
 
+#if defined(POLARSSL_ECDH_C)
+#include "ecdh.h"
+#endif
+
 #if defined(POLARSSL_ZLIB_SUPPORT)
 #include "zlib.h"
 #endif
 
+#if defined(POLARSSL_HAVE_TIME)
+#include <time.h>
+#endif
+
+/* For convenience below and in programs */
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED) ||                           \
+    defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+#define POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) ||                   \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+#define POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED
+#endif
+
 #if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
@@ -64,11 +112,11 @@
 #define POLARSSL_ERR_SSL_CONN_EOF                          -0x7280  /**< The connection indicated an EOF. */
 #define POLARSSL_ERR_SSL_UNKNOWN_CIPHER                    -0x7300  /**< An unknown cipher was received. */
 #define POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN                  -0x7380  /**< The server has no ciphersuites in common with the client. */
-#define POLARSSL_ERR_SSL_NO_SESSION_FOUND                  -0x7400  /**< No session to recover was found. */
+#define POLARSSL_ERR_SSL_NO_RNG                            -0x7400  /**< No RNG was provided to the SSL module. */
 #define POLARSSL_ERR_SSL_NO_CLIENT_CERTIFICATE             -0x7480  /**< No client certification received from the client, but required by the authentication mode. */
 #define POLARSSL_ERR_SSL_CERTIFICATE_TOO_LARGE             -0x7500  /**< Our own certificate(s) is/are too large to send in an SSL message.*/
 #define POLARSSL_ERR_SSL_CERTIFICATE_REQUIRED              -0x7580  /**< The own certificate is not set, but needed by the server. */
-#define POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED              -0x7600  /**< The own private key is not set, but needed. */
+#define POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED              -0x7600  /**< The own private key or pre-shared key is not set, but needed. */
 #define POLARSSL_ERR_SSL_CA_CHAIN_REQUIRED                 -0x7680  /**< No CA Chain is set, but required to operate. */
 #define POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE                -0x7700  /**< An unexpected message was received from our peer. */
 #define POLARSSL_ERR_SSL_FATAL_ALERT_MESSAGE               -0x7780  /**< A fatal alert message was received from our peer. */
@@ -81,8 +129,8 @@
 #define POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE        -0x7B00  /**< Processing of the ServerKeyExchange handshake message failed. */
 #define POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO_DONE          -0x7B80  /**< Processing of the ServerHelloDone handshake message failed. */
 #define POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE        -0x7C00  /**< Processing of the ClientKeyExchange handshake message failed. */
-#define POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_RP -0x7C80  /**< Processing of the ClientKeyExchange handshake message failed in DHM Read Public. */
-#define POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_CS -0x7D00  /**< Processing of the ClientKeyExchange handshake message failed in DHM Calculate Secret. */
+#define POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP     -0x7C80  /**< Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public. */
+#define POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS     -0x7D00  /**< Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret. */
 #define POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY         -0x7D80  /**< Processing of the CertificateVerify handshake message failed. */
 #define POLARSSL_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC         -0x7E00  /**< Processing of the ChangeCipherSpec handshake message failed. */
 #define POLARSSL_ERR_SSL_BAD_HS_FINISHED                   -0x7E80  /**< Processing of the Finished handshake message failed. */
@@ -91,6 +139,12 @@
 #define POLARSSL_ERR_SSL_HW_ACCEL_FALLTHROUGH              -0x6F80  /**< Hardware acceleration function skipped / left alone data */
 #define POLARSSL_ERR_SSL_COMPRESSION_FAILED                -0x6F00  /**< Processing of the compression / decompression failed */
 #define POLARSSL_ERR_SSL_BAD_HS_PROTOCOL_VERSION           -0x6E80  /**< Handshake protocol not within min/max boundaries */
+#define POLARSSL_ERR_SSL_BAD_HS_NEW_SESSION_TICKET         -0x6E00  /**< Processing of the NewSessionTicket handshake message failed. */
+#define POLARSSL_ERR_SSL_SESSION_TICKET_EXPIRED            -0x6D80  /**< Session ticket has expired. */
+#define POLARSSL_ERR_SSL_PK_TYPE_MISMATCH                  -0x6D00  /**< Public key type mismatch (eg, asked for RSA key exchange and presented EC key) */
+#define POLARSSL_ERR_SSL_UNKNOWN_IDENTITY                  -0x6C80  /**< Unknown identity received (eg, PSK identity) */
+#define POLARSSL_ERR_SSL_INTERNAL_ERROR                    -0x6C00  /**< Internal error (eg, unexpected failure in lower-level module) */
+#define POLARSSL_ERR_SSL_COUNTER_WRAPPING                  -0x6B80  /**< A counter would wrap (eg, too many messages exchanged). */
 
 /*
  * Various constants
@@ -101,6 +155,53 @@
 #define SSL_MINOR_VERSION_2             2   /*!< TLS v1.1 */
 #define SSL_MINOR_VERSION_3             3   /*!< TLS v1.2 */
 
+/* Determine minimum supported version */
+#define SSL_MIN_MAJOR_VERSION           SSL_MAJOR_VERSION_3
+
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+#define SSL_MIN_MINOR_VERSION           SSL_MINOR_VERSION_0
+#else
+#if defined(POLARSSL_SSL_PROTO_TLS1)
+#define SSL_MIN_MINOR_VERSION           SSL_MINOR_VERSION_1
+#else
+#if defined(POLARSSL_SSL_PROTO_TLS1_1)
+#define SSL_MIN_MINOR_VERSION           SSL_MINOR_VERSION_2
+#else
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#define SSL_MIN_MINOR_VERSION           SSL_MINOR_VERSION_3
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+#endif /* POLARSSL_SSL_PROTO_TLS1_1 */
+#endif /* POLARSSL_SSL_PROTO_TLS1   */
+#endif /* POLARSSL_SSL_PROTO_SSL3   */
+
+/* Determine maximum supported version */
+#define SSL_MAX_MAJOR_VERSION           SSL_MAJOR_VERSION_3
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#define SSL_MAX_MINOR_VERSION           SSL_MINOR_VERSION_3
+#else
+#if defined(POLARSSL_SSL_PROTO_TLS1_1)
+#define SSL_MAX_MINOR_VERSION           SSL_MINOR_VERSION_2
+#else
+#if defined(POLARSSL_SSL_PROTO_TLS1)
+#define SSL_MAX_MINOR_VERSION           SSL_MINOR_VERSION_1
+#else
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+#define SSL_MAX_MINOR_VERSION           SSL_MINOR_VERSION_0
+#endif /* POLARSSL_SSL_PROTO_SSL3   */
+#endif /* POLARSSL_SSL_PROTO_TLS1   */
+#endif /* POLARSSL_SSL_PROTO_TLS1_1 */
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+/* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c
+ * NONE must be zero so that memset()ing structure to zero works */
+#define SSL_MAX_FRAG_LEN_NONE           0   /*!< don't use this extension   */
+#define SSL_MAX_FRAG_LEN_512            1   /*!< MaxFragmentLength 2^9      */
+#define SSL_MAX_FRAG_LEN_1024           2   /*!< MaxFragmentLength 2^10     */
+#define SSL_MAX_FRAG_LEN_2048           3   /*!< MaxFragmentLength 2^11     */
+#define SSL_MAX_FRAG_LEN_4096           4   /*!< MaxFragmentLength 2^12     */
+#define SSL_MAX_FRAG_LEN_INVALID        5   /*!< first invalid value        */
+
 #define SSL_IS_CLIENT                   0
 #define SSL_IS_SERVER                   1
 #define SSL_COMPRESS_NULL               0
@@ -111,7 +212,9 @@
 #define SSL_VERIFY_REQUIRED             2
 
 #define SSL_INITIAL_HANDSHAKE           0
-#define SSL_RENEGOTIATION               1
+#define SSL_RENEGOTIATION               1   /* In progress */
+#define SSL_RENEGOTIATION_DONE          2   /* Done */
+#define SSL_RENEGOTIATION_PENDING       3   /* Requested (server only) */
 
 #define SSL_LEGACY_RENEGOTIATION        0
 #define SSL_SECURE_RENEGOTIATION        1
@@ -119,24 +222,50 @@
 #define SSL_RENEGOTIATION_DISABLED      0
 #define SSL_RENEGOTIATION_ENABLED       1
 
+#define SSL_RENEGOTIATION_NOT_ENFORCED  -1
+#define SSL_RENEGO_MAX_RECORDS_DEFAULT  16
+
 #define SSL_LEGACY_NO_RENEGOTIATION     0
 #define SSL_LEGACY_ALLOW_RENEGOTIATION  1
 #define SSL_LEGACY_BREAK_HANDSHAKE      2
 
+#define SSL_TRUNC_HMAC_DISABLED         0
+#define SSL_TRUNC_HMAC_ENABLED          1
+#define SSL_TRUNCATED_HMAC_LEN          10  /* 80 bits, rfc 6066 section 7 */
+
+#define SSL_SESSION_TICKETS_DISABLED     0
+#define SSL_SESSION_TICKETS_ENABLED      1
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(SSL_DEFAULT_TICKET_LIFETIME)
+#define SSL_DEFAULT_TICKET_LIFETIME     86400 /**< Lifetime of session tickets (if enabled) */
+#endif
+
 /*
  * Size of the input / output buffer.
  * Note: the RFC defines the default size of SSL / TLS messages. If you
  * change the value here, other clients / servers may not be able to
  * communicate with you anymore. Only change this value if you control
- * both sides of the connection and have it reduced at both sides!
+ * both sides of the connection and have it reduced at both sides, or
+ * if you're using the Max Fragment Length extension and you know all your
+ * peers are using it too!
  */
-#if !defined(POLARSSL_CONFIG_OPTIONS)
+#if !defined(SSL_MAX_CONTENT_LEN)
 #define SSL_MAX_CONTENT_LEN         16384   /**< Size of the input / output buffer */
-#endif /* !POLARSSL_CONFIG_OPTIONS */
+#endif
+
+/* \} name SECTION: Module settings */
 
 /*
- * Allow an extra 512 bytes for the record header
- * and encryption overhead (counter + MAC + padding)
+ * Allow extra bytes for record, authentication and encryption overhead:
+ * counter (8) + header (5) + IV(16) + MAC (16-48) + padding (0-256)
  * and allow for a maximum of 1024 of compression expansion if
  * enabled.
  */
@@ -146,50 +275,41 @@
 #define SSL_COMPRESSION_ADD             0
 #endif
 
-#define SSL_BUFFER_LEN (SSL_MAX_CONTENT_LEN + SSL_COMPRESSION_ADD + 512)
+#if defined(POLARSSL_RC4_C) || defined(POLARSSL_CIPHER_MODE_CBC)
+/* Ciphersuites using HMAC */
+#if defined(POLARSSL_SHA512_C)
+#define SSL_MAC_ADD                 48  /* SHA-384 used for HMAC */
+#elif defined(POLARSSL_SHA256_C)
+#define SSL_MAC_ADD                 32  /* SHA-256 used for HMAC */
+#else
+#define SSL_MAC_ADD                 20  /* SHA-1   used for HMAC */
+#endif
+#else
+/* AEAD ciphersuites: GCM and CCM use a 128 bits tag */
+#define SSL_MAC_ADD                 16
+#endif
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#define SSL_PADDING_ADD            256
+#else
+#define SSL_PADDING_ADD              0
+#endif
+
+#define SSL_BUFFER_LEN  ( SSL_MAX_CONTENT_LEN               \
+                        + SSL_COMPRESSION_ADD               \
+                        + 29 /* counter + header + IV */    \
+                        + SSL_MAC_ADD                       \
+                        + SSL_PADDING_ADD                   \
+                        )
 
 /*
- * Supported ciphersuites (Official IANA names)
+ * Signaling ciphersuite values (SCSV)
  */
-#define TLS_RSA_WITH_NULL_MD5                    0x01   /**< Weak! */
-#define TLS_RSA_WITH_NULL_SHA                    0x02   /**< Weak! */
-#define TLS_RSA_WITH_NULL_SHA256                 0x3B   /**< Weak! */
-#define TLS_RSA_WITH_DES_CBC_SHA                 0x09   /**< Weak! Not in TLS 1.2 */
-#define TLS_DHE_RSA_WITH_DES_CBC_SHA             0x15   /**< Weak! Not in TLS 1.2 */
-
-#define TLS_RSA_WITH_RC4_128_MD5                 0x04
-#define TLS_RSA_WITH_RC4_128_SHA                 0x05
-
-#define TLS_RSA_WITH_3DES_EDE_CBC_SHA            0x0A
-#define TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA        0x16
-
-#define TLS_RSA_WITH_AES_128_CBC_SHA             0x2F
-#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA         0x33
-#define TLS_RSA_WITH_AES_256_CBC_SHA             0x35
-#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA         0x39
-#define TLS_RSA_WITH_AES_128_CBC_SHA256          0x3C   /**< TLS 1.2 */
-#define TLS_RSA_WITH_AES_256_CBC_SHA256          0x3D   /**< TLS 1.2 */
-#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA256      0x67   /**< TLS 1.2 */
-#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA256      0x6B   /**< TLS 1.2 */
-
-#define TLS_RSA_WITH_CAMELLIA_128_CBC_SHA        0x41
-#define TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA    0x45
-#define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA        0x84
-#define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA    0x88
-#define TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256     0xBA   /**< TLS 1.2 */
-#define TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 0xBE   /**< TLS 1.2 */
-#define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256     0xC0   /**< TLS 1.2 */
-#define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 0xC4   /**< TLS 1.2 */
-
-#define TLS_RSA_WITH_AES_128_GCM_SHA256          0x9C
-#define TLS_RSA_WITH_AES_256_GCM_SHA384          0x9D
-#define TLS_DHE_RSA_WITH_AES_128_GCM_SHA256      0x9E
-#define TLS_DHE_RSA_WITH_AES_256_GCM_SHA384      0x9F
-
-#define SSL_EMPTY_RENEGOTIATION_INFO    0xFF   /**< renegotiation info ext */ 
+#define SSL_EMPTY_RENEGOTIATION_INFO    0xFF   /**< renegotiation info ext */
 
 /*
  * Supported Signature and Hash algorithms (For TLS 1.2)
+ * RFC 5246 section 7.4.1.4.1
  */
 #define SSL_HASH_NONE                0
 #define SSL_HASH_MD5                 1
@@ -199,12 +319,16 @@
 #define SSL_HASH_SHA384              5
 #define SSL_HASH_SHA512              6
 
+#define SSL_SIG_ANON                 0
 #define SSL_SIG_RSA                  1
+#define SSL_SIG_ECDSA                3
 
 /*
  * Client Certificate Types
+ * RFC 5246 section 7.4.4 plus RFC 4492 section 5.5
  */
 #define SSL_CERT_TYPE_RSA_SIGN       1
+#define SSL_CERT_TYPE_ECDSA_SIGN    64
 
 /*
  * Message, alert and handshake types
@@ -243,10 +367,13 @@
 #define SSL_ALERT_MSG_NO_RENEGOTIATION     100  /* 0x64 */
 #define SSL_ALERT_MSG_UNSUPPORTED_EXT      110  /* 0x6E */
 #define SSL_ALERT_MSG_UNRECOGNIZED_NAME    112  /* 0x70 */
+#define SSL_ALERT_MSG_UNKNOWN_PSK_IDENTITY 115  /* 0x73 */
+#define SSL_ALERT_MSG_NO_APPLICATION_PROTOCOL 120 /* 0x78 */
 
 #define SSL_HS_HELLO_REQUEST            0
 #define SSL_HS_CLIENT_HELLO             1
 #define SSL_HS_SERVER_HELLO             2
+#define SSL_HS_NEW_SESSION_TICKET       4
 #define SSL_HS_CERTIFICATE             11
 #define SSL_HS_SERVER_KEY_EXCHANGE     12
 #define SSL_HS_CERTIFICATE_REQUEST     13
@@ -258,13 +385,74 @@
 /*
  * TLS extensions
  */
-#define TLS_EXT_SERVERNAME              0
-#define TLS_EXT_SERVERNAME_HOSTNAME     0
+#define TLS_EXT_SERVERNAME                   0
+#define TLS_EXT_SERVERNAME_HOSTNAME          0
 
-#define TLS_EXT_SIG_ALG                13
+#define TLS_EXT_MAX_FRAGMENT_LENGTH          1
 
-#define TLS_EXT_RENEGOTIATION_INFO 0xFF01
+#define TLS_EXT_TRUNCATED_HMAC               4
 
+#define TLS_EXT_SUPPORTED_ELLIPTIC_CURVES   10
+#define TLS_EXT_SUPPORTED_POINT_FORMATS     11
+
+#define TLS_EXT_SIG_ALG                     13
+
+#define TLS_EXT_ALPN                        16
+
+#define TLS_EXT_SESSION_TICKET              35
+
+#define TLS_EXT_RENEGOTIATION_INFO      0xFF01
+
+/*
+ * TLS extension flags (for extensions with outgoing ServerHello content
+ * that need it (e.g. for RENEGOTIATION_INFO the server already knows because
+ * of state of the renegotiation flag, so no indicator is required)
+ */
+#define TLS_EXT_SUPPORTED_POINT_FORMATS_PRESENT (1 << 0)
+
+/*
+ * Size defines
+ */
+#if !defined(POLARSSL_PSK_MAX_LEN)
+#define POLARSSL_PSK_MAX_LEN            32 /* 256 bits */
+#endif
+
+/* Dummy type used only for its size */
+union _ssl_premaster_secret
+{
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+    unsigned char _pms_rsa[48];                         /* RFC 5246 8.1.1 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+    unsigned char _pms_dhm[POLARSSL_MPI_MAX_SIZE];      /* RFC 5246 8.1.2 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED)    || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)  || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED)     || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    unsigned char _pms_ecdh[POLARSSL_ECP_MAX_BYTES];    /* RFC 4492 5.10 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+    unsigned char _pms_psk[4 + 2 * POLARSSL_PSK_MAX_LEN];       /* RFC 4279 2 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    unsigned char _pms_dhe_psk[4 + POLARSSL_MPI_MAX_SIZE
+                                 + POLARSSL_PSK_MAX_LEN];       /* RFC 4279 3 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    unsigned char _pms_rsa_psk[52 + POLARSSL_PSK_MAX_LEN];      /* RFC 4279 4 */
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    unsigned char _pms_ecdhe_psk[4 + POLARSSL_ECP_MAX_BYTES
+                                   + POLARSSL_PSK_MAX_LEN];     /* RFC 5489 2 */
+#endif
+};
+
+#define POLARSSL_PREMASTER_SIZE     sizeof( union _ssl_premaster_secret )
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Generic function pointers for allowing external RSA private key
@@ -272,10 +460,10 @@
  */
 typedef int (*rsa_decrypt_func)( void *ctx, int mode, size_t *olen,
                         const unsigned char *input, unsigned char *output,
-                        size_t output_max_len ); 
+                        size_t output_max_len );
 typedef int (*rsa_sign_func)( void *ctx,
                      int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
-                     int mode, int hash_id, unsigned int hashlen,
+                     int mode, md_type_t md_alg, unsigned int hashlen,
                      const unsigned char *hash, unsigned char *sig );
 typedef size_t (*rsa_key_len_func)( void *ctx );
 
@@ -300,7 +488,8 @@ typedef enum
     SSL_SERVER_FINISHED,
     SSL_FLUSH_BUFFERS,
     SSL_HANDSHAKE_WRAPUP,
-    SSL_HANDSHAKE_OVER
+    SSL_HANDSHAKE_OVER,
+    SSL_SERVER_NEW_SESSION_TICKET,
 }
 ssl_states;
 
@@ -308,19 +497,45 @@ typedef struct _ssl_session ssl_session;
 typedef struct _ssl_context ssl_context;
 typedef struct _ssl_transform ssl_transform;
 typedef struct _ssl_handshake_params ssl_handshake_params;
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+typedef struct _ssl_ticket_keys ssl_ticket_keys;
+#endif
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+typedef struct _ssl_key_cert ssl_key_cert;
+#endif
 
 /*
  * This structure is used for storing current session data.
  */
 struct _ssl_session
 {
+#if defined(POLARSSL_HAVE_TIME)
     time_t start;               /*!< starting time      */
+#endif
     int ciphersuite;            /*!< chosen ciphersuite */
     int compression;            /*!< chosen compression */
     size_t length;              /*!< session id length  */
     unsigned char id[32];       /*!< session identifier */
     unsigned char master[48];   /*!< the master secret  */
-    x509_cert *peer_cert;       /*!< peer X.509 cert chain */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    x509_crt *peer_cert;        /*!< peer X.509 cert chain */
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+    int verify_result;          /*!<  verification result     */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    unsigned char *ticket;      /*!< RFC 5077 session ticket */
+    size_t ticket_len;          /*!< session ticket length   */
+    uint32_t ticket_lifetime;   /*!< ticket lifetime hint    */
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    unsigned char mfl_code;     /*!< MaxFragmentLength negotiated by peer */
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+    int trunc_hmac;             /*!< flag for truncated hmac activation   */
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
 };
 
 /*
@@ -332,6 +547,8 @@ struct _ssl_transform
     /*
      * Session specific crypto layer
      */
+    const ssl_ciphersuite_t *ciphersuite_info;
+                                        /*!<  Chosen cipersuite_info  */
     unsigned int keylen;                /*!<  symmetric key length    */
     size_t minlen;                      /*!<  min. ciphertext length  */
     size_t ivlen;                       /*!<  IV length               */
@@ -341,11 +558,17 @@ struct _ssl_transform
     unsigned char iv_enc[16];           /*!<  IV (encryption)         */
     unsigned char iv_dec[16];           /*!<  IV (decryption)         */
 
-    unsigned char mac_enc[32];          /*!<  MAC (encryption)        */
-    unsigned char mac_dec[32];          /*!<  MAC (decryption)        */
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+    /* Needed only for SSL v3.0 secret */
+    unsigned char mac_enc[48];          /*!<  SSL v3.0 secret (enc)   */
+    unsigned char mac_dec[48];          /*!<  SSL v3.0 secret (dec)   */
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
-    uint32_t ctx_enc[136];              /*!<  encryption context      */
-    uint32_t ctx_dec[136];              /*!<  decryption context      */
+    md_context_t md_ctx_enc;            /*!<  MAC (encryption)        */
+    md_context_t md_ctx_dec;            /*!<  MAC (decryption)        */
+
+    cipher_context_t cipher_ctx_enc;    /*!<  encryption context      */
+    cipher_context_t cipher_ctx_dec;    /*!<  decryption context      */
 
     /*
      * Session specific compression layer
@@ -364,37 +587,97 @@ struct _ssl_handshake_params
     /*
      * Handshake specific crypto variables
      */
-    int sig_alg;                        /*!<  Signature algorithm     */
-    int cert_type;                      /*!<  Requested cert type     */
+    int sig_alg;                        /*!<  Hash algorithm for signature   */
+    int cert_type;                      /*!<  Requested cert type            */
     int verify_sig_alg;                 /*!<  Signature algorithm for verify */
 #if defined(POLARSSL_DHM_C)
     dhm_context dhm_ctx;                /*!<  DHM key exchange        */
 #endif
+#if defined(POLARSSL_ECDH_C)
+    ecdh_context ecdh_ctx;              /*!<  ECDH key exchange       */
+#endif
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+    const ecp_curve_info **curves;      /*!<  Supported elliptic curves */
+#endif
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    /**
+     * Current key/cert or key/cert list.
+     * On client: pointer to ssl->key_cert, only the first entry used.
+     * On server: starts as a pointer to ssl->key_cert, then becomes
+     * a pointer to the chosen key from this list or the SNI list.
+     */
+    ssl_key_cert *key_cert;
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    ssl_key_cert *sni_key_cert;         /*!<  key/cert list from SNI  */
+#endif
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
     /*
      * Checksum contexts
      */
-     md5_context fin_md5;
-    sha1_context fin_sha1;
-    sha2_context fin_sha2;
-    sha4_context fin_sha4;
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+       md5_context fin_md5;
+      sha1_context fin_sha1;
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+    sha256_context fin_sha256;
+#endif
+#if defined(POLARSSL_SHA512_C)
+    sha512_context fin_sha512;
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
 
-    void (*update_checksum)(ssl_context *, unsigned char *, size_t);
+    void (*update_checksum)(ssl_context *, const unsigned char *, size_t);
     void (*calc_verify)(ssl_context *, unsigned char *);
     void (*calc_finished)(ssl_context *, unsigned char *, int);
-    int  (*tls_prf)(unsigned char *, size_t, char *,
-                    unsigned char *, size_t,
+    int  (*tls_prf)(const unsigned char *, size_t, const char *,
+                    const unsigned char *, size_t,
                     unsigned char *, size_t);
 
     size_t pmslen;                      /*!<  premaster length        */
 
     unsigned char randbytes[64];        /*!<  random bytes            */
-    unsigned char premaster[POLARSSL_MPI_MAX_SIZE];
+    unsigned char premaster[POLARSSL_PREMASTER_SIZE];
                                         /*!<  premaster secret        */
 
     int resume;                         /*!<  session resume indicator*/
+    int max_major_ver;                  /*!< max. major version client*/
+    int max_minor_ver;                  /*!< max. minor version client*/
+    int cli_exts;                       /*!< client extension presence*/
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    int new_session_ticket;             /*!< use NewSessionTicket?    */
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 };
 
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+/*
+ * Parameters needed to secure session tickets
+ */
+struct _ssl_ticket_keys
+{
+    unsigned char key_name[16];     /*!< name to quickly discard bad tickets */
+    aes_context enc;                /*!< encryption context                  */
+    aes_context dec;                /*!< decryption context                  */
+    unsigned char mac_key[16];      /*!< authentication key                  */
+};
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+/*
+ * List of certificate + private key pairs
+ */
+struct _ssl_key_cert
+{
+    x509_crt *cert;                 /*!< cert                       */
+    pk_context *key;                /*!< private key                */
+    int key_own_alloc;              /*!< did we allocate key?       */
+    ssl_key_cert *next;             /*!< next key/cert pair         */
+};
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
 struct _ssl_context
 {
     /*
@@ -402,14 +685,15 @@ struct _ssl_context
      */
     int state;                  /*!< SSL handshake: current state     */
     int renegotiation;          /*!< Initial or renegotiation         */
+    int renego_records_seen;    /*!< Records since renego request     */
 
     int major_ver;              /*!< equal to  SSL_MAJOR_VERSION_3    */
     int minor_ver;              /*!< either 0 (SSL3) or 1 (TLS1.0)    */
 
-    int max_major_ver;          /*!< max. major version from client   */
-    int max_minor_ver;          /*!< max. minor version from client   */
-    int min_major_ver;          /*!< min. major version accepted      */
-    int min_minor_ver;          /*!< min. minor version accepted      */
+    int max_major_ver;          /*!< max. major version used          */
+    int max_minor_ver;          /*!< max. minor version used          */
+    int min_major_ver;          /*!< min. major version used          */
+    int min_minor_ver;          /*!< min. minor version used          */
 
     /*
      * Callbacks (RNG, debug, I/O, verification)
@@ -418,21 +702,32 @@ struct _ssl_context
     void (*f_dbg)(void *, int, const char *);
     int (*f_recv)(void *, unsigned char *, size_t);
     int (*f_send)(void *, const unsigned char *, size_t);
-    int (*f_vrfy)(void *, x509_cert *, int, int *);
     int (*f_get_cache)(void *, ssl_session *);
     int (*f_set_cache)(void *, const ssl_session *);
-    int (*f_sni)(void *, ssl_context *, const unsigned char *, size_t);
 
     void *p_rng;                /*!< context for the RNG function     */
     void *p_dbg;                /*!< context for the debug function   */
     void *p_recv;               /*!< context for reading operations   */
     void *p_send;               /*!< context for writing operations   */
-    void *p_vrfy;               /*!< context for verification         */
     void *p_get_cache;          /*!< context for cache retrieval      */
     void *p_set_cache;          /*!< context for cache store          */
-    void *p_sni;                /*!< context for SNI extension        */
     void *p_hw_data;            /*!< context for HW acceleration      */
 
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    int (*f_sni)(void *, ssl_context *, const unsigned char *, size_t);
+    void *p_sni;                /*!< context for SNI extension        */
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    int (*f_vrfy)(void *, x509_crt *, int, int *);
+    void *p_vrfy;               /*!< context for verification         */
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+    int (*f_psk)(void *, ssl_context *, const unsigned char *, size_t);
+    void *p_psk;               /*!< context for PSK retrieval         */
+#endif
+
     /*
      * Session layer
      */
@@ -457,7 +752,8 @@ struct _ssl_context
      */
     unsigned char *in_ctr;      /*!< 64-bit incoming message counter  */
     unsigned char *in_hdr;      /*!< 5-byte record header (in_ctr+8)  */
-    unsigned char *in_msg;      /*!< the message contents (in_hdr+5)  */
+    unsigned char *in_iv;       /*!< ivlen-byte IV (in_hdr+5)         */
+    unsigned char *in_msg;      /*!< message contents (in_iv+ivlen)   */
     unsigned char *in_offt;     /*!< read offset in application data  */
 
     int in_msgtype;             /*!< record header: message type      */
@@ -466,30 +762,44 @@ struct _ssl_context
 
     size_t in_hslen;            /*!< current handshake message length */
     int nb_zero;                /*!< # of 0-length encrypted messages */
+    int record_read;            /*!< record is already present        */
 
     /*
      * Record layer (outgoing data)
      */
     unsigned char *out_ctr;     /*!< 64-bit outgoing message counter  */
     unsigned char *out_hdr;     /*!< 5-byte record header (out_ctr+8) */
-    unsigned char *out_msg;     /*!< the message contents (out_hdr+32)*/
+    unsigned char *out_iv;      /*!< ivlen-byte IV (out_hdr+5)        */
+    unsigned char *out_msg;     /*!< message contents (out_iv+ivlen)  */
 
     int out_msgtype;            /*!< record header: message type      */
     size_t out_msglen;          /*!< record header: message length    */
     size_t out_left;            /*!< amount of data not yet written   */
 
+#if defined(POLARSSL_ZLIB_SUPPORT)
+    unsigned char *compress_buf;        /*!<  zlib data buffer        */
+#endif
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    unsigned char mfl_code;     /*!< MaxFragmentLength chosen by us   */
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
     /*
      * PKI layer
      */
-    void *rsa_key;                      /*!<  own RSA private key     */
-    rsa_decrypt_func rsa_decrypt;       /*!<  function for RSA decrypt*/
-    rsa_sign_func rsa_sign;             /*!<  function for RSA sign   */
-    rsa_key_len_func rsa_key_len;       /*!<  function for RSA key len*/
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    ssl_key_cert *key_cert;             /*!<  own certificate(s)/key(s) */
 
-    x509_cert *own_cert;                /*!<  own X.509 certificate   */
-    x509_cert *ca_chain;                /*!<  own trusted CA chain    */
-    x509_crl *ca_crl;                   /*!<  trusted CA CRLs         */
-    const char *peer_cn;                /*!<  expected peer CN        */
+    x509_crt *ca_chain;                 /*!<  own trusted CA chain      */
+    x509_crl *ca_crl;                   /*!<  trusted CA CRLs           */
+    const char *peer_cn;                /*!<  expected peer CN          */
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+    /*
+     * Support for generating and checking session tickets
+     */
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    ssl_ticket_keys *ticket_keys;       /*!<  keys for ticket encryption */
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 
     /*
      * User settings
@@ -500,18 +810,49 @@ struct _ssl_context
     int verify_result;                  /*!<  verification result     */
     int disable_renegotiation;          /*!<  enable/disable renegotiation   */
     int allow_legacy_renegotiation;     /*!<  allow legacy renegotiation     */
-    const int **ciphersuites;           /*!<  allowed ciphersuites / version */
+    int renego_max_records;             /*!<  grace period for renegotiation */
+    const int *ciphersuite_list[4];     /*!<  allowed ciphersuites / version */
+#if defined(POLARSSL_SSL_SET_CURVES)
+    const ecp_group_id *curve_list;     /*!<  allowed curves                 */
+#endif
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+    int trunc_hmac;                     /*!<  negotiate truncated hmac?      */
+#endif
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    int session_tickets;                /*!<  use session tickets?    */
+    int ticket_lifetime;                /*!<  session ticket lifetime */
+#endif
 
 #if defined(POLARSSL_DHM_C)
     mpi dhm_P;                          /*!<  prime modulus for DHM   */
     mpi dhm_G;                          /*!<  generator for DHM       */
 #endif
 
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
     /*
-     * TLS extensions
+     * PSK values
+     */
+    unsigned char *psk;
+    size_t         psk_len;
+    unsigned char *psk_identity;
+    size_t         psk_identity_len;
+#endif
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    /*
+     * SNI extension
      */
     unsigned char *hostname;
     size_t         hostname_len;
+#endif
+
+#if defined(POLARSSL_SSL_ALPN)
+    /*
+     * ALPN extension
+     */
+    const char **alpn_list;     /*!<  ordered list of supported protocols   */
+    const char *alpn_chosen;    /*!<  negotiated protocol                   */
+#endif
 
     /*
      * Secure renegotiation
@@ -523,22 +864,24 @@ struct _ssl_context
     char peer_verify_data[36];          /*!<  previous handshake verify data */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const int ssl_default_ciphersuites[];
-
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
+
+#define SSL_CHANNEL_OUTBOUND    0
+#define SSL_CHANNEL_INBOUND     1
+
 extern int (*ssl_hw_record_init)(ssl_context *ssl,
                 const unsigned char *key_enc, const unsigned char *key_dec,
+                size_t keylen,
                 const unsigned char *iv_enc,  const unsigned char *iv_dec,
-                const unsigned char *mac_enc, const unsigned char *mac_dec);
+                size_t ivlen,
+                const unsigned char *mac_enc, const unsigned char *mac_dec,
+                size_t maclen);
+extern int (*ssl_hw_record_activate)(ssl_context *ssl, int direction);
 extern int (*ssl_hw_record_reset)(ssl_context *ssl);
 extern int (*ssl_hw_record_write)(ssl_context *ssl);
 extern int (*ssl_hw_record_read)(ssl_context *ssl);
 extern int (*ssl_hw_record_finish)(ssl_context *ssl);
-#endif
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
 
 /**
  * \brief Returns the list of ciphersuites supported by the SSL/TLS module.
@@ -546,14 +889,11 @@ extern int (*ssl_hw_record_finish)(ssl_context *ssl);
  * \return              a statically allocated array of ciphersuites, the last
  *                      entry is 0.
  */
-static inline const int *ssl_list_ciphersuites( void )
-{
-    return ssl_default_ciphersuites;
-}
+const int *ssl_list_ciphersuites( void );
 
 /**
- * \brief               Return the name of the ciphersuite associated with the given
- *                      ID
+ * \brief               Return the name of the ciphersuite associated with the
+ *                      given ID
  *
  * \param ciphersuite_id SSL ciphersuite ID
  *
@@ -562,8 +902,8 @@ static inline const int *ssl_list_ciphersuites( void )
 const char *ssl_get_ciphersuite_name( const int ciphersuite_id );
 
 /**
- * \brief               Return the ID of the ciphersuite associated with the given
- *                      name
+ * \brief               Return the ID of the ciphersuite associated with the
+ *                      given name
  *
  * \param ciphersuite_name SSL ciphersuite name
  *
@@ -573,6 +913,7 @@ int ssl_get_ciphersuite_id( const char *ciphersuite_name );
 
 /**
  * \brief          Initialize an SSL context
+ *                 (An individual SSL context is not thread-safe)
  *
  * \param ssl      SSL context
  *
@@ -598,6 +939,9 @@ int ssl_session_reset( ssl_context *ssl );
  *
  * \param ssl      SSL context
  * \param endpoint must be SSL_IS_CLIENT or SSL_IS_SERVER
+ *
+ * \note           This function should be called right after ssl_init() since
+ *                 some other ssl_set_foo() functions depend on it.
  */
 void ssl_set_endpoint( ssl_context *ssl, int endpoint );
 
@@ -617,9 +961,16 @@ void ssl_set_endpoint( ssl_context *ssl, int endpoint );
  *
  *  SSL_VERIFY_REQUIRED:  peer *must* present a valid certificate,
  *                        handshake is aborted if verification failed.
+ *
+ * \note On client, SSL_VERIFY_REQUIRED is the recommended mode.
+ * With SSL_VERIFY_OPTIONAL, the user needs to call ssl_get_verify_result() at
+ * the right time(s), which may not be obvious, while REQUIRED always perform
+ * the verification as soon as possible. For example, REQUIRED was protecting
+ * against the "triple handshake" attack even before it was found.
  */
 void ssl_set_authmode( ssl_context *ssl, int authmode );
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 /**
  * \brief          Set the verification callback (Optional).
  *
@@ -632,8 +983,9 @@ void ssl_set_authmode( ssl_context *ssl, int authmode );
  * \param p_vrfy   verification parameter
  */
 void ssl_set_verify( ssl_context *ssl,
-                     int (*f_vrfy)(void *, x509_cert *, int, int *),
+                     int (*f_vrfy)(void *, x509_crt *, int, int *),
                      void *p_vrfy );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
 /**
  * \brief          Set the random number generator callback
@@ -715,30 +1067,35 @@ void ssl_set_session_cache( ssl_context *ssl,
  * \brief          Request resumption of session (client-side only)
  *                 Session data is copied from presented session structure.
  *
- *                 Warning: session.peer_cert is cleared by the SSL/TLS layer on
- *                 connection shutdown, so do not cache the pointer! Either set
- *                 it to NULL or make a full copy of the certificate when
- *                 storing the session for use in this function.
- *
  * \param ssl      SSL context
  * \param session  session context
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_SSL_MALLOC_FAILED if memory allocation failed,
+ *                 POLARSSL_ERR_SSL_BAD_INPUT_DATA if used server-side or
+ *                 arguments are otherwise invalid
+ *
+ * \sa             ssl_get_session()
  */
-void ssl_set_session( ssl_context *ssl, const ssl_session *session );
+int ssl_set_session( ssl_context *ssl, const ssl_session *session );
 
 /**
- * \brief               Set the list of allowed ciphersuites
- *                      (Default: ssl_default_ciphersuites)
+ * \brief               Set the list of allowed ciphersuites and the preference
+ *                      order. First in the list has the highest preference.
  *                      (Overrides all version specific lists)
  *
+ *                      Note: The PolarSSL SSL server uses its own preferences
+ *                      over the preference of the connection SSL client unless
+ *                      POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE is defined!
+ *
  * \param ssl           SSL context
  * \param ciphersuites  0-terminated list of allowed ciphersuites
  */
 void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites );
 
 /**
- * \brief               Set the list of allowed ciphersuites for a specific
- *                      version of the protocol.
- *                      (Default: ssl_default_ciphersuites)
+ * \brief               Set the list of allowed ciphersuites and the
+ *                      preference order for a specific version of the protocol.
  *                      (Only useful on the server side)
  *
  * \param ssl           SSL context
@@ -753,6 +1110,7 @@ void ssl_set_ciphersuites_for_version( ssl_context *ssl,
                                        const int *ciphersuites,
                                        int major, int minor );
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 /**
  * \brief          Set the data required to verify peer certificate
  *
@@ -761,25 +1119,53 @@ void ssl_set_ciphersuites_for_version( ssl_context *ssl,
  * \param ca_crl   trusted CA CRLs
  * \param peer_cn  expected peer CommonName (or NULL)
  */
-void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
+void ssl_set_ca_chain( ssl_context *ssl, x509_crt *ca_chain,
                        x509_crl *ca_crl, const char *peer_cn );
 
 /**
  * \brief          Set own certificate chain and private key
  *
+ * \note           own_cert should contain in order from the bottom up your
+ *                 certificate chain. The top certificate (self-signed)
+ *                 can be omitted.
+ *
+ * \note           This function may be called more than once if you want to
+ *                 support multiple certificates (eg, one using RSA and one
+ *                 using ECDSA). However, on client, currently only the first
+ *                 certificate is used (subsequent calls have no effect).
+ *
+ * \param ssl      SSL context
+ * \param own_cert own public certificate chain
+ * \param pk_key   own private key
+ *
+ * \return         0 on success or POLARSSL_ERR_SSL_MALLOC_FAILED
+ */
+int ssl_set_own_cert( ssl_context *ssl, x509_crt *own_cert,
+                       pk_context *pk_key );
+
+#if defined(POLARSSL_RSA_C)
+/**
+ * \brief          Set own certificate chain and private RSA key
+ *
  *                 Note: own_cert should contain IN order from the bottom
  *                 up your certificate chain. The top certificate (self-signed)
  *                 can be omitted.
  *
+ * \warning        This backwards-compatibility function is deprecated!
+ *                 Please use \c ssl_set_own_cert() instead.
+ *
  * \param ssl      SSL context
  * \param own_cert own public certificate chain
  * \param rsa_key  own private RSA key
+ *
+ * \return          0 on success, or a specific error code.
  */
-void ssl_set_own_cert( ssl_context *ssl, x509_cert *own_cert,
-                       rsa_context *rsa_key );
+int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
+                          rsa_context *rsa_key );
+#endif /* POLARSSL_RSA_C */
 
 /**
- * \brief          Set own certificate and alternate non-PolarSSL private
+ * \brief          Set own certificate and alternate non-PolarSSL RSA private
  *                 key and handling callbacks, such as the PKCS#11 wrappers
  *                 or any other external private key handler.
  *                 (see the respective RSA functions in rsa.h for documentation
@@ -790,18 +1176,67 @@ void ssl_set_own_cert( ssl_context *ssl, x509_cert *own_cert,
  *                 up your certificate chain. The top certificate (self-signed)
  *                 can be omitted.
  *
+ * \warning        This backwards-compatibility function is deprecated!
+ *                 Please use \c pk_init_ctx_rsa_alt()
+ *                 and \c ssl_set_own_cert() instead.
+ *
  * \param ssl      SSL context
  * \param own_cert own public certificate chain
  * \param rsa_key  alternate implementation private RSA key
- * \param rsa_decrypt_func  alternate implementation of \c rsa_pkcs1_decrypt()
- * \param rsa_sign_func     alternate implementation of \c rsa_pkcs1_sign()
- * \param rsa_key_len_func  function returning length of RSA key in bytes
+ * \param rsa_decrypt  alternate implementation of \c rsa_pkcs1_decrypt()
+ * \param rsa_sign     alternate implementation of \c rsa_pkcs1_sign()
+ * \param rsa_key_len  function returning length of RSA key in bytes
+ *
+ * \return          0 on success, or a specific error code.
  */
-void ssl_set_own_cert_alt( ssl_context *ssl, x509_cert *own_cert,
-                           void *rsa_key,
-                           rsa_decrypt_func rsa_decrypt,
-                           rsa_sign_func rsa_sign,
-                           rsa_key_len_func rsa_key_len );
+int ssl_set_own_cert_alt( ssl_context *ssl, x509_crt *own_cert,
+                          void *rsa_key,
+                          rsa_decrypt_func rsa_decrypt,
+                          rsa_sign_func rsa_sign,
+                          rsa_key_len_func rsa_key_len );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+/**
+ * \brief          Set the Pre Shared Key (PSK) and the identity name connected
+ *                 to it.
+ *
+ * \param ssl      SSL context
+ * \param psk      pointer to the pre-shared key
+ * \param psk_len  pre-shared key length
+ * \param psk_identity      pointer to the pre-shared key identity
+ * \param psk_identity_len  identity key length
+ *
+ * \return         0 if successful or POLARSSL_ERR_SSL_MALLOC_FAILED
+ */
+int ssl_set_psk( ssl_context *ssl, const unsigned char *psk, size_t psk_len,
+                 const unsigned char *psk_identity, size_t psk_identity_len );
+
+/**
+ * \brief          Set the PSK callback (server-side only) (Optional).
+ *
+ *                 If set, the PSK callback is called for each
+ *                 handshake where a PSK ciphersuite was negotiated.
+ *                 The caller provides the identity received and wants to
+ *                 receive the actual PSK data and length.
+ *
+ *                 The callback has the following parameters: (void *parameter,
+ *                 ssl_context *ssl, const unsigned char *psk_identity,
+ *                 size_t identity_len)
+ *                 If a valid PSK identity is found, the callback should use
+ *                 ssl_set_psk() on the ssl context to set the correct PSK and
+ *                 identity and return 0.
+ *                 Any other return value will result in a denied PSK identity.
+ *
+ * \param ssl      SSL context
+ * \param f_psk    PSK identity function
+ * \param p_psk    PSK identity parameter
+ */
+void ssl_set_psk_cb( ssl_context *ssl,
+                     int (*f_psk)(void *, ssl_context *, const unsigned char *,
+                                  size_t),
+                     void *p_psk );
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
 
 #if defined(POLARSSL_DHM_C)
 /**
@@ -827,12 +1262,35 @@ int ssl_set_dh_param( ssl_context *ssl, const char *dhm_P, const char *dhm_G );
  * \return         0 if successful
  */
 int ssl_set_dh_param_ctx( ssl_context *ssl, dhm_context *dhm_ctx );
-#endif
+#endif /* POLARSSL_DHM_C */
 
+#if defined(POLARSSL_SSL_SET_CURVES)
+/**
+ * \brief          Set the allowed curves in order of preference.
+ *                 (Default: all defined curves.)
+ *
+ *                 On server: this only affects selection of the ECDHE curve;
+ *                 the curves used for ECDH and ECDSA are determined by the
+ *                 list of available certificates instead.
+ *
+ *                 On client: this affects the list of curves offered for any
+ *                 use. The server can override our preference order.
+ *
+ *                 Both sides: limits the set of curves used by peer to the
+ *                 listed curves for any use (ECDH(E), certificates).
+ *
+ * \param ssl      SSL context
+ * \param curves   Ordered list of allowed curves,
+ *                 terminated by POLARSSL_ECP_DP_NONE.
+ */
+void ssl_set_curves( ssl_context *ssl, const ecp_group_id *curves );
+#endif /* POLARSSL_SSL_SET_CURVES */
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
 /**
  * \brief          Set hostname for ServerName TLS extension
  *                 (client-side only)
- *                 
+ *
  *
  * \param ssl      SSL context
  * \param hostname the server hostname
@@ -864,10 +1322,41 @@ void ssl_set_sni( ssl_context *ssl,
                   int (*f_sni)(void *, ssl_context *, const unsigned char *,
                                size_t),
                   void *p_sni );
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
+
+#if defined(POLARSSL_SSL_ALPN)
+/**
+ * \brief          Set the supported Application Layer Protocols.
+ *
+ * \param ssl      SSL context
+ * \param protos   NULL-terminated list of supported protocols,
+ *                 in decreasing preference order.
+ *
+ * \return         0 on success, or POLARSSL_ERR_SSL_BAD_INPUT_DATA.
+ */
+int ssl_set_alpn_protocols( ssl_context *ssl, const char **protos );
+
+/**
+ * \brief          Get the name of the negotiated Application Layer Protocol.
+ *                 This function should be called after the handshake is
+ *                 completed.
+ *
+ * \param ssl      SSL context
+ *
+ * \return         Protcol name, or NULL if no protocol was negotiated.
+ */
+const char *ssl_get_alpn_protocol( const ssl_context *ssl );
+#endif /* POLARSSL_SSL_ALPN */
 
 /**
  * \brief          Set the maximum supported version sent from the client side
- * 
+ *                 and/or accepted at the server side
+ *                 (Default: SSL_MAX_MAJOR_VERSION, SSL_MAX_MINOR_VERSION)
+ *
+ *                 Note: This ignores ciphersuites from 'higher' versions.
+ *                 Note: Input outside of the SSL_MAX_XXXXX_VERSION and
+ *                       SSL_MIN_XXXXX_VERSION range is ignored.
+ *
  * \param ssl      SSL context
  * \param major    Major version number (only SSL_MAJOR_VERSION_3 supported)
  * \param minor    Minor version number (SSL_MINOR_VERSION_0,
@@ -879,7 +1368,10 @@ void ssl_set_max_version( ssl_context *ssl, int major, int minor );
 
 /**
  * \brief          Set the minimum accepted SSL/TLS protocol version
- *                 (Default: SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0)
+ *                 (Default: SSL_MIN_MAJOR_VERSION, SSL_MIN_MINOR_VERSION)
+ *
+ *                 Note: Input outside of the SSL_MAX_XXXXX_VERSION and
+ *                       SSL_MIN_XXXXX_VERSION range is ignored.
  *
  * \param ssl      SSL context
  * \param major    Major version number (only SSL_MAJOR_VERSION_3 supported)
@@ -889,6 +1381,69 @@ void ssl_set_max_version( ssl_context *ssl, int major, int minor );
  */
 void ssl_set_min_version( ssl_context *ssl, int major, int minor );
 
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+/**
+ * \brief          Set the maximum fragment length to emit and/or negotiate
+ *                 (Default: SSL_MAX_CONTENT_LEN, usually 2^14 bytes)
+ *                 (Server: set maximum fragment length to emit,
+ *                 usually negotiated by the client during handshake
+ *                 (Client: set maximum fragment length to emit *and*
+ *                 negotiate with the server during handshake)
+ *
+ * \param ssl      SSL context
+ * \param mfl_code Code for maximum fragment length (allowed values:
+ *                 SSL_MAX_FRAG_LEN_512,  SSL_MAX_FRAG_LEN_1024,
+ *                 SSL_MAX_FRAG_LEN_2048, SSL_MAX_FRAG_LEN_4096)
+ *
+ * \return         O if successful or POLARSSL_ERR_SSL_BAD_INPUT_DATA
+ */
+int ssl_set_max_frag_len( ssl_context *ssl, unsigned char mfl_code );
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+/**
+ * \brief          Activate negotiation of truncated HMAC (Client only)
+ *                 (Default: SSL_TRUNC_HMAC_ENABLED)
+ *
+ * \param ssl      SSL context
+ * \param truncate Enable or disable (SSL_TRUNC_HMAC_ENABLED or
+ *                                    SSL_TRUNC_HMAC_DISABLED)
+ *
+ * \return         O if successful,
+ *                 POLARSSL_ERR_SSL_BAD_INPUT_DATA if used server-side
+ */
+int ssl_set_truncated_hmac( ssl_context *ssl, int truncate );
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+/**
+ * \brief          Enable / Disable session tickets
+ *                 (Default: SSL_SESSION_TICKETS_ENABLED on client,
+ *                           SSL_SESSION_TICKETS_DISABLED on server)
+ *
+ * \note           On server, ssl_set_rng() must be called before this function
+ *                 to allow generating the ticket encryption and
+ *                 authentication keys.
+ *
+ * \param ssl      SSL context
+ * \param use_tickets   Enable or disable (SSL_SESSION_TICKETS_ENABLED or
+ *                                         SSL_SESSION_TICKETS_DISABLED)
+ *
+ * \return         O if successful,
+ *                 or a specific error code (server only).
+ */
+int ssl_set_session_tickets( ssl_context *ssl, int use_tickets );
+
+/**
+ * \brief          Set session ticket lifetime (server only)
+ *                 (Default: SSL_DEFAULT_TICKET_LIFETIME (86400 secs / 1 day))
+ *
+ * \param ssl      SSL context
+ * \param lifetime session ticket lifetime
+ */
+void ssl_set_session_ticket_lifetime( ssl_context *ssl, int lifetime );
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
 /**
  * \brief          Enable / Disable renegotiation support for connection when
  *                 initiated by peer
@@ -907,7 +1462,7 @@ void ssl_set_renegotiation( ssl_context *ssl, int renegotiation );
 /**
  * \brief          Prevent or allow legacy renegotiation.
  *                 (Default: SSL_LEGACY_NO_RENEGOTIATION)
- *                 
+ *
  *                 SSL_LEGACY_NO_RENEGOTIATION allows connections to
  *                 be established even if the peer does not support
  *                 secure renegotiation, but does not allow renegotiation
@@ -933,6 +1488,33 @@ void ssl_set_renegotiation( ssl_context *ssl, int renegotiation );
  */
 void ssl_legacy_renegotiation( ssl_context *ssl, int allow_legacy );
 
+/**
+ * \brief          Enforce server-requested renegotiation.
+ *                 (Default: enforced, max_records = 16)
+ *                 (No effect on client.)
+ *
+ *                 When a server requests a renegotiation, the client can
+ *                 comply or ignore the request. This function allows the
+ *                 server to decide if it should enforce its renegotiation
+ *                 requests by closing the connection if the client doesn't
+ *                 initiate a renegotiation.
+ *
+ *                 However, records could already be in transit from the
+ *                 client to the server when the request is emitted. In order
+ *                 to increase reliability, the server can accept a number of
+ *                 records containing application data before the ClientHello
+ *                 that was requested.
+ *
+ *                 The optimal value is highly dependent on the specific usage
+ *                 scenario.
+ *
+ * \param ssl      SSL context
+ * \param max_records Use SSL_RENEGOTIATION_NOT_ENFORCED if you don't want to
+ *                 enforce renegotiation, or a non-negative value to enforce
+ *                 it but allow for a grace period of max_records records.
+ */
+void ssl_set_renegotiation_enforced( ssl_context *ssl, int max_records );
+
 /**
  * \brief          Return the number of data bytes available to read
  *
@@ -973,6 +1555,7 @@ const char *ssl_get_ciphersuite( const ssl_context *ssl );
  */
 const char *ssl_get_version( const ssl_context *ssl );
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 /**
  * \brief          Return the peer certificate from the current connection
  *
@@ -987,7 +1570,26 @@ const char *ssl_get_version( const ssl_context *ssl );
  *
  * \return         the current peer certificate
  */
-const x509_cert *ssl_get_peer_cert( const ssl_context *ssl );
+const x509_crt *ssl_get_peer_cert( const ssl_context *ssl );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+/**
+ * \brief          Save session in order to resume it later (client-side only)
+ *                 Session data is copied to presented session structure.
+ *
+ * \warning        Currently, peer certificate is lost in the operation.
+ *
+ * \param ssl      SSL context
+ * \param session  session context
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_SSL_MALLOC_FAILED if memory allocation failed,
+ *                 POLARSSL_ERR_SSL_BAD_INPUT_DATA if used server-side or
+ *                 arguments are otherwise invalid
+ *
+ * \sa             ssl_set_session()
+ */
+int ssl_get_session( const ssl_context *ssl, ssl_session *session );
 
 /**
  * \brief          Perform the SSL handshake
@@ -1014,11 +1616,14 @@ int ssl_handshake( ssl_context *ssl );
 int ssl_handshake_step( ssl_context *ssl );
 
 /**
- * \brief          Perform an SSL renegotiation on the running connection
+ * \brief          Initiate an SSL renegotiation on the running connection.
+ *                 Client: perform the renegotiation right now.
+ *                 Server: request renegotiation, which will be performed
+ *                 during the next call to ssl_read() if honored by client.
  *
  * \param ssl      SSL context
  *
- * \return         0 if succesful, or any ssl_handshake() return value.
+ * \return         0 if successful, or any ssl_handshake() return value.
  */
 int ssl_renegotiate( ssl_context *ssl );
 
@@ -1077,6 +1682,13 @@ int ssl_close_notify( ssl_context *ssl );
  */
 void ssl_free( ssl_context *ssl );
 
+/**
+ * \brief          Initialize SSL session structure
+ *
+ * \param session  SSL session
+ */
+void ssl_session_init( ssl_session *session );
+
 /**
  * \brief          Free referenced items in an SSL session including the
  *                 peer certificate and clear memory
@@ -1131,7 +1743,64 @@ int ssl_write_change_cipher_spec( ssl_context *ssl );
 int ssl_parse_finished( ssl_context *ssl );
 int ssl_write_finished( ssl_context *ssl );
 
-void ssl_optimize_checksum( ssl_context *ssl, int ciphersuite );
+void ssl_optimize_checksum( ssl_context *ssl,
+                            const ssl_ciphersuite_t *ciphersuite_info );
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+int ssl_psk_derive_premaster( ssl_context *ssl, key_exchange_type_t key_ex );
+#endif
+
+#if defined(POLARSSL_PK_C)
+unsigned char ssl_sig_from_pk( pk_context *pk );
+pk_type_t ssl_pk_alg_from_sig( unsigned char sig );
+#endif
+
+md_type_t ssl_md_alg_from_hash( unsigned char hash );
+
+#if defined(POLARSSL_SSL_SET_CURVES)
+int ssl_curve_is_acceptable( const ssl_context *ssl, ecp_group_id grp_id );
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+static inline pk_context *ssl_own_key( ssl_context *ssl )
+{
+    return( ssl->handshake->key_cert == NULL ? NULL
+            : ssl->handshake->key_cert->key );
+}
+
+static inline x509_crt *ssl_own_cert( ssl_context *ssl )
+{
+    return( ssl->handshake->key_cert == NULL ? NULL
+            : ssl->handshake->key_cert->cert );
+}
+
+/*
+ * Check usage of a certificate wrt extensions:
+ * keyUsage, extendedKeyUsage (later), and nSCertType (later).
+ *
+ * Warning: cert_endpoint is the endpoint of the cert (ie, of our peer when we
+ * check a cert we received from them)!
+ *
+ * Return 0 if everything is OK, -1 if not.
+ */
+int ssl_check_cert_usage( const x509_crt *cert,
+                          const ssl_ciphersuite_t *ciphersuite,
+                          int cert_endpoint );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+/* constant-time buffer comparison */
+static inline int safer_memcmp( const void *a, const void *b, size_t n )
+{
+    size_t i;
+    const unsigned char *A = (const unsigned char *) a;
+    const unsigned char *B = (const unsigned char *) b;
+    unsigned char diff = 0;
+
+    for( i = 0; i < n; i++ )
+        diff |= A[i] ^ B[i];
+
+    return( diff );
+}
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/include/polarssl/ssl_cache.h b/Externals/polarssl/include/polarssl/ssl_cache.h
index 8d66b5caf4..918fb608eb 100644
--- a/Externals/polarssl/include/polarssl/ssl_cache.h
+++ b/Externals/polarssl/include/polarssl/ssl_cache.h
@@ -29,10 +29,27 @@
 
 #include "ssl.h"
 
-#if !defined(POLARSSL_CONFIG_OPTIONS)
+#if defined(POLARSSL_THREADING_C)
+#include "threading.h"
+#endif
+
+/**
+ * \name SECTION: Module settings
+ *
+ * The configuration options you can set for this module are in this section.
+ * Either change them in config.h or define them on the compiler command line.
+ * \{
+ */
+
+#if !defined(SSL_CACHE_DEFAULT_TIMEOUT)
 #define SSL_CACHE_DEFAULT_TIMEOUT       86400   /*!< 1 day  */
+#endif
+
+#if !defined(SSL_CACHE_DEFAULT_MAX_ENTRIES)
 #define SSL_CACHE_DEFAULT_MAX_ENTRIES      50   /*!< Maximum entries in cache */
-#endif /* !POLARSSL_CONFIG_OPTIONS */
+#endif
+
+/* \} name SECTION: Module settings */
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,9 +63,13 @@ typedef struct _ssl_cache_entry ssl_cache_entry;
  */
 struct _ssl_cache_entry
 {
+#if defined(POLARSSL_HAVE_TIME)
     time_t timestamp;           /*!< entry timestamp    */
+#endif
     ssl_session session;        /*!< entry session      */
+#if defined(POLARSSL_X509_CRT_PARSE_C)
     x509_buf peer_cert;         /*!< entry peer_cert    */
+#endif
     ssl_cache_entry *next;      /*!< chain pointer      */
 };
 
@@ -60,6 +81,9 @@ struct _ssl_cache_context
     ssl_cache_entry *chain;     /*!< start of the chain     */
     int timeout;                /*!< cache entry timeout    */
     int max_entries;            /*!< maximum entries        */
+#if defined(POLARSSL_THREADING_C)
+    threading_mutex_t mutex;    /*!< mutex                  */
+#endif
 };
 
 /**
@@ -71,6 +95,7 @@ void ssl_cache_init( ssl_cache_context *cache );
 
 /**
  * \brief          Cache get callback implementation
+ *                 (Thread-safe if POLARSSL_THREADING_C is enabled)
  *
  * \param data     SSL cache context
  * \param session  session to retrieve entry for
@@ -79,12 +104,14 @@ int ssl_cache_get( void *data, ssl_session *session );
 
 /**
  * \brief          Cache set callback implementation
+ *                 (Thread-safe if POLARSSL_THREADING_C is enabled)
  *
  * \param data     SSL cache context
  * \param session  session to store entry for
  */
 int ssl_cache_set( void *data, const ssl_session *session );
 
+#if defined(POLARSSL_HAVE_TIME)
 /**
  * \brief          Set the cache timeout
  *                 (Default: SSL_CACHE_DEFAULT_TIMEOUT (1 day))
@@ -92,9 +119,10 @@ int ssl_cache_set( void *data, const ssl_session *session );
  *                 A timeout of 0 indicates no timeout.
  *
  * \param cache    SSL cache context
- * \param timeout  cache entry timeout
+ * \param timeout  cache entry timeout in seconds
  */
 void ssl_cache_set_timeout( ssl_cache_context *cache, int timeout );
+#endif /* POLARSSL_HAVE_TIME */
 
 /**
  * \brief          Set the cache timeout
diff --git a/Externals/polarssl/include/polarssl/ssl_ciphersuites.h b/Externals/polarssl/include/polarssl/ssl_ciphersuites.h
new file mode 100644
index 0000000000..c4f1ffe644
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/ssl_ciphersuites.h
@@ -0,0 +1,293 @@
+/**
+ * \file ssl_ciphersuites.h
+ *
+ * \brief SSL Ciphersuites for PolarSSL
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_SSL_CIPHERSUITES_H
+#define POLARSSL_SSL_CIPHERSUITES_H
+
+#include "pk.h"
+#include "cipher.h"
+#include "md.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Supported ciphersuites (Official IANA names)
+ */
+#define TLS_RSA_WITH_NULL_MD5                    0x01   /**< Weak! */
+#define TLS_RSA_WITH_NULL_SHA                    0x02   /**< Weak! */
+
+#define TLS_RSA_WITH_RC4_128_MD5                 0x04
+#define TLS_RSA_WITH_RC4_128_SHA                 0x05
+#define TLS_RSA_WITH_DES_CBC_SHA                 0x09   /**< Weak! Not in TLS 1.2 */
+
+#define TLS_RSA_WITH_3DES_EDE_CBC_SHA            0x0A
+
+#define TLS_DHE_RSA_WITH_DES_CBC_SHA             0x15   /**< Weak! Not in TLS 1.2 */
+#define TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA        0x16
+
+#define TLS_PSK_WITH_NULL_SHA                    0x2C   /**< Weak! */
+#define TLS_DHE_PSK_WITH_NULL_SHA                0x2D   /**< Weak! */
+#define TLS_RSA_PSK_WITH_NULL_SHA                0x2E   /**< Weak! */
+#define TLS_RSA_WITH_AES_128_CBC_SHA             0x2F
+
+#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA         0x33
+#define TLS_RSA_WITH_AES_256_CBC_SHA             0x35
+#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA         0x39
+
+#define TLS_RSA_WITH_NULL_SHA256                 0x3B   /**< Weak! */
+#define TLS_RSA_WITH_AES_128_CBC_SHA256          0x3C   /**< TLS 1.2 */
+#define TLS_RSA_WITH_AES_256_CBC_SHA256          0x3D   /**< TLS 1.2 */
+
+#define TLS_RSA_WITH_CAMELLIA_128_CBC_SHA        0x41
+#define TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA    0x45
+
+#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA256      0x67   /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA256      0x6B   /**< TLS 1.2 */
+
+#define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA        0x84
+#define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA    0x88
+
+#define TLS_PSK_WITH_RC4_128_SHA                 0x8A
+#define TLS_PSK_WITH_3DES_EDE_CBC_SHA            0x8B
+#define TLS_PSK_WITH_AES_128_CBC_SHA             0x8C
+#define TLS_PSK_WITH_AES_256_CBC_SHA             0x8D
+
+#define TLS_DHE_PSK_WITH_RC4_128_SHA             0x8E
+#define TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA        0x8F
+#define TLS_DHE_PSK_WITH_AES_128_CBC_SHA         0x90
+#define TLS_DHE_PSK_WITH_AES_256_CBC_SHA         0x91
+
+#define TLS_RSA_PSK_WITH_RC4_128_SHA             0x92
+#define TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA        0x93
+#define TLS_RSA_PSK_WITH_AES_128_CBC_SHA         0x94
+#define TLS_RSA_PSK_WITH_AES_256_CBC_SHA         0x95
+
+#define TLS_RSA_WITH_AES_128_GCM_SHA256          0x9C   /**< TLS 1.2 */
+#define TLS_RSA_WITH_AES_256_GCM_SHA384          0x9D   /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_128_GCM_SHA256      0x9E   /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_256_GCM_SHA384      0x9F   /**< TLS 1.2 */
+
+#define TLS_PSK_WITH_AES_128_GCM_SHA256          0xA8   /**< TLS 1.2 */
+#define TLS_PSK_WITH_AES_256_GCM_SHA384          0xA9   /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_128_GCM_SHA256      0xAA   /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_256_GCM_SHA384      0xAB   /**< TLS 1.2 */
+#define TLS_RSA_PSK_WITH_AES_128_GCM_SHA256      0xAC   /**< TLS 1.2 */
+#define TLS_RSA_PSK_WITH_AES_256_GCM_SHA384      0xAD   /**< TLS 1.2 */
+
+#define TLS_PSK_WITH_AES_128_CBC_SHA256          0xAE
+#define TLS_PSK_WITH_AES_256_CBC_SHA384          0xAF
+#define TLS_PSK_WITH_NULL_SHA256                 0xB0   /**< Weak! */
+#define TLS_PSK_WITH_NULL_SHA384                 0xB1   /**< Weak! */
+
+#define TLS_DHE_PSK_WITH_AES_128_CBC_SHA256      0xB2
+#define TLS_DHE_PSK_WITH_AES_256_CBC_SHA384      0xB3
+#define TLS_DHE_PSK_WITH_NULL_SHA256             0xB4   /**< Weak! */
+#define TLS_DHE_PSK_WITH_NULL_SHA384             0xB5   /**< Weak! */
+
+#define TLS_RSA_PSK_WITH_AES_128_CBC_SHA256      0xB6
+#define TLS_RSA_PSK_WITH_AES_256_CBC_SHA384      0xB7
+#define TLS_RSA_PSK_WITH_NULL_SHA256             0xB8   /**< Weak! */
+#define TLS_RSA_PSK_WITH_NULL_SHA384             0xB9   /**< Weak! */
+
+#define TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256     0xBA   /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 0xBE   /**< TLS 1.2 */
+
+#define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256     0xC0   /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 0xC4   /**< TLS 1.2 */
+
+#define TLS_ECDH_ECDSA_WITH_NULL_SHA             0xC001 /**< Weak! */
+#define TLS_ECDH_ECDSA_WITH_RC4_128_SHA          0xC002 /**< Not in SSL3! */
+#define TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA     0xC003 /**< Not in SSL3! */
+#define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA      0xC004 /**< Not in SSL3! */
+#define TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA      0xC005 /**< Not in SSL3! */
+
+#define TLS_ECDHE_ECDSA_WITH_NULL_SHA            0xC006 /**< Weak! */
+#define TLS_ECDHE_ECDSA_WITH_RC4_128_SHA         0xC007 /**< Not in SSL3! */
+#define TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA    0xC008 /**< Not in SSL3! */
+#define TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA     0xC009 /**< Not in SSL3! */
+#define TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA     0xC00A /**< Not in SSL3! */
+
+#define TLS_ECDH_RSA_WITH_NULL_SHA               0xC00B /**< Weak! */
+#define TLS_ECDH_RSA_WITH_RC4_128_SHA            0xC00C /**< Not in SSL3! */
+#define TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA       0xC00D /**< Not in SSL3! */
+#define TLS_ECDH_RSA_WITH_AES_128_CBC_SHA        0xC00E /**< Not in SSL3! */
+#define TLS_ECDH_RSA_WITH_AES_256_CBC_SHA        0xC00F /**< Not in SSL3! */
+
+#define TLS_ECDHE_RSA_WITH_NULL_SHA              0xC010 /**< Weak! */
+#define TLS_ECDHE_RSA_WITH_RC4_128_SHA           0xC011 /**< Not in SSL3! */
+#define TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA      0xC012 /**< Not in SSL3! */
+#define TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA       0xC013 /**< Not in SSL3! */
+#define TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA       0xC014 /**< Not in SSL3! */
+
+#define TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256  0xC023 /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384  0xC024 /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256   0xC025 /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384   0xC026 /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256    0xC027 /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384    0xC028 /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256     0xC029 /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384     0xC02A /**< TLS 1.2 */
+
+#define TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256  0xC02B /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384  0xC02C /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256   0xC02D /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384   0xC02E /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256    0xC02F /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384    0xC030 /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256     0xC031 /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384     0xC032 /**< TLS 1.2 */
+
+#define TLS_ECDHE_PSK_WITH_RC4_128_SHA           0xC033 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA      0xC034 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA       0xC035 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA       0xC036 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256    0xC037 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384    0xC038 /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_NULL_SHA              0xC039 /**< Weak! No SSL3! */
+#define TLS_ECDHE_PSK_WITH_NULL_SHA256           0xC03A /**< Weak! No SSL3! */
+#define TLS_ECDHE_PSK_WITH_NULL_SHA384           0xC03B /**< Weak! No SSL3! */
+
+#define TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0xC072 /**< Not in SSL3! */
+#define TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0xC073 /**< Not in SSL3! */
+#define TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256  0xC074 /**< Not in SSL3! */
+#define TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384  0xC075 /**< Not in SSL3! */
+#define TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   0xC076 /**< Not in SSL3! */
+#define TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384   0xC077 /**< Not in SSL3! */
+#define TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256    0xC078 /**< Not in SSL3! */
+#define TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384    0xC079 /**< Not in SSL3! */
+
+#define TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256         0xC07A /**< TLS 1.2 */
+#define TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384         0xC07B /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256     0xC07C /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384     0xC07D /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 0xC086 /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 0xC087 /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256  0xC088 /**< TLS 1.2 */
+#define TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384  0xC089 /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256   0xC08A /**< TLS 1.2 */
+#define TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384   0xC08B /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256    0xC08C /**< TLS 1.2 */
+#define TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384    0xC08D /**< TLS 1.2 */
+
+#define TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256       0xC08E /**< TLS 1.2 */
+#define TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384       0xC08F /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256   0xC090 /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384   0xC091 /**< TLS 1.2 */
+#define TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256   0xC092 /**< TLS 1.2 */
+#define TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384   0xC093 /**< TLS 1.2 */
+
+#define TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256       0xC094
+#define TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384       0xC095
+#define TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256   0xC096
+#define TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384   0xC097
+#define TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256   0xC098
+#define TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384   0xC099
+#define TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 0xC09A /**< Not in SSL3! */
+#define TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 0xC09B /**< Not in SSL3! */
+
+#define TLS_RSA_WITH_AES_128_CCM                0xC09C  /**< TLS 1.2 */
+#define TLS_RSA_WITH_AES_256_CCM                0xC09D  /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_128_CCM            0xC09E  /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_256_CCM            0xC09F  /**< TLS 1.2 */
+#define TLS_RSA_WITH_AES_128_CCM_8              0xC0A0  /**< TLS 1.2 */
+#define TLS_RSA_WITH_AES_256_CCM_8              0xC0A1  /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_128_CCM_8          0xC0A2  /**< TLS 1.2 */
+#define TLS_DHE_RSA_WITH_AES_256_CCM_8          0xC0A3  /**< TLS 1.2 */
+#define TLS_PSK_WITH_AES_128_CCM                0xC0A4  /**< TLS 1.2 */
+#define TLS_PSK_WITH_AES_256_CCM                0xC0A5  /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_128_CCM            0xC0A6  /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_256_CCM            0xC0A7  /**< TLS 1.2 */
+#define TLS_PSK_WITH_AES_128_CCM_8              0xC0A8  /**< TLS 1.2 */
+#define TLS_PSK_WITH_AES_256_CCM_8              0xC0A9  /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_128_CCM_8          0xC0AA  /**< TLS 1.2 */
+#define TLS_DHE_PSK_WITH_AES_256_CCM_8          0xC0AB  /**< TLS 1.2 */
+/* The last two are named with PSK_DHE in the RFC, which looks like a typo */
+
+#define TLS_ECDHE_ECDSA_WITH_AES_128_CCM        0xC0AC  /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_AES_256_CCM        0xC0AD  /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8      0xC0AE  /**< TLS 1.2 */
+#define TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8      0xC0AF  /**< TLS 1.2 */
+
+/* Reminder: update _ssl_premaster_secret when adding a new key exchange */
+typedef enum {
+    POLARSSL_KEY_EXCHANGE_NONE = 0,
+    POLARSSL_KEY_EXCHANGE_RSA,
+    POLARSSL_KEY_EXCHANGE_DHE_RSA,
+    POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+    POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+    POLARSSL_KEY_EXCHANGE_PSK,
+    POLARSSL_KEY_EXCHANGE_DHE_PSK,
+    POLARSSL_KEY_EXCHANGE_RSA_PSK,
+    POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+    POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+    POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+} key_exchange_type_t;
+
+typedef struct _ssl_ciphersuite_t ssl_ciphersuite_t;
+
+#define POLARSSL_CIPHERSUITE_WEAK       0x01    /**< Weak ciphersuite flag  */
+#define POLARSSL_CIPHERSUITE_SHORT_TAG  0x02    /**< Short authentication tag,
+                                                     eg for CCM_8 */
+
+/**
+ * \brief   This structure is used for storing ciphersuite information
+ */
+struct _ssl_ciphersuite_t
+{
+    int id;
+    const char * name;
+
+    cipher_type_t cipher;
+    md_type_t mac;
+    key_exchange_type_t key_exchange;
+
+    int min_major_ver;
+    int min_minor_ver;
+    int max_major_ver;
+    int max_minor_ver;
+
+    unsigned char flags;
+};
+
+const int *ssl_list_ciphersuites( void );
+
+const ssl_ciphersuite_t *ssl_ciphersuite_from_string( const char *ciphersuite_name );
+const ssl_ciphersuite_t *ssl_ciphersuite_from_id( int ciphersuite_id );
+
+#if defined(POLARSSL_PK_C)
+pk_type_t ssl_get_ciphersuite_sig_pk_alg( const ssl_ciphersuite_t *info );
+#endif
+
+int ssl_ciphersuite_uses_ec( const ssl_ciphersuite_t *info );
+int ssl_ciphersuite_uses_psk( const ssl_ciphersuite_t *info );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ssl_ciphersuites.h */
diff --git a/Externals/polarssl/include/polarssl/threading.h b/Externals/polarssl/include/polarssl/threading.h
new file mode 100644
index 0000000000..1fc9f9826d
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/threading.h
@@ -0,0 +1,86 @@
+/**
+ * \file threading.h
+ *
+ * \brief Threading abstraction layer
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_THREADING_H
+#define POLARSSL_THREADING_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define POLARSSL_ERR_THREADING_FEATURE_UNAVAILABLE         -0x001A  /**< The selected feature is not available. */
+#define POLARSSL_ERR_THREADING_BAD_INPUT_DATA              -0x001C  /**< Bad input parameters to function. */
+#define POLARSSL_ERR_THREADING_MUTEX_ERROR                 -0x001E  /**< Locking / unlocking / free failed with error code. */
+
+#if defined(POLARSSL_THREADING_PTHREAD)
+#include <pthread.h>
+typedef pthread_mutex_t threading_mutex_t;
+#endif
+
+#if defined(POLARSSL_THREADING_ALT)
+/* You should define the threading_mutex_t type in your header */
+#include "threading_alt.h"
+
+/**
+ * \brief           Set your alternate threading implementation function
+ *                  pointers
+ *
+ * \param mutex_init    the init function implementation
+ * \param mutex_free    the free function implementation
+ * \param mutex_lock    the lock function implementation
+ * \param mutex_unlock  the unlock function implementation
+ *
+ * \return              0 if successful
+ */
+int threading_set_alt( int (*mutex_init)( threading_mutex_t * ),
+                       int (*mutex_free)( threading_mutex_t * ),
+                       int (*mutex_lock)( threading_mutex_t * ),
+                       int (*mutex_unlock)( threading_mutex_t * ) );
+#endif /* POLARSSL_THREADING_ALT_C */
+
+/*
+ * The function pointers for mutex_init, mutex_free, mutex_ and mutex_unlock
+ *
+ * All these functions are expected to work or the result will be undefined.
+ */
+extern int (*polarssl_mutex_init)( threading_mutex_t *mutex );
+extern int (*polarssl_mutex_free)( threading_mutex_t *mutex );
+extern int (*polarssl_mutex_lock)( threading_mutex_t *mutex );
+extern int (*polarssl_mutex_unlock)( threading_mutex_t *mutex );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* threading.h */
diff --git a/Externals/polarssl/include/polarssl/timing.h b/Externals/polarssl/include/polarssl/timing.h
index 355c63c779..383120efea 100644
--- a/Externals/polarssl/include/polarssl/timing.h
+++ b/Externals/polarssl/include/polarssl/timing.h
@@ -3,7 +3,7 @@
  *
  * \brief Portable interface to the CPU cycle counter
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,6 +27,20 @@
 #ifndef POLARSSL_TIMING_H
 #define POLARSSL_TIMING_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if !defined(POLARSSL_TIMING_ALT)
+// Regular implementation
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          timer structure
  */
@@ -35,10 +49,6 @@ struct hr_time
     unsigned char opaque[32];
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern volatile int alarmed;
 
 /**
@@ -68,8 +78,21 @@ void set_alarm( int seconds );
  */
 void m_sleep( int milliseconds );
 
+#if defined(POLARSSL_SELF_TEST)
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if a test failed
+ */
+int timing_self_test( int verbose );
+#endif
+
 #ifdef __cplusplus
 }
 #endif
 
+#else  /* POLARSSL_TIMING_ALT */
+#include "timing_alt.h"
+#endif /* POLARSSL_TIMING_ALT */
+
 #endif /* timing.h */
diff --git a/Externals/polarssl/include/polarssl/version.h b/Externals/polarssl/include/polarssl/version.h
index 036e2b42bb..1ee2a3b5ac 100644
--- a/Externals/polarssl/include/polarssl/version.h
+++ b/Externals/polarssl/include/polarssl/version.h
@@ -3,7 +3,7 @@
  *
  * \brief Run-time version information
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -31,14 +31,18 @@
 #ifndef POLARSSL_VERSION_H
 #define POLARSSL_VERSION_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 /**
  * The version number x.y.z is split into three parts.
  * Major, Minor, Patchlevel
  */
 #define POLARSSL_VERSION_MAJOR  1
-#define POLARSSL_VERSION_MINOR  2
+#define POLARSSL_VERSION_MINOR  3
 #define POLARSSL_VERSION_PATCH  8
 
 /**
@@ -46,12 +50,16 @@
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01020800
-#define POLARSSL_VERSION_STRING         "1.2.8"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.8"
+#define POLARSSL_VERSION_NUMBER         0x01030800
+#define POLARSSL_VERSION_STRING         "1.3.8"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.3.8"
 
 #if defined(POLARSSL_VERSION_C)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Get the version number.
  *
@@ -71,11 +79,36 @@ void version_get_string( char *string );
 /**
  * Get the full version string ("PolarSSL x.y.z").
  *
- * \param string    The string that will receive the value.
- *                  (Should be at least 18 bytes in size)
+ * \param string    The string that will receive the value. The PolarSSL version
+ *                  string will use 18 bytes AT MOST including a terminating
+ *                  null byte.
+ *                  (So the buffer should be at least 18 bytes to receive this
+ *                  version string).
  */
 void version_get_string_full( char *string );
 
+/**
+ * \brief           Check if support for a feature was compiled into this
+ *                  PolarSSL binary. This allows you to see at runtime if the
+ *                  library was for instance compiled with or without
+ *                  Multi-threading support.
+ *
+ *                  Note: only checks against defines in the sections "System
+ *                        support", "PolarSSL modules" and "PolarSSL feature
+ *                        support" in config.h
+ *
+ * \param feature   The string for the define to check (e.g. "POLARSSL_AES_C")
+ *
+ * \return          0 if the feature is present, -1 if the feature is not
+ *                  present and -2 if support for feature checking as a whole
+ *                  was not compiled in.
+ */
+int version_check_feature( const char *feature );
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* POLARSSL_VERSION_C */
 
 #endif /* version.h */
diff --git a/Externals/polarssl/include/polarssl/x509.h b/Externals/polarssl/include/polarssl/x509.h
index 6dabf37356..583cb83205 100644
--- a/Externals/polarssl/include/polarssl/x509.h
+++ b/Externals/polarssl/include/polarssl/x509.h
@@ -1,9 +1,9 @@
 /**
  * \file x509.h
  *
- * \brief X.509 certificate and private key decoding
+ * \brief X.509 generic defines and structures
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,46 +27,48 @@
 #ifndef POLARSSL_X509_H
 #define POLARSSL_X509_H
 
-#include "asn1.h"
-#include "rsa.h"
-#include "dhm.h"
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
-/** 
+#include "asn1.h"
+#include "pk.h"
+
+#if defined(POLARSSL_RSA_C)
+#include "rsa.h"
+#endif
+
+/**
  * \addtogroup x509_module
- * \{ 
+ * \{
  */
- 
-/** 
+
+/**
  * \name X509 Error codes
  * \{
  */
 #define POLARSSL_ERR_X509_FEATURE_UNAVAILABLE              -0x2080  /**< Unavailable feature, e.g. RSA hashing/encryption combination. */
-#define POLARSSL_ERR_X509_CERT_INVALID_PEM                 -0x2100  /**< The PEM-encoded certificate contains invalid elements, e.g. invalid character. */ 
-#define POLARSSL_ERR_X509_CERT_INVALID_FORMAT              -0x2180  /**< The certificate format is invalid, e.g. different type expected. */
-#define POLARSSL_ERR_X509_CERT_INVALID_VERSION             -0x2200  /**< The certificate version element is invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_SERIAL              -0x2280  /**< The serial tag or value is invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_ALG                 -0x2300  /**< The algorithm tag or value is invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_NAME                -0x2380  /**< The name tag or value is invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_DATE                -0x2400  /**< The date tag or value is invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_PUBKEY              -0x2480  /**< The pubkey tag or value is invalid (only RSA is supported). */
-#define POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE           -0x2500  /**< The signature tag or value invalid. */
-#define POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS          -0x2580  /**< The extension tag or value is invalid. */
-#define POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION             -0x2600  /**< Certificate or CRL has an unsupported version number. */
-#define POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG             -0x2680  /**< Signature algorithm (oid) is unsupported. */
-#define POLARSSL_ERR_X509_UNKNOWN_PK_ALG                   -0x2700  /**< Key algorithm is unsupported (only RSA is supported). */
-#define POLARSSL_ERR_X509_CERT_SIG_MISMATCH                -0x2780  /**< Certificate signature algorithms do not match. (see \c ::x509_cert sig_oid) */
-#define POLARSSL_ERR_X509_CERT_VERIFY_FAILED               -0x2800  /**< Certificate verification failed, e.g. CRL, CA or signature check failed. */
-#define POLARSSL_ERR_X509_KEY_INVALID_VERSION              -0x2880  /**< Unsupported RSA key version */
-#define POLARSSL_ERR_X509_KEY_INVALID_FORMAT               -0x2900  /**< Invalid RSA key tag or value. */
-#define POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT              -0x2980  /**< Format not recognized as DER or PEM. */
-#define POLARSSL_ERR_X509_INVALID_INPUT                    -0x2A00  /**< Input invalid. */
-#define POLARSSL_ERR_X509_MALLOC_FAILED                    -0x2A80  /**< Allocation of memory failed. */
-#define POLARSSL_ERR_X509_FILE_IO_ERROR                    -0x2B00  /**< Read/write of file failed. */
-#define POLARSSL_ERR_X509_PASSWORD_REQUIRED                -0x2B80  /**< Private key password can't be empty. */
-#define POLARSSL_ERR_X509_PASSWORD_MISMATCH                -0x2C00  /**< Given private key password does not allow for correct decryption. */
+#define POLARSSL_ERR_X509_UNKNOWN_OID                      -0x2100  /**< Requested OID is unknown. */
+#define POLARSSL_ERR_X509_INVALID_FORMAT                   -0x2180  /**< The CRT/CRL/CSR format is invalid, e.g. different type expected. */
+#define POLARSSL_ERR_X509_INVALID_VERSION                  -0x2200  /**< The CRT/CRL/CSR version element is invalid. */
+#define POLARSSL_ERR_X509_INVALID_SERIAL                   -0x2280  /**< The serial tag or value is invalid. */
+#define POLARSSL_ERR_X509_INVALID_ALG                      -0x2300  /**< The algorithm tag or value is invalid. */
+#define POLARSSL_ERR_X509_INVALID_NAME                     -0x2380  /**< The name tag or value is invalid. */
+#define POLARSSL_ERR_X509_INVALID_DATE                     -0x2400  /**< The date tag or value is invalid. */
+#define POLARSSL_ERR_X509_INVALID_SIGNATURE                -0x2480  /**< The signature tag or value invalid. */
+#define POLARSSL_ERR_X509_INVALID_EXTENSIONS               -0x2500  /**< The extension tag or value is invalid. */
+#define POLARSSL_ERR_X509_UNKNOWN_VERSION                  -0x2580  /**< CRT/CRL/CSR has an unsupported version number. */
+#define POLARSSL_ERR_X509_UNKNOWN_SIG_ALG                  -0x2600  /**< Signature algorithm (oid) is unsupported. */
+#define POLARSSL_ERR_X509_SIG_MISMATCH                     -0x2680  /**< Signature algorithms do not match. (see \c ::x509_crt sig_oid) */
+#define POLARSSL_ERR_X509_CERT_VERIFY_FAILED               -0x2700  /**< Certificate verification failed, e.g. CRL, CA or signature check failed. */
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT              -0x2780  /**< Format not recognized as DER or PEM. */
+#define POLARSSL_ERR_X509_BAD_INPUT_DATA                   -0x2800  /**< Input invalid. */
+#define POLARSSL_ERR_X509_MALLOC_FAILED                    -0x2880  /**< Allocation of memory failed. */
+#define POLARSSL_ERR_X509_FILE_IO_ERROR                    -0x2900  /**< Read/write of file failed. */
 /* \} name */
 
-
 /**
  * \name X509 Verify codes
  * \{
@@ -80,72 +82,11 @@
 #define BADCERT_MISSING             0x40  /**< Certificate was missing. */
 #define BADCERT_SKIP_VERIFY         0x80  /**< Certificate verification was skipped. */
 #define BADCERT_OTHER             0x0100  /**< Other reason (can be used by verify callback) */
+#define BADCERT_FUTURE            0x0200  /**< The certificate validity starts in the future. */
+#define BADCRL_FUTURE             0x0400  /**< The CRL is from the future */
 /* \} name */
 /* \} addtogroup x509_module */
 
-/*
- * various object identifiers
- */
-#define X520_COMMON_NAME                3
-#define X520_COUNTRY                    6
-#define X520_LOCALITY                   7
-#define X520_STATE                      8
-#define X520_ORGANIZATION              10
-#define X520_ORG_UNIT                  11
-#define PKCS9_EMAIL                     1
-
-#define X509_OUTPUT_DER              0x01
-#define X509_OUTPUT_PEM              0x02
-#define PEM_LINE_LENGTH                72
-#define X509_ISSUER                  0x01
-#define X509_SUBJECT                 0x02
-
-#define OID_X520                "\x55\x04"
-#define OID_CN                  OID_X520 "\x03"
-#define OID_COUNTRY             OID_X520 "\x06"
-#define OID_LOCALITY            OID_X520 "\x07"
-#define OID_STATE               OID_X520 "\x08"
-#define OID_ORGANIZATION        OID_X520 "\x0A"
-#define OID_ORG_UNIT            OID_X520 "\x0B"
-
-#define OID_PKCS1               "\x2A\x86\x48\x86\xF7\x0D\x01\x01"
-#define OID_PKCS1_RSA           OID_PKCS1 "\x01"
-#define OID_PKCS1_SHA1          OID_PKCS1 "\x05"
-
-#define OID_RSA_SHA_OBS         "\x2B\x0E\x03\x02\x1D"
-
-#define OID_PKCS9               "\x2A\x86\x48\x86\xF7\x0D\x01\x09"
-#define OID_PKCS9_EMAIL         OID_PKCS9 "\x01"
-
-/** ISO arc for standard certificate and CRL extensions */
-#define OID_ID_CE               "\x55\x1D" /**< id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29} */
-
-/**
- * Private Internet Extensions
- * { iso(1) identified-organization(3) dod(6) internet(1)
- *                      security(5) mechanisms(5) pkix(7) }
- */
-#define OID_PKIX                "\x2B\x06\x01\x05\x05\x07"
-
-/*
- * OIDs for standard certificate extensions
- */
-#define OID_AUTHORITY_KEY_IDENTIFIER    OID_ID_CE "\x23" /**< id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 } */
-#define OID_SUBJECT_KEY_IDENTIFIER      OID_ID_CE "\x0E" /**< id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 } */
-#define OID_KEY_USAGE                   OID_ID_CE "\x0F" /**< id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 } */
-#define OID_CERTIFICATE_POLICIES        OID_ID_CE "\x20" /**< id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 } */
-#define OID_POLICY_MAPPINGS             OID_ID_CE "\x21" /**< id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 } */
-#define OID_SUBJECT_ALT_NAME            OID_ID_CE "\x11" /**< id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 } */
-#define OID_ISSUER_ALT_NAME             OID_ID_CE "\x12" /**< id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 } */
-#define OID_SUBJECT_DIRECTORY_ATTRS     OID_ID_CE "\x09" /**< id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 } */
-#define OID_BASIC_CONSTRAINTS           OID_ID_CE "\x13" /**< id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 } */
-#define OID_NAME_CONSTRAINTS            OID_ID_CE "\x1E" /**< id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 } */
-#define OID_POLICY_CONSTRAINTS          OID_ID_CE "\x24" /**< id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 } */
-#define OID_EXTENDED_KEY_USAGE          OID_ID_CE "\x25" /**< id-ce-extKeyUsage OBJECT IDENTIFIER ::= { id-ce 37 } */
-#define OID_CRL_DISTRIBUTION_POINTS     OID_ID_CE "\x1F" /**< id-ce-cRLDistributionPoints OBJECT IDENTIFIER ::=  { id-ce 31 } */
-#define OID_INIHIBIT_ANYPOLICY          OID_ID_CE "\x36" /**< id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 } */
-#define OID_FRESHEST_CRL                OID_ID_CE "\x2E" /**< id-ce-freshestCRL OBJECT IDENTIFIER ::=  { id-ce 46 } */
-
 /*
  * X.509 v3 Key Usage Extension flags
  */
@@ -157,48 +98,6 @@
 #define KU_KEY_CERT_SIGN                (0x04)  /* bit 5 */
 #define KU_CRL_SIGN                     (0x02)  /* bit 6 */
 
-/*
- * X.509 v3 Extended key usage OIDs
- */
-#define OID_ANY_EXTENDED_KEY_USAGE      OID_EXTENDED_KEY_USAGE "\x00" /**< anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 } */
-
-#define OID_KP                          OID_PKIX "\x03" /**< id-kp OBJECT IDENTIFIER ::= { id-pkix 3 } */
-#define OID_SERVER_AUTH                 OID_KP "\x01" /**< id-kp-serverAuth OBJECT IDENTIFIER ::= { id-kp 1 } */
-#define OID_CLIENT_AUTH                 OID_KP "\x02" /**< id-kp-clientAuth OBJECT IDENTIFIER ::= { id-kp 2 } */
-#define OID_CODE_SIGNING                OID_KP "\x03" /**< id-kp-codeSigning OBJECT IDENTIFIER ::= { id-kp 3 } */
-#define OID_EMAIL_PROTECTION            OID_KP "\x04" /**< id-kp-emailProtection OBJECT IDENTIFIER ::= { id-kp 4 } */
-#define OID_TIME_STAMPING               OID_KP "\x08" /**< id-kp-timeStamping OBJECT IDENTIFIER ::= { id-kp 8 } */
-#define OID_OCSP_SIGNING                OID_KP "\x09" /**< id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } */
-
-#define STRING_SERVER_AUTH              "TLS Web Server Authentication"
-#define STRING_CLIENT_AUTH              "TLS Web Client Authentication"
-#define STRING_CODE_SIGNING             "Code Signing"
-#define STRING_EMAIL_PROTECTION         "E-mail Protection"
-#define STRING_TIME_STAMPING            "Time Stamping"
-#define STRING_OCSP_SIGNING             "OCSP Signing"
-
-/*
- * OIDs for CRL extensions
- */
-#define OID_PRIVATE_KEY_USAGE_PERIOD    OID_ID_CE "\x10"
-#define OID_CRL_NUMBER                  OID_ID_CE "\x14" /**< id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 } */
-
-/*
- * Netscape certificate extensions
- */
-#define OID_NETSCAPE                "\x60\x86\x48\x01\x86\xF8\x42" /**< Netscape OID */
-#define OID_NS_CERT                 OID_NETSCAPE "\x01"
-#define OID_NS_CERT_TYPE            OID_NS_CERT  "\x01"
-#define OID_NS_BASE_URL             OID_NS_CERT  "\x02"
-#define OID_NS_REVOCATION_URL       OID_NS_CERT  "\x03"
-#define OID_NS_CA_REVOCATION_URL    OID_NS_CERT  "\x04"
-#define OID_NS_RENEWAL_URL          OID_NS_CERT  "\x07"
-#define OID_NS_CA_POLICY_URL        OID_NS_CERT  "\x08"
-#define OID_NS_SSL_SERVER_NAME      OID_NS_CERT  "\x0C"
-#define OID_NS_COMMENT              OID_NS_CERT  "\x0D"
-#define OID_NS_DATA_TYPE            OID_NETSCAPE "\x02"
-#define OID_NS_CERT_SEQUENCE        OID_NS_DATA_TYPE "\x05"
-
 /*
  * Netscape certificate types
  * (http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html)
@@ -213,23 +112,29 @@
 #define NS_CERT_TYPE_EMAIL_CA           (0x02)  /* bit 6 */
 #define NS_CERT_TYPE_OBJECT_SIGNING_CA  (0x01)  /* bit 7 */
 
+/*
+ * X.509 extension types
+ *
+ * Comments refer to the status for using certificates. Status can be
+ * different for writing certificates or reading CRLs or CSRs.
+ */
 #define EXT_AUTHORITY_KEY_IDENTIFIER    (1 << 0)
 #define EXT_SUBJECT_KEY_IDENTIFIER      (1 << 1)
-#define EXT_KEY_USAGE                   (1 << 2)
+#define EXT_KEY_USAGE                   (1 << 2)    /* Parsed but not used */
 #define EXT_CERTIFICATE_POLICIES        (1 << 3)
 #define EXT_POLICY_MAPPINGS             (1 << 4)
-#define EXT_SUBJECT_ALT_NAME            (1 << 5)
+#define EXT_SUBJECT_ALT_NAME            (1 << 5)    /* Supported (DNS) */
 #define EXT_ISSUER_ALT_NAME             (1 << 6)
 #define EXT_SUBJECT_DIRECTORY_ATTRS     (1 << 7)
-#define EXT_BASIC_CONSTRAINTS           (1 << 8)
+#define EXT_BASIC_CONSTRAINTS           (1 << 8)    /* Supported */
 #define EXT_NAME_CONSTRAINTS            (1 << 9)
 #define EXT_POLICY_CONSTRAINTS          (1 << 10)
-#define EXT_EXTENDED_KEY_USAGE          (1 << 11)
+#define EXT_EXTENDED_KEY_USAGE          (1 << 11)   /* Parsed but not used */
 #define EXT_CRL_DISTRIBUTION_POINTS     (1 << 12)
 #define EXT_INIHIBIT_ANYPOLICY          (1 << 13)
 #define EXT_FRESHEST_CRL                (1 << 14)
 
-#define EXT_NS_CERT_TYPE                (1 << 16)
+#define EXT_NS_CERT_TYPE                (1 << 16)   /* Parsed (and then ?) */
 
 /*
  * Storage format identifiers
@@ -238,16 +143,20 @@
 #define X509_FORMAT_DER                 1
 #define X509_FORMAT_PEM                 2
 
-/** 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
  * \addtogroup x509_module
  * \{ */
 
 /**
- * \name Structures for parsing X.509 certificates and CRLs
+ * \name Structures for parsing X.509 certificates, CRLs and CSRs
  * \{
  */
- 
-/** 
+
+/**
  * Type-length-value structure that allows for ASN1 using DER.
  */
 typedef asn1_buf x509_buf;
@@ -258,16 +167,10 @@ typedef asn1_buf x509_buf;
 typedef asn1_bitstring x509_bitstring;
 
 /**
- * Container for ASN1 named information objects. 
+ * Container for ASN1 named information objects.
  * It allows for Relative Distinguished Names (e.g. cn=polarssl,ou=code,etc.).
  */
-typedef struct _x509_name
-{
-    x509_buf oid;               /**< The object identifier. */
-    x509_buf val;               /**< The named value. */
-    struct _x509_name *next;    /**< The next named information object. */
-}
-x509_name;
+typedef asn1_named_data x509_name;
 
 /**
  * Container for a sequence of ASN.1 items
@@ -282,313 +185,9 @@ typedef struct _x509_time
 }
 x509_time;
 
-/** 
- * Container for an X.509 certificate. The certificate may be chained.
- */
-typedef struct _x509_cert
-{
-    x509_buf raw;               /**< The raw certificate data (DER). */
-    x509_buf tbs;               /**< The raw certificate body (DER). The part that is To Be Signed. */
-
-    int version;                /**< The X.509 version. (0=v1, 1=v2, 2=v3) */
-    x509_buf serial;            /**< Unique id for certificate issued by a specific CA. */
-    x509_buf sig_oid1;          /**< Signature algorithm, e.g. sha1RSA */
-
-    x509_buf issuer_raw;        /**< The raw issuer data (DER). Used for quick comparison. */
-    x509_buf subject_raw;       /**< The raw subject data (DER). Used for quick comparison. */
-
-    x509_name issuer;           /**< The parsed issuer data (named information object). */
-    x509_name subject;          /**< The parsed subject data (named information object). */
-
-    x509_time valid_from;       /**< Start time of certificate validity. */
-    x509_time valid_to;         /**< End time of certificate validity. */
-
-    x509_buf pk_oid;            /**< Subject public key info. Includes the public key algorithm and the key itself. */
-    rsa_context rsa;            /**< Container for the RSA context. Only RSA is supported for public keys at this time. */
-
-    x509_buf issuer_id;         /**< Optional X.509 v2/v3 issuer unique identifier. */
-    x509_buf subject_id;        /**< Optional X.509 v2/v3 subject unique identifier. */
-    x509_buf v3_ext;            /**< Optional X.509 v3 extensions. Only Basic Contraints are supported at this time. */
-    x509_sequence subject_alt_names;    /**< Optional list of Subject Alternative Names (Only dNSName supported). */
-
-    int ext_types;              /**< Bit string containing detected and parsed extensions */
-    int ca_istrue;              /**< Optional Basic Constraint extension value: 1 if this certificate belongs to a CA, 0 otherwise. */
-    int max_pathlen;            /**< Optional Basic Constraint extension value: The maximum path length to the root certificate. Path length is 1 higher than RFC 5280 'meaning', so 1+ */
-
-    unsigned char key_usage;    /**< Optional key usage extension value: See the values below */
-
-    x509_sequence ext_key_usage; /**< Optional list of extended key usage OIDs. */
-
-    unsigned char ns_cert_type; /**< Optional Netscape certificate type extension value: See the values below */
-
-    x509_buf sig_oid2;          /**< Signature algorithm. Must match sig_oid1. */
-    x509_buf sig;               /**< Signature: hash of the tbs part signed with the private key. */
-    int sig_alg;                /**< Internal representation of the signature algorithm, e.g. SIG_RSA_MD2 */
-
-    struct _x509_cert *next;    /**< Next certificate in the CA-chain. */ 
-}
-x509_cert;
-
-/** 
- * Certificate revocation list entry. 
- * Contains the CA-specific serial numbers and revocation dates.
- */
-typedef struct _x509_crl_entry
-{
-    x509_buf raw;
-
-    x509_buf serial;
-
-    x509_time revocation_date;
-
-    x509_buf entry_ext;
-
-    struct _x509_crl_entry *next;
-}
-x509_crl_entry;
-
-/** 
- * Certificate revocation list structure. 
- * Every CRL may have multiple entries.
- */
-typedef struct _x509_crl
-{
-    x509_buf raw;           /**< The raw certificate data (DER). */
-    x509_buf tbs;           /**< The raw certificate body (DER). The part that is To Be Signed. */
-
-    int version;
-    x509_buf sig_oid1;
-
-    x509_buf issuer_raw;    /**< The raw issuer data (DER). */
-
-    x509_name issuer;       /**< The parsed issuer data (named information object). */
-
-    x509_time this_update;  
-    x509_time next_update;
-
-    x509_crl_entry entry;   /**< The CRL entries containing the certificate revocation times for this CA. */
-
-    x509_buf crl_ext;
-
-    x509_buf sig_oid2;
-    x509_buf sig;
-    int sig_alg;
-
-    struct _x509_crl *next; 
-}
-x509_crl;
-/** \} name Structures for parsing X.509 certificates and CRLs */
+/** \} name Structures for parsing X.509 certificates, CRLs and CSRs */
 /** \} addtogroup x509_module */
 
-/**
- * \name Structures for writing X.509 certificates.
- * XvP: commented out as they are not used.
- * - <tt>typedef struct _x509_node x509_node;</tt>
- * - <tt>typedef struct _x509_raw x509_raw;</tt>
- */
-/*
-typedef struct _x509_node
-{
-    unsigned char *data;
-    unsigned char *p;
-    unsigned char *end;
-
-    size_t len;
-}
-x509_node;
-
-typedef struct _x509_raw
-{
-    x509_node raw;
-    x509_node tbs;
-
-    x509_node version;
-    x509_node serial;
-    x509_node tbs_signalg;
-    x509_node issuer;
-    x509_node validity;
-    x509_node subject;
-    x509_node subpubkey;
-
-    x509_node signalg;
-    x509_node sign;
-}
-x509_raw;
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \name Functions to read in DHM parameters, a certificate, CRL or private RSA key
- * \{
- */
-
-/** \ingroup x509_module */
-/**
- * \brief          Parse a single DER formatted certificate and add it
- *                 to the chained list.
- *
- * \param chain    points to the start of the chain
- * \param buf      buffer holding the certificate DER data
- * \param buflen   size of the buffer
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t buflen );
-
-/**
- * \brief          Parse one or more certificates and add them
- *                 to the chained list. Parses permissively. If some
- *                 certificates can be parsed, the result is the number
- *                 of failed certificates it encountered. If none complete
- *                 correctly, the first error is returned.
- *
- * \param chain    points to the start of the chain
- * \param buf      buffer holding the certificate data
- * \param buflen   size of the buffer
- *
- * \return         0 if all certificates parsed successfully, a positive number
- *                 if partly successful or a specific X509 or PEM error code
- */
-int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load one or more certificates and add them
- *                 to the chained list. Parses permissively. If some
- *                 certificates can be parsed, the result is the number
- *                 of failed certificates it encountered. If none complete
- *                 correctly, the first error is returned.
- *
- * \param chain    points to the start of the chain
- * \param path     filename to read the certificates from
- *
- * \return         0 if all certificates parsed successfully, a positive number
- *                 if partly successful or a specific X509 or PEM error code
- */
-int x509parse_crtfile( x509_cert *chain, const char *path );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load one or more certificate files from a path and add them
- *                 to the chained list. Parses permissively. If some
- *                 certificates can be parsed, the result is the number
- *                 of failed certificates it encountered. If none complete
- *                 correctly, the first error is returned.
- *
- * \param chain    points to the start of the chain
- * \param path     directory / folder to read the certificate files from
- *
- * \return         0 if all certificates parsed successfully, a positive number
- *                 if partly successful or a specific X509 or PEM error code
- */
-int x509parse_crtpath( x509_cert *chain, const char *path );
-
-/** \ingroup x509_module */
-/**
- * \brief          Parse one or more CRLs and add them
- *                 to the chained list
- *
- * \param chain    points to the start of the chain
- * \param buf      buffer holding the CRL data
- * \param buflen   size of the buffer
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_crl( x509_crl *chain, const unsigned char *buf, size_t buflen );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load one or more CRLs and add them
- *                 to the chained list
- *
- * \param chain    points to the start of the chain
- * \param path     filename to read the CRLs from
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_crlfile( x509_crl *chain, const char *path );
-
-/** \ingroup x509_module */
-/**
- * \brief          Parse a private RSA key
- *
- * \param rsa      RSA context to be initialized
- * \param key      input buffer
- * \param keylen   size of the buffer
- * \param pwd      password for decryption (optional)
- * \param pwdlen   size of the password
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_key( rsa_context *rsa,
-                   const unsigned char *key, size_t keylen,
-                   const unsigned char *pwd, size_t pwdlen );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load and parse a private RSA key
- *
- * \param rsa      RSA context to be initialized
- * \param path     filename to read the private key from
- * \param password password to decrypt the file (can be NULL)
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_keyfile( rsa_context *rsa, const char *path,
-                       const char *password );
-
-/** \ingroup x509_module */
-/**
- * \brief          Parse a public RSA key
- *
- * \param rsa      RSA context to be initialized
- * \param key      input buffer
- * \param keylen   size of the buffer
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_public_key( rsa_context *rsa,
-                   const unsigned char *key, size_t keylen );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load and parse a public RSA key
- *
- * \param rsa      RSA context to be initialized
- * \param path     filename to read the private key from
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_public_keyfile( rsa_context *rsa, const char *path );
-
-/** \ingroup x509_module */
-/**
- * \brief          Parse DHM parameters
- *
- * \param dhm      DHM context to be initialized
- * \param dhmin    input buffer
- * \param dhminlen size of the buffer
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_dhm( dhm_context *dhm, const unsigned char *dhmin, size_t dhminlen );
-
-/** \ingroup x509_module */
-/**
- * \brief          Load and parse DHM parameters
- *
- * \param dhm      DHM context to be initialized
- * \param path     filename to read the DHM Parameters from
- *
- * \return         0 if successful, or a specific X509 or PEM error code
- */
-int x509parse_dhmfile( dhm_context *dhm, const char *path );
-
-/** \} name Functions to read in DHM parameters, a certificate, CRL or private RSA key */
-
 /**
  * \brief          Store the certificate DN in printable form into buf;
  *                 no more than size characters will be written.
@@ -600,7 +199,7 @@ int x509parse_dhmfile( dhm_context *dhm, const char *path );
  * \return         The amount of data written to the buffer, or -1 in
  *                 case of an error.
  */
-int x509parse_dn_gets( char *buf, size_t size, const x509_name *dn );
+int x509_dn_gets( char *buf, size_t size, const x509_name *dn );
 
 /**
  * \brief          Store the certificate serial in printable form into buf;
@@ -613,40 +212,12 @@ int x509parse_dn_gets( char *buf, size_t size, const x509_name *dn );
  * \return         The amount of data written to the buffer, or -1 in
  *                 case of an error.
  */
-int x509parse_serial_gets( char *buf, size_t size, const x509_buf *serial );
-
-/**
- * \brief          Returns an informational string about the
- *                 certificate.
- *
- * \param buf      Buffer to write to
- * \param size     Maximum size of buffer
- * \param prefix   A line prefix
- * \param crt      The X509 certificate to represent
- *
- * \return         The amount of data written to the buffer, or -1 in
- *                 case of an error.
- */
-int x509parse_cert_info( char *buf, size_t size, const char *prefix,
-                         const x509_cert *crt );
-
-/**
- * \brief          Returns an informational string about the
- *                 CRL.
- *
- * \param buf      Buffer to write to
- * \param size     Maximum size of buffer
- * \param prefix   A line prefix
- * \param crl      The X509 CRL to represent
- *
- * \return         The amount of data written to the buffer, or -1 in
- *                 case of an error.
- */
-int x509parse_crl_info( char *buf, size_t size, const char *prefix,
-                        const x509_crl *crl );
+int x509_serial_gets( char *buf, size_t size, const x509_buf *serial );
 
 /**
  * \brief          Give an known OID, return its descriptive string.
+ *                 (Deprecated. Use oid_get_extended_key_usage() instead.)
+ *                 Warning: only works for extended_key_usage OIDs!
  *
  * \param oid      buffer containing the oid
  *
@@ -657,112 +228,38 @@ const char *x509_oid_get_description( x509_buf *oid );
 
 /**
  * \brief          Give an OID, return a string version of its OID number.
+ *                 (Deprecated. Use oid_get_numeric_string() instead)
  *
  * \param buf      Buffer to write to
  * \param size     Maximum size of buffer
  * \param oid      Buffer containing the OID
  *
- * \return         The amount of data written to the buffer, or -1 in
- *                 case of an error.
+ * \return         Length of the string written (excluding final NULL) or
+ *                 POLARSSL_ERR_OID_BUF_TO_SMALL in case of error
  */
 int x509_oid_get_numeric_string( char *buf, size_t size, x509_buf *oid );
 
 /**
  * \brief          Check a given x509_time against the system time and check
- *                 if it is valid.
+ *                 if it is not expired.
  *
  * \param time     x509_time to check
  *
- * \return         Return 0 if the x509_time is still valid,
- *                 or 1 otherwise.
+ * \return         0 if the x509_time is still valid,
+ *                 1 otherwise.
  */
-int x509parse_time_expired( const x509_time *time );
+int x509_time_expired( const x509_time *time );
 
 /**
- * \name Functions to verify a certificate
- * \{
+ * \brief          Check a given x509_time against the system time and check
+ *                 if it is not from the future.
+ *
+ * \param time     x509_time to check
+ *
+ * \return         0 if the x509_time is already valid,
+ *                 1 otherwise.
  */
-/** \ingroup x509_module */
-/**
- * \brief          Verify the certificate signature
- *
- *                 The verify callback is a user-supplied callback that
- *                 can clear / modify / add flags for a certificate. If set,
- *                 the verification callback is called for each
- *                 certificate in the chain (from the trust-ca down to the
- *                 presented crt). The parameters for the callback are:
- *                 (void *parameter, x509_cert *crt, int certificate_depth,
- *                 int *flags). With the flags representing current flags for
- *                 that specific certificate and the certificate depth from
- *                 the bottom (Peer cert depth = 0).
- *
- *                 All flags left after returning from the callback
- *                 are also returned to the application. The function should
- *                 return 0 for anything but a fatal error.
- *
- * \param crt      a certificate to be verified
- * \param trust_ca the trusted CA chain
- * \param ca_crl   the CRL chain for trusted CA's
- * \param cn       expected Common Name (can be set to
- *                 NULL if the CN must not be verified)
- * \param flags    result of the verification
- * \param f_vrfy   verification function
- * \param p_vrfy   verification parameter
- *
- * \return         0 if successful or POLARSSL_ERR_X509_SIG_VERIFY_FAILED,
- *                 in which case *flags will have one or more of
- *                 the following values set:
- *                      BADCERT_EXPIRED --
- *                      BADCERT_REVOKED --
- *                      BADCERT_CN_MISMATCH --
- *                      BADCERT_NOT_TRUSTED
- *                 or another error in case of a fatal error encountered
- *                 during the verification process.
- */
-int x509parse_verify( x509_cert *crt,
-                      x509_cert *trust_ca,
-                      x509_crl *ca_crl,
-                      const char *cn, int *flags,
-                      int (*f_vrfy)(void *, x509_cert *, int, int *),
-                      void *p_vrfy );
-
-/**
- * \brief          Verify the certificate signature
- *
- * \param crt      a certificate to be verified
- * \param crl      the CRL to verify against
- *
- * \return         1 if the certificate is revoked, 0 otherwise
- *
- */
-int x509parse_revoked( const x509_cert *crt, const x509_crl *crl );
-
-/** \} name Functions to verify a certificate */
-
-
-
-/**
- * \name Functions to clear a certificate, CRL or private RSA key 
- * \{
- */
-/** \ingroup x509_module */
-/**
- * \brief          Unallocate all certificate data
- *
- * \param crt      Certificate chain to free
- */
-void x509_free( x509_cert *crt );
-
-/** \ingroup x509_module */
-/**
- * \brief          Unallocate all CRL data
- *
- * \param crl      CRL chain to free
- */
-void x509_crl_free( x509_crl *crl );
-
-/** \} name Functions to clear a certificate, CRL or private RSA key */
-
+int x509_time_future( const x509_time *time );
 
 /**
  * \brief          Checkup routine
@@ -771,6 +268,48 @@ void x509_crl_free( x509_crl *crl );
  */
 int x509_self_test( int verbose );
 
+/*
+ * Internal module functions. You probably do not want to use these unless you
+ * know you do.
+ */
+int x509_get_name( unsigned char **p, const unsigned char *end,
+                   x509_name *cur );
+int x509_get_alg_null( unsigned char **p, const unsigned char *end,
+                       x509_buf *alg );
+int x509_get_alg( unsigned char **p, const unsigned char *end,
+                  x509_buf *alg, x509_buf *params );
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+int x509_get_rsassa_pss_params( const x509_buf *params,
+                                md_type_t *md_alg, md_type_t *mgf_md,
+                                int *salt_len );
+#endif
+int x509_get_sig( unsigned char **p, const unsigned char *end, x509_buf *sig );
+int x509_get_sig_alg( const x509_buf *sig_oid, const x509_buf *sig_params,
+                      md_type_t *md_alg, pk_type_t *pk_alg,
+                      void **sig_opts );
+int x509_get_time( unsigned char **p, const unsigned char *end,
+                   x509_time *time );
+int x509_get_serial( unsigned char **p, const unsigned char *end,
+                     x509_buf *serial );
+int x509_get_ext( unsigned char **p, const unsigned char *end,
+                  x509_buf *ext, int tag );
+int x509_load_file( const char *path, unsigned char **buf, size_t *n );
+int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid,
+                       pk_type_t pk_alg, md_type_t md_alg,
+                       const void *sig_opts );
+int x509_key_size_helper( char *buf, size_t size, const char *name );
+int x509_string_to_names( asn1_named_data **head, const char *name );
+int x509_set_extension( asn1_named_data **head, const char *oid, size_t oid_len,
+                        int critical, const unsigned char *val,
+                        size_t val_len );
+int x509_write_extensions( unsigned char **p, unsigned char *start,
+                           asn1_named_data *first );
+int x509_write_names( unsigned char **p, unsigned char *start,
+                      asn1_named_data *first );
+int x509_write_sig( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len,
+                    unsigned char *sig, size_t size );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Externals/polarssl/include/polarssl/x509_crl.h b/Externals/polarssl/include/polarssl/x509_crl.h
new file mode 100644
index 0000000000..9f597a855a
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/x509_crl.h
@@ -0,0 +1,162 @@
+/**
+ * \file x509_crl.h
+ *
+ * \brief X.509 certificate revocation list parsing
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_X509_CRL_H
+#define POLARSSL_X509_CRL_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include "x509.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup x509_module
+ * \{ */
+
+/**
+ * \name Structures and functions for parsing CRLs
+ * \{
+ */
+
+/**
+ * Certificate revocation list entry.
+ * Contains the CA-specific serial numbers and revocation dates.
+ */
+typedef struct _x509_crl_entry
+{
+    x509_buf raw;
+
+    x509_buf serial;
+
+    x509_time revocation_date;
+
+    x509_buf entry_ext;
+
+    struct _x509_crl_entry *next;
+}
+x509_crl_entry;
+
+/**
+ * Certificate revocation list structure.
+ * Every CRL may have multiple entries.
+ */
+typedef struct _x509_crl
+{
+    x509_buf raw;           /**< The raw certificate data (DER). */
+    x509_buf tbs;           /**< The raw certificate body (DER). The part that is To Be Signed. */
+
+    int version;            /**< CRL version (1=v1, 2=v2) */
+    x509_buf sig_oid1;
+
+    x509_buf issuer_raw;    /**< The raw issuer data (DER). */
+
+    x509_name issuer;       /**< The parsed issuer data (named information object). */
+
+    x509_time this_update;
+    x509_time next_update;
+
+    x509_crl_entry entry;   /**< The CRL entries containing the certificate revocation times for this CA. */
+
+    x509_buf crl_ext;
+
+    x509_buf sig_oid2;
+    x509_buf sig;
+    md_type_t sig_md;           /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
+    pk_type_t sig_pk;           /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
+    void *sig_opts;             /**< Signature options to be passed to pk_verify_ext(), e.g. for RSASSA-PSS */
+
+    struct _x509_crl *next;
+}
+x509_crl;
+
+/**
+ * \brief          Parse one or more CRLs and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the CRL data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int x509_crl_parse( x509_crl *chain, const unsigned char *buf, size_t buflen );
+
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief          Load one or more CRLs and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the CRLs from
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int x509_crl_parse_file( x509_crl *chain, const char *path );
+#endif /* POLARSSL_FS_IO */
+
+/**
+ * \brief          Returns an informational string about the CRL.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param crl      The X509 CRL to represent
+ *
+ * \return         The amount of data written to the buffer, or -1 in
+ *                 case of an error.
+ */
+int x509_crl_info( char *buf, size_t size, const char *prefix,
+                   const x509_crl *crl );
+
+/**
+ * \brief          Initialize a CRL (chain)
+ *
+ * \param crl      CRL chain to initialize
+ */
+void x509_crl_init( x509_crl *crl );
+
+/**
+ * \brief          Unallocate all CRL data
+ *
+ * \param crl      CRL chain to free
+ */
+void x509_crl_free( x509_crl *crl );
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509_crl.h */
diff --git a/Externals/polarssl/include/polarssl/x509_crt.h b/Externals/polarssl/include/polarssl/x509_crt.h
new file mode 100644
index 0000000000..4bf8e568f1
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/x509_crt.h
@@ -0,0 +1,558 @@
+/**
+ * \file x509_crt.h
+ *
+ * \brief X.509 certificate parsing and writing
+ *
+ *  Copyright (C) 2006-2013, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_X509_CRT_H
+#define POLARSSL_X509_CRT_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include "x509.h"
+
+#include "x509_crl.h"
+
+/**
+ * \addtogroup x509_module
+ * \{
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name Structures and functions for parsing and writing X.509 certificates
+ * \{
+ */
+
+/**
+ * Container for an X.509 certificate. The certificate may be chained.
+ */
+typedef struct _x509_crt
+{
+    x509_buf raw;               /**< The raw certificate data (DER). */
+    x509_buf tbs;               /**< The raw certificate body (DER). The part that is To Be Signed. */
+
+    int version;                /**< The X.509 version. (1=v1, 2=v2, 3=v3) */
+    x509_buf serial;            /**< Unique id for certificate issued by a specific CA. */
+    x509_buf sig_oid1;          /**< Signature algorithm, e.g. sha1RSA */
+
+    x509_buf issuer_raw;        /**< The raw issuer data (DER). Used for quick comparison. */
+    x509_buf subject_raw;       /**< The raw subject data (DER). Used for quick comparison. */
+
+    x509_name issuer;           /**< The parsed issuer data (named information object). */
+    x509_name subject;          /**< The parsed subject data (named information object). */
+
+    x509_time valid_from;       /**< Start time of certificate validity. */
+    x509_time valid_to;         /**< End time of certificate validity. */
+
+    pk_context pk;              /**< Container for the public key context. */
+
+    x509_buf issuer_id;         /**< Optional X.509 v2/v3 issuer unique identifier. */
+    x509_buf subject_id;        /**< Optional X.509 v2/v3 subject unique identifier. */
+    x509_buf v3_ext;            /**< Optional X.509 v3 extensions.  */
+    x509_sequence subject_alt_names;    /**< Optional list of Subject Alternative Names (Only dNSName supported). */
+
+    int ext_types;              /**< Bit string containing detected and parsed extensions */
+    int ca_istrue;              /**< Optional Basic Constraint extension value: 1 if this certificate belongs to a CA, 0 otherwise. */
+    int max_pathlen;            /**< Optional Basic Constraint extension value: The maximum path length to the root certificate. Path length is 1 higher than RFC 5280 'meaning', so 1+ */
+
+    unsigned char key_usage;    /**< Optional key usage extension value: See the values in x509.h */
+
+    x509_sequence ext_key_usage; /**< Optional list of extended key usage OIDs. */
+
+    unsigned char ns_cert_type; /**< Optional Netscape certificate type extension value: See the values in x509.h */
+
+    x509_buf sig_oid2;          /**< Signature algorithm. Must match sig_oid1. */
+    x509_buf sig;               /**< Signature: hash of the tbs part signed with the private key. */
+    md_type_t sig_md;           /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
+    pk_type_t sig_pk;           /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
+    void *sig_opts;             /**< Signature options to be passed to pk_verify_ext(), e.g. for RSASSA-PSS */
+
+    struct _x509_crt *next;     /**< Next certificate in the CA-chain. */
+}
+x509_crt;
+
+#define X509_CRT_VERSION_1              0
+#define X509_CRT_VERSION_2              1
+#define X509_CRT_VERSION_3              2
+
+#define X509_RFC5280_MAX_SERIAL_LEN 32
+#define X509_RFC5280_UTC_TIME_LEN   15
+
+/**
+ * Container for writing a certificate (CRT)
+ */
+typedef struct _x509write_cert
+{
+    int version;
+    mpi serial;
+    pk_context *subject_key;
+    pk_context *issuer_key;
+    asn1_named_data *subject;
+    asn1_named_data *issuer;
+    md_type_t md_alg;
+    char not_before[X509_RFC5280_UTC_TIME_LEN + 1];
+    char not_after[X509_RFC5280_UTC_TIME_LEN + 1];
+    asn1_named_data *extensions;
+}
+x509write_cert;
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+/**
+ * \brief          Parse a single DER formatted certificate and add it
+ *                 to the chained list.
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate DER data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int x509_crt_parse_der( x509_crt *chain, const unsigned char *buf,
+                        size_t buflen );
+
+/**
+ * \brief          Parse one or more certificates and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int x509_crt_parse( x509_crt *chain, const unsigned char *buf, size_t buflen );
+
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief          Load one or more certificates and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the certificates from
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int x509_crt_parse_file( x509_crt *chain, const char *path );
+
+/**
+ * \brief          Load one or more certificate files from a path and add them
+ *                 to the chained list. Parses permissively. If some
+ *                 certificates can be parsed, the result is the number
+ *                 of failed certificates it encountered. If none complete
+ *                 correctly, the first error is returned.
+ *
+ * \warning        This function is NOT thread-safe unless
+ *                 POLARSSL_THREADING_PTHREADS is defined. If you're using an
+ *                 alternative threading implementation, you should either use
+ *                 this function only in the main thread, or mutex it.
+ *
+ * \param chain    points to the start of the chain
+ * \param path     directory / folder to read the certificate files from
+ *
+ * \return         0 if all certificates parsed successfully, a positive number
+ *                 if partly successful or a specific X509 or PEM error code
+ */
+int x509_crt_parse_path( x509_crt *chain, const char *path );
+#endif /* POLARSSL_FS_IO */
+
+/**
+ * \brief          Returns an informational string about the
+ *                 certificate.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param crt      The X509 certificate to represent
+ *
+ * \return         The amount of data written to the buffer, or -1 in
+ *                 case of an error.
+ */
+int x509_crt_info( char *buf, size_t size, const char *prefix,
+                   const x509_crt *crt );
+
+/**
+ * \brief          Verify the certificate signature
+ *
+ *                 The verify callback is a user-supplied callback that
+ *                 can clear / modify / add flags for a certificate. If set,
+ *                 the verification callback is called for each
+ *                 certificate in the chain (from the trust-ca down to the
+ *                 presented crt). The parameters for the callback are:
+ *                 (void *parameter, x509_crt *crt, int certificate_depth,
+ *                 int *flags). With the flags representing current flags for
+ *                 that specific certificate and the certificate depth from
+ *                 the bottom (Peer cert depth = 0).
+ *
+ *                 All flags left after returning from the callback
+ *                 are also returned to the application. The function should
+ *                 return 0 for anything but a fatal error.
+ *
+ * \param crt      a certificate to be verified
+ * \param trust_ca the trusted CA chain
+ * \param ca_crl   the CRL chain for trusted CA's
+ * \param cn       expected Common Name (can be set to
+ *                 NULL if the CN must not be verified)
+ * \param flags    result of the verification
+ * \param f_vrfy   verification function
+ * \param p_vrfy   verification parameter
+ *
+ * \return         0 if successful or POLARSSL_ERR_X509_SIG_VERIFY_FAILED,
+ *                 in which case *flags will have one or more of
+ *                 the following values set:
+ *                      BADCERT_EXPIRED --
+ *                      BADCERT_REVOKED --
+ *                      BADCERT_CN_MISMATCH --
+ *                      BADCERT_NOT_TRUSTED
+ *                 or another error in case of a fatal error encountered
+ *                 during the verification process.
+ */
+int x509_crt_verify( x509_crt *crt,
+                     x509_crt *trust_ca,
+                     x509_crl *ca_crl,
+                     const char *cn, int *flags,
+                     int (*f_vrfy)(void *, x509_crt *, int, int *),
+                     void *p_vrfy );
+
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+/**
+ * \brief          Check usage of certificate against keyUsage extension.
+ *
+ * \param crt      Leaf certificate used.
+ * \param usage    Intended usage(s) (eg KU_KEY_ENCIPHERMENT before using the
+ *                 certificate to perform an RSA key exchange).
+ *
+ * \return         0 is these uses of the certificate are allowed,
+ *                 POLARSSL_ERR_X509_BAD_INPUT_DATA if the keyUsage extension
+ *                 is present but does not contain all the bits set in the
+ *                 usage argument.
+ *
+ * \note           You should only call this function on leaf certificates, on
+ *                 (intermediate) CAs the keyUsage extension is automatically
+ *                 checked by \c x509_crt_verify().
+ */
+int x509_crt_check_key_usage( const x509_crt *crt, int usage );
+#endif /* POLARSSL_X509_CHECK_KEY_USAGE) */
+
+#if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+/**
+ * \brief          Check usage of certificate against extentedJeyUsage.
+ *
+ * \param crt      Leaf certificate used.
+ * \param usage_oid Intended usage (eg OID_SERVER_AUTH or OID_CLIENT_AUTH).
+ * \param usage_len Length of usage_oid (eg given by OID_SIZE()).
+ *
+ * \return         0 is this use of the certificate is allowed,
+ *                 POLARSSL_ERR_X509_BAD_INPUT_DATA if not.
+ *
+ * \note           Usually only makes sense on leaf certificates.
+ */
+int x509_crt_check_extended_key_usage( const x509_crt *crt,
+                                       const char *usage_oid,
+                                       size_t usage_len );
+#endif /* POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE) */
+
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+/**
+ * \brief          Verify the certificate revocation status
+ *
+ * \param crt      a certificate to be verified
+ * \param crl      the CRL to verify against
+ *
+ * \return         1 if the certificate is revoked, 0 otherwise
+ *
+ */
+int x509_crt_revoked( const x509_crt *crt, const x509_crl *crl );
+#endif /* POLARSSL_X509_CRL_PARSE_C */
+
+/**
+ * \brief          Initialize a certificate (chain)
+ *
+ * \param crt      Certificate chain to initialize
+ */
+void x509_crt_init( x509_crt *crt );
+
+/**
+ * \brief          Unallocate all certificate data
+ *
+ * \param crt      Certificate chain to free
+ */
+void x509_crt_free( x509_crt *crt );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+#if defined(POLARSSL_X509_CRT_WRITE_C)
+/**
+ * \brief           Initialize a CRT writing context
+ *
+ * \param ctx       CRT context to initialize
+ */
+void x509write_crt_init( x509write_cert *ctx );
+
+/**
+ * \brief           Set the verion for a Certificate
+ *                  Default: X509_CRT_VERSION_3
+ *
+ * \param ctx       CRT context to use
+ * \param version   version to set (X509_CRT_VERSION_1, X509_CRT_VERSION_2 or
+ *                                  X509_CRT_VERSION_3)
+ */
+void x509write_crt_set_version( x509write_cert *ctx, int version );
+
+/**
+ * \brief           Set the serial number for a Certificate.
+ *
+ * \param ctx       CRT context to use
+ * \param serial    serial number to set
+ *
+ * \return          0 if successful
+ */
+int x509write_crt_set_serial( x509write_cert *ctx, const mpi *serial );
+
+/**
+ * \brief           Set the validity period for a Certificate
+ *                  Timestamps should be in string format for UTC timezone
+ *                  i.e. "YYYYMMDDhhmmss"
+ *                  e.g. "20131231235959" for December 31st 2013
+ *                       at 23:59:59
+ *
+ * \param ctx       CRT context to use
+ * \param not_before    not_before timestamp
+ * \param not_after     not_after timestamp
+ *
+ * \return          0 if timestamp was parsed successfully, or
+ *                  a specific error code
+ */
+int x509write_crt_set_validity( x509write_cert *ctx, const char *not_before,
+                                const char *not_after );
+
+/**
+ * \brief           Set the issuer name for a Certificate
+ *                  Issuer names should contain a comma-separated list
+ *                  of OID types and values:
+ *                  e.g. "C=NL,O=Offspark,CN=PolarSSL CA"
+ *
+ * \param ctx           CRT context to use
+ * \param issuer_name   issuer name to set
+ *
+ * \return          0 if issuer name was parsed successfully, or
+ *                  a specific error code
+ */
+int x509write_crt_set_issuer_name( x509write_cert *ctx,
+                                   const char *issuer_name );
+
+/**
+ * \brief           Set the subject name for a Certificate
+ *                  Subject names should contain a comma-separated list
+ *                  of OID types and values:
+ *                  e.g. "C=NL,O=Offspark,CN=PolarSSL Server 1"
+ *
+ * \param ctx           CRT context to use
+ * \param subject_name  subject name to set
+ *
+ * \return          0 if subject name was parsed successfully, or
+ *                  a specific error code
+ */
+int x509write_crt_set_subject_name( x509write_cert *ctx,
+                                    const char *subject_name );
+
+/**
+ * \brief           Set the subject public key for the certificate
+ *
+ * \param ctx       CRT context to use
+ * \param key       public key to include
+ */
+void x509write_crt_set_subject_key( x509write_cert *ctx, pk_context *key );
+
+/**
+ * \brief           Set the issuer key used for signing the certificate
+ *
+ * \param ctx       CRT context to use
+ * \param key       private key to sign with
+ */
+void x509write_crt_set_issuer_key( x509write_cert *ctx, pk_context *key );
+
+/**
+ * \brief           Set the MD algorithm to use for the signature
+ *                  (e.g. POLARSSL_MD_SHA1)
+ *
+ * \param ctx       CRT context to use
+ * \param md_alg    MD algorithm to use
+ */
+void x509write_crt_set_md_alg( x509write_cert *ctx, md_type_t md_alg );
+
+/**
+ * \brief           Generic function to add to or replace an extension in the
+ *                  CRT
+ *
+ * \param ctx       CRT context to use
+ * \param oid       OID of the extension
+ * \param oid_len   length of the OID
+ * \param critical  if the extension is critical (per the RFC's definition)
+ * \param val       value of the extension OCTET STRING
+ * \param val_len   length of the value data
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_extension( x509write_cert *ctx,
+                                 const char *oid, size_t oid_len,
+                                 int critical,
+                                 const unsigned char *val, size_t val_len );
+
+/**
+ * \brief           Set the basicConstraints extension for a CRT
+ *
+ * \param ctx       CRT context to use
+ * \param is_ca     is this a CA certificate
+ * \param max_pathlen   maximum length of certificate chains below this
+ *                      certificate (only for CA certificates, -1 is
+ *                      inlimited)
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_basic_constraints( x509write_cert *ctx,
+                                         int is_ca, int max_pathlen );
+
+#if defined(POLARSSL_SHA1_C)
+/**
+ * \brief           Set the subjectKeyIdentifier extension for a CRT
+ *                  Requires that x509write_crt_set_subject_key() has been
+ *                  called before
+ *
+ * \param ctx       CRT context to use
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_subject_key_identifier( x509write_cert *ctx );
+
+/**
+ * \brief           Set the authorityKeyIdentifier extension for a CRT
+ *                  Requires that x509write_crt_set_issuer_key() has been
+ *                  called before
+ *
+ * \param ctx       CRT context to use
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_authority_key_identifier( x509write_cert *ctx );
+#endif /* POLARSSL_SHA1_C */
+
+/**
+ * \brief           Set the Key Usage Extension flags
+ *                  (e.g. KU_DIGITAL_SIGNATURE | KU_KEY_CERT_SIGN)
+ *
+ * \param ctx       CRT context to use
+ * \param key_usage key usage flags to set
+ *
+ * \return          0 if successful, or POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_key_usage( x509write_cert *ctx, unsigned char key_usage );
+
+/**
+ * \brief           Set the Netscape Cert Type flags
+ *                  (e.g. NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_EMAIL)
+ *
+ * \param ctx           CRT context to use
+ * \param ns_cert_type  Netscape Cert Type flags to set
+ *
+ * \return          0 if successful, or POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_crt_set_ns_cert_type( x509write_cert *ctx,
+                                    unsigned char ns_cert_type );
+
+/**
+ * \brief           Free the contents of a CRT write context
+ *
+ * \param ctx       CRT context to free
+ */
+void x509write_crt_free( x509write_cert *ctx );
+
+/**
+ * \brief           Write a built up certificate to a X509 DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       certificate to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for countermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int x509write_crt_der( x509write_cert *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+
+#if defined(POLARSSL_PEM_WRITE_C)
+/**
+ * \brief           Write a built up certificate to a X509 PEM string
+ *
+ * \param ctx       certificate to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 successful, or a specific error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for countermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int x509write_crt_pem( x509write_cert *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+#endif /* POLARSSL_PEM_WRITE_C */
+#endif /* POLARSSL_X509_CRT_WRITE_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509_crt.h */
diff --git a/Externals/polarssl/include/polarssl/x509_csr.h b/Externals/polarssl/include/polarssl/x509_csr.h
new file mode 100644
index 0000000000..6591e382eb
--- /dev/null
+++ b/Externals/polarssl/include/polarssl/x509_csr.h
@@ -0,0 +1,295 @@
+/**
+ * \file x509_csr.h
+ *
+ * \brief X.509 certificate signing request parsing and writing
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_X509_CSR_H
+#define POLARSSL_X509_CSR_H
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#include "x509.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup x509_module
+ * \{ */
+
+/**
+ * \name Structures and functions for X.509 Certificate Signing Requests (CSR)
+ * \{
+ */
+
+/**
+ * Certificate Signing Request (CSR) structure.
+ */
+typedef struct _x509_csr
+{
+    x509_buf raw;           /**< The raw CSR data (DER). */
+    x509_buf cri;           /**< The raw CertificateRequestInfo body (DER). */
+
+    int version;            /**< CSR version (1=v1). */
+
+    x509_buf  subject_raw;  /**< The raw subject data (DER). */
+    x509_name subject;      /**< The parsed subject data (named information object). */
+
+    pk_context pk;          /**< Container for the public key context. */
+
+    x509_buf sig_oid;
+    x509_buf sig;
+    md_type_t sig_md;       /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
+    pk_type_t sig_pk;       /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
+    void *sig_opts;         /**< Signature options to be passed to pk_verify_ext(), e.g. for RSASSA-PSS */
+}
+x509_csr;
+
+/**
+ * Container for writing a CSR
+ */
+typedef struct _x509write_csr
+{
+    pk_context *key;
+    asn1_named_data *subject;
+    md_type_t md_alg;
+    asn1_named_data *extensions;
+}
+x509write_csr;
+
+#if defined(POLARSSL_X509_CSR_PARSE_C)
+/**
+ * \brief          Load a Certificate Signing Request (CSR) in DER format
+ *
+ * \param csr      CSR context to fill
+ * \param buf      buffer holding the CRL data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509_csr_parse_der( x509_csr *csr,
+                        const unsigned char *buf, size_t buflen );
+
+/**
+ * \brief          Load a Certificate Signing Request (CSR), DER or PEM format
+ *
+ * \param csr      CSR context to fill
+ * \param buf      buffer holding the CRL data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen );
+
+#if defined(POLARSSL_FS_IO)
+/**
+ * \brief          Load a Certificate Signing Request (CSR)
+ *
+ * \param csr      CSR context to fill
+ * \param path     filename to read the CSR from
+ *
+ * \return         0 if successful, or a specific X509 or PEM error code
+ */
+int x509_csr_parse_file( x509_csr *csr, const char *path );
+#endif /* POLARSSL_FS_IO */
+
+/**
+ * \brief          Returns an informational string about the
+ *                 CSR.
+ *
+ * \param buf      Buffer to write to
+ * \param size     Maximum size of buffer
+ * \param prefix   A line prefix
+ * \param csr      The X509 CSR to represent
+ *
+ * \return         The length of the string written (exluding the terminating
+ *                 null byte), or a negative value in case of an error.
+ */
+int x509_csr_info( char *buf, size_t size, const char *prefix,
+                   const x509_csr *csr );
+
+/**
+ * \brief          Initialize a CSR
+ *
+ * \param csr      CSR to initialize
+ */
+void x509_csr_init( x509_csr *csr );
+
+/**
+ * \brief          Unallocate all CSR data
+ *
+ * \param csr      CSR to free
+ */
+void x509_csr_free( x509_csr *csr );
+#endif /* POLARSSL_X509_CSR_PARSE_C */
+
+/* \} name */
+/* \} addtogroup x509_module */
+
+#if defined(POLARSSL_X509_CSR_WRITE_C)
+/**
+ * \brief           Initialize a CSR context
+ *
+ * \param ctx       CSR context to initialize
+ */
+void x509write_csr_init( x509write_csr *ctx );
+
+/**
+ * \brief           Set the subject name for a CSR
+ *                  Subject names should contain a comma-separated list
+ *                  of OID types and values:
+ *                  e.g. "C=NL,O=Offspark,CN=PolarSSL Server 1"
+ *
+ * \param ctx           CSR context to use
+ * \param subject_name  subject name to set
+ *
+ * \return          0 if subject name was parsed successfully, or
+ *                  a specific error code
+ */
+int x509write_csr_set_subject_name( x509write_csr *ctx,
+                                    const char *subject_name );
+
+/**
+ * \brief           Set the key for a CSR (public key will be included,
+ *                  private key used to sign the CSR when writing it)
+ *
+ * \param ctx       CSR context to use
+ * \param key       Asymetric key to include
+ */
+void x509write_csr_set_key( x509write_csr *ctx, pk_context *key );
+
+/**
+ * \brief           Set the MD algorithm to use for the signature
+ *                  (e.g. POLARSSL_MD_SHA1)
+ *
+ * \param ctx       CSR context to use
+ * \param md_alg    MD algorithm to use
+ */
+void x509write_csr_set_md_alg( x509write_csr *ctx, md_type_t md_alg );
+
+/**
+ * \brief           Set the Key Usage Extension flags
+ *                  (e.g. KU_DIGITAL_SIGNATURE | KU_KEY_CERT_SIGN)
+ *
+ * \param ctx       CSR context to use
+ * \param key_usage key usage flags to set
+ *
+ * \return          0 if successful, or POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_csr_set_key_usage( x509write_csr *ctx, unsigned char key_usage );
+
+/**
+ * \brief           Set the Netscape Cert Type flags
+ *                  (e.g. NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_EMAIL)
+ *
+ * \param ctx           CSR context to use
+ * \param ns_cert_type  Netscape Cert Type flags to set
+ *
+ * \return          0 if successful, or POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_csr_set_ns_cert_type( x509write_csr *ctx,
+                                    unsigned char ns_cert_type );
+
+/**
+ * \brief           Generic function to add to or replace an extension in the
+ *                  CSR
+ *
+ * \param ctx       CSR context to use
+ * \param oid       OID of the extension
+ * \param oid_len   length of the OID
+ * \param val       value of the extension OCTET STRING
+ * \param val_len   length of the value data
+ *
+ * \return          0 if successful, or a POLARSSL_ERR_X509WRITE_MALLOC_FAILED
+ */
+int x509write_csr_set_extension( x509write_csr *ctx,
+                                 const char *oid, size_t oid_len,
+                                 const unsigned char *val, size_t val_len );
+
+/**
+ * \brief           Free the contents of a CSR context
+ *
+ * \param ctx       CSR context to free
+ */
+void x509write_csr_free( x509write_csr *ctx );
+
+/**
+ * \brief           Write a CSR (Certificate Signing Request) to a
+ *                  DER structure
+ *                  Note: data is written at the end of the buffer! Use the
+ *                        return value to determine where you should start
+ *                        using the buffer
+ *
+ * \param ctx       CSR to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          length of data written if successful, or a specific
+ *                  error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for countermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int x509write_csr_der( x509write_csr *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+
+#if defined(POLARSSL_PEM_WRITE_C)
+/**
+ * \brief           Write a CSR (Certificate Signing Request) to a
+ *                  PEM string
+ *
+ * \param ctx       CSR to write away
+ * \param buf       buffer to write to
+ * \param size      size of the buffer
+ * \param f_rng     RNG function (for signature, see note)
+ * \param p_rng     RNG parameter
+ *
+ * \return          0 successful, or a specific error code
+ *
+ * \note            f_rng may be NULL if RSA is used for signature and the
+ *                  signature is made offline (otherwise f_rng is desirable
+ *                  for couermeasures against timing attacks).
+ *                  ECDSA signatures always require a non-NULL f_rng.
+ */
+int x509write_csr_pem( x509write_csr *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng );
+#endif /* POLARSSL_PEM_WRITE_C */
+#endif /* POLARSSL_X509_CSR_WRITE_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509_csr.h */
diff --git a/Externals/polarssl/include/polarssl/x509write.h b/Externals/polarssl/include/polarssl/x509write.h
deleted file mode 100644
index 8ce3d86692..0000000000
--- a/Externals/polarssl/include/polarssl/x509write.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * \file x509write.h
- *
- * \brief X509 buffer writing functionality
- *
- *  Copyright (C) 2006-2012, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef POLARSSL_X509_WRITE_H
-#define POLARSSL_X509_WRITE_H
-
-#include "rsa.h"
-
-typedef struct _x509_req_name
-{
-    char oid[128];
-    char name[128];
-
-    struct _x509_req_name *next;
-}
-x509_req_name;
-
-int x509_write_pubkey_der( unsigned char *buf, size_t size, rsa_context *rsa );
-int x509_write_key_der( unsigned char *buf, size_t size, rsa_context *rsa );
-int x509_write_cert_req( unsigned char *buf, size_t size, rsa_context *rsa,
-                         x509_req_name *req_name, int hash_id );
-
-#endif /* POLARSSL_X509_WRITE_H */
diff --git a/Externals/polarssl/include/polarssl/xtea.h b/Externals/polarssl/include/polarssl/xtea.h
index c95cb768cc..794c5efa31 100644
--- a/Externals/polarssl/include/polarssl/xtea.h
+++ b/Externals/polarssl/include/polarssl/xtea.h
@@ -27,11 +27,15 @@
 #ifndef POLARSSL_XTEA_H
 #define POLARSSL_XTEA_H
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -47,6 +51,10 @@ typedef UINT32 uint32_t;
 // Regular implementation
 //
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          XTEA context structure
  */
@@ -56,9 +64,19 @@ typedef struct
 }
 xtea_context;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * \brief          Initialize XTEA context
+ *
+ * \param ctx      XTEA context to be initialized
+ */
+void xtea_init( xtea_context *ctx );
+
+/**
+ * \brief          Clear XTEA context
+ *
+ * \param ctx      XTEA context to be cleared
+ */
+void xtea_free( xtea_context *ctx );
 
 /**
  * \brief          XTEA key schedule
@@ -66,7 +84,7 @@ extern "C" {
  * \param ctx      XTEA context to be initialized
  * \param key      the secret key
  */
-void xtea_setup( xtea_context *ctx, unsigned char key[16] );
+void xtea_setup( xtea_context *ctx, const unsigned char key[16] );
 
 /**
  * \brief          XTEA cipher function
@@ -80,9 +98,10 @@ void xtea_setup( xtea_context *ctx, unsigned char key[16] );
  */
 int xtea_crypt_ecb( xtea_context *ctx,
                     int mode,
-                    unsigned char input[8],
+                    const unsigned char input[8],
                     unsigned char output[8] );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /**
  * \brief          XTEA CBC cipher function
  *
@@ -100,8 +119,9 @@ int xtea_crypt_cbc( xtea_context *ctx,
                     int mode,
                     size_t length,
                     unsigned char iv[8],
-                    unsigned char *input,
+                    const unsigned char *input,
                     unsigned char *output);
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #ifdef __cplusplus
 }
diff --git a/Externals/polarssl/library/CMakeLists.txt b/Externals/polarssl/library/CMakeLists.txt
index 8cf055e950..35c08f345d 100644
--- a/Externals/polarssl/library/CMakeLists.txt
+++ b/Externals/polarssl/library/CMakeLists.txt
@@ -1,7 +1,10 @@
-option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
+option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL static library." ON)
+option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL shared library." OFF)
+option(LINK_WITH_PTHREAD "Explicitly link PolarSSL library to pthread." OFF)
 
 set(src
      aes.c
+     aesni.c
      arc4.c
      asn1parse.c
      asn1write.c
@@ -9,6 +12,7 @@ set(src
      bignum.c
      blowfish.c
      camellia.c
+     ccm.c
      certs.c
      cipher.c
      cipher_wrap.c
@@ -16,35 +20,56 @@ set(src
      debug.c
      des.c
      dhm.c
+     ecp.c
+     ecp_curves.c
+     ecdh.c
+     ecdsa.c
      entropy.c
      entropy_poll.c
      error.c
      gcm.c
      havege.c
+     hmac_drbg.c
      md.c
      md_wrap.c
      md2.c
      md4.c
      md5.c
+     memory_buffer_alloc.c
      net.c
+     oid.c
      padlock.c
      pbkdf2.c
      pem.c
      pkcs5.c
      pkcs11.c
      pkcs12.c
+     pk.c
+     pk_wrap.c
+     pkparse.c
+     pkwrite.c
+     platform.c
+     ripemd160.c
      rsa.c
      sha1.c
-     sha2.c
-     sha4.c
+     sha256.c
+     sha512.c
      ssl_cache.c
-     ssl_cli.c 
-     ssl_srv.c 
+     ssl_ciphersuites.c
+     ssl_cli.c
+     ssl_srv.c
      ssl_tls.c
+     threading.c
      timing.c
      version.c
-     x509parse.c
-     x509write.c
+     version_features.c
+     x509.c
+     x509_crt.c
+     x509_crl.c
+     x509_csr.c
+     x509_create.c
+     x509write_crt.c
+     x509write_csr.c
      xtea.c
 )
 
@@ -52,19 +77,52 @@ if(WIN32)
 set(libs ws2_32)
 endif(WIN32)
 
-if(NOT USE_SHARED_POLARSSL_LIBRARY)
+if(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wmissing-declarations -Wmissing-prototypes")
+  set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
+endif(CMAKE_COMPILER_IS_GNUCC)
 
-add_library(polarssl STATIC ${src})
+if(CMAKE_COMPILER_IS_CLANG)
+  set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wmissing-declarations -Wmissing-prototypes")
+endif(CMAKE_COMPILER_IS_CLANG)
 
-else(NOT USE_SHARED_POLARSSL_LIBRARY)
+if (NOT USE_STATIC_POLARSSL_LIBRARY AND NOT USE_SHARED_POLARSSL_LIBRARY)
+	message(FATAL_ERROR "Need to choose static or shared polarssl build!")
+endif(NOT USE_STATIC_POLARSSL_LIBRARY AND NOT USE_SHARED_POLARSSL_LIBRARY)
 
-add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.2.8 SOVERSION 2)
+if(USE_STATIC_POLARSSL_LIBRARY AND USE_SHARED_POLARSSL_LIBRARY)
+	# if we build both static an shared, then let
+	# tests and programs link to the shared lib target
+	set(polarssl_static_target "polarssl_static")
+elseif(USE_STATIC_POLARSSL_LIBRARY)
+	set(polarssl_static_target "polarssl")
+endif()
 
-endif(NOT USE_SHARED_POLARSSL_LIBRARY)
+if(USE_STATIC_POLARSSL_LIBRARY)
+	add_library(${polarssl_static_target} STATIC ${src})
+	set_target_properties(${polarssl_static_target} PROPERTIES OUTPUT_NAME polarssl)
+	target_link_libraries(${polarssl_static_target} ${libs})
 
-target_link_libraries(polarssl ${libs})
+	if(ZLIB_FOUND)
+		target_link_libraries(${polarssl_static_target} ${ZLIB_LIBRARIES})
+	endif(ZLIB_FOUND)
 
-install(TARGETS polarssl
-        DESTINATION ${LIB_INSTALL_DIR}
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+	if(LINK_WITH_PTHREAD)
+        target_link_libraries(${polarssl_static_target} pthread)
+	endif()
+endif()
+
+if(USE_SHARED_POLARSSL_LIBRARY)
+	add_library(polarssl SHARED ${src})
+	set_target_properties(polarssl PROPERTIES VERSION 1.3.8 SOVERSION 7)
+
+	target_link_libraries(polarssl ${libs})
+
+	if(ZLIB_FOUND)
+		target_link_libraries(polarssl ${ZLIB_LIBRARIES})
+	endif(ZLIB_FOUND)
+
+	if(LINK_WITH_PTHREAD)
+        target_link_libraries(polarssl pthread)
+	endif()
+endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/Externals/polarssl/library/aes.c b/Externals/polarssl/library/aes.c
index 6456c54d19..f295747c59 100644
--- a/Externals/polarssl/library/aes.c
+++ b/Externals/polarssl/library/aes.c
@@ -1,7 +1,7 @@
 /*
  *  FIPS-197 compliant AES implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_AES_C)
 
@@ -37,9 +41,23 @@
 #if defined(POLARSSL_PADLOCK_C)
 #include "polarssl/padlock.h"
 #endif
+#if defined(POLARSSL_AESNI_C)
+#include "polarssl/aesni.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
 
 #if !defined(POLARSSL_AES_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * 32-bit integer manipulation macros (little endian)
  */
@@ -333,16 +351,16 @@ static const uint32_t RCON[10] =
     0x0000001B, 0x00000036
 };
 
-#else
+#else /* POLARSSL_AES_ROM_TABLES */
 
 /*
  * Forward S-box & tables
  */
 static unsigned char FSb[256];
-static uint32_t FT0[256]; 
-static uint32_t FT1[256]; 
-static uint32_t FT2[256]; 
-static uint32_t FT3[256]; 
+static uint32_t FT0[256];
+static uint32_t FT1[256];
+static uint32_t FT2[256];
+static uint32_t FT3[256];
 
 /*
  * Reverse S-box & tables
@@ -402,10 +420,10 @@ static void aes_gen_tables( void )
     {
         x = pow[255 - log[i]];
 
-        y  = x; y = ( (y << 1) | (y >> 7) ) & 0xFF;
-        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
-        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
-        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
+        y  = x; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
+        x ^= y; y = ( ( y << 1 ) | ( y >> 7 ) ) & 0xFF;
         x ^= y ^ 0x63;
 
         FSb[i] = (unsigned char) x;
@@ -443,12 +461,26 @@ static void aes_gen_tables( void )
     }
 }
 
-#endif
+#endif /* POLARSSL_AES_ROM_TABLES */
+
+void aes_init( aes_context *ctx )
+{
+    memset( ctx, 0, sizeof( aes_context ) );
+}
+
+void aes_free( aes_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( aes_context ) );
+}
 
 /*
  * AES key schedule (encryption)
  */
-int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int keysize )
+int aes_setkey_enc( aes_context *ctx, const unsigned char *key,
+                    unsigned int keysize )
 {
     unsigned int i;
     uint32_t *RK;
@@ -480,7 +512,12 @@ int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int key
 #endif
     ctx->rk = RK = ctx->buf;
 
-    for( i = 0; i < (keysize >> 5); i++ )
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    if( aesni_supports( POLARSSL_AESNI_AES ) )
+        return( aesni_setkey_enc( (unsigned char *) ctx->rk, key, keysize ) );
+#endif
+
+    for( i = 0; i < ( keysize >> 5 ); i++ )
     {
         GET_UINT32_LE( RK[i], key, i << 2 );
     }
@@ -546,10 +583,6 @@ int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int key
                 RK[15] = RK[7] ^ RK[14];
             }
             break;
-
-        default:
-
-            break;
     }
 
     return( 0 );
@@ -558,21 +591,15 @@ int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int key
 /*
  * AES key schedule (decryption)
  */
-int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int keysize )
+int aes_setkey_dec( aes_context *ctx, const unsigned char *key,
+                    unsigned int keysize )
 {
-    int i, j;
+    int i, j, ret;
     aes_context cty;
     uint32_t *RK;
     uint32_t *SK;
-    int ret;
 
-    switch( keysize )
-    {
-        case 128: ctx->nr = 10; break;
-        case 192: ctx->nr = 12; break;
-        case 256: ctx->nr = 14; break;
-        default : return( POLARSSL_ERR_AES_INVALID_KEY_LENGTH );
-    }
+    aes_init( &cty );
 
 #if defined(POLARSSL_PADLOCK_C) && defined(PADLOCK_ALIGN16)
     if( aes_padlock_ace == -1 )
@@ -584,9 +611,20 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int key
 #endif
     ctx->rk = RK = ctx->buf;
 
-    ret = aes_setkey_enc( &cty, key, keysize );
-    if( ret != 0 )
-        return( ret );
+    /* Also checks keysize */
+    if( ( ret = aes_setkey_enc( &cty, key, keysize ) ) != 0 )
+        goto exit;
+
+    ctx->nr = cty.nr;
+
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    if( aesni_supports( POLARSSL_AESNI_AES ) )
+    {
+        aesni_inverse_key( (unsigned char *) ctx->rk,
+                           (const unsigned char *) cty.rk, ctx->nr );
+        goto exit;
+    }
+#endif
 
     SK = cty.rk + cty.nr * 4;
 
@@ -611,9 +649,10 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int key
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-    memset( &cty, 0, sizeof( aes_context ) );
+exit:
+    aes_free( &cty );
 
-    return( 0 );
+    return( ret );
 }
 
 #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
@@ -673,6 +712,11 @@ int aes_crypt_ecb( aes_context *ctx,
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    if( aesni_supports( POLARSSL_AESNI_AES ) )
+        return( aesni_crypt_ecb( ctx, mode, input, output ) );
+#endif
+
 #if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
     if( aes_padlock_ace )
     {
@@ -694,7 +738,7 @@ int aes_crypt_ecb( aes_context *ctx,
 
     if( mode == AES_DECRYPT )
     {
-        for( i = (ctx->nr >> 1) - 1; i > 0; i-- )
+        for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
         {
             AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
             AES_RROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
@@ -728,7 +772,7 @@ int aes_crypt_ecb( aes_context *ctx,
     }
     else /* AES_ENCRYPT */
     {
-        for( i = (ctx->nr >> 1) - 1; i > 0; i-- )
+        for( i = ( ctx->nr >> 1 ) - 1; i > 0; i-- )
         {
             AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
             AES_FROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
@@ -769,6 +813,7 @@ int aes_crypt_ecb( aes_context *ctx,
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * AES-CBC buffer encryption/decryption
  */
@@ -790,7 +835,7 @@ int aes_crypt_cbc( aes_context *ctx,
     {
         if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
             return( 0 );
-        
+
         // If padlock data misaligned, we just fall back to
         // unaccelerated mode
         //
@@ -832,6 +877,7 @@ int aes_crypt_cbc( aes_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 /*
@@ -859,7 +905,7 @@ int aes_crypt_cfb128( aes_context *ctx,
             *output++ = (unsigned char)( c ^ iv[n] );
             iv[n] = (unsigned char) c;
 
-            n = (n + 1) & 0x0F;
+            n = ( n + 1 ) & 0x0F;
         }
     }
     else
@@ -871,7 +917,7 @@ int aes_crypt_cfb128( aes_context *ctx,
 
             iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
 
-            n = (n + 1) & 0x0F;
+            n = ( n + 1 ) & 0x0F;
         }
     }
 
@@ -879,6 +925,39 @@ int aes_crypt_cfb128( aes_context *ctx,
 
     return( 0 );
 }
+
+/*
+ * AES-CFB8 buffer encryption/decryption
+ */
+#include <stdio.h>
+int aes_crypt_cfb8( aes_context *ctx,
+                       int mode,
+                       size_t length,
+                       unsigned char iv[16],
+                       const unsigned char *input,
+                       unsigned char *output )
+{
+    unsigned char c;
+    unsigned char ov[17];
+
+    while( length-- )
+    {
+        memcpy( ov, iv, 16 );
+        aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
+
+        if( mode == AES_DECRYPT )
+            ov[16] = *input;
+
+        c = *output++ = (unsigned char)( iv[0] ^ *input++ );
+
+        if( mode == AES_ENCRYPT )
+            ov[16] = c;
+
+        memcpy( iv, ov + 1, 16 );
+    }
+
+    return( 0 );
+}
 #endif /*POLARSSL_CIPHER_MODE_CFB */
 
 #if defined(POLARSSL_CIPHER_MODE_CTR)
@@ -908,7 +987,7 @@ int aes_crypt_ctr( aes_context *ctx,
         c = *input++;
         *output++ = (unsigned char)( c ^ stream_block[n] );
 
-        n = (n + 1) & 0x0F;
+        n = ( n + 1 ) & 0x0F;
     }
 
     *nc_off = n;
@@ -916,6 +995,7 @@ int aes_crypt_ctr( aes_context *ctx,
     return( 0 );
 }
 #endif /* POLARSSL_CIPHER_MODE_CTR */
+
 #endif /* !POLARSSL_AES_ALT */
 
 #if defined(POLARSSL_SELF_TEST)
@@ -947,6 +1027,7 @@ static const unsigned char aes_test_ecb_enc[3][16] =
       0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4 }
 };
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 static const unsigned char aes_test_cbc_dec[3][16] =
 {
     { 0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
@@ -966,6 +1047,7 @@ static const unsigned char aes_test_cbc_enc[3][16] =
     { 0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
       0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0 }
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 /*
@@ -1101,11 +1183,13 @@ static const int aes_test_ctr_len[3] =
  */
 int aes_self_test( int verbose )
 {
-    int i, j, u, v;
+    int ret = 0, i, j, u, v;
     unsigned char key[32];
     unsigned char buf[64];
-    unsigned char prv[16];
     unsigned char iv[16];
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    unsigned char prv[16];
+#endif
 #if defined(POLARSSL_CIPHER_MODE_CTR) || defined(POLARSSL_CIPHER_MODE_CFB)
     size_t offset;
 #endif
@@ -1117,6 +1201,7 @@ int aes_self_test( int verbose )
     aes_context ctx;
 
     memset( key, 0, 32 );
+    aes_init( &ctx );
 
     /*
      * ECB mode
@@ -1127,8 +1212,8 @@ int aes_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  AES-ECB-%3d (%s): ", 128 + u * 64,
-                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  AES-ECB-%3d (%s): ", 128 + u * 64,
+                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
 
         memset( buf, 0, 16 );
 
@@ -1142,9 +1227,10 @@ int aes_self_test( int verbose )
             if( memcmp( buf, aes_test_ecb_dec[u], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
         else
@@ -1157,19 +1243,21 @@ int aes_self_test( int verbose )
             if( memcmp( buf, aes_test_ecb_enc[u], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
@@ -1179,8 +1267,8 @@ int aes_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  AES-CBC-%3d (%s): ", 128 + u * 64,
-                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  AES-CBC-%3d (%s): ", 128 + u * 64,
+                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
 
         memset( iv , 0, 16 );
         memset( prv, 0, 16 );
@@ -1196,9 +1284,10 @@ int aes_self_test( int verbose )
             if( memcmp( buf, aes_test_cbc_dec[u], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
         else
@@ -1219,18 +1308,20 @@ int aes_self_test( int verbose )
             if( memcmp( prv, aes_test_cbc_enc[u], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
     /*
@@ -1242,8 +1333,8 @@ int aes_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  AES-CFB128-%3d (%s): ", 128 + u * 64,
-                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  AES-CFB128-%3d (%s): ", 128 + u * 64,
+                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
 
         memcpy( iv,  aes_test_cfb128_iv, 16 );
         memcpy( key, aes_test_cfb128_key[u], 16 + u * 8 );
@@ -1259,9 +1350,10 @@ int aes_self_test( int verbose )
             if( memcmp( buf, aes_test_cfb128_pt, 64 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
         else
@@ -1272,18 +1364,19 @@ int aes_self_test( int verbose )
             if( memcmp( buf, aes_test_cfb128_ct[u], 64 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 #endif /* POLARSSL_CIPHER_MODE_CFB */
 
 #if defined(POLARSSL_CIPHER_MODE_CTR)
@@ -1296,8 +1389,8 @@ int aes_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  AES-CTR-128 (%s): ",
-                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  AES-CTR-128 (%s): ",
+                             ( v == AES_DECRYPT ) ? "dec" : "enc" );
 
         memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
         memcpy( key, aes_test_ctr_key[u], 16 );
@@ -1310,14 +1403,16 @@ int aes_self_test( int verbose )
             len = aes_test_ctr_len[u];
             memcpy( buf, aes_test_ctr_ct[u], len );
 
-            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, buf, buf );
+            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                           buf, buf );
 
             if( memcmp( buf, aes_test_ctr_pt[u], len ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
         else
@@ -1325,28 +1420,35 @@ int aes_self_test( int verbose )
             len = aes_test_ctr_len[u];
             memcpy( buf, aes_test_ctr_pt[u], len );
 
-            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, buf, buf );
+            aes_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                           buf, buf );
 
             if( memcmp( buf, aes_test_ctr_ct[u], len ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 #endif /* POLARSSL_CIPHER_MODE_CTR */
 
-    return( 0 );
+    ret = 0;
+
+exit:
+    aes_free( &ctx );
+
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_AES_C */
diff --git a/Externals/polarssl/library/aesni.c b/Externals/polarssl/library/aesni.c
new file mode 100644
index 0000000000..97f646ea4f
--- /dev/null
+++ b/Externals/polarssl/library/aesni.c
@@ -0,0 +1,463 @@
+/*
+ *  AES-NI support functions
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * [AES-WP] http://software.intel.com/en-us/articles/intel-advanced-encryption-standard-aes-instructions-set
+ * [CLMUL-WP] http://software.intel.com/en-us/articles/intel-carry-less-multiplication-instruction-and-its-usage-for-computing-the-gcm-mode/
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_AESNI_C)
+
+#include "polarssl/aesni.h"
+#include <stdio.h>
+
+#if defined(POLARSSL_HAVE_X86_64)
+
+/*
+ * AES-NI support detection routine
+ */
+int aesni_supports( unsigned int what )
+{
+    static int done = 0;
+    static unsigned int c = 0;
+
+    if( ! done )
+    {
+        asm( "movl  $1, %%eax   \n\t"
+             "cpuid             \n\t"
+             : "=c" (c)
+             :
+             : "eax", "ebx", "edx" );
+        done = 1;
+    }
+
+    return( ( c & what ) != 0 );
+}
+
+/*
+ * Binutils needs to be at least 2.19 to support AES-NI instructions.
+ * Unfortunately, a lot of users have a lower version now (2014-04).
+ * Emit bytecode directly in order to support "old" version of gas.
+ *
+ * Opcodes from the Intel architecture reference manual, vol. 3.
+ * We always use registers, so we don't need prefixes for memory operands.
+ * Operand macros are in gas order (src, dst) as opposed to Intel order
+ * (dst, src) in order to blend better into the surrounding assembly code.
+ */
+#define AESDEC      ".byte 0x66,0x0F,0x38,0xDE,"
+#define AESDECLAST  ".byte 0x66,0x0F,0x38,0xDF,"
+#define AESENC      ".byte 0x66,0x0F,0x38,0xDC,"
+#define AESENCLAST  ".byte 0x66,0x0F,0x38,0xDD,"
+#define AESIMC      ".byte 0x66,0x0F,0x38,0xDB,"
+#define AESKEYGENA  ".byte 0x66,0x0F,0x3A,0xDF,"
+#define PCLMULQDQ   ".byte 0x66,0x0F,0x3A,0x44,"
+
+#define xmm0_xmm0   "0xC0"
+#define xmm0_xmm1   "0xC8"
+#define xmm0_xmm2   "0xD0"
+#define xmm0_xmm3   "0xD8"
+#define xmm0_xmm4   "0xE0"
+#define xmm1_xmm0   "0xC1"
+#define xmm1_xmm2   "0xD1"
+
+/*
+ * AES-NI AES-ECB block en(de)cryption
+ */
+int aesni_crypt_ecb( aes_context *ctx,
+                     int mode,
+                     const unsigned char input[16],
+                     unsigned char output[16] )
+{
+    asm( "movdqu    (%3), %%xmm0    \n\t" // load input
+         "movdqu    (%1), %%xmm1    \n\t" // load round key 0
+         "pxor      %%xmm1, %%xmm0  \n\t" // round 0
+         "addq      $16, %1         \n\t" // point to next round key
+         "subl      $1, %0          \n\t" // normal rounds = nr - 1
+         "test      %2, %2          \n\t" // mode?
+         "jz        2f              \n\t" // 0 = decrypt
+
+         "1:                        \n\t" // encryption loop
+         "movdqu    (%1), %%xmm1    \n\t" // load round key
+         AESENC     xmm1_xmm0      "\n\t" // do round
+         "addq      $16, %1         \n\t" // point to next round key
+         "subl      $1, %0          \n\t" // loop
+         "jnz       1b              \n\t"
+         "movdqu    (%1), %%xmm1    \n\t" // load round key
+         AESENCLAST xmm1_xmm0      "\n\t" // last round
+         "jmp       3f              \n\t"
+
+         "2:                        \n\t" // decryption loop
+         "movdqu    (%1), %%xmm1    \n\t"
+         AESDEC     xmm1_xmm0      "\n\t" // do round
+         "addq      $16, %1         \n\t"
+         "subl      $1, %0          \n\t"
+         "jnz       2b              \n\t"
+         "movdqu    (%1), %%xmm1    \n\t" // load round key
+         AESDECLAST xmm1_xmm0      "\n\t" // last round
+
+         "3:                        \n\t"
+         "movdqu    %%xmm0, (%4)    \n\t" // export output
+         :
+         : "r" (ctx->nr), "r" (ctx->rk), "r" (mode), "r" (input), "r" (output)
+         : "memory", "cc", "xmm0", "xmm1" );
+
+
+    return( 0 );
+}
+
+/*
+ * GCM multiplication: c = a times b in GF(2^128)
+ * Based on [CLMUL-WP] algorithms 1 (with equation 27) and 5.
+ */
+void aesni_gcm_mult( unsigned char c[16],
+                     const unsigned char a[16],
+                     const unsigned char b[16] )
+{
+    unsigned char aa[16], bb[16], cc[16];
+    size_t i;
+
+    /* The inputs are in big-endian order, so byte-reverse them */
+    for( i = 0; i < 16; i++ )
+    {
+        aa[i] = a[15 - i];
+        bb[i] = b[15 - i];
+    }
+
+    asm( "movdqu (%0), %%xmm0               \n\t" // a1:a0
+         "movdqu (%1), %%xmm1               \n\t" // b1:b0
+
+         /*
+          * Caryless multiplication xmm2:xmm1 = xmm0 * xmm1
+          * using [CLMUL-WP] algorithm 1 (p. 13).
+          */
+         "movdqa %%xmm1, %%xmm2             \n\t" // copy of b1:b0
+         "movdqa %%xmm1, %%xmm3             \n\t" // same
+         "movdqa %%xmm1, %%xmm4             \n\t" // same
+         PCLMULQDQ xmm0_xmm1 ",0x00         \n\t" // a0*b0 = c1:c0
+         PCLMULQDQ xmm0_xmm2 ",0x11         \n\t" // a1*b1 = d1:d0
+         PCLMULQDQ xmm0_xmm3 ",0x10         \n\t" // a0*b1 = e1:e0
+         PCLMULQDQ xmm0_xmm4 ",0x01         \n\t" // a1*b0 = f1:f0
+         "pxor %%xmm3, %%xmm4               \n\t" // e1+f1:e0+f0
+         "movdqa %%xmm4, %%xmm3             \n\t" // same
+         "psrldq $8, %%xmm4                 \n\t" // 0:e1+f1
+         "pslldq $8, %%xmm3                 \n\t" // e0+f0:0
+         "pxor %%xmm4, %%xmm2               \n\t" // d1:d0+e1+f1
+         "pxor %%xmm3, %%xmm1               \n\t" // c1+e0+f1:c0
+
+         /*
+          * Now shift the result one bit to the left,
+          * taking advantage of [CLMUL-WP] eq 27 (p. 20)
+          */
+         "movdqa %%xmm1, %%xmm3             \n\t" // r1:r0
+         "movdqa %%xmm2, %%xmm4             \n\t" // r3:r2
+         "psllq $1, %%xmm1                  \n\t" // r1<<1:r0<<1
+         "psllq $1, %%xmm2                  \n\t" // r3<<1:r2<<1
+         "psrlq $63, %%xmm3                 \n\t" // r1>>63:r0>>63
+         "psrlq $63, %%xmm4                 \n\t" // r3>>63:r2>>63
+         "movdqa %%xmm3, %%xmm5             \n\t" // r1>>63:r0>>63
+         "pslldq $8, %%xmm3                 \n\t" // r0>>63:0
+         "pslldq $8, %%xmm4                 \n\t" // r2>>63:0
+         "psrldq $8, %%xmm5                 \n\t" // 0:r1>>63
+         "por %%xmm3, %%xmm1                \n\t" // r1<<1|r0>>63:r0<<1
+         "por %%xmm4, %%xmm2                \n\t" // r3<<1|r2>>62:r2<<1
+         "por %%xmm5, %%xmm2                \n\t" // r3<<1|r2>>62:r2<<1|r1>>63
+
+         /*
+          * Now reduce modulo the GCM polynomial x^128 + x^7 + x^2 + x + 1
+          * using [CLMUL-WP] algorithm 5 (p. 20).
+          * Currently xmm2:xmm1 holds x3:x2:x1:x0 (already shifted).
+          */
+         /* Step 2 (1) */
+         "movdqa %%xmm1, %%xmm3             \n\t" // x1:x0
+         "movdqa %%xmm1, %%xmm4             \n\t" // same
+         "movdqa %%xmm1, %%xmm5             \n\t" // same
+         "psllq $63, %%xmm3                 \n\t" // x1<<63:x0<<63 = stuff:a
+         "psllq $62, %%xmm4                 \n\t" // x1<<62:x0<<62 = stuff:b
+         "psllq $57, %%xmm5                 \n\t" // x1<<57:x0<<57 = stuff:c
+
+         /* Step 2 (2) */
+         "pxor %%xmm4, %%xmm3               \n\t" // stuff:a+b
+         "pxor %%xmm5, %%xmm3               \n\t" // stuff:a+b+c
+         "pslldq $8, %%xmm3                 \n\t" // a+b+c:0
+         "pxor %%xmm3, %%xmm1               \n\t" // x1+a+b+c:x0 = d:x0
+
+         /* Steps 3 and 4 */
+         "movdqa %%xmm1,%%xmm0              \n\t" // d:x0
+         "movdqa %%xmm1,%%xmm4              \n\t" // same
+         "movdqa %%xmm1,%%xmm5              \n\t" // same
+         "psrlq $1, %%xmm0                  \n\t" // e1:x0>>1 = e1:e0'
+         "psrlq $2, %%xmm4                  \n\t" // f1:x0>>2 = f1:f0'
+         "psrlq $7, %%xmm5                  \n\t" // g1:x0>>7 = g1:g0'
+         "pxor %%xmm4, %%xmm0               \n\t" // e1+f1:e0'+f0'
+         "pxor %%xmm5, %%xmm0               \n\t" // e1+f1+g1:e0'+f0'+g0'
+         // e0'+f0'+g0' is almost e0+f0+g0, ex\tcept for some missing
+         // bits carried from d. Now get those\t bits back in.
+         "movdqa %%xmm1,%%xmm3              \n\t" // d:x0
+         "movdqa %%xmm1,%%xmm4              \n\t" // same
+         "movdqa %%xmm1,%%xmm5              \n\t" // same
+         "psllq $63, %%xmm3                 \n\t" // d<<63:stuff
+         "psllq $62, %%xmm4                 \n\t" // d<<62:stuff
+         "psllq $57, %%xmm5                 \n\t" // d<<57:stuff
+         "pxor %%xmm4, %%xmm3               \n\t" // d<<63+d<<62:stuff
+         "pxor %%xmm5, %%xmm3               \n\t" // missing bits of d:stuff
+         "psrldq $8, %%xmm3                 \n\t" // 0:missing bits of d
+         "pxor %%xmm3, %%xmm0               \n\t" // e1+f1+g1:e0+f0+g0
+         "pxor %%xmm1, %%xmm0               \n\t" // h1:h0
+         "pxor %%xmm2, %%xmm0               \n\t" // x3+h1:x2+h0
+
+         "movdqu %%xmm0, (%2)               \n\t" // done
+         :
+         : "r" (aa), "r" (bb), "r" (cc)
+         : "memory", "cc", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5" );
+
+    /* Now byte-reverse the outputs */
+    for( i = 0; i < 16; i++ )
+        c[i] = cc[15 - i];
+
+    return;
+}
+
+/*
+ * Compute decryption round keys from encryption round keys
+ */
+void aesni_inverse_key( unsigned char *invkey,
+                        const unsigned char *fwdkey, int nr )
+{
+    unsigned char *ik = invkey;
+    const unsigned char *fk = fwdkey + 16 * nr;
+
+    memcpy( ik, fk, 16 );
+
+    for( fk -= 16, ik += 16; fk > fwdkey; fk -= 16, ik += 16 )
+        asm( "movdqu (%0), %%xmm0       \n\t"
+             AESIMC  xmm0_xmm0         "\n\t"
+             "movdqu %%xmm0, (%1)       \n\t"
+             :
+             : "r" (fk), "r" (ik)
+             : "memory", "xmm0" );
+
+    memcpy( ik, fk, 16 );
+}
+
+/*
+ * Key expansion, 128-bit case
+ */
+static void aesni_setkey_enc_128( unsigned char *rk,
+                                  const unsigned char *key )
+{
+    asm( "movdqu (%1), %%xmm0               \n\t" // copy the original key
+         "movdqu %%xmm0, (%0)               \n\t" // as round key 0
+         "jmp 2f                            \n\t" // skip auxiliary routine
+
+         /*
+          * Finish generating the next round key.
+          *
+          * On entry xmm0 is r3:r2:r1:r0 and xmm1 is X:stuff:stuff:stuff
+          * with X = rot( sub( r3 ) ) ^ RCON.
+          *
+          * On exit, xmm0 is r7:r6:r5:r4
+          * with r4 = X + r0, r5 = r4 + r1, r6 = r5 + r2, r7 = r6 + r3
+          * and those are written to the round key buffer.
+          */
+         "1:                                \n\t"
+         "pshufd $0xff, %%xmm1, %%xmm1      \n\t" // X:X:X:X
+         "pxor %%xmm0, %%xmm1               \n\t" // X+r3:X+r2:X+r1:r4
+         "pslldq $4, %%xmm0                 \n\t" // r2:r1:r0:0
+         "pxor %%xmm0, %%xmm1               \n\t" // X+r3+r2:X+r2+r1:r5:r4
+         "pslldq $4, %%xmm0                 \n\t" // etc
+         "pxor %%xmm0, %%xmm1               \n\t"
+         "pslldq $4, %%xmm0                 \n\t"
+         "pxor %%xmm1, %%xmm0               \n\t" // update xmm0 for next time!
+         "add $16, %0                       \n\t" // point to next round key
+         "movdqu %%xmm0, (%0)               \n\t" // write it
+         "ret                               \n\t"
+
+         /* Main "loop" */
+         "2:                                \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x01        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x02        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x04        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x08        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x10        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x20        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x40        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x80        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x1B        \n\tcall 1b \n\t"
+         AESKEYGENA xmm0_xmm1 ",0x36        \n\tcall 1b \n\t"
+         :
+         : "r" (rk), "r" (key)
+         : "memory", "cc", "0" );
+}
+
+/*
+ * Key expansion, 192-bit case
+ */
+static void aesni_setkey_enc_192( unsigned char *rk,
+                                  const unsigned char *key )
+{
+    asm( "movdqu (%1), %%xmm0   \n\t" // copy original round key
+         "movdqu %%xmm0, (%0)   \n\t"
+         "add $16, %0           \n\t"
+         "movq 16(%1), %%xmm1   \n\t"
+         "movq %%xmm1, (%0)     \n\t"
+         "add $8, %0            \n\t"
+         "jmp 2f                \n\t" // skip auxiliary routine
+
+         /*
+          * Finish generating the next 6 quarter-keys.
+          *
+          * On entry xmm0 is r3:r2:r1:r0, xmm1 is stuff:stuff:r5:r4
+          * and xmm2 is stuff:stuff:X:stuff with X = rot( sub( r3 ) ) ^ RCON.
+          *
+          * On exit, xmm0 is r9:r8:r7:r6 and xmm1 is stuff:stuff:r11:r10
+          * and those are written to the round key buffer.
+          */
+         "1:                            \n\t"
+         "pshufd $0x55, %%xmm2, %%xmm2  \n\t" // X:X:X:X
+         "pxor %%xmm0, %%xmm2           \n\t" // X+r3:X+r2:X+r1:r4
+         "pslldq $4, %%xmm0             \n\t" // etc
+         "pxor %%xmm0, %%xmm2           \n\t"
+         "pslldq $4, %%xmm0             \n\t"
+         "pxor %%xmm0, %%xmm2           \n\t"
+         "pslldq $4, %%xmm0             \n\t"
+         "pxor %%xmm2, %%xmm0           \n\t" // update xmm0 = r9:r8:r7:r6
+         "movdqu %%xmm0, (%0)           \n\t"
+         "add $16, %0                   \n\t"
+         "pshufd $0xff, %%xmm0, %%xmm2  \n\t" // r9:r9:r9:r9
+         "pxor %%xmm1, %%xmm2           \n\t" // stuff:stuff:r9+r5:r10
+         "pslldq $4, %%xmm1             \n\t" // r2:r1:r0:0
+         "pxor %%xmm2, %%xmm1           \n\t" // xmm1 = stuff:stuff:r11:r10
+         "movq %%xmm1, (%0)             \n\t"
+         "add $8, %0                    \n\t"
+         "ret                           \n\t"
+
+         "2:                            \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x01    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x02    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x04    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x08    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x10    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x20    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x40    \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x80    \n\tcall 1b \n\t"
+
+         :
+         : "r" (rk), "r" (key)
+         : "memory", "cc", "0" );
+}
+
+/*
+ * Key expansion, 256-bit case
+ */
+static void aesni_setkey_enc_256( unsigned char *rk,
+                                  const unsigned char *key )
+{
+    asm( "movdqu (%1), %%xmm0           \n\t"
+         "movdqu %%xmm0, (%0)           \n\t"
+         "add $16, %0                   \n\t"
+         "movdqu 16(%1), %%xmm1         \n\t"
+         "movdqu %%xmm1, (%0)           \n\t"
+         "jmp 2f                        \n\t" // skip auxiliary routine
+
+         /*
+          * Finish generating the next two round keys.
+          *
+          * On entry xmm0 is r3:r2:r1:r0, xmm1 is r7:r6:r5:r4 and
+          * xmm2 is X:stuff:stuff:stuff with X = rot( sub( r7 )) ^ RCON
+          *
+          * On exit, xmm0 is r11:r10:r9:r8 and xmm1 is r15:r14:r13:r12
+          * and those have been written to the output buffer.
+          */
+         "1:                                \n\t"
+         "pshufd $0xff, %%xmm2, %%xmm2      \n\t"
+         "pxor %%xmm0, %%xmm2               \n\t"
+         "pslldq $4, %%xmm0                 \n\t"
+         "pxor %%xmm0, %%xmm2               \n\t"
+         "pslldq $4, %%xmm0                 \n\t"
+         "pxor %%xmm0, %%xmm2               \n\t"
+         "pslldq $4, %%xmm0                 \n\t"
+         "pxor %%xmm2, %%xmm0               \n\t"
+         "add $16, %0                       \n\t"
+         "movdqu %%xmm0, (%0)               \n\t"
+
+         /* Set xmm2 to stuff:Y:stuff:stuff with Y = subword( r11 )
+          * and proceed to generate next round key from there */
+         AESKEYGENA xmm0_xmm2 ",0x00        \n\t"
+         "pshufd $0xaa, %%xmm2, %%xmm2      \n\t"
+         "pxor %%xmm1, %%xmm2               \n\t"
+         "pslldq $4, %%xmm1                 \n\t"
+         "pxor %%xmm1, %%xmm2               \n\t"
+         "pslldq $4, %%xmm1                 \n\t"
+         "pxor %%xmm1, %%xmm2               \n\t"
+         "pslldq $4, %%xmm1                 \n\t"
+         "pxor %%xmm2, %%xmm1               \n\t"
+         "add $16, %0                       \n\t"
+         "movdqu %%xmm1, (%0)               \n\t"
+         "ret                               \n\t"
+
+         /*
+          * Main "loop" - Generating one more key than necessary,
+          * see definition of aes_context.buf
+          */
+         "2:                                \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x01        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x02        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x04        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x08        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x10        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x20        \n\tcall 1b \n\t"
+         AESKEYGENA xmm1_xmm2 ",0x40        \n\tcall 1b \n\t"
+         :
+         : "r" (rk), "r" (key)
+         : "memory", "cc", "0" );
+}
+
+/*
+ * Key expansion, wrapper
+ */
+int aesni_setkey_enc( unsigned char *rk,
+                      const unsigned char *key,
+                      size_t bits )
+{
+    switch( bits )
+    {
+        case 128: aesni_setkey_enc_128( rk, key ); break;
+        case 192: aesni_setkey_enc_192( rk, key ); break;
+        case 256: aesni_setkey_enc_256( rk, key ); break;
+        default : return( POLARSSL_ERR_AES_INVALID_KEY_LENGTH );
+    }
+
+    return( 0 );
+}
+
+#endif /* POLARSSL_HAVE_X86_64 */
+
+#endif /* POLARSSL_AESNI_C */
diff --git a/Externals/polarssl/library/arc4.c b/Externals/polarssl/library/arc4.c
index 85b78f5ba5..54e89ea888 100644
--- a/Externals/polarssl/library/arc4.c
+++ b/Externals/polarssl/library/arc4.c
@@ -1,7 +1,7 @@
 /*
  *  An implementation of the ARCFOUR algorithm
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -28,18 +28,47 @@
  *  http://groups.google.com/group/sci.crypt/msg/10a300c9d21afca0
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_ARC4_C)
 
 #include "polarssl/arc4.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 #if !defined(POLARSSL_ARC4_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+void arc4_init( arc4_context *ctx )
+{
+    memset( ctx, 0, sizeof( arc4_context ) );
+}
+
+void arc4_free( arc4_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( arc4_context ) );
+}
+
 /*
  * ARC4 key schedule
  */
-void arc4_setup( arc4_context *ctx, const unsigned char *key, unsigned int keylen )
+void arc4_setup( arc4_context *ctx, const unsigned char *key,
+                 unsigned int keylen )
 {
     int i, j, a;
     unsigned int k;
@@ -135,15 +164,17 @@ static const unsigned char arc4_test_ct[3][8] =
  */
 int arc4_self_test( int verbose )
 {
-    int i;
+    int i, ret = 0;
     unsigned char ibuf[8];
     unsigned char obuf[8];
     arc4_context ctx;
 
+    arc4_init( &ctx );
+
     for( i = 0; i < 3; i++ )
     {
         if( verbose != 0 )
-            printf( "  ARC4 test #%d: ", i + 1 );
+            polarssl_printf( "  ARC4 test #%d: ", i + 1 );
 
         memcpy( ibuf, arc4_test_pt[i], 8 );
 
@@ -153,21 +184,25 @@ int arc4_self_test( int verbose )
         if( memcmp( obuf, arc4_test_ct[i], 8 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
-    return( 0 );
+exit:
+    arc4_free( &ctx );
+
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_ARC4_C */
diff --git a/Externals/polarssl/library/asn1parse.c b/Externals/polarssl/library/asn1parse.c
index 2584774a77..97443529a8 100644
--- a/Externals/polarssl/library/asn1parse.c
+++ b/Externals/polarssl/library/asn1parse.c
@@ -1,7 +1,7 @@
 /*
  *  Generic ASN.1 parsing
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,7 +23,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_ASN1_PARSE_C)
 
@@ -33,9 +37,15 @@
 #include "polarssl/bignum.h"
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <string.h>
 #include <stdlib.h>
-#include <time.h>
 
 /*
  * ASN.1 DER decoding routines
@@ -81,7 +91,8 @@ int asn1_get_len( unsigned char **p,
             if( ( end - *p ) < 5 )
                 return( POLARSSL_ERR_ASN1_OUT_OF_DATA );
 
-            *len = ( (*p)[1] << 24 ) | ( (*p)[2] << 16 ) | ( (*p)[3] << 8 ) | (*p)[4];
+            *len = ( (*p)[1] << 24 ) | ( (*p)[2] << 16 ) | ( (*p)[3] << 8 ) |
+                   (*p)[4];
             (*p) += 5;
             break;
 
@@ -183,7 +194,7 @@ int asn1_get_bitstring( unsigned char **p, const unsigned char *end,
         return( ret );
 
     /* Check length, subtract one for actual bit string length */
-    if ( bs->len < 1 )
+    if( bs->len < 1 )
         return( POLARSSL_ERR_ASN1_OUT_OF_DATA );
     bs->len -= 1;
 
@@ -200,9 +211,27 @@ int asn1_get_bitstring( unsigned char **p, const unsigned char *end,
     if( *p != end )
         return( POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
 
-    return 0;
+    return( 0 );
 }
 
+/*
+ * Get a bit string without unused bits
+ */
+int asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
+                             size_t *len )
+{
+    int ret;
+
+    if( ( ret = asn1_get_tag( p, end, len, ASN1_BIT_STRING ) ) != 0 )
+        return( ret );
+
+    if( (*len)-- < 2 || *(*p)++ != 0 )
+        return( POLARSSL_ERR_ASN1_INVALID_DATA );
+
+    return( 0 );
+}
+
+
 
 /*
  *  Parses and splits an ASN.1 "SEQUENCE OF <tag>"
@@ -236,9 +265,9 @@ int asn1_get_sequence_of( unsigned char **p,
         *p += buf->len;
 
         /* Allocate and assign next pointer */
-        if (*p < end)
+        if( *p < end )
         {
-            cur->next = (asn1_sequence *) malloc(
+            cur->next = (asn1_sequence *) polarssl_malloc(
                  sizeof( asn1_sequence ) );
 
             if( cur->next == NULL )
@@ -257,4 +286,106 @@ int asn1_get_sequence_of( unsigned char **p,
     return( 0 );
 }
 
-#endif
+int asn1_get_alg( unsigned char **p,
+                  const unsigned char *end,
+                  asn1_buf *alg, asn1_buf *params )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    alg->tag = **p;
+    end = *p + len;
+
+    if( ( ret = asn1_get_tag( p, end, &alg->len, ASN1_OID ) ) != 0 )
+        return( ret );
+
+    alg->p = *p;
+    *p += alg->len;
+
+    if( *p == end )
+    {
+        memset( params, 0, sizeof(asn1_buf) );
+        return( 0 );
+    }
+
+    params->tag = **p;
+    (*p)++;
+
+    if( ( ret = asn1_get_len( p, end, &params->len ) ) != 0 )
+        return( ret );
+
+    params->p = *p;
+    *p += params->len;
+
+    if( *p != end )
+        return( POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+int asn1_get_alg_null( unsigned char **p,
+                       const unsigned char *end,
+                       asn1_buf *alg )
+{
+    int ret;
+    asn1_buf params;
+
+    memset( &params, 0, sizeof(asn1_buf) );
+
+    if( ( ret = asn1_get_alg( p, end, alg, &params ) ) != 0 )
+        return( ret );
+
+    if( ( params.tag != ASN1_NULL && params.tag != 0 ) || params.len != 0 )
+        return( POLARSSL_ERR_ASN1_INVALID_DATA );
+
+    return( 0 );
+}
+
+void asn1_free_named_data( asn1_named_data *cur )
+{
+    if( cur == NULL )
+        return;
+
+    polarssl_free( cur->oid.p );
+    polarssl_free( cur->val.p );
+
+    memset( cur, 0, sizeof( asn1_named_data ) );
+}
+
+void asn1_free_named_data_list( asn1_named_data **head )
+{
+    asn1_named_data *cur;
+
+    while( ( cur = *head ) != NULL )
+    {
+        *head = cur->next;
+        asn1_free_named_data( cur );
+        polarssl_free( cur );
+    }
+}
+
+asn1_named_data *asn1_find_named_data( asn1_named_data *list,
+                                       const char *oid, size_t len )
+{
+    while( list != NULL )
+    {
+        if( list->oid.len == len &&
+            memcmp( list->oid.p, oid, len ) == 0 )
+        {
+            break;
+        }
+
+        list = list->next;
+    }
+
+    return( list );
+}
+
+#endif /* POLARSSL_ASN1_PARSE_C */
diff --git a/Externals/polarssl/library/asn1write.c b/Externals/polarssl/library/asn1write.c
index e50c17c581..ebc0e97660 100644
--- a/Externals/polarssl/library/asn1write.c
+++ b/Externals/polarssl/library/asn1write.c
@@ -1,7 +1,7 @@
 /*
  * ASN.1 buffer writing functionality
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,12 +23,24 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_ASN1_WRITE_C)
 
 #include "polarssl/asn1write.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdlib.h>
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 int asn1_write_len( unsigned char **p, unsigned char *start, size_t len )
 {
     if( len < 0x80 )
@@ -36,7 +48,7 @@ int asn1_write_len( unsigned char **p, unsigned char *start, size_t len )
         if( *p - start < 1 )
             return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
 
-        *--(*p) = len;
+        *--(*p) = (unsigned char) len;
         return( 1 );
     }
 
@@ -45,7 +57,7 @@ int asn1_write_len( unsigned char **p, unsigned char *start, size_t len )
         if( *p - start < 2 )
             return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
 
-        *--(*p) = len;
+        *--(*p) = (unsigned char) len;
         *--(*p) = 0x81;
         return( 2 );
     }
@@ -72,6 +84,22 @@ int asn1_write_tag( unsigned char **p, unsigned char *start, unsigned char tag )
     return( 1 );
 }
 
+int asn1_write_raw_buffer( unsigned char **p, unsigned char *start,
+                           const unsigned char *buf, size_t size )
+{
+    size_t len = 0;
+
+    if( *p - start < (int) size )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    len = size;
+    (*p) -= len;
+    memcpy( *p, buf, len );
+
+    return( (int) len );
+}
+
+#if defined(POLARSSL_BIGNUM_C)
 int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X )
 {
     int ret;
@@ -85,12 +113,12 @@ int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X )
         return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
 
     (*p) -= len;
-    mpi_write_binary( X, *p, len );
+    MPI_CHK( mpi_write_binary( X, *p, len ) );
 
     // DER format assumes 2s complement for numbers, so the leftmost bit
     // should be 0 for positive numbers and 1 for negative numbers.
     //
-    if ( X->s ==1 && **p & 0x80 )
+    if( X->s ==1 && **p & 0x80 )
     {
         if( *p - start < 1 )
             return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
@@ -102,9 +130,13 @@ int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X )
     ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_INTEGER ) );
 
-    return( len );
+    ret = (int) len;
+
+cleanup:
+    return( ret );
 }
-    
+#endif /* POLARSSL_BIGNUM_C */
+
 int asn1_write_null( unsigned char **p, unsigned char *start )
 {
     int ret;
@@ -115,52 +147,59 @@ int asn1_write_null( unsigned char **p, unsigned char *start )
     ASN1_CHK_ADD( len, asn1_write_len( p, start, 0) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_NULL ) );
 
-    return( len );
+    return( (int) len );
 }
 
-int asn1_write_oid( unsigned char **p, unsigned char *start, char *oid )
+int asn1_write_oid( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len )
 {
     int ret;
     size_t len = 0;
 
-    // Write OID
-    //
-    len = strlen( oid );
-
-    if( *p - start < (int) len )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    (*p) -= len;
-    memcpy( *p, oid, len );
-
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                                  (const unsigned char *) oid, oid_len ) );
     ASN1_CHK_ADD( len , asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len , asn1_write_tag( p, start, ASN1_OID ) );
 
-    return( len );
+    return( (int) len );
 }
 
 int asn1_write_algorithm_identifier( unsigned char **p, unsigned char *start,
-                                     char *algorithm_oid )
+                                     const char *oid, size_t oid_len,
+                                     size_t par_len )
 {
     int ret;
-    size_t null_len = 0;
-    size_t oid_len = 0;
     size_t len = 0;
 
-    // Write NULL
-    //
-    ASN1_CHK_ADD( null_len, asn1_write_null( p, start ) );
+    if( par_len == 0 )
+        ASN1_CHK_ADD( len, asn1_write_null( p, start ) );
+    else
+        len += par_len;
 
-    // Write OID
-    //
-    ASN1_CHK_ADD( oid_len, asn1_write_oid( p, start, algorithm_oid ) );
+    ASN1_CHK_ADD( len, asn1_write_oid( p, start, oid, oid_len ) );
 
-    len = oid_len + null_len;
-    ASN1_CHK_ADD( len, asn1_write_len( p, start, oid_len + null_len ) );
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start,
                                        ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
 
-    return( len );
+    return( (int) len );
+}
+
+int asn1_write_bool( unsigned char **p, unsigned char *start, int boolean )
+{
+    int ret;
+    size_t len = 0;
+
+    if( *p - start < 1 )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    *--(*p) = (boolean) ? 1 : 0;
+    len++;
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_BOOLEAN ) );
+
+    return( (int) len );
 }
 
 int asn1_write_int( unsigned char **p, unsigned char *start, int val )
@@ -178,7 +217,7 @@ int asn1_write_int( unsigned char **p, unsigned char *start, int val )
     len += 1;
     *--(*p) = val;
 
-    if ( val > 0 && **p & 0x80 )
+    if( val > 0 && **p & 0x80 )
     {
         if( *p - start < 1 )
             return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
@@ -190,52 +229,138 @@ int asn1_write_int( unsigned char **p, unsigned char *start, int val )
     ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_INTEGER ) );
 
-    return( len );
+    return( (int) len );
 }
 
 int asn1_write_printable_string( unsigned char **p, unsigned char *start,
-                                 char *text )
+                                 const char *text, size_t text_len )
 {
     int ret;
     size_t len = 0;
 
-    // Write string
-    //
-    len = strlen( text );
-
-    if( *p - start < (int) len )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    (*p) -= len;
-    memcpy( *p, text, len );
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                  (const unsigned char *) text, text_len ) );
 
     ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_PRINTABLE_STRING ) );
 
-    return( len );
+    return( (int) len );
 }
-    
+
 int asn1_write_ia5_string( unsigned char **p, unsigned char *start,
-                          char *text )
+                           const char *text, size_t text_len )
 {
     int ret;
     size_t len = 0;
 
-    // Write string
-    //
-    len = strlen( text );
-
-    if( *p - start < (int) len )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    (*p) -= len;
-    memcpy( *p, text, len );
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                  (const unsigned char *) text, text_len ) );
 
     ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
     ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_IA5_STRING ) );
 
-    return( len );
+    return( (int) len );
 }
-    
 
-#endif
+int asn1_write_bitstring( unsigned char **p, unsigned char *start,
+                          const unsigned char *buf, size_t bits )
+{
+    int ret;
+    size_t len = 0, size;
+
+    size = ( bits / 8 ) + ( ( bits % 8 ) ? 1 : 0 );
+
+    // Calculate byte length
+    //
+    if( *p - start < (int) size + 1 )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    len = size + 1;
+    (*p) -= size;
+    memcpy( *p, buf, size );
+
+    // Write unused bits
+    //
+    *--(*p) = (unsigned char) (size * 8 - bits);
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_BIT_STRING ) );
+
+    return( (int) len );
+}
+
+int asn1_write_octet_string( unsigned char **p, unsigned char *start,
+                             const unsigned char *buf, size_t size )
+{
+    int ret;
+    size_t len = 0;
+
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start, buf, size ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_OCTET_STRING ) );
+
+    return( (int) len );
+}
+
+asn1_named_data *asn1_store_named_data( asn1_named_data **head,
+                                        const char *oid, size_t oid_len,
+                                        const unsigned char *val,
+                                        size_t val_len )
+{
+    asn1_named_data *cur;
+
+    if( ( cur = asn1_find_named_data( *head, oid, oid_len ) ) == NULL )
+    {
+        // Add new entry if not present yet based on OID
+        //
+        if( ( cur = polarssl_malloc( sizeof(asn1_named_data) ) ) == NULL )
+            return( NULL );
+
+        memset( cur, 0, sizeof(asn1_named_data) );
+
+        cur->oid.len = oid_len;
+        cur->oid.p = polarssl_malloc( oid_len );
+        if( cur->oid.p == NULL )
+        {
+            polarssl_free( cur );
+            return( NULL );
+        }
+
+        cur->val.len = val_len;
+        cur->val.p = polarssl_malloc( val_len );
+        if( cur->val.p == NULL )
+        {
+            polarssl_free( cur->oid.p );
+            polarssl_free( cur );
+            return( NULL );
+        }
+
+        memcpy( cur->oid.p, oid, oid_len );
+
+        cur->next = *head;
+        *head = cur;
+    }
+    else if( cur->val.len < val_len )
+    {
+        // Enlarge existing value buffer if needed
+        //
+        polarssl_free( cur->val.p );
+        cur->val.p = NULL;
+
+        cur->val.len = val_len;
+        cur->val.p = polarssl_malloc( val_len );
+        if( cur->val.p == NULL )
+        {
+            polarssl_free( cur->oid.p );
+            polarssl_free( cur );
+            return( NULL );
+        }
+    }
+
+    if( val != NULL )
+        memcpy( cur->val.p, val, val_len );
+
+    return( cur );
+}
+#endif /* POLARSSL_ASN1_WRITE_C */
diff --git a/Externals/polarssl/library/base64.c b/Externals/polarssl/library/base64.c
index 06305bb5ed..39a8323e83 100644
--- a/Externals/polarssl/library/base64.c
+++ b/Externals/polarssl/library/base64.c
@@ -1,7 +1,7 @@
 /*
  *  RFC 1521 base64 encoding/decoding
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,19 +23,29 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_BASE64_C)
 
 #include "polarssl/base64.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
 #include <inttypes.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 static const unsigned char base64_enc_map[64] =
 {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
@@ -77,9 +87,9 @@ int base64_encode( unsigned char *dst, size_t *dlen,
     if( slen == 0 )
         return( 0 );
 
-    n = (slen << 3) / 6;
+    n = ( slen << 3 ) / 6;
 
-    switch( (slen << 3) - (n * 6) )
+    switch( ( slen << 3 ) - ( n * 6 ) )
     {
         case  2: n += 3; break;
         case  4: n += 2; break;
@@ -92,7 +102,7 @@ int base64_encode( unsigned char *dst, size_t *dlen,
         return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
     }
 
-    n = (slen / 3) * 3;
+    n = ( slen / 3 ) * 3;
 
     for( i = 0, p = dst; i < n; i += 3 )
     {
@@ -109,12 +119,12 @@ int base64_encode( unsigned char *dst, size_t *dlen,
     if( i < slen )
     {
         C1 = *src++;
-        C2 = ((i + 1) < slen) ? *src++ : 0;
+        C2 = ( ( i + 1 ) < slen ) ? *src++ : 0;
 
         *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
         *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
 
-        if( (i + 1) < slen )
+        if( ( i + 1 ) < slen )
              *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
         else *p++ = '=';
 
@@ -137,7 +147,7 @@ int base64_decode( unsigned char *dst, size_t *dlen,
     uint32_t j, x;
     unsigned char *p;
 
-    for( i = j = n = 0; i < slen; i++ )
+    for( i = n = j = 0; i < slen; i++ )
     {
         if( ( slen - i ) >= 2 &&
             src[i] == '\r' && src[i + 1] == '\n' )
@@ -161,9 +171,10 @@ int base64_decode( unsigned char *dst, size_t *dlen,
     if( n == 0 )
         return( 0 );
 
-    n = ((n * 6) + 7) >> 3;
+    n = ( ( n * 6 ) + 7 ) >> 3;
+    n -= j;
 
-    if( *dlen < n )
+    if( dst == NULL || *dlen < n )
     {
         *dlen = n;
         return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
@@ -175,7 +186,7 @@ int base64_decode( unsigned char *dst, size_t *dlen,
             continue;
 
         j -= ( base64_dec_map[*src] == 64 );
-        x  = (x << 6) | ( base64_dec_map[*src] & 0x3F );
+        x  = ( x << 6 ) | ( base64_dec_map[*src] & 0x3F );
 
         if( ++n == 4 )
         {
@@ -222,7 +233,7 @@ int base64_self_test( int verbose )
     unsigned char buffer[128];
 
     if( verbose != 0 )
-        printf( "  Base64 encoding test: " );
+        polarssl_printf( "  Base64 encoding test: " );
 
     len = sizeof( buffer );
     src = base64_test_dec;
@@ -231,13 +242,13 @@ int base64_self_test( int verbose )
          memcmp( base64_test_enc, buffer, 88 ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n  Base64 decoding test: " );
+        polarssl_printf( "passed\n  Base64 decoding test: " );
 
     len = sizeof( buffer );
     src = base64_test_enc;
@@ -246,17 +257,17 @@ int base64_self_test( int verbose )
          memcmp( base64_test_dec, buffer, 64 ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n\n" );
+        polarssl_printf( "passed\n\n" );
 
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_BASE64_C */
diff --git a/Externals/polarssl/library/bignum.c b/Externals/polarssl/library/bignum.c
index 1422d50262..80cf0f8008 100644
--- a/Externals/polarssl/library/bignum.c
+++ b/Externals/polarssl/library/bignum.c
@@ -1,7 +1,7 @@
 /*
  *  Multi-precision integer library
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -30,15 +30,32 @@
  *  http://math.libtomcrypt.com/files/tommath.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_BIGNUM_C)
 
 #include "polarssl/bignum.h"
 #include "polarssl/bn_mul.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf     printf
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #define ciL    (sizeof(t_uint))         /* chars in limb  */
 #define biL    (ciL << 3)               /* bits  in limb  */
 #define biH    (ciL << 2)               /* half limb size */
@@ -72,8 +89,8 @@ void mpi_free( mpi *X )
 
     if( X->p != NULL )
     {
-        memset( X->p, 0, X->n * ciL );
-        free( X->p );
+        polarssl_zeroize( X->p, X->n * ciL );
+        polarssl_free( X->p );
     }
 
     X->s = 1;
@@ -93,7 +110,7 @@ int mpi_grow( mpi *X, size_t nblimbs )
 
     if( X->n < nblimbs )
     {
-        if( ( p = (t_uint *) malloc( nblimbs * ciL ) ) == NULL )
+        if( ( p = (t_uint *) polarssl_malloc( nblimbs * ciL ) ) == NULL )
             return( POLARSSL_ERR_MPI_MALLOC_FAILED );
 
         memset( p, 0, nblimbs * ciL );
@@ -101,8 +118,8 @@ int mpi_grow( mpi *X, size_t nblimbs )
         if( X->p != NULL )
         {
             memcpy( p, X->p, X->n * ciL );
-            memset( X->p, 0, X->n * ciL );
-            free( X->p );
+            polarssl_zeroize( X->p, X->n * ciL );
+            polarssl_free( X->p );
         }
 
         X->n = nblimbs;
@@ -112,6 +129,45 @@ int mpi_grow( mpi *X, size_t nblimbs )
     return( 0 );
 }
 
+/*
+ * Resize down as much as possible,
+ * while keeping at least the specified number of limbs
+ */
+int mpi_shrink( mpi *X, size_t nblimbs )
+{
+    t_uint *p;
+    size_t i;
+
+    /* Actually resize up in this case */
+    if( X->n <= nblimbs )
+        return( mpi_grow( X, nblimbs ) );
+
+    for( i = X->n - 1; i > 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+    i++;
+
+    if( i < nblimbs )
+        i = nblimbs;
+
+    if( ( p = (t_uint *) polarssl_malloc( i * ciL ) ) == NULL )
+        return( POLARSSL_ERR_MPI_MALLOC_FAILED );
+
+    memset( p, 0, i * ciL );
+
+    if( X->p != NULL )
+    {
+        memcpy( p, X->p, i * ciL );
+        polarssl_zeroize( X->p, X->n * ciL );
+        polarssl_free( X->p );
+    }
+
+    X->n = i;
+    X->p = p;
+
+    return( 0 );
+}
+
 /*
  * Copy the contents of Y into X
  */
@@ -123,6 +179,12 @@ int mpi_copy( mpi *X, const mpi *Y )
     if( X == Y )
         return( 0 );
 
+    if( Y->p == NULL )
+    {
+        mpi_free( X );
+        return( 0 );
+    }
+
     for( i = Y->n - 1; i > 0; i-- )
         if( Y->p[i] != 0 )
             break;
@@ -152,6 +214,70 @@ void mpi_swap( mpi *X, mpi *Y )
     memcpy(  Y, &T, sizeof( mpi ) );
 }
 
+/*
+ * Conditionally assign X = Y, without leaking information
+ * about whether the assignment was made or not.
+ * (Leaking information about the respective sizes of X and Y is ok however.)
+ */
+int mpi_safe_cond_assign( mpi *X, const mpi *Y, unsigned char assign )
+{
+    int ret = 0;
+    size_t i;
+
+    /* make sure assign is 0 or 1 */
+    assign = ( assign != 0 );
+
+    MPI_CHK( mpi_grow( X, Y->n ) );
+
+    X->s = X->s * ( 1 - assign ) + Y->s * assign;
+
+    for( i = 0; i < Y->n; i++ )
+        X->p[i] = X->p[i] * ( 1 - assign ) + Y->p[i] * assign;
+
+    for( ; i < X->n; i++ )
+        X->p[i] *= ( 1 - assign );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Conditionally swap X and Y, without leaking information
+ * about whether the swap was made or not.
+ * Here it is not ok to simply swap the pointers, which whould lead to
+ * different memory access patterns when X and Y are used afterwards.
+ */
+int mpi_safe_cond_swap( mpi *X, mpi *Y, unsigned char swap )
+{
+    int ret, s;
+    size_t i;
+    t_uint tmp;
+
+    if( X == Y )
+        return( 0 );
+
+    /* make sure swap is 0 or 1 */
+    swap = ( swap != 0 );
+
+    MPI_CHK( mpi_grow( X, Y->n ) );
+    MPI_CHK( mpi_grow( Y, X->n ) );
+
+    s = X->s;
+    X->s = X->s * ( 1 - swap ) + Y->s * swap;
+    Y->s = Y->s * ( 1 - swap ) +    s * swap;
+
+
+    for( i = 0; i < X->n; i++ )
+    {
+        tmp = X->p[i];
+        X->p[i] = X->p[i] * ( 1 - swap ) + Y->p[i] * swap;
+        Y->p[i] = Y->p[i] * ( 1 - swap ) +     tmp * swap;
+    }
+
+cleanup:
+    return( ret );
+}
+
 /*
  * Set value from integer
  */
@@ -178,7 +304,7 @@ int mpi_get_bit( const mpi *X, size_t pos )
     if( X->n * biL <= pos )
         return( 0 );
 
-    return ( X->p[pos / biL] >> ( pos % biL ) ) & 0x01;
+    return( ( X->p[pos / biL] >> ( pos % biL ) ) & 0x01 );
 }
 
 /*
@@ -191,20 +317,21 @@ int mpi_set_bit( mpi *X, size_t pos, unsigned char val )
     size_t idx = pos % biL;
 
     if( val != 0 && val != 1 )
-        return POLARSSL_ERR_MPI_BAD_INPUT_DATA;
-        
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
     if( X->n * biL <= pos )
     {
         if( val == 0 )
-            return ( 0 );
+            return( 0 );
 
         MPI_CHK( mpi_grow( X, off + 1 ) );
     }
 
-    X->p[off] = ( X->p[off] & ~( 0x01 << idx ) ) | ( val << idx );
+    X->p[off] &= ~( (t_uint) 0x01 << idx );
+    X->p[off] |= (t_uint) val << idx;
 
 cleanup:
-    
+
     return( ret );
 }
 
@@ -299,7 +426,7 @@ int mpi_read_string( mpi *X, int radix, const char *s )
             }
 
             MPI_CHK( mpi_get_digit( &d, radix, s[i - 1] ) );
-            X->p[j / (2 * ciL)] |= d << ( (j % (2 * ciL)) << 2 );
+            X->p[j / ( 2 * ciL )] |= d << ( ( j % ( 2 * ciL ) ) << 2 );
         }
     }
     else
@@ -403,7 +530,7 @@ int mpi_write_string( const mpi *X, int radix, char *s, size_t *slen )
             {
                 c = ( X->p[i - 1] >> ( ( j - 1 ) << 3) ) & 0xFF;
 
-                if( c == 0 && k == 0 && ( i + j + 3 ) != 0 )
+                if( c == 0 && k == 0 && ( i + j ) != 2 )
                     continue;
 
                 *(p++) = "0123456789ABCDEF" [c / 16];
@@ -499,7 +626,7 @@ int mpi_write_file( const char *p, const mpi *X, int radix, FILE *fout )
             return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
     }
     else
-        printf( "%s%s", p, s );
+        polarssl_printf( "%s%s", p, s );
 
 cleanup:
 
@@ -738,7 +865,7 @@ int mpi_add_abs( mpi *X, const mpi *A, const mpi *B )
 
     if( X != A )
         MPI_CHK( mpi_copy( X, A ) );
-   
+
     /*
      * X should always be positive as a result of unsigned additions.
      */
@@ -775,7 +902,7 @@ cleanup:
 }
 
 /*
- * Helper for mpi substraction
+ * Helper for mpi subtraction
  */
 static void mpi_sub_hlp( size_t n, t_uint *s, t_uint *d )
 {
@@ -796,7 +923,7 @@ static void mpi_sub_hlp( size_t n, t_uint *s, t_uint *d )
 }
 
 /*
- * Unsigned substraction: X = |A| - |B|  (HAC 14.9)
+ * Unsigned subtraction: X = |A| - |B|  (HAC 14.9)
  */
 int mpi_sub_abs( mpi *X, const mpi *A, const mpi *B )
 {
@@ -819,7 +946,7 @@ int mpi_sub_abs( mpi *X, const mpi *A, const mpi *B )
         MPI_CHK( mpi_copy( X, A ) );
 
     /*
-     * X should always be positive as a result of unsigned substractions.
+     * X should always be positive as a result of unsigned subtractions.
      */
     X->s = 1;
 
@@ -870,7 +997,7 @@ cleanup:
 }
 
 /*
- * Signed substraction: X = A - B
+ * Signed subtraction: X = A - B
  */
 int mpi_sub_mpi( mpi *X, const mpi *A, const mpi *B )
 {
@@ -917,7 +1044,7 @@ int mpi_add_int( mpi *X, const mpi *A, t_sint b )
 }
 
 /*
- * Signed substraction: X = A - b
+ * Signed subtraction: X = A - b
  */
 int mpi_sub_int( mpi *X, const mpi *A, t_sint b )
 {
@@ -961,7 +1088,7 @@ void mpi_mul_hlp( size_t i, t_uint *s, t_uint *d, t_uint b )
         MULADDC_CORE
         MULADDC_STOP
     }
-#else
+#else /* MULADDC_HUIT */
     for( ; i >= 16; i -= 16 )
     {
         MULADDC_INIT
@@ -994,7 +1121,7 @@ void mpi_mul_hlp( size_t i, t_uint *s, t_uint *d, t_uint b )
         MULADDC_CORE
         MULADDC_STOP
     }
-#endif
+#endif /* MULADDC_HUIT */
 
     t++;
 
@@ -1099,14 +1226,14 @@ int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
 
     n = X.n - 1;
     t = Y.n - 1;
-    MPI_CHK( mpi_shift_l( &Y, biL * (n - t) ) );
+    MPI_CHK( mpi_shift_l( &Y, biL * ( n - t ) ) );
 
     while( mpi_cmp_mpi( &X, &Y ) >= 0 )
     {
         Z.p[n - t]++;
-        mpi_sub_mpi( &X, &X, &Y );
+        MPI_CHK( mpi_sub_mpi( &X, &X, &Y ) );
     }
-    mpi_shift_r( &Y, biL * (n - t) );
+    MPI_CHK( mpi_shift_r( &Y, biL * ( n - t ) ) );
 
     for( i = n; i > t ; i-- )
     {
@@ -1114,14 +1241,24 @@ int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
             Z.p[i - t - 1] = ~0;
         else
         {
-#if defined(POLARSSL_HAVE_UDBL)
+            /*
+             * The version of Clang shipped by Apple with Mavericks around
+             * 2014-03 can't handle 128-bit division properly. Disable
+             * 128-bits division for this version. Let's be optimistic and
+             * assume it'll be fixed in the next minor version (next
+             * patchlevel is probably a bit too optimistic).
+             */
+#if defined(POLARSSL_HAVE_UDBL) &&                          \
+    ! ( defined(__x86_64__) && defined(__APPLE__) &&        \
+        defined(__clang_major__) && __clang_major__ == 5 && \
+        defined(__clang_minor__) && __clang_minor__ == 0 )
             t_udbl r;
 
             r  = (t_udbl) X.p[i] << biL;
             r |= (t_udbl) X.p[i - 1];
             r /= Y.p[t];
-            if( r > ((t_udbl) 1 << biL) - 1)
-                r = ((t_udbl) 1 << biL) - 1;
+            if( r > ( (t_udbl) 1 << biL ) - 1 )
+                r = ( (t_udbl) 1 << biL ) - 1;
 
             Z.p[i - t - 1] = (t_uint) r;
 #else
@@ -1164,7 +1301,7 @@ int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
             r0 -= m;
 
             Z.p[i - t - 1] = ( q1 << biH ) | q0;
-#endif
+#endif /* POLARSSL_HAVE_UDBL && !64-bit Apple with Clang 5.0 */
         }
 
         Z.p[i - t - 1]++;
@@ -1173,25 +1310,25 @@ int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
             Z.p[i - t - 1]--;
 
             MPI_CHK( mpi_lset( &T1, 0 ) );
-            T1.p[0] = (t < 1) ? 0 : Y.p[t - 1];
+            T1.p[0] = ( t < 1 ) ? 0 : Y.p[t - 1];
             T1.p[1] = Y.p[t];
             MPI_CHK( mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
 
             MPI_CHK( mpi_lset( &T2, 0 ) );
-            T2.p[0] = (i < 2) ? 0 : X.p[i - 2];
-            T2.p[1] = (i < 1) ? 0 : X.p[i - 1];
+            T2.p[0] = ( i < 2 ) ? 0 : X.p[i - 2];
+            T2.p[1] = ( i < 1 ) ? 0 : X.p[i - 1];
             T2.p[2] = X.p[i];
         }
         while( mpi_cmp_mpi( &T1, &T2 ) > 0 );
 
         MPI_CHK( mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
-        MPI_CHK( mpi_shift_l( &T1,  biL * (i - t - 1) ) );
+        MPI_CHK( mpi_shift_l( &T1,  biL * ( i - t - 1 ) ) );
         MPI_CHK( mpi_sub_mpi( &X, &X, &T1 ) );
 
         if( mpi_cmp_int( &X, 0 ) < 0 )
         {
             MPI_CHK( mpi_copy( &T1, &Y ) );
-            MPI_CHK( mpi_shift_l( &T1, biL * (i - t - 1) ) );
+            MPI_CHK( mpi_shift_l( &T1, biL * ( i - t - 1 ) ) );
             MPI_CHK( mpi_add_mpi( &X, &X, &T1 ) );
             Z.p[i - t - 1]--;
         }
@@ -1199,15 +1336,15 @@ int mpi_div_mpi( mpi *Q, mpi *R, const mpi *A, const mpi *B )
 
     if( Q != NULL )
     {
-        mpi_copy( Q, &Z );
+        MPI_CHK( mpi_copy( Q, &Z ) );
         Q->s = A->s * B->s;
     }
 
     if( R != NULL )
     {
-        mpi_shift_r( &X, k );
+        MPI_CHK( mpi_shift_r( &X, k ) );
         X.s = A->s;
-        mpi_copy( R, &X );
+        MPI_CHK( mpi_copy( R, &X ) );
 
         if( mpi_cmp_int( R, 0 ) == 0 )
             R->s = 1;
@@ -1245,7 +1382,7 @@ int mpi_mod_mpi( mpi *R, const mpi *A, const mpi *B )
     int ret;
 
     if( mpi_cmp_int( B, 0 ) < 0 )
-        return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
+        return( POLARSSL_ERR_MPI_NEGATIVE_VALUE );
 
     MPI_CHK( mpi_div_mpi( NULL, R, A, B ) );
 
@@ -1272,7 +1409,7 @@ int mpi_mod_int( t_uint *r, const mpi *A, t_sint b )
         return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
 
     if( b < 0 )
-        return POLARSSL_ERR_MPI_NEGATIVE_VALUE;
+        return( POLARSSL_ERR_MPI_NEGATIVE_VALUE );
 
     /*
      * handle trivial cases
@@ -1323,14 +1460,13 @@ int mpi_mod_int( t_uint *r, const mpi *A, t_sint b )
 static void mpi_montg_init( t_uint *mm, const mpi *N )
 {
     t_uint x, m0 = N->p[0];
+    unsigned int i;
 
     x  = m0;
     x += ( ( m0 + 2 ) & 4 ) << 1;
-    x *= ( 2 - ( m0 * x ) );
 
-    if( biL >= 16 ) x *= ( 2 - ( m0 * x ) );
-    if( biL >= 32 ) x *= ( 2 - ( m0 * x ) );
-    if( biL >= 64 ) x *= ( 2 - ( m0 * x ) );
+    for( i = biL; i >= 8; i /= 2 )
+        x *= ( 2 - ( m0 * x ) );
 
     *mm = ~x + 1;
 }
@@ -1338,7 +1474,8 @@ static void mpi_montg_init( t_uint *mm, const mpi *N )
 /*
  * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
  */
-static void mpi_montmul( mpi *A, const mpi *B, const mpi *N, t_uint mm, const mpi *T )
+static void mpi_montmul( mpi *A, const mpi *B, const mpi *N, t_uint mm,
+                         const mpi *T )
 {
     size_t i, n, m;
     t_uint u0, u1, *d;
@@ -1363,7 +1500,7 @@ static void mpi_montmul( mpi *A, const mpi *B, const mpi *N, t_uint mm, const mp
         *d++ = u0; d[n + 1] = 0;
     }
 
-    memcpy( A->p, d, (n + 1) * ciL );
+    memcpy( A->p, d, ( n + 1 ) * ciL );
 
     if( mpi_cmp_abs( A, N ) >= 0 )
         mpi_sub_hlp( n, N->p, A->p );
@@ -1410,6 +1547,7 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
      */
     mpi_montg_init( &mm, N );
     mpi_init( &RR ); mpi_init( &T );
+    mpi_init( &Apos );
     memset( W, 0, sizeof( W ) );
 
     i = mpi_msb( E );
@@ -1429,8 +1567,6 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
      * Compensate for negative A (and correct at the end)
      */
     neg = ( A->s == -1 );
-
-    mpi_init( &Apos );
     if( neg )
     {
         MPI_CHK( mpi_copy( &Apos, A ) );
@@ -1457,8 +1593,9 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
      * W[1] = A * R^2 * R^-1 mod N = A * R mod N
      */
     if( mpi_cmp_mpi( A, N ) >= 0 )
-        mpi_mod_mpi( &W[1], A, N );
-    else   mpi_copy( &W[1], A );
+        MPI_CHK( mpi_mod_mpi( &W[1], A, N ) );
+    else
+        MPI_CHK( mpi_copy( &W[1], A ) );
 
     mpi_montmul( &W[1], &RR, N, mm, &T );
 
@@ -1473,18 +1610,18 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
         /*
          * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
          */
-        j =  one << (wsize - 1);
+        j =  one << ( wsize - 1 );
 
         MPI_CHK( mpi_grow( &W[j], N->n + 1 ) );
         MPI_CHK( mpi_copy( &W[j], &W[1]    ) );
 
         for( i = 0; i < wsize - 1; i++ )
             mpi_montmul( &W[j], &W[j], N, mm, &T );
-    
+
         /*
          * W[i] = W[i - 1] * W[1]
          */
-        for( i = j + 1; i < (one << wsize); i++ )
+        for( i = j + 1; i < ( one << wsize ); i++ )
         {
             MPI_CHK( mpi_grow( &W[i], N->n + 1 ) );
             MPI_CHK( mpi_copy( &W[i], &W[i - 1] ) );
@@ -1503,9 +1640,11 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
     {
         if( bufsize == 0 )
         {
-            if( nblimbs-- == 0 )
+            if( nblimbs == 0 )
                 break;
 
+            nblimbs--;
+
             bufsize = sizeof( t_uint ) << 3;
         }
 
@@ -1534,7 +1673,7 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
         state = 2;
 
         nbits++;
-        wbits |= (ei << (wsize - nbits));
+        wbits |= ( ei << ( wsize - nbits ) );
 
         if( nbits == wsize )
         {
@@ -1564,7 +1703,7 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
 
         wbits <<= 1;
 
-        if( (wbits & (one << wsize)) != 0 )
+        if( ( wbits & ( one << wsize ) ) != 0 )
             mpi_montmul( X, &W[1], N, mm, &T );
     }
 
@@ -1576,17 +1715,17 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
     if( neg )
     {
         X->s = -1;
-        mpi_add_mpi( X, N, X );
+        MPI_CHK( mpi_add_mpi( X, N, X ) );
     }
 
 cleanup:
 
-    for( i = (one << (wsize - 1)); i < (one << wsize); i++ )
+    for( i = ( one << ( wsize - 1 ) ); i < ( one << wsize ); i++ )
         mpi_free( &W[i] );
 
     mpi_free( &W[1] ); mpi_free( &T ); mpi_free( &Apos );
 
-    if( _RR == NULL )
+    if( _RR == NULL || _RR->p == NULL )
         mpi_free( &RR );
 
     return( ret );
@@ -1609,7 +1748,7 @@ int mpi_gcd( mpi *G, const mpi *A, const mpi *B )
     lz = mpi_lsb( &TA );
     lzt = mpi_lsb( &TB );
 
-    if ( lzt < lz )
+    if( lzt < lz )
         lz = lzt;
 
     MPI_CHK( mpi_shift_r( &TA, lz ) );
@@ -1644,16 +1783,25 @@ cleanup:
     return( ret );
 }
 
+/*
+ * Fill X with size bytes of random.
+ *
+ * Use a temporary bytes representation to make sure the result is the same
+ * regardless of the platform endianness (useful when f_rng is actually
+ * deterministic, eg for tests).
+ */
 int mpi_fill_random( mpi *X, size_t size,
                      int (*f_rng)(void *, unsigned char *, size_t),
                      void *p_rng )
 {
     int ret;
+    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
 
-    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( size ) ) );
-    MPI_CHK( mpi_lset( X, 0 ) );
+    if( size > POLARSSL_MPI_MAX_SIZE )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
 
-    MPI_CHK( f_rng( p_rng, (unsigned char *) X->p, size ) );
+    MPI_CHK( f_rng( p_rng, buf, size ) );
+    MPI_CHK( mpi_read_binary( X, buf, size ) );
 
 cleanup:
     return( ret );
@@ -1782,40 +1930,27 @@ static const int small_prime[] =
 };
 
 /*
- * Miller-Rabin primality test  (HAC 4.24)
+ * Small divisors test (X must be positive)
+ *
+ * Return values:
+ * 0: no small factor (possible prime, more tests needed)
+ * 1: certain prime
+ * POLARSSL_ERR_MPI_NOT_ACCEPTABLE: certain non-prime
+ * other negative: error
  */
-int mpi_is_prime( mpi *X,
-                  int (*f_rng)(void *, unsigned char *, size_t),
-                  void *p_rng )
+static int mpi_check_small_factors( const mpi *X )
 {
-    int ret, xs;
-    size_t i, j, n, s;
-    mpi W, R, T, A, RR;
+    int ret = 0;
+    size_t i;
+    t_uint r;
 
-    if( mpi_cmp_int( X, 0 ) == 0 ||
-        mpi_cmp_int( X, 1 ) == 0 )
-        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
-
-    if( mpi_cmp_int( X, 2 ) == 0 )
-        return( 0 );
-
-    mpi_init( &W ); mpi_init( &R ); mpi_init( &T ); mpi_init( &A );
-    mpi_init( &RR );
-
-    xs = X->s; X->s = 1;
-
-    /*
-     * test trivial factors first
-     */
     if( ( X->p[0] & 1 ) == 0 )
         return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
 
     for( i = 0; small_prime[i] > 0; i++ )
     {
-        t_uint r;
-
         if( mpi_cmp_int( X, small_prime[i] ) <= 0 )
-            return( 0 );
+            return( 1 );
 
         MPI_CHK( mpi_mod_int( &r, X, small_prime[i] ) );
 
@@ -1823,6 +1958,24 @@ int mpi_is_prime( mpi *X,
             return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
     }
 
+cleanup:
+    return( ret );
+}
+
+/*
+ * Miller-Rabin pseudo-primality test  (HAC 4.24)
+ */
+static int mpi_miller_rabin( const mpi *X,
+                             int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng )
+{
+    int ret;
+    size_t i, j, n, s;
+    mpi W, R, T, A, RR;
+
+    mpi_init( &W ); mpi_init( &R ); mpi_init( &T ); mpi_init( &A );
+    mpi_init( &RR );
+
     /*
      * W = |X| - 1
      * R = W >> lsb( W )
@@ -1890,15 +2043,40 @@ int mpi_is_prime( mpi *X,
     }
 
 cleanup:
-
-    X->s = xs;
-
     mpi_free( &W ); mpi_free( &R ); mpi_free( &T ); mpi_free( &A );
     mpi_free( &RR );
 
     return( ret );
 }
 
+/*
+ * Pseudo-primality test: small factors, then Miller-Rabin
+ */
+int mpi_is_prime( mpi *X,
+                  int (*f_rng)(void *, unsigned char *, size_t),
+                  void *p_rng )
+{
+    int ret;
+    const mpi XX = { 1, X->n, X->p }; /* Abs(X) */
+
+    if( mpi_cmp_int( &XX, 0 ) == 0 ||
+        mpi_cmp_int( &XX, 1 ) == 0 )
+        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+
+    if( mpi_cmp_int( &XX, 2 ) == 0 )
+        return( 0 );
+
+    if( ( ret = mpi_check_small_factors( &XX ) ) != 0 )
+    {
+        if( ret == 1 )
+            return( 0 );
+
+        return( ret );
+    }
+
+    return( mpi_miller_rabin( &XX, f_rng, p_rng ) );
+}
+
 /*
  * Prime number generation
  */
@@ -1908,6 +2086,7 @@ int mpi_gen_prime( mpi *X, size_t nbits, int dh_flag,
 {
     int ret;
     size_t k, n;
+    t_uint r;
     mpi Y;
 
     if( nbits < 3 || nbits > POLARSSL_MPI_MAX_BITS )
@@ -1937,26 +2116,45 @@ int mpi_gen_prime( mpi *X, size_t nbits, int dh_flag,
     }
     else
     {
-        MPI_CHK( mpi_sub_int( &Y, X, 1 ) );
+        /*
+         * An necessary condition for Y and X = 2Y + 1 to be prime
+         * is X = 2 mod 3 (which is equivalent to Y = 2 mod 3).
+         * Make sure it is satisfied, while keeping X = 3 mod 4
+         */
+        MPI_CHK( mpi_mod_int( &r, X, 3 ) );
+        if( r == 0 )
+            MPI_CHK( mpi_add_int( X, X, 8 ) );
+        else if( r == 1 )
+            MPI_CHK( mpi_add_int( X, X, 4 ) );
+
+        /* Set Y = (X-1) / 2, which is X / 2 because X is odd */
+        MPI_CHK( mpi_copy( &Y, X ) );
         MPI_CHK( mpi_shift_r( &Y, 1 ) );
 
         while( 1 )
         {
-            if( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) == 0 )
+            /*
+             * First, check small factors for X and Y
+             * before doing Miller-Rabin on any of them
+             */
+            if( ( ret = mpi_check_small_factors(  X         ) ) == 0 &&
+                ( ret = mpi_check_small_factors( &Y         ) ) == 0 &&
+                ( ret = mpi_miller_rabin(  X, f_rng, p_rng  ) ) == 0 &&
+                ( ret = mpi_miller_rabin( &Y, f_rng, p_rng  ) ) == 0 )
             {
-                if( ( ret = mpi_is_prime( &Y, f_rng, p_rng ) ) == 0 )
-                    break;
-
-                if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
-                    goto cleanup;
+                break;
             }
 
             if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
                 goto cleanup;
 
-            MPI_CHK( mpi_add_int( &Y, X, 1 ) );
-            MPI_CHK( mpi_add_int(  X, X, 2 ) );
-            MPI_CHK( mpi_shift_r( &Y, 1 ) );
+            /*
+             * Next candidates. We want to preserve Y = (X-1) / 2 and
+             * Y = 1 mod 2 and Y = 2 mod 3 (eq X = 3 mod 4 and X = 2 mod 3)
+             * so up Y by 6 and X by 12.
+             */
+            MPI_CHK( mpi_add_int(  X,  X, 12 ) );
+            MPI_CHK( mpi_add_int( &Y, &Y, 6  ) );
         }
     }
 
@@ -1967,7 +2165,7 @@ cleanup:
     return( ret );
 }
 
-#endif
+#endif /* POLARSSL_GENPRIME */
 
 #if defined(POLARSSL_SELF_TEST)
 
@@ -2020,18 +2218,19 @@ int mpi_self_test( int verbose )
         "30879B56C61DE584A0F53A2447A51E" ) );
 
     if( verbose != 0 )
-        printf( "  MPI test #1 (mul_mpi): " );
+        polarssl_printf( "  MPI test #1 (mul_mpi): " );
 
     if( mpi_cmp_mpi( &X, &U ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
-        return( 1 );
+        ret = 1;
+        goto cleanup;
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
 
     MPI_CHK( mpi_div_mpi( &X, &Y, &A, &N ) );
 
@@ -2044,19 +2243,20 @@ int mpi_self_test( int verbose )
         "9EE50D0657C77F374E903CDFA4C642" ) );
 
     if( verbose != 0 )
-        printf( "  MPI test #2 (div_mpi): " );
+        polarssl_printf( "  MPI test #2 (div_mpi): " );
 
     if( mpi_cmp_mpi( &X, &U ) != 0 ||
         mpi_cmp_mpi( &Y, &V ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
-        return( 1 );
+        ret = 1;
+        goto cleanup;
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
 
     MPI_CHK( mpi_exp_mod( &X, &A, &E, &N, NULL ) );
 
@@ -2066,20 +2266,20 @@ int mpi_self_test( int verbose )
         "325D24D6A3C12710F10A09FA08AB87" ) );
 
     if( verbose != 0 )
-        printf( "  MPI test #3 (exp_mod): " );
+        polarssl_printf( "  MPI test #3 (exp_mod): " );
 
     if( mpi_cmp_mpi( &X, &U ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
-        return( 1 );
+        ret = 1;
+        goto cleanup;
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
 
-#if defined(POLARSSL_GENPRIME)
     MPI_CHK( mpi_inv_mod( &X, &A, &N ) );
 
     MPI_CHK( mpi_read_string( &U, 16,
@@ -2088,56 +2288,57 @@ int mpi_self_test( int verbose )
         "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
 
     if( verbose != 0 )
-        printf( "  MPI test #4 (inv_mod): " );
+        polarssl_printf( "  MPI test #4 (inv_mod): " );
 
     if( mpi_cmp_mpi( &X, &U ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
-        return( 1 );
+        ret = 1;
+        goto cleanup;
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
-#endif
+        polarssl_printf( "passed\n" );
 
     if( verbose != 0 )
-        printf( "  MPI test #5 (simple gcd): " );
+        polarssl_printf( "  MPI test #5 (simple gcd): " );
 
-    for ( i = 0; i < GCD_PAIR_COUNT; i++)
+    for( i = 0; i < GCD_PAIR_COUNT; i++ )
     {
         MPI_CHK( mpi_lset( &X, gcd_pairs[i][0] ) );
         MPI_CHK( mpi_lset( &Y, gcd_pairs[i][1] ) );
 
-	    MPI_CHK( mpi_gcd( &A, &X, &Y ) );
+        MPI_CHK( mpi_gcd( &A, &X, &Y ) );
 
-	    if( mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
-	    {
-		    if( verbose != 0 )
-			    printf( "failed at %d\n", i );
+        if( mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed at %d\n", i );
 
-		    return( 1 );
-	    }
+            ret = 1;
+            goto cleanup;
+        }
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
 
 cleanup:
 
     if( ret != 0 && verbose != 0 )
-        printf( "Unexpected error, return code = %08X\n", ret );
+        polarssl_printf( "Unexpected error, return code = %08X\n", ret );
 
     mpi_free( &A ); mpi_free( &E ); mpi_free( &N ); mpi_free( &X );
     mpi_free( &Y ); mpi_free( &U ); mpi_free( &V );
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_BIGNUM_C */
diff --git a/Externals/polarssl/library/blowfish.c b/Externals/polarssl/library/blowfish.c
index 719aea61af..87396dc22a 100644
--- a/Externals/polarssl/library/blowfish.c
+++ b/Externals/polarssl/library/blowfish.c
@@ -1,7 +1,7 @@
 /*
  *  Blowfish implementation
  *
- *  Copyright (C) 2012-2013, Brainspark B.V.
+ *  Copyright (C) 2012-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_BLOWFISH_C)
 
@@ -37,6 +41,11 @@
 
 #if !defined(POLARSSL_BLOWFISH_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * 32-bit integer manipulation macros (big endian)
  */
@@ -71,7 +80,7 @@ static const uint32_t P[BLOWFISH_ROUNDS + 2] = {
 /* declarations of data at the end of this file */
 static const uint32_t S[4][256];
 
-static uint32_t F(blowfish_context *ctx, uint32_t x) 
+static uint32_t F( blowfish_context *ctx, uint32_t x )
 {
    unsigned short a, b, c, d;
    uint32_t  y;
@@ -87,10 +96,10 @@ static uint32_t F(blowfish_context *ctx, uint32_t x)
    y = y ^ ctx->S[2][c];
    y = y + ctx->S[3][d];
 
-   return y;
+   return( y );
 }
 
-static void blowfish_enc(blowfish_context *ctx, uint32_t *xl, uint32_t *xr) 
+static void blowfish_enc( blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
 {
     uint32_t  Xl, Xr, temp;
     short i;
@@ -98,10 +107,10 @@ static void blowfish_enc(blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
     Xl = *xl;
     Xr = *xr;
 
-    for (i = 0; i < BLOWFISH_ROUNDS; ++i) 
+    for( i = 0; i < BLOWFISH_ROUNDS; ++i )
     {
         Xl = Xl ^ ctx->P[i];
-        Xr = F(ctx, Xl) ^ Xr;
+        Xr = F( ctx, Xl ) ^ Xr;
 
         temp = Xl;
         Xl = Xr;
@@ -119,7 +128,7 @@ static void blowfish_enc(blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
     *xr = Xr;
 }
 
-static void blowfish_dec(blowfish_context *ctx, uint32_t *xl, uint32_t *xr) 
+static void blowfish_dec( blowfish_context *ctx, uint32_t *xl, uint32_t *xr )
 {
     uint32_t  Xl, Xr, temp;
     short i;
@@ -127,10 +136,10 @@ static void blowfish_dec(blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
     Xl = *xl;
     Xr = *xr;
 
-    for (i = BLOWFISH_ROUNDS + 1; i > 1; --i) 
+    for( i = BLOWFISH_ROUNDS + 1; i > 1; --i )
     {
         Xl = Xl ^ ctx->P[i];
-        Xr = F(ctx, Xl) ^ Xr;
+        Xr = F( ctx, Xl ) ^ Xr;
 
         temp = Xl;
         Xl = Xr;
@@ -148,23 +157,37 @@ static void blowfish_dec(blowfish_context *ctx, uint32_t *xl, uint32_t *xr)
     *xr = Xr;
 }
 
+void blowfish_init( blowfish_context *ctx )
+{
+    memset( ctx, 0, sizeof( blowfish_context ) );
+}
+
+void blowfish_free( blowfish_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( blowfish_context ) );
+}
+
 /*
  * Blowfish key schedule
  */
-int blowfish_setkey( blowfish_context *ctx, const unsigned char *key, unsigned int keysize )
+int blowfish_setkey( blowfish_context *ctx, const unsigned char *key,
+                     unsigned int keysize )
 {
     unsigned int i, j, k;
     uint32_t data, datal, datar;
 
     if( keysize < BLOWFISH_MIN_KEY || keysize > BLOWFISH_MAX_KEY ||
-        ( keysize % 8 ) ) 
+        ( keysize % 8 ) )
     {
-        return POLARSSL_ERR_BLOWFISH_INVALID_KEY_LENGTH;
+        return( POLARSSL_ERR_BLOWFISH_INVALID_KEY_LENGTH );
     }
 
     keysize >>= 3;
 
-    for( i = 0; i < 4; i++ ) 
+    for( i = 0; i < 4; i++ )
     {
         for( j = 0; j < 256; j++ )
             ctx->S[i][j] = S[i][j];
@@ -215,16 +238,16 @@ int blowfish_crypt_ecb( blowfish_context *ctx,
 {
     uint32_t X0, X1;
 
-    GET_UINT32_BE( X0, input,  0 ); 
-    GET_UINT32_BE( X1, input,  4 ); 
+    GET_UINT32_BE( X0, input,  0 );
+    GET_UINT32_BE( X1, input,  4 );
 
     if( mode == BLOWFISH_DECRYPT )
     {
-        blowfish_dec(ctx, &X0, &X1);
+        blowfish_dec( ctx, &X0, &X1 );
     }
     else /* BLOWFISH_ENCRYPT */
     {
-        blowfish_enc(ctx, &X0, &X1);
+        blowfish_enc( ctx, &X0, &X1 );
     }
 
     PUT_UINT32_BE( X0, output,  0 );
@@ -233,6 +256,7 @@ int blowfish_crypt_ecb( blowfish_context *ctx,
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * Blowfish-CBC buffer encryption/decryption
  */
@@ -284,6 +308,7 @@ int blowfish_crypt_cbc( blowfish_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 /*
@@ -311,7 +336,7 @@ int blowfish_crypt_cfb64( blowfish_context *ctx,
             *output++ = (unsigned char)( c ^ iv[n] );
             iv[n] = (unsigned char) c;
 
-            n = (n + 1) % BLOWFISH_BLOCKSIZE;
+            n = ( n + 1 ) % BLOWFISH_BLOCKSIZE;
         }
     }
     else
@@ -323,7 +348,7 @@ int blowfish_crypt_cfb64( blowfish_context *ctx,
 
             iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
 
-            n = (n + 1) % BLOWFISH_BLOCKSIZE;
+            n = ( n + 1 ) % BLOWFISH_BLOCKSIZE;
         }
     }
 
@@ -351,7 +376,8 @@ int blowfish_crypt_ctr( blowfish_context *ctx,
     while( length-- )
     {
         if( n == 0 ) {
-            blowfish_crypt_ecb( ctx, BLOWFISH_ENCRYPT, nonce_counter, stream_block );
+            blowfish_crypt_ecb( ctx, BLOWFISH_ENCRYPT, nonce_counter,
+                                stream_block );
 
             for( i = BLOWFISH_BLOCKSIZE; i > 0; i-- )
                 if( ++nonce_counter[i - 1] != 0 )
@@ -360,7 +386,7 @@ int blowfish_crypt_ctr( blowfish_context *ctx,
         c = *input++;
         *output++ = (unsigned char)( c ^ stream_block[n] );
 
-        n = (n + 1) % BLOWFISH_BLOCKSIZE;
+        n = ( n + 1 ) % BLOWFISH_BLOCKSIZE;
     }
 
     *nc_off = n;
diff --git a/Externals/polarssl/library/camellia.c b/Externals/polarssl/library/camellia.c
index bb8787503b..a4968f411e 100644
--- a/Externals/polarssl/library/camellia.c
+++ b/Externals/polarssl/library/camellia.c
@@ -1,7 +1,7 @@
 /*
  *  Camellia implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,14 +29,29 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/01espec.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_CAMELLIA_C)
 
 #include "polarssl/camellia.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 #if !defined(POLARSSL_CAMELLIA_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * 32-bit integer manipulation macros (big endian)
  */
@@ -97,86 +112,86 @@ static const unsigned char FSb[256] =
 #define SBOX3(n) (unsigned char)((FSb[(n)] >> 1 ^ FSb[(n)] << 7) & 0xff)
 #define SBOX4(n) FSb[((n) << 1 ^ (n) >> 7) &0xff]
 
-#else
+#else /* POLARSSL_CAMELLIA_SMALL_MEMORY */
 
 static const unsigned char FSb[256] =
 {
-    112, 130,  44, 236, 179,  39, 192, 229, 228, 133,  87,  53, 234,  12, 174,  65,
-    35, 239, 107, 147,  69,  25, 165,  33, 237,  14,  79,  78,  29, 101, 146, 189,
-    134, 184, 175, 143, 124, 235,  31, 206,  62,  48, 220,  95,  94, 197,  11,  26,
-    166, 225,  57, 202, 213,  71,  93,  61, 217,   1,  90, 214,  81,  86, 108,  77,
-    139,  13, 154, 102, 251, 204, 176,  45, 116,  18,  43,  32, 240, 177, 132, 153,
-    223,  76, 203, 194,  52, 126, 118,   5, 109, 183, 169,  49, 209,  23,   4, 215,
-    20,  88,  58,  97, 222,  27,  17,  28,  50,  15, 156,  22,  83,  24, 242,  34,
-    254,  68, 207, 178, 195, 181, 122, 145,  36,   8, 232, 168,  96, 252, 105,  80,
-    170, 208, 160, 125, 161, 137,  98, 151,  84,  91,  30, 149, 224, 255, 100, 210,
-    16, 196,   0,  72, 163, 247, 117, 219, 138,   3, 230, 218,   9,  63, 221, 148,
-    135,  92, 131,   2, 205,  74, 144,  51, 115, 103, 246, 243, 157, 127, 191, 226,
-    82, 155, 216,  38, 200,  55, 198,  59, 129, 150, 111,  75,  19, 190,  99,  46,
-    233, 121, 167, 140, 159, 110, 188, 142,  41, 245, 249, 182,  47, 253, 180,  89,
-    120, 152,   6, 106, 231,  70, 113, 186, 212,  37, 171,  66, 136, 162, 141, 250,
-    114,   7, 185,  85, 248, 238, 172,  10,  54,  73,  42, 104,  60,  56, 241, 164,
-    64,  40, 211, 123, 187, 201,  67, 193,  21, 227, 173, 244, 119, 199, 128, 158
+ 112, 130,  44, 236, 179,  39, 192, 229, 228, 133,  87,  53, 234,  12, 174,  65,
+  35, 239, 107, 147,  69,  25, 165,  33, 237,  14,  79,  78,  29, 101, 146, 189,
+ 134, 184, 175, 143, 124, 235,  31, 206,  62,  48, 220,  95,  94, 197,  11,  26,
+ 166, 225,  57, 202, 213,  71,  93,  61, 217,   1,  90, 214,  81,  86, 108,  77,
+ 139,  13, 154, 102, 251, 204, 176,  45, 116,  18,  43,  32, 240, 177, 132, 153,
+ 223,  76, 203, 194,  52, 126, 118,   5, 109, 183, 169,  49, 209,  23,   4, 215,
+  20,  88,  58,  97, 222,  27,  17,  28,  50,  15, 156,  22,  83,  24, 242,  34,
+ 254,  68, 207, 178, 195, 181, 122, 145,  36,   8, 232, 168,  96, 252, 105,  80,
+ 170, 208, 160, 125, 161, 137,  98, 151,  84,  91,  30, 149, 224, 255, 100, 210,
+  16, 196,   0,  72, 163, 247, 117, 219, 138,   3, 230, 218,   9,  63, 221, 148,
+ 135,  92, 131,   2, 205,  74, 144,  51, 115, 103, 246, 243, 157, 127, 191, 226,
+  82, 155, 216,  38, 200,  55, 198,  59, 129, 150, 111,  75,  19, 190,  99,  46,
+ 233, 121, 167, 140, 159, 110, 188, 142,  41, 245, 249, 182,  47, 253, 180,  89,
+ 120, 152,   6, 106, 231,  70, 113, 186, 212,  37, 171,  66, 136, 162, 141, 250,
+ 114,   7, 185,  85, 248, 238, 172,  10,  54,  73,  42, 104,  60,  56, 241, 164,
+ 64,  40, 211, 123, 187, 201,  67, 193,  21, 227, 173, 244, 119, 199, 128, 158
 };
 
 static const unsigned char FSb2[256] =
 {
-    224,   5,  88, 217, 103,  78, 129, 203, 201,  11, 174, 106, 213,  24,  93, 130,
-    70, 223, 214,  39, 138,  50,  75,  66, 219,  28, 158, 156,  58, 202,  37, 123,
-    13, 113,  95,  31, 248, 215,  62, 157, 124,  96, 185, 190, 188, 139,  22,  52,
-    77, 195, 114, 149, 171, 142, 186, 122, 179,   2, 180, 173, 162, 172, 216, 154,
-    23,  26,  53, 204, 247, 153,  97,  90, 232,  36,  86,  64, 225,  99,   9,  51,
-    191, 152, 151, 133, 104, 252, 236,  10, 218, 111,  83,  98, 163,  46,   8, 175,
-    40, 176, 116, 194, 189,  54,  34,  56, 100,  30,  57,  44, 166,  48, 229,  68,
-    253, 136, 159, 101, 135, 107, 244,  35,  72,  16, 209,  81, 192, 249, 210, 160,
-    85, 161,  65, 250,  67,  19, 196,  47, 168, 182,  60,  43, 193, 255, 200, 165,
-    32, 137,   0, 144,  71, 239, 234, 183,  21,   6, 205, 181,  18, 126, 187,  41,
-    15, 184,   7,   4, 155, 148,  33, 102, 230, 206, 237, 231,  59, 254, 127, 197,
-    164,  55, 177,  76, 145, 110, 141, 118,   3,  45, 222, 150,  38, 125, 198,  92,
-    211, 242,  79,  25,  63, 220, 121,  29,  82, 235, 243, 109,  94, 251, 105, 178,
-    240,  49,  12, 212, 207, 140, 226, 117, 169,  74,  87, 132,  17,  69,  27, 245,
-    228,  14, 115, 170, 241, 221,  89,  20, 108, 146,  84, 208, 120, 112, 227,  73,
-    128,  80, 167, 246, 119, 147, 134, 131,  42, 199,  91, 233, 238, 143,   1,  61
+ 224,   5,  88, 217, 103,  78, 129, 203, 201,  11, 174, 106, 213,  24,  93, 130,
+  70, 223, 214,  39, 138,  50,  75,  66, 219,  28, 158, 156,  58, 202,  37, 123,
+  13, 113,  95,  31, 248, 215,  62, 157, 124,  96, 185, 190, 188, 139,  22,  52,
+  77, 195, 114, 149, 171, 142, 186, 122, 179,   2, 180, 173, 162, 172, 216, 154,
+  23,  26,  53, 204, 247, 153,  97,  90, 232,  36,  86,  64, 225,  99,   9,  51,
+ 191, 152, 151, 133, 104, 252, 236,  10, 218, 111,  83,  98, 163,  46,   8, 175,
+  40, 176, 116, 194, 189,  54,  34,  56, 100,  30,  57,  44, 166,  48, 229,  68,
+ 253, 136, 159, 101, 135, 107, 244,  35,  72,  16, 209,  81, 192, 249, 210, 160,
+  85, 161,  65, 250,  67,  19, 196,  47, 168, 182,  60,  43, 193, 255, 200, 165,
+  32, 137,   0, 144,  71, 239, 234, 183,  21,   6, 205, 181,  18, 126, 187,  41,
+  15, 184,   7,   4, 155, 148,  33, 102, 230, 206, 237, 231,  59, 254, 127, 197,
+ 164,  55, 177,  76, 145, 110, 141, 118,   3,  45, 222, 150,  38, 125, 198,  92,
+ 211, 242,  79,  25,  63, 220, 121,  29,  82, 235, 243, 109,  94, 251, 105, 178,
+ 240,  49,  12, 212, 207, 140, 226, 117, 169,  74,  87, 132,  17,  69,  27, 245,
+ 228,  14, 115, 170, 241, 221,  89,  20, 108, 146,  84, 208, 120, 112, 227,  73,
+ 128,  80, 167, 246, 119, 147, 134, 131,  42, 199,  91, 233, 238, 143,   1,  61
 };
 
 static const unsigned char FSb3[256] =
 {
-    56,  65,  22, 118, 217, 147,  96, 242, 114, 194, 171, 154, 117,   6,  87, 160,
-    145, 247, 181, 201, 162, 140, 210, 144, 246,   7, 167,  39, 142, 178,  73, 222,
-    67,  92, 215, 199,  62, 245, 143, 103,  31,  24, 110, 175,  47, 226, 133,  13,
-    83, 240, 156, 101, 234, 163, 174, 158, 236, 128,  45, 107, 168,  43,  54, 166,
-    197, 134,  77,  51, 253, 102,  88, 150,  58,   9, 149,  16, 120, 216,  66, 204,
-    239,  38, 229,  97,  26,  63,  59, 130, 182, 219, 212, 152, 232, 139,   2, 235,
-    10,  44,  29, 176, 111, 141, 136,  14,  25, 135,  78,  11, 169,  12, 121,  17,
-    127,  34, 231,  89, 225, 218,  61, 200,  18,   4, 116,  84,  48, 126, 180,  40,
-    85, 104,  80, 190, 208, 196,  49, 203,  42, 173,  15, 202, 112, 255,  50, 105,
-    8,  98,   0,  36, 209, 251, 186, 237,  69, 129, 115, 109, 132, 159, 238,  74,
-    195,  46, 193,   1, 230,  37,  72, 153, 185, 179, 123, 249, 206, 191, 223, 113,
-    41, 205, 108,  19, 100, 155,  99, 157, 192,  75, 183, 165, 137,  95, 177,  23,
-    244, 188, 211,  70, 207,  55,  94,  71, 148, 250, 252,  91, 151, 254,  90, 172,
-    60,  76,   3,  53, 243,  35, 184,  93, 106, 146, 213,  33,  68,  81, 198, 125,
-    57, 131, 220, 170, 124, 119,  86,   5,  27, 164,  21,  52,  30,  28, 248,  82,
-    32,  20, 233, 189, 221, 228, 161, 224, 138, 241, 214, 122, 187, 227,  64,  79
+  56,  65,  22, 118, 217, 147,  96, 242, 114, 194, 171, 154, 117,   6,  87, 160,
+ 145, 247, 181, 201, 162, 140, 210, 144, 246,   7, 167,  39, 142, 178,  73, 222,
+  67,  92, 215, 199,  62, 245, 143, 103,  31,  24, 110, 175,  47, 226, 133,  13,
+  83, 240, 156, 101, 234, 163, 174, 158, 236, 128,  45, 107, 168,  43,  54, 166,
+ 197, 134,  77,  51, 253, 102,  88, 150,  58,   9, 149,  16, 120, 216,  66, 204,
+ 239,  38, 229,  97,  26,  63,  59, 130, 182, 219, 212, 152, 232, 139,   2, 235,
+  10,  44,  29, 176, 111, 141, 136,  14,  25, 135,  78,  11, 169,  12, 121,  17,
+ 127,  34, 231,  89, 225, 218,  61, 200,  18,   4, 116,  84,  48, 126, 180,  40,
+  85, 104,  80, 190, 208, 196,  49, 203,  42, 173,  15, 202, 112, 255,  50, 105,
+   8,  98,   0,  36, 209, 251, 186, 237,  69, 129, 115, 109, 132, 159, 238,  74,
+ 195,  46, 193,   1, 230,  37,  72, 153, 185, 179, 123, 249, 206, 191, 223, 113,
+  41, 205, 108,  19, 100, 155,  99, 157, 192,  75, 183, 165, 137,  95, 177,  23,
+ 244, 188, 211,  70, 207,  55,  94,  71, 148, 250, 252,  91, 151, 254,  90, 172,
+  60,  76,   3,  53, 243,  35, 184,  93, 106, 146, 213,  33,  68,  81, 198, 125,
+  57, 131, 220, 170, 124, 119,  86,   5,  27, 164,  21,  52,  30,  28, 248,  82,
+  32,  20, 233, 189, 221, 228, 161, 224, 138, 241, 214, 122, 187, 227,  64,  79
 };
 
 static const unsigned char FSb4[256] =
 {
-    112,  44, 179, 192, 228,  87, 234, 174,  35, 107,  69, 165, 237,  79,  29, 146,
-    134, 175, 124,  31,  62, 220,  94,  11, 166,  57, 213,  93, 217,  90,  81, 108,
-    139, 154, 251, 176, 116,  43, 240, 132, 223, 203,  52, 118, 109, 169, 209,   4,
-    20,  58, 222,  17,  50, 156,  83, 242, 254, 207, 195, 122,  36, 232,  96, 105,
-    170, 160, 161,  98,  84,  30, 224, 100,  16,   0, 163, 117, 138, 230,   9, 221,
-    135, 131, 205, 144, 115, 246, 157, 191,  82, 216, 200, 198, 129, 111,  19,  99,
-    233, 167, 159, 188,  41, 249,  47, 180, 120,   6, 231, 113, 212, 171, 136, 141,
-    114, 185, 248, 172,  54,  42,  60, 241,  64, 211, 187,  67,  21, 173, 119, 128,
-    130, 236,  39, 229, 133,  53,  12,  65, 239, 147,  25,  33,  14,  78, 101, 189,
-    184, 143, 235, 206,  48,  95, 197,  26, 225, 202,  71,  61,   1, 214,  86,  77,
-    13, 102, 204,  45,  18,  32, 177, 153,  76, 194, 126,   5, 183,  49,  23, 215,
-    88,  97,  27,  28,  15,  22,  24,  34,  68, 178, 181, 145,   8, 168, 252,  80,
-    208, 125, 137, 151,  91, 149, 255, 210, 196,  72, 247, 219,   3, 218,  63, 148,
-    92,   2,  74,  51, 103, 243, 127, 226, 155,  38,  55,  59, 150,  75, 190,  46,
-    121, 140, 110, 142, 245, 182, 253,  89, 152, 106,  70, 186,  37,  66, 162, 250,
-    7,  85, 238,  10,  73, 104,  56, 164,  40, 123, 201, 193, 227, 244, 199, 158
+ 112,  44, 179, 192, 228,  87, 234, 174,  35, 107,  69, 165, 237,  79,  29, 146,
+ 134, 175, 124,  31,  62, 220,  94,  11, 166,  57, 213,  93, 217,  90,  81, 108,
+ 139, 154, 251, 176, 116,  43, 240, 132, 223, 203,  52, 118, 109, 169, 209,   4,
+  20,  58, 222,  17,  50, 156,  83, 242, 254, 207, 195, 122,  36, 232,  96, 105,
+ 170, 160, 161,  98,  84,  30, 224, 100,  16,   0, 163, 117, 138, 230,   9, 221,
+ 135, 131, 205, 144, 115, 246, 157, 191,  82, 216, 200, 198, 129, 111,  19,  99,
+ 233, 167, 159, 188,  41, 249,  47, 180, 120,   6, 231, 113, 212, 171, 136, 141,
+ 114, 185, 248, 172,  54,  42,  60, 241,  64, 211, 187,  67,  21, 173, 119, 128,
+ 130, 236,  39, 229, 133,  53,  12,  65, 239, 147,  25,  33,  14,  78, 101, 189,
+ 184, 143, 235, 206,  48,  95, 197,  26, 225, 202,  71,  61,   1, 214,  86,  77,
+  13, 102, 204,  45,  18,  32, 177, 153,  76, 194, 126,   5, 183,  49,  23, 215,
+  88,  97,  27,  28,  15,  22,  24,  34,  68, 178, 181, 145,   8, 168, 252,  80,
+ 208, 125, 137, 151,  91, 149, 255, 210, 196,  72, 247, 219,   3, 218,  63, 148,
+  92,   2,  74,  51, 103, 243, 127, 226, 155,  38,  55,  59, 150,  75, 190,  46,
+ 121, 140, 110, 142, 245, 182, 253,  89, 152, 106,  70, 186,  37,  66, 162, 250,
+  7,  85, 238,  10,  73, 104,  56, 164,  40, 123, 201, 193, 227, 244, 199, 158
 };
 
 #define SBOX1(n) FSb[(n)]
@@ -184,7 +199,7 @@ static const unsigned char FSb4[256] =
 #define SBOX3(n) FSb3[(n)]
 #define SBOX4(n) FSb4[(n)]
 
-#endif
+#endif /* POLARSSL_CAMELLIA_SMALL_MEMORY */
 
 static const unsigned char shifts[2][4][4] =
 {
@@ -258,13 +273,13 @@ static const signed char transposes[2][20] =
     (XR) = ((((XL) & (KL)) << 1) | (((XL) & (KL)) >> 31)) ^ (XR);   \
     (XL) = ((XR) | (KR)) ^ (XL);                                    \
 }
-    
+
 #define FLInv(YL, YR, KL, KR)                                       \
 {                                                                   \
     (YL) = ((YR) | (KR)) ^ (YL);                                    \
     (YR) = ((((YL) & (KL)) << 1) | (((YL) & (KL)) >> 31)) ^ (YR);   \
 }
-    
+
 #define SHIFT_AND_PLACE(INDEX, OFFSET)                      \
 {                                                           \
     TK[0] = KC[(OFFSET) * 4 + 0];                           \
@@ -272,17 +287,18 @@ static const signed char transposes[2][20] =
     TK[2] = KC[(OFFSET) * 4 + 2];                           \
     TK[3] = KC[(OFFSET) * 4 + 3];                           \
                                                             \
-    for ( i = 1; i <= 4; i++ )                              \
-        if (shifts[(INDEX)][(OFFSET)][i -1])                \
-            ROTL(TK + i * 4, TK, (15 * i) % 32);            \
+    for( i = 1; i <= 4; i++ )                               \
+        if( shifts[(INDEX)][(OFFSET)][i -1] )               \
+            ROTL(TK + i * 4, TK, ( 15 * i ) % 32);          \
                                                             \
-    for ( i = 0; i < 20; i++ )                              \
-        if (indexes[(INDEX)][(OFFSET)][i] != -1) {          \
-        RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ];        \
-    }                                                       \
+    for( i = 0; i < 20; i++ )                               \
+        if( indexes[(INDEX)][(OFFSET)][i] != -1 ) {         \
+            RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ];    \
+        }                                                   \
 }
 
-static void camellia_feistel(const uint32_t x[2], const uint32_t k[2], uint32_t z[2])
+static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
+                              uint32_t z[2])
 {
     uint32_t I0, I1;
     I0 = x[0] ^ k[0];
@@ -306,10 +322,24 @@ static void camellia_feistel(const uint32_t x[2], const uint32_t k[2], uint32_t
     z[1] ^= I0;
 }
 
+void camellia_init( camellia_context *ctx )
+{
+    memset( ctx, 0, sizeof( camellia_context ) );
+}
+
+void camellia_free( camellia_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( camellia_context ) );
+}
+
 /*
  * Camellia key schedule (encryption)
  */
-int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsigned int keysize )
+int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key,
+                         unsigned int keysize )
 {
     int idx;
     size_t i;
@@ -321,8 +351,8 @@ int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsign
 
     RK = ctx->rk;
 
-    memset(t, 0, 64);
-    memset(RK, 0, sizeof(ctx->rk));
+    memset( t, 0, 64 );
+    memset( RK, 0, sizeof(ctx->rk) );
 
     switch( keysize )
     {
@@ -332,77 +362,77 @@ int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsign
         default : return( POLARSSL_ERR_CAMELLIA_INVALID_KEY_LENGTH );
     }
 
-    for( i = 0; i < keysize / 8; ++i)
+    for( i = 0; i < keysize / 8; ++i )
         t[i] = key[i];
 
-    if (keysize == 192) {
-        for (i = 0; i < 8; i++)
+    if( keysize == 192 ) {
+        for( i = 0; i < 8; i++ )
             t[24 + i] = ~t[16 + i];
     }
 
     /*
      * Prepare SIGMA values
      */
-    for (i = 0; i < 6; i++) {
-        GET_UINT32_BE(SIGMA[i][0], SIGMA_CHARS[i], 0);
-        GET_UINT32_BE(SIGMA[i][1], SIGMA_CHARS[i], 4);
+    for( i = 0; i < 6; i++ ) {
+        GET_UINT32_BE( SIGMA[i][0], SIGMA_CHARS[i], 0 );
+        GET_UINT32_BE( SIGMA[i][1], SIGMA_CHARS[i], 4 );
     }
 
     /*
      * Key storage in KC
      * Order: KL, KR, KA, KB
      */
-    memset(KC, 0, sizeof(KC));
+    memset( KC, 0, sizeof(KC) );
 
     /* Store KL, KR */
-    for (i = 0; i < 8; i++)
-        GET_UINT32_BE(KC[i], t, i * 4);
+    for( i = 0; i < 8; i++ )
+        GET_UINT32_BE( KC[i], t, i * 4 );
 
     /* Generate KA */
-    for( i = 0; i < 4; ++i)
+    for( i = 0; i < 4; ++i )
         KC[8 + i] = KC[i] ^ KC[4 + i];
 
-    camellia_feistel(KC + 8, SIGMA[0], KC + 10);
-    camellia_feistel(KC + 10, SIGMA[1], KC + 8);
+    camellia_feistel( KC + 8, SIGMA[0], KC + 10 );
+    camellia_feistel( KC + 10, SIGMA[1], KC + 8 );
 
-    for( i = 0; i < 4; ++i)
+    for( i = 0; i < 4; ++i )
         KC[8 + i] ^= KC[i];
 
-    camellia_feistel(KC + 8, SIGMA[2], KC + 10);
-    camellia_feistel(KC + 10, SIGMA[3], KC + 8);
+    camellia_feistel( KC + 8, SIGMA[2], KC + 10 );
+    camellia_feistel( KC + 10, SIGMA[3], KC + 8 );
 
-    if (keysize > 128) {
+    if( keysize > 128 ) {
         /* Generate KB */
-        for( i = 0; i < 4; ++i)
+        for( i = 0; i < 4; ++i )
             KC[12 + i] = KC[4 + i] ^ KC[8 + i];
 
-        camellia_feistel(KC + 12, SIGMA[4], KC + 14);
-        camellia_feistel(KC + 14, SIGMA[5], KC + 12);
+        camellia_feistel( KC + 12, SIGMA[4], KC + 14 );
+        camellia_feistel( KC + 14, SIGMA[5], KC + 12 );
     }
 
     /*
      * Generating subkeys
-     */ 
+     */
 
     /* Manipulating KL */
-    SHIFT_AND_PLACE(idx, 0);
+    SHIFT_AND_PLACE( idx, 0 );
 
     /* Manipulating KR */
-    if (keysize > 128) {
-        SHIFT_AND_PLACE(idx, 1);
+    if( keysize > 128 ) {
+        SHIFT_AND_PLACE( idx, 1 );
     }
 
     /* Manipulating KA */
-    SHIFT_AND_PLACE(idx, 2);
+    SHIFT_AND_PLACE( idx, 2 );
 
     /* Manipulating KB */
-    if (keysize > 128) {
-        SHIFT_AND_PLACE(idx, 3);
+    if( keysize > 128 ) {
+        SHIFT_AND_PLACE( idx, 3 );
     }
 
     /* Do transpositions */
-    for ( i = 0; i < 20; i++ ) {
-        if (transposes[idx][i] != -1) {
+    for( i = 0; i < 20; i++ ) {
+        if( transposes[idx][i] != -1 ) {
             RK[32 + 12 * idx + i] = RK[transposes[idx][i]];
         }
     }
@@ -413,29 +443,25 @@ int camellia_setkey_enc( camellia_context *ctx, const unsigned char *key, unsign
 /*
  * Camellia key schedule (decryption)
  */
-int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, unsigned int keysize )
+int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key,
+                         unsigned int keysize )
 {
-    int idx;
+    int idx, ret;
     size_t i;
     camellia_context cty;
     uint32_t *RK;
     uint32_t *SK;
-    int ret;
 
-    switch( keysize )
-    {
-        case 128: ctx->nr = 3; idx = 0; break;
-        case 192:
-        case 256: ctx->nr = 4; idx = 1; break;
-        default : return( POLARSSL_ERR_CAMELLIA_INVALID_KEY_LENGTH );
-    }
+    camellia_init( &cty );
+
+    /* Also checks keysize */
+    if( ( ret = camellia_setkey_enc( &cty, key, keysize ) ) )
+        goto exit;
+
+    ctx->nr = cty.nr;
+    idx = ( ctx->nr == 4 );
 
     RK = ctx->rk;
-
-    ret = camellia_setkey_enc(&cty, key, keysize);
-    if( ret != 0 )
-        return( ret );
-
     SK = cty.rk + 24 * 2 + 8 * idx * 2;
 
     *RK++ = *SK++;
@@ -443,7 +469,7 @@ int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, unsign
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-    for (i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4)
+    for( i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4 )
     {
         *RK++ = *SK++;
         *RK++ = *SK++;
@@ -456,9 +482,10 @@ int camellia_setkey_dec( camellia_context *ctx, const unsigned char *key, unsign
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-    memset( &cty, 0, sizeof( camellia_context ) );
+exit:
+    camellia_free( &cty );
 
-    return( 0 );
+    return( ret );
 }
 
 /*
@@ -487,22 +514,22 @@ int camellia_crypt_ecb( camellia_context *ctx,
     X[2] ^= *RK++;
     X[3] ^= *RK++;
 
-    while (NR) {
+    while( NR ) {
         --NR;
-        camellia_feistel(X, RK, X + 2);
+        camellia_feistel( X, RK, X + 2 );
         RK += 2;
-        camellia_feistel(X + 2, RK, X);
+        camellia_feistel( X + 2, RK, X );
         RK += 2;
-        camellia_feistel(X, RK, X + 2);
+        camellia_feistel( X, RK, X + 2 );
         RK += 2;
-        camellia_feistel(X + 2, RK, X);
+        camellia_feistel( X + 2, RK, X );
         RK += 2;
-        camellia_feistel(X, RK, X + 2);
+        camellia_feistel( X, RK, X + 2 );
         RK += 2;
-        camellia_feistel(X + 2, RK, X);
+        camellia_feistel( X + 2, RK, X );
         RK += 2;
 
-        if (NR) {
+        if( NR ) {
             FL(X[0], X[1], RK[0], RK[1]);
             RK += 2;
             FLInv(X[2], X[3], RK[0], RK[1]);
@@ -523,6 +550,7 @@ int camellia_crypt_ecb( camellia_context *ctx,
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * Camellia-CBC buffer encryption/decryption
  */
@@ -574,6 +602,7 @@ int camellia_crypt_cbc( camellia_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 /*
@@ -601,7 +630,7 @@ int camellia_crypt_cfb128( camellia_context *ctx,
             *output++ = (unsigned char)( c ^ iv[n] );
             iv[n] = (unsigned char) c;
 
-            n = (n + 1) & 0x0F;
+            n = ( n + 1 ) & 0x0F;
         }
     }
     else
@@ -613,7 +642,7 @@ int camellia_crypt_cfb128( camellia_context *ctx,
 
             iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
 
-            n = (n + 1) & 0x0F;
+            n = ( n + 1 ) & 0x0F;
         }
     }
 
@@ -641,7 +670,8 @@ int camellia_crypt_ctr( camellia_context *ctx,
     while( length-- )
     {
         if( n == 0 ) {
-            camellia_crypt_ecb( ctx, CAMELLIA_ENCRYPT, nonce_counter, stream_block );
+            camellia_crypt_ecb( ctx, CAMELLIA_ENCRYPT, nonce_counter,
+                                stream_block );
 
             for( i = 16; i > 0; i-- )
                 if( ++nonce_counter[i - 1] != 0 )
@@ -650,7 +680,7 @@ int camellia_crypt_ctr( camellia_context *ctx,
         c = *input++;
         *output++ = (unsigned char)( c ^ stream_block[n] );
 
-        n = (n + 1) & 0x0F;
+        n = ( n + 1 ) & 0x0F;
     }
 
     *nc_off = n;
@@ -679,14 +709,14 @@ static const unsigned char camellia_test_ecb_key[3][CAMELLIA_TESTS_ECB][32] =
     {
         { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
           0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
     },
     {
         { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
           0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
           0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
     },
@@ -695,7 +725,7 @@ static const unsigned char camellia_test_ecb_key[3][CAMELLIA_TESTS_ECB][32] =
           0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
           0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
           0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
-        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
@@ -706,7 +736,7 @@ static const unsigned char camellia_test_ecb_plain[CAMELLIA_TESTS_ECB][16] =
 {
     { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
       0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
-    { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+    { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
@@ -732,6 +762,7 @@ static const unsigned char camellia_test_ecb_cipher[3][CAMELLIA_TESTS_ECB][16] =
     }
 };
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 #define CAMELLIA_TESTS_CBC  3
 
 static const unsigned char camellia_test_cbc_key[3][32] =
@@ -793,6 +824,7 @@ static const unsigned char camellia_test_cbc_cipher[3][CAMELLIA_TESTS_CBC][16] =
           0x33, 0x30, 0xCD, 0xF1, 0xB1, 0x86, 0x0A, 0x83 }
     }
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CTR)
 /*
@@ -867,7 +899,9 @@ int camellia_self_test( int verbose )
     unsigned char buf[64];
     unsigned char src[16];
     unsigned char dst[16];
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     unsigned char iv[16];
+#endif
 #if defined(POLARSSL_CIPHER_MODE_CTR)
     size_t offset, len;
     unsigned char nonce_counter[16];
@@ -878,45 +912,46 @@ int camellia_self_test( int verbose )
 
     memset( key, 0, 32 );
 
-    for (j = 0; j < 6; j++) {
+    for( j = 0; j < 6; j++ ) {
         u = j >> 1;
     v = j & 1;
 
     if( verbose != 0 )
-        printf( "  CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
-                (v == CAMELLIA_DECRYPT) ? "dec" : "enc");
+        polarssl_printf( "  CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
+                         (v == CAMELLIA_DECRYPT) ? "dec" : "enc");
 
-    for (i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
-        memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u);
+    for( i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
+        memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u );
 
-        if (v == CAMELLIA_DECRYPT) {
-            camellia_setkey_dec(&ctx, key, 128 + u * 64);
-            memcpy(src, camellia_test_ecb_cipher[u][i], 16);
-            memcpy(dst, camellia_test_ecb_plain[i], 16);
+        if( v == CAMELLIA_DECRYPT ) {
+            camellia_setkey_dec( &ctx, key, 128 + u * 64 );
+            memcpy( src, camellia_test_ecb_cipher[u][i], 16 );
+            memcpy( dst, camellia_test_ecb_plain[i], 16 );
         } else { /* CAMELLIA_ENCRYPT */
-            camellia_setkey_enc(&ctx, key, 128 + u * 64);
-            memcpy(src, camellia_test_ecb_plain[i], 16);
-            memcpy(dst, camellia_test_ecb_cipher[u][i], 16);
+            camellia_setkey_enc( &ctx, key, 128 + u * 64 );
+            memcpy( src, camellia_test_ecb_plain[i], 16 );
+            memcpy( dst, camellia_test_ecb_cipher[u][i], 16 );
         }
 
-        camellia_crypt_ecb(&ctx, v, src, buf);
+        camellia_crypt_ecb( &ctx, v, src, buf );
 
         if( memcmp( buf, dst, 16 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
     }
 
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
@@ -926,48 +961,49 @@ int camellia_self_test( int verbose )
         v = j  & 1;
 
         if( verbose != 0 )
-            printf( "  CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
-                    ( v == CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
+                             ( v == CAMELLIA_DECRYPT ) ? "dec" : "enc" );
 
-    memcpy( src, camellia_test_cbc_iv, 16);
-    memcpy( dst, camellia_test_cbc_iv, 16);
-    memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u);
+    memcpy( src, camellia_test_cbc_iv, 16 );
+    memcpy( dst, camellia_test_cbc_iv, 16 );
+    memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u );
 
-    if (v == CAMELLIA_DECRYPT) {
-        camellia_setkey_dec(&ctx, key, 128 + u * 64);
+    if( v == CAMELLIA_DECRYPT ) {
+        camellia_setkey_dec( &ctx, key, 128 + u * 64 );
     } else {
-        camellia_setkey_enc(&ctx, key, 128 + u * 64);
+        camellia_setkey_enc( &ctx, key, 128 + u * 64 );
     }
 
-    for (i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
+    for( i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
 
-        if (v == CAMELLIA_DECRYPT) {
+        if( v == CAMELLIA_DECRYPT ) {
             memcpy( iv , src, 16 );
-            memcpy(src, camellia_test_cbc_cipher[u][i], 16);
-            memcpy(dst, camellia_test_cbc_plain[i], 16);
+            memcpy( src, camellia_test_cbc_cipher[u][i], 16 );
+            memcpy( dst, camellia_test_cbc_plain[i], 16 );
         } else { /* CAMELLIA_ENCRYPT */
             memcpy( iv , dst, 16 );
-            memcpy(src, camellia_test_cbc_plain[i], 16);
-            memcpy(dst, camellia_test_cbc_cipher[u][i], 16);
+            memcpy( src, camellia_test_cbc_plain[i], 16 );
+            memcpy( dst, camellia_test_cbc_cipher[u][i], 16 );
         }
 
-        camellia_crypt_cbc(&ctx, v, 16, iv, src, buf);
+        camellia_crypt_cbc( &ctx, v, 16, iv, src, buf );
 
         if( memcmp( buf, dst, 16 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
     }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
 #if defined(POLARSSL_CIPHER_MODE_CTR)
     /*
@@ -979,8 +1015,8 @@ int camellia_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  CAMELLIA-CTR-128 (%s): ",
-                    ( v == CAMELLIA_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  CAMELLIA-CTR-128 (%s): ",
+                             ( v == CAMELLIA_DECRYPT ) ? "dec" : "enc" );
 
         memcpy( nonce_counter, camellia_test_ctr_nonce_counter[u], 16 );
         memcpy( key, camellia_test_ctr_key[u], 16 );
@@ -993,12 +1029,13 @@ int camellia_self_test( int verbose )
             len = camellia_test_ctr_len[u];
             memcpy( buf, camellia_test_ctr_ct[u], len );
 
-            camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, buf, buf );
+            camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                                buf, buf );
 
             if( memcmp( buf, camellia_test_ctr_pt[u], len ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
                 return( 1 );
             }
@@ -1008,28 +1045,29 @@ int camellia_self_test( int verbose )
             len = camellia_test_ctr_len[u];
             memcpy( buf, camellia_test_ctr_pt[u], len );
 
-            camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block, buf, buf );
+            camellia_crypt_ctr( &ctx, len, &offset, nonce_counter, stream_block,
+                                buf, buf );
 
             if( memcmp( buf, camellia_test_ctr_ct[u], len ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
                 return( 1 );
             }
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 #endif /* POLARSSL_CIPHER_MODE_CTR */
 
-    return ( 0 );
+    return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_CAMELLIA_C */
diff --git a/Externals/polarssl/library/ccm.c b/Externals/polarssl/library/ccm.c
new file mode 100644
index 0000000000..72d766b9a5
--- /dev/null
+++ b/Externals/polarssl/library/ccm.c
@@ -0,0 +1,456 @@
+/*
+ *  NIST SP800-38C compliant CCM implementation
+ *
+ *  Copyright (C) 2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Definition of CCM:
+ * http://csrc.nist.gov/publications/nistpubs/800-38C/SP800-38C_updated-July20_2007.pdf
+ * RFC 3610 "Counter with CBC-MAC (CCM)"
+ *
+ * Related:
+ * RFC 5116 "An Interface and Algorithms for Authenticated Encryption"
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_CCM_C)
+
+#include "polarssl/ccm.h"
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#define CCM_ENCRYPT 0
+#define CCM_DECRYPT 1
+
+/*
+ * Initialize context
+ */
+int ccm_init( ccm_context *ctx, cipher_id_t cipher,
+              const unsigned char *key, unsigned int keysize )
+{
+    int ret;
+    const cipher_info_t *cipher_info;
+
+    memset( ctx, 0, sizeof( ccm_context ) );
+
+    cipher_init( &ctx->cipher_ctx );
+
+    cipher_info = cipher_info_from_values( cipher, keysize, POLARSSL_MODE_ECB );
+    if( cipher_info == NULL )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+    if( cipher_info->block_size != 16 )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+    if( ( ret = cipher_init_ctx( &ctx->cipher_ctx, cipher_info ) ) != 0 )
+        return( ret );
+
+    if( ( ret = cipher_setkey( &ctx->cipher_ctx, key, keysize,
+                               POLARSSL_ENCRYPT ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Free context
+ */
+void ccm_free( ccm_context *ctx )
+{
+    cipher_free( &ctx->cipher_ctx );
+    polarssl_zeroize( ctx, sizeof( ccm_context ) );
+}
+
+/*
+ * Macros for common operations.
+ * Results in smaller compiled code than static inline functions.
+ */
+
+/*
+ * Update the CBC-MAC state in y using a block in b
+ * (Always using b as the source helps the compiler optimise a bit better.)
+ */
+#define UPDATE_CBC_MAC                                                      \
+    for( i = 0; i < 16; i++ )                                               \
+        y[i] ^= b[i];                                                       \
+                                                                            \
+    if( ( ret = cipher_update( &ctx->cipher_ctx, y, 16, y, &olen ) ) != 0 ) \
+        return( ret );
+
+/*
+ * Encrypt or decrypt a partial block with CTR
+ * Warning: using b for temporary storage! src and dst must not be b!
+ * This avoids allocating one more 16 bytes buffer while allowing src == dst.
+ */
+#define CTR_CRYPT( dst, src, len  )                                            \
+    if( ( ret = cipher_update( &ctx->cipher_ctx, ctr, 16, b, &olen ) ) != 0 )  \
+        return( ret );                                                         \
+                                                                               \
+    for( i = 0; i < len; i++ )                                                 \
+        dst[i] = src[i] ^ b[i];
+
+/*
+ * Authenticated encryption or decryption
+ */
+static int ccm_auth_crypt( ccm_context *ctx, int mode, size_t length,
+                           const unsigned char *iv, size_t iv_len,
+                           const unsigned char *add, size_t add_len,
+                           const unsigned char *input, unsigned char *output,
+                           unsigned char *tag, size_t tag_len )
+{
+    int ret;
+    unsigned char i;
+    unsigned char q = 16 - 1 - iv_len;
+    size_t len_left, olen;
+    unsigned char b[16];
+    unsigned char y[16];
+    unsigned char ctr[16];
+    const unsigned char *src;
+    unsigned char *dst;
+
+    /*
+     * Check length requirements: SP800-38C A.1
+     * Additional requirement: a < 2^16 - 2^8 to simplify the code.
+     * 'length' checked later (when writing it to the first block)
+     */
+    if( tag_len < 4 || tag_len > 16 || tag_len % 2 != 0 )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+    /* Also implies q is within bounds */
+    if( iv_len < 7 || iv_len > 13 )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+    if( add_len > 0xFF00 )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+    /*
+     * First block B_0:
+     * 0        .. 0        flags
+     * 1        .. iv_len   nonce (aka iv)
+     * iv_len+1 .. 15       length
+     *
+     * With flags as (bits):
+     * 7        0
+     * 6        add present?
+     * 5 .. 3   (t - 2) / 2
+     * 2 .. 0   q - 1
+     */
+    b[0] = 0;
+    b[0] |= ( add_len > 0 ) << 6;
+    b[0] |= ( ( tag_len - 2 ) / 2 ) << 3;
+    b[0] |= q - 1;
+
+    memcpy( b + 1, iv, iv_len );
+
+    for( i = 0, len_left = length; i < q; i++, len_left >>= 8 )
+        b[15-i] = (unsigned char)( len_left & 0xFF );
+
+    if( len_left > 0 )
+        return( POLARSSL_ERR_CCM_BAD_INPUT );
+
+
+    /* Start CBC-MAC with first block */
+    memset( y, 0, 16 );
+    UPDATE_CBC_MAC;
+
+    /*
+     * If there is additional data, update CBC-MAC with
+     * add_len, add, 0 (padding to a block boundary)
+     */
+    if( add_len > 0 )
+    {
+        size_t use_len;
+        len_left = add_len;
+        src = add;
+
+        memset( b, 0, 16 );
+        b[0] = (unsigned char)( ( add_len >> 8 ) & 0xFF );
+        b[1] = (unsigned char)( ( add_len      ) & 0xFF );
+
+        use_len = len_left < 16 - 2 ? len_left : 16 - 2;
+        memcpy( b + 2, src, use_len );
+        len_left -= use_len;
+        src += use_len;
+
+        UPDATE_CBC_MAC;
+
+        while( len_left > 0 )
+        {
+            use_len = len_left > 16 ? 16 : len_left;
+
+            memset( b, 0, 16 );
+            memcpy( b, src, use_len );
+            UPDATE_CBC_MAC;
+
+            len_left -= use_len;
+            src += use_len;
+        }
+    }
+
+    /*
+     * Prepare counter block for encryption:
+     * 0        .. 0        flags
+     * 1        .. iv_len   nonce (aka iv)
+     * iv_len+1 .. 15       counter (initially 1)
+     *
+     * With flags as (bits):
+     * 7 .. 3   0
+     * 2 .. 0   q - 1
+     */
+    ctr[0] = q - 1;
+    memcpy( ctr + 1, iv, iv_len );
+    memset( ctr + 1 + iv_len, 0, q );
+    ctr[15] = 1;
+
+    /*
+     * Authenticate and {en,de}crypt the message.
+     *
+     * The only difference between encryption and decryption is
+     * the respective order of authentication and {en,de}cryption.
+     */
+    len_left = length;
+    src = input;
+    dst = output;
+
+    while( len_left > 0 )
+    {
+        unsigned char use_len = len_left > 16 ? 16 : len_left;
+
+        if( mode == CCM_ENCRYPT )
+        {
+            memset( b, 0, 16 );
+            memcpy( b, src, use_len );
+            UPDATE_CBC_MAC;
+        }
+
+        CTR_CRYPT( dst, src, use_len );
+
+        if( mode == CCM_DECRYPT )
+        {
+            memset( b, 0, 16 );
+            memcpy( b, dst, use_len );
+            UPDATE_CBC_MAC;
+        }
+
+        dst += use_len;
+        src += use_len;
+        len_left -= use_len;
+
+        /*
+         * Increment counter.
+         * No need to check for overflow thanks to the length check above.
+         */
+        for( i = 0; i < q; i++ )
+            if( ++ctr[15-i] != 0 )
+                break;
+    }
+
+    /*
+     * Authentication: reset counter and crypt/mask internal tag
+     */
+    for( i = 0; i < q; i++ )
+        ctr[15-i] = 0;
+
+    CTR_CRYPT( y, y, 16 );
+    memcpy( tag, y, tag_len );
+
+    return( 0 );
+}
+
+/*
+ * Authenticated encryption
+ */
+int ccm_encrypt_and_tag( ccm_context *ctx, size_t length,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *add, size_t add_len,
+                         const unsigned char *input, unsigned char *output,
+                         unsigned char *tag, size_t tag_len )
+{
+    return( ccm_auth_crypt( ctx, CCM_ENCRYPT, length, iv, iv_len,
+                            add, add_len, input, output, tag, tag_len ) );
+}
+
+/*
+ * Authenticated decryption
+ */
+int ccm_auth_decrypt( ccm_context *ctx, size_t length,
+                      const unsigned char *iv, size_t iv_len,
+                      const unsigned char *add, size_t add_len,
+                      const unsigned char *input, unsigned char *output,
+                      const unsigned char *tag, size_t tag_len )
+{
+    int ret;
+    unsigned char check_tag[16];
+    unsigned char i;
+    int diff;
+
+    if( ( ret = ccm_auth_crypt( ctx, CCM_DECRYPT, length,
+                                iv, iv_len, add, add_len,
+                                input, output, check_tag, tag_len ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* Check tag in "constant-time" */
+    for( diff = 0, i = 0; i < tag_len; i++ )
+        diff |= tag[i] ^ check_tag[i];
+
+    if( diff != 0 )
+    {
+        polarssl_zeroize( output, length );
+        return( POLARSSL_ERR_CCM_AUTH_FAILED );
+    }
+
+    return( 0 );
+}
+
+
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdio.h>
+#define polarssl_printf printf
+#endif
+
+/*
+ * Examples 1 to 3 from SP800-38C Appendix C
+ */
+
+#define NB_TESTS 3
+
+/*
+ * The data is the same for all tests, only the used length changes
+ */
+static const unsigned char key[] = {
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+    0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f
+};
+
+static const unsigned char iv[] = {
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b
+};
+
+static const unsigned char ad[] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13
+};
+
+static const unsigned char msg[] = {
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+};
+
+static const size_t iv_len [NB_TESTS] = { 7, 8,  12 };
+static const size_t add_len[NB_TESTS] = { 8, 16, 20 };
+static const size_t msg_len[NB_TESTS] = { 4, 16, 24 };
+static const size_t tag_len[NB_TESTS] = { 4, 6,  8  };
+
+static const unsigned char res[NB_TESTS][32] = {
+    {   0x71, 0x62, 0x01, 0x5b, 0x4d, 0xac, 0x25, 0x5d },
+    {   0xd2, 0xa1, 0xf0, 0xe0, 0x51, 0xea, 0x5f, 0x62,
+        0x08, 0x1a, 0x77, 0x92, 0x07, 0x3d, 0x59, 0x3d,
+        0x1f, 0xc6, 0x4f, 0xbf, 0xac, 0xcd },
+    {   0xe3, 0xb2, 0x01, 0xa9, 0xf5, 0xb7, 0x1a, 0x7a,
+        0x9b, 0x1c, 0xea, 0xec, 0xcd, 0x97, 0xe7, 0x0b,
+        0x61, 0x76, 0xaa, 0xd9, 0xa4, 0x42, 0x8a, 0xa5,
+        0x48, 0x43, 0x92, 0xfb, 0xc1, 0xb0, 0x99, 0x51 }
+};
+
+int ccm_self_test( int verbose )
+{
+    ccm_context ctx;
+    unsigned char out[32];
+    size_t i;
+    int ret;
+
+    if( ccm_init( &ctx, POLARSSL_CIPHER_ID_AES, key, 8 * sizeof key ) != 0 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "  CCM: setup failed" );
+
+        return( 1 );
+    }
+
+    for( i = 0; i < NB_TESTS; i++ )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "  CCM-AES #%u: ", (unsigned int) i + 1 );
+
+        ret = ccm_encrypt_and_tag( &ctx, msg_len[i],
+                                   iv, iv_len[i], ad, add_len[i],
+                                   msg, out,
+                                   out + msg_len[i], tag_len[i] );
+
+        if( ret != 0 ||
+            memcmp( out, res[i], msg_len[i] + tag_len[i] ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        ret = ccm_auth_decrypt( &ctx, msg_len[i],
+                                iv, iv_len[i], ad, add_len[i],
+                                res[i], out,
+                                res[i] + msg_len[i], tag_len[i] );
+
+        if( ret != 0 ||
+            memcmp( out, msg, msg_len[i] ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+    }
+
+    ccm_free( &ctx );
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    return( 0 );
+}
+
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */
+
+#endif /* POLARSSL_CCM_C */
diff --git a/Externals/polarssl/library/certs.c b/Externals/polarssl/library/certs.c
index e2d07f7628..a782bc1144 100644
--- a/Externals/polarssl/library/certs.c
+++ b/Externals/polarssl/library/certs.c
@@ -1,7 +1,7 @@
 /*
  *  X.509 test certificates
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,34 +23,121 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_CERTS_C)
 
-const char test_ca_crt[] =
+#if defined(POLARSSL_ECDSA_C)
+#define TEST_CA_CRT_EC                                                  \
+"-----BEGIN CERTIFICATE-----\r\n"                                       \
+"MIICUjCCAdegAwIBAgIJAMFD4n5iQ8zoMAoGCCqGSM49BAMCMD4xCzAJBgNVBAYT\r\n"  \
+"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+"QyBDQTAeFw0xMzA5MjQxNTQ5NDhaFw0yMzA5MjIxNTQ5NDhaMD4xCzAJBgNVBAYT\r\n"  \
+"Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF\r\n"  \
+"QyBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMPaKzRBN1gvh1b+/Im6KUNLTuBu\r\n"  \
+"ww5XUzM5WNRStJGVOQsj318XJGJI/BqVKc4sLYfCiFKAr9ZqqyHduNMcbli4yuiy\r\n"  \
+"aY7zQa0pw7RfdadHb9UZKVVpmlM7ILRmFmAzHqOBoDCBnTAdBgNVHQ4EFgQUnW0g\r\n"  \
+"JEkBPyvLeLUZvH4kydv7NnwwbgYDVR0jBGcwZYAUnW0gJEkBPyvLeLUZvH4kydv7\r\n"  \
+"NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UE\r\n"  \
+"AxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAwGA1UdEwQFMAMBAf8w\r\n"  \
+"CgYIKoZIzj0EAwIDaQAwZgIxAMO0YnNWKJUAfXgSJtJxexn4ipg+kv4znuR50v56\r\n"  \
+"t4d0PCu412mUC6Nnd7izvtE2MgIxAP1nnJQjZ8BWukszFQDG48wxCCyci9qpdSMv\r\n"  \
+"uCjn8pwUOkABXK8Mss90fzCfCEOtIA==\r\n"                                  \
+"-----END CERTIFICATE-----\r\n"
+const char test_ca_crt_ec[] = TEST_CA_CRT_EC;
+
+const char test_ca_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"Proc-Type: 4,ENCRYPTED\r\n"
+"DEK-Info: DES-EDE3-CBC,307EAB469933D64E\r\n"
+"\r\n"
+"IxbrRmKcAzctJqPdTQLA4SWyBYYGYJVkYEna+F7Pa5t5Yg/gKADrFKcm6B72e7DG\r\n"
+"ihExtZI648s0zdYw6qSJ74vrPSuWDe5qm93BqsfVH9svtCzWHW0pm1p0KTBCFfUq\r\n"
+"UsuWTITwJImcnlAs1gaRZ3sAWm7cOUidL0fo2G0fYUFNcYoCSLffCFTEHBuPnagb\r\n"
+"a77x/sY1Bvii8S9/XhDTb6pTMx06wzrm\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+
+const char test_ca_pwd_ec[] = "PolarSSLTest";
+
+const char test_srv_crt_ec[] =
 "-----BEGIN CERTIFICATE-----\r\n"
-"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
-"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
-"MTEwMjEyMTQ0NDAwWhcNMjEwMjEyMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"
-"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"
-"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"
-"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"
-"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"
-"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"
-"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"
-"gZUwgZIwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtFrkpbPe0lL2udWmlQ/rPrzH\r\n"
-"/f8wYwYDVR0jBFwwWoAUtFrkpbPe0lL2udWmlQ/rPrzH/f+hP6Q9MDsxCzAJBgNV\r\n"
-"BAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEZMBcGA1UEAxMQUG9sYXJTU0wgVGVz\r\n"
-"dCBDQYIBADANBgkqhkiG9w0BAQUFAAOCAQEAuP1U2ABUkIslsCfdlc2i94QHHYeJ\r\n"
-"SsR4EdgHtdciUI5I62J6Mom+Y0dT/7a+8S6MVMCZP6C5NyNyXw1GWY/YR82XTJ8H\r\n"
-"DBJiCTok5DbZ6SzaONBzdWHXwWwmi5vg1dxn7YxrM9d0IjxM27WNKs4sDQhZBQkF\r\n"
-"pjmfs2cb4oPl4Y9T9meTx/lvdkRYEug61Jfn6cA+qHpyPYdTH+UshITnmp5/Ztkf\r\n"
-"m/UTSLBNFNHesiTZeH31NcxYGdHSme9Nc/gfidRa0FLOCfWxRlFqAI47zG9jAQCZ\r\n"
-"7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n"
+"MIICHzCCAaWgAwIBAgIBCTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEG\r\n"
+"CCqGSM49AwEHA0IABDfMVtl2CR5acj7HWS3/IG7ufPkGkXTQrRS192giWWKSTuUA\r\n"
+"2CMR/+ov0jRdXRa9iojCa3cNVc2KKg76Aci07f+jgZ0wgZowCQYDVR0TBAIwADAd\r\n"
+"BgNVHQ4EFgQUUGGlj9QH2deCAQzlZX+MY0anE74wbgYDVR0jBGcwZYAUnW0gJEkB\r\n"
+"PyvLeLUZvH4kydv7NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xh\r\n"
+"clNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAoG\r\n"
+"CCqGSM49BAMCA2gAMGUCMQCaLFzXptui5WQN8LlO3ddh1hMxx6tzgLvT03MTVK2S\r\n"
+"C12r0Lz3ri/moSEpNZWqPjkCMCE2f53GXcYLqyfyJR078c/xNSUU5+Xxl7VZ414V\r\n"
+"fGa5kHvHARBPc8YAIVIqDvHH1Q==\r\n"
 "-----END CERTIFICATE-----\r\n";
 
-const char test_ca_key[] =
+const char test_srv_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"MHcCAQEEIPEqEyB2AnCoPL/9U/YDHvdqXYbIogTywwyp6/UfDw6noAoGCCqGSM49\r\n"
+"AwEHoUQDQgAEN8xW2XYJHlpyPsdZLf8gbu58+QaRdNCtFLX3aCJZYpJO5QDYIxH/\r\n"
+"6i/SNF1dFr2KiMJrdw1VzYoqDvoByLTt/w==\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+
+const char test_cli_crt_ec[] =
+"-----BEGIN CERTIFICATE-----\r\n"
+"MIICLDCCAbKgAwIBAgIBDTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\r\n"
+"MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjBBMQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxHzAdBgNVBAMTFlBvbGFyU1NMIFRlc3QgQ2xpZW50IDIw\r\n"
+"WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARX5a6xc9/TrLuTuIH/Eq7u5lOszlVT\r\n"
+"9jQOzC7jYyUL35ji81xgNpbA1RgUcOV/n9VLRRjlsGzVXPiWj4dwo+THo4GdMIGa\r\n"
+"MAkGA1UdEwQCMAAwHQYDVR0OBBYEFHoAX4Zk/OBd5REQO7LmO8QmP8/iMG4GA1Ud\r\n"
+"IwRnMGWAFJ1tICRJAT8ry3i1Gbx+JMnb+zZ8oUKkQDA+MQswCQYDVQQGEwJOTDER\r\n"
+"MA8GA1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0GC\r\n"
+"CQDBQ+J+YkPM6DAKBggqhkjOPQQDAgNoADBlAjBKZQ17IIOimbmoD/yN7o89u3BM\r\n"
+"lgOsjnhw3fIOoLIWy2WOGsk/LGF++DzvrRzuNiACMQCd8iem1XS4JK7haj8xocpU\r\n"
+"LwjQje5PDGHfd3h9tP38Qknu5bJqws0md2KOKHyeV0U=\r\n"
+"-----END CERTIFICATE-----\r\n";
+
+const char test_cli_key_ec[] =
+"-----BEGIN EC PRIVATE KEY-----\r\n"
+"MHcCAQEEIPb3hmTxZ3/mZI3vyk7p3U3wBf+WIop6hDhkFzJhmLcqoAoGCCqGSM49\r\n"
+"AwEHoUQDQgAEV+WusXPf06y7k7iB/xKu7uZTrM5VU/Y0Dswu42MlC9+Y4vNcYDaW\r\n"
+"wNUYFHDlf5/VS0UY5bBs1Vz4lo+HcKPkxw==\r\n"
+"-----END EC PRIVATE KEY-----\r\n";
+#else
+#define TEST_CA_CRT_EC
+#endif /* POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_RSA_C)
+#define TEST_CA_CRT_RSA                                                 \
+"-----BEGIN CERTIFICATE-----\r\n"                                       \
+"MIIDhzCCAm+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"  \
+"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"  \
+"MTEwMjEyMTQ0NDAwWhcNMjEwMjEyMTQ0NDAwWjA7MQswCQYDVQQGEwJOTDERMA8G\r\n"  \
+"A1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwggEiMA0G\r\n"  \
+"CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3zf8F7vglp0/ht6WMn1EpRagzSHx\r\n"  \
+"mdTs6st8GFgIlKXsm8WL3xoemTiZhx57wI053zhdcHgH057Zk+i5clHFzqMwUqny\r\n"  \
+"50BwFMtEonILwuVA+T7lpg6z+exKY8C4KQB0nFc7qKUEkHHxvYPZP9al4jwqj+8n\r\n"  \
+"YMPGn8u67GB9t+aEMr5P+1gmIgNb1LTV+/Xjli5wwOQuvfwu7uJBVcA0Ln0kcmnL\r\n"  \
+"R7EUQIN9Z/SG9jGr8XmksrUuEvmEF/Bibyc+E1ixVA0hmnM3oTDPb5Lc9un8rNsu\r\n"  \
+"KNF+AksjoBXyOGVkCeoMbo4bF6BxyLObyavpw/LPh5aPgAIynplYb6LVAgMBAAGj\r\n"  \
+"gZUwgZIwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtFrkpbPe0lL2udWmlQ/rPrzH\r\n"  \
+"/f8wYwYDVR0jBFwwWoAUtFrkpbPe0lL2udWmlQ/rPrzH/f+hP6Q9MDsxCzAJBgNV\r\n"  \
+"BAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEZMBcGA1UEAxMQUG9sYXJTU0wgVGVz\r\n"  \
+"dCBDQYIBADANBgkqhkiG9w0BAQUFAAOCAQEAuP1U2ABUkIslsCfdlc2i94QHHYeJ\r\n"  \
+"SsR4EdgHtdciUI5I62J6Mom+Y0dT/7a+8S6MVMCZP6C5NyNyXw1GWY/YR82XTJ8H\r\n"  \
+"DBJiCTok5DbZ6SzaONBzdWHXwWwmi5vg1dxn7YxrM9d0IjxM27WNKs4sDQhZBQkF\r\n"  \
+"pjmfs2cb4oPl4Y9T9meTx/lvdkRYEug61Jfn6cA+qHpyPYdTH+UshITnmp5/Ztkf\r\n"  \
+"m/UTSLBNFNHesiTZeH31NcxYGdHSme9Nc/gfidRa0FLOCfWxRlFqAI47zG9jAQCZ\r\n"  \
+"7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n"      \
+"-----END CERTIFICATE-----\r\n"
+const char test_ca_crt_rsa[] = TEST_CA_CRT_RSA;
+
+const char test_ca_key_rsa[] =
 "-----BEGIN RSA PRIVATE KEY-----\r\n"
 "Proc-Type: 4,ENCRYPTED\r\n"
 "DEK-Info: DES-EDE3-CBC,A8A95B05D5B7206B\r\n"
@@ -82,60 +169,61 @@ const char test_ca_key[] =
 "P/eQiddSf0brnpiLJRh7qZrl9XuqYdpUqnoEdMAfotDOID8OtV7gt8a48ad8VPW2\r\n"
 "-----END RSA PRIVATE KEY-----\r\n";
 
-const char test_ca_pwd[] = "PolarSSLTest";
+const char test_ca_pwd_rsa[] = "PolarSSLTest";
 
-const char test_srv_crt[] =
+const char test_srv_crt_rsa[] =
 "-----BEGIN CERTIFICATE-----\r\n"
-"MIIDPzCCAiegAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
+"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
 "MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
-"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA8MQswCQYDVQQGEwJOTDERMA8G\r\n"
-"A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIFNlcnZlciAxMIIBIjAN\r\n"
-"BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqQIfPUBq1VVTi/027oJlLhVhXom/\r\n"
-"uOhFkNvuiBZS0/FDUEeWEllkh2v9K+BG+XO+3c+S4ZFb7Wagb4kpeUWA0INq1UFD\r\n"
-"d185fAkER4KwVzlw7aPsFRkeqDMIR8EFQqn9TMO0390GH00QUUBncxMPQPhtgSVf\r\n"
-"CrFTxjB+FTms+Vruf5KepgVb5xOXhbUjktnUJAbVCSWJdQfdphqPPwkZvq1lLGTr\r\n"
-"lZvc/kFeF6babFtpzAK6FCwWJJxK3M3Q91Jnc/EtoCP9fvQxyi1wyokLBNsupk9w\r\n"
-"bp7OvViJ4lNZnm5akmXiiD8MlBmj3eXonZUT7Snbq3AS3FrKaxerUoJUsQIDAQAB\r\n"
-"o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQfdNY/KcF0dEU7BRIsPai9Q1kCpjAf\r\n"
-"BgNVHSMEGDAWgBS0WuSls97SUva51aaVD+s+vMf9/zANBgkqhkiG9w0BAQUFAAOC\r\n"
-"AQEAvc+WwZUemsJu2IiI2Cp6liA+UAvIx98dQe3kZs2zAoF9VwQbXcYzWQ/BILkj\r\n"
-"NImKbPL9x0g2jIDn4ZvGYFywMwIO/d++YbwYiQw42/v7RiMy94zBPnzeHi86dy/0\r\n"
-"jpOOJUx3IXRsGLdyjb/1T11klcFqGnARiK+8VYolMPP6afKvLXX7K4kiUpsFQhUp\r\n"
-"E5VeM5pV1Mci2ETOJau2cO40FJvI/C9W/wR+GAArMaw2fxG77E3laaa0LAOlexM6\r\n"
-"A4KOb5f5cGTM5Ih6tEF5FVq3/9vzNIYMa1FqzacBLZF8zSHYLEimXBdzjBoN4qDU\r\n"
-"/WzRyYRBRjAI49mzHX6raleqnw==\r\n"
+"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
+"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n"
+"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n"
+"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n"
+"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n"
+"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n"
+"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n"
+"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n"
+"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n"
+"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n"
+"oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n"
+"UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n"
+"iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n"
+"wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n"
+"RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n"
+"zhuYwjVuX6JHG0c=\r\n"
 "-----END CERTIFICATE-----\r\n";
 
-const char test_srv_key[] =
+const char test_srv_key_rsa[] =
 "-----BEGIN RSA PRIVATE KEY-----\r\n"
-"MIIEogIBAAKCAQEAqQIfPUBq1VVTi/027oJlLhVhXom/uOhFkNvuiBZS0/FDUEeW\r\n"
-"Ellkh2v9K+BG+XO+3c+S4ZFb7Wagb4kpeUWA0INq1UFDd185fAkER4KwVzlw7aPs\r\n"
-"FRkeqDMIR8EFQqn9TMO0390GH00QUUBncxMPQPhtgSVfCrFTxjB+FTms+Vruf5Ke\r\n"
-"pgVb5xOXhbUjktnUJAbVCSWJdQfdphqPPwkZvq1lLGTrlZvc/kFeF6babFtpzAK6\r\n"
-"FCwWJJxK3M3Q91Jnc/EtoCP9fvQxyi1wyokLBNsupk9wbp7OvViJ4lNZnm5akmXi\r\n"
-"iD8MlBmj3eXonZUT7Snbq3AS3FrKaxerUoJUsQIDAQABAoIBABaJ9eiRQq4Ypv+w\r\n"
-"UTcVpLC0oTueWzcpor1i1zjG4Vzqe/Ok2FqyGToGKMlFK7Hwwa+LEyeJ3xyV5yd4\r\n"
-"v1Mw9bDZFdJC1eCBjoUAHtX6k9HOE0Vd6woVQ4Vi6OPI1g7B5Mnr/58rNrnN6TMs\r\n"
-"x58NF6euecwTU811QJrZtLbX7j2Cr28yB2Vs8qyYlHwVw5jbDOv43D7vU5gmlIDN\r\n"
-"0JQRuWAnOuPzZNoJr4SfJKqHNGxYYY6pHZ1s0dOTLIDb/B8KQWapA2kRmZyid2EH\r\n"
-"nwzgLbAsHJCf+bQnhXjXuxtUsrcIL8noZLazlOMxwNEammglVWW23Ud/QRnFgJg5\r\n"
-"UgcAcRECgYEA19uYetht5qmwdJ+12oC6zeO+vXLcyD9gon23T5J6w2YThld7/OW0\r\n"
-"oArQJGgkAdaq0pcTyOIjtTQVMFygdVmCEJmxh/3RutPcTeydqW9fphKDMej32J8e\r\n"
-"GniGmNGiclbcfNOS8E5TGp445yZb9P1+7AHng16bGg3Ykj5EA4G+HCcCgYEAyHAl\r\n"
-"//ekk8YjQElm+8izLtFkymIK0aCtEe9C/RIRhFYBeFaotC5dStNhBOncn4ovMAPD\r\n"
-"lX/92yDi9OP8PPLN3a4B9XpW3k/SS5GrbT5cwOivBHNllZSmu/2qz5WPGcjVCOrB\r\n"
-"LYl3YWr2h3EGKICT03kEoTkiDBvCeOpW7cCGl2cCgYBD5whoXHz1+ptPlI4YVjZt\r\n"
-"Xh86aU+ajpVPiEyJ84I6xXmO4SZXv8q6LaycR0ZMbcL+zBelMb4Z2nBv7jNrtuR7\r\n"
-"ZF28cdPv+YVr3esaybZE/73VjXup4SQPH6r3l7qKTVi+y6+FeJ4b2Xn8/MwgnT23\r\n"
-"8EFrye7wmzpthrjOgZnUMQKBgE9Lhsz/5J0Nis6Y+2Pqn3CLKEukg9Ewtqdct2y0\r\n"
-"5Dcta0F3TyCRIxlCDKTL/BslqMtfAdY4H268UO0+8IAQMn9boqzBrHIgs/pvc5kx\r\n"
-"TbKHmw2wtWR6vYersBKVgVpbCGSRssDYHGFu1n74qM4HJ/RGcR1zI9QUe1gopSFD\r\n"
-"xDtLAoGAVAdWvrqDwgoL2hHW3scGpxdE/ygJDOwHnf+1B9goKAOP5lf2FJaiAxf3\r\n"
-"ectoPOgZbCmm/iiDmigu703ld3O+VoCLDD4qx3R+KyALL78gtVJYzSRiKhzgCZ3g\r\n"
-"mKsIVRBq4IfwiwyMNG2BYZQAwbSDjjPtn/kPBduPzPj7eriByhI=\r\n"
+"MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n"
+"lqdStJDvLXJ6PiSa/LY0rCT1d+AmZIycsCh9odrqjObJHJa8/sEEUrM21KP64bF2\r\n"
+"2JDBYbRmUjaiJlOqq3ReB30Zgtsq2B+g2Q0cLUlm91slc0boC4pPaQy1AJDh2oIQ\r\n"
+"Zn2uVCuLZXmRoeJhw81ASQjuaAzxi4bSRr/QuKoRAx5/VqgaHkQYDw+Fi9qLRF7i\r\n"
+"GMZiL8dmjfpd2H3zJ4kpAcWQDj8n8TDISg7v1t7HxydrxwU9esQCPJodPg/oNJhb\r\n"
+"y3NLUpbYEaIsgIhpOVrTD7DeWS8Rx/fqEgEwlwIDAQABAoIBAQCXR0S8EIHFGORZ\r\n"
+"++AtOg6eENxD+xVs0f1IeGz57Tjo3QnXX7VBZNdj+p1ECvhCE/G7XnkgU5hLZX+G\r\n"
+"Z0jkz/tqJOI0vRSdLBbipHnWouyBQ4e/A1yIJdlBtqXxJ1KE/ituHRbNc4j4kL8Z\r\n"
+"/r6pvwnTI0PSx2Eqs048YdS92LT6qAv4flbNDxMn2uY7s4ycS4Q8w1JXnCeaAnYm\r\n"
+"WYI5wxO+bvRELR2Mcz5DmVnL8jRyml6l6582bSv5oufReFIbyPZbQWlXgYnpu6He\r\n"
+"GTc7E1zKYQGG/9+DQUl/1vQuCPqQwny0tQoX2w5tdYpdMdVm+zkLtbajzdTviJJa\r\n"
+"TWzL6lt5AoGBAN86+SVeJDcmQJcv4Eq6UhtRr4QGMiQMz0Sod6ettYxYzMgxtw28\r\n"
+"CIrgpozCc+UaZJLo7UxvC6an85r1b2nKPCLQFaggJ0H4Q0J/sZOhBIXaoBzWxveK\r\n"
+"nupceKdVxGsFi8CDy86DBfiyFivfBj+47BbaQzPBj7C4rK7UlLjab2rDAoGBAN2u\r\n"
+"AM2gchoFiu4v1HFL8D7lweEpi6ZnMJjnEu/dEgGQJFjwdpLnPbsj4c75odQ4Gz8g\r\n"
+"sw9lao9VVzbusoRE/JGI4aTdO0pATXyG7eG1Qu+5Yc1YGXcCrliA2xM9xx+d7f+s\r\n"
+"mPzN+WIEg5GJDYZDjAzHG5BNvi/FfM1C9dOtjv2dAoGAF0t5KmwbjWHBhcVqO4Ic\r\n"
+"BVvN3BIlc1ue2YRXEDlxY5b0r8N4XceMgKmW18OHApZxfl8uPDauWZLXOgl4uepv\r\n"
+"whZC3EuWrSyyICNhLY21Ah7hbIEBPF3L3ZsOwC+UErL+dXWLdB56Jgy3gZaBeW7b\r\n"
+"vDrEnocJbqCm7IukhXHOBK8CgYEAwqdHB0hqyNSzIOGY7v9abzB6pUdA3BZiQvEs\r\n"
+"3LjHVd4HPJ2x0N8CgrBIWOE0q8+0hSMmeE96WW/7jD3fPWwCR5zlXknxBQsfv0gP\r\n"
+"3BC5PR0Qdypz+d+9zfMf625kyit4T/hzwhDveZUzHnk1Cf+IG7Q+TOEnLnWAWBED\r\n"
+"ISOWmrUCgYAFEmRxgwAc/u+D6t0syCwAYh6POtscq9Y0i9GyWk89NzgC4NdwwbBH\r\n"
+"4AgahOxIxXx2gxJnq3yfkJfIjwf0s2DyP0kY2y6Ua1OeomPeY9mrIS4tCuDQ6LrE\r\n"
+"TB6l9VGoxJL4fyHnZb8L5gGvnB1bbD8cL6YPaDiOhcRseC9vBiEuVg==\r\n"
 "-----END RSA PRIVATE KEY-----\r\n";
 
-const char test_cli_crt[] =
+
+const char test_cli_crt_rsa[] =
 "-----BEGIN CERTIFICATE-----\r\n"
 "MIIDPzCCAiegAwIBAgIBBDANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
 "MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
@@ -157,7 +245,7 @@ const char test_cli_crt[] =
 "D+stpAKiQLAWaAusIWKYEyw9MQ==\r\n"
 "-----END CERTIFICATE-----\r\n";
 
-const char test_cli_key[] =
+const char test_cli_key_rsa[] =
 "-----BEGIN RSA PRIVATE KEY-----\r\n"
 "MIIEpAIBAAKCAQEAyHTEzLn5tXnpRdkUYLB9u5Pyax6fM60Nj4o8VmXl3ETZzGaF\r\n"
 "B9X4J7BKNdBjngpuG7fa8H6r7gwQk4ZJGDTzqCrSV/Uu1C93KYRhTYJQj6eVSHD1\r\n"
@@ -185,12 +273,38 @@ const char test_cli_key[] =
 "bHFVW2r0dBTqegP2/KTOxKzaHfC1qf0RGDsUoJCNJrd1cwoCLG8P2EF4w3OBrKqv\r\n"
 "8u4ytY0F+Vlanj5lm3TaoHSVF1+NWPyOTiwevIECGKwSxvlki4fDAA==\r\n"
 "-----END RSA PRIVATE KEY-----\r\n";
+#else
+#define TEST_CA_CRT_RSA
+#endif /* POLARSSL_RSA_C */
 
+#if defined(POLARSSL_DHM_C)
 const char test_dhm_params[] =
 "-----BEGIN DH PARAMETERS-----\r\n"
 "MIGHAoGBAJ419DBEOgmQTzo5qXl5fQcN9TN455wkOL7052HzxxRVMyhYmwQcgJvh\r\n"
 "1sa18fyfR9OiVEMYglOpkqVoGLN7qd5aQNNi5W7/C+VBdHTBJcGZJyyP5B3qcz32\r\n"
 "9mLJKudlVudV0Qxk5qUJaPZ/xupz0NyoVpviuiBOI1gNi8ovSXWzAgEC\r\n"
 "-----END DH PARAMETERS-----\r\n";
-
 #endif
+
+/* Concatenation of all available CA certificates */
+const char test_ca_list[] = TEST_CA_CRT_RSA TEST_CA_CRT_EC;
+
+#if defined(POLARSSL_RSA_C)
+const char *test_ca_crt = test_ca_crt_rsa;
+const char *test_ca_key = test_ca_key_rsa;
+const char *test_ca_pwd = test_ca_pwd_rsa;
+const char *test_srv_crt = test_srv_crt_rsa;
+const char *test_srv_key = test_srv_key_rsa;
+const char *test_cli_crt = test_cli_crt_rsa;
+const char *test_cli_key = test_cli_key_rsa;
+#else /* ! POLARSSL_RSA_C, so POLARSSL_ECDSA_C */
+const char *test_ca_crt = test_ca_crt_ec;
+const char *test_ca_key = test_ca_key_ec;
+const char *test_ca_pwd = test_ca_pwd_ec;
+const char *test_srv_crt = test_srv_crt_ec;
+const char *test_srv_key = test_srv_key_ec;
+const char *test_cli_crt = test_cli_crt_ec;
+const char *test_cli_key = test_cli_key_ec;
+#endif /* POLARSSL_RSA_C */
+
+#endif /* POLARSSL_CERTS_C */
diff --git a/Externals/polarssl/library/cipher.c b/Externals/polarssl/library/cipher.c
index f20cc73b48..5cd30f8ad9 100644
--- a/Externals/polarssl/library/cipher.c
+++ b/Externals/polarssl/library/cipher.c
@@ -1,11 +1,11 @@
 /**
  * \file cipher.c
- * 
+ *
  * \brief Generic cipher wrapper for PolarSSL
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,317 +27,169 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_CIPHER_C)
 
 #include "polarssl/cipher.h"
 #include "polarssl/cipher_wrap.h"
 
+#if defined(POLARSSL_GCM_C)
+#include "polarssl/gcm.h"
+#endif
+
+#if defined(POLARSSL_CCM_C)
+#include "polarssl/ccm.h"
+#endif
+
 #include <stdlib.h>
 
-#if defined _MSC_VER && !defined strcasecmp
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER)
+#define POLARSSL_CIPHER_MODE_STREAM
+#endif
+
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strcasecmp _stricmp
 #endif
 
-static const int supported_ciphers[] = {
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
 
-#if defined(POLARSSL_AES_C)
-        POLARSSL_CIPHER_AES_128_CBC,
-        POLARSSL_CIPHER_AES_192_CBC,
-        POLARSSL_CIPHER_AES_256_CBC,
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        POLARSSL_CIPHER_AES_128_CFB128,
-        POLARSSL_CIPHER_AES_192_CFB128,
-        POLARSSL_CIPHER_AES_256_CFB128,
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        POLARSSL_CIPHER_AES_128_CTR,
-        POLARSSL_CIPHER_AES_192_CTR,
-        POLARSSL_CIPHER_AES_256_CTR,
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif /* defined(POLARSSL_AES_C) */
-
-#if defined(POLARSSL_CAMELLIA_C)
-        POLARSSL_CIPHER_CAMELLIA_128_CBC,
-        POLARSSL_CIPHER_CAMELLIA_192_CBC,
-        POLARSSL_CIPHER_CAMELLIA_256_CBC,
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        POLARSSL_CIPHER_CAMELLIA_128_CFB128,
-        POLARSSL_CIPHER_CAMELLIA_192_CFB128,
-        POLARSSL_CIPHER_CAMELLIA_256_CFB128,
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        POLARSSL_CIPHER_CAMELLIA_128_CTR,
-        POLARSSL_CIPHER_CAMELLIA_192_CTR,
-        POLARSSL_CIPHER_CAMELLIA_256_CTR,
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif /* defined(POLARSSL_CAMELLIA_C) */
-
-#if defined(POLARSSL_DES_C)
-        POLARSSL_CIPHER_DES_CBC,
-        POLARSSL_CIPHER_DES_EDE_CBC,
-        POLARSSL_CIPHER_DES_EDE3_CBC,
-#endif /* defined(POLARSSL_DES_C) */
-
-#if defined(POLARSSL_BLOWFISH_C)
-        POLARSSL_CIPHER_BLOWFISH_CBC,
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        POLARSSL_CIPHER_BLOWFISH_CFB64,
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        POLARSSL_CIPHER_BLOWFISH_CTR,
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif /* defined(POLARSSL_BLOWFISH_C) */
-
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        POLARSSL_CIPHER_NULL,
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-        0
-};
+static int supported_init = 0;
 
 const int *cipher_list( void )
 {
-    return supported_ciphers;
+    const cipher_definition_t *def;
+    int *type;
+
+    if( ! supported_init )
+    {
+        def = cipher_definitions;
+        type = supported_ciphers;
+
+        while( def->type != 0 )
+            *type++ = (*def++).type;
+
+        *type = 0;
+
+        supported_init = 1;
+    }
+
+    return( supported_ciphers );
 }
 
 const cipher_info_t *cipher_info_from_type( const cipher_type_t cipher_type )
 {
-    /* Find static cipher information */
-    switch ( cipher_type )
-    {
-#if defined(POLARSSL_AES_C)
-        case POLARSSL_CIPHER_AES_128_CBC:
-            return &aes_128_cbc_info;
-        case POLARSSL_CIPHER_AES_192_CBC:
-            return &aes_192_cbc_info;
-        case POLARSSL_CIPHER_AES_256_CBC:
-            return &aes_256_cbc_info;
+    const cipher_definition_t *def;
 
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        case POLARSSL_CIPHER_AES_128_CFB128:
-            return &aes_128_cfb128_info;
-        case POLARSSL_CIPHER_AES_192_CFB128:
-            return &aes_192_cfb128_info;
-        case POLARSSL_CIPHER_AES_256_CFB128:
-            return &aes_256_cfb128_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
+    for( def = cipher_definitions; def->info != NULL; def++ )
+        if( def->type == cipher_type )
+            return( def->info );
 
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        case POLARSSL_CIPHER_AES_128_CTR:
-            return &aes_128_ctr_info;
-        case POLARSSL_CIPHER_AES_192_CTR:
-            return &aes_192_ctr_info;
-        case POLARSSL_CIPHER_AES_256_CTR:
-            return &aes_256_ctr_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif
-
-#if defined(POLARSSL_CAMELLIA_C)
-        case POLARSSL_CIPHER_CAMELLIA_128_CBC:
-            return &camellia_128_cbc_info;
-        case POLARSSL_CIPHER_CAMELLIA_192_CBC:
-            return &camellia_192_cbc_info;
-        case POLARSSL_CIPHER_CAMELLIA_256_CBC:
-            return &camellia_256_cbc_info;
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        case POLARSSL_CIPHER_CAMELLIA_128_CFB128:
-            return &camellia_128_cfb128_info;
-        case POLARSSL_CIPHER_CAMELLIA_192_CFB128:
-            return &camellia_192_cfb128_info;
-        case POLARSSL_CIPHER_CAMELLIA_256_CFB128:
-            return &camellia_256_cfb128_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        case POLARSSL_CIPHER_CAMELLIA_128_CTR:
-            return &camellia_128_ctr_info;
-        case POLARSSL_CIPHER_CAMELLIA_192_CTR:
-            return &camellia_192_ctr_info;
-        case POLARSSL_CIPHER_CAMELLIA_256_CTR:
-            return &camellia_256_ctr_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif
-
-#if defined(POLARSSL_DES_C)
-        case POLARSSL_CIPHER_DES_CBC:
-            return &des_cbc_info;
-        case POLARSSL_CIPHER_DES_EDE_CBC:
-            return &des_ede_cbc_info;
-        case POLARSSL_CIPHER_DES_EDE3_CBC:
-            return &des_ede3_cbc_info;
-#endif
-
-#if defined(POLARSSL_BLOWFISH_C)
-        case POLARSSL_CIPHER_BLOWFISH_CBC:
-            return &blowfish_cbc_info;
-
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-        case POLARSSL_CIPHER_BLOWFISH_CFB64:
-            return &blowfish_cfb64_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-        case POLARSSL_CIPHER_BLOWFISH_CTR:
-            return &blowfish_ctr_info;
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-
-#endif
-
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        case POLARSSL_CIPHER_NULL:
-            return &null_cipher_info;
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-        default:
-            return NULL;
-    }
+    return( NULL );
 }
 
 const cipher_info_t *cipher_info_from_string( const char *cipher_name )
 {
+    const cipher_definition_t *def;
+
     if( NULL == cipher_name )
-        return NULL;
+        return( NULL );
 
-    /* Get the appropriate cipher information */
-#if defined(POLARSSL_CAMELLIA_C)
-    if( !strcasecmp( "CAMELLIA-128-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_128_CBC );
-    if( !strcasecmp( "CAMELLIA-192-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_192_CBC );
-    if( !strcasecmp( "CAMELLIA-256-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_256_CBC );
+    for( def = cipher_definitions; def->info != NULL; def++ )
+        if( !  strcasecmp( def->info->name, cipher_name ) )
+            return( def->info );
 
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-    if( !strcasecmp( "CAMELLIA-128-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_128_CFB128 );
-    if( !strcasecmp( "CAMELLIA-192-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_192_CFB128 );
-    if( !strcasecmp( "CAMELLIA-256-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_256_CFB128 );
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
+    return( NULL );
+}
 
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-    if( !strcasecmp( "CAMELLIA-128-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_128_CTR );
-    if( !strcasecmp( "CAMELLIA-192-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_192_CTR );
-    if( !strcasecmp( "CAMELLIA-256-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_CAMELLIA_256_CTR );
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-#endif
+const cipher_info_t *cipher_info_from_values( const cipher_id_t cipher_id,
+                                              int key_length,
+                                              const cipher_mode_t mode )
+{
+    const cipher_definition_t *def;
 
-#if defined(POLARSSL_AES_C)
-    if( !strcasecmp( "AES-128-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_128_CBC );
-    if( !strcasecmp( "AES-192-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_192_CBC );
-    if( !strcasecmp( "AES-256-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_256_CBC );
+    for( def = cipher_definitions; def->info != NULL; def++ )
+        if( def->info->base->cipher == cipher_id &&
+            def->info->key_length == (unsigned) key_length &&
+            def->info->mode == mode )
+            return( def->info );
 
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-    if( !strcasecmp( "AES-128-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_128_CFB128 );
-    if( !strcasecmp( "AES-192-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_192_CFB128 );
-    if( !strcasecmp( "AES-256-CFB128", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_256_CFB128 );
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
+    return( NULL );
+}
 
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-    if( !strcasecmp( "AES-128-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_128_CTR );
-    if( !strcasecmp( "AES-192-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_192_CTR );
-    if( !strcasecmp( "AES-256-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_AES_256_CTR );
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-#endif
+void cipher_init( cipher_context_t *ctx )
+{
+    memset( ctx, 0, sizeof( cipher_context_t ) );
+}
 
-#if defined(POLARSSL_DES_C)
-    if( !strcasecmp( "DES-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_DES_CBC );
-    if( !strcasecmp( "DES-EDE-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_DES_EDE_CBC );
-    if( !strcasecmp( "DES-EDE3-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_DES_EDE3_CBC );
-#endif
+void cipher_free( cipher_context_t *ctx )
+{
+    if( ctx == NULL )
+        return;
 
-#if defined(POLARSSL_BLOWFISH_C)
-    if( !strcasecmp( "BLOWFISH-CBC", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CBC );
+    if( ctx->cipher_ctx )
+        ctx->cipher_info->base->ctx_free_func( ctx->cipher_ctx );
 
-#if defined(POLARSSL_CIPHER_MODE_CFB)
-    if( !strcasecmp( "BLOWFISH-CFB64", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CFB64 );
-#endif /* defined(POLARSSL_CIPHER_MODE_CFB) */
-
-#if defined(POLARSSL_CIPHER_MODE_CTR)
-    if( !strcasecmp( "BLOWFISH-CTR", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CTR );
-#endif /* defined(POLARSSL_CIPHER_MODE_CTR) */
-#endif
-
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-    if( !strcasecmp( "NULL", cipher_name ) )
-        return cipher_info_from_type( POLARSSL_CIPHER_NULL );
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-    return NULL;
+    polarssl_zeroize( ctx, sizeof(cipher_context_t) );
 }
 
 int cipher_init_ctx( cipher_context_t *ctx, const cipher_info_t *cipher_info )
 {
     if( NULL == cipher_info || NULL == ctx )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
 
     memset( ctx, 0, sizeof( cipher_context_t ) );
 
     if( NULL == ( ctx->cipher_ctx = cipher_info->base->ctx_alloc_func() ) )
-        return POLARSSL_ERR_CIPHER_ALLOC_FAILED;
+        return( POLARSSL_ERR_CIPHER_ALLOC_FAILED );
 
     ctx->cipher_info = cipher_info;
 
-    return 0;
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
+    /*
+     * Ignore possible errors caused by a cipher mode that doesn't use padding
+     */
+#if defined(POLARSSL_CIPHER_PADDING_PKCS7)
+    (void) cipher_set_padding_mode( ctx, POLARSSL_PADDING_PKCS7 );
+#else
+    (void) cipher_set_padding_mode( ctx, POLARSSL_PADDING_NONE );
+#endif
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
+
+    return( 0 );
 }
 
+/* Deprecated, redirects to cipher_free() */
 int cipher_free_ctx( cipher_context_t *ctx )
 {
-    if( ctx == NULL || ctx->cipher_info == NULL )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+    cipher_free( ctx );
 
-    ctx->cipher_info->base->ctx_free_func( ctx->cipher_ctx );
-
-    return 0;
+    return( 0 );
 }
 
 int cipher_setkey( cipher_context_t *ctx, const unsigned char *key,
         int key_length, const operation_t operation )
 {
     if( NULL == ctx || NULL == ctx->cipher_info )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( ( ctx->cipher_info->flags & POLARSSL_CIPHER_VARIABLE_KEY_LEN ) == 0 &&
+        (int) ctx->cipher_info->key_length != key_length )
+    {
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+    }
 
     ctx->key_length = key_length;
     ctx->operation = operation;
 
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-    if( ctx->cipher_info->mode == POLARSSL_MODE_NULL )
-        return 0;
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
     /*
      * For CFB and CTR mode always use the encryption key schedule
      */
@@ -353,46 +205,113 @@ int cipher_setkey( cipher_context_t *ctx, const unsigned char *key,
         return ctx->cipher_info->base->setkey_dec_func( ctx->cipher_ctx, key,
                 ctx->key_length );
 
-    return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+    return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
 }
 
-int cipher_reset( cipher_context_t *ctx, const unsigned char *iv )
+int cipher_set_iv( cipher_context_t *ctx,
+                   const unsigned char *iv, size_t iv_len )
 {
+    size_t actual_iv_size;
+
     if( NULL == ctx || NULL == ctx->cipher_info || NULL == iv )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    /* avoid buffer overflow in ctx->iv */
+    if( iv_len > POLARSSL_MAX_IV_LENGTH )
+        return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+
+    if( ( ctx->cipher_info->flags & POLARSSL_CIPHER_VARIABLE_IV_LEN ) != 0 )
+        actual_iv_size = iv_len;
+    else
+    {
+        actual_iv_size = ctx->cipher_info->iv_size;
+
+        /* avoid reading past the end of input buffer */
+        if( actual_iv_size > iv_len )
+            return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    memcpy( ctx->iv, iv, actual_iv_size );
+    ctx->iv_size = actual_iv_size;
+
+    return( 0 );
+}
+
+int cipher_reset( cipher_context_t *ctx )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
 
     ctx->unprocessed_len = 0;
 
-    memcpy( ctx->iv, iv, cipher_get_iv_size( ctx ) );
-
-    return 0;
+    return( 0 );
 }
 
-int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ilen,
-        unsigned char *output, size_t *olen )
+#if defined(POLARSSL_GCM_C)
+int cipher_update_ad( cipher_context_t *ctx,
+                      const unsigned char *ad, size_t ad_len )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( POLARSSL_MODE_GCM == ctx->cipher_info->mode )
+    {
+        return gcm_starts( (gcm_context *) ctx->cipher_ctx, ctx->operation,
+                           ctx->iv, ctx->iv_size, ad, ad_len );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_GCM_C */
+
+int cipher_update( cipher_context_t *ctx, const unsigned char *input,
+                   size_t ilen, unsigned char *output, size_t *olen )
 {
     int ret;
-    size_t copy_len = 0;
 
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen ||
-        input == output )
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
     {
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
     }
 
     *olen = 0;
 
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-    if( ctx->cipher_info->mode == POLARSSL_MODE_NULL )
+    if( ctx->cipher_info->mode == POLARSSL_MODE_ECB )
     {
-        memcpy( output, input, ilen );
-        *olen = ilen;
-        return 0;
-    }
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
+        if( ilen != cipher_get_block_size( ctx ) )
+            return( POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED );
 
+        *olen = ilen;
+
+        if( 0 != ( ret = ctx->cipher_info->base->ecb_func( ctx->cipher_ctx,
+                    ctx->operation, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        return( 0 );
+    }
+
+#if defined(POLARSSL_GCM_C)
+    if( ctx->cipher_info->mode == POLARSSL_MODE_GCM )
+    {
+        *olen = ilen;
+        return gcm_update( (gcm_context *) ctx->cipher_ctx, ilen, input,
+                           output );
+    }
+#endif
+
+    if( input == output &&
+       ( ctx->unprocessed_len != 0 || ilen % cipher_get_block_size( ctx ) ) )
+    {
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     if( ctx->cipher_info->mode == POLARSSL_MODE_CBC )
     {
+        size_t copy_len = 0;
+
         /*
          * If there is not enough data for a full block, cache it.
          */
@@ -405,7 +324,7 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
                     ilen );
 
             ctx->unprocessed_len += ilen;
-            return 0;
+            return( 0 );
         }
 
         /*
@@ -422,7 +341,7 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
                     ctx->operation, cipher_get_block_size( ctx ), ctx->iv,
                     ctx->unprocessed_data, output ) ) )
             {
-                return ret;
+                return( ret );
             }
 
             *olen += cipher_get_block_size( ctx );
@@ -440,7 +359,7 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
         {
             copy_len = ilen % cipher_get_block_size( ctx );
             if( copy_len == 0 && ctx->operation == POLARSSL_DECRYPT )
-                copy_len = cipher_get_block_size(ctx);
+                copy_len = cipher_get_block_size( ctx );
 
             memcpy( ctx->unprocessed_data, &( input[ilen - copy_len] ),
                     copy_len );
@@ -457,104 +376,291 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
             if( 0 != ( ret = ctx->cipher_info->base->cbc_func( ctx->cipher_ctx,
                     ctx->operation, ilen, ctx->iv, input, output ) ) )
             {
-                return ret;
+                return( ret );
             }
+
             *olen += ilen;
         }
 
-        return 0;
+        return( 0 );
     }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
+#if defined(POLARSSL_CIPHER_MODE_CFB)
     if( ctx->cipher_info->mode == POLARSSL_MODE_CFB )
     {
         if( 0 != ( ret = ctx->cipher_info->base->cfb_func( ctx->cipher_ctx,
                 ctx->operation, ilen, &ctx->unprocessed_len, ctx->iv,
                 input, output ) ) )
         {
-            return ret;
+            return( ret );
         }
 
         *olen = ilen;
 
-        return 0;
+        return( 0 );
     }
+#endif /* POLARSSL_CIPHER_MODE_CFB */
 
+#if defined(POLARSSL_CIPHER_MODE_CTR)
     if( ctx->cipher_info->mode == POLARSSL_MODE_CTR )
     {
         if( 0 != ( ret = ctx->cipher_info->base->ctr_func( ctx->cipher_ctx,
                 ilen, &ctx->unprocessed_len, ctx->iv,
                 ctx->unprocessed_data, input, output ) ) )
         {
-            return ret;
+            return( ret );
         }
 
         *olen = ilen;
 
-        return 0;
+        return( 0 );
     }
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
+#if defined(POLARSSL_CIPHER_MODE_STREAM)
+    if( ctx->cipher_info->mode == POLARSSL_MODE_STREAM )
+    {
+        if( 0 != ( ret = ctx->cipher_info->base->stream_func( ctx->cipher_ctx,
+                                                    ilen, input, output ) ) )
+        {
+            return( ret );
+        }
+
+        *olen = ilen;
+
+        return( 0 );
+    }
+#endif /* POLARSSL_CIPHER_MODE_STREAM */
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
+#if defined(POLARSSL_CIPHER_PADDING_PKCS7)
+/*
+ * PKCS7 (and PKCS5) padding: fill with ll bytes, with ll = padding_len
+ */
 static void add_pkcs_padding( unsigned char *output, size_t output_len,
         size_t data_len )
 {
     size_t padding_len = output_len - data_len;
-    unsigned char i = 0;
+    unsigned char i;
 
     for( i = 0; i < padding_len; i++ )
         output[data_len + i] = (unsigned char) padding_len;
 }
 
-static int get_pkcs_padding( unsigned char *input, unsigned int input_len,
-        size_t *data_len)
+static int get_pkcs_padding( unsigned char *input, size_t input_len,
+        size_t *data_len )
 {
-    unsigned int i, padding_len = 0;
+    size_t i, pad_idx;
+    unsigned char padding_len, bad = 0;
 
     if( NULL == input || NULL == data_len )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
 
     padding_len = input[input_len - 1];
-
-    if( padding_len > input_len )
-        return POLARSSL_ERR_CIPHER_INVALID_PADDING;
-
-    for( i = input_len - padding_len; i < input_len; i++ )
-        if( input[i] != padding_len )
-            return POLARSSL_ERR_CIPHER_INVALID_PADDING;
-
     *data_len = input_len - padding_len;
 
-    return 0;
+    /* Avoid logical || since it results in a branch */
+    bad |= padding_len > input_len;
+    bad |= padding_len == 0;
+
+    /* The number of bytes checked must be independent of padding_len,
+     * so pick input_len, which is usually 8 or 16 (one block) */
+    pad_idx = input_len - padding_len;
+    for( i = 0; i < input_len; i++ )
+        bad |= ( input[i] ^ padding_len ) * ( i >= pad_idx );
+
+    return( POLARSSL_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+}
+#endif /* POLARSSL_CIPHER_PADDING_PKCS7 */
+
+#if defined(POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS)
+/*
+ * One and zeros padding: fill with 80 00 ... 00
+ */
+static void add_one_and_zeros_padding( unsigned char *output,
+                                       size_t output_len, size_t data_len )
+{
+    size_t padding_len = output_len - data_len;
+    unsigned char i = 0;
+
+    output[data_len] = 0x80;
+    for( i = 1; i < padding_len; i++ )
+        output[data_len + i] = 0x00;
 }
 
-int cipher_finish( cipher_context_t *ctx, unsigned char *output, size_t *olen)
+static int get_one_and_zeros_padding( unsigned char *input, size_t input_len,
+                                      size_t *data_len )
 {
-    int ret = 0;
+    size_t i;
+    unsigned char done = 0, prev_done, bad;
 
+    if( NULL == input || NULL == data_len )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    bad = 0xFF;
+    *data_len = 0;
+    for( i = input_len; i > 0; i-- )
+    {
+        prev_done = done;
+        done |= ( input[i-1] != 0 );
+        *data_len |= ( i - 1 ) * ( done != prev_done );
+        bad &= ( input[i-1] ^ 0x80 ) | ( done == prev_done );
+    }
+
+    return( POLARSSL_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+
+}
+#endif /* POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS */
+
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN)
+/*
+ * Zeros and len padding: fill with 00 ... 00 ll, where ll is padding length
+ */
+static void add_zeros_and_len_padding( unsigned char *output,
+                                       size_t output_len, size_t data_len )
+{
+    size_t padding_len = output_len - data_len;
+    unsigned char i = 0;
+
+    for( i = 1; i < padding_len; i++ )
+        output[data_len + i - 1] = 0x00;
+    output[output_len - 1] = (unsigned char) padding_len;
+}
+
+static int get_zeros_and_len_padding( unsigned char *input, size_t input_len,
+                                      size_t *data_len )
+{
+    size_t i, pad_idx;
+    unsigned char padding_len, bad = 0;
+
+    if( NULL == input || NULL == data_len )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    padding_len = input[input_len - 1];
+    *data_len = input_len - padding_len;
+
+    /* Avoid logical || since it results in a branch */
+    bad |= padding_len > input_len;
+    bad |= padding_len == 0;
+
+    /* The number of bytes checked must be independent of padding_len */
+    pad_idx = input_len - padding_len;
+    for( i = 0; i < input_len - 1; i++ )
+        bad |= input[i] * ( i >= pad_idx );
+
+    return( POLARSSL_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );
+}
+#endif /* POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN */
+
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS)
+/*
+ * Zero padding: fill with 00 ... 00
+ */
+static void add_zeros_padding( unsigned char *output,
+                               size_t output_len, size_t data_len )
+{
+    size_t i;
+
+    for( i = data_len; i < output_len; i++ )
+        output[i] = 0x00;
+}
+
+static int get_zeros_padding( unsigned char *input, size_t input_len,
+                              size_t *data_len )
+{
+    size_t i;
+    unsigned char done = 0, prev_done;
+
+    if( NULL == input || NULL == data_len )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    *data_len = 0;
+    for( i = input_len; i > 0; i-- )
+    {
+        prev_done = done;
+        done |= ( input[i-1] != 0 );
+        *data_len |= i * ( done != prev_done );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_CIPHER_PADDING_ZEROS */
+
+/*
+ * No padding: don't pad :)
+ *
+ * There is no add_padding function (check for NULL in cipher_finish)
+ * but a trivial get_padding function
+ */
+static int get_no_padding( unsigned char *input, size_t input_len,
+                              size_t *data_len )
+{
+    if( NULL == input || NULL == data_len )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    *data_len = input_len;
+
+    return( 0 );
+}
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
+
+int cipher_finish( cipher_context_t *ctx,
+                   unsigned char *output, size_t *olen )
+{
     if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen )
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
 
     *olen = 0;
 
     if( POLARSSL_MODE_CFB == ctx->cipher_info->mode ||
         POLARSSL_MODE_CTR == ctx->cipher_info->mode ||
-        POLARSSL_MODE_NULL == ctx->cipher_info->mode )
+        POLARSSL_MODE_GCM == ctx->cipher_info->mode ||
+        POLARSSL_MODE_STREAM == ctx->cipher_info->mode )
     {
-        return 0;
+        return( 0 );
     }
 
+    if( POLARSSL_MODE_ECB == ctx->cipher_info->mode )
+    {
+        if( ctx->unprocessed_len != 0 )
+            return( POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+
+        return( 0 );
+    }
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     if( POLARSSL_MODE_CBC == ctx->cipher_info->mode )
     {
+        int ret = 0;
+
         if( POLARSSL_ENCRYPT == ctx->operation )
         {
-            add_pkcs_padding( ctx->unprocessed_data, cipher_get_iv_size( ctx ),
+            /* check for 'no padding' mode */
+            if( NULL == ctx->add_padding )
+            {
+                if( 0 != ctx->unprocessed_len )
+                    return( POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED );
+
+                return( 0 );
+            }
+
+            ctx->add_padding( ctx->unprocessed_data, cipher_get_iv_size( ctx ),
                     ctx->unprocessed_len );
         }
-        else if ( cipher_get_block_size( ctx ) != ctx->unprocessed_len )
+        else if( cipher_get_block_size( ctx ) != ctx->unprocessed_len )
         {
-            /* For decrypt operations, expect a full block */
-            return POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED;
+            /*
+             * For decrypt operations, expect a full block,
+             * or an empty block if no padding
+             */
+            if( NULL == ctx->add_padding && 0 == ctx->unprocessed_len )
+                return( 0 );
+
+            return( POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED );
         }
 
         /* cipher block */
@@ -562,33 +668,243 @@ int cipher_finish( cipher_context_t *ctx, unsigned char *output, size_t *olen)
                 ctx->operation, cipher_get_block_size( ctx ), ctx->iv,
                 ctx->unprocessed_data, output ) ) )
         {
-            return ret;
+            return( ret );
         }
 
         /* Set output size for decryption */
         if( POLARSSL_DECRYPT == ctx->operation )
-            return get_pkcs_padding( output, cipher_get_block_size( ctx ), olen );
+            return ctx->get_padding( output, cipher_get_block_size( ctx ),
+                                     olen );
 
         /* Set output size for encryption */
         *olen = cipher_get_block_size( ctx );
-        return 0;
+        return( 0 );
+    }
+#else
+    ((void) output);
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
+int cipher_set_padding_mode( cipher_context_t *ctx, cipher_padding_t mode )
+{
+    if( NULL == ctx ||
+        POLARSSL_MODE_CBC != ctx->cipher_info->mode )
+    {
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
     }
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
+    switch( mode )
+    {
+#if defined(POLARSSL_CIPHER_PADDING_PKCS7)
+    case POLARSSL_PADDING_PKCS7:
+        ctx->add_padding = add_pkcs_padding;
+        ctx->get_padding = get_pkcs_padding;
+        break;
+#endif
+#if defined(POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS)
+    case POLARSSL_PADDING_ONE_AND_ZEROS:
+        ctx->add_padding = add_one_and_zeros_padding;
+        ctx->get_padding = get_one_and_zeros_padding;
+        break;
+#endif
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN)
+    case POLARSSL_PADDING_ZEROS_AND_LEN:
+        ctx->add_padding = add_zeros_and_len_padding;
+        ctx->get_padding = get_zeros_and_len_padding;
+        break;
+#endif
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS)
+    case POLARSSL_PADDING_ZEROS:
+        ctx->add_padding = add_zeros_padding;
+        ctx->get_padding = get_zeros_padding;
+        break;
+#endif
+    case POLARSSL_PADDING_NONE:
+        ctx->add_padding = NULL;
+        ctx->get_padding = get_no_padding;
+        break;
+
+    default:
+        return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    }
+
+    return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
+
+#if defined(POLARSSL_GCM_C)
+int cipher_write_tag( cipher_context_t *ctx,
+                      unsigned char *tag, size_t tag_len )
+{
+    if( NULL == ctx || NULL == ctx->cipher_info || NULL == tag )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( POLARSSL_ENCRYPT != ctx->operation )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    if( POLARSSL_MODE_GCM == ctx->cipher_info->mode )
+        return gcm_finish( (gcm_context *) ctx->cipher_ctx, tag, tag_len );
+
+    return( 0 );
+}
+
+int cipher_check_tag( cipher_context_t *ctx,
+                      const unsigned char *tag, size_t tag_len )
+{
+    int ret;
+
+    if( NULL == ctx || NULL == ctx->cipher_info ||
+        POLARSSL_DECRYPT != ctx->operation )
+    {
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+    }
+
+    if( POLARSSL_MODE_GCM == ctx->cipher_info->mode )
+    {
+        unsigned char check_tag[16];
+        size_t i;
+        int diff;
+
+        if( tag_len > sizeof( check_tag ) )
+            return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+        if( 0 != ( ret = gcm_finish( (gcm_context *) ctx->cipher_ctx,
+                                     check_tag, tag_len ) ) )
+        {
+            return( ret );
+        }
+
+        /* Check the tag in "constant-time" */
+        for( diff = 0, i = 0; i < tag_len; i++ )
+            diff |= tag[i] ^ check_tag[i];
+
+        if( diff != 0 )
+            return( POLARSSL_ERR_CIPHER_AUTH_FAILED );
+
+        return( 0 );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_GCM_C */
+
+/*
+ * Packet-oriented wrapper for non-AEAD modes
+ */
+int cipher_crypt( cipher_context_t *ctx,
+                  const unsigned char *iv, size_t iv_len,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char *output, size_t *olen )
+{
+    int ret;
+    size_t finish_olen;
+
+    if( ( ret = cipher_set_iv( ctx, iv, iv_len ) ) != 0 )
+        return( ret );
+
+    if( ( ret = cipher_reset( ctx ) ) != 0 )
+        return( ret );
+
+    if( ( ret = cipher_update( ctx, input, ilen, output, olen ) ) != 0 )
+        return( ret );
+
+    if( ( ret = cipher_finish( ctx, output + *olen, &finish_olen ) ) != 0 )
+        return( ret );
+
+    *olen += finish_olen;
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_CIPHER_MODE_AEAD)
+/*
+ * Packet-oriented encryption for AEAD modes
+ */
+int cipher_auth_encrypt( cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         unsigned char *tag, size_t tag_len )
+{
+#if defined(POLARSSL_GCM_C)
+    if( POLARSSL_MODE_GCM == ctx->cipher_info->mode )
+    {
+        *olen = ilen;
+        return( gcm_crypt_and_tag( ctx->cipher_ctx, GCM_ENCRYPT, ilen,
+                                   iv, iv_len, ad, ad_len, input, output,
+                                   tag_len, tag ) );
+    }
+#endif /* POLARSSL_GCM_C */
+#if defined(POLARSSL_CCM_C)
+    if( POLARSSL_MODE_CCM == ctx->cipher_info->mode )
+    {
+        *olen = ilen;
+        return( ccm_encrypt_and_tag( ctx->cipher_ctx, ilen,
+                                     iv, iv_len, ad, ad_len, input, output,
+                                     tag, tag_len ) );
+    }
+#endif /* POLARSSL_CCM_C */
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+
+/*
+ * Packet-oriented decryption for AEAD modes
+ */
+int cipher_auth_decrypt( cipher_context_t *ctx,
+                         const unsigned char *iv, size_t iv_len,
+                         const unsigned char *ad, size_t ad_len,
+                         const unsigned char *input, size_t ilen,
+                         unsigned char *output, size_t *olen,
+                         const unsigned char *tag, size_t tag_len )
+{
+#if defined(POLARSSL_GCM_C)
+    if( POLARSSL_MODE_GCM == ctx->cipher_info->mode )
+    {
+        int ret;
+
+        *olen = ilen;
+        ret = gcm_auth_decrypt( ctx->cipher_ctx, ilen,
+                                iv, iv_len, ad, ad_len,
+                                tag, tag_len, input, output );
+
+        if( ret == POLARSSL_ERR_GCM_AUTH_FAILED )
+            ret = POLARSSL_ERR_CIPHER_AUTH_FAILED;
+
+        return( ret );
+    }
+#endif /* POLARSSL_GCM_C */
+#if defined(POLARSSL_CCM_C)
+    if( POLARSSL_MODE_CCM == ctx->cipher_info->mode )
+    {
+        int ret;
+
+        *olen = ilen;
+        ret = ccm_auth_decrypt( ctx->cipher_ctx, ilen,
+                                iv, iv_len, ad, ad_len,
+                                input, output, tag, tag_len );
+
+        if( ret == POLARSSL_ERR_CCM_AUTH_FAILED )
+            ret = POLARSSL_ERR_CIPHER_AUTH_FAILED;
+
+        return( ret );
+    }
+#endif /* POLARSSL_CCM_C */
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+}
+#endif /* POLARSSL_CIPHER_MODE_AEAD */
+
 
 #if defined(POLARSSL_SELF_TEST)
 
-#include <stdio.h>
-
-#define ASSERT(x) if (!(x)) { \
-        printf( "failed with %i at %s\n", value, (#x) ); \
-    return( 1 ); \
-}
 /*
  * Checkup routine
  */
-
 int cipher_self_test( int verbose )
 {
     ((void) verbose);
@@ -596,6 +912,6 @@ int cipher_self_test( int verbose )
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_CIPHER_C */
diff --git a/Externals/polarssl/library/cipher_wrap.c b/Externals/polarssl/library/cipher_wrap.c
index 9437212747..47a69a97b2 100644
--- a/Externals/polarssl/library/cipher_wrap.c
+++ b/Externals/polarssl/library/cipher_wrap.c
@@ -1,11 +1,11 @@
 /**
- * \file md_wrap.c
- * 
+ * \file cipher_wrap.c
+ *
  * \brief Generic cipher wrapper for PolarSSL
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_CIPHER_C)
 
@@ -37,6 +41,10 @@
 #include "polarssl/aes.h"
 #endif
 
+#if defined(POLARSSL_ARC4_C)
+#include "polarssl/arc4.h"
+#endif
+
 #if defined(POLARSSL_CAMELLIA_C)
 #include "polarssl/camellia.h"
 #endif
@@ -49,21 +57,84 @@
 #include "polarssl/blowfish.h"
 #endif
 
+#if defined(POLARSSL_GCM_C)
+#include "polarssl/gcm.h"
+#endif
+
+#if defined(POLARSSL_CCM_C)
+#include "polarssl/ccm.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 
+#if defined(POLARSSL_GCM_C)
+/* shared by all GCM ciphers */
+static void *gcm_ctx_alloc( void )
+{
+    return polarssl_malloc( sizeof( gcm_context ) );
+}
+
+static void gcm_ctx_free( void *ctx )
+{
+    gcm_free( ctx );
+    polarssl_free( ctx );
+}
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CCM_C)
+/* shared by all CCM ciphers */
+static void *ccm_ctx_alloc( void )
+{
+    return polarssl_malloc( sizeof( ccm_context ) );
+}
+
+static void ccm_ctx_free( void *ctx )
+{
+    ccm_free( ctx );
+    polarssl_free( ctx );
+}
+#endif /* POLARSSL_CCM_C */
+
 #if defined(POLARSSL_AES_C)
 
-int aes_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int aes_crypt_ecb_wrap( void *ctx, operation_t operation,
+        const unsigned char *input, unsigned char *output )
 {
-    return aes_crypt_cbc( (aes_context *) ctx, operation, length, iv, input, output );
+    return aes_crypt_ecb( (aes_context *) ctx, operation, input, output );
 }
 
-int aes_crypt_cfb128_wrap( void *ctx, operation_t operation, size_t length,
-        size_t *iv_off, unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int aes_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
+{
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    return aes_crypt_cbc( (aes_context *) ctx, operation, length, iv, input,
+                          output );
+#else
+    ((void) ctx);
+    ((void) operation);
+    ((void) length);
+    ((void) iv);
+    ((void) input);
+    ((void) output);
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+}
+
+static int aes_crypt_cfb128_wrap( void *ctx, operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CFB)
-    return aes_crypt_cfb128( (aes_context *) ctx, operation, length, iv_off, iv, input, output );
+    return aes_crypt_cfb128( (aes_context *) ctx, operation, length, iv_off, iv,
+                             input, output );
 #else
     ((void) ctx);
     ((void) operation);
@@ -73,12 +144,12 @@ int aes_crypt_cfb128_wrap( void *ctx, operation_t operation, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CFB */
 }
 
-int aes_crypt_ctr_wrap( void *ctx, size_t length,
-        size_t *nc_off, unsigned char *nonce_counter, unsigned char *stream_block,
+static int aes_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
         const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CTR)
@@ -93,47 +164,94 @@ int aes_crypt_ctr_wrap( void *ctx, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 }
 
-int aes_setkey_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int aes_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
 {
     return aes_setkey_dec( (aes_context *) ctx, key, key_length );
 }
 
-int aes_setkey_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
 {
     return aes_setkey_enc( (aes_context *) ctx, key, key_length );
 }
 
 static void * aes_ctx_alloc( void )
 {
-    return malloc( sizeof( aes_context ) );
+    aes_context *aes = (aes_context *) polarssl_malloc( sizeof( aes_context ) );
+
+    if( aes == NULL )
+        return( NULL );
+
+    aes_init( aes );
+
+    return( aes );
 }
 
 static void aes_ctx_free( void *ctx )
 {
-    free( ctx );
+    aes_free( (aes_context *) ctx );
+    polarssl_free( ctx );
 }
 
 const cipher_base_t aes_info = {
     POLARSSL_CIPHER_ID_AES,
+    aes_crypt_ecb_wrap,
     aes_crypt_cbc_wrap,
     aes_crypt_cfb128_wrap,
     aes_crypt_ctr_wrap,
+    NULL,
     aes_setkey_enc_wrap,
     aes_setkey_dec_wrap,
     aes_ctx_alloc,
     aes_ctx_free
 };
 
+const cipher_info_t aes_128_ecb_info = {
+    POLARSSL_CIPHER_AES_128_ECB,
+    POLARSSL_MODE_ECB,
+    128,
+    "AES-128-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+const cipher_info_t aes_192_ecb_info = {
+    POLARSSL_CIPHER_AES_192_ECB,
+    POLARSSL_MODE_ECB,
+    192,
+    "AES-192-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+const cipher_info_t aes_256_ecb_info = {
+    POLARSSL_CIPHER_AES_256_ECB,
+    POLARSSL_MODE_ECB,
+    256,
+    "AES-256-ECB",
+    16,
+    0,
+    16,
+    &aes_info
+};
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t aes_128_cbc_info = {
     POLARSSL_CIPHER_AES_128_CBC,
     POLARSSL_MODE_CBC,
     128,
     "AES-128-CBC",
     16,
+    0,
     16,
     &aes_info
 };
@@ -144,6 +262,7 @@ const cipher_info_t aes_192_cbc_info = {
     192,
     "AES-192-CBC",
     16,
+    0,
     16,
     &aes_info
 };
@@ -154,9 +273,11 @@ const cipher_info_t aes_256_cbc_info = {
     256,
     "AES-256-CBC",
     16,
+    0,
     16,
     &aes_info
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 const cipher_info_t aes_128_cfb128_info = {
@@ -165,6 +286,7 @@ const cipher_info_t aes_128_cfb128_info = {
     128,
     "AES-128-CFB128",
     16,
+    0,
     16,
     &aes_info
 };
@@ -175,6 +297,7 @@ const cipher_info_t aes_192_cfb128_info = {
     192,
     "AES-192-CFB128",
     16,
+    0,
     16,
     &aes_info
 };
@@ -185,6 +308,7 @@ const cipher_info_t aes_256_cfb128_info = {
     256,
     "AES-256-CFB128",
     16,
+    0,
     16,
     &aes_info
 };
@@ -197,6 +321,7 @@ const cipher_info_t aes_128_ctr_info = {
     128,
     "AES-128-CTR",
     16,
+    0,
     16,
     &aes_info
 };
@@ -207,6 +332,7 @@ const cipher_info_t aes_192_ctr_info = {
     192,
     "AES-192-CTR",
     16,
+    0,
     16,
     &aes_info
 };
@@ -217,26 +343,159 @@ const cipher_info_t aes_256_ctr_info = {
     256,
     "AES-256-CTR",
     16,
+    0,
     16,
     &aes_info
 };
 #endif /* POLARSSL_CIPHER_MODE_CTR */
 
-#endif
+#if defined(POLARSSL_GCM_C)
+static int gcm_aes_setkey_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
+{
+    return gcm_init( (gcm_context *) ctx, POLARSSL_CIPHER_ID_AES,
+                     key, key_length );
+}
+
+const cipher_base_t gcm_aes_info = {
+    POLARSSL_CIPHER_ID_AES,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    gcm_aes_setkey_wrap,
+    gcm_aes_setkey_wrap,
+    gcm_ctx_alloc,
+    gcm_ctx_free,
+};
+
+const cipher_info_t aes_128_gcm_info = {
+    POLARSSL_CIPHER_AES_128_GCM,
+    POLARSSL_MODE_GCM,
+    128,
+    "AES-128-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+
+const cipher_info_t aes_192_gcm_info = {
+    POLARSSL_CIPHER_AES_192_GCM,
+    POLARSSL_MODE_GCM,
+    192,
+    "AES-192-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+
+const cipher_info_t aes_256_gcm_info = {
+    POLARSSL_CIPHER_AES_256_GCM,
+    POLARSSL_MODE_GCM,
+    256,
+    "AES-256-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_aes_info
+};
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CCM_C)
+static int ccm_aes_setkey_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
+{
+    return ccm_init( (ccm_context *) ctx, POLARSSL_CIPHER_ID_AES,
+                     key, key_length );
+}
+
+const cipher_base_t ccm_aes_info = {
+    POLARSSL_CIPHER_ID_AES,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    ccm_aes_setkey_wrap,
+    ccm_aes_setkey_wrap,
+    ccm_ctx_alloc,
+    ccm_ctx_free,
+};
+
+const cipher_info_t aes_128_ccm_info = {
+    POLARSSL_CIPHER_AES_128_CCM,
+    POLARSSL_MODE_CCM,
+    128,
+    "AES-128-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+
+const cipher_info_t aes_192_ccm_info = {
+    POLARSSL_CIPHER_AES_192_CCM,
+    POLARSSL_MODE_CCM,
+    192,
+    "AES-192-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+
+const cipher_info_t aes_256_ccm_info = {
+    POLARSSL_CIPHER_AES_256_CCM,
+    POLARSSL_MODE_CCM,
+    256,
+    "AES-256-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_aes_info
+};
+#endif /* POLARSSL_CCM_C */
+
+#endif /* POLARSSL_AES_C */
 
 #if defined(POLARSSL_CAMELLIA_C)
 
-int camellia_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int camellia_crypt_ecb_wrap( void *ctx, operation_t operation,
+        const unsigned char *input, unsigned char *output )
 {
-    return camellia_crypt_cbc( (camellia_context *) ctx, operation, length, iv, input, output );
+    return camellia_crypt_ecb( (camellia_context *) ctx, operation, input,
+                               output );
 }
 
-int camellia_crypt_cfb128_wrap( void *ctx, operation_t operation, size_t length,
-        size_t *iv_off, unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int camellia_crypt_cbc_wrap( void *ctx, operation_t operation,
+        size_t length, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
+{
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    return camellia_crypt_cbc( (camellia_context *) ctx, operation, length, iv,
+                               input, output );
+#else
+    ((void) ctx);
+    ((void) operation);
+    ((void) length);
+    ((void) iv);
+    ((void) input);
+    ((void) output);
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+}
+
+static int camellia_crypt_cfb128_wrap( void *ctx, operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CFB)
-    return camellia_crypt_cfb128( (camellia_context *) ctx, operation, length, iv_off, iv, input, output );
+    return camellia_crypt_cfb128( (camellia_context *) ctx, operation, length,
+                                  iv_off, iv, input, output );
 #else
     ((void) ctx);
     ((void) operation);
@@ -246,17 +505,17 @@ int camellia_crypt_cfb128_wrap( void *ctx, operation_t operation, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CFB */
 }
 
-int camellia_crypt_ctr_wrap( void *ctx, size_t length,
-        size_t *nc_off, unsigned char *nonce_counter, unsigned char *stream_block,
+static int camellia_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
         const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CTR)
-    return camellia_crypt_ctr( (camellia_context *) ctx, length, nc_off, nonce_counter,
-                          stream_block, input, output );
+    return camellia_crypt_ctr( (camellia_context *) ctx, length, nc_off,
+                               nonce_counter, stream_block, input, output );
 #else
     ((void) ctx);
     ((void) length);
@@ -266,47 +525,95 @@ int camellia_crypt_ctr_wrap( void *ctx, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 }
 
-int camellia_setkey_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int camellia_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_length )
 {
     return camellia_setkey_dec( (camellia_context *) ctx, key, key_length );
 }
 
-int camellia_setkey_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int camellia_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_length )
 {
     return camellia_setkey_enc( (camellia_context *) ctx, key, key_length );
 }
 
 static void * camellia_ctx_alloc( void )
 {
-    return malloc( sizeof( camellia_context ) );
+    camellia_context *ctx;
+    ctx = (camellia_context *) polarssl_malloc( sizeof( camellia_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    camellia_init( ctx );
+
+    return( ctx );
 }
 
 static void camellia_ctx_free( void *ctx )
 {
-    free( ctx );
+    camellia_free( (camellia_context *) ctx );
+    polarssl_free( ctx );
 }
 
 const cipher_base_t camellia_info = {
     POLARSSL_CIPHER_ID_CAMELLIA,
+    camellia_crypt_ecb_wrap,
     camellia_crypt_cbc_wrap,
     camellia_crypt_cfb128_wrap,
     camellia_crypt_ctr_wrap,
+    NULL,
     camellia_setkey_enc_wrap,
     camellia_setkey_dec_wrap,
     camellia_ctx_alloc,
     camellia_ctx_free
 };
 
+const cipher_info_t camellia_128_ecb_info = {
+    POLARSSL_CIPHER_CAMELLIA_128_ECB,
+    POLARSSL_MODE_ECB,
+    128,
+    "CAMELLIA-128-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+const cipher_info_t camellia_192_ecb_info = {
+    POLARSSL_CIPHER_CAMELLIA_192_ECB,
+    POLARSSL_MODE_ECB,
+    192,
+    "CAMELLIA-192-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+const cipher_info_t camellia_256_ecb_info = {
+    POLARSSL_CIPHER_CAMELLIA_256_ECB,
+    POLARSSL_MODE_ECB,
+    256,
+    "CAMELLIA-256-ECB",
+    16,
+    0,
+    16,
+    &camellia_info
+};
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t camellia_128_cbc_info = {
     POLARSSL_CIPHER_CAMELLIA_128_CBC,
     POLARSSL_MODE_CBC,
     128,
     "CAMELLIA-128-CBC",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -317,6 +624,7 @@ const cipher_info_t camellia_192_cbc_info = {
     192,
     "CAMELLIA-192-CBC",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -327,9 +635,11 @@ const cipher_info_t camellia_256_cbc_info = {
     256,
     "CAMELLIA-256-CBC",
     16,
+    0,
     16,
     &camellia_info
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 const cipher_info_t camellia_128_cfb128_info = {
@@ -338,6 +648,7 @@ const cipher_info_t camellia_128_cfb128_info = {
     128,
     "CAMELLIA-128-CFB128",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -348,6 +659,7 @@ const cipher_info_t camellia_192_cfb128_info = {
     192,
     "CAMELLIA-192-CFB128",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -358,6 +670,7 @@ const cipher_info_t camellia_256_cfb128_info = {
     256,
     "CAMELLIA-256-CFB128",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -370,6 +683,7 @@ const cipher_info_t camellia_128_ctr_info = {
     128,
     "CAMELLIA-128-CTR",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -380,6 +694,7 @@ const cipher_info_t camellia_192_ctr_info = {
     192,
     "CAMELLIA-192-CTR",
     16,
+    0,
     16,
     &camellia_info
 };
@@ -390,93 +705,218 @@ const cipher_info_t camellia_256_ctr_info = {
     256,
     "CAMELLIA-256-CTR",
     16,
+    0,
     16,
     &camellia_info
 };
 #endif /* POLARSSL_CIPHER_MODE_CTR */
 
-#endif
+#if defined(POLARSSL_GCM_C)
+static int gcm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_length )
+{
+    return gcm_init( (gcm_context *) ctx, POLARSSL_CIPHER_ID_CAMELLIA,
+                     key, key_length );
+}
+
+const cipher_base_t gcm_camellia_info = {
+    POLARSSL_CIPHER_ID_CAMELLIA,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    gcm_camellia_setkey_wrap,
+    gcm_camellia_setkey_wrap,
+    gcm_ctx_alloc,
+    gcm_ctx_free,
+};
+
+const cipher_info_t camellia_128_gcm_info = {
+    POLARSSL_CIPHER_CAMELLIA_128_GCM,
+    POLARSSL_MODE_GCM,
+    128,
+    "CAMELLIA-128-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+
+const cipher_info_t camellia_192_gcm_info = {
+    POLARSSL_CIPHER_CAMELLIA_192_GCM,
+    POLARSSL_MODE_GCM,
+    192,
+    "CAMELLIA-192-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+
+const cipher_info_t camellia_256_gcm_info = {
+    POLARSSL_CIPHER_CAMELLIA_256_GCM,
+    POLARSSL_MODE_GCM,
+    256,
+    "CAMELLIA-256-GCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &gcm_camellia_info
+};
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CCM_C)
+static int ccm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
+                                     unsigned int key_length )
+{
+    return ccm_init( (ccm_context *) ctx, POLARSSL_CIPHER_ID_CAMELLIA,
+                     key, key_length );
+}
+
+const cipher_base_t ccm_camellia_info = {
+    POLARSSL_CIPHER_ID_CAMELLIA,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    ccm_camellia_setkey_wrap,
+    ccm_camellia_setkey_wrap,
+    ccm_ctx_alloc,
+    ccm_ctx_free,
+};
+
+const cipher_info_t camellia_128_ccm_info = {
+    POLARSSL_CIPHER_CAMELLIA_128_CCM,
+    POLARSSL_MODE_CCM,
+    128,
+    "CAMELLIA-128-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+
+const cipher_info_t camellia_192_ccm_info = {
+    POLARSSL_CIPHER_CAMELLIA_192_CCM,
+    POLARSSL_MODE_CCM,
+    192,
+    "CAMELLIA-192-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+
+const cipher_info_t camellia_256_ccm_info = {
+    POLARSSL_CIPHER_CAMELLIA_256_CCM,
+    POLARSSL_MODE_CCM,
+    256,
+    "CAMELLIA-256-CCM",
+    12,
+    POLARSSL_CIPHER_VARIABLE_IV_LEN,
+    16,
+    &ccm_camellia_info
+};
+#endif /* POLARSSL_CCM_C */
+
+#endif /* POLARSSL_CAMELLIA_C */
 
 #if defined(POLARSSL_DES_C)
 
-int des_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int des_crypt_ecb_wrap( void *ctx, operation_t operation,
+        const unsigned char *input, unsigned char *output )
 {
-    return des_crypt_cbc( (des_context *) ctx, operation, length, iv, input, output );
+    ((void) operation);
+    return des_crypt_ecb( (des_context *) ctx, input, output );
 }
 
-int des3_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int des3_crypt_ecb_wrap( void *ctx, operation_t operation,
+        const unsigned char *input, unsigned char *output )
 {
-    return des3_crypt_cbc( (des3_context *) ctx, operation, length, iv, input, output );
+    ((void) operation);
+    return des3_crypt_ecb( (des3_context *) ctx, input, output );
 }
 
-int des_crypt_cfb128_wrap( void *ctx, operation_t operation, size_t length,
-        size_t *iv_off, unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int des_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
 {
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    return des_crypt_cbc( (des_context *) ctx, operation, length, iv, input,
+                          output );
+#else
     ((void) ctx);
     ((void) operation);
     ((void) length);
-    ((void) iv_off);
     ((void) iv);
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 }
 
-int des_crypt_ctr_wrap( void *ctx, size_t length,
-        size_t *nc_off, unsigned char *nonce_counter, unsigned char *stream_block,
-        const unsigned char *input, unsigned char *output )
+static int des3_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
+        unsigned char *iv, const unsigned char *input, unsigned char *output )
 {
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    return des3_crypt_cbc( (des3_context *) ctx, operation, length, iv, input,
+                           output );
+#else
     ((void) ctx);
+    ((void) operation);
     ((void) length);
-    ((void) nc_off);
-    ((void) nonce_counter);
-    ((void) stream_block);
+    ((void) iv);
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 }
 
-
-int des_setkey_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des_setkey_dec_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
 {
     ((void) key_length);
 
     return des_setkey_dec( (des_context *) ctx, key );
 }
 
-int des_setkey_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des_setkey_enc_wrap( void *ctx, const unsigned char *key,
+                                unsigned int key_length )
 {
     ((void) key_length);
 
     return des_setkey_enc( (des_context *) ctx, key );
 }
 
-int des3_set2key_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des3_set2key_dec_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_length )
 {
     ((void) key_length);
 
     return des3_set2key_dec( (des3_context *) ctx, key );
 }
 
-int des3_set2key_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des3_set2key_enc_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_length )
 {
     ((void) key_length);
 
     return des3_set2key_enc( (des3_context *) ctx, key );
 }
 
-int des3_set3key_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des3_set3key_dec_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_length )
 {
     ((void) key_length);
 
     return des3_set3key_dec( (des3_context *) ctx, key );
 }
 
-int des3_set3key_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int des3_set3key_enc_wrap( void *ctx, const unsigned char *key,
+                                  unsigned int key_length )
 {
     ((void) key_length);
 
@@ -485,96 +925,187 @@ int des3_set3key_enc_wrap( void *ctx, const unsigned char *key, unsigned int key
 
 static void * des_ctx_alloc( void )
 {
-    return malloc( sizeof( des_context ) );
-}
+    des_context *des = (des_context *) polarssl_malloc( sizeof( des_context ) );
 
-static void * des3_ctx_alloc( void )
-{
-    return malloc( sizeof( des3_context ) );
+    if( des == NULL )
+        return( NULL );
+
+    des_init( des );
+
+    return( des );
 }
 
 static void des_ctx_free( void *ctx )
 {
-    free( ctx );
+    des_free( (des_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void * des3_ctx_alloc( void )
+{
+    des3_context *des3;
+    des3 = (des3_context *) polarssl_malloc( sizeof( des3_context ) );
+
+    if( des3 == NULL )
+        return( NULL );
+
+    des3_init( des3 );
+
+    return( des3 );
+}
+
+static void des3_ctx_free( void *ctx )
+{
+    des3_free( (des3_context *) ctx );
+    polarssl_free( ctx );
 }
 
 const cipher_base_t des_info = {
     POLARSSL_CIPHER_ID_DES,
+    des_crypt_ecb_wrap,
     des_crypt_cbc_wrap,
-    des_crypt_cfb128_wrap,
-    des_crypt_ctr_wrap,
+    NULL,
+    NULL,
+    NULL,
     des_setkey_enc_wrap,
     des_setkey_dec_wrap,
     des_ctx_alloc,
     des_ctx_free
 };
 
+const cipher_info_t des_ecb_info = {
+    POLARSSL_CIPHER_DES_ECB,
+    POLARSSL_MODE_ECB,
+    POLARSSL_KEY_LENGTH_DES,
+    "DES-ECB",
+    8,
+    0,
+    8,
+    &des_info
+};
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t des_cbc_info = {
     POLARSSL_CIPHER_DES_CBC,
     POLARSSL_MODE_CBC,
     POLARSSL_KEY_LENGTH_DES,
     "DES-CBC",
     8,
+    0,
     8,
     &des_info
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 const cipher_base_t des_ede_info = {
     POLARSSL_CIPHER_ID_DES,
+    des3_crypt_ecb_wrap,
     des3_crypt_cbc_wrap,
-    des_crypt_cfb128_wrap,
-    des_crypt_ctr_wrap,
+    NULL,
+    NULL,
+    NULL,
     des3_set2key_enc_wrap,
     des3_set2key_dec_wrap,
     des3_ctx_alloc,
-    des_ctx_free
+    des3_ctx_free
 };
 
+const cipher_info_t des_ede_ecb_info = {
+    POLARSSL_CIPHER_DES_EDE_ECB,
+    POLARSSL_MODE_ECB,
+    POLARSSL_KEY_LENGTH_DES_EDE,
+    "DES-EDE-ECB",
+    8,
+    0,
+    8,
+    &des_ede_info
+};
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t des_ede_cbc_info = {
     POLARSSL_CIPHER_DES_EDE_CBC,
     POLARSSL_MODE_CBC,
     POLARSSL_KEY_LENGTH_DES_EDE,
     "DES-EDE-CBC",
     8,
+    0,
     8,
     &des_ede_info
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 const cipher_base_t des_ede3_info = {
     POLARSSL_CIPHER_ID_DES,
+    des3_crypt_ecb_wrap,
     des3_crypt_cbc_wrap,
-    des_crypt_cfb128_wrap,
-    des_crypt_ctr_wrap,
+    NULL,
+    NULL,
+    NULL,
     des3_set3key_enc_wrap,
     des3_set3key_dec_wrap,
     des3_ctx_alloc,
-    des_ctx_free
+    des3_ctx_free
 };
 
+const cipher_info_t des_ede3_ecb_info = {
+    POLARSSL_CIPHER_DES_EDE3_ECB,
+    POLARSSL_MODE_ECB,
+    POLARSSL_KEY_LENGTH_DES_EDE3,
+    "DES-EDE3-ECB",
+    8,
+    0,
+    8,
+    &des_ede3_info
+};
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t des_ede3_cbc_info = {
     POLARSSL_CIPHER_DES_EDE3_CBC,
     POLARSSL_MODE_CBC,
     POLARSSL_KEY_LENGTH_DES_EDE3,
     "DES-EDE3-CBC",
     8,
+    0,
     8,
     &des_ede3_info
 };
-#endif
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
 
 #if defined(POLARSSL_BLOWFISH_C)
 
-int blowfish_crypt_cbc_wrap( void *ctx, operation_t operation, size_t length,
-        unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int blowfish_crypt_ecb_wrap( void *ctx, operation_t operation,
+        const unsigned char *input, unsigned char *output )
 {
-    return blowfish_crypt_cbc( (blowfish_context *) ctx, operation, length, iv, input, output );
+    return blowfish_crypt_ecb( (blowfish_context *) ctx, operation, input,
+                               output );
 }
 
-int blowfish_crypt_cfb64_wrap( void *ctx, operation_t operation, size_t length,
-        size_t *iv_off, unsigned char *iv, const unsigned char *input, unsigned char *output )
+static int blowfish_crypt_cbc_wrap( void *ctx, operation_t operation,
+        size_t length, unsigned char *iv, const unsigned char *input,
+        unsigned char *output )
+{
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    return blowfish_crypt_cbc( (blowfish_context *) ctx, operation, length, iv,
+                               input, output );
+#else
+    ((void) ctx);
+    ((void) operation);
+    ((void) length);
+    ((void) iv);
+    ((void) input);
+    ((void) output);
+
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+}
+
+static int blowfish_crypt_cfb64_wrap( void *ctx, operation_t operation,
+        size_t length, size_t *iv_off, unsigned char *iv,
+        const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CFB)
-    return blowfish_crypt_cfb64( (blowfish_context *) ctx, operation, length, iv_off, iv, input, output );
+    return blowfish_crypt_cfb64( (blowfish_context *) ctx, operation, length,
+                                 iv_off, iv, input, output );
 #else
     ((void) ctx);
     ((void) operation);
@@ -584,17 +1115,17 @@ int blowfish_crypt_cfb64_wrap( void *ctx, operation_t operation, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CFB */
 }
 
-int blowfish_crypt_ctr_wrap( void *ctx, size_t length,
-        size_t *nc_off, unsigned char *nonce_counter, unsigned char *stream_block,
+static int blowfish_crypt_ctr_wrap( void *ctx, size_t length, size_t *nc_off,
+        unsigned char *nonce_counter, unsigned char *stream_block,
         const unsigned char *input, unsigned char *output )
 {
 #if defined(POLARSSL_CIPHER_MODE_CTR)
-    return blowfish_crypt_ctr( (blowfish_context *) ctx, length, nc_off, nonce_counter,
-                          stream_block, input, output );
+    return blowfish_crypt_ctr( (blowfish_context *) ctx, length, nc_off,
+                               nonce_counter, stream_block, input, output );
 #else
     ((void) ctx);
     ((void) length);
@@ -604,50 +1135,71 @@ int blowfish_crypt_ctr_wrap( void *ctx, size_t length,
     ((void) input);
     ((void) output);
 
-    return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CIPHER_MODE_CTR */
 }
 
-int blowfish_setkey_dec_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
-{
-    return blowfish_setkey( (blowfish_context *) ctx, key, key_length );
-}
-
-int blowfish_setkey_enc_wrap( void *ctx, const unsigned char *key, unsigned int key_length )
+static int blowfish_setkey_wrap( void *ctx, const unsigned char *key,
+                                 unsigned int key_length )
 {
     return blowfish_setkey( (blowfish_context *) ctx, key, key_length );
 }
 
 static void * blowfish_ctx_alloc( void )
 {
-    return malloc( sizeof( blowfish_context ) );
+    blowfish_context *ctx;
+    ctx = (blowfish_context *) polarssl_malloc( sizeof( blowfish_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    blowfish_init( ctx );
+
+    return( ctx );
 }
 
 static void blowfish_ctx_free( void *ctx )
 {
-    free( ctx );
+    blowfish_free( (blowfish_context *) ctx );
+    polarssl_free( ctx );
 }
 
 const cipher_base_t blowfish_info = {
     POLARSSL_CIPHER_ID_BLOWFISH,
+    blowfish_crypt_ecb_wrap,
     blowfish_crypt_cbc_wrap,
     blowfish_crypt_cfb64_wrap,
     blowfish_crypt_ctr_wrap,
-    blowfish_setkey_enc_wrap,
-    blowfish_setkey_dec_wrap,
+    NULL,
+    blowfish_setkey_wrap,
+    blowfish_setkey_wrap,
     blowfish_ctx_alloc,
     blowfish_ctx_free
 };
 
+const cipher_info_t blowfish_ecb_info = {
+    POLARSSL_CIPHER_BLOWFISH_ECB,
+    POLARSSL_MODE_ECB,
+    128,
+    "BLOWFISH-ECB",
+    8,
+    POLARSSL_CIPHER_VARIABLE_KEY_LEN,
+    8,
+    &blowfish_info
+};
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 const cipher_info_t blowfish_cbc_info = {
     POLARSSL_CIPHER_BLOWFISH_CBC,
     POLARSSL_MODE_CBC,
     128,
     "BLOWFISH-CBC",
     8,
+    POLARSSL_CIPHER_VARIABLE_KEY_LEN,
     8,
     &blowfish_info
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #if defined(POLARSSL_CIPHER_MODE_CFB)
 const cipher_info_t blowfish_cfb64_info = {
@@ -656,6 +1208,7 @@ const cipher_info_t blowfish_cfb64_info = {
     128,
     "BLOWFISH-CFB64",
     8,
+    POLARSSL_CIPHER_VARIABLE_KEY_LEN,
     8,
     &blowfish_info
 };
@@ -668,18 +1221,100 @@ const cipher_info_t blowfish_ctr_info = {
     128,
     "BLOWFISH-CTR",
     8,
+    POLARSSL_CIPHER_VARIABLE_KEY_LEN,
     8,
     &blowfish_info
 };
 #endif /* POLARSSL_CIPHER_MODE_CTR */
 #endif /* POLARSSL_BLOWFISH_C */
 
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-static void * null_ctx_alloc( void )
+#if defined(POLARSSL_ARC4_C)
+static int arc4_crypt_stream_wrap( void *ctx, size_t length,
+                                   const unsigned char *input,
+                                   unsigned char *output )
 {
-    return (void *) 1;
+    return( arc4_crypt( (arc4_context *) ctx, length, input, output ) );
 }
 
+static int arc4_setkey_wrap( void *ctx, const unsigned char *key,
+                             unsigned int key_length )
+{
+    /* we get key_length in bits, arc4 expects it in bytes */
+    if( key_length % 8 != 0 )
+        return( POLARSSL_ERR_CIPHER_BAD_INPUT_DATA );
+
+    arc4_setup( (arc4_context *) ctx, key, key_length / 8 );
+    return( 0 );
+}
+
+static void * arc4_ctx_alloc( void )
+{
+    arc4_context *ctx;
+    ctx = (arc4_context *) polarssl_malloc( sizeof( arc4_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    arc4_init( ctx );
+
+    return( ctx );
+}
+
+static void arc4_ctx_free( void *ctx )
+{
+    arc4_free( (arc4_context *) ctx );
+    polarssl_free( ctx );
+}
+
+const cipher_base_t arc4_base_info = {
+    POLARSSL_CIPHER_ID_ARC4,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    arc4_crypt_stream_wrap,
+    arc4_setkey_wrap,
+    arc4_setkey_wrap,
+    arc4_ctx_alloc,
+    arc4_ctx_free
+};
+
+const cipher_info_t arc4_128_info = {
+    POLARSSL_CIPHER_ARC4_128,
+    POLARSSL_MODE_STREAM,
+    128,
+    "ARC4-128",
+    0,
+    0,
+    1,
+    &arc4_base_info
+};
+#endif /* POLARSSL_ARC4_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+static int null_crypt_stream( void *ctx, size_t length,
+                              const unsigned char *input,
+                              unsigned char *output )
+{
+    ((void) ctx);
+    memmove( output, input, length );
+    return( 0 );
+}
+
+static int null_setkey( void *ctx, const unsigned char *key,
+                        unsigned int key_length )
+{
+    ((void) ctx);
+    ((void) key);
+    ((void) key_length);
+
+    return( 0 );
+}
+
+static void * null_ctx_alloc( void )
+{
+    return( (void *) 1 )
+}
 
 static void null_ctx_free( void *ctx )
 {
@@ -692,20 +1327,125 @@ const cipher_base_t null_base_info = {
     NULL,
     NULL,
     NULL,
-    NULL,
+    null_crypt_stream,
+    null_setkey,
+    null_setkey,
     null_ctx_alloc,
     null_ctx_free
 };
 
 const cipher_info_t null_cipher_info = {
     POLARSSL_CIPHER_NULL,
-    POLARSSL_MODE_NULL,
+    POLARSSL_MODE_STREAM,
     0,
     "NULL",
-    1,
+    0,
+    0,
     1,
     &null_base_info
 };
 #endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
 
+const cipher_definition_t cipher_definitions[] =
+{
+#if defined(POLARSSL_AES_C)
+    { POLARSSL_CIPHER_AES_128_ECB,          &aes_128_ecb_info },
+    { POLARSSL_CIPHER_AES_192_ECB,          &aes_192_ecb_info },
+    { POLARSSL_CIPHER_AES_256_ECB,          &aes_256_ecb_info },
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { POLARSSL_CIPHER_AES_128_CBC,          &aes_128_cbc_info },
+    { POLARSSL_CIPHER_AES_192_CBC,          &aes_192_cbc_info },
+    { POLARSSL_CIPHER_AES_256_CBC,          &aes_256_cbc_info },
 #endif
+#if defined(POLARSSL_CIPHER_MODE_CFB)
+    { POLARSSL_CIPHER_AES_128_CFB128,       &aes_128_cfb128_info },
+    { POLARSSL_CIPHER_AES_192_CFB128,       &aes_192_cfb128_info },
+    { POLARSSL_CIPHER_AES_256_CFB128,       &aes_256_cfb128_info },
+#endif
+#if defined(POLARSSL_CIPHER_MODE_CTR)
+    { POLARSSL_CIPHER_AES_128_CTR,          &aes_128_ctr_info },
+    { POLARSSL_CIPHER_AES_192_CTR,          &aes_192_ctr_info },
+    { POLARSSL_CIPHER_AES_256_CTR,          &aes_256_ctr_info },
+#endif
+#if defined(POLARSSL_GCM_C)
+    { POLARSSL_CIPHER_AES_128_GCM,          &aes_128_gcm_info },
+    { POLARSSL_CIPHER_AES_192_GCM,          &aes_192_gcm_info },
+    { POLARSSL_CIPHER_AES_256_GCM,          &aes_256_gcm_info },
+#endif
+#if defined(POLARSSL_CCM_C)
+    { POLARSSL_CIPHER_AES_128_CCM,          &aes_128_ccm_info },
+    { POLARSSL_CIPHER_AES_192_CCM,          &aes_192_ccm_info },
+    { POLARSSL_CIPHER_AES_256_CCM,          &aes_256_ccm_info },
+#endif
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_ARC4_C)
+    { POLARSSL_CIPHER_ARC4_128,             &arc4_128_info },
+#endif
+
+#if defined(POLARSSL_BLOWFISH_C)
+    { POLARSSL_CIPHER_BLOWFISH_ECB,         &blowfish_ecb_info },
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { POLARSSL_CIPHER_BLOWFISH_CBC,         &blowfish_cbc_info },
+#endif
+#if defined(POLARSSL_CIPHER_MODE_CFB)
+    { POLARSSL_CIPHER_BLOWFISH_CFB64,       &blowfish_cfb64_info },
+#endif
+#if defined(POLARSSL_CIPHER_MODE_CTR)
+    { POLARSSL_CIPHER_BLOWFISH_CTR,         &blowfish_ctr_info },
+#endif
+#endif /* POLARSSL_BLOWFISH_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+    { POLARSSL_CIPHER_CAMELLIA_128_ECB,     &camellia_128_ecb_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_ECB,     &camellia_192_ecb_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_ECB,     &camellia_256_ecb_info },
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { POLARSSL_CIPHER_CAMELLIA_128_CBC,     &camellia_128_cbc_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_CBC,     &camellia_192_cbc_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_CBC,     &camellia_256_cbc_info },
+#endif
+#if defined(POLARSSL_CIPHER_MODE_CFB)
+    { POLARSSL_CIPHER_CAMELLIA_128_CFB128,  &camellia_128_cfb128_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_CFB128,  &camellia_192_cfb128_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_CFB128,  &camellia_256_cfb128_info },
+#endif
+#if defined(POLARSSL_CIPHER_MODE_CTR)
+    { POLARSSL_CIPHER_CAMELLIA_128_CTR,     &camellia_128_ctr_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_CTR,     &camellia_192_ctr_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_CTR,     &camellia_256_ctr_info },
+#endif
+#if defined(POLARSSL_GCM_C)
+    { POLARSSL_CIPHER_CAMELLIA_128_GCM,     &camellia_128_gcm_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_GCM,     &camellia_192_gcm_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_GCM,     &camellia_256_gcm_info },
+#endif
+#if defined(POLARSSL_CCM_C)
+    { POLARSSL_CIPHER_CAMELLIA_128_CCM,     &camellia_128_ccm_info },
+    { POLARSSL_CIPHER_CAMELLIA_192_CCM,     &camellia_192_ccm_info },
+    { POLARSSL_CIPHER_CAMELLIA_256_CCM,     &camellia_256_ccm_info },
+#endif
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+    { POLARSSL_CIPHER_DES_ECB,              &des_ecb_info },
+    { POLARSSL_CIPHER_DES_EDE_ECB,          &des_ede_ecb_info },
+    { POLARSSL_CIPHER_DES_EDE3_ECB,         &des_ede3_ecb_info },
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { POLARSSL_CIPHER_DES_CBC,              &des_cbc_info },
+    { POLARSSL_CIPHER_DES_EDE_CBC,          &des_ede_cbc_info },
+    { POLARSSL_CIPHER_DES_EDE3_CBC,         &des_ede3_cbc_info },
+#endif
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+    { POLARSSL_CIPHER_NULL,                 &null_cipher_info },
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+
+    { 0, NULL }
+};
+
+#define NUM_CIPHERS sizeof cipher_definitions / sizeof cipher_definitions[0]
+int supported_ciphers[NUM_CIPHERS];
+
+#endif /* POLARSSL_CIPHER_C */
diff --git a/Externals/polarssl/library/ctr_drbg.c b/Externals/polarssl/library/ctr_drbg.c
index 8cf03712e0..96ee4f1625 100644
--- a/Externals/polarssl/library/ctr_drbg.c
+++ b/Externals/polarssl/library/ctr_drbg.c
@@ -1,7 +1,7 @@
 /*
  *  CTR_DRBG implementation based on AES-256 (NIST SP 800-90)
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -28,7 +28,11 @@
  *  http://csrc.nist.gov/publications/nistpubs/800-90/SP800-90revised_March2007.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_CTR_DRBG_C)
 
@@ -38,6 +42,17 @@
 #include <stdio.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * Non-public function wrapped by ctr_crbg_init(). Necessary to allow NIST
  * tests to succeed (which require known length fixed entropy)
@@ -56,6 +71,8 @@ int ctr_drbg_init_entropy_len(
     memset( ctx, 0, sizeof(ctr_drbg_context) );
     memset( key, 0, CTR_DRBG_KEYSIZE );
 
+    aes_init( &ctx->aes_ctx );
+
     ctx->f_entropy = f_entropy;
     ctx->p_entropy = p_entropy;
 
@@ -83,6 +100,15 @@ int ctr_drbg_init( ctr_drbg_context *ctx,
                                        CTR_DRBG_ENTROPY_LEN ) );
 }
 
+void ctr_drbg_free( ctr_drbg_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    aes_free( &ctx->aes_ctx );
+    polarssl_zeroize( ctx, sizeof( ctr_drbg_context ) );
+}
+
 void ctr_drbg_set_prediction_resistance( ctr_drbg_context *ctx, int resistance )
 {
     ctx->prediction_resistance = resistance;
@@ -92,25 +118,27 @@ void ctr_drbg_set_entropy_len( ctr_drbg_context *ctx, size_t len )
 {
     ctx->entropy_len = len;
 }
-    
+
 void ctr_drbg_set_reseed_interval( ctr_drbg_context *ctx, int interval )
 {
     ctx->reseed_interval = interval;
 }
-    
-int block_cipher_df( unsigned char *output,
-                     const unsigned char *data, size_t data_len )
+
+static int block_cipher_df( unsigned char *output,
+                            const unsigned char *data, size_t data_len )
 {
     unsigned char buf[CTR_DRBG_MAX_SEED_INPUT + CTR_DRBG_BLOCKSIZE + 16];
     unsigned char tmp[CTR_DRBG_SEEDLEN];
     unsigned char key[CTR_DRBG_KEYSIZE];
     unsigned char chain[CTR_DRBG_BLOCKSIZE];
-    unsigned char *p = buf, *iv;
+    unsigned char *p, *iv;
     aes_context aes_ctx;
 
-    int i, j, buf_len, use_len;
+    int i, j;
+    size_t buf_len, use_len;
 
     memset( buf, 0, CTR_DRBG_MAX_SEED_INPUT + CTR_DRBG_BLOCKSIZE + 16 );
+    aes_init( &aes_ctx );
 
     /*
      * Construct IV (16 bytes) and S in buffer
@@ -150,11 +178,12 @@ int block_cipher_df( unsigned char *output,
             for( i = 0; i < CTR_DRBG_BLOCKSIZE; i++ )
                 chain[i] ^= p[i];
             p += CTR_DRBG_BLOCKSIZE;
-            use_len -= CTR_DRBG_BLOCKSIZE;
+            use_len -= ( use_len >= CTR_DRBG_BLOCKSIZE ) ?
+                       CTR_DRBG_BLOCKSIZE : use_len;
 
             aes_crypt_ecb( &aes_ctx, AES_ENCRYPT, chain, chain );
         }
-        
+
         memcpy( tmp + j, chain, CTR_DRBG_BLOCKSIZE );
 
         /*
@@ -177,10 +206,12 @@ int block_cipher_df( unsigned char *output,
         p += CTR_DRBG_BLOCKSIZE;
     }
 
+    aes_free( &aes_ctx );
+
     return( 0 );
 }
 
-int ctr_drbg_update_internal( ctr_drbg_context *ctx,
+static int ctr_drbg_update_internal( ctr_drbg_context *ctx,
                               const unsigned char data[CTR_DRBG_SEEDLEN] )
 {
     unsigned char tmp[CTR_DRBG_SEEDLEN];
@@ -242,7 +273,7 @@ int ctr_drbg_reseed( ctr_drbg_context *ctx,
     memset( seed, 0, CTR_DRBG_MAX_SEED_INPUT );
 
     /*
-     * Gather enropy_len bytes of entropy to seed state
+     * Gather entropy_len bytes of entropy to seed state
      */
     if( 0 != ctx->f_entropy( ctx->p_entropy, seed,
                              ctx->entropy_len ) )
@@ -274,7 +305,7 @@ int ctr_drbg_reseed( ctr_drbg_context *ctx,
 
     return( 0 );
 }
-    
+
 int ctr_drbg_random_with_add( void *p_rng,
                               unsigned char *output, size_t output_len,
                               const unsigned char *additional, size_t add_len )
@@ -324,7 +355,8 @@ int ctr_drbg_random_with_add( void *p_rng,
          */
         aes_crypt_ecb( &ctx->aes_ctx, AES_ENCRYPT, ctx->counter, tmp );
 
-        use_len = (output_len > CTR_DRBG_BLOCKSIZE ) ? CTR_DRBG_BLOCKSIZE : output_len;
+        use_len = ( output_len > CTR_DRBG_BLOCKSIZE ) ? CTR_DRBG_BLOCKSIZE :
+                                                       output_len;
         /*
          * Copy random block to destination
          */
@@ -348,7 +380,7 @@ int ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len )
 #if defined(POLARSSL_FS_IO)
 int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path )
 {
-    int ret;
+    int ret = POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR;
     FILE *f;
     unsigned char buf[ CTR_DRBG_MAX_INPUT ];
 
@@ -356,16 +388,19 @@ int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path )
         return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR );
 
     if( ( ret = ctr_drbg_random( ctx, buf, CTR_DRBG_MAX_INPUT ) ) != 0 )
-        return( ret );
+        goto exit;
 
     if( fwrite( buf, 1, CTR_DRBG_MAX_INPUT, f ) != CTR_DRBG_MAX_INPUT )
     {
-        fclose( f );
-        return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR );
+        ret = POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR;
+        goto exit;
     }
 
+    ret = 0;
+
+exit:
     fclose( f );
-    return( 0 );
+    return( ret );
 }
 
 int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
@@ -382,7 +417,10 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
     fseek( f, 0, SEEK_SET );
 
     if( n > CTR_DRBG_MAX_INPUT )
+    {
+        fclose( f );
         return( POLARSSL_ERR_CTR_DRBG_INPUT_TOO_BIG );
+    }
 
     if( fread( buf, 1, n, f ) != n )
     {
@@ -390,10 +428,10 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
         return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR );
     }
 
-    ctr_drbg_update( ctx, buf, n );
-    
     fclose( f );
-    
+
+    ctr_drbg_update( ctx, buf, n );
+
     return( ctr_drbg_write_seed_file( ctx, path ) );
 }
 #endif /* POLARSSL_FS_IO */
@@ -402,7 +440,7 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
 
 #include <stdio.h>
 
-unsigned char entropy_source_pr[96] =
+static unsigned char entropy_source_pr[96] =
     { 0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16,
       0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02,
       0x6a, 0x54, 0x6f, 0x0c, 0x70, 0x81, 0x49, 0x8b,
@@ -416,7 +454,7 @@ unsigned char entropy_source_pr[96] =
       0x93, 0x92, 0xcf, 0xc5, 0x23, 0x12, 0xd5, 0x56,
       0x2c, 0x4a, 0x6e, 0xff, 0xdc, 0x10, 0xd0, 0x68 };
 
-unsigned char entropy_source_nopr[64] =
+static unsigned char entropy_source_nopr[64] =
     { 0x5a, 0x19, 0x4d, 0x5e, 0x2b, 0x31, 0x58, 0x14,
       0x54, 0xde, 0xf6, 0x75, 0xfb, 0x79, 0x58, 0xfe,
       0xc7, 0xdb, 0x87, 0x3e, 0x56, 0x89, 0xfc, 0x9d,
@@ -426,31 +464,39 @@ unsigned char entropy_source_nopr[64] =
       0xf5, 0x98, 0x3d, 0x77, 0x1c, 0x1b, 0x13, 0x7e,
       0x4e, 0x0f, 0x9d, 0x8e, 0xf4, 0x09, 0xf9, 0x2e };
 
-unsigned char nonce_pers_pr[16] =
+static const unsigned char nonce_pers_pr[16] =
     { 0xd2, 0x54, 0xfc, 0xff, 0x02, 0x1e, 0x69, 0xd2,
       0x29, 0xc9, 0xcf, 0xad, 0x85, 0xfa, 0x48, 0x6c };
 
-unsigned char nonce_pers_nopr[16] =
+static const unsigned char nonce_pers_nopr[16] =
     { 0x1b, 0x54, 0xb8, 0xff, 0x06, 0x42, 0xbf, 0xf5,
       0x21, 0xf1, 0x5c, 0x1c, 0x0b, 0x66, 0x5f, 0x3f };
 
-unsigned char result_pr[16] =
+static const unsigned char result_pr[16] =
     { 0x34, 0x01, 0x16, 0x56, 0xb4, 0x29, 0x00, 0x8f,
       0x35, 0x63, 0xec, 0xb5, 0xf2, 0x59, 0x07, 0x23 };
 
-unsigned char result_nopr[16] =
+static const unsigned char result_nopr[16] =
     { 0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88,
       0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f };
 
-int test_offset;
-int ctr_drbg_self_test_entropy( void *data, unsigned char *buf, size_t len )
+static size_t test_offset;
+static int ctr_drbg_self_test_entropy( void *data, unsigned char *buf,
+                                       size_t len )
 {
-    unsigned char *p = data;
+    const unsigned char *p = data;
     memcpy( buf, p + test_offset, len );
-    test_offset += 32;
+    test_offset += len;
     return( 0 );
 }
 
+#define CHK( c )    if( (c) != 0 )                          \
+                    {                                       \
+                        if( verbose != 0 )                  \
+                            polarssl_printf( "failed\n" );  \
+                        return( 1 );                        \
+                    }
+
 /*
  * Checkup routine
  */
@@ -463,100 +509,41 @@ int ctr_drbg_self_test( int verbose )
      * Based on a NIST CTR_DRBG test vector (PR = True)
      */
     if( verbose != 0 )
-        printf( "  CTR_DRBG (PR = TRUE) : " );
+        polarssl_printf( "  CTR_DRBG (PR = TRUE) : " );
 
     test_offset = 0;
-    if( ctr_drbg_init_entropy_len( &ctx, ctr_drbg_self_test_entropy, entropy_source_pr, nonce_pers_pr, 16, 32 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
+    CHK( ctr_drbg_init_entropy_len( &ctx, ctr_drbg_self_test_entropy,
+                                entropy_source_pr, nonce_pers_pr, 16, 32 ) );
     ctr_drbg_set_prediction_resistance( &ctx, CTR_DRBG_PR_ON );
+    CHK( ctr_drbg_random( &ctx, buf, CTR_DRBG_BLOCKSIZE ) );
+    CHK( ctr_drbg_random( &ctx, buf, CTR_DRBG_BLOCKSIZE ) );
+    CHK( memcmp( buf, result_pr, CTR_DRBG_BLOCKSIZE ) );
 
-    if( ctr_drbg_random( &ctx, buf, CTR_DRBG_BLOCKSIZE ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( ctr_drbg_random( &ctx, buf, CTR_DRBG_BLOCKSIZE ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( memcmp( buf, result_pr, CTR_DRBG_BLOCKSIZE ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-    
     if( verbose != 0 )
-        printf( "passed\n" );
+        polarssl_printf( "passed\n" );
 
     /*
      * Based on a NIST CTR_DRBG test vector (PR = FALSE)
      */
     if( verbose != 0 )
-        printf( "  CTR_DRBG (PR = FALSE): " );
+        polarssl_printf( "  CTR_DRBG (PR = FALSE): " );
 
     test_offset = 0;
-    if( ctr_drbg_init_entropy_len( &ctx, ctr_drbg_self_test_entropy, entropy_source_nopr, nonce_pers_nopr, 16, 32 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( ctr_drbg_random( &ctx, buf, 16 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( ctr_drbg_reseed( &ctx, NULL, 0 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( ctr_drbg_random( &ctx, buf, 16 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-
-    if( memcmp( buf, result_nopr, 16 ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( 1 );
-    }
-    
-    if( verbose != 0 )
-        printf( "passed\n" );
+    CHK( ctr_drbg_init_entropy_len( &ctx, ctr_drbg_self_test_entropy,
+                            entropy_source_nopr, nonce_pers_nopr, 16, 32 ) );
+    CHK( ctr_drbg_random( &ctx, buf, 16 ) );
+    CHK( ctr_drbg_reseed( &ctx, NULL, 0 ) );
+    CHK( ctr_drbg_random( &ctx, buf, 16 ) );
+    CHK( memcmp( buf, result_nopr, 16 ) );
 
     if( verbose != 0 )
-            printf( "\n" );
+        polarssl_printf( "passed\n" );
+
+    if( verbose != 0 )
+            polarssl_printf( "\n" );
 
     return( 0 );
 }
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_CTR_DRBG_C */
diff --git a/Externals/polarssl/library/debug.c b/Externals/polarssl/library/debug.c
index 81ee649074..a81f502bfb 100644
--- a/Externals/polarssl/library/debug.c
+++ b/Externals/polarssl/library/debug.c
@@ -1,7 +1,7 @@
 /*
  *  Debugging routines
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,7 +23,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_DEBUG_C)
 
@@ -32,13 +36,32 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#if defined _MSC_VER && !defined  snprintf
+#if defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
+#if !defined  snprintf
 #define  snprintf  _snprintf
 #endif
 
-#if defined _MSC_VER && !defined vsnprintf
+#if !defined vsnprintf
 #define vsnprintf _vsnprintf
 #endif
+#endif /* _MSC_VER */
+
+static int debug_log_mode = POLARSSL_DEBUG_DFL_MODE;
+static int debug_threshold = 0;
+
+void debug_set_log_mode( int log_mode )
+{
+    debug_log_mode = log_mode;
+}
+
+void debug_set_threshold( int threshold )
+{
+    debug_threshold = threshold;
+}
 
 char *debug_fmt( const char *format, ... )
 {
@@ -60,9 +83,15 @@ void debug_print_msg( const ssl_context *ssl, int level,
     char str[512];
     int maxlen = sizeof( str ) - 1;
 
-    if( ssl->f_dbg == NULL )
+    if( ssl->f_dbg == NULL || level > debug_threshold )
         return;
 
+    if( debug_log_mode == POLARSSL_DEBUG_LOG_RAW )
+    {
+        ssl->f_dbg( ssl->p_dbg, level, text );
+        return;
+    }
+
     snprintf( str, maxlen, "%s(%04d): %s\n", file, line, text );
     str[maxlen] = '\0';
     ssl->f_dbg( ssl->p_dbg, level, str );
@@ -74,12 +103,16 @@ void debug_print_ret( const ssl_context *ssl, int level,
 {
     char str[512];
     int maxlen = sizeof( str ) - 1;
+    size_t idx = 0;
 
-    if( ssl->f_dbg == NULL )
+    if( ssl->f_dbg == NULL || level > debug_threshold )
         return;
 
-    snprintf( str, maxlen, "%s(%04d): %s() returned %d (0x%x)\n",
-              file, line, text, ret, ret );
+    if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+        idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
+
+    snprintf( str + idx, maxlen - idx, "%s() returned %d (-0x%04x)\n",
+              text, ret, -ret );
 
     str[maxlen] = '\0';
     ssl->f_dbg( ssl->p_dbg, level, str );
@@ -90,17 +123,21 @@ void debug_print_buf( const ssl_context *ssl, int level,
                       unsigned char *buf, size_t len )
 {
     char str[512];
-    size_t i, maxlen = sizeof( str ) - 1;
+    size_t i, maxlen = sizeof( str ) - 1, idx = 0;
 
-    if( ssl->f_dbg == NULL )
+    if( ssl->f_dbg == NULL || level > debug_threshold )
         return;
 
-    snprintf( str, maxlen, "%s(%04d): dumping '%s' (%d bytes)\n",
-              file, line, text, (unsigned int) len );
+    if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+        idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
+
+    snprintf( str + idx, maxlen - idx, "dumping '%s' (%u bytes)\n",
+              text, (unsigned int) len );
 
     str[maxlen] = '\0';
     ssl->f_dbg( ssl->p_dbg, level, str );
 
+    idx = 0;
     for( i = 0; i < len; i++ )
     {
         if( i >= 4096 )
@@ -109,34 +146,62 @@ void debug_print_buf( const ssl_context *ssl, int level,
         if( i % 16 == 0 )
         {
             if( i > 0 )
-                ssl->f_dbg( ssl->p_dbg, level, "\n" );
+            {
+                snprintf( str + idx, maxlen - idx, "\n" );
+                ssl->f_dbg( ssl->p_dbg, level, str );
+                idx = 0;
+            }
 
-            snprintf( str, maxlen, "%s(%04d): %04x: ", file, line,
-                      (unsigned int) i );
+            if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+                idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
+
+            idx += snprintf( str + idx, maxlen - idx, "%04x: ",
+                             (unsigned int) i );
 
-            str[maxlen] = '\0';
-            ssl->f_dbg( ssl->p_dbg, level, str );
         }
 
-        snprintf( str, maxlen, " %02x", (unsigned int) buf[i] );
-
-        str[maxlen] = '\0';
-        ssl->f_dbg( ssl->p_dbg, level, str );
+        idx += snprintf( str + idx, maxlen - idx, " %02x",
+                         (unsigned int) buf[i] );
     }
 
     if( len > 0 )
-        ssl->f_dbg( ssl->p_dbg, level, "\n" );
+    {
+        snprintf( str + idx, maxlen - idx, "\n" );
+        ssl->f_dbg( ssl->p_dbg, level, str );
+    }
 }
 
+#if defined(POLARSSL_ECP_C)
+void debug_print_ecp( const ssl_context *ssl, int level,
+                      const char *file, int line,
+                      const char *text, const ecp_point *X )
+{
+    char str[512];
+    int maxlen = sizeof( str ) - 1;
+
+    if( ssl->f_dbg == NULL || level > debug_threshold )
+        return;
+
+    snprintf( str, maxlen, "%s(X)", text );
+    str[maxlen] = '\0';
+    debug_print_mpi( ssl, level, file, line, str, &X->X );
+
+    snprintf( str, maxlen, "%s(Y)", text );
+    str[maxlen] = '\0';
+    debug_print_mpi( ssl, level, file, line, str, &X->Y );
+}
+#endif /* POLARSSL_ECP_C */
+
+#if defined(POLARSSL_BIGNUM_C)
 void debug_print_mpi( const ssl_context *ssl, int level,
                       const char *file, int line,
                       const char *text, const mpi *X )
 {
     char str[512];
     int j, k, maxlen = sizeof( str ) - 1, zeros = 1;
-    size_t i, n;
+    size_t i, n, idx = 0;
 
-    if( ssl->f_dbg == NULL || X == NULL )
+    if( ssl->f_dbg == NULL || X == NULL || level > debug_threshold )
         return;
 
     for( n = X->n - 1; n > 0; n-- )
@@ -147,13 +212,16 @@ void debug_print_mpi( const ssl_context *ssl, int level,
         if( ( ( X->p[n] >> j ) & 1 ) != 0 )
             break;
 
-    snprintf( str, maxlen, "%s(%04d): value of '%s' (%d bits) is:\n",
-              file, line, text, 
-              (int) ( ( n * ( sizeof(t_uint) << 3 ) ) + j + 1 ) );
+    if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+        idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
+
+    snprintf( str + idx, maxlen - idx, "value of '%s' (%d bits) is:\n",
+              text, (int) ( ( n * ( sizeof(t_uint) << 3 ) ) + j + 1 ) );
 
     str[maxlen] = '\0';
     ssl->f_dbg( ssl->p_dbg, level, str );
 
+    idx = 0;
     for( i = n + 1, j = 0; i > 0; i-- )
     {
         if( zeros && X->p[i - 1] == 0 )
@@ -161,7 +229,7 @@ void debug_print_mpi( const ssl_context *ssl, int level,
 
         for( k = sizeof( t_uint ) - 1; k >= 0; k-- )
         {
-            if( zeros && ( ( X->p[i - 1] >> (k << 3) ) & 0xFF ) == 0 )
+            if( zeros && ( ( X->p[i - 1] >> ( k << 3 ) ) & 0xFF ) == 0 )
                 continue;
             else
                 zeros = 0;
@@ -169,19 +237,18 @@ void debug_print_mpi( const ssl_context *ssl, int level,
             if( j % 16 == 0 )
             {
                 if( j > 0 )
-                    ssl->f_dbg( ssl->p_dbg, level, "\n" );
+                {
+                    snprintf( str + idx, maxlen - idx, "\n" );
+                    ssl->f_dbg( ssl->p_dbg, level, str );
+                    idx = 0;
+                }
 
-                snprintf( str, maxlen, "%s(%04d): ", file, line );
-
-                str[maxlen] = '\0';
-                ssl->f_dbg( ssl->p_dbg, level, str );
+                if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+                    idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
             }
 
-            snprintf( str, maxlen, " %02x", (unsigned int)
-                      ( X->p[i - 1] >> (k << 3) ) & 0xFF );
-
-            str[maxlen] = '\0';
-            ssl->f_dbg( ssl->p_dbg, level, str );
+            idx += snprintf( str + idx, maxlen - idx, " %02x", (unsigned int)
+                             ( X->p[i - 1] >> ( k << 3 ) ) & 0xFF );
 
             j++;
         }
@@ -190,49 +257,95 @@ void debug_print_mpi( const ssl_context *ssl, int level,
 
     if( zeros == 1 )
     {
-        snprintf( str, maxlen, "%s(%04d): ", file, line );
+        if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+        {
+            idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
 
-        str[maxlen] = '\0';
-        ssl->f_dbg( ssl->p_dbg, level, str );
-        ssl->f_dbg( ssl->p_dbg, level, " 00" );
+        }
+        idx += snprintf( str + idx, maxlen - idx, " 00" );
     }
 
-    ssl->f_dbg( ssl->p_dbg, level, "\n" );
+    snprintf( str + idx, maxlen - idx, "\n" );
+    ssl->f_dbg( ssl->p_dbg, level, str );
+}
+#endif /* POLARSSL_BIGNUM_C */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+static void debug_print_pk( const ssl_context *ssl, int level,
+                            const char *file, int line,
+                            const char *text, const pk_context *pk )
+{
+    size_t i;
+    pk_debug_item items[POLARSSL_PK_DEBUG_MAX_ITEMS];
+    char name[16];
+
+    memset( items, 0, sizeof( items ) );
+
+    if( pk_debug( pk, items ) != 0 )
+    {
+        debug_print_msg( ssl, level, file, line, "invalid PK context" );
+        return;
+    }
+
+    for( i = 0; i < POLARSSL_PK_DEBUG_MAX_ITEMS; i++ )
+    {
+        if( items[i].type == POLARSSL_PK_DEBUG_NONE )
+            return;
+
+        snprintf( name, sizeof( name ), "%s%s", text, items[i].name );
+        name[sizeof( name ) - 1] = '\0';
+
+        if( items[i].type == POLARSSL_PK_DEBUG_MPI )
+            debug_print_mpi( ssl, level, file, line, name, items[i].value );
+        else
+#if defined(POLARSSL_ECP_C)
+        if( items[i].type == POLARSSL_PK_DEBUG_ECP )
+            debug_print_ecp( ssl, level, file, line, name, items[i].value );
+        else
+#endif
+            debug_print_msg( ssl, level, file, line, "should not happen" );
+    }
 }
 
 void debug_print_crt( const ssl_context *ssl, int level,
                       const char *file, int line,
-                      const char *text, const x509_cert *crt )
+                      const char *text, const x509_crt *crt )
 {
     char str[1024], prefix[64];
-    int i = 0, maxlen = sizeof( prefix ) - 1;
+    int i = 0, maxlen = sizeof( prefix ) - 1, idx = 0;
 
-    if( ssl->f_dbg == NULL || crt == NULL )
+    if( ssl->f_dbg == NULL || crt == NULL || level > debug_threshold )
         return;
 
-    snprintf( prefix, maxlen, "%s(%04d): ", file, line );
-    prefix[maxlen] = '\0';
+    if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+    {
+        snprintf( prefix, maxlen, "%s(%04d): ", file, line );
+        prefix[maxlen] = '\0';
+    }
+    else
+        prefix[0] = '\0';
+
     maxlen = sizeof( str ) - 1;
 
     while( crt != NULL )
     {
         char buf[1024];
-        x509parse_cert_info( buf, sizeof( buf ) - 1, prefix, crt );
+        x509_crt_info( buf, sizeof( buf ) - 1, prefix, crt );
 
-        snprintf( str, maxlen, "%s(%04d): %s #%d:\n%s",
-                  file, line, text, ++i, buf );
+        if( debug_log_mode == POLARSSL_DEBUG_LOG_FULL )
+            idx = snprintf( str, maxlen, "%s(%04d): ", file, line );
+
+        snprintf( str + idx, maxlen - idx, "%s #%d:\n%s",
+                  text, ++i, buf );
 
         str[maxlen] = '\0';
         ssl->f_dbg( ssl->p_dbg, level, str );
 
-        debug_print_mpi( ssl, level, file, line,
-                         "crt->rsa.N", &crt->rsa.N );
-
-        debug_print_mpi( ssl, level, file, line,
-                         "crt->rsa.E", &crt->rsa.E );
+        debug_print_pk( ssl, level, file, line, "crt->", &crt->pk );
 
         crt = crt->next;
     }
 }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
-#endif
+#endif /* POLARSSL_DEBUG_C */
diff --git a/Externals/polarssl/library/des.c b/Externals/polarssl/library/des.c
index 0cf4b3d50d..12fe4f46a6 100644
--- a/Externals/polarssl/library/des.c
+++ b/Externals/polarssl/library/des.c
@@ -1,7 +1,7 @@
 /*
  *  FIPS-46-3 compliant Triple-DES implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,14 +29,29 @@
  *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_DES_C)
 
 #include "polarssl/des.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 #if !defined(POLARSSL_DES_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * 32-bit integer manipulation macros (big endian)
  */
@@ -290,6 +305,32 @@ static const uint32_t RHs[16] =
 
 #define SWAP(a,b) { uint32_t t = a; a = b; b = t; t = 0; }
 
+void des_init( des_context *ctx )
+{
+    memset( ctx, 0, sizeof( des_context ) );
+}
+
+void des_free( des_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( des_context ) );
+}
+
+void des3_init( des3_context *ctx )
+{
+    memset( ctx, 0, sizeof( des3_context ) );
+}
+
+void des3_free( des3_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( des3_context ) );
+}
+
 static const unsigned char odd_parity_table[128] = { 1,  2,  4,  7,  8,
         11, 13, 14, 16, 19, 21, 22, 25, 26, 28, 31, 32, 35, 37, 38, 41, 42, 44,
         47, 49, 50, 52, 55, 56, 59, 61, 62, 64, 67, 69, 70, 73, 74, 76, 79, 81,
@@ -317,7 +358,7 @@ int des_key_check_key_parity( const unsigned char key[DES_KEY_SIZE] )
     int i;
 
     for( i = 0; i < DES_KEY_SIZE; i++ )
-        if ( key[i] != odd_parity_table[key[i] / 2] )
+        if( key[i] != odd_parity_table[key[i] / 2] )
             return( 1 );
 
     return( 0 );
@@ -372,7 +413,7 @@ int des_key_check_weak( const unsigned char key[DES_KEY_SIZE] )
     int i;
 
     for( i = 0; i < WEAK_KEY_COUNT; i++ )
-        if( memcmp( weak_key_table[i], key, DES_KEY_SIZE) == 0)
+        if( memcmp( weak_key_table[i], key, DES_KEY_SIZE) == 0 )
             return( 1 );
 
     return( 0 );
@@ -503,12 +544,13 @@ static void des3_set2key( uint32_t esk[96],
 /*
  * Triple-DES key schedule (112-bit, encryption)
  */
-int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] )
+int des3_set2key_enc( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 2] )
 {
     uint32_t sk[96];
 
     des3_set2key( ctx->sk, sk, key );
-    memset( sk,  0, sizeof( sk ) );
+    polarssl_zeroize( sk,  sizeof( sk ) );
 
     return( 0 );
 }
@@ -516,12 +558,13 @@ int des3_set2key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE *
 /*
  * Triple-DES key schedule (112-bit, decryption)
  */
-int des3_set2key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 2] )
+int des3_set2key_dec( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 2] )
 {
     uint32_t sk[96];
 
     des3_set2key( sk, ctx->sk, key );
-    memset( sk,  0, sizeof( sk ) );
+    polarssl_zeroize( sk,  sizeof( sk ) );
 
     return( 0 );
 }
@@ -552,12 +595,13 @@ static void des3_set3key( uint32_t esk[96],
 /*
  * Triple-DES key schedule (168-bit, encryption)
  */
-int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] )
+int des3_set3key_enc( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 3] )
 {
     uint32_t sk[96];
 
     des3_set3key( ctx->sk, sk, key );
-    memset( sk, 0, sizeof( sk ) );
+    polarssl_zeroize( sk,  sizeof( sk ) );
 
     return( 0 );
 }
@@ -565,12 +609,13 @@ int des3_set3key_enc( des3_context *ctx, const unsigned char key[DES_KEY_SIZE *
 /*
  * Triple-DES key schedule (168-bit, decryption)
  */
-int des3_set3key_dec( des3_context *ctx, const unsigned char key[DES_KEY_SIZE * 3] )
+int des3_set3key_dec( des3_context *ctx,
+                      const unsigned char key[DES_KEY_SIZE * 3] )
 {
     uint32_t sk[96];
 
     des3_set3key( sk, ctx->sk, key );
-    memset( sk, 0, sizeof( sk ) );
+    polarssl_zeroize( sk,  sizeof( sk ) );
 
     return( 0 );
 }
@@ -606,6 +651,7 @@ int des_crypt_ecb( des_context *ctx,
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * DES-CBC buffer encryption/decryption
  */
@@ -657,6 +703,7 @@ int des_crypt_cbc( des_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 /*
  * 3DES-ECB block encryption/decryption
@@ -701,6 +748,7 @@ int des3_crypt_ecb( des3_context *ctx,
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * 3DES-CBC buffer encryption/decryption
  */
@@ -752,6 +800,7 @@ int des3_crypt_cbc( des3_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 #endif /* !POLARSSL_DES_ALT */
 
@@ -771,11 +820,6 @@ static const unsigned char des3_test_keys[24] =
     0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23
 };
 
-static const unsigned char des3_test_iv[8] =
-{
-    0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF,
-};
-
 static const unsigned char des3_test_buf[8] =
 {
     0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74
@@ -795,6 +839,12 @@ static const unsigned char des3_test_ecb_enc[3][8] =
     { 0xDD, 0x17, 0xE8, 0xB8, 0xB4, 0x37, 0xD2, 0x32 }
 };
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+static const unsigned char des3_test_iv[8] =
+{
+    0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF,
+};
+
 static const unsigned char des3_test_cbc_dec[3][8] =
 {
     { 0x12, 0x9F, 0x40, 0xB9, 0xD2, 0x00, 0x56, 0xB3 },
@@ -808,22 +858,24 @@ static const unsigned char des3_test_cbc_enc[3][8] =
     { 0x35, 0x76, 0x11, 0x56, 0x5F, 0xA1, 0x8E, 0x4D },
     { 0xCB, 0x19, 0x1F, 0x85, 0xD1, 0xED, 0x84, 0x39 }
 };
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
 /*
  * Checkup routine
  */
 int des_self_test( int verbose )
 {
-    int i, j, u, v;
+    int i, j, u, v, ret = 0;
     des_context ctx;
     des3_context ctx3;
-    unsigned char key[24];
     unsigned char buf[8];
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     unsigned char prv[8];
     unsigned char iv[8];
+#endif
 
-    memset( key, 0, 24 );
-
+    des_init( &ctx );
+    des3_init( &ctx3 );
     /*
      * ECB mode
      */
@@ -833,9 +885,9 @@ int des_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  DES%c-ECB-%3d (%s): ",
-                    ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-                    ( v == DES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  DES%c-ECB-%3d (%s): ",
+                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
+                             ( v == DES_DECRYPT ) ? "dec" : "enc" );
 
         memcpy( buf, des3_test_buf, 8 );
 
@@ -883,18 +935,20 @@ int des_self_test( int verbose )
                 memcmp( buf, des3_test_ecb_enc[u], 8 ) != 0 ) )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
     /*
      * CBC mode
      */
@@ -904,9 +958,9 @@ int des_self_test( int verbose )
         v = i  & 1;
 
         if( verbose != 0 )
-            printf( "  DES%c-CBC-%3d (%s): ",
-                    ( u == 0 ) ? ' ' : '3', 56 + u * 56,
-                    ( v == DES_DECRYPT ) ? "dec" : "enc" );
+            polarssl_printf( "  DES%c-CBC-%3d (%s): ",
+                             ( u == 0 ) ? ' ' : '3', 56 + u * 56,
+                             ( v == DES_DECRYPT ) ? "dec" : "enc" );
 
         memcpy( iv,  des3_test_iv,  8 );
         memcpy( prv, des3_test_iv,  8 );
@@ -977,21 +1031,27 @@ int des_self_test( int verbose )
                 memcmp( buf, des3_test_cbc_enc[u], 8 ) != 0 ) )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
-    return( 0 );
+exit:
+    des_free( &ctx );
+    des3_free( &ctx3 );
+
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_DES_C */
diff --git a/Externals/polarssl/library/dhm.c b/Externals/polarssl/library/dhm.c
index 90e5b4b19a..089c11b3d9 100644
--- a/Externals/polarssl/library/dhm.c
+++ b/Externals/polarssl/library/dhm.c
@@ -1,7 +1,7 @@
 /*
  *  Diffie-Hellman-Merkle key exchange
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -28,12 +28,38 @@
  *  http://www.cacr.math.uwaterloo.ca/hac/ (chapter 12)
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_DHM_C)
 
 #include "polarssl/dhm.h"
 
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_ASN1_PARSE_C)
+#include "polarssl/asn1.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdlib.h>
+#define polarssl_printf     printf
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * helper to validate the mpi size and import it
  */
@@ -75,8 +101,9 @@ static int dhm_check_range( const mpi *param, const mpi *P )
     int ret = POLARSSL_ERR_DHM_BAD_INPUT_DATA;
 
     mpi_init( &L ); mpi_init( &U );
-    mpi_lset( &L, 2 );
-    mpi_sub_int( &U, P, 2 );
+
+    MPI_CHK( mpi_lset( &L, 2 ) );
+    MPI_CHK( mpi_sub_int( &U, P, 2 ) );
 
     if( mpi_cmp_mpi( param, &L ) >= 0 &&
         mpi_cmp_mpi( param, &U ) <= 0 )
@@ -84,11 +111,16 @@ static int dhm_check_range( const mpi *param, const mpi *P )
         ret = 0;
     }
 
+cleanup:
     mpi_free( &L ); mpi_free( &U );
-
     return( ret );
 }
 
+void dhm_init( dhm_context *ctx )
+{
+    memset( ctx, 0, sizeof( dhm_context ) );
+}
+
 /*
  * Parse the ServerKeyExchange parameters
  */
@@ -98,8 +130,6 @@ int dhm_read_params( dhm_context *ctx,
 {
     int ret;
 
-    memset( ctx, 0, sizeof( dhm_context ) );
-
     if( ( ret = dhm_read_bignum( &ctx->P,  p, end ) ) != 0 ||
         ( ret = dhm_read_bignum( &ctx->G,  p, end ) ) != 0 ||
         ( ret = dhm_read_bignum( &ctx->GY, p, end ) ) != 0 )
@@ -110,9 +140,6 @@ int dhm_read_params( dhm_context *ctx,
 
     ctx->len = mpi_size( &ctx->P );
 
-    if( end - *p < 2 )
-        return( POLARSSL_ERR_DHM_BAD_INPUT_DATA );
-
     return( 0 );
 }
 
@@ -139,7 +166,7 @@ int dhm_make_params( dhm_context *ctx, int x_size,
         mpi_fill_random( &ctx->X, x_size, f_rng, p_rng );
 
         while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 )
-            mpi_shift_r( &ctx->X, 1 );
+            MPI_CHK( mpi_shift_r( &ctx->X, 1 ) );
 
         if( count++ > 10 )
             return( POLARSSL_ERR_DHM_MAKE_PARAMS_FAILED );
@@ -225,7 +252,7 @@ int dhm_make_public( dhm_context *ctx, int x_size,
         mpi_fill_random( &ctx->X, x_size, f_rng, p_rng );
 
         while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 )
-            mpi_shift_r( &ctx->X, 1 );
+            MPI_CHK( mpi_shift_r( &ctx->X, 1 ) );
 
         if( count++ > 10 )
             return( POLARSSL_ERR_DHM_MAKE_PUBLIC_FAILED );
@@ -248,28 +275,117 @@ cleanup:
     return( 0 );
 }
 
+/*
+ * Use the blinding method and optimisation suggested in section 10 of:
+ *  KOCHER, Paul C. Timing attacks on implementations of Diffie-Hellman, RSA,
+ *  DSS, and other systems. In : Advances in Cryptology—CRYPTO’96. Springer
+ *  Berlin Heidelberg, 1996. p. 104-113.
+ */
+static int dhm_update_blinding( dhm_context *ctx,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret, count;
+
+    /*
+     * Don't use any blinding the first time a particular X is used,
+     * but remember it to use blinding next time.
+     */
+    if( mpi_cmp_mpi( &ctx->X, &ctx->pX ) != 0 )
+    {
+        MPI_CHK( mpi_copy( &ctx->pX, &ctx->X ) );
+        MPI_CHK( mpi_lset( &ctx->Vi, 1 ) );
+        MPI_CHK( mpi_lset( &ctx->Vf, 1 ) );
+
+        return( 0 );
+    }
+
+    /*
+     * Ok, we need blinding. Can we re-use existing values?
+     * If yes, just update them by squaring them.
+     */
+    if( mpi_cmp_int( &ctx->Vi, 1 ) != 0 )
+    {
+        MPI_CHK( mpi_mul_mpi( &ctx->Vi, &ctx->Vi, &ctx->Vi ) );
+        MPI_CHK( mpi_mod_mpi( &ctx->Vi, &ctx->Vi, &ctx->P ) );
+
+        MPI_CHK( mpi_mul_mpi( &ctx->Vf, &ctx->Vf, &ctx->Vf ) );
+        MPI_CHK( mpi_mod_mpi( &ctx->Vf, &ctx->Vf, &ctx->P ) );
+
+        return( 0 );
+    }
+
+    /*
+     * We need to generate blinding values from scratch
+     */
+
+    /* Vi = random( 2, P-1 ) */
+    count = 0;
+    do
+    {
+        mpi_fill_random( &ctx->Vi, mpi_size( &ctx->P ), f_rng, p_rng );
+
+        while( mpi_cmp_mpi( &ctx->Vi, &ctx->P ) >= 0 )
+            MPI_CHK( mpi_shift_r( &ctx->Vi, 1 ) );
+
+        if( count++ > 10 )
+            return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+    }
+    while( mpi_cmp_int( &ctx->Vi, 1 ) <= 0 );
+
+    /* Vf = Vi^-X mod P */
+    MPI_CHK( mpi_inv_mod( &ctx->Vf, &ctx->Vi, &ctx->P ) );
+    MPI_CHK( mpi_exp_mod( &ctx->Vf, &ctx->Vf, &ctx->X, &ctx->P, &ctx->RP ) );
+
+cleanup:
+    return( ret );
+}
+
 /*
  * Derive and export the shared secret (G^Y)^X mod P
  */
 int dhm_calc_secret( dhm_context *ctx,
-                     unsigned char *output, size_t *olen )
+                     unsigned char *output, size_t *olen,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng )
 {
     int ret;
+    mpi GYb;
 
     if( ctx == NULL || *olen < ctx->len )
         return( POLARSSL_ERR_DHM_BAD_INPUT_DATA );
 
-    MPI_CHK( mpi_exp_mod( &ctx->K, &ctx->GY, &ctx->X,
-                          &ctx->P, &ctx->RP ) );
-
     if( ( ret = dhm_check_range( &ctx->GY, &ctx->P ) ) != 0 )
         return( ret );
 
+    mpi_init( &GYb );
+
+    /* Blind peer's value */
+    if( f_rng != NULL )
+    {
+        MPI_CHK( dhm_update_blinding( ctx, f_rng, p_rng ) );
+        MPI_CHK( mpi_mul_mpi( &GYb, &ctx->GY, &ctx->Vi ) );
+        MPI_CHK( mpi_mod_mpi( &GYb, &GYb, &ctx->P ) );
+    }
+    else
+        MPI_CHK( mpi_copy( &GYb, &ctx->GY ) );
+
+    /* Do modular exponentiation */
+    MPI_CHK( mpi_exp_mod( &ctx->K, &GYb, &ctx->X,
+                          &ctx->P, &ctx->RP ) );
+
+    /* Unblind secret value */
+    if( f_rng != NULL )
+    {
+        MPI_CHK( mpi_mul_mpi( &ctx->K, &ctx->K, &ctx->Vf ) );
+        MPI_CHK( mpi_mod_mpi( &ctx->K, &ctx->K, &ctx->P ) );
+    }
+
     *olen = mpi_size( &ctx->K );
 
     MPI_CHK( mpi_write_binary( &ctx->K, output, *olen ) );
 
 cleanup:
+    mpi_free( &GYb );
 
     if( ret != 0 )
         return( POLARSSL_ERR_DHM_CALC_SECRET_FAILED + ret );
@@ -282,21 +398,201 @@ cleanup:
  */
 void dhm_free( dhm_context *ctx )
 {
+    mpi_free( &ctx->pX); mpi_free( &ctx->Vf ); mpi_free( &ctx->Vi );
     mpi_free( &ctx->RP ); mpi_free( &ctx->K ); mpi_free( &ctx->GY );
     mpi_free( &ctx->GX ); mpi_free( &ctx->X ); mpi_free( &ctx->G );
     mpi_free( &ctx->P );
+
+    polarssl_zeroize( ctx, sizeof( dhm_context ) );
 }
 
+#if defined(POLARSSL_ASN1_PARSE_C)
+/*
+ * Parse DHM parameters
+ */
+int dhm_parse_dhm( dhm_context *dhm, const unsigned char *dhmin,
+                   size_t dhminlen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end;
+#if defined(POLARSSL_PEM_PARSE_C)
+    pem_context pem;
+
+    pem_init( &pem );
+
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN DH PARAMETERS-----",
+                           "-----END DH PARAMETERS-----",
+                           dhmin, NULL, 0, &dhminlen );
+
+    if( ret == 0 )
+    {
+        /*
+         * Was PEM encoded
+         */
+        dhminlen = pem.buflen;
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        goto exit;
+
+    p = ( ret == 0 ) ? pem.buf : (unsigned char *) dhmin;
+#else
+    p = (unsigned char *) dhmin;
+#endif /* POLARSSL_PEM_PARSE_C */
+    end = p + dhminlen;
+
+    /*
+     *  DHParams ::= SEQUENCE {
+     *      prime            INTEGER,  -- P
+     *      generator        INTEGER,  -- g
+     *  }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        ret = POLARSSL_ERR_DHM_INVALID_FORMAT + ret;
+        goto exit;
+    }
+
+    end = p + len;
+
+    if( ( ret = asn1_get_mpi( &p, end, &dhm->P  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &dhm->G ) ) != 0 )
+    {
+        ret = POLARSSL_ERR_DHM_INVALID_FORMAT + ret;
+        goto exit;
+    }
+
+    if( p != end )
+    {
+        ret = POLARSSL_ERR_DHM_INVALID_FORMAT +
+              POLARSSL_ERR_ASN1_LENGTH_MISMATCH;
+        goto exit;
+    }
+
+    ret = 0;
+
+    dhm->len = mpi_size( &dhm->P );
+
+exit:
+#if defined(POLARSSL_PEM_PARSE_C)
+    pem_free( &pem );
+#endif
+    if( ret != 0 )
+        dhm_free( dhm );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * Load all data from a file into a given buffer.
+ */
+static int load_file( const char *path, unsigned char **buf, size_t *n )
+{
+    FILE *f;
+    long size;
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_DHM_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    if( ( size = ftell( f ) ) == -1 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_DHM_FILE_IO_ERROR );
+    }
+    fseek( f, 0, SEEK_SET );
+
+    *n = (size_t) size;
+
+    if( *n + 1 == 0 ||
+        ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_DHM_MALLOC_FAILED );
+    }
+
+    if( fread( *buf, 1, *n, f ) != *n )
+    {
+        fclose( f );
+        polarssl_free( *buf );
+        return( POLARSSL_ERR_DHM_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    (*buf)[*n] = '\0';
+
+    return( 0 );
+}
+
+/*
+ * Load and parse DHM parameters
+ */
+int dhm_parse_dhmfile( dhm_context *dhm, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = dhm_parse_dhm( dhm, buf, n );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+#endif /* POLARSSL_ASN1_PARSE_C */
+
 #if defined(POLARSSL_SELF_TEST)
 
+#include "polarssl/certs.h"
+
 /*
  * Checkup routine
  */
 int dhm_self_test( int verbose )
 {
-    return( verbose++ );
+#if defined(POLARSSL_CERTS_C)
+    int ret;
+    dhm_context dhm;
+
+    dhm_init( &dhm );
+
+    if( verbose != 0 )
+        polarssl_printf( "  DHM parameter load: " );
+
+    if( ( ret = dhm_parse_dhm( &dhm, (const unsigned char *) test_dhm_params,
+                               strlen( test_dhm_params ) ) ) != 0 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "failed\n" );
+
+        ret = 1;
+        goto exit;
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n\n" );
+
+exit:
+    dhm_free( &dhm );
+
+    return( ret );
+#else
+    if( verbose != 0 )
+        polarssl_printf( "  DHM parameter load: skipped\n" );
+
+    return( 0 );
+#endif /* POLARSSL_CERTS_C */
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_DHM_C */
diff --git a/Externals/polarssl/library/ecdh.c b/Externals/polarssl/library/ecdh.c
new file mode 100644
index 0000000000..b93d82ec6b
--- /dev/null
+++ b/Externals/polarssl/library/ecdh.c
@@ -0,0 +1,280 @@
+/*
+ *  Elliptic curve Diffie-Hellman
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * References:
+ *
+ * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
+ * RFC 4492
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_ECDH_C)
+
+#include "polarssl/ecdh.h"
+
+/*
+ * Generate public key: simple wrapper around ecp_gen_keypair
+ */
+int ecdh_gen_public( ecp_group *grp, mpi *d, ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng )
+{
+    return ecp_gen_keypair( grp, d, Q, f_rng, p_rng );
+}
+
+/*
+ * Compute shared secret (SEC1 3.3.1)
+ */
+int ecdh_compute_shared( ecp_group *grp, mpi *z,
+                         const ecp_point *Q, const mpi *d,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng )
+{
+    int ret;
+    ecp_point P;
+
+    ecp_point_init( &P );
+
+    /*
+     * Make sure Q is a valid pubkey before using it
+     */
+    MPI_CHK( ecp_check_pubkey( grp, Q ) );
+
+    MPI_CHK( ecp_mul( grp, &P, d, Q, f_rng, p_rng ) );
+
+    if( ecp_is_zero( &P ) )
+    {
+        ret = POLARSSL_ERR_ECP_BAD_INPUT_DATA;
+        goto cleanup;
+    }
+
+    MPI_CHK( mpi_copy( z, &P.X ) );
+
+cleanup:
+    ecp_point_free( &P );
+
+    return( ret );
+}
+
+/*
+ * Initialize context
+ */
+void ecdh_init( ecdh_context *ctx )
+{
+    memset( ctx, 0, sizeof( ecdh_context ) );
+}
+
+/*
+ * Free context
+ */
+void ecdh_free( ecdh_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    ecp_group_free( &ctx->grp );
+    ecp_point_free( &ctx->Q   );
+    ecp_point_free( &ctx->Qp  );
+    ecp_point_free( &ctx->Vi  );
+    ecp_point_free( &ctx->Vf  );
+    mpi_free( &ctx->d  );
+    mpi_free( &ctx->z  );
+    mpi_free( &ctx->_d );
+}
+
+/*
+ * Setup and write the ServerKeyExhange parameters (RFC 4492)
+ *      struct {
+ *          ECParameters    curve_params;
+ *          ECPoint         public;
+ *      } ServerECDHParams;
+ */
+int ecdh_make_params( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng )
+{
+    int ret;
+    size_t grp_len, pt_len;
+
+    if( ctx == NULL || ctx->grp.pbits == 0 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecdh_gen_public( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) )
+                != 0 )
+        return( ret );
+
+    if( ( ret = ecp_tls_write_group( &ctx->grp, &grp_len, buf, blen ) )
+                != 0 )
+        return( ret );
+
+    buf += grp_len;
+    blen -= grp_len;
+
+    if( ( ret = ecp_tls_write_point( &ctx->grp, &ctx->Q, ctx->point_format,
+                                     &pt_len, buf, blen ) ) != 0 )
+        return( ret );
+
+    *olen = grp_len + pt_len;
+    return( 0 );
+}
+
+/*
+ * Read the ServerKeyExhange parameters (RFC 4492)
+ *      struct {
+ *          ECParameters    curve_params;
+ *          ECPoint         public;
+ *      } ServerECDHParams;
+ */
+int ecdh_read_params( ecdh_context *ctx,
+                      const unsigned char **buf, const unsigned char *end )
+{
+    int ret;
+
+    if( ( ret = ecp_tls_read_group( &ctx->grp, buf, end - *buf ) ) != 0 )
+        return( ret );
+
+    if( ( ret = ecp_tls_read_point( &ctx->grp, &ctx->Qp, buf, end - *buf ) )
+                != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+/*
+ * Get parameters from a keypair
+ */
+int ecdh_get_params( ecdh_context *ctx, const ecp_keypair *key,
+                     ecdh_side side )
+{
+    int ret;
+
+    if( ( ret = ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 )
+        return( ret );
+
+    /* If it's not our key, just import the public part as Qp */
+    if( side == POLARSSL_ECDH_THEIRS )
+        return( ecp_copy( &ctx->Qp, &key->Q ) );
+
+    /* Our key: import public (as Q) and private parts */
+    if( side != POLARSSL_ECDH_OURS )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecp_copy( &ctx->Q, &key->Q ) ) != 0 ||
+        ( ret = mpi_copy( &ctx->d, &key->d ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+/*
+ * Setup and export the client public value
+ */
+int ecdh_make_public( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng )
+{
+    int ret;
+
+    if( ctx == NULL || ctx->grp.pbits == 0 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecdh_gen_public( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) )
+                != 0 )
+        return( ret );
+
+    return ecp_tls_write_point( &ctx->grp, &ctx->Q, ctx->point_format,
+                                olen, buf, blen );
+}
+
+/*
+ * Parse and import the client's public value
+ */
+int ecdh_read_public( ecdh_context *ctx,
+                      const unsigned char *buf, size_t blen )
+{
+    int ret;
+    const unsigned char *p = buf;
+
+    if( ctx == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecp_tls_read_point( &ctx->grp, &ctx->Qp, &p, blen ) ) != 0 )
+        return( ret );
+
+    if( (size_t)( p - buf ) != blen )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+
+/*
+ * Derive and export the shared secret
+ */
+int ecdh_calc_secret( ecdh_context *ctx, size_t *olen,
+                      unsigned char *buf, size_t blen,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng )
+{
+    int ret;
+
+    if( ctx == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecdh_compute_shared( &ctx->grp, &ctx->z, &ctx->Qp, &ctx->d,
+                                     f_rng, p_rng ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( mpi_size( &ctx->z ) > blen )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    *olen = ctx->grp.pbits / 8 + ( ( ctx->grp.pbits % 8 ) != 0 );
+    return mpi_write_binary( &ctx->z, buf, *olen );
+}
+
+
+#if defined(POLARSSL_SELF_TEST)
+
+/*
+ * Checkup routine
+ */
+int ecdh_self_test( int verbose )
+{
+    ((void) verbose );
+    return( 0 );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_ECDH_C */
diff --git a/Externals/polarssl/library/ecdsa.c b/Externals/polarssl/library/ecdsa.c
new file mode 100644
index 0000000000..5af7f6b53e
--- /dev/null
+++ b/Externals/polarssl/library/ecdsa.c
@@ -0,0 +1,503 @@
+/*
+ *  Elliptic curve DSA
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * References:
+ *
+ * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_ECDSA_C)
+
+#include "polarssl/ecdsa.h"
+#include "polarssl/asn1write.h"
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+#include "polarssl/hmac_drbg.h"
+#endif
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+/*
+ * This a hopefully temporary compatibility function.
+ *
+ * Since we can't ensure the caller will pass a valid md_alg before the next
+ * interface change, try to pick up a decent md by size.
+ *
+ * Argument is the minimum size in bytes of the MD output.
+ */
+static const md_info_t *md_info_by_size( size_t min_size )
+{
+    const md_info_t *md_cur, *md_picked = NULL;
+    const int *md_alg;
+
+    for( md_alg = md_list(); *md_alg != 0; md_alg++ )
+    {
+        if( ( md_cur = md_info_from_type( *md_alg ) ) == NULL ||
+            (size_t) md_cur->size < min_size ||
+            ( md_picked != NULL && md_cur->size > md_picked->size ) )
+            continue;
+
+        md_picked = md_cur;
+    }
+
+    return( md_picked );
+}
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+
+/*
+ * Derive a suitable integer for group grp from a buffer of length len
+ * SEC1 4.1.3 step 5 aka SEC1 4.1.4 step 3
+ */
+static int derive_mpi( const ecp_group *grp, mpi *x,
+                       const unsigned char *buf, size_t blen )
+{
+    int ret;
+    size_t n_size = ( grp->nbits + 7 ) / 8;
+    size_t use_size = blen > n_size ? n_size : blen;
+
+    MPI_CHK( mpi_read_binary( x, buf, use_size ) );
+    if( use_size * 8 > grp->nbits )
+        MPI_CHK( mpi_shift_r( x, use_size * 8 - grp->nbits ) );
+
+    /* While at it, reduce modulo N */
+    if( mpi_cmp_mpi( x, &grp->N ) >= 0 )
+        MPI_CHK( mpi_sub_mpi( x, x, &grp->N ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Compute ECDSA signature of a hashed message (SEC1 4.1.3)
+ * Obviously, compared to SEC1 4.1.3, we skip step 4 (hash message)
+ */
+int ecdsa_sign( ecp_group *grp, mpi *r, mpi *s,
+                const mpi *d, const unsigned char *buf, size_t blen,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret, key_tries, sign_tries, blind_tries;
+    ecp_point R;
+    mpi k, e, t;
+
+    /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
+    if( grp->N.p == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    ecp_point_init( &R );
+    mpi_init( &k ); mpi_init( &e ); mpi_init( &t );
+
+    sign_tries = 0;
+    do
+    {
+        /*
+         * Steps 1-3: generate a suitable ephemeral keypair
+         * and set r = xR mod n
+         */
+        key_tries = 0;
+        do
+        {
+            MPI_CHK( ecp_gen_keypair( grp, &k, &R, f_rng, p_rng ) );
+            MPI_CHK( mpi_mod_mpi( r, &R.X, &grp->N ) );
+
+            if( key_tries++ > 10 )
+            {
+                ret = POLARSSL_ERR_ECP_RANDOM_FAILED;
+                goto cleanup;
+            }
+        }
+        while( mpi_cmp_int( r, 0 ) == 0 );
+
+        /*
+         * Step 5: derive MPI from hashed message
+         */
+        MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+
+        /*
+         * Generate a random value to blind inv_mod in next step,
+         * avoiding a potential timing leak.
+         */
+        blind_tries = 0;
+        do
+        {
+            size_t n_size = ( grp->nbits + 7 ) / 8;
+            MPI_CHK( mpi_fill_random( &t, n_size, f_rng, p_rng ) );
+            MPI_CHK( mpi_shift_r( &t, 8 * n_size - grp->nbits ) );
+
+            /* See ecp_gen_keypair() */
+            if( ++blind_tries > 30 )
+                return( POLARSSL_ERR_ECP_RANDOM_FAILED );
+        }
+        while( mpi_cmp_int( &t, 1 ) < 0 ||
+               mpi_cmp_mpi( &t, &grp->N ) >= 0 );
+
+        /*
+         * Step 6: compute s = (e + r * d) / k = t (e + rd) / (kt) mod n
+         */
+        MPI_CHK( mpi_mul_mpi( s, r, d ) );
+        MPI_CHK( mpi_add_mpi( &e, &e, s ) );
+        MPI_CHK( mpi_mul_mpi( &e, &e, &t ) );
+        MPI_CHK( mpi_mul_mpi( &k, &k, &t ) );
+        MPI_CHK( mpi_inv_mod( s, &k, &grp->N ) );
+        MPI_CHK( mpi_mul_mpi( s, s, &e ) );
+        MPI_CHK( mpi_mod_mpi( s, s, &grp->N ) );
+
+        if( sign_tries++ > 10 )
+        {
+            ret = POLARSSL_ERR_ECP_RANDOM_FAILED;
+            goto cleanup;
+        }
+    }
+    while( mpi_cmp_int( s, 0 ) == 0 );
+
+cleanup:
+    ecp_point_free( &R );
+    mpi_free( &k ); mpi_free( &e ); mpi_free( &t );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+/*
+ * Deterministic signature wrapper
+ */
+int ecdsa_sign_det( ecp_group *grp, mpi *r, mpi *s,
+                    const mpi *d, const unsigned char *buf, size_t blen,
+                    md_type_t md_alg )
+{
+    int ret;
+    hmac_drbg_context rng_ctx;
+    unsigned char data[2 * POLARSSL_ECP_MAX_BYTES];
+    size_t grp_len = ( grp->nbits + 7 ) / 8;
+    const md_info_t *md_info;
+    mpi h;
+
+    /* Temporary fallback */
+    if( md_alg == POLARSSL_MD_NONE )
+        md_info = md_info_by_size( blen );
+    else
+        md_info = md_info_from_type( md_alg );
+
+    if( md_info == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    mpi_init( &h );
+    memset( &rng_ctx, 0, sizeof( hmac_drbg_context ) );
+
+    /* Use private key and message hash (reduced) to initialize HMAC_DRBG */
+    MPI_CHK( mpi_write_binary( d, data, grp_len ) );
+    MPI_CHK( derive_mpi( grp, &h, buf, blen ) );
+    MPI_CHK( mpi_write_binary( &h, data + grp_len, grp_len ) );
+    hmac_drbg_init_buf( &rng_ctx, md_info, data, 2 * grp_len );
+
+    ret = ecdsa_sign( grp, r, s, d, buf, blen,
+                      hmac_drbg_random, &rng_ctx );
+
+cleanup:
+    hmac_drbg_free( &rng_ctx );
+    mpi_free( &h );
+
+    return( ret );
+}
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+
+/*
+ * Verify ECDSA signature of hashed message (SEC1 4.1.4)
+ * Obviously, compared to SEC1 4.1.3, we skip step 2 (hash message)
+ */
+int ecdsa_verify( ecp_group *grp,
+                  const unsigned char *buf, size_t blen,
+                  const ecp_point *Q, const mpi *r, const mpi *s)
+{
+    int ret;
+    mpi e, s_inv, u1, u2;
+    ecp_point R, P;
+
+    ecp_point_init( &R ); ecp_point_init( &P );
+    mpi_init( &e ); mpi_init( &s_inv ); mpi_init( &u1 ); mpi_init( &u2 );
+
+    /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
+    if( grp->N.p == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Step 1: make sure r and s are in range 1..n-1
+     */
+    if( mpi_cmp_int( r, 1 ) < 0 || mpi_cmp_mpi( r, &grp->N ) >= 0 ||
+        mpi_cmp_int( s, 1 ) < 0 || mpi_cmp_mpi( s, &grp->N ) >= 0 )
+    {
+        ret = POLARSSL_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+    /*
+     * Additional precaution: make sure Q is valid
+     */
+    MPI_CHK( ecp_check_pubkey( grp, Q ) );
+
+    /*
+     * Step 3: derive MPI from hashed message
+     */
+    MPI_CHK( derive_mpi( grp, &e, buf, blen ) );
+
+    /*
+     * Step 4: u1 = e / s mod n, u2 = r / s mod n
+     */
+    MPI_CHK( mpi_inv_mod( &s_inv, s, &grp->N ) );
+
+    MPI_CHK( mpi_mul_mpi( &u1, &e, &s_inv ) );
+    MPI_CHK( mpi_mod_mpi( &u1, &u1, &grp->N ) );
+
+    MPI_CHK( mpi_mul_mpi( &u2, r, &s_inv ) );
+    MPI_CHK( mpi_mod_mpi( &u2, &u2, &grp->N ) );
+
+    /*
+     * Step 5: R = u1 G + u2 Q
+     *
+     * Since we're not using any secret data, no need to pass a RNG to
+     * ecp_mul() for countermesures.
+     */
+    MPI_CHK( ecp_mul( grp, &R, &u1, &grp->G, NULL, NULL ) );
+    MPI_CHK( ecp_mul( grp, &P, &u2, Q, NULL, NULL ) );
+    MPI_CHK( ecp_add( grp, &R, &R, &P ) );
+
+    if( ecp_is_zero( &R ) )
+    {
+        ret = POLARSSL_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+    /*
+     * Step 6: convert xR to an integer (no-op)
+     * Step 7: reduce xR mod n (gives v)
+     */
+    MPI_CHK( mpi_mod_mpi( &R.X, &R.X, &grp->N ) );
+
+    /*
+     * Step 8: check if v (that is, R.X) is equal to r
+     */
+    if( mpi_cmp_mpi( &R.X, r ) != 0 )
+    {
+        ret = POLARSSL_ERR_ECP_VERIFY_FAILED;
+        goto cleanup;
+    }
+
+cleanup:
+    ecp_point_free( &R ); ecp_point_free( &P );
+    mpi_free( &e ); mpi_free( &s_inv ); mpi_free( &u1 ); mpi_free( &u2 );
+
+    return( ret );
+}
+
+/*
+ * RFC 4492 page 20:
+ *
+ *     Ecdsa-Sig-Value ::= SEQUENCE {
+ *         r       INTEGER,
+ *         s       INTEGER
+ *     }
+ *
+ * Size is at most
+ *    1 (tag) + 1 (len) + 1 (initial 0) + ECP_MAX_BYTES for each of r and s,
+ *    twice that + 1 (tag) + 2 (len) for the sequence
+ * (assuming ECP_MAX_BYTES is less than 126 for r and s,
+ * and less than 124 (total len <= 255) for the sequence)
+ */
+#if POLARSSL_ECP_MAX_BYTES > 124
+#error "POLARSSL_ECP_MAX_BYTES bigger than expected, please fix MAX_SIG_LEN"
+#endif
+#define MAX_SIG_LEN ( 3 + 2 * ( 2 + POLARSSL_ECP_MAX_BYTES ) )
+
+/*
+ * Convert a signature (given by context) to ASN.1
+ */
+static int ecdsa_signature_to_asn1( ecdsa_context *ctx,
+                                    unsigned char *sig, size_t *slen )
+{
+    int ret;
+    unsigned char buf[MAX_SIG_LEN];
+    unsigned char *p = buf + sizeof( buf );
+    size_t len = 0;
+
+    ASN1_CHK_ADD( len, asn1_write_mpi( &p, buf, &ctx->s ) );
+    ASN1_CHK_ADD( len, asn1_write_mpi( &p, buf, &ctx->r ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( &p, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &p, buf,
+                                       ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
+
+    memcpy( sig, p, len );
+    *slen = len;
+
+    return( 0 );
+}
+
+/*
+ * Compute and write signature
+ */
+int ecdsa_write_signature( ecdsa_context *ctx,
+                           const unsigned char *hash, size_t hlen,
+                           unsigned char *sig, size_t *slen,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng )
+{
+    int ret;
+
+    if( ( ret = ecdsa_sign( &ctx->grp, &ctx->r, &ctx->s, &ctx->d,
+                            hash, hlen, f_rng, p_rng ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( ecdsa_signature_to_asn1( ctx, sig, slen ) );
+}
+
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+/*
+ * Compute and write signature deterministically
+ */
+int ecdsa_write_signature_det( ecdsa_context *ctx,
+                               const unsigned char *hash, size_t hlen,
+                               unsigned char *sig, size_t *slen,
+                               md_type_t md_alg )
+{
+    int ret;
+
+    if( ( ret = ecdsa_sign_det( &ctx->grp, &ctx->r, &ctx->s, &ctx->d,
+                                hash, hlen, md_alg ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( ecdsa_signature_to_asn1( ctx, sig, slen ) );
+}
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+
+/*
+ * Read and check signature
+ */
+int ecdsa_read_signature( ecdsa_context *ctx,
+                          const unsigned char *hash, size_t hlen,
+                          const unsigned char *sig, size_t slen )
+{
+    int ret;
+    unsigned char *p = (unsigned char *) sig;
+    const unsigned char *end = sig + slen;
+    size_t len;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA + ret );
+    }
+
+    if( p + len != end )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    if( ( ret = asn1_get_mpi( &p, end, &ctx->r ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &ctx->s ) ) != 0 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA + ret );
+
+    if( ( ret = ecdsa_verify( &ctx->grp, hash, hlen,
+                              &ctx->Q, &ctx->r, &ctx->s ) ) != 0 )
+        return( ret );
+
+    if( p != end )
+        return( POLARSSL_ERR_ECP_SIG_LEN_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * Generate key pair
+ */
+int ecdsa_genkey( ecdsa_context *ctx, ecp_group_id gid,
+                  int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    return( ecp_use_known_dp( &ctx->grp, gid ) ||
+            ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) );
+}
+
+/*
+ * Set context from an ecp_keypair
+ */
+int ecdsa_from_keypair( ecdsa_context *ctx, const ecp_keypair *key )
+{
+    int ret;
+
+    if( ( ret = ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ||
+        ( ret = mpi_copy( &ctx->d, &key->d ) ) != 0 ||
+        ( ret = ecp_copy( &ctx->Q, &key->Q ) ) != 0 )
+    {
+        ecdsa_free( ctx );
+    }
+
+    return( ret );
+}
+
+/*
+ * Initialize context
+ */
+void ecdsa_init( ecdsa_context *ctx )
+{
+    ecp_group_init( &ctx->grp );
+    mpi_init( &ctx->d );
+    ecp_point_init( &ctx->Q );
+    mpi_init( &ctx->r );
+    mpi_init( &ctx->s );
+}
+
+/*
+ * Free context
+ */
+void ecdsa_free( ecdsa_context *ctx )
+{
+    ecp_group_free( &ctx->grp );
+    mpi_free( &ctx->d );
+    ecp_point_free( &ctx->Q );
+    mpi_free( &ctx->r );
+    mpi_free( &ctx->s );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+/*
+ * Checkup routine
+ */
+int ecdsa_self_test( int verbose )
+{
+    ((void) verbose );
+    return( 0 );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_ECDSA_C */
diff --git a/Externals/polarssl/library/ecp.c b/Externals/polarssl/library/ecp.c
new file mode 100644
index 0000000000..afa795525d
--- /dev/null
+++ b/Externals/polarssl/library/ecp.c
@@ -0,0 +1,2029 @@
+/*
+ *  Elliptic curves over GF(p): generic functions
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * References:
+ *
+ * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
+ * GECC = Guide to Elliptic Curve Cryptography - Hankerson, Menezes, Vanstone
+ * FIPS 186-3 http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf
+ * RFC 4492 for the related TLS structures and constants
+ *
+ * [M255] http://cr.yp.to/ecdh/curve25519-20060209.pdf
+ *
+ * [2] CORON, Jean-Sébastien. Resistance against differential power analysis
+ *     for elliptic curve cryptosystems. In : Cryptographic Hardware and
+ *     Embedded Systems. Springer Berlin Heidelberg, 1999. p. 292-302.
+ *     <http://link.springer.com/chapter/10.1007/3-540-48059-5_25>
+ *
+ * [3] HEDABOU, Mustapha, PINEL, Pierre, et BÉNÉTEAU, Lucien. A comb method to
+ *     render ECC resistant against Side Channel Attacks. IACR Cryptology
+ *     ePrint Archive, 2004, vol. 2004, p. 342.
+ *     <http://eprint.iacr.org/2004/342.pdf>
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_ECP_C)
+
+#include "polarssl/ecp.h"
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf     printf
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#include <stdlib.h>
+
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strcasecmp _stricmp
+#endif
+
+#if defined(_MSC_VER) && !defined(inline)
+#define inline _inline
+#else
+#if defined(__ARMCC_VERSION) && !defined(inline)
+#define inline __inline
+#endif /* __ARMCC_VERSION */
+#endif /*_MSC_VER */
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if defined(POLARSSL_SELF_TEST)
+/*
+ * Counts of point addition and doubling, and field multiplications.
+ * Used to test resistance of point multiplication to simple timing attacks.
+ */
+static unsigned long add_count, dbl_count, mul_count;
+#endif
+
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP224R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP256R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP384R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP521R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_BP256R1_ENABLED)   ||   \
+    defined(POLARSSL_ECP_DP_BP384R1_ENABLED)   ||   \
+    defined(POLARSSL_ECP_DP_BP512R1_ENABLED)   ||   \
+    defined(POLARSSL_ECP_DP_SECP192K1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP224K1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+#define POLARSSL_ECP_SHORT_WEIERSTRASS
+#endif
+
+#if defined(POLARSSL_ECP_DP_M221_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_M255_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_M383_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_M511_ENABLED)
+#define POLARSSL_ECP_MONTGOMERY
+#endif
+
+/*
+ * Curve types: internal for now, might be exposed later
+ */
+typedef enum
+{
+    POLARSSL_ECP_TYPE_NONE = 0,
+    POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS,    /* y^2 = x^3 + a x + b      */
+    POLARSSL_ECP_TYPE_MONTGOMERY,           /* y^2 = x^3 + a x^2 + x    */
+} ecp_curve_type;
+
+/*
+ * List of supported curves:
+ *  - internal ID
+ *  - TLS NamedCurve ID (RFC 4492 sec. 5.1.1, RFC 7071 sec. 2)
+ *  - size in bits
+ *  - readable name
+ *
+ * Curves are listed in order: largest curves first, and for a given size,
+ * fastest curves first. This provides the default order for the SSL module.
+ */
+static const ecp_curve_info ecp_supported_curves[] =
+{
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+    { POLARSSL_ECP_DP_SECP521R1,    25,     521,    "secp521r1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_BP512R1_ENABLED)
+    { POLARSSL_ECP_DP_BP512R1,      28,     512,    "brainpoolP512r1"   },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+    { POLARSSL_ECP_DP_SECP384R1,    24,     384,    "secp384r1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_BP384R1_ENABLED)
+    { POLARSSL_ECP_DP_BP384R1,      27,     384,    "brainpoolP384r1"   },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+    { POLARSSL_ECP_DP_SECP256R1,    23,     256,    "secp256r1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+    { POLARSSL_ECP_DP_SECP256K1,    22,     256,    "secp256k1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_BP256R1_ENABLED)
+    { POLARSSL_ECP_DP_BP256R1,      26,     256,    "brainpoolP256r1"   },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+    { POLARSSL_ECP_DP_SECP224R1,    21,     224,    "secp224r1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+    { POLARSSL_ECP_DP_SECP224K1,    20,     224,    "secp224k1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+    { POLARSSL_ECP_DP_SECP192R1,    19,     192,    "secp192r1"         },
+#endif
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+    { POLARSSL_ECP_DP_SECP192K1,    18,     192,    "secp192k1"         },
+#endif
+    { POLARSSL_ECP_DP_NONE,          0,     0,      NULL                },
+};
+
+#define ECP_NB_CURVES   sizeof( ecp_supported_curves ) /    \
+                        sizeof( ecp_supported_curves[0] )
+
+static ecp_group_id ecp_supported_grp_id[ECP_NB_CURVES];
+
+/*
+ * List of supported curves and associated info
+ */
+const ecp_curve_info *ecp_curve_list( void )
+{
+    return( ecp_supported_curves );
+}
+
+/*
+ * List of supported curves, group ID only
+ */
+const ecp_group_id *ecp_grp_id_list( void )
+{
+    static int init_done = 0;
+
+    if( ! init_done )
+    {
+        size_t i = 0;
+        const ecp_curve_info *curve_info;
+
+        for( curve_info = ecp_curve_list();
+             curve_info->grp_id != POLARSSL_ECP_DP_NONE;
+             curve_info++ )
+        {
+            ecp_supported_grp_id[i++] = curve_info->grp_id;
+        }
+        ecp_supported_grp_id[i] = POLARSSL_ECP_DP_NONE;
+
+        init_done = 1;
+    }
+
+    return( ecp_supported_grp_id );
+}
+
+/*
+ * Get the curve info for the internal identifier
+ */
+const ecp_curve_info *ecp_curve_info_from_grp_id( ecp_group_id grp_id )
+{
+    const ecp_curve_info *curve_info;
+
+    for( curve_info = ecp_curve_list();
+         curve_info->grp_id != POLARSSL_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( curve_info->grp_id == grp_id )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the curve info from the TLS identifier
+ */
+const ecp_curve_info *ecp_curve_info_from_tls_id( uint16_t tls_id )
+{
+    const ecp_curve_info *curve_info;
+
+    for( curve_info = ecp_curve_list();
+         curve_info->grp_id != POLARSSL_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( curve_info->tls_id == tls_id )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the curve info from the name
+ */
+const ecp_curve_info *ecp_curve_info_from_name( const char *name )
+{
+    const ecp_curve_info *curve_info;
+
+    for( curve_info = ecp_curve_list();
+         curve_info->grp_id != POLARSSL_ECP_DP_NONE;
+         curve_info++ )
+    {
+        if( strcasecmp( curve_info->name, name ) == 0 )
+            return( curve_info );
+    }
+
+    return( NULL );
+}
+
+/*
+ * Get the type of a curve
+ */
+static inline ecp_curve_type ecp_get_type( const ecp_group *grp )
+{
+    if( grp->G.X.p == NULL )
+        return( POLARSSL_ECP_TYPE_NONE );
+
+    if( grp->G.Y.p == NULL )
+        return( POLARSSL_ECP_TYPE_MONTGOMERY );
+    else
+        return( POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS );
+}
+
+/*
+ * Initialize (the components of) a point
+ */
+void ecp_point_init( ecp_point *pt )
+{
+    if( pt == NULL )
+        return;
+
+    mpi_init( &pt->X );
+    mpi_init( &pt->Y );
+    mpi_init( &pt->Z );
+}
+
+/*
+ * Initialize (the components of) a group
+ */
+void ecp_group_init( ecp_group *grp )
+{
+    if( grp == NULL )
+        return;
+
+    memset( grp, 0, sizeof( ecp_group ) );
+}
+
+/*
+ * Initialize (the components of) a key pair
+ */
+void ecp_keypair_init( ecp_keypair *key )
+{
+    if( key == NULL )
+        return;
+
+    ecp_group_init( &key->grp );
+    mpi_init( &key->d );
+    ecp_point_init( &key->Q );
+}
+
+/*
+ * Unallocate (the components of) a point
+ */
+void ecp_point_free( ecp_point *pt )
+{
+    if( pt == NULL )
+        return;
+
+    mpi_free( &( pt->X ) );
+    mpi_free( &( pt->Y ) );
+    mpi_free( &( pt->Z ) );
+}
+
+/*
+ * Unallocate (the components of) a group
+ */
+void ecp_group_free( ecp_group *grp )
+{
+    size_t i;
+
+    if( grp == NULL )
+        return;
+
+    if( grp->h != 1 )
+    {
+        mpi_free( &grp->P );
+        mpi_free( &grp->A );
+        mpi_free( &grp->B );
+        ecp_point_free( &grp->G );
+        mpi_free( &grp->N );
+    }
+
+    if( grp->T != NULL )
+    {
+        for( i = 0; i < grp->T_size; i++ )
+            ecp_point_free( &grp->T[i] );
+        polarssl_free( grp->T );
+    }
+
+    polarssl_zeroize( grp, sizeof( ecp_group ) );
+}
+
+/*
+ * Unallocate (the components of) a key pair
+ */
+void ecp_keypair_free( ecp_keypair *key )
+{
+    if( key == NULL )
+        return;
+
+    ecp_group_free( &key->grp );
+    mpi_free( &key->d );
+    ecp_point_free( &key->Q );
+}
+
+/*
+ * Copy the contents of a point
+ */
+int ecp_copy( ecp_point *P, const ecp_point *Q )
+{
+    int ret;
+
+    MPI_CHK( mpi_copy( &P->X, &Q->X ) );
+    MPI_CHK( mpi_copy( &P->Y, &Q->Y ) );
+    MPI_CHK( mpi_copy( &P->Z, &Q->Z ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Copy the contents of a group object
+ */
+int ecp_group_copy( ecp_group *dst, const ecp_group *src )
+{
+    return ecp_use_known_dp( dst, src->id );
+}
+
+/*
+ * Set point to zero
+ */
+int ecp_set_zero( ecp_point *pt )
+{
+    int ret;
+
+    MPI_CHK( mpi_lset( &pt->X , 1 ) );
+    MPI_CHK( mpi_lset( &pt->Y , 1 ) );
+    MPI_CHK( mpi_lset( &pt->Z , 0 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Tell if a point is zero
+ */
+int ecp_is_zero( ecp_point *pt )
+{
+    return( mpi_cmp_int( &pt->Z, 0 ) == 0 );
+}
+
+/*
+ * Import a non-zero point from ASCII strings
+ */
+int ecp_point_read_string( ecp_point *P, int radix,
+                           const char *x, const char *y )
+{
+    int ret;
+
+    MPI_CHK( mpi_read_string( &P->X, radix, x ) );
+    MPI_CHK( mpi_read_string( &P->Y, radix, y ) );
+    MPI_CHK( mpi_lset( &P->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Export a point into unsigned binary data (SEC1 2.3.3)
+ */
+int ecp_point_write_binary( const ecp_group *grp, const ecp_point *P,
+                            int format, size_t *olen,
+                            unsigned char *buf, size_t buflen )
+{
+    int ret = 0;
+    size_t plen;
+
+    if( format != POLARSSL_ECP_PF_UNCOMPRESSED &&
+        format != POLARSSL_ECP_PF_COMPRESSED )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Common case: P == 0
+     */
+    if( mpi_cmp_int( &P->Z, 0 ) == 0 )
+    {
+        if( buflen < 1 )
+            return( POLARSSL_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x00;
+        *olen = 1;
+
+        return( 0 );
+    }
+
+    plen = mpi_size( &grp->P );
+
+    if( format == POLARSSL_ECP_PF_UNCOMPRESSED )
+    {
+        *olen = 2 * plen + 1;
+
+        if( buflen < *olen )
+            return( POLARSSL_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x04;
+        MPI_CHK( mpi_write_binary( &P->X, buf + 1, plen ) );
+        MPI_CHK( mpi_write_binary( &P->Y, buf + 1 + plen, plen ) );
+    }
+    else if( format == POLARSSL_ECP_PF_COMPRESSED )
+    {
+        *olen = plen + 1;
+
+        if( buflen < *olen )
+            return( POLARSSL_ERR_ECP_BUFFER_TOO_SMALL );
+
+        buf[0] = 0x02 + mpi_get_bit( &P->Y, 0 );
+        MPI_CHK( mpi_write_binary( &P->X, buf + 1, plen ) );
+    }
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Import a point from unsigned binary data (SEC1 2.3.4)
+ */
+int ecp_point_read_binary( const ecp_group *grp, ecp_point *pt,
+                           const unsigned char *buf, size_t ilen )
+{
+    int ret;
+    size_t plen;
+
+    if ( ilen < 1 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( buf[0] == 0x00 )
+    {
+        if( ilen == 1 )
+            return( ecp_set_zero( pt ) );
+        else
+            return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+    }
+
+    plen = mpi_size( &grp->P );
+
+    if( buf[0] != 0x04 )
+        return( POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    if( ilen != 2 * plen + 1 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    MPI_CHK( mpi_read_binary( &pt->X, buf + 1, plen ) );
+    MPI_CHK( mpi_read_binary( &pt->Y, buf + 1 + plen, plen ) );
+    MPI_CHK( mpi_lset( &pt->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Import a point from a TLS ECPoint record (RFC 4492)
+ *      struct {
+ *          opaque point <1..2^8-1>;
+ *      } ECPoint;
+ */
+int ecp_tls_read_point( const ecp_group *grp, ecp_point *pt,
+                        const unsigned char **buf, size_t buf_len )
+{
+    unsigned char data_len;
+    const unsigned char *buf_start;
+
+    /*
+     * We must have at least two bytes (1 for length, at least one for data)
+     */
+    if( buf_len < 2 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    data_len = *(*buf)++;
+    if( data_len < 1 || data_len > buf_len - 1 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Save buffer start for read_binary and update buf
+     */
+    buf_start = *buf;
+    *buf += data_len;
+
+    return ecp_point_read_binary( grp, pt, buf_start, data_len );
+}
+
+/*
+ * Export a point as a TLS ECPoint record (RFC 4492)
+ *      struct {
+ *          opaque point <1..2^8-1>;
+ *      } ECPoint;
+ */
+int ecp_tls_write_point( const ecp_group *grp, const ecp_point *pt,
+                         int format, size_t *olen,
+                         unsigned char *buf, size_t blen )
+{
+    int ret;
+
+    /*
+     * buffer length must be at least one, for our length byte
+     */
+    if( blen < 1 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecp_point_write_binary( grp, pt, format,
+                    olen, buf + 1, blen - 1) ) != 0 )
+        return( ret );
+
+    /*
+     * write length to the first byte and update total length
+     */
+    buf[0] = (unsigned char) *olen;
+    ++*olen;
+
+    return( 0 );
+}
+
+/*
+ * Import an ECP group from ASCII strings, case A == -3
+ */
+int ecp_group_read_string( ecp_group *grp, int radix,
+                           const char *p, const char *b,
+                           const char *gx, const char *gy, const char *n)
+{
+    int ret;
+
+    MPI_CHK( mpi_read_string( &grp->P, radix, p ) );
+    MPI_CHK( mpi_read_string( &grp->B, radix, b ) );
+    MPI_CHK( ecp_point_read_string( &grp->G, radix, gx, gy ) );
+    MPI_CHK( mpi_read_string( &grp->N, radix, n ) );
+
+    grp->pbits = mpi_msb( &grp->P );
+    grp->nbits = mpi_msb( &grp->N );
+
+cleanup:
+    if( ret != 0 )
+        ecp_group_free( grp );
+
+    return( ret );
+}
+
+/*
+ * Set a group from an ECParameters record (RFC 4492)
+ */
+int ecp_tls_read_group( ecp_group *grp, const unsigned char **buf, size_t len )
+{
+    uint16_t tls_id;
+    const ecp_curve_info *curve_info;
+
+    /*
+     * We expect at least three bytes (see below)
+     */
+    if( len < 3 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * First byte is curve_type; only named_curve is handled
+     */
+    if( *(*buf)++ != POLARSSL_ECP_TLS_NAMED_CURVE )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Next two bytes are the namedcurve value
+     */
+    tls_id = *(*buf)++;
+    tls_id <<= 8;
+    tls_id |= *(*buf)++;
+
+    if( ( curve_info = ecp_curve_info_from_tls_id( tls_id ) ) == NULL )
+        return( POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    return ecp_use_known_dp( grp, curve_info->grp_id );
+}
+
+/*
+ * Write the ECParameters record corresponding to a group (RFC 4492)
+ */
+int ecp_tls_write_group( const ecp_group *grp, size_t *olen,
+                         unsigned char *buf, size_t blen )
+{
+    const ecp_curve_info *curve_info;
+
+    if( ( curve_info = ecp_curve_info_from_grp_id( grp->id ) ) == NULL )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * We are going to write 3 bytes (see below)
+     */
+    *olen = 3;
+    if( blen < *olen )
+        return( POLARSSL_ERR_ECP_BUFFER_TOO_SMALL );
+
+    /*
+     * First byte is curve_type, always named_curve
+     */
+    *buf++ = POLARSSL_ECP_TLS_NAMED_CURVE;
+
+    /*
+     * Next two bytes are the namedcurve value
+     */
+    buf[0] = curve_info->tls_id >> 8;
+    buf[1] = curve_info->tls_id & 0xFF;
+
+    return( 0 );
+}
+
+/*
+ * Wrapper around fast quasi-modp functions, with fall-back to mpi_mod_mpi.
+ * See the documentation of struct ecp_group.
+ *
+ * This function is in the critial loop for ecp_mul, so pay attention to perf.
+ */
+static int ecp_modp( mpi *N, const ecp_group *grp )
+{
+    int ret;
+
+    if( grp->modp == NULL )
+        return( mpi_mod_mpi( N, N, &grp->P ) );
+
+    /* N->s < 0 is a much faster test, which fails only if N is 0 */
+    if( ( N->s < 0 && mpi_cmp_int( N, 0 ) != 0 ) ||
+        mpi_msb( N ) > 2 * grp->pbits )
+    {
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+    }
+
+    MPI_CHK( grp->modp( N ) );
+
+    /* N->s < 0 is a much faster test, which fails only if N is 0 */
+    while( N->s < 0 && mpi_cmp_int( N, 0 ) != 0 )
+        MPI_CHK( mpi_add_mpi( N, N, &grp->P ) );
+
+    while( mpi_cmp_mpi( N, &grp->P ) >= 0 )
+        /* we known P, N and the result are positive */
+        MPI_CHK( mpi_sub_abs( N, N, &grp->P ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Fast mod-p functions expect their argument to be in the 0..p^2 range.
+ *
+ * In order to guarantee that, we need to ensure that operands of
+ * mpi_mul_mpi are in the 0..p range. So, after each operation we will
+ * bring the result back to this range.
+ *
+ * The following macros are shortcuts for doing that.
+ */
+
+/*
+ * Reduce a mpi mod p in-place, general case, to use after mpi_mul_mpi
+ */
+#if defined(POLARSSL_SELF_TEST)
+#define INC_MUL_COUNT   mul_count++;
+#else
+#define INC_MUL_COUNT
+#endif
+
+#define MOD_MUL( N )    do { MPI_CHK( ecp_modp( &N, grp ) ); INC_MUL_COUNT } \
+                        while( 0 )
+
+/*
+ * Reduce a mpi mod p in-place, to use after mpi_sub_mpi
+ * N->s < 0 is a very fast test, which fails only if N is 0
+ */
+#define MOD_SUB( N )                                \
+    while( N.s < 0 && mpi_cmp_int( &N, 0 ) != 0 )   \
+        MPI_CHK( mpi_add_mpi( &N, &N, &grp->P ) )
+
+/*
+ * Reduce a mpi mod p in-place, to use after mpi_add_mpi and mpi_mul_int.
+ * We known P, N and the result are positive, so sub_abs is correct, and
+ * a bit faster.
+ */
+#define MOD_ADD( N )                                \
+    while( mpi_cmp_mpi( &N, &grp->P ) >= 0 )        \
+        MPI_CHK( mpi_sub_abs( &N, &N, &grp->P ) )
+
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+/*
+ * For curves in short Weierstrass form, we do all the internal operations in
+ * Jacobian coordinates.
+ *
+ * For multiplication, we'll use a comb method with coutermeasueres against
+ * SPA, hence timing attacks.
+ */
+
+/*
+ * Normalize jacobian coordinates so that Z == 0 || Z == 1  (GECC 3.2.1)
+ * Cost: 1N := 1I + 3M + 1S
+ */
+static int ecp_normalize_jac( const ecp_group *grp, ecp_point *pt )
+{
+    int ret;
+    mpi Zi, ZZi;
+
+    if( mpi_cmp_int( &pt->Z, 0 ) == 0 )
+        return( 0 );
+
+    mpi_init( &Zi ); mpi_init( &ZZi );
+
+    /*
+     * X = X / Z^2  mod p
+     */
+    MPI_CHK( mpi_inv_mod( &Zi,      &pt->Z,     &grp->P ) );
+    MPI_CHK( mpi_mul_mpi( &ZZi,     &Zi,        &Zi     ) ); MOD_MUL( ZZi );
+    MPI_CHK( mpi_mul_mpi( &pt->X,   &pt->X,     &ZZi    ) ); MOD_MUL( pt->X );
+
+    /*
+     * Y = Y / Z^3  mod p
+     */
+    MPI_CHK( mpi_mul_mpi( &pt->Y,   &pt->Y,     &ZZi    ) ); MOD_MUL( pt->Y );
+    MPI_CHK( mpi_mul_mpi( &pt->Y,   &pt->Y,     &Zi     ) ); MOD_MUL( pt->Y );
+
+    /*
+     * Z = 1
+     */
+    MPI_CHK( mpi_lset( &pt->Z, 1 ) );
+
+cleanup:
+
+    mpi_free( &Zi ); mpi_free( &ZZi );
+
+    return( ret );
+}
+
+/*
+ * Normalize jacobian coordinates of an array of (pointers to) points,
+ * using Montgomery's trick to perform only one inversion mod P.
+ * (See for example Cohen's "A Course in Computational Algebraic Number
+ * Theory", Algorithm 10.3.4.)
+ *
+ * Warning: fails (returning an error) if one of the points is zero!
+ * This should never happen, see choice of w in ecp_mul_comb().
+ *
+ * Cost: 1N(t) := 1I + (6t - 3)M + 1S
+ */
+static int ecp_normalize_jac_many( const ecp_group *grp,
+                                   ecp_point *T[], size_t t_len )
+{
+    int ret;
+    size_t i;
+    mpi *c, u, Zi, ZZi;
+
+    if( t_len < 2 )
+        return( ecp_normalize_jac( grp, *T ) );
+
+    if( ( c = (mpi *) polarssl_malloc( t_len * sizeof( mpi ) ) ) == NULL )
+        return( POLARSSL_ERR_ECP_MALLOC_FAILED );
+
+    mpi_init( &u ); mpi_init( &Zi ); mpi_init( &ZZi );
+    for( i = 0; i < t_len; i++ )
+        mpi_init( &c[i] );
+
+    /*
+     * c[i] = Z_0 * ... * Z_i
+     */
+    MPI_CHK( mpi_copy( &c[0], &T[0]->Z ) );
+    for( i = 1; i < t_len; i++ )
+    {
+        MPI_CHK( mpi_mul_mpi( &c[i], &c[i-1], &T[i]->Z ) );
+        MOD_MUL( c[i] );
+    }
+
+    /*
+     * u = 1 / (Z_0 * ... * Z_n) mod P
+     */
+    MPI_CHK( mpi_inv_mod( &u, &c[t_len-1], &grp->P ) );
+
+    for( i = t_len - 1; ; i-- )
+    {
+        /*
+         * Zi = 1 / Z_i mod p
+         * u = 1 / (Z_0 * ... * Z_i) mod P
+         */
+        if( i == 0 ) {
+            MPI_CHK( mpi_copy( &Zi, &u ) );
+        }
+        else
+        {
+            MPI_CHK( mpi_mul_mpi( &Zi, &u, &c[i-1]  ) ); MOD_MUL( Zi );
+            MPI_CHK( mpi_mul_mpi( &u,  &u, &T[i]->Z ) ); MOD_MUL( u );
+        }
+
+        /*
+         * proceed as in normalize()
+         */
+        MPI_CHK( mpi_mul_mpi( &ZZi,     &Zi,      &Zi  ) ); MOD_MUL( ZZi );
+        MPI_CHK( mpi_mul_mpi( &T[i]->X, &T[i]->X, &ZZi ) ); MOD_MUL( T[i]->X );
+        MPI_CHK( mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &ZZi ) ); MOD_MUL( T[i]->Y );
+        MPI_CHK( mpi_mul_mpi( &T[i]->Y, &T[i]->Y, &Zi  ) ); MOD_MUL( T[i]->Y );
+
+        /*
+         * Post-precessing: reclaim some memory by shrinking coordinates
+         * - not storing Z (always 1)
+         * - shrinking other coordinates, but still keeping the same number of
+         *   limbs as P, as otherwise it will too likely be regrown too fast.
+         */
+        MPI_CHK( mpi_shrink( &T[i]->X, grp->P.n ) );
+        MPI_CHK( mpi_shrink( &T[i]->Y, grp->P.n ) );
+        mpi_free( &T[i]->Z );
+
+        if( i == 0 )
+            break;
+    }
+
+cleanup:
+
+    mpi_free( &u ); mpi_free( &Zi ); mpi_free( &ZZi );
+    for( i = 0; i < t_len; i++ )
+        mpi_free( &c[i] );
+    polarssl_free( c );
+
+    return( ret );
+}
+
+/*
+ * Conditional point inversion: Q -> -Q = (Q.X, -Q.Y, Q.Z) without leak.
+ * "inv" must be 0 (don't invert) or 1 (invert) or the result will be invalid
+ */
+static int ecp_safe_invert_jac( const ecp_group *grp,
+                            ecp_point *Q,
+                            unsigned char inv )
+{
+    int ret;
+    unsigned char nonzero;
+    mpi mQY;
+
+    mpi_init( &mQY );
+
+    /* Use the fact that -Q.Y mod P = P - Q.Y unless Q.Y == 0 */
+    MPI_CHK( mpi_sub_mpi( &mQY, &grp->P, &Q->Y ) );
+    nonzero = mpi_cmp_int( &Q->Y, 0 ) != 0;
+    MPI_CHK( mpi_safe_cond_assign( &Q->Y, &mQY, inv & nonzero ) );
+
+cleanup:
+    mpi_free( &mQY );
+
+    return( ret );
+}
+
+/*
+ * Point doubling R = 2 P, Jacobian coordinates
+ *
+ * http://www.hyperelliptic.org/EFD/g1p/auto-code/shortw/jacobian/doubling/dbl-2007-bl.op3
+ * with heavy variable renaming, some reordering and one minor modification
+ * (a = 2 * b, c = d - 2a replaced with c = d, c = c - b, c = c - b)
+ * in order to use a lot less intermediate variables (6 vs 25).
+ *
+ * Cost: 1D := 2M + 8S
+ */
+static int ecp_double_jac( const ecp_group *grp, ecp_point *R,
+                           const ecp_point *P )
+{
+    int ret;
+    mpi T1, T2, T3, X3, Y3, Z3;
+
+#if defined(POLARSSL_SELF_TEST)
+    dbl_count++;
+#endif
+
+    mpi_init( &T1 ); mpi_init( &T2 ); mpi_init( &T3 );
+    mpi_init( &X3 ); mpi_init( &Y3 ); mpi_init( &Z3 );
+
+    MPI_CHK( mpi_mul_mpi( &T3,  &P->X,  &P->X   ) ); MOD_MUL( T3 );
+    MPI_CHK( mpi_mul_mpi( &T2,  &P->Y,  &P->Y   ) ); MOD_MUL( T2 );
+    MPI_CHK( mpi_mul_mpi( &Y3,  &T2,    &T2     ) ); MOD_MUL( Y3 );
+    MPI_CHK( mpi_add_mpi( &X3,  &P->X,  &T2     ) ); MOD_ADD( X3 );
+    MPI_CHK( mpi_mul_mpi( &X3,  &X3,    &X3     ) ); MOD_MUL( X3 );
+    MPI_CHK( mpi_sub_mpi( &X3,  &X3,    &Y3     ) ); MOD_SUB( X3 );
+    MPI_CHK( mpi_sub_mpi( &X3,  &X3,    &T3     ) ); MOD_SUB( X3 );
+    MPI_CHK( mpi_mul_int( &T1,  &X3,    2       ) ); MOD_ADD( T1 );
+    MPI_CHK( mpi_mul_mpi( &Z3,  &P->Z,  &P->Z   ) ); MOD_MUL( Z3 );
+    MPI_CHK( mpi_mul_mpi( &X3,  &Z3,    &Z3     ) ); MOD_MUL( X3 );
+    MPI_CHK( mpi_mul_int( &T3,  &T3,    3       ) ); MOD_ADD( T3 );
+
+    /* Special case for A = -3 */
+    if( grp->A.p == NULL )
+    {
+        MPI_CHK( mpi_mul_int( &X3, &X3, 3 ) );
+        X3.s = -1; /* mpi_mul_int doesn't handle negative numbers */
+        MOD_SUB( X3 );
+    }
+    else
+        MPI_CHK( mpi_mul_mpi( &X3,  &X3,    &grp->A ) ); MOD_MUL( X3 );
+
+    MPI_CHK( mpi_add_mpi( &T3,  &T3,    &X3     ) ); MOD_ADD( T3 );
+    MPI_CHK( mpi_mul_mpi( &X3,  &T3,    &T3     ) ); MOD_MUL( X3 );
+    MPI_CHK( mpi_sub_mpi( &X3,  &X3,    &T1     ) ); MOD_SUB( X3 );
+    MPI_CHK( mpi_sub_mpi( &X3,  &X3,    &T1     ) ); MOD_SUB( X3 );
+    MPI_CHK( mpi_sub_mpi( &T1,  &T1,    &X3     ) ); MOD_SUB( T1 );
+    MPI_CHK( mpi_mul_mpi( &T1,  &T3,    &T1     ) ); MOD_MUL( T1 );
+    MPI_CHK( mpi_mul_int( &T3,  &Y3,    8       ) ); MOD_ADD( T3 );
+    MPI_CHK( mpi_sub_mpi( &Y3,  &T1,    &T3     ) ); MOD_SUB( Y3 );
+    MPI_CHK( mpi_add_mpi( &T1,  &P->Y,  &P->Z   ) ); MOD_ADD( T1 );
+    MPI_CHK( mpi_mul_mpi( &T1,  &T1,    &T1     ) ); MOD_MUL( T1 );
+    MPI_CHK( mpi_sub_mpi( &T1,  &T1,    &T2     ) ); MOD_SUB( T1 );
+    MPI_CHK( mpi_sub_mpi( &Z3,  &T1,    &Z3     ) ); MOD_SUB( Z3 );
+
+    MPI_CHK( mpi_copy( &R->X, &X3 ) );
+    MPI_CHK( mpi_copy( &R->Y, &Y3 ) );
+    MPI_CHK( mpi_copy( &R->Z, &Z3 ) );
+
+cleanup:
+    mpi_free( &T1 ); mpi_free( &T2 ); mpi_free( &T3 );
+    mpi_free( &X3 ); mpi_free( &Y3 ); mpi_free( &Z3 );
+
+    return( ret );
+}
+
+/*
+ * Addition: R = P + Q, mixed affine-Jacobian coordinates (GECC 3.22)
+ *
+ * The coordinates of Q must be normalized (= affine),
+ * but those of P don't need to. R is not normalized.
+ *
+ * Special cases: (1) P or Q is zero, (2) R is zero, (3) P == Q.
+ * None of these cases can happen as intermediate step in ecp_mul_comb():
+ * - at each step, P, Q and R are multiples of the base point, the factor
+ *   being less than its order, so none of them is zero;
+ * - Q is an odd multiple of the base point, P an even multiple,
+ *   due to the choice of precomputed points in the modified comb method.
+ * So branches for these cases do not leak secret information.
+ *
+ * We accept Q->Z being unset (saving memory in tables) as meaning 1.
+ *
+ * Cost: 1A := 8M + 3S
+ */
+static int ecp_add_mixed( const ecp_group *grp, ecp_point *R,
+                          const ecp_point *P, const ecp_point *Q )
+{
+    int ret;
+    mpi T1, T2, T3, T4, X, Y, Z;
+
+#if defined(POLARSSL_SELF_TEST)
+    add_count++;
+#endif
+
+    /*
+     * Trivial cases: P == 0 or Q == 0 (case 1)
+     */
+    if( mpi_cmp_int( &P->Z, 0 ) == 0 )
+        return( ecp_copy( R, Q ) );
+
+    if( Q->Z.p != NULL && mpi_cmp_int( &Q->Z, 0 ) == 0 )
+        return( ecp_copy( R, P ) );
+
+    /*
+     * Make sure Q coordinates are normalized
+     */
+    if( Q->Z.p != NULL && mpi_cmp_int( &Q->Z, 1 ) != 0 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    mpi_init( &T1 ); mpi_init( &T2 ); mpi_init( &T3 ); mpi_init( &T4 );
+    mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
+
+    MPI_CHK( mpi_mul_mpi( &T1,  &P->Z,  &P->Z ) );  MOD_MUL( T1 );
+    MPI_CHK( mpi_mul_mpi( &T2,  &T1,    &P->Z ) );  MOD_MUL( T2 );
+    MPI_CHK( mpi_mul_mpi( &T1,  &T1,    &Q->X ) );  MOD_MUL( T1 );
+    MPI_CHK( mpi_mul_mpi( &T2,  &T2,    &Q->Y ) );  MOD_MUL( T2 );
+    MPI_CHK( mpi_sub_mpi( &T1,  &T1,    &P->X ) );  MOD_SUB( T1 );
+    MPI_CHK( mpi_sub_mpi( &T2,  &T2,    &P->Y ) );  MOD_SUB( T2 );
+
+    /* Special cases (2) and (3) */
+    if( mpi_cmp_int( &T1, 0 ) == 0 )
+    {
+        if( mpi_cmp_int( &T2, 0 ) == 0 )
+        {
+            ret = ecp_double_jac( grp, R, P );
+            goto cleanup;
+        }
+        else
+        {
+            ret = ecp_set_zero( R );
+            goto cleanup;
+        }
+    }
+
+    MPI_CHK( mpi_mul_mpi( &Z,   &P->Z,  &T1   ) );  MOD_MUL( Z  );
+    MPI_CHK( mpi_mul_mpi( &T3,  &T1,    &T1   ) );  MOD_MUL( T3 );
+    MPI_CHK( mpi_mul_mpi( &T4,  &T3,    &T1   ) );  MOD_MUL( T4 );
+    MPI_CHK( mpi_mul_mpi( &T3,  &T3,    &P->X ) );  MOD_MUL( T3 );
+    MPI_CHK( mpi_mul_int( &T1,  &T3,    2     ) );  MOD_ADD( T1 );
+    MPI_CHK( mpi_mul_mpi( &X,   &T2,    &T2   ) );  MOD_MUL( X  );
+    MPI_CHK( mpi_sub_mpi( &X,   &X,     &T1   ) );  MOD_SUB( X  );
+    MPI_CHK( mpi_sub_mpi( &X,   &X,     &T4   ) );  MOD_SUB( X  );
+    MPI_CHK( mpi_sub_mpi( &T3,  &T3,    &X    ) );  MOD_SUB( T3 );
+    MPI_CHK( mpi_mul_mpi( &T3,  &T3,    &T2   ) );  MOD_MUL( T3 );
+    MPI_CHK( mpi_mul_mpi( &T4,  &T4,    &P->Y ) );  MOD_MUL( T4 );
+    MPI_CHK( mpi_sub_mpi( &Y,   &T3,    &T4   ) );  MOD_SUB( Y  );
+
+    MPI_CHK( mpi_copy( &R->X, &X ) );
+    MPI_CHK( mpi_copy( &R->Y, &Y ) );
+    MPI_CHK( mpi_copy( &R->Z, &Z ) );
+
+cleanup:
+
+    mpi_free( &T1 ); mpi_free( &T2 ); mpi_free( &T3 ); mpi_free( &T4 );
+    mpi_free( &X ); mpi_free( &Y ); mpi_free( &Z );
+
+    return( ret );
+}
+
+/*
+ * Addition: R = P + Q, result's coordinates normalized
+ */
+int ecp_add( const ecp_group *grp, ecp_point *R,
+             const ecp_point *P, const ecp_point *Q )
+{
+    int ret;
+
+    if( ecp_get_type( grp ) != POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+        return( POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    MPI_CHK( ecp_add_mixed( grp, R, P, Q ) );
+    MPI_CHK( ecp_normalize_jac( grp, R ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Subtraction: R = P - Q, result's coordinates normalized
+ */
+int ecp_sub( const ecp_group *grp, ecp_point *R,
+             const ecp_point *P, const ecp_point *Q )
+{
+    int ret;
+    ecp_point mQ;
+
+    ecp_point_init( &mQ );
+
+    if( ecp_get_type( grp ) != POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+        return( POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE );
+
+    /* mQ = - Q */
+    MPI_CHK( ecp_copy( &mQ, Q ) );
+    if( mpi_cmp_int( &mQ.Y, 0 ) != 0 )
+        MPI_CHK( mpi_sub_mpi( &mQ.Y, &grp->P, &mQ.Y ) );
+
+    MPI_CHK( ecp_add_mixed( grp, R, P, &mQ ) );
+    MPI_CHK( ecp_normalize_jac( grp, R ) );
+
+cleanup:
+    ecp_point_free( &mQ );
+
+    return( ret );
+}
+
+/*
+ * Randomize jacobian coordinates:
+ * (X, Y, Z) -> (l^2 X, l^3 Y, l Z) for random l
+ * This is sort of the reverse operation of ecp_normalize_jac().
+ *
+ * This countermeasure was first suggested in [2].
+ */
+static int ecp_randomize_jac( const ecp_group *grp, ecp_point *pt,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    mpi l, ll;
+    size_t p_size = ( grp->pbits + 7 ) / 8;
+    int count = 0;
+
+    mpi_init( &l ); mpi_init( &ll );
+
+    /* Generate l such that 1 < l < p */
+    do
+    {
+        mpi_fill_random( &l, p_size, f_rng, p_rng );
+
+        while( mpi_cmp_mpi( &l, &grp->P ) >= 0 )
+            MPI_CHK( mpi_shift_r( &l, 1 ) );
+
+        if( count++ > 10 )
+            return( POLARSSL_ERR_ECP_RANDOM_FAILED );
+    }
+    while( mpi_cmp_int( &l, 1 ) <= 0 );
+
+    /* Z = l * Z */
+    MPI_CHK( mpi_mul_mpi( &pt->Z,   &pt->Z,     &l  ) ); MOD_MUL( pt->Z );
+
+    /* X = l^2 * X */
+    MPI_CHK( mpi_mul_mpi( &ll,      &l,         &l  ) ); MOD_MUL( ll );
+    MPI_CHK( mpi_mul_mpi( &pt->X,   &pt->X,     &ll ) ); MOD_MUL( pt->X );
+
+    /* Y = l^3 * Y */
+    MPI_CHK( mpi_mul_mpi( &ll,      &ll,        &l  ) ); MOD_MUL( ll );
+    MPI_CHK( mpi_mul_mpi( &pt->Y,   &pt->Y,     &ll ) ); MOD_MUL( pt->Y );
+
+cleanup:
+    mpi_free( &l ); mpi_free( &ll );
+
+    return( ret );
+}
+
+/*
+ * Check and define parameters used by the comb method (see below for details)
+ */
+#if POLARSSL_ECP_WINDOW_SIZE < 2 || POLARSSL_ECP_WINDOW_SIZE > 7
+#error "POLARSSL_ECP_WINDOW_SIZE out of bounds"
+#endif
+
+/* d = ceil( n / w ) */
+#define COMB_MAX_D      ( POLARSSL_ECP_MAX_BITS + 1 ) / 2
+
+/* number of precomputed points */
+#define COMB_MAX_PRE    ( 1 << ( POLARSSL_ECP_WINDOW_SIZE - 1 ) )
+
+/*
+ * Compute the representation of m that will be used with our comb method.
+ *
+ * The basic comb method is described in GECC 3.44 for example. We use a
+ * modified version that provides resistance to SPA by avoiding zero
+ * digits in the representation as in [3]. We modify the method further by
+ * requiring that all K_i be odd, which has the small cost that our
+ * representation uses one more K_i, due to carries.
+ *
+ * Also, for the sake of compactness, only the seven low-order bits of x[i]
+ * are used to represent K_i, and the msb of x[i] encodes the the sign (s_i in
+ * the paper): it is set if and only if if s_i == -1;
+ *
+ * Calling conventions:
+ * - x is an array of size d + 1
+ * - w is the size, ie number of teeth, of the comb, and must be between
+ *   2 and 7 (in practice, between 2 and POLARSSL_ECP_WINDOW_SIZE)
+ * - m is the MPI, expected to be odd and such that bitlength(m) <= w * d
+ *   (the result will be incorrect if these assumptions are not satisfied)
+ */
+static void ecp_comb_fixed( unsigned char x[], size_t d,
+                            unsigned char w, const mpi *m )
+{
+    size_t i, j;
+    unsigned char c, cc, adjust;
+
+    memset( x, 0, d+1 );
+
+    /* First get the classical comb values (except for x_d = 0) */
+    for( i = 0; i < d; i++ )
+        for( j = 0; j < w; j++ )
+            x[i] |= mpi_get_bit( m, i + d * j ) << j;
+
+    /* Now make sure x_1 .. x_d are odd */
+    c = 0;
+    for( i = 1; i <= d; i++ )
+    {
+        /* Add carry and update it */
+        cc   = x[i] & c;
+        x[i] = x[i] ^ c;
+        c = cc;
+
+        /* Adjust if needed, avoiding branches */
+        adjust = 1 - ( x[i] & 0x01 );
+        c   |= x[i] & ( x[i-1] * adjust );
+        x[i] = x[i] ^ ( x[i-1] * adjust );
+        x[i-1] |= adjust << 7;
+    }
+}
+
+/*
+ * Precompute points for the comb method
+ *
+ * If i = i_{w-1} ... i_1 is the binary representation of i, then
+ * T[i] = i_{w-1} 2^{(w-1)d} P + ... + i_1 2^d P + P
+ *
+ * T must be able to hold 2^{w - 1} elements
+ *
+ * Cost: d(w-1) D + (2^{w-1} - 1) A + 1 N(w-1) + 1 N(2^{w-1} - 1)
+ */
+static int ecp_precompute_comb( const ecp_group *grp,
+                                ecp_point T[], const ecp_point *P,
+                                unsigned char w, size_t d )
+{
+    int ret;
+    unsigned char i, k;
+    size_t j;
+    ecp_point *cur, *TT[COMB_MAX_PRE - 1];
+
+    /*
+     * Set T[0] = P and
+     * T[2^{l-1}] = 2^{dl} P for l = 1 .. w-1 (this is not the final value)
+     */
+    MPI_CHK( ecp_copy( &T[0], P ) );
+
+    k = 0;
+    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
+    {
+        cur = T + i;
+        MPI_CHK( ecp_copy( cur, T + ( i >> 1 ) ) );
+        for( j = 0; j < d; j++ )
+            MPI_CHK( ecp_double_jac( grp, cur, cur ) );
+
+        TT[k++] = cur;
+    }
+
+    MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+
+    /*
+     * Compute the remaining ones using the minimal number of additions
+     * Be careful to update T[2^l] only after using it!
+     */
+    k = 0;
+    for( i = 1; i < ( 1U << ( w - 1 ) ); i <<= 1 )
+    {
+        j = i;
+        while( j-- )
+        {
+            MPI_CHK( ecp_add_mixed( grp, &T[i + j], &T[j], &T[i] ) );
+            TT[k++] = &T[i + j];
+        }
+    }
+
+    MPI_CHK( ecp_normalize_jac_many( grp, TT, k ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Select precomputed point: R = sign(i) * T[ abs(i) / 2 ]
+ */
+static int ecp_select_comb( const ecp_group *grp, ecp_point *R,
+                            const ecp_point T[], unsigned char t_len,
+                            unsigned char i )
+{
+    int ret;
+    unsigned char ii, j;
+
+    /* Ignore the "sign" bit and scale down */
+    ii =  ( i & 0x7Fu ) >> 1;
+
+    /* Read the whole table to thwart cache-based timing attacks */
+    for( j = 0; j < t_len; j++ )
+    {
+        MPI_CHK( mpi_safe_cond_assign( &R->X, &T[j].X, j == ii ) );
+        MPI_CHK( mpi_safe_cond_assign( &R->Y, &T[j].Y, j == ii ) );
+    }
+
+    /* Safely invert result if i is "negative" */
+    MPI_CHK( ecp_safe_invert_jac( grp, R, i >> 7 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Core multiplication algorithm for the (modified) comb method.
+ * This part is actually common with the basic comb method (GECC 3.44)
+ *
+ * Cost: d A + d D + 1 R
+ */
+static int ecp_mul_comb_core( const ecp_group *grp, ecp_point *R,
+                              const ecp_point T[], unsigned char t_len,
+                              const unsigned char x[], size_t d,
+                              int (*f_rng)(void *, unsigned char *, size_t),
+                              void *p_rng )
+{
+    int ret;
+    ecp_point Txi;
+    size_t i;
+
+    ecp_point_init( &Txi );
+
+    /* Start with a non-zero point and randomize its coordinates */
+    i = d;
+    MPI_CHK( ecp_select_comb( grp, R, T, t_len, x[i] ) );
+    MPI_CHK( mpi_lset( &R->Z, 1 ) );
+    if( f_rng != 0 )
+        MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) );
+
+    while( i-- != 0 )
+    {
+        MPI_CHK( ecp_double_jac( grp, R, R ) );
+        MPI_CHK( ecp_select_comb( grp, &Txi, T, t_len, x[i] ) );
+        MPI_CHK( ecp_add_mixed( grp, R, R, &Txi ) );
+    }
+
+cleanup:
+    ecp_point_free( &Txi );
+
+    return( ret );
+}
+
+/*
+ * Multiplication using the comb method,
+ * for curves in short Weierstrass form
+ */
+static int ecp_mul_comb( ecp_group *grp, ecp_point *R,
+                         const mpi *m, const ecp_point *P,
+                         int (*f_rng)(void *, unsigned char *, size_t),
+                         void *p_rng )
+{
+    int ret;
+    unsigned char w, m_is_odd, p_eq_g, pre_len, i;
+    size_t d;
+    unsigned char k[COMB_MAX_D + 1];
+    ecp_point *T;
+    mpi M, mm;
+
+    mpi_init( &M );
+    mpi_init( &mm );
+
+    /* we need N to be odd to trnaform m in an odd number, check now */
+    if( mpi_get_bit( &grp->N, 0 ) != 1 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    /*
+     * Minimize the number of multiplications, that is minimize
+     * 10 * d * w + 18 * 2^(w-1) + 11 * d + 7 * w, with d = ceil( nbits / w )
+     * (see costs of the various parts, with 1S = 1M)
+     */
+    w = grp->nbits >= 384 ? 5 : 4;
+
+    /*
+     * If P == G, pre-compute a bit more, since this may be re-used later.
+     * Just adding one avoids upping the cost of the first mul too much,
+     * and the memory cost too.
+     */
+#if POLARSSL_ECP_FIXED_POINT_OPTIM == 1
+    p_eq_g = ( mpi_cmp_mpi( &P->Y, &grp->G.Y ) == 0 &&
+               mpi_cmp_mpi( &P->X, &grp->G.X ) == 0 );
+    if( p_eq_g )
+        w++;
+#else
+    p_eq_g = 0;
+#endif
+
+    /*
+     * Make sure w is within bounds.
+     * (The last test is useful only for very small curves in the test suite.)
+     */
+    if( w > POLARSSL_ECP_WINDOW_SIZE )
+        w = POLARSSL_ECP_WINDOW_SIZE;
+    if( w >= grp->nbits )
+        w = 2;
+
+    /* Other sizes that depend on w */
+    pre_len = 1U << ( w - 1 );
+    d = ( grp->nbits + w - 1 ) / w;
+
+    /*
+     * Prepare precomputed points: if P == G we want to
+     * use grp->T if already initialized, or initialize it.
+     */
+    T = p_eq_g ? grp->T : NULL;
+
+    if( T == NULL )
+    {
+        T = (ecp_point *) polarssl_malloc( pre_len * sizeof( ecp_point ) );
+        if( T == NULL )
+        {
+            ret = POLARSSL_ERR_ECP_MALLOC_FAILED;
+            goto cleanup;
+        }
+
+        for( i = 0; i < pre_len; i++ )
+            ecp_point_init( &T[i] );
+
+        MPI_CHK( ecp_precompute_comb( grp, T, P, w, d ) );
+
+        if( p_eq_g )
+        {
+            grp->T = T;
+            grp->T_size = pre_len;
+        }
+    }
+
+    /*
+     * Make sure M is odd (M = m or M = N - m, since N is odd)
+     * using the fact that m * P = - (N - m) * P
+     */
+    m_is_odd = ( mpi_get_bit( m, 0 ) == 1 );
+    MPI_CHK( mpi_copy( &M, m ) );
+    MPI_CHK( mpi_sub_mpi( &mm, &grp->N, m ) );
+    MPI_CHK( mpi_safe_cond_assign( &M, &mm, ! m_is_odd ) );
+
+    /*
+     * Go for comb multiplication, R = M * P
+     */
+    ecp_comb_fixed( k, d, w, &M );
+    MPI_CHK( ecp_mul_comb_core( grp, R, T, pre_len, k, d, f_rng, p_rng ) );
+
+    /*
+     * Now get m * P from M * P and normalize it
+     */
+    MPI_CHK( ecp_safe_invert_jac( grp, R, ! m_is_odd ) );
+    MPI_CHK( ecp_normalize_jac( grp, R ) );
+
+cleanup:
+
+    if( T != NULL && ! p_eq_g )
+    {
+        for( i = 0; i < pre_len; i++ )
+            ecp_point_free( &T[i] );
+        polarssl_free( T );
+    }
+
+    mpi_free( &M );
+    mpi_free( &mm );
+
+    if( ret != 0 )
+        ecp_point_free( R );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_ECP_SHORT_WEIERSTRASS */
+
+#if defined(POLARSSL_ECP_MONTGOMERY)
+/*
+ * For Montgomery curves, we do all the internal arithmetic in projective
+ * coordinates. Import/export of points uses only the x coordinates, which is
+ * internaly represented as X / Z.
+ *
+ * For scalar multiplication, we'll use a Montgomery ladder.
+ */
+
+/*
+ * Normalize Montgomery x/z coordinates: X = X/Z, Z = 1
+ * Cost: 1M + 1I
+ */
+static int ecp_normalize_mxz( const ecp_group *grp, ecp_point *P )
+{
+    int ret;
+
+    MPI_CHK( mpi_inv_mod( &P->Z, &P->Z, &grp->P ) );
+    MPI_CHK( mpi_mul_mpi( &P->X, &P->X, &P->Z ) ); MOD_MUL( P->X );
+    MPI_CHK( mpi_lset( &P->Z, 1 ) );
+
+cleanup:
+    return( ret );
+}
+
+/*
+ * Randomize projective x/z coordinates:
+ * (X, Z) -> (l X, l Z) for random l
+ * This is sort of the reverse operation of ecp_normalize_mxz().
+ *
+ * This countermeasure was first suggested in [2].
+ * Cost: 2M
+ */
+static int ecp_randomize_mxz( const ecp_group *grp, ecp_point *P,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    mpi l;
+    size_t p_size = ( grp->pbits + 7 ) / 8;
+    int count = 0;
+
+    mpi_init( &l );
+
+    /* Generate l such that 1 < l < p */
+    do
+    {
+        mpi_fill_random( &l, p_size, f_rng, p_rng );
+
+        while( mpi_cmp_mpi( &l, &grp->P ) >= 0 )
+            MPI_CHK( mpi_shift_r( &l, 1 ) );
+
+        if( count++ > 10 )
+            return( POLARSSL_ERR_ECP_RANDOM_FAILED );
+    }
+    while( mpi_cmp_int( &l, 1 ) <= 0 );
+
+    MPI_CHK( mpi_mul_mpi( &P->X, &P->X, &l ) ); MOD_MUL( P->X );
+    MPI_CHK( mpi_mul_mpi( &P->Z, &P->Z, &l ) ); MOD_MUL( P->Z );
+
+cleanup:
+    mpi_free( &l );
+
+    return( ret );
+}
+
+/*
+ * Double-and-add: R = 2P, S = P + Q, with d = X(P - Q),
+ * for Montgomery curves in x/z coordinates.
+ *
+ * http://www.hyperelliptic.org/EFD/g1p/auto-code/montgom/xz/ladder/mladd-1987-m.op3
+ * with
+ * d =  X1
+ * P = (X2, Z2)
+ * Q = (X3, Z3)
+ * R = (X4, Z4)
+ * S = (X5, Z5)
+ * and eliminating temporary variables tO, ..., t4.
+ *
+ * Cost: 5M + 4S
+ */
+static int ecp_double_add_mxz( const ecp_group *grp,
+                               ecp_point *R, ecp_point *S,
+                               const ecp_point *P, const ecp_point *Q,
+                               const mpi *d )
+{
+    int ret;
+    mpi A, AA, B, BB, E, C, D, DA, CB;
+
+    mpi_init( &A ); mpi_init( &AA ); mpi_init( &B );
+    mpi_init( &BB ); mpi_init( &E ); mpi_init( &C );
+    mpi_init( &D ); mpi_init( &DA ); mpi_init( &CB );
+
+    MPI_CHK( mpi_add_mpi( &A,    &P->X,   &P->Z ) ); MOD_ADD( A    );
+    MPI_CHK( mpi_mul_mpi( &AA,   &A,      &A    ) ); MOD_MUL( AA   );
+    MPI_CHK( mpi_sub_mpi( &B,    &P->X,   &P->Z ) ); MOD_SUB( B    );
+    MPI_CHK( mpi_mul_mpi( &BB,   &B,      &B    ) ); MOD_MUL( BB   );
+    MPI_CHK( mpi_sub_mpi( &E,    &AA,     &BB   ) ); MOD_SUB( E    );
+    MPI_CHK( mpi_add_mpi( &C,    &Q->X,   &Q->Z ) ); MOD_ADD( C    );
+    MPI_CHK( mpi_sub_mpi( &D,    &Q->X,   &Q->Z ) ); MOD_SUB( D    );
+    MPI_CHK( mpi_mul_mpi( &DA,   &D,      &A    ) ); MOD_MUL( DA   );
+    MPI_CHK( mpi_mul_mpi( &CB,   &C,      &B    ) ); MOD_MUL( CB   );
+    MPI_CHK( mpi_add_mpi( &S->X, &DA,     &CB   ) ); MOD_MUL( S->X );
+    MPI_CHK( mpi_mul_mpi( &S->X, &S->X,   &S->X ) ); MOD_MUL( S->X );
+    MPI_CHK( mpi_sub_mpi( &S->Z, &DA,     &CB   ) ); MOD_SUB( S->Z );
+    MPI_CHK( mpi_mul_mpi( &S->Z, &S->Z,   &S->Z ) ); MOD_MUL( S->Z );
+    MPI_CHK( mpi_mul_mpi( &S->Z, d,       &S->Z ) ); MOD_MUL( S->Z );
+    MPI_CHK( mpi_mul_mpi( &R->X, &AA,     &BB   ) ); MOD_MUL( R->X );
+    MPI_CHK( mpi_mul_mpi( &R->Z, &grp->A, &E    ) ); MOD_MUL( R->Z );
+    MPI_CHK( mpi_add_mpi( &R->Z, &BB,     &R->Z ) ); MOD_ADD( R->Z );
+    MPI_CHK( mpi_mul_mpi( &R->Z, &E,      &R->Z ) ); MOD_MUL( R->Z );
+
+cleanup:
+    mpi_free( &A ); mpi_free( &AA ); mpi_free( &B );
+    mpi_free( &BB ); mpi_free( &E ); mpi_free( &C );
+    mpi_free( &D ); mpi_free( &DA ); mpi_free( &CB );
+
+    return( ret );
+}
+
+/*
+ * Multiplication with Montgomery ladder in x/z coordinates,
+ * for curves in Montgomery form
+ */
+static int ecp_mul_mxz( ecp_group *grp, ecp_point *R,
+                        const mpi *m, const ecp_point *P,
+                        int (*f_rng)(void *, unsigned char *, size_t),
+                        void *p_rng )
+{
+    int ret;
+    size_t i;
+    unsigned char b;
+    ecp_point RP;
+    mpi PX;
+
+    ecp_point_init( &RP ); mpi_init( &PX );
+
+    /* Save PX and read from P before writing to R, in case P == R */
+    MPI_CHK( mpi_copy( &PX, &P->X ) );
+    MPI_CHK( ecp_copy( &RP, P ) );
+
+    /* Set R to zero in modified x/z coordinates */
+    MPI_CHK( mpi_lset( &R->X, 1 ) );
+    MPI_CHK( mpi_lset( &R->Z, 0 ) );
+    mpi_free( &R->Y );
+
+    /* RP.X might be sligtly larger than P, so reduce it */
+    MOD_ADD( RP.X );
+
+    /* Randomize coordinates of the starting point */
+    if( f_rng != NULL )
+        MPI_CHK( ecp_randomize_mxz( grp, &RP, f_rng, p_rng ) );
+
+    /* Loop invariant: R = result so far, RP = R + P */
+    i = mpi_msb( m ); /* one past the (zero-based) most significant bit */
+    while( i-- > 0 )
+    {
+        b = mpi_get_bit( m, i );
+        /*
+         *  if (b) R = 2R + P else R = 2R,
+         * which is:
+         *  if (b) double_add( RP, R, RP, R )
+         *  else   double_add( R, RP, R, RP )
+         * but using safe conditional swaps to avoid leaks
+         */
+        MPI_CHK( mpi_safe_cond_swap( &R->X, &RP.X, b ) );
+        MPI_CHK( mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
+        MPI_CHK( ecp_double_add_mxz( grp, R, &RP, R, &RP, &PX ) );
+        MPI_CHK( mpi_safe_cond_swap( &R->X, &RP.X, b ) );
+        MPI_CHK( mpi_safe_cond_swap( &R->Z, &RP.Z, b ) );
+    }
+
+    MPI_CHK( ecp_normalize_mxz( grp, R ) );
+
+cleanup:
+    ecp_point_free( &RP ); mpi_free( &PX );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_ECP_MONTGOMERY */
+
+/*
+ * Multiplication R = m * P
+ */
+int ecp_mul( ecp_group *grp, ecp_point *R,
+             const mpi *m, const ecp_point *P,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+
+    /* Common sanity checks */
+    if( mpi_cmp_int( &P->Z, 1 ) != 0 )
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = ecp_check_privkey( grp, m ) ) != 0 ||
+        ( ret = ecp_check_pubkey( grp, P ) ) != 0 )
+        return( ret );
+
+#if defined(POLARSSL_ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_MONTGOMERY )
+        return( ecp_mul_mxz( grp, R, m, P, f_rng, p_rng ) );
+#endif
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+        return( ecp_mul_comb( grp, R, m, P, f_rng, p_rng ) );
+#endif
+    return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+}
+
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+/*
+ * Check that an affine point is valid as a public key,
+ * short weierstrass curves (SEC1 3.2.3.1)
+ */
+static int ecp_check_pubkey_sw( const ecp_group *grp, const ecp_point *pt )
+{
+    int ret;
+    mpi YY, RHS;
+
+    /* pt coordinates must be normalized for our checks */
+    if( mpi_cmp_int( &pt->X, 0 ) < 0 ||
+        mpi_cmp_int( &pt->Y, 0 ) < 0 ||
+        mpi_cmp_mpi( &pt->X, &grp->P ) >= 0 ||
+        mpi_cmp_mpi( &pt->Y, &grp->P ) >= 0 )
+        return( POLARSSL_ERR_ECP_INVALID_KEY );
+
+    mpi_init( &YY ); mpi_init( &RHS );
+
+    /*
+     * YY = Y^2
+     * RHS = X (X^2 + A) + B = X^3 + A X + B
+     */
+    MPI_CHK( mpi_mul_mpi( &YY,  &pt->Y,   &pt->Y  ) );  MOD_MUL( YY  );
+    MPI_CHK( mpi_mul_mpi( &RHS, &pt->X,   &pt->X  ) );  MOD_MUL( RHS );
+
+    /* Special case for A = -3 */
+    if( grp->A.p == NULL )
+    {
+        MPI_CHK( mpi_sub_int( &RHS, &RHS, 3       ) );  MOD_SUB( RHS );
+    }
+    else
+    {
+        MPI_CHK( mpi_add_mpi( &RHS, &RHS, &grp->A ) );  MOD_ADD( RHS );
+    }
+
+    MPI_CHK( mpi_mul_mpi( &RHS, &RHS,     &pt->X  ) );  MOD_MUL( RHS );
+    MPI_CHK( mpi_add_mpi( &RHS, &RHS,     &grp->B ) );  MOD_ADD( RHS );
+
+    if( mpi_cmp_mpi( &YY, &RHS ) != 0 )
+        ret = POLARSSL_ERR_ECP_INVALID_KEY;
+
+cleanup:
+
+    mpi_free( &YY ); mpi_free( &RHS );
+
+    return( ret );
+}
+#endif /* POLARSSL_ECP_SHORT_WEIERSTRASS */
+
+
+#if defined(POLARSSL_ECP_MONTGOMERY)
+/*
+ * Check validity of a public key for Montgomery curves with x-only schemes
+ */
+static int ecp_check_pubkey_mx( const ecp_group *grp, const ecp_point *pt )
+{
+    /* [M255 p. 5] Just check X is the correct number of bytes */
+    if( mpi_size( &pt->X ) > ( grp->nbits + 7 ) / 8 )
+        return( POLARSSL_ERR_ECP_INVALID_KEY );
+
+    return( 0 );
+}
+#endif /* POLARSSL_ECP_MONTGOMERY */
+
+/*
+ * Check that a point is valid as a public key
+ */
+int ecp_check_pubkey( const ecp_group *grp, const ecp_point *pt )
+{
+    /* Must use affine coordinates */
+    if( mpi_cmp_int( &pt->Z, 1 ) != 0 )
+        return( POLARSSL_ERR_ECP_INVALID_KEY );
+
+#if defined(POLARSSL_ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_MONTGOMERY )
+        return( ecp_check_pubkey_mx( grp, pt ) );
+#endif
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+        return( ecp_check_pubkey_sw( grp, pt ) );
+#endif
+    return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+}
+
+/*
+ * Check that an mpi is valid as a private key
+ */
+int ecp_check_privkey( const ecp_group *grp, const mpi *d )
+{
+#if defined(POLARSSL_ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_MONTGOMERY )
+    {
+        /* see [M255] page 5 */
+        if( mpi_get_bit( d, 0 ) != 0 ||
+            mpi_get_bit( d, 1 ) != 0 ||
+            mpi_get_bit( d, 2 ) != 0 ||
+            mpi_msb( d ) - 1 != grp->nbits ) /* mpi_msb is one-based! */
+            return( POLARSSL_ERR_ECP_INVALID_KEY );
+        else
+            return( 0 );
+    }
+#endif /* POLARSSL_ECP_MONTGOMERY */
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+    {
+        /* see SEC1 3.2 */
+        if( mpi_cmp_int( d, 1 ) < 0 ||
+            mpi_cmp_mpi( d, &grp->N ) >= 0 )
+            return( POLARSSL_ERR_ECP_INVALID_KEY );
+        else
+            return( 0 );
+    }
+#endif /* POLARSSL_ECP_SHORT_WEIERSTRASS */
+
+    return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+}
+
+/*
+ * Generate a keypair
+ */
+int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
+                     int (*f_rng)(void *, unsigned char *, size_t),
+                     void *p_rng )
+{
+    int ret;
+    size_t n_size = ( grp->nbits + 7 ) / 8;
+
+#if defined(POLARSSL_ECP_MONTGOMERY)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_MONTGOMERY )
+    {
+        /* [M225] page 5 */
+        size_t b;
+
+        MPI_CHK( mpi_fill_random( d, n_size, f_rng, p_rng ) );
+
+        /* Make sure the most significant bit is nbits */
+        b = mpi_msb( d ) - 1; /* mpi_msb is one-based */
+        if( b > grp->nbits )
+            MPI_CHK( mpi_shift_r( d, b - grp->nbits ) );
+        else
+            MPI_CHK( mpi_set_bit( d, grp->nbits, 1 ) );
+
+        /* Make sure the last three bits are unset */
+        MPI_CHK( mpi_set_bit( d, 0, 0 ) );
+        MPI_CHK( mpi_set_bit( d, 1, 0 ) );
+        MPI_CHK( mpi_set_bit( d, 2, 0 ) );
+    }
+    else
+#endif /* POLARSSL_ECP_MONTGOMERY */
+#if defined(POLARSSL_ECP_SHORT_WEIERSTRASS)
+    if( ecp_get_type( grp ) == POLARSSL_ECP_TYPE_SHORT_WEIERSTRASS )
+    {
+        /* SEC1 3.2.1: Generate d such that 1 <= n < N */
+        int count = 0;
+        unsigned char rnd[POLARSSL_ECP_MAX_BYTES];
+
+        /*
+         * Match the procedure given in RFC 6979 (deterministic ECDSA):
+         * - use the same byte ordering;
+         * - keep the leftmost nbits bits of the generated octet string;
+         * - try until result is in the desired range.
+         * This also avoids any biais, which is especially important for ECDSA.
+         */
+        do
+        {
+            MPI_CHK( f_rng( p_rng, rnd, n_size ) );
+            MPI_CHK( mpi_read_binary( d, rnd, n_size ) );
+            MPI_CHK( mpi_shift_r( d, 8 * n_size - grp->nbits ) );
+
+            /*
+             * Each try has at worst a probability 1/2 of failing (the msb has
+             * a probability 1/2 of being 0, and then the result will be < N),
+             * so after 30 tries failure probability is a most 2**(-30).
+             *
+             * For most curves, 1 try is enough with overwhelming probability,
+             * since N starts with a lot of 1s in binary, but some curves
+             * such as secp224k1 are actually very close to the worst case.
+             */
+            if( ++count > 30 )
+                return( POLARSSL_ERR_ECP_RANDOM_FAILED );
+        }
+        while( mpi_cmp_int( d, 1 ) < 0 ||
+               mpi_cmp_mpi( d, &grp->N ) >= 0 );
+    }
+    else
+#endif /* POLARSSL_ECP_SHORT_WEIERSTRASS */
+        return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
+
+cleanup:
+    if( ret != 0 )
+        return( ret );
+
+    return( ecp_mul( grp, Q, d, &grp->G, f_rng, p_rng ) );
+}
+
+/*
+ * Generate a keypair, prettier wrapper
+ */
+int ecp_gen_key( ecp_group_id grp_id, ecp_keypair *key,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+
+    if( ( ret = ecp_use_known_dp( &key->grp, grp_id ) ) != 0 )
+        return( ret );
+
+    return( ecp_gen_keypair( &key->grp, &key->d, &key->Q, f_rng, p_rng ) );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+/*
+ * Checkup routine
+ */
+int ecp_self_test( int verbose )
+{
+    int ret;
+    size_t i;
+    ecp_group grp;
+    ecp_point R, P;
+    mpi m;
+    unsigned long add_c_prev, dbl_c_prev, mul_c_prev;
+    /* exponents especially adapted for secp192r1 */
+    const char *exponents[] =
+    {
+        "000000000000000000000000000000000000000000000001", /* one */
+        "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22830", /* N - 1 */
+        "5EA6F389A38B8BC81E767753B15AA5569E1782E30ABE7D25", /* random */
+        "400000000000000000000000000000000000000000000000", /* one and zeros */
+        "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", /* all ones */
+        "555555555555555555555555555555555555555555555555", /* 101010... */
+    };
+
+    ecp_group_init( &grp );
+    ecp_point_init( &R );
+    ecp_point_init( &P );
+    mpi_init( &m );
+
+    /* Use secp192r1 if available, or any available curve */
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+    MPI_CHK( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_SECP192R1 ) );
+#else
+    MPI_CHK( ecp_use_known_dp( &grp, ecp_curve_list()->grp_id ) );
+#endif
+
+    if( verbose != 0 )
+        polarssl_printf( "  ECP test #1 (constant op_count, base point G): " );
+
+    /* Do a dummy multiplication first to trigger precomputation */
+    MPI_CHK( mpi_lset( &m, 2 ) );
+    MPI_CHK( ecp_mul( &grp, &P, &m, &grp.G, NULL, NULL ) );
+
+    add_count = 0;
+    dbl_count = 0;
+    mul_count = 0;
+    MPI_CHK( mpi_read_string( &m, 16, exponents[0] ) );
+    MPI_CHK( ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+
+    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
+    {
+        add_c_prev = add_count;
+        dbl_c_prev = dbl_count;
+        mul_c_prev = mul_count;
+        add_count = 0;
+        dbl_count = 0;
+        mul_count = 0;
+
+        MPI_CHK( mpi_read_string( &m, 16, exponents[i] ) );
+        MPI_CHK( ecp_mul( &grp, &R, &m, &grp.G, NULL, NULL ) );
+
+        if( add_count != add_c_prev ||
+            dbl_count != dbl_c_prev ||
+            mul_count != mul_c_prev )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed (%u)\n", (unsigned int) i );
+
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "  ECP test #2 (constant op_count, other point): " );
+    /* We computed P = 2G last time, use it */
+
+    add_count = 0;
+    dbl_count = 0;
+    mul_count = 0;
+    MPI_CHK( mpi_read_string( &m, 16, exponents[0] ) );
+    MPI_CHK( ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+
+    for( i = 1; i < sizeof( exponents ) / sizeof( exponents[0] ); i++ )
+    {
+        add_c_prev = add_count;
+        dbl_c_prev = dbl_count;
+        mul_c_prev = mul_count;
+        add_count = 0;
+        dbl_count = 0;
+        mul_count = 0;
+
+        MPI_CHK( mpi_read_string( &m, 16, exponents[i] ) );
+        MPI_CHK( ecp_mul( &grp, &R, &m, &P, NULL, NULL ) );
+
+        if( add_count != add_c_prev ||
+            dbl_count != dbl_c_prev ||
+            mul_count != mul_c_prev )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed (%u)\n", (unsigned int) i );
+
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+cleanup:
+
+    if( ret < 0 && verbose != 0 )
+        polarssl_printf( "Unexpected error, return code = %08X\n", ret );
+
+    ecp_group_free( &grp );
+    ecp_point_free( &R );
+    ecp_point_free( &P );
+    mpi_free( &m );
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_ECP_C */
diff --git a/Externals/polarssl/library/ecp_curves.c b/Externals/polarssl/library/ecp_curves.c
new file mode 100644
index 0000000000..4c0018cc73
--- /dev/null
+++ b/Externals/polarssl/library/ecp_curves.c
@@ -0,0 +1,1380 @@
+/*
+ *  Elliptic curves over GF(p): curve-specific data and functions
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_ECP_C)
+
+#include "polarssl/ecp.h"
+
+#if defined(_MSC_VER) && !defined(inline)
+#define inline _inline
+#else
+#if defined(__ARMCC_VERSION) && !defined(inline)
+#define inline __inline
+#endif /* __ARMCC_VERSION */
+#endif /*_MSC_VER */
+
+/*
+ * Conversion macros for embedded constants:
+ * build lists of t_uint's from lists of unsigned char's grouped by 8, 4 or 2
+ */
+#if defined(POLARSSL_HAVE_INT8)
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    a, b, c, d, e, f, g, h
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    a, b, c, d
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    a, b
+
+#elif defined(POLARSSL_HAVE_INT16)
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    ( (t_uint) a << 0 ) |                           \
+    ( (t_uint) b << 8 )
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    BYTES_TO_T_UINT_2( a, b ),                      \
+    BYTES_TO_T_UINT_2( c, d )
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    BYTES_TO_T_UINT_2( a, b ),                      \
+    BYTES_TO_T_UINT_2( c, d ),                      \
+    BYTES_TO_T_UINT_2( e, f ),                      \
+    BYTES_TO_T_UINT_2( g, h )
+
+#elif defined(POLARSSL_HAVE_INT32)
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    ( (t_uint) a <<  0 ) |                          \
+    ( (t_uint) b <<  8 ) |                          \
+    ( (t_uint) c << 16 ) |                          \
+    ( (t_uint) d << 24 )
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    BYTES_TO_T_UINT_4( a, b, 0, 0 )
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    BYTES_TO_T_UINT_4( a, b, c, d ),                \
+    BYTES_TO_T_UINT_4( e, f, g, h )
+
+#else /* 64-bits */
+
+#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
+    ( (t_uint) a <<  0 ) |                          \
+    ( (t_uint) b <<  8 ) |                          \
+    ( (t_uint) c << 16 ) |                          \
+    ( (t_uint) d << 24 ) |                          \
+    ( (t_uint) e << 32 ) |                          \
+    ( (t_uint) f << 40 ) |                          \
+    ( (t_uint) g << 48 ) |                          \
+    ( (t_uint) h << 56 )
+
+#define BYTES_TO_T_UINT_4( a, b, c, d )             \
+    BYTES_TO_T_UINT_8( a, b, c, d, 0, 0, 0, 0 )
+
+#define BYTES_TO_T_UINT_2( a, b )                   \
+    BYTES_TO_T_UINT_8( a, b, 0, 0, 0, 0, 0, 0 )
+
+#endif /* bits in t_uint */
+
+/*
+ * Note: the constants are in little-endian order
+ * to be directly usable in MPIs
+ */
+
+/*
+ * Domain parameters for secp192r1
+ */
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+static const t_uint secp192r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp192r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB1, 0xB9, 0x46, 0xC1, 0xEC, 0xDE, 0xB8, 0xFE ),
+    BYTES_TO_T_UINT_8( 0x49, 0x30, 0x24, 0x72, 0xAB, 0xE9, 0xA7, 0x0F ),
+    BYTES_TO_T_UINT_8( 0xE7, 0x80, 0x9C, 0xE5, 0x19, 0x05, 0x21, 0x64 ),
+};
+static const t_uint secp192r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x12, 0x10, 0xFF, 0x82, 0xFD, 0x0A, 0xFF, 0xF4 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x88, 0xA1, 0x43, 0xEB, 0x20, 0xBF, 0x7C ),
+    BYTES_TO_T_UINT_8( 0xF6, 0x90, 0x30, 0xB0, 0x0E, 0xA8, 0x8D, 0x18 ),
+};
+static const t_uint secp192r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x11, 0x48, 0x79, 0x1E, 0xA1, 0x77, 0xF9, 0x73 ),
+    BYTES_TO_T_UINT_8( 0xD5, 0xCD, 0x24, 0x6B, 0xED, 0x11, 0x10, 0x63 ),
+    BYTES_TO_T_UINT_8( 0x78, 0xDA, 0xC8, 0xFF, 0x95, 0x2B, 0x19, 0x07 ),
+};
+static const t_uint secp192r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x31, 0x28, 0xD2, 0xB4, 0xB1, 0xC9, 0x6B, 0x14 ),
+    BYTES_TO_T_UINT_8( 0x36, 0xF8, 0xDE, 0x99, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */
+
+/*
+ * Domain parameters for secp224r1
+ */
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+static const t_uint secp224r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+};
+static const t_uint secp224r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB4, 0xFF, 0x55, 0x23, 0x43, 0x39, 0x0B, 0x27 ),
+    BYTES_TO_T_UINT_8( 0xBA, 0xD8, 0xBF, 0xD7, 0xB7, 0xB0, 0x44, 0x50 ),
+    BYTES_TO_T_UINT_8( 0x56, 0x32, 0x41, 0xF5, 0xAB, 0xB3, 0x04, 0x0C ),
+    BYTES_TO_T_UINT_4( 0x85, 0x0A, 0x05, 0xB4 ),
+};
+static const t_uint secp224r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x21, 0x1D, 0x5C, 0x11, 0xD6, 0x80, 0x32, 0x34 ),
+    BYTES_TO_T_UINT_8( 0x22, 0x11, 0xC2, 0x56, 0xD3, 0xC1, 0x03, 0x4A ),
+    BYTES_TO_T_UINT_8( 0xB9, 0x90, 0x13, 0x32, 0x7F, 0xBF, 0xB4, 0x6B ),
+    BYTES_TO_T_UINT_4( 0xBD, 0x0C, 0x0E, 0xB7 ),
+};
+static const t_uint secp224r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x34, 0x7E, 0x00, 0x85, 0x99, 0x81, 0xD5, 0x44 ),
+    BYTES_TO_T_UINT_8( 0x64, 0x47, 0x07, 0x5A, 0xA0, 0x75, 0x43, 0xCD ),
+    BYTES_TO_T_UINT_8( 0xE6, 0xDF, 0x22, 0x4C, 0xFB, 0x23, 0xF7, 0xB5 ),
+    BYTES_TO_T_UINT_4( 0x88, 0x63, 0x37, 0xBD ),
+};
+static const t_uint secp224r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x3D, 0x2A, 0x5C, 0x5C, 0x45, 0x29, 0xDD, 0x13 ),
+    BYTES_TO_T_UINT_8( 0x3E, 0xF0, 0xB8, 0xE0, 0xA2, 0x16, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED */
+
+/*
+ * Domain parameters for secp256r1
+ */
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+static const t_uint secp256r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp256r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x4B, 0x60, 0xD2, 0x27, 0x3E, 0x3C, 0xCE, 0x3B ),
+    BYTES_TO_T_UINT_8( 0xF6, 0xB0, 0x53, 0xCC, 0xB0, 0x06, 0x1D, 0x65 ),
+    BYTES_TO_T_UINT_8( 0xBC, 0x86, 0x98, 0x76, 0x55, 0xBD, 0xEB, 0xB3 ),
+    BYTES_TO_T_UINT_8( 0xE7, 0x93, 0x3A, 0xAA, 0xD8, 0x35, 0xC6, 0x5A ),
+};
+static const t_uint secp256r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x96, 0xC2, 0x98, 0xD8, 0x45, 0x39, 0xA1, 0xF4 ),
+    BYTES_TO_T_UINT_8( 0xA0, 0x33, 0xEB, 0x2D, 0x81, 0x7D, 0x03, 0x77 ),
+    BYTES_TO_T_UINT_8( 0xF2, 0x40, 0xA4, 0x63, 0xE5, 0xE6, 0xBC, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x47, 0x42, 0x2C, 0xE1, 0xF2, 0xD1, 0x17, 0x6B ),
+};
+static const t_uint secp256r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xF5, 0x51, 0xBF, 0x37, 0x68, 0x40, 0xB6, 0xCB ),
+    BYTES_TO_T_UINT_8( 0xCE, 0x5E, 0x31, 0x6B, 0x57, 0x33, 0xCE, 0x2B ),
+    BYTES_TO_T_UINT_8( 0x16, 0x9E, 0x0F, 0x7C, 0x4A, 0xEB, 0xE7, 0x8E ),
+    BYTES_TO_T_UINT_8( 0x9B, 0x7F, 0x1A, 0xFE, 0xE2, 0x42, 0xE3, 0x4F ),
+};
+static const t_uint secp256r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x51, 0x25, 0x63, 0xFC, 0xC2, 0xCA, 0xB9, 0xF3 ),
+    BYTES_TO_T_UINT_8( 0x84, 0x9E, 0x17, 0xA7, 0xAD, 0xFA, 0xE6, 0xBC ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP256R1_ENABLED */
+
+/*
+ * Domain parameters for secp384r1
+ */
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+static const t_uint secp384r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp384r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xEF, 0x2A, 0xEC, 0xD3, 0xED, 0xC8, 0x85, 0x2A ),
+    BYTES_TO_T_UINT_8( 0x9D, 0xD1, 0x2E, 0x8A, 0x8D, 0x39, 0x56, 0xC6 ),
+    BYTES_TO_T_UINT_8( 0x5A, 0x87, 0x13, 0x50, 0x8F, 0x08, 0x14, 0x03 ),
+    BYTES_TO_T_UINT_8( 0x12, 0x41, 0x81, 0xFE, 0x6E, 0x9C, 0x1D, 0x18 ),
+    BYTES_TO_T_UINT_8( 0x19, 0x2D, 0xF8, 0xE3, 0x6B, 0x05, 0x8E, 0x98 ),
+    BYTES_TO_T_UINT_8( 0xE4, 0xE7, 0x3E, 0xE2, 0xA7, 0x2F, 0x31, 0xB3 ),
+};
+static const t_uint secp384r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0xB7, 0x0A, 0x76, 0x72, 0x38, 0x5E, 0x54, 0x3A ),
+    BYTES_TO_T_UINT_8( 0x6C, 0x29, 0x55, 0xBF, 0x5D, 0xF2, 0x02, 0x55 ),
+    BYTES_TO_T_UINT_8( 0x38, 0x2A, 0x54, 0x82, 0xE0, 0x41, 0xF7, 0x59 ),
+    BYTES_TO_T_UINT_8( 0x98, 0x9B, 0xA7, 0x8B, 0x62, 0x3B, 0x1D, 0x6E ),
+    BYTES_TO_T_UINT_8( 0x74, 0xAD, 0x20, 0xF3, 0x1E, 0xC7, 0xB1, 0x8E ),
+    BYTES_TO_T_UINT_8( 0x37, 0x05, 0x8B, 0xBE, 0x22, 0xCA, 0x87, 0xAA ),
+};
+static const t_uint secp384r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x5F, 0x0E, 0xEA, 0x90, 0x7C, 0x1D, 0x43, 0x7A ),
+    BYTES_TO_T_UINT_8( 0x9D, 0x81, 0x7E, 0x1D, 0xCE, 0xB1, 0x60, 0x0A ),
+    BYTES_TO_T_UINT_8( 0xC0, 0xB8, 0xF0, 0xB5, 0x13, 0x31, 0xDA, 0xE9 ),
+    BYTES_TO_T_UINT_8( 0x7C, 0x14, 0x9A, 0x28, 0xBD, 0x1D, 0xF4, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x29, 0xDC, 0x92, 0x92, 0xBF, 0x98, 0x9E, 0x5D ),
+    BYTES_TO_T_UINT_8( 0x6F, 0x2C, 0x26, 0x96, 0x4A, 0xDE, 0x17, 0x36 ),
+};
+static const t_uint secp384r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x73, 0x29, 0xC5, 0xCC, 0x6A, 0x19, 0xEC, 0xEC ),
+    BYTES_TO_T_UINT_8( 0x7A, 0xA7, 0xB0, 0x48, 0xB2, 0x0D, 0x1A, 0x58 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x2D, 0x37, 0xF4, 0x81, 0x4D, 0x63, 0xC7 ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP384R1_ENABLED */
+
+/*
+ * Domain parameters for secp521r1
+ */
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+static const t_uint secp521r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+};
+static const t_uint secp521r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x00, 0x3F, 0x50, 0x6B, 0xD4, 0x1F, 0x45, 0xEF ),
+    BYTES_TO_T_UINT_8( 0xF1, 0x34, 0x2C, 0x3D, 0x88, 0xDF, 0x73, 0x35 ),
+    BYTES_TO_T_UINT_8( 0x07, 0xBF, 0xB1, 0x3B, 0xBD, 0xC0, 0x52, 0x16 ),
+    BYTES_TO_T_UINT_8( 0x7B, 0x93, 0x7E, 0xEC, 0x51, 0x39, 0x19, 0x56 ),
+    BYTES_TO_T_UINT_8( 0xE1, 0x09, 0xF1, 0x8E, 0x91, 0x89, 0xB4, 0xB8 ),
+    BYTES_TO_T_UINT_8( 0xF3, 0x15, 0xB3, 0x99, 0x5B, 0x72, 0xDA, 0xA2 ),
+    BYTES_TO_T_UINT_8( 0xEE, 0x40, 0x85, 0xB6, 0xA0, 0x21, 0x9A, 0x92 ),
+    BYTES_TO_T_UINT_8( 0x1F, 0x9A, 0x1C, 0x8E, 0x61, 0xB9, 0x3E, 0x95 ),
+    BYTES_TO_T_UINT_2( 0x51, 0x00 ),
+};
+static const t_uint secp521r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x66, 0xBD, 0xE5, 0xC2, 0x31, 0x7E, 0x7E, 0xF9 ),
+    BYTES_TO_T_UINT_8( 0x9B, 0x42, 0x6A, 0x85, 0xC1, 0xB3, 0x48, 0x33 ),
+    BYTES_TO_T_UINT_8( 0xDE, 0xA8, 0xFF, 0xA2, 0x27, 0xC1, 0x1D, 0xFE ),
+    BYTES_TO_T_UINT_8( 0x28, 0x59, 0xE7, 0xEF, 0x77, 0x5E, 0x4B, 0xA1 ),
+    BYTES_TO_T_UINT_8( 0xBA, 0x3D, 0x4D, 0x6B, 0x60, 0xAF, 0x28, 0xF8 ),
+    BYTES_TO_T_UINT_8( 0x21, 0xB5, 0x3F, 0x05, 0x39, 0x81, 0x64, 0x9C ),
+    BYTES_TO_T_UINT_8( 0x42, 0xB4, 0x95, 0x23, 0x66, 0xCB, 0x3E, 0x9E ),
+    BYTES_TO_T_UINT_8( 0xCD, 0xE9, 0x04, 0x04, 0xB7, 0x06, 0x8E, 0x85 ),
+    BYTES_TO_T_UINT_2( 0xC6, 0x00 ),
+};
+static const t_uint secp521r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x50, 0x66, 0xD1, 0x9F, 0x76, 0x94, 0xBE, 0x88 ),
+    BYTES_TO_T_UINT_8( 0x40, 0xC2, 0x72, 0xA2, 0x86, 0x70, 0x3C, 0x35 ),
+    BYTES_TO_T_UINT_8( 0x61, 0x07, 0xAD, 0x3F, 0x01, 0xB9, 0x50, 0xC5 ),
+    BYTES_TO_T_UINT_8( 0x40, 0x26, 0xF4, 0x5E, 0x99, 0x72, 0xEE, 0x97 ),
+    BYTES_TO_T_UINT_8( 0x2C, 0x66, 0x3E, 0x27, 0x17, 0xBD, 0xAF, 0x17 ),
+    BYTES_TO_T_UINT_8( 0x68, 0x44, 0x9B, 0x57, 0x49, 0x44, 0xF5, 0x98 ),
+    BYTES_TO_T_UINT_8( 0xD9, 0x1B, 0x7D, 0x2C, 0xB4, 0x5F, 0x8A, 0x5C ),
+    BYTES_TO_T_UINT_8( 0x04, 0xC0, 0x3B, 0x9A, 0x78, 0x6A, 0x29, 0x39 ),
+    BYTES_TO_T_UINT_2( 0x18, 0x01 ),
+};
+static const t_uint secp521r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x09, 0x64, 0x38, 0x91, 0x1E, 0xB7, 0x6F, 0xBB ),
+    BYTES_TO_T_UINT_8( 0xAE, 0x47, 0x9C, 0x89, 0xB8, 0xC9, 0xB5, 0x3B ),
+    BYTES_TO_T_UINT_8( 0xD0, 0xA5, 0x09, 0xF7, 0x48, 0x01, 0xCC, 0x7F ),
+    BYTES_TO_T_UINT_8( 0x6B, 0x96, 0x2F, 0xBF, 0x83, 0x87, 0x86, 0x51 ),
+    BYTES_TO_T_UINT_8( 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_2( 0xFF, 0x01 ),
+};
+#endif /* POLARSSL_ECP_DP_SECP521R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+static const t_uint secp192k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x37, 0xEE, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp192k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const t_uint secp192k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x03, 0x00 ),
+};
+static const t_uint secp192k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x7D, 0x6C, 0xE0, 0xEA, 0xB1, 0xD1, 0xA5, 0x1D ),
+    BYTES_TO_T_UINT_8( 0x34, 0xF4, 0xB7, 0x80, 0x02, 0x7D, 0xB0, 0x26 ),
+    BYTES_TO_T_UINT_8( 0xAE, 0xE9, 0x57, 0xC0, 0x0E, 0xF1, 0x4F, 0xDB ),
+};
+static const t_uint secp192k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x9D, 0x2F, 0x5E, 0xD9, 0x88, 0xAA, 0x82, 0x40 ),
+    BYTES_TO_T_UINT_8( 0x34, 0x86, 0xBE, 0x15, 0xD0, 0x63, 0x41, 0x84 ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x28, 0x56, 0x9C, 0x6D, 0x2F, 0x2F, 0x9B ),
+};
+static const t_uint secp192k1_n[] = {
+    BYTES_TO_T_UINT_8( 0x8D, 0xFD, 0xDE, 0x74, 0x6A, 0x46, 0x69, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x17, 0xFC, 0xF2, 0x26, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+static const t_uint secp224k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x6D, 0xE5, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_4( 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp224k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const t_uint secp224k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x05, 0x00 ),
+};
+static const t_uint secp224k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x5C, 0xA4, 0xB7, 0xB6, 0x0E, 0x65, 0x7E, 0x0F ),
+    BYTES_TO_T_UINT_8( 0xA9, 0x75, 0x70, 0xE4, 0xE9, 0x67, 0xA4, 0x69 ),
+    BYTES_TO_T_UINT_8( 0xA1, 0x28, 0xFC, 0x30, 0xDF, 0x99, 0xF0, 0x4D ),
+    BYTES_TO_T_UINT_4( 0x33, 0x5B, 0x45, 0xA1 ),
+};
+static const t_uint secp224k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xA5, 0x61, 0x6D, 0x55, 0xDB, 0x4B, 0xCA, 0xE2 ),
+    BYTES_TO_T_UINT_8( 0x59, 0xBD, 0xB0, 0xC0, 0xF7, 0x19, 0xE3, 0xF7 ),
+    BYTES_TO_T_UINT_8( 0xD6, 0xFB, 0xCA, 0x82, 0x42, 0x34, 0xBA, 0x7F ),
+    BYTES_TO_T_UINT_4( 0xED, 0x9F, 0x08, 0x7E ),
+};
+static const t_uint secp224k1_n[] = {
+    BYTES_TO_T_UINT_8( 0xF7, 0xB1, 0x9F, 0x76, 0x71, 0xA9, 0xF0, 0xCA ),
+    BYTES_TO_T_UINT_8( 0x84, 0x61, 0xEC, 0xD2, 0xE8, 0xDC, 0x01, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ),
+    BYTES_TO_T_UINT_8( 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ),
+};
+#endif /* POLARSSL_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+static const t_uint secp256k1_p[] = {
+    BYTES_TO_T_UINT_8( 0x2F, 0xFC, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+static const t_uint secp256k1_a[] = {
+    BYTES_TO_T_UINT_2( 0x00, 0x00 ),
+};
+static const t_uint secp256k1_b[] = {
+    BYTES_TO_T_UINT_2( 0x07, 0x00 ),
+};
+static const t_uint secp256k1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x98, 0x17, 0xF8, 0x16, 0x5B, 0x81, 0xF2, 0x59 ),
+    BYTES_TO_T_UINT_8( 0xD9, 0x28, 0xCE, 0x2D, 0xDB, 0xFC, 0x9B, 0x02 ),
+    BYTES_TO_T_UINT_8( 0x07, 0x0B, 0x87, 0xCE, 0x95, 0x62, 0xA0, 0x55 ),
+    BYTES_TO_T_UINT_8( 0xAC, 0xBB, 0xDC, 0xF9, 0x7E, 0x66, 0xBE, 0x79 ),
+};
+static const t_uint secp256k1_gy[] = {
+    BYTES_TO_T_UINT_8( 0xB8, 0xD4, 0x10, 0xFB, 0x8F, 0xD0, 0x47, 0x9C ),
+    BYTES_TO_T_UINT_8( 0x19, 0x54, 0x85, 0xA6, 0x48, 0xB4, 0x17, 0xFD ),
+    BYTES_TO_T_UINT_8( 0xA8, 0x08, 0x11, 0x0E, 0xFC, 0xFB, 0xA4, 0x5D ),
+    BYTES_TO_T_UINT_8( 0x65, 0xC4, 0xA3, 0x26, 0x77, 0xDA, 0x3A, 0x48 ),
+};
+static const t_uint secp256k1_n[] = {
+    BYTES_TO_T_UINT_8( 0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF ),
+    BYTES_TO_T_UINT_8( 0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA ),
+    BYTES_TO_T_UINT_8( 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+    BYTES_TO_T_UINT_8( 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ),
+};
+#endif /* POLARSSL_ECP_DP_SECP256K1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP256r1 (RFC 5639 3.4)
+ */
+#if defined(POLARSSL_ECP_DP_BP256R1_ENABLED)
+static const t_uint brainpoolP256r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x77, 0x53, 0x6E, 0x1F, 0x1D, 0x48, 0x13, 0x20 ),
+    BYTES_TO_T_UINT_8( 0x28, 0x20, 0x26, 0xD5, 0x23, 0xF6, 0x3B, 0x6E ),
+    BYTES_TO_T_UINT_8( 0x72, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
+    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+};
+static const t_uint brainpoolP256r1_a[] = {
+    BYTES_TO_T_UINT_8( 0xD9, 0xB5, 0x30, 0xF3, 0x44, 0x4B, 0x4A, 0xE9 ),
+    BYTES_TO_T_UINT_8( 0x6C, 0x5C, 0xDC, 0x26, 0xC1, 0x55, 0x80, 0xFB ),
+    BYTES_TO_T_UINT_8( 0xE7, 0xFF, 0x7A, 0x41, 0x30, 0x75, 0xF6, 0xEE ),
+    BYTES_TO_T_UINT_8( 0x57, 0x30, 0x2C, 0xFC, 0x75, 0x09, 0x5A, 0x7D ),
+};
+static const t_uint brainpoolP256r1_b[] = {
+    BYTES_TO_T_UINT_8( 0xB6, 0x07, 0x8C, 0xFF, 0x18, 0xDC, 0xCC, 0x6B ),
+    BYTES_TO_T_UINT_8( 0xCE, 0xE1, 0xF7, 0x5C, 0x29, 0x16, 0x84, 0x95 ),
+    BYTES_TO_T_UINT_8( 0xBF, 0x7C, 0xD7, 0xBB, 0xD9, 0xB5, 0x30, 0xF3 ),
+    BYTES_TO_T_UINT_8( 0x44, 0x4B, 0x4A, 0xE9, 0x6C, 0x5C, 0xDC, 0x26 ),
+};
+static const t_uint brainpoolP256r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x62, 0x32, 0xCE, 0x9A, 0xBD, 0x53, 0x44, 0x3A ),
+    BYTES_TO_T_UINT_8( 0xC2, 0x23, 0xBD, 0xE3, 0xE1, 0x27, 0xDE, 0xB9 ),
+    BYTES_TO_T_UINT_8( 0xAF, 0xB7, 0x81, 0xFC, 0x2F, 0x48, 0x4B, 0x2C ),
+    BYTES_TO_T_UINT_8( 0xCB, 0x57, 0x7E, 0xCB, 0xB9, 0xAE, 0xD2, 0x8B ),
+};
+static const t_uint brainpoolP256r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x97, 0x69, 0x04, 0x2F, 0xC7, 0x54, 0x1D, 0x5C ),
+    BYTES_TO_T_UINT_8( 0x54, 0x8E, 0xED, 0x2D, 0x13, 0x45, 0x77, 0xC2 ),
+    BYTES_TO_T_UINT_8( 0xC9, 0x1D, 0x61, 0x14, 0x1A, 0x46, 0xF8, 0x97 ),
+    BYTES_TO_T_UINT_8( 0xFD, 0xC4, 0xDA, 0xC3, 0x35, 0xF8, 0x7E, 0x54 ),
+};
+static const t_uint brainpoolP256r1_n[] = {
+    BYTES_TO_T_UINT_8( 0xA7, 0x56, 0x48, 0x97, 0x82, 0x0E, 0x1E, 0x90 ),
+    BYTES_TO_T_UINT_8( 0xF7, 0xA6, 0x61, 0xB5, 0xA3, 0x7A, 0x39, 0x8C ),
+    BYTES_TO_T_UINT_8( 0x71, 0x8D, 0x83, 0x9D, 0x90, 0x0A, 0x66, 0x3E ),
+    BYTES_TO_T_UINT_8( 0xBC, 0xA9, 0xEE, 0xA1, 0xDB, 0x57, 0xFB, 0xA9 ),
+};
+#endif /* POLARSSL_ECP_DP_BP256R1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP384r1 (RFC 5639 3.6)
+ */
+#if defined(POLARSSL_ECP_DP_BP384R1_ENABLED)
+static const t_uint brainpoolP384r1_p[] = {
+    BYTES_TO_T_UINT_8( 0x53, 0xEC, 0x07, 0x31, 0x13, 0x00, 0x47, 0x87 ),
+    BYTES_TO_T_UINT_8( 0x71, 0x1A, 0x1D, 0x90, 0x29, 0xA7, 0xD3, 0xAC ),
+    BYTES_TO_T_UINT_8( 0x23, 0x11, 0xB7, 0x7F, 0x19, 0xDA, 0xB1, 0x12 ),
+    BYTES_TO_T_UINT_8( 0xB4, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+};
+static const t_uint brainpoolP384r1_a[] = {
+    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
+    BYTES_TO_T_UINT_8( 0xEB, 0xD4, 0x3A, 0x50, 0x4A, 0x81, 0xA5, 0x8A ),
+    BYTES_TO_T_UINT_8( 0x0F, 0xF9, 0x91, 0xBA, 0xEF, 0x65, 0x91, 0x13 ),
+    BYTES_TO_T_UINT_8( 0x87, 0x27, 0xB2, 0x4F, 0x8E, 0xA2, 0xBE, 0xC2 ),
+    BYTES_TO_T_UINT_8( 0xA0, 0xAF, 0x05, 0xCE, 0x0A, 0x08, 0x72, 0x3C ),
+    BYTES_TO_T_UINT_8( 0x0C, 0x15, 0x8C, 0x3D, 0xC6, 0x82, 0xC3, 0x7B ),
+};
+static const t_uint brainpoolP384r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x11, 0x4C, 0x50, 0xFA, 0x96, 0x86, 0xB7, 0x3A ),
+    BYTES_TO_T_UINT_8( 0x94, 0xC9, 0xDB, 0x95, 0x02, 0x39, 0xB4, 0x7C ),
+    BYTES_TO_T_UINT_8( 0xD5, 0x62, 0xEB, 0x3E, 0xA5, 0x0E, 0x88, 0x2E ),
+    BYTES_TO_T_UINT_8( 0xA6, 0xD2, 0xDC, 0x07, 0xE1, 0x7D, 0xB7, 0x2F ),
+    BYTES_TO_T_UINT_8( 0x7C, 0x44, 0xF0, 0x16, 0x54, 0xB5, 0x39, 0x8B ),
+    BYTES_TO_T_UINT_8( 0x26, 0x28, 0xCE, 0x22, 0xDD, 0xC7, 0xA8, 0x04 ),
+};
+static const t_uint brainpoolP384r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x1E, 0xAF, 0xD4, 0x47, 0xE2, 0xB2, 0x87, 0xEF ),
+    BYTES_TO_T_UINT_8( 0xAA, 0x46, 0xD6, 0x36, 0x34, 0xE0, 0x26, 0xE8 ),
+    BYTES_TO_T_UINT_8( 0xE8, 0x10, 0xBD, 0x0C, 0xFE, 0xCA, 0x7F, 0xDB ),
+    BYTES_TO_T_UINT_8( 0xE3, 0x4F, 0xF1, 0x7E, 0xE7, 0xA3, 0x47, 0x88 ),
+    BYTES_TO_T_UINT_8( 0x6B, 0x3F, 0xC1, 0xB7, 0x81, 0x3A, 0xA6, 0xA2 ),
+    BYTES_TO_T_UINT_8( 0xFF, 0x45, 0xCF, 0x68, 0xF0, 0x64, 0x1C, 0x1D ),
+};
+static const t_uint brainpoolP384r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x15, 0x53, 0x3C, 0x26, 0x41, 0x03, 0x82, 0x42 ),
+    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x91, 0x77, 0x21, 0x46, 0x46, 0x0E ),
+    BYTES_TO_T_UINT_8( 0x28, 0x29, 0x91, 0xF9, 0x4F, 0x05, 0x9C, 0xE1 ),
+    BYTES_TO_T_UINT_8( 0x64, 0x58, 0xEC, 0xFE, 0x29, 0x0B, 0xB7, 0x62 ),
+    BYTES_TO_T_UINT_8( 0x52, 0xD5, 0xCF, 0x95, 0x8E, 0xEB, 0xB1, 0x5C ),
+    BYTES_TO_T_UINT_8( 0xA4, 0xC2, 0xF9, 0x20, 0x75, 0x1D, 0xBE, 0x8A ),
+};
+static const t_uint brainpoolP384r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x65, 0x65, 0x04, 0xE9, 0x02, 0x32, 0x88, 0x3B ),
+    BYTES_TO_T_UINT_8( 0x10, 0xC3, 0x7F, 0x6B, 0xAF, 0xB6, 0x3A, 0xCF ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x25, 0x04, 0xAC, 0x6C, 0x6E, 0x16, 0x1F ),
+    BYTES_TO_T_UINT_8( 0xB3, 0x56, 0x54, 0xED, 0x09, 0x71, 0x2F, 0x15 ),
+    BYTES_TO_T_UINT_8( 0xDF, 0x41, 0xE6, 0x50, 0x7E, 0x6F, 0x5D, 0x0F ),
+    BYTES_TO_T_UINT_8( 0x28, 0x6D, 0x38, 0xA3, 0x82, 0x1E, 0xB9, 0x8C ),
+};
+#endif /* POLARSSL_ECP_DP_BP384R1_ENABLED */
+
+/*
+ * Domain parameters for brainpoolP512r1 (RFC 5639 3.7)
+ */
+#if defined(POLARSSL_ECP_DP_BP512R1_ENABLED)
+static const t_uint brainpoolP512r1_p[] = {
+    BYTES_TO_T_UINT_8( 0xF3, 0x48, 0x3A, 0x58, 0x56, 0x60, 0xAA, 0x28 ),
+    BYTES_TO_T_UINT_8( 0x85, 0xC6, 0x82, 0x2D, 0x2F, 0xFF, 0x81, 0x28 ),
+    BYTES_TO_T_UINT_8( 0xE6, 0x80, 0xA3, 0xE6, 0x2A, 0xA1, 0xCD, 0xAE ),
+    BYTES_TO_T_UINT_8( 0x42, 0x68, 0xC6, 0x9B, 0x00, 0x9B, 0x4D, 0x7D ),
+    BYTES_TO_T_UINT_8( 0x71, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
+    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
+    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
+    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+};
+static const t_uint brainpoolP512r1_a[] = {
+    BYTES_TO_T_UINT_8( 0xCA, 0x94, 0xFC, 0x77, 0x4D, 0xAC, 0xC1, 0xE7 ),
+    BYTES_TO_T_UINT_8( 0xB9, 0xC7, 0xF2, 0x2B, 0xA7, 0x17, 0x11, 0x7F ),
+    BYTES_TO_T_UINT_8( 0xB5, 0xC8, 0x9A, 0x8B, 0xC9, 0xF1, 0x2E, 0x0A ),
+    BYTES_TO_T_UINT_8( 0xA1, 0x3A, 0x25, 0xA8, 0x5A, 0x5D, 0xED, 0x2D ),
+    BYTES_TO_T_UINT_8( 0xBC, 0x63, 0x98, 0xEA, 0xCA, 0x41, 0x34, 0xA8 ),
+    BYTES_TO_T_UINT_8( 0x10, 0x16, 0xF9, 0x3D, 0x8D, 0xDD, 0xCB, 0x94 ),
+    BYTES_TO_T_UINT_8( 0xC5, 0x4C, 0x23, 0xAC, 0x45, 0x71, 0x32, 0xE2 ),
+    BYTES_TO_T_UINT_8( 0x89, 0x3B, 0x60, 0x8B, 0x31, 0xA3, 0x30, 0x78 ),
+};
+static const t_uint brainpoolP512r1_b[] = {
+    BYTES_TO_T_UINT_8( 0x23, 0xF7, 0x16, 0x80, 0x63, 0xBD, 0x09, 0x28 ),
+    BYTES_TO_T_UINT_8( 0xDD, 0xE5, 0xBA, 0x5E, 0xB7, 0x50, 0x40, 0x98 ),
+    BYTES_TO_T_UINT_8( 0x67, 0x3E, 0x08, 0xDC, 0xCA, 0x94, 0xFC, 0x77 ),
+    BYTES_TO_T_UINT_8( 0x4D, 0xAC, 0xC1, 0xE7, 0xB9, 0xC7, 0xF2, 0x2B ),
+    BYTES_TO_T_UINT_8( 0xA7, 0x17, 0x11, 0x7F, 0xB5, 0xC8, 0x9A, 0x8B ),
+    BYTES_TO_T_UINT_8( 0xC9, 0xF1, 0x2E, 0x0A, 0xA1, 0x3A, 0x25, 0xA8 ),
+    BYTES_TO_T_UINT_8( 0x5A, 0x5D, 0xED, 0x2D, 0xBC, 0x63, 0x98, 0xEA ),
+    BYTES_TO_T_UINT_8( 0xCA, 0x41, 0x34, 0xA8, 0x10, 0x16, 0xF9, 0x3D ),
+};
+static const t_uint brainpoolP512r1_gx[] = {
+    BYTES_TO_T_UINT_8( 0x22, 0xF8, 0xB9, 0xBC, 0x09, 0x22, 0x35, 0x8B ),
+    BYTES_TO_T_UINT_8( 0x68, 0x5E, 0x6A, 0x40, 0x47, 0x50, 0x6D, 0x7C ),
+    BYTES_TO_T_UINT_8( 0x5F, 0x7D, 0xB9, 0x93, 0x7B, 0x68, 0xD1, 0x50 ),
+    BYTES_TO_T_UINT_8( 0x8D, 0xD4, 0xD0, 0xE2, 0x78, 0x1F, 0x3B, 0xFF ),
+    BYTES_TO_T_UINT_8( 0x8E, 0x09, 0xD0, 0xF4, 0xEE, 0x62, 0x3B, 0xB4 ),
+    BYTES_TO_T_UINT_8( 0xC1, 0x16, 0xD9, 0xB5, 0x70, 0x9F, 0xED, 0x85 ),
+    BYTES_TO_T_UINT_8( 0x93, 0x6A, 0x4C, 0x9C, 0x2E, 0x32, 0x21, 0x5A ),
+    BYTES_TO_T_UINT_8( 0x64, 0xD9, 0x2E, 0xD8, 0xBD, 0xE4, 0xAE, 0x81 ),
+};
+static const t_uint brainpoolP512r1_gy[] = {
+    BYTES_TO_T_UINT_8( 0x92, 0x08, 0xD8, 0x3A, 0x0F, 0x1E, 0xCD, 0x78 ),
+    BYTES_TO_T_UINT_8( 0x06, 0x54, 0xF0, 0xA8, 0x2F, 0x2B, 0xCA, 0xD1 ),
+    BYTES_TO_T_UINT_8( 0xAE, 0x63, 0x27, 0x8A, 0xD8, 0x4B, 0xCA, 0x5B ),
+    BYTES_TO_T_UINT_8( 0x5E, 0x48, 0x5F, 0x4A, 0x49, 0xDE, 0xDC, 0xB2 ),
+    BYTES_TO_T_UINT_8( 0x11, 0x81, 0x1F, 0x88, 0x5B, 0xC5, 0x00, 0xA0 ),
+    BYTES_TO_T_UINT_8( 0x1A, 0x7B, 0xA5, 0x24, 0x00, 0xF7, 0x09, 0xF2 ),
+    BYTES_TO_T_UINT_8( 0xFD, 0x22, 0x78, 0xCF, 0xA9, 0xBF, 0xEA, 0xC0 ),
+    BYTES_TO_T_UINT_8( 0xEC, 0x32, 0x63, 0x56, 0x5D, 0x38, 0xDE, 0x7D ),
+};
+static const t_uint brainpoolP512r1_n[] = {
+    BYTES_TO_T_UINT_8( 0x69, 0x00, 0xA9, 0x9C, 0x82, 0x96, 0x87, 0xB5 ),
+    BYTES_TO_T_UINT_8( 0xDD, 0xDA, 0x5D, 0x08, 0x81, 0xD3, 0xB1, 0x1D ),
+    BYTES_TO_T_UINT_8( 0x47, 0x10, 0xAC, 0x7F, 0x19, 0x61, 0x86, 0x41 ),
+    BYTES_TO_T_UINT_8( 0x19, 0x26, 0xA9, 0x4C, 0x41, 0x5C, 0x3E, 0x55 ),
+    BYTES_TO_T_UINT_8( 0x70, 0x08, 0x33, 0x70, 0xCA, 0x9C, 0x63, 0xD6 ),
+    BYTES_TO_T_UINT_8( 0x0E, 0xD2, 0xC9, 0xB3, 0xB3, 0x8D, 0x30, 0xCB ),
+    BYTES_TO_T_UINT_8( 0x07, 0xFC, 0xC9, 0x33, 0xAE, 0xE6, 0xD4, 0x3F ),
+    BYTES_TO_T_UINT_8( 0x8B, 0xC4, 0xE9, 0xDB, 0xB8, 0x9D, 0xDD, 0xAA ),
+};
+#endif /* POLARSSL_ECP_DP_BP512R1_ENABLED */
+
+/*
+ * Create an MPI from embedded constants
+ * (assumes len is an exact multiple of sizeof t_uint)
+ */
+static inline void ecp_mpi_load( mpi *X, const t_uint *p, size_t len )
+{
+    X->s = 1;
+    X->n = len / sizeof( t_uint );
+    X->p = (t_uint *) p;
+}
+
+/*
+ * Set an MPI to static value 1
+ */
+static inline void ecp_mpi_set1( mpi *X )
+{
+    static t_uint one[] = { 1 };
+    X->s = 1;
+    X->n = 1;
+    X->p = one;
+}
+
+/*
+ * Make group available from embedded constants
+ */
+static int ecp_group_load( ecp_group *grp,
+                           const t_uint *p,  size_t plen,
+                           const t_uint *a,  size_t alen,
+                           const t_uint *b,  size_t blen,
+                           const t_uint *gx, size_t gxlen,
+                           const t_uint *gy, size_t gylen,
+                           const t_uint *n,  size_t nlen)
+{
+    ecp_mpi_load( &grp->P, p, plen );
+    if( a != NULL )
+        ecp_mpi_load( &grp->A, a, alen );
+    ecp_mpi_load( &grp->B, b, blen );
+    ecp_mpi_load( &grp->N, n, nlen );
+
+    ecp_mpi_load( &grp->G.X, gx, gxlen );
+    ecp_mpi_load( &grp->G.Y, gy, gylen );
+    ecp_mpi_set1( &grp->G.Z );
+
+    grp->pbits = mpi_msb( &grp->P );
+    grp->nbits = mpi_msb( &grp->N );
+
+    grp->h = 1;
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_ECP_NIST_OPTIM)
+/* Forward declarations */
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+static int ecp_mod_p192( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+static int ecp_mod_p224( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+static int ecp_mod_p256( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+static int ecp_mod_p384( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+static int ecp_mod_p521( mpi * );
+#endif
+
+#define NIST_MODP( P )      grp->modp = ecp_mod_ ## P;
+#else
+#define NIST_MODP( P )
+#endif /* POLARSSL_ECP_NIST_OPTIM */
+
+/* Additional forward declarations */
+#if defined(POLARSSL_ECP_DP_M255_ENABLED)
+static int ecp_mod_p255( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+static int ecp_mod_p192k1( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+static int ecp_mod_p224k1( mpi * );
+#endif
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+static int ecp_mod_p256k1( mpi * );
+#endif
+
+#define LOAD_GROUP_A( G )   ecp_group_load( grp,            \
+                            G ## _p,  sizeof( G ## _p  ),   \
+                            G ## _a,  sizeof( G ## _a  ),   \
+                            G ## _b,  sizeof( G ## _b  ),   \
+                            G ## _gx, sizeof( G ## _gx ),   \
+                            G ## _gy, sizeof( G ## _gy ),   \
+                            G ## _n,  sizeof( G ## _n  ) )
+
+#define LOAD_GROUP( G )     ecp_group_load( grp,            \
+                            G ## _p,  sizeof( G ## _p  ),   \
+                            NULL,     0,                    \
+                            G ## _b,  sizeof( G ## _b  ),   \
+                            G ## _gx, sizeof( G ## _gx ),   \
+                            G ## _gy, sizeof( G ## _gy ),   \
+                            G ## _n,  sizeof( G ## _n  ) )
+
+#if defined(POLARSSL_ECP_DP_M255_ENABLED)
+/*
+ * Specialized function for creating the Curve25519 group
+ */
+static int ecp_use_curve25519( ecp_group *grp )
+{
+    int ret;
+
+    /* Actually ( A + 2 ) / 4 */
+    MPI_CHK( mpi_read_string( &grp->A, 16, "01DB42" ) );
+
+    /* P = 2^255 - 19 */
+    MPI_CHK( mpi_lset( &grp->P, 1 ) );
+    MPI_CHK( mpi_shift_l( &grp->P, 255 ) );
+    MPI_CHK( mpi_sub_int( &grp->P, &grp->P, 19 ) );
+    grp->pbits = mpi_msb( &grp->P );
+
+    /* Y intentionaly not set, since we use x/z coordinates.
+     * This is used as a marker to identify Montgomery curves! */
+    MPI_CHK( mpi_lset( &grp->G.X, 9 ) );
+    MPI_CHK( mpi_lset( &grp->G.Z, 1 ) );
+    mpi_free( &grp->G.Y );
+
+    /* Actually, the required msb for private keys */
+    grp->nbits = 254;
+
+cleanup:
+    if( ret != 0 )
+        ecp_group_free( grp );
+
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_M255_ENABLED */
+
+/*
+ * Set a group using well-known domain parameters
+ */
+int ecp_use_known_dp( ecp_group *grp, ecp_group_id id )
+{
+    ecp_group_free( grp );
+
+    grp->id = id;
+
+    switch( id )
+    {
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+        case POLARSSL_ECP_DP_SECP192R1:
+            NIST_MODP( p192 );
+            return( LOAD_GROUP( secp192r1 ) );
+#endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+        case POLARSSL_ECP_DP_SECP224R1:
+            NIST_MODP( p224 );
+            return( LOAD_GROUP( secp224r1 ) );
+#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+        case POLARSSL_ECP_DP_SECP256R1:
+            NIST_MODP( p256 );
+            return( LOAD_GROUP( secp256r1 ) );
+#endif /* POLARSSL_ECP_DP_SECP256R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+        case POLARSSL_ECP_DP_SECP384R1:
+            NIST_MODP( p384 );
+            return( LOAD_GROUP( secp384r1 ) );
+#endif /* POLARSSL_ECP_DP_SECP384R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+        case POLARSSL_ECP_DP_SECP521R1:
+            NIST_MODP( p521 );
+            return( LOAD_GROUP( secp521r1 ) );
+#endif /* POLARSSL_ECP_DP_SECP521R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+        case POLARSSL_ECP_DP_SECP192K1:
+            grp->modp = ecp_mod_p192k1;
+            return( LOAD_GROUP_A( secp192k1 ) );
+#endif /* POLARSSL_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+        case POLARSSL_ECP_DP_SECP224K1:
+            grp->modp = ecp_mod_p224k1;
+            return( LOAD_GROUP_A( secp224k1 ) );
+#endif /* POLARSSL_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+        case POLARSSL_ECP_DP_SECP256K1:
+            grp->modp = ecp_mod_p256k1;
+            return( LOAD_GROUP_A( secp256k1 ) );
+#endif /* POLARSSL_ECP_DP_SECP256K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_BP256R1_ENABLED)
+        case POLARSSL_ECP_DP_BP256R1:
+            return( LOAD_GROUP_A( brainpoolP256r1 ) );
+#endif /* POLARSSL_ECP_DP_BP256R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_BP384R1_ENABLED)
+        case POLARSSL_ECP_DP_BP384R1:
+            return( LOAD_GROUP_A( brainpoolP384r1 ) );
+#endif /* POLARSSL_ECP_DP_BP384R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_BP512R1_ENABLED)
+        case POLARSSL_ECP_DP_BP512R1:
+            return( LOAD_GROUP_A( brainpoolP512r1 ) );
+#endif /* POLARSSL_ECP_DP_BP512R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_M255_ENABLED)
+        case POLARSSL_ECP_DP_M255:
+            grp->modp = ecp_mod_p255;
+            return( ecp_use_curve25519( grp ) );
+#endif /* POLARSSL_ECP_DP_M255_ENABLED */
+
+        default:
+            ecp_group_free( grp );
+            return( POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE );
+    }
+}
+
+#if defined(POLARSSL_ECP_NIST_OPTIM)
+/*
+ * Fast reduction modulo the primes used by the NIST curves.
+ *
+ * These functions are critical for speed, but not needed for correct
+ * operations. So, we make the choice to heavily rely on the internals of our
+ * bignum library, which creates a tight coupling between these functions and
+ * our MPI implementation.  However, the coupling between the ECP module and
+ * MPI remains loose, since these functions can be deactivated at will.
+ */
+
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+/*
+ * Compared to the way things are presented in FIPS 186-3 D.2,
+ * we proceed in columns, from right (least significant chunk) to left,
+ * adding chunks to N in place, and keeping a carry for the next chunk.
+ * This avoids moving things around in memory, and uselessly adding zeros,
+ * compared to the more straightforward, line-oriented approach.
+ *
+ * For this prime we need to handle data in chunks of 64 bits.
+ * Since this is always a multiple of our basic t_uint, we can
+ * use a t_uint * to designate such a chunk, and small loops to handle it.
+ */
+
+/* Add 64-bit chunks (dst += src) and update carry */
+static inline void add64( t_uint *dst, t_uint *src, t_uint *carry )
+{
+    unsigned char i;
+    t_uint c = 0;
+    for( i = 0; i < 8 / sizeof( t_uint ); i++, dst++, src++ )
+    {
+        *dst += c;      c  = ( *dst < c );
+        *dst += *src;   c += ( *dst < *src );
+    }
+    *carry += c;
+}
+
+/* Add carry to a 64-bit chunk and update carry */
+static inline void carry64( t_uint *dst, t_uint *carry )
+{
+    unsigned char i;
+    for( i = 0; i < 8 / sizeof( t_uint ); i++, dst++ )
+    {
+        *dst += *carry;
+        *carry  = ( *dst < *carry );
+    }
+}
+
+#define WIDTH       8 / sizeof( t_uint )
+#define A( i )      N->p + i * WIDTH
+#define ADD( i )    add64( p, A( i ), &c )
+#define NEXT        p += WIDTH; carry64( p, &c )
+#define LAST        p += WIDTH; *p = c; while( ++p < end ) *p = 0
+
+/*
+ * Fast quasi-reduction modulo p192 (FIPS 186-3 D.2.1)
+ */
+static int ecp_mod_p192( mpi *N )
+{
+    int ret;
+    t_uint c = 0;
+    t_uint *p, *end;
+
+    /* Make sure we have enough blocks so that A(5) is legal */
+    MPI_CHK( mpi_grow( N, 6 * WIDTH ) );
+
+    p = N->p;
+    end = p + N->n;
+
+    ADD( 3 ); ADD( 5 );             NEXT; // A0 += A3 + A5
+    ADD( 3 ); ADD( 4 ); ADD( 5 );   NEXT; // A1 += A3 + A4 + A5
+    ADD( 4 ); ADD( 5 );             LAST; // A2 += A4 + A5
+
+cleanup:
+    return( ret );
+}
+
+#undef WIDTH
+#undef A
+#undef ADD
+#undef NEXT
+#undef LAST
+#endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP256R1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+/*
+ * The reader is advised to first understand ecp_mod_p192() since the same
+ * general structure is used here, but with additional complications:
+ * (1) chunks of 32 bits, and (2) subtractions.
+ */
+
+/*
+ * For these primes, we need to handle data in chunks of 32 bits.
+ * This makes it more complicated if we use 64 bits limbs in MPI,
+ * which prevents us from using a uniform access method as for p192.
+ *
+ * So, we define a mini abstraction layer to access 32 bit chunks,
+ * load them in 'cur' for work, and store them back from 'cur' when done.
+ *
+ * While at it, also define the size of N in terms of 32-bit chunks.
+ */
+#define LOAD32      cur = A( i );
+
+#if defined(POLARSSL_HAVE_INT8)     /* 8 bit */
+
+#define MAX32       N->n / 4
+#define A( j )      (uint32_t)( N->p[4*j+0]       ) |  \
+                              ( N->p[4*j+1] << 8  ) |  \
+                              ( N->p[4*j+2] << 16 ) |  \
+                              ( N->p[4*j+3] << 24 )
+#define STORE32     N->p[4*i+0] = (t_uint)( cur       );   \
+                    N->p[4*i+1] = (t_uint)( cur >> 8  );   \
+                    N->p[4*i+2] = (t_uint)( cur >> 16 );   \
+                    N->p[4*i+3] = (t_uint)( cur >> 24 );
+
+#elif defined(POLARSSL_HAVE_INT16)  /* 16 bit */
+
+#define MAX32       N->n / 2
+#define A( j )      (uint32_t)( N->p[2*j] ) | ( N->p[2*j+1] << 16 )
+#define STORE32     N->p[2*i+0] = (t_uint)( cur       );  \
+                    N->p[2*i+1] = (t_uint)( cur >> 16 );
+
+#elif defined(POLARSSL_HAVE_INT32)  /* 32 bit */
+
+#define MAX32       N->n
+#define A( j )      N->p[j]
+#define STORE32     N->p[i] = cur;
+
+#else                               /* 64-bit */
+
+#define MAX32       N->n * 2
+#define A( j ) j % 2 ? (uint32_t)( N->p[j/2] >> 32 ) : (uint32_t)( N->p[j/2] )
+#define STORE32                                   \
+    if( i % 2 ) {                                 \
+        N->p[i/2] &= 0x00000000FFFFFFFF;          \
+        N->p[i/2] |= ((t_uint) cur) << 32;        \
+    } else {                                      \
+        N->p[i/2] &= 0xFFFFFFFF00000000;          \
+        N->p[i/2] |= (t_uint) cur;                \
+    }
+
+#endif /* sizeof( t_uint ) */
+
+/*
+ * Helpers for addition and subtraction of chunks, with signed carry.
+ */
+static inline void add32( uint32_t *dst, uint32_t src, signed char *carry )
+{
+    *dst += src;
+    *carry += ( *dst < src );
+}
+
+static inline void sub32( uint32_t *dst, uint32_t src, signed char *carry )
+{
+    *carry -= ( *dst < src );
+    *dst -= src;
+}
+
+#define ADD( j )    add32( &cur, A( j ), &c );
+#define SUB( j )    sub32( &cur, A( j ), &c );
+
+/*
+ * Helpers for the main 'loop'
+ * (see fix_negative for the motivation of C)
+ */
+#define INIT( b )                                           \
+    int ret;                                                \
+    signed char c = 0, cc;                                  \
+    uint32_t cur;                                           \
+    size_t i = 0, bits = b;                                 \
+    mpi C;                                                  \
+    t_uint Cp[ b / 8 / sizeof( t_uint) + 1 ];               \
+                                                            \
+    C.s = 1;                                                \
+    C.n = b / 8 / sizeof( t_uint) + 1;                      \
+    C.p = Cp;                                               \
+    memset( Cp, 0, C.n * sizeof( t_uint ) );                \
+                                                            \
+    MPI_CHK( mpi_grow( N, b * 2 / 8 / sizeof( t_uint ) ) ); \
+    LOAD32;
+
+#define NEXT                    \
+    STORE32; i++; LOAD32;       \
+    cc = c; c = 0;              \
+    if( cc < 0 )                \
+        sub32( &cur, -cc, &c ); \
+    else                        \
+        add32( &cur, cc, &c );  \
+
+#define LAST                                    \
+    STORE32; i++;                               \
+    cur = c > 0 ? c : 0; STORE32;               \
+    cur = 0; while( ++i < MAX32 ) { STORE32; }  \
+    if( c < 0 ) fix_negative( N, c, &C, bits );
+
+/*
+ * If the result is negative, we get it in the form
+ * c * 2^(bits + 32) + N, with c negative and N positive shorter than 'bits'
+ */
+static inline int fix_negative( mpi *N, signed char c, mpi *C, size_t bits )
+{
+    int ret;
+
+    /* C = - c * 2^(bits + 32) */
+#if !defined(POLARSSL_HAVE_INT64)
+    ((void) bits);
+#else
+    if( bits == 224 )
+        C->p[ C->n - 1 ] = ((t_uint) -c) << 32;
+    else
+#endif
+        C->p[ C->n - 1 ] = (t_uint) -c;
+
+    /* N = - ( C - N ) */
+    MPI_CHK( mpi_sub_abs( N, C, N ) );
+    N->s = -1;
+
+cleanup:
+
+    return( ret );
+}
+
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p224 (FIPS 186-3 D.2.2)
+ */
+static int ecp_mod_p224( mpi *N )
+{
+    INIT( 224 );
+
+    SUB(  7 ); SUB( 11 );               NEXT; // A0 += -A7 - A11
+    SUB(  8 ); SUB( 12 );               NEXT; // A1 += -A8 - A12
+    SUB(  9 ); SUB( 13 );               NEXT; // A2 += -A9 - A13
+    SUB( 10 ); ADD(  7 ); ADD( 11 );    NEXT; // A3 += -A10 + A7 + A11
+    SUB( 11 ); ADD(  8 ); ADD( 12 );    NEXT; // A4 += -A11 + A8 + A12
+    SUB( 12 ); ADD(  9 ); ADD( 13 );    NEXT; // A5 += -A12 + A9 + A13
+    SUB( 13 ); ADD( 10 );               LAST; // A6 += -A13 + A10
+
+cleanup:
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p256 (FIPS 186-3 D.2.3)
+ */
+static int ecp_mod_p256( mpi *N )
+{
+    INIT( 256 );
+
+    ADD(  8 ); ADD(  9 );
+    SUB( 11 ); SUB( 12 ); SUB( 13 ); SUB( 14 );             NEXT; // A0
+
+    ADD(  9 ); ADD( 10 );
+    SUB( 12 ); SUB( 13 ); SUB( 14 ); SUB( 15 );             NEXT; // A1
+
+    ADD( 10 ); ADD( 11 );
+    SUB( 13 ); SUB( 14 ); SUB( 15 );                        NEXT; // A2
+
+    ADD( 11 ); ADD( 11 ); ADD( 12 ); ADD( 12 ); ADD( 13 );
+    SUB( 15 ); SUB(  8 ); SUB(  9 );                        NEXT; // A3
+
+    ADD( 12 ); ADD( 12 ); ADD( 13 ); ADD( 13 ); ADD( 14 );
+    SUB(  9 ); SUB( 10 );                                   NEXT; // A4
+
+    ADD( 13 ); ADD( 13 ); ADD( 14 ); ADD( 14 ); ADD( 15 );
+    SUB( 10 ); SUB( 11 );                                   NEXT; // A5
+
+    ADD( 14 ); ADD( 14 ); ADD( 15 ); ADD( 15 ); ADD( 14 ); ADD( 13 );
+    SUB(  8 ); SUB(  9 );                                   NEXT; // A6
+
+    ADD( 15 ); ADD( 15 ); ADD( 15 ); ADD( 8 );
+    SUB( 10 ); SUB( 11 ); SUB( 12 ); SUB( 13 );             LAST; // A7
+
+cleanup:
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_SECP256R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p384 (FIPS 186-3 D.2.4)
+ */
+static int ecp_mod_p384( mpi *N )
+{
+    INIT( 384 );
+
+    ADD( 12 ); ADD( 21 ); ADD( 20 );
+    SUB( 23 );                                              NEXT; // A0
+
+    ADD( 13 ); ADD( 22 ); ADD( 23 );
+    SUB( 12 ); SUB( 20 );                                   NEXT; // A2
+
+    ADD( 14 ); ADD( 23 );
+    SUB( 13 ); SUB( 21 );                                   NEXT; // A2
+
+    ADD( 15 ); ADD( 12 ); ADD( 20 ); ADD( 21 );
+    SUB( 14 ); SUB( 22 ); SUB( 23 );                        NEXT; // A3
+
+    ADD( 21 ); ADD( 21 ); ADD( 16 ); ADD( 13 ); ADD( 12 ); ADD( 20 ); ADD( 22 );
+    SUB( 15 ); SUB( 23 ); SUB( 23 );                        NEXT; // A4
+
+    ADD( 22 ); ADD( 22 ); ADD( 17 ); ADD( 14 ); ADD( 13 ); ADD( 21 ); ADD( 23 );
+    SUB( 16 );                                              NEXT; // A5
+
+    ADD( 23 ); ADD( 23 ); ADD( 18 ); ADD( 15 ); ADD( 14 ); ADD( 22 );
+    SUB( 17 );                                              NEXT; // A6
+
+    ADD( 19 ); ADD( 16 ); ADD( 15 ); ADD( 23 );
+    SUB( 18 );                                              NEXT; // A7
+
+    ADD( 20 ); ADD( 17 ); ADD( 16 );
+    SUB( 19 );                                              NEXT; // A8
+
+    ADD( 21 ); ADD( 18 ); ADD( 17 );
+    SUB( 20 );                                              NEXT; // A9
+
+    ADD( 22 ); ADD( 19 ); ADD( 18 );
+    SUB( 21 );                                              NEXT; // A10
+
+    ADD( 23 ); ADD( 20 ); ADD( 19 );
+    SUB( 22 );                                              LAST; // A11
+
+cleanup:
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_SECP384R1_ENABLED */
+
+#undef A
+#undef LOAD32
+#undef STORE32
+#undef MAX32
+#undef INIT
+#undef NEXT
+#undef LAST
+
+#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED ||
+          POLARSSL_ECP_DP_SECP256R1_ENABLED ||
+          POLARSSL_ECP_DP_SECP384R1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+/*
+ * Here we have an actual Mersenne prime, so things are more straightforward.
+ * However, chunks are aligned on a 'weird' boundary (521 bits).
+ */
+
+/* Size of p521 in terms of t_uint */
+#define P521_WIDTH      ( 521 / 8 / sizeof( t_uint ) + 1 )
+
+/* Bits to keep in the most significant t_uint */
+#if defined(POLARSSL_HAVE_INT8)
+#define P521_MASK       0x01
+#else
+#define P521_MASK       0x01FF
+#endif
+
+/*
+ * Fast quasi-reduction modulo p521 (FIPS 186-3 D.2.5)
+ * Write N as A1 + 2^521 A0, return A0 + A1
+ */
+static int ecp_mod_p521( mpi *N )
+{
+    int ret;
+    size_t i;
+    mpi M;
+    t_uint Mp[P521_WIDTH + 1];
+    /* Worst case for the size of M is when t_uint is 16 bits:
+     * we need to hold bits 513 to 1056, which is 34 limbs, that is
+     * P521_WIDTH + 1. Otherwise P521_WIDTH is enough. */
+
+    if( N->n < P521_WIDTH )
+        return( 0 );
+
+    /* M = A1 */
+    M.s = 1;
+    M.n = N->n - ( P521_WIDTH - 1 );
+    if( M.n > P521_WIDTH + 1 )
+        M.n = P521_WIDTH + 1;
+    M.p = Mp;
+    memcpy( Mp, N->p + P521_WIDTH - 1, M.n * sizeof( t_uint ) );
+    MPI_CHK( mpi_shift_r( &M, 521 % ( 8 * sizeof( t_uint ) ) ) );
+
+    /* N = A0 */
+    N->p[P521_WIDTH - 1] &= P521_MASK;
+    for( i = P521_WIDTH; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + A1 */
+    MPI_CHK( mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+
+#undef P521_WIDTH
+#undef P521_MASK
+#endif /* POLARSSL_ECP_DP_SECP521R1_ENABLED */
+
+#endif /* POLARSSL_ECP_NIST_OPTIM */
+
+#if defined(POLARSSL_ECP_DP_M255_ENABLED)
+
+/* Size of p255 in terms of t_uint */
+#define P255_WIDTH      ( 255 / 8 / sizeof( t_uint ) + 1 )
+
+/*
+ * Fast quasi-reduction modulo p255 = 2^255 - 19
+ * Write N as A0 + 2^255 A1, return A0 + 19 * A1
+ */
+static int ecp_mod_p255( mpi *N )
+{
+    int ret;
+    size_t i;
+    mpi M;
+    t_uint Mp[P255_WIDTH + 2];
+
+    if( N->n < P255_WIDTH )
+        return( 0 );
+
+    /* M = A1 */
+    M.s = 1;
+    M.n = N->n - ( P255_WIDTH - 1 );
+    if( M.n > P255_WIDTH + 1 )
+        M.n = P255_WIDTH + 1;
+    M.p = Mp;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + P255_WIDTH - 1, M.n * sizeof( t_uint ) );
+    MPI_CHK( mpi_shift_r( &M, 255 % ( 8 * sizeof( t_uint ) ) ) );
+    M.n++; /* Make room for multiplication by 19 */
+
+    /* N = A0 */
+    MPI_CHK( mpi_set_bit( N, 255, 0 ) );
+    for( i = P255_WIDTH; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + 19 * A1 */
+    MPI_CHK( mpi_mul_int( &M, &M, 19 ) );
+    MPI_CHK( mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_M255_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP224K1_ENABLED) ||   \
+    defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo P = 2^s - R,
+ * with R about 33 bits, used by the Koblitz curves.
+ *
+ * Write N as A0 + 2^224 A1, return A0 + R * A1.
+ * Actually do two passes, since R is big.
+ */
+#define P_KOBLITZ_MAX   ( 256 / 8 / sizeof( t_uint ) )  // Max limbs in P
+#define P_KOBLITZ_R     ( 8 / sizeof( t_uint ) )        // Limbs in R
+static inline int ecp_mod_koblitz( mpi *N, t_uint *Rp, size_t p_limbs,
+                                   size_t adjust, size_t shift, t_uint mask )
+{
+    int ret;
+    size_t i;
+    mpi M, R;
+    t_uint Mp[P_KOBLITZ_MAX + P_KOBLITZ_R];
+
+    if( N->n < p_limbs )
+        return( 0 );
+
+    /* Init R */
+    R.s = 1;
+    R.p = Rp;
+    R.n = P_KOBLITZ_R;
+
+    /* Common setup for M */
+    M.s = 1;
+    M.p = Mp;
+
+    /* M = A1 */
+    M.n = N->n - ( p_limbs - adjust );
+    if( M.n > p_limbs + adjust )
+        M.n = p_limbs + adjust;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( t_uint ) );
+    if( shift != 0 )
+        MPI_CHK( mpi_shift_r( &M, shift ) );
+    M.n += R.n - adjust; /* Make room for multiplication by R */
+
+    /* N = A0 */
+    if( mask != 0 )
+        N->p[p_limbs - 1] &= mask;
+    for( i = p_limbs; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + R * A1 */
+    MPI_CHK( mpi_mul_mpi( &M, &M, &R ) );
+    MPI_CHK( mpi_add_abs( N, N, &M ) );
+
+    /* Second pass */
+
+    /* M = A1 */
+    M.n = N->n - ( p_limbs - adjust );
+    if( M.n > p_limbs + adjust )
+        M.n = p_limbs + adjust;
+    memset( Mp, 0, sizeof Mp );
+    memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( t_uint ) );
+    if( shift != 0 )
+        MPI_CHK( mpi_shift_r( &M, shift ) );
+    M.n += R.n - adjust; /* Make room for multiplication by R */
+
+    /* N = A0 */
+    if( mask != 0 )
+        N->p[p_limbs - 1] &= mask;
+    for( i = p_limbs; i < N->n; i++ )
+        N->p[i] = 0;
+
+    /* N = A0 + R * A1 */
+    MPI_CHK( mpi_mul_mpi( &M, &M, &R ) );
+    MPI_CHK( mpi_add_abs( N, N, &M ) );
+
+cleanup:
+    return( ret );
+}
+#endif /* POLARSSL_ECP_DP_SECP192K1_ENABLED) ||
+          POLARSSL_ECP_DP_SECP224K1_ENABLED) ||
+          POLARSSL_ECP_DP_SECP256K1_ENABLED) */
+
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p192k1 = 2^192 - R,
+ * with R = 2^32 + 2^12 + 2^8 + 2^7 + 2^6 + 2^3 + 1 = 0x0100001119
+ */
+static int ecp_mod_p192k1( mpi *N )
+{
+    static t_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0xC9, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+
+    return( ecp_mod_koblitz( N, Rp, 192 / 8 / sizeof( t_uint ), 0, 0, 0 ) );
+}
+#endif /* POLARSSL_ECP_DP_SECP192K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p224k1 = 2^224 - R,
+ * with R = 2^32 + 2^12 + 2^11 + 2^9 + 2^7 + 2^4 + 2 + 1 = 0x0100001A93
+ */
+static int ecp_mod_p224k1( mpi *N )
+{
+    static t_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+
+#if defined(POLARSSL_HAVE_INT64)
+    return( ecp_mod_koblitz( N, Rp, 4, 1, 32, 0xFFFFFFFF ) );
+#else
+    return( ecp_mod_koblitz( N, Rp, 224 / 8 / sizeof( t_uint ), 0, 0, 0 ) );
+#endif
+}
+
+#endif /* POLARSSL_ECP_DP_SECP224K1_ENABLED */
+
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+/*
+ * Fast quasi-reduction modulo p256k1 = 2^256 - R,
+ * with R = 2^32 + 2^9 + 2^8 + 2^7 + 2^6 + 2^4 + 1 = 0x01000003D1
+ */
+static int ecp_mod_p256k1( mpi *N )
+{
+    static t_uint Rp[] = {
+        BYTES_TO_T_UINT_8( 0xD1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ) };
+    return( ecp_mod_koblitz( N, Rp, 256 / 8 / sizeof( t_uint ), 0, 0, 0 ) );
+}
+#endif /* POLARSSL_ECP_DP_SECP256K1_ENABLED */
+
+#endif /* POLARSSL_ECP_C */
diff --git a/Externals/polarssl/library/entropy.c b/Externals/polarssl/library/entropy.c
index 9662454721..bc7fb0fe46 100644
--- a/Externals/polarssl/library/entropy.c
+++ b/Externals/polarssl/library/entropy.c
@@ -1,7 +1,7 @@
 /*
  *  Entropy accumulator implementation
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,24 +23,45 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_ENTROPY_C)
 
 #include "polarssl/entropy.h"
 #include "polarssl/entropy_poll.h"
 
+#if defined(POLARSSL_FS_IO)
+#include <stdio.h>
+#endif
+
 #if defined(POLARSSL_HAVEGE_C)
 #include "polarssl/havege.h"
 #endif
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #define ENTROPY_MAX_LOOP    256     /**< Maximum amount to loop before error */
 
 void entropy_init( entropy_context *ctx )
 {
     memset( ctx, 0, sizeof(entropy_context) );
 
-    sha4_starts( &ctx->accumulator, 0 );
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_init( &ctx->mutex );
+#endif
+
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
+    sha512_starts( &ctx->accumulator, 0 );
+#else
+    sha256_starts( &ctx->accumulator, 0 );
+#endif
 #if defined(POLARSSL_HAVEGE_C)
     havege_init( &ctx->havege_data );
 #endif
@@ -60,14 +81,34 @@ void entropy_init( entropy_context *ctx )
 #endif /* POLARSSL_NO_DEFAULT_ENTROPY_SOURCES */
 }
 
+void entropy_free( entropy_context *ctx )
+{
+#if defined(POLARSSL_HAVEGE_C)
+    havege_free( &ctx->havege_data );
+#endif
+    polarssl_zeroize( ctx, sizeof( entropy_context ) );
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_free( &ctx->mutex );
+#endif
+}
+
 int entropy_add_source( entropy_context *ctx,
                         f_source_ptr f_source, void *p_source,
                         size_t threshold )
 {
-    int index = ctx->source_count;
+    int index, ret = 0;
 
+#if defined(POLARSSL_THREADING_C)
+    if( ( ret = polarssl_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    index = ctx->source_count;
     if( index >= ENTROPY_MAX_SOURCES )
-        return( POLARSSL_ERR_ENTROPY_MAX_SOURCES );
+    {
+        ret = POLARSSL_ERR_ENTROPY_MAX_SOURCES;
+        goto exit;
+    }
 
     ctx->source[index].f_source = f_source;
     ctx->source[index].p_source = p_source;
@@ -75,24 +116,33 @@ int entropy_add_source( entropy_context *ctx,
 
     ctx->source_count++;
 
-    return( 0 );
+exit:
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &ctx->mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
 }
 
 /*
  * Entropy accumulator update
  */
-int entropy_update( entropy_context *ctx, unsigned char source_id,
-                    const unsigned char *data, size_t len )
+static int entropy_update( entropy_context *ctx, unsigned char source_id,
+                           const unsigned char *data, size_t len )
 {
     unsigned char header[2];
     unsigned char tmp[ENTROPY_BLOCK_SIZE];
     size_t use_len = len;
     const unsigned char *p = data;
-   
+
     if( use_len > ENTROPY_BLOCK_SIZE )
     {
-        sha4( data, len, tmp, 0 );
-
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
+        sha512( data, len, tmp, 0 );
+#else
+        sha256( data, len, tmp, 0 );
+#endif
         p = tmp;
         use_len = ENTROPY_BLOCK_SIZE;
     }
@@ -100,27 +150,46 @@ int entropy_update( entropy_context *ctx, unsigned char source_id,
     header[0] = source_id;
     header[1] = use_len & 0xFF;
 
-    sha4_update( &ctx->accumulator, header, 2 );
-    sha4_update( &ctx->accumulator, p, use_len );
-    
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
+    sha512_update( &ctx->accumulator, header, 2 );
+    sha512_update( &ctx->accumulator, p, use_len );
+#else
+    sha256_update( &ctx->accumulator, header, 2 );
+    sha256_update( &ctx->accumulator, p, use_len );
+#endif
+
     return( 0 );
 }
 
 int entropy_update_manual( entropy_context *ctx,
                            const unsigned char *data, size_t len )
 {
-    return entropy_update( ctx, ENTROPY_SOURCE_MANUAL, data, len );
+    int ret;
+
+#if defined(POLARSSL_THREADING_C)
+    if( ( ret = polarssl_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    ret = entropy_update( ctx, ENTROPY_SOURCE_MANUAL, data, len );
+
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &ctx->mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
 }
 
 /*
  * Run through the different sources to add entropy to our accumulator
  */
-int entropy_gather( entropy_context *ctx )
+static int entropy_gather_internal( entropy_context *ctx )
 {
     int ret, i;
     unsigned char buf[ENTROPY_MAX_GATHER];
     size_t olen;
-    
+
     if( ctx->source_count == 0 )
         return( POLARSSL_ERR_ENTROPY_NO_SOURCES_DEFINED );
 
@@ -130,7 +199,7 @@ int entropy_gather( entropy_context *ctx )
     for( i = 0; i < ctx->source_count; i++ )
     {
         olen = 0;
-        if ( ( ret = ctx->source[i].f_source( ctx->source[i].p_source,
+        if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source,
                         buf, ENTROPY_MAX_GATHER, &olen ) ) != 0 )
         {
             return( ret );
@@ -149,6 +218,28 @@ int entropy_gather( entropy_context *ctx )
     return( 0 );
 }
 
+/*
+ * Thread-safe wrapper for entropy_gather_internal()
+ */
+int entropy_gather( entropy_context *ctx )
+{
+    int ret;
+
+#if defined(POLARSSL_THREADING_C)
+    if( ( ret = polarssl_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    ret = entropy_gather_internal( ctx );
+
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &ctx->mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
 int entropy_func( void *data, unsigned char *output, size_t len )
 {
     int ret, count = 0, i, reached;
@@ -158,16 +249,24 @@ int entropy_func( void *data, unsigned char *output, size_t len )
     if( len > ENTROPY_BLOCK_SIZE )
         return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
 
+#if defined(POLARSSL_THREADING_C)
+    if( ( ret = polarssl_mutex_lock( &ctx->mutex ) ) != 0 )
+        return( ret );
+#endif
+
     /*
      * Always gather extra entropy before a call
      */
     do
     {
         if( count++ > ENTROPY_MAX_LOOP )
-            return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
+        {
+            ret = POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+            goto exit;
+        }
 
-        if( ( ret = entropy_gather( ctx ) ) != 0 )
-            return( ret );
+        if( ( ret = entropy_gather_internal( ctx ) ) != 0 )
+            goto exit;
 
         reached = 0;
 
@@ -179,26 +278,200 @@ int entropy_func( void *data, unsigned char *output, size_t len )
 
     memset( buf, 0, ENTROPY_BLOCK_SIZE );
 
-    sha4_finish( &ctx->accumulator, buf );
-                
-    /*
-     * Perform second SHA-512 on entropy
-     */
-    sha4( buf, ENTROPY_BLOCK_SIZE, buf, 0 );
+#if defined(POLARSSL_ENTROPY_SHA512_ACCUMULATOR)
+    sha512_finish( &ctx->accumulator, buf );
 
     /*
      * Reset accumulator and counters and recycle existing entropy
      */
-    memset( &ctx->accumulator, 0, sizeof( sha4_context ) );
-    sha4_starts( &ctx->accumulator, 0 );
-    sha4_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE );
+    memset( &ctx->accumulator, 0, sizeof( sha512_context ) );
+    sha512_starts( &ctx->accumulator, 0 );
+    sha512_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE );
+
+    /*
+     * Perform second SHA-512 on entropy
+     */
+    sha512( buf, ENTROPY_BLOCK_SIZE, buf, 0 );
+#else /* POLARSSL_ENTROPY_SHA512_ACCUMULATOR */
+    sha256_finish( &ctx->accumulator, buf );
+
+    /*
+     * Reset accumulator and counters and recycle existing entropy
+     */
+    memset( &ctx->accumulator, 0, sizeof( sha256_context ) );
+    sha256_starts( &ctx->accumulator, 0 );
+    sha256_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE );
+
+    /*
+     * Perform second SHA-256 on entropy
+     */
+    sha256( buf, ENTROPY_BLOCK_SIZE, buf, 0 );
+#endif /* POLARSSL_ENTROPY_SHA512_ACCUMULATOR */
 
     for( i = 0; i < ctx->source_count; i++ )
         ctx->source[i].size = 0;
 
     memcpy( output, buf, len );
 
+    ret = 0;
+
+exit:
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &ctx->mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+#endif
+
+    return( ret );
+}
+
+#if defined(POLARSSL_FS_IO)
+int entropy_write_seed_file( entropy_context *ctx, const char *path )
+{
+    int ret = POLARSSL_ERR_ENTROPY_FILE_IO_ERROR;
+    FILE *f;
+    unsigned char buf[ENTROPY_BLOCK_SIZE];
+
+    if( ( f = fopen( path, "wb" ) ) == NULL )
+        return( POLARSSL_ERR_ENTROPY_FILE_IO_ERROR );
+
+    if( ( ret = entropy_func( ctx, buf, ENTROPY_BLOCK_SIZE ) ) != 0 )
+        goto exit;
+
+    if( fwrite( buf, 1, ENTROPY_BLOCK_SIZE, f ) != ENTROPY_BLOCK_SIZE )
+    {
+        ret = POLARSSL_ERR_ENTROPY_FILE_IO_ERROR;
+        goto exit;
+    }
+
+    ret = 0;
+
+exit:
+    fclose( f );
+    return( ret );
+}
+
+int entropy_update_seed_file( entropy_context *ctx, const char *path )
+{
+    FILE *f;
+    size_t n;
+    unsigned char buf[ ENTROPY_MAX_SEED_SIZE ];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_ENTROPY_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    n = (size_t) ftell( f );
+    fseek( f, 0, SEEK_SET );
+
+    if( n > ENTROPY_MAX_SEED_SIZE )
+        n = ENTROPY_MAX_SEED_SIZE;
+
+    if( fread( buf, 1, n, f ) != n )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_ENTROPY_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    entropy_update_manual( ctx, buf, n );
+
+    return( entropy_write_seed_file( ctx, path ) );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(POLARSSL_SELF_TEST)
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdio.h>
+#define polarssl_printf     printf
+#endif
+
+/*
+ * Dummy source function
+ */
+static int entropy_dummy_source( void *data, unsigned char *output,
+                                 size_t len, size_t *olen )
+{
+    ((void) data);
+
+    memset( output, 0x2a, len );
+    *olen = len;
+
     return( 0 );
 }
 
-#endif
+/*
+ * The actual entropy quality is hard to test, but we can at least
+ * test that the functions don't cause errors and write the correct
+ * amount of data to buffers.
+ */
+int entropy_self_test( int verbose )
+{
+    int ret = 0;
+    entropy_context ctx;
+    unsigned char buf[ENTROPY_BLOCK_SIZE] = { 0 };
+    unsigned char acc[ENTROPY_BLOCK_SIZE] = { 0 };
+    size_t i, j;
+
+    if( verbose != 0 )
+        polarssl_printf( "  ENTROPY test: " );
+
+    entropy_init( &ctx );
+
+    ret = entropy_add_source( &ctx, entropy_dummy_source, NULL, 16 );
+    if( ret != 0 )
+        goto cleanup;
+
+    if( ( ret = entropy_gather( &ctx ) ) != 0 )
+        goto cleanup;
+
+    if( ( ret = entropy_update_manual( &ctx, buf, sizeof buf ) ) != 0 )
+        goto cleanup;
+
+    /*
+     * To test that entropy_func writes correct number of bytes:
+     * - use the whole buffer and rely on ASan to detect overruns
+     * - collect entropy 8 times and OR the result in an accumulator:
+     *   any byte should then be 0 with probably 2^(-64), so requiring
+     *   each of the 32 or 64 bytes to be non-zero has a false failure rate
+     *   of at most 2^(-58) which is acceptable.
+     */
+    for( i = 0; i < 8; i++ )
+    {
+        if( ( ret = entropy_func( &ctx, buf, sizeof( buf ) ) ) != 0 )
+            goto cleanup;
+
+        for( j = 0; j < sizeof( buf ); j++ )
+            acc[j] |= buf[j];
+    }
+
+    for( j = 0; j < sizeof( buf ); j++ )
+    {
+        if( acc[j] == 0 )
+        {
+            ret = 1;
+            goto cleanup;
+        }
+    }
+
+cleanup:
+    entropy_free( &ctx );
+
+    if( verbose != 0 )
+    {
+        if( ret != 0 )
+            polarssl_printf( "failed\n" );
+        else
+            polarssl_printf( "passed\n" );
+
+        polarssl_printf( "\n" );
+    }
+
+    return( ret != 0 );
+}
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_ENTROPY_C */
diff --git a/Externals/polarssl/library/entropy_poll.c b/Externals/polarssl/library/entropy_poll.c
index b5d9f787c0..9ca9e95199 100644
--- a/Externals/polarssl/library/entropy_poll.c
+++ b/Externals/polarssl/library/entropy_poll.c
@@ -1,7 +1,7 @@
 /*
  *  Platform-specific and custom entropy polling functions
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,7 +23,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_ENTROPY_C)
 
@@ -38,7 +42,7 @@
 #endif
 
 #if !defined(POLARSSL_NO_PLATFORM_ENTROPY)
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 
 #if !defined(_WIN32_WINNT)
 #define _WIN32_WINNT 0x0400
@@ -56,18 +60,18 @@ int platform_entropy_poll( void *data, unsigned char *output, size_t len,
     if( CryptAcquireContext( &provider, NULL, NULL,
                               PROV_RSA_FULL, CRYPT_VERIFYCONTEXT ) == FALSE )
     {
-        return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+        return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
     }
 
-    if( CryptGenRandom( provider, len, output ) == FALSE )
-        return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+    if( CryptGenRandom( provider, (DWORD) len, output ) == FALSE )
+        return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
 
     CryptReleaseContext( provider, 0 );
     *olen = len;
 
     return( 0 );
 }
-#else
+#else /* _WIN32 && !EFIX64 && !EFI32 */
 
 #include <stdio.h>
 
@@ -82,13 +86,13 @@ int platform_entropy_poll( void *data,
 
     file = fopen( "/dev/urandom", "rb" );
     if( file == NULL )
-        return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
-    
+        return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
+
     ret = fread( output, 1, len, file );
     if( ret != len )
     {
         fclose( file );
-        return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+        return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
     }
 
     fclose( file );
@@ -96,8 +100,8 @@ int platform_entropy_poll( void *data,
 
     return( 0 );
 }
-#endif
-#endif
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+#endif /* !POLARSSL_NO_PLATFORM_ENTROPY */
 
 #if defined(POLARSSL_TIMING_C)
 int hardclock_poll( void *data,
@@ -115,7 +119,7 @@ int hardclock_poll( void *data,
 
     return( 0 );
 }
-#endif
+#endif /* POLARSSL_TIMING_C */
 
 #if defined(POLARSSL_HAVEGE_C)
 int havege_poll( void *data,
@@ -125,12 +129,12 @@ int havege_poll( void *data,
     *olen = 0;
 
     if( havege_random( hs, output, len ) != 0 )
-        return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+        return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
 
     *olen = len;
 
     return( 0 );
 }
-#endif
+#endif /* POLARSSL_HAVEGE_C */
 
 #endif /* POLARSSL_ENTROPY_C */
diff --git a/Externals/polarssl/library/error.c b/Externals/polarssl/library/error.c
index 036b834f1f..22234cf28d 100644
--- a/Externals/polarssl/library/error.c
+++ b/Externals/polarssl/library/error.c
@@ -1,7 +1,7 @@
 /*
  *  Error message information
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,12 +23,18 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY)
+#include "polarssl/error.h"
+#endif
 
 #if defined(POLARSSL_ERROR_C)
 
-#include "polarssl/error.h"
-
 #if defined(POLARSSL_AES_C)
 #include "polarssl/aes.h"
 #endif
@@ -49,6 +55,10 @@
 #include "polarssl/camellia.h"
 #endif
 
+#if defined(POLARSSL_CCM_C)
+#include "polarssl/ccm.h"
+#endif
+
 #if defined(POLARSSL_CIPHER_C)
 #include "polarssl/cipher.h"
 #endif
@@ -65,6 +75,10 @@
 #include "polarssl/dhm.h"
 #endif
 
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+
 #if defined(POLARSSL_ENTROPY_C)
 #include "polarssl/entropy.h"
 #endif
@@ -73,6 +87,10 @@
 #include "polarssl/gcm.h"
 #endif
 
+#if defined(POLARSSL_HMAC_DRBG_C)
+#include "polarssl/hmac_drbg.h"
+#endif
+
 #if defined(POLARSSL_MD_C)
 #include "polarssl/md.h"
 #endif
@@ -93,6 +111,10 @@
 #include "polarssl/net.h"
 #endif
 
+#if defined(POLARSSL_OID_C)
+#include "polarssl/oid.h"
+#endif
+
 #if defined(POLARSSL_PADLOCK_C)
 #include "polarssl/padlock.h"
 #endif
@@ -101,10 +123,14 @@
 #include "polarssl/pbkdf2.h"
 #endif
 
-#if defined(POLARSSL_PEM_C)
+#if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C)
 #include "polarssl/pem.h"
 #endif
 
+#if defined(POLARSSL_PK_C)
+#include "polarssl/pk.h"
+#endif
+
 #if defined(POLARSSL_PKCS12_C)
 #include "polarssl/pkcs12.h"
 #endif
@@ -113,6 +139,10 @@
 #include "polarssl/pkcs5.h"
 #endif
 
+#if defined(POLARSSL_RIPEMD160_C)
+#include "polarssl/ripemd160.h"
+#endif
+
 #if defined(POLARSSL_RSA_C)
 #include "polarssl/rsa.h"
 #endif
@@ -121,19 +151,23 @@
 #include "polarssl/sha1.h"
 #endif
 
-#if defined(POLARSSL_SHA2_C)
-#include "polarssl/sha2.h"
+#if defined(POLARSSL_SHA256_C)
+#include "polarssl/sha256.h"
 #endif
 
-#if defined(POLARSSL_SHA4_C)
-#include "polarssl/sha4.h"
+#if defined(POLARSSL_SHA512_C)
+#include "polarssl/sha512.h"
 #endif
 
 #if defined(POLARSSL_SSL_TLS_C)
 #include "polarssl/ssl.h"
 #endif
 
-#if defined(POLARSSL_X509_PARSE_C)
+#if defined(POLARSSL_THREADING_C)
+#include "polarssl/threading.h"
+#endif
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
 #include "polarssl/x509.h"
 #endif
 
@@ -144,17 +178,23 @@
 
 #include <string.h>
 
-#if defined _MSC_VER && !defined  snprintf
+#if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #define  snprintf  _snprintf
 #endif
 
-void error_strerror( int ret, char *buf, size_t buflen )
+void polarssl_strerror( int ret, char *buf, size_t buflen )
 {
     size_t len;
     int use_ret;
 
+    if( buflen == 0 )
+        return;
+
     memset( buf, 0x00, buflen );
-     
+    /* Reduce buflen to make sure MSVC _snprintf() ends with \0 as well */
+    buflen -= 1;
+
     if( ret < 0 )
         ret = -ret;
 
@@ -164,6 +204,7 @@ void error_strerror( int ret, char *buf, size_t buflen )
 
         // High level error codes
         //
+        // BEGIN generated code
 #if defined(POLARSSL_CIPHER_C)
         if( use_ret == -(POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE) )
             snprintf( buf, buflen, "CIPHER - The selected feature is not available" );
@@ -175,6 +216,8 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "CIPHER - Input data contains invalid padding and is rejected" );
         if( use_ret == -(POLARSSL_ERR_CIPHER_FULL_BLOCK_EXPECTED) )
             snprintf( buf, buflen, "CIPHER - Decryption of block requires a full block" );
+        if( use_ret == -(POLARSSL_ERR_CIPHER_AUTH_FAILED) )
+            snprintf( buf, buflen, "CIPHER - Authentication failed (for AEAD modes)" );
 #endif /* POLARSSL_CIPHER_C */
 
 #if defined(POLARSSL_DHM_C)
@@ -190,8 +233,33 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "DHM - Making of the public value failed" );
         if( use_ret == -(POLARSSL_ERR_DHM_CALC_SECRET_FAILED) )
             snprintf( buf, buflen, "DHM - Calculation of the DHM secret failed" );
+        if( use_ret == -(POLARSSL_ERR_DHM_INVALID_FORMAT) )
+            snprintf( buf, buflen, "DHM - The ASN.1 data is not formatted correctly" );
+        if( use_ret == -(POLARSSL_ERR_DHM_MALLOC_FAILED) )
+            snprintf( buf, buflen, "DHM - Allocation of memory failed" );
+        if( use_ret == -(POLARSSL_ERR_DHM_FILE_IO_ERROR) )
+            snprintf( buf, buflen, "DHM - Read/write of file failed" );
 #endif /* POLARSSL_DHM_C */
 
+#if defined(POLARSSL_ECP_C)
+        if( use_ret == -(POLARSSL_ERR_ECP_BAD_INPUT_DATA) )
+            snprintf( buf, buflen, "ECP - Bad input parameters to function" );
+        if( use_ret == -(POLARSSL_ERR_ECP_BUFFER_TOO_SMALL) )
+            snprintf( buf, buflen, "ECP - The buffer is too small to write to" );
+        if( use_ret == -(POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE) )
+            snprintf( buf, buflen, "ECP - Requested curve not available" );
+        if( use_ret == -(POLARSSL_ERR_ECP_VERIFY_FAILED) )
+            snprintf( buf, buflen, "ECP - The signature is not valid" );
+        if( use_ret == -(POLARSSL_ERR_ECP_MALLOC_FAILED) )
+            snprintf( buf, buflen, "ECP - Memory allocation failed" );
+        if( use_ret == -(POLARSSL_ERR_ECP_RANDOM_FAILED) )
+            snprintf( buf, buflen, "ECP - Generation of random value, such as (ephemeral) key, failed" );
+        if( use_ret == -(POLARSSL_ERR_ECP_INVALID_KEY) )
+            snprintf( buf, buflen, "ECP - Invalid private or public key" );
+        if( use_ret == -(POLARSSL_ERR_ECP_SIG_LEN_MISMATCH) )
+            snprintf( buf, buflen, "ECP - Signature is valid but shorter than the user-supplied length" );
+#endif /* POLARSSL_ECP_C */
+
 #if defined(POLARSSL_MD_C)
         if( use_ret == -(POLARSSL_ERR_MD_FEATURE_UNAVAILABLE) )
             snprintf( buf, buflen, "MD - The selected feature is not available" );
@@ -203,7 +271,7 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "MD - Opening or reading of file failed" );
 #endif /* POLARSSL_MD_C */
 
-#if defined(POLARSSL_PEM_C)
+#if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C)
         if( use_ret == -(POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT) )
             snprintf( buf, buflen, "PEM - No PEM header or footer found" );
         if( use_ret == -(POLARSSL_ERR_PEM_INVALID_DATA) )
@@ -222,7 +290,38 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "PEM - Unavailable feature, e.g. hashing/encryption combination" );
         if( use_ret == -(POLARSSL_ERR_PEM_BAD_INPUT_DATA) )
             snprintf( buf, buflen, "PEM - Bad input parameters to function" );
-#endif /* POLARSSL_PEM_C */
+#endif /* POLARSSL_PEM_PARSE_C || POLARSSL_PEM_WRITE_C */
+
+#if defined(POLARSSL_PK_C)
+        if( use_ret == -(POLARSSL_ERR_PK_MALLOC_FAILED) )
+            snprintf( buf, buflen, "PK - Memory alloation failed" );
+        if( use_ret == -(POLARSSL_ERR_PK_TYPE_MISMATCH) )
+            snprintf( buf, buflen, "PK - Type mismatch, eg attempt to encrypt with an ECDSA key" );
+        if( use_ret == -(POLARSSL_ERR_PK_BAD_INPUT_DATA) )
+            snprintf( buf, buflen, "PK - Bad input parameters to function" );
+        if( use_ret == -(POLARSSL_ERR_PK_FILE_IO_ERROR) )
+            snprintf( buf, buflen, "PK - Read/write of file failed" );
+        if( use_ret == -(POLARSSL_ERR_PK_KEY_INVALID_VERSION) )
+            snprintf( buf, buflen, "PK - Unsupported key version" );
+        if( use_ret == -(POLARSSL_ERR_PK_KEY_INVALID_FORMAT) )
+            snprintf( buf, buflen, "PK - Invalid key tag or value" );
+        if( use_ret == -(POLARSSL_ERR_PK_UNKNOWN_PK_ALG) )
+            snprintf( buf, buflen, "PK - Key algorithm is unsupported (only RSA and EC are supported)" );
+        if( use_ret == -(POLARSSL_ERR_PK_PASSWORD_REQUIRED) )
+            snprintf( buf, buflen, "PK - Private key password can't be empty" );
+        if( use_ret == -(POLARSSL_ERR_PK_PASSWORD_MISMATCH) )
+            snprintf( buf, buflen, "PK - Given private key password does not allow for correct decryption" );
+        if( use_ret == -(POLARSSL_ERR_PK_INVALID_PUBKEY) )
+            snprintf( buf, buflen, "PK - The pubkey tag or value is invalid (only RSA and EC are supported)" );
+        if( use_ret == -(POLARSSL_ERR_PK_INVALID_ALG) )
+            snprintf( buf, buflen, "PK - The algorithm tag or value is invalid" );
+        if( use_ret == -(POLARSSL_ERR_PK_UNKNOWN_NAMED_CURVE) )
+            snprintf( buf, buflen, "PK - Elliptic curve is unsupported (only NIST curves are supported)" );
+        if( use_ret == -(POLARSSL_ERR_PK_FEATURE_UNAVAILABLE) )
+            snprintf( buf, buflen, "PK - Unavailable feature, e.g. RSA disabled for RSA key" );
+        if( use_ret == -(POLARSSL_ERR_PK_SIG_LEN_MISMATCH) )
+            snprintf( buf, buflen, "PK - The signature is valid but its length is less than expected" );
+#endif /* POLARSSL_PK_C */
 
 #if defined(POLARSSL_PKCS12_C)
         if( use_ret == -(POLARSSL_ERR_PKCS12_BAD_INPUT_DATA) )
@@ -282,8 +381,8 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "SSL - An unknown cipher was received" );
         if( use_ret == -(POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN) )
             snprintf( buf, buflen, "SSL - The server has no ciphersuites in common with the client" );
-        if( use_ret == -(POLARSSL_ERR_SSL_NO_SESSION_FOUND) )
-            snprintf( buf, buflen, "SSL - No session to recover was found" );
+        if( use_ret == -(POLARSSL_ERR_SSL_NO_RNG) )
+            snprintf( buf, buflen, "SSL - No RNG was provided to the SSL module" );
         if( use_ret == -(POLARSSL_ERR_SSL_NO_CLIENT_CERTIFICATE) )
             snprintf( buf, buflen, "SSL - No client certification received from the client, but required by the authentication mode" );
         if( use_ret == -(POLARSSL_ERR_SSL_CERTIFICATE_TOO_LARGE) )
@@ -291,7 +390,7 @@ void error_strerror( int ret, char *buf, size_t buflen )
         if( use_ret == -(POLARSSL_ERR_SSL_CERTIFICATE_REQUIRED) )
             snprintf( buf, buflen, "SSL - The own certificate is not set, but needed by the server" );
         if( use_ret == -(POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED) )
-            snprintf( buf, buflen, "SSL - The own private key is not set, but needed" );
+            snprintf( buf, buflen, "SSL - The own private key or pre-shared key is not set, but needed" );
         if( use_ret == -(POLARSSL_ERR_SSL_CA_CHAIN_REQUIRED) )
             snprintf( buf, buflen, "SSL - No CA Chain is set, but required to operate" );
         if( use_ret == -(POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE) )
@@ -319,10 +418,10 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "SSL - Processing of the ServerHelloDone handshake message failed" );
         if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE) )
             snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed" );
-        if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_RP) )
-            snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM Read Public" );
-        if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_CS) )
-            snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM Calculate Secret" );
+        if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP) )
+            snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public" );
+        if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS) )
+            snprintf( buf, buflen, "SSL - Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret" );
         if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY) )
             snprintf( buf, buflen, "SSL - Processing of the CertificateVerify handshake message failed" );
         if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC) )
@@ -339,58 +438,59 @@ void error_strerror( int ret, char *buf, size_t buflen )
             snprintf( buf, buflen, "SSL - Processing of the compression / decompression failed" );
         if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_PROTOCOL_VERSION) )
             snprintf( buf, buflen, "SSL - Handshake protocol not within min/max boundaries" );
+        if( use_ret == -(POLARSSL_ERR_SSL_BAD_HS_NEW_SESSION_TICKET) )
+            snprintf( buf, buflen, "SSL - Processing of the NewSessionTicket handshake message failed" );
+        if( use_ret == -(POLARSSL_ERR_SSL_SESSION_TICKET_EXPIRED) )
+            snprintf( buf, buflen, "SSL - Session ticket has expired" );
+        if( use_ret == -(POLARSSL_ERR_SSL_PK_TYPE_MISMATCH) )
+            snprintf( buf, buflen, "SSL - Public key type mismatch (eg, asked for RSA key exchange and presented EC key)" );
+        if( use_ret == -(POLARSSL_ERR_SSL_UNKNOWN_IDENTITY) )
+            snprintf( buf, buflen, "SSL - Unknown identity received (eg, PSK identity)" );
+        if( use_ret == -(POLARSSL_ERR_SSL_INTERNAL_ERROR) )
+            snprintf( buf, buflen, "SSL - Internal error (eg, unexpected failure in lower-level module)" );
+        if( use_ret == -(POLARSSL_ERR_SSL_COUNTER_WRAPPING) )
+            snprintf( buf, buflen, "SSL - A counter would wrap (eg, too many messages exchanged)" );
 #endif /* POLARSSL_SSL_TLS_C */
 
-#if defined(POLARSSL_X509_PARSE_C)
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
         if( use_ret == -(POLARSSL_ERR_X509_FEATURE_UNAVAILABLE) )
             snprintf( buf, buflen, "X509 - Unavailable feature, e.g. RSA hashing/encryption combination" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_PEM) )
-            snprintf( buf, buflen, "X509 - The PEM-encoded certificate contains invalid elements, e.g. invalid character" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_FORMAT) )
-            snprintf( buf, buflen, "X509 - The certificate format is invalid, e.g. different type expected" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_VERSION) )
-            snprintf( buf, buflen, "X509 - The certificate version element is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_SERIAL) )
+        if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_OID) )
+            snprintf( buf, buflen, "X509 - Requested OID is unknown" );
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_FORMAT) )
+            snprintf( buf, buflen, "X509 - The CRT/CRL/CSR format is invalid, e.g. different type expected" );
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_VERSION) )
+            snprintf( buf, buflen, "X509 - The CRT/CRL/CSR version element is invalid" );
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_SERIAL) )
             snprintf( buf, buflen, "X509 - The serial tag or value is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_ALG) )
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_ALG) )
             snprintf( buf, buflen, "X509 - The algorithm tag or value is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_NAME) )
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_NAME) )
             snprintf( buf, buflen, "X509 - The name tag or value is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_DATE) )
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_DATE) )
             snprintf( buf, buflen, "X509 - The date tag or value is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_PUBKEY) )
-            snprintf( buf, buflen, "X509 - The pubkey tag or value is invalid (only RSA is supported)" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE) )
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_SIGNATURE) )
             snprintf( buf, buflen, "X509 - The signature tag or value invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS) )
+        if( use_ret == -(POLARSSL_ERR_X509_INVALID_EXTENSIONS) )
             snprintf( buf, buflen, "X509 - The extension tag or value is invalid" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION) )
-            snprintf( buf, buflen, "X509 - Certificate or CRL has an unsupported version number" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG) )
+        if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_VERSION) )
+            snprintf( buf, buflen, "X509 - CRT/CRL/CSR has an unsupported version number" );
+        if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_SIG_ALG) )
             snprintf( buf, buflen, "X509 - Signature algorithm (oid) is unsupported" );
-        if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_PK_ALG) )
-            snprintf( buf, buflen, "X509 - Key algorithm is unsupported (only RSA is supported)" );
-        if( use_ret == -(POLARSSL_ERR_X509_CERT_SIG_MISMATCH) )
-            snprintf( buf, buflen, "X509 - Certificate signature algorithms do not match. (see \\c ::x509_cert sig_oid)" );
+        if( use_ret == -(POLARSSL_ERR_X509_SIG_MISMATCH) )
+            snprintf( buf, buflen, "X509 - Signature algorithms do not match. (see \\c ::x509_crt sig_oid)" );
         if( use_ret == -(POLARSSL_ERR_X509_CERT_VERIFY_FAILED) )
             snprintf( buf, buflen, "X509 - Certificate verification failed, e.g. CRL, CA or signature check failed" );
-        if( use_ret == -(POLARSSL_ERR_X509_KEY_INVALID_VERSION) )
-            snprintf( buf, buflen, "X509 - Unsupported RSA key version" );
-        if( use_ret == -(POLARSSL_ERR_X509_KEY_INVALID_FORMAT) )
-            snprintf( buf, buflen, "X509 - Invalid RSA key tag or value" );
         if( use_ret == -(POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT) )
             snprintf( buf, buflen, "X509 - Format not recognized as DER or PEM" );
-        if( use_ret == -(POLARSSL_ERR_X509_INVALID_INPUT) )
+        if( use_ret == -(POLARSSL_ERR_X509_BAD_INPUT_DATA) )
             snprintf( buf, buflen, "X509 - Input invalid" );
         if( use_ret == -(POLARSSL_ERR_X509_MALLOC_FAILED) )
             snprintf( buf, buflen, "X509 - Allocation of memory failed" );
         if( use_ret == -(POLARSSL_ERR_X509_FILE_IO_ERROR) )
             snprintf( buf, buflen, "X509 - Read/write of file failed" );
-        if( use_ret == -(POLARSSL_ERR_X509_PASSWORD_REQUIRED) )
-            snprintf( buf, buflen, "X509 - Private key password can't be empty" );
-        if( use_ret == -(POLARSSL_ERR_X509_PASSWORD_MISMATCH) )
-            snprintf( buf, buflen, "X509 - Given private key password does not allow for correct decryption" );
-#endif /* POLARSSL_X509_PARSE_C */
+#endif /* POLARSSL_X509_USE,X509_CREATE_C */
+        // END generated code
 
         if( strlen( buf ) == 0 )
             snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
@@ -419,6 +519,7 @@ void error_strerror( int ret, char *buf, size_t buflen )
 
     // Low level error codes
     //
+    // BEGIN generated code
 #if defined(POLARSSL_AES_C)
     if( use_ret == -(POLARSSL_ERR_AES_INVALID_KEY_LENGTH) )
         snprintf( buf, buflen, "AES - Invalid key length" );
@@ -483,6 +584,13 @@ void error_strerror( int ret, char *buf, size_t buflen )
         snprintf( buf, buflen, "CAMELLIA - Invalid data input length" );
 #endif /* POLARSSL_CAMELLIA_C */
 
+#if defined(POLARSSL_CCM_C)
+    if( use_ret == -(POLARSSL_ERR_CCM_BAD_INPUT) )
+        snprintf( buf, buflen, "CCM - Bad input parameters to function" );
+    if( use_ret == -(POLARSSL_ERR_CCM_AUTH_FAILED) )
+        snprintf( buf, buflen, "CCM - Authenticated decryption failed" );
+#endif /* POLARSSL_CCM_C */
+
 #if defined(POLARSSL_CTR_DRBG_C)
     if( use_ret == -(POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED) )
         snprintf( buf, buflen, "CTR_DRBG - The entropy source failed" );
@@ -506,6 +614,8 @@ void error_strerror( int ret, char *buf, size_t buflen )
         snprintf( buf, buflen, "ENTROPY - No more sources can be added" );
     if( use_ret == -(POLARSSL_ERR_ENTROPY_NO_SOURCES_DEFINED) )
         snprintf( buf, buflen, "ENTROPY - No sources have been added to poll" );
+    if( use_ret == -(POLARSSL_ERR_ENTROPY_FILE_IO_ERROR) )
+        snprintf( buf, buflen, "ENTROPY - Read/write error in file" );
 #endif /* POLARSSL_ENTROPY_C */
 
 #if defined(POLARSSL_GCM_C)
@@ -515,6 +625,17 @@ void error_strerror( int ret, char *buf, size_t buflen )
         snprintf( buf, buflen, "GCM - Bad input parameters to function" );
 #endif /* POLARSSL_GCM_C */
 
+#if defined(POLARSSL_HMAC_DRBG_C)
+    if( use_ret == -(POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG) )
+        snprintf( buf, buflen, "HMAC_DRBG - Too many random requested in single call" );
+    if( use_ret == -(POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG) )
+        snprintf( buf, buflen, "HMAC_DRBG - Input too large (Entropy + additional)" );
+    if( use_ret == -(POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR) )
+        snprintf( buf, buflen, "HMAC_DRBG - Read/write error in file" );
+    if( use_ret == -(POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED) )
+        snprintf( buf, buflen, "HMAC_DRBG - The entropy source failed" );
+#endif /* POLARSSL_HMAC_DRBG_C */
+
 #if defined(POLARSSL_MD2_C)
     if( use_ret == -(POLARSSL_ERR_MD2_FILE_IO_ERROR) )
         snprintf( buf, buflen, "MD2 - Read/write error in file" );
@@ -555,6 +676,13 @@ void error_strerror( int ret, char *buf, size_t buflen )
         snprintf( buf, buflen, "NET - Connection requires a write call" );
 #endif /* POLARSSL_NET_C */
 
+#if defined(POLARSSL_OID_C)
+    if( use_ret == -(POLARSSL_ERR_OID_NOT_FOUND) )
+        snprintf( buf, buflen, "OID - OID is not found" );
+    if( use_ret == -(POLARSSL_ERR_OID_BUF_TOO_SMALL) )
+        snprintf( buf, buflen, "OID - output buffer is too small" );
+#endif /* POLARSSL_OID_C */
+
 #if defined(POLARSSL_PADLOCK_C)
     if( use_ret == -(POLARSSL_ERR_PADLOCK_DATA_MISALIGNED) )
         snprintf( buf, buflen, "PADLOCK - Input data should be aligned" );
@@ -565,25 +693,40 @@ void error_strerror( int ret, char *buf, size_t buflen )
         snprintf( buf, buflen, "PBKDF2 - Bad input parameters to function" );
 #endif /* POLARSSL_PBKDF2_C */
 
+#if defined(POLARSSL_RIPEMD160_C)
+    if( use_ret == -(POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR) )
+        snprintf( buf, buflen, "RIPEMD160 - Read/write error in file" );
+#endif /* POLARSSL_RIPEMD160_C */
+
 #if defined(POLARSSL_SHA1_C)
     if( use_ret == -(POLARSSL_ERR_SHA1_FILE_IO_ERROR) )
         snprintf( buf, buflen, "SHA1 - Read/write error in file" );
 #endif /* POLARSSL_SHA1_C */
 
-#if defined(POLARSSL_SHA2_C)
-    if( use_ret == -(POLARSSL_ERR_SHA2_FILE_IO_ERROR) )
-        snprintf( buf, buflen, "SHA2 - Read/write error in file" );
-#endif /* POLARSSL_SHA2_C */
+#if defined(POLARSSL_SHA256_C)
+    if( use_ret == -(POLARSSL_ERR_SHA256_FILE_IO_ERROR) )
+        snprintf( buf, buflen, "SHA256 - Read/write error in file" );
+#endif /* POLARSSL_SHA256_C */
 
-#if defined(POLARSSL_SHA4_C)
-    if( use_ret == -(POLARSSL_ERR_SHA4_FILE_IO_ERROR) )
-        snprintf( buf, buflen, "SHA4 - Read/write error in file" );
-#endif /* POLARSSL_SHA4_C */
+#if defined(POLARSSL_SHA512_C)
+    if( use_ret == -(POLARSSL_ERR_SHA512_FILE_IO_ERROR) )
+        snprintf( buf, buflen, "SHA512 - Read/write error in file" );
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_THREADING_C)
+    if( use_ret == -(POLARSSL_ERR_THREADING_FEATURE_UNAVAILABLE) )
+        snprintf( buf, buflen, "THREADING - The selected feature is not available" );
+    if( use_ret == -(POLARSSL_ERR_THREADING_BAD_INPUT_DATA) )
+        snprintf( buf, buflen, "THREADING - Bad input parameters to function" );
+    if( use_ret == -(POLARSSL_ERR_THREADING_MUTEX_ERROR) )
+        snprintf( buf, buflen, "THREADING - Locking / unlocking / free failed with error code" );
+#endif /* POLARSSL_THREADING_C */
 
 #if defined(POLARSSL_XTEA_C)
     if( use_ret == -(POLARSSL_ERR_XTEA_INVALID_INPUT_LENGTH) )
         snprintf( buf, buflen, "XTEA - The data input has an invalid length" );
 #endif /* POLARSSL_XTEA_C */
+    // END generated code
 
     if( strlen( buf ) != 0 )
         return;
@@ -591,6 +734,13 @@ void error_strerror( int ret, char *buf, size_t buflen )
     snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
 }
 
+#if defined(POLARSSL_ERROR_STRERROR_BC)
+void error_strerror( int ret, char *buf, size_t buflen )
+{
+    polarssl_strerror( ret, buf, buflen );
+}
+#endif /* POLARSSL_ERROR_STRERROR_BC */
+
 #else /* POLARSSL_ERROR_C */
 
 #if defined(POLARSSL_ERROR_STRERROR_DUMMY)
@@ -600,7 +750,7 @@ void error_strerror( int ret, char *buf, size_t buflen )
 /*
  * Provide an non-function in case POLARSSL_ERROR_C is not defined
  */
-void error_strerror( int ret, char *buf, size_t buflen )
+void polarssl_strerror( int ret, char *buf, size_t buflen )
 {
     ((void) ret);
 
@@ -608,5 +758,12 @@ void error_strerror( int ret, char *buf, size_t buflen )
         buf[0] = '\0';
 }
 
+#if defined(POLARSSL_ERROR_STRERROR_BC)
+void error_strerror( int ret, char *buf, size_t buflen )
+{
+    polarssl_strerror( ret, buf, buflen );
+}
+#endif /* POLARSSL_ERROR_STRERROR_BC */
 #endif /* POLARSSL_ERROR_STRERROR_DUMMY */
+
 #endif /* POLARSSL_ERROR_C */
diff --git a/Externals/polarssl/library/gcm.c b/Externals/polarssl/library/gcm.c
index 60dc0cd0a4..77b1e0fb68 100644
--- a/Externals/polarssl/library/gcm.c
+++ b/Externals/polarssl/library/gcm.c
@@ -1,7 +1,7 @@
 /*
  *  NIST SP800-38D compliant GCM implementation
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -22,15 +22,37 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 /*
- *  http://csrc.nist.gov/publications/nistpubs/800-38D/SP-800-38D.pdf
+ * http://csrc.nist.gov/publications/nistpubs/800-38D/SP-800-38D.pdf
+ *
+ * See also:
+ * [MGV] http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-revised-spec.pdf
+ *
+ * We use the algorithm described as Shoup's method with 4-bit tables in
+ * [MGV] 4.1, pp. 12-13, to enhance speed without using too much memory.
  */
+
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_GCM_C)
 
 #include "polarssl/gcm.h"
 
+#if defined(POLARSSL_AESNI_C)
+#include "polarssl/aesni.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 /*
  * 32-bit integer manipulation macros (big endian)
  */
@@ -54,19 +76,32 @@
 }
 #endif
 
-static void gcm_gen_table( gcm_context *ctx )
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ * Precompute small multiples of H, that is set
+ *      HH[i] || HL[i] = H times i,
+ * where i is seen as a field element as in [MGV], ie high-order bits
+ * correspond to low powers of P. The result is stored in the same way, that
+ * is the high-order bit of HH corresponds to P^0 and the low-order bit of HL
+ * corresponds to P^127.
+ */
+static int gcm_gen_table( gcm_context *ctx )
 {
-    int i, j;
+    int ret, i, j;
     uint64_t hi, lo;
     uint64_t vl, vh;
     unsigned char h[16];
-    
+    size_t olen = 0;
+
     memset( h, 0, 16 );
-    aes_crypt_ecb( &ctx->aes_ctx, AES_ENCRYPT, h, h );
-
-    ctx->HH[0] = 0;
-    ctx->HL[0] = 0;
+    if( ( ret = cipher_update( &ctx->cipher_ctx, h, 16, h, &olen ) ) != 0 )
+        return( ret );
 
+    /* pack h as two 64-bits ints, big-endian */
     GET_UINT32_BE( hi, h,  0  );
     GET_UINT32_BE( lo, h,  4  );
     vh = (uint64_t) hi << 32 | lo;
@@ -74,10 +109,21 @@ static void gcm_gen_table( gcm_context *ctx )
     GET_UINT32_BE( hi, h,  8  );
     GET_UINT32_BE( lo, h,  12 );
     vl = (uint64_t) hi << 32 | lo;
-    
+
+    /* 8 = 1000 corresponds to 1 in GF(2^128) */
     ctx->HL[8] = vl;
     ctx->HH[8] = vh;
 
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    /* With CLMUL support, we need only h, not the rest of the table */
+    if( aesni_supports( POLARSSL_AESNI_CLMUL ) )
+        return( 0 );
+#endif
+
+    /* 0 corresponds to 0 in GF(2^128) */
+    ctx->HH[0] = 0;
+    ctx->HL[0] = 0;
+
     for( i = 4; i > 0; i >>= 1 )
     {
         uint32_t T = ( vl & 1 ) * 0xe1000000U;
@@ -88,7 +134,7 @@ static void gcm_gen_table( gcm_context *ctx )
         ctx->HH[i] = vh;
     }
 
-    for (i = 2; i < 16; i <<= 1 )
+    for( i = 2; i < 16; i <<= 1 )
     {
         uint64_t *HiL = ctx->HL + i, *HiH = ctx->HH + i;
         vh = *HiH;
@@ -99,23 +145,47 @@ static void gcm_gen_table( gcm_context *ctx )
             HiL[j] = vl ^ ctx->HL[j];
         }
     }
-    
-}
-
-int gcm_init( gcm_context *ctx, const unsigned char *key, unsigned int keysize )
-{
-    int ret;
-
-    memset( ctx, 0, sizeof(gcm_context) );
-
-    if( ( ret = aes_setkey_enc( &ctx->aes_ctx, key, keysize ) ) != 0 )
-        return( ret );
-
-    gcm_gen_table( ctx );
 
     return( 0 );
 }
 
+int gcm_init( gcm_context *ctx, cipher_id_t cipher, const unsigned char *key,
+              unsigned int keysize )
+{
+    int ret;
+    const cipher_info_t *cipher_info;
+
+    memset( ctx, 0, sizeof(gcm_context) );
+
+    cipher_init( &ctx->cipher_ctx );
+
+    cipher_info = cipher_info_from_values( cipher, keysize, POLARSSL_MODE_ECB );
+    if( cipher_info == NULL )
+        return( POLARSSL_ERR_GCM_BAD_INPUT );
+
+    if( cipher_info->block_size != 16 )
+        return( POLARSSL_ERR_GCM_BAD_INPUT );
+
+    if( ( ret = cipher_init_ctx( &ctx->cipher_ctx, cipher_info ) ) != 0 )
+        return( ret );
+
+    if( ( ret = cipher_setkey( &ctx->cipher_ctx, key, keysize,
+                               POLARSSL_ENCRYPT ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = gcm_gen_table( ctx ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+/*
+ * Shoup's method for multiplication use this table with
+ *      last4[x] = x times P^128
+ * where x and last4[x] are seen as elements of GF(2^128) as in [MGV]
+ */
 static const uint64_t last4[16] =
 {
     0x0000, 0x1c20, 0x3840, 0x2460,
@@ -124,14 +194,30 @@ static const uint64_t last4[16] =
     0x9180, 0x8da0, 0xa9c0, 0xb5e0
 };
 
-void gcm_mult( gcm_context *ctx, const unsigned char x[16], unsigned char output[16] )
+/*
+ * Sets output to x times H using the precomputed tables.
+ * x and output are seen as elements of GF(2^128) as in [MGV].
+ */
+static void gcm_mult( gcm_context *ctx, const unsigned char x[16],
+                      unsigned char output[16] )
 {
     int i = 0;
-    unsigned char z[16];
     unsigned char lo, hi, rem;
     uint64_t zh, zl;
 
-    memset( z, 0x00, 16 );
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    if( aesni_supports( POLARSSL_AESNI_CLMUL ) ) {
+        unsigned char h[16];
+
+        PUT_UINT32_BE( ctx->HH[8] >> 32, h,  0 );
+        PUT_UINT32_BE( ctx->HH[8],       h,  4 );
+        PUT_UINT32_BE( ctx->HL[8] >> 32, h,  8 );
+        PUT_UINT32_BE( ctx->HL[8],       h, 12 );
+
+        aesni_gcm_mult( output, x, h );
+        return;
+    }
+#endif /* POLARSSL_AESNI_C && POLARSSL_HAVE_X86_64 */
 
     lo = x[15] & 0xf;
     hi = x[15] >> 4;
@@ -169,44 +255,37 @@ void gcm_mult( gcm_context *ctx, const unsigned char x[16], unsigned char output
     PUT_UINT32_BE( zl, output, 12 );
 }
 
-int gcm_crypt_and_tag( gcm_context *ctx,
-                       int mode,
-                       size_t length,
-                       const unsigned char *iv,
-                       size_t iv_len,
-                       const unsigned char *add,
-                       size_t add_len,
-                       const unsigned char *input,
-                       unsigned char *output,
-                       size_t tag_len,
-                       unsigned char *tag )
+int gcm_starts( gcm_context *ctx,
+                int mode,
+                const unsigned char *iv,
+                size_t iv_len,
+                const unsigned char *add,
+                size_t add_len )
 {
-    unsigned char y[16];
-    unsigned char ectr[16];
-    unsigned char buf[16];
+    int ret;
     unsigned char work_buf[16];
     size_t i;
     const unsigned char *p;
-    unsigned char *out_p = output;
-    size_t use_len;
-    uint64_t orig_len = length * 8;
-    uint64_t orig_add_len = add_len * 8;
+    size_t use_len, olen = 0;
 
-    memset( y, 0x00, 16 );
-    memset( work_buf, 0x00, 16 );
-    memset( tag, 0x00, tag_len );
-    memset( buf, 0x00, 16 );
-
-    if( ( mode == GCM_DECRYPT && output <= input && ( input - output ) < 8 ) ||
-        ( output > input && (size_t) ( output - input ) < length ) )
+    /* IV and AD are limited to 2^64 bits, so 2^61 bytes */
+    if( ( (uint64_t) iv_len  ) >> 61 != 0 ||
+        ( (uint64_t) add_len ) >> 61 != 0 )
     {
         return( POLARSSL_ERR_GCM_BAD_INPUT );
     }
 
+    memset( ctx->y, 0x00, sizeof(ctx->y) );
+    memset( ctx->buf, 0x00, sizeof(ctx->buf) );
+
+    ctx->mode = mode;
+    ctx->len = 0;
+    ctx->add_len = 0;
+
     if( iv_len == 12 )
     {
-        memcpy( y, iv, iv_len );
-        y[15] = 1;
+        memcpy( ctx->y, iv, iv_len );
+        ctx->y[15] = 1;
     }
     else
     {
@@ -219,64 +298,118 @@ int gcm_crypt_and_tag( gcm_context *ctx,
             use_len = ( iv_len < 16 ) ? iv_len : 16;
 
             for( i = 0; i < use_len; i++ )
-                y[i] ^= p[i];
-        
-            gcm_mult( ctx, y, y );
+                ctx->y[i] ^= p[i];
+
+            gcm_mult( ctx, ctx->y, ctx->y );
 
             iv_len -= use_len;
             p += use_len;
         }
 
         for( i = 0; i < 16; i++ )
-            y[i] ^= work_buf[i];
+            ctx->y[i] ^= work_buf[i];
 
-        gcm_mult( ctx, y, y );
+        gcm_mult( ctx, ctx->y, ctx->y );
     }
 
-    aes_crypt_ecb( &ctx->aes_ctx, AES_ENCRYPT, y, ectr );
-    memcpy( tag, ectr, tag_len );
+    if( ( ret = cipher_update( &ctx->cipher_ctx, ctx->y, 16, ctx->base_ectr,
+                             &olen ) ) != 0 )
+    {
+        return( ret );
+    }
 
+    ctx->add_len = add_len;
     p = add;
     while( add_len > 0 )
     {
         use_len = ( add_len < 16 ) ? add_len : 16;
 
         for( i = 0; i < use_len; i++ )
-            buf[i] ^= p[i];
-        
-        gcm_mult( ctx, buf, buf );
+            ctx->buf[i] ^= p[i];
+
+        gcm_mult( ctx, ctx->buf, ctx->buf );
 
         add_len -= use_len;
         p += use_len;
     }
 
+    return( 0 );
+}
+
+int gcm_update( gcm_context *ctx,
+                size_t length,
+                const unsigned char *input,
+                unsigned char *output )
+{
+    int ret;
+    unsigned char ectr[16];
+    size_t i;
+    const unsigned char *p;
+    unsigned char *out_p = output;
+    size_t use_len, olen = 0;
+
+    if( output > input && (size_t) ( output - input ) < length )
+        return( POLARSSL_ERR_GCM_BAD_INPUT );
+
+    /* Total length is restricted to 2^39 - 256 bits, ie 2^36 - 2^5 bytes
+     * Also check for possible overflow */
+    if( ctx->len + length < ctx->len ||
+        (uint64_t) ctx->len + length > 0x03FFFFE0llu )
+    {
+        return( POLARSSL_ERR_GCM_BAD_INPUT );
+    }
+
+    ctx->len += length;
+
     p = input;
     while( length > 0 )
     {
         use_len = ( length < 16 ) ? length : 16;
 
         for( i = 16; i > 12; i-- )
-            if( ++y[i - 1] != 0 )
+            if( ++ctx->y[i - 1] != 0 )
                 break;
 
-        aes_crypt_ecb( &ctx->aes_ctx, AES_ENCRYPT, y, ectr );
+        if( ( ret = cipher_update( &ctx->cipher_ctx, ctx->y, 16, ectr,
+                                   &olen ) ) != 0 )
+        {
+            return( ret );
+        }
 
         for( i = 0; i < use_len; i++ )
         {
+            if( ctx->mode == GCM_DECRYPT )
+                ctx->buf[i] ^= p[i];
             out_p[i] = ectr[i] ^ p[i];
-            if( mode == GCM_ENCRYPT )
-                buf[i] ^= out_p[i];
-            else
-                buf[i] ^= p[i];
+            if( ctx->mode == GCM_ENCRYPT )
+                ctx->buf[i] ^= out_p[i];
         }
-        
-        gcm_mult( ctx, buf, buf );
-        
+
+        gcm_mult( ctx, ctx->buf, ctx->buf );
+
         length -= use_len;
         p += use_len;
         out_p += use_len;
     }
 
+    return( 0 );
+}
+
+int gcm_finish( gcm_context *ctx,
+                unsigned char *tag,
+                size_t tag_len )
+{
+    unsigned char work_buf[16];
+    size_t i;
+    uint64_t orig_len = ctx->len * 8;
+    uint64_t orig_add_len = ctx->add_len * 8;
+
+    if( tag_len > 16 || tag_len < 4 )
+        return( POLARSSL_ERR_GCM_BAD_INPUT );
+
+    if( tag_len != 0 )
+        memcpy( tag, ctx->base_ectr, tag_len );
+
     if( orig_len || orig_add_len )
     {
         memset( work_buf, 0x00, 16 );
@@ -287,46 +420,91 @@ int gcm_crypt_and_tag( gcm_context *ctx,
         PUT_UINT32_BE( ( orig_len           ), work_buf, 12 );
 
         for( i = 0; i < 16; i++ )
-            buf[i] ^= work_buf[i];
+            ctx->buf[i] ^= work_buf[i];
 
-        gcm_mult( ctx, buf, buf );
+        gcm_mult( ctx, ctx->buf, ctx->buf );
 
         for( i = 0; i < tag_len; i++ )
-            tag[i] ^= buf[i];
+            tag[i] ^= ctx->buf[i];
     }
 
     return( 0 );
 }
 
+int gcm_crypt_and_tag( gcm_context *ctx,
+                       int mode,
+                       size_t length,
+                       const unsigned char *iv,
+                       size_t iv_len,
+                       const unsigned char *add,
+                       size_t add_len,
+                       const unsigned char *input,
+                       unsigned char *output,
+                       size_t tag_len,
+                       unsigned char *tag )
+{
+    int ret;
+
+    if( ( ret = gcm_starts( ctx, mode, iv, iv_len, add, add_len ) ) != 0 )
+        return( ret );
+
+    if( ( ret = gcm_update( ctx, length, input, output ) ) != 0 )
+        return( ret );
+
+    if( ( ret = gcm_finish( ctx, tag, tag_len ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
 int gcm_auth_decrypt( gcm_context *ctx,
                       size_t length,
                       const unsigned char *iv,
                       size_t iv_len,
                       const unsigned char *add,
                       size_t add_len,
-                      const unsigned char *tag, 
+                      const unsigned char *tag,
                       size_t tag_len,
                       const unsigned char *input,
                       unsigned char *output )
 {
+    int ret;
     unsigned char check_tag[16];
+    size_t i;
+    int diff;
 
-    gcm_crypt_and_tag( ctx, GCM_DECRYPT, length, iv, iv_len, add, add_len, input, output, tag_len, check_tag );
+    if( ( ret = gcm_crypt_and_tag( ctx, GCM_DECRYPT, length,
+                                   iv, iv_len, add, add_len,
+                                   input, output, tag_len, check_tag ) ) != 0 )
+    {
+        return( ret );
+    }
 
-    if( memcmp( check_tag, tag, tag_len ) == 0 )
-        return( 0 );
+    /* Check tag in "constant-time" */
+    for( diff = 0, i = 0; i < tag_len; i++ )
+        diff |= tag[i] ^ check_tag[i];
 
-    memset( output, 0, length );
+    if( diff != 0 )
+    {
+        polarssl_zeroize( output, length );
+        return( POLARSSL_ERR_GCM_AUTH_FAILED );
+    }
 
-    return( POLARSSL_ERR_GCM_AUTH_FAILED );
+    return( 0 );
 }
 
-#if defined(POLARSSL_SELF_TEST)
+void gcm_free( gcm_context *ctx )
+{
+    cipher_free( &ctx->cipher_ctx );
+    polarssl_zeroize( ctx, sizeof( gcm_context ) );
+}
+
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
 
 #include <stdio.h>
 
 /*
- * GCM test vectors from:
+ * AES-GCM test vectors from:
  *
  * http://csrc.nist.gov/groups/STM/cavp/documents/mac/gcmtestvectors.zip
  */
@@ -344,7 +522,7 @@ unsigned char key[MAX_TESTS][32] =
     { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
       0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
       0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-      0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08 },  
+      0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08 },
 };
 
 size_t iv_len[MAX_TESTS] =
@@ -360,13 +538,13 @@ unsigned char iv[MAX_TESTS][64] =
     { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
       0xde, 0xca, 0xf8, 0x88 },
     { 0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
-      0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa, 
+      0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
       0x6a, 0x7a, 0x95, 0x38, 0x53, 0x4f, 0x7d, 0xa1,
-      0xe4, 0xc3, 0x03, 0xd2, 0xa3, 0x18, 0xa7, 0x28, 
+      0xe4, 0xc3, 0x03, 0xd2, 0xa3, 0x18, 0xa7, 0x28,
       0xc3, 0xc0, 0xc9, 0x51, 0x56, 0x80, 0x95, 0x39,
-      0xfc, 0xf0, 0xe2, 0x42, 0x9a, 0x6b, 0x52, 0x54, 
+      0xfc, 0xf0, 0xe2, 0x42, 0x9a, 0x6b, 0x52, 0x54,
       0x16, 0xae, 0xdb, 0xf5, 0xa0, 0xde, 0x6a, 0x57,
-      0xa6, 0x37, 0xb3, 0x9b }, 
+      0xa6, 0x37, 0xb3, 0x9b },
 };
 
 size_t add_len[MAX_TESTS] =
@@ -379,7 +557,7 @@ unsigned char additional[MAX_TESTS][64] =
 {
     { 0x00 },
     { 0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-      0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef, 
+      0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
       0xab, 0xad, 0xda, 0xd2 },
 };
 
@@ -409,107 +587,107 @@ unsigned char ct[MAX_TESTS * 3][64] =
     { 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92,
       0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78 },
     { 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24,
-      0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c, 
+      0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c,
       0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0,
-      0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e, 
+      0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e,
       0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c,
-      0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05, 
+      0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05,
       0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97,
       0x3d, 0x58, 0xe0, 0x91, 0x47, 0x3f, 0x59, 0x85 },
     { 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24,
-      0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c, 
+      0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c,
       0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0,
-      0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e, 
+      0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e,
       0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c,
-      0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05, 
+      0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05,
       0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97,
       0x3d, 0x58, 0xe0, 0x91 },
     { 0x61, 0x35, 0x3b, 0x4c, 0x28, 0x06, 0x93, 0x4a,
-      0x77, 0x7f, 0xf5, 0x1f, 0xa2, 0x2a, 0x47, 0x55, 
+      0x77, 0x7f, 0xf5, 0x1f, 0xa2, 0x2a, 0x47, 0x55,
       0x69, 0x9b, 0x2a, 0x71, 0x4f, 0xcd, 0xc6, 0xf8,
-      0x37, 0x66, 0xe5, 0xf9, 0x7b, 0x6c, 0x74, 0x23, 
+      0x37, 0x66, 0xe5, 0xf9, 0x7b, 0x6c, 0x74, 0x23,
       0x73, 0x80, 0x69, 0x00, 0xe4, 0x9f, 0x24, 0xb2,
-      0x2b, 0x09, 0x75, 0x44, 0xd4, 0x89, 0x6b, 0x42, 
+      0x2b, 0x09, 0x75, 0x44, 0xd4, 0x89, 0x6b, 0x42,
       0x49, 0x89, 0xb5, 0xe1, 0xeb, 0xac, 0x0f, 0x07,
       0xc2, 0x3f, 0x45, 0x98 },
     { 0x8c, 0xe2, 0x49, 0x98, 0x62, 0x56, 0x15, 0xb6,
-      0x03, 0xa0, 0x33, 0xac, 0xa1, 0x3f, 0xb8, 0x94, 
+      0x03, 0xa0, 0x33, 0xac, 0xa1, 0x3f, 0xb8, 0x94,
       0xbe, 0x91, 0x12, 0xa5, 0xc3, 0xa2, 0x11, 0xa8,
-      0xba, 0x26, 0x2a, 0x3c, 0xca, 0x7e, 0x2c, 0xa7, 
+      0xba, 0x26, 0x2a, 0x3c, 0xca, 0x7e, 0x2c, 0xa7,
       0x01, 0xe4, 0xa9, 0xa4, 0xfb, 0xa4, 0x3c, 0x90,
-      0xcc, 0xdc, 0xb2, 0x81, 0xd4, 0x8c, 0x7c, 0x6f, 
+      0xcc, 0xdc, 0xb2, 0x81, 0xd4, 0x8c, 0x7c, 0x6f,
       0xd6, 0x28, 0x75, 0xd2, 0xac, 0xa4, 0x17, 0x03,
       0x4c, 0x34, 0xae, 0xe5 },
     { 0x00 },
     { 0x98, 0xe7, 0x24, 0x7c, 0x07, 0xf0, 0xfe, 0x41,
-      0x1c, 0x26, 0x7e, 0x43, 0x84, 0xb0, 0xf6, 0x00 }, 
+      0x1c, 0x26, 0x7e, 0x43, 0x84, 0xb0, 0xf6, 0x00 },
     { 0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41,
-      0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57, 
+      0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57,
       0x85, 0x9e, 0x1c, 0xea, 0xa6, 0xef, 0xd9, 0x84,
-      0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c, 
+      0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c,
       0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25,
-      0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47, 
+      0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47,
       0x18, 0xe2, 0x44, 0x8b, 0x2f, 0xe3, 0x24, 0xd9,
       0xcc, 0xda, 0x27, 0x10, 0xac, 0xad, 0xe2, 0x56 },
     { 0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41,
-      0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57, 
+      0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57,
       0x85, 0x9e, 0x1c, 0xea, 0xa6, 0xef, 0xd9, 0x84,
-      0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c, 
-      0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25, 
-      0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47, 
+      0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c,
+      0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25,
+      0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47,
       0x18, 0xe2, 0x44, 0x8b, 0x2f, 0xe3, 0x24, 0xd9,
-      0xcc, 0xda, 0x27, 0x10 }, 
+      0xcc, 0xda, 0x27, 0x10 },
     { 0x0f, 0x10, 0xf5, 0x99, 0xae, 0x14, 0xa1, 0x54,
-      0xed, 0x24, 0xb3, 0x6e, 0x25, 0x32, 0x4d, 0xb8, 
+      0xed, 0x24, 0xb3, 0x6e, 0x25, 0x32, 0x4d, 0xb8,
       0xc5, 0x66, 0x63, 0x2e, 0xf2, 0xbb, 0xb3, 0x4f,
-      0x83, 0x47, 0x28, 0x0f, 0xc4, 0x50, 0x70, 0x57, 
+      0x83, 0x47, 0x28, 0x0f, 0xc4, 0x50, 0x70, 0x57,
       0xfd, 0xdc, 0x29, 0xdf, 0x9a, 0x47, 0x1f, 0x75,
-      0xc6, 0x65, 0x41, 0xd4, 0xd4, 0xda, 0xd1, 0xc9, 
+      0xc6, 0x65, 0x41, 0xd4, 0xd4, 0xda, 0xd1, 0xc9,
       0xe9, 0x3a, 0x19, 0xa5, 0x8e, 0x8b, 0x47, 0x3f,
-      0xa0, 0xf0, 0x62, 0xf7 }, 
+      0xa0, 0xf0, 0x62, 0xf7 },
     { 0xd2, 0x7e, 0x88, 0x68, 0x1c, 0xe3, 0x24, 0x3c,
-      0x48, 0x30, 0x16, 0x5a, 0x8f, 0xdc, 0xf9, 0xff, 
+      0x48, 0x30, 0x16, 0x5a, 0x8f, 0xdc, 0xf9, 0xff,
       0x1d, 0xe9, 0xa1, 0xd8, 0xe6, 0xb4, 0x47, 0xef,
-      0x6e, 0xf7, 0xb7, 0x98, 0x28, 0x66, 0x6e, 0x45, 
+      0x6e, 0xf7, 0xb7, 0x98, 0x28, 0x66, 0x6e, 0x45,
       0x81, 0xe7, 0x90, 0x12, 0xaf, 0x34, 0xdd, 0xd9,
-      0xe2, 0xf0, 0x37, 0x58, 0x9b, 0x29, 0x2d, 0xb3, 
+      0xe2, 0xf0, 0x37, 0x58, 0x9b, 0x29, 0x2d, 0xb3,
       0xe6, 0x7c, 0x03, 0x67, 0x45, 0xfa, 0x22, 0xe7,
-      0xe9, 0xb7, 0x37, 0x3b }, 
+      0xe9, 0xb7, 0x37, 0x3b },
     { 0x00 },
-    { 0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e, 
-      0x07, 0x4e, 0xc5, 0xd3, 0xba, 0xf3, 0x9d, 0x18 }, 
-    { 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07, 
-      0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d, 
-      0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9, 
-      0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa, 
-      0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d, 
-      0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38, 
-      0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a, 
-      0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad }, 
-    { 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07, 
-      0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,  
-      0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9, 
-      0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa, 
-      0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d, 
-      0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38, 
-      0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a, 
-      0xbc, 0xc9, 0xf6, 0x62 }, 
+    { 0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e,
+      0x07, 0x4e, 0xc5, 0xd3, 0xba, 0xf3, 0x9d, 0x18 },
+    { 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
+      0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,
+      0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9,
+      0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa,
+      0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d,
+      0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38,
+      0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a,
+      0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad },
+    { 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
+      0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,
+      0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9,
+      0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa,
+      0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d,
+      0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38,
+      0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a,
+      0xbc, 0xc9, 0xf6, 0x62 },
     { 0xc3, 0x76, 0x2d, 0xf1, 0xca, 0x78, 0x7d, 0x32,
-      0xae, 0x47, 0xc1, 0x3b, 0xf1, 0x98, 0x44, 0xcb, 
+      0xae, 0x47, 0xc1, 0x3b, 0xf1, 0x98, 0x44, 0xcb,
       0xaf, 0x1a, 0xe1, 0x4d, 0x0b, 0x97, 0x6a, 0xfa,
-      0xc5, 0x2f, 0xf7, 0xd7, 0x9b, 0xba, 0x9d, 0xe0, 
+      0xc5, 0x2f, 0xf7, 0xd7, 0x9b, 0xba, 0x9d, 0xe0,
       0xfe, 0xb5, 0x82, 0xd3, 0x39, 0x34, 0xa4, 0xf0,
-      0x95, 0x4c, 0xc2, 0x36, 0x3b, 0xc7, 0x3f, 0x78, 
+      0x95, 0x4c, 0xc2, 0x36, 0x3b, 0xc7, 0x3f, 0x78,
       0x62, 0xac, 0x43, 0x0e, 0x64, 0xab, 0xe4, 0x99,
-      0xf4, 0x7c, 0x9b, 0x1f }, 
+      0xf4, 0x7c, 0x9b, 0x1f },
     { 0x5a, 0x8d, 0xef, 0x2f, 0x0c, 0x9e, 0x53, 0xf1,
-      0xf7, 0x5d, 0x78, 0x53, 0x65, 0x9e, 0x2a, 0x20, 
+      0xf7, 0x5d, 0x78, 0x53, 0x65, 0x9e, 0x2a, 0x20,
       0xee, 0xb2, 0xb2, 0x2a, 0xaf, 0xde, 0x64, 0x19,
-      0xa0, 0x58, 0xab, 0x4f, 0x6f, 0x74, 0x6b, 0xf4, 
+      0xa0, 0x58, 0xab, 0x4f, 0x6f, 0x74, 0x6b, 0xf4,
       0x0f, 0xc0, 0xc3, 0xb7, 0x80, 0xf2, 0x44, 0x45,
-      0x2d, 0xa3, 0xeb, 0xf1, 0xc5, 0xd8, 0x2c, 0xde, 
+      0x2d, 0xa3, 0xeb, 0xf1, 0xc5, 0xd8, 0x2c, 0xde,
       0xa2, 0x41, 0x89, 0x97, 0x20, 0x0e, 0xf8, 0x2e,
-      0x44, 0xae, 0x7e, 0x3f }, 
+      0x44, 0xae, 0x7e, 0x3f },
 };
 
 unsigned char tag[MAX_TESTS * 3][16] =
@@ -519,7 +697,7 @@ unsigned char tag[MAX_TESTS * 3][16] =
     { 0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd,
       0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf },
     { 0x4d, 0x5c, 0x2a, 0xf3, 0x27, 0xcd, 0x64, 0xa6,
-      0x2c, 0xf3, 0x5a, 0xbd, 0x2b, 0xa6, 0xfa, 0xb4 }, 
+      0x2c, 0xf3, 0x5a, 0xbd, 0x2b, 0xa6, 0xfa, 0xb4 },
     { 0x5b, 0xc9, 0x4f, 0xbc, 0x32, 0x21, 0xa5, 0xdb,
       0x94, 0xfa, 0xe9, 0x5a, 0xe7, 0x12, 0x1a, 0x47 },
     { 0x36, 0x12, 0xd2, 0xe7, 0x9e, 0x3b, 0x07, 0x85,
@@ -529,27 +707,27 @@ unsigned char tag[MAX_TESTS * 3][16] =
     { 0xcd, 0x33, 0xb2, 0x8a, 0xc7, 0x73, 0xf7, 0x4b,
       0xa0, 0x0e, 0xd1, 0xf3, 0x12, 0x57, 0x24, 0x35 },
     { 0x2f, 0xf5, 0x8d, 0x80, 0x03, 0x39, 0x27, 0xab,
-      0x8e, 0xf4, 0xd4, 0x58, 0x75, 0x14, 0xf0, 0xfb }, 
+      0x8e, 0xf4, 0xd4, 0x58, 0x75, 0x14, 0xf0, 0xfb },
     { 0x99, 0x24, 0xa7, 0xc8, 0x58, 0x73, 0x36, 0xbf,
       0xb1, 0x18, 0x02, 0x4d, 0xb8, 0x67, 0x4a, 0x14 },
     { 0x25, 0x19, 0x49, 0x8e, 0x80, 0xf1, 0x47, 0x8f,
-      0x37, 0xba, 0x55, 0xbd, 0x6d, 0x27, 0x61, 0x8c }, 
+      0x37, 0xba, 0x55, 0xbd, 0x6d, 0x27, 0x61, 0x8c },
     { 0x65, 0xdc, 0xc5, 0x7f, 0xcf, 0x62, 0x3a, 0x24,
-      0x09, 0x4f, 0xcc, 0xa4, 0x0d, 0x35, 0x33, 0xf8 }, 
+      0x09, 0x4f, 0xcc, 0xa4, 0x0d, 0x35, 0x33, 0xf8 },
     { 0xdc, 0xf5, 0x66, 0xff, 0x29, 0x1c, 0x25, 0xbb,
-      0xb8, 0x56, 0x8f, 0xc3, 0xd3, 0x76, 0xa6, 0xd9 }, 
+      0xb8, 0x56, 0x8f, 0xc3, 0xd3, 0x76, 0xa6, 0xd9 },
     { 0x53, 0x0f, 0x8a, 0xfb, 0xc7, 0x45, 0x36, 0xb9,
-      0xa9, 0x63, 0xb4, 0xf1, 0xc4, 0xcb, 0x73, 0x8b }, 
+      0xa9, 0x63, 0xb4, 0xf1, 0xc4, 0xcb, 0x73, 0x8b },
     { 0xd0, 0xd1, 0xc8, 0xa7, 0x99, 0x99, 0x6b, 0xf0,
-      0x26, 0x5b, 0x98, 0xb5, 0xd4, 0x8a, 0xb9, 0x19 }, 
+      0x26, 0x5b, 0x98, 0xb5, 0xd4, 0x8a, 0xb9, 0x19 },
     { 0xb0, 0x94, 0xda, 0xc5, 0xd9, 0x34, 0x71, 0xbd,
-      0xec, 0x1a, 0x50, 0x22, 0x70, 0xe3, 0xcc, 0x6c }, 
+      0xec, 0x1a, 0x50, 0x22, 0x70, 0xe3, 0xcc, 0x6c },
     { 0x76, 0xfc, 0x6e, 0xce, 0x0f, 0x4e, 0x17, 0x68,
-      0xcd, 0xdf, 0x88, 0x53, 0xbb, 0x2d, 0x55, 0x1b }, 
+      0xcd, 0xdf, 0x88, 0x53, 0xbb, 0x2d, 0x55, 0x1b },
     { 0x3a, 0x33, 0x7d, 0xbf, 0x46, 0xa7, 0x92, 0xc4,
-      0x5e, 0x45, 0x49, 0x13, 0xfe, 0x2e, 0xa8, 0xf2 }, 
+      0x5e, 0x45, 0x49, 0x13, 0xfe, 0x2e, 0xa8, 0xf2 },
     { 0xa4, 0x4a, 0x82, 0x66, 0xee, 0x1c, 0x8e, 0xb0,
-      0xc8, 0xb5, 0xd4, 0xcf, 0x5a, 0xe9, 0xf1, 0x9a }, 
+      0xc8, 0xb5, 0xd4, 0xcf, 0x5a, 0xe9, 0xf1, 0x9a },
 };
 
 int gcm_self_test( int verbose )
@@ -558,6 +736,7 @@ int gcm_self_test( int verbose )
     unsigned char buf[64];
     unsigned char tag_buf[16];
     int i, j, ret;
+    cipher_id_t cipher = POLARSSL_CIPHER_ID_AES;
 
     for( j = 0; j < 3; j++ )
     {
@@ -565,8 +744,11 @@ int gcm_self_test( int verbose )
 
         for( i = 0; i < MAX_TESTS; i++ )
         {
-            printf( "  AES-GCM-%3d #%d (%s): ", key_len, i, "enc" );
-            gcm_init( &ctx, key[key_index[i]], key_len );
+            if( verbose != 0 )
+                polarssl_printf( "  AES-GCM-%3d #%d (%s): ",
+                                 key_len, i, "enc" );
+
+            gcm_init( &ctx, cipher, key[key_index[i]], key_len );
 
             ret = gcm_crypt_and_tag( &ctx, GCM_ENCRYPT,
                                      pt_len[i],
@@ -579,16 +761,21 @@ int gcm_self_test( int verbose )
                 memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
                 return( 1 );
             }
 
-            if( verbose != 0 )
-                printf( "passed\n" );
+            gcm_free( &ctx );
 
-            printf( "  AES-GCM-%3d #%d (%s): ", key_len, i, "dec" );
-            gcm_init( &ctx, key[key_index[i]], key_len );
+            if( verbose != 0 )
+                polarssl_printf( "passed\n" );
+
+            if( verbose != 0 )
+                polarssl_printf( "  AES-GCM-%3d #%d (%s): ",
+                                 key_len, i, "dec" );
+
+            gcm_init( &ctx, cipher, key[key_index[i]], key_len );
 
             ret = gcm_crypt_and_tag( &ctx, GCM_DECRYPT,
                                      pt_len[i],
@@ -601,21 +788,161 @@ int gcm_self_test( int verbose )
                 memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 )
             {
                 if( verbose != 0 )
-                    printf( "failed\n" );
+                    polarssl_printf( "failed\n" );
 
                 return( 1 );
             }
 
+            gcm_free( &ctx );
+
             if( verbose != 0 )
-                printf( "passed\n" );
+                polarssl_printf( "passed\n" );
+
+            if( verbose != 0 )
+                polarssl_printf( "  AES-GCM-%3d #%d split (%s): ",
+                                 key_len, i, "enc" );
+
+            gcm_init( &ctx, cipher, key[key_index[i]], key_len );
+
+            ret = gcm_starts( &ctx, GCM_ENCRYPT,
+                              iv[iv_index[i]], iv_len[i],
+                              additional[add_index[i]], add_len[i] );
+            if( ret != 0 )
+            {
+                if( verbose != 0 )
+                    polarssl_printf( "failed\n" );
+
+                return( 1 );
+            }
+
+            if( pt_len[i] > 32 )
+            {
+                size_t rest_len = pt_len[i] - 32;
+                ret = gcm_update( &ctx, 32, pt[pt_index[i]], buf );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+
+                ret = gcm_update( &ctx, rest_len, pt[pt_index[i]] + 32,
+                                  buf + 32 );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+            }
+            else
+            {
+                ret = gcm_update( &ctx, pt_len[i], pt[pt_index[i]], buf );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+            }
+
+            ret = gcm_finish( &ctx, tag_buf, 16 );
+            if( ret != 0 ||
+                memcmp( buf, ct[j * 6 + i], pt_len[i] ) != 0 ||
+                memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    polarssl_printf( "failed\n" );
+
+                return( 1 );
+            }
+
+            gcm_free( &ctx );
+
+            if( verbose != 0 )
+                polarssl_printf( "passed\n" );
+
+            if( verbose != 0 )
+                polarssl_printf( "  AES-GCM-%3d #%d split (%s): ",
+                                 key_len, i, "dec" );
+
+            gcm_init( &ctx, cipher, key[key_index[i]], key_len );
+
+            ret = gcm_starts( &ctx, GCM_DECRYPT,
+                              iv[iv_index[i]], iv_len[i],
+                              additional[add_index[i]], add_len[i] );
+            if( ret != 0 )
+            {
+                if( verbose != 0 )
+                    polarssl_printf( "failed\n" );
+
+                return( 1 );
+            }
+
+            if( pt_len[i] > 32 )
+            {
+                size_t rest_len = pt_len[i] - 32;
+                ret = gcm_update( &ctx, 32, ct[j * 6 + i], buf );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+
+                ret = gcm_update( &ctx, rest_len, ct[j * 6 + i] + 32,
+                                  buf + 32 );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+            }
+            else
+            {
+                ret = gcm_update( &ctx, pt_len[i], ct[j * 6 + i], buf );
+                if( ret != 0 )
+                {
+                    if( verbose != 0 )
+                        polarssl_printf( "failed\n" );
+
+                    return( 1 );
+                }
+            }
+
+            ret = gcm_finish( &ctx, tag_buf, 16 );
+            if( ret != 0 ||
+                memcmp( buf, pt[pt_index[i]], pt_len[i] ) != 0 ||
+                memcmp( tag_buf, tag[j * 6 + i], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    polarssl_printf( "failed\n" );
+
+                return( 1 );
+            }
+
+            gcm_free( &ctx );
+
+            if( verbose != 0 )
+                polarssl_printf( "passed\n" );
+
         }
     }
-    
-    printf( "\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
 
     return( 0 );
 }
 
-#endif
 
-#endif
+
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */
+
+#endif /* POLARSSL_GCM_C */
diff --git a/Externals/polarssl/library/havege.c b/Externals/polarssl/library/havege.c
index ff302c577c..3acd5bca10 100644
--- a/Externals/polarssl/library/havege.c
+++ b/Externals/polarssl/library/havege.c
@@ -1,7 +1,7 @@
 /**
  *  \brief HAVEGE: HArdware Volatile Entropy Gathering and Expansion
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -30,7 +30,11 @@
  *  Contact: seznec(at)irisa_dot_fr - orocheco(at)irisa_dot_fr
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_HAVEGE_C)
 
@@ -38,7 +42,11 @@
 #include "polarssl/timing.h"
 
 #include <string.h>
-#include <time.h>
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
 
 /* ------------------------------------------------------------------------
  * On average, one iteration accesses two 8-word blocks in the havege WALK
@@ -146,7 +154,7 @@
     *C = (*C >> (15)) ^ (*C << (17)) ^ CLK;             \
     *D = (*D >> (16)) ^ (*D << (16)) ^ CLK;             \
                                                         \
-    PT1 = ( RES[(i - 8) ^ PTX] ^                        \
+    PT1 = ( RES[( i - 8 ) ^ PTX] ^                      \
             WALK[PT1 ^ PTX ^ 7] ) & (~1);               \
     PT1 ^= (PT2 ^ 0x10) & 0x10;                         \
                                                         \
@@ -197,6 +205,14 @@ void havege_init( havege_state *hs )
     havege_fill( hs );
 }
 
+void havege_free( havege_state *hs )
+{
+    if( hs == NULL )
+        return;
+
+    polarssl_zeroize( hs, sizeof( havege_state ) );
+}
+
 /*
  * HAVEGE rand function
  */
@@ -220,7 +236,7 @@ int havege_random( void *p_rng, unsigned char *buf, size_t len )
         val ^= hs->pool[hs->offset[1]++];
 
         memcpy( p, &val, use_len );
-        
+
         len -= use_len;
         p += use_len;
     }
@@ -228,4 +244,4 @@ int havege_random( void *p_rng, unsigned char *buf, size_t len )
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_HAVEGE_C */
diff --git a/Externals/polarssl/library/hmac_drbg.c b/Externals/polarssl/library/hmac_drbg.c
new file mode 100644
index 0000000000..d691be11f1
--- /dev/null
+++ b/Externals/polarssl/library/hmac_drbg.c
@@ -0,0 +1,502 @@
+/*
+ *  HMAC_DRBG implementation (NIST SP 800-90)
+ *
+ *  Copyright (C) 2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ *  The NIST SP 800-90A DRBGs are described in the following publication.
+ *  http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
+ *  References below are based on rev. 1 (January 2012).
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_HMAC_DRBG_C)
+
+#include "polarssl/hmac_drbg.h"
+
+#if defined(POLARSSL_FS_IO)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ * HMAC_DRBG update, using optional additional data (10.1.2.2)
+ */
+void hmac_drbg_update( hmac_drbg_context *ctx,
+                       const unsigned char *additional, size_t add_len )
+{
+    size_t md_len = ctx->md_ctx.md_info->size;
+    unsigned char rounds = ( additional != NULL && add_len != 0 ) ? 2 : 1;
+    unsigned char sep[1];
+    unsigned char K[POLARSSL_MD_MAX_SIZE];
+
+    for( sep[0] = 0; sep[0] < rounds; sep[0]++ )
+    {
+        /* Step 1 or 4 */
+        md_hmac_reset( &ctx->md_ctx );
+        md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+        md_hmac_update( &ctx->md_ctx, sep, 1 );
+        if( rounds == 2 )
+            md_hmac_update( &ctx->md_ctx, additional, add_len );
+        md_hmac_finish( &ctx->md_ctx, K );
+
+        /* Step 2 or 5 */
+        md_hmac_starts( &ctx->md_ctx, K, md_len );
+        md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+        md_hmac_finish( &ctx->md_ctx, ctx->V );
+    }
+}
+
+/*
+ * Simplified HMAC_DRBG initialisation (for use with deterministic ECDSA)
+ */
+int hmac_drbg_init_buf( hmac_drbg_context *ctx,
+                        const md_info_t * md_info,
+                        const unsigned char *data, size_t data_len )
+{
+    int ret;
+
+    memset( ctx, 0, sizeof( hmac_drbg_context ) );
+
+    md_init( &ctx->md_ctx );
+
+    if( ( ret = md_init_ctx( &ctx->md_ctx, md_info ) ) != 0 )
+        return( ret );
+
+    /*
+     * Set initial working state.
+     * Use the V memory location, which is currently all 0, to initialize the
+     * MD context with an all-zero key. Then set V to its initial value.
+     */
+    md_hmac_starts( &ctx->md_ctx, ctx->V, md_info->size );
+    memset( ctx->V, 0x01, md_info->size );
+
+    hmac_drbg_update( ctx, data, data_len );
+
+    return( 0 );
+}
+
+/*
+ * HMAC_DRBG reseeding: 10.1.2.4 (arabic) + 9.2 (Roman)
+ */
+int hmac_drbg_reseed( hmac_drbg_context *ctx,
+                      const unsigned char *additional, size_t len )
+{
+    unsigned char seed[POLARSSL_HMAC_DRBG_MAX_SEED_INPUT];
+    size_t seedlen;
+
+    /* III. Check input length */
+    if( len > POLARSSL_HMAC_DRBG_MAX_INPUT ||
+        ctx->entropy_len + len > POLARSSL_HMAC_DRBG_MAX_SEED_INPUT )
+    {
+        return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+    }
+
+    memset( seed, 0, POLARSSL_HMAC_DRBG_MAX_SEED_INPUT );
+
+    /* IV. Gather entropy_len bytes of entropy for the seed */
+    if( ctx->f_entropy( ctx->p_entropy, seed, ctx->entropy_len ) != 0 )
+        return( POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED );
+
+    seedlen = ctx->entropy_len;
+
+    /* 1. Concatenate entropy and additional data if any */
+    if( additional != NULL && len != 0 )
+    {
+        memcpy( seed + seedlen, additional, len );
+        seedlen += len;
+    }
+
+    /* 2. Update state */
+    hmac_drbg_update( ctx, seed, seedlen );
+
+    /* 3. Reset reseed_counter */
+    ctx->reseed_counter = 1;
+
+    /* 4. Done */
+    return( 0 );
+}
+
+/*
+ * HMAC_DRBG initialisation (10.1.2.3 + 9.1)
+ */
+int hmac_drbg_init( hmac_drbg_context *ctx,
+                    const md_info_t * md_info,
+                    int (*f_entropy)(void *, unsigned char *, size_t),
+                    void *p_entropy,
+                    const unsigned char *custom,
+                    size_t len )
+{
+    int ret;
+    size_t entropy_len;
+
+    memset( ctx, 0, sizeof( hmac_drbg_context ) );
+
+    md_init( &ctx->md_ctx );
+
+    if( ( ret = md_init_ctx( &ctx->md_ctx, md_info ) ) != 0 )
+        return( ret );
+
+    /*
+     * Set initial working state.
+     * Use the V memory location, which is currently all 0, to initialize the
+     * MD context with an all-zero key. Then set V to its initial value.
+     */
+    md_hmac_starts( &ctx->md_ctx, ctx->V, md_info->size );
+    memset( ctx->V, 0x01, md_info->size );
+
+    ctx->f_entropy = f_entropy;
+    ctx->p_entropy = p_entropy;
+
+    ctx->reseed_interval = POLARSSL_HMAC_DRBG_RESEED_INTERVAL;
+
+    /*
+     * See SP800-57 5.6.1 (p. 65-66) for the security strength provided by
+     * each hash function, then according to SP800-90A rev1 10.1 table 2,
+     * min_entropy_len (in bits) is security_strength.
+     *
+     * (This also matches the sizes used in the NIST test vectors.)
+     */
+    entropy_len = md_info->size <= 20 ? 16 : /* 160-bits hash -> 128 bits */
+                  md_info->size <= 28 ? 24 : /* 224-bits hash -> 192 bits */
+                                        32;  /* better (256+) -> 256 bits */
+
+    /*
+     * For initialisation, use more entropy to emulate a nonce
+     * (Again, matches test vectors.)
+     */
+    ctx->entropy_len = entropy_len * 3 / 2;
+
+    if( ( ret = hmac_drbg_reseed( ctx, custom, len ) ) != 0 )
+        return( ret );
+
+    ctx->entropy_len = entropy_len;
+
+    return( 0 );
+}
+
+/*
+ * Set prediction resistance
+ */
+void hmac_drbg_set_prediction_resistance( hmac_drbg_context *ctx,
+                                          int resistance )
+{
+    ctx->prediction_resistance = resistance;
+}
+
+/*
+ * Set entropy length grabbed for reseeds
+ */
+void hmac_drbg_set_entropy_len( hmac_drbg_context *ctx, size_t len )
+{
+    ctx->entropy_len = len;
+}
+
+/*
+ * Set reseed interval
+ */
+void hmac_drbg_set_reseed_interval( hmac_drbg_context *ctx, int interval )
+{
+    ctx->reseed_interval = interval;
+}
+
+/*
+ * HMAC_DRBG random function with optional additional data:
+ * 10.1.2.5 (arabic) + 9.3 (Roman)
+ */
+int hmac_drbg_random_with_add( void *p_rng,
+                               unsigned char *output, size_t out_len,
+                               const unsigned char *additional, size_t add_len )
+{
+    int ret;
+    hmac_drbg_context *ctx = (hmac_drbg_context *) p_rng;
+    size_t md_len = md_get_size( ctx->md_ctx.md_info );
+    size_t left = out_len;
+    unsigned char *out = output;
+
+    /* II. Check request length */
+    if( out_len > POLARSSL_HMAC_DRBG_MAX_REQUEST )
+        return( POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG );
+
+    /* III. Check input length */
+    if( add_len > POLARSSL_HMAC_DRBG_MAX_INPUT )
+        return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+
+    /* 1. (aka VII and IX) Check reseed counter and PR */
+    if( ctx->f_entropy != NULL && /* For no-reseeding instances */
+        ( ctx->prediction_resistance == POLARSSL_HMAC_DRBG_PR_ON ||
+          ctx->reseed_counter > ctx->reseed_interval ) )
+    {
+        if( ( ret = hmac_drbg_reseed( ctx, additional, add_len ) ) != 0 )
+            return( ret );
+
+        add_len = 0; /* VII.4 */
+    }
+
+    /* 2. Use additional data if any */
+    if( additional != NULL && add_len != 0 )
+        hmac_drbg_update( ctx, additional, add_len );
+
+    /* 3, 4, 5. Generate bytes */
+    while( left != 0 )
+    {
+        size_t use_len = left > md_len ? md_len : left;
+
+        md_hmac_reset( &ctx->md_ctx );
+        md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+        md_hmac_finish( &ctx->md_ctx, ctx->V );
+
+        memcpy( out, ctx->V, use_len );
+        out += use_len;
+        left -= use_len;
+    }
+
+    /* 6. Update */
+    hmac_drbg_update( ctx, additional, add_len );
+
+    /* 7. Update reseed counter */
+    ctx->reseed_counter++;
+
+    /* 8. Done */
+    return( 0 );
+}
+
+/*
+ * HMAC_DRBG random function
+ */
+int hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len )
+{
+    return( hmac_drbg_random_with_add( p_rng, output, out_len, NULL, 0 ) );
+}
+
+/*
+ * Free an HMAC_DRBG context
+ */
+void hmac_drbg_free( hmac_drbg_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    md_free_ctx( &ctx->md_ctx );
+
+    polarssl_zeroize( ctx, sizeof( hmac_drbg_context ) );
+}
+
+#if defined(POLARSSL_FS_IO)
+int hmac_drbg_write_seed_file( hmac_drbg_context *ctx, const char *path )
+{
+    int ret;
+    FILE *f;
+    unsigned char buf[ POLARSSL_HMAC_DRBG_MAX_INPUT ];
+
+    if( ( f = fopen( path, "wb" ) ) == NULL )
+        return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+
+    if( ( ret = hmac_drbg_random( ctx, buf, sizeof( buf ) ) ) != 0 )
+        goto exit;
+
+    if( fwrite( buf, 1, sizeof( buf ), f ) != sizeof( buf ) )
+    {
+        ret = POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR;
+        goto exit;
+    }
+
+    ret = 0;
+
+exit:
+    fclose( f );
+    return( ret );
+}
+
+int hmac_drbg_update_seed_file( hmac_drbg_context *ctx, const char *path )
+{
+    FILE *f;
+    size_t n;
+    unsigned char buf[ POLARSSL_HMAC_DRBG_MAX_INPUT ];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    n = (size_t) ftell( f );
+    fseek( f, 0, SEEK_SET );
+
+    if( n > POLARSSL_HMAC_DRBG_MAX_INPUT )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+    }
+
+    if( fread( buf, 1, n, f ) != n )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    hmac_drbg_update( ctx, buf, n );
+
+    return( hmac_drbg_write_seed_file( ctx, path ) );
+}
+#endif /* POLARSSL_FS_IO */
+
+
+#if defined(POLARSSL_SELF_TEST)
+
+#include <stdio.h>
+
+#if !defined(POLARSSL_SHA1_C)
+/* Dummy checkup routine */
+int hmac_drbg_self_test( int verbose )
+{
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    return( 0 );
+}
+#else
+
+#define OUTPUT_LEN  80
+
+/* From a NIST PR=true test vector */
+static unsigned char entropy_pr[] = {
+    0xa0, 0xc9, 0xab, 0x58, 0xf1, 0xe2, 0xe5, 0xa4, 0xde, 0x3e, 0xbd, 0x4f,
+    0xf7, 0x3e, 0x9c, 0x5b, 0x64, 0xef, 0xd8, 0xca, 0x02, 0x8c, 0xf8, 0x11,
+    0x48, 0xa5, 0x84, 0xfe, 0x69, 0xab, 0x5a, 0xee, 0x42, 0xaa, 0x4d, 0x42,
+    0x17, 0x60, 0x99, 0xd4, 0x5e, 0x13, 0x97, 0xdc, 0x40, 0x4d, 0x86, 0xa3,
+    0x7b, 0xf5, 0x59, 0x54, 0x75, 0x69, 0x51, 0xe4 };
+static const unsigned char result_pr[OUTPUT_LEN] = {
+    0x9a, 0x00, 0xa2, 0xd0, 0x0e, 0xd5, 0x9b, 0xfe, 0x31, 0xec, 0xb1, 0x39,
+    0x9b, 0x60, 0x81, 0x48, 0xd1, 0x96, 0x9d, 0x25, 0x0d, 0x3c, 0x1e, 0x94,
+    0x10, 0x10, 0x98, 0x12, 0x93, 0x25, 0xca, 0xb8, 0xfc, 0xcc, 0x2d, 0x54,
+    0x73, 0x19, 0x70, 0xc0, 0x10, 0x7a, 0xa4, 0x89, 0x25, 0x19, 0x95, 0x5e,
+    0x4b, 0xc6, 0x00, 0x1d, 0x7f, 0x4e, 0x6a, 0x2b, 0xf8, 0xa3, 0x01, 0xab,
+    0x46, 0x05, 0x5c, 0x09, 0xa6, 0x71, 0x88, 0xf1, 0xa7, 0x40, 0xee, 0xf3,
+    0xe1, 0x5c, 0x02, 0x9b, 0x44, 0xaf, 0x03, 0x44 };
+
+/* From a NIST PR=false test vector */
+static unsigned char entropy_nopr[] = {
+    0x79, 0x34, 0x9b, 0xbf, 0x7c, 0xdd, 0xa5, 0x79, 0x95, 0x57, 0x86, 0x66,
+    0x21, 0xc9, 0x13, 0x83, 0x11, 0x46, 0x73, 0x3a, 0xbf, 0x8c, 0x35, 0xc8,
+    0xc7, 0x21, 0x5b, 0x5b, 0x96, 0xc4, 0x8e, 0x9b, 0x33, 0x8c, 0x74, 0xe3,
+    0xe9, 0x9d, 0xfe, 0xdf };
+static const unsigned char result_nopr[OUTPUT_LEN] = {
+    0xc6, 0xa1, 0x6a, 0xb8, 0xd4, 0x20, 0x70, 0x6f, 0x0f, 0x34, 0xab, 0x7f,
+    0xec, 0x5a, 0xdc, 0xa9, 0xd8, 0xca, 0x3a, 0x13, 0x3e, 0x15, 0x9c, 0xa6,
+    0xac, 0x43, 0xc6, 0xf8, 0xa2, 0xbe, 0x22, 0x83, 0x4a, 0x4c, 0x0a, 0x0a,
+    0xff, 0xb1, 0x0d, 0x71, 0x94, 0xf1, 0xc1, 0xa5, 0xcf, 0x73, 0x22, 0xec,
+    0x1a, 0xe0, 0x96, 0x4e, 0xd4, 0xbf, 0x12, 0x27, 0x46, 0xe0, 0x87, 0xfd,
+    0xb5, 0xb3, 0xe9, 0x1b, 0x34, 0x93, 0xd5, 0xbb, 0x98, 0xfa, 0xed, 0x49,
+    0xe8, 0x5f, 0x13, 0x0f, 0xc8, 0xa4, 0x59, 0xb7 };
+
+/* "Entropy" from buffer */
+static size_t test_offset;
+static int hmac_drbg_self_test_entropy( void *data,
+                                        unsigned char *buf, size_t len )
+{
+    const unsigned char *p = data;
+    memcpy( buf, p + test_offset, len );
+    test_offset += len;
+    return( 0 );
+}
+
+#define CHK( c )    if( (c) != 0 )                          \
+                    {                                       \
+                        if( verbose != 0 )                  \
+                            polarssl_printf( "failed\n" );  \
+                        return( 1 );                        \
+                    }
+
+/*
+ * Checkup routine for HMAC_DRBG with SHA-1
+ */
+int hmac_drbg_self_test( int verbose )
+{
+    hmac_drbg_context ctx;
+    unsigned char buf[OUTPUT_LEN];
+    const md_info_t *md_info = md_info_from_type( POLARSSL_MD_SHA1 );
+
+    /*
+     * PR = True
+     */
+    if( verbose != 0 )
+        polarssl_printf( "  HMAC_DRBG (PR = True) : " );
+
+    test_offset = 0;
+    CHK( hmac_drbg_init( &ctx, md_info,
+                         hmac_drbg_self_test_entropy, entropy_pr,
+                         NULL, 0 ) );
+    hmac_drbg_set_prediction_resistance( &ctx, POLARSSL_HMAC_DRBG_PR_ON );
+    CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+    CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+    CHK( memcmp( buf, result_pr, OUTPUT_LEN ) );
+    hmac_drbg_free( &ctx );
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+    /*
+     * PR = False
+     */
+    if( verbose != 0 )
+        polarssl_printf( "  HMAC_DRBG (PR = False) : " );
+
+    test_offset = 0;
+    CHK( hmac_drbg_init( &ctx, md_info,
+                         hmac_drbg_self_test_entropy, entropy_nopr,
+                         NULL, 0 ) );
+    CHK( hmac_drbg_reseed( &ctx, NULL, 0 ) );
+    CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+    CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+    CHK( memcmp( buf, result_nopr, OUTPUT_LEN ) );
+    hmac_drbg_free( &ctx );
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    return( 0 );
+}
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_HMAC_DRBG_C */
diff --git a/Externals/polarssl/library/md.c b/Externals/polarssl/library/md.c
index 96065c95f0..7f9c5dc843 100644
--- a/Externals/polarssl/library/md.c
+++ b/Externals/polarssl/library/md.c
@@ -1,11 +1,11 @@
 /**
  * \file md.c
- * 
+ *
  * \brief Generic message digest wrapper for PolarSSL
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_MD_C)
 
@@ -36,50 +40,60 @@
 
 #include <stdlib.h>
 
-#if defined _MSC_VER && !defined strcasecmp
-#define strcasecmp _stricmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strcasecmp  _stricmp
 #endif
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 static const int supported_digests[] = {
 
-#if defined(POLARSSL_MD2_C)
-        POLARSSL_MD_MD2,
+#if defined(POLARSSL_SHA512_C)
+        POLARSSL_MD_SHA384,
+        POLARSSL_MD_SHA512,
 #endif
 
-#if defined(POLARSSL_MD4_C)
-        POLARSSL_MD_MD4,
-#endif
-
-#if defined(POLARSSL_MD5_C)
-        POLARSSL_MD_MD5,
+#if defined(POLARSSL_SHA256_C)
+        POLARSSL_MD_SHA224,
+        POLARSSL_MD_SHA256,
 #endif
 
 #if defined(POLARSSL_SHA1_C)
         POLARSSL_MD_SHA1,
 #endif
 
-#if defined(POLARSSL_SHA2_C)
-        POLARSSL_MD_SHA224,
-        POLARSSL_MD_SHA256,
+#if defined(POLARSSL_RIPEMD160_C)
+        POLARSSL_MD_RIPEMD160,
 #endif
 
-#if defined(POLARSSL_SHA4_C)
-        POLARSSL_MD_SHA384,
-        POLARSSL_MD_SHA512,
+#if defined(POLARSSL_MD5_C)
+        POLARSSL_MD_MD5,
 #endif
 
-        0
+#if defined(POLARSSL_MD4_C)
+        POLARSSL_MD_MD4,
+#endif
+
+#if defined(POLARSSL_MD2_C)
+        POLARSSL_MD_MD2,
+#endif
+
+        POLARSSL_MD_NONE
 };
 
 const int *md_list( void )
 {
-    return supported_digests;
+    return( supported_digests );
 }
 
 const md_info_t *md_info_from_string( const char *md_name )
 {
     if( NULL == md_name )
-        return NULL;
+        return( NULL );
 
     /* Get the appropriate digest information */
 #if defined(POLARSSL_MD2_C)
@@ -94,23 +108,27 @@ const md_info_t *md_info_from_string( const char *md_name )
     if( !strcasecmp( "MD5", md_name ) )
         return md_info_from_type( POLARSSL_MD_MD5 );
 #endif
+#if defined(POLARSSL_RIPEMD160_C)
+    if( !strcasecmp( "RIPEMD160", md_name ) )
+        return md_info_from_type( POLARSSL_MD_RIPEMD160 );
+#endif
 #if defined(POLARSSL_SHA1_C)
     if( !strcasecmp( "SHA1", md_name ) || !strcasecmp( "SHA", md_name ) )
         return md_info_from_type( POLARSSL_MD_SHA1 );
 #endif
-#if defined(POLARSSL_SHA2_C)
+#if defined(POLARSSL_SHA256_C)
     if( !strcasecmp( "SHA224", md_name ) )
         return md_info_from_type( POLARSSL_MD_SHA224 );
     if( !strcasecmp( "SHA256", md_name ) )
         return md_info_from_type( POLARSSL_MD_SHA256 );
 #endif
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
     if( !strcasecmp( "SHA384", md_name ) )
         return md_info_from_type( POLARSSL_MD_SHA384 );
     if( !strcasecmp( "SHA512", md_name ) )
         return md_info_from_type( POLARSSL_MD_SHA512 );
 #endif
-    return NULL;
+    return( NULL );
 }
 
 const md_info_t *md_info_from_type( md_type_t md_type )
@@ -119,104 +137,120 @@ const md_info_t *md_info_from_type( md_type_t md_type )
     {
 #if defined(POLARSSL_MD2_C)
         case POLARSSL_MD_MD2:
-            return &md2_info;
+            return( &md2_info );
 #endif
 #if defined(POLARSSL_MD4_C)
         case POLARSSL_MD_MD4:
-            return &md4_info;
+            return( &md4_info );
 #endif
 #if defined(POLARSSL_MD5_C)
         case POLARSSL_MD_MD5:
-            return &md5_info;
+            return( &md5_info );
+#endif
+#if defined(POLARSSL_RIPEMD160_C)
+        case POLARSSL_MD_RIPEMD160:
+            return( &ripemd160_info );
 #endif
 #if defined(POLARSSL_SHA1_C)
         case POLARSSL_MD_SHA1:
-            return &sha1_info;
+            return( &sha1_info );
 #endif
-#if defined(POLARSSL_SHA2_C)
+#if defined(POLARSSL_SHA256_C)
         case POLARSSL_MD_SHA224:
-            return &sha224_info;
+            return( &sha224_info );
         case POLARSSL_MD_SHA256:
-            return &sha256_info;
+            return( &sha256_info );
 #endif
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
         case POLARSSL_MD_SHA384:
-            return &sha384_info;
+            return( &sha384_info );
         case POLARSSL_MD_SHA512:
-            return &sha512_info;
+            return( &sha512_info );
 #endif
         default:
-            return NULL;
+            return( NULL );
     }
 }
 
+void md_init( md_context_t *ctx )
+{
+    memset( ctx, 0, sizeof( md_context_t ) );
+}
+
+void md_free( md_context_t *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    if( ctx->md_ctx )
+        ctx->md_info->ctx_free_func( ctx->md_ctx );
+
+    polarssl_zeroize( ctx, sizeof( md_context_t ) );
+}
+
 int md_init_ctx( md_context_t *ctx, const md_info_t *md_info )
 {
     if( md_info == NULL || ctx == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     memset( ctx, 0, sizeof( md_context_t ) );
 
     if( ( ctx->md_ctx = md_info->ctx_alloc_func() ) == NULL )
-        return POLARSSL_ERR_MD_ALLOC_FAILED;
+        return( POLARSSL_ERR_MD_ALLOC_FAILED );
 
     ctx->md_info = md_info;
 
     md_info->starts_func( ctx->md_ctx );
 
-    return 0;
+    return( 0 );
 }
 
 int md_free_ctx( md_context_t *ctx )
 {
-    if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+    md_free( ctx );
 
-    ctx->md_info->ctx_free_func( ctx->md_ctx );
-    ctx->md_ctx = NULL;
-
-    return 0;
+    return( 0 );
 }
 
 int md_starts( md_context_t *ctx )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     ctx->md_info->starts_func( ctx->md_ctx );
 
-    return 0;
+    return( 0 );
 }
 
 int md_update( md_context_t *ctx, const unsigned char *input, size_t ilen )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     ctx->md_info->update_func( ctx->md_ctx, input, ilen );
 
-    return 0;
+    return( 0 );
 }
 
 int md_finish( md_context_t *ctx, unsigned char *output )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     ctx->md_info->finish_func( ctx->md_ctx, output );
 
-    return 0;
+    return( 0 );
 }
 
 int md( const md_info_t *md_info, const unsigned char *input, size_t ilen,
             unsigned char *output )
 {
-    if ( md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+    if( md_info == NULL )
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     md_info->digest_func( input, ilen, output );
 
-    return 0;
+    return( 0 );
 }
 
 int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
@@ -226,7 +260,7 @@ int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
 #endif
 
     if( md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
 #if defined(POLARSSL_FS_IO)
     ret = md_info->file_func( path, output );
@@ -238,48 +272,48 @@ int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
     ((void) path);
     ((void) output);
 
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
-#endif
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_FS_IO */
 }
 
 int md_hmac_starts( md_context_t *ctx, const unsigned char *key, size_t keylen )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
-    ctx->md_info->hmac_starts_func( ctx->md_ctx, key, keylen);
+    ctx->md_info->hmac_starts_func( ctx->md_ctx, key, keylen );
 
-    return 0;
+    return( 0 );
 }
 
 int md_hmac_update( md_context_t *ctx, const unsigned char *input, size_t ilen )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     ctx->md_info->hmac_update_func( ctx->md_ctx, input, ilen );
 
-    return 0;
+    return( 0 );
 }
 
-int md_hmac_finish( md_context_t *ctx, unsigned char *output)
+int md_hmac_finish( md_context_t *ctx, unsigned char *output )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
-    ctx->md_info->hmac_finish_func( ctx->md_ctx, output);
+    ctx->md_info->hmac_finish_func( ctx->md_ctx, output );
 
-    return 0;
+    return( 0 );
 }
 
 int md_hmac_reset( md_context_t *ctx )
 {
     if( ctx == NULL || ctx->md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
-    ctx->md_info->hmac_reset_func( ctx->md_ctx);
+    ctx->md_info->hmac_reset_func( ctx->md_ctx );
 
-    return 0;
+    return( 0 );
 }
 
 int md_hmac( const md_info_t *md_info, const unsigned char *key, size_t keylen,
@@ -287,11 +321,21 @@ int md_hmac( const md_info_t *md_info, const unsigned char *key, size_t keylen,
                 unsigned char *output )
 {
     if( md_info == NULL )
-        return POLARSSL_ERR_MD_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
 
     md_info->hmac_func( key, keylen, input, ilen, output );
 
-    return 0;
+    return( 0 );
 }
 
-#endif
+int md_process( md_context_t *ctx, const unsigned char *data )
+{
+    if( ctx == NULL || ctx->md_info == NULL )
+        return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
+
+    ctx->md_info->process_func( ctx->md_ctx, data );
+
+    return( 0 );
+}
+
+#endif /* POLARSSL_MD_C */
diff --git a/Externals/polarssl/library/md2.c b/Externals/polarssl/library/md2.c
index 2c8754a8a9..45bce371c7 100644
--- a/Externals/polarssl/library/md2.c
+++ b/Externals/polarssl/library/md2.c
@@ -1,7 +1,7 @@
 /*
  *  RFC 1115/1319 compliant MD2 implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *  http://www.ietf.org/rfc/rfc1319.txt
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_MD2_C)
 
@@ -39,6 +43,17 @@
 #include <stdio.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if !defined(POLARSSL_MD2_ALT)
 
 static const unsigned char PI_SUBST[256] =
@@ -71,6 +86,19 @@ static const unsigned char PI_SUBST[256] =
     0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14
 };
 
+void md2_init( md2_context *ctx )
+{
+    memset( ctx, 0, sizeof( md2_context ) );
+}
+
+void md2_free( md2_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( md2_context ) );
+}
+
 /*
  * MD2 context setup
  */
@@ -82,7 +110,7 @@ void md2_starts( md2_context *ctx )
     ctx->left = 0;
 }
 
-static void md2_process( md2_context *ctx )
+void md2_process( md2_context *ctx )
 {
     int i, j;
     unsigned char t = 0;
@@ -174,11 +202,11 @@ void md2( const unsigned char *input, size_t ilen, unsigned char output[16] )
 {
     md2_context ctx;
 
+    md2_init( &ctx );
     md2_starts( &ctx );
     md2_update( &ctx, input, ilen );
     md2_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md2_context ) );
+    md2_free( &ctx );
 }
 
 #if defined(POLARSSL_FS_IO)
@@ -195,14 +223,14 @@ int md2_file( const char *path, unsigned char output[16] )
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( POLARSSL_ERR_MD2_FILE_IO_ERROR );
 
+    md2_init( &ctx );
     md2_starts( &ctx );
 
     while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
         md2_update( &ctx, buf, n );
 
     md2_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md2_context ) );
+    md2_free( &ctx );
 
     if( ferror( f ) != 0 )
     {
@@ -218,7 +246,8 @@ int md2_file( const char *path, unsigned char output[16] )
 /*
  * MD2 HMAC context setup
  */
-void md2_hmac_starts( md2_context *ctx, const unsigned char *key, size_t keylen )
+void md2_hmac_starts( md2_context *ctx, const unsigned char *key,
+                      size_t keylen )
 {
     size_t i;
     unsigned char sum[16];
@@ -242,13 +271,14 @@ void md2_hmac_starts( md2_context *ctx, const unsigned char *key, size_t keylen
     md2_starts( ctx );
     md2_update( ctx, ctx->ipad, 16 );
 
-    memset( sum, 0, sizeof( sum ) );
+    polarssl_zeroize( sum, sizeof( sum ) );
 }
 
 /*
  * MD2 HMAC process buffer
  */
-void md2_hmac_update( md2_context *ctx, const unsigned char *input, size_t ilen )
+void md2_hmac_update( md2_context *ctx, const unsigned char *input,
+                      size_t ilen )
 {
     md2_update( ctx, input, ilen );
 }
@@ -266,7 +296,7 @@ void md2_hmac_finish( md2_context *ctx, unsigned char output[16] )
     md2_update( ctx, tmpbuf, 16 );
     md2_finish( ctx, output );
 
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
 }
 
 /*
@@ -287,11 +317,11 @@ void md2_hmac( const unsigned char *key, size_t keylen,
 {
     md2_context ctx;
 
+    md2_init( &ctx );
     md2_hmac_starts( &ctx, key, keylen );
     md2_hmac_update( &ctx, input, ilen );
     md2_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md2_context ) );
+    md2_free( &ctx );
 }
 
 #if defined(POLARSSL_SELF_TEST)
@@ -340,7 +370,7 @@ int md2_self_test( int verbose )
     for( i = 0; i < 7; i++ )
     {
         if( verbose != 0 )
-            printf( "  MD2 test #%d: ", i + 1 );
+            polarssl_printf( "  MD2 test #%d: ", i + 1 );
 
         md2( (unsigned char *) md2_test_str[i],
              strlen( md2_test_str[i] ), md2sum );
@@ -348,21 +378,21 @@ int md2_self_test( int verbose )
         if( memcmp( md2sum, md2_test_sum[i], 16 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_MD2_C */
diff --git a/Externals/polarssl/library/md4.c b/Externals/polarssl/library/md4.c
index 980f5e462d..f6b71d56e5 100644
--- a/Externals/polarssl/library/md4.c
+++ b/Externals/polarssl/library/md4.c
@@ -1,7 +1,7 @@
 /*
  *  RFC 1186/1320 compliant MD4 implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *  http://www.ietf.org/rfc/rfc1320.txt
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_MD4_C)
 
@@ -39,6 +43,17 @@
 #include <stdio.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if !defined(POLARSSL_MD4_ALT)
 
 /*
@@ -64,6 +79,19 @@
 }
 #endif
 
+void md4_init( md4_context *ctx )
+{
+    memset( ctx, 0, sizeof( md4_context ) );
+}
+
+void md4_free( md4_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( md4_context ) );
+}
+
 /*
  * MD4 context setup
  */
@@ -78,7 +106,7 @@ void md4_starts( md4_context *ctx )
     ctx->state[3] = 0x10325476;
 }
 
-static void md4_process( md4_context *ctx, const unsigned char data[64] )
+void md4_process( md4_context *ctx, const unsigned char data[64] )
 {
     uint32_t X[16], A, B, C, D;
 
@@ -189,7 +217,7 @@ void md4_update( md4_context *ctx, const unsigned char *input, size_t ilen )
     size_t fill;
     uint32_t left;
 
-    if( ilen <= 0 )
+    if( ilen == 0 )
         return;
 
     left = ctx->total[0] & 0x3F;
@@ -270,11 +298,11 @@ void md4( const unsigned char *input, size_t ilen, unsigned char output[16] )
 {
     md4_context ctx;
 
+    md4_init( &ctx );
     md4_starts( &ctx );
     md4_update( &ctx, input, ilen );
     md4_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md4_context ) );
+    md4_free( &ctx );
 }
 
 #if defined(POLARSSL_FS_IO)
@@ -291,14 +319,14 @@ int md4_file( const char *path, unsigned char output[16] )
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( POLARSSL_ERR_MD4_FILE_IO_ERROR );
 
+    md4_init( &ctx );
     md4_starts( &ctx );
 
     while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
         md4_update( &ctx, buf, n );
 
     md4_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md4_context ) );
+    md4_free( &ctx );
 
     if( ferror( f ) != 0 )
     {
@@ -314,7 +342,8 @@ int md4_file( const char *path, unsigned char output[16] )
 /*
  * MD4 HMAC context setup
  */
-void md4_hmac_starts( md4_context *ctx, const unsigned char *key, size_t keylen )
+void md4_hmac_starts( md4_context *ctx, const unsigned char *key,
+                      size_t keylen )
 {
     size_t i;
     unsigned char sum[16];
@@ -338,13 +367,14 @@ void md4_hmac_starts( md4_context *ctx, const unsigned char *key, size_t keylen
     md4_starts( ctx );
     md4_update( ctx, ctx->ipad, 64 );
 
-    memset( sum, 0, sizeof( sum ) );
+    polarssl_zeroize( sum, sizeof( sum ) );
 }
 
 /*
  * MD4 HMAC process buffer
  */
-void md4_hmac_update( md4_context *ctx, const unsigned char *input, size_t ilen )
+void md4_hmac_update( md4_context *ctx, const unsigned char *input,
+                      size_t ilen )
 {
     md4_update( ctx, input, ilen );
 }
@@ -362,7 +392,7 @@ void md4_hmac_finish( md4_context *ctx, unsigned char output[16] )
     md4_update( ctx, tmpbuf, 16 );
     md4_finish( ctx, output );
 
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
 }
 
 /*
@@ -383,11 +413,11 @@ void md4_hmac( const unsigned char *key, size_t keylen,
 {
     md4_context ctx;
 
+    md4_init( &ctx );
     md4_hmac_starts( &ctx, key, keylen );
     md4_hmac_update( &ctx, input, ilen );
     md4_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md4_context ) );
+    md4_free( &ctx );
 }
 
 #if defined(POLARSSL_SELF_TEST)
@@ -397,7 +427,7 @@ void md4_hmac( const unsigned char *key, size_t keylen,
  */
 static const char md4_test_str[7][81] =
 {
-    { "" }, 
+    { "" },
     { "a" },
     { "abc" },
     { "message digest" },
@@ -436,7 +466,7 @@ int md4_self_test( int verbose )
     for( i = 0; i < 7; i++ )
     {
         if( verbose != 0 )
-            printf( "  MD4 test #%d: ", i + 1 );
+            polarssl_printf( "  MD4 test #%d: ", i + 1 );
 
         md4( (unsigned char *) md4_test_str[i],
              strlen( md4_test_str[i] ), md4sum );
@@ -444,21 +474,21 @@ int md4_self_test( int verbose )
         if( memcmp( md4sum, md4_test_sum[i], 16 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_MD4_C */
diff --git a/Externals/polarssl/library/md5.c b/Externals/polarssl/library/md5.c
index b28461e9b2..89354bc7d3 100644
--- a/Externals/polarssl/library/md5.c
+++ b/Externals/polarssl/library/md5.c
@@ -1,7 +1,7 @@
 /*
  *  RFC 1321 compliant MD5 implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -28,7 +28,11 @@
  *  http://www.ietf.org/rfc/rfc1321.txt
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_MD5_C)
 
@@ -38,6 +42,17 @@
 #include <stdio.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if !defined(POLARSSL_MD5_ALT)
 
 /*
@@ -63,6 +78,19 @@
 }
 #endif
 
+void md5_init( md5_context *ctx )
+{
+    memset( ctx, 0, sizeof( md5_context ) );
+}
+
+void md5_free( md5_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( md5_context ) );
+}
+
 /*
  * MD5 context setup
  */
@@ -151,7 +179,7 @@ void md5_process( md5_context *ctx, const unsigned char data[64] )
     P( B, C, D, A, 12, 20, 0x8D2A4C8A );
 
 #undef F
-    
+
 #define F(x,y,z) (x ^ y ^ z)
 
     P( A, B, C, D,  5,  4, 0xFFFA3942 );
@@ -208,7 +236,7 @@ void md5_update( md5_context *ctx, const unsigned char *input, size_t ilen )
     size_t fill;
     uint32_t left;
 
-    if( ilen <= 0 )
+    if( ilen == 0 )
         return;
 
     left = ctx->total[0] & 0x3F;
@@ -287,11 +315,11 @@ void md5( const unsigned char *input, size_t ilen, unsigned char output[16] )
 {
     md5_context ctx;
 
+    md5_init( &ctx );
     md5_starts( &ctx );
     md5_update( &ctx, input, ilen );
     md5_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md5_context ) );
+    md5_free( &ctx );
 }
 
 #if defined(POLARSSL_FS_IO)
@@ -308,14 +336,14 @@ int md5_file( const char *path, unsigned char output[16] )
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( POLARSSL_ERR_MD5_FILE_IO_ERROR );
 
+    md5_init( &ctx );
     md5_starts( &ctx );
 
     while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
         md5_update( &ctx, buf, n );
 
     md5_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md5_context ) );
+    md5_free( &ctx );
 
     if( ferror( f ) != 0 )
     {
@@ -331,7 +359,8 @@ int md5_file( const char *path, unsigned char output[16] )
 /*
  * MD5 HMAC context setup
  */
-void md5_hmac_starts( md5_context *ctx, const unsigned char *key, size_t keylen )
+void md5_hmac_starts( md5_context *ctx, const unsigned char *key,
+                      size_t keylen )
 {
     size_t i;
     unsigned char sum[16];
@@ -355,13 +384,14 @@ void md5_hmac_starts( md5_context *ctx, const unsigned char *key, size_t keylen
     md5_starts( ctx );
     md5_update( ctx, ctx->ipad, 64 );
 
-    memset( sum, 0, sizeof( sum ) );
+    polarssl_zeroize( sum, sizeof( sum ) );
 }
 
 /*
  * MD5 HMAC process buffer
  */
-void md5_hmac_update( md5_context *ctx, const unsigned char *input, size_t ilen )
+void md5_hmac_update( md5_context *ctx, const unsigned char *input,
+                      size_t ilen )
 {
     md5_update( ctx, input, ilen );
 }
@@ -379,7 +409,7 @@ void md5_hmac_finish( md5_context *ctx, unsigned char output[16] )
     md5_update( ctx, tmpbuf, 16 );
     md5_finish( ctx, output );
 
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
 }
 
 /*
@@ -400,11 +430,11 @@ void md5_hmac( const unsigned char *key, size_t keylen,
 {
     md5_context ctx;
 
+    md5_init( &ctx );
     md5_hmac_starts( &ctx, key, keylen );
     md5_hmac_update( &ctx, input, ilen );
     md5_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( md5_context ) );
+    md5_free( &ctx );
 }
 
 #if defined(POLARSSL_SELF_TEST)
@@ -413,7 +443,7 @@ void md5_hmac( const unsigned char *key, size_t keylen,
  */
 static unsigned char md5_test_buf[7][81] =
 {
-    { "" }, 
+    { "" },
     { "a" },
     { "abc" },
     { "message digest" },
@@ -522,29 +552,29 @@ int md5_self_test( int verbose )
     for( i = 0; i < 7; i++ )
     {
         if( verbose != 0 )
-            printf( "  MD5 test #%d: ", i + 1 );
+            polarssl_printf( "  MD5 test #%d: ", i + 1 );
 
         md5( md5_test_buf[i], md5_test_buflen[i], md5sum );
 
         if( memcmp( md5sum, md5_test_sum[i], 16 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     for( i = 0; i < 7; i++ )
     {
         if( verbose != 0 )
-            printf( "  HMAC-MD5 test #%d: ", i + 1 );
+            polarssl_printf( "  HMAC-MD5 test #%d: ", i + 1 );
 
         if( i == 5 || i == 6 )
         {
@@ -565,21 +595,21 @@ int md5_self_test( int verbose )
         if( memcmp( md5sum, md5_hmac_test_sum[i], buflen ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
             return( 1 );
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_MD5_C */
diff --git a/Externals/polarssl/library/md_wrap.c b/Externals/polarssl/library/md_wrap.c
index f276db5925..de701d319a 100644
--- a/Externals/polarssl/library/md_wrap.c
+++ b/Externals/polarssl/library/md_wrap.c
@@ -5,7 +5,7 @@
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,7 +27,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_MD_C)
 
@@ -45,20 +49,36 @@
 #include "polarssl/md5.h"
 #endif
 
+#if defined(POLARSSL_RIPEMD160_C)
+#include "polarssl/ripemd160.h"
+#endif
+
 #if defined(POLARSSL_SHA1_C)
 #include "polarssl/sha1.h"
 #endif
 
-#if defined(POLARSSL_SHA2_C)
-#include "polarssl/sha2.h"
+#if defined(POLARSSL_SHA256_C)
+#include "polarssl/sha256.h"
 #endif
 
-#if defined(POLARSSL_SHA4_C)
-#include "polarssl/sha4.h"
+#if defined(POLARSSL_SHA512_C)
+#include "polarssl/sha512.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
 #endif
 
 #include <stdlib.h>
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if defined(POLARSSL_MD2_C)
 
 static void md2_starts_wrap( void *ctx )
@@ -66,7 +86,8 @@ static void md2_starts_wrap( void *ctx )
     md2_starts( (md2_context *) ctx );
 }
 
-static void md2_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md2_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
 {
     md2_update( (md2_context *) ctx, input, ilen );
 }
@@ -76,23 +97,25 @@ static void md2_finish_wrap( void *ctx, unsigned char *output )
     md2_finish( (md2_context *) ctx, output );
 }
 
-int md2_file_wrap( const char *path, unsigned char *output )
+static int md2_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
     return md2_file( path, output );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-static void md2_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void md2_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                  size_t keylen )
 {
     md2_hmac_starts( (md2_context *) ctx, key, keylen );
 }
 
-static void md2_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md2_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                  size_t ilen )
 {
     md2_hmac_update( (md2_context *) ctx, input, ilen );
 }
@@ -109,12 +132,20 @@ static void md2_hmac_reset_wrap( void *ctx )
 
 static void * md2_ctx_alloc( void )
 {
-    return malloc( sizeof( md2_context ) );
+    return polarssl_malloc( sizeof( md2_context ) );
 }
 
 static void md2_ctx_free( void *ctx )
 {
-    free( ctx );
+    polarssl_zeroize( ctx, sizeof( md2_context ) );
+    polarssl_free( ctx );
+}
+
+static void md2_process_wrap( void *ctx, const unsigned char *data )
+{
+    ((void) data);
+
+    md2_process( (md2_context *) ctx );
 }
 
 const md_info_t md2_info = {
@@ -133,66 +164,76 @@ const md_info_t md2_info = {
     md2_hmac,
     md2_ctx_alloc,
     md2_ctx_free,
+    md2_process_wrap,
 };
 
-#endif
+#endif /* POLARSSL_MD2_C */
 
 #if defined(POLARSSL_MD4_C)
 
-void md4_starts_wrap( void *ctx )
+static void md4_starts_wrap( void *ctx )
 {
     md4_starts( (md4_context *) ctx );
 }
 
-void md4_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md4_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
 {
     md4_update( (md4_context *) ctx, input, ilen );
 }
 
-void md4_finish_wrap( void *ctx, unsigned char *output )
+static void md4_finish_wrap( void *ctx, unsigned char *output )
 {
     md4_finish( (md4_context *) ctx, output );
 }
 
-int md4_file_wrap( const char *path, unsigned char *output )
+static int md4_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
     return md4_file( path, output );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void md4_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void md4_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                  size_t keylen )
 {
     md4_hmac_starts( (md4_context *) ctx, key, keylen );
 }
 
-void md4_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md4_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                  size_t ilen )
 {
     md4_hmac_update( (md4_context *) ctx, input, ilen );
 }
 
-void md4_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void md4_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
     md4_hmac_finish( (md4_context *) ctx, output );
 }
 
-void md4_hmac_reset_wrap( void *ctx )
+static void md4_hmac_reset_wrap( void *ctx )
 {
     md4_hmac_reset( (md4_context *) ctx );
 }
 
-void *md4_ctx_alloc( void )
+static void *md4_ctx_alloc( void )
 {
-    return malloc( sizeof( md4_context ) );
+    return polarssl_malloc( sizeof( md4_context ) );
 }
 
-void md4_ctx_free( void *ctx )
+static void md4_ctx_free( void *ctx )
 {
-    free( ctx );
+    polarssl_zeroize( ctx, sizeof( md4_context ) );
+    polarssl_free( ctx );
+}
+
+static void md4_process_wrap( void *ctx, const unsigned char *data )
+{
+    md4_process( (md4_context *) ctx, data );
 }
 
 const md_info_t md4_info = {
@@ -211,9 +252,10 @@ const md_info_t md4_info = {
     md4_hmac,
     md4_ctx_alloc,
     md4_ctx_free,
+    md4_process_wrap,
 };
 
-#endif
+#endif /* POLARSSL_MD4_C */
 
 #if defined(POLARSSL_MD5_C)
 
@@ -222,7 +264,8 @@ static void md5_starts_wrap( void *ctx )
     md5_starts( (md5_context *) ctx );
 }
 
-static void md5_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md5_update_wrap( void *ctx, const unsigned char *input,
+                             size_t ilen )
 {
     md5_update( (md5_context *) ctx, input, ilen );
 }
@@ -232,23 +275,25 @@ static void md5_finish_wrap( void *ctx, unsigned char *output )
     md5_finish( (md5_context *) ctx, output );
 }
 
-int md5_file_wrap( const char *path, unsigned char *output )
+static int md5_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
     return md5_file( path, output );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-static void md5_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void md5_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                  size_t keylen )
 {
     md5_hmac_starts( (md5_context *) ctx, key, keylen );
 }
 
-static void md5_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void md5_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                  size_t ilen )
 {
     md5_hmac_update( (md5_context *) ctx, input, ilen );
 }
@@ -265,12 +310,18 @@ static void md5_hmac_reset_wrap( void *ctx )
 
 static void * md5_ctx_alloc( void )
 {
-    return malloc( sizeof( md5_context ) );
+    return polarssl_malloc( sizeof( md5_context ) );
 }
 
 static void md5_ctx_free( void *ctx )
 {
-    free( ctx );
+    polarssl_zeroize( ctx, sizeof( md5_context ) );
+    polarssl_free( ctx );
+}
+
+static void md5_process_wrap( void *ctx, const unsigned char *data )
+{
+    md5_process( (md5_context *) ctx, data );
 }
 
 const md_info_t md5_info = {
@@ -289,66 +340,180 @@ const md_info_t md5_info = {
     md5_hmac,
     md5_ctx_alloc,
     md5_ctx_free,
+    md5_process_wrap,
 };
 
+#endif /* POLARSSL_MD5_C */
+
+#if defined(POLARSSL_RIPEMD160_C)
+
+static void ripemd160_starts_wrap( void *ctx )
+{
+    ripemd160_starts( (ripemd160_context *) ctx );
+}
+
+static void ripemd160_update_wrap( void *ctx, const unsigned char *input,
+                                   size_t ilen )
+{
+    ripemd160_update( (ripemd160_context *) ctx, input, ilen );
+}
+
+static void ripemd160_finish_wrap( void *ctx, unsigned char *output )
+{
+    ripemd160_finish( (ripemd160_context *) ctx, output );
+}
+
+static int ripemd160_file_wrap( const char *path, unsigned char *output )
+{
+#if defined(POLARSSL_FS_IO)
+    return ripemd160_file( path, output );
+#else
+    ((void) path);
+    ((void) output);
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
+}
+
+static void ripemd160_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                        size_t keylen )
+{
+    ripemd160_hmac_starts( (ripemd160_context *) ctx, key, keylen );
+}
+
+static void ripemd160_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                        size_t ilen )
+{
+    ripemd160_hmac_update( (ripemd160_context *) ctx, input, ilen );
+}
+
+static void ripemd160_hmac_finish_wrap( void *ctx, unsigned char *output )
+{
+    ripemd160_hmac_finish( (ripemd160_context *) ctx, output );
+}
+
+static void ripemd160_hmac_reset_wrap( void *ctx )
+{
+    ripemd160_hmac_reset( (ripemd160_context *) ctx );
+}
+
+static void * ripemd160_ctx_alloc( void )
+{
+    ripemd160_context *ctx;
+    ctx = (ripemd160_context *) polarssl_malloc( sizeof( ripemd160_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    ripemd160_init( ctx );
+
+    return( ctx );
+}
+
+static void ripemd160_ctx_free( void *ctx )
+{
+    ripemd160_free( (ripemd160_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void ripemd160_process_wrap( void *ctx, const unsigned char *data )
+{
+    ripemd160_process( (ripemd160_context *) ctx, data );
+}
+
+const md_info_t ripemd160_info = {
+    POLARSSL_MD_RIPEMD160,
+    "RIPEMD160",
+    20,
+    ripemd160_starts_wrap,
+    ripemd160_update_wrap,
+    ripemd160_finish_wrap,
+    ripemd160,
+    ripemd160_file_wrap,
+    ripemd160_hmac_starts_wrap,
+    ripemd160_hmac_update_wrap,
+    ripemd160_hmac_finish_wrap,
+    ripemd160_hmac_reset_wrap,
+    ripemd160_hmac,
+    ripemd160_ctx_alloc,
+    ripemd160_ctx_free,
+    ripemd160_process_wrap,
+};
+
+#endif /* POLARSSL_RIPEMD160_C */
 
 #if defined(POLARSSL_SHA1_C)
 
-void sha1_starts_wrap( void *ctx )
+static void sha1_starts_wrap( void *ctx )
 {
     sha1_starts( (sha1_context *) ctx );
 }
 
-void sha1_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha1_update_wrap( void *ctx, const unsigned char *input,
+                              size_t ilen )
 {
     sha1_update( (sha1_context *) ctx, input, ilen );
 }
 
-void sha1_finish_wrap( void *ctx, unsigned char *output )
+static void sha1_finish_wrap( void *ctx, unsigned char *output )
 {
     sha1_finish( (sha1_context *) ctx, output );
 }
 
-int sha1_file_wrap( const char *path, unsigned char *output )
+static int sha1_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
     return sha1_file( path, output );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void sha1_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void sha1_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                   size_t keylen )
 {
     sha1_hmac_starts( (sha1_context *) ctx, key, keylen );
 }
 
-void sha1_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha1_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                   size_t ilen )
 {
     sha1_hmac_update( (sha1_context *) ctx, input, ilen );
 }
 
-void sha1_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void sha1_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
     sha1_hmac_finish( (sha1_context *) ctx, output );
 }
 
-void sha1_hmac_reset_wrap( void *ctx )
+static void sha1_hmac_reset_wrap( void *ctx )
 {
     sha1_hmac_reset( (sha1_context *) ctx );
 }
 
-void * sha1_ctx_alloc( void )
+static void * sha1_ctx_alloc( void )
 {
-    return malloc( sizeof( sha1_context ) );
+    sha1_context *ctx;
+    ctx = (sha1_context *) polarssl_malloc( sizeof( sha1_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    sha1_init( ctx );
+
+    return( ctx );
 }
 
-void sha1_ctx_free( void *ctx )
+static void sha1_ctx_free( void *ctx )
 {
-    free( ctx );
+    sha1_free( (sha1_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void sha1_process_wrap( void *ctx, const unsigned char *data )
+{
+    sha1_process( (sha1_context *) ctx, data );
 }
 
 const md_info_t sha1_info = {
@@ -367,82 +532,92 @@ const md_info_t sha1_info = {
     sha1_hmac,
     sha1_ctx_alloc,
     sha1_ctx_free,
+    sha1_process_wrap,
 };
 
-#endif
+#endif /* POLARSSL_SHA1_C */
 
 /*
  * Wrappers for generic message digests
  */
-#if defined(POLARSSL_SHA2_C)
+#if defined(POLARSSL_SHA256_C)
 
-void sha224_starts_wrap( void *ctx )
+static void sha224_starts_wrap( void *ctx )
 {
-    sha2_starts( (sha2_context *) ctx, 1 );
+    sha256_starts( (sha256_context *) ctx, 1 );
 }
 
-void sha224_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha224_update_wrap( void *ctx, const unsigned char *input,
+                                size_t ilen )
 {
-    sha2_update( (sha2_context *) ctx, input, ilen );
+    sha256_update( (sha256_context *) ctx, input, ilen );
 }
 
-void sha224_finish_wrap( void *ctx, unsigned char *output )
+static void sha224_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha2_finish( (sha2_context *) ctx, output );
+    sha256_finish( (sha256_context *) ctx, output );
 }
 
-void sha224_wrap( const unsigned char *input, size_t ilen,
+static void sha224_wrap( const unsigned char *input, size_t ilen,
                     unsigned char *output )
 {
-    sha2( input, ilen, output, 1 );
+    sha256( input, ilen, output, 1 );
 }
 
-int sha224_file_wrap( const char *path, unsigned char *output )
+static int sha224_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
-    return sha2_file( path, output, 1 );
+    return sha256_file( path, output, 1 );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void sha224_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void sha224_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                     size_t keylen )
 {
-    sha2_hmac_starts( (sha2_context *) ctx, key, keylen, 1 );
+    sha256_hmac_starts( (sha256_context *) ctx, key, keylen, 1 );
 }
 
-void sha224_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha224_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                     size_t ilen )
 {
-    sha2_hmac_update( (sha2_context *) ctx, input, ilen );
+    sha256_hmac_update( (sha256_context *) ctx, input, ilen );
 }
 
-void sha224_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void sha224_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha2_hmac_finish( (sha2_context *) ctx, output );
+    sha256_hmac_finish( (sha256_context *) ctx, output );
 }
 
-void sha224_hmac_reset_wrap( void *ctx )
+static void sha224_hmac_reset_wrap( void *ctx )
 {
-    sha2_hmac_reset( (sha2_context *) ctx );
+    sha256_hmac_reset( (sha256_context *) ctx );
 }
 
-void sha224_hmac_wrap( const unsigned char *key, size_t keylen,
+static void sha224_hmac_wrap( const unsigned char *key, size_t keylen,
         const unsigned char *input, size_t ilen,
         unsigned char *output )
 {
-    sha2_hmac( key, keylen, input, ilen, output, 1 );
+    sha256_hmac( key, keylen, input, ilen, output, 1 );
 }
 
-void * sha224_ctx_alloc( void )
+static void * sha224_ctx_alloc( void )
 {
-    return malloc( sizeof( sha2_context ) );
+    return polarssl_malloc( sizeof( sha256_context ) );
 }
 
-void sha224_ctx_free( void *ctx )
+static void sha224_ctx_free( void *ctx )
 {
-    free( ctx );
+    polarssl_zeroize( ctx, sizeof( sha256_context ) );
+    polarssl_free( ctx );
+}
+
+static void sha224_process_wrap( void *ctx, const unsigned char *data )
+{
+    sha256_process( (sha256_context *) ctx, data );
 }
 
 const md_info_t sha224_info = {
@@ -461,75 +636,93 @@ const md_info_t sha224_info = {
     sha224_hmac_wrap,
     sha224_ctx_alloc,
     sha224_ctx_free,
+    sha224_process_wrap,
 };
 
-void sha256_starts_wrap( void *ctx )
+static void sha256_starts_wrap( void *ctx )
 {
-    sha2_starts( (sha2_context *) ctx, 0 );
+    sha256_starts( (sha256_context *) ctx, 0 );
 }
 
-void sha256_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha256_update_wrap( void *ctx, const unsigned char *input,
+                                size_t ilen )
 {
-    sha2_update( (sha2_context *) ctx, input, ilen );
+    sha256_update( (sha256_context *) ctx, input, ilen );
 }
 
-void sha256_finish_wrap( void *ctx, unsigned char *output )
+static void sha256_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha2_finish( (sha2_context *) ctx, output );
+    sha256_finish( (sha256_context *) ctx, output );
 }
 
-void sha256_wrap( const unsigned char *input, size_t ilen,
+static void sha256_wrap( const unsigned char *input, size_t ilen,
                     unsigned char *output )
 {
-    sha2( input, ilen, output, 0 );
+    sha256( input, ilen, output, 0 );
 }
 
-int sha256_file_wrap( const char *path, unsigned char *output )
+static int sha256_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
-    return sha2_file( path, output, 0 );
+    return sha256_file( path, output, 0 );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void sha256_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void sha256_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                     size_t keylen )
 {
-    sha2_hmac_starts( (sha2_context *) ctx, key, keylen, 0 );
+    sha256_hmac_starts( (sha256_context *) ctx, key, keylen, 0 );
 }
 
-void sha256_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha256_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                     size_t ilen )
 {
-    sha2_hmac_update( (sha2_context *) ctx, input, ilen );
+    sha256_hmac_update( (sha256_context *) ctx, input, ilen );
 }
 
-void sha256_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void sha256_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha2_hmac_finish( (sha2_context *) ctx, output );
+    sha256_hmac_finish( (sha256_context *) ctx, output );
 }
 
-void sha256_hmac_reset_wrap( void *ctx )
+static void sha256_hmac_reset_wrap( void *ctx )
 {
-    sha2_hmac_reset( (sha2_context *) ctx );
+    sha256_hmac_reset( (sha256_context *) ctx );
 }
 
-void sha256_hmac_wrap( const unsigned char *key, size_t keylen,
+static void sha256_hmac_wrap( const unsigned char *key, size_t keylen,
         const unsigned char *input, size_t ilen,
         unsigned char *output )
 {
-    sha2_hmac( key, keylen, input, ilen, output, 0 );
+    sha256_hmac( key, keylen, input, ilen, output, 0 );
 }
 
-void * sha256_ctx_alloc( void )
+static void * sha256_ctx_alloc( void )
 {
-    return malloc( sizeof( sha2_context ) );
+    sha256_context *ctx;
+    ctx = (sha256_context *) polarssl_malloc( sizeof( sha256_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    sha256_init( ctx );
+
+    return( ctx );
 }
 
-void sha256_ctx_free( void *ctx )
+static void sha256_ctx_free( void *ctx )
 {
-    free( ctx );
+    sha256_free( (sha256_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void sha256_process_wrap( void *ctx, const unsigned char *data )
+{
+    sha256_process( (sha256_context *) ctx, data );
 }
 
 const md_info_t sha256_info = {
@@ -548,79 +741,89 @@ const md_info_t sha256_info = {
     sha256_hmac_wrap,
     sha256_ctx_alloc,
     sha256_ctx_free,
+    sha256_process_wrap,
 };
 
-#endif
+#endif /* POLARSSL_SHA256_C */
 
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
 
-void sha384_starts_wrap( void *ctx )
+static void sha384_starts_wrap( void *ctx )
 {
-    sha4_starts( (sha4_context *) ctx, 1 );
+    sha512_starts( (sha512_context *) ctx, 1 );
 }
 
-void sha384_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha384_update_wrap( void *ctx, const unsigned char *input,
+                                size_t ilen )
 {
-    sha4_update( (sha4_context *) ctx, input, ilen );
+    sha512_update( (sha512_context *) ctx, input, ilen );
 }
 
-void sha384_finish_wrap( void *ctx, unsigned char *output )
+static void sha384_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha4_finish( (sha4_context *) ctx, output );
+    sha512_finish( (sha512_context *) ctx, output );
 }
 
-void sha384_wrap( const unsigned char *input, size_t ilen,
+static void sha384_wrap( const unsigned char *input, size_t ilen,
                     unsigned char *output )
 {
-    sha4( input, ilen, output, 1 );
+    sha512( input, ilen, output, 1 );
 }
 
-int sha384_file_wrap( const char *path, unsigned char *output )
+static int sha384_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
-    return sha4_file( path, output, 1 );
+    return sha512_file( path, output, 1 );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void sha384_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void sha384_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                     size_t keylen )
 {
-    sha4_hmac_starts( (sha4_context *) ctx, key, keylen, 1 );
+    sha512_hmac_starts( (sha512_context *) ctx, key, keylen, 1 );
 }
 
-void sha384_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha384_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                     size_t ilen )
 {
-    sha4_hmac_update( (sha4_context *) ctx, input, ilen );
+    sha512_hmac_update( (sha512_context *) ctx, input, ilen );
 }
 
-void sha384_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void sha384_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha4_hmac_finish( (sha4_context *) ctx, output );
+    sha512_hmac_finish( (sha512_context *) ctx, output );
 }
 
-void sha384_hmac_reset_wrap( void *ctx )
+static void sha384_hmac_reset_wrap( void *ctx )
 {
-    sha4_hmac_reset( (sha4_context *) ctx );
+    sha512_hmac_reset( (sha512_context *) ctx );
 }
 
-void sha384_hmac_wrap( const unsigned char *key, size_t keylen,
+static void sha384_hmac_wrap( const unsigned char *key, size_t keylen,
         const unsigned char *input, size_t ilen,
         unsigned char *output )
 {
-    sha4_hmac( key, keylen, input, ilen, output, 1 );
+    sha512_hmac( key, keylen, input, ilen, output, 1 );
 }
 
-void * sha384_ctx_alloc( void )
+static void * sha384_ctx_alloc( void )
 {
-    return malloc( sizeof( sha4_context ) );
+    return polarssl_malloc( sizeof( sha512_context ) );
 }
 
-void sha384_ctx_free( void *ctx )
+static void sha384_ctx_free( void *ctx )
 {
-    free( ctx );
+    polarssl_zeroize( ctx, sizeof( sha512_context ) );
+    polarssl_free( ctx );
+}
+
+static void sha384_process_wrap( void *ctx, const unsigned char *data )
+{
+    sha512_process( (sha512_context *) ctx, data );
 }
 
 const md_info_t sha384_info = {
@@ -639,75 +842,93 @@ const md_info_t sha384_info = {
     sha384_hmac_wrap,
     sha384_ctx_alloc,
     sha384_ctx_free,
+    sha384_process_wrap,
 };
 
-void sha512_starts_wrap( void *ctx )
+static void sha512_starts_wrap( void *ctx )
 {
-    sha4_starts( (sha4_context *) ctx, 0 );
+    sha512_starts( (sha512_context *) ctx, 0 );
 }
 
-void sha512_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha512_update_wrap( void *ctx, const unsigned char *input,
+                                size_t ilen )
 {
-    sha4_update( (sha4_context *) ctx, input, ilen );
+    sha512_update( (sha512_context *) ctx, input, ilen );
 }
 
-void sha512_finish_wrap( void *ctx, unsigned char *output )
+static void sha512_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha4_finish( (sha4_context *) ctx, output );
+    sha512_finish( (sha512_context *) ctx, output );
 }
 
-void sha512_wrap( const unsigned char *input, size_t ilen,
+static void sha512_wrap( const unsigned char *input, size_t ilen,
                     unsigned char *output )
 {
-    sha4( input, ilen, output, 0 );
+    sha512( input, ilen, output, 0 );
 }
 
-int sha512_file_wrap( const char *path, unsigned char *output )
+static int sha512_file_wrap( const char *path, unsigned char *output )
 {
 #if defined(POLARSSL_FS_IO)
-    return sha4_file( path, output, 0 );
+    return sha512_file( path, output, 0 );
 #else
     ((void) path);
     ((void) output);
-    return POLARSSL_ERR_MD_FEATURE_UNAVAILABLE;
+    return( POLARSSL_ERR_MD_FEATURE_UNAVAILABLE );
 #endif
 }
 
-void sha512_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void sha512_hmac_starts_wrap( void *ctx, const unsigned char *key,
+                                     size_t keylen )
 {
-    sha4_hmac_starts( (sha4_context *) ctx, key, keylen, 0 );
+    sha512_hmac_starts( (sha512_context *) ctx, key, keylen, 0 );
 }
 
-void sha512_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void sha512_hmac_update_wrap( void *ctx, const unsigned char *input,
+                                     size_t ilen )
 {
-    sha4_hmac_update( (sha4_context *) ctx, input, ilen );
+    sha512_hmac_update( (sha512_context *) ctx, input, ilen );
 }
 
-void sha512_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void sha512_hmac_finish_wrap( void *ctx, unsigned char *output )
 {
-    sha4_hmac_finish( (sha4_context *) ctx, output );
+    sha512_hmac_finish( (sha512_context *) ctx, output );
 }
 
-void sha512_hmac_reset_wrap( void *ctx )
+static void sha512_hmac_reset_wrap( void *ctx )
 {
-    sha4_hmac_reset( (sha4_context *) ctx );
+    sha512_hmac_reset( (sha512_context *) ctx );
 }
 
-void sha512_hmac_wrap( const unsigned char *key, size_t keylen,
+static void sha512_hmac_wrap( const unsigned char *key, size_t keylen,
         const unsigned char *input, size_t ilen,
         unsigned char *output )
 {
-    sha4_hmac( key, keylen, input, ilen, output, 0 );
+    sha512_hmac( key, keylen, input, ilen, output, 0 );
 }
 
-void * sha512_ctx_alloc( void )
+static void * sha512_ctx_alloc( void )
 {
-    return malloc( sizeof( sha4_context ) );
+    sha512_context *ctx;
+    ctx = (sha512_context *) polarssl_malloc( sizeof( sha512_context ) );
+
+    if( ctx == NULL )
+        return( NULL );
+
+    sha512_init( ctx );
+
+    return( ctx );
 }
 
-void sha512_ctx_free( void *ctx )
+static void sha512_ctx_free( void *ctx )
 {
-    free( ctx );
+    sha512_free( (sha512_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void sha512_process_wrap( void *ctx, const unsigned char *data )
+{
+    sha512_process( (sha512_context *) ctx, data );
 }
 
 const md_info_t sha512_info = {
@@ -726,8 +947,9 @@ const md_info_t sha512_info = {
     sha512_hmac_wrap,
     sha512_ctx_alloc,
     sha512_ctx_free,
+    sha512_process_wrap,
 };
 
-#endif
+#endif /* POLARSSL_SHA512_C */
 
-#endif
+#endif /* POLARSSL_MD_C */
diff --git a/Externals/polarssl/library/memory_buffer_alloc.c b/Externals/polarssl/library/memory_buffer_alloc.c
new file mode 100644
index 0000000000..7710ba52b1
--- /dev/null
+++ b/Externals/polarssl/library/memory_buffer_alloc.c
@@ -0,0 +1,589 @@
+/*
+ *  Buffer-based memory allocator
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
+
+#include "polarssl/memory_buffer_alloc.h"
+
+#include <string.h>
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+#include <stdio.h>
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+#include <execinfo.h>
+#endif
+#endif
+
+#if defined(POLARSSL_THREADING_C)
+#include "polarssl/threading.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_fprintf fprintf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#define MAGIC1       0xFF00AA55
+#define MAGIC2       0xEE119966
+#define MAX_BT 20
+
+typedef struct _memory_header memory_header;
+struct _memory_header
+{
+    size_t          magic1;
+    size_t          size;
+    size_t          alloc;
+    memory_header   *prev;
+    memory_header   *next;
+    memory_header   *prev_free;
+    memory_header   *next_free;
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    char            **trace;
+    size_t          trace_count;
+#endif
+    size_t          magic2;
+};
+
+typedef struct
+{
+    unsigned char   *buf;
+    size_t          len;
+    memory_header   *first;
+    memory_header   *first_free;
+    size_t          current_alloc_size;
+    int             verify;
+#if defined(POLARSSL_MEMORY_DEBUG)
+    size_t          malloc_count;
+    size_t          free_count;
+    size_t          total_used;
+    size_t          maximum_used;
+    size_t          header_count;
+    size_t          maximum_header_count;
+#endif
+#if defined(POLARSSL_THREADING_C)
+    threading_mutex_t   mutex;
+#endif
+}
+buffer_alloc_ctx;
+
+static buffer_alloc_ctx heap;
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+static void debug_header( memory_header *hdr )
+{
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    size_t i;
+#endif
+
+    polarssl_fprintf( stderr, "HDR:  PTR(%10u), PREV(%10u), NEXT(%10u), "
+                              "ALLOC(%u), SIZE(%10u)\n",
+                      (size_t) hdr, (size_t) hdr->prev, (size_t) hdr->next,
+                      hdr->alloc, hdr->size );
+    polarssl_fprintf( stderr, "      FPREV(%10u), FNEXT(%10u)\n",
+                      (size_t) hdr->prev_free, (size_t) hdr->next_free );
+
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    polarssl_fprintf( stderr, "TRACE: \n" );
+    for( i = 0; i < hdr->trace_count; i++ )
+        polarssl_fprintf( stderr, "%s\n", hdr->trace[i] );
+    polarssl_fprintf( stderr, "\n" );
+#endif
+}
+
+static void debug_chain()
+{
+    memory_header *cur = heap.first;
+
+    polarssl_fprintf( stderr, "\nBlock list\n" );
+    while( cur != NULL )
+    {
+        debug_header( cur );
+        cur = cur->next;
+    }
+
+    polarssl_fprintf( stderr, "Free list\n" );
+    cur = heap.first_free;
+
+    while( cur != NULL )
+    {
+        debug_header( cur );
+        cur = cur->next_free;
+    }
+}
+#endif /* POLARSSL_MEMORY_DEBUG */
+
+static int verify_header( memory_header *hdr )
+{
+    if( hdr->magic1 != MAGIC1 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: MAGIC1 mismatch\n" );
+#endif
+        return( 1 );
+    }
+
+    if( hdr->magic2 != MAGIC2 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: MAGIC2 mismatch\n" );
+#endif
+        return( 1 );
+    }
+
+    if( hdr->alloc > 1 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: alloc has illegal value\n" );
+#endif
+        return( 1 );
+    }
+
+    if( hdr->prev != NULL && hdr->prev == hdr->next )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: prev == next\n" );
+#endif
+        return( 1 );
+    }
+
+    if( hdr->prev_free != NULL && hdr->prev_free == hdr->next_free )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: prev_free == next_free\n" );
+#endif
+        return( 1 );
+    }
+
+    return( 0 );
+}
+
+static int verify_chain()
+{
+    memory_header *prv = heap.first, *cur = heap.first->next;
+
+    if( verify_header( heap.first ) != 0 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: verification of first header "
+                                  "failed\n" );
+#endif
+        return( 1 );
+    }
+
+    if( heap.first->prev != NULL )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: verification failed: "
+                                  "first->prev != NULL\n" );
+#endif
+        return( 1 );
+    }
+
+    while( cur != NULL )
+    {
+        if( verify_header( cur ) != 0 )
+        {
+#if defined(POLARSSL_MEMORY_DEBUG)
+            polarssl_fprintf( stderr, "FATAL: verification of header "
+                                      "failed\n" );
+#endif
+            return( 1 );
+        }
+
+        if( cur->prev != prv )
+        {
+#if defined(POLARSSL_MEMORY_DEBUG)
+            polarssl_fprintf( stderr, "FATAL: verification failed: "
+                                      "cur->prev != prv\n" );
+#endif
+            return( 1 );
+        }
+
+        prv = cur;
+        cur = cur->next;
+    }
+
+    return( 0 );
+}
+
+static void *buffer_alloc_malloc( size_t len )
+{
+    memory_header *new, *cur = heap.first_free;
+    unsigned char *p;
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    void *trace_buffer[MAX_BT];
+    size_t trace_cnt;
+#endif
+
+    if( heap.buf == NULL || heap.first == NULL )
+        return( NULL );
+
+    if( len % POLARSSL_MEMORY_ALIGN_MULTIPLE )
+    {
+        len -= len % POLARSSL_MEMORY_ALIGN_MULTIPLE;
+        len += POLARSSL_MEMORY_ALIGN_MULTIPLE;
+    }
+
+    // Find block that fits
+    //
+    while( cur != NULL )
+    {
+        if( cur->size >= len )
+            break;
+
+        cur = cur->next_free;
+    }
+
+    if( cur == NULL )
+        return( NULL );
+
+    if( cur->alloc != 0 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: block in free_list but allocated "
+                                  "data\n" );
+#endif
+        exit( 1 );
+    }
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+    heap.malloc_count++;
+#endif
+
+    // Found location, split block if > memory_header + 4 room left
+    //
+    if( cur->size - len < sizeof(memory_header) +
+                          POLARSSL_MEMORY_ALIGN_MULTIPLE )
+    {
+        cur->alloc = 1;
+
+        // Remove from free_list
+        //
+        if( cur->prev_free != NULL )
+            cur->prev_free->next_free = cur->next_free;
+        else
+            heap.first_free = cur->next_free;
+
+        if( cur->next_free != NULL )
+            cur->next_free->prev_free = cur->prev_free;
+
+        cur->prev_free = NULL;
+        cur->next_free = NULL;
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+        heap.total_used += cur->size;
+        if( heap.total_used > heap.maximum_used )
+            heap.maximum_used = heap.total_used;
+#endif
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+        trace_cnt = backtrace( trace_buffer, MAX_BT );
+        cur->trace = backtrace_symbols( trace_buffer, trace_cnt );
+        cur->trace_count = trace_cnt;
+#endif
+
+        if( ( heap.verify & MEMORY_VERIFY_ALLOC ) && verify_chain() != 0 )
+            exit( 1 );
+
+        return( ( (unsigned char *) cur ) + sizeof(memory_header) );
+    }
+
+    p = ( (unsigned char *) cur ) + sizeof(memory_header) + len;
+    new = (memory_header *) p;
+
+    new->size = cur->size - len - sizeof(memory_header);
+    new->alloc = 0;
+    new->prev = cur;
+    new->next = cur->next;
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    new->trace = NULL;
+    new->trace_count = 0;
+#endif
+    new->magic1 = MAGIC1;
+    new->magic2 = MAGIC2;
+
+    if( new->next != NULL )
+        new->next->prev = new;
+
+    // Replace cur with new in free_list
+    //
+    new->prev_free = cur->prev_free;
+    new->next_free = cur->next_free;
+    if( new->prev_free != NULL )
+        new->prev_free->next_free = new;
+    else
+        heap.first_free = new;
+
+    if( new->next_free != NULL )
+        new->next_free->prev_free = new;
+
+    cur->alloc = 1;
+    cur->size = len;
+    cur->next = new;
+    cur->prev_free = NULL;
+    cur->next_free = NULL;
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+    heap.header_count++;
+    if( heap.header_count > heap.maximum_header_count )
+        heap.maximum_header_count = heap.header_count;
+    heap.total_used += cur->size;
+    if( heap.total_used > heap.maximum_used )
+        heap.maximum_used = heap.total_used;
+#endif
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    trace_cnt = backtrace( trace_buffer, MAX_BT );
+    cur->trace = backtrace_symbols( trace_buffer, trace_cnt );
+    cur->trace_count = trace_cnt;
+#endif
+
+    if( ( heap.verify & MEMORY_VERIFY_ALLOC ) && verify_chain() != 0 )
+        exit( 1 );
+
+    return( ( (unsigned char *) cur ) + sizeof(memory_header) );
+}
+
+static void buffer_alloc_free( void *ptr )
+{
+    memory_header *hdr, *old = NULL;
+    unsigned char *p = (unsigned char *) ptr;
+
+    if( ptr == NULL || heap.buf == NULL || heap.first == NULL )
+        return;
+
+    if( p < heap.buf || p > heap.buf + heap.len )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: polarssl_free() outside of managed "
+                                  "space\n" );
+#endif
+        exit( 1 );
+    }
+
+    p -= sizeof(memory_header);
+    hdr = (memory_header *) p;
+
+    if( verify_header( hdr ) != 0 )
+        exit( 1 );
+
+    if( hdr->alloc != 1 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        polarssl_fprintf( stderr, "FATAL: polarssl_free() on unallocated "
+                                  "data\n" );
+#endif
+        exit( 1 );
+    }
+
+    hdr->alloc = 0;
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+    heap.free_count++;
+    heap.total_used -= hdr->size;
+#endif
+
+    // Regroup with block before
+    //
+    if( hdr->prev != NULL && hdr->prev->alloc == 0 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        heap.header_count--;
+#endif
+        hdr->prev->size += sizeof(memory_header) + hdr->size;
+        hdr->prev->next = hdr->next;
+        old = hdr;
+        hdr = hdr->prev;
+
+        if( hdr->next != NULL )
+            hdr->next->prev = hdr;
+
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+        free( old->trace );
+#endif
+        memset( old, 0, sizeof(memory_header) );
+    }
+
+    // Regroup with block after
+    //
+    if( hdr->next != NULL && hdr->next->alloc == 0 )
+    {
+#if defined(POLARSSL_MEMORY_DEBUG)
+        heap.header_count--;
+#endif
+        hdr->size += sizeof(memory_header) + hdr->next->size;
+        old = hdr->next;
+        hdr->next = hdr->next->next;
+
+        if( hdr->prev_free != NULL || hdr->next_free != NULL )
+        {
+            if( hdr->prev_free != NULL )
+                hdr->prev_free->next_free = hdr->next_free;
+            else
+                heap.first_free = hdr->next_free;
+
+            if( hdr->next_free != NULL )
+                hdr->next_free->prev_free = hdr->prev_free;
+        }
+
+        hdr->prev_free = old->prev_free;
+        hdr->next_free = old->next_free;
+
+        if( hdr->prev_free != NULL )
+            hdr->prev_free->next_free = hdr;
+        else
+            heap.first_free = hdr;
+
+        if( hdr->next_free != NULL )
+            hdr->next_free->prev_free = hdr;
+
+        if( hdr->next != NULL )
+            hdr->next->prev = hdr;
+
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+        free( old->trace );
+#endif
+        memset( old, 0, sizeof(memory_header) );
+    }
+
+    // Prepend to free_list if we have not merged
+    // (Does not have to stay in same order as prev / next list)
+    //
+    if( old == NULL )
+    {
+        hdr->next_free = heap.first_free;
+        heap.first_free->prev_free = hdr;
+        heap.first_free = hdr;
+    }
+
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    hdr->trace = NULL;
+    hdr->trace_count = 0;
+#endif
+
+    if( ( heap.verify & MEMORY_VERIFY_FREE ) && verify_chain() != 0 )
+        exit( 1 );
+}
+
+void memory_buffer_set_verify( int verify )
+{
+    heap.verify = verify;
+}
+
+int memory_buffer_alloc_verify()
+{
+    return verify_chain();
+}
+
+#if defined(POLARSSL_MEMORY_DEBUG)
+void memory_buffer_alloc_status()
+{
+    polarssl_fprintf( stderr,
+                      "Current use: %u blocks / %u bytes, max: %u blocks / "
+                      "%u bytes (total %u bytes), malloc / free: %u / %u\n",
+                      heap.header_count, heap.total_used,
+                      heap.maximum_header_count, heap.maximum_used,
+                      heap.maximum_header_count * sizeof( memory_header )
+                      + heap.maximum_used,
+                      heap.malloc_count, heap.free_count );
+
+    if( heap.first->next == NULL )
+        polarssl_fprintf( stderr, "All memory de-allocated in stack buffer\n" );
+    else
+    {
+        polarssl_fprintf( stderr, "Memory currently allocated:\n" );
+        debug_chain();
+    }
+}
+#endif /* POLARSSL_MEMORY_DEBUG */
+
+#if defined(POLARSSL_THREADING_C)
+static void *buffer_alloc_malloc_mutexed( size_t len )
+{
+    void *buf;
+    polarssl_mutex_lock( &heap.mutex );
+    buf = buffer_alloc_malloc( len );
+    polarssl_mutex_unlock( &heap.mutex );
+    return( buf );
+}
+
+static void buffer_alloc_free_mutexed( void *ptr )
+{
+    polarssl_mutex_lock( &heap.mutex );
+    buffer_alloc_free( ptr );
+    polarssl_mutex_unlock( &heap.mutex );
+}
+#endif /* POLARSSL_THREADING_C */
+
+int memory_buffer_alloc_init( unsigned char *buf, size_t len )
+{
+    memset( &heap, 0, sizeof(buffer_alloc_ctx) );
+    memset( buf, 0, len );
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_init( &heap.mutex );
+    platform_set_malloc_free( buffer_alloc_malloc_mutexed,
+                              buffer_alloc_free_mutexed );
+#else
+    platform_set_malloc_free( buffer_alloc_malloc, buffer_alloc_free );
+#endif
+
+    if( (size_t) buf % POLARSSL_MEMORY_ALIGN_MULTIPLE )
+    {
+        buf += POLARSSL_MEMORY_ALIGN_MULTIPLE
+             - (size_t) buf % POLARSSL_MEMORY_ALIGN_MULTIPLE;
+        len -= (size_t) buf % POLARSSL_MEMORY_ALIGN_MULTIPLE;
+    }
+
+    heap.buf = buf;
+    heap.len = len;
+
+    heap.first = (memory_header *) buf;
+    heap.first->size = len - sizeof(memory_header);
+    heap.first->magic1 = MAGIC1;
+    heap.first->magic2 = MAGIC2;
+    heap.first_free = heap.first;
+    return( 0 );
+}
+
+void memory_buffer_alloc_free()
+{
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_free( &heap.mutex );
+#endif
+    polarssl_zeroize( &heap, sizeof(buffer_alloc_ctx) );
+}
+
+#endif /* POLARSSL_MEMORY_BUFFER_ALLOC_C */
diff --git a/Externals/polarssl/library/net.c b/Externals/polarssl/library/net.c
index 7a1818df0e..ad4b8921c5 100644
--- a/Externals/polarssl/library/net.c
+++ b/Externals/polarssl/library/net.c
@@ -1,7 +1,7 @@
 /*
  *  TCP networking functions
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,22 +23,38 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_NET_C)
 
 #include "polarssl/net.h"
 
-#if defined(_WIN32) || defined(_WIN32_WCE)
+#if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
+    !defined(EFI32)
+
+#if defined(POLARSSL_HAVE_IPV6)
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+/* Enables getaddrinfo() & Co */
+#define _WIN32_WINNT 0x0501
+#include <ws2tcpip.h>
+#endif
 
 #include <winsock2.h>
 #include <windows.h>
 
+#if defined(_MSC_VER)
 #if defined(_WIN32_WCE)
 #pragma comment( lib, "ws2.lib" )
 #else
 #pragma comment( lib, "ws2_32.lib" )
 #endif
+#endif /* _MSC_VER */
 
 #define read(fd,buf,len)        recv(fd,(char*)buf,(int) len,0)
 #define write(fd,buf,len)       send(fd,(char*)buf,(int) len,0)
@@ -46,13 +62,15 @@
 
 static int wsa_init_done = 0;
 
-#else
+#else /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#if defined(POLARSSL_HAVE_TIME)
 #include <sys/time.h>
+#endif
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -60,23 +78,34 @@ static int wsa_init_done = 0;
 #include <errno.h>
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||  \
-    defined(__DragonflyBSD__)
+    defined(__DragonFly__)
 #include <sys/endian.h>
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(HAVE_MACHINE_ENDIAN_H) ||   \
+      defined(EFIX64) || defined(EFI32)
 #include <machine/endian.h>
 #elif defined(sun)
 #include <sys/isa_defs.h>
+#elif defined(_AIX) || defined(HAVE_ARPA_NAMESER_COMPAT_H)
+#include <arpa/nameser_compat.h>
 #else
 #include <endian.h>
 #endif
 
-#endif
+#endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#define  snprintf  _snprintf
+#endif
+
+#if defined(POLARSSL_HAVE_TIME)
+#include <time.h>
+#endif
+
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
 #else
@@ -85,10 +114,11 @@ typedef UINT32 uint32_t;
 
 /*
  * htons() is not always available.
- * By default go for LITTLE_ENDIAN variant. Otherwise hope for _BYTE_ORDER and __BIG_ENDIAN
- * to help determine endianess.
+ * By default go for LITTLE_ENDIAN variant. Otherwise hope for _BYTE_ORDER and
+ * __BIG_ENDIAN to help determine endianness.
  */
-#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
+#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) &&                   \
+    __BYTE_ORDER == __BIG_ENDIAN
 #define POLARSSL_HTONS(n) (n)
 #define POLARSSL_HTONL(n) (n)
 #else
@@ -100,37 +130,101 @@ typedef UINT32 uint32_t;
                            (((unsigned long )(n) & 0xFF000000) >> 24))
 #endif
 
-unsigned short net_htons(unsigned short n);
-unsigned long  net_htonl(unsigned long  n);
+unsigned short net_htons( unsigned short n );
+unsigned long  net_htonl( unsigned long  n );
 #define net_htons(n) POLARSSL_HTONS(n)
 #define net_htonl(n) POLARSSL_HTONL(n)
 
+/*
+ * Prepare for using the sockets interface
+ */
+static int net_prepare( void )
+{
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
+    WSADATA wsaData;
+
+    if( wsa_init_done == 0 )
+    {
+        if( WSAStartup( MAKEWORD(2,0), &wsaData ) != 0 )
+            return( POLARSSL_ERR_NET_SOCKET_FAILED );
+
+        wsa_init_done = 1;
+    }
+#else
+#if !defined(EFIX64) && !defined(EFI32)
+    signal( SIGPIPE, SIG_IGN );
+#endif
+#endif
+    return( 0 );
+}
+
 /*
  * Initiate a TCP connection with host:port
  */
 int net_connect( int *fd, const char *host, int port )
 {
+#if defined(POLARSSL_HAVE_IPV6)
+    int ret;
+    struct addrinfo hints, *addr_list, *cur;
+    char port_str[6];
+
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    /* getaddrinfo expects port as a string */
+    memset( port_str, 0, sizeof( port_str ) );
+    snprintf( port_str, sizeof( port_str ), "%d", port );
+
+    /* Do name resolution with both IPv6 and IPv4, but only TCP */
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
+
+    if( getaddrinfo( host, port_str, &hints, &addr_list ) != 0 )
+        return( POLARSSL_ERR_NET_UNKNOWN_HOST );
+
+    /* Try the sockaddrs until a connection succeeds */
+    ret = POLARSSL_ERR_NET_UNKNOWN_HOST;
+    for( cur = addr_list; cur != NULL; cur = cur->ai_next )
+    {
+        *fd = (int) socket( cur->ai_family, cur->ai_socktype,
+                            cur->ai_protocol );
+        if( *fd < 0 )
+        {
+            ret = POLARSSL_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        if( connect( *fd, cur->ai_addr, cur->ai_addrlen ) == 0 )
+        {
+            ret = 0;
+            break;
+        }
+
+        close( *fd );
+        ret = POLARSSL_ERR_NET_CONNECT_FAILED;
+    }
+
+    freeaddrinfo( addr_list );
+
+    return( ret );
+
+#else
+    /* Legacy IPv4-only version */
+
+    int ret;
     struct sockaddr_in server_addr;
     struct hostent *server_host;
 
-#if defined(_WIN32) || defined(_WIN32_WCE)
-    WSADATA wsaData;
-
-    if( wsa_init_done == 0 )
-    {
-        if( WSAStartup( MAKEWORD(2,0), &wsaData ) == SOCKET_ERROR )
-            return( POLARSSL_ERR_NET_SOCKET_FAILED );
-
-        wsa_init_done = 1;
-    }
-#else
-    signal( SIGPIPE, SIG_IGN );
-#endif
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
 
     if( ( server_host = gethostbyname( host ) ) == NULL )
         return( POLARSSL_ERR_NET_UNKNOWN_HOST );
 
-    if( ( *fd = socket( AF_INET, SOCK_STREAM, IPPROTO_IP ) ) < 0 )
+    if( ( *fd = (int) socket( AF_INET, SOCK_STREAM, IPPROTO_IP ) ) < 0 )
         return( POLARSSL_ERR_NET_SOCKET_FAILED );
 
     memcpy( (void *) &server_addr.sin_addr,
@@ -148,6 +242,7 @@ int net_connect( int *fd, const char *host, int port )
     }
 
     return( 0 );
+#endif /* POLARSSL_HAVE_IPV6 */
 }
 
 /*
@@ -155,24 +250,83 @@ int net_connect( int *fd, const char *host, int port )
  */
 int net_bind( int *fd, const char *bind_ip, int port )
 {
-    int n, c[4];
+#if defined(POLARSSL_HAVE_IPV6)
+    int n, ret;
+    struct addrinfo hints, *addr_list, *cur;
+    char port_str[6];
+
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
+
+    /* getaddrinfo expects port as a string */
+    memset( port_str, 0, sizeof( port_str ) );
+    snprintf( port_str, sizeof( port_str ), "%d", port );
+
+    /* Bind to IPv6 and/or IPv4, but only in TCP */
+    memset( &hints, 0, sizeof( hints ) );
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
+    if( bind_ip == NULL )
+        hints.ai_flags = AI_PASSIVE;
+
+    if( getaddrinfo( bind_ip, port_str, &hints, &addr_list ) != 0 )
+        return( POLARSSL_ERR_NET_UNKNOWN_HOST );
+
+    /* Try the sockaddrs until a binding succeeds */
+    ret = POLARSSL_ERR_NET_UNKNOWN_HOST;
+    for( cur = addr_list; cur != NULL; cur = cur->ai_next )
+    {
+        *fd = (int) socket( cur->ai_family, cur->ai_socktype,
+                            cur->ai_protocol );
+        if( *fd < 0 )
+        {
+            ret = POLARSSL_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        n = 1;
+        if( setsockopt( *fd, SOL_SOCKET, SO_REUSEADDR,
+                        (const char *) &n, sizeof( n ) ) != 0 )
+        {
+            close( *fd );
+            ret = POLARSSL_ERR_NET_SOCKET_FAILED;
+            continue;
+        }
+
+        if( bind( *fd, cur->ai_addr, cur->ai_addrlen ) != 0 )
+        {
+            close( *fd );
+            ret = POLARSSL_ERR_NET_BIND_FAILED;
+            continue;
+        }
+
+        if( listen( *fd, POLARSSL_NET_LISTEN_BACKLOG ) != 0 )
+        {
+            close( *fd );
+            ret = POLARSSL_ERR_NET_LISTEN_FAILED;
+            continue;
+        }
+
+        /* I we ever get there, it's a success */
+        ret = 0;
+        break;
+    }
+
+    freeaddrinfo( addr_list );
+
+    return( ret );
+
+#else
+    /* Legacy IPv4-only version */
+
+    int ret, n, c[4];
     struct sockaddr_in server_addr;
 
-#if defined(_WIN32) || defined(_WIN32_WCE)
-    WSADATA wsaData;
+    if( ( ret = net_prepare() ) != 0 )
+        return( ret );
 
-    if( wsa_init_done == 0 )
-    {
-        if( WSAStartup( MAKEWORD(2,0), &wsaData ) == SOCKET_ERROR )
-            return( POLARSSL_ERR_NET_SOCKET_FAILED );
-
-        wsa_init_done = 1;
-    }
-#else
-    signal( SIGPIPE, SIG_IGN );
-#endif
-
-    if( ( *fd = socket( AF_INET, SOCK_STREAM, IPPROTO_IP ) ) < 0 )
+    if( ( *fd = (int) socket( AF_INET, SOCK_STREAM, IPPROTO_IP ) ) < 0 )
         return( POLARSSL_ERR_NET_SOCKET_FAILED );
 
     n = 1;
@@ -214,16 +368,35 @@ int net_bind( int *fd, const char *bind_ip, int port )
     }
 
     return( 0 );
+#endif /* POLARSSL_HAVE_IPV6 */
 }
 
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
 /*
- * Check if the current operation is blocking
+ * Check if the requested operation would be blocking on a non-blocking socket
+ * and thus 'failed' with a negative return value.
  */
-static int net_is_blocking( void )
+static int net_would_block( int fd )
 {
-#if defined(_WIN32) || defined(_WIN32_WCE)
+    ((void) fd);
     return( WSAGetLastError() == WSAEWOULDBLOCK );
+}
 #else
+/*
+ * Check if the requested operation would be blocking on a non-blocking socket
+ * and thus 'failed' with a negative return value.
+ *
+ * Note: on a blocking socket this function always returns 0!
+ */
+static int net_would_block( int fd )
+{
+    /*
+     * Never return 'WOULD BLOCK' on a non-blocking socket
+     */
+    if( ( fcntl( fd, F_GETFL ) & O_NONBLOCK ) != O_NONBLOCK )
+        return( 0 );
+
     switch( errno )
     {
 #if defined EAGAIN
@@ -235,15 +408,19 @@ static int net_is_blocking( void )
             return( 1 );
     }
     return( 0 );
-#endif
 }
+#endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
 
 /*
  * Accept a connection from a remote client
  */
 int net_accept( int bind_fd, int *client_fd, void *client_ip )
 {
+#if defined(POLARSSL_HAVE_IPV6)
+    struct sockaddr_storage client_addr;
+#else
     struct sockaddr_in client_addr;
+#endif
 
 #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) ||  \
     defined(_SOCKLEN_T_DECLARED)
@@ -252,20 +429,37 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
     int n = (int) sizeof( client_addr );
 #endif
 
-    *client_fd = accept( bind_fd, (struct sockaddr *)
-                         &client_addr, &n );
+    *client_fd = (int) accept( bind_fd, (struct sockaddr *)
+                               &client_addr, &n );
 
     if( *client_fd < 0 )
     {
-        if( net_is_blocking() != 0 )
+        if( net_would_block( *client_fd ) != 0 )
             return( POLARSSL_ERR_NET_WANT_READ );
 
         return( POLARSSL_ERR_NET_ACCEPT_FAILED );
     }
 
     if( client_ip != NULL )
+    {
+#if defined(POLARSSL_HAVE_IPV6)
+        if( client_addr.ss_family == AF_INET )
+        {
+            struct sockaddr_in *addr4 = (struct sockaddr_in *) &client_addr;
+            memcpy( client_ip, &addr4->sin_addr.s_addr,
+                        sizeof( addr4->sin_addr.s_addr ) );
+        }
+        else
+        {
+            struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &client_addr;
+            memcpy( client_ip, &addr6->sin6_addr.s6_addr,
+                        sizeof( addr6->sin6_addr.s6_addr ) );
+        }
+#else
         memcpy( client_ip, &client_addr.sin_addr.s_addr,
                     sizeof( client_addr.sin_addr.s_addr ) );
+#endif /* POLARSSL_HAVE_IPV6 */
+    }
 
     return( 0 );
 }
@@ -275,7 +469,8 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
  */
 int net_set_block( int fd )
 {
-#if defined(_WIN32) || defined(_WIN32_WCE)
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
     u_long n = 0;
     return( ioctlsocket( fd, FIONBIO, &n ) );
 #else
@@ -285,7 +480,8 @@ int net_set_block( int fd )
 
 int net_set_nonblock( int fd )
 {
-#if defined(_WIN32) || defined(_WIN32_WCE)
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
     u_long n = 1;
     return( ioctlsocket( fd, FIONBIO, &n ) );
 #else
@@ -293,6 +489,7 @@ int net_set_nonblock( int fd )
 #endif
 }
 
+#if defined(POLARSSL_HAVE_TIME)
 /*
  * Portable usleep helper
  */
@@ -303,20 +500,23 @@ void net_usleep( unsigned long usec )
     tv.tv_usec = usec;
     select( 0, NULL, NULL, NULL, &tv );
 }
+#endif /* POLARSSL_HAVE_TIME */
 
 /*
  * Read at most 'len' characters
  */
 int net_recv( void *ctx, unsigned char *buf, size_t len )
-{ 
-    int ret = read( *((int *) ctx), buf, len );
+{
+    int fd = *((int *) ctx);
+    int ret = read( fd, buf, len );
 
     if( ret < 0 )
     {
-        if( net_is_blocking() != 0 )
+        if( net_would_block( fd ) != 0 )
             return( POLARSSL_ERR_NET_WANT_READ );
 
-#if defined(_WIN32) || defined(_WIN32_WCE)
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
         if( WSAGetLastError() == WSAECONNRESET )
             return( POLARSSL_ERR_NET_CONN_RESET );
 #else
@@ -338,14 +538,16 @@ int net_recv( void *ctx, unsigned char *buf, size_t len )
  */
 int net_send( void *ctx, const unsigned char *buf, size_t len )
 {
-    int ret = write( *((int *) ctx), buf, len );
+    int fd = *((int *) ctx);
+    int ret = write( fd, buf, len );
 
     if( ret < 0 )
     {
-        if( net_is_blocking() != 0 )
+        if( net_would_block( fd ) != 0 )
             return( POLARSSL_ERR_NET_WANT_WRITE );
 
-#if defined(_WIN32) || defined(_WIN32_WCE)
+#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
+    !defined(EFI32)
         if( WSAGetLastError() == WSAECONNRESET )
             return( POLARSSL_ERR_NET_CONN_RESET );
 #else
@@ -371,4 +573,4 @@ void net_close( int fd )
     close( fd );
 }
 
-#endif
+#endif /* POLARSSL_NET_C */
diff --git a/Externals/polarssl/library/oid.c b/Externals/polarssl/library/oid.c
new file mode 100644
index 0000000000..7b54054de2
--- /dev/null
+++ b/Externals/polarssl/library/oid.c
@@ -0,0 +1,684 @@
+/**
+ * \file oid.c
+ *
+ * \brief Object Identifier (OID) database
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_OID_C)
+
+#include "polarssl/oid.h"
+#include "polarssl/rsa.h"
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
+#include "polarssl/x509.h"
+#endif
+
+#include <stdio.h>
+
+/*
+ * Macro to automatically add the size of #define'd OIDs
+ */
+#define ADD_LEN(s)      s, OID_SIZE(s)
+
+/*
+ * Macro to generate an internal function for oid_XXX_from_asn1() (used by
+ * the other functions)
+ */
+#define FN_OID_TYPED_FROM_ASN1( TYPE_T, NAME, LIST )                        \
+static const TYPE_T * oid_ ## NAME ## _from_asn1( const asn1_buf *oid )     \
+{                                                                           \
+    const TYPE_T *p = LIST;                                                 \
+    const oid_descriptor_t *cur = (const oid_descriptor_t *) p;             \
+    if( p == NULL || oid == NULL ) return( NULL );                          \
+    while( cur->asn1 != NULL ) {                                            \
+        if( cur->asn1_len == oid->len &&                                    \
+            memcmp( cur->asn1, oid->p, oid->len ) == 0 ) {                  \
+            return( p );                                                    \
+        }                                                                   \
+        p++;                                                                \
+        cur = (const oid_descriptor_t *) p;                                 \
+    }                                                                       \
+    return( NULL );                                                         \
+}
+
+/*
+ * Macro to generate a function for retrieving a single attribute from the
+ * descriptor of an oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_DESCRIPTOR_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
+int FN_NAME( const asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+{                                                                       \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+    if( data == NULL ) return( POLARSSL_ERR_OID_NOT_FOUND );            \
+    *ATTR1 = data->descriptor.ATTR1;                                    \
+    return( 0 );                                                        \
+}
+
+/*
+ * Macro to generate a function for retrieving a single attribute from an
+ * oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_ATTR1(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1) \
+int FN_NAME( const asn1_buf *oid, ATTR1_TYPE * ATTR1 )                  \
+{                                                                       \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );        \
+    if( data == NULL ) return( POLARSSL_ERR_OID_NOT_FOUND );            \
+    *ATTR1 = data->ATTR1;                                               \
+    return( 0 );                                                        \
+}
+
+/*
+ * Macro to generate a function for retrieving two attributes from an
+ * oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_ATTR2(FN_NAME, TYPE_T, TYPE_NAME, ATTR1_TYPE, ATTR1,     \
+                         ATTR2_TYPE, ATTR2)                                 \
+int FN_NAME( const asn1_buf *oid, ATTR1_TYPE * ATTR1, ATTR2_TYPE * ATTR2 )  \
+{                                                                           \
+    const TYPE_T *data = oid_ ## TYPE_NAME ## _from_asn1( oid );            \
+    if( data == NULL ) return( POLARSSL_ERR_OID_NOT_FOUND );                \
+    *ATTR1 = data->ATTR1;                                                   \
+    *ATTR2 = data->ATTR2;                                                   \
+    return( 0 );                                                            \
+}
+
+/*
+ * Macro to generate a function for retrieving the OID based on a single
+ * attribute from a oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_OID_BY_ATTR1(FN_NAME, TYPE_T, LIST, ATTR1_TYPE, ATTR1)   \
+int FN_NAME( ATTR1_TYPE ATTR1, const char **oid, size_t *olen )             \
+{                                                                           \
+    const TYPE_T *cur = LIST;                                               \
+    while( cur->descriptor.asn1 != NULL ) {                                 \
+        if( cur->ATTR1 == ATTR1 ) {                                         \
+            *oid = cur->descriptor.asn1;                                    \
+            *olen = cur->descriptor.asn1_len;                               \
+            return( 0 );                                                    \
+        }                                                                   \
+        cur++;                                                              \
+    }                                                                       \
+    return( POLARSSL_ERR_OID_NOT_FOUND );                                   \
+}
+
+/*
+ * Macro to generate a function for retrieving the OID based on two
+ * attributes from a oid_descriptor_t wrapper.
+ */
+#define FN_OID_GET_OID_BY_ATTR2(FN_NAME, TYPE_T, LIST, ATTR1_TYPE, ATTR1,   \
+                                ATTR2_TYPE, ATTR2)                          \
+int FN_NAME( ATTR1_TYPE ATTR1, ATTR2_TYPE ATTR2, const char **oid ,         \
+             size_t *olen )                                                 \
+{                                                                           \
+    const TYPE_T *cur = LIST;                                               \
+    while( cur->descriptor.asn1 != NULL ) {                                 \
+        if( cur->ATTR1 == ATTR1 && cur->ATTR2 == ATTR2 ) {                  \
+            *oid = cur->descriptor.asn1;                                    \
+            *olen = cur->descriptor.asn1_len;                               \
+            return( 0 );                                                    \
+        }                                                                   \
+        cur++;                                                              \
+    }                                                                       \
+    return( POLARSSL_ERR_OID_NOT_FOUND );                                   \
+}
+
+/*
+ * For X520 attribute types
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    const char          *short_name;
+} oid_x520_attr_t;
+
+static const oid_x520_attr_t oid_x520_attr_type[] =
+{
+    {
+        { ADD_LEN( OID_AT_CN ),          "id-at-commonName",               "Common Name" },
+        "CN",
+    },
+    {
+        { ADD_LEN( OID_AT_COUNTRY ),     "id-at-countryName",              "Country" },
+        "C",
+    },
+    {
+        { ADD_LEN( OID_AT_LOCALITY ),    "id-at-locality",                 "Locality" },
+        "L",
+    },
+    {
+        { ADD_LEN( OID_AT_STATE ),       "id-at-state",                    "State" },
+        "ST",
+    },
+    {
+        { ADD_LEN( OID_AT_ORGANIZATION ),"id-at-organizationName",         "Organization" },
+        "O",
+    },
+    {
+        { ADD_LEN( OID_AT_ORG_UNIT ),    "id-at-organizationalUnitName",   "Org Unit" },
+        "OU",
+    },
+    {
+        { ADD_LEN( OID_PKCS9_EMAIL ),    "emailAddress",                   "E-mail address" },
+        "emailAddress",
+    },
+    {
+        { ADD_LEN( OID_AT_SERIAL_NUMBER ),"id-at-serialNumber",            "Serial number" },
+        "serialNumber",
+    },
+    {
+        { ADD_LEN( OID_AT_POSTAL_ADDRESS ),"id-at-postalAddress",          "Postal address" },
+        "postalAddress",
+    },
+    {
+        { ADD_LEN( OID_AT_POSTAL_CODE ), "id-at-postalCode",               "Postal code" },
+        "postalCode",
+    },
+    {
+        { ADD_LEN( OID_AT_SUR_NAME ),    "id-at-surName",                  "Surname" },
+        "SN",
+    },
+    {
+        { ADD_LEN( OID_AT_GIVEN_NAME ),  "id-at-givenName",                "Given name" },
+        "GN",
+    },
+    {
+        { ADD_LEN( OID_AT_INITIALS ),    "id-at-initials",                 "Initials" },
+        "initials",
+    },
+    {
+        { ADD_LEN( OID_AT_GENERATION_QUALIFIER ), "id-at-generationQualifier", "Generation qualifier" },
+        "generationQualifier",
+    },
+    {
+        { ADD_LEN( OID_AT_TITLE ),       "id-at-title",                    "Title" },
+        "title",
+    },
+    {
+        { ADD_LEN( OID_AT_DN_QUALIFIER ),"id-at-dnQualifier",              "Distinguished Name qualifier" },
+        "dnQualifier",
+    },
+    {
+        { ADD_LEN( OID_AT_PSEUDONYM ),   "id-at-pseudonym",                "Pseudonym" },
+        "pseudonym",
+    },
+    {
+        { ADD_LEN( OID_DOMAIN_COMPONENT ), "id-domainComponent",           "Domain component" },
+        "DC",
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        NULL,
+    }
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_x520_attr_t, x520_attr, oid_x520_attr_type);
+FN_OID_GET_ATTR1(oid_get_attr_short_name, oid_x520_attr_t, x520_attr, const char *, short_name);
+
+#if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
+/*
+ * For X509 extensions
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    int                 ext_type;
+} oid_x509_ext_t;
+
+static const oid_x509_ext_t oid_x509_ext[] =
+{
+    {
+        { ADD_LEN( OID_BASIC_CONSTRAINTS ),    "id-ce-basicConstraints",   "Basic Constraints" },
+        EXT_BASIC_CONSTRAINTS,
+    },
+    {
+        { ADD_LEN( OID_KEY_USAGE ),            "id-ce-keyUsage",           "Key Usage" },
+        EXT_KEY_USAGE,
+    },
+    {
+        { ADD_LEN( OID_EXTENDED_KEY_USAGE ),   "id-ce-keyUsage",           "Extended Key Usage" },
+        EXT_EXTENDED_KEY_USAGE,
+    },
+    {
+        { ADD_LEN( OID_SUBJECT_ALT_NAME ),     "id-ce-subjectAltName",     "Subject Alt Name" },
+        EXT_SUBJECT_ALT_NAME,
+    },
+    {
+        { ADD_LEN( OID_NS_CERT_TYPE ),         "id-netscape-certtype",     "Netscape Certificate Type" },
+        EXT_NS_CERT_TYPE,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_x509_ext_t, x509_ext, oid_x509_ext);
+FN_OID_GET_ATTR1(oid_get_x509_ext_type, oid_x509_ext_t, x509_ext, int, ext_type);
+
+static const oid_descriptor_t oid_ext_key_usage[] =
+{
+    { ADD_LEN( OID_SERVER_AUTH ),      "id-kp-serverAuth",      "TLS Web Server Authentication" },
+    { ADD_LEN( OID_CLIENT_AUTH ),      "id-kp-clientAuth",      "TLS Web Client Authentication" },
+    { ADD_LEN( OID_CODE_SIGNING ),     "id-kp-codeSigning",     "Code Signing" },
+    { ADD_LEN( OID_EMAIL_PROTECTION ), "id-kp-emailProtection", "E-mail Protection" },
+    { ADD_LEN( OID_TIME_STAMPING ),    "id-kp-timeStamping",    "Time Stamping" },
+    { ADD_LEN( OID_OCSP_SIGNING ),     "id-kp-OCSPSigning",     "OCSP Signing" },
+    { NULL, 0, NULL, NULL },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_descriptor_t, ext_key_usage, oid_ext_key_usage);
+FN_OID_GET_ATTR1(oid_get_extended_key_usage, oid_descriptor_t, ext_key_usage, const char *, description);
+#endif /* POLARSSL_X509_USE_C || POLARSSL_X509_CREATE_C */
+
+#if defined(POLARSSL_MD_C)
+/*
+ * For SignatureAlgorithmIdentifier
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    md_type_t           md_alg;
+    pk_type_t           pk_alg;
+} oid_sig_alg_t;
+
+static const oid_sig_alg_t oid_sig_alg[] =
+{
+    {
+        { ADD_LEN( OID_PKCS1_MD2 ),        "md2WithRSAEncryption",     "RSA with MD2" },
+        POLARSSL_MD_MD2,      POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_MD4 ),        "md4WithRSAEncryption",     "RSA with MD4" },
+        POLARSSL_MD_MD4,      POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_MD5 ),        "md5WithRSAEncryption",     "RSA with MD5" },
+        POLARSSL_MD_MD5,      POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_SHA1 ),       "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        POLARSSL_MD_SHA1,     POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_SHA224 ),     "sha224WithRSAEncryption",  "RSA with SHA-224" },
+        POLARSSL_MD_SHA224,   POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_SHA256 ),     "sha256WithRSAEncryption",  "RSA with SHA-256" },
+        POLARSSL_MD_SHA256,   POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_SHA384 ),     "sha384WithRSAEncryption",  "RSA with SHA-384" },
+        POLARSSL_MD_SHA384,   POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_PKCS1_SHA512 ),     "sha512WithRSAEncryption",  "RSA with SHA-512" },
+        POLARSSL_MD_SHA512,   POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_RSA_SHA_OBS ),      "sha-1WithRSAEncryption",   "RSA with SHA1" },
+        POLARSSL_MD_SHA1,     POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_ECDSA_SHA1 ),       "ecdsa-with-SHA1",      "ECDSA with SHA1" },
+        POLARSSL_MD_SHA1,     POLARSSL_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( OID_ECDSA_SHA224 ),     "ecdsa-with-SHA224",    "ECDSA with SHA224" },
+        POLARSSL_MD_SHA224,   POLARSSL_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( OID_ECDSA_SHA256 ),     "ecdsa-with-SHA256",    "ECDSA with SHA256" },
+        POLARSSL_MD_SHA256,   POLARSSL_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( OID_ECDSA_SHA384 ),     "ecdsa-with-SHA384",    "ECDSA with SHA384" },
+        POLARSSL_MD_SHA384,   POLARSSL_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( OID_ECDSA_SHA512 ),     "ecdsa-with-SHA512",    "ECDSA with SHA512" },
+        POLARSSL_MD_SHA512,   POLARSSL_PK_ECDSA,
+    },
+    {
+        { ADD_LEN( OID_RSASSA_PSS ),        "RSASSA-PSS",           "RSASSA-PSS" },
+        POLARSSL_MD_NONE,     POLARSSL_PK_RSASSA_PSS,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0, 0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_sig_alg_t, sig_alg, oid_sig_alg);
+FN_OID_GET_DESCRIPTOR_ATTR1(oid_get_sig_alg_desc, oid_sig_alg_t, sig_alg, const char *, description);
+FN_OID_GET_ATTR2(oid_get_sig_alg, oid_sig_alg_t, sig_alg, md_type_t, md_alg, pk_type_t, pk_alg);
+FN_OID_GET_OID_BY_ATTR2(oid_get_oid_by_sig_alg, oid_sig_alg_t, oid_sig_alg, pk_type_t, pk_alg, md_type_t, md_alg);
+#endif /* POLARSSL_MD_C */
+
+/*
+ * For PublicKeyInfo (PKCS1, RFC 5480)
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    pk_type_t           pk_alg;
+} oid_pk_alg_t;
+
+static const oid_pk_alg_t oid_pk_alg[] =
+{
+    {
+        { ADD_LEN( OID_PKCS1_RSA ),      "rsaEncryption",   "RSA" },
+        POLARSSL_PK_RSA,
+    },
+    {
+        { ADD_LEN( OID_EC_ALG_UNRESTRICTED ),  "id-ecPublicKey",   "Generic EC key" },
+        POLARSSL_PK_ECKEY,
+    },
+    {
+        { ADD_LEN( OID_EC_ALG_ECDH ),          "id-ecDH",          "EC key for ECDH" },
+        POLARSSL_PK_ECKEY_DH,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_pk_alg_t, pk_alg, oid_pk_alg);
+FN_OID_GET_ATTR1(oid_get_pk_alg, oid_pk_alg_t, pk_alg, pk_type_t, pk_alg);
+FN_OID_GET_OID_BY_ATTR1(oid_get_oid_by_pk_alg, oid_pk_alg_t, oid_pk_alg, pk_type_t, pk_alg);
+
+#if defined(POLARSSL_ECP_C)
+/*
+ * For namedCurve (RFC 5480)
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    ecp_group_id        grp_id;
+} oid_ecp_grp_t;
+
+static const oid_ecp_grp_t oid_ecp_grp[] =
+{
+    {
+        { ADD_LEN( OID_EC_GRP_SECP192R1 ), "secp192r1",    "secp192r1" },
+        POLARSSL_ECP_DP_SECP192R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP224R1 ), "secp224r1",    "secp224r1" },
+        POLARSSL_ECP_DP_SECP224R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP256R1 ), "secp256r1",    "secp256r1" },
+        POLARSSL_ECP_DP_SECP256R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP384R1 ), "secp384r1",    "secp384r1" },
+        POLARSSL_ECP_DP_SECP384R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP521R1 ), "secp521r1",    "secp521r1" },
+        POLARSSL_ECP_DP_SECP521R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP192K1 ), "secp192k1",    "secp192k1" },
+        POLARSSL_ECP_DP_SECP192K1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP224K1 ), "secp224k1",    "secp224k1" },
+        POLARSSL_ECP_DP_SECP224K1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_SECP256K1 ), "secp256k1",    "secp256k1" },
+        POLARSSL_ECP_DP_SECP256K1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_BP256R1 ),   "brainpoolP256r1","brainpool256r1" },
+        POLARSSL_ECP_DP_BP256R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_BP384R1 ),   "brainpoolP384r1","brainpool384r1" },
+        POLARSSL_ECP_DP_BP384R1,
+    },
+    {
+        { ADD_LEN( OID_EC_GRP_BP512R1 ),   "brainpoolP512r1","brainpool512r1" },
+        POLARSSL_ECP_DP_BP512R1,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_ecp_grp_t, grp_id, oid_ecp_grp);
+FN_OID_GET_ATTR1(oid_get_ec_grp, oid_ecp_grp_t, grp_id, ecp_group_id, grp_id);
+FN_OID_GET_OID_BY_ATTR1(oid_get_oid_by_ec_grp, oid_ecp_grp_t, oid_ecp_grp, ecp_group_id, grp_id);
+#endif /* POLARSSL_ECP_C */
+
+#if defined(POLARSSL_CIPHER_C)
+/*
+ * For PKCS#5 PBES2 encryption algorithm
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    cipher_type_t       cipher_alg;
+} oid_cipher_alg_t;
+
+static const oid_cipher_alg_t oid_cipher_alg[] =
+{
+    {
+        { ADD_LEN( OID_DES_CBC ),              "desCBC",       "DES-CBC" },
+        POLARSSL_CIPHER_DES_CBC,
+    },
+    {
+        { ADD_LEN( OID_DES_EDE3_CBC ),         "des-ede3-cbc", "DES-EDE3-CBC" },
+        POLARSSL_CIPHER_DES_EDE3_CBC,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_cipher_alg_t, cipher_alg, oid_cipher_alg);
+FN_OID_GET_ATTR1(oid_get_cipher_alg, oid_cipher_alg_t, cipher_alg, cipher_type_t, cipher_alg);
+#endif /* POLARSSL_CIPHER_C */
+
+#if defined(POLARSSL_MD_C)
+/*
+ * For digestAlgorithm
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    md_type_t           md_alg;
+} oid_md_alg_t;
+
+static const oid_md_alg_t oid_md_alg[] =
+{
+    {
+        { ADD_LEN( OID_DIGEST_ALG_MD2 ),       "id-md2",       "MD2" },
+        POLARSSL_MD_MD2,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_MD4 ),       "id-md4",       "MD4" },
+        POLARSSL_MD_MD4,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_MD5 ),       "id-md5",       "MD5" },
+        POLARSSL_MD_MD5,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_SHA1 ),      "id-sha1",      "SHA-1" },
+        POLARSSL_MD_SHA1,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_SHA224 ),    "id-sha224",    "SHA-224" },
+        POLARSSL_MD_SHA224,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_SHA256 ),    "id-sha256",    "SHA-256" },
+        POLARSSL_MD_SHA256,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_SHA384 ),    "id-sha384",    "SHA-384" },
+        POLARSSL_MD_SHA384,
+    },
+    {
+        { ADD_LEN( OID_DIGEST_ALG_SHA512 ),    "id-sha512",    "SHA-512" },
+        POLARSSL_MD_SHA512,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_md_alg_t, md_alg, oid_md_alg);
+FN_OID_GET_ATTR1(oid_get_md_alg, oid_md_alg_t, md_alg, md_type_t, md_alg);
+FN_OID_GET_OID_BY_ATTR1(oid_get_oid_by_md, oid_md_alg_t, oid_md_alg, md_type_t, md_alg);
+#endif /* POLARSSL_MD_C */
+
+#if defined(POLARSSL_PKCS12_C)
+/*
+ * For PKCS#12 PBEs
+ */
+typedef struct {
+    oid_descriptor_t    descriptor;
+    md_type_t           md_alg;
+    cipher_type_t       cipher_alg;
+} oid_pkcs12_pbe_alg_t;
+
+static const oid_pkcs12_pbe_alg_t oid_pkcs12_pbe_alg[] =
+{
+    {
+        { ADD_LEN( OID_PKCS12_PBE_SHA1_DES3_EDE_CBC ), "pbeWithSHAAnd3-KeyTripleDES-CBC", "PBE with SHA1 and 3-Key 3DES" },
+        POLARSSL_MD_SHA1,      POLARSSL_CIPHER_DES_EDE3_CBC,
+    },
+    {
+        { ADD_LEN( OID_PKCS12_PBE_SHA1_DES2_EDE_CBC ), "pbeWithSHAAnd2-KeyTripleDES-CBC", "PBE with SHA1 and 2-Key 3DES" },
+        POLARSSL_MD_SHA1,      POLARSSL_CIPHER_DES_EDE_CBC,
+    },
+    {
+        { NULL, 0, NULL, NULL },
+        0, 0,
+    },
+};
+
+FN_OID_TYPED_FROM_ASN1(oid_pkcs12_pbe_alg_t, pkcs12_pbe_alg, oid_pkcs12_pbe_alg);
+FN_OID_GET_ATTR2(oid_get_pkcs12_pbe_alg, oid_pkcs12_pbe_alg_t, pkcs12_pbe_alg, md_type_t, md_alg, cipher_type_t, cipher_alg);
+#endif /* POLARSSL_PKCS12_C */
+
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf( char *str, size_t size, const char *format, ... )
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if( res < 0 )
+        return( (int) size + 20 );
+
+    return( res );
+}
+
+#define snprintf compat_snprintf
+#endif /* _MSC_VER && !snprintf && !EFIX64 && !EFI32 */
+
+#define SAFE_SNPRINTF()                             \
+{                                                   \
+    if( ret == -1 )                                 \
+        return( POLARSSL_ERR_OID_BUF_TOO_SMALL );   \
+                                                    \
+    if( (unsigned int) ret >= n ) {                 \
+        p[n - 1] = '\0';                            \
+        return( POLARSSL_ERR_OID_BUF_TOO_SMALL );   \
+    }                                               \
+                                                    \
+    n -= (unsigned int) ret;                        \
+    p += (unsigned int) ret;                        \
+}
+
+/* Return the x.y.z.... style numeric string for the given OID */
+int oid_get_numeric_string( char *buf, size_t size,
+                            const asn1_buf *oid )
+{
+    int ret;
+    size_t i, n;
+    unsigned int value;
+    char *p;
+
+    p = buf;
+    n = size;
+
+    /* First byte contains first two dots */
+    if( oid->len > 0 )
+    {
+        ret = snprintf( p, n, "%d.%d", oid->p[0] / 40, oid->p[0] % 40 );
+        SAFE_SNPRINTF();
+    }
+
+    value = 0;
+    for( i = 1; i < oid->len; i++ )
+    {
+        /* Prevent overflow in value. */
+        if( ( ( value << 7 ) >> 7 ) != value )
+            return( POLARSSL_ERR_OID_BUF_TOO_SMALL );
+
+        value <<= 7;
+        value += oid->p[i] & 0x7F;
+
+        if( !( oid->p[i] & 0x80 ) )
+        {
+            /* Last byte */
+            ret = snprintf( p, n, ".%d", value );
+            SAFE_SNPRINTF();
+            value = 0;
+        }
+    }
+
+    return( (int) ( size - n ) );
+}
+
+#endif /* POLARSSL_OID_C */
diff --git a/Externals/polarssl/library/padlock.c b/Externals/polarssl/library/padlock.c
index a7b4c0c77b..5d06390cad 100644
--- a/Externals/polarssl/library/padlock.c
+++ b/Externals/polarssl/library/padlock.c
@@ -1,7 +1,7 @@
 /*
  *  VIA PadLock support functions
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *  programming_guide.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_PADLOCK_C)
 
@@ -43,21 +47,21 @@
 int padlock_supports( int feature )
 {
     static int flags = -1;
-    int ebx, edx;
+    int ebx = 0, edx = 0;
 
     if( flags == -1 )
     {
-        asm( "movl  %%ebx, %0           \n"     \
-             "movl  $0xC0000000, %%eax  \n"     \
-             "cpuid                     \n"     \
-             "cmpl  $0xC0000001, %%eax  \n"     \
-             "movl  $0, %%edx           \n"     \
-             "jb    unsupported         \n"     \
-             "movl  $0xC0000001, %%eax  \n"     \
-             "cpuid                     \n"     \
-             "unsupported:              \n"     \
-             "movl  %%edx, %1           \n"     \
-             "movl  %2, %%ebx           \n"
+        asm( "movl  %%ebx, %0           \n\t"
+             "movl  $0xC0000000, %%eax  \n\t"
+             "cpuid                     \n\t"
+             "cmpl  $0xC0000001, %%eax  \n\t"
+             "movl  $0, %%edx           \n\t"
+             "jb    unsupported         \n\t"
+             "movl  $0xC0000001, %%eax  \n\t"
+             "cpuid                     \n\t"
+             "unsupported:              \n\t"
+             "movl  %%edx, %1           \n\t"
+             "movl  %2, %%ebx           \n\t"
              : "=m" (ebx), "=m" (edx)
              :  "m" (ebx)
              : "eax", "ecx", "edx" );
@@ -76,7 +80,7 @@ int padlock_xcryptecb( aes_context *ctx,
                        const unsigned char input[16],
                        unsigned char output[16] )
 {
-    int ebx;
+    int ebx = 0;
     uint32_t *rk;
     uint32_t *blk;
     uint32_t *ctrl;
@@ -89,15 +93,16 @@ int padlock_xcryptecb( aes_context *ctx,
      ctrl = blk + 4;
     *ctrl = 0x80 | ctx->nr | ( ( ctx->nr + ( mode^1 ) - 10 ) << 9 );
 
-    asm( "pushfl; popfl         \n"     \
-         "movl    %%ebx, %0     \n"     \
-         "movl    $1, %%ecx     \n"     \
-         "movl    %2, %%edx     \n"     \
-         "movl    %3, %%ebx     \n"     \
-         "movl    %4, %%esi     \n"     \
-         "movl    %4, %%edi     \n"     \
-         ".byte  0xf3,0x0f,0xa7,0xc8\n" \
-         "movl    %1, %%ebx     \n"
+    asm( "pushfl                        \n\t"
+         "popfl                         \n\t"
+         "movl    %%ebx, %0             \n\t"
+         "movl    $1, %%ecx             \n\t"
+         "movl    %2, %%edx             \n\t"
+         "movl    %3, %%ebx             \n\t"
+         "movl    %4, %%esi             \n\t"
+         "movl    %4, %%edi             \n\t"
+         ".byte  0xf3,0x0f,0xa7,0xc8    \n\t"
+         "movl    %1, %%ebx             \n\t"
          : "=m" (ebx)
          :  "m" (ebx), "m" (ctrl), "m" (rk), "m" (blk)
          : "ecx", "edx", "esi", "edi" );
@@ -117,7 +122,7 @@ int padlock_xcryptcbc( aes_context *ctx,
                        const unsigned char *input,
                        unsigned char *output )
 {
-    int ebx;
+    int ebx = 0;
     size_t count;
     uint32_t *rk;
     uint32_t *iw;
@@ -133,20 +138,21 @@ int padlock_xcryptcbc( aes_context *ctx,
     memcpy( iw, iv, 16 );
 
      ctrl = iw + 4;
-    *ctrl = 0x80 | ctx->nr | ( ( ctx->nr + (mode^1) - 10 ) << 9 );
+    *ctrl = 0x80 | ctx->nr | ( ( ctx->nr + ( mode ^ 1 ) - 10 ) << 9 );
 
-    count = (length + 15) >> 4;
+    count = ( length + 15 ) >> 4;
 
-    asm( "pushfl; popfl         \n"     \
-         "movl    %%ebx, %0     \n"     \
-         "movl    %2, %%ecx     \n"     \
-         "movl    %3, %%edx     \n"     \
-         "movl    %4, %%ebx     \n"     \
-         "movl    %5, %%esi     \n"     \
-         "movl    %6, %%edi     \n"     \
-         "movl    %7, %%eax     \n"     \
-         ".byte  0xf3,0x0f,0xa7,0xd0\n" \
-         "movl    %1, %%ebx     \n"
+    asm( "pushfl                        \n\t"
+         "popfl                         \n\t"
+         "movl    %%ebx, %0             \n\t"
+         "movl    %2, %%ecx             \n\t"
+         "movl    %3, %%edx             \n\t"
+         "movl    %4, %%ebx             \n\t"
+         "movl    %5, %%esi             \n\t"
+         "movl    %6, %%edi             \n\t"
+         "movl    %7, %%eax             \n\t"
+         ".byte  0xf3,0x0f,0xa7,0xd0    \n\t"
+         "movl    %1, %%ebx             \n\t"
          : "=m" (ebx)
          :  "m" (ebx), "m" (count), "m" (ctrl),
             "m"  (rk), "m" (input), "m" (output), "m" (iw)
@@ -157,6 +163,6 @@ int padlock_xcryptcbc( aes_context *ctx,
     return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_HAVE_X86 */
 
-#endif
+#endif /* POLARSSL_PADLOCK_C */
diff --git a/Externals/polarssl/library/pbkdf2.c b/Externals/polarssl/library/pbkdf2.c
index 09e56dfa3c..e76f066421 100644
--- a/Externals/polarssl/library/pbkdf2.c
+++ b/Externals/polarssl/library/pbkdf2.c
@@ -6,7 +6,7 @@
  *
  * \author Mathias Olsson <mathias@kompetensum.com>
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -34,7 +34,11 @@
  * http://tools.ietf.org/html/rfc6070 (Test vectors)
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_PBKDF2_C)
 
diff --git a/Externals/polarssl/library/pem.c b/Externals/polarssl/library/pem.c
index e2e399801b..485d829c08 100644
--- a/Externals/polarssl/library/pem.c
+++ b/Externals/polarssl/library/pem.c
@@ -1,7 +1,7 @@
 /*
  *  Privacy Enhanced Mail (PEM) decoding
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,10 +23,13 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
-#if defined(POLARSSL_PEM_C)
-
+#if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C)
 #include "polarssl/pem.h"
 #include "polarssl/base64.h"
 #include "polarssl/des.h"
@@ -34,18 +37,33 @@
 #include "polarssl/md5.h"
 #include "polarssl/cipher.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if defined(POLARSSL_PEM_PARSE_C)
 void pem_init( pem_context *ctx )
 {
     memset( ctx, 0, sizeof( pem_context ) );
 }
 
-#if defined(POLARSSL_MD5_C) && (defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C))
+#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) &&         \
+    ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
 /*
  * Read a 16-byte hex string and convert it to binary
  */
-static int pem_get_iv( const unsigned char *s, unsigned char *iv, size_t iv_len )
+static int pem_get_iv( const unsigned char *s, unsigned char *iv,
+                       size_t iv_len )
 {
     size_t i, j, k;
 
@@ -74,6 +92,8 @@ static void pem_pbkdf1( unsigned char *key, size_t keylen,
     unsigned char md5sum[16];
     size_t use_len;
 
+    md5_init( &md5_ctx );
+
     /*
      * key[ 0..15] = MD5(pwd || IV)
      */
@@ -86,8 +106,8 @@ static void pem_pbkdf1( unsigned char *key, size_t keylen,
     {
         memcpy( key, md5sum, keylen );
 
-        memset( &md5_ctx, 0, sizeof(  md5_ctx ) );
-        memset( md5sum, 0, 16 );
+        md5_free( &md5_ctx );
+        polarssl_zeroize( md5sum, 16 );
         return;
     }
 
@@ -108,8 +128,8 @@ static void pem_pbkdf1( unsigned char *key, size_t keylen,
 
     memcpy( key + 16, md5sum, use_len );
 
-    memset( &md5_ctx, 0, sizeof(  md5_ctx ) );
-    memset( md5sum, 0, 16 );
+    md5_free( &md5_ctx );
+    polarssl_zeroize( md5sum, 16 );
 }
 
 #if defined(POLARSSL_DES_C)
@@ -123,14 +143,16 @@ static void pem_des_decrypt( unsigned char des_iv[8],
     des_context des_ctx;
     unsigned char des_key[8];
 
+    des_init( &des_ctx );
+
     pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen );
 
     des_setkey_dec( &des_ctx, des_key );
     des_crypt_cbc( &des_ctx, DES_DECRYPT, buflen,
                      des_iv, buf, buf );
 
-    memset( &des_ctx, 0, sizeof( des_ctx ) );
-    memset( des_key, 0, 8 );
+    des_free( &des_ctx );
+    polarssl_zeroize( des_key, 8 );
 }
 
 /*
@@ -143,14 +165,16 @@ static void pem_des3_decrypt( unsigned char des3_iv[8],
     des3_context des3_ctx;
     unsigned char des3_key[24];
 
+    des3_init( &des3_ctx );
+
     pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen );
 
     des3_set3key_dec( &des3_ctx, des3_key );
     des3_crypt_cbc( &des3_ctx, DES_DECRYPT, buflen,
                      des3_iv, buf, buf );
 
-    memset( &des3_ctx, 0, sizeof( des3_ctx ) );
-    memset( des3_key, 0, 24 );
+    des3_free( &des3_ctx );
+    polarssl_zeroize( des3_key, 24 );
 }
 #endif /* POLARSSL_DES_C */
 
@@ -165,32 +189,39 @@ static void pem_aes_decrypt( unsigned char aes_iv[16], unsigned int keylen,
     aes_context aes_ctx;
     unsigned char aes_key[32];
 
+    aes_init( &aes_ctx );
+
     pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen );
 
     aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 );
     aes_crypt_cbc( &aes_ctx, AES_DECRYPT, buflen,
                      aes_iv, buf, buf );
 
-    memset( &aes_ctx, 0, sizeof( aes_ctx ) );
-    memset( aes_key, 0, keylen );
+    aes_free( &aes_ctx );
+    polarssl_zeroize( aes_key, keylen );
 }
 #endif /* POLARSSL_AES_C */
 
-#endif /* POLARSSL_MD5_C && (POLARSSL_AES_C || POLARSSL_DES_C) */
+#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_DES_C ) */
 
-int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigned char *data, const unsigned char *pwd, size_t pwdlen, size_t *use_len )
+int pem_read_buffer( pem_context *ctx, const char *header, const char *footer,
+                     const unsigned char *data, const unsigned char *pwd,
+                     size_t pwdlen, size_t *use_len )
 {
     int ret, enc;
     size_t len;
     unsigned char *buf;
     const unsigned char *s1, *s2, *end;
-#if defined(POLARSSL_MD5_C) && (defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C))
+#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) &&         \
+    ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
     unsigned char pem_iv[16];
     cipher_type_t enc_alg = POLARSSL_CIPHER_NONE;
 #else
     ((void) pwd);
     ((void) pwdlen);
-#endif /* POLARSSL_MD5_C && (POLARSSL_AES_C || POLARSSL_DES_C) */
+#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_DES_C ) */
 
     if( ctx == NULL )
         return( POLARSSL_ERR_PEM_BAD_INPUT_DATA );
@@ -220,7 +251,8 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
 
     if( memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
     {
-#if defined(POLARSSL_MD5_C) && (defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C))
+#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) &&         \
+    ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
         enc++;
 
         s1 += 22;
@@ -271,7 +303,7 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
             s1 += 32;
         }
 #endif /* POLARSSL_AES_C */
-        
+
         if( enc_alg == POLARSSL_CIPHER_NONE )
             return( POLARSSL_ERR_PEM_UNKNOWN_ENC_ALG );
 
@@ -280,7 +312,8 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
         else return( POLARSSL_ERR_PEM_INVALID_DATA );
 #else
         return( POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE );
-#endif /* POLARSSL_MD5_C && (POLARSSL_AES_C || POLARSSL_DES_C) */
+#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_DES_C ) */
     }
 
     len = 0;
@@ -289,21 +322,22 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
     if( ret == POLARSSL_ERR_BASE64_INVALID_CHARACTER )
         return( POLARSSL_ERR_PEM_INVALID_DATA + ret );
 
-    if( ( buf = (unsigned char *) malloc( len ) ) == NULL )
+    if( ( buf = (unsigned char *) polarssl_malloc( len ) ) == NULL )
         return( POLARSSL_ERR_PEM_MALLOC_FAILED );
 
     if( ( ret = base64_decode( buf, &len, s1, s2 - s1 ) ) != 0 )
     {
-        free( buf );
+        polarssl_free( buf );
         return( POLARSSL_ERR_PEM_INVALID_DATA + ret );
     }
-    
+
     if( enc != 0 )
     {
-#if defined(POLARSSL_MD5_C) && (defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C))
+#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) &&         \
+    ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
         if( pwd == NULL )
         {
-            free( buf );
+            polarssl_free( buf );
             return( POLARSSL_ERR_PEM_PASSWORD_REQUIRED );
         }
 
@@ -323,16 +357,22 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
             pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen );
 #endif /* POLARSSL_AES_C */
 
-        if( buf[0] != 0x30 || buf[1] != 0x82 ||
-            buf[4] != 0x02 || buf[5] != 0x01 )
+        /*
+         * The result will be ASN.1 starting with a SEQUENCE tag, with 1 to 3
+         * length bytes (allow 4 to be sure) in all known use cases.
+         *
+         * Use that as heurisitic to try detecting password mismatchs.
+         */
+        if( len <= 2 || buf[0] != 0x30 || buf[1] > 0x83 )
         {
-            free( buf );
+            polarssl_free( buf );
             return( POLARSSL_ERR_PEM_PASSWORD_MISMATCH );
         }
 #else
-        free( buf );
+        polarssl_free( buf );
         return( POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE );
-#endif
+#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_DES_C ) */
     }
 
     ctx->buf = buf;
@@ -343,13 +383,63 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
 
 void pem_free( pem_context *ctx )
 {
-    if( ctx->buf )
-        free( ctx->buf );
+    polarssl_free( ctx->buf );
+    polarssl_free( ctx->info );
 
-    if( ctx->info )
-        free( ctx->info );
-
-    memset( ctx, 0, sizeof( pem_context ) );
+    polarssl_zeroize( ctx, sizeof( pem_context ) );
 }
+#endif /* POLARSSL_PEM_PARSE_C */
 
-#endif
+#if defined(POLARSSL_PEM_WRITE_C)
+int pem_write_buffer( const char *header, const char *footer,
+                      const unsigned char *der_data, size_t der_len,
+                      unsigned char *buf, size_t buf_len, size_t *olen )
+{
+    int ret;
+    unsigned char *encode_buf, *c, *p = buf;
+    size_t len = 0, use_len = 0, add_len = 0;
+
+    base64_encode( NULL, &use_len, der_data, der_len );
+    add_len = strlen( header ) + strlen( footer ) + ( use_len / 64 ) + 1;
+
+    if( use_len + add_len > buf_len )
+    {
+        *olen = use_len + add_len;
+        return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+    if( ( encode_buf = polarssl_malloc( use_len ) ) == NULL )
+        return( POLARSSL_ERR_PEM_MALLOC_FAILED );
+
+    if( ( ret = base64_encode( encode_buf, &use_len, der_data,
+                               der_len ) ) != 0 )
+    {
+        polarssl_free( encode_buf );
+        return( ret );
+    }
+
+    memcpy( p, header, strlen( header ) );
+    p += strlen( header );
+    c = encode_buf;
+
+    while( use_len )
+    {
+        len = ( use_len > 64 ) ? 64 : use_len;
+        memcpy( p, c, len );
+        use_len -= len;
+        p += len;
+        c += len;
+        *p++ = '\n';
+    }
+
+    memcpy( p, footer, strlen( footer ) );
+    p += strlen( footer );
+
+    *p++ = '\0';
+    *olen = p - buf;
+
+    polarssl_free( encode_buf );
+    return( 0 );
+}
+#endif /* POLARSSL_PEM_WRITE_C */
+#endif /* POLARSSL_PEM_PARSE_C || POLARSSL_PEM_WRITE_C */
diff --git a/Externals/polarssl/library/pk.c b/Externals/polarssl/library/pk.c
new file mode 100644
index 0000000000..11faf3c8d9
--- /dev/null
+++ b/Externals/polarssl/library/pk.c
@@ -0,0 +1,351 @@
+/*
+ *  Public Key abstraction layer
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_PK_C)
+
+#include "polarssl/pk.h"
+#include "polarssl/pk_wrap.h"
+
+#if defined(POLARSSL_RSA_C)
+#include "polarssl/rsa.h"
+#endif
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+#if defined(POLARSSL_ECDSA_C)
+#include "polarssl/ecdsa.h"
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ * Initialise a pk_context
+ */
+void pk_init( pk_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    ctx->pk_info = NULL;
+    ctx->pk_ctx = NULL;
+}
+
+/*
+ * Free (the components of) a pk_context
+ */
+void pk_free( pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return;
+
+    ctx->pk_info->ctx_free_func( ctx->pk_ctx );
+
+    polarssl_zeroize( ctx, sizeof( pk_context ) );
+}
+
+/*
+ * Get pk_info structure from type
+ */
+const pk_info_t * pk_info_from_type( pk_type_t pk_type )
+{
+    switch( pk_type ) {
+#if defined(POLARSSL_RSA_C)
+        case POLARSSL_PK_RSA:
+            return( &rsa_info );
+#endif
+#if defined(POLARSSL_ECP_C)
+        case POLARSSL_PK_ECKEY:
+            return( &eckey_info );
+        case POLARSSL_PK_ECKEY_DH:
+            return( &eckeydh_info );
+#endif
+#if defined(POLARSSL_ECDSA_C)
+        case POLARSSL_PK_ECDSA:
+            return( &ecdsa_info );
+#endif
+        /* POLARSSL_PK_RSA_ALT omitted on purpose */
+        default:
+            return( NULL );
+    }
+}
+
+/*
+ * Initialise context
+ */
+int pk_init_ctx( pk_context *ctx, const pk_info_t *info )
+{
+    if( ctx == NULL || info == NULL || ctx->pk_info != NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
+        return( POLARSSL_ERR_PK_MALLOC_FAILED );
+
+    ctx->pk_info = info;
+
+    return( 0 );
+}
+
+/*
+ * Initialize an RSA-alt context
+ */
+int pk_init_ctx_rsa_alt( pk_context *ctx, void * key,
+                         pk_rsa_alt_decrypt_func decrypt_func,
+                         pk_rsa_alt_sign_func sign_func,
+                         pk_rsa_alt_key_len_func key_len_func )
+{
+    rsa_alt_context *rsa_alt;
+    const pk_info_t *info = &rsa_alt_info;
+
+    if( ctx == NULL || ctx->pk_info != NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
+        return( POLARSSL_ERR_PK_MALLOC_FAILED );
+
+    ctx->pk_info = info;
+
+    rsa_alt = (rsa_alt_context *) ctx->pk_ctx;
+
+    rsa_alt->key = key;
+    rsa_alt->decrypt_func = decrypt_func;
+    rsa_alt->sign_func = sign_func;
+    rsa_alt->key_len_func = key_len_func;
+
+    return( 0 );
+}
+
+/*
+ * Tell if a PK can do the operations of the given type
+ */
+int pk_can_do( pk_context *ctx, pk_type_t type )
+{
+    /* null or NONE context can't do anything */
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( 0 );
+
+    return( ctx->pk_info->can_do( type ) );
+}
+
+/*
+ * Helper for pk_sign and pk_verify
+ */
+static inline int pk_hashlen_helper( md_type_t md_alg, size_t *hash_len )
+{
+    const md_info_t *md_info;
+
+    if( *hash_len != 0 )
+        return( 0 );
+
+    if( ( md_info = md_info_from_type( md_alg ) ) == NULL )
+        return( -1 );
+
+    *hash_len = md_info->size;
+    return( 0 );
+}
+
+/*
+ * Verify a signature
+ */
+int pk_verify( pk_context *ctx, md_type_t md_alg,
+               const unsigned char *hash, size_t hash_len,
+               const unsigned char *sig, size_t sig_len )
+{
+    if( ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->verify_func == NULL )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->verify_func( ctx->pk_ctx, md_alg, hash, hash_len,
+                                       sig, sig_len ) );
+}
+
+/*
+ * Verify a signature with options
+ */
+int pk_verify_ext( pk_type_t type, const void *options,
+                   pk_context *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ! pk_can_do( ctx, type ) )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    if( type == POLARSSL_PK_RSASSA_PSS )
+    {
+#if defined(POLARSSL_RSA_C) && defined(POLARSSL_PKCS1_V21)
+        int ret;
+        const pk_rsassa_pss_options *pss_opts;
+
+        if( options == NULL )
+            return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+        pss_opts = (const pk_rsassa_pss_options *) options;
+
+        if( sig_len < pk_get_len( ctx ) )
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+        ret = rsa_rsassa_pss_verify_ext( pk_rsa( *ctx ),
+                NULL, NULL, RSA_PUBLIC,
+                md_alg, hash_len, hash,
+                pss_opts->mgf1_hash_id,
+                pss_opts->expected_salt_len,
+                sig );
+        if( ret != 0 )
+            return( ret );
+
+        if( sig_len > pk_get_len( ctx ) )
+            return( POLARSSL_ERR_PK_SIG_LEN_MISMATCH );
+
+        return( 0 );
+#else
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+#endif
+    }
+
+    /* General case: no options */
+    if( options != NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    return( pk_verify( ctx, md_alg, hash, hash_len, sig, sig_len ) );
+}
+
+/*
+ * Make a signature
+ */
+int pk_sign( pk_context *ctx, md_type_t md_alg,
+             const unsigned char *hash, size_t hash_len,
+             unsigned char *sig, size_t *sig_len,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL ||
+        pk_hashlen_helper( md_alg, &hash_len ) != 0 )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->sign_func == NULL )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->sign_func( ctx->pk_ctx, md_alg, hash, hash_len,
+                                     sig, sig_len, f_rng, p_rng ) );
+}
+
+/*
+ * Decrypt message
+ */
+int pk_decrypt( pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->decrypt_func == NULL )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->decrypt_func( ctx->pk_ctx, input, ilen,
+                output, olen, osize, f_rng, p_rng ) );
+}
+
+/*
+ * Encrypt message
+ */
+int pk_encrypt( pk_context *ctx,
+                const unsigned char *input, size_t ilen,
+                unsigned char *output, size_t *olen, size_t osize,
+                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->encrypt_func == NULL )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    return( ctx->pk_info->encrypt_func( ctx->pk_ctx, input, ilen,
+                output, olen, osize, f_rng, p_rng ) );
+}
+
+/*
+ * Get key size in bits
+ */
+size_t pk_get_size( const pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( 0 );
+
+    return( ctx->pk_info->get_size( ctx->pk_ctx ) );
+}
+
+/*
+ * Export debug information
+ */
+int pk_debug( const pk_context *ctx, pk_debug_item *items )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    if( ctx->pk_info->debug_func == NULL )
+        return( POLARSSL_ERR_PK_TYPE_MISMATCH );
+
+    ctx->pk_info->debug_func( ctx->pk_ctx, items );
+    return( 0 );
+}
+
+/*
+ * Access the PK type name
+ */
+const char * pk_get_name( const pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( "invalid PK" );
+
+    return( ctx->pk_info->name );
+}
+
+/*
+ * Access the PK type
+ */
+pk_type_t pk_get_type( const pk_context *ctx )
+{
+    if( ctx == NULL || ctx->pk_info == NULL )
+        return( POLARSSL_PK_NONE );
+
+    return( ctx->pk_info->type );
+}
+
+#endif /* POLARSSL_PK_C */
diff --git a/Externals/polarssl/library/pk_wrap.c b/Externals/polarssl/library/pk_wrap.c
new file mode 100644
index 0000000000..5e9ff605ee
--- /dev/null
+++ b/Externals/polarssl/library/pk_wrap.c
@@ -0,0 +1,452 @@
+/*
+ *  Public Key abstraction layer: wrapper functions
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_PK_C)
+
+#include "polarssl/pk_wrap.h"
+
+/* Even if RSA not activated, for the sake of RSA-alt */
+#include "polarssl/rsa.h"
+
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+
+#if defined(POLARSSL_ECDSA_C)
+#include "polarssl/ecdsa.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdlib.h>
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if defined(POLARSSL_RSA_C)
+static int rsa_can_do( pk_type_t type )
+{
+    return( type == POLARSSL_PK_RSA ||
+            type == POLARSSL_PK_RSASSA_PSS );
+}
+
+static size_t rsa_get_size( const void *ctx )
+{
+    return( 8 * ((const rsa_context *) ctx)->len );
+}
+
+static int rsa_verify_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+
+    if( sig_len < ((rsa_context *) ctx)->len )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( ( ret = rsa_pkcs1_verify( (rsa_context *) ctx, NULL, NULL,
+                                  RSA_PUBLIC, md_alg,
+                                  (unsigned int) hash_len, hash, sig ) ) != 0 )
+        return( ret );
+
+    if( sig_len > ((rsa_context *) ctx)->len )
+        return( POLARSSL_ERR_PK_SIG_LEN_MISMATCH );
+
+    return( 0 );
+}
+
+static int rsa_sign_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    *sig_len = ((rsa_context *) ctx)->len;
+
+    return( rsa_pkcs1_sign( (rsa_context *) ctx, f_rng, p_rng, RSA_PRIVATE,
+                md_alg, (unsigned int) hash_len, hash, sig ) );
+}
+
+static int rsa_decrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    if( ilen != ((rsa_context *) ctx)->len )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    return( rsa_pkcs1_decrypt( (rsa_context *) ctx, f_rng, p_rng,
+                RSA_PRIVATE, olen, input, output, osize ) );
+}
+
+static int rsa_encrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    ((void) osize);
+
+    *olen = ((rsa_context *) ctx)->len;
+
+    return( rsa_pkcs1_encrypt( (rsa_context *) ctx,
+                f_rng, p_rng, RSA_PUBLIC, ilen, input, output ) );
+}
+
+static void *rsa_alloc_wrap( void )
+{
+    void *ctx = polarssl_malloc( sizeof( rsa_context ) );
+
+    if( ctx != NULL )
+        rsa_init( (rsa_context *) ctx, 0, 0 );
+
+    return( ctx );
+}
+
+static void rsa_free_wrap( void *ctx )
+{
+    rsa_free( (rsa_context *) ctx );
+    polarssl_free( ctx );
+}
+
+static void rsa_debug( const void *ctx, pk_debug_item *items )
+{
+    items->type = POLARSSL_PK_DEBUG_MPI;
+    items->name = "rsa.N";
+    items->value = &( ((rsa_context *) ctx)->N );
+
+    items++;
+
+    items->type = POLARSSL_PK_DEBUG_MPI;
+    items->name = "rsa.E";
+    items->value = &( ((rsa_context *) ctx)->E );
+}
+
+const pk_info_t rsa_info = {
+    POLARSSL_PK_RSA,
+    "RSA",
+    rsa_get_size,
+    rsa_can_do,
+    rsa_verify_wrap,
+    rsa_sign_wrap,
+    rsa_decrypt_wrap,
+    rsa_encrypt_wrap,
+    rsa_alloc_wrap,
+    rsa_free_wrap,
+    rsa_debug,
+};
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+/*
+ * Generic EC key
+ */
+static int eckey_can_do( pk_type_t type )
+{
+    return( type == POLARSSL_PK_ECKEY ||
+            type == POLARSSL_PK_ECKEY_DH ||
+            type == POLARSSL_PK_ECDSA );
+}
+
+static size_t eckey_get_size( const void *ctx )
+{
+    return( ((ecp_keypair *) ctx)->grp.pbits );
+}
+
+#if defined(POLARSSL_ECDSA_C)
+/* Forward declarations */
+static int ecdsa_verify_wrap( void *ctx, md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len );
+
+static int ecdsa_sign_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
+
+static int eckey_verify_wrap( void *ctx, md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+    ecdsa_context ecdsa;
+
+    ecdsa_init( &ecdsa );
+
+    if( ( ret = ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
+        ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
+
+    ecdsa_free( &ecdsa );
+
+    return( ret );
+}
+
+static int eckey_sign_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret;
+    ecdsa_context ecdsa;
+
+    ecdsa_init( &ecdsa );
+
+    if( ( ret = ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
+        ret = ecdsa_sign_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len,
+                               f_rng, p_rng );
+
+    ecdsa_free( &ecdsa );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_ECDSA_C */
+
+static void *eckey_alloc_wrap( void )
+{
+    void *ctx = polarssl_malloc( sizeof( ecp_keypair ) );
+
+    if( ctx != NULL )
+        ecp_keypair_init( ctx );
+
+    return( ctx );
+}
+
+static void eckey_free_wrap( void *ctx )
+{
+    ecp_keypair_free( (ecp_keypair *) ctx );
+    polarssl_free( ctx );
+}
+
+static void eckey_debug( const void *ctx, pk_debug_item *items )
+{
+    items->type = POLARSSL_PK_DEBUG_ECP;
+    items->name = "eckey.Q";
+    items->value = &( ((ecp_keypair *) ctx)->Q );
+}
+
+const pk_info_t eckey_info = {
+    POLARSSL_PK_ECKEY,
+    "EC",
+    eckey_get_size,
+    eckey_can_do,
+#if defined(POLARSSL_ECDSA_C)
+    eckey_verify_wrap,
+    eckey_sign_wrap,
+#else
+    NULL,
+    NULL,
+#endif
+    NULL,
+    NULL,
+    eckey_alloc_wrap,
+    eckey_free_wrap,
+    eckey_debug,
+};
+
+/*
+ * EC key restricted to ECDH
+ */
+static int eckeydh_can_do( pk_type_t type )
+{
+    return( type == POLARSSL_PK_ECKEY ||
+            type == POLARSSL_PK_ECKEY_DH );
+}
+
+const pk_info_t eckeydh_info = {
+    POLARSSL_PK_ECKEY_DH,
+    "EC_DH",
+    eckey_get_size,         /* Same underlying key structure */
+    eckeydh_can_do,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    eckey_alloc_wrap,       /* Same underlying key structure */
+    eckey_free_wrap,        /* Same underlying key structure */
+    eckey_debug,            /* Same underlying key structure */
+};
+#endif /* POLARSSL_ECP_C */
+
+#if defined(POLARSSL_ECDSA_C)
+static int ecdsa_can_do( pk_type_t type )
+{
+    return( type == POLARSSL_PK_ECDSA );
+}
+
+static int ecdsa_verify_wrap( void *ctx, md_type_t md_alg,
+                       const unsigned char *hash, size_t hash_len,
+                       const unsigned char *sig, size_t sig_len )
+{
+    int ret;
+    ((void) md_alg);
+
+    ret = ecdsa_read_signature( (ecdsa_context *) ctx,
+                                hash, hash_len, sig, sig_len );
+
+    if( ret == POLARSSL_ERR_ECP_SIG_LEN_MISMATCH )
+        return( POLARSSL_ERR_PK_SIG_LEN_MISMATCH );
+
+    return( ret );
+}
+
+static int ecdsa_sign_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    /* Use deterministic ECDSA by default if available */
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+    ((void) f_rng);
+    ((void) p_rng);
+
+    return( ecdsa_write_signature_det( (ecdsa_context *) ctx,
+                hash, hash_len, sig, sig_len, md_alg ) );
+#else
+    ((void) md_alg);
+
+    return( ecdsa_write_signature( (ecdsa_context *) ctx,
+                hash, hash_len, sig, sig_len, f_rng, p_rng ) );
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+}
+
+static void *ecdsa_alloc_wrap( void )
+{
+    void *ctx = polarssl_malloc( sizeof( ecdsa_context ) );
+
+    if( ctx != NULL )
+        ecdsa_init( (ecdsa_context *) ctx );
+
+    return( ctx );
+}
+
+static void ecdsa_free_wrap( void *ctx )
+{
+    ecdsa_free( (ecdsa_context *) ctx );
+    polarssl_free( ctx );
+}
+
+const pk_info_t ecdsa_info = {
+    POLARSSL_PK_ECDSA,
+    "ECDSA",
+    eckey_get_size,     /* Compatible key structures */
+    ecdsa_can_do,
+    ecdsa_verify_wrap,
+    ecdsa_sign_wrap,
+    NULL,
+    NULL,
+    ecdsa_alloc_wrap,
+    ecdsa_free_wrap,
+    eckey_debug,        /* Compatible key structures */
+};
+#endif /* POLARSSL_ECDSA_C */
+
+/*
+ * Support for alternative RSA-private implementations
+ */
+
+static int rsa_alt_can_do( pk_type_t type )
+{
+    return( type == POLARSSL_PK_RSA );
+}
+
+static size_t rsa_alt_get_size( const void *ctx )
+{
+    const rsa_alt_context *rsa_alt = (const rsa_alt_context *) ctx;
+
+    return( 8 * rsa_alt->key_len_func( rsa_alt->key ) );
+}
+
+static int rsa_alt_sign_wrap( void *ctx, md_type_t md_alg,
+                   const unsigned char *hash, size_t hash_len,
+                   unsigned char *sig, size_t *sig_len,
+                   int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    rsa_alt_context *rsa_alt = (rsa_alt_context *) ctx;
+
+    *sig_len = rsa_alt->key_len_func( rsa_alt->key );
+
+    return( rsa_alt->sign_func( rsa_alt->key, f_rng, p_rng, RSA_PRIVATE,
+                md_alg, (unsigned int) hash_len, hash, sig ) );
+}
+
+static int rsa_alt_decrypt_wrap( void *ctx,
+                    const unsigned char *input, size_t ilen,
+                    unsigned char *output, size_t *olen, size_t osize,
+                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    rsa_alt_context *rsa_alt = (rsa_alt_context *) ctx;
+
+    ((void) f_rng);
+    ((void) p_rng);
+
+    if( ilen != rsa_alt->key_len_func( rsa_alt->key ) )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    return( rsa_alt->decrypt_func( rsa_alt->key,
+                RSA_PRIVATE, olen, input, output, osize ) );
+}
+
+static void *rsa_alt_alloc_wrap( void )
+{
+    void *ctx = polarssl_malloc( sizeof( rsa_alt_context ) );
+
+    if( ctx != NULL )
+        memset( ctx, 0, sizeof( rsa_alt_context ) );
+
+    return( ctx );
+}
+
+static void rsa_alt_free_wrap( void *ctx )
+{
+    polarssl_zeroize( ctx, sizeof( rsa_alt_context ) );
+    polarssl_free( ctx );
+}
+
+const pk_info_t rsa_alt_info = {
+    POLARSSL_PK_RSA_ALT,
+    "RSA-alt",
+    rsa_alt_get_size,
+    rsa_alt_can_do,
+    NULL,
+    rsa_alt_sign_wrap,
+    rsa_alt_decrypt_wrap,
+    NULL,
+    rsa_alt_alloc_wrap,
+    rsa_alt_free_wrap,
+    NULL,
+};
+
+#endif /* POLARSSL_PK_C */
diff --git a/Externals/polarssl/library/pkcs11.c b/Externals/polarssl/library/pkcs11.c
index b68d6881db..64e7ce3795 100644
--- a/Externals/polarssl/library/pkcs11.c
+++ b/Externals/polarssl/library/pkcs11.c
@@ -5,7 +5,7 @@
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -30,10 +30,19 @@
 #include "polarssl/pkcs11.h"
 
 #if defined(POLARSSL_PKCS11_C)
+#include "polarssl/md.h"
+#include "polarssl/oid.h"
+#include "polarssl/x509_crt.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
 #include <stdlib.h>
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
 
-int pkcs11_x509_cert_init( x509_cert *cert, pkcs11h_certificate_t pkcs11_cert )
+int pkcs11_x509_cert_init( x509_crt *cert, pkcs11h_certificate_t pkcs11_cert )
 {
     int ret = 1;
     unsigned char *cert_blob = NULL;
@@ -45,26 +54,28 @@ int pkcs11_x509_cert_init( x509_cert *cert, pkcs11h_certificate_t pkcs11_cert )
         goto cleanup;
     }
 
-    if( pkcs11h_certificate_getCertificateBlob( pkcs11_cert, NULL, &cert_blob_size ) != CKR_OK )
+    if( pkcs11h_certificate_getCertificateBlob( pkcs11_cert, NULL,
+                                                &cert_blob_size ) != CKR_OK )
     {
         ret = 3;
         goto cleanup;
     }
 
-    cert_blob = malloc( cert_blob_size );
+    cert_blob = polarssl_malloc( cert_blob_size );
     if( NULL == cert_blob )
     {
         ret = 4;
         goto cleanup;
     }
 
-    if( pkcs11h_certificate_getCertificateBlob( pkcs11_cert, cert_blob, &cert_blob_size ) != CKR_OK )
+    if( pkcs11h_certificate_getCertificateBlob( pkcs11_cert, cert_blob,
+                                                &cert_blob_size ) != CKR_OK )
     {
         ret = 5;
         goto cleanup;
     }
 
-    if( 0 != x509parse_crt(cert, cert_blob, cert_blob_size ) )
+    if( 0 != x509_crt_parse( cert, cert_blob, cert_blob_size ) )
     {
         ret = 6;
         goto cleanup;
@@ -74,9 +85,9 @@ int pkcs11_x509_cert_init( x509_cert *cert, pkcs11h_certificate_t pkcs11_cert )
 
 cleanup:
     if( NULL != cert_blob )
-        free( cert_blob );
+        polarssl_free( cert_blob );
 
-    return ret;
+    return( ret );
 }
 
 
@@ -84,9 +95,9 @@ int pkcs11_priv_key_init( pkcs11_context *priv_key,
         pkcs11h_certificate_t pkcs11_cert )
 {
     int ret = 1;
-    x509_cert cert;
+    x509_crt cert;
 
-    memset( &cert, 0, sizeof( cert ) );
+    x509_crt_init( &cert );
 
     if( priv_key == NULL )
         goto cleanup;
@@ -94,15 +105,15 @@ int pkcs11_priv_key_init( pkcs11_context *priv_key,
     if( 0 != pkcs11_x509_cert_init( &cert, pkcs11_cert ) )
         goto cleanup;
 
-    priv_key->len = cert.rsa.len;
+    priv_key->len = pk_get_len( &cert.pk );
     priv_key->pkcs11h_cert = pkcs11_cert;
 
     ret = 0;
 
 cleanup:
-    x509_free( &cert );
+    x509_crt_free( &cert );
 
-    return ret;
+    return( ret );
 }
 
 void pkcs11_priv_key_free( pkcs11_context *priv_key )
@@ -122,7 +133,7 @@ int pkcs11_decrypt( pkcs11_context *ctx,
     if( NULL == ctx )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
-    if( RSA_PUBLIC == mode )
+    if( RSA_PRIVATE != mode )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     output_len = input_len = ctx->len;
@@ -151,83 +162,70 @@ int pkcs11_decrypt( pkcs11_context *ctx,
 
 int pkcs11_sign( pkcs11_context *ctx,
                     int mode,
-                    int hash_id,
+                    md_type_t md_alg,
                     unsigned int hashlen,
                     const unsigned char *hash,
                     unsigned char *sig )
 {
-    size_t olen, asn_len;
+    size_t sig_len = 0, asn_len = 0, oid_size = 0;
     unsigned char *p = sig;
+    const char *oid;
 
     if( NULL == ctx )
-        return POLARSSL_ERR_RSA_BAD_INPUT_DATA;
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
-    if( RSA_PUBLIC == mode )
-        return POLARSSL_ERR_RSA_BAD_INPUT_DATA;
+    if( RSA_PRIVATE != mode )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
-    olen = ctx->len;
-
-    switch( hash_id )
+    if( md_alg != POLARSSL_MD_NONE )
     {
-        case SIG_RSA_RAW:
-            asn_len = 0;
-            memcpy( p, hash, hashlen );
-            break;
-
-        case SIG_RSA_MD2:
-            asn_len = OID_SIZE(ASN1_HASH_MDX);
-            memcpy( p, ASN1_HASH_MDX, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[13] = 2; break;
-
-        case SIG_RSA_MD4:
-            asn_len = OID_SIZE(ASN1_HASH_MDX);
-            memcpy( p, ASN1_HASH_MDX, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[13] = 4; break;
-
-        case SIG_RSA_MD5:
-            asn_len = OID_SIZE(ASN1_HASH_MDX);
-            memcpy( p, ASN1_HASH_MDX, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[13] = 5; break;
-
-        case SIG_RSA_SHA1:
-            asn_len = OID_SIZE(ASN1_HASH_SHA1);
-            memcpy( p, ASN1_HASH_SHA1, asn_len );
-            memcpy( p + 15, hash, hashlen );
-            break;
-
-        case SIG_RSA_SHA224:
-            asn_len = OID_SIZE(ASN1_HASH_SHA2X);
-            memcpy( p, ASN1_HASH_SHA2X, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[1] += hashlen; p[14] = 4; p[18] += hashlen; break;
-
-        case SIG_RSA_SHA256:
-            asn_len = OID_SIZE(ASN1_HASH_SHA2X);
-            memcpy( p, ASN1_HASH_SHA2X, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[1] += hashlen; p[14] = 1; p[18] += hashlen; break;
-
-        case SIG_RSA_SHA384:
-            asn_len = OID_SIZE(ASN1_HASH_SHA2X);
-            memcpy( p, ASN1_HASH_SHA2X, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[1] += hashlen; p[14] = 2; p[18] += hashlen; break;
-
-        case SIG_RSA_SHA512:
-            asn_len = OID_SIZE(ASN1_HASH_SHA2X);
-            memcpy( p, ASN1_HASH_SHA2X, asn_len );
-            memcpy( p + asn_len, hash, hashlen );
-            p[1] += hashlen; p[14] = 3; p[18] += hashlen; break;
-
-        default:
+        const md_info_t *md_info = md_info_from_type( md_alg );
+        if( md_info == NULL )
             return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        if( oid_get_oid_by_md( md_alg, &oid, &oid_size ) != 0 )
+            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = md_get_size( md_info );
+        asn_len = 10 + oid_size;
     }
 
+    sig_len = ctx->len;
+    if( hashlen > sig_len || asn_len > sig_len ||
+        hashlen + asn_len > sig_len )
+    {
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    if( md_alg != POLARSSL_MD_NONE )
+    {
+        /*
+         * DigestInfo ::= SEQUENCE {
+         *   digestAlgorithm DigestAlgorithmIdentifier,
+         *   digest Digest }
+         *
+         * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+         *
+         * Digest ::= OCTET STRING
+         */
+        *p++ = ASN1_SEQUENCE | ASN1_CONSTRUCTED;
+        *p++ = (unsigned char) ( 0x08 + oid_size + hashlen );
+        *p++ = ASN1_SEQUENCE | ASN1_CONSTRUCTED;
+        *p++ = (unsigned char) ( 0x04 + oid_size );
+        *p++ = ASN1_OID;
+        *p++ = oid_size & 0xFF;
+        memcpy( p, oid, oid_size );
+        p += oid_size;
+        *p++ = ASN1_NULL;
+        *p++ = 0x00;
+        *p++ = ASN1_OCTET_STRING;
+        *p++ = hashlen;
+    }
+
+    memcpy( p, hash, hashlen );
+
     if( pkcs11h_certificate_signAny( ctx->pkcs11h_cert, CKM_RSA_PKCS, sig,
-            asn_len + hashlen, sig, &olen ) != CKR_OK )
+            asn_len + hashlen, sig, &sig_len ) != CKR_OK )
     {
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
     }
diff --git a/Externals/polarssl/library/pkcs12.c b/Externals/polarssl/library/pkcs12.c
index 2c032edfae..0cf2edf102 100644
--- a/Externals/polarssl/library/pkcs12.c
+++ b/Externals/polarssl/library/pkcs12.c
@@ -1,7 +1,7 @@
 /*
  *  PKCS#12 Personal Information Exchange Syntax
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,7 +29,11 @@
  *  ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1-1.asn
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_PKCS12_C)
 
@@ -45,12 +49,17 @@
 #include "polarssl/des.h"
 #endif
 
-static int pkcs12_parse_pbe_params( unsigned char **p,
-                                    const unsigned char *end,
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+static int pkcs12_parse_pbe_params( asn1_buf *params,
                                     asn1_buf *salt, int *iterations )
 {
     int ret;
-    size_t len = 0;
+    unsigned char **p = &params->p;
+    const unsigned char *end = params->p + params->len;
 
     /*
      *  pkcs-12PbeParams ::= SEQUENCE {
@@ -59,13 +68,9 @@ static int pkcs12_parse_pbe_params( unsigned char **p,
      *  }
      *
      */
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
-    }
-
-    end = *p + len;
+    if( params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+        return( POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
 
     if( ( ret = asn1_get_tag( p, end, &salt->len, ASN1_OCTET_STRING ) ) != 0 )
         return( POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
@@ -91,19 +96,16 @@ static int pkcs12_pbe_derive_key_iv( asn1_buf *pbe_params, md_type_t md_type,
     int ret, iterations;
     asn1_buf salt;
     size_t i;
-    unsigned char *p, *end;
     unsigned char unipwd[258];
 
-    memset(&salt, 0, sizeof(asn1_buf));
-    memset(&unipwd, 0, sizeof(unipwd));
+    memset( &salt, 0, sizeof(asn1_buf) );
+    memset( &unipwd, 0, sizeof(unipwd) );
 
-    p = pbe_params->p;
-    end = p + pbe_params->len;
-
-    if( ( ret = pkcs12_parse_pbe_params( &p, end, &salt, &iterations ) ) != 0 )
+    if( ( ret = pkcs12_parse_pbe_params( pbe_params, &salt,
+                                         &iterations ) ) != 0 )
         return( ret );
 
-    for(i = 0; i < pwdlen; i++)
+    for( i = 0; i < pwdlen; i++ )
         unipwd[i * 2 + 1] = pwd[i];
 
     if( ( ret = pkcs12_derivation( key, keylen, unipwd, pwdlen * 2 + 2,
@@ -145,6 +147,8 @@ int pkcs12_pbe_sha1_rc4_128( asn1_buf *pbe_params, int mode,
     arc4_context ctx;
     ((void) mode);
 
+    arc4_init( &ctx );
+
     if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, POLARSSL_MD_SHA1,
                                           pwd, pwdlen,
                                           key, 16, NULL, 0 ) ) != 0 )
@@ -154,9 +158,13 @@ int pkcs12_pbe_sha1_rc4_128( asn1_buf *pbe_params, int mode,
 
     arc4_setup( &ctx, key, 16 );
     if( ( ret = arc4_crypt( &ctx, len, data, output ) ) != 0 )
-        return( ret );
+        goto exit;
 
-    return( 0 );
+exit:
+    polarssl_zeroize( key, sizeof( key ) );
+    arc4_free( &ctx );
+
+    return( ret );
 #endif /* POLARSSL_ARC4_C */
 }
 
@@ -186,25 +194,35 @@ int pkcs12_pbe( asn1_buf *pbe_params, int mode,
         return( ret );
     }
 
+    cipher_init( &cipher_ctx );
+
     if( ( ret = cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
-        return( ret );
+        goto exit;
 
-    if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 )
-        return( ret );
+    if( ( ret = cipher_setkey( &cipher_ctx, key, 8 * keylen, mode ) ) != 0 )
+        goto exit;
 
-    if( ( ret = cipher_reset( &cipher_ctx, iv ) ) != 0 )
-        return( ret );
+    if( ( ret = cipher_set_iv( &cipher_ctx, iv, cipher_info->iv_size ) ) != 0 )
+        goto exit;
+
+    if( ( ret = cipher_reset( &cipher_ctx ) ) != 0 )
+        goto exit;
 
     if( ( ret = cipher_update( &cipher_ctx, data, len,
                                 output, &olen ) ) != 0 )
     {
-        return( ret );
+        goto exit;
     }
 
     if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
-        return( POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH );
+        ret = POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH;
 
-    return( 0 );
+exit:
+    polarssl_zeroize( key, sizeof( key ) );
+    polarssl_zeroize( iv,  sizeof( iv  ) );
+    cipher_free( &cipher_ctx );
+
+    return( ret );
 }
 
 static void pkcs12_fill_buffer( unsigned char *data, size_t data_len,
@@ -249,7 +267,9 @@ int pkcs12_derivation( unsigned char *data, size_t datalen,
     if( md_info == NULL )
         return( POLARSSL_ERR_PKCS12_FEATURE_UNAVAILABLE );
 
-    if ( ( ret = md_init_ctx( &md_ctx, md_info ) ) != 0 )
+    md_init( &md_ctx );
+
+    if( ( ret = md_init_ctx( &md_ctx, md_info ) ) != 0 )
         return( ret );
     hlen = md_get_size( md_info );
 
@@ -268,25 +288,25 @@ int pkcs12_derivation( unsigned char *data, size_t datalen,
     {
         // Calculate hash( diversifier || salt_block || pwd_block )
         if( ( ret = md_starts( &md_ctx ) ) != 0 )
-            return( ret );
+            goto exit;
 
         if( ( ret = md_update( &md_ctx, diversifier, v ) ) != 0 )
-            return( ret );
+            goto exit;
 
         if( ( ret = md_update( &md_ctx, salt_block, v ) ) != 0 )
-            return( ret );
+            goto exit;
 
         if( ( ret = md_update( &md_ctx, pwd_block, v ) ) != 0 )
-            return( ret );
+            goto exit;
 
         if( ( ret = md_finish( &md_ctx, hash_output ) ) != 0 )
-            return( ret );
+            goto exit;
 
         // Perform remaining ( iterations - 1 ) recursive hash calculations
-        for( i = 1; i < iterations; i++ )
+        for( i = 1; i < (size_t) iterations; i++ )
         {
             if( ( ret = md( md_info, hash_output, hlen, hash_output ) ) != 0 )
-                return( ret );
+                goto exit;
         }
 
         use_len = ( datalen > hlen ) ? hlen : datalen;
@@ -324,7 +344,17 @@ int pkcs12_derivation( unsigned char *data, size_t datalen,
         }
     }
 
-    return( 0 );
+    ret = 0;
+
+exit:
+    polarssl_zeroize( salt_block, sizeof( salt_block ) );
+    polarssl_zeroize( pwd_block, sizeof( pwd_block ) );
+    polarssl_zeroize( hash_block, sizeof( hash_block ) );
+    polarssl_zeroize( hash_output, sizeof( hash_output ) );
+
+    md_free( &md_ctx );
+
+    return( ret );
 }
 
 #endif /* POLARSSL_PKCS12_C */
diff --git a/Externals/polarssl/library/pkcs5.c b/Externals/polarssl/library/pkcs5.c
index 8e55415bcf..e769783eef 100644
--- a/Externals/polarssl/library/pkcs5.c
+++ b/Externals/polarssl/library/pkcs5.c
@@ -5,7 +5,7 @@
  *
  * \author Mathias Olsson <mathias@kompetensum.com>
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -33,27 +33,37 @@
  * http://tools.ietf.org/html/rfc6070 (Test vectors)
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_PKCS5_C)
 
 #include "polarssl/pkcs5.h"
 #include "polarssl/asn1.h"
 #include "polarssl/cipher.h"
+#include "polarssl/oid.h"
 
-#define OID_CMP(oid_str, oid_buf) \
-        ( ( OID_SIZE(oid_str) == (oid_buf)->len ) && \
-                memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) == 0)
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
 
-static int pkcs5_parse_pbkdf2_params( unsigned char **p,
-                                      const unsigned char *end,
+static int pkcs5_parse_pbkdf2_params( const asn1_buf *params,
                                       asn1_buf *salt, int *iterations,
                                       int *keylen, md_type_t *md_type )
 {
     int ret;
-    size_t len = 0;
     asn1_buf prf_alg_oid;
+    unsigned char *p = params->p;
+    const unsigned char *end = params->p + params->len;
 
+    if( params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
     /*
      *  PBKDF2-params ::= SEQUENCE {
      *    salt              OCTET STRING,
@@ -63,36 +73,28 @@ static int pkcs5_parse_pbkdf2_params( unsigned char **p,
      *  }
      *
      */
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-    }
-
-    end = *p + len;
-
-    if( ( ret = asn1_get_tag( p, end, &salt->len, ASN1_OCTET_STRING ) ) != 0 )
+    if( ( ret = asn1_get_tag( &p, end, &salt->len, ASN1_OCTET_STRING ) ) != 0 )
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
 
-    salt->p = *p;
-    *p += salt->len;
+    salt->p = p;
+    p += salt->len;
 
-    if( ( ret = asn1_get_int( p, end, iterations ) ) != 0 )
+    if( ( ret = asn1_get_int( &p, end, iterations ) ) != 0 )
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
 
-    if( *p == end )
+    if( p == end )
         return( 0 );
 
-    if( ( ret = asn1_get_int( p, end, keylen ) ) != 0 )
+    if( ( ret = asn1_get_int( &p, end, keylen ) ) != 0 )
     {
         if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
             return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
     }
 
-    if( *p == end )
+    if( p == end )
         return( 0 );
 
-    if( ( ret = asn1_get_tag( p, end, &prf_alg_oid.len, ASN1_OID ) ) != 0 )
+    if( ( ret = asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 )
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
 
     if( !OID_CMP( OID_HMAC_SHA1, &prf_alg_oid ) )
@@ -100,7 +102,7 @@ static int pkcs5_parse_pbkdf2_params( unsigned char **p,
 
     *md_type = POLARSSL_MD_SHA1;
 
-    if( *p != end )
+    if( p != end )
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT +
                 POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
 
@@ -113,14 +115,16 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
                  unsigned char *output )
 {
     int ret, iterations = 0, keylen = 0;
-    unsigned char *p, *end, *end2;
-    asn1_buf kdf_alg_oid, enc_scheme_oid, salt;
+    unsigned char *p, *end;
+    asn1_buf kdf_alg_oid, enc_scheme_oid, kdf_alg_params, enc_scheme_params;
+    asn1_buf salt;
     md_type_t md_type = POLARSSL_MD_SHA1;
     unsigned char key[32], iv[32];
-    size_t len = 0, olen = 0;
+    size_t olen = 0;
     const md_info_t *md_info;
     const cipher_info_t *cipher_info;
     md_context_t md_ctx;
+    cipher_type_t cipher_alg;
     cipher_context_t cipher_ctx;
 
     p = pbe_params->p;
@@ -132,32 +136,19 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
      *    encryptionScheme AlgorithmIdentifier {{PBES2-Encs}}
      *  }
      */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
+    if( pbe_params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+    if( ( ret = asn1_get_alg( &p, end, &kdf_alg_oid, &kdf_alg_params ) ) != 0 )
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-    }
-
-    end2 = p + len;
-
-    if( ( ret = asn1_get_tag( &p, end2, &kdf_alg_oid.len, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-
-    kdf_alg_oid.p = p;
-    p += kdf_alg_oid.len;
 
     // Only PBKDF2 supported at the moment
     //
     if( !OID_CMP( OID_PKCS5_PBKDF2, &kdf_alg_oid ) )
         return( POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE );
 
-    if( ( ret = pkcs5_parse_pbkdf2_params( &p, end2,
+    if( ( ret = pkcs5_parse_pbkdf2_params( &kdf_alg_params,
                                            &salt, &iterations, &keylen,
                                            &md_type ) ) != 0 )
     {
@@ -168,76 +159,60 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
     if( md_info == NULL )
         return( POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE );
 
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    if( ( ret = asn1_get_alg( &p, end, &enc_scheme_oid,
+                              &enc_scheme_params ) ) != 0 )
     {
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
     }
 
-    end2 = p + len;
-
-    if( ( ret = asn1_get_tag( &p, end2, &enc_scheme_oid.len, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-
-    enc_scheme_oid.p = p;
-    p += enc_scheme_oid.len;
-
-#if defined(POLARSSL_DES_C)
-    // Only DES-CBC and DES-EDE3-CBC supported at the moment
-    //
-    if( OID_CMP( OID_DES_EDE3_CBC, &enc_scheme_oid ) )
-    {
-        cipher_info = cipher_info_from_type( POLARSSL_CIPHER_DES_EDE3_CBC );
-    }
-    else if( OID_CMP( OID_DES_CBC, &enc_scheme_oid ) )
-    {
-        cipher_info = cipher_info_from_type( POLARSSL_CIPHER_DES_CBC );
-    }
-    else
-#endif /* POLARSSL_DES_C */
+    if( oid_get_cipher_alg( &enc_scheme_oid, &cipher_alg ) != 0 )
         return( POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE );
 
+    cipher_info = cipher_info_from_type( cipher_alg );
     if( cipher_info == NULL )
         return( POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE );
 
+    /*
+     * The value of keylen from pkcs5_parse_pbkdf2_params() is ignored
+     * since it is optional and we don't know if it was set or not
+     */
     keylen = cipher_info->key_length / 8;
 
-    if( ( ret = asn1_get_tag( &p, end2, &len, ASN1_OCTET_STRING ) ) != 0 )
-        return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
-
-    if( len != cipher_info->iv_size )
+    if( enc_scheme_params.tag != ASN1_OCTET_STRING ||
+        enc_scheme_params.len != cipher_info->iv_size )
+    {
         return( POLARSSL_ERR_PKCS5_INVALID_FORMAT );
+    }
 
-    memcpy( iv, p, len );
+    md_init( &md_ctx );
+    cipher_init( &cipher_ctx );
+
+    memcpy( iv, enc_scheme_params.p, enc_scheme_params.len );
 
     if( ( ret = md_init_ctx( &md_ctx, md_info ) ) != 0 )
-        return( ret );
+        goto exit;
+
+    if( ( ret = pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len,
+                                   iterations, keylen, key ) ) != 0 )
+    {
+        goto exit;
+    }
 
     if( ( ret = cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
-        return( ret );
+        goto exit;
 
-    if ( ( ret = pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len,
-                                    iterations, keylen, key ) ) != 0 )
-    {
-        return( ret );
-    }
+    if( ( ret = cipher_setkey( &cipher_ctx, key, 8 * keylen, mode ) ) != 0 )
+        goto exit;
 
-    if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 )
-        return( ret );
+    if( ( ret = cipher_crypt( &cipher_ctx, iv, enc_scheme_params.len,
+                              data, datalen, output, &olen ) ) != 0 )
+        ret = POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH;
 
-    if( ( ret = cipher_reset( &cipher_ctx, iv ) ) != 0 )
-        return( ret );
+exit:
+    md_free( &md_ctx );
+    cipher_free( &cipher_ctx );
 
-    if( ( ret = cipher_update( &cipher_ctx, data, datalen,
-                                output, &olen ) ) != 0 )
-    {
-        return( ret );
-    }
-
-    if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
-        return( POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH );
-
-    return( 0 );
+    return( ret );
 }
 
 int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
@@ -278,7 +253,7 @@ int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
 
         memcpy( md1, work, md_size );
 
-        for ( i = 1; i < iteration_count; i++ )
+        for( i = 1; i < iteration_count; i++ )
         {
             // U2 ends up in md1
             //
@@ -300,7 +275,7 @@ int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
         use_len = ( key_length < md_size ) ? key_length : md_size;
         memcpy( out_p, work, use_len );
 
-        key_length -= use_len;
+        key_length -= (uint32_t) use_len;
         out_p += use_len;
 
         for( i = 4; i > 0; i-- )
@@ -313,6 +288,16 @@ int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
 
 #if defined(POLARSSL_SELF_TEST)
 
+#if !defined(POLARSSL_SHA1_C)
+int pkcs5_self_test( int verbose )
+{
+    if( verbose != 0 )
+        polarssl_printf( "  PBKDF2 (SHA1): skipped\n\n" );
+
+    return( 0 );
+}
+#else
+
 #include <stdio.h>
 
 #define MAX_TESTS   6
@@ -350,7 +335,7 @@ uint32_t key_len[MAX_TESTS] =
     { 20, 20, 20, 20, 25, 16 };
 
 
-unsigned char result_key[MAX_TESTS][32] = 
+unsigned char result_key[MAX_TESTS][32] =
 {
     { 0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
       0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
@@ -379,16 +364,28 @@ int pkcs5_self_test( int verbose )
     int ret, i;
     unsigned char key[64];
 
+    md_init( &sha1_ctx );
+
     info_sha1 = md_info_from_type( POLARSSL_MD_SHA1 );
     if( info_sha1 == NULL )
-        return( 1 );
+    {
+        ret = 1;
+        goto exit;
+    }
 
     if( ( ret = md_init_ctx( &sha1_ctx, info_sha1 ) ) != 0 )
-        return( 1 );
+    {
+        ret = 1;
+        goto exit;
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "  PBKDF2 note: test #3 may be slow!\n" );
 
     for( i = 0; i < MAX_TESTS; i++ )
     {
-        printf( "  PBKDF2 (SHA1) #%d: ", i );
+        if( verbose != 0 )
+            polarssl_printf( "  PBKDF2 (SHA1) #%d: ", i );
 
         ret = pkcs5_pbkdf2_hmac( &sha1_ctx, password[i], plen[i], salt[i],
                                   slen[i], it_cnt[i], key_len[i], key );
@@ -396,19 +393,24 @@ int pkcs5_self_test( int verbose )
             memcmp( result_key[i], key, key_len[i] ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
-    printf( "\n" );
+    polarssl_printf( "\n" );
+
+exit:
+    md_free( &sha1_ctx );
 
     return( 0 );
 }
+#endif /* POLARSSL_SHA1_C */
 
 #endif /* POLARSSL_SELF_TEST */
 
diff --git a/Externals/polarssl/library/pkparse.c b/Externals/polarssl/library/pkparse.c
new file mode 100644
index 0000000000..29217a28a2
--- /dev/null
+++ b/Externals/polarssl/library/pkparse.c
@@ -0,0 +1,1256 @@
+/*
+ *  Public Key layer for parsing key files and structures
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_PK_PARSE_C)
+
+#include "polarssl/pk.h"
+#include "polarssl/asn1.h"
+#include "polarssl/oid.h"
+
+#if defined(POLARSSL_RSA_C)
+#include "polarssl/rsa.h"
+#endif
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+#if defined(POLARSSL_ECDSA_C)
+#include "polarssl/ecdsa.h"
+#endif
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+#if defined(POLARSSL_PKCS5_C)
+#include "polarssl/pkcs5.h"
+#endif
+#if defined(POLARSSL_PKCS12_C)
+#include "polarssl/pkcs12.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdlib.h>
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#if defined(POLARSSL_FS_IO)
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ * Load all data from a file into a given buffer.
+ */
+static int load_file( const char *path, unsigned char **buf, size_t *n )
+{
+    FILE *f;
+    long size;
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_PK_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    if( ( size = ftell( f ) ) == -1 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_PK_FILE_IO_ERROR );
+    }
+    fseek( f, 0, SEEK_SET );
+
+    *n = (size_t) size;
+
+    if( *n + 1 == 0 ||
+        ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_PK_MALLOC_FAILED );
+    }
+
+    if( fread( *buf, 1, *n, f ) != *n )
+    {
+        fclose( f );
+        polarssl_free( *buf );
+        return( POLARSSL_ERR_PK_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    (*buf)[*n] = '\0';
+
+    return( 0 );
+}
+
+/*
+ * Load and parse a private key
+ */
+int pk_parse_keyfile( pk_context *ctx,
+                      const char *path, const char *pwd )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    if( pwd == NULL )
+        ret = pk_parse_key( ctx, buf, n, NULL, 0 );
+    else
+        ret = pk_parse_key( ctx, buf, n,
+                (const unsigned char *) pwd, strlen( pwd ) );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+
+/*
+ * Load and parse a public key
+ */
+int pk_parse_public_keyfile( pk_context *ctx, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = pk_parse_public_key( ctx, buf, n );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(POLARSSL_ECP_C)
+/* Minimally parse an ECParameters buffer to and asn1_buf
+ *
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
+ *   -- implicitCurve   NULL
+ * }
+ */
+static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
+                            asn1_buf *params )
+{
+    int ret;
+
+    /* Tag may be either OID or SEQUENCE */
+    params->tag = **p;
+    if( params->tag != ASN1_OID
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
+            && params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE )
+#endif
+            )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+    }
+
+    if( ( ret = asn1_get_tag( p, end, &params->len, params->tag ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    params->p = *p;
+    *p += params->len;
+
+    if( *p != end )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
+/*
+ * Parse a SpecifiedECDomain (SEC 1 C.2) and (mostly) fill the group with it.
+ * WARNING: the resulting group should only be used with
+ * pk_group_id_from_specified(), since its base point may not be set correctly
+ * if it was encoded compressed.
+ *
+ *  SpecifiedECDomain ::= SEQUENCE {
+ *      version SpecifiedECDomainVersion(ecdpVer1 | ecdpVer2 | ecdpVer3, ...),
+ *      fieldID FieldID {{FieldTypes}},
+ *      curve Curve,
+ *      base ECPoint,
+ *      order INTEGER,
+ *      cofactor INTEGER OPTIONAL,
+ *      hash HashAlgorithm OPTIONAL,
+ *      ...
+ *  }
+ *
+ * We only support prime-field as field type, and ignore hash and cofactor.
+ */
+static int pk_group_from_specified( const asn1_buf *params, ecp_group *grp )
+{
+    int ret;
+    unsigned char *p = params->p;
+    const unsigned char * const end = params->p + params->len;
+    const unsigned char *end_field, *end_curve;
+    size_t len;
+    int ver;
+
+    /* SpecifiedECDomainVersion ::= INTEGER { 1, 2, 3 } */
+    if( ( ret = asn1_get_int( &p, end, &ver ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ver < 1 || ver > 3 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+
+    /*
+     * FieldID { FIELD-ID:IOSet } ::= SEQUENCE { -- Finite field
+     *       fieldType FIELD-ID.&id({IOSet}),
+     *       parameters FIELD-ID.&Type({IOSet}{@fieldType})
+     * }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    end_field = p + len;
+
+    /*
+     * FIELD-ID ::= TYPE-IDENTIFIER
+     * FieldTypes FIELD-ID ::= {
+     *       { Prime-p IDENTIFIED BY prime-field } |
+     *       { Characteristic-two IDENTIFIED BY characteristic-two-field }
+     * }
+     * prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
+     */
+    if( ( ret = asn1_get_tag( &p, end_field, &len, ASN1_OID ) ) != 0 )
+        return( ret );
+
+    if( len != OID_SIZE( OID_ANSI_X9_62_PRIME_FIELD ) ||
+        memcmp( p, OID_ANSI_X9_62_PRIME_FIELD, len ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+    }
+
+    p += len;
+
+    /* Prime-p ::= INTEGER -- Field of size p. */
+    if( ( ret = asn1_get_mpi( &p, end_field, &grp->P ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    grp->pbits = mpi_msb( &grp->P );
+
+    if( p != end_field )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    /*
+     * Curve ::= SEQUENCE {
+     *       a FieldElement,
+     *       b FieldElement,
+     *       seed BIT STRING OPTIONAL
+     *       -- Shall be present if used in SpecifiedECDomain
+     *       -- with version equal to ecdpVer2 or ecdpVer3
+     * }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( ret );
+
+    end_curve = p + len;
+
+    /*
+     * FieldElement ::= OCTET STRING
+     * containing an integer in the case of a prime field
+     */
+    if( ( ret = asn1_get_tag( &p, end_curve, &len, ASN1_OCTET_STRING ) ) != 0 ||
+        ( ret = mpi_read_binary( &grp->A, p, len ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    if( ( ret = asn1_get_tag( &p, end_curve, &len, ASN1_OCTET_STRING ) ) != 0 ||
+        ( ret = mpi_read_binary( &grp->B, p, len ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    /* Ignore seed BIT STRING OPTIONAL */
+    if( ( ret = asn1_get_tag( &p, end_curve, &len, ASN1_BIT_STRING ) ) == 0 )
+        p += len;
+
+    if( p != end_curve )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    /*
+     * ECPoint ::= OCTET STRING
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = ecp_point_read_binary( grp, &grp->G,
+                                      ( const unsigned char *) p, len ) ) != 0 )
+    {
+        /*
+         * If we can't read the point because it's compressed, cheat by
+         * reading only the X coordinate and the parity bit of Y.
+         */
+        if( ret != POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE ||
+            ( p[0] != 0x02 && p[0] != 0x03 ) ||
+            len != mpi_size( &grp->P ) + 1 ||
+            mpi_read_binary( &grp->G.X, p + 1, len - 1 ) != 0 ||
+            mpi_lset( &grp->G.Y, p[0] - 2 ) != 0 ||
+            mpi_lset( &grp->G.Z, 1 ) != 0 )
+        {
+            return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+        }
+    }
+
+    p += len;
+
+    /*
+     * order INTEGER
+     */
+    if( ( ret = asn1_get_mpi( &p, end, &grp->N ) ) )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    grp->nbits = mpi_msb( &grp->N );
+
+    /*
+     * Allow optional elements by purposefully not enforcing p == end here.
+     */
+
+    return( 0 );
+}
+
+/*
+ * Find the group id associated with an (almost filled) group as generated by
+ * pk_group_from_specified(), or return an error if unknown.
+ */
+static int pk_group_id_from_group( const ecp_group *grp, ecp_group_id *grp_id )
+{
+    int ret = 0;
+    ecp_group ref;
+    const ecp_group_id *id;
+
+    ecp_group_init( &ref );
+
+    for( id = ecp_grp_id_list(); *id != POLARSSL_ECP_DP_NONE; id++ )
+    {
+        /* Load the group associated to that id */
+        ecp_group_free( &ref );
+        MPI_CHK( ecp_use_known_dp( &ref, *id ) );
+
+        /* Compare to the group we were given, starting with easy tests */
+        if( grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
+            mpi_cmp_mpi( &grp->P, &ref.P ) == 0 &&
+            mpi_cmp_mpi( &grp->A, &ref.A ) == 0 &&
+            mpi_cmp_mpi( &grp->B, &ref.B ) == 0 &&
+            mpi_cmp_mpi( &grp->N, &ref.N ) == 0 &&
+            mpi_cmp_mpi( &grp->G.X, &ref.G.X ) == 0 &&
+            mpi_cmp_mpi( &grp->G.Z, &ref.G.Z ) == 0 &&
+            /* For Y we may only know the parity bit, so compare only that */
+            mpi_get_bit( &grp->G.Y, 0 ) == mpi_get_bit( &ref.G.Y, 0 ) )
+        {
+            break;
+        }
+
+    }
+
+cleanup:
+    ecp_group_free( &ref );
+
+    *grp_id = *id;
+
+    if( ret == 0 && *id == POLARSSL_ECP_DP_NONE )
+        ret = POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE;
+
+    return( ret );
+}
+
+/*
+ * Parse a SpecifiedECDomain (SEC 1 C.2) and find the associated group ID
+ */
+static int pk_group_id_from_specified( const asn1_buf *params,
+                                       ecp_group_id *grp_id )
+{
+    int ret;
+    ecp_group grp;
+
+    ecp_group_init( &grp );
+
+    if( ( ret = pk_group_from_specified( params, &grp ) ) != 0 )
+        goto cleanup;
+
+    ret = pk_group_id_from_group( &grp, grp_id );
+
+cleanup:
+    ecp_group_free( &grp );
+
+    return( ret );
+}
+#endif /* POLARSSL_PK_PARSE_EC_EXTENDED */
+
+/*
+ * Use EC parameters to initialise an EC group
+ *
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ *   specifiedCurve     SpecifiedECDomain -- = SEQUENCE { ... }
+ *   -- implicitCurve   NULL
+ */
+static int pk_use_ecparams( const asn1_buf *params, ecp_group *grp )
+{
+    int ret;
+    ecp_group_id grp_id;
+
+    if( params->tag == ASN1_OID )
+    {
+        if( oid_get_ec_grp( params, &grp_id ) != 0 )
+            return( POLARSSL_ERR_PK_UNKNOWN_NAMED_CURVE );
+    }
+    else
+    {
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
+        if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 )
+            return( ret );
+#else
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+#endif
+    }
+
+    /*
+     * grp may already be initilialized; if so, make sure IDs match
+     */
+    if( grp->id != POLARSSL_ECP_DP_NONE && grp->id != grp_id )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+
+    if( ( ret = ecp_use_known_dp( grp, grp_id ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+/*
+ * EC public key is an EC point
+ *
+ * The caller is responsible for clearing the structure upon failure if
+ * desired. Take care to pass along the possible ECP_FEATURE_UNAVAILABLE
+ * return code of ecp_point_read_binary() and leave p in a usable state.
+ */
+static int pk_get_ecpubkey( unsigned char **p, const unsigned char *end,
+                            ecp_keypair *key )
+{
+    int ret;
+
+    if( ( ret = ecp_point_read_binary( &key->grp, &key->Q,
+                    (const unsigned char *) *p, end - *p ) ) == 0 )
+    {
+        ret = ecp_check_pubkey( &key->grp, &key->Q );
+    }
+
+    /*
+     * We know ecp_point_read_binary consumed all bytes or failed
+     */
+    *p = (unsigned char *) end;
+
+    return( ret );
+}
+#endif /* POLARSSL_ECP_C */
+
+#if defined(POLARSSL_RSA_C)
+/*
+ *  RSAPublicKey ::= SEQUENCE {
+ *      modulus           INTEGER,  -- n
+ *      publicExponent    INTEGER   -- e
+ *  }
+ */
+static int pk_get_rsapubkey( unsigned char **p,
+                             const unsigned char *end,
+                             rsa_context *rsa )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( *p + len != end )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    if( ( ret = asn1_get_mpi( p, end, &rsa->N ) ) != 0 ||
+        ( ret = asn1_get_mpi( p, end, &rsa->E ) ) != 0 )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( *p != end )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    if( ( ret = rsa_check_pubkey( rsa ) ) != 0 )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY );
+
+    rsa->len = mpi_size( &rsa->N );
+
+    return( 0 );
+}
+#endif /* POLARSSL_RSA_C */
+
+/* Get a PK algorithm identifier
+ *
+ *  AlgorithmIdentifier  ::=  SEQUENCE  {
+ *       algorithm               OBJECT IDENTIFIER,
+ *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ */
+static int pk_get_pk_alg( unsigned char **p,
+                          const unsigned char *end,
+                          pk_type_t *pk_alg, asn1_buf *params )
+{
+    int ret;
+    asn1_buf alg_oid;
+
+    memset( params, 0, sizeof(asn1_buf) );
+
+    if( ( ret = asn1_get_alg( p, end, &alg_oid, params ) ) != 0 )
+        return( POLARSSL_ERR_PK_INVALID_ALG + ret );
+
+    if( oid_get_pk_alg( &alg_oid, pk_alg ) != 0 )
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    /*
+     * No parameters with RSA (only for EC)
+     */
+    if( *pk_alg == POLARSSL_PK_RSA &&
+            ( ( params->tag != ASN1_NULL && params->tag != 0 ) ||
+                params->len != 0 ) )
+    {
+        return( POLARSSL_ERR_PK_INVALID_ALG );
+    }
+
+    return( 0 );
+}
+
+/*
+ *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+ *       algorithm            AlgorithmIdentifier,
+ *       subjectPublicKey     BIT STRING }
+ */
+int pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        pk_context *pk )
+{
+    int ret;
+    size_t len;
+    asn1_buf alg_params;
+    pk_type_t pk_alg = POLARSSL_PK_NONE;
+    const pk_info_t *pk_info;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+                    ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = *p + len;
+
+    if( ( ret = pk_get_pk_alg( p, end, &pk_alg, &alg_params ) ) != 0 )
+        return( ret );
+
+    if( ( ret = asn1_get_bitstring_null( p, end, &len ) ) != 0 )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY + ret );
+
+    if( *p + len != end )
+        return( POLARSSL_ERR_PK_INVALID_PUBKEY +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    if( ( pk_info = pk_info_from_type( pk_alg ) ) == NULL )
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 )
+        return( ret );
+
+#if defined(POLARSSL_RSA_C)
+    if( pk_alg == POLARSSL_PK_RSA )
+    {
+        ret = pk_get_rsapubkey( p, end, pk_rsa( *pk ) );
+    } else
+#endif /* POLARSSL_RSA_C */
+#if defined(POLARSSL_ECP_C)
+    if( pk_alg == POLARSSL_PK_ECKEY_DH || pk_alg == POLARSSL_PK_ECKEY )
+    {
+        ret = pk_use_ecparams( &alg_params, &pk_ec( *pk )->grp );
+        if( ret == 0 )
+            ret = pk_get_ecpubkey( p, end, pk_ec( *pk ) );
+    } else
+#endif /* POLARSSL_ECP_C */
+        ret = POLARSSL_ERR_PK_UNKNOWN_PK_ALG;
+
+    if( ret == 0 && *p != end )
+        ret = POLARSSL_ERR_PK_INVALID_PUBKEY
+              POLARSSL_ERR_ASN1_LENGTH_MISMATCH;
+
+    if( ret != 0 )
+        pk_free( pk );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_RSA_C)
+/*
+ * Parse a PKCS#1 encoded private RSA key
+ */
+static int pk_parse_key_pkcs1_der( rsa_context *rsa,
+                                   const unsigned char *key,
+                                   size_t keylen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end;
+
+    p = (unsigned char *) key;
+    end = p + keylen;
+
+    /*
+     * This function parses the RSAPrivateKey (PKCS#1)
+     *
+     *  RSAPrivateKey ::= SEQUENCE {
+     *      version           Version,
+     *      modulus           INTEGER,  -- n
+     *      publicExponent    INTEGER,  -- e
+     *      privateExponent   INTEGER,  -- d
+     *      prime1            INTEGER,  -- p
+     *      prime2            INTEGER,  -- q
+     *      exponent1         INTEGER,  -- d mod (p-1)
+     *      exponent2         INTEGER,  -- d mod (q-1)
+     *      coefficient       INTEGER,  -- (inverse of q) mod p
+     *      otherPrimeInfos   OtherPrimeInfos OPTIONAL
+     *  }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = asn1_get_int( &p, end, &rsa->ver ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    if( rsa->ver != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_VERSION );
+    }
+
+    if( ( ret = asn1_get_mpi( &p, end, &rsa->N  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->E  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->D  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->P  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->Q  ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->DP ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->DQ ) ) != 0 ||
+        ( ret = asn1_get_mpi( &p, end, &rsa->QP ) ) != 0 )
+    {
+        rsa_free( rsa );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    rsa->len = mpi_size( &rsa->N );
+
+    if( p != end )
+    {
+        rsa_free( rsa );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    if( ( ret = rsa_check_privkey( rsa ) ) != 0 )
+    {
+        rsa_free( rsa );
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+/*
+ * Parse a SEC1 encoded private EC key
+ */
+static int pk_parse_key_sec1_der( ecp_keypair *eck,
+                                  const unsigned char *key,
+                                  size_t keylen )
+{
+    int ret;
+    int version, pubkey_done;
+    size_t len;
+    asn1_buf params;
+    unsigned char *p = (unsigned char *) key;
+    unsigned char *end = p + keylen;
+    unsigned char *end2;
+
+    /*
+     * RFC 5915, or SEC1 Appendix C.4
+     *
+     * ECPrivateKey ::= SEQUENCE {
+     *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+     *      privateKey     OCTET STRING,
+     *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+     *      publicKey  [1] BIT STRING OPTIONAL
+     *    }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = asn1_get_int( &p, end, &version ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( version != 1 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_VERSION );
+
+    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = mpi_read_binary( &eck->d, p, len ) ) != 0 )
+    {
+        ecp_keypair_free( eck );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    p += len;
+
+    /*
+     * Is 'parameters' present?
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 0 ) ) == 0 )
+    {
+        if( ( ret = pk_get_ecparams( &p, p + len, &params) ) != 0 ||
+            ( ret = pk_use_ecparams( &params, &eck->grp )  ) != 0 )
+        {
+            ecp_keypair_free( eck );
+            return( ret );
+        }
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+    {
+        ecp_keypair_free( eck );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    /*
+     * Is 'publickey' present? If not, or if we can't read it (eg because it
+     * is compressed), create it from the private key.
+     */
+    pubkey_done = 0;
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 1 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        if( ( ret = asn1_get_bitstring_null( &p, end2, &len ) ) != 0 )
+            return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+        if( p + len != end2 )
+            return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+        if( ( ret = pk_get_ecpubkey( &p, end2, eck ) ) == 0 )
+            pubkey_done = 1;
+        else
+        {
+            /*
+             * The only acceptable failure mode of pk_get_ecpubkey() above
+             * is if the point format is not recognized.
+             */
+            if( ret != POLARSSL_ERR_ECP_FEATURE_UNAVAILABLE )
+                return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+        }
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+    {
+        ecp_keypair_free( eck );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    if( ! pubkey_done &&
+        ( ret = ecp_mul( &eck->grp, &eck->Q, &eck->d, &eck->grp.G,
+                                                      NULL, NULL ) ) != 0 )
+    {
+        ecp_keypair_free( eck );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
+    {
+        ecp_keypair_free( eck );
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_ECP_C */
+
+/*
+ * Parse an unencrypted PKCS#8 encoded private key
+ */
+static int pk_parse_key_pkcs8_unencrypted_der(
+                                    pk_context *pk,
+                                    const unsigned char* key,
+                                    size_t keylen )
+{
+    int ret, version;
+    size_t len;
+    asn1_buf params;
+    unsigned char *p = (unsigned char *) key;
+    unsigned char *end = p + keylen;
+    pk_type_t pk_alg = POLARSSL_PK_NONE;
+    const pk_info_t *pk_info;
+
+    /*
+     * This function parses the PrivatKeyInfo object (PKCS#8 v1.2 = RFC 5208)
+     *
+     *    PrivateKeyInfo ::= SEQUENCE {
+     *      version                   Version,
+     *      privateKeyAlgorithm       PrivateKeyAlgorithmIdentifier,
+     *      privateKey                PrivateKey,
+     *      attributes           [0]  IMPLICIT Attributes OPTIONAL }
+     *
+     *    Version ::= INTEGER
+     *    PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
+     *    PrivateKey ::= OCTET STRING
+     *
+     *  The PrivateKey OCTET STRING is a SEC1 ECPrivateKey
+     */
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = asn1_get_int( &p, end, &version ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( version != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_VERSION + ret );
+
+    if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &params ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( len < 1 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    if( ( pk_info = pk_info_from_type( pk_alg ) ) == NULL )
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 )
+        return( ret );
+
+#if defined(POLARSSL_RSA_C)
+    if( pk_alg == POLARSSL_PK_RSA )
+    {
+        if( ( ret = pk_parse_key_pkcs1_der( pk_rsa( *pk ), p, len ) ) != 0 )
+        {
+            pk_free( pk );
+            return( ret );
+        }
+    } else
+#endif /* POLARSSL_RSA_C */
+#if defined(POLARSSL_ECP_C)
+    if( pk_alg == POLARSSL_PK_ECKEY || pk_alg == POLARSSL_PK_ECKEY_DH )
+    {
+        if( ( ret = pk_use_ecparams( &params, &pk_ec( *pk )->grp ) ) != 0 ||
+            ( ret = pk_parse_key_sec1_der( pk_ec( *pk ), p, len )  ) != 0 )
+        {
+            pk_free( pk );
+            return( ret );
+        }
+    } else
+#endif /* POLARSSL_ECP_C */
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    return( 0 );
+}
+
+/*
+ * Parse an encrypted PKCS#8 encoded private key
+ */
+static int pk_parse_key_pkcs8_encrypted_der(
+                                    pk_context *pk,
+                                    const unsigned char *key, size_t keylen,
+                                    const unsigned char *pwd, size_t pwdlen )
+{
+    int ret, decrypted = 0;
+    size_t len;
+    unsigned char buf[2048];
+    unsigned char *p, *end;
+    asn1_buf pbe_alg_oid, pbe_params;
+#if defined(POLARSSL_PKCS12_C)
+    cipher_type_t cipher_alg;
+    md_type_t md_alg;
+#endif
+
+    memset( buf, 0, sizeof( buf ) );
+
+    p = (unsigned char *) key;
+    end = p + keylen;
+
+    if( pwdlen == 0 )
+        return( POLARSSL_ERR_PK_PASSWORD_REQUIRED );
+
+    /*
+     * This function parses the EncryptedPrivatKeyInfo object (PKCS#8)
+     *
+     *  EncryptedPrivateKeyInfo ::= SEQUENCE {
+     *    encryptionAlgorithm  EncryptionAlgorithmIdentifier,
+     *    encryptedData        EncryptedData
+     *  }
+     *
+     *  EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
+     *
+     *  EncryptedData ::= OCTET STRING
+     *
+     *  The EncryptedData OCTET STRING is a PKCS#8 PrivateKeyInfo
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+
+    if( ( ret = asn1_get_alg( &p, end, &pbe_alg_oid, &pbe_params ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+
+    if( len > sizeof( buf ) )
+        return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
+
+    /*
+     * Decrypt EncryptedData with appropriate PDE
+     */
+#if defined(POLARSSL_PKCS12_C)
+    if( oid_get_pkcs12_pbe_alg( &pbe_alg_oid, &md_alg, &cipher_alg ) == 0 )
+    {
+        if( ( ret = pkcs12_pbe( &pbe_params, PKCS12_PBE_DECRYPT,
+                                cipher_alg, md_alg,
+                                pwd, pwdlen, p, len, buf ) ) != 0 )
+        {
+            if( ret == POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH )
+                return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+
+            return( ret );
+        }
+
+        decrypted = 1;
+    }
+    else if( OID_CMP( OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) )
+    {
+        if( ( ret = pkcs12_pbe_sha1_rc4_128( &pbe_params,
+                                             PKCS12_PBE_DECRYPT,
+                                             pwd, pwdlen,
+                                             p, len, buf ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        // Best guess for password mismatch when using RC4. If first tag is
+        // not ASN1_CONSTRUCTED | ASN1_SEQUENCE
+        //
+        if( *buf != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+            return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+
+        decrypted = 1;
+    }
+    else
+#endif /* POLARSSL_PKCS12_C */
+#if defined(POLARSSL_PKCS5_C)
+    if( OID_CMP( OID_PKCS5_PBES2, &pbe_alg_oid ) )
+    {
+        if( ( ret = pkcs5_pbes2( &pbe_params, PKCS5_DECRYPT, pwd, pwdlen,
+                                  p, len, buf ) ) != 0 )
+        {
+            if( ret == POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH )
+                return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+
+            return( ret );
+        }
+
+        decrypted = 1;
+    }
+    else
+#endif /* POLARSSL_PKCS5_C */
+    {
+        ((void) pwd);
+    }
+
+    if( decrypted == 0 )
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( pk_parse_key_pkcs8_unencrypted_der( pk, buf, len ) );
+}
+
+/*
+ * Parse a private key
+ */
+int pk_parse_key( pk_context *pk,
+                  const unsigned char *key, size_t keylen,
+                  const unsigned char *pwd, size_t pwdlen )
+{
+    int ret;
+    const pk_info_t *pk_info;
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    size_t len;
+    pem_context pem;
+
+    pem_init( &pem );
+
+#if defined(POLARSSL_RSA_C)
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN RSA PRIVATE KEY-----",
+                           "-----END RSA PRIVATE KEY-----",
+                           key, pwd, pwdlen, &len );
+    if( ret == 0 )
+    {
+        if( ( pk_info = pk_info_from_type( POLARSSL_PK_RSA ) ) == NULL )
+            return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+        if( ( ret = pk_init_ctx( pk, pk_info                    ) ) != 0 ||
+            ( ret = pk_parse_key_pkcs1_der( pk_rsa( *pk ),
+                                            pem.buf, pem.buflen ) ) != 0 )
+        {
+            pk_free( pk );
+        }
+
+        pem_free( &pem );
+        return( ret );
+    }
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_MISMATCH )
+        return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_REQUIRED )
+        return( POLARSSL_ERR_PK_PASSWORD_REQUIRED );
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN EC PRIVATE KEY-----",
+                           "-----END EC PRIVATE KEY-----",
+                           key, pwd, pwdlen, &len );
+    if( ret == 0 )
+    {
+        if( ( pk_info = pk_info_from_type( POLARSSL_PK_ECKEY ) ) == NULL )
+            return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+        if( ( ret = pk_init_ctx( pk, pk_info                   ) ) != 0 ||
+            ( ret = pk_parse_key_sec1_der( pk_ec( *pk ),
+                                           pem.buf, pem.buflen ) ) != 0 )
+        {
+            pk_free( pk );
+        }
+
+        pem_free( &pem );
+        return( ret );
+    }
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_MISMATCH )
+        return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_REQUIRED )
+        return( POLARSSL_ERR_PK_PASSWORD_REQUIRED );
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#endif /* POLARSSL_ECP_C */
+
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN PRIVATE KEY-----",
+                           "-----END PRIVATE KEY-----",
+                           key, NULL, 0, &len );
+    if( ret == 0 )
+    {
+        if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk,
+                                                pem.buf, pem.buflen ) ) != 0 )
+        {
+            pk_free( pk );
+        }
+
+        pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN ENCRYPTED PRIVATE KEY-----",
+                           "-----END ENCRYPTED PRIVATE KEY-----",
+                           key, NULL, 0, &len );
+    if( ret == 0 )
+    {
+        if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk,
+                                                      pem.buf, pem.buflen,
+                                                      pwd, pwdlen ) ) != 0 )
+        {
+            pk_free( pk );
+        }
+
+        pem_free( &pem );
+        return( ret );
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+        return( ret );
+#else
+    ((void) pwd);
+    ((void) pwdlen);
+#endif /* POLARSSL_PEM_PARSE_C */
+
+    /*
+    * At this point we only know it's not a PEM formatted key. Could be any
+    * of the known DER encoded private key formats
+    *
+    * We try the different DER format parsers to see if one passes without
+    * error
+    */
+    if( ( ret = pk_parse_key_pkcs8_encrypted_der( pk, key, keylen,
+                                                  pwd, pwdlen ) ) == 0 )
+    {
+        return( 0 );
+    }
+
+    pk_free( pk );
+
+    if( ret == POLARSSL_ERR_PK_PASSWORD_MISMATCH )
+    {
+        return( ret );
+    }
+
+    if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen ) ) == 0 )
+        return( 0 );
+
+    pk_free( pk );
+
+#if defined(POLARSSL_RSA_C)
+    if( ( pk_info = pk_info_from_type( POLARSSL_PK_RSA ) ) == NULL )
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = pk_init_ctx( pk, pk_info                           ) ) != 0 ||
+        ( ret = pk_parse_key_pkcs1_der( pk_rsa( *pk ), key, keylen ) ) == 0 )
+    {
+        return( 0 );
+    }
+
+    pk_free( pk );
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+    if( ( pk_info = pk_info_from_type( POLARSSL_PK_ECKEY ) ) == NULL )
+        return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
+
+    if( ( ret = pk_init_ctx( pk, pk_info                         ) ) != 0 ||
+        ( ret = pk_parse_key_sec1_der( pk_ec( *pk ), key, keylen ) ) == 0 )
+    {
+        return( 0 );
+    }
+
+    pk_free( pk );
+#endif /* POLARSSL_ECP_C */
+
+    return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+}
+
+/*
+ * Parse a public key
+ */
+int pk_parse_public_key( pk_context *ctx,
+                         const unsigned char *key, size_t keylen )
+{
+    int ret;
+    unsigned char *p;
+#if defined(POLARSSL_PEM_PARSE_C)
+    size_t len;
+    pem_context pem;
+
+    pem_init( &pem );
+    ret = pem_read_buffer( &pem,
+            "-----BEGIN PUBLIC KEY-----",
+            "-----END PUBLIC KEY-----",
+            key, NULL, 0, &len );
+
+    if( ret == 0 )
+    {
+        /*
+         * Was PEM encoded
+         */
+        key = pem.buf;
+        keylen = pem.buflen;
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+    {
+        pem_free( &pem );
+        return( ret );
+    }
+#endif /* POLARSSL_PEM_PARSE_C */
+    p = (unsigned char *) key;
+
+    ret = pk_parse_subpubkey( &p, p + keylen, ctx );
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    pem_free( &pem );
+#endif
+
+    return( ret );
+}
+
+#endif /* POLARSSL_PK_PARSE_C */
diff --git a/Externals/polarssl/library/pkwrite.c b/Externals/polarssl/library/pkwrite.c
new file mode 100644
index 0000000000..3b0bbdb4e5
--- /dev/null
+++ b/Externals/polarssl/library/pkwrite.c
@@ -0,0 +1,358 @@
+/*
+ *  Public Key layer for writing key files and structures
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_PK_WRITE_C)
+
+#include "polarssl/pk.h"
+#include "polarssl/asn1write.h"
+#include "polarssl/oid.h"
+
+#if defined(POLARSSL_RSA_C)
+#include "polarssl/rsa.h"
+#endif
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+#if defined(POLARSSL_ECDSA_C)
+#include "polarssl/ecdsa.h"
+#endif
+#if defined(POLARSSL_PEM_WRITE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdlib.h>
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#if defined(POLARSSL_RSA_C)
+/*
+ *  RSAPublicKey ::= SEQUENCE {
+ *      modulus           INTEGER,  -- n
+ *      publicExponent    INTEGER   -- e
+ *  }
+ */
+static int pk_write_rsa_pubkey( unsigned char **p, unsigned char *start,
+                                  rsa_context *rsa )
+{
+    int ret;
+    size_t len = 0;
+
+    ASN1_CHK_ADD( len, asn1_write_mpi( p, start, &rsa->E ) );
+    ASN1_CHK_ADD( len, asn1_write_mpi( p, start, &rsa->N ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+#endif /* POLARSSL_RSA_C */
+
+#if defined(POLARSSL_ECP_C)
+/*
+ * EC public key is an EC point
+ */
+static int pk_write_ec_pubkey( unsigned char **p, unsigned char *start,
+                                 ecp_keypair *ec )
+{
+    int ret;
+    size_t len = 0;
+    unsigned char buf[POLARSSL_ECP_MAX_PT_LEN];
+
+    if( ( ret = ecp_point_write_binary( &ec->grp, &ec->Q,
+                                        POLARSSL_ECP_PF_UNCOMPRESSED,
+                                        &len, buf, sizeof( buf ) ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    if( *p - start < (int) len )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    *p -= len;
+    memcpy( *p, buf, len );
+
+    return( (int) len );
+}
+
+/*
+ * ECParameters ::= CHOICE {
+ *   namedCurve         OBJECT IDENTIFIER
+ * }
+ */
+static int pk_write_ec_param( unsigned char **p, unsigned char *start,
+                                ecp_keypair *ec )
+{
+    int ret;
+    size_t len = 0;
+    const char *oid;
+    size_t oid_len;
+
+    if( ( ret = oid_get_oid_by_ec_grp( ec->grp.id, &oid, &oid_len ) ) != 0 )
+        return( ret );
+
+    ASN1_CHK_ADD( len, asn1_write_oid( p, start, oid, oid_len ) );
+
+    return( (int) len );
+}
+#endif /* POLARSSL_ECP_C */
+
+int pk_write_pubkey( unsigned char **p, unsigned char *start,
+                     const pk_context *key )
+{
+    int ret;
+    size_t len = 0;
+
+#if defined(POLARSSL_RSA_C)
+    if( pk_get_type( key ) == POLARSSL_PK_RSA )
+        ASN1_CHK_ADD( len, pk_write_rsa_pubkey( p, start, pk_rsa( *key ) ) );
+    else
+#endif
+#if defined(POLARSSL_ECP_C)
+    if( pk_get_type( key ) == POLARSSL_PK_ECKEY )
+        ASN1_CHK_ADD( len, pk_write_ec_pubkey( p, start, pk_ec( *key ) ) );
+    else
+#endif
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( (int) len );
+}
+
+int pk_write_pubkey_der( pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char *c;
+    size_t len = 0, par_len = 0, oid_len;
+    const char *oid;
+
+    c = buf + size;
+
+    ASN1_CHK_ADD( len, pk_write_pubkey( &c, buf, key ) );
+
+    if( c - buf < 1 )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    /*
+     *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+     *       algorithm            AlgorithmIdentifier,
+     *       subjectPublicKey     BIT STRING }
+     */
+    *--c = 0;
+    len += 1;
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_BIT_STRING ) );
+
+    if( ( ret = oid_get_oid_by_pk_alg( pk_get_type( key ),
+                                       &oid, &oid_len ) ) != 0 )
+    {
+        return( ret );
+    }
+
+#if defined(POLARSSL_ECP_C)
+    if( pk_get_type( key ) == POLARSSL_PK_ECKEY )
+    {
+        ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, pk_ec( *key ) ) );
+    }
+#endif
+
+    ASN1_CHK_ADD( len, asn1_write_algorithm_identifier( &c, buf, oid, oid_len,
+                                                        par_len ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED |
+                                                ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+int pk_write_key_der( pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char *c = buf + size;
+    size_t len = 0;
+
+#if defined(POLARSSL_RSA_C)
+    if( pk_get_type( key ) == POLARSSL_PK_RSA )
+    {
+        rsa_context *rsa = pk_rsa( *key );
+
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->QP ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->DQ ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->DP ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->Q ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->P ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->D ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->E ) );
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->N ) );
+        ASN1_CHK_ADD( len, asn1_write_int( &c, buf, 0 ) );
+
+        ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+    }
+    else
+#endif /* POLARSSL_RSA_C */
+#if defined(POLARSSL_ECP_C)
+    if( pk_get_type( key ) == POLARSSL_PK_ECKEY )
+    {
+        ecp_keypair *ec = pk_ec( *key );
+        size_t pub_len = 0, par_len = 0;
+
+        /*
+         * RFC 5915, or SEC1 Appendix C.4
+         *
+         * ECPrivateKey ::= SEQUENCE {
+         *      version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+         *      privateKey     OCTET STRING,
+         *      parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+         *      publicKey  [1] BIT STRING OPTIONAL
+         *    }
+         */
+
+        /* publicKey */
+        ASN1_CHK_ADD( pub_len, pk_write_ec_pubkey( &c, buf, ec ) );
+
+        if( c - buf < 1 )
+            return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+        *--c = 0;
+        pub_len += 1;
+
+        ASN1_CHK_ADD( pub_len, asn1_write_len( &c, buf, pub_len ) );
+        ASN1_CHK_ADD( pub_len, asn1_write_tag( &c, buf, ASN1_BIT_STRING ) );
+
+        ASN1_CHK_ADD( pub_len, asn1_write_len( &c, buf, pub_len ) );
+        ASN1_CHK_ADD( pub_len, asn1_write_tag( &c, buf,
+                            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 1 ) );
+        len += pub_len;
+
+        /* parameters */
+        ASN1_CHK_ADD( par_len, pk_write_ec_param( &c, buf, ec ) );
+
+        ASN1_CHK_ADD( par_len, asn1_write_len( &c, buf, par_len ) );
+        ASN1_CHK_ADD( par_len, asn1_write_tag( &c, buf,
+                            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 0 ) );
+        len += par_len;
+
+        /* privateKey: write as MPI then fix tag */
+        ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &ec->d ) );
+        *c = ASN1_OCTET_STRING;
+
+        /* version */
+        ASN1_CHK_ADD( len, asn1_write_int( &c, buf, 1 ) );
+
+        ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+    }
+    else
+#endif /* POLARSSL_ECP_C */
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+
+    return( (int) len );
+}
+
+#if defined(POLARSSL_PEM_WRITE_C)
+
+#define PEM_BEGIN_PUBLIC_KEY    "-----BEGIN PUBLIC KEY-----\n"
+#define PEM_END_PUBLIC_KEY      "-----END PUBLIC KEY-----\n"
+
+#define PEM_BEGIN_PRIVATE_KEY_RSA   "-----BEGIN RSA PRIVATE KEY-----\n"
+#define PEM_END_PRIVATE_KEY_RSA     "-----END RSA PRIVATE KEY-----\n"
+#define PEM_BEGIN_PRIVATE_KEY_EC    "-----BEGIN EC PRIVATE KEY-----\n"
+#define PEM_END_PRIVATE_KEY_EC      "-----END EC PRIVATE KEY-----\n"
+
+int pk_write_pubkey_pem( pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char output_buf[4096];
+    size_t olen = 0;
+
+    if( ( ret = pk_write_pubkey_der( key, output_buf,
+                                     sizeof(output_buf) ) ) < 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = pem_write_buffer( PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+int pk_write_key_pem( pk_context *key, unsigned char *buf, size_t size )
+{
+    int ret;
+    unsigned char output_buf[4096];
+    const char *begin, *end;
+    size_t olen = 0;
+
+    if( ( ret = pk_write_key_der( key, output_buf, sizeof(output_buf) ) ) < 0 )
+        return( ret );
+
+#if defined(POLARSSL_RSA_C)
+    if( pk_get_type( key ) == POLARSSL_PK_RSA )
+    {
+        begin = PEM_BEGIN_PRIVATE_KEY_RSA;
+        end = PEM_END_PRIVATE_KEY_RSA;
+    }
+    else
+#endif
+#if defined(POLARSSL_ECP_C)
+    if( pk_get_type( key ) == POLARSSL_PK_ECKEY )
+    {
+        begin = PEM_BEGIN_PRIVATE_KEY_EC;
+        end = PEM_END_PRIVATE_KEY_EC;
+    }
+    else
+#endif
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+
+    if( ( ret = pem_write_buffer( begin, end,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_PEM_WRITE_C */
+
+#endif /* POLARSSL_PK_WRITE_C */
diff --git a/Externals/polarssl/library/platform.c b/Externals/polarssl/library/platform.c
new file mode 100644
index 0000000000..d57cbc8286
--- /dev/null
+++ b/Externals/polarssl/library/platform.c
@@ -0,0 +1,116 @@
+/*
+ *  Platform abstraction layer
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+
+#include "polarssl/platform.h"
+
+#if defined(POLARSSL_PLATFORM_MEMORY)
+#if !defined(POLARSSL_PLATFORM_STD_MALLOC)
+static void *platform_malloc_uninit( size_t len )
+{
+    ((void) len);
+    return( NULL );
+}
+
+#define POLARSSL_PLATFORM_STD_MALLOC   platform_malloc_uninit
+#endif /* !POLARSSL_PLATFORM_STD_MALLOC */
+
+#if !defined(POLARSSL_PLATFORM_STD_FREE)
+static void platform_free_uninit( void *ptr )
+{
+    ((void) ptr);
+}
+
+#define POLARSSL_PLATFORM_STD_FREE     platform_free_uninit
+#endif /* !POLARSSL_PLATFORM_STD_FREE */
+
+void * (*polarssl_malloc)( size_t ) = POLARSSL_PLATFORM_STD_MALLOC;
+void (*polarssl_free)( void * )     = POLARSSL_PLATFORM_STD_FREE;
+
+int platform_set_malloc_free( void * (*malloc_func)( size_t ),
+                              void (*free_func)( void * ) )
+{
+    polarssl_malloc = malloc_func;
+    polarssl_free = free_func;
+    return( 0 );
+}
+#endif /* POLARSSL_PLATFORM_MEMORY */
+
+#if defined(POLARSSL_PLATFORM_PRINTF_ALT)
+#if !defined(POLARSSL_PLATFORM_STD_PRINTF)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_printf_uninit( const char *format, ... )
+{
+    ((void) format);
+    return( 0 );
+}
+
+#define POLARSSL_PLATFORM_STD_PRINTF    platform_printf_uninit
+#endif /* !POLARSSL_PLATFORM_STD_PRINTF */
+
+int (*polarssl_printf)( const char *, ... ) = POLARSSL_PLATFORM_STD_PRINTF;
+
+int platform_set_printf( int (*printf_func)( const char *, ... ) )
+{
+    polarssl_printf = printf_func;
+    return( 0 );
+}
+#endif /* POLARSSL_PLATFORM_PRINTF_ALT */
+
+#if defined(POLARSSL_PLATFORM_FPRINTF_ALT)
+#if !defined(POLARSSL_PLATFORM_STD_FPRINTF)
+/*
+ * Make dummy function to prevent NULL pointer dereferences
+ */
+static int platform_fprintf_uninit( FILE *stream, const char *format, ... )
+{
+    ((void) stream);
+    ((void) format);
+    return( 0 );
+}
+
+#define POLARSSL_PLATFORM_STD_FPRINTF   platform_fprintf_uninit
+#endif /* !POLARSSL_PLATFORM_STD_FPRINTF */
+
+int (*polarssl_fprintf)( FILE *, const char *, ... ) =
+                                        POLARSSL_PLATFORM_STD_FPRINTF;
+
+int platform_set_fprintf( int (*fprintf_func)( FILE *, const char *, ... ) )
+{
+    polarssl_fprintf = fprintf_func;
+    return( 0 );
+}
+#endif /* POLARSSL_PLATFORM_FPRINTF_ALT */
+
+#endif /* POLARSSL_PLATFORM_C */
diff --git a/Externals/polarssl/library/ripemd160.c b/Externals/polarssl/library/ripemd160.c
new file mode 100644
index 0000000000..fcd77609fc
--- /dev/null
+++ b/Externals/polarssl/library/ripemd160.c
@@ -0,0 +1,653 @@
+/*
+ *  RIPE MD-160 implementation
+ *
+ *  Copyright (C) 2014-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ *  The RIPEMD-160 algorithm was designed by RIPE in 1996
+ *  http://homes.esat.kuleuven.be/~bosselae/ripemd160.html
+ *  http://ehash.iaik.tugraz.at/wiki/RIPEMD-160
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_RIPEMD160_C)
+
+#include "polarssl/ripemd160.h"
+
+#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_SELF_TEST)
+#include <string.h>
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/*
+ * 32-bit integer manipulation macros (little endian)
+ */
+#ifndef GET_UINT32_LE
+#define GET_UINT32_LE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ]       )             \
+        | ( (uint32_t) (b)[(i) + 1] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 2] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 3] << 24 );            \
+}
+#endif
+
+#ifndef PUT_UINT32_LE
+#define PUT_UINT32_LE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n)       );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
+}
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+void ripemd160_init( ripemd160_context *ctx )
+{
+    memset( ctx, 0, sizeof( ripemd160_context ) );
+}
+
+void ripemd160_free( ripemd160_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( ripemd160_context ) );
+}
+
+/*
+ * RIPEMD-160 context setup
+ */
+void ripemd160_starts( ripemd160_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
+}
+
+/*
+ * Process one block
+ */
+void ripemd160_process( ripemd160_context *ctx, const unsigned char data[64] )
+{
+    uint32_t A, B, C, D, E, Ap, Bp, Cp, Dp, Ep, X[16];
+
+    GET_UINT32_LE( X[ 0], data,  0 );
+    GET_UINT32_LE( X[ 1], data,  4 );
+    GET_UINT32_LE( X[ 2], data,  8 );
+    GET_UINT32_LE( X[ 3], data, 12 );
+    GET_UINT32_LE( X[ 4], data, 16 );
+    GET_UINT32_LE( X[ 5], data, 20 );
+    GET_UINT32_LE( X[ 6], data, 24 );
+    GET_UINT32_LE( X[ 7], data, 28 );
+    GET_UINT32_LE( X[ 8], data, 32 );
+    GET_UINT32_LE( X[ 9], data, 36 );
+    GET_UINT32_LE( X[10], data, 40 );
+    GET_UINT32_LE( X[11], data, 44 );
+    GET_UINT32_LE( X[12], data, 48 );
+    GET_UINT32_LE( X[13], data, 52 );
+    GET_UINT32_LE( X[14], data, 56 );
+    GET_UINT32_LE( X[15], data, 60 );
+
+    A = Ap = ctx->state[0];
+    B = Bp = ctx->state[1];
+    C = Cp = ctx->state[2];
+    D = Dp = ctx->state[3];
+    E = Ep = ctx->state[4];
+
+#define F1( x, y, z )   ( x ^ y ^ z )
+#define F2( x, y, z )   ( ( x & y ) | ( ~x & z ) )
+#define F3( x, y, z )   ( ( x | ~y ) ^ z )
+#define F4( x, y, z )   ( ( x & z ) | ( y & ~z ) )
+#define F5( x, y, z )   ( x ^ ( y | ~z ) )
+
+#define S( x, n ) ( ( x << n ) | ( x >> (32 - n) ) )
+
+#define P( a, b, c, d, e, r, s, f, k )      \
+    a += f( b, c, d ) + X[r] + k;           \
+    a = S( a, s ) + e;                      \
+    c = S( c, 10 );
+
+#define P2( a, b, c, d, e, r, s, rp, sp )   \
+    P( a, b, c, d, e, r, s, F, K );         \
+    P( a ## p, b ## p, c ## p, d ## p, e ## p, rp, sp, Fp, Kp );
+
+#define F   F1
+#define K   0x00000000
+#define Fp  F5
+#define Kp  0x50A28BE6
+    P2( A, B, C, D, E,  0, 11,  5,  8 );
+    P2( E, A, B, C, D,  1, 14, 14,  9 );
+    P2( D, E, A, B, C,  2, 15,  7,  9 );
+    P2( C, D, E, A, B,  3, 12,  0, 11 );
+    P2( B, C, D, E, A,  4,  5,  9, 13 );
+    P2( A, B, C, D, E,  5,  8,  2, 15 );
+    P2( E, A, B, C, D,  6,  7, 11, 15 );
+    P2( D, E, A, B, C,  7,  9,  4,  5 );
+    P2( C, D, E, A, B,  8, 11, 13,  7 );
+    P2( B, C, D, E, A,  9, 13,  6,  7 );
+    P2( A, B, C, D, E, 10, 14, 15,  8 );
+    P2( E, A, B, C, D, 11, 15,  8, 11 );
+    P2( D, E, A, B, C, 12,  6,  1, 14 );
+    P2( C, D, E, A, B, 13,  7, 10, 14 );
+    P2( B, C, D, E, A, 14,  9,  3, 12 );
+    P2( A, B, C, D, E, 15,  8, 12,  6 );
+#undef F
+#undef K
+#undef Fp
+#undef Kp
+
+#define F   F2
+#define K   0x5A827999
+#define Fp  F4
+#define Kp  0x5C4DD124
+    P2( E, A, B, C, D,  7,  7,  6,  9 );
+    P2( D, E, A, B, C,  4,  6, 11, 13 );
+    P2( C, D, E, A, B, 13,  8,  3, 15 );
+    P2( B, C, D, E, A,  1, 13,  7,  7 );
+    P2( A, B, C, D, E, 10, 11,  0, 12 );
+    P2( E, A, B, C, D,  6,  9, 13,  8 );
+    P2( D, E, A, B, C, 15,  7,  5,  9 );
+    P2( C, D, E, A, B,  3, 15, 10, 11 );
+    P2( B, C, D, E, A, 12,  7, 14,  7 );
+    P2( A, B, C, D, E,  0, 12, 15,  7 );
+    P2( E, A, B, C, D,  9, 15,  8, 12 );
+    P2( D, E, A, B, C,  5,  9, 12,  7 );
+    P2( C, D, E, A, B,  2, 11,  4,  6 );
+    P2( B, C, D, E, A, 14,  7,  9, 15 );
+    P2( A, B, C, D, E, 11, 13,  1, 13 );
+    P2( E, A, B, C, D,  8, 12,  2, 11 );
+#undef F
+#undef K
+#undef Fp
+#undef Kp
+
+#define F   F3
+#define K   0x6ED9EBA1
+#define Fp  F3
+#define Kp  0x6D703EF3
+    P2( D, E, A, B, C,  3, 11, 15,  9 );
+    P2( C, D, E, A, B, 10, 13,  5,  7 );
+    P2( B, C, D, E, A, 14,  6,  1, 15 );
+    P2( A, B, C, D, E,  4,  7,  3, 11 );
+    P2( E, A, B, C, D,  9, 14,  7,  8 );
+    P2( D, E, A, B, C, 15,  9, 14,  6 );
+    P2( C, D, E, A, B,  8, 13,  6,  6 );
+    P2( B, C, D, E, A,  1, 15,  9, 14 );
+    P2( A, B, C, D, E,  2, 14, 11, 12 );
+    P2( E, A, B, C, D,  7,  8,  8, 13 );
+    P2( D, E, A, B, C,  0, 13, 12,  5 );
+    P2( C, D, E, A, B,  6,  6,  2, 14 );
+    P2( B, C, D, E, A, 13,  5, 10, 13 );
+    P2( A, B, C, D, E, 11, 12,  0, 13 );
+    P2( E, A, B, C, D,  5,  7,  4,  7 );
+    P2( D, E, A, B, C, 12,  5, 13,  5 );
+#undef F
+#undef K
+#undef Fp
+#undef Kp
+
+#define F   F4
+#define K   0x8F1BBCDC
+#define Fp  F2
+#define Kp  0x7A6D76E9
+    P2( C, D, E, A, B,  1, 11,  8, 15 );
+    P2( B, C, D, E, A,  9, 12,  6,  5 );
+    P2( A, B, C, D, E, 11, 14,  4,  8 );
+    P2( E, A, B, C, D, 10, 15,  1, 11 );
+    P2( D, E, A, B, C,  0, 14,  3, 14 );
+    P2( C, D, E, A, B,  8, 15, 11, 14 );
+    P2( B, C, D, E, A, 12,  9, 15,  6 );
+    P2( A, B, C, D, E,  4,  8,  0, 14 );
+    P2( E, A, B, C, D, 13,  9,  5,  6 );
+    P2( D, E, A, B, C,  3, 14, 12,  9 );
+    P2( C, D, E, A, B,  7,  5,  2, 12 );
+    P2( B, C, D, E, A, 15,  6, 13,  9 );
+    P2( A, B, C, D, E, 14,  8,  9, 12 );
+    P2( E, A, B, C, D,  5,  6,  7,  5 );
+    P2( D, E, A, B, C,  6,  5, 10, 15 );
+    P2( C, D, E, A, B,  2, 12, 14,  8 );
+#undef F
+#undef K
+#undef Fp
+#undef Kp
+
+#define F   F5
+#define K   0xA953FD4E
+#define Fp  F1
+#define Kp  0x00000000
+    P2( B, C, D, E, A,  4,  9, 12,  8 );
+    P2( A, B, C, D, E,  0, 15, 15,  5 );
+    P2( E, A, B, C, D,  5,  5, 10, 12 );
+    P2( D, E, A, B, C,  9, 11,  4,  9 );
+    P2( C, D, E, A, B,  7,  6,  1, 12 );
+    P2( B, C, D, E, A, 12,  8,  5,  5 );
+    P2( A, B, C, D, E,  2, 13,  8, 14 );
+    P2( E, A, B, C, D, 10, 12,  7,  6 );
+    P2( D, E, A, B, C, 14,  5,  6,  8 );
+    P2( C, D, E, A, B,  1, 12,  2, 13 );
+    P2( B, C, D, E, A,  3, 13, 13,  6 );
+    P2( A, B, C, D, E,  8, 14, 14,  5 );
+    P2( E, A, B, C, D, 11, 11,  0, 15 );
+    P2( D, E, A, B, C,  6,  8,  3, 13 );
+    P2( C, D, E, A, B, 15,  5,  9, 11 );
+    P2( B, C, D, E, A, 13,  6, 11, 11 );
+#undef F
+#undef K
+#undef Fp
+#undef Kp
+
+    C             = ctx->state[1] + C + Dp;
+    ctx->state[1] = ctx->state[2] + D + Ep;
+    ctx->state[2] = ctx->state[3] + E + Ap;
+    ctx->state[3] = ctx->state[4] + A + Bp;
+    ctx->state[4] = ctx->state[0] + B + Cp;
+    ctx->state[0] = C;
+}
+
+/*
+ * RIPEMD-160 process buffer
+ */
+void ripemd160_update( ripemd160_context *ctx,
+                       const unsigned char *input, size_t ilen )
+{
+    size_t fill;
+    uint32_t left;
+
+    if( ilen == 0 )
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += (uint32_t) ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < (uint32_t) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, fill );
+        ripemd160_process( ctx, ctx->buffer );
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 64 )
+    {
+        ripemd160_process( ctx, input );
+        input += 64;
+        ilen  -= 64;
+    }
+
+    if( ilen > 0 )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, ilen );
+    }
+}
+
+static const unsigned char ripemd160_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * RIPEMD-160 final digest
+ */
+void ripemd160_finish( ripemd160_context *ctx, unsigned char output[20] )
+{
+    uint32_t last, padn;
+    uint32_t high, low;
+    unsigned char msglen[8];
+
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT32_LE( low,  msglen, 0 );
+    PUT_UINT32_LE( high, msglen, 4 );
+
+    last = ctx->total[0] & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    ripemd160_update( ctx, ripemd160_padding, padn );
+    ripemd160_update( ctx, msglen, 8 );
+
+    PUT_UINT32_LE( ctx->state[0], output,  0 );
+    PUT_UINT32_LE( ctx->state[1], output,  4 );
+    PUT_UINT32_LE( ctx->state[2], output,  8 );
+    PUT_UINT32_LE( ctx->state[3], output, 12 );
+    PUT_UINT32_LE( ctx->state[4], output, 16 );
+}
+
+/*
+ * output = RIPEMD-160( input buffer )
+ */
+void ripemd160( const unsigned char *input, size_t ilen,
+                unsigned char output[20] )
+{
+    ripemd160_context ctx;
+
+    ripemd160_init( &ctx );
+    ripemd160_starts( &ctx );
+    ripemd160_update( &ctx, input, ilen );
+    ripemd160_finish( &ctx, output );
+    ripemd160_free( &ctx );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * output = RIPEMD-160( file contents )
+ */
+int ripemd160_file( const char *path, unsigned char output[20] )
+{
+    FILE *f;
+    size_t n;
+    ripemd160_context ctx;
+    unsigned char buf[1024];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR );
+
+    ripemd160_init( &ctx );
+    ripemd160_starts( &ctx );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        ripemd160_update( &ctx, buf, n );
+
+    ripemd160_finish( &ctx, output );
+    ripemd160_free( &ctx );
+
+    if( ferror( f ) != 0 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+    return( 0 );
+}
+#endif /* POLARSSL_FS_IO */
+
+/*
+ * RIPEMD-160 HMAC context setup
+ */
+void ripemd160_hmac_starts( ripemd160_context *ctx,
+                            const unsigned char *key, size_t keylen )
+{
+    size_t i;
+    unsigned char sum[20];
+
+    if( keylen > 64 )
+    {
+        ripemd160( key, keylen, sum );
+        keylen = 20;
+        key = sum;
+    }
+
+    memset( ctx->ipad, 0x36, 64 );
+    memset( ctx->opad, 0x5C, 64 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
+        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
+    }
+
+    ripemd160_starts( ctx );
+    ripemd160_update( ctx, ctx->ipad, 64 );
+
+    polarssl_zeroize( sum, sizeof( sum ) );
+}
+
+/*
+ * RIPEMD-160 HMAC process buffer
+ */
+void ripemd160_hmac_update( ripemd160_context *ctx,
+                            const unsigned char *input, size_t ilen )
+{
+    ripemd160_update( ctx, input, ilen );
+}
+
+/*
+ * RIPEMD-160 HMAC final digest
+ */
+void ripemd160_hmac_finish( ripemd160_context *ctx, unsigned char output[20] )
+{
+    unsigned char tmpbuf[20];
+
+    ripemd160_finish( ctx, tmpbuf );
+    ripemd160_starts( ctx );
+    ripemd160_update( ctx, ctx->opad, 64 );
+    ripemd160_update( ctx, tmpbuf, 20 );
+    ripemd160_finish( ctx, output );
+
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
+}
+
+/*
+ * RIPEMD-160 HMAC context reset
+ */
+void ripemd160_hmac_reset( ripemd160_context *ctx )
+{
+    ripemd160_starts( ctx );
+    ripemd160_update( ctx, ctx->ipad, 64 );
+}
+
+/*
+ * output = HMAC-RIPEMD-160( hmac key, input buffer )
+ */
+void ripemd160_hmac( const unsigned char *key, size_t keylen,
+                     const unsigned char *input, size_t ilen,
+                     unsigned char output[20] )
+{
+    ripemd160_context ctx;
+
+    ripemd160_init( &ctx );
+    ripemd160_hmac_starts( &ctx, key, keylen );
+    ripemd160_hmac_update( &ctx, input, ilen );
+    ripemd160_hmac_finish( &ctx, output );
+    ripemd160_free( &ctx );
+}
+
+
+#if defined(POLARSSL_SELF_TEST)
+/*
+ * Test vectors from the RIPEMD-160 paper and
+ * http://homes.esat.kuleuven.be/~bosselae/ripemd160.html#HMAC
+ */
+#define TESTS   8
+#define KEYS    2
+static const char *ripemd160_test_input[TESTS] =
+{
+    "",
+    "a",
+    "abc",
+    "message digest",
+    "abcdefghijklmnopqrstuvwxyz",
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+    "1234567890123456789012345678901234567890"
+        "1234567890123456789012345678901234567890",
+};
+
+static const unsigned char ripemd160_test_md[TESTS][20] =
+{
+    { 0x9c, 0x11, 0x85, 0xa5, 0xc5, 0xe9, 0xfc, 0x54, 0x61, 0x28,
+      0x08, 0x97, 0x7e, 0xe8, 0xf5, 0x48, 0xb2, 0x25, 0x8d, 0x31 },
+    { 0x0b, 0xdc, 0x9d, 0x2d, 0x25, 0x6b, 0x3e, 0xe9, 0xda, 0xae,
+      0x34, 0x7b, 0xe6, 0xf4, 0xdc, 0x83, 0x5a, 0x46, 0x7f, 0xfe },
+    { 0x8e, 0xb2, 0x08, 0xf7, 0xe0, 0x5d, 0x98, 0x7a, 0x9b, 0x04,
+      0x4a, 0x8e, 0x98, 0xc6, 0xb0, 0x87, 0xf1, 0x5a, 0x0b, 0xfc },
+    { 0x5d, 0x06, 0x89, 0xef, 0x49, 0xd2, 0xfa, 0xe5, 0x72, 0xb8,
+      0x81, 0xb1, 0x23, 0xa8, 0x5f, 0xfa, 0x21, 0x59, 0x5f, 0x36 },
+    { 0xf7, 0x1c, 0x27, 0x10, 0x9c, 0x69, 0x2c, 0x1b, 0x56, 0xbb,
+      0xdc, 0xeb, 0x5b, 0x9d, 0x28, 0x65, 0xb3, 0x70, 0x8d, 0xbc },
+    { 0x12, 0xa0, 0x53, 0x38, 0x4a, 0x9c, 0x0c, 0x88, 0xe4, 0x05,
+      0xa0, 0x6c, 0x27, 0xdc, 0xf4, 0x9a, 0xda, 0x62, 0xeb, 0x2b },
+    { 0xb0, 0xe2, 0x0b, 0x6e, 0x31, 0x16, 0x64, 0x02, 0x86, 0xed,
+      0x3a, 0x87, 0xa5, 0x71, 0x30, 0x79, 0xb2, 0x1f, 0x51, 0x89 },
+    { 0x9b, 0x75, 0x2e, 0x45, 0x57, 0x3d, 0x4b, 0x39, 0xf4, 0xdb,
+      0xd3, 0x32, 0x3c, 0xab, 0x82, 0xbf, 0x63, 0x32, 0x6b, 0xfb },
+};
+
+static const unsigned char ripemd160_test_hmac[KEYS][TESTS][20] =
+{
+  {
+    { 0xcf, 0x38, 0x76, 0x77, 0xbf, 0xda, 0x84, 0x83, 0xe6, 0x3b,
+      0x57, 0xe0, 0x6c, 0x3b, 0x5e, 0xcd, 0x8b, 0x7f, 0xc0, 0x55 },
+    { 0x0d, 0x35, 0x1d, 0x71, 0xb7, 0x8e, 0x36, 0xdb, 0xb7, 0x39,
+      0x1c, 0x81, 0x0a, 0x0d, 0x2b, 0x62, 0x40, 0xdd, 0xba, 0xfc },
+    { 0xf7, 0xef, 0x28, 0x8c, 0xb1, 0xbb, 0xcc, 0x61, 0x60, 0xd7,
+      0x65, 0x07, 0xe0, 0xa3, 0xbb, 0xf7, 0x12, 0xfb, 0x67, 0xd6 },
+    { 0xf8, 0x36, 0x62, 0xcc, 0x8d, 0x33, 0x9c, 0x22, 0x7e, 0x60,
+      0x0f, 0xcd, 0x63, 0x6c, 0x57, 0xd2, 0x57, 0x1b, 0x1c, 0x34 },
+    { 0x84, 0x3d, 0x1c, 0x4e, 0xb8, 0x80, 0xac, 0x8a, 0xc0, 0xc9,
+      0xc9, 0x56, 0x96, 0x50, 0x79, 0x57, 0xd0, 0x15, 0x5d, 0xdb },
+    { 0x60, 0xf5, 0xef, 0x19, 0x8a, 0x2d, 0xd5, 0x74, 0x55, 0x45,
+      0xc1, 0xf0, 0xc4, 0x7a, 0xa3, 0xfb, 0x57, 0x76, 0xf8, 0x81 },
+    { 0xe4, 0x9c, 0x13, 0x6a, 0x9e, 0x56, 0x27, 0xe0, 0x68, 0x1b,
+      0x80, 0x8a, 0x3b, 0x97, 0xe6, 0xa6, 0xe6, 0x61, 0xae, 0x79 },
+    { 0x31, 0xbe, 0x3c, 0xc9, 0x8c, 0xee, 0x37, 0xb7, 0x9b, 0x06,
+      0x19, 0xe3, 0xe1, 0xc2, 0xbe, 0x4f, 0x1a, 0xa5, 0x6e, 0x6c },
+  },
+  {
+    { 0xfe, 0x69, 0xa6, 0x6c, 0x74, 0x23, 0xee, 0xa9, 0xc8, 0xfa,
+      0x2e, 0xff, 0x8d, 0x9d, 0xaf, 0xb4, 0xf1, 0x7a, 0x62, 0xf5 },
+    { 0x85, 0x74, 0x3e, 0x89, 0x9b, 0xc8, 0x2d, 0xbf, 0xa3, 0x6f,
+      0xaa, 0xa7, 0xa2, 0x5b, 0x7c, 0xfd, 0x37, 0x24, 0x32, 0xcd },
+    { 0x6e, 0x4a, 0xfd, 0x50, 0x1f, 0xa6, 0xb4, 0xa1, 0x82, 0x3c,
+      0xa3, 0xb1, 0x0b, 0xd9, 0xaa, 0x0b, 0xa9, 0x7b, 0xa1, 0x82 },
+    { 0x2e, 0x06, 0x6e, 0x62, 0x4b, 0xad, 0xb7, 0x6a, 0x18, 0x4c,
+      0x8f, 0x90, 0xfb, 0xa0, 0x53, 0x33, 0x0e, 0x65, 0x0e, 0x92 },
+    { 0x07, 0xe9, 0x42, 0xaa, 0x4e, 0x3c, 0xd7, 0xc0, 0x4d, 0xed,
+      0xc1, 0xd4, 0x6e, 0x2e, 0x8c, 0xc4, 0xc7, 0x41, 0xb3, 0xd9 },
+    { 0xb6, 0x58, 0x23, 0x18, 0xdd, 0xcf, 0xb6, 0x7a, 0x53, 0xa6,
+      0x7d, 0x67, 0x6b, 0x8a, 0xd8, 0x69, 0xad, 0xed, 0x62, 0x9a },
+    { 0xf1, 0xbe, 0x3e, 0xe8, 0x77, 0x70, 0x31, 0x40, 0xd3, 0x4f,
+      0x97, 0xea, 0x1a, 0xb3, 0xa0, 0x7c, 0x14, 0x13, 0x33, 0xe2 },
+    { 0x85, 0xf1, 0x64, 0x70, 0x3e, 0x61, 0xa6, 0x31, 0x31, 0xbe,
+      0x7e, 0x45, 0x95, 0x8e, 0x07, 0x94, 0x12, 0x39, 0x04, 0xf9 },
+  },
+};
+
+static const unsigned char ripemd160_test_key[KEYS][20] =
+{
+    { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
+      0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x01, 0x23, 0x45, 0x67 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc,
+      0xba, 0x98, 0x76, 0x54, 0x32, 0x10, 0x00, 0x11, 0x22, 0x33 },
+};
+
+/*
+ * Checkup routine
+ */
+int ripemd160_self_test( int verbose )
+{
+    int i, j;
+    unsigned char output[20];
+
+    memset( output, 0, sizeof output );
+
+    for( i = 0; i < TESTS; i++ )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "  RIPEMD-160 test #%d: ", i + 1 );
+
+        ripemd160( (const unsigned char *) ripemd160_test_input[i],
+                   strlen( ripemd160_test_input[i] ),
+                   output );
+
+        if( memcmp( output, ripemd160_test_md[i], 20 ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+
+        for( j = 0; j < KEYS; j++ )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "  HMAC-RIPEMD-160 test #%d, key #%d: ",
+                                 i + 1, j + 1 );
+
+            ripemd160_hmac( ripemd160_test_key[j], 20,
+                            (const unsigned char *) ripemd160_test_input[i],
+                            strlen( ripemd160_test_input[i] ),
+                            output );
+
+            if( memcmp( output, ripemd160_test_hmac[j][i], 20 ) != 0 )
+            {
+                if( verbose != 0 )
+                    polarssl_printf( "failed\n" );
+
+                return( 1 );
+            }
+
+            if( verbose != 0 )
+                polarssl_printf( "passed\n" );
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "\n" );
+    }
+
+    return( 0 );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_RIPEMD160_C */
diff --git a/Externals/polarssl/library/rsa.c b/Externals/polarssl/library/rsa.c
index e53d9a2eec..0fd5199b2a 100644
--- a/Externals/polarssl/library/rsa.c
+++ b/Externals/polarssl/library/rsa.c
@@ -1,7 +1,7 @@
 /*
  *  The RSA public-key cryptosystem
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,11 +29,16 @@
  *  http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_RSA_C)
 
 #include "polarssl/rsa.h"
+#include "polarssl/oid.h"
 
 #if defined(POLARSSL_PKCS1_V21)
 #include "polarssl/md.h"
@@ -42,6 +47,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 /*
  * Initialize an RSA context
  */
@@ -51,6 +62,18 @@ void rsa_init( rsa_context *ctx,
 {
     memset( ctx, 0, sizeof( rsa_context ) );
 
+    rsa_set_padding( ctx, padding, hash_id );
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_init( &ctx->mutex );
+#endif
+}
+
+/*
+ * Set padding for an existing RSA context
+ */
+void rsa_set_padding( rsa_context *ctx, int padding, int hash_id )
+{
     ctx->padding = padding;
     ctx->hash_id = hash_id;
 }
@@ -81,7 +104,7 @@ int rsa_gen_key( rsa_context *ctx,
 
     do
     {
-        MPI_CHK( mpi_gen_prime( &ctx->P, ( nbits + 1 ) >> 1, 0, 
+        MPI_CHK( mpi_gen_prime( &ctx->P, ( nbits + 1 ) >> 1, 0,
                                 f_rng, p_rng ) );
 
         MPI_CHK( mpi_gen_prime( &ctx->Q, ( nbits + 1 ) >> 1, 0,
@@ -127,10 +150,10 @@ cleanup:
         return( POLARSSL_ERR_RSA_KEY_GEN_FAILED + ret );
     }
 
-    return( 0 );   
+    return( 0 );
 }
 
-#endif
+#endif /* POLARSSL_GENPRIME */
 
 /*
  * Check a public RSA key
@@ -140,7 +163,7 @@ int rsa_check_pubkey( const rsa_context *ctx )
     if( !ctx->N.p || !ctx->E.p )
         return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
 
-    if( ( ctx->N.p[0] & 1 ) == 0 || 
+    if( ( ctx->N.p[0] & 1 ) == 0 ||
         ( ctx->E.p[0] & 1 ) == 0 )
         return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
 
@@ -149,7 +172,7 @@ int rsa_check_pubkey( const rsa_context *ctx )
         return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
 
     if( mpi_msb( &ctx->E ) < 2 ||
-        mpi_msb( &ctx->E ) > 64 )
+        mpi_cmp_mpi( &ctx->E, &ctx->N ) >= 0 )
         return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
 
     return( 0 );
@@ -182,7 +205,7 @@ int rsa_check_privkey( const rsa_context *ctx )
     MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
 
     MPI_CHK( mpi_gcd( &G2, &P1, &Q1 ) );
-    MPI_CHK( mpi_div_mpi( &L1, &L2, &H, &G2 ) );  
+    MPI_CHK( mpi_div_mpi( &L1, &L2, &H, &G2 ) );
     MPI_CHK( mpi_mod_mpi( &I, &DE, &L1  ) );
 
     MPI_CHK( mpi_mod_mpi( &DP, &ctx->D, &P1 ) );
@@ -201,7 +224,7 @@ int rsa_check_privkey( const rsa_context *ctx )
     {
         ret = POLARSSL_ERR_RSA_KEY_CHECK_FAILED;
     }
-    
+
 cleanup:
     mpi_free( &PQ ); mpi_free( &DE ); mpi_free( &P1 ); mpi_free( &Q1 );
     mpi_free( &H  ); mpi_free( &I  ); mpi_free( &G  ); mpi_free( &G2 );
@@ -252,21 +275,97 @@ cleanup:
     return( 0 );
 }
 
+#if !defined(POLARSSL_RSA_NO_CRT)
+/*
+ * Generate or update blinding values, see section 10 of:
+ *  KOCHER, Paul C. Timing attacks on implementations of Diffie-Hellman, RSA,
+ *  DSS, and other systems. In : Advances in Cryptology—CRYPTO’96. Springer
+ *  Berlin Heidelberg, 1996. p. 104-113.
+ */
+static int rsa_prepare_blinding( rsa_context *ctx, mpi *Vi, mpi *Vf,
+                 int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
+{
+    int ret, count = 0;
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_lock( &ctx->mutex );
+#endif
+
+    if( ctx->Vf.p != NULL )
+    {
+        /* We already have blinding values, just update them by squaring */
+        MPI_CHK( mpi_mul_mpi( &ctx->Vi, &ctx->Vi, &ctx->Vi ) );
+        MPI_CHK( mpi_mod_mpi( &ctx->Vi, &ctx->Vi, &ctx->N ) );
+        MPI_CHK( mpi_mul_mpi( &ctx->Vf, &ctx->Vf, &ctx->Vf ) );
+        MPI_CHK( mpi_mod_mpi( &ctx->Vf, &ctx->Vf, &ctx->N ) );
+
+        goto done;
+    }
+
+    /* Unblinding value: Vf = random number, invertible mod N */
+    do {
+        if( count++ > 10 )
+            return( POLARSSL_ERR_RSA_RNG_FAILED );
+
+        MPI_CHK( mpi_fill_random( &ctx->Vf, ctx->len - 1, f_rng, p_rng ) );
+        MPI_CHK( mpi_gcd( &ctx->Vi, &ctx->Vf, &ctx->N ) );
+    } while( mpi_cmp_int( &ctx->Vi, 1 ) != 0 );
+
+    /* Blinding value: Vi =  Vf^(-e) mod N */
+    MPI_CHK( mpi_inv_mod( &ctx->Vi, &ctx->Vf, &ctx->N ) );
+    MPI_CHK( mpi_exp_mod( &ctx->Vi, &ctx->Vi, &ctx->E, &ctx->N, &ctx->RN ) );
+
+done:
+    if( Vi != &ctx->Vi )
+    {
+        MPI_CHK( mpi_copy( Vi, &ctx->Vi ) );
+        MPI_CHK( mpi_copy( Vf, &ctx->Vf ) );
+    }
+
+cleanup:
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_unlock( &ctx->mutex );
+#endif
+
+    return( ret );
+}
+#endif /* !POLARSSL_RSA_NO_CRT */
+
 /*
  * Do an RSA private key operation
  */
 int rsa_private( rsa_context *ctx,
+                 int (*f_rng)(void *, unsigned char *, size_t),
+                 void *p_rng,
                  const unsigned char *input,
                  unsigned char *output )
 {
     int ret;
     size_t olen;
     mpi T, T1, T2;
+#if !defined(POLARSSL_RSA_NO_CRT)
+    mpi *Vi, *Vf;
+
+    /*
+     * When using the Chinese Remainder Theorem, we use blinding values.
+     * Without threading, we just read them directly from the context,
+     * otherwise we make a local copy in order to reduce locking contention.
+     */
+#if defined(POLARSSL_THREADING_C)
+    mpi Vi_copy, Vf_copy;
+
+    mpi_init( &Vi_copy ); mpi_init( &Vf_copy );
+    Vi = &Vi_copy;
+    Vf = &Vf_copy;
+#else
+    Vi = &ctx->Vi;
+    Vf = &ctx->Vf;
+#endif
+#endif /* !POLARSSL_RSA_NO_CRT */
 
     mpi_init( &T ); mpi_init( &T1 ); mpi_init( &T2 );
 
     MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
-
     if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
     {
         mpi_free( &T );
@@ -274,8 +373,21 @@ int rsa_private( rsa_context *ctx,
     }
 
 #if defined(POLARSSL_RSA_NO_CRT)
+    ((void) f_rng);
+    ((void) p_rng);
     MPI_CHK( mpi_exp_mod( &T, &T, &ctx->D, &ctx->N, &ctx->RN ) );
 #else
+    if( f_rng != NULL )
+    {
+        /*
+         * Blinding
+         * T = T * Vi mod N
+         */
+        MPI_CHK( rsa_prepare_blinding( ctx, Vi, Vf, f_rng, p_rng ) );
+        MPI_CHK( mpi_mul_mpi( &T, &T, Vi ) );
+        MPI_CHK( mpi_mod_mpi( &T, &T, &ctx->N ) );
+    }
+
     /*
      * faster decryption using the CRT
      *
@@ -293,18 +405,30 @@ int rsa_private( rsa_context *ctx,
     MPI_CHK( mpi_mod_mpi( &T, &T1, &ctx->P ) );
 
     /*
-     * output = T2 + T * Q
+     * T = T2 + T * Q
      */
     MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->Q ) );
     MPI_CHK( mpi_add_mpi( &T, &T2, &T1 ) );
-#endif
+
+    if( f_rng != NULL )
+    {
+        /*
+         * Unblind
+         * T = T * Vf mod N
+         */
+        MPI_CHK( mpi_mul_mpi( &T, &T, Vf ) );
+        MPI_CHK( mpi_mod_mpi( &T, &T, &ctx->N ) );
+    }
+#endif /* POLARSSL_RSA_NO_CRT */
 
     olen = ctx->len;
     MPI_CHK( mpi_write_binary( &T, output, olen ) );
 
 cleanup:
-
     mpi_free( &T ); mpi_free( &T1 ); mpi_free( &T2 );
+#if !defined(POLARSSL_RSA_NO_CRT) && defined(POLARSSL_THREADING_C)
+    mpi_free( &Vi_copy ); mpi_free( &Vf_copy );
+#endif
 
     if( ret != 0 )
         return( POLARSSL_ERR_RSA_PRIVATE_FAILED + ret );
@@ -322,8 +446,8 @@ cleanup:
  * \param slen      length of the source buffer
  * \param md_ctx    message digest context to use
  */
-static void mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src, size_t slen,  
-                       md_context_t *md_ctx )
+static void mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src,
+                      size_t slen, md_context_t *md_ctx )
 {
     unsigned char mask[POLARSSL_MD_MAX_SIZE];
     unsigned char counter[4];
@@ -359,7 +483,7 @@ static void mgf_mask( unsigned char *dst, size_t dlen, unsigned char *src, size_
         dlen -= use_len;
     }
 }
-#endif
+#endif /* POLARSSL_PKCS1_V21 */
 
 #if defined(POLARSSL_PKCS1_V21)
 /*
@@ -381,18 +505,20 @@ int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
     const md_info_t *md_info;
     md_context_t md_ctx;
 
-    if( ctx->padding != RSA_PKCS_V21 || f_rng == NULL )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V21 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    if( f_rng == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     md_info = md_info_from_type( ctx->hash_id );
-
     if( md_info == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     olen = ctx->len;
     hlen = md_get_size( md_info );
 
-    if( olen < ilen + 2 * hlen + 2 || f_rng == NULL )
+    if( olen < ilen + 2 * hlen + 2 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     memset( output, 0, olen );
@@ -414,6 +540,7 @@ int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
     *p++ = 1;
     memcpy( p, input, ilen );
 
+    md_init( &md_ctx );
     md_init_ctx( &md_ctx, md_info );
 
     // maskedDB: Apply dbMask to DB
@@ -426,14 +553,15 @@ int rsa_rsaes_oaep_encrypt( rsa_context *ctx,
     mgf_mask( output + 1, hlen, output + hlen + 1, olen - hlen - 1,
                &md_ctx );
 
-    md_free_ctx( &md_ctx );
+    md_free( &md_ctx );
 
     return( ( mode == RSA_PUBLIC )
             ? rsa_public(  ctx, output, output )
-            : rsa_private( ctx, output, output ) );
+            : rsa_private( ctx, f_rng, p_rng, output, output ) );
 }
 #endif /* POLARSSL_PKCS1_V21 */
 
+#if defined(POLARSSL_PKCS1_V15)
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-ENCRYPT function
  */
@@ -448,7 +576,10 @@ int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
     int ret;
     unsigned char *p = output;
 
-    if( ctx->padding != RSA_PKCS_V15 || f_rng == NULL )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V15 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    if( f_rng == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     olen = ctx->len;
@@ -473,8 +604,8 @@ int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
 
             // Check if RNG failed to generate data
             //
-            if( rng_dl == 0 || ret != 0)
-                return POLARSSL_ERR_RSA_RNG_FAILED + ret;
+            if( rng_dl == 0 || ret != 0 )
+                return( POLARSSL_ERR_RSA_RNG_FAILED + ret );
 
             p++;
         }
@@ -492,8 +623,9 @@ int rsa_rsaes_pkcs1_v15_encrypt( rsa_context *ctx,
 
     return( ( mode == RSA_PUBLIC )
             ? rsa_public(  ctx, output, output )
-            : rsa_private( ctx, output, output ) );
+            : rsa_private( ctx, f_rng, p_rng, output, output ) );
 }
+#endif /* POLARSSL_PKCS1_V15 */
 
 /*
  * Add the message padding, then do an RSA operation
@@ -507,9 +639,11 @@ int rsa_pkcs1_encrypt( rsa_context *ctx,
 {
     switch( ctx->padding )
     {
+#if defined(POLARSSL_PKCS1_V15)
         case RSA_PKCS_V15:
             return rsa_rsaes_pkcs1_v15_encrypt( ctx, f_rng, p_rng, mode, ilen,
                                                 input, output );
+#endif
 
 #if defined(POLARSSL_PKCS1_V21)
         case RSA_PKCS_V21:
@@ -527,7 +661,9 @@ int rsa_pkcs1_encrypt( rsa_context *ctx,
  * Implementation of the PKCS#1 v2.1 RSAES-OAEP-DECRYPT function
  */
 int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
-                            int mode, 
+                            int (*f_rng)(void *, unsigned char *, size_t),
+                            void *p_rng,
+                            int mode,
                             const unsigned char *label, size_t label_len,
                             size_t *olen,
                             const unsigned char *input,
@@ -535,15 +671,18 @@ int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
                             size_t output_max_len )
 {
     int ret;
-    size_t ilen;
-    unsigned char *p;
+    size_t ilen, i, pad_len;
+    unsigned char *p, bad, pad_done;
     unsigned char buf[POLARSSL_MPI_MAX_SIZE];
     unsigned char lhash[POLARSSL_MD_MAX_SIZE];
     unsigned int hlen;
     const md_info_t *md_info;
     md_context_t md_ctx;
 
-    if( ctx->padding != RSA_PKCS_V21 )
+    /*
+     * Parameters sanity checks
+     */
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V21 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     ilen = ctx->len;
@@ -551,60 +690,78 @@ int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
     if( ilen < 16 || ilen > sizeof( buf ) )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
-    ret = ( mode == RSA_PUBLIC )
-          ? rsa_public(  ctx, input, buf )
-          : rsa_private( ctx, input, buf );
-
-    if( ret != 0 )
-        return( ret );
-
-    p = buf;
-
-    if( *p++ != 0 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
     md_info = md_info_from_type( ctx->hash_id );
     if( md_info == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
+    /*
+     * RSA operation
+     */
+    ret = ( mode == RSA_PUBLIC )
+          ? rsa_public(  ctx, input, buf )
+          : rsa_private( ctx, f_rng, p_rng, input, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    /*
+     * Unmask data and generate lHash
+     */
     hlen = md_get_size( md_info );
 
+    md_init( &md_ctx );
     md_init_ctx( &md_ctx, md_info );
 
-    // Generate lHash
-    //
+    /* Generate lHash */
     md( md_info, label, label_len, lhash );
 
-    // seed: Apply seedMask to maskedSeed
-    //
+    /* seed: Apply seedMask to maskedSeed */
     mgf_mask( buf + 1, hlen, buf + hlen + 1, ilen - hlen - 1,
                &md_ctx );
 
-    // DB: Apply dbMask to maskedDB
-    //
+    /* DB: Apply dbMask to maskedDB */
     mgf_mask( buf + hlen + 1, ilen - hlen - 1, buf + 1, hlen,
                &md_ctx );
 
-    p += hlen;
-    md_free_ctx( &md_ctx );
+    md_free( &md_ctx );
 
-    // Check validity
-    //
-    if( memcmp( lhash, p, hlen ) != 0 )
+    /*
+     * Check contents, in "constant-time"
+     */
+    p = buf;
+    bad = 0;
+
+    bad |= *p++; /* First byte must be 0 */
+
+    p += hlen; /* Skip seed */
+
+    /* Check lHash */
+    for( i = 0; i < hlen; i++ )
+        bad |= lhash[i] ^ *p++;
+
+    /* Get zero-padding len, but always read till end of buffer
+     * (minus one, for the 01 byte) */
+    pad_len = 0;
+    pad_done = 0;
+    for( i = 0; i < ilen - 2 * hlen - 2; i++ )
+    {
+        pad_done |= p[i];
+        pad_len += ( pad_done == 0 );
+    }
+
+    p += pad_len;
+    bad |= *p++ ^ 0x01;
+
+    /*
+     * The only information "leaked" is whether the padding was correct or not
+     * (eg, no data is copied if it was not correct). This meets the
+     * recommendations in PKCS#1 v2.2: an opponent cannot distinguish between
+     * the different error conditions.
+     */
+    if( bad != 0 )
         return( POLARSSL_ERR_RSA_INVALID_PADDING );
 
-    p += hlen;
-
-    while( *p == 0 && p < buf + ilen )
-        p++;
-
-    if( p == buf + ilen )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    if( *p++ != 0x01 )
-        return( POLARSSL_ERR_RSA_INVALID_PADDING );
-
-    if (ilen - (p - buf) > output_max_len)
+    if( ilen - ( p - buf ) > output_max_len )
         return( POLARSSL_ERR_RSA_OUTPUT_TOO_LARGE );
 
     *olen = ilen - (p - buf);
@@ -614,22 +771,24 @@ int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
 }
 #endif /* POLARSSL_PKCS1_V21 */
 
+#if defined(POLARSSL_PKCS1_V15)
 /*
  * Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-DECRYPT function
  */
 int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
                                  int mode, size_t *olen,
                                  const unsigned char *input,
                                  unsigned char *output,
                                  size_t output_max_len)
 {
-    int ret, correct = 1;
-    size_t ilen, pad_count = 0;
-    unsigned char *p, *q;
-    unsigned char bt;
+    int ret;
+    size_t ilen, pad_count = 0, i;
+    unsigned char *p, bad, pad_done = 0;
     unsigned char buf[POLARSSL_MPI_MAX_SIZE];
 
-    if( ctx->padding != RSA_PKCS_V15 )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V15 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     ilen = ctx->len;
@@ -639,66 +798,55 @@ int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
 
     ret = ( mode == RSA_PUBLIC )
           ? rsa_public(  ctx, input, buf )
-          : rsa_private( ctx, input, buf );
+          : rsa_private( ctx, f_rng, p_rng, input, buf );
 
     if( ret != 0 )
         return( ret );
 
     p = buf;
+    bad = 0;
 
-    if( *p++ != 0 )
-        correct = 0;
+    /*
+     * Check and get padding len in "constant-time"
+     */
+    bad |= *p++; /* First byte must be 0 */
 
-    bt = *p++;
-    if( ( bt != RSA_CRYPT && mode == RSA_PRIVATE ) ||
-        ( bt != RSA_SIGN && mode == RSA_PUBLIC ) )
+    /* This test does not depend on secret data */
+    if( mode == RSA_PRIVATE )
     {
-        correct = 0;
-    }
+        bad |= *p++ ^ RSA_CRYPT;
 
-    if( bt == RSA_CRYPT )
-    {
-        while( *p != 0 && p < buf + ilen - 1 )
-            pad_count += ( *p++ != 0 );
+        /* Get padding len, but always read till end of buffer
+         * (minus one, for the 00 byte) */
+        for( i = 0; i < ilen - 3; i++ )
+        {
+            pad_done |= ( p[i] == 0 );
+            pad_count += ( pad_done == 0 );
+        }
 
-        correct &= ( *p == 0 && p < buf + ilen - 1 );
-
-        q = p;
-
-        // Also pass over all other bytes to reduce timing differences
-        //
-        while ( q < buf + ilen - 1 )
-            pad_count += ( *q++ != 0 );
-
-        // Prevent compiler optimization of pad_count
-        //
-        correct |= pad_count & 0x100000; /* Always 0 unless 1M bit keys */
-        p++;
+        p += pad_count;
+        bad |= *p++; /* Must be zero */
     }
     else
     {
-        while( *p == 0xFF && p < buf + ilen - 1 )
-            pad_count += ( *p++ == 0xFF );
+        bad |= *p++ ^ RSA_SIGN;
 
-        correct &= ( *p == 0 && p < buf + ilen - 1 );
+        /* Get padding len, but always read till end of buffer
+         * (minus one, for the 00 byte) */
+        for( i = 0; i < ilen - 3; i++ )
+        {
+            pad_done |= ( p[i] != 0xFF );
+            pad_count += ( pad_done == 0 );
+        }
 
-        q = p;
-
-        // Also pass over all other bytes to reduce timing differences
-        //
-        while ( q < buf + ilen - 1 )
-            pad_count += ( *q++ != 0 );
-
-        // Prevent compiler optimization of pad_count
-        //
-        correct |= pad_count & 0x100000; /* Always 0 unless 1M bit keys */
-        p++;
+        p += pad_count;
+        bad |= *p++; /* Must be zero */
     }
 
-    if( correct == 0 )
+    if( bad )
         return( POLARSSL_ERR_RSA_INVALID_PADDING );
 
-    if (ilen - (p - buf) > output_max_len)
+    if( ilen - ( p - buf ) > output_max_len )
         return( POLARSSL_ERR_RSA_OUTPUT_TOO_LARGE );
 
     *olen = ilen - (p - buf);
@@ -706,11 +854,14 @@ int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_PKCS1_V15 */
 
 /*
  * Do an RSA operation, then remove the message padding
  */
 int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng,
                        int mode, size_t *olen,
                        const unsigned char *input,
                        unsigned char *output,
@@ -718,14 +869,17 @@ int rsa_pkcs1_decrypt( rsa_context *ctx,
 {
     switch( ctx->padding )
     {
+#if defined(POLARSSL_PKCS1_V15)
         case RSA_PKCS_V15:
-            return rsa_rsaes_pkcs1_v15_decrypt( ctx, mode, olen, input, output,
-                                                output_max_len );
+            return rsa_rsaes_pkcs1_v15_decrypt( ctx, f_rng, p_rng, mode, olen,
+                                                input, output, output_max_len );
+#endif
 
 #if defined(POLARSSL_PKCS1_V21)
         case RSA_PKCS_V21:
-            return rsa_rsaes_oaep_decrypt( ctx, mode, NULL, 0, olen, input,
-                                           output, output_max_len );
+            return rsa_rsaes_oaep_decrypt( ctx, f_rng, p_rng, mode, NULL, 0,
+                                           olen, input, output,
+                                           output_max_len );
 #endif
 
         default:
@@ -741,7 +895,7 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
                          int (*f_rng)(void *, unsigned char *, size_t),
                          void *p_rng,
                          int mode,
-                         int hash_id,
+                         md_type_t md_alg,
                          unsigned int hashlen,
                          const unsigned char *hash,
                          unsigned char *sig )
@@ -755,41 +909,23 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
     const md_info_t *md_info;
     md_context_t md_ctx;
 
-    if( ctx->padding != RSA_PKCS_V21 || f_rng == NULL )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V21 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    if( f_rng == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     olen = ctx->len;
 
-    switch( hash_id )
+    if( md_alg != POLARSSL_MD_NONE )
     {
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            hashlen = 16;
-            break;
-
-        case SIG_RSA_SHA1:
-            hashlen = 20;
-            break;
-
-        case SIG_RSA_SHA224:
-            hashlen = 28;
-            break;
-
-        case SIG_RSA_SHA256:
-            hashlen = 32;
-            break;
-
-        case SIG_RSA_SHA384:
-            hashlen = 48;
-            break;
-
-        case SIG_RSA_SHA512:
-            hashlen = 64;
-            break;
-
-        default:
+        // Gather length of hash to sign
+        //
+        md_info = md_info_from_type( md_alg );
+        if( md_info == NULL )
             return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = md_get_size( md_info );
     }
 
     md_info = md_info_from_type( ctx->hash_id );
@@ -804,8 +940,6 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
 
     memset( sig, 0, olen );
 
-    msb = mpi_msb( &ctx->N ) - 1;
-
     // Generate salt of length slen
     //
     if( ( ret = f_rng( p_rng, salt, slen ) ) != 0 )
@@ -819,6 +953,7 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
     memcpy( p, salt, slen );
     p += slen;
 
+    md_init( &md_ctx );
     md_init_ctx( &md_ctx, md_info );
 
     // Generate H = Hash( M' )
@@ -838,7 +973,7 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
     //
     mgf_mask( sig + offset, olen - hlen - 1 - offset, p, hlen, &md_ctx );
 
-    md_free_ctx( &md_ctx );
+    md_free( &md_ctx );
 
     msb = mpi_msb( &ctx->N ) - 1;
     sig[0] &= 0xFF >> ( olen * 8 - msb );
@@ -848,10 +983,11 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
 
     return( ( mode == RSA_PUBLIC )
             ? rsa_public(  ctx, sig, sig )
-            : rsa_private( ctx, sig, sig ) );
+            : rsa_private( ctx, f_rng, p_rng, sig, sig ) );
 }
 #endif /* POLARSSL_PKCS1_V21 */
 
+#if defined(POLARSSL_PKCS1_V15)
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-V1_5-SIGN function
  */
@@ -859,57 +995,40 @@ int rsa_rsassa_pss_sign( rsa_context *ctx,
  * Do an RSA operation to sign the message digest
  */
 int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
                                int mode,
-                               int hash_id,
+                               md_type_t md_alg,
                                unsigned int hashlen,
                                const unsigned char *hash,
                                unsigned char *sig )
 {
-    size_t nb_pad, olen;
+    size_t nb_pad, olen, oid_size = 0;
     unsigned char *p = sig;
+    const char *oid;
 
-    if( ctx->padding != RSA_PKCS_V15 )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V15 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     olen = ctx->len;
+    nb_pad = olen - 3;
 
-    switch( hash_id )
+    if( md_alg != POLARSSL_MD_NONE )
     {
-        case SIG_RSA_RAW:
-            nb_pad = olen - 3 - hashlen;
-            break;
-
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            nb_pad = olen - 3 - 34;
-            break;
-
-        case SIG_RSA_SHA1:
-            nb_pad = olen - 3 - 35;
-            break;
-
-        case SIG_RSA_SHA224:
-            nb_pad = olen - 3 - 47;
-            break;
-
-        case SIG_RSA_SHA256:
-            nb_pad = olen - 3 - 51;
-            break;
-
-        case SIG_RSA_SHA384:
-            nb_pad = olen - 3 - 67;
-            break;
-
-        case SIG_RSA_SHA512:
-            nb_pad = olen - 3 - 83;
-            break;
-
-
-        default:
+        const md_info_t *md_info = md_info_from_type( md_alg );
+        if( md_info == NULL )
             return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        if( oid_get_oid_by_md( md_alg, &oid, &oid_size ) != 0 )
+            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        nb_pad -= 10 + oid_size;
+
+        hashlen = md_get_size( md_info );
     }
 
+    nb_pad -= hashlen;
+
     if( ( nb_pad < 8 ) || ( nb_pad > olen ) )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
@@ -919,60 +1038,41 @@ int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
     p += nb_pad;
     *p++ = 0;
 
-    switch( hash_id )
+    if( md_alg == POLARSSL_MD_NONE )
     {
-        case SIG_RSA_RAW:
-            memcpy( p, hash, hashlen );
-            break;
-
-        case SIG_RSA_MD2:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 2; break;
-
-        case SIG_RSA_MD4:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 4; break;
-
-        case SIG_RSA_MD5:
-            memcpy( p, ASN1_HASH_MDX, 18 );
-            memcpy( p + 18, hash, 16 );
-            p[13] = 5; break;
-
-        case SIG_RSA_SHA1:
-            memcpy( p, ASN1_HASH_SHA1, 15 );
-            memcpy( p + 15, hash, 20 );
-            break;
-
-        case SIG_RSA_SHA224:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 28 );
-            p[1] += 28; p[14] = 4; p[18] += 28; break;
-
-        case SIG_RSA_SHA256:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 32 );
-            p[1] += 32; p[14] = 1; p[18] += 32; break;
-
-        case SIG_RSA_SHA384:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 48 );
-            p[1] += 48; p[14] = 2; p[18] += 48; break;
-
-        case SIG_RSA_SHA512:
-            memcpy( p, ASN1_HASH_SHA2X, 19 );
-            memcpy( p + 19, hash, 64 );
-            p[1] += 64; p[14] = 3; p[18] += 64; break;
-
-        default:
-            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+        memcpy( p, hash, hashlen );
+    }
+    else
+    {
+        /*
+         * DigestInfo ::= SEQUENCE {
+         *   digestAlgorithm DigestAlgorithmIdentifier,
+         *   digest Digest }
+         *
+         * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+         *
+         * Digest ::= OCTET STRING
+         */
+        *p++ = ASN1_SEQUENCE | ASN1_CONSTRUCTED;
+        *p++ = (unsigned char) ( 0x08 + oid_size + hashlen );
+        *p++ = ASN1_SEQUENCE | ASN1_CONSTRUCTED;
+        *p++ = (unsigned char) ( 0x04 + oid_size );
+        *p++ = ASN1_OID;
+        *p++ = oid_size & 0xFF;
+        memcpy( p, oid, oid_size );
+        p += oid_size;
+        *p++ = ASN1_NULL;
+        *p++ = 0x00;
+        *p++ = ASN1_OCTET_STRING;
+        *p++ = hashlen;
+        memcpy( p, hash, hashlen );
     }
 
     return( ( mode == RSA_PUBLIC )
             ? rsa_public(  ctx, sig, sig )
-            : rsa_private( ctx, sig, sig ) );
+            : rsa_private( ctx, f_rng, p_rng, sig, sig ) );
 }
+#endif /* POLARSSL_PKCS1_V15 */
 
 /*
  * Do an RSA operation to sign the message digest
@@ -981,20 +1081,22 @@ int rsa_pkcs1_sign( rsa_context *ctx,
                     int (*f_rng)(void *, unsigned char *, size_t),
                     void *p_rng,
                     int mode,
-                    int hash_id,
+                    md_type_t md_alg,
                     unsigned int hashlen,
                     const unsigned char *hash,
                     unsigned char *sig )
 {
     switch( ctx->padding )
     {
+#if defined(POLARSSL_PKCS1_V15)
         case RSA_PKCS_V15:
-            return rsa_rsassa_pkcs1_v15_sign( ctx, mode, hash_id,
+            return rsa_rsassa_pkcs1_v15_sign( ctx, f_rng, p_rng, mode, md_alg,
                                               hashlen, hash, sig );
+#endif
 
 #if defined(POLARSSL_PKCS1_V21)
         case RSA_PKCS_V21:
-            return rsa_rsassa_pss_sign( ctx, f_rng, p_rng, mode, hash_id,
+            return rsa_rsassa_pss_sign( ctx, f_rng, p_rng, mode, md_alg,
                                         hashlen, hash, sig );
 #endif
 
@@ -1007,12 +1109,16 @@ int rsa_pkcs1_sign( rsa_context *ctx,
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
  */
-int rsa_rsassa_pss_verify( rsa_context *ctx,
-                           int mode,
-                           int hash_id,
-                           unsigned int hashlen,
-                           const unsigned char *hash,
-                           unsigned char *sig )
+int rsa_rsassa_pss_verify_ext( rsa_context *ctx,
+                               int (*f_rng)(void *, unsigned char *, size_t),
+                               void *p_rng,
+                               int mode,
+                               md_type_t md_alg,
+                               unsigned int hashlen,
+                               const unsigned char *hash,
+                               md_type_t mgf1_hash_id,
+                               int expected_salt_len,
+                               const unsigned char *sig )
 {
     int ret;
     size_t siglen;
@@ -1025,7 +1131,7 @@ int rsa_rsassa_pss_verify( rsa_context *ctx,
     const md_info_t *md_info;
     md_context_t md_ctx;
 
-    if( ctx->padding != RSA_PKCS_V21 )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V21 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     siglen = ctx->len;
@@ -1035,7 +1141,7 @@ int rsa_rsassa_pss_verify( rsa_context *ctx,
 
     ret = ( mode == RSA_PUBLIC )
           ? rsa_public(  ctx, sig, buf )
-          : rsa_private( ctx, sig, buf );
+          : rsa_private( ctx, f_rng, p_rng, sig, buf );
 
     if( ret != 0 )
         return( ret );
@@ -1045,44 +1151,23 @@ int rsa_rsassa_pss_verify( rsa_context *ctx,
     if( buf[siglen - 1] != 0xBC )
         return( POLARSSL_ERR_RSA_INVALID_PADDING );
 
-    switch( hash_id )
+    if( md_alg != POLARSSL_MD_NONE )
     {
-        case SIG_RSA_MD2:
-        case SIG_RSA_MD4:
-        case SIG_RSA_MD5:
-            hashlen = 16;
-            break;
-
-        case SIG_RSA_SHA1:
-            hashlen = 20;
-            break;
-
-        case SIG_RSA_SHA224:
-            hashlen = 28;
-            break;
-
-        case SIG_RSA_SHA256:
-            hashlen = 32;
-            break;
-
-        case SIG_RSA_SHA384:
-            hashlen = 48;
-            break;
-
-        case SIG_RSA_SHA512:
-            hashlen = 64;
-            break;
-
-        default:
+        // Gather length of hash to sign
+        //
+        md_info = md_info_from_type( md_alg );
+        if( md_info == NULL )
             return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+        hashlen = md_get_size( md_info );
     }
 
-    md_info = md_info_from_type( ctx->hash_id );
+    md_info = md_info_from_type( mgf1_hash_id );
     if( md_info == NULL )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     hlen = md_get_size( md_info );
-    slen = siglen - hlen - 1;
+    slen = siglen - hlen - 1; /* Currently length of salt + padding */
 
     memset( zeros, 0, 8 );
 
@@ -1100,24 +1185,33 @@ int rsa_rsassa_pss_verify( rsa_context *ctx,
     if( buf[0] >> ( 8 - siglen * 8 + msb ) )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
+    md_init( &md_ctx );
     md_init_ctx( &md_ctx, md_info );
 
     mgf_mask( p, siglen - hlen - 1, p + siglen - hlen - 1, hlen, &md_ctx );
 
     buf[0] &= 0xFF >> ( siglen * 8 - msb );
 
-    while( *p == 0 && p < buf + siglen )
+    while( p < buf + siglen && *p == 0 )
         p++;
 
     if( p == buf + siglen ||
         *p++ != 0x01 )
     {
-        md_free_ctx( &md_ctx );
+        md_free( &md_ctx );
         return( POLARSSL_ERR_RSA_INVALID_PADDING );
     }
 
+    /* Actual salt len */
     slen -= p - buf;
 
+    if( expected_salt_len != RSA_SALT_LEN_ANY &&
+        slen != (size_t) expected_salt_len )
+    {
+        md_free( &md_ctx );
+        return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
     // Generate H = Hash( M' )
     //
     md_starts( &md_ctx );
@@ -1126,31 +1220,60 @@ int rsa_rsassa_pss_verify( rsa_context *ctx,
     md_update( &md_ctx, p, slen );
     md_finish( &md_ctx, result );
 
-    md_free_ctx( &md_ctx );
+    md_free( &md_ctx );
 
     if( memcmp( p + slen, result, hlen ) == 0 )
         return( 0 );
     else
         return( POLARSSL_ERR_RSA_VERIFY_FAILED );
 }
+
+/*
+ * Simplified PKCS#1 v2.1 RSASSA-PSS-VERIFY function
+ */
+int rsa_rsassa_pss_verify( rsa_context *ctx,
+                           int (*f_rng)(void *, unsigned char *, size_t),
+                           void *p_rng,
+                           int mode,
+                           md_type_t md_alg,
+                           unsigned int hashlen,
+                           const unsigned char *hash,
+                           const unsigned char *sig )
+{
+    md_type_t mgf1_hash_id = ( ctx->hash_id != POLARSSL_MD_NONE )
+                             ? (md_type_t) ctx->hash_id
+                             : md_alg;
+
+    return( rsa_rsassa_pss_verify_ext( ctx, f_rng, p_rng, mode,
+                                       md_alg, hashlen, hash,
+                                       mgf1_hash_id, RSA_SALT_LEN_ANY,
+                                       sig ) );
+
+}
 #endif /* POLARSSL_PKCS1_V21 */
 
+#if defined(POLARSSL_PKCS1_V15)
 /*
  * Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-v1_5-VERIFY function
  */
 int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
+                                 int (*f_rng)(void *, unsigned char *, size_t),
+                                 void *p_rng,
                                  int mode,
-                                 int hash_id,
+                                 md_type_t md_alg,
                                  unsigned int hashlen,
                                  const unsigned char *hash,
-                                 unsigned char *sig )
+                                 const unsigned char *sig )
 {
     int ret;
-    size_t len, siglen;
-    unsigned char *p, c;
+    size_t len, siglen, asn1_len;
+    unsigned char *p, *end;
     unsigned char buf[POLARSSL_MPI_MAX_SIZE];
+    md_type_t msg_md_alg;
+    const md_info_t *md_info;
+    asn1_buf oid;
 
-    if( ctx->padding != RSA_PKCS_V15 )
+    if( mode == RSA_PRIVATE && ctx->padding != RSA_PKCS_V15 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     siglen = ctx->len;
@@ -1160,7 +1283,7 @@ int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
 
     ret = ( mode == RSA_PUBLIC )
           ? rsa_public(  ctx, sig, buf )
-          : rsa_private( ctx, sig, buf );
+          : rsa_private( ctx, f_rng, p_rng, sig, buf );
 
     if( ret != 0 )
         return( ret );
@@ -1180,59 +1303,7 @@ int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
 
     len = siglen - ( p - buf );
 
-    if( len == 33 && hash_id == SIG_RSA_SHA1 )
-    {
-        if( memcmp( p, ASN1_HASH_SHA1_ALT, 13 ) == 0 &&
-                memcmp( p + 13, hash, 20 ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-    if( len == 34 )
-    {
-        c = p[13];
-        p[13] = 0;
-
-        if( memcmp( p, ASN1_HASH_MDX, 18 ) != 0 )
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-
-        if( ( c == 2 && hash_id == SIG_RSA_MD2 ) ||
-                ( c == 4 && hash_id == SIG_RSA_MD4 ) ||
-                ( c == 5 && hash_id == SIG_RSA_MD5 ) )
-        {
-            if( memcmp( p + 18, hash, 16 ) == 0 )
-                return( 0 );
-            else
-                return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-        }
-    }
-
-    if( len == 35 && hash_id == SIG_RSA_SHA1 )
-    {
-        if( memcmp( p, ASN1_HASH_SHA1, 15 ) == 0 &&
-                memcmp( p + 15, hash, 20 ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-    if( ( len == 19 + 28 && p[14] == 4 && hash_id == SIG_RSA_SHA224 ) ||
-            ( len == 19 + 32 && p[14] == 1 && hash_id == SIG_RSA_SHA256 ) ||
-            ( len == 19 + 48 && p[14] == 2 && hash_id == SIG_RSA_SHA384 ) ||
-            ( len == 19 + 64 && p[14] == 3 && hash_id == SIG_RSA_SHA512 ) )
-    {
-        c = p[1] - 17;
-        p[1] = 17;
-        p[14] = 0;
-
-        if( p[18] == c &&
-                memcmp( p, ASN1_HASH_SHA2X, 18 ) == 0 &&
-                memcmp( p + 19, hash, c ) == 0 )
-            return( 0 );
-        else
-            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
-    }
-
-    if( len == hashlen && hash_id == SIG_RSA_RAW )
+    if( len == hashlen && md_alg == POLARSSL_MD_NONE )
     {
         if( memcmp( p, hash, hashlen ) == 0 )
             return( 0 );
@@ -1240,28 +1311,88 @@ int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
             return( POLARSSL_ERR_RSA_VERIFY_FAILED );
     }
 
-    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    md_info = md_info_from_type( md_alg );
+    if( md_info == NULL )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    hashlen = md_get_size( md_info );
+
+    end = p + len;
+
+    // Parse the ASN.1 structure inside the PKCS#1 v1.5 structure
+    //
+    if( ( ret = asn1_get_tag( &p, end, &asn1_len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( asn1_len + 2 != len )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( ( ret = asn1_get_tag( &p, end, &asn1_len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( asn1_len + 6 + hashlen != len )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( ( ret = asn1_get_tag( &p, end, &oid.len, ASN1_OID ) ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    oid.p = p;
+    p += oid.len;
+
+    if( oid_get_md_alg( &oid, &msg_md_alg ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( md_alg != msg_md_alg )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    /*
+     * assume the algorithm parameters must be NULL
+     */
+    if( ( ret = asn1_get_tag( &p, end, &asn1_len, ASN1_NULL ) ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( ( ret = asn1_get_tag( &p, end, &asn1_len, ASN1_OCTET_STRING ) ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( asn1_len != hashlen )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    if( memcmp( p, hash, hashlen ) != 0 )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    p += hashlen;
+
+    if( p != end )
+        return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+    return( 0 );
 }
+#endif /* POLARSSL_PKCS1_V15 */
 
 /*
  * Do an RSA operation and check the message digest
  */
 int rsa_pkcs1_verify( rsa_context *ctx,
+                      int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng,
                       int mode,
-                      int hash_id,
+                      md_type_t md_alg,
                       unsigned int hashlen,
                       const unsigned char *hash,
-                      unsigned char *sig )
+                      const unsigned char *sig )
 {
     switch( ctx->padding )
     {
+#if defined(POLARSSL_PKCS1_V15)
         case RSA_PKCS_V15:
-            return rsa_rsassa_pkcs1_v15_verify( ctx, mode, hash_id,
+            return rsa_rsassa_pkcs1_v15_verify( ctx, f_rng, p_rng, mode, md_alg,
                                                 hashlen, hash, sig );
+#endif
 
 #if defined(POLARSSL_PKCS1_V21)
         case RSA_PKCS_V21:
-            return rsa_rsassa_pss_verify( ctx, mode, hash_id,
+            return rsa_rsassa_pss_verify( ctx, f_rng, p_rng, mode, md_alg,
                                           hashlen, hash, sig );
 #endif
 
@@ -1270,15 +1401,61 @@ int rsa_pkcs1_verify( rsa_context *ctx,
     }
 }
 
+/*
+ * Copy the components of an RSA key
+ */
+int rsa_copy( rsa_context *dst, const rsa_context *src )
+{
+    int ret;
+
+    dst->ver = src->ver;
+    dst->len = src->len;
+
+    MPI_CHK( mpi_copy( &dst->N, &src->N ) );
+    MPI_CHK( mpi_copy( &dst->E, &src->E ) );
+
+    MPI_CHK( mpi_copy( &dst->D, &src->D ) );
+    MPI_CHK( mpi_copy( &dst->P, &src->P ) );
+    MPI_CHK( mpi_copy( &dst->Q, &src->Q ) );
+    MPI_CHK( mpi_copy( &dst->DP, &src->DP ) );
+    MPI_CHK( mpi_copy( &dst->DQ, &src->DQ ) );
+    MPI_CHK( mpi_copy( &dst->QP, &src->QP ) );
+
+    MPI_CHK( mpi_copy( &dst->RN, &src->RN ) );
+    MPI_CHK( mpi_copy( &dst->RP, &src->RP ) );
+    MPI_CHK( mpi_copy( &dst->RQ, &src->RQ ) );
+
+#if !defined(POLARSSL_RSA_NO_CRT)
+    MPI_CHK( mpi_copy( &dst->Vi, &src->Vi ) );
+    MPI_CHK( mpi_copy( &dst->Vf, &src->Vf ) );
+#endif
+
+    dst->padding = src->padding;
+    dst->hash_id = src->hash_id;
+
+cleanup:
+    if( ret != 0 )
+        rsa_free( dst );
+
+    return( ret );
+}
+
 /*
  * Free the components of an RSA key
  */
 void rsa_free( rsa_context *ctx )
 {
+#if !defined(POLARSSL_RSA_NO_CRT)
+    mpi_free( &ctx->Vi ); mpi_free( &ctx->Vf );
+#endif
     mpi_free( &ctx->RQ ); mpi_free( &ctx->RP ); mpi_free( &ctx->RN );
     mpi_free( &ctx->QP ); mpi_free( &ctx->DQ ); mpi_free( &ctx->DP );
     mpi_free( &ctx->Q  ); mpi_free( &ctx->P  ); mpi_free( &ctx->D );
     mpi_free( &ctx->E  ); mpi_free( &ctx->N  );
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_free( &ctx->mutex );
+#endif
 }
 
 #if defined(POLARSSL_SELF_TEST)
@@ -1339,8 +1516,10 @@ void rsa_free( rsa_context *ctx )
 #define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
                 "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
 
+#if defined(POLARSSL_PKCS1_V15)
 static int myrand( void *rng_state, unsigned char *output, size_t len )
 {
+#if !defined(__OpenBSD__)
     size_t i;
 
     if( rng_state != NULL )
@@ -1348,15 +1527,24 @@ static int myrand( void *rng_state, unsigned char *output, size_t len )
 
     for( i = 0; i < len; ++i )
         output[i] = rand();
-    
+#else
+    if( rng_state != NULL )
+        rng_state = NULL;
+
+    arc4random_buf( output, len );
+#endif /* !OpenBSD */
+
     return( 0 );
 }
+#endif /* POLARSSL_PKCS1_V15 */
 
 /*
  * Checkup routine
  */
 int rsa_self_test( int verbose )
 {
+    int ret = 0;
+#if defined(POLARSSL_PKCS1_V15)
     size_t len;
     rsa_context rsa;
     unsigned char rsa_plaintext[PT_LEN];
@@ -1369,50 +1557,50 @@ int rsa_self_test( int verbose )
     rsa_init( &rsa, RSA_PKCS_V15, 0 );
 
     rsa.len = KEY_LEN;
-    mpi_read_string( &rsa.N , 16, RSA_N  );
-    mpi_read_string( &rsa.E , 16, RSA_E  );
-    mpi_read_string( &rsa.D , 16, RSA_D  );
-    mpi_read_string( &rsa.P , 16, RSA_P  );
-    mpi_read_string( &rsa.Q , 16, RSA_Q  );
-    mpi_read_string( &rsa.DP, 16, RSA_DP );
-    mpi_read_string( &rsa.DQ, 16, RSA_DQ );
-    mpi_read_string( &rsa.QP, 16, RSA_QP );
+    MPI_CHK( mpi_read_string( &rsa.N , 16, RSA_N  ) );
+    MPI_CHK( mpi_read_string( &rsa.E , 16, RSA_E  ) );
+    MPI_CHK( mpi_read_string( &rsa.D , 16, RSA_D  ) );
+    MPI_CHK( mpi_read_string( &rsa.P , 16, RSA_P  ) );
+    MPI_CHK( mpi_read_string( &rsa.Q , 16, RSA_Q  ) );
+    MPI_CHK( mpi_read_string( &rsa.DP, 16, RSA_DP ) );
+    MPI_CHK( mpi_read_string( &rsa.DQ, 16, RSA_DQ ) );
+    MPI_CHK( mpi_read_string( &rsa.QP, 16, RSA_QP ) );
 
     if( verbose != 0 )
-        printf( "  RSA key validation: " );
+        polarssl_printf( "  RSA key validation: " );
 
     if( rsa_check_pubkey(  &rsa ) != 0 ||
         rsa_check_privkey( &rsa ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n  PKCS#1 encryption : " );
+        polarssl_printf( "passed\n  PKCS#1 encryption : " );
 
     memcpy( rsa_plaintext, RSA_PT, PT_LEN );
 
-    if( rsa_pkcs1_encrypt( &rsa, &myrand, NULL, RSA_PUBLIC, PT_LEN,
+    if( rsa_pkcs1_encrypt( &rsa, myrand, NULL, RSA_PUBLIC, PT_LEN,
                            rsa_plaintext, rsa_ciphertext ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n  PKCS#1 decryption : " );
+        polarssl_printf( "passed\n  PKCS#1 decryption : " );
 
-    if( rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &len,
+    if( rsa_pkcs1_decrypt( &rsa, myrand, NULL, RSA_PRIVATE, &len,
                            rsa_ciphertext, rsa_decrypted,
                            sizeof(rsa_decrypted) ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
@@ -1420,47 +1608,50 @@ int rsa_self_test( int verbose )
     if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
 #if defined(POLARSSL_SHA1_C)
     if( verbose != 0 )
-        printf( "passed\n  PKCS#1 data sign  : " );
+        polarssl_printf( "passed\n  PKCS#1 data sign  : " );
 
     sha1( rsa_plaintext, PT_LEN, sha1sum );
 
-    if( rsa_pkcs1_sign( &rsa, NULL, NULL, RSA_PRIVATE, SIG_RSA_SHA1, 20,
+    if( rsa_pkcs1_sign( &rsa, myrand, NULL, RSA_PRIVATE, POLARSSL_MD_SHA1, 0,
                         sha1sum, rsa_ciphertext ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n  PKCS#1 sig. verify: " );
+        polarssl_printf( "passed\n  PKCS#1 sig. verify: " );
 
-    if( rsa_pkcs1_verify( &rsa, RSA_PUBLIC, SIG_RSA_SHA1, 20,
+    if( rsa_pkcs1_verify( &rsa, NULL, NULL, RSA_PUBLIC, POLARSSL_MD_SHA1, 0,
                           sha1sum, rsa_ciphertext ) != 0 )
     {
         if( verbose != 0 )
-            printf( "failed\n" );
+            polarssl_printf( "failed\n" );
 
         return( 1 );
     }
 
     if( verbose != 0 )
-        printf( "passed\n\n" );
+        polarssl_printf( "passed\n\n" );
 #endif /* POLARSSL_SHA1_C */
 
+cleanup:
     rsa_free( &rsa );
-
-    return( 0 );
+#else /* POLARSSL_PKCS1_V15 */
+    ((void) verbose);
+#endif /* POLARSSL_PKCS1_V15 */
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_RSA_C */
diff --git a/Externals/polarssl/library/sha1.c b/Externals/polarssl/library/sha1.c
index b301b09797..20408c742f 100644
--- a/Externals/polarssl/library/sha1.c
+++ b/Externals/polarssl/library/sha1.c
@@ -1,7 +1,7 @@
 /*
  *  FIPS-180-1 compliant SHA-1 implementation
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -28,7 +28,11 @@
  *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_SHA1_C)
 
@@ -38,6 +42,17 @@
 #include <stdio.h>
 #endif
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if !defined(POLARSSL_SHA1_ALT)
 
 /*
@@ -63,6 +78,19 @@
 }
 #endif
 
+void sha1_init( sha1_context *ctx )
+{
+    memset( ctx, 0, sizeof( sha1_context ) );
+}
+
+void sha1_free( sha1_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( sha1_context ) );
+}
+
 /*
  * SHA-1 context setup
  */
@@ -103,8 +131,8 @@ void sha1_process( sha1_context *ctx, const unsigned char data[64] )
 
 #define R(t)                                            \
 (                                                       \
-    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
-           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
+    temp = W[( t -  3 ) & 0x0F] ^ W[( t - 8 ) & 0x0F] ^ \
+           W[( t - 14 ) & 0x0F] ^ W[  t       & 0x0F],  \
     ( W[t & 0x0F] = S(temp,1) )                         \
 )
 
@@ -242,7 +270,7 @@ void sha1_update( sha1_context *ctx, const unsigned char *input, size_t ilen )
     size_t fill;
     uint32_t left;
 
-    if( ilen <= 0 )
+    if( ilen == 0 )
         return;
 
     left = ctx->total[0] & 0x3F;
@@ -320,11 +348,11 @@ void sha1( const unsigned char *input, size_t ilen, unsigned char output[20] )
 {
     sha1_context ctx;
 
+    sha1_init( &ctx );
     sha1_starts( &ctx );
     sha1_update( &ctx, input, ilen );
     sha1_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
+    sha1_free( &ctx );
 }
 
 #if defined(POLARSSL_FS_IO)
@@ -341,14 +369,14 @@ int sha1_file( const char *path, unsigned char output[20] )
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( POLARSSL_ERR_SHA1_FILE_IO_ERROR );
 
+    sha1_init( &ctx );
     sha1_starts( &ctx );
 
     while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
         sha1_update( &ctx, buf, n );
 
     sha1_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
+    sha1_free( &ctx );
 
     if( ferror( f ) != 0 )
     {
@@ -364,7 +392,8 @@ int sha1_file( const char *path, unsigned char output[20] )
 /*
  * SHA-1 HMAC context setup
  */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, size_t keylen )
+void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key,
+                       size_t keylen )
 {
     size_t i;
     unsigned char sum[20];
@@ -388,13 +417,14 @@ void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, size_t keyle
     sha1_starts( ctx );
     sha1_update( ctx, ctx->ipad, 64 );
 
-    memset( sum, 0, sizeof( sum ) );
+    polarssl_zeroize( sum, sizeof( sum ) );
 }
 
 /*
  * SHA-1 HMAC process buffer
  */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input, size_t ilen )
+void sha1_hmac_update( sha1_context *ctx, const unsigned char *input,
+                       size_t ilen )
 {
     sha1_update( ctx, input, ilen );
 }
@@ -412,7 +442,7 @@ void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] )
     sha1_update( ctx, tmpbuf, 20 );
     sha1_finish( ctx, output );
 
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
 }
 
 /*
@@ -433,18 +463,18 @@ void sha1_hmac( const unsigned char *key, size_t keylen,
 {
     sha1_context ctx;
 
+    sha1_init( &ctx );
     sha1_hmac_starts( &ctx, key, keylen );
     sha1_hmac_update( &ctx, input, ilen );
     sha1_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
+    sha1_free( &ctx );
 }
 
 #if defined(POLARSSL_SELF_TEST)
 /*
  * FIPS-180-1 test vectors
  */
-static unsigned char sha1_test_buf[3][57] = 
+static unsigned char sha1_test_buf[3][57] =
 {
     { "abc" },
     { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
@@ -537,18 +567,20 @@ static const unsigned char sha1_hmac_test_sum[7][20] =
  */
 int sha1_self_test( int verbose )
 {
-    int i, j, buflen;
+    int i, j, buflen, ret = 0;
     unsigned char buf[1024];
     unsigned char sha1sum[20];
     sha1_context ctx;
 
+    sha1_init( &ctx );
+
     /*
      * SHA-1
      */
     for( i = 0; i < 3; i++ )
     {
         if( verbose != 0 )
-            printf( "  SHA-1 test #%d: ", i + 1 );
+            polarssl_printf( "  SHA-1 test #%d: ", i + 1 );
 
         sha1_starts( &ctx );
 
@@ -568,22 +600,23 @@ int sha1_self_test( int verbose )
         if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
     for( i = 0; i < 7; i++ )
     {
         if( verbose != 0 )
-            printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
+            polarssl_printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
 
         if( i == 5 || i == 6 )
         {
@@ -604,21 +637,25 @@ int sha1_self_test( int verbose )
         if( memcmp( sha1sum, sha1_hmac_test_sum[i], buflen ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
-    return( 0 );
+exit:
+    sha1_free( &ctx );
+
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_SHA1_C */
diff --git a/Externals/polarssl/library/sha2.c b/Externals/polarssl/library/sha2.c
deleted file mode 100644
index 20772eca26..0000000000
--- a/Externals/polarssl/library/sha2.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- *  FIPS-180-2 compliant SHA-256 implementation
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  The SHA-256 Secure Hash Standard was published by NIST in 2002.
- *
- *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
- */
-
-#include "polarssl/config.h"
-
-#if defined(POLARSSL_SHA2_C)
-
-#include "polarssl/sha2.h"
-
-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
-#include <stdio.h>
-#endif
-
-#if !defined(POLARSSL_SHA2_ALT)
-
-/*
- * 32-bit integer manipulation macros (big endian)
- */
-#ifndef GET_UINT32_BE
-#define GET_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
-        | ( (uint32_t) (b)[(i) + 3]       );            \
-}
-#endif
-
-#ifndef PUT_UINT32_BE
-#define PUT_UINT32_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
-#endif
-
-/*
- * SHA-256 context setup
- */
-void sha2_starts( sha2_context *ctx, int is224 )
-{
-    ctx->total[0] = 0;
-    ctx->total[1] = 0;
-
-    if( is224 == 0 )
-    {
-        /* SHA-256 */
-        ctx->state[0] = 0x6A09E667;
-        ctx->state[1] = 0xBB67AE85;
-        ctx->state[2] = 0x3C6EF372;
-        ctx->state[3] = 0xA54FF53A;
-        ctx->state[4] = 0x510E527F;
-        ctx->state[5] = 0x9B05688C;
-        ctx->state[6] = 0x1F83D9AB;
-        ctx->state[7] = 0x5BE0CD19;
-    }
-    else
-    {
-        /* SHA-224 */
-        ctx->state[0] = 0xC1059ED8;
-        ctx->state[1] = 0x367CD507;
-        ctx->state[2] = 0x3070DD17;
-        ctx->state[3] = 0xF70E5939;
-        ctx->state[4] = 0xFFC00B31;
-        ctx->state[5] = 0x68581511;
-        ctx->state[6] = 0x64F98FA7;
-        ctx->state[7] = 0xBEFA4FA4;
-    }
-
-    ctx->is224 = is224;
-}
-
-void sha2_process( sha2_context *ctx, const unsigned char data[64] )
-{
-    uint32_t temp1, temp2, W[64];
-    uint32_t A, B, C, D, E, F, G, H;
-
-    GET_UINT32_BE( W[ 0], data,  0 );
-    GET_UINT32_BE( W[ 1], data,  4 );
-    GET_UINT32_BE( W[ 2], data,  8 );
-    GET_UINT32_BE( W[ 3], data, 12 );
-    GET_UINT32_BE( W[ 4], data, 16 );
-    GET_UINT32_BE( W[ 5], data, 20 );
-    GET_UINT32_BE( W[ 6], data, 24 );
-    GET_UINT32_BE( W[ 7], data, 28 );
-    GET_UINT32_BE( W[ 8], data, 32 );
-    GET_UINT32_BE( W[ 9], data, 36 );
-    GET_UINT32_BE( W[10], data, 40 );
-    GET_UINT32_BE( W[11], data, 44 );
-    GET_UINT32_BE( W[12], data, 48 );
-    GET_UINT32_BE( W[13], data, 52 );
-    GET_UINT32_BE( W[14], data, 56 );
-    GET_UINT32_BE( W[15], data, 60 );
-
-#define  SHR(x,n) ((x & 0xFFFFFFFF) >> n)
-#define ROTR(x,n) (SHR(x,n) | (x << (32 - n)))
-
-#define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^  SHR(x, 3))
-#define S1(x) (ROTR(x,17) ^ ROTR(x,19) ^  SHR(x,10))
-
-#define S2(x) (ROTR(x, 2) ^ ROTR(x,13) ^ ROTR(x,22))
-#define S3(x) (ROTR(x, 6) ^ ROTR(x,11) ^ ROTR(x,25))
-
-#define F0(x,y,z) ((x & y) | (z & (x | y)))
-#define F1(x,y,z) (z ^ (x & (y ^ z)))
-
-#define R(t)                                    \
-(                                               \
-    W[t] = S1(W[t -  2]) + W[t -  7] +          \
-           S0(W[t - 15]) + W[t - 16]            \
-)
-
-#define P(a,b,c,d,e,f,g,h,x,K)                  \
-{                                               \
-    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
-    temp2 = S2(a) + F0(a,b,c);                  \
-    d += temp1; h = temp1 + temp2;              \
-}
-
-    A = ctx->state[0];
-    B = ctx->state[1];
-    C = ctx->state[2];
-    D = ctx->state[3];
-    E = ctx->state[4];
-    F = ctx->state[5];
-    G = ctx->state[6];
-    H = ctx->state[7];
-
-    P( A, B, C, D, E, F, G, H, W[ 0], 0x428A2F98 );
-    P( H, A, B, C, D, E, F, G, W[ 1], 0x71374491 );
-    P( G, H, A, B, C, D, E, F, W[ 2], 0xB5C0FBCF );
-    P( F, G, H, A, B, C, D, E, W[ 3], 0xE9B5DBA5 );
-    P( E, F, G, H, A, B, C, D, W[ 4], 0x3956C25B );
-    P( D, E, F, G, H, A, B, C, W[ 5], 0x59F111F1 );
-    P( C, D, E, F, G, H, A, B, W[ 6], 0x923F82A4 );
-    P( B, C, D, E, F, G, H, A, W[ 7], 0xAB1C5ED5 );
-    P( A, B, C, D, E, F, G, H, W[ 8], 0xD807AA98 );
-    P( H, A, B, C, D, E, F, G, W[ 9], 0x12835B01 );
-    P( G, H, A, B, C, D, E, F, W[10], 0x243185BE );
-    P( F, G, H, A, B, C, D, E, W[11], 0x550C7DC3 );
-    P( E, F, G, H, A, B, C, D, W[12], 0x72BE5D74 );
-    P( D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE );
-    P( C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7 );
-    P( B, C, D, E, F, G, H, A, W[15], 0xC19BF174 );
-    P( A, B, C, D, E, F, G, H, R(16), 0xE49B69C1 );
-    P( H, A, B, C, D, E, F, G, R(17), 0xEFBE4786 );
-    P( G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6 );
-    P( F, G, H, A, B, C, D, E, R(19), 0x240CA1CC );
-    P( E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F );
-    P( D, E, F, G, H, A, B, C, R(21), 0x4A7484AA );
-    P( C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC );
-    P( B, C, D, E, F, G, H, A, R(23), 0x76F988DA );
-    P( A, B, C, D, E, F, G, H, R(24), 0x983E5152 );
-    P( H, A, B, C, D, E, F, G, R(25), 0xA831C66D );
-    P( G, H, A, B, C, D, E, F, R(26), 0xB00327C8 );
-    P( F, G, H, A, B, C, D, E, R(27), 0xBF597FC7 );
-    P( E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3 );
-    P( D, E, F, G, H, A, B, C, R(29), 0xD5A79147 );
-    P( C, D, E, F, G, H, A, B, R(30), 0x06CA6351 );
-    P( B, C, D, E, F, G, H, A, R(31), 0x14292967 );
-    P( A, B, C, D, E, F, G, H, R(32), 0x27B70A85 );
-    P( H, A, B, C, D, E, F, G, R(33), 0x2E1B2138 );
-    P( G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC );
-    P( F, G, H, A, B, C, D, E, R(35), 0x53380D13 );
-    P( E, F, G, H, A, B, C, D, R(36), 0x650A7354 );
-    P( D, E, F, G, H, A, B, C, R(37), 0x766A0ABB );
-    P( C, D, E, F, G, H, A, B, R(38), 0x81C2C92E );
-    P( B, C, D, E, F, G, H, A, R(39), 0x92722C85 );
-    P( A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1 );
-    P( H, A, B, C, D, E, F, G, R(41), 0xA81A664B );
-    P( G, H, A, B, C, D, E, F, R(42), 0xC24B8B70 );
-    P( F, G, H, A, B, C, D, E, R(43), 0xC76C51A3 );
-    P( E, F, G, H, A, B, C, D, R(44), 0xD192E819 );
-    P( D, E, F, G, H, A, B, C, R(45), 0xD6990624 );
-    P( C, D, E, F, G, H, A, B, R(46), 0xF40E3585 );
-    P( B, C, D, E, F, G, H, A, R(47), 0x106AA070 );
-    P( A, B, C, D, E, F, G, H, R(48), 0x19A4C116 );
-    P( H, A, B, C, D, E, F, G, R(49), 0x1E376C08 );
-    P( G, H, A, B, C, D, E, F, R(50), 0x2748774C );
-    P( F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5 );
-    P( E, F, G, H, A, B, C, D, R(52), 0x391C0CB3 );
-    P( D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A );
-    P( C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F );
-    P( B, C, D, E, F, G, H, A, R(55), 0x682E6FF3 );
-    P( A, B, C, D, E, F, G, H, R(56), 0x748F82EE );
-    P( H, A, B, C, D, E, F, G, R(57), 0x78A5636F );
-    P( G, H, A, B, C, D, E, F, R(58), 0x84C87814 );
-    P( F, G, H, A, B, C, D, E, R(59), 0x8CC70208 );
-    P( E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA );
-    P( D, E, F, G, H, A, B, C, R(61), 0xA4506CEB );
-    P( C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7 );
-    P( B, C, D, E, F, G, H, A, R(63), 0xC67178F2 );
-
-    ctx->state[0] += A;
-    ctx->state[1] += B;
-    ctx->state[2] += C;
-    ctx->state[3] += D;
-    ctx->state[4] += E;
-    ctx->state[5] += F;
-    ctx->state[6] += G;
-    ctx->state[7] += H;
-}
-
-/*
- * SHA-256 process buffer
- */
-void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen )
-{
-    size_t fill;
-    uint32_t left;
-
-    if( ilen <= 0 )
-        return;
-
-    left = ctx->total[0] & 0x3F;
-    fill = 64 - left;
-
-    ctx->total[0] += (uint32_t) ilen;
-    ctx->total[0] &= 0xFFFFFFFF;
-
-    if( ctx->total[0] < (uint32_t) ilen )
-        ctx->total[1]++;
-
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
-        sha2_process( ctx, ctx->buffer );
-        input += fill;
-        ilen  -= fill;
-        left = 0;
-    }
-
-    while( ilen >= 64 )
-    {
-        sha2_process( ctx, input );
-        input += 64;
-        ilen  -= 64;
-    }
-
-    if( ilen > 0 )
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
-}
-
-static const unsigned char sha2_padding[64] =
-{
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/*
- * SHA-256 final digest
- */
-void sha2_finish( sha2_context *ctx, unsigned char output[32] )
-{
-    uint32_t last, padn;
-    uint32_t high, low;
-    unsigned char msglen[8];
-
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
-
-    PUT_UINT32_BE( high, msglen, 0 );
-    PUT_UINT32_BE( low,  msglen, 4 );
-
-    last = ctx->total[0] & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
-
-    sha2_update( ctx, sha2_padding, padn );
-    sha2_update( ctx, msglen, 8 );
-
-    PUT_UINT32_BE( ctx->state[0], output,  0 );
-    PUT_UINT32_BE( ctx->state[1], output,  4 );
-    PUT_UINT32_BE( ctx->state[2], output,  8 );
-    PUT_UINT32_BE( ctx->state[3], output, 12 );
-    PUT_UINT32_BE( ctx->state[4], output, 16 );
-    PUT_UINT32_BE( ctx->state[5], output, 20 );
-    PUT_UINT32_BE( ctx->state[6], output, 24 );
-
-    if( ctx->is224 == 0 )
-        PUT_UINT32_BE( ctx->state[7], output, 28 );
-}
-
-#endif /* !POLARSSL_SHA2_ALT */
-
-/*
- * output = SHA-256( input buffer )
- */
-void sha2( const unsigned char *input, size_t ilen,
-           unsigned char output[32], int is224 )
-{
-    sha2_context ctx;
-
-    sha2_starts( &ctx, is224 );
-    sha2_update( &ctx, input, ilen );
-    sha2_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha2_context ) );
-}
-
-#if defined(POLARSSL_FS_IO)
-/*
- * output = SHA-256( file contents )
- */
-int sha2_file( const char *path, unsigned char output[32], int is224 )
-{
-    FILE *f;
-    size_t n;
-    sha2_context ctx;
-    unsigned char buf[1024];
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( POLARSSL_ERR_SHA2_FILE_IO_ERROR );
-
-    sha2_starts( &ctx, is224 );
-
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        sha2_update( &ctx, buf, n );
-
-    sha2_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha2_context ) );
-
-    if( ferror( f ) != 0 )
-    {
-        fclose( f );
-        return( POLARSSL_ERR_SHA2_FILE_IO_ERROR );
-    }
-
-    fclose( f );
-    return( 0 );
-}
-#endif /* POLARSSL_FS_IO */
-
-/*
- * SHA-256 HMAC context setup
- */
-void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keylen,
-                       int is224 )
-{
-    size_t i;
-    unsigned char sum[32];
-
-    if( keylen > 64 )
-    {
-        sha2( key, keylen, sum, is224 );
-        keylen = ( is224 ) ? 28 : 32;
-        key = sum;
-    }
-
-    memset( ctx->ipad, 0x36, 64 );
-    memset( ctx->opad, 0x5C, 64 );
-
-    for( i = 0; i < keylen; i++ )
-    {
-        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
-        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
-    }
-
-    sha2_starts( ctx, is224 );
-    sha2_update( ctx, ctx->ipad, 64 );
-
-    memset( sum, 0, sizeof( sum ) );
-}
-
-/*
- * SHA-256 HMAC process buffer
- */
-void sha2_hmac_update( sha2_context *ctx, const unsigned char *input, size_t ilen )
-{
-    sha2_update( ctx, input, ilen );
-}
-
-/*
- * SHA-256 HMAC final digest
- */
-void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] )
-{
-    int is224, hlen;
-    unsigned char tmpbuf[32];
-
-    is224 = ctx->is224;
-    hlen = ( is224 == 0 ) ? 32 : 28;
-
-    sha2_finish( ctx, tmpbuf );
-    sha2_starts( ctx, is224 );
-    sha2_update( ctx, ctx->opad, 64 );
-    sha2_update( ctx, tmpbuf, hlen );
-    sha2_finish( ctx, output );
-
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
-}
-
-/*
- * SHA-256 HMAC context reset
- */
-void sha2_hmac_reset( sha2_context *ctx )
-{
-    sha2_starts( ctx, ctx->is224 );
-    sha2_update( ctx, ctx->ipad, 64 );
-}
-
-/*
- * output = HMAC-SHA-256( hmac key, input buffer )
- */
-void sha2_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[32], int is224 )
-{
-    sha2_context ctx;
-
-    sha2_hmac_starts( &ctx, key, keylen, is224 );
-    sha2_hmac_update( &ctx, input, ilen );
-    sha2_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha2_context ) );
-}
-
-#if defined(POLARSSL_SELF_TEST)
-/*
- * FIPS-180-2 test vectors
- */
-static unsigned char sha2_test_buf[3][57] = 
-{
-    { "abc" },
-    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
-    { "" }
-};
-
-static const int sha2_test_buflen[3] =
-{
-    3, 56, 1000
-};
-
-static const unsigned char sha2_test_sum[6][32] =
-{
-    /*
-     * SHA-224 test vectors
-     */
-    { 0x23, 0x09, 0x7D, 0x22, 0x34, 0x05, 0xD8, 0x22,
-      0x86, 0x42, 0xA4, 0x77, 0xBD, 0xA2, 0x55, 0xB3,
-      0x2A, 0xAD, 0xBC, 0xE4, 0xBD, 0xA0, 0xB3, 0xF7,
-      0xE3, 0x6C, 0x9D, 0xA7 },
-    { 0x75, 0x38, 0x8B, 0x16, 0x51, 0x27, 0x76, 0xCC,
-      0x5D, 0xBA, 0x5D, 0xA1, 0xFD, 0x89, 0x01, 0x50,
-      0xB0, 0xC6, 0x45, 0x5C, 0xB4, 0xF5, 0x8B, 0x19,
-      0x52, 0x52, 0x25, 0x25 },
-    { 0x20, 0x79, 0x46, 0x55, 0x98, 0x0C, 0x91, 0xD8,
-      0xBB, 0xB4, 0xC1, 0xEA, 0x97, 0x61, 0x8A, 0x4B,
-      0xF0, 0x3F, 0x42, 0x58, 0x19, 0x48, 0xB2, 0xEE,
-      0x4E, 0xE7, 0xAD, 0x67 },
-
-    /*
-     * SHA-256 test vectors
-     */
-    { 0xBA, 0x78, 0x16, 0xBF, 0x8F, 0x01, 0xCF, 0xEA,
-      0x41, 0x41, 0x40, 0xDE, 0x5D, 0xAE, 0x22, 0x23,
-      0xB0, 0x03, 0x61, 0xA3, 0x96, 0x17, 0x7A, 0x9C,
-      0xB4, 0x10, 0xFF, 0x61, 0xF2, 0x00, 0x15, 0xAD },
-    { 0x24, 0x8D, 0x6A, 0x61, 0xD2, 0x06, 0x38, 0xB8,
-      0xE5, 0xC0, 0x26, 0x93, 0x0C, 0x3E, 0x60, 0x39,
-      0xA3, 0x3C, 0xE4, 0x59, 0x64, 0xFF, 0x21, 0x67,
-      0xF6, 0xEC, 0xED, 0xD4, 0x19, 0xDB, 0x06, 0xC1 },
-    { 0xCD, 0xC7, 0x6E, 0x5C, 0x99, 0x14, 0xFB, 0x92,
-      0x81, 0xA1, 0xC7, 0xE2, 0x84, 0xD7, 0x3E, 0x67,
-      0xF1, 0x80, 0x9A, 0x48, 0xA4, 0x97, 0x20, 0x0E,
-      0x04, 0x6D, 0x39, 0xCC, 0xC7, 0x11, 0x2C, 0xD0 }
-};
-
-/*
- * RFC 4231 test vectors
- */
-static unsigned char sha2_hmac_test_key[7][26] =
-{
-    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
-      "\x0B\x0B\x0B\x0B" },
-    { "Jefe" },
-    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-      "\xAA\xAA\xAA\xAA" },
-    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
-      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
-    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
-      "\x0C\x0C\x0C\x0C" },
-    { "" }, /* 0xAA 131 times */
-    { "" }
-};
-
-static const int sha2_hmac_test_keylen[7] =
-{
-    20, 4, 20, 25, 20, 131, 131
-};
-
-static unsigned char sha2_hmac_test_buf[7][153] =
-{
-    { "Hi There" },
-    { "what do ya want for nothing?" },
-    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
-    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
-    { "Test With Truncation" },
-    { "Test Using Larger Than Block-Size Key - Hash Key First" },
-    { "This is a test using a larger than block-size key "
-      "and a larger than block-size data. The key needs to "
-      "be hashed before being used by the HMAC algorithm." }
-};
-
-static const int sha2_hmac_test_buflen[7] =
-{
-    8, 28, 50, 50, 20, 54, 152
-};
-
-static const unsigned char sha2_hmac_test_sum[14][32] =
-{
-    /*
-     * HMAC-SHA-224 test vectors
-     */
-    { 0x89, 0x6F, 0xB1, 0x12, 0x8A, 0xBB, 0xDF, 0x19,
-      0x68, 0x32, 0x10, 0x7C, 0xD4, 0x9D, 0xF3, 0x3F,
-      0x47, 0xB4, 0xB1, 0x16, 0x99, 0x12, 0xBA, 0x4F,
-      0x53, 0x68, 0x4B, 0x22 },
-    { 0xA3, 0x0E, 0x01, 0x09, 0x8B, 0xC6, 0xDB, 0xBF,
-      0x45, 0x69, 0x0F, 0x3A, 0x7E, 0x9E, 0x6D, 0x0F,
-      0x8B, 0xBE, 0xA2, 0xA3, 0x9E, 0x61, 0x48, 0x00,
-      0x8F, 0xD0, 0x5E, 0x44 },
-    { 0x7F, 0xB3, 0xCB, 0x35, 0x88, 0xC6, 0xC1, 0xF6,
-      0xFF, 0xA9, 0x69, 0x4D, 0x7D, 0x6A, 0xD2, 0x64,
-      0x93, 0x65, 0xB0, 0xC1, 0xF6, 0x5D, 0x69, 0xD1,
-      0xEC, 0x83, 0x33, 0xEA },
-    { 0x6C, 0x11, 0x50, 0x68, 0x74, 0x01, 0x3C, 0xAC,
-      0x6A, 0x2A, 0xBC, 0x1B, 0xB3, 0x82, 0x62, 0x7C,
-      0xEC, 0x6A, 0x90, 0xD8, 0x6E, 0xFC, 0x01, 0x2D,
-      0xE7, 0xAF, 0xEC, 0x5A },
-    { 0x0E, 0x2A, 0xEA, 0x68, 0xA9, 0x0C, 0x8D, 0x37,
-      0xC9, 0x88, 0xBC, 0xDB, 0x9F, 0xCA, 0x6F, 0xA8 },
-    { 0x95, 0xE9, 0xA0, 0xDB, 0x96, 0x20, 0x95, 0xAD,
-      0xAE, 0xBE, 0x9B, 0x2D, 0x6F, 0x0D, 0xBC, 0xE2,
-      0xD4, 0x99, 0xF1, 0x12, 0xF2, 0xD2, 0xB7, 0x27,
-      0x3F, 0xA6, 0x87, 0x0E },
-    { 0x3A, 0x85, 0x41, 0x66, 0xAC, 0x5D, 0x9F, 0x02,
-      0x3F, 0x54, 0xD5, 0x17, 0xD0, 0xB3, 0x9D, 0xBD,
-      0x94, 0x67, 0x70, 0xDB, 0x9C, 0x2B, 0x95, 0xC9,
-      0xF6, 0xF5, 0x65, 0xD1 },
-
-    /*
-     * HMAC-SHA-256 test vectors
-     */
-    { 0xB0, 0x34, 0x4C, 0x61, 0xD8, 0xDB, 0x38, 0x53,
-      0x5C, 0xA8, 0xAF, 0xCE, 0xAF, 0x0B, 0xF1, 0x2B,
-      0x88, 0x1D, 0xC2, 0x00, 0xC9, 0x83, 0x3D, 0xA7,
-      0x26, 0xE9, 0x37, 0x6C, 0x2E, 0x32, 0xCF, 0xF7 },
-    { 0x5B, 0xDC, 0xC1, 0x46, 0xBF, 0x60, 0x75, 0x4E,
-      0x6A, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xC7,
-      0x5A, 0x00, 0x3F, 0x08, 0x9D, 0x27, 0x39, 0x83,
-      0x9D, 0xEC, 0x58, 0xB9, 0x64, 0xEC, 0x38, 0x43 },
-    { 0x77, 0x3E, 0xA9, 0x1E, 0x36, 0x80, 0x0E, 0x46,
-      0x85, 0x4D, 0xB8, 0xEB, 0xD0, 0x91, 0x81, 0xA7,
-      0x29, 0x59, 0x09, 0x8B, 0x3E, 0xF8, 0xC1, 0x22,
-      0xD9, 0x63, 0x55, 0x14, 0xCE, 0xD5, 0x65, 0xFE },
-    { 0x82, 0x55, 0x8A, 0x38, 0x9A, 0x44, 0x3C, 0x0E,
-      0xA4, 0xCC, 0x81, 0x98, 0x99, 0xF2, 0x08, 0x3A,
-      0x85, 0xF0, 0xFA, 0xA3, 0xE5, 0x78, 0xF8, 0x07,
-      0x7A, 0x2E, 0x3F, 0xF4, 0x67, 0x29, 0x66, 0x5B },
-    { 0xA3, 0xB6, 0x16, 0x74, 0x73, 0x10, 0x0E, 0xE0,
-      0x6E, 0x0C, 0x79, 0x6C, 0x29, 0x55, 0x55, 0x2B },
-    { 0x60, 0xE4, 0x31, 0x59, 0x1E, 0xE0, 0xB6, 0x7F,
-      0x0D, 0x8A, 0x26, 0xAA, 0xCB, 0xF5, 0xB7, 0x7F,
-      0x8E, 0x0B, 0xC6, 0x21, 0x37, 0x28, 0xC5, 0x14,
-      0x05, 0x46, 0x04, 0x0F, 0x0E, 0xE3, 0x7F, 0x54 },
-    { 0x9B, 0x09, 0xFF, 0xA7, 0x1B, 0x94, 0x2F, 0xCB,
-      0x27, 0x63, 0x5F, 0xBC, 0xD5, 0xB0, 0xE9, 0x44,
-      0xBF, 0xDC, 0x63, 0x64, 0x4F, 0x07, 0x13, 0x93,
-      0x8A, 0x7F, 0x51, 0x53, 0x5C, 0x3A, 0x35, 0xE2 }
-};
-
-/*
- * Checkup routine
- */
-int sha2_self_test( int verbose )
-{
-    int i, j, k, buflen;
-    unsigned char buf[1024];
-    unsigned char sha2sum[32];
-    sha2_context ctx;
-
-    for( i = 0; i < 6; i++ )
-    {
-        j = i % 3;
-        k = i < 3;
-
-        if( verbose != 0 )
-            printf( "  SHA-%d test #%d: ", 256 - k * 32, j + 1 );
-
-        sha2_starts( &ctx, k );
-
-        if( j == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
-
-            for( j = 0; j < 1000; j++ )
-                sha2_update( &ctx, buf, buflen );
-        }
-        else
-            sha2_update( &ctx, sha2_test_buf[j],
-                               sha2_test_buflen[j] );
-
-        sha2_finish( &ctx, sha2sum );
-
-        if( memcmp( sha2sum, sha2_test_sum[i], 32 - k * 4 ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    for( i = 0; i < 14; i++ )
-    {
-        j = i % 7;
-        k = i < 7;
-
-        if( verbose != 0 )
-            printf( "  HMAC-SHA-%d test #%d: ", 256 - k * 32, j + 1 );
-
-        if( j == 5 || j == 6 )
-        {
-            memset( buf, '\xAA', buflen = 131 );
-            sha2_hmac_starts( &ctx, buf, buflen, k );
-        }
-        else
-            sha2_hmac_starts( &ctx, sha2_hmac_test_key[j],
-                                    sha2_hmac_test_keylen[j], k );
-
-        sha2_hmac_update( &ctx, sha2_hmac_test_buf[j],
-                                sha2_hmac_test_buflen[j] );
-
-        sha2_hmac_finish( &ctx, sha2sum );
-
-        buflen = ( j == 4 ) ? 16 : 32 - k * 4;
-
-        if( memcmp( sha2sum, sha2_hmac_test_sum[i], buflen ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    return( 0 );
-}
-
-#endif
-
-#endif
diff --git a/Externals/polarssl/library/sha256.c b/Externals/polarssl/library/sha256.c
new file mode 100644
index 0000000000..4fc66982f2
--- /dev/null
+++ b/Externals/polarssl/library/sha256.c
@@ -0,0 +1,742 @@
+/*
+ *  FIPS-180-2 compliant SHA-256 implementation
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The SHA-256 Secure Hash Standard was published by NIST in 2002.
+ *
+ *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_SHA256_C)
+
+#include "polarssl/sha256.h"
+
+#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if !defined(POLARSSL_SHA256_ALT)
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint32_t) (b)[(i)    ] << 24 )             \
+        | ( (uint32_t) (b)[(i) + 1] << 16 )             \
+        | ( (uint32_t) (b)[(i) + 2] <<  8 )             \
+        | ( (uint32_t) (b)[(i) + 3]       );            \
+}
+#endif
+
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+void sha256_init( sha256_context *ctx )
+{
+    memset( ctx, 0, sizeof( sha256_context ) );
+}
+
+void sha256_free( sha256_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( sha256_context ) );
+}
+
+/*
+ * SHA-256 context setup
+ */
+void sha256_starts( sha256_context *ctx, int is224 )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    if( is224 == 0 )
+    {
+        /* SHA-256 */
+        ctx->state[0] = 0x6A09E667;
+        ctx->state[1] = 0xBB67AE85;
+        ctx->state[2] = 0x3C6EF372;
+        ctx->state[3] = 0xA54FF53A;
+        ctx->state[4] = 0x510E527F;
+        ctx->state[5] = 0x9B05688C;
+        ctx->state[6] = 0x1F83D9AB;
+        ctx->state[7] = 0x5BE0CD19;
+    }
+    else
+    {
+        /* SHA-224 */
+        ctx->state[0] = 0xC1059ED8;
+        ctx->state[1] = 0x367CD507;
+        ctx->state[2] = 0x3070DD17;
+        ctx->state[3] = 0xF70E5939;
+        ctx->state[4] = 0xFFC00B31;
+        ctx->state[5] = 0x68581511;
+        ctx->state[6] = 0x64F98FA7;
+        ctx->state[7] = 0xBEFA4FA4;
+    }
+
+    ctx->is224 = is224;
+}
+
+void sha256_process( sha256_context *ctx, const unsigned char data[64] )
+{
+    uint32_t temp1, temp2, W[64];
+    uint32_t A, B, C, D, E, F, G, H;
+
+    GET_UINT32_BE( W[ 0], data,  0 );
+    GET_UINT32_BE( W[ 1], data,  4 );
+    GET_UINT32_BE( W[ 2], data,  8 );
+    GET_UINT32_BE( W[ 3], data, 12 );
+    GET_UINT32_BE( W[ 4], data, 16 );
+    GET_UINT32_BE( W[ 5], data, 20 );
+    GET_UINT32_BE( W[ 6], data, 24 );
+    GET_UINT32_BE( W[ 7], data, 28 );
+    GET_UINT32_BE( W[ 8], data, 32 );
+    GET_UINT32_BE( W[ 9], data, 36 );
+    GET_UINT32_BE( W[10], data, 40 );
+    GET_UINT32_BE( W[11], data, 44 );
+    GET_UINT32_BE( W[12], data, 48 );
+    GET_UINT32_BE( W[13], data, 52 );
+    GET_UINT32_BE( W[14], data, 56 );
+    GET_UINT32_BE( W[15], data, 60 );
+
+#define  SHR(x,n) ((x & 0xFFFFFFFF) >> n)
+#define ROTR(x,n) (SHR(x,n) | (x << (32 - n)))
+
+#define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^  SHR(x, 3))
+#define S1(x) (ROTR(x,17) ^ ROTR(x,19) ^  SHR(x,10))
+
+#define S2(x) (ROTR(x, 2) ^ ROTR(x,13) ^ ROTR(x,22))
+#define S3(x) (ROTR(x, 6) ^ ROTR(x,11) ^ ROTR(x,25))
+
+#define F0(x,y,z) ((x & y) | (z & (x | y)))
+#define F1(x,y,z) (z ^ (x & (y ^ z)))
+
+#define R(t)                                    \
+(                                               \
+    W[t] = S1(W[t -  2]) + W[t -  7] +          \
+           S0(W[t - 15]) + W[t - 16]            \
+)
+
+#define P(a,b,c,d,e,f,g,h,x,K)                  \
+{                                               \
+    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
+    temp2 = S2(a) + F0(a,b,c);                  \
+    d += temp1; h = temp1 + temp2;              \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+    F = ctx->state[5];
+    G = ctx->state[6];
+    H = ctx->state[7];
+
+    P( A, B, C, D, E, F, G, H, W[ 0], 0x428A2F98 );
+    P( H, A, B, C, D, E, F, G, W[ 1], 0x71374491 );
+    P( G, H, A, B, C, D, E, F, W[ 2], 0xB5C0FBCF );
+    P( F, G, H, A, B, C, D, E, W[ 3], 0xE9B5DBA5 );
+    P( E, F, G, H, A, B, C, D, W[ 4], 0x3956C25B );
+    P( D, E, F, G, H, A, B, C, W[ 5], 0x59F111F1 );
+    P( C, D, E, F, G, H, A, B, W[ 6], 0x923F82A4 );
+    P( B, C, D, E, F, G, H, A, W[ 7], 0xAB1C5ED5 );
+    P( A, B, C, D, E, F, G, H, W[ 8], 0xD807AA98 );
+    P( H, A, B, C, D, E, F, G, W[ 9], 0x12835B01 );
+    P( G, H, A, B, C, D, E, F, W[10], 0x243185BE );
+    P( F, G, H, A, B, C, D, E, W[11], 0x550C7DC3 );
+    P( E, F, G, H, A, B, C, D, W[12], 0x72BE5D74 );
+    P( D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE );
+    P( C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7 );
+    P( B, C, D, E, F, G, H, A, W[15], 0xC19BF174 );
+    P( A, B, C, D, E, F, G, H, R(16), 0xE49B69C1 );
+    P( H, A, B, C, D, E, F, G, R(17), 0xEFBE4786 );
+    P( G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6 );
+    P( F, G, H, A, B, C, D, E, R(19), 0x240CA1CC );
+    P( E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F );
+    P( D, E, F, G, H, A, B, C, R(21), 0x4A7484AA );
+    P( C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC );
+    P( B, C, D, E, F, G, H, A, R(23), 0x76F988DA );
+    P( A, B, C, D, E, F, G, H, R(24), 0x983E5152 );
+    P( H, A, B, C, D, E, F, G, R(25), 0xA831C66D );
+    P( G, H, A, B, C, D, E, F, R(26), 0xB00327C8 );
+    P( F, G, H, A, B, C, D, E, R(27), 0xBF597FC7 );
+    P( E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3 );
+    P( D, E, F, G, H, A, B, C, R(29), 0xD5A79147 );
+    P( C, D, E, F, G, H, A, B, R(30), 0x06CA6351 );
+    P( B, C, D, E, F, G, H, A, R(31), 0x14292967 );
+    P( A, B, C, D, E, F, G, H, R(32), 0x27B70A85 );
+    P( H, A, B, C, D, E, F, G, R(33), 0x2E1B2138 );
+    P( G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC );
+    P( F, G, H, A, B, C, D, E, R(35), 0x53380D13 );
+    P( E, F, G, H, A, B, C, D, R(36), 0x650A7354 );
+    P( D, E, F, G, H, A, B, C, R(37), 0x766A0ABB );
+    P( C, D, E, F, G, H, A, B, R(38), 0x81C2C92E );
+    P( B, C, D, E, F, G, H, A, R(39), 0x92722C85 );
+    P( A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1 );
+    P( H, A, B, C, D, E, F, G, R(41), 0xA81A664B );
+    P( G, H, A, B, C, D, E, F, R(42), 0xC24B8B70 );
+    P( F, G, H, A, B, C, D, E, R(43), 0xC76C51A3 );
+    P( E, F, G, H, A, B, C, D, R(44), 0xD192E819 );
+    P( D, E, F, G, H, A, B, C, R(45), 0xD6990624 );
+    P( C, D, E, F, G, H, A, B, R(46), 0xF40E3585 );
+    P( B, C, D, E, F, G, H, A, R(47), 0x106AA070 );
+    P( A, B, C, D, E, F, G, H, R(48), 0x19A4C116 );
+    P( H, A, B, C, D, E, F, G, R(49), 0x1E376C08 );
+    P( G, H, A, B, C, D, E, F, R(50), 0x2748774C );
+    P( F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5 );
+    P( E, F, G, H, A, B, C, D, R(52), 0x391C0CB3 );
+    P( D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A );
+    P( C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F );
+    P( B, C, D, E, F, G, H, A, R(55), 0x682E6FF3 );
+    P( A, B, C, D, E, F, G, H, R(56), 0x748F82EE );
+    P( H, A, B, C, D, E, F, G, R(57), 0x78A5636F );
+    P( G, H, A, B, C, D, E, F, R(58), 0x84C87814 );
+    P( F, G, H, A, B, C, D, E, R(59), 0x8CC70208 );
+    P( E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA );
+    P( D, E, F, G, H, A, B, C, R(61), 0xA4506CEB );
+    P( C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7 );
+    P( B, C, D, E, F, G, H, A, R(63), 0xC67178F2 );
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+    ctx->state[5] += F;
+    ctx->state[6] += G;
+    ctx->state[7] += H;
+}
+
+/*
+ * SHA-256 process buffer
+ */
+void sha256_update( sha256_context *ctx, const unsigned char *input,
+                    size_t ilen )
+{
+    size_t fill;
+    uint32_t left;
+
+    if( ilen == 0 )
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += (uint32_t) ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < (uint32_t) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, fill );
+        sha256_process( ctx, ctx->buffer );
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 64 )
+    {
+        sha256_process( ctx, input );
+        input += 64;
+        ilen  -= 64;
+    }
+
+    if( ilen > 0 )
+        memcpy( (void *) (ctx->buffer + left), input, ilen );
+}
+
+static const unsigned char sha256_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * SHA-256 final digest
+ */
+void sha256_finish( sha256_context *ctx, unsigned char output[32] )
+{
+    uint32_t last, padn;
+    uint32_t high, low;
+    unsigned char msglen[8];
+
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT32_BE( high, msglen, 0 );
+    PUT_UINT32_BE( low,  msglen, 4 );
+
+    last = ctx->total[0] & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    sha256_update( ctx, sha256_padding, padn );
+    sha256_update( ctx, msglen, 8 );
+
+    PUT_UINT32_BE( ctx->state[0], output,  0 );
+    PUT_UINT32_BE( ctx->state[1], output,  4 );
+    PUT_UINT32_BE( ctx->state[2], output,  8 );
+    PUT_UINT32_BE( ctx->state[3], output, 12 );
+    PUT_UINT32_BE( ctx->state[4], output, 16 );
+    PUT_UINT32_BE( ctx->state[5], output, 20 );
+    PUT_UINT32_BE( ctx->state[6], output, 24 );
+
+    if( ctx->is224 == 0 )
+        PUT_UINT32_BE( ctx->state[7], output, 28 );
+}
+
+#endif /* !POLARSSL_SHA256_ALT */
+
+/*
+ * output = SHA-256( input buffer )
+ */
+void sha256( const unsigned char *input, size_t ilen,
+             unsigned char output[32], int is224 )
+{
+    sha256_context ctx;
+
+    sha256_init( &ctx );
+    sha256_starts( &ctx, is224 );
+    sha256_update( &ctx, input, ilen );
+    sha256_finish( &ctx, output );
+    sha256_free( &ctx );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * output = SHA-256( file contents )
+ */
+int sha256_file( const char *path, unsigned char output[32], int is224 )
+{
+    FILE *f;
+    size_t n;
+    sha256_context ctx;
+    unsigned char buf[1024];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_SHA256_FILE_IO_ERROR );
+
+    sha256_init( &ctx );
+    sha256_starts( &ctx, is224 );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        sha256_update( &ctx, buf, n );
+
+    sha256_finish( &ctx, output );
+    sha256_free( &ctx );
+
+    if( ferror( f ) != 0 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_SHA256_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+    return( 0 );
+}
+#endif /* POLARSSL_FS_IO */
+
+/*
+ * SHA-256 HMAC context setup
+ */
+void sha256_hmac_starts( sha256_context *ctx, const unsigned char *key,
+                         size_t keylen, int is224 )
+{
+    size_t i;
+    unsigned char sum[32];
+
+    if( keylen > 64 )
+    {
+        sha256( key, keylen, sum, is224 );
+        keylen = ( is224 ) ? 28 : 32;
+        key = sum;
+    }
+
+    memset( ctx->ipad, 0x36, 64 );
+    memset( ctx->opad, 0x5C, 64 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
+        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
+    }
+
+    sha256_starts( ctx, is224 );
+    sha256_update( ctx, ctx->ipad, 64 );
+
+    polarssl_zeroize( sum, sizeof( sum ) );
+}
+
+/*
+ * SHA-256 HMAC process buffer
+ */
+void sha256_hmac_update( sha256_context *ctx, const unsigned char *input,
+                         size_t ilen )
+{
+    sha256_update( ctx, input, ilen );
+}
+
+/*
+ * SHA-256 HMAC final digest
+ */
+void sha256_hmac_finish( sha256_context *ctx, unsigned char output[32] )
+{
+    int is224, hlen;
+    unsigned char tmpbuf[32];
+
+    is224 = ctx->is224;
+    hlen = ( is224 == 0 ) ? 32 : 28;
+
+    sha256_finish( ctx, tmpbuf );
+    sha256_starts( ctx, is224 );
+    sha256_update( ctx, ctx->opad, 64 );
+    sha256_update( ctx, tmpbuf, hlen );
+    sha256_finish( ctx, output );
+
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
+}
+
+/*
+ * SHA-256 HMAC context reset
+ */
+void sha256_hmac_reset( sha256_context *ctx )
+{
+    sha256_starts( ctx, ctx->is224 );
+    sha256_update( ctx, ctx->ipad, 64 );
+}
+
+/*
+ * output = HMAC-SHA-256( hmac key, input buffer )
+ */
+void sha256_hmac( const unsigned char *key, size_t keylen,
+                  const unsigned char *input, size_t ilen,
+                  unsigned char output[32], int is224 )
+{
+    sha256_context ctx;
+
+    sha256_init( &ctx );
+    sha256_hmac_starts( &ctx, key, keylen, is224 );
+    sha256_hmac_update( &ctx, input, ilen );
+    sha256_hmac_finish( &ctx, output );
+    sha256_free( &ctx );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+/*
+ * FIPS-180-2 test vectors
+ */
+static unsigned char sha256_test_buf[3][57] =
+{
+    { "abc" },
+    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
+    { "" }
+};
+
+static const int sha256_test_buflen[3] =
+{
+    3, 56, 1000
+};
+
+static const unsigned char sha256_test_sum[6][32] =
+{
+    /*
+     * SHA-224 test vectors
+     */
+    { 0x23, 0x09, 0x7D, 0x22, 0x34, 0x05, 0xD8, 0x22,
+      0x86, 0x42, 0xA4, 0x77, 0xBD, 0xA2, 0x55, 0xB3,
+      0x2A, 0xAD, 0xBC, 0xE4, 0xBD, 0xA0, 0xB3, 0xF7,
+      0xE3, 0x6C, 0x9D, 0xA7 },
+    { 0x75, 0x38, 0x8B, 0x16, 0x51, 0x27, 0x76, 0xCC,
+      0x5D, 0xBA, 0x5D, 0xA1, 0xFD, 0x89, 0x01, 0x50,
+      0xB0, 0xC6, 0x45, 0x5C, 0xB4, 0xF5, 0x8B, 0x19,
+      0x52, 0x52, 0x25, 0x25 },
+    { 0x20, 0x79, 0x46, 0x55, 0x98, 0x0C, 0x91, 0xD8,
+      0xBB, 0xB4, 0xC1, 0xEA, 0x97, 0x61, 0x8A, 0x4B,
+      0xF0, 0x3F, 0x42, 0x58, 0x19, 0x48, 0xB2, 0xEE,
+      0x4E, 0xE7, 0xAD, 0x67 },
+
+    /*
+     * SHA-256 test vectors
+     */
+    { 0xBA, 0x78, 0x16, 0xBF, 0x8F, 0x01, 0xCF, 0xEA,
+      0x41, 0x41, 0x40, 0xDE, 0x5D, 0xAE, 0x22, 0x23,
+      0xB0, 0x03, 0x61, 0xA3, 0x96, 0x17, 0x7A, 0x9C,
+      0xB4, 0x10, 0xFF, 0x61, 0xF2, 0x00, 0x15, 0xAD },
+    { 0x24, 0x8D, 0x6A, 0x61, 0xD2, 0x06, 0x38, 0xB8,
+      0xE5, 0xC0, 0x26, 0x93, 0x0C, 0x3E, 0x60, 0x39,
+      0xA3, 0x3C, 0xE4, 0x59, 0x64, 0xFF, 0x21, 0x67,
+      0xF6, 0xEC, 0xED, 0xD4, 0x19, 0xDB, 0x06, 0xC1 },
+    { 0xCD, 0xC7, 0x6E, 0x5C, 0x99, 0x14, 0xFB, 0x92,
+      0x81, 0xA1, 0xC7, 0xE2, 0x84, 0xD7, 0x3E, 0x67,
+      0xF1, 0x80, 0x9A, 0x48, 0xA4, 0x97, 0x20, 0x0E,
+      0x04, 0x6D, 0x39, 0xCC, 0xC7, 0x11, 0x2C, 0xD0 }
+};
+
+/*
+ * RFC 4231 test vectors
+ */
+static unsigned char sha256_hmac_test_key[7][26] =
+{
+    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
+      "\x0B\x0B\x0B\x0B" },
+    { "Jefe" },
+    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
+      "\xAA\xAA\xAA\xAA" },
+    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
+    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
+      "\x0C\x0C\x0C\x0C" },
+    { "" }, /* 0xAA 131 times */
+    { "" }
+};
+
+static const int sha256_hmac_test_keylen[7] =
+{
+    20, 4, 20, 25, 20, 131, 131
+};
+
+static unsigned char sha256_hmac_test_buf[7][153] =
+{
+    { "Hi There" },
+    { "what do ya want for nothing?" },
+    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
+    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
+    { "Test With Truncation" },
+    { "Test Using Larger Than Block-Size Key - Hash Key First" },
+    { "This is a test using a larger than block-size key "
+      "and a larger than block-size data. The key needs to "
+      "be hashed before being used by the HMAC algorithm." }
+};
+
+static const int sha256_hmac_test_buflen[7] =
+{
+    8, 28, 50, 50, 20, 54, 152
+};
+
+static const unsigned char sha256_hmac_test_sum[14][32] =
+{
+    /*
+     * HMAC-SHA-224 test vectors
+     */
+    { 0x89, 0x6F, 0xB1, 0x12, 0x8A, 0xBB, 0xDF, 0x19,
+      0x68, 0x32, 0x10, 0x7C, 0xD4, 0x9D, 0xF3, 0x3F,
+      0x47, 0xB4, 0xB1, 0x16, 0x99, 0x12, 0xBA, 0x4F,
+      0x53, 0x68, 0x4B, 0x22 },
+    { 0xA3, 0x0E, 0x01, 0x09, 0x8B, 0xC6, 0xDB, 0xBF,
+      0x45, 0x69, 0x0F, 0x3A, 0x7E, 0x9E, 0x6D, 0x0F,
+      0x8B, 0xBE, 0xA2, 0xA3, 0x9E, 0x61, 0x48, 0x00,
+      0x8F, 0xD0, 0x5E, 0x44 },
+    { 0x7F, 0xB3, 0xCB, 0x35, 0x88, 0xC6, 0xC1, 0xF6,
+      0xFF, 0xA9, 0x69, 0x4D, 0x7D, 0x6A, 0xD2, 0x64,
+      0x93, 0x65, 0xB0, 0xC1, 0xF6, 0x5D, 0x69, 0xD1,
+      0xEC, 0x83, 0x33, 0xEA },
+    { 0x6C, 0x11, 0x50, 0x68, 0x74, 0x01, 0x3C, 0xAC,
+      0x6A, 0x2A, 0xBC, 0x1B, 0xB3, 0x82, 0x62, 0x7C,
+      0xEC, 0x6A, 0x90, 0xD8, 0x6E, 0xFC, 0x01, 0x2D,
+      0xE7, 0xAF, 0xEC, 0x5A },
+    { 0x0E, 0x2A, 0xEA, 0x68, 0xA9, 0x0C, 0x8D, 0x37,
+      0xC9, 0x88, 0xBC, 0xDB, 0x9F, 0xCA, 0x6F, 0xA8 },
+    { 0x95, 0xE9, 0xA0, 0xDB, 0x96, 0x20, 0x95, 0xAD,
+      0xAE, 0xBE, 0x9B, 0x2D, 0x6F, 0x0D, 0xBC, 0xE2,
+      0xD4, 0x99, 0xF1, 0x12, 0xF2, 0xD2, 0xB7, 0x27,
+      0x3F, 0xA6, 0x87, 0x0E },
+    { 0x3A, 0x85, 0x41, 0x66, 0xAC, 0x5D, 0x9F, 0x02,
+      0x3F, 0x54, 0xD5, 0x17, 0xD0, 0xB3, 0x9D, 0xBD,
+      0x94, 0x67, 0x70, 0xDB, 0x9C, 0x2B, 0x95, 0xC9,
+      0xF6, 0xF5, 0x65, 0xD1 },
+
+    /*
+     * HMAC-SHA-256 test vectors
+     */
+    { 0xB0, 0x34, 0x4C, 0x61, 0xD8, 0xDB, 0x38, 0x53,
+      0x5C, 0xA8, 0xAF, 0xCE, 0xAF, 0x0B, 0xF1, 0x2B,
+      0x88, 0x1D, 0xC2, 0x00, 0xC9, 0x83, 0x3D, 0xA7,
+      0x26, 0xE9, 0x37, 0x6C, 0x2E, 0x32, 0xCF, 0xF7 },
+    { 0x5B, 0xDC, 0xC1, 0x46, 0xBF, 0x60, 0x75, 0x4E,
+      0x6A, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xC7,
+      0x5A, 0x00, 0x3F, 0x08, 0x9D, 0x27, 0x39, 0x83,
+      0x9D, 0xEC, 0x58, 0xB9, 0x64, 0xEC, 0x38, 0x43 },
+    { 0x77, 0x3E, 0xA9, 0x1E, 0x36, 0x80, 0x0E, 0x46,
+      0x85, 0x4D, 0xB8, 0xEB, 0xD0, 0x91, 0x81, 0xA7,
+      0x29, 0x59, 0x09, 0x8B, 0x3E, 0xF8, 0xC1, 0x22,
+      0xD9, 0x63, 0x55, 0x14, 0xCE, 0xD5, 0x65, 0xFE },
+    { 0x82, 0x55, 0x8A, 0x38, 0x9A, 0x44, 0x3C, 0x0E,
+      0xA4, 0xCC, 0x81, 0x98, 0x99, 0xF2, 0x08, 0x3A,
+      0x85, 0xF0, 0xFA, 0xA3, 0xE5, 0x78, 0xF8, 0x07,
+      0x7A, 0x2E, 0x3F, 0xF4, 0x67, 0x29, 0x66, 0x5B },
+    { 0xA3, 0xB6, 0x16, 0x74, 0x73, 0x10, 0x0E, 0xE0,
+      0x6E, 0x0C, 0x79, 0x6C, 0x29, 0x55, 0x55, 0x2B },
+    { 0x60, 0xE4, 0x31, 0x59, 0x1E, 0xE0, 0xB6, 0x7F,
+      0x0D, 0x8A, 0x26, 0xAA, 0xCB, 0xF5, 0xB7, 0x7F,
+      0x8E, 0x0B, 0xC6, 0x21, 0x37, 0x28, 0xC5, 0x14,
+      0x05, 0x46, 0x04, 0x0F, 0x0E, 0xE3, 0x7F, 0x54 },
+    { 0x9B, 0x09, 0xFF, 0xA7, 0x1B, 0x94, 0x2F, 0xCB,
+      0x27, 0x63, 0x5F, 0xBC, 0xD5, 0xB0, 0xE9, 0x44,
+      0xBF, 0xDC, 0x63, 0x64, 0x4F, 0x07, 0x13, 0x93,
+      0x8A, 0x7F, 0x51, 0x53, 0x5C, 0x3A, 0x35, 0xE2 }
+};
+
+/*
+ * Checkup routine
+ */
+int sha256_self_test( int verbose )
+{
+    int i, j, k, buflen, ret = 0;
+    unsigned char buf[1024];
+    unsigned char sha256sum[32];
+    sha256_context ctx;
+
+    sha256_init( &ctx );
+
+    for( i = 0; i < 6; i++ )
+    {
+        j = i % 3;
+        k = i < 3;
+
+        if( verbose != 0 )
+            polarssl_printf( "  SHA-%d test #%d: ", 256 - k * 32, j + 1 );
+
+        sha256_starts( &ctx, k );
+
+        if( j == 2 )
+        {
+            memset( buf, 'a', buflen = 1000 );
+
+            for( j = 0; j < 1000; j++ )
+                sha256_update( &ctx, buf, buflen );
+        }
+        else
+            sha256_update( &ctx, sha256_test_buf[j],
+                                 sha256_test_buflen[j] );
+
+        sha256_finish( &ctx, sha256sum );
+
+        if( memcmp( sha256sum, sha256_test_sum[i], 32 - k * 4 ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    for( i = 0; i < 14; i++ )
+    {
+        j = i % 7;
+        k = i < 7;
+
+        if( verbose != 0 )
+            polarssl_printf( "  HMAC-SHA-%d test #%d: ", 256 - k * 32, j + 1 );
+
+        if( j == 5 || j == 6 )
+        {
+            memset( buf, '\xAA', buflen = 131 );
+            sha256_hmac_starts( &ctx, buf, buflen, k );
+        }
+        else
+            sha256_hmac_starts( &ctx, sha256_hmac_test_key[j],
+                                      sha256_hmac_test_keylen[j], k );
+
+        sha256_hmac_update( &ctx, sha256_hmac_test_buf[j],
+                                  sha256_hmac_test_buflen[j] );
+
+        sha256_hmac_finish( &ctx, sha256sum );
+
+        buflen = ( j == 4 ) ? 16 : 32 - k * 4;
+
+        if( memcmp( sha256sum, sha256_hmac_test_sum[i], buflen ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+exit:
+    sha256_free( &ctx );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_SHA256_C */
diff --git a/Externals/polarssl/library/sha4.c b/Externals/polarssl/library/sha4.c
deleted file mode 100644
index 466420abf5..0000000000
--- a/Externals/polarssl/library/sha4.c
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
- *  FIPS-180-2 compliant SHA-384/512 implementation
- *
- *  Copyright (C) 2006-2013, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  The SHA-512 Secure Hash Standard was published by NIST in 2002.
- *
- *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
- */
-
-#include "polarssl/config.h"
-
-#if defined(POLARSSL_SHA4_C)
-
-#include "polarssl/sha4.h"
-
-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
-#include <stdio.h>
-#endif
-
-#if !defined(POLARSSL_SHA4_ALT)
-
-/*
- * 64-bit integer manipulation macros (big endian)
- */
-#ifndef GET_UINT64_BE
-#define GET_UINT64_BE(n,b,i)                            \
-{                                                       \
-    (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
-        | ( (uint64_t) (b)[(i) + 1] << 48 )       \
-        | ( (uint64_t) (b)[(i) + 2] << 40 )       \
-        | ( (uint64_t) (b)[(i) + 3] << 32 )       \
-        | ( (uint64_t) (b)[(i) + 4] << 24 )       \
-        | ( (uint64_t) (b)[(i) + 5] << 16 )       \
-        | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
-        | ( (uint64_t) (b)[(i) + 7]       );      \
-}
-#endif
-
-#ifndef PUT_UINT64_BE
-#define PUT_UINT64_BE(n,b,i)                            \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 56 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 48 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >> 40 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n) >> 32 );       \
-    (b)[(i) + 4] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 5] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 6] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 7] = (unsigned char) ( (n)       );       \
-}
-#endif
-
-/*
- * Round constants
- */
-static const uint64_t K[80] =
-{
-    UL64(0x428A2F98D728AE22),  UL64(0x7137449123EF65CD),
-    UL64(0xB5C0FBCFEC4D3B2F),  UL64(0xE9B5DBA58189DBBC),
-    UL64(0x3956C25BF348B538),  UL64(0x59F111F1B605D019),
-    UL64(0x923F82A4AF194F9B),  UL64(0xAB1C5ED5DA6D8118),
-    UL64(0xD807AA98A3030242),  UL64(0x12835B0145706FBE),
-    UL64(0x243185BE4EE4B28C),  UL64(0x550C7DC3D5FFB4E2),
-    UL64(0x72BE5D74F27B896F),  UL64(0x80DEB1FE3B1696B1),
-    UL64(0x9BDC06A725C71235),  UL64(0xC19BF174CF692694),
-    UL64(0xE49B69C19EF14AD2),  UL64(0xEFBE4786384F25E3),
-    UL64(0x0FC19DC68B8CD5B5),  UL64(0x240CA1CC77AC9C65),
-    UL64(0x2DE92C6F592B0275),  UL64(0x4A7484AA6EA6E483),
-    UL64(0x5CB0A9DCBD41FBD4),  UL64(0x76F988DA831153B5),
-    UL64(0x983E5152EE66DFAB),  UL64(0xA831C66D2DB43210),
-    UL64(0xB00327C898FB213F),  UL64(0xBF597FC7BEEF0EE4),
-    UL64(0xC6E00BF33DA88FC2),  UL64(0xD5A79147930AA725),
-    UL64(0x06CA6351E003826F),  UL64(0x142929670A0E6E70),
-    UL64(0x27B70A8546D22FFC),  UL64(0x2E1B21385C26C926),
-    UL64(0x4D2C6DFC5AC42AED),  UL64(0x53380D139D95B3DF),
-    UL64(0x650A73548BAF63DE),  UL64(0x766A0ABB3C77B2A8),
-    UL64(0x81C2C92E47EDAEE6),  UL64(0x92722C851482353B),
-    UL64(0xA2BFE8A14CF10364),  UL64(0xA81A664BBC423001),
-    UL64(0xC24B8B70D0F89791),  UL64(0xC76C51A30654BE30),
-    UL64(0xD192E819D6EF5218),  UL64(0xD69906245565A910),
-    UL64(0xF40E35855771202A),  UL64(0x106AA07032BBD1B8),
-    UL64(0x19A4C116B8D2D0C8),  UL64(0x1E376C085141AB53),
-    UL64(0x2748774CDF8EEB99),  UL64(0x34B0BCB5E19B48A8),
-    UL64(0x391C0CB3C5C95A63),  UL64(0x4ED8AA4AE3418ACB),
-    UL64(0x5B9CCA4F7763E373),  UL64(0x682E6FF3D6B2B8A3),
-    UL64(0x748F82EE5DEFB2FC),  UL64(0x78A5636F43172F60),
-    UL64(0x84C87814A1F0AB72),  UL64(0x8CC702081A6439EC),
-    UL64(0x90BEFFFA23631E28),  UL64(0xA4506CEBDE82BDE9),
-    UL64(0xBEF9A3F7B2C67915),  UL64(0xC67178F2E372532B),
-    UL64(0xCA273ECEEA26619C),  UL64(0xD186B8C721C0C207),
-    UL64(0xEADA7DD6CDE0EB1E),  UL64(0xF57D4F7FEE6ED178),
-    UL64(0x06F067AA72176FBA),  UL64(0x0A637DC5A2C898A6),
-    UL64(0x113F9804BEF90DAE),  UL64(0x1B710B35131C471B),
-    UL64(0x28DB77F523047D84),  UL64(0x32CAAB7B40C72493),
-    UL64(0x3C9EBE0A15C9BEBC),  UL64(0x431D67C49C100D4C),
-    UL64(0x4CC5D4BECB3E42B6),  UL64(0x597F299CFC657E2A),
-    UL64(0x5FCB6FAB3AD6FAEC),  UL64(0x6C44198C4A475817)
-};
-
-/*
- * SHA-512 context setup
- */
-void sha4_starts( sha4_context *ctx, int is384 )
-{
-    ctx->total[0] = 0;
-    ctx->total[1] = 0;
-
-    if( is384 == 0 )
-    {
-        /* SHA-512 */
-        ctx->state[0] = UL64(0x6A09E667F3BCC908);
-        ctx->state[1] = UL64(0xBB67AE8584CAA73B);
-        ctx->state[2] = UL64(0x3C6EF372FE94F82B);
-        ctx->state[3] = UL64(0xA54FF53A5F1D36F1);
-        ctx->state[4] = UL64(0x510E527FADE682D1);
-        ctx->state[5] = UL64(0x9B05688C2B3E6C1F);
-        ctx->state[6] = UL64(0x1F83D9ABFB41BD6B);
-        ctx->state[7] = UL64(0x5BE0CD19137E2179);
-    }
-    else
-    {
-        /* SHA-384 */
-        ctx->state[0] = UL64(0xCBBB9D5DC1059ED8);
-        ctx->state[1] = UL64(0x629A292A367CD507);
-        ctx->state[2] = UL64(0x9159015A3070DD17);
-        ctx->state[3] = UL64(0x152FECD8F70E5939);
-        ctx->state[4] = UL64(0x67332667FFC00B31);
-        ctx->state[5] = UL64(0x8EB44A8768581511);
-        ctx->state[6] = UL64(0xDB0C2E0D64F98FA7);
-        ctx->state[7] = UL64(0x47B5481DBEFA4FA4);
-    }
-
-    ctx->is384 = is384;
-}
-
-static void sha4_process( sha4_context *ctx, const unsigned char data[128] )
-{
-    int i;
-    uint64_t temp1, temp2, W[80];
-    uint64_t A, B, C, D, E, F, G, H;
-
-#define  SHR(x,n) (x >> n)
-#define ROTR(x,n) (SHR(x,n) | (x << (64 - n)))
-
-#define S0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^  SHR(x, 7))
-#define S1(x) (ROTR(x,19) ^ ROTR(x,61) ^  SHR(x, 6))
-
-#define S2(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
-#define S3(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
-
-#define F0(x,y,z) ((x & y) | (z & (x | y)))
-#define F1(x,y,z) (z ^ (x & (y ^ z)))
-
-#define P(a,b,c,d,e,f,g,h,x,K)                  \
-{                                               \
-    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
-    temp2 = S2(a) + F0(a,b,c);                  \
-    d += temp1; h = temp1 + temp2;              \
-}
-
-    for( i = 0; i < 16; i++ )
-    {
-        GET_UINT64_BE( W[i], data, i << 3 );
-    }
-
-    for( ; i < 80; i++ )
-    {
-        W[i] = S1(W[i -  2]) + W[i -  7] +
-               S0(W[i - 15]) + W[i - 16];
-    }
-
-    A = ctx->state[0];
-    B = ctx->state[1];
-    C = ctx->state[2];
-    D = ctx->state[3];
-    E = ctx->state[4];
-    F = ctx->state[5];
-    G = ctx->state[6];
-    H = ctx->state[7];
-    i = 0;
-
-    do
-    {
-        P( A, B, C, D, E, F, G, H, W[i], K[i] ); i++;
-        P( H, A, B, C, D, E, F, G, W[i], K[i] ); i++;
-        P( G, H, A, B, C, D, E, F, W[i], K[i] ); i++;
-        P( F, G, H, A, B, C, D, E, W[i], K[i] ); i++;
-        P( E, F, G, H, A, B, C, D, W[i], K[i] ); i++;
-        P( D, E, F, G, H, A, B, C, W[i], K[i] ); i++;
-        P( C, D, E, F, G, H, A, B, W[i], K[i] ); i++;
-        P( B, C, D, E, F, G, H, A, W[i], K[i] ); i++;
-    }
-    while( i < 80 );
-
-    ctx->state[0] += A;
-    ctx->state[1] += B;
-    ctx->state[2] += C;
-    ctx->state[3] += D;
-    ctx->state[4] += E;
-    ctx->state[5] += F;
-    ctx->state[6] += G;
-    ctx->state[7] += H;
-}
-
-/*
- * SHA-512 process buffer
- */
-void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen )
-{
-    size_t fill;
-    unsigned int left;
-
-    if( ilen <= 0 )
-        return;
-
-    left = (unsigned int) (ctx->total[0] & 0x7F);
-    fill = 128 - left;
-
-    ctx->total[0] += (uint64_t) ilen;
-
-    if( ctx->total[0] < (uint64_t) ilen )
-        ctx->total[1]++;
-
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), input, fill );
-        sha4_process( ctx, ctx->buffer );
-        input += fill;
-        ilen  -= fill;
-        left = 0;
-    }
-
-    while( ilen >= 128 )
-    {
-        sha4_process( ctx, input );
-        input += 128;
-        ilen  -= 128;
-    }
-
-    if( ilen > 0 )
-        memcpy( (void *) (ctx->buffer + left), input, ilen );
-}
-
-static const unsigned char sha4_padding[128] =
-{
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/*
- * SHA-512 final digest
- */
-void sha4_finish( sha4_context *ctx, unsigned char output[64] )
-{
-    size_t last, padn;
-    uint64_t high, low;
-    unsigned char msglen[16];
-
-    high = ( ctx->total[0] >> 61 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
-
-    PUT_UINT64_BE( high, msglen, 0 );
-    PUT_UINT64_BE( low,  msglen, 8 );
-
-    last = (size_t)( ctx->total[0] & 0x7F );
-    padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last );
-
-    sha4_update( ctx, sha4_padding, padn );
-    sha4_update( ctx, msglen, 16 );
-
-    PUT_UINT64_BE( ctx->state[0], output,  0 );
-    PUT_UINT64_BE( ctx->state[1], output,  8 );
-    PUT_UINT64_BE( ctx->state[2], output, 16 );
-    PUT_UINT64_BE( ctx->state[3], output, 24 );
-    PUT_UINT64_BE( ctx->state[4], output, 32 );
-    PUT_UINT64_BE( ctx->state[5], output, 40 );
-
-    if( ctx->is384 == 0 )
-    {
-        PUT_UINT64_BE( ctx->state[6], output, 48 );
-        PUT_UINT64_BE( ctx->state[7], output, 56 );
-    }
-}
-
-#endif /* !POLARSSL_SHA4_ALT */
-
-/*
- * output = SHA-512( input buffer )
- */
-void sha4( const unsigned char *input, size_t ilen,
-           unsigned char output[64], int is384 )
-{
-    sha4_context ctx;
-
-    sha4_starts( &ctx, is384 );
-    sha4_update( &ctx, input, ilen );
-    sha4_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha4_context ) );
-}
-
-#if defined(POLARSSL_FS_IO)
-/*
- * output = SHA-512( file contents )
- */
-int sha4_file( const char *path, unsigned char output[64], int is384 )
-{
-    FILE *f;
-    size_t n;
-    sha4_context ctx;
-    unsigned char buf[1024];
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( POLARSSL_ERR_SHA4_FILE_IO_ERROR );
-
-    sha4_starts( &ctx, is384 );
-
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        sha4_update( &ctx, buf, n );
-
-    sha4_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha4_context ) );
-
-    if( ferror( f ) != 0 )
-    {
-        fclose( f );
-        return( POLARSSL_ERR_SHA4_FILE_IO_ERROR );
-    }
-
-    fclose( f );
-    return( 0 );
-}
-#endif /* POLARSSL_FS_IO */
-
-/*
- * SHA-512 HMAC context setup
- */
-void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keylen,
-                       int is384 )
-{
-    size_t i;
-    unsigned char sum[64];
-
-    if( keylen > 128 )
-    {
-        sha4( key, keylen, sum, is384 );
-        keylen = ( is384 ) ? 48 : 64;
-        key = sum;
-    }
-
-    memset( ctx->ipad, 0x36, 128 );
-    memset( ctx->opad, 0x5C, 128 );
-
-    for( i = 0; i < keylen; i++ )
-    {
-        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
-        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
-    }
-
-    sha4_starts( ctx, is384 );
-    sha4_update( ctx, ctx->ipad, 128 );
-
-    memset( sum, 0, sizeof( sum ) );
-}
-
-/*
- * SHA-512 HMAC process buffer
- */
-void sha4_hmac_update( sha4_context  *ctx,
-                       const unsigned char *input, size_t ilen )
-{
-    sha4_update( ctx, input, ilen );
-}
-
-/*
- * SHA-512 HMAC final digest
- */
-void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] )
-{
-    int is384, hlen;
-    unsigned char tmpbuf[64];
-
-    is384 = ctx->is384;
-    hlen = ( is384 == 0 ) ? 64 : 48;
-
-    sha4_finish( ctx, tmpbuf );
-    sha4_starts( ctx, is384 );
-    sha4_update( ctx, ctx->opad, 128 );
-    sha4_update( ctx, tmpbuf, hlen );
-    sha4_finish( ctx, output );
-
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
-}
-
-/*
- * SHA-512 HMAC context reset
- */
-void sha4_hmac_reset( sha4_context *ctx )
-{
-    sha4_starts( ctx, ctx->is384 );
-    sha4_update( ctx, ctx->ipad, 128 );
-}
-
-/*
- * output = HMAC-SHA-512( hmac key, input buffer )
- */
-void sha4_hmac( const unsigned char *key, size_t keylen,
-                const unsigned char *input, size_t ilen,
-                unsigned char output[64], int is384 )
-{
-    sha4_context ctx;
-
-    sha4_hmac_starts( &ctx, key, keylen, is384 );
-    sha4_hmac_update( &ctx, input, ilen );
-    sha4_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha4_context ) );
-}
-
-#if defined(POLARSSL_SELF_TEST)
-
-/*
- * FIPS-180-2 test vectors
- */
-static unsigned char sha4_test_buf[3][113] = 
-{
-    { "abc" },
-    { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-      "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
-    { "" }
-};
-
-static const int sha4_test_buflen[3] =
-{
-    3, 112, 1000
-};
-
-static const unsigned char sha4_test_sum[6][64] =
-{
-    /*
-     * SHA-384 test vectors
-     */
-    { 0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B,
-      0xB5, 0xA0, 0x3D, 0x69, 0x9A, 0xC6, 0x50, 0x07,
-      0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE, 0xD1, 0x63,
-      0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
-      0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23,
-      0x58, 0xBA, 0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7 },
-    { 0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8,
-      0x3D, 0x19, 0x2F, 0xC7, 0x82, 0xCD, 0x1B, 0x47,
-      0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B, 0x05, 0xD2,
-      0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
-      0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9,
-      0x66, 0xC3, 0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39 },
-    { 0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB,
-      0x08, 0x6E, 0x83, 0x4E, 0x31, 0x0A, 0x4A, 0x1C,
-      0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2, 0x48, 0x52,
-      0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
-      0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB,
-      0xAE, 0x97, 0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85 },
-
-    /*
-     * SHA-512 test vectors
-     */
-    { 0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA,
-      0xCC, 0x41, 0x73, 0x49, 0xAE, 0x20, 0x41, 0x31,
-      0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9, 0x7E, 0xA2,
-      0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
-      0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8,
-      0x36, 0xBA, 0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD,
-      0x45, 0x4D, 0x44, 0x23, 0x64, 0x3C, 0xE8, 0x0E,
-      0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C, 0xA4, 0x9F },
-    { 0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA,
-      0x8C, 0xF4, 0xF7, 0x28, 0x14, 0xFC, 0x14, 0x3F,
-      0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F, 0x7F, 0xA1,
-      0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
-      0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4,
-      0x33, 0x1B, 0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A,
-      0xC7, 0xD3, 0x29, 0xEE, 0xB6, 0xDD, 0x26, 0x54,
-      0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B, 0xE9, 0x09 },
-    { 0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64,
-      0x4E, 0x2E, 0x42, 0xC7, 0xBC, 0x15, 0xB4, 0x63,
-      0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20, 0x44, 0x28,
-      0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
-      0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A,
-      0x4C, 0xB0, 0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B,
-      0xEB, 0x00, 0x9C, 0x5C, 0x2C, 0x49, 0xAA, 0x2E,
-      0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B }
-};
-
-/*
- * RFC 4231 test vectors
- */
-static unsigned char sha4_hmac_test_key[7][26] =
-{
-    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
-      "\x0B\x0B\x0B\x0B" },
-    { "Jefe" },
-    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-      "\xAA\xAA\xAA\xAA" },
-    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
-      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
-    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
-      "\x0C\x0C\x0C\x0C" },
-    { "" }, /* 0xAA 131 times */
-    { "" }
-};
-
-static const int sha4_hmac_test_keylen[7] =
-{
-    20, 4, 20, 25, 20, 131, 131
-};
-
-static unsigned char sha4_hmac_test_buf[7][153] =
-{
-    { "Hi There" },
-    { "what do ya want for nothing?" },
-    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
-    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
-    { "Test With Truncation" },
-    { "Test Using Larger Than Block-Size Key - Hash Key First" },
-    { "This is a test using a larger than block-size key "
-      "and a larger than block-size data. The key needs to "
-      "be hashed before being used by the HMAC algorithm." }
-};
-
-static const int sha4_hmac_test_buflen[7] =
-{
-    8, 28, 50, 50, 20, 54, 152
-};
-
-static const unsigned char sha4_hmac_test_sum[14][64] =
-{
-    /*
-     * HMAC-SHA-384 test vectors
-     */
-    { 0xAF, 0xD0, 0x39, 0x44, 0xD8, 0x48, 0x95, 0x62,
-      0x6B, 0x08, 0x25, 0xF4, 0xAB, 0x46, 0x90, 0x7F,
-      0x15, 0xF9, 0xDA, 0xDB, 0xE4, 0x10, 0x1E, 0xC6,
-      0x82, 0xAA, 0x03, 0x4C, 0x7C, 0xEB, 0xC5, 0x9C,
-      0xFA, 0xEA, 0x9E, 0xA9, 0x07, 0x6E, 0xDE, 0x7F,
-      0x4A, 0xF1, 0x52, 0xE8, 0xB2, 0xFA, 0x9C, 0xB6 },
-    { 0xAF, 0x45, 0xD2, 0xE3, 0x76, 0x48, 0x40, 0x31,
-      0x61, 0x7F, 0x78, 0xD2, 0xB5, 0x8A, 0x6B, 0x1B,
-      0x9C, 0x7E, 0xF4, 0x64, 0xF5, 0xA0, 0x1B, 0x47,
-      0xE4, 0x2E, 0xC3, 0x73, 0x63, 0x22, 0x44, 0x5E,
-      0x8E, 0x22, 0x40, 0xCA, 0x5E, 0x69, 0xE2, 0xC7,
-      0x8B, 0x32, 0x39, 0xEC, 0xFA, 0xB2, 0x16, 0x49 },
-    { 0x88, 0x06, 0x26, 0x08, 0xD3, 0xE6, 0xAD, 0x8A,
-      0x0A, 0xA2, 0xAC, 0xE0, 0x14, 0xC8, 0xA8, 0x6F,
-      0x0A, 0xA6, 0x35, 0xD9, 0x47, 0xAC, 0x9F, 0xEB,
-      0xE8, 0x3E, 0xF4, 0xE5, 0x59, 0x66, 0x14, 0x4B,
-      0x2A, 0x5A, 0xB3, 0x9D, 0xC1, 0x38, 0x14, 0xB9,
-      0x4E, 0x3A, 0xB6, 0xE1, 0x01, 0xA3, 0x4F, 0x27 },
-    { 0x3E, 0x8A, 0x69, 0xB7, 0x78, 0x3C, 0x25, 0x85,
-      0x19, 0x33, 0xAB, 0x62, 0x90, 0xAF, 0x6C, 0xA7,
-      0x7A, 0x99, 0x81, 0x48, 0x08, 0x50, 0x00, 0x9C,
-      0xC5, 0x57, 0x7C, 0x6E, 0x1F, 0x57, 0x3B, 0x4E,
-      0x68, 0x01, 0xDD, 0x23, 0xC4, 0xA7, 0xD6, 0x79,
-      0xCC, 0xF8, 0xA3, 0x86, 0xC6, 0x74, 0xCF, 0xFB },
-    { 0x3A, 0xBF, 0x34, 0xC3, 0x50, 0x3B, 0x2A, 0x23,
-      0xA4, 0x6E, 0xFC, 0x61, 0x9B, 0xAE, 0xF8, 0x97 },
-    { 0x4E, 0xCE, 0x08, 0x44, 0x85, 0x81, 0x3E, 0x90,
-      0x88, 0xD2, 0xC6, 0x3A, 0x04, 0x1B, 0xC5, 0xB4,
-      0x4F, 0x9E, 0xF1, 0x01, 0x2A, 0x2B, 0x58, 0x8F,
-      0x3C, 0xD1, 0x1F, 0x05, 0x03, 0x3A, 0xC4, 0xC6,
-      0x0C, 0x2E, 0xF6, 0xAB, 0x40, 0x30, 0xFE, 0x82,
-      0x96, 0x24, 0x8D, 0xF1, 0x63, 0xF4, 0x49, 0x52 },
-    { 0x66, 0x17, 0x17, 0x8E, 0x94, 0x1F, 0x02, 0x0D,
-      0x35, 0x1E, 0x2F, 0x25, 0x4E, 0x8F, 0xD3, 0x2C,
-      0x60, 0x24, 0x20, 0xFE, 0xB0, 0xB8, 0xFB, 0x9A,
-      0xDC, 0xCE, 0xBB, 0x82, 0x46, 0x1E, 0x99, 0xC5,
-      0xA6, 0x78, 0xCC, 0x31, 0xE7, 0x99, 0x17, 0x6D,
-      0x38, 0x60, 0xE6, 0x11, 0x0C, 0x46, 0x52, 0x3E },
-
-    /*
-     * HMAC-SHA-512 test vectors
-     */
-    { 0x87, 0xAA, 0x7C, 0xDE, 0xA5, 0xEF, 0x61, 0x9D,
-      0x4F, 0xF0, 0xB4, 0x24, 0x1A, 0x1D, 0x6C, 0xB0,
-      0x23, 0x79, 0xF4, 0xE2, 0xCE, 0x4E, 0xC2, 0x78,
-      0x7A, 0xD0, 0xB3, 0x05, 0x45, 0xE1, 0x7C, 0xDE,
-      0xDA, 0xA8, 0x33, 0xB7, 0xD6, 0xB8, 0xA7, 0x02,
-      0x03, 0x8B, 0x27, 0x4E, 0xAE, 0xA3, 0xF4, 0xE4,
-      0xBE, 0x9D, 0x91, 0x4E, 0xEB, 0x61, 0xF1, 0x70,
-      0x2E, 0x69, 0x6C, 0x20, 0x3A, 0x12, 0x68, 0x54 },
-    { 0x16, 0x4B, 0x7A, 0x7B, 0xFC, 0xF8, 0x19, 0xE2,
-      0xE3, 0x95, 0xFB, 0xE7, 0x3B, 0x56, 0xE0, 0xA3,
-      0x87, 0xBD, 0x64, 0x22, 0x2E, 0x83, 0x1F, 0xD6,
-      0x10, 0x27, 0x0C, 0xD7, 0xEA, 0x25, 0x05, 0x54,
-      0x97, 0x58, 0xBF, 0x75, 0xC0, 0x5A, 0x99, 0x4A,
-      0x6D, 0x03, 0x4F, 0x65, 0xF8, 0xF0, 0xE6, 0xFD,
-      0xCA, 0xEA, 0xB1, 0xA3, 0x4D, 0x4A, 0x6B, 0x4B,
-      0x63, 0x6E, 0x07, 0x0A, 0x38, 0xBC, 0xE7, 0x37 },
-    { 0xFA, 0x73, 0xB0, 0x08, 0x9D, 0x56, 0xA2, 0x84,
-      0xEF, 0xB0, 0xF0, 0x75, 0x6C, 0x89, 0x0B, 0xE9,
-      0xB1, 0xB5, 0xDB, 0xDD, 0x8E, 0xE8, 0x1A, 0x36,
-      0x55, 0xF8, 0x3E, 0x33, 0xB2, 0x27, 0x9D, 0x39,
-      0xBF, 0x3E, 0x84, 0x82, 0x79, 0xA7, 0x22, 0xC8,
-      0x06, 0xB4, 0x85, 0xA4, 0x7E, 0x67, 0xC8, 0x07,
-      0xB9, 0x46, 0xA3, 0x37, 0xBE, 0xE8, 0x94, 0x26,
-      0x74, 0x27, 0x88, 0x59, 0xE1, 0x32, 0x92, 0xFB },
-    { 0xB0, 0xBA, 0x46, 0x56, 0x37, 0x45, 0x8C, 0x69,
-      0x90, 0xE5, 0xA8, 0xC5, 0xF6, 0x1D, 0x4A, 0xF7,
-      0xE5, 0x76, 0xD9, 0x7F, 0xF9, 0x4B, 0x87, 0x2D,
-      0xE7, 0x6F, 0x80, 0x50, 0x36, 0x1E, 0xE3, 0xDB,
-      0xA9, 0x1C, 0xA5, 0xC1, 0x1A, 0xA2, 0x5E, 0xB4,
-      0xD6, 0x79, 0x27, 0x5C, 0xC5, 0x78, 0x80, 0x63,
-      0xA5, 0xF1, 0x97, 0x41, 0x12, 0x0C, 0x4F, 0x2D,
-      0xE2, 0xAD, 0xEB, 0xEB, 0x10, 0xA2, 0x98, 0xDD },
-    { 0x41, 0x5F, 0xAD, 0x62, 0x71, 0x58, 0x0A, 0x53,
-      0x1D, 0x41, 0x79, 0xBC, 0x89, 0x1D, 0x87, 0xA6 },
-    { 0x80, 0xB2, 0x42, 0x63, 0xC7, 0xC1, 0xA3, 0xEB,
-      0xB7, 0x14, 0x93, 0xC1, 0xDD, 0x7B, 0xE8, 0xB4,
-      0x9B, 0x46, 0xD1, 0xF4, 0x1B, 0x4A, 0xEE, 0xC1,
-      0x12, 0x1B, 0x01, 0x37, 0x83, 0xF8, 0xF3, 0x52,
-      0x6B, 0x56, 0xD0, 0x37, 0xE0, 0x5F, 0x25, 0x98,
-      0xBD, 0x0F, 0xD2, 0x21, 0x5D, 0x6A, 0x1E, 0x52,
-      0x95, 0xE6, 0x4F, 0x73, 0xF6, 0x3F, 0x0A, 0xEC,
-      0x8B, 0x91, 0x5A, 0x98, 0x5D, 0x78, 0x65, 0x98 },
-    { 0xE3, 0x7B, 0x6A, 0x77, 0x5D, 0xC8, 0x7D, 0xBA,
-      0xA4, 0xDF, 0xA9, 0xF9, 0x6E, 0x5E, 0x3F, 0xFD,
-      0xDE, 0xBD, 0x71, 0xF8, 0x86, 0x72, 0x89, 0x86,
-      0x5D, 0xF5, 0xA3, 0x2D, 0x20, 0xCD, 0xC9, 0x44,
-      0xB6, 0x02, 0x2C, 0xAC, 0x3C, 0x49, 0x82, 0xB1,
-      0x0D, 0x5E, 0xEB, 0x55, 0xC3, 0xE4, 0xDE, 0x15,
-      0x13, 0x46, 0x76, 0xFB, 0x6D, 0xE0, 0x44, 0x60,
-      0x65, 0xC9, 0x74, 0x40, 0xFA, 0x8C, 0x6A, 0x58 }
-};
-
-/*
- * Checkup routine
- */
-int sha4_self_test( int verbose )
-{
-    int i, j, k, buflen;
-    unsigned char buf[1024];
-    unsigned char sha4sum[64];
-    sha4_context ctx;
-
-    for( i = 0; i < 6; i++ )
-    {
-        j = i % 3;
-        k = i < 3;
-
-        if( verbose != 0 )
-            printf( "  SHA-%d test #%d: ", 512 - k * 128, j + 1 );
-
-        sha4_starts( &ctx, k );
-
-        if( j == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
-
-            for( j = 0; j < 1000; j++ )
-                sha4_update( &ctx, buf, buflen );
-        }
-        else
-            sha4_update( &ctx, sha4_test_buf[j],
-                               sha4_test_buflen[j] );
-
-        sha4_finish( &ctx, sha4sum );
-
-        if( memcmp( sha4sum, sha4_test_sum[i], 64 - k * 16 ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    for( i = 0; i < 14; i++ )
-    {
-        j = i % 7;
-        k = i < 7;
-
-        if( verbose != 0 )
-            printf( "  HMAC-SHA-%d test #%d: ", 512 - k * 128, j + 1 );
-
-        if( j == 5 || j == 6 )
-        {
-            memset( buf, '\xAA', buflen = 131 );
-            sha4_hmac_starts( &ctx, buf, buflen, k );
-        }
-        else
-            sha4_hmac_starts( &ctx, sha4_hmac_test_key[j],
-                                    sha4_hmac_test_keylen[j], k );
-
-        sha4_hmac_update( &ctx, sha4_hmac_test_buf[j],
-                                sha4_hmac_test_buflen[j] );
-
-        sha4_hmac_finish( &ctx, sha4sum );
-
-        buflen = ( j == 4 ) ? 16 : 64 - k * 16;
-
-        if( memcmp( sha4sum, sha4_hmac_test_sum[i], buflen ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    return( 0 );
-}
-
-#endif
-
-#endif
diff --git a/Externals/polarssl/library/sha512.c b/Externals/polarssl/library/sha512.c
new file mode 100644
index 0000000000..f1d15256f8
--- /dev/null
+++ b/Externals/polarssl/library/sha512.c
@@ -0,0 +1,796 @@
+/*
+ *  FIPS-180-2 compliant SHA-384/512 implementation
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The SHA-512 Secure Hash Standard was published by NIST in 2002.
+ *
+ *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+
+#include "polarssl/sha512.h"
+
+#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if !defined(POLARSSL_SHA512_ALT)
+
+/*
+ * 64-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT64_BE
+#define GET_UINT64_BE(n,b,i)                            \
+{                                                       \
+    (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
+        | ( (uint64_t) (b)[(i) + 1] << 48 )       \
+        | ( (uint64_t) (b)[(i) + 2] << 40 )       \
+        | ( (uint64_t) (b)[(i) + 3] << 32 )       \
+        | ( (uint64_t) (b)[(i) + 4] << 24 )       \
+        | ( (uint64_t) (b)[(i) + 5] << 16 )       \
+        | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
+        | ( (uint64_t) (b)[(i) + 7]       );      \
+}
+#endif /* GET_UINT64_BE */
+
+#ifndef PUT_UINT64_BE
+#define PUT_UINT64_BE(n,b,i)                            \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 56 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 48 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >> 40 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n) >> 32 );       \
+    (b)[(i) + 4] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 5] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 6] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 7] = (unsigned char) ( (n)       );       \
+}
+#endif /* PUT_UINT64_BE */
+
+/*
+ * Round constants
+ */
+static const uint64_t K[80] =
+{
+    UL64(0x428A2F98D728AE22),  UL64(0x7137449123EF65CD),
+    UL64(0xB5C0FBCFEC4D3B2F),  UL64(0xE9B5DBA58189DBBC),
+    UL64(0x3956C25BF348B538),  UL64(0x59F111F1B605D019),
+    UL64(0x923F82A4AF194F9B),  UL64(0xAB1C5ED5DA6D8118),
+    UL64(0xD807AA98A3030242),  UL64(0x12835B0145706FBE),
+    UL64(0x243185BE4EE4B28C),  UL64(0x550C7DC3D5FFB4E2),
+    UL64(0x72BE5D74F27B896F),  UL64(0x80DEB1FE3B1696B1),
+    UL64(0x9BDC06A725C71235),  UL64(0xC19BF174CF692694),
+    UL64(0xE49B69C19EF14AD2),  UL64(0xEFBE4786384F25E3),
+    UL64(0x0FC19DC68B8CD5B5),  UL64(0x240CA1CC77AC9C65),
+    UL64(0x2DE92C6F592B0275),  UL64(0x4A7484AA6EA6E483),
+    UL64(0x5CB0A9DCBD41FBD4),  UL64(0x76F988DA831153B5),
+    UL64(0x983E5152EE66DFAB),  UL64(0xA831C66D2DB43210),
+    UL64(0xB00327C898FB213F),  UL64(0xBF597FC7BEEF0EE4),
+    UL64(0xC6E00BF33DA88FC2),  UL64(0xD5A79147930AA725),
+    UL64(0x06CA6351E003826F),  UL64(0x142929670A0E6E70),
+    UL64(0x27B70A8546D22FFC),  UL64(0x2E1B21385C26C926),
+    UL64(0x4D2C6DFC5AC42AED),  UL64(0x53380D139D95B3DF),
+    UL64(0x650A73548BAF63DE),  UL64(0x766A0ABB3C77B2A8),
+    UL64(0x81C2C92E47EDAEE6),  UL64(0x92722C851482353B),
+    UL64(0xA2BFE8A14CF10364),  UL64(0xA81A664BBC423001),
+    UL64(0xC24B8B70D0F89791),  UL64(0xC76C51A30654BE30),
+    UL64(0xD192E819D6EF5218),  UL64(0xD69906245565A910),
+    UL64(0xF40E35855771202A),  UL64(0x106AA07032BBD1B8),
+    UL64(0x19A4C116B8D2D0C8),  UL64(0x1E376C085141AB53),
+    UL64(0x2748774CDF8EEB99),  UL64(0x34B0BCB5E19B48A8),
+    UL64(0x391C0CB3C5C95A63),  UL64(0x4ED8AA4AE3418ACB),
+    UL64(0x5B9CCA4F7763E373),  UL64(0x682E6FF3D6B2B8A3),
+    UL64(0x748F82EE5DEFB2FC),  UL64(0x78A5636F43172F60),
+    UL64(0x84C87814A1F0AB72),  UL64(0x8CC702081A6439EC),
+    UL64(0x90BEFFFA23631E28),  UL64(0xA4506CEBDE82BDE9),
+    UL64(0xBEF9A3F7B2C67915),  UL64(0xC67178F2E372532B),
+    UL64(0xCA273ECEEA26619C),  UL64(0xD186B8C721C0C207),
+    UL64(0xEADA7DD6CDE0EB1E),  UL64(0xF57D4F7FEE6ED178),
+    UL64(0x06F067AA72176FBA),  UL64(0x0A637DC5A2C898A6),
+    UL64(0x113F9804BEF90DAE),  UL64(0x1B710B35131C471B),
+    UL64(0x28DB77F523047D84),  UL64(0x32CAAB7B40C72493),
+    UL64(0x3C9EBE0A15C9BEBC),  UL64(0x431D67C49C100D4C),
+    UL64(0x4CC5D4BECB3E42B6),  UL64(0x597F299CFC657E2A),
+    UL64(0x5FCB6FAB3AD6FAEC),  UL64(0x6C44198C4A475817)
+};
+
+void sha512_init( sha512_context *ctx )
+{
+    memset( ctx, 0, sizeof( sha512_context ) );
+}
+
+void sha512_free( sha512_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( sha512_context ) );
+}
+
+/*
+ * SHA-512 context setup
+ */
+void sha512_starts( sha512_context *ctx, int is384 )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    if( is384 == 0 )
+    {
+        /* SHA-512 */
+        ctx->state[0] = UL64(0x6A09E667F3BCC908);
+        ctx->state[1] = UL64(0xBB67AE8584CAA73B);
+        ctx->state[2] = UL64(0x3C6EF372FE94F82B);
+        ctx->state[3] = UL64(0xA54FF53A5F1D36F1);
+        ctx->state[4] = UL64(0x510E527FADE682D1);
+        ctx->state[5] = UL64(0x9B05688C2B3E6C1F);
+        ctx->state[6] = UL64(0x1F83D9ABFB41BD6B);
+        ctx->state[7] = UL64(0x5BE0CD19137E2179);
+    }
+    else
+    {
+        /* SHA-384 */
+        ctx->state[0] = UL64(0xCBBB9D5DC1059ED8);
+        ctx->state[1] = UL64(0x629A292A367CD507);
+        ctx->state[2] = UL64(0x9159015A3070DD17);
+        ctx->state[3] = UL64(0x152FECD8F70E5939);
+        ctx->state[4] = UL64(0x67332667FFC00B31);
+        ctx->state[5] = UL64(0x8EB44A8768581511);
+        ctx->state[6] = UL64(0xDB0C2E0D64F98FA7);
+        ctx->state[7] = UL64(0x47B5481DBEFA4FA4);
+    }
+
+    ctx->is384 = is384;
+}
+
+void sha512_process( sha512_context *ctx, const unsigned char data[128] )
+{
+    int i;
+    uint64_t temp1, temp2, W[80];
+    uint64_t A, B, C, D, E, F, G, H;
+
+#define  SHR(x,n) (x >> n)
+#define ROTR(x,n) (SHR(x,n) | (x << (64 - n)))
+
+#define S0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^  SHR(x, 7))
+#define S1(x) (ROTR(x,19) ^ ROTR(x,61) ^  SHR(x, 6))
+
+#define S2(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
+#define S3(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
+
+#define F0(x,y,z) ((x & y) | (z & (x | y)))
+#define F1(x,y,z) (z ^ (x & (y ^ z)))
+
+#define P(a,b,c,d,e,f,g,h,x,K)                  \
+{                                               \
+    temp1 = h + S3(e) + F1(e,f,g) + K + x;      \
+    temp2 = S2(a) + F0(a,b,c);                  \
+    d += temp1; h = temp1 + temp2;              \
+}
+
+    for( i = 0; i < 16; i++ )
+    {
+        GET_UINT64_BE( W[i], data, i << 3 );
+    }
+
+    for( ; i < 80; i++ )
+    {
+        W[i] = S1(W[i -  2]) + W[i -  7] +
+               S0(W[i - 15]) + W[i - 16];
+    }
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+    F = ctx->state[5];
+    G = ctx->state[6];
+    H = ctx->state[7];
+    i = 0;
+
+    do
+    {
+        P( A, B, C, D, E, F, G, H, W[i], K[i] ); i++;
+        P( H, A, B, C, D, E, F, G, W[i], K[i] ); i++;
+        P( G, H, A, B, C, D, E, F, W[i], K[i] ); i++;
+        P( F, G, H, A, B, C, D, E, W[i], K[i] ); i++;
+        P( E, F, G, H, A, B, C, D, W[i], K[i] ); i++;
+        P( D, E, F, G, H, A, B, C, W[i], K[i] ); i++;
+        P( C, D, E, F, G, H, A, B, W[i], K[i] ); i++;
+        P( B, C, D, E, F, G, H, A, W[i], K[i] ); i++;
+    }
+    while( i < 80 );
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+    ctx->state[5] += F;
+    ctx->state[6] += G;
+    ctx->state[7] += H;
+}
+
+/*
+ * SHA-512 process buffer
+ */
+void sha512_update( sha512_context *ctx, const unsigned char *input,
+                    size_t ilen )
+{
+    size_t fill;
+    unsigned int left;
+
+    if( ilen == 0 )
+        return;
+
+    left = (unsigned int) (ctx->total[0] & 0x7F);
+    fill = 128 - left;
+
+    ctx->total[0] += (uint64_t) ilen;
+
+    if( ctx->total[0] < (uint64_t) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), input, fill );
+        sha512_process( ctx, ctx->buffer );
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 128 )
+    {
+        sha512_process( ctx, input );
+        input += 128;
+        ilen  -= 128;
+    }
+
+    if( ilen > 0 )
+        memcpy( (void *) (ctx->buffer + left), input, ilen );
+}
+
+static const unsigned char sha512_padding[128] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * SHA-512 final digest
+ */
+void sha512_finish( sha512_context *ctx, unsigned char output[64] )
+{
+    size_t last, padn;
+    uint64_t high, low;
+    unsigned char msglen[16];
+
+    high = ( ctx->total[0] >> 61 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT64_BE( high, msglen, 0 );
+    PUT_UINT64_BE( low,  msglen, 8 );
+
+    last = (size_t)( ctx->total[0] & 0x7F );
+    padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last );
+
+    sha512_update( ctx, sha512_padding, padn );
+    sha512_update( ctx, msglen, 16 );
+
+    PUT_UINT64_BE( ctx->state[0], output,  0 );
+    PUT_UINT64_BE( ctx->state[1], output,  8 );
+    PUT_UINT64_BE( ctx->state[2], output, 16 );
+    PUT_UINT64_BE( ctx->state[3], output, 24 );
+    PUT_UINT64_BE( ctx->state[4], output, 32 );
+    PUT_UINT64_BE( ctx->state[5], output, 40 );
+
+    if( ctx->is384 == 0 )
+    {
+        PUT_UINT64_BE( ctx->state[6], output, 48 );
+        PUT_UINT64_BE( ctx->state[7], output, 56 );
+    }
+}
+
+#endif /* !POLARSSL_SHA512_ALT */
+
+/*
+ * output = SHA-512( input buffer )
+ */
+void sha512( const unsigned char *input, size_t ilen,
+             unsigned char output[64], int is384 )
+{
+    sha512_context ctx;
+
+    sha512_init( &ctx );
+    sha512_starts( &ctx, is384 );
+    sha512_update( &ctx, input, ilen );
+    sha512_finish( &ctx, output );
+    sha512_free( &ctx );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * output = SHA-512( file contents )
+ */
+int sha512_file( const char *path, unsigned char output[64], int is384 )
+{
+    FILE *f;
+    size_t n;
+    sha512_context ctx;
+    unsigned char buf[1024];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_SHA512_FILE_IO_ERROR );
+
+    sha512_init( &ctx );
+    sha512_starts( &ctx, is384 );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        sha512_update( &ctx, buf, n );
+
+    sha512_finish( &ctx, output );
+    sha512_free( &ctx );
+
+    if( ferror( f ) != 0 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_SHA512_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+    return( 0 );
+}
+#endif /* POLARSSL_FS_IO */
+
+/*
+ * SHA-512 HMAC context setup
+ */
+void sha512_hmac_starts( sha512_context *ctx, const unsigned char *key,
+                         size_t keylen, int is384 )
+{
+    size_t i;
+    unsigned char sum[64];
+
+    if( keylen > 128 )
+    {
+        sha512( key, keylen, sum, is384 );
+        keylen = ( is384 ) ? 48 : 64;
+        key = sum;
+    }
+
+    memset( ctx->ipad, 0x36, 128 );
+    memset( ctx->opad, 0x5C, 128 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
+        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
+    }
+
+    sha512_starts( ctx, is384 );
+    sha512_update( ctx, ctx->ipad, 128 );
+
+    polarssl_zeroize( sum, sizeof( sum ) );
+}
+
+/*
+ * SHA-512 HMAC process buffer
+ */
+void sha512_hmac_update( sha512_context  *ctx,
+                         const unsigned char *input, size_t ilen )
+{
+    sha512_update( ctx, input, ilen );
+}
+
+/*
+ * SHA-512 HMAC final digest
+ */
+void sha512_hmac_finish( sha512_context *ctx, unsigned char output[64] )
+{
+    int is384, hlen;
+    unsigned char tmpbuf[64];
+
+    is384 = ctx->is384;
+    hlen = ( is384 == 0 ) ? 64 : 48;
+
+    sha512_finish( ctx, tmpbuf );
+    sha512_starts( ctx, is384 );
+    sha512_update( ctx, ctx->opad, 128 );
+    sha512_update( ctx, tmpbuf, hlen );
+    sha512_finish( ctx, output );
+
+    polarssl_zeroize( tmpbuf, sizeof( tmpbuf ) );
+}
+
+/*
+ * SHA-512 HMAC context reset
+ */
+void sha512_hmac_reset( sha512_context *ctx )
+{
+    sha512_starts( ctx, ctx->is384 );
+    sha512_update( ctx, ctx->ipad, 128 );
+}
+
+/*
+ * output = HMAC-SHA-512( hmac key, input buffer )
+ */
+void sha512_hmac( const unsigned char *key, size_t keylen,
+                const unsigned char *input, size_t ilen,
+                unsigned char output[64], int is384 )
+{
+    sha512_context ctx;
+
+    sha512_init( &ctx );
+    sha512_hmac_starts( &ctx, key, keylen, is384 );
+    sha512_hmac_update( &ctx, input, ilen );
+    sha512_hmac_finish( &ctx, output );
+    sha512_free( &ctx );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+/*
+ * FIPS-180-2 test vectors
+ */
+static unsigned char sha512_test_buf[3][113] =
+{
+    { "abc" },
+    { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+      "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" },
+    { "" }
+};
+
+static const int sha512_test_buflen[3] =
+{
+    3, 112, 1000
+};
+
+static const unsigned char sha512_test_sum[6][64] =
+{
+    /*
+     * SHA-384 test vectors
+     */
+    { 0xCB, 0x00, 0x75, 0x3F, 0x45, 0xA3, 0x5E, 0x8B,
+      0xB5, 0xA0, 0x3D, 0x69, 0x9A, 0xC6, 0x50, 0x07,
+      0x27, 0x2C, 0x32, 0xAB, 0x0E, 0xDE, 0xD1, 0x63,
+      0x1A, 0x8B, 0x60, 0x5A, 0x43, 0xFF, 0x5B, 0xED,
+      0x80, 0x86, 0x07, 0x2B, 0xA1, 0xE7, 0xCC, 0x23,
+      0x58, 0xBA, 0xEC, 0xA1, 0x34, 0xC8, 0x25, 0xA7 },
+    { 0x09, 0x33, 0x0C, 0x33, 0xF7, 0x11, 0x47, 0xE8,
+      0x3D, 0x19, 0x2F, 0xC7, 0x82, 0xCD, 0x1B, 0x47,
+      0x53, 0x11, 0x1B, 0x17, 0x3B, 0x3B, 0x05, 0xD2,
+      0x2F, 0xA0, 0x80, 0x86, 0xE3, 0xB0, 0xF7, 0x12,
+      0xFC, 0xC7, 0xC7, 0x1A, 0x55, 0x7E, 0x2D, 0xB9,
+      0x66, 0xC3, 0xE9, 0xFA, 0x91, 0x74, 0x60, 0x39 },
+    { 0x9D, 0x0E, 0x18, 0x09, 0x71, 0x64, 0x74, 0xCB,
+      0x08, 0x6E, 0x83, 0x4E, 0x31, 0x0A, 0x4A, 0x1C,
+      0xED, 0x14, 0x9E, 0x9C, 0x00, 0xF2, 0x48, 0x52,
+      0x79, 0x72, 0xCE, 0xC5, 0x70, 0x4C, 0x2A, 0x5B,
+      0x07, 0xB8, 0xB3, 0xDC, 0x38, 0xEC, 0xC4, 0xEB,
+      0xAE, 0x97, 0xDD, 0xD8, 0x7F, 0x3D, 0x89, 0x85 },
+
+    /*
+     * SHA-512 test vectors
+     */
+    { 0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA,
+      0xCC, 0x41, 0x73, 0x49, 0xAE, 0x20, 0x41, 0x31,
+      0x12, 0xE6, 0xFA, 0x4E, 0x89, 0xA9, 0x7E, 0xA2,
+      0x0A, 0x9E, 0xEE, 0xE6, 0x4B, 0x55, 0xD3, 0x9A,
+      0x21, 0x92, 0x99, 0x2A, 0x27, 0x4F, 0xC1, 0xA8,
+      0x36, 0xBA, 0x3C, 0x23, 0xA3, 0xFE, 0xEB, 0xBD,
+      0x45, 0x4D, 0x44, 0x23, 0x64, 0x3C, 0xE8, 0x0E,
+      0x2A, 0x9A, 0xC9, 0x4F, 0xA5, 0x4C, 0xA4, 0x9F },
+    { 0x8E, 0x95, 0x9B, 0x75, 0xDA, 0xE3, 0x13, 0xDA,
+      0x8C, 0xF4, 0xF7, 0x28, 0x14, 0xFC, 0x14, 0x3F,
+      0x8F, 0x77, 0x79, 0xC6, 0xEB, 0x9F, 0x7F, 0xA1,
+      0x72, 0x99, 0xAE, 0xAD, 0xB6, 0x88, 0x90, 0x18,
+      0x50, 0x1D, 0x28, 0x9E, 0x49, 0x00, 0xF7, 0xE4,
+      0x33, 0x1B, 0x99, 0xDE, 0xC4, 0xB5, 0x43, 0x3A,
+      0xC7, 0xD3, 0x29, 0xEE, 0xB6, 0xDD, 0x26, 0x54,
+      0x5E, 0x96, 0xE5, 0x5B, 0x87, 0x4B, 0xE9, 0x09 },
+    { 0xE7, 0x18, 0x48, 0x3D, 0x0C, 0xE7, 0x69, 0x64,
+      0x4E, 0x2E, 0x42, 0xC7, 0xBC, 0x15, 0xB4, 0x63,
+      0x8E, 0x1F, 0x98, 0xB1, 0x3B, 0x20, 0x44, 0x28,
+      0x56, 0x32, 0xA8, 0x03, 0xAF, 0xA9, 0x73, 0xEB,
+      0xDE, 0x0F, 0xF2, 0x44, 0x87, 0x7E, 0xA6, 0x0A,
+      0x4C, 0xB0, 0x43, 0x2C, 0xE5, 0x77, 0xC3, 0x1B,
+      0xEB, 0x00, 0x9C, 0x5C, 0x2C, 0x49, 0xAA, 0x2E,
+      0x4E, 0xAD, 0xB2, 0x17, 0xAD, 0x8C, 0xC0, 0x9B }
+};
+
+/*
+ * RFC 4231 test vectors
+ */
+static unsigned char sha512_hmac_test_key[7][26] =
+{
+    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
+      "\x0B\x0B\x0B\x0B" },
+    { "Jefe" },
+    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
+      "\xAA\xAA\xAA\xAA" },
+    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
+    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
+      "\x0C\x0C\x0C\x0C" },
+    { "" }, /* 0xAA 131 times */
+    { "" }
+};
+
+static const int sha512_hmac_test_keylen[7] =
+{
+    20, 4, 20, 25, 20, 131, 131
+};
+
+static unsigned char sha512_hmac_test_buf[7][153] =
+{
+    { "Hi There" },
+    { "what do ya want for nothing?" },
+    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
+    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
+    { "Test With Truncation" },
+    { "Test Using Larger Than Block-Size Key - Hash Key First" },
+    { "This is a test using a larger than block-size key "
+      "and a larger than block-size data. The key needs to "
+      "be hashed before being used by the HMAC algorithm." }
+};
+
+static const int sha512_hmac_test_buflen[7] =
+{
+    8, 28, 50, 50, 20, 54, 152
+};
+
+static const unsigned char sha512_hmac_test_sum[14][64] =
+{
+    /*
+     * HMAC-SHA-384 test vectors
+     */
+    { 0xAF, 0xD0, 0x39, 0x44, 0xD8, 0x48, 0x95, 0x62,
+      0x6B, 0x08, 0x25, 0xF4, 0xAB, 0x46, 0x90, 0x7F,
+      0x15, 0xF9, 0xDA, 0xDB, 0xE4, 0x10, 0x1E, 0xC6,
+      0x82, 0xAA, 0x03, 0x4C, 0x7C, 0xEB, 0xC5, 0x9C,
+      0xFA, 0xEA, 0x9E, 0xA9, 0x07, 0x6E, 0xDE, 0x7F,
+      0x4A, 0xF1, 0x52, 0xE8, 0xB2, 0xFA, 0x9C, 0xB6 },
+    { 0xAF, 0x45, 0xD2, 0xE3, 0x76, 0x48, 0x40, 0x31,
+      0x61, 0x7F, 0x78, 0xD2, 0xB5, 0x8A, 0x6B, 0x1B,
+      0x9C, 0x7E, 0xF4, 0x64, 0xF5, 0xA0, 0x1B, 0x47,
+      0xE4, 0x2E, 0xC3, 0x73, 0x63, 0x22, 0x44, 0x5E,
+      0x8E, 0x22, 0x40, 0xCA, 0x5E, 0x69, 0xE2, 0xC7,
+      0x8B, 0x32, 0x39, 0xEC, 0xFA, 0xB2, 0x16, 0x49 },
+    { 0x88, 0x06, 0x26, 0x08, 0xD3, 0xE6, 0xAD, 0x8A,
+      0x0A, 0xA2, 0xAC, 0xE0, 0x14, 0xC8, 0xA8, 0x6F,
+      0x0A, 0xA6, 0x35, 0xD9, 0x47, 0xAC, 0x9F, 0xEB,
+      0xE8, 0x3E, 0xF4, 0xE5, 0x59, 0x66, 0x14, 0x4B,
+      0x2A, 0x5A, 0xB3, 0x9D, 0xC1, 0x38, 0x14, 0xB9,
+      0x4E, 0x3A, 0xB6, 0xE1, 0x01, 0xA3, 0x4F, 0x27 },
+    { 0x3E, 0x8A, 0x69, 0xB7, 0x78, 0x3C, 0x25, 0x85,
+      0x19, 0x33, 0xAB, 0x62, 0x90, 0xAF, 0x6C, 0xA7,
+      0x7A, 0x99, 0x81, 0x48, 0x08, 0x50, 0x00, 0x9C,
+      0xC5, 0x57, 0x7C, 0x6E, 0x1F, 0x57, 0x3B, 0x4E,
+      0x68, 0x01, 0xDD, 0x23, 0xC4, 0xA7, 0xD6, 0x79,
+      0xCC, 0xF8, 0xA3, 0x86, 0xC6, 0x74, 0xCF, 0xFB },
+    { 0x3A, 0xBF, 0x34, 0xC3, 0x50, 0x3B, 0x2A, 0x23,
+      0xA4, 0x6E, 0xFC, 0x61, 0x9B, 0xAE, 0xF8, 0x97 },
+    { 0x4E, 0xCE, 0x08, 0x44, 0x85, 0x81, 0x3E, 0x90,
+      0x88, 0xD2, 0xC6, 0x3A, 0x04, 0x1B, 0xC5, 0xB4,
+      0x4F, 0x9E, 0xF1, 0x01, 0x2A, 0x2B, 0x58, 0x8F,
+      0x3C, 0xD1, 0x1F, 0x05, 0x03, 0x3A, 0xC4, 0xC6,
+      0x0C, 0x2E, 0xF6, 0xAB, 0x40, 0x30, 0xFE, 0x82,
+      0x96, 0x24, 0x8D, 0xF1, 0x63, 0xF4, 0x49, 0x52 },
+    { 0x66, 0x17, 0x17, 0x8E, 0x94, 0x1F, 0x02, 0x0D,
+      0x35, 0x1E, 0x2F, 0x25, 0x4E, 0x8F, 0xD3, 0x2C,
+      0x60, 0x24, 0x20, 0xFE, 0xB0, 0xB8, 0xFB, 0x9A,
+      0xDC, 0xCE, 0xBB, 0x82, 0x46, 0x1E, 0x99, 0xC5,
+      0xA6, 0x78, 0xCC, 0x31, 0xE7, 0x99, 0x17, 0x6D,
+      0x38, 0x60, 0xE6, 0x11, 0x0C, 0x46, 0x52, 0x3E },
+
+    /*
+     * HMAC-SHA-512 test vectors
+     */
+    { 0x87, 0xAA, 0x7C, 0xDE, 0xA5, 0xEF, 0x61, 0x9D,
+      0x4F, 0xF0, 0xB4, 0x24, 0x1A, 0x1D, 0x6C, 0xB0,
+      0x23, 0x79, 0xF4, 0xE2, 0xCE, 0x4E, 0xC2, 0x78,
+      0x7A, 0xD0, 0xB3, 0x05, 0x45, 0xE1, 0x7C, 0xDE,
+      0xDA, 0xA8, 0x33, 0xB7, 0xD6, 0xB8, 0xA7, 0x02,
+      0x03, 0x8B, 0x27, 0x4E, 0xAE, 0xA3, 0xF4, 0xE4,
+      0xBE, 0x9D, 0x91, 0x4E, 0xEB, 0x61, 0xF1, 0x70,
+      0x2E, 0x69, 0x6C, 0x20, 0x3A, 0x12, 0x68, 0x54 },
+    { 0x16, 0x4B, 0x7A, 0x7B, 0xFC, 0xF8, 0x19, 0xE2,
+      0xE3, 0x95, 0xFB, 0xE7, 0x3B, 0x56, 0xE0, 0xA3,
+      0x87, 0xBD, 0x64, 0x22, 0x2E, 0x83, 0x1F, 0xD6,
+      0x10, 0x27, 0x0C, 0xD7, 0xEA, 0x25, 0x05, 0x54,
+      0x97, 0x58, 0xBF, 0x75, 0xC0, 0x5A, 0x99, 0x4A,
+      0x6D, 0x03, 0x4F, 0x65, 0xF8, 0xF0, 0xE6, 0xFD,
+      0xCA, 0xEA, 0xB1, 0xA3, 0x4D, 0x4A, 0x6B, 0x4B,
+      0x63, 0x6E, 0x07, 0x0A, 0x38, 0xBC, 0xE7, 0x37 },
+    { 0xFA, 0x73, 0xB0, 0x08, 0x9D, 0x56, 0xA2, 0x84,
+      0xEF, 0xB0, 0xF0, 0x75, 0x6C, 0x89, 0x0B, 0xE9,
+      0xB1, 0xB5, 0xDB, 0xDD, 0x8E, 0xE8, 0x1A, 0x36,
+      0x55, 0xF8, 0x3E, 0x33, 0xB2, 0x27, 0x9D, 0x39,
+      0xBF, 0x3E, 0x84, 0x82, 0x79, 0xA7, 0x22, 0xC8,
+      0x06, 0xB4, 0x85, 0xA4, 0x7E, 0x67, 0xC8, 0x07,
+      0xB9, 0x46, 0xA3, 0x37, 0xBE, 0xE8, 0x94, 0x26,
+      0x74, 0x27, 0x88, 0x59, 0xE1, 0x32, 0x92, 0xFB },
+    { 0xB0, 0xBA, 0x46, 0x56, 0x37, 0x45, 0x8C, 0x69,
+      0x90, 0xE5, 0xA8, 0xC5, 0xF6, 0x1D, 0x4A, 0xF7,
+      0xE5, 0x76, 0xD9, 0x7F, 0xF9, 0x4B, 0x87, 0x2D,
+      0xE7, 0x6F, 0x80, 0x50, 0x36, 0x1E, 0xE3, 0xDB,
+      0xA9, 0x1C, 0xA5, 0xC1, 0x1A, 0xA2, 0x5E, 0xB4,
+      0xD6, 0x79, 0x27, 0x5C, 0xC5, 0x78, 0x80, 0x63,
+      0xA5, 0xF1, 0x97, 0x41, 0x12, 0x0C, 0x4F, 0x2D,
+      0xE2, 0xAD, 0xEB, 0xEB, 0x10, 0xA2, 0x98, 0xDD },
+    { 0x41, 0x5F, 0xAD, 0x62, 0x71, 0x58, 0x0A, 0x53,
+      0x1D, 0x41, 0x79, 0xBC, 0x89, 0x1D, 0x87, 0xA6 },
+    { 0x80, 0xB2, 0x42, 0x63, 0xC7, 0xC1, 0xA3, 0xEB,
+      0xB7, 0x14, 0x93, 0xC1, 0xDD, 0x7B, 0xE8, 0xB4,
+      0x9B, 0x46, 0xD1, 0xF4, 0x1B, 0x4A, 0xEE, 0xC1,
+      0x12, 0x1B, 0x01, 0x37, 0x83, 0xF8, 0xF3, 0x52,
+      0x6B, 0x56, 0xD0, 0x37, 0xE0, 0x5F, 0x25, 0x98,
+      0xBD, 0x0F, 0xD2, 0x21, 0x5D, 0x6A, 0x1E, 0x52,
+      0x95, 0xE6, 0x4F, 0x73, 0xF6, 0x3F, 0x0A, 0xEC,
+      0x8B, 0x91, 0x5A, 0x98, 0x5D, 0x78, 0x65, 0x98 },
+    { 0xE3, 0x7B, 0x6A, 0x77, 0x5D, 0xC8, 0x7D, 0xBA,
+      0xA4, 0xDF, 0xA9, 0xF9, 0x6E, 0x5E, 0x3F, 0xFD,
+      0xDE, 0xBD, 0x71, 0xF8, 0x86, 0x72, 0x89, 0x86,
+      0x5D, 0xF5, 0xA3, 0x2D, 0x20, 0xCD, 0xC9, 0x44,
+      0xB6, 0x02, 0x2C, 0xAC, 0x3C, 0x49, 0x82, 0xB1,
+      0x0D, 0x5E, 0xEB, 0x55, 0xC3, 0xE4, 0xDE, 0x15,
+      0x13, 0x46, 0x76, 0xFB, 0x6D, 0xE0, 0x44, 0x60,
+      0x65, 0xC9, 0x74, 0x40, 0xFA, 0x8C, 0x6A, 0x58 }
+};
+
+/*
+ * Checkup routine
+ */
+int sha512_self_test( int verbose )
+{
+    int i, j, k, buflen, ret = 0;
+    unsigned char buf[1024];
+    unsigned char sha512sum[64];
+    sha512_context ctx;
+
+    sha512_init( &ctx );
+
+    for( i = 0; i < 6; i++ )
+    {
+        j = i % 3;
+        k = i < 3;
+
+        if( verbose != 0 )
+            polarssl_printf( "  SHA-%d test #%d: ", 512 - k * 128, j + 1 );
+
+        sha512_starts( &ctx, k );
+
+        if( j == 2 )
+        {
+            memset( buf, 'a', buflen = 1000 );
+
+            for( j = 0; j < 1000; j++ )
+                sha512_update( &ctx, buf, buflen );
+        }
+        else
+            sha512_update( &ctx, sha512_test_buf[j],
+                                 sha512_test_buflen[j] );
+
+        sha512_finish( &ctx, sha512sum );
+
+        if( memcmp( sha512sum, sha512_test_sum[i], 64 - k * 16 ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    for( i = 0; i < 14; i++ )
+    {
+        j = i % 7;
+        k = i < 7;
+
+        if( verbose != 0 )
+            polarssl_printf( "  HMAC-SHA-%d test #%d: ", 512 - k * 128, j + 1 );
+
+        if( j == 5 || j == 6 )
+        {
+            memset( buf, '\xAA', buflen = 131 );
+            sha512_hmac_starts( &ctx, buf, buflen, k );
+        }
+        else
+            sha512_hmac_starts( &ctx, sha512_hmac_test_key[j],
+                                      sha512_hmac_test_keylen[j], k );
+
+        sha512_hmac_update( &ctx, sha512_hmac_test_buf[j],
+                                  sha512_hmac_test_buflen[j] );
+
+        sha512_hmac_finish( &ctx, sha512sum );
+
+        buflen = ( j == 4 ) ? 16 : 64 - k * 16;
+
+        if( memcmp( sha512sum, sha512_hmac_test_sum[i], buflen ) != 0 )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            ret = 1;
+            goto exit;
+        }
+
+        if( verbose != 0 )
+            polarssl_printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+exit:
+    sha512_free( &ctx );
+
+    return( ret );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_SHA512_C */
diff --git a/Externals/polarssl/library/ssl_cache.c b/Externals/polarssl/library/ssl_cache.c
index f5686be047..836b68511b 100644
--- a/Externals/polarssl/library/ssl_cache.c
+++ b/Externals/polarssl/library/ssl_cache.c
@@ -1,7 +1,7 @@
 /*
  *  SSL session cache implementation
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -27,12 +27,23 @@
  * to store and retrieve the session information.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_SSL_CACHE_C)
 
 #include "polarssl/ssl_cache.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 
 void ssl_cache_init( ssl_cache_context *cache )
@@ -41,14 +52,26 @@ void ssl_cache_init( ssl_cache_context *cache )
 
     cache->timeout = SSL_CACHE_DEFAULT_TIMEOUT;
     cache->max_entries = SSL_CACHE_DEFAULT_MAX_ENTRIES;
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_init( &cache->mutex );
+#endif
 }
 
 int ssl_cache_get( void *data, ssl_session *session )
 {
+    int ret = 1;
+#if defined(POLARSSL_HAVE_TIME)
     time_t t = time( NULL );
+#endif
     ssl_cache_context *cache = (ssl_cache_context *) data;
     ssl_cache_entry *cur, *entry;
 
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_lock( &cache->mutex ) != 0 )
+        return( 1 );
+#endif
+
     cur = cache->chain;
     entry = NULL;
 
@@ -57,9 +80,11 @@ int ssl_cache_get( void *data, ssl_session *session )
         entry = cur;
         cur = cur->next;
 
+#if defined(POLARSSL_HAVE_TIME)
         if( cache->timeout != 0 &&
             (int) ( t - entry->timestamp ) > cache->timeout )
             continue;
+#endif
 
         if( session->ciphersuite != entry->session.ciphersuite ||
             session->compression != entry->session.compression ||
@@ -72,38 +97,64 @@ int ssl_cache_get( void *data, ssl_session *session )
 
         memcpy( session->master, entry->session.master, 48 );
 
+        session->verify_result = entry->session.verify_result;
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
         /*
          * Restore peer certificate (without rest of the original chain)
          */
         if( entry->peer_cert.p != NULL )
         {
-            session->peer_cert = (x509_cert *) malloc( sizeof(x509_cert) );
-            if( session->peer_cert == NULL )
-                return( 1 );
+            session->peer_cert =
+                (x509_crt *) polarssl_malloc( sizeof(x509_crt) );
 
-            memset( session->peer_cert, 0, sizeof(x509_cert) );
-            if( x509parse_crt( session->peer_cert, entry->peer_cert.p,
-                               entry->peer_cert.len ) != 0 )
+            if( session->peer_cert == NULL )
             {
-                free( session->peer_cert );
+                ret = 1;
+                goto exit;
+            }
+
+            x509_crt_init( session->peer_cert );
+            if( x509_crt_parse( session->peer_cert, entry->peer_cert.p,
+                                entry->peer_cert.len ) != 0 )
+            {
+                polarssl_free( session->peer_cert );
                 session->peer_cert = NULL;
-                return( 1 );
+                ret = 1;
+                goto exit;
             }
         }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
-        return( 0 );
+        ret = 0;
+        goto exit;
     }
 
-    return( 1 );
+exit:
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &cache->mutex ) != 0 )
+        ret = 1;
+#endif
+
+    return( ret );
 }
 
 int ssl_cache_set( void *data, const ssl_session *session )
 {
+    int ret = 1;
+#if defined(POLARSSL_HAVE_TIME)
     time_t t = time( NULL ), oldest = 0;
+    ssl_cache_entry *old = NULL;
+#endif
     ssl_cache_context *cache = (ssl_cache_context *) data;
-    ssl_cache_entry *cur, *prv, *old = NULL;
+    ssl_cache_entry *cur, *prv;
     int count = 0;
 
+#if defined(POLARSSL_THREADING_C)
+    if( ( ret = polarssl_mutex_lock( &cache->mutex ) ) != 0 )
+        return( ret );
+#endif
+
     cur = cache->chain;
     prv = NULL;
 
@@ -111,21 +162,25 @@ int ssl_cache_set( void *data, const ssl_session *session )
     {
         count++;
 
+#if defined(POLARSSL_HAVE_TIME)
         if( cache->timeout != 0 &&
             (int) ( t - cur->timestamp ) > cache->timeout )
         {
             cur->timestamp = t;
             break; /* expired, reuse this slot, update timestamp */
         }
+#endif
 
         if( memcmp( session->id, cur->session.id, cur->session.length ) == 0 )
             break; /* client reconnected, keep timestamp for session id */
 
+#if defined(POLARSSL_HAVE_TIME)
         if( oldest == 0 || cur->timestamp < oldest )
         {
             oldest = cur->timestamp;
             old = cur;
         }
+#endif
 
         prv = cur;
         cur = cur->next;
@@ -133,24 +188,51 @@ int ssl_cache_set( void *data, const ssl_session *session )
 
     if( cur == NULL )
     {
+#if defined(POLARSSL_HAVE_TIME)
         /*
          * Reuse oldest entry if max_entries reached
          */
-        if( old != NULL && count >= cache->max_entries )
+        if( count >= cache->max_entries )
         {
-            cur = old;
-            memset( &cur->session, 0, sizeof(ssl_session) );
-            if( cur->peer_cert.p != NULL )
+            if( old == NULL )
             {
-                free( cur->peer_cert.p );
-                memset( &cur->peer_cert, 0, sizeof(x509_buf) );
+                ret = 1;
+                goto exit;
             }
+
+            cur = old;
         }
+#else /* POLARSSL_HAVE_TIME */
+        /*
+         * Reuse first entry in chain if max_entries reached,
+         * but move to last place
+         */
+        if( count >= cache->max_entries )
+        {
+            if( cache->chain == NULL )
+            {
+                ret = 1;
+                goto exit;
+            }
+
+            cur = cache->chain;
+            cache->chain = cur->next;
+            cur->next = NULL;
+            prv->next = cur;
+        }
+#endif /* POLARSSL_HAVE_TIME */
         else
         {
-            cur = (ssl_cache_entry *) malloc( sizeof(ssl_cache_entry) );
+            /*
+             * max_entries not reached, create new entry
+             */
+            cur = (ssl_cache_entry *)
+                        polarssl_malloc( sizeof(ssl_cache_entry) );
             if( cur == NULL )
-                return( 1 );
+            {
+                ret = 1;
+                goto exit;
+            }
 
             memset( cur, 0, sizeof(ssl_cache_entry) );
 
@@ -160,19 +242,35 @@ int ssl_cache_set( void *data, const ssl_session *session )
                 prv->next = cur;
         }
 
+#if defined(POLARSSL_HAVE_TIME)
         cur->timestamp = t;
+#endif
     }
 
     memcpy( &cur->session, session, sizeof( ssl_session ) );
-    
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    /*
+     * If we're reusing an entry, free its certificate first
+     */
+    if( cur->peer_cert.p != NULL )
+    {
+        polarssl_free( cur->peer_cert.p );
+        memset( &cur->peer_cert, 0, sizeof(x509_buf) );
+    }
+
     /*
      * Store peer certificate
      */
     if( session->peer_cert != NULL )
     {
-        cur->peer_cert.p = (unsigned char *) malloc( session->peer_cert->raw.len );
+        cur->peer_cert.p = (unsigned char *)
+                                polarssl_malloc( session->peer_cert->raw.len );
         if( cur->peer_cert.p == NULL )
-            return( 1 );
+        {
+            ret = 1;
+            goto exit;
+        }
 
         memcpy( cur->peer_cert.p, session->peer_cert->raw.p,
                 session->peer_cert->raw.len );
@@ -180,16 +278,27 @@ int ssl_cache_set( void *data, const ssl_session *session )
 
         cur->session.peer_cert = NULL;
     }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
-    return( 0 );
+    ret = 0;
+
+exit:
+#if defined(POLARSSL_THREADING_C)
+    if( polarssl_mutex_unlock( &cache->mutex ) != 0 )
+        ret = 1;
+#endif
+
+    return( ret );
 }
 
+#if defined(POLARSSL_HAVE_TIME)
 void ssl_cache_set_timeout( ssl_cache_context *cache, int timeout )
 {
     if( timeout < 0 ) timeout = 0;
 
     cache->timeout = timeout;
 }
+#endif /* POLARSSL_HAVE_TIME */
 
 void ssl_cache_set_max_entries( ssl_cache_context *cache, int max )
 {
@@ -211,11 +320,16 @@ void ssl_cache_free( ssl_cache_context *cache )
 
         ssl_session_free( &prv->session );
 
-        if( prv->peer_cert.p != NULL )
-            free( prv->peer_cert.p );
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+        polarssl_free( prv->peer_cert.p );
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
-        free( prv );
+        polarssl_free( prv );
     }
+
+#if defined(POLARSSL_THREADING_C)
+    polarssl_mutex_free( &cache->mutex );
+#endif
 }
 
 #endif /* POLARSSL_SSL_CACHE_C */
diff --git a/Externals/polarssl/library/ssl_ciphersuites.c b/Externals/polarssl/library/ssl_ciphersuites.c
new file mode 100644
index 0000000000..df838e2605
--- /dev/null
+++ b/Externals/polarssl/library/ssl_ciphersuites.c
@@ -0,0 +1,1843 @@
+/**
+ * \file ssl_ciphersuites.c
+ *
+ * \brief SSL ciphersuites for PolarSSL
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_SSL_TLS_C)
+
+#include "polarssl/ssl_ciphersuites.h"
+#include "polarssl/ssl.h"
+
+#include <stdlib.h>
+
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strcasecmp _stricmp
+#endif
+
+/*
+ * Ordered from most preferred to least preferred in terms of security.
+ *
+ * Current rule (except rc4, weak and null which come last):
+ * 1. By key exchange:
+ *    Forward-secure non-PSK > forward-secure PSK > other non-PSK > other PSK
+ * 2. By key length and cipher:
+ *    AES-256 > Camellia-256 > AES-128 > Camellia-128 > 3DES
+ * 3. By cipher mode when relevant GCM > CCM > CBC > CCM_8
+ * 4. By hash function used when relevant
+ * 5. By key exchange/auth again: EC > non-EC
+ */
+static const int ciphersuite_preference[] =
+{
+#if defined(SSL_CIPHERSUITES)
+    SSL_CIPHERSUITES,
+#else
+    /* All AES-256 ephemeral suites */
+    TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+    TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+    TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
+    TLS_ECDHE_ECDSA_WITH_AES_256_CCM,
+    TLS_DHE_RSA_WITH_AES_256_CCM,
+    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+    TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
+    TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
+    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+    TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+    TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+    TLS_DHE_RSA_WITH_AES_256_CCM_8,
+
+    /* All CAMELLIA-256 ephemeral suites */
+    TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
+
+    /* All AES-128 ephemeral suites */
+    TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+    TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+    TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
+    TLS_ECDHE_ECDSA_WITH_AES_128_CCM,
+    TLS_DHE_RSA_WITH_AES_128_CCM,
+    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+    TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
+    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+    TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+    TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+    TLS_DHE_RSA_WITH_AES_128_CCM_8,
+
+    /* All CAMELLIA-128 ephemeral suites */
+    TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
+
+    /* All remaining >= 128-bit ephemeral suites */
+    TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
+    TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+
+    /* The PSK ephemeral suites */
+    TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
+    TLS_DHE_PSK_WITH_AES_256_CCM,
+    TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
+    TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
+    TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA,
+    TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
+    TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_DHE_PSK_WITH_AES_256_CCM_8,
+
+    TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
+    TLS_DHE_PSK_WITH_AES_128_CCM,
+    TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
+    TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
+    TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
+    TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
+    TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_DHE_PSK_WITH_AES_128_CCM_8,
+
+    TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
+    TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
+
+    /* All AES-256 suites */
+    TLS_RSA_WITH_AES_256_GCM_SHA384,
+    TLS_RSA_WITH_AES_256_CCM,
+    TLS_RSA_WITH_AES_256_CBC_SHA256,
+    TLS_RSA_WITH_AES_256_CBC_SHA,
+    TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384,
+    TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
+    TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
+    TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384,
+    TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
+    TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
+    TLS_RSA_WITH_AES_256_CCM_8,
+
+    /* All CAMELLIA-256 suites */
+    TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
+    TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+
+    /* All AES-128 suites */
+    TLS_RSA_WITH_AES_128_GCM_SHA256,
+    TLS_RSA_WITH_AES_128_CCM,
+    TLS_RSA_WITH_AES_128_CBC_SHA256,
+    TLS_RSA_WITH_AES_128_CBC_SHA,
+    TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256,
+    TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256,
+    TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
+    TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256,
+    TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
+    TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
+    TLS_RSA_WITH_AES_128_CCM_8,
+
+    /* All CAMELLIA-128 suites */
+    TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
+    TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+
+    /* All remaining >= 128-bit suites */
+    TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
+    TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
+
+    /* The RSA PSK suites */
+    TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
+    TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
+    TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
+    TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+
+    TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
+    TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
+    TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
+    TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+
+    TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+
+    /* The PSK suites */
+    TLS_PSK_WITH_AES_256_GCM_SHA384,
+    TLS_PSK_WITH_AES_256_CCM,
+    TLS_PSK_WITH_AES_256_CBC_SHA384,
+    TLS_PSK_WITH_AES_256_CBC_SHA,
+    TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384,
+    TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+    TLS_PSK_WITH_AES_256_CCM_8,
+
+    TLS_PSK_WITH_AES_128_GCM_SHA256,
+    TLS_PSK_WITH_AES_128_CCM,
+    TLS_PSK_WITH_AES_128_CBC_SHA256,
+    TLS_PSK_WITH_AES_128_CBC_SHA,
+    TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256,
+    TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+    TLS_PSK_WITH_AES_128_CCM_8,
+
+    TLS_PSK_WITH_3DES_EDE_CBC_SHA,
+
+    /* RC4 suites */
+    TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+    TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+    TLS_ECDHE_PSK_WITH_RC4_128_SHA,
+    TLS_DHE_PSK_WITH_RC4_128_SHA,
+    TLS_RSA_WITH_RC4_128_SHA,
+    TLS_RSA_WITH_RC4_128_MD5,
+    TLS_ECDH_RSA_WITH_RC4_128_SHA,
+    TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
+    TLS_RSA_PSK_WITH_RC4_128_SHA,
+    TLS_PSK_WITH_RC4_128_SHA,
+
+    /* Weak suites */
+    TLS_DHE_RSA_WITH_DES_CBC_SHA,
+    TLS_RSA_WITH_DES_CBC_SHA,
+
+    /* NULL suites */
+    TLS_ECDHE_ECDSA_WITH_NULL_SHA,
+    TLS_ECDHE_RSA_WITH_NULL_SHA,
+    TLS_ECDHE_PSK_WITH_NULL_SHA384,
+    TLS_ECDHE_PSK_WITH_NULL_SHA256,
+    TLS_ECDHE_PSK_WITH_NULL_SHA,
+    TLS_DHE_PSK_WITH_NULL_SHA384,
+    TLS_DHE_PSK_WITH_NULL_SHA256,
+    TLS_DHE_PSK_WITH_NULL_SHA,
+
+    TLS_RSA_WITH_NULL_SHA256,
+    TLS_RSA_WITH_NULL_SHA,
+    TLS_RSA_WITH_NULL_MD5,
+    TLS_ECDH_RSA_WITH_NULL_SHA,
+    TLS_ECDH_ECDSA_WITH_NULL_SHA,
+    TLS_RSA_PSK_WITH_NULL_SHA384,
+    TLS_RSA_PSK_WITH_NULL_SHA256,
+    TLS_RSA_PSK_WITH_NULL_SHA,
+    TLS_PSK_WITH_NULL_SHA384,
+    TLS_PSK_WITH_NULL_SHA256,
+    TLS_PSK_WITH_NULL_SHA,
+
+#endif
+    0
+};
+
+static const ssl_ciphersuite_t ciphersuite_definitions[] =
+{
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA1_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, "TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, "TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, "TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, "TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, "TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, "TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA512_C */
+#if defined(POLARSSL_CCM_C)
+    { TLS_ECDHE_ECDSA_WITH_AES_256_CCM, "TLS-ECDHE-ECDSA-WITH-AES-256-CCM",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8, "TLS-ECDHE-ECDSA-WITH-AES-256-CCM-8",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+    { TLS_ECDHE_ECDSA_WITH_AES_128_CCM, "TLS-ECDHE-ECDSA-WITH-AES-128-CCM",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8, "TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+#endif /* POLARSSL_CCM_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-ECDHE-ECDSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, "TLS-ECDHE-ECDSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, "TLS-ECDHE-ECDSA-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_ECDSA_WITH_NULL_SHA, "TLS-ECDHE-ECDSA-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA1_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, "TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, "TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, "TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, "TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, "TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, "TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-ECDHE-RSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-ECDHE-RSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, "TLS-ECDHE-RSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_RSA_WITH_RC4_128_SHA, "TLS-ECDHE-RSA-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_RSA_WITH_NULL_SHA, "TLS-ECDHE-RSA-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA512_C) && defined(POLARSSL_GCM_C)
+    { TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, "TLS-DHE-RSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C && POLARSSL_GCM_C */
+
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_GCM_C)
+    { TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, "TLS-DHE-RSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, "TLS-DHE-RSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, "TLS-DHE-RSA-WITH-AES-256-CBC-SHA256",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_RSA_WITH_AES_128_CBC_SHA, "TLS-DHE-RSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_DHE_RSA_WITH_AES_256_CBC_SHA, "TLS-DHE-RSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_CCM_C)
+    { TLS_DHE_RSA_WITH_AES_256_CCM, "TLS-DHE-RSA-WITH-AES-256-CCM",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_DHE_RSA_WITH_AES_256_CCM_8, "TLS-DHE-RSA-WITH-AES-256-CCM-8",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+    { TLS_DHE_RSA_WITH_AES_128_CCM, "TLS-DHE-RSA-WITH-AES-128-CCM",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_DHE_RSA_WITH_AES_128_CCM_8, "TLS-DHE-RSA-WITH-AES-128-CCM-8",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+#endif /* POLARSSL_CCM_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256, "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-DHE-RSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-DHE-RSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, "TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA512_C) && defined(POLARSSL_GCM_C)
+    { TLS_RSA_WITH_AES_256_GCM_SHA384, "TLS-RSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C && POLARSSL_GCM_C */
+
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_GCM_C)
+    { TLS_RSA_WITH_AES_128_GCM_SHA256, "TLS-RSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_RSA_WITH_AES_128_CBC_SHA256, "TLS-RSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_RSA_WITH_AES_256_CBC_SHA256, "TLS-RSA-WITH-AES-256-CBC-SHA256",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA1_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_RSA_WITH_AES_128_CBC_SHA, "TLS-RSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_RSA_WITH_AES_256_CBC_SHA, "TLS-RSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_CCM_C)
+    { TLS_RSA_WITH_AES_256_CCM, "TLS-RSA-WITH-AES-256-CCM",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_RSA_WITH_AES_256_CCM_8, "TLS-RSA-WITH-AES-256-CCM-8",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+    { TLS_RSA_WITH_AES_128_CCM, "TLS-RSA-WITH-AES-128-CCM",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_RSA_WITH_AES_128_CCM_8, "TLS-RSA-WITH-AES-128-CCM-8",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+#endif /* POLARSSL_CCM_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256, "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_CAMELLIA_128_CBC_SHA, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_RSA_WITH_CAMELLIA_256_CBC_SHA, "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-RSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-RSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_3DES_EDE_CBC_SHA, "TLS-RSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_MD5_C)
+    { TLS_RSA_WITH_RC4_128_MD5, "TLS-RSA-WITH-RC4-128-MD5",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_MD5, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_RC4_128_SHA, "TLS-RSA-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif
+#endif /* POLARSSL_ARC4_C */
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA1_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, "TLS-ECDH-RSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, "TLS-ECDH-RSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256, "TLS-ECDH-RSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256, "TLS-ECDH-RSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384, "TLS-ECDH-RSA-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384, "TLS-ECDH-RSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDH-RSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDH-RSA-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-ECDH-RSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-ECDH-RSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, "TLS-ECDH-RSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_RSA_WITH_RC4_128_SHA, "TLS-ECDH-RSA-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_RSA_WITH_NULL_SHA, "TLS-ECDH-RSA-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_SHA1_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, "TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, "TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_SHA256_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256, "TLS-ECDH-ECDSA-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256, "TLS-ECDH-ECDSA-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    { TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384, "TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_GCM_C)
+    { TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384, "TLS-ECDH-ECDSA-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDH-ECDSA-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDH-ECDSA-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256, "TLS-ECDH-ECDSA-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384, "TLS-ECDH-ECDSA-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, "TLS-ECDH-ECDSA-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_ECDSA_WITH_RC4_128_SHA, "TLS-ECDH-ECDSA-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDH_ECDSA_WITH_NULL_SHA, "TLS-ECDH-ECDSA-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDH_ECDSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_PSK_WITH_AES_128_GCM_SHA256, "TLS-PSK-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_PSK_WITH_AES_256_GCM_SHA384, "TLS-PSK-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_PSK_WITH_AES_128_CBC_SHA256, "TLS-PSK-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_PSK_WITH_AES_256_CBC_SHA384, "TLS-PSK-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_PSK_WITH_AES_128_CBC_SHA, "TLS-PSK-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_PSK_WITH_AES_256_CBC_SHA, "TLS-PSK-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_CCM_C)
+    { TLS_PSK_WITH_AES_256_CCM, "TLS-PSK-WITH-AES-256-CCM",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_PSK_WITH_AES_256_CCM_8, "TLS-PSK-WITH-AES-256-CCM-8",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+    { TLS_PSK_WITH_AES_128_CCM, "TLS-PSK-WITH-AES-128-CCM",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_PSK_WITH_AES_128_CCM_8, "TLS-PSK-WITH-AES-128-CCM-8",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+#endif /* POLARSSL_CCM_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256, "TLS-PSK-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384, "TLS-PSK-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256, "TLS-PSK-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384, "TLS-PSK-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_PSK_WITH_3DES_EDE_CBC_SHA, "TLS-PSK-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_PSK_WITH_RC4_128_SHA, "TLS-PSK-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_PSK_WITH_AES_128_GCM_SHA256, "TLS-DHE-PSK-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_PSK_WITH_AES_256_GCM_SHA384, "TLS-DHE-PSK-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_PSK_WITH_AES_128_CBC_SHA256, "TLS-DHE-PSK-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_PSK_WITH_AES_256_CBC_SHA384, "TLS-DHE-PSK-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_PSK_WITH_AES_128_CBC_SHA, "TLS-DHE-PSK-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_DHE_PSK_WITH_AES_256_CBC_SHA, "TLS-DHE-PSK-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_CCM_C)
+    { TLS_DHE_PSK_WITH_AES_256_CCM, "TLS-DHE-PSK-WITH-AES-256-CCM",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_DHE_PSK_WITH_AES_256_CCM_8, "TLS-DHE-PSK-WITH-AES-256-CCM-8",
+      POLARSSL_CIPHER_AES_256_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+    { TLS_DHE_PSK_WITH_AES_128_CCM, "TLS-DHE-PSK-WITH-AES-128-CCM",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+    { TLS_DHE_PSK_WITH_AES_128_CCM_8, "TLS-DHE-PSK-WITH-AES-128-CCM-8",
+      POLARSSL_CIPHER_AES_128_CCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_SHORT_TAG },
+#endif /* POLARSSL_CCM_C */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256, "TLS-DHE-PSK-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384, "TLS-DHE-PSK-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256, "TLS-DHE-PSK-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384, "TLS-DHE-PSK-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA, "TLS-DHE-PSK-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_PSK_WITH_RC4_128_SHA, "TLS-DHE-PSK-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+#if defined(POLARSSL_AES_C)
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256, "TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384, "TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA, "TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA, "TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDHE-PSK-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDHE-PSK-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA, "TLS-ECDHE-PSK-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_PSK_WITH_RC4_128_SHA, "TLS-ECDHE-PSK-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+#if defined(POLARSSL_AES_C)
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_PSK_WITH_AES_128_GCM_SHA256, "TLS-RSA-PSK-WITH-AES-128-GCM-SHA256",
+      POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_RSA_PSK_WITH_AES_256_GCM_SHA384, "TLS-RSA-PSK-WITH-AES-256-GCM-SHA384",
+      POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_PSK_WITH_AES_128_CBC_SHA256, "TLS-RSA-PSK-WITH-AES-128-CBC-SHA256",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_RSA_PSK_WITH_AES_256_CBC_SHA384, "TLS-RSA-PSK-WITH-AES-256-CBC-SHA384",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_PSK_WITH_AES_128_CBC_SHA, "TLS-RSA-PSK-WITH-AES-128-CBC-SHA",
+      POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+
+    { TLS_RSA_PSK_WITH_AES_256_CBC_SHA, "TLS-RSA-PSK-WITH-AES-256-CBC-SHA",
+      POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_AES_C */
+
+#if defined(POLARSSL_CAMELLIA_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256, "TLS-RSA-PSK-WITH-CAMELLIA-128-CBC-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384, "TLS-RSA-PSK-WITH-CAMELLIA-256-CBC-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+#if defined(POLARSSL_GCM_C)
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256, "TLS-RSA-PSK-WITH-CAMELLIA-128-GCM-SHA256",
+      POLARSSL_CIPHER_CAMELLIA_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA256_C */
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384, "TLS-RSA-PSK-WITH-CAMELLIA-256-GCM-SHA384",
+      POLARSSL_CIPHER_CAMELLIA_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_GCM_C */
+#endif /* POLARSSL_CAMELLIA_C */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA, "TLS-RSA-PSK-WITH-3DES-EDE-CBC-SHA",
+      POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+
+#if defined(POLARSSL_ARC4_C)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_PSK_WITH_RC4_128_SHA, "TLS-RSA-PSK-WITH-RC4-128-SHA",
+      POLARSSL_CIPHER_ARC4_128, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      0 },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_ARC4_C */
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+
+#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+#if defined(POLARSSL_MD5_C)
+    { TLS_RSA_WITH_NULL_MD5, "TLS-RSA-WITH-NULL-MD5",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_MD5, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_NULL_SHA, "TLS-RSA-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_WITH_NULL_SHA256, "TLS-RSA-WITH-NULL-SHA256",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_PSK_WITH_NULL_SHA, "TLS-PSK-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+
+#if defined(POLARSSL_SHA256_C)
+    { TLS_PSK_WITH_NULL_SHA256, "TLS-PSK-WITH-NULL-SHA256",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_PSK_WITH_NULL_SHA384, "TLS-PSK-WITH-NULL-SHA384",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_PSK_WITH_NULL_SHA, "TLS-DHE-PSK-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+
+#if defined(POLARSSL_SHA256_C)
+    { TLS_DHE_PSK_WITH_NULL_SHA256, "TLS-DHE-PSK-WITH-NULL-SHA256",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_DHE_PSK_WITH_NULL_SHA384, "TLS-DHE-PSK-WITH-NULL-SHA384",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_ECDHE_PSK_WITH_NULL_SHA, "TLS-ECDHE-PSK-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+
+#if defined(POLARSSL_SHA256_C)
+    { TLS_ECDHE_PSK_WITH_NULL_SHA256, "TLS-ECDHE-PSK-WITH-NULL-SHA256",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_ECDHE_PSK_WITH_NULL_SHA384, "TLS-ECDHE-PSK-WITH-NULL-SHA384",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_PSK_WITH_NULL_SHA, "TLS-RSA-PSK-WITH-NULL-SHA",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+
+#if defined(POLARSSL_SHA256_C)
+    { TLS_RSA_PSK_WITH_NULL_SHA256, "TLS-RSA-PSK-WITH-NULL-SHA256",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+    { TLS_RSA_PSK_WITH_NULL_SHA384, "TLS-RSA-PSK-WITH-NULL-SHA384",
+      POLARSSL_CIPHER_NULL, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+
+#if defined(POLARSSL_DES_C)
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_DHE_RSA_WITH_DES_CBC_SHA, "TLS-DHE-RSA-WITH-DES-CBC-SHA",
+      POLARSSL_CIPHER_DES_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+#if defined(POLARSSL_SHA1_C)
+    { TLS_RSA_WITH_DES_CBC_SHA, "TLS-RSA-WITH-DES-CBC-SHA",
+      POLARSSL_CIPHER_DES_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_0,
+      SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3,
+      POLARSSL_CIPHERSUITE_WEAK },
+#endif /* POLARSSL_SHA1_C */
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#endif /* POLARSSL_DES_C */
+#endif /* POLARSSL_ENABLE_WEAK_CIPHERSUITES */
+
+    { 0, "", 0, 0, 0, 0, 0, 0, 0, 0 }
+};
+
+#if defined(SSL_CIPHERSUITES)
+const int *ssl_list_ciphersuites( void )
+{
+    return( ciphersuite_preference );
+}
+#else
+#define MAX_CIPHERSUITES    sizeof( ciphersuite_definitions     ) /         \
+                            sizeof( ciphersuite_definitions[0]  )
+static int supported_ciphersuites[MAX_CIPHERSUITES];
+static int supported_init = 0;
+
+const int *ssl_list_ciphersuites( void )
+{
+    /*
+     * On initial call filter out all ciphersuites not supported by current
+     * build based on presence in the ciphersuite_definitions.
+     */
+    if( supported_init == 0 )
+    {
+        const int *p;
+        int *q;
+
+        for( p = ciphersuite_preference, q = supported_ciphersuites;
+             *p != 0 && q < supported_ciphersuites + MAX_CIPHERSUITES - 1;
+             p++ )
+        {
+#if defined(POLARSSL_REMOVE_ARC4_CIPHERSUITES)
+            const ssl_ciphersuite_t *cs_info;
+            if( ( cs_info = ssl_ciphersuite_from_id( *p ) ) != NULL &&
+                cs_info->cipher != POLARSSL_CIPHER_ARC4_128 )
+#else
+            if( ssl_ciphersuite_from_id( *p ) != NULL )
+#endif
+                *(q++) = *p;
+        }
+        *q = 0;
+
+        supported_init = 1;
+    }
+
+    return( supported_ciphersuites );
+};
+#endif /* SSL_CIPHERSUITES */
+
+const ssl_ciphersuite_t *ssl_ciphersuite_from_string(
+                                                const char *ciphersuite_name )
+{
+    const ssl_ciphersuite_t *cur = ciphersuite_definitions;
+
+    if( NULL == ciphersuite_name )
+        return( NULL );
+
+    while( cur->id != 0 )
+    {
+        if( 0 == strcasecmp( cur->name, ciphersuite_name ) )
+            return( cur );
+
+        cur++;
+    }
+
+    return( NULL );
+}
+
+const ssl_ciphersuite_t *ssl_ciphersuite_from_id( int ciphersuite )
+{
+    const ssl_ciphersuite_t *cur = ciphersuite_definitions;
+
+    while( cur->id != 0 )
+    {
+        if( cur->id == ciphersuite )
+            return( cur );
+
+        cur++;
+    }
+
+    return( NULL );
+}
+
+const char *ssl_get_ciphersuite_name( const int ciphersuite_id )
+{
+    const ssl_ciphersuite_t *cur;
+
+    cur = ssl_ciphersuite_from_id( ciphersuite_id );
+
+    if( cur == NULL )
+        return( "unknown" );
+
+    return( cur->name );
+}
+
+int ssl_get_ciphersuite_id( const char *ciphersuite_name )
+{
+    const ssl_ciphersuite_t *cur;
+
+    cur = ssl_ciphersuite_from_string( ciphersuite_name );
+
+    if( cur == NULL )
+        return( 0 );
+
+    return( cur->id );
+}
+
+#if defined(POLARSSL_PK_C)
+pk_type_t ssl_get_ciphersuite_sig_pk_alg( const ssl_ciphersuite_t *info )
+{
+    switch( info->key_exchange )
+    {
+        case POLARSSL_KEY_EXCHANGE_RSA:
+        case POLARSSL_KEY_EXCHANGE_DHE_RSA:
+        case POLARSSL_KEY_EXCHANGE_ECDHE_RSA:
+        case POLARSSL_KEY_EXCHANGE_RSA_PSK:
+            return( POLARSSL_PK_RSA );
+
+        case POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA:
+            return( POLARSSL_PK_ECDSA );
+
+        case POLARSSL_KEY_EXCHANGE_ECDH_RSA:
+        case POLARSSL_KEY_EXCHANGE_ECDH_ECDSA:
+            return( POLARSSL_PK_ECKEY );
+
+        default:
+            return( POLARSSL_PK_NONE );
+    }
+}
+#endif /* POLARSSL_PK_C */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+int ssl_ciphersuite_uses_ec( const ssl_ciphersuite_t *info )
+{
+    switch( info->key_exchange )
+    {
+        case POLARSSL_KEY_EXCHANGE_ECDHE_RSA:
+        case POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA:
+        case POLARSSL_KEY_EXCHANGE_ECDHE_PSK:
+        case POLARSSL_KEY_EXCHANGE_ECDH_RSA:
+        case POLARSSL_KEY_EXCHANGE_ECDH_ECDSA:
+            return( 1 );
+
+        default:
+            return( 0 );
+    }
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+int ssl_ciphersuite_uses_psk( const ssl_ciphersuite_t *info )
+{
+    switch( info->key_exchange )
+    {
+        case POLARSSL_KEY_EXCHANGE_PSK:
+        case POLARSSL_KEY_EXCHANGE_RSA_PSK:
+        case POLARSSL_KEY_EXCHANGE_DHE_PSK:
+        case POLARSSL_KEY_EXCHANGE_ECDHE_PSK:
+            return( 1 );
+
+        default:
+            return( 0 );
+    }
+}
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+
+#endif /* POLARSSL_SSL_TLS_C */
diff --git a/Externals/polarssl/library/ssl_cli.c b/Externals/polarssl/library/ssl_cli.c
index e4a102b90f..d38d769551 100644
--- a/Externals/polarssl/library/ssl_cli.c
+++ b/Externals/polarssl/library/ssl_cli.c
@@ -1,7 +1,7 @@
 /*
  *  SSLv3/TLSv1 client-side functions
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,33 +23,447 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_SSL_CLI_C)
 
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
 
-#if defined(POLARSSL_SHA4_C)
-#include "polarssl/sha4.h"
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
+#include <basetsd.h>
+typedef UINT32 uint32_t;
+#else
+#include <inttypes.h>
 #endif
 
+#if defined(POLARSSL_HAVE_TIME)
+#include <time.h>
+#endif
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+#endif
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+static void ssl_write_hostname_ext( ssl_context *ssl,
+                                    unsigned char *buf,
+                                    size_t *olen )
+{
+    unsigned char *p = buf;
+
+    *olen = 0;
+
+    if( ssl->hostname == NULL )
+        return;
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding server name extension: %s",
+                   ssl->hostname ) );
+
+    /*
+     * struct {
+     *     NameType name_type;
+     *     select (name_type) {
+     *         case host_name: HostName;
+     *     } name;
+     * } ServerName;
+     *
+     * enum {
+     *     host_name(0), (255)
+     * } NameType;
+     *
+     * opaque HostName<1..2^16-1>;
+     *
+     * struct {
+     *     ServerName server_name_list<1..2^16-1>
+     * } ServerNameList;
+     */
+    *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( (ssl->hostname_len + 5) >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( (ssl->hostname_len + 5)      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( (ssl->hostname_len + 3) >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( (ssl->hostname_len + 3)      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME_HOSTNAME ) & 0xFF );
+    *p++ = (unsigned char)( ( ssl->hostname_len >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( ssl->hostname_len      ) & 0xFF );
+
+    memcpy( p, ssl->hostname, ssl->hostname_len );
+
+    *olen = ssl->hostname_len + 9;
+}
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
+
+static void ssl_write_renegotiation_ext( ssl_context *ssl,
+                                         unsigned char *buf,
+                                         size_t *olen )
+{
+    unsigned char *p = buf;
+
+    *olen = 0;
+
+    if( ssl->renegotiation != SSL_RENEGOTIATION )
+        return;
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding renegotiation extension" ) );
+
+    /*
+     * Secure renegotiation
+     */
+    *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = ( ssl->verify_data_len + 1 ) & 0xFF;
+    *p++ = ssl->verify_data_len & 0xFF;
+
+    memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
+
+    *olen = 5 + ssl->verify_data_len;
+}
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+static void ssl_write_signature_algorithms_ext( ssl_context *ssl,
+                                                unsigned char *buf,
+                                                size_t *olen )
+{
+    unsigned char *p = buf;
+    size_t sig_alg_len = 0;
+#if defined(POLARSSL_RSA_C) || defined(POLARSSL_ECDSA_C)
+    unsigned char *sig_alg_list = buf + 6;
+#endif
+
+    *olen = 0;
+
+    if( ssl->max_minor_ver != SSL_MINOR_VERSION_3 )
+        return;
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding signature_algorithms extension" ) );
+
+    /*
+     * Prepare signature_algorithms extension (TLS 1.2)
+     */
+#if defined(POLARSSL_RSA_C)
+#if defined(POLARSSL_SHA512_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA512;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA384;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+#endif
+#if defined(POLARSSL_SHA256_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA256;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA224;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+#endif
+#if defined(POLARSSL_SHA1_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA1;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+#endif
+#if defined(POLARSSL_MD5_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_MD5;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+#endif
+#endif /* POLARSSL_RSA_C */
+#if defined(POLARSSL_ECDSA_C)
+#if defined(POLARSSL_SHA512_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA512;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA384;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+#endif
+#if defined(POLARSSL_SHA256_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA256;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA224;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+#endif
+#if defined(POLARSSL_SHA1_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_SHA1;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+#endif
+#if defined(POLARSSL_MD5_C)
+    sig_alg_list[sig_alg_len++] = SSL_HASH_MD5;
+    sig_alg_list[sig_alg_len++] = SSL_SIG_ECDSA;
+#endif
+#endif /* POLARSSL_ECDSA_C */
+
+    /*
+     * enum {
+     *     none(0), md5(1), sha1(2), sha224(3), sha256(4), sha384(5),
+     *     sha512(6), (255)
+     * } HashAlgorithm;
+     *
+     * enum { anonymous(0), rsa(1), dsa(2), ecdsa(3), (255) }
+     *   SignatureAlgorithm;
+     *
+     * struct {
+     *     HashAlgorithm hash;
+     *     SignatureAlgorithm signature;
+     * } SignatureAndHashAlgorithm;
+     *
+     * SignatureAndHashAlgorithm
+     *   supported_signature_algorithms<2..2^16-2>;
+     */
+    *p++ = (unsigned char)( ( TLS_EXT_SIG_ALG >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SIG_ALG      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( ( sig_alg_len + 2 ) >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( ( sig_alg_len + 2 )      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( sig_alg_len >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( sig_alg_len      ) & 0xFF );
+
+    *olen = 6 + sig_alg_len;
+}
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+static void ssl_write_supported_elliptic_curves_ext( ssl_context *ssl,
+                                                     unsigned char *buf,
+                                                     size_t *olen )
+{
+    unsigned char *p = buf;
+    unsigned char *elliptic_curve_list = p + 6;
+    size_t elliptic_curve_len = 0;
+    const ecp_curve_info *info;
+#if defined(POLARSSL_SSL_SET_CURVES)
+    const ecp_group_id *grp_id;
+#else
+    ((void) ssl);
+#endif
+
+    *olen = 0;
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding supported_elliptic_curves extension" ) );
+
+#if defined(POLARSSL_SSL_SET_CURVES)
+    for( grp_id = ssl->curve_list; *grp_id != POLARSSL_ECP_DP_NONE; grp_id++ )
+    {
+        info = ecp_curve_info_from_grp_id( *grp_id );
+#else
+    for( info = ecp_curve_list(); info->grp_id != POLARSSL_ECP_DP_NONE; info++ )
+    {
+#endif
+
+        elliptic_curve_list[elliptic_curve_len++] = info->tls_id >> 8;
+        elliptic_curve_list[elliptic_curve_len++] = info->tls_id & 0xFF;
+    }
+
+    if( elliptic_curve_len == 0 )
+        return;
+
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_ELLIPTIC_CURVES >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_ELLIPTIC_CURVES      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( ( elliptic_curve_len + 2 ) >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( ( elliptic_curve_len + 2 )      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( ( elliptic_curve_len     ) >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( ( elliptic_curve_len     )      ) & 0xFF );
+
+    *olen = 6 + elliptic_curve_len;
+}
+
+static void ssl_write_supported_point_formats_ext( ssl_context *ssl,
+                                                   unsigned char *buf,
+                                                   size_t *olen )
+{
+    unsigned char *p = buf;
+    ((void) ssl);
+
+    *olen = 0;
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding supported_point_formats extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_POINT_FORMATS >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_POINT_FORMATS      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 2;
+
+    *p++ = 1;
+    *p++ = POLARSSL_ECP_PF_UNCOMPRESSED;
+
+    *olen = 6;
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+static void ssl_write_max_fragment_length_ext( ssl_context *ssl,
+                                               unsigned char *buf,
+                                               size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->mfl_code == SSL_MAX_FRAG_LEN_NONE ) {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding max_fragment_length extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_MAX_FRAGMENT_LENGTH >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_MAX_FRAGMENT_LENGTH      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 1;
+
+    *p++ = ssl->mfl_code;
+
+    *olen = 5;
+}
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+static void ssl_write_truncated_hmac_ext( ssl_context *ssl,
+                                          unsigned char *buf, size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->trunc_hmac == SSL_TRUNC_HMAC_DISABLED )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding truncated_hmac extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_TRUNCATED_HMAC >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_TRUNCATED_HMAC      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 0x00;
+
+    *olen = 4;
+}
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static void ssl_write_session_ticket_ext( ssl_context *ssl,
+                                          unsigned char *buf, size_t *olen )
+{
+    unsigned char *p = buf;
+    size_t tlen = ssl->session_negotiate->ticket_len;
+
+    if( ssl->session_tickets == SSL_SESSION_TICKETS_DISABLED )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding session ticket extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_SESSION_TICKET >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SESSION_TICKET      ) & 0xFF );
+
+    *p++ = (unsigned char)( ( tlen >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( tlen      ) & 0xFF );
+
+    *olen = 4;
+
+    if( ssl->session_negotiate->ticket == NULL ||
+        ssl->session_negotiate->ticket_len == 0 )
+    {
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "sending session ticket of length %d", tlen ) );
+
+    memcpy( p, ssl->session_negotiate->ticket, tlen );
+
+    *olen += tlen;
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_SSL_ALPN)
+static void ssl_write_alpn_ext( ssl_context *ssl,
+                                unsigned char *buf, size_t *olen )
+{
+    unsigned char *p = buf;
+    const char **cur;
+
+    if( ssl->alpn_list == NULL )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "client hello, adding alpn extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_ALPN >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_ALPN      ) & 0xFF );
+
+    /*
+     * opaque ProtocolName<1..2^8-1>;
+     *
+     * struct {
+     *     ProtocolName protocol_name_list<2..2^16-1>
+     * } ProtocolNameList;
+     */
+
+    /* Skip writing extension and list length for now */
+    p += 4;
+
+    for( cur = ssl->alpn_list; *cur != NULL; cur++ )
+    {
+        *p = (unsigned char)( strlen( *cur ) & 0xFF );
+        memcpy( p + 1, *cur, *p );
+        p += 1 + *p;
+    }
+
+    *olen = p - buf;
+
+    /* List length = olen - 2 (ext_type) - 2 (ext_len) - 2 (list_len) */
+    buf[4] = (unsigned char)( ( ( *olen - 6 ) >> 8 ) & 0xFF );
+    buf[5] = (unsigned char)( ( ( *olen - 6 )      ) & 0xFF );
+
+    /* Extension length = olen - 2 (ext_type) - 2 (ext_len) */
+    buf[2] = (unsigned char)( ( ( *olen - 4 ) >> 8 ) & 0xFF );
+    buf[3] = (unsigned char)( ( ( *olen - 4 )      ) & 0xFF );
+}
+#endif /* POLARSSL_SSL_ALPN */
+
 static int ssl_write_client_hello( ssl_context *ssl )
 {
     int ret;
-    size_t i, n, ext_len = 0;
+    size_t i, n, olen, ext_len = 0;
     unsigned char *buf;
-    unsigned char *p;
+    unsigned char *p, *q;
+#if defined(POLARSSL_HAVE_TIME)
     time_t t;
-    unsigned char sig_alg_list[20];
-    size_t sig_alg_len = 0;
+#endif
+    const int *ciphersuites;
+    const ssl_ciphersuite_t *ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> write client hello" ) );
 
+    if( ssl->f_rng == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "no RNG provided") );
+        return( POLARSSL_ERR_SSL_NO_RNG );
+    }
+
     if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
     {
         ssl->major_ver = ssl->min_major_ver;
@@ -58,8 +472,8 @@ static int ssl_write_client_hello( ssl_context *ssl )
 
     if( ssl->max_major_ver == 0 && ssl->max_minor_ver == 0 )
     {
-        ssl->max_major_ver = SSL_MAJOR_VERSION_3;
-        ssl->max_minor_ver = SSL_MINOR_VERSION_3;
+        ssl->max_major_ver = SSL_MAX_MAJOR_VERSION;
+        ssl->max_minor_ver = SSL_MAX_MINOR_VERSION;
     }
 
     /*
@@ -78,6 +492,7 @@ static int ssl_write_client_hello( ssl_context *ssl )
     SSL_DEBUG_MSG( 3, ( "client hello, max version: [%d:%d]",
                    buf[4], buf[5] ) );
 
+#if defined(POLARSSL_HAVE_TIME)
     t = time( NULL );
     *p++ = (unsigned char)( t >> 24 );
     *p++ = (unsigned char)( t >> 16 );
@@ -85,6 +500,12 @@ static int ssl_write_client_hello( ssl_context *ssl )
     *p++ = (unsigned char)( t       );
 
     SSL_DEBUG_MSG( 3, ( "client hello, current time: %lu", t ) );
+#else
+    if( ( ret = ssl->f_rng( ssl->p_rng, p, 4 ) ) != 0 )
+        return( ret );
+
+    p += 4;
+#endif /* POLARSSL_HAVE_TIME */
 
     if( ( ret = ssl->f_rng( ssl->p_rng, p, 28 ) ) != 0 )
         return( ret );
@@ -109,7 +530,27 @@ static int ssl_write_client_hello( ssl_context *ssl )
 
     if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE || n < 16 || n > 32 ||
         ssl->handshake->resume == 0 )
+    {
         n = 0;
+    }
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    /*
+     * RFC 5077 section 3.4: "When presenting a ticket, the client MAY
+     * generate and include a Session ID in the TLS ClientHello."
+     */
+    if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE &&
+        ssl->session_negotiate->ticket != NULL &&
+        ssl->session_negotiate->ticket_len != 0 )
+    {
+        ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id, 32 );
+
+        if( ret != 0 )
+            return( ret );
+
+        ssl->session_negotiate->length = n = 32;
+    }
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 
     *p++ = (unsigned char) n;
 
@@ -119,10 +560,12 @@ static int ssl_write_client_hello( ssl_context *ssl )
     SSL_DEBUG_MSG( 3, ( "client hello, session id len.: %d", n ) );
     SSL_DEBUG_BUF( 3,   "client hello, session id", buf + 39, n );
 
-    for( n = 0; ssl->ciphersuites[ssl->minor_ver][n] != 0; n++ );
-    if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) n++;
-    *p++ = (unsigned char)( n >> 7 );
-    *p++ = (unsigned char)( n << 1 );
+    ciphersuites = ssl->ciphersuite_list[ssl->minor_ver];
+    n = 0;
+    q = p;
+
+    // Skip writing ciphersuite length for now
+    p += 2;
 
     /*
      * Add TLS_EMPTY_RENEGOTIATION_INFO_SCSV
@@ -131,19 +574,33 @@ static int ssl_write_client_hello( ssl_context *ssl )
     {
         *p++ = (unsigned char)( SSL_EMPTY_RENEGOTIATION_INFO >> 8 );
         *p++ = (unsigned char)( SSL_EMPTY_RENEGOTIATION_INFO      );
-        n--;
+        n++;
     }
 
+    for( i = 0; ciphersuites[i] != 0; i++ )
+    {
+        ciphersuite_info = ssl_ciphersuite_from_id( ciphersuites[i] );
+
+        if( ciphersuite_info == NULL )
+            continue;
+
+        if( ciphersuite_info->min_minor_ver > ssl->max_minor_ver ||
+            ciphersuite_info->max_minor_ver < ssl->min_minor_ver )
+            continue;
+
+        SSL_DEBUG_MSG( 3, ( "client hello, add ciphersuite: %2d",
+                       ciphersuites[i] ) );
+
+        n++;
+        *p++ = (unsigned char)( ciphersuites[i] >> 8 );
+        *p++ = (unsigned char)( ciphersuites[i]      );
+    }
+
+    *q++ = (unsigned char)( n >> 7 );
+    *q++ = (unsigned char)( n << 1 );
+
     SSL_DEBUG_MSG( 3, ( "client hello, got %d ciphersuites", n ) );
 
-    for( i = 0; i < n; i++ )
-    {
-        SSL_DEBUG_MSG( 3, ( "client hello, add ciphersuite: %2d",
-                       ssl->ciphersuites[ssl->minor_ver][i] ) );
-
-        *p++ = (unsigned char)( ssl->ciphersuites[ssl->minor_ver][i] >> 8 );
-        *p++ = (unsigned char)( ssl->ciphersuites[ssl->minor_ver][i]      );
-    }
 
 #if defined(POLARSSL_ZLIB_SUPPORT)
     SSL_DEBUG_MSG( 3, ( "client hello, compress len.: %d", 2 ) );
@@ -159,147 +616,59 @@ static int ssl_write_client_hello( ssl_context *ssl )
 
     *p++ = 1;
     *p++ = SSL_COMPRESS_NULL;
+#endif /* POLARSSL_ZLIB_SUPPORT */
+
+    // First write extensions, then the total length
+    //
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    ssl_write_hostname_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 #endif
 
-    if ( ssl->hostname != NULL )
-    {
-        SSL_DEBUG_MSG( 3, ( "client hello, prepping for server name extension: %s",
-                       ssl->hostname ) );
+    ssl_write_renegotiation_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 
-        ext_len += ssl->hostname_len + 9;
-    }
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+    ssl_write_signature_algorithms_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
 
-    if( ssl->renegotiation == SSL_RENEGOTIATION )
-    {
-        SSL_DEBUG_MSG( 3, ( "client hello, prepping for renegotiation extension" ) );
-        ext_len += 5 + ssl->verify_data_len;
-    }
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+    ssl_write_supported_elliptic_curves_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 
-    /*
-     * Prepare signature_algorithms extension (TLS 1.2)
-     */
-    if( ssl->max_minor_ver == SSL_MINOR_VERSION_3 )
-    {
-#if defined(POLARSSL_SHA4_C)
-        sig_alg_list[sig_alg_len++] = SSL_HASH_SHA512;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
-        sig_alg_list[sig_alg_len++] = SSL_HASH_SHA384;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+    ssl_write_supported_point_formats_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 #endif
-#if defined(POLARSSL_SHA2_C)
-        sig_alg_list[sig_alg_len++] = SSL_HASH_SHA256;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
-        sig_alg_list[sig_alg_len++] = SSL_HASH_SHA224;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    ssl_write_max_fragment_length_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 #endif
-#if defined(POLARSSL_SHA1_C)
-        sig_alg_list[sig_alg_len++] = SSL_HASH_SHA1;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+    ssl_write_truncated_hmac_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 #endif
-#if defined(POLARSSL_MD5_C)
-        sig_alg_list[sig_alg_len++] = SSL_HASH_MD5;
-        sig_alg_list[sig_alg_len++] = SSL_SIG_RSA;
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+#if defined(POLARSSL_SSL_ALPN)
+    ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
 #endif
-        ext_len += 6 + sig_alg_len;
-    }
 
     SSL_DEBUG_MSG( 3, ( "client hello, total extension length: %d",
                    ext_len ) );
 
-    *p++ = (unsigned char)( ( ext_len >> 8 ) & 0xFF );
-    *p++ = (unsigned char)( ( ext_len      ) & 0xFF );
-
-    if ( ssl->hostname != NULL )
+    if( ext_len > 0 )
     {
-        /*
-         * struct {
-         *     NameType name_type;
-         *     select (name_type) {
-         *         case host_name: HostName;
-         *     } name;
-         * } ServerName;
-         *
-         * enum {
-         *     host_name(0), (255)
-         * } NameType;
-         *
-         * opaque HostName<1..2^16-1>;
-         *
-         * struct {
-         *     ServerName server_name_list<1..2^16-1>
-         * } ServerNameList;
-         */
-        SSL_DEBUG_MSG( 3, ( "client hello, adding server name extension: %s",
-                       ssl->hostname ) );
-
-        *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME      ) & 0xFF );
-
-        *p++ = (unsigned char)( ( (ssl->hostname_len + 5) >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( (ssl->hostname_len + 5)      ) & 0xFF );
-
-        *p++ = (unsigned char)( ( (ssl->hostname_len + 3) >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( (ssl->hostname_len + 3)      ) & 0xFF );
-
-        *p++ = (unsigned char)( ( TLS_EXT_SERVERNAME_HOSTNAME ) & 0xFF );
-        *p++ = (unsigned char)( ( ssl->hostname_len >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( ssl->hostname_len      ) & 0xFF );
-
-        memcpy( p, ssl->hostname, ssl->hostname_len );
-        p += ssl->hostname_len;
-    }
-
-    if( ssl->renegotiation == SSL_RENEGOTIATION )
-    {
-        /*
-         * Secure renegotiation
-         */
-        SSL_DEBUG_MSG( 3, ( "client hello, renegotiation info extension" ) );
-
-        *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO      ) & 0xFF );
-
-        *p++ = 0x00;
-        *p++ = ( ssl->verify_data_len + 1 ) & 0xFF;
-        *p++ = ssl->verify_data_len & 0xFF;
-
-        memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
-        p += ssl->verify_data_len;
-    }
-
-    if( ssl->max_minor_ver == SSL_MINOR_VERSION_3 )
-    {
-        /*
-         * enum {
-         *     none(0), md5(1), sha1(2), sha224(3), sha256(4), sha384(5),
-         *     sha512(6), (255)
-         * } HashAlgorithm;
-         *
-         * enum { anonymous(0), rsa(1), dsa(2), ecdsa(3), (255) }
-         *   SignatureAlgorithm;
-         *
-         * struct {
-         *     HashAlgorithm hash;
-         *     SignatureAlgorithm signature;
-         * } SignatureAndHashAlgorithm;
-         *
-         * SignatureAndHashAlgorithm
-         *   supported_signature_algorithms<2..2^16-2>;
-         */
-        SSL_DEBUG_MSG( 3, ( "client hello, adding signature_algorithms extension" ) );
-
-        *p++ = (unsigned char)( ( TLS_EXT_SIG_ALG >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( TLS_EXT_SIG_ALG      ) & 0xFF );
-
-        *p++ = (unsigned char)( ( ( sig_alg_len + 2 ) >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( ( sig_alg_len + 2 )      ) & 0xFF );
-
-        *p++ = (unsigned char)( ( sig_alg_len >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( sig_alg_len      ) & 0xFF );
-
-        memcpy( p, sig_alg_list, sig_alg_len );
-
-        p += sig_alg_len;
+        *p++ = (unsigned char)( ( ext_len >> 8 ) & 0xFF );
+        *p++ = (unsigned char)( ( ext_len      ) & 0xFF );
+        p += ext_len;
     }
 
     ssl->out_msglen  = p - buf;
@@ -320,7 +689,7 @@ static int ssl_write_client_hello( ssl_context *ssl )
 }
 
 static int ssl_parse_renegotiation_info( ssl_context *ssl,
-                                         unsigned char *buf,
+                                         const unsigned char *buf,
                                          size_t len )
 {
     int ret;
@@ -341,11 +710,13 @@ static int ssl_parse_renegotiation_info( ssl_context *ssl,
     }
     else
     {
+        /* Check verify-data in constant-time. The length OTOH is no secret */
         if( len    != 1 + ssl->verify_data_len * 2 ||
             buf[0] !=     ssl->verify_data_len * 2 ||
-            memcmp( buf + 1, ssl->own_verify_data,  ssl->verify_data_len ) != 0 ||
-            memcmp( buf + 1 + ssl->verify_data_len,
-                    ssl->peer_verify_data, ssl->verify_data_len ) != 0 )
+            safer_memcmp( buf + 1,
+                          ssl->own_verify_data, ssl->verify_data_len ) != 0 ||
+            safer_memcmp( buf + 1 + ssl->verify_data_len,
+                          ssl->peer_verify_data, ssl->verify_data_len ) != 0 )
         {
             SSL_DEBUG_MSG( 1, ( "non-matching renegotiated connection field" ) );
 
@@ -359,17 +730,158 @@ static int ssl_parse_renegotiation_info( ssl_context *ssl,
     return( 0 );
 }
 
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+static int ssl_parse_max_fragment_length_ext( ssl_context *ssl,
+                                              const unsigned char *buf,
+                                              size_t len )
+{
+    /*
+     * server should use the extension only if we did,
+     * and if so the server's value should match ours (and len is always 1)
+     */
+    if( ssl->mfl_code == SSL_MAX_FRAG_LEN_NONE ||
+        len != 1 ||
+        buf[0] != ssl->mfl_code )
+    {
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+static int ssl_parse_truncated_hmac_ext( ssl_context *ssl,
+                                         const unsigned char *buf,
+                                         size_t len )
+{
+    if( ssl->trunc_hmac == SSL_TRUNC_HMAC_DISABLED ||
+        len != 0 )
+    {
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+    }
+
+    ((void) buf);
+
+    ssl->session_negotiate->trunc_hmac = SSL_TRUNC_HMAC_ENABLED;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static int ssl_parse_session_ticket_ext( ssl_context *ssl,
+                                         const unsigned char *buf,
+                                         size_t len )
+{
+    if( ssl->session_tickets == SSL_SESSION_TICKETS_DISABLED ||
+        len != 0 )
+    {
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+    }
+
+    ((void) buf);
+
+    ssl->handshake->new_session_ticket = 1;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+static int ssl_parse_supported_point_formats_ext( ssl_context *ssl,
+                                                  const unsigned char *buf,
+                                                  size_t len )
+{
+    size_t list_size;
+    const unsigned char *p;
+
+    list_size = buf[0];
+    if( list_size + 1 != len )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad server hello message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+    }
+
+    p = buf + 1;
+    while( list_size > 0 )
+    {
+        if( p[0] == POLARSSL_ECP_PF_UNCOMPRESSED ||
+            p[0] == POLARSSL_ECP_PF_COMPRESSED )
+        {
+            ssl->handshake->ecdh_ctx.point_format = p[0];
+            SSL_DEBUG_MSG( 4, ( "point format selected: %d", p[0] ) );
+            return( 0 );
+        }
+
+        list_size--;
+        p++;
+    }
+
+    SSL_DEBUG_MSG( 1, ( "no point format in common" ) );
+    return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_SSL_ALPN)
+static int ssl_parse_alpn_ext( ssl_context *ssl,
+                               const unsigned char *buf, size_t len )
+{
+    size_t list_len, name_len;
+    const char **p;
+
+    /* If we didn't send it, the server shouldn't send it */
+    if( ssl->alpn_list == NULL )
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+
+    /*
+     * opaque ProtocolName<1..2^8-1>;
+     *
+     * struct {
+     *     ProtocolName protocol_name_list<2..2^16-1>
+     * } ProtocolNameList;
+     *
+     * the "ProtocolNameList" MUST contain exactly one "ProtocolName"
+     */
+
+    /* Min length is 2 (list_len) + 1 (name_len) + 1 (name) */
+    if( len < 4 )
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+
+    list_len = ( buf[0] << 8 ) | buf[1];
+    if( list_len != len - 2 )
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+
+    name_len = buf[2];
+    if( name_len != list_len - 1 )
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+
+    /* Check that the server chosen protocol was in our list and save it */
+    for( p = ssl->alpn_list; *p != NULL; p++ )
+    {
+        if( name_len == strlen( *p ) &&
+            memcmp( buf + 3, *p, name_len ) == 0 )
+        {
+            ssl->alpn_chosen = *p;
+            return( 0 );
+        }
+    }
+
+    return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
+}
+#endif /* POLARSSL_SSL_ALPN */
+
 static int ssl_parse_server_hello( ssl_context *ssl )
 {
-#if defined(POLARSSL_DEBUG_C)
-    time_t t;
-#endif
     int ret, i, comp;
     size_t n;
     size_t ext_len = 0;
     unsigned char *buf, *ext;
     int renegotiation_info_seen = 0;
     int handshake_failure = 0;
+#if defined(POLARSSL_DEBUG_C)
+    uint32_t t;
+#endif
 
     SSL_DEBUG_MSG( 2, ( "=> parse server hello" ) );
 
@@ -416,8 +928,8 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     if( ssl->minor_ver < ssl->min_minor_ver )
     {
         SSL_DEBUG_MSG( 1, ( "server only supports ssl smaller than minimum"
-                            " [%d:%d] < [%d:%d]", ssl->major_ver, ssl->minor_ver,
-                            buf[4], buf[5] ) );
+                            " [%d:%d] < [%d:%d]", ssl->major_ver,
+                            ssl->minor_ver, buf[4], buf[5] ) );
 
         ssl_send_alert_message( ssl, SSL_ALERT_LEVEL_FATAL,
                                      SSL_ALERT_MSG_PROTOCOL_VERSION );
@@ -426,17 +938,17 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     }
 
 #if defined(POLARSSL_DEBUG_C)
-    t = ( (time_t) buf[6] << 24 )
-      | ( (time_t) buf[7] << 16 )
-      | ( (time_t) buf[8] <<  8 )
-      | ( (time_t) buf[9]       );
+    t = ( (uint32_t) buf[6] << 24 )
+      | ( (uint32_t) buf[7] << 16 )
+      | ( (uint32_t) buf[8] <<  8 )
+      | ( (uint32_t) buf[9]       );
+    SSL_DEBUG_MSG( 3, ( "server hello, current time: %lu", t ) );
 #endif
 
     memcpy( ssl->handshake->randbytes + 32, buf + 6, 32 );
 
     n = buf[38];
 
-    SSL_DEBUG_MSG( 3, ( "server hello, current time: %lu", t ) );
     SSL_DEBUG_BUF( 3,   "server hello, random bytes", buf + 6, 32 );
 
     if( n > 32 )
@@ -472,7 +984,15 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     /*
      * Initialize update checksum functions
      */
-    ssl_optimize_checksum( ssl, i );
+    ssl->transform_negotiate->ciphersuite_info = ssl_ciphersuite_from_id( i );
+
+    if( ssl->transform_negotiate->ciphersuite_info == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "ciphersuite info for %04x not found", i ) );
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
 
     SSL_DEBUG_MSG( 3, ( "server hello, session id len.: %d", n ) );
     SSL_DEBUG_BUF( 3,   "server hello, session id", buf + 39, n );
@@ -489,7 +1009,9 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     {
         ssl->state++;
         ssl->handshake->resume = 0;
+#if defined(POLARSSL_HAVE_TIME)
         ssl->session_negotiate->start = time( NULL );
+#endif
         ssl->session_negotiate->ciphersuite = i;
         ssl->session_negotiate->compression = comp;
         ssl->session_negotiate->length = n;
@@ -515,14 +1037,17 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     i = 0;
     while( 1 )
     {
-        if( ssl->ciphersuites[ssl->minor_ver][i] == 0 )
+        if( ssl->ciphersuite_list[ssl->minor_ver][i] == 0 )
         {
             SSL_DEBUG_MSG( 1, ( "bad server hello message" ) );
             return( POLARSSL_ERR_SSL_BAD_HS_SERVER_HELLO );
         }
 
-        if( ssl->ciphersuites[ssl->minor_ver][i++] == ssl->session_negotiate->ciphersuite )
+        if( ssl->ciphersuite_list[ssl->minor_ver][i++] ==
+            ssl->session_negotiate->ciphersuite )
+        {
             break;
+        }
     }
 
     if( comp != SSL_COMPRESS_NULL
@@ -538,6 +1063,8 @@ static int ssl_parse_server_hello( ssl_context *ssl )
 
     ext = buf + 44 + n;
 
+    SSL_DEBUG_MSG( 2, ( "server hello, total extension length: %d", ext_len ) );
+
     while( ext_len )
     {
         unsigned int ext_id   = ( ( ext[0] <<  8 )
@@ -557,11 +1084,74 @@ static int ssl_parse_server_hello( ssl_context *ssl )
             SSL_DEBUG_MSG( 3, ( "found renegotiation extension" ) );
             renegotiation_info_seen = 1;
 
-            if( ( ret = ssl_parse_renegotiation_info( ssl, ext + 4, ext_size ) ) != 0 )
+            if( ( ret = ssl_parse_renegotiation_info( ssl, ext + 4,
+                                                      ext_size ) ) != 0 )
                 return( ret );
 
             break;
 
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+        case TLS_EXT_MAX_FRAGMENT_LENGTH:
+            SSL_DEBUG_MSG( 3, ( "found max_fragment_length extension" ) );
+
+            if( ( ret = ssl_parse_max_fragment_length_ext( ssl,
+                            ext + 4, ext_size ) ) != 0 )
+            {
+                return( ret );
+            }
+
+            break;
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+        case TLS_EXT_TRUNCATED_HMAC:
+            SSL_DEBUG_MSG( 3, ( "found truncated_hmac extension" ) );
+
+            if( ( ret = ssl_parse_truncated_hmac_ext( ssl,
+                            ext + 4, ext_size ) ) != 0 )
+            {
+                return( ret );
+            }
+
+            break;
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+        case TLS_EXT_SESSION_TICKET:
+            SSL_DEBUG_MSG( 3, ( "found session_ticket extension" ) );
+
+            if( ( ret = ssl_parse_session_ticket_ext( ssl,
+                            ext + 4, ext_size ) ) != 0 )
+            {
+                return( ret );
+            }
+
+            break;
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+        case TLS_EXT_SUPPORTED_POINT_FORMATS:
+            SSL_DEBUG_MSG( 3, ( "found supported_point_formats extension" ) );
+
+            if( ( ret = ssl_parse_supported_point_formats_ext( ssl,
+                            ext + 4, ext_size ) ) != 0 )
+            {
+                return( ret );
+            }
+
+            break;
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_SSL_ALPN)
+        case TLS_EXT_ALPN:
+            SSL_DEBUG_MSG( 3, ( "found alpn extension" ) );
+
+            if( ( ret = ssl_parse_alpn_ext( ssl, ext + 4, ext_size ) ) != 0 )
+                return( ret );
+
+            break;
+#endif /* POLARSSL_SSL_ALPN */
+
         default:
             SSL_DEBUG_MSG( 3, ( "unknown extension found: %d (ignoring)",
                            ext_id ) );
@@ -585,7 +1175,7 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     {
         SSL_DEBUG_MSG( 1, ( "legacy renegotiation, breaking off handshake" ) );
         handshake_failure = 1;
-    } 
+    }
     else if( ssl->renegotiation == SSL_RENEGOTIATION &&
              ssl->secure_renegotiation == SSL_SECURE_RENEGOTIATION &&
              renegotiation_info_seen == 0 )
@@ -621,43 +1211,351 @@ static int ssl_parse_server_hello( ssl_context *ssl )
     return( 0 );
 }
 
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+static int ssl_parse_server_dh_params( ssl_context *ssl, unsigned char **p,
+                                       unsigned char *end )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+
+    /*
+     * Ephemeral DH parameters:
+     *
+     * struct {
+     *     opaque dh_p<1..2^16-1>;
+     *     opaque dh_g<1..2^16-1>;
+     *     opaque dh_Ys<1..2^16-1>;
+     * } ServerDHParams;
+     */
+    if( ( ret = dhm_read_params( &ssl->handshake->dhm_ctx, p, end ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 2, ( "dhm_read_params" ), ret );
+        return( ret );
+    }
+
+    if( ssl->handshake->dhm_ctx.len < 64  ||
+        ssl->handshake->dhm_ctx.len > 512 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad server key exchange message (DHM length)" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+    }
+
+    SSL_DEBUG_MPI( 3, "DHM: P ", &ssl->handshake->dhm_ctx.P  );
+    SSL_DEBUG_MPI( 3, "DHM: G ", &ssl->handshake->dhm_ctx.G  );
+    SSL_DEBUG_MPI( 3, "DHM: GY", &ssl->handshake->dhm_ctx.GY );
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) ||                   \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) ||                      \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+static int ssl_check_server_ecdh_params( const ssl_context *ssl )
+{
+    const ecp_curve_info *curve_info;
+
+    curve_info = ecp_curve_info_from_grp_id( ssl->handshake->ecdh_ctx.grp.id );
+    if( curve_info == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
+
+    SSL_DEBUG_MSG( 2, ( "ECDH curve: %s", curve_info->name ) );
+
+#if defined(POLARSSL_SSL_ECP_SET_CURVES)
+    if( ! ssl_curve_is_acceptable( ssl, ssl->handshake->ecdh_ctx.grp.id ) )
+#else
+    if( ssl->handshake->ecdh_ctx.grp.nbits < 163 ||
+        ssl->handshake->ecdh_ctx.grp.nbits > 521 )
+#endif
+        return( -1 );
+
+    SSL_DEBUG_ECP( 3, "ECDH: Qp", &ssl->handshake->ecdh_ctx.Qp );
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) ||                   \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+static int ssl_parse_server_ecdh_params( ssl_context *ssl,
+                                         unsigned char **p,
+                                         unsigned char *end )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+
+    /*
+     * Ephemeral ECDH parameters:
+     *
+     * struct {
+     *     ECParameters curve_params;
+     *     ECPoint      public;
+     * } ServerECDHParams;
+     */
+    if( ( ret = ecdh_read_params( &ssl->handshake->ecdh_ctx,
+                                  (const unsigned char **) p, end ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, ( "ecdh_read_params" ), ret );
+        return( ret );
+    }
+
+    if( ssl_check_server_ecdh_params( ssl ) != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad server key exchange message (ECDHE curve)" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+    }
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+static int ssl_parse_server_psk_hint( ssl_context *ssl,
+                                      unsigned char **p,
+                                      unsigned char *end )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    size_t  len;
+    ((void) ssl);
+
+    /*
+     * PSK parameters:
+     *
+     * opaque psk_identity_hint<0..2^16-1>;
+     */
+    len = (*p)[0] << 8 | (*p)[1];
+    *p += 2;
+
+    if( (*p) + len > end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad server key exchange message (psk_identity_hint length)" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+    }
+
+    // TODO: Retrieve PSK identity hint and callback to app
+    //
+    *p += len;
+    ret = 0;
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) ||                           \
+    defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+/*
+ * Generate a pre-master secret and encrypt it with the server's RSA key
+ */
+static int ssl_write_encrypted_pms( ssl_context *ssl,
+                                    size_t offset, size_t *olen,
+                                    size_t pms_offset )
+{
+    int ret;
+    size_t len_bytes = ssl->minor_ver == SSL_MINOR_VERSION_0 ? 0 : 2;
+    unsigned char *p = ssl->handshake->premaster + pms_offset;
+
+    /*
+     * Generate (part of) the pre-master as
+     *  struct {
+     *      ProtocolVersion client_version;
+     *      opaque random[46];
+     *  } PreMasterSecret;
+     */
+    p[0] = (unsigned char) ssl->max_major_ver;
+    p[1] = (unsigned char) ssl->max_minor_ver;
+
+    if( ( ret = ssl->f_rng( ssl->p_rng, p + 2, 46 ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "f_rng", ret );
+        return( ret );
+    }
+
+    ssl->handshake->pmslen = 48;
+
+    /*
+     * Now write it out, encrypted
+     */
+    if( ! pk_can_do( &ssl->session_negotiate->peer_cert->pk,
+                POLARSSL_PK_RSA ) )
+    {
+        SSL_DEBUG_MSG( 1, ( "certificate key type mismatch" ) );
+        return( POLARSSL_ERR_SSL_PK_TYPE_MISMATCH );
+    }
+
+    if( ( ret = pk_encrypt( &ssl->session_negotiate->peer_cert->pk,
+                            p, ssl->handshake->pmslen,
+                            ssl->out_msg + offset + len_bytes, olen,
+                            SSL_MAX_CONTENT_LEN - offset - len_bytes,
+                            ssl->f_rng, ssl->p_rng ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "rsa_pkcs1_encrypt", ret );
+        return( ret );
+    }
+
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+    if( len_bytes == 2 )
+    {
+        ssl->out_msg[offset+0] = (unsigned char)( *olen >> 8 );
+        ssl->out_msg[offset+1] = (unsigned char)( *olen      );
+        *olen += 2;
+    }
+#endif
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+static int ssl_parse_signature_algorithm( ssl_context *ssl,
+                                          unsigned char **p,
+                                          unsigned char *end,
+                                          md_type_t *md_alg,
+                                          pk_type_t *pk_alg )
+{
+    ((void) ssl);
+    *md_alg = POLARSSL_MD_NONE;
+    *pk_alg = POLARSSL_PK_NONE;
+
+    /* Only in TLS 1.2 */
+    if( ssl->minor_ver != SSL_MINOR_VERSION_3 )
+    {
+        return( 0 );
+    }
+
+    if( (*p) + 2 > end )
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+
+    /*
+     * Get hash algorithm
+     */
+    if( ( *md_alg = ssl_md_alg_from_hash( (*p)[0] ) ) == POLARSSL_MD_NONE )
+    {
+        SSL_DEBUG_MSG( 2, ( "Server used unsupported "
+                            "HashAlgorithm %d", *(p)[0] ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+    }
+
+    /*
+     * Get signature algorithm
+     */
+    if( ( *pk_alg = ssl_pk_alg_from_sig( (*p)[1] ) ) == POLARSSL_PK_NONE )
+    {
+        SSL_DEBUG_MSG( 2, ( "server used unsupported "
+                            "SignatureAlgorithm %d", (*p)[1] ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+    }
+
+    SSL_DEBUG_MSG( 2, ( "Server used SignatureAlgorithm %d", (*p)[1] ) );
+    SSL_DEBUG_MSG( 2, ( "Server used HashAlgorithm %d", (*p)[0] ) );
+    *p += 2;
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+static int ssl_get_ecdh_params_from_cert( ssl_context *ssl )
+{
+    int ret;
+    const ecp_keypair *peer_key;
+
+    if( ! pk_can_do( &ssl->session_negotiate->peer_cert->pk,
+                     POLARSSL_PK_ECKEY ) )
+    {
+        SSL_DEBUG_MSG( 1, ( "server key not ECDH capable" ) );
+        return( POLARSSL_ERR_SSL_PK_TYPE_MISMATCH );
+    }
+
+    peer_key = pk_ec( ssl->session_negotiate->peer_cert->pk );
+
+    if( ( ret = ecdh_get_params( &ssl->handshake->ecdh_ctx, peer_key,
+                                 POLARSSL_ECDH_THEIRS ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, ( "ecdh_get_params" ), ret );
+        return( ret );
+    }
+
+    if( ssl_check_server_ecdh_params( ssl ) != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad server certificate (ECDH curve)" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
+    }
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+
 static int ssl_parse_server_key_exchange( ssl_context *ssl )
 {
-#if defined(POLARSSL_DHM_C)
     int ret;
-    size_t n;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
     unsigned char *p, *end;
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    size_t sig_len, params_len;
     unsigned char hash[64];
-    md5_context md5;
-    sha1_context sha1;
-    int hash_id = SIG_RSA_RAW;
-    unsigned int hashlen = 0;
+    md_type_t md_alg = POLARSSL_MD_NONE;
+    size_t hashlen;
+    pk_type_t pk_alg = POLARSSL_PK_NONE;
 #endif
 
     SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );
 
-    if( ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_DES_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA )
     {
         SSL_DEBUG_MSG( 2, ( "<= skip parse server key exchange" ) );
         ssl->state++;
         return( 0 );
     }
+    ((void) p);
+    ((void) end);
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_ECDSA )
+    {
+        if( ( ret = ssl_get_ecdh_params_from_cert( ssl ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_get_ecdh_params_from_cert", ret );
+            return( ret );
+        }
+
+        SSL_DEBUG_MSG( 2, ( "<= skip parse server key exchange" ) );
+        ssl->state++;
+        return( 0 );
+    }
+    ((void) p);
+    ((void) end);
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
 
-#if !defined(POLARSSL_DHM_C)
-    SSL_DEBUG_MSG( 1, ( "support for dhm in not available" ) );
-    return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-#else
     if( ( ret = ssl_read_record( ssl ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_read_record", ret );
@@ -670,235 +1568,304 @@ static int ssl_parse_server_key_exchange( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
     }
 
+    /*
+     * ServerKeyExchange may be skipped with PSK and RSA-PSK when the server
+     * doesn't use a psk_identity_hint
+     */
     if( ssl->in_msg[0] != SSL_HS_SERVER_KEY_EXCHANGE )
     {
+        if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+            ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK )
+        {
+            ssl->record_read = 1;
+            goto exit;
+        }
+
         SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+        return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
     }
 
-    SSL_DEBUG_BUF( 3,   "server key exchange", ssl->in_msg + 4, ssl->in_hslen - 4 );
-
-    /*
-     * Ephemeral DH parameters:
-     *
-     * struct {
-     *     opaque dh_p<1..2^16-1>;
-     *     opaque dh_g<1..2^16-1>;
-     *     opaque dh_Ys<1..2^16-1>;
-     * } ServerDHParams;
-     */
     p   = ssl->in_msg + 4;
     end = ssl->in_msg + ssl->in_hslen;
+    SSL_DEBUG_BUF( 3,   "server key exchange", p, ssl->in_hslen - 4 );
 
-    if( ( ret = dhm_read_params( &ssl->handshake->dhm_ctx, &p, end ) ) != 0 )
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
     {
-        SSL_DEBUG_MSG( 2, ( "DHM Read Params returned -0x%x", -ret ) );
-        SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE ); 
-    }
-
-    if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
-    {
-        if( p[1] != SSL_SIG_RSA )
+        if( ssl_parse_server_psk_hint( ssl, &p, end ) != 0 )
         {
-            SSL_DEBUG_MSG( 2, ( "server used unsupported SignatureAlgorithm %d", p[1] ) );
             SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-            return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE ); 
+            return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
         }
+    } /* FALLTROUGH */
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
 
-        switch( p[0] )
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK )
+        ; /* nothing more to do */
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        if( ssl_parse_server_dh_params( ssl, &p, end ) != 0 )
         {
-#if defined(POLARSSL_MD5_C)
-            case SSL_HASH_MD5:
-                hash_id = SIG_RSA_MD5;
-                break;
-#endif
-#if defined(POLARSSL_SHA1_C)
-            case SSL_HASH_SHA1:
-                hash_id = SIG_RSA_SHA1;
-                break;
-#endif
-#if defined(POLARSSL_SHA2_C)
-            case SSL_HASH_SHA224:
-                hash_id = SIG_RSA_SHA224;
-                break;
-            case SSL_HASH_SHA256:
-                hash_id = SIG_RSA_SHA256;
-                break;
-#endif
-#if defined(POLARSSL_SHA4_C)
-            case SSL_HASH_SHA384:
-                hash_id = SIG_RSA_SHA384;
-                break;
-            case SSL_HASH_SHA512:
-                hash_id = SIG_RSA_SHA512;
-                break;
-#endif
-            default:
-                SSL_DEBUG_MSG( 2, ( "Server used unsupported HashAlgorithm %d", p[0] ) );
-                SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-                return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE ); 
-        }      
-
-        SSL_DEBUG_MSG( 2, ( "Server used SignatureAlgorithm %d", p[1] ) );
-        SSL_DEBUG_MSG( 2, ( "Server used HashAlgorithm %d", p[0] ) );
-        p += 2;
-    }
-
-    n = ( p[0] << 8 ) | p[1];
-    p += 2;
-
-    if( end != p + n )
-    {
-        SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
-    }
-
-    if( (unsigned int)( end - p ) !=
-        ssl->session_negotiate->peer_cert->rsa.len )
-    {
-        SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
-    }
-
-    if( ssl->handshake->dhm_ctx.len < 64 || ssl->handshake->dhm_ctx.len > 512 )
-    {
-        SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
-    }
-
-    SSL_DEBUG_MPI( 3, "DHM: P ", &ssl->handshake->dhm_ctx.P  );
-    SSL_DEBUG_MPI( 3, "DHM: G ", &ssl->handshake->dhm_ctx.G  );
-    SSL_DEBUG_MPI( 3, "DHM: GY", &ssl->handshake->dhm_ctx.GY );
-
-    if( ssl->minor_ver != SSL_MINOR_VERSION_3 )
-    {
-        /*
-         * digitally-signed struct {
-         *     opaque md5_hash[16];
-         *     opaque sha_hash[20];
-         * };
-         *
-         * md5_hash
-         *     MD5(ClientHello.random + ServerHello.random
-         *                            + ServerParams);
-         * sha_hash
-         *     SHA(ClientHello.random + ServerHello.random
-         *                            + ServerParams);
-         */
-        n = ssl->in_hslen - ( end - p ) - 6;
-
-        md5_starts( &md5 );
-        md5_update( &md5, ssl->handshake->randbytes, 64 );
-        md5_update( &md5, ssl->in_msg + 4, n );
-        md5_finish( &md5, hash );
-
-        sha1_starts( &sha1 );
-        sha1_update( &sha1, ssl->handshake->randbytes, 64 );
-        sha1_update( &sha1, ssl->in_msg + 4, n );
-        sha1_finish( &sha1, hash + 16 );
-
-        hash_id = SIG_RSA_RAW;
-        hashlen = 36;
+            SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+        }
     }
     else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA )
     {
-        sha2_context sha2;
-#if defined(POLARSSL_SHA4_C)
-        sha4_context sha4;
-#endif
-
-        n = ssl->in_hslen - ( end - p ) - 8;
-
-        /*
-         * digitally-signed struct {
-         *     opaque client_random[32];
-         *     opaque server_random[32];
-         *     ServerDHParams params;
-         * };
-         */
-        switch( hash_id )
+        if( ssl_parse_server_ecdh_params( ssl, &p, end ) != 0 )
         {
-#if defined(POLARSSL_MD5_C)
-            case SIG_RSA_MD5:
-                md5_starts( &md5 );
-                md5_update( &md5, ssl->handshake->randbytes, 64 );
-                md5_update( &md5, ssl->in_msg + 4, n );
-                md5_finish( &md5, hash );
-                hashlen = 16;
-                break;
-#endif
-#if defined(POLARSSL_SHA1_C)
-            case SIG_RSA_SHA1:
-                sha1_starts( &sha1 );
-                sha1_update( &sha1, ssl->handshake->randbytes, 64 );
-                sha1_update( &sha1, ssl->in_msg + 4, n );
-                sha1_finish( &sha1, hash );
-                hashlen = 20;
-                break;
-#endif
-#if defined(POLARSSL_SHA2_C)
-            case SIG_RSA_SHA224:
-                sha2_starts( &sha2, 1 );
-                sha2_update( &sha2, ssl->handshake->randbytes, 64 );
-                sha2_update( &sha2, ssl->in_msg + 4, n );
-                sha2_finish( &sha2, hash );
-                hashlen = 28;
-                break;
-            case SIG_RSA_SHA256:
-                sha2_starts( &sha2, 0 );
-                sha2_update( &sha2, ssl->handshake->randbytes, 64 );
-                sha2_update( &sha2, ssl->in_msg + 4, n );
-                sha2_finish( &sha2, hash );
-                hashlen = 32;
-                break;
-#endif
-#if defined(POLARSSL_SHA4_C)
-            case SIG_RSA_SHA384:
-                sha4_starts( &sha4, 1 );
-                sha4_update( &sha4, ssl->handshake->randbytes, 64 );
-                sha4_update( &sha4, ssl->in_msg + 4, n );
-                sha4_finish( &sha4, hash );
-                hashlen = 48;
-                break;
-            case SIG_RSA_SHA512:
-                sha4_starts( &sha4, 0 );
-                sha4_update( &sha4, ssl->handshake->randbytes, 64 );
-                sha4_update( &sha4, ssl->in_msg + 4, n );
-                sha4_finish( &sha4, hash );
-                hashlen = 64;
-                break;
-#endif
+            SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
         }
     }
-    
-    SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen );
-
-    if( ( ret = rsa_pkcs1_verify( &ssl->session_negotiate->peer_cert->rsa,
-                                  RSA_PUBLIC,
-                                  hash_id, hashlen, hash, p ) ) != 0 )
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
     {
-        SSL_DEBUG_RET( 1, "rsa_pkcs1_verify", ret );
-        return( ret );
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
     }
 
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA )
+    {
+        params_len = p - ( ssl->in_msg + 4 );
+
+        /*
+         * Handle the digitally-signed structure
+         */
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
+        {
+            if( ssl_parse_signature_algorithm( ssl, &p, end,
+                                               &md_alg, &pk_alg ) != 0 )
+            {
+                SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+                return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+            }
+
+            if( pk_alg != ssl_get_ciphersuite_sig_pk_alg( ciphersuite_info ) )
+            {
+                SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+                return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+            }
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+        if( ssl->minor_ver < SSL_MINOR_VERSION_3 )
+        {
+            pk_alg = ssl_get_ciphersuite_sig_pk_alg( ciphersuite_info );
+
+            /* Default hash for ECDSA is SHA-1 */
+            if( pk_alg == POLARSSL_PK_ECDSA && md_alg == POLARSSL_MD_NONE )
+                md_alg = POLARSSL_MD_SHA1;
+        }
+        else
+#endif
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+        /*
+         * Read signature
+         */
+        sig_len = ( p[0] << 8 ) | p[1];
+        p += 2;
+
+        if( end != p + sig_len )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE );
+        }
+
+        SSL_DEBUG_BUF( 3, "signature", p, sig_len );
+
+        /*
+         * Compute the hash that has been signed
+         */
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+        if( md_alg == POLARSSL_MD_NONE )
+        {
+            md5_context md5;
+            sha1_context sha1;
+
+            md5_init(  &md5  );
+            sha1_init( &sha1 );
+
+            hashlen = 36;
+
+            /*
+             * digitally-signed struct {
+             *     opaque md5_hash[16];
+             *     opaque sha_hash[20];
+             * };
+             *
+             * md5_hash
+             *     MD5(ClientHello.random + ServerHello.random
+             *                            + ServerParams);
+             * sha_hash
+             *     SHA(ClientHello.random + ServerHello.random
+             *                            + ServerParams);
+             */
+            md5_starts( &md5 );
+            md5_update( &md5, ssl->handshake->randbytes, 64 );
+            md5_update( &md5, ssl->in_msg + 4, params_len );
+            md5_finish( &md5, hash );
+
+            sha1_starts( &sha1 );
+            sha1_update( &sha1, ssl->handshake->randbytes, 64 );
+            sha1_update( &sha1, ssl->in_msg + 4, params_len );
+            sha1_finish( &sha1, hash + 16 );
+
+            md5_free(  &md5  );
+            sha1_free( &sha1 );
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_SSL3 || POLARSSL_SSL_PROTO_TLS1 || \
+          POLARSSL_SSL_PROTO_TLS1_1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( md_alg != POLARSSL_MD_NONE )
+        {
+            md_context_t ctx;
+
+            md_init( &ctx );
+
+            /* Info from md_alg will be used instead */
+            hashlen = 0;
+
+            /*
+             * digitally-signed struct {
+             *     opaque client_random[32];
+             *     opaque server_random[32];
+             *     ServerDHParams params;
+             * };
+             */
+            if( ( ret = md_init_ctx( &ctx,
+                                     md_info_from_type( md_alg ) ) ) != 0 )
+            {
+                SSL_DEBUG_RET( 1, "md_init_ctx", ret );
+                return( ret );
+            }
+
+            md_starts( &ctx );
+            md_update( &ctx, ssl->handshake->randbytes, 64 );
+            md_update( &ctx, ssl->in_msg + 4, params_len );
+            md_finish( &ctx, hash );
+            md_free( &ctx );
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 || \
+          POLARSSL_SSL_PROTO_TLS1_2 */
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen != 0 ? hashlen :
+                (unsigned int) ( md_info_from_type( md_alg ) )->size );
+
+        /*
+         * Verify signature
+         */
+        if( ! pk_can_do( &ssl->session_negotiate->peer_cert->pk, pk_alg ) )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
+            return( POLARSSL_ERR_SSL_PK_TYPE_MISMATCH );
+        }
+
+        if( ( ret = pk_verify( &ssl->session_negotiate->peer_cert->pk,
+                               md_alg, hash, hashlen, p, sig_len ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "pk_verify", ret );
+            return( ret );
+        }
+    }
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+
+exit:
     ssl->state++;
 
     SSL_DEBUG_MSG( 2, ( "<= parse server key exchange" ) );
 
     return( 0 );
-#endif
 }
 
+#if !defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)       && \
+    !defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)   && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+static int ssl_parse_certificate_request( ssl_context *ssl )
+{
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+
+    SSL_DEBUG_MSG( 2, ( "=> parse certificate request" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate request" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+#else
 static int ssl_parse_certificate_request( ssl_context *ssl )
 {
     int ret;
     unsigned char *buf, *p;
     size_t n = 0, m = 0;
-    size_t cert_type_len = 0, sig_alg_len = 0, dn_len = 0;
+    size_t cert_type_len = 0, dn_len = 0;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse certificate request" ) );
 
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate request" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
     /*
      *     0  .   0   handshake type
      *     1  .   3   handshake length
@@ -911,16 +1878,21 @@ static int ssl_parse_certificate_request( ssl_context *ssl )
      *    n+4 .. ...  Distinguished Name #1
      *    ... .. ...  length of DN 2, etc.
      */
-    if( ( ret = ssl_read_record( ssl ) ) != 0 )
+    if( ssl->record_read == 0 )
     {
-        SSL_DEBUG_RET( 1, "ssl_read_record", ret );
-        return( ret );
-    }
+        if( ( ret = ssl_read_record( ssl ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_read_record", ret );
+            return( ret );
+        }
 
-    if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
-    {
-        SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
-        return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
+        if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
+            return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
+        }
+
+        ssl->record_read = 1;
     }
 
     ssl->client_auth = 0;
@@ -935,11 +1907,13 @@ static int ssl_parse_certificate_request( ssl_context *ssl )
     if( ssl->client_auth == 0 )
         goto exit;
 
+    ssl->record_read = 0;
+
     // TODO: handshake_failure alert for an anonymous server to request
     // client authentication
 
     buf = ssl->in_msg;
-    
+
     // Retrieve cert types
     //
     cert_type_len = buf[4];
@@ -954,26 +1928,39 @@ static int ssl_parse_certificate_request( ssl_context *ssl )
     p = buf + 5;
     while( cert_type_len > 0 )
     {
-        if( *p == SSL_CERT_TYPE_RSA_SIGN )
+#if defined(POLARSSL_RSA_C)
+        if( *p == SSL_CERT_TYPE_RSA_SIGN &&
+            pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_RSA ) )
         {
             ssl->handshake->cert_type = SSL_CERT_TYPE_RSA_SIGN;
             break;
         }
+        else
+#endif
+#if defined(POLARSSL_ECDSA_C)
+        if( *p == SSL_CERT_TYPE_ECDSA_SIGN &&
+            pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_ECDSA ) )
+        {
+            ssl->handshake->cert_type = SSL_CERT_TYPE_ECDSA_SIGN;
+            break;
+        }
+        else
+#endif
+        {
+            ; /* Unsupported cert type, ignore */
+        }
 
         cert_type_len--;
         p++;
     }
 
-    if( ssl->handshake->cert_type == 0 )
-    {
-        SSL_DEBUG_MSG( 1, ( "no known cert_type provided" ) );
-        return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST );
-    }
-
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
     if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
-        sig_alg_len = ( ( buf[5 + n] <<  8 )
-                      | ( buf[6 + n]       ) );
+        /* Ignored, see comments about hash in write_certificate_verify */
+        // TODO: should check the signature part against our pk_key though
+        size_t sig_alg_len = ( ( buf[5 + n] <<  8 )
+                             | ( buf[6 + n]       ) );
 
         p = buf + 7 + n;
         m += 2;
@@ -984,8 +1971,11 @@ static int ssl_parse_certificate_request( ssl_context *ssl )
             SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
             return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST );
         }
-    } 
+    }
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
 
+    /* Ignore certificate_authorities, we only have one cert anyway */
+    // TODO: should not send cert if no CA matches
     dn_len = ( ( buf[5 + m + n] <<  8 )
              | ( buf[6 + m + n]       ) );
 
@@ -1001,6 +1991,10 @@ exit:
 
     return( 0 );
 }
+#endif /* !POLARSSL_KEY_EXCHANGE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
 
 static int ssl_parse_server_hello_done( ssl_context *ssl )
 {
@@ -1008,7 +2002,7 @@ static int ssl_parse_server_hello_done( ssl_context *ssl )
 
     SSL_DEBUG_MSG( 2, ( "=> parse server hello done" ) );
 
-    if( ssl->client_auth != 0 )
+    if( ssl->record_read == 0 )
     {
         if( ( ret = ssl_read_record( ssl ) ) != 0 )
         {
@@ -1022,6 +2016,7 @@ static int ssl_parse_server_hello_done( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
         }
     }
+    ssl->record_read = 0;
 
     if( ssl->in_hslen  != 4 ||
         ssl->in_msg[0] != SSL_HS_SERVER_HELLO_DONE )
@@ -1041,26 +2036,13 @@ static int ssl_write_client_key_exchange( ssl_context *ssl )
 {
     int ret;
     size_t i, n;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> write client key exchange" ) );
 
-    if( ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_DES_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA )
     {
-#if !defined(POLARSSL_DHM_C)
-        SSL_DEBUG_MSG( 1, ( "support for dhm in not available" ) );
-        return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-#else
         /*
          * DHM key exchange -- send G^X mod P
          */
@@ -1071,7 +2053,7 @@ static int ssl_write_client_key_exchange( ssl_context *ssl )
         i = 6;
 
         ret = dhm_make_public( &ssl->handshake->dhm_ctx,
-                                mpi_size( &ssl->handshake->dhm_ctx.P ),
+                                (int) mpi_size( &ssl->handshake->dhm_ctx.P ),
                                &ssl->out_msg[i], n,
                                 ssl->f_rng, ssl->p_rng );
         if( ret != 0 )
@@ -1083,55 +2065,168 @@ static int ssl_write_client_key_exchange( ssl_context *ssl )
         SSL_DEBUG_MPI( 3, "DHM: X ", &ssl->handshake->dhm_ctx.X  );
         SSL_DEBUG_MPI( 3, "DHM: GX", &ssl->handshake->dhm_ctx.GX );
 
-        ssl->handshake->pmslen = ssl->handshake->dhm_ctx.len;
+        ssl->handshake->pmslen = POLARSSL_PREMASTER_SIZE;
 
         if( ( ret = dhm_calc_secret( &ssl->handshake->dhm_ctx,
                                       ssl->handshake->premaster,
-                                     &ssl->handshake->pmslen ) ) != 0 )
+                                     &ssl->handshake->pmslen,
+                                      ssl->f_rng, ssl->p_rng ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "dhm_calc_secret", ret );
             return( ret );
         }
 
         SSL_DEBUG_MPI( 3, "DHM: K ", &ssl->handshake->dhm_ctx.K  );
-#endif
     }
     else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) ||                   \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) ||                      \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_ECDSA )
     {
         /*
-         * RSA key exchange -- send rsa_public(pkcs1 v1.5(premaster))
+         * ECDH key exchange -- send client public value
          */
-        ssl->handshake->premaster[0] = (unsigned char) ssl->max_major_ver;
-        ssl->handshake->premaster[1] = (unsigned char) ssl->max_minor_ver;
-        ssl->handshake->pmslen = 48;
+        i = 4;
 
-        ret = ssl->f_rng( ssl->p_rng, ssl->handshake->premaster + 2,
-                          ssl->handshake->pmslen - 2 );
+        ret = ecdh_make_public( &ssl->handshake->ecdh_ctx,
+                                &n,
+                                &ssl->out_msg[i], 1000,
+                                ssl->f_rng, ssl->p_rng );
         if( ret != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecdh_make_public", ret );
             return( ret );
+        }
+
+        SSL_DEBUG_ECP( 3, "ECDH: Q", &ssl->handshake->ecdh_ctx.Q );
+
+        if( ( ret = ecdh_calc_secret( &ssl->handshake->ecdh_ctx,
+                                      &ssl->handshake->pmslen,
+                                       ssl->handshake->premaster,
+                                       POLARSSL_MPI_MAX_SIZE,
+                                       ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecdh_calc_secret", ret );
+            return( ret );
+        }
+
+        SSL_DEBUG_MPI( 3, "ECDH: z", &ssl->handshake->ecdh_ctx.z );
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        /*
+         * opaque psk_identity<0..2^16-1>;
+         */
+        if( ssl->psk == NULL || ssl->psk_identity == NULL )
+            return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
 
         i = 4;
-        n = ssl->session_negotiate->peer_cert->rsa.len;
+        n = ssl->psk_identity_len;
+        ssl->out_msg[i++] = (unsigned char)( n >> 8 );
+        ssl->out_msg[i++] = (unsigned char)( n      );
 
-        if( ssl->minor_ver != SSL_MINOR_VERSION_0 )
+        memcpy( ssl->out_msg + i, ssl->psk_identity, ssl->psk_identity_len );
+        i += ssl->psk_identity_len;
+
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+        if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK )
         {
-            i += 2;
-            ssl->out_msg[4] = (unsigned char)( n >> 8 );
-            ssl->out_msg[5] = (unsigned char)( n      );
+            n = 0;
+        }
+        else
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+        if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK )
+        {
+            if( ( ret = ssl_write_encrypted_pms( ssl, i, &n, 2 ) ) != 0 )
+                return( ret );
+        }
+        else
+#endif
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+        if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+        {
+            /*
+             * ClientDiffieHellmanPublic public (DHM send G^X mod P)
+             */
+            n = ssl->handshake->dhm_ctx.len;
+            ssl->out_msg[i++] = (unsigned char)( n >> 8 );
+            ssl->out_msg[i++] = (unsigned char)( n      );
+
+            ret = dhm_make_public( &ssl->handshake->dhm_ctx,
+                    (int) mpi_size( &ssl->handshake->dhm_ctx.P ),
+                    &ssl->out_msg[i], n,
+                    ssl->f_rng, ssl->p_rng );
+            if( ret != 0 )
+            {
+                SSL_DEBUG_RET( 1, "dhm_make_public", ret );
+                return( ret );
+            }
+        }
+        else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+        if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+        {
+            /*
+             * ClientECDiffieHellmanPublic public;
+             */
+            ret = ecdh_make_public( &ssl->handshake->ecdh_ctx, &n,
+                    &ssl->out_msg[i], SSL_MAX_CONTENT_LEN - i,
+                    ssl->f_rng, ssl->p_rng );
+            if( ret != 0 )
+            {
+                SSL_DEBUG_RET( 1, "ecdh_make_public", ret );
+                return( ret );
+            }
+
+            SSL_DEBUG_ECP( 3, "ECDH: Q", &ssl->handshake->ecdh_ctx.Q );
+        }
+        else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
         }
 
-        ret = rsa_pkcs1_encrypt( &ssl->session_negotiate->peer_cert->rsa,
-                                  ssl->f_rng, ssl->p_rng,
-                                  RSA_PUBLIC,
-                                  ssl->handshake->pmslen,
-                                  ssl->handshake->premaster,
-                                  ssl->out_msg + i );
-        if( ret != 0 )
+        if( ( ret = ssl_psk_derive_premaster( ssl,
+                        ciphersuite_info->key_exchange ) ) != 0 )
         {
-            SSL_DEBUG_RET( 1, "rsa_pkcs1_encrypt", ret );
+            SSL_DEBUG_RET( 1, "ssl_psk_derive_premaster", ret );
             return( ret );
         }
     }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA )
+    {
+        i = 4;
+        if( ( ret = ssl_write_encrypted_pms( ssl, i, &n, 0 ) ) != 0 )
+            return( ret );
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+    {
+        ((void) ciphersuite_info);
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
 
     if( ( ret = ssl_derive_keys( ssl ) ) != 0 )
     {
@@ -1156,24 +2251,60 @@ static int ssl_write_client_key_exchange( ssl_context *ssl )
     return( 0 );
 }
 
+#if !defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)       && \
+    !defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)   && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
 static int ssl_write_certificate_verify( ssl_context *ssl )
 {
-    int ret = 0;
-    size_t n = 0, offset = 0;
-    unsigned char hash[48];
-    int hash_id = SIG_RSA_RAW;
-    unsigned int hashlen = 36;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
 
-    if( ssl->client_auth == 0 || ssl->own_cert == NULL )
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
     {
         SSL_DEBUG_MSG( 2, ( "<= skip write certificate verify" ) );
         ssl->state++;
         return( 0 );
     }
 
-    if( ssl->rsa_key == NULL )
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+#else
+static int ssl_write_certificate_verify( ssl_context *ssl )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+    size_t n = 0, offset = 0;
+    unsigned char hash[48];
+    unsigned char *hash_start = hash;
+    md_type_t md_alg = POLARSSL_MD_NONE;
+    unsigned int hashlen;
+
+    SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip write certificate verify" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    if( ssl->client_auth == 0 || ssl_own_cert( ssl ) == NULL )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip write certificate verify" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    if( ssl_own_key( ssl ) == NULL )
     {
         SSL_DEBUG_MSG( 1, ( "got no private key" ) );
         return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
@@ -1184,6 +2315,8 @@ static int ssl_write_certificate_verify( ssl_context *ssl )
      */
     ssl->handshake->calc_verify( ssl, hash );
 
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
     if( ssl->minor_ver != SSL_MINOR_VERSION_3 )
     {
         /*
@@ -1199,9 +2332,23 @@ static int ssl_write_certificate_verify( ssl_context *ssl )
          *     SHA(handshake_messages);
          */
         hashlen = 36;
-        hash_id = SIG_RSA_RAW;
+        md_alg = POLARSSL_MD_NONE;
+
+        /*
+         * For ECDSA, default hash is SHA-1 only
+         */
+        if( pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_ECDSA ) )
+        {
+            hash_start += 16;
+            hashlen -= 16;
+            md_alg = POLARSSL_MD_SHA1;
+        }
     }
     else
+#endif /* POLARSSL_SSL_PROTO_SSL3 || POLARSSL_SSL_PROTO_TLS1 || \
+          POLARSSL_SSL_PROTO_TLS1_1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+    if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
         /*
          * digitally-signed struct {
@@ -1218,44 +2365,41 @@ static int ssl_write_certificate_verify( ssl_context *ssl )
          * Reason: Otherwise we should have running hashes for SHA512 and SHA224
          *         in order to satisfy 'weird' needs from the server side.
          */
-        if( ssl->session_negotiate->ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-            ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+        if( ssl->transform_negotiate->ciphersuite_info->mac ==
+            POLARSSL_MD_SHA384 )
         {
-            hash_id = SIG_RSA_SHA384;
-            hashlen = 48;
+            md_alg = POLARSSL_MD_SHA384;
             ssl->out_msg[4] = SSL_HASH_SHA384;
-            ssl->out_msg[5] = SSL_SIG_RSA;
         }
         else
         {
-            hash_id = SIG_RSA_SHA256;
-            hashlen = 32;
+            md_alg = POLARSSL_MD_SHA256;
             ssl->out_msg[4] = SSL_HASH_SHA256;
-            ssl->out_msg[5] = SSL_SIG_RSA;
         }
+        ssl->out_msg[5] = ssl_sig_from_pk( ssl_own_key( ssl ) );
 
+        /* Info from md_alg will be used instead */
+        hashlen = 0;
         offset = 2;
     }
+    else
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
 
-    if ( ssl->rsa_key )
-        n = ssl->rsa_key_len ( ssl->rsa_key );
+    if( ( ret = pk_sign( ssl_own_key( ssl ), md_alg, hash_start, hashlen,
+                         ssl->out_msg + 6 + offset, &n,
+                         ssl->f_rng, ssl->p_rng ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "pk_sign", ret );
+        return( ret );
+    }
 
     ssl->out_msg[4 + offset] = (unsigned char)( n >> 8 );
     ssl->out_msg[5 + offset] = (unsigned char)( n      );
 
-    if( ssl->rsa_key )
-    {
-        ret = ssl->rsa_sign( ssl->rsa_key, ssl->f_rng, ssl->p_rng,
-                             RSA_PRIVATE, hash_id,
-                             hashlen, hash, ssl->out_msg + 6 + offset );
-    }
-
-    if (ret != 0)
-    {
-        SSL_DEBUG_RET( 1, "pkcs1_sign", ret );
-        return( ret );
-    }
-
     ssl->out_msglen  = 6 + n + offset;
     ssl->out_msgtype = SSL_MSG_HANDSHAKE;
     ssl->out_msg[0]  = SSL_HS_CERTIFICATE_VERIFY;
@@ -1270,8 +2414,107 @@ static int ssl_write_certificate_verify( ssl_context *ssl )
 
     SSL_DEBUG_MSG( 2, ( "<= write certificate verify" ) );
 
+    return( ret );
+}
+#endif /* !POLARSSL_KEY_EXCHANGE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static int ssl_parse_new_session_ticket( ssl_context *ssl )
+{
+    int ret;
+    uint32_t lifetime;
+    size_t ticket_len;
+    unsigned char *ticket;
+
+    SSL_DEBUG_MSG( 2, ( "=> parse new session ticket" ) );
+
+    if( ( ret = ssl_read_record( ssl ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "ssl_read_record", ret );
+        return( ret );
+    }
+
+    if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad new session ticket message" ) );
+        return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
+    }
+
+    /*
+     * struct {
+     *     uint32 ticket_lifetime_hint;
+     *     opaque ticket<0..2^16-1>;
+     * } NewSessionTicket;
+     *
+     * 0  .  0   handshake message type
+     * 1  .  3   handshake message length
+     * 4  .  7   ticket_lifetime_hint
+     * 8  .  9   ticket_len (n)
+     * 10 .  9+n ticket content
+     */
+    if( ssl->in_msg[0] != SSL_HS_NEW_SESSION_TICKET ||
+        ssl->in_hslen < 10 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad new session ticket message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_NEW_SESSION_TICKET );
+    }
+
+    lifetime = ( ssl->in_msg[4] << 24 ) | ( ssl->in_msg[5] << 16 ) |
+               ( ssl->in_msg[6] <<  8 ) | ( ssl->in_msg[7]       );
+
+    ticket_len = ( ssl->in_msg[8] << 8 ) | ( ssl->in_msg[9] );
+
+    if( ticket_len + 10 != ssl->in_hslen )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad new session ticket message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_NEW_SESSION_TICKET );
+    }
+
+    SSL_DEBUG_MSG( 3, ( "ticket length: %d", ticket_len ) );
+
+    /* We're not waiting for a NewSessionTicket message any more */
+    ssl->handshake->new_session_ticket = 0;
+
+    /*
+     * Zero-length ticket means the server changed his mind and doesn't want
+     * to send a ticket after all, so just forget it
+     */
+    if( ticket_len == 0 )
+        return( 0 );
+
+    polarssl_zeroize( ssl->session_negotiate->ticket,
+                      ssl->session_negotiate->ticket_len );
+    polarssl_free( ssl->session_negotiate->ticket );
+    ssl->session_negotiate->ticket = NULL;
+    ssl->session_negotiate->ticket_len = 0;
+
+    if( ( ticket = polarssl_malloc( ticket_len ) ) == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "ticket malloc failed" ) );
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+    }
+
+    memcpy( ticket, ssl->in_msg + 10, ticket_len );
+
+    ssl->session_negotiate->ticket = ticket;
+    ssl->session_negotiate->ticket_len = ticket_len;
+    ssl->session_negotiate->ticket_lifetime = lifetime;
+
+    /*
+     * RFC 5077 section 3.4:
+     * "If the client receives a session ticket from the server, then it
+     * discards any Session ID that was sent in the ServerHello."
+     */
+    SSL_DEBUG_MSG( 3, ( "ticket in use, discarding session id" ) );
+    ssl->session_negotiate->length = 0;
+
+    SSL_DEBUG_MSG( 2, ( "<= parse new session ticket" ) );
+
     return( 0 );
 }
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 
 /*
  * SSL handshake -- client side -- single step
@@ -1356,11 +2599,17 @@ int ssl_handshake_client_step( ssl_context *ssl )
            break;
 
        /*
-        *  <==   ChangeCipherSpec
+        *  <==   ( NewSessionTicket )
+        *        ChangeCipherSpec
         *        Finished
         */
        case SSL_SERVER_CHANGE_CIPHER_SPEC:
-           ret = ssl_parse_change_cipher_spec( ssl );
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+           if( ssl->handshake->new_session_ticket != 0 )
+               ret = ssl_parse_new_session_ticket( ssl );
+           else
+#endif
+               ret = ssl_parse_change_cipher_spec( ssl );
            break;
 
        case SSL_SERVER_FINISHED:
@@ -1383,4 +2632,4 @@ int ssl_handshake_client_step( ssl_context *ssl )
 
     return( ret );
 }
-#endif
+#endif /* POLARSSL_SSL_CLI_C */
diff --git a/Externals/polarssl/library/ssl_srv.c b/Externals/polarssl/library/ssl_srv.c
index 9ba22949bc..25be988267 100644
--- a/Externals/polarssl/library/ssl_srv.c
+++ b/Externals/polarssl/library/ssl_srv.c
@@ -1,7 +1,7 @@
 /*
  *  SSLv3/TLSv1 server-side functions
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,16 +23,353 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_SSL_SRV_C)
 
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"
+#if defined(POLARSSL_ECP_C)
+#include "polarssl/ecp.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
+
+#if defined(POLARSSL_HAVE_TIME)
 #include <time.h>
+#endif
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ * Serialize a session in the following format:
+ *  0   .   n-1     session structure, n = sizeof(ssl_session)
+ *  n   .   n+2     peer_cert length = m (0 if no certificate)
+ *  n+3 .   n+2+m   peer cert ASN.1
+ *
+ *  Assumes ticket is NULL (always true on server side).
+ */
+static int ssl_save_session( const ssl_session *session,
+                             unsigned char *buf, size_t buf_len,
+                             size_t *olen )
+{
+    unsigned char *p = buf;
+    size_t left = buf_len;
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    size_t cert_len;
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+    if( left < sizeof( ssl_session ) )
+        return( -1 );
+
+    memcpy( p, session, sizeof( ssl_session ) );
+    p += sizeof( ssl_session );
+    left -= sizeof( ssl_session );
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    if( session->peer_cert == NULL )
+        cert_len = 0;
+    else
+        cert_len = session->peer_cert->raw.len;
+
+    if( left < 3 + cert_len )
+        return( -1 );
+
+    *p++ = (unsigned char)( cert_len >> 16 & 0xFF );
+    *p++ = (unsigned char)( cert_len >>  8 & 0xFF );
+    *p++ = (unsigned char)( cert_len       & 0xFF );
+
+    if( session->peer_cert != NULL )
+        memcpy( p, session->peer_cert->raw.p, cert_len );
+
+    p += cert_len;
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+    *olen = p - buf;
+
+    return( 0 );
+}
+
+/*
+ * Unserialise session, see ssl_save_session()
+ */
+static int ssl_load_session( ssl_session *session,
+                             const unsigned char *buf, size_t len )
+{
+    const unsigned char *p = buf;
+    const unsigned char * const end = buf + len;
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    size_t cert_len;
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+    if( p + sizeof( ssl_session ) > end )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    memcpy( session, p, sizeof( ssl_session ) );
+    p += sizeof( ssl_session );
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    if( p + 3 > end )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    cert_len = ( p[0] << 16 ) | ( p[1] << 8 ) | p[2];
+    p += 3;
+
+    if( cert_len == 0 )
+    {
+        session->peer_cert = NULL;
+    }
+    else
+    {
+        int ret;
+
+        if( p + cert_len > end )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+        session->peer_cert = polarssl_malloc( sizeof( x509_crt ) );
+
+        if( session->peer_cert == NULL )
+            return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+        x509_crt_init( session->peer_cert );
+
+        if( ( ret = x509_crt_parse_der( session->peer_cert,
+                                        p, cert_len ) ) != 0 )
+        {
+            x509_crt_free( session->peer_cert );
+            polarssl_free( session->peer_cert );
+            session->peer_cert = NULL;
+            return( ret );
+        }
+
+        p += cert_len;
+    }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+    if( p != end )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+
+/*
+ * Create session ticket, secured as recommended in RFC 5077 section 4:
+ *
+ *    struct {
+ *        opaque key_name[16];
+ *        opaque iv[16];
+ *        opaque encrypted_state<0..2^16-1>;
+ *        opaque mac[32];
+ *    } ticket;
+ *
+ * (the internal state structure differs, however).
+ */
+static int ssl_write_ticket( ssl_context *ssl, size_t *tlen )
+{
+    int ret;
+    unsigned char * const start = ssl->out_msg + 10;
+    unsigned char *p = start;
+    unsigned char *state;
+    unsigned char iv[16];
+    size_t clear_len, enc_len, pad_len, i;
+
+    *tlen = 0;
+
+    if( ssl->ticket_keys == NULL )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    /* Write key name */
+    memcpy( p, ssl->ticket_keys->key_name, 16 );
+    p += 16;
+
+    /* Generate and write IV (with a copy for aes_crypt) */
+    if( ( ret = ssl->f_rng( ssl->p_rng, p, 16 ) ) != 0 )
+        return( ret );
+    memcpy( iv, p, 16 );
+    p += 16;
+
+    /*
+     * Dump session state
+     *
+     * After the session state itself, we still need room for 16 bytes of
+     * padding and 32 bytes of MAC, so there's only so much room left
+     */
+    state = p + 2;
+    if( ssl_save_session( ssl->session_negotiate, state,
+                          SSL_MAX_CONTENT_LEN - ( state - ssl->out_ctr ) - 48,
+                          &clear_len ) != 0 )
+    {
+        return( POLARSSL_ERR_SSL_CERTIFICATE_TOO_LARGE );
+    }
+    SSL_DEBUG_BUF( 3, "session ticket cleartext", state, clear_len );
+
+    /* Apply PKCS padding */
+    pad_len = 16 - clear_len % 16;
+    enc_len = clear_len + pad_len;
+    for( i = clear_len; i < enc_len; i++ )
+        state[i] = (unsigned char) pad_len;
+
+    /* Encrypt */
+    if( ( ret = aes_crypt_cbc( &ssl->ticket_keys->enc, AES_ENCRYPT,
+                               enc_len, iv, state, state ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* Write length */
+    *p++ = (unsigned char)( ( enc_len >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( enc_len      ) & 0xFF );
+    p = state + enc_len;
+
+    /* Compute and write MAC( key_name + iv + enc_state_len + enc_state ) */
+    sha256_hmac( ssl->ticket_keys->mac_key, 16, start, p - start, p, 0 );
+    p += 32;
+
+    *tlen = p - start;
+
+    SSL_DEBUG_BUF( 3, "session ticket structure", start, *tlen );
+
+    return( 0 );
+}
+
+/*
+ * Load session ticket (see ssl_write_ticket for structure)
+ */
+static int ssl_parse_ticket( ssl_context *ssl,
+                             unsigned char *buf,
+                             size_t len )
+{
+    int ret;
+    ssl_session session;
+    unsigned char *key_name = buf;
+    unsigned char *iv = buf + 16;
+    unsigned char *enc_len_p = iv + 16;
+    unsigned char *ticket = enc_len_p + 2;
+    unsigned char *mac;
+    unsigned char computed_mac[32];
+    size_t enc_len, clear_len, i;
+    unsigned char pad_len, diff;
+
+    SSL_DEBUG_BUF( 3, "session ticket structure", buf, len );
+
+    if( len < 34 || ssl->ticket_keys == NULL )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    enc_len = ( enc_len_p[0] << 8 ) | enc_len_p[1];
+    mac = ticket + enc_len;
+
+    if( len != enc_len + 66 )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    /* Check name, in constant time though it's not a big secret */
+    diff = 0;
+    for( i = 0; i < 16; i++ )
+        diff |= key_name[i] ^ ssl->ticket_keys->key_name[i];
+    /* don't return yet, check the MAC anyway */
+
+    /* Check mac, with constant-time buffer comparison */
+    sha256_hmac( ssl->ticket_keys->mac_key, 16, buf, len - 32,
+                 computed_mac, 0 );
+
+    for( i = 0; i < 32; i++ )
+        diff |= mac[i] ^ computed_mac[i];
+
+    /* Now return if ticket is not authentic, since we want to avoid
+     * decrypting arbitrary attacker-chosen data */
+    if( diff != 0 )
+        return( POLARSSL_ERR_SSL_INVALID_MAC );
+
+    /* Decrypt */
+    if( ( ret = aes_crypt_cbc( &ssl->ticket_keys->dec, AES_DECRYPT,
+                               enc_len, iv, ticket, ticket ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /* Check PKCS padding */
+    pad_len = ticket[enc_len - 1];
+
+    ret = 0;
+    for( i = 2; i < pad_len; i++ )
+        if( ticket[enc_len - i] != pad_len )
+            ret = POLARSSL_ERR_SSL_BAD_INPUT_DATA;
+    if( ret != 0 )
+        return( ret );
+
+    clear_len = enc_len - pad_len;
+
+    SSL_DEBUG_BUF( 3, "session ticket cleartext", ticket, clear_len );
+
+    /* Actually load session */
+    if( ( ret = ssl_load_session( &session, ticket, clear_len ) ) != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "failed to parse ticket content" ) );
+        ssl_session_free( &session );
+        return( ret );
+    }
+
+#if defined(POLARSSL_HAVE_TIME)
+    /* Check if still valid */
+    if( (int) ( time( NULL) - session.start ) > ssl->ticket_lifetime )
+    {
+        SSL_DEBUG_MSG( 1, ( "session ticket expired" ) );
+        ssl_session_free( &session );
+        return( POLARSSL_ERR_SSL_SESSION_TICKET_EXPIRED );
+    }
+#endif
+
+    /*
+     * Keep the session ID sent by the client, since we MUST send it back to
+     * inform him we're accepting the ticket  (RFC 5077 section 3.4)
+     */
+    session.length = ssl->session_negotiate->length;
+    memcpy( &session.id, ssl->session_negotiate->id, session.length );
+
+    ssl_session_free( ssl->session_negotiate );
+    memcpy( ssl->session_negotiate, &session, sizeof( ssl_session ) );
+
+    /* Zeroize instead of free as we copied the content */
+    polarssl_zeroize( &session, sizeof( ssl_session ) );
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+/*
+ * Wrapper around f_sni, allowing use of ssl_set_own_cert() but
+ * making it act on ssl->hanshake->sni_key_cert instead.
+ */
+static int ssl_sni_wrapper( ssl_context *ssl,
+                            const unsigned char* name, size_t len )
+{
+    int ret;
+    ssl_key_cert *key_cert_ori = ssl->key_cert;
+
+    ssl->key_cert = NULL;
+    ret = ssl->f_sni( ssl->p_sni, ssl, name, len );
+    ssl->handshake->sni_key_cert = ssl->key_cert;
+
+    ssl->key_cert = key_cert_ori;
+
+    return( ret );
+}
 
 static int ssl_parse_servername_ext( ssl_context *ssl,
                                      const unsigned char *buf,
@@ -42,6 +379,8 @@ static int ssl_parse_servername_ext( ssl_context *ssl,
     size_t servername_list_size, hostname_len;
     const unsigned char *p;
 
+    SSL_DEBUG_MSG( 3, ( "parse ServerName extension" ) );
+
     servername_list_size = ( ( buf[0] << 8 ) | ( buf[1] ) );
     if( servername_list_size + 2 != len )
     {
@@ -61,9 +400,10 @@ static int ssl_parse_servername_ext( ssl_context *ssl,
 
         if( p[0] == TLS_EXT_SERVERNAME_HOSTNAME )
         {
-            ret = ssl->f_sni( ssl->p_sni, ssl, p + 3, hostname_len );
+            ret = ssl_sni_wrapper( ssl, p + 3, hostname_len );
             if( ret != 0 )
             {
+                SSL_DEBUG_RET( 1, "ssl_sni_wrapper", ret );
                 ssl_send_alert_message( ssl, SSL_ALERT_LEVEL_FATAL,
                         SSL_ALERT_MSG_UNRECOGNIZED_NAME );
                 return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -83,6 +423,7 @@ static int ssl_parse_servername_ext( ssl_context *ssl,
 
     return( 0 );
 }
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
 
 static int ssl_parse_renegotiation_info( ssl_context *ssl,
                                          const unsigned char *buf,
@@ -106,9 +447,11 @@ static int ssl_parse_renegotiation_info( ssl_context *ssl,
     }
     else
     {
+        /* Check verify-data in constant-time. The length OTOH is no secret */
         if( len    != 1 + ssl->verify_data_len ||
             buf[0] !=     ssl->verify_data_len ||
-            memcmp( buf + 1, ssl->peer_verify_data, ssl->verify_data_len ) != 0 )
+            safer_memcmp( buf + 1, ssl->peer_verify_data,
+                          ssl->verify_data_len ) != 0 )
         {
             SSL_DEBUG_MSG( 1, ( "non-matching renegotiated connection field" ) );
 
@@ -122,72 +465,406 @@ static int ssl_parse_renegotiation_info( ssl_context *ssl,
     return( 0 );
 }
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
 static int ssl_parse_signature_algorithms_ext( ssl_context *ssl,
                                                const unsigned char *buf,
                                                size_t len )
 {
     size_t sig_alg_list_size;
     const unsigned char *p;
+    const unsigned char *end = buf + len;
+    const int *md_cur;
+
 
     sig_alg_list_size = ( ( buf[0] << 8 ) | ( buf[1] ) );
     if( sig_alg_list_size + 2 != len ||
-        sig_alg_list_size %2 != 0 )
+        sig_alg_list_size % 2 != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+    }
+
+    /*
+     * For now, ignore the SignatureAlgorithm part and rely on offered
+     * ciphersuites only for that part. To be fixed later.
+     *
+     * So, just look at the HashAlgorithm part.
+     */
+    for( md_cur = md_list(); *md_cur != POLARSSL_MD_NONE; md_cur++ ) {
+        for( p = buf + 2; p < end; p += 2 ) {
+            if( *md_cur == (int) ssl_md_alg_from_hash( p[0] ) ) {
+                ssl->handshake->sig_alg = p[0];
+                break;
+            }
+        }
+    }
+
+    SSL_DEBUG_MSG( 3, ( "client hello v3, signature_algorithm ext: %d",
+                   ssl->handshake->sig_alg ) );
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+static int ssl_parse_supported_elliptic_curves( ssl_context *ssl,
+                                                const unsigned char *buf,
+                                                size_t len )
+{
+    size_t list_size, our_size;
+    const unsigned char *p;
+    const ecp_curve_info *curve_info, **curves;
+
+    list_size = ( ( buf[0] << 8 ) | ( buf[1] ) );
+    if( list_size + 2 != len ||
+        list_size % 2 != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+    }
+
+    /* Don't allow our peer to make us allocate too much memory,
+     * and leave room for a final 0 */
+    our_size = list_size / 2 + 1;
+    if( our_size > POLARSSL_ECP_DP_MAX )
+        our_size = POLARSSL_ECP_DP_MAX;
+
+    if( ( curves = polarssl_malloc( our_size * sizeof( *curves ) ) ) == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    /* explicit void pointer cast for buggy MS compiler */
+    memset( (void *) curves, 0, our_size * sizeof( *curves ) );
+    ssl->handshake->curves = curves;
+
+    p = buf + 2;
+    while( list_size > 0 && our_size > 1 )
+    {
+        curve_info = ecp_curve_info_from_tls_id( ( p[0] << 8 ) | p[1] );
+
+        if( curve_info != NULL )
+        {
+            *curves++ = curve_info;
+            our_size--;
+        }
+
+        list_size -= 2;
+        p += 2;
+    }
+
+    return( 0 );
+}
+
+static int ssl_parse_supported_point_formats( ssl_context *ssl,
+                                              const unsigned char *buf,
+                                              size_t len )
+{
+    size_t list_size;
+    const unsigned char *p;
+
+    list_size = buf[0];
+    if( list_size + 1 != len )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
     }
 
     p = buf + 2;
-    while( sig_alg_list_size > 0 )
+    while( list_size > 0 )
     {
-        if( p[1] != SSL_SIG_RSA )
+        if( p[0] == POLARSSL_ECP_PF_UNCOMPRESSED ||
+            p[0] == POLARSSL_ECP_PF_COMPRESSED )
         {
-            sig_alg_list_size -= 2;
-            p += 2;
-            continue;
-        }
-#if defined(POLARSSL_SHA4_C)
-        if( p[0] == SSL_HASH_SHA512 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_SHA512;
-            break;
-        }
-        if( p[0] == SSL_HASH_SHA384 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_SHA384;
-            break;
-        }
-#endif
-#if defined(POLARSSL_SHA2_C)
-        if( p[0] == SSL_HASH_SHA256 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_SHA256;
-            break;
-        }
-        if( p[0] == SSL_HASH_SHA224 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_SHA224;
-            break;
-        }
-#endif
-        if( p[0] == SSL_HASH_SHA1 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_SHA1;
-            break;
-        }
-        if( p[0] == SSL_HASH_MD5 )
-        {
-            ssl->handshake->sig_alg = SSL_HASH_MD5;
-            break;
+            ssl->handshake->ecdh_ctx.point_format = p[0];
+            SSL_DEBUG_MSG( 4, ( "point format selected: %d", p[0] ) );
+            return( 0 );
         }
 
-        sig_alg_list_size -= 2;
-        p += 2;
+        list_size--;
+        p++;
     }
 
-    SSL_DEBUG_MSG( 3, ( "client hello v3, signature_algorithm ext: %d",
-                   ssl->handshake->sig_alg ) );
+    return( 0 );
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
 
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+static int ssl_parse_max_fragment_length_ext( ssl_context *ssl,
+                                              const unsigned char *buf,
+                                              size_t len )
+{
+    if( len != 1 || buf[0] >= SSL_MAX_FRAG_LEN_INVALID )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+    }
+
+    ssl->session_negotiate->mfl_code = buf[0];
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+static int ssl_parse_truncated_hmac_ext( ssl_context *ssl,
+                                         const unsigned char *buf,
+                                         size_t len )
+{
+    if( len != 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+    }
+
+    ((void) buf);
+
+    ssl->session_negotiate->trunc_hmac = SSL_TRUNC_HMAC_ENABLED;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static int ssl_parse_session_ticket_ext( ssl_context *ssl,
+                                         unsigned char *buf,
+                                         size_t len )
+{
+    int ret;
+
+    if( ssl->session_tickets == SSL_SESSION_TICKETS_DISABLED )
+        return( 0 );
+
+    /* Remember the client asked us to send a new ticket */
+    ssl->handshake->new_session_ticket = 1;
+
+    SSL_DEBUG_MSG( 3, ( "ticket length: %d", len ) );
+
+    if( len == 0 )
+        return( 0 );
+
+    if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE )
+    {
+        SSL_DEBUG_MSG( 3, ( "ticket rejected: renegotiating" ) );
+        return( 0 );
+    }
+
+    /*
+     * Failures are ok: just ignore the ticket and proceed.
+     */
+    if( ( ret = ssl_parse_ticket( ssl, buf, len ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "ssl_parse_ticket", ret );
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 3, ( "session successfully restored from ticket" ) );
+
+    ssl->handshake->resume = 1;
+
+    /* Don't send a new ticket after all, this one is OK */
+    ssl->handshake->new_session_ticket = 0;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_SSL_ALPN)
+static int ssl_parse_alpn_ext( ssl_context *ssl,
+                               const unsigned char *buf, size_t len )
+{
+    size_t list_len, cur_len, ours_len;
+    const unsigned char *theirs, *start, *end;
+    const char **ours;
+
+    /* If ALPN not configured, just ignore the extension */
+    if( ssl->alpn_list == NULL )
+        return( 0 );
+
+    /*
+     * opaque ProtocolName<1..2^8-1>;
+     *
+     * struct {
+     *     ProtocolName protocol_name_list<2..2^16-1>
+     * } ProtocolNameList;
+     */
+
+    /* Min length is 2 (list_len) + 1 (name_len) + 1 (name) */
+    if( len < 4 )
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+
+    list_len = ( buf[0] << 8 ) | buf[1];
+    if( list_len != len - 2 )
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+
+    /*
+     * Use our order of preference
+     */
+    start = buf + 2;
+    end = buf + len;
+    for( ours = ssl->alpn_list; *ours != NULL; ours++ )
+    {
+        ours_len = strlen( *ours );
+        for( theirs = start; theirs != end; theirs += cur_len )
+        {
+            /* If the list is well formed, we should get equality first */
+            if( theirs > end )
+                return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+
+            cur_len = *theirs++;
+
+            /* Empty strings MUST NOT be included */
+            if( cur_len == 0 )
+                return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+
+            if( cur_len == ours_len &&
+                memcmp( theirs, *ours, cur_len ) == 0 )
+            {
+                ssl->alpn_chosen = *ours;
+                return( 0 );
+            }
+        }
+    }
+
+    /* If we get there, no match was found */
+    ssl_send_alert_message( ssl, SSL_ALERT_LEVEL_FATAL,
+                            SSL_ALERT_MSG_NO_APPLICATION_PROTOCOL );
+    return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
+}
+#endif /* POLARSSL_SSL_ALPN */
+
+/*
+ * Auxiliary functions for ServerHello parsing and related actions
+ */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+/*
+ * Return 1 if the given EC key uses the given curve, 0 otherwise
+ */
+#if defined(POLARSSL_ECDSA_C)
+static int ssl_key_matches_curves( pk_context *pk,
+                                   const ecp_curve_info **curves )
+{
+    const ecp_curve_info **crv = curves;
+    ecp_group_id grp_id = pk_ec( *pk )->grp.id;
+
+    while( *crv != NULL )
+    {
+        if( (*crv)->grp_id == grp_id )
+            return( 1 );
+        crv++;
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_ECDSA_C */
+
+/*
+ * Try picking a certificate for this ciphersuite,
+ * return 0 on success and -1 on failure.
+ */
+static int ssl_pick_cert( ssl_context *ssl,
+                          const ssl_ciphersuite_t * ciphersuite_info )
+{
+    ssl_key_cert *cur, *list;
+    pk_type_t pk_alg = ssl_get_ciphersuite_sig_pk_alg( ciphersuite_info );
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    if( ssl->handshake->sni_key_cert != NULL )
+        list = ssl->handshake->sni_key_cert;
+    else
+#endif
+        list = ssl->handshake->key_cert;
+
+    if( pk_alg == POLARSSL_PK_NONE )
+        return( 0 );
+
+    for( cur = list; cur != NULL; cur = cur->next )
+    {
+        if( ! pk_can_do( cur->key, pk_alg ) )
+            continue;
+
+        /*
+         * This avoids sending the client a cert it'll reject based on
+         * keyUsage or other extensions.
+         *
+         * It also allows the user to provision different certificates for
+         * different uses based on keyUsage, eg if they want to avoid signing
+         * and decrypting with the same RSA key.
+         */
+        if( ssl_check_cert_usage( cur->cert, ciphersuite_info,
+                                  SSL_IS_SERVER ) != 0 )
+        {
+            continue;
+        }
+
+#if defined(POLARSSL_ECDSA_C)
+        if( pk_alg == POLARSSL_PK_ECDSA )
+        {
+            if( ssl_key_matches_curves( cur->key, ssl->handshake->curves ) )
+                break;
+        }
+        else
+#endif
+            break;
+    }
+
+    if( cur == NULL )
+        return( -1 );
+
+    ssl->handshake->key_cert = cur;
+    return( 0 );
+}
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+/*
+ * Check if a given ciphersuite is suitable for use with our config/keys/etc
+ * Sets ciphersuite_info only if the suite matches.
+ */
+static int ssl_ciphersuite_match( ssl_context *ssl, int suite_id,
+                                  const ssl_ciphersuite_t **ciphersuite_info )
+{
+    const ssl_ciphersuite_t *suite_info;
+
+    suite_info = ssl_ciphersuite_from_id( suite_id );
+    if( suite_info == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "ciphersuite info for %04x not found", suite_id ) );
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    if( suite_info->min_minor_ver > ssl->minor_ver ||
+        suite_info->max_minor_ver < ssl->minor_ver )
+        return( 0 );
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+    if( ssl_ciphersuite_uses_ec( suite_info ) &&
+        ( ssl->handshake->curves == NULL ||
+          ssl->handshake->curves[0] == NULL ) )
+        return( 0 );
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+    /* If the ciphersuite requires a pre-shared key and we don't
+     * have one, skip it now rather than failing later */
+    if( ssl_ciphersuite_uses_psk( suite_info ) &&
+        ssl->f_psk == NULL &&
+        ( ssl->psk == NULL || ssl->psk_identity == NULL ||
+          ssl->psk_identity_len == 0 || ssl->psk_len == 0 ) )
+        return( 0 );
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    /*
+     * Final check: if ciphersuite requires us to have a
+     * certificate/key of a particular type:
+     * - select the appropriate certificate if we have one, or
+     * - try the next ciphersuite if we don't
+     * This must be done last since we modify the key_cert list.
+     */
+    if( ssl_pick_cert( ssl, suite_info ) != 0 )
+        return( 0 );
+#endif
+
+    *ciphersuite_info = suite_info;
     return( 0 );
 }
 
@@ -199,6 +876,8 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
     size_t n;
     unsigned int ciph_len, sess_len, chal_len;
     unsigned char *buf, *p;
+    const int *ciphersuites;
+    const ssl_ciphersuite_t *ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse client hello v2" ) );
 
@@ -249,13 +928,14 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
     }
 
     ssl->major_ver = SSL_MAJOR_VERSION_3;
-    ssl->minor_ver = ( buf[4] <= SSL_MINOR_VERSION_3 )
-                     ? buf[4]  : SSL_MINOR_VERSION_3;
+    ssl->minor_ver = ( buf[4] <= ssl->max_minor_ver )
+                     ? buf[4]  : ssl->max_minor_ver;
 
     if( ssl->minor_ver < ssl->min_minor_ver )
     {
         SSL_DEBUG_MSG( 1, ( "client only supports ssl smaller than minimum"
-                            " [%d:%d] < [%d:%d]", ssl->major_ver, ssl->minor_ver,
+                            " [%d:%d] < [%d:%d]",
+                            ssl->major_ver, ssl->minor_ver,
                             ssl->min_major_ver, ssl->min_minor_ver ) );
 
         ssl_send_alert_message( ssl, SSL_ALERT_LEVEL_FATAL,
@@ -263,8 +943,8 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_PROTOCOL_VERSION );
     }
 
-    ssl->max_major_ver = buf[3];
-    ssl->max_minor_ver = buf[4];
+    ssl->handshake->max_major_ver = buf[3];
+    ssl->handshake->max_minor_ver = buf[4];
 
     if( ( ret = ssl_fetch_input( ssl, 2 + n ) ) != 0 )
     {
@@ -330,7 +1010,8 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
 
     p = buf + 6 + ciph_len;
     ssl->session_negotiate->length = sess_len;
-    memset( ssl->session_negotiate->id, 0, sizeof( ssl->session_negotiate->id ) );
+    memset( ssl->session_negotiate->id, 0,
+            sizeof( ssl->session_negotiate->id ) );
     memcpy( ssl->session_negotiate->id, p, ssl->session_negotiate->length );
 
     p += sess_len;
@@ -359,13 +1040,28 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
         }
     }
 
-    for( i = 0; ssl->ciphersuites[ssl->minor_ver][i] != 0; i++ )
+    ciphersuites = ssl->ciphersuite_list[ssl->minor_ver];
+    ciphersuite_info = NULL;
+#if defined(POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE)
+    for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 )
+    {
+        for( i = 0; ciphersuites[i] != 0; i++ )
+#else
+    for( i = 0; ciphersuites[i] != 0; i++ )
     {
         for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 )
+#endif
         {
-            if( p[0] == 0 &&
-                p[1] == 0 &&
-                p[2] == ssl->ciphersuites[ssl->minor_ver][i] )
+            if( p[0] != 0 ||
+                p[1] != ( ( ciphersuites[i] >> 8 ) & 0xFF ) ||
+                p[2] != ( ( ciphersuites[i]      ) & 0xFF ) )
+                continue;
+
+            if( ( ret = ssl_ciphersuite_match( ssl, ciphersuites[i],
+                                               &ciphersuite_info ) ) != 0 )
+                return( ret );
+
+            if( ciphersuite_info != NULL )
                 goto have_ciphersuite_v2;
         }
     }
@@ -375,8 +1071,9 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
     return( POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN );
 
 have_ciphersuite_v2:
-    ssl->session_negotiate->ciphersuite = ssl->ciphersuites[ssl->minor_ver][i];
-    ssl_optimize_checksum( ssl, ssl->session_negotiate->ciphersuite );
+    ssl->session_negotiate->ciphersuite = ciphersuites[i];
+    ssl->transform_negotiate->ciphersuite_info = ciphersuite_info;
+    ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
 
     /*
      * SSLv2 Client Hello relevant renegotiation security checks
@@ -412,6 +1109,8 @@ static int ssl_parse_client_hello( ssl_context *ssl )
     unsigned char *buf, *p, *ext;
     int renegotiation_info_seen = 0;
     int handshake_failure = 0;
+    const int *ciphersuites;
+    const ssl_ciphersuite_t *ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse client hello" ) );
 
@@ -439,15 +1138,20 @@ static int ssl_parse_client_hello( ssl_context *ssl )
                    buf[1], buf[2] ) );
 
     /*
-     * SSLv3 Client Hello
+     * SSLv3/TLS Client Hello
      *
      * Record layer:
      *     0  .   0   message type
      *     1  .   2   protocol version
      *     3  .   4   message length
      */
+
+    /* According to RFC 5246 Appendix E.1, the version here is typically
+     * "{03,00}, the lowest version number supported by the client, [or] the
+     * value of ClientHello.client_version", so the only meaningful check here
+     * is the major version shouldn't be less than 3 */
     if( buf[0] != SSL_MSG_HANDSHAKE ||
-        buf[1] != SSL_MAJOR_VERSION_3 )
+        buf[1] < SSL_MAJOR_VERSION_3 )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -455,7 +1159,7 @@ static int ssl_parse_client_hello( ssl_context *ssl )
 
     n = ( buf[3] << 8 ) | buf[4];
 
-    if( n < 45 || n > 512 )
+    if( n < 45 || n > SSL_MAX_CONTENT_LEN )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -486,8 +1190,9 @@ static int ssl_parse_client_hello( ssl_context *ssl )
      *    38  .  38   session id length
      *    39  . 38+x  session id
      *   39+x . 40+x  ciphersuitelist length
-     *   41+x .  ..   ciphersuitelist
-     *    ..  .  ..   compression alg.
+     *   41+x . 40+y  ciphersuitelist
+     *   41+y . 41+y  compression alg length
+     *   42+y . 41+z  compression algs
      *    ..  .  ..   extensions
      */
     SSL_DEBUG_BUF( 4, "record contents", buf, n );
@@ -502,21 +1207,24 @@ static int ssl_parse_client_hello( ssl_context *ssl )
     /*
      * Check the handshake type and protocol version
      */
-    if( buf[0] != SSL_HS_CLIENT_HELLO ||
-        buf[4] != SSL_MAJOR_VERSION_3 )
+    if( buf[0] != SSL_HS_CLIENT_HELLO )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
     }
 
-    ssl->major_ver = SSL_MAJOR_VERSION_3;
-    ssl->minor_ver = ( buf[5] <= SSL_MINOR_VERSION_3 )
-                     ? buf[5]  : SSL_MINOR_VERSION_3;
+    ssl->major_ver = buf[4];
+    ssl->minor_ver = buf[5];
 
-    if( ssl->minor_ver < ssl->min_minor_ver )
+    ssl->handshake->max_major_ver = ssl->major_ver;
+    ssl->handshake->max_minor_ver = ssl->minor_ver;
+
+    if( ssl->major_ver < ssl->min_major_ver ||
+        ssl->minor_ver < ssl->min_minor_ver )
     {
         SSL_DEBUG_MSG( 1, ( "client only supports ssl smaller than minimum"
-                            " [%d:%d] < [%d:%d]", ssl->major_ver, ssl->minor_ver,
+                            " [%d:%d] < [%d:%d]",
+                            ssl->major_ver, ssl->minor_ver,
                             ssl->min_major_ver, ssl->min_minor_ver ) );
 
         ssl_send_alert_message( ssl, SSL_ALERT_LEVEL_FATAL,
@@ -525,8 +1233,13 @@ static int ssl_parse_client_hello( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_PROTOCOL_VERSION );
     }
 
-    ssl->max_major_ver = buf[4];
-    ssl->max_minor_ver = buf[5];
+    if( ssl->major_ver > ssl->max_major_ver )
+    {
+        ssl->major_ver = ssl->max_major_ver;
+        ssl->minor_ver = ssl->max_minor_ver;
+    }
+    else if( ssl->minor_ver > ssl->max_minor_ver )
+        ssl->minor_ver = ssl->max_minor_ver;
 
     memcpy( ssl->handshake->randbytes, buf + 6, 32 );
 
@@ -544,7 +1257,7 @@ static int ssl_parse_client_hello( ssl_context *ssl )
      */
     sess_len = buf[38];
 
-    if( sess_len > 32 )
+    if( sess_len > 32 || sess_len > n - 42 )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -562,7 +1275,7 @@ static int ssl_parse_client_hello( ssl_context *ssl )
     ciph_len = ( buf[39 + sess_len] << 8 )
              | ( buf[40 + sess_len]      );
 
-    if( ciph_len < 2 || ciph_len > 256 || ( ciph_len % 2 ) != 0 )
+    if( ciph_len < 2 || ( ciph_len % 2 ) != 0 || ciph_len > n - 42 - sess_len )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -573,7 +1286,8 @@ static int ssl_parse_client_hello( ssl_context *ssl )
      */
     comp_len = buf[41 + sess_len + ciph_len];
 
-    if( comp_len < 1 || comp_len > 16 )
+    if( comp_len < 1 || comp_len > 16 ||
+        comp_len > n - 42 - sess_len - ciph_len )
     {
         SSL_DEBUG_MSG( 1, ( "bad client hello message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
@@ -639,27 +1353,6 @@ static int ssl_parse_client_hello( ssl_context *ssl )
         }
     }
 
-    /*
-     * Search for a matching ciphersuite
-     */
-    for( i = 0; ssl->ciphersuites[ssl->minor_ver][i] != 0; i++ )
-    {
-        for( j = 0, p = buf + 41 + sess_len; j < ciph_len;
-            j += 2, p += 2 )
-        {
-            if( p[0] == 0 && p[1] == ssl->ciphersuites[ssl->minor_ver][i] )
-                goto have_ciphersuite;
-        }
-    }
-
-    SSL_DEBUG_MSG( 1, ( "got no ciphersuites in common" ) );
-
-    return( POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN );
-
-have_ciphersuite:
-    ssl->session_negotiate->ciphersuite = ssl->ciphersuites[ssl->minor_ver][i];
-    ssl_optimize_checksum( ssl, ssl->session_negotiate->ciphersuite );
-
     ext = buf + 44 + sess_len + ciph_len + comp_len;
 
     while( ext_len )
@@ -676,6 +1369,7 @@ have_ciphersuite:
         }
         switch( ext_id )
         {
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
         case TLS_EXT_SERVERNAME:
             SSL_DEBUG_MSG( 3, ( "found ServerName extension" ) );
             if( ssl->f_sni == NULL )
@@ -685,6 +1379,7 @@ have_ciphersuite:
             if( ret != 0 )
                 return( ret );
             break;
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
 
         case TLS_EXT_RENEGOTIATION_INFO:
             SSL_DEBUG_MSG( 3, ( "found renegotiation extension" ) );
@@ -695,6 +1390,7 @@ have_ciphersuite:
                 return( ret );
             break;
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
         case TLS_EXT_SIG_ALG:
             SSL_DEBUG_MSG( 3, ( "found signature_algorithms extension" ) );
             if( ssl->renegotiation == SSL_RENEGOTIATION )
@@ -704,6 +1400,66 @@ have_ciphersuite:
             if( ret != 0 )
                 return( ret );
             break;
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+        case TLS_EXT_SUPPORTED_ELLIPTIC_CURVES:
+            SSL_DEBUG_MSG( 3, ( "found supported elliptic curves extension" ) );
+
+            ret = ssl_parse_supported_elliptic_curves( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+
+        case TLS_EXT_SUPPORTED_POINT_FORMATS:
+            SSL_DEBUG_MSG( 3, ( "found supported point formats extension" ) );
+            ssl->handshake->cli_exts |= TLS_EXT_SUPPORTED_POINT_FORMATS_PRESENT;
+
+            ret = ssl_parse_supported_point_formats( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+        case TLS_EXT_MAX_FRAGMENT_LENGTH:
+            SSL_DEBUG_MSG( 3, ( "found max fragment length extension" ) );
+
+            ret = ssl_parse_max_fragment_length_ext( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+        case TLS_EXT_TRUNCATED_HMAC:
+            SSL_DEBUG_MSG( 3, ( "found truncated hmac extension" ) );
+
+            ret = ssl_parse_truncated_hmac_ext( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+        case TLS_EXT_SESSION_TICKET:
+            SSL_DEBUG_MSG( 3, ( "found session ticket extension" ) );
+
+            ret = ssl_parse_session_ticket_ext( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+#if defined(POLARSSL_SSL_ALPN)
+        case TLS_EXT_ALPN:
+            SSL_DEBUG_MSG( 3, ( "found alpn extension" ) );
+
+            ret = ssl_parse_alpn_ext( ssl, ext + 4, ext_size );
+            if( ret != 0 )
+                return( ret );
+            break;
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 
         default:
             SSL_DEBUG_MSG( 3, ( "unknown extension found: %d (ignoring)",
@@ -759,6 +1515,48 @@ have_ciphersuite:
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
     }
 
+    /*
+     * Search for a matching ciphersuite
+     * (At the end because we need information from the EC-based extensions
+     * and certificate from the SNI callback triggered by the SNI extension.)
+     */
+    ciphersuites = ssl->ciphersuite_list[ssl->minor_ver];
+    ciphersuite_info = NULL;
+#if defined(POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE)
+    for( j = 0, p = buf + 41 + sess_len; j < ciph_len; j += 2, p += 2 )
+    {
+        for( i = 0; ciphersuites[i] != 0; i++ )
+#else
+    for( i = 0; ciphersuites[i] != 0; i++ )
+    {
+        for( j = 0, p = buf + 41 + sess_len; j < ciph_len; j += 2, p += 2 )
+#endif
+        {
+            if( p[0] != ( ( ciphersuites[i] >> 8 ) & 0xFF ) ||
+                p[1] != ( ( ciphersuites[i]      ) & 0xFF ) )
+                continue;
+
+            if( ( ret = ssl_ciphersuite_match( ssl, ciphersuites[i],
+                                               &ciphersuite_info ) ) != 0 )
+                return( ret );
+
+            if( ciphersuite_info != NULL )
+                goto have_ciphersuite;
+        }
+    }
+
+    SSL_DEBUG_MSG( 1, ( "got no ciphersuites in common" ) );
+
+    if( ( ret = ssl_send_fatal_handshake_failure( ssl ) ) != 0 )
+        return( ret );
+
+    return( POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN );
+
+have_ciphersuite:
+    ssl->session_negotiate->ciphersuite = ciphersuites[i];
+    ssl->transform_negotiate->ciphersuite_info = ciphersuite_info;
+    ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
+
     ssl->in_left = 0;
     ssl->state++;
 
@@ -767,15 +1565,195 @@ have_ciphersuite:
     return( 0 );
 }
 
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+static void ssl_write_truncated_hmac_ext( ssl_context *ssl,
+                                          unsigned char *buf,
+                                          size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->session_negotiate->trunc_hmac == SSL_TRUNC_HMAC_DISABLED )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, adding truncated hmac extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_TRUNCATED_HMAC >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_TRUNCATED_HMAC      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 0x00;
+
+    *olen = 4;
+}
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static void ssl_write_session_ticket_ext( ssl_context *ssl,
+                                          unsigned char *buf,
+                                          size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->handshake->new_session_ticket == 0 )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, adding session ticket extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_SESSION_TICKET >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SESSION_TICKET      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 0x00;
+
+    *olen = 4;
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+static void ssl_write_renegotiation_ext( ssl_context *ssl,
+                                         unsigned char *buf,
+                                         size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->secure_renegotiation != SSL_SECURE_RENEGOTIATION )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, secure renegotiation extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = ( ssl->verify_data_len * 2 + 1 ) & 0xFF;
+    *p++ = ssl->verify_data_len * 2 & 0xFF;
+
+    memcpy( p, ssl->peer_verify_data, ssl->verify_data_len );
+    p += ssl->verify_data_len;
+    memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
+    p += ssl->verify_data_len;
+
+    *olen = 5 + ssl->verify_data_len * 2;
+}
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+static void ssl_write_max_fragment_length_ext( ssl_context *ssl,
+                                               unsigned char *buf,
+                                               size_t *olen )
+{
+    unsigned char *p = buf;
+
+    if( ssl->session_negotiate->mfl_code == SSL_MAX_FRAG_LEN_NONE )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, max_fragment_length extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_MAX_FRAGMENT_LENGTH >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_MAX_FRAGMENT_LENGTH      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 1;
+
+    *p++ = ssl->session_negotiate->mfl_code;
+
+    *olen = 5;
+}
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+static void ssl_write_supported_point_formats_ext( ssl_context *ssl,
+                                                   unsigned char *buf,
+                                                   size_t *olen )
+{
+    unsigned char *p = buf;
+    ((void) ssl);
+
+    if( ( ssl->handshake->cli_exts &
+          TLS_EXT_SUPPORTED_POINT_FORMATS_PRESENT ) == 0 )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, supported_point_formats extension" ) );
+
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_POINT_FORMATS >> 8 ) & 0xFF );
+    *p++ = (unsigned char)( ( TLS_EXT_SUPPORTED_POINT_FORMATS      ) & 0xFF );
+
+    *p++ = 0x00;
+    *p++ = 2;
+
+    *p++ = 1;
+    *p++ = POLARSSL_ECP_PF_UNCOMPRESSED;
+
+    *olen = 6;
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
+#if defined(POLARSSL_SSL_ALPN )
+static void ssl_write_alpn_ext( ssl_context *ssl,
+                                unsigned char *buf, size_t *olen )
+{
+    if( ssl->alpn_chosen == NULL )
+    {
+        *olen = 0;
+        return;
+    }
+
+    SSL_DEBUG_MSG( 3, ( "server hello, adding alpn extension" ) );
+
+    /*
+     * 0 . 1    ext identifier
+     * 2 . 3    ext length
+     * 4 . 5    protocol list length
+     * 6 . 6    protocol name length
+     * 7 . 7+n  protocol name
+     */
+    buf[0] = (unsigned char)( ( TLS_EXT_ALPN >> 8 ) & 0xFF );
+    buf[1] = (unsigned char)( ( TLS_EXT_ALPN      ) & 0xFF );
+
+    *olen = 7 + strlen( ssl->alpn_chosen );
+
+    buf[2] = (unsigned char)( ( ( *olen - 4 ) >> 8 ) & 0xFF );
+    buf[3] = (unsigned char)( ( ( *olen - 4 )      ) & 0xFF );
+
+    buf[4] = (unsigned char)( ( ( *olen - 6 ) >> 8 ) & 0xFF );
+    buf[5] = (unsigned char)( ( ( *olen - 6 )      ) & 0xFF );
+
+    buf[6] = (unsigned char)( ( ( *olen - 7 )      ) & 0xFF );
+
+    memcpy( buf + 7, ssl->alpn_chosen, *olen - 7 );
+}
+#endif /* POLARSSL_ECDH_C || POLARSSL_ECDSA_C */
+
 static int ssl_write_server_hello( ssl_context *ssl )
 {
+#if defined(POLARSSL_HAVE_TIME)
     time_t t;
-    int ret, n;
-    size_t ext_len = 0;
+#endif
+    int ret;
+    size_t olen, ext_len = 0, n;
     unsigned char *buf, *p;
 
     SSL_DEBUG_MSG( 2, ( "=> write server hello" ) );
 
+    if( ssl->f_rng == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "no RNG provided") );
+        return( POLARSSL_ERR_SSL_NO_RNG );
+    }
+
     /*
      *     0  .   0   handshake type
      *     1  .   3   handshake length
@@ -792,6 +1770,7 @@ static int ssl_write_server_hello( ssl_context *ssl )
     SSL_DEBUG_MSG( 3, ( "server hello, chosen version: [%d:%d]",
                    buf[4], buf[5] ) );
 
+#if defined(POLARSSL_HAVE_TIME)
     t = time( NULL );
     *p++ = (unsigned char)( t >> 24 );
     *p++ = (unsigned char)( t >> 16 );
@@ -799,6 +1778,12 @@ static int ssl_write_server_hello( ssl_context *ssl )
     *p++ = (unsigned char)( t       );
 
     SSL_DEBUG_MSG( 3, ( "server hello, current time: %lu", t ) );
+#else
+    if( ( ret = ssl->f_rng( ssl->p_rng, p, 4 ) ) != 0 )
+        return( ret );
+
+    p += 4;
+#endif /* POLARSSL_HAVE_TIME */
 
     if( ( ret = ssl->f_rng( ssl->p_rng, p, 28 ) ) != 0 )
         return( ret );
@@ -810,34 +1795,53 @@ static int ssl_write_server_hello( ssl_context *ssl )
     SSL_DEBUG_BUF( 3, "server hello, random bytes", buf + 6, 32 );
 
     /*
-     *    38  .  38   session id length
-     *    39  . 38+n  session id
-     *   39+n . 40+n  chosen ciphersuite
-     *   41+n . 41+n  chosen compression alg.
+     * Resume is 0  by default, see ssl_handshake_init().
+     * It may be already set to 1 by ssl_parse_session_ticket_ext().
+     * If not, try looking up session ID in our cache.
      */
-    ssl->session_negotiate->length = n = 32;
-    *p++ = (unsigned char) ssl->session_negotiate->length;
+    if( ssl->handshake->resume == 0 &&
+        ssl->renegotiation == SSL_INITIAL_HANDSHAKE &&
+        ssl->session_negotiate->length != 0 &&
+        ssl->f_get_cache != NULL &&
+        ssl->f_get_cache( ssl->p_get_cache, ssl->session_negotiate ) == 0 )
+    {
+        SSL_DEBUG_MSG( 3, ( "session successfully restored from cache" ) );
+        ssl->handshake->resume = 1;
+    }
 
-    if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE ||
-        ssl->f_get_cache == NULL ||
-        ssl->f_get_cache( ssl->p_get_cache, ssl->session_negotiate ) != 0 )
+    if( ssl->handshake->resume == 0 )
     {
         /*
-         * Not found, create a new session id
+         * New session, create a new session id,
+         * unless we're about to issue a session ticket
          */
-        ssl->handshake->resume = 0;
         ssl->state++;
 
-        if( ( ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id,
-                                n ) ) != 0 )
-            return( ret );
+#if defined(POLARSSL_HAVE_TIME)
+        ssl->session_negotiate->start = time( NULL );
+#endif
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+        if( ssl->handshake->new_session_ticket != 0 )
+        {
+            ssl->session_negotiate->length = n = 0;
+            memset( ssl->session_negotiate->id, 0, 32 );
+        }
+        else
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+        {
+            ssl->session_negotiate->length = n = 32;
+            if( ( ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id,
+                                    n ) ) != 0 )
+                return( ret );
+        }
     }
     else
     {
         /*
-         * Found a matching session, resuming it
+         * Resuming a session
          */
-        ssl->handshake->resume = 1;
+        n = ssl->session_negotiate->length;
         ssl->state = SSL_SERVER_CHANGE_CIPHER_SPEC;
 
         if( ( ret = ssl_derive_keys( ssl ) ) != 0 )
@@ -847,6 +1851,15 @@ static int ssl_write_server_hello( ssl_context *ssl )
         }
     }
 
+    /*
+     *    38  .  38     session id length
+     *    39  . 38+n    session id
+     *   39+n . 40+n    chosen ciphersuite
+     *   41+n . 41+n    chosen compression alg.
+     *   42+n . 43+n    extensions length
+     *   44+n . 43+n+m  extensions
+     */
+    *p++ = (unsigned char) ssl->session_negotiate->length;
     memcpy( p, ssl->session_negotiate->id, ssl->session_negotiate->length );
     p += ssl->session_negotiate->length;
 
@@ -859,38 +1872,49 @@ static int ssl_write_server_hello( ssl_context *ssl )
     *p++ = (unsigned char)( ssl->session_negotiate->ciphersuite      );
     *p++ = (unsigned char)( ssl->session_negotiate->compression      );
 
-    SSL_DEBUG_MSG( 3, ( "server hello, chosen ciphersuite: %d",
-                   ssl->session_negotiate->ciphersuite ) );
-    SSL_DEBUG_MSG( 3, ( "server hello, compress alg.: %d",
+    SSL_DEBUG_MSG( 3, ( "server hello, chosen ciphersuite: %s",
+           ssl_get_ciphersuite_name( ssl->session_negotiate->ciphersuite ) ) );
+    SSL_DEBUG_MSG( 3, ( "server hello, compress alg.: 0x%02X",
                    ssl->session_negotiate->compression ) );
 
-    if( ssl->secure_renegotiation == SSL_SECURE_RENEGOTIATION )
+    /*
+     *  First write extensions, then the total length
+     */
+    ssl_write_renegotiation_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    ssl_write_max_fragment_length_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+    ssl_write_truncated_hmac_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+    ssl_write_supported_point_formats_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+#if defined(POLARSSL_SSL_ALPN)
+    ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen );
+    ext_len += olen;
+#endif
+
+    SSL_DEBUG_MSG( 3, ( "server hello, total extension length: %d", ext_len ) );
+
+    if( ext_len > 0 )
     {
-        SSL_DEBUG_MSG( 3, ( "server hello, prepping for secure renegotiation extension" ) );
-        ext_len += 5 + ssl->verify_data_len * 2;
-
-        SSL_DEBUG_MSG( 3, ( "server hello, total extension length: %d",
-                       ext_len ) );
-
         *p++ = (unsigned char)( ( ext_len >> 8 ) & 0xFF );
         *p++ = (unsigned char)( ( ext_len      ) & 0xFF );
-
-        /*
-         * Secure renegotiation
-         */
-        SSL_DEBUG_MSG( 3, ( "client hello, secure renegotiation extension" ) );
-
-        *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO >> 8 ) & 0xFF );
-        *p++ = (unsigned char)( ( TLS_EXT_RENEGOTIATION_INFO      ) & 0xFF );
-
-        *p++ = 0x00;
-        *p++ = ( ssl->verify_data_len * 2 + 1 ) & 0xFF;
-        *p++ = ssl->verify_data_len * 2 & 0xFF;
-
-        memcpy( p, ssl->peer_verify_data, ssl->verify_data_len );
-        p += ssl->verify_data_len;
-        memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
-        p += ssl->verify_data_len;
+        p += ext_len;
     }
 
     ssl->out_msglen  = p - buf;
@@ -904,18 +1928,48 @@ static int ssl_write_server_hello( ssl_context *ssl )
     return( ret );
 }
 
+#if !defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)       && \
+    !defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)   && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
 static int ssl_write_certificate_request( ssl_context *ssl )
 {
-    int ret;
-    size_t n = 0, dn_size, total_dn_size;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+
+    SSL_DEBUG_MSG( 2, ( "=> write certificate request" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip write certificate request" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+#else
+static int ssl_write_certificate_request( ssl_context *ssl )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+    size_t dn_size, total_dn_size; /* excluding length bytes */
+    size_t ct_len, sa_len; /* including length bytes */
     unsigned char *buf, *p;
-    const x509_cert *crt;
+    const x509_crt *crt;
 
     SSL_DEBUG_MSG( 2, ( "=> write certificate request" ) );
 
     ssl->state++;
 
-    if( ssl->authmode == SSL_VERIFY_NONE )
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ssl->authmode == SSL_VERIFY_NONE )
     {
         SSL_DEBUG_MSG( 2, ( "<= skip write certificate request" ) );
         return( 0 );
@@ -927,7 +1981,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
      *     4  .   4   cert type count
      *     5  .. m-1  cert types
      *     m  .. m+1  sig alg length (TLS 1.2 only)
-     *    m+1 .. n-1  SignatureAndHashAlgorithms (TLS 1.2 only) 
+     *    m+1 .. n-1  SignatureAndHashAlgorithms (TLS 1.2 only)
      *     n  .. n+1  length of all DNs
      *    n+2 .. n+3  length of DN 1
      *    n+4 .. ...  Distinguished Name #1
@@ -937,42 +1991,80 @@ static int ssl_write_certificate_request( ssl_context *ssl )
     p = buf + 4;
 
     /*
-     * At the moment, only RSA certificates are supported
+     * Supported certificate types
+     *
+     *     ClientCertificateType certificate_types<1..2^8-1>;
+     *     enum { (255) } ClientCertificateType;
      */
-    *p++ = 1;
-    *p++ = SSL_CERT_TYPE_RSA_SIGN;
+    ct_len = 0;
 
+#if defined(POLARSSL_RSA_C)
+    p[1 + ct_len++] = SSL_CERT_TYPE_RSA_SIGN;
+#endif
+#if defined(POLARSSL_ECDSA_C)
+    p[1 + ct_len++] = SSL_CERT_TYPE_ECDSA_SIGN;
+#endif
+
+    p[0] = (unsigned char) ct_len++;
+    p += ct_len;
+
+    sa_len = 0;
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
     /*
      * Add signature_algorithms for verify (TLS 1.2)
-     * Only add current running algorithm that is already required for
-     * requested ciphersuite.
      *
-     * Length is always 2
+     *     SignatureAndHashAlgorithm supported_signature_algorithms<2..2^16-2>;
+     *
+     *     struct {
+     *           HashAlgorithm hash;
+     *           SignatureAlgorithm signature;
+     *     } SignatureAndHashAlgorithm;
+     *
+     *     enum { (255) } HashAlgorithm;
+     *     enum { (255) } SignatureAlgorithm;
      */
     if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
+        /*
+         * Only use current running hash algorithm that is already required
+         * for requested ciphersuite.
+         */
         ssl->handshake->verify_sig_alg = SSL_HASH_SHA256;
 
-        *p++ = 0;
-        *p++ = 2;
-
-        if( ssl->session_negotiate->ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-            ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+        if( ssl->transform_negotiate->ciphersuite_info->mac ==
+            POLARSSL_MD_SHA384 )
         {
             ssl->handshake->verify_sig_alg = SSL_HASH_SHA384;
         }
-        
-        *p++ = ssl->handshake->verify_sig_alg;
-        *p++ = SSL_SIG_RSA;
 
-        n += 4;
+        /*
+         * Supported signature algorithms
+         */
+#if defined(POLARSSL_RSA_C)
+        p[2 + sa_len++] = ssl->handshake->verify_sig_alg;
+        p[2 + sa_len++] = SSL_SIG_RSA;
+#endif
+#if defined(POLARSSL_ECDSA_C)
+        p[2 + sa_len++] = ssl->handshake->verify_sig_alg;
+        p[2 + sa_len++] = SSL_SIG_ECDSA;
+#endif
+
+        p[0] = (unsigned char)( sa_len >> 8 );
+        p[1] = (unsigned char)( sa_len      );
+        sa_len += 2;
+        p += sa_len;
     }
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
 
+    /*
+     * DistinguishedName certificate_authorities<0..2^16-1>;
+     * opaque DistinguishedName<1..2^16-1>;
+     */
     p += 2;
     crt = ssl->ca_chain;
 
     total_dn_size = 0;
-    while( crt != NULL && crt->version != 0)
+    while( crt != NULL && crt->version != 0 )
     {
         if( p - buf > 4096 )
             break;
@@ -992,8 +2084,8 @@ static int ssl_write_certificate_request( ssl_context *ssl )
     ssl->out_msglen  = p - buf;
     ssl->out_msgtype = SSL_MSG_HANDSHAKE;
     ssl->out_msg[0]  = SSL_HS_CERTIFICATE_REQUEST;
-    ssl->out_msg[6 + n]  = (unsigned char)( total_dn_size  >> 8 );
-    ssl->out_msg[7 + n]  = (unsigned char)( total_dn_size       );
+    ssl->out_msg[4 + ct_len + sa_len] = (unsigned char)( total_dn_size  >> 8 );
+    ssl->out_msg[5 + ct_len + sa_len] = (unsigned char)( total_dn_size       );
 
     ret = ssl_write_record( ssl );
 
@@ -1001,231 +2093,369 @@ static int ssl_write_certificate_request( ssl_context *ssl )
 
     return( ret );
 }
+#endif /* !POLARSSL_KEY_EXCHANGE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+static int ssl_get_ecdh_params_from_cert( ssl_context *ssl )
+{
+    int ret;
+
+    if( ! pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_ECKEY ) )
+    {
+        SSL_DEBUG_MSG( 1, ( "server key not ECDH capable" ) );
+        return( POLARSSL_ERR_SSL_PK_TYPE_MISMATCH );
+    }
+
+    if( ( ret = ecdh_get_params( &ssl->handshake->ecdh_ctx,
+                                 pk_ec( *ssl_own_key( ssl ) ),
+                                 POLARSSL_ECDH_OURS ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, ( "ecdh_get_params" ), ret );
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
 
 static int ssl_write_server_key_exchange( ssl_context *ssl )
 {
-#if defined(POLARSSL_DHM_C)
     int ret;
-    size_t n, rsa_key_len = 0;
-    unsigned char hash[64];
-    int hash_id = 0;
-    unsigned int hashlen = 0;
+    size_t n = 0;
+    const ssl_ciphersuite_t *ciphersuite_info =
+                            ssl->transform_negotiate->ciphersuite_info;
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    unsigned char *p = ssl->out_msg + 4;
+    unsigned char *dig_signed = p;
+    size_t dig_signed_len = 0, len;
+    ((void) dig_signed);
+    ((void) dig_signed_len);
 #endif
 
     SSL_DEBUG_MSG( 2, ( "=> write server key exchange" ) );
 
-    if( ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_DES_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 &&
-        ssl->session_negotiate->ciphersuite != TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) ||                           \
+    defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED) ||                           \
+    defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK )
     {
         SSL_DEBUG_MSG( 2, ( "<= skip write server key exchange" ) );
         ssl->state++;
         return( 0 );
     }
-
-#if !defined(POLARSSL_DHM_C)
-    SSL_DEBUG_MSG( 1, ( "support for dhm is not available" ) );
-    return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-#else
-
-    if( ssl->rsa_key == NULL )
-    {
-        SSL_DEBUG_MSG( 1, ( "got no private key" ) );
-        return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
-    }
-
-    /*
-     * Ephemeral DH parameters:
-     *
-     * struct {
-     *     opaque dh_p<1..2^16-1>;
-     *     opaque dh_g<1..2^16-1>;
-     *     opaque dh_Ys<1..2^16-1>;
-     * } ServerDHParams;
-     */
-    if( ( ret = mpi_copy( &ssl->handshake->dhm_ctx.P, &ssl->dhm_P ) ) != 0 ||
-        ( ret = mpi_copy( &ssl->handshake->dhm_ctx.G, &ssl->dhm_G ) ) != 0 )
-    {
-        SSL_DEBUG_RET( 1, "mpi_copy", ret );
-        return( ret );
-    }
-
-    if( ( ret = dhm_make_params( &ssl->handshake->dhm_ctx,
-                                  mpi_size( &ssl->handshake->dhm_ctx.P ),
-                                  ssl->out_msg + 4,
-                                  &n, ssl->f_rng, ssl->p_rng ) ) != 0 )
-    {
-        SSL_DEBUG_RET( 1, "dhm_make_params", ret );
-        return( ret );
-    }
-
-    SSL_DEBUG_MPI( 3, "DHM: X ", &ssl->handshake->dhm_ctx.X  );
-    SSL_DEBUG_MPI( 3, "DHM: P ", &ssl->handshake->dhm_ctx.P  );
-    SSL_DEBUG_MPI( 3, "DHM: G ", &ssl->handshake->dhm_ctx.G  );
-    SSL_DEBUG_MPI( 3, "DHM: GX", &ssl->handshake->dhm_ctx.GX );
-
-    if( ssl->minor_ver != SSL_MINOR_VERSION_3 )
-    {
-        md5_context md5;
-        sha1_context sha1;
-
-        /*
-         * digitally-signed struct {
-         *     opaque md5_hash[16];
-         *     opaque sha_hash[20];
-         * };
-         *
-         * md5_hash
-         *     MD5(ClientHello.random + ServerHello.random
-         *                            + ServerParams);
-         * sha_hash
-         *     SHA(ClientHello.random + ServerHello.random
-         *                            + ServerParams);
-         */
-        md5_starts( &md5 );
-        md5_update( &md5, ssl->handshake->randbytes,  64 );
-        md5_update( &md5, ssl->out_msg + 4, n );
-        md5_finish( &md5, hash );
-
-        sha1_starts( &sha1 );
-        sha1_update( &sha1, ssl->handshake->randbytes,  64 );
-        sha1_update( &sha1, ssl->out_msg + 4, n );
-        sha1_finish( &sha1, hash + 16 );
-
-        hashlen = 36;
-        hash_id = SIG_RSA_RAW;
-    }
-    else
-    {
-        /*
-         * digitally-signed struct {
-         *     opaque client_random[32];
-         *     opaque server_random[32];
-         *     ServerDHParams params;
-         * };
-         */
-#if defined(POLARSSL_SHA4_C)
-        if( ssl->handshake->sig_alg == SSL_HASH_SHA512 )
-        {
-            sha4_context sha4;
-
-            sha4_starts( &sha4, 0 );
-            sha4_update( &sha4, ssl->handshake->randbytes, 64 );
-            sha4_update( &sha4, ssl->out_msg + 4, n );
-            sha4_finish( &sha4, hash );
-
-            hashlen = 64;
-            hash_id = SIG_RSA_SHA512;
-        }
-        else if( ssl->handshake->sig_alg == SSL_HASH_SHA384 )
-        {
-            sha4_context sha4;
-
-            sha4_starts( &sha4, 1 );
-            sha4_update( &sha4, ssl->handshake->randbytes, 64 );
-            sha4_update( &sha4, ssl->out_msg + 4, n );
-            sha4_finish( &sha4, hash );
-
-            hashlen = 48;
-            hash_id = SIG_RSA_SHA384;
-        }
-        else
 #endif
-#if defined(POLARSSL_SHA2_C)
-        if( ssl->handshake->sig_alg == SSL_HASH_SHA256 )
-        {
-            sha2_context sha2;
 
-            sha2_starts( &sha2, 0 );
-            sha2_update( &sha2, ssl->handshake->randbytes, 64 );
-            sha2_update( &sha2, ssl->out_msg + 4, n );
-            sha2_finish( &sha2, hash );
-
-            hashlen = 32;
-            hash_id = SIG_RSA_SHA256;
-        }
-        else if( ssl->handshake->sig_alg == SSL_HASH_SHA224 )
-        {
-            sha2_context sha2;
-
-            sha2_starts( &sha2, 1 );
-            sha2_update( &sha2, ssl->handshake->randbytes, 64 );
-            sha2_update( &sha2, ssl->out_msg + 4, n );
-            sha2_finish( &sha2, hash );
-
-            hashlen = 24;
-            hash_id = SIG_RSA_SHA224;
-        }
-        else
-#endif
-        if( ssl->handshake->sig_alg == SSL_HASH_SHA1 )
-        {
-            sha1_context sha1;
-
-            sha1_starts( &sha1 );
-            sha1_update( &sha1, ssl->handshake->randbytes, 64 );
-            sha1_update( &sha1, ssl->out_msg + 4, n );
-            sha1_finish( &sha1, hash );
-
-            hashlen = 20;
-            hash_id = SIG_RSA_SHA1;
-        }
-        else if( ssl->handshake->sig_alg == SSL_HASH_MD5 )
-        {
-            md5_context md5;
-
-            md5_starts( &md5 );
-            md5_update( &md5, ssl->handshake->randbytes, 64 );
-            md5_update( &md5, ssl->out_msg + 4, n );
-            md5_finish( &md5, hash );
-
-            hashlen = 16;
-            hash_id = SIG_RSA_MD5;
-        }
-    }
-
-    SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen );
-
-    if ( ssl->rsa_key )
-        rsa_key_len = ssl->rsa_key_len( ssl->rsa_key );
-
-    if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_ECDSA )
     {
-        ssl->out_msg[4 + n] = ssl->handshake->sig_alg;
-        ssl->out_msg[5 + n] = SSL_SIG_RSA;
+        ssl_get_ecdh_params_from_cert( ssl );
+
+        SSL_DEBUG_MSG( 2, ( "<= skip write server key exchange" ) );
+        ssl->state++;
+        return( 0 );
+    }
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        /* TODO: Support identity hints */
+        *(p++) = 0x00;
+        *(p++) = 0x00;
 
         n += 2;
     }
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
 
-    ssl->out_msg[4 + n] = (unsigned char)( rsa_key_len >> 8 );
-    ssl->out_msg[5 + n] = (unsigned char)( rsa_key_len      );
-
-    if ( ssl->rsa_key )
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
     {
-        ret = ssl->rsa_sign( ssl->rsa_key, ssl->f_rng, ssl->p_rng,
-                             RSA_PRIVATE,
-                             hash_id, hashlen, hash,
-                             ssl->out_msg + 6 + n );
-    }
+        /*
+         * Ephemeral DH parameters:
+         *
+         * struct {
+         *     opaque dh_p<1..2^16-1>;
+         *     opaque dh_g<1..2^16-1>;
+         *     opaque dh_Ys<1..2^16-1>;
+         * } ServerDHParams;
+         */
+        if( ( ret = mpi_copy( &ssl->handshake->dhm_ctx.P, &ssl->dhm_P ) ) != 0 ||
+            ( ret = mpi_copy( &ssl->handshake->dhm_ctx.G, &ssl->dhm_G ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "mpi_copy", ret );
+            return( ret );
+        }
 
-    if( ret != 0 )
+        if( ( ret = dhm_make_params( &ssl->handshake->dhm_ctx,
+                        (int) mpi_size( &ssl->handshake->dhm_ctx.P ),
+                        p, &len, ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "dhm_make_params", ret );
+            return( ret );
+        }
+
+        dig_signed = p;
+        dig_signed_len = len;
+
+        p += len;
+        n += len;
+
+        SSL_DEBUG_MPI( 3, "DHM: X ", &ssl->handshake->dhm_ctx.X  );
+        SSL_DEBUG_MPI( 3, "DHM: P ", &ssl->handshake->dhm_ctx.P  );
+        SSL_DEBUG_MPI( 3, "DHM: G ", &ssl->handshake->dhm_ctx.G  );
+        SSL_DEBUG_MPI( 3, "DHM: GX", &ssl->handshake->dhm_ctx.GX );
+    }
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
     {
-        SSL_DEBUG_RET( 1, "pkcs1_sign", ret );
-        return( ret );
+        /*
+         * Ephemeral ECDH parameters:
+         *
+         * struct {
+         *     ECParameters curve_params;
+         *     ECPoint      public;
+         * } ServerECDHParams;
+         */
+        const ecp_curve_info **curve = NULL;
+#if defined(POLARSSL_SSL_SET_CURVES)
+        const ecp_group_id *gid;
+
+        /* Match our preference list against the offered curves */
+        for( gid = ssl->curve_list; *gid != POLARSSL_ECP_DP_NONE; gid++ )
+            for( curve = ssl->handshake->curves; *curve != NULL; curve++ )
+                if( (*curve)->grp_id == *gid )
+                    goto curve_matching_done;
+
+curve_matching_done:
+#else
+        curve = ssl->handshake->curves;
+#endif
+
+        if( *curve == NULL )
+        {
+            SSL_DEBUG_MSG( 1, ( "no matching curve for ECDHE" ) );
+            return( POLARSSL_ERR_SSL_NO_CIPHER_CHOSEN );
+        }
+
+        SSL_DEBUG_MSG( 2, ( "ECDHE curve: %s", (*curve)->name ) );
+
+        if( ( ret = ecp_use_known_dp( &ssl->handshake->ecdh_ctx.grp,
+                                       (*curve)->grp_id ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecp_use_known_dp", ret );
+            return( ret );
+        }
+
+        if( ( ret = ecdh_make_params( &ssl->handshake->ecdh_ctx, &len,
+                                      p, SSL_MAX_CONTENT_LEN - n,
+                                      ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecdh_make_params", ret );
+            return( ret );
+        }
+
+        dig_signed = p;
+        dig_signed_len = len;
+
+        p += len;
+        n += len;
+
+        SSL_DEBUG_ECP( 3, "ECDH: Q ", &ssl->handshake->ecdh_ctx.Q );
     }
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED */
 
-    SSL_DEBUG_BUF( 3, "my RSA sig", ssl->out_msg + 6 + n, rsa_key_len );
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA )
+    {
+        size_t signature_len = 0;
+        unsigned int hashlen = 0;
+        unsigned char hash[64];
+        md_type_t md_alg = POLARSSL_MD_NONE;
 
-    ssl->out_msglen  = 6 + n + rsa_key_len;
+        /*
+         * Choose hash algorithm. NONE means MD5 + SHA1 here.
+         */
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
+        {
+            md_alg = ssl_md_alg_from_hash( ssl->handshake->sig_alg );
+
+            if( md_alg == POLARSSL_MD_NONE )
+            {
+                SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+                return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+            }
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+        if( ciphersuite_info->key_exchange ==
+                  POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA )
+        {
+            md_alg = POLARSSL_MD_SHA1;
+        }
+        else
+#endif
+        {
+            md_alg = POLARSSL_MD_NONE;
+        }
+
+        /*
+         * Compute the hash to be signed
+         */
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+        if( md_alg == POLARSSL_MD_NONE )
+        {
+            md5_context md5;
+            sha1_context sha1;
+
+            md5_init(  &md5  );
+            sha1_init( &sha1 );
+
+            /*
+             * digitally-signed struct {
+             *     opaque md5_hash[16];
+             *     opaque sha_hash[20];
+             * };
+             *
+             * md5_hash
+             *     MD5(ClientHello.random + ServerHello.random
+             *                            + ServerParams);
+             * sha_hash
+             *     SHA(ClientHello.random + ServerHello.random
+             *                            + ServerParams);
+             */
+            md5_starts( &md5 );
+            md5_update( &md5, ssl->handshake->randbytes,  64 );
+            md5_update( &md5, dig_signed, dig_signed_len );
+            md5_finish( &md5, hash );
+
+            sha1_starts( &sha1 );
+            sha1_update( &sha1, ssl->handshake->randbytes,  64 );
+            sha1_update( &sha1, dig_signed, dig_signed_len );
+            sha1_finish( &sha1, hash + 16 );
+
+            hashlen = 36;
+
+            md5_free(  &md5  );
+            sha1_free( &sha1 );
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_SSL3 || POLARSSL_SSL_PROTO_TLS1 || \
+          POLARSSL_SSL_PROTO_TLS1_1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( md_alg != POLARSSL_MD_NONE )
+        {
+            md_context_t ctx;
+            const md_info_t *md_info = md_info_from_type( md_alg );
+
+            md_init( &ctx );
+
+            /* Info from md_alg will be used instead */
+            hashlen = 0;
+
+            /*
+             * digitally-signed struct {
+             *     opaque client_random[32];
+             *     opaque server_random[32];
+             *     ServerDHParams params;
+             * };
+             */
+            if( ( ret = md_init_ctx( &ctx, md_info ) ) != 0 )
+            {
+                SSL_DEBUG_RET( 1, "md_init_ctx", ret );
+                return( ret );
+            }
+
+            md_starts( &ctx );
+            md_update( &ctx, ssl->handshake->randbytes, 64 );
+            md_update( &ctx, dig_signed, dig_signed_len );
+            md_finish( &ctx, hash );
+            md_free( &ctx );
+        }
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 || \
+          POLARSSL_SSL_PROTO_TLS1_2 */
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen != 0 ? hashlen :
+                (unsigned int) ( md_info_from_type( md_alg ) )->size );
+
+        /*
+         * Make the signature
+         */
+        if( ssl_own_key( ssl ) == NULL )
+        {
+            SSL_DEBUG_MSG( 1, ( "got no private key" ) );
+            return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
+        }
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
+        {
+            *(p++) = ssl->handshake->sig_alg;
+            *(p++) = ssl_sig_from_pk( ssl_own_key( ssl ) );
+
+            n += 2;
+        }
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+        if( ( ret = pk_sign( ssl_own_key( ssl ), md_alg, hash, hashlen,
+                        p + 2 , &signature_len,
+                        ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "pk_sign", ret );
+            return( ret );
+        }
+
+        *(p++) = (unsigned char)( signature_len >> 8 );
+        *(p++) = (unsigned char)( signature_len      );
+        n += 2;
+
+        SSL_DEBUG_BUF( 3, "my signature", p, signature_len );
+
+        p += signature_len;
+        n += signature_len;
+    }
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+
+    ssl->out_msglen  = 4 + n;
     ssl->out_msgtype = SSL_MSG_HANDSHAKE;
     ssl->out_msg[0]  = SSL_HS_SERVER_KEY_EXCHANGE;
 
@@ -1240,7 +2470,6 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
     SSL_DEBUG_MSG( 2, ( "<= write server key exchange" ) );
 
     return( 0 );
-#endif
 }
 
 static int ssl_write_server_hello_done( ssl_context *ssl )
@@ -1266,10 +2495,189 @@ static int ssl_write_server_hello_done( ssl_context *ssl )
     return( 0 );
 }
 
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) ||                       \
+    defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+static int ssl_parse_client_dh_public( ssl_context *ssl, unsigned char **p,
+                                       const unsigned char *end )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    size_t n;
+
+    /*
+     * Receive G^Y mod P, premaster = (G^Y)^X mod P
+     */
+    if( *p + 2 > end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+    }
+
+    n = ( (*p)[0] << 8 ) | (*p)[1];
+    *p += 2;
+
+    if( *p + n > end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+    }
+
+    if( ( ret = dhm_read_public( &ssl->handshake->dhm_ctx, *p, n ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "dhm_read_public", ret );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP );
+    }
+
+    *p += n;
+
+    SSL_DEBUG_MPI( 3, "DHM: GY", &ssl->handshake->dhm_ctx.GY );
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) ||                           \
+    defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+static int ssl_parse_encrypted_pms( ssl_context *ssl,
+                                    const unsigned char *p,
+                                    const unsigned char *end,
+                                    size_t pms_offset )
+{
+    int ret;
+    size_t len = pk_get_len( ssl_own_key( ssl ) );
+    unsigned char *pms = ssl->handshake->premaster + pms_offset;
+
+    if( ! pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_RSA ) )
+    {
+        SSL_DEBUG_MSG( 1, ( "got no RSA private key" ) );
+        return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
+    }
+
+    /*
+     * Decrypt the premaster using own private RSA key
+     */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+    if( ssl->minor_ver != SSL_MINOR_VERSION_0 )
+    {
+        if( *p++ != ( ( len >> 8 ) & 0xFF ) ||
+            *p++ != ( ( len      ) & 0xFF ) )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+        }
+    }
+#endif
+
+    if( p + len != end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+    }
+
+    ret = pk_decrypt( ssl_own_key( ssl ), p, len,
+                      pms, &ssl->handshake->pmslen,
+                      sizeof( ssl->handshake->premaster ) - pms_offset,
+                      ssl->f_rng, ssl->p_rng );
+
+    if( ret != 0 || ssl->handshake->pmslen != 48 ||
+        pms[0] != ssl->handshake->max_major_ver ||
+        pms[1] != ssl->handshake->max_minor_ver )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+
+        /*
+         * Protection against Bleichenbacher's attack:
+         * invalid PKCS#1 v1.5 padding must not cause
+         * the connection to end immediately; instead,
+         * send a bad_record_mac later in the handshake.
+         */
+        ssl->handshake->pmslen = 48;
+
+        ret = ssl->f_rng( ssl->p_rng, pms, ssl->handshake->pmslen );
+        if( ret != 0 )
+            return( ret );
+    }
+
+    return( ret );
+}
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+static int ssl_parse_client_psk_identity( ssl_context *ssl, unsigned char **p,
+                                          const unsigned char *end )
+{
+    int ret = 0;
+    size_t n;
+
+    if( ssl->f_psk == NULL &&
+        ( ssl->psk == NULL || ssl->psk_identity == NULL ||
+          ssl->psk_identity_len == 0 || ssl->psk_len == 0 ) )
+    {
+        SSL_DEBUG_MSG( 1, ( "got no pre-shared key" ) );
+        return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
+    }
+
+    /*
+     * Receive client pre-shared key identity name
+     */
+    if( *p + 2 > end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+    }
+
+    n = ( (*p)[0] << 8 ) | (*p)[1];
+    *p += 2;
+
+    if( n < 1 || n > 65535 || *p + n > end )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+        return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+    }
+
+    if( ssl->f_psk != NULL )
+    {
+        if( ssl->f_psk( ssl->p_psk, ssl, *p, n ) != 0 )
+            ret = POLARSSL_ERR_SSL_UNKNOWN_IDENTITY;
+    }
+    else
+    {
+        /* Identity is not a big secret since clients send it in the clear,
+         * but treat it carefully anyway, just in case */
+        if( n != ssl->psk_identity_len ||
+            safer_memcmp( ssl->psk_identity, *p, n ) != 0 )
+        {
+            ret = POLARSSL_ERR_SSL_UNKNOWN_IDENTITY;
+        }
+    }
+
+    if( ret == POLARSSL_ERR_SSL_UNKNOWN_IDENTITY )
+    {
+        SSL_DEBUG_BUF( 3, "Unknown PSK identity", *p, n );
+        if( ( ret = ssl_send_alert_message( ssl,
+                              SSL_ALERT_LEVEL_FATAL,
+                              SSL_ALERT_MSG_UNKNOWN_PSK_IDENTITY ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        return( POLARSSL_ERR_SSL_UNKNOWN_IDENTITY );
+    }
+
+    *p += n;
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+
 static int ssl_parse_client_key_exchange( ssl_context *ssl )
 {
     int ret;
-    size_t i, n = 0;
+    const ssl_ciphersuite_t *ciphersuite_info;
+
+    ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse client key exchange" ) );
 
@@ -1291,118 +2699,208 @@ static int ssl_parse_client_key_exchange( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
     }
 
-    if( ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_DES_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ||
-        ssl->session_negotiate->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_RSA )
     {
-#if !defined(POLARSSL_DHM_C)
-        SSL_DEBUG_MSG( 1, ( "support for dhm is not available" ) );
-        return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-#else
-        /*
-         * Receive G^Y mod P, premaster = (G^Y)^X mod P
-         */
-        n = ( ssl->in_msg[4] << 8 ) | ssl->in_msg[5];
+        unsigned char *p = ssl->in_msg + 4;
+        unsigned char *end = ssl->in_msg + ssl->in_hslen;
 
-        if( n < 1 || n > ssl->handshake->dhm_ctx.len ||
-            n + 6 != ssl->in_hslen )
+        if( ( ret = ssl_parse_client_dh_public( ssl, &p, end ) ) != 0 )
         {
-            SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_dh_public" ), ret );
+            return( ret );
+        }
+
+        if( p != end )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad client key exchange" ) );
             return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
         }
 
-        if( ( ret = dhm_read_public( &ssl->handshake->dhm_ctx,
-                                      ssl->in_msg + 6, n ) ) != 0 )
-        {
-            SSL_DEBUG_RET( 1, "dhm_read_public", ret );
-            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_RP );
-        }
-
-        SSL_DEBUG_MPI( 3, "DHM: GY", &ssl->handshake->dhm_ctx.GY );
-
-        ssl->handshake->pmslen = ssl->handshake->dhm_ctx.len;
+        ssl->handshake->pmslen = POLARSSL_PREMASTER_SIZE;
 
         if( ( ret = dhm_calc_secret( &ssl->handshake->dhm_ctx,
                                       ssl->handshake->premaster,
-                                     &ssl->handshake->pmslen ) ) != 0 )
+                                     &ssl->handshake->pmslen,
+                                      ssl->f_rng, ssl->p_rng ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "dhm_calc_secret", ret );
-            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_DHM_CS );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS );
         }
 
         SSL_DEBUG_MPI( 3, "DHM: K ", &ssl->handshake->dhm_ctx.K  );
-#endif
     }
     else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) ||                     \
+    defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) ||                   \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED) ||                      \
+    defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_RSA ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDH_ECDSA )
     {
-        if( ssl->rsa_key == NULL )
+        if( ( ret = ecdh_read_public( &ssl->handshake->ecdh_ctx,
+                        ssl->in_msg + 4, ssl->in_hslen - 4 ) ) != 0 )
         {
-            SSL_DEBUG_MSG( 1, ( "got no private key" ) );
-            return( POLARSSL_ERR_SSL_PRIVATE_KEY_REQUIRED );
+            SSL_DEBUG_RET( 1, "ecdh_read_public", ret );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP );
         }
 
-        /*
-         * Decrypt the premaster using own private RSA key
-         */
-        i = 4;
-        if( ssl->rsa_key )
-            n = ssl->rsa_key_len( ssl->rsa_key );
-        ssl->handshake->pmslen = 48;
+        SSL_DEBUG_ECP( 3, "ECDH: Qp ", &ssl->handshake->ecdh_ctx.Qp );
 
-        if( ssl->minor_ver != SSL_MINOR_VERSION_0 )
+        if( ( ret = ecdh_calc_secret( &ssl->handshake->ecdh_ctx,
+                                      &ssl->handshake->pmslen,
+                                       ssl->handshake->premaster,
+                                       POLARSSL_MPI_MAX_SIZE,
+                                       ssl->f_rng, ssl->p_rng ) ) != 0 )
         {
-            i += 2;
-            if( ssl->in_msg[4] != ( ( n >> 8 ) & 0xFF ) ||
-                ssl->in_msg[5] != ( ( n      ) & 0xFF ) )
-            {
-                SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
-                return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
-            }
+            SSL_DEBUG_RET( 1, "ecdh_calc_secret", ret );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS );
         }
 
-        if( ssl->in_hslen != i + n )
+        SSL_DEBUG_MPI( 3, "ECDH: z  ", &ssl->handshake->ecdh_ctx.z );
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED ||
+          POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK )
+    {
+        unsigned char *p = ssl->in_msg + 4;
+        unsigned char *end = ssl->in_msg + ssl->in_hslen;
+
+        if( ( ret = ssl_parse_client_psk_identity( ssl, &p, end ) ) != 0 )
         {
-            SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_psk_identity" ), ret );
+            return( ret );
+        }
+
+        if( p != end )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad client key exchange" ) );
             return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
         }
 
-        if( ssl->rsa_key ) {
-            ret = ssl->rsa_decrypt( ssl->rsa_key, RSA_PRIVATE,
-                                   &ssl->handshake->pmslen,
-                                    ssl->in_msg + i,
-                                    ssl->handshake->premaster,
-                                    sizeof(ssl->handshake->premaster) );
-        }
-
-        if( ret != 0 || ssl->handshake->pmslen != 48 ||
-            ssl->handshake->premaster[0] != ssl->max_major_ver ||
-            ssl->handshake->premaster[1] != ssl->max_minor_ver )
+        if( ( ret = ssl_psk_derive_premaster( ssl,
+                        ciphersuite_info->key_exchange ) ) != 0 )
         {
-            SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
-
-            /*
-             * Protection against Bleichenbacher's attack:
-             * invalid PKCS#1 v1.5 padding must not cause
-             * the connection to end immediately; instead,
-             * send a bad_record_mac later in the handshake.
-             */
-            ssl->handshake->pmslen = 48;
-
-            ret = ssl->f_rng( ssl->p_rng, ssl->handshake->premaster,
-                              ssl->handshake->pmslen );
-            if( ret != 0 )
-                return( ret );
+            SSL_DEBUG_RET( 1, "ssl_psk_derive_premaster", ret );
+            return( ret );
         }
     }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK )
+    {
+        unsigned char *p = ssl->in_msg + 4;
+        unsigned char *end = ssl->in_msg + ssl->in_hslen;
+
+        if( ( ret = ssl_parse_client_psk_identity( ssl, &p, end ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_psk_identity" ), ret );
+            return( ret );
+        }
+
+        if( ( ret = ssl_parse_encrypted_pms( ssl, p, end, 2 ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_encrypted_pms" ), ret );
+            return( ret );
+        }
+
+        if( ( ret = ssl_psk_derive_premaster( ssl,
+                        ciphersuite_info->key_exchange ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_psk_derive_premaster", ret );
+            return( ret );
+        }
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        unsigned char *p = ssl->in_msg + 4;
+        unsigned char *end = ssl->in_msg + ssl->in_hslen;
+
+        if( ( ret = ssl_parse_client_psk_identity( ssl, &p, end ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_psk_identity" ), ret );
+            return( ret );
+        }
+        if( ( ret = ssl_parse_client_dh_public( ssl, &p, end ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_dh_public" ), ret );
+            return( ret );
+        }
+
+        if( p != end )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad client key exchange" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE );
+        }
+
+        if( ( ret = ssl_psk_derive_premaster( ssl,
+                        ciphersuite_info->key_exchange ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_psk_derive_premaster", ret );
+            return( ret );
+        }
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        unsigned char *p = ssl->in_msg + 4;
+        unsigned char *end = ssl->in_msg + ssl->in_hslen;
+
+        if( ( ret = ssl_parse_client_psk_identity( ssl, &p, end ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_client_psk_identity" ), ret );
+            return( ret );
+        }
+
+        if( ( ret = ecdh_read_public( &ssl->handshake->ecdh_ctx,
+                                       p, end - p ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecdh_read_public", ret );
+            return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP );
+        }
+
+        SSL_DEBUG_ECP( 3, "ECDH: Qp ", &ssl->handshake->ecdh_ctx.Qp );
+
+        if( ( ret = ssl_psk_derive_premaster( ssl,
+                        ciphersuite_info->key_exchange ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_psk_derive_premaster", ret );
+            return( ret );
+        }
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA )
+    {
+        if( ( ret = ssl_parse_encrypted_pms( ssl,
+                                             ssl->in_msg + 4,
+                                             ssl->in_msg + ssl->in_hslen,
+                                             0 ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, ( "ssl_parse_parse_encrypted_pms_secret" ), ret );
+            return( ret );
+        }
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
 
     if( ( ret = ssl_derive_keys( ssl ) ) != 0 )
     {
@@ -1417,16 +2915,55 @@ static int ssl_parse_client_key_exchange( ssl_context *ssl )
     return( 0 );
 }
 
+#if !defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)       && \
+    !defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)   && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
 static int ssl_parse_certificate_verify( ssl_context *ssl )
 {
-    int ret;
-    size_t n = 0, n1, n2;
-    unsigned char hash[48];
-    int hash_id;
-    unsigned int hashlen;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse certificate verify" ) );
 
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate verify" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+#else
+static int ssl_parse_certificate_verify( ssl_context *ssl )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    size_t sa_len, sig_len;
+    unsigned char hash[48];
+    unsigned char *hash_start = hash;
+    size_t hashlen;
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+    pk_type_t pk_alg;
+#endif
+    md_type_t md_alg;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+
+    SSL_DEBUG_MSG( 2, ( "=> parse certificate verify" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate verify" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
     if( ssl->session_negotiate->peer_cert == NULL )
     {
         SSL_DEBUG_MSG( 2, ( "<= skip parse certificate verify" ) );
@@ -1456,59 +2993,162 @@ static int ssl_parse_certificate_verify( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY );
     }
 
+    /*
+     *     0  .   0   handshake type
+     *     1  .   3   handshake length
+     *     4  .   5   sig alg (TLS 1.2 only)
+     *    4+n .  5+n  signature length (n = sa_len)
+     *    6+n . 6+n+m signature (m = sig_len)
+     */
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+    if( ssl->minor_ver != SSL_MINOR_VERSION_3 )
+    {
+        sa_len = 0;
+
+        md_alg = POLARSSL_MD_NONE;
+        hashlen = 36;
+
+        /* For ECDSA, use SHA-1, not MD-5 + SHA-1 */
+        if( pk_can_do( &ssl->session_negotiate->peer_cert->pk,
+                        POLARSSL_PK_ECDSA ) )
+        {
+            hash_start += 16;
+            hashlen -= 16;
+            md_alg = POLARSSL_MD_SHA1;
+        }
+    }
+    else
+#endif /* POLARSSL_SSL_PROTO_SSL3 || POLARSSL_SSL_PROTO_TLS1 ||
+          POLARSSL_SSL_PROTO_TLS1_1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
     if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
+        sa_len = 2;
+
         /*
-         * As server we know we either have SSL_HASH_SHA384 or
-         * SSL_HASH_SHA256
+         * Hash
          */
-        if( ssl->in_msg[4] != ssl->handshake->verify_sig_alg ||
-            ssl->in_msg[5] != SSL_SIG_RSA )
+        if( ssl->in_msg[4] != ssl->handshake->verify_sig_alg )
         {
-            SSL_DEBUG_MSG( 1, ( "peer not adhering to requested sig_alg for verify message" ) );
+            SSL_DEBUG_MSG( 1, ( "peer not adhering to requested sig_alg"
+                                " for verify message" ) );
             return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY );
         }
 
-        if( ssl->handshake->verify_sig_alg == SSL_HASH_SHA384 )
+        md_alg = ssl_md_alg_from_hash( ssl->handshake->verify_sig_alg );
+
+        /* Info from md_alg will be used instead */
+        hashlen = 0;
+
+        /*
+         * Signature
+         */
+        if( ( pk_alg = ssl_pk_alg_from_sig( ssl->in_msg[5] ) )
+                        == POLARSSL_PK_NONE )
         {
-            hashlen = 48;
-            hash_id = SIG_RSA_SHA384;
-        }
-        else
-        {
-            hashlen = 32;
-            hash_id = SIG_RSA_SHA256;
+            SSL_DEBUG_MSG( 1, ( "peer not adhering to requested sig_alg"
+                                " for verify message" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY );
         }
 
-        n += 2;
+        /*
+         * Check the certificate's key type matches the signature alg
+         */
+        if( ! pk_can_do( &ssl->session_negotiate->peer_cert->pk, pk_alg ) )
+        {
+            SSL_DEBUG_MSG( 1, ( "sig_alg doesn't match cert key" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY );
+        }
     }
     else
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
     {
-        hashlen = 36;
-        hash_id = SIG_RSA_RAW;
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
     }
 
-    n1 = ssl->session_negotiate->peer_cert->rsa.len;
-    n2 = ( ssl->in_msg[4 + n] << 8 ) | ssl->in_msg[5 + n];
+    sig_len = ( ssl->in_msg[4 + sa_len] << 8 ) | ssl->in_msg[5 + sa_len];
 
-    if( n + n1 + 6 != ssl->in_hslen || n1 != n2 )
+    if( sa_len + sig_len + 6 != ssl->in_hslen )
     {
         SSL_DEBUG_MSG( 1, ( "bad certificate verify message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY );
     }
 
-    ret = rsa_pkcs1_verify( &ssl->session_negotiate->peer_cert->rsa, RSA_PUBLIC,
-                            hash_id, hashlen, hash, ssl->in_msg + 6 + n );
-    if( ret != 0 )
+    if( ( ret = pk_verify( &ssl->session_negotiate->peer_cert->pk,
+                           md_alg, hash_start, hashlen,
+                           ssl->in_msg + 6 + sa_len, sig_len ) ) != 0 )
     {
-        SSL_DEBUG_RET( 1, "rsa_pkcs1_verify", ret );
+        SSL_DEBUG_RET( 1, "pk_verify", ret );
         return( ret );
     }
 
     SSL_DEBUG_MSG( 2, ( "<= parse certificate verify" ) );
 
+    return( ret );
+}
+#endif /* !POLARSSL_KEY_EXCHANGE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED &&
+          !POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static int ssl_write_new_session_ticket( ssl_context *ssl )
+{
+    int ret;
+    size_t tlen;
+    uint32_t lifetime = (uint32_t) ssl->ticket_lifetime;
+
+    SSL_DEBUG_MSG( 2, ( "=> write new session ticket" ) );
+
+    ssl->out_msgtype = SSL_MSG_HANDSHAKE;
+    ssl->out_msg[0]  = SSL_HS_NEW_SESSION_TICKET;
+
+    /*
+     * struct {
+     *     uint32 ticket_lifetime_hint;
+     *     opaque ticket<0..2^16-1>;
+     * } NewSessionTicket;
+     *
+     * 4  .  7   ticket_lifetime_hint (0 = unspecified)
+     * 8  .  9   ticket_len (n)
+     * 10 .  9+n ticket content
+     */
+
+    ssl->out_msg[4] = ( lifetime >> 24 ) & 0xFF;
+    ssl->out_msg[5] = ( lifetime >> 16 ) & 0xFF;
+    ssl->out_msg[6] = ( lifetime >>  8 ) & 0xFF;
+    ssl->out_msg[7] = ( lifetime       ) & 0xFF;
+
+    if( ( ret = ssl_write_ticket( ssl, &tlen ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "ssl_write_ticket", ret );
+        tlen = 0;
+    }
+
+    ssl->out_msg[8] = (unsigned char)( ( tlen >> 8 ) & 0xFF );
+    ssl->out_msg[9] = (unsigned char)( ( tlen      ) & 0xFF );
+
+    ssl->out_msglen = 10 + tlen;
+
+    /*
+     * Morally equivalent to updating ssl->state, but NewSessionTicket and
+     * ChangeCipherSpec share the same state.
+     */
+    ssl->handshake->new_session_ticket = 0;
+
+    if( ( ret = ssl_write_record( ssl ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "ssl_write_record", ret );
+        return( ret );
+    }
+
+    SSL_DEBUG_MSG( 2, ( "<= write new session ticket" ) );
+
     return( 0 );
 }
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
 
 /*
  * SSL handshake -- server side -- single step
@@ -1593,11 +3233,17 @@ int ssl_handshake_server_step( ssl_context *ssl )
             break;
 
         /*
-         *  ==>   ChangeCipherSpec
+         *  ==> ( NewSessionTicket )
+         *        ChangeCipherSpec
          *        Finished
          */
         case SSL_SERVER_CHANGE_CIPHER_SPEC:
-            ret = ssl_write_change_cipher_spec( ssl );
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+            if( ssl->handshake->new_session_ticket != 0 )
+                ret = ssl_write_new_session_ticket( ssl );
+            else
+#endif
+                ret = ssl_write_change_cipher_spec( ssl );
             break;
 
         case SSL_SERVER_FINISHED:
@@ -1620,4 +3266,4 @@ int ssl_handshake_server_step( ssl_context *ssl )
 
     return( ret );
 }
-#endif
+#endif /* POLARSSL_SSL_SRV_C */
diff --git a/Externals/polarssl/library/ssl_tls.c b/Externals/polarssl/library/ssl_tls.c
index cde6795f99..8613b8d0e3 100644
--- a/Externals/polarssl/library/ssl_tls.c
+++ b/Externals/polarssl/library/ssl_tls.c
@@ -1,7 +1,7 @@
 /*
  *  SSLv3/TLSv1 shared functions
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -31,67 +31,122 @@
  *  http://www.ietf.org/rfc/rfc4346.txt
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_SSL_TLS_C)
 
-#include "polarssl/aes.h"
-#include "polarssl/arc4.h"
-#include "polarssl/camellia.h"
-#include "polarssl/des.h"
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"
-#include "polarssl/sha2.h"
 
-#if defined(POLARSSL_GCM_C)
-#include "polarssl/gcm.h"
+#if defined(POLARSSL_X509_CRT_PARSE_C) && \
+    defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+#include "polarssl/oid.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
 #endif
 
 #include <stdlib.h>
-#include <time.h>
 
-#if defined _MSC_VER && !defined strcasecmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strcasecmp _stricmp
 #endif
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+/*
+ * Convert max_fragment_length codes to length.
+ * RFC 6066 says:
+ *    enum{
+ *        2^9(1), 2^10(2), 2^11(3), 2^12(4), (255)
+ *    } MaxFragmentLength;
+ * and we add 0 -> extension unused
+ */
+static unsigned int mfl_code_to_length[SSL_MAX_FRAG_LEN_INVALID] =
+{
+    SSL_MAX_CONTENT_LEN,    /* SSL_MAX_FRAG_LEN_NONE */
+    512,                    /* SSL_MAX_FRAG_LEN_512  */
+    1024,                   /* SSL_MAX_FRAG_LEN_1024 */
+    2048,                   /* SSL_MAX_FRAG_LEN_2048 */
+    4096,                   /* SSL_MAX_FRAG_LEN_4096 */
+};
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+static int ssl_session_copy( ssl_session *dst, const ssl_session *src )
+{
+    ssl_session_free( dst );
+    memcpy( dst, src, sizeof( ssl_session ) );
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    if( src->peer_cert != NULL )
+    {
+        int ret;
+
+        dst->peer_cert = (x509_crt *) polarssl_malloc( sizeof(x509_crt) );
+        if( dst->peer_cert == NULL )
+            return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+        x509_crt_init( dst->peer_cert );
+
+        if( ( ret = x509_crt_parse_der( dst->peer_cert, src->peer_cert->raw.p,
+                                        src->peer_cert->raw.len ) ) != 0 )
+        {
+            polarssl_free( dst->peer_cert );
+            dst->peer_cert = NULL;
+            return( ret );
+        }
+    }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    if( src->ticket != NULL )
+    {
+        dst->ticket = (unsigned char *) polarssl_malloc( src->ticket_len );
+        if( dst->ticket == NULL )
+            return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+        memcpy( dst->ticket, src->ticket, src->ticket_len );
+    }
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
+    return( 0 );
+}
+
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
-int (*ssl_hw_record_init)(ssl_context *ssl,
-                       const unsigned char *key_enc, const unsigned char *key_dec,
-                       const unsigned char *iv_enc,  const unsigned char *iv_dec,
-                       const unsigned char *mac_enc, const unsigned char *mac_dec) = NULL;
-int (*ssl_hw_record_reset)(ssl_context *ssl) = NULL;
-int (*ssl_hw_record_write)(ssl_context *ssl) = NULL;
-int (*ssl_hw_record_read)(ssl_context *ssl) = NULL;
-int (*ssl_hw_record_finish)(ssl_context *ssl) = NULL;
-#endif
-
-static int ssl_rsa_decrypt( void *ctx, int mode, size_t *olen,
-                        const unsigned char *input, unsigned char *output,
-                        size_t output_max_len )
-{
-    return rsa_pkcs1_decrypt( (rsa_context *) ctx, mode, olen, input, output,
-                              output_max_len );
-}
-
-static int ssl_rsa_sign( void *ctx,
-                    int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
-                    int mode, int hash_id, unsigned int hashlen,
-                    const unsigned char *hash, unsigned char *sig )
-{
-    return rsa_pkcs1_sign( (rsa_context *) ctx, f_rng, p_rng, mode, hash_id,
-                           hashlen, hash, sig );
-}
-
-static size_t ssl_rsa_key_len( void *ctx )
-{
-    return ( (rsa_context *) ctx )->len;
-}
+int (*ssl_hw_record_init)( ssl_context *ssl,
+                     const unsigned char *key_enc, const unsigned char *key_dec,
+                     size_t keylen,
+                     const unsigned char *iv_enc,  const unsigned char *iv_dec,
+                     size_t ivlen,
+                     const unsigned char *mac_enc, const unsigned char *mac_dec,
+                     size_t maclen ) = NULL;
+int (*ssl_hw_record_activate)( ssl_context *ssl, int direction) = NULL;
+int (*ssl_hw_record_reset)( ssl_context *ssl ) = NULL;
+int (*ssl_hw_record_write)( ssl_context *ssl ) = NULL;
+int (*ssl_hw_record_read)( ssl_context *ssl ) = NULL;
+int (*ssl_hw_record_finish)( ssl_context *ssl ) = NULL;
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
 
 /*
  * Key material generation
  */
-static int ssl3_prf( unsigned char *secret, size_t slen, char *label,
-                     unsigned char *random, size_t rlen,
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+static int ssl3_prf( const unsigned char *secret, size_t slen,
+                     const char *label,
+                     const unsigned char *random, size_t rlen,
                      unsigned char *dstbuf, size_t dlen )
 {
     size_t i;
@@ -101,6 +156,9 @@ static int ssl3_prf( unsigned char *secret, size_t slen, char *label,
     unsigned char sha1sum[20];
     ((void)label);
 
+    md5_init(  &md5  );
+    sha1_init( &sha1 );
+
     /*
      *  SSLv3:
      *    block =
@@ -111,7 +169,7 @@ static int ssl3_prf( unsigned char *secret, size_t slen, char *label,
      */
     for( i = 0; i < dlen / 16; i++ )
     {
-        memset( padding, 'A' + i, 1 + i );
+        memset( padding, (unsigned char) ('A' + i), 1 + i );
 
         sha1_starts( &sha1 );
         sha1_update( &sha1, padding, 1 + i );
@@ -125,22 +183,25 @@ static int ssl3_prf( unsigned char *secret, size_t slen, char *label,
         md5_finish( &md5, dstbuf + i * 16 );
     }
 
-    memset( &md5,  0, sizeof( md5  ) );
-    memset( &sha1, 0, sizeof( sha1 ) );
+    md5_free(  &md5  );
+    sha1_free( &sha1 );
 
-    memset( padding, 0, sizeof( padding ) );
-    memset( sha1sum, 0, sizeof( sha1sum ) );
+    polarssl_zeroize( padding, sizeof( padding ) );
+    polarssl_zeroize( sha1sum, sizeof( sha1sum ) );
 
     return( 0 );
 }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
-static int tls1_prf( unsigned char *secret, size_t slen, char *label,
-                     unsigned char *random, size_t rlen,
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1)
+static int tls1_prf( const unsigned char *secret, size_t slen,
+                     const char *label,
+                     const unsigned char *random, size_t rlen,
                      unsigned char *dstbuf, size_t dlen )
 {
     size_t nb, hs;
     size_t i, j, k;
-    unsigned char *S1, *S2;
+    const unsigned char *S1, *S2;
     unsigned char tmp[128];
     unsigned char h_i[20];
 
@@ -188,14 +249,18 @@ static int tls1_prf( unsigned char *secret, size_t slen, char *label,
             dstbuf[i + j] = (unsigned char)( dstbuf[i + j] ^ h_i[j] );
     }
 
-    memset( tmp, 0, sizeof( tmp ) );
-    memset( h_i, 0, sizeof( h_i ) );
+    polarssl_zeroize( tmp, sizeof( tmp ) );
+    polarssl_zeroize( h_i, sizeof( h_i ) );
 
     return( 0 );
 }
+#endif /* POLARSSL_SSL_PROTO_TLS1) || POLARSSL_SSL_PROTO_TLS1_1 */
 
-static int tls_prf_sha256( unsigned char *secret, size_t slen, char *label,
-                           unsigned char *random, size_t rlen,
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+static int tls_prf_sha256( const unsigned char *secret, size_t slen,
+                           const char *label,
+                           const unsigned char *random, size_t rlen,
                            unsigned char *dstbuf, size_t dlen )
 {
     size_t nb;
@@ -214,12 +279,12 @@ static int tls_prf_sha256( unsigned char *secret, size_t slen, char *label,
     /*
      * Compute P_<hash>(secret, label + random)[0..dlen]
      */
-    sha2_hmac( secret, slen, tmp + 32, nb, tmp, 0 );
+    sha256_hmac( secret, slen, tmp + 32, nb, tmp, 0 );
 
     for( i = 0; i < dlen; i += 32 )
     {
-        sha2_hmac( secret, slen, tmp, 32 + nb, h_i, 0 );
-        sha2_hmac( secret, slen, tmp, 32,      tmp, 0 );
+        sha256_hmac( secret, slen, tmp, 32 + nb, h_i, 0 );
+        sha256_hmac( secret, slen, tmp, 32,      tmp, 0 );
 
         k = ( i + 32 > dlen ) ? dlen % 32 : 32;
 
@@ -227,15 +292,17 @@ static int tls_prf_sha256( unsigned char *secret, size_t slen, char *label,
             dstbuf[i + j]  = h_i[j];
     }
 
-    memset( tmp, 0, sizeof( tmp ) );
-    memset( h_i, 0, sizeof( h_i ) );
+    polarssl_zeroize( tmp, sizeof( tmp ) );
+    polarssl_zeroize( h_i, sizeof( h_i ) );
 
     return( 0 );
 }
+#endif /* POLARSSL_SHA256_C */
 
-#if defined(POLARSSL_SHA4_C)
-static int tls_prf_sha384( unsigned char *secret, size_t slen, char *label,
-                           unsigned char *random, size_t rlen,
+#if defined(POLARSSL_SHA512_C)
+static int tls_prf_sha384( const unsigned char *secret, size_t slen,
+                           const char *label,
+                           const unsigned char *random, size_t rlen,
                            unsigned char *dstbuf, size_t dlen )
 {
     size_t nb;
@@ -254,12 +321,12 @@ static int tls_prf_sha384( unsigned char *secret, size_t slen, char *label,
     /*
      * Compute P_<hash>(secret, label + random)[0..dlen]
      */
-    sha4_hmac( secret, slen, tmp + 48, nb, tmp, 1 );
+    sha512_hmac( secret, slen, tmp + 48, nb, tmp, 1 );
 
     for( i = 0; i < dlen; i += 48 )
     {
-        sha4_hmac( secret, slen, tmp, 48 + nb, h_i, 1 );
-        sha4_hmac( secret, slen, tmp, 48,      tmp, 1 );
+        sha512_hmac( secret, slen, tmp, 48 + nb, h_i, 1 );
+        sha512_hmac( secret, slen, tmp, 48,      tmp, 1 );
 
         k = ( i + 48 > dlen ) ? dlen % 48 : 48;
 
@@ -267,74 +334,126 @@ static int tls_prf_sha384( unsigned char *secret, size_t slen, char *label,
             dstbuf[i + j]  = h_i[j];
     }
 
-    memset( tmp, 0, sizeof( tmp ) );
-    memset( h_i, 0, sizeof( h_i ) );
+    polarssl_zeroize( tmp, sizeof( tmp ) );
+    polarssl_zeroize( h_i, sizeof( h_i ) );
 
     return( 0 );
 }
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+static void ssl_update_checksum_start( ssl_context *, const unsigned char *, size_t );
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+static void ssl_update_checksum_md5sha1( ssl_context *, const unsigned char *, size_t );
 #endif
 
-static void ssl_update_checksum_start(ssl_context *, unsigned char *, size_t);
-static void ssl_update_checksum_md5sha1(ssl_context *, unsigned char *, size_t);
-static void ssl_update_checksum_sha256(ssl_context *, unsigned char *, size_t);
-
-static void ssl_calc_verify_ssl(ssl_context *,unsigned char *);
-static void ssl_calc_verify_tls(ssl_context *,unsigned char *);
-static void ssl_calc_verify_tls_sha256(ssl_context *,unsigned char *);
-
-static void ssl_calc_finished_ssl(ssl_context *,unsigned char *,int);
-static void ssl_calc_finished_tls(ssl_context *,unsigned char *,int);
-static void ssl_calc_finished_tls_sha256(ssl_context *,unsigned char *,int);
-
-#if defined(POLARSSL_SHA4_C)
-static void ssl_update_checksum_sha384(ssl_context *, unsigned char *, size_t);
-static void ssl_calc_verify_tls_sha384(ssl_context *,unsigned char *);
-static void ssl_calc_finished_tls_sha384(ssl_context *,unsigned char *,int);
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+static void ssl_calc_verify_ssl( ssl_context *, unsigned char * );
+static void ssl_calc_finished_ssl( ssl_context *, unsigned char *, int );
 #endif
 
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1)
+static void ssl_calc_verify_tls( ssl_context *, unsigned char * );
+static void ssl_calc_finished_tls( ssl_context *, unsigned char *, int );
+#endif
+
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+static void ssl_update_checksum_sha256( ssl_context *, const unsigned char *, size_t );
+static void ssl_calc_verify_tls_sha256( ssl_context *,unsigned char * );
+static void ssl_calc_finished_tls_sha256( ssl_context *,unsigned char *, int );
+#endif
+
+#if defined(POLARSSL_SHA512_C)
+static void ssl_update_checksum_sha384( ssl_context *, const unsigned char *, size_t );
+static void ssl_calc_verify_tls_sha384( ssl_context *, unsigned char * );
+static void ssl_calc_finished_tls_sha384( ssl_context *, unsigned char *, int );
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
 int ssl_derive_keys( ssl_context *ssl )
 {
+    int ret = 0;
     unsigned char tmp[64];
     unsigned char keyblk[256];
     unsigned char *key1;
     unsigned char *key2;
-    unsigned int iv_copy_len;
+    unsigned char *mac_enc;
+    unsigned char *mac_dec;
+    size_t iv_copy_len;
+    const cipher_info_t *cipher_info;
+    const md_info_t *md_info;
+
     ssl_session *session = ssl->session_negotiate;
     ssl_transform *transform = ssl->transform_negotiate;
     ssl_handshake_params *handshake = ssl->handshake;
 
     SSL_DEBUG_MSG( 2, ( "=> derive keys" ) );
 
+    cipher_info = cipher_info_from_type( transform->ciphersuite_info->cipher );
+    if( cipher_info == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "cipher info for %d not found",
+                            transform->ciphersuite_info->cipher ) );
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    md_info = md_info_from_type( transform->ciphersuite_info->mac );
+    if( md_info == NULL )
+    {
+        SSL_DEBUG_MSG( 1, ( "md info for %d not found",
+                            transform->ciphersuite_info->mac ) );
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
     /*
      * Set appropriate PRF function and other SSL / TLS / TLS1.2 functions
      */
+#if defined(POLARSSL_SSL_PROTO_SSL3)
     if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
     {
         handshake->tls_prf = ssl3_prf;
         handshake->calc_verify = ssl_calc_verify_ssl;
         handshake->calc_finished = ssl_calc_finished_ssl;
     }
-    else if( ssl->minor_ver < SSL_MINOR_VERSION_3 )
+    else
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1)
+    if( ssl->minor_ver < SSL_MINOR_VERSION_3 )
     {
         handshake->tls_prf = tls1_prf;
         handshake->calc_verify = ssl_calc_verify_tls;
         handshake->calc_finished = ssl_calc_finished_tls;
     }
-#if defined(POLARSSL_SHA4_C)
-    else if( session->ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-             session->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+    else
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA512_C)
+    if( ssl->minor_ver == SSL_MINOR_VERSION_3 &&
+        transform->ciphersuite_info->mac == POLARSSL_MD_SHA384 )
     {
         handshake->tls_prf = tls_prf_sha384;
         handshake->calc_verify = ssl_calc_verify_tls_sha384;
         handshake->calc_finished = ssl_calc_finished_tls_sha384;
     }
-#endif
     else
+#endif
+#if defined(POLARSSL_SHA256_C)
+    if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
         handshake->tls_prf = tls_prf_sha256;
         handshake->calc_verify = ssl_calc_verify_tls_sha256;
         handshake->calc_finished = ssl_calc_finished_tls_sha256;
     }
+    else
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
 
     /*
      * SSLv3:
@@ -342,8 +461,8 @@ int ssl_derive_keys( ssl_context *ssl )
      *     MD5( premaster + SHA1( 'A'   + premaster + randbytes ) ) +
      *     MD5( premaster + SHA1( 'BB'  + premaster + randbytes ) ) +
      *     MD5( premaster + SHA1( 'CCC' + premaster + randbytes ) )
-     *   
-     * TLSv1:
+     *
+     * TLSv1+:
      *   master = PRF( premaster, "master secret", randbytes )[0..47]
      */
     if( handshake->resume == 0 )
@@ -355,7 +474,7 @@ int ssl_derive_keys( ssl_context *ssl )
                             "master secret",
                             handshake->randbytes, 64, session->master, 48 );
 
-        memset( handshake->premaster, 0, sizeof( handshake->premaster ) );
+        polarssl_zeroize( handshake->premaster, sizeof(handshake->premaster) );
     }
     else
         SSL_DEBUG_MSG( 3, ( "no premaster (session resumed)" ) );
@@ -366,7 +485,7 @@ int ssl_derive_keys( ssl_context *ssl )
     memcpy( tmp, handshake->randbytes, 64 );
     memcpy( handshake->randbytes, tmp + 32, 32 );
     memcpy( handshake->randbytes + 32, tmp, 32 );
-    memset( tmp, 0, sizeof( tmp ) );
+    polarssl_zeroize( tmp, sizeof( tmp ) );
 
     /*
      *  SSLv3:
@@ -389,135 +508,88 @@ int ssl_derive_keys( ssl_context *ssl )
     SSL_DEBUG_BUF( 4, "random bytes", handshake->randbytes, 64 );
     SSL_DEBUG_BUF( 4, "key block", keyblk, 256 );
 
-    memset( handshake->randbytes, 0, sizeof( handshake->randbytes ) );
+    polarssl_zeroize( handshake->randbytes, sizeof( handshake->randbytes ) );
 
     /*
      * Determine the appropriate key, IV and MAC length.
      */
-    switch( session->ciphersuite )
+
+    transform->keylen = cipher_info->key_length / 8;
+
+    if( cipher_info->mode == POLARSSL_MODE_GCM ||
+        cipher_info->mode == POLARSSL_MODE_CCM )
     {
-#if defined(POLARSSL_ARC4_C)
-        case TLS_RSA_WITH_RC4_128_MD5:
-            transform->keylen = 16; transform->minlen = 16;
-            transform->ivlen  =  0; transform->maclen = 16;
-            break;
+        transform->maclen = 0;
 
-        case TLS_RSA_WITH_RC4_128_SHA:
-            transform->keylen = 16; transform->minlen = 20;
-            transform->ivlen  =  0; transform->maclen = 20;
-            break;
+        transform->ivlen = 12;
+        transform->fixed_ivlen = 4;
+
+        /* Minimum length is expicit IV + tag */
+        transform->minlen = transform->ivlen - transform->fixed_ivlen
+                            + ( transform->ciphersuite_info->flags &
+                                POLARSSL_CIPHERSUITE_SHORT_TAG ? 8 : 16 );
+    }
+    else
+    {
+        int ret;
+
+        /* Initialize HMAC contexts */
+        if( ( ret = md_init_ctx( &transform->md_ctx_enc, md_info ) ) != 0 ||
+            ( ret = md_init_ctx( &transform->md_ctx_dec, md_info ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "md_init_ctx", ret );
+            return( ret );
+        }
+
+        /* Get MAC length */
+        transform->maclen = md_get_size( md_info );
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+        /*
+         * If HMAC is to be truncated, we shall keep the leftmost bytes,
+         * (rfc 6066 page 13 or rfc 2104 section 4),
+         * so we only need to adjust the length here.
+         */
+        if( session->trunc_hmac == SSL_TRUNC_HMAC_ENABLED )
+            transform->maclen = SSL_TRUNCATED_HMAC_LEN;
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
+        /* IV length */
+        transform->ivlen = cipher_info->iv_size;
+
+        /* Minimum length */
+        if( cipher_info->mode == POLARSSL_MODE_STREAM )
+            transform->minlen = transform->maclen;
+        else
+        {
+            /*
+             * GenericBlockCipher:
+             * first multiple of blocklen greater than maclen
+             * + IV except for SSL3 and TLS 1.0
+             */
+            transform->minlen = transform->maclen
+                                + cipher_info->block_size
+                                - transform->maclen % cipher_info->block_size;
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1)
+            if( ssl->minor_ver == SSL_MINOR_VERSION_0 ||
+                ssl->minor_ver == SSL_MINOR_VERSION_1 )
+                ; /* No need to adjust minlen */
+            else
 #endif
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-            transform->keylen = 24; transform->minlen = 24;
-            transform->ivlen  =  8; transform->maclen = 20;
-            break;
+#if defined(POLARSSL_SSL_PROTO_TLS1_1) || defined(POLARSSL_SSL_PROTO_TLS1_2)
+            if( ssl->minor_ver == SSL_MINOR_VERSION_2 ||
+                ssl->minor_ver == SSL_MINOR_VERSION_3 )
+            {
+                transform->minlen += transform->ivlen;
+            }
+            else
 #endif
-
-#if defined(POLARSSL_AES_C)
-        case TLS_RSA_WITH_AES_128_CBC_SHA:
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-            transform->keylen = 16; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 20;
-            break;
-
-        case TLS_RSA_WITH_AES_256_CBC_SHA:
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-            transform->keylen = 32; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 20;
-            break;
-
-#if defined(POLARSSL_SHA2_C)
-        case TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-            transform->keylen = 16; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 32;
-            break;
-
-        case TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-            transform->keylen = 32; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 32;
-            break;
-#endif
-#if defined(POLARSSL_GCM_C)
-        case TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-            transform->keylen = 16; transform->minlen = 1;
-            transform->ivlen  = 12; transform->maclen = 0;
-            transform->fixed_ivlen = 4;
-            break;
-
-        case TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-            transform->keylen = 32; transform->minlen = 1;
-            transform->ivlen  = 12; transform->maclen = 0;
-            transform->fixed_ivlen = 4;
-            break;
-#endif
-#endif
-
-#if defined(POLARSSL_CAMELLIA_C)
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            transform->keylen = 16; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 20;
-            break;
-
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            transform->keylen = 32; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 20;
-            break;
-
-#if defined(POLARSSL_SHA2_C)
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            transform->keylen = 16; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 32;
-            break;
-
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            transform->keylen = 32; transform->minlen = 32;
-            transform->ivlen  = 16; transform->maclen = 32;
-            break;
-#endif
-#endif
-
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        case TLS_RSA_WITH_NULL_MD5:
-            transform->keylen = 0; transform->minlen = 0;
-            transform->ivlen  = 0; transform->maclen = 16;
-            break;
-
-        case TLS_RSA_WITH_NULL_SHA:
-            transform->keylen = 0; transform->minlen = 0;
-            transform->ivlen  = 0; transform->maclen = 20;
-            break;
-
-        case TLS_RSA_WITH_NULL_SHA256:
-            transform->keylen = 0; transform->minlen = 0;
-            transform->ivlen  = 0; transform->maclen = 32;
-            break;
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_DES_CBC_SHA:
-        case TLS_DHE_RSA_WITH_DES_CBC_SHA:
-            transform->keylen =  8; transform->minlen = 8;
-            transform->ivlen  =  8; transform->maclen = 20;
-            break;
-#endif
-#endif /* defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES) */
-
-        default:
-            SSL_DEBUG_MSG( 1, ( "ciphersuite %s is not available",
-                           ssl_get_ciphersuite_name( session->ciphersuite ) ) );
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
+            {
+                SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+                return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+            }
+        }
     }
 
     SSL_DEBUG_MSG( 3, ( "keylen: %d, minlen: %d, ivlen: %d, maclen: %d",
@@ -532,9 +604,8 @@ int ssl_derive_keys( ssl_context *ssl )
         key1 = keyblk + transform->maclen * 2;
         key2 = keyblk + transform->maclen * 2 + transform->keylen;
 
-        memcpy( transform->mac_enc, keyblk,  transform->maclen );
-        memcpy( transform->mac_dec, keyblk + transform->maclen,
-                transform->maclen );
+        mac_enc = keyblk;
+        mac_dec = keyblk + transform->maclen;
 
         /*
          * This is not used in TLS v1.1.
@@ -550,9 +621,8 @@ int ssl_derive_keys( ssl_context *ssl )
         key1 = keyblk + transform->maclen * 2 + transform->keylen;
         key2 = keyblk + transform->maclen * 2;
 
-        memcpy( transform->mac_dec, keyblk,  transform->maclen );
-        memcpy( transform->mac_enc, keyblk + transform->maclen,
-                transform->maclen );
+        mac_enc = keyblk + transform->maclen;
+        mac_dec = keyblk;
 
         /*
          * This is not used in TLS v1.1.
@@ -564,127 +634,128 @@ int ssl_derive_keys( ssl_context *ssl )
                 iv_copy_len );
     }
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+    if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
+    {
+        if( transform->maclen > sizeof transform->mac_enc )
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+        memcpy( transform->mac_enc, mac_enc, transform->maclen );
+        memcpy( transform->mac_dec, mac_dec, transform->maclen );
+    }
+    else
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+    if( ssl->minor_ver >= SSL_MINOR_VERSION_1 )
+    {
+        md_hmac_starts( &transform->md_ctx_enc, mac_enc, transform->maclen );
+        md_hmac_starts( &transform->md_ctx_dec, mac_dec, transform->maclen );
+    }
+    else
+#endif
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
+
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
-    if( ssl_hw_record_init != NULL)
+    if( ssl_hw_record_init != NULL )
     {
         int ret = 0;
 
         SSL_DEBUG_MSG( 2, ( "going for ssl_hw_record_init()" ) );
 
-        if( ( ret = ssl_hw_record_init( ssl, key1, key2, transform->iv_enc,
-                                        transform->iv_dec, transform->mac_enc,
-                                        transform->mac_dec ) ) != 0 )
+        if( ( ret = ssl_hw_record_init( ssl, key1, key2, transform->keylen,
+                                        transform->iv_enc, transform->iv_dec,
+                                        iv_copy_len,
+                                        mac_enc, mac_dec,
+                                        transform->maclen ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "ssl_hw_record_init", ret );
-            return POLARSSL_ERR_SSL_HW_ACCEL_FAILED;
+            return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
         }
     }
-#endif
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
 
-    switch( session->ciphersuite )
+    if( ( ret = cipher_init_ctx( &transform->cipher_ctx_enc,
+                                 cipher_info ) ) != 0 )
     {
-#if defined(POLARSSL_ARC4_C)
-        case TLS_RSA_WITH_RC4_128_MD5:
-        case TLS_RSA_WITH_RC4_128_SHA:
-            arc4_setup( (arc4_context *) transform->ctx_enc, key1,
-                        transform->keylen );
-            arc4_setup( (arc4_context *) transform->ctx_dec, key2,
-                        transform->keylen );
-            break;
-#endif
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-            des3_set3key_enc( (des3_context *) transform->ctx_enc, key1 );
-            des3_set3key_dec( (des3_context *) transform->ctx_dec, key2 );
-            break;
-#endif
-
-#if defined(POLARSSL_AES_C)
-        case TLS_RSA_WITH_AES_128_CBC_SHA:
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-            aes_setkey_enc( (aes_context *) transform->ctx_enc, key1, 128 );
-            aes_setkey_dec( (aes_context *) transform->ctx_dec, key2, 128 );
-            break;
-
-        case TLS_RSA_WITH_AES_256_CBC_SHA:
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-            aes_setkey_enc( (aes_context *) transform->ctx_enc, key1, 256 );
-            aes_setkey_dec( (aes_context *) transform->ctx_dec, key2, 256 );
-            break;
-
-#if defined(POLARSSL_GCM_C)
-        case TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-            gcm_init( (gcm_context *) transform->ctx_enc, key1, 128 );
-            gcm_init( (gcm_context *) transform->ctx_dec, key2, 128 );
-            break;
-
-        case TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-            gcm_init( (gcm_context *) transform->ctx_enc, key1, 256 );
-            gcm_init( (gcm_context *) transform->ctx_dec, key2, 256 );
-            break;
-#endif
-#endif
-
-#if defined(POLARSSL_CAMELLIA_C)
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            camellia_setkey_enc( (camellia_context *) transform->ctx_enc, key1, 128 );
-            camellia_setkey_dec( (camellia_context *) transform->ctx_dec, key2, 128 );
-            break;
-
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            camellia_setkey_enc( (camellia_context *) transform->ctx_enc, key1, 256 );
-            camellia_setkey_dec( (camellia_context *) transform->ctx_dec, key2, 256 );
-            break;
-#endif
-
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        case TLS_RSA_WITH_NULL_MD5:
-        case TLS_RSA_WITH_NULL_SHA:
-        case TLS_RSA_WITH_NULL_SHA256:
-            break;
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_DES_CBC_SHA:
-        case TLS_DHE_RSA_WITH_DES_CBC_SHA:
-            des_setkey_enc( (des_context *) transform->ctx_enc, key1 );
-            des_setkey_dec( (des_context *) transform->ctx_dec, key2 );
-            break;
-#endif
-#endif /* defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES) */
-
-        default:
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
+        SSL_DEBUG_RET( 1, "cipher_init_ctx", ret );
+        return( ret );
     }
 
-    memset( keyblk, 0, sizeof( keyblk ) );
+    if( ( ret = cipher_init_ctx( &transform->cipher_ctx_dec,
+                                 cipher_info ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "cipher_init_ctx", ret );
+        return( ret );
+    }
+
+    if( ( ret = cipher_setkey( &transform->cipher_ctx_enc, key1,
+                               cipher_info->key_length,
+                               POLARSSL_ENCRYPT ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "cipher_setkey", ret );
+        return( ret );
+    }
+
+    if( ( ret = cipher_setkey( &transform->cipher_ctx_dec, key2,
+                               cipher_info->key_length,
+                               POLARSSL_DECRYPT ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "cipher_setkey", ret );
+        return( ret );
+    }
+
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    if( cipher_info->mode == POLARSSL_MODE_CBC )
+    {
+        if( ( ret = cipher_set_padding_mode( &transform->cipher_ctx_enc,
+                                             POLARSSL_PADDING_NONE ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "cipher_set_padding_mode", ret );
+            return( ret );
+        }
+
+        if( ( ret = cipher_set_padding_mode( &transform->cipher_ctx_dec,
+                                             POLARSSL_PADDING_NONE ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "cipher_set_padding_mode", ret );
+            return( ret );
+        }
+    }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+
+    polarssl_zeroize( keyblk, sizeof( keyblk ) );
 
 #if defined(POLARSSL_ZLIB_SUPPORT)
     // Initialize compression
     //
     if( session->compression == SSL_COMPRESS_DEFLATE )
     {
+        if( ssl->compress_buf == NULL )
+        {
+            SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );
+            ssl->compress_buf = polarssl_malloc( SSL_BUFFER_LEN );
+            if( ssl->compress_buf == NULL )
+            {
+                SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed",
+                                    SSL_BUFFER_LEN ) );
+                return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+            }
+        }
+
         SSL_DEBUG_MSG( 3, ( "Initializing zlib states" ) );
 
         memset( &transform->ctx_deflate, 0, sizeof( transform->ctx_deflate ) );
         memset( &transform->ctx_inflate, 0, sizeof( transform->ctx_inflate ) );
 
-        if( deflateInit( &transform->ctx_deflate, Z_DEFAULT_COMPRESSION ) != Z_OK ||
+        if( deflateInit( &transform->ctx_deflate,
+                         Z_DEFAULT_COMPRESSION )   != Z_OK ||
             inflateInit( &transform->ctx_inflate ) != Z_OK )
         {
             SSL_DEBUG_MSG( 1, ( "Failed to initialize compression" ) );
@@ -698,6 +769,7 @@ int ssl_derive_keys( ssl_context *ssl )
     return( 0 );
 }
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
 void ssl_calc_verify_ssl( ssl_context *ssl, unsigned char hash[36] )
 {
     md5_context md5;
@@ -736,9 +808,14 @@ void ssl_calc_verify_ssl( ssl_context *ssl, unsigned char hash[36] )
     SSL_DEBUG_BUF( 3, "calculated verify result", hash, 36 );
     SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
 
+    md5_free(  &md5  );
+    sha1_free( &sha1 );
+
     return;
 }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1)
 void ssl_calc_verify_tls( ssl_context *ssl, unsigned char hash[36] )
 {
     md5_context md5;
@@ -755,209 +832,264 @@ void ssl_calc_verify_tls( ssl_context *ssl, unsigned char hash[36] )
     SSL_DEBUG_BUF( 3, "calculated verify result", hash, 36 );
     SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
 
+    md5_free(  &md5  );
+    sha1_free( &sha1 );
+
     return;
 }
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 */
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
 void ssl_calc_verify_tls_sha256( ssl_context *ssl, unsigned char hash[32] )
 {
-    sha2_context sha2;
+    sha256_context sha256;
 
     SSL_DEBUG_MSG( 2, ( "=> calc verify sha256" ) );
 
-    memcpy( &sha2, &ssl->handshake->fin_sha2, sizeof(sha2_context) );
-    sha2_finish( &sha2, hash );
+    memcpy( &sha256, &ssl->handshake->fin_sha256, sizeof(sha256_context) );
+    sha256_finish( &sha256, hash );
 
     SSL_DEBUG_BUF( 3, "calculated verify result", hash, 32 );
     SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
 
+    sha256_free( &sha256 );
+
     return;
 }
+#endif /* POLARSSL_SHA256_C */
 
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
 void ssl_calc_verify_tls_sha384( ssl_context *ssl, unsigned char hash[48] )
 {
-    sha4_context sha4;
+    sha512_context sha512;
 
     SSL_DEBUG_MSG( 2, ( "=> calc verify sha384" ) );
 
-    memcpy( &sha4, &ssl->handshake->fin_sha4, sizeof(sha4_context) );
-    sha4_finish( &sha4, hash );
+    memcpy( &sha512, &ssl->handshake->fin_sha512, sizeof(sha512_context) );
+    sha512_finish( &sha512, hash );
 
     SSL_DEBUG_BUF( 3, "calculated verify result", hash, 48 );
     SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
 
+    sha512_free( &sha512 );
+
     return;
 }
-#endif
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
 
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+int ssl_psk_derive_premaster( ssl_context *ssl, key_exchange_type_t key_ex )
+{
+    unsigned char *p = ssl->handshake->premaster;
+    unsigned char *end = p + sizeof( ssl->handshake->premaster );
+
+    /*
+     * PMS = struct {
+     *     opaque other_secret<0..2^16-1>;
+     *     opaque psk<0..2^16-1>;
+     * };
+     * with "other_secret" depending on the particular key exchange
+     */
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+    if( key_ex == POLARSSL_KEY_EXCHANGE_PSK )
+    {
+        if( end - p < 2 + (int) ssl->psk_len )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+        *(p++) = (unsigned char)( ssl->psk_len >> 8 );
+        *(p++) = (unsigned char)( ssl->psk_len      );
+        p += ssl->psk_len;
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    if( key_ex == POLARSSL_KEY_EXCHANGE_RSA_PSK )
+    {
+        /*
+         * other_secret already set by the ClientKeyExchange message,
+         * and is 48 bytes long
+         */
+        *p++ = 0;
+        *p++ = 48;
+        p += 48;
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_PKS_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    if( key_ex == POLARSSL_KEY_EXCHANGE_DHE_PSK )
+    {
+        int ret;
+        size_t len = end - ( p + 2 );
+
+        /* Write length only when we know the actual value */
+        if( ( ret = dhm_calc_secret( &ssl->handshake->dhm_ctx,
+                                      p + 2, &len,
+                                      ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "dhm_calc_secret", ret );
+            return( ret );
+        }
+        *(p++) = (unsigned char)( len >> 8 );
+        *(p++) = (unsigned char)( len );
+        p += len;
+
+        SSL_DEBUG_MPI( 3, "DHM: K ", &ssl->handshake->dhm_ctx.K  );
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+    if( key_ex == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        int ret;
+        size_t zlen;
+
+        if( ( ret = ecdh_calc_secret( &ssl->handshake->ecdh_ctx, &zlen,
+                                       p + 2, end - ( p + 2 ),
+                                       ssl->f_rng, ssl->p_rng ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ecdh_calc_secret", ret );
+            return( ret );
+        }
+
+        *(p++) = (unsigned char)( zlen >> 8 );
+        *(p++) = (unsigned char)( zlen      );
+        p += zlen;
+
+        SSL_DEBUG_MPI( 3, "ECDH: z", &ssl->handshake->ecdh_ctx.z );
+    }
+    else
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+    }
+
+    /* opaque psk<0..2^16-1>; */
+    if( end - p < 2 + (int) ssl->psk_len )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    *(p++) = (unsigned char)( ssl->psk_len >> 8 );
+    *(p++) = (unsigned char)( ssl->psk_len      );
+    memcpy( p, ssl->psk, ssl->psk_len );
+    p += ssl->psk_len;
+
+    ssl->handshake->pmslen = p - ssl->handshake->premaster;
+
+    return( 0 );
+}
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
+
+#if defined(POLARSSL_SSL_PROTO_SSL3)
 /*
  * SSLv3.0 MAC functions
  */
-static void ssl_mac_md5( unsigned char *secret,
-                         unsigned char *buf, size_t len,
-                         unsigned char *ctr, int type )
+static void ssl_mac( md_context_t *md_ctx, unsigned char *secret,
+                     unsigned char *buf, size_t len,
+                     unsigned char *ctr, int type )
 {
     unsigned char header[11];
     unsigned char padding[48];
-    md5_context md5;
+    int padlen = 0;
+    int md_size = md_get_size( md_ctx->md_info );
+    int md_type = md_get_type( md_ctx->md_info );
+
+    if( md_type == POLARSSL_MD_MD5 )
+        padlen = 48;
+    else if( md_type == POLARSSL_MD_SHA1 )
+        padlen = 40;
+    else if( md_type == POLARSSL_MD_SHA256 )
+        padlen = 32;
+    else if( md_type == POLARSSL_MD_SHA384 )
+        padlen = 16;
 
     memcpy( header, ctr, 8 );
     header[ 8] = (unsigned char)  type;
     header[ 9] = (unsigned char)( len >> 8 );
     header[10] = (unsigned char)( len      );
 
-    memset( padding, 0x36, 48 );
-    md5_starts( &md5 );
-    md5_update( &md5, secret,  16 );
-    md5_update( &md5, padding, 48 );
-    md5_update( &md5, header,  11 );
-    md5_update( &md5, buf,  len );
-    md5_finish( &md5, buf + len );
+    memset( padding, 0x36, padlen );
+    md_starts( md_ctx );
+    md_update( md_ctx, secret,  md_size );
+    md_update( md_ctx, padding, padlen  );
+    md_update( md_ctx, header,  11      );
+    md_update( md_ctx, buf,     len     );
+    md_finish( md_ctx, buf +    len     );
 
-    memset( padding, 0x5C, 48 );
-    md5_starts( &md5 );
-    md5_update( &md5, secret,  16 );
-    md5_update( &md5, padding, 48 );
-    md5_update( &md5, buf + len, 16 );
-    md5_finish( &md5, buf + len );
-}
-
-static void ssl_mac_sha1( unsigned char *secret,
-                          unsigned char *buf, size_t len,
-                          unsigned char *ctr, int type )
-{
-    unsigned char header[11];
-    unsigned char padding[40];
-    sha1_context sha1;
-
-    memcpy( header, ctr, 8 );
-    header[ 8] = (unsigned char)  type;
-    header[ 9] = (unsigned char)( len >> 8 );
-    header[10] = (unsigned char)( len      );
-
-    memset( padding, 0x36, 40 );
-    sha1_starts( &sha1 );
-    sha1_update( &sha1, secret,  20 );
-    sha1_update( &sha1, padding, 40 );
-    sha1_update( &sha1, header,  11 );
-    sha1_update( &sha1, buf,  len );
-    sha1_finish( &sha1, buf + len );
-
-    memset( padding, 0x5C, 40 );
-    sha1_starts( &sha1 );
-    sha1_update( &sha1, secret,  20 );
-    sha1_update( &sha1, padding, 40 );
-    sha1_update( &sha1, buf + len, 20 );
-    sha1_finish( &sha1, buf + len );
-}
-
-static void ssl_mac_sha2( unsigned char *secret,
-                          unsigned char *buf, size_t len,
-                          unsigned char *ctr, int type )
-{
-    unsigned char header[11];
-    unsigned char padding[32];
-    sha2_context sha2;
-
-    memcpy( header, ctr, 8 );
-    header[ 8] = (unsigned char)  type;
-    header[ 9] = (unsigned char)( len >> 8 );
-    header[10] = (unsigned char)( len      );
-
-    memset( padding, 0x36, 32 );
-    sha2_starts( &sha2, 0 );
-    sha2_update( &sha2, secret,  32 );
-    sha2_update( &sha2, padding, 32 );
-    sha2_update( &sha2, header,  11 );
-    sha2_update( &sha2, buf,  len );
-    sha2_finish( &sha2, buf + len );
-
-    memset( padding, 0x5C, 32 );
-    sha2_starts( &sha2, 0 );
-    sha2_update( &sha2, secret,  32 );
-    sha2_update( &sha2, padding, 32 );
-    sha2_update( &sha2, buf + len, 32 );
-    sha2_finish( &sha2, buf + len );
+    memset( padding, 0x5C, padlen );
+    md_starts( md_ctx );
+    md_update( md_ctx, secret,    md_size );
+    md_update( md_ctx, padding,   padlen  );
+    md_update( md_ctx, buf + len, md_size );
+    md_finish( md_ctx, buf + len          );
 }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
 /*
  * Encryption/decryption functions
- */ 
+ */
 static int ssl_encrypt_buf( ssl_context *ssl )
 {
-    size_t i, padlen;
+    size_t i;
+    const cipher_mode_t mode = cipher_get_cipher_mode(
+                                        &ssl->transform_out->cipher_ctx_enc );
 
     SSL_DEBUG_MSG( 2, ( "=> encrypt buf" ) );
 
     /*
-     * Add MAC then encrypt
+     * Add MAC before encrypt, except for AEAD modes
      */
-    if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) ||     \
+    ( defined(POLARSSL_CIPHER_MODE_CBC) &&                                  \
+      ( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) ) )
+    if( mode != POLARSSL_MODE_GCM &&
+        mode != POLARSSL_MODE_CCM )
     {
-        if( ssl->transform_out->maclen == 16 )
-             ssl_mac_md5( ssl->transform_out->mac_enc,
-                          ssl->out_msg, ssl->out_msglen,
-                          ssl->out_ctr, ssl->out_msgtype );
-        else if( ssl->transform_out->maclen == 20 )
-            ssl_mac_sha1( ssl->transform_out->mac_enc,
-                          ssl->out_msg, ssl->out_msglen,
-                          ssl->out_ctr, ssl->out_msgtype );
-        else if( ssl->transform_out->maclen == 32 )
-            ssl_mac_sha2( ssl->transform_out->mac_enc,
-                          ssl->out_msg, ssl->out_msglen,
-                          ssl->out_ctr, ssl->out_msgtype );
-        else if( ssl->transform_out->maclen != 0 )
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+        if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
         {
-            SSL_DEBUG_MSG( 1, ( "invalid MAC len: %d",
-                                ssl->transform_out->maclen ) );
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
+            ssl_mac( &ssl->transform_out->md_ctx_enc,
+                      ssl->transform_out->mac_enc,
+                      ssl->out_msg, ssl->out_msglen,
+                      ssl->out_ctr, ssl->out_msgtype );
         }
+        else
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+        defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver >= SSL_MINOR_VERSION_1 )
+        {
+            md_hmac_update( &ssl->transform_out->md_ctx_enc, ssl->out_ctr, 13 );
+            md_hmac_update( &ssl->transform_out->md_ctx_enc,
+                             ssl->out_msg, ssl->out_msglen );
+            md_hmac_finish( &ssl->transform_out->md_ctx_enc,
+                             ssl->out_msg + ssl->out_msglen );
+            md_hmac_reset( &ssl->transform_out->md_ctx_enc );
+        }
+        else
+#endif
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+        SSL_DEBUG_BUF( 4, "computed mac",
+                       ssl->out_msg + ssl->out_msglen,
+                       ssl->transform_out->maclen );
+
+        ssl->out_msglen += ssl->transform_out->maclen;
     }
-    else
+#endif /* AEAD not the only option */
+
+    /*
+     * Encrypt
+     */
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER)
+    if( mode == POLARSSL_MODE_STREAM )
     {
-        if( ssl->transform_out->maclen == 16 )
-        {
-            md5_context ctx;
-            md5_hmac_starts( &ctx, ssl->transform_out->mac_enc, 16 );
-            md5_hmac_update( &ctx, ssl->out_ctr, 13 );
-            md5_hmac_update( &ctx, ssl->out_msg, ssl->out_msglen );
-            md5_hmac_finish( &ctx, ssl->out_msg + ssl->out_msglen );
-            memset( &ctx, 0, sizeof(md5_context));
-        }
-        else if( ssl->transform_out->maclen == 20 )
-        {
-            sha1_context ctx;
-            sha1_hmac_starts( &ctx, ssl->transform_out->mac_enc, 20 );
-            sha1_hmac_update( &ctx, ssl->out_ctr, 13 );
-            sha1_hmac_update( &ctx, ssl->out_msg, ssl->out_msglen );
-            sha1_hmac_finish( &ctx, ssl->out_msg + ssl->out_msglen );
-            memset( &ctx, 0, sizeof(sha1_context));
-        }
-        else if( ssl->transform_out->maclen == 32 )
-        {
-            sha2_context ctx;
-            sha2_hmac_starts( &ctx, ssl->transform_out->mac_enc, 32, 0 );
-            sha2_hmac_update( &ctx, ssl->out_ctr, 13 );
-            sha2_hmac_update( &ctx, ssl->out_msg, ssl->out_msglen );
-            sha2_hmac_finish( &ctx, ssl->out_msg + ssl->out_msglen );
-            memset( &ctx, 0, sizeof(sha2_context));
-        }
-        else if( ssl->transform_out->maclen != 0 )
-        {
-            SSL_DEBUG_MSG( 1, ( "invalid MAC len: %d",
-                                ssl->transform_out->maclen ) );
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-        }
-    }
-
-    SSL_DEBUG_BUF( 4, "computed mac",
-                   ssl->out_msg + ssl->out_msglen, ssl->transform_out->maclen );
-
-    ssl->out_msglen += ssl->transform_out->maclen;
-
-    if( ssl->transform_out->ivlen == 0 )
-    {
-        padlen = 0;
+        int ret;
+        size_t olen = 0;
 
         SSL_DEBUG_MSG( 3, ( "before encrypt: msglen = %d, "
                             "including %d bytes of padding",
@@ -966,33 +1098,34 @@ static int ssl_encrypt_buf( ssl_context *ssl )
         SSL_DEBUG_BUF( 4, "before encrypt: output payload",
                        ssl->out_msg, ssl->out_msglen );
 
-#if defined(POLARSSL_ARC4_C)
-        if( ssl->session_out->ciphersuite == TLS_RSA_WITH_RC4_128_MD5 ||
-            ssl->session_out->ciphersuite == TLS_RSA_WITH_RC4_128_SHA )
+        if( ( ret = cipher_crypt( &ssl->transform_out->cipher_ctx_enc,
+                                   ssl->transform_out->iv_enc,
+                                   ssl->transform_out->ivlen,
+                                   ssl->out_msg, ssl->out_msglen,
+                                   ssl->out_msg, &olen ) ) != 0 )
         {
-            arc4_crypt( (arc4_context *) ssl->transform_out->ctx_enc,
-                        ssl->out_msglen, ssl->out_msg,
-                        ssl->out_msg );
-        } else
-#endif
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        if( ssl->session_out->ciphersuite == TLS_RSA_WITH_NULL_MD5 ||
-            ssl->session_out->ciphersuite == TLS_RSA_WITH_NULL_SHA ||
-            ssl->session_out->ciphersuite == TLS_RSA_WITH_NULL_SHA256 )
+            SSL_DEBUG_RET( 1, "cipher_crypt", ret );
+            return( ret );
+        }
+
+        if( ssl->out_msglen != olen )
         {
-        } else
-#endif
-        return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
     }
-    else if( ssl->transform_out->ivlen == 12 )
+    else
+#endif /* POLARSSL_ARC4_C || POLARSSL_CIPHER_NULL_CIPHER */
+#if defined(POLARSSL_GCM_C) || defined(POLARSSL_CCM_C)
+    if( mode == POLARSSL_MODE_GCM ||
+        mode == POLARSSL_MODE_CCM )
     {
-        size_t enc_msglen;
+        int ret;
+        size_t enc_msglen, olen;
         unsigned char *enc_msg;
         unsigned char add_data[13];
-        int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
-
-        padlen = 0;
-        enc_msglen = ssl->out_msglen;
+        unsigned char taglen = ssl->transform_out->ciphersuite_info->flags &
+                               POLARSSL_CIPHERSUITE_SHORT_TAG ? 8 : 16;
 
         memcpy( add_data, ssl->out_ctr, 8 );
         add_data[8]  = ssl->out_msgtype;
@@ -1004,71 +1137,71 @@ static int ssl_encrypt_buf( ssl_context *ssl )
         SSL_DEBUG_BUF( 4, "additional data used for AEAD",
                        add_data, 13 );
 
-#if defined(POLARSSL_AES_C) && defined(POLARSSL_GCM_C)
+        /*
+         * Generate IV
+         */
+        ret = ssl->f_rng( ssl->p_rng,
+                ssl->transform_out->iv_enc + ssl->transform_out->fixed_ivlen,
+                ssl->transform_out->ivlen - ssl->transform_out->fixed_ivlen );
+        if( ret != 0 )
+            return( ret );
 
-        if( ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_128_GCM_SHA256 ||
-            ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-            ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ||
-            ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
+        memcpy( ssl->out_iv,
+                ssl->transform_out->iv_enc + ssl->transform_out->fixed_ivlen,
+                ssl->transform_out->ivlen - ssl->transform_out->fixed_ivlen );
+
+        SSL_DEBUG_BUF( 4, "IV used", ssl->out_iv,
+                ssl->transform_out->ivlen - ssl->transform_out->fixed_ivlen );
+
+        /*
+         * Fix pointer positions and message length with added IV
+         */
+        enc_msg = ssl->out_msg;
+        enc_msglen = ssl->out_msglen;
+        ssl->out_msglen += ssl->transform_out->ivlen -
+                           ssl->transform_out->fixed_ivlen;
+
+        SSL_DEBUG_MSG( 3, ( "before encrypt: msglen = %d, "
+                            "including %d bytes of padding",
+                       ssl->out_msglen, 0 ) );
+
+        SSL_DEBUG_BUF( 4, "before encrypt: output payload",
+                       ssl->out_msg, ssl->out_msglen );
+
+        /*
+         * Encrypt and authenticate
+         */
+        if( ( ret = cipher_auth_encrypt( &ssl->transform_out->cipher_ctx_enc,
+                                         ssl->transform_out->iv_enc,
+                                         ssl->transform_out->ivlen,
+                                         add_data, 13,
+                                         enc_msg, enc_msglen,
+                                         enc_msg, &olen,
+                                         enc_msg + enc_msglen, taglen ) ) != 0 )
         {
-            /*
-             * Generate IV
-             */
-            ret = ssl->f_rng( ssl->p_rng,
-                        ssl->transform_out->iv_enc + ssl->transform_out->fixed_ivlen,
-                        ssl->transform_out->ivlen - ssl->transform_out->fixed_ivlen );
-            if( ret != 0 )
-                return( ret );
+            SSL_DEBUG_RET( 1, "cipher_auth_encrypt", ret );
+            return( ret );
+        }
 
-            /*
-             * Shift message for ivlen bytes and prepend IV
-             */
-            memmove( ssl->out_msg + ssl->transform_out->ivlen -
-                     ssl->transform_out->fixed_ivlen,
-                     ssl->out_msg, ssl->out_msglen );
-            memcpy( ssl->out_msg,
-                    ssl->transform_out->iv_enc + ssl->transform_out->fixed_ivlen,
-                    ssl->transform_out->ivlen  - ssl->transform_out->fixed_ivlen );
+        if( olen != enc_msglen )
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
 
-            /*
-             * Fix pointer positions and message length with added IV
-             */
-            enc_msg = ssl->out_msg + ssl->transform_out->ivlen -
-                      ssl->transform_out->fixed_ivlen;
-            enc_msglen = ssl->out_msglen;
-            ssl->out_msglen += ssl->transform_out->ivlen -
-                               ssl->transform_out->fixed_ivlen;
+        ssl->out_msglen += taglen;
 
-            SSL_DEBUG_MSG( 3, ( "before encrypt: msglen = %d, "
-                                "including %d bytes of padding",
-                           ssl->out_msglen, 0 ) );
-
-            SSL_DEBUG_BUF( 4, "before encrypt: output payload",
-                           ssl->out_msg, ssl->out_msglen );
-
-            /*
-             * Adjust for tag
-             */
-            ssl->out_msglen += 16;
-            
-            gcm_crypt_and_tag( (gcm_context *) ssl->transform_out->ctx_enc,
-                    GCM_ENCRYPT, enc_msglen,
-                    ssl->transform_out->iv_enc, ssl->transform_out->ivlen,
-                    add_data, 13,
-                    enc_msg, enc_msg,
-                    16, enc_msg + enc_msglen );
-
-            SSL_DEBUG_BUF( 4, "after encrypt: tag",
-                           enc_msg + enc_msglen, 16 );
-
-        } else
-#endif
-        return( ret );
+        SSL_DEBUG_BUF( 4, "after encrypt: tag", enc_msg + enc_msglen, taglen );
     }
     else
+#endif /* POLARSSL_GCM_C || POLARSSL_CCM_C */
+#if defined(POLARSSL_CIPHER_MODE_CBC) &&                                    \
+    ( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) )
+    if( mode == POLARSSL_MODE_CBC )
     {
+        int ret;
         unsigned char *enc_msg;
-        size_t enc_msglen;
+        size_t enc_msglen, padlen, olen = 0;
 
         padlen = ssl->transform_out->ivlen - ( ssl->out_msglen + 1 ) %
                  ssl->transform_out->ivlen;
@@ -1083,6 +1216,7 @@ static int ssl_encrypt_buf( ssl_context *ssl )
         enc_msglen = ssl->out_msglen;
         enc_msg = ssl->out_msg;
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_1) || defined(POLARSSL_SSL_PROTO_TLS1_2)
         /*
          * Prepend per-record IV for block cipher in TLS v1.1 and up as per
          * Method 1 (6.2.3.2. in RFC4346 and RFC5246)
@@ -1097,107 +1231,90 @@ static int ssl_encrypt_buf( ssl_context *ssl )
             if( ret != 0 )
                 return( ret );
 
-            /*
-             * Shift message for ivlen bytes and prepend IV
-             */
-            memmove( ssl->out_msg + ssl->transform_out->ivlen, ssl->out_msg,
-                     ssl->out_msglen );
-            memcpy( ssl->out_msg, ssl->transform_out->iv_enc,
+            memcpy( ssl->out_iv, ssl->transform_out->iv_enc,
                     ssl->transform_out->ivlen );
 
             /*
              * Fix pointer positions and message length with added IV
              */
-            enc_msg = ssl->out_msg + ssl->transform_out->ivlen;
+            enc_msg = ssl->out_msg;
             enc_msglen = ssl->out_msglen;
             ssl->out_msglen += ssl->transform_out->ivlen;
         }
+#endif /* POLARSSL_SSL_PROTO_TLS1_1 || POLARSSL_SSL_PROTO_TLS1_2 */
 
         SSL_DEBUG_MSG( 3, ( "before encrypt: msglen = %d, "
                             "including %d bytes of IV and %d bytes of padding",
-                       ssl->out_msglen, ssl->transform_out->ivlen, padlen + 1 ) );
+                            ssl->out_msglen, ssl->transform_out->ivlen,
+                            padlen + 1 ) );
 
         SSL_DEBUG_BUF( 4, "before encrypt: output payload",
-                       ssl->out_msg, ssl->out_msglen );
+                       ssl->out_iv, ssl->out_msglen );
 
-        switch( ssl->transform_out->ivlen )
+        if( ( ret = cipher_crypt( &ssl->transform_out->cipher_ctx_enc,
+                                   ssl->transform_out->iv_enc,
+                                   ssl->transform_out->ivlen,
+                                   enc_msg, enc_msglen,
+                                   enc_msg, &olen ) ) != 0 )
         {
-#if defined(POLARSSL_DES_C)
-            case  8:
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-                if( ssl->session_out->ciphersuite == TLS_RSA_WITH_DES_CBC_SHA ||
-                    ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_DES_CBC_SHA )
-                {
-                    des_crypt_cbc( (des_context *) ssl->transform_out->ctx_enc,
-                                   DES_ENCRYPT, enc_msglen,
-                                   ssl->transform_out->iv_enc, enc_msg, enc_msg );
-                }
-                else
-#endif
-                    des3_crypt_cbc( (des3_context *) ssl->transform_out->ctx_enc,
-                                    DES_ENCRYPT, enc_msglen,
-                                    ssl->transform_out->iv_enc, enc_msg, enc_msg );
-                break;
-#endif
+            SSL_DEBUG_RET( 1, "cipher_crypt", ret );
+            return( ret );
+        }
 
-            case 16:
-#if defined(POLARSSL_AES_C)
-        if ( ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_128_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_256_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_128_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_AES_256_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 )
+        if( enc_msglen != olen )
         {
-                    aes_crypt_cbc( (aes_context *) ssl->transform_out->ctx_enc,
-                        AES_ENCRYPT, enc_msglen,
-                        ssl->transform_out->iv_enc, enc_msg, enc_msg);
-                    break;
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1)
+        if( ssl->minor_ver < SSL_MINOR_VERSION_2 )
+        {
+            /*
+             * Save IV in SSL3 and TLS1
+             */
+            memcpy( ssl->transform_out->iv_enc,
+                    ssl->transform_out->cipher_ctx_enc.iv,
+                    ssl->transform_out->ivlen );
         }
 #endif
-
-#if defined(POLARSSL_CAMELLIA_C)
-        if ( ssl->session_out->ciphersuite == TLS_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 ||
-             ssl->session_out->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 )
-        {
-                    camellia_crypt_cbc( (camellia_context *) ssl->transform_out->ctx_enc,
-                        CAMELLIA_ENCRYPT, enc_msglen,
-                        ssl->transform_out->iv_enc, enc_msg, enc_msg );
-                    break;
-        }
-#endif
-
-            default:
-                return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-        }
+    }
+    else
+#endif /* POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_CAMELLIA_C ) */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
     }
 
     for( i = 8; i > 0; i-- )
         if( ++ssl->out_ctr[i - 1] != 0 )
             break;
 
+    /* The loops goes to its end iff the counter is wrapping */
+    if( i == 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "outgoing message counter would wrap" ) );
+        return( POLARSSL_ERR_SSL_COUNTER_WRAPPING );
+    }
+
     SSL_DEBUG_MSG( 2, ( "<= encrypt buf" ) );
 
     return( 0 );
 }
 
-/*
- * TODO: Use digest version when integrated!
- */
-#define POLARSSL_SSL_MAX_MAC_SIZE   32
+#define POLARSSL_SSL_MAX_MAC_SIZE   48
 
 static int ssl_decrypt_buf( ssl_context *ssl )
 {
-    size_t i, padlen = 0, correct = 1;
-    unsigned char tmp[POLARSSL_SSL_MAX_MAC_SIZE];
+    size_t i;
+    const cipher_mode_t mode = cipher_get_cipher_mode(
+                                        &ssl->transform_in->cipher_ctx_dec );
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) ||     \
+    ( defined(POLARSSL_CIPHER_MODE_CBC) &&                                  \
+      ( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) ) )
+    size_t padlen = 0, correct = 1;
+#endif
 
     SSL_DEBUG_MSG( 2, ( "=> decrypt buf" ) );
 
@@ -1208,98 +1325,117 @@ static int ssl_decrypt_buf( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_INVALID_MAC );
     }
 
-    if( ssl->transform_in->ivlen == 0 )
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER)
+    if( mode == POLARSSL_MODE_STREAM )
     {
-#if defined(POLARSSL_ARC4_C)
-        if( ssl->session_in->ciphersuite == TLS_RSA_WITH_RC4_128_MD5 ||
-            ssl->session_in->ciphersuite == TLS_RSA_WITH_RC4_128_SHA )
+        int ret;
+        size_t olen = 0;
+
+        padlen = 0;
+
+        if( ( ret = cipher_crypt( &ssl->transform_in->cipher_ctx_dec,
+                                   ssl->transform_in->iv_dec,
+                                   ssl->transform_in->ivlen,
+                                   ssl->in_msg, ssl->in_msglen,
+                                   ssl->in_msg, &olen ) ) != 0 )
         {
-            arc4_crypt( (arc4_context *) ssl->transform_in->ctx_dec,
-                    ssl->in_msglen, ssl->in_msg,
-                    ssl->in_msg );
-        } else
-#endif
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        if( ssl->session_in->ciphersuite == TLS_RSA_WITH_NULL_MD5 ||
-            ssl->session_in->ciphersuite == TLS_RSA_WITH_NULL_SHA ||
-            ssl->session_in->ciphersuite == TLS_RSA_WITH_NULL_SHA256 )
+            SSL_DEBUG_RET( 1, "cipher_crypt", ret );
+            return( ret );
+        }
+
+        if( ssl->in_msglen != olen )
         {
-        } else
-#endif
-        return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-    }
-    else if( ssl->transform_in->ivlen == 12 )
-    {
-        unsigned char *dec_msg;
-        unsigned char *dec_msg_result;
-        size_t dec_msglen;
-        unsigned char add_data[13];
-        int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
-
-#if defined(POLARSSL_AES_C) && defined(POLARSSL_GCM_C)
-        if( ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_128_GCM_SHA256 ||
-            ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-            ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ||
-            ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
-        {
-            dec_msglen = ssl->in_msglen - ( ssl->transform_in->ivlen -
-                                            ssl->transform_in->fixed_ivlen );
-            dec_msglen -= 16;
-            dec_msg = ssl->in_msg + ( ssl->transform_in->ivlen -
-                                      ssl->transform_in->fixed_ivlen );
-            dec_msg_result = ssl->in_msg;
-            ssl->in_msglen = dec_msglen;
-
-            memcpy( add_data, ssl->in_ctr, 8 );
-            add_data[8]  = ssl->in_msgtype;
-            add_data[9]  = ssl->major_ver;
-            add_data[10] = ssl->minor_ver;
-            add_data[11] = ( ssl->in_msglen >> 8 ) & 0xFF;
-            add_data[12] = ssl->in_msglen & 0xFF;
-
-            SSL_DEBUG_BUF( 4, "additional data used for AEAD",
-                           add_data, 13 );
-
-            memcpy( ssl->transform_in->iv_dec + ssl->transform_in->fixed_ivlen,
-                    ssl->in_msg,
-                    ssl->transform_in->ivlen - ssl->transform_in->fixed_ivlen );
-
-            SSL_DEBUG_BUF( 4, "IV used", ssl->transform_in->iv_dec,
-                                         ssl->transform_in->ivlen );
-            SSL_DEBUG_BUF( 4, "TAG used", dec_msg + dec_msglen, 16 );
-
-            memcpy( ssl->transform_in->iv_dec + ssl->transform_in->fixed_ivlen,
-                    ssl->in_msg,
-                    ssl->transform_in->ivlen - ssl->transform_in->fixed_ivlen );
-
-            ret = gcm_auth_decrypt( (gcm_context *) ssl->transform_in->ctx_dec,
-                                     dec_msglen,
-                                     ssl->transform_in->iv_dec,
-                                     ssl->transform_in->ivlen,
-                                     add_data, 13,
-                                     dec_msg + dec_msglen, 16,
-                                     dec_msg, dec_msg_result );
-            
-            if( ret != 0 )
-            {
-                SSL_DEBUG_MSG( 1, ( "AEAD decrypt failed on validation (ret = -0x%02x)",
-                                    -ret ) );
-
-                return( POLARSSL_ERR_SSL_INVALID_MAC );
-            }
-        } else
-#endif
-        return( ret );
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
     }
     else
+#endif /* POLARSSL_ARC4_C || POLARSSL_CIPHER_NULL_CIPHER */
+#if defined(POLARSSL_GCM_C) || defined(POLARSSL_CCM_C)
+    if( mode == POLARSSL_MODE_GCM ||
+        mode == POLARSSL_MODE_CCM )
+    {
+        int ret;
+        size_t dec_msglen, olen;
+        unsigned char *dec_msg;
+        unsigned char *dec_msg_result;
+        unsigned char add_data[13];
+        unsigned char taglen = ssl->transform_in->ciphersuite_info->flags &
+                               POLARSSL_CIPHERSUITE_SHORT_TAG ? 8 : 16;
+        unsigned char explicit_iv_len =  ssl->transform_in->ivlen -
+                                         ssl->transform_in->fixed_ivlen;
+
+        if( ssl->in_msglen < explicit_iv_len + taglen )
+        {
+            SSL_DEBUG_MSG( 1, ( "msglen (%d) < explicit_iv_len (%d) "
+                                "+ taglen (%d)", ssl->in_msglen,
+                                explicit_iv_len, taglen ) );
+            return( POLARSSL_ERR_SSL_INVALID_MAC );
+        }
+        dec_msglen = ssl->in_msglen - explicit_iv_len - taglen;
+
+        dec_msg = ssl->in_msg;
+        dec_msg_result = ssl->in_msg;
+        ssl->in_msglen = dec_msglen;
+
+        memcpy( add_data, ssl->in_ctr, 8 );
+        add_data[8]  = ssl->in_msgtype;
+        add_data[9]  = ssl->major_ver;
+        add_data[10] = ssl->minor_ver;
+        add_data[11] = ( ssl->in_msglen >> 8 ) & 0xFF;
+        add_data[12] = ssl->in_msglen & 0xFF;
+
+        SSL_DEBUG_BUF( 4, "additional data used for AEAD",
+                       add_data, 13 );
+
+        memcpy( ssl->transform_in->iv_dec + ssl->transform_in->fixed_ivlen,
+                ssl->in_iv,
+                ssl->transform_in->ivlen - ssl->transform_in->fixed_ivlen );
+
+        SSL_DEBUG_BUF( 4, "IV used", ssl->transform_in->iv_dec,
+                                     ssl->transform_in->ivlen );
+        SSL_DEBUG_BUF( 4, "TAG used", dec_msg + dec_msglen, taglen );
+
+        /*
+         * Decrypt and authenticate
+         */
+        if( ( ret = cipher_auth_decrypt( &ssl->transform_in->cipher_ctx_dec,
+                                         ssl->transform_in->iv_dec,
+                                         ssl->transform_in->ivlen,
+                                         add_data, 13,
+                                         dec_msg, dec_msglen,
+                                         dec_msg_result, &olen,
+                                         dec_msg + dec_msglen, taglen ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "cipher_auth_decrypt", ret );
+
+            if( ret == POLARSSL_ERR_CIPHER_AUTH_FAILED )
+                return( POLARSSL_ERR_SSL_INVALID_MAC );
+
+            return( ret );
+        }
+
+        if( olen != dec_msglen )
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+    }
+    else
+#endif /* POLARSSL_GCM_C || POLARSSL_CCM_C */
+#if defined(POLARSSL_CIPHER_MODE_CBC) &&                                    \
+    ( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) )
+    if( mode == POLARSSL_MODE_CBC )
     {
         /*
          * Decrypt and check the padding
          */
+        int ret;
         unsigned char *dec_msg;
         unsigned char *dec_msg_result;
         size_t dec_msglen;
         size_t minlen = 0;
+        size_t olen = 0;
 
         /*
          * Check immediate ciphertext sanity
@@ -1311,14 +1447,18 @@ static int ssl_decrypt_buf( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_INVALID_MAC );
         }
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_1) || defined(POLARSSL_SSL_PROTO_TLS1_2)
         if( ssl->minor_ver >= SSL_MINOR_VERSION_2 )
             minlen += ssl->transform_in->ivlen;
+#endif
 
         if( ssl->in_msglen < minlen + ssl->transform_in->ivlen ||
             ssl->in_msglen < minlen + ssl->transform_in->maclen + 1 )
         {
-            SSL_DEBUG_MSG( 1, ( "msglen (%d) < max( ivlen(%d), maclen (%d) + 1 ) ( + expl IV )",
-                           ssl->in_msglen, ssl->transform_in->ivlen, ssl->transform_in->maclen ) );
+            SSL_DEBUG_MSG( 1, ( "msglen (%d) < max( ivlen(%d), maclen (%d) "
+                                "+ 1 ) ( + expl IV )", ssl->in_msglen,
+                                ssl->transform_in->ivlen,
+                                ssl->transform_in->maclen ) );
             return( POLARSSL_ERR_SSL_INVALID_MAC );
         }
 
@@ -1326,78 +1466,48 @@ static int ssl_decrypt_buf( ssl_context *ssl )
         dec_msg = ssl->in_msg;
         dec_msg_result = ssl->in_msg;
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_1) || defined(POLARSSL_SSL_PROTO_TLS1_2)
         /*
          * Initialize for prepended IV for block cipher in TLS v1.1 and up
          */
         if( ssl->minor_ver >= SSL_MINOR_VERSION_2 )
         {
-            dec_msg += ssl->transform_in->ivlen;
             dec_msglen -= ssl->transform_in->ivlen;
             ssl->in_msglen -= ssl->transform_in->ivlen;
 
             for( i = 0; i < ssl->transform_in->ivlen; i++ )
-                ssl->transform_in->iv_dec[i] = ssl->in_msg[i];
+                ssl->transform_in->iv_dec[i] = ssl->in_iv[i];
         }
+#endif /* POLARSSL_SSL_PROTO_TLS1_1 || POLARSSL_SSL_PROTO_TLS1_2 */
 
-        switch( ssl->transform_in->ivlen )
+        if( ( ret = cipher_crypt( &ssl->transform_in->cipher_ctx_dec,
+                                   ssl->transform_in->iv_dec,
+                                   ssl->transform_in->ivlen,
+                                   dec_msg, dec_msglen,
+                                   dec_msg_result, &olen ) ) != 0 )
         {
-#if defined(POLARSSL_DES_C)
-            case  8:
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-                if( ssl->session_in->ciphersuite == TLS_RSA_WITH_DES_CBC_SHA ||
-                    ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_DES_CBC_SHA )
-                {
-                    des_crypt_cbc( (des_context *) ssl->transform_in->ctx_dec,
-                                   DES_DECRYPT, dec_msglen,
-                                   ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
-                }
-                else
-#endif
-                    des3_crypt_cbc( (des3_context *) ssl->transform_in->ctx_dec,
-                        DES_DECRYPT, dec_msglen,
-                        ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
-                break;
-#endif
+            SSL_DEBUG_RET( 1, "cipher_crypt", ret );
+            return( ret );
+        }
 
-            case 16:
-#if defined(POLARSSL_AES_C)
-        if ( ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_128_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_256_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_128_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_AES_256_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 )
+        if( dec_msglen != olen )
         {
-                    aes_crypt_cbc( (aes_context *) ssl->transform_in->ctx_dec,
-                       AES_DECRYPT, dec_msglen,
-                       ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
-                    break;
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
         }
-#endif
 
-#if defined(POLARSSL_CAMELLIA_C)
-        if ( ssl->session_in->ciphersuite == TLS_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 ||
-             ssl->session_in->ciphersuite == TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 )
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1)
+        if( ssl->minor_ver < SSL_MINOR_VERSION_2 )
         {
-                    camellia_crypt_cbc( (camellia_context *) ssl->transform_in->ctx_dec,
-                       CAMELLIA_DECRYPT, dec_msglen,
-                       ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
-                    break;
+            /*
+             * Save IV in SSL3 and TLS1
+             */
+            memcpy( ssl->transform_in->iv_dec,
+                    ssl->transform_in->cipher_ctx_dec.iv,
+                    ssl->transform_in->ivlen );
         }
 #endif
 
-            default:
-                return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-        }
-
         padlen = 1 + ssl->in_msg[ssl->in_msglen - 1];
 
         if( ssl->in_msglen < ssl->transform_in->maclen + padlen )
@@ -1410,6 +1520,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
             correct = 0;
         }
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
         if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
         {
             if( padlen > ssl->transform_in->ivlen )
@@ -1423,142 +1534,157 @@ static int ssl_decrypt_buf( ssl_context *ssl )
             }
         }
         else
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver > SSL_MINOR_VERSION_0 )
         {
             /*
              * TLSv1+: always check the padding up to the first failure
              * and fake check up to 256 bytes of padding
              */
-            size_t pad_count = 0, fake_pad_count = 0;
+            size_t pad_count = 0, real_count = 1;
             size_t padding_idx = ssl->in_msglen - padlen - 1;
 
-            for( i = 1; i <= padlen; i++ )
-                pad_count += ( ssl->in_msg[padding_idx + i] == padlen - 1 );
+            /*
+             * Padding is guaranteed to be incorrect if:
+             *   1. padlen >= ssl->in_msglen
+             *
+             *   2. padding_idx >= SSL_MAX_CONTENT_LEN +
+             *                     ssl->transform_in->maclen
+             *
+             * In both cases we reset padding_idx to a safe value (0) to
+             * prevent out-of-buffer reads.
+             */
+            correct &= ( ssl->in_msglen >= padlen + 1 );
+            correct &= ( padding_idx < SSL_MAX_CONTENT_LEN +
+                                       ssl->transform_in->maclen );
 
-            for( ; i <= 256; i++ )
-                fake_pad_count += ( ssl->in_msg[padding_idx + i] == padlen - 1 );
+            padding_idx *= correct;
+
+            for( i = 1; i <= 256; i++ )
+            {
+                real_count &= ( i <= padlen );
+                pad_count += real_count *
+                             ( ssl->in_msg[padding_idx + i] == padlen - 1 );
+            }
 
             correct &= ( pad_count == padlen ); /* Only 1 on correct padding */
-            correct &= ( pad_count + fake_pad_count < 512 ); /* Always 1 */
 
 #if defined(POLARSSL_SSL_DEBUG_ALL)
-            if( padlen > 0 && correct == 0)
+            if( padlen > 0 && correct == 0 )
                 SSL_DEBUG_MSG( 1, ( "bad padding byte detected" ) );
 #endif
             padlen &= correct * 0x1FF;
         }
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 || \
+          POLARSSL_SSL_PROTO_TLS1_2 */
+        {
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+        }
+    }
+    else
+#endif /* POLARSSL_CIPHER_MODE_CBC &&
+          ( POLARSSL_AES_C || POLARSSL_CAMELLIA_C ) */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
     }
 
     SSL_DEBUG_BUF( 4, "raw buffer after decryption",
                    ssl->in_msg, ssl->in_msglen );
 
     /*
-     * Always compute the MAC (RFC4346, CBCTIME).
+     * Always compute the MAC (RFC4346, CBCTIME), except for AEAD of course
      */
-    ssl->in_msglen -= ( ssl->transform_in->maclen + padlen );
-
-    ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
-    ssl->in_hdr[4] = (unsigned char)( ssl->in_msglen      );
-
-    memcpy( tmp, ssl->in_msg + ssl->in_msglen, ssl->transform_in->maclen );
-
-    if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
+#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) ||     \
+    ( defined(POLARSSL_CIPHER_MODE_CBC) &&                                  \
+      ( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) ) )
+    if( mode != POLARSSL_MODE_GCM &&
+        mode != POLARSSL_MODE_CCM )
     {
-        if( ssl->transform_in->maclen == 16 )
-             ssl_mac_md5( ssl->transform_in->mac_dec,
-                          ssl->in_msg, ssl->in_msglen,
-                          ssl->in_ctr, ssl->in_msgtype );
-        else if( ssl->transform_in->maclen == 20 )
-            ssl_mac_sha1( ssl->transform_in->mac_dec,
-                          ssl->in_msg, ssl->in_msglen,
-                          ssl->in_ctr, ssl->in_msgtype );
-        else if( ssl->transform_in->maclen == 32 )
-            ssl_mac_sha2( ssl->transform_in->mac_dec,
-                          ssl->in_msg, ssl->in_msglen,
-                          ssl->in_ctr, ssl->in_msgtype );
-        else if( ssl->transform_in->maclen != 0 )
+        unsigned char tmp[POLARSSL_SSL_MAX_MAC_SIZE];
+
+        ssl->in_msglen -= ( ssl->transform_in->maclen + padlen );
+
+        ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
+        ssl->in_hdr[4] = (unsigned char)( ssl->in_msglen      );
+
+        memcpy( tmp, ssl->in_msg + ssl->in_msglen, ssl->transform_in->maclen );
+
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+        if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
         {
-            SSL_DEBUG_MSG( 1, ( "invalid MAC len: %d",
-                                ssl->transform_in->maclen ) );
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
+            ssl_mac( &ssl->transform_in->md_ctx_dec,
+                      ssl->transform_in->mac_dec,
+                      ssl->in_msg, ssl->in_msglen,
+                      ssl->in_ctr, ssl->in_msgtype );
         }
-    }
-    else
-    {
-        /*
-         * Process MAC and always update for padlen afterwards to make
-         * total time independent of padlen
-         *
-         * extra_run compensates MAC check for padlen 
-         *
-         * Known timing attacks:
-         *  - Lucky Thirteen (http://www.isg.rhul.ac.uk/tls/TLStiming.pdf)
-         *
-         * We use ( ( Lx + 8 ) / 64 ) to handle 'negative Lx' values
-         * correctly. (We round down instead of up, so -56 is the correct
-         * value for our calculations instead of -55)
-         */
-        int j, extra_run = 0;
-        extra_run = ( 13 + ssl->in_msglen + padlen + 8 ) / 64 -
-                    ( 13 + ssl->in_msglen          + 8 ) / 64;
-
-        extra_run &= correct * 0xFF;
-
-        if( ssl->transform_in->maclen == 16 )
+        else
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+        defined(POLARSSL_SSL_PROTO_TLS1_2)
+        if( ssl->minor_ver > SSL_MINOR_VERSION_0 )
         {
-            md5_context ctx;
-            md5_hmac_starts( &ctx, ssl->transform_in->mac_dec, 16 );
-            md5_hmac_update( &ctx, ssl->in_ctr,  ssl->in_msglen + 13 );
-            md5_hmac_finish( &ctx, ssl->in_msg + ssl->in_msglen );
+            /*
+             * Process MAC and always update for padlen afterwards to make
+             * total time independent of padlen
+             *
+             * extra_run compensates MAC check for padlen
+             *
+             * Known timing attacks:
+             *  - Lucky Thirteen (http://www.isg.rhul.ac.uk/tls/TLStiming.pdf)
+             *
+             * We use ( ( Lx + 8 ) / 64 ) to handle 'negative Lx' values
+             * correctly. (We round down instead of up, so -56 is the correct
+             * value for our calculations instead of -55)
+             */
+            size_t j, extra_run = 0;
+            extra_run = ( 13 + ssl->in_msglen + padlen + 8 ) / 64 -
+                        ( 13 + ssl->in_msglen          + 8 ) / 64;
 
+            extra_run &= correct * 0xFF;
+
+            md_hmac_update( &ssl->transform_in->md_ctx_dec, ssl->in_ctr, 13 );
+            md_hmac_update( &ssl->transform_in->md_ctx_dec, ssl->in_msg,
+                             ssl->in_msglen );
+            md_hmac_finish( &ssl->transform_in->md_ctx_dec,
+                             ssl->in_msg + ssl->in_msglen );
             for( j = 0; j < extra_run; j++ )
-                md5_process( &ctx, ssl->in_msg ); 
+                md_process( &ssl->transform_in->md_ctx_dec, ssl->in_msg );
+
+            md_hmac_reset( &ssl->transform_in->md_ctx_dec );
         }
-        else if( ssl->transform_in->maclen == 20 )
+        else
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 || \
+              POLARSSL_SSL_PROTO_TLS1_2 */
         {
-            sha1_context ctx;
-            sha1_hmac_starts( &ctx, ssl->transform_in->mac_dec, 20 );
-            sha1_hmac_update( &ctx, ssl->in_ctr,  ssl->in_msglen + 13 );
-            sha1_hmac_finish( &ctx, ssl->in_msg + ssl->in_msglen );
-
-            for( j = 0; j < extra_run; j++ )
-                sha1_process( &ctx, ssl->in_msg ); 
+            SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+            return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
         }
-        else if( ssl->transform_in->maclen == 32 )
+
+        SSL_DEBUG_BUF( 4, "message  mac", tmp, ssl->transform_in->maclen );
+        SSL_DEBUG_BUF( 4, "computed mac", ssl->in_msg + ssl->in_msglen,
+                       ssl->transform_in->maclen );
+
+        if( safer_memcmp( tmp, ssl->in_msg + ssl->in_msglen,
+                         ssl->transform_in->maclen ) != 0 )
         {
-            sha2_context ctx;
-            sha2_hmac_starts( &ctx, ssl->transform_in->mac_dec, 32, 0 );
-            sha2_hmac_update( &ctx, ssl->in_ctr,  ssl->in_msglen + 13 );
-            sha2_hmac_finish( &ctx, ssl->in_msg + ssl->in_msglen );
-
-            for( j = 0; j < extra_run; j++ )
-                sha2_process( &ctx, ssl->in_msg ); 
-        }
-        else if( ssl->transform_in->maclen != 0 )
-        {
-            SSL_DEBUG_MSG( 1, ( "invalid MAC len: %d",
-                                ssl->transform_in->maclen ) );
-            return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
-        }
-    }
-
-    SSL_DEBUG_BUF( 4, "message  mac", tmp, ssl->transform_in->maclen );
-    SSL_DEBUG_BUF( 4, "computed mac", ssl->in_msg + ssl->in_msglen,
-                   ssl->transform_in->maclen );
-
-    if( memcmp( tmp, ssl->in_msg + ssl->in_msglen,
-                     ssl->transform_in->maclen ) != 0 )
-    {
 #if defined(POLARSSL_SSL_DEBUG_ALL)
-        SSL_DEBUG_MSG( 1, ( "message mac does not match" ) );
+            SSL_DEBUG_MSG( 1, ( "message mac does not match" ) );
 #endif
-        correct = 0;
-    }
+            correct = 0;
+        }
 
-    /*
-     * Finally check the correct flag
-     */
-    if( correct == 0 )
-        return( POLARSSL_ERR_SSL_INVALID_MAC );
+        /*
+         * Finally check the correct flag
+         */
+        if( correct == 0 )
+            return( POLARSSL_ERR_SSL_INVALID_MAC );
+    }
+#endif /* AEAD not the only option */
 
     if( ssl->in_msglen == 0 )
     {
@@ -1577,11 +1703,18 @@ static int ssl_decrypt_buf( ssl_context *ssl )
     }
     else
         ssl->nb_zero = 0;
-            
+
     for( i = 8; i > 0; i-- )
         if( ++ssl->in_ctr[i - 1] != 0 )
             break;
 
+    /* The loops goes to its end iff the counter is wrapping */
+    if( i == 0 )
+    {
+        SSL_DEBUG_MSG( 1, ( "incoming message counter would wrap" ) );
+        return( POLARSSL_ERR_SSL_COUNTER_WRAPPING );
+    }
+
     SSL_DEBUG_MSG( 2, ( "<= decrypt buf" ) );
 
     return( 0 );
@@ -1596,16 +1729,12 @@ static int ssl_compress_buf( ssl_context *ssl )
     int ret;
     unsigned char *msg_post = ssl->out_msg;
     size_t len_pre = ssl->out_msglen;
-    unsigned char *msg_pre;
+    unsigned char *msg_pre = ssl->compress_buf;
 
     SSL_DEBUG_MSG( 2, ( "=> compress buf" ) );
 
-    msg_pre = (unsigned char*) malloc( len_pre );
-    if( msg_pre == NULL )
-    {
-        SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len_pre ) );
-        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
-    }
+    if( len_pre == 0 )
+        return( 0 );
 
     memcpy( msg_pre, ssl->out_msg, len_pre );
 
@@ -1627,9 +1756,8 @@ static int ssl_compress_buf( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_COMPRESSION_FAILED );
     }
 
-    ssl->out_msglen = SSL_BUFFER_LEN - ssl->transform_out->ctx_deflate.avail_out;
-
-    free( msg_pre );
+    ssl->out_msglen = SSL_BUFFER_LEN -
+                      ssl->transform_out->ctx_deflate.avail_out;
 
     SSL_DEBUG_MSG( 3, ( "after compression: msglen = %d, ",
                    ssl->out_msglen ) );
@@ -1647,16 +1775,12 @@ static int ssl_decompress_buf( ssl_context *ssl )
     int ret;
     unsigned char *msg_post = ssl->in_msg;
     size_t len_pre = ssl->in_msglen;
-    unsigned char *msg_pre;
+    unsigned char *msg_pre = ssl->compress_buf;
 
     SSL_DEBUG_MSG( 2, ( "=> decompress buf" ) );
 
-    msg_pre = (unsigned char*) malloc( len_pre );
-    if( msg_pre == NULL )
-    {
-        SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len_pre ) );
-        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
-    }
+    if( len_pre == 0 )
+        return( 0 );
 
     memcpy( msg_pre, ssl->in_msg, len_pre );
 
@@ -1678,9 +1802,8 @@ static int ssl_decompress_buf( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_COMPRESSION_FAILED );
     }
 
-    ssl->in_msglen = SSL_MAX_CONTENT_LEN - ssl->transform_in->ctx_inflate.avail_out;
-
-    free( msg_pre );
+    ssl->in_msglen = SSL_MAX_CONTENT_LEN -
+                     ssl->transform_in->ctx_inflate.avail_out;
 
     SSL_DEBUG_MSG( 3, ( "after decompression: msglen = %d, ",
                    ssl->in_msglen ) );
@@ -1704,6 +1827,12 @@ int ssl_fetch_input( ssl_context *ssl, size_t nb_want )
 
     SSL_DEBUG_MSG( 2, ( "=> fetch input" ) );
 
+    if( nb_want > SSL_BUFFER_LEN - 8 )
+    {
+        SSL_DEBUG_MSG( 1, ( "requesting more data than fits" ) );
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
     while( ssl->in_left < nb_want )
     {
         len = nb_want - ssl->in_left;
@@ -1742,22 +1871,7 @@ int ssl_flush_output( ssl_context *ssl )
         SSL_DEBUG_MSG( 2, ( "message length: %d, out_left: %d",
                        5 + ssl->out_msglen, ssl->out_left ) );
 
-        if( ssl->out_msglen < ssl->out_left )
-        {
-            size_t header_left = ssl->out_left - ssl->out_msglen;
-
-            buf = ssl->out_hdr + 5 - header_left;
-            ret = ssl->f_send( ssl->p_send, buf, header_left );
-            
-            SSL_DEBUG_RET( 2, "ssl->f_send (header)", ret );
-
-            if( ret <= 0 )
-                return( ret );
-
-            ssl->out_left -= ret;
-        }
-        
-        buf = ssl->out_msg + ssl->out_msglen - ssl->out_left;
+        buf = ssl->out_hdr + 5 + ssl->out_msglen - ssl->out_left;
         ret = ssl->f_send( ssl->p_send, buf, ssl->out_left );
 
         SSL_DEBUG_RET( 2, "ssl->f_send", ret );
@@ -1789,7 +1903,8 @@ int ssl_write_record( ssl_context *ssl )
         ssl->out_msg[2] = (unsigned char)( ( len - 4 ) >>  8 );
         ssl->out_msg[3] = (unsigned char)( ( len - 4 )       );
 
-        ssl->handshake->update_checksum( ssl, ssl->out_msg, len );
+        if( ssl->out_msg[0] != SSL_HS_HELLO_REQUEST )
+            ssl->handshake->update_checksum( ssl, ssl->out_msg, len );
     }
 
 #if defined(POLARSSL_ZLIB_SUPPORT)
@@ -1807,7 +1922,7 @@ int ssl_write_record( ssl_context *ssl )
 #endif /*POLARSSL_ZLIB_SUPPORT */
 
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
-    if( ssl_hw_record_write != NULL)
+    if( ssl_hw_record_write != NULL )
     {
         SSL_DEBUG_MSG( 2, ( "going for ssl_hw_record_write()" ) );
 
@@ -1815,11 +1930,13 @@ int ssl_write_record( ssl_context *ssl )
         if( ret != 0 && ret != POLARSSL_ERR_SSL_HW_ACCEL_FALLTHROUGH )
         {
             SSL_DEBUG_RET( 1, "ssl_hw_record_write", ret );
-            return POLARSSL_ERR_SSL_HW_ACCEL_FAILED;
+            return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
         }
-        done = 1;
+
+        if( ret == 0 )
+            done = 1;
     }
-#endif
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
     if( !done )
     {
         ssl->out_hdr[0] = (unsigned char) ssl->out_msgtype;
@@ -1848,10 +1965,8 @@ int ssl_write_record( ssl_context *ssl )
                        ssl->out_hdr[0], ssl->out_hdr[1], ssl->out_hdr[2],
                      ( ssl->out_hdr[3] << 8 ) | ssl->out_hdr[4] ) );
 
-        SSL_DEBUG_BUF( 4, "output record header sent to network",
-                       ssl->out_hdr, 5 );
         SSL_DEBUG_BUF( 4, "output record sent to network",
-                       ssl->out_hdr + 32, ssl->out_msglen );
+                       ssl->out_hdr, 5 + ssl->out_msglen );
     }
 
     if( ( ret = ssl_flush_output( ssl ) ) != 0 )
@@ -1901,7 +2016,8 @@ int ssl_read_record( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_INVALID_RECORD );
         }
 
-        ssl->handshake->update_checksum( ssl, ssl->in_msg, ssl->in_hslen );
+        if( ssl->state != SSL_HANDSHAKE_OVER )
+            ssl->handshake->update_checksum( ssl, ssl->in_msg, ssl->in_hslen );
 
         return( 0 );
     }
@@ -1937,13 +2053,20 @@ int ssl_read_record( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_INVALID_RECORD );
     }
 
+    /* Sanity check (outer boundaries) */
+    if( ssl->in_msglen < 1 || ssl->in_msglen > SSL_BUFFER_LEN - 13 )
+    {
+        SSL_DEBUG_MSG( 1, ( "bad message length" ) );
+        return( POLARSSL_ERR_SSL_INVALID_RECORD );
+    }
+
     /*
-     * Make sure the message length is acceptable
+     * Make sure the message length is acceptable for the current transform
+     * and protocol version.
      */
     if( ssl->transform_in == NULL )
     {
-        if( ssl->in_msglen < 1 ||
-            ssl->in_msglen > SSL_MAX_CONTENT_LEN )
+        if( ssl->in_msglen > SSL_MAX_CONTENT_LEN )
         {
             SSL_DEBUG_MSG( 1, ( "bad message length" ) );
             return( POLARSSL_ERR_SSL_INVALID_RECORD );
@@ -1957,22 +2080,28 @@ int ssl_read_record( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_INVALID_RECORD );
         }
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
         if( ssl->minor_ver == SSL_MINOR_VERSION_0 &&
             ssl->in_msglen > ssl->transform_in->minlen + SSL_MAX_CONTENT_LEN )
         {
             SSL_DEBUG_MSG( 1, ( "bad message length" ) );
             return( POLARSSL_ERR_SSL_INVALID_RECORD );
         }
+#endif
 
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
         /*
          * TLS encrypted messages can have up to 256 bytes of padding
          */
         if( ssl->minor_ver >= SSL_MINOR_VERSION_1 &&
-            ssl->in_msglen > ssl->transform_in->minlen + SSL_MAX_CONTENT_LEN + 256 )
+            ssl->in_msglen > ssl->transform_in->minlen +
+                             SSL_MAX_CONTENT_LEN + 256 )
         {
             SSL_DEBUG_MSG( 1, ( "bad message length" ) );
             return( POLARSSL_ERR_SSL_INVALID_RECORD );
         }
+#endif
     }
 
     /*
@@ -1988,7 +2117,7 @@ int ssl_read_record( ssl_context *ssl )
                    ssl->in_hdr, 5 + ssl->in_msglen );
 
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
-    if( ssl_hw_record_read != NULL)
+    if( ssl_hw_record_read != NULL )
     {
         SSL_DEBUG_MSG( 2, ( "going for ssl_hw_record_read()" ) );
 
@@ -1996,11 +2125,13 @@ int ssl_read_record( ssl_context *ssl )
         if( ret != 0 && ret != POLARSSL_ERR_SSL_HW_ACCEL_FALLTHROUGH )
         {
             SSL_DEBUG_RET( 1, "ssl_hw_record_read", ret );
-            return POLARSSL_ERR_SSL_HW_ACCEL_FAILED;
+            return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
         }
-        done = 1;
+
+        if( ret == 0 )
+            done = 1;
     }
-#endif
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
     if( !done && ssl->transform_in != NULL )
     {
         if( ( ret = ssl_decrypt_buf( ssl ) ) != 0 )
@@ -2162,14 +2293,69 @@ int ssl_send_alert_message( ssl_context *ssl,
 /*
  * Handshake functions
  */
+#if !defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)         && \
+    !defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)     && \
+    !defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)     && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED)   && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED)    && \
+    !defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
 int ssl_write_certificate( ssl_context *ssl )
 {
-    int ret;
-    size_t i, n;
-    const x509_cert *crt;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> write certificate" ) );
 
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip write certificate" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+
+int ssl_parse_certificate( ssl_context *ssl )
+{
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+
+    SSL_DEBUG_MSG( 2, ( "=> parse certificate" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+}
+#else
+int ssl_write_certificate( ssl_context *ssl )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+    size_t i, n;
+    const x509_crt *crt;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
+
+    SSL_DEBUG_MSG( 2, ( "=> write certificate" ) );
+
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
+    {
+        SSL_DEBUG_MSG( 2, ( "<= skip write certificate" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
     if( ssl->endpoint == SSL_IS_CLIENT )
     {
         if( ssl->client_auth == 0 )
@@ -2179,11 +2365,12 @@ int ssl_write_certificate( ssl_context *ssl )
             return( 0 );
         }
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
         /*
          * If using SSLv3 and got no cert, send an Alert message
          * (otherwise an empty Certificate message will be sent).
          */
-        if( ssl->own_cert  == NULL &&
+        if( ssl_own_cert( ssl )  == NULL &&
             ssl->minor_ver == SSL_MINOR_VERSION_0 )
         {
             ssl->out_msglen  = 2;
@@ -2194,17 +2381,18 @@ int ssl_write_certificate( ssl_context *ssl )
             SSL_DEBUG_MSG( 2, ( "got no certificate to send" ) );
             goto write_msg;
         }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
     }
     else /* SSL_IS_SERVER */
     {
-        if( ssl->own_cert == NULL )
+        if( ssl_own_cert( ssl ) == NULL )
         {
             SSL_DEBUG_MSG( 1, ( "got no certificate to send" ) );
             return( POLARSSL_ERR_SSL_CERTIFICATE_REQUIRED );
         }
     }
 
-    SSL_DEBUG_CRT( 3, "own certificate", ssl->own_cert );
+    SSL_DEBUG_CRT( 3, "own certificate", ssl_own_cert( ssl ) );
 
     /*
      *     0  .  0    handshake type
@@ -2216,12 +2404,12 @@ int ssl_write_certificate( ssl_context *ssl )
      *    n+3 . ...   upper level cert, etc.
      */
     i = 7;
-    crt = ssl->own_cert;
+    crt = ssl_own_cert( ssl );
 
     while( crt != NULL )
     {
         n = crt->raw.len;
-        if( i + 3 + n > SSL_MAX_CONTENT_LEN )
+        if( n > SSL_MAX_CONTENT_LEN - 3 - i )
         {
             SSL_DEBUG_MSG( 1, ( "certificate too large, %d > %d",
                            i + 3 + n, SSL_MAX_CONTENT_LEN ) );
@@ -2244,7 +2432,9 @@ int ssl_write_certificate( ssl_context *ssl )
     ssl->out_msgtype = SSL_MSG_HANDSHAKE;
     ssl->out_msg[0]  = SSL_HS_CERTIFICATE;
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
 write_msg:
+#endif
 
     ssl->state++;
 
@@ -2256,20 +2446,31 @@ write_msg:
 
     SSL_DEBUG_MSG( 2, ( "<= write certificate" ) );
 
-    return( 0 );
+    return( ret );
 }
 
 int ssl_parse_certificate( ssl_context *ssl )
 {
-    int ret;
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
     size_t i, n;
+    const ssl_ciphersuite_t *ciphersuite_info = ssl->transform_negotiate->ciphersuite_info;
 
     SSL_DEBUG_MSG( 2, ( "=> parse certificate" ) );
 
-    if( ssl->endpoint == SSL_IS_SERVER &&
-        ssl->authmode == SSL_VERIFY_NONE )
+    if( ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_DHE_PSK ||
+        ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_ECDHE_PSK )
     {
-        ssl->verify_result = BADCERT_SKIP_VERIFY;
+        SSL_DEBUG_MSG( 2, ( "<= skip parse certificate" ) );
+        ssl->state++;
+        return( 0 );
+    }
+
+    if( ssl->endpoint == SSL_IS_SERVER &&
+        ( ssl->authmode == SSL_VERIFY_NONE ||
+          ciphersuite_info->key_exchange == POLARSSL_KEY_EXCHANGE_RSA_PSK ) )
+    {
+        ssl->session_negotiate->verify_result = BADCERT_SKIP_VERIFY;
         SSL_DEBUG_MSG( 2, ( "<= skip parse certificate" ) );
         ssl->state++;
         return( 0 );
@@ -2283,6 +2484,7 @@ int ssl_parse_certificate( ssl_context *ssl )
 
     ssl->state++;
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
     /*
      * Check if the client sent an empty certificate
      */
@@ -2296,14 +2498,17 @@ int ssl_parse_certificate( ssl_context *ssl )
         {
             SSL_DEBUG_MSG( 1, ( "SSLv3 client has no certificate" ) );
 
-            ssl->verify_result = BADCERT_MISSING;
+            ssl->session_negotiate->verify_result = BADCERT_MISSING;
             if( ssl->authmode == SSL_VERIFY_OPTIONAL )
                 return( 0 );
             else
                 return( POLARSSL_ERR_SSL_NO_CLIENT_CERTIFICATE );
         }
     }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
     if( ssl->endpoint  == SSL_IS_SERVER &&
         ssl->minor_ver != SSL_MINOR_VERSION_0 )
     {
@@ -2314,13 +2519,15 @@ int ssl_parse_certificate( ssl_context *ssl )
         {
             SSL_DEBUG_MSG( 1, ( "TLSv1 client has no certificate" ) );
 
-            ssl->verify_result = BADCERT_MISSING;
+            ssl->session_negotiate->verify_result = BADCERT_MISSING;
             if( ssl->authmode == SSL_VERIFY_REQUIRED )
                 return( POLARSSL_ERR_SSL_NO_CLIENT_CERTIFICATE );
             else
                 return( 0 );
         }
     }
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 || \
+          POLARSSL_SSL_PROTO_TLS1_2 */
 
     if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
     {
@@ -2345,15 +2552,22 @@ int ssl_parse_certificate( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
     }
 
-    if( ( ssl->session_negotiate->peer_cert = (x509_cert *) malloc(
-                    sizeof( x509_cert ) ) ) == NULL )
+    /* In case we tried to reuse a session but it failed */
+    if( ssl->session_negotiate->peer_cert != NULL )
+    {
+        x509_crt_free( ssl->session_negotiate->peer_cert );
+        polarssl_free( ssl->session_negotiate->peer_cert );
+    }
+
+    if( ( ssl->session_negotiate->peer_cert = (x509_crt *) polarssl_malloc(
+                    sizeof( x509_crt ) ) ) == NULL )
     {
         SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed",
-                       sizeof( x509_cert ) ) );
+                       sizeof( x509_crt ) ) );
         return( POLARSSL_ERR_SSL_MALLOC_FAILED );
     }
 
-    memset( ssl->session_negotiate->peer_cert, 0, sizeof( x509_cert ) );
+    x509_crt_init( ssl->session_negotiate->peer_cert );
 
     i = 7;
 
@@ -2375,11 +2589,11 @@ int ssl_parse_certificate( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
         }
 
-        ret = x509parse_crt_der( ssl->session_negotiate->peer_cert,
-                                 ssl->in_msg + i, n );
+        ret = x509_crt_parse_der( ssl->session_negotiate->peer_cert,
+                                  ssl->in_msg + i, n );
         if( ret != 0 )
         {
-            SSL_DEBUG_RET( 1, " x509parse_crt", ret );
+            SSL_DEBUG_RET( 1, " x509_crt_parse_der", ret );
             return( ret );
         }
 
@@ -2388,6 +2602,30 @@ int ssl_parse_certificate( ssl_context *ssl )
 
     SSL_DEBUG_CRT( 3, "peer certificate", ssl->session_negotiate->peer_cert );
 
+    /*
+     * On client, make sure the server cert doesn't change during renego to
+     * avoid "triple handshake" attack: https://secure-resumption.com/
+     */
+    if( ssl->endpoint == SSL_IS_CLIENT &&
+        ssl->renegotiation == SSL_RENEGOTIATION )
+    {
+        if( ssl->session->peer_cert == NULL )
+        {
+            SSL_DEBUG_MSG( 1, ( "new server cert during renegotiation" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
+        }
+
+        if( ssl->session->peer_cert->raw.len !=
+            ssl->session_negotiate->peer_cert->raw.len ||
+            memcmp( ssl->session->peer_cert->raw.p,
+                    ssl->session_negotiate->peer_cert->raw.p,
+                    ssl->session->peer_cert->raw.len ) != 0 )
+        {
+            SSL_DEBUG_MSG( 1, ( "server cert changed during renegotiation" ) );
+            return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
+        }
+    }
+
     if( ssl->authmode != SSL_VERIFY_NONE )
     {
         if( ssl->ca_chain == NULL )
@@ -2396,13 +2634,46 @@ int ssl_parse_certificate( ssl_context *ssl )
             return( POLARSSL_ERR_SSL_CA_CHAIN_REQUIRED );
         }
 
-        ret = x509parse_verify( ssl->session_negotiate->peer_cert,
-                                ssl->ca_chain, ssl->ca_crl,
-                                ssl->peer_cn,  &ssl->verify_result,
-                                ssl->f_vrfy, ssl->p_vrfy );
+        /*
+         * Main check: verify certificate
+         */
+        ret = x509_crt_verify( ssl->session_negotiate->peer_cert,
+                               ssl->ca_chain, ssl->ca_crl, ssl->peer_cn,
+                              &ssl->session_negotiate->verify_result,
+                               ssl->f_vrfy, ssl->p_vrfy );
 
         if( ret != 0 )
+        {
             SSL_DEBUG_RET( 1, "x509_verify_cert", ret );
+        }
+
+        /*
+         * Secondary checks: always done, but change 'ret' only if it was 0
+         */
+
+#if defined(POLARSSL_SSL_SET_CURVES)
+        {
+            pk_context *pk = &ssl->session_negotiate->peer_cert->pk;
+
+            /* If certificate uses an EC key, make sure the curve is OK */
+            if( pk_can_do( pk, POLARSSL_PK_ECKEY ) &&
+                ! ssl_curve_is_acceptable( ssl, pk_ec( *pk )->grp.id ) )
+            {
+                SSL_DEBUG_MSG( 1, ( "bad certificate (EC key curve)" ) );
+                if( ret == 0 )
+                    ret = POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE;
+            }
+        }
+#endif /* POLARSSL_SSL_SET_CURVES */
+
+        if( ssl_check_cert_usage( ssl->session_negotiate->peer_cert,
+                                  ciphersuite_info,
+                                  ! ssl->endpoint ) != 0 )
+        {
+            SSL_DEBUG_MSG( 1, ( "bad certificate (usage extensions)" ) );
+            if( ret == 0 )
+                ret = POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE;
+        }
 
         if( ssl->authmode != SSL_VERIFY_REQUIRED )
             ret = 0;
@@ -2412,6 +2683,13 @@ int ssl_parse_certificate( ssl_context *ssl )
 
     return( ret );
 }
+#endif /* !POLARSSL_KEY_EXCHANGE_RSA_ENABLED
+          !POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
+          !POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
+          !POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+          !POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+          !POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
+          !POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
 
 int ssl_write_change_cipher_spec( ssl_context *ssl )
 {
@@ -2467,57 +2745,82 @@ int ssl_parse_change_cipher_spec( ssl_context *ssl )
     return( 0 );
 }
 
-void ssl_optimize_checksum( ssl_context *ssl, int ciphersuite )
+void ssl_optimize_checksum( ssl_context *ssl,
+                            const ssl_ciphersuite_t *ciphersuite_info )
 {
-#if !defined(POLARSSL_SHA4_C)
-    ((void) ciphersuite);
-#endif
+    ((void) ciphersuite_info);
 
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
     if( ssl->minor_ver < SSL_MINOR_VERSION_3 )
         ssl->handshake->update_checksum = ssl_update_checksum_md5sha1;
-#if defined(POLARSSL_SHA4_C)
-    else if ( ciphersuite == TLS_RSA_WITH_AES_256_GCM_SHA384 ||
-              ciphersuite == TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 )
-    {
-        ssl->handshake->update_checksum = ssl_update_checksum_sha384;
-    }
-#endif
     else
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA512_C)
+    if( ciphersuite_info->mac == POLARSSL_MD_SHA384 )
+        ssl->handshake->update_checksum = ssl_update_checksum_sha384;
+    else
+#endif
+#if defined(POLARSSL_SHA256_C)
+    if( ciphersuite_info->mac != POLARSSL_MD_SHA384 )
         ssl->handshake->update_checksum = ssl_update_checksum_sha256;
-}
-    
-static void ssl_update_checksum_start( ssl_context *ssl, unsigned char *buf,
-                                       size_t len )
-{
-     md5_update( &ssl->handshake->fin_md5 , buf, len );
-    sha1_update( &ssl->handshake->fin_sha1, buf, len );
-    sha2_update( &ssl->handshake->fin_sha2, buf, len );
-#if defined(POLARSSL_SHA4_C)
-    sha4_update( &ssl->handshake->fin_sha4, buf, len );
+    else
 #endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return;
+    }
 }
 
-static void ssl_update_checksum_md5sha1( ssl_context *ssl, unsigned char *buf,
-                                         size_t len )
+static void ssl_update_checksum_start( ssl_context *ssl,
+                                       const unsigned char *buf, size_t len )
+{
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+     md5_update( &ssl->handshake->fin_md5 , buf, len );
+    sha1_update( &ssl->handshake->fin_sha1, buf, len );
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+    sha256_update( &ssl->handshake->fin_sha256, buf, len );
+#endif
+#if defined(POLARSSL_SHA512_C)
+    sha512_update( &ssl->handshake->fin_sha512, buf, len );
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+}
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+static void ssl_update_checksum_md5sha1( ssl_context *ssl,
+                                         const unsigned char *buf, size_t len )
 {
      md5_update( &ssl->handshake->fin_md5 , buf, len );
     sha1_update( &ssl->handshake->fin_sha1, buf, len );
 }
+#endif
 
-static void ssl_update_checksum_sha256( ssl_context *ssl, unsigned char *buf,
-                                        size_t len )
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+static void ssl_update_checksum_sha256( ssl_context *ssl,
+                                        const unsigned char *buf, size_t len )
 {
-    sha2_update( &ssl->handshake->fin_sha2, buf, len );
-}
-
-#if defined(POLARSSL_SHA4_C)
-static void ssl_update_checksum_sha384( ssl_context *ssl, unsigned char *buf,
-                                        size_t len )
-{
-    sha4_update( &ssl->handshake->fin_sha4, buf, len );
+    sha256_update( &ssl->handshake->fin_sha256, buf, len );
 }
 #endif
 
+#if defined(POLARSSL_SHA512_C)
+static void ssl_update_checksum_sha384( ssl_context *ssl,
+                                        const unsigned char *buf, size_t len )
+{
+    sha512_update( &ssl->handshake->fin_sha512, buf, len );
+}
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+#if defined(POLARSSL_SSL_PROTO_SSL3)
 static void ssl_calc_finished_ssl(
                 ssl_context *ssl, unsigned char *buf, int from )
 {
@@ -2588,16 +2891,18 @@ static void ssl_calc_finished_ssl(
 
     SSL_DEBUG_BUF( 3, "calc finished result", buf, 36 );
 
-    memset(  &md5, 0, sizeof(  md5_context ) );
-    memset( &sha1, 0, sizeof( sha1_context ) );
+    md5_free(  &md5  );
+    sha1_free( &sha1 );
 
-    memset(  padbuf, 0, sizeof(  padbuf ) );
-    memset(  md5sum, 0, sizeof(  md5sum ) );
-    memset( sha1sum, 0, sizeof( sha1sum ) );
+    polarssl_zeroize(  padbuf, sizeof(  padbuf ) );
+    polarssl_zeroize(  md5sum, sizeof(  md5sum ) );
+    polarssl_zeroize( sha1sum, sizeof( sha1sum ) );
 
     SSL_DEBUG_MSG( 2, ( "<= calc  finished" ) );
 }
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
 
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1)
 static void ssl_calc_finished_tls(
                 ssl_context *ssl, unsigned char *buf, int from )
 {
@@ -2639,25 +2944,28 @@ static void ssl_calc_finished_tls(
     md5_finish(  &md5, padbuf );
     sha1_finish( &sha1, padbuf + 16 );
 
-    ssl->handshake->tls_prf( session->master, 48, (char *) sender,
+    ssl->handshake->tls_prf( session->master, 48, sender,
                              padbuf, 36, buf, len );
 
     SSL_DEBUG_BUF( 3, "calc finished result", buf, len );
 
-    memset(  &md5, 0, sizeof(  md5_context ) );
-    memset( &sha1, 0, sizeof( sha1_context ) );
+    md5_free(  &md5  );
+    sha1_free( &sha1 );
 
-    memset(  padbuf, 0, sizeof(  padbuf ) );
+    polarssl_zeroize(  padbuf, sizeof(  padbuf ) );
 
     SSL_DEBUG_MSG( 2, ( "<= calc  finished" ) );
 }
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 */
 
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
 static void ssl_calc_finished_tls_sha256(
                 ssl_context *ssl, unsigned char *buf, int from )
 {
     int len = 12;
     const char *sender;
-    sha2_context sha2;
+    sha256_context sha256;
     unsigned char padbuf[32];
 
     ssl_session *session = ssl->session_negotiate;
@@ -2666,7 +2974,7 @@ static void ssl_calc_finished_tls_sha256(
 
     SSL_DEBUG_MSG( 2, ( "=> calc  finished tls sha256" ) );
 
-    memcpy( &sha2, &ssl->handshake->fin_sha2, sizeof(sha2_context) );
+    memcpy( &sha256, &ssl->handshake->fin_sha256, sizeof(sha256_context) );
 
     /*
      * TLSv1.2:
@@ -2674,36 +2982,37 @@ static void ssl_calc_finished_tls_sha256(
      *               Hash( handshake ) )[0.11]
      */
 
-#if !defined(POLARSSL_SHA2_ALT)
+#if !defined(POLARSSL_SHA256_ALT)
     SSL_DEBUG_BUF( 4, "finished sha2 state", (unsigned char *)
-                   sha2.state, sizeof( sha2.state ) );
+                   sha256.state, sizeof( sha256.state ) );
 #endif
 
     sender = ( from == SSL_IS_CLIENT )
              ? "client finished"
              : "server finished";
 
-    sha2_finish( &sha2, padbuf );
+    sha256_finish( &sha256, padbuf );
 
-    ssl->handshake->tls_prf( session->master, 48, (char *) sender,
+    ssl->handshake->tls_prf( session->master, 48, sender,
                              padbuf, 32, buf, len );
 
     SSL_DEBUG_BUF( 3, "calc finished result", buf, len );
 
-    memset( &sha2, 0, sizeof( sha2_context ) );
+    sha256_free( &sha256 );
 
-    memset(  padbuf, 0, sizeof(  padbuf ) );
+    polarssl_zeroize(  padbuf, sizeof(  padbuf ) );
 
     SSL_DEBUG_MSG( 2, ( "<= calc  finished" ) );
 }
+#endif /* POLARSSL_SHA256_C */
 
-#if defined(POLARSSL_SHA4_C)
+#if defined(POLARSSL_SHA512_C)
 static void ssl_calc_finished_tls_sha384(
                 ssl_context *ssl, unsigned char *buf, int from )
 {
     int len = 12;
     const char *sender;
-    sha4_context sha4;
+    sha512_context sha512;
     unsigned char padbuf[48];
 
     ssl_session *session = ssl->session_negotiate;
@@ -2712,7 +3021,7 @@ static void ssl_calc_finished_tls_sha384(
 
     SSL_DEBUG_MSG( 2, ( "=> calc  finished tls sha384" ) );
 
-    memcpy( &sha4, &ssl->handshake->fin_sha4, sizeof(sha4_context) );
+    memcpy( &sha512, &ssl->handshake->fin_sha512, sizeof(sha512_context) );
 
     /*
      * TLSv1.2:
@@ -2720,48 +3029,57 @@ static void ssl_calc_finished_tls_sha384(
      *               Hash( handshake ) )[0.11]
      */
 
-#if !defined(POLARSSL_SHA4_ALT)
-    SSL_DEBUG_BUF( 4, "finished sha4 state", (unsigned char *)
-                   sha4.state, sizeof( sha4.state ) );
+#if !defined(POLARSSL_SHA512_ALT)
+    SSL_DEBUG_BUF( 4, "finished sha512 state", (unsigned char *)
+                   sha512.state, sizeof( sha512.state ) );
 #endif
 
     sender = ( from == SSL_IS_CLIENT )
              ? "client finished"
              : "server finished";
 
-    sha4_finish( &sha4, padbuf );
+    sha512_finish( &sha512, padbuf );
 
-    ssl->handshake->tls_prf( session->master, 48, (char *) sender,
+    ssl->handshake->tls_prf( session->master, 48, sender,
                              padbuf, 48, buf, len );
 
     SSL_DEBUG_BUF( 3, "calc finished result", buf, len );
 
-    memset( &sha4, 0, sizeof( sha4_context ) );
+    sha512_free( &sha512 );
 
-    memset(  padbuf, 0, sizeof(  padbuf ) );
+    polarssl_zeroize(  padbuf, sizeof( padbuf ) );
 
     SSL_DEBUG_MSG( 2, ( "<= calc  finished" ) );
 }
-#endif
+#endif /* POLARSSL_SHA512_C */
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
 
 void ssl_handshake_wrapup( ssl_context *ssl )
 {
+    int resume = ssl->handshake->resume;
+
     SSL_DEBUG_MSG( 3, ( "=> handshake wrapup" ) );
 
     /*
      * Free our handshake params
      */
     ssl_handshake_free( ssl->handshake );
-    free( ssl->handshake );
+    polarssl_free( ssl->handshake );
     ssl->handshake = NULL;
 
+    if( ssl->renegotiation == SSL_RENEGOTIATION )
+    {
+        ssl->renegotiation =  SSL_RENEGOTIATION_DONE;
+        ssl->renego_records_seen = 0;
+    }
+
     /*
      * Switch in our now active transform context
      */
     if( ssl->transform )
     {
         ssl_transform_free( ssl->transform );
-        free( ssl->transform );
+        polarssl_free( ssl->transform );
     }
     ssl->transform = ssl->transform_negotiate;
     ssl->transform_negotiate = NULL;
@@ -2769,7 +3087,7 @@ void ssl_handshake_wrapup( ssl_context *ssl )
     if( ssl->session )
     {
         ssl_session_free( ssl->session );
-        free( ssl->session );
+        polarssl_free( ssl->session );
     }
     ssl->session = ssl->session_negotiate;
     ssl->session_negotiate = NULL;
@@ -2777,9 +3095,13 @@ void ssl_handshake_wrapup( ssl_context *ssl )
     /*
      * Add cache entry
      */
-    if( ssl->f_set_cache != NULL )
+    if( ssl->f_set_cache != NULL &&
+        ssl->session->length != 0 &&
+        resume == 0 )
+    {
         if( ssl->f_set_cache( ssl->p_set_cache, ssl->session ) != 0 )
             SSL_DEBUG_MSG( 1, ( "cache did not store session" ) );
+    }
 
     ssl->state++;
 
@@ -2792,6 +3114,17 @@ int ssl_write_finished( ssl_context *ssl )
 
     SSL_DEBUG_MSG( 2, ( "=> write finished" ) );
 
+    /*
+     * Set the out_msg pointer to the correct location based on IV length
+     */
+    if( ssl->minor_ver >= SSL_MINOR_VERSION_2 )
+    {
+        ssl->out_msg = ssl->out_iv + ssl->transform_negotiate->ivlen -
+                       ssl->transform_negotiate->fixed_ivlen;
+    }
+    else
+        ssl->out_msg = ssl->out_iv;
+
     ssl->handshake->calc_finished( ssl, ssl->out_msg + 4, ssl->endpoint );
 
     // TODO TLS/1.2 Hash length is determined by cipher suite (Page 63)
@@ -2819,13 +3152,25 @@ int ssl_write_finished( ssl_context *ssl )
         ssl->state++;
 
     /*
-     * Switch to our negotiated transform and session parameters for outbound data.
+     * Switch to our negotiated transform and session parameters for outbound
+     * data.
      */
     SSL_DEBUG_MSG( 3, ( "switching to new transform spec for outbound data" ) );
     ssl->transform_out = ssl->transform_negotiate;
     ssl->session_out = ssl->session_negotiate;
     memset( ssl->out_ctr, 0, 8 );
 
+#if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
+    if( ssl_hw_record_activate != NULL )
+    {
+        if( ( ret = ssl_hw_record_activate( ssl, SSL_CHANNEL_OUTBOUND ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_hw_record_activate", ret );
+            return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
+        }
+    }
+#endif
+
     if( ( ret = ssl_write_record( ssl ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_write_record", ret );
@@ -2848,13 +3193,36 @@ int ssl_parse_finished( ssl_context *ssl )
     ssl->handshake->calc_finished( ssl, buf, ssl->endpoint ^ 1 );
 
     /*
-     * Switch to our negotiated transform and session parameters for inbound data.
+     * Switch to our negotiated transform and session parameters for inbound
+     * data.
      */
     SSL_DEBUG_MSG( 3, ( "switching to new transform spec for inbound data" ) );
     ssl->transform_in = ssl->transform_negotiate;
     ssl->session_in = ssl->session_negotiate;
     memset( ssl->in_ctr, 0, 8 );
 
+    /*
+     * Set the in_msg pointer to the correct location based on IV length
+     */
+    if( ssl->minor_ver >= SSL_MINOR_VERSION_2 )
+    {
+        ssl->in_msg = ssl->in_iv + ssl->transform_negotiate->ivlen -
+                      ssl->transform_negotiate->fixed_ivlen;
+    }
+    else
+        ssl->in_msg = ssl->in_iv;
+
+#if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
+    if( ssl_hw_record_activate != NULL )
+    {
+        if( ( ret = ssl_hw_record_activate( ssl, SSL_CHANNEL_INBOUND ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_hw_record_activate", ret );
+            return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
+        }
+    }
+#endif
+
     if( ( ret = ssl_read_record( ssl ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_read_record", ret );
@@ -2877,7 +3245,7 @@ int ssl_parse_finished( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_BAD_HS_FINISHED );
     }
 
-    if( memcmp( ssl->in_msg + 4, buf, hash_len ) != 0 )
+    if( safer_memcmp( ssl->in_msg + 4, buf, hash_len ) != 0 )
     {
         SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
         return( POLARSSL_ERR_SSL_BAD_HS_FINISHED );
@@ -2902,45 +3270,114 @@ int ssl_parse_finished( ssl_context *ssl )
     return( 0 );
 }
 
-int ssl_handshake_init( ssl_context *ssl )
+static void ssl_handshake_params_init( ssl_handshake_params *handshake )
 {
+    memset( handshake, 0, sizeof( ssl_handshake_params ) );
+
+#if defined(POLARSSL_SSL_PROTO_SSL3) || defined(POLARSSL_SSL_PROTO_TLS1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_1)
+     md5_init(   &handshake->fin_md5  );
+    sha1_init(   &handshake->fin_sha1 );
+     md5_starts( &handshake->fin_md5  );
+    sha1_starts( &handshake->fin_sha1 );
+#endif
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+#if defined(POLARSSL_SHA256_C)
+    sha256_init(   &handshake->fin_sha256    );
+    sha256_starts( &handshake->fin_sha256, 0 );
+#endif
+#if defined(POLARSSL_SHA512_C)
+    sha512_init(   &handshake->fin_sha512    );
+    sha512_starts( &handshake->fin_sha512, 1 );
+#endif
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+
+    handshake->update_checksum = ssl_update_checksum_start;
+    handshake->sig_alg = SSL_HASH_SHA1;
+
+#if defined(POLARSSL_DHM_C)
+    dhm_init( &handshake->dhm_ctx );
+#endif
+#if defined(POLARSSL_ECDH_C)
+    ecdh_init( &handshake->ecdh_ctx );
+#endif
+}
+
+static void ssl_transform_init( ssl_transform *transform )
+{
+    memset( transform, 0, sizeof(ssl_transform) );
+
+    cipher_init( &transform->cipher_ctx_enc );
+    cipher_init( &transform->cipher_ctx_dec );
+
+    md_init( &transform->md_ctx_enc );
+    md_init( &transform->md_ctx_dec );
+}
+
+void ssl_session_init( ssl_session *session )
+{
+    memset( session, 0, sizeof(ssl_session) );
+}
+
+static int ssl_handshake_init( ssl_context *ssl )
+{
+    /* Clear old handshake information if present */
     if( ssl->transform_negotiate )
         ssl_transform_free( ssl->transform_negotiate );
-    else
-        ssl->transform_negotiate = malloc( sizeof(ssl_transform) );
-
     if( ssl->session_negotiate )
         ssl_session_free( ssl->session_negotiate );
-    else
-        ssl->session_negotiate = malloc( sizeof(ssl_session) );
-
     if( ssl->handshake )
         ssl_handshake_free( ssl->handshake );
-    else
-        ssl->handshake = malloc( sizeof(ssl_handshake_params) );
 
+    /*
+     * Either the pointers are now NULL or cleared properly and can be freed.
+     * Now allocate missing structures.
+     */
+    if( ssl->transform_negotiate == NULL )
+    {
+        ssl->transform_negotiate =
+            (ssl_transform *) polarssl_malloc( sizeof(ssl_transform) );
+    }
+
+    if( ssl->session_negotiate == NULL )
+    {
+        ssl->session_negotiate =
+            (ssl_session *) polarssl_malloc( sizeof(ssl_session) );
+    }
+
+    if( ssl->handshake == NULL)
+    {
+        ssl->handshake = (ssl_handshake_params *)
+            polarssl_malloc( sizeof(ssl_handshake_params) );
+    }
+
+    /* All pointers should exist and can be directly freed without issue */
     if( ssl->handshake == NULL ||
         ssl->transform_negotiate == NULL ||
         ssl->session_negotiate == NULL )
     {
         SSL_DEBUG_MSG( 1, ( "malloc() of ssl sub-contexts failed" ) );
+
+        polarssl_free( ssl->handshake );
+        polarssl_free( ssl->transform_negotiate );
+        polarssl_free( ssl->session_negotiate );
+
+        ssl->handshake = NULL;
+        ssl->transform_negotiate = NULL;
+        ssl->session_negotiate = NULL;
+
         return( POLARSSL_ERR_SSL_MALLOC_FAILED );
     }
 
-    memset( ssl->handshake, 0, sizeof(ssl_handshake_params) );
-    memset( ssl->transform_negotiate, 0, sizeof(ssl_transform) );
-    memset( ssl->session_negotiate, 0, sizeof(ssl_session) );
+    /* Initialize structures */
+    ssl_session_init( ssl->session_negotiate );
+    ssl_transform_init( ssl->transform_negotiate );
+    ssl_handshake_params_init( ssl->handshake );
 
-     md5_starts( &ssl->handshake->fin_md5 );
-    sha1_starts( &ssl->handshake->fin_sha1 );
-    sha2_starts( &ssl->handshake->fin_sha2, 0 );
-#if defined(POLARSSL_SHA4_C)
-    sha4_starts( &ssl->handshake->fin_sha4, 1 );
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    ssl->handshake->key_cert = ssl->key_cert;
 #endif
 
-    ssl->handshake->update_checksum = ssl_update_checksum_start;
-    ssl->handshake->sig_alg = SSL_HASH_SHA1;
-    
     return( 0 );
 }
 
@@ -2957,15 +3394,14 @@ int ssl_init( ssl_context *ssl )
     /*
      * Sane defaults
      */
-    ssl->rsa_decrypt = ssl_rsa_decrypt;
-    ssl->rsa_sign = ssl_rsa_sign;
-    ssl->rsa_key_len = ssl_rsa_key_len;
+    ssl->min_major_ver = SSL_MIN_MAJOR_VERSION;
+    ssl->min_minor_ver = SSL_MIN_MINOR_VERSION;
+    ssl->max_major_ver = SSL_MAX_MAJOR_VERSION;
+    ssl->max_minor_ver = SSL_MAX_MINOR_VERSION;
 
-    ssl->min_major_ver = SSL_MAJOR_VERSION_3;
-    ssl->min_minor_ver = SSL_MINOR_VERSION_0;
+    ssl_set_ciphersuites( ssl, ssl_list_ciphersuites() );
 
-    ssl->ciphersuites = malloc( sizeof(int *) * 4 );
-    ssl_set_ciphersuites( ssl, ssl_default_ciphersuites );
+    ssl->renego_max_records = SSL_RENEGO_MAX_RECORDS_DEFAULT;
 
 #if defined(POLARSSL_DHM_C)
     if( ( ret = mpi_read_string( &ssl->dhm_P, 16,
@@ -2981,8 +3417,9 @@ int ssl_init( ssl_context *ssl )
     /*
      * Prepare base structures
      */
-    ssl->in_ctr = (unsigned char *) malloc( len );
+    ssl->in_ctr = (unsigned char *) polarssl_malloc( len );
     ssl->in_hdr = ssl->in_ctr +  8;
+    ssl->in_iv  = ssl->in_ctr + 13;
     ssl->in_msg = ssl->in_ctr + 13;
 
     if( ssl->in_ctr == NULL )
@@ -2991,22 +3428,29 @@ int ssl_init( ssl_context *ssl )
         return( POLARSSL_ERR_SSL_MALLOC_FAILED );
     }
 
-    ssl->out_ctr = (unsigned char *) malloc( len );
+    ssl->out_ctr = (unsigned char *) polarssl_malloc( len );
     ssl->out_hdr = ssl->out_ctr +  8;
-    ssl->out_msg = ssl->out_ctr + 40;
+    ssl->out_iv  = ssl->out_ctr + 13;
+    ssl->out_msg = ssl->out_ctr + 13;
 
     if( ssl->out_ctr == NULL )
     {
         SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len ) );
-        free( ssl-> in_ctr );
+        polarssl_free( ssl->in_ctr );
+        ssl->in_ctr = NULL;
         return( POLARSSL_ERR_SSL_MALLOC_FAILED );
     }
 
     memset( ssl-> in_ctr, 0, SSL_BUFFER_LEN );
     memset( ssl->out_ctr, 0, SSL_BUFFER_LEN );
 
-    ssl->hostname = NULL;
-    ssl->hostname_len = 0;
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    ssl->ticket_lifetime = SSL_DEFAULT_TICKET_LIFETIME;
+#endif
+
+#if defined(POLARSSL_SSL_SET_CURVES)
+    ssl->curve_list = ecp_grp_id_list( );
+#endif
 
     if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
         return( ret );
@@ -3032,13 +3476,16 @@ int ssl_session_reset( ssl_context *ssl )
 
     ssl->in_offt = NULL;
 
+    ssl->in_msg = ssl->in_ctr + 13;
     ssl->in_msgtype = 0;
     ssl->in_msglen = 0;
     ssl->in_left = 0;
 
     ssl->in_hslen = 0;
     ssl->nb_zero = 0;
+    ssl->record_read = 0;
 
+    ssl->out_msg = ssl->out_ctr + 13;
     ssl->out_msgtype = 0;
     ssl->out_msglen = 0;
     ssl->out_left = 0;
@@ -3046,14 +3493,16 @@ int ssl_session_reset( ssl_context *ssl )
     ssl->transform_in = NULL;
     ssl->transform_out = NULL;
 
+    ssl->renego_records_seen = 0;
+
     memset( ssl->out_ctr, 0, SSL_BUFFER_LEN );
     memset( ssl->in_ctr, 0, SSL_BUFFER_LEN );
 
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
-    if( ssl_hw_record_reset != NULL)
+    if( ssl_hw_record_reset != NULL )
     {
         SSL_DEBUG_MSG( 2, ( "going for ssl_hw_record_reset()" ) );
-        if( ssl_hw_record_reset( ssl ) != 0 )
+        if( ( ret = ssl_hw_record_reset( ssl ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "ssl_hw_record_reset", ret );
             return( POLARSSL_ERR_SSL_HW_ACCEL_FAILED );
@@ -3064,29 +3513,95 @@ int ssl_session_reset( ssl_context *ssl )
     if( ssl->transform )
     {
         ssl_transform_free( ssl->transform );
-        free( ssl->transform );
+        polarssl_free( ssl->transform );
         ssl->transform = NULL;
     }
 
     if( ssl->session )
     {
         ssl_session_free( ssl->session );
-        free( ssl->session );
+        polarssl_free( ssl->session );
         ssl->session = NULL;
     }
 
+#if defined(POLARSSL_SSL_ALPN)
+    ssl->alpn_chosen = NULL;
+#endif
+
     if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
         return( ret );
 
     return( 0 );
 }
 
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+static void ssl_ticket_keys_free( ssl_ticket_keys *tkeys )
+{
+    aes_free( &tkeys->enc );
+    aes_free( &tkeys->dec );
+
+    polarssl_zeroize( tkeys, sizeof(ssl_ticket_keys) );
+}
+
+/*
+ * Allocate and initialize ticket keys
+ */
+static int ssl_ticket_keys_init( ssl_context *ssl )
+{
+    int ret;
+    ssl_ticket_keys *tkeys;
+    unsigned char buf[16];
+
+    if( ssl->ticket_keys != NULL )
+        return( 0 );
+
+    tkeys = (ssl_ticket_keys *) polarssl_malloc( sizeof(ssl_ticket_keys) );
+    if( tkeys == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    aes_init( &tkeys->enc );
+    aes_init( &tkeys->dec );
+
+    if( ( ret = ssl->f_rng( ssl->p_rng, tkeys->key_name, 16 ) ) != 0 )
+    {
+        ssl_ticket_keys_free( tkeys );
+        polarssl_free( tkeys );
+        return( ret );
+    }
+
+    if( ( ret = ssl->f_rng( ssl->p_rng, buf, 16 ) ) != 0 ||
+        ( ret = aes_setkey_enc( &tkeys->enc, buf, 128 ) ) != 0 ||
+        ( ret = aes_setkey_dec( &tkeys->dec, buf, 128 ) ) != 0 )
+    {
+        ssl_ticket_keys_free( tkeys );
+        polarssl_free( tkeys );
+        return( ret );
+    }
+
+    if( ( ret = ssl->f_rng( ssl->p_rng, tkeys->mac_key, 16 ) ) != 0 )
+    {
+        ssl_ticket_keys_free( tkeys );
+        polarssl_free( tkeys );
+        return( ret );
+    }
+
+    ssl->ticket_keys = tkeys;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
 /*
  * SSL set accessors
  */
 void ssl_set_endpoint( ssl_context *ssl, int endpoint )
 {
     ssl->endpoint   = endpoint;
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    if( endpoint == SSL_IS_CLIENT )
+        ssl->session_tickets = SSL_SESSION_TICKETS_ENABLED;
+#endif
 }
 
 void ssl_set_authmode( ssl_context *ssl, int authmode )
@@ -3094,13 +3609,15 @@ void ssl_set_authmode( ssl_context *ssl, int authmode )
     ssl->authmode   = authmode;
 }
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
 void ssl_set_verify( ssl_context *ssl,
-                     int (*f_vrfy)(void *, x509_cert *, int, int *),
+                     int (*f_vrfy)(void *, x509_crt *, int, int *),
                      void *p_vrfy )
 {
     ssl->f_vrfy      = f_vrfy;
     ssl->p_vrfy      = p_vrfy;
 }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
 void ssl_set_rng( ssl_context *ssl,
                   int (*f_rng)(void *, unsigned char *, size_t),
@@ -3138,21 +3655,36 @@ void ssl_set_session_cache( ssl_context *ssl,
     ssl->p_set_cache = p_set_cache;
 }
 
-void ssl_set_session( ssl_context *ssl, const ssl_session *session )
+int ssl_set_session( ssl_context *ssl, const ssl_session *session )
 {
-    memcpy( ssl->session_negotiate, session, sizeof(ssl_session) );
+    int ret;
+
+    if( ssl == NULL ||
+        session == NULL ||
+        ssl->session_negotiate == NULL ||
+        ssl->endpoint != SSL_IS_CLIENT )
+    {
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    if( ( ret = ssl_session_copy( ssl->session_negotiate, session ) ) != 0 )
+        return( ret );
+
     ssl->handshake->resume = 1;
+
+    return( 0 );
 }
 
 void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites )
 {
-    ssl->ciphersuites[SSL_MINOR_VERSION_0] = ciphersuites;
-    ssl->ciphersuites[SSL_MINOR_VERSION_1] = ciphersuites;
-    ssl->ciphersuites[SSL_MINOR_VERSION_2] = ciphersuites;
-    ssl->ciphersuites[SSL_MINOR_VERSION_3] = ciphersuites;
+    ssl->ciphersuite_list[SSL_MINOR_VERSION_0] = ciphersuites;
+    ssl->ciphersuite_list[SSL_MINOR_VERSION_1] = ciphersuites;
+    ssl->ciphersuite_list[SSL_MINOR_VERSION_2] = ciphersuites;
+    ssl->ciphersuite_list[SSL_MINOR_VERSION_3] = ciphersuites;
 }
 
-void ssl_set_ciphersuites_for_version( ssl_context *ssl, const int *ciphersuites,
+void ssl_set_ciphersuites_for_version( ssl_context *ssl,
+                                       const int *ciphersuites,
                                        int major, int minor )
 {
     if( major != SSL_MAJOR_VERSION_3 )
@@ -3161,10 +3693,40 @@ void ssl_set_ciphersuites_for_version( ssl_context *ssl, const int *ciphersuites
     if( minor < SSL_MINOR_VERSION_0 || minor > SSL_MINOR_VERSION_3 )
         return;
 
-    ssl->ciphersuites[minor] = ciphersuites;
+    ssl->ciphersuite_list[minor] = ciphersuites;
 }
 
-void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+/* Add a new (empty) key_cert entry an return a pointer to it */
+static ssl_key_cert *ssl_add_key_cert( ssl_context *ssl )
+{
+    ssl_key_cert *key_cert, *last;
+
+    key_cert = (ssl_key_cert *) polarssl_malloc( sizeof(ssl_key_cert) );
+    if( key_cert == NULL )
+        return( NULL );
+
+    memset( key_cert, 0, sizeof( ssl_key_cert ) );
+
+    /* Append the new key_cert to the (possibly empty) current list */
+    if( ssl->key_cert == NULL )
+    {
+        ssl->key_cert = key_cert;
+        if( ssl->handshake != NULL )
+            ssl->handshake->key_cert = key_cert;
+    }
+    else
+    {
+        last = ssl->key_cert;
+        while( last->next != NULL )
+            last = last->next;
+        last->next = key_cert;
+    }
+
+    return( key_cert );
+}
+
+void ssl_set_ca_chain( ssl_context *ssl, x509_crt *ca_chain,
                        x509_crl *ca_crl, const char *peer_cn )
 {
     ssl->ca_chain   = ca_chain;
@@ -3172,26 +3734,120 @@ void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
     ssl->peer_cn    = peer_cn;
 }
 
-void ssl_set_own_cert( ssl_context *ssl, x509_cert *own_cert,
-                       rsa_context *rsa_key )
+int ssl_set_own_cert( ssl_context *ssl, x509_crt *own_cert,
+                       pk_context *pk_key )
 {
-    ssl->own_cert   = own_cert;
-    ssl->rsa_key    = rsa_key;
+    ssl_key_cert *key_cert = ssl_add_key_cert( ssl );
+
+    if( key_cert == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    key_cert->cert = own_cert;
+    key_cert->key  = pk_key;
+
+    return( 0 );
 }
 
-void ssl_set_own_cert_alt( ssl_context *ssl, x509_cert *own_cert,
-                           void *rsa_key,
-                           rsa_decrypt_func rsa_decrypt,
-                           rsa_sign_func rsa_sign,
-                           rsa_key_len_func rsa_key_len )
+#if defined(POLARSSL_RSA_C)
+int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
+                           rsa_context *rsa_key )
 {
-    ssl->own_cert   = own_cert;
-    ssl->rsa_key    = rsa_key;
-    ssl->rsa_decrypt = rsa_decrypt;
-    ssl->rsa_sign = rsa_sign;
-    ssl->rsa_key_len = rsa_key_len;
+    int ret;
+    ssl_key_cert *key_cert = ssl_add_key_cert( ssl );
+
+    if( key_cert == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    key_cert->key = (pk_context *) polarssl_malloc( sizeof(pk_context) );
+    if( key_cert->key == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    pk_init( key_cert->key );
+
+    ret = pk_init_ctx( key_cert->key, pk_info_from_type( POLARSSL_PK_RSA ) );
+    if( ret != 0 )
+        return( ret );
+
+    if( ( ret = rsa_copy( pk_rsa( *key_cert->key ), rsa_key ) ) != 0 )
+        return( ret );
+
+    key_cert->cert = own_cert;
+    key_cert->key_own_alloc = 1;
+
+    return( 0 );
+}
+#endif /* POLARSSL_RSA_C */
+
+int ssl_set_own_cert_alt( ssl_context *ssl, x509_crt *own_cert,
+                          void *rsa_key,
+                          rsa_decrypt_func rsa_decrypt,
+                          rsa_sign_func rsa_sign,
+                          rsa_key_len_func rsa_key_len )
+{
+    int ret;
+    ssl_key_cert *key_cert = ssl_add_key_cert( ssl );
+
+    if( key_cert == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    key_cert->key = (pk_context *) polarssl_malloc( sizeof(pk_context) );
+    if( key_cert->key == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    pk_init( key_cert->key );
+
+    if( ( ret = pk_init_ctx_rsa_alt( key_cert->key, rsa_key,
+                                 rsa_decrypt, rsa_sign, rsa_key_len ) ) != 0 )
+        return( ret );
+
+    key_cert->cert = own_cert;
+    key_cert->key_own_alloc = 1;
+
+    return( 0 );
+}
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+int ssl_set_psk( ssl_context *ssl, const unsigned char *psk, size_t psk_len,
+                 const unsigned char *psk_identity, size_t psk_identity_len )
+{
+    if( psk == NULL || psk_identity == NULL )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    if( psk_len > POLARSSL_PSK_MAX_LEN )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    if( ssl->psk != NULL )
+    {
+        polarssl_free( ssl->psk );
+        polarssl_free( ssl->psk_identity );
+    }
+
+    ssl->psk_len = psk_len;
+    ssl->psk_identity_len = psk_identity_len;
+
+    ssl->psk = (unsigned char *) polarssl_malloc( ssl->psk_len );
+    ssl->psk_identity = (unsigned char *)
+                                polarssl_malloc( ssl->psk_identity_len );
+
+    if( ssl->psk == NULL || ssl->psk_identity == NULL )
+        return( POLARSSL_ERR_SSL_MALLOC_FAILED );
+
+    memcpy( ssl->psk, psk, ssl->psk_len );
+    memcpy( ssl->psk_identity, psk_identity, ssl->psk_identity_len );
+
+    return( 0 );
 }
 
+void ssl_set_psk_cb( ssl_context *ssl,
+                     int (*f_psk)(void *, ssl_context *, const unsigned char *,
+                     size_t),
+                     void *p_psk )
+{
+    ssl->f_psk = f_psk;
+    ssl->p_psk = p_psk;
+}
+#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
 
 #if defined(POLARSSL_DHM_C)
 int ssl_set_dh_param( ssl_context *ssl, const char *dhm_P, const char *dhm_G )
@@ -3217,13 +3873,13 @@ int ssl_set_dh_param_ctx( ssl_context *ssl, dhm_context *dhm_ctx )
 {
     int ret;
 
-    if( ( ret = mpi_copy(&ssl->dhm_P, &dhm_ctx->P) ) != 0 )
+    if( ( ret = mpi_copy( &ssl->dhm_P, &dhm_ctx->P ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "mpi_copy", ret );
         return( ret );
     }
 
-    if( ( ret = mpi_copy(&ssl->dhm_G, &dhm_ctx->G) ) != 0 )
+    if( ( ret = mpi_copy( &ssl->dhm_G, &dhm_ctx->G ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "mpi_copy", ret );
         return( ret );
@@ -3233,20 +3889,35 @@ int ssl_set_dh_param_ctx( ssl_context *ssl, dhm_context *dhm_ctx )
 }
 #endif /* POLARSSL_DHM_C */
 
+#if defined(POLARSSL_SSL_SET_CURVES)
+/*
+ * Set the allowed elliptic curves
+ */
+void ssl_set_curves( ssl_context *ssl, const ecp_group_id *curve_list )
+{
+  ssl->curve_list = curve_list;
+}
+#endif
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
 int ssl_set_hostname( ssl_context *ssl, const char *hostname )
 {
     if( hostname == NULL )
         return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
 
     ssl->hostname_len = strlen( hostname );
-    ssl->hostname = (unsigned char *) malloc( ssl->hostname_len + 1 );
+
+    if( ssl->hostname_len + 1 == 0 )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    ssl->hostname = (unsigned char *) polarssl_malloc( ssl->hostname_len + 1 );
 
     if( ssl->hostname == NULL )
         return( POLARSSL_ERR_SSL_MALLOC_FAILED );
 
     memcpy( ssl->hostname, (const unsigned char *) hostname,
             ssl->hostname_len );
-    
+
     ssl->hostname[ssl->hostname_len] = '\0';
 
     return( 0 );
@@ -3260,19 +3931,86 @@ void ssl_set_sni( ssl_context *ssl,
     ssl->f_sni = f_sni;
     ssl->p_sni = p_sni;
 }
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
+
+#if defined(POLARSSL_SSL_ALPN)
+int ssl_set_alpn_protocols( ssl_context *ssl, const char **protos )
+{
+    size_t cur_len, tot_len;
+    const char **p;
+
+    /*
+     * "Empty strings MUST NOT be included and byte strings MUST NOT be
+     * truncated". Check lengths now rather than later.
+     */
+    tot_len = 0;
+    for( p = protos; *p != NULL; p++ )
+    {
+        cur_len = strlen( *p );
+        tot_len += cur_len;
+
+        if( cur_len == 0 || cur_len > 255 || tot_len > 65535 )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    ssl->alpn_list = protos;
+
+    return( 0 );
+}
+
+const char *ssl_get_alpn_protocol( const ssl_context *ssl )
+{
+    return( ssl->alpn_chosen );
+}
+#endif /* POLARSSL_SSL_ALPN */
 
 void ssl_set_max_version( ssl_context *ssl, int major, int minor )
 {
-    ssl->max_major_ver = major;
-    ssl->max_minor_ver = minor;
+    if( major >= SSL_MIN_MAJOR_VERSION && major <= SSL_MAX_MAJOR_VERSION &&
+        minor >= SSL_MIN_MINOR_VERSION && minor <= SSL_MAX_MINOR_VERSION )
+    {
+        ssl->max_major_ver = major;
+        ssl->max_minor_ver = minor;
+    }
 }
 
 void ssl_set_min_version( ssl_context *ssl, int major, int minor )
 {
-    ssl->min_major_ver = major;
-    ssl->min_minor_ver = minor;
+    if( major >= SSL_MIN_MAJOR_VERSION && major <= SSL_MAX_MAJOR_VERSION &&
+        minor >= SSL_MIN_MINOR_VERSION && minor <= SSL_MAX_MINOR_VERSION )
+    {
+        ssl->min_major_ver = major;
+        ssl->min_minor_ver = minor;
+    }
 }
 
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+int ssl_set_max_frag_len( ssl_context *ssl, unsigned char mfl_code )
+{
+    if( mfl_code >= SSL_MAX_FRAG_LEN_INVALID ||
+        mfl_code_to_length[mfl_code] > SSL_MAX_CONTENT_LEN )
+    {
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    ssl->mfl_code = mfl_code;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+int ssl_set_truncated_hmac( ssl_context *ssl, int truncate )
+{
+    if( ssl->endpoint != SSL_IS_CLIENT )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    ssl->trunc_hmac = truncate;
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+
 void ssl_set_renegotiation( ssl_context *ssl, int renegotiation )
 {
     ssl->disable_renegotiation = renegotiation;
@@ -3283,6 +4021,31 @@ void ssl_legacy_renegotiation( ssl_context *ssl, int allow_legacy )
     ssl->allow_legacy_renegotiation = allow_legacy;
 }
 
+void ssl_set_renegotiation_enforced( ssl_context *ssl, int max_records )
+{
+    ssl->renego_max_records = max_records;
+}
+
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+int ssl_set_session_tickets( ssl_context *ssl, int use_tickets )
+{
+    ssl->session_tickets = use_tickets;
+
+    if( ssl->endpoint == SSL_IS_CLIENT )
+        return( 0 );
+
+    if( ssl->f_rng == NULL )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+    return( ssl_ticket_keys_init( ssl ) );
+}
+
+void ssl_set_session_ticket_lifetime( ssl_context *ssl, int lifetime )
+{
+    ssl->ticket_lifetime = lifetime;
+}
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+
 /*
  * SSL get accessors
  */
@@ -3293,225 +4056,13 @@ size_t ssl_get_bytes_avail( const ssl_context *ssl )
 
 int ssl_get_verify_result( const ssl_context *ssl )
 {
-    return( ssl->verify_result );
-}
-
-const char *ssl_get_ciphersuite_name( const int ciphersuite_id )
-{
-    switch( ciphersuite_id )
-    {
-#if defined(POLARSSL_ARC4_C)
-        case TLS_RSA_WITH_RC4_128_MD5:
-            return( "TLS-RSA-WITH-RC4-128-MD5" );
-
-        case TLS_RSA_WITH_RC4_128_SHA:
-            return( "TLS-RSA-WITH-RC4-128-SHA" );
-#endif
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-            return( "TLS-RSA-WITH-3DES-EDE-CBC-SHA" );
-
-        case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA" );
-#endif
-
-#if defined(POLARSSL_AES_C)
-        case TLS_RSA_WITH_AES_128_CBC_SHA:
-            return( "TLS-RSA-WITH-AES-128-CBC-SHA" );
-
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-AES-128-CBC-SHA" );
-
-        case TLS_RSA_WITH_AES_256_CBC_SHA:
-            return( "TLS-RSA-WITH-AES-256-CBC-SHA" );
-
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-AES-256-CBC-SHA" );
-
-#if defined(POLARSSL_SHA2_C)
-        case TLS_RSA_WITH_AES_128_CBC_SHA256:
-            return( "TLS-RSA-WITH-AES-128-CBC-SHA256" );
-
-        case TLS_RSA_WITH_AES_256_CBC_SHA256:
-            return( "TLS-RSA-WITH-AES-256-CBC-SHA256" );
-
-        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-            return( "TLS-DHE-RSA-WITH-AES-128-CBC-SHA256" );
-
-        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-            return( "TLS-DHE-RSA-WITH-AES-256-CBC-SHA256" );
-#endif
-
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA2_C)
-        case TLS_RSA_WITH_AES_128_GCM_SHA256:
-            return( "TLS-RSA-WITH-AES-128-GCM-SHA256" );
-
-        case TLS_RSA_WITH_AES_256_GCM_SHA384:
-            return( "TLS-RSA-WITH-AES-256-GCM-SHA384" );
-#endif
-
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA4_C)
-        case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-            return( "TLS-DHE-RSA-WITH-AES-128-GCM-SHA256" );
-
-        case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-            return( "TLS-DHE-RSA-WITH-AES-256-GCM-SHA384" );
-#endif
-#endif /* POLARSSL_AES_C */
-
-#if defined(POLARSSL_CAMELLIA_C)
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            return( "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA" );
-
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA" );
-
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            return( "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA" );
-
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA" );
-
-#if defined(POLARSSL_SHA2_C)
-        case TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            return( "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256" );
-
-        case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            return( "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256" );
-
-        case TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            return( "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256" );
-
-        case TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            return( "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256" );
-#endif
-#endif
-
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-        case TLS_RSA_WITH_NULL_MD5:
-            return( "TLS-RSA-WITH-NULL-MD5" );
-        case TLS_RSA_WITH_NULL_SHA:
-            return( "TLS-RSA-WITH-NULL-SHA" );
-        case TLS_RSA_WITH_NULL_SHA256:
-            return( "TLS-RSA-WITH-NULL-SHA256" );
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-#if defined(POLARSSL_DES_C)
-        case TLS_RSA_WITH_DES_CBC_SHA:
-            return( "TLS-RSA-WITH-DES-CBC-SHA" );
-        case TLS_DHE_RSA_WITH_DES_CBC_SHA:
-            return( "TLS-DHE-RSA-WITH-DES-CBC-SHA" );
-#endif
-#endif /* defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES) */
-
-    default:
-        break;
-    }
-
-    return( "unknown" );
-}
-
-int ssl_get_ciphersuite_id( const char *ciphersuite_name )
-{
-#if defined(POLARSSL_ARC4_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-RC4-128-MD5"))
-        return( TLS_RSA_WITH_RC4_128_MD5 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-RC4-128-SHA"))
-        return( TLS_RSA_WITH_RC4_128_SHA );
-#endif
-
-#if defined(POLARSSL_DES_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-3DES-EDE-CBC-SHA"))
-        return( TLS_RSA_WITH_3DES_EDE_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA );
-#endif
-
-#if defined(POLARSSL_AES_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-128-CBC-SHA"))
-        return( TLS_RSA_WITH_AES_128_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-128-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_AES_128_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-256-CBC-SHA"))
-        return( TLS_RSA_WITH_AES_256_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-256-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_AES_256_CBC_SHA );
-
-#if defined(POLARSSL_SHA2_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-128-CBC-SHA256"))
-        return( TLS_RSA_WITH_AES_128_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-256-CBC-SHA256"))
-        return( TLS_RSA_WITH_AES_256_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-128-CBC-SHA256"))
-        return( TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-256-CBC-SHA256"))
-        return( TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 );
-#endif
-
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA2_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-128-GCM-SHA256"))
-        return( TLS_RSA_WITH_AES_128_GCM_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-AES-256-GCM-SHA384"))
-        return( TLS_RSA_WITH_AES_256_GCM_SHA384 );
-#endif
-
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA2_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-128-GCM-SHA256"))
-        return( TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-AES-256-GCM-SHA384"))
-        return( TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 );
-#endif
-#endif
-
-#if defined(POLARSSL_CAMELLIA_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA"))
-        return( TLS_RSA_WITH_CAMELLIA_128_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA"))
-        return( TLS_RSA_WITH_CAMELLIA_256_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA );
-
-#if defined(POLARSSL_SHA2_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256"))
-        return( TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256"))
-        return( TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256"))
-        return( TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256"))
-        return( TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 );
-#endif
-#endif
-
-#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
-#if defined(POLARSSL_CIPHER_NULL_CIPHER)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-NULL-MD5"))
-        return( TLS_RSA_WITH_NULL_MD5 );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-NULL-SHA"))
-        return( TLS_RSA_WITH_NULL_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-NULL-SHA256"))
-        return( TLS_RSA_WITH_NULL_SHA256 );
-#endif /* defined(POLARSSL_CIPHER_NULL_CIPHER) */
-
-#if defined(POLARSSL_DES_C)
-    if (0 == strcasecmp(ciphersuite_name, "TLS-RSA-WITH-DES-CBC-SHA"))
-        return( TLS_RSA_WITH_DES_CBC_SHA );
-    if (0 == strcasecmp(ciphersuite_name, "TLS-DHE-RSA-WITH-DES-CBC-SHA"))
-        return( TLS_DHE_RSA_WITH_DES_CBC_SHA );
-#endif
-#endif /* defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES) */
-
-    return( 0 );
+    return( ssl->session->verify_result );
 }
 
 const char *ssl_get_ciphersuite( const ssl_context *ssl )
 {
     if( ssl == NULL || ssl->session == NULL )
-        return NULL;
+        return( NULL );
 
     return ssl_get_ciphersuite_name( ssl->session->ciphersuite );
 }
@@ -3538,87 +4089,28 @@ const char *ssl_get_version( const ssl_context *ssl )
     return( "unknown" );
 }
 
-const x509_cert *ssl_get_peer_cert( const ssl_context *ssl )
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+const x509_crt *ssl_get_peer_cert( const ssl_context *ssl )
 {
     if( ssl == NULL || ssl->session == NULL )
-        return NULL;
+        return( NULL );
 
-    return ssl->session->peer_cert;
+    return( ssl->session->peer_cert );
 }
+#endif /* POLARSSL_X509_CRT_PARSE_C */
 
-const int ssl_default_ciphersuites[] =
+int ssl_get_session( const ssl_context *ssl, ssl_session *dst )
 {
-#if defined(POLARSSL_DHM_C)
-#if defined(POLARSSL_AES_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA4_C)
-    TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
-#endif
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-#if defined(POLARSSL_SHA2_C)
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-#endif
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA2_C)
-    TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
-#endif
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-#endif
-#if defined(POLARSSL_CAMELLIA_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-#if defined(POLARSSL_SHA2_C)
-    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-#endif
-#if defined(POLARSSL_DES_C)
-    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-#endif
-#endif
+    if( ssl == NULL ||
+        dst == NULL ||
+        ssl->session == NULL ||
+        ssl->endpoint != SSL_IS_CLIENT )
+    {
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    }
 
-#if defined(POLARSSL_AES_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_RSA_WITH_AES_256_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA4_C)
-    TLS_RSA_WITH_AES_256_GCM_SHA384,
-#endif /* POLARSSL_SHA2_C */
-    TLS_RSA_WITH_AES_256_CBC_SHA,
-#endif
-#if defined(POLARSSL_CAMELLIA_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
-#endif
-#if defined(POLARSSL_AES_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_RSA_WITH_AES_128_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-#if defined(POLARSSL_GCM_C) && defined(POLARSSL_SHA2_C)
-    TLS_RSA_WITH_AES_128_GCM_SHA256,
-#endif /* POLARSSL_SHA2_C */
-    TLS_RSA_WITH_AES_128_CBC_SHA,
-#endif
-#if defined(POLARSSL_CAMELLIA_C)
-#if defined(POLARSSL_SHA2_C)
-    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-#endif /* POLARSSL_SHA2_C */
-    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
-#endif
-#if defined(POLARSSL_DES_C)
-    TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-#endif
-#if defined(POLARSSL_ARC4_C)
-    TLS_RSA_WITH_RC4_128_SHA,
-    TLS_RSA_WITH_RC4_128_MD5,
-#endif
-    0
-};
+    return( ssl_session_copy( dst, ssl->session ) );
+}
 
 /*
  * Perform a single step of the SSL handshake
@@ -3662,24 +4154,55 @@ int ssl_handshake( ssl_context *ssl )
     return( ret );
 }
 
+#if defined(POLARSSL_SSL_SRV_C)
 /*
- * Renegotiate current connection
+ * Write HelloRequest to request renegotiation on server
  */
-int ssl_renegotiate( ssl_context *ssl )
+static int ssl_write_hello_request( ssl_context *ssl )
+{
+    int ret;
+
+    SSL_DEBUG_MSG( 2, ( "=> write hello request" ) );
+
+    ssl->out_msglen  = 4;
+    ssl->out_msgtype = SSL_MSG_HANDSHAKE;
+    ssl->out_msg[0]  = SSL_HS_HELLO_REQUEST;
+
+    if( ( ret = ssl_write_record( ssl ) ) != 0 )
+    {
+        SSL_DEBUG_RET( 1, "ssl_write_record", ret );
+        return( ret );
+    }
+
+    ssl->renegotiation = SSL_RENEGOTIATION_PENDING;
+
+    SSL_DEBUG_MSG( 2, ( "<= write hello request" ) );
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SRV_C */
+
+/*
+ * Actually renegotiate current connection, triggered by either:
+ * - calling ssl_renegotiate() on client,
+ * - receiving a HelloRequest on client during ssl_read(),
+ * - receiving any handshake message on server during ssl_read() after the
+ *   initial handshake is completed
+ * If the handshake doesn't complete due to waiting for I/O, it will continue
+ * during the next calls to ssl_renegotiate() or ssl_read() respectively.
+ */
+static int ssl_start_renegotiation( ssl_context *ssl )
 {
     int ret;
 
     SSL_DEBUG_MSG( 2, ( "=> renegotiate" ) );
 
-    if( ssl->state != SSL_HANDSHAKE_OVER )
-        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+    if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
+        return( ret );
 
     ssl->state = SSL_HELLO_REQUEST;
     ssl->renegotiation = SSL_RENEGOTIATION;
 
-    if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
-        return( ret );
-
     if( ( ret = ssl_handshake( ssl ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_handshake", ret );
@@ -3691,6 +4214,54 @@ int ssl_renegotiate( ssl_context *ssl )
     return( 0 );
 }
 
+/*
+ * Renegotiate current connection on client,
+ * or request renegotiation on server
+ */
+int ssl_renegotiate( ssl_context *ssl )
+{
+    int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
+
+#if defined(POLARSSL_SSL_SRV_C)
+    /* On server, just send the request */
+    if( ssl->endpoint == SSL_IS_SERVER )
+    {
+        if( ssl->state != SSL_HANDSHAKE_OVER )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+        return( ssl_write_hello_request( ssl ) );
+    }
+#endif /* POLARSSL_SSL_SRV_C */
+
+#if defined(POLARSSL_SSL_CLI_C)
+    /*
+     * On client, either start the renegotiation process or,
+     * if already in progress, continue the handshake
+     */
+    if( ssl->renegotiation != SSL_RENEGOTIATION )
+    {
+        if( ssl->state != SSL_HANDSHAKE_OVER )
+            return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
+        if( ( ret = ssl_start_renegotiation( ssl ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_start_renegotiation", ret );
+            return( ret );
+        }
+    }
+    else
+    {
+        if( ( ret = ssl_handshake( ssl ) ) != 0 )
+        {
+            SSL_DEBUG_RET( 1, "ssl_handshake", ret );
+            return( ret );
+        }
+    }
+#endif /* POLARSSL_SSL_CLI_C */
+
+    return( ret );
+}
+
 /*
  * Receive application data decrypted from the SSL layer
  */
@@ -3751,10 +4322,12 @@ int ssl_read( ssl_context *ssl, unsigned char *buf, size_t len )
 
             if( ssl->disable_renegotiation == SSL_RENEGOTIATION_DISABLED ||
                 ( ssl->secure_renegotiation == SSL_LEGACY_RENEGOTIATION &&
-                  ssl->allow_legacy_renegotiation == SSL_LEGACY_NO_RENEGOTIATION ) )
+                  ssl->allow_legacy_renegotiation ==
+                                                SSL_LEGACY_NO_RENEGOTIATION ) )
             {
                 SSL_DEBUG_MSG( 3, ( "ignoring renegotiation, sending alert" ) );
 
+#if defined(POLARSSL_SSL_PROTO_SSL3)
                 if( ssl->minor_ver == SSL_MINOR_VERSION_0 )
                 {
                     /*
@@ -3764,6 +4337,10 @@ int ssl_read( ssl_context *ssl, unsigned char *buf, size_t len )
                         return( ret );
                 }
                 else
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
+#if defined(POLARSSL_SSL_PROTO_TLS1) || defined(POLARSSL_SSL_PROTO_TLS1_1) || \
+    defined(POLARSSL_SSL_PROTO_TLS1_2)
+                if( ssl->minor_ver >= SSL_MINOR_VERSION_1 )
                 {
                     if( ( ret = ssl_send_alert_message( ssl,
                                     SSL_ALERT_LEVEL_WARNING,
@@ -3772,18 +4349,37 @@ int ssl_read( ssl_context *ssl, unsigned char *buf, size_t len )
                         return( ret );
                     }
                 }
+                else
+#endif /* POLARSSL_SSL_PROTO_TLS1 || POLARSSL_SSL_PROTO_TLS1_1 ||
+          POLARSSL_SSL_PROTO_TLS1_2 */
+                {
+                    SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+                    return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
+                }
             }
             else
             {
-                if( ( ret = ssl_renegotiate( ssl ) ) != 0 )
+                if( ( ret = ssl_start_renegotiation( ssl ) ) != 0 )
                 {
-                    SSL_DEBUG_RET( 1, "ssl_renegotiate", ret );
+                    SSL_DEBUG_RET( 1, "ssl_start_renegotiation", ret );
                     return( ret );
                 }
 
                 return( POLARSSL_ERR_NET_WANT_READ );
             }
         }
+        else if( ssl->renegotiation == SSL_RENEGOTIATION_PENDING )
+        {
+            ssl->renego_records_seen++;
+
+            if( ssl->renego_max_records >= 0 &&
+                ssl->renego_records_seen > ssl->renego_max_records )
+            {
+                SSL_DEBUG_MSG( 1, ( "renegotiation requested, "
+                                    "but not honored by client" ) );
+                return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
+            }
+        }
         else if( ssl->in_msgtype != SSL_MSG_APPLICATION_DATA )
         {
             SSL_DEBUG_MSG( 1, ( "bad application data message" ) );
@@ -3818,6 +4414,7 @@ int ssl_write( ssl_context *ssl, const unsigned char *buf, size_t len )
 {
     int ret;
     size_t n;
+    unsigned int max_len = SSL_MAX_CONTENT_LEN;
 
     SSL_DEBUG_MSG( 2, ( "=> write" ) );
 
@@ -3830,8 +4427,23 @@ int ssl_write( ssl_context *ssl, const unsigned char *buf, size_t len )
         }
     }
 
-    n = ( len < SSL_MAX_CONTENT_LEN )
-        ? len : SSL_MAX_CONTENT_LEN;
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    /*
+     * Assume mfl_code is correct since it was checked when set
+     */
+    max_len = mfl_code_to_length[ssl->mfl_code];
+
+    /*
+     * Check if a smaller max length was negotiated
+     */
+    if( ssl->session_out != NULL &&
+        mfl_code_to_length[ssl->session_out->mfl_code] < max_len )
+    {
+        max_len = mfl_code_to_length[ssl->session_out->mfl_code];
+    }
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+
+    n = ( len < max_len) ? len : max_len;
 
     if( ssl->out_left != 0 )
     {
@@ -3891,31 +4503,101 @@ int ssl_close_notify( ssl_context *ssl )
 
 void ssl_transform_free( ssl_transform *transform )
 {
+    if( transform == NULL )
+        return;
+
 #if defined(POLARSSL_ZLIB_SUPPORT)
     deflateEnd( &transform->ctx_deflate );
     inflateEnd( &transform->ctx_inflate );
 #endif
 
-    memset( transform, 0, sizeof( ssl_transform ) );
+    cipher_free( &transform->cipher_ctx_enc );
+    cipher_free( &transform->cipher_ctx_dec );
+
+    md_free( &transform->md_ctx_enc );
+    md_free( &transform->md_ctx_dec );
+
+    polarssl_zeroize( transform, sizeof( ssl_transform ) );
 }
 
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+static void ssl_key_cert_free( ssl_key_cert *key_cert )
+{
+    ssl_key_cert *cur = key_cert, *next;
+
+    while( cur != NULL )
+    {
+        next = cur->next;
+
+        if( cur->key_own_alloc )
+        {
+            pk_free( cur->key );
+            polarssl_free( cur->key );
+        }
+        polarssl_free( cur );
+
+        cur = next;
+    }
+}
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
 void ssl_handshake_free( ssl_handshake_params *handshake )
 {
+    if( handshake == NULL )
+        return;
+
 #if defined(POLARSSL_DHM_C)
     dhm_free( &handshake->dhm_ctx );
 #endif
-    memset( handshake, 0, sizeof( ssl_handshake_params ) );
+#if defined(POLARSSL_ECDH_C)
+    ecdh_free( &handshake->ecdh_ctx );
+#endif
+
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
+    /* explicit void pointer cast for buggy MS compiler */
+    polarssl_free( (void *) handshake->curves );
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C) && \
+    defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    /*
+     * Free only the linked list wrapper, not the keys themselves
+     * since the belong to the SNI callback
+     */
+    if( handshake->sni_key_cert != NULL )
+    {
+        ssl_key_cert *cur = handshake->sni_key_cert, *next;
+
+        while( cur != NULL )
+        {
+            next = cur->next;
+            polarssl_free( cur );
+            cur = next;
+        }
+    }
+#endif /* POLARSSL_X509_CRT_PARSE_C && POLARSSL_SSL_SERVER_NAME_INDICATION */
+
+    polarssl_zeroize( handshake, sizeof( ssl_handshake_params ) );
 }
 
 void ssl_session_free( ssl_session *session )
 {
+    if( session == NULL )
+        return;
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
     if( session->peer_cert != NULL )
     {
-        x509_free( session->peer_cert );
-        free( session->peer_cert );
+        x509_crt_free( session->peer_cert );
+        polarssl_free( session->peer_cert );
     }
+#endif
 
-    memset( session, 0, sizeof( ssl_session ) );
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    polarssl_free( session->ticket );
+#endif
+
+    polarssl_zeroize( session, sizeof( ssl_session ) );
 }
 
 /*
@@ -3923,22 +4605,31 @@ void ssl_session_free( ssl_session *session )
  */
 void ssl_free( ssl_context *ssl )
 {
-    SSL_DEBUG_MSG( 2, ( "=> free" ) );
+    if( ssl == NULL )
+        return;
 
-    free( ssl->ciphersuites );
+    SSL_DEBUG_MSG( 2, ( "=> free" ) );
 
     if( ssl->out_ctr != NULL )
     {
-        memset( ssl->out_ctr, 0, SSL_BUFFER_LEN );
-          free( ssl->out_ctr );
+        polarssl_zeroize( ssl->out_ctr, SSL_BUFFER_LEN );
+        polarssl_free( ssl->out_ctr );
     }
 
     if( ssl->in_ctr != NULL )
     {
-        memset( ssl->in_ctr, 0, SSL_BUFFER_LEN );
-          free( ssl->in_ctr );
+        polarssl_zeroize( ssl->in_ctr, SSL_BUFFER_LEN );
+        polarssl_free( ssl->in_ctr );
     }
 
+#if defined(POLARSSL_ZLIB_SUPPORT)
+    if( ssl->compress_buf != NULL )
+    {
+        polarssl_zeroize( ssl->compress_buf, SSL_BUFFER_LEN );
+        polarssl_free( ssl->compress_buf );
+    }
+#endif
+
 #if defined(POLARSSL_DHM_C)
     mpi_free( &ssl->dhm_P );
     mpi_free( &ssl->dhm_G );
@@ -3947,7 +4638,7 @@ void ssl_free( ssl_context *ssl )
     if( ssl->transform )
     {
         ssl_transform_free( ssl->transform );
-        free( ssl->transform );
+        polarssl_free( ssl->transform );
     }
 
     if( ssl->handshake )
@@ -3956,23 +4647,49 @@ void ssl_free( ssl_context *ssl )
         ssl_transform_free( ssl->transform_negotiate );
         ssl_session_free( ssl->session_negotiate );
 
-        free( ssl->handshake );
-        free( ssl->transform_negotiate );
-        free( ssl->session_negotiate );
+        polarssl_free( ssl->handshake );
+        polarssl_free( ssl->transform_negotiate );
+        polarssl_free( ssl->session_negotiate );
     }
 
     if( ssl->session )
     {
         ssl_session_free( ssl->session );
-        free( ssl->session );
+        polarssl_free( ssl->session );
     }
 
-    if ( ssl->hostname != NULL)
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    if( ssl->ticket_keys )
     {
-        memset( ssl->hostname, 0, ssl->hostname_len );
-        free( ssl->hostname );
+        ssl_ticket_keys_free( ssl->ticket_keys );
+        polarssl_free( ssl->ticket_keys );
+    }
+#endif
+
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    if( ssl->hostname != NULL )
+    {
+        polarssl_zeroize( ssl->hostname, ssl->hostname_len );
+        polarssl_free( ssl->hostname );
         ssl->hostname_len = 0;
     }
+#endif
+
+#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
+    if( ssl->psk != NULL )
+    {
+        polarssl_zeroize( ssl->psk, ssl->psk_len );
+        polarssl_zeroize( ssl->psk_identity, ssl->psk_identity_len );
+        polarssl_free( ssl->psk );
+        polarssl_free( ssl->psk_identity );
+        ssl->psk_len = 0;
+        ssl->psk_identity_len = 0;
+    }
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    ssl_key_cert_free( ssl->key_cert );
+#endif
 
 #if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
     if( ssl_hw_record_finish != NULL )
@@ -3985,7 +4702,172 @@ void ssl_free( ssl_context *ssl )
     SSL_DEBUG_MSG( 2, ( "<= free" ) );
 
     /* Actually clear after last debug message */
-    memset( ssl, 0, sizeof( ssl_context ) );
+    polarssl_zeroize( ssl, sizeof( ssl_context ) );
 }
 
+#if defined(POLARSSL_PK_C)
+/*
+ * Convert between POLARSSL_PK_XXX and SSL_SIG_XXX
+ */
+unsigned char ssl_sig_from_pk( pk_context *pk )
+{
+#if defined(POLARSSL_RSA_C)
+    if( pk_can_do( pk, POLARSSL_PK_RSA ) )
+        return( SSL_SIG_RSA );
 #endif
+#if defined(POLARSSL_ECDSA_C)
+    if( pk_can_do( pk, POLARSSL_PK_ECDSA ) )
+        return( SSL_SIG_ECDSA );
+#endif
+    return( SSL_SIG_ANON );
+}
+
+pk_type_t ssl_pk_alg_from_sig( unsigned char sig )
+{
+    switch( sig )
+    {
+#if defined(POLARSSL_RSA_C)
+        case SSL_SIG_RSA:
+            return( POLARSSL_PK_RSA );
+#endif
+#if defined(POLARSSL_ECDSA_C)
+        case SSL_SIG_ECDSA:
+            return( POLARSSL_PK_ECDSA );
+#endif
+        default:
+            return( POLARSSL_PK_NONE );
+    }
+}
+#endif /* POLARSSL_PK_C */
+
+/*
+ * Convert between SSL_HASH_XXX and POLARSSL_MD_XXX
+ */
+md_type_t ssl_md_alg_from_hash( unsigned char hash )
+{
+    switch( hash )
+    {
+#if defined(POLARSSL_MD5_C)
+        case SSL_HASH_MD5:
+            return( POLARSSL_MD_MD5 );
+#endif
+#if defined(POLARSSL_SHA1_C)
+        case SSL_HASH_SHA1:
+            return( POLARSSL_MD_SHA1 );
+#endif
+#if defined(POLARSSL_SHA256_C)
+        case SSL_HASH_SHA224:
+            return( POLARSSL_MD_SHA224 );
+        case SSL_HASH_SHA256:
+            return( POLARSSL_MD_SHA256 );
+#endif
+#if defined(POLARSSL_SHA512_C)
+        case SSL_HASH_SHA384:
+            return( POLARSSL_MD_SHA384 );
+        case SSL_HASH_SHA512:
+            return( POLARSSL_MD_SHA512 );
+#endif
+        default:
+            return( POLARSSL_MD_NONE );
+    }
+}
+
+#if defined(POLARSSL_SSL_SET_CURVES)
+/*
+ * Check is a curve proposed by the peer is in our list.
+ * Return 1 if we're willing to use it, 0 otherwise.
+ */
+int ssl_curve_is_acceptable( const ssl_context *ssl, ecp_group_id grp_id )
+{
+    const ecp_group_id *gid;
+
+    for( gid = ssl->curve_list; *gid != POLARSSL_ECP_DP_NONE; gid++ )
+        if( *gid == grp_id )
+            return( 1 );
+
+    return( 0 );
+}
+#endif /* POLARSSL_SSL_SET_CURVES */
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+int ssl_check_cert_usage( const x509_crt *cert,
+                          const ssl_ciphersuite_t *ciphersuite,
+                          int cert_endpoint )
+{
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+    int usage = 0;
+#endif
+#if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+    const char *ext_oid;
+    size_t ext_len;
+#endif
+
+#if !defined(POLARSSL_X509_CHECK_KEY_USAGE) &&          \
+    !defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+    ((void) cert);
+    ((void) cert_endpoint);
+#endif
+
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+    if( cert_endpoint == SSL_IS_SERVER )
+    {
+        /* Server part of the key exchange */
+        switch( ciphersuite->key_exchange )
+        {
+            case POLARSSL_KEY_EXCHANGE_RSA:
+            case POLARSSL_KEY_EXCHANGE_RSA_PSK:
+                usage = KU_KEY_ENCIPHERMENT;
+                break;
+
+            case POLARSSL_KEY_EXCHANGE_DHE_RSA:
+            case POLARSSL_KEY_EXCHANGE_ECDHE_RSA:
+            case POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA:
+                usage = KU_DIGITAL_SIGNATURE;
+                break;
+
+            case POLARSSL_KEY_EXCHANGE_ECDH_RSA:
+            case POLARSSL_KEY_EXCHANGE_ECDH_ECDSA:
+                usage = KU_KEY_AGREEMENT;
+                break;
+
+            /* Don't use default: we want warnings when adding new values */
+            case POLARSSL_KEY_EXCHANGE_NONE:
+            case POLARSSL_KEY_EXCHANGE_PSK:
+            case POLARSSL_KEY_EXCHANGE_DHE_PSK:
+            case POLARSSL_KEY_EXCHANGE_ECDHE_PSK:
+                usage = 0;
+        }
+    }
+    else
+    {
+        /* Client auth: we only implement rsa_sign and ecdsa_sign for now */
+        usage = KU_DIGITAL_SIGNATURE;
+    }
+
+    if( x509_crt_check_key_usage( cert, usage ) != 0 )
+        return( -1 );
+#else
+    ((void) ciphersuite);
+#endif /* POLARSSL_X509_CHECK_KEY_USAGE */
+
+#if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+    if( cert_endpoint == SSL_IS_SERVER )
+    {
+        ext_oid = OID_SERVER_AUTH;
+        ext_len = OID_SIZE( OID_SERVER_AUTH );
+    }
+    else
+    {
+        ext_oid = OID_CLIENT_AUTH;
+        ext_len = OID_SIZE( OID_CLIENT_AUTH );
+    }
+
+    if( x509_crt_check_extended_key_usage( cert, ext_oid, ext_len ) != 0 )
+        return( -1 );
+#endif /* POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE */
+
+    return( 0 );
+}
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+
+#endif /* POLARSSL_SSL_TLS_C */
diff --git a/Externals/polarssl/library/threading.c b/Externals/polarssl/library/threading.c
new file mode 100644
index 0000000000..522c70fef7
--- /dev/null
+++ b/Externals/polarssl/library/threading.c
@@ -0,0 +1,113 @@
+/*
+ *  Threading abstraction layer
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_THREADING_C)
+
+#include "polarssl/threading.h"
+
+#if defined(POLARSSL_THREADING_PTHREAD)
+static int threading_mutex_init_pthread( threading_mutex_t *mutex )
+{
+    if( mutex == NULL )
+        return( POLARSSL_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_init( mutex, NULL ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+static int threading_mutex_free_pthread( threading_mutex_t *mutex )
+{
+    if( mutex == NULL )
+        return( POLARSSL_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_destroy( mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+static int threading_mutex_lock_pthread( threading_mutex_t *mutex )
+{
+    if( mutex == NULL )
+        return( POLARSSL_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_lock( mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+static int threading_mutex_unlock_pthread( threading_mutex_t *mutex )
+{
+    if( mutex == NULL )
+        return( POLARSSL_ERR_THREADING_BAD_INPUT_DATA );
+
+    if( pthread_mutex_unlock( mutex ) != 0 )
+        return( POLARSSL_ERR_THREADING_MUTEX_ERROR );
+
+    return( 0 );
+}
+
+int (*polarssl_mutex_init)( threading_mutex_t * ) = threading_mutex_init_pthread;
+int (*polarssl_mutex_free)( threading_mutex_t * ) = threading_mutex_free_pthread;
+int (*polarssl_mutex_lock)( threading_mutex_t * ) = threading_mutex_lock_pthread;
+int (*polarssl_mutex_unlock)( threading_mutex_t * ) = threading_mutex_unlock_pthread;
+#endif /* POLARSSL_THREADING_PTHREAD */
+
+#if defined(POLARSSL_THREADING_ALT)
+static int threading_mutex_fail( threading_mutex_t *mutex )
+{
+    ((void) mutex );
+    return( POLARSSL_ERR_THREADING_BAD_INPUT_DATA );
+}
+
+int (*polarssl_mutex_init)( threading_mutex_t * ) = threading_mutex_fail;
+int (*polarssl_mutex_free)( threading_mutex_t * ) = threading_mutex_fail;
+int (*polarssl_mutex_lock)( threading_mutex_t * ) = threading_mutex_fail;
+int (*polarssl_mutex_unlock)( threading_mutex_t * ) = threading_mutex_fail;
+
+int threading_set_alt( int (*mutex_init)( threading_mutex_t * ),
+                       int (*mutex_free)( threading_mutex_t * ),
+                       int (*mutex_lock)( threading_mutex_t * ),
+                       int (*mutex_unlock)( threading_mutex_t * ) )
+{
+    polarssl_mutex_init = mutex_init;
+    polarssl_mutex_free = mutex_free;
+    polarssl_mutex_lock = mutex_lock;
+    polarssl_mutex_unlock = mutex_unlock;
+
+    return( 0 );
+}
+#endif /* POLARSSL_THREADING_ALT_C */
+
+#endif /* POLARSSL_THREADING_C */
diff --git a/Externals/polarssl/library/timing.c b/Externals/polarssl/library/timing.c
index 0273d1af84..6c1dfa46b1 100644
--- a/Externals/polarssl/library/timing.c
+++ b/Externals/polarssl/library/timing.c
@@ -1,7 +1,7 @@
 /*
  *  Portable interface to the CPU cycle counter
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,13 +23,24 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
-#if defined(POLARSSL_TIMING_C)
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdio.h>
+#define polarssl_printf     printf
+#endif
+
+#if defined(POLARSSL_TIMING_C) && !defined(POLARSSL_TIMING_ALT)
 
 #include "polarssl/timing.h"
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 
 #include <windows.h>
 #include <winbase.h>
@@ -52,10 +63,10 @@ struct _hr_time
     struct timeval start;
 };
 
-#endif
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
-	(defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+    ( defined(_MSC_VER) && defined(_M_IX86) ) || defined(__WATCOMC__)
 
 #define POLARSSL_HAVE_HARDCLOCK
 
@@ -66,7 +77,8 @@ unsigned long hardclock( void )
     __asm   mov  [tsc], eax
     return( tsc );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          ( _MSC_VER && _M_IX86 ) || __WATCOMC__ */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
     defined(__GNUC__) && defined(__i386__)
@@ -76,26 +88,28 @@ unsigned long hardclock( void )
 unsigned long hardclock( void )
 {
     unsigned long lo, hi;
-    asm( "rdtsc" : "=a" (lo), "=d" (hi) );
+    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
     return( lo );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && __i386__ */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
-    defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
+    defined(__GNUC__) && ( defined(__amd64__) || defined(__x86_64__) )
 
 #define POLARSSL_HAVE_HARDCLOCK
 
 unsigned long hardclock( void )
 {
     unsigned long lo, hi;
-    asm( "rdtsc" : "=a" (lo), "=d" (hi) ); 
-    return( lo | (hi << 32) );
+    asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
+    return( lo | ( hi << 32 ) );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && ( __amd64__ || __x86_64__ ) */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
-    defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+    defined(__GNUC__) && ( defined(__powerpc__) || defined(__ppc__) )
 
 #define POLARSSL_HAVE_HARDCLOCK
 
@@ -105,15 +119,16 @@ unsigned long hardclock( void )
 
     do
     {
-        asm( "mftbu %0" : "=r" (tbu0) );
-        asm( "mftb  %0" : "=r" (tbl ) );
-        asm( "mftbu %0" : "=r" (tbu1) );
+        asm volatile( "mftbu %0" : "=r" (tbu0) );
+        asm volatile( "mftb  %0" : "=r" (tbl ) );
+        asm volatile( "mftbu %0" : "=r" (tbu1) );
     }
     while( tbu0 != tbu1 );
 
     return( tbl );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && ( __powerpc__ || __ppc__ ) */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
     defined(__GNUC__) && defined(__sparc64__)
@@ -126,11 +141,12 @@ unsigned long hardclock( void )
 unsigned long hardclock( void )
 {
     unsigned long tick;
-    asm( "rdpr %%tick, %0;" : "=&r" (tick) );
+    asm volatile( "rdpr %%tick, %0;" : "=&r" (tick) );
     return( tick );
 }
-#endif
-#endif
+#endif /* __OpenBSD__ */
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && __sparc64__ */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&  \
     defined(__GNUC__) && defined(__sparc__) && !defined(__sparc64__)
@@ -140,11 +156,12 @@ unsigned long hardclock( void )
 unsigned long hardclock( void )
 {
     unsigned long tick;
-    asm( ".byte 0x83, 0x41, 0x00, 0x00" );
-    asm( "mov   %%g1, %0" : "=r" (tick) );
+    asm volatile( ".byte 0x83, 0x41, 0x00, 0x00" );
+    asm volatile( "mov   %%g1, %0" : "=r" (tick) );
     return( tick );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && __sparc__ && !__sparc64__ */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&      \
     defined(__GNUC__) && defined(__alpha__)
@@ -154,10 +171,11 @@ unsigned long hardclock( void )
 unsigned long hardclock( void )
 {
     unsigned long cc;
-    asm( "rpcc %0" : "=r" (cc) );
+    asm volatile( "rpcc %0" : "=r" (cc) );
     return( cc & 0xFFFFFFFF );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && __alpha__ */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(POLARSSL_HAVE_ASM) &&      \
     defined(__GNUC__) && defined(__ia64__)
@@ -167,24 +185,26 @@ unsigned long hardclock( void )
 unsigned long hardclock( void )
 {
     unsigned long itc;
-    asm( "mov %0 = ar.itc" : "=r" (itc) );
+    asm volatile( "mov %0 = ar.itc" : "=r" (itc) );
     return( itc );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && POLARSSL_HAVE_ASM &&
+          __GNUC__ && __ia64__ */
 
-#if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(_MSC_VER)
+#if !defined(POLARSSL_HAVE_HARDCLOCK) && defined(_MSC_VER) && \
+    !defined(EFIX64) && !defined(EFI32)
 
 #define POLARSSL_HAVE_HARDCLOCK
 
 unsigned long hardclock( void )
 {
     LARGE_INTEGER offset;
-    
-	QueryPerformanceCounter( &offset );
 
-	return (unsigned long)( offset.QuadPart );
+    QueryPerformanceCounter( &offset );
+
+    return( (unsigned long)( offset.QuadPart ) );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK && _MSC_VER && !EFIX64 && !EFI32 */
 
 #if !defined(POLARSSL_HAVE_HARDCLOCK)
 
@@ -207,11 +227,11 @@ unsigned long hardclock( void )
     return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
           + ( tv_cur.tv_usec - tv_init.tv_usec ) );
 }
-#endif
+#endif /* !POLARSSL_HAVE_HARDCLOCK */
 
 volatile int alarmed = 0;
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 
 unsigned long get_timer( struct hr_time *val, int reset )
 {
@@ -233,17 +253,17 @@ unsigned long get_timer( struct hr_time *val, int reset )
 }
 
 DWORD WINAPI TimerProc( LPVOID uElapse )
-{   
+{
     Sleep( (DWORD) uElapse );
-    alarmed = 1; 
+    alarmed = 1;
     return( TRUE );
 }
 
 void set_alarm( int seconds )
-{   
+{
     DWORD ThreadId;
 
-    alarmed = 0; 
+    alarmed = 0;
     CloseHandle( CreateThread( NULL, 0, TimerProc,
         (LPVOID) ( seconds * 1000 ), 0, &ThreadId ) );
 }
@@ -253,7 +273,7 @@ void m_sleep( int milliseconds )
     Sleep( milliseconds );
 }
 
-#else
+#else /* _WIN32 && !EFIX64 && !EFI32 */
 
 unsigned long get_timer( struct hr_time *val, int reset )
 {
@@ -281,10 +301,10 @@ void m_sleep( int milliseconds )
     usleep( milliseconds * 1000 );
 }
 
-#else
+#else /* INTEGRITY */
 
 static void sighandler( int signum )
-{   
+{
     alarmed = 1;
     signal( signum, sighandler );
 }
@@ -301,12 +321,180 @@ void m_sleep( int milliseconds )
     struct timeval tv;
 
     tv.tv_sec  = milliseconds / 1000;
-    tv.tv_usec = milliseconds * 1000;
+    tv.tv_usec = ( milliseconds % 1000 ) * 1000;
 
     select( 0, NULL, NULL, NULL, &tv );
 }
 #endif /* INTEGRITY */
 
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+
+#if defined(POLARSSL_SELF_TEST)
+
+/* To test net_usleep against our functions */
+#if defined(POLARSSL_NET_C)
+#include "polarssl/net.h"
 #endif
 
-#endif
+/*
+ * Busy-waits for the given number of milliseconds.
+ * Used for testing hardclock.
+ */
+static void busy_msleep( unsigned long msec )
+{
+    struct hr_time hires;
+    unsigned long i = 0; /* for busy-waiting */
+    volatile unsigned long j; /* to prevent optimisation */
+
+    (void) get_timer( &hires, 1 );
+
+    while( get_timer( &hires, 0 ) < msec )
+        i++;
+
+    j = i;
+    (void) j;
+}
+
+/*
+ * Checkup routine
+ *
+ * Warning: this is work in progress, some tests may not be reliable enough
+ * yet! False positives may happen.
+ */
+int timing_self_test( int verbose )
+{
+    unsigned long cycles, ratio;
+    unsigned long millisecs, secs;
+    int hardfail;
+    struct hr_time hires;
+
+    if( verbose != 0 )
+        polarssl_printf( "  TIMING tests note: will take some time!\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "  TIMING test #1 (m_sleep   / get_timer): " );
+
+    for( secs = 1; secs <= 3; secs++ )
+    {
+        (void) get_timer( &hires, 1 );
+
+        m_sleep( 500 * secs );
+
+        millisecs = get_timer( &hires, 0 );
+
+        if( millisecs < 450 * secs || millisecs > 550 * secs )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "  TIMING test #2 (set_alarm / get_timer): " );
+
+    for( secs = 1; secs <= 3; secs++ )
+    {
+        (void) get_timer( &hires, 1 );
+
+        set_alarm( secs );
+        while( !alarmed )
+            ;
+
+        millisecs = get_timer( &hires, 0 );
+
+        if( millisecs < 900 * secs || millisecs > 1100 * secs )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+    if( verbose != 0 )
+        polarssl_printf( "  TIMING test #3 (hardclock / get_timer): " );
+
+    /*
+     * Allow one failure for possible counter wrapping.
+     * On a 4Ghz 32-bit machine the cycle counter wraps about once per second;
+     * since the whole test is about 10ms, it shouldn't happen twice in a row.
+     */
+    hardfail = 0;
+
+hard_test:
+    if( hardfail > 1 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    /* Get a reference ratio cycles/ms */
+    millisecs = 1;
+    cycles = hardclock();
+    busy_msleep( millisecs );
+    cycles = hardclock() - cycles;
+    ratio = cycles / millisecs;
+
+    /* Check that the ratio is mostly constant */
+    for( millisecs = 2; millisecs <= 4; millisecs++ )
+    {
+        cycles = hardclock();
+        busy_msleep( millisecs );
+        cycles = hardclock() - cycles;
+
+        /* Allow variation up to 20% */
+        if( cycles / millisecs < ratio - ratio / 5 ||
+            cycles / millisecs > ratio + ratio / 5 )
+        {
+            hardfail++;
+            goto hard_test;
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+
+#if defined(POLARSSL_NET_C)
+    if( verbose != 0 )
+        polarssl_printf( "  TIMING test #4 (net_usleep/ get_timer): " );
+
+    for( secs = 1; secs <= 3; secs++ )
+    {
+        (void) get_timer( &hires, 1 );
+
+        net_usleep( 500000 * secs );
+
+        millisecs = get_timer( &hires, 0 );
+
+        if( millisecs < 450 * secs || millisecs > 550 * secs )
+        {
+            if( verbose != 0 )
+                polarssl_printf( "failed\n" );
+
+            return( 1 );
+        }
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n" );
+#endif /* POLARSSL_NET_C */
+
+    if( verbose != 0 )
+        polarssl_printf( "\n" );
+
+    return( 0 );
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_TIMING_C && !POLARSSL_TIMING_ALT */
diff --git a/Externals/polarssl/library/version.c b/Externals/polarssl/library/version.c
index c1080b7816..c3c708a2de 100644
--- a/Externals/polarssl/library/version.c
+++ b/Externals/polarssl/library/version.c
@@ -1,7 +1,7 @@
 /*
  *  Version information
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,7 +23,11 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_VERSION_C)
 
@@ -34,17 +38,19 @@ const char version[] = POLARSSL_VERSION_STRING;
 
 unsigned int version_get_number()
 {
-    return POLARSSL_VERSION_NUMBER;
+    return( POLARSSL_VERSION_NUMBER );
 }
 
 void version_get_string( char *string )
 {
-    memcpy( string, POLARSSL_VERSION_STRING, sizeof( POLARSSL_VERSION_STRING ) );
+    memcpy( string, POLARSSL_VERSION_STRING,
+            sizeof( POLARSSL_VERSION_STRING ) );
 }
 
 void version_get_string_full( char *string )
 {
-    memcpy( string, POLARSSL_VERSION_STRING_FULL, sizeof( POLARSSL_VERSION_STRING_FULL ) );
+    memcpy( string, POLARSSL_VERSION_STRING_FULL,
+            sizeof( POLARSSL_VERSION_STRING_FULL ) );
 }
 
 #endif /* POLARSSL_VERSION_C */
diff --git a/Externals/polarssl/library/version_features.c b/Externals/polarssl/library/version_features.c
new file mode 100644
index 0000000000..10231987fa
--- /dev/null
+++ b/Externals/polarssl/library/version_features.c
@@ -0,0 +1,560 @@
+/*
+ *  Version feature information
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_VERSION_C)
+
+#include "polarssl/version.h"
+
+#include <string.h>
+
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strcasecmp _stricmp
+#endif
+
+const char *features[] = {
+#if defined(POLARSSL_VERSION_FEATURES)
+#if defined(POLARSSL_HAVE_INT8)
+    "POLARSSL_HAVE_INT8",
+#endif /* POLARSSL_HAVE_INT8 */
+#if defined(POLARSSL_HAVE_INT16)
+    "POLARSSL_HAVE_INT16",
+#endif /* POLARSSL_HAVE_INT16 */
+#if defined(POLARSSL_HAVE_LONGLONG)
+    "POLARSSL_HAVE_LONGLONG",
+#endif /* POLARSSL_HAVE_LONGLONG */
+#if defined(POLARSSL_HAVE_ASM)
+    "POLARSSL_HAVE_ASM",
+#endif /* POLARSSL_HAVE_ASM */
+#if defined(POLARSSL_HAVE_SSE2)
+    "POLARSSL_HAVE_SSE2",
+#endif /* POLARSSL_HAVE_SSE2 */
+#if defined(POLARSSL_HAVE_TIME)
+    "POLARSSL_HAVE_TIME",
+#endif /* POLARSSL_HAVE_TIME */
+#if defined(POLARSSL_HAVE_IPV6)
+    "POLARSSL_HAVE_IPV6",
+#endif /* POLARSSL_HAVE_IPV6 */
+#if defined(POLARSSL_PLATFORM_MEMORY)
+    "POLARSSL_PLATFORM_MEMORY",
+#endif /* POLARSSL_PLATFORM_MEMORY */
+#if defined(POLARSSL_PLATFORM_NO_STD_FUNCTIONS)
+    "POLARSSL_PLATFORM_NO_STD_FUNCTIONS",
+#endif /* POLARSSL_PLATFORM_NO_STD_FUNCTIONS */
+#if defined(POLARSSL_PLATFORM_PRINTF_ALT)
+    "POLARSSL_PLATFORM_PRINTF_ALT",
+#endif /* POLARSSL_PLATFORM_PRINTF_ALT */
+#if defined(POLARSSL_PLATFORM_FPRINTF_ALT)
+    "POLARSSL_PLATFORM_FPRINTF_ALT",
+#endif /* POLARSSL_PLATFORM_FPRINTF_ALT */
+#if defined(POLARSSL_TIMING_ALT)
+    "POLARSSL_TIMING_ALT",
+#endif /* POLARSSL_TIMING_ALT */
+#if defined(POLARSSL_AES_ALT)
+    "POLARSSL_AES_ALT",
+#endif /* POLARSSL_AES_ALT */
+#if defined(POLARSSL_ARC4_ALT)
+    "POLARSSL_ARC4_ALT",
+#endif /* POLARSSL_ARC4_ALT */
+#if defined(POLARSSL_BLOWFISH_ALT)
+    "POLARSSL_BLOWFISH_ALT",
+#endif /* POLARSSL_BLOWFISH_ALT */
+#if defined(POLARSSL_CAMELLIA_ALT)
+    "POLARSSL_CAMELLIA_ALT",
+#endif /* POLARSSL_CAMELLIA_ALT */
+#if defined(POLARSSL_DES_ALT)
+    "POLARSSL_DES_ALT",
+#endif /* POLARSSL_DES_ALT */
+#if defined(POLARSSL_XTEA_ALT)
+    "POLARSSL_XTEA_ALT",
+#endif /* POLARSSL_XTEA_ALT */
+#if defined(POLARSSL_MD2_ALT)
+    "POLARSSL_MD2_ALT",
+#endif /* POLARSSL_MD2_ALT */
+#if defined(POLARSSL_MD4_ALT)
+    "POLARSSL_MD4_ALT",
+#endif /* POLARSSL_MD4_ALT */
+#if defined(POLARSSL_MD5_ALT)
+    "POLARSSL_MD5_ALT",
+#endif /* POLARSSL_MD5_ALT */
+#if defined(POLARSSL_RIPEMD160_ALT)
+    "POLARSSL_RIPEMD160_ALT",
+#endif /* POLARSSL_RIPEMD160_ALT */
+#if defined(POLARSSL_SHA1_ALT)
+    "POLARSSL_SHA1_ALT",
+#endif /* POLARSSL_SHA1_ALT */
+#if defined(POLARSSL_SHA256_ALT)
+    "POLARSSL_SHA256_ALT",
+#endif /* POLARSSL_SHA256_ALT */
+#if defined(POLARSSL_SHA512_ALT)
+    "POLARSSL_SHA512_ALT",
+#endif /* POLARSSL_SHA512_ALT */
+#if defined(POLARSSL_AES_ROM_TABLES)
+    "POLARSSL_AES_ROM_TABLES",
+#endif /* POLARSSL_AES_ROM_TABLES */
+#if defined(POLARSSL_CIPHER_MODE_CBC)
+    "POLARSSL_CIPHER_MODE_CBC",
+#endif /* POLARSSL_CIPHER_MODE_CBC */
+#if defined(POLARSSL_CIPHER_MODE_CFB)
+    "POLARSSL_CIPHER_MODE_CFB",
+#endif /* POLARSSL_CIPHER_MODE_CFB */
+#if defined(POLARSSL_CIPHER_MODE_CTR)
+    "POLARSSL_CIPHER_MODE_CTR",
+#endif /* POLARSSL_CIPHER_MODE_CTR */
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+    "POLARSSL_CIPHER_NULL_CIPHER",
+#endif /* POLARSSL_CIPHER_NULL_CIPHER */
+#if defined(POLARSSL_CIPHER_PADDING_PKCS7)
+    "POLARSSL_CIPHER_PADDING_PKCS7",
+#endif /* POLARSSL_CIPHER_PADDING_PKCS7 */
+#if defined(POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS)
+    "POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS",
+#endif /* POLARSSL_CIPHER_PADDING_ONE_AND_ZEROS */
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN)
+    "POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN",
+#endif /* POLARSSL_CIPHER_PADDING_ZEROS_AND_LEN */
+#if defined(POLARSSL_CIPHER_PADDING_ZEROS)
+    "POLARSSL_CIPHER_PADDING_ZEROS",
+#endif /* POLARSSL_CIPHER_PADDING_ZEROS */
+#if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES)
+    "POLARSSL_ENABLE_WEAK_CIPHERSUITES",
+#endif /* POLARSSL_ENABLE_WEAK_CIPHERSUITES */
+#if defined(POLARSSL_REMOVE_ARC4_CIPHERSUITES)
+    "POLARSSL_REMOVE_ARC4_CIPHERSUITES",
+#endif /* POLARSSL_REMOVE_ARC4_CIPHERSUITES */
+#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
+    "POLARSSL_ECP_DP_SECP192R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
+    "POLARSSL_ECP_DP_SECP224R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP224R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
+    "POLARSSL_ECP_DP_SECP256R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP256R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
+    "POLARSSL_ECP_DP_SECP384R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP384R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
+    "POLARSSL_ECP_DP_SECP521R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP521R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP192K1_ENABLED)
+    "POLARSSL_ECP_DP_SECP192K1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP192K1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP224K1_ENABLED)
+    "POLARSSL_ECP_DP_SECP224K1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP224K1_ENABLED */
+#if defined(POLARSSL_ECP_DP_SECP256K1_ENABLED)
+    "POLARSSL_ECP_DP_SECP256K1_ENABLED",
+#endif /* POLARSSL_ECP_DP_SECP256K1_ENABLED */
+#if defined(POLARSSL_ECP_DP_BP256R1_ENABLED)
+    "POLARSSL_ECP_DP_BP256R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_BP256R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_BP384R1_ENABLED)
+    "POLARSSL_ECP_DP_BP384R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_BP384R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_BP512R1_ENABLED)
+    "POLARSSL_ECP_DP_BP512R1_ENABLED",
+#endif /* POLARSSL_ECP_DP_BP512R1_ENABLED */
+#if defined(POLARSSL_ECP_DP_M221_ENABLED)
+    "POLARSSL_ECP_DP_M221_ENABLED",
+#endif /* POLARSSL_ECP_DP_M221_ENABLED */
+#if defined(POLARSSL_ECP_DP_M255_ENABLED)
+    "POLARSSL_ECP_DP_M255_ENABLED",
+#endif /* POLARSSL_ECP_DP_M255_ENABLED */
+#if defined(POLARSSL_ECP_DP_M383_ENABLED)
+    "POLARSSL_ECP_DP_M383_ENABLED",
+#endif /* POLARSSL_ECP_DP_M383_ENABLED */
+#if defined(POLARSSL_ECP_DP_M511_ENABLED)
+    "POLARSSL_ECP_DP_M511_ENABLED",
+#endif /* POLARSSL_ECP_DP_M511_ENABLED */
+#if defined(POLARSSL_ECP_NIST_OPTIM)
+    "POLARSSL_ECP_NIST_OPTIM",
+#endif /* POLARSSL_ECP_NIST_OPTIM */
+#if defined(POLARSSL_ECDSA_DETERMINISTIC)
+    "POLARSSL_ECDSA_DETERMINISTIC",
+#endif /* POLARSSL_ECDSA_DETERMINISTIC */
+#if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_PSK_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_RSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */
+#if defined(POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED)
+    "POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED",
+#endif /* POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED */
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
+    "POLARSSL_PK_PARSE_EC_EXTENDED",
+#endif /* POLARSSL_PK_PARSE_EC_EXTENDED */
+#if defined(POLARSSL_ERROR_STRERROR_BC)
+    "POLARSSL_ERROR_STRERROR_BC",
+#endif /* POLARSSL_ERROR_STRERROR_BC */
+#if defined(POLARSSL_ERROR_STRERROR_DUMMY)
+    "POLARSSL_ERROR_STRERROR_DUMMY",
+#endif /* POLARSSL_ERROR_STRERROR_DUMMY */
+#if defined(POLARSSL_GENPRIME)
+    "POLARSSL_GENPRIME",
+#endif /* POLARSSL_GENPRIME */
+#if defined(POLARSSL_FS_IO)
+    "POLARSSL_FS_IO",
+#endif /* POLARSSL_FS_IO */
+#if defined(POLARSSL_NO_DEFAULT_ENTROPY_SOURCES)
+    "POLARSSL_NO_DEFAULT_ENTROPY_SOURCES",
+#endif /* POLARSSL_NO_DEFAULT_ENTROPY_SOURCES */
+#if defined(POLARSSL_NO_PLATFORM_ENTROPY)
+    "POLARSSL_NO_PLATFORM_ENTROPY",
+#endif /* POLARSSL_NO_PLATFORM_ENTROPY */
+#if defined(POLARSSL_ENTROPY_FORCE_SHA256)
+    "POLARSSL_ENTROPY_FORCE_SHA256",
+#endif /* POLARSSL_ENTROPY_FORCE_SHA256 */
+#if defined(POLARSSL_MEMORY_DEBUG)
+    "POLARSSL_MEMORY_DEBUG",
+#endif /* POLARSSL_MEMORY_DEBUG */
+#if defined(POLARSSL_MEMORY_BACKTRACE)
+    "POLARSSL_MEMORY_BACKTRACE",
+#endif /* POLARSSL_MEMORY_BACKTRACE */
+#if defined(POLARSSL_PKCS1_V15)
+    "POLARSSL_PKCS1_V15",
+#endif /* POLARSSL_PKCS1_V15 */
+#if defined(POLARSSL_PKCS1_V21)
+    "POLARSSL_PKCS1_V21",
+#endif /* POLARSSL_PKCS1_V21 */
+#if defined(POLARSSL_RSA_NO_CRT)
+    "POLARSSL_RSA_NO_CRT",
+#endif /* POLARSSL_RSA_NO_CRT */
+#if defined(POLARSSL_SELF_TEST)
+    "POLARSSL_SELF_TEST",
+#endif /* POLARSSL_SELF_TEST */
+#if defined(POLARSSL_SSL_ALERT_MESSAGES)
+    "POLARSSL_SSL_ALERT_MESSAGES",
+#endif /* POLARSSL_SSL_ALERT_MESSAGES */
+#if defined(POLARSSL_SSL_DEBUG_ALL)
+    "POLARSSL_SSL_DEBUG_ALL",
+#endif /* POLARSSL_SSL_DEBUG_ALL */
+#if defined(POLARSSL_SSL_HW_RECORD_ACCEL)
+    "POLARSSL_SSL_HW_RECORD_ACCEL",
+#endif /* POLARSSL_SSL_HW_RECORD_ACCEL */
+#if defined(POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO)
+    "POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO",
+#endif /* POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO */
+#if defined(POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE)
+    "POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE",
+#endif /* POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE */
+#if defined(POLARSSL_SSL_MAX_FRAGMENT_LENGTH)
+    "POLARSSL_SSL_MAX_FRAGMENT_LENGTH",
+#endif /* POLARSSL_SSL_MAX_FRAGMENT_LENGTH */
+#if defined(POLARSSL_SSL_PROTO_SSL3)
+    "POLARSSL_SSL_PROTO_SSL3",
+#endif /* POLARSSL_SSL_PROTO_SSL3 */
+#if defined(POLARSSL_SSL_PROTO_TLS1)
+    "POLARSSL_SSL_PROTO_TLS1",
+#endif /* POLARSSL_SSL_PROTO_TLS1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1_1)
+    "POLARSSL_SSL_PROTO_TLS1_1",
+#endif /* POLARSSL_SSL_PROTO_TLS1_1 */
+#if defined(POLARSSL_SSL_PROTO_TLS1_2)
+    "POLARSSL_SSL_PROTO_TLS1_2",
+#endif /* POLARSSL_SSL_PROTO_TLS1_2 */
+#if defined(POLARSSL_SSL_ALPN)
+    "POLARSSL_SSL_ALPN",
+#endif /* POLARSSL_SSL_ALPN */
+#if defined(POLARSSL_SSL_SESSION_TICKETS)
+    "POLARSSL_SSL_SESSION_TICKETS",
+#endif /* POLARSSL_SSL_SESSION_TICKETS */
+#if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
+    "POLARSSL_SSL_SERVER_NAME_INDICATION",
+#endif /* POLARSSL_SSL_SERVER_NAME_INDICATION */
+#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
+    "POLARSSL_SSL_TRUNCATED_HMAC",
+#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
+#if defined(POLARSSL_SSL_SET_CURVES)
+    "POLARSSL_SSL_SET_CURVES",
+#endif /* POLARSSL_SSL_SET_CURVES */
+#if defined(POLARSSL_THREADING_ALT)
+    "POLARSSL_THREADING_ALT",
+#endif /* POLARSSL_THREADING_ALT */
+#if defined(POLARSSL_THREADING_PTHREAD)
+    "POLARSSL_THREADING_PTHREAD",
+#endif /* POLARSSL_THREADING_PTHREAD */
+#if defined(POLARSSL_VERSION_FEATURES)
+    "POLARSSL_VERSION_FEATURES",
+#endif /* POLARSSL_VERSION_FEATURES */
+#if defined(POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3)
+    "POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3",
+#endif /* POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3 */
+#if defined(POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
+    "POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION",
+#endif /* POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION */
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+    "POLARSSL_X509_CHECK_KEY_USAGE",
+#endif /* POLARSSL_X509_CHECK_KEY_USAGE */
+#if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+    "POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE",
+#endif /* POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE */
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+    "POLARSSL_X509_RSASSA_PSS_SUPPORT",
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
+#if defined(POLARSSL_ZLIB_SUPPORT)
+    "POLARSSL_ZLIB_SUPPORT",
+#endif /* POLARSSL_ZLIB_SUPPORT */
+#if defined(POLARSSL_AESNI_C)
+    "POLARSSL_AESNI_C",
+#endif /* POLARSSL_AESNI_C */
+#if defined(POLARSSL_AES_C)
+    "POLARSSL_AES_C",
+#endif /* POLARSSL_AES_C */
+#if defined(POLARSSL_ARC4_C)
+    "POLARSSL_ARC4_C",
+#endif /* POLARSSL_ARC4_C */
+#if defined(POLARSSL_ASN1_PARSE_C)
+    "POLARSSL_ASN1_PARSE_C",
+#endif /* POLARSSL_ASN1_PARSE_C */
+#if defined(POLARSSL_ASN1_WRITE_C)
+    "POLARSSL_ASN1_WRITE_C",
+#endif /* POLARSSL_ASN1_WRITE_C */
+#if defined(POLARSSL_BASE64_C)
+    "POLARSSL_BASE64_C",
+#endif /* POLARSSL_BASE64_C */
+#if defined(POLARSSL_BIGNUM_C)
+    "POLARSSL_BIGNUM_C",
+#endif /* POLARSSL_BIGNUM_C */
+#if defined(POLARSSL_BLOWFISH_C)
+    "POLARSSL_BLOWFISH_C",
+#endif /* POLARSSL_BLOWFISH_C */
+#if defined(POLARSSL_CAMELLIA_C)
+    "POLARSSL_CAMELLIA_C",
+#endif /* POLARSSL_CAMELLIA_C */
+#if defined(POLARSSL_CCM_C)
+    "POLARSSL_CCM_C",
+#endif /* POLARSSL_CCM_C */
+#if defined(POLARSSL_CERTS_C)
+    "POLARSSL_CERTS_C",
+#endif /* POLARSSL_CERTS_C */
+#if defined(POLARSSL_CIPHER_C)
+    "POLARSSL_CIPHER_C",
+#endif /* POLARSSL_CIPHER_C */
+#if defined(POLARSSL_CTR_DRBG_C)
+    "POLARSSL_CTR_DRBG_C",
+#endif /* POLARSSL_CTR_DRBG_C */
+#if defined(POLARSSL_DEBUG_C)
+    "POLARSSL_DEBUG_C",
+#endif /* POLARSSL_DEBUG_C */
+#if defined(POLARSSL_DES_C)
+    "POLARSSL_DES_C",
+#endif /* POLARSSL_DES_C */
+#if defined(POLARSSL_DHM_C)
+    "POLARSSL_DHM_C",
+#endif /* POLARSSL_DHM_C */
+#if defined(POLARSSL_ECDH_C)
+    "POLARSSL_ECDH_C",
+#endif /* POLARSSL_ECDH_C */
+#if defined(POLARSSL_ECDSA_C)
+    "POLARSSL_ECDSA_C",
+#endif /* POLARSSL_ECDSA_C */
+#if defined(POLARSSL_ECP_C)
+    "POLARSSL_ECP_C",
+#endif /* POLARSSL_ECP_C */
+#if defined(POLARSSL_ENTROPY_C)
+    "POLARSSL_ENTROPY_C",
+#endif /* POLARSSL_ENTROPY_C */
+#if defined(POLARSSL_ERROR_C)
+    "POLARSSL_ERROR_C",
+#endif /* POLARSSL_ERROR_C */
+#if defined(POLARSSL_GCM_C)
+    "POLARSSL_GCM_C",
+#endif /* POLARSSL_GCM_C */
+#if defined(POLARSSL_HAVEGE_C)
+    "POLARSSL_HAVEGE_C",
+#endif /* POLARSSL_HAVEGE_C */
+#if defined(POLARSSL_HMAC_DRBG_C)
+    "POLARSSL_HMAC_DRBG_C",
+#endif /* POLARSSL_HMAC_DRBG_C */
+#if defined(POLARSSL_MD_C)
+    "POLARSSL_MD_C",
+#endif /* POLARSSL_MD_C */
+#if defined(POLARSSL_MD2_C)
+    "POLARSSL_MD2_C",
+#endif /* POLARSSL_MD2_C */
+#if defined(POLARSSL_MD4_C)
+    "POLARSSL_MD4_C",
+#endif /* POLARSSL_MD4_C */
+#if defined(POLARSSL_MD5_C)
+    "POLARSSL_MD5_C",
+#endif /* POLARSSL_MD5_C */
+#if defined(POLARSSL_MEMORY_C)
+    "POLARSSL_MEMORY_C",
+#endif /* POLARSSL_MEMORY_C */
+#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
+    "POLARSSL_MEMORY_BUFFER_ALLOC_C",
+#endif /* POLARSSL_MEMORY_BUFFER_ALLOC_C */
+#if defined(POLARSSL_NET_C)
+    "POLARSSL_NET_C",
+#endif /* POLARSSL_NET_C */
+#if defined(POLARSSL_OID_C)
+    "POLARSSL_OID_C",
+#endif /* POLARSSL_OID_C */
+#if defined(POLARSSL_PADLOCK_C)
+    "POLARSSL_PADLOCK_C",
+#endif /* POLARSSL_PADLOCK_C */
+#if defined(POLARSSL_PBKDF2_C)
+    "POLARSSL_PBKDF2_C",
+#endif /* POLARSSL_PBKDF2_C */
+#if defined(POLARSSL_PEM_PARSE_C)
+    "POLARSSL_PEM_PARSE_C",
+#endif /* POLARSSL_PEM_PARSE_C */
+#if defined(POLARSSL_PEM_WRITE_C)
+    "POLARSSL_PEM_WRITE_C",
+#endif /* POLARSSL_PEM_WRITE_C */
+#if defined(POLARSSL_PK_C)
+    "POLARSSL_PK_C",
+#endif /* POLARSSL_PK_C */
+#if defined(POLARSSL_PK_PARSE_C)
+    "POLARSSL_PK_PARSE_C",
+#endif /* POLARSSL_PK_PARSE_C */
+#if defined(POLARSSL_PK_WRITE_C)
+    "POLARSSL_PK_WRITE_C",
+#endif /* POLARSSL_PK_WRITE_C */
+#if defined(POLARSSL_PKCS5_C)
+    "POLARSSL_PKCS5_C",
+#endif /* POLARSSL_PKCS5_C */
+#if defined(POLARSSL_PKCS11_C)
+    "POLARSSL_PKCS11_C",
+#endif /* POLARSSL_PKCS11_C */
+#if defined(POLARSSL_PKCS12_C)
+    "POLARSSL_PKCS12_C",
+#endif /* POLARSSL_PKCS12_C */
+#if defined(POLARSSL_PLATFORM_C)
+    "POLARSSL_PLATFORM_C",
+#endif /* POLARSSL_PLATFORM_C */
+#if defined(POLARSSL_RIPEMD160_C)
+    "POLARSSL_RIPEMD160_C",
+#endif /* POLARSSL_RIPEMD160_C */
+#if defined(POLARSSL_RSA_C)
+    "POLARSSL_RSA_C",
+#endif /* POLARSSL_RSA_C */
+#if defined(POLARSSL_SHA1_C)
+    "POLARSSL_SHA1_C",
+#endif /* POLARSSL_SHA1_C */
+#if defined(POLARSSL_SHA256_C)
+    "POLARSSL_SHA256_C",
+#endif /* POLARSSL_SHA256_C */
+#if defined(POLARSSL_SHA512_C)
+    "POLARSSL_SHA512_C",
+#endif /* POLARSSL_SHA512_C */
+#if defined(POLARSSL_SSL_CACHE_C)
+    "POLARSSL_SSL_CACHE_C",
+#endif /* POLARSSL_SSL_CACHE_C */
+#if defined(POLARSSL_SSL_CLI_C)
+    "POLARSSL_SSL_CLI_C",
+#endif /* POLARSSL_SSL_CLI_C */
+#if defined(POLARSSL_SSL_SRV_C)
+    "POLARSSL_SSL_SRV_C",
+#endif /* POLARSSL_SSL_SRV_C */
+#if defined(POLARSSL_SSL_TLS_C)
+    "POLARSSL_SSL_TLS_C",
+#endif /* POLARSSL_SSL_TLS_C */
+#if defined(POLARSSL_THREADING_C)
+    "POLARSSL_THREADING_C",
+#endif /* POLARSSL_THREADING_C */
+#if defined(POLARSSL_TIMING_C)
+    "POLARSSL_TIMING_C",
+#endif /* POLARSSL_TIMING_C */
+#if defined(POLARSSL_VERSION_C)
+    "POLARSSL_VERSION_C",
+#endif /* POLARSSL_VERSION_C */
+#if defined(POLARSSL_X509_USE_C)
+    "POLARSSL_X509_USE_C",
+#endif /* POLARSSL_X509_USE_C */
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+    "POLARSSL_X509_CRT_PARSE_C",
+#endif /* POLARSSL_X509_CRT_PARSE_C */
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+    "POLARSSL_X509_CRL_PARSE_C",
+#endif /* POLARSSL_X509_CRL_PARSE_C */
+#if defined(POLARSSL_X509_CSR_PARSE_C)
+    "POLARSSL_X509_CSR_PARSE_C",
+#endif /* POLARSSL_X509_CSR_PARSE_C */
+#if defined(POLARSSL_X509_CREATE_C)
+    "POLARSSL_X509_CREATE_C",
+#endif /* POLARSSL_X509_CREATE_C */
+#if defined(POLARSSL_X509_CRT_WRITE_C)
+    "POLARSSL_X509_CRT_WRITE_C",
+#endif /* POLARSSL_X509_CRT_WRITE_C */
+#if defined(POLARSSL_X509_CSR_WRITE_C)
+    "POLARSSL_X509_CSR_WRITE_C",
+#endif /* POLARSSL_X509_CSR_WRITE_C */
+#if defined(POLARSSL_XTEA_C)
+    "POLARSSL_XTEA_C",
+#endif /* POLARSSL_XTEA_C */
+#endif /* POLARSSL_VERSION_FEATURES */
+    NULL
+};
+
+int version_check_feature( const char *feature )
+{
+    const char **idx = features;
+
+    if( *idx == NULL )
+        return( -2 );
+
+    if( feature == NULL )
+        return( -1 );
+
+    while( *idx != NULL )
+    {
+        if( !strcasecmp( *idx, feature ) )
+            return( 0 );
+        idx++;
+    }
+    return( -1 );
+}
+
+#endif /* POLARSSL_VERSION_C */
diff --git a/Externals/polarssl/library/x509.c b/Externals/polarssl/library/x509.c
new file mode 100644
index 0000000000..17c7a7db04
--- /dev/null
+++ b/Externals/polarssl/library/x509.c
@@ -0,0 +1,1102 @@
+/*
+ *  X.509 common functions for parsing and verification
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_USE_C)
+
+#include "polarssl/x509.h"
+#include "polarssl/asn1.h"
+#include "polarssl/oid.h"
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf     printf
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#include <windows.h>
+#else
+#include <time.h>
+#endif
+
+#if defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_FS_IO)
+#include <stdio.h>
+#if !defined(_WIN32)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#endif
+#endif
+
+/*
+ *  CertificateSerialNumber  ::=  INTEGER
+ */
+int x509_get_serial( unsigned char **p, const unsigned char *end,
+                     x509_buf *serial )
+{
+    int ret;
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_X509_INVALID_SERIAL +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    if( **p != ( ASN1_CONTEXT_SPECIFIC | ASN1_PRIMITIVE | 2 ) &&
+        **p !=   ASN1_INTEGER )
+        return( POLARSSL_ERR_X509_INVALID_SERIAL +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+    serial->tag = *(*p)++;
+
+    if( ( ret = asn1_get_len( p, end, &serial->len ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_SERIAL + ret );
+
+    serial->p = *p;
+    *p += serial->len;
+
+    return( 0 );
+}
+
+/* Get an algorithm identifier without parameters (eg for signatures)
+ *
+ *  AlgorithmIdentifier  ::=  SEQUENCE  {
+ *       algorithm               OBJECT IDENTIFIER,
+ *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ */
+int x509_get_alg_null( unsigned char **p, const unsigned char *end,
+                       x509_buf *alg )
+{
+    int ret;
+
+    if( ( ret = asn1_get_alg_null( p, end, alg ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    return( 0 );
+}
+
+/*
+ * Parse an algorithm identifier with (optional) paramaters
+ */
+int x509_get_alg( unsigned char **p, const unsigned char *end,
+                  x509_buf *alg, x509_buf *params )
+{
+    int ret;
+
+    if( ( ret = asn1_get_alg( p, end, alg, params ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+/*
+ * HashAlgorithm ::= AlgorithmIdentifier
+ *
+ * AlgorithmIdentifier  ::=  SEQUENCE  {
+ *      algorithm               OBJECT IDENTIFIER,
+ *      parameters              ANY DEFINED BY algorithm OPTIONAL  }
+ *
+ * For HashAlgorithm, parameters MUST be NULL or absent.
+ */
+static int x509_get_hash_alg( const x509_buf *alg, md_type_t *md_alg )
+{
+    int ret;
+    unsigned char *p;
+    const unsigned char *end;
+    x509_buf md_oid;
+    size_t len;
+
+    /* Make sure we got a SEQUENCE and setup bounds */
+    if( alg->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+        return( POLARSSL_ERR_X509_INVALID_ALG +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+    p = (unsigned char *) alg->p;
+    end = p + alg->len;
+
+    if( p >= end )
+        return( POLARSSL_ERR_X509_INVALID_ALG +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    /* Parse md_oid */
+    md_oid.tag = *p;
+
+    if( ( ret = asn1_get_tag( &p, end, &md_oid.len, ASN1_OID ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    md_oid.p = p;
+    p += md_oid.len;
+
+    /* Get md_alg from md_oid */
+    if( ( ret = oid_get_md_alg( &md_oid, md_alg ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    /* Make sure params is absent of NULL */
+    if( p == end )
+        return( 0 );
+
+    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_NULL ) ) != 0 || len != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    if( p != end )
+        return( POLARSSL_ERR_X509_INVALID_ALG +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ *    RSASSA-PSS-params  ::=  SEQUENCE  {
+ *       hashAlgorithm     [0] HashAlgorithm DEFAULT sha1Identifier,
+ *       maskGenAlgorithm  [1] MaskGenAlgorithm DEFAULT mgf1SHA1Identifier,
+ *       saltLength        [2] INTEGER DEFAULT 20,
+ *       trailerField      [3] INTEGER DEFAULT 1  }
+ *    -- Note that the tags in this Sequence are explicit.
+ *
+ * RFC 4055 (which defines use of RSASSA-PSS in PKIX) states that the value
+ * of trailerField MUST be 1, and PKCS#1 v2.2 doesn't even define any other
+ * option. Enfore this at parsing time.
+ */
+int x509_get_rsassa_pss_params( const x509_buf *params,
+                                md_type_t *md_alg, md_type_t *mgf_md,
+                                int *salt_len )
+{
+    int ret;
+    unsigned char *p;
+    const unsigned char *end, *end2;
+    size_t len;
+    x509_buf alg_id, alg_params;
+
+    /* First set everything to defaults */
+    *md_alg = POLARSSL_MD_SHA1;
+    *mgf_md = POLARSSL_MD_SHA1;
+    *salt_len = 20;
+
+    /* Make sure params is a SEQUENCE and setup bounds */
+    if( params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+        return( POLARSSL_ERR_X509_INVALID_ALG +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+    p = (unsigned char *) params->p;
+    end = p + params->len;
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * HashAlgorithm
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 0 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        /* HashAlgorithm ::= AlgorithmIdentifier (without parameters) */
+        if( ( ret = x509_get_alg_null( &p, end2, &alg_id ) ) != 0 )
+            return( ret );
+
+        if( ( ret = oid_get_md_alg( &alg_id, md_alg ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( POLARSSL_ERR_X509_INVALID_ALG +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * MaskGenAlgorithm
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 1 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        /* MaskGenAlgorithm ::= AlgorithmIdentifier (params = HashAlgorithm) */
+        if( ( ret = x509_get_alg( &p, end2, &alg_id, &alg_params ) ) != 0 )
+            return( ret );
+
+        /* Only MFG1 is recognised for now */
+        if( ! OID_CMP( OID_MGF1, &alg_id ) )
+            return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE +
+                    POLARSSL_ERR_OID_NOT_FOUND );
+
+        /* Parse HashAlgorithm */
+        if( ( ret = x509_get_hash_alg( &alg_params, mgf_md ) ) != 0 )
+            return( ret );
+
+        if( p != end2 )
+            return( POLARSSL_ERR_X509_INVALID_ALG +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * salt_len
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 2 ) ) == 0 )
+    {
+        end2 = p + len;
+
+        if( ( ret = asn1_get_int( &p, end2, salt_len ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( POLARSSL_ERR_X509_INVALID_ALG +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    if( p == end )
+        return( 0 );
+
+    /*
+     * trailer_field (if present, must be 1)
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+                    ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 3 ) ) == 0 )
+    {
+        int trailer_field;
+
+        end2 = p + len;
+
+        if( ( ret = asn1_get_int( &p, end2, &trailer_field ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+        if( p != end2 )
+            return( POLARSSL_ERR_X509_INVALID_ALG +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+        if( trailer_field != 1 )
+            return( POLARSSL_ERR_X509_INVALID_ALG );
+    }
+    else if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        return( POLARSSL_ERR_X509_INVALID_ALG + ret );
+
+    if( p != end )
+        return( POLARSSL_ERR_X509_INVALID_ALG +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
+
+/*
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ *
+ *  AttributeType ::= OBJECT IDENTIFIER
+ *
+ *  AttributeValue ::= ANY DEFINED BY AttributeType
+ */
+static int x509_get_attr_type_value( unsigned char **p,
+                                     const unsigned char *end,
+                                     x509_name *cur )
+{
+    int ret;
+    size_t len;
+    x509_buf *oid;
+    x509_buf *val;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_NAME + ret );
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_X509_INVALID_NAME +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    oid = &cur->oid;
+    oid->tag = **p;
+
+    if( ( ret = asn1_get_tag( p, end, &oid->len, ASN1_OID ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_NAME + ret );
+
+    oid->p = *p;
+    *p += oid->len;
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_X509_INVALID_NAME +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    if( **p != ASN1_BMP_STRING && **p != ASN1_UTF8_STRING      &&
+        **p != ASN1_T61_STRING && **p != ASN1_PRINTABLE_STRING &&
+        **p != ASN1_IA5_STRING && **p != ASN1_UNIVERSAL_STRING )
+        return( POLARSSL_ERR_X509_INVALID_NAME +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+    val = &cur->val;
+    val->tag = *(*p)++;
+
+    if( ( ret = asn1_get_len( p, end, &val->len ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_NAME + ret );
+
+    val->p = *p;
+    *p += val->len;
+
+    cur->next = NULL;
+
+    return( 0 );
+}
+
+/*
+ *  RelativeDistinguishedName ::=
+ *    SET OF AttributeTypeAndValue
+ *
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ *
+ *  AttributeType ::= OBJECT IDENTIFIER
+ *
+ *  AttributeValue ::= ANY DEFINED BY AttributeType
+ */
+int x509_get_name( unsigned char **p, const unsigned char *end,
+                   x509_name *cur )
+{
+    int ret;
+    size_t len;
+    const unsigned char *end2;
+    x509_name *use;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SET ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_NAME + ret );
+
+    end2 = end;
+    end  = *p + len;
+    use = cur;
+
+    do
+    {
+        if( ( ret = x509_get_attr_type_value( p, end, use ) ) != 0 )
+            return( ret );
+
+        if( *p != end )
+        {
+            use->next = (x509_name *) polarssl_malloc(
+                    sizeof( x509_name ) );
+
+            if( use->next == NULL )
+                return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+            memset( use->next, 0, sizeof( x509_name ) );
+
+            use = use->next;
+        }
+    }
+    while( *p != end );
+
+    /*
+     * recurse until end of SEQUENCE is reached
+     */
+    if( *p == end2 )
+        return( 0 );
+
+    cur->next = (x509_name *) polarssl_malloc(
+         sizeof( x509_name ) );
+
+    if( cur->next == NULL )
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+    memset( cur->next, 0, sizeof( x509_name ) );
+
+    return( x509_get_name( p, end2, cur->next ) );
+}
+
+/*
+ *  Time ::= CHOICE {
+ *       utcTime        UTCTime,
+ *       generalTime    GeneralizedTime }
+ */
+int x509_get_time( unsigned char **p, const unsigned char *end,
+                   x509_time *time )
+{
+    int ret;
+    size_t len;
+    char date[64];
+    unsigned char tag;
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_X509_INVALID_DATE +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    tag = **p;
+
+    if( tag == ASN1_UTC_TIME )
+    {
+        (*p)++;
+        ret = asn1_get_len( p, end, &len );
+
+        if( ret != 0 )
+            return( POLARSSL_ERR_X509_INVALID_DATE + ret );
+
+        memset( date,  0, sizeof( date ) );
+        memcpy( date, *p, ( len < sizeof( date ) - 1 ) ?
+                len : sizeof( date ) - 1 );
+
+        if( sscanf( date, "%2d%2d%2d%2d%2d%2dZ",
+                    &time->year, &time->mon, &time->day,
+                    &time->hour, &time->min, &time->sec ) < 5 )
+            return( POLARSSL_ERR_X509_INVALID_DATE );
+
+        time->year +=  100 * ( time->year < 50 );
+        time->year += 1900;
+
+        *p += len;
+
+        return( 0 );
+    }
+    else if( tag == ASN1_GENERALIZED_TIME )
+    {
+        (*p)++;
+        ret = asn1_get_len( p, end, &len );
+
+        if( ret != 0 )
+            return( POLARSSL_ERR_X509_INVALID_DATE + ret );
+
+        memset( date,  0, sizeof( date ) );
+        memcpy( date, *p, ( len < sizeof( date ) - 1 ) ?
+                len : sizeof( date ) - 1 );
+
+        if( sscanf( date, "%4d%2d%2d%2d%2d%2dZ",
+                    &time->year, &time->mon, &time->day,
+                    &time->hour, &time->min, &time->sec ) < 5 )
+            return( POLARSSL_ERR_X509_INVALID_DATE );
+
+        *p += len;
+
+        return( 0 );
+    }
+    else
+        return( POLARSSL_ERR_X509_INVALID_DATE +
+                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+}
+
+int x509_get_sig( unsigned char **p, const unsigned char *end, x509_buf *sig )
+{
+    int ret;
+    size_t len;
+
+    if( ( end - *p ) < 1 )
+        return( POLARSSL_ERR_X509_INVALID_SIGNATURE +
+                POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+    sig->tag = **p;
+
+    if( ( ret = asn1_get_bitstring_null( p, end, &len ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_SIGNATURE + ret );
+
+    sig->len = len;
+    sig->p = *p;
+
+    *p += len;
+
+    return( 0 );
+}
+
+/*
+ * Get signature algorithm from alg OID and optional parameters
+ */
+int x509_get_sig_alg( const x509_buf *sig_oid, const x509_buf *sig_params,
+                      md_type_t *md_alg, pk_type_t *pk_alg,
+                      void **sig_opts )
+{
+    int ret;
+
+    if( *sig_opts != NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    if( ( ret = oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 )
+        return( POLARSSL_ERR_X509_UNKNOWN_SIG_ALG + ret );
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+    if( *pk_alg == POLARSSL_PK_RSASSA_PSS )
+    {
+        pk_rsassa_pss_options *pss_opts;
+
+        pss_opts = polarssl_malloc( sizeof( pk_rsassa_pss_options ) );
+        if( pss_opts == NULL )
+            return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+        ret = x509_get_rsassa_pss_params( sig_params,
+                                          md_alg,
+                                          &pss_opts->mgf1_hash_id,
+                                          &pss_opts->expected_salt_len );
+        if( ret != 0 )
+        {
+            polarssl_free( pss_opts );
+            return( ret );
+        }
+
+        *sig_opts = (void *) pss_opts;
+    }
+    else
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
+    {
+        /* Make sure parameters are absent or NULL */
+        if( ( sig_params->tag != ASN1_NULL && sig_params->tag != 0 ) ||
+              sig_params->len != 0 )
+        return( POLARSSL_ERR_X509_INVALID_ALG );
+    }
+
+    return( 0 );
+}
+
+/*
+ * X.509 Extensions (No parsing of extensions, pointer should
+ * be either manually updated or extensions should be parsed!
+ */
+int x509_get_ext( unsigned char **p, const unsigned char *end,
+                  x509_buf *ext, int tag )
+{
+    int ret;
+    size_t len;
+
+    if( *p == end )
+        return( 0 );
+
+    ext->tag = **p;
+
+    if( ( ret = asn1_get_tag( p, end, &ext->len,
+            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | tag ) ) != 0 )
+        return( ret );
+
+    ext->p = *p;
+    end = *p + ext->len;
+
+    /*
+     * Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
+     *
+     * Extension  ::=  SEQUENCE  {
+     *      extnID      OBJECT IDENTIFIER,
+     *      critical    BOOLEAN DEFAULT FALSE,
+     *      extnValue   OCTET STRING  }
+     */
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( end != *p + len )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * Load all data from a file into a given buffer.
+ */
+int x509_load_file( const char *path, unsigned char **buf, size_t *n )
+{
+    FILE *f;
+    long size;
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+
+    fseek( f, 0, SEEK_END );
+    if( ( size = ftell( f ) ) == -1 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+    }
+    fseek( f, 0, SEEK_SET );
+
+    *n = (size_t) size;
+
+    if( *n + 1 == 0 ||
+        ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
+    }
+
+    if( fread( *buf, 1, *n, f ) != *n )
+    {
+        fclose( f );
+        polarssl_free( *buf );
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+    }
+
+    fclose( f );
+
+    (*buf)[*n] = '\0';
+
+    return( 0 );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf( char *str, size_t size, const char *format, ... )
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if( res < 0 )
+        return( (int) size + 20 );
+
+    return( res );
+}
+
+#define snprintf compat_snprintf
+#endif /* _MSC_VER && !snprintf && !EFIX64 && !EFI32 */
+
+#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
+
+#define SAFE_SNPRINTF()                             \
+{                                                   \
+    if( ret == -1 )                                 \
+        return( -1 );                               \
+                                                    \
+    if( (unsigned int) ret > n ) {                  \
+        p[n - 1] = '\0';                            \
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL ); \
+    }                                               \
+                                                    \
+    n -= (unsigned int) ret;                        \
+    p += (unsigned int) ret;                        \
+}
+
+/*
+ * Store the name in printable form into buf; no more
+ * than size characters will be written
+ */
+int x509_dn_gets( char *buf, size_t size, const x509_name *dn )
+{
+    int ret;
+    size_t i, n;
+    unsigned char c;
+    const x509_name *name;
+    const char *short_name = NULL;
+    char s[128], *p;
+
+    memset( s, 0, sizeof( s ) );
+
+    name = dn;
+    p = buf;
+    n = size;
+
+    while( name != NULL )
+    {
+        if( !name->oid.p )
+        {
+            name = name->next;
+            continue;
+        }
+
+        if( name != dn )
+        {
+            ret = snprintf( p, n, ", " );
+            SAFE_SNPRINTF();
+        }
+
+        ret = oid_get_attr_short_name( &name->oid, &short_name );
+
+        if( ret == 0 )
+            ret = snprintf( p, n, "%s=", short_name );
+        else
+            ret = snprintf( p, n, "\?\?=" );
+        SAFE_SNPRINTF();
+
+        for( i = 0; i < name->val.len; i++ )
+        {
+            if( i >= sizeof( s ) - 1 )
+                break;
+
+            c = name->val.p[i];
+            if( c < 32 || c == 127 || ( c > 128 && c < 160 ) )
+                 s[i] = '?';
+            else s[i] = c;
+        }
+        s[i] = '\0';
+        ret = snprintf( p, n, "%s", s );
+        SAFE_SNPRINTF();
+        name = name->next;
+    }
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Store the serial in printable form into buf; no more
+ * than size characters will be written
+ */
+int x509_serial_gets( char *buf, size_t size, const x509_buf *serial )
+{
+    int ret;
+    size_t i, n, nr;
+    char *p;
+
+    p = buf;
+    n = size;
+
+    nr = ( serial->len <= 32 )
+        ? serial->len  : 28;
+
+    for( i = 0; i < nr; i++ )
+    {
+        if( i == 0 && nr > 1 && serial->p[i] == 0x0 )
+            continue;
+
+        ret = snprintf( p, n, "%02X%s",
+                serial->p[i], ( i < nr - 1 ) ? ":" : "" );
+        SAFE_SNPRINTF();
+    }
+
+    if( nr != serial->len )
+    {
+        ret = snprintf( p, n, "...." );
+        SAFE_SNPRINTF();
+    }
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Helper for writing signature algorithms
+ */
+int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid,
+                       pk_type_t pk_alg, md_type_t md_alg,
+                       const void *sig_opts )
+{
+    int ret;
+    char *p = buf;
+    size_t n = size;
+    const char *desc = NULL;
+
+    ret = oid_get_sig_alg_desc( sig_oid, &desc );
+    if( ret != 0 )
+        ret = snprintf( p, n, "???"  );
+    else
+        ret = snprintf( p, n, "%s", desc );
+    SAFE_SNPRINTF();
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+    if( pk_alg == POLARSSL_PK_RSASSA_PSS )
+    {
+        const pk_rsassa_pss_options *pss_opts;
+        const md_info_t *md_info, *mgf_md_info;
+
+        pss_opts = (const pk_rsassa_pss_options *) sig_opts;
+
+        md_info = md_info_from_type( md_alg );
+        mgf_md_info = md_info_from_type( pss_opts->mgf1_hash_id );
+
+        ret = snprintf( p, n, " (%s, MGF1-%s, 0x%02X)",
+                              md_info ? md_info->name : "???",
+                              mgf_md_info ? mgf_md_info->name : "???",
+                              pss_opts->expected_salt_len );
+        SAFE_SNPRINTF();
+    }
+#else
+    ((void) pk_alg);
+    ((void) md_alg);
+    ((void) sig_opts);
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
+
+    return( (int) size - n );
+}
+
+/*
+ * Helper for writing "RSA key size", "EC key size", etc
+ */
+int x509_key_size_helper( char *buf, size_t size, const char *name )
+{
+    char *p = buf;
+    size_t n = size;
+    int ret;
+
+    if( strlen( name ) + sizeof( " key size" ) > size )
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL );
+
+    ret = snprintf( p, n, "%s key size", name );
+    SAFE_SNPRINTF();
+
+    return( 0 );
+}
+
+/*
+ * Return an informational string describing the given OID
+ */
+const char *x509_oid_get_description( x509_buf *oid )
+{
+    const char *desc = NULL;
+    int ret;
+
+    ret = oid_get_extended_key_usage( oid, &desc );
+
+    if( ret != 0 )
+        return( NULL );
+
+    return( desc );
+}
+
+/* Return the x.y.z.... style numeric string for the given OID */
+int x509_oid_get_numeric_string( char *buf, size_t size, x509_buf *oid )
+{
+    return oid_get_numeric_string( buf, size, oid );
+}
+
+/*
+ * Return 0 if the x509_time is still valid, or 1 otherwise.
+ */
+#if defined(POLARSSL_HAVE_TIME)
+
+static void x509_get_current_time( x509_time *now )
+{
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+    SYSTEMTIME st;
+
+    GetSystemTime( &st );
+
+    now->year = st.wYear;
+    now->mon = st.wMonth;
+    now->day = st.wDay;
+    now->hour = st.wHour;
+    now->min = st.wMinute;
+    now->sec = st.wSecond;
+#else
+    struct tm lt;
+    time_t tt;
+
+    tt = time( NULL );
+    gmtime_r( &tt, &lt );
+
+    now->year = lt.tm_year + 1900;
+    now->mon = lt.tm_mon + 1;
+    now->day = lt.tm_mday;
+    now->hour = lt.tm_hour;
+    now->min = lt.tm_min;
+    now->sec = lt.tm_sec;
+#endif /* _WIN32 && !EFIX64 && !EFI32 */
+}
+
+/*
+ * Return 0 if before <= after, 1 otherwise
+ */
+static int x509_check_time( const x509_time *before, const x509_time *after )
+{
+    if( before->year  > after->year )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon   > after->mon )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day   > after->day )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour  > after->hour )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour == after->hour &&
+        before->min   > after->min  )
+        return( 1 );
+
+    if( before->year == after->year &&
+        before->mon  == after->mon  &&
+        before->day  == after->day  &&
+        before->hour == after->hour &&
+        before->min  == after->min  &&
+        before->sec   > after->sec  )
+        return( 1 );
+
+    return( 0 );
+}
+
+int x509_time_expired( const x509_time *to )
+{
+    x509_time now;
+
+    x509_get_current_time( &now );
+
+    return( x509_check_time( &now, to ) );
+}
+
+int x509_time_future( const x509_time *from )
+{
+    x509_time now;
+
+    x509_get_current_time( &now );
+
+    return( x509_check_time( from, &now ) );
+}
+
+#else  /* POLARSSL_HAVE_TIME */
+
+int x509_time_expired( const x509_time *to )
+{
+    ((void) to);
+    return( 0 );
+}
+
+int x509_time_future( const x509_time *from )
+{
+    ((void) from);
+    return( 0 );
+}
+#endif /* POLARSSL_HAVE_TIME */
+
+#if defined(POLARSSL_SELF_TEST)
+
+#include "polarssl/x509_crt.h"
+#include "polarssl/certs.h"
+
+/*
+ * Checkup routine
+ */
+int x509_self_test( int verbose )
+{
+#if defined(POLARSSL_CERTS_C) && defined(POLARSSL_SHA1_C)
+    int ret;
+    int flags;
+    x509_crt cacert;
+    x509_crt clicert;
+
+    if( verbose != 0 )
+        polarssl_printf( "  X.509 certificate load: " );
+
+    x509_crt_init( &clicert );
+
+    ret = x509_crt_parse( &clicert, (const unsigned char *) test_cli_crt,
+                          strlen( test_cli_crt ) );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "failed\n" );
+
+        return( ret );
+    }
+
+    x509_crt_init( &cacert );
+
+    ret = x509_crt_parse( &cacert, (const unsigned char *) test_ca_crt,
+                          strlen( test_ca_crt ) );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "failed\n" );
+
+        return( ret );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n  X.509 signature verify: ");
+
+    ret = x509_crt_verify( &clicert, &cacert, NULL, NULL, &flags, NULL, NULL );
+    if( ret != 0 )
+    {
+        if( verbose != 0 )
+            polarssl_printf( "failed\n" );
+
+        polarssl_printf( "ret = %d, &flags = %04x\n", ret, flags );
+
+        return( ret );
+    }
+
+    if( verbose != 0 )
+        polarssl_printf( "passed\n\n");
+
+    x509_crt_free( &cacert  );
+    x509_crt_free( &clicert );
+
+    return( 0 );
+#else
+    ((void) verbose);
+    return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE );
+#endif /* POLARSSL_CERTS_C && POLARSSL_SHA1_C */
+}
+
+#endif /* POLARSSL_SELF_TEST */
+
+#endif /* POLARSSL_X509_USE_C */
diff --git a/Externals/polarssl/library/x509_create.c b/Externals/polarssl/library/x509_create.c
new file mode 100644
index 0000000000..1019313327
--- /dev/null
+++ b/Externals/polarssl/library/x509_create.c
@@ -0,0 +1,318 @@
+/*
+ *  X.509 base functions for creating certificates / CSRs
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CREATE_C)
+
+#include "polarssl/x509.h"
+#include "polarssl/asn1write.h"
+#include "polarssl/oid.h"
+
+#if defined(_MSC_VER) && !defined strncasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strncasecmp _strnicmp
+#endif
+
+typedef struct {
+    const char *name;
+    size_t name_len;
+    const char*oid;
+} x509_attr_descriptor_t;
+
+#define ADD_STRLEN( s )     s, sizeof( s ) - 1
+
+static const x509_attr_descriptor_t x509_attrs[] =
+{
+    { ADD_STRLEN( "CN" ),                       OID_AT_CN },
+    { ADD_STRLEN( "commonName" ),               OID_AT_CN },
+    { ADD_STRLEN( "C" ),                        OID_AT_COUNTRY },
+    { ADD_STRLEN( "countryName" ),              OID_AT_COUNTRY },
+    { ADD_STRLEN( "O" ),                        OID_AT_ORGANIZATION },
+    { ADD_STRLEN( "organizationName" ),         OID_AT_ORGANIZATION },
+    { ADD_STRLEN( "L" ),                        OID_AT_LOCALITY },
+    { ADD_STRLEN( "locality" ),                 OID_AT_LOCALITY },
+    { ADD_STRLEN( "R" ),                        OID_PKCS9_EMAIL },
+    { ADD_STRLEN( "OU" ),                       OID_AT_ORG_UNIT },
+    { ADD_STRLEN( "organizationalUnitName" ),   OID_AT_ORG_UNIT },
+    { ADD_STRLEN( "ST" ),                       OID_AT_STATE },
+    { ADD_STRLEN( "stateOrProvinceName" ),      OID_AT_STATE },
+    { ADD_STRLEN( "emailAddress" ),             OID_PKCS9_EMAIL },
+    { ADD_STRLEN( "serialNumber" ),             OID_AT_SERIAL_NUMBER },
+    { ADD_STRLEN( "postalAddress" ),            OID_AT_POSTAL_ADDRESS },
+    { ADD_STRLEN( "postalCode" ),               OID_AT_POSTAL_CODE },
+    { ADD_STRLEN( "dnQualifier" ),              OID_AT_DN_QUALIFIER },
+    { ADD_STRLEN( "title" ),                    OID_AT_TITLE },
+    { ADD_STRLEN( "surName" ),                  OID_AT_SUR_NAME },
+    { ADD_STRLEN( "SN" ),                       OID_AT_SUR_NAME },
+    { ADD_STRLEN( "givenName" ),                OID_AT_GIVEN_NAME },
+    { ADD_STRLEN( "GN" ),                       OID_AT_GIVEN_NAME },
+    { ADD_STRLEN( "initials" ),                 OID_AT_INITIALS },
+    { ADD_STRLEN( "pseudonym" ),                OID_AT_PSEUDONYM },
+    { ADD_STRLEN( "generationQualifier" ),      OID_AT_GENERATION_QUALIFIER },
+    { ADD_STRLEN( "domainComponent" ),          OID_DOMAIN_COMPONENT },
+    { ADD_STRLEN( "DC" ),                       OID_DOMAIN_COMPONENT },
+    { NULL, 0, NULL }
+};
+
+static const char *x509_at_oid_from_name( const char *name, size_t name_len )
+{
+    const x509_attr_descriptor_t *cur;
+
+    for( cur = x509_attrs; cur->name != NULL; cur++ )
+        if( cur->name_len == name_len &&
+            strncasecmp( cur->name, name, name_len ) == 0 )
+            break;
+
+    return( cur->oid );
+}
+
+int x509_string_to_names( asn1_named_data **head, const char *name )
+{
+    int ret = 0;
+    const char *s = name, *c = s;
+    const char *end = s + strlen( s );
+    const char *oid = NULL;
+    int in_tag = 1;
+
+    /* Clear existing chain if present */
+    asn1_free_named_data_list( head );
+
+    while( c <= end )
+    {
+        if( in_tag && *c == '=' )
+        {
+            if( ( oid = x509_at_oid_from_name( s, c - s ) ) == NULL )
+            {
+                ret = POLARSSL_ERR_X509_UNKNOWN_OID;
+                goto exit;
+            }
+
+            s = c + 1;
+            in_tag = 0;
+        }
+
+        if( !in_tag && ( *c == ',' || c == end ) )
+        {
+            if( asn1_store_named_data( head, oid, strlen( oid ),
+                                       (unsigned char *) s,
+                                       c - s ) == NULL )
+            {
+                return( POLARSSL_ERR_X509_MALLOC_FAILED );
+            }
+
+            while( c < end && *(c + 1) == ' ' )
+                c++;
+
+            s = c + 1;
+            in_tag = 1;
+        }
+        c++;
+    }
+
+exit:
+
+    return( ret );
+}
+
+/* The first byte of the value in the asn1_named_data structure is reserved
+ * to store the critical boolean for us
+ */
+int x509_set_extension( asn1_named_data **head, const char *oid, size_t oid_len,
+                        int critical, const unsigned char *val, size_t val_len )
+{
+    asn1_named_data *cur;
+
+    if( ( cur = asn1_store_named_data( head, oid, oid_len,
+                                       NULL, val_len + 1 ) ) == NULL )
+    {
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
+    }
+
+    cur->val.p[0] = critical;
+    memcpy( cur->val.p + 1, val, val_len );
+
+    return( 0 );
+}
+
+/*
+ *  RelativeDistinguishedName ::=
+ *    SET OF AttributeTypeAndValue
+ *
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ *
+ *  AttributeType ::= OBJECT IDENTIFIER
+ *
+ *  AttributeValue ::= ANY DEFINED BY AttributeType
+ */
+static int x509_write_name( unsigned char **p, unsigned char *start,
+                            const char *oid, size_t oid_len,
+                            const unsigned char *name, size_t name_len )
+{
+    int ret;
+    size_t len = 0;
+
+    // Write PrintableString for all except OID_PKCS9_EMAIL
+    //
+    if( OID_SIZE( OID_PKCS9_EMAIL ) == oid_len &&
+        memcmp( oid, OID_PKCS9_EMAIL, oid_len ) == 0 )
+    {
+        ASN1_CHK_ADD( len, asn1_write_ia5_string( p, start,
+                                                  (const char *) name,
+                                                  name_len ) );
+    }
+    else
+    {
+        ASN1_CHK_ADD( len, asn1_write_printable_string( p, start,
+                                                        (const char *) name,
+                                                        name_len ) );
+    }
+
+    // Write OID
+    //
+    ASN1_CHK_ADD( len, asn1_write_oid( p, start, oid, oid_len ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED |
+                                                 ASN1_SET ) );
+
+    return( (int) len );
+}
+
+int x509_write_names( unsigned char **p, unsigned char *start,
+                      asn1_named_data *first )
+{
+    int ret;
+    size_t len = 0;
+    asn1_named_data *cur = first;
+
+    while( cur != NULL )
+    {
+        ASN1_CHK_ADD( len, x509_write_name( p, start, (char *) cur->oid.p,
+                                            cur->oid.len,
+                                            cur->val.p, cur->val.len ) );
+        cur = cur->next;
+    }
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+int x509_write_sig( unsigned char **p, unsigned char *start,
+                    const char *oid, size_t oid_len,
+                    unsigned char *sig, size_t size )
+{
+    int ret;
+    size_t len = 0;
+
+    if( *p - start < (int) size + 1 )
+        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
+
+    len = size;
+    (*p) -= len;
+    memcpy( *p, sig, len );
+
+    *--(*p) = 0;
+    len += 1;
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_BIT_STRING ) );
+
+    // Write OID
+    //
+    ASN1_CHK_ADD( len, asn1_write_algorithm_identifier( p, start, oid,
+                                                        oid_len, 0 ) );
+
+    return( (int) len );
+}
+
+static int x509_write_extension( unsigned char **p, unsigned char *start,
+                                 asn1_named_data *ext )
+{
+    int ret;
+    size_t len = 0;
+
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start, ext->val.p + 1,
+                                              ext->val.len - 1 ) );
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, ext->val.len - 1 ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_OCTET_STRING ) );
+
+    if( ext->val.p[0] != 0 )
+    {
+        ASN1_CHK_ADD( len, asn1_write_bool( p, start, 1 ) );
+    }
+
+    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start, ext->oid.p,
+                                              ext->oid.len ) );
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, ext->oid.len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_OID ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+/*
+ * Extension  ::=  SEQUENCE  {
+ *     extnID      OBJECT IDENTIFIER,
+ *     critical    BOOLEAN DEFAULT FALSE,
+ *     extnValue   OCTET STRING
+ *                 -- contains the DER encoding of an ASN.1 value
+ *                 -- corresponding to the extension type identified
+ *                 -- by extnID
+ *     }
+ */
+int x509_write_extensions( unsigned char **p, unsigned char *start,
+                           asn1_named_data *first )
+{
+    int ret;
+    size_t len = 0;
+    asn1_named_data *cur_ext = first;
+
+    while( cur_ext != NULL )
+    {
+        ASN1_CHK_ADD( len, x509_write_extension( p, start, cur_ext ) );
+        cur_ext = cur_ext->next;
+    }
+
+    return( (int) len );
+}
+
+#endif /* POLARSSL_X509_CREATE_C */
diff --git a/Externals/polarssl/library/x509_crl.c b/Externals/polarssl/library/x509_crl.c
new file mode 100644
index 0000000000..7dd53c2f60
--- /dev/null
+++ b/Externals/polarssl/library/x509_crl.c
@@ -0,0 +1,768 @@
+/*
+ *  X.509 Certidicate Revocation List (CRL) parsing
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+
+#include "polarssl/x509_crl.h"
+#include "polarssl/oid.h"
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+
+#include <windows.h>
+#else
+#include <time.h>
+#endif
+
+#if defined(POLARSSL_FS_IO) || defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ *  Version  ::=  INTEGER  {  v1(0), v2(1)  }
+ */
+static int x509_crl_get_version( unsigned char **p,
+                             const unsigned char *end,
+                             int *ver )
+{
+    int ret;
+
+    if( ( ret = asn1_get_int( p, end, ver ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            *ver = 0;
+            return( 0 );
+        }
+
+        return( POLARSSL_ERR_X509_INVALID_VERSION + ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL v2 extensions (no extensions parsed yet.)
+ */
+static int x509_get_crl_ext( unsigned char **p,
+                             const unsigned char *end,
+                             x509_buf *ext )
+{
+    int ret;
+    size_t len = 0;
+
+    /* Get explicit tag */
+    if( ( ret = x509_get_ext( p, end, ext, 0) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    while( *p < end )
+    {
+        if( ( ret = asn1_get_tag( p, end, &len,
+                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        *p += len;
+    }
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL v2 entry extensions (no extensions parsed yet.)
+ */
+static int x509_get_crl_entry_ext( unsigned char **p,
+                             const unsigned char *end,
+                             x509_buf *ext )
+{
+    int ret;
+    size_t len = 0;
+
+    /* OPTIONAL */
+    if( end <= *p )
+        return( 0 );
+
+    ext->tag = **p;
+    ext->p = *p;
+
+    /*
+     * Get CRL-entry extension sequence header
+     * crlEntryExtensions      Extensions OPTIONAL  -- if present, MUST be v2
+     */
+    if( ( ret = asn1_get_tag( p, end, &ext->len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            ext->p = NULL;
+            return( 0 );
+        }
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+    }
+
+    end = *p + ext->len;
+
+    if( end != *p + ext->len )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    while( *p < end )
+    {
+        if( ( ret = asn1_get_tag( p, end, &len,
+                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        *p += len;
+    }
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 CRL Entries
+ */
+static int x509_get_entries( unsigned char **p,
+                             const unsigned char *end,
+                             x509_crl_entry *entry )
+{
+    int ret;
+    size_t entry_len;
+    x509_crl_entry *cur_entry = entry;
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = asn1_get_tag( p, end, &entry_len,
+            ASN1_SEQUENCE | ASN1_CONSTRUCTED ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    end = *p + entry_len;
+
+    while( *p < end )
+    {
+        size_t len2;
+        const unsigned char *end2;
+
+        if( ( ret = asn1_get_tag( p, end, &len2,
+                ASN1_SEQUENCE | ASN1_CONSTRUCTED ) ) != 0 )
+        {
+            return( ret );
+        }
+
+        cur_entry->raw.tag = **p;
+        cur_entry->raw.p = *p;
+        cur_entry->raw.len = len2;
+        end2 = *p + len2;
+
+        if( ( ret = x509_get_serial( p, end2, &cur_entry->serial ) ) != 0 )
+            return( ret );
+
+        if( ( ret = x509_get_time( p, end2,
+                                   &cur_entry->revocation_date ) ) != 0 )
+            return( ret );
+
+        if( ( ret = x509_get_crl_entry_ext( p, end2,
+                                            &cur_entry->entry_ext ) ) != 0 )
+            return( ret );
+
+        if( *p < end )
+        {
+            cur_entry->next = polarssl_malloc( sizeof( x509_crl_entry ) );
+
+            if( cur_entry->next == NULL )
+                return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+            cur_entry = cur_entry->next;
+            memset( cur_entry, 0, sizeof( x509_crl_entry ) );
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one or more CRLs and add them to the chained list
+ */
+int x509_crl_parse( x509_crl *chain, const unsigned char *buf, size_t buflen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end;
+    x509_crl *crl;
+    x509_buf sig_params1, sig_params2;
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    size_t use_len;
+    pem_context pem;
+#endif
+
+    memset( &sig_params1, 0, sizeof( x509_buf ) );
+    memset( &sig_params2, 0, sizeof( x509_buf ) );
+
+    crl = chain;
+
+    /*
+     * Check for valid input
+     */
+    if( crl == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    while( crl->version != 0 && crl->next != NULL )
+        crl = crl->next;
+
+    /*
+     * Add new CRL on the end of the chain if needed.
+     */
+    if( crl->version != 0 && crl->next == NULL )
+    {
+        crl->next = (x509_crl *) polarssl_malloc( sizeof( x509_crl ) );
+
+        if( crl->next == NULL )
+        {
+            x509_crl_free( crl );
+            return( POLARSSL_ERR_X509_MALLOC_FAILED );
+        }
+
+        crl = crl->next;
+        x509_crl_init( crl );
+    }
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    pem_init( &pem );
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN X509 CRL-----",
+                           "-----END X509 CRL-----",
+                           buf, NULL, 0, &use_len );
+
+    if( ret == 0 )
+    {
+        /*
+         * Was PEM encoded
+         */
+        buflen -= use_len;
+        buf += use_len;
+
+        /*
+         * Steal PEM buffer
+         */
+        p = pem.buf;
+        pem.buf = NULL;
+        len = pem.buflen;
+        pem_free( &pem );
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+    {
+        pem_free( &pem );
+        return( ret );
+    }
+    else
+#endif /* POLARSSL_PEM_PARSE_C */
+    {
+        /*
+         * nope, copy the raw DER data
+         */
+        p = (unsigned char *) polarssl_malloc( len = buflen );
+
+        if( p == NULL )
+            return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+        memcpy( p, buf, buflen );
+
+        buflen = 0;
+    }
+
+    crl->raw.p = p;
+    crl->raw.len = len;
+    end = p + len;
+
+    /*
+     * CertificateList  ::=  SEQUENCE  {
+     *      tbsCertList          TBSCertList,
+     *      signatureAlgorithm   AlgorithmIdentifier,
+     *      signatureValue       BIT STRING  }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT );
+    }
+
+    if( len != (size_t) ( end - p ) )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    /*
+     * TBSCertList  ::=  SEQUENCE  {
+     */
+    crl->tbs.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+    crl->tbs.len = end - crl->tbs.p;
+
+    /*
+     * Version  ::=  INTEGER  OPTIONAL {  v1(0), v2(1)  }
+     *               -- if present, MUST be v2
+     *
+     * signature            AlgorithmIdentifier
+     */
+    if( ( ret = x509_crl_get_version( &p, end, &crl->version ) ) != 0 ||
+        ( ret = x509_get_alg( &p, end, &crl->sig_oid1, &sig_params1 ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    crl->version++;
+
+    if( crl->version > 2 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_UNKNOWN_VERSION );
+    }
+
+    if( ( ret = x509_get_sig_alg( &crl->sig_oid1, &sig_params1,
+                                  &crl->sig_md, &crl->sig_pk,
+                                  &crl->sig_opts ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_UNKNOWN_SIG_ALG );
+    }
+
+    /*
+     * issuer               Name
+     */
+    crl->issuer_raw.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = x509_get_name( &p, p + len, &crl->issuer ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    crl->issuer_raw.len = p - crl->issuer_raw.p;
+
+    /*
+     * thisUpdate          Time
+     * nextUpdate          Time OPTIONAL
+     */
+    if( ( ret = x509_get_time( &p, end, &crl->this_update ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( ( ret = x509_get_time( &p, end, &crl->next_update ) ) != 0 )
+    {
+        if( ret != ( POLARSSL_ERR_X509_INVALID_DATE +
+                        POLARSSL_ERR_ASN1_UNEXPECTED_TAG ) &&
+            ret != ( POLARSSL_ERR_X509_INVALID_DATE +
+                        POLARSSL_ERR_ASN1_OUT_OF_DATA ) )
+        {
+            x509_crl_free( crl );
+            return( ret );
+        }
+    }
+
+    /*
+     * revokedCertificates    SEQUENCE OF SEQUENCE   {
+     *      userCertificate        CertificateSerialNumber,
+     *      revocationDate         Time,
+     *      crlEntryExtensions     Extensions OPTIONAL
+     *                                   -- if present, MUST be v2
+     *                        } OPTIONAL
+     */
+    if( ( ret = x509_get_entries( &p, end, &crl->entry ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    /*
+     * crlExtensions          EXPLICIT Extensions OPTIONAL
+     *                              -- if present, MUST be v2
+     */
+    if( crl->version == 2 )
+    {
+        ret = x509_get_crl_ext( &p, end, &crl->crl_ext );
+
+        if( ret != 0 )
+        {
+            x509_crl_free( crl );
+            return( ret );
+        }
+    }
+
+    if( p != end )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    end = crl->raw.p + crl->raw.len;
+
+    /*
+     *  signatureAlgorithm   AlgorithmIdentifier,
+     *  signatureValue       BIT STRING
+     */
+    if( ( ret = x509_get_alg( &p, end, &crl->sig_oid2, &sig_params2 ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( crl->sig_oid1.len != crl->sig_oid2.len ||
+        memcmp( crl->sig_oid1.p, crl->sig_oid2.p, crl->sig_oid1.len ) != 0 ||
+        sig_params1.len != sig_params2.len ||
+        memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_SIG_MISMATCH );
+    }
+
+    if( ( ret = x509_get_sig( &p, end, &crl->sig ) ) != 0 )
+    {
+        x509_crl_free( crl );
+        return( ret );
+    }
+
+    if( p != end )
+    {
+        x509_crl_free( crl );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    if( buflen > 0 )
+    {
+        crl->next = (x509_crl *) polarssl_malloc( sizeof( x509_crl ) );
+
+        if( crl->next == NULL )
+        {
+            x509_crl_free( crl );
+            return( POLARSSL_ERR_X509_MALLOC_FAILED );
+        }
+
+        crl = crl->next;
+        x509_crl_init( crl );
+
+        return( x509_crl_parse( crl, buf, buflen ) );
+    }
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * Load one or more CRLs and add them to the chained list
+ */
+int x509_crl_parse_file( x509_crl *chain, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = x509_crl_parse( chain, buf, n );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf( char *str, size_t size, const char *format, ... )
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if( res < 0 )
+        return( (int) size + 20 );
+
+    return( res );
+}
+
+#define snprintf compat_snprintf
+#endif /* _MSC_VER && !snprintf && !EFIX64 && !EFI32 */
+
+#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
+
+#define SAFE_SNPRINTF()                             \
+{                                                   \
+    if( ret == -1 )                                 \
+        return( -1 );                               \
+                                                    \
+    if( (unsigned int) ret > n ) {                  \
+        p[n - 1] = '\0';                            \
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL ); \
+    }                                               \
+                                                    \
+    n -= (unsigned int) ret;                        \
+    p += (unsigned int) ret;                        \
+}
+
+/*
+ * Return an informational string about the certificate.
+ */
+#define BEFORE_COLON    14
+#define BC              "14"
+/*
+ * Return an informational string about the CRL.
+ */
+int x509_crl_info( char *buf, size_t size, const char *prefix,
+                   const x509_crl *crl )
+{
+    int ret;
+    size_t n;
+    char *p;
+    const x509_crl_entry *entry;
+
+    p = buf;
+    n = size;
+
+    ret = snprintf( p, n, "%sCRL version   : %d",
+                               prefix, crl->version );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%sissuer name   : ", prefix );
+    SAFE_SNPRINTF();
+    ret = x509_dn_gets( p, n, &crl->issuer );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%sthis update   : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crl->this_update.year, crl->this_update.mon,
+                   crl->this_update.day,  crl->this_update.hour,
+                   crl->this_update.min,  crl->this_update.sec );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%snext update   : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crl->next_update.year, crl->next_update.mon,
+                   crl->next_update.day,  crl->next_update.hour,
+                   crl->next_update.min,  crl->next_update.sec );
+    SAFE_SNPRINTF();
+
+    entry = &crl->entry;
+
+    ret = snprintf( p, n, "\n%sRevoked certificates:",
+                               prefix );
+    SAFE_SNPRINTF();
+
+    while( entry != NULL && entry->raw.len != 0 )
+    {
+        ret = snprintf( p, n, "\n%sserial number: ",
+                               prefix );
+        SAFE_SNPRINTF();
+
+        ret = x509_serial_gets( p, n, &entry->serial );
+        SAFE_SNPRINTF();
+
+        ret = snprintf( p, n, " revocation date: " \
+                   "%04d-%02d-%02d %02d:%02d:%02d",
+                   entry->revocation_date.year, entry->revocation_date.mon,
+                   entry->revocation_date.day,  entry->revocation_date.hour,
+                   entry->revocation_date.min,  entry->revocation_date.sec );
+        SAFE_SNPRINTF();
+
+        entry = entry->next;
+    }
+
+    ret = snprintf( p, n, "\n%ssigned using  : ", prefix );
+    SAFE_SNPRINTF();
+
+    ret = x509_sig_alg_gets( p, n, &crl->sig_oid1, crl->sig_pk, crl->sig_md,
+                             crl->sig_opts );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n" );
+    SAFE_SNPRINTF();
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Initialize a CRL chain
+ */
+void x509_crl_init( x509_crl *crl )
+{
+    memset( crl, 0, sizeof(x509_crl) );
+}
+
+/*
+ * Unallocate all CRL data
+ */
+void x509_crl_free( x509_crl *crl )
+{
+    x509_crl *crl_cur = crl;
+    x509_crl *crl_prv;
+    x509_name *name_cur;
+    x509_name *name_prv;
+    x509_crl_entry *entry_cur;
+    x509_crl_entry *entry_prv;
+
+    if( crl == NULL )
+        return;
+
+    do
+    {
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+        polarssl_free( crl_cur->sig_opts );
+#endif
+
+        name_cur = crl_cur->issuer.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            polarssl_zeroize( name_prv, sizeof( x509_name ) );
+            polarssl_free( name_prv );
+        }
+
+        entry_cur = crl_cur->entry.next;
+        while( entry_cur != NULL )
+        {
+            entry_prv = entry_cur;
+            entry_cur = entry_cur->next;
+            polarssl_zeroize( entry_prv, sizeof( x509_crl_entry ) );
+            polarssl_free( entry_prv );
+        }
+
+        if( crl_cur->raw.p != NULL )
+        {
+            polarssl_zeroize( crl_cur->raw.p, crl_cur->raw.len );
+            polarssl_free( crl_cur->raw.p );
+        }
+
+        crl_cur = crl_cur->next;
+    }
+    while( crl_cur != NULL );
+
+    crl_cur = crl;
+    do
+    {
+        crl_prv = crl_cur;
+        crl_cur = crl_cur->next;
+
+        polarssl_zeroize( crl_prv, sizeof( x509_crl ) );
+        if( crl_prv != crl )
+            polarssl_free( crl_prv );
+    }
+    while( crl_cur != NULL );
+}
+
+#endif /* POLARSSL_X509_CRL_PARSE_C */
diff --git a/Externals/polarssl/library/x509_crt.c b/Externals/polarssl/library/x509_crt.c
new file mode 100644
index 0000000000..03cdda8079
--- /dev/null
+++ b/Externals/polarssl/library/x509_crt.c
@@ -0,0 +1,2018 @@
+/*
+ *  X.509 certificate parsing and verification
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CRT_PARSE_C)
+
+#include "polarssl/x509_crt.h"
+#include "polarssl/oid.h"
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#if defined(POLARSSL_THREADING_C)
+#include "polarssl/threading.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+#include <windows.h>
+#else
+#include <time.h>
+#endif
+
+#if defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+#if defined(POLARSSL_FS_IO)
+#include <stdio.h>
+#if !defined(_WIN32) || defined(EFIX64) || defined(EFI32)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#endif
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+ */
+static int x509_get_version( unsigned char **p,
+                             const unsigned char *end,
+                             int *ver )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 0 ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            *ver = 0;
+            return( 0 );
+        }
+
+        return( ret );
+    }
+
+    end = *p + len;
+
+    if( ( ret = asn1_get_int( p, end, ver ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_VERSION + ret );
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_VERSION +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ *  Validity ::= SEQUENCE {
+ *       notBefore      Time,
+ *       notAfter       Time }
+ */
+static int x509_get_dates( unsigned char **p,
+                           const unsigned char *end,
+                           x509_time *from,
+                           x509_time *to )
+{
+    int ret;
+    size_t len;
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_DATE + ret );
+
+    end = *p + len;
+
+    if( ( ret = x509_get_time( p, end, from ) ) != 0 )
+        return( ret );
+
+    if( ( ret = x509_get_time( p, end, to ) ) != 0 )
+        return( ret );
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_DATE +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 v2/v3 unique identifier (not parsed)
+ */
+static int x509_get_uid( unsigned char **p,
+                         const unsigned char *end,
+                         x509_buf *uid, int n )
+{
+    int ret;
+
+    if( *p == end )
+        return( 0 );
+
+    uid->tag = **p;
+
+    if( ( ret = asn1_get_tag( p, end, &uid->len,
+            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | n ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    uid->p = *p;
+    *p += uid->len;
+
+    return( 0 );
+}
+
+static int x509_get_basic_constraints( unsigned char **p,
+                                       const unsigned char *end,
+                                       int *ca_istrue,
+                                       int *max_pathlen )
+{
+    int ret;
+    size_t len;
+
+    /*
+     * BasicConstraints ::= SEQUENCE {
+     *      cA                      BOOLEAN DEFAULT FALSE,
+     *      pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
+     */
+    *ca_istrue = 0; /* DEFAULT FALSE */
+    *max_pathlen = 0; /* endless */
+
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = asn1_get_bool( p, end, ca_istrue ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+            ret = asn1_get_int( p, end, ca_istrue );
+
+        if( ret != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        if( *ca_istrue != 0 )
+            *ca_istrue = 1;
+    }
+
+    if( *p == end )
+        return( 0 );
+
+    if( ( ret = asn1_get_int( p, end, max_pathlen ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    (*max_pathlen)++;
+
+    return( 0 );
+}
+
+static int x509_get_ns_cert_type( unsigned char **p,
+                                       const unsigned char *end,
+                                       unsigned char *ns_cert_type)
+{
+    int ret;
+    x509_bitstring bs = { 0, 0, NULL };
+
+    if( ( ret = asn1_get_bitstring( p, end, &bs ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( bs.len != 1 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_INVALID_LENGTH );
+
+    /* Get actual bitstring */
+    *ns_cert_type = *bs.p;
+    return( 0 );
+}
+
+static int x509_get_key_usage( unsigned char **p,
+                               const unsigned char *end,
+                               unsigned char *key_usage)
+{
+    int ret;
+    x509_bitstring bs = { 0, 0, NULL };
+
+    if( ( ret = asn1_get_bitstring( p, end, &bs ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( bs.len < 1 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_INVALID_LENGTH );
+
+    /* Get actual bitstring */
+    *key_usage = *bs.p;
+    return( 0 );
+}
+
+/*
+ * ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
+ *
+ * KeyPurposeId ::= OBJECT IDENTIFIER
+ */
+static int x509_get_ext_key_usage( unsigned char **p,
+                               const unsigned char *end,
+                               x509_sequence *ext_key_usage)
+{
+    int ret;
+
+    if( ( ret = asn1_get_sequence_of( p, end, ext_key_usage, ASN1_OID ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    /* Sequence length must be >= 1 */
+    if( ext_key_usage->buf.p == NULL )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_INVALID_LENGTH );
+
+    return( 0 );
+}
+
+/*
+ * SubjectAltName ::= GeneralNames
+ *
+ * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
+ *
+ * GeneralName ::= CHOICE {
+ *      otherName                       [0]     OtherName,
+ *      rfc822Name                      [1]     IA5String,
+ *      dNSName                         [2]     IA5String,
+ *      x400Address                     [3]     ORAddress,
+ *      directoryName                   [4]     Name,
+ *      ediPartyName                    [5]     EDIPartyName,
+ *      uniformResourceIdentifier       [6]     IA5String,
+ *      iPAddress                       [7]     OCTET STRING,
+ *      registeredID                    [8]     OBJECT IDENTIFIER }
+ *
+ * OtherName ::= SEQUENCE {
+ *      type-id    OBJECT IDENTIFIER,
+ *      value      [0] EXPLICIT ANY DEFINED BY type-id }
+ *
+ * EDIPartyName ::= SEQUENCE {
+ *      nameAssigner            [0]     DirectoryString OPTIONAL,
+ *      partyName               [1]     DirectoryString }
+ *
+ * NOTE: PolarSSL only parses and uses dNSName at this point.
+ */
+static int x509_get_subject_alt_name( unsigned char **p,
+                                      const unsigned char *end,
+                                      x509_sequence *subject_alt_name )
+{
+    int ret;
+    size_t len, tag_len;
+    asn1_buf *buf;
+    unsigned char tag;
+    asn1_sequence *cur = subject_alt_name;
+
+    /* Get main sequence tag */
+    if( ( ret = asn1_get_tag( p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+    if( *p + len != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    while( *p < end )
+    {
+        if( ( end - *p ) < 1 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                    POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+        tag = **p;
+        (*p)++;
+        if( ( ret = asn1_get_len( p, end, &tag_len ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        if( ( tag & ASN1_CONTEXT_SPECIFIC ) != ASN1_CONTEXT_SPECIFIC )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                    POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+
+        /* Skip everything but DNS name */
+        if( tag != ( ASN1_CONTEXT_SPECIFIC | 2 ) )
+        {
+            *p += tag_len;
+            continue;
+        }
+
+        /* Allocate and assign next pointer */
+        if( cur->buf.p != NULL )
+        {
+            cur->next = (asn1_sequence *) polarssl_malloc(
+                 sizeof( asn1_sequence ) );
+
+            if( cur->next == NULL )
+                return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                        POLARSSL_ERR_ASN1_MALLOC_FAILED );
+
+            memset( cur->next, 0, sizeof( asn1_sequence ) );
+            cur = cur->next;
+        }
+
+        buf = &(cur->buf);
+        buf->tag = tag;
+        buf->p = *p;
+        buf->len = tag_len;
+        *p += buf->len;
+    }
+
+    /* Set final sequence entry's next pointer to NULL */
+    cur->next = NULL;
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * X.509 v3 extensions
+ *
+ * TODO: Perform all of the basic constraints tests required by the RFC
+ * TODO: Set values for undetected extensions to a sane default?
+ *
+ */
+static int x509_get_crt_ext( unsigned char **p,
+                             const unsigned char *end,
+                             x509_crt *crt )
+{
+    int ret;
+    size_t len;
+    unsigned char *end_ext_data, *end_ext_octet;
+
+    if( ( ret = x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+            return( 0 );
+
+        return( ret );
+    }
+
+    while( *p < end )
+    {
+        /*
+         * Extension  ::=  SEQUENCE  {
+         *      extnID      OBJECT IDENTIFIER,
+         *      critical    BOOLEAN DEFAULT FALSE,
+         *      extnValue   OCTET STRING  }
+         */
+        x509_buf extn_oid = {0, 0, NULL};
+        int is_critical = 0; /* DEFAULT FALSE */
+        int ext_type = 0;
+
+        if( ( ret = asn1_get_tag( p, end, &len,
+                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        end_ext_data = *p + len;
+
+        /* Get extension ID */
+        extn_oid.tag = **p;
+
+        if( ( ret = asn1_get_tag( p, end, &extn_oid.len, ASN1_OID ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        extn_oid.p = *p;
+        *p += extn_oid.len;
+
+        if( ( end - *p ) < 1 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                    POLARSSL_ERR_ASN1_OUT_OF_DATA );
+
+        /* Get optional critical */
+        if( ( ret = asn1_get_bool( p, end_ext_data, &is_critical ) ) != 0 &&
+            ( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG ) )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        /* Data should be octet string type */
+        if( ( ret = asn1_get_tag( p, end_ext_data, &len,
+                ASN1_OCTET_STRING ) ) != 0 )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS + ret );
+
+        end_ext_octet = *p + len;
+
+        if( end_ext_octet != end_ext_data )
+            return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+        /*
+         * Detect supported extensions
+         */
+        ret = oid_get_x509_ext_type( &extn_oid, &ext_type );
+
+        if( ret != 0 )
+        {
+            /* No parser found, skip extension */
+            *p = end_ext_octet;
+
+#if !defined(POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
+            if( is_critical )
+            {
+                /* Data is marked as critical: fail */
+                return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                        POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
+            }
+#endif
+            continue;
+        }
+
+        crt->ext_types |= ext_type;
+
+        switch( ext_type )
+        {
+        case EXT_BASIC_CONSTRAINTS:
+            /* Parse basic constraints */
+            if( ( ret = x509_get_basic_constraints( p, end_ext_octet,
+                    &crt->ca_istrue, &crt->max_pathlen ) ) != 0 )
+                return( ret );
+            break;
+
+        case EXT_KEY_USAGE:
+            /* Parse key usage */
+            if( ( ret = x509_get_key_usage( p, end_ext_octet,
+                    &crt->key_usage ) ) != 0 )
+                return( ret );
+            break;
+
+        case EXT_EXTENDED_KEY_USAGE:
+            /* Parse extended key usage */
+            if( ( ret = x509_get_ext_key_usage( p, end_ext_octet,
+                    &crt->ext_key_usage ) ) != 0 )
+                return( ret );
+            break;
+
+        case EXT_SUBJECT_ALT_NAME:
+            /* Parse subject alt name */
+            if( ( ret = x509_get_subject_alt_name( p, end_ext_octet,
+                    &crt->subject_alt_names ) ) != 0 )
+                return( ret );
+            break;
+
+        case EXT_NS_CERT_TYPE:
+            /* Parse netscape certificate type */
+            if( ( ret = x509_get_ns_cert_type( p, end_ext_octet,
+                    &crt->ns_cert_type ) ) != 0 )
+                return( ret );
+            break;
+
+        default:
+            return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE );
+        }
+    }
+
+    if( *p != end )
+        return( POLARSSL_ERR_X509_INVALID_EXTENSIONS +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+
+    return( 0 );
+}
+
+/*
+ * Parse and fill a single X.509 certificate in DER format
+ */
+static int x509_crt_parse_der_core( x509_crt *crt, const unsigned char *buf,
+                                    size_t buflen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end, *crt_end;
+    x509_buf sig_params1, sig_params2;
+
+    memset( &sig_params1, 0, sizeof( x509_buf ) );
+    memset( &sig_params2, 0, sizeof( x509_buf ) );
+
+    /*
+     * Check for valid input
+     */
+    if( crt == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    p = (unsigned char *) polarssl_malloc( len = buflen );
+
+    if( p == NULL )
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+    memcpy( p, buf, buflen );
+
+    crt->raw.p = p;
+    crt->raw.len = len;
+    end = p + len;
+
+    /*
+     * Certificate  ::=  SEQUENCE  {
+     *      tbsCertificate       TBSCertificate,
+     *      signatureAlgorithm   AlgorithmIdentifier,
+     *      signatureValue       BIT STRING  }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT );
+    }
+
+    if( len > (size_t) ( end - p ) )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+    crt_end = p + len;
+
+    /*
+     * TBSCertificate  ::=  SEQUENCE  {
+     */
+    crt->tbs.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+    crt->tbs.len = end - crt->tbs.p;
+
+    /*
+     * Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     *
+     * CertificateSerialNumber  ::=  INTEGER
+     *
+     * signature            AlgorithmIdentifier
+     */
+    if( ( ret = x509_get_version(  &p, end, &crt->version  ) ) != 0 ||
+        ( ret = x509_get_serial(   &p, end, &crt->serial   ) ) != 0 ||
+        ( ret = x509_get_alg(      &p, end, &crt->sig_oid1,
+                                            &sig_params1 ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    crt->version++;
+
+    if( crt->version > 3 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_UNKNOWN_VERSION );
+    }
+
+    if( ( ret = x509_get_sig_alg( &crt->sig_oid1, &sig_params1,
+                                  &crt->sig_md, &crt->sig_pk,
+                                  &crt->sig_opts ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     * issuer               Name
+     */
+    crt->issuer_raw.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = x509_get_name( &p, p + len, &crt->issuer ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    crt->issuer_raw.len = p - crt->issuer_raw.p;
+
+    /*
+     * Validity ::= SEQUENCE {
+     *      notBefore      Time,
+     *      notAfter       Time }
+     *
+     */
+    if( ( ret = x509_get_dates( &p, end, &crt->valid_from,
+                                         &crt->valid_to ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     * subject              Name
+     */
+    crt->subject_raw.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( len && ( ret = x509_get_name( &p, p + len, &crt->subject ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    crt->subject_raw.len = p - crt->subject_raw.p;
+
+    /*
+     * SubjectPublicKeyInfo
+     */
+    if( ( ret = pk_parse_subpubkey( &p, end, &crt->pk ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    /*
+     *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
+     *                       -- If present, version shall be v2 or v3
+     *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
+     *                       -- If present, version shall be v2 or v3
+     *  extensions      [3]  EXPLICIT Extensions OPTIONAL
+     *                       -- If present, version shall be v3
+     */
+    if( crt->version == 2 || crt->version == 3 )
+    {
+        ret = x509_get_uid( &p, end, &crt->issuer_id,  1 );
+        if( ret != 0 )
+        {
+            x509_crt_free( crt );
+            return( ret );
+        }
+    }
+
+    if( crt->version == 2 || crt->version == 3 )
+    {
+        ret = x509_get_uid( &p, end, &crt->subject_id,  2 );
+        if( ret != 0 )
+        {
+            x509_crt_free( crt );
+            return( ret );
+        }
+    }
+
+#if !defined(POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3)
+    if( crt->version == 3 )
+    {
+#endif
+        ret = x509_get_crt_ext( &p, end, crt );
+        if( ret != 0 )
+        {
+            x509_crt_free( crt );
+            return( ret );
+        }
+#if !defined(POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3)
+    }
+#endif
+
+    if( p != end )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    end = crt_end;
+
+    /*
+     *  }
+     *  -- end of TBSCertificate
+     *
+     *  signatureAlgorithm   AlgorithmIdentifier,
+     *  signatureValue       BIT STRING
+     */
+    if( ( ret = x509_get_alg( &p, end, &crt->sig_oid2, &sig_params2 ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    if( crt->sig_oid1.len != crt->sig_oid2.len ||
+        memcmp( crt->sig_oid1.p, crt->sig_oid2.p, crt->sig_oid1.len ) != 0 ||
+        sig_params1.len != sig_params2.len ||
+        memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_SIG_MISMATCH );
+    }
+
+    if( ( ret = x509_get_sig( &p, end, &crt->sig ) ) != 0 )
+    {
+        x509_crt_free( crt );
+        return( ret );
+    }
+
+    if( p != end )
+    {
+        x509_crt_free( crt );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one X.509 certificate in DER format from a buffer and add them to a
+ * chained list
+ */
+int x509_crt_parse_der( x509_crt *chain, const unsigned char *buf,
+                        size_t buflen )
+{
+    int ret;
+    x509_crt *crt = chain, *prev = NULL;
+
+    /*
+     * Check for valid input
+     */
+    if( crt == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    while( crt->version != 0 && crt->next != NULL )
+    {
+        prev = crt;
+        crt = crt->next;
+    }
+
+    /*
+     * Add new certificate on the end of the chain if needed.
+     */
+    if( crt->version != 0 && crt->next == NULL )
+    {
+        crt->next = (x509_crt *) polarssl_malloc( sizeof( x509_crt ) );
+
+        if( crt->next == NULL )
+            return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+        prev = crt;
+        crt = crt->next;
+        x509_crt_init( crt );
+    }
+
+    if( ( ret = x509_crt_parse_der_core( crt, buf, buflen ) ) != 0 )
+    {
+        if( prev )
+            prev->next = NULL;
+
+        if( crt != chain )
+            polarssl_free( crt );
+
+        return( ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse one or more PEM certificates from a buffer and add them to the chained
+ * list
+ */
+int x509_crt_parse( x509_crt *chain, const unsigned char *buf, size_t buflen )
+{
+    int success = 0, first_error = 0, total_failed = 0;
+    int buf_format = X509_FORMAT_DER;
+
+    /*
+     * Check for valid input
+     */
+    if( chain == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    /*
+     * Determine buffer content. Buffer contains either one DER certificate or
+     * one or more PEM certificates.
+     */
+#if defined(POLARSSL_PEM_PARSE_C)
+    if( strstr( (const char *) buf, "-----BEGIN CERTIFICATE-----" ) != NULL )
+        buf_format = X509_FORMAT_PEM;
+#endif
+
+    if( buf_format == X509_FORMAT_DER )
+        return x509_crt_parse_der( chain, buf, buflen );
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    if( buf_format == X509_FORMAT_PEM )
+    {
+        int ret;
+        pem_context pem;
+
+        while( buflen > 0 )
+        {
+            size_t use_len;
+            pem_init( &pem );
+
+            ret = pem_read_buffer( &pem,
+                           "-----BEGIN CERTIFICATE-----",
+                           "-----END CERTIFICATE-----",
+                           buf, NULL, 0, &use_len );
+
+            if( ret == 0 )
+            {
+                /*
+                 * Was PEM encoded
+                 */
+                buflen -= use_len;
+                buf += use_len;
+            }
+            else if( ret == POLARSSL_ERR_PEM_BAD_INPUT_DATA )
+            {
+                return( ret );
+            }
+            else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+            {
+                pem_free( &pem );
+
+                /*
+                 * PEM header and footer were found
+                 */
+                buflen -= use_len;
+                buf += use_len;
+
+                if( first_error == 0 )
+                    first_error = ret;
+
+                continue;
+            }
+            else
+                break;
+
+            ret = x509_crt_parse_der( chain, pem.buf, pem.buflen );
+
+            pem_free( &pem );
+
+            if( ret != 0 )
+            {
+                /*
+                 * Quit parsing on a memory error
+                 */
+                if( ret == POLARSSL_ERR_X509_MALLOC_FAILED )
+                    return( ret );
+
+                if( first_error == 0 )
+                    first_error = ret;
+
+                total_failed++;
+                continue;
+            }
+
+            success = 1;
+        }
+    }
+#endif /* POLARSSL_PEM_PARSE_C */
+
+    if( success )
+        return( total_failed );
+    else if( first_error )
+        return( first_error );
+    else
+        return( POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * Load one or more certificates and add them to the chained list
+ */
+int x509_crt_parse_file( x509_crt *chain, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = x509_crt_parse( chain, buf, n );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_THREADING_PTHREAD)
+static threading_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+int x509_crt_parse_path( x509_crt *chain, const char *path )
+{
+    int ret = 0;
+#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
+    int w_ret;
+    WCHAR szDir[MAX_PATH];
+    char filename[MAX_PATH];
+    char *p;
+    int len = (int) strlen( path );
+
+    WIN32_FIND_DATAW file_data;
+    HANDLE hFind;
+
+    if( len > MAX_PATH - 3 )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    memset( szDir, 0, sizeof(szDir) );
+    memset( filename, 0, MAX_PATH );
+    memcpy( filename, path, len );
+    filename[len++] = '\\';
+    p = filename + len;
+    filename[len++] = '*';
+
+    w_ret = MultiByteToWideChar( CP_ACP, 0, filename, len, szDir,
+                                 MAX_PATH - 3 );
+
+    hFind = FindFirstFileW( szDir, &file_data );
+    if( hFind == INVALID_HANDLE_VALUE )
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+
+    len = MAX_PATH - len;
+    do
+    {
+        memset( p, 0, len );
+
+        if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
+            continue;
+
+        w_ret = WideCharToMultiByte( CP_ACP, 0, file_data.cFileName,
+                                     lstrlenW( file_data.cFileName ),
+                                     p, len - 1,
+                                     NULL, NULL );
+
+        w_ret = x509_crt_parse_file( chain, filename );
+        if( w_ret < 0 )
+            ret++;
+        else
+            ret += w_ret;
+    }
+    while( FindNextFileW( hFind, &file_data ) != 0 );
+
+    if( GetLastError() != ERROR_NO_MORE_FILES )
+        ret = POLARSSL_ERR_X509_FILE_IO_ERROR;
+
+    FindClose( hFind );
+#else /* _WIN32 */
+    int t_ret;
+    struct stat sb;
+    struct dirent *entry;
+    char entry_name[255];
+    DIR *dir = opendir( path );
+
+    if( dir == NULL )
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+
+#if defined(POLARSSL_THREADING_PTHREAD)
+    if( ( ret = polarssl_mutex_lock( &readdir_mutex ) ) != 0 )
+        return( ret );
+#endif
+
+    while( ( entry = readdir( dir ) ) != NULL )
+    {
+        snprintf( entry_name, sizeof entry_name, "%s/%s", path, entry->d_name );
+
+        if( stat( entry_name, &sb ) == -1 )
+        {
+            closedir( dir );
+            ret = POLARSSL_ERR_X509_FILE_IO_ERROR;
+            goto cleanup;
+        }
+
+        if( !S_ISREG( sb.st_mode ) )
+            continue;
+
+        // Ignore parse errors
+        //
+        t_ret = x509_crt_parse_file( chain, entry_name );
+        if( t_ret < 0 )
+            ret++;
+        else
+            ret += t_ret;
+    }
+    closedir( dir );
+
+cleanup:
+#if defined(POLARSSL_THREADING_PTHREAD)
+    if( polarssl_mutex_unlock( &readdir_mutex ) != 0 )
+        ret = POLARSSL_ERR_THREADING_MUTEX_ERROR;
+#endif
+
+#endif /* _WIN32 */
+
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf( char *str, size_t size, const char *format, ... )
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if( res < 0 )
+        return( (int) size + 20 );
+
+    return( res );
+}
+
+#define snprintf compat_snprintf
+#endif /* _MSC_VER  && !snprintf && !EFIX64 && !EFI32 */
+
+#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
+
+#define SAFE_SNPRINTF()                             \
+{                                                   \
+    if( ret == -1 )                                 \
+        return( -1 );                               \
+                                                    \
+    if( (unsigned int) ret > n ) {                  \
+        p[n - 1] = '\0';                            \
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL ); \
+    }                                               \
+                                                    \
+    n -= (unsigned int) ret;                        \
+    p += (unsigned int) ret;                        \
+}
+
+static int x509_info_subject_alt_name( char **buf, size_t *size,
+                                       const x509_sequence *subject_alt_name )
+{
+    size_t i;
+    size_t n = *size;
+    char *p = *buf;
+    const x509_sequence *cur = subject_alt_name;
+    const char *sep = "";
+    size_t sep_len = 0;
+
+    while( cur != NULL )
+    {
+        if( cur->buf.len + sep_len >= n )
+        {
+            *p = '\0';
+            return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL );
+        }
+
+        n -= cur->buf.len + sep_len;
+        for( i = 0; i < sep_len; i++ )
+            *p++ = sep[i];
+        for( i = 0; i < cur->buf.len; i++ )
+            *p++ = cur->buf.p[i];
+
+        sep = ", ";
+        sep_len = 2;
+
+        cur = cur->next;
+    }
+
+    *p = '\0';
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+#define PRINT_ITEM(i)                           \
+    {                                           \
+        ret = snprintf( p, n, "%s" i, sep );    \
+        SAFE_SNPRINTF();                        \
+        sep = ", ";                             \
+    }
+
+#define CERT_TYPE(type,name)                    \
+    if( ns_cert_type & type )                   \
+        PRINT_ITEM( name );
+
+static int x509_info_cert_type( char **buf, size_t *size,
+                                unsigned char ns_cert_type )
+{
+    int ret;
+    size_t n = *size;
+    char *p = *buf;
+    const char *sep = "";
+
+    CERT_TYPE( NS_CERT_TYPE_SSL_CLIENT,         "SSL Client" );
+    CERT_TYPE( NS_CERT_TYPE_SSL_SERVER,         "SSL Server" );
+    CERT_TYPE( NS_CERT_TYPE_EMAIL,              "Email" );
+    CERT_TYPE( NS_CERT_TYPE_OBJECT_SIGNING,     "Object Signing" );
+    CERT_TYPE( NS_CERT_TYPE_RESERVED,           "Reserved" );
+    CERT_TYPE( NS_CERT_TYPE_SSL_CA,             "SSL CA" );
+    CERT_TYPE( NS_CERT_TYPE_EMAIL_CA,           "Email CA" );
+    CERT_TYPE( NS_CERT_TYPE_OBJECT_SIGNING_CA,  "Object Signing CA" );
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+#define KEY_USAGE(code,name)    \
+    if( key_usage & code )      \
+        PRINT_ITEM( name );
+
+static int x509_info_key_usage( char **buf, size_t *size,
+                                unsigned char key_usage )
+{
+    int ret;
+    size_t n = *size;
+    char *p = *buf;
+    const char *sep = "";
+
+    KEY_USAGE( KU_DIGITAL_SIGNATURE,    "Digital Signature" );
+    KEY_USAGE( KU_NON_REPUDIATION,      "Non Repudiation" );
+    KEY_USAGE( KU_KEY_ENCIPHERMENT,     "Key Encipherment" );
+    KEY_USAGE( KU_DATA_ENCIPHERMENT,    "Data Encipherment" );
+    KEY_USAGE( KU_KEY_AGREEMENT,        "Key Agreement" );
+    KEY_USAGE( KU_KEY_CERT_SIGN,        "Key Cert Sign" );
+    KEY_USAGE( KU_CRL_SIGN,             "CRL Sign" );
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+static int x509_info_ext_key_usage( char **buf, size_t *size,
+                                    const x509_sequence *extended_key_usage )
+{
+    int ret;
+    const char *desc;
+    size_t n = *size;
+    char *p = *buf;
+    const x509_sequence *cur = extended_key_usage;
+    const char *sep = "";
+
+    while( cur != NULL )
+    {
+        if( oid_get_extended_key_usage( &cur->buf, &desc ) != 0 )
+            desc = "???";
+
+        ret = snprintf( p, n, "%s%s", sep, desc );
+        SAFE_SNPRINTF();
+
+        sep = ", ";
+
+        cur = cur->next;
+    }
+
+    *size = n;
+    *buf = p;
+
+    return( 0 );
+}
+
+/*
+ * Return an informational string about the certificate.
+ */
+#define BEFORE_COLON    18
+#define BC              "18"
+int x509_crt_info( char *buf, size_t size, const char *prefix,
+                   const x509_crt *crt )
+{
+    int ret;
+    size_t n;
+    char *p;
+    char key_size_str[BEFORE_COLON];
+
+    p = buf;
+    n = size;
+
+    ret = snprintf( p, n, "%scert. version     : %d\n",
+                               prefix, crt->version );
+    SAFE_SNPRINTF();
+    ret = snprintf( p, n, "%sserial number     : ",
+                               prefix );
+    SAFE_SNPRINTF();
+
+    ret = x509_serial_gets( p, n, &crt->serial );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%sissuer name       : ", prefix );
+    SAFE_SNPRINTF();
+    ret = x509_dn_gets( p, n, &crt->issuer  );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%ssubject name      : ", prefix );
+    SAFE_SNPRINTF();
+    ret = x509_dn_gets( p, n, &crt->subject );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%sissued  on        : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crt->valid_from.year, crt->valid_from.mon,
+                   crt->valid_from.day,  crt->valid_from.hour,
+                   crt->valid_from.min,  crt->valid_from.sec );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%sexpires on        : " \
+                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
+                   crt->valid_to.year, crt->valid_to.mon,
+                   crt->valid_to.day,  crt->valid_to.hour,
+                   crt->valid_to.min,  crt->valid_to.sec );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%ssigned using      : ", prefix );
+    SAFE_SNPRINTF();
+
+    ret = x509_sig_alg_gets( p, n, &crt->sig_oid1, crt->sig_pk,
+                             crt->sig_md, crt->sig_opts );
+    SAFE_SNPRINTF();
+
+    /* Key size */
+    if( ( ret = x509_key_size_helper( key_size_str, BEFORE_COLON,
+                                      pk_get_name( &crt->pk ) ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    ret = snprintf( p, n, "\n%s%-" BC "s: %d bits", prefix, key_size_str,
+                          (int) pk_get_size( &crt->pk ) );
+    SAFE_SNPRINTF();
+
+    /*
+     * Optional extensions
+     */
+
+    if( crt->ext_types & EXT_BASIC_CONSTRAINTS )
+    {
+        ret = snprintf( p, n, "\n%sbasic constraints : CA=%s", prefix,
+                        crt->ca_istrue ? "true" : "false" );
+        SAFE_SNPRINTF();
+
+        if( crt->max_pathlen > 0 )
+        {
+            ret = snprintf( p, n, ", max_pathlen=%d", crt->max_pathlen - 1 );
+            SAFE_SNPRINTF();
+        }
+    }
+
+    if( crt->ext_types & EXT_SUBJECT_ALT_NAME )
+    {
+        ret = snprintf( p, n, "\n%ssubject alt name  : ", prefix );
+        SAFE_SNPRINTF();
+
+        if( ( ret = x509_info_subject_alt_name( &p, &n,
+                                            &crt->subject_alt_names ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & EXT_NS_CERT_TYPE )
+    {
+        ret = snprintf( p, n, "\n%scert. type        : ", prefix );
+        SAFE_SNPRINTF();
+
+        if( ( ret = x509_info_cert_type( &p, &n, crt->ns_cert_type ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & EXT_KEY_USAGE )
+    {
+        ret = snprintf( p, n, "\n%skey usage         : ", prefix );
+        SAFE_SNPRINTF();
+
+        if( ( ret = x509_info_key_usage( &p, &n, crt->key_usage ) ) != 0 )
+            return( ret );
+    }
+
+    if( crt->ext_types & EXT_EXTENDED_KEY_USAGE )
+    {
+        ret = snprintf( p, n, "\n%sext key usage     : ", prefix );
+        SAFE_SNPRINTF();
+
+        if( ( ret = x509_info_ext_key_usage( &p, &n,
+                                             &crt->ext_key_usage ) ) != 0 )
+            return( ret );
+    }
+
+    ret = snprintf( p, n, "\n" );
+    SAFE_SNPRINTF();
+
+    return( (int) ( size - n ) );
+}
+
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+int x509_crt_check_key_usage( const x509_crt *crt, int usage )
+{
+    if( ( crt->ext_types & EXT_KEY_USAGE ) != 0 &&
+        ( crt->key_usage & usage ) != usage )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    return( 0 );
+}
+#endif
+
+#if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
+int x509_crt_check_extended_key_usage( const x509_crt *crt,
+                                       const char *usage_oid,
+                                       size_t usage_len )
+{
+    const x509_sequence *cur;
+
+    /* Extension is not mandatory, absent means no restriction */
+    if( ( crt->ext_types & EXT_EXTENDED_KEY_USAGE ) == 0 )
+        return( 0 );
+
+    /*
+     * Look for the requested usage (or wildcard ANY) in our list
+     */
+    for( cur = &crt->ext_key_usage; cur != NULL; cur = cur->next )
+    {
+        const x509_buf *cur_oid = &cur->buf;
+
+        if( cur_oid->len == usage_len &&
+            memcmp( cur_oid->p, usage_oid, usage_len ) == 0 )
+        {
+            return( 0 );
+        }
+
+        if( OID_CMP( OID_ANY_EXTENDED_KEY_USAGE, cur_oid ) )
+            return( 0 );
+    }
+
+    return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+}
+#endif /* POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE */
+
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+/*
+ * Return 1 if the certificate is revoked, or 0 otherwise.
+ */
+int x509_crt_revoked( const x509_crt *crt, const x509_crl *crl )
+{
+    const x509_crl_entry *cur = &crl->entry;
+
+    while( cur != NULL && cur->serial.len != 0 )
+    {
+        if( crt->serial.len == cur->serial.len &&
+            memcmp( crt->serial.p, cur->serial.p, crt->serial.len ) == 0 )
+        {
+            if( x509_time_expired( &cur->revocation_date ) )
+                return( 1 );
+        }
+
+        cur = cur->next;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Check that the given certificate is valid according to the CRL.
+ */
+static int x509_crt_verifycrl( x509_crt *crt, x509_crt *ca,
+                               x509_crl *crl_list)
+{
+    int flags = 0;
+    unsigned char hash[POLARSSL_MD_MAX_SIZE];
+    const md_info_t *md_info;
+
+    if( ca == NULL )
+        return( flags );
+
+    /*
+     * TODO: What happens if no CRL is present?
+     * Suggestion: Revocation state should be unknown if no CRL is present.
+     * For backwards compatibility this is not yet implemented.
+     */
+
+    while( crl_list != NULL )
+    {
+        if( crl_list->version == 0 ||
+            crl_list->issuer_raw.len != ca->subject_raw.len ||
+            memcmp( crl_list->issuer_raw.p, ca->subject_raw.p,
+                    crl_list->issuer_raw.len ) != 0 )
+        {
+            crl_list = crl_list->next;
+            continue;
+        }
+
+        /*
+         * Check if the CA is configured to sign CRLs
+         */
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+        if( x509_crt_check_key_usage( ca, KU_CRL_SIGN ) != 0 )
+        {
+            flags |= BADCRL_NOT_TRUSTED;
+            break;
+        }
+#endif
+
+        /*
+         * Check if CRL is correctly signed by the trusted CA
+         */
+        md_info = md_info_from_type( crl_list->sig_md );
+        if( md_info == NULL )
+        {
+            /*
+             * Cannot check 'unknown' hash
+             */
+            flags |= BADCRL_NOT_TRUSTED;
+            break;
+        }
+
+        md( md_info, crl_list->tbs.p, crl_list->tbs.len, hash );
+
+        if( pk_verify_ext( crl_list->sig_pk, crl_list->sig_opts, &ca->pk,
+                           crl_list->sig_md, hash, md_info->size,
+                           crl_list->sig.p, crl_list->sig.len ) != 0 )
+        {
+            flags |= BADCRL_NOT_TRUSTED;
+            break;
+        }
+
+        /*
+         * Check for validity of CRL (Do not drop out)
+         */
+        if( x509_time_expired( &crl_list->next_update ) )
+            flags |= BADCRL_EXPIRED;
+
+        if( x509_time_future( &crl_list->this_update ) )
+            flags |= BADCRL_FUTURE;
+
+        /*
+         * Check if certificate is revoked
+         */
+        if( x509_crt_revoked( crt, crl_list ) )
+        {
+            flags |= BADCERT_REVOKED;
+            break;
+        }
+
+        crl_list = crl_list->next;
+    }
+    return( flags );
+}
+#endif /* POLARSSL_X509_CRL_PARSE_C */
+
+// Equal == 0, inequal == 1
+static int x509_name_cmp( const void *s1, const void *s2, size_t len )
+{
+    size_t i;
+    unsigned char diff;
+    const unsigned char *n1 = s1, *n2 = s2;
+
+    for( i = 0; i < len; i++ )
+    {
+        diff = n1[i] ^ n2[i];
+
+        if( diff == 0 )
+            continue;
+
+        if( diff == 32 &&
+            ( ( n1[i] >= 'a' && n1[i] <= 'z' ) ||
+              ( n1[i] >= 'A' && n1[i] <= 'Z' ) ) )
+        {
+            continue;
+        }
+
+        return( 1 );
+    }
+
+    return( 0 );
+}
+
+static int x509_wildcard_verify( const char *cn, x509_buf *name )
+{
+    size_t i;
+    size_t cn_idx = 0, cn_len = strlen( cn );
+
+    if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' )
+        return( 0 );
+
+    for( i = 0; i < cn_len; ++i )
+    {
+        if( cn[i] == '.' )
+        {
+            cn_idx = i;
+            break;
+        }
+    }
+
+    if( cn_idx == 0 )
+        return( 0 );
+
+    if( cn_len - cn_idx == name->len - 1 &&
+        x509_name_cmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 )
+    {
+        return( 1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Check if 'parent' is a suitable parent (signing CA) for 'child'.
+ * Return 0 if yes, -1 if not.
+ *
+ * top means parent is a locally-trusted certificate
+ * bottom means child is the end entity cert
+ */
+static int x509_crt_check_parent( const x509_crt *child,
+                                  const x509_crt *parent,
+                                  int top, int bottom )
+{
+    int need_ca_bit;
+
+    /* Parent must be the issuer */
+    if( child->issuer_raw.len != parent->subject_raw.len ||
+        memcmp( child->issuer_raw.p, parent->subject_raw.p,
+                child->issuer_raw.len ) != 0 )
+    {
+        return( -1 );
+    }
+
+    /* Parent must have the basicConstraints CA bit set as a general rule */
+    need_ca_bit = 1;
+
+    /* Exception: v1/v2 certificates that are locally trusted. */
+    if( top && parent->version < 3 )
+        need_ca_bit = 0;
+
+    /* Exception: self-signed end-entity certs that are locally trusted. */
+    if( top && bottom &&
+        child->raw.len == parent->raw.len &&
+        memcmp( child->raw.p, parent->raw.p, child->raw.len ) == 0 )
+    {
+        need_ca_bit = 0;
+    }
+
+    if( need_ca_bit && ! parent->ca_istrue )
+        return( -1 );
+
+#if defined(POLARSSL_X509_CHECK_KEY_USAGE)
+    if( need_ca_bit &&
+        x509_crt_check_key_usage( parent, KU_KEY_CERT_SIGN ) != 0 )
+    {
+        return( -1 );
+    }
+#endif
+
+    return( 0 );
+}
+
+static int x509_crt_verify_top(
+                x509_crt *child, x509_crt *trust_ca,
+                x509_crl *ca_crl, int path_cnt, int *flags,
+                int (*f_vrfy)(void *, x509_crt *, int, int *),
+                void *p_vrfy )
+{
+    int ret;
+    int ca_flags = 0, check_path_cnt = path_cnt + 1;
+    unsigned char hash[POLARSSL_MD_MAX_SIZE];
+    const md_info_t *md_info;
+
+    if( x509_time_expired( &child->valid_to ) )
+        *flags |= BADCERT_EXPIRED;
+
+    if( x509_time_future( &child->valid_from ) )
+        *flags |= BADCERT_FUTURE;
+
+    /*
+     * Child is the top of the chain. Check against the trust_ca list.
+     */
+    *flags |= BADCERT_NOT_TRUSTED;
+
+    md_info = md_info_from_type( child->sig_md );
+    if( md_info == NULL )
+    {
+        /*
+         * Cannot check 'unknown', no need to try any CA
+         */
+        trust_ca = NULL;
+    }
+    else
+        md( md_info, child->tbs.p, child->tbs.len, hash );
+
+    for( /* trust_ca */ ; trust_ca != NULL; trust_ca = trust_ca->next )
+    {
+        if( x509_crt_check_parent( child, trust_ca, 1, path_cnt == 0 ) != 0 )
+            continue;
+
+        /*
+         * Reduce path_len to check against if top of the chain is
+         * the same as the trusted CA
+         */
+        if( child->subject_raw.len == trust_ca->subject_raw.len &&
+            memcmp( child->subject_raw.p, trust_ca->subject_raw.p,
+                            child->issuer_raw.len ) == 0 )
+        {
+            check_path_cnt--;
+        }
+
+        if( trust_ca->max_pathlen > 0 &&
+            trust_ca->max_pathlen < check_path_cnt )
+        {
+            continue;
+        }
+
+        if( pk_verify_ext( child->sig_pk, child->sig_opts, &trust_ca->pk,
+                           child->sig_md, hash, md_info->size,
+                           child->sig.p, child->sig.len ) != 0 )
+        {
+            continue;
+        }
+
+        /*
+         * Top of chain is signed by a trusted CA
+         */
+        *flags &= ~BADCERT_NOT_TRUSTED;
+        break;
+    }
+
+    /*
+     * If top of chain is not the same as the trusted CA send a verify request
+     * to the callback for any issues with validity and CRL presence for the
+     * trusted CA certificate.
+     */
+    if( trust_ca != NULL &&
+        ( child->subject_raw.len != trust_ca->subject_raw.len ||
+          memcmp( child->subject_raw.p, trust_ca->subject_raw.p,
+                            child->issuer_raw.len ) != 0 ) )
+    {
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+        /* Check trusted CA's CRL for the chain's top crt */
+        *flags |= x509_crt_verifycrl( child, trust_ca, ca_crl );
+#else
+        ((void) ca_crl);
+#endif
+
+        if( x509_time_expired( &trust_ca->valid_to ) )
+            ca_flags |= BADCERT_EXPIRED;
+
+        if( x509_time_future( &trust_ca->valid_from ) )
+            ca_flags |= BADCERT_FUTURE;
+
+        if( NULL != f_vrfy )
+        {
+            if( ( ret = f_vrfy( p_vrfy, trust_ca, path_cnt + 1,
+                                &ca_flags ) ) != 0 )
+            {
+                return( ret );
+            }
+        }
+    }
+
+    /* Call callback on top cert */
+    if( NULL != f_vrfy )
+    {
+        if( ( ret = f_vrfy( p_vrfy, child, path_cnt, flags ) ) != 0 )
+            return( ret );
+    }
+
+    *flags |= ca_flags;
+
+    return( 0 );
+}
+
+static int x509_crt_verify_child(
+                x509_crt *child, x509_crt *parent, x509_crt *trust_ca,
+                x509_crl *ca_crl, int path_cnt, int *flags,
+                int (*f_vrfy)(void *, x509_crt *, int, int *),
+                void *p_vrfy )
+{
+    int ret;
+    int parent_flags = 0;
+    unsigned char hash[POLARSSL_MD_MAX_SIZE];
+    x509_crt *grandparent;
+    const md_info_t *md_info;
+
+    if( x509_time_expired( &child->valid_to ) )
+        *flags |= BADCERT_EXPIRED;
+
+    if( x509_time_future( &child->valid_from ) )
+        *flags |= BADCERT_FUTURE;
+
+    md_info = md_info_from_type( child->sig_md );
+    if( md_info == NULL )
+    {
+        /*
+         * Cannot check 'unknown' hash
+         */
+        *flags |= BADCERT_NOT_TRUSTED;
+    }
+    else
+    {
+        md( md_info, child->tbs.p, child->tbs.len, hash );
+
+        if( pk_verify_ext( child->sig_pk, child->sig_opts, &parent->pk,
+                           child->sig_md, hash, md_info->size,
+                           child->sig.p, child->sig.len ) != 0 )
+        {
+            *flags |= BADCERT_NOT_TRUSTED;
+        }
+    }
+
+#if defined(POLARSSL_X509_CRL_PARSE_C)
+    /* Check trusted CA's CRL for the given crt */
+    *flags |= x509_crt_verifycrl(child, parent, ca_crl);
+#endif
+
+    /* Look for a grandparent upwards the chain */
+    for( grandparent = parent->next;
+         grandparent != NULL;
+         grandparent = grandparent->next )
+    {
+        if( x509_crt_check_parent( parent, grandparent,
+                                   0, path_cnt == 0 ) == 0 )
+            break;
+    }
+
+    /* Is our parent part of the chain or at the top? */
+    if( grandparent != NULL )
+    {
+        ret = x509_crt_verify_child( parent, grandparent, trust_ca, ca_crl,
+                                path_cnt + 1, &parent_flags, f_vrfy, p_vrfy );
+        if( ret != 0 )
+            return( ret );
+    }
+    else
+    {
+        ret = x509_crt_verify_top( parent, trust_ca, ca_crl,
+                                path_cnt + 1, &parent_flags, f_vrfy, p_vrfy );
+        if( ret != 0 )
+            return( ret );
+    }
+
+    /* child is verified to be a child of the parent, call verify callback */
+    if( NULL != f_vrfy )
+        if( ( ret = f_vrfy( p_vrfy, child, path_cnt, flags ) ) != 0 )
+            return( ret );
+
+    *flags |= parent_flags;
+
+    return( 0 );
+}
+
+/*
+ * Verify the certificate validity
+ */
+int x509_crt_verify( x509_crt *crt,
+                     x509_crt *trust_ca,
+                     x509_crl *ca_crl,
+                     const char *cn, int *flags,
+                     int (*f_vrfy)(void *, x509_crt *, int, int *),
+                     void *p_vrfy )
+{
+    size_t cn_len;
+    int ret;
+    int pathlen = 0;
+    x509_crt *parent;
+    x509_name *name;
+    x509_sequence *cur = NULL;
+
+    *flags = 0;
+
+    if( cn != NULL )
+    {
+        name = &crt->subject;
+        cn_len = strlen( cn );
+
+        if( crt->ext_types & EXT_SUBJECT_ALT_NAME )
+        {
+            cur = &crt->subject_alt_names;
+
+            while( cur != NULL )
+            {
+                if( cur->buf.len == cn_len &&
+                    x509_name_cmp( cn, cur->buf.p, cn_len ) == 0 )
+                    break;
+
+                if( cur->buf.len > 2 &&
+                    memcmp( cur->buf.p, "*.", 2 ) == 0 &&
+                            x509_wildcard_verify( cn, &cur->buf ) )
+                    break;
+
+                cur = cur->next;
+            }
+
+            if( cur == NULL )
+                *flags |= BADCERT_CN_MISMATCH;
+        }
+        else
+        {
+            while( name != NULL )
+            {
+                if( OID_CMP( OID_AT_CN, &name->oid ) )
+                {
+                    if( name->val.len == cn_len &&
+                        x509_name_cmp( name->val.p, cn, cn_len ) == 0 )
+                        break;
+
+                    if( name->val.len > 2 &&
+                        memcmp( name->val.p, "*.", 2 ) == 0 &&
+                                x509_wildcard_verify( cn, &name->val ) )
+                        break;
+                }
+
+                name = name->next;
+            }
+
+            if( name == NULL )
+                *flags |= BADCERT_CN_MISMATCH;
+        }
+    }
+
+    /* Look for a parent upwards the chain */
+    for( parent = crt->next; parent != NULL; parent = parent->next )
+    {
+        if( x509_crt_check_parent( crt, parent, 0, pathlen == 0 ) == 0 )
+            break;
+    }
+
+    /* Are we part of the chain or at the top? */
+    if( parent != NULL )
+    {
+        ret = x509_crt_verify_child( crt, parent, trust_ca, ca_crl,
+                                     pathlen, flags, f_vrfy, p_vrfy );
+        if( ret != 0 )
+            return( ret );
+    }
+    else
+    {
+        ret = x509_crt_verify_top( crt, trust_ca, ca_crl,
+                                   pathlen, flags, f_vrfy, p_vrfy );
+        if( ret != 0 )
+            return( ret );
+    }
+
+    if( *flags != 0 )
+        return( POLARSSL_ERR_X509_CERT_VERIFY_FAILED );
+
+    return( 0 );
+}
+
+/*
+ * Initialize a certificate chain
+ */
+void x509_crt_init( x509_crt *crt )
+{
+    memset( crt, 0, sizeof(x509_crt) );
+}
+
+/*
+ * Unallocate all certificate data
+ */
+void x509_crt_free( x509_crt *crt )
+{
+    x509_crt *cert_cur = crt;
+    x509_crt *cert_prv;
+    x509_name *name_cur;
+    x509_name *name_prv;
+    x509_sequence *seq_cur;
+    x509_sequence *seq_prv;
+
+    if( crt == NULL )
+        return;
+
+    do
+    {
+        pk_free( &cert_cur->pk );
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+        polarssl_free( cert_cur->sig_opts );
+#endif
+
+        name_cur = cert_cur->issuer.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            polarssl_zeroize( name_prv, sizeof( x509_name ) );
+            polarssl_free( name_prv );
+        }
+
+        name_cur = cert_cur->subject.next;
+        while( name_cur != NULL )
+        {
+            name_prv = name_cur;
+            name_cur = name_cur->next;
+            polarssl_zeroize( name_prv, sizeof( x509_name ) );
+            polarssl_free( name_prv );
+        }
+
+        seq_cur = cert_cur->ext_key_usage.next;
+        while( seq_cur != NULL )
+        {
+            seq_prv = seq_cur;
+            seq_cur = seq_cur->next;
+            polarssl_zeroize( seq_prv, sizeof( x509_sequence ) );
+            polarssl_free( seq_prv );
+        }
+
+        seq_cur = cert_cur->subject_alt_names.next;
+        while( seq_cur != NULL )
+        {
+            seq_prv = seq_cur;
+            seq_cur = seq_cur->next;
+            polarssl_zeroize( seq_prv, sizeof( x509_sequence ) );
+            polarssl_free( seq_prv );
+        }
+
+        if( cert_cur->raw.p != NULL )
+        {
+            polarssl_zeroize( cert_cur->raw.p, cert_cur->raw.len );
+            polarssl_free( cert_cur->raw.p );
+        }
+
+        cert_cur = cert_cur->next;
+    }
+    while( cert_cur != NULL );
+
+    cert_cur = crt;
+    do
+    {
+        cert_prv = cert_cur;
+        cert_cur = cert_cur->next;
+
+        polarssl_zeroize( cert_prv, sizeof( x509_crt ) );
+        if( cert_prv != crt )
+            polarssl_free( cert_prv );
+    }
+    while( cert_cur != NULL );
+}
+
+#endif /* POLARSSL_X509_CRT_PARSE_C */
diff --git a/Externals/polarssl/library/x509_csr.c b/Externals/polarssl/library/x509_csr.c
new file mode 100644
index 0000000000..0b4f771f92
--- /dev/null
+++ b/Externals/polarssl/library/x509_csr.c
@@ -0,0 +1,465 @@
+/*
+ *  X.509 Certificate Signing Request (CSR) parsing
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificate format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc5280.txt (Certificates and CRLs)
+ *  http://www.ietf.org/rfc/rfc3279.txt (Alg IDs for CRLs)
+ *  http://www.ietf.org/rfc/rfc2986.txt (CSRs, aka PKCS#10)
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CSR_PARSE_C)
+
+#include "polarssl/x509_csr.h"
+#include "polarssl/oid.h"
+#if defined(POLARSSL_PEM_PARSE_C)
+#include "polarssl/pem.h"
+#endif
+
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(POLARSSL_FS_IO) || defined(EFIX64) || defined(EFI32)
+#include <stdio.h>
+#endif
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+/*
+ *  Version  ::=  INTEGER  {  v1(0)  }
+ */
+static int x509_csr_get_version( unsigned char **p,
+                             const unsigned char *end,
+                             int *ver )
+{
+    int ret;
+
+    if( ( ret = asn1_get_int( p, end, ver ) ) != 0 )
+    {
+        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
+        {
+            *ver = 0;
+            return( 0 );
+        }
+
+        return( POLARSSL_ERR_X509_INVALID_VERSION + ret );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse a CSR in DER format
+ */
+int x509_csr_parse_der( x509_csr *csr,
+                        const unsigned char *buf, size_t buflen )
+{
+    int ret;
+    size_t len;
+    unsigned char *p, *end;
+    x509_buf sig_params;
+
+    memset( &sig_params, 0, sizeof( x509_buf ) );
+
+    /*
+     * Check for valid input
+     */
+    if( csr == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    x509_csr_init( csr );
+
+    /*
+     * first copy the raw DER data
+     */
+    p = (unsigned char *) polarssl_malloc( len = buflen );
+
+    if( p == NULL )
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
+
+    memcpy( p, buf, buflen );
+
+    csr->raw.p = p;
+    csr->raw.len = len;
+    end = p + len;
+
+    /*
+     *  CertificationRequest ::= SEQUENCE {
+     *       certificationRequestInfo CertificationRequestInfo,
+     *       signatureAlgorithm AlgorithmIdentifier,
+     *       signature          BIT STRING
+     *  }
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT );
+    }
+
+    if( len != (size_t) ( end - p ) )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    /*
+     *  CertificationRequestInfo ::= SEQUENCE {
+     */
+    csr->cri.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    end = p + len;
+    csr->cri.len = end - csr->cri.p;
+
+    /*
+     *  Version  ::=  INTEGER {  v1(0) }
+     */
+    if( ( ret = x509_csr_get_version( &p, end, &csr->version ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( ret );
+    }
+
+    csr->version++;
+
+    if( csr->version != 1 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_UNKNOWN_VERSION );
+    }
+
+    /*
+     *  subject               Name
+     */
+    csr->subject_raw.p = p;
+
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+
+    if( ( ret = x509_get_name( &p, p + len, &csr->subject ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( ret );
+    }
+
+    csr->subject_raw.len = p - csr->subject_raw.p;
+
+    /*
+     *  subjectPKInfo SubjectPublicKeyInfo
+     */
+    if( ( ret = pk_parse_subpubkey( &p, end, &csr->pk ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( ret );
+    }
+
+    /*
+     *  attributes    [0] Attributes
+     */
+    if( ( ret = asn1_get_tag( &p, end, &len,
+            ASN1_CONSTRUCTED | ASN1_CONTEXT_SPECIFIC ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT + ret );
+    }
+    // TODO Parse Attributes / extension requests
+
+    p += len;
+
+    end = csr->raw.p + csr->raw.len;
+
+    /*
+     *  signatureAlgorithm   AlgorithmIdentifier,
+     *  signature            BIT STRING
+     */
+    if( ( ret = x509_get_alg( &p, end, &csr->sig_oid, &sig_params ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( ret );
+    }
+
+    if( ( ret = x509_get_sig_alg( &csr->sig_oid, &sig_params,
+                                  &csr->sig_md, &csr->sig_pk,
+                                  &csr->sig_opts ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_UNKNOWN_SIG_ALG );
+    }
+
+    if( ( ret = x509_get_sig( &p, end, &csr->sig ) ) != 0 )
+    {
+        x509_csr_free( csr );
+        return( ret );
+    }
+
+    if( p != end )
+    {
+        x509_csr_free( csr );
+        return( POLARSSL_ERR_X509_INVALID_FORMAT +
+                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Parse a CSR, allowing for PEM or raw DER encoding
+ */
+int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
+{
+    int ret;
+#if defined(POLARSSL_PEM_PARSE_C)
+    size_t use_len;
+    pem_context pem;
+#endif
+
+    /*
+     * Check for valid input
+     */
+    if( csr == NULL || buf == NULL )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+#if defined(POLARSSL_PEM_PARSE_C)
+    pem_init( &pem );
+    ret = pem_read_buffer( &pem,
+                           "-----BEGIN CERTIFICATE REQUEST-----",
+                           "-----END CERTIFICATE REQUEST-----",
+                           buf, NULL, 0, &use_len );
+
+    if( ret == 0 )
+    {
+        /*
+         * Was PEM encoded, parse the result
+         */
+        if( ( ret = x509_csr_parse_der( csr, pem.buf, pem.buflen ) ) != 0 )
+            return( ret );
+
+        pem_free( &pem );
+        return( 0 );
+    }
+    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
+    {
+        pem_free( &pem );
+        return( ret );
+    }
+    else
+#endif /* POLARSSL_PEM_PARSE_C */
+    return( x509_csr_parse_der( csr, buf, buflen ) );
+}
+
+#if defined(POLARSSL_FS_IO)
+/*
+ * Load a CSR into the structure
+ */
+int x509_csr_parse_file( x509_csr *csr, const char *path )
+{
+    int ret;
+    size_t n;
+    unsigned char *buf;
+
+    if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 )
+        return( ret );
+
+    ret = x509_csr_parse( csr, buf, n );
+
+    polarssl_zeroize( buf, n + 1 );
+    polarssl_free( buf );
+
+    return( ret );
+}
+#endif /* POLARSSL_FS_IO */
+
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
+#include <stdarg.h>
+
+#if !defined vsnprintf
+#define vsnprintf _vsnprintf
+#endif // vsnprintf
+
+/*
+ * Windows _snprintf and _vsnprintf are not compatible to linux versions.
+ * Result value is not size of buffer needed, but -1 if no fit is possible.
+ *
+ * This fuction tries to 'fix' this by at least suggesting enlarging the
+ * size by 20.
+ */
+static int compat_snprintf( char *str, size_t size, const char *format, ... )
+{
+    va_list ap;
+    int res = -1;
+
+    va_start( ap, format );
+
+    res = vsnprintf( str, size, format, ap );
+
+    va_end( ap );
+
+    // No quick fix possible
+    if( res < 0 )
+        return( (int) size + 20 );
+
+    return( res );
+}
+
+#define snprintf compat_snprintf
+#endif /* _MSC_VER && !snprintf && !EFIX64 && !EFI32 */
+
+#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
+
+#define SAFE_SNPRINTF()                             \
+{                                                   \
+    if( ret == -1 )                                 \
+        return( -1 );                               \
+                                                    \
+    if( (unsigned int) ret > n ) {                  \
+        p[n - 1] = '\0';                            \
+        return( POLARSSL_ERR_DEBUG_BUF_TOO_SMALL ); \
+    }                                               \
+                                                    \
+    n -= (unsigned int) ret;                        \
+    p += (unsigned int) ret;                        \
+}
+
+#define BEFORE_COLON    14
+#define BC              "14"
+/*
+ * Return an informational string about the CSR.
+ */
+int x509_csr_info( char *buf, size_t size, const char *prefix,
+                   const x509_csr *csr )
+{
+    int ret;
+    size_t n;
+    char *p;
+    char key_size_str[BEFORE_COLON];
+
+    p = buf;
+    n = size;
+
+    ret = snprintf( p, n, "%sCSR version   : %d",
+                               prefix, csr->version );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%ssubject name  : ", prefix );
+    SAFE_SNPRINTF();
+    ret = x509_dn_gets( p, n, &csr->subject );
+    SAFE_SNPRINTF();
+
+    ret = snprintf( p, n, "\n%ssigned using  : ", prefix );
+    SAFE_SNPRINTF();
+
+    ret = x509_sig_alg_gets( p, n, &csr->sig_oid, csr->sig_pk, csr->sig_md,
+                             csr->sig_opts );
+    SAFE_SNPRINTF();
+
+    if( ( ret = x509_key_size_helper( key_size_str, BEFORE_COLON,
+                                      pk_get_name( &csr->pk ) ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    ret = snprintf( p, n, "\n%s%-" BC "s: %d bits\n", prefix, key_size_str,
+                          (int) pk_get_size( &csr->pk ) );
+    SAFE_SNPRINTF();
+
+    return( (int) ( size - n ) );
+}
+
+/*
+ * Initialize a CSR
+ */
+void x509_csr_init( x509_csr *csr )
+{
+    memset( csr, 0, sizeof(x509_csr) );
+}
+
+/*
+ * Unallocate all CSR data
+ */
+void x509_csr_free( x509_csr *csr )
+{
+    x509_name *name_cur;
+    x509_name *name_prv;
+
+    if( csr == NULL )
+        return;
+
+    pk_free( &csr->pk );
+
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
+    polarssl_free( csr->sig_opts );
+#endif
+
+    name_cur = csr->subject.next;
+    while( name_cur != NULL )
+    {
+        name_prv = name_cur;
+        name_cur = name_cur->next;
+        polarssl_zeroize( name_prv, sizeof( x509_name ) );
+        polarssl_free( name_prv );
+    }
+
+    if( csr->raw.p != NULL )
+    {
+        polarssl_zeroize( csr->raw.p, csr->raw.len );
+        polarssl_free( csr->raw.p );
+    }
+
+    polarssl_zeroize( csr, sizeof( x509_csr ) );
+}
+
+#endif /* POLARSSL_X509_CSR_PARSE_C */
diff --git a/Externals/polarssl/library/x509parse.c b/Externals/polarssl/library/x509parse.c
deleted file mode 100644
index 77725e0631..0000000000
--- a/Externals/polarssl/library/x509parse.c
+++ /dev/null
@@ -1,3809 +0,0 @@
-/*
- *  X.509 certificate and private key decoding
- *
- *  Copyright (C) 2006-2011, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  The ITU-T X.509 standard defines a certificate format for PKI.
- *
- *  http://www.ietf.org/rfc/rfc3279.txt
- *  http://www.ietf.org/rfc/rfc3280.txt
- *
- *  ftp://ftp.rsasecurity.com/pub/pkcs/ascii/pkcs-1v2.asc
- *
- *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
- *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
- */
-
-#include "polarssl/config.h"
-
-#if defined(POLARSSL_X509_PARSE_C)
-
-#include "polarssl/x509.h"
-#include "polarssl/asn1.h"
-#include "polarssl/pem.h"
-#include "polarssl/des.h"
-#if defined(POLARSSL_MD2_C)
-#include "polarssl/md2.h"
-#endif
-#if defined(POLARSSL_MD4_C)
-#include "polarssl/md4.h"
-#endif
-#if defined(POLARSSL_MD5_C)
-#include "polarssl/md5.h"
-#endif
-#if defined(POLARSSL_SHA1_C)
-#include "polarssl/sha1.h"
-#endif
-#if defined(POLARSSL_SHA2_C)
-#include "polarssl/sha2.h"
-#endif
-#if defined(POLARSSL_SHA4_C)
-#include "polarssl/sha4.h"
-#endif
-#include "polarssl/dhm.h"
-#if defined(POLARSSL_PKCS5_C)
-#include "polarssl/pkcs5.h"
-#endif
-#if defined(POLARSSL_PKCS12_C)
-#include "polarssl/pkcs12.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#if defined(_WIN32)
-#include <windows.h>
-#else
-#include <time.h>
-#endif
-
-#if defined(POLARSSL_FS_IO)
-#include <stdio.h>
-#if !defined(_WIN32)
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#endif
-#endif
-
-/* Compare a given OID string with an OID x509_buf * */
-#define OID_CMP(oid_str, oid_buf) \
-        ( ( OID_SIZE(oid_str) == (oid_buf)->len ) && \
-                memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) == 0)
-
-/*
- *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
- */
-static int x509_get_version( unsigned char **p,
-                             const unsigned char *end,
-                             int *ver )
-{
-    int ret;
-    size_t len;
-
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 0 ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-        {
-            *ver = 0;
-            return( 0 );
-        }
-
-        return( ret );
-    }
-
-    end = *p + len;
-
-    if( ( ret = asn1_get_int( p, end, ver ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_VERSION + ret );
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_VERSION +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- *  Version  ::=  INTEGER  {  v1(0), v2(1)  }
- */
-static int x509_crl_get_version( unsigned char **p,
-                             const unsigned char *end,
-                             int *ver )
-{
-    int ret;
-
-    if( ( ret = asn1_get_int( p, end, ver ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-        {
-            *ver = 0;
-            return( 0 );
-        }
-
-        return( POLARSSL_ERR_X509_CERT_INVALID_VERSION + ret );
-    }
-
-    return( 0 );
-}
-
-/*
- *  CertificateSerialNumber  ::=  INTEGER
- */
-static int x509_get_serial( unsigned char **p,
-                            const unsigned char *end,
-                            x509_buf *serial )
-{
-    int ret;
-
-    if( ( end - *p ) < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SERIAL +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-    if( **p != ( ASN1_CONTEXT_SPECIFIC | ASN1_PRIMITIVE | 2 ) &&
-        **p !=   ASN1_INTEGER )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SERIAL +
-                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
-
-    serial->tag = *(*p)++;
-
-    if( ( ret = asn1_get_len( p, end, &serial->len ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SERIAL + ret );
-
-    serial->p = *p;
-    *p += serial->len;
-
-    return( 0 );
-}
-
-/*
- *  AlgorithmIdentifier  ::=  SEQUENCE  {
- *       algorithm               OBJECT IDENTIFIER,
- *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
- */
-static int x509_get_alg( unsigned char **p,
-                         const unsigned char *end,
-                         x509_buf *alg )
-{
-    int ret;
-    size_t len;
-
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_ALG + ret );
-
-    end = *p + len;
-    alg->tag = **p;
-
-    if( ( ret = asn1_get_tag( p, end, &alg->len, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_ALG + ret );
-
-    alg->p = *p;
-    *p += alg->len;
-
-    if( *p == end )
-        return( 0 );
-
-    /*
-     * assume the algorithm parameters must be NULL
-     */
-    if( ( ret = asn1_get_tag( p, end, &len, ASN1_NULL ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_ALG + ret );
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_ALG +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- *  AttributeTypeAndValue ::= SEQUENCE {
- *    type     AttributeType,
- *    value    AttributeValue }
- *
- *  AttributeType ::= OBJECT IDENTIFIER
- *
- *  AttributeValue ::= ANY DEFINED BY AttributeType
- */
-static int x509_get_attr_type_value( unsigned char **p,
-                                     const unsigned char *end,
-                                     x509_name *cur )
-{
-    int ret;
-    size_t len;
-    x509_buf *oid;
-    x509_buf *val;
-
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME + ret );
-
-    oid = &cur->oid;
-    oid->tag = **p;
-
-    if( ( ret = asn1_get_tag( p, end, &oid->len, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME + ret );
-
-    oid->p = *p;
-    *p += oid->len;
-
-    if( ( end - *p ) < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-    if( **p != ASN1_BMP_STRING && **p != ASN1_UTF8_STRING      &&
-        **p != ASN1_T61_STRING && **p != ASN1_PRINTABLE_STRING &&
-        **p != ASN1_IA5_STRING && **p != ASN1_UNIVERSAL_STRING )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME +
-                POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
-
-    val = &cur->val;
-    val->tag = *(*p)++;
-
-    if( ( ret = asn1_get_len( p, end, &val->len ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME + ret );
-
-    val->p = *p;
-    *p += val->len;
-
-    cur->next = NULL;
-
-    return( 0 );
-}
-
-/*
- *  RelativeDistinguishedName ::=
- *    SET OF AttributeTypeAndValue
- *
- *  AttributeTypeAndValue ::= SEQUENCE {
- *    type     AttributeType,
- *    value    AttributeValue }
- *
- *  AttributeType ::= OBJECT IDENTIFIER
- *
- *  AttributeValue ::= ANY DEFINED BY AttributeType
- */
-static int x509_get_name( unsigned char **p,
-                          const unsigned char *end,
-                          x509_name *cur )
-{
-    int ret;
-    size_t len;
-    const unsigned char *end2;
-    x509_name *use; 
-    
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SET ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_NAME + ret );
-
-    end2 = end;
-    end  = *p + len;
-    use = cur;
-
-    do
-    {
-        if( ( ret = x509_get_attr_type_value( p, end, use ) ) != 0 )
-            return( ret );
-        
-        if( *p != end )
-        {
-            use->next = (x509_name *) malloc(
-                    sizeof( x509_name ) );
-
-            if( use->next == NULL )
-                return( POLARSSL_ERR_X509_MALLOC_FAILED );
-            
-            memset( use->next, 0, sizeof( x509_name ) );
-
-            use = use->next;
-        }
-    }
-    while( *p != end );
-
-    /*
-     * recurse until end of SEQUENCE is reached
-     */
-    if( *p == end2 )
-        return( 0 );
-
-    cur->next = (x509_name *) malloc(
-         sizeof( x509_name ) );
-
-    if( cur->next == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    memset( cur->next, 0, sizeof( x509_name ) );
-
-    return( x509_get_name( p, end2, cur->next ) );
-}
-
-/*
- *  Time ::= CHOICE {
- *       utcTime        UTCTime,
- *       generalTime    GeneralizedTime }
- */
-static int x509_get_time( unsigned char **p,
-                          const unsigned char *end,
-                          x509_time *time )
-{
-    int ret;
-    size_t len;
-    char date[64];
-    unsigned char tag;
-
-    if( ( end - *p ) < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_DATE +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-    tag = **p;
-
-    if ( tag == ASN1_UTC_TIME )
-    {
-        (*p)++;
-        ret = asn1_get_len( p, end, &len );
-        
-        if( ret != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_DATE + ret );
-
-        memset( date,  0, sizeof( date ) );
-        memcpy( date, *p, ( len < sizeof( date ) - 1 ) ?
-                len : sizeof( date ) - 1 );
-
-        if( sscanf( date, "%2d%2d%2d%2d%2d%2d",
-                    &time->year, &time->mon, &time->day,
-                    &time->hour, &time->min, &time->sec ) < 5 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_DATE );
-
-        time->year +=  100 * ( time->year < 50 );
-        time->year += 1900;
-
-        *p += len;
-
-        return( 0 );
-    }
-    else if ( tag == ASN1_GENERALIZED_TIME )
-    {
-        (*p)++;
-        ret = asn1_get_len( p, end, &len );
-        
-        if( ret != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_DATE + ret );
-
-        memset( date,  0, sizeof( date ) );
-        memcpy( date, *p, ( len < sizeof( date ) - 1 ) ?
-                len : sizeof( date ) - 1 );
-
-        if( sscanf( date, "%4d%2d%2d%2d%2d%2d",
-                    &time->year, &time->mon, &time->day,
-                    &time->hour, &time->min, &time->sec ) < 5 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_DATE );
-
-        *p += len;
-
-        return( 0 );
-    }
-    else
-        return( POLARSSL_ERR_X509_CERT_INVALID_DATE + POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
-}
-
-
-/*
- *  Validity ::= SEQUENCE {
- *       notBefore      Time,
- *       notAfter       Time }
- */
-static int x509_get_dates( unsigned char **p,
-                           const unsigned char *end,
-                           x509_time *from,
-                           x509_time *to )
-{
-    int ret;
-    size_t len;
-
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_DATE + ret );
-
-    end = *p + len;
-
-    if( ( ret = x509_get_time( p, end, from ) ) != 0 )
-        return( ret );
-
-    if( ( ret = x509_get_time( p, end, to ) ) != 0 )
-        return( ret );
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_DATE +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
- *       algorithm            AlgorithmIdentifier,
- *       subjectPublicKey     BIT STRING }
- */
-static int x509_get_pubkey( unsigned char **p,
-                            const unsigned char *end,
-                            x509_buf *pk_alg_oid,
-                            mpi *N, mpi *E )
-{
-    int ret;
-    size_t len;
-    unsigned char *end2;
-
-    if( ( ret = x509_get_alg( p, end, pk_alg_oid ) ) != 0 )
-        return( ret );
-
-    /*
-     * only RSA public keys handled at this time
-     */
-    if( pk_alg_oid->len != 9 ||
-        memcmp( pk_alg_oid->p, OID_PKCS1_RSA, 9 ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_UNKNOWN_PK_ALG );
-    }
-
-    if( ( ret = asn1_get_tag( p, end, &len, ASN1_BIT_STRING ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY + ret );
-
-    if( ( end - *p ) < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-    end2 = *p + len;
-
-    if( *(*p)++ != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY );
-
-    /*
-     *  RSAPublicKey ::= SEQUENCE {
-     *      modulus           INTEGER,  -- n
-     *      publicExponent    INTEGER   -- e
-     *  }
-     */
-    if( ( ret = asn1_get_tag( p, end2, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY + ret );
-
-    if( *p + len != end2 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    if( ( ret = asn1_get_mpi( p, end2, N ) ) != 0 ||
-        ( ret = asn1_get_mpi( p, end2, E ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY + ret );
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-static int x509_get_sig( unsigned char **p,
-                         const unsigned char *end,
-                         x509_buf *sig )
-{
-    int ret;
-    size_t len;
-
-    if( ( end - *p ) < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-    sig->tag = **p;
-
-    if( ( ret = asn1_get_tag( p, end, &len, ASN1_BIT_STRING ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE + ret );
-
-
-    if( --len < 1 || *(*p)++ != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE );
-
-    sig->len = len;
-    sig->p = *p;
-
-    *p += len;
-
-    return( 0 );
-}
-
-/*
- * X.509 v2/v3 unique identifier (not parsed)
- */
-static int x509_get_uid( unsigned char **p,
-                         const unsigned char *end,
-                         x509_buf *uid, int n )
-{
-    int ret;
-
-    if( *p == end )
-        return( 0 );
-
-    uid->tag = **p;
-
-    if( ( ret = asn1_get_tag( p, end, &uid->len,
-            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | n ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
-
-        return( ret );
-    }
-
-    uid->p = *p;
-    *p += uid->len;
-
-    return( 0 );
-}
-
-/*
- * X.509 Extensions (No parsing of extensions, pointer should
- * be either manually updated or extensions should be parsed!
- */
-static int x509_get_ext( unsigned char **p,
-                         const unsigned char *end,
-                         x509_buf *ext, int tag )
-{
-    int ret;
-    size_t len;
-
-    if( *p == end )
-        return( 0 );
-
-    ext->tag = **p;
-
-    if( ( ret = asn1_get_tag( p, end, &ext->len,
-            ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | tag ) ) != 0 )
-        return( ret );
-
-    ext->p = *p;
-    end = *p + ext->len;
-
-    /*
-     * Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
-     *
-     * Extension  ::=  SEQUENCE  {
-     *      extnID      OBJECT IDENTIFIER,
-     *      critical    BOOLEAN DEFAULT FALSE,
-     *      extnValue   OCTET STRING  }
-     */
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( end != *p + len )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- * X.509 CRL v2 extensions (no extensions parsed yet.)
- */
-static int x509_get_crl_ext( unsigned char **p,
-                             const unsigned char *end,
-                             x509_buf *ext )
-{
-    int ret;
-    size_t len = 0;
-
-    /* Get explicit tag */
-    if( ( ret = x509_get_ext( p, end, ext, 0) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
-
-        return( ret );
-    }
-
-    while( *p < end )
-    {
-        if( ( ret = asn1_get_tag( p, end, &len,
-                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        *p += len;
-    }
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- * X.509 CRL v2 entry extensions (no extensions parsed yet.)
- */
-static int x509_get_crl_entry_ext( unsigned char **p,
-                             const unsigned char *end,
-                             x509_buf *ext )
-{
-    int ret;
-    size_t len = 0;
-
-    /* OPTIONAL */
-    if (end <= *p)
-        return( 0 );
-
-    ext->tag = **p;
-    ext->p = *p;
-
-    /*
-     * Get CRL-entry extension sequence header
-     * crlEntryExtensions      Extensions OPTIONAL  -- if present, MUST be v2
-     */
-    if( ( ret = asn1_get_tag( p, end, &ext->len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-        {
-            ext->p = NULL;
-            return( 0 );
-        }
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-    }
-
-	end = *p + ext->len;
-
-    if( end != *p + ext->len )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    while( *p < end )
-    {
-        if( ( ret = asn1_get_tag( p, end, &len,
-                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        *p += len;
-    }
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-static int x509_get_basic_constraints( unsigned char **p,
-                                       const unsigned char *end,
-                                       int *ca_istrue,
-                                       int *max_pathlen )
-{
-    int ret;
-    size_t len;
-
-    /*
-     * BasicConstraints ::= SEQUENCE {
-     *      cA                      BOOLEAN DEFAULT FALSE,
-     *      pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
-     */
-    *ca_istrue = 0; /* DEFAULT FALSE */
-    *max_pathlen = 0; /* endless */
-
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( *p == end )
-        return 0;
-
-    if( ( ret = asn1_get_bool( p, end, ca_istrue ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-            ret = asn1_get_int( p, end, ca_istrue );
-
-        if( ret != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        if( *ca_istrue != 0 )
-            *ca_istrue = 1;
-    }
-
-    if( *p == end )
-        return 0;
-
-    if( ( ret = asn1_get_int( p, end, max_pathlen ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    (*max_pathlen)++;
-
-    return 0;
-}
-
-static int x509_get_ns_cert_type( unsigned char **p,
-                                       const unsigned char *end,
-                                       unsigned char *ns_cert_type)
-{
-    int ret;
-    x509_bitstring bs = { 0, 0, NULL };
-
-    if( ( ret = asn1_get_bitstring( p, end, &bs ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( bs.len != 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_INVALID_LENGTH );
-
-    /* Get actual bitstring */
-    *ns_cert_type = *bs.p;
-    return 0;
-}
-
-static int x509_get_key_usage( unsigned char **p,
-                               const unsigned char *end,
-                               unsigned char *key_usage)
-{
-    int ret;
-    x509_bitstring bs = { 0, 0, NULL };
-
-    if( ( ret = asn1_get_bitstring( p, end, &bs ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( bs.len < 1 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_INVALID_LENGTH );
-
-    /* Get actual bitstring */
-    *key_usage = *bs.p;
-    return 0;
-}
-
-/*
- * ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
- *
- * KeyPurposeId ::= OBJECT IDENTIFIER
- */
-static int x509_get_ext_key_usage( unsigned char **p,
-                               const unsigned char *end,
-                               x509_sequence *ext_key_usage)
-{
-    int ret;
-
-    if( ( ret = asn1_get_sequence_of( p, end, ext_key_usage, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    /* Sequence length must be >= 1 */
-    if( ext_key_usage->buf.p == NULL )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_INVALID_LENGTH );
-
-    return 0;
-}
-
-/*
- * SubjectAltName ::= GeneralNames
- *
- * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
- *
- * GeneralName ::= CHOICE {
- *      otherName                       [0]     OtherName,
- *      rfc822Name                      [1]     IA5String,
- *      dNSName                         [2]     IA5String,
- *      x400Address                     [3]     ORAddress,
- *      directoryName                   [4]     Name,
- *      ediPartyName                    [5]     EDIPartyName,
- *      uniformResourceIdentifier       [6]     IA5String,
- *      iPAddress                       [7]     OCTET STRING,
- *      registeredID                    [8]     OBJECT IDENTIFIER }
- *
- * OtherName ::= SEQUENCE {
- *      type-id    OBJECT IDENTIFIER,
- *      value      [0] EXPLICIT ANY DEFINED BY type-id }
- *
- * EDIPartyName ::= SEQUENCE {
- *      nameAssigner            [0]     DirectoryString OPTIONAL,
- *      partyName               [1]     DirectoryString }
- *
- * NOTE: PolarSSL only parses and uses dNSName at this point.
- */
-static int x509_get_subject_alt_name( unsigned char **p,
-                                      const unsigned char *end,
-                                      x509_sequence *subject_alt_name )
-{
-    int ret;
-    size_t len, tag_len;
-    asn1_buf *buf;
-    unsigned char tag;
-    asn1_sequence *cur = subject_alt_name;
-
-    /* Get main sequence tag */
-    if( ( ret = asn1_get_tag( p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-    if( *p + len != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    while( *p < end )
-    {
-        if( ( end - *p ) < 1 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                    POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-        tag = **p;
-        (*p)++;
-        if( ( ret = asn1_get_len( p, end, &tag_len ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        if( ( tag & ASN1_CONTEXT_SPECIFIC ) != ASN1_CONTEXT_SPECIFIC )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                    POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
-
-        if( tag != ( ASN1_CONTEXT_SPECIFIC | 2 ) )
-        {
-            *p += tag_len;
-            continue;
-        }
-
-        buf = &(cur->buf);
-        buf->tag = tag;
-        buf->p = *p;
-        buf->len = tag_len;
-        *p += buf->len;
-
-        /* Allocate and assign next pointer */
-        if (*p < end)
-        {
-            cur->next = (asn1_sequence *) malloc(
-                 sizeof( asn1_sequence ) );
-
-            if( cur->next == NULL )
-                return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                        POLARSSL_ERR_ASN1_MALLOC_FAILED );
-
-            memset( cur->next, 0, sizeof( asn1_sequence ) );
-            cur = cur->next;
-        }
-    }
-
-    /* Set final sequence entry's next pointer to NULL */
-    cur->next = NULL;
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- * X.509 v3 extensions
- *
- * TODO: Perform all of the basic constraints tests required by the RFC
- * TODO: Set values for undetected extensions to a sane default?
- *
- */
-static int x509_get_crt_ext( unsigned char **p,
-                             const unsigned char *end,
-                             x509_cert *crt )
-{
-    int ret;
-    size_t len;
-    unsigned char *end_ext_data, *end_ext_octet;
-
-    if( ( ret = x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
-
-        return( ret );
-    }
-
-    while( *p < end )
-    {
-        /*
-         * Extension  ::=  SEQUENCE  {
-         *      extnID      OBJECT IDENTIFIER,
-         *      critical    BOOLEAN DEFAULT FALSE,
-         *      extnValue   OCTET STRING  }
-         */
-        x509_buf extn_oid = {0, 0, NULL};
-        int is_critical = 0; /* DEFAULT FALSE */
-
-        if( ( ret = asn1_get_tag( p, end, &len,
-                ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        end_ext_data = *p + len;
-
-        /* Get extension ID */
-        extn_oid.tag = **p;
-
-        if( ( ret = asn1_get_tag( p, end, &extn_oid.len, ASN1_OID ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        extn_oid.p = *p;
-        *p += extn_oid.len;
-
-        if( ( end - *p ) < 1 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                    POLARSSL_ERR_ASN1_OUT_OF_DATA );
-
-        /* Get optional critical */
-        if( ( ret = asn1_get_bool( p, end_ext_data, &is_critical ) ) != 0 &&
-            ( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG ) )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        /* Data should be octet string type */
-        if( ( ret = asn1_get_tag( p, end_ext_data, &len,
-                ASN1_OCTET_STRING ) ) != 0 )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS + ret );
-
-        end_ext_octet = *p + len;
-
-        if( end_ext_octet != end_ext_data )
-            return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                    POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-        /*
-         * Detect supported extensions
-         */
-        if( ( OID_SIZE( OID_BASIC_CONSTRAINTS ) == extn_oid.len ) &&
-                memcmp( extn_oid.p, OID_BASIC_CONSTRAINTS, extn_oid.len ) == 0 )
-        {
-            /* Parse basic constraints */
-            if( ( ret = x509_get_basic_constraints( p, end_ext_octet,
-                    &crt->ca_istrue, &crt->max_pathlen ) ) != 0 )
-                return ( ret );
-            crt->ext_types |= EXT_BASIC_CONSTRAINTS;
-        }
-        else if( ( OID_SIZE( OID_NS_CERT_TYPE ) == extn_oid.len ) &&
-                memcmp( extn_oid.p, OID_NS_CERT_TYPE, extn_oid.len ) == 0 )
-        {
-            /* Parse netscape certificate type */
-            if( ( ret = x509_get_ns_cert_type( p, end_ext_octet,
-                    &crt->ns_cert_type ) ) != 0 )
-                return ( ret );
-            crt->ext_types |= EXT_NS_CERT_TYPE;
-        }
-        else if( ( OID_SIZE( OID_KEY_USAGE ) == extn_oid.len ) &&
-                memcmp( extn_oid.p, OID_KEY_USAGE, extn_oid.len ) == 0 )
-        {
-            /* Parse key usage */
-            if( ( ret = x509_get_key_usage( p, end_ext_octet,
-                    &crt->key_usage ) ) != 0 )
-                return ( ret );
-            crt->ext_types |= EXT_KEY_USAGE;
-        }
-        else if( ( OID_SIZE( OID_EXTENDED_KEY_USAGE ) == extn_oid.len ) &&
-                memcmp( extn_oid.p, OID_EXTENDED_KEY_USAGE, extn_oid.len ) == 0 )
-        {
-            /* Parse extended key usage */
-            if( ( ret = x509_get_ext_key_usage( p, end_ext_octet,
-                    &crt->ext_key_usage ) ) != 0 )
-                return ( ret );
-            crt->ext_types |= EXT_EXTENDED_KEY_USAGE;
-        }
-        else if( ( OID_SIZE( OID_SUBJECT_ALT_NAME ) == extn_oid.len ) &&
-                memcmp( extn_oid.p, OID_SUBJECT_ALT_NAME, extn_oid.len ) == 0 )
-        {
-            /* Parse extended key usage */
-            if( ( ret = x509_get_subject_alt_name( p, end_ext_octet,
-                    &crt->subject_alt_names ) ) != 0 )
-                return ( ret );
-            crt->ext_types |= EXT_SUBJECT_ALT_NAME;
-        }
-        else
-        {
-            /* No parser found, skip extension */
-            *p = end_ext_octet;
-
-#if !defined(POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
-            if( is_critical )
-            {
-                /* Data is marked as critical: fail */
-                return ( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                        POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
-            }
-#endif
-        }
-    }
-
-    if( *p != end )
-        return( POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-
-    return( 0 );
-}
-
-/*
- * X.509 CRL Entries
- */
-static int x509_get_entries( unsigned char **p,
-                             const unsigned char *end,
-                             x509_crl_entry *entry )
-{
-    int ret;
-    size_t entry_len;
-    x509_crl_entry *cur_entry = entry;
-
-    if( *p == end )
-        return( 0 );
-
-    if( ( ret = asn1_get_tag( p, end, &entry_len,
-            ASN1_SEQUENCE | ASN1_CONSTRUCTED ) ) != 0 )
-    {
-        if( ret == POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
-            return( 0 );
-
-        return( ret );
-    }
-
-    end = *p + entry_len;
-
-    while( *p < end )
-    {
-        size_t len2;
-        const unsigned char *end2;
-
-        if( ( ret = asn1_get_tag( p, end, &len2,
-                ASN1_SEQUENCE | ASN1_CONSTRUCTED ) ) != 0 )
-        {
-            return( ret );
-        }
-
-        cur_entry->raw.tag = **p;
-        cur_entry->raw.p = *p;
-        cur_entry->raw.len = len2;
-        end2 = *p + len2;
-
-        if( ( ret = x509_get_serial( p, end2, &cur_entry->serial ) ) != 0 )
-            return( ret );
-
-        if( ( ret = x509_get_time( p, end2, &cur_entry->revocation_date ) ) != 0 )
-            return( ret );
-
-        if( ( ret = x509_get_crl_entry_ext( p, end2, &cur_entry->entry_ext ) ) != 0 )
-            return( ret );
-
-        if ( *p < end )
-        {
-            cur_entry->next = malloc( sizeof( x509_crl_entry ) );
-
-            if( cur_entry->next == NULL )
-                return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-            cur_entry = cur_entry->next;
-            memset( cur_entry, 0, sizeof( x509_crl_entry ) );
-        }
-    }
-
-    return( 0 );
-}
-
-static int x509_get_sig_alg( const x509_buf *sig_oid, int *sig_alg )
-{
-    if( sig_oid->len == 9 &&
-        memcmp( sig_oid->p, OID_PKCS1, 8 ) == 0 )
-    {
-        if( sig_oid->p[8] >= 2 && sig_oid->p[8] <= 5 )
-        {
-            *sig_alg = sig_oid->p[8];
-            return( 0 );
-        }
-
-        if ( sig_oid->p[8] >= 11 && sig_oid->p[8] <= 14 )
-        {
-            *sig_alg = sig_oid->p[8];
-            return( 0 );
-        }
-
-        return( POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG );
-    }
-    if( sig_oid->len == 5 &&
-        memcmp( sig_oid->p, OID_RSA_SHA_OBS, 5 ) == 0 )
-    {
-        *sig_alg = SIG_RSA_SHA1;
-        return( 0 );
-    }
-
-    return( POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG );
-}
-
-/*
- * Parse and fill a single X.509 certificate in DER format
- */
-int x509parse_crt_der_core( x509_cert *crt, const unsigned char *buf,
-                            size_t buflen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end, *crt_end;
-
-    /*
-     * Check for valid input
-     */
-    if( crt == NULL || buf == NULL )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-    p = (unsigned char *) malloc( len = buflen );
-
-    if( p == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    memcpy( p, buf, buflen );
-
-    buflen = 0;
-
-    crt->raw.p = p;
-    crt->raw.len = len;
-    end = p + len;
-
-    /*
-     * Certificate  ::=  SEQUENCE  {
-     *      tbsCertificate       TBSCertificate,
-     *      signatureAlgorithm   AlgorithmIdentifier,
-     *      signatureValue       BIT STRING  }
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT );
-    }
-
-    if( len > (size_t) ( end - p ) )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-    crt_end = p + len;
-
-    /*
-     * TBSCertificate  ::=  SEQUENCE  {
-     */
-    crt->tbs.p = p;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-    crt->tbs.len = end - crt->tbs.p;
-
-    /*
-     * Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
-     *
-     * CertificateSerialNumber  ::=  INTEGER
-     *
-     * signature            AlgorithmIdentifier
-     */
-    if( ( ret = x509_get_version( &p, end, &crt->version ) ) != 0 ||
-        ( ret = x509_get_serial(  &p, end, &crt->serial  ) ) != 0 ||
-        ( ret = x509_get_alg(  &p, end, &crt->sig_oid1   ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    crt->version++;
-
-    if( crt->version > 3 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION );
-    }
-
-    if( ( ret = x509_get_sig_alg( &crt->sig_oid1, &crt->sig_alg ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    /*
-     * issuer               Name
-     */
-    crt->issuer_raw.p = p;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = x509_get_name( &p, p + len, &crt->issuer ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    crt->issuer_raw.len = p - crt->issuer_raw.p;
-
-    /*
-     * Validity ::= SEQUENCE {
-     *      notBefore      Time,
-     *      notAfter       Time }
-     *
-     */
-    if( ( ret = x509_get_dates( &p, end, &crt->valid_from,
-                                         &crt->valid_to ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    /*
-     * subject              Name
-     */
-    crt->subject_raw.p = p;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    if( len && ( ret = x509_get_name( &p, p + len, &crt->subject ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    crt->subject_raw.len = p - crt->subject_raw.p;
-
-    /*
-     * SubjectPublicKeyInfo  ::=  SEQUENCE
-     *      algorithm            AlgorithmIdentifier,
-     *      subjectPublicKey     BIT STRING  }
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = x509_get_pubkey( &p, p + len, &crt->pk_oid,
-                                 &crt->rsa.N, &crt->rsa.E ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    if( ( ret = rsa_check_pubkey( &crt->rsa ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    crt->rsa.len = mpi_size( &crt->rsa.N );
-
-    /*
-     *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-     *                       -- If present, version shall be v2 or v3
-     *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-     *                       -- If present, version shall be v2 or v3
-     *  extensions      [3]  EXPLICIT Extensions OPTIONAL
-     *                       -- If present, version shall be v3
-     */
-    if( crt->version == 2 || crt->version == 3 )
-    {
-        ret = x509_get_uid( &p, end, &crt->issuer_id,  1 );
-        if( ret != 0 )
-        {
-            x509_free( crt );
-            return( ret );
-        }
-    }
-
-    if( crt->version == 2 || crt->version == 3 )
-    {
-        ret = x509_get_uid( &p, end, &crt->subject_id,  2 );
-        if( ret != 0 )
-        {
-            x509_free( crt );
-            return( ret );
-        }
-    }
-
-    if( crt->version == 3 )
-    {
-        ret = x509_get_crt_ext( &p, end, crt);
-        if( ret != 0 )
-        {
-            x509_free( crt );
-            return( ret );
-        }
-    }
-
-    if( p != end )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    end = crt_end;
-
-    /*
-     *  signatureAlgorithm   AlgorithmIdentifier,
-     *  signatureValue       BIT STRING
-     */
-    if( ( ret = x509_get_alg( &p, end, &crt->sig_oid2 ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    if( crt->sig_oid1.len != crt->sig_oid2.len ||
-        memcmp( crt->sig_oid1.p, crt->sig_oid2.p, crt->sig_oid1.len ) != 0 )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_SIG_MISMATCH );
-    }
-
-    if( ( ret = x509_get_sig( &p, end, &crt->sig ) ) != 0 )
-    {
-        x509_free( crt );
-        return( ret );
-    }
-
-    if( p != end )
-    {
-        x509_free( crt );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    return( 0 );
-}
-
-/*
- * Parse one X.509 certificate in DER format from a buffer and add them to a
- * chained list
- */
-int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t buflen )
-{
-    int ret;
-    x509_cert *crt = chain, *prev = NULL;
-
-    /*
-     * Check for valid input
-     */
-    if( crt == NULL || buf == NULL )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-    while( crt->version != 0 && crt->next != NULL )
-    {
-        prev = crt;
-        crt = crt->next;
-    }
-
-    /*
-     * Add new certificate on the end of the chain if needed.
-     */
-    if ( crt->version != 0 && crt->next == NULL)
-    {
-        crt->next = (x509_cert *) malloc( sizeof( x509_cert ) );
-
-        if( crt->next == NULL )
-            return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-        prev = crt;
-        crt = crt->next;
-        memset( crt, 0, sizeof( x509_cert ) );
-    }
-
-    if( ( ret = x509parse_crt_der_core( crt, buf, buflen ) ) != 0 )
-    {
-        if( prev )
-            prev->next = NULL;
-
-        if( crt != chain )
-            free( crt );
-
-        return( ret );
-    }
-
-    return( 0 );
-}
-
-/*
- * Parse one or more PEM certificates from a buffer and add them to the chained list
- */
-int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
-{
-    int ret, success = 0, first_error = 0, total_failed = 0;
-    int buf_format = X509_FORMAT_DER;
-
-    /*
-     * Check for valid input
-     */
-    if( chain == NULL || buf == NULL )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-    /*
-     * Determine buffer content. Buffer contains either one DER certificate or
-     * one or more PEM certificates.
-     */
-#if defined(POLARSSL_PEM_C)
-    if( strstr( (const char *) buf, "-----BEGIN CERTIFICATE-----" ) != NULL )
-        buf_format = X509_FORMAT_PEM;
-#endif
-
-    if( buf_format == X509_FORMAT_DER )
-        return x509parse_crt_der( chain, buf, buflen );
-
-#if defined(POLARSSL_PEM_C)
-    if( buf_format == X509_FORMAT_PEM )
-    {
-        pem_context pem;
-
-        while( buflen > 0 )
-        {
-            size_t use_len;
-            pem_init( &pem );
-
-            ret = pem_read_buffer( &pem,
-                           "-----BEGIN CERTIFICATE-----",
-                           "-----END CERTIFICATE-----",
-                           buf, NULL, 0, &use_len );
-
-            if( ret == 0 )
-            {
-                /*
-                 * Was PEM encoded
-                 */
-                buflen -= use_len;
-                buf += use_len;
-            }
-            else if( ret == POLARSSL_ERR_PEM_BAD_INPUT_DATA )
-            {
-                return( ret );
-            }
-            else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-            {
-                pem_free( &pem );
-
-                /*
-                 * PEM header and footer were found
-                 */
-                buflen -= use_len;
-                buf += use_len;
-
-                if( first_error == 0 )
-                    first_error = ret;
-
-                continue;
-            }
-            else
-                break;
-
-            ret = x509parse_crt_der( chain, pem.buf, pem.buflen );
-
-            pem_free( &pem );
-
-            if( ret != 0 )
-            {
-                /*
-                 * Quit parsing on a memory error
-                 */
-                if( ret == POLARSSL_ERR_X509_MALLOC_FAILED )
-                    return( ret );
-
-                if( first_error == 0 )
-                    first_error = ret;
-
-                total_failed++;
-                continue;
-            }
-
-            success = 1;
-        }
-    }
-#endif
-
-    if( success )
-        return( total_failed );
-    else if( first_error )
-        return( first_error );
-    else
-        return( POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT );
-}
-
-/*
- * Parse one or more CRLs and add them to the chained list
- */
-int x509parse_crl( x509_crl *chain, const unsigned char *buf, size_t buflen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end;
-    x509_crl *crl;
-#if defined(POLARSSL_PEM_C)
-    size_t use_len;
-    pem_context pem;
-#endif
-
-    crl = chain;
-
-    /*
-     * Check for valid input
-     */
-    if( crl == NULL || buf == NULL )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-    while( crl->version != 0 && crl->next != NULL )
-        crl = crl->next;
-
-    /*
-     * Add new CRL on the end of the chain if needed.
-     */
-    if ( crl->version != 0 && crl->next == NULL)
-    {
-        crl->next = (x509_crl *) malloc( sizeof( x509_crl ) );
-
-        if( crl->next == NULL )
-        {
-            x509_crl_free( crl );
-            return( POLARSSL_ERR_X509_MALLOC_FAILED );
-        }
-
-        crl = crl->next;
-        memset( crl, 0, sizeof( x509_crl ) );
-    }
-
-#if defined(POLARSSL_PEM_C)
-    pem_init( &pem );
-    ret = pem_read_buffer( &pem,
-                           "-----BEGIN X509 CRL-----",
-                           "-----END X509 CRL-----",
-                           buf, NULL, 0, &use_len );
-
-    if( ret == 0 )
-    {
-        /*
-         * Was PEM encoded
-         */
-        buflen -= use_len;
-        buf += use_len;
-
-        /*
-         * Steal PEM buffer
-         */
-        p = pem.buf;
-        pem.buf = NULL;
-        len = pem.buflen;
-        pem_free( &pem );
-    }
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-    {
-        pem_free( &pem );
-        return( ret );
-    }
-    else
-    {
-        /*
-         * nope, copy the raw DER data
-         */
-        p = (unsigned char *) malloc( len = buflen );
-
-        if( p == NULL )
-            return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-        memcpy( p, buf, buflen );
-
-        buflen = 0;
-    }
-#else
-    p = (unsigned char *) malloc( len = buflen );
-
-    if( p == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    memcpy( p, buf, buflen );
-
-    buflen = 0;
-#endif
-
-    crl->raw.p = p;
-    crl->raw.len = len;
-    end = p + len;
-
-    /*
-     * CertificateList  ::=  SEQUENCE  {
-     *      tbsCertList          TBSCertList,
-     *      signatureAlgorithm   AlgorithmIdentifier,
-     *      signatureValue       BIT STRING  }
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT );
-    }
-
-    if( len != (size_t) ( end - p ) )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    /*
-     * TBSCertList  ::=  SEQUENCE  {
-     */
-    crl->tbs.p = p;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-    crl->tbs.len = end - crl->tbs.p;
-
-    /*
-     * Version  ::=  INTEGER  OPTIONAL {  v1(0), v2(1)  }
-     *               -- if present, MUST be v2
-     *
-     * signature            AlgorithmIdentifier
-     */
-    if( ( ret = x509_crl_get_version( &p, end, &crl->version ) ) != 0 ||
-        ( ret = x509_get_alg(  &p, end, &crl->sig_oid1   ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    crl->version++;
-
-    if( crl->version > 2 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION );
-    }
-
-    if( ( ret = x509_get_sig_alg( &crl->sig_oid1, &crl->sig_alg ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG );
-    }
-
-    /*
-     * issuer               Name
-     */
-    crl->issuer_raw.p = p;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = x509_get_name( &p, p + len, &crl->issuer ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    crl->issuer_raw.len = p - crl->issuer_raw.p;
-
-    /*
-     * thisUpdate          Time
-     * nextUpdate          Time OPTIONAL
-     */
-    if( ( ret = x509_get_time( &p, end, &crl->this_update ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    if( ( ret = x509_get_time( &p, end, &crl->next_update ) ) != 0 )
-    {
-        if ( ret != ( POLARSSL_ERR_X509_CERT_INVALID_DATE +
-                        POLARSSL_ERR_ASN1_UNEXPECTED_TAG ) &&
-             ret != ( POLARSSL_ERR_X509_CERT_INVALID_DATE +
-                        POLARSSL_ERR_ASN1_OUT_OF_DATA ) )
-        {
-            x509_crl_free( crl );
-            return( ret );
-        }
-    }
-
-    /*
-     * revokedCertificates    SEQUENCE OF SEQUENCE   {
-     *      userCertificate        CertificateSerialNumber,
-     *      revocationDate         Time,
-     *      crlEntryExtensions     Extensions OPTIONAL
-     *                                   -- if present, MUST be v2
-     *                        } OPTIONAL
-     */
-    if( ( ret = x509_get_entries( &p, end, &crl->entry ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    /*
-     * crlExtensions          EXPLICIT Extensions OPTIONAL
-     *                              -- if present, MUST be v2
-     */
-    if( crl->version == 2 )
-    {
-        ret = x509_get_crl_ext( &p, end, &crl->crl_ext );
-                            
-        if( ret != 0 )
-        {
-            x509_crl_free( crl );
-            return( ret );
-        }
-    }
-
-    if( p != end )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    end = crl->raw.p + crl->raw.len;
-
-    /*
-     *  signatureAlgorithm   AlgorithmIdentifier,
-     *  signatureValue       BIT STRING
-     */
-    if( ( ret = x509_get_alg( &p, end, &crl->sig_oid2 ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    if( crl->sig_oid1.len != crl->sig_oid2.len ||
-        memcmp( crl->sig_oid1.p, crl->sig_oid2.p, crl->sig_oid1.len ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_SIG_MISMATCH );
-    }
-
-    if( ( ret = x509_get_sig( &p, end, &crl->sig ) ) != 0 )
-    {
-        x509_crl_free( crl );
-        return( ret );
-    }
-
-    if( p != end )
-    {
-        x509_crl_free( crl );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    if( buflen > 0 )
-    {
-        crl->next = (x509_crl *) malloc( sizeof( x509_crl ) );
-
-        if( crl->next == NULL )
-        {
-            x509_crl_free( crl );
-            return( POLARSSL_ERR_X509_MALLOC_FAILED );
-        }
-
-        crl = crl->next;
-        memset( crl, 0, sizeof( x509_crl ) );
-
-        return( x509parse_crl( crl, buf, buflen ) );
-    }
-
-    return( 0 );
-}
-
-#if defined(POLARSSL_FS_IO)
-/*
- * Load all data from a file into a given buffer.
- */
-int load_file( const char *path, unsigned char **buf, size_t *n )
-{
-    FILE *f;
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
-
-    fseek( f, 0, SEEK_END );
-    *n = (size_t) ftell( f );
-    fseek( f, 0, SEEK_SET );
-
-    if( ( *buf = (unsigned char *) malloc( *n + 1 ) ) == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    if( fread( *buf, 1, *n, f ) != *n )
-    {
-        fclose( f );
-        free( *buf );
-        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
-    }
-
-    fclose( f );
-
-    (*buf)[*n] = '\0';
-
-    return( 0 );
-}
-
-/*
- * Load one or more certificates and add them to the chained list
- */
-int x509parse_crtfile( x509_cert *chain, const char *path )
-{
-    int ret;
-    size_t n;
-    unsigned char *buf;
-
-    if ( (ret = load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
-
-    ret = x509parse_crt( chain, buf, n );
-
-    memset( buf, 0, n + 1 );
-    free( buf );
-
-    return( ret );
-}
-
-int x509parse_crtpath( x509_cert *chain, const char *path )
-{
-    int ret = 0;
-#if defined(_WIN32)
-    int w_ret;
-    WCHAR szDir[MAX_PATH];
-    char filename[MAX_PATH];
-	char *p;
-    int len = strlen( path );
-
-	WIN32_FIND_DATAW file_data;
-    HANDLE hFind;
-
-    if( len > MAX_PATH - 3 )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-	memset( szDir, 0, sizeof(szDir) );
-	memset( filename, 0, MAX_PATH );
-	memcpy( filename, path, len );
-	filename[len++] = '\\';
-	p = filename + len;
-    filename[len++] = '*';
-
-	w_ret = MultiByteToWideChar( CP_ACP, 0, path, len, szDir, MAX_PATH - 3 );
-
-    hFind = FindFirstFileW( szDir, &file_data );
-    if (hFind == INVALID_HANDLE_VALUE) 
-        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
-
-    len = MAX_PATH - len;
-    do
-    {
-		memset( p, 0, len );
-
-        if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
-            continue;
-
-		w_ret = WideCharToMultiByte( CP_ACP, 0, file_data.cFileName,
-									 lstrlenW(file_data.cFileName),
-									 p, len - 1,
-									 NULL, NULL );
-
-        w_ret = x509parse_crtfile( chain, filename );
-        if( w_ret < 0 )
-            ret++;
-        else
-            ret += w_ret;
-    }
-    while( FindNextFileW( hFind, &file_data ) != 0 );
-
-    if (GetLastError() != ERROR_NO_MORE_FILES) 
-        ret = POLARSSL_ERR_X509_FILE_IO_ERROR;
-
-cleanup:
-    FindClose( hFind );
-#else
-    int t_ret, i;
-    struct stat sb;
-    struct dirent entry, *result = NULL;
-    char entry_name[255];
-    DIR *dir = opendir( path );
-
-    if( dir == NULL)
-        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
-
-    while( ( t_ret = readdir_r( dir, &entry, &result ) ) == 0 )
-    {
-        if( result == NULL )
-            break;
-
-        snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry.d_name );
-
-        i = stat( entry_name, &sb );
-
-        if( i == -1 )
-            return( POLARSSL_ERR_X509_FILE_IO_ERROR );
-
-        if( !S_ISREG( sb.st_mode ) )
-            continue;
-
-        // Ignore parse errors
-        //
-        t_ret = x509parse_crtfile( chain, entry_name );
-        if( t_ret < 0 )
-            ret++;
-        else
-            ret += t_ret;
-    }
-    closedir( dir );
-#endif
-
-    return( ret );
-}
-
-/*
- * Load one or more CRLs and add them to the chained list
- */
-int x509parse_crlfile( x509_crl *chain, const char *path )
-{
-    int ret;
-    size_t n;
-    unsigned char *buf;
-
-    if ( (ret = load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
-
-    ret = x509parse_crl( chain, buf, n );
-
-    memset( buf, 0, n + 1 );
-    free( buf );
-
-    return( ret );
-}
-
-/*
- * Load and parse a private RSA key
- */
-int x509parse_keyfile( rsa_context *rsa, const char *path, const char *pwd )
-{
-    int ret;
-    size_t n;
-    unsigned char *buf;
-
-    if ( (ret = load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
-
-    if( pwd == NULL )
-        ret = x509parse_key( rsa, buf, n, NULL, 0 );
-    else
-        ret = x509parse_key( rsa, buf, n,
-                (unsigned char *) pwd, strlen( pwd ) );
-
-    memset( buf, 0, n + 1 );
-    free( buf );
-
-    return( ret );
-}
-
-/*
- * Load and parse a public RSA key
- */
-int x509parse_public_keyfile( rsa_context *rsa, const char *path )
-{
-    int ret;
-    size_t n;
-    unsigned char *buf;
-
-    if ( (ret = load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
-
-    ret = x509parse_public_key( rsa, buf, n );
-
-    memset( buf, 0, n + 1 );
-    free( buf );
-
-    return( ret );
-}
-#endif /* POLARSSL_FS_IO */
-
-/*
- * Parse a PKCS#1 encoded private RSA key
- */
-static int x509parse_key_pkcs1_der( rsa_context *rsa,
-                                    const unsigned char *key,
-                                    size_t keylen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end;
-
-    p = (unsigned char *) key;
-    end = p + keylen;
-
-    /*
-     * This function parses the RSAPrivateKey (PKCS#1)
-     *
-     *  RSAPrivateKey ::= SEQUENCE {
-     *      version           Version,
-     *      modulus           INTEGER,  -- n
-     *      publicExponent    INTEGER,  -- e
-     *      privateExponent   INTEGER,  -- d
-     *      prime1            INTEGER,  -- p
-     *      prime2            INTEGER,  -- q
-     *      exponent1         INTEGER,  -- d mod (p-1)
-     *      exponent2         INTEGER,  -- d mod (q-1)
-     *      coefficient       INTEGER,  -- (inverse of q) mod p
-     *      otherPrimeInfos   OtherPrimeInfos OPTIONAL
-     *  }
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-
-    if( ( ret = asn1_get_int( &p, end, &rsa->ver ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    if( rsa->ver != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_VERSION + ret );
-    }
-
-    if( ( ret = asn1_get_mpi( &p, end, &rsa->N  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->E  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->D  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->P  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->Q  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->DP ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->DQ ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &rsa->QP ) ) != 0 )
-    {
-        rsa_free( rsa );
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    rsa->len = mpi_size( &rsa->N );
-
-    if( p != end )
-    {
-        rsa_free( rsa );
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-    if( ( ret = rsa_check_privkey( rsa ) ) != 0 )
-    {
-        rsa_free( rsa );
-        return( ret );
-    }
-
-    return( 0 );
-}
-
-/*
- * Parse an unencrypted PKCS#8 encoded private RSA key
- */
-static int x509parse_key_pkcs8_unencrypted_der(
-                                    rsa_context *rsa,
-                                    const unsigned char *key,
-                                    size_t keylen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end;
-    x509_buf pk_alg_oid;
-
-    p = (unsigned char *) key;
-    end = p + keylen;
-
-    /*
-     * This function parses the PrivatKeyInfo object (PKCS#8)
-     *
-     *  PrivateKeyInfo ::= SEQUENCE {
-     *    version           Version,
-     *    algorithm       AlgorithmIdentifier,
-     *    PrivateKey      BIT STRING
-     *  }
-     *
-     *  AlgorithmIdentifier ::= SEQUENCE {
-     *    algorithm       OBJECT IDENTIFIER,
-     *    parameters      ANY DEFINED BY algorithm OPTIONAL
-     *  }
-     *
-     *  The PrivateKey BIT STRING is a PKCS#1 RSAPrivateKey
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-
-    if( ( ret = asn1_get_int( &p, end, &rsa->ver ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    if( rsa->ver != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_VERSION + ret );
-    }
-
-    if( ( ret = x509_get_alg( &p, end, &pk_alg_oid ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    /*
-     * only RSA keys handled at this time
-     */
-    if( pk_alg_oid.len != 9 ||
-        memcmp( pk_alg_oid.p, OID_PKCS1_RSA, 9 ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_UNKNOWN_PK_ALG );
-    }
-
-    /*
-     * Get the OCTET STRING and parse the PKCS#1 format inside
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-
-    if( ( end - p ) < 1 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_OUT_OF_DATA );
-    }
-
-    end = p + len;
-
-    if( ( ret = x509parse_key_pkcs1_der( rsa, p, end - p ) ) != 0 )
-        return( ret );
-
-    return( 0 );
-}
-
-/*
- * Parse an encrypted PKCS#8 encoded private RSA key
- */
-static int x509parse_key_pkcs8_encrypted_der(
-                                    rsa_context *rsa,
-                                    const unsigned char *key,
-                                    size_t keylen,
-                                    const unsigned char *pwd,
-                                    size_t pwdlen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end, *end2;
-    x509_buf pbe_alg_oid, pbe_params;
-    unsigned char buf[2048];
-
-    memset(buf, 0, 2048);
-
-    p = (unsigned char *) key;
-    end = p + keylen;
-
-    if( pwdlen == 0 )
-        return( POLARSSL_ERR_X509_PASSWORD_REQUIRED );
-
-    /*
-     * This function parses the EncryptedPrivatKeyInfo object (PKCS#8)
-     *
-     *  EncryptedPrivateKeyInfo ::= SEQUENCE {
-     *    encryptionAlgorithm  EncryptionAlgorithmIdentifier,
-     *    encryptedData        EncryptedData
-     *  }
-     *
-     *  EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-     *
-     *  EncryptedData ::= OCTET STRING
-     *
-     *  The EncryptedData OCTET STRING is a PKCS#8 PrivateKeyInfo
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    end2 = p + len;
-
-    if( ( ret = asn1_get_tag( &p, end, &pbe_alg_oid.len, ASN1_OID ) ) != 0 )
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-
-    pbe_alg_oid.p = p;
-    p += pbe_alg_oid.len;
-
-    /*
-     * Store the algorithm parameters
-     */
-    pbe_params.p = p;
-    pbe_params.len = end2 - p;
-    p += pbe_params.len;
-
-    if( ( ret = asn1_get_tag( &p, end, &len, ASN1_OCTET_STRING ) ) != 0 )
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-
-    // buf has been sized to 2048 bytes
-    if( len > 2048 )
-        return( POLARSSL_ERR_X509_INVALID_INPUT );
-
-    /*
-     * Decrypt EncryptedData with appropriate PDE
-     */
-#if defined(POLARSSL_PKCS12_C)
-    if( OID_CMP( OID_PKCS12_PBE_SHA1_DES3_EDE_CBC, &pbe_alg_oid ) )
-    {
-        if( ( ret = pkcs12_pbe( &pbe_params, PKCS12_PBE_DECRYPT,
-                                POLARSSL_CIPHER_DES_EDE3_CBC, POLARSSL_MD_SHA1,
-                                pwd, pwdlen, p, len, buf ) ) != 0 )
-        {
-            if( ret == POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH )
-                return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
-
-            return( ret );
-        }
-    }
-    else if( OID_CMP( OID_PKCS12_PBE_SHA1_DES2_EDE_CBC, &pbe_alg_oid ) )
-    {
-        if( ( ret = pkcs12_pbe( &pbe_params, PKCS12_PBE_DECRYPT,
-                                POLARSSL_CIPHER_DES_EDE_CBC, POLARSSL_MD_SHA1,
-                                pwd, pwdlen, p, len, buf ) ) != 0 )
-        {
-            if( ret == POLARSSL_ERR_PKCS12_PASSWORD_MISMATCH )
-                return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
-
-            return( ret );
-        }
-    }
-    else if( OID_CMP( OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) )
-    {
-        if( ( ret = pkcs12_pbe_sha1_rc4_128( &pbe_params,
-                                             PKCS12_PBE_DECRYPT,
-                                             pwd, pwdlen,
-                                             p, len, buf ) ) != 0 )
-        {
-            return( ret );
-        }
-
-        // Best guess for password mismatch when using RC4. If first tag is
-        // not ASN1_CONSTRUCTED | ASN1_SEQUENCE
-        //
-        if( *buf != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
-            return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
-    }
-    else
-#endif /* POLARSSL_PKCS12_C */
-#if defined(POLARSSL_PKCS5_C)
-    if( OID_CMP( OID_PKCS5_PBES2, &pbe_alg_oid ) )
-    {
-        if( ( ret = pkcs5_pbes2( &pbe_params, PKCS5_DECRYPT, pwd, pwdlen,
-                                  p, len, buf ) ) != 0 )
-        {
-            if( ret == POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH )
-                return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
-
-            return( ret );
-        }
-    }
-    else
-#endif /* POLARSSL_PKCS5_C */
-        return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE );
-
-    return x509parse_key_pkcs8_unencrypted_der( rsa, buf, len );
-}
-
-/*
- * Parse a private RSA key
- */
-int x509parse_key( rsa_context *rsa, const unsigned char *key, size_t keylen,
-                                     const unsigned char *pwd, size_t pwdlen )
-{
-    int ret;
-
-#if defined(POLARSSL_PEM_C)
-    size_t len;
-    pem_context pem;
-
-    pem_init( &pem );
-    ret = pem_read_buffer( &pem,
-                           "-----BEGIN RSA PRIVATE KEY-----",
-                           "-----END RSA PRIVATE KEY-----",
-                           key, pwd, pwdlen, &len );
-    if( ret == 0 )
-    {
-        if( ( ret = x509parse_key_pkcs1_der( rsa, pem.buf, pem.buflen ) ) != 0 )
-        {
-            rsa_free( rsa );
-        }
-
-        pem_free( &pem );
-        return( ret );
-    }
-    else if( ret == POLARSSL_ERR_PEM_PASSWORD_MISMATCH )
-        return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
-    else if( ret == POLARSSL_ERR_PEM_PASSWORD_REQUIRED )
-        return( POLARSSL_ERR_X509_PASSWORD_REQUIRED );
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
-
-    ret = pem_read_buffer( &pem,
-                           "-----BEGIN PRIVATE KEY-----",
-                           "-----END PRIVATE KEY-----",
-                           key, NULL, 0, &len );
-    if( ret == 0 )
-    {
-        if( ( ret = x509parse_key_pkcs8_unencrypted_der( rsa,
-                                                pem.buf, pem.buflen ) ) != 0 )
-        {
-            rsa_free( rsa );
-        }
-
-        pem_free( &pem );
-        return( ret );
-    }
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
-
-    ret = pem_read_buffer( &pem,
-                           "-----BEGIN ENCRYPTED PRIVATE KEY-----",
-                           "-----END ENCRYPTED PRIVATE KEY-----",
-                           key, NULL, 0, &len );
-    if( ret == 0 )
-    {
-        if( ( ret = x509parse_key_pkcs8_encrypted_der( rsa,
-                                                pem.buf, pem.buflen,
-                                                pwd, pwdlen ) ) != 0 )
-        {
-            rsa_free( rsa );
-        }
-
-        pem_free( &pem );
-        return( ret );
-    }
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-        return( ret );
-#else
-    ((void) pwd);
-    ((void) pwdlen);
-#endif /* POLARSSL_PEM_C */
-
-    // At this point we only know it's not a PEM formatted key. Could be any
-    // of the known DER encoded private key formats
-    //
-    // We try the different DER format parsers to see if one passes without
-    // error
-    //
-    if( ( ret = x509parse_key_pkcs8_encrypted_der( rsa, key, keylen,
-                                                   pwd, pwdlen ) ) == 0 )
-    {
-        return( 0 );
-    }
-
-    rsa_free( rsa );
-
-    if( ret == POLARSSL_ERR_X509_PASSWORD_MISMATCH )
-    {
-        return( ret );
-    }
-
-    if( ( ret = x509parse_key_pkcs8_unencrypted_der( rsa, key, keylen ) ) == 0 )
-        return( 0 );
-
-    rsa_free( rsa );
-
-    if( ( ret = x509parse_key_pkcs1_der( rsa, key, keylen ) ) == 0 )
-        return( 0 );
-
-    rsa_free( rsa );
-
-    return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT );
-}
-
-/*
- * Parse a public RSA key
- */
-int x509parse_public_key( rsa_context *rsa, const unsigned char *key, size_t keylen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end;
-    x509_buf alg_oid;
-#if defined(POLARSSL_PEM_C)
-    pem_context pem;
-
-    pem_init( &pem );
-    ret = pem_read_buffer( &pem,
-            "-----BEGIN PUBLIC KEY-----",
-            "-----END PUBLIC KEY-----",
-            key, NULL, 0, &len );
-
-    if( ret == 0 )
-    {
-        /*
-         * Was PEM encoded
-         */
-        keylen = pem.buflen;
-    }
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-    {
-        pem_free( &pem );
-        return( ret );
-    }
-
-    p = ( ret == 0 ) ? pem.buf : (unsigned char *) key;
-#else
-    p = (unsigned char *) key;
-#endif
-    end = p + keylen;
-
-    /*
-     *  PublicKeyInfo ::= SEQUENCE {
-     *    algorithm       AlgorithmIdentifier,
-     *    PublicKey       BIT STRING
-     *  }
-     *
-     *  AlgorithmIdentifier ::= SEQUENCE {
-     *    algorithm       OBJECT IDENTIFIER,
-     *    parameters      ANY DEFINED BY algorithm OPTIONAL
-     *  }
-     *
-     *  RSAPublicKey ::= SEQUENCE {
-     *      modulus           INTEGER,  -- n
-     *      publicExponent    INTEGER   -- e
-     *  }
-     */
-
-    if( ( ret = asn1_get_tag( &p, end, &len,
-                    ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        rsa_free( rsa );
-        return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = x509_get_pubkey( &p, end, &alg_oid, &rsa->N, &rsa->E ) ) != 0 )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        rsa_free( rsa );
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    if( ( ret = rsa_check_pubkey( rsa ) ) != 0 )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        rsa_free( rsa );
-        return( ret );
-    }
-
-    rsa->len = mpi_size( &rsa->N );
-
-#if defined(POLARSSL_PEM_C)
-    pem_free( &pem );
-#endif
-
-    return( 0 );
-}
-
-#if defined(POLARSSL_DHM_C)
-/*
- * Parse DHM parameters
- */
-int x509parse_dhm( dhm_context *dhm, const unsigned char *dhmin, size_t dhminlen )
-{
-    int ret;
-    size_t len;
-    unsigned char *p, *end;
-#if defined(POLARSSL_PEM_C)
-    pem_context pem;
-
-    pem_init( &pem );
-
-    ret = pem_read_buffer( &pem, 
-                           "-----BEGIN DH PARAMETERS-----",
-                           "-----END DH PARAMETERS-----",
-                           dhmin, NULL, 0, &dhminlen );
-
-    if( ret == 0 )
-    {
-        /*
-         * Was PEM encoded
-         */
-        dhminlen = pem.buflen;
-    }
-    else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
-    {
-        pem_free( &pem );
-        return( ret );
-    }
-
-    p = ( ret == 0 ) ? pem.buf : (unsigned char *) dhmin;
-#else
-    p = (unsigned char *) dhmin;
-#endif
-    end = p + dhminlen;
-
-    memset( dhm, 0, sizeof( dhm_context ) );
-
-    /*
-     *  DHParams ::= SEQUENCE {
-     *      prime            INTEGER,  -- P
-     *      generator        INTEGER,  -- g
-     *  }
-     */
-    if( ( ret = asn1_get_tag( &p, end, &len,
-            ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) != 0 )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    end = p + len;
-
-    if( ( ret = asn1_get_mpi( &p, end, &dhm->P  ) ) != 0 ||
-        ( ret = asn1_get_mpi( &p, end, &dhm->G ) ) != 0 )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        dhm_free( dhm );
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
-    }
-
-    if( p != end )
-    {
-#if defined(POLARSSL_PEM_C)
-        pem_free( &pem );
-#endif
-        dhm_free( dhm );
-        return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT +
-                POLARSSL_ERR_ASN1_LENGTH_MISMATCH );
-    }
-
-#if defined(POLARSSL_PEM_C)
-    pem_free( &pem );
-#endif
-
-    return( 0 );
-}
-
-#if defined(POLARSSL_FS_IO)
-/*
- * Load and parse a private RSA key
- */
-int x509parse_dhmfile( dhm_context *dhm, const char *path )
-{
-    int ret;
-    size_t n;
-    unsigned char *buf;
-
-    if ( ( ret = load_file( path, &buf, &n ) ) != 0 )
-        return( ret );
-
-    ret = x509parse_dhm( dhm, buf, n );
-
-    memset( buf, 0, n + 1 );
-    free( buf );
-
-    return( ret );
-}
-#endif /* POLARSSL_FS_IO */
-#endif /* POLARSSL_DHM_C */
-
-#if defined _MSC_VER && !defined snprintf
-#include <stdarg.h>
-
-#if !defined vsnprintf
-#define vsnprintf _vsnprintf
-#endif // vsnprintf
-
-/*
- * Windows _snprintf and _vsnprintf are not compatible to linux versions.
- * Result value is not size of buffer needed, but -1 if no fit is possible.
- *
- * This fuction tries to 'fix' this by at least suggesting enlarging the
- * size by 20.
- */
-int compat_snprintf(char *str, size_t size, const char *format, ...)
-{
-    va_list ap;
-    int res = -1;
-
-    va_start( ap, format );
-
-    res = vsnprintf( str, size, format, ap );
-
-    va_end( ap );
-
-    // No quick fix possible
-    if ( res < 0 )
-        return( (int) size + 20 );
-    
-    return res;
-}
-
-#define snprintf compat_snprintf
-#endif
-
-#define POLARSSL_ERR_DEBUG_BUF_TOO_SMALL    -2
-
-#define SAFE_SNPRINTF()                         \
-{                                               \
-    if( ret == -1 )                             \
-        return( -1 );                           \
-                                                \
-    if ( (unsigned int) ret > n ) {             \
-        p[n - 1] = '\0';                        \
-        return POLARSSL_ERR_DEBUG_BUF_TOO_SMALL;\
-    }                                           \
-                                                \
-    n -= (unsigned int) ret;                    \
-    p += (unsigned int) ret;                    \
-}
-
-/*
- * Store the name in printable form into buf; no more
- * than size characters will be written
- */
-int x509parse_dn_gets( char *buf, size_t size, const x509_name *dn )
-{
-    int ret;
-    size_t i, n;
-    unsigned char c;
-    const x509_name *name;
-    char s[128], *p;
-
-    memset( s, 0, sizeof( s ) );
-
-    name = dn;
-    p = buf;
-    n = size;
-
-    while( name != NULL )
-    {
-        if( !name->oid.p )
-        {
-            name = name->next;
-            continue;
-        }
-
-        if( name != dn )
-        {
-            ret = snprintf( p, n, ", " );
-            SAFE_SNPRINTF();
-        }
-
-        if( name->oid.len == 3 &&
-            memcmp( name->oid.p, OID_X520, 2 ) == 0 )
-        {
-            switch( name->oid.p[2] )
-            {
-            case X520_COMMON_NAME:
-                ret = snprintf( p, n, "CN=" ); break;
-
-            case X520_COUNTRY:
-                ret = snprintf( p, n, "C="  ); break;
-
-            case X520_LOCALITY:
-                ret = snprintf( p, n, "L="  ); break;
-
-            case X520_STATE:
-                ret = snprintf( p, n, "ST=" ); break;
-
-            case X520_ORGANIZATION:
-                ret = snprintf( p, n, "O="  ); break;
-
-            case X520_ORG_UNIT:
-                ret = snprintf( p, n, "OU=" ); break;
-
-            default:
-                ret = snprintf( p, n, "0x%02X=",
-                               name->oid.p[2] );
-                break;
-            }
-        SAFE_SNPRINTF();
-        }
-        else if( name->oid.len == 9 &&
-                 memcmp( name->oid.p, OID_PKCS9, 8 ) == 0 )
-        {
-            switch( name->oid.p[8] )
-            {
-            case PKCS9_EMAIL:
-                ret = snprintf( p, n, "emailAddress=" ); break;
-
-            default:
-                ret = snprintf( p, n, "0x%02X=",
-                               name->oid.p[8] );
-                break;
-            }
-        SAFE_SNPRINTF();
-        }
-        else
-        {
-            ret = snprintf( p, n, "\?\?=" );
-            SAFE_SNPRINTF();
-        }
-
-        for( i = 0; i < name->val.len; i++ )
-        {
-            if( i >= sizeof( s ) - 1 )
-                break;
-
-            c = name->val.p[i];
-            if( c < 32 || c == 127 || ( c > 128 && c < 160 ) )
-                 s[i] = '?';
-            else s[i] = c;
-        }
-        s[i] = '\0';
-        ret = snprintf( p, n, "%s", s );
-    SAFE_SNPRINTF();
-        name = name->next;
-    }
-
-    return( (int) ( size - n ) );
-}
-
-/*
- * Store the serial in printable form into buf; no more
- * than size characters will be written
- */
-int x509parse_serial_gets( char *buf, size_t size, const x509_buf *serial )
-{
-    int ret;
-    size_t i, n, nr;
-    char *p;
-
-    p = buf;
-    n = size;
-
-    nr = ( serial->len <= 32 )
-        ? serial->len  : 28;
-
-    for( i = 0; i < nr; i++ )
-    {
-        if( i == 0 && nr > 1 && serial->p[i] == 0x0 )
-            continue;
-
-        ret = snprintf( p, n, "%02X%s",
-                serial->p[i], ( i < nr - 1 ) ? ":" : "" );
-        SAFE_SNPRINTF();
-    }
-
-    if( nr != serial->len )
-    {
-        ret = snprintf( p, n, "...." );
-        SAFE_SNPRINTF();
-    }
-
-    return( (int) ( size - n ) );
-}
-
-/*
- * Return an informational string about the certificate.
- */
-int x509parse_cert_info( char *buf, size_t size, const char *prefix,
-                         const x509_cert *crt )
-{
-    int ret;
-    size_t n;
-    char *p;
-
-    p = buf;
-    n = size;
-
-    ret = snprintf( p, n, "%scert. version : %d\n",
-                               prefix, crt->version );
-    SAFE_SNPRINTF();
-    ret = snprintf( p, n, "%sserial number : ",
-                               prefix );
-    SAFE_SNPRINTF();
-
-    ret = x509parse_serial_gets( p, n, &crt->serial);
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sissuer name   : ", prefix );
-    SAFE_SNPRINTF();
-    ret = x509parse_dn_gets( p, n, &crt->issuer  );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%ssubject name  : ", prefix );
-    SAFE_SNPRINTF();
-    ret = x509parse_dn_gets( p, n, &crt->subject );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sissued  on    : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crt->valid_from.year, crt->valid_from.mon,
-                   crt->valid_from.day,  crt->valid_from.hour,
-                   crt->valid_from.min,  crt->valid_from.sec );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sexpires on    : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crt->valid_to.year, crt->valid_to.mon,
-                   crt->valid_to.day,  crt->valid_to.hour,
-                   crt->valid_to.min,  crt->valid_to.sec );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%ssigned using  : RSA+", prefix );
-    SAFE_SNPRINTF();
-
-    switch( crt->sig_alg )
-    {
-        case SIG_RSA_MD2    : ret = snprintf( p, n, "MD2"    ); break;
-        case SIG_RSA_MD4    : ret = snprintf( p, n, "MD4"    ); break;
-        case SIG_RSA_MD5    : ret = snprintf( p, n, "MD5"    ); break;
-        case SIG_RSA_SHA1   : ret = snprintf( p, n, "SHA1"   ); break;
-        case SIG_RSA_SHA224 : ret = snprintf( p, n, "SHA224" ); break;
-        case SIG_RSA_SHA256 : ret = snprintf( p, n, "SHA256" ); break;
-        case SIG_RSA_SHA384 : ret = snprintf( p, n, "SHA384" ); break;
-        case SIG_RSA_SHA512 : ret = snprintf( p, n, "SHA512" ); break;
-        default: ret = snprintf( p, n, "???"  ); break;
-    }
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sRSA key size  : %d bits\n", prefix,
-                   (int) crt->rsa.N.n * (int) sizeof( t_uint ) * 8 );
-    SAFE_SNPRINTF();
-
-    return( (int) ( size - n ) );
-}
-
-/*
- * Return an informational string describing the given OID
- */
-const char *x509_oid_get_description( x509_buf *oid )
-{
-    if ( oid == NULL )
-        return ( NULL );
-    
-    else if( OID_CMP( OID_SERVER_AUTH, oid ) )
-        return( STRING_SERVER_AUTH );
-    
-    else if( OID_CMP( OID_CLIENT_AUTH, oid ) )
-        return( STRING_CLIENT_AUTH );
-    
-    else if( OID_CMP( OID_CODE_SIGNING, oid ) )
-        return( STRING_CODE_SIGNING );
-    
-    else if( OID_CMP( OID_EMAIL_PROTECTION, oid ) )
-        return( STRING_EMAIL_PROTECTION );
-    
-    else if( OID_CMP( OID_TIME_STAMPING, oid ) )
-        return( STRING_TIME_STAMPING );
-
-    else if( OID_CMP( OID_OCSP_SIGNING, oid ) )
-        return( STRING_OCSP_SIGNING );
-
-    return( NULL );
-}
-
-/* Return the x.y.z.... style numeric string for the given OID */
-int x509_oid_get_numeric_string( char *buf, size_t size, x509_buf *oid )
-{
-    int ret;
-    size_t i, n;
-    unsigned int value;
-    char *p;
-
-    p = buf;
-    n = size;
-
-    /* First byte contains first two dots */
-    if( oid->len > 0 )
-    {
-        ret = snprintf( p, n, "%d.%d", oid->p[0]/40, oid->p[0]%40 );
-        SAFE_SNPRINTF();
-    }
-
-    /* TODO: value can overflow in value. */
-    value = 0;
-    for( i = 1; i < oid->len; i++ )
-    {
-        value <<= 7;
-        value += oid->p[i] & 0x7F;
-
-        if( !( oid->p[i] & 0x80 ) )
-        {
-            /* Last byte */
-            ret = snprintf( p, n, ".%d", value );
-            SAFE_SNPRINTF();
-            value = 0;
-        }
-    }
-
-    return( (int) ( size - n ) );
-}
-
-/*
- * Return an informational string about the CRL.
- */
-int x509parse_crl_info( char *buf, size_t size, const char *prefix,
-                        const x509_crl *crl )
-{
-    int ret;
-    size_t n;
-    char *p;
-    const x509_crl_entry *entry;
-
-    p = buf;
-    n = size;
-
-    ret = snprintf( p, n, "%sCRL version   : %d",
-                               prefix, crl->version );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sissuer name   : ", prefix );
-    SAFE_SNPRINTF();
-    ret = x509parse_dn_gets( p, n, &crl->issuer );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%sthis update   : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crl->this_update.year, crl->this_update.mon,
-                   crl->this_update.day,  crl->this_update.hour,
-                   crl->this_update.min,  crl->this_update.sec );
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n%snext update   : " \
-                   "%04d-%02d-%02d %02d:%02d:%02d", prefix,
-                   crl->next_update.year, crl->next_update.mon,
-                   crl->next_update.day,  crl->next_update.hour,
-                   crl->next_update.min,  crl->next_update.sec );
-    SAFE_SNPRINTF();
-
-    entry = &crl->entry;
-
-    ret = snprintf( p, n, "\n%sRevoked certificates:",
-                               prefix );
-    SAFE_SNPRINTF();
-
-    while( entry != NULL && entry->raw.len != 0 )
-    {
-        ret = snprintf( p, n, "\n%sserial number: ",
-                               prefix );
-        SAFE_SNPRINTF();
-
-        ret = x509parse_serial_gets( p, n, &entry->serial);
-        SAFE_SNPRINTF();
-
-        ret = snprintf( p, n, " revocation date: " \
-                   "%04d-%02d-%02d %02d:%02d:%02d",
-                   entry->revocation_date.year, entry->revocation_date.mon,
-                   entry->revocation_date.day,  entry->revocation_date.hour,
-                   entry->revocation_date.min,  entry->revocation_date.sec );
-        SAFE_SNPRINTF();
-
-        entry = entry->next;
-    }
-
-    ret = snprintf( p, n, "\n%ssigned using  : RSA+", prefix );
-    SAFE_SNPRINTF();
-
-    switch( crl->sig_alg )
-    {
-        case SIG_RSA_MD2    : ret = snprintf( p, n, "MD2"    ); break;
-        case SIG_RSA_MD4    : ret = snprintf( p, n, "MD4"    ); break;
-        case SIG_RSA_MD5    : ret = snprintf( p, n, "MD5"    ); break;
-        case SIG_RSA_SHA1   : ret = snprintf( p, n, "SHA1"   ); break;
-        case SIG_RSA_SHA224 : ret = snprintf( p, n, "SHA224" ); break;
-        case SIG_RSA_SHA256 : ret = snprintf( p, n, "SHA256" ); break;
-        case SIG_RSA_SHA384 : ret = snprintf( p, n, "SHA384" ); break;
-        case SIG_RSA_SHA512 : ret = snprintf( p, n, "SHA512" ); break;
-        default: ret = snprintf( p, n, "???"  ); break;
-    }
-    SAFE_SNPRINTF();
-
-    ret = snprintf( p, n, "\n" );
-    SAFE_SNPRINTF();
-
-    return( (int) ( size - n ) );
-}
-
-/*
- * Return 0 if the x509_time is still valid, or 1 otherwise.
- */
-int x509parse_time_expired( const x509_time *to )
-{
-    int year, mon, day;
-    int hour, min, sec;
-
-#if defined(_WIN32)
-    SYSTEMTIME st;
-
-    GetLocalTime(&st);
-
-    year = st.wYear;
-    mon = st.wMonth;
-    day = st.wDay;
-    hour = st.wHour;
-    min = st.wMinute;
-    sec = st.wSecond;
-#else
-    struct tm *lt;
-    time_t tt;
-
-    tt = time( NULL );
-    lt = localtime( &tt );
-
-    year = lt->tm_year + 1900;
-    mon = lt->tm_mon + 1;
-    day = lt->tm_mday;
-    hour = lt->tm_hour;
-    min = lt->tm_min;
-    sec = lt->tm_sec;
-#endif
-
-    if( year  > to->year )
-        return( 1 );
-
-    if( year == to->year &&
-        mon   > to->mon )
-        return( 1 );
-
-    if( year == to->year &&
-        mon  == to->mon  &&
-        day   > to->day )
-        return( 1 );
-
-    if( year == to->year &&
-        mon  == to->mon  &&
-        day  == to->day  &&
-        hour  > to->hour )
-        return( 1 );
-
-    if( year == to->year &&
-        mon  == to->mon  &&
-        day  == to->day  &&
-        hour == to->hour &&
-        min   > to->min  )
-        return( 1 );
-
-    if( year == to->year &&
-        mon  == to->mon  &&
-        day  == to->day  &&
-        hour == to->hour &&
-        min  == to->min  &&
-        sec   > to->sec  )
-        return( 1 );
-
-    return( 0 );
-}
-
-/*
- * Return 1 if the certificate is revoked, or 0 otherwise.
- */
-int x509parse_revoked( const x509_cert *crt, const x509_crl *crl )
-{
-    const x509_crl_entry *cur = &crl->entry;
-
-    while( cur != NULL && cur->serial.len != 0 )
-    {
-        if( crt->serial.len == cur->serial.len &&
-            memcmp( crt->serial.p, cur->serial.p, crt->serial.len ) == 0 )
-        {
-            if( x509parse_time_expired( &cur->revocation_date ) )
-                return( 1 );
-        }
-
-        cur = cur->next;
-    }
-
-    return( 0 );
-}
-
-/*
- * Wrapper for x509 hashes.
- */
-static void x509_hash( const unsigned char *in, size_t len, int alg,
-                       unsigned char *out )
-{
-    switch( alg )
-    {
-#if defined(POLARSSL_MD2_C)
-        case SIG_RSA_MD2    :  md2( in, len, out ); break;
-#endif
-#if defined(POLARSSL_MD4_C)
-        case SIG_RSA_MD4    :  md4( in, len, out ); break;
-#endif
-#if defined(POLARSSL_MD5_C)
-        case SIG_RSA_MD5    :  md5( in, len, out ); break;
-#endif
-#if defined(POLARSSL_SHA1_C)
-        case SIG_RSA_SHA1   : sha1( in, len, out ); break;
-#endif
-#if defined(POLARSSL_SHA2_C)
-        case SIG_RSA_SHA224 : sha2( in, len, out, 1 ); break;
-        case SIG_RSA_SHA256 : sha2( in, len, out, 0 ); break;
-#endif
-#if defined(POLARSSL_SHA4_C)
-        case SIG_RSA_SHA384 : sha4( in, len, out, 1 ); break;
-        case SIG_RSA_SHA512 : sha4( in, len, out, 0 ); break;
-#endif
-        default:
-            memset( out, '\xFF', 64 );
-            break;
-    }
-}
-
-/*
- * Check that the given certificate is valid accoring to the CRL.
- */
-static int x509parse_verifycrl(x509_cert *crt, x509_cert *ca,
-        x509_crl *crl_list)
-{
-    int flags = 0;
-    int hash_id;
-    unsigned char hash[64];
-
-    if( ca == NULL )
-        return( flags );
-
-    /*
-     * TODO: What happens if no CRL is present?
-     * Suggestion: Revocation state should be unknown if no CRL is present.
-     * For backwards compatibility this is not yet implemented.
-     */
-
-    while( crl_list != NULL )
-    {
-        if( crl_list->version == 0 ||
-            crl_list->issuer_raw.len != ca->subject_raw.len ||
-            memcmp( crl_list->issuer_raw.p, ca->subject_raw.p,
-                    crl_list->issuer_raw.len ) != 0 )
-        {
-            crl_list = crl_list->next;
-            continue;
-        }
-
-        /*
-         * Check if CRL is correctly signed by the trusted CA
-         */
-        hash_id = crl_list->sig_alg;
-
-        x509_hash( crl_list->tbs.p, crl_list->tbs.len, hash_id, hash );
-
-        if( !rsa_pkcs1_verify( &ca->rsa, RSA_PUBLIC, hash_id,
-                              0, hash, crl_list->sig.p ) == 0 )
-        {
-            /*
-             * CRL is not trusted
-             */
-            flags |= BADCRL_NOT_TRUSTED;
-            break;
-        }
-
-        /*
-         * Check for validity of CRL (Do not drop out)
-         */
-        if( x509parse_time_expired( &crl_list->next_update ) )
-            flags |= BADCRL_EXPIRED;
-
-        /*
-         * Check if certificate is revoked
-         */
-        if( x509parse_revoked(crt, crl_list) )
-        {
-            flags |= BADCERT_REVOKED;
-            break;
-        }
-
-        crl_list = crl_list->next;
-    }
-    return flags;
-}
-
-int x509_wildcard_verify( const char *cn, x509_buf *name )
-{
-    size_t i;
-    size_t cn_idx = 0;
-
-    if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' )
-        return( 0 );
-
-    for( i = 0; i < strlen( cn ); ++i )
-    {
-        if( cn[i] == '.' )
-        {
-            cn_idx = i;
-            break;
-        }
-    }
-
-    if( cn_idx == 0 )
-        return( 0 );
-
-    if( strlen( cn ) - cn_idx == name->len - 1 &&
-        memcmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 )
-    {
-        return( 1 );
-    }
-
-    return( 0 );
-}
-
-static int x509parse_verify_top(
-                x509_cert *child, x509_cert *trust_ca,
-                x509_crl *ca_crl, int path_cnt, int *flags,
-                int (*f_vrfy)(void *, x509_cert *, int, int *),
-                void *p_vrfy )
-{
-    int hash_id, ret;
-    int ca_flags = 0, check_path_cnt = path_cnt + 1;
-    unsigned char hash[64];
-
-    if( x509parse_time_expired( &child->valid_to ) )
-        *flags |= BADCERT_EXPIRED;
-
-    /*
-     * Child is the top of the chain. Check against the trust_ca list.
-     */
-    *flags |= BADCERT_NOT_TRUSTED;
-
-    while( trust_ca != NULL )
-    {
-        if( trust_ca->version == 0 ||
-            child->issuer_raw.len != trust_ca->subject_raw.len ||
-            memcmp( child->issuer_raw.p, trust_ca->subject_raw.p,
-                    child->issuer_raw.len ) != 0 )
-        {
-            trust_ca = trust_ca->next;
-            continue;
-        }
-
-        /*
-         * Reduce path_len to check against if top of the chain is
-         * the same as the trusted CA
-         */
-        if( child->subject_raw.len == trust_ca->subject_raw.len &&
-            memcmp( child->subject_raw.p, trust_ca->subject_raw.p,
-                            child->issuer_raw.len ) == 0 ) 
-        {
-            check_path_cnt--;
-        }
-
-        if( trust_ca->max_pathlen > 0 &&
-            trust_ca->max_pathlen < check_path_cnt )
-        {
-            trust_ca = trust_ca->next;
-            continue;
-        }
-
-        hash_id = child->sig_alg;
-
-        x509_hash( child->tbs.p, child->tbs.len, hash_id, hash );
-
-        if( rsa_pkcs1_verify( &trust_ca->rsa, RSA_PUBLIC, hash_id,
-                    0, hash, child->sig.p ) != 0 )
-        {
-            trust_ca = trust_ca->next;
-            continue;
-        }
-
-        /*
-         * Top of chain is signed by a trusted CA
-         */
-        *flags &= ~BADCERT_NOT_TRUSTED;
-        break;
-    }
-
-    /*
-     * If top of chain is not the same as the trusted CA send a verify request
-     * to the callback for any issues with validity and CRL presence for the
-     * trusted CA certificate.
-     */
-    if( trust_ca != NULL &&
-        ( child->subject_raw.len != trust_ca->subject_raw.len ||
-          memcmp( child->subject_raw.p, trust_ca->subject_raw.p,
-                            child->issuer_raw.len ) != 0 ) )
-    {
-        /* Check trusted CA's CRL for then chain's top crt */
-        *flags |= x509parse_verifycrl( child, trust_ca, ca_crl );
-
-        if( x509parse_time_expired( &trust_ca->valid_to ) )
-            ca_flags |= BADCERT_EXPIRED;
-
-        if( NULL != f_vrfy )
-        {
-            if( ( ret = f_vrfy( p_vrfy, trust_ca, path_cnt + 1, &ca_flags ) ) != 0 )
-                return( ret );
-        }
-    }
-
-    /* Call callback on top cert */
-    if( NULL != f_vrfy )
-    {
-        if( ( ret = f_vrfy(p_vrfy, child, path_cnt, flags ) ) != 0 )
-            return( ret );
-    }
-
-    *flags |= ca_flags;
-
-    return( 0 );
-}
-
-static int x509parse_verify_child(
-                x509_cert *child, x509_cert *parent, x509_cert *trust_ca,
-                x509_crl *ca_crl, int path_cnt, int *flags,
-                int (*f_vrfy)(void *, x509_cert *, int, int *),
-                void *p_vrfy )
-{
-    int hash_id, ret;
-    int parent_flags = 0;
-    unsigned char hash[64];
-    x509_cert *grandparent;
-
-    if( x509parse_time_expired( &child->valid_to ) )
-        *flags |= BADCERT_EXPIRED;
-
-    hash_id = child->sig_alg;
-
-    x509_hash( child->tbs.p, child->tbs.len, hash_id, hash );
-
-    if( rsa_pkcs1_verify( &parent->rsa, RSA_PUBLIC, hash_id, 0, hash,
-                           child->sig.p ) != 0 )
-        *flags |= BADCERT_NOT_TRUSTED;
-        
-    /* Check trusted CA's CRL for the given crt */
-    *flags |= x509parse_verifycrl(child, parent, ca_crl);
-
-    grandparent = parent->next;
-
-    while( grandparent != NULL )
-    {
-        if( grandparent->version == 0 ||
-            grandparent->ca_istrue == 0 ||
-            parent->issuer_raw.len != grandparent->subject_raw.len ||
-            memcmp( parent->issuer_raw.p, grandparent->subject_raw.p,
-                    parent->issuer_raw.len ) != 0 )
-        {
-            grandparent = grandparent->next;
-            continue;
-        }
-        break;
-    }
-
-    if( grandparent != NULL )
-    {
-        /*
-         * Part of the chain
-         */
-        ret = x509parse_verify_child( parent, grandparent, trust_ca, ca_crl, path_cnt + 1, &parent_flags, f_vrfy, p_vrfy );
-        if( ret != 0 )
-            return( ret );
-    } 
-    else
-    {
-        ret = x509parse_verify_top( parent, trust_ca, ca_crl, path_cnt + 1, &parent_flags, f_vrfy, p_vrfy );
-        if( ret != 0 )
-            return( ret );
-    }
-
-    /* child is verified to be a child of the parent, call verify callback */
-    if( NULL != f_vrfy )
-        if( ( ret = f_vrfy( p_vrfy, child, path_cnt, flags ) ) != 0 )
-            return( ret );
-
-    *flags |= parent_flags;
-
-    return( 0 );
-}
-
-/*
- * Verify the certificate validity
- */
-int x509parse_verify( x509_cert *crt,
-                      x509_cert *trust_ca,
-                      x509_crl *ca_crl,
-                      const char *cn, int *flags,
-                      int (*f_vrfy)(void *, x509_cert *, int, int *),
-                      void *p_vrfy )
-{
-    size_t cn_len;
-    int ret;
-    int pathlen = 0;
-    x509_cert *parent;
-    x509_name *name;
-    x509_sequence *cur = NULL;
-
-    *flags = 0;
-
-    if( cn != NULL )
-    {
-        name = &crt->subject;
-        cn_len = strlen( cn );
-
-        if( crt->ext_types & EXT_SUBJECT_ALT_NAME )
-        {
-            cur = &crt->subject_alt_names;
-
-            while( cur != NULL )
-            {
-                if( cur->buf.len == cn_len &&
-                    memcmp( cn, cur->buf.p, cn_len ) == 0 )
-                    break;
-
-                if( cur->buf.len > 2 &&
-                    memcmp( cur->buf.p, "*.", 2 ) == 0 &&
-                            x509_wildcard_verify( cn, &cur->buf ) )
-                    break;
-
-                cur = cur->next;
-            }
-
-            if( cur == NULL )
-                *flags |= BADCERT_CN_MISMATCH;
-        }
-        else
-        {
-            while( name != NULL )
-            {
-                if( name->oid.len == 3 &&
-                    memcmp( name->oid.p, OID_CN,  3 ) == 0 )
-                {
-                    if( name->val.len == cn_len &&
-                        memcmp( name->val.p, cn, cn_len ) == 0 )
-                        break;
-
-                    if( name->val.len > 2 &&
-                        memcmp( name->val.p, "*.", 2 ) == 0 &&
-                                x509_wildcard_verify( cn, &name->val ) )
-                        break;
-                }
-
-                name = name->next;
-            }
-
-            if( name == NULL )
-                *flags |= BADCERT_CN_MISMATCH;
-        }
-    }
-
-    /*
-     * Iterate upwards in the given cert chain, to find our crt parent.
-     * Ignore any upper cert with CA != TRUE.
-     */
-    parent = crt->next;
-
-    while( parent != NULL && parent->version != 0 )
-    {
-        if( parent->ca_istrue == 0 ||
-            crt->issuer_raw.len != parent->subject_raw.len ||
-            memcmp( crt->issuer_raw.p, parent->subject_raw.p,
-                    crt->issuer_raw.len ) != 0 )
-        {
-            parent = parent->next;
-            continue;
-        }
-        break;
-    }
-
-    if( parent != NULL )
-    {
-        /*
-         * Part of the chain
-         */
-        ret = x509parse_verify_child( crt, parent, trust_ca, ca_crl, pathlen, flags, f_vrfy, p_vrfy );
-        if( ret != 0 )
-            return( ret );
-    } 
-    else
-    {
-        ret = x509parse_verify_top( crt, trust_ca, ca_crl, pathlen, flags, f_vrfy, p_vrfy );
-        if( ret != 0 )
-            return( ret );
-    }
-
-    if( *flags != 0 )
-        return( POLARSSL_ERR_X509_CERT_VERIFY_FAILED );
-
-    return( 0 );
-}
-
-/*
- * Unallocate all certificate data
- */
-void x509_free( x509_cert *crt )
-{
-    x509_cert *cert_cur = crt;
-    x509_cert *cert_prv;
-    x509_name *name_cur;
-    x509_name *name_prv;
-    x509_sequence *seq_cur;
-    x509_sequence *seq_prv;
-
-    if( crt == NULL )
-        return;
-
-    do
-    {
-        rsa_free( &cert_cur->rsa );
-
-        name_cur = cert_cur->issuer.next;
-        while( name_cur != NULL )
-        {
-            name_prv = name_cur;
-            name_cur = name_cur->next;
-            memset( name_prv, 0, sizeof( x509_name ) );
-            free( name_prv );
-        }
-
-        name_cur = cert_cur->subject.next;
-        while( name_cur != NULL )
-        {
-            name_prv = name_cur;
-            name_cur = name_cur->next;
-            memset( name_prv, 0, sizeof( x509_name ) );
-            free( name_prv );
-        }
-
-        seq_cur = cert_cur->ext_key_usage.next;
-        while( seq_cur != NULL )
-        {
-            seq_prv = seq_cur;
-            seq_cur = seq_cur->next;
-            memset( seq_prv, 0, sizeof( x509_sequence ) );
-            free( seq_prv );
-        }
-
-        seq_cur = cert_cur->subject_alt_names.next;
-        while( seq_cur != NULL )
-        {
-            seq_prv = seq_cur;
-            seq_cur = seq_cur->next;
-            memset( seq_prv, 0, sizeof( x509_sequence ) );
-            free( seq_prv );
-        }
-
-        if( cert_cur->raw.p != NULL )
-        {
-            memset( cert_cur->raw.p, 0, cert_cur->raw.len );
-            free( cert_cur->raw.p );
-        }
-
-        cert_cur = cert_cur->next;
-    }
-    while( cert_cur != NULL );
-
-    cert_cur = crt;
-    do
-    {
-        cert_prv = cert_cur;
-        cert_cur = cert_cur->next;
-
-        memset( cert_prv, 0, sizeof( x509_cert ) );
-        if( cert_prv != crt )
-            free( cert_prv );
-    }
-    while( cert_cur != NULL );
-}
-
-/*
- * Unallocate all CRL data
- */
-void x509_crl_free( x509_crl *crl )
-{
-    x509_crl *crl_cur = crl;
-    x509_crl *crl_prv;
-    x509_name *name_cur;
-    x509_name *name_prv;
-    x509_crl_entry *entry_cur;
-    x509_crl_entry *entry_prv;
-
-    if( crl == NULL )
-        return;
-
-    do
-    {
-        name_cur = crl_cur->issuer.next;
-        while( name_cur != NULL )
-        {
-            name_prv = name_cur;
-            name_cur = name_cur->next;
-            memset( name_prv, 0, sizeof( x509_name ) );
-            free( name_prv );
-        }
-
-        entry_cur = crl_cur->entry.next;
-        while( entry_cur != NULL )
-        {
-            entry_prv = entry_cur;
-            entry_cur = entry_cur->next;
-            memset( entry_prv, 0, sizeof( x509_crl_entry ) );
-            free( entry_prv );
-        }
-
-        if( crl_cur->raw.p != NULL )
-        {
-            memset( crl_cur->raw.p, 0, crl_cur->raw.len );
-            free( crl_cur->raw.p );
-        }
-
-        crl_cur = crl_cur->next;
-    }
-    while( crl_cur != NULL );
-
-    crl_cur = crl;
-    do
-    {
-        crl_prv = crl_cur;
-        crl_cur = crl_cur->next;
-
-        memset( crl_prv, 0, sizeof( x509_crl ) );
-        if( crl_prv != crl )
-            free( crl_prv );
-    }
-    while( crl_cur != NULL );
-}
-
-#if defined(POLARSSL_SELF_TEST)
-
-#include "polarssl/certs.h"
-
-/*
- * Checkup routine
- */
-int x509_self_test( int verbose )
-{
-#if defined(POLARSSL_CERTS_C) && defined(POLARSSL_MD5_C)
-    int ret;
-    int flags;
-    size_t i, j;
-    x509_cert cacert;
-    x509_cert clicert;
-    rsa_context rsa;
-#if defined(POLARSSL_DHM_C)
-    dhm_context dhm;
-#endif
-
-    if( verbose != 0 )
-        printf( "  X.509 certificate load: " );
-
-    memset( &clicert, 0, sizeof( x509_cert ) );
-
-    ret = x509parse_crt( &clicert, (const unsigned char *) test_cli_crt,
-                         strlen( test_cli_crt ) );
-    if( ret != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( ret );
-    }
-
-    memset( &cacert, 0, sizeof( x509_cert ) );
-
-    ret = x509parse_crt( &cacert, (const unsigned char *) test_ca_crt,
-                         strlen( test_ca_crt ) );
-    if( ret != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( ret );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n  X.509 private key load: " );
-
-    i = strlen( test_ca_key );
-    j = strlen( test_ca_pwd );
-
-    rsa_init( &rsa, RSA_PKCS_V15, 0 );
-
-    if( ( ret = x509parse_key( &rsa,
-                    (const unsigned char *) test_ca_key, i,
-                    (const unsigned char *) test_ca_pwd, j ) ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( ret );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n  X.509 signature verify: ");
-
-    ret = x509parse_verify( &clicert, &cacert, NULL, "PolarSSL Client 2", &flags, NULL, NULL );
-    if( ret != 0 )
-    {
-        printf("%02x", flags);
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( ret );
-    }
-
-#if defined(POLARSSL_DHM_C)
-    if( verbose != 0 )
-        printf( "passed\n  X.509 DHM parameter load: " );
-
-    i = strlen( test_dhm_params );
-    j = strlen( test_ca_pwd );
-
-    if( ( ret = x509parse_dhm( &dhm, (const unsigned char *) test_dhm_params, i ) ) != 0 )
-    {
-        if( verbose != 0 )
-            printf( "failed\n" );
-
-        return( ret );
-    }
-
-    if( verbose != 0 )
-        printf( "passed\n\n" );
-#endif
-
-    x509_free( &cacert  );
-    x509_free( &clicert );
-    rsa_free( &rsa );
-#if defined(POLARSSL_DHM_C)
-    dhm_free( &dhm );
-#endif
-
-    return( 0 );
-#else
-    ((void) verbose);
-    return( POLARSSL_ERR_X509_FEATURE_UNAVAILABLE );
-#endif
-}
-
-#endif
-
-#endif
diff --git a/Externals/polarssl/library/x509write.c b/Externals/polarssl/library/x509write.c
deleted file mode 100644
index 9f5a91009b..0000000000
--- a/Externals/polarssl/library/x509write.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * X509 buffer writing functionality
- *
- *  Copyright (C) 2006-2012, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "polarssl/config.h"
-
-#if defined(POLARSSL_X509_WRITE_C)
-
-#include "polarssl/asn1write.h"
-#include "polarssl/x509write.h"
-#include "polarssl/x509.h"
-#include "polarssl/sha1.h"
-#include "polarssl/sha2.h"
-#include "polarssl/sha4.h"
-#include "polarssl/md4.h"
-#include "polarssl/md5.h"
-
-int x509_write_pubkey_der( unsigned char *buf, size_t size, rsa_context *rsa )
-{
-    int ret;
-    unsigned char *c;
-    size_t len = 0;
-
-    c = buf + size - 1;
-
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->E ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->N ) );
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    if( c - buf < 1 )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    *--c = 0;
-    len += 1;
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_BIT_STRING ) );
-
-    ASN1_CHK_ADD( len, asn1_write_algorithm_identifier( &c, buf, OID_PKCS1_RSA ) );
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    return( len );
-}
-
-int x509_write_key_der( unsigned char *buf, size_t size, rsa_context *rsa )
-{
-    int ret;
-    unsigned char *c;
-    size_t len = 0;
-
-    c = buf + size - 1;
-
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->QP ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->DQ ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->DP ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->Q ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->P ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->D ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->E ) );
-    ASN1_CHK_ADD( len, asn1_write_mpi( &c, buf, &rsa->N ) );
-    ASN1_CHK_ADD( len, asn1_write_int( &c, buf, 0 ) );
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    // TODO: Make NON RSA Specific variant later on
-/*    *--c = 0;
-    len += 1;
-
-    len += asn1_write_len( &c, len);
-    len += asn1_write_tag( &c, ASN1_BIT_STRING );
-
-    len += asn1_write_oid( &c, OID_PKCS1_RSA );
-
-    len += asn1_write_int( &c, 0 );
-
-    len += asn1_write_len( &c, len);
-    len += asn1_write_tag( &c, ASN1_CONSTRUCTED | ASN1_SEQUENCE );*/
-
-/*    for(i = 0; i < len; ++i)
-    {
-        if (i % 16 == 0 ) printf("\n");
-        printf("%02x ", c[i]);
-    }
-    printf("\n");*/
-
-    return( len );
-}
-
-int x509_write_name( unsigned char **p, unsigned char *start, char *oid,
-                     char *name )
-{
-    int ret;
-    size_t string_len = 0;
-    size_t oid_len = 0;
-    size_t len = 0;
-
-    // Write PrintableString for all except OID_PKCS9_EMAIL
-    //
-    if( OID_SIZE( OID_PKCS9_EMAIL ) == strlen( oid ) &&
-        memcmp( oid, OID_PKCS9_EMAIL, strlen( oid ) ) == 0 )
-    {
-        ASN1_CHK_ADD( string_len, asn1_write_ia5_string( p, start, name ) );
-    }
-    else
-        ASN1_CHK_ADD( string_len, asn1_write_printable_string( p, start, name ) );
-
-    // Write OID
-    //
-    ASN1_CHK_ADD( oid_len, asn1_write_oid( p, start, oid ) );
-
-    len = oid_len + string_len;
-    ASN1_CHK_ADD( len, asn1_write_len( p, start, oid_len + string_len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_CONSTRUCTED | ASN1_SET ) );
-
-    return( len );
-}
-
-/*
- * Wrapper for x509 hashes.
- */
-static void x509_hash( const unsigned char *in, size_t len, int alg,
-                       unsigned char *out )
-{
-    switch( alg )
-    {
-#if defined(POLARSSL_MD2_C)
-        case SIG_RSA_MD2    :  md2( in, len, out ); break;
-#endif
-#if defined(POLARSSL_MD4_C)
-        case SIG_RSA_MD4    :  md4( in, len, out ); break;
-#endif
-#if defined(POLARSSL_MD5_C)
-        case SIG_RSA_MD5    :  md5( in, len, out ); break;
-#endif
-#if defined(POLARSSL_SHA1_C)
-        case SIG_RSA_SHA1   : sha1( in, len, out ); break;
-#endif
-#if defined(POLARSSL_SHA2_C)
-        case SIG_RSA_SHA224 : sha2( in, len, out, 1 ); break;
-        case SIG_RSA_SHA256 : sha2( in, len, out, 0 ); break;
-#endif
-#if defined(POLARSSL_SHA4_C)
-        case SIG_RSA_SHA384 : sha4( in, len, out, 1 ); break;
-        case SIG_RSA_SHA512 : sha4( in, len, out, 0 ); break;
-#endif
-        default:
-            memset( out, '\xFF', 64 );
-            break;
-    }
-}
-
-int x509_write_sig( unsigned char **p, unsigned char *start, char *oid,
-                    unsigned char *sig, size_t size )
-{
-    int ret;
-    size_t len = 0;
-
-    if( *p - start < (int) size + 1 )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    len = size;
-    (*p) -= len;
-    memcpy( *p, sig, len );
-
-    *--(*p) = 0;
-    len += 1;
-
-    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_BIT_STRING ) );
-
-    // Write OID
-    //
-    ASN1_CHK_ADD( len, asn1_write_algorithm_identifier( p, start, oid ) );
-
-    return( len );
-}
-
-int x509_write_cert_req( unsigned char *buf, size_t size, rsa_context *rsa,
-                         x509_req_name *req_name, int hash_id )
-{
-    int ret;
-    char sig_oid[10];
-    unsigned char *c, *c2;
-    unsigned char hash[64];
-    unsigned char sig[POLARSSL_MPI_MAX_SIZE];
-    unsigned char tmp_buf[2048];
-    size_t sub_len = 0, pub_len = 0, sig_len = 0;
-    size_t len = 0;
-    x509_req_name *cur = req_name;
-
-    c = tmp_buf + 2048 - 1;
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, 0 ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED | ASN1_CONTEXT_SPECIFIC ) );
-
-    ASN1_CHK_ADD( pub_len, asn1_write_mpi( &c, tmp_buf, &rsa->E ) );
-    ASN1_CHK_ADD( pub_len, asn1_write_mpi( &c, tmp_buf, &rsa->N ) );
-
-    ASN1_CHK_ADD( pub_len, asn1_write_len( &c, tmp_buf, pub_len ) );
-    ASN1_CHK_ADD( pub_len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    if( c - tmp_buf < 1 )
-        return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
-
-    *--c = 0;
-    pub_len += 1;
-
-    ASN1_CHK_ADD( pub_len, asn1_write_len( &c, tmp_buf, pub_len ) );
-    ASN1_CHK_ADD( pub_len, asn1_write_tag( &c, tmp_buf, ASN1_BIT_STRING ) );
-
-    ASN1_CHK_ADD( pub_len, asn1_write_algorithm_identifier( &c, tmp_buf, OID_PKCS1_RSA ) );
-
-    len += pub_len;
-    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, pub_len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    while( cur != NULL )
-    {
-        ASN1_CHK_ADD( sub_len, x509_write_name( &c, tmp_buf, cur->oid, cur->name ) );
-        
-        cur = cur->next;
-    }
-
-    len += sub_len;
-    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, sub_len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    ASN1_CHK_ADD( len, asn1_write_int( &c, tmp_buf, 0 ) );
-
-    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-    
-    x509_hash( c, len, hash_id, hash );
-
-    rsa_pkcs1_sign( rsa, NULL, NULL, RSA_PRIVATE, hash_id, 0, hash, sig );
-
-    // Generate correct OID
-    //
-    memcpy( sig_oid, OID_PKCS1, 8 );
-    sig_oid[8] = hash_id;
-    sig_oid[9] = '\0';
-
-    c2 = buf + size - 1;
-    ASN1_CHK_ADD( sig_len, x509_write_sig( &c2, buf, sig_oid, sig, rsa->len ) );
-    
-    c2 -= len;
-    memcpy( c2, c, len ); 
-    
-    len += sig_len;
-    ASN1_CHK_ADD( len, asn1_write_len( &c2, buf, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( &c2, buf, ASN1_CONSTRUCTED | ASN1_SEQUENCE ) );
-
-    return( len );
-}
-
-#endif
diff --git a/Externals/polarssl/library/x509write_crt.c b/Externals/polarssl/library/x509write_crt.c
new file mode 100644
index 0000000000..e298c24ecf
--- /dev/null
+++ b/Externals/polarssl/library/x509write_crt.c
@@ -0,0 +1,452 @@
+/*
+ *  X.509 certificate writing
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * References:
+ * - certificates: RFC 5280, updated by RFC 6818
+ * - CSRs: PKCS#10 v1.7 aka RFC 2986
+ * - attributes: PKCS#9 v2.0 aka RFC 2985
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CRT_WRITE_C)
+
+#include "polarssl/x509_crt.h"
+#include "polarssl/oid.h"
+#include "polarssl/asn1write.h"
+#include "polarssl/sha1.h"
+
+#if defined(POLARSSL_PEM_WRITE_C)
+#include "polarssl/pem.h"
+#endif /* POLARSSL_PEM_WRITE_C */
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+void x509write_crt_init( x509write_cert *ctx )
+{
+    memset( ctx, 0, sizeof(x509write_cert) );
+
+    mpi_init( &ctx->serial );
+    ctx->version = X509_CRT_VERSION_3;
+}
+
+void x509write_crt_free( x509write_cert *ctx )
+{
+    mpi_free( &ctx->serial );
+
+    asn1_free_named_data_list( &ctx->subject );
+    asn1_free_named_data_list( &ctx->issuer );
+    asn1_free_named_data_list( &ctx->extensions );
+
+    polarssl_zeroize( ctx, sizeof(x509write_cert) );
+}
+
+void x509write_crt_set_version( x509write_cert *ctx, int version )
+{
+    ctx->version = version;
+}
+
+void x509write_crt_set_md_alg( x509write_cert *ctx, md_type_t md_alg )
+{
+    ctx->md_alg = md_alg;
+}
+
+void x509write_crt_set_subject_key( x509write_cert *ctx, pk_context *key )
+{
+    ctx->subject_key = key;
+}
+
+void x509write_crt_set_issuer_key( x509write_cert *ctx, pk_context *key )
+{
+    ctx->issuer_key = key;
+}
+
+int x509write_crt_set_subject_name( x509write_cert *ctx,
+                                    const char *subject_name )
+{
+    return x509_string_to_names( &ctx->subject, subject_name );
+}
+
+int x509write_crt_set_issuer_name( x509write_cert *ctx,
+                                   const char *issuer_name )
+{
+    return x509_string_to_names( &ctx->issuer, issuer_name );
+}
+
+int x509write_crt_set_serial( x509write_cert *ctx, const mpi *serial )
+{
+    int ret;
+
+    if( ( ret = mpi_copy( &ctx->serial, serial ) ) != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+int x509write_crt_set_validity( x509write_cert *ctx, const char *not_before,
+                                const char *not_after )
+{
+    if( strlen( not_before ) != X509_RFC5280_UTC_TIME_LEN - 1 ||
+        strlen( not_after )  != X509_RFC5280_UTC_TIME_LEN - 1 )
+    {
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+    }
+    strncpy( ctx->not_before, not_before, X509_RFC5280_UTC_TIME_LEN );
+    strncpy( ctx->not_after , not_after , X509_RFC5280_UTC_TIME_LEN );
+    ctx->not_before[X509_RFC5280_UTC_TIME_LEN - 1] = 'Z';
+    ctx->not_after[X509_RFC5280_UTC_TIME_LEN - 1] = 'Z';
+
+    return( 0 );
+}
+
+int x509write_crt_set_extension( x509write_cert *ctx,
+                                 const char *oid, size_t oid_len,
+                                 int critical,
+                                 const unsigned char *val, size_t val_len )
+{
+    return x509_set_extension( &ctx->extensions, oid, oid_len,
+                               critical, val, val_len );
+}
+
+int x509write_crt_set_basic_constraints( x509write_cert *ctx,
+                                         int is_ca, int max_pathlen )
+{
+    int ret;
+    unsigned char buf[9];
+    unsigned char *c = buf + sizeof(buf);
+    size_t len = 0;
+
+    memset( buf, 0, sizeof(buf) );
+
+    if( is_ca && max_pathlen > 127 )
+        return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
+
+    if( is_ca )
+    {
+        if( max_pathlen >= 0 )
+        {
+            ASN1_CHK_ADD( len, asn1_write_int( &c, buf, max_pathlen ) );
+        }
+        ASN1_CHK_ADD( len, asn1_write_bool( &c, buf, 1 ) );
+    }
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED |
+                                                ASN1_SEQUENCE ) );
+
+    return x509write_crt_set_extension( ctx, OID_BASIC_CONSTRAINTS,
+                                        OID_SIZE( OID_BASIC_CONSTRAINTS ),
+                                        0, buf + sizeof(buf) - len, len );
+}
+
+#if defined(POLARSSL_SHA1_C)
+int x509write_crt_set_subject_key_identifier( x509write_cert *ctx )
+{
+    int ret;
+    unsigned char buf[POLARSSL_MPI_MAX_SIZE * 2 + 20]; /* tag, length + 2xMPI */
+    unsigned char *c = buf + sizeof(buf);
+    size_t len = 0;
+
+    memset( buf, 0, sizeof(buf) );
+    ASN1_CHK_ADD( len, pk_write_pubkey( &c, buf, ctx->subject_key ) );
+
+    sha1( buf + sizeof(buf) - len, len, buf + sizeof(buf) - 20 );
+    c = buf + sizeof(buf) - 20;
+    len = 20;
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_OCTET_STRING ) );
+
+    return x509write_crt_set_extension( ctx, OID_SUBJECT_KEY_IDENTIFIER,
+                                        OID_SIZE( OID_SUBJECT_KEY_IDENTIFIER ),
+                                        0, buf + sizeof(buf) - len, len );
+}
+
+int x509write_crt_set_authority_key_identifier( x509write_cert *ctx )
+{
+    int ret;
+    unsigned char buf[POLARSSL_MPI_MAX_SIZE * 2 + 20]; /* tag, length + 2xMPI */
+    unsigned char *c = buf + sizeof(buf);
+    size_t len = 0;
+
+    memset( buf, 0, sizeof(buf) );
+    ASN1_CHK_ADD( len, pk_write_pubkey( &c, buf, ctx->issuer_key ) );
+
+    sha1( buf + sizeof(buf) - len, len, buf + sizeof(buf) - 20 );
+    c = buf + sizeof(buf) - 20;
+    len = 20;
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONTEXT_SPECIFIC | 0 ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, buf, ASN1_CONSTRUCTED |
+                                                ASN1_SEQUENCE ) );
+
+    return x509write_crt_set_extension( ctx, OID_AUTHORITY_KEY_IDENTIFIER,
+                                   OID_SIZE( OID_AUTHORITY_KEY_IDENTIFIER ),
+                                   0, buf + sizeof(buf) - len, len );
+}
+#endif /* POLARSSL_SHA1_C */
+
+int x509write_crt_set_key_usage( x509write_cert *ctx, unsigned char key_usage )
+{
+    unsigned char buf[4];
+    unsigned char *c;
+    int ret;
+
+    c = buf + 4;
+
+    if( ( ret = asn1_write_bitstring( &c, buf, &key_usage, 7 ) ) != 4 )
+        return( ret );
+
+    ret = x509write_crt_set_extension( ctx, OID_KEY_USAGE,
+                                       OID_SIZE( OID_KEY_USAGE ),
+                                       1, buf, 4 );
+    if( ret != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+int x509write_crt_set_ns_cert_type( x509write_cert *ctx,
+                                    unsigned char ns_cert_type )
+{
+    unsigned char buf[4];
+    unsigned char *c;
+    int ret;
+
+    c = buf + 4;
+
+    if( ( ret = asn1_write_bitstring( &c, buf, &ns_cert_type, 8 ) ) != 4 )
+        return( ret );
+
+    ret = x509write_crt_set_extension( ctx, OID_NS_CERT_TYPE,
+                                       OID_SIZE( OID_NS_CERT_TYPE ),
+                                       0, buf, 4 );
+    if( ret != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+static int x509_write_time( unsigned char **p, unsigned char *start,
+                            const char *time, size_t size )
+{
+    int ret;
+    size_t len = 0;
+
+    /*
+     * write ASN1_UTC_TIME if year < 2050 (2 bytes shorter)
+     */
+    if( time[0] == '2' && time[1] == '0' && time [2] < '5' )
+    {
+        ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                                             (const unsigned char *) time + 2,
+                                             size - 2 ) );
+        ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_UTC_TIME ) );
+    }
+    else
+    {
+        ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                                                  (const unsigned char *) time,
+                                                  size ) );
+        ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_GENERALIZED_TIME ) );
+    }
+
+    return( (int) len );
+}
+
+int x509write_crt_der( x509write_cert *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng )
+{
+    int ret;
+    const char *sig_oid;
+    size_t sig_oid_len = 0;
+    unsigned char *c, *c2;
+    unsigned char hash[64];
+    unsigned char sig[POLARSSL_MPI_MAX_SIZE];
+    unsigned char tmp_buf[2048];
+    size_t sub_len = 0, pub_len = 0, sig_and_oid_len = 0, sig_len;
+    size_t len = 0;
+    pk_type_t pk_alg;
+
+    /*
+     * Prepare data to be signed in tmp_buf
+     */
+    c = tmp_buf + sizeof( tmp_buf );
+
+    /* Signature algorithm needed in TBS, and later for actual signature */
+    pk_alg = pk_get_type( ctx->issuer_key );
+    if( pk_alg == POLARSSL_PK_ECKEY )
+        pk_alg = POLARSSL_PK_ECDSA;
+
+    if( ( ret = oid_get_oid_by_sig_alg( pk_alg, ctx->md_alg,
+                                        &sig_oid, &sig_oid_len ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /*
+     *  Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
+     */
+    ASN1_CHK_ADD( len, x509_write_extensions( &c, tmp_buf, ctx->extensions ) );
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONTEXT_SPECIFIC |
+                                                    ASN1_CONSTRUCTED | 3 ) );
+
+    /*
+     *  SubjectPublicKeyInfo
+     */
+    ASN1_CHK_ADD( pub_len, pk_write_pubkey_der( ctx->subject_key,
+                                                tmp_buf, c - tmp_buf ) );
+    c -= pub_len;
+    len += pub_len;
+
+    /*
+     *  Subject  ::=  Name
+     */
+    ASN1_CHK_ADD( len, x509_write_names( &c, tmp_buf, ctx->subject ) );
+
+    /*
+     *  Validity ::= SEQUENCE {
+     *       notBefore      Time,
+     *       notAfter       Time }
+     */
+    sub_len = 0;
+
+    ASN1_CHK_ADD( sub_len, x509_write_time( &c, tmp_buf, ctx->not_after,
+                                            X509_RFC5280_UTC_TIME_LEN ) );
+
+    ASN1_CHK_ADD( sub_len, x509_write_time( &c, tmp_buf, ctx->not_before,
+                                            X509_RFC5280_UTC_TIME_LEN ) );
+
+    len += sub_len;
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, sub_len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+
+    /*
+     *  Issuer  ::=  Name
+     */
+    ASN1_CHK_ADD( len, x509_write_names( &c, tmp_buf, ctx->issuer ) );
+
+    /*
+     *  Signature   ::=  AlgorithmIdentifier
+     */
+    ASN1_CHK_ADD( len, asn1_write_algorithm_identifier( &c, tmp_buf,
+                       sig_oid, strlen( sig_oid ), 0 ) );
+
+    /*
+     *  Serial   ::=  INTEGER
+     */
+    ASN1_CHK_ADD( len, asn1_write_mpi( &c, tmp_buf, &ctx->serial ) );
+
+    /*
+     *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     */
+    sub_len = 0;
+    ASN1_CHK_ADD( sub_len, asn1_write_int( &c, tmp_buf, ctx->version ) );
+    len += sub_len;
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, sub_len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONTEXT_SPECIFIC |
+                                                    ASN1_CONSTRUCTED | 0 ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+
+    /*
+     * Make signature
+     */
+    md( md_info_from_type( ctx->md_alg ), c, len, hash );
+
+    if( ( ret = pk_sign( ctx->issuer_key, ctx->md_alg, hash, 0, sig, &sig_len,
+                         f_rng, p_rng ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /*
+     * Write data to output buffer
+     */
+    c2 = buf + size;
+    ASN1_CHK_ADD( sig_and_oid_len, x509_write_sig( &c2, buf,
+                                        sig_oid, sig_oid_len, sig, sig_len ) );
+
+    c2 -= len;
+    memcpy( c2, c, len );
+
+    len += sig_and_oid_len;
+    ASN1_CHK_ADD( len, asn1_write_len( &c2, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c2, buf, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+#define PEM_BEGIN_CRT           "-----BEGIN CERTIFICATE-----\n"
+#define PEM_END_CRT             "-----END CERTIFICATE-----\n"
+
+#if defined(POLARSSL_PEM_WRITE_C)
+int x509write_crt_pem( x509write_cert *crt, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng )
+{
+    int ret;
+    unsigned char output_buf[4096];
+    size_t olen = 0;
+
+    if( ( ret = x509write_crt_der( crt, output_buf, sizeof(output_buf),
+                                   f_rng, p_rng ) ) < 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = pem_write_buffer( PEM_BEGIN_CRT, PEM_END_CRT,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_PEM_WRITE_C */
+
+#endif /* POLARSSL_X509_CRT_WRITE_C */
diff --git a/Externals/polarssl/library/x509write_csr.c b/Externals/polarssl/library/x509write_csr.c
new file mode 100644
index 0000000000..53ae9c63b7
--- /dev/null
+++ b/Externals/polarssl/library/x509write_csr.c
@@ -0,0 +1,260 @@
+/*
+ *  X.509 Certificate Signing Request writing
+ *
+ *  Copyright (C) 2006-2014, Brainspark B.V.
+ *
+ *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+ *
+ *  All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * References:
+ * - CSRs: PKCS#10 v1.7 aka RFC 2986
+ * - attributes: PKCS#9 v2.0 aka RFC 2985
+ */
+
+#if !defined(POLARSSL_CONFIG_FILE)
+#include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
+
+#if defined(POLARSSL_X509_CSR_WRITE_C)
+
+#include "polarssl/x509_csr.h"
+#include "polarssl/oid.h"
+#include "polarssl/asn1write.h"
+
+#if defined(POLARSSL_PEM_WRITE_C)
+#include "polarssl/pem.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
+void x509write_csr_init( x509write_csr *ctx )
+{
+    memset( ctx, 0, sizeof(x509write_csr) );
+}
+
+void x509write_csr_free( x509write_csr *ctx )
+{
+    asn1_free_named_data_list( &ctx->subject );
+    asn1_free_named_data_list( &ctx->extensions );
+
+    polarssl_zeroize( ctx, sizeof(x509write_csr) );
+}
+
+void x509write_csr_set_md_alg( x509write_csr *ctx, md_type_t md_alg )
+{
+    ctx->md_alg = md_alg;
+}
+
+void x509write_csr_set_key( x509write_csr *ctx, pk_context *key )
+{
+    ctx->key = key;
+}
+
+int x509write_csr_set_subject_name( x509write_csr *ctx,
+                                    const char *subject_name )
+{
+    return x509_string_to_names( &ctx->subject, subject_name );
+}
+
+int x509write_csr_set_extension( x509write_csr *ctx,
+                                 const char *oid, size_t oid_len,
+                                 const unsigned char *val, size_t val_len )
+{
+    return x509_set_extension( &ctx->extensions, oid, oid_len,
+                               0, val, val_len );
+}
+
+int x509write_csr_set_key_usage( x509write_csr *ctx, unsigned char key_usage )
+{
+    unsigned char buf[4];
+    unsigned char *c;
+    int ret;
+
+    c = buf + 4;
+
+    if( ( ret = asn1_write_bitstring( &c, buf, &key_usage, 7 ) ) != 4 )
+        return( ret );
+
+    ret = x509write_csr_set_extension( ctx, OID_KEY_USAGE,
+                                       OID_SIZE( OID_KEY_USAGE ),
+                                       buf, 4 );
+    if( ret != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+int x509write_csr_set_ns_cert_type( x509write_csr *ctx,
+                                    unsigned char ns_cert_type )
+{
+    unsigned char buf[4];
+    unsigned char *c;
+    int ret;
+
+    c = buf + 4;
+
+    if( ( ret = asn1_write_bitstring( &c, buf, &ns_cert_type, 8 ) ) != 4 )
+        return( ret );
+
+    ret = x509write_csr_set_extension( ctx, OID_NS_CERT_TYPE,
+                                       OID_SIZE( OID_NS_CERT_TYPE ),
+                                       buf, 4 );
+    if( ret != 0 )
+        return( ret );
+
+    return( 0 );
+}
+
+int x509write_csr_der( x509write_csr *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng )
+{
+    int ret;
+    const char *sig_oid;
+    size_t sig_oid_len = 0;
+    unsigned char *c, *c2;
+    unsigned char hash[64];
+    unsigned char sig[POLARSSL_MPI_MAX_SIZE];
+    unsigned char tmp_buf[2048];
+    size_t pub_len = 0, sig_and_oid_len = 0, sig_len;
+    size_t len = 0;
+    pk_type_t pk_alg;
+
+    /*
+     * Prepare data to be signed in tmp_buf
+     */
+    c = tmp_buf + sizeof( tmp_buf );
+
+    ASN1_CHK_ADD( len, x509_write_extensions( &c, tmp_buf, ctx->extensions ) );
+
+    if( len )
+    {
+        ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                        ASN1_SEQUENCE ) );
+
+        ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                        ASN1_SET ) );
+
+        ASN1_CHK_ADD( len, asn1_write_oid( &c, tmp_buf, OID_PKCS9_CSR_EXT_REQ,
+                                          OID_SIZE( OID_PKCS9_CSR_EXT_REQ ) ) );
+
+        ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                        ASN1_SEQUENCE ) );
+    }
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                    ASN1_CONTEXT_SPECIFIC ) );
+
+    ASN1_CHK_ADD( pub_len, pk_write_pubkey_der( ctx->key,
+                                                tmp_buf, c - tmp_buf ) );
+    c -= pub_len;
+    len += pub_len;
+
+    /*
+     *  Subject  ::=  Name
+     */
+    ASN1_CHK_ADD( len, x509_write_names( &c, tmp_buf, ctx->subject ) );
+
+    /*
+     *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     */
+    ASN1_CHK_ADD( len, asn1_write_int( &c, tmp_buf, 0 ) );
+
+    ASN1_CHK_ADD( len, asn1_write_len( &c, tmp_buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c, tmp_buf, ASN1_CONSTRUCTED |
+                                                    ASN1_SEQUENCE ) );
+
+    /*
+     * Prepare signature
+     */
+    md( md_info_from_type( ctx->md_alg ), c, len, hash );
+
+    pk_alg = pk_get_type( ctx->key );
+    if( pk_alg == POLARSSL_PK_ECKEY )
+        pk_alg = POLARSSL_PK_ECDSA;
+
+    if( ( ret = pk_sign( ctx->key, ctx->md_alg, hash, 0, sig, &sig_len,
+                         f_rng, p_rng ) ) != 0 ||
+        ( ret = oid_get_oid_by_sig_alg( pk_alg, ctx->md_alg,
+                                        &sig_oid, &sig_oid_len ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    /*
+     * Write data to output buffer
+     */
+    c2 = buf + size;
+    ASN1_CHK_ADD( sig_and_oid_len, x509_write_sig( &c2, buf,
+                                        sig_oid, sig_oid_len, sig, sig_len ) );
+
+    c2 -= len;
+    memcpy( c2, c, len );
+
+    len += sig_and_oid_len;
+    ASN1_CHK_ADD( len, asn1_write_len( &c2, buf, len ) );
+    ASN1_CHK_ADD( len, asn1_write_tag( &c2, buf, ASN1_CONSTRUCTED |
+                                                 ASN1_SEQUENCE ) );
+
+    return( (int) len );
+}
+
+#define PEM_BEGIN_CSR           "-----BEGIN CERTIFICATE REQUEST-----\n"
+#define PEM_END_CSR             "-----END CERTIFICATE REQUEST-----\n"
+
+#if defined(POLARSSL_PEM_WRITE_C)
+int x509write_csr_pem( x509write_csr *ctx, unsigned char *buf, size_t size,
+                       int (*f_rng)(void *, unsigned char *, size_t),
+                       void *p_rng )
+{
+    int ret;
+    unsigned char output_buf[4096];
+    size_t olen = 0;
+
+    if( ( ret = x509write_csr_der( ctx, output_buf, sizeof(output_buf),
+                                   f_rng, p_rng ) ) < 0 )
+    {
+        return( ret );
+    }
+
+    if( ( ret = pem_write_buffer( PEM_BEGIN_CSR, PEM_END_CSR,
+                                  output_buf + sizeof(output_buf) - ret,
+                                  ret, buf, size, &olen ) ) != 0 )
+    {
+        return( ret );
+    }
+
+    return( 0 );
+}
+#endif /* POLARSSL_PEM_WRITE_C */
+
+#endif /* POLARSSL_X509_CSR_WRITE_C */
diff --git a/Externals/polarssl/library/xtea.c b/Externals/polarssl/library/xtea.c
index f8ab014f9a..75215c50af 100644
--- a/Externals/polarssl/library/xtea.c
+++ b/Externals/polarssl/library/xtea.c
@@ -1,7 +1,7 @@
 /*
  *  An 32-bit implementation of the XTEA algorithm
  *
- *  Copyright (C) 2006-2013, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -23,14 +23,29 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
+#else
+#include POLARSSL_CONFIG_FILE
+#endif
 
 #if defined(POLARSSL_XTEA_C)
 
 #include "polarssl/xtea.h"
 
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
 #if !defined(POLARSSL_XTEA_ALT)
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 /*
  * 32-bit integer manipulation macros (big endian)
  */
@@ -54,14 +69,27 @@
 }
 #endif
 
+void xtea_init( xtea_context *ctx )
+{
+    memset( ctx, 0, sizeof( xtea_context ) );
+}
+
+void xtea_free( xtea_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    polarssl_zeroize( ctx, sizeof( xtea_context ) );
+}
+
 /*
  * XTEA key schedule
  */
-void xtea_setup( xtea_context *ctx, unsigned char key[16] )
+void xtea_setup( xtea_context *ctx, const unsigned char key[16] )
 {
     int i;
 
-    memset(ctx, 0, sizeof(xtea_context));
+    memset( ctx, 0, sizeof(xtea_context) );
 
     for( i = 0; i < 4; i++ )
     {
@@ -72,13 +100,13 @@ void xtea_setup( xtea_context *ctx, unsigned char key[16] )
 /*
  * XTEA encrypt function
  */
-int xtea_crypt_ecb( xtea_context *ctx, int mode, unsigned char input[8],
-                     unsigned char output[8])
+int xtea_crypt_ecb( xtea_context *ctx, int mode,
+                    const unsigned char input[8], unsigned char output[8])
 {
     uint32_t *k, v0, v1, i;
 
     k = ctx->k;
-    
+
     GET_UINT32_BE( v0, input, 0 );
     GET_UINT32_BE( v1, input, 4 );
 
@@ -111,30 +139,28 @@ int xtea_crypt_ecb( xtea_context *ctx, int mode, unsigned char input[8],
     return( 0 );
 }
 
+#if defined(POLARSSL_CIPHER_MODE_CBC)
 /*
  * XTEA-CBC buffer encryption/decryption
  */
-int xtea_crypt_cbc( xtea_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[8],
-                    unsigned char *input,
+int xtea_crypt_cbc( xtea_context *ctx, int mode, size_t length,
+                    unsigned char iv[8], const unsigned char *input,
                     unsigned char *output)
 {
     int i;
     unsigned char temp[8];
 
-    if(length % 8)
+    if( length % 8 )
         return( POLARSSL_ERR_XTEA_INVALID_INPUT_LENGTH );
 
-    if( mode == XTEA_DECRYPT ) 
+    if( mode == XTEA_DECRYPT )
     {
         while( length > 0 )
         {
             memcpy( temp, input, 8 );
             xtea_crypt_ecb( ctx, mode, input, output );
 
-            for(i = 0; i < 8; i++) 
+            for( i = 0; i < 8; i++ )
                 output[i] = (unsigned char)( output[i] ^ iv[i] );
 
             memcpy( iv, temp, 8 );
@@ -143,8 +169,8 @@ int xtea_crypt_cbc( xtea_context *ctx,
             output += 8;
             length -= 8;
         }
-    } 
-    else 
+    }
+    else
     {
         while( length > 0 )
         {
@@ -153,7 +179,7 @@ int xtea_crypt_cbc( xtea_context *ctx,
 
             xtea_crypt_ecb( ctx, mode, output, output );
             memcpy( iv, output, 8 );
-            
+
             input  += 8;
             output += 8;
             length -= 8;
@@ -162,6 +188,7 @@ int xtea_crypt_cbc( xtea_context *ctx,
 
     return( 0 );
 }
+#endif /* POLARSSL_CIPHER_MODE_CBC */
 #endif /* !POLARSSL_XTEA_ALT */
 
 #if defined(POLARSSL_SELF_TEST)
@@ -214,38 +241,43 @@ static const unsigned char xtea_test_ct[6][8] =
  */
 int xtea_self_test( int verbose )
 {
-    int i;
+    int i, ret = 0;
     unsigned char buf[8];
     xtea_context ctx;
 
+    xtea_init( &ctx );
     for( i = 0; i < 6; i++ )
     {
         if( verbose != 0 )
-            printf( "  XTEA test #%d: ", i + 1 );
+            polarssl_printf( "  XTEA test #%d: ", i + 1 );
 
         memcpy( buf, xtea_test_pt[i], 8 );
 
-        xtea_setup( &ctx, (unsigned char *) xtea_test_key[i] );
+        xtea_setup( &ctx, xtea_test_key[i] );
         xtea_crypt_ecb( &ctx, XTEA_ENCRYPT, buf, buf );
 
         if( memcmp( buf, xtea_test_ct[i], 8 ) != 0 )
         {
             if( verbose != 0 )
-                printf( "failed\n" );
+                polarssl_printf( "failed\n" );
 
-            return( 1 );
+            ret = 1;
+            goto exit;
         }
 
         if( verbose != 0 )
-            printf( "passed\n" );
+            polarssl_printf( "passed\n" );
     }
 
     if( verbose != 0 )
-        printf( "\n" );
+        polarssl_printf( "\n" );
 
-    return( 0 );
+exit:
+    xtea_free( &ctx );
+
+    return( ret );
 }
 
-#endif
+#endif /* POLARSSL_SELF_TEST */
 
-#endif
+#endif /* POLARSSL_XTEA_C */
diff --git a/Externals/polarssl/visualc/PolarSSL.vcxproj b/Externals/polarssl/visualc/PolarSSL.vcxproj
new file mode 100644
index 0000000000..843b4c8c5f
--- /dev/null
+++ b/Externals/polarssl/visualc/PolarSSL.vcxproj
@@ -0,0 +1,113 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BDB6578B-0691-4E80-A46C-DF21639FD3B8}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClCompile Include="..\library\aes.c" />
+    <ClCompile Include="..\library\aesni.c" />
+    <ClCompile Include="..\library\arc4.c" />
+    <ClCompile Include="..\library\asn1parse.c" />
+    <ClCompile Include="..\library\asn1write.c" />
+    <ClCompile Include="..\library\base64.c" />
+    <ClCompile Include="..\library\bignum.c" />
+    <ClCompile Include="..\library\blowfish.c" />
+    <ClCompile Include="..\library\camellia.c" />
+    <ClCompile Include="..\library\ccm.c" />
+    <ClCompile Include="..\library\certs.c" />
+    <ClCompile Include="..\library\cipher.c" />
+    <ClCompile Include="..\library\cipher_wrap.c" />
+    <ClCompile Include="..\library\ctr_drbg.c" />
+    <ClCompile Include="..\library\debug.c" />
+    <ClCompile Include="..\library\des.c" />
+    <ClCompile Include="..\library\dhm.c" />
+    <ClCompile Include="..\library\ecdh.c" />
+    <ClCompile Include="..\library\ecdsa.c" />
+    <ClCompile Include="..\library\ecp.c" />
+    <ClCompile Include="..\library\ecp_curves.c" />
+    <ClCompile Include="..\library\entropy.c" />
+    <ClCompile Include="..\library\entropy_poll.c" />
+    <ClCompile Include="..\library\error.c" />
+    <ClCompile Include="..\library\gcm.c" />
+    <ClCompile Include="..\library\havege.c" />
+    <ClCompile Include="..\library\hmac_drbg.c" />
+    <ClCompile Include="..\library\md.c" />
+    <ClCompile Include="..\library\md2.c" />
+    <ClCompile Include="..\library\md4.c" />
+    <ClCompile Include="..\library\md5.c" />
+    <ClCompile Include="..\library\md_wrap.c" />
+    <ClCompile Include="..\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\library\net.c" />
+    <ClCompile Include="..\library\oid.c" />
+    <ClCompile Include="..\library\padlock.c" />
+    <ClCompile Include="..\library\pbkdf2.c" />
+    <ClCompile Include="..\library\pem.c" />
+    <ClCompile Include="..\library\pk.c" />
+    <ClCompile Include="..\library\pk_wrap.c" />
+    <ClCompile Include="..\library\pkcs11.c" />
+    <ClCompile Include="..\library\pkcs12.c" />
+    <ClCompile Include="..\library\pkcs5.c" />
+    <ClCompile Include="..\library\pkparse.c" />
+    <ClCompile Include="..\library\pkwrite.c" />
+    <ClCompile Include="..\library\platform.c" />
+    <ClCompile Include="..\library\ripemd160.c" />
+    <ClCompile Include="..\library\rsa.c" />
+    <ClCompile Include="..\library\sha1.c" />
+    <ClCompile Include="..\library\sha256.c" />
+    <ClCompile Include="..\library\sha512.c" />
+    <ClCompile Include="..\library\ssl_cache.c" />
+    <ClCompile Include="..\library\ssl_ciphersuites.c" />
+    <ClCompile Include="..\library\ssl_cli.c" />
+    <ClCompile Include="..\library\ssl_srv.c" />
+    <ClCompile Include="..\library\ssl_tls.c" />
+    <ClCompile Include="..\library\threading.c" />
+    <ClCompile Include="..\library\timing.c" />
+    <ClCompile Include="..\library\version.c" />
+    <ClCompile Include="..\library\version_features.c" />
+    <ClCompile Include="..\library\x509.c" />
+    <ClCompile Include="..\library\x509_create.c" />
+    <ClCompile Include="..\library\x509_crl.c" />
+    <ClCompile Include="..\library\x509_crt.c" />
+    <ClCompile Include="..\library\x509_csr.c" />
+    <ClCompile Include="..\library\x509write_crt.c" />
+    <ClCompile Include="..\library\x509write_csr.c" />
+    <ClCompile Include="..\library\xtea.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\library\CMakeLists.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Externals/polarssl/visualc/VS2010/PolarSSL.sln b/Externals/polarssl/visualc/VS2010/PolarSSL.sln
deleted file mode 100644
index 234c80ff5f..0000000000
--- a/Externals/polarssl/visualc/VS2010/PolarSSL.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolarSSL", "PolarSSL.vcxproj", "{46CF2D25-6A36-4189-B59C-E4815388E554}"
-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
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.Build.0 = Debug|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.ActiveCfg = Debug|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.Build.0 = Debug|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.ActiveCfg = Release|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.Build.0 = Release|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.ActiveCfg = Release|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj b/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj
deleted file mode 100644
index 25e09cc48b..0000000000
--- a/Externals/polarssl/visualc/VS2010/PolarSSL.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{46CF2D25-6A36-4189-B59C-E4815388E554}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>PolarSSL</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </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" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\polarssl\aes.h" />
-    <ClInclude Include="..\..\include\polarssl\arc4.h" />
-    <ClInclude Include="..\..\include\polarssl\asn1.h" />
-    <ClInclude Include="..\..\include\polarssl\base64.h" />
-    <ClInclude Include="..\..\include\polarssl\bignum.h" />
-    <ClInclude Include="..\..\include\polarssl\blowfish.h" />
-    <ClInclude Include="..\..\include\polarssl\bn_mul.h" />
-    <ClInclude Include="..\..\include\polarssl\camellia.h" />
-    <ClInclude Include="..\..\include\polarssl\certs.h" />
-    <ClInclude Include="..\..\include\polarssl\cipher.h" />
-    <ClInclude Include="..\..\include\polarssl\cipher_wrap.h" />
-    <ClInclude Include="..\..\include\polarssl\config.h" />
-    <ClInclude Include="..\..\include\polarssl\ctr_drbg.h" />
-    <ClInclude Include="..\..\include\polarssl\debug.h" />
-    <ClInclude Include="..\..\include\polarssl\des.h" />
-    <ClInclude Include="..\..\include\polarssl\dhm.h" />
-    <ClInclude Include="..\..\include\polarssl\entropy.h" />
-    <ClInclude Include="..\..\include\polarssl\entropy_poll.h" />
-    <ClInclude Include="..\..\include\polarssl\error.h" />
-    <ClInclude Include="..\..\include\polarssl\havege.h" />
-    <ClInclude Include="..\..\include\polarssl\md.h" />
-    <ClInclude Include="..\..\include\polarssl\md2.h" />
-    <ClInclude Include="..\..\include\polarssl\md4.h" />
-    <ClInclude Include="..\..\include\polarssl\md5.h" />
-    <ClInclude Include="..\..\include\polarssl\md_wrap.h" />
-    <ClInclude Include="..\..\include\polarssl\net.h" />
-    <ClInclude Include="..\..\include\polarssl\openssl.h" />
-    <ClInclude Include="..\..\include\polarssl\padlock.h" />
-    <ClInclude Include="..\..\include\polarssl\pem.h" />
-    <ClInclude Include="..\..\include\polarssl\pkcs11.h" />
-    <ClInclude Include="..\..\include\polarssl\rsa.h" />
-    <ClInclude Include="..\..\include\polarssl\sha1.h" />
-    <ClInclude Include="..\..\include\polarssl\sha2.h" />
-    <ClInclude Include="..\..\include\polarssl\sha4.h" />
-    <ClInclude Include="..\..\include\polarssl\ssl.h" />
-    <ClInclude Include="..\..\include\polarssl\timing.h" />
-    <ClInclude Include="..\..\include\polarssl\version.h" />
-    <ClInclude Include="..\..\include\polarssl\x509.h" />
-    <ClInclude Include="..\..\include\polarssl\xtea.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\library\aes.c" />
-    <ClCompile Include="..\..\library\arc4.c" />
-    <ClCompile Include="..\..\library\asn1parse.c" />
-    <ClCompile Include="..\..\library\base64.c" />
-    <ClCompile Include="..\..\library\bignum.c" />
-    <ClCompile Include="..\..\library\blowfish.c" />
-    <ClCompile Include="..\..\library\camellia.c" />
-    <ClCompile Include="..\..\library\certs.c" />
-    <ClCompile Include="..\..\library\cipher.c" />
-    <ClCompile Include="..\..\library\cipher_wrap.c" />
-    <ClCompile Include="..\..\library\ctr_drbg.c" />
-    <ClCompile Include="..\..\library\debug.c" />
-    <ClCompile Include="..\..\library\des.c" />
-    <ClCompile Include="..\..\library\dhm.c" />
-    <ClCompile Include="..\..\library\entropy.c" />
-    <ClCompile Include="..\..\library\entropy_poll.c" />
-    <ClCompile Include="..\..\library\error.c" />
-    <ClCompile Include="..\..\library\gcm.c" />
-    <ClCompile Include="..\..\library\havege.c" />
-    <ClCompile Include="..\..\library\md.c" />
-    <ClCompile Include="..\..\library\md2.c" />
-    <ClCompile Include="..\..\library\md4.c" />
-    <ClCompile Include="..\..\library\md5.c" />
-    <ClCompile Include="..\..\library\md_wrap.c" />
-    <ClCompile Include="..\..\library\net.c" />
-    <ClCompile Include="..\..\library\padlock.c" />
-    <ClCompile Include="..\..\library\pem.c" />
-    <ClCompile Include="..\..\library\pkcs11.c" />
-    <ClCompile Include="..\..\library\pkcs12.c" />
-    <ClCompile Include="..\..\library\pkcs5.c" />
-    <ClCompile Include="..\..\library\rsa.c" />
-    <ClCompile Include="..\..\library\sha1.c" />
-    <ClCompile Include="..\..\library\sha2.c" />
-    <ClCompile Include="..\..\library\sha4.c" />
-    <ClCompile Include="..\..\library\ssl_cache.c" />
-    <ClCompile Include="..\..\library\ssl_cli.c" />
-    <ClCompile Include="..\..\library\ssl_srv.c" />
-    <ClCompile Include="..\..\library\ssl_tls.c" />
-    <ClCompile Include="..\..\library\timing.c" />
-    <ClCompile Include="..\..\library\version.c" />
-    <ClCompile Include="..\..\library\x509parse.c" />
-    <ClCompile Include="..\..\library\xtea.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/aescrypt2.vcxproj b/Externals/polarssl/visualc/VS2010/aescrypt2.vcxproj
deleted file mode 100644
index d4997ddfea..0000000000
--- a/Externals/polarssl/visualc/VS2010/aescrypt2.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\aes\aescrypt2.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{54880004-9AA2-434D-A2F0-7F59D6F1536A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>aescrypt2</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/benchmark.vcxproj b/Externals/polarssl/visualc/VS2010/benchmark.vcxproj
deleted file mode 100644
index 524203d8a1..0000000000
--- a/Externals/polarssl/visualc/VS2010/benchmark.vcxproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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>{F52B9FFC-0E87-4816-BB2D-711CFC1E8955}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>benchmark</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\programs\test\benchmark.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/crypt_and_hash.vcxproj b/Externals/polarssl/visualc/VS2010/crypt_and_hash.vcxproj
deleted file mode 100644
index fa6864b608..0000000000
--- a/Externals/polarssl/visualc/VS2010/crypt_and_hash.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\aes\crypt_and_hash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B9CD06FA-D063-4AFE-BF05-1348142274D7}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>crypt_and_hash</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/dh_client.vcxproj b/Externals/polarssl/visualc/VS2010/dh_client.vcxproj
deleted file mode 100644
index 76e17147b3..0000000000
--- a/Externals/polarssl/visualc/VS2010/dh_client.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\dh_client.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E3F6459F-183D-4604-8A42-3F1C84A7C119}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>dh_client</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/dh_genprime.vcxproj b/Externals/polarssl/visualc/VS2010/dh_genprime.vcxproj
deleted file mode 100644
index 94caa91af4..0000000000
--- a/Externals/polarssl/visualc/VS2010/dh_genprime.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\dh_genprime.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{83BCC55C-5216-41BD-865B-E38FAB399454}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>dh_genprime</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/dh_server.vcxproj b/Externals/polarssl/visualc/VS2010/dh_server.vcxproj
deleted file mode 100644
index 017923d509..0000000000
--- a/Externals/polarssl/visualc/VS2010/dh_server.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\dh_server.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{17D1A1DA-6803-4AA1-A0DB-566E00D7593C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>dh_server</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/gen_random_ctr_drbg.vcxproj b/Externals/polarssl/visualc/VS2010/gen_random_ctr_drbg.vcxproj
deleted file mode 100644
index 8fedf84e5c..0000000000
--- a/Externals/polarssl/visualc/VS2010/gen_random_ctr_drbg.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\random\gen_random_ctr_drbg.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{316E338C-6DC1-4D11-81C1-91F20E92AB04}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>gen_random_ctr_drbg</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/gen_random_havege.vcxproj b/Externals/polarssl/visualc/VS2010/gen_random_havege.vcxproj
deleted file mode 100644
index eddec1b369..0000000000
--- a/Externals/polarssl/visualc/VS2010/gen_random_havege.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\random\gen_random_havege.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CFA36CC7-515C-4E18-8F8F-5B56AB903352}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>gen_random_havege</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Externals/polarssl/visualc/VS2010/generic_sum.vcxproj b/Externals/polarssl/visualc/VS2010/generic_sum.vcxproj
deleted file mode 100644
index 6f09edf508..0000000000
--- a/Externals/polarssl/visualc/VS2010/generic_sum.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\hash\generic_sum.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BE21679A-D26E-4A26-BC4F-382F57A33480}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>generic_sum</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/md5sum.vcxproj b/Externals/polarssl/visualc/VS2010/md5sum.vcxproj
deleted file mode 100644
index 1c8627a67c..0000000000
--- a/Externals/polarssl/visualc/VS2010/md5sum.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\hash\md5sum.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7FEC406E-95C5-4CC7-9CE7-8EA014AF5E15}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>md5sum</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/mpi_demo.vcxproj b/Externals/polarssl/visualc/VS2010/mpi_demo.vcxproj
deleted file mode 100644
index 9fab471b5a..0000000000
--- a/Externals/polarssl/visualc/VS2010/mpi_demo.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\mpi_demo.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E6999C98-6F20-4ED8-A791-69930800728F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mpi_demo</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/rsa_genkey.vcxproj b/Externals/polarssl/visualc/VS2010/rsa_genkey.vcxproj
deleted file mode 100644
index 54bf0cb9fb..0000000000
--- a/Externals/polarssl/visualc/VS2010/rsa_genkey.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\rsa_genkey.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{914C3FB6-43A6-4FB6-875C-870DF0553035}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rsa_genkey</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/rsa_sign.vcxproj b/Externals/polarssl/visualc/VS2010/rsa_sign.vcxproj
deleted file mode 100644
index cdfdb5705b..0000000000
--- a/Externals/polarssl/visualc/VS2010/rsa_sign.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\rsa_sign.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{27FA2978-988C-4918-AF10-FC9613B66CDB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rsa_sign</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/rsa_sign_pss.vcxproj b/Externals/polarssl/visualc/VS2010/rsa_sign_pss.vcxproj
deleted file mode 100644
index 9d6ea34ddf..0000000000
--- a/Externals/polarssl/visualc/VS2010/rsa_sign_pss.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\rsa_sign_pss.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FAAA2021-DF20-436F-AE12-9AD91C34C0B4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rsa_sign_pss</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/rsa_verify.vcxproj b/Externals/polarssl/visualc/VS2010/rsa_verify.vcxproj
deleted file mode 100644
index d26f7975d9..0000000000
--- a/Externals/polarssl/visualc/VS2010/rsa_verify.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\rsa_verify.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4485C157-39E7-4A97-93DC-80F794E37450}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>dh_client</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/rsa_verify_pss.vcxproj b/Externals/polarssl/visualc/VS2010/rsa_verify_pss.vcxproj
deleted file mode 100644
index 1ee36ed32f..0000000000
--- a/Externals/polarssl/visualc/VS2010/rsa_verify_pss.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\pkey\rsa_verify_pss.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{22142D77-6986-4C71-8386-0184A8E7A1E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rsa_verify_pss</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/selftest.vcxproj b/Externals/polarssl/visualc/VS2010/selftest.vcxproj
deleted file mode 100644
index a56642a94e..0000000000
--- a/Externals/polarssl/visualc/VS2010/selftest.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\test\selftest.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B44D0A4-DE85-4C15-A1FF-A334C0A1EFF2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>selftest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/sha1sum.vcxproj b/Externals/polarssl/visualc/VS2010/sha1sum.vcxproj
deleted file mode 100644
index 4c56f3f7f3..0000000000
--- a/Externals/polarssl/visualc/VS2010/sha1sum.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\hash\sha1sum.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{15F21E24-7810-4B51-AF44-69F9062E35A0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sha1sum</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/sha2sum.vcxproj b/Externals/polarssl/visualc/VS2010/sha2sum.vcxproj
deleted file mode 100644
index f964fb92cb..0000000000
--- a/Externals/polarssl/visualc/VS2010/sha2sum.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\hash\sha2sum.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{97A7EBB4-A76D-40CA-8E30-C10F2EB0B324}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sha2sum</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/ssl_client1.vcxproj b/Externals/polarssl/visualc/VS2010/ssl_client1.vcxproj
deleted file mode 100644
index 86ada1bda3..0000000000
--- a/Externals/polarssl/visualc/VS2010/ssl_client1.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\ssl\ssl_client1.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E0DC7623-13A7-48DF-A42F-8585FA533894}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ssl_client1</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/ssl_client2.vcxproj b/Externals/polarssl/visualc/VS2010/ssl_client2.vcxproj
deleted file mode 100644
index ec77e0e23f..0000000000
--- a/Externals/polarssl/visualc/VS2010/ssl_client2.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\ssl\ssl_client2.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6418ABBB-6D56-4D26-A7E8-69A47B61F7EB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ssl_client2</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/polarssl/visualc/VS2010/ssl_server.vcxproj b/Externals/polarssl/visualc/VS2010/ssl_server.vcxproj
deleted file mode 100644
index badf92ed89..0000000000
--- a/Externals/polarssl/visualc/VS2010/ssl_server.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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="..\..\programs\ssl\ssl_server.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
-      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EDF3B291-9D85-49EC-8CF4-27EA9096BCCB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ssl_server</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/portaudio/Win32/Debug/portaudio.lib b/Externals/portaudio/Win32/Debug/portaudio.lib
deleted file mode 100644
index 058b3c404c..0000000000
Binary files a/Externals/portaudio/Win32/Debug/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/Win32/Debug/portaudio.pdb b/Externals/portaudio/Win32/Debug/portaudio.pdb
deleted file mode 100644
index c9269f2c5d..0000000000
Binary files a/Externals/portaudio/Win32/Debug/portaudio.pdb and /dev/null differ
diff --git a/Externals/portaudio/Win32/DebugFast/portaudio.lib b/Externals/portaudio/Win32/DebugFast/portaudio.lib
deleted file mode 100644
index 30874d6f05..0000000000
Binary files a/Externals/portaudio/Win32/DebugFast/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/Win32/DebugFast/portaudio.pdb b/Externals/portaudio/Win32/DebugFast/portaudio.pdb
deleted file mode 100644
index 12415be92d..0000000000
Binary files a/Externals/portaudio/Win32/DebugFast/portaudio.pdb and /dev/null differ
diff --git a/Externals/portaudio/Win32/Release/portaudio.lib b/Externals/portaudio/Win32/Release/portaudio.lib
deleted file mode 100644
index 30874d6f05..0000000000
Binary files a/Externals/portaudio/Win32/Release/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/Win32/Release/portaudio.pdb b/Externals/portaudio/Win32/Release/portaudio.pdb
deleted file mode 100644
index 12415be92d..0000000000
Binary files a/Externals/portaudio/Win32/Release/portaudio.pdb and /dev/null differ
diff --git a/Externals/portaudio/build/dolphin-notes.txt b/Externals/portaudio/build/dolphin-notes.txt
new file mode 100644
index 0000000000..b6d3707a69
--- /dev/null
+++ b/Externals/portaudio/build/dolphin-notes.txt
@@ -0,0 +1,6 @@
+This directory contains the Visual Studio project files which are used to build portaudio.
+* portaudio's files were very old and messy
+* Makes it easier to update portaudio in the future
+* Uses dolphin's VSProps, so we know it's properly compatible
+
+See full portaudio distribution for instructions about building and using portaudio.
diff --git a/Externals/portaudio/build/portaudio.vcxproj b/Externals/portaudio/build/portaudio.vcxproj
new file mode 100644
index 0000000000..38c6a907ec
--- /dev/null
+++ b/Externals/portaudio/build/portaudio.vcxproj
@@ -0,0 +1,80 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\src\common;..\include;.\;..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>PA_WDMKS_NO_KSGUID_LIB;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=0;PA_ENABLE_DEBUG_OUTPUT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\common\pa_allocation.c" />
+    <ClCompile Include="..\src\common\pa_converters.c" />
+    <ClCompile Include="..\src\common\pa_cpuload.c" />
+    <ClCompile Include="..\src\common\pa_debugprint.c" />
+    <ClCompile Include="..\src\common\pa_dither.c" />
+    <ClCompile Include="..\src\common\pa_front.c" />
+    <ClCompile Include="..\src\hostapi\skeleton\pa_hostapi_skeleton.c" />
+    <ClCompile Include="..\src\common\pa_process.c" />
+    <ClCompile Include="..\src\common\pa_ringbuffer.c" />
+    <ClCompile Include="..\src\common\pa_stream.c" />
+    <ClCompile Include="..\src\common\pa_trace.c" />
+    <ClCompile Include="..\src\hostapi\dsound\pa_win_ds.c" />
+    <ClCompile Include="..\src\hostapi\dsound\pa_win_ds_dynlink.c" />
+    <ClCompile Include="..\src\hostapi\wmme\pa_win_wmme.c" />
+    <ClCompile Include="..\src\hostapi\wasapi\pa_win_wasapi.c" />
+    <ClCompile Include="..\src\hostapi\wdmks\pa_win_wdmks.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_coinitialize.c" />
+    <ClCompile Include="..\src\os\win\pa_win_hostapis.c" />
+    <ClCompile Include="..\src\os\win\pa_win_util.c" />
+    <ClCompile Include="..\src\os\win\pa_win_waveformat.c" />
+    <ClCompile Include="..\src\os\win\pa_win_wdmks_utils.c" />
+    <ClCompile Include="..\src\os\win\pa_x86_plain_converters.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\pa_asio.h" />
+    <ClInclude Include="..\include\pa_win_ds.h" />
+    <ClInclude Include="..\include\pa_win_wasapi.h" />
+    <ClInclude Include="..\include\pa_win_waveformat.h" />
+    <ClInclude Include="..\include\pa_win_wmme.h" />
+    <ClInclude Include="..\include\portaudio.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/portaudio/build/portaudio.vcxproj.filters b/Externals/portaudio/build/portaudio.vcxproj.filters
new file mode 100644
index 0000000000..96a498ea07
--- /dev/null
+++ b/Externals/portaudio/build/portaudio.vcxproj.filters
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{69112e69-92e4-40c1-aa5b-e4c4780ade42}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\common">
+      <UniqueIdentifier>{ddf0cf9b-f2df-4549-a447-8d7c4c2128d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi">
+      <UniqueIdentifier>{219121eb-0c81-4948-a94c-6802cf152776}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\dsound">
+      <UniqueIdentifier>{17688226-7728-4556-83a7-8e85b561ccca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wmme">
+      <UniqueIdentifier>{520ee766-8582-402e-a935-bdbcaa0d44de}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wasapi">
+      <UniqueIdentifier>{3891bf2e-9681-4394-be07-88e0a3fd2a68}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wdmks">
+      <UniqueIdentifier>{16791044-a8a5-4f21-b032-08245e52777a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os">
+      <UniqueIdentifier>{bde5e4fb-71f2-4cdf-8879-5370d0e12697}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os\win">
+      <UniqueIdentifier>{f1e8b583-742d-46a2-ac7f-060aabdc3a2c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d8832c7e-2dd0-48e7-8227-23b0d04c1879}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\common\pa_allocation.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_converters.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_cpuload.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_debugprint.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_dither.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_front.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\skeleton\pa_hostapi_skeleton.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_process.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_ringbuffer.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_stream.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\pa_trace.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\dsound\pa_win_ds.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\dsound\pa_win_ds_dynlink.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\wmme\pa_win_wmme.c">
+      <Filter>Source Files\hostapi\wmme</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\wasapi\pa_win_wasapi.c">
+      <Filter>Source Files\hostapi\wasapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hostapi\wdmks\pa_win_wdmks.c">
+      <Filter>Source Files\hostapi\wdmks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_coinitialize.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_hostapis.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_util.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_waveformat.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_win_wdmks_utils.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\os\win\pa_x86_plain_converters.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\pa_asio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\pa_win_ds.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\pa_win_wasapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\pa_win_waveformat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\pa_win_wmme.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\portaudio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/portaudio/src/SConscript b/Externals/portaudio/src/SConscript
new file mode 100644
index 0000000000..5cc915216d
--- /dev/null
+++ b/Externals/portaudio/src/SConscript
@@ -0,0 +1,220 @@
+import os.path, copy, sys
+
+def checkSymbol(conf, header, library=None, symbol=None, autoAdd=True, critical=False, pkgName=None):
+    """ Check for symbol in library, optionally look only for header.
+    @param conf: Configure instance.
+    @param header: The header file where the symbol is declared.
+    @param library: The library in which the symbol exists, if None it is taken to be the standard C library.
+    @param symbol: The symbol to look for, if None only the header will be looked up.
+    @param autoAdd: Automatically link with this library if check is positive.
+    @param critical: Raise on error?
+    @param pkgName: Optional name of pkg-config entry for library, to determine build parameters.
+    @return: True/False
+    """
+    origEnv = conf.env.Copy() # Copy unmodified environment so we can restore it upon error
+    env = conf.env
+    if library is None:
+        library = "c"   # Standard library
+        autoAdd = False
+
+    if pkgName is not None:
+        origLibs = copy.copy(env.get("LIBS", None))
+
+        try: env.ParseConfig("pkg-config --silence-errors %s --cflags --libs" % pkgName)
+        except: pass
+        else:
+            # I see no other way of checking that the parsing succeeded, if it did add no more linking parameters
+            if env.get("LIBS", None) != origLibs:
+                autoAdd = False
+
+    try:
+        if not conf.CheckCHeader(header, include_quotes="<>"):
+            raise ConfigurationError("missing header %s" % header)
+        if symbol is not None and not conf.CheckLib(library, symbol, language="C", autoadd=autoAdd):
+            raise ConfigurationError("missing symbol %s in library %s" % (symbol, library))
+    except ConfigurationError:
+        conf.env = origEnv
+        if not critical:
+            return False
+        raise
+
+    return True
+
+import SCons.Errors
+
+# Import common variables
+
+# Could use '#' to refer to top-level SConstruct directory, but looks like env.SConsignFile doesn't interpret this at least :(
+sconsDir = os.path.abspath(os.path.join("build", "scons"))
+
+try:
+    Import("Platform", "Posix", "ConfigurationError", "ApiVer")
+except SCons.Errors.UserError:
+    # The common objects must be exported first
+    SConscript(os.path.join(sconsDir, "SConscript_common"))
+    Import("Platform", "Posix", "ConfigurationError", "ApiVer")
+
+Import("env")
+
+# This will be manipulated
+env = env.Copy()
+
+# We operate with a set of needed libraries and optional libraries, the latter stemming from host API implementations.
+# For libraries of both types we record a set of values that is used to look for the library in question, during
+# configuration. If the corresponding library for a host API implementation isn't found, the implementation is left out.
+neededLibs = []
+optionalImpls = {}
+if Platform in Posix:
+    env.Append(CPPPATH=os.path.join("os", "unix"))
+    neededLibs += [("pthread", "pthread.h", "pthread_create"), ("m", "math.h", "sin")]
+    if env["useALSA"]:
+        optionalImpls["ALSA"] = ("asound", "alsa/asoundlib.h", "snd_pcm_open")
+    if env["useJACK"]:
+        optionalImpls["JACK"] = ("jack", "jack/jack.h", "jack_client_new")
+    if env["useOSS"]:
+        # TODO: It looks like the prefix for soundcard.h depends on the platform
+        optionalImpls["OSS"] = ("oss", "sys/soundcard.h", None)
+	if Platform == 'netbsd':
+	        optionalImpls["OSS"] = ("ossaudio", "sys/soundcard.h", "_oss_ioctl")
+    if env["useASIHPI"]:
+        optionalImpls["ASIHPI"] = ("hpi", "asihpi/hpi.h", "HPI_SubSysCreate")
+    if env["useCOREAUDIO"]:
+        optionalImpls["COREAUDIO"] = ("CoreAudio", "CoreAudio/CoreAudio.h", None)
+else:
+    raise ConfigurationError("unknown platform %s" % Platform)
+
+if Platform == "darwin":
+    env.Append(LINKFLAGS="-framework CoreFoundation -framework CoreServices -framework CoreAudio -framework AudioToolBox -framework AudioUnit")
+elif Platform == "cygwin":
+    env.Append(LIBS=["winmm"])
+elif Platform == "irix":
+    neededLibs +=  [("audio", "dmedia/audio.h", "alOpenPort"), ("dmedia", "dmedia/dmedia.h", "dmGetUST")]
+    env.Append(CPPDEFINES=["PA_USE_SGI"])
+
+def CheckCTypeSize(context, tp):
+    """ Check size of C type.
+    @param context: A configuration context.
+    @param tp: The type to check.
+    @return: Size of type, in bytes.
+    """
+    context.Message("Checking the size of C type %s..." % tp)
+    ret = context.TryRun("""
+#include <stdio.h>
+
+int main() {
+    printf("%%d", sizeof(%s));
+    return 0;
+}
+""" % tp, ".c")
+    if not ret[0]:
+        context.Result(" Couldn't obtain size of type %s!" % tp)
+        return None
+
+    assert ret[1]
+    sz = int(ret[1])
+    context.Result("%d" % sz)
+    return sz
+
+"""
+if sys.byteorder == "little":
+    env.Append(CPPDEFINES=["PA_LITTLE_ENDIAN"])
+elif sys.byteorder == "big":
+    env.Append(CPPDEFINES=["PA_BIG_ENDIAN"])
+else:
+    raise ConfigurationError("unknown byte order: %s" % sys.byteorder)
+"""
+if env["enableDebugOutput"]:
+    env.Append(CPPDEFINES=["PA_ENABLE_DEBUG_OUTPUT"])
+
+# Start configuration
+
+# Use an absolute path for conf_dir, otherwise it gets created both relative to current directory and build directory
+conf = env.Configure(log_file=os.path.join(sconsDir, "sconf.log"), custom_tests={"CheckCTypeSize": CheckCTypeSize},
+        conf_dir=os.path.join(sconsDir, ".sconf_temp"))
+conf.env.Append(CPPDEFINES=["SIZEOF_SHORT=%d" % conf.CheckCTypeSize("short")])
+conf.env.Append(CPPDEFINES=["SIZEOF_INT=%d" % conf.CheckCTypeSize("int")])
+conf.env.Append(CPPDEFINES=["SIZEOF_LONG=%d" % conf.CheckCTypeSize("long")])
+if checkSymbol(conf, "time.h", "rt", "clock_gettime"):
+    conf.env.Append(CPPDEFINES=["HAVE_CLOCK_GETTIME"])
+if checkSymbol(conf, "time.h", symbol="nanosleep"):
+    conf.env.Append(CPPDEFINES=["HAVE_NANOSLEEP"])
+if conf.CheckCHeader("sys/soundcard.h"):
+    conf.env.Append(CPPDEFINES=["HAVE_SYS_SOUNDCARD_H"])
+if conf.CheckCHeader("linux/soundcard.h"):
+    conf.env.Append(CPPDEFINES=["HAVE_LINUX_SOUNDCARD_H"])
+if conf.CheckCHeader("machine/soundcard.h"):
+    conf.env.Append(CPPDEFINES=["HAVE_MACHINE_SOUNDCARD_H"])
+
+# Look for needed libraries and link with them
+for lib, hdr, sym in neededLibs:
+    checkSymbol(conf, hdr, lib, sym, critical=True)
+# Look for host API libraries, if a library isn't found disable corresponding host API implementation.
+for name, val in optionalImpls.items():
+    lib, hdr, sym = val
+    if checkSymbol(conf, hdr, lib, sym, critical=False, pkgName=name.lower()):
+        conf.env.Append(CPPDEFINES=["PA_USE_%s=1" % name.upper()])
+    else:
+        del optionalImpls[name]
+
+# Configuration finished
+env = conf.Finish()
+
+# PA infrastructure
+CommonSources = [os.path.join("common", f) for f in "pa_allocation.c pa_converters.c pa_cpuload.c pa_dither.c pa_front.c \
+        pa_process.c pa_stream.c pa_trace.c pa_debugprint.c pa_ringbuffer.c".split()]
+CommonSources.append(os.path.join("hostapi", "skeleton", "pa_hostapi_skeleton.c"))
+
+# Host APIs implementations
+ImplSources = []
+if Platform in Posix:
+    ImplSources += [os.path.join("os", "unix", f) for f in "pa_unix_hostapis.c pa_unix_util.c".split()]
+
+if "ALSA" in optionalImpls:
+    ImplSources.append(os.path.join("hostapi", "alsa", "pa_linux_alsa.c"))
+if "JACK" in optionalImpls:
+    ImplSources.append(os.path.join("hostapi", "jack", "pa_jack.c"))
+if "OSS" in optionalImpls:
+    ImplSources.append(os.path.join("hostapi", "oss", "pa_unix_oss.c"))
+if "ASIHPI" in optionalImpls:
+    ImplSources.append(os.path.join("hostapi", "asihpi", "pa_linux_asihpi.c"))
+if "COREAUDIO" in optionalImpls:
+    ImplSources.append([os.path.join("hostapi", "coreaudio", f) for f in """
+	pa_mac_core.c  pa_mac_core_blocking.c  pa_mac_core_utilities.c 
+    """.split()])
+
+
+sources = CommonSources + ImplSources
+
+sharedLibEnv = env.Copy()
+if Platform in Posix:
+    # Add soname to library, this is so a reference is made to the versioned library in programs linking against libportaudio.so
+    if Platform != 'darwin':
+        sharedLibEnv.AppendUnique(SHLINKFLAGS="-Wl,-soname=libportaudio.so.%d" % int(ApiVer.split(".")[0]))
+sharedLib = sharedLibEnv.SharedLibrary(target="portaudio", source=sources)
+
+staticLib = env.StaticLibrary(target="portaudio", source=sources)
+
+if Platform in Posix:
+    prefix = env["prefix"]
+    includeDir = os.path.join(prefix, "include")
+    libDir = os.path.join(prefix, "lib")
+
+testNames = ["patest_sine", "paqa_devs", "paqa_errs", "patest1", "patest_buffer", "patest_callbackstop", "patest_clip", \
+        "patest_dither", "patest_hang", "patest_in_overflow", "patest_latency", "patest_leftright", "patest_longsine", \
+        "patest_many", "patest_maxsines", "patest_multi_sine", "patest_out_underflow", "patest_pink", "patest_prime", \
+        "patest_read_record", "patest_record", "patest_ringmix", "patest_saw", "patest_sine8", "patest_sine", \
+        "patest_sine_time", "patest_start_stop", "patest_stop", "patest_sync", "patest_toomanysines", \
+        "patest_underflow", "patest_wire", "patest_write_sine", "pa_devs", "pa_fuzz", "pa_minlat", \
+        "patest_sine_channelmaps",]
+
+# The test directory ("bin") should be in the top-level PA directory
+tests = [env.Program(target=os.path.join("#", "bin", name), source=[os.path.join("#", "test", name + ".c"),
+        staticLib]) for name in testNames]
+
+# Detect host APIs
+hostApis = []
+for cppdef in env["CPPDEFINES"]:
+    if cppdef.startswith("PA_USE_"):
+        hostApis.append(cppdef[7:-2])
+
+Return("sources", "sharedLib", "staticLib", "tests", "env", "hostApis")
diff --git a/Externals/portaudio/src/common/pa_allocation.c b/Externals/portaudio/src/common/pa_allocation.c
new file mode 100644
index 0000000000..c78c2cf7e2
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_allocation.c
@@ -0,0 +1,243 @@
+/*
+ * $Id: pa_allocation.c 1097 2006-08-26 08:27:53Z rossb $
+ * Portable Audio I/O Library allocation group implementation
+ * memory allocation group for tracking allocation groups
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Allocation Group implementation.
+*/
+
+
+#include "pa_allocation.h"
+#include "pa_util.h"
+
+
+/*
+    Maintain 3 singly linked lists...
+    linkBlocks: the buffers used to allocate the links
+    spareLinks: links available for use in the allocations list
+    allocations: the buffers currently allocated using PaUtil_ContextAllocateMemory()
+
+    Link block size is doubled every time new links are allocated.
+*/
+
+
+#define PA_INITIAL_LINK_COUNT_    16
+
+struct PaUtilAllocationGroupLink
+{
+    struct PaUtilAllocationGroupLink *next;
+    void *buffer;
+};
+
+/*
+    Allocate a block of links. The first link will have it's buffer member
+    pointing to the block, and it's next member set to <nextBlock>. The remaining
+    links will have NULL buffer members, and each link will point to
+    the next link except the last, which will point to <nextSpare>
+*/
+static struct PaUtilAllocationGroupLink *AllocateLinks( long count,
+        struct PaUtilAllocationGroupLink *nextBlock,
+        struct PaUtilAllocationGroupLink *nextSpare )
+{
+    struct PaUtilAllocationGroupLink *result;
+    int i;
+    
+    result = (struct PaUtilAllocationGroupLink *)PaUtil_AllocateMemory(
+            sizeof(struct PaUtilAllocationGroupLink) * count );
+    if( result )
+    {
+        /* the block link */
+        result[0].buffer = result;
+        result[0].next = nextBlock;
+
+        /* the spare links */
+        for( i=1; i<count; ++i )
+        {
+            result[i].buffer = 0;
+            result[i].next = &result[i+1];
+        }
+        result[count-1].next = nextSpare;
+    }
+    
+    return result;
+}
+
+
+PaUtilAllocationGroup* PaUtil_CreateAllocationGroup( void )
+{
+    PaUtilAllocationGroup* result = 0;
+    struct PaUtilAllocationGroupLink *links;
+
+
+    links = AllocateLinks( PA_INITIAL_LINK_COUNT_, 0, 0 );
+    if( links != 0 )
+    {
+        result = (PaUtilAllocationGroup*)PaUtil_AllocateMemory( sizeof(PaUtilAllocationGroup) );
+        if( result )
+        {
+            result->linkCount = PA_INITIAL_LINK_COUNT_;
+            result->linkBlocks = &links[0];
+            result->spareLinks = &links[1];
+            result->allocations = 0;
+        }
+        else
+        {
+            PaUtil_FreeMemory( links );
+        }
+    }
+
+    return result;
+}
+
+
+void PaUtil_DestroyAllocationGroup( PaUtilAllocationGroup* group )
+{
+    struct PaUtilAllocationGroupLink *current = group->linkBlocks;
+    struct PaUtilAllocationGroupLink *next;
+
+    while( current )
+    {
+        next = current->next;
+        PaUtil_FreeMemory( current->buffer );
+        current = next;
+    }
+
+    PaUtil_FreeMemory( group );
+}
+
+
+void* PaUtil_GroupAllocateMemory( PaUtilAllocationGroup* group, long size )
+{
+    struct PaUtilAllocationGroupLink *links, *link;
+    void *result = 0;
+    
+    /* allocate more links if necessary */
+    if( !group->spareLinks )
+    {
+        /* double the link count on each block allocation */
+        links = AllocateLinks( group->linkCount, group->linkBlocks, group->spareLinks );
+        if( links )
+        {
+            group->linkCount += group->linkCount;
+            group->linkBlocks = &links[0];
+            group->spareLinks = &links[1];
+        }
+    }
+
+    if( group->spareLinks )
+    {
+        result = PaUtil_AllocateMemory( size );
+        if( result )
+        {
+            link = group->spareLinks;
+            group->spareLinks = link->next;
+
+            link->buffer = result;
+            link->next = group->allocations;
+
+            group->allocations = link;
+        }
+    }
+
+    return result;    
+}
+
+
+void PaUtil_GroupFreeMemory( PaUtilAllocationGroup* group, void *buffer )
+{
+    struct PaUtilAllocationGroupLink *current = group->allocations;
+    struct PaUtilAllocationGroupLink *previous = 0;
+
+    if( buffer == 0 )
+        return;
+
+    /* find the right link and remove it */
+    while( current )
+    {
+        if( current->buffer == buffer )
+        {
+            if( previous )
+            {
+                previous->next = current->next;
+            }
+            else
+            {
+                group->allocations = current->next;
+            }
+
+            current->buffer = 0;
+            current->next = group->spareLinks;
+            group->spareLinks = current;
+
+            break;
+        }
+        
+        previous = current;
+        current = current->next;
+    }
+
+    PaUtil_FreeMemory( buffer ); /* free the memory whether we found it in the list or not */
+}
+
+
+void PaUtil_FreeAllAllocations( PaUtilAllocationGroup* group )
+{
+    struct PaUtilAllocationGroupLink *current = group->allocations;
+    struct PaUtilAllocationGroupLink *previous = 0;
+
+    /* free all buffers in the allocations list */
+    while( current )
+    {
+        PaUtil_FreeMemory( current->buffer );
+        current->buffer = 0;
+
+        previous = current;
+        current = current->next;
+    }
+
+    /* link the former allocations list onto the front of the spareLinks list */
+    if( previous )
+    {
+        previous->next = group->spareLinks;
+        group->spareLinks = group->allocations;
+        group->allocations = 0;
+    }
+}
+
diff --git a/Externals/portaudio/src/common/pa_allocation.h b/Externals/portaudio/src/common/pa_allocation.h
new file mode 100644
index 0000000000..811dd72e0e
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_allocation.h
@@ -0,0 +1,104 @@
+#ifndef PA_ALLOCATION_H
+#define PA_ALLOCATION_H
+/*
+ * $Id: pa_allocation.h 1339 2008-02-15 07:50:33Z rossb $
+ * Portable Audio I/O Library allocation context header
+ * memory allocation context for tracking allocation groups
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Allocation Group prototypes. An Allocation Group makes it easy to
+ allocate multiple blocks of memory and free them all at once.
+ 
+ An allocation group is useful for keeping track of multiple blocks
+ of memory which are allocated at the same time (such as during initialization)
+ and need to be deallocated at the same time. The allocation group maintains
+ a list of allocated blocks, and can free all allocations at once. This
+ can be usefull for cleaning up after a partially initialized object fails.
+
+ The allocation group implementation is built on top of the lower
+ level allocation functions defined in pa_util.h
+*/
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+typedef struct
+{
+    long linkCount;
+    struct PaUtilAllocationGroupLink *linkBlocks;
+    struct PaUtilAllocationGroupLink *spareLinks;
+    struct PaUtilAllocationGroupLink *allocations;
+}PaUtilAllocationGroup;
+
+
+
+/** Create an allocation group.
+*/
+PaUtilAllocationGroup* PaUtil_CreateAllocationGroup( void );
+
+/** Destroy an allocation group, but not the memory allocated through the group.
+*/
+void PaUtil_DestroyAllocationGroup( PaUtilAllocationGroup* group );
+
+/** Allocate a block of memory though an allocation group.
+*/
+void* PaUtil_GroupAllocateMemory( PaUtilAllocationGroup* group, long size );
+
+/** Free a block of memory that was previously allocated though an allocation
+ group. Calling this function is a relatively time consuming operation.
+ Under normal circumstances clients should call PaUtil_FreeAllAllocations to
+ free all allocated blocks simultaneously.
+ @see PaUtil_FreeAllAllocations
+*/
+void PaUtil_GroupFreeMemory( PaUtilAllocationGroup* group, void *buffer );
+
+/** Free all blocks of memory which have been allocated through the allocation
+ group. This function doesn't destroy the group itself.
+*/
+void PaUtil_FreeAllAllocations( PaUtilAllocationGroup* group );
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_ALLOCATION_H */
diff --git a/Externals/portaudio/src/common/pa_converters.c b/Externals/portaudio/src/common/pa_converters.c
new file mode 100644
index 0000000000..ef65b68a5c
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_converters.c
@@ -0,0 +1,1983 @@
+/*
+ * $Id: pa_converters.c 1748 2011-09-01 22:08:32Z philburk $
+ * Portable Audio I/O Library sample conversion mechanism
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Conversion function implementations.
+ 
+ If the C9x function lrintf() is available, define PA_USE_C99_LRINTF to use it
+
+ @todo Consider whether functions which dither but don't clip should exist,
+ V18 automatically enabled clipping whenever dithering was selected. Perhaps
+ we should do the same. 
+    see: "require clipping for dithering sample conversion functions?"
+    http://www.portaudio.com/trac/ticket/112
+
+ @todo implement the converters marked IMPLEMENT ME: Int32_To_Int24_Dither,
+ Int32_To_UInt8_Dither, Int24_To_Int16_Dither, Int24_To_Int8_Dither, 
+ Int24_To_UInt8_Dither, Int16_To_Int8_Dither, Int16_To_UInt8_Dither
+    see: "some conversion functions are not implemented in pa_converters.c"
+    http://www.portaudio.com/trac/ticket/35
+
+ @todo review the converters marked REVIEW: Float32_To_Int32,
+ Float32_To_Int32_Dither, Float32_To_Int32_Clip, Float32_To_Int32_DitherClip,
+ Int32_To_Int16_Dither, Int32_To_Int8_Dither, Int16_To_Int32
+*/
+
+
+#include "pa_converters.h"
+#include "pa_dither.h"
+#include "pa_endianness.h"
+#include "pa_types.h"
+
+
+PaSampleFormat PaUtil_SelectClosestAvailableFormat(
+        PaSampleFormat availableFormats, PaSampleFormat format )
+{
+    PaSampleFormat result;
+
+    format &= ~paNonInterleaved;
+    availableFormats &= ~paNonInterleaved;
+    
+    if( (format & availableFormats) == 0 )
+    {
+        /* NOTE: this code depends on the sample format constants being in
+            descending order of quality - ie best quality is 0
+            FIXME: should write an assert which checks that all of the
+            known constants conform to that requirement.
+        */
+
+        if( format != 0x01 )
+        {
+            /* scan for better formats */
+            result = format;
+            do
+            {
+                result >>= 1;
+            }
+            while( (result & availableFormats) == 0 && result != 0 );
+        }
+        else
+        {
+            result = 0;
+        }
+        
+        if( result == 0 ){
+            /* scan for worse formats */
+            result = format;
+            do
+            {
+                result <<= 1;
+            }
+            while( (result & availableFormats) == 0 && result != paCustomFormat );
+
+            if( (result & availableFormats) == 0 )
+                result = paSampleFormatNotSupported;
+        }
+        
+    }else{
+        result = format;
+    }
+
+    return result;
+}
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_SELECT_FORMAT_( format, float32, int32, int24, int16, int8, uint8 ) \
+    switch( format & ~paNonInterleaved ){                                      \
+    case paFloat32:                                                            \
+        float32                                                                \
+    case paInt32:                                                              \
+        int32                                                                  \
+    case paInt24:                                                              \
+        int24                                                                  \
+    case paInt16:                                                              \
+        int16                                                                  \
+    case paInt8:                                                               \
+        int8                                                                   \
+    case paUInt8:                                                              \
+        uint8                                                                  \
+    default: return 0;                                                         \
+    }
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_SELECT_CONVERTER_DITHER_CLIP_( flags, source, destination )         \
+    if( flags & paClipOff ){ /* no clip */                                     \
+        if( flags & paDitherOff ){ /* no dither */                             \
+            return paConverters. source ## _To_ ## destination;                \
+        }else{ /* dither */                                                    \
+            return paConverters. source ## _To_ ## destination ## _Dither;     \
+        }                                                                      \
+    }else{ /* clip */                                                          \
+        if( flags & paDitherOff ){ /* no dither */                             \
+            return paConverters. source ## _To_ ## destination ## _Clip;       \
+        }else{ /* dither */                                                    \
+            return paConverters. source ## _To_ ## destination ## _DitherClip; \
+        }                                                                      \
+    }
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_SELECT_CONVERTER_DITHER_( flags, source, destination )              \
+    if( flags & paDitherOff ){ /* no dither */                                 \
+        return paConverters. source ## _To_ ## destination;                    \
+    }else{ /* dither */                                                        \
+        return paConverters. source ## _To_ ## destination ## _Dither;         \
+    }
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_USE_CONVERTER_( source, destination )\
+    return paConverters. source ## _To_ ## destination;
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_UNITY_CONVERSION_( wordlength )\
+    return paConverters. Copy_ ## wordlength ## _To_ ## wordlength;
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilConverter* PaUtil_SelectConverter( PaSampleFormat sourceFormat,
+        PaSampleFormat destinationFormat, PaStreamFlags flags )
+{
+    PA_SELECT_FORMAT_( sourceFormat,
+                       /* paFloat32: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_UNITY_CONVERSION_( 32 ),
+                                          /* paInt32: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int32 ),
+                                          /* paInt24: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int24 ),
+                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int16 ),
+                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int8 ),
+                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, UInt8 )
+                                        ),
+                       /* paInt32: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_USE_CONVERTER_( Int32, Float32 ),
+                                          /* paInt32: */          PA_UNITY_CONVERSION_( 32 ),
+                                          /* paInt24: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int24 ),
+                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int16 ),
+                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int8 ),
+                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, UInt8 )
+                                        ),
+                       /* paInt24: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_USE_CONVERTER_( Int24, Float32 ),
+                                          /* paInt32: */          PA_USE_CONVERTER_( Int24, Int32 ),
+                                          /* paInt24: */          PA_UNITY_CONVERSION_( 24 ),
+                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int16 ),
+                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int8 ),
+                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int24, UInt8 )
+                                        ),
+                       /* paInt16: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_USE_CONVERTER_( Int16, Float32 ),
+                                          /* paInt32: */          PA_USE_CONVERTER_( Int16, Int32 ),
+                                          /* paInt24: */          PA_USE_CONVERTER_( Int16, Int24 ),
+                                          /* paInt16: */          PA_UNITY_CONVERSION_( 16 ),
+                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int16, Int8 ),
+                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int16, UInt8 )
+                                        ),
+                       /* paInt8: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_USE_CONVERTER_( Int8, Float32 ),
+                                          /* paInt32: */          PA_USE_CONVERTER_( Int8, Int32 ),
+                                          /* paInt24: */          PA_USE_CONVERTER_( Int8, Int24 ),
+                                          /* paInt16: */          PA_USE_CONVERTER_( Int8, Int16 ),
+                                          /* paInt8: */           PA_UNITY_CONVERSION_( 8 ),
+                                          /* paUInt8: */          PA_USE_CONVERTER_( Int8, UInt8 )
+                                        ),
+                       /* paUInt8: */
+                       PA_SELECT_FORMAT_( destinationFormat,
+                                          /* paFloat32: */        PA_USE_CONVERTER_( UInt8, Float32 ),
+                                          /* paInt32: */          PA_USE_CONVERTER_( UInt8, Int32 ),
+                                          /* paInt24: */          PA_USE_CONVERTER_( UInt8, Int24 ),
+                                          /* paInt16: */          PA_USE_CONVERTER_( UInt8, Int16 ),
+                                          /* paInt8: */           PA_USE_CONVERTER_( UInt8, Int8 ),
+                                          /* paUInt8: */          PA_UNITY_CONVERSION_( 8 )
+                                        )
+                     )
+}
+
+/* -------------------------------------------------------------------------- */
+
+#ifdef PA_NO_STANDARD_CONVERTERS
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilConverterTable paConverters = {
+    0, /* PaUtilConverter *Float32_To_Int32; */
+    0, /* PaUtilConverter *Float32_To_Int32_Dither; */
+    0, /* PaUtilConverter *Float32_To_Int32_Clip; */
+    0, /* PaUtilConverter *Float32_To_Int32_DitherClip; */
+
+    0, /* PaUtilConverter *Float32_To_Int24; */
+    0, /* PaUtilConverter *Float32_To_Int24_Dither; */
+    0, /* PaUtilConverter *Float32_To_Int24_Clip; */
+    0, /* PaUtilConverter *Float32_To_Int24_DitherClip; */
+
+    0, /* PaUtilConverter *Float32_To_Int16; */
+    0, /* PaUtilConverter *Float32_To_Int16_Dither; */
+    0, /* PaUtilConverter *Float32_To_Int16_Clip; */
+    0, /* PaUtilConverter *Float32_To_Int16_DitherClip; */
+
+    0, /* PaUtilConverter *Float32_To_Int8; */
+    0, /* PaUtilConverter *Float32_To_Int8_Dither; */
+    0, /* PaUtilConverter *Float32_To_Int8_Clip; */
+    0, /* PaUtilConverter *Float32_To_Int8_DitherClip; */
+
+    0, /* PaUtilConverter *Float32_To_UInt8; */
+    0, /* PaUtilConverter *Float32_To_UInt8_Dither; */
+    0, /* PaUtilConverter *Float32_To_UInt8_Clip; */
+    0, /* PaUtilConverter *Float32_To_UInt8_DitherClip; */
+
+    0, /* PaUtilConverter *Int32_To_Float32; */
+    0, /* PaUtilConverter *Int32_To_Int24; */
+    0, /* PaUtilConverter *Int32_To_Int24_Dither; */
+    0, /* PaUtilConverter *Int32_To_Int16; */
+    0, /* PaUtilConverter *Int32_To_Int16_Dither; */
+    0, /* PaUtilConverter *Int32_To_Int8; */
+    0, /* PaUtilConverter *Int32_To_Int8_Dither; */
+    0, /* PaUtilConverter *Int32_To_UInt8; */
+    0, /* PaUtilConverter *Int32_To_UInt8_Dither; */
+
+    0, /* PaUtilConverter *Int24_To_Float32; */
+    0, /* PaUtilConverter *Int24_To_Int32; */
+    0, /* PaUtilConverter *Int24_To_Int16; */
+    0, /* PaUtilConverter *Int24_To_Int16_Dither; */
+    0, /* PaUtilConverter *Int24_To_Int8; */
+    0, /* PaUtilConverter *Int24_To_Int8_Dither; */
+    0, /* PaUtilConverter *Int24_To_UInt8; */
+    0, /* PaUtilConverter *Int24_To_UInt8_Dither; */
+    
+    0, /* PaUtilConverter *Int16_To_Float32; */
+    0, /* PaUtilConverter *Int16_To_Int32; */
+    0, /* PaUtilConverter *Int16_To_Int24; */
+    0, /* PaUtilConverter *Int16_To_Int8; */
+    0, /* PaUtilConverter *Int16_To_Int8_Dither; */
+    0, /* PaUtilConverter *Int16_To_UInt8; */
+    0, /* PaUtilConverter *Int16_To_UInt8_Dither; */
+
+    0, /* PaUtilConverter *Int8_To_Float32; */
+    0, /* PaUtilConverter *Int8_To_Int32; */
+    0, /* PaUtilConverter *Int8_To_Int24 */
+    0, /* PaUtilConverter *Int8_To_Int16; */
+    0, /* PaUtilConverter *Int8_To_UInt8; */
+
+    0, /* PaUtilConverter *UInt8_To_Float32; */
+    0, /* PaUtilConverter *UInt8_To_Int32; */
+    0, /* PaUtilConverter *UInt8_To_Int24; */
+    0, /* PaUtilConverter *UInt8_To_Int16; */
+    0, /* PaUtilConverter *UInt8_To_Int8; */
+
+    0, /* PaUtilConverter *Copy_8_To_8; */
+    0, /* PaUtilConverter *Copy_16_To_16; */
+    0, /* PaUtilConverter *Copy_24_To_24; */
+    0  /* PaUtilConverter *Copy_32_To_32; */
+};
+
+/* -------------------------------------------------------------------------- */
+
+#else /* PA_NO_STANDARD_CONVERTERS is not defined */
+
+/* -------------------------------------------------------------------------- */
+
+#define PA_CLIP_( val, min, max )\
+    { val = ((val) < (min)) ? (min) : (((val) > (max)) ? (max) : (val)); }
+
+
+static const float const_1_div_128_ = 1.0f / 128.0f;  /* 8 bit multiplier */
+
+static const float const_1_div_32768_ = 1.0f / 32768.f; /* 16 bit multiplier */
+
+static const double const_1_div_2147483648_ = 1.0 / 2147483648.0; /* 32 bit multiplier */
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        /* REVIEW */
+#ifdef PA_USE_C99_LRINTF
+        float scaled = *src * 0x7FFFFFFF;
+        *dest = lrintf(scaled-0.5f);
+#else
+        double scaled = *src * 0x7FFFFFFF;
+        *dest = (PaInt32) scaled;        
+#endif
+        
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+
+    while( count-- )
+    {
+        /* REVIEW */
+#ifdef PA_USE_C99_LRINTF
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = ((float)*src * (2147483646.0f)) + dither;
+        *dest = lrintf(dithered - 0.5f);
+#else
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        *dest = (PaInt32) dithered;
+#endif
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        /* REVIEW */
+#ifdef PA_USE_C99_LRINTF
+        float scaled = *src * 0x7FFFFFFF;
+        PA_CLIP_( scaled, -2147483648.f, 2147483647.f  );
+        *dest = lrintf(scaled-0.5f);
+#else
+        double scaled = *src * 0x7FFFFFFF;
+        PA_CLIP_( scaled, -2147483648., 2147483647.  );
+        *dest = (PaInt32) scaled;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+
+    while( count-- )
+    {
+        /* REVIEW */
+#ifdef PA_USE_C99_LRINTF
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = ((float)*src * (2147483646.0f)) + dither;
+        PA_CLIP_( dithered, -2147483648.f, 2147483647.f  );
+        *dest = lrintf(dithered-0.5f);
+#else
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        PA_CLIP_( dithered, -2147483648., 2147483647.  );
+        *dest = (PaInt32) dithered;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    PaInt32 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        /* convert to 32 bit and drop the low 8 bits */
+        double scaled = (double)(*src) * 2147483647.0;
+        temp = (PaInt32) scaled;
+        
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 24);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 8);
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    PaInt32 temp;
+
+    while( count-- )
+    {
+        /* convert to 32 bit and drop the low 8 bits */
+
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        
+        temp = (PaInt32) dithered;
+
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 24);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 8);
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    PaInt32 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        /* convert to 32 bit and drop the low 8 bits */
+        double scaled = *src * 0x7FFFFFFF;
+        PA_CLIP_( scaled, -2147483648., 2147483647.  );
+        temp = (PaInt32) scaled;
+
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 24);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 8);
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    PaInt32 temp;
+    
+    while( count-- )
+    {
+        /* convert to 32 bit and drop the low 8 bits */
+        
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        PA_CLIP_( dithered, -2147483648., 2147483647.  );
+        
+        temp = (PaInt32) dithered;
+
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 24);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 8);
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+#ifdef PA_USE_C99_LRINTF
+        float tempf = (*src * (32767.0f)) ;
+        *dest = lrintf(tempf-0.5f);
+#else
+        short samp = (short) (*src * (32767.0f));
+        *dest = samp;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt16 *dest = (PaInt16*)destinationBuffer;
+
+    while( count-- )
+    {
+
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (32766.0f)) + dither;
+
+#ifdef PA_USE_C99_LRINTF
+        *dest = lrintf(dithered-0.5f);
+#else
+        *dest = (PaInt16) dithered;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+#ifdef PA_USE_C99_LRINTF
+        long samp = lrintf((*src * (32767.0f)) -0.5f);
+#else
+        long samp = (PaInt32) (*src * (32767.0f));
+#endif
+        PA_CLIP_( samp, -0x8000, 0x7FFF );
+        *dest = (PaInt16) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (32766.0f)) + dither;
+        PaInt32 samp = (PaInt32) dithered;
+        PA_CLIP_( samp, -0x8000, 0x7FFF );
+#ifdef PA_USE_C99_LRINTF
+        *dest = lrintf(samp-0.5f);
+#else
+        *dest = (PaInt16) samp;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        signed char samp = (signed char) (*src * (127.0f));
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    
+    while( count-- )
+    {
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (126.0f)) + dither;
+        PaInt32 samp = (PaInt32) dithered;
+        *dest = (signed char) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int8_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        PaInt32 samp = (PaInt32)(*src * (127.0f));
+        PA_CLIP_( samp, -0x80, 0x7F );
+        *dest = (signed char) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int8_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (126.0f)) + dither;
+        PaInt32 samp = (PaInt32) dithered;
+        PA_CLIP_( samp, -0x80, 0x7F );
+        *dest = (signed char) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_UInt8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        unsigned char samp = (unsigned char)(128 + ((unsigned char) (*src * (127.0f))));
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_UInt8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    
+    while( count-- )
+    {
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (126.0f)) + dither;
+        PaInt32 samp = (PaInt32) dithered;
+        *dest = (unsigned char) (128 + samp);
+        
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_UInt8_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        PaInt32 samp = 128 + (PaInt32)(*src * (127.0f));
+        PA_CLIP_( samp, 0x0000, 0x00FF );
+        *dest = (unsigned char) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_UInt8_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        /* use smaller scaler to prevent overflow when we add the dither */
+        float dithered = (*src * (126.0f)) + dither;
+        PaInt32 samp = 128 + (PaInt32) dithered;
+        PA_CLIP_( samp, 0x0000, 0x00FF );
+        *dest = (unsigned char) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Float32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    float *dest =  (float*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        *dest = (float) ((double)*src * const_1_div_2147483648_);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src    = (PaInt32*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    (void) ditherGenerator; /* unused parameter */
+    
+	while( count-- )
+    {
+		/* REVIEW */
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = (unsigned char)(*src >> 8);
+        dest[1] = (unsigned char)(*src >> 16);
+        dest[2] = (unsigned char)(*src >> 24);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(*src >> 24);
+        dest[1] = (unsigned char)(*src >> 16);
+        dest[2] = (unsigned char)(*src >> 8);
+#endif
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int24_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    (void) destinationBuffer; /* unused parameters */
+    (void) destinationStride; /* unused parameters */
+    (void) sourceBuffer; /* unused parameters */
+    (void) sourceStride; /* unused parameters */
+    (void) count; /* unused parameters */
+    (void) ditherGenerator; /* unused parameters */
+    /* IMPLEMENT ME */
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        *dest = (PaInt16) ((*src) >> 16);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int16_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    PaInt32 dither;
+
+    while( count-- )
+    {
+        /* REVIEW */
+        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
+        *dest = (PaInt16) ((((*src)>>1) + dither) >> 15);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        *dest = (signed char) ((*src) >> 24);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_Int8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    PaInt32 dither;
+
+    while( count-- )
+    {
+        /* REVIEW */
+        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
+        *dest = (signed char) ((((*src)>>1) + dither) >> 23);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_UInt8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+		(*dest) = (unsigned char)(((*src) >> 24) + 128); 
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int32_To_UInt8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt32 *src = (PaInt32*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        /* IMPLEMENT ME */
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Float32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    float *dest = (float*)destinationBuffer;
+    PaInt32 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        temp = (((PaInt32)src[0]) << 8);  
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 24);
+#elif defined(PA_BIG_ENDIAN)
+        temp = (((PaInt32)src[0]) << 24);
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 8);
+#endif
+
+        *dest = (float) ((double)temp * const_1_div_2147483648_);
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src  = (unsigned char*)sourceBuffer;
+    PaInt32 *dest = (PaInt32*)  destinationBuffer;
+    PaInt32 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        temp = (((PaInt32)src[0]) << 8);  
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 24);
+#elif defined(PA_BIG_ENDIAN)
+        temp = (((PaInt32)src[0]) << 24);
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 8);
+#endif
+
+        *dest = temp;
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    PaInt16 *dest = (PaInt16*)destinationBuffer;
+    
+    PaInt16 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+        
+    while( count-- )
+    {
+		
+#if defined(PA_LITTLE_ENDIAN)
+		/* src[0] is discarded */
+        temp = (((PaInt16)src[1]));
+        temp = temp | (PaInt16)(((PaInt16)src[2]) << 8);
+#elif defined(PA_BIG_ENDIAN)
+		/* src[2] is discarded */
+        temp = (PaInt16)(((PaInt16)src[0]) << 8);
+        temp = temp | (((PaInt16)src[1]));
+#endif
+
+        *dest = temp;
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Int16_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    PaInt16 *dest = (PaInt16*)destinationBuffer;
+
+    PaInt32 temp, dither;
+
+    while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        temp = (((PaInt32)src[0]) << 8);  
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 24);
+#elif defined(PA_BIG_ENDIAN)
+        temp = (((PaInt32)src[0]) << 24);
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 8);
+#endif
+
+        /* REVIEW */
+        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
+        *dest = (PaInt16) (((temp >> 1) + dither) >> 15);
+
+        src  += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Int8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    signed char  *dest = (signed char*)destinationBuffer;
+    
+    (void) ditherGenerator; /* unused parameter */
+        
+    while( count-- )
+    {	
+	
+#if defined(PA_LITTLE_ENDIAN)
+		/* src[0] is discarded */
+		/* src[1] is discarded */
+        *dest = src[2];
+#elif defined(PA_BIG_ENDIAN)
+		/* src[2] is discarded */
+		/* src[1] is discarded */
+		*dest = src[0];
+#endif
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_Int8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    signed char  *dest = (signed char*)destinationBuffer;
+    
+    PaInt32 temp, dither;
+
+    while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        temp = (((PaInt32)src[0]) << 8);  
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 24);
+#elif defined(PA_BIG_ENDIAN)
+        temp = (((PaInt32)src[0]) << 24);
+        temp = temp | (((PaInt32)src[1]) << 16);
+        temp = temp | (((PaInt32)src[2]) << 8);
+#endif
+
+        /* REVIEW */
+        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
+        *dest = (signed char) (((temp >> 1) + dither) >> 23);
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_UInt8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    
+    (void) ditherGenerator; /* unused parameter */
+        
+    while( count-- )
+    {
+		
+#if defined(PA_LITTLE_ENDIAN)
+		/* src[0] is discarded */
+		/* src[1] is discarded */
+        *dest = (unsigned char)(src[2] + 128);
+#elif defined(PA_BIG_ENDIAN)
+        *dest = (unsigned char)(src[0] + 128);
+		/* src[1] is discarded */
+		/* src[2] is discarded */		
+#endif
+
+        src += sourceStride * 3;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int24_To_UInt8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    (void) destinationBuffer; /* unused parameters */
+    (void) destinationStride; /* unused parameters */
+    (void) sourceBuffer; /* unused parameters */
+    (void) sourceStride; /* unused parameters */
+    (void) count; /* unused parameters */
+    (void) ditherGenerator; /* unused parameters */
+    /* IMPLEMENT ME */
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_Float32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    float *dest =  (float*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        float samp = *src * const_1_div_32768_; /* FIXME: i'm concerned about this being asymetrical with float->int16 -rb */
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        /* REVIEW: we should consider something like
+            (*src << 16) | (*src & 0xFFFF)
+        */
+        
+        *dest = *src << 16;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src   = (PaInt16*) sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    PaInt16 temp;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        temp = *src;
+        
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = 0;
+        dest[1] = (unsigned char)(temp);
+        dest[2] = (unsigned char)(temp >> 8);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp);
+        dest[2] = 0;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_Int8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        (*dest) = (signed char)((*src) >> 8);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_Int8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    signed char *dest =  (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        /* IMPLEMENT ME */
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_UInt8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+		(*dest) = (unsigned char)(((*src) >> 8) + 128); 
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int16_To_UInt8_Dither(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaInt16 *src = (PaInt16*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        /* IMPLEMENT ME */
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int8_To_Float32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    signed char *src = (signed char*)sourceBuffer;
+    float *dest =  (float*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        float samp = *src * const_1_div_128_;
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int8_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    signed char *src = (signed char*)sourceBuffer;
+    PaInt32 *dest =  (PaInt32*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+		(*dest) = (*src) << 24;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int8_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    signed char *src = (signed char*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = 0;
+        dest[1] = 0;
+        dest[2] = (*src);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (*src);
+        dest[1] = 0;
+        dest[2] = 0;
+#endif
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int8_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    signed char *src = (signed char*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        (*dest) = (PaInt16)((*src) << 8);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Int8_To_UInt8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    signed char *src = (signed char*)sourceBuffer;
+    unsigned char *dest =  (unsigned char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        (*dest) = (unsigned char)(*src + 128);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void UInt8_To_Float32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    float *dest =  (float*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        float samp = (*src - 128) * const_1_div_128_;
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void UInt8_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    PaInt32 *dest = (PaInt32*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+		(*dest) = (*src - 128) << 24;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void UInt8_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+	unsigned char *src  = (unsigned char*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    (void) ditherGenerator; /* unused parameters */
+    
+	while( count-- )
+    {
+
+#if defined(PA_LITTLE_ENDIAN)
+        dest[0] = 0;
+        dest[1] = 0;
+        dest[2] = (unsigned char)(*src - 128);
+#elif defined(PA_BIG_ENDIAN)
+        dest[0] = (unsigned char)(*src - 128);
+        dest[1] = 0;
+        dest[2] = 0;
+#endif
+		
+        src += sourceStride;
+        dest += destinationStride * 3;    
+	}
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void UInt8_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    PaInt16 *dest =  (PaInt16*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        (*dest) = (PaInt16)((*src - 128) << 8);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void UInt8_To_Int8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    signed char  *dest = (signed char*)destinationBuffer;
+    (void)ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        (*dest) = (signed char)(*src - 128);
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Copy_8_To_8(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+                                                      
+    (void) ditherGenerator; /* unused parameter */
+
+    while( count-- )
+    {
+        *dest = *src;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Copy_16_To_16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaUint16 *src = (PaUint16 *)sourceBuffer;
+    PaUint16 *dest = (PaUint16 *)destinationBuffer;
+                                                        
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        *dest = *src;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Copy_24_To_24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    unsigned char *src = (unsigned char*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        dest[0] = src[0];
+        dest[1] = src[1];
+        dest[2] = src[2];
+
+        src += sourceStride * 3;
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Copy_32_To_32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    PaUint32 *dest = (PaUint32 *)destinationBuffer;
+    PaUint32 *src = (PaUint32 *)sourceBuffer;
+
+    (void) ditherGenerator; /* unused parameter */
+    
+    while( count-- )
+    {
+        *dest = *src;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilConverterTable paConverters = {
+    Float32_To_Int32,              /* PaUtilConverter *Float32_To_Int32; */
+    Float32_To_Int32_Dither,       /* PaUtilConverter *Float32_To_Int32_Dither; */
+    Float32_To_Int32_Clip,         /* PaUtilConverter *Float32_To_Int32_Clip; */
+    Float32_To_Int32_DitherClip,   /* PaUtilConverter *Float32_To_Int32_DitherClip; */
+
+    Float32_To_Int24,              /* PaUtilConverter *Float32_To_Int24; */
+    Float32_To_Int24_Dither,       /* PaUtilConverter *Float32_To_Int24_Dither; */
+    Float32_To_Int24_Clip,         /* PaUtilConverter *Float32_To_Int24_Clip; */
+    Float32_To_Int24_DitherClip,   /* PaUtilConverter *Float32_To_Int24_DitherClip; */
+    
+    Float32_To_Int16,              /* PaUtilConverter *Float32_To_Int16; */
+    Float32_To_Int16_Dither,       /* PaUtilConverter *Float32_To_Int16_Dither; */
+    Float32_To_Int16_Clip,         /* PaUtilConverter *Float32_To_Int16_Clip; */
+    Float32_To_Int16_DitherClip,   /* PaUtilConverter *Float32_To_Int16_DitherClip; */
+
+    Float32_To_Int8,               /* PaUtilConverter *Float32_To_Int8; */
+    Float32_To_Int8_Dither,        /* PaUtilConverter *Float32_To_Int8_Dither; */
+    Float32_To_Int8_Clip,          /* PaUtilConverter *Float32_To_Int8_Clip; */
+    Float32_To_Int8_DitherClip,    /* PaUtilConverter *Float32_To_Int8_DitherClip; */
+
+    Float32_To_UInt8,              /* PaUtilConverter *Float32_To_UInt8; */
+    Float32_To_UInt8_Dither,       /* PaUtilConverter *Float32_To_UInt8_Dither; */
+    Float32_To_UInt8_Clip,         /* PaUtilConverter *Float32_To_UInt8_Clip; */
+    Float32_To_UInt8_DitherClip,   /* PaUtilConverter *Float32_To_UInt8_DitherClip; */
+
+    Int32_To_Float32,              /* PaUtilConverter *Int32_To_Float32; */
+    Int32_To_Int24,                /* PaUtilConverter *Int32_To_Int24; */
+    Int32_To_Int24_Dither,         /* PaUtilConverter *Int32_To_Int24_Dither; */
+    Int32_To_Int16,                /* PaUtilConverter *Int32_To_Int16; */
+    Int32_To_Int16_Dither,         /* PaUtilConverter *Int32_To_Int16_Dither; */
+    Int32_To_Int8,                 /* PaUtilConverter *Int32_To_Int8; */
+    Int32_To_Int8_Dither,          /* PaUtilConverter *Int32_To_Int8_Dither; */
+    Int32_To_UInt8,                /* PaUtilConverter *Int32_To_UInt8; */
+    Int32_To_UInt8_Dither,         /* PaUtilConverter *Int32_To_UInt8_Dither; */
+
+    Int24_To_Float32,              /* PaUtilConverter *Int24_To_Float32; */
+    Int24_To_Int32,                /* PaUtilConverter *Int24_To_Int32; */
+    Int24_To_Int16,                /* PaUtilConverter *Int24_To_Int16; */
+    Int24_To_Int16_Dither,         /* PaUtilConverter *Int24_To_Int16_Dither; */
+    Int24_To_Int8,                 /* PaUtilConverter *Int24_To_Int8; */
+    Int24_To_Int8_Dither,          /* PaUtilConverter *Int24_To_Int8_Dither; */
+    Int24_To_UInt8,                /* PaUtilConverter *Int24_To_UInt8; */
+    Int24_To_UInt8_Dither,         /* PaUtilConverter *Int24_To_UInt8_Dither; */
+
+    Int16_To_Float32,              /* PaUtilConverter *Int16_To_Float32; */
+    Int16_To_Int32,                /* PaUtilConverter *Int16_To_Int32; */
+    Int16_To_Int24,                /* PaUtilConverter *Int16_To_Int24; */
+    Int16_To_Int8,                 /* PaUtilConverter *Int16_To_Int8; */
+    Int16_To_Int8_Dither,          /* PaUtilConverter *Int16_To_Int8_Dither; */
+    Int16_To_UInt8,                /* PaUtilConverter *Int16_To_UInt8; */
+    Int16_To_UInt8_Dither,         /* PaUtilConverter *Int16_To_UInt8_Dither; */
+
+    Int8_To_Float32,               /* PaUtilConverter *Int8_To_Float32; */
+    Int8_To_Int32,                 /* PaUtilConverter *Int8_To_Int32; */
+    Int8_To_Int24,                 /* PaUtilConverter *Int8_To_Int24 */
+    Int8_To_Int16,                 /* PaUtilConverter *Int8_To_Int16; */
+    Int8_To_UInt8,                 /* PaUtilConverter *Int8_To_UInt8; */
+
+    UInt8_To_Float32,              /* PaUtilConverter *UInt8_To_Float32; */
+    UInt8_To_Int32,                /* PaUtilConverter *UInt8_To_Int32; */
+    UInt8_To_Int24,                /* PaUtilConverter *UInt8_To_Int24; */
+    UInt8_To_Int16,                /* PaUtilConverter *UInt8_To_Int16; */
+    UInt8_To_Int8,                 /* PaUtilConverter *UInt8_To_Int8; */
+
+    Copy_8_To_8,                   /* PaUtilConverter *Copy_8_To_8; */
+    Copy_16_To_16,                 /* PaUtilConverter *Copy_16_To_16; */
+    Copy_24_To_24,                 /* PaUtilConverter *Copy_24_To_24; */
+    Copy_32_To_32                  /* PaUtilConverter *Copy_32_To_32; */
+};
+
+/* -------------------------------------------------------------------------- */
+
+#endif /* PA_NO_STANDARD_CONVERTERS */
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilZeroer* PaUtil_SelectZeroer( PaSampleFormat destinationFormat )
+{
+    switch( destinationFormat & ~paNonInterleaved ){
+    case paFloat32:
+        return paZeroers.Zero32;
+    case paInt32:
+        return paZeroers.Zero32;
+    case paInt24:
+        return paZeroers.Zero24;
+    case paInt16:
+        return paZeroers.Zero16;
+    case paInt8:
+        return paZeroers.Zero8;
+    case paUInt8:
+        return paZeroers.ZeroU8;
+    default: return 0;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+#ifdef PA_NO_STANDARD_ZEROERS
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilZeroerTable paZeroers = {
+    0,  /* PaUtilZeroer *ZeroU8; */
+    0,  /* PaUtilZeroer *Zero8; */
+    0,  /* PaUtilZeroer *Zero16; */
+    0,  /* PaUtilZeroer *Zero24; */
+    0,  /* PaUtilZeroer *Zero32; */
+};
+
+/* -------------------------------------------------------------------------- */
+
+#else /* PA_NO_STANDARD_ZEROERS is not defined */
+
+/* -------------------------------------------------------------------------- */
+
+static void ZeroU8( void *destinationBuffer, signed int destinationStride,
+        unsigned int count )
+{
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+
+    while( count-- )
+    {
+        *dest = 128;
+
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Zero8( void *destinationBuffer, signed int destinationStride,
+        unsigned int count )
+{
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+
+    while( count-- )
+    {
+        *dest = 0;
+
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Zero16( void *destinationBuffer, signed int destinationStride,
+        unsigned int count )
+{
+    PaUint16 *dest = (PaUint16 *)destinationBuffer;
+
+    while( count-- )
+    {
+        *dest = 0;
+
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Zero24( void *destinationBuffer, signed int destinationStride,
+        unsigned int count )
+{
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+
+    while( count-- )
+    {
+        dest[0] = 0;
+        dest[1] = 0;
+        dest[2] = 0;
+
+        dest += destinationStride * 3;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Zero32( void *destinationBuffer, signed int destinationStride,
+        unsigned int count )
+{
+    PaUint32 *dest = (PaUint32 *)destinationBuffer;
+
+    while( count-- )
+    {
+        *dest = 0;
+
+        dest += destinationStride;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+PaUtilZeroerTable paZeroers = {
+    ZeroU8,  /* PaUtilZeroer *ZeroU8; */
+    Zero8,  /* PaUtilZeroer *Zero8; */
+    Zero16,  /* PaUtilZeroer *Zero16; */
+    Zero24,  /* PaUtilZeroer *Zero24; */
+    Zero32,  /* PaUtilZeroer *Zero32; */
+};
+
+/* -------------------------------------------------------------------------- */
+
+#endif /* PA_NO_STANDARD_ZEROERS */
diff --git a/Externals/portaudio/src/common/pa_converters.h b/Externals/portaudio/src/common/pa_converters.h
new file mode 100644
index 0000000000..7ddfcaa3c2
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_converters.h
@@ -0,0 +1,263 @@
+#ifndef PA_CONVERTERS_H
+#define PA_CONVERTERS_H
+/*
+ * $Id: pa_converters.h 1097 2006-08-26 08:27:53Z rossb $
+ * Portable Audio I/O Library sample conversion mechanism
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Conversion functions used to convert buffers of samples from one
+ format to another.
+*/
+
+
+#include "portaudio.h"  /* for PaSampleFormat */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+struct PaUtilTriangularDitherGenerator;
+
+
+/** Choose an available sample format which is most appropriate for
+ representing the requested format. If the requested format is not available
+ higher quality formats are considered before lower quality formates.
+ @param availableFormats A variable containing the logical OR of all available
+ formats.
+ @param format The desired format.
+ @return The most appropriate available format for representing the requested
+ format.
+*/
+PaSampleFormat PaUtil_SelectClosestAvailableFormat(
+        PaSampleFormat availableFormats, PaSampleFormat format );
+
+
+/* high level conversions functions for use by implementations */
+
+
+/** The generic sample converter prototype. Sample converters convert count
+    samples from sourceBuffer to destinationBuffer. The actual type of the data
+    pointed to by these parameters varys for different converter functions.
+    @param destinationBuffer A pointer to the first sample of the destination.
+    @param destinationStride An offset between successive destination samples
+    expressed in samples (not bytes.) It may be negative.
+    @param sourceBuffer A pointer to the first sample of the source.
+    @param sourceStride An offset between successive source samples
+    expressed in samples (not bytes.) It may be negative.
+    @param count The number of samples to convert.
+    @param ditherState State information used to calculate dither. Converters
+    that do not perform dithering will ignore this parameter, in which case
+    NULL or invalid dither state may be passed.
+*/
+typedef void PaUtilConverter(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator );
+
+
+/** Find a sample converter function for the given source and destinations
+    formats and flags (clip and dither.)
+    @return
+    A pointer to a PaUtilConverter which will perform the requested
+    conversion, or NULL if the given format conversion is not supported.
+    For conversions where clipping or dithering is not necessary, the
+    clip and dither flags are ignored and a non-clipping or dithering
+    version is returned.
+    If the source and destination formats are the same, a function which
+    copies data of the appropriate size will be returned.
+*/
+PaUtilConverter* PaUtil_SelectConverter( PaSampleFormat sourceFormat,
+        PaSampleFormat destinationFormat, PaStreamFlags flags );
+
+
+/** The generic buffer zeroer prototype. Buffer zeroers copy count zeros to
+    destinationBuffer. The actual type of the data pointed to varys for
+    different zeroer functions.
+    @param destinationBuffer A pointer to the first sample of the destination.
+    @param destinationStride An offset between successive destination samples
+    expressed in samples (not bytes.) It may be negative.
+    @param count The number of samples to zero.
+*/
+typedef void PaUtilZeroer(
+    void *destinationBuffer, signed int destinationStride, unsigned int count );
+
+    
+/** Find a buffer zeroer function for the given destination format.
+    @return
+    A pointer to a PaUtilZeroer which will perform the requested
+    zeroing.
+*/
+PaUtilZeroer* PaUtil_SelectZeroer( PaSampleFormat destinationFormat );
+
+/*----------------------------------------------------------------------------*/
+/* low level functions and data structures which may be used for
+    substituting conversion functions */
+
+
+/** The type used to store all sample conversion functions.
+    @see paConverters;
+*/
+typedef struct{
+    PaUtilConverter *Float32_To_Int32;
+    PaUtilConverter *Float32_To_Int32_Dither;
+    PaUtilConverter *Float32_To_Int32_Clip;
+    PaUtilConverter *Float32_To_Int32_DitherClip;
+
+    PaUtilConverter *Float32_To_Int24;
+    PaUtilConverter *Float32_To_Int24_Dither;
+    PaUtilConverter *Float32_To_Int24_Clip;
+    PaUtilConverter *Float32_To_Int24_DitherClip;
+    
+    PaUtilConverter *Float32_To_Int16;
+    PaUtilConverter *Float32_To_Int16_Dither;
+    PaUtilConverter *Float32_To_Int16_Clip;
+    PaUtilConverter *Float32_To_Int16_DitherClip;
+
+    PaUtilConverter *Float32_To_Int8;
+    PaUtilConverter *Float32_To_Int8_Dither;
+    PaUtilConverter *Float32_To_Int8_Clip;
+    PaUtilConverter *Float32_To_Int8_DitherClip;
+
+    PaUtilConverter *Float32_To_UInt8;
+    PaUtilConverter *Float32_To_UInt8_Dither;
+    PaUtilConverter *Float32_To_UInt8_Clip;
+    PaUtilConverter *Float32_To_UInt8_DitherClip;
+
+    PaUtilConverter *Int32_To_Float32;
+    PaUtilConverter *Int32_To_Int24;
+    PaUtilConverter *Int32_To_Int24_Dither;
+    PaUtilConverter *Int32_To_Int16;
+    PaUtilConverter *Int32_To_Int16_Dither;
+    PaUtilConverter *Int32_To_Int8;
+    PaUtilConverter *Int32_To_Int8_Dither;
+    PaUtilConverter *Int32_To_UInt8;
+    PaUtilConverter *Int32_To_UInt8_Dither;
+
+    PaUtilConverter *Int24_To_Float32;
+    PaUtilConverter *Int24_To_Int32;
+    PaUtilConverter *Int24_To_Int16;
+    PaUtilConverter *Int24_To_Int16_Dither;
+    PaUtilConverter *Int24_To_Int8;
+    PaUtilConverter *Int24_To_Int8_Dither;
+    PaUtilConverter *Int24_To_UInt8;
+    PaUtilConverter *Int24_To_UInt8_Dither;
+
+    PaUtilConverter *Int16_To_Float32;
+    PaUtilConverter *Int16_To_Int32;
+    PaUtilConverter *Int16_To_Int24;
+    PaUtilConverter *Int16_To_Int8;
+    PaUtilConverter *Int16_To_Int8_Dither;
+    PaUtilConverter *Int16_To_UInt8;
+    PaUtilConverter *Int16_To_UInt8_Dither;
+
+    PaUtilConverter *Int8_To_Float32;
+    PaUtilConverter *Int8_To_Int32;
+    PaUtilConverter *Int8_To_Int24;
+    PaUtilConverter *Int8_To_Int16;
+    PaUtilConverter *Int8_To_UInt8;
+    
+    PaUtilConverter *UInt8_To_Float32;
+    PaUtilConverter *UInt8_To_Int32;
+    PaUtilConverter *UInt8_To_Int24;
+    PaUtilConverter *UInt8_To_Int16;
+    PaUtilConverter *UInt8_To_Int8;
+
+    PaUtilConverter *Copy_8_To_8;       /* copy without any conversion */
+    PaUtilConverter *Copy_16_To_16;     /* copy without any conversion */
+    PaUtilConverter *Copy_24_To_24;     /* copy without any conversion */
+    PaUtilConverter *Copy_32_To_32;     /* copy without any conversion */
+} PaUtilConverterTable;
+
+
+/** A table of pointers to all required converter functions.
+    PaUtil_SelectConverter() uses this table to lookup the appropriate
+    conversion functions. The fields of this structure are initialized
+    with default conversion functions. Fields may be NULL, indicating that
+    no conversion function is available. User code may substitue optimised
+    conversion functions by assigning different function pointers to
+    these fields.
+
+    @note
+    If the PA_NO_STANDARD_CONVERTERS preprocessor variable is defined,
+    PortAudio's standard converters will not be compiled, and all fields
+    of this structure will be initialized to NULL. In such cases, users
+    should supply their own conversion functions if the require PortAudio
+    to open a stream that requires sample conversion.
+
+    @see PaUtilConverterTable, PaUtilConverter, PaUtil_SelectConverter
+*/
+extern PaUtilConverterTable paConverters;
+
+
+/** The type used to store all buffer zeroing functions.
+    @see paZeroers;
+*/
+typedef struct{
+    PaUtilZeroer *ZeroU8; /* unsigned 8 bit, zero == 128 */
+    PaUtilZeroer *Zero8;
+    PaUtilZeroer *Zero16;
+    PaUtilZeroer *Zero24;
+    PaUtilZeroer *Zero32;
+} PaUtilZeroerTable;
+
+
+/** A table of pointers to all required zeroer functions.
+    PaUtil_SelectZeroer() uses this table to lookup the appropriate
+    conversion functions. The fields of this structure are initialized
+    with default conversion functions. User code may substitue optimised
+    conversion functions by assigning different function pointers to
+    these fields.
+
+    @note
+    If the PA_NO_STANDARD_ZEROERS preprocessor variable is defined,
+    PortAudio's standard zeroers will not be compiled, and all fields
+    of this structure will be initialized to NULL. In such cases, users
+    should supply their own zeroing functions for the sample sizes which
+    they intend to use.
+
+    @see PaUtilZeroerTable, PaUtilZeroer, PaUtil_SelectZeroer
+*/
+extern PaUtilZeroerTable paZeroers;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_CONVERTERS_H */
diff --git a/Externals/portaudio/src/common/pa_cpuload.c b/Externals/portaudio/src/common/pa_cpuload.c
new file mode 100644
index 0000000000..4465a50b62
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_cpuload.c
@@ -0,0 +1,105 @@
+/*
+ * $Id: pa_cpuload.c 1577 2011-02-01 13:03:45Z rossb $
+ * Portable Audio I/O Library CPU Load measurement functions
+ * Portable CPU load measurement facility.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 2002 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Functions to assist in measuring the CPU utilization of a callback
+ stream. Used to implement the Pa_GetStreamCpuLoad() function.
+
+ @todo Dynamically calculate the coefficients used to smooth the CPU Load
+ Measurements over time to provide a uniform characterisation of CPU Load
+ independent of rate at which PaUtil_BeginCpuLoadMeasurement /
+ PaUtil_EndCpuLoadMeasurement are called. see http://www.portaudio.com/trac/ticket/113
+*/
+
+
+#include "pa_cpuload.h"
+
+#include <assert.h>
+
+#include "pa_util.h"   /* for PaUtil_GetTime() */
+
+
+void PaUtil_InitializeCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer, double sampleRate )
+{
+    assert( sampleRate > 0 );
+
+    measurer->samplingPeriod = 1. / sampleRate;
+    measurer->averageLoad = 0.;
+}
+
+void PaUtil_ResetCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer )
+{
+    measurer->averageLoad = 0.;
+}
+
+void PaUtil_BeginCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer )
+{
+    measurer->measurementStartTime = PaUtil_GetTime();
+}
+
+
+void PaUtil_EndCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer, unsigned long framesProcessed )
+{
+    double measurementEndTime, secondsFor100Percent, measuredLoad;
+
+    if( framesProcessed > 0 ){
+        measurementEndTime = PaUtil_GetTime();
+
+        assert( framesProcessed > 0 );
+        secondsFor100Percent = framesProcessed * measurer->samplingPeriod;
+
+        measuredLoad = (measurementEndTime - measurer->measurementStartTime) / secondsFor100Percent;
+
+        /* Low pass filter the calculated CPU load to reduce jitter using a simple IIR low pass filter. */
+        /** FIXME @todo these coefficients shouldn't be hardwired see: http://www.portaudio.com/trac/ticket/113 */
+#define LOWPASS_COEFFICIENT_0   (0.9)
+#define LOWPASS_COEFFICIENT_1   (0.99999 - LOWPASS_COEFFICIENT_0)
+
+        measurer->averageLoad = (LOWPASS_COEFFICIENT_0 * measurer->averageLoad) +
+                               (LOWPASS_COEFFICIENT_1 * measuredLoad);
+    }
+}
+
+
+double PaUtil_GetCpuLoad( PaUtilCpuLoadMeasurer* measurer )
+{
+    return measurer->averageLoad;
+}
diff --git a/Externals/portaudio/src/common/pa_cpuload.h b/Externals/portaudio/src/common/pa_cpuload.h
new file mode 100644
index 0000000000..4a594430b8
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_cpuload.h
@@ -0,0 +1,72 @@
+#ifndef PA_CPULOAD_H
+#define PA_CPULOAD_H
+/*
+ * $Id: pa_cpuload.h 1097 2006-08-26 08:27:53Z rossb $
+ * Portable Audio I/O Library CPU Load measurement functions
+ * Portable CPU load measurement facility.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 2002 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Functions to assist in measuring the CPU utilization of a callback
+ stream. Used to implement the Pa_GetStreamCpuLoad() function.
+*/
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+typedef struct {
+    double samplingPeriod;
+    double measurementStartTime;
+    double averageLoad;
+} PaUtilCpuLoadMeasurer; /**< @todo need better name than measurer */
+
+void PaUtil_InitializeCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer, double sampleRate );
+void PaUtil_BeginCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer );
+void PaUtil_EndCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer, unsigned long framesProcessed );
+void PaUtil_ResetCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer );
+double PaUtil_GetCpuLoad( PaUtilCpuLoadMeasurer* measurer );
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */     
+#endif /* PA_CPULOAD_H */
diff --git a/Externals/portaudio/src/common/pa_debugprint.c b/Externals/portaudio/src/common/pa_debugprint.c
new file mode 100644
index 0000000000..f34d4bbf98
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_debugprint.c
@@ -0,0 +1,123 @@
+/*
+ * $Id: pa_log.c $
+ * Portable Audio I/O Library Multi-Host API front end
+ * Validate function parameters and manage multiple host APIs.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Implements log function.
+
+    PaUtil_SetLogPrintFunction can be user called to replace the provided
+	DefaultLogPrint function, which writes to stderr.
+	One can NOT pass var_args across compiler/dll boundaries as it is not
+	"byte code/abi portable". So the technique used here is to allocate a local
+	a static array, write in it, then callback the user with a pointer to its
+	start.
+*/
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "pa_debugprint.h"
+
+// for OutputDebugStringA
+#if defined(_MSC_VER) && defined(PA_ENABLE_MSVC_DEBUG_OUTPUT)
+	#define WIN32_LEAN_AND_MEAN // exclude rare headers
+	#include "windows.h"
+#endif
+
+// User callback
+static PaUtilLogCallback userCB = NULL;
+
+// Sets user callback
+void PaUtil_SetDebugPrintFunction(PaUtilLogCallback cb)
+{
+    userCB = cb;
+}
+
+/*
+ If your platform doesn�t have vsnprintf, you are stuck with a
+ VERY dangerous alternative, vsprintf (with no n)
+*/
+#if _MSC_VER
+	/* Some Windows Mobile SDKs don't define vsnprintf but all define _vsnprintf (hopefully).
+	   According to MSDN "vsnprintf is identical to _vsnprintf". So we use _vsnprintf with MSC.
+	*/
+	#define VSNPRINTF  _vsnprintf 
+#else
+	#define VSNPRINTF  vsnprintf
+#endif
+
+#define PA_LOG_BUF_SIZE 2048
+
+void PaUtil_DebugPrint( const char *format, ... )
+{
+	// Optional logging into Output console of Visual Studio
+#if defined(_MSC_VER) && defined(PA_ENABLE_MSVC_DEBUG_OUTPUT)
+	{
+		char buf[PA_LOG_BUF_SIZE];
+		va_list ap;
+		va_start(ap, format);
+		VSNPRINTF(buf, sizeof(buf), format, ap);
+		buf[sizeof(buf)-1] = 0;
+		OutputDebugStringA(buf);
+		va_end(ap);
+	}
+#endif
+
+	// Output to User-Callback
+    if (userCB != NULL)
+    {
+        char strdump[PA_LOG_BUF_SIZE];
+        va_list ap;
+        va_start(ap, format);
+        VSNPRINTF(strdump, sizeof(strdump), format, ap);
+        strdump[sizeof(strdump)-1] = 0;
+        userCB(strdump);
+        va_end(ap);
+    }
+    else
+	// Standard output to stderr
+    {
+        va_list ap;
+        va_start(ap, format);
+        vfprintf(stderr, format, ap);
+        va_end(ap);
+        fflush(stderr);
+    }
+}
diff --git a/Externals/portaudio/src/common/pa_debugprint.h b/Externals/portaudio/src/common/pa_debugprint.h
new file mode 100644
index 0000000000..5fba7667dc
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_debugprint.h
@@ -0,0 +1,149 @@
+#ifndef PA_LOG_H
+#define PA_LOG_H
+/*
+ * Log file redirector function
+ * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+*/
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+
+void PaUtil_DebugPrint( const char *format, ... );
+
+
+/*
+    The basic format for log messages is described below. If you need to
+    add any log messages, please follow this format.
+
+    Function entry (void function):
+
+        "FunctionName called.\n"
+
+    Function entry (non void function):
+
+        "FunctionName called:\n"
+        "\tParam1Type param1: param1Value\n"
+        "\tParam2Type param2: param2Value\n"      (etc...)
+
+
+    Function exit (no return value):
+
+        "FunctionName returned.\n"
+
+    Function exit (simple return value):
+
+        "FunctionName returned:\n"
+        "\tReturnType: returnValue\n"
+
+    If the return type is an error code, the error text is displayed in ()
+
+    If the return type is not an error code, but has taken a special value
+    because an error occurred, then the reason for the error is shown in []
+
+    If the return type is a struct ptr, the struct is dumped.
+
+    See the code below for examples
+*/
+
+/** PA_DEBUG() provides a simple debug message printing facility. The macro
+ passes it's argument to a printf-like function called PaUtil_DebugPrint()
+ which prints to stderr and always flushes the stream after printing.
+ Because preprocessor macros cannot directly accept variable length argument
+ lists, calls to the macro must include an additional set of parenthesis, eg:
+ PA_DEBUG(("errorno: %d", 1001 ));
+*/
+
+
+#ifdef PA_ENABLE_DEBUG_OUTPUT
+#define PA_DEBUG(x) PaUtil_DebugPrint x ;
+#else
+#define PA_DEBUG(x)
+#endif
+
+
+#ifdef PA_LOG_API_CALLS
+#define PA_LOGAPI(x) PaUtil_DebugPrint x 
+
+#define PA_LOGAPI_ENTER(functionName) PaUtil_DebugPrint( functionName " called.\n" )
+
+#define PA_LOGAPI_ENTER_PARAMS(functionName) PaUtil_DebugPrint( functionName " called:\n" )
+
+#define PA_LOGAPI_EXIT(functionName) PaUtil_DebugPrint( functionName " returned.\n" )
+
+#define PA_LOGAPI_EXIT_PAERROR( functionName, result ) \
+	PaUtil_DebugPrint( functionName " returned:\n" ); \
+	PaUtil_DebugPrint("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) )
+
+#define PA_LOGAPI_EXIT_T( functionName, resultFormatString, result ) \
+	PaUtil_DebugPrint( functionName " returned:\n" ); \
+	PaUtil_DebugPrint("\t" resultFormatString "\n", result )
+
+#define PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( functionName, positiveResultFormatString, result ) \
+	PaUtil_DebugPrint( functionName " returned:\n" ); \
+	if( result > 0 ) \
+        PaUtil_DebugPrint("\t" positiveResultFormatString "\n", result ); \
+    else \
+        PaUtil_DebugPrint("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) )
+#else
+#define PA_LOGAPI(x)
+#define PA_LOGAPI_ENTER(functionName)
+#define PA_LOGAPI_ENTER_PARAMS(functionName)
+#define PA_LOGAPI_EXIT(functionName)
+#define PA_LOGAPI_EXIT_PAERROR( functionName, result )
+#define PA_LOGAPI_EXIT_T( functionName, resultFormatString, result )
+#define PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( functionName, positiveResultFormatString, result )
+#endif
+
+    
+typedef void (*PaUtilLogCallback ) (const char *log);
+
+/**
+    Install user provided log function
+*/
+void PaUtil_SetDebugPrintFunction(PaUtilLogCallback  cb);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_LOG_H */
diff --git a/Externals/portaudio/src/common/pa_dither.c b/Externals/portaudio/src/common/pa_dither.c
new file mode 100644
index 0000000000..7a1b13125b
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_dither.c
@@ -0,0 +1,218 @@
+/*
+ * $Id: pa_dither.c 1418 2009-10-12 21:00:53Z philburk $
+ * Portable Audio I/O Library triangular dither generator
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Functions for generating dither noise
+*/
+
+#include "pa_types.h"
+#include "pa_dither.h"
+
+
+/* Note that the linear congruential algorithm requires 32 bit integers
+ * because it uses arithmetic overflow. So use PaUint32 instead of
+ * unsigned long so it will work on 64 bit systems.
+ */
+
+#define PA_DITHER_BITS_   (15)
+
+
+void PaUtil_InitializeTriangularDitherState( PaUtilTriangularDitherGenerator *state )
+{
+    state->previous = 0;
+    state->randSeed1 = 22222;
+    state->randSeed2 = 5555555;
+}
+
+
+PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state )
+{
+    PaInt32 current, highPass;
+
+    /* Generate two random numbers. */
+    state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
+    state->randSeed2 = (state->randSeed2 * 196314165) + 907633515;
+
+    /* Generate triangular distribution about 0.
+     * Shift before adding to prevent overflow which would skew the distribution.
+     * Also shift an extra bit for the high pass filter. 
+     */
+#define DITHER_SHIFT_  ((sizeof(PaInt32)*8 - PA_DITHER_BITS_) + 1)
+	
+    current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
+              (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
+
+    /* High pass filter to reduce audibility. */
+    highPass = current - state->previous;
+    state->previous = current;
+    return highPass;
+}
+
+
+/* Multiply by PA_FLOAT_DITHER_SCALE_ to get a float between -2.0 and +1.99999 */
+#define PA_FLOAT_DITHER_SCALE_  (1.0f / ((1<<PA_DITHER_BITS_)-1))
+static const float const_float_dither_scale_ = PA_FLOAT_DITHER_SCALE_;
+
+float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *state )
+{
+    PaInt32 current, highPass;
+
+    /* Generate two random numbers. */
+    state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
+    state->randSeed2 = (state->randSeed2 * 196314165) + 907633515;
+
+    /* Generate triangular distribution about 0.
+     * Shift before adding to prevent overflow which would skew the distribution.
+     * Also shift an extra bit for the high pass filter. 
+     */
+    current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
+              (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
+
+    /* High pass filter to reduce audibility. */
+    highPass = current - state->previous;
+    state->previous = current;
+    return ((float)highPass) * const_float_dither_scale_;
+}
+
+
+/*
+The following alternate dither algorithms (from musicdsp.org) could be
+considered
+*/
+
+/*Noise shaped dither  (March 2000)
+-------------------
+
+This is a simple implementation of highpass triangular-PDF dither with
+2nd-order noise shaping, for use when truncating floating point audio
+data to fixed point.
+
+The noise shaping lowers the noise floor by 11dB below 5kHz (@ 44100Hz
+sample rate) compared to triangular-PDF dither. The code below assumes
+input data is in the range +1 to -1 and doesn't check for overloads!
+
+To save time when generating dither for multiple channels you can do
+things like this:  r3=(r1 & 0x7F)<<8; instead of calling rand() again.
+
+
+
+  int   r1, r2;                //rectangular-PDF random numbers
+  float s1, s2;                //error feedback buffers
+  float s = 0.5f;              //set to 0.0f for no noise shaping
+  float w = pow(2.0,bits-1);   //word length (usually bits=16)
+  float wi= 1.0f/w;            
+  float d = wi / RAND_MAX;     //dither amplitude (2 lsb)
+  float o = wi * 0.5f;         //remove dc offset
+  float in, tmp;
+  int   out;
+
+
+//for each sample...
+
+  r2=r1;                               //can make HP-TRI dither by
+  r1=rand();                           //subtracting previous rand()
+    
+  in += s * (s1 + s1 - s2);            //error feedback
+  tmp = in + o + d * (float)(r1 - r2); //dc offset and dither 
+  
+  out = (int)(w * tmp);                //truncate downwards
+  if(tmp<0.0f) out--;                  //this is faster than floor()
+
+  s2 = s1;                            
+  s1 = in - wi * (float)out;           //error
+
+
+
+-- 
+paul.kellett@maxim.abel.co.uk
+http://www.maxim.abel.co.uk
+*/
+
+
+/*
+16-to-8-bit first-order dither
+
+Type : First order error feedforward dithering code
+References : Posted by Jon Watte
+
+Notes : 
+This is about as simple a dithering algorithm as you can implement, but it's
+likely to sound better than just truncating to N bits.
+
+Note that you might not want to carry forward the full difference for infinity.
+It's probably likely that the worst performance hit comes from the saturation
+conditionals, which can be avoided with appropriate instructions on many DSPs
+and integer SIMD type instructions, or CMOV.
+
+Last, if sound quality is paramount (such as when going from > 16 bits to 16
+bits) you probably want to use a higher-order dither function found elsewhere
+on this site. 
+
+
+Code : 
+// This code will down-convert and dither a 16-bit signed short 
+// mono signal into an 8-bit unsigned char signal, using a first 
+// order forward-feeding error term dither. 
+
+#define uchar unsigned char 
+
+void dither_one_channel_16_to_8( short * input, uchar * output, int count, int * memory ) 
+{ 
+  int m = *memory; 
+  while( count-- > 0 ) { 
+    int i = *input++; 
+    i += m; 
+    int j = i + 32768 - 128; 
+    uchar o; 
+    if( j < 0 ) { 
+      o = 0; 
+    } 
+    else if( j > 65535 ) { 
+      o = 255; 
+    } 
+    else { 
+      o = (uchar)((j>>8)&0xff); 
+    } 
+    m = ((j-32768+128)-i); 
+    *output++ = o; 
+  } 
+  *memory = m; 
+} 
+*/
diff --git a/Externals/portaudio/src/common/pa_dither.h b/Externals/portaudio/src/common/pa_dither.h
new file mode 100644
index 0000000000..a5131b27fa
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_dither.h
@@ -0,0 +1,106 @@
+#ifndef PA_DITHER_H
+#define PA_DITHER_H
+/*
+ * $Id: pa_dither.h 1418 2009-10-12 21:00:53Z philburk $
+ * Portable Audio I/O Library triangular dither generator
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Functions for generating dither noise
+*/
+
+#include "pa_types.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+/* Note that the linear congruential algorithm requires 32 bit integers
+ * because it uses arithmetic overflow. So use PaUint32 instead of
+ * unsigned long so it will work on 64 bit systems.
+ */
+
+/** @brief State needed to generate a dither signal */
+typedef struct PaUtilTriangularDitherGenerator{
+    PaUint32 previous;
+    PaUint32 randSeed1;
+    PaUint32 randSeed2;
+} PaUtilTriangularDitherGenerator;
+
+
+/** @brief Initialize dither state */
+void PaUtil_InitializeTriangularDitherState( PaUtilTriangularDitherGenerator *ditherState );
+
+
+/**
+ @brief Calculate 2 LSB dither signal with a triangular distribution.
+ Ranged for adding to a 1 bit right-shifted 32 bit integer
+ prior to >>15. eg:
+<pre>
+    signed long in = *
+    signed long dither = PaUtil_Generate16BitTriangularDither( ditherState );
+    signed short out = (signed short)(((in>>1) + dither) >> 15);
+</pre>
+ @return
+ A signed 32-bit integer with a range of +32767 to -32768
+*/
+PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
+
+
+/**
+ @brief Calculate 2 LSB dither signal with a triangular distribution.
+ Ranged for adding to a pre-scaled float.
+<pre>
+    float in = *
+    float dither = PaUtil_GenerateFloatTriangularDither( ditherState );
+    // use smaller scaler to prevent overflow when we add the dither
+    signed short out = (signed short)(in*(32766.0f) + dither );
+</pre>
+ @return
+ A float with a range of -2.0 to +1.99999.
+*/
+float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_DITHER_H */
diff --git a/Externals/portaudio/src/common/pa_endianness.h b/Externals/portaudio/src/common/pa_endianness.h
new file mode 100644
index 0000000000..84e904ca7b
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_endianness.h
@@ -0,0 +1,145 @@
+#ifndef PA_ENDIANNESS_H
+#define PA_ENDIANNESS_H
+/*
+ * $Id: pa_endianness.h 1324 2008-01-27 02:03:30Z bjornroche $
+ * Portable Audio I/O Library current platform endianness macros
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Configure endianness symbols for the target processor.
+
+ Arrange for either the PA_LITTLE_ENDIAN or PA_BIG_ENDIAN preprocessor symbols
+ to be defined. The one that is defined reflects the endianness of the target
+ platform and may be used to implement conditional compilation of byte-order
+ dependent code.
+
+ If either PA_LITTLE_ENDIAN or PA_BIG_ENDIAN is defined already, then no attempt
+ is made to override that setting. This may be useful if you have a better way
+ of determining the platform's endianness. The autoconf mechanism uses this for
+ example.
+
+ A PA_VALIDATE_ENDIANNESS macro is provided to compare the compile time
+ and runtime endiannes and raise an assertion if they don't match.
+*/
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+/* If this is an apple, we need to do detect endianness this way */
+#if defined(__APPLE__)
+    /* we need to do some endian detection that is sensitive to harware arch */
+    #if defined(__LITTLE_ENDIAN__)
+       #if !defined( PA_LITTLE_ENDIAN )
+          #define PA_LITTLE_ENDIAN
+       #endif
+       #if defined( PA_BIG_ENDIAN )
+          #undef PA_BIG_ENDIAN
+       #endif
+    #else
+       #if !defined( PA_BIG_ENDIAN )
+          #define PA_BIG_ENDIAN
+       #endif
+       #if defined( PA_LITTLE_ENDIAN )
+          #undef PA_LITTLE_ENDIAN
+       #endif
+    #endif
+#else
+    /* this is not an apple, so first check the existing defines, and, failing that,
+       detect well-known architechtures. */
+
+    #if defined(PA_LITTLE_ENDIAN) || defined(PA_BIG_ENDIAN)
+        /* endianness define has been set externally, such as by autoconf */
+
+        #if defined(PA_LITTLE_ENDIAN) && defined(PA_BIG_ENDIAN)
+        #error both PA_LITTLE_ENDIAN and PA_BIG_ENDIAN have been defined externally to pa_endianness.h - only one endianness at a time please
+        #endif
+
+    #else
+        /* endianness define has not been set externally */
+
+        /* set PA_LITTLE_ENDIAN or PA_BIG_ENDIAN by testing well known platform specific defines */
+
+        #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(LITTLE_ENDIAN) || defined(__i386) || defined(_M_IX86) || defined(__x86_64__)
+            #define PA_LITTLE_ENDIAN /* win32, assume intel byte order */
+        #else
+            #define PA_BIG_ENDIAN
+        #endif
+    #endif
+
+    #if !defined(PA_LITTLE_ENDIAN) && !defined(PA_BIG_ENDIAN)
+        /*
+         If the following error is raised, you either need to modify the code above
+         to automatically determine the endianness from other symbols defined on your
+         platform, or define either PA_LITTLE_ENDIAN or PA_BIG_ENDIAN externally.
+        */
+        #error pa_endianness.h was unable to automatically determine the endianness of the target platform
+    #endif
+
+#endif
+
+
+/* PA_VALIDATE_ENDIANNESS compares the compile time and runtime endianness,
+ and raises an assertion if they don't match. <assert.h> must be included in
+ the context in which this macro is used.
+*/
+#if defined(NDEBUG)
+    #define PA_VALIDATE_ENDIANNESS
+#else
+    #if defined(PA_LITTLE_ENDIAN)
+        #define PA_VALIDATE_ENDIANNESS \
+        { \
+            const long nativeOne = 1; \
+            assert( "PortAudio: compile time and runtime endianness don't match" && (((char *)&nativeOne)[0]) == 1 ); \
+        }
+    #elif defined(PA_BIG_ENDIAN)
+        #define PA_VALIDATE_ENDIANNESS \
+        { \
+            const long nativeOne = 1; \
+            assert( "PortAudio: compile time and runtime endianness don't match" && (((char *)&nativeOne)[0]) == 0 ); \
+        }
+    #endif
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_ENDIANNESS_H */
diff --git a/Externals/portaudio/src/common/pa_front.c b/Externals/portaudio/src/common/pa_front.c
new file mode 100644
index 0000000000..957d1eac47
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_front.c
@@ -0,0 +1,1770 @@
+/*
+ * $Id: pa_front.c 1730 2011-08-18 03:43:51Z rossb $
+ * Portable Audio I/O Library Multi-Host API front end
+ * Validate function parameters and manage multiple host APIs.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Implements PortAudio API functions defined in portaudio.h, checks 
+ some errors, delegates platform-specific behavior to host API implementations.
+ 
+ Implements the functions defined in the PortAudio API (portaudio.h), 
+ validates some parameters and checks for state inconsistencies before 
+ forwarding API requests to specific Host API implementations (via the 
+ interface declared in pa_hostapi.h), and Streams (via the interface 
+ declared in pa_stream.h).
+
+ This file manages initialization and termination of Host API
+ implementations via initializer functions stored in the paHostApiInitializers
+ global array (usually defined in an os-specific pa_[os]_hostapis.c file).
+
+ This file maintains a list of all open streams and closes them at Pa_Terminate().
+
+ Some utility functions declared in pa_util.h are implemented in this file.
+
+ All PortAudio API functions can be conditionally compiled with logging code.
+ To compile with logging, define the PA_LOG_API_CALLS precompiler symbol.
+*/
+
+
+#include <stdio.h>
+#include <memory.h>
+#include <string.h>
+#include <assert.h> /* needed by PA_VALIDATE_ENDIANNESS */
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_endianness.h"
+#include "pa_types.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_trace.h" /* still usefull?*/
+#include "pa_debugprint.h"
+
+
+#define PA_VERSION_  1899
+#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__  " " __TIME__ ")"
+
+
+
+
+int Pa_GetVersion( void )
+{
+    return PA_VERSION_;
+}
+
+
+const char* Pa_GetVersionText( void )
+{
+    return PA_VERSION_TEXT_;
+}
+
+
+
+#define PA_LAST_HOST_ERROR_TEXT_LENGTH_  1024
+
+static char lastHostErrorText_[ PA_LAST_HOST_ERROR_TEXT_LENGTH_ + 1 ] = {0};
+
+static PaHostErrorInfo lastHostErrorInfo_ = { (PaHostApiTypeId)-1, 0, lastHostErrorText_ };
+
+
+void PaUtil_SetLastHostErrorInfo( PaHostApiTypeId hostApiType, long errorCode,
+        const char *errorText )
+{
+    lastHostErrorInfo_.hostApiType = hostApiType;
+    lastHostErrorInfo_.errorCode = errorCode;
+
+    strncpy( lastHostErrorText_, errorText, PA_LAST_HOST_ERROR_TEXT_LENGTH_ );
+}
+
+
+
+static PaUtilHostApiRepresentation **hostApis_ = 0;
+static int hostApisCount_ = 0;
+static int defaultHostApiIndex_ = 0;
+static int initializationCount_ = 0;
+static int deviceCount_ = 0;
+
+PaUtilStreamRepresentation *firstOpenStream_ = NULL;
+
+
+#define PA_IS_INITIALISED_ (initializationCount_ != 0)
+
+
+static int CountHostApiInitializers( void )
+{
+    int result = 0;
+
+    while( paHostApiInitializers[ result ] != 0 )
+        ++result;
+    return result;
+}
+
+
+static void TerminateHostApis( void )
+{
+    /* terminate in reverse order from initialization */
+    PA_DEBUG(("TerminateHostApis in \n"));
+
+    while( hostApisCount_ > 0 )
+    {
+        --hostApisCount_;
+        hostApis_[hostApisCount_]->Terminate( hostApis_[hostApisCount_] );
+    }
+    hostApisCount_ = 0;
+    defaultHostApiIndex_ = 0;
+    deviceCount_ = 0;
+
+    if( hostApis_ != 0 )
+        PaUtil_FreeMemory( hostApis_ );
+    hostApis_ = 0;
+
+    PA_DEBUG(("TerminateHostApis out\n"));
+}
+
+
+static PaError InitializeHostApis( void )
+{
+    PaError result = paNoError;
+    int i, initializerCount, baseDeviceIndex;
+
+    initializerCount = CountHostApiInitializers();
+
+    hostApis_ = (PaUtilHostApiRepresentation**)PaUtil_AllocateMemory(
+            sizeof(PaUtilHostApiRepresentation*) * initializerCount );
+    if( !hostApis_ )
+    {
+        result = paInsufficientMemory;
+        goto error; 
+    }
+
+    hostApisCount_ = 0;
+    defaultHostApiIndex_ = -1; /* indicates that we haven't determined the default host API yet */
+    deviceCount_ = 0;
+    baseDeviceIndex = 0;
+
+    for( i=0; i< initializerCount; ++i )
+    {
+        hostApis_[hostApisCount_] = NULL;
+
+        PA_DEBUG(( "before paHostApiInitializers[%d].\n",i));
+
+        result = paHostApiInitializers[i]( &hostApis_[hostApisCount_], hostApisCount_ );
+        if( result != paNoError )
+            goto error;
+
+        PA_DEBUG(( "after paHostApiInitializers[%d].\n",i));
+
+        if( hostApis_[hostApisCount_] )
+        {
+            PaUtilHostApiRepresentation* hostApi = hostApis_[hostApisCount_];
+            assert( hostApi->info.defaultInputDevice < hostApi->info.deviceCount );
+            assert( hostApi->info.defaultOutputDevice < hostApi->info.deviceCount );
+
+            /* the first successfully initialized host API with a default input *or* 
+               output device is used as the default host API.
+            */
+            if( (defaultHostApiIndex_ == -1) &&
+                    ( hostApi->info.defaultInputDevice != paNoDevice 
+                        || hostApi->info.defaultOutputDevice != paNoDevice ) )
+            {
+                defaultHostApiIndex_ = hostApisCount_;
+            }
+
+            hostApi->privatePaFrontInfo.baseDeviceIndex = baseDeviceIndex;
+
+            if( hostApi->info.defaultInputDevice != paNoDevice )
+                hostApi->info.defaultInputDevice += baseDeviceIndex;
+
+            if( hostApi->info.defaultOutputDevice != paNoDevice )
+                hostApi->info.defaultOutputDevice += baseDeviceIndex;
+
+            baseDeviceIndex += hostApi->info.deviceCount;
+            deviceCount_ += hostApi->info.deviceCount;
+
+            ++hostApisCount_;
+        }
+    }
+
+    /* if no host APIs have devices, the default host API is the first initialized host API */
+    if( defaultHostApiIndex_ == -1 )
+        defaultHostApiIndex_ = 0;
+
+    return result;
+
+error:
+    TerminateHostApis();
+    return result;
+}
+
+
+/*
+    FindHostApi() finds the index of the host api to which
+    <device> belongs and returns it. if <hostSpecificDeviceIndex> is
+    non-null, the host specific device index is returned in it.
+    returns -1 if <device> is out of range.
+ 
+*/
+static int FindHostApi( PaDeviceIndex device, int *hostSpecificDeviceIndex )
+{
+    int i=0;
+
+    if( !PA_IS_INITIALISED_ )
+        return -1;
+
+    if( device < 0 )
+        return -1;
+
+    while( i < hostApisCount_
+            && device >= hostApis_[i]->info.deviceCount )
+    {
+
+        device -= hostApis_[i]->info.deviceCount;
+        ++i;
+    }
+
+    if( i >= hostApisCount_ )
+        return -1;
+
+    if( hostSpecificDeviceIndex )
+        *hostSpecificDeviceIndex = device;
+
+    return i;
+}
+
+
+static void AddOpenStream( PaStream* stream )
+{
+    ((PaUtilStreamRepresentation*)stream)->nextOpenStream = firstOpenStream_;
+    firstOpenStream_ = (PaUtilStreamRepresentation*)stream;
+}
+
+
+static void RemoveOpenStream( PaStream* stream )
+{
+    PaUtilStreamRepresentation *previous = NULL;
+    PaUtilStreamRepresentation *current = firstOpenStream_;
+
+    while( current != NULL )
+    {
+        if( ((PaStream*)current) == stream )
+        {
+            if( previous == NULL )
+            {
+                firstOpenStream_ = current->nextOpenStream;
+            }
+            else
+            {
+                previous->nextOpenStream = current->nextOpenStream;
+            }
+            return;
+        }
+        else
+        {
+            previous = current;
+            current = current->nextOpenStream;
+        }
+    }
+}
+
+
+static void CloseOpenStreams( void )
+{
+    /* we call Pa_CloseStream() here to ensure that the same destruction
+        logic is used for automatically closed streams */
+
+    while( firstOpenStream_ != NULL )
+        Pa_CloseStream( firstOpenStream_ );
+}
+
+
+PaError Pa_Initialize( void )
+{
+    PaError result;
+
+    PA_LOGAPI_ENTER( "Pa_Initialize" );
+
+    if( PA_IS_INITIALISED_ )
+    {
+        ++initializationCount_;
+        result = paNoError;
+    }
+    else
+    {
+        PA_VALIDATE_TYPE_SIZES;
+        PA_VALIDATE_ENDIANNESS;
+        
+        PaUtil_InitializeClock();
+        PaUtil_ResetTraceMessages();
+
+        result = InitializeHostApis();
+        if( result == paNoError )
+            ++initializationCount_;
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_Initialize", result );
+
+    return result;
+}
+
+
+PaError Pa_Terminate( void )
+{
+    PaError result;
+
+    PA_LOGAPI_ENTER( "Pa_Terminate" );
+
+    if( PA_IS_INITIALISED_ )
+    {
+        if( --initializationCount_ == 0 )
+        {
+            CloseOpenStreams();
+
+            TerminateHostApis();
+
+            PaUtil_DumpTraceMessages();
+        }
+        result = paNoError;
+    }
+    else
+    {
+        result=  paNotInitialized;
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_Terminate", result );
+
+    return result;
+}
+
+
+const PaHostErrorInfo* Pa_GetLastHostErrorInfo( void )
+{
+    return &lastHostErrorInfo_;
+}
+
+
+const char *Pa_GetErrorText( PaError errorCode )
+{
+    const char *result;
+
+    switch( errorCode )
+    {
+    case paNoError:                  result = "Success"; break;
+    case paNotInitialized:           result = "PortAudio not initialized"; break;
+    /** @todo could catenate the last host error text to result in the case of paUnanticipatedHostError. see: http://www.portaudio.com/trac/ticket/114 */
+    case paUnanticipatedHostError:   result = "Unanticipated host error"; break;
+    case paInvalidChannelCount:      result = "Invalid number of channels"; break;
+    case paInvalidSampleRate:        result = "Invalid sample rate"; break;
+    case paInvalidDevice:            result = "Invalid device"; break;
+    case paInvalidFlag:              result = "Invalid flag"; break;
+    case paSampleFormatNotSupported: result = "Sample format not supported"; break;
+    case paBadIODeviceCombination:   result = "Illegal combination of I/O devices"; break;
+    case paInsufficientMemory:       result = "Insufficient memory"; break;
+    case paBufferTooBig:             result = "Buffer too big"; break;
+    case paBufferTooSmall:           result = "Buffer too small"; break;
+    case paNullCallback:             result = "No callback routine specified"; break;
+    case paBadStreamPtr:             result = "Invalid stream pointer"; break;
+    case paTimedOut:                 result = "Wait timed out"; break;
+    case paInternalError:            result = "Internal PortAudio error"; break;
+    case paDeviceUnavailable:        result = "Device unavailable"; break;
+    case paIncompatibleHostApiSpecificStreamInfo:   result = "Incompatible host API specific stream info"; break;
+    case paStreamIsStopped:          result = "Stream is stopped"; break;
+    case paStreamIsNotStopped:       result = "Stream is not stopped"; break;
+    case paInputOverflowed:          result = "Input overflowed"; break;
+    case paOutputUnderflowed:        result = "Output underflowed"; break;
+    case paHostApiNotFound:          result = "Host API not found"; break;
+    case paInvalidHostApi:           result = "Invalid host API"; break;
+    case paCanNotReadFromACallbackStream:       result = "Can't read from a callback stream"; break;
+    case paCanNotWriteToACallbackStream:        result = "Can't write to a callback stream"; break;
+    case paCanNotReadFromAnOutputOnlyStream:    result = "Can't read from an output only stream"; break;
+    case paCanNotWriteToAnInputOnlyStream:      result = "Can't write to an input only stream"; break;
+    case paIncompatibleStreamHostApi: result = "Incompatible stream host API"; break;
+    case paBadBufferPtr:             result = "Bad buffer pointer"; break;
+    default:                         
+		if( errorCode > 0 )
+			result = "Invalid error code (value greater than zero)"; 
+        else
+			result = "Invalid error code"; 
+        break;
+    }
+    return result;
+}
+
+
+PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type )
+{
+    PaHostApiIndex result;
+    int i;
+    
+    PA_LOGAPI_ENTER_PARAMS( "Pa_HostApiTypeIdToHostApiIndex" );
+    PA_LOGAPI(("\tPaHostApiTypeId type: %d\n", type ));
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        result = paHostApiNotFound;
+        
+        for( i=0; i < hostApisCount_; ++i )
+        {
+            if( hostApis_[i]->info.type == type )
+            {
+                result = i;
+                break;
+            }         
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_HostApiTypeIdToHostApiIndex", "PaHostApiIndex: %d", result );
+
+    return result;
+}
+
+
+PaError PaUtil_GetHostApiRepresentation( struct PaUtilHostApiRepresentation **hostApi,
+        PaHostApiTypeId type )
+{
+    PaError result;
+    int i;
+    
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        result = paHostApiNotFound;
+                
+        for( i=0; i < hostApisCount_; ++i )
+        {
+            if( hostApis_[i]->info.type == type )
+            {
+                *hostApi = hostApis_[i];
+                result = paNoError;
+                break;
+            }
+        }
+    }
+
+    return result;
+}
+
+
+PaError PaUtil_DeviceIndexToHostApiDeviceIndex(
+        PaDeviceIndex *hostApiDevice, PaDeviceIndex device, struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaError result;
+    PaDeviceIndex x;
+    
+    x = device - hostApi->privatePaFrontInfo.baseDeviceIndex;
+
+    if( x < 0 || x >= hostApi->info.deviceCount )
+    {
+        result = paInvalidDevice;
+    }
+    else
+    {
+        *hostApiDevice = x;
+        result = paNoError;
+    }
+
+    return result;
+}
+
+
+PaHostApiIndex Pa_GetHostApiCount( void )
+{
+    int result;
+
+    PA_LOGAPI_ENTER( "Pa_GetHostApiCount" );
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        result = hostApisCount_;
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetHostApiCount", "PaHostApiIndex: %d", result );
+
+    return result;
+}
+
+
+PaHostApiIndex Pa_GetDefaultHostApi( void )
+{
+    int result;
+
+    PA_LOGAPI_ENTER( "Pa_GetDefaultHostApi" );
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        result = defaultHostApiIndex_;
+
+        /* internal consistency check: make sure that the default host api
+         index is within range */
+
+        if( result < 0 || result >= hostApisCount_ )
+        {
+            result = paInternalError;
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetDefaultHostApi", "PaHostApiIndex: %d", result );
+
+    return result;
+}
+
+
+const PaHostApiInfo* Pa_GetHostApiInfo( PaHostApiIndex hostApi )
+{
+    PaHostApiInfo *info;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetHostApiInfo" );
+    PA_LOGAPI(("\tPaHostApiIndex hostApi: %d\n", hostApi ));
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        info = NULL;
+
+        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
+        PA_LOGAPI(("\tPaHostApiInfo*: NULL [ PortAudio not initialized ]\n" ));
+
+    }
+    else if( hostApi < 0 || hostApi >= hostApisCount_ )
+    {
+        info = NULL;
+        
+        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
+        PA_LOGAPI(("\tPaHostApiInfo*: NULL [ hostApi out of range ]\n" ));
+
+    }
+    else
+    {
+        info = &hostApis_[hostApi]->info;
+
+        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
+        PA_LOGAPI(("\tPaHostApiInfo*: 0x%p\n", info ));
+        PA_LOGAPI(("\t{\n" ));
+        PA_LOGAPI(("\t\tint structVersion: %d\n", info->structVersion ));
+        PA_LOGAPI(("\t\tPaHostApiTypeId type: %d\n", info->type ));
+        PA_LOGAPI(("\t\tconst char *name: %s\n", info->name ));
+        PA_LOGAPI(("\t}\n" ));
+
+    }
+
+     return info;
+}
+
+
+PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi, int hostApiDeviceIndex )
+{
+    PaDeviceIndex result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_HostApiDeviceIndexToPaDeviceIndex" );
+    PA_LOGAPI(("\tPaHostApiIndex hostApi: %d\n", hostApi ));
+    PA_LOGAPI(("\tint hostApiDeviceIndex: %d\n", hostApiDeviceIndex ));
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        if( hostApi < 0 || hostApi >= hostApisCount_ )
+        {
+            result = paInvalidHostApi;
+        }
+        else
+        {
+            if( hostApiDeviceIndex < 0 ||
+                    hostApiDeviceIndex >= hostApis_[hostApi]->info.deviceCount )
+            {
+                result = paInvalidDevice;
+            }
+            else
+            {
+                result = hostApis_[hostApi]->privatePaFrontInfo.baseDeviceIndex + hostApiDeviceIndex;
+            }
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_HostApiDeviceIndexToPaDeviceIndex", "PaDeviceIndex: %d", result );
+
+    return result;
+}
+
+
+PaDeviceIndex Pa_GetDeviceCount( void )
+{
+    PaDeviceIndex result;
+
+    PA_LOGAPI_ENTER( "Pa_GetDeviceCount" );
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+    }
+    else
+    {
+        result = deviceCount_;
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetDeviceCount", "PaDeviceIndex: %d", result );
+
+    return result;
+}
+
+
+PaDeviceIndex Pa_GetDefaultInputDevice( void )
+{
+    PaHostApiIndex hostApi;
+    PaDeviceIndex result;
+
+    PA_LOGAPI_ENTER( "Pa_GetDefaultInputDevice" );
+
+    hostApi = Pa_GetDefaultHostApi();
+    if( hostApi < 0 )
+    {
+        result = paNoDevice;
+    }
+    else
+    {
+        result = hostApis_[hostApi]->info.defaultInputDevice;
+    }
+
+    PA_LOGAPI_EXIT_T( "Pa_GetDefaultInputDevice", "PaDeviceIndex: %d", result );
+
+    return result;
+}
+
+
+PaDeviceIndex Pa_GetDefaultOutputDevice( void )
+{
+    PaHostApiIndex hostApi;
+    PaDeviceIndex result;
+    
+    PA_LOGAPI_ENTER( "Pa_GetDefaultOutputDevice" );
+
+    hostApi = Pa_GetDefaultHostApi();
+    if( hostApi < 0 )
+    {
+        result = paNoDevice;
+    }
+    else
+    {
+        result = hostApis_[hostApi]->info.defaultOutputDevice;
+    }
+
+    PA_LOGAPI_EXIT_T( "Pa_GetDefaultOutputDevice", "PaDeviceIndex: %d", result );
+
+    return result;
+}
+
+
+const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device )
+{
+    int hostSpecificDeviceIndex;
+    int hostApiIndex = FindHostApi( device, &hostSpecificDeviceIndex );
+    PaDeviceInfo *result;
+
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetDeviceInfo" );
+    PA_LOGAPI(("\tPaDeviceIndex device: %d\n", device ));
+
+    if( hostApiIndex < 0 )
+    {
+        result = NULL;
+
+        PA_LOGAPI(("Pa_GetDeviceInfo returned:\n" ));
+        PA_LOGAPI(("\tPaDeviceInfo* NULL [ invalid device index ]\n" ));
+
+    }
+    else
+    {
+        result = hostApis_[hostApiIndex]->deviceInfos[ hostSpecificDeviceIndex ];
+
+        PA_LOGAPI(("Pa_GetDeviceInfo returned:\n" ));
+        PA_LOGAPI(("\tPaDeviceInfo*: 0x%p:\n", result ));
+        PA_LOGAPI(("\t{\n" ));
+
+        PA_LOGAPI(("\t\tint structVersion: %d\n", result->structVersion ));
+        PA_LOGAPI(("\t\tconst char *name: %s\n", result->name ));
+        PA_LOGAPI(("\t\tPaHostApiIndex hostApi: %d\n", result->hostApi ));
+        PA_LOGAPI(("\t\tint maxInputChannels: %d\n", result->maxInputChannels ));
+        PA_LOGAPI(("\t\tint maxOutputChannels: %d\n", result->maxOutputChannels ));
+        PA_LOGAPI(("\t}\n" ));
+
+    }
+
+    return result;
+}
+
+
+/*
+    SampleFormatIsValid() returns 1 if sampleFormat is a sample format
+    defined in portaudio.h, or 0 otherwise.
+*/
+static int SampleFormatIsValid( PaSampleFormat format )
+{
+    switch( format & ~paNonInterleaved )
+    {
+    case paFloat32: return 1;
+    case paInt16: return 1;
+    case paInt32: return 1;
+    case paInt24: return 1;
+    case paInt8: return 1;
+    case paUInt8: return 1;
+    case paCustomFormat: return 1;
+    default: return 0;
+    }
+}
+
+/*
+    NOTE: make sure this validation list is kept syncronised with the one in
+            pa_hostapi.h
+
+    ValidateOpenStreamParameters() checks that parameters to Pa_OpenStream()
+    conform to the expected values as described below. This function is
+    also designed to be used with the proposed Pa_IsFormatSupported() function.
+    
+    There are basically two types of validation that could be performed:
+    Generic conformance validation, and device capability mismatch
+    validation. This function performs only generic conformance validation.
+    Validation that would require knowledge of device capabilities is
+    not performed because of potentially complex relationships between
+    combinations of parameters - for example, even if the sampleRate
+    seems ok, it might not be for a duplex stream - we have no way of
+    checking this in an API-neutral way, so we don't try.
+ 
+    On success the function returns PaNoError and fills in hostApi,
+    hostApiInputDeviceID, and hostApiOutputDeviceID fields. On failure
+    the function returns an error code indicating the first encountered
+    parameter error.
+ 
+ 
+    If ValidateOpenStreamParameters() returns paNoError, the following
+    assertions are guaranteed to be true.
+ 
+    - at least one of inputParameters & outputParmeters is valid (not NULL)
+
+    - if inputParameters & outputParameters are both valid, that
+        inputParameters->device & outputParameters->device  both use the same host api
+ 
+    PaDeviceIndex inputParameters->device
+        - is within range (0 to Pa_GetDeviceCount-1) Or:
+        - is paUseHostApiSpecificDeviceSpecification and
+            inputParameters->hostApiSpecificStreamInfo is non-NULL and refers
+            to a valid host api
+
+    int inputParameters->channelCount
+        - if inputParameters->device is not paUseHostApiSpecificDeviceSpecification, channelCount is > 0
+        - upper bound is NOT validated against device capabilities
+ 
+    PaSampleFormat inputParameters->sampleFormat
+        - is one of the sample formats defined in portaudio.h
+
+    void *inputParameters->hostApiSpecificStreamInfo
+        - if supplied its hostApi field matches the input device's host Api
+ 
+    PaDeviceIndex outputParmeters->device
+        - is within range (0 to Pa_GetDeviceCount-1)
+ 
+    int outputParmeters->channelCount
+        - if inputDevice is valid, channelCount is > 0
+        - upper bound is NOT validated against device capabilities
+ 
+    PaSampleFormat outputParmeters->sampleFormat
+        - is one of the sample formats defined in portaudio.h
+        
+    void *outputParmeters->hostApiSpecificStreamInfo
+        - if supplied its hostApi field matches the output device's host Api
+ 
+    double sampleRate
+        - is not an 'absurd' rate (less than 1000. or greater than 200000.)
+        - sampleRate is NOT validated against device capabilities
+ 
+    PaStreamFlags streamFlags
+        - unused platform neutral flags are zero
+        - paNeverDropInput is only used for full-duplex callback streams with
+            variable buffer size (paFramesPerBufferUnspecified)
+*/
+static PaError ValidateOpenStreamParameters(
+    const PaStreamParameters *inputParameters,
+    const PaStreamParameters *outputParameters,
+    double sampleRate,
+    unsigned long framesPerBuffer,
+    PaStreamFlags streamFlags,
+    PaStreamCallback *streamCallback,
+    PaUtilHostApiRepresentation **hostApi,
+    PaDeviceIndex *hostApiInputDevice,
+    PaDeviceIndex *hostApiOutputDevice )
+{
+    int inputHostApiIndex  = -1, /* Surpress uninitialised var warnings: compiler does */
+        outputHostApiIndex = -1; /* not see that if inputParameters and outputParame-  */
+                                 /* ters are both nonzero, these indices are set.      */
+
+    if( (inputParameters == NULL) && (outputParameters == NULL) )
+    {
+        return paInvalidDevice; /** @todo should be a new error code "invalid device parameters" or something */
+    }
+    else
+    {
+        if( inputParameters == NULL )
+        {
+            *hostApiInputDevice = paNoDevice;
+        }
+        else if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+        {
+            if( inputParameters->hostApiSpecificStreamInfo )
+            {
+                inputHostApiIndex = Pa_HostApiTypeIdToHostApiIndex(
+                        ((PaUtilHostApiSpecificStreamInfoHeader*)inputParameters->hostApiSpecificStreamInfo)->hostApiType );
+
+                if( inputHostApiIndex != -1 )
+                {
+                    *hostApiInputDevice = paUseHostApiSpecificDeviceSpecification;
+                    *hostApi = hostApis_[inputHostApiIndex];
+                }
+                else
+                {
+                    return paInvalidDevice;
+                }
+            }
+            else
+            {
+                return paInvalidDevice;
+            }
+        }
+        else
+        {
+            if( inputParameters->device < 0 || inputParameters->device >= deviceCount_ )
+                return paInvalidDevice;
+
+            inputHostApiIndex = FindHostApi( inputParameters->device, hostApiInputDevice );
+            if( inputHostApiIndex < 0 )
+                return paInternalError;
+
+            *hostApi = hostApis_[inputHostApiIndex];
+
+            if( inputParameters->channelCount <= 0 )
+                return paInvalidChannelCount;
+
+            if( !SampleFormatIsValid( inputParameters->sampleFormat ) )
+                return paSampleFormatNotSupported;
+
+            if( inputParameters->hostApiSpecificStreamInfo != NULL )
+            {
+                if( ((PaUtilHostApiSpecificStreamInfoHeader*)inputParameters->hostApiSpecificStreamInfo)->hostApiType
+                        != (*hostApi)->info.type )
+                    return paIncompatibleHostApiSpecificStreamInfo;
+            }
+        }
+
+        if( outputParameters == NULL )
+        {
+            *hostApiOutputDevice = paNoDevice;
+        }
+        else if( outputParameters->device == paUseHostApiSpecificDeviceSpecification  )
+        {
+            if( outputParameters->hostApiSpecificStreamInfo )
+            {
+                outputHostApiIndex = Pa_HostApiTypeIdToHostApiIndex(
+                        ((PaUtilHostApiSpecificStreamInfoHeader*)outputParameters->hostApiSpecificStreamInfo)->hostApiType );
+
+                if( outputHostApiIndex != -1 )
+                {
+                    *hostApiOutputDevice = paUseHostApiSpecificDeviceSpecification;
+                    *hostApi = hostApis_[outputHostApiIndex];
+                }
+                else
+                {
+                    return paInvalidDevice;
+                }
+            }
+            else
+            {
+                return paInvalidDevice;
+            }
+        }
+        else
+        {
+            if( outputParameters->device < 0 || outputParameters->device >= deviceCount_ )
+                return paInvalidDevice;
+
+            outputHostApiIndex = FindHostApi( outputParameters->device, hostApiOutputDevice );
+            if( outputHostApiIndex < 0 )
+                return paInternalError;
+
+            *hostApi = hostApis_[outputHostApiIndex];
+
+            if( outputParameters->channelCount <= 0 )
+                return paInvalidChannelCount;
+
+            if( !SampleFormatIsValid( outputParameters->sampleFormat ) )
+                return paSampleFormatNotSupported;
+
+            if( outputParameters->hostApiSpecificStreamInfo != NULL )
+            {
+                if( ((PaUtilHostApiSpecificStreamInfoHeader*)outputParameters->hostApiSpecificStreamInfo)->hostApiType
+                        != (*hostApi)->info.type )
+                    return paIncompatibleHostApiSpecificStreamInfo;
+            }
+        }   
+
+        if( (inputParameters != NULL) && (outputParameters != NULL) )
+        {
+            /* ensure that both devices use the same API */
+            if( inputHostApiIndex != outputHostApiIndex )
+                return paBadIODeviceCombination;
+        }
+    }
+    
+    
+    /* Check for absurd sample rates. */
+    if( (sampleRate < 1000.0) || (sampleRate > 200000.0) )
+        return paInvalidSampleRate;
+
+    if( ((streamFlags & ~paPlatformSpecificFlags) & ~(paClipOff | paDitherOff | paNeverDropInput | paPrimeOutputBuffersUsingStreamCallback ) ) != 0 )
+        return paInvalidFlag;
+
+    if( streamFlags & paNeverDropInput )
+    {
+        /* must be a callback stream */
+        if( !streamCallback )
+             return paInvalidFlag;
+
+        /* must be a full duplex stream */
+        if( (inputParameters == NULL) || (outputParameters == NULL) )
+            return paInvalidFlag;
+
+        /* must use paFramesPerBufferUnspecified */
+        if( framesPerBuffer != paFramesPerBufferUnspecified )
+            return paInvalidFlag;
+    }
+    
+    return paNoError;
+}
+
+
+PaError Pa_IsFormatSupported( const PaStreamParameters *inputParameters,
+                              const PaStreamParameters *outputParameters,
+                              double sampleRate )
+{
+    PaError result;
+    PaUtilHostApiRepresentation *hostApi = 0;
+    PaDeviceIndex hostApiInputDevice = paNoDevice, hostApiOutputDevice = paNoDevice;
+    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
+    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
+
+
+#ifdef PA_LOG_API_CALLS
+    PA_LOGAPI_ENTER_PARAMS( "Pa_IsFormatSupported" );
+
+    if( inputParameters == NULL ){
+        PA_LOGAPI(("\tPaStreamParameters *inputParameters: NULL\n" ));
+    }else{
+        PA_LOGAPI(("\tPaStreamParameters *inputParameters: 0x%p\n", inputParameters ));
+        PA_LOGAPI(("\tPaDeviceIndex inputParameters->device: %d\n", inputParameters->device ));
+        PA_LOGAPI(("\tint inputParameters->channelCount: %d\n", inputParameters->channelCount ));
+        PA_LOGAPI(("\tPaSampleFormat inputParameters->sampleFormat: %d\n", inputParameters->sampleFormat ));
+        PA_LOGAPI(("\tPaTime inputParameters->suggestedLatency: %f\n", inputParameters->suggestedLatency ));
+        PA_LOGAPI(("\tvoid *inputParameters->hostApiSpecificStreamInfo: 0x%p\n", inputParameters->hostApiSpecificStreamInfo ));
+    }
+
+    if( outputParameters == NULL ){
+        PA_LOGAPI(("\tPaStreamParameters *outputParameters: NULL\n" ));
+    }else{
+        PA_LOGAPI(("\tPaStreamParameters *outputParameters: 0x%p\n", outputParameters ));
+        PA_LOGAPI(("\tPaDeviceIndex outputParameters->device: %d\n", outputParameters->device ));
+        PA_LOGAPI(("\tint outputParameters->channelCount: %d\n", outputParameters->channelCount ));
+        PA_LOGAPI(("\tPaSampleFormat outputParameters->sampleFormat: %d\n", outputParameters->sampleFormat ));
+        PA_LOGAPI(("\tPaTime outputParameters->suggestedLatency: %f\n", outputParameters->suggestedLatency ));
+        PA_LOGAPI(("\tvoid *outputParameters->hostApiSpecificStreamInfo: 0x%p\n", outputParameters->hostApiSpecificStreamInfo ));
+    }
+    
+    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
+#endif
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+
+        PA_LOGAPI_EXIT_PAERROR( "Pa_IsFormatSupported", result );
+        return result;
+    }
+
+    result = ValidateOpenStreamParameters( inputParameters,
+                                           outputParameters,
+                                           sampleRate, 0, paNoFlag, 0,
+                                           &hostApi,
+                                           &hostApiInputDevice,
+                                           &hostApiOutputDevice );
+    if( result != paNoError )
+    {
+        PA_LOGAPI_EXIT_PAERROR( "Pa_IsFormatSupported", result );
+        return result;
+    }
+    
+
+    if( inputParameters )
+    {
+        hostApiInputParameters.device = hostApiInputDevice;
+        hostApiInputParameters.channelCount = inputParameters->channelCount;
+        hostApiInputParameters.sampleFormat = inputParameters->sampleFormat;
+        hostApiInputParameters.suggestedLatency = inputParameters->suggestedLatency;
+        hostApiInputParameters.hostApiSpecificStreamInfo = inputParameters->hostApiSpecificStreamInfo;
+        hostApiInputParametersPtr = &hostApiInputParameters;
+    }
+    else
+    {
+        hostApiInputParametersPtr = NULL;
+    }
+
+    if( outputParameters )
+    {
+        hostApiOutputParameters.device = hostApiOutputDevice;
+        hostApiOutputParameters.channelCount = outputParameters->channelCount;
+        hostApiOutputParameters.sampleFormat = outputParameters->sampleFormat;
+        hostApiOutputParameters.suggestedLatency = outputParameters->suggestedLatency;
+        hostApiOutputParameters.hostApiSpecificStreamInfo = outputParameters->hostApiSpecificStreamInfo;
+        hostApiOutputParametersPtr = &hostApiOutputParameters;
+    }
+    else
+    {
+        hostApiOutputParametersPtr = NULL;
+    }
+
+    result = hostApi->IsFormatSupported( hostApi,
+                                  hostApiInputParametersPtr, hostApiOutputParametersPtr,
+                                  sampleRate );
+
+#ifdef PA_LOG_API_CALLS
+    PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+    if( result == paFormatIsSupported )
+        PA_LOGAPI(("\tPaError: 0 [ paFormatIsSupported ]\n" ));
+    else
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+#endif
+
+    return result;
+}
+
+
+PaError Pa_OpenStream( PaStream** stream,
+                       const PaStreamParameters *inputParameters,
+                       const PaStreamParameters *outputParameters,
+                       double sampleRate,
+                       unsigned long framesPerBuffer,
+                       PaStreamFlags streamFlags,
+                       PaStreamCallback *streamCallback,
+                       void *userData )
+{
+    PaError result;
+    PaUtilHostApiRepresentation *hostApi = 0;
+    PaDeviceIndex hostApiInputDevice = paNoDevice, hostApiOutputDevice = paNoDevice;
+    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
+    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
+
+
+#ifdef PA_LOG_API_CALLS
+    PA_LOGAPI_ENTER_PARAMS( "Pa_OpenStream" );
+    PA_LOGAPI(("\tPaStream** stream: 0x%p\n", stream ));
+
+    if( inputParameters == NULL ){
+        PA_LOGAPI(("\tPaStreamParameters *inputParameters: NULL\n" ));
+    }else{
+        PA_LOGAPI(("\tPaStreamParameters *inputParameters: 0x%p\n", inputParameters ));
+        PA_LOGAPI(("\tPaDeviceIndex inputParameters->device: %d\n", inputParameters->device ));
+        PA_LOGAPI(("\tint inputParameters->channelCount: %d\n", inputParameters->channelCount ));
+        PA_LOGAPI(("\tPaSampleFormat inputParameters->sampleFormat: %d\n", inputParameters->sampleFormat ));
+        PA_LOGAPI(("\tPaTime inputParameters->suggestedLatency: %f\n", inputParameters->suggestedLatency ));
+        PA_LOGAPI(("\tvoid *inputParameters->hostApiSpecificStreamInfo: 0x%p\n", inputParameters->hostApiSpecificStreamInfo ));
+    }
+
+    if( outputParameters == NULL ){
+        PA_LOGAPI(("\tPaStreamParameters *outputParameters: NULL\n" ));
+    }else{
+        PA_LOGAPI(("\tPaStreamParameters *outputParameters: 0x%p\n", outputParameters ));
+        PA_LOGAPI(("\tPaDeviceIndex outputParameters->device: %d\n", outputParameters->device ));
+        PA_LOGAPI(("\tint outputParameters->channelCount: %d\n", outputParameters->channelCount ));
+        PA_LOGAPI(("\tPaSampleFormat outputParameters->sampleFormat: %d\n", outputParameters->sampleFormat ));
+        PA_LOGAPI(("\tPaTime outputParameters->suggestedLatency: %f\n", outputParameters->suggestedLatency ));
+        PA_LOGAPI(("\tvoid *outputParameters->hostApiSpecificStreamInfo: 0x%p\n", outputParameters->hostApiSpecificStreamInfo ));
+    }
+    
+    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
+    PA_LOGAPI(("\tunsigned long framesPerBuffer: %d\n", framesPerBuffer ));
+    PA_LOGAPI(("\tPaStreamFlags streamFlags: 0x%x\n", streamFlags ));
+    PA_LOGAPI(("\tPaStreamCallback *streamCallback: 0x%p\n", streamCallback ));
+    PA_LOGAPI(("\tvoid *userData: 0x%p\n", userData ));
+#endif
+
+    if( !PA_IS_INITIALISED_ )
+    {
+        result = paNotInitialized;
+
+        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+        return result;
+    }
+
+    /* Check for parameter errors.
+        NOTE: make sure this validation list is kept syncronised with the one
+        in pa_hostapi.h
+    */
+
+    if( stream == NULL )
+    {
+        result = paBadStreamPtr;
+
+        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+        return result;
+    }
+
+    result = ValidateOpenStreamParameters( inputParameters,
+                                           outputParameters,
+                                           sampleRate, framesPerBuffer,
+                                           streamFlags, streamCallback,
+                                           &hostApi,
+                                           &hostApiInputDevice,
+                                           &hostApiOutputDevice );
+    if( result != paNoError )
+    {
+        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+        return result;
+    }
+    
+
+    if( inputParameters )
+    {
+        hostApiInputParameters.device = hostApiInputDevice;
+        hostApiInputParameters.channelCount = inputParameters->channelCount;
+        hostApiInputParameters.sampleFormat = inputParameters->sampleFormat;
+        hostApiInputParameters.suggestedLatency = inputParameters->suggestedLatency;
+        hostApiInputParameters.hostApiSpecificStreamInfo = inputParameters->hostApiSpecificStreamInfo;
+        hostApiInputParametersPtr = &hostApiInputParameters;
+    }
+    else
+    {
+        hostApiInputParametersPtr = NULL;
+    }
+
+    if( outputParameters )
+    {
+        hostApiOutputParameters.device = hostApiOutputDevice;
+        hostApiOutputParameters.channelCount = outputParameters->channelCount;
+        hostApiOutputParameters.sampleFormat = outputParameters->sampleFormat;
+        hostApiOutputParameters.suggestedLatency = outputParameters->suggestedLatency;
+        hostApiOutputParameters.hostApiSpecificStreamInfo = outputParameters->hostApiSpecificStreamInfo;
+        hostApiOutputParametersPtr = &hostApiOutputParameters;
+    }
+    else
+    {
+        hostApiOutputParametersPtr = NULL;
+    }
+
+    result = hostApi->OpenStream( hostApi, stream,
+                                  hostApiInputParametersPtr, hostApiOutputParametersPtr,
+                                  sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
+
+    if( result == paNoError )
+        AddOpenStream( *stream );
+
+
+    PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+    PA_LOGAPI(("\t*(PaStream** stream): 0x%p\n", *stream ));
+    PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+
+    return result;
+}
+
+
+PaError Pa_OpenDefaultStream( PaStream** stream,
+                              int inputChannelCount,
+                              int outputChannelCount,
+                              PaSampleFormat sampleFormat,
+                              double sampleRate,
+                              unsigned long framesPerBuffer,
+                              PaStreamCallback *streamCallback,
+                              void *userData )
+{
+    PaError result;
+    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
+    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_OpenDefaultStream" );
+    PA_LOGAPI(("\tPaStream** stream: 0x%p\n", stream ));
+    PA_LOGAPI(("\tint inputChannelCount: %d\n", inputChannelCount ));
+    PA_LOGAPI(("\tint outputChannelCount: %d\n", outputChannelCount ));
+    PA_LOGAPI(("\tPaSampleFormat sampleFormat: %d\n", sampleFormat ));
+    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
+    PA_LOGAPI(("\tunsigned long framesPerBuffer: %d\n", framesPerBuffer ));
+    PA_LOGAPI(("\tPaStreamCallback *streamCallback: 0x%p\n", streamCallback ));
+    PA_LOGAPI(("\tvoid *userData: 0x%p\n", userData ));
+
+
+    if( inputChannelCount > 0 )
+    {
+        hostApiInputParameters.device = Pa_GetDefaultInputDevice();
+		if( hostApiInputParameters.device == paNoDevice )
+			return paDeviceUnavailable; 
+	
+        hostApiInputParameters.channelCount = inputChannelCount;
+        hostApiInputParameters.sampleFormat = sampleFormat;
+        /* defaultHighInputLatency is used below instead of
+           defaultLowInputLatency because it is more important for the default
+           stream to work reliably than it is for it to work with the lowest
+           latency.
+         */
+        hostApiInputParameters.suggestedLatency = 
+             Pa_GetDeviceInfo( hostApiInputParameters.device )->defaultHighInputLatency;
+        hostApiInputParameters.hostApiSpecificStreamInfo = NULL;
+        hostApiInputParametersPtr = &hostApiInputParameters;
+    }
+    else
+    {
+        hostApiInputParametersPtr = NULL;
+    }
+
+    if( outputChannelCount > 0 )
+    {
+        hostApiOutputParameters.device = Pa_GetDefaultOutputDevice();
+		if( hostApiOutputParameters.device == paNoDevice )
+			return paDeviceUnavailable; 
+
+        hostApiOutputParameters.channelCount = outputChannelCount;
+        hostApiOutputParameters.sampleFormat = sampleFormat;
+        /* defaultHighOutputLatency is used below instead of
+           defaultLowOutputLatency because it is more important for the default
+           stream to work reliably than it is for it to work with the lowest
+           latency.
+         */
+        hostApiOutputParameters.suggestedLatency =
+             Pa_GetDeviceInfo( hostApiOutputParameters.device )->defaultHighOutputLatency;
+        hostApiOutputParameters.hostApiSpecificStreamInfo = NULL;
+        hostApiOutputParametersPtr = &hostApiOutputParameters;
+    }
+    else
+    {
+        hostApiOutputParametersPtr = NULL;
+    }
+
+
+    result = Pa_OpenStream(
+                 stream, hostApiInputParametersPtr, hostApiOutputParametersPtr,
+                 sampleRate, framesPerBuffer, paNoFlag, streamCallback, userData );
+
+    PA_LOGAPI(("Pa_OpenDefaultStream returned:\n" ));
+    PA_LOGAPI(("\t*(PaStream** stream): 0x%p", *stream ));
+    PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+
+    return result;
+}
+
+
+PaError PaUtil_ValidateStreamPointer( PaStream* stream )
+{
+    if( !PA_IS_INITIALISED_ ) return paNotInitialized;
+
+    if( stream == NULL ) return paBadStreamPtr;
+
+    if( ((PaUtilStreamRepresentation*)stream)->magic != PA_STREAM_MAGIC )
+        return paBadStreamPtr;
+
+    return paNoError;
+}
+
+
+PaError Pa_CloseStream( PaStream* stream )
+{
+    PaUtilStreamInterface *interface;
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_CloseStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    /* always remove the open stream from our list, even if this function
+        eventually returns an error. Otherwise CloseOpenStreams() will
+        get stuck in an infinite loop */
+    RemoveOpenStream( stream ); /* be sure to call this _before_ closing the stream */
+
+    if( result == paNoError )
+    {
+        interface = PA_STREAM_INTERFACE(stream);
+
+        /* abort the stream if it isn't stopped */
+        result = interface->IsStopped( stream );
+        if( result == 1 )
+            result = paNoError;
+        else if( result == 0 )
+            result = interface->Abort( stream );
+
+        if( result == paNoError )                 /** @todo REVIEW: shouldn't we close anyway? see: http://www.portaudio.com/trac/ticket/115 */
+            result = interface->Close( stream );
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_CloseStream", result );
+
+    return result;
+}
+
+
+PaError Pa_SetStreamFinishedCallback( PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_SetStreamFinishedCallback" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+    PA_LOGAPI(("\tPaStreamFinishedCallback* streamFinishedCallback: 0x%p\n", streamFinishedCallback ));
+
+    if( result == paNoError )
+    {
+        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+        if( result == 0 )
+        {
+            result = paStreamIsNotStopped ;
+        }
+        if( result == 1 )
+        {
+            PA_STREAM_REP( stream )->streamFinishedCallback = streamFinishedCallback;
+            result = paNoError;
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_SetStreamFinishedCallback", result );
+
+    return result;
+
+}
+
+
+PaError Pa_StartStream( PaStream *stream )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_StartStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+    {
+        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+        if( result == 0 )
+        {
+            result = paStreamIsNotStopped ;
+        }
+        else if( result == 1 )
+        {
+            result = PA_STREAM_INTERFACE(stream)->Start( stream );
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_StartStream", result );
+
+    return result;
+}
+
+
+PaError Pa_StopStream( PaStream *stream )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_StopStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+    {
+        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+        if( result == 0 )
+        {
+            result = PA_STREAM_INTERFACE(stream)->Stop( stream );
+        }
+        else if( result == 1 )
+        {
+            result = paStreamIsStopped;
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_StopStream", result );
+
+    return result;
+}
+
+
+PaError Pa_AbortStream( PaStream *stream )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_AbortStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+    {
+        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+        if( result == 0 )
+        {
+            result = PA_STREAM_INTERFACE(stream)->Abort( stream );
+        }
+        else if( result == 1 )
+        {
+            result = paStreamIsStopped;
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_AbortStream", result );
+
+    return result;
+}
+
+
+PaError Pa_IsStreamStopped( PaStream *stream )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_IsStreamStopped" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_IsStreamStopped", result );
+
+    return result;
+}
+
+
+PaError Pa_IsStreamActive( PaStream *stream )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_IsStreamActive" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+        result = PA_STREAM_INTERFACE(stream)->IsActive( stream );
+
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_IsStreamActive", result );
+
+    return result;
+}
+
+
+const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream )
+{
+    PaError error = PaUtil_ValidateStreamPointer( stream );
+    const PaStreamInfo *result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamInfo" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( error != paNoError )
+    {
+        result = 0;
+
+        PA_LOGAPI(("Pa_GetStreamInfo returned:\n" ));
+        PA_LOGAPI(("\tconst PaStreamInfo*: 0 [PaError error:%d ( %s )]\n", error, Pa_GetErrorText( error ) ));
+
+    }
+    else
+    {
+        result = &PA_STREAM_REP( stream )->streamInfo;
+
+        PA_LOGAPI(("Pa_GetStreamInfo returned:\n" ));
+        PA_LOGAPI(("\tconst PaStreamInfo*: 0x%p:\n", result ));
+        PA_LOGAPI(("\t{" ));
+
+        PA_LOGAPI(("\t\tint structVersion: %d\n", result->structVersion ));
+        PA_LOGAPI(("\t\tPaTime inputLatency: %f\n", result->inputLatency ));
+        PA_LOGAPI(("\t\tPaTime outputLatency: %f\n", result->outputLatency ));
+        PA_LOGAPI(("\t\tdouble sampleRate: %f\n", result->sampleRate ));
+        PA_LOGAPI(("\t}\n" ));
+
+    }
+
+    return result;
+}
+
+
+PaTime Pa_GetStreamTime( PaStream *stream )
+{
+    PaError error = PaUtil_ValidateStreamPointer( stream );
+    PaTime result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamTime" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( error != paNoError )
+    {
+        result = 0;
+
+        PA_LOGAPI(("Pa_GetStreamTime returned:\n" ));
+        PA_LOGAPI(("\tPaTime: 0 [PaError error:%d ( %s )]\n", result, error, Pa_GetErrorText( error ) ));
+
+    }
+    else
+    {
+        result = PA_STREAM_INTERFACE(stream)->GetTime( stream );
+
+        PA_LOGAPI(("Pa_GetStreamTime returned:\n" ));
+        PA_LOGAPI(("\tPaTime: %g\n", result ));
+
+    }
+
+    return result;
+}
+
+
+double Pa_GetStreamCpuLoad( PaStream* stream )
+{
+    PaError error = PaUtil_ValidateStreamPointer( stream );
+    double result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamCpuLoad" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( error != paNoError )
+    {
+
+        result = 0.0;
+
+        PA_LOGAPI(("Pa_GetStreamCpuLoad returned:\n" ));
+        PA_LOGAPI(("\tdouble: 0.0 [PaError error: %d ( %s )]\n", error, Pa_GetErrorText( error ) ));
+
+    }
+    else
+    {
+        result = PA_STREAM_INTERFACE(stream)->GetCpuLoad( stream );
+
+        PA_LOGAPI(("Pa_GetStreamCpuLoad returned:\n" ));
+        PA_LOGAPI(("\tdouble: %g\n", result ));
+
+    }
+
+    return result;
+}
+
+
+PaError Pa_ReadStream( PaStream* stream,
+                       void *buffer,
+                       unsigned long frames )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_ReadStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+    {
+        if( frames == 0 )
+        {
+            /* @todo Should we not allow the implementation to signal any overflow condition? see: http://www.portaudio.com/trac/ticket/116*/
+            result = paNoError;
+        }
+        else if( buffer == 0 )
+        {
+            result = paBadBufferPtr;
+        }
+        else
+        {
+            result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+            if( result == 0 )
+            {
+                result = PA_STREAM_INTERFACE(stream)->Read( stream, buffer, frames );
+            }
+            else if( result == 1 )
+            {
+                result = paStreamIsStopped;
+            }
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_ReadStream", result );
+
+    return result;
+}
+
+
+PaError Pa_WriteStream( PaStream* stream,
+                        const void *buffer,
+                        unsigned long frames )
+{
+    PaError result = PaUtil_ValidateStreamPointer( stream );
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_WriteStream" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( result == paNoError )
+    {
+        if( frames == 0 )
+        {
+            /* @todo Should we not allow the implementation to signal any underflow condition? see: http://www.portaudio.com/trac/ticket/116*/
+            result = paNoError;
+        }
+        else if( buffer == 0 )
+        {
+            result = paBadBufferPtr;
+        }
+        else
+        {
+            result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
+            if( result == 0 )
+            {
+                result = PA_STREAM_INTERFACE(stream)->Write( stream, buffer, frames );
+            }
+            else if( result == 1 )
+            {
+                result = paStreamIsStopped;
+            }  
+        }
+    }
+
+    PA_LOGAPI_EXIT_PAERROR( "Pa_WriteStream", result );
+
+    return result;
+}
+
+signed long Pa_GetStreamReadAvailable( PaStream* stream )
+{
+    PaError error = PaUtil_ValidateStreamPointer( stream );
+    signed long result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamReadAvailable" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( error != paNoError )
+    {
+        result = 0;
+
+        PA_LOGAPI(("Pa_GetStreamReadAvailable returned:\n" ));
+        PA_LOGAPI(("\tunsigned long: 0 [ PaError error: %d ( %s ) ]\n", error, Pa_GetErrorText( error ) ));
+
+    }
+    else
+    {
+        result = PA_STREAM_INTERFACE(stream)->GetReadAvailable( stream );
+
+        PA_LOGAPI(("Pa_GetStreamReadAvailable returned:\n" ));
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+
+    }
+
+    return result;
+}
+
+
+signed long Pa_GetStreamWriteAvailable( PaStream* stream )
+{
+    PaError error = PaUtil_ValidateStreamPointer( stream );
+    signed long result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamWriteAvailable" );
+    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
+
+    if( error != paNoError )
+    {
+        result = 0;
+
+        PA_LOGAPI(("Pa_GetStreamWriteAvailable returned:\n" ));
+        PA_LOGAPI(("\tunsigned long: 0 [ PaError error: %d ( %s ) ]\n", error, Pa_GetErrorText( error ) ));
+
+    }
+    else
+    {
+        result = PA_STREAM_INTERFACE(stream)->GetWriteAvailable( stream );
+
+        PA_LOGAPI(("Pa_GetStreamWriteAvailable returned:\n" ));
+        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
+
+    }
+
+    return result;
+}
+
+
+PaError Pa_GetSampleSize( PaSampleFormat format )
+{
+    int result;
+
+    PA_LOGAPI_ENTER_PARAMS( "Pa_GetSampleSize" );
+    PA_LOGAPI(("\tPaSampleFormat format: %d\n", format ));
+
+    switch( format & ~paNonInterleaved )
+    {
+
+    case paUInt8:
+    case paInt8:
+        result = 1;
+        break;
+
+    case paInt16:
+        result = 2;
+        break;
+
+    case paInt24:
+        result = 3;
+        break;
+
+    case paFloat32:
+    case paInt32:
+        result = 4;
+        break;
+
+    default:
+        result = paSampleFormatNotSupported;
+        break;
+    }
+
+    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetSampleSize", "int: %d", result );
+
+    return (PaError) result;
+}
+
diff --git a/Externals/portaudio/src/common/pa_hostapi.h b/Externals/portaudio/src/common/pa_hostapi.h
new file mode 100644
index 0000000000..1437f629dc
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_hostapi.h
@@ -0,0 +1,362 @@
+#ifndef PA_HOSTAPI_H
+#define PA_HOSTAPI_H
+/*
+ * $Id: pa_hostapi.h 1740 2011-08-25 07:17:48Z philburk $
+ * Portable Audio I/O Library
+ * host api representation
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Interfaces and representation structures used by pa_front.c 
+ to manage and communicate with host API implementations.
+*/
+
+#include "portaudio.h"
+
+/**
+The PA_NO_* host API macros are now deprecated in favor of PA_USE_* macros.
+PA_USE_* indicates whether a particular host API will be initialized by PortAudio.
+An undefined or 0 value indicates that the host API will not be used. A value of 1 
+indicates that the host API will be used. PA_USE_* macros should be left undefined 
+or defined to either 0 or 1.
+
+The code below ensures that PA_USE_* macros are always defined and have value
+0 or 1. Undefined symbols are defaulted to 0. Symbols that are neither 0 nor 1 
+are defaulted to 1.
+*/
+
+#ifndef PA_USE_SKELETON
+#define PA_USE_SKELETON 0
+#elif (PA_USE_SKELETON != 0) && (PA_USE_SKELETON != 1)
+#undef PA_USE_SKELETON
+#define PA_USE_SKELETON 1
+#endif 
+
+#if defined(PA_NO_ASIO) || defined(PA_NO_DS) || defined(PA_NO_WMME) || defined(PA_NO_WASAPI) || defined(PA_NO_WDMKS)
+#error "Portaudio: PA_NO_<APINAME> is no longer supported, please remove definition and use PA_USE_<APINAME> instead"
+#endif
+
+#ifndef PA_USE_ASIO
+#define PA_USE_ASIO 0
+#elif (PA_USE_ASIO != 0) && (PA_USE_ASIO != 1)
+#undef PA_USE_ASIO
+#define PA_USE_ASIO 1
+#endif 
+
+#ifndef PA_USE_DS
+#define PA_USE_DS 0
+#elif (PA_USE_DS != 0) && (PA_USE_DS != 1)
+#undef PA_USE_DS
+#define PA_USE_DS 1
+#endif 
+
+#ifndef PA_USE_WMME
+#define PA_USE_WMME 0
+#elif (PA_USE_WMME != 0) && (PA_USE_WMME != 1)
+#undef PA_USE_WMME
+#define PA_USE_WMME 1
+#endif 
+
+#ifndef PA_USE_WASAPI
+#define PA_USE_WASAPI 0
+#elif (PA_USE_WASAPI != 0) && (PA_USE_WASAPI != 1)
+#undef PA_USE_WASAPI
+#define PA_USE_WASAPI 1
+#endif 
+
+#ifndef PA_USE_WDMKS
+#define PA_USE_WDMKS 0
+#elif (PA_USE_WDMKS != 0) && (PA_USE_WDMKS != 1)
+#undef PA_USE_WDMKS
+#define PA_USE_WDMKS 1
+#endif 
+
+/* Set default values for Unix based APIs. */
+#if defined(PA_NO_OSS) || defined(PA_NO_ALSA) || defined(PA_NO_JACK) || defined(PA_NO_COREAUDIO) || defined(PA_NO_SGI) || defined(PA_NO_ASIHPI)
+#error "Portaudio: PA_NO_<APINAME> is no longer supported, please remove definition and use PA_USE_<APINAME> instead"
+#endif
+
+#ifndef PA_USE_OSS
+#define PA_USE_OSS 0
+#elif (PA_USE_OSS != 0) && (PA_USE_OSS != 1)
+#undef PA_USE_OSS
+#define PA_USE_OSS 1
+#endif 
+
+#ifndef PA_USE_ALSA
+#define PA_USE_ALSA 0
+#elif (PA_USE_ALSA != 0) && (PA_USE_ALSA != 1)
+#undef PA_USE_ALSA
+#define PA_USE_ALSA 1
+#endif 
+
+#ifndef PA_USE_JACK
+#define PA_USE_JACK 0
+#elif (PA_USE_JACK != 0) && (PA_USE_JACK != 1)
+#undef PA_USE_JACK
+#define PA_USE_JACK 1
+#endif 
+
+#ifndef PA_USE_SGI
+#define PA_USE_SGI 0
+#elif (PA_USE_SGI != 0) && (PA_USE_SGI != 1)
+#undef PA_USE_SGI
+#define PA_USE_SGI 1
+#endif 
+
+#ifndef PA_USE_COREAUDIO
+#define PA_USE_COREAUDIO 0
+#elif (PA_USE_COREAUDIO != 0) && (PA_USE_COREAUDIO != 1)
+#undef PA_USE_COREAUDIO
+#define PA_USE_COREAUDIO 1
+#endif 
+
+#ifndef PA_USE_ASIHPI
+#define PA_USE_ASIHPI 0
+#elif (PA_USE_ASIHPI != 0) && (PA_USE_ASIHPI != 1)
+#undef PA_USE_ASIHPI
+#define PA_USE_ASIHPI 1
+#endif 
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+/** **FOR THE USE OF pa_front.c ONLY**
+    Do NOT use fields in this structure, they my change at any time.
+    Use functions defined in pa_util.h if you think you need functionality
+    which can be derived from here.
+*/
+typedef struct PaUtilPrivatePaFrontHostApiInfo {
+
+
+    unsigned long baseDeviceIndex;
+}PaUtilPrivatePaFrontHostApiInfo;
+
+
+/** The common header for all data structures whose pointers are passed through
+ the hostApiSpecificStreamInfo field of the PaStreamParameters structure.
+ Note that in order to keep the public PortAudio interface clean, this structure
+ is not used explicitly when declaring hostApiSpecificStreamInfo data structures.
+ However, some code in pa_front depends on the first 3 members being equivalent
+ with this structure.
+ @see PaStreamParameters
+*/
+typedef struct PaUtilHostApiSpecificStreamInfoHeader
+{
+    unsigned long size;             /**< size of whole structure including this header */
+    PaHostApiTypeId hostApiType;    /**< host API for which this data is intended */
+    unsigned long version;          /**< structure version */
+} PaUtilHostApiSpecificStreamInfoHeader;
+
+
+
+/** A structure representing the interface to a host API. Contains both
+ concrete data and pointers to functions which implement the interface.
+*/
+typedef struct PaUtilHostApiRepresentation {
+    PaUtilPrivatePaFrontHostApiInfo privatePaFrontInfo;
+
+    /** The host api implementation should populate the info field. In the
+        case of info.defaultInputDevice and info.defaultOutputDevice the
+        values stored should be 0 based indices within the host api's own
+        device index range (0 to deviceCount). These values will be converted
+        to global device indices by pa_front after PaUtilHostApiInitializer()
+        returns.
+    */
+    PaHostApiInfo info;
+
+    PaDeviceInfo** deviceInfos;
+
+    /**
+        (*Terminate)() is guaranteed to be called with a valid <hostApi>
+        parameter, which was previously returned from the same implementation's
+        initializer.
+    */
+    void (*Terminate)( struct PaUtilHostApiRepresentation *hostApi );
+
+    /**
+        The inputParameters and outputParameters pointers should not be saved
+        as they will not remain valid after OpenStream is called.
+
+        
+        The following guarantees are made about parameters to (*OpenStream)():
+
+            [NOTE: the following list up to *END PA FRONT VALIDATIONS* should be
+                kept in sync with the one for ValidateOpenStreamParameters and
+                Pa_OpenStream in pa_front.c]
+                
+            PaHostApiRepresentation *hostApi
+                - is valid for this implementation
+
+            PaStream** stream
+                - is non-null
+
+            - at least one of inputParameters & outputParmeters is valid (not NULL)
+
+            - if inputParameters & outputParmeters are both valid, that
+                inputParameters->device & outputParmeters->device  both use the same host api
+ 
+            PaDeviceIndex inputParameters->device
+                - is within range (0 to Pa_CountDevices-1) Or:
+                - is paUseHostApiSpecificDeviceSpecification and
+                    inputParameters->hostApiSpecificStreamInfo is non-NULL and refers
+                    to a valid host api
+
+            int inputParameters->numChannels
+                - if inputParameters->device is not paUseHostApiSpecificDeviceSpecification, numInputChannels is > 0
+                - upper bound is NOT validated against device capabilities
+ 
+            PaSampleFormat inputParameters->sampleFormat
+                - is one of the sample formats defined in portaudio.h
+
+            void *inputParameters->hostApiSpecificStreamInfo
+                - if supplied its hostApi field matches the input device's host Api
+ 
+            PaDeviceIndex outputParmeters->device
+                - is within range (0 to Pa_CountDevices-1)
+ 
+            int outputParmeters->numChannels
+                - if inputDevice is valid, numInputChannels is > 0
+                - upper bound is NOT validated against device capabilities
+ 
+            PaSampleFormat outputParmeters->sampleFormat
+                - is one of the sample formats defined in portaudio.h
+        
+            void *outputParmeters->hostApiSpecificStreamInfo
+                - if supplied its hostApi field matches the output device's host Api
+ 
+            double sampleRate
+                - is not an 'absurd' rate (less than 1000. or greater than 200000.)
+                - sampleRate is NOT validated against device capabilities
+ 
+            PaStreamFlags streamFlags
+                - unused platform neutral flags are zero
+                - paNeverDropInput is only used for full-duplex callback streams
+                    with variable buffer size (paFramesPerBufferUnspecified)
+
+            [*END PA FRONT VALIDATIONS*]
+
+
+        The following validations MUST be performed by (*OpenStream)():
+
+            - check that input device can support numInputChannels
+            
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - if inputStreamInfo is supplied, validate its contents,
+                or return an error if no inputStreamInfo is expected
+
+            - check that output device can support numOutputChannels
+            
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - if outputStreamInfo is supplied, validate its contents,
+                or return an error if no outputStreamInfo is expected
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+
+            - check that the device supports sampleRate
+
+            - alter sampleRate to a close allowable rate if necessary
+
+            - validate inputLatency and outputLatency
+
+            - validate any platform specific flags, if flags are supplied they
+                must be valid.
+    */
+    PaError (*OpenStream)( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** stream,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerCallback,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+
+
+    PaError (*IsFormatSupported)( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+} PaUtilHostApiRepresentation;
+
+
+/** Prototype for the initialization function which must be implemented by every
+ host API.
+ 
+ This function should only return an error other than paNoError if it encounters 
+ an unexpected and fatal error (memory allocation error for example). In general, 
+ there may be conditions under which it returns a NULL interface pointer and also 
+ returns paNoError. For example, if the ASIO implementation detects that ASIO is 
+ not installed, it should return a NULL interface, and paNoError.
+
+ @see paHostApiInitializers
+*/
+typedef PaError PaUtilHostApiInitializer( PaUtilHostApiRepresentation**, PaHostApiIndex );
+
+
+/** paHostApiInitializers is a NULL-terminated array of host API initialization
+ functions. These functions are called by pa_front.c to initialize the host APIs
+ when the client calls Pa_Initialize(). 
+ 
+ The initialization functions are invoked in order.
+
+ The first successfully initialized host API that has a default input *or* output 
+ device is used as the default PortAudio host API. This is based on the logic that
+ there is only one default host API, and it must contain the default input and output
+ devices (if defined).
+
+ There is a platform specific file that defines paHostApiInitializers for that
+ platform, pa_win/pa_win_hostapis.c contains the Win32 definitions for example.
+*/
+extern PaUtilHostApiInitializer *paHostApiInitializers[];
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_HOSTAPI_H */
diff --git a/Externals/portaudio/src/common/pa_memorybarrier.h b/Externals/portaudio/src/common/pa_memorybarrier.h
new file mode 100644
index 0000000000..2879ce33ad
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_memorybarrier.h
@@ -0,0 +1,128 @@
+/*
+ * $Id: pa_memorybarrier.h 1240 2007-07-17 13:05:07Z bjornroche $
+ * Portable Audio I/O Library
+ * Memory barrier utilities
+ *
+ * Author: Bjorn Roche, XO Audio, LLC
+ *
+ * This program uses the PortAudio Portable Audio Library.
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file pa_memorybarrier.h
+ @ingroup common_src
+*/
+
+/****************
+ * Some memory barrier primitives based on the system.
+ * right now only OS X, FreeBSD, and Linux are supported. In addition to providing
+ * memory barriers, these functions should ensure that data cached in registers
+ * is written out to cache where it can be snooped by other CPUs. (ie, the volatile
+ * keyword should not be required)
+ *
+ * the primitives that must be defined are:
+ *
+ * PaUtil_FullMemoryBarrier()
+ * PaUtil_ReadMemoryBarrier()
+ * PaUtil_WriteMemoryBarrier()
+ *
+ ****************/
+
+#if defined(__APPLE__)
+#   include <libkern/OSAtomic.h>
+    /* Here are the memory barrier functions. Mac OS X only provides
+       full memory barriers, so the three types of barriers are the same,
+       however, these barriers are superior to compiler-based ones. */
+#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
+#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
+#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
+#elif defined(__GNUC__)
+    /* GCC >= 4.1 has built-in intrinsics. We'll use those */
+#   if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#      define PaUtil_FullMemoryBarrier()  __sync_synchronize()
+#      define PaUtil_ReadMemoryBarrier()  __sync_synchronize()
+#      define PaUtil_WriteMemoryBarrier() __sync_synchronize()
+    /* as a fallback, GCC understands volatile asm and "memory" to mean it
+     * should not reorder memory read/writes */
+    /* Note that it is not clear that any compiler actually defines __PPC__,
+     * it can probably removed safely. */
+#   elif defined( __ppc__ ) || defined( __powerpc__) || defined( __PPC__ )
+#      define PaUtil_FullMemoryBarrier()  asm volatile("sync":::"memory")
+#      define PaUtil_ReadMemoryBarrier()  asm volatile("sync":::"memory")
+#      define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory")
+#   elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || \
+         defined( __i686__ ) || defined( __x86_64__ )
+#      define PaUtil_FullMemoryBarrier()  asm volatile("mfence":::"memory")
+#      define PaUtil_ReadMemoryBarrier()  asm volatile("lfence":::"memory")
+#      define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory")
+#   else
+#      ifdef ALLOW_SMP_DANGERS
+#         warning Memory barriers not defined on this system or system unknown
+#         warning For SMP safety, you should fix this.
+#         define PaUtil_FullMemoryBarrier()
+#         define PaUtil_ReadMemoryBarrier()
+#         define PaUtil_WriteMemoryBarrier()
+#      else
+#         error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
+#      endif
+#   endif
+#elif (_MSC_VER >= 1400) && !defined(_WIN32_WCE)
+#   include <intrin.h>
+#   pragma intrinsic(_ReadWriteBarrier)
+#   pragma intrinsic(_ReadBarrier)
+#   pragma intrinsic(_WriteBarrier)
+/* note that MSVC intrinsics _ReadWriteBarrier(), _ReadBarrier(), _WriteBarrier() are just compiler barriers *not* memory barriers */
+#   define PaUtil_FullMemoryBarrier()  _ReadWriteBarrier()
+#   define PaUtil_ReadMemoryBarrier()  _ReadBarrier()
+#   define PaUtil_WriteMemoryBarrier() _WriteBarrier()
+#elif defined(_WIN32_WCE)
+#   define PaUtil_FullMemoryBarrier()
+#   define PaUtil_ReadMemoryBarrier()
+#   define PaUtil_WriteMemoryBarrier()
+#elif defined(_MSC_VER) || defined(__BORLANDC__)
+#   define PaUtil_FullMemoryBarrier()  _asm { lock add    [esp], 0 }
+#   define PaUtil_ReadMemoryBarrier()  _asm { lock add    [esp], 0 }
+#   define PaUtil_WriteMemoryBarrier() _asm { lock add    [esp], 0 }
+#else
+#   ifdef ALLOW_SMP_DANGERS
+#      warning Memory barriers not defined on this system or system unknown
+#      warning For SMP safety, you should fix this.
+#      define PaUtil_FullMemoryBarrier()
+#      define PaUtil_ReadMemoryBarrier()
+#      define PaUtil_WriteMemoryBarrier()
+#   else
+#      error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
+#   endif
+#endif
diff --git a/Externals/portaudio/src/common/pa_process.c b/Externals/portaudio/src/common/pa_process.c
new file mode 100644
index 0000000000..383f9cafa5
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_process.c
@@ -0,0 +1,1827 @@
+/*
+ * $Id: pa_process.c 1706 2011-07-21 18:44:58Z philburk $
+ * Portable Audio I/O Library
+ * streamCallback <-> host buffer processing adapter
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Buffer Processor implementation.
+*/
+
+
+#include <assert.h>
+#include <string.h> /* memset() */
+
+#include "pa_process.h"
+#include "pa_util.h"
+
+
+#define PA_FRAMES_PER_TEMP_BUFFER_WHEN_HOST_BUFFER_SIZE_IS_UNKNOWN_    1024
+
+#define PA_MIN_( a, b ) ( ((a)<(b)) ? (a) : (b) )
+
+
+/* greatest common divisor - PGCD in French */
+static unsigned long GCD( unsigned long a, unsigned long b )
+{
+    return (b==0) ? a : GCD( b, a%b);
+}
+
+/* least common multiple - PPCM in French */
+static unsigned long LCM( unsigned long a, unsigned long b )
+{
+    return (a*b) / GCD(a,b);
+}
+
+#define PA_MAX_( a, b ) (((a) > (b)) ? (a) : (b))
+
+static unsigned long CalculateFrameShift( unsigned long M, unsigned long N )
+{
+    unsigned long result = 0;
+    unsigned long i;
+    unsigned long lcm;
+
+    assert( M > 0 );
+    assert( N > 0 );
+
+    lcm = LCM( M, N );
+    for( i = M; i < lcm; i += M )
+        result = PA_MAX_( result, i % N );
+
+    return result;
+}
+
+
+PaError PaUtil_InitializeBufferProcessor( PaUtilBufferProcessor* bp,
+        int inputChannelCount, PaSampleFormat userInputSampleFormat,
+        PaSampleFormat hostInputSampleFormat,
+        int outputChannelCount, PaSampleFormat userOutputSampleFormat,
+        PaSampleFormat hostOutputSampleFormat,
+        double sampleRate,
+        PaStreamFlags streamFlags,
+        unsigned long framesPerUserBuffer,
+        unsigned long framesPerHostBuffer,
+        PaUtilHostBufferSizeMode hostBufferSizeMode,
+        PaStreamCallback *streamCallback, void *userData )
+{
+    PaError result = paNoError;
+    PaError bytesPerSample;
+    unsigned long tempInputBufferSize, tempOutputBufferSize;
+    PaStreamFlags tempInputStreamFlags;
+
+    if( streamFlags & paNeverDropInput )
+    {
+        /* paNeverDropInput is only valid for full-duplex callback streams, with an unspecified number of frames per buffer. */
+        if( !streamCallback || !(inputChannelCount > 0 && outputChannelCount > 0) ||
+                framesPerUserBuffer != paFramesPerBufferUnspecified )
+            return paInvalidFlag;
+    }
+
+    /* initialize buffer ptrs to zero so they can be freed if necessary in error */
+    bp->tempInputBuffer = 0;
+    bp->tempInputBufferPtrs = 0;
+    bp->tempOutputBuffer = 0;
+    bp->tempOutputBufferPtrs = 0;
+
+    bp->framesPerUserBuffer = framesPerUserBuffer;
+    bp->framesPerHostBuffer = framesPerHostBuffer;
+
+    bp->inputChannelCount = inputChannelCount;
+    bp->outputChannelCount = outputChannelCount;
+
+    bp->hostBufferSizeMode = hostBufferSizeMode;
+
+    bp->hostInputChannels[0] = bp->hostInputChannels[1] = 0;
+    bp->hostOutputChannels[0] = bp->hostOutputChannels[1] = 0;
+
+    if( framesPerUserBuffer == 0 ) /* streamCallback will accept any buffer size */
+    {
+        bp->useNonAdaptingProcess = 1;
+        bp->initialFramesInTempInputBuffer = 0;
+        bp->initialFramesInTempOutputBuffer = 0;
+
+        if( hostBufferSizeMode == paUtilFixedHostBufferSize
+                || hostBufferSizeMode == paUtilBoundedHostBufferSize )
+        {
+            bp->framesPerTempBuffer = framesPerHostBuffer;
+        }
+        else /* unknown host buffer size */
+        {
+             bp->framesPerTempBuffer = PA_FRAMES_PER_TEMP_BUFFER_WHEN_HOST_BUFFER_SIZE_IS_UNKNOWN_;
+        }
+    }
+    else
+    {
+        bp->framesPerTempBuffer = framesPerUserBuffer;
+
+        if( hostBufferSizeMode == paUtilFixedHostBufferSize
+                && framesPerHostBuffer % framesPerUserBuffer == 0 )
+        {
+            bp->useNonAdaptingProcess = 1;
+            bp->initialFramesInTempInputBuffer = 0;
+            bp->initialFramesInTempOutputBuffer = 0;
+        }
+        else
+        {
+            bp->useNonAdaptingProcess = 0;
+
+            if( inputChannelCount > 0 && outputChannelCount > 0 )
+            {
+                /* full duplex */
+                if( hostBufferSizeMode == paUtilFixedHostBufferSize )
+                {
+                    unsigned long frameShift =
+                        CalculateFrameShift( framesPerHostBuffer, framesPerUserBuffer );
+
+                    if( framesPerUserBuffer > framesPerHostBuffer )
+                    {
+                        bp->initialFramesInTempInputBuffer = frameShift;
+                        bp->initialFramesInTempOutputBuffer = 0;
+                    }
+                    else
+                    {
+                        bp->initialFramesInTempInputBuffer = 0;
+                        bp->initialFramesInTempOutputBuffer = frameShift;
+                    }
+                }
+                else /* variable host buffer size, add framesPerUserBuffer latency */
+                {
+                    bp->initialFramesInTempInputBuffer = 0;
+                    bp->initialFramesInTempOutputBuffer = framesPerUserBuffer;
+                }
+            }
+            else
+            {
+                /* half duplex */
+                bp->initialFramesInTempInputBuffer = 0;
+                bp->initialFramesInTempOutputBuffer = 0;
+            }
+        }
+    }
+
+
+    bp->framesInTempInputBuffer = bp->initialFramesInTempInputBuffer;
+    bp->framesInTempOutputBuffer = bp->initialFramesInTempOutputBuffer;
+
+    
+    if( inputChannelCount > 0 )
+    {
+        bytesPerSample = Pa_GetSampleSize( hostInputSampleFormat );
+        if( bytesPerSample > 0 )
+        {
+            bp->bytesPerHostInputSample = bytesPerSample;
+        }
+        else
+        {
+            result = bytesPerSample;
+            goto error;
+        }
+
+        bytesPerSample = Pa_GetSampleSize( userInputSampleFormat );
+        if( bytesPerSample > 0 )
+        {
+            bp->bytesPerUserInputSample = bytesPerSample;
+        }
+        else
+        {
+            result = bytesPerSample;
+            goto error;
+        }
+
+        /* Under the assumption that no ADC in existence delivers better than 24bits resolution,
+            we disable dithering when host input format is paInt32 and user format is paInt24, 
+            since the host samples will just be padded with zeros anyway. */
+
+        tempInputStreamFlags = streamFlags;
+        if( !(tempInputStreamFlags & paDitherOff) /* dither is on */
+                && (hostInputSampleFormat & paInt32) /* host input format is int32 */
+                && (userInputSampleFormat & paInt24) /* user requested format is int24 */ ){
+
+            tempInputStreamFlags = tempInputStreamFlags | paDitherOff;
+        }
+
+        bp->inputConverter =
+            PaUtil_SelectConverter( hostInputSampleFormat, userInputSampleFormat, tempInputStreamFlags );
+
+        bp->inputZeroer = PaUtil_SelectZeroer( hostInputSampleFormat );
+            
+        bp->userInputIsInterleaved = (userInputSampleFormat & paNonInterleaved)?0:1;
+		
+        bp->hostInputIsInterleaved = (hostInputSampleFormat & paNonInterleaved)?0:1;
+
+        bp->userInputSampleFormatIsEqualToHost = ((userInputSampleFormat & ~paNonInterleaved) == (hostInputSampleFormat & ~paNonInterleaved));
+
+        tempInputBufferSize =
+            bp->framesPerTempBuffer * bp->bytesPerUserInputSample * inputChannelCount;
+         
+        bp->tempInputBuffer = PaUtil_AllocateMemory( tempInputBufferSize );
+        if( bp->tempInputBuffer == 0 )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+        
+        if( bp->framesInTempInputBuffer > 0 )
+            memset( bp->tempInputBuffer, 0, tempInputBufferSize );
+
+        if( userInputSampleFormat & paNonInterleaved )
+        {
+            bp->tempInputBufferPtrs =
+                (void **)PaUtil_AllocateMemory( sizeof(void*)*inputChannelCount );
+            if( bp->tempInputBufferPtrs == 0 )
+            {
+                result = paInsufficientMemory;
+                goto error;
+            }
+        }
+
+        bp->hostInputChannels[0] = (PaUtilChannelDescriptor*)
+                PaUtil_AllocateMemory( sizeof(PaUtilChannelDescriptor) * inputChannelCount * 2);
+        if( bp->hostInputChannels[0] == 0 )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        bp->hostInputChannels[1] = &bp->hostInputChannels[0][inputChannelCount];
+    }
+
+    if( outputChannelCount > 0 )
+    {
+        bytesPerSample = Pa_GetSampleSize( hostOutputSampleFormat );
+        if( bytesPerSample > 0 )
+        {
+            bp->bytesPerHostOutputSample = bytesPerSample;
+        }
+        else
+        {
+            result = bytesPerSample;
+            goto error;
+        }
+
+        bytesPerSample = Pa_GetSampleSize( userOutputSampleFormat );
+        if( bytesPerSample > 0 )
+        {
+            bp->bytesPerUserOutputSample = bytesPerSample;
+        }
+        else
+        {
+            result = bytesPerSample;
+            goto error;
+        }
+
+        bp->outputConverter =
+            PaUtil_SelectConverter( userOutputSampleFormat, hostOutputSampleFormat, streamFlags );
+
+        bp->outputZeroer = PaUtil_SelectZeroer( hostOutputSampleFormat );
+
+        bp->userOutputIsInterleaved = (userOutputSampleFormat & paNonInterleaved)?0:1;
+
+        bp->hostOutputIsInterleaved = (hostOutputSampleFormat & paNonInterleaved)?0:1;
+
+        bp->userOutputSampleFormatIsEqualToHost = ((userOutputSampleFormat & ~paNonInterleaved) == (hostOutputSampleFormat & ~paNonInterleaved));
+
+        tempOutputBufferSize =
+                bp->framesPerTempBuffer * bp->bytesPerUserOutputSample * outputChannelCount;
+
+        bp->tempOutputBuffer = PaUtil_AllocateMemory( tempOutputBufferSize );
+        if( bp->tempOutputBuffer == 0 )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        if( bp->framesInTempOutputBuffer > 0 )
+            memset( bp->tempOutputBuffer, 0, tempOutputBufferSize );
+        
+        if( userOutputSampleFormat & paNonInterleaved )
+        {
+            bp->tempOutputBufferPtrs =
+                (void **)PaUtil_AllocateMemory( sizeof(void*)*outputChannelCount );
+            if( bp->tempOutputBufferPtrs == 0 )
+            {
+                result = paInsufficientMemory;
+                goto error;
+            }
+        }
+
+        bp->hostOutputChannels[0] = (PaUtilChannelDescriptor*)
+                PaUtil_AllocateMemory( sizeof(PaUtilChannelDescriptor)*outputChannelCount * 2 );
+        if( bp->hostOutputChannels[0] == 0 )
+        {                                                                     
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        bp->hostOutputChannels[1] = &bp->hostOutputChannels[0][outputChannelCount];
+    }
+
+    PaUtil_InitializeTriangularDitherState( &bp->ditherGenerator );
+
+    bp->samplePeriod = 1. / sampleRate;
+
+    bp->streamCallback = streamCallback;
+    bp->userData = userData;
+
+    return result;
+
+error:
+    if( bp->tempInputBuffer )
+        PaUtil_FreeMemory( bp->tempInputBuffer );
+
+    if( bp->tempInputBufferPtrs )
+        PaUtil_FreeMemory( bp->tempInputBufferPtrs );
+
+    if( bp->hostInputChannels[0] )
+        PaUtil_FreeMemory( bp->hostInputChannels[0] );
+
+    if( bp->tempOutputBuffer )
+        PaUtil_FreeMemory( bp->tempOutputBuffer );
+
+    if( bp->tempOutputBufferPtrs )
+        PaUtil_FreeMemory( bp->tempOutputBufferPtrs );
+
+    if( bp->hostOutputChannels[0] )
+        PaUtil_FreeMemory( bp->hostOutputChannels[0] );
+
+    return result;
+}
+
+
+void PaUtil_TerminateBufferProcessor( PaUtilBufferProcessor* bp )
+{
+    if( bp->tempInputBuffer )
+        PaUtil_FreeMemory( bp->tempInputBuffer );
+
+    if( bp->tempInputBufferPtrs )
+        PaUtil_FreeMemory( bp->tempInputBufferPtrs );
+
+    if( bp->hostInputChannels[0] )
+        PaUtil_FreeMemory( bp->hostInputChannels[0] );
+        
+    if( bp->tempOutputBuffer )
+        PaUtil_FreeMemory( bp->tempOutputBuffer );
+
+    if( bp->tempOutputBufferPtrs )
+        PaUtil_FreeMemory( bp->tempOutputBufferPtrs );
+
+    if( bp->hostOutputChannels[0] )
+        PaUtil_FreeMemory( bp->hostOutputChannels[0] );
+}
+
+
+void PaUtil_ResetBufferProcessor( PaUtilBufferProcessor* bp )
+{
+    unsigned long tempInputBufferSize, tempOutputBufferSize;
+
+    bp->framesInTempInputBuffer = bp->initialFramesInTempInputBuffer;
+    bp->framesInTempOutputBuffer = bp->initialFramesInTempOutputBuffer;
+
+    if( bp->framesInTempInputBuffer > 0 )
+    {
+        tempInputBufferSize =
+            bp->framesPerTempBuffer * bp->bytesPerUserInputSample * bp->inputChannelCount;
+        memset( bp->tempInputBuffer, 0, tempInputBufferSize );
+    }
+
+    if( bp->framesInTempOutputBuffer > 0 )
+    {      
+        tempOutputBufferSize =
+            bp->framesPerTempBuffer * bp->bytesPerUserOutputSample * bp->outputChannelCount;
+        memset( bp->tempOutputBuffer, 0, tempOutputBufferSize );
+    }
+}
+
+
+unsigned long PaUtil_GetBufferProcessorInputLatencyFrames( PaUtilBufferProcessor* bp )
+{
+    return bp->initialFramesInTempInputBuffer;
+}
+
+
+unsigned long PaUtil_GetBufferProcessorOutputLatencyFrames( PaUtilBufferProcessor* bp )
+{
+    return bp->initialFramesInTempOutputBuffer;
+}
+
+
+void PaUtil_SetInputFrameCount( PaUtilBufferProcessor* bp,
+        unsigned long frameCount )
+{
+    if( frameCount == 0 )
+        bp->hostInputFrameCount[0] = bp->framesPerHostBuffer;
+    else
+        bp->hostInputFrameCount[0] = frameCount;
+}
+        
+
+void PaUtil_SetNoInput( PaUtilBufferProcessor* bp )
+{
+    assert( bp->inputChannelCount > 0 );
+
+    bp->hostInputChannels[0][0].data = 0;
+}
+
+
+void PaUtil_SetInputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data, unsigned int stride )
+{
+    assert( channel < bp->inputChannelCount );
+    
+    bp->hostInputChannels[0][channel].data = data;
+    bp->hostInputChannels[0][channel].stride = stride;
+}
+
+
+void PaUtil_SetInterleavedInputChannels( PaUtilBufferProcessor* bp,
+        unsigned int firstChannel, void *data, unsigned int channelCount )
+{
+    unsigned int i;
+    unsigned int channel = firstChannel;
+    unsigned char *p = (unsigned char*)data;
+
+    if( channelCount == 0 )
+        channelCount = bp->inputChannelCount;
+
+    assert( firstChannel < bp->inputChannelCount );
+    assert( firstChannel + channelCount <= bp->inputChannelCount );
+    assert( bp->hostInputIsInterleaved );
+
+    for( i=0; i< channelCount; ++i )
+    {
+        bp->hostInputChannels[0][channel+i].data = p;
+        p += bp->bytesPerHostInputSample;
+        bp->hostInputChannels[0][channel+i].stride = channelCount;
+    }
+}
+
+
+void PaUtil_SetNonInterleavedInputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data )
+{
+    assert( channel < bp->inputChannelCount );
+    assert( !bp->hostInputIsInterleaved );
+    
+    bp->hostInputChannels[0][channel].data = data;
+    bp->hostInputChannels[0][channel].stride = 1;
+}
+
+
+void PaUtil_Set2ndInputFrameCount( PaUtilBufferProcessor* bp,
+        unsigned long frameCount )
+{
+    bp->hostInputFrameCount[1] = frameCount;
+}
+
+
+void PaUtil_Set2ndInputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data, unsigned int stride )
+{
+    assert( channel < bp->inputChannelCount );
+
+    bp->hostInputChannels[1][channel].data = data;
+    bp->hostInputChannels[1][channel].stride = stride;
+}
+
+
+void PaUtil_Set2ndInterleavedInputChannels( PaUtilBufferProcessor* bp,
+        unsigned int firstChannel, void *data, unsigned int channelCount )
+{
+    unsigned int i;
+    unsigned int channel = firstChannel;
+    unsigned char *p = (unsigned char*)data;
+
+    if( channelCount == 0 )
+        channelCount = bp->inputChannelCount;
+
+    assert( firstChannel < bp->inputChannelCount );
+    assert( firstChannel + channelCount <= bp->inputChannelCount );
+    assert( bp->hostInputIsInterleaved );
+    
+    for( i=0; i< channelCount; ++i )
+    {
+        bp->hostInputChannels[1][channel+i].data = p;
+        p += bp->bytesPerHostInputSample;
+        bp->hostInputChannels[1][channel+i].stride = channelCount;
+    }
+}
+
+        
+void PaUtil_Set2ndNonInterleavedInputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data )
+{
+    assert( channel < bp->inputChannelCount );
+    assert( !bp->hostInputIsInterleaved );
+    
+    bp->hostInputChannels[1][channel].data = data;
+    bp->hostInputChannels[1][channel].stride = 1;
+}
+
+
+void PaUtil_SetOutputFrameCount( PaUtilBufferProcessor* bp,
+        unsigned long frameCount )
+{
+    if( frameCount == 0 )
+        bp->hostOutputFrameCount[0] = bp->framesPerHostBuffer;
+    else
+        bp->hostOutputFrameCount[0] = frameCount;
+}
+
+
+void PaUtil_SetNoOutput( PaUtilBufferProcessor* bp )
+{
+    assert( bp->outputChannelCount > 0 );
+
+    bp->hostOutputChannels[0][0].data = 0;
+
+    /* note that only NonAdaptingProcess is able to deal with no output at this stage. not implemented for AdaptingProcess */
+}
+
+
+void PaUtil_SetOutputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data, unsigned int stride )
+{
+    assert( channel < bp->outputChannelCount );
+    assert( data != NULL );
+
+    bp->hostOutputChannels[0][channel].data = data;
+    bp->hostOutputChannels[0][channel].stride = stride;
+}
+
+
+void PaUtil_SetInterleavedOutputChannels( PaUtilBufferProcessor* bp,
+        unsigned int firstChannel, void *data, unsigned int channelCount )
+{
+    unsigned int i;
+    unsigned int channel = firstChannel;
+    unsigned char *p = (unsigned char*)data;
+
+    if( channelCount == 0 )
+        channelCount = bp->outputChannelCount;
+
+    assert( firstChannel < bp->outputChannelCount );
+    assert( firstChannel + channelCount <= bp->outputChannelCount );
+    assert( bp->hostOutputIsInterleaved );
+    
+    for( i=0; i< channelCount; ++i )
+    {
+        PaUtil_SetOutputChannel( bp, channel + i, p, channelCount );
+        p += bp->bytesPerHostOutputSample;
+    }
+}
+
+
+void PaUtil_SetNonInterleavedOutputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data )
+{
+    assert( channel < bp->outputChannelCount );
+    assert( !bp->hostOutputIsInterleaved );
+
+    PaUtil_SetOutputChannel( bp, channel, data, 1 );
+}
+
+
+void PaUtil_Set2ndOutputFrameCount( PaUtilBufferProcessor* bp,
+        unsigned long frameCount )
+{
+    bp->hostOutputFrameCount[1] = frameCount;
+}
+
+
+void PaUtil_Set2ndOutputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data, unsigned int stride )
+{
+    assert( channel < bp->outputChannelCount );
+    assert( data != NULL );
+
+    bp->hostOutputChannels[1][channel].data = data;
+    bp->hostOutputChannels[1][channel].stride = stride;
+}
+
+
+void PaUtil_Set2ndInterleavedOutputChannels( PaUtilBufferProcessor* bp,
+        unsigned int firstChannel, void *data, unsigned int channelCount )
+{
+    unsigned int i;
+    unsigned int channel = firstChannel;
+    unsigned char *p = (unsigned char*)data;
+
+    if( channelCount == 0 )
+        channelCount = bp->outputChannelCount;
+
+    assert( firstChannel < bp->outputChannelCount );
+    assert( firstChannel + channelCount <= bp->outputChannelCount );
+    assert( bp->hostOutputIsInterleaved );
+    
+    for( i=0; i< channelCount; ++i )
+    {
+        PaUtil_Set2ndOutputChannel( bp, channel + i, p, channelCount );
+        p += bp->bytesPerHostOutputSample;
+    }
+}
+
+        
+void PaUtil_Set2ndNonInterleavedOutputChannel( PaUtilBufferProcessor* bp,
+        unsigned int channel, void *data )
+{
+    assert( channel < bp->outputChannelCount );
+    assert( !bp->hostOutputIsInterleaved );
+    
+    PaUtil_Set2ndOutputChannel( bp, channel, data, 1 );
+}
+
+
+void PaUtil_BeginBufferProcessing( PaUtilBufferProcessor* bp,
+        PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags callbackStatusFlags )
+{
+    bp->timeInfo = timeInfo;
+
+    /* the first streamCallback will be called to process samples which are
+        currently in the input buffer before the ones starting at the timeInfo time */
+        
+    bp->timeInfo->inputBufferAdcTime -= bp->framesInTempInputBuffer * bp->samplePeriod;
+    
+    /* We just pass through timeInfo->currentTime provided by the caller. This is
+        not strictly conformant to the word of the spec, since the buffer processor 
+        might call the callback multiple times, and we never refresh currentTime. */
+
+    /* the first streamCallback will be called to generate samples which will be
+        outputted after the frames currently in the output buffer have been
+        outputted. */
+    bp->timeInfo->outputBufferDacTime += bp->framesInTempOutputBuffer * bp->samplePeriod;
+
+    bp->callbackStatusFlags = callbackStatusFlags;
+
+    bp->hostInputFrameCount[1] = 0;
+    bp->hostOutputFrameCount[1] = 0;
+}
+
+
+/*
+    NonAdaptingProcess() is a simple buffer copying adaptor that can handle
+    both full and half duplex copies. It processes framesToProcess frames,
+    broken into blocks bp->framesPerTempBuffer long.
+    This routine can be used when the streamCallback doesn't care what length
+    the buffers are, or when framesToProcess is an integer multiple of
+    bp->framesPerTempBuffer, in which case streamCallback will always be called
+    with bp->framesPerTempBuffer samples.
+*/
+static unsigned long NonAdaptingProcess( PaUtilBufferProcessor *bp,
+        int *streamCallbackResult,
+        PaUtilChannelDescriptor *hostInputChannels,
+        PaUtilChannelDescriptor *hostOutputChannels,
+        unsigned long framesToProcess )
+{
+    void *userInput, *userOutput;
+    unsigned char *srcBytePtr, *destBytePtr;
+    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i;
+    unsigned long frameCount;
+    unsigned long framesToGo = framesToProcess;
+    unsigned long framesProcessed = 0;
+    int skipOutputConvert = 0;
+    int skipInputConvert = 0;
+
+
+    if( *streamCallbackResult == paContinue )
+    {
+        do
+        {
+            frameCount = PA_MIN_( bp->framesPerTempBuffer, framesToGo );
+
+            /* configure user input buffer and convert input data (host -> user) */
+            if( bp->inputChannelCount == 0 )
+            {
+                /* no input */
+                userInput = 0;
+            }
+            else /* there are input channels */
+            {
+                
+                destBytePtr = (unsigned char *)bp->tempInputBuffer;
+
+                if( bp->userInputIsInterleaved )
+                {
+                    destSampleStrideSamples = bp->inputChannelCount;
+                    destChannelStrideBytes = bp->bytesPerUserInputSample;
+
+                    /* process host buffer directly, or use temp buffer if formats differ or host buffer non-interleaved */
+                    if( bp->userInputSampleFormatIsEqualToHost && bp->hostInputIsInterleaved && bp->hostInputChannels[0][0].data)
+                    {
+                        userInput = hostInputChannels[0].data;
+                        destBytePtr = (unsigned char *)hostInputChannels[0].data;
+                        skipInputConvert = 1;
+                    }
+                    else
+                    {
+                        userInput = bp->tempInputBuffer;
+                    }
+                }
+                else /* user input is not interleaved */
+                {
+                    destSampleStrideSamples = 1;
+                    destChannelStrideBytes = frameCount * bp->bytesPerUserInputSample;
+
+                    /* setup non-interleaved ptrs */
+                    if( bp->userInputSampleFormatIsEqualToHost && !bp->hostInputIsInterleaved && bp->hostInputChannels[0][0].data )
+                    {
+                        for( i=0; i<bp->inputChannelCount; ++i )
+                        {
+                            bp->tempInputBufferPtrs[i] = hostInputChannels[i].data;
+                        }
+                        skipInputConvert = 1;
+                    }
+                    else
+                    {
+                        for( i=0; i<bp->inputChannelCount; ++i )
+                        {
+                            bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
+                                i * bp->bytesPerUserInputSample * frameCount;
+                        }
+                    }
+                
+                    userInput = bp->tempInputBufferPtrs;
+                }
+
+                if( !bp->hostInputChannels[0][0].data )
+                {
+                    /* no input was supplied (see PaUtil_SetNoInput), so
+                        zero the input buffer */
+
+                    for( i=0; i<bp->inputChannelCount; ++i )
+                    {
+                        bp->inputZeroer( destBytePtr, destSampleStrideSamples, frameCount );
+                        destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
+                    }
+                }
+                else
+	            {
+                    if( skipInputConvert )
+                    {
+                        for( i=0; i<bp->inputChannelCount; ++i )
+                        {
+                            /* advance src ptr for next iteration */
+                            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                                    frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+                        }
+                    }
+                    else
+                    {
+                        for( i=0; i<bp->inputChannelCount; ++i )
+                        {
+                            bp->inputConverter( destBytePtr, destSampleStrideSamples,
+                                                    hostInputChannels[i].data,
+                                                    hostInputChannels[i].stride,
+                                                    frameCount, &bp->ditherGenerator );
+
+                            destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
+
+                            /* advance src ptr for next iteration */
+                            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                                    frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+                        }
+                    }
+                }
+            }
+
+            /* configure user output buffer */
+            if( bp->outputChannelCount == 0 )
+            {
+                /* no output */
+                userOutput = 0;
+            }
+            else /* there are output channels */
+            {
+                if( bp->userOutputIsInterleaved )
+                {
+                    /* process host buffer directly, or use temp buffer if formats differ or host buffer non-interleaved */
+                    if( bp->userOutputSampleFormatIsEqualToHost && bp->hostOutputIsInterleaved )
+                    {
+                        userOutput = hostOutputChannels[0].data;
+                        skipOutputConvert = 1;
+                    }
+                    else
+                    {
+                        userOutput = bp->tempOutputBuffer;
+                    }
+                }
+                else /* user output is not interleaved */
+                {
+                    if( bp->userOutputSampleFormatIsEqualToHost && !bp->hostOutputIsInterleaved )
+                    {
+                        for( i=0; i<bp->outputChannelCount; ++i )
+                        {
+                            bp->tempOutputBufferPtrs[i] = hostOutputChannels[i].data;
+                        }
+                        skipOutputConvert = 1;
+                    }
+                    else
+                    {
+                        for( i=0; i<bp->outputChannelCount; ++i )
+                        {
+                            bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
+                                i * bp->bytesPerUserOutputSample * frameCount;
+                        }
+                    }
+
+                    userOutput = bp->tempOutputBufferPtrs;
+                }
+            }
+        
+            *streamCallbackResult = bp->streamCallback( userInput, userOutput,
+                    frameCount, bp->timeInfo, bp->callbackStatusFlags, bp->userData );
+
+            if( *streamCallbackResult == paAbort )
+            {
+                /* callback returned paAbort, don't advance framesProcessed
+                        and framesToGo, they will be handled below */
+            }
+            else
+            {
+                bp->timeInfo->inputBufferAdcTime += frameCount * bp->samplePeriod;
+                bp->timeInfo->outputBufferDacTime += frameCount * bp->samplePeriod;
+
+                /* convert output data (user -> host) */
+                
+                if( bp->outputChannelCount != 0 && bp->hostOutputChannels[0][0].data )
+                {
+                    if( skipOutputConvert )
+					{
+						for( i=0; i<bp->outputChannelCount; ++i )
+                    	{
+                        	/* advance dest ptr for next iteration */
+                        	hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                            	    frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+                    	}
+					}
+					else
+					{
+
+                    	srcBytePtr = (unsigned char *)bp->tempOutputBuffer;
+
+                    	if( bp->userOutputIsInterleaved )
+                    	{
+                        	srcSampleStrideSamples = bp->outputChannelCount;
+                        	srcChannelStrideBytes = bp->bytesPerUserOutputSample;
+                    	}
+                    	else /* user output is not interleaved */
+                    	{
+                        	srcSampleStrideSamples = 1;
+                        	srcChannelStrideBytes = frameCount * bp->bytesPerUserOutputSample;
+                    	}
+
+                    	for( i=0; i<bp->outputChannelCount; ++i )
+                    	{
+                        	bp->outputConverter(    hostOutputChannels[i].data,
+                                                	hostOutputChannels[i].stride,
+                                                	srcBytePtr, srcSampleStrideSamples,
+                                                	frameCount, &bp->ditherGenerator );
+
+                        	srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
+
+                        	/* advance dest ptr for next iteration */
+                        	hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                                		frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+                    	}
+					}
+                }
+             
+                framesProcessed += frameCount;
+
+                framesToGo -= frameCount;
+            }
+        }
+        while( framesToGo > 0  && *streamCallbackResult == paContinue );
+    }
+
+    if( framesToGo > 0 )
+    {
+        /* zero any remaining frames output. There will only be remaining frames
+            if the callback has returned paComplete or paAbort */
+
+        frameCount = framesToGo;
+
+        if( bp->outputChannelCount != 0 && bp->hostOutputChannels[0][0].data )
+        {
+            for( i=0; i<bp->outputChannelCount; ++i )
+            {
+                bp->outputZeroer(   hostOutputChannels[i].data,
+                                    hostOutputChannels[i].stride,
+                                    frameCount );
+
+                /* advance dest ptr for next iteration */
+                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+            }
+        }
+
+        framesProcessed += frameCount;
+    }
+
+    return framesProcessed;
+}
+
+
+/*
+    AdaptingInputOnlyProcess() is a half duplex input buffer processor. It
+    converts data from the input buffers into the temporary input buffer,
+    when the temporary input buffer is full, it calls the streamCallback.
+*/
+static unsigned long AdaptingInputOnlyProcess( PaUtilBufferProcessor *bp,
+        int *streamCallbackResult,
+        PaUtilChannelDescriptor *hostInputChannels,
+        unsigned long framesToProcess )
+{
+    void *userInput, *userOutput;
+    unsigned char *destBytePtr;
+    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i;
+    unsigned long frameCount;
+    unsigned long framesToGo = framesToProcess;
+    unsigned long framesProcessed = 0;
+    
+    userOutput = 0;
+
+    do
+    {
+        frameCount = ( bp->framesInTempInputBuffer + framesToGo > bp->framesPerUserBuffer )
+                ? ( bp->framesPerUserBuffer - bp->framesInTempInputBuffer )
+                : framesToGo;
+
+        /* convert frameCount samples into temp buffer */
+
+        if( bp->userInputIsInterleaved )
+        {
+            destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
+                    bp->bytesPerUserInputSample * bp->inputChannelCount *
+                    bp->framesInTempInputBuffer;
+                      
+            destSampleStrideSamples = bp->inputChannelCount;
+            destChannelStrideBytes = bp->bytesPerUserInputSample;
+
+            userInput = bp->tempInputBuffer;
+        }
+        else /* user input is not interleaved */
+        {
+            destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
+                    bp->bytesPerUserInputSample * bp->framesInTempInputBuffer;
+
+            destSampleStrideSamples = 1;
+            destChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
+
+            /* setup non-interleaved ptrs */
+            for( i=0; i<bp->inputChannelCount; ++i )
+            {
+                bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
+                    i * bp->bytesPerUserInputSample * bp->framesPerUserBuffer;
+            }
+                    
+            userInput = bp->tempInputBufferPtrs;
+        }
+
+        for( i=0; i<bp->inputChannelCount; ++i )
+        {
+            bp->inputConverter( destBytePtr, destSampleStrideSamples,
+                                    hostInputChannels[i].data,
+                                    hostInputChannels[i].stride,
+                                    frameCount, &bp->ditherGenerator );
+
+            destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
+
+            /* advance src ptr for next iteration */
+            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                    frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+        }
+
+        bp->framesInTempInputBuffer += frameCount;
+
+        if( bp->framesInTempInputBuffer == bp->framesPerUserBuffer )
+        {
+            /**
+            @todo (non-critical optimisation)
+            The conditional below implements the continue/complete/abort mechanism
+            simply by continuing on iterating through the input buffer, but not
+            passing the data to the callback. With care, the outer loop could be
+            terminated earlier, thus some unneeded conversion cycles would be
+            saved.
+            */
+            if( *streamCallbackResult == paContinue )
+            {
+                bp->timeInfo->outputBufferDacTime = 0;
+
+                *streamCallbackResult = bp->streamCallback( userInput, userOutput,
+                        bp->framesPerUserBuffer, bp->timeInfo,
+                        bp->callbackStatusFlags, bp->userData );
+
+                bp->timeInfo->inputBufferAdcTime += bp->framesPerUserBuffer * bp->samplePeriod;
+            }
+            
+            bp->framesInTempInputBuffer = 0;
+        }
+
+        framesProcessed += frameCount;
+
+        framesToGo -= frameCount;
+    }while( framesToGo > 0 );
+
+    return framesProcessed;
+}
+
+
+/*
+    AdaptingOutputOnlyProcess() is a half duplex output buffer processor.
+    It converts data from the temporary output buffer, to the output buffers,
+    when the temporary output buffer is empty, it calls the streamCallback.
+*/
+static unsigned long AdaptingOutputOnlyProcess( PaUtilBufferProcessor *bp,
+        int *streamCallbackResult,
+        PaUtilChannelDescriptor *hostOutputChannels,
+        unsigned long framesToProcess )
+{
+    void *userInput, *userOutput;
+    unsigned char *srcBytePtr;
+    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int srcChannelStrideBytes;  /* stride from one channel to the next, in bytes */
+    unsigned int i;
+    unsigned long frameCount;
+    unsigned long framesToGo = framesToProcess;
+    unsigned long framesProcessed = 0;
+
+    do
+    {
+        if( bp->framesInTempOutputBuffer == 0 && *streamCallbackResult == paContinue )
+        {
+            userInput = 0;
+
+            /* setup userOutput */
+            if( bp->userOutputIsInterleaved )
+            {
+                userOutput = bp->tempOutputBuffer;
+            }
+            else /* user output is not interleaved */
+            {
+                for( i = 0; i < bp->outputChannelCount; ++i )
+                {
+                    bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
+                            i * bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
+                }
+
+                userOutput = bp->tempOutputBufferPtrs;
+            }
+
+            bp->timeInfo->inputBufferAdcTime = 0;
+            
+            *streamCallbackResult = bp->streamCallback( userInput, userOutput,
+                    bp->framesPerUserBuffer, bp->timeInfo,
+                    bp->callbackStatusFlags, bp->userData );
+
+            if( *streamCallbackResult == paAbort )
+            {
+                /* if the callback returned paAbort, we disregard its output */
+            }
+            else
+            {
+                bp->timeInfo->outputBufferDacTime += bp->framesPerUserBuffer * bp->samplePeriod;
+
+                bp->framesInTempOutputBuffer = bp->framesPerUserBuffer;
+            }
+        }
+
+        if( bp->framesInTempOutputBuffer > 0 )
+        {
+            /* convert frameCount frames from user buffer to host buffer */
+
+            frameCount = PA_MIN_( bp->framesInTempOutputBuffer, framesToGo );
+
+            if( bp->userOutputIsInterleaved )
+            {
+                srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
+                        bp->bytesPerUserOutputSample * bp->outputChannelCount *
+                        (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
+
+                srcSampleStrideSamples = bp->outputChannelCount;
+                srcChannelStrideBytes = bp->bytesPerUserOutputSample;
+            }
+            else /* user output is not interleaved */
+            {
+                srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
+                        bp->bytesPerUserOutputSample *
+                        (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
+                            
+                srcSampleStrideSamples = 1;
+                srcChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
+            }
+
+            for( i=0; i<bp->outputChannelCount; ++i )
+            {
+                bp->outputConverter(    hostOutputChannels[i].data,
+                                        hostOutputChannels[i].stride,
+                                        srcBytePtr, srcSampleStrideSamples,
+                                        frameCount, &bp->ditherGenerator );
+
+                srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
+
+                /* advance dest ptr for next iteration */
+                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+            }
+
+            bp->framesInTempOutputBuffer -= frameCount;
+        }
+        else
+        {
+            /* no more user data is available because the callback has returned
+                paComplete or paAbort. Fill the remainder of the host buffer
+                with zeros.
+            */
+
+            frameCount = framesToGo;
+
+            for( i=0; i<bp->outputChannelCount; ++i )
+            {
+                bp->outputZeroer(   hostOutputChannels[i].data,
+                                    hostOutputChannels[i].stride,
+                                    frameCount );
+
+                /* advance dest ptr for next iteration */
+                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+            }
+        }
+        
+        framesProcessed += frameCount;
+        
+        framesToGo -= frameCount;
+
+    }while( framesToGo > 0 );
+
+    return framesProcessed;
+}
+
+/* CopyTempOutputBuffersToHostOutputBuffers is called from AdaptingProcess to copy frames from
+	tempOutputBuffer to hostOutputChannels. This includes data conversion
+	and interleaving. 
+*/
+static void CopyTempOutputBuffersToHostOutputBuffers( PaUtilBufferProcessor *bp)
+{
+    unsigned long maxFramesToCopy;
+    PaUtilChannelDescriptor *hostOutputChannels;
+    unsigned int frameCount;
+    unsigned char *srcBytePtr;
+    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i;
+
+     /* copy frames from user to host output buffers */
+     while( bp->framesInTempOutputBuffer > 0 &&
+             ((bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]) > 0) )
+     {
+         maxFramesToCopy = bp->framesInTempOutputBuffer;
+
+         /* select the output buffer set (1st or 2nd) */
+         if( bp->hostOutputFrameCount[0] > 0 )
+         {
+             hostOutputChannels = bp->hostOutputChannels[0];
+             frameCount = PA_MIN_( bp->hostOutputFrameCount[0], maxFramesToCopy );
+         }
+         else
+         {
+             hostOutputChannels = bp->hostOutputChannels[1];
+             frameCount = PA_MIN_( bp->hostOutputFrameCount[1], maxFramesToCopy );
+         }
+
+         if( bp->userOutputIsInterleaved )
+         {
+             srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
+                     bp->bytesPerUserOutputSample * bp->outputChannelCount *
+                     (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
+                         
+             srcSampleStrideSamples = bp->outputChannelCount;
+             srcChannelStrideBytes = bp->bytesPerUserOutputSample;
+         }
+         else /* user output is not interleaved */
+         {
+             srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
+                     bp->bytesPerUserOutputSample *
+                     (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
+
+             srcSampleStrideSamples = 1;
+             srcChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
+         }
+
+         for( i=0; i<bp->outputChannelCount; ++i )
+         {
+             assert( hostOutputChannels[i].data != NULL );
+             bp->outputConverter(    hostOutputChannels[i].data,
+                                     hostOutputChannels[i].stride,
+                                     srcBytePtr, srcSampleStrideSamples,
+                                     frameCount, &bp->ditherGenerator );
+
+             srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
+
+             /* advance dest ptr for next iteration */
+             hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                     frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+         }
+
+         if( bp->hostOutputFrameCount[0] > 0 )
+             bp->hostOutputFrameCount[0] -= frameCount;
+         else
+             bp->hostOutputFrameCount[1] -= frameCount;
+
+         bp->framesInTempOutputBuffer -= frameCount;
+     }
+}
+
+/*
+    AdaptingProcess is a full duplex adapting buffer processor. It converts
+    data from the temporary output buffer into the host output buffers, then
+    from the host input buffers into the temporary input buffers. Calling the
+    streamCallback when necessary.
+    When processPartialUserBuffers is 0, all available input data will be
+    consumed and all available output space will be filled. When
+    processPartialUserBuffers is non-zero, as many full user buffers
+    as possible will be processed, but partial buffers will not be consumed.
+*/
+static unsigned long AdaptingProcess( PaUtilBufferProcessor *bp,
+        int *streamCallbackResult, int processPartialUserBuffers )
+{
+    void *userInput, *userOutput;
+    unsigned long framesProcessed = 0;
+    unsigned long framesAvailable;
+    unsigned long endProcessingMinFrameCount;
+    unsigned long maxFramesToCopy;
+    PaUtilChannelDescriptor *hostInputChannels, *hostOutputChannels;
+    unsigned int frameCount;
+    unsigned char *destBytePtr;
+    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i, j;
+ 
+
+    framesAvailable = bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1];/* this is assumed to be the same as the output buffer's frame count */
+
+    if( processPartialUserBuffers )
+        endProcessingMinFrameCount = 0;
+    else
+        endProcessingMinFrameCount = (bp->framesPerUserBuffer - 1);
+
+    /* Fill host output with remaining frames in user output (tempOutputBuffer) */
+    CopyTempOutputBuffersToHostOutputBuffers( bp );		  	
+
+    while( framesAvailable > endProcessingMinFrameCount ) 
+    {
+
+        if( bp->framesInTempOutputBuffer == 0 && *streamCallbackResult != paContinue )
+        {
+            /* the callback will not be called any more, so zero what remains
+                of the host output buffers */
+
+            for( i=0; i<2; ++i )
+            {
+                frameCount = bp->hostOutputFrameCount[i];
+                if( frameCount > 0 )
+                {
+                    hostOutputChannels = bp->hostOutputChannels[i];
+                    
+                    for( j=0; j<bp->outputChannelCount; ++j )
+                    {
+                        bp->outputZeroer(   hostOutputChannels[j].data,
+                                            hostOutputChannels[j].stride,
+                                            frameCount );
+
+                        /* advance dest ptr for next iteration  */
+                        hostOutputChannels[j].data = ((unsigned char*)hostOutputChannels[j].data) +
+                                frameCount * hostOutputChannels[j].stride * bp->bytesPerHostOutputSample;
+                    }
+                    bp->hostOutputFrameCount[i] = 0;
+                }
+            }
+        }          
+
+
+        /* copy frames from host to user input buffers */
+        while( bp->framesInTempInputBuffer < bp->framesPerUserBuffer &&
+                ((bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1]) > 0) )
+        {
+            maxFramesToCopy = bp->framesPerUserBuffer - bp->framesInTempInputBuffer;
+
+            /* select the input buffer set (1st or 2nd) */
+            if( bp->hostInputFrameCount[0] > 0 )
+            {
+                hostInputChannels = bp->hostInputChannels[0];
+                frameCount = PA_MIN_( bp->hostInputFrameCount[0], maxFramesToCopy );
+            }
+            else
+            {
+                hostInputChannels = bp->hostInputChannels[1];
+                frameCount = PA_MIN_( bp->hostInputFrameCount[1], maxFramesToCopy );
+            }
+
+            /* configure conversion destination pointers */
+            if( bp->userInputIsInterleaved )
+            {
+                destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
+                        bp->bytesPerUserInputSample * bp->inputChannelCount *
+                        bp->framesInTempInputBuffer;
+
+                destSampleStrideSamples = bp->inputChannelCount;
+                destChannelStrideBytes = bp->bytesPerUserInputSample;
+            }
+            else /* user input is not interleaved */
+            {
+                destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
+                        bp->bytesPerUserInputSample * bp->framesInTempInputBuffer;
+
+                destSampleStrideSamples = 1;
+                destChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
+            }
+
+            for( i=0; i<bp->inputChannelCount; ++i )
+            {
+                bp->inputConverter( destBytePtr, destSampleStrideSamples,
+                                        hostInputChannels[i].data,
+                                        hostInputChannels[i].stride,
+                                        frameCount, &bp->ditherGenerator );
+
+                destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
+
+                /* advance src ptr for next iteration */
+                hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                        frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+            }
+
+            if( bp->hostInputFrameCount[0] > 0 )
+                bp->hostInputFrameCount[0] -= frameCount;
+            else
+                bp->hostInputFrameCount[1] -= frameCount;
+                
+            bp->framesInTempInputBuffer += frameCount;
+
+            /* update framesAvailable and framesProcessed based on input consumed
+                unless something is very wrong this will also correspond to the
+                amount of output generated */
+            framesAvailable -= frameCount;
+            framesProcessed += frameCount;
+        }
+
+        /* call streamCallback */
+        if( bp->framesInTempInputBuffer == bp->framesPerUserBuffer &&
+            bp->framesInTempOutputBuffer == 0 )
+        {
+            if( *streamCallbackResult == paContinue )
+            {
+                /* setup userInput */
+                if( bp->userInputIsInterleaved )
+                {
+                    userInput = bp->tempInputBuffer;
+                }
+                else /* user input is not interleaved */
+                {
+                    for( i = 0; i < bp->inputChannelCount; ++i )
+                    {
+                        bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
+                                i * bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
+                    }
+
+                    userInput = bp->tempInputBufferPtrs;
+                }
+
+                /* setup userOutput */
+                if( bp->userOutputIsInterleaved )
+                {
+                    userOutput = bp->tempOutputBuffer;
+                }
+                else /* user output is not interleaved */
+                {
+                    for( i = 0; i < bp->outputChannelCount; ++i )
+                    {
+                        bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
+                                i * bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
+                    }
+
+                    userOutput = bp->tempOutputBufferPtrs;
+                }
+
+                /* call streamCallback */
+
+                *streamCallbackResult = bp->streamCallback( userInput, userOutput,
+                        bp->framesPerUserBuffer, bp->timeInfo,
+                        bp->callbackStatusFlags, bp->userData );
+
+                bp->timeInfo->inputBufferAdcTime += bp->framesPerUserBuffer * bp->samplePeriod;
+                bp->timeInfo->outputBufferDacTime += bp->framesPerUserBuffer * bp->samplePeriod;
+
+                bp->framesInTempInputBuffer = 0;
+
+                if( *streamCallbackResult == paAbort )
+                    bp->framesInTempOutputBuffer = 0;
+                else
+                    bp->framesInTempOutputBuffer = bp->framesPerUserBuffer;
+            }
+            else
+            {
+                /* paComplete or paAbort has already been called. */
+
+                bp->framesInTempInputBuffer = 0;
+            }
+        }
+
+        /* copy frames from user (tempOutputBuffer) to host output buffers (hostOutputChannels) 
+           Means to process the user output provided by the callback. Has to be called after
+            each callback. */
+        CopyTempOutputBuffersToHostOutputBuffers( bp );		  	
+
+    }
+    
+    return framesProcessed;
+}
+
+
+unsigned long PaUtil_EndBufferProcessing( PaUtilBufferProcessor* bp, int *streamCallbackResult )
+{
+    unsigned long framesToProcess, framesToGo;
+    unsigned long framesProcessed = 0;
+    
+    if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0
+            && bp->hostInputChannels[0][0].data /* input was supplied (see PaUtil_SetNoInput) */
+            && bp->hostOutputChannels[0][0].data /* output was supplied (see PaUtil_SetNoOutput) */ )
+    {
+        assert( (bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1]) ==
+                (bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]) );
+    }
+
+    assert( *streamCallbackResult == paContinue
+            || *streamCallbackResult == paComplete
+            || *streamCallbackResult == paAbort ); /* don't forget to pass in a valid callback result value */
+
+    if( bp->useNonAdaptingProcess )
+    {
+        if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0 )
+        {
+            /* full duplex non-adapting process, splice buffers if they are
+                different lengths */
+
+            framesToGo = bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]; /* relies on assert above for input/output equivalence */
+
+            do{
+                unsigned long noInputInputFrameCount;
+                unsigned long *hostInputFrameCount;
+                PaUtilChannelDescriptor *hostInputChannels;
+                unsigned long noOutputOutputFrameCount;
+                unsigned long *hostOutputFrameCount;
+                PaUtilChannelDescriptor *hostOutputChannels;
+                unsigned long framesProcessedThisIteration;
+
+                if( !bp->hostInputChannels[0][0].data )
+                {
+                    /* no input was supplied (see PaUtil_SetNoInput)
+                        NonAdaptingProcess knows how to deal with this
+                    */
+                    noInputInputFrameCount = framesToGo;
+                    hostInputFrameCount = &noInputInputFrameCount;
+                    hostInputChannels = 0;
+                }
+                else if( bp->hostInputFrameCount[0] != 0 )
+                {
+                    hostInputFrameCount = &bp->hostInputFrameCount[0];
+                    hostInputChannels = bp->hostInputChannels[0];
+                }
+                else
+                {
+                    hostInputFrameCount = &bp->hostInputFrameCount[1];
+                    hostInputChannels = bp->hostInputChannels[1];
+                }
+
+                if( !bp->hostOutputChannels[0][0].data )
+                {
+                    /* no output was supplied (see PaUtil_SetNoOutput)
+                        NonAdaptingProcess knows how to deal with this
+                    */
+                    noOutputOutputFrameCount = framesToGo;
+                    hostOutputFrameCount = &noOutputOutputFrameCount;
+                    hostOutputChannels = 0;
+                }
+                if( bp->hostOutputFrameCount[0] != 0 )
+                {
+                    hostOutputFrameCount = &bp->hostOutputFrameCount[0];
+                    hostOutputChannels = bp->hostOutputChannels[0];
+                }
+                else
+                {
+                    hostOutputFrameCount = &bp->hostOutputFrameCount[1];
+                    hostOutputChannels = bp->hostOutputChannels[1];
+                }
+
+                framesToProcess = PA_MIN_( *hostInputFrameCount,
+                                       *hostOutputFrameCount );
+
+                assert( framesToProcess != 0 );
+                
+                framesProcessedThisIteration = NonAdaptingProcess( bp, streamCallbackResult,
+                        hostInputChannels, hostOutputChannels,
+                        framesToProcess );                                       
+
+                *hostInputFrameCount -= framesProcessedThisIteration;
+                *hostOutputFrameCount -= framesProcessedThisIteration;
+
+                framesProcessed += framesProcessedThisIteration;
+                framesToGo -= framesProcessedThisIteration;
+                
+            }while( framesToGo > 0 );
+        }
+        else
+        {
+            /* half duplex non-adapting process, just process 1st and 2nd buffer */
+            /* process first buffer */
+
+            framesToProcess = (bp->inputChannelCount != 0)
+                            ? bp->hostInputFrameCount[0]
+                            : bp->hostOutputFrameCount[0];
+
+            framesProcessed = NonAdaptingProcess( bp, streamCallbackResult,
+                        bp->hostInputChannels[0], bp->hostOutputChannels[0],
+                        framesToProcess );
+
+            /* process second buffer if provided */
+    
+            framesToProcess = (bp->inputChannelCount != 0)
+                            ? bp->hostInputFrameCount[1]
+                            : bp->hostOutputFrameCount[1];
+            if( framesToProcess > 0 )
+            {
+                framesProcessed += NonAdaptingProcess( bp, streamCallbackResult,
+                    bp->hostInputChannels[1], bp->hostOutputChannels[1],
+                    framesToProcess );
+            }
+        }
+    }
+    else /* block adaption necessary*/
+    {
+
+        if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0 )
+        {
+            /* full duplex */
+            
+            if( bp->hostBufferSizeMode == paUtilVariableHostBufferSizePartialUsageAllowed  )
+            {
+                framesProcessed = AdaptingProcess( bp, streamCallbackResult,
+                        0 /* dont process partial user buffers */ );
+            }
+            else
+            {
+                framesProcessed = AdaptingProcess( bp, streamCallbackResult,
+                        1 /* process partial user buffers */ );
+            }
+        }
+        else if( bp->inputChannelCount != 0 )
+        {
+            /* input only */
+            framesToProcess = bp->hostInputFrameCount[0];
+
+            framesProcessed = AdaptingInputOnlyProcess( bp, streamCallbackResult,
+                        bp->hostInputChannels[0], framesToProcess );
+
+            framesToProcess = bp->hostInputFrameCount[1];
+            if( framesToProcess > 0 )
+            {
+                framesProcessed += AdaptingInputOnlyProcess( bp, streamCallbackResult,
+                        bp->hostInputChannels[1], framesToProcess );
+            }
+        }
+        else
+        {
+            /* output only */
+            framesToProcess = bp->hostOutputFrameCount[0];
+
+            framesProcessed = AdaptingOutputOnlyProcess( bp, streamCallbackResult,
+                        bp->hostOutputChannels[0], framesToProcess );
+
+            framesToProcess = bp->hostOutputFrameCount[1];
+            if( framesToProcess > 0 )
+            {
+                framesProcessed += AdaptingOutputOnlyProcess( bp, streamCallbackResult,
+                        bp->hostOutputChannels[1], framesToProcess );
+            }
+        }
+    }
+
+    return framesProcessed;
+}
+
+
+int PaUtil_IsBufferProcessorOutputEmpty( PaUtilBufferProcessor* bp )
+{
+    return (bp->framesInTempOutputBuffer) ? 0 : 1;
+} 
+
+
+unsigned long PaUtil_CopyInput( PaUtilBufferProcessor* bp,
+        void **buffer, unsigned long frameCount )
+{
+    PaUtilChannelDescriptor *hostInputChannels;
+    unsigned int framesToCopy;
+    unsigned char *destBytePtr;
+    void **nonInterleavedDestPtrs;
+    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i;
+
+    hostInputChannels = bp->hostInputChannels[0];
+    framesToCopy = PA_MIN_( bp->hostInputFrameCount[0], frameCount );
+
+    if( bp->userInputIsInterleaved )
+    {
+        destBytePtr = (unsigned char*)*buffer;
+        
+        destSampleStrideSamples = bp->inputChannelCount;
+        destChannelStrideBytes = bp->bytesPerUserInputSample;
+
+        for( i=0; i<bp->inputChannelCount; ++i )
+        {
+            bp->inputConverter( destBytePtr, destSampleStrideSamples,
+                                hostInputChannels[i].data,
+                                hostInputChannels[i].stride,
+                                framesToCopy, &bp->ditherGenerator );
+
+            destBytePtr += destChannelStrideBytes;  /* skip to next source channel */
+
+            /* advance dest ptr for next iteration */
+            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                    framesToCopy * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+        }
+
+        /* advance callers dest pointer (buffer) */
+        *buffer = ((unsigned char *)*buffer) +
+                framesToCopy * bp->inputChannelCount * bp->bytesPerUserInputSample;
+    }
+    else
+    {
+        /* user input is not interleaved */
+        
+        nonInterleavedDestPtrs = (void**)*buffer;
+
+        destSampleStrideSamples = 1;
+        
+        for( i=0; i<bp->inputChannelCount; ++i )
+        {
+            destBytePtr = (unsigned char*)nonInterleavedDestPtrs[i];
+
+            bp->inputConverter( destBytePtr, destSampleStrideSamples,
+                                hostInputChannels[i].data,
+                                hostInputChannels[i].stride,
+                                framesToCopy, &bp->ditherGenerator );
+
+            /* advance callers dest pointer (nonInterleavedDestPtrs[i]) */
+            destBytePtr += bp->bytesPerUserInputSample * framesToCopy;
+            nonInterleavedDestPtrs[i] = destBytePtr;
+            
+            /* advance dest ptr for next iteration */
+            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
+                    framesToCopy * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
+        }
+    }
+
+    bp->hostInputFrameCount[0] -= framesToCopy;
+    
+    return framesToCopy;
+}
+
+unsigned long PaUtil_CopyOutput( PaUtilBufferProcessor* bp,
+        const void ** buffer, unsigned long frameCount )
+{
+    PaUtilChannelDescriptor *hostOutputChannels;
+    unsigned int framesToCopy;
+    unsigned char *srcBytePtr;
+    void **nonInterleavedSrcPtrs;
+    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
+    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
+    unsigned int i;
+
+    hostOutputChannels = bp->hostOutputChannels[0];
+    framesToCopy = PA_MIN_( bp->hostOutputFrameCount[0], frameCount );
+
+    if( bp->userOutputIsInterleaved )
+    {
+        srcBytePtr = (unsigned char*)*buffer;
+        
+        srcSampleStrideSamples = bp->outputChannelCount;
+        srcChannelStrideBytes = bp->bytesPerUserOutputSample;
+
+        for( i=0; i<bp->outputChannelCount; ++i )
+        {
+            bp->outputConverter(    hostOutputChannels[i].data,
+                                    hostOutputChannels[i].stride,
+                                    srcBytePtr, srcSampleStrideSamples,
+                                    framesToCopy, &bp->ditherGenerator );
+
+            srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
+
+            /* advance dest ptr for next iteration */
+            hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                    framesToCopy * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+        }
+
+        /* advance callers source pointer (buffer) */
+        *buffer = ((unsigned char *)*buffer) +
+                framesToCopy * bp->outputChannelCount * bp->bytesPerUserOutputSample;
+
+    }
+    else
+    {
+        /* user output is not interleaved */
+        
+        nonInterleavedSrcPtrs = (void**)*buffer;
+
+        srcSampleStrideSamples = 1;
+        
+        for( i=0; i<bp->outputChannelCount; ++i )
+        {
+            srcBytePtr = (unsigned char*)nonInterleavedSrcPtrs[i];
+            
+            bp->outputConverter(    hostOutputChannels[i].data,
+                                    hostOutputChannels[i].stride,
+                                    srcBytePtr, srcSampleStrideSamples,
+                                    framesToCopy, &bp->ditherGenerator );
+
+
+            /* advance callers source pointer (nonInterleavedSrcPtrs[i]) */
+            srcBytePtr += bp->bytesPerUserOutputSample * framesToCopy;
+            nonInterleavedSrcPtrs[i] = srcBytePtr;
+            
+            /* advance dest ptr for next iteration */
+            hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                    framesToCopy * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+        }
+    }
+
+    bp->hostOutputFrameCount[0] += framesToCopy;
+    
+    return framesToCopy;
+}
+
+
+unsigned long PaUtil_ZeroOutput( PaUtilBufferProcessor* bp, unsigned long frameCount )
+{
+    PaUtilChannelDescriptor *hostOutputChannels;
+    unsigned int framesToZero;
+    unsigned int i;
+
+    hostOutputChannels = bp->hostOutputChannels[0];
+    framesToZero = PA_MIN_( bp->hostOutputFrameCount[0], frameCount );
+
+    for( i=0; i<bp->outputChannelCount; ++i )
+    {
+        bp->outputZeroer(   hostOutputChannels[i].data,
+                            hostOutputChannels[i].stride,
+                            framesToZero );
+
+
+        /* advance dest ptr for next iteration */
+        hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
+                framesToZero * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
+    }
+
+    bp->hostOutputFrameCount[0] += framesToZero;
+    
+    return framesToZero;
+}
diff --git a/Externals/portaudio/src/common/pa_process.h b/Externals/portaudio/src/common/pa_process.h
new file mode 100644
index 0000000000..4d5f56ad63
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_process.h
@@ -0,0 +1,754 @@
+#ifndef PA_PROCESS_H
+#define PA_PROCESS_H
+/*
+ * $Id: pa_process.h 1668 2011-05-02 17:07:11Z rossb $
+ * Portable Audio I/O Library callback buffer processing adapters
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+ 
+/** @file
+ @ingroup common_src
+
+ @brief Buffer Processor prototypes. A Buffer Processor performs buffer length
+ adaption, coordinates sample format conversion, and interleaves/deinterleaves
+ channels.
+
+ <h3>Overview</h3>
+
+ The "Buffer Processor" (PaUtilBufferProcessor) manages conversion of audio
+ data from host buffers to user buffers and back again. Where required, the
+ buffer processor takes care of converting between host and user sample formats,
+ interleaving and deinterleaving multichannel buffers, and adapting between host
+ and user buffers with different lengths. The buffer processor may be used with
+ full and half duplex streams, for both callback streams and blocking read/write
+ streams.
+
+ One of the important capabilities provided by the buffer processor is
+ the ability to adapt between user and host buffer sizes of different lengths
+ with minimum latency. Although this task is relatively easy to perform when
+ the host buffer size is an integer multiple of the user buffer size, the
+ problem is more complicated when this is not the case - especially for
+ full-duplex callback streams. Where necessary the adaption is implemented by
+ internally buffering some input and/or output data. The buffer adation
+ algorithm used by the buffer processor was originally implemented by
+ Stephan Letz for the ASIO version of PortAudio, and is described in his
+ Callback_adaption_.pdf which is included in the distribution.
+
+ The buffer processor performs sample conversion using the functions provided
+ by pa_converters.c.
+
+ The following sections provide an overview of how to use the buffer processor.
+ Interested readers are advised to consult the host API implementations for
+ examples of buffer processor usage.
+ 
+
+ <h4>Initialization, resetting and termination</h4>
+
+ When a stream is opened, the buffer processor should be initialized using
+ PaUtil_InitializeBufferProcessor. This function initializes internal state
+ and allocates temporary buffers as neccesary according to the supplied
+ configuration parameters. Some of the parameters correspond to those requested
+ by the user in their call to Pa_OpenStream(), others reflect the requirements
+ of the host API implementation - they indicate host buffer sizes, formats,
+ and the type of buffering which the Host API uses. The buffer processor should
+ be initialized for callback streams and blocking read/write streams.
+
+ Call PaUtil_ResetBufferProcessor to clear any sample data which is present
+ in the buffer processor before starting to use it (for example when
+ Pa_StartStream is called).
+
+ When the buffer processor is no longer used call
+ PaUtil_TerminateBufferProcessor.
+
+ 
+ <h4>Using the buffer processor for a callback stream</h4>
+
+ The buffer processor's role in a callback stream is to take host input buffers
+ process them with the stream callback, and fill host output buffers. For a
+ full duplex stream, the buffer processor handles input and output simultaneously
+ due to the requirements of the minimum-latency buffer adation algorithm.
+
+ When a host buffer becomes available, the implementation should call
+ the buffer processor to process the buffer. The buffer processor calls the
+ stream callback to consume and/or produce audio data as necessary. The buffer
+ processor will convert sample formats, interleave/deinterleave channels,
+ and slice or chunk the data to the appropriate buffer lengths according to
+ the requirements of the stream callback and the host API.
+
+ To process a host buffer (or a pair of host buffers for a full-duplex stream)
+ use the following calling sequence:
+
+ -# Call PaUtil_BeginBufferProcessing
+ -# For a stream which takes input:
+    - Call PaUtil_SetInputFrameCount with the number of frames in the host input
+        buffer.
+    - Call one of the following functions one or more times to tell the
+        buffer processor about the host input buffer(s): PaUtil_SetInputChannel,
+        PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel.
+        Which function you call will depend on whether the host buffer(s) are
+        interleaved or not.
+    - If the available host data is split accross two buffers (for example a
+        data range at the end of a circular buffer and another range at the
+        beginning of the circular buffer), also call
+        PaUtil_Set2ndInputFrameCount, PaUtil_Set2ndInputChannel,
+        PaUtil_Set2ndInterleavedInputChannels,
+        PaUtil_Set2ndNonInterleavedInputChannel as necessary to tell the buffer
+        processor about the second buffer.
+ -# For a stream which generates output:
+    - Call PaUtil_SetOutputFrameCount with the number of frames in the host
+        output buffer.
+    - Call one of the following functions one or more times to tell the
+        buffer processor about the host output buffer(s): PaUtil_SetOutputChannel,
+        PaUtil_SetInterleavedOutputChannels, PaUtil_SetNonInterleavedOutputChannel.
+        Which function you call will depend on whether the host buffer(s) are
+        interleaved or not.
+    - If the available host output buffer space is split accross two buffers
+        (for example a data range at the end of a circular buffer and another
+        range at the beginning of the circular buffer), call
+        PaUtil_Set2ndOutputFrameCount, PaUtil_Set2ndOutputChannel,
+        PaUtil_Set2ndInterleavedOutputChannels,
+        PaUtil_Set2ndNonInterleavedOutputChannel as necessary to tell the buffer
+        processor about the second buffer.
+ -# Call PaUtil_EndBufferProcessing, this function performs the actual data
+    conversion and processing.
+
+
+ <h4>Using the buffer processor for a blocking read/write stream</h4>
+
+ Blocking read/write streams use the buffer processor to convert and copy user
+ output data to a host buffer, and to convert and copy host input data to
+ the user's buffer. The buffer processor does not perform any buffer adaption.
+ When using the buffer processor in a blocking read/write stream the input and
+ output conversion are performed separately by the PaUtil_CopyInput and
+ PaUtil_CopyOutput functions.
+
+ To copy data from a host input buffer to the buffer(s) which the user supplies
+ to Pa_ReadStream, use the following calling sequence.
+
+ - Repeat the following three steps until the user buffer(s) have been filled
+    with samples from the host input buffers:
+     -# Call PaUtil_SetInputFrameCount with the number of frames in the host
+        input buffer.
+     -# Call one of the following functions one or more times to tell the
+        buffer processor about the host input buffer(s): PaUtil_SetInputChannel,
+        PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel.
+        Which function you call will depend on whether the host buffer(s) are
+        interleaved or not.
+     -# Call PaUtil_CopyInput with the user buffer pointer (or a copy of the
+        array of buffer pointers for a non-interleaved stream) passed to
+        Pa_ReadStream, along with the number of frames in the user buffer(s).
+        Be careful to pass a <i>copy</i> of the user buffer pointers to
+        PaUtil_CopyInput because PaUtil_CopyInput advances the pointers to
+        the start of the next region to copy.
+ - PaUtil_CopyInput will not copy more data than is available in the
+    host buffer(s), so the above steps need to be repeated until the user
+    buffer(s) are full.
+
+ 
+ To copy data to the host output buffer from the user buffers(s) supplied
+ to Pa_WriteStream use the following calling sequence.
+
+ - Repeat the following three steps until all frames from the user buffer(s)
+    have been copied to the host API:
+     -# Call PaUtil_SetOutputFrameCount with the number of frames in the host
+        output buffer.
+     -# Call one of the following functions one or more times to tell the
+        buffer processor about the host output buffer(s): PaUtil_SetOutputChannel,
+        PaUtil_SetInterleavedOutputChannels, PaUtil_SetNonInterleavedOutputChannel.
+        Which function you call will depend on whether the host buffer(s) are
+        interleaved or not.
+     -# Call PaUtil_CopyOutput with the user buffer pointer (or a copy of the
+        array of buffer pointers for a non-interleaved stream) passed to
+        Pa_WriteStream, along with the number of frames in the user buffer(s).
+        Be careful to pass a <i>copy</i> of the user buffer pointers to 
+        PaUtil_CopyOutput because PaUtil_CopyOutput advances the pointers to
+        the start of the next region to copy.
+ - PaUtil_CopyOutput will not copy more data than fits in the host buffer(s),
+    so the above steps need to be repeated until all user data is copied.
+*/
+
+
+#include "portaudio.h"
+#include "pa_converters.h"
+#include "pa_dither.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+/** @brief Mode flag passed to PaUtil_InitializeBufferProcessor indicating the type
+ of buffering that the host API uses.
+
+ The mode used depends on whether the host API or the implementation manages
+ the buffers, and how these buffers are used (scatter gather, circular buffer).
+*/
+typedef enum {
+/** The host buffer size is a fixed known size. */
+    paUtilFixedHostBufferSize,
+
+/** The host buffer size may vary, but has a known maximum size. */
+    paUtilBoundedHostBufferSize,
+
+/** Nothing is known about the host buffer size. */
+    paUtilUnknownHostBufferSize,
+
+/** The host buffer size varies, and the client does not require the buffer
+ processor to consume all of the input and fill all of the output buffer. This
+ is useful when the implementation has access to the host API's circular buffer
+ and only needs to consume/fill some of it, not necessarily all of it, with each
+ call to the buffer processor. This is the only mode where
+ PaUtil_EndBufferProcessing() may not consume the whole buffer.
+*/
+    paUtilVariableHostBufferSizePartialUsageAllowed
+}PaUtilHostBufferSizeMode;
+
+
+/** @brief An auxilliary data structure used internally by the buffer processor
+ to represent host input and output buffers. */
+typedef struct PaUtilChannelDescriptor{
+    void *data;
+    unsigned int stride;  /**< stride in samples, not bytes */
+}PaUtilChannelDescriptor;
+
+
+/** @brief The main buffer processor data structure.
+
+ Allocate one of these, initialize it with PaUtil_InitializeBufferProcessor
+ and terminate it with PaUtil_TerminateBufferProcessor.
+*/
+typedef struct {
+    unsigned long framesPerUserBuffer;
+    unsigned long framesPerHostBuffer;
+
+    PaUtilHostBufferSizeMode hostBufferSizeMode;
+    int useNonAdaptingProcess;
+    int userOutputSampleFormatIsEqualToHost;
+    int userInputSampleFormatIsEqualToHost;
+    unsigned long framesPerTempBuffer;
+
+    unsigned int inputChannelCount;
+    unsigned int bytesPerHostInputSample;
+    unsigned int bytesPerUserInputSample;
+    int userInputIsInterleaved;
+    PaUtilConverter *inputConverter;
+    PaUtilZeroer *inputZeroer;
+    
+    unsigned int outputChannelCount;
+    unsigned int bytesPerHostOutputSample;
+    unsigned int bytesPerUserOutputSample;
+    int userOutputIsInterleaved;
+    PaUtilConverter *outputConverter;
+    PaUtilZeroer *outputZeroer;
+
+    unsigned long initialFramesInTempInputBuffer;
+    unsigned long initialFramesInTempOutputBuffer;
+
+    void *tempInputBuffer;          /**< used for slips, block adaption, and conversion. */
+    void **tempInputBufferPtrs;     /**< storage for non-interleaved buffer pointers, NULL for interleaved user input */
+    unsigned long framesInTempInputBuffer; /**< frames remaining in input buffer from previous adaption iteration */
+
+    void *tempOutputBuffer;         /**< used for slips, block adaption, and conversion. */
+    void **tempOutputBufferPtrs;    /**< storage for non-interleaved buffer pointers, NULL for interleaved user output */
+    unsigned long framesInTempOutputBuffer; /**< frames remaining in input buffer from previous adaption iteration */
+
+    PaStreamCallbackTimeInfo *timeInfo;
+
+    PaStreamCallbackFlags callbackStatusFlags;
+
+    int hostInputIsInterleaved;
+    unsigned long hostInputFrameCount[2];
+    PaUtilChannelDescriptor *hostInputChannels[2]; /**< pointers to arrays of channel descriptors.
+                                                        pointers are NULL for half-duplex output processing.
+                                                        hostInputChannels[i].data is NULL when the caller
+                                                        calls PaUtil_SetNoInput()
+                                                        */
+    int hostOutputIsInterleaved;
+    unsigned long hostOutputFrameCount[2];
+    PaUtilChannelDescriptor *hostOutputChannels[2]; /**< pointers to arrays of channel descriptors.
+                                                         pointers are NULL for half-duplex input processing.
+                                                         hostOutputChannels[i].data is NULL when the caller
+                                                         calls PaUtil_SetNoOutput()
+                                                         */
+
+    PaUtilTriangularDitherGenerator ditherGenerator;
+
+    double samplePeriod;
+
+    PaStreamCallback *streamCallback;
+    void *userData;
+} PaUtilBufferProcessor;
+
+
+/** @name Initialization, termination, resetting and info */
+/*@{*/
+
+/** Initialize a buffer processor's representation stored in a
+ PaUtilBufferProcessor structure. Be sure to call
+ PaUtil_TerminateBufferProcessor after finishing with a buffer processor.
+
+ @param bufferProcessor The buffer processor structure to initialize.
+
+ @param inputChannelCount The number of input channels as passed to
+ Pa_OpenStream or 0 for an output-only stream.
+
+ @param userInputSampleFormat Format of user input samples, as passed to
+ Pa_OpenStream. This parameter is ignored for ouput-only streams.
+ 
+ @param hostInputSampleFormat Format of host input samples. This parameter is
+ ignored for output-only streams. See note about host buffer interleave below.
+
+ @param outputChannelCount The number of output channels as passed to
+ Pa_OpenStream or 0 for an input-only stream.
+
+ @param userOutputSampleFormat Format of user output samples, as passed to
+ Pa_OpenStream. This parameter is ignored for input-only streams.
+ 
+ @param hostOutputSampleFormat Format of host output samples. This parameter is
+ ignored for input-only streams. See note about host buffer interleave below.
+
+ @param sampleRate Sample rate of the stream. The more accurate this is the
+ better - it is used for updating time stamps when adapting buffers.
+ 
+ @param streamFlags Stream flags as passed to Pa_OpenStream, this parameter is
+ used for selecting special sample conversion options such as clipping and
+ dithering.
+ 
+ @param framesPerUserBuffer Number of frames per user buffer, as requested
+ by the framesPerBuffer parameter to Pa_OpenStream. This parameter may be
+ zero to indicate that the user will accept any (and varying) buffer sizes.
+
+ @param framesPerHostBuffer Specifies the number of frames per host buffer
+ for the fixed buffer size mode, and the maximum number of frames
+ per host buffer for the bounded host buffer size mode. It is ignored for
+ the other modes.
+
+ @param hostBufferSizeMode A mode flag indicating the size variability of
+ host buffers that will be passed to the buffer processor. See
+ PaUtilHostBufferSizeMode for further details.
+ 
+ @param streamCallback The user stream callback passed to Pa_OpenStream.
+
+ @param userData The user data field passed to Pa_OpenStream.
+    
+ @note The interleave flag is ignored for host buffer formats. Host
+ interleave is determined by the use of different SetInput and SetOutput
+ functions.
+
+ @return An error code indicating whether the initialization was successful.
+ If the error code is not PaNoError, the buffer processor was not initialized
+ and should not be used.
+ 
+ @see Pa_OpenStream, PaUtilHostBufferSizeMode, PaUtil_TerminateBufferProcessor
+*/
+PaError PaUtil_InitializeBufferProcessor( PaUtilBufferProcessor* bufferProcessor,
+            int inputChannelCount, PaSampleFormat userInputSampleFormat,
+            PaSampleFormat hostInputSampleFormat,
+            int outputChannelCount, PaSampleFormat userOutputSampleFormat,
+            PaSampleFormat hostOutputSampleFormat,
+            double sampleRate,
+            PaStreamFlags streamFlags,
+            unsigned long framesPerUserBuffer, /* 0 indicates don't care */
+            unsigned long framesPerHostBuffer,
+            PaUtilHostBufferSizeMode hostBufferSizeMode,
+            PaStreamCallback *streamCallback, void *userData );
+
+
+/** Terminate a buffer processor's representation. Deallocates any temporary
+ buffers allocated by PaUtil_InitializeBufferProcessor.
+ 
+ @param bufferProcessor The buffer processor structure to terminate.
+
+ @see PaUtil_InitializeBufferProcessor.
+*/
+void PaUtil_TerminateBufferProcessor( PaUtilBufferProcessor* bufferProcessor );
+
+
+/** Clear any internally buffered data. If you call
+ PaUtil_InitializeBufferProcessor in your OpenStream routine, make sure you
+ call PaUtil_ResetBufferProcessor in your StartStream call.
+
+ @param bufferProcessor The buffer processor to reset.
+*/
+void PaUtil_ResetBufferProcessor( PaUtilBufferProcessor* bufferProcessor );
+
+
+/** Retrieve the input latency of a buffer processor, in frames.
+
+ @param bufferProcessor The buffer processor examine.
+
+ @return The input latency introduced by the buffer processor, in frames.
+
+ @see PaUtil_GetBufferProcessorOutputLatencyFrames
+*/
+unsigned long PaUtil_GetBufferProcessorInputLatencyFrames( PaUtilBufferProcessor* bufferProcessor );
+
+/** Retrieve the output latency of a buffer processor, in frames.
+
+ @param bufferProcessor The buffer processor examine.
+
+ @return The output latency introduced by the buffer processor, in frames.
+
+ @see PaUtil_GetBufferProcessorInputLatencyFrames
+*/
+unsigned long PaUtil_GetBufferProcessorOutputLatencyFrames( PaUtilBufferProcessor* bufferProcessor );
+
+/*@}*/
+
+
+/** @name Host buffer pointer configuration
+
+ Functions to set host input and output buffers, used by both callback streams
+ and blocking read/write streams.
+*/
+/*@{*/ 
+
+
+/** Set the number of frames in the input host buffer(s) specified by the
+ PaUtil_Set*InputChannel functions.
+
+ @param bufferProcessor The buffer processor.
+
+ @param frameCount The number of host input frames. A 0 frameCount indicates to
+ use the framesPerHostBuffer value passed to PaUtil_InitializeBufferProcessor.
+
+ @see PaUtil_SetNoInput, PaUtil_SetInputChannel,
+ PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel
+*/
+void PaUtil_SetInputFrameCount( PaUtilBufferProcessor* bufferProcessor,
+        unsigned long frameCount );
+
+        
+/** Indicate that no input is avalable. This function should be used when
+ priming the output of a full-duplex stream opened with the
+ paPrimeOutputBuffersUsingStreamCallback flag. Note that it is not necessary
+ to call this or any othe PaUtil_Set*Input* functions for ouput-only streams.
+
+ @param bufferProcessor The buffer processor.
+*/
+void PaUtil_SetNoInput( PaUtilBufferProcessor* bufferProcessor );
+
+
+/** Provide the buffer processor with a pointer to a host input channel.
+
+ @param bufferProcessor The buffer processor.
+ @param channel The channel number.
+ @param data The buffer.
+ @param stride The stride from one sample to the next, in samples. For
+ interleaved host buffers, the stride will usually be the same as the number of
+ channels in the buffer.
+*/
+void PaUtil_SetInputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data, unsigned int stride );
+
+
+/** Provide the buffer processor with a pointer to an number of interleaved
+ host input channels.
+
+ @param bufferProcessor The buffer processor.
+ @param firstChannel The first channel number.
+ @param data The buffer.
+ @param channelCount The number of interleaved channels in the buffer. If
+ channelCount is zero, the number of channels specified to
+ PaUtil_InitializeBufferProcessor will be used.
+*/
+void PaUtil_SetInterleavedInputChannels( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int firstChannel, void *data, unsigned int channelCount );
+
+
+/** Provide the buffer processor with a pointer to one non-interleaved host
+ output channel.
+
+ @param bufferProcessor The buffer processor.
+ @param channel The channel number.
+ @param data The buffer.
+*/
+void PaUtil_SetNonInterleavedInputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data );
+
+
+/** Use for the second buffer half when the input buffer is split in two halves.
+ @see PaUtil_SetInputFrameCount
+*/
+void PaUtil_Set2ndInputFrameCount( PaUtilBufferProcessor* bufferProcessor,
+        unsigned long frameCount );
+
+/** Use for the second buffer half when the input buffer is split in two halves.
+ @see PaUtil_SetInputChannel
+*/
+void PaUtil_Set2ndInputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data, unsigned int stride );
+
+/** Use for the second buffer half when the input buffer is split in two halves.
+ @see PaUtil_SetInterleavedInputChannels
+*/
+void PaUtil_Set2ndInterleavedInputChannels( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int firstChannel, void *data, unsigned int channelCount );
+
+/** Use for the second buffer half when the input buffer is split in two halves.
+ @see PaUtil_SetNonInterleavedInputChannel
+*/
+void PaUtil_Set2ndNonInterleavedInputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data );
+
+        
+/** Set the number of frames in the output host buffer(s) specified by the
+ PaUtil_Set*OutputChannel functions.
+
+ @param bufferProcessor The buffer processor.
+
+ @param frameCount The number of host output frames. A 0 frameCount indicates to
+ use the framesPerHostBuffer value passed to PaUtil_InitializeBufferProcessor.
+
+ @see PaUtil_SetOutputChannel, PaUtil_SetInterleavedOutputChannels,
+ PaUtil_SetNonInterleavedOutputChannel
+*/
+void PaUtil_SetOutputFrameCount( PaUtilBufferProcessor* bufferProcessor,
+        unsigned long frameCount );
+
+
+/** Indicate that the output will be discarded. This function should be used
+ when implementing the paNeverDropInput mode for full duplex streams.
+
+ @param bufferProcessor The buffer processor.
+*/
+void PaUtil_SetNoOutput( PaUtilBufferProcessor* bufferProcessor );
+
+
+/** Provide the buffer processor with a pointer to a host output channel.
+
+ @param bufferProcessor The buffer processor.
+ @param channel The channel number.
+ @param data The buffer.
+ @param stride The stride from one sample to the next, in samples. For
+ interleaved host buffers, the stride will usually be the same as the number of
+ channels in the buffer.
+*/
+void PaUtil_SetOutputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data, unsigned int stride );
+
+
+/** Provide the buffer processor with a pointer to a number of interleaved
+ host output channels.
+
+ @param bufferProcessor The buffer processor.
+ @param firstChannel The first channel number.
+ @param data The buffer.
+ @param channelCount The number of interleaved channels in the buffer. If
+ channelCount is zero, the number of channels specified to
+ PaUtil_InitializeBufferProcessor will be used.
+*/
+void PaUtil_SetInterleavedOutputChannels( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int firstChannel, void *data, unsigned int channelCount );
+
+        
+/** Provide the buffer processor with a pointer to one non-interleaved host
+ output channel.
+
+ @param bufferProcessor The buffer processor.
+ @param channel The channel number.
+ @param data The buffer.
+*/
+void PaUtil_SetNonInterleavedOutputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data );
+
+
+/** Use for the second buffer half when the output buffer is split in two halves.
+ @see PaUtil_SetOutputFrameCount
+*/
+void PaUtil_Set2ndOutputFrameCount( PaUtilBufferProcessor* bufferProcessor,
+        unsigned long frameCount );
+
+/** Use for the second buffer half when the output buffer is split in two halves.
+ @see PaUtil_SetOutputChannel
+*/
+void PaUtil_Set2ndOutputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data, unsigned int stride );
+
+/** Use for the second buffer half when the output buffer is split in two halves.
+ @see PaUtil_SetInterleavedOutputChannels
+*/
+void PaUtil_Set2ndInterleavedOutputChannels( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int firstChannel, void *data, unsigned int channelCount );
+
+/** Use for the second buffer half when the output buffer is split in two halves.
+ @see PaUtil_SetNonInterleavedOutputChannel
+*/
+void PaUtil_Set2ndNonInterleavedOutputChannel( PaUtilBufferProcessor* bufferProcessor,
+        unsigned int channel, void *data );
+
+/*@}*/
+
+
+/** @name Buffer processing functions for callback streams
+*/
+/*@{*/
+
+/** Commence processing a host buffer (or a pair of host buffers in the
+ full-duplex case) for a callback stream.
+
+ @param bufferProcessor The buffer processor.
+
+ @param timeInfo Timing information for the first sample of the host
+ buffer(s). This information may be adjusted when buffer adaption is being
+ performed.
+
+ @param callbackStatusFlags Flags indicating whether underruns and overruns
+ have occurred since the last time the buffer processor was called.
+*/
+void PaUtil_BeginBufferProcessing( PaUtilBufferProcessor* bufferProcessor,
+        PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags callbackStatusFlags );
+
+        
+/** Finish processing a host buffer (or a pair of host buffers in the
+ full-duplex case) for a callback stream.
+
+ @param bufferProcessor The buffer processor.
+ 
+ @param callbackResult On input, indicates a previous callback result, and on
+ exit, the result of the user stream callback, if it is called.
+ On entry callbackResult should contain one of { paContinue, paComplete, or
+ paAbort}. If paComplete is passed, the stream callback will not be called
+ but any audio that was generated by previous stream callbacks will be copied
+ to the output buffer(s). You can check whether the buffer processor's internal
+ buffer is empty by calling PaUtil_IsBufferProcessorOutputEmpty.
+
+ If the stream callback is called its result is stored in *callbackResult. If
+ the stream callback returns paComplete or paAbort, all output buffers will be
+ full of valid data - some of which may be zeros to acount for data that
+ wasn't generated by the terminating callback.
+
+ @return The number of frames processed. This usually corresponds to the
+ number of frames specified by the PaUtil_Set*FrameCount functions, exept in
+ the paUtilVariableHostBufferSizePartialUsageAllowed buffer size mode when a
+ smaller value may be returned.
+*/
+unsigned long PaUtil_EndBufferProcessing( PaUtilBufferProcessor* bufferProcessor,
+        int *callbackResult );
+
+
+/** Determine whether any callback generated output remains in the bufffer
+ processor's internal buffers. This method may be used to determine when to
+ continue calling PaUtil_EndBufferProcessing() after the callback has returned
+ a callbackResult of paComplete.
+
+ @param bufferProcessor The buffer processor.
+ 
+ @return Returns non-zero when callback generated output remains in the internal
+ buffer and zero (0) when there internal buffer contains no callback generated
+ data.
+*/
+int PaUtil_IsBufferProcessorOutputEmpty( PaUtilBufferProcessor* bufferProcessor );
+
+/*@}*/
+
+
+/** @name Buffer processing functions for blocking read/write streams
+*/
+/*@{*/
+
+/** Copy samples from host input channels set up by the PaUtil_Set*InputChannels
+ functions to a user supplied buffer. This function is intended for use with
+ blocking read/write streams. Copies the minimum of the number of
+ user frames (specified by the frameCount parameter) and the number of available
+ host frames (specified in a previous call to SetInputFrameCount()).
+
+ @param bufferProcessor The buffer processor.
+
+ @param buffer A pointer to the user buffer pointer, or a pointer to a pointer
+ to an array of user buffer pointers for a non-interleaved stream. It is
+ important that this parameter points to a copy of the user buffer pointers,
+ not to the actual user buffer pointers, because this function updates the
+ pointers before returning.
+
+ @param frameCount The number of frames of data in the buffer(s) pointed to by
+ the buffer parameter.
+
+ @return The number of frames copied. The buffer pointer(s) pointed to by the
+ buffer parameter are advanced to point to the frame(s) following the last one
+ filled.
+*/
+unsigned long PaUtil_CopyInput( PaUtilBufferProcessor* bufferProcessor,
+        void **buffer, unsigned long frameCount );
+
+
+/* Copy samples from a user supplied buffer to host output channels set up by
+ the PaUtil_Set*OutputChannels functions. This function is intended for use with
+ blocking read/write streams. Copies the minimum of the number of
+ user frames (specified by the frameCount parameter) and the number of
+ host frames (specified in a previous call to SetOutputFrameCount()).
+
+ @param bufferProcessor The buffer processor.
+
+ @param buffer A pointer to the user buffer pointer, or a pointer to a pointer
+ to an array of user buffer pointers for a non-interleaved stream. It is
+ important that this parameter points to a copy of the user buffer pointers,
+ not to the actual user buffer pointers, because this function updates the
+ pointers before returning.
+
+ @param frameCount The number of frames of data in the buffer(s) pointed to by
+ the buffer parameter.
+
+ @return The number of frames copied. The buffer pointer(s) pointed to by the
+ buffer parameter are advanced to point to the frame(s) following the last one
+ copied.
+*/
+unsigned long PaUtil_CopyOutput( PaUtilBufferProcessor* bufferProcessor,
+        const void ** buffer, unsigned long frameCount );
+
+
+/* Zero samples in host output channels set up by the PaUtil_Set*OutputChannels
+ functions. This function is useful for flushing streams.
+ Zeros the minimum of frameCount and the number of host frames specified in a
+ previous call to SetOutputFrameCount().
+
+ @param bufferProcessor The buffer processor.
+
+ @param frameCount The maximum number of frames to zero.
+ 
+ @return The number of frames zeroed.
+*/
+unsigned long PaUtil_ZeroOutput( PaUtilBufferProcessor* bufferProcessor,
+        unsigned long frameCount );
+
+
+/*@}*/
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_PROCESS_H */
diff --git a/Externals/portaudio/src/common/pa_ringbuffer.c b/Externals/portaudio/src/common/pa_ringbuffer.c
new file mode 100644
index 0000000000..19c91497ce
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_ringbuffer.c
@@ -0,0 +1,237 @@
+/*
+ * $Id: pa_ringbuffer.c 1738 2011-08-18 11:47:28Z rossb $
+ * Portable Audio I/O Library
+ * Ring Buffer utility.
+ *
+ * Author: Phil Burk, http://www.softsynth.com
+ * modified for SMP safety on Mac OS X by Bjorn Roche
+ * modified for SMP safety on Linux by Leland Lucius
+ * also, allowed for const where possible
+ * modified for multiple-byte-sized data elements by Sven Fischer 
+ *
+ * Note that this is safe only for a single-thread reader and a
+ * single-thread writer.
+ *
+ * This program uses the PortAudio Portable Audio Library.
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup common_src
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "pa_ringbuffer.h"
+#include <string.h>
+#include "pa_memorybarrier.h"
+
+/***************************************************************************
+ * Initialize FIFO.
+ * elementCount must be power of 2, returns -1 if not.
+ */
+ring_buffer_size_t PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementSizeBytes, ring_buffer_size_t elementCount, void *dataPtr )
+{
+    if( ((elementCount-1) & elementCount) != 0) return -1; /* Not Power of two. */
+    rbuf->bufferSize = elementCount;
+    rbuf->buffer = (char *)dataPtr;
+    PaUtil_FlushRingBuffer( rbuf );
+    rbuf->bigMask = (elementCount*2)-1;
+    rbuf->smallMask = (elementCount)-1;
+    rbuf->elementSizeBytes = elementSizeBytes;
+    return 0;
+}
+
+/***************************************************************************
+** Return number of elements available for reading. */
+ring_buffer_size_t PaUtil_GetRingBufferReadAvailable( const PaUtilRingBuffer *rbuf )
+{
+    return ( (rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask );
+}
+/***************************************************************************
+** Return number of elements available for writing. */
+ring_buffer_size_t PaUtil_GetRingBufferWriteAvailable( const PaUtilRingBuffer *rbuf )
+{
+    return ( rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf));
+}
+
+/***************************************************************************
+** Clear buffer. Should only be called when buffer is NOT being read or written. */
+void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf )
+{
+    rbuf->writeIndex = rbuf->readIndex = 0;
+}
+
+/***************************************************************************
+** Get address of region(s) to which we can write data.
+** If the region is contiguous, size2 will be zero.
+** If non-contiguous, size2 will be the size of second region.
+** Returns room available to be written or elementCount, whichever is smaller.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount,
+                                       void **dataPtr1, ring_buffer_size_t *sizePtr1,
+                                       void **dataPtr2, ring_buffer_size_t *sizePtr2 )
+{
+    ring_buffer_size_t   index;
+    ring_buffer_size_t   available = PaUtil_GetRingBufferWriteAvailable( rbuf );
+    if( elementCount > available ) elementCount = available;
+    /* Check to see if write is not contiguous. */
+    index = rbuf->writeIndex & rbuf->smallMask;
+    if( (index + elementCount) > rbuf->bufferSize )
+    {
+        /* Write data in two blocks that wrap the buffer. */
+        ring_buffer_size_t   firstHalf = rbuf->bufferSize - index;
+        *dataPtr1 = &rbuf->buffer[index*rbuf->elementSizeBytes];
+        *sizePtr1 = firstHalf;
+        *dataPtr2 = &rbuf->buffer[0];
+        *sizePtr2 = elementCount - firstHalf;
+    }
+    else
+    {
+        *dataPtr1 = &rbuf->buffer[index*rbuf->elementSizeBytes];
+        *sizePtr1 = elementCount;
+        *dataPtr2 = NULL;
+        *sizePtr2 = 0;
+    }
+
+    if( available )
+        PaUtil_FullMemoryBarrier(); /* (write-after-read) => full barrier */
+
+    return elementCount;
+}
+
+
+/***************************************************************************
+*/
+ring_buffer_size_t PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount )
+{
+    /* ensure that previous writes are seen before we update the write index 
+       (write after write)
+    */
+    PaUtil_WriteMemoryBarrier();
+    return rbuf->writeIndex = (rbuf->writeIndex + elementCount) & rbuf->bigMask;
+}
+
+/***************************************************************************
+** Get address of region(s) from which we can read data.
+** If the region is contiguous, size2 will be zero.
+** If non-contiguous, size2 will be the size of second region.
+** Returns room available to be read or elementCount, whichever is smaller.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount,
+                                void **dataPtr1, ring_buffer_size_t *sizePtr1,
+                                void **dataPtr2, ring_buffer_size_t *sizePtr2 )
+{
+    ring_buffer_size_t   index;
+    ring_buffer_size_t   available = PaUtil_GetRingBufferReadAvailable( rbuf ); /* doesn't use memory barrier */
+    if( elementCount > available ) elementCount = available;
+    /* Check to see if read is not contiguous. */
+    index = rbuf->readIndex & rbuf->smallMask;
+    if( (index + elementCount) > rbuf->bufferSize )
+    {
+        /* Write data in two blocks that wrap the buffer. */
+        ring_buffer_size_t firstHalf = rbuf->bufferSize - index;
+        *dataPtr1 = &rbuf->buffer[index*rbuf->elementSizeBytes];
+        *sizePtr1 = firstHalf;
+        *dataPtr2 = &rbuf->buffer[0];
+        *sizePtr2 = elementCount - firstHalf;
+    }
+    else
+    {
+        *dataPtr1 = &rbuf->buffer[index*rbuf->elementSizeBytes];
+        *sizePtr1 = elementCount;
+        *dataPtr2 = NULL;
+        *sizePtr2 = 0;
+    }
+    
+    if( available )
+        PaUtil_ReadMemoryBarrier(); /* (read-after-read) => read barrier */
+
+    return elementCount;
+}
+/***************************************************************************
+*/
+ring_buffer_size_t PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount )
+{
+    /* ensure that previous reads (copies out of the ring buffer) are always completed before updating (writing) the read index. 
+       (write-after-read) => full barrier
+    */
+    PaUtil_FullMemoryBarrier();
+    return rbuf->readIndex = (rbuf->readIndex + elementCount) & rbuf->bigMask;
+}
+
+/***************************************************************************
+** Return elements written. */
+ring_buffer_size_t PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, ring_buffer_size_t elementCount )
+{
+    ring_buffer_size_t size1, size2, numWritten;
+    void *data1, *data2;
+    numWritten = PaUtil_GetRingBufferWriteRegions( rbuf, elementCount, &data1, &size1, &data2, &size2 );
+    if( size2 > 0 )
+    {
+
+        memcpy( data1, data, size1*rbuf->elementSizeBytes );
+        data = ((char *)data) + size1*rbuf->elementSizeBytes;
+        memcpy( data2, data, size2*rbuf->elementSizeBytes );
+    }
+    else
+    {
+        memcpy( data1, data, size1*rbuf->elementSizeBytes );
+    }
+    PaUtil_AdvanceRingBufferWriteIndex( rbuf, numWritten );
+    return numWritten;
+}
+
+/***************************************************************************
+** Return elements read. */
+ring_buffer_size_t PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, ring_buffer_size_t elementCount )
+{
+    ring_buffer_size_t size1, size2, numRead;
+    void *data1, *data2;
+    numRead = PaUtil_GetRingBufferReadRegions( rbuf, elementCount, &data1, &size1, &data2, &size2 );
+    if( size2 > 0 )
+    {
+        memcpy( data, data1, size1*rbuf->elementSizeBytes );
+        data = ((char *)data) + size1*rbuf->elementSizeBytes;
+        memcpy( data, data2, size2*rbuf->elementSizeBytes );
+    }
+    else
+    {
+        memcpy( data, data1, size1*rbuf->elementSizeBytes );
+    }
+    PaUtil_AdvanceRingBufferReadIndex( rbuf, numRead );
+    return numRead;
+}
diff --git a/Externals/portaudio/src/common/pa_ringbuffer.h b/Externals/portaudio/src/common/pa_ringbuffer.h
new file mode 100644
index 0000000000..51577f0707
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_ringbuffer.h
@@ -0,0 +1,233 @@
+#ifndef PA_RINGBUFFER_H
+#define PA_RINGBUFFER_H
+/*
+ * $Id: pa_ringbuffer.h 1734 2011-08-18 11:19:36Z rossb $
+ * Portable Audio I/O Library
+ * Ring Buffer utility.
+ *
+ * Author: Phil Burk, http://www.softsynth.com
+ * modified for SMP safety on OS X by Bjorn Roche.
+ * also allowed for const where possible.
+ * modified for multiple-byte-sized data elements by Sven Fischer 
+ *
+ * Note that this is safe only for a single-thread reader
+ * and a single-thread writer.
+ *
+ * This program is distributed with the PortAudio Portable Audio Library.
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+ @brief Single-reader single-writer lock-free ring buffer
+
+ PaUtilRingBuffer is a ring buffer used to transport samples between
+ different execution contexts (threads, OS callbacks, interrupt handlers)
+ without requiring the use of any locks. This only works when there is
+ a single reader and a single writer (ie. one thread or callback writes
+ to the ring buffer, another thread or callback reads from it).
+
+ The PaUtilRingBuffer structure manages a ring buffer containing N 
+ elements, where N must be a power of two. An element may be any size 
+ (specified in bytes).
+
+ The memory area used to store the buffer elements must be allocated by 
+ the client prior to calling PaUtil_InitializeRingBuffer() and must outlive
+ the use of the ring buffer.
+*/
+
+#if defined(__APPLE__)
+#include <sys/types.h>
+typedef int32_t ring_buffer_size_t;
+#elif defined( __GNUC__ )
+typedef long ring_buffer_size_t;
+#elif (_MSC_VER >= 1400)
+typedef long ring_buffer_size_t;
+#elif defined(_MSC_VER) || defined(__BORLANDC__)
+typedef long ring_buffer_size_t;
+#else
+typedef long ring_buffer_size_t;
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+typedef struct PaUtilRingBuffer
+{
+    ring_buffer_size_t  bufferSize; /**< Number of elements in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */
+    volatile ring_buffer_size_t  writeIndex; /**< Index of next writable element. Set by PaUtil_AdvanceRingBufferWriteIndex. */
+    volatile ring_buffer_size_t  readIndex;  /**< Index of next readable element. Set by PaUtil_AdvanceRingBufferReadIndex. */
+    ring_buffer_size_t  bigMask;    /**< Used for wrapping indices with extra bit to distinguish full/empty. */
+    ring_buffer_size_t  smallMask;  /**< Used for fitting indices to buffer. */
+    ring_buffer_size_t  elementSizeBytes; /**< Number of bytes per element. */
+    char  *buffer;    /**< Pointer to the buffer containing the actual data. */
+}PaUtilRingBuffer;
+
+/** Initialize Ring Buffer to empty state ready to have elements written to it.
+
+ @param rbuf The ring buffer.
+
+ @param elementSizeBytes The size of a single data element in bytes.
+
+ @param elementCount The number of elements in the buffer (must be a power of 2).
+
+ @param dataPtr A pointer to a previously allocated area where the data
+ will be maintained.  It must be elementCount*elementSizeBytes long.
+
+ @return -1 if elementCount is not a power of 2, otherwise 0.
+*/
+ring_buffer_size_t PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementSizeBytes, ring_buffer_size_t elementCount, void *dataPtr );
+
+/** Reset buffer to empty. Should only be called when buffer is NOT being read or written.
+
+ @param rbuf The ring buffer.
+*/
+void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf );
+
+/** Retrieve the number of elements available in the ring buffer for writing.
+
+ @param rbuf The ring buffer.
+
+ @return The number of elements available for writing.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferWriteAvailable( const PaUtilRingBuffer *rbuf );
+
+/** Retrieve the number of elements available in the ring buffer for reading.
+
+ @param rbuf The ring buffer.
+
+ @return The number of elements available for reading.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferReadAvailable( const PaUtilRingBuffer *rbuf );
+
+/** Write data to the ring buffer.
+
+ @param rbuf The ring buffer.
+
+ @param data The address of new data to write to the buffer.
+
+ @param elementCount The number of elements to be written.
+
+ @return The number of elements written.
+*/
+ring_buffer_size_t PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, ring_buffer_size_t elementCount );
+
+/** Read data from the ring buffer.
+
+ @param rbuf The ring buffer.
+
+ @param data The address where the data should be stored.
+
+ @param elementCount The number of elements to be read.
+
+ @return The number of elements read.
+*/
+ring_buffer_size_t PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, ring_buffer_size_t elementCount );
+
+/** Get address of region(s) to which we can write data.
+
+ @param rbuf The ring buffer.
+
+ @param elementCount The number of elements desired.
+
+ @param dataPtr1 The address where the first (or only) region pointer will be
+ stored.
+
+ @param sizePtr1 The address where the first (or only) region length will be
+ stored.
+
+ @param dataPtr2 The address where the second region pointer will be stored if
+ the first region is too small to satisfy elementCount.
+
+ @param sizePtr2 The address where the second region length will be stored if
+ the first region is too small to satisfy elementCount.
+
+ @return The room available to be written or elementCount, whichever is smaller.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount,
+                                       void **dataPtr1, ring_buffer_size_t *sizePtr1,
+                                       void **dataPtr2, ring_buffer_size_t *sizePtr2 );
+
+/** Advance the write index to the next location to be written.
+
+ @param rbuf The ring buffer.
+
+ @param elementCount The number of elements to advance.
+
+ @return The new position.
+*/
+ring_buffer_size_t PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount );
+
+/** Get address of region(s) from which we can read data.
+
+ @param rbuf The ring buffer.
+
+ @param elementCount The number of elements desired.
+
+ @param dataPtr1 The address where the first (or only) region pointer will be
+ stored.
+
+ @param sizePtr1 The address where the first (or only) region length will be
+ stored.
+
+ @param dataPtr2 The address where the second region pointer will be stored if
+ the first region is too small to satisfy elementCount.
+
+ @param sizePtr2 The address where the second region length will be stored if
+ the first region is too small to satisfy elementCount.
+
+ @return The number of elements available for reading.
+*/
+ring_buffer_size_t PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount,
+                                      void **dataPtr1, ring_buffer_size_t *sizePtr1,
+                                      void **dataPtr2, ring_buffer_size_t *sizePtr2 );
+
+/** Advance the read index to the next location to be read.
+
+ @param rbuf The ring buffer.
+
+ @param elementCount The number of elements to advance.
+
+ @return The new position.
+*/
+ring_buffer_size_t PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, ring_buffer_size_t elementCount );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_RINGBUFFER_H */
diff --git a/Externals/portaudio/src/common/pa_stream.c b/Externals/portaudio/src/common/pa_stream.c
new file mode 100644
index 0000000000..ea91821f8d
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_stream.c
@@ -0,0 +1,150 @@
+/*
+ * $Id: pa_stream.c 1339 2008-02-15 07:50:33Z rossb $
+ * Portable Audio I/O Library
+ * stream interface
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 2008 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Stream interfaces, representation structures and helper functions
+ used to interface between pa_front.c host API implementations.
+*/
+
+
+#include "pa_stream.h"
+
+
+void PaUtil_InitializeStreamInterface( PaUtilStreamInterface *streamInterface,
+                                       PaError (*Close)( PaStream* ),
+                                       PaError (*Start)( PaStream* ),
+                                       PaError (*Stop)( PaStream* ),
+                                       PaError (*Abort)( PaStream* ),
+                                       PaError (*IsStopped)( PaStream* ),
+                                       PaError (*IsActive)( PaStream* ),
+                                       PaTime (*GetTime)( PaStream* ),
+                                       double (*GetCpuLoad)( PaStream* ),
+                                       PaError (*Read)( PaStream*, void *, unsigned long ),
+                                       PaError (*Write)( PaStream*, const void *, unsigned long ),
+                                       signed long (*GetReadAvailable)( PaStream* ),
+                                       signed long (*GetWriteAvailable)( PaStream* )  )
+{
+    streamInterface->Close = Close;
+    streamInterface->Start = Start;
+    streamInterface->Stop = Stop;
+    streamInterface->Abort = Abort;
+    streamInterface->IsStopped = IsStopped;
+    streamInterface->IsActive = IsActive;
+    streamInterface->GetTime = GetTime;
+    streamInterface->GetCpuLoad = GetCpuLoad;
+    streamInterface->Read = Read;
+    streamInterface->Write = Write;
+    streamInterface->GetReadAvailable = GetReadAvailable;
+    streamInterface->GetWriteAvailable = GetWriteAvailable;
+}
+
+
+void PaUtil_InitializeStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation,
+        PaUtilStreamInterface *streamInterface,
+        PaStreamCallback *streamCallback,
+        void *userData )
+{
+    streamRepresentation->magic = PA_STREAM_MAGIC;
+    streamRepresentation->nextOpenStream = 0;
+    streamRepresentation->streamInterface = streamInterface;
+    streamRepresentation->streamCallback = streamCallback;
+    streamRepresentation->streamFinishedCallback = 0;
+
+    streamRepresentation->userData = userData;
+
+    streamRepresentation->streamInfo.inputLatency = 0.;
+    streamRepresentation->streamInfo.outputLatency = 0.;
+    streamRepresentation->streamInfo.sampleRate = 0.;
+}
+
+
+void PaUtil_TerminateStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation )
+{
+    streamRepresentation->magic = 0;
+}
+
+
+PaError PaUtil_DummyRead( PaStream* stream,
+                               void *buffer,
+                               unsigned long frames )
+{
+    (void)stream; /* unused parameter */
+    (void)buffer; /* unused parameter */
+    (void)frames; /* unused parameter */
+
+    return paCanNotReadFromACallbackStream;
+}
+
+
+PaError PaUtil_DummyWrite( PaStream* stream,
+                               const void *buffer,
+                               unsigned long frames )
+{
+    (void)stream; /* unused parameter */
+    (void)buffer; /* unused parameter */
+    (void)frames; /* unused parameter */
+
+    return paCanNotWriteToACallbackStream;
+}
+
+
+signed long PaUtil_DummyGetReadAvailable( PaStream* stream )
+{
+    (void)stream; /* unused parameter */
+
+    return paCanNotReadFromACallbackStream;
+}
+
+
+signed long PaUtil_DummyGetWriteAvailable( PaStream* stream )
+{
+    (void)stream; /* unused parameter */
+
+    return paCanNotWriteToACallbackStream;
+}
+
+
+double PaUtil_DummyGetCpuLoad( PaStream* stream )
+{
+    (void)stream; /* unused parameter */
+
+    return 0.0;
+}
diff --git a/Externals/portaudio/src/common/pa_stream.h b/Externals/portaudio/src/common/pa_stream.h
new file mode 100644
index 0000000000..8d707b79cf
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_stream.h
@@ -0,0 +1,205 @@
+#ifndef PA_STREAM_H
+#define PA_STREAM_H
+/*
+ * $Id: pa_stream.h 1339 2008-02-15 07:50:33Z rossb $
+ * Portable Audio I/O Library
+ * stream interface
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Stream interfaces, representation structures and helper functions
+ used to interface between pa_front.c host API implementations.
+*/
+
+
+#include "portaudio.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+#define PA_STREAM_MAGIC (0x18273645)
+
+
+/** A structure representing an (abstract) interface to a host API. Contains
+ pointers to functions which implement the interface.
+
+ All PaStreamInterface functions are guaranteed to be called with a non-null,
+ valid stream parameter.
+*/
+typedef struct {
+    PaError (*Close)( PaStream* stream );
+    PaError (*Start)( PaStream *stream );
+    PaError (*Stop)( PaStream *stream );
+    PaError (*Abort)( PaStream *stream );
+    PaError (*IsStopped)( PaStream *stream );
+    PaError (*IsActive)( PaStream *stream );
+    PaTime (*GetTime)( PaStream *stream );
+    double (*GetCpuLoad)( PaStream* stream );
+    PaError (*Read)( PaStream* stream, void *buffer, unsigned long frames );
+    PaError (*Write)( PaStream* stream, const void *buffer, unsigned long frames );
+    signed long (*GetReadAvailable)( PaStream* stream );
+    signed long (*GetWriteAvailable)( PaStream* stream );
+} PaUtilStreamInterface;
+
+
+/** Initialize the fields of a PaUtilStreamInterface structure.
+*/
+void PaUtil_InitializeStreamInterface( PaUtilStreamInterface *streamInterface,
+    PaError (*Close)( PaStream* ),
+    PaError (*Start)( PaStream* ),
+    PaError (*Stop)( PaStream* ),
+    PaError (*Abort)( PaStream* ),
+    PaError (*IsStopped)( PaStream* ),
+    PaError (*IsActive)( PaStream* ),
+    PaTime (*GetTime)( PaStream* ),
+    double (*GetCpuLoad)( PaStream* ),
+    PaError (*Read)( PaStream* stream, void *buffer, unsigned long frames ),
+    PaError (*Write)( PaStream* stream, const void *buffer, unsigned long frames ),
+    signed long (*GetReadAvailable)( PaStream* stream ),
+    signed long (*GetWriteAvailable)( PaStream* stream ) );
+
+
+/** Dummy Read function for use in interfaces to a callback based streams.
+ Pass to the Read parameter of PaUtil_InitializeStreamInterface.
+ @return An error code indicating that the function has no effect
+ because the stream is a callback stream.
+*/
+PaError PaUtil_DummyRead( PaStream* stream,
+                       void *buffer,
+                       unsigned long frames );
+
+
+/** Dummy Write function for use in an interfaces to callback based streams.
+ Pass to the Write parameter of PaUtil_InitializeStreamInterface.
+ @return An error code indicating that the function has no effect
+ because the stream is a callback stream.
+*/
+PaError PaUtil_DummyWrite( PaStream* stream,
+                       const void *buffer,
+                       unsigned long frames );
+
+
+/** Dummy GetReadAvailable function for use in interfaces to callback based
+ streams. Pass to the GetReadAvailable parameter of PaUtil_InitializeStreamInterface.
+ @return An error code indicating that the function has no effect
+ because the stream is a callback stream.
+*/
+signed long PaUtil_DummyGetReadAvailable( PaStream* stream );
+
+
+/** Dummy GetWriteAvailable function for use in interfaces to callback based
+ streams. Pass to the GetWriteAvailable parameter of PaUtil_InitializeStreamInterface.
+ @return An error code indicating that the function has no effect
+ because the stream is a callback stream.
+*/
+signed long PaUtil_DummyGetWriteAvailable( PaStream* stream );
+
+
+
+/** Dummy GetCpuLoad function for use in an interface to a read/write stream.
+ Pass to the GetCpuLoad parameter of PaUtil_InitializeStreamInterface.
+ @return Returns 0.
+*/
+double PaUtil_DummyGetCpuLoad( PaStream* stream );
+
+
+/** Non host specific data for a stream. This data is used by pa_front to
+ forward to the appropriate functions in the streamInterface structure.
+*/
+typedef struct PaUtilStreamRepresentation {
+    unsigned long magic;    /**< set to PA_STREAM_MAGIC */
+    struct PaUtilStreamRepresentation *nextOpenStream; /**< field used by multi-api code */
+    PaUtilStreamInterface *streamInterface;
+    PaStreamCallback *streamCallback;
+    PaStreamFinishedCallback *streamFinishedCallback;
+    void *userData;
+    PaStreamInfo streamInfo;
+} PaUtilStreamRepresentation;
+
+
+/** Initialize a PaUtilStreamRepresentation structure.
+
+ @see PaUtil_InitializeStreamRepresentation
+*/
+void PaUtil_InitializeStreamRepresentation(
+        PaUtilStreamRepresentation *streamRepresentation,
+        PaUtilStreamInterface *streamInterface,
+        PaStreamCallback *streamCallback,
+        void *userData );
+        
+
+/** Clean up a PaUtilStreamRepresentation structure previously initialized
+ by a call to PaUtil_InitializeStreamRepresentation.
+
+ @see PaUtil_InitializeStreamRepresentation
+*/
+void PaUtil_TerminateStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation );
+
+
+/** Check that the stream pointer is valid.
+
+ @return Returns paNoError if the stream pointer appears to be OK, otherwise
+ returns an error indicating the cause of failure.
+*/
+PaError PaUtil_ValidateStreamPointer( PaStream *stream );
+
+
+/** Cast an opaque stream pointer into a pointer to a PaUtilStreamRepresentation.
+
+ @see PaUtilStreamRepresentation
+*/
+#define PA_STREAM_REP( stream )\
+    ((PaUtilStreamRepresentation*) (stream) )
+
+
+/** Cast an opaque stream pointer into a pointer to a PaUtilStreamInterface.
+
+ @see PaUtilStreamRepresentation, PaUtilStreamInterface
+*/
+#define PA_STREAM_INTERFACE( stream )\
+    PA_STREAM_REP( (stream) )->streamInterface
+
+
+    
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_STREAM_H */
diff --git a/Externals/portaudio/src/common/pa_trace.c b/Externals/portaudio/src/common/pa_trace.c
new file mode 100644
index 0000000000..24305003f7
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_trace.c
@@ -0,0 +1,97 @@
+/*
+ * $Id: pa_trace.c 1339 2008-02-15 07:50:33Z rossb $
+ * Portable Audio I/O Library Trace Facility
+ * Store trace information in real-time for later printing.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2000 Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Real-time safe event trace logging facility for debugging.
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "pa_trace.h"
+
+#if PA_TRACE_REALTIME_EVENTS
+
+static char *traceTextArray[PA_MAX_TRACE_RECORDS];
+static int traceIntArray[PA_MAX_TRACE_RECORDS];
+static int traceIndex = 0;
+static int traceBlock = 0;
+
+/*********************************************************************/
+void PaUtil_ResetTraceMessages()
+{
+    traceIndex = 0;
+}
+
+/*********************************************************************/
+void PaUtil_DumpTraceMessages()
+{
+    int i;
+    int messageCount = (traceIndex < PA_MAX_TRACE_RECORDS) ? traceIndex : PA_MAX_TRACE_RECORDS;
+
+    printf("DumpTraceMessages: traceIndex = %d\n", traceIndex );
+    for( i=0; i<messageCount; i++ )
+    {
+        printf("%3d: %s = 0x%08X\n",
+               i, traceTextArray[i], traceIntArray[i] );
+    }
+    PaUtil_ResetTraceMessages();
+    fflush(stdout);
+}
+
+/*********************************************************************/
+void PaUtil_AddTraceMessage( const char *msg, int data )
+{
+    if( (traceIndex == PA_MAX_TRACE_RECORDS) && (traceBlock == 0) )
+    {
+        traceBlock = 1;
+        /*  PaUtil_DumpTraceMessages(); */
+    }
+    else if( traceIndex < PA_MAX_TRACE_RECORDS )
+    {
+        traceTextArray[traceIndex] = msg;
+        traceIntArray[traceIndex] = data;
+        traceIndex++;
+    }
+}
+
+#endif /* TRACE_REALTIME_EVENTS */
diff --git a/Externals/portaudio/src/common/pa_trace.h b/Externals/portaudio/src/common/pa_trace.h
new file mode 100644
index 0000000000..b11509e0ec
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_trace.h
@@ -0,0 +1,101 @@
+#ifndef PA_TRACE_H
+#define PA_TRACE_H
+/*
+ * $Id: pa_trace.h 1339 2008-02-15 07:50:33Z rossb $
+ * Portable Audio I/O Library Trace Facility
+ * Store trace information in real-time for later printing.
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2000 Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Real-time safe event trace logging facility for debugging.
+
+ Allows data to be logged to a fixed size trace buffer in a real-time
+ execution context (such as at interrupt time). Each log entry consists 
+ of a message comprising a string pointer and an int.  The trace buffer 
+ may be dumped to stdout later.
+
+ This facility is only active if PA_TRACE_REALTIME_EVENTS is set to 1,
+ otherwise the trace functions expand to no-ops.
+
+ @fn PaUtil_ResetTraceMessages
+ @brief Clear the trace buffer.
+
+ @fn PaUtil_AddTraceMessage
+ @brief Add a message to the trace buffer. A message consists of string and an int.
+ @param msg The string pointer must remain valid until PaUtil_DumpTraceMessages 
+    is called. As a result, usually only string literals should be passed as 
+    the msg parameter.
+
+ @fn PaUtil_DumpTraceMessages
+ @brief Print all messages in the trace buffer to stdout and clear the trace buffer.
+*/
+
+#ifndef PA_TRACE_REALTIME_EVENTS
+#define PA_TRACE_REALTIME_EVENTS     (0)   /**< Set to 1 to enable logging using the trace functions defined below */
+#endif
+
+#ifndef PA_MAX_TRACE_RECORDS
+#define PA_MAX_TRACE_RECORDS      (2048)   /**< Maximum number of records stored in trace buffer */   
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+#if PA_TRACE_REALTIME_EVENTS
+
+void PaUtil_ResetTraceMessages();
+void PaUtil_AddTraceMessage( const char *msg, int data );
+void PaUtil_DumpTraceMessages();
+    
+#else
+
+#define PaUtil_ResetTraceMessages() /* noop */
+#define PaUtil_AddTraceMessage(msg,data) /* noop */
+#define PaUtil_DumpTraceMessages() /* noop */
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PA_TRACE_H */
diff --git a/Externals/portaudio/src/common/pa_types.h b/Externals/portaudio/src/common/pa_types.h
new file mode 100644
index 0000000000..5b647d641e
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_types.h
@@ -0,0 +1,107 @@
+#ifndef PA_TYPES_H
+#define PA_TYPES_H
+
+/* 
+ * Portable Audio I/O Library
+ * integer type definitions
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Definition of 16 and 32 bit integer types (PaInt16, PaInt32 etc)
+
+ SIZEOF_SHORT, SIZEOF_INT and SIZEOF_LONG are set by the configure script
+ when it is used. Otherwise we default to the common 32 bit values, if your
+ platform doesn't use configure, and doesn't use the default values below
+ you will need to explicitly define these symbols in your make file.
+
+ A PA_VALIDATE_SIZES macro is provided to assert that the values set in this
+ file are correct.
+*/
+
+#ifndef SIZEOF_SHORT
+#define SIZEOF_SHORT 2
+#endif
+
+#ifndef SIZEOF_INT
+#define SIZEOF_INT 4
+#endif
+
+#ifndef SIZEOF_LONG
+#define SIZEOF_LONG 4
+#endif
+
+
+#if SIZEOF_SHORT == 2
+typedef signed short PaInt16;
+typedef unsigned short PaUint16;
+#elif SIZEOF_INT == 2
+typedef signed int PaInt16;
+typedef unsigned int PaUint16;
+#else
+#error pa_types.h was unable to determine which type to use for 16bit integers on the target platform
+#endif
+
+#if SIZEOF_SHORT == 4
+typedef signed short PaInt32;
+typedef unsigned short PaUint32;
+#elif SIZEOF_INT == 4
+typedef signed int PaInt32;
+typedef unsigned int PaUint32;
+#elif SIZEOF_LONG == 4
+typedef signed long PaInt32;
+typedef unsigned long PaUint32;
+#else
+#error pa_types.h was unable to determine which type to use for 32bit integers on the target platform
+#endif
+
+
+/* PA_VALIDATE_TYPE_SIZES compares the size of the integer types at runtime to
+ ensure that PortAudio was configured correctly, and raises an assertion if
+ they don't match the expected values. <assert.h> must be included in the
+ context in which this macro is used.
+*/
+#define PA_VALIDATE_TYPE_SIZES \
+    { \
+        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaUint16 ) == 2 ); \
+        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaInt16 ) == 2 ); \
+        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaUint32 ) == 4 ); \
+        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaInt32 ) == 4 ); \
+    }
+
+
+#endif /* PA_TYPES_H */
diff --git a/Externals/portaudio/src/common/pa_util.h b/Externals/portaudio/src/common/pa_util.h
new file mode 100644
index 0000000000..c454ea771d
--- /dev/null
+++ b/Externals/portaudio/src/common/pa_util.h
@@ -0,0 +1,159 @@
+#ifndef PA_UTIL_H
+#define PA_UTIL_H
+/*
+ * $Id: pa_util.h 1584 2011-02-02 18:58:17Z rossb $
+ * Portable Audio I/O Library implementation utilities header
+ * common implementation utilities and interfaces
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+    @brief Prototypes for utility functions used by PortAudio implementations.
+
+    Some functions declared here are defined in pa_front.c while others
+    are implemented separately for each platform.
+*/
+
+
+#include "portaudio.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+struct PaUtilHostApiRepresentation;
+
+
+/** Retrieve a specific host API representation. This function can be used
+ by implementations to retrieve a pointer to their representation in
+ host api specific extension functions which aren't passed a rep pointer
+ by pa_front.c.
+
+ @param hostApi A pointer to a host API represenation pointer. Apon success
+ this will receive the requested representation pointer.
+
+ @param type A valid host API type identifier.
+
+ @returns An error code. If the result is PaNoError then a pointer to the
+ requested host API representation will be stored in *hostApi. If the host API
+ specified by type is not found, this function returns paHostApiNotFound.
+*/
+PaError PaUtil_GetHostApiRepresentation( struct PaUtilHostApiRepresentation **hostApi,
+        PaHostApiTypeId type );
+
+
+/** Convert a PortAudio device index into a host API specific device index.
+ @param hostApiDevice Pointer to a device index, on success this will recieve the
+ converted device index value.
+ @param device The PortAudio device index to convert.
+ @param hostApi The host api which the index should be converted for.
+
+ @returns On success returns PaNoError and places the converted index in the
+ hostApiDevice parameter.
+*/
+PaError PaUtil_DeviceIndexToHostApiDeviceIndex(
+        PaDeviceIndex *hostApiDevice, PaDeviceIndex device,
+        struct PaUtilHostApiRepresentation *hostApi );
+
+
+/** Set the host error information returned by Pa_GetLastHostErrorInfo. This
+ function and the paUnanticipatedHostError error code should be used as a
+ last resort.  Implementors should use existing PA error codes where possible,
+ or nominate new ones. Note that at it is always better to use
+ PaUtil_SetLastHostErrorInfo() and paUnanticipatedHostError than to return an
+ ambiguous or inaccurate PaError code.
+
+ @param hostApiType  The host API which encountered the error (ie of the caller)
+
+ @param errorCode The error code returned by the native API function.
+
+ @param errorText A string describing the error. PaUtil_SetLastHostErrorInfo
+ makes a copy of the string, so it is not necessary for the pointer to remain
+ valid after the call to PaUtil_SetLastHostErrorInfo() returns.
+
+*/
+void PaUtil_SetLastHostErrorInfo( PaHostApiTypeId hostApiType, long errorCode,
+        const char *errorText );
+
+
+        
+/* the following functions are implemented in a platform platform specific
+ .c file
+*/
+
+/** Allocate size bytes, guaranteed to be aligned to a FIXME byte boundary */
+void *PaUtil_AllocateMemory( long size );
+
+
+/** Realease block if non-NULL. block may be NULL */
+void PaUtil_FreeMemory( void *block );
+
+
+/** Return the number of currently allocated blocks. This function can be
+ used for detecting memory leaks.
+
+ @note Allocations will only be tracked if PA_TRACK_MEMORY is #defined. If
+ it isn't, this function will always return 0.
+*/
+int PaUtil_CountCurrentlyAllocatedBlocks( void );
+
+
+/** Initialize the clock used by PaUtil_GetTime(). Call this before calling
+ PaUtil_GetTime.
+
+ @see PaUtil_GetTime
+*/
+void PaUtil_InitializeClock( void );
+
+
+/** Return the system time in seconds. Used to implement CPU load functions
+
+ @see PaUtil_InitializeClock
+*/
+double PaUtil_GetTime( void );
+
+
+/* void Pa_Sleep( long msec );  must also be implemented in per-platform .c file */
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_UTIL_H */
diff --git a/Externals/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/Externals/portaudio/src/hostapi/alsa/pa_linux_alsa.c
new file mode 100644
index 0000000000..97c2ebcfce
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/alsa/pa_linux_alsa.c
@@ -0,0 +1,4552 @@
+/*
+ * $Id: pa_linux_alsa.c 1691 2011-05-26 20:19:19Z aknudsen $
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ * ALSA implementation by Joshua Haberman and Arve Knudsen
+ *
+ * Copyright (c) 2002 Joshua Haberman <joshua@haberman.com>
+ * Copyright (c) 2005-2009 Arve Knudsen <arve.knudsen@gmail.com>
+ * Copyright (c) 2008 Kevin Kofler <kevin.kofler@chello.at>
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#define ALSA_PCM_NEW_HW_PARAMS_API
+#define ALSA_PCM_NEW_SW_PARAMS_API
+#include <alsa/asoundlib.h>
+#undef ALSA_PCM_NEW_HW_PARAMS_API
+#undef ALSA_PCM_NEW_SW_PARAMS_API
+
+#include <sys/poll.h>
+#include <string.h> /* strlen() */
+#include <limits.h>
+#include <math.h>
+#include <pthread.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/mman.h>
+#include <signal.h> /* For sig_atomic_t */
+#ifdef PA_ALSA_DYNAMIC
+    #include <dlfcn.h> /* For dlXXX functions */
+#endif
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_unix_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_endianness.h"
+#include "pa_debugprint.h"
+
+#include "pa_linux_alsa.h"
+
+#ifndef SND_PCM_TSTAMP_ENABLE
+#define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP
+#endif
+
+/* Defines Alsa function types and pointers to these functions. */
+#define _PA_DEFINE_FUNC(x)  typedef typeof(x) x##_ft; static x##_ft *alsa_##x = 0
+
+/* Alloca helper. */
+#define __alsa_snd_alloca(ptr,type) do { size_t __alsa_alloca_size = alsa_##type##_sizeof(); (*ptr) = (type##_t *) alloca(__alsa_alloca_size); memset(*ptr, 0, __alsa_alloca_size); } while (0)
+
+_PA_DEFINE_FUNC(snd_pcm_open);
+_PA_DEFINE_FUNC(snd_pcm_close);
+_PA_DEFINE_FUNC(snd_pcm_nonblock);
+_PA_DEFINE_FUNC(snd_pcm_frames_to_bytes);
+_PA_DEFINE_FUNC(snd_pcm_prepare);
+_PA_DEFINE_FUNC(snd_pcm_start);
+_PA_DEFINE_FUNC(snd_pcm_resume);
+_PA_DEFINE_FUNC(snd_pcm_wait);
+_PA_DEFINE_FUNC(snd_pcm_state);
+_PA_DEFINE_FUNC(snd_pcm_avail_update);
+_PA_DEFINE_FUNC(snd_pcm_areas_silence);
+_PA_DEFINE_FUNC(snd_pcm_mmap_begin);
+_PA_DEFINE_FUNC(snd_pcm_mmap_commit);
+_PA_DEFINE_FUNC(snd_pcm_readi);
+_PA_DEFINE_FUNC(snd_pcm_readn);
+_PA_DEFINE_FUNC(snd_pcm_writei);
+_PA_DEFINE_FUNC(snd_pcm_writen);
+_PA_DEFINE_FUNC(snd_pcm_drain);
+_PA_DEFINE_FUNC(snd_pcm_recover);
+_PA_DEFINE_FUNC(snd_pcm_drop);
+_PA_DEFINE_FUNC(snd_pcm_area_copy);
+_PA_DEFINE_FUNC(snd_pcm_poll_descriptors);
+_PA_DEFINE_FUNC(snd_pcm_poll_descriptors_count);
+_PA_DEFINE_FUNC(snd_pcm_poll_descriptors_revents);
+_PA_DEFINE_FUNC(snd_pcm_format_size);
+_PA_DEFINE_FUNC(snd_pcm_link);
+_PA_DEFINE_FUNC(snd_pcm_delay);
+
+_PA_DEFINE_FUNC(snd_pcm_hw_params_sizeof);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_malloc);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_free);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_any);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_access);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_format);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_channels);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_set_periods_near);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_rate_near); //!!!
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_rate);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_rate_resample);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_set_buffer_time_near);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_buffer_size);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_buffer_size_near); //!!!
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_buffer_size_min);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_set_period_time_near);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_period_size_near);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_periods_integer);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_periods_min);
+
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_buffer_size);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_get_period_size);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_get_access);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_get_periods);
+//_PA_DEFINE_FUNC(snd_pcm_hw_params_get_rate);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_channels_min);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_channels_max);
+
+_PA_DEFINE_FUNC(snd_pcm_hw_params_test_period_size);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_test_format);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_test_access);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_dump);
+_PA_DEFINE_FUNC(snd_pcm_hw_params);
+
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_periods_min);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_periods_max);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_set_period_size);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_period_size_min);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_period_size_max);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_buffer_size_max);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_rate_min);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_rate_max);
+_PA_DEFINE_FUNC(snd_pcm_hw_params_get_rate_numden);
+#define alsa_snd_pcm_hw_params_alloca(ptr) __alsa_snd_alloca(ptr, snd_pcm_hw_params)
+
+_PA_DEFINE_FUNC(snd_pcm_sw_params_sizeof);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_malloc);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_current);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_avail_min);
+_PA_DEFINE_FUNC(snd_pcm_sw_params);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_free);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_start_threshold);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_stop_threshold);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_get_boundary);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_silence_threshold);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_silence_size);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_xfer_align);
+_PA_DEFINE_FUNC(snd_pcm_sw_params_set_tstamp_mode);
+#define alsa_snd_pcm_sw_params_alloca(ptr) __alsa_snd_alloca(ptr, snd_pcm_sw_params)
+
+_PA_DEFINE_FUNC(snd_pcm_info);
+_PA_DEFINE_FUNC(snd_pcm_info_sizeof);
+_PA_DEFINE_FUNC(snd_pcm_info_malloc);
+_PA_DEFINE_FUNC(snd_pcm_info_free);
+_PA_DEFINE_FUNC(snd_pcm_info_set_device);
+_PA_DEFINE_FUNC(snd_pcm_info_set_subdevice);
+_PA_DEFINE_FUNC(snd_pcm_info_set_stream);
+_PA_DEFINE_FUNC(snd_pcm_info_get_name);
+_PA_DEFINE_FUNC(snd_pcm_info_get_card);
+#define alsa_snd_pcm_info_alloca(ptr) __alsa_snd_alloca(ptr, snd_pcm_info)
+
+_PA_DEFINE_FUNC(snd_ctl_pcm_next_device);
+_PA_DEFINE_FUNC(snd_ctl_pcm_info);
+_PA_DEFINE_FUNC(snd_ctl_open);
+_PA_DEFINE_FUNC(snd_ctl_close);
+_PA_DEFINE_FUNC(snd_ctl_card_info_malloc);
+_PA_DEFINE_FUNC(snd_ctl_card_info_free);
+_PA_DEFINE_FUNC(snd_ctl_card_info);
+_PA_DEFINE_FUNC(snd_ctl_card_info_sizeof);
+_PA_DEFINE_FUNC(snd_ctl_card_info_get_name);
+#define alsa_snd_ctl_card_info_alloca(ptr) __alsa_snd_alloca(ptr, snd_ctl_card_info)
+
+_PA_DEFINE_FUNC(snd_config);
+_PA_DEFINE_FUNC(snd_config_update);
+_PA_DEFINE_FUNC(snd_config_search);
+_PA_DEFINE_FUNC(snd_config_iterator_entry);
+_PA_DEFINE_FUNC(snd_config_iterator_first);
+_PA_DEFINE_FUNC(snd_config_iterator_end);
+_PA_DEFINE_FUNC(snd_config_iterator_next);
+_PA_DEFINE_FUNC(snd_config_get_string);
+_PA_DEFINE_FUNC(snd_config_get_id);
+_PA_DEFINE_FUNC(snd_config_update_free_global);
+
+_PA_DEFINE_FUNC(snd_pcm_status);
+_PA_DEFINE_FUNC(snd_pcm_status_sizeof);
+_PA_DEFINE_FUNC(snd_pcm_status_get_tstamp);
+_PA_DEFINE_FUNC(snd_pcm_status_get_state);
+_PA_DEFINE_FUNC(snd_pcm_status_get_trigger_tstamp);
+_PA_DEFINE_FUNC(snd_pcm_status_get_delay);
+#define alsa_snd_pcm_status_alloca(ptr) __alsa_snd_alloca(ptr, snd_pcm_status)
+
+_PA_DEFINE_FUNC(snd_card_next);
+_PA_DEFINE_FUNC(snd_strerror);
+_PA_DEFINE_FUNC(snd_output_stdio_attach);
+
+#define alsa_snd_config_for_each(pos, next, node)\
+    for (pos = alsa_snd_config_iterator_first(node),\
+         next = alsa_snd_config_iterator_next(pos);\
+         pos != alsa_snd_config_iterator_end(node); pos = next, next = alsa_snd_config_iterator_next(pos))
+
+#undef _PA_DEFINE_FUNC
+
+/* Redefine 'PA_ALSA_PATHNAME' to a different Alsa library name if desired. */
+#ifndef PA_ALSA_PATHNAME
+    #define PA_ALSA_PATHNAME "libasound.so"
+#endif
+static const char *g_AlsaLibName = PA_ALSA_PATHNAME;
+
+/* Handle to dynamically loaded library. */
+static void *g_AlsaLib = NULL;
+
+#ifdef PA_ALSA_DYNAMIC
+
+#define _PA_LOCAL_IMPL(x) __pa_local_##x
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_set_rate_near) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir)
+{
+	int ret;
+
+	if ((ret = alsa_snd_pcm_hw_params_set_rate(pcm, params, (*val), (*dir))) < 0)
+		return ret;
+
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_set_buffer_size_near) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val)
+{
+	int ret;
+
+	if ((ret = alsa_snd_pcm_hw_params_set_buffer_size(pcm, params, (*val))) < 0)
+		return ret;
+
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_set_period_size_near) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir)
+{
+	int ret;
+
+	if ((ret = alsa_snd_pcm_hw_params_set_period_size(pcm, params, (*val), (*dir))) < 0)
+		return ret;
+
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_channels_min) (const snd_pcm_hw_params_t *params, unsigned int *val)
+{
+	(*val) = 1;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_channels_max) (const snd_pcm_hw_params_t *params, unsigned int *val)
+{
+	(*val) = 2;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_periods_min) (const snd_pcm_hw_params_t *params, unsigned int *val, int *dir)
+{
+	(*val) = 2;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_periods_max) (const snd_pcm_hw_params_t *params, unsigned int *val, int *dir)
+{
+	(*val) = 8;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_period_size_min) (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir)
+{
+	(*frames) = 64;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_period_size_max) (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir)
+{
+	(*frames) = 512;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_buffer_size_max) (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val)
+{
+	int ret;
+	int dir                = 0;
+	snd_pcm_uframes_t pmax = 0;
+	unsigned int      pcnt = 0;
+
+	if ((ret = _PA_LOCAL_IMPL(snd_pcm_hw_params_get_period_size_max)(params, &pmax, &dir)) < 0)
+		return ret;
+	if ((ret = _PA_LOCAL_IMPL(snd_pcm_hw_params_get_periods_max)(params, &pcnt, &dir)) < 0)
+		return ret;
+
+	(*val) = pmax * pcnt;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_rate_min) (const snd_pcm_hw_params_t *params, unsigned int *val, int *dir)
+{
+	(*val) = 44100;
+	return 0;
+}
+
+int _PA_LOCAL_IMPL(snd_pcm_hw_params_get_rate_max) (const snd_pcm_hw_params_t *params, unsigned int *val, int *dir)
+{
+	(*val) = 44100;
+	return 0;
+}
+
+#endif // PA_ALSA_DYNAMIC
+
+/* Trying to load Alsa library dynamically if 'PA_ALSA_DYNAMIC' is defined, othervise
+   will link during compilation.
+*/
+static int PaAlsa_LoadLibrary()
+{
+#ifdef PA_ALSA_DYNAMIC
+
+	PA_DEBUG(( "%s: loading ALSA library file - %s\n", __FUNCTION__, g_AlsaLibName ));
+
+	dlerror();
+    g_AlsaLib = dlopen(g_AlsaLibName, (RTLD_NOW|RTLD_GLOBAL));
+    if (g_AlsaLib == NULL)
+    {
+    	PA_DEBUG(( "%s: failed dlopen() ALSA library file - %s, error: %s\n", __FUNCTION__, g_AlsaLibName, dlerror() ));
+    	return 0;
+    }
+
+    PA_DEBUG(( "%s: loading ALSA API\n", __FUNCTION__ ));
+
+    #define _PA_LOAD_FUNC(x) do {             \
+		alsa_##x = dlsym(g_AlsaLib, #x);      \
+		if (alsa_##x == NULL) {               \
+			PA_DEBUG(( "%s: symbol [%s] not found in - %s, error: %s\n", __FUNCTION__, #x, g_AlsaLibName, dlerror() )); }\
+        } while(0)
+
+#else
+
+    #define _PA_LOAD_FUNC(x) alsa_##x = &x
+
+#endif
+
+_PA_LOAD_FUNC(snd_pcm_open);
+_PA_LOAD_FUNC(snd_pcm_close);
+_PA_LOAD_FUNC(snd_pcm_nonblock);
+_PA_LOAD_FUNC(snd_pcm_frames_to_bytes);
+_PA_LOAD_FUNC(snd_pcm_prepare);
+_PA_LOAD_FUNC(snd_pcm_start);
+_PA_LOAD_FUNC(snd_pcm_resume);
+_PA_LOAD_FUNC(snd_pcm_wait);
+_PA_LOAD_FUNC(snd_pcm_state);
+_PA_LOAD_FUNC(snd_pcm_avail_update);
+_PA_LOAD_FUNC(snd_pcm_areas_silence);
+_PA_LOAD_FUNC(snd_pcm_mmap_begin);
+_PA_LOAD_FUNC(snd_pcm_mmap_commit);
+_PA_LOAD_FUNC(snd_pcm_readi);
+_PA_LOAD_FUNC(snd_pcm_readn);
+_PA_LOAD_FUNC(snd_pcm_writei);
+_PA_LOAD_FUNC(snd_pcm_writen);
+_PA_LOAD_FUNC(snd_pcm_drain);
+_PA_LOAD_FUNC(snd_pcm_recover);
+_PA_LOAD_FUNC(snd_pcm_drop);
+_PA_LOAD_FUNC(snd_pcm_area_copy);
+_PA_LOAD_FUNC(snd_pcm_poll_descriptors);
+_PA_LOAD_FUNC(snd_pcm_poll_descriptors_count);
+_PA_LOAD_FUNC(snd_pcm_poll_descriptors_revents);
+_PA_LOAD_FUNC(snd_pcm_format_size);
+_PA_LOAD_FUNC(snd_pcm_link);
+_PA_LOAD_FUNC(snd_pcm_delay);
+
+_PA_LOAD_FUNC(snd_pcm_hw_params_sizeof);
+_PA_LOAD_FUNC(snd_pcm_hw_params_malloc);
+_PA_LOAD_FUNC(snd_pcm_hw_params_free);
+_PA_LOAD_FUNC(snd_pcm_hw_params_any);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_access);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_format);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_channels);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_set_periods_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_rate_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_rate);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_rate_resample);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_set_buffer_time_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_buffer_size);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_buffer_size_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_buffer_size_min);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_set_period_time_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_period_size_near);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_periods_integer);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_periods_min);
+
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_buffer_size);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_get_period_size);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_get_access);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_get_periods);
+//_PA_LOAD_FUNC(snd_pcm_hw_params_get_rate);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_channels_min);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_channels_max);
+
+_PA_LOAD_FUNC(snd_pcm_hw_params_test_period_size);
+_PA_LOAD_FUNC(snd_pcm_hw_params_test_format);
+_PA_LOAD_FUNC(snd_pcm_hw_params_test_access);
+_PA_LOAD_FUNC(snd_pcm_hw_params_dump);
+_PA_LOAD_FUNC(snd_pcm_hw_params);
+
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_periods_min);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_periods_max);
+_PA_LOAD_FUNC(snd_pcm_hw_params_set_period_size);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_period_size_min);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_period_size_max);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_buffer_size_max);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_rate_min);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_rate_max);
+_PA_LOAD_FUNC(snd_pcm_hw_params_get_rate_numden);
+
+_PA_LOAD_FUNC(snd_pcm_sw_params_sizeof);
+_PA_LOAD_FUNC(snd_pcm_sw_params_malloc);
+_PA_LOAD_FUNC(snd_pcm_sw_params_current);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_avail_min);
+_PA_LOAD_FUNC(snd_pcm_sw_params);
+_PA_LOAD_FUNC(snd_pcm_sw_params_free);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_start_threshold);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_stop_threshold);
+_PA_LOAD_FUNC(snd_pcm_sw_params_get_boundary);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_silence_threshold);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_silence_size);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_xfer_align);
+_PA_LOAD_FUNC(snd_pcm_sw_params_set_tstamp_mode);
+
+_PA_LOAD_FUNC(snd_pcm_info);
+_PA_LOAD_FUNC(snd_pcm_info_sizeof);
+_PA_LOAD_FUNC(snd_pcm_info_malloc);
+_PA_LOAD_FUNC(snd_pcm_info_free);
+_PA_LOAD_FUNC(snd_pcm_info_set_device);
+_PA_LOAD_FUNC(snd_pcm_info_set_subdevice);
+_PA_LOAD_FUNC(snd_pcm_info_set_stream);
+_PA_LOAD_FUNC(snd_pcm_info_get_name);
+_PA_LOAD_FUNC(snd_pcm_info_get_card);
+
+_PA_LOAD_FUNC(snd_ctl_pcm_next_device);
+_PA_LOAD_FUNC(snd_ctl_pcm_info);
+_PA_LOAD_FUNC(snd_ctl_open);
+_PA_LOAD_FUNC(snd_ctl_close);
+_PA_LOAD_FUNC(snd_ctl_card_info_malloc);
+_PA_LOAD_FUNC(snd_ctl_card_info_free);
+_PA_LOAD_FUNC(snd_ctl_card_info);
+_PA_LOAD_FUNC(snd_ctl_card_info_sizeof);
+_PA_LOAD_FUNC(snd_ctl_card_info_get_name);
+
+_PA_LOAD_FUNC(snd_config);
+_PA_LOAD_FUNC(snd_config_update);
+_PA_LOAD_FUNC(snd_config_search);
+_PA_LOAD_FUNC(snd_config_iterator_entry);
+_PA_LOAD_FUNC(snd_config_iterator_first);
+_PA_LOAD_FUNC(snd_config_iterator_end);
+_PA_LOAD_FUNC(snd_config_iterator_next);
+_PA_LOAD_FUNC(snd_config_get_string);
+_PA_LOAD_FUNC(snd_config_get_id);
+_PA_LOAD_FUNC(snd_config_update_free_global);
+
+_PA_LOAD_FUNC(snd_pcm_status);
+_PA_LOAD_FUNC(snd_pcm_status_sizeof);
+_PA_LOAD_FUNC(snd_pcm_status_get_tstamp);
+_PA_LOAD_FUNC(snd_pcm_status_get_state);
+_PA_LOAD_FUNC(snd_pcm_status_get_trigger_tstamp);
+_PA_LOAD_FUNC(snd_pcm_status_get_delay);
+
+_PA_LOAD_FUNC(snd_card_next);
+_PA_LOAD_FUNC(snd_strerror);
+_PA_LOAD_FUNC(snd_output_stdio_attach);
+#undef _PA_LOAD_FUNC
+
+#ifdef PA_ALSA_DYNAMIC
+	PA_DEBUG(( "%s: loaded ALSA API - ok\n", __FUNCTION__ ));
+
+#define _PA_VALIDATE_LOAD_REPLACEMENT(x)\
+	do {\
+		if (alsa_##x == NULL)\
+		{\
+			alsa_##x = &_PA_LOCAL_IMPL(x);\
+			PA_DEBUG(( "%s: replacing [%s] with local implementation\n", __FUNCTION__, #x ));\
+		}\
+	} while (0)
+
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_set_rate_near);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_set_buffer_size_near);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_set_period_size_near);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_channels_min);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_channels_max);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_periods_min);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_periods_max);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_period_size_min);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_period_size_max);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_buffer_size_max);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_rate_min);
+	_PA_VALIDATE_LOAD_REPLACEMENT(snd_pcm_hw_params_get_rate_max);
+
+#undef _PA_LOCAL_IMPL
+#undef _PA_VALIDATE_LOAD_REPLACEMENT
+
+#endif // PA_ALSA_DYNAMIC
+
+    return 1;
+}
+
+void PaAlsa_SetLibraryPathName( const char *pathName )
+{
+#ifdef PA_ALSA_DYNAMIC
+    g_AlsaLibName = pathName;
+#else
+    (void)pathName;
+#endif
+}
+
+/* Close handle to Alsa library. */
+static void PaAlsa_CloseLibrary()
+{
+#ifdef PA_ALSA_DYNAMIC
+    dlclose(g_AlsaLib);
+	g_AlsaLib = NULL;
+#endif
+}
+
+/* Check return value of ALSA function, and map it to PaError */
+#define ENSURE_(expr, code) \
+    do { \
+		int __pa_unsure_error_id;\
+        if( UNLIKELY( (__pa_unsure_error_id = (expr)) < 0 ) ) \
+        { \
+            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
+            if( (code) == paUnanticipatedHostError && pthread_equal( pthread_self(), paUnixMainThread) ) \
+            { \
+                PaUtil_SetLastHostErrorInfo( paALSA, __pa_unsure_error_id, alsa_snd_strerror( __pa_unsure_error_id ) ); \
+            } \
+            PaUtil_DebugPrint( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" ); \
+            if( (code) == paUnanticipatedHostError ) \
+                PA_DEBUG(( "Host error description: %s\n", alsa_snd_strerror( __pa_unsure_error_id ) )); \
+            result = (code); \
+            goto error; \
+        } \
+    } while (0)
+
+#define ASSERT_CALL_(expr, success) \
+    do {\
+    	int __pa_assert_error_id;\
+    	__pa_assert_error_id = (expr);\
+		assert( success == __pa_assert_error_id );\
+	} while (0)
+
+static int numPeriods_ = 4;
+static int busyRetries_ = 100;
+
+int PaAlsa_SetNumPeriods( int numPeriods )
+{
+    numPeriods_ = numPeriods;
+    return paNoError;
+}
+
+typedef enum
+{
+    StreamDirection_In,
+    StreamDirection_Out
+} StreamDirection;
+
+typedef struct
+{
+    PaSampleFormat hostSampleFormat;
+    unsigned long framesPerBuffer;
+    int numUserChannels, numHostChannels;
+    int userInterleaved, hostInterleaved;
+    int canMmap;
+    void *nonMmapBuffer;
+    unsigned int nonMmapBufferSize;
+    PaDeviceIndex device;     /* Keep the device index */
+
+    snd_pcm_t *pcm;
+    snd_pcm_uframes_t bufferSize;
+    snd_pcm_format_t nativeFormat;
+    unsigned int nfds;
+    int ready;  /* Marked ready from poll */
+    void **userBuffers;
+    snd_pcm_uframes_t offset;
+    StreamDirection streamDir;
+
+    snd_pcm_channel_area_t *channelAreas;  /* Needed for channel adaption */
+} PaAlsaStreamComponent;
+
+/* Implementation specific stream structure */
+typedef struct PaAlsaStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+    PaUnixThread thread;
+
+    unsigned long framesPerUserBuffer, maxFramesPerHostBuffer;
+
+    int primeBuffers;
+    int callbackMode;              /* bool: are we running in callback mode? */
+    int pcmsSynced;                /* Have we successfully synced pcms */
+    int rtSched;
+
+    /* the callback thread uses these to poll the sound device(s), waiting
+     * for data to be ready/available */
+    struct pollfd* pfds;
+    int pollTimeout;
+
+    /* Used in communication between threads */
+    volatile sig_atomic_t callback_finished; /* bool: are we in the "callback finished" state? */
+    volatile sig_atomic_t callbackAbort;    /* Drop frames? */
+    volatile sig_atomic_t isActive;         /* Is stream in active state? (Between StartStream and StopStream || !paContinue) */
+    PaUnixMutex stateMtx;                   /* Used to synchronize access to stream state */
+
+    int neverDropInput;
+
+    PaTime underrun;
+    PaTime overrun;
+
+    PaAlsaStreamComponent capture, playback;
+}
+PaAlsaStream;
+
+/* PaAlsaHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct PaAlsaHostApiRepresentation
+{
+    PaUtilHostApiRepresentation baseHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    PaHostApiIndex hostApiIndex;
+}
+PaAlsaHostApiRepresentation;
+
+typedef struct PaAlsaDeviceInfo
+{
+    PaDeviceInfo baseDeviceInfo;
+    char *alsaName;
+    int isPlug;
+    int minInputChannels;
+    int minOutputChannels;
+}
+PaAlsaDeviceInfo;
+
+/* prototypes for functions declared in this file */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *callback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError BuildDeviceList( PaAlsaHostApiRepresentation *hostApi );
+static int SetApproximateSampleRate( snd_pcm_t *pcm, snd_pcm_hw_params_t *hwParams, double sampleRate );
+static int GetExactSampleRate( snd_pcm_hw_params_t *hwParams, double *sampleRate );
+
+/* Callback prototypes */
+static void *CallbackThreadFunc( void *userData );
+
+/* Blocking prototypes */
+static signed long GetStreamReadAvailable( PaStream* s );
+static signed long GetStreamWriteAvailable( PaStream* s );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+
+
+static const PaAlsaDeviceInfo *GetDeviceInfo( const PaUtilHostApiRepresentation *hostApi, int device )
+{
+    return (const PaAlsaDeviceInfo *)hostApi->deviceInfos[device];
+}
+
+/** Uncommented because AlsaErrorHandler is unused for anything good yet. If AlsaErrorHandler is
+    to be used, do not forget to register this callback in PaAlsa_Initialize, and unregister in Terminate.
+*/
+/*static void AlsaErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...)
+{
+}*/
+
+PaError PaAlsa_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaAlsaHostApiRepresentation *alsaHostApi = NULL;
+
+    /* Try loading Alsa library. */
+    if (!PaAlsa_LoadLibrary())
+        return paHostApiNotFound;
+
+    PA_UNLESS( alsaHostApi = (PaAlsaHostApiRepresentation*) PaUtil_AllocateMemory(
+                sizeof(PaAlsaHostApiRepresentation) ), paInsufficientMemory );
+    PA_UNLESS( alsaHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
+    alsaHostApi->hostApiIndex = hostApiIndex;
+
+    *hostApi = (PaUtilHostApiRepresentation*)alsaHostApi;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paALSA;
+    (*hostApi)->info.name = "ALSA";
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    /** If AlsaErrorHandler is to be used, do not forget to unregister callback pointer in
+        Terminate function.
+    */
+    /*ENSURE_( snd_lib_error_set_handler(AlsaErrorHandler), paUnanticipatedHostError );*/
+
+    PA_ENSURE( BuildDeviceList( alsaHostApi ) );
+
+    PaUtil_InitializeStreamInterface( &alsaHostApi->callbackStreamInterface,
+                                      CloseStream, StartStream,
+                                      StopStream, AbortStream,
+                                      IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable,
+                                      PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &alsaHostApi->blockingStreamInterface,
+                                      CloseStream, StartStream,
+                                      StopStream, AbortStream,
+                                      IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream,
+                                      GetStreamReadAvailable,
+                                      GetStreamWriteAvailable );
+
+    PA_ENSURE( PaUnixThreading_Initialize() );
+
+    return result;
+
+error:
+    if( alsaHostApi )
+    {
+        if( alsaHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( alsaHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( alsaHostApi->allocations );
+        }
+
+        PaUtil_FreeMemory( alsaHostApi );
+    }
+
+    return result;
+}
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaAlsaHostApiRepresentation *alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
+
+    assert( hostApi );
+
+    /** See AlsaErrorHandler and PaAlsa_Initialize for details.
+    */
+    /*snd_lib_error_set_handler(NULL);*/
+
+    if( alsaHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( alsaHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( alsaHostApi->allocations );
+    }
+
+    PaUtil_FreeMemory( alsaHostApi );
+    alsa_snd_config_update_free_global();
+
+    /* Close Alsa library. */
+    PaAlsa_CloseLibrary();
+}
+
+/** Determine max channels and default latencies.
+ *
+ * This function provides functionality to grope an opened (might be opened for capture or playback) pcm device for
+ * traits like max channels, suitable default latencies and default sample rate. Upon error, max channels is set to zero,
+ * and a suitable result returned. The device is closed before returning.
+ */
+static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
+        PaAlsaDeviceInfo* devInfo )
+{
+    PaError result = paNoError;
+    snd_pcm_hw_params_t *hwParams;
+    snd_pcm_uframes_t lowLatency = 512, highLatency = 2048;
+    unsigned int minChans, maxChans;
+    int* minChannels, * maxChannels;
+    double * defaultLowLatency, * defaultHighLatency, * defaultSampleRate =
+        &devInfo->baseDeviceInfo.defaultSampleRate;
+    double defaultSr = *defaultSampleRate;
+
+    assert( pcm );
+
+    PA_DEBUG(( "%s: collecting info ..\n", __FUNCTION__ ));
+
+    if( StreamDirection_In == mode )
+    {
+        minChannels = &devInfo->minInputChannels;
+        maxChannels = &devInfo->baseDeviceInfo.maxInputChannels;
+        defaultLowLatency = &devInfo->baseDeviceInfo.defaultLowInputLatency;
+        defaultHighLatency = &devInfo->baseDeviceInfo.defaultHighInputLatency;
+    }
+    else
+    {
+        minChannels = &devInfo->minOutputChannels;
+        maxChannels = &devInfo->baseDeviceInfo.maxOutputChannels;
+        defaultLowLatency = &devInfo->baseDeviceInfo.defaultLowOutputLatency;
+        defaultHighLatency = &devInfo->baseDeviceInfo.defaultHighOutputLatency;
+    }
+
+    ENSURE_( alsa_snd_pcm_nonblock( pcm, 0 ), paUnanticipatedHostError );
+
+    alsa_snd_pcm_hw_params_alloca( &hwParams );
+    alsa_snd_pcm_hw_params_any( pcm, hwParams );
+
+    if( defaultSr >= 0 )
+    {
+        /* Could be that the device opened in one mode supports samplerates that the other mode wont have,
+         * so try again .. */
+        if( SetApproximateSampleRate( pcm, hwParams, defaultSr ) < 0 )
+        {
+            defaultSr = -1.;
+            PA_DEBUG(( "%s: Original default samplerate failed, trying again ..\n", __FUNCTION__ ));
+        }
+    }
+
+    if( defaultSr < 0. )           /* Default sample rate not set */
+    {
+        unsigned int sampleRate = 44100;        /* Will contain approximate rate returned by alsa-lib */
+        if( alsa_snd_pcm_hw_params_set_rate_near( pcm, hwParams, &sampleRate, NULL ) < 0)
+        {
+            result = paUnanticipatedHostError;
+            goto error;
+        }
+        ENSURE_( GetExactSampleRate( hwParams, &defaultSr ), paUnanticipatedHostError );
+    }
+
+    ENSURE_( alsa_snd_pcm_hw_params_get_channels_min( hwParams, &minChans ), paUnanticipatedHostError );
+    ENSURE_( alsa_snd_pcm_hw_params_get_channels_max( hwParams, &maxChans ), paUnanticipatedHostError );
+    assert( maxChans <= INT_MAX );
+    assert( maxChans > 0 );    /* Weird linking issue could cause wrong version of ALSA symbols to be called,
+                                   resulting in zeroed values */
+
+    /* XXX: Limit to sensible number (ALSA plugins accept a crazy amount of channels)? */
+    if( isPlug && maxChans > 128 )
+    {
+        maxChans = 128;
+        PA_DEBUG(( "%s: Limiting number of plugin channels to %u\n", __FUNCTION__, maxChans ));
+    }
+
+    /* TWEAKME:
+     *
+     * Giving values for default min and max latency is not
+     * straightforward.  Here are our objectives:
+     *
+     *         * for low latency, we want to give the lowest value
+     *         that will work reliably.  This varies based on the
+     *         sound card, kernel, CPU, etc.  I think it is better
+     *         to give sub-optimal latency than to give a number
+     *         too low and cause dropouts.  My conservative
+     *         estimate at this point is to base it on 4096-sample
+     *         latency at 44.1 kHz, which gives a latency of 23ms.
+     *         * for high latency we want to give a large enough
+     *         value that dropouts are basically impossible.  This
+     *         doesn't really require as much tweaking, since
+     *         providing too large a number will just cause us to
+     *         select the nearest setting that will work at stream
+     *         config time.
+     */
+    ENSURE_( alsa_snd_pcm_hw_params_set_buffer_size_near( pcm, hwParams, &lowLatency ), paUnanticipatedHostError );
+
+    /* Have to reset hwParams, to set new buffer size */
+    ENSURE_( alsa_snd_pcm_hw_params_any( pcm, hwParams ), paUnanticipatedHostError );
+    ENSURE_( alsa_snd_pcm_hw_params_set_buffer_size_near( pcm, hwParams, &highLatency ), paUnanticipatedHostError );
+
+    *minChannels = (int)minChans;
+    *maxChannels = (int)maxChans;
+    *defaultSampleRate = defaultSr;
+    *defaultLowLatency = (double) lowLatency / *defaultSampleRate;
+    *defaultHighLatency = (double) highLatency / *defaultSampleRate;
+
+end:
+    alsa_snd_pcm_close( pcm );
+    return result;
+
+error:
+    goto end;
+}
+
+/* Initialize device info with invalid values (maxInputChannels and maxOutputChannels are set to zero since these indicate
+ * wether input/output is available) */
+static void InitializeDeviceInfo( PaDeviceInfo *deviceInfo )
+{
+    deviceInfo->structVersion = -1;
+    deviceInfo->name = NULL;
+    deviceInfo->hostApi = -1;
+    deviceInfo->maxInputChannels = 0;
+    deviceInfo->maxOutputChannels = 0;
+    deviceInfo->defaultLowInputLatency = -1.;
+    deviceInfo->defaultLowOutputLatency = -1.;
+    deviceInfo->defaultHighInputLatency = -1.;
+    deviceInfo->defaultHighOutputLatency = -1.;
+    deviceInfo->defaultSampleRate = -1.;
+}
+
+/* Helper struct */
+typedef struct
+{
+    char *alsaName;
+    char *name;
+    int isPlug;
+    int hasPlayback;
+    int hasCapture;
+} HwDevInfo;
+
+
+HwDevInfo predefinedNames[] = {
+    { "center_lfe", NULL, 0, 1, 0 },
+/* { "default", NULL, 0, 1, 0 }, */
+/* { "dmix", NULL, 0, 1, 0 }, */
+/* { "dpl", NULL, 0, 1, 0 }, */
+/* { "dsnoop", NULL, 0, 1, 0 }, */
+    { "front", NULL, 0, 1, 0 },
+    { "iec958", NULL, 0, 1, 0 },
+/* { "modem", NULL, 0, 1, 0 }, */
+    { "rear", NULL, 0, 1, 0 },
+    { "side", NULL, 0, 1, 0 },
+/*     { "spdif", NULL, 0, 0, 0 }, */
+    { "surround40", NULL, 0, 1, 0 },
+    { "surround41", NULL, 0, 1, 0 },
+    { "surround50", NULL, 0, 1, 0 },
+    { "surround51", NULL, 0, 1, 0 },
+    { "surround71", NULL, 0, 1, 0 },
+
+    { "AndroidPlayback_Earpiece_normal",         NULL, 0, 1, 0 },
+    { "AndroidPlayback_Speaker_normal",          NULL, 0, 1, 0 },
+    { "AndroidPlayback_Bluetooth_normal",        NULL, 0, 1, 0 },
+    { "AndroidPlayback_Headset_normal",          NULL, 0, 1, 0 },
+    { "AndroidPlayback_Speaker_Headset_normal",  NULL, 0, 1, 0 },
+    { "AndroidPlayback_Bluetooth-A2DP_normal",   NULL, 0, 1, 0 },
+    { "AndroidPlayback_ExtraDockSpeaker_normal", NULL, 0, 1, 0 },
+    { "AndroidPlayback_TvOut_normal",            NULL, 0, 1, 0 },
+
+    { "AndroidRecord_Microphone",        		 NULL, 0, 0, 1 },
+    { "AndroidRecord_Earpiece_normal",           NULL, 0, 0, 1 },
+    { "AndroidRecord_Speaker_normal",        	 NULL, 0, 0, 1 },
+    { "AndroidRecord_Headset_normal",            NULL, 0, 0, 1 },
+    { "AndroidRecord_Bluetooth_normal",  		 NULL, 0, 0, 1 },
+    { "AndroidRecord_Speaker_Headset_normal",    NULL, 0, 0, 1 },
+
+    { NULL, NULL, 0, 1, 0 }
+};
+
+static const HwDevInfo *FindDeviceName( const char *name )
+{
+    int i;
+
+    for( i = 0; predefinedNames[i].alsaName; i++ )
+    {
+        if( strcmp( name, predefinedNames[i].alsaName ) == 0 )
+        {
+            return &predefinedNames[i];
+        }
+    }
+
+    return NULL;
+}
+
+static PaError PaAlsa_StrDup( PaAlsaHostApiRepresentation *alsaApi,
+        char **dst,
+        const char *src)
+{
+    PaError result = paNoError;
+    int len = strlen( src ) + 1;
+
+    /* PA_DEBUG(("PaStrDup %s %d\n", src, len)); */
+
+    PA_UNLESS( *dst = (char *)PaUtil_GroupAllocateMemory( alsaApi->allocations, len ),
+            paInsufficientMemory );
+    strncpy( *dst, src, len );
+
+error:
+    return result;
+}
+
+/* Disregard some standard plugins
+ */
+static int IgnorePlugin( const char *pluginId )
+{
+    static const char *ignoredPlugins[] = {"hw", "plughw", "plug", "dsnoop", "tee",
+        "file", "null", "shm", "cards", "rate_convert", NULL};
+    int i = 0;
+    while( ignoredPlugins[i] )
+    {
+        if( !strcmp( pluginId, ignoredPlugins[i] ) )
+        {
+            return 1;
+        }
+        ++i;
+    }
+
+    return 0;
+}
+
+/** Open PCM device.
+ *
+ * Wrapper around alsa_snd_pcm_open which may repeatedly retry opening a device if it is busy, for
+ * a certain time. This is because dmix may temporarily hold on to a device after it (dmix)
+ * has been opened and closed.
+ * @param mode: Open mode (e.g., SND_PCM_BLOCKING).
+ * @param waitOnBusy: Retry opening busy device for up to one second?
+ **/
+static int OpenPcm( snd_pcm_t **pcmp, const char *name, snd_pcm_stream_t stream, int mode, int waitOnBusy )
+{
+    int tries = 0, maxTries = waitOnBusy ? busyRetries_ : 0;
+    int ret = alsa_snd_pcm_open( pcmp, name, stream, mode );
+    for( tries = 0; tries < maxTries && -EBUSY == ret; ++tries )
+    {
+        Pa_Sleep( 10 );
+        ret = alsa_snd_pcm_open( pcmp, name, stream, mode );
+        if( -EBUSY != ret )
+        {
+            PA_DEBUG(( "%s: Successfully opened initially busy device after %d tries\n",
+                        __FUNCTION__, tries ));
+        }
+    }
+    if( -EBUSY == ret )
+    {
+        PA_DEBUG(( "%s: Failed to open busy device '%s'\n", __FUNCTION__, name ));
+    }
+    else
+    {
+    	if (ret < 0)
+			PA_DEBUG(( "%s: Opened device '%s' ptr[%p] - result: [%d:%s]\n", __FUNCTION__, name, *pcmp, ret, alsa_snd_strerror(ret) ));
+    }
+
+    return ret;
+}
+
+static PaError FillInDevInfo( PaAlsaHostApiRepresentation *alsaApi, HwDevInfo* deviceName, int blocking,
+        PaAlsaDeviceInfo* devInfo, int* devIdx )
+{
+    PaError result = 0;
+    PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
+    snd_pcm_t *pcm = NULL;
+    PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
+
+	PA_DEBUG(( "%s: filling device info for: %s\n", __FUNCTION__, deviceName->name ));
+
+    /* Zero fields */
+    InitializeDeviceInfo( baseDeviceInfo );
+
+    /* to determine device capabilities, we must open the device and query the
+     * hardware parameter configuration space */
+
+    /* Query capture */
+    if( deviceName->hasCapture &&
+            OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
+            >= 0 )
+    {
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo ) != paNoError )
+        {
+            /* Error */
+            PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
+            goto end;
+        }
+    }
+
+    /* Query playback */
+    if( deviceName->hasPlayback &&
+            OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
+            >= 0 )
+    {
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo ) != paNoError )
+        {
+            /* Error */
+            PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
+            goto end;
+        }
+    }
+
+    baseDeviceInfo->structVersion = 2;
+    baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
+    baseDeviceInfo->name = deviceName->name;
+    devInfo->alsaName = deviceName->alsaName;
+    devInfo->isPlug = deviceName->isPlug;
+
+    /* A: Storing pointer to PaAlsaDeviceInfo object as pointer to PaDeviceInfo object.
+     * Should now be safe to add device info, unless the device supports neither capture nor playback
+     */
+    if( baseDeviceInfo->maxInputChannels > 0 || baseDeviceInfo->maxOutputChannels > 0 )
+    {
+        /* Make device default if there isn't already one or it is the ALSA "default" device */
+        if( (baseApi->info.defaultInputDevice == paNoDevice || !strcmp(deviceName->alsaName,
+                        "default" )) && baseDeviceInfo->maxInputChannels > 0 )
+        {
+            baseApi->info.defaultInputDevice = *devIdx;
+            PA_DEBUG(("Default input device: %s\n", deviceName->name));
+        }
+        if( (baseApi->info.defaultOutputDevice == paNoDevice || !strcmp(deviceName->alsaName,
+                        "default" )) && baseDeviceInfo->maxOutputChannels > 0 )
+        {
+            baseApi->info.defaultOutputDevice = *devIdx;
+            PA_DEBUG(("Default output device: %s\n", deviceName->name));
+        }
+        PA_DEBUG(("%s: Adding device %s: %d\n", __FUNCTION__, deviceName->name, *devIdx));
+        baseApi->deviceInfos[*devIdx] = (PaDeviceInfo *) devInfo;
+        (*devIdx) += 1;
+    }
+    else
+    {
+    	PA_DEBUG(( "%s: skipped device: %s, all channels - 0\n", __FUNCTION__, deviceName->name ));
+    }
+
+end:
+    return result;
+}
+
+/* Build PaDeviceInfo list, ignore devices for which we cannot determine capabilities (possibly busy, sigh) */
+static PaError BuildDeviceList( PaAlsaHostApiRepresentation *alsaApi )
+{
+    PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
+    PaAlsaDeviceInfo *deviceInfoArray;
+    int cardIdx = -1, devIdx = 0;
+    snd_ctl_card_info_t *cardInfo;
+    PaError result = paNoError;
+    size_t numDeviceNames = 0, maxDeviceNames = 1, i;
+    HwDevInfo *hwDevInfos = NULL;
+    snd_config_t *topNode = NULL;
+    snd_pcm_info_t *pcmInfo;
+    int res;
+    int blocking = SND_PCM_NONBLOCK;
+    char alsaCardName[50];
+#ifdef PA_ENABLE_DEBUG_OUTPUT
+    PaTime startTime = PaUtil_GetTime();
+#endif
+
+    if( getenv( "PA_ALSA_INITIALIZE_BLOCK" ) && atoi( getenv( "PA_ALSA_INITIALIZE_BLOCK" ) ) )
+        blocking = 0;
+
+    /* These two will be set to the first working input and output device, respectively */
+    baseApi->info.defaultInputDevice = paNoDevice;
+    baseApi->info.defaultOutputDevice = paNoDevice;
+
+    /* Gather info about hw devices
+
+     * alsa_snd_card_next() modifies the integer passed to it to be:
+     *      the index of the first card if the parameter is -1
+     *      the index of the next card if the parameter is the index of a card
+     *      -1 if there are no more cards
+     *
+     * The function itself returns 0 if it succeeded. */
+    cardIdx = -1;
+    alsa_snd_ctl_card_info_alloca( &cardInfo );
+    alsa_snd_pcm_info_alloca( &pcmInfo );
+    while( alsa_snd_card_next( &cardIdx ) == 0 && cardIdx >= 0 )
+    {
+        char *cardName;
+        int devIdx = -1;
+        snd_ctl_t *ctl;
+        char buf[50];
+
+        snprintf( alsaCardName, sizeof (alsaCardName), "hw:%d", cardIdx );
+
+        /* Acquire name of card */
+        if( alsa_snd_ctl_open( &ctl, alsaCardName, 0 ) < 0 )
+        {
+            /* Unable to open card :( */
+            PA_DEBUG(( "%s: Unable to open device %s\n", __FUNCTION__, alsaCardName ));
+            continue;
+        }
+        alsa_snd_ctl_card_info( ctl, cardInfo );
+
+        PA_ENSURE( PaAlsa_StrDup( alsaApi, &cardName, alsa_snd_ctl_card_info_get_name( cardInfo )) );
+
+        while( alsa_snd_ctl_pcm_next_device( ctl, &devIdx ) == 0 && devIdx >= 0 )
+        {
+            char *alsaDeviceName, *deviceName;
+            size_t len;
+            int hasPlayback = 0, hasCapture = 0;
+            snprintf( buf, sizeof (buf), "hw:%d,%d", cardIdx, devIdx );
+
+            /* Obtain info about this particular device */
+            alsa_snd_pcm_info_set_device( pcmInfo, devIdx );
+            alsa_snd_pcm_info_set_subdevice( pcmInfo, 0 );
+            alsa_snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_CAPTURE );
+            if( alsa_snd_ctl_pcm_info( ctl, pcmInfo ) >= 0 )
+            {
+                hasCapture = 1;
+            }
+
+            alsa_snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_PLAYBACK );
+            if( alsa_snd_ctl_pcm_info( ctl, pcmInfo ) >= 0 )
+            {
+                hasPlayback = 1;
+            }
+
+            if( !hasPlayback && !hasCapture )
+            {
+                /* Error */
+                continue;
+            }
+
+            /* The length of the string written by snprintf plus terminating 0 */
+            len = snprintf( NULL, 0, "%s: %s (%s)", cardName, alsa_snd_pcm_info_get_name( pcmInfo ), buf ) + 1;
+            PA_UNLESS( deviceName = (char *)PaUtil_GroupAllocateMemory( alsaApi->allocations, len ),
+                    paInsufficientMemory );
+            snprintf( deviceName, len, "%s: %s (%s)", cardName,
+                    alsa_snd_pcm_info_get_name( pcmInfo ), buf );
+
+            ++numDeviceNames;
+            if( !hwDevInfos || numDeviceNames > maxDeviceNames )
+            {
+                maxDeviceNames *= 2;
+                PA_UNLESS( hwDevInfos = (HwDevInfo *) realloc( hwDevInfos, maxDeviceNames * sizeof (HwDevInfo) ),
+                        paInsufficientMemory );
+            }
+
+            PA_ENSURE( PaAlsa_StrDup( alsaApi, &alsaDeviceName, buf ) );
+
+            hwDevInfos[ numDeviceNames - 1 ].alsaName = alsaDeviceName;
+            hwDevInfos[ numDeviceNames - 1 ].name = deviceName;
+            hwDevInfos[ numDeviceNames - 1 ].isPlug = 0;
+            hwDevInfos[ numDeviceNames - 1 ].hasPlayback = hasPlayback;
+            hwDevInfos[ numDeviceNames - 1 ].hasCapture = hasCapture;
+        }
+        alsa_snd_ctl_close( ctl );
+    }
+
+    /* Iterate over plugin devices */
+
+    if( NULL == (*alsa_snd_config) )
+    {
+        /* alsa_snd_config_update is called implicitly by some functions, if this hasn't happened snd_config will be NULL (bleh) */
+        ENSURE_( alsa_snd_config_update(), paUnanticipatedHostError );
+        PA_DEBUG(( "Updating snd_config\n" ));
+    }
+    assert(  *alsa_snd_config );
+    if( (res = alsa_snd_config_search( *alsa_snd_config, "pcm", &topNode )) >= 0 )
+    {
+        snd_config_iterator_t i, next;
+
+        alsa_snd_config_for_each( i, next, topNode )
+        {
+            const char *tpStr = "unknown", *idStr = NULL;
+            int err = 0;
+
+            char *alsaDeviceName, *deviceName;
+            const HwDevInfo *predefined = NULL;
+            snd_config_t *n = alsa_snd_config_iterator_entry( i ), * tp = NULL;;
+
+            if( (err = alsa_snd_config_search( n, "type", &tp )) < 0 )
+            {
+                if( -ENOENT != err )
+                {
+                    ENSURE_(err, paUnanticipatedHostError);
+                }
+            }
+            else
+            {
+                ENSURE_( alsa_snd_config_get_string( tp, &tpStr ), paUnanticipatedHostError );
+            }
+            ENSURE_( alsa_snd_config_get_id( n, &idStr ), paUnanticipatedHostError );
+            if( IgnorePlugin( idStr ) )
+            {
+                PA_DEBUG(( "%s: Ignoring ALSA plugin device [%s] of type [%s]\n", __FUNCTION__, idStr, tpStr ));
+                continue;
+            }
+            PA_DEBUG(( "%s: Found plugin [%s] of type [%s]\n", __FUNCTION__, idStr, tpStr ));
+
+            PA_UNLESS( alsaDeviceName = (char*)PaUtil_GroupAllocateMemory( alsaApi->allocations,
+                                                            strlen(idStr) + 6 ), paInsufficientMemory );
+            strcpy( alsaDeviceName, idStr );
+            PA_UNLESS( deviceName = (char*)PaUtil_GroupAllocateMemory( alsaApi->allocations,
+                                                            strlen(idStr) + 1 ), paInsufficientMemory );
+            strcpy( deviceName, idStr );
+
+            ++numDeviceNames;
+            if( !hwDevInfos || numDeviceNames > maxDeviceNames )
+            {
+                maxDeviceNames *= 2;
+                PA_UNLESS( hwDevInfos = (HwDevInfo *) realloc( hwDevInfos, maxDeviceNames * sizeof (HwDevInfo) ),
+                        paInsufficientMemory );
+            }
+
+            predefined = FindDeviceName( alsaDeviceName );
+
+            hwDevInfos[numDeviceNames - 1].alsaName = alsaDeviceName;
+            hwDevInfos[numDeviceNames - 1].name = deviceName;
+            hwDevInfos[numDeviceNames - 1].isPlug = 1;
+
+            if( predefined )
+            {
+                hwDevInfos[numDeviceNames - 1].hasPlayback = predefined->hasPlayback;
+                hwDevInfos[numDeviceNames - 1].hasCapture = predefined->hasCapture;
+            }
+            else
+            {
+                hwDevInfos[numDeviceNames - 1].hasPlayback = 1;
+                hwDevInfos[numDeviceNames - 1].hasCapture = 1;
+            }
+        }
+    }
+    else
+        PA_DEBUG(( "%s: Iterating over ALSA plugins failed: %s\n", __FUNCTION__, alsa_snd_strerror( res ) ));
+
+    /* allocate deviceInfo memory based on the number of devices */
+    PA_UNLESS( baseApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+            alsaApi->allocations, sizeof(PaDeviceInfo*) * (numDeviceNames) ), paInsufficientMemory );
+
+    /* allocate all device info structs in a contiguous block */
+    PA_UNLESS( deviceInfoArray = (PaAlsaDeviceInfo*)PaUtil_GroupAllocateMemory(
+            alsaApi->allocations, sizeof(PaAlsaDeviceInfo) * numDeviceNames ), paInsufficientMemory );
+
+    /* Loop over list of cards, filling in info. If a device is deemed unavailable (can't get name),
+     * it's ignored.
+     *
+     * Note that we do this in two stages. This is a workaround owing to the fact that the 'dmix'
+     * plugin may cause the underlying hardware device to be busy for a short while even after it
+     * (dmix) is closed. The 'default' plugin may also point to the dmix plugin, so the same goes
+     * for this.
+     */
+	PA_DEBUG(( "%s: filling device info for %d devices\n", __FUNCTION__, numDeviceNames ));
+    for( i = 0, devIdx = 0; i < numDeviceNames; ++i )
+    {
+        PaAlsaDeviceInfo* devInfo = &deviceInfoArray[i];
+        HwDevInfo* hwInfo = &hwDevInfos[i];
+        if( !strcmp( hwInfo->name, "dmix" ) || !strcmp( hwInfo->name, "default" ) )
+        {
+            continue;
+        }
+
+        PA_ENSURE( FillInDevInfo( alsaApi, hwInfo, blocking, devInfo, &devIdx ) );
+    }
+    assert( devIdx < numDeviceNames );
+    /* Now inspect 'dmix' and 'default' plugins */
+    for( i = 0; i < numDeviceNames; ++i )
+    {
+        PaAlsaDeviceInfo* devInfo = &deviceInfoArray[i];
+        HwDevInfo* hwInfo = &hwDevInfos[i];
+        if( strcmp( hwInfo->name, "dmix" ) && strcmp( hwInfo->name, "default" ) )
+        {
+            continue;
+        }
+
+        PA_ENSURE( FillInDevInfo( alsaApi, hwInfo, blocking, devInfo,
+                    &devIdx ) );
+    }
+    free( hwDevInfos );
+
+    baseApi->info.deviceCount = devIdx;   /* Number of successfully queried devices */
+
+#ifdef PA_ENABLE_DEBUG_OUTPUT
+    PA_DEBUG(( "%s: Building device list took %f seconds\n", __FUNCTION__, PaUtil_GetTime() - startTime ));
+#endif
+
+end:
+    return result;
+
+error:
+    /* No particular action */
+    goto end;
+}
+
+/* Check against known device capabilities */
+static PaError ValidateParameters( const PaStreamParameters *parameters, PaUtilHostApiRepresentation *hostApi, StreamDirection mode )
+{
+    PaError result = paNoError;
+    int maxChans;
+    const PaAlsaDeviceInfo *deviceInfo = NULL;
+    assert( parameters );
+
+    if( parameters->device != paUseHostApiSpecificDeviceSpecification )
+    {
+        assert( parameters->device < hostApi->info.deviceCount );
+        PA_UNLESS( parameters->hostApiSpecificStreamInfo == NULL, paBadIODeviceCombination );
+        deviceInfo = GetDeviceInfo( hostApi, parameters->device );
+    }
+    else
+    {
+        const PaAlsaStreamInfo *streamInfo = parameters->hostApiSpecificStreamInfo;
+
+        PA_UNLESS( parameters->device == paUseHostApiSpecificDeviceSpecification, paInvalidDevice );
+        PA_UNLESS( streamInfo->size == sizeof (PaAlsaStreamInfo) && streamInfo->version == 1,
+                paIncompatibleHostApiSpecificStreamInfo );
+        PA_UNLESS( streamInfo->deviceString != NULL, paInvalidDevice );
+
+        /* Skip further checking */
+        return paNoError;
+    }
+
+    assert( deviceInfo );
+    assert( parameters->hostApiSpecificStreamInfo == NULL );
+    maxChans = (StreamDirection_In == mode ? deviceInfo->baseDeviceInfo.maxInputChannels :
+        deviceInfo->baseDeviceInfo.maxOutputChannels);
+    PA_UNLESS( parameters->channelCount <= maxChans, paInvalidChannelCount );
+
+error:
+    return result;
+}
+
+/* Given an open stream, what sample formats are available? */
+static PaSampleFormat GetAvailableFormats( snd_pcm_t *pcm )
+{
+    PaSampleFormat available = 0;
+    snd_pcm_hw_params_t *hwParams;
+    alsa_snd_pcm_hw_params_alloca( &hwParams );
+
+    alsa_snd_pcm_hw_params_any( pcm, hwParams );
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT ) >= 0)
+        available |= paFloat32;
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S32 ) >= 0)
+        available |= paInt32;
+
+#ifdef PA_LITTLE_ENDIAN
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3LE ) >= 0)
+        available |= paInt24;
+#elif defined PA_BIG_ENDIAN
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3BE ) >= 0)
+        available |= paInt24;
+#endif
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S16 ) >= 0)
+        available |= paInt16;
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U8 ) >= 0)
+        available |= paUInt8;
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S8 ) >= 0)
+        available |= paInt8;
+
+    return available;
+}
+
+/* Output to console all formats supported by device */
+static void LogAllAvailableFormats( snd_pcm_t *pcm )
+{
+    PaSampleFormat available = 0;
+    snd_pcm_hw_params_t *hwParams;
+    alsa_snd_pcm_hw_params_alloca( &hwParams );
+
+    alsa_snd_pcm_hw_params_any( pcm, hwParams );
+
+	PA_DEBUG(( " --- Supported Formats ---\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S8 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S8\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U8 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U8\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S16_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S16_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S16_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S16_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U16_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U16_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U16_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U16_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S24_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S24_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U24_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U24_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U24_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U24_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT64_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT64_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT64_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT64_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_IEC958_SUBFRAME_LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_IEC958_SUBFRAME_LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_IEC958_SUBFRAME_BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_IEC958_SUBFRAME_BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_MU_LAW ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_MU_LAW\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_A_LAW ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_A_LAW\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_IMA_ADPCM ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_IMA_ADPCM\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_MPEG ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_MPEG\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_GSM ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_GSM\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_SPECIAL ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_SPECIAL\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S24_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S24_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U24_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U24_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U24_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U24_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S20_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S20_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S20_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S20_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U20_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U20_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U20_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U20_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S18_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S18_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S18_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S18_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U18_3LE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U18_3LE\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U18_3BE ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U18_3BE\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S16 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S16\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U16 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U16\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S24\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U24 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U24\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S32 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_S32\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U32 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_U32\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT\n" ));
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT64 ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_FLOAT64\n" ));
+
+    if( alsa_snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_IEC958_SUBFRAME ) >= 0)
+        PA_DEBUG(( "SND_PCM_FORMAT_IEC958_SUBFRAME\n" ));
+
+    PA_DEBUG(( " -------------------------\n" ));
+}
+
+static snd_pcm_format_t Pa2AlsaFormat( PaSampleFormat paFormat )
+{
+    switch( paFormat )
+    {
+        case paFloat32:
+            return SND_PCM_FORMAT_FLOAT;
+
+        case paInt16:
+            return SND_PCM_FORMAT_S16;
+
+        case paInt24:
+#ifdef PA_LITTLE_ENDIAN
+            return SND_PCM_FORMAT_S24_3LE;
+#elif defined PA_BIG_ENDIAN
+            return SND_PCM_FORMAT_S24_3BE;
+#endif
+
+        case paInt32:
+            return SND_PCM_FORMAT_S32;
+
+        case paInt8:
+            return SND_PCM_FORMAT_S8;
+
+        case paUInt8:
+            return SND_PCM_FORMAT_U8;
+
+        default:
+            return SND_PCM_FORMAT_UNKNOWN;
+    }
+}
+
+/** Open an ALSA pcm handle.
+ *
+ * The device to be open can be specified in a custom PaAlsaStreamInfo struct, or it will be a device number. In case of a
+ * device number, it maybe specified through an env variable (PA_ALSA_PLUGHW) that we should open the corresponding plugin
+ * device.
+ */
+static PaError AlsaOpen( const PaUtilHostApiRepresentation *hostApi, const PaStreamParameters *params, StreamDirection
+        streamDir, snd_pcm_t **pcm )
+{
+    PaError result = paNoError;
+    int ret;
+    char dnameArray[50];
+    const char* deviceName = dnameArray;
+    const PaAlsaDeviceInfo *deviceInfo = NULL;
+    PaAlsaStreamInfo *streamInfo = (PaAlsaStreamInfo *)params->hostApiSpecificStreamInfo;
+
+    if( !streamInfo )
+    {
+        int usePlug = 0;
+        deviceInfo = GetDeviceInfo( hostApi, params->device );
+
+        /* If device name starts with hw: and PA_ALSA_PLUGHW is 1, we open the plughw device instead */
+        if( !strncmp( "hw:", deviceInfo->alsaName, 3 ) && getenv( "PA_ALSA_PLUGHW" ) )
+            usePlug = atoi( getenv( "PA_ALSA_PLUGHW" ) );
+        if( usePlug )
+            snprintf( dnameArray, 50, "plug%s", deviceInfo->alsaName );
+        else
+            deviceName = deviceInfo->alsaName;
+    }
+    else
+        deviceName = streamInfo->deviceString;
+
+    PA_DEBUG(( "%s: Opening device %s\n", __FUNCTION__, deviceName ));
+    if( (ret = OpenPcm( pcm, deviceName, streamDir == StreamDirection_In ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK,
+                    SND_PCM_NONBLOCK, 1 )) < 0 )
+    {
+        /* Not to be closed */
+        *pcm = NULL;
+        ENSURE_( ret, -EBUSY == ret ? paDeviceUnavailable : paBadIODeviceCombination );
+    }
+    ENSURE_( alsa_snd_pcm_nonblock( *pcm, 0 ), paUnanticipatedHostError );
+
+end:
+    return result;
+
+error:
+    goto end;
+}
+
+static PaError TestParameters( const PaUtilHostApiRepresentation *hostApi, const PaStreamParameters *parameters,
+        double sampleRate, StreamDirection streamDir )
+{
+    PaError result = paNoError;
+    snd_pcm_t *pcm = NULL;
+    PaSampleFormat availableFormats;
+    /* We are able to adapt to a number of channels less than what the device supports */
+    unsigned int numHostChannels;
+    PaSampleFormat hostFormat;
+    snd_pcm_hw_params_t *hwParams;
+    alsa_snd_pcm_hw_params_alloca( &hwParams );
+
+    if( !parameters->hostApiSpecificStreamInfo )
+    {
+        const PaAlsaDeviceInfo *devInfo = GetDeviceInfo( hostApi, parameters->device );
+        numHostChannels = PA_MAX( parameters->channelCount, StreamDirection_In == streamDir ?
+                devInfo->minInputChannels : devInfo->minOutputChannels );
+    }
+    else
+        numHostChannels = parameters->channelCount;
+
+    PA_ENSURE( AlsaOpen( hostApi, parameters, streamDir, &pcm ) );
+
+    alsa_snd_pcm_hw_params_any( pcm, hwParams );
+
+    if( SetApproximateSampleRate( pcm, hwParams, sampleRate ) < 0 )
+    {
+        result = paInvalidSampleRate;
+        goto error;
+    }
+
+    if( alsa_snd_pcm_hw_params_set_channels( pcm, hwParams, numHostChannels ) < 0 )
+    {
+        result = paInvalidChannelCount;
+        goto error;
+    }
+
+    /* See if we can find a best possible match */
+    availableFormats = GetAvailableFormats( pcm );
+    PA_ENSURE( hostFormat = PaUtil_SelectClosestAvailableFormat( availableFormats, parameters->sampleFormat ) );
+
+    /* Some specific hardware (reported: Audio8 DJ) can fail with assertion during this step. */
+    ENSURE_( alsa_snd_pcm_hw_params_set_format( pcm, hwParams, Pa2AlsaFormat( hostFormat ) ), paUnanticipatedHostError );
+
+    {
+        /* It happens that this call fails because the device is busy */
+        int ret = 0;
+        if( (ret = alsa_snd_pcm_hw_params( pcm, hwParams )) < 0)
+        {
+            if( -EINVAL == ret )
+            {
+                /* Don't know what to return here */
+                result = paBadIODeviceCombination;
+                goto error;
+            }
+            else if( -EBUSY == ret )
+            {
+                result = paDeviceUnavailable;
+                PA_DEBUG(( "%s: Device is busy\n", __FUNCTION__ ));
+            }
+            else
+            {
+                result = paUnanticipatedHostError;
+            }
+
+            ENSURE_( ret, result );
+        }
+    }
+
+end:
+    if( pcm )
+    {
+        alsa_snd_pcm_close( pcm );
+    }
+    return result;
+
+error:
+    goto end;
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    int inputChannelCount = 0, outputChannelCount = 0;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaError result = paFormatIsSupported;
+
+    if( inputParameters )
+    {
+        PA_ENSURE( ValidateParameters( inputParameters, hostApi, StreamDirection_In ) );
+
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+    }
+
+    if( outputParameters )
+    {
+        PA_ENSURE( ValidateParameters( outputParameters, hostApi, StreamDirection_Out ) );
+
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+    }
+
+    if( inputChannelCount )
+    {
+        if( (result = TestParameters( hostApi, inputParameters, sampleRate, StreamDirection_In ))
+                != paNoError )
+            goto error;
+    }
+    if ( outputChannelCount )
+    {
+        if( (result = TestParameters( hostApi, outputParameters, sampleRate, StreamDirection_Out ))
+                != paNoError )
+            goto error;
+    }
+
+    return paFormatIsSupported;
+
+error:
+    return result;
+}
+
+static PaError PaAlsaStreamComponent_Initialize( PaAlsaStreamComponent *self, PaAlsaHostApiRepresentation *alsaApi,
+        const PaStreamParameters *params, StreamDirection streamDir, int callbackMode )
+{
+    PaError result = paNoError;
+    PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
+    assert( params->channelCount > 0 );
+
+    /* Make sure things have an initial value */
+    memset( self, 0, sizeof (PaAlsaStreamComponent) );
+
+    if( NULL == params->hostApiSpecificStreamInfo )
+    {
+        const PaAlsaDeviceInfo *devInfo = GetDeviceInfo( &alsaApi->baseHostApiRep, params->device );
+        self->numHostChannels = PA_MAX( params->channelCount, StreamDirection_In == streamDir ? devInfo->minInputChannels
+                : devInfo->minOutputChannels );
+    }
+    else
+    {
+        /* We're blissfully unaware of the minimum channelCount */
+        self->numHostChannels = params->channelCount;
+    }
+
+    self->device = params->device;
+
+    PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
+    self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
+
+    PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
+
+    self->hostSampleFormat = hostSampleFormat;
+    self->nativeFormat = Pa2AlsaFormat( hostSampleFormat );
+    self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
+    self->numUserChannels = params->channelCount;
+    self->streamDir = streamDir;
+    self->canMmap = 0;
+    self->nonMmapBuffer = NULL;
+    self->nonMmapBufferSize = 0;
+
+    if( !callbackMode && !self->userInterleaved )
+    {
+        /* Pre-allocate non-interleaved user provided buffers */
+        PA_UNLESS( self->userBuffers = PaUtil_AllocateMemory( sizeof (void *) * self->numUserChannels ),
+                paInsufficientMemory );
+    }
+
+error:
+
+    /* Log all available formats. */
+    if ( hostSampleFormat == paSampleFormatNotSupported )
+	{
+        LogAllAvailableFormats( self->pcm );
+        PA_DEBUG(( "%s: Please provide the log output to PortAudio developers, your hardware does not have any sample format implemented yet.\n", __FUNCTION__ ));
+    }
+
+    return result;
+}
+
+static void PaAlsaStreamComponent_Terminate( PaAlsaStreamComponent *self )
+{
+    alsa_snd_pcm_close( self->pcm );
+    if( self->userBuffers )
+        PaUtil_FreeMemory( self->userBuffers );
+}
+
+/*
+static int nearbyint_(float value) {
+    if(  value - (int)value > .5 )
+        return (int)ceil( value );
+    return (int)floor( value );
+}
+*/
+
+/** Initiate configuration, preparing for determining a period size suitable for both capture and playback components.
+ *
+ */
+static PaError PaAlsaStreamComponent_InitialConfigure( PaAlsaStreamComponent *self, const PaStreamParameters *params,
+        int primeBuffers, snd_pcm_hw_params_t *hwParams, double *sampleRate )
+{
+    /* Configuration consists of setting all of ALSA's parameters.
+     * These parameters come in two flavors: hardware parameters
+     * and software paramters.  Hardware parameters will affect
+     * the way the device is initialized, software parameters
+     * affect the way ALSA interacts with me, the user-level client.
+     */
+
+    PaError result = paNoError;
+    snd_pcm_access_t accessMode, alternateAccessMode;
+    int dir = 0;
+    snd_pcm_t *pcm = self->pcm;
+    double sr = *sampleRate;
+    unsigned int minPeriods = 2;
+
+    /* self->framesPerBuffer = framesPerHostBuffer; */
+
+    /* ... fill up the configuration space with all possibile
+     * combinations of parameters this device will accept */
+    ENSURE_( alsa_snd_pcm_hw_params_any( pcm, hwParams ), paUnanticipatedHostError );
+
+    ENSURE_( alsa_snd_pcm_hw_params_set_periods_integer( pcm, hwParams ), paUnanticipatedHostError );
+    /* I think there should be at least 2 periods (even though ALSA doesn't appear to enforce this) */
+    dir = 0;
+    ENSURE_( alsa_snd_pcm_hw_params_set_periods_min( pcm, hwParams, &minPeriods, &dir ), paUnanticipatedHostError );
+
+    if( self->userInterleaved )
+    {
+        accessMode          = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+        alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+
+        /* test if MMAP supported */
+        self->canMmap = alsa_snd_pcm_hw_params_test_access( pcm, hwParams, accessMode ) >= 0 ||
+                        alsa_snd_pcm_hw_params_test_access( pcm, hwParams, alternateAccessMode ) >= 0;
+
+        PA_DEBUG(("%s: device MMAP SND_PCM_ACCESS_MMAP_INTERLEAVED: %s\n", __FUNCTION__, (alsa_snd_pcm_hw_params_test_access( pcm, hwParams, accessMode ) >= 0 ? "YES" : "NO")));
+        PA_DEBUG(("%s: device MMAP SND_PCM_ACCESS_MMAP_NONINTERLEAVED: %s\n", __FUNCTION__, (alsa_snd_pcm_hw_params_test_access( pcm, hwParams, alternateAccessMode ) >= 0 ? "YES" : "NO")));
+
+        if (!self->canMmap)
+        {
+            accessMode          = SND_PCM_ACCESS_RW_INTERLEAVED;
+            alternateAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
+        }
+    }
+    else
+    {
+        accessMode          = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+        alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+
+        /* test if MMAP supported */
+        self->canMmap = alsa_snd_pcm_hw_params_test_access( pcm, hwParams, accessMode ) >= 0 ||
+                        alsa_snd_pcm_hw_params_test_access( pcm, hwParams, alternateAccessMode ) >= 0;
+
+        PA_DEBUG(("%s: device MMAP SND_PCM_ACCESS_MMAP_NONINTERLEAVED: %s\n", __FUNCTION__, (alsa_snd_pcm_hw_params_test_access( pcm, hwParams, accessMode ) >= 0 ? "YES" : "NO")));
+        PA_DEBUG(("%s: device MMAP SND_PCM_ACCESS_MMAP_INTERLEAVED: %s\n", __FUNCTION__, (alsa_snd_pcm_hw_params_test_access( pcm, hwParams, alternateAccessMode ) >= 0 ? "YES" : "NO")));
+
+        if (!self->canMmap)
+        {
+            accessMode          = SND_PCM_ACCESS_RW_NONINTERLEAVED;
+            alternateAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
+        }
+    }
+
+    PA_DEBUG(("%s: device can MMAP: %s\n", __FUNCTION__, (self->canMmap ? "YES" : "NO")));
+
+    /* If requested access mode fails, try alternate mode */
+    if( alsa_snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
+    {
+        int err = 0;
+        if( (err = alsa_snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
+        {
+            result = paUnanticipatedHostError;
+            PaUtil_SetLastHostErrorInfo( paALSA, err, alsa_snd_strerror( err ) );
+            goto error;
+        }
+        /* Flip mode */
+        self->hostInterleaved = !self->userInterleaved;
+    }
+
+    /* Some specific hardware (reported: Audio8 DJ) can fail with assertion during this step. */
+    ENSURE_( alsa_snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
+
+    ENSURE_( SetApproximateSampleRate( pcm, hwParams, sr ), paInvalidSampleRate );
+    ENSURE_( GetExactSampleRate( hwParams, &sr ), paUnanticipatedHostError );
+    /* reject if there's no sample rate within 1% of the one requested */
+    if( (fabs( *sampleRate - sr ) / *sampleRate) > 0.01 )
+    {
+        PA_DEBUG(("%s: Wanted %f, closest sample rate was %d\n", __FUNCTION__, sampleRate, sr ));
+        PA_ENSURE( paInvalidSampleRate );
+    }
+
+    ENSURE_( alsa_snd_pcm_hw_params_set_channels( pcm, hwParams, self->numHostChannels ), paInvalidChannelCount );
+
+    *sampleRate = sr;
+
+end:
+    return result;
+
+error:
+    /* No particular action */
+    goto end;
+}
+
+/** Finish the configuration of the component's ALSA device.
+ *
+ * As part of this method, the component's bufferSize attribute will be set.
+ * @param latency: The latency for this component.
+ */
+static PaError PaAlsaStreamComponent_FinishConfigure( PaAlsaStreamComponent *self, snd_pcm_hw_params_t* hwParams,
+        const PaStreamParameters *params, int primeBuffers, double sampleRate, PaTime* latency )
+{
+    PaError result = paNoError;
+    snd_pcm_sw_params_t* swParams;
+    snd_pcm_uframes_t bufSz = 0;
+    *latency = -1.;
+
+    alsa_snd_pcm_sw_params_alloca( &swParams );
+
+    bufSz = params->suggestedLatency * sampleRate;
+    ENSURE_( alsa_snd_pcm_hw_params_set_buffer_size_near( self->pcm, hwParams, &bufSz ), paUnanticipatedHostError );
+
+    /* Set the parameters! */
+    {
+        int r = alsa_snd_pcm_hw_params( self->pcm, hwParams );
+#ifdef PA_ENABLE_DEBUG_OUTPUT
+        if( r < 0 )
+        {
+            snd_output_t *output = NULL;
+            alsa_snd_output_stdio_attach( &output, stderr, 0 );
+            alsa_snd_pcm_hw_params_dump( hwParams, output );
+        }
+#endif
+        ENSURE_(r, paUnanticipatedHostError );
+    }
+    if (alsa_snd_pcm_hw_params_get_buffer_size != NULL)
+    {
+		ENSURE_( alsa_snd_pcm_hw_params_get_buffer_size( hwParams, &self->bufferSize ), paUnanticipatedHostError );
+	}
+	else
+	{
+		self->bufferSize = bufSz;
+	}
+
+    /* Latency in seconds */
+    *latency = self->bufferSize / sampleRate;
+
+    /* Now software parameters... */
+    ENSURE_( alsa_snd_pcm_sw_params_current( self->pcm, swParams ), paUnanticipatedHostError );
+
+    ENSURE_( alsa_snd_pcm_sw_params_set_start_threshold( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
+    ENSURE_( alsa_snd_pcm_sw_params_set_stop_threshold( self->pcm, swParams, self->bufferSize ), paUnanticipatedHostError );
+
+    /* Silence buffer in the case of underrun */
+    if( !primeBuffers ) /* XXX: Make sense? */
+    {
+        snd_pcm_uframes_t boundary;
+        ENSURE_( alsa_snd_pcm_sw_params_get_boundary( swParams, &boundary ), paUnanticipatedHostError );
+        ENSURE_( alsa_snd_pcm_sw_params_set_silence_threshold( self->pcm, swParams, 0 ), paUnanticipatedHostError );
+        ENSURE_( alsa_snd_pcm_sw_params_set_silence_size( self->pcm, swParams, boundary ), paUnanticipatedHostError );
+    }
+
+    ENSURE_( alsa_snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
+    ENSURE_( alsa_snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
+    ENSURE_( alsa_snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
+
+    /* Set the parameters! */
+    ENSURE_( alsa_snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
+
+error:
+    return result;
+}
+
+static PaError PaAlsaStream_Initialize( PaAlsaStream *self, PaAlsaHostApiRepresentation *alsaApi, const PaStreamParameters *inParams,
+        const PaStreamParameters *outParams, double sampleRate, unsigned long framesPerUserBuffer, PaStreamCallback callback,
+        PaStreamFlags streamFlags, void *userData )
+{
+    PaError result = paNoError;
+    assert( self );
+
+    memset( self, 0, sizeof (PaAlsaStream) );
+
+    if( NULL != callback )
+    {
+        PaUtil_InitializeStreamRepresentation( &self->streamRepresentation,
+                                               &alsaApi->callbackStreamInterface,
+                                               callback, userData );
+        self->callbackMode = 1;
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &self->streamRepresentation,
+                                               &alsaApi->blockingStreamInterface,
+                                               NULL, userData );
+    }
+
+    self->framesPerUserBuffer = framesPerUserBuffer;
+    self->neverDropInput = streamFlags & paNeverDropInput;
+    /* XXX: Ignore paPrimeOutputBuffersUsingStreamCallback untill buffer priming is fully supported in pa_process.c */
+    /*
+    if( outParams & streamFlags & paPrimeOutputBuffersUsingStreamCallback )
+        self->primeBuffers = 1;
+        */
+    memset( &self->capture, 0, sizeof (PaAlsaStreamComponent) );
+    memset( &self->playback, 0, sizeof (PaAlsaStreamComponent) );
+    if( inParams )
+    {
+        PA_ENSURE( PaAlsaStreamComponent_Initialize( &self->capture, alsaApi, inParams, StreamDirection_In, NULL != callback ) );
+    }
+    if( outParams )
+    {
+        PA_ENSURE( PaAlsaStreamComponent_Initialize( &self->playback, alsaApi, outParams, StreamDirection_Out, NULL != callback ) );
+    }
+
+    assert( self->capture.nfds || self->playback.nfds );
+
+    PA_UNLESS( self->pfds = (struct pollfd*)PaUtil_AllocateMemory( (self->capture.nfds +
+                    self->playback.nfds) * sizeof (struct pollfd) ), paInsufficientMemory );
+
+    PaUtil_InitializeCpuLoadMeasurer( &self->cpuLoadMeasurer, sampleRate );
+    ASSERT_CALL_( PaUnixMutex_Initialize( &self->stateMtx ), paNoError );
+
+error:
+    return result;
+}
+
+/** Free resources associated with stream, and eventually stream itself.
+ *
+ * Frees allocated memory, and terminates individual StreamComponents.
+ */
+static void PaAlsaStream_Terminate( PaAlsaStream *self )
+{
+    assert( self );
+
+    if( self->capture.pcm )
+    {
+        PaAlsaStreamComponent_Terminate( &self->capture );
+    }
+    if( self->playback.pcm )
+    {
+        PaAlsaStreamComponent_Terminate( &self->playback );
+    }
+
+    PaUtil_FreeMemory( self->pfds );
+    ASSERT_CALL_( PaUnixMutex_Terminate( &self->stateMtx ), paNoError );
+
+    PaUtil_FreeMemory( self );
+}
+
+/** Calculate polling timeout
+ *
+ * @param frames Time to wait
+ * @return Polling timeout in milliseconds
+ */
+static int CalculatePollTimeout( const PaAlsaStream *stream, unsigned long frames )
+{
+    assert( stream->streamRepresentation.streamInfo.sampleRate > 0.0 );
+    /* Period in msecs, rounded up */
+    return (int)ceil( 1000 * frames / stream->streamRepresentation.streamInfo.sampleRate );
+}
+
+/** Align value in backward direction.
+ *
+ * @param v: Value to align.
+ * @param align: Alignment.
+ */
+static unsigned long PaAlsa_AlignBackward(unsigned long v, unsigned long align)
+{
+	return ((v - (align ? v % align : 0)));
+}
+
+/** Align value in forward direction.
+ *
+ * @param v: Value to align.
+ * @param align: Alignment.
+ */
+static unsigned long PaAlsa_AlignForward(unsigned long v, unsigned long align)
+{
+	unsigned long remainder = (align ? (v % align) : 0);
+	return (remainder != 0 ? v + (align - remainder) : v);
+}
+
+/** Get size of host buffer maintained from the number of user frames, sample rate and suggested latency. Minimum double buffering
+ *  is maintained to allow 100% CPU usage inside user callback.
+ *
+ * @param userFramesPerBuffer: User buffer size in number of frames.
+ * @param suggestedLatency: User provided desired latency.
+ * @param sampleRate: Sample rate.
+ */
+static unsigned long PaAlsa_GetFramesPerHostBuffer(unsigned long userFramesPerBuffer, PaTime suggestedLatency, double sampleRate)
+{
+	unsigned long frames = userFramesPerBuffer + PA_MAX( userFramesPerBuffer, (unsigned long)(suggestedLatency * sampleRate) );
+	return frames;
+}
+
+/** Determine size per host buffer.
+ *
+ * During this method call, the component's framesPerBuffer attribute gets computed, and the corresponding period size
+ * gets configured for the device.
+ * @param accurate: If the configured period size is non-integer, this will be set to 0.
+ */
+static PaError PaAlsaStreamComponent_DetermineFramesPerBuffer( PaAlsaStreamComponent* self, const PaStreamParameters* params,
+        unsigned long framesPerUserBuffer, double sampleRate, snd_pcm_hw_params_t* hwParams, int* accurate )
+{
+    PaError result = paNoError;
+    unsigned long bufferSize, framesPerHostBuffer;
+    int dir = 0;
+
+    /* Calculate host buffer size */
+    bufferSize = PaAlsa_GetFramesPerHostBuffer(framesPerUserBuffer, params->suggestedLatency, sampleRate);
+
+    /* Log */
+    PA_DEBUG(( "%s: user-buffer (frames)           = %lu\n", __FUNCTION__, framesPerUserBuffer ));
+    PA_DEBUG(( "%s: user-buffer (sec)              = %f\n",  __FUNCTION__, (double)(framesPerUserBuffer / sampleRate) ));
+    PA_DEBUG(( "%s: suggested latency (sec)        = %f\n",  __FUNCTION__, params->suggestedLatency ));
+    PA_DEBUG(( "%s: suggested host buffer (frames) = %lu\n", __FUNCTION__, bufferSize ));
+    PA_DEBUG(( "%s: suggested host buffer (sec)    = %f\n",  __FUNCTION__, (double)(bufferSize / sampleRate) ));
+
+#ifdef PA_ALSA_USE_OBSOLETE_HOST_BUFFER_CALC
+
+    if( framesPerUserBuffer != paFramesPerBufferUnspecified )
+    {
+        /* Preferably the host buffer size should be a multiple of the user buffer size */
+
+        if( bufferSize > framesPerUserBuffer )
+        {
+            snd_pcm_uframes_t remainder = bufferSize % framesPerUserBuffer;
+            if( remainder > framesPerUserBuffer / 2. )
+                bufferSize += framesPerUserBuffer - remainder;
+            else
+                bufferSize -= remainder;
+
+            assert( bufferSize % framesPerUserBuffer == 0 );
+        }
+        else if( framesPerUserBuffer % bufferSize != 0 )
+        {
+            /*  Find a good compromise between user specified latency and buffer size */
+            if( bufferSize > framesPerUserBuffer * .75 )
+            {
+                bufferSize = framesPerUserBuffer;
+            }
+            else
+            {
+                snd_pcm_uframes_t newSz = framesPerUserBuffer;
+                while( newSz / 2 >= bufferSize )
+                {
+                    if( framesPerUserBuffer % (newSz / 2) != 0 )
+                    {
+                        /* No use dividing any further */
+                        break;
+                    }
+                    newSz /= 2;
+                }
+                bufferSize = newSz;
+            }
+
+            assert( framesPerUserBuffer % bufferSize == 0 );
+        }
+    }
+
+#endif
+
+	{
+        unsigned numPeriods = numPeriods_, maxPeriods = 0, minPeriods = numPeriods_;
+
+        /* It may be that the device only supports 2 periods for instance */
+        dir = 0;
+        ENSURE_( alsa_snd_pcm_hw_params_get_periods_min( hwParams, &minPeriods, &dir ), paUnanticipatedHostError );
+        ENSURE_( alsa_snd_pcm_hw_params_get_periods_max( hwParams, &maxPeriods, &dir ), paUnanticipatedHostError );
+        assert( maxPeriods > 1 );
+
+        /* Clamp to min/max */
+        numPeriods = PA_MIN(maxPeriods, PA_MAX(minPeriods, numPeriods));
+
+        PA_DEBUG(( "%s: periods min = %lu, max = %lu, req = %lu \n", __FUNCTION__, minPeriods, maxPeriods, numPeriods ));
+
+#ifndef PA_ALSA_USE_OBSOLETE_HOST_BUFFER_CALC
+
+        /* Calculate period size */
+        framesPerHostBuffer = (bufferSize / numPeriods);
+
+        /* Align & test size */
+        if( framesPerUserBuffer != paFramesPerBufferUnspecified )
+        {
+            /* Align to user buffer size */
+            framesPerHostBuffer = PaAlsa_AlignForward(framesPerHostBuffer, framesPerUserBuffer);
+
+            /* Test (borrowed from older implementation) */
+            if( framesPerHostBuffer < framesPerUserBuffer )
+            {
+                assert( framesPerUserBuffer % framesPerHostBuffer == 0 );
+                if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
+                {
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer * 2, 0 ) == 0 )
+                        framesPerHostBuffer *= 2;
+                    else
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer / 2, 0 ) == 0 )
+                        framesPerHostBuffer /= 2;
+                }
+            }
+            else
+            {
+                assert( framesPerHostBuffer % framesPerUserBuffer == 0 );
+                if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
+                {
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer + framesPerUserBuffer, 0 ) == 0 )
+                        framesPerHostBuffer += framesPerUserBuffer;
+                    else
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer - framesPerUserBuffer, 0 ) == 0 )
+                        framesPerHostBuffer -= framesPerUserBuffer;
+                }
+            }
+        }
+#endif
+
+#ifdef PA_ALSA_USE_OBSOLETE_HOST_BUFFER_CALC
+
+        if( framesPerUserBuffer != paFramesPerBufferUnspecified )
+        {
+            /* Try to get a power-of-two of the user buffer size. */
+            framesPerHostBuffer = framesPerUserBuffer;
+            if( framesPerHostBuffer < bufferSize )
+            {
+                while( bufferSize / framesPerHostBuffer > numPeriods )
+                {
+                    framesPerHostBuffer *= 2;
+                }
+                /* One extra period is preferrable to one less (should be more robust) */
+                if( bufferSize / framesPerHostBuffer < numPeriods )
+                {
+                    framesPerHostBuffer /= 2;
+                }
+            }
+            else
+            {
+                while( bufferSize / framesPerHostBuffer < numPeriods )
+                {
+                    if( framesPerUserBuffer % (framesPerHostBuffer / 2) != 0 )
+                    {
+                        /* Can't be divided any further */
+                        break;
+                    }
+                    framesPerHostBuffer /= 2;
+                }
+            }
+
+            if( framesPerHostBuffer < framesPerUserBuffer )
+            {
+                assert( framesPerUserBuffer % framesPerHostBuffer == 0 );
+                if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
+                {
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer * 2, 0 ) == 0 )
+                        framesPerHostBuffer *= 2;
+                    else if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer / 2, 0 ) == 0 )
+                        framesPerHostBuffer /= 2;
+                }
+            }
+            else
+            {
+                assert( framesPerHostBuffer % framesPerUserBuffer == 0 );
+                if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
+                {
+                    if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer + framesPerUserBuffer, 0 ) == 0 )
+                        framesPerHostBuffer += framesPerUserBuffer;
+                    else if( alsa_snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer - framesPerUserBuffer, 0 ) == 0 )
+                        framesPerHostBuffer -= framesPerUserBuffer;
+                }
+            }
+        }
+        else
+        {
+            framesPerHostBuffer = bufferSize / numPeriods;
+        }
+
+        /* non-mmap mode needs a reasonably-sized buffer or it'll stutter */
+        if( !self->canMmap && framesPerHostBuffer < 2048 )
+            framesPerHostBuffer = 2048;
+#endif
+        PA_DEBUG(( "%s: suggested host buffer period   = %lu \n", __FUNCTION__, framesPerHostBuffer ));
+	}
+
+    {
+        /* Get min/max period sizes and adjust our chosen */
+        snd_pcm_uframes_t min = 0, max = 0, minmax_diff;
+        ENSURE_( alsa_snd_pcm_hw_params_get_period_size_min( hwParams, &min, NULL ), paUnanticipatedHostError );
+        ENSURE_( alsa_snd_pcm_hw_params_get_period_size_max( hwParams, &max, NULL ), paUnanticipatedHostError );
+        minmax_diff = max - min;
+
+        if( framesPerHostBuffer < min )
+        {
+            PA_DEBUG(( "%s: The determined period size (%lu) is less than minimum (%lu)\n", __FUNCTION__, framesPerHostBuffer, min ));
+            framesPerHostBuffer = ((minmax_diff == 2) ? min + 1 : min);
+        }
+        else
+        if( framesPerHostBuffer > max )
+        {
+            PA_DEBUG(( "%s: The determined period size (%lu) is greater than maximum (%lu)\n", __FUNCTION__, framesPerHostBuffer, max ));
+            framesPerHostBuffer = ((minmax_diff == 2) ? max - 1 : max);
+        }
+
+		PA_DEBUG(( "%s: device period minimum          = %lu\n", __FUNCTION__, min ));
+		PA_DEBUG(( "%s: device period maximum          = %lu\n", __FUNCTION__, max ));
+		PA_DEBUG(( "%s: host buffer period             = %lu\n", __FUNCTION__, framesPerHostBuffer ));
+		PA_DEBUG(( "%s: host buffer period latency     = %f\n", __FUNCTION__, (double)(framesPerHostBuffer / sampleRate) ));
+
+        /* Try setting period size */
+        dir = 0;
+        ENSURE_( alsa_snd_pcm_hw_params_set_period_size_near( self->pcm, hwParams, &framesPerHostBuffer, &dir ), paUnanticipatedHostError );
+        if( dir != 0 )
+        {
+            PA_DEBUG(( "%s: The configured period size is non-integer.\n", __FUNCTION__, dir ));
+            *accurate = 0;
+        }
+    }
+
+    /* Set result */
+    self->framesPerBuffer = framesPerHostBuffer;
+
+error:
+    return result;
+}
+
+/* We need to determine how many frames per host buffer (period) to use.  Our
+ * goals are to provide the best possible performance, but also to
+ * honor the requested latency settings as closely as we can. Therefore this
+ * decision is based on:
+ *
+ *   - the period sizes that playback and/or capture support.  The
+ *     host buffer size has to be one of these.
+ *   - the number of periods that playback and/or capture support.
+ *
+ * We want to make period_size*(num_periods-1) to be as close as possible
+ * to latency*rate for both playback and capture.
+ *
+ * This method will determine suitable period sizes for capture and playback handles, and report the maximum number of
+ * frames per host buffer. The latter is relevant, in case we should be so unfortunate that the period size differs
+ * between capture and playback. If this should happen, the stream's hostBufferSizeMode attribute will be set to
+ * paUtilBoundedHostBufferSize, because the best we can do is limit the size of individual host buffers to the upper
+ * bound. The size of host buffers scheduled for processing should only matter if the user has specified a buffer size,
+ * but when he/she does we must strive for an optimal configuration. By default we'll opt for a fixed host buffer size,
+ * which should be fine if the period size is the same for capture and playback. In general, if there is a specified user
+ * buffer size, this method tries it best to determine a period size which is a multiple of the user buffer size.
+ *
+ * The framesPerBuffer attributes of the individual capture and playback components of the stream are set to corresponding
+ * values determined here. Since these should be reported as
+ *
+ * This is one of those blocks of code that will just take a lot of
+ * refinement to be any good.
+ *
+ * In the full-duplex case it is possible that the routine was unable
+ * to find a number of frames per buffer acceptable to both devices
+ * TODO: Implement an algorithm to find the value closest to acceptance
+ * by both devices, to minimize difference between period sizes?
+ *
+ * @param determinedFramesPerHostBuffer: The determined host buffer size.
+ */
+static PaError PaAlsaStream_DetermineFramesPerBuffer( PaAlsaStream* self, double sampleRate, const PaStreamParameters* inputParameters,
+        const PaStreamParameters* outputParameters, unsigned long framesPerUserBuffer, snd_pcm_hw_params_t* hwParamsCapture,
+        snd_pcm_hw_params_t* hwParamsPlayback, PaUtilHostBufferSizeMode* hostBufferSizeMode )
+{
+    PaError result = paNoError;
+    unsigned long framesPerHostBuffer = 0;
+    int dir = 0;
+    int accurate = 1;
+    unsigned numPeriods = numPeriods_;
+
+    if( self->capture.pcm && self->playback.pcm )
+    {
+        if( framesPerUserBuffer == paFramesPerBufferUnspecified )
+        {
+            /* Come up with a common desired latency */
+            snd_pcm_uframes_t desiredBufSz, e, minPeriodSize, maxPeriodSize, optimalPeriodSize, periodSize,
+                              minCapture, minPlayback, maxCapture, maxPlayback;
+
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_get_period_size_min( hwParamsCapture, &minCapture, &dir ), paUnanticipatedHostError );
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_get_period_size_min( hwParamsPlayback, &minPlayback, &dir ), paUnanticipatedHostError );
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_get_period_size_max( hwParamsCapture, &maxCapture, &dir ), paUnanticipatedHostError );
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_get_period_size_max( hwParamsPlayback, &maxPlayback, &dir ), paUnanticipatedHostError );
+            minPeriodSize = PA_MAX( minPlayback, minCapture );
+            maxPeriodSize = PA_MIN( maxPlayback, maxCapture );
+            PA_UNLESS( minPeriodSize <= maxPeriodSize, paBadIODeviceCombination );
+
+            desiredBufSz = (snd_pcm_uframes_t)(PA_MIN( outputParameters->suggestedLatency, inputParameters->suggestedLatency )
+                    * sampleRate);
+            /* Clamp desiredBufSz */
+            {
+                snd_pcm_uframes_t maxBufferSize;
+                snd_pcm_uframes_t maxBufferSizeCapture, maxBufferSizePlayback;
+                ENSURE_( alsa_snd_pcm_hw_params_get_buffer_size_max( hwParamsCapture, &maxBufferSizeCapture ), paUnanticipatedHostError );
+                ENSURE_( alsa_snd_pcm_hw_params_get_buffer_size_max( hwParamsPlayback, &maxBufferSizePlayback ), paUnanticipatedHostError );
+                maxBufferSize = PA_MIN( maxBufferSizeCapture, maxBufferSizePlayback );
+
+                desiredBufSz = PA_MIN( desiredBufSz, maxBufferSize );
+            }
+
+            /* Find the closest power of 2 */
+            e = ilogb( minPeriodSize );
+            if( minPeriodSize & (minPeriodSize - 1) )
+                e += 1;
+            periodSize = (snd_pcm_uframes_t)pow( 2, e );
+
+            while( periodSize <= maxPeriodSize )
+            {
+                if( alsa_snd_pcm_hw_params_test_period_size( self->playback.pcm, hwParamsPlayback, periodSize, 0 ) >= 0 &&
+                        alsa_snd_pcm_hw_params_test_period_size( self->capture.pcm, hwParamsCapture, periodSize, 0 ) >= 0 )
+                {
+                    /* OK! */
+                    break;
+                }
+
+                periodSize *= 2;
+            }
+
+            optimalPeriodSize = PA_MAX( desiredBufSz / numPeriods, minPeriodSize );
+            optimalPeriodSize = PA_MIN( optimalPeriodSize, maxPeriodSize );
+
+            /* Find the closest power of 2 */
+            e = ilogb( optimalPeriodSize );
+            if( optimalPeriodSize & (optimalPeriodSize - 1) )
+                e += 1;
+            optimalPeriodSize = (snd_pcm_uframes_t)pow( 2, e );
+
+            while( optimalPeriodSize >= periodSize )
+            {
+                if( alsa_snd_pcm_hw_params_test_period_size( self->capture.pcm, hwParamsCapture, optimalPeriodSize, 0 )
+                        >= 0 && alsa_snd_pcm_hw_params_test_period_size( self->playback.pcm, hwParamsPlayback,
+                            optimalPeriodSize, 0 ) >= 0 )
+                {
+                    break;
+                }
+                optimalPeriodSize /= 2;
+            }
+
+            if( optimalPeriodSize > periodSize )
+                periodSize = optimalPeriodSize;
+
+            if( periodSize <= maxPeriodSize )
+            {
+                /* Looks good, the periodSize _should_ be acceptable by both devices */
+                ENSURE_( alsa_snd_pcm_hw_params_set_period_size( self->capture.pcm, hwParamsCapture, periodSize, 0 ),
+                        paUnanticipatedHostError );
+                ENSURE_( alsa_snd_pcm_hw_params_set_period_size( self->playback.pcm, hwParamsPlayback, periodSize, 0 ),
+                        paUnanticipatedHostError );
+                self->capture.framesPerBuffer = self->playback.framesPerBuffer = periodSize;
+                framesPerHostBuffer = periodSize;
+            }
+            else
+            {
+                /* Unable to find a common period size, oh well */
+                optimalPeriodSize = PA_MAX( desiredBufSz / numPeriods, minPeriodSize );
+                optimalPeriodSize = PA_MIN( optimalPeriodSize, maxPeriodSize );
+
+                self->capture.framesPerBuffer = optimalPeriodSize;
+                dir = 0;
+                ENSURE_( alsa_snd_pcm_hw_params_set_period_size_near( self->capture.pcm, hwParamsCapture, &self->capture.framesPerBuffer, &dir ),
+                        paUnanticipatedHostError );
+                self->playback.framesPerBuffer = optimalPeriodSize;
+                dir = 0;
+                ENSURE_( alsa_snd_pcm_hw_params_set_period_size_near( self->playback.pcm, hwParamsPlayback, &self->playback.framesPerBuffer, &dir ),
+                        paUnanticipatedHostError );
+                framesPerHostBuffer = PA_MAX( self->capture.framesPerBuffer, self->playback.framesPerBuffer );
+                *hostBufferSizeMode = paUtilBoundedHostBufferSize;
+            }
+        }
+        else
+        {
+            /* We choose the simple route and determine a suitable number of frames per buffer for one component of
+             * the stream, then we hope that this will work for the other component too (it should!).
+             */
+
+            unsigned maxPeriods = 0;
+            PaAlsaStreamComponent* first = &self->capture, * second = &self->playback;
+            const PaStreamParameters* firstStreamParams = inputParameters;
+            snd_pcm_hw_params_t* firstHwParams = hwParamsCapture, * secondHwParams = hwParamsPlayback;
+
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_get_periods_max( hwParamsPlayback, &maxPeriods, &dir ), paUnanticipatedHostError );
+            if( maxPeriods < numPeriods )
+            {
+                /* The playback component is trickier to get right, try that first */
+                first = &self->playback;
+                second = &self->capture;
+                firstStreamParams = outputParameters;
+                firstHwParams = hwParamsPlayback;
+                secondHwParams = hwParamsCapture;
+            }
+
+            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( first, firstStreamParams, framesPerUserBuffer,
+                        sampleRate, firstHwParams, &accurate ) );
+
+            second->framesPerBuffer = first->framesPerBuffer;
+            dir = 0;
+            ENSURE_( alsa_snd_pcm_hw_params_set_period_size_near( second->pcm, secondHwParams, &second->framesPerBuffer, &dir ),
+                    paUnanticipatedHostError );
+            if( self->capture.framesPerBuffer == self->playback.framesPerBuffer )
+            {
+                framesPerHostBuffer = self->capture.framesPerBuffer;
+            }
+            else
+            {
+                framesPerHostBuffer = PA_MAX( self->capture.framesPerBuffer, self->playback.framesPerBuffer );
+                *hostBufferSizeMode = paUtilBoundedHostBufferSize;
+            }
+        }
+    }
+    else    /* half-duplex is a slightly simpler case */
+    {
+        if( self->capture.pcm )
+        {
+            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( &self->capture, inputParameters, framesPerUserBuffer,
+                        sampleRate, hwParamsCapture, &accurate) );
+            framesPerHostBuffer = self->capture.framesPerBuffer;
+        }
+        else
+        {
+            assert( self->playback.pcm );
+            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( &self->playback, outputParameters, framesPerUserBuffer,
+                        sampleRate, hwParamsPlayback, &accurate ) );
+            framesPerHostBuffer = self->playback.framesPerBuffer;
+        }
+    }
+
+    PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
+    self->maxFramesPerHostBuffer = framesPerHostBuffer;
+
+    if( !self->playback.canMmap || !accurate )
+    {
+        /* Don't know the exact size per host buffer */
+        *hostBufferSizeMode = paUtilBoundedHostBufferSize;
+        /* Raise upper bound */
+        if( !accurate )
+            ++self->maxFramesPerHostBuffer;
+    }
+
+error:
+    return result;
+}
+
+/** Set up ALSA stream parameters.
+ *
+ */
+static PaError PaAlsaStream_Configure( PaAlsaStream *self, const PaStreamParameters *inParams, const PaStreamParameters*
+        outParams, double sampleRate, unsigned long framesPerUserBuffer, double* inputLatency, double* outputLatency,
+        PaUtilHostBufferSizeMode* hostBufferSizeMode )
+{
+    PaError result = paNoError;
+    double realSr = sampleRate;
+    snd_pcm_hw_params_t* hwParamsCapture, * hwParamsPlayback;
+
+    alsa_snd_pcm_hw_params_alloca( &hwParamsCapture );
+    alsa_snd_pcm_hw_params_alloca( &hwParamsPlayback );
+
+    if( self->capture.pcm )
+        PA_ENSURE( PaAlsaStreamComponent_InitialConfigure( &self->capture, inParams, self->primeBuffers, hwParamsCapture,
+                    &realSr ) );
+    if( self->playback.pcm )
+        PA_ENSURE( PaAlsaStreamComponent_InitialConfigure( &self->playback, outParams, self->primeBuffers, hwParamsPlayback,
+                    &realSr ) );
+
+    PA_ENSURE( PaAlsaStream_DetermineFramesPerBuffer( self, realSr, inParams, outParams, framesPerUserBuffer,
+                hwParamsCapture, hwParamsPlayback, hostBufferSizeMode ) );
+
+    if( self->capture.pcm )
+    {
+        assert( self->capture.framesPerBuffer != 0 );
+        PA_ENSURE( PaAlsaStreamComponent_FinishConfigure( &self->capture, hwParamsCapture, inParams, self->primeBuffers, realSr,
+                    inputLatency ) );
+        PA_DEBUG(( "%s: Capture period size: %lu, latency: %f\n", __FUNCTION__, self->capture.framesPerBuffer, *inputLatency ));
+    }
+    if( self->playback.pcm )
+    {
+        assert( self->playback.framesPerBuffer != 0 );
+        PA_ENSURE( PaAlsaStreamComponent_FinishConfigure( &self->playback, hwParamsPlayback, outParams, self->primeBuffers, realSr,
+                    outputLatency ) );
+        PA_DEBUG(( "%s: Playback period size: %lu, latency: %f\n", __FUNCTION__, self->playback.framesPerBuffer, *outputLatency ));
+    }
+
+    /* Should be exact now */
+    self->streamRepresentation.streamInfo.sampleRate = realSr;
+
+    /* this will cause the two streams to automatically start/stop/prepare in sync.
+     * We only need to execute these operations on one of the pair.
+     * A: We don't want to do this on a blocking stream.
+     */
+    if( self->callbackMode && self->capture.pcm && self->playback.pcm )
+    {
+        int err = alsa_snd_pcm_link( self->capture.pcm, self->playback.pcm );
+        if( err == 0 )
+            self->pcmsSynced = 1;
+        else
+            PA_DEBUG(( "%s: Unable to sync pcms: %s\n", __FUNCTION__, alsa_snd_strerror( err ) ));
+    }
+
+    {
+        unsigned long minFramesPerHostBuffer = PA_MIN( self->capture.pcm ? self->capture.framesPerBuffer : ULONG_MAX,
+            self->playback.pcm ? self->playback.framesPerBuffer : ULONG_MAX );
+        self->pollTimeout = CalculatePollTimeout( self, minFramesPerHostBuffer );    /* Period in msecs, rounded up */
+
+        /* Time before watchdog unthrottles realtime thread == 1/4 of period time in msecs */
+        /* self->threading.throttledSleepTime = (unsigned long) (minFramesPerHostBuffer / sampleRate / 4 * 1000); */
+    }
+
+    if( self->callbackMode )
+    {
+        /* If the user expects a certain number of frames per callback we will either have to rely on block adaption
+         * (framesPerHostBuffer is not an integer multiple of framesPerBuffer) or we can simply align the number
+         * of host buffer frames with what the user specified */
+        if( self->framesPerUserBuffer != paFramesPerBufferUnspecified )
+        {
+            /* self->alignFrames = 1; */
+
+            /* Unless the ratio between number of host and user buffer frames is an integer we will have to rely
+             * on block adaption */
+        /*
+            if( framesPerHostBuffer % framesPerBuffer != 0 || (self->capture.pcm && self->playback.pcm &&
+                        self->capture.framesPerBuffer != self->playback.framesPerBuffer) )
+                self->useBlockAdaption = 1;
+            else
+                self->alignFrames = 1;
+        */
+        }
+    }
+
+error:
+    return result;
+}
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback* callback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaAlsaHostApiRepresentation *alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
+    PaAlsaStream *stream = NULL;
+    PaSampleFormat hostInputSampleFormat = 0, hostOutputSampleFormat = 0;
+    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
+    int numInputChannels = 0, numOutputChannels = 0;
+    PaTime inputLatency, outputLatency;
+    /* Operate with fixed host buffer size by default, since other modes will invariably lead to block adaption */
+    /* XXX: Use Bounded by default? Output tends to get stuttery with Fixed ... */
+    PaUtilHostBufferSizeMode hostBufferSizeMode = paUtilFixedHostBufferSize;
+
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag;
+
+    if( inputParameters )
+    {
+        PA_ENSURE( ValidateParameters( inputParameters, hostApi, StreamDirection_In ) );
+
+        numInputChannels = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+    }
+    if( outputParameters )
+    {
+        PA_ENSURE( ValidateParameters( outputParameters, hostApi, StreamDirection_Out ) );
+
+        numOutputChannels = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+    }
+
+    /* XXX: Why do we support this anyway? */
+    if( framesPerBuffer == paFramesPerBufferUnspecified && getenv( "PA_ALSA_PERIODSIZE" ) != NULL )
+    {
+        PA_DEBUG(( "%s: Getting framesPerBuffer from environment\n", __FUNCTION__ ));
+        framesPerBuffer = atoi( getenv("PA_ALSA_PERIODSIZE") );
+    }
+
+    PA_UNLESS( stream = (PaAlsaStream*)PaUtil_AllocateMemory( sizeof(PaAlsaStream) ), paInsufficientMemory );
+    PA_ENSURE( PaAlsaStream_Initialize( stream, alsaHostApi, inputParameters, outputParameters, sampleRate,
+                framesPerBuffer, callback, streamFlags, userData ) );
+
+    PA_ENSURE( PaAlsaStream_Configure( stream, inputParameters, outputParameters, sampleRate, framesPerBuffer,
+                &inputLatency, &outputLatency, &hostBufferSizeMode ) );
+    hostInputSampleFormat = stream->capture.hostSampleFormat | (!stream->capture.hostInterleaved ? paNonInterleaved : 0);
+    hostOutputSampleFormat = stream->playback.hostSampleFormat | (!stream->playback.hostInterleaved ? paNonInterleaved : 0);
+
+    PA_ENSURE( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                    numInputChannels, inputSampleFormat, hostInputSampleFormat,
+                    numOutputChannels, outputSampleFormat, hostOutputSampleFormat,
+                    sampleRate, streamFlags, framesPerBuffer, stream->maxFramesPerHostBuffer,
+                    hostBufferSizeMode, callback, userData ) );
+
+    /* Ok, buffer processor is initialized, now we can deduce it's latency */
+    if( numInputChannels > 0 )
+        stream->streamRepresentation.streamInfo.inputLatency = inputLatency + (PaTime)(
+                PaUtil_GetBufferProcessorInputLatencyFrames( &stream->bufferProcessor ) / sampleRate);
+    if( numOutputChannels > 0 )
+        stream->streamRepresentation.streamInfo.outputLatency = outputLatency + (PaTime)(
+                PaUtil_GetBufferProcessorOutputLatencyFrames( &stream->bufferProcessor ) / sampleRate);
+
+    PA_DEBUG(( "%s: Stream: framesPerBuffer = %lu, maxFramesPerHostBuffer = %lu, latency = i(%f)/o(%f), \n", __FUNCTION__, framesPerBuffer, stream->maxFramesPerHostBuffer, stream->streamRepresentation.streamInfo.inputLatency, stream->streamRepresentation.streamInfo.outputLatency));
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    if( stream )
+    {
+        PA_DEBUG(( "%s: Stream in error, terminating\n", __FUNCTION__ ));
+        PaAlsaStream_Terminate( stream );
+    }
+
+    return result;
+}
+
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+
+    PaAlsaStream_Terminate( stream );
+
+    return result;
+}
+
+static void SilenceBuffer( PaAlsaStream *stream )
+{
+    const snd_pcm_channel_area_t *areas;
+    snd_pcm_uframes_t frames = (snd_pcm_uframes_t)alsa_snd_pcm_avail_update( stream->playback.pcm ), offset;
+
+    alsa_snd_pcm_mmap_begin( stream->playback.pcm, &areas, &offset, &frames );
+    alsa_snd_pcm_areas_silence( areas, offset, stream->playback.numHostChannels, frames, stream->playback.nativeFormat );
+    alsa_snd_pcm_mmap_commit( stream->playback.pcm, offset, frames );
+}
+
+/** Start/prepare pcm(s) for streaming.
+ *
+ * Depending on wether the stream is in callback or blocking mode, we will respectively start or simply
+ * prepare the playback pcm. If the buffer has _not_ been primed, we will in callback mode prepare and
+ * silence the buffer before starting playback. In blocking mode we simply prepare, as the playback will
+ * be started automatically as the user writes to output.
+ *
+ * The capture pcm, however, will simply be prepared and started.
+ */
+static PaError AlsaStart( PaAlsaStream *stream, int priming )
+{
+    PaError result = paNoError;
+
+    if( stream->playback.pcm )
+    {
+        if( stream->callbackMode )
+        {
+            if( !priming )
+            {
+                /* Buffer isn't primed, so prepare and silence */
+                ENSURE_( alsa_snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
+                if( stream->playback.canMmap )
+                    SilenceBuffer( stream );
+            }
+            if( stream->playback.canMmap )
+                ENSURE_( alsa_snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+        }
+        else
+            ENSURE_( alsa_snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
+    }
+    if( stream->capture.pcm && !stream->pcmsSynced )
+    {
+        ENSURE_( alsa_snd_pcm_prepare( stream->capture.pcm ), paUnanticipatedHostError );
+        /* For a blocking stream we want to start capture as well, since nothing will happen otherwise */
+        ENSURE_( alsa_snd_pcm_start( stream->capture.pcm ), paUnanticipatedHostError );
+    }
+
+end:
+    return result;
+error:
+    goto end;
+}
+
+/** Utility function for determining if pcms are in running state.
+ *
+ */
+#if 0
+static int IsRunning( PaAlsaStream *stream )
+{
+    int result = 0;
+
+    PA_ENSURE( PaUnixMutex_Lock( &stream->stateMtx ) );
+    if( stream->capture.pcm )
+    {
+        snd_pcm_state_t capture_state = alsa_snd_pcm_state( stream->capture.pcm );
+
+        if( capture_state == SND_PCM_STATE_RUNNING || capture_state == SND_PCM_STATE_XRUN
+                || capture_state == SND_PCM_STATE_DRAINING )
+        {
+            result = 1;
+            goto end;
+        }
+    }
+
+    if( stream->playback.pcm )
+    {
+        snd_pcm_state_t playback_state = alsa_snd_pcm_state( stream->playback.pcm );
+
+        if( playback_state == SND_PCM_STATE_RUNNING || playback_state == SND_PCM_STATE_XRUN
+                || playback_state == SND_PCM_STATE_DRAINING )
+        {
+            result = 1;
+            goto end;
+        }
+    }
+
+end:
+    ASSERT_CALL_( PaUnixMutex_Unlock( &stream->stateMtx ), paNoError );
+    return result;
+error:
+    goto error;
+}
+#endif
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAlsaStream* stream = (PaAlsaStream*)s;
+    int streamStarted = 0;  /* So we can know wether we need to take the stream down */
+
+    /* Ready the processor */
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+
+    /* Set now, so we can test for activity further down */
+    stream->isActive = 1;
+
+    if( stream->callbackMode )
+    {
+        PA_ENSURE( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., stream->rtSched ) );
+    }
+    else
+    {
+        PA_ENSURE( AlsaStart( stream, 0 ) );
+        streamStarted = 1;
+    }
+
+end:
+    return result;
+error:
+    if( streamStarted )
+    {
+        AbortStream( stream );
+    }
+    stream->isActive = 0;
+
+    goto end;
+}
+
+/** Stop PCM handle, either softly or abruptly.
+ */
+static PaError AlsaStop( PaAlsaStream *stream, int abort )
+{
+    PaError result = paNoError;
+    /* XXX: alsa_snd_pcm_drain tends to lock up, avoid it until we find out more */
+    abort = 1;
+    /*
+    if( stream->capture.pcm && !strcmp( Pa_GetDeviceInfo( stream->capture.device )->name,
+                "dmix" ) )
+    {
+        abort = 1;
+    }
+    else if( stream->playback.pcm && !strcmp( Pa_GetDeviceInfo( stream->playback.device )->name,
+                "dmix" ) )
+    {
+        abort = 1;
+    }
+    */
+
+    if( abort )
+    {
+        if( stream->playback.pcm )
+        {
+            ENSURE_( alsa_snd_pcm_drop( stream->playback.pcm ), paUnanticipatedHostError );
+        }
+        if( stream->capture.pcm && !stream->pcmsSynced )
+        {
+            ENSURE_( alsa_snd_pcm_drop( stream->capture.pcm ), paUnanticipatedHostError );
+        }
+
+        PA_DEBUG(( "%s: Dropped frames\n", __FUNCTION__ ));
+    }
+    else
+    {
+        if( stream->playback.pcm )
+        {
+            ENSURE_( alsa_snd_pcm_nonblock( stream->playback.pcm, 0 ), paUnanticipatedHostError );
+            if( alsa_snd_pcm_drain( stream->playback.pcm ) < 0 )
+            {
+                PA_DEBUG(( "%s: Draining playback handle failed!\n", __FUNCTION__ ));
+            }
+        }
+        if( stream->capture.pcm && !stream->pcmsSynced )
+        {
+            /* We don't need to retrieve any remaining frames */
+            if( alsa_snd_pcm_drain( stream->capture.pcm ) < 0 )
+            {
+                PA_DEBUG(( "%s: Draining capture handle failed!\n", __FUNCTION__ ));
+            }
+        }
+    }
+
+end:
+    return result;
+error:
+    goto end;
+}
+
+/** Stop or abort stream.
+ *
+ * If a stream is in callback mode we will have to inspect wether the background thread has
+ * finished, or we will have to take it out. In either case we join the thread before
+ * returning. In blocking mode, we simply tell ALSA to stop abruptly (abort) or finish
+ * buffers (drain)
+ *
+ * Stream will be considered inactive (!PaAlsaStream::isActive) after a call to this function
+ */
+static PaError RealStop( PaAlsaStream *stream, int abort )
+{
+    PaError result = paNoError;
+
+    /* First deal with the callback thread, cancelling and/or joining
+     * it if necessary
+     */
+    if( stream->callbackMode )
+    {
+        PaError threadRes;
+        stream->callbackAbort = abort;
+
+        if( !abort )
+        {
+            PA_DEBUG(( "Stopping callback\n" ));
+        }
+        PA_ENSURE( PaUnixThread_Terminate( &stream->thread, !abort, &threadRes ) );
+        if( threadRes != paNoError )
+        {
+            PA_DEBUG(( "Callback thread returned: %d\n", threadRes ));
+        }
+#if 0
+        if( watchdogRes != paNoError )
+            PA_DEBUG(( "Watchdog thread returned: %d\n", watchdogRes ));
+#endif
+
+        stream->callback_finished = 0;
+    }
+    else
+    {
+        PA_ENSURE( AlsaStop( stream, abort ) );
+    }
+
+    stream->isActive = 0;
+
+end:
+    return result;
+
+error:
+    goto end;
+}
+
+static PaError StopStream( PaStream *s )
+{
+    return RealStop( (PaAlsaStream *) s, 0 );
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    return RealStop( (PaAlsaStream * ) s, 1 );
+}
+
+/** The stream is considered stopped before StartStream, or AFTER a call to Abort/StopStream (callback
+ * returning !paContinue is not considered)
+ *
+ */
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaAlsaStream *stream = (PaAlsaStream *)s;
+
+    /* callback_finished indicates we need to join callback thread (ie. in Abort/StopStream) */
+    return !IsStreamActive( s ) && !stream->callback_finished;
+}
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+    return stream->isActive;
+}
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+
+    snd_timestamp_t timestamp;
+    snd_pcm_status_t* status;
+    alsa_snd_pcm_status_alloca( &status );
+
+    /* TODO: what if we have both?  does it really matter? */
+
+    /* TODO: if running in callback mode, this will mean
+     * libasound routines are being called from multiple threads.
+     * need to verify that libasound is thread-safe. */
+
+    if( stream->capture.pcm )
+    {
+        alsa_snd_pcm_status( stream->capture.pcm, status );
+    }
+    else if( stream->playback.pcm )
+    {
+        alsa_snd_pcm_status( stream->playback.pcm, status );
+    }
+
+    alsa_snd_pcm_status_get_tstamp( status, &timestamp );
+    return timestamp.tv_sec + (PaTime)timestamp.tv_usec / 1e6;
+}
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+static int SetApproximateSampleRate( snd_pcm_t *pcm, snd_pcm_hw_params_t *hwParams, double sampleRate )
+{
+    PaError result = paNoError;
+    unsigned long approx = (unsigned long) sampleRate;
+    int dir = 0;
+    double fraction = sampleRate - approx;
+
+    assert( pcm && hwParams );
+
+    if( fraction > 0.0 )
+    {
+        if( fraction > 0.5 )
+        {
+            ++approx;
+            dir = -1;
+        }
+        else
+            dir = 1;
+    }
+
+    if( alsa_snd_pcm_hw_params_set_rate( pcm, hwParams, approx, dir ) < 0)
+        result = paInvalidSampleRate;
+
+end:
+
+    return result;
+
+error:
+
+    /* Log */
+    {
+        unsigned int _min = 0, _max = 0; int _dir = 0;
+        ENSURE_( alsa_snd_pcm_hw_params_get_rate_min( hwParams, &_min, &_dir ), paUnanticipatedHostError );
+        ENSURE_( alsa_snd_pcm_hw_params_get_rate_max( hwParams, &_max, &_dir ), paUnanticipatedHostError );
+        PA_DEBUG(( "%s: SR min = %d, max = %d, req = %lu\n", __FUNCTION__, _min, _max, approx ));
+    }
+
+    goto end;
+}
+
+/* Return exact sample rate in param sampleRate */
+static int GetExactSampleRate( snd_pcm_hw_params_t *hwParams, double *sampleRate )
+{
+    unsigned int num, den;
+    int err;
+
+    assert( hwParams );
+
+    err = alsa_snd_pcm_hw_params_get_rate_numden( hwParams, &num, &den );
+    *sampleRate = (double) num / den;
+
+    return err;
+}
+
+/* Utility functions for blocking/callback interfaces */
+
+/* Atomic restart of stream (we don't want the intermediate state visible) */
+static PaError AlsaRestart( PaAlsaStream *stream )
+{
+    PaError result = paNoError;
+
+    PA_ENSURE( PaUnixMutex_Lock( &stream->stateMtx ) );
+    PA_ENSURE( AlsaStop( stream, 0 ) );
+    PA_ENSURE( AlsaStart( stream, 0 ) );
+
+    PA_DEBUG(( "%s: Restarted audio\n", __FUNCTION__ ));
+
+error:
+    PA_ENSURE( PaUnixMutex_Unlock( &stream->stateMtx ) );
+
+    return result;
+}
+
+/** Recover from xrun state.
+ *
+ */
+static PaError PaAlsaStream_HandleXrun( PaAlsaStream *self )
+{
+    PaError result = paNoError;
+    snd_pcm_status_t *st;
+    PaTime now = PaUtil_GetTime();
+    snd_timestamp_t t;
+    int restartAlsa = 0; /* do not restart Alsa by default */
+
+    alsa_snd_pcm_status_alloca( &st );
+
+    if( self->playback.pcm )
+    {
+        alsa_snd_pcm_status( self->playback.pcm, st );
+        if( alsa_snd_pcm_status_get_state( st ) == SND_PCM_STATE_XRUN )
+        {
+            alsa_snd_pcm_status_get_trigger_tstamp( st, &t );
+            self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+
+            if (!self->playback.canMmap)
+            {
+                if (alsa_snd_pcm_recover( self->playback.pcm, -EPIPE, 0 ) < 0)
+                {
+                    PA_DEBUG(( "%s: [playback] non-MMAP-PCM failed recovering from XRUN, will restart Alsa\n", __FUNCTION__ ));
+                    ++ restartAlsa; /* did not manage to recover */
+                }
+            }
+            else
+                ++ restartAlsa; /* always restart MMAPed device */
+        }
+    }
+    if( self->capture.pcm )
+    {
+        alsa_snd_pcm_status( self->capture.pcm, st );
+        if( alsa_snd_pcm_status_get_state( st ) == SND_PCM_STATE_XRUN )
+        {
+            alsa_snd_pcm_status_get_trigger_tstamp( st, &t );
+            self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+
+            if (!self->capture.canMmap)
+            {
+                if (alsa_snd_pcm_recover( self->capture.pcm, -EPIPE, 0 ) < 0)
+                {
+                    PA_DEBUG(( "%s: [capture] non-MMAP-PCM failed recovering from XRUN, will restart Alsa\n", __FUNCTION__ ));
+                    ++ restartAlsa; /* did not manage to recover */
+                }
+            }
+            else
+                ++ restartAlsa; /* always restart MMAPed device */
+        }
+    }
+
+    if( restartAlsa )
+    {
+        PA_DEBUG(( "%s: restarting Alsa to recover from XRUN\n", __FUNCTION__ ));
+        PA_ENSURE( AlsaRestart( self ) );
+    }
+
+end:
+    return result;
+error:
+    goto end;
+}
+
+/** Decide if we should continue polling for specified direction, eventually adjust the poll timeout.
+ *
+ */
+static PaError ContinuePoll( const PaAlsaStream *stream, StreamDirection streamDir, int *pollTimeout, int *continuePoll )
+{
+    PaError result = paNoError;
+    snd_pcm_sframes_t delay, margin;
+    int err;
+    const PaAlsaStreamComponent *component = NULL, *otherComponent = NULL;
+
+    *continuePoll = 1;
+
+    if( StreamDirection_In == streamDir )
+    {
+        component = &stream->capture;
+        otherComponent = &stream->playback;
+    }
+    else
+    {
+        component = &stream->playback;
+        otherComponent = &stream->capture;
+    }
+
+    /* ALSA docs say that negative delay should indicate xrun, but in my experience alsa_snd_pcm_delay returns -EPIPE */
+    if( (err = alsa_snd_pcm_delay( otherComponent->pcm, &delay )) < 0 )
+    {
+        if( err == -EPIPE )
+        {
+            /* Xrun */
+            *continuePoll = 0;
+            goto error;
+        }
+
+        ENSURE_( err, paUnanticipatedHostError );
+    }
+
+    if( StreamDirection_Out == streamDir )
+    {
+        /* Number of eligible frames before capture overrun */
+        delay = otherComponent->bufferSize - delay;
+    }
+    margin = delay - otherComponent->framesPerBuffer / 2;
+
+    if( margin < 0 )
+    {
+        PA_DEBUG(( "%s: Stopping poll for %s\n", __FUNCTION__, StreamDirection_In == streamDir ? "capture" : "playback" ));
+        *continuePoll = 0;
+    }
+    else if( margin < otherComponent->framesPerBuffer )
+    {
+        *pollTimeout = CalculatePollTimeout( stream, margin );
+        PA_DEBUG(( "%s: Trying to poll again for %s frames, pollTimeout: %d\n",
+                    __FUNCTION__, StreamDirection_In == streamDir ? "capture" : "playback", *pollTimeout ));
+    }
+
+error:
+    return result;
+}
+
+/* Callback interface */
+
+static void OnExit( void *data )
+{
+    PaAlsaStream *stream = (PaAlsaStream *) data;
+
+    assert( data );
+
+    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
+
+    stream->callback_finished = 1;  /* Let the outside world know stream was stopped in callback */
+    PA_DEBUG(( "%s: Stopping ALSA handles\n", __FUNCTION__ ));
+    AlsaStop( stream, stream->callbackAbort );
+
+    PA_DEBUG(( "%s: Stoppage\n", __FUNCTION__ ));
+
+    /* Eventually notify user all buffers have played */
+    if( stream->streamRepresentation.streamFinishedCallback )
+    {
+        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+    stream->isActive = 0;
+}
+
+static void CalculateTimeInfo( PaAlsaStream *stream, PaStreamCallbackTimeInfo *timeInfo )
+{
+    snd_pcm_status_t *capture_status, *playback_status;
+    snd_timestamp_t capture_timestamp, playback_timestamp;
+    PaTime capture_time = 0., playback_time = 0.;
+
+    alsa_snd_pcm_status_alloca( &capture_status );
+    alsa_snd_pcm_status_alloca( &playback_status );
+
+    if( stream->capture.pcm )
+    {
+        snd_pcm_sframes_t capture_delay;
+
+        alsa_snd_pcm_status( stream->capture.pcm, capture_status );
+        alsa_snd_pcm_status_get_tstamp( capture_status, &capture_timestamp );
+
+        capture_time = capture_timestamp.tv_sec +
+            ((PaTime)capture_timestamp.tv_usec / 1000000.0);
+        timeInfo->currentTime = capture_time;
+
+        capture_delay = alsa_snd_pcm_status_get_delay( capture_status );
+        timeInfo->inputBufferAdcTime = timeInfo->currentTime -
+            (PaTime)capture_delay / stream->streamRepresentation.streamInfo.sampleRate;
+    }
+    if( stream->playback.pcm )
+    {
+        snd_pcm_sframes_t playback_delay;
+
+        alsa_snd_pcm_status( stream->playback.pcm, playback_status );
+        alsa_snd_pcm_status_get_tstamp( playback_status, &playback_timestamp );
+
+        playback_time = playback_timestamp.tv_sec +
+            ((PaTime)playback_timestamp.tv_usec / 1000000.0);
+
+        if( stream->capture.pcm ) /* Full duplex */
+        {
+            /* Hmm, we have both a playback and a capture timestamp.
+             * Hopefully they are the same... */
+            if( fabs( capture_time - playback_time ) > 0.01 )
+                PA_DEBUG(("Capture time and playback time differ by %f\n", fabs(capture_time-playback_time)));
+        }
+        else
+            timeInfo->currentTime = playback_time;
+
+        playback_delay = alsa_snd_pcm_status_get_delay( playback_status );
+        timeInfo->outputBufferDacTime = timeInfo->currentTime +
+            (PaTime)playback_delay / stream->streamRepresentation.streamInfo.sampleRate;
+    }
+}
+
+/** Called after buffer processing is finished.
+ *
+ * A number of mmapped frames is committed, it is possible that an xrun has occurred in the meantime.
+ *
+ * @param numFrames The number of frames that has been processed
+ * @param xrun Return whether an xrun has occurred
+ */
+static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
+{
+    PaError result = paNoError;
+    int res = 0;
+
+    /* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
+     * afterwards
+     */
+    if( !self->ready )
+        goto end;
+
+    if( !self->canMmap && StreamDirection_Out == self->streamDir )
+    {
+        /* Play sound */
+        if( self->hostInterleaved )
+            res = alsa_snd_pcm_writei( self->pcm, self->nonMmapBuffer, numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            int bufsize = alsa_snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += bufsize;
+            }
+            res = alsa_snd_pcm_writen( self->pcm, bufs, numFrames );
+        }
+    }
+
+    if( self->canMmap )
+        res = alsa_snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+    else
+    {
+        /* using realloc for optimisation
+        free( self->nonMmapBuffer );
+        self->nonMmapBuffer = NULL;
+        */
+    }
+
+    if( res == -EPIPE || res == -ESTRPIPE )
+    {
+        *xrun = 1;
+    }
+    else
+    {
+        ENSURE_( res, paUnanticipatedHostError );
+    }
+
+end:
+error:
+    return result;
+}
+
+/* Extract buffer from channel area */
+static unsigned char *ExtractAddress( const snd_pcm_channel_area_t *area, snd_pcm_uframes_t offset )
+{
+    return (unsigned char *) area->addr + (area->first + offset * area->step) / 8;
+}
+
+/** Do necessary adaption between user and host channels.
+ *
+    @concern ChannelAdaption Adapting between user and host channels can involve silencing unused channels and
+    duplicating mono information if host outputs come in pairs.
+ */
+static PaError PaAlsaStreamComponent_DoChannelAdaption( PaAlsaStreamComponent *self, PaUtilBufferProcessor *bp, int numFrames )
+{
+    PaError result = paNoError;
+    unsigned char *p;
+    int i;
+    int unusedChans = self->numHostChannels - self->numUserChannels;
+    unsigned char *src, *dst;
+    int convertMono = (self->numHostChannels % 2) == 0 && (self->numUserChannels % 2) != 0;
+
+    assert( StreamDirection_Out == self->streamDir );
+
+    if( self->hostInterleaved )
+    {
+        int swidth = alsa_snd_pcm_format_size( self->nativeFormat, 1 );
+        unsigned char *buffer = self->canMmap ? ExtractAddress( self->channelAreas, self->offset ) : self->nonMmapBuffer;
+
+        /* Start after the last user channel */
+        p = buffer + self->numUserChannels * swidth;
+
+        if( convertMono )
+        {
+            /* Convert the last user channel into stereo pair */
+            src = buffer + (self->numUserChannels - 1) * swidth;
+            for( i = 0; i < numFrames; ++i )
+            {
+                dst = src + swidth;
+                memcpy( dst, src, swidth );
+                src += self->numHostChannels * swidth;
+            }
+
+            /* Don't touch the channel we just wrote to */
+            p += swidth;
+            --unusedChans;
+        }
+
+        if( unusedChans > 0 )
+        {
+            /* Silence unused output channels */
+            for( i = 0; i < numFrames; ++i )
+            {
+                memset( p, 0, swidth * unusedChans );
+                p += self->numHostChannels * swidth;
+            }
+        }
+    }
+    else
+    {
+        /* We extract the last user channel */
+        if( convertMono )
+        {
+            ENSURE_( alsa_snd_pcm_area_copy( self->channelAreas + self->numUserChannels, self->offset, self->channelAreas +
+                    (self->numUserChannels - 1), self->offset, numFrames, self->nativeFormat ), paUnanticipatedHostError );
+            --unusedChans;
+        }
+        if( unusedChans > 0 )
+        {
+            alsa_snd_pcm_areas_silence( self->channelAreas + (self->numHostChannels - unusedChans), self->offset, unusedChans, numFrames,
+                    self->nativeFormat );
+        }
+    }
+
+error:
+    return result;
+}
+
+static PaError PaAlsaStream_EndProcessing( PaAlsaStream *self, unsigned long numFrames, int *xrunOccurred )
+{
+    PaError result = paNoError;
+    int xrun = 0;
+
+    if( self->capture.pcm )
+    {
+        PA_ENSURE( PaAlsaStreamComponent_EndProcessing( &self->capture, numFrames, &xrun ) );
+    }
+    if( self->playback.pcm )
+    {
+        if( self->playback.numHostChannels > self->playback.numUserChannels )
+        {
+            PA_ENSURE( PaAlsaStreamComponent_DoChannelAdaption( &self->playback, &self->bufferProcessor, numFrames ) );
+        }
+        PA_ENSURE( PaAlsaStreamComponent_EndProcessing( &self->playback, numFrames, &xrun ) );
+    }
+
+error:
+    *xrunOccurred = xrun;
+    return result;
+}
+
+/** Update the number of available frames.
+ *
+ */
+static PaError PaAlsaStreamComponent_GetAvailableFrames( PaAlsaStreamComponent *self, unsigned long *numFrames, int *xrunOccurred )
+{
+    PaError result = paNoError;
+    snd_pcm_sframes_t framesAvail = alsa_snd_pcm_avail_update( self->pcm );
+    *xrunOccurred = 0;
+
+    if( -EPIPE == framesAvail )
+    {
+        *xrunOccurred = 1;
+        framesAvail = 0;
+    }
+    else
+    {
+        ENSURE_( framesAvail, paUnanticipatedHostError );
+    }
+
+    *numFrames = framesAvail;
+
+error:
+    return result;
+}
+
+/** Fill in pollfd objects.
+ */
+static PaError PaAlsaStreamComponent_BeginPolling( PaAlsaStreamComponent* self, struct pollfd* pfds )
+{
+    PaError result = paNoError;
+    int ret = alsa_snd_pcm_poll_descriptors( self->pcm, pfds, self->nfds );
+    (void)ret;  /* Prevent unused variable warning if asserts are turned off */
+    assert( ret == self->nfds );
+
+    self->ready = 0;
+
+    return result;
+}
+
+/** Examine results from poll().
+ *
+ * @param pfds pollfds to inspect
+ * @param shouldPoll Should we continue to poll
+ * @param xrun Has an xrun occurred
+ */
+static PaError PaAlsaStreamComponent_EndPolling( PaAlsaStreamComponent* self, struct pollfd* pfds, int* shouldPoll, int* xrun )
+{
+    PaError result = paNoError;
+    unsigned short revents;
+
+    ENSURE_( alsa_snd_pcm_poll_descriptors_revents( self->pcm, pfds, self->nfds, &revents ), paUnanticipatedHostError );
+    if( revents != 0 )
+    {
+        if( revents & POLLERR )
+        {
+            *xrun = 1;
+        }
+        else
+        if( revents & POLLHUP )
+        {
+            *xrun = 1;
+            PA_DEBUG(( "%s: revents has POLLHUP, processing as XRUN\n", __FUNCTION__ ));
+        }
+        else
+            self->ready = 1;
+
+        *shouldPoll = 0;
+    }
+
+error:
+    return result;
+}
+
+/** Return the number of available frames for this stream.
+ *
+ * @concern FullDuplex The minimum available for the two directions is calculated, it might be desirable to ignore
+ * one direction however (not marked ready from poll), so this is controlled by queryCapture and queryPlayback.
+ *
+ * @param queryCapture Check available for capture
+ * @param queryPlayback Check available for playback
+ * @param available The returned number of frames
+ * @param xrunOccurred Return whether an xrun has occurred
+ */
+static PaError PaAlsaStream_GetAvailableFrames( PaAlsaStream *self, int queryCapture, int queryPlayback, unsigned long
+        *available, int *xrunOccurred )
+{
+    PaError result = paNoError;
+    unsigned long captureFrames, playbackFrames;
+    *xrunOccurred = 0;
+
+    assert( queryCapture || queryPlayback );
+
+    if( queryCapture )
+    {
+        assert( self->capture.pcm );
+        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &self->capture, &captureFrames, xrunOccurred ) );
+        if( *xrunOccurred )
+        {
+            goto end;
+        }
+    }
+    if( queryPlayback )
+    {
+        assert( self->playback.pcm );
+        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &self->playback, &playbackFrames, xrunOccurred ) );
+        if( *xrunOccurred )
+        {
+            goto end;
+        }
+    }
+
+    if( queryCapture && queryPlayback )
+    {
+        *available = PA_MIN( captureFrames, playbackFrames );
+        /*PA_DEBUG(("capture: %lu, playback: %lu, combined: %lu\n", captureFrames, playbackFrames, *available));*/
+    }
+    else if( queryCapture )
+    {
+        *available = captureFrames;
+    }
+    else
+    {
+        *available = playbackFrames;
+    }
+
+end:
+error:
+    return result;
+}
+
+/** Wait for and report available buffer space from ALSA.
+ *
+ * Unless ALSA reports a minimum of frames available for I/O, we poll the ALSA filedescriptors for more.
+ * Both of these operations can uncover xrun conditions.
+ *
+ * @concern Xruns Both polling and querying available frames can report an xrun condition.
+ *
+ * @param framesAvail Return the number of available frames
+ * @param xrunOccurred Return whether an xrun has occurred
+ */
+static PaError PaAlsaStream_WaitForFrames( PaAlsaStream *self, unsigned long *framesAvail, int *xrunOccurred )
+{
+    PaError result = paNoError;
+    int pollPlayback = self->playback.pcm != NULL, pollCapture = self->capture.pcm != NULL;
+    int pollTimeout = self->pollTimeout;
+    int xrun = 0, timeouts = 0;
+    int pollResults;
+
+    assert( self );
+    assert( framesAvail );
+
+    if( !self->callbackMode )
+    {
+        /* In blocking mode we will only wait if necessary */
+        PA_ENSURE( PaAlsaStream_GetAvailableFrames( self, self->capture.pcm != NULL, self->playback.pcm != NULL,
+                    framesAvail, &xrun ) );
+        if( xrun )
+        {
+            goto end;
+        }
+
+        if( *framesAvail > 0 )
+        {
+            /* Mark pcms ready from poll */
+            if( self->capture.pcm )
+                self->capture.ready = 1;
+            if( self->playback.pcm )
+                self->playback.ready = 1;
+
+            goto end;
+        }
+    }
+
+    while( pollPlayback || pollCapture )
+    {
+        int totalFds = 0;
+        struct pollfd *capturePfds = NULL, *playbackPfds = NULL;
+
+#ifdef PTHREAD_CANCELED
+        pthread_testcancel();
+#endif
+        if( pollCapture )
+        {
+            capturePfds = self->pfds;
+            PA_ENSURE( PaAlsaStreamComponent_BeginPolling( &self->capture, capturePfds ) );
+            totalFds += self->capture.nfds;
+        }
+        if( pollPlayback )
+        {
+            playbackPfds = self->pfds + (self->capture.pcm ? self->capture.nfds : 0);
+            PA_ENSURE( PaAlsaStreamComponent_BeginPolling( &self->playback, playbackPfds ) );
+            totalFds += self->playback.nfds;
+        }
+
+        pollResults = poll( self->pfds, totalFds, pollTimeout );
+
+        if( pollResults < 0 )
+        {
+            /*  XXX: Depend on preprocessor condition? */
+            if( errno == EINTR )
+            {
+                /* gdb */
+                Pa_Sleep( 1 ); /* avoid hot loop */
+                continue;
+            }
+
+            /* TODO: Add macro for checking system calls */
+            PA_ENSURE( paInternalError );
+        }
+        else
+        if (pollResults == 0)
+        {
+
+           /* Suspended, paused or failed device can provide 0 poll results. To avoid deadloop in such situation
+            * we simply run counter 'timeouts' which detects 0 poll result and accumulates. As soon as 2048 timouts (around 2 seconds)
+            * are achieved we simply fail function with paTimedOut to notify waiting methods that device is not capable
+            * of providing audio data anymore and needs some corresponding recovery action.
+            * Note that 'timeouts' is reset to 0 if poll() managed to return non 0 results.
+            */
+
+            /*PA_DEBUG(( "%s: poll == 0 results, timed out, %d times left\n", __FUNCTION__, 2048 - timeouts ));*/
+
+            ++ timeouts;
+            if (timeouts > 1) /* sometimes device times out, but normally once, so we do not sleep any time */
+            {
+                Pa_Sleep( 1 ); /* avoid hot loop */
+            }
+            /* not else ! */
+            if (timeouts >= 2048) /* audio device not working, shall return error to notify waiters */
+            {
+				*framesAvail = 0; /* no frames available for processing */
+				xrun = 1; /* try recovering device */
+
+                PA_DEBUG(( "%s: poll timed out\n", __FUNCTION__, timeouts ));
+                goto end;/*PA_ENSURE( paTimedOut );*/
+            }
+        }
+        else
+        if (pollResults > 0)
+        {
+            /* reset timouts counter */
+            timeouts = 0;
+
+            /* check the return status of our pfds */
+            if( pollCapture )
+            {
+                PA_ENSURE( PaAlsaStreamComponent_EndPolling( &self->capture, capturePfds, &pollCapture, &xrun ) );
+            }
+            if( pollPlayback )
+            {
+                PA_ENSURE( PaAlsaStreamComponent_EndPolling( &self->playback, playbackPfds, &pollPlayback, &xrun ) );
+            }
+            if( xrun )
+            {
+                break;
+            }
+        }
+
+        /* @concern FullDuplex If only one of two pcms is ready we may want to compromise between the two.
+         * If there is less than half a period's worth of samples left of frames in the other pcm's buffer we will
+         * stop polling.
+         */
+        if( self->capture.pcm && self->playback.pcm )
+        {
+            if( pollCapture && !pollPlayback )
+            {
+                PA_ENSURE( ContinuePoll( self, StreamDirection_In, &pollTimeout, &pollCapture ) );
+            }
+            else if( pollPlayback && !pollCapture )
+            {
+                PA_ENSURE( ContinuePoll( self, StreamDirection_Out, &pollTimeout, &pollPlayback ) );
+            }
+        }
+    }
+
+    if( !xrun )
+    {
+        /* Get the number of available frames for the pcms that are marked ready.
+         * @concern FullDuplex If only one direction is marked ready (from poll), the number of frames available for
+         * the other direction is returned. Output is normally preferred over capture however, so capture frames may be
+         * discarded to avoid overrun unless paNeverDropInput is specified.
+         */
+        int captureReady = self->capture.pcm ? self->capture.ready : 0,
+            playbackReady = self->playback.pcm ? self->playback.ready : 0;
+        PA_ENSURE( PaAlsaStream_GetAvailableFrames( self, captureReady, playbackReady, framesAvail, &xrun ) );
+
+        if( self->capture.pcm && self->playback.pcm )
+        {
+            if( !self->playback.ready && !self->neverDropInput )
+            {
+                /* Drop input, a period's worth */
+                assert( self->capture.ready );
+                PaAlsaStreamComponent_EndProcessing( &self->capture, PA_MIN( self->capture.framesPerBuffer,
+                            *framesAvail ), &xrun );
+                *framesAvail = 0;
+                self->capture.ready = 0;
+            }
+        }
+        else if( self->capture.pcm )
+            assert( self->capture.ready );
+        else
+            assert( self->playback.ready );
+    }
+
+end:
+error:
+    if( xrun )
+    {
+        /* Recover from the xrun state */
+        PA_ENSURE( PaAlsaStream_HandleXrun( self ) );
+        *framesAvail = 0;
+    }
+    else
+    {
+        if( 0 != *framesAvail )
+        {
+            /* If we're reporting frames eligible for processing, one of the handles better be ready */
+            PA_UNLESS( self->capture.ready || self->playback.ready, paInternalError );
+        }
+    }
+    *xrunOccurred = xrun;
+
+    return result;
+}
+
+/** Register per-channel ALSA buffer information with buffer processor.
+ *
+ * Mmapped buffer space is acquired from ALSA, and registered with the buffer processor. Differences between the
+ * number of host and user channels is taken into account.
+ *
+ * @param numFrames On entrance the number of requested frames, on exit the number of contiguously accessible frames.
+ */
+static PaError PaAlsaStreamComponent_RegisterChannels( PaAlsaStreamComponent* self, PaUtilBufferProcessor* bp,
+        unsigned long* numFrames, int* xrun )
+{
+    PaError result = paNoError;
+    const snd_pcm_channel_area_t *areas, *area;
+    void (*setChannel)(PaUtilBufferProcessor *, unsigned int, void *, unsigned int) =
+        StreamDirection_In == self->streamDir ? PaUtil_SetInputChannel : PaUtil_SetOutputChannel;
+    unsigned char *buffer, *p;
+    int i;
+    unsigned long framesAvail;
+
+    /* This _must_ be called before mmap_begin */
+    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( self, &framesAvail, xrun ) );
+    if( *xrun )
+    {
+        *numFrames = 0;
+        goto end;
+    }
+
+    if( self->canMmap )
+    {
+        ENSURE_( alsa_snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+        /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
+        self->channelAreas = (snd_pcm_channel_area_t *)areas;
+    }
+    else
+    {
+        unsigned int bufferSize = self->numHostChannels * alsa_snd_pcm_format_size( self->nativeFormat, *numFrames );
+        if (bufferSize > self->nonMmapBufferSize)
+        {
+            self->nonMmapBuffer = realloc(self->nonMmapBuffer, (self->nonMmapBufferSize = bufferSize));
+            if (!self->nonMmapBuffer)
+            {
+                result = paInsufficientMemory;
+                goto error;
+            }
+        }
+    }
+
+    if( self->hostInterleaved )
+    {
+        int swidth = alsa_snd_pcm_format_size( self->nativeFormat, 1 );
+
+        p = buffer = self->canMmap ? ExtractAddress( areas, self->offset ) : self->nonMmapBuffer;
+        for( i = 0; i < self->numUserChannels; ++i )
+        {
+            /* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
+            setChannel( bp, i, p, self->numHostChannels );
+            p += swidth;
+        }
+    }
+    else
+    {
+        if( self->canMmap )
+        {
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                area = areas + i;
+                buffer = ExtractAddress( area, self->offset );
+                setChannel( bp, i, buffer, 1 );
+            }
+        }
+        else
+        {
+            unsigned int buf_per_ch_size = self->nonMmapBufferSize / self->numHostChannels;
+            buffer = self->nonMmapBuffer;
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                setChannel( bp, i, buffer, 1 );
+                buffer += buf_per_ch_size;
+            }
+        }
+    }
+
+    if( !self->canMmap && StreamDirection_In == self->streamDir )
+    {
+        /* Read sound */
+        int res;
+        if( self->hostInterleaved )
+            res = alsa_snd_pcm_readi( self->pcm, self->nonMmapBuffer, *numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            unsigned int buf_per_ch_size = self->nonMmapBufferSize / self->numHostChannels;
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += buf_per_ch_size;
+            }
+            res = alsa_snd_pcm_readn( self->pcm, bufs, *numFrames );
+        }
+        if( res == -EPIPE || res == -ESTRPIPE )
+        {
+            *xrun = 1;
+            *numFrames = 0;
+        }
+    }
+
+end:
+error:
+    return result;
+}
+
+/** Initiate buffer processing.
+ *
+ * ALSA buffers are registered with the PA buffer processor and the buffer size (in frames) set.
+ *
+ * @concern FullDuplex If both directions are being processed, the minimum amount of frames for the two directions is
+ * calculated.
+ *
+ * @param numFrames On entrance the number of available frames, on exit the number of received frames
+ * @param xrunOccurred Return whether an xrun has occurred
+ */
+static PaError PaAlsaStream_SetUpBuffers( PaAlsaStream* self, unsigned long* numFrames, int* xrunOccurred )
+{
+    PaError result = paNoError;
+    unsigned long captureFrames = ULONG_MAX, playbackFrames = ULONG_MAX, commonFrames = 0;
+    int xrun = 0;
+
+    if( *xrunOccurred )
+    {
+        *numFrames = 0;
+        return result;
+    }
+    /* If we got here at least one of the pcm's should be marked ready */
+    PA_UNLESS( self->capture.ready || self->playback.ready, paInternalError );
+
+    /* Extract per-channel ALSA buffer pointers and register them with the buffer processor.
+     * It is possible that a direction is not marked ready however, because it is out of sync with the other.
+     */
+    if( self->capture.pcm && self->capture.ready )
+    {
+        captureFrames = *numFrames;
+        PA_ENSURE( PaAlsaStreamComponent_RegisterChannels( &self->capture, &self->bufferProcessor, &captureFrames,
+                    &xrun ) );
+    }
+    if( self->playback.pcm && self->playback.ready )
+    {
+        playbackFrames = *numFrames;
+        PA_ENSURE( PaAlsaStreamComponent_RegisterChannels( &self->playback, &self->bufferProcessor, &playbackFrames,
+                    &xrun ) );
+    }
+    if( xrun )
+    {
+        /* Nothing more to do */
+        assert( 0 == commonFrames );
+        goto end;
+    }
+
+    commonFrames = PA_MIN( captureFrames, playbackFrames );
+    /* assert( commonFrames <= *numFrames ); */
+    if( commonFrames > *numFrames )
+    {
+        /* Hmmm ... how come there are more frames available than we requested!? Blah. */
+        PA_DEBUG(( "%s: Common available frames are reported to be more than number requested: %lu, %lu, callbackMode: %d\n", __FUNCTION__,
+                    commonFrames, *numFrames, self->callbackMode ));
+        if( self->capture.pcm )
+        {
+            PA_DEBUG(( "%s: captureFrames: %lu, capture.ready: %d\n", __FUNCTION__, captureFrames, self->capture.ready ));
+        }
+        if( self->playback.pcm )
+        {
+            PA_DEBUG(( "%s: playbackFrames: %lu, playback.ready: %d\n", __FUNCTION__, playbackFrames, self->playback.ready ));
+        }
+
+        commonFrames = 0;
+        goto end;
+    }
+
+    /* Inform PortAudio of the number of frames we got.
+     * @concern FullDuplex We might be experiencing underflow in either end; if its an input underflow, we go on
+     * with output. If its output underflow however, depending on the paNeverDropInput flag, we may want to simply
+     * discard the excess input or call the callback with paOutputOverflow flagged.
+     */
+    if( self->capture.pcm )
+    {
+        if( self->capture.ready )
+        {
+            PaUtil_SetInputFrameCount( &self->bufferProcessor, commonFrames );
+        }
+        else
+        {
+            /* We have input underflow */
+            PaUtil_SetNoInput( &self->bufferProcessor );
+        }
+    }
+    if( self->playback.pcm )
+    {
+        if( self->playback.ready )
+        {
+            PaUtil_SetOutputFrameCount( &self->bufferProcessor, commonFrames );
+        }
+        else
+        {
+            /* We have output underflow, but keeping input data (paNeverDropInput) */
+            assert( self->neverDropInput );
+            assert( self->capture.pcm != NULL );
+            PA_DEBUG(( "%s: Setting output buffers to NULL\n", __FUNCTION__ ));
+            PaUtil_SetNoOutput( &self->bufferProcessor );
+        }
+    }
+
+end:
+    *numFrames = commonFrames;
+error:
+    if( xrun )
+    {
+        PA_ENSURE( PaAlsaStream_HandleXrun( self ) );
+        *numFrames = 0;
+    }
+    *xrunOccurred = xrun;
+
+    return result;
+}
+
+/** Callback thread's function.
+ *
+ * Roughly, the workflow can be described in the following way: The number of available frames that can be processed
+ * directly is obtained from ALSA, we then request as much directly accessible memory as possible within this amount
+ * from ALSA. The buffer memory is registered with the PA buffer processor and processing is carried out with
+ * PaUtil_EndBufferProcessing. Finally, the number of processed frames is reported to ALSA. The processing can
+ * happen in several iterations untill we have consumed the known number of available frames (or an xrun is detected).
+ */
+static void *CallbackThreadFunc( void *userData )
+{
+    PaError result = paNoError;
+    PaAlsaStream *stream = (PaAlsaStream*) userData;
+    PaStreamCallbackTimeInfo timeInfo = {0, 0, 0};
+    snd_pcm_sframes_t startThreshold = 0;
+    int callbackResult = paContinue;
+    PaStreamCallbackFlags cbFlags = 0;  /* We might want to keep state across iterations */
+    int streamStarted = 0;
+
+    assert( stream );
+
+    /* Execute OnExit when exiting */
+    pthread_cleanup_push( &OnExit, stream );
+
+    /* Not implemented */
+    assert( !stream->primeBuffers );
+
+    /* @concern StreamStart If the output is being primed the output pcm needs to be prepared, otherwise the
+     * stream is started immediately. The latter involves signaling the waiting main thread.
+     */
+    if( stream->primeBuffers )
+    {
+        snd_pcm_sframes_t avail;
+
+        if( stream->playback.pcm )
+            ENSURE_( alsa_snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
+        if( stream->capture.pcm && !stream->pcmsSynced )
+            ENSURE_( alsa_snd_pcm_prepare( stream->capture.pcm ), paUnanticipatedHostError );
+
+        /* We can't be certain that the whole ring buffer is available for priming, but there should be
+         * at least one period */
+        avail = alsa_snd_pcm_avail_update( stream->playback.pcm );
+        startThreshold = avail - (avail % stream->playback.framesPerBuffer);
+        assert( startThreshold >= stream->playback.framesPerBuffer );
+    }
+    else
+    {
+        PA_ENSURE( PaUnixThread_PrepareNotify( &stream->thread ) );
+        /* Buffer will be zeroed */
+        PA_ENSURE( AlsaStart( stream, 0 ) );
+        PA_ENSURE( PaUnixThread_NotifyParent( &stream->thread ) );
+
+        streamStarted = 1;
+    }
+
+    while( 1 )
+    {
+        unsigned long framesAvail, framesGot;
+        int xrun = 0;
+
+#ifdef PTHREAD_CANCELED
+		pthread_testcancel();
+#endif
+
+        /* @concern StreamStop if the main thread has requested a stop and the stream has not been effectively
+         * stopped we signal this condition by modifying callbackResult (we'll want to flush buffered output).
+         */
+        if( PaUnixThread_StopRequested( &stream->thread ) && paContinue == callbackResult )
+        {
+            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
+            callbackResult = paComplete;
+        }
+
+        if( paContinue != callbackResult )
+        {
+            stream->callbackAbort = (paAbort == callbackResult);
+            if( stream->callbackAbort ||
+                    /** @concern BlockAdaption: Go on if adaption buffers are empty */
+                    PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
+            {
+                goto end;
+            }
+
+            PA_DEBUG(( "%s: Flushing buffer processor\n", __FUNCTION__ ));
+            /* There is still buffered output that needs to be processed */
+        }
+
+        /* Wait for data to become available, this comes down to polling the ALSA file descriptors untill we have
+         * a number of available frames.
+         */
+        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
+        if( xrun )
+        {
+            assert( 0 == framesAvail );
+            continue;
+
+            /* XXX: Report xruns to the user? A situation is conceivable where the callback is never invoked due
+             * to constant xruns, it might be desirable to notify the user of this.
+             */
+        }
+
+        /* Consume buffer space. Once we have a number of frames available for consumption we must retrieve the
+         * mmapped buffers from ALSA, this is contiguously accessible memory however, so we may receive smaller
+         * portions at a time than is available as a whole. Therefore we should be prepared to process several
+         * chunks successively. The buffers are passed to the PA buffer processor.
+         */
+        while( framesAvail > 0 )
+        {
+            xrun = 0;
+
+#ifdef PTHREAD_CANCELED
+           pthread_testcancel();
+#endif
+
+            /** @concern Xruns Under/overflows are to be reported to the callback */
+            if( stream->underrun > 0.0 )
+            {
+                cbFlags |= paOutputUnderflow;
+                stream->underrun = 0.0;
+            }
+            if( stream->overrun > 0.0 )
+            {
+                cbFlags |= paInputOverflow;
+                stream->overrun = 0.0;
+            }
+            if( stream->capture.pcm && stream->playback.pcm )
+            {
+                /** @concern FullDuplex It's possible that only one direction is being processed to avoid an
+                 * under- or overflow, this should be reported correspondingly */
+                if( !stream->capture.ready )
+                {
+                    cbFlags |= paInputUnderflow;
+                    PA_DEBUG(( "%s: Input underflow\n", __FUNCTION__ ));
+                }
+                else if( !stream->playback.ready )
+                {
+                    cbFlags |= paOutputOverflow;
+                    PA_DEBUG(( "%s: Output overflow\n", __FUNCTION__ ));
+                }
+            }
+
+#if 0
+            CallbackUpdate( &stream->threading );
+#endif
+            CalculateTimeInfo( stream, &timeInfo );
+            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, cbFlags );
+            cbFlags = 0;
+
+            /* CPU load measurement should include processing activivity external to the stream callback */
+            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+            framesGot = framesAvail;
+            if( paUtilFixedHostBufferSize == stream->bufferProcessor.hostBufferSizeMode )
+            {
+                /* We've committed to a fixed host buffer size, stick to that */
+                framesGot = framesGot >= stream->maxFramesPerHostBuffer ? stream->maxFramesPerHostBuffer : 0;
+            }
+            else
+            {
+                /* We've committed to an upper bound on the size of host buffers */
+                assert( paUtilBoundedHostBufferSize == stream->bufferProcessor.hostBufferSizeMode );
+                framesGot = PA_MIN( framesGot, stream->maxFramesPerHostBuffer );
+            }
+            PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
+            /* Check the host buffer size against the buffer processor configuration */
+            framesAvail -= framesGot;
+
+            if( framesGot > 0 )
+            {
+                assert( !xrun );
+                PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+                PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
+            }
+            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesGot );
+
+            if( 0 == framesGot )
+            {
+                /* Go back to polling for more frames */
+                break;
+
+            }
+
+            if( paContinue != callbackResult )
+                break;
+        }
+    }
+
+end:
+    ; /* Hack to fix "label at end of compound statement" error caused by pthread_cleanup_pop(1) macro. */
+    /* Match pthread_cleanup_push */
+    pthread_cleanup_pop( 1 );
+
+    PA_DEBUG(( "%s: Thread %d exiting\n ", __FUNCTION__, pthread_self() ));
+    PaUnixThreading_EXIT( result );
+
+error:
+    PA_DEBUG(( "%s: Thread %d is canceled due to error %d\n ", __FUNCTION__, pthread_self(), result ));
+    goto end;
+}
+
+/* Blocking interface */
+
+static PaError ReadStream( PaStream* s, void *buffer, unsigned long frames )
+{
+    PaError result = paNoError;
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+    unsigned long framesGot, framesAvail;
+    void *userBuffer;
+    snd_pcm_t *save = stream->playback.pcm;
+
+    assert( stream );
+
+    PA_UNLESS( stream->capture.pcm, paCanNotReadFromAnOutputOnlyStream );
+
+    /* Disregard playback */
+    stream->playback.pcm = NULL;
+
+    if( stream->overrun > 0. )
+    {
+        result = paInputOverflowed;
+        stream->overrun = 0.0;
+    }
+
+    if( stream->capture.userInterleaved )
+    {
+        userBuffer = buffer;
+    }
+    else
+    {
+        /* Copy channels into local array */
+        userBuffer = stream->capture.userBuffers;
+        memcpy( userBuffer, buffer, sizeof (void *) * stream->capture.numUserChannels );
+    }
+
+    /* Start stream if in prepared state */
+    if( alsa_snd_pcm_state( stream->capture.pcm ) == SND_PCM_STATE_PREPARED )
+    {
+        ENSURE_( alsa_snd_pcm_start( stream->capture.pcm ), paUnanticipatedHostError );
+    }
+
+    while( frames > 0 )
+    {
+        int xrun = 0;
+        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
+        framesGot = PA_MIN( framesAvail, frames );
+
+        PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
+        if( framesGot > 0 )
+        {
+            framesGot = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesGot );
+            PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
+            frames -= framesGot;
+        }
+    }
+
+end:
+    stream->playback.pcm = save;
+    return result;
+error:
+    goto end;
+}
+
+static PaError WriteStream( PaStream* s, const void *buffer, unsigned long frames )
+{
+    PaError result = paNoError;
+    signed long err;
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+    snd_pcm_uframes_t framesGot, framesAvail;
+    const void *userBuffer;
+    snd_pcm_t *save = stream->capture.pcm;
+
+    assert( stream );
+
+    PA_UNLESS( stream->playback.pcm, paCanNotWriteToAnInputOnlyStream );
+
+    /* Disregard capture */
+    stream->capture.pcm = NULL;
+
+    if( stream->underrun > 0. )
+    {
+        result = paOutputUnderflowed;
+        stream->underrun = 0.0;
+    }
+
+    if( stream->playback.userInterleaved )
+        userBuffer = buffer;
+    else /* Copy channels into local array */
+    {
+        userBuffer = stream->playback.userBuffers;
+        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->playback.numUserChannels );
+    }
+
+    while( frames > 0 )
+    {
+        int xrun = 0;
+        snd_pcm_uframes_t hwAvail;
+
+        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
+        framesGot = PA_MIN( framesAvail, frames );
+
+        PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
+        if( framesGot > 0 )
+        {
+            framesGot = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, framesGot );
+            PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
+            frames -= framesGot;
+        }
+
+        /* Start stream after one period of samples worth */
+
+        /* Frames residing in buffer */
+        PA_ENSURE( err = GetStreamWriteAvailable( stream ) );
+        framesAvail = err;
+        hwAvail = stream->playback.bufferSize - framesAvail;
+
+        if( alsa_snd_pcm_state( stream->playback.pcm ) == SND_PCM_STATE_PREPARED &&
+                hwAvail >= stream->playback.framesPerBuffer )
+        {
+            ENSURE_( alsa_snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+        }
+    }
+
+end:
+    stream->capture.pcm = save;
+    return result;
+error:
+    goto end;
+}
+
+/* Return frames available for reading. In the event of an overflow, the capture pcm will be restarted */
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaError result = paNoError;
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+    unsigned long avail;
+    int xrun;
+
+    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->capture, &avail, &xrun ) );
+    if( xrun )
+    {
+        PA_ENSURE( PaAlsaStream_HandleXrun( stream ) );
+        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->capture, &avail, &xrun ) );
+        if( xrun )
+            PA_ENSURE( paInputOverflowed );
+    }
+
+    return (signed long)avail;
+
+error:
+    return result;
+}
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaError result = paNoError;
+    PaAlsaStream *stream = (PaAlsaStream*)s;
+    unsigned long avail;
+    int xrun;
+
+    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->playback, &avail, &xrun ) );
+    if( xrun )
+    {
+        snd_pcm_sframes_t savail;
+
+        PA_ENSURE( PaAlsaStream_HandleXrun( stream ) );
+        savail = alsa_snd_pcm_avail_update( stream->playback.pcm );
+
+        /* savail should not contain -EPIPE now, since PaAlsaStream_HandleXrun will only prepare the pcm */
+        ENSURE_( savail, paUnanticipatedHostError );
+
+        avail = (unsigned long) savail;
+    }
+
+    return (signed long)avail;
+
+error:
+    return result;
+}
+
+/* Extensions */
+
+void PaAlsa_InitializeStreamInfo( PaAlsaStreamInfo *info )
+{
+    info->size = sizeof (PaAlsaStreamInfo);
+    info->hostApiType = paALSA;
+    info->version = 1;
+    info->deviceString = NULL;
+}
+
+void PaAlsa_EnableRealtimeScheduling( PaStream *s, int enable )
+{
+    PaAlsaStream *stream = (PaAlsaStream *) s;
+    stream->rtSched = enable;
+}
+
+#if 0
+void PaAlsa_EnableWatchdog( PaStream *s, int enable )
+{
+    PaAlsaStream *stream = (PaAlsaStream *) s;
+    stream->thread.useWatchdog = enable;
+}
+#endif
+
+static PaError GetAlsaStreamPointer( PaStream* s, PaAlsaStream** stream )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation* hostApi;
+    PaAlsaHostApiRepresentation* alsaHostApi;
+
+    PA_ENSURE( PaUtil_ValidateStreamPointer( s ) );
+    PA_ENSURE( PaUtil_GetHostApiRepresentation( &hostApi, paALSA ) );
+    alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
+
+    PA_UNLESS( PA_STREAM_REP( s )->streamInterface == &alsaHostApi->callbackStreamInterface
+            || PA_STREAM_REP( s )->streamInterface == &alsaHostApi->blockingStreamInterface,
+        paIncompatibleStreamHostApi );
+
+    *stream = (PaAlsaStream*)s;
+error:
+    return paNoError;
+}
+
+PaError PaAlsa_GetStreamInputCard(PaStream* s, int* card) {
+    PaAlsaStream *stream;
+    PaError result = paNoError;
+    snd_pcm_info_t* pcmInfo;
+
+    PA_ENSURE( GetAlsaStreamPointer( s, &stream ) );
+
+    /* XXX: More descriptive error? */
+    PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
+
+    alsa_snd_pcm_info_alloca( &pcmInfo );
+    PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
+    *card = alsa_snd_pcm_info_get_card( pcmInfo );
+
+error:
+    return result;
+}
+
+PaError PaAlsa_GetStreamOutputCard(PaStream* s, int* card) {
+    PaAlsaStream *stream;
+    PaError result = paNoError;
+    snd_pcm_info_t* pcmInfo;
+
+    PA_ENSURE( GetAlsaStreamPointer( s, &stream ) );
+
+    /* XXX: More descriptive error? */
+    PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
+
+    alsa_snd_pcm_info_alloca( &pcmInfo );
+    PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
+    *card = alsa_snd_pcm_info_get_card( pcmInfo );
+
+error:
+    return result;
+}
+
+PaError PaAlsa_SetRetriesBusy( int retries )
+{
+    busyRetries_ = retries;
+    return paNoError;
+}
diff --git a/Externals/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/Externals/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
new file mode 100644
index 0000000000..f5a5290284
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
@@ -0,0 +1,2893 @@
+/*
+ * $Id:$
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ * AudioScience HPI implementation by Fred Gleason, Ludwig Schwardt and
+ * Eliot Blennerhassett
+ *
+ * Copyright (c) 2003 Fred Gleason <fredg@salemradiolabs.com>
+ * Copyright (c) 2005,2006 Ludwig Schwardt <schwardt@sun.ac.za>
+ * Copyright (c) 2011 Eliot Blennerhassett <eblennerhassett@audioscience.com>
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/*
+ * Modification History
+ * 12/2003 - Initial version
+ * 09/2005 - v19 version [rewrite]
+ */
+
+/** @file
+ @ingroup hostapi_src
+ @brief Host API implementation supporting AudioScience cards
+        via the Linux HPI interface.
+
+ <h3>Overview</h3>
+
+ This is a PortAudio implementation for the AudioScience HPI Audio API
+ on the Linux platform. AudioScience makes a range of audio adapters customised
+ for the broadcasting industry, with support for both Windows and Linux.
+ More information on their products can be found on their website:
+
+     http://www.audioscience.com
+
+ Documentation for the HPI API can be found at:
+
+     http://www.audioscience.com/internet/download/sdk/hpi_usermanual_html/html/index.html
+
+ The Linux HPI driver itself (a kernel module + library) can be downloaded from:
+
+     http://www.audioscience.com/internet/download/linux_drivers.htm
+
+ <h3>Implementation strategy</h3>
+
+ *Note* Ideally, AudioScience cards should be handled by the PortAudio ALSA
+ implementation on Linux, as ALSA is the preferred Linux soundcard API. The existence
+ of this host API implementation might therefore seem a bit flawed. Unfortunately, at
+ the time of the creation of this implementation (June 2006), the PA ALSA implementation
+ could not make use of the existing AudioScience ALSA driver. PA ALSA uses the
+ "memory-mapped" (mmap) ALSA access mode to interact with the ALSA library, while the
+ AudioScience ALSA driver only supports the "read-write" access mode. The appropriate
+ solution to this problem is to add "read-write" support to PortAudio ALSA, thereby
+ extending the range of soundcards it supports (AudioScience cards are not the only
+ ones with this problem). Given the author's limited knowledge of ALSA and the
+ simplicity of the HPI API, the second-best solution was born...
+
+ The following mapping between HPI and PA was followed:
+ HPI subsystem => PortAudio host API
+ HPI adapter => nothing specific
+ HPI stream => PortAudio device
+
+ Each HPI stream is either input or output (not both), and can support
+ different channel counts, sampling rates and sample formats. It is therefore
+ a more natural fit to a PA device. A PA stream can therefore combine two
+ HPI streams (one input and one output) into a "full-duplex" stream. These
+ HPI streams can even be on different physical adapters. The two streams ought to be
+ sample-synchronised when they reside on the same adapter, as most AudioScience adapters
+ derive their ADC and DAC clocks from one master clock. When combining two adapters
+ into one full-duplex stream, however, the use of a word clock connection between the
+ adapters is strongly recommended.
+
+ The HPI interface is inherently blocking, making use of read and write calls to
+ transfer data between user buffers and driver buffers. The callback interface therefore
+ requires a helper thread ("callback engine") which periodically transfers data (one thread
+ per PA stream, in fact). The current implementation explicitly sleeps via Pa_Sleep() until
+ enough samples can be transferred (select() or poll() would be better, but currently seems
+ impossible...). The thread implementation makes use of the Unix thread helper functions
+ and some pthread calls here and there. If a unified PA thread exists, this host API
+ implementation might also compile on Windows, as this is the only real Linux-specific
+ part of the code.
+
+ There is no inherent fixed buffer size in the HPI interface, as in some other host APIs.
+ The PortAudio implementation contains a buffer that is allocated during OpenStream and
+ used to transfer data between the callback and the HPI driver buffer. The size of this
+ buffer is quite flexible and is derived from latency suggestions and matched to the
+ requested callback buffer size as far as possible. It can become quite huge, as the
+ AudioScience cards are typically geared towards higher-latency applications and contain
+ large hardware buffers.
+
+ The HPI interface natively supports most common sample formats and sample rates (some
+ conversion is done on the adapter itself).
+
+ Stream time is measured based on the number of processed frames, which is adjusted by the
+ number of frames currently buffered by the HPI driver.
+
+ There is basic support for detecting overflow and underflow. The HPI interface does not
+ explicitly indicate this, so thresholds on buffer levels are used in combination with
+ stream state. Recovery from overflow and underflow is left to the PA client.
+
+ Blocking streams are also implemented. It makes use of the same polling routines that
+ the callback interface uses, in order to prevent the allocation of variable-sized
+ buffers during reading and writing. The framesPerBuffer parameter is therefore still
+ relevant, and this can be increased in the blocking case to improve efficiency.
+
+ The implementation contains extensive reporting macros (slightly modified PA_ENSURE and
+ PA_UNLESS versions) and a useful stream dump routine to provide debugging feedback.
+
+ Output buffer priming via the user callback (i.e. paPrimeOutputBuffersUsingStreamCallback
+ and friends) is not implemented yet. All output is primed with silence.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>          /* strlen() */
+#include <pthread.h>         /* pthreads and friends */
+#include <assert.h>          /* assert */
+#include <math.h>            /* ceil, floor */
+
+#include <asihpi/hpi.h>      /* HPI API */
+
+#include "portaudio.h"       /* PortAudio API */
+#include "pa_util.h"         /* PA_DEBUG, other small utilities */
+#include "pa_unix_util.h"    /* Unix threading utilities */
+#include "pa_allocation.h"   /* Group memory allocation */
+#include "pa_hostapi.h"      /* Host API structs */
+#include "pa_stream.h"       /* Stream interface structs */
+#include "pa_cpuload.h"      /* CPU load measurer */
+#include "pa_process.h"      /* Buffer processor */
+#include "pa_converters.h"   /* PaUtilZeroer */
+#include "pa_debugprint.h"
+
+/* -------------------------------------------------------------------------- */
+
+/*
+ * Defines
+ */
+
+/* Error reporting and assertions */
+
+/** Evaluate expression, and return on any PortAudio errors */
+#define PA_ENSURE_(expr) \
+    do { \
+        PaError paError = (expr); \
+        if( UNLIKELY( paError < paNoError ) ) \
+        { \
+            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = paError; \
+            goto error; \
+        } \
+    } while (0);
+
+/** Assert expression, else return the provided PaError */
+#define PA_UNLESS_(expr, paError) \
+    do { \
+        if( UNLIKELY( (expr) == 0 ) ) \
+        { \
+            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = (paError); \
+            goto error; \
+        } \
+    } while( 0 );
+
+/** Check return value of HPI function, and map it to PaError */
+#define PA_ASIHPI_UNLESS_(expr, paError) \
+    do { \
+        hpi_err_t hpiError = (expr); \
+        /* If HPI error occurred */ \
+        if( UNLIKELY( hpiError ) ) \
+        { \
+	    char szError[256]; \
+	    HPI_GetErrorText( hpiError, szError ); \
+	    PA_DEBUG(( "HPI error %d occurred: %s\n", hpiError, szError )); \
+	    /* This message will always be displayed, even if debug info is disabled */ \
+            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            if( (paError) == paUnanticipatedHostError ) \
+	    { \
+	        PA_DEBUG(( "Host error description: %s\n", szError )); \
+	        /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
+	        if( pthread_equal( pthread_self(), paUnixMainThread ) ) \
+                { \
+		    PaUtil_SetLastHostErrorInfo( paInDevelopment, hpiError, szError ); \
+                } \
+	    } \
+	    /* If paNoError is specified, continue as usual */ \
+            /* (useful if you only want to print out the debug messages above) */ \
+	    if( (paError) < 0 ) \
+	    { \
+	        result = (paError); \
+	        goto error; \
+	    } \
+        } \
+    } while( 0 );
+
+/** Report HPI error code and text */
+#define PA_ASIHPI_REPORT_ERROR_(hpiErrorCode) \
+    do { \
+        char szError[256]; \
+        HPI_GetErrorText( hpiError, szError ); \
+        PA_DEBUG(( "HPI error %d occurred: %s\n", hpiError, szError )); \
+        /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
+        if( pthread_equal( pthread_self(), paUnixMainThread ) ) \
+	{ \
+	    PaUtil_SetLastHostErrorInfo( paInDevelopment, (hpiErrorCode), szError ); \
+	} \
+    } while( 0 );
+
+/* Defaults */
+
+/** Sample formats available natively on AudioScience hardware */
+#define PA_ASIHPI_AVAILABLE_FORMATS_ (paFloat32 | paInt32 | paInt24 | paInt16 | paUInt8)
+/** Enable background bus mastering (BBM) for buffer transfers, if available (see HPI docs) */
+#define PA_ASIHPI_USE_BBM_ 1
+/** Minimum number of frames in HPI buffer (for either data or available space).
+ If buffer contains less data/space, it indicates xrun or completion. */
+#define PA_ASIHPI_MIN_FRAMES_ 1152
+/** Minimum polling interval in milliseconds, which determines minimum host buffer size */
+#define PA_ASIHPI_MIN_POLLING_INTERVAL_ 10
+
+/* -------------------------------------------------------------------------- */
+
+/*
+ * Structures
+ */
+
+/** Host API global data */
+typedef struct PaAsiHpiHostApiRepresentation
+{
+    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
+    PaUtilHostApiRepresentation baseHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    /* implementation specific data goes here */
+
+    PaHostApiIndex hostApiIndex;
+}
+PaAsiHpiHostApiRepresentation;
+
+
+/** Device data */
+typedef struct PaAsiHpiDeviceInfo
+{
+    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
+    /** Common PortAudio device information */
+    PaDeviceInfo baseDeviceInfo;
+
+    /* implementation specific data goes here */
+
+    /** Adapter index */
+    uint16_t adapterIndex;
+    /** Adapter model number (hex) */
+    uint16_t adapterType;
+    /** Adapter HW/SW version */
+    uint16_t adapterVersion;
+    /** Adapter serial number */
+    uint32_t adapterSerialNumber;
+    /** Stream number */
+    uint16_t streamIndex;
+    /** 0=Input, 1=Output (HPI streams are either input or output but not both) */
+    uint16_t streamIsOutput;
+}
+PaAsiHpiDeviceInfo;
+
+
+/** Stream state as defined by PortAudio.
+ It seems that the host API implementation has to keep track of the PortAudio stream state.
+ Please note that this is NOT the same as the state of the underlying HPI stream. By separating
+ these two concepts, a lot of flexibility is gained. There is a rough match between the two,
+ of course, but forcing a precise match is difficult. For example, HPI_STATE_DRAINED can occur
+ during the Active state of PortAudio (due to underruns) and also during CallBackFinished in
+ the case of an output stream. Similarly, HPI_STATE_STOPPED mostly coincides with the Stopped
+ PortAudio state, by may also occur in the CallbackFinished state when recording is finished.
+
+ Here is a rough match-up:
+
+ PortAudio state   =>     HPI state
+ ---------------          ---------
+ Active            =>     HPI_STATE_RECORDING, HPI_STATE_PLAYING, (HPI_STATE_DRAINED)
+ Stopped           =>     HPI_STATE_STOPPED
+ CallbackFinished  =>     HPI_STATE_STOPPED, HPI_STATE_DRAINED */
+typedef enum PaAsiHpiStreamState
+{
+    paAsiHpiStoppedState=0,
+    paAsiHpiActiveState=1,
+    paAsiHpiCallbackFinishedState=2
+}
+PaAsiHpiStreamState;
+
+
+/** Stream component data (associated with one direction, i.e. either input or output) */
+typedef struct PaAsiHpiStreamComponent
+{
+    /** Device information (HPI handles, etc) */
+    PaAsiHpiDeviceInfo *hpiDevice;
+    /** Stream handle, as passed to HPI interface. */
+    hpi_handle_t hpiStream;
+    /** Stream format, as passed to HPI interface */
+    struct hpi_format hpiFormat;
+    /** Number of bytes per frame, derived from hpiFormat and saved for convenience */
+    uint32_t bytesPerFrame;
+    /** Size of hardware (on-card) buffer of stream in bytes */
+    uint32_t hardwareBufferSize;
+    /** Size of host (BBM) buffer of stream in bytes (if used) */
+    uint32_t hostBufferSize;
+    /** Upper limit on the utilization of output stream buffer (both hardware and host).
+     This prevents large latencies in an output-only stream with a potentially huge buffer
+     and a fast data generator, which would otherwise keep the hardware buffer filled to
+     capacity. See also the "Hardware Buffering=off" option in the AudioScience WAV driver. */
+    uint32_t outputBufferCap;
+    /** Sample buffer (halfway station between HPI and buffer processor) */
+    uint8_t *tempBuffer;
+    /** Sample buffer size, in bytes */
+    uint32_t tempBufferSize;
+}
+PaAsiHpiStreamComponent;
+
+
+/** Stream data */
+typedef struct PaAsiHpiStream
+{
+    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
+    PaUtilStreamRepresentation baseStreamRep;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    PaUtilAllocationGroup *allocations;
+
+    /* implementation specific data goes here */
+
+    /** Separate structs for input and output sides of stream */
+    PaAsiHpiStreamComponent *input, *output;
+
+    /** Polling interval (in milliseconds) */
+    uint32_t pollingInterval;
+    /** Are we running in callback mode? */
+    int callbackMode;
+    /** Number of frames to transfer at a time to/from HPI */
+    unsigned long maxFramesPerHostBuffer;
+    /** Indicates that the stream is in the paNeverDropInput mode */
+    int neverDropInput;
+    /** Contains copy of user buffers, used by blocking interface to transfer non-interleaved data.
+     It went here instead of to each stream component, as the stream component buffer setup in
+     PaAsiHpi_SetupBuffers doesn't know the stream details such as callbackMode.
+     (Maybe a problem later if ReadStream and WriteStream happens concurrently on same stream.) */
+    void **blockingUserBufferCopy;
+
+    /* Thread-related variables */
+
+    /** Helper thread which will deliver data to user callback */
+    PaUnixThread thread;
+    /** PortAudio stream state (Active/Stopped/CallbackFinished) */
+    volatile sig_atomic_t state;
+    /** Hard abort, i.e. drop frames? */
+    volatile sig_atomic_t callbackAbort;
+    /** True if stream stopped via exiting callback with paComplete/paAbort flag
+     (as opposed to explicit call to StopStream/AbortStream) */
+    volatile sig_atomic_t callbackFinished;
+}
+PaAsiHpiStream;
+
+
+/** Stream state information, collected together for convenience */
+typedef struct PaAsiHpiStreamInfo
+{
+    /** HPI stream state (HPI_STATE_STOPPED, HPI_STATE_PLAYING, etc.) */
+    uint16_t state;
+    /** Size (in bytes) of recording/playback data buffer in HPI driver */
+    uint32_t bufferSize;
+    /** Amount of data (in bytes) available in the buffer */
+    uint32_t dataSize;
+    /** Number of frames played/recorded since last stream reset */
+    uint32_t frameCounter;
+    /** Amount of data (in bytes) in hardware (on-card) buffer.
+     This differs from dataSize if bus mastering (BBM) is used, which introduces another
+     driver-level buffer to which dataSize/bufferSize then refers. */
+    uint32_t auxDataSize;
+    /** Total number of data frames currently buffered by HPI driver (host + hw buffers) */
+    uint32_t totalBufferedData;
+    /** Size of immediately available data (for input) or space (for output) in frames.
+     This only checks the first-level buffer (typically host buffer). This amount can be
+     transferred immediately. */
+    uint32_t availableFrames;
+    /** Indicates that hardware buffer is getting too full */
+    int overflow;
+    /** Indicates that hardware buffer is getting too empty */
+    int underflow;
+}
+PaAsiHpiStreamInfo;
+
+/* -------------------------------------------------------------------------- */
+
+/*
+ * Function prototypes
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+    /* The only exposed function in the entire host API implementation */
+    PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+
+/* Stream prototypes */
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream **s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream *s );
+static PaError StartStream( PaStream *s );
+static PaError StopStream( PaStream *s );
+static PaError AbortStream( PaStream *s );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *s );
+static PaTime GetStreamTime( PaStream *s );
+static double GetStreamCpuLoad( PaStream *s );
+
+/* Blocking prototypes */
+static PaError ReadStream( PaStream *s, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream *s, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream *s );
+static signed long GetStreamWriteAvailable( PaStream *s );
+
+/* Callback prototypes */
+static void *CallbackThreadFunc( void *userData );
+
+/* Functions specific to this API */
+static PaError PaAsiHpi_BuildDeviceList( PaAsiHpiHostApiRepresentation *hpiHostApi );
+static uint16_t PaAsiHpi_PaToHpiFormat( PaSampleFormat paFormat );
+static PaSampleFormat PaAsiHpi_HpiToPaFormat( uint16_t hpiFormat );
+static PaError PaAsiHpi_CreateFormat( struct PaUtilHostApiRepresentation *hostApi,
+                                      const PaStreamParameters *parameters, double sampleRate,
+                                      PaAsiHpiDeviceInfo **hpiDevice, struct hpi_format *hpiFormat );
+static PaError PaAsiHpi_OpenInput( struct PaUtilHostApiRepresentation *hostApi,
+                                   const PaAsiHpiDeviceInfo *hpiDevice, const struct hpi_format *hpiFormat,
+                                   hpi_handle_t *hpiStream );
+static PaError PaAsiHpi_OpenOutput( struct PaUtilHostApiRepresentation *hostApi,
+                                    const PaAsiHpiDeviceInfo *hpiDevice, const struct hpi_format *hpiFormat,
+                                    hpi_handle_t *hpiStream );
+static PaError PaAsiHpi_GetStreamInfo( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStreamInfo *info );
+static void PaAsiHpi_StreamComponentDump( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStream *stream );
+static void PaAsiHpi_StreamDump( PaAsiHpiStream *stream );
+static PaError PaAsiHpi_SetupBuffers( PaAsiHpiStreamComponent *streamComp, uint32_t pollingInterval,
+                                      unsigned long framesPerPaHostBuffer, PaTime suggestedLatency );
+static PaError PaAsiHpi_PrimeOutputWithSilence( PaAsiHpiStream *stream );
+static PaError PaAsiHpi_StartStream( PaAsiHpiStream *stream, int outputPrimed );
+static PaError PaAsiHpi_StopStream( PaAsiHpiStream *stream, int abort );
+static PaError PaAsiHpi_ExplicitStop( PaAsiHpiStream *stream, int abort );
+static void PaAsiHpi_OnThreadExit( void *userData );
+static PaError PaAsiHpi_WaitForFrames( PaAsiHpiStream *stream, unsigned long *framesAvail,
+                                       PaStreamCallbackFlags *cbFlags );
+static void PaAsiHpi_CalculateTimeInfo( PaAsiHpiStream *stream, PaStreamCallbackTimeInfo *timeInfo );
+static PaError PaAsiHpi_BeginProcessing( PaAsiHpiStream* stream, unsigned long* numFrames,
+        PaStreamCallbackFlags *cbFlags );
+static PaError PaAsiHpi_EndProcessing( PaAsiHpiStream *stream, unsigned long numFrames,
+                                       PaStreamCallbackFlags *cbFlags );
+
+/* ==========================================================================
+ * ============================= IMPLEMENTATION =============================
+ * ========================================================================== */
+
+/* --------------------------- Host API Interface --------------------------- */
+
+/** Enumerate all PA devices (= HPI streams).
+ This compiles a list of all HPI adapters, and registers a PA device for each input and
+ output stream it finds. Most errors are ignored, as missing or erroneous devices are
+ simply skipped.
+
+ @param hpiHostApi Pointer to HPI host API struct
+
+ @return PortAudio error code (only paInsufficientMemory in practice)
+ */
+static PaError PaAsiHpi_BuildDeviceList( PaAsiHpiHostApiRepresentation *hpiHostApi )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *hostApi = &hpiHostApi->baseHostApiRep;
+    PaHostApiInfo *baseApiInfo = &hostApi->info;
+    PaAsiHpiDeviceInfo *hpiDeviceList;
+    int numAdapters;
+    hpi_err_t hpiError = 0;
+    int i, j, deviceCount = 0, deviceIndex = 0;
+
+    assert( hpiHostApi );
+
+    /* Errors not considered critical here (subsystem may report 0 devices), but report them */
+    /* in debug mode. */
+    PA_ASIHPI_UNLESS_( HPI_SubSysGetNumAdapters( NULL, &numAdapters), paNoError );
+
+    for( i=0; i < numAdapters; ++i )
+    {
+        uint16_t inStreams, outStreams;
+        uint16_t version;
+        uint32_t serial;
+        uint16_t type;
+        uint32_t idx;
+
+        hpiError = HPI_SubSysGetAdapter(NULL, i, &idx, &type);
+        if (hpiError)
+            continue;
+
+        /* Try to open adapter */
+        hpiError = HPI_AdapterOpen( NULL, idx );
+        /* Report error and skip to next device on failure */
+        if( hpiError )
+        {
+            PA_ASIHPI_REPORT_ERROR_( hpiError );
+            continue;
+        }
+        hpiError = HPI_AdapterGetInfo( NULL, idx, &outStreams, &inStreams,
+					&version, &serial, &type );
+        /* Skip to next device on failure */
+        if( hpiError )
+        {
+            PA_ASIHPI_REPORT_ERROR_( hpiError );
+            continue;
+        }
+        else
+        {
+            /* Assign default devices if available and increment device count */
+            if( (baseApiInfo->defaultInputDevice == paNoDevice) && (inStreams > 0) )
+                baseApiInfo->defaultInputDevice = deviceCount;
+            deviceCount += inStreams;
+            if( (baseApiInfo->defaultOutputDevice == paNoDevice) && (outStreams > 0) )
+                baseApiInfo->defaultOutputDevice = deviceCount;
+            deviceCount += outStreams;
+        }
+    }
+
+    /* Register any discovered devices */
+    if( deviceCount > 0 )
+    {
+        /* Memory allocation */
+        PA_UNLESS_( hostApi->deviceInfos = (PaDeviceInfo**) PaUtil_GroupAllocateMemory(
+                                               hpiHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount ),
+                    paInsufficientMemory );
+        /* Allocate all device info structs in a contiguous block */
+        PA_UNLESS_( hpiDeviceList = (PaAsiHpiDeviceInfo*) PaUtil_GroupAllocateMemory(
+                                        hpiHostApi->allocations, sizeof(PaAsiHpiDeviceInfo) * deviceCount ),
+                    paInsufficientMemory );
+
+        /* Now query devices again for information */
+        for( i=0; i < numAdapters; ++i )
+        {
+            uint16_t inStreams, outStreams;
+            uint16_t version;
+            uint32_t serial;
+            uint16_t type;
+            uint32_t idx;
+
+            hpiError = HPI_SubSysGetAdapter( NULL, i, &idx, &type );
+            if (hpiError)
+                continue;
+
+            /* Assume adapter is still open from previous round */
+            hpiError = HPI_AdapterGetInfo( NULL, idx,
+                                           &outStreams, &inStreams, &version, &serial, &type );
+            /* Report error and skip to next device on failure */
+            if( hpiError )
+            {
+                PA_ASIHPI_REPORT_ERROR_( hpiError );
+                continue;
+            }
+            else
+            {
+                PA_DEBUG(( "Found HPI Adapter ID=%4X Idx=%d #In=%d #Out=%d S/N=%d HWver=%c%d DSPver=%03d\n",
+                           type, idx, inStreams, outStreams, serial,
+                           ((version>>3)&0xf)+'A',                  /* Hw version major */
+                           version&0x7,                             /* Hw version minor */
+                           ((version>>13)*100)+((version>>7)&0x3f)  /* DSP code version */
+                         ));
+            }
+
+            /* First add all input streams as devices */
+            for( j=0; j < inStreams; ++j )
+            {
+                PaAsiHpiDeviceInfo *hpiDevice = &hpiDeviceList[deviceIndex];
+                PaDeviceInfo *baseDeviceInfo = &hpiDevice->baseDeviceInfo;
+                char srcName[72];
+                char *deviceName;
+
+                memset( hpiDevice, 0, sizeof(PaAsiHpiDeviceInfo) );
+                /* Set implementation-specific device details */
+                hpiDevice->adapterIndex = idx;
+                hpiDevice->adapterType = type;
+                hpiDevice->adapterVersion = version;
+                hpiDevice->adapterSerialNumber = serial;
+                hpiDevice->streamIndex = j;
+                hpiDevice->streamIsOutput = 0;
+                /* Set common PortAudio device stats */
+                baseDeviceInfo->structVersion = 2;
+                /* Make sure name string is owned by API info structure */
+                sprintf( srcName,
+                         "Adapter %d (%4X) - Input Stream %d", i+1, type, j+1 );
+                PA_UNLESS_( deviceName = (char *) PaUtil_GroupAllocateMemory(
+                                             hpiHostApi->allocations, strlen(srcName) + 1 ), paInsufficientMemory );
+                strcpy( deviceName, srcName );
+                baseDeviceInfo->name = deviceName;
+                baseDeviceInfo->hostApi = hpiHostApi->hostApiIndex;
+                baseDeviceInfo->maxInputChannels = HPI_MAX_CHANNELS;
+                baseDeviceInfo->maxOutputChannels = 0;
+                /* Default latency values for interactive performance */
+                baseDeviceInfo->defaultLowInputLatency = 0.01;
+                baseDeviceInfo->defaultLowOutputLatency = -1.0;
+                /* Default latency values for robust non-interactive applications (eg. playing sound files) */
+                baseDeviceInfo->defaultHighInputLatency = 0.2;
+                baseDeviceInfo->defaultHighOutputLatency = -1.0;
+                /* HPI interface can actually handle any sampling rate to 1 Hz accuracy,
+                * so this default is as good as any */
+                baseDeviceInfo->defaultSampleRate = 44100;
+
+                /* Store device in global PortAudio list */
+                hostApi->deviceInfos[deviceIndex++] = (PaDeviceInfo *) hpiDevice;
+            }
+
+            /* Now add all output streams as devices (I know, the repetition is painful) */
+            for( j=0; j < outStreams; ++j )
+            {
+                PaAsiHpiDeviceInfo *hpiDevice = &hpiDeviceList[deviceIndex];
+                PaDeviceInfo *baseDeviceInfo = &hpiDevice->baseDeviceInfo;
+                char srcName[72];
+                char *deviceName;
+
+                memset( hpiDevice, 0, sizeof(PaAsiHpiDeviceInfo) );
+                /* Set implementation-specific device details */
+                hpiDevice->adapterIndex = idx;
+                hpiDevice->adapterType = type;
+                hpiDevice->adapterVersion = version;
+                hpiDevice->adapterSerialNumber = serial;
+                hpiDevice->streamIndex = j;
+                hpiDevice->streamIsOutput = 1;
+                /* Set common PortAudio device stats */
+                baseDeviceInfo->structVersion = 2;
+                /* Make sure name string is owned by API info structure */
+                sprintf( srcName,
+                         "Adapter %d (%4X) - Output Stream %d", i+1, type, j+1 );
+                PA_UNLESS_( deviceName = (char *) PaUtil_GroupAllocateMemory(
+                                             hpiHostApi->allocations, strlen(srcName) + 1 ), paInsufficientMemory );
+                strcpy( deviceName, srcName );
+                baseDeviceInfo->name = deviceName;
+                baseDeviceInfo->hostApi = hpiHostApi->hostApiIndex;
+                baseDeviceInfo->maxInputChannels = 0;
+                baseDeviceInfo->maxOutputChannels = HPI_MAX_CHANNELS;
+                /* Default latency values for interactive performance. */
+                baseDeviceInfo->defaultLowInputLatency = -1.0;
+                baseDeviceInfo->defaultLowOutputLatency = 0.01;
+                /* Default latency values for robust non-interactive applications (eg. playing sound files). */
+                baseDeviceInfo->defaultHighInputLatency = -1.0;
+                baseDeviceInfo->defaultHighOutputLatency = 0.2;
+                /* HPI interface can actually handle any sampling rate to 1 Hz accuracy,
+                * so this default is as good as any */
+                baseDeviceInfo->defaultSampleRate = 44100;
+
+                /* Store device in global PortAudio list */
+                hostApi->deviceInfos[deviceIndex++] = (PaDeviceInfo *) hpiDevice;
+            }
+        }
+    }
+
+    /* Finally acknowledge checked devices */
+    baseApiInfo->deviceCount = deviceIndex;
+
+error:
+    return result;
+}
+
+
+/** Initialize host API implementation.
+ This is the only function exported beyond this file. It is called by PortAudio to initialize
+ the host API. It stores API info, finds and registers all devices, and sets up callback and
+ blocking interfaces.
+
+ @param hostApi Pointer to host API struct
+
+ @param hostApiIndex Index of current (HPI) host API
+
+ @return PortAudio error code
+ */
+PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaAsiHpiHostApiRepresentation *hpiHostApi = NULL;
+    PaHostApiInfo *baseApiInfo;
+
+    /* Try to initialize HPI subsystem */
+    if (!HPI_SubSysCreate())
+    {
+        /* the V19 development docs say that if an implementation
+         * detects that it cannot be used, it should return a NULL
+         * interface and paNoError */
+        PA_DEBUG(( "Could not open HPI interface\n" ));
+
+	*hostApi = NULL;
+        return paNoError;
+    }
+    else
+    {
+        uint32_t hpiVersion;
+        PA_ASIHPI_UNLESS_( HPI_SubSysGetVersionEx( NULL, &hpiVersion ), paUnanticipatedHostError );
+        PA_DEBUG(( "HPI interface v%d.%02d.%02d\n",
+                   hpiVersion >> 16,  (hpiVersion >> 8) & 0x0F, (hpiVersion & 0x0F) ));
+    }
+
+    /* Allocate host API structure */
+    PA_UNLESS_( hpiHostApi = (PaAsiHpiHostApiRepresentation*) PaUtil_AllocateMemory(
+                                 sizeof(PaAsiHpiHostApiRepresentation) ), paInsufficientMemory );
+    PA_UNLESS_( hpiHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
+
+    hpiHostApi->hostApiIndex = hostApiIndex;
+
+    *hostApi = &hpiHostApi->baseHostApiRep;
+    baseApiInfo = &((*hostApi)->info);
+    /* Fill in common API details */
+    baseApiInfo->structVersion = 1;
+    baseApiInfo->type = paAudioScienceHPI;
+    baseApiInfo->name = "AudioScience HPI";
+    baseApiInfo->deviceCount = 0;
+    baseApiInfo->defaultInputDevice = paNoDevice;
+    baseApiInfo->defaultOutputDevice = paNoDevice;
+
+    PA_ENSURE_( PaAsiHpi_BuildDeviceList( hpiHostApi ) );
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &hpiHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &hpiHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    /* Store identity of main thread */
+    PA_ENSURE_( PaUnixThreading_Initialize() );
+
+    return result;
+error:
+    if (hpiHostApi)
+        PaUtil_FreeMemory( hpiHostApi );
+    return result;
+}
+
+
+/** Terminate host API implementation.
+ This closes all HPI adapters and frees the HPI subsystem. It also frees the host API struct
+ memory. It should be called once for every PaAsiHpi_Initialize call.
+
+ @param Pointer to host API struct
+ */
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
+    int i;
+    PaError result = paNoError;
+
+    if( hpiHostApi )
+    {
+        /* Get rid of HPI-specific structures */
+        uint16_t lastAdapterIndex = HPI_MAX_ADAPTERS;
+        /* Iterate through device list and close adapters */
+        for( i=0; i < hostApi->info.deviceCount; ++i )
+        {
+            PaAsiHpiDeviceInfo *hpiDevice = (PaAsiHpiDeviceInfo *) hostApi->deviceInfos[ i ];
+            /* Close adapter only if it differs from previous one */
+            if( hpiDevice->adapterIndex != lastAdapterIndex )
+            {
+                /* Ignore errors (report only during debugging) */
+                PA_ASIHPI_UNLESS_( HPI_AdapterClose( NULL,
+                                                     hpiDevice->adapterIndex ), paNoError );
+                lastAdapterIndex = hpiDevice->adapterIndex;
+            }
+        }
+        /* Finally dismantle HPI subsystem */
+        HPI_SubSysFree( NULL );
+
+        if( hpiHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( hpiHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( hpiHostApi->allocations );
+        }
+
+        PaUtil_FreeMemory( hpiHostApi );
+    }
+error:
+    return;
+}
+
+
+/** Converts PortAudio sample format to equivalent HPI format.
+
+ @param paFormat PortAudio sample format
+
+ @return HPI sample format
+ */
+static uint16_t PaAsiHpi_PaToHpiFormat( PaSampleFormat paFormat )
+{
+    /* Ignore interleaving flag */
+    switch( paFormat & ~paNonInterleaved )
+    {
+    case paFloat32:
+        return HPI_FORMAT_PCM32_FLOAT;
+
+    case paInt32:
+        return HPI_FORMAT_PCM32_SIGNED;
+
+    case paInt24:
+        return HPI_FORMAT_PCM24_SIGNED;
+
+    case paInt16:
+        return HPI_FORMAT_PCM16_SIGNED;
+
+    case paUInt8:
+        return HPI_FORMAT_PCM8_UNSIGNED;
+
+        /* Default is 16-bit signed */
+    case paInt8:
+    default:
+        return HPI_FORMAT_PCM16_SIGNED;
+    }
+}
+
+
+/** Converts HPI sample format to equivalent PortAudio format.
+
+ @param paFormat HPI sample format
+
+ @return PortAudio sample format
+ */
+static PaSampleFormat PaAsiHpi_HpiToPaFormat( uint16_t hpiFormat )
+{
+    switch( hpiFormat )
+    {
+    case HPI_FORMAT_PCM32_FLOAT:
+        return paFloat32;
+
+    case HPI_FORMAT_PCM32_SIGNED:
+        return paInt32;
+
+    case HPI_FORMAT_PCM24_SIGNED:
+        return paInt24;
+
+    case HPI_FORMAT_PCM16_SIGNED:
+        return paInt16;
+
+    case HPI_FORMAT_PCM8_UNSIGNED:
+        return paUInt8;
+
+        /* Default is custom format (e.g. for HPI MP3 format) */
+    default:
+        return paCustomFormat;
+    }
+}
+
+
+/** Creates HPI format struct based on PortAudio parameters.
+ This also does some checks to see whether the desired format is valid, and whether
+ the device allows it. This only checks the format of one half (input or output) of the
+ PortAudio stream.
+
+ @param hostApi Pointer to host API struct
+
+ @param parameters Pointer to stream parameter struct
+
+ @param sampleRate Desired sample rate
+
+ @param hpiDevice Pointer to HPI device struct
+
+ @param hpiFormat Resulting HPI format returned here
+
+ @return PortAudio error code (typically indicating a problem with stream format)
+ */
+static PaError PaAsiHpi_CreateFormat( struct PaUtilHostApiRepresentation *hostApi,
+                                      const PaStreamParameters *parameters, double sampleRate,
+                                      PaAsiHpiDeviceInfo **hpiDevice, struct hpi_format *hpiFormat )
+{
+    int maxChannelCount = 0;
+    PaSampleFormat hostSampleFormat = 0;
+    hpi_err_t hpiError = 0;
+
+    /* Unless alternate device specification is supported, reject the use of
+       paUseHostApiSpecificDeviceSpecification */
+    if( parameters->device == paUseHostApiSpecificDeviceSpecification )
+        return paInvalidDevice;
+    else
+    {
+        assert( parameters->device < hostApi->info.deviceCount );
+        *hpiDevice = (PaAsiHpiDeviceInfo*) hostApi->deviceInfos[ parameters->device ];
+    }
+
+    /* Validate streamInfo - this implementation doesn't use custom stream info */
+    if( parameters->hostApiSpecificStreamInfo )
+        return paIncompatibleHostApiSpecificStreamInfo;
+
+    /* Check that device can support channel count */
+    if( (*hpiDevice)->streamIsOutput )
+    {
+        maxChannelCount = (*hpiDevice)->baseDeviceInfo.maxOutputChannels;
+    }
+    else
+    {
+        maxChannelCount = (*hpiDevice)->baseDeviceInfo.maxInputChannels;
+    }
+    if( (maxChannelCount == 0) || (parameters->channelCount > maxChannelCount) )
+        return paInvalidChannelCount;
+
+    /* All standard sample formats are supported by the buffer adapter,
+       and this implementation doesn't support any custom sample formats */
+    if( parameters->sampleFormat & paCustomFormat )
+        return paSampleFormatNotSupported;
+
+    /* Switch to closest HPI native format */
+    hostSampleFormat = PaUtil_SelectClosestAvailableFormat(PA_ASIHPI_AVAILABLE_FORMATS_,
+                       parameters->sampleFormat );
+    /* Setup format + info objects */
+    hpiError = HPI_FormatCreate( hpiFormat, (uint16_t)parameters->channelCount,
+                                 PaAsiHpi_PaToHpiFormat( hostSampleFormat ),
+                                 (uint32_t)sampleRate, 0, 0 );
+    if( hpiError )
+    {
+        PA_ASIHPI_REPORT_ERROR_( hpiError );
+        switch( hpiError )
+        {
+        case HPI_ERROR_INVALID_FORMAT:
+            return paSampleFormatNotSupported;
+
+        case HPI_ERROR_INVALID_SAMPLERATE:
+        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
+            return paInvalidSampleRate;
+
+        case HPI_ERROR_INVALID_CHANNELS:
+            return paInvalidChannelCount;
+        }
+    }
+
+    return paNoError;
+}
+
+
+/** Open HPI input stream with given format.
+ This attempts to open HPI input stream with desired format. If the format is not supported
+ or the device is unavailable, the stream is closed and a PortAudio error code is returned.
+
+ @param hostApi Pointer to host API struct
+
+ @param hpiDevice Pointer to HPI device struct
+
+ @param hpiFormat Pointer to HPI format struct
+
+ @return PortAudio error code (typically indicating a problem with stream format or device)
+*/
+static PaError PaAsiHpi_OpenInput( struct PaUtilHostApiRepresentation *hostApi,
+                                   const PaAsiHpiDeviceInfo *hpiDevice, const struct hpi_format *hpiFormat,
+                                   hpi_handle_t *hpiStream )
+{
+    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
+    PaError result = paNoError;
+    hpi_err_t hpiError = 0;
+
+    /* Catch misplaced output devices, as they typically have 0 input channels */
+    PA_UNLESS_( !hpiDevice->streamIsOutput, paInvalidChannelCount );
+    /* Try to open input stream */
+    PA_ASIHPI_UNLESS_( HPI_InStreamOpen( NULL, hpiDevice->adapterIndex,
+                                         hpiDevice->streamIndex, hpiStream ), paDeviceUnavailable );
+    /* Set input format (checking it in the process) */
+    /* Could also use HPI_InStreamQueryFormat, but this economizes the process */
+    hpiError = HPI_InStreamSetFormat( NULL, *hpiStream, (struct hpi_format*)hpiFormat );
+    if( hpiError )
+    {
+        PA_ASIHPI_REPORT_ERROR_( hpiError );
+        PA_ASIHPI_UNLESS_( HPI_InStreamClose( NULL, *hpiStream ), paNoError );
+        switch( hpiError )
+        {
+        case HPI_ERROR_INVALID_FORMAT:
+            return paSampleFormatNotSupported;
+
+        case HPI_ERROR_INVALID_SAMPLERATE:
+        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
+            return paInvalidSampleRate;
+
+        case HPI_ERROR_INVALID_CHANNELS:
+            return paInvalidChannelCount;
+
+        default:
+            /* In case anything else went wrong */
+            return paInvalidDevice;
+        }
+    }
+
+error:
+    return result;
+}
+
+
+/** Open HPI output stream with given format.
+ This attempts to open HPI output stream with desired format. If the format is not supported
+ or the device is unavailable, the stream is closed and a PortAudio error code is returned.
+
+ @param hostApi Pointer to host API struct
+
+ @param hpiDevice Pointer to HPI device struct
+
+ @param hpiFormat Pointer to HPI format struct
+
+ @return PortAudio error code (typically indicating a problem with stream format or device)
+*/
+static PaError PaAsiHpi_OpenOutput( struct PaUtilHostApiRepresentation *hostApi,
+                                    const PaAsiHpiDeviceInfo *hpiDevice, const struct hpi_format *hpiFormat,
+                                    hpi_handle_t *hpiStream )
+{
+    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
+    PaError result = paNoError;
+    hpi_err_t hpiError = 0;
+
+    /* Catch misplaced input devices, as they typically have 0 output channels */
+    PA_UNLESS_( hpiDevice->streamIsOutput, paInvalidChannelCount );
+    /* Try to open output stream */
+    PA_ASIHPI_UNLESS_( HPI_OutStreamOpen( NULL, hpiDevice->adapterIndex,
+                                          hpiDevice->streamIndex, hpiStream ), paDeviceUnavailable );
+
+    /* Check output format (format is set on first write to output stream) */
+    hpiError = HPI_OutStreamQueryFormat( NULL, *hpiStream, (struct hpi_format*)hpiFormat );
+    if( hpiError )
+    {
+        PA_ASIHPI_REPORT_ERROR_( hpiError );
+        PA_ASIHPI_UNLESS_( HPI_OutStreamClose( NULL, *hpiStream ), paNoError );
+        switch( hpiError )
+        {
+        case HPI_ERROR_INVALID_FORMAT:
+            return paSampleFormatNotSupported;
+
+        case HPI_ERROR_INVALID_SAMPLERATE:
+        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
+            return paInvalidSampleRate;
+
+        case HPI_ERROR_INVALID_CHANNELS:
+            return paInvalidChannelCount;
+
+        default:
+            /* In case anything else went wrong */
+            return paInvalidDevice;
+        }
+    }
+
+error:
+    return result;
+}
+
+
+/** Checks whether the desired stream formats and devices are supported
+ (for both input and output).
+ This is done by actually opening the appropriate HPI streams and closing them again.
+
+ @param hostApi Pointer to host API struct
+
+ @param inputParameters Pointer to stream parameter struct for input side of stream
+
+ @param outputParameters Pointer to stream parameter struct for output side of stream
+
+ @param sampleRate Desired sample rate
+
+ @return PortAudio error code (paFormatIsSupported on success)
+ */
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaError result = paFormatIsSupported;
+    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
+    PaAsiHpiDeviceInfo *hpiDevice = NULL;
+    struct hpi_format hpiFormat;
+
+    /* Input stream */
+    if( inputParameters )
+    {
+        hpi_handle_t hpiStream;
+        PA_DEBUG(( "%s: Checking input params: dev=%d, sr=%d, chans=%d, fmt=%d\n",
+                   __FUNCTION__, inputParameters->device, (int)sampleRate,
+                   inputParameters->channelCount, inputParameters->sampleFormat ));
+        /* Create and validate format */
+        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, inputParameters, sampleRate,
+                                           &hpiDevice, &hpiFormat ) );
+        /* Open stream to further check format */
+        PA_ENSURE_( PaAsiHpi_OpenInput( hostApi, hpiDevice, &hpiFormat, &hpiStream ) );
+        /* Close stream again */
+        PA_ASIHPI_UNLESS_( HPI_InStreamClose( NULL, hpiStream ), paNoError );
+    }
+
+    /* Output stream */
+    if( outputParameters )
+    {
+        hpi_handle_t hpiStream;
+        PA_DEBUG(( "%s: Checking output params: dev=%d, sr=%d, chans=%d, fmt=%d\n",
+                   __FUNCTION__, outputParameters->device, (int)sampleRate,
+                   outputParameters->channelCount, outputParameters->sampleFormat ));
+        /* Create and validate format */
+        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, outputParameters, sampleRate,
+                                           &hpiDevice, &hpiFormat ) );
+        /* Open stream to further check format */
+        PA_ENSURE_( PaAsiHpi_OpenOutput( hostApi, hpiDevice, &hpiFormat, &hpiStream ) );
+        /* Close stream again */
+        PA_ASIHPI_UNLESS_( HPI_OutStreamClose( NULL, hpiStream ), paNoError );
+    }
+
+error:
+    return result;
+}
+
+/* ---------------------------- Stream Interface ---------------------------- */
+
+/** Obtain HPI stream information.
+ This obtains info such as stream state and available data/space in buffers. It also
+ estimates whether an underflow or overflow occurred.
+
+ @param streamComp Pointer to stream component (input or output) to query
+
+ @param info Pointer to stream info struct that will contain result
+
+ @return PortAudio error code (either paNoError, paDeviceUnavailable or paUnanticipatedHostError)
+ */
+static PaError PaAsiHpi_GetStreamInfo( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStreamInfo *info )
+{
+    PaError result = paDeviceUnavailable;
+    uint16_t state;
+    uint32_t bufferSize, dataSize, frameCounter, auxDataSize, threshold;
+    uint32_t hwBufferSize, hwDataSize;
+
+    assert( streamComp );
+    assert( info );
+
+    /* First blank the stream info struct, in case something goes wrong below.
+       This saves the caller from initializing the struct. */
+    info->state = 0;
+    info->bufferSize = 0;
+    info->dataSize = 0;
+    info->frameCounter = 0;
+    info->auxDataSize = 0;
+    info->totalBufferedData = 0;
+    info->availableFrames = 0;
+    info->underflow = 0;
+    info->overflow = 0;
+
+    if( streamComp->hpiDevice && streamComp->hpiStream )
+    {
+        /* Obtain detailed stream info (either input or output) */
+        if( streamComp->hpiDevice->streamIsOutput )
+        {
+            PA_ASIHPI_UNLESS_( HPI_OutStreamGetInfoEx( NULL,
+                               streamComp->hpiStream,
+                               &state, &bufferSize, &dataSize, &frameCounter,
+                               &auxDataSize ), paUnanticipatedHostError );
+        }
+        else
+        {
+            PA_ASIHPI_UNLESS_( HPI_InStreamGetInfoEx( NULL,
+                               streamComp->hpiStream,
+                               &state, &bufferSize, &dataSize, &frameCounter,
+                               &auxDataSize ), paUnanticipatedHostError );
+        }
+        /* Load stream info */
+        info->state = state;
+        info->bufferSize = bufferSize;
+        info->dataSize = dataSize;
+        info->frameCounter = frameCounter;
+        info->auxDataSize = auxDataSize;
+        /* Determine total buffered data */
+        info->totalBufferedData = dataSize;
+        if( streamComp->hostBufferSize > 0 )
+            info->totalBufferedData += auxDataSize;
+        info->totalBufferedData /= streamComp->bytesPerFrame;
+        /* Determine immediately available frames */
+        info->availableFrames = streamComp->hpiDevice->streamIsOutput ?
+                                bufferSize - dataSize : dataSize;
+        info->availableFrames /= streamComp->bytesPerFrame;
+        /* Minimum space/data required in buffers */
+        threshold = PA_MIN( streamComp->tempBufferSize,
+                            streamComp->bytesPerFrame * PA_ASIHPI_MIN_FRAMES_ );
+        /* Obtain hardware buffer stats first, to simplify things */
+        hwBufferSize = streamComp->hardwareBufferSize;
+        hwDataSize = streamComp->hostBufferSize > 0 ? auxDataSize : dataSize;
+        /* Underflow is a bit tricky */
+        info->underflow = streamComp->hpiDevice->streamIsOutput ?
+                          /* Stream seems to start in drained state sometimes, so ignore initial underflow */
+                          (frameCounter > 0) && ( (state == HPI_STATE_DRAINED) || (hwDataSize == 0) ) :
+                          /* Input streams check the first-level (host) buffer for underflow */
+                          (state != HPI_STATE_STOPPED) && (dataSize < threshold);
+        /* Check for overflow in second-level (hardware) buffer for both input and output */
+        info->overflow = (state != HPI_STATE_STOPPED) && (hwBufferSize - hwDataSize < threshold);
+
+        return paNoError;
+    }
+
+error:
+    return result;
+}
+
+
+/** Display stream component information for debugging purposes.
+
+ @param streamComp Pointer to stream component (input or output) to query
+
+ @param stream Pointer to stream struct which contains the component above
+ */
+static void PaAsiHpi_StreamComponentDump( PaAsiHpiStreamComponent *streamComp,
+        PaAsiHpiStream *stream )
+{
+    PaAsiHpiStreamInfo streamInfo;
+
+    assert( streamComp );
+    assert( stream );
+
+    /* Name of soundcard/device used by component */
+    PA_DEBUG(( "device: %s\n", streamComp->hpiDevice->baseDeviceInfo.name ));
+    /* Unfortunately some overlap between input and output here */
+    if( streamComp->hpiDevice->streamIsOutput )
+    {
+        /* Settings on the user side (as experienced by user callback) */
+        PA_DEBUG(( "user: %d-bit, %d ",
+                   8*stream->bufferProcessor.bytesPerUserOutputSample,
+                   stream->bufferProcessor.outputChannelCount));
+        if( stream->bufferProcessor.userOutputIsInterleaved )
+        {
+            PA_DEBUG(( "interleaved channels, " ));
+        }
+        else
+        {
+            PA_DEBUG(( "non-interleaved channels, " ));
+        }
+        PA_DEBUG(( "%d frames/buffer, latency = %5.1f ms\n",
+                   stream->bufferProcessor.framesPerUserBuffer,
+                   1000*stream->baseStreamRep.streamInfo.outputLatency ));
+        /* Settings on the host side (internal to PortAudio host API) */
+        PA_DEBUG(( "host: %d-bit, %d interleaved channels, %d frames/buffer ",
+                   8*stream->bufferProcessor.bytesPerHostOutputSample,
+                   stream->bufferProcessor.outputChannelCount,
+                   stream->bufferProcessor.framesPerHostBuffer ));
+    }
+    else
+    {
+        /* Settings on the user side (as experienced by user callback) */
+        PA_DEBUG(( "user: %d-bit, %d ",
+                   8*stream->bufferProcessor.bytesPerUserInputSample,
+                   stream->bufferProcessor.inputChannelCount));
+        if( stream->bufferProcessor.userInputIsInterleaved )
+        {
+            PA_DEBUG(( "interleaved channels, " ));
+        }
+        else
+        {
+            PA_DEBUG(( "non-interleaved channels, " ));
+        }
+        PA_DEBUG(( "%d frames/buffer, latency = %5.1f ms\n",
+                   stream->bufferProcessor.framesPerUserBuffer,
+                   1000*stream->baseStreamRep.streamInfo.inputLatency ));
+        /* Settings on the host side (internal to PortAudio host API) */
+        PA_DEBUG(( "host: %d-bit, %d interleaved channels, %d frames/buffer ",
+                   8*stream->bufferProcessor.bytesPerHostInputSample,
+                   stream->bufferProcessor.inputChannelCount,
+                   stream->bufferProcessor.framesPerHostBuffer ));
+    }
+    switch( stream->bufferProcessor.hostBufferSizeMode )
+    {
+    case paUtilFixedHostBufferSize:
+        PA_DEBUG(( "[fixed] " ));
+        break;
+    case paUtilBoundedHostBufferSize:
+        PA_DEBUG(( "[bounded] " ));
+        break;
+    case paUtilUnknownHostBufferSize:
+        PA_DEBUG(( "[unknown] " ));
+        break;
+    case paUtilVariableHostBufferSizePartialUsageAllowed:
+        PA_DEBUG(( "[variable] " ));
+        break;
+    }
+    PA_DEBUG(( "(%d max)\n", streamComp->tempBufferSize / streamComp->bytesPerFrame ));
+    /* HPI hardware settings */
+    PA_DEBUG(( "HPI: adapter %d stream %d, %d-bit, %d-channel, %d Hz\n",
+               streamComp->hpiDevice->adapterIndex, streamComp->hpiDevice->streamIndex,
+               8 * streamComp->bytesPerFrame / streamComp->hpiFormat.wChannels,
+               streamComp->hpiFormat.wChannels,
+               streamComp->hpiFormat.dwSampleRate ));
+    /* Stream state and buffer levels */
+    PA_DEBUG(( "HPI: " ));
+    PaAsiHpi_GetStreamInfo( streamComp, &streamInfo );
+    switch( streamInfo.state )
+    {
+    case HPI_STATE_STOPPED:
+        PA_DEBUG(( "[STOPPED] " ));
+        break;
+    case HPI_STATE_PLAYING:
+        PA_DEBUG(( "[PLAYING] " ));
+        break;
+    case HPI_STATE_RECORDING:
+        PA_DEBUG(( "[RECORDING] " ));
+        break;
+    case HPI_STATE_DRAINED:
+        PA_DEBUG(( "[DRAINED] " ));
+        break;
+    default:
+        PA_DEBUG(( "[unknown state] " ));
+        break;
+    }
+    if( streamComp->hostBufferSize )
+    {
+        PA_DEBUG(( "host = %d/%d B, ", streamInfo.dataSize, streamComp->hostBufferSize ));
+        PA_DEBUG(( "hw = %d/%d (%d) B, ", streamInfo.auxDataSize,
+                   streamComp->hardwareBufferSize, streamComp->outputBufferCap ));
+    }
+    else
+    {
+        PA_DEBUG(( "hw = %d/%d B, ", streamInfo.dataSize, streamComp->hardwareBufferSize ));
+    }
+    PA_DEBUG(( "count = %d", streamInfo.frameCounter ));
+    if( streamInfo.overflow )
+    {
+        PA_DEBUG(( " [overflow]" ));
+    }
+    else if( streamInfo.underflow )
+    {
+        PA_DEBUG(( " [underflow]" ));
+    }
+    PA_DEBUG(( "\n" ));
+}
+
+
+/** Display stream information for debugging purposes.
+
+ @param stream Pointer to stream to query
+ */
+static void PaAsiHpi_StreamDump( PaAsiHpiStream *stream )
+{
+    assert( stream );
+
+    PA_DEBUG(( "\n------------------------- STREAM INFO FOR %p ---------------------------\n", stream ));
+    /* General stream info (input+output) */
+    if( stream->baseStreamRep.streamCallback )
+    {
+        PA_DEBUG(( "[callback] " ));
+    }
+    else
+    {
+        PA_DEBUG(( "[blocking] " ));
+    }
+    PA_DEBUG(( "sr=%d Hz, poll=%d ms, max %d frames/buf ",
+               (int)stream->baseStreamRep.streamInfo.sampleRate,
+               stream->pollingInterval, stream->maxFramesPerHostBuffer ));
+    switch( stream->state )
+    {
+    case paAsiHpiStoppedState:
+        PA_DEBUG(( "[stopped]\n" ));
+        break;
+    case paAsiHpiActiveState:
+        PA_DEBUG(( "[active]\n" ));
+        break;
+    case paAsiHpiCallbackFinishedState:
+        PA_DEBUG(( "[cb fin]\n" ));
+        break;
+    default:
+        PA_DEBUG(( "[unknown state]\n" ));
+        break;
+    }
+    if( stream->callbackMode )
+    {
+        PA_DEBUG(( "cb info: thread=%p, cbAbort=%d, cbFinished=%d\n",
+                   stream->thread.thread, stream->callbackAbort, stream->callbackFinished ));
+    }
+
+    PA_DEBUG(( "----------------------------------- Input  ------------------------------------\n" ));
+    if( stream->input )
+    {
+        PaAsiHpi_StreamComponentDump( stream->input, stream );
+    }
+    else
+    {
+        PA_DEBUG(( "*none*\n" ));
+    }
+
+    PA_DEBUG(( "----------------------------------- Output ------------------------------------\n" ));
+    if( stream->output )
+    {
+        PaAsiHpi_StreamComponentDump( stream->output, stream );
+    }
+    else
+    {
+        PA_DEBUG(( "*none*\n" ));
+    }
+    PA_DEBUG(( "-------------------------------------------------------------------------------\n\n" ));
+
+}
+
+
+/** Determine buffer sizes and allocate appropriate stream buffers.
+ This attempts to allocate a BBM (host) buffer for the HPI stream component (either input
+ or output, as both have similar buffer needs). Not all AudioScience adapters support BBM,
+ in which case the hardware buffer has to suffice. The size of the HPI host buffer is chosen
+ as a multiple of framesPerPaHostBuffer, and also influenced by the suggested latency and the
+ estimated minimum polling interval. The HPI host and hardware buffer sizes are stored, and an
+ appropriate cap for the hardware buffer is also calculated. Finally, the temporary stream
+ buffer which serves as the PortAudio host buffer for this implementation is allocated.
+ This buffer contains an integer number of user buffers, to simplify buffer adaption in the
+ buffer processor. The function returns paBufferTooBig if the HPI interface cannot allocate
+ an HPI host buffer of the desired size.
+
+ @param streamComp Pointer to stream component struct
+
+ @param pollingInterval Polling interval for stream, in milliseconds
+
+ @param framesPerPaHostBuffer Size of PortAudio host buffer, in frames
+
+ @param suggestedLatency Suggested latency for stream component, in seconds
+
+ @return PortAudio error code (possibly paBufferTooBig or paInsufficientMemory)
+ */
+static PaError PaAsiHpi_SetupBuffers( PaAsiHpiStreamComponent *streamComp, uint32_t pollingInterval,
+                                      unsigned long framesPerPaHostBuffer, PaTime suggestedLatency )
+{
+    PaError result = paNoError;
+    PaAsiHpiStreamInfo streamInfo;
+    unsigned long hpiBufferSize = 0, paHostBufferSize = 0;
+
+    assert( streamComp );
+    assert( streamComp->hpiDevice );
+
+    /* Obtain size of hardware buffer of HPI stream, since we will be activating BBM shortly
+       and afterwards the buffer size will refer to the BBM (host-side) buffer.
+       This is necessary to enable reliable detection of xruns. */
+    PA_ENSURE_( PaAsiHpi_GetStreamInfo( streamComp, &streamInfo ) );
+    streamComp->hardwareBufferSize = streamInfo.bufferSize;
+    hpiBufferSize = streamInfo.bufferSize;
+
+    /* Check if BBM (background bus mastering) is to be enabled */
+    if( PA_ASIHPI_USE_BBM_ )
+    {
+        uint32_t bbmBufferSize = 0, preLatencyBufferSize = 0;
+        hpi_err_t hpiError = 0;
+        PaTime pollingOverhead;
+
+        /* Check overhead of Pa_Sleep() call (minimum sleep duration in ms -> OS dependent) */
+        pollingOverhead = PaUtil_GetTime();
+        Pa_Sleep( 0 );
+        pollingOverhead = 1000*(PaUtil_GetTime() - pollingOverhead);
+        PA_DEBUG(( "polling overhead = %f ms (length of 0-second sleep)\n", pollingOverhead ));
+        /* Obtain minimum recommended size for host buffer (in bytes) */
+        PA_ASIHPI_UNLESS_( HPI_StreamEstimateBufferSize( &streamComp->hpiFormat,
+                           pollingInterval + (uint32_t)ceil( pollingOverhead ),
+                           &bbmBufferSize ), paUnanticipatedHostError );
+        /* BBM places more stringent requirements on buffer size (see description */
+        /* of HPI_StreamEstimateBufferSize in HPI API document) */
+        bbmBufferSize *= 3;
+        /* Make sure the BBM buffer contains multiple PA host buffers */
+        if( bbmBufferSize < 3 * streamComp->bytesPerFrame * framesPerPaHostBuffer )
+            bbmBufferSize = 3 * streamComp->bytesPerFrame * framesPerPaHostBuffer;
+        /* Try to honor latency suggested by user by growing buffer (no decrease possible) */
+        if( suggestedLatency > 0.0 )
+        {
+            PaTime bufferDuration = ((PaTime)bbmBufferSize) / streamComp->bytesPerFrame
+                                    / streamComp->hpiFormat.dwSampleRate;
+            /* Don't decrease buffer */
+            if( bufferDuration < suggestedLatency )
+            {
+                /* Save old buffer size, to be retried if new size proves too big */
+                preLatencyBufferSize = bbmBufferSize;
+                bbmBufferSize = (uint32_t)ceil( suggestedLatency * streamComp->bytesPerFrame
+                                            * streamComp->hpiFormat.dwSampleRate );
+            }
+        }
+        /* Choose closest memory block boundary (HPI API document states that
+        "a buffer size of Nx4096 - 20 makes the best use of memory"
+        (under the entry for HPI_StreamEstimateBufferSize)) */
+        bbmBufferSize = ((uint32_t)ceil((bbmBufferSize + 20)/4096.0))*4096 - 20;
+        streamComp->hostBufferSize = bbmBufferSize;
+        /* Allocate BBM host buffer (this enables bus mastering transfers in background) */
+        if( streamComp->hpiDevice->streamIsOutput )
+            hpiError = HPI_OutStreamHostBufferAllocate( NULL,
+                       streamComp->hpiStream,
+                       bbmBufferSize );
+        else
+            hpiError = HPI_InStreamHostBufferAllocate( NULL,
+                       streamComp->hpiStream,
+                       bbmBufferSize );
+        if( hpiError )
+        {
+            /* Indicate that BBM is disabled */
+            streamComp->hostBufferSize = 0;
+            /* Retry with smaller buffer size (transfers will still work, but not via BBM) */
+            if( hpiError == HPI_ERROR_INVALID_DATASIZE )
+            {
+                /* Retry BBM allocation with smaller size if requested latency proved too big */
+                if( preLatencyBufferSize > 0 )
+                {
+                    PA_DEBUG(( "Retrying BBM allocation with smaller size (%d vs. %d bytes)\n",
+                               preLatencyBufferSize, bbmBufferSize ));
+                    bbmBufferSize = preLatencyBufferSize;
+                    if( streamComp->hpiDevice->streamIsOutput )
+                        hpiError = HPI_OutStreamHostBufferAllocate( NULL,
+                                   streamComp->hpiStream,
+                                   bbmBufferSize );
+                    else
+                        hpiError = HPI_InStreamHostBufferAllocate( NULL,
+                                   streamComp->hpiStream,
+                                   bbmBufferSize );
+                    /* Another round of error checking */
+                    if( hpiError )
+                    {
+                        PA_ASIHPI_REPORT_ERROR_( hpiError );
+                        /* No escapes this time */
+                        if( hpiError == HPI_ERROR_INVALID_DATASIZE )
+                        {
+                            result = paBufferTooBig;
+                            goto error;
+                        }
+                        else if( hpiError != HPI_ERROR_INVALID_OPERATION )
+                        {
+                            result = paUnanticipatedHostError;
+                            goto error;
+                        }
+                    }
+                    else
+                    {
+                        streamComp->hostBufferSize = bbmBufferSize;
+                        hpiBufferSize = bbmBufferSize;
+                    }
+                }
+                else
+                {
+                    result = paBufferTooBig;
+                    goto error;
+                }
+            }
+            /* If BBM not supported, foreground transfers will be used, but not a show-stopper */
+            /* Anything else is an error */
+            else if (( hpiError != HPI_ERROR_INVALID_OPERATION ) &&
+		     ( hpiError != HPI_ERROR_INVALID_FUNC ))
+            {
+                PA_ASIHPI_REPORT_ERROR_( hpiError );
+                result = paUnanticipatedHostError;
+                goto error;
+            }
+        }
+        else
+        {
+            hpiBufferSize = bbmBufferSize;
+        }
+    }
+
+    /* Final check of buffer size */
+    paHostBufferSize = streamComp->bytesPerFrame * framesPerPaHostBuffer;
+    if( hpiBufferSize < 3*paHostBufferSize )
+    {
+        result = paBufferTooBig;
+        goto error;
+    }
+    /* Set cap on output buffer size, based on latency suggestions */
+    if( streamComp->hpiDevice->streamIsOutput )
+    {
+        PaTime latency = suggestedLatency > 0.0 ? suggestedLatency :
+                         streamComp->hpiDevice->baseDeviceInfo.defaultHighOutputLatency;
+        streamComp->outputBufferCap =
+            (uint32_t)ceil( latency * streamComp->bytesPerFrame * streamComp->hpiFormat.dwSampleRate );
+        /* The cap should not be too small, to prevent underflow */
+        if( streamComp->outputBufferCap < 4*paHostBufferSize )
+            streamComp->outputBufferCap = 4*paHostBufferSize;
+    }
+    else
+    {
+        streamComp->outputBufferCap = 0;
+    }
+    /* Temp buffer size should be multiple of PA host buffer size (or 1x, if using fixed blocks) */
+    streamComp->tempBufferSize = paHostBufferSize;
+    /* Allocate temp buffer */
+    PA_UNLESS_( streamComp->tempBuffer = (uint8_t *)PaUtil_AllocateMemory( streamComp->tempBufferSize ),
+                paInsufficientMemory );
+error:
+    return result;
+}
+
+
+/** Opens PortAudio stream.
+ This determines a suitable value for framesPerBuffer, if the user didn't specify it,
+ based on the suggested latency. It then opens each requested stream direction with the
+ appropriate stream format, and allocates the required stream buffers. It sets up the
+ various PortAudio structures dealing with streams, and estimates the stream latency.
+
+ See pa_hostapi.h for a list of validity guarantees made about OpenStream parameters.
+
+ @param hostApi Pointer to host API struct
+
+ @param s List of open streams, where successfully opened stream will go
+
+ @param inputParameters Pointer to stream parameter struct for input side of stream
+
+ @param outputParameters Pointer to stream parameter struct for output side of stream
+
+ @param sampleRate Desired sample rate
+
+ @param framesPerBuffer Desired number of frames per buffer passed to user callback
+                        (or chunk size for blocking stream)
+
+ @param streamFlags Stream flags
+
+ @param streamCallback Pointer to user callback function (zero for blocking interface)
+
+ @param userData Pointer to user data that will be passed to callback function along with data
+
+ @return PortAudio error code
+*/
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream **s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
+    PaAsiHpiStream *stream = NULL;
+    unsigned long framesPerHostBuffer = framesPerBuffer;
+    int inputChannelCount = 0, outputChannelCount = 0;
+    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
+    PaSampleFormat hostInputSampleFormat = 0, hostOutputSampleFormat = 0;
+    PaTime maxSuggestedLatency = 0.0;
+
+    /* Validate platform-specific flags -> none expected for HPI */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform-specific flag */
+
+    /* Create blank stream structure */
+    PA_UNLESS_( stream = (PaAsiHpiStream *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStream) ),
+                paInsufficientMemory );
+    memset( stream, 0, sizeof(PaAsiHpiStream) );
+
+    /* If the number of frames per buffer is unspecified, we have to come up with one. */
+    if( framesPerHostBuffer == paFramesPerBufferUnspecified )
+    {
+        if( inputParameters )
+            maxSuggestedLatency = inputParameters->suggestedLatency;
+        if( outputParameters && (outputParameters->suggestedLatency > maxSuggestedLatency) )
+            maxSuggestedLatency = outputParameters->suggestedLatency;
+        /* Use suggested latency if available */
+        if( maxSuggestedLatency > 0.0 )
+            framesPerHostBuffer = (unsigned long)ceil( maxSuggestedLatency * sampleRate );
+        else
+            /* AudioScience cards like BIG buffers by default */
+            framesPerHostBuffer = 4096;
+    }
+    /* Lower bounds on host buffer size, due to polling and HPI constraints */
+    if( 1000.0*framesPerHostBuffer/sampleRate < PA_ASIHPI_MIN_POLLING_INTERVAL_ )
+        framesPerHostBuffer = (unsigned long)ceil( sampleRate * PA_ASIHPI_MIN_POLLING_INTERVAL_ / 1000.0 );
+    /*    if( framesPerHostBuffer < PA_ASIHPI_MIN_FRAMES_ )
+            framesPerHostBuffer = PA_ASIHPI_MIN_FRAMES_; */
+    /* Efficient if host buffer size is integer multiple of user buffer size */
+    if( framesPerBuffer > 0 )
+        framesPerHostBuffer = (unsigned long)ceil( (double)framesPerHostBuffer / framesPerBuffer ) * framesPerBuffer;
+    /* Buffer should always be a multiple of 4 bytes to facilitate 32-bit PCI transfers.
+     By keeping the frames a multiple of 4, this is ensured even for 8-bit mono sound. */
+    framesPerHostBuffer = (framesPerHostBuffer / 4) * 4;
+    /* Polling is based on time length (in milliseconds) of user-requested block size */
+    stream->pollingInterval = (uint32_t)ceil( 1000.0*framesPerHostBuffer/sampleRate );
+    assert( framesPerHostBuffer > 0 );
+
+    /* Open underlying streams, check formats and allocate buffers */
+    if( inputParameters )
+    {
+        /* Create blank stream component structure */
+        PA_UNLESS_( stream->input = (PaAsiHpiStreamComponent *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStreamComponent) ),
+                    paInsufficientMemory );
+        memset( stream->input, 0, sizeof(PaAsiHpiStreamComponent) );
+        /* Create/validate format */
+        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, inputParameters, sampleRate,
+                                           &stream->input->hpiDevice, &stream->input->hpiFormat ) );
+        /* Open stream and set format */
+        PA_ENSURE_( PaAsiHpi_OpenInput( hostApi, stream->input->hpiDevice, &stream->input->hpiFormat,
+                                        &stream->input->hpiStream ) );
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+        hostInputSampleFormat = PaAsiHpi_HpiToPaFormat( stream->input->hpiFormat.wFormat );
+        stream->input->bytesPerFrame = inputChannelCount * Pa_GetSampleSize( hostInputSampleFormat );
+        assert( stream->input->bytesPerFrame > 0 );
+        /* Allocate host and temp buffers of appropriate size */
+        PA_ENSURE_( PaAsiHpi_SetupBuffers( stream->input, stream->pollingInterval,
+                                           framesPerHostBuffer, inputParameters->suggestedLatency ) );
+    }
+    if( outputParameters )
+    {
+        /* Create blank stream component structure */
+        PA_UNLESS_( stream->output = (PaAsiHpiStreamComponent *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStreamComponent) ),
+                    paInsufficientMemory );
+        memset( stream->output, 0, sizeof(PaAsiHpiStreamComponent) );
+        /* Create/validate format */
+        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, outputParameters, sampleRate,
+                                           &stream->output->hpiDevice, &stream->output->hpiFormat ) );
+        /* Open stream and check format */
+        PA_ENSURE_( PaAsiHpi_OpenOutput( hostApi, stream->output->hpiDevice,
+                                         &stream->output->hpiFormat,
+                                         &stream->output->hpiStream ) );
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        hostOutputSampleFormat = PaAsiHpi_HpiToPaFormat( stream->output->hpiFormat.wFormat );
+        stream->output->bytesPerFrame = outputChannelCount * Pa_GetSampleSize( hostOutputSampleFormat );
+        /* Allocate host and temp buffers of appropriate size */
+        PA_ENSURE_( PaAsiHpi_SetupBuffers( stream->output, stream->pollingInterval,
+                                           framesPerHostBuffer, outputParameters->suggestedLatency ) );
+    }
+
+    /* Determine maximum frames per host buffer (least common denominator of input/output) */
+    if( inputParameters && outputParameters )
+    {
+        stream->maxFramesPerHostBuffer = PA_MIN( stream->input->tempBufferSize / stream->input->bytesPerFrame,
+                                         stream->output->tempBufferSize / stream->output->bytesPerFrame );
+    }
+    else
+    {
+        stream->maxFramesPerHostBuffer = inputParameters ? stream->input->tempBufferSize / stream->input->bytesPerFrame
+                                         : stream->output->tempBufferSize / stream->output->bytesPerFrame;
+    }
+    assert( stream->maxFramesPerHostBuffer > 0 );
+    /* Initialize various other stream parameters */
+    stream->neverDropInput = streamFlags & paNeverDropInput;
+    stream->state = paAsiHpiStoppedState;
+
+    /* Initialize either callback or blocking interface */
+    if( streamCallback )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->baseStreamRep,
+                                               &hpiHostApi->callbackStreamInterface,
+                                               streamCallback, userData );
+        stream->callbackMode = 1;
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->baseStreamRep,
+                                               &hpiHostApi->blockingStreamInterface,
+                                               streamCallback, userData );
+        /* Pre-allocate non-interleaved user buffer pointers for blocking interface */
+        PA_UNLESS_( stream->blockingUserBufferCopy =
+                        PaUtil_AllocateMemory( sizeof(void *) * PA_MAX( inputChannelCount, outputChannelCount ) ),
+                    paInsufficientMemory );
+        stream->callbackMode = 0;
+    }
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+    /* Following pa_linux_alsa's lead, we operate with fixed host buffer size by default, */
+    /* since other modes will invariably lead to block adaption (maybe Bounded better?) */
+    PA_ENSURE_( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                inputChannelCount, inputSampleFormat, hostInputSampleFormat,
+                outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
+                sampleRate, streamFlags,
+                framesPerBuffer, framesPerHostBuffer, paUtilFixedHostBufferSize,
+                streamCallback, userData ) );
+
+    stream->baseStreamRep.streamInfo.structVersion = 1;
+    stream->baseStreamRep.streamInfo.sampleRate = sampleRate;
+    /* Determine input latency from buffer processor and buffer sizes */
+    if( stream->input )
+    {
+        PaTime bufferDuration = ( stream->input->hostBufferSize + stream->input->hardwareBufferSize )
+                                / sampleRate / stream->input->bytesPerFrame;
+        stream->baseStreamRep.streamInfo.inputLatency =
+            bufferDuration +
+            ((PaTime)PaUtil_GetBufferProcessorInputLatencyFrames( &stream->bufferProcessor ) -
+                stream->maxFramesPerHostBuffer) / sampleRate;
+        assert( stream->baseStreamRep.streamInfo.inputLatency > 0.0 );
+    }
+    /* Determine output latency from buffer processor and buffer sizes */
+    if( stream->output )
+    {
+        PaTime bufferDuration = ( stream->output->hostBufferSize + stream->output->hardwareBufferSize )
+                                / sampleRate / stream->output->bytesPerFrame;
+        /* Take buffer size cap into account (see PaAsiHpi_WaitForFrames) */
+        if( !stream->input && (stream->output->outputBufferCap > 0) )
+        {
+            bufferDuration = PA_MIN( bufferDuration,
+                                     stream->output->outputBufferCap / sampleRate / stream->output->bytesPerFrame );
+        }
+        stream->baseStreamRep.streamInfo.outputLatency =
+            bufferDuration +
+            ((PaTime)PaUtil_GetBufferProcessorOutputLatencyFrames( &stream->bufferProcessor ) -
+                stream->maxFramesPerHostBuffer) / sampleRate;
+        assert( stream->baseStreamRep.streamInfo.outputLatency > 0.0 );
+    }
+
+    /* Report stream info, for debugging purposes */
+    PaAsiHpi_StreamDump( stream );
+
+    /* Save initialized stream to PA stream list */
+    *s = (PaStream*)stream;
+    return result;
+
+error:
+    CloseStream( (PaStream*)stream );
+    return result;
+}
+
+
+/** Close PortAudio stream.
+ When CloseStream() is called, the multi-api layer ensures that the stream has already
+ been stopped or aborted. This closes the underlying HPI streams and deallocates stream
+ buffers and structs.
+
+ @param s Pointer to PortAudio stream
+
+ @return PortAudio error code
+*/
+static PaError CloseStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+
+    /* If stream is already gone, all is well */
+    if( stream == NULL )
+        return paNoError;
+
+    /* Generic stream cleanup */
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->baseStreamRep );
+
+    /* Implementation-specific details - close internal streams */
+    if( stream->input )
+    {
+        /* Close HPI stream (freeing BBM host buffer in the process, if used) */
+        if( stream->input->hpiStream )
+        {
+            PA_ASIHPI_UNLESS_( HPI_InStreamClose( NULL,
+                                                  stream->input->hpiStream ), paUnanticipatedHostError );
+        }
+        /* Free temp buffer and stream component */
+        PaUtil_FreeMemory( stream->input->tempBuffer );
+        PaUtil_FreeMemory( stream->input );
+    }
+    if( stream->output )
+    {
+        /* Close HPI stream (freeing BBM host buffer in the process, if used) */
+        if( stream->output->hpiStream )
+        {
+            PA_ASIHPI_UNLESS_( HPI_OutStreamClose( NULL,
+                                                   stream->output->hpiStream ), paUnanticipatedHostError );
+        }
+        /* Free temp buffer and stream component */
+        PaUtil_FreeMemory( stream->output->tempBuffer );
+        PaUtil_FreeMemory( stream->output );
+    }
+
+    PaUtil_FreeMemory( stream->blockingUserBufferCopy );
+    PaUtil_FreeMemory( stream );
+
+error:
+    return result;
+}
+
+
+/** Prime HPI output stream with silence.
+ This resets the output stream and uses PortAudio helper routines to fill the
+ temp buffer with silence. It then writes two host buffers to the stream. This is supposed
+ to be called before the stream is started. It has no effect on input-only streams.
+
+ @param stream Pointer to stream struct
+
+ @return PortAudio error code
+ */
+static PaError PaAsiHpi_PrimeOutputWithSilence( PaAsiHpiStream *stream )
+{
+    PaError result = paNoError;
+    PaAsiHpiStreamComponent *out;
+    PaUtilZeroer *zeroer;
+    PaSampleFormat outputFormat;
+    assert( stream );
+    out = stream->output;
+    /* Only continue if stream has output channels */
+    if( !out )
+        return result;
+    assert( out->tempBuffer );
+
+    /* Clear all existing data in hardware playback buffer */
+    PA_ASIHPI_UNLESS_( HPI_OutStreamReset( NULL,
+                                           out->hpiStream ), paUnanticipatedHostError );
+    /* Fill temp buffer with silence */
+    outputFormat = PaAsiHpi_HpiToPaFormat( out->hpiFormat.wFormat );
+    zeroer = PaUtil_SelectZeroer( outputFormat );
+    zeroer(out->tempBuffer, 1, out->tempBufferSize / Pa_GetSampleSize(outputFormat) );
+    /* Write temp buffer to hardware fifo twice, to get started */
+    PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( NULL, out->hpiStream,
+                                              out->tempBuffer, out->tempBufferSize, &out->hpiFormat),
+                                              paUnanticipatedHostError );
+    PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( NULL, out->hpiStream,
+                                              out->tempBuffer, out->tempBufferSize, &out->hpiFormat),
+                                              paUnanticipatedHostError );
+error:
+    return result;
+}
+
+
+/** Start HPI streams (both input + output).
+ This starts all HPI streams in the PortAudio stream. Output streams are first primed with
+ silence, if required. After this call the PA stream is in the Active state.
+
+ @todo Implement priming via the user callback
+
+ @param stream Pointer to stream struct
+
+ @param outputPrimed True if output is already primed (if false, silence will be loaded before starting)
+
+ @return PortAudio error code
+ */
+static PaError PaAsiHpi_StartStream( PaAsiHpiStream *stream, int outputPrimed )
+{
+    PaError result = paNoError;
+
+    if( stream->input )
+    {
+        PA_ASIHPI_UNLESS_( HPI_InStreamStart( NULL,
+                                              stream->input->hpiStream ), paUnanticipatedHostError );
+    }
+    if( stream->output )
+    {
+        if( !outputPrimed )
+        {
+            /* Buffer isn't primed, so load stream with silence */
+            PA_ENSURE_( PaAsiHpi_PrimeOutputWithSilence( stream ) );
+        }
+        PA_ASIHPI_UNLESS_( HPI_OutStreamStart( NULL,
+                                               stream->output->hpiStream ), paUnanticipatedHostError );
+    }
+    stream->state = paAsiHpiActiveState;
+    stream->callbackFinished = 0;
+
+    /* Report stream info for debugging purposes */
+    /*    PaAsiHpi_StreamDump( stream );   */
+
+error:
+    return result;
+}
+
+
+/** Start PortAudio stream.
+ If the stream has a callback interface, this starts a helper thread to feed the user callback.
+ The thread will then take care of starting the HPI streams, and this function will block
+ until the streams actually start. In the case of a blocking interface, the HPI streams
+ are simply started.
+
+ @param s Pointer to PortAudio stream
+
+ @return PortAudio error code
+*/
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+
+    assert( stream );
+
+    /* Ready the processor */
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+
+    if( stream->callbackMode )
+    {
+        /* Create and start callback engine thread */
+        /* Also waits 1 second for stream to be started by engine thread (otherwise aborts) */
+        PA_ENSURE_( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., 0 /*rtSched*/ ) );
+    }
+    else
+    {
+        PA_ENSURE_( PaAsiHpi_StartStream( stream, 0 ) );
+    }
+
+error:
+    return result;
+}
+
+
+/** Stop HPI streams (input + output), either softly or abruptly.
+ If abort is false, the function blocks until the output stream is drained, otherwise it
+ stops immediately and discards data in the stream hardware buffers.
+
+ This function is safe to call from the callback engine thread as well as the main thread.
+
+ @param stream Pointer to stream struct
+
+ @param abort True if samples in output buffer should be discarded (otherwise blocks until stream is done)
+
+ @return PortAudio error code
+
+ */
+static PaError PaAsiHpi_StopStream( PaAsiHpiStream *stream, int abort )
+{
+    PaError result = paNoError;
+
+    assert( stream );
+
+    /* Input channels */
+    if( stream->input )
+    {
+        PA_ASIHPI_UNLESS_( HPI_InStreamReset( NULL,
+                                              stream->input->hpiStream ), paUnanticipatedHostError );
+    }
+    /* Output channels */
+    if( stream->output )
+    {
+        if( !abort )
+        {
+            /* Wait until HPI output stream is drained */
+            while( 1 )
+            {
+                PaAsiHpiStreamInfo streamInfo;
+                PaTime timeLeft;
+
+                /* Obtain number of samples waiting to be played */
+                PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &streamInfo ) );
+                /* Check if stream is drained */
+                if( (streamInfo.state != HPI_STATE_PLAYING) &&
+                        (streamInfo.dataSize < stream->output->bytesPerFrame * PA_ASIHPI_MIN_FRAMES_) )
+                    break;
+                /* Sleep amount of time represented by remaining samples */
+                timeLeft = 1000.0 * streamInfo.dataSize / stream->output->bytesPerFrame
+                           / stream->baseStreamRep.streamInfo.sampleRate;
+                Pa_Sleep( (long)ceil( timeLeft ) );
+            }
+        }
+        PA_ASIHPI_UNLESS_( HPI_OutStreamReset( NULL,
+                                               stream->output->hpiStream ), paUnanticipatedHostError );
+    }
+
+    /* Report stream info for debugging purposes */
+    /*    PaAsiHpi_StreamDump( stream ); */
+
+error:
+    return result;
+}
+
+
+/** Stop or abort PortAudio stream.
+
+ This function is used to explicitly stop the PortAudio stream (via StopStream/AbortStream),
+ as opposed to the situation when the callback finishes with a result other than paContinue.
+ If a stream is in callback mode we will have to inspect whether the background thread has
+ finished, or we will have to take it out. In either case we join the thread before returning.
+ In blocking mode, we simply tell HPI to stop abruptly (abort) or finish buffers (drain).
+ The PortAudio stream will be in the Stopped state after a call to this function.
+
+ Don't call this from the callback engine thread!
+
+ @param stream Pointer to stream struct
+
+ @param abort True if samples in output buffer should be discarded (otherwise blocks until stream is done)
+
+ @return PortAudio error code
+*/
+static PaError PaAsiHpi_ExplicitStop( PaAsiHpiStream *stream, int abort )
+{
+    PaError result = paNoError;
+
+    /* First deal with the callback thread, cancelling and/or joining it if necessary */
+    if( stream->callbackMode )
+    {
+        PaError threadRes;
+        stream->callbackAbort = abort;
+        if( abort )
+        {
+            PA_DEBUG(( "Aborting callback\n" ));
+        }
+        else
+        {
+            PA_DEBUG(( "Stopping callback\n" ));
+        }
+        PA_ENSURE_( PaUnixThread_Terminate( &stream->thread, !abort, &threadRes ) );
+        if( threadRes != paNoError )
+        {
+            PA_DEBUG(( "Callback thread returned: %d\n", threadRes ));
+        }
+    }
+    else
+    {
+        PA_ENSURE_( PaAsiHpi_StopStream( stream, abort ) );
+    }
+
+    stream->state = paAsiHpiStoppedState;
+
+error:
+    return result;
+}
+
+
+/** Stop PortAudio stream.
+ This blocks until the output buffers are drained.
+
+ @param s Pointer to PortAudio stream
+
+ @return PortAudio error code
+*/
+static PaError StopStream( PaStream *s )
+{
+    return PaAsiHpi_ExplicitStop( (PaAsiHpiStream *) s, 0 );
+}
+
+
+/** Abort PortAudio stream.
+ This discards any existing data in output buffers and stops the stream immediately.
+
+ @param s Pointer to PortAudio stream
+
+ @return PortAudio error code
+*/
+static PaError AbortStream( PaStream *s )
+{
+    return PaAsiHpi_ExplicitStop( (PaAsiHpiStream * ) s, 1 );
+}
+
+
+/** Determine whether the stream is stopped.
+ A stream is considered to be stopped prior to a successful call to StartStream and after
+ a successful call to StopStream or AbortStream. If a stream callback returns a value other
+ than paContinue the stream is NOT considered to be stopped (it is in CallbackFinished state).
+
+ @param s Pointer to PortAudio stream
+
+ @return Returns one (1) when the stream is stopped, zero (0) when the stream is running, or
+         a PaErrorCode (which are always negative) if PortAudio is not initialized or an
+         error is encountered.
+*/
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+
+    assert( stream );
+    return stream->state == paAsiHpiStoppedState ? 1 : 0;
+}
+
+
+/** Determine whether the stream is active.
+ A stream is active after a successful call to StartStream(), until it becomes inactive either
+ as a result of a call to StopStream() or AbortStream(), or as a result of a return value
+ other than paContinue from the stream callback. In the latter case, the stream is considered
+ inactive after the last buffer has finished playing.
+
+ @param s Pointer to PortAudio stream
+
+ @return Returns one (1) when the stream is active (i.e. playing or recording audio),
+         zero (0) when not playing, or a PaErrorCode (which are always negative)
+         if PortAudio is not initialized or an error is encountered.
+*/
+static PaError IsStreamActive( PaStream *s )
+{
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+
+    assert( stream );
+    return stream->state == paAsiHpiActiveState ? 1 : 0;
+}
+
+
+/** Returns current stream time.
+ This corresponds to the system clock. The clock should run continuously while the stream
+ is open, i.e. between calls to OpenStream() and CloseStream(), therefore a frame counter
+ is not good enough.
+
+ @param s Pointer to PortAudio stream
+
+ @return Stream time, in seconds
+ */
+static PaTime GetStreamTime( PaStream *s )
+{
+    return PaUtil_GetTime();
+}
+
+
+/** Returns CPU load.
+
+ @param s Pointer to PortAudio stream
+
+ @return CPU load (0.0 if blocking interface is used)
+ */
+static double GetStreamCpuLoad( PaStream *s )
+{
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+
+    return stream->callbackMode ? PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer ) : 0.0;
+}
+
+/* --------------------------- Callback Interface --------------------------- */
+
+/** Exit routine which is called when callback thread quits.
+ This takes care of stopping the HPI streams (either waiting for output to finish, or
+ abruptly). It also calls the user-supplied StreamFinished callback, and sets the
+ stream state to CallbackFinished if it was reached via a non-paContinue return from
+ the user callback function.
+
+ @param userData A pointer to an open stream previously created with Pa_OpenStream
+ */
+static void PaAsiHpi_OnThreadExit( void *userData )
+{
+    PaAsiHpiStream *stream = (PaAsiHpiStream *) userData;
+
+    assert( stream );
+
+    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
+
+    PA_DEBUG(( "%s: Stopping HPI streams\n", __FUNCTION__ ));
+    PaAsiHpi_StopStream( stream, stream->callbackAbort );
+    PA_DEBUG(( "%s: Stoppage\n", __FUNCTION__ ));
+
+    /* Eventually notify user all buffers have played */
+    if( stream->baseStreamRep.streamFinishedCallback )
+    {
+        stream->baseStreamRep.streamFinishedCallback( stream->baseStreamRep.userData );
+    }
+
+    /* Unfortunately both explicit calls to Stop/AbortStream (leading to Stopped state)
+     and implicit stops via paComplete/paAbort (leading to CallbackFinished state)
+     end up here - need another flag to remind us which is the case */
+    if( stream->callbackFinished )
+        stream->state = paAsiHpiCallbackFinishedState;
+}
+
+
+/** Wait until there is enough frames to fill a host buffer.
+ The routine attempts to sleep until at least a full host buffer can be retrieved from the
+ input HPI stream and passed to the output HPI stream. It will first sleep until enough
+ output space is available, as this is usually easily achievable. If it is an output-only
+ stream, it will also sleep if the hardware buffer is too full, thereby throttling the
+ filling of the output buffer and reducing output latency. The routine then blocks until
+ enough input samples are available, unless this will cause an output underflow. In the
+ process, input overflows and output underflows are indicated.
+
+ @param stream Pointer to stream struct
+
+ @param framesAvail Returns the number of available frames
+
+ @param cbFlags Overflows and underflows indicated in here
+
+ @return PortAudio error code (only paUnanticipatedHostError expected)
+ */
+static PaError PaAsiHpi_WaitForFrames( PaAsiHpiStream *stream, unsigned long *framesAvail,
+                                       PaStreamCallbackFlags *cbFlags )
+{
+    PaError result = paNoError;
+    double sampleRate;
+    unsigned long framesTarget;
+    uint32_t outputData = 0, outputSpace = 0, inputData = 0, framesLeft = 0;
+
+    assert( stream );
+    assert( stream->input || stream->output );
+
+    sampleRate = stream->baseStreamRep.streamInfo.sampleRate;
+    /* We have to come up with this much frames on both input and output */
+    framesTarget = stream->bufferProcessor.framesPerHostBuffer;
+    assert( framesTarget > 0 );
+
+    while( 1 )
+    {
+        PaAsiHpiStreamInfo info;
+        /* Check output first, as this takes priority in the default full-duplex mode */
+        if( stream->output )
+        {
+            PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
+            /* Wait until enough space is available in output buffer to receive a full block */
+            if( info.availableFrames < framesTarget )
+            {
+                framesLeft = framesTarget - info.availableFrames;
+                Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
+                continue;
+            }
+            /* Wait until the data in hardware buffer has dropped to a sensible level.
+             Without this, the hardware buffer quickly fills up in the absence of an input
+             stream to regulate its data rate (if data generation is fast). This leads to
+             large latencies, as the AudioScience hardware buffers are humongous.
+             This is similar to the default "Hardware Buffering=off" option in the
+             AudioScience WAV driver. */
+            if( !stream->input && (stream->output->outputBufferCap > 0) &&
+                    ( info.totalBufferedData > stream->output->outputBufferCap / stream->output->bytesPerFrame ) )
+            {
+                framesLeft = info.totalBufferedData - stream->output->outputBufferCap / stream->output->bytesPerFrame;
+                Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
+                continue;
+            }
+            outputData = info.totalBufferedData;
+            outputSpace = info.availableFrames;
+            /* Report output underflow to callback */
+            if( info.underflow )
+            {
+                *cbFlags |= paOutputUnderflow;
+            }
+        }
+
+        /* Now check input side */
+        if( stream->input )
+        {
+            PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
+            /* If a full block of samples hasn't been recorded yet, wait for it if possible */
+            if( info.availableFrames < framesTarget )
+            {
+                framesLeft = framesTarget - info.availableFrames;
+                /* As long as output is not disrupted in the process, wait for a full
+                block of input samples */
+                if( !stream->output || (outputData > framesLeft) )
+                {
+                    Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
+                    continue;
+                }
+            }
+            inputData = info.availableFrames;
+            /** @todo The paInputOverflow flag should be set in the callback containing the
+             first input sample following the overflow. That means the block currently sitting
+             at the fore-front of recording, i.e. typically the one containing the newest (last)
+             sample in the HPI buffer system. This is most likely not the same as the current
+             block of data being passed to the callback. The current overflow should ideally
+             be noted in an overflow list of sorts, with an indication of when it should be
+             reported. The trouble starts if there are several separate overflow incidents,
+             given a big input buffer. Oh well, something to try out later... */
+            if( info.overflow )
+            {
+                *cbFlags |= paInputOverflow;
+            }
+        }
+        break;
+    }
+    /* Full-duplex stream */
+    if( stream->input && stream->output )
+    {
+        if( outputSpace >= framesTarget )
+            *framesAvail = outputSpace;
+        /* If input didn't make the target, keep the output count instead (input underflow) */
+        if( (inputData >= framesTarget) && (inputData < outputSpace) )
+            *framesAvail = inputData;
+    }
+    else
+    {
+        *framesAvail = stream->input ? inputData : outputSpace;
+    }
+
+error:
+    return result;
+}
+
+
+/** Obtain recording, current and playback timestamps of stream.
+ The current time is determined by the system clock. This "now" timestamp occurs at the
+ forefront of recording (and playback in the full-duplex case), which happens later than the
+ input timestamp by an amount equal to the total number of recorded frames in the input buffer.
+ The output timestamp indicates when the next generated sample will actually be played. This
+ happens after all the samples currently in the output buffer are played. The output timestamp
+ therefore follows the current timestamp by an amount equal to the number of frames yet to be
+ played back in the output buffer.
+
+ If the current timestamp is the present, the input timestamp is in the past and the output
+ timestamp is in the future.
+
+ @param stream Pointer to stream struct
+
+ @param timeInfo Pointer to timeInfo struct that will contain timestamps
+ */
+static void PaAsiHpi_CalculateTimeInfo( PaAsiHpiStream *stream, PaStreamCallbackTimeInfo *timeInfo )
+{
+    PaAsiHpiStreamInfo streamInfo;
+    double sampleRate;
+
+    assert( stream );
+    assert( timeInfo );
+    sampleRate = stream->baseStreamRep.streamInfo.sampleRate;
+
+    /* The current time ("now") is at the forefront of both recording and playback */
+    timeInfo->currentTime = GetStreamTime( (PaStream *)stream );
+    /* The last sample in the input buffer was recorded just now, so the first sample
+     happened (number of recorded samples)/sampleRate ago */
+    timeInfo->inputBufferAdcTime = timeInfo->currentTime;
+    if( stream->input )
+    {
+        PaAsiHpi_GetStreamInfo( stream->input, &streamInfo );
+        timeInfo->inputBufferAdcTime -= streamInfo.totalBufferedData / sampleRate;
+    }
+    /* The first of the outgoing samples will be played after all the samples in the output
+     buffer is done */
+    timeInfo->outputBufferDacTime = timeInfo->currentTime;
+    if( stream->output )
+    {
+        PaAsiHpi_GetStreamInfo( stream->output, &streamInfo );
+        timeInfo->outputBufferDacTime += streamInfo.totalBufferedData / sampleRate;
+    }
+}
+
+
+/** Read from HPI input stream and register buffers.
+ This reads data from the HPI input stream (if it exists) and registers the temp stream
+ buffers of both input and output streams with the buffer processor. In the process it also
+ handles input underflows in the full-duplex case.
+
+ @param stream Pointer to stream struct
+
+ @param numFrames On entrance the number of available frames, on exit the number of
+                  received frames
+
+ @param cbFlags Indicates overflows and underflows
+
+ @return PortAudio error code
+ */
+static PaError PaAsiHpi_BeginProcessing( PaAsiHpiStream *stream, unsigned long *numFrames,
+        PaStreamCallbackFlags *cbFlags )
+{
+    PaError result = paNoError;
+
+    assert( stream );
+    if( *numFrames > stream->maxFramesPerHostBuffer )
+        *numFrames = stream->maxFramesPerHostBuffer;
+
+    if( stream->input )
+    {
+        PaAsiHpiStreamInfo info;
+
+        uint32_t framesToGet = *numFrames;
+
+        /* Check for overflows and underflows yet again */
+        PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
+        if( info.overflow )
+        {
+            *cbFlags |= paInputOverflow;
+        }
+        /* Input underflow if less than expected number of samples pitch up */
+        if( framesToGet > info.availableFrames )
+        {
+            PaUtilZeroer *zeroer;
+            PaSampleFormat inputFormat;
+
+            /* Never call an input-only stream with InputUnderflow set */
+            if( stream->output )
+                *cbFlags |= paInputUnderflow;
+            framesToGet = info.availableFrames;
+            /* Fill temp buffer with silence (to make up for missing input samples) */
+            inputFormat = PaAsiHpi_HpiToPaFormat( stream->input->hpiFormat.wFormat );
+            zeroer = PaUtil_SelectZeroer( inputFormat );
+            zeroer(stream->input->tempBuffer, 1,
+                   stream->input->tempBufferSize / Pa_GetSampleSize(inputFormat) );
+        }
+
+        /* Read block of data into temp buffer */
+        PA_ASIHPI_UNLESS_( HPI_InStreamReadBuf( NULL,
+                                             stream->input->hpiStream,
+                                             stream->input->tempBuffer,
+                                             framesToGet * stream->input->bytesPerFrame),
+                           paUnanticipatedHostError );
+        /* Register temp buffer with buffer processor (always FULL buffer) */
+        PaUtil_SetInputFrameCount( &stream->bufferProcessor, *numFrames );
+        /* HPI interface only allows interleaved channels */
+        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
+                                            0, stream->input->tempBuffer,
+                                            stream->input->hpiFormat.wChannels );
+    }
+    if( stream->output )
+    {
+        /* Register temp buffer with buffer processor */
+        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, *numFrames );
+        /* HPI interface only allows interleaved channels */
+        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
+                                             0, stream->output->tempBuffer,
+                                             stream->output->hpiFormat.wChannels );
+    }
+
+error:
+    return result;
+}
+
+
+/** Flush output buffers to HPI output stream.
+ This completes the processing cycle by writing the temp buffer to the HPI interface.
+ Additional output underflows are caught before data is written to the stream, as this
+ action typically remedies the underflow and hides it in the process.
+
+ @param stream Pointer to stream struct
+
+ @param numFrames The number of frames to write to the output stream
+
+ @param cbFlags Indicates overflows and underflows
+ */
+static PaError PaAsiHpi_EndProcessing( PaAsiHpiStream *stream, unsigned long numFrames,
+                                       PaStreamCallbackFlags *cbFlags )
+{
+    PaError result = paNoError;
+
+    assert( stream );
+
+    if( stream->output )
+    {
+        PaAsiHpiStreamInfo info;
+        /* Check for underflows after the (potentially time-consuming) callback */
+        PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
+        if( info.underflow )
+        {
+            *cbFlags |= paOutputUnderflow;
+        }
+
+        /* Write temp buffer to HPI stream */
+        PA_ASIHPI_UNLESS_( HPI_OutStreamWriteBuf( NULL,
+                                           stream->output->hpiStream,
+                                           stream->output->tempBuffer,
+                                           numFrames * stream->output->bytesPerFrame,
+                                           &stream->output->hpiFormat),
+                           paUnanticipatedHostError );
+    }
+
+error:
+    return result;
+}
+
+
+/** Main callback engine.
+ This function runs in a separate thread and does all the work of fetching audio data from
+ the AudioScience card via the HPI interface, feeding it to the user callback via the buffer
+ processor, and delivering the resulting output data back to the card via HPI calls.
+ It is started and terminated when the PortAudio stream is started and stopped, and starts
+ the HPI streams on startup.
+
+ @param userData A pointer to an open stream previously created with Pa_OpenStream.
+*/
+static void *CallbackThreadFunc( void *userData )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream *) userData;
+    int callbackResult = paContinue;
+
+    assert( stream );
+
+    /* Cleanup routine stops streams on thread exit */
+    pthread_cleanup_push( &PaAsiHpi_OnThreadExit, stream );
+
+    /* Start HPI streams and notify parent when we're done */
+    PA_ENSURE_( PaUnixThread_PrepareNotify( &stream->thread ) );
+    /* Buffer will be primed with silence */
+    PA_ENSURE_( PaAsiHpi_StartStream( stream, 0 ) );
+    PA_ENSURE_( PaUnixThread_NotifyParent( &stream->thread ) );
+
+    /* MAIN LOOP */
+    while( 1 )
+    {
+        PaStreamCallbackFlags cbFlags = 0;
+        unsigned long framesAvail, framesGot;
+
+        pthread_testcancel();
+
+        /** @concern StreamStop if the main thread has requested a stop and the stream has not
+        * been effectively stopped we signal this condition by modifying callbackResult
+        * (we'll want to flush buffered output). */
+        if( PaUnixThread_StopRequested( &stream->thread ) && (callbackResult == paContinue) )
+        {
+            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
+            callbackResult = paComplete;
+        }
+
+        /* Start winding down thread if requested */
+        if( callbackResult != paContinue )
+        {
+            stream->callbackAbort = (callbackResult == paAbort);
+            if( stream->callbackAbort ||
+                    /** @concern BlockAdaption: Go on if adaption buffers are empty */
+                    PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
+            {
+                goto end;
+            }
+            PA_DEBUG(( "%s: Flushing buffer processor\n", __FUNCTION__ ));
+            /* There is still buffered output that needs to be processed */
+        }
+
+        /* SLEEP */
+        /* Wait for data (or buffer space) to become available. This basically sleeps and
+        polls the HPI interface until a full block of frames can be moved. */
+        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
+
+        /* Consume buffer space. Once we have a number of frames available for consumption we
+        must retrieve the data from the HPI interface and pass it to the PA buffer processor.
+        We should be prepared to process several chunks successively. */
+        while( framesAvail > 0 )
+        {
+            PaStreamCallbackTimeInfo timeInfo = {0, 0, 0};
+
+            pthread_testcancel();
+
+            framesGot = framesAvail;
+            if( stream->bufferProcessor.hostBufferSizeMode == paUtilFixedHostBufferSize )
+            {
+                /* We've committed to a fixed host buffer size, stick to that */
+                framesGot = framesGot >= stream->maxFramesPerHostBuffer ? stream->maxFramesPerHostBuffer : 0;
+            }
+            else
+            {
+                /* We've committed to an upper bound on the size of host buffers */
+                assert( stream->bufferProcessor.hostBufferSizeMode == paUtilBoundedHostBufferSize );
+                framesGot = PA_MIN( framesGot, stream->maxFramesPerHostBuffer );
+            }
+
+            /* Obtain buffer timestamps */
+            PaAsiHpi_CalculateTimeInfo( stream, &timeInfo );
+            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, cbFlags );
+            /* CPU load measurement should include processing activivity external to the stream callback */
+            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+            if( framesGot > 0 )
+            {
+                /* READ FROM HPI INPUT STREAM */
+                PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
+                /* Input overflow in a full-duplex stream makes for interesting times */
+                if( stream->input && stream->output && (cbFlags & paInputOverflow) )
+                {
+                    /* Special full-duplex paNeverDropInput mode */
+                    if( stream->neverDropInput )
+                    {
+                        PaUtil_SetNoOutput( &stream->bufferProcessor );
+                        cbFlags |= paOutputOverflow;
+                    }
+                }
+                /* CALL USER CALLBACK WITH INPUT DATA, AND OBTAIN OUTPUT DATA */
+                PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+                /* Clear overflow and underflow information (but PaAsiHpi_EndProcessing might
+                still show up output underflow that will carry over to next round) */
+                cbFlags = 0;
+                /*  WRITE TO HPI OUTPUT STREAM */
+                PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
+                /* Advance frame counter */
+                framesAvail -= framesGot;
+            }
+            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesGot );
+
+            if( framesGot == 0 )
+            {
+                /* Go back to polling for more frames */
+                break;
+
+            }
+            if( callbackResult != paContinue )
+                break;
+        }
+    }
+
+    /* This code is unreachable, but important to include regardless because it
+     * is possibly a macro with a closing brace to match the opening brace in
+     * pthread_cleanup_push() above.  The documentation states that they must
+     * always occur in pairs. */
+    pthread_cleanup_pop( 1 );
+
+end:
+    /* Indicates normal exit of callback, as opposed to the thread getting killed explicitly */
+    stream->callbackFinished = 1;
+    PA_DEBUG(( "%s: Thread %d exiting (callbackResult = %d)\n ",
+               __FUNCTION__, pthread_self(), callbackResult ));
+    /* Exit from thread and report any PortAudio error in the process */
+    PaUnixThreading_EXIT( result );
+error:
+    goto end;
+}
+
+/* --------------------------- Blocking Interface --------------------------- */
+
+/* As separate stream interfaces are used for blocking and callback streams, the following
+ functions can be guaranteed to only be called for blocking streams. */
+
+/** Read data from input stream.
+ This reads the indicated number of frames into the supplied buffer from an input stream,
+ and blocks until this is done.
+
+ @param s Pointer to PortAudio stream
+
+ @param buffer Pointer to buffer that will receive interleaved data (or an array of pointers
+               to a buffer for each non-interleaved channel)
+
+ @param frames Number of frames to read from stream
+
+ @return PortAudio error code (also indicates overflow via paInputOverflowed)
+ */
+static PaError ReadStream( PaStream *s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+    PaAsiHpiStreamInfo info;
+    void *userBuffer;
+
+    assert( stream );
+    PA_UNLESS_( stream->input, paCanNotReadFromAnOutputOnlyStream );
+
+    /* Check for input overflow since previous call to ReadStream */
+    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
+    if( info.overflow )
+    {
+        result = paInputOverflowed;
+    }
+
+    /* NB Make copy of user buffer pointers, since they are advanced by buffer processor */
+    if( stream->bufferProcessor.userInputIsInterleaved )
+    {
+        userBuffer = buffer;
+    }
+    else
+    {
+        /* Copy channels into local array */
+        userBuffer = stream->blockingUserBufferCopy;
+        memcpy( userBuffer, buffer, sizeof (void *) * stream->input->hpiFormat.wChannels );
+    }
+
+    while( frames > 0 )
+    {
+        unsigned long framesGot, framesAvail;
+        PaStreamCallbackFlags cbFlags = 0;
+
+        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
+        framesGot = PA_MIN( framesAvail, frames );
+        PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
+
+        if( framesGot > 0 )
+        {
+            framesGot = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesGot );
+            PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
+            /* Advance frame counter */
+            frames -= framesGot;
+        }
+    }
+
+error:
+    return result;
+}
+
+
+/** Write data to output stream.
+ This writes the indicated number of frames from the supplied buffer to an output stream,
+ and blocks until this is done.
+
+ @param s Pointer to PortAudio stream
+
+ @param buffer Pointer to buffer that provides interleaved data (or an array of pointers
+               to a buffer for each non-interleaved channel)
+
+ @param frames Number of frames to write to stream
+
+ @return PortAudio error code (also indicates underflow via paOutputUnderflowed)
+ */
+static PaError WriteStream( PaStream *s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+    PaAsiHpiStreamInfo info;
+    const void *userBuffer;
+
+    assert( stream );
+    PA_UNLESS_( stream->output, paCanNotWriteToAnInputOnlyStream );
+
+    /* Check for output underflow since previous call to WriteStream */
+    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
+    if( info.underflow )
+    {
+        result = paOutputUnderflowed;
+    }
+
+    /* NB Make copy of user buffer pointers, since they are advanced by buffer processor */
+    if( stream->bufferProcessor.userOutputIsInterleaved )
+    {
+        userBuffer = buffer;
+    }
+    else
+    {
+        /* Copy channels into local array */
+        userBuffer = stream->blockingUserBufferCopy;
+        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->output->hpiFormat.wChannels );
+    }
+
+    while( frames > 0 )
+    {
+        unsigned long framesGot, framesAvail;
+        PaStreamCallbackFlags cbFlags = 0;
+
+        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
+        framesGot = PA_MIN( framesAvail, frames );
+        PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
+
+        if( framesGot > 0 )
+        {
+            framesGot = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, framesGot );
+            PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
+            /* Advance frame counter */
+            frames -= framesGot;
+        }
+    }
+
+error:
+    return result;
+}
+
+
+/** Number of frames that can be read from input stream without blocking.
+
+ @param s Pointer to PortAudio stream
+
+ @return Number of frames, or PortAudio error code
+ */
+static signed long GetStreamReadAvailable( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+    PaAsiHpiStreamInfo info;
+
+    assert( stream );
+    PA_UNLESS_( stream->input, paCanNotReadFromAnOutputOnlyStream );
+
+    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
+    /* Round down to the nearest host buffer multiple */
+    result = (info.availableFrames / stream->maxFramesPerHostBuffer) * stream->maxFramesPerHostBuffer;
+    if( info.overflow )
+    {
+        result = paInputOverflowed;
+    }
+
+error:
+    return result;
+}
+
+
+/** Number of frames that can be written to output stream without blocking.
+
+ @param s Pointer to PortAudio stream
+
+ @return Number of frames, or PortAudio error code
+ */
+static signed long GetStreamWriteAvailable( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
+    PaAsiHpiStreamInfo info;
+
+    assert( stream );
+    PA_UNLESS_( stream->output, paCanNotWriteToAnInputOnlyStream );
+
+    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
+    /* Round down to the nearest host buffer multiple */
+    result = (info.availableFrames / stream->maxFramesPerHostBuffer) * stream->maxFramesPerHostBuffer;
+    if( info.underflow )
+    {
+        result = paOutputUnderflowed;
+    }
+
+error:
+    return result;
+}
diff --git a/Externals/portaudio/src/hostapi/asio/ASIO-README.txt b/Externals/portaudio/src/hostapi/asio/ASIO-README.txt
new file mode 100644
index 0000000000..bc86caa5be
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/asio/ASIO-README.txt
@@ -0,0 +1,147 @@
+ASIO-README.txt
+
+This document contains information to help you compile PortAudio with 
+ASIO support. If you find any omissions or errors in this document 
+please notify us on the PortAudio mailing list.
+
+NOTE: The Macintosh sections of this document are provided for historical
+reference. They refer to pre-OS X Macintosh. PortAudio no longer
+supports pre-OS X Macintosh. Steinberg does not support ASIO on Mac OS X.
+
+
+Building PortAudio with ASIO support
+------------------------------------
+
+To build PortAudio with ASIO support you need to compile and link with
+pa_asio.c, and files from the ASIO SDK (see below), along with the common 
+PortAudio files from src/common/ and platform specific files from 
+src/os/win/ (for Win32).
+
+If you are compiling with a non-Microsoft compiler on Windows, also 
+compile and link with iasiothiscallresolver.cpp (see below for 
+an explanation).
+
+For some platforms (MingW, Cygwin/MingW), you may simply
+be able to type:
+
+./configure --with-host_os=mingw --with-winapi=asio [--with-asiodir=/usr/local/asiosdk2]
+make
+
+and life will be good. Make sure you update the above with the correct local
+path to the ASIO SDK.
+
+
+For Microsoft Visual C++ there is an build tutorial here:
+http://www.portaudio.com/trac/wiki/TutorialDir/Compile/WindowsASIOMSVC
+
+
+
+Obtaining the ASIO SDK
+----------------------
+
+In order to build PortAudio with ASIO support, you need to download 
+the ASIO SDK (version 2.0 or later) from Steinberg. Steinberg makes the ASIO 
+SDK available to anyone free of charge, however they do not permit its 
+source code to be distributed.
+
+NOTE: In some cases the ASIO SDK may require patching, see below 
+for further details.
+
+http://www.steinberg.net/en/company/developer.html
+
+If the above link is broken search Google for:
+"download steinberg ASIO SDK"
+
+
+
+Building the ASIO SDK on Windows
+--------------------------------
+
+To build the ASIO SDK on Windows you need to compile and link with the 
+following files from the ASIO SDK:
+
+asio_sdk\common\asio.cpp
+asio_sdk\host\asiodrivers.cpp
+asio_sdk\host\pc\asiolist.cpp
+
+You may also need to adjust your include paths to support inclusion of 
+header files from the above directories.
+
+The ASIO SDK depends on the following COM API functions: 
+CoInitialize, CoUninitialize, CoCreateInstance, CLSIDFromString
+For compilation with MinGW you will need to link with -lole32, for
+Borland compilers link with Import32.lib.
+
+
+
+Non-Microsoft (MSVC) Compilers on Windows including Borland and GCC
+-------------------------------------------------------------------
+
+Steinberg did not specify a calling convention in the IASIO interface 
+definition. This causes the Microsoft compiler to use the proprietary 
+thiscall convention which is not compatible with other compilers, such 
+as compilers from Borland (BCC and C++Builder) and GNU (gcc). 
+Steinberg's ASIO SDK will compile but crash on initialization if 
+compiled with a non-Microsoft compiler on Windows.
+
+PortAudio solves this problem using the iasiothiscallresolver library 
+which is included in the distribution. When building ASIO support for
+non-Microsoft compilers, be sure to compile and link with
+iasiothiscallresolver.cpp. Note that iasiothiscallresolver includes
+conditional directives which cause it to have no effect if it is
+compiled with a Microsoft compiler, or on the Macintosh.
+
+If you use configure and make (see above), this should be handled
+automatically for you.
+
+For further information about the IASIO thiscall problem see this page:
+http://www.rossbencina.com/code/iasio-thiscall-resolver
+
+
+
+Building the ASIO SDK on (Pre-OS X) Macintosh
+---------------------------------------------
+
+To build the ASIO SDK on Macintosh you need to compile and link with the 
+following files from the ASIO SDK:
+
+host/asiodrivers.cpp 
+host/mac/asioshlib.cpp 
+host/mac/codefragements.cpp
+
+You may also need to adjust your include paths to support inclusion of 
+header files from the above directories.
+
+
+
+(Pre-OS X) Macintosh ASIO SDK Bug Patch
+---------------------------------------
+
+There is a bug in the ASIO SDK that causes the Macintosh version to 
+often fail during initialization. Below is a patch that you can apply.
+
+In codefragments.cpp replace getFrontProcessDirectory function with 
+the following one (GetFrontProcess replaced by GetCurrentProcess).
+
+
+bool CodeFragments::getFrontProcessDirectory(void *specs)
+{
+	FSSpec *fss = (FSSpec *)specs;
+	ProcessInfoRec pif;
+	ProcessSerialNumber psn;
+
+	memset(&psn,0,(long)sizeof(ProcessSerialNumber));
+	//  if(GetFrontProcess(&psn) == noErr)  // wrong !!!
+	if(GetCurrentProcess(&psn) == noErr)  // correct !!!
+	{
+		pif.processName = 0;
+		pif.processAppSpec = fss;
+		pif.processInfoLength = sizeof(ProcessInfoRec);
+		if(GetProcessInformation(&psn, &pif) == noErr)
+				return true;
+	}
+	return false;
+}
+
+
+###
diff --git a/Externals/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/Externals/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
new file mode 100644
index 0000000000..76bf678635
Binary files /dev/null and b/Externals/portaudio/src/hostapi/asio/Callback_adaptation_.pdf differ
diff --git a/Externals/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/Externals/portaudio/src/hostapi/asio/Pa_ASIO.pdf
new file mode 100644
index 0000000000..ac5ecadbc9
Binary files /dev/null and b/Externals/portaudio/src/hostapi/asio/Pa_ASIO.pdf differ
diff --git a/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
new file mode 100644
index 0000000000..08c55eacfc
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
@@ -0,0 +1,572 @@
+/*
+	IASIOThiscallResolver.cpp see the comments in iasiothiscallresolver.h for
+    the top level description - this comment describes the technical details of
+    the implementation.
+
+    The latest version of this file is available from:
+    http://www.audiomulch.com/~rossb/code/calliasio
+
+    please email comments to Ross Bencina <rossb@audiomulch.com>
+
+    BACKGROUND
+
+    The IASIO interface declared in the Steinberg ASIO 2 SDK declares
+    functions with no explicit calling convention. This causes MSVC++ to default
+    to using the thiscall convention, which is a proprietary convention not
+    implemented by some non-microsoft compilers - notably borland BCC,
+    C++Builder, and gcc. MSVC++ is the defacto standard compiler used by
+    Steinberg. As a result of this situation, the ASIO sdk will compile with
+    any compiler, however attempting to execute the compiled code will cause a
+    crash due to different default calling conventions on non-Microsoft
+    compilers.
+
+    IASIOThiscallResolver solves the problem by providing an adapter class that
+    delegates to the IASIO interface using the correct calling convention
+    (thiscall). Due to the lack of support for thiscall in the Borland and GCC
+    compilers, the calls have been implemented in assembly language.
+
+    A number of macros are defined for thiscall function calls with different
+    numbers of parameters, with and without return values - it may be possible
+    to modify the format of these macros to make them work with other inline
+    assemblers.
+
+
+    THISCALL DEFINITION
+
+    A number of definitions of the thiscall calling convention are floating
+    around the internet. The following definition has been validated against
+    output from the MSVC++ compiler:
+
+    For non-vararg functions, thiscall works as follows: the object (this)
+    pointer is passed in ECX. All arguments are passed on the stack in
+    right to left order. The return value is placed in EAX. The callee
+    clears the passed arguments from the stack.
+
+
+    FINDING FUNCTION POINTERS FROM AN IASIO POINTER
+
+    The first field of a COM object is a pointer to its vtble. Thus a pointer
+    to an object implementing the IASIO interface also points to a pointer to
+    that object's vtbl. The vtble is a table of function pointers for all of
+    the virtual functions exposed by the implemented interfaces.
+
+    If we consider a variable declared as a pointer to IASO:
+
+    IASIO *theAsioDriver
+
+    theAsioDriver points to:
+
+    object implementing IASIO
+    {
+        IASIOvtbl *vtbl
+        other data
+    }
+
+    in other words, theAsioDriver points to a pointer to an IASIOvtbl
+
+    vtbl points to a table of function pointers:
+
+    IASIOvtbl ( interface IASIO : public IUnknown )
+    {
+    (IUnknown functions)
+    0   virtual HRESULT STDMETHODCALLTYPE (*QueryInterface)(REFIID riid, void **ppv) = 0;
+    4   virtual ULONG STDMETHODCALLTYPE (*AddRef)() = 0;
+    8   virtual ULONG STDMETHODCALLTYPE (*Release)() = 0;      
+
+    (IASIO functions)
+    12	virtual ASIOBool (*init)(void *sysHandle) = 0;
+    16	virtual void (*getDriverName)(char *name) = 0;
+    20	virtual long (*getDriverVersion)() = 0;
+    24	virtual void (*getErrorMessage)(char *string) = 0;
+    28	virtual ASIOError (*start)() = 0;
+    32	virtual ASIOError (*stop)() = 0;
+    36	virtual ASIOError (*getChannels)(long *numInputChannels, long *numOutputChannels) = 0;
+    40	virtual ASIOError (*getLatencies)(long *inputLatency, long *outputLatency) = 0;
+    44	virtual ASIOError (*getBufferSize)(long *minSize, long *maxSize,
+            long *preferredSize, long *granularity) = 0;
+    48	virtual ASIOError (*canSampleRate)(ASIOSampleRate sampleRate) = 0;
+    52	virtual ASIOError (*getSampleRate)(ASIOSampleRate *sampleRate) = 0;
+    56	virtual ASIOError (*setSampleRate)(ASIOSampleRate sampleRate) = 0;
+    60	virtual ASIOError (*getClockSources)(ASIOClockSource *clocks, long *numSources) = 0;
+    64	virtual ASIOError (*setClockSource)(long reference) = 0;
+    68	virtual ASIOError (*getSamplePosition)(ASIOSamples *sPos, ASIOTimeStamp *tStamp) = 0;
+    72	virtual ASIOError (*getChannelInfo)(ASIOChannelInfo *info) = 0;
+    76	virtual ASIOError (*createBuffers)(ASIOBufferInfo *bufferInfos, long numChannels,
+            long bufferSize, ASIOCallbacks *callbacks) = 0;
+    80	virtual ASIOError (*disposeBuffers)() = 0;
+    84	virtual ASIOError (*controlPanel)() = 0;
+    88	virtual ASIOError (*future)(long selector,void *opt) = 0;
+    92	virtual ASIOError (*outputReady)() = 0;
+    };
+
+    The numbers in the left column show the byte offset of each function ptr
+    from the beginning of the vtbl. These numbers are used in the code below
+    to select different functions.
+
+    In order to find the address of a particular function, theAsioDriver
+    must first be dereferenced to find the value of the vtbl pointer:
+
+    mov     eax, theAsioDriver
+    mov     edx, [theAsioDriver]  // edx now points to vtbl[0]
+
+    Then an offset must be added to the vtbl pointer to select a
+    particular function, for example vtbl+44 points to the slot containing
+    a pointer to the getBufferSize function.
+
+    Finally vtbl+x must be dereferenced to obtain the value of the function
+    pointer stored in that address:
+
+    call    [edx+44]    // call the function pointed to by
+                        // the value in the getBufferSize field of the vtbl
+
+
+    SEE ALSO
+
+    Martin Fay's OpenASIO DLL at http://www.martinfay.com solves the same
+    problem by providing a new COM interface which wraps IASIO with an
+    interface that uses portable calling conventions. OpenASIO must be compiled
+    with MSVC, and requires that you ship the OpenASIO DLL with your
+    application.
+
+    
+    ACKNOWLEDGEMENTS
+
+    Ross Bencina: worked out the thiscall details above, wrote the original
+    Borland asm macros, and a patch for asio.cpp (which is no longer needed).
+    Thanks to Martin Fay for introducing me to the issues discussed here,
+    and to Rene G. Ceballos for assisting with asm dumps from MSVC++.
+
+    Antti Silvast: converted the original calliasio to work with gcc and NASM
+    by implementing the asm code in a separate file.
+
+	Fraser Adams: modified the original calliasio containing the Borland inline
+    asm to add inline asm for gcc i.e. Intel syntax for Borland and AT&T syntax
+    for gcc. This seems a neater approach for gcc than to have a separate .asm
+    file and it means that we only need one version of the thiscall patch.
+
+    Fraser Adams: rewrote the original calliasio patch in the form of the
+    IASIOThiscallResolver class in order to avoid modifications to files from
+    the Steinberg SDK, which may have had potential licence issues.
+
+    Andrew Baldwin: contributed fixes for compatibility problems with more
+    recent versions of the gcc assembler.
+*/
+
+
+// We only need IASIOThiscallResolver at all if we are on Win32. For other
+// platforms we simply bypass the IASIOThiscallResolver definition to allow us
+// to be safely #include'd whatever the platform to keep client code portable
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) && !defined(_WIN64)
+
+
+// If microsoft compiler we can call IASIO directly so IASIOThiscallResolver
+// is not used.
+#if !defined(_MSC_VER)
+
+
+#include <new>
+#include <assert.h>
+
+// We have a mechanism in iasiothiscallresolver.h to ensure that asio.h is
+// #include'd before it in client code, we do NOT want to do this test here.
+#define iasiothiscallresolver_sourcefile 1
+#include "iasiothiscallresolver.h"
+#undef iasiothiscallresolver_sourcefile
+
+// iasiothiscallresolver.h redefines ASIOInit for clients, but we don't want
+// this macro defined in this translation unit.
+#undef ASIOInit
+
+
+// theAsioDriver is a global pointer to the current IASIO instance which the
+// ASIO SDK uses to perform all actions on the IASIO interface. We substitute
+// our own forwarding interface into this pointer.
+extern IASIO* theAsioDriver;
+
+
+// The following macros define the inline assembler for BORLAND first then gcc
+
+#if defined(__BCPLUSPLUS__) || defined(__BORLANDC__)          
+
+
+#define CALL_THISCALL_0( resultName, thisPtr, funcOffset )\
+    void *this_ = (thisPtr);                                                \
+    __asm {                                                                 \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+        mov     resultName, eax       ;                                     \
+    }
+
+
+#define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 )\
+    void *this_ = (thisPtr);                                                \
+    __asm {                                                                 \
+        mov     eax, param1           ;                                     \
+        push    eax                   ;                                     \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+    }
+
+
+#define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 )\
+    void *this_ = (thisPtr);                                                \
+    __asm {                                                                 \
+        mov     eax, param1           ;                                     \
+        push    eax                   ;                                     \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+        mov     resultName, eax       ;                                     \
+    }
+
+
+#define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 )\
+    void *this_ = (thisPtr);                                                \
+    void *doubleParamPtr_ (&param1);                                        \
+    __asm {                                                                 \
+        mov     eax, doubleParamPtr_  ;                                     \
+        push    [eax+4]               ;                                     \
+        push    [eax]                 ;                                     \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+        mov     resultName, eax       ;                                     \
+    }
+
+
+#define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 )\
+    void *this_ = (thisPtr);                                                \
+    __asm {                                                                 \
+        mov     eax, param2           ;                                     \
+        push    eax                   ;                                     \
+        mov     eax, param1           ;                                     \
+        push    eax                   ;                                     \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+        mov     resultName, eax       ;                                     \
+    }
+
+
+#define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\
+    void *this_ = (thisPtr);                                                \
+    __asm {                                                                 \
+        mov     eax, param4           ;                                     \
+        push    eax                   ;                                     \
+        mov     eax, param3           ;                                     \
+        push    eax                   ;                                     \
+        mov     eax, param2           ;                                     \
+        push    eax                   ;                                     \
+        mov     eax, param1           ;                                     \
+        push    eax                   ;                                     \
+        mov     ecx, this_            ;                                     \
+        mov     eax, [ecx]            ;                                     \
+        call    [eax+funcOffset]      ;                                     \
+        mov     resultName, eax       ;                                     \
+    }
+
+
+#elif defined(__GNUC__)
+
+
+#define CALL_THISCALL_0( resultName, thisPtr, funcOffset )                  \
+    __asm__ __volatile__ ("movl (%1), %%edx\n\t"                            \
+                          "call *"#funcOffset"(%%edx)\n\t"                  \
+                          :"=a"(resultName) /* Output Operands */           \
+                          :"c"(thisPtr)     /* Input Operands */            \
+                          : "%edx" /* Clobbered Registers */                \
+                         );                                                 \
+
+
+#define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 )                 \
+    __asm__ __volatile__ ("pushl %0\n\t"                                    \
+                          "movl (%1), %%edx\n\t"                            \
+                          "call *"#funcOffset"(%%edx)\n\t"                  \
+                          :                 /* Output Operands */           \
+                          :"r"(param1),     /* Input Operands */            \
+                           "c"(thisPtr)                                     \
+                          : "%edx" /* Clobbered Registers */                \
+                         );                                                 \
+
+
+#define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 )          \
+    __asm__ __volatile__ ("pushl %1\n\t"                                    \
+                          "movl (%2), %%edx\n\t"                            \
+                          "call *"#funcOffset"(%%edx)\n\t"                  \
+                          :"=a"(resultName) /* Output Operands */           \
+                          :"r"(param1),     /* Input Operands */            \
+                           "c"(thisPtr)                                     \
+                          : "%edx" /* Clobbered Registers */                \
+                          );                                                \
+
+
+#define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 )   \
+    do {                                                                    \
+    double param1f64 = param1; /* Cast explicitly to double */              \
+    double *param1f64Ptr = &param1f64; /* Make pointer to address */        \
+     __asm__ __volatile__ ("pushl 4(%1)\n\t"                                \
+                           "pushl (%1)\n\t"                                 \
+                           "movl (%2), %%edx\n\t"                           \
+                           "call *"#funcOffset"(%%edx);\n\t"                \
+                           : "=a"(resultName) /* Output Operands */         \
+                           : "r"(param1f64Ptr),  /* Input Operands */       \
+                           "c"(thisPtr),                                    \
+                           "m"(*param1f64Ptr) /* Using address */           \
+                           : "%edx" /* Clobbered Registers */               \
+                           );                                               \
+    } while (0);                                                            \
+
+
+#define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 )  \
+    __asm__ __volatile__ ("pushl %1\n\t"                                    \
+                          "pushl %2\n\t"                                    \
+                          "movl (%3), %%edx\n\t"                            \
+                          "call *"#funcOffset"(%%edx)\n\t"                  \
+                          :"=a"(resultName) /* Output Operands */           \
+                          :"r"(param2),     /* Input Operands */            \
+                           "r"(param1),                                     \
+                           "c"(thisPtr)                                     \
+                          : "%edx" /* Clobbered Registers */                \
+                          );                                                \
+
+
+#define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\
+    __asm__ __volatile__ ("pushl %1\n\t"                                    \
+                          "pushl %2\n\t"                                    \
+                          "pushl %3\n\t"                                    \
+                          "pushl %4\n\t"                                    \
+                          "movl (%5), %%edx\n\t"                            \
+                          "call *"#funcOffset"(%%edx)\n\t"                  \
+                          :"=a"(resultName) /* Output Operands */           \
+                          :"r"(param4),     /* Input Operands  */           \
+                           "r"(param3),                                     \
+                           "r"(param2),                                     \
+                           "r"(param1),                                     \
+                           "c"(thisPtr)                                     \
+                          : "%edx" /* Clobbered Registers */                \
+                          );                                                \
+
+#endif
+
+
+
+// Our static singleton instance.
+IASIOThiscallResolver IASIOThiscallResolver::instance;
+
+// Constructor called to initialize static Singleton instance above. Note that
+// it is important not to clear that_ incase it has already been set by the call
+// to placement new in ASIOInit().
+IASIOThiscallResolver::IASIOThiscallResolver()
+{
+}
+
+// Constructor called from ASIOInit() below
+IASIOThiscallResolver::IASIOThiscallResolver(IASIO* that)
+: that_( that )
+{
+}
+
+// Implement IUnknown methods as assert(false). IASIOThiscallResolver is not
+// really a COM object, just a wrapper which will work with the ASIO SDK.
+// If you wanted to use ASIO without the SDK you might want to implement COM
+// aggregation in these methods.
+HRESULT STDMETHODCALLTYPE IASIOThiscallResolver::QueryInterface(REFIID riid, void **ppv)
+{
+    (void)riid;     // suppress unused variable warning
+
+    assert( false ); // this function should never be called by the ASIO SDK.
+
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+ULONG STDMETHODCALLTYPE IASIOThiscallResolver::AddRef()
+{
+    assert( false ); // this function should never be called by the ASIO SDK.
+
+    return 1;
+}
+
+ULONG STDMETHODCALLTYPE IASIOThiscallResolver::Release()
+{
+    assert( false ); // this function should never be called by the ASIO SDK.
+    
+    return 1;
+}
+
+
+// Implement the IASIO interface methods by performing the vptr manipulation
+// described above then delegating to the real implementation.
+ASIOBool IASIOThiscallResolver::init(void *sysHandle)
+{
+    ASIOBool result;
+    CALL_THISCALL_1( result, that_, 12, sysHandle );
+    return result;
+}
+
+void IASIOThiscallResolver::getDriverName(char *name)
+{
+    CALL_VOID_THISCALL_1( that_, 16, name );
+}
+
+long IASIOThiscallResolver::getDriverVersion()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 20 );
+    return result;
+}
+
+void IASIOThiscallResolver::getErrorMessage(char *string)
+{
+     CALL_VOID_THISCALL_1( that_, 24, string );
+}
+
+ASIOError IASIOThiscallResolver::start()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 28 );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::stop()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 32 );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getChannels(long *numInputChannels, long *numOutputChannels)
+{
+    ASIOBool result;
+    CALL_THISCALL_2( result, that_, 36, numInputChannels, numOutputChannels );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getLatencies(long *inputLatency, long *outputLatency)
+{
+    ASIOBool result;
+    CALL_THISCALL_2( result, that_, 40, inputLatency, outputLatency );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getBufferSize(long *minSize, long *maxSize,
+        long *preferredSize, long *granularity)
+{
+    ASIOBool result;
+    CALL_THISCALL_4( result, that_, 44, minSize, maxSize, preferredSize, granularity );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::canSampleRate(ASIOSampleRate sampleRate)
+{
+    ASIOBool result;
+    CALL_THISCALL_1_DOUBLE( result, that_, 48, sampleRate );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getSampleRate(ASIOSampleRate *sampleRate)
+{
+    ASIOBool result;
+    CALL_THISCALL_1( result, that_, 52, sampleRate );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::setSampleRate(ASIOSampleRate sampleRate)
+{    
+    ASIOBool result;
+    CALL_THISCALL_1_DOUBLE( result, that_, 56, sampleRate );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getClockSources(ASIOClockSource *clocks, long *numSources)
+{
+    ASIOBool result;
+    CALL_THISCALL_2( result, that_, 60, clocks, numSources );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::setClockSource(long reference)
+{
+    ASIOBool result;
+    CALL_THISCALL_1( result, that_, 64, reference );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp)
+{
+    ASIOBool result;
+    CALL_THISCALL_2( result, that_, 68, sPos, tStamp );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::getChannelInfo(ASIOChannelInfo *info)
+{
+    ASIOBool result;
+    CALL_THISCALL_1( result, that_, 72, info );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::createBuffers(ASIOBufferInfo *bufferInfos,
+        long numChannels, long bufferSize, ASIOCallbacks *callbacks)
+{
+    ASIOBool result;
+    CALL_THISCALL_4( result, that_, 76, bufferInfos, numChannels, bufferSize, callbacks );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::disposeBuffers()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 80 );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::controlPanel()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 84 );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::future(long selector,void *opt)
+{
+    ASIOBool result;
+    CALL_THISCALL_2( result, that_, 88, selector, opt );
+    return result;
+}
+
+ASIOError IASIOThiscallResolver::outputReady()
+{
+    ASIOBool result;
+    CALL_THISCALL_0( result, that_, 92 );
+    return result;
+}
+
+
+// Implement our substitute ASIOInit() method
+ASIOError IASIOThiscallResolver::ASIOInit(ASIODriverInfo *info)
+{
+    // To ensure that our instance's vptr is correctly constructed, even if
+    // ASIOInit is called prior to main(), we explicitly call its constructor
+    // (potentially over the top of an existing instance). Note that this is
+    // pretty ugly, and is only safe because IASIOThiscallResolver has no
+    // destructor and contains no objects with destructors.
+    new((void*)&instance) IASIOThiscallResolver( theAsioDriver );
+
+    // Interpose between ASIO client code and the real driver.
+    theAsioDriver = &instance;
+
+    // Note that we never need to switch theAsioDriver back to point to the
+    // real driver because theAsioDriver is reset to zero in ASIOExit().
+
+    // Delegate to the real ASIOInit
+	return ::ASIOInit(info);
+}
+
+
+#endif /* !defined(_MSC_VER) */
+
+#endif /* Win32 */
+
diff --git a/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.h
new file mode 100644
index 0000000000..21d53b3206
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/asio/iasiothiscallresolver.h
@@ -0,0 +1,197 @@
+// ****************************************************************************
+// File:			IASIOThiscallResolver.h
+// Description:     The IASIOThiscallResolver class implements the IASIO
+//					interface and acts as a proxy to the real IASIO interface by
+//                  calling through its vptr table using the thiscall calling
+//                  convention. To put it another way, we interpose
+//                  IASIOThiscallResolver between ASIO SDK code and the driver.
+//                  This is necessary because most non-Microsoft compilers don't
+//                  implement the thiscall calling convention used by IASIO.
+//
+//					iasiothiscallresolver.cpp contains the background of this
+//					problem plus a technical description of the vptr
+//                  manipulations.
+//
+//					In order to use this mechanism one simply has to add
+//					iasiothiscallresolver.cpp to the list of files to compile
+//                  and #include <iasiothiscallresolver.h>
+//
+//					Note that this #include must come after the other ASIO SDK
+//                  #includes, for example:
+//
+//					#include <windows.h>
+//					#include <asiosys.h>
+//					#include <asio.h>
+//					#include <asiodrivers.h>
+//					#include <iasiothiscallresolver.h>
+//
+//					Actually the important thing is to #include
+//                  <iasiothiscallresolver.h> after <asio.h>. We have
+//                  incorporated a test to enforce this ordering.
+//
+//					The code transparently takes care of the interposition by
+//                  using macro substitution to intercept calls to ASIOInit()
+//                  and ASIOExit(). We save the original ASIO global
+//                  "theAsioDriver" in our "that" variable, and then set
+//                  "theAsioDriver" to equal our IASIOThiscallResolver instance.
+//
+// 					Whilst this method of resolving the thiscall problem requires
+//					the addition of #include <iasiothiscallresolver.h> to client
+//                  code it has the advantage that it does not break the terms
+//                  of the ASIO licence by publishing it. We are NOT modifying
+//                  any Steinberg code here, we are merely implementing the IASIO
+//					interface in the same way that we would need to do if we
+//					wished to provide an open source ASIO driver.
+//
+//					For compilation with MinGW -lole32 needs to be added to the
+//                  linker options. For BORLAND, linking with Import32.lib is
+//                  sufficient.
+//
+//					The dependencies are with: CoInitialize, CoUninitialize,
+//					CoCreateInstance, CLSIDFromString - used by asiolist.cpp
+//					and are required on Windows whether ThiscallResolver is used
+//					or not.
+//
+//					Searching for the above strings in the root library path
+//					of your compiler should enable the correct libraries to be
+//					identified if they aren't immediately obvious.
+//
+//                  Note that the current implementation of IASIOThiscallResolver
+//                  is not COM compliant - it does not correctly implement the
+//                  IUnknown interface. Implementing it is not necessary because
+//                  it is not called by parts of the ASIO SDK which call through
+//                  theAsioDriver ptr. The IUnknown methods are implemented as
+//                  assert(false) to ensure that the code fails if they are
+//                  ever called.
+// Restrictions:	None. Public Domain & Open Source distribute freely
+//					You may use IASIOThiscallResolver commercially as well as
+//                  privately.
+//					You the user assume the responsibility for the use of the
+//					files, binary or text, and there is no guarantee or warranty,
+//					expressed or implied, including but not limited to the
+//					implied warranties of merchantability and fitness for a
+//					particular purpose. You assume all responsibility and agree
+//					to hold no entity, copyright holder or distributors liable
+//					for any loss of data or inaccurate representations of data
+//					as a result of using IASIOThiscallResolver.
+// Version:         1.4 Added separate macro CALL_THISCALL_1_DOUBLE from
+//                  Andrew Baldwin, and volatile for whole gcc asm blocks,
+//                  both for compatibility with newer gcc versions. Cleaned up
+//                  Borland asm to use one less register.
+//                  1.3 Switched to including assert.h for better compatibility.
+//                  Wrapped entire .h and .cpp contents with a check for
+//                  _MSC_VER to provide better compatibility with MS compilers.
+//                  Changed Singleton implementation to use static instance
+//                  instead of freestore allocated instance. Removed ASIOExit
+//                  macro as it is no longer needed.
+//                  1.2 Removed semicolons from ASIOInit and ASIOExit macros to
+//                  allow them to be embedded in expressions (if statements).
+//                  Cleaned up some comments. Removed combase.c dependency (it
+//                  doesn't compile with BCB anyway) by stubbing IUnknown.
+//                  1.1 Incorporated comments from Ross Bencina including things
+//					such as changing name from ThiscallResolver to
+//					IASIOThiscallResolver, tidying up the constructor, fixing
+//					a bug in IASIOThiscallResolver::ASIOExit() and improving
+//					portability through the use of conditional compilation
+//					1.0 Initial working version.
+// Created:			6/09/2003
+// Authors:         Fraser Adams
+//                  Ross Bencina
+//                  Rene G. Ceballos
+//                  Martin Fay
+//                  Antti Silvast
+//                  Andrew Baldwin
+//
+// ****************************************************************************
+
+
+#ifndef included_iasiothiscallresolver_h
+#define included_iasiothiscallresolver_h
+
+// We only need IASIOThiscallResolver at all if we are on Win32. For other
+// platforms we simply bypass the IASIOThiscallResolver definition to allow us
+// to be safely #include'd whatever the platform to keep client code portable
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) && !defined(_WIN64)
+
+
+// If microsoft compiler we can call IASIO directly so IASIOThiscallResolver
+// is not used.
+#if !defined(_MSC_VER)
+
+
+// The following is in order to ensure that this header is only included after
+// the other ASIO headers (except for the case of iasiothiscallresolver.cpp).
+// We need to do this because IASIOThiscallResolver works by eclipsing the
+// original definition of ASIOInit() with a macro (see below).
+#if !defined(iasiothiscallresolver_sourcefile)
+	#if !defined(__ASIO_H)
+	#error iasiothiscallresolver.h must be included AFTER asio.h
+	#endif
+#endif
+
+#include <windows.h>
+#include <asiodrvr.h> /* From ASIO SDK */
+
+
+class IASIOThiscallResolver : public IASIO {
+private:
+	IASIO* that_; // Points to the real IASIO
+
+	static IASIOThiscallResolver instance; // Singleton instance
+
+	// Constructors - declared private so construction is limited to
+    // our Singleton instance
+    IASIOThiscallResolver();
+	IASIOThiscallResolver(IASIO* that);
+public:
+
+    // Methods from the IUnknown interface. We don't fully implement IUnknown
+    // because the ASIO SDK never calls these methods through theAsioDriver ptr.
+    // These methods are implemented as assert(false).
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppv);
+    virtual ULONG STDMETHODCALLTYPE AddRef();
+    virtual ULONG STDMETHODCALLTYPE Release();
+
+    // Methods from the IASIO interface, implemented as forwarning calls to that.
+	virtual ASIOBool init(void *sysHandle);
+	virtual void getDriverName(char *name);
+	virtual long getDriverVersion();
+	virtual void getErrorMessage(char *string);
+	virtual ASIOError start();
+	virtual ASIOError stop();
+	virtual ASIOError getChannels(long *numInputChannels, long *numOutputChannels);
+	virtual ASIOError getLatencies(long *inputLatency, long *outputLatency);
+	virtual ASIOError getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity);
+	virtual ASIOError canSampleRate(ASIOSampleRate sampleRate);
+	virtual ASIOError getSampleRate(ASIOSampleRate *sampleRate);
+	virtual ASIOError setSampleRate(ASIOSampleRate sampleRate);
+	virtual ASIOError getClockSources(ASIOClockSource *clocks, long *numSources);
+	virtual ASIOError setClockSource(long reference);
+	virtual ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp);
+	virtual ASIOError getChannelInfo(ASIOChannelInfo *info);
+	virtual ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks);
+	virtual ASIOError disposeBuffers();
+	virtual ASIOError controlPanel();
+	virtual ASIOError future(long selector,void *opt);
+	virtual ASIOError outputReady();
+
+    // Class method, see ASIOInit() macro below.
+    static ASIOError ASIOInit(ASIODriverInfo *info); // Delegates to ::ASIOInit
+};
+
+
+// Replace calls to ASIOInit with our interposing version.
+// This macro enables us to perform thiscall resolution simply by #including
+// <iasiothiscallresolver.h> after the asio #includes (this file _must_ be
+// included _after_ the asio #includes)
+
+#define ASIOInit(name) IASIOThiscallResolver::ASIOInit((name))
+
+
+#endif /* !defined(_MSC_VER) */
+
+#endif /* Win32 */
+
+#endif /* included_iasiothiscallresolver_h */
+
+
diff --git a/Externals/portaudio/src/hostapi/asio/pa_asio.cpp b/Externals/portaudio/src/hostapi/asio/pa_asio.cpp
new file mode 100644
index 0000000000..28eee9dbb5
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/asio/pa_asio.cpp
@@ -0,0 +1,4214 @@
+/*
+ * $Id: pa_asio.cpp 1778 2011-11-10 13:59:53Z rossb $
+ * Portable Audio I/O Library for ASIO Drivers
+ *
+ * Author: Stephane Letz
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 2000-2002 Stephane Letz, Phil Burk, Ross Bencina
+ * Blocking i/o implementation by Sven Fischer, Institute of Hearing
+ * Technology and Audiology (www.hoertechnik-audiologie.de)
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/* Modification History
+
+        08-03-01 First version : Stephane Letz
+        08-06-01 Tweaks for PC, use C++, buffer allocation, Float32 to Int32 conversion : Phil Burk
+        08-20-01 More conversion, PA_StreamTime, Pa_GetHostError : Stephane Letz
+        08-21-01 PaUInt8 bug correction, implementation of ASIOSTFloat32LSB and ASIOSTFloat32MSB native formats : Stephane Letz
+        08-24-01 MAX_INT32_FP hack, another Uint8 fix : Stephane and Phil
+        08-27-01 Implementation of hostBufferSize < userBufferSize case, better management of the ouput buffer when
+                 the stream is stopped : Stephane Letz
+        08-28-01 Check the stream pointer for null in bufferSwitchTimeInfo, correct bug in bufferSwitchTimeInfo when
+                 the stream is stopped : Stephane Letz
+        10-12-01 Correct the PaHost_CalcNumHostBuffers function: computes FramesPerHostBuffer to be the lowest that
+                 respect requested FramesPerUserBuffer and userBuffersPerHostBuffer : Stephane Letz
+        10-26-01 Management of hostBufferSize and userBufferSize of any size : Stephane Letz
+        10-27-01 Improve calculus of hostBufferSize to be multiple or divisor of userBufferSize if possible : Stephane and Phil
+        10-29-01 Change MAX_INT32_FP to (2147483520.0f) to prevent roundup to 0x80000000 : Phil Burk
+        10-31-01 Clear the ouput buffer and user buffers in PaHost_StartOutput, correct bug in GetFirstMultiple : Stephane Letz
+        11-06-01 Rename functions : Stephane Letz
+        11-08-01 New Pa_ASIO_Adaptor_Init function to init Callback adpatation variables, cleanup of Pa_ASIO_Callback_Input: Stephane Letz
+        11-29-01 Break apart device loading to debug random failure in Pa_ASIO_QueryDeviceInfo ; Phil Burk
+        01-03-02 Desallocate all resources in PaHost_Term for cases where Pa_CloseStream is not called properly :  Stephane Letz
+        02-01-02 Cleanup, test of multiple-stream opening : Stephane Letz
+        19-02-02 New Pa_ASIO_loadDriver that calls CoInitialize on each thread on Windows : Stephane Letz
+        09-04-02 Correct error code management in PaHost_Term, removes various compiler warning : Stephane Letz
+        12-04-02 Add Mac includes for <Devices.h> and <Timer.h> : Phil Burk
+        13-04-02 Removes another compiler warning : Stephane Letz
+        30-04-02 Pa_ASIO_QueryDeviceInfo bug correction, memory allocation checking, better error handling : D Viens, P Burk, S Letz
+        12-06-02 Rehashed into new multi-api infrastructure, added support for all ASIO sample formats : Ross Bencina
+        18-06-02 Added pa_asio.h, PaAsio_GetAvailableLatencyValues() : Ross B.
+        21-06-02 Added SelectHostBufferSize() which selects host buffer size based on user latency parameters : Ross Bencina
+        ** NOTE  maintanance history is now stored in CVS **
+*/
+
+/** @file
+    @ingroup hostapi_src
+
+    Note that specific support for paInputUnderflow, paOutputOverflow and
+    paNeverDropInput is not necessary or possible with this driver due to the
+    synchronous full duplex double-buffered architecture of ASIO.
+*/
+
+
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+//#include <values.h>
+#include <new>
+
+#include <windows.h>
+#include <mmsystem.h>
+
+#include "portaudio.h"
+#include "pa_asio.h"
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_debugprint.h"
+#include "pa_ringbuffer.h"
+
+#include "pa_win_coinitialize.h"
+
+/* This version of pa_asio.cpp is currently only targetted at Win32,
+   It would require a few tweaks to work with pre-OS X Macintosh.
+   To make configuration easier, we define WIN32 here to make sure
+   that the ASIO SDK knows this is Win32.
+*/
+#ifndef WIN32
+#define WIN32
+#endif
+
+#include "asiosys.h"
+#include "asio.h"
+#include "asiodrivers.h"
+#include "iasiothiscallresolver.h"
+
+/*
+#if MAC
+#include <Devices.h>
+#include <Timer.h>
+#include <Math64.h>
+#else
+*/
+/*
+#include <math.h>
+#include <windows.h>
+#include <mmsystem.h>
+*/
+/*
+#endif
+*/
+
+
+/* winmm.lib is needed for timeGetTime() (this is in winmm.a if you're using gcc) */
+#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+#pragma comment(lib, "winmm.lib")
+#endif
+
+
+/* external reference to ASIO SDK's asioDrivers.
+
+ This is a bit messy because we want to explicitly manage 
+ allocation/deallocation of this structure, but some layers of the SDK 
+ which we currently use (eg the implementation in asio.cpp) still
+ use this global version.
+
+ For now we keep it in sync with our local instance in the host
+ API representation structure, but later we should be able to remove
+ all dependence on it.
+*/
+extern AsioDrivers* asioDrivers;
+
+
+/* We are trying to be compatible with CARBON but this has not been thoroughly tested. */
+/* not tested at all since new V19 code was introduced. */
+#define CARBON_COMPATIBLE  (0)
+
+
+/* prototypes for functions declared in this file */
+
+extern "C" PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex );
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+/* Blocking i/o callback function. */
+static int BlockingIoPaCallback(const void                     *inputBuffer    ,
+                                      void                     *outputBuffer   ,
+                                      unsigned long             framesPerBuffer,
+                                const PaStreamCallbackTimeInfo *timeInfo       ,
+                                      PaStreamCallbackFlags     statusFlags    ,
+                                      void                     *userData       );
+
+/* our ASIO callback functions */
+
+static void bufferSwitch(long index, ASIOBool processNow);
+static ASIOTime *bufferSwitchTimeInfo(ASIOTime *timeInfo, long index, ASIOBool processNow);
+static void sampleRateChanged(ASIOSampleRate sRate);
+static long asioMessages(long selector, long value, void* message, double* opt);
+
+static ASIOCallbacks asioCallbacks_ =
+    { bufferSwitch, sampleRateChanged, asioMessages, bufferSwitchTimeInfo };
+
+
+#define PA_ASIO_SET_LAST_HOST_ERROR( errorCode, errorText ) \
+    PaUtil_SetLastHostErrorInfo( paASIO, errorCode, errorText )
+
+
+static void PaAsio_SetLastSystemError( DWORD errorCode )
+{
+    LPVOID lpMsgBuf;
+    FormatMessage(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+        NULL,
+        errorCode,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPTSTR) &lpMsgBuf,
+        0,
+        NULL
+    );
+    PaUtil_SetLastHostErrorInfo( paASIO, errorCode, (const char*)lpMsgBuf );
+    LocalFree( lpMsgBuf );
+}
+
+#define PA_ASIO_SET_LAST_SYSTEM_ERROR( errorCode ) \
+    PaAsio_SetLastSystemError( errorCode )
+
+
+static const char* PaAsio_GetAsioErrorText( ASIOError asioError )
+{
+    const char *result;
+
+    switch( asioError ){
+        case ASE_OK:
+        case ASE_SUCCESS:           result = "Success"; break;
+        case ASE_NotPresent:        result = "Hardware input or output is not present or available"; break;
+        case ASE_HWMalfunction:     result = "Hardware is malfunctioning"; break;
+        case ASE_InvalidParameter:  result = "Input parameter invalid"; break;
+        case ASE_InvalidMode:       result = "Hardware is in a bad mode or used in a bad mode"; break;
+        case ASE_SPNotAdvancing:    result = "Hardware is not running when sample position is inquired"; break;
+        case ASE_NoClock:           result = "Sample clock or rate cannot be determined or is not present"; break;
+        case ASE_NoMemory:          result = "Not enough memory for completing the request"; break;
+        default:                    result = "Unknown ASIO error"; break;
+    }
+
+    return result;
+}
+
+
+#define PA_ASIO_SET_LAST_ASIO_ERROR( asioError ) \
+    PaUtil_SetLastHostErrorInfo( paASIO, asioError, PaAsio_GetAsioErrorText( asioError ) )
+
+
+
+
+// Atomic increment and decrement operations
+#if MAC
+    /* need to be implemented on Mac */
+    inline long PaAsio_AtomicIncrement(volatile long* v) {return ++(*const_cast<long*>(v));}
+    inline long PaAsio_AtomicDecrement(volatile long* v) {return --(*const_cast<long*>(v));}
+#elif WINDOWS
+    inline long PaAsio_AtomicIncrement(volatile long* v) {return InterlockedIncrement(const_cast<long*>(v));}
+    inline long PaAsio_AtomicDecrement(volatile long* v) {return InterlockedDecrement(const_cast<long*>(v));}
+#endif
+
+
+
+typedef struct PaAsioDriverInfo
+{
+    ASIODriverInfo asioDriverInfo;
+    long inputChannelCount, outputChannelCount;
+    long bufferMinSize, bufferMaxSize, bufferPreferredSize, bufferGranularity;
+    bool postOutput;
+}
+PaAsioDriverInfo;
+
+
+/* PaAsioHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    PaWinUtilComInitializationResult comInitializationResult;
+
+    AsioDrivers *asioDrivers;
+    void *systemSpecific;
+    
+    /* the ASIO C API only allows one ASIO driver to be open at a time,
+        so we keep track of whether we have the driver open here, and
+        use this information to return errors from OpenStream if the
+        driver is already open.
+
+        openAsioDeviceIndex will be PaNoDevice if there is no device open
+        and a valid pa_asio (not global) device index otherwise.
+
+        openAsioDriverInfo is populated with the driver info for the
+        currently open device (if any)
+    */
+    PaDeviceIndex openAsioDeviceIndex;
+    PaAsioDriverInfo openAsioDriverInfo;
+}
+PaAsioHostApiRepresentation;
+
+
+/*
+    Retrieve <driverCount> driver names from ASIO, returned in a char**
+    allocated in <group>.
+*/
+static char **GetAsioDriverNames( PaAsioHostApiRepresentation *asioHostApi, PaUtilAllocationGroup *group, long driverCount )
+{
+    char **result = 0;
+    int i;
+
+    result =(char**)PaUtil_GroupAllocateMemory(
+            group, sizeof(char*) * driverCount );
+    if( !result )
+        goto error;
+
+    result[0] = (char*)PaUtil_GroupAllocateMemory(
+            group, 32 * driverCount );
+    if( !result[0] )
+        goto error;
+
+    for( i=0; i<driverCount; ++i )
+        result[i] = result[0] + (32 * i);
+
+    asioHostApi->asioDrivers->getDriverNames( result, driverCount );
+
+error:
+    return result;
+}
+
+
+static PaSampleFormat AsioSampleTypeToPaNativeSampleFormat(ASIOSampleType type)
+{
+    switch (type) {
+        case ASIOSTInt16MSB:
+        case ASIOSTInt16LSB:
+                return paInt16;
+
+        case ASIOSTFloat32MSB:
+        case ASIOSTFloat32LSB:
+        case ASIOSTFloat64MSB:
+        case ASIOSTFloat64LSB:
+                return paFloat32;
+
+        case ASIOSTInt32MSB:
+        case ASIOSTInt32LSB:
+        case ASIOSTInt32MSB16:
+        case ASIOSTInt32LSB16:
+        case ASIOSTInt32MSB18:
+        case ASIOSTInt32MSB20:
+        case ASIOSTInt32MSB24:
+        case ASIOSTInt32LSB18:
+        case ASIOSTInt32LSB20:
+        case ASIOSTInt32LSB24:
+                return paInt32;
+
+        case ASIOSTInt24MSB:
+        case ASIOSTInt24LSB:
+                return paInt24;
+
+        default:
+                return paCustomFormat;
+    }
+}
+
+void AsioSampleTypeLOG(ASIOSampleType type)
+{
+    switch (type) {
+        case ASIOSTInt16MSB:  PA_DEBUG(("ASIOSTInt16MSB\n"));  break;
+        case ASIOSTInt16LSB:  PA_DEBUG(("ASIOSTInt16LSB\n"));  break;
+        case ASIOSTFloat32MSB:PA_DEBUG(("ASIOSTFloat32MSB\n"));break;
+        case ASIOSTFloat32LSB:PA_DEBUG(("ASIOSTFloat32LSB\n"));break;
+        case ASIOSTFloat64MSB:PA_DEBUG(("ASIOSTFloat64MSB\n"));break;
+        case ASIOSTFloat64LSB:PA_DEBUG(("ASIOSTFloat64LSB\n"));break;
+        case ASIOSTInt32MSB:  PA_DEBUG(("ASIOSTInt32MSB\n"));  break;
+        case ASIOSTInt32LSB:  PA_DEBUG(("ASIOSTInt32LSB\n"));  break;
+        case ASIOSTInt32MSB16:PA_DEBUG(("ASIOSTInt32MSB16\n"));break;
+        case ASIOSTInt32LSB16:PA_DEBUG(("ASIOSTInt32LSB16\n"));break;
+        case ASIOSTInt32MSB18:PA_DEBUG(("ASIOSTInt32MSB18\n"));break;
+        case ASIOSTInt32MSB20:PA_DEBUG(("ASIOSTInt32MSB20\n"));break;
+        case ASIOSTInt32MSB24:PA_DEBUG(("ASIOSTInt32MSB24\n"));break;
+        case ASIOSTInt32LSB18:PA_DEBUG(("ASIOSTInt32LSB18\n"));break;
+        case ASIOSTInt32LSB20:PA_DEBUG(("ASIOSTInt32LSB20\n"));break;
+        case ASIOSTInt32LSB24:PA_DEBUG(("ASIOSTInt32LSB24\n"));break;
+        case ASIOSTInt24MSB:  PA_DEBUG(("ASIOSTInt24MSB\n"));  break;
+        case ASIOSTInt24LSB:  PA_DEBUG(("ASIOSTInt24LSB\n"));  break;
+        default:              PA_DEBUG(("Custom Format%d\n",type));break;
+
+    }
+}
+
+static int BytesPerAsioSample( ASIOSampleType sampleType )
+{
+    switch (sampleType) {
+        case ASIOSTInt16MSB:
+        case ASIOSTInt16LSB:
+            return 2;
+
+        case ASIOSTFloat64MSB:
+        case ASIOSTFloat64LSB:
+            return 8;
+
+        case ASIOSTFloat32MSB:
+        case ASIOSTFloat32LSB:
+        case ASIOSTInt32MSB:
+        case ASIOSTInt32LSB:
+        case ASIOSTInt32MSB16:
+        case ASIOSTInt32LSB16:
+        case ASIOSTInt32MSB18:
+        case ASIOSTInt32MSB20:
+        case ASIOSTInt32MSB24:
+        case ASIOSTInt32LSB18:
+        case ASIOSTInt32LSB20:
+        case ASIOSTInt32LSB24:
+            return 4;
+
+        case ASIOSTInt24MSB:
+        case ASIOSTInt24LSB:
+            return 3;
+
+        default:
+            return 0;
+    }
+}
+
+
+static void Swap16( void *buffer, long shift, long count )
+{
+    unsigned short *p = (unsigned short*)buffer;
+    unsigned short temp;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+    {
+        temp = *p;
+        *p++ = (unsigned short)((temp<<8) | (temp>>8));
+    }
+}
+
+static void Swap24( void *buffer, long shift, long count )
+{
+    unsigned char *p = (unsigned char*)buffer;
+    unsigned char temp;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+    {
+        temp = *p;
+        *p = *(p+2);
+        *(p+2) = temp;
+        p += 3;
+    }
+}
+
+#define PA_SWAP32_( x ) ((x>>24) | ((x>>8)&0xFF00) | ((x<<8)&0xFF0000) | (x<<24));
+
+static void Swap32( void *buffer, long shift, long count )
+{
+    unsigned long *p = (unsigned long*)buffer;
+    unsigned long temp;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+    {
+        temp = *p;
+        *p++ = PA_SWAP32_( temp);
+    }
+}
+
+static void SwapShiftLeft32( void *buffer, long shift, long count )
+{
+    unsigned long *p = (unsigned long*)buffer;
+    unsigned long temp;
+
+    while( count-- )
+    {
+        temp = *p;
+        temp = PA_SWAP32_( temp);
+        *p++ = temp << shift;
+    }
+}
+
+static void ShiftRightSwap32( void *buffer, long shift, long count )
+{
+    unsigned long *p = (unsigned long*)buffer;
+    unsigned long temp;
+
+    while( count-- )
+    {
+        temp = *p >> shift;
+        *p++ = PA_SWAP32_( temp);
+    }
+}
+
+static void ShiftLeft32( void *buffer, long shift, long count )
+{
+    unsigned long *p = (unsigned long*)buffer;
+    unsigned long temp;
+
+    while( count-- )
+    {
+        temp = *p;
+        *p++ = temp << shift;
+    }
+}
+
+static void ShiftRight32( void *buffer, long shift, long count )
+{
+    unsigned long *p = (unsigned long*)buffer;
+    unsigned long temp;
+
+    while( count-- )
+    {
+        temp = *p;
+        *p++ = temp >> shift;
+    }
+}
+
+#define PA_SWAP_( x, y ) temp=x; x = y; y = temp;
+
+static void Swap64ConvertFloat64ToFloat32( void *buffer, long shift, long count )
+{
+    double *in = (double*)buffer;
+    float *out = (float*)buffer;
+    unsigned char *p;
+    unsigned char temp;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+    {
+        p = (unsigned char*)in;
+        PA_SWAP_( p[0], p[7] );
+        PA_SWAP_( p[1], p[6] );
+        PA_SWAP_( p[2], p[5] );
+        PA_SWAP_( p[3], p[4] );
+
+        *out++ = (float) (*in++);
+    }
+}
+
+static void ConvertFloat64ToFloat32( void *buffer, long shift, long count )
+{
+    double *in = (double*)buffer;
+    float *out = (float*)buffer;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+        *out++ = (float) (*in++);
+}
+
+static void ConvertFloat32ToFloat64Swap64( void *buffer, long shift, long count )
+{
+    float *in = ((float*)buffer) + (count-1);
+    double *out = ((double*)buffer) + (count-1);
+    unsigned char *p;
+    unsigned char temp;
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+    {
+        *out = *in--;
+
+        p = (unsigned char*)out;
+        PA_SWAP_( p[0], p[7] );
+        PA_SWAP_( p[1], p[6] );
+        PA_SWAP_( p[2], p[5] );
+        PA_SWAP_( p[3], p[4] );
+
+        out--;
+    }
+}
+
+static void ConvertFloat32ToFloat64( void *buffer, long shift, long count )
+{
+    float *in = ((float*)buffer) + (count-1);
+    double *out = ((double*)buffer) + (count-1);
+    (void) shift; /* unused parameter */
+
+    while( count-- )
+        *out-- = *in--;
+}
+
+#ifdef MAC
+#define PA_MSB_IS_NATIVE_
+#undef PA_LSB_IS_NATIVE_
+#endif
+
+#ifdef WINDOWS
+#undef PA_MSB_IS_NATIVE_
+#define PA_LSB_IS_NATIVE_
+#endif
+
+typedef void PaAsioBufferConverter( void *, long, long );
+
+static void SelectAsioToPaConverter( ASIOSampleType type, PaAsioBufferConverter **converter, long *shift )
+{
+    *shift = 0;
+    *converter = 0;
+
+    switch (type) {
+        case ASIOSTInt16MSB:
+            /* dest: paInt16, no conversion necessary, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap16;
+            #endif
+            break;
+        case ASIOSTInt16LSB:
+            /* dest: paInt16, no conversion necessary, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap16;
+            #endif
+            break;
+        case ASIOSTFloat32MSB:
+            /* dest: paFloat32, no conversion necessary, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTFloat32LSB:
+            /* dest: paFloat32, no conversion necessary, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTFloat64MSB:
+            /* dest: paFloat32, in-place conversion to/from float32, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap64ConvertFloat64ToFloat32;
+            #else
+                *converter = ConvertFloat64ToFloat32;
+            #endif
+            break;
+        case ASIOSTFloat64LSB:
+            /* dest: paFloat32, in-place conversion to/from float32, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap64ConvertFloat64ToFloat32;
+            #else
+                *converter = ConvertFloat64ToFloat32;
+            #endif
+            break;
+        case ASIOSTInt32MSB:
+            /* dest: paInt32, no conversion necessary, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTInt32LSB:
+            /* dest: paInt32, no conversion necessary, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTInt32MSB16:
+            /* dest: paInt32, 16 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 16;
+            break;
+        case ASIOSTInt32MSB18:
+            /* dest: paInt32, 14 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 14;
+            break;
+        case ASIOSTInt32MSB20:
+            /* dest: paInt32, 12 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 12;
+            break;
+        case ASIOSTInt32MSB24:
+            /* dest: paInt32, 8 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 8;
+            break;
+        case ASIOSTInt32LSB16:
+            /* dest: paInt32, 16 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 16;
+            break;
+        case ASIOSTInt32LSB18:
+            /* dest: paInt32, 14 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 14;
+            break;
+        case ASIOSTInt32LSB20:
+            /* dest: paInt32, 12 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 12;
+            break;
+        case ASIOSTInt32LSB24:
+            /* dest: paInt32, 8 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = SwapShiftLeft32;
+            #else
+                *converter = ShiftLeft32;
+            #endif
+            *shift = 8;
+            break;
+        case ASIOSTInt24MSB:
+            /* dest: paInt24, no conversion necessary, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap24;
+            #endif
+            break;
+        case ASIOSTInt24LSB:
+            /* dest: paInt24, no conversion necessary, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap24;
+            #endif
+            break;
+    }
+}
+
+
+static void SelectPaToAsioConverter( ASIOSampleType type, PaAsioBufferConverter **converter, long *shift )
+{
+    *shift = 0;
+    *converter = 0;
+
+    switch (type) {
+        case ASIOSTInt16MSB:
+            /* src: paInt16, no conversion necessary, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap16;
+            #endif
+            break;
+        case ASIOSTInt16LSB:
+            /* src: paInt16, no conversion necessary, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap16;
+            #endif
+            break;
+        case ASIOSTFloat32MSB:
+            /* src: paFloat32, no conversion necessary, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTFloat32LSB:
+            /* src: paFloat32, no conversion necessary, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTFloat64MSB:
+            /* src: paFloat32, in-place conversion to/from float32, possible byte swap*/
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = ConvertFloat32ToFloat64Swap64;
+            #else
+                *converter = ConvertFloat32ToFloat64;
+            #endif
+            break;
+        case ASIOSTFloat64LSB:
+            /* src: paFloat32, in-place conversion to/from float32, possible byte swap*/
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = ConvertFloat32ToFloat64Swap64;
+            #else
+                *converter = ConvertFloat32ToFloat64;
+            #endif
+            break;
+        case ASIOSTInt32MSB:
+            /* src: paInt32, no conversion necessary, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTInt32LSB:
+            /* src: paInt32, no conversion necessary, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap32;
+            #endif
+            break;
+        case ASIOSTInt32MSB16:
+            /* src: paInt32, 16 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 16;
+            break;
+        case ASIOSTInt32MSB18:
+            /* src: paInt32, 14 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 14;
+            break;
+        case ASIOSTInt32MSB20:
+            /* src: paInt32, 12 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 12;
+            break;
+        case ASIOSTInt32MSB24:
+            /* src: paInt32, 8 bit shift, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 8;
+            break;
+        case ASIOSTInt32LSB16:
+            /* src: paInt32, 16 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 16;
+            break;
+        case ASIOSTInt32LSB18:
+            /* src: paInt32, 14 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 14;
+            break;
+        case ASIOSTInt32LSB20:
+            /* src: paInt32, 12 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 12;
+            break;
+        case ASIOSTInt32LSB24:
+            /* src: paInt32, 8 bit shift, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = ShiftRightSwap32;
+            #else
+                *converter = ShiftRight32;
+            #endif
+            *shift = 8;
+            break;
+        case ASIOSTInt24MSB:
+            /* src: paInt24, no conversion necessary, possible byte swap */
+            #ifdef PA_LSB_IS_NATIVE_
+                *converter = Swap24;
+            #endif
+            break;
+        case ASIOSTInt24LSB:
+            /* src: paInt24, no conversion necessary, possible byte swap */
+            #ifdef PA_MSB_IS_NATIVE_
+                *converter = Swap24;
+            #endif
+            break;
+    }
+}
+
+
+typedef struct PaAsioDeviceInfo
+{
+    PaDeviceInfo commonDeviceInfo;
+    long minBufferSize;
+    long maxBufferSize;
+    long preferredBufferSize;
+    long bufferGranularity;
+
+    ASIOChannelInfo *asioChannelInfos;
+}
+PaAsioDeviceInfo;
+
+
+PaError PaAsio_GetAvailableBufferSizes( PaDeviceIndex device,
+        long *minBufferSizeFrames, long *maxBufferSizeFrames, long *preferredBufferSizeFrames, long *granularity )
+{
+    PaError result;
+    PaUtilHostApiRepresentation *hostApi;
+    PaDeviceIndex hostApiDevice;
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
+
+    if( result == paNoError )
+    {
+        result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
+
+        if( result == paNoError )
+        {
+            PaAsioDeviceInfo *asioDeviceInfo =
+                    (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
+
+            *minBufferSizeFrames = asioDeviceInfo->minBufferSize;
+            *maxBufferSizeFrames = asioDeviceInfo->maxBufferSize;
+            *preferredBufferSizeFrames = asioDeviceInfo->preferredBufferSize;
+            *granularity = asioDeviceInfo->bufferGranularity;
+        }
+    }
+
+    return result;
+}
+
+/* Unload whatever we loaded in LoadAsioDriver().
+*/
+static void UnloadAsioDriver( void )
+{
+	ASIOExit();
+}
+
+/*
+    load the asio driver named by <driverName> and return statistics about
+    the driver in info. If no error occurred, the driver will remain open
+    and must be closed by the called by calling UnloadAsioDriver() - if an error
+    is returned the driver will already be unloaded.
+*/
+static PaError LoadAsioDriver( PaAsioHostApiRepresentation *asioHostApi, const char *driverName,
+        PaAsioDriverInfo *driverInfo, void *systemSpecific )
+{
+    PaError result = paNoError;
+    ASIOError asioError;
+    int asioIsInitialized = 0;
+
+    if( !asioHostApi->asioDrivers->loadDriver( const_cast<char*>(driverName) ) )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_HOST_ERROR( 0, "Failed to load ASIO driver" );
+        goto error;
+    }
+
+    memset( &driverInfo->asioDriverInfo, 0, sizeof(ASIODriverInfo) );
+    driverInfo->asioDriverInfo.asioVersion = 2;
+    driverInfo->asioDriverInfo.sysRef = systemSpecific;
+    if( (asioError = ASIOInit( &driverInfo->asioDriverInfo )) != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        goto error;
+    }
+    else
+    {
+        asioIsInitialized = 1;
+    }
+
+    if( (asioError = ASIOGetChannels(&driverInfo->inputChannelCount,
+            &driverInfo->outputChannelCount)) != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        goto error;
+    }
+
+    if( (asioError = ASIOGetBufferSize(&driverInfo->bufferMinSize,
+            &driverInfo->bufferMaxSize, &driverInfo->bufferPreferredSize,
+            &driverInfo->bufferGranularity)) != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        goto error;
+    }
+
+    if( ASIOOutputReady() == ASE_OK )
+        driverInfo->postOutput = true;
+    else
+        driverInfo->postOutput = false;
+
+    return result;
+
+error:
+    if( asioIsInitialized )
+	{
+		ASIOExit();
+	}
+
+    return result;
+}
+
+
+#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_     13   /* must be the same number of elements as in the array below */
+static ASIOSampleRate defaultSampleRateSearchOrder_[]
+     = {44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0,
+        192000.0, 16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
+
+
+/* we look up IsDebuggerPresent at runtime incase it isn't present (on Win95 for example) */
+typedef BOOL (WINAPI *IsDebuggerPresentPtr)(VOID);
+IsDebuggerPresentPtr IsDebuggerPresent_ = 0;
+//FARPROC IsDebuggerPresent_ = 0; // this is the current way to do it apparently according to davidv
+
+PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i, driverCount;
+    PaAsioHostApiRepresentation *asioHostApi;
+    PaAsioDeviceInfo *deviceInfoArray;
+    char **names;
+    PaAsioDriverInfo paAsioDriverInfo;
+
+    asioHostApi = (PaAsioHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaAsioHostApiRepresentation) );
+    if( !asioHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /*
+        We initialize COM ourselves here and uninitialize it in Terminate().
+        This should be the only COM initialization needed in this module.
+
+        The ASIO SDK may also initialize COM but since we want to reduce dependency
+        on the ASIO SDK we manage COM initialization ourselves.
+
+        There used to be code that initialized COM in other situations
+        such as when creating a Stream. This made PA work when calling Pa_CreateStream
+        from a non-main thread. However we currently consider initialization 
+        of COM in non-main threads to be the caller's responsibility.
+    */
+    result = PaWinUtil_CoInitialize( paASIO, &asioHostApi->comInitializationResult );
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    asioHostApi->asioDrivers = 0; /* avoid surprises in our error handler below */
+
+    asioHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !asioHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* Allocate the AsioDrivers() driver list (class from ASIO SDK) */
+    try
+    {
+        asioHostApi->asioDrivers = new AsioDrivers(); /* invokes CoInitialize(0) in AsioDriverList::AsioDriverList */
+    } 
+    catch (std::bad_alloc)
+    {
+        asioHostApi->asioDrivers = 0;
+    }
+    /* some implementations of new (ie MSVC, see http://support.microsoft.com/?kbid=167733)
+       don't throw std::bad_alloc, so we also explicitly test for a null return. */
+    if( asioHostApi->asioDrivers == 0 )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    asioDrivers = asioHostApi->asioDrivers; /* keep SDK global in sync until we stop depending on it */
+
+    asioHostApi->systemSpecific = 0;
+    asioHostApi->openAsioDeviceIndex = paNoDevice;
+
+    *hostApi = &asioHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+
+    (*hostApi)->info.type = paASIO;
+    (*hostApi)->info.name = "ASIO";
+    (*hostApi)->info.deviceCount = 0;
+
+    #ifdef WINDOWS
+        /* use desktop window as system specific ptr */
+        asioHostApi->systemSpecific = GetDesktopWindow();
+    #endif
+
+    /* driverCount is the number of installed drivers - not necessarily
+        the number of installed physical devices. */
+    #if MAC
+        driverCount = asioHostApi->asioDrivers->getNumFragments();
+    #elif WINDOWS
+        driverCount = asioHostApi->asioDrivers->asioGetNumDev();
+    #endif
+
+    if( driverCount > 0 )
+    {
+        names = GetAsioDriverNames( asioHostApi, asioHostApi->allocations, driverCount );
+        if( !names )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+
+        /* allocate enough space for all drivers, even if some aren't installed */
+
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                asioHostApi->allocations, sizeof(PaDeviceInfo*) * driverCount );
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaAsioDeviceInfo*)PaUtil_GroupAllocateMemory(
+                asioHostApi->allocations, sizeof(PaAsioDeviceInfo) * driverCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        IsDebuggerPresent_ = (IsDebuggerPresentPtr)GetProcAddress( LoadLibraryA( "Kernel32.dll" ), "IsDebuggerPresent" );
+
+        for( i=0; i < driverCount; ++i )
+        {
+
+            PA_DEBUG(("ASIO names[%d]:%s\n",i,names[i]));
+
+            // Since portaudio opens ALL ASIO drivers, and no one else does that,
+            // we face fact that some drivers were not meant for it, drivers which act
+            // like shells on top of REAL drivers, for instance.
+            // so we get duplicate handles, locks and other problems.
+            // so lets NOT try to load any such wrappers. 
+            // The ones i [davidv] know of so far are:
+
+            if (   strcmp (names[i],"ASIO DirectX Full Duplex Driver") == 0
+                || strcmp (names[i],"ASIO Multimedia Driver")          == 0
+                || strncmp(names[i],"Premiere",8)                      == 0   //"Premiere Elements Windows Sound 1.0"
+                || strncmp(names[i],"Adobe",5)                         == 0   //"Adobe Default Windows Sound 1.5"
+               )
+            {
+                PA_DEBUG(("BLACKLISTED!!!\n"));
+                continue;
+            }
+
+
+            if( IsDebuggerPresent_ && IsDebuggerPresent_() )  
+            {
+                /* ASIO Digidesign Driver uses PACE copy protection which quits out
+                   if a debugger is running. So we don't load it if a debugger is running. */
+                if( strcmp(names[i], "ASIO Digidesign Driver") == 0 )  
+                {
+                    PA_DEBUG(("BLACKLISTED!!! ASIO Digidesign Driver would quit the debugger\n"));  
+                    continue;  
+                }  
+            }  
+
+
+            /* Attempt to load the asio driver... */
+            if( LoadAsioDriver( asioHostApi, names[i], &paAsioDriverInfo, asioHostApi->systemSpecific ) == paNoError )
+            {
+                PaAsioDeviceInfo *asioDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
+                PaDeviceInfo *deviceInfo = &asioDeviceInfo->commonDeviceInfo;
+
+                deviceInfo->structVersion = 2;
+                deviceInfo->hostApi = hostApiIndex;
+
+                deviceInfo->name = names[i];
+                PA_DEBUG(("PaAsio_Initialize: drv:%d name = %s\n",  i,deviceInfo->name));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d inputChannels       = %d\n", i, paAsioDriverInfo.inputChannelCount));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d outputChannels      = %d\n", i, paAsioDriverInfo.outputChannelCount));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferMinSize       = %d\n", i, paAsioDriverInfo.bufferMinSize));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferMaxSize       = %d\n", i, paAsioDriverInfo.bufferMaxSize));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferPreferredSize = %d\n", i, paAsioDriverInfo.bufferPreferredSize));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferGranularity   = %d\n", i, paAsioDriverInfo.bufferGranularity));
+
+                deviceInfo->maxInputChannels  = paAsioDriverInfo.inputChannelCount;
+                deviceInfo->maxOutputChannels = paAsioDriverInfo.outputChannelCount;
+
+                deviceInfo->defaultSampleRate = 0.;
+                bool foundDefaultSampleRate = false;
+                for( int j=0; j < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++j )
+                {
+                    ASIOError asioError = ASIOCanSampleRate( defaultSampleRateSearchOrder_[j] );
+                    if( asioError != ASE_NoClock && asioError != ASE_NotPresent )
+                    {
+                        deviceInfo->defaultSampleRate = defaultSampleRateSearchOrder_[j];
+                        foundDefaultSampleRate = true;
+                        break;
+                    }
+                }
+
+                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultSampleRate = %f\n", i, deviceInfo->defaultSampleRate));
+
+                if( foundDefaultSampleRate ){
+
+                    /* calculate default latency values from bufferPreferredSize
+                        for default low latency, and bufferMaxSize
+                        for default high latency.
+                        use the default sample rate to convert from samples to
+                        seconds. Without knowing what sample rate the user will
+                        use this is the best we can do.
+                    */
+
+                    double defaultLowLatency =
+                            paAsioDriverInfo.bufferPreferredSize / deviceInfo->defaultSampleRate;
+
+                    deviceInfo->defaultLowInputLatency = defaultLowLatency;
+                    deviceInfo->defaultLowOutputLatency = defaultLowLatency;
+
+                    double defaultHighLatency =
+                            paAsioDriverInfo.bufferMaxSize / deviceInfo->defaultSampleRate;
+
+                    if( defaultHighLatency < defaultLowLatency )
+                        defaultHighLatency = defaultLowLatency; /* just in case the driver returns something strange */ 
+                            
+                    deviceInfo->defaultHighInputLatency = defaultHighLatency;
+                    deviceInfo->defaultHighOutputLatency = defaultHighLatency;
+                    
+                }else{
+
+                    deviceInfo->defaultLowInputLatency = 0.;
+                    deviceInfo->defaultLowOutputLatency = 0.;
+                    deviceInfo->defaultHighInputLatency = 0.;
+                    deviceInfo->defaultHighOutputLatency = 0.;
+                }
+
+                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultLowInputLatency = %f\n", i, deviceInfo->defaultLowInputLatency));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultLowOutputLatency = %f\n", i, deviceInfo->defaultLowOutputLatency));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultHighInputLatency = %f\n", i, deviceInfo->defaultHighInputLatency));
+                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultHighOutputLatency = %f\n", i, deviceInfo->defaultHighOutputLatency));
+
+                asioDeviceInfo->minBufferSize = paAsioDriverInfo.bufferMinSize;
+                asioDeviceInfo->maxBufferSize = paAsioDriverInfo.bufferMaxSize;
+                asioDeviceInfo->preferredBufferSize = paAsioDriverInfo.bufferPreferredSize;
+                asioDeviceInfo->bufferGranularity = paAsioDriverInfo.bufferGranularity;
+
+
+                asioDeviceInfo->asioChannelInfos = (ASIOChannelInfo*)PaUtil_GroupAllocateMemory(
+                        asioHostApi->allocations,
+                        sizeof(ASIOChannelInfo) * (deviceInfo->maxInputChannels
+                                + deviceInfo->maxOutputChannels) );
+                if( !asioDeviceInfo->asioChannelInfos )
+                {
+                    result = paInsufficientMemory;
+                    goto error_unload;
+                }
+
+                int a;
+
+                for( a=0; a < deviceInfo->maxInputChannels; ++a ){
+                    asioDeviceInfo->asioChannelInfos[a].channel = a;
+                    asioDeviceInfo->asioChannelInfos[a].isInput = ASIOTrue;
+                    ASIOError asioError = ASIOGetChannelInfo( &asioDeviceInfo->asioChannelInfos[a] );
+                    if( asioError != ASE_OK )
+                    {
+                        result = paUnanticipatedHostError;
+                        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+                        goto error_unload;
+                    }
+                }
+
+                for( a=0; a < deviceInfo->maxOutputChannels; ++a ){
+                    int b = deviceInfo->maxInputChannels + a;
+                    asioDeviceInfo->asioChannelInfos[b].channel = a;
+                    asioDeviceInfo->asioChannelInfos[b].isInput = ASIOFalse;
+                    ASIOError asioError = ASIOGetChannelInfo( &asioDeviceInfo->asioChannelInfos[b] );
+                    if( asioError != ASE_OK )
+                    {
+                        result = paUnanticipatedHostError;
+                        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+                        goto error_unload;
+                    }
+                }
+
+
+                /* unload the driver */
+                UnloadAsioDriver();
+
+                (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
+                ++(*hostApi)->info.deviceCount;
+            }
+        }
+    }
+
+    if( (*hostApi)->info.deviceCount > 0 )
+    {
+        (*hostApi)->info.defaultInputDevice = 0;
+        (*hostApi)->info.defaultOutputDevice = 0;
+    }
+    else
+    {
+        (*hostApi)->info.defaultInputDevice = paNoDevice;
+        (*hostApi)->info.defaultOutputDevice = paNoDevice;
+    }
+
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &asioHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &asioHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    return result;
+
+error_unload:
+	UnloadAsioDriver();
+
+error:
+    if( asioHostApi )
+    {
+        if( asioHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( asioHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( asioHostApi->allocations );
+        }
+
+        delete asioHostApi->asioDrivers;
+        asioDrivers = 0; /* keep SDK global in sync until we stop depending on it */
+
+        PaWinUtil_CoUninitialize( paASIO, &asioHostApi->comInitializationResult );
+
+        PaUtil_FreeMemory( asioHostApi );
+    }
+
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
+
+    /*
+        IMPLEMENT ME:
+            - clean up any resources not handled by the allocation group (need to review if there are any)
+    */
+
+    if( asioHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( asioHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( asioHostApi->allocations );
+    }
+
+    delete asioHostApi->asioDrivers;
+    asioDrivers = 0; /* keep SDK global in sync until we stop depending on it */
+
+    PaWinUtil_CoUninitialize( paASIO, &asioHostApi->comInitializationResult );
+
+    PaUtil_FreeMemory( asioHostApi );
+}
+
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaError result = paNoError;
+    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
+    PaAsioDriverInfo *driverInfo = &asioHostApi->openAsioDriverInfo;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaDeviceIndex asioDeviceIndex;                                  
+    ASIOError asioError;
+    
+    if( inputParameters && outputParameters )
+    {
+        /* full duplex ASIO stream must use the same device for input and output */
+
+        if( inputParameters->device != outputParameters->device )
+            return paBadIODeviceCombination;
+    }
+    
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( inputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        asioDeviceIndex = inputParameters->device;
+
+        /* validate inputStreamInfo */
+        /** @todo do more validation here */
+        // if( inputParameters->hostApiSpecificStreamInfo )
+        //    return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( outputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        asioDeviceIndex = outputParameters->device;
+
+        /* validate outputStreamInfo */
+        /** @todo do more validation here */
+        // if( outputParameters->hostApiSpecificStreamInfo )
+        //    return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+
+
+
+    /* if an ASIO device is open we can only get format information for the currently open device */
+
+    if( asioHostApi->openAsioDeviceIndex != paNoDevice 
+            && asioHostApi->openAsioDeviceIndex != asioDeviceIndex )
+    {
+        return paDeviceUnavailable;
+    }
+
+
+    /* NOTE: we load the driver and use its current settings
+        rather than the ones in our device info structure which may be stale */
+
+    /* open the device if it's not already open */
+    if( asioHostApi->openAsioDeviceIndex == paNoDevice )
+    {
+        result = LoadAsioDriver( asioHostApi, asioHostApi->inheritedHostApiRep.deviceInfos[ asioDeviceIndex ]->name,
+                driverInfo, asioHostApi->systemSpecific );
+        if( result != paNoError )
+            return result;
+    }
+
+    /* check that input device can support inputChannelCount */
+    if( inputChannelCount > 0 )
+    {
+        if( inputChannelCount > driverInfo->inputChannelCount )
+        {
+            result = paInvalidChannelCount;
+            goto done;
+        }
+    }
+
+    /* check that output device can support outputChannelCount */
+    if( outputChannelCount )
+    {
+        if( outputChannelCount > driverInfo->outputChannelCount )
+        {
+            result = paInvalidChannelCount;
+            goto done;
+        }
+    }
+    
+    /* query for sample rate support */
+    asioError = ASIOCanSampleRate( sampleRate );
+    if( asioError == ASE_NoClock || asioError == ASE_NotPresent )
+    {
+        result = paInvalidSampleRate;
+        goto done;
+    }
+
+done:
+    /* close the device if it wasn't already open */
+    if( asioHostApi->openAsioDeviceIndex == paNoDevice )
+    {
+        UnloadAsioDriver(); /* not sure if we should check for errors here */
+    }
+
+    if( result == paNoError )
+        return paFormatIsSupported;
+    else
+        return result;
+}
+
+
+
+/** A data structure specifically for storing blocking i/o related data. */
+typedef struct PaAsioStreamBlockingState
+{
+    int stopFlag; /**< Flag indicating that block processing is to be stopped. */
+
+    unsigned long writeBuffersRequested; /**< The number of available output buffers, requested by the #WriteStream() function. */
+    unsigned long readFramesRequested;   /**< The number of available input frames, requested by the #ReadStream() function. */
+
+    int writeBuffersRequestedFlag; /**< Flag to indicate that #WriteStream() has requested more output buffers to be available. */
+    int readFramesRequestedFlag;   /**< Flag to indicate that #ReadStream() requires more input frames to be available. */
+
+    HANDLE writeBuffersReadyEvent; /**< Event to signal that requested output buffers are available. */
+    HANDLE readFramesReadyEvent;   /**< Event to signal that requested input frames are available. */
+
+    void *writeRingBufferData; /**< The actual ring buffer memory, used by the output ring buffer. */
+    void *readRingBufferData;  /**< The actual ring buffer memory, used by the input ring buffer. */
+
+    PaUtilRingBuffer writeRingBuffer; /**< Frame-aligned blocking i/o ring buffer to store output data (interleaved user format). */
+    PaUtilRingBuffer readRingBuffer;  /**< Frame-aligned blocking i/o ring buffer to store input data (interleaved user format). */
+
+    long writeRingBufferInitialFrames; /**< The initial number of silent frames within the output ring buffer. */
+
+    const void **writeStreamBuffer; /**< Temp buffer, used by #WriteStream() for handling non-interleaved data. */
+    void **readStreamBuffer; /**< Temp buffer, used by #ReadStream() for handling non-interleaved data. */
+
+    PaUtilBufferProcessor bufferProcessor; /**< Buffer processor, used to handle the blocking i/o ring buffers. */
+
+    int outputUnderflowFlag; /**< Flag to signal an output underflow from within the callback function. */
+    int inputOverflowFlag; /**< Flag to signal an input overflow from within the callback function. */
+}
+PaAsioStreamBlockingState;
+
+
+
+/* PaAsioStream - a stream data structure specifically for this implementation */
+
+typedef struct PaAsioStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    PaAsioHostApiRepresentation *asioHostApi;
+    unsigned long framesPerHostCallback;
+
+    /* ASIO driver info  - these may not be needed for the life of the stream,
+        but store them here until we work out how format conversion is going
+        to work. */
+
+    ASIOBufferInfo *asioBufferInfos;
+    ASIOChannelInfo *asioChannelInfos;
+    long asioInputLatencyFrames, asioOutputLatencyFrames; // actual latencies returned by asio
+
+    long inputChannelCount, outputChannelCount;
+    bool postOutput;
+
+    void **bufferPtrs; /* this is carved up for inputBufferPtrs and outputBufferPtrs */
+    void **inputBufferPtrs[2];
+    void **outputBufferPtrs[2];
+
+    PaAsioBufferConverter *inputBufferConverter;
+    long inputShift;
+    PaAsioBufferConverter *outputBufferConverter;
+    long outputShift;
+
+    volatile bool stopProcessing;
+    int stopPlayoutCount;
+    HANDLE completedBuffersPlayedEvent;
+
+    bool streamFinishedCallbackCalled;
+    int isStopped;
+    volatile int isActive;
+    volatile bool zeroOutput; /* all future calls to the callback will output silence */
+
+    volatile long reenterCount;
+    volatile long reenterError;
+
+    PaStreamCallbackFlags callbackFlags;
+
+    PaAsioStreamBlockingState *blockingState; /**< Blocking i/o data struct, or NULL when using callback interface. */
+}
+PaAsioStream;
+
+static PaAsioStream *theAsioStream = 0; /* due to ASIO sdk limitations there can be only one stream */
+
+
+static void ZeroOutputBuffers( PaAsioStream *stream, long index )
+{
+    int i;
+
+    for( i=0; i < stream->outputChannelCount; ++i )
+    {
+        void *buffer = stream->asioBufferInfos[ i + stream->inputChannelCount ].buffers[index];
+
+        int bytesPerSample = BytesPerAsioSample( stream->asioChannelInfos[ i + stream->inputChannelCount ].type );
+
+        memset( buffer, 0, stream->framesPerHostCallback * bytesPerSample );
+    }
+}
+
+
+/* return the next power of two >= x. 
+   Returns the input parameter if it is already a power of two. 
+   http://stackoverflow.com/questions/364985/algorithm-for-finding-the-smallest-power-of-two-thats-greater-or-equal-to-a-giv 
+*/
+static unsigned long NextPowerOfTwo( unsigned long x )
+{
+    --x;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    /* If you needed to deal with numbers > 2^32 the following would be needed. 
+       For latencies, we don't deal with values this large. 
+     x |= x >> 16;
+    */
+
+    return x + 1;
+}
+
+
+static unsigned long SelectHostBufferSizeForUnspecifiedUserFramesPerBuffer( 
+        unsigned long targetBufferingLatencyFrames, PaAsioDriverInfo *driverInfo )
+{
+	/* Choose a host buffer size based only on targetBufferingLatencyFrames and the 
+	   device's supported buffer sizes. Always returns a valid value.
+	*/
+
+	unsigned long result;
+
+	if( targetBufferingLatencyFrames <= (unsigned long)driverInfo->bufferMinSize )
+    {
+        result = driverInfo->bufferMinSize;
+    }
+    else if( targetBufferingLatencyFrames >= (unsigned long)driverInfo->bufferMaxSize )
+    {
+        result = driverInfo->bufferMaxSize;
+    }
+    else
+    {
+		if( driverInfo->bufferGranularity == 0 ) /* single fixed host buffer size */
+        {
+            /* The documentation states that bufferGranularity should be zero 
+               when bufferMinSize, bufferMaxSize and bufferPreferredSize are the 
+               same. We assume that is the case.
+            */
+
+            result = driverInfo->bufferPreferredSize;
+        }
+		else if( driverInfo->bufferGranularity == -1 ) /* power-of-two */
+        {
+		    /* We assume bufferMinSize and bufferMaxSize are powers of two. */
+
+            result = NextPowerOfTwo( targetBufferingLatencyFrames );
+
+            if( result < (unsigned long)driverInfo->bufferMinSize )
+                result = driverInfo->bufferMinSize;
+
+            if( result > (unsigned long)driverInfo->bufferMaxSize )
+                result = driverInfo->bufferMaxSize;
+        }
+        else /* modulo bufferGranularity */
+        {
+            /* round up to the next multiple of granularity */
+            unsigned long n = (targetBufferingLatencyFrames + driverInfo->bufferGranularity - 1) 
+                    / driverInfo->bufferGranularity;
+            
+            result = n * driverInfo->bufferGranularity;
+
+            if( result < (unsigned long)driverInfo->bufferMinSize )
+                result = driverInfo->bufferMinSize;
+
+            if( result > (unsigned long)driverInfo->bufferMaxSize )
+                result = driverInfo->bufferMaxSize;
+        }
+    }
+
+	return result;
+}
+
+
+static unsigned long SelectHostBufferSizeForSpecifiedUserFramesPerBuffer( 
+        unsigned long targetBufferingLatencyFrames, unsigned long userFramesPerBuffer,
+        PaAsioDriverInfo *driverInfo )
+{
+	/* Select a host buffer size conforming to targetBufferingLatencyFrames 
+	   and the device's supported buffer sizes.
+	   The return value will always be a multiple of userFramesPerBuffer. 
+	   If a valid buffer size can not be found the function returns 0.
+
+	   The current implementation uses a simple iterative search for clarity.
+	   Feel free to suggest a closed form solution.
+	*/
+	unsigned long result = 0;
+
+	assert( userFramesPerBuffer != 0 );
+	
+	if( driverInfo->bufferGranularity == 0 ) /* single fixed host buffer size */
+    {
+        /* The documentation states that bufferGranularity should be zero 
+           when bufferMinSize, bufferMaxSize and bufferPreferredSize are the 
+           same. We assume that is the case.
+        */
+
+		if( (driverInfo->bufferPreferredSize % userFramesPerBuffer) == 0 )
+			result = driverInfo->bufferPreferredSize;
+    }
+	else if( driverInfo->bufferGranularity == -1 ) /* power-of-two */
+    {
+		/* We assume bufferMinSize and bufferMaxSize are powers of two. */
+
+        /* Search all powers of two in the range [bufferMinSize,bufferMaxSize] 
+           for multiples of userFramesPerBuffer. We prefer the first multiple
+           that is equal or greater than targetBufferingLatencyFrames, or  
+           failing that, the largest multiple less than 
+           targetBufferingLatencyFrames.
+        */
+        unsigned long x = (unsigned long)driverInfo->bufferMinSize; 
+		do {
+			if( (x % userFramesPerBuffer) == 0 )
+			{
+                /* any power-of-two multiple of userFramesPerBuffer is acceptable */
+				result = x;
+				if( result >= targetBufferingLatencyFrames )
+					break; /* stop. a value >= to targetBufferingLatencyFrames is ideal. */
+			}
+
+			x *= 2;
+		} while( x <= (unsigned long)driverInfo->bufferMaxSize );
+    }
+    else /* modulo granularity */
+    {
+		/* We assume bufferMinSize is a multiple of bufferGranularity. */
+
+        /* Search all multiples of bufferGranularity in the range 
+           [bufferMinSize,bufferMaxSize] for multiples of userFramesPerBuffer. 
+           We prefer the first multiple that is equal or greater than 
+           targetBufferingLatencyFrames, or failing that, the largest multiple  
+           less than targetBufferingLatencyFrames.
+        */
+		unsigned long x = (unsigned long)driverInfo->bufferMinSize; 
+		do {
+			if( (x % userFramesPerBuffer) == 0 )
+			{
+                /* any power-of-two multiple of userFramesPerBuffer is acceptable */
+				result = x;
+				if( result >= targetBufferingLatencyFrames )
+					break; /* stop. a value >= to targetBufferingLatencyFrames is ideal. */
+			}
+
+			x += driverInfo->bufferGranularity;
+		} while( x <= (unsigned long)driverInfo->bufferMaxSize );
+    }
+
+	return result;
+}
+
+
+static unsigned long SelectHostBufferSize( 
+        unsigned long targetBufferingLatencyFrames, 
+        unsigned long userFramesPerBuffer, PaAsioDriverInfo *driverInfo )
+{
+    unsigned long result = 0;
+
+    /* We select a host buffer size based on the following requirements 
+       (in priority order):
+
+        1. The host buffer size must be permissible according to the ASIO 
+           driverInfo buffer size constraints (min, max, granularity or 
+           powers-of-two).
+
+        2. If the user specifies a non-zero framesPerBuffer parameter 
+           (userFramesPerBuffer here) the host buffer should be a multiple of 
+           this (subject to the constraints in (1) above).
+
+           [NOTE: Where no permissible host buffer size is a multiple of 
+           userFramesPerBuffer, we choose a value as if userFramesPerBuffer were 
+           zero (i.e. we ignore it). This strategy is open for review ~ perhaps 
+           there are still "more optimal" buffer sizes related to 
+           userFramesPerBuffer that we could use.]
+
+        3. The host buffer size should be greater than or equal to 
+           targetBufferingLatencyFrames, subject to (1) and (2) above. Where it 
+           is not possible to select a host buffer size equal or greater than 
+           targetBufferingLatencyFrames, the highest buffer size conforming to  
+           (1) and (2) should be chosen.
+    */
+
+	if( userFramesPerBuffer != 0 )
+	{
+		/* userFramesPerBuffer is specified, try to find a buffer size that's 
+           a multiple of it */
+		result = SelectHostBufferSizeForSpecifiedUserFramesPerBuffer( 
+                targetBufferingLatencyFrames, userFramesPerBuffer, driverInfo );
+	}
+
+	if( result == 0 )
+	{
+		/* either userFramesPerBuffer was not specified, or we couldn't find a 
+           host buffer size that is a multiple of it. Select a host buffer size 
+           according to targetBufferingLatencyFrames and the ASIO driverInfo 
+           buffer size constraints.
+	     */
+		result = SelectHostBufferSizeForUnspecifiedUserFramesPerBuffer( 
+                targetBufferingLatencyFrames, driverInfo );
+	}
+
+	return result;
+}
+
+
+/* returns channelSelectors if present */
+
+static PaError ValidateAsioSpecificStreamInfo(
+        const PaStreamParameters *streamParameters,
+        const PaAsioStreamInfo *streamInfo,
+        int deviceChannelCount,
+        int **channelSelectors )
+{
+    if( streamInfo )
+    {
+        if( streamInfo->size != sizeof( PaAsioStreamInfo )
+                || streamInfo->version != 1 )
+        {
+            return paIncompatibleHostApiSpecificStreamInfo;
+        }
+
+        if( streamInfo->flags & paAsioUseChannelSelectors )
+            *channelSelectors = streamInfo->channelSelectors;
+
+        if( !(*channelSelectors) )
+            return paIncompatibleHostApiSpecificStreamInfo;
+
+        for( int i=0; i < streamParameters->channelCount; ++i ){
+             if( (*channelSelectors)[i] < 0
+                    || (*channelSelectors)[i] >= deviceChannelCount ){
+                return paInvalidChannelCount;
+             }           
+        }
+    }
+
+    return paNoError;
+}
+
+
+static bool IsUsingExternalClockSource()
+{
+    bool result = false;
+    ASIOError asioError;
+    ASIOClockSource clocks[32];
+    long numSources=32;
+
+    /* davidv: listing ASIO Clock sources. there is an ongoing investigation by
+       me about whether or not to call ASIOSetSampleRate if an external Clock is
+       used. A few drivers expected different things here */
+    
+    asioError = ASIOGetClockSources(clocks, &numSources);
+    if( asioError != ASE_OK ){
+        PA_DEBUG(("ERROR: ASIOGetClockSources: %s\n", PaAsio_GetAsioErrorText(asioError) ));
+    }else{
+        PA_DEBUG(("INFO ASIOGetClockSources listing %d clocks\n", numSources ));
+        for (int i=0;i<numSources;++i){
+            PA_DEBUG(("ASIOClockSource%d %s current:%d\n", i, clocks[i].name, clocks[i].isCurrentSource ));
+           
+            if (clocks[i].isCurrentSource)
+                result = true;
+        }
+    }
+
+    return result;
+}
+
+
+static PaError ValidateAndSetSampleRate( double sampleRate )
+{
+    PaError result = paNoError;
+    ASIOError asioError;
+
+    // check that the device supports the requested sample rate 
+
+    asioError = ASIOCanSampleRate( sampleRate );
+    PA_DEBUG(("ASIOCanSampleRate(%f):%d\n", sampleRate, asioError ));
+
+    if( asioError != ASE_OK )
+    {
+        result = paInvalidSampleRate;
+        PA_DEBUG(("ERROR: ASIOCanSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
+        goto error;
+    }
+
+    // retrieve the current sample rate, we only change to the requested
+    // sample rate if the device is not already in that rate.
+
+    ASIOSampleRate oldRate;
+    asioError = ASIOGetSampleRate(&oldRate);
+    if( asioError != ASE_OK )
+    {
+        result = paInvalidSampleRate;
+        PA_DEBUG(("ERROR: ASIOGetSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
+        goto error;
+    }
+    PA_DEBUG(("ASIOGetSampleRate:%f\n",oldRate));
+
+    if (oldRate != sampleRate){
+        /* Set sample rate */
+
+        PA_DEBUG(("before ASIOSetSampleRate(%f)\n",sampleRate));
+
+        /*
+            If you have problems with some drivers when externally clocked, 
+            try switching on the following line and commenting out the one after it.
+            See IsUsingExternalClockSource() for more info.
+        */
+        //if( IsUsingExternalClockSource() ){
+        if( false ){
+            asioError = ASIOSetSampleRate( 0 );
+        }else{
+            asioError = ASIOSetSampleRate( sampleRate );
+        }
+        if( asioError != ASE_OK )
+        {
+            result = paInvalidSampleRate;
+            PA_DEBUG(("ERROR: ASIOSetSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
+            goto error;
+        }
+        PA_DEBUG(("after ASIOSetSampleRate(%f)\n",sampleRate));
+    }
+    else
+    {
+        PA_DEBUG(("No Need to change SR\n"));
+    }
+
+error:
+    return result;
+}
+
+
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream  parameters */
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
+    PaAsioStream *stream = 0;
+    PaAsioStreamInfo *inputStreamInfo, *outputStreamInfo;
+    unsigned long framesPerHostBuffer;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+    unsigned long suggestedInputLatencyFrames;
+    unsigned long suggestedOutputLatencyFrames;
+    PaDeviceIndex asioDeviceIndex;
+    ASIOError asioError;
+    int asioIsInitialized = 0;
+    int asioBuffersCreated = 0;
+    int completedBuffersPlayedEventInited = 0;
+    int i;
+    PaAsioDriverInfo *driverInfo;
+    int *inputChannelSelectors = 0;
+    int *outputChannelSelectors = 0;
+
+    /* Are we using blocking i/o interface? */
+    int usingBlockingIo = ( !streamCallback ) ? TRUE : FALSE;
+    /* Blocking i/o stuff */
+    long lBlockingBufferSize     = 0; /* Desired ring buffer size in samples. */
+    long lBlockingBufferSizePow2 = 0; /* Power-of-2 rounded ring buffer size. */
+    long lBytesPerFrame          = 0; /* Number of bytes per input/output frame. */
+    int blockingWriteBuffersReadyEventInitialized = 0; /* Event init flag. */
+    int blockingReadFramesReadyEventInitialized   = 0; /* Event init flag. */
+
+    int callbackBufferProcessorInited = FALSE;
+    int blockingBufferProcessorInited = FALSE;
+
+    /* unless we move to using lower level ASIO calls, we can only have
+        one device open at a time */
+    if( asioHostApi->openAsioDeviceIndex != paNoDevice )
+    {
+        PA_DEBUG(("OpenStream paDeviceUnavailable\n"));
+        return paDeviceUnavailable;
+    }
+
+    assert( theAsioStream == 0 );
+
+    if( inputParameters && outputParameters )
+    {
+        /* full duplex ASIO stream must use the same device for input and output */
+
+        if( inputParameters->device != outputParameters->device )
+        {
+            PA_DEBUG(("OpenStream paBadIODeviceCombination\n"));
+            return paBadIODeviceCombination;
+        }
+    }
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+        suggestedInputLatencyFrames = (unsigned long)((inputParameters->suggestedLatency * sampleRate)+0.5f);
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        asioDeviceIndex = inputParameters->device;
+
+        PaAsioDeviceInfo *asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[asioDeviceIndex];
+
+        /* validate hostApiSpecificStreamInfo */
+        inputStreamInfo = (PaAsioStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
+        result = ValidateAsioSpecificStreamInfo( inputParameters, inputStreamInfo,
+            asioDeviceInfo->commonDeviceInfo.maxInputChannels,
+            &inputChannelSelectors
+        );
+        if( result != paNoError ) return result;
+    }
+    else
+    {
+        inputChannelCount = 0;
+        inputSampleFormat = 0;
+        suggestedInputLatencyFrames = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        suggestedOutputLatencyFrames = (unsigned long)((outputParameters->suggestedLatency * sampleRate)+0.5f);
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        asioDeviceIndex = outputParameters->device;
+
+        PaAsioDeviceInfo *asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[asioDeviceIndex];
+
+        /* validate hostApiSpecificStreamInfo */
+        outputStreamInfo = (PaAsioStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
+        result = ValidateAsioSpecificStreamInfo( outputParameters, outputStreamInfo,
+            asioDeviceInfo->commonDeviceInfo.maxOutputChannels,
+            &outputChannelSelectors
+        );
+        if( result != paNoError ) return result;
+    }
+    else
+    {
+        outputChannelCount = 0;
+        outputSampleFormat = 0;
+        suggestedOutputLatencyFrames = 0;
+    }
+
+    driverInfo = &asioHostApi->openAsioDriverInfo;
+
+    /* NOTE: we load the driver and use its current settings
+        rather than the ones in our device info structure which may be stale */
+
+    result = LoadAsioDriver( asioHostApi, asioHostApi->inheritedHostApiRep.deviceInfos[ asioDeviceIndex ]->name,
+            driverInfo, asioHostApi->systemSpecific );
+    if( result == paNoError )
+        asioIsInitialized = 1;
+    else{
+        PA_DEBUG(("OpenStream ERROR1 - LoadAsioDriver returned %d\n", result));
+        goto error;
+    }
+
+    /* check that input device can support inputChannelCount */
+    if( inputChannelCount > 0 )
+    {
+        if( inputChannelCount > driverInfo->inputChannelCount )
+        {
+            result = paInvalidChannelCount;
+            PA_DEBUG(("OpenStream ERROR2\n"));
+            goto error;
+        }
+    }
+
+    /* check that output device can support outputChannelCount */
+    if( outputChannelCount )
+    {
+        if( outputChannelCount > driverInfo->outputChannelCount )
+        {
+            result = paInvalidChannelCount;
+            PA_DEBUG(("OpenStream ERROR3\n"));
+            goto error;
+        }
+    }
+
+    result = ValidateAndSetSampleRate( sampleRate );
+    if( result != paNoError )
+        goto error;
+
+    /*
+        IMPLEMENT ME:
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+    */
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 ){
+        PA_DEBUG(("OpenStream invalid flags!!\n"));
+        return paInvalidFlag; /* unexpected platform specific flag */
+    }
+
+
+    stream = (PaAsioStream*)PaUtil_AllocateMemory( sizeof(PaAsioStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        PA_DEBUG(("OpenStream ERROR5\n"));
+        goto error;
+    }
+    stream->blockingState = NULL; /* Blocking i/o not initialized, yet. */
+
+
+    stream->completedBuffersPlayedEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
+    if( stream->completedBuffersPlayedEvent == NULL )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+        PA_DEBUG(("OpenStream ERROR6\n"));
+        goto error;
+    }
+    completedBuffersPlayedEventInited = 1;
+
+
+    stream->asioBufferInfos = 0; /* for deallocation in error */
+    stream->asioChannelInfos = 0; /* for deallocation in error */
+    stream->bufferPtrs = 0; /* for deallocation in error */
+
+    /* Using blocking i/o interface... */
+    if( usingBlockingIo )
+    {
+        /* Blocking i/o is implemented by running callback mode, using a special blocking i/o callback. */
+        streamCallback = BlockingIoPaCallback; /* Setup PA to use the ASIO blocking i/o callback. */
+        userData       = &theAsioStream;       /* The callback user data will be the PA ASIO stream. */
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &asioHostApi->blockingStreamInterface, streamCallback, userData );
+    }
+    else /* Using callback interface... */
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &asioHostApi->callbackStreamInterface, streamCallback, userData );
+    }
+
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+
+    stream->asioBufferInfos = (ASIOBufferInfo*)PaUtil_AllocateMemory(
+            sizeof(ASIOBufferInfo) * (inputChannelCount + outputChannelCount) );
+    if( !stream->asioBufferInfos )
+    {
+        result = paInsufficientMemory;
+        PA_DEBUG(("OpenStream ERROR7\n"));
+        goto error;
+    }
+
+
+    for( i=0; i < inputChannelCount; ++i )
+    {
+        ASIOBufferInfo *info = &stream->asioBufferInfos[i];
+
+        info->isInput = ASIOTrue;
+
+        if( inputChannelSelectors ){
+            // inputChannelSelectors values have already been validated in
+            // ValidateAsioSpecificStreamInfo() above
+            info->channelNum = inputChannelSelectors[i];
+        }else{
+            info->channelNum = i;
+        }
+
+        info->buffers[0] = info->buffers[1] = 0;
+    }
+
+    for( i=0; i < outputChannelCount; ++i ){
+        ASIOBufferInfo *info = &stream->asioBufferInfos[inputChannelCount+i];
+
+        info->isInput = ASIOFalse;
+
+        if( outputChannelSelectors ){
+            // outputChannelSelectors values have already been validated in
+            // ValidateAsioSpecificStreamInfo() above
+            info->channelNum = outputChannelSelectors[i];
+        }else{
+            info->channelNum = i;
+        }
+        
+        info->buffers[0] = info->buffers[1] = 0;
+    }
+
+
+    /* Using blocking i/o interface... */
+    if( usingBlockingIo )
+    {
+/** @todo REVIEW selection of host buffer size for blocking i/o */
+
+        framesPerHostBuffer = SelectHostBufferSize( 0, framesPerBuffer, driverInfo );
+
+    }
+    else /* Using callback interface... */
+    {
+        /* Select the host buffer size based on user framesPerBuffer and the
+           maximum of suggestedInputLatencyFrames and 
+           suggestedOutputLatencyFrames.
+
+           We should subtract any fixed known driver latency from 
+           suggestedLatencyFrames before computing the host buffer size.
+           However, the ASIO API doesn't provide a method for determining fixed 
+           latencies independent of the host buffer size. ASIOGetLatencies()  
+           only returns latencies after the buffer size has been configured, so 
+           we can't reliably use it to determine fixed latencies here.
+
+           We could set the preferred buffer size and then subtract it from
+           the values returned from ASIOGetLatencies, but this would not be 100%
+           reliable, so we don't do it.
+        */
+
+        unsigned long targetBufferingLatencyFrames = 
+                (( suggestedInputLatencyFrames > suggestedOutputLatencyFrames )
+                ? suggestedInputLatencyFrames 
+                : suggestedOutputLatencyFrames);
+
+        framesPerHostBuffer = SelectHostBufferSize( targetBufferingLatencyFrames, 
+                framesPerBuffer, driverInfo );
+    }
+
+
+    PA_DEBUG(("PaAsioOpenStream: framesPerHostBuffer :%d\n",  framesPerHostBuffer));
+
+    asioError = ASIOCreateBuffers( stream->asioBufferInfos,
+            inputChannelCount+outputChannelCount,
+            framesPerHostBuffer, &asioCallbacks_ );
+
+    if( asioError != ASE_OK
+            && framesPerHostBuffer != (unsigned long)driverInfo->bufferPreferredSize )
+    {
+        PA_DEBUG(("ERROR: ASIOCreateBuffers: %s\n", PaAsio_GetAsioErrorText(asioError) ));
+        /*
+            Some buggy drivers (like the Hoontech DSP24) give incorrect
+            [min, preferred, max] values They should work with the preferred size
+            value, thus if Pa_ASIO_CreateBuffers fails with the hostBufferSize
+            computed in SelectHostBufferSize, we try again with the preferred size.
+        */
+
+        framesPerHostBuffer = driverInfo->bufferPreferredSize;
+
+        PA_DEBUG(("PaAsioOpenStream: CORRECTED framesPerHostBuffer :%d\n",  framesPerHostBuffer));
+
+        ASIOError asioError2 = ASIOCreateBuffers( stream->asioBufferInfos,
+                inputChannelCount+outputChannelCount,
+                 framesPerHostBuffer, &asioCallbacks_ );
+        if( asioError2 == ASE_OK )
+            asioError = ASE_OK;
+    }
+
+    if( asioError != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        PA_DEBUG(("OpenStream ERROR9\n"));
+        goto error;
+    }
+
+    asioBuffersCreated = 1;
+
+    stream->asioChannelInfos = (ASIOChannelInfo*)PaUtil_AllocateMemory(
+            sizeof(ASIOChannelInfo) * (inputChannelCount + outputChannelCount) );
+    if( !stream->asioChannelInfos )
+    {
+        result = paInsufficientMemory;
+        PA_DEBUG(("OpenStream ERROR10\n"));
+        goto error;
+    }
+
+    for( i=0; i < inputChannelCount + outputChannelCount; ++i )
+    {
+        stream->asioChannelInfos[i].channel = stream->asioBufferInfos[i].channelNum;
+        stream->asioChannelInfos[i].isInput = stream->asioBufferInfos[i].isInput;
+        asioError = ASIOGetChannelInfo( &stream->asioChannelInfos[i] );
+        if( asioError != ASE_OK )
+        {
+            result = paUnanticipatedHostError;
+            PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+            PA_DEBUG(("OpenStream ERROR11\n"));
+            goto error;
+        }
+    }
+
+    stream->bufferPtrs = (void**)PaUtil_AllocateMemory(
+            2 * sizeof(void*) * (inputChannelCount + outputChannelCount) );
+    if( !stream->bufferPtrs )
+    {
+        result = paInsufficientMemory;
+        PA_DEBUG(("OpenStream ERROR12\n"));
+        goto error;
+    }
+
+    if( inputChannelCount > 0 )
+    {
+        stream->inputBufferPtrs[0] = stream-> bufferPtrs;
+        stream->inputBufferPtrs[1] = &stream->bufferPtrs[inputChannelCount];
+
+        for( i=0; i<inputChannelCount; ++i )
+        {
+            stream->inputBufferPtrs[0][i] = stream->asioBufferInfos[i].buffers[0];
+            stream->inputBufferPtrs[1][i] = stream->asioBufferInfos[i].buffers[1];
+        }
+    }
+    else
+    {
+        stream->inputBufferPtrs[0] = 0;
+        stream->inputBufferPtrs[1] = 0;
+    }
+
+    if( outputChannelCount > 0 )
+    {
+        stream->outputBufferPtrs[0] = &stream->bufferPtrs[inputChannelCount*2];
+        stream->outputBufferPtrs[1] = &stream->bufferPtrs[inputChannelCount*2 + outputChannelCount];
+
+        for( i=0; i<outputChannelCount; ++i )
+        {
+            stream->outputBufferPtrs[0][i] = stream->asioBufferInfos[inputChannelCount+i].buffers[0];
+            stream->outputBufferPtrs[1][i] = stream->asioBufferInfos[inputChannelCount+i].buffers[1];
+        }
+    }
+    else
+    {
+        stream->outputBufferPtrs[0] = 0;
+        stream->outputBufferPtrs[1] = 0;
+    }
+
+    if( inputChannelCount > 0 )
+    {
+        /* FIXME: assume all channels use the same type for now 
+        
+            see: "ASIO devices with multiple sample formats are unsupported"
+            http://www.portaudio.com/trac/ticket/106
+        */
+        ASIOSampleType inputType = stream->asioChannelInfos[0].type;
+
+        PA_DEBUG(("ASIO Input  type:%d",inputType));
+        AsioSampleTypeLOG(inputType);
+        hostInputSampleFormat = AsioSampleTypeToPaNativeSampleFormat( inputType );
+
+        SelectAsioToPaConverter( inputType, &stream->inputBufferConverter, &stream->inputShift );
+    }
+    else
+    {
+        hostInputSampleFormat = 0;
+        stream->inputBufferConverter = 0;
+    }
+
+    if( outputChannelCount > 0 )
+    {
+        /* FIXME: assume all channels use the same type for now 
+        
+            see: "ASIO devices with multiple sample formats are unsupported"
+            http://www.portaudio.com/trac/ticket/106
+        */
+        ASIOSampleType outputType = stream->asioChannelInfos[inputChannelCount].type;
+
+        PA_DEBUG(("ASIO Output type:%d",outputType));
+        AsioSampleTypeLOG(outputType);
+        hostOutputSampleFormat = AsioSampleTypeToPaNativeSampleFormat( outputType );
+
+        SelectPaToAsioConverter( outputType, &stream->outputBufferConverter, &stream->outputShift );
+    }
+    else
+    {
+        hostOutputSampleFormat = 0;
+        stream->outputBufferConverter = 0;
+    }
+
+    /* Values returned by ASIOGetLatencies() include the latency introduced by 
+       the ASIO double buffer. */
+    ASIOGetLatencies( &stream->asioInputLatencyFrames, &stream->asioOutputLatencyFrames );
+
+
+    /* Using blocking i/o interface... */
+    if( usingBlockingIo )
+    {
+        /* Allocate the blocking i/o input ring buffer memory. */
+        stream->blockingState = (PaAsioStreamBlockingState*)PaUtil_AllocateMemory( sizeof(PaAsioStreamBlockingState) );
+        if( !stream->blockingState )
+        {
+            result = paInsufficientMemory;
+            PA_DEBUG(("ERROR! Blocking i/o interface struct allocation failed in OpenStream()\n"));
+            goto error;
+        }
+
+        /* Initialize blocking i/o interface struct. */
+        stream->blockingState->readFramesReadyEvent   = NULL; /* Uninitialized, yet. */
+        stream->blockingState->writeBuffersReadyEvent = NULL; /* Uninitialized, yet. */
+        stream->blockingState->readRingBufferData     = NULL; /* Uninitialized, yet. */
+        stream->blockingState->writeRingBufferData    = NULL; /* Uninitialized, yet. */
+        stream->blockingState->readStreamBuffer       = NULL; /* Uninitialized, yet. */
+        stream->blockingState->writeStreamBuffer      = NULL; /* Uninitialized, yet. */
+        stream->blockingState->stopFlag               = TRUE; /* Not started, yet. */
+
+
+        /* If the user buffer is unspecified */
+        if( framesPerBuffer == paFramesPerBufferUnspecified )
+        {
+            /* Make the user buffer the same size as the host buffer. */
+            framesPerBuffer = framesPerHostBuffer;
+        }
+
+
+        /* Initialize callback buffer processor. */
+        result = PaUtil_InitializeBufferProcessor( &stream->bufferProcessor               ,
+                                                    inputChannelCount                     ,
+                                                    inputSampleFormat & ~paNonInterleaved , /* Ring buffer. */
+                                                    hostInputSampleFormat                 , /* Host format. */
+                                                    outputChannelCount                    ,
+                                                    outputSampleFormat & ~paNonInterleaved, /* Ring buffer. */
+                                                    hostOutputSampleFormat                , /* Host format. */
+                                                    sampleRate                            ,
+                                                    streamFlags                           ,
+                                                    framesPerBuffer                       , /* Frames per ring buffer block. */
+                                                    framesPerHostBuffer                   , /* Frames per asio buffer. */
+                                                    paUtilFixedHostBufferSize             ,
+                                                    streamCallback                        ,
+                                                    userData                               );
+        if( result != paNoError ){
+            PA_DEBUG(("OpenStream ERROR13\n"));
+            goto error;
+        }
+        callbackBufferProcessorInited = TRUE;
+
+        /* Initialize the blocking i/o buffer processor. */
+        result = PaUtil_InitializeBufferProcessor(&stream->blockingState->bufferProcessor,
+                                                   inputChannelCount                     ,
+                                                   inputSampleFormat                     , /* User format. */
+                                                   inputSampleFormat & ~paNonInterleaved , /* Ring buffer. */
+                                                   outputChannelCount                    ,
+                                                   outputSampleFormat                    , /* User format. */
+                                                   outputSampleFormat & ~paNonInterleaved, /* Ring buffer. */
+                                                   sampleRate                            ,
+                                                   paClipOff | paDitherOff               , /* Don't use dither nor clipping. */
+                                                   framesPerBuffer                       , /* Frames per user buffer. */
+                                                   framesPerBuffer                       , /* Frames per ring buffer block. */
+                                                   paUtilBoundedHostBufferSize           ,
+                                                   NULL, NULL                            );/* No callback! */
+        if( result != paNoError ){
+            PA_DEBUG(("ERROR! Blocking i/o buffer processor initialization failed in OpenStream()\n"));
+            goto error;
+        }
+        blockingBufferProcessorInited = TRUE;
+
+        /* If input is requested. */
+        if( inputChannelCount )
+        {
+            /* Create the callback sync-event. */
+            stream->blockingState->readFramesReadyEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+            if( stream->blockingState->readFramesReadyEvent == NULL )
+            {
+                result = paUnanticipatedHostError;
+                PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+                PA_DEBUG(("ERROR! Blocking i/o \"read frames ready\" event creation failed in OpenStream()\n"));
+                goto error;
+            }
+            blockingReadFramesReadyEventInitialized = 1;
+
+
+            /* Create pointer buffer to access non-interleaved data in ReadStream() */
+            stream->blockingState->readStreamBuffer = (void**)PaUtil_AllocateMemory( sizeof(void*) * inputChannelCount );
+            if( !stream->blockingState->readStreamBuffer )
+            {
+                result = paInsufficientMemory;
+                PA_DEBUG(("ERROR! Blocking i/o read stream buffer allocation failed in OpenStream()\n"));
+                goto error;
+            }
+
+            /* The ring buffer should store as many data blocks as needed
+               to achieve the requested latency. Whereas it must be large
+               enough to store at least two complete data blocks.
+
+               1) Determine the amount of latency to be added to the
+                  prefered ASIO latency.
+               2) Make sure we have at lest one additional latency frame.
+               3) Divide the number of frames by the desired block size to
+                  get the number (rounded up to pure integer) of blocks to
+                  be stored in the buffer.
+               4) Add one additional block for block processing and convert
+                  to samples frames.
+               5) Get the next larger (or equal) power-of-two buffer size.
+             */
+            lBlockingBufferSize = suggestedInputLatencyFrames - stream->asioInputLatencyFrames;
+            lBlockingBufferSize = (lBlockingBufferSize > 0) ? lBlockingBufferSize : 1;
+            lBlockingBufferSize = (lBlockingBufferSize + framesPerBuffer - 1) / framesPerBuffer;
+            lBlockingBufferSize = (lBlockingBufferSize + 1) * framesPerBuffer;
+
+            /* Get the next larger or equal power-of-two buffersize. */
+            lBlockingBufferSizePow2 = 1;
+            while( lBlockingBufferSize > (lBlockingBufferSizePow2<<=1) );
+            lBlockingBufferSize = lBlockingBufferSizePow2;
+
+            /* Compute total intput latency in seconds */
+            stream->streamRepresentation.streamInfo.inputLatency =
+                (double)( PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor               )
+                        + PaUtil_GetBufferProcessorInputLatencyFrames(&stream->blockingState->bufferProcessor)
+                        + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer
+                        + stream->asioInputLatencyFrames )
+                / sampleRate;
+
+            /* The code below prints the ASIO latency which doesn't include
+               the buffer processor latency nor the blocking i/o latency. It
+               reports the added latency separately.
+            */
+            PA_DEBUG(("PaAsio : ASIO InputLatency = %ld (%ld ms),\n         added buffProc:%ld (%ld ms),\n         added blocking:%ld (%ld ms)\n",
+                stream->asioInputLatencyFrames,
+                (long)( stream->asioInputLatencyFrames * (1000.0 / sampleRate) ),
+                PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor),
+                (long)( PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor) * (1000.0 / sampleRate) ),
+                PaUtil_GetBufferProcessorInputLatencyFrames(&stream->blockingState->bufferProcessor) + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer,
+                (long)( (PaUtil_GetBufferProcessorInputLatencyFrames(&stream->blockingState->bufferProcessor) + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer) * (1000.0 / sampleRate) )
+                ));
+
+            /* Determine the size of ring buffer in bytes. */
+            lBytesPerFrame = inputChannelCount * Pa_GetSampleSize(inputSampleFormat );
+
+            /* Allocate the blocking i/o input ring buffer memory. */
+            stream->blockingState->readRingBufferData = (void*)PaUtil_AllocateMemory( lBlockingBufferSize * lBytesPerFrame );
+            if( !stream->blockingState->readRingBufferData )
+            {
+                result = paInsufficientMemory;
+                PA_DEBUG(("ERROR! Blocking i/o input ring buffer allocation failed in OpenStream()\n"));
+                goto error;
+            }
+
+            /* Initialize the input ring buffer struct. */
+            PaUtil_InitializeRingBuffer( &stream->blockingState->readRingBuffer    ,
+                                          lBytesPerFrame                           ,
+                                          lBlockingBufferSize                      ,
+                                          stream->blockingState->readRingBufferData );
+        }
+
+        /* If output is requested. */
+        if( outputChannelCount )
+        {
+            stream->blockingState->writeBuffersReadyEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+            if( stream->blockingState->writeBuffersReadyEvent == NULL )
+            {
+                result = paUnanticipatedHostError;
+                PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+                PA_DEBUG(("ERROR! Blocking i/o \"write buffers ready\" event creation failed in OpenStream()\n"));
+                goto error;
+            }
+            blockingWriteBuffersReadyEventInitialized = 1;
+
+            /* Create pointer buffer to access non-interleaved data in WriteStream() */
+            stream->blockingState->writeStreamBuffer = (const void**)PaUtil_AllocateMemory( sizeof(const void*) * outputChannelCount );
+            if( !stream->blockingState->writeStreamBuffer )
+            {
+                result = paInsufficientMemory;
+                PA_DEBUG(("ERROR! Blocking i/o write stream buffer allocation failed in OpenStream()\n"));
+                goto error;
+            }
+
+            /* The ring buffer should store as many data blocks as needed
+               to achieve the requested latency. Whereas it must be large
+               enough to store at least two complete data blocks.
+
+               1) Determine the amount of latency to be added to the
+                  prefered ASIO latency.
+               2) Make sure we have at lest one additional latency frame.
+               3) Divide the number of frames by the desired block size to
+                  get the number (rounded up to pure integer) of blocks to
+                  be stored in the buffer.
+               4) Add one additional block for block processing and convert
+                  to samples frames.
+               5) Get the next larger (or equal) power-of-two buffer size.
+             */
+            lBlockingBufferSize = suggestedOutputLatencyFrames - stream->asioOutputLatencyFrames;
+            lBlockingBufferSize = (lBlockingBufferSize > 0) ? lBlockingBufferSize : 1;
+            lBlockingBufferSize = (lBlockingBufferSize + framesPerBuffer - 1) / framesPerBuffer;
+            lBlockingBufferSize = (lBlockingBufferSize + 1) * framesPerBuffer;
+
+            /* The buffer size (without the additional block) corresponds
+               to the initial number of silent samples in the output ring
+               buffer. */
+            stream->blockingState->writeRingBufferInitialFrames = lBlockingBufferSize - framesPerBuffer;
+
+            /* Get the next larger or equal power-of-two buffersize. */
+            lBlockingBufferSizePow2 = 1;
+            while( lBlockingBufferSize > (lBlockingBufferSizePow2<<=1) );
+            lBlockingBufferSize = lBlockingBufferSizePow2;
+
+            /* Compute total output latency in seconds */
+            stream->streamRepresentation.streamInfo.outputLatency =
+                (double)( PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor)
+                        + PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->blockingState->bufferProcessor)
+                        + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer
+                        + stream->asioOutputLatencyFrames )
+                / sampleRate;
+
+            /* The code below prints the ASIO latency which doesn't include
+               the buffer processor latency nor the blocking i/o latency. It
+               reports the added latency separately.
+            */
+            PA_DEBUG(("PaAsio : ASIO OutputLatency = %ld (%ld ms),\n         added buffProc:%ld (%ld ms),\n         added blocking:%ld (%ld ms)\n",
+                stream->asioOutputLatencyFrames,
+                (long)( stream->asioOutputLatencyFrames * (1000.0 / sampleRate) ),
+                PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor),
+                (long)( PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor) * (1000.0 / sampleRate) ),
+                PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->blockingState->bufferProcessor) + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer,
+                (long)( (PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->blockingState->bufferProcessor) + (lBlockingBufferSize / framesPerBuffer - 1) * framesPerBuffer) * (1000.0 / sampleRate) )
+                ));
+
+            /* Determine the size of ring buffer in bytes. */
+            lBytesPerFrame = outputChannelCount * Pa_GetSampleSize(outputSampleFormat);
+
+            /* Allocate the blocking i/o output ring buffer memory. */
+            stream->blockingState->writeRingBufferData = (void*)PaUtil_AllocateMemory( lBlockingBufferSize * lBytesPerFrame );
+            if( !stream->blockingState->writeRingBufferData )
+            {
+                result = paInsufficientMemory;
+                PA_DEBUG(("ERROR! Blocking i/o output ring buffer allocation failed in OpenStream()\n"));
+                goto error;
+            }
+
+            /* Initialize the output ring buffer struct. */
+            PaUtil_InitializeRingBuffer( &stream->blockingState->writeRingBuffer    ,
+                                          lBytesPerFrame                            ,
+                                          lBlockingBufferSize                       ,
+                                          stream->blockingState->writeRingBufferData );
+        }
+
+        stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+
+    }
+    else /* Using callback interface... */
+    {
+        result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                        inputChannelCount, inputSampleFormat, (hostInputSampleFormat | paNonInterleaved),
+                        outputChannelCount, outputSampleFormat, (hostOutputSampleFormat | paNonInterleaved),
+                        sampleRate, streamFlags, framesPerBuffer,
+                        framesPerHostBuffer, paUtilFixedHostBufferSize,
+                        streamCallback, userData );
+        if( result != paNoError ){
+            PA_DEBUG(("OpenStream ERROR13\n"));
+            goto error;
+        }
+        callbackBufferProcessorInited = TRUE;
+
+        stream->streamRepresentation.streamInfo.inputLatency =
+                (double)( PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor)
+                    + stream->asioInputLatencyFrames) / sampleRate;   // seconds
+        stream->streamRepresentation.streamInfo.outputLatency =
+                (double)( PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor)
+                    + stream->asioOutputLatencyFrames) / sampleRate; // seconds
+        stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+        // the code below prints the ASIO latency which doesn't include the
+        // buffer processor latency. it reports the added latency separately
+        PA_DEBUG(("PaAsio : ASIO InputLatency = %ld (%ld ms), added buffProc:%ld (%ld ms)\n",
+                stream->asioInputLatencyFrames,
+                (long)((stream->asioInputLatencyFrames*1000)/ sampleRate),  
+                PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor),
+                (long)((PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor)*1000)/ sampleRate)
+                ));
+
+        PA_DEBUG(("PaAsio : ASIO OuputLatency = %ld (%ld ms), added buffProc:%ld (%ld ms)\n",
+                stream->asioOutputLatencyFrames,
+                (long)((stream->asioOutputLatencyFrames*1000)/ sampleRate), 
+                PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor),
+                (long)((PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor)*1000)/ sampleRate)
+                ));
+    }
+
+    stream->asioHostApi = asioHostApi;
+    stream->framesPerHostCallback = framesPerHostBuffer;
+
+    stream->inputChannelCount = inputChannelCount;
+    stream->outputChannelCount = outputChannelCount;
+    stream->postOutput = driverInfo->postOutput;
+    stream->isStopped = 1;
+    stream->isActive = 0;
+    
+    asioHostApi->openAsioDeviceIndex = asioDeviceIndex;
+
+    theAsioStream = stream;
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    PA_DEBUG(("goto errored\n"));
+    if( stream )
+    {
+        if( stream->blockingState )
+        {
+            if( blockingBufferProcessorInited )
+                PaUtil_TerminateBufferProcessor( &stream->blockingState->bufferProcessor );
+
+            if( stream->blockingState->writeRingBufferData )
+                PaUtil_FreeMemory( stream->blockingState->writeRingBufferData );
+            if( stream->blockingState->writeStreamBuffer )
+                PaUtil_FreeMemory( stream->blockingState->writeStreamBuffer );
+            if( blockingWriteBuffersReadyEventInitialized )
+                CloseHandle( stream->blockingState->writeBuffersReadyEvent );
+
+            if( stream->blockingState->readRingBufferData )
+                PaUtil_FreeMemory( stream->blockingState->readRingBufferData );
+            if( stream->blockingState->readStreamBuffer )
+                PaUtil_FreeMemory( stream->blockingState->readStreamBuffer );
+            if( blockingReadFramesReadyEventInitialized )
+                CloseHandle( stream->blockingState->readFramesReadyEvent );
+
+            PaUtil_FreeMemory( stream->blockingState );
+        }
+
+        if( callbackBufferProcessorInited )
+            PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+
+        if( completedBuffersPlayedEventInited )
+            CloseHandle( stream->completedBuffersPlayedEvent );
+
+        if( stream->asioBufferInfos )
+            PaUtil_FreeMemory( stream->asioBufferInfos );
+
+        if( stream->asioChannelInfos )
+            PaUtil_FreeMemory( stream->asioChannelInfos );
+
+        if( stream->bufferPtrs )
+            PaUtil_FreeMemory( stream->bufferPtrs );
+
+        PaUtil_FreeMemory( stream );
+    }
+
+    if( asioBuffersCreated )
+        ASIODisposeBuffers();
+
+    if( asioIsInitialized )
+	{
+		UnloadAsioDriver();
+	}
+    return result;
+}
+
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaAsioStream *stream = (PaAsioStream*)s;
+
+    /*
+        IMPLEMENT ME:
+            - additional stream closing + cleanup
+    */
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+
+    stream->asioHostApi->openAsioDeviceIndex = paNoDevice;
+
+    CloseHandle( stream->completedBuffersPlayedEvent );
+
+    /* Using blocking i/o interface... */
+    if( stream->blockingState )
+    {
+        PaUtil_TerminateBufferProcessor( &stream->blockingState->bufferProcessor );
+
+        if( stream->inputChannelCount ) {
+            PaUtil_FreeMemory( stream->blockingState->readRingBufferData );
+            PaUtil_FreeMemory( stream->blockingState->readStreamBuffer  );
+            CloseHandle( stream->blockingState->readFramesReadyEvent );
+        }
+        if( stream->outputChannelCount ) {
+            PaUtil_FreeMemory( stream->blockingState->writeRingBufferData );
+            PaUtil_FreeMemory( stream->blockingState->writeStreamBuffer );
+            CloseHandle( stream->blockingState->writeBuffersReadyEvent );
+        }
+
+        PaUtil_FreeMemory( stream->blockingState );
+    }
+
+    PaUtil_FreeMemory( stream->asioBufferInfos );
+    PaUtil_FreeMemory( stream->asioChannelInfos );
+    PaUtil_FreeMemory( stream->bufferPtrs );
+    PaUtil_FreeMemory( stream );
+
+    ASIODisposeBuffers();
+    UnloadAsioDriver();
+
+    theAsioStream = 0;
+
+    return result;
+}
+
+
+static void bufferSwitch(long index, ASIOBool directProcess)
+{
+//TAKEN FROM THE ASIO SDK
+
+    // the actual processing callback.
+    // Beware that this is normally in a seperate thread, hence be sure that
+    // you take care about thread synchronization. This is omitted here for
+    // simplicity.
+
+    // as this is a "back door" into the bufferSwitchTimeInfo a timeInfo needs
+    // to be created though it will only set the timeInfo.samplePosition and
+    // timeInfo.systemTime fields and the according flags
+
+    ASIOTime  timeInfo;
+    memset( &timeInfo, 0, sizeof (timeInfo) );
+
+    // get the time stamp of the buffer, not necessary if no
+    // synchronization to other media is required
+    if( ASIOGetSamplePosition(&timeInfo.timeInfo.samplePosition, &timeInfo.timeInfo.systemTime) == ASE_OK)
+            timeInfo.timeInfo.flags = kSystemTimeValid | kSamplePositionValid;
+
+    // Call the real callback
+    bufferSwitchTimeInfo( &timeInfo, index, directProcess );
+}
+
+
+// conversion from 64 bit ASIOSample/ASIOTimeStamp to double float
+#if NATIVE_INT64
+    #define ASIO64toDouble(a)  (a)
+#else
+    const double twoRaisedTo32 = 4294967296.;
+    #define ASIO64toDouble(a)  ((a).lo + (a).hi * twoRaisedTo32)
+#endif
+
+static ASIOTime *bufferSwitchTimeInfo( ASIOTime *timeInfo, long index, ASIOBool directProcess )
+{
+    // the actual processing callback.
+    // Beware that this is normally in a seperate thread, hence be sure that
+    // you take care about thread synchronization.
+
+
+    /* The SDK says the following about the directProcess flag:
+        suggests to the host whether it should immediately start processing
+        (directProcess == ASIOTrue), or whether its process should be deferred
+        because the call comes from a very low level (for instance, a high level
+        priority interrupt), and direct processing would cause timing instabilities for
+        the rest of the system. If in doubt, directProcess should be set to ASIOFalse.
+
+        We just ignore directProcess. This could cause incompatibilities with
+        drivers which really don't want the audio processing to occur in this
+        callback, but none have been identified yet.
+    */
+
+    (void) directProcess; /* suppress unused parameter warning */
+
+#if 0
+    // store the timeInfo for later use
+    asioDriverInfo.tInfo = *timeInfo;
+
+    // get the time stamp of the buffer, not necessary if no
+    // synchronization to other media is required
+
+    if (timeInfo->timeInfo.flags & kSystemTimeValid)
+            asioDriverInfo.nanoSeconds = ASIO64toDouble(timeInfo->timeInfo.systemTime);
+    else
+            asioDriverInfo.nanoSeconds = 0;
+
+    if (timeInfo->timeInfo.flags & kSamplePositionValid)
+            asioDriverInfo.samples = ASIO64toDouble(timeInfo->timeInfo.samplePosition);
+    else
+            asioDriverInfo.samples = 0;
+
+    if (timeInfo->timeCode.flags & kTcValid)
+            asioDriverInfo.tcSamples = ASIO64toDouble(timeInfo->timeCode.timeCodeSamples);
+    else
+            asioDriverInfo.tcSamples = 0;
+
+    // get the system reference time
+    asioDriverInfo.sysRefTime = get_sys_reference_time();
+#endif
+
+#if 0
+    // a few debug messages for the Windows device driver developer
+    // tells you the time when driver got its interrupt and the delay until the app receives
+    // the event notification.
+    static double last_samples = 0;
+    char tmp[128];
+    sprintf (tmp, "diff: %d / %d ms / %d ms / %d samples                 \n", asioDriverInfo.sysRefTime - (long)(asioDriverInfo.nanoSeconds / 1000000.0), asioDriverInfo.sysRefTime, (long)(asioDriverInfo.nanoSeconds / 1000000.0), (long)(asioDriverInfo.samples - last_samples));
+    OutputDebugString (tmp);
+    last_samples = asioDriverInfo.samples;
+#endif
+
+
+    if( !theAsioStream )
+        return 0L;
+
+    // protect against reentrancy
+    if( PaAsio_AtomicIncrement(&theAsioStream->reenterCount) )
+    {
+        theAsioStream->reenterError++;
+        //DBUG(("bufferSwitchTimeInfo : reentrancy detection = %d\n", asioDriverInfo.reenterError));
+        return 0L;
+    }
+
+    int buffersDone = 0;
+    
+    do
+    {
+        if( buffersDone > 0 )
+        {
+            // this is a reentered buffer, we missed processing it on time
+            // set the input overflow and output underflow flags as appropriate
+            
+            if( theAsioStream->inputChannelCount > 0 )
+                theAsioStream->callbackFlags |= paInputOverflow;
+                
+            if( theAsioStream->outputChannelCount > 0 )
+                theAsioStream->callbackFlags |= paOutputUnderflow;
+        }
+        else
+        {
+            if( theAsioStream->zeroOutput )
+            {
+                ZeroOutputBuffers( theAsioStream, index );
+
+                // Finally if the driver supports the ASIOOutputReady() optimization,
+                // do it here, all data are in place
+                if( theAsioStream->postOutput )
+                    ASIOOutputReady();
+
+                if( theAsioStream->stopProcessing )
+                {
+                    if( theAsioStream->stopPlayoutCount < 2 )
+                    {
+                        ++theAsioStream->stopPlayoutCount;
+                        if( theAsioStream->stopPlayoutCount == 2 )
+                        {
+                            theAsioStream->isActive = 0;
+                            if( theAsioStream->streamRepresentation.streamFinishedCallback != 0 )
+                                theAsioStream->streamRepresentation.streamFinishedCallback( theAsioStream->streamRepresentation.userData );
+                            theAsioStream->streamFinishedCallbackCalled = true;
+                            SetEvent( theAsioStream->completedBuffersPlayedEvent );
+                        }
+                    }
+                }
+            }
+            else
+            {
+
+#if 0
+/*
+    see: "ASIO callback underflow/overflow buffer slip detection doesn't work"
+    http://www.portaudio.com/trac/ticket/110
+*/
+
+// test code to try to detect slip conditions... these may work on some systems
+// but neither of them work on the RME Digi96
+
+// check that sample delta matches buffer size (otherwise we must have skipped
+// a buffer.
+static double last_samples = -512;
+double samples;
+//if( timeInfo->timeCode.flags & kTcValid )
+//    samples = ASIO64toDouble(timeInfo->timeCode.timeCodeSamples);
+//else
+    samples = ASIO64toDouble(timeInfo->timeInfo.samplePosition);
+int delta = samples - last_samples;
+//printf( "%d\n", delta);
+last_samples = samples;
+
+if( delta > theAsioStream->framesPerHostCallback )
+{
+    if( theAsioStream->inputChannelCount > 0 )
+        theAsioStream->callbackFlags |= paInputOverflow;
+
+    if( theAsioStream->outputChannelCount > 0 )
+        theAsioStream->callbackFlags |= paOutputUnderflow;
+}
+
+// check that the buffer index is not the previous index (which would indicate
+// that a buffer was skipped.
+static int previousIndex = 1;
+if( index == previousIndex )
+{
+    if( theAsioStream->inputChannelCount > 0 )
+        theAsioStream->callbackFlags |= paInputOverflow;
+
+    if( theAsioStream->outputChannelCount > 0 )
+        theAsioStream->callbackFlags |= paOutputUnderflow;
+}
+previousIndex = index;
+#endif
+
+                int i;
+
+                PaUtil_BeginCpuLoadMeasurement( &theAsioStream->cpuLoadMeasurer );
+
+                PaStreamCallbackTimeInfo paTimeInfo;
+
+                // asio systemTime is supposed to be measured according to the same
+                // clock as timeGetTime
+                paTimeInfo.currentTime = (ASIO64toDouble( timeInfo->timeInfo.systemTime ) * .000000001);
+
+                /* patch from Paul Boege */
+                paTimeInfo.inputBufferAdcTime = paTimeInfo.currentTime -
+                    ((double)theAsioStream->asioInputLatencyFrames/theAsioStream->streamRepresentation.streamInfo.sampleRate);
+
+                paTimeInfo.outputBufferDacTime = paTimeInfo.currentTime +
+                    ((double)theAsioStream->asioOutputLatencyFrames/theAsioStream->streamRepresentation.streamInfo.sampleRate);
+
+                /* old version is buggy because the buffer processor also adds in its latency to the time parameters
+                paTimeInfo.inputBufferAdcTime = paTimeInfo.currentTime - theAsioStream->streamRepresentation.streamInfo.inputLatency;
+                paTimeInfo.outputBufferDacTime = paTimeInfo.currentTime + theAsioStream->streamRepresentation.streamInfo.outputLatency;
+                */
+
+/* Disabled! Stopping and re-starting the stream causes an input overflow / output undeflow. S.Fischer */
+#if 0
+// detect underflows by checking inter-callback time > 2 buffer period
+static double previousTime = -1;
+if( previousTime > 0 ){
+
+    double delta = paTimeInfo.currentTime - previousTime;
+
+    if( delta >= 2. * (theAsioStream->framesPerHostCallback / theAsioStream->streamRepresentation.streamInfo.sampleRate) ){
+        if( theAsioStream->inputChannelCount > 0 )
+            theAsioStream->callbackFlags |= paInputOverflow;
+
+        if( theAsioStream->outputChannelCount > 0 )
+            theAsioStream->callbackFlags |= paOutputUnderflow;
+    }
+}
+previousTime = paTimeInfo.currentTime;
+#endif
+
+                // note that the above input and output times do not need to be
+                // adjusted for the latency of the buffer processor -- the buffer
+                // processor handles that.
+
+                if( theAsioStream->inputBufferConverter )
+                {
+                    for( i=0; i<theAsioStream->inputChannelCount; i++ )
+                    {
+                        theAsioStream->inputBufferConverter( theAsioStream->inputBufferPtrs[index][i],
+                                theAsioStream->inputShift, theAsioStream->framesPerHostCallback );
+                    }
+                }
+
+                PaUtil_BeginBufferProcessing( &theAsioStream->bufferProcessor, &paTimeInfo, theAsioStream->callbackFlags );
+
+                /* reset status flags once they've been passed to the callback */
+                theAsioStream->callbackFlags = 0;
+
+                PaUtil_SetInputFrameCount( &theAsioStream->bufferProcessor, 0 /* default to host buffer size */ );
+                for( i=0; i<theAsioStream->inputChannelCount; ++i )
+                    PaUtil_SetNonInterleavedInputChannel( &theAsioStream->bufferProcessor, i, theAsioStream->inputBufferPtrs[index][i] );
+
+                PaUtil_SetOutputFrameCount( &theAsioStream->bufferProcessor, 0 /* default to host buffer size */ );
+                for( i=0; i<theAsioStream->outputChannelCount; ++i )
+                    PaUtil_SetNonInterleavedOutputChannel( &theAsioStream->bufferProcessor, i, theAsioStream->outputBufferPtrs[index][i] );
+
+                int callbackResult;
+                if( theAsioStream->stopProcessing )
+                    callbackResult = paComplete;
+                else
+                    callbackResult = paContinue;
+                unsigned long framesProcessed = PaUtil_EndBufferProcessing( &theAsioStream->bufferProcessor, &callbackResult );
+
+                if( theAsioStream->outputBufferConverter )
+                {
+                    for( i=0; i<theAsioStream->outputChannelCount; i++ )
+                    {
+                        theAsioStream->outputBufferConverter( theAsioStream->outputBufferPtrs[index][i],
+                                theAsioStream->outputShift, theAsioStream->framesPerHostCallback );
+                    }
+                }
+
+                PaUtil_EndCpuLoadMeasurement( &theAsioStream->cpuLoadMeasurer, framesProcessed );
+
+                // Finally if the driver supports the ASIOOutputReady() optimization,
+                // do it here, all data are in place
+                if( theAsioStream->postOutput )
+                    ASIOOutputReady();
+
+                if( callbackResult == paContinue )
+                {
+                    /* nothing special to do */
+                }
+                else if( callbackResult == paAbort )
+                {
+                    /* finish playback immediately  */
+                    theAsioStream->isActive = 0;
+                    if( theAsioStream->streamRepresentation.streamFinishedCallback != 0 )
+                        theAsioStream->streamRepresentation.streamFinishedCallback( theAsioStream->streamRepresentation.userData );
+                    theAsioStream->streamFinishedCallbackCalled = true;
+                    SetEvent( theAsioStream->completedBuffersPlayedEvent );
+                    theAsioStream->zeroOutput = true;
+                }
+                else /* paComplete or other non-zero value indicating complete */
+                {
+                    /* Finish playback once currently queued audio has completed. */
+                    theAsioStream->stopProcessing = true;
+
+                    if( PaUtil_IsBufferProcessorOutputEmpty( &theAsioStream->bufferProcessor ) )
+                    {
+                        theAsioStream->zeroOutput = true;
+                        theAsioStream->stopPlayoutCount = 0;
+                    }
+                }
+            }
+        }
+        
+        ++buffersDone;
+    }while( PaAsio_AtomicDecrement(&theAsioStream->reenterCount) >= 0 );
+
+    return 0L;
+}
+
+
+static void sampleRateChanged(ASIOSampleRate sRate)
+{
+    // TAKEN FROM THE ASIO SDK
+    // do whatever you need to do if the sample rate changed
+    // usually this only happens during external sync.
+    // Audio processing is not stopped by the driver, actual sample rate
+    // might not have even changed, maybe only the sample rate status of an
+    // AES/EBU or S/PDIF digital input at the audio device.
+    // You might have to update time/sample related conversion routines, etc.
+
+    (void) sRate; /* unused parameter */
+    PA_DEBUG( ("sampleRateChanged : %d \n", sRate));
+}
+
+static long asioMessages(long selector, long value, void* message, double* opt)
+{
+// TAKEN FROM THE ASIO SDK
+    // currently the parameters "value", "message" and "opt" are not used.
+    long ret = 0;
+
+    (void) message; /* unused parameters */
+    (void) opt;
+
+    PA_DEBUG( ("asioMessages : %d , %d \n", selector, value));
+
+    switch(selector)
+    {
+        case kAsioSelectorSupported:
+            if(value == kAsioResetRequest
+            || value == kAsioEngineVersion
+            || value == kAsioResyncRequest
+            || value == kAsioLatenciesChanged
+            // the following three were added for ASIO 2.0, you don't necessarily have to support them
+            || value == kAsioSupportsTimeInfo
+            || value == kAsioSupportsTimeCode
+            || value == kAsioSupportsInputMonitor)
+                    ret = 1L;
+            break;
+
+        case kAsioBufferSizeChange:
+            //printf("kAsioBufferSizeChange \n");
+            break;
+
+        case kAsioResetRequest:
+            // defer the task and perform the reset of the driver during the next "safe" situation
+            // You cannot reset the driver right now, as this code is called from the driver.
+            // Reset the driver is done by completely destruct is. I.e. ASIOStop(), ASIODisposeBuffers(), Destruction
+            // Afterwards you initialize the driver again.
+
+            /*FIXME: commented the next line out
+
+                see: "PA/ASIO ignores some driver notifications it probably shouldn't"
+                http://www.portaudio.com/trac/ticket/108
+            */
+            //asioDriverInfo.stopped;  // In this sample the processing will just stop
+            ret = 1L;
+            break;
+
+        case kAsioResyncRequest:
+            // This informs the application, that the driver encountered some non fatal data loss.
+            // It is used for synchronization purposes of different media.
+            // Added mainly to work around the Win16Mutex problems in Windows 95/98 with the
+            // Windows Multimedia system, which could loose data because the Mutex was hold too long
+            // by another thread.
+            // However a driver can issue it in other situations, too.
+            ret = 1L;
+            break;
+
+        case kAsioLatenciesChanged:
+            // This will inform the host application that the drivers were latencies changed.
+            // Beware, it this does not mean that the buffer sizes have changed!
+            // You might need to update internal delay data.
+            ret = 1L;
+            //printf("kAsioLatenciesChanged \n");
+            break;
+
+        case kAsioEngineVersion:
+            // return the supported ASIO version of the host application
+            // If a host applications does not implement this selector, ASIO 1.0 is assumed
+            // by the driver
+            ret = 2L;
+            break;
+
+        case kAsioSupportsTimeInfo:
+            // informs the driver wether the asioCallbacks.bufferSwitchTimeInfo() callback
+            // is supported.
+            // For compatibility with ASIO 1.0 drivers the host application should always support
+            // the "old" bufferSwitch method, too.
+            ret = 1;
+            break;
+
+        case kAsioSupportsTimeCode:
+            // informs the driver wether application is interested in time code info.
+            // If an application does not need to know about time code, the driver has less work
+            // to do.
+            ret = 0;
+            break;
+    }
+    return ret;
+}
+
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsioStream *stream = (PaAsioStream*)s;
+    PaAsioStreamBlockingState *blockingState = stream->blockingState;
+    ASIOError asioError;
+
+    if( stream->outputChannelCount > 0 )
+    {
+        ZeroOutputBuffers( stream, 0 );
+        ZeroOutputBuffers( stream, 1 );
+    }
+
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+    stream->stopProcessing = false;
+    stream->zeroOutput = false;
+
+    /* Reentrancy counter initialisation */
+    stream->reenterCount = -1;
+    stream->reenterError = 0;
+
+    stream->callbackFlags = 0;
+
+    if( ResetEvent( stream->completedBuffersPlayedEvent ) == 0 )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+    }
+
+
+    /* Using blocking i/o interface... */
+    if( blockingState )
+    {
+        /* Reset blocking i/o buffer processor. */
+        PaUtil_ResetBufferProcessor( &blockingState->bufferProcessor );
+
+        /* If we're about to process some input data. */
+        if( stream->inputChannelCount )
+        {
+            /* Reset callback-ReadStream sync event. */
+            if( ResetEvent( blockingState->readFramesReadyEvent ) == 0 )
+            {
+                result = paUnanticipatedHostError;
+                PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+            }
+
+            /* Flush blocking i/o ring buffer. */
+            PaUtil_FlushRingBuffer( &blockingState->readRingBuffer );
+            (*blockingState->bufferProcessor.inputZeroer)( blockingState->readRingBuffer.buffer, 1, blockingState->bufferProcessor.inputChannelCount * blockingState->readRingBuffer.bufferSize );
+        }
+
+        /* If we're about to process some output data. */
+        if( stream->outputChannelCount )
+        {
+            /* Reset callback-WriteStream sync event. */
+            if( ResetEvent( blockingState->writeBuffersReadyEvent ) == 0 )
+            {
+                result = paUnanticipatedHostError;
+                PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+            }
+
+            /* Flush blocking i/o ring buffer. */
+            PaUtil_FlushRingBuffer( &blockingState->writeRingBuffer );
+            (*blockingState->bufferProcessor.outputZeroer)( blockingState->writeRingBuffer.buffer, 1, blockingState->bufferProcessor.outputChannelCount * blockingState->writeRingBuffer.bufferSize );
+
+            /* Initialize the output ring buffer to "silence". */
+            PaUtil_AdvanceRingBufferWriteIndex( &blockingState->writeRingBuffer, blockingState->writeRingBufferInitialFrames );
+        }
+
+        /* Clear requested frames / buffers count. */
+        blockingState->writeBuffersRequested     = 0;
+        blockingState->readFramesRequested       = 0;
+        blockingState->writeBuffersRequestedFlag = FALSE;
+        blockingState->readFramesRequestedFlag   = FALSE;
+        blockingState->outputUnderflowFlag       = FALSE;
+        blockingState->inputOverflowFlag         = FALSE;
+        blockingState->stopFlag                  = FALSE;
+    }
+
+
+    if( result == paNoError )
+    {
+        assert( theAsioStream == stream ); /* theAsioStream should be set correctly in OpenStream */
+
+        /* initialize these variables before the callback has a chance to be invoked */
+        stream->isStopped = 0;
+        stream->isActive = 1;
+        stream->streamFinishedCallbackCalled = false;
+
+        asioError = ASIOStart();
+        if( asioError != ASE_OK )
+        {
+            stream->isStopped = 1;
+            stream->isActive = 0;
+
+            result = paUnanticipatedHostError;
+            PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        }
+    }
+
+    return result;
+}
+
+static void EnsureCallbackHasCompleted( PaAsioStream *stream )
+{
+    // make sure that the callback is not still in-flight after ASIOStop()
+    // returns. This has been observed to happen on the Hoontech DSP24 for
+    // example.
+    int count = 2000;  // only wait for 2 seconds, rather than hanging.
+    while( stream->reenterCount != -1 && count > 0 )
+    {
+        Sleep(1);
+        --count;
+    }
+}
+
+static PaError StopStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsioStream *stream = (PaAsioStream*)s;
+    PaAsioStreamBlockingState *blockingState = stream->blockingState;
+    ASIOError asioError;
+
+    if( stream->isActive )
+    {
+        /* If blocking i/o output is in use */
+        if( blockingState && stream->outputChannelCount )
+        {
+            /* Request the whole output buffer to be available. */
+            blockingState->writeBuffersRequested = blockingState->writeRingBuffer.bufferSize;
+            /* Signalize that additional buffers are need. */
+            blockingState->writeBuffersRequestedFlag = TRUE;
+            /* Set flag to indicate the playback is to be stopped. */
+            blockingState->stopFlag = TRUE;
+
+            /* Wait until requested number of buffers has been freed. Time
+               out after twice the blocking i/o ouput buffer could have
+               been consumed. */
+            DWORD timeout = (DWORD)( 2 * blockingState->writeRingBuffer.bufferSize * 1000
+                                       / stream->streamRepresentation.streamInfo.sampleRate );
+            DWORD waitResult = WaitForSingleObject( blockingState->writeBuffersReadyEvent, timeout );
+
+            /* If something seriously went wrong... */
+            if( waitResult == WAIT_FAILED )
+            {
+                PA_DEBUG(("WaitForSingleObject() failed in StopStream()\n"));
+                result = paUnanticipatedHostError;
+                PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+            }
+            else if( waitResult == WAIT_TIMEOUT )
+            {
+                PA_DEBUG(("WaitForSingleObject() timed out in StopStream()\n"));
+                result = paTimedOut;
+            }
+        }
+
+        stream->stopProcessing = true;
+
+        /* wait for the stream to finish playing out enqueued buffers.
+            timeout after four times the stream latency.
+
+            @todo should use a better time out value - if the user buffer
+            length is longer than the asio buffer size then that should
+            be taken into account.
+        */
+        if( WaitForSingleObject( stream->completedBuffersPlayedEvent,
+                (DWORD)(stream->streamRepresentation.streamInfo.outputLatency * 1000. * 4.) )
+                    == WAIT_TIMEOUT )
+        {
+            PA_DEBUG(("WaitForSingleObject() timed out in StopStream()\n" ));
+        }
+    }
+
+    asioError = ASIOStop();
+    if( asioError == ASE_OK )
+    {
+        EnsureCallbackHasCompleted( stream );
+    }
+    else
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+    }
+
+    stream->isStopped = 1;
+    stream->isActive = 0;
+
+    if( !stream->streamFinishedCallbackCalled )
+    {
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+
+    return result;
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaAsioStream *stream = (PaAsioStream*)s;
+    ASIOError asioError;
+
+    stream->zeroOutput = true;
+
+    asioError = ASIOStop();
+    if( asioError == ASE_OK )
+    {
+        EnsureCallbackHasCompleted( stream );
+    }
+    else
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+    }
+
+    stream->isStopped = 1;
+    stream->isActive = 0;
+
+    if( !stream->streamFinishedCallbackCalled )
+    {
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+
+    return result;
+}
+
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaAsioStream *stream = (PaAsioStream*)s;
+    
+    return stream->isStopped;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaAsioStream *stream = (PaAsioStream*)s;
+
+    return stream->isActive;
+}
+
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    (void) s; /* unused parameter */
+    return (double)timeGetTime() * .001;
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaAsioStream *stream = (PaAsioStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+/*
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+static PaError ReadStream( PaStream      *s     ,
+                           void          *buffer,
+                           unsigned long  frames )
+{
+    PaError result = paNoError; /* Initial return value. */
+    PaAsioStream *stream = (PaAsioStream*)s; /* The PA ASIO stream. */
+
+    /* Pointer to the blocking i/o data struct. */
+    PaAsioStreamBlockingState *blockingState = stream->blockingState;
+
+    /* Get blocking i/o buffer processor and ring buffer pointers. */
+    PaUtilBufferProcessor *pBp = &blockingState->bufferProcessor;
+    PaUtilRingBuffer      *pRb = &blockingState->readRingBuffer;
+
+    /* Ring buffer segment(s) used for writing. */
+    void *pRingBufferData1st = NULL; /* First segment. (Mandatory) */
+    void *pRingBufferData2nd = NULL; /* Second segment. (Optional) */
+
+    /* Number of frames per ring buffer segment. */
+    long lRingBufferSize1st = 0; /* First segment. (Mandatory) */
+    long lRingBufferSize2nd = 0; /* Second segment. (Optional) */
+
+    /* Get number of frames to be processed per data block. */
+    unsigned long lFramesPerBlock = stream->bufferProcessor.framesPerUserBuffer;
+    /* Actual number of frames that has been copied into the ring buffer. */
+    unsigned long lFramesCopied = 0;
+    /* The number of remaining unprocessed dtat frames. */
+    unsigned long lFramesRemaining = frames;
+
+    /* Copy the input argument to avoid pointer increment! */
+    const void *userBuffer;
+    unsigned int i; /* Just a counter. */
+
+    /* About the time, needed to process 8 data blocks. */
+    DWORD timeout = (DWORD)( 8 * lFramesPerBlock * 1000 / stream->streamRepresentation.streamInfo.sampleRate );
+    DWORD waitResult = 0;
+
+
+    /* Check if the stream is still available ready to gather new data. */
+    if( blockingState->stopFlag || !stream->isActive )
+    {
+        PA_DEBUG(("Warning! Stream no longer available for reading in ReadStream()\n"));
+        result = paStreamIsStopped;
+        return result;
+    }
+
+    /* If the stream is a input stream. */
+    if( stream->inputChannelCount )
+    {
+        /* Prepare buffer access. */
+        if( !pBp->userOutputIsInterleaved )
+        {
+            userBuffer = blockingState->readStreamBuffer;
+            for( i = 0; i<pBp->inputChannelCount; ++i )
+            {
+                ((void**)userBuffer)[i] = ((void**)buffer)[i];
+            }
+        } /* Use the unchanged buffer. */
+        else { userBuffer = buffer; }
+
+        do /* Internal block processing for too large user data buffers. */
+        {
+            /* Get the size of the current data block to be processed. */
+            lFramesPerBlock =(lFramesPerBlock < lFramesRemaining)
+                            ? lFramesPerBlock : lFramesRemaining;
+            /* Use predefined block size for as long there are enough
+               buffers available, thereafter reduce the processing block
+               size to match the number of remaining buffers. So the final
+               data block is processed although it may be incomplete. */
+
+            /* If the available amount of data frames is insufficient. */
+            if( PaUtil_GetRingBufferReadAvailable(pRb) < (long) lFramesPerBlock )
+            {
+                /* Make sure, the event isn't already set! */
+                /* ResetEvent( blockingState->readFramesReadyEvent ); */
+
+                /* Set the number of requested buffers. */
+                blockingState->readFramesRequested = lFramesPerBlock;
+
+                /* Signalize that additional buffers are need. */
+                blockingState->readFramesRequestedFlag = TRUE;
+
+                /* Wait until requested number of buffers has been freed. */
+                waitResult = WaitForSingleObject( blockingState->readFramesReadyEvent, timeout );
+
+                /* If something seriously went wrong... */
+                if( waitResult == WAIT_FAILED )
+                {
+                    PA_DEBUG(("WaitForSingleObject() failed in ReadStream()\n"));
+                    result = paUnanticipatedHostError;
+                    PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+                    return result;
+                }
+                else if( waitResult == WAIT_TIMEOUT )
+                {
+                    PA_DEBUG(("WaitForSingleObject() timed out in ReadStream()\n"));
+
+                    /* If block processing has stopped, abort! */
+                    if( blockingState->stopFlag ) { return result = paStreamIsStopped; }
+
+                    /* If a timeout is encountered, give up eventually. */
+                    return result = paTimedOut;
+                }
+            }
+            /* Now, the ring buffer contains the required amount of data
+               frames.
+               (Therefor we don't need to check the return argument of
+               PaUtil_GetRingBufferReadRegions(). ;-) )
+            */
+
+            /* Retrieve pointer(s) to the ring buffer's current write
+               position(s). If the first buffer segment is too small to
+               store the requested number of bytes, an additional second
+               segment is returned. Otherwise, i.e. if the first segment
+               is large enough, the second segment's pointer will be NULL.
+            */
+            PaUtil_GetRingBufferReadRegions(pRb                ,
+                                            lFramesPerBlock    ,
+                                            &pRingBufferData1st,
+                                            &lRingBufferSize1st,
+                                            &pRingBufferData2nd,
+                                            &lRingBufferSize2nd);
+
+            /* Set number of frames to be copied from the ring buffer. */
+            PaUtil_SetInputFrameCount( pBp, lRingBufferSize1st ); 
+            /* Setup ring buffer access. */
+            PaUtil_SetInterleavedInputChannels(pBp               ,  /* Buffer processor. */
+                                               0                 ,  /* The first channel's index. */
+                                               pRingBufferData1st,  /* First ring buffer segment. */
+                                               0                 ); /* Use all available channels. */
+
+            /* If a second ring buffer segment is required. */
+            if( lRingBufferSize2nd ) {
+                /* Set number of frames to be copied from the ring buffer. */
+                PaUtil_Set2ndInputFrameCount( pBp, lRingBufferSize2nd );
+                /* Setup ring buffer access. */
+                PaUtil_Set2ndInterleavedInputChannels(pBp               ,  /* Buffer processor. */
+                                                      0                 ,  /* The first channel's index. */
+                                                      pRingBufferData2nd,  /* Second ring buffer segment. */
+                                                      0                 ); /* Use all available channels. */
+            }
+
+            /* Let the buffer processor handle "copy and conversion" and
+               update the ring buffer indices manually. */
+            lFramesCopied = PaUtil_CopyInput( pBp, &buffer, lFramesPerBlock );
+            PaUtil_AdvanceRingBufferReadIndex( pRb, lFramesCopied );
+
+            /* Decrease number of unprocessed frames. */
+            lFramesRemaining -= lFramesCopied;
+
+        } /* Continue with the next data chunk. */
+        while( lFramesRemaining );
+
+
+        /* If there has been an input overflow within the callback */
+        if( blockingState->inputOverflowFlag )
+        {
+            blockingState->inputOverflowFlag = FALSE;
+
+            /* Return the corresponding error code. */
+            result = paInputOverflowed;
+        }
+
+    } /* If this is not an input stream. */
+    else {
+        result = paCanNotReadFromAnOutputOnlyStream;
+    }
+
+    return result;
+}
+
+static PaError WriteStream( PaStream      *s     ,
+                            const void    *buffer,
+                            unsigned long  frames )
+{
+    PaError result = paNoError; /* Initial return value. */
+    PaAsioStream *stream = (PaAsioStream*)s; /* The PA ASIO stream. */
+
+    /* Pointer to the blocking i/o data struct. */
+    PaAsioStreamBlockingState *blockingState = stream->blockingState;
+
+    /* Get blocking i/o buffer processor and ring buffer pointers. */
+    PaUtilBufferProcessor *pBp = &blockingState->bufferProcessor;
+    PaUtilRingBuffer      *pRb = &blockingState->writeRingBuffer;
+
+    /* Ring buffer segment(s) used for writing. */
+    void *pRingBufferData1st = NULL; /* First segment. (Mandatory) */
+    void *pRingBufferData2nd = NULL; /* Second segment. (Optional) */
+
+    /* Number of frames per ring buffer segment. */
+    long lRingBufferSize1st = 0; /* First segment. (Mandatory) */
+    long lRingBufferSize2nd = 0; /* Second segment. (Optional) */
+
+    /* Get number of frames to be processed per data block. */
+    unsigned long lFramesPerBlock = stream->bufferProcessor.framesPerUserBuffer;
+    /* Actual number of frames that has been copied into the ring buffer. */
+    unsigned long lFramesCopied = 0;
+    /* The number of remaining unprocessed dtat frames. */
+    unsigned long lFramesRemaining = frames;
+
+    /* About the time, needed to process 8 data blocks. */
+    DWORD timeout = (DWORD)( 8 * lFramesPerBlock * 1000 / stream->streamRepresentation.streamInfo.sampleRate );
+    DWORD waitResult = 0;
+
+    /* Copy the input argument to avoid pointer increment! */
+    const void *userBuffer;
+    unsigned int i; /* Just a counter. */
+
+
+    /* Check if the stream ist still available ready to recieve new data. */
+    if( blockingState->stopFlag || !stream->isActive )
+    {
+        PA_DEBUG(("Warning! Stream no longer available for writing in WriteStream()\n"));
+        result = paStreamIsStopped;
+        return result;
+    }
+
+    /* If the stream is a output stream. */
+    if( stream->outputChannelCount )
+    {
+        /* Prepare buffer access. */
+        if( !pBp->userOutputIsInterleaved )
+        {
+            userBuffer = blockingState->writeStreamBuffer;
+            for( i = 0; i<pBp->outputChannelCount; ++i )
+            {
+                ((const void**)userBuffer)[i] = ((const void**)buffer)[i];
+            }
+        } /* Use the unchanged buffer. */
+        else { userBuffer = buffer; }
+
+
+        do /* Internal block processing for too large user data buffers. */
+        {
+            /* Get the size of the current data block to be processed. */
+            lFramesPerBlock =(lFramesPerBlock < lFramesRemaining)
+                            ? lFramesPerBlock : lFramesRemaining;
+            /* Use predefined block size for as long there are enough
+               frames available, thereafter reduce the processing block
+               size to match the number of remaining frames. So the final
+               data block is processed although it may be incomplete. */
+
+            /* If the available amount of buffers is insufficient. */
+            if( PaUtil_GetRingBufferWriteAvailable(pRb) < (long) lFramesPerBlock )
+            {
+                /* Make sure, the event isn't already set! */
+                /* ResetEvent( blockingState->writeBuffersReadyEvent ); */
+
+                /* Set the number of requested buffers. */
+                blockingState->writeBuffersRequested = lFramesPerBlock;
+
+                /* Signalize that additional buffers are need. */
+                blockingState->writeBuffersRequestedFlag = TRUE;
+
+                /* Wait until requested number of buffers has been freed. */
+                waitResult = WaitForSingleObject( blockingState->writeBuffersReadyEvent, timeout );
+
+                /* If something seriously went wrong... */
+                if( waitResult == WAIT_FAILED )
+                {
+                    PA_DEBUG(("WaitForSingleObject() failed in WriteStream()\n"));
+                    result = paUnanticipatedHostError;
+                    PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
+                    return result;
+                }
+                else if( waitResult == WAIT_TIMEOUT )
+                {
+                    PA_DEBUG(("WaitForSingleObject() timed out in WriteStream()\n"));
+
+                    /* If block processing has stopped, abort! */
+                    if( blockingState->stopFlag ) { return result = paStreamIsStopped; }
+                    
+                    /* If a timeout is encountered, give up eventually. */
+                    return result = paTimedOut;
+                }
+            }
+            /* Now, the ring buffer contains the required amount of free
+               space to store the provided number of data frames.
+               (Therefor we don't need to check the return argument of
+               PaUtil_GetRingBufferWriteRegions(). ;-) )
+            */
+
+            /* Retrieve pointer(s) to the ring buffer's current write
+               position(s). If the first buffer segment is too small to
+               store the requested number of bytes, an additional second
+               segment is returned. Otherwise, i.e. if the first segment
+               is large enough, the second segment's pointer will be NULL.
+            */
+            PaUtil_GetRingBufferWriteRegions(pRb                ,
+                                             lFramesPerBlock    ,
+                                             &pRingBufferData1st,
+                                             &lRingBufferSize1st,
+                                             &pRingBufferData2nd,
+                                             &lRingBufferSize2nd);
+
+            /* Set number of frames to be copied to the ring buffer. */
+            PaUtil_SetOutputFrameCount( pBp, lRingBufferSize1st ); 
+            /* Setup ring buffer access. */
+            PaUtil_SetInterleavedOutputChannels(pBp               ,  /* Buffer processor. */
+                                                0                 ,  /* The first channel's index. */
+                                                pRingBufferData1st,  /* First ring buffer segment. */
+                                                0                 ); /* Use all available channels. */
+
+            /* If a second ring buffer segment is required. */
+            if( lRingBufferSize2nd ) {
+                /* Set number of frames to be copied to the ring buffer. */
+                PaUtil_Set2ndOutputFrameCount( pBp, lRingBufferSize2nd );
+                /* Setup ring buffer access. */
+                PaUtil_Set2ndInterleavedOutputChannels(pBp               ,  /* Buffer processor. */
+                                                       0                 ,  /* The first channel's index. */
+                                                       pRingBufferData2nd,  /* Second ring buffer segment. */
+                                                       0                 ); /* Use all available channels. */
+            }
+
+            /* Let the buffer processor handle "copy and conversion" and
+               update the ring buffer indices manually. */
+            lFramesCopied = PaUtil_CopyOutput( pBp, &userBuffer, lFramesPerBlock );
+            PaUtil_AdvanceRingBufferWriteIndex( pRb, lFramesCopied );
+
+            /* Decrease number of unprocessed frames. */
+            lFramesRemaining -= lFramesCopied;
+
+        } /* Continue with the next data chunk. */
+        while( lFramesRemaining );
+
+
+        /* If there has been an output underflow within the callback */
+        if( blockingState->outputUnderflowFlag )
+        {
+            blockingState->outputUnderflowFlag = FALSE;
+
+            /* Return the corresponding error code. */
+            result = paOutputUnderflowed;
+        }
+
+    } /* If this is not an output stream. */
+    else
+    {
+        result = paCanNotWriteToAnInputOnlyStream;
+    }
+
+    return result;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaAsioStream *stream = (PaAsioStream*)s;
+
+    /* Call buffer utility routine to get the number of available frames. */
+    return PaUtil_GetRingBufferReadAvailable( &stream->blockingState->readRingBuffer );
+}
+
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaAsioStream *stream = (PaAsioStream*)s;
+
+    /* Call buffer utility routine to get the number of empty buffers. */
+    return PaUtil_GetRingBufferWriteAvailable( &stream->blockingState->writeRingBuffer );
+}
+
+
+/* This routine will be called by the PortAudio engine when audio is needed.
+** It may called at interrupt level on some machines so don't do anything
+** that could mess up the system like calling malloc() or free().
+*/
+static int BlockingIoPaCallback(const void                     *inputBuffer    ,
+                                      void                     *outputBuffer   ,
+                                      unsigned long             framesPerBuffer,
+                                const PaStreamCallbackTimeInfo *timeInfo       ,
+                                      PaStreamCallbackFlags     statusFlags    ,
+                                      void                     *userData       )
+{
+    PaError result = paNoError; /* Initial return value. */
+    PaAsioStream *stream = *(PaAsioStream**)userData; /* The PA ASIO stream. */
+    PaAsioStreamBlockingState *blockingState = stream->blockingState; /* Persume blockingState is valid, otherwise the callback wouldn't be running. */
+
+    /* Get a pointer to the stream's blocking i/o buffer processor. */
+    PaUtilBufferProcessor *pBp = &blockingState->bufferProcessor;
+    PaUtilRingBuffer      *pRb = NULL;
+
+    /* If output data has been requested. */
+    if( stream->outputChannelCount )
+    {
+        /* If the callback input argument signalizes a output underflow,
+           make sure the WriteStream() function knows about it, too! */
+        if( statusFlags & paOutputUnderflowed ) {
+            blockingState->outputUnderflowFlag = TRUE;
+        }
+
+        /* Access the corresponding ring buffer. */
+        pRb = &blockingState->writeRingBuffer;
+
+        /* If the blocking i/o buffer contains enough output data, */
+        if( PaUtil_GetRingBufferReadAvailable(pRb) >= (long) framesPerBuffer )
+        {
+            /* Extract the requested data from the ring buffer. */
+            PaUtil_ReadRingBuffer( pRb, outputBuffer, framesPerBuffer );
+        }
+        else /* If no output data is available :-( */
+        {
+            /* Signalize a write-buffer underflow. */
+            blockingState->outputUnderflowFlag = TRUE;
+
+            /* Fill the output buffer with silence. */
+            (*pBp->outputZeroer)( outputBuffer, 1, pBp->outputChannelCount * framesPerBuffer );
+
+            /* If playback is to be stopped */
+            if( blockingState->stopFlag && PaUtil_GetRingBufferReadAvailable(pRb) < (long) framesPerBuffer )
+            {
+                /* Extract all the remaining data from the ring buffer,
+                   whether it is a complete data block or not. */
+                PaUtil_ReadRingBuffer( pRb, outputBuffer, PaUtil_GetRingBufferReadAvailable(pRb) );
+            }
+        }
+
+        /* Set blocking i/o event? */
+        if( blockingState->writeBuffersRequestedFlag && PaUtil_GetRingBufferWriteAvailable(pRb) >= (long) blockingState->writeBuffersRequested )
+        {
+            /* Reset buffer request. */
+            blockingState->writeBuffersRequestedFlag = FALSE;
+            blockingState->writeBuffersRequested     = 0;
+            /* Signalize that requested buffers are ready. */
+            SetEvent( blockingState->writeBuffersReadyEvent );
+            /* What do we do if SetEvent() returns zero, i.e. the event
+               could not be set? How to return errors from within the
+               callback? - S.Fischer */
+        }
+    }
+
+    /* If input data has been supplied. */
+    if( stream->inputChannelCount )
+    {
+        /* If the callback input argument signalizes a input overflow,
+           make sure the ReadStream() function knows about it, too! */
+        if( statusFlags & paInputOverflowed ) {
+            blockingState->inputOverflowFlag = TRUE;
+        }
+
+        /* Access the corresponding ring buffer. */
+        pRb = &blockingState->readRingBuffer;
+
+        /* If the blocking i/o buffer contains not enough input buffers */
+        if( PaUtil_GetRingBufferWriteAvailable(pRb) < (long) framesPerBuffer )
+        {
+            /* Signalize a read-buffer overflow. */
+            blockingState->inputOverflowFlag = TRUE;
+
+            /* Remove some old data frames from the buffer. */
+            PaUtil_AdvanceRingBufferReadIndex( pRb, framesPerBuffer );
+        }
+
+        /* Insert the current input data into the ring buffer. */
+        PaUtil_WriteRingBuffer( pRb, inputBuffer, framesPerBuffer );
+
+        /* Set blocking i/o event? */
+        if( blockingState->readFramesRequestedFlag && PaUtil_GetRingBufferReadAvailable(pRb) >= (long) blockingState->readFramesRequested )
+        {
+            /* Reset buffer request. */
+            blockingState->readFramesRequestedFlag = FALSE;
+            blockingState->readFramesRequested     = 0;
+            /* Signalize that requested buffers are ready. */
+            SetEvent( blockingState->readFramesReadyEvent );
+            /* What do we do if SetEvent() returns zero, i.e. the event
+               could not be set? How to return errors from within the
+               callback? - S.Fischer */
+            /** @todo report an error with PA_DEBUG */
+        }
+    }
+
+    return paContinue;
+}
+
+
+PaError PaAsio_ShowControlPanel( PaDeviceIndex device, void* systemSpecific )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *hostApi;
+    PaDeviceIndex hostApiDevice;
+    ASIODriverInfo asioDriverInfo;
+    ASIOError asioError;
+    int asioIsInitialized = 0;
+    PaAsioHostApiRepresentation *asioHostApi;
+    PaAsioDeviceInfo *asioDeviceInfo;
+    PaWinUtilComInitializationResult comInitializationResult;
+
+    /* initialize COM again here, we might be in another thread */
+    result = PaWinUtil_CoInitialize( paASIO, &comInitializationResult );
+    if( result != paNoError )
+        return result;
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
+    if( result != paNoError )
+        goto error;
+
+    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
+    if( result != paNoError )
+        goto error;
+
+    /*
+        In theory we could proceed if the currently open device was the same
+        one for which the control panel was requested, however  because the
+        window pointer is not available until this function is called we
+        currently need to call ASIOInit() again here, which of course can't be
+        done safely while a stream is open.
+    */
+
+    asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
+    if( asioHostApi->openAsioDeviceIndex != paNoDevice )
+    {
+        result = paDeviceUnavailable;
+        goto error;
+    }
+
+    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
+
+    if( !asioHostApi->asioDrivers->loadDriver( const_cast<char*>(asioDeviceInfo->commonDeviceInfo.name) ) )
+    {
+        result = paUnanticipatedHostError;
+        goto error;
+    }
+
+    /* CRUCIAL!!! */
+    memset( &asioDriverInfo, 0, sizeof(ASIODriverInfo) );
+    asioDriverInfo.asioVersion = 2;
+    asioDriverInfo.sysRef = systemSpecific;
+    asioError = ASIOInit( &asioDriverInfo );
+    if( asioError != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        goto error;
+    }
+    else
+    {
+        asioIsInitialized = 1;
+    }
+
+PA_DEBUG(("PaAsio_ShowControlPanel: ASIOInit(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
+PA_DEBUG(("asioVersion: ASIOInit(): %ld\n",   asioDriverInfo.asioVersion )); 
+PA_DEBUG(("driverVersion: ASIOInit(): %ld\n", asioDriverInfo.driverVersion )); 
+PA_DEBUG(("Name: ASIOInit(): %s\n",           asioDriverInfo.name )); 
+PA_DEBUG(("ErrorMessage: ASIOInit(): %s\n",   asioDriverInfo.errorMessage )); 
+
+    asioError = ASIOControlPanel();
+    if( asioError != ASE_OK )
+    {
+        PA_DEBUG(("PaAsio_ShowControlPanel: ASIOControlPanel(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        goto error;
+    }
+
+PA_DEBUG(("PaAsio_ShowControlPanel: ASIOControlPanel(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
+
+    asioError = ASIOExit();
+    if( asioError != ASE_OK )
+    {
+        result = paUnanticipatedHostError;
+        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
+        asioIsInitialized = 0;
+        goto error;
+    }
+
+PA_DEBUG(("PaAsio_ShowControlPanel: ASIOExit(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
+
+    return result;
+
+error:
+    if( asioIsInitialized )
+	{
+		ASIOExit();
+	}
+
+    PaWinUtil_CoUninitialize( paASIO, &comInitializationResult );
+
+    return result;
+}
+
+
+PaError PaAsio_GetInputChannelName( PaDeviceIndex device, int channelIndex,
+        const char** channelName )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *hostApi;
+    PaDeviceIndex hostApiDevice;
+    PaAsioDeviceInfo *asioDeviceInfo;
+
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
+    if( result != paNoError )
+        goto error;
+
+    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
+    if( result != paNoError )
+        goto error;
+
+    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
+
+    if( channelIndex < 0 || channelIndex >= asioDeviceInfo->commonDeviceInfo.maxInputChannels ){
+        result = paInvalidChannelCount;
+        goto error;
+    }
+
+    *channelName = asioDeviceInfo->asioChannelInfos[channelIndex].name;
+
+    return paNoError;
+    
+error:
+    return result;
+}
+
+
+PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex,
+        const char** channelName )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *hostApi;
+    PaDeviceIndex hostApiDevice;
+    PaAsioDeviceInfo *asioDeviceInfo;
+
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
+    if( result != paNoError )
+        goto error;
+
+    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
+    if( result != paNoError )
+        goto error;
+
+    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
+
+    if( channelIndex < 0 || channelIndex >= asioDeviceInfo->commonDeviceInfo.maxOutputChannels ){
+        result = paInvalidChannelCount;
+        goto error;
+    }
+
+    *channelName = asioDeviceInfo->asioChannelInfos[
+            asioDeviceInfo->commonDeviceInfo.maxInputChannels + channelIndex].name;
+
+    return paNoError;
+    
+error:
+    return result;
+}
+
+
+/* NOTE: the following functions are ASIO-stream specific, and are called directly
+    by client code. We need to check for many more error conditions here because
+    we don't have the benefit of pa_front.c's parameter checking.
+*/
+
+static PaError GetAsioStreamPointer( PaAsioStream **stream, PaStream *s )
+{
+    PaError result;
+    PaUtilHostApiRepresentation *hostApi;
+    PaAsioHostApiRepresentation *asioHostApi;
+    
+    result = PaUtil_ValidateStreamPointer( s );
+    if( result != paNoError )
+        return result;
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
+    if( result != paNoError )
+        return result;
+
+    asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
+    
+    if( PA_STREAM_REP( s )->streamInterface == &asioHostApi->callbackStreamInterface
+            || PA_STREAM_REP( s )->streamInterface == &asioHostApi->blockingStreamInterface )
+    {
+        /* s is an ASIO  stream */
+        *stream = (PaAsioStream *)s;
+        return paNoError;
+    }
+    else
+    {
+        return paIncompatibleStreamHostApi;
+    }
+}
+
+
+PaError PaAsio_SetStreamSampleRate( PaStream* s, double sampleRate )
+{
+    PaAsioStream *stream;
+    PaError result = GetAsioStreamPointer( &stream, s );
+    if( result != paNoError )
+        return result;
+
+    if( stream != theAsioStream )
+        return paBadStreamPtr;
+
+    return ValidateAndSetSampleRate( sampleRate );
+}
+
diff --git a/Externals/portaudio/src/hostapi/coreaudio/notes.txt b/Externals/portaudio/src/hostapi/coreaudio/notes.txt
new file mode 100644
index 0000000000..145afe1544
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/notes.txt
@@ -0,0 +1,196 @@
+Notes on status of CoreAudio Implementation of PortAudio
+
+Document Last Updated December 9, 2005
+
+There are currently two implementations of PortAudio for Mac Core Audio.
+
+The original is in pa_mac_core_old.c, and the newer, default implementation
+is in pa_mac_core.c.
+Only pa_mac_core.c is currently developed and supported as it uses apple's
+current core audio technology. To select use the old implementation, replace
+pa_mac_core.c with pa_mac_core_old.c (eg. "cp pa_mac_core_auhal.c
+pa_mac_core.c"), then run configure and make as usual.
+
+-------------------------------------------
+
+Notes on Newer/Default AUHAL implementation:
+
+by Bjorn Roche
+
+Last Updated December 9, 2005
+
+Principle of Operation:
+
+This implementation uses AUHAL for audio I/O. To some extent, it also
+operates at the "HAL" Layer, though this behavior can be limited by
+platform specific flags (see pa_mac_core.h for details). The default
+settings should be reasonable: they don't change the SR of the device and
+don't cause interruptions if other devices are using the device.
+
+Major Software Elements Used: Apple's HAL AUs provide output SR
+conversion transparently, however, only on output, so this
+implementation uses AudioConverters to convert the sample rate on input.
+A PortAudio ring buffer is used to buffer input when sample rate
+conversion is required or when separate audio units are used for duplex
+IO. Finally, a PortAudio buffer processor is used to convert formats and
+provide additional buffers if needed. Internally, interleaved floating
+point data streams are used exclusively - the audio unit converts from
+the audio hardware's native format to interleaved float PCM and
+PortAudio's Buffer processor is used for conversion to user formats.
+
+Simplex Input: Simplex input uses a single callback. If sample rate
+conversion is required, a ring buffer and AudioConverter are used as
+well.
+
+Simplex output: Simplex output uses a single callback. No ring buffer or
+audio converter is used because AUHAL does its own output SR conversion.
+
+Duplex, one device (no SR conversion): When one device is used, a single
+callback is used. This achieves very low latency.
+
+Duplex, separate devices or SR conversion: When SR conversion is
+required, data must be buffered before it is converted and data is not
+always available at the same times on input and output, so SR conversion
+requires the same treatment as separate devices. The input callback
+reads data and puts it in the ring buffer. The output callback reads the
+data off the ring buffer, into an audio converter and finally to the
+buffer processor.
+
+Platform Specific Options:
+
+By using the flags in pa_mac_core.h, the user may specify several options.
+For example, the user can specify the sample-rate conversion quality, and
+the extent to which PA will attempt to "play nice" and to what extent it
+will interrupt other apps to improve performance. For example, if 44100 Hz
+sample rate is requested but the device is set at 48000 Hz, PA can either
+change the device for optimal playback ("Pro" mode), which may interrupt
+other programs playing back audio, or simple use a sample-rate coversion,
+which allows for friendlier sharing of the device ("Play Nice" mode).
+
+Additionally, the user may define a "channel mapping" by calling
+paSetupMacCoreChannelMap() on their stream info structure before opening
+the stream with it. See below for creating a channel map.
+
+Known issues:
+
+- Buffering: No buffering beyond that provided by core audio is provided
+except where absolutely needed for the implementation to work. This may cause
+issues with large framesPerBuffer settings and it also means that no additional
+latency will be provided even if a large latency setting is selected.
+
+- Latency: Latency settings are generally ignored. They may be used as a
+hint for buffer size in paHostFramesPerBufferUnspecified, or the value may
+be used in cases where additional buffering is needed, such as doing input and
+output on seperate devices. Latency settings are always automatically bound
+to "safe" values, however, so setting extreme values here should not be
+an issue.
+
+- Buffer Size: paHostFramesPerBufferUnspecified and specific host buffer sizes
+are supported. paHostFramesPerBufferUnspecified works best in "pro" mode,
+where the buffer size and sample rate of the audio device is most likely
+to match the expected values. In the case of paHostFramesPerBuffer, an
+appropriate framesPerBuffer value will be used that guarantees minimum
+requested latency if that's possible.
+
+- Timing info. It reports on stream time, but I'm probably doing something
+wrong since patest_sine_time often reports negative latency numbers. Also,
+there are currently issues with some devices whehn plugging/unplugging
+devices.
+
+- xrun detection: The only xrun detection performed is when reading
+and writing the ring buffer. There is probably more that can be done.
+
+- abort/stop issues: stopping a stream is always a complete operation,
+but latency should be low enough to make the lack of a separate abort
+unnecessary. Apple clarifies its AudioOutputUnitStop() call here:
+http://lists.apple.com/archives/coreaudio-api/2005/Dec/msg00055.html
+
+- blocking interface: should work fine.
+
+- multichannel: It has been tested successfully on multichannel hardware
+from MOTU: traveler and 896HD. Also Presonus firepod and others. It is
+believed to work with all Core Audio devices, including virtual devices
+such as soundflower.
+
+- sample rate conversion quality: By default, SR conversion is the maximum
+available. This can be tweaked using flags pa_mac_core.h. Note that the AU
+render quyality property is used to set the sample rate conversion quality
+as "documented" here:
+http://lists.apple.com/archives/coreaudio-api/2004/Jan/msg00141.html
+
+- x86/Universal Binary: Universal binaries can be build.
+
+
+
+Creating a channel map:
+
+How to create the map array -  Text taken From AUHAL.rtfd :
+[3] Channel Maps
+Clients can tell the AUHAL units which channels of the device they are interested in.  For example, the client may be processing stereo data, but outputting to a six-channel device.  This is done by using the kAudioOutputUnitProperty_ChannelMap property.  To use this property:
+
+For Output:
+Create an array of SInt32 that is the size of the number of channels of the device (Get the Format of the AUHAL's output Element == 0)
+Initialize each of the array's values to -1 (-1 indicates that that channel is NOT to be presented in the conversion.)
+
+Next, for each channel of your app's output, set:
+channelMapArray[deviceOutputChannel] = desiredAppOutputChannel.
+
+For example: we have a 6 channel output device and our application has a stereo source it wants to provide to the device.  Suppose we want that stereo source to go to the 3rd and 4th channels of the device. The channel map would look like this: { -1, -1, 0, 1, -1, -1 }
+
+Where the formats are:
+Input Element == 0: 2 channels (- client format - settable)
+Output Element == 0: 6 channels (- device format - NOT settable)
+
+So channel 2 (zero-based) of the device will take the first channel of output and channel 3 will take the second channel of output. (This translates to the 3rd and 4th plugs of the 6 output plugs of the device of course!)
+
+For Input:
+Create an array of SInt32 that is the size of the number of channels of the format you require for input.  Get (or Set in this case as needed) the AUHAL's output Element == 1.
+
+Next, for each channel of input you require, set:
+channelMapArray[desiredAppInputChannel] = deviceOutputChannel;
+
+For example: we have a 6 channel input device from which we wish to receive stereo input from the 3rd and 4th channels. The channel map looks like this: { 2, 3 }
+
+Where the formats are:
+Input Element == 0: 2 channels (- device format - NOT settable)
+Output Element == 0: 6 channels (- client format - settable)
+
+
+
+----------------------------------------
+
+Notes on Original implementation:
+
+by Phil Burk and Darren Gibbs
+
+Last updated March 20, 2002
+
+WHAT WORKS
+
+Output with very low latency, <10 msec.
+Half duplex input or output.
+Full duplex on the same CoreAudio device.
+The paFLoat32, paInt16, paInt8, paUInt8 sample formats.
+Pa_GetCPULoad()
+Pa_StreamTime()
+
+KNOWN BUGS OR LIMITATIONS
+
+We do not yet support simultaneous input and output on different 
+devices. Note that some CoreAudio devices like the Roland UH30 look 
+like one device but are actually two different CoreAudio devices. The 
+Built-In audio is typically one CoreAudio device.
+
+Mono doesn't work.
+
+DEVICE MAPPING
+
+CoreAudio devices can support both input and output. But the sample 
+rates supported may be different. So we have map one or two PortAudio 
+device to each CoreAudio device depending on whether it supports 
+input, output or both.
+
+When we query devices, we first get a list of CoreAudio devices. Then 
+we scan the list and add a PortAudio device for each CoreAudio device 
+that supports input. Then we make a scan for output devices.
+
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core.c
new file mode 100644
index 0000000000..b182dac05a
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core.c
@@ -0,0 +1,2752 @@
+/*
+ * Implementation of the PortAudio API for Apple AUHAL
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file pa_mac_core
+ @ingroup hostapi_src
+ @author Bjorn Roche
+ @brief AUHAL implementation of PortAudio
+*/
+
+/* FIXME: not all error conditions call PaUtil_SetLastHostErrorInfo()
+ * PaMacCore_SetError() will do this.
+ */
+
+#include "pa_mac_core_internal.h"
+
+#include <string.h> /* strlen(), memcmp() etc. */
+#include <libkern/OSAtomic.h>
+
+#include "pa_mac_core.h"
+#include "pa_mac_core_utilities.h"
+#include "pa_mac_core_blocking.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+	
+/* This is a reasonable size for a small buffer based on experience. */
+#define PA_MAC_SMALL_BUFFER_SIZE    (64)
+	
+/* prototypes for functions declared in this file */
+PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+/*
+ * Function declared in pa_mac_core.h. Sets up a PaMacCoreStreamInfoStruct
+ * with the requested flags and initializes channel map.
+ */
+void PaMacCore_SetupStreamInfo(  PaMacCoreStreamInfo *data, const unsigned long flags )
+{
+   bzero( data, sizeof( PaMacCoreStreamInfo ) );
+   data->size = sizeof( PaMacCoreStreamInfo );
+   data->hostApiType = paCoreAudio;
+   data->version = 0x01;
+   data->flags = flags;
+   data->channelMap = NULL;
+   data->channelMapSize = 0;
+}
+
+/*
+ * Function declared in pa_mac_core.h. Adds channel mapping to a PaMacCoreStreamInfoStruct
+ */
+void PaMacCore_SetupChannelMap( PaMacCoreStreamInfo *data, const SInt32 * const channelMap, const unsigned long channelMapSize )
+{
+   data->channelMap = channelMap;
+   data->channelMapSize = channelMapSize;
+}
+static char *channelName = NULL;
+static int channelNameSize = 0;
+static bool ensureChannelNameSize( int size )
+{
+   if( size >= channelNameSize ) {
+      free( channelName );
+      channelName = (char *) malloc( ( channelNameSize = size ) + 1 );
+      if( !channelName ) {
+         channelNameSize = 0;
+         return false;
+      }
+   }
+   return true;
+}
+/*
+ * Function declared in pa_mac_core.h. retrives channel names.
+ */
+const char *PaMacCore_GetChannelName( int device, int channelIndex, bool input )
+{
+   struct PaUtilHostApiRepresentation *hostApi;
+   PaError err;
+   OSStatus error;
+   err = PaUtil_GetHostApiRepresentation( &hostApi, paCoreAudio );
+   assert(err == paNoError);
+   if( err != paNoError )
+      return NULL;
+   PaMacAUHAL *macCoreHostApi = (PaMacAUHAL*)hostApi;
+   AudioDeviceID hostApiDevice = macCoreHostApi->devIds[device];
+
+   UInt32 size = 0;
+
+   error = AudioDeviceGetPropertyInfo( hostApiDevice,
+                                       channelIndex + 1,
+                                       input,
+                                       kAudioDevicePropertyChannelName,
+                                       &size,
+                                       NULL );
+   if( error ) {
+      //try the CFString
+      CFStringRef name;
+      bool isDeviceName = false;
+      size = sizeof( name );
+      error = AudioDeviceGetProperty( hostApiDevice,
+                                      channelIndex + 1,
+                                      input,
+                                      kAudioDevicePropertyChannelNameCFString,
+                                      &size,
+                                      &name );
+      if( error ) { //as a last-ditch effort, get the device name. Later we'll append the channel number.
+         size = sizeof( name );
+         error = AudioDeviceGetProperty( hostApiDevice,
+                                      channelIndex + 1,
+                                      input,
+                                      kAudioDevicePropertyDeviceNameCFString,
+                                      &size,
+                                      &name );
+         if( error )
+            return NULL;
+         isDeviceName = true;
+      }
+      if( isDeviceName ) {
+         name = CFStringCreateWithFormat( NULL, NULL, CFSTR( "%@: %d"), name, channelIndex + 1 );
+      }
+
+      CFIndex length = CFStringGetLength(name);
+      while( ensureChannelNameSize( length * sizeof(UniChar) + 1 ) ) {
+         if( CFStringGetCString( name, channelName, channelNameSize, kCFStringEncodingUTF8 ) ) {
+            if( isDeviceName )
+               CFRelease( name );
+            return channelName;
+         }
+         if( length == 0 )
+            ++length;
+         length *= 2;
+      }
+      if( isDeviceName )
+         CFRelease( name );
+      return NULL;
+   }
+
+   //continue with C string:
+   if( !ensureChannelNameSize( size ) )
+      return NULL;
+
+   error = AudioDeviceGetProperty( hostApiDevice,
+                                   channelIndex + 1,
+                                   input,
+                                   kAudioDevicePropertyChannelName,
+                                   &size,
+                                   channelName );
+
+   if( error ) {
+      ERR( error );
+      return NULL;
+   }
+   return channelName;
+}
+
+
+
+
+
+AudioDeviceID PaMacCore_GetStreamInputDevice( PaStream* s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    VVDBUG(("PaMacCore_GetStreamInputHandle()\n"));
+
+    return ( stream->inputDevice );
+}
+
+AudioDeviceID PaMacCore_GetStreamOutputDevice( PaStream* s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    VVDBUG(("PaMacCore_GetStreamOutputHandle()\n"));
+
+    return ( stream->outputDevice );
+}
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#define RING_BUFFER_ADVANCE_DENOMINATOR (4)
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static OSStatus AudioIOProc( void *inRefCon,
+                               AudioUnitRenderActionFlags *ioActionFlags,
+                               const AudioTimeStamp *inTimeStamp,
+                               UInt32 inBusNumber,
+                               UInt32 inNumberFrames,
+                               AudioBufferList *ioData );
+static double GetStreamCpuLoad( PaStream* stream );
+
+static PaError GetChannelInfo( PaMacAUHAL *auhalHostApi,
+                               PaDeviceInfo *deviceInfo,
+                               AudioDeviceID macCoreDeviceId,
+                               int isInput);
+
+static PaError OpenAndSetupOneAudioUnit(
+                                   const PaMacCoreStream *stream,
+                                   const PaStreamParameters *inStreamParams,
+                                   const PaStreamParameters *outStreamParams,
+                                   const UInt32 requestedFramesPerBuffer,
+                                   UInt32 *actualInputFramesPerBuffer,
+                                   UInt32 *actualOutputFramesPerBuffer,
+                                   const PaMacAUHAL *auhalHostApi,
+                                   AudioUnit *audioUnit,
+                                   AudioConverterRef *srConverter,
+                                   AudioDeviceID *audioDevice,
+                                   const double sampleRate,
+                                   void *refCon );
+
+/* for setting errors. */
+#define PA_AUHAL_SET_LAST_HOST_ERROR( errorCode, errorText ) \
+    PaUtil_SetLastHostErrorInfo( paInDevelopment, errorCode, errorText )
+
+/*
+ * Callback called when starting or stopping a stream.
+ */
+static void startStopCallback(
+   void *               inRefCon,
+   AudioUnit            ci,
+   AudioUnitPropertyID  inID,
+   AudioUnitScope       inScope,
+   AudioUnitElement     inElement )
+{
+   PaMacCoreStream *stream = (PaMacCoreStream *) inRefCon;
+   UInt32 isRunning;
+   UInt32 size = sizeof( isRunning );
+   OSStatus err;
+   err = AudioUnitGetProperty( ci, kAudioOutputUnitProperty_IsRunning, inScope, inElement, &isRunning, &size );
+   assert( !err );
+   if( err )
+      isRunning = false; //it's very unclear what to do in case of error here. There's no real way to notify the user, and crashing seems unreasonable.
+   if( isRunning )
+      return; //We are only interested in when we are stopping
+   // -- if we are using 2 I/O units, we only need one notification!
+   if( stream->inputUnit && stream->outputUnit && stream->inputUnit != stream->outputUnit && ci == stream->inputUnit )
+      return;
+   PaStreamFinishedCallback *sfc = stream->streamRepresentation.streamFinishedCallback;
+   if( stream->state == STOPPING )
+      stream->state = STOPPED ;
+   if( sfc )
+      sfc( stream->streamRepresentation.userData );
+}
+
+
+/*currently, this is only used in initialization, but it might be modified
+  to be used when the list of devices changes.*/
+static PaError gatherDeviceInfo(PaMacAUHAL *auhalHostApi)
+{
+    UInt32 size;
+    UInt32 propsize;
+    VVDBUG(("gatherDeviceInfo()\n"));
+    /* -- free any previous allocations -- */
+    if( auhalHostApi->devIds )
+        PaUtil_GroupFreeMemory(auhalHostApi->allocations, auhalHostApi->devIds);
+    auhalHostApi->devIds = NULL;
+
+    /* -- figure out how many devices there are -- */
+    AudioHardwareGetPropertyInfo( kAudioHardwarePropertyDevices,
+                                  &propsize,
+                                  NULL );
+    auhalHostApi->devCount = propsize / sizeof( AudioDeviceID );
+
+    VDBUG( ( "Found %ld device(s).\n", auhalHostApi->devCount ) );
+
+    /* -- copy the device IDs -- */
+    auhalHostApi->devIds = (AudioDeviceID *)PaUtil_GroupAllocateMemory(
+                             auhalHostApi->allocations,
+                             propsize );
+    if( !auhalHostApi->devIds )
+        return paInsufficientMemory;
+    AudioHardwareGetProperty( kAudioHardwarePropertyDevices,
+                                  &propsize,
+                                  auhalHostApi->devIds );
+#ifdef MAC_CORE_VERBOSE_DEBUG
+    {
+       int i;
+       for( i=0; i<auhalHostApi->devCount; ++i )
+          printf( "Device %d\t: %ld\n", i, auhalHostApi->devIds[i] );
+    }
+#endif
+
+    size = sizeof(AudioDeviceID);
+    auhalHostApi->defaultIn  = kAudioDeviceUnknown;
+    auhalHostApi->defaultOut = kAudioDeviceUnknown;
+
+    /* determine the default device. */
+    /* I am not sure how these calls to AudioHardwareGetProperty()
+       could fail, but in case they do, we use the first available
+       device as the default. */
+    if( 0 != AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,
+                     &size,
+                     &auhalHostApi->defaultIn) ) {
+       int i;
+       auhalHostApi->defaultIn  = kAudioDeviceUnknown;
+       VDBUG(("Failed to get default input device from OS."));
+       VDBUG((" I will substitute the first available input Device."));
+       for( i=0; i<auhalHostApi->devCount; ++i ) {
+          PaDeviceInfo devInfo;
+          if( 0 != GetChannelInfo( auhalHostApi, &devInfo,
+                                   auhalHostApi->devIds[i], TRUE ) )
+             if( devInfo.maxInputChannels ) {
+                auhalHostApi->defaultIn = auhalHostApi->devIds[i];
+                break;
+             }
+       }
+    }   
+    if( 0 != AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
+                     &size,
+                     &auhalHostApi->defaultOut) ) {
+       int i;
+       auhalHostApi->defaultIn  = kAudioDeviceUnknown;
+       VDBUG(("Failed to get default output device from OS."));
+       VDBUG((" I will substitute the first available output Device."));
+       for( i=0; i<auhalHostApi->devCount; ++i ) {
+          PaDeviceInfo devInfo;
+          if( 0 != GetChannelInfo( auhalHostApi, &devInfo,
+                                   auhalHostApi->devIds[i], FALSE ) )
+             if( devInfo.maxOutputChannels ) {
+                auhalHostApi->defaultOut = auhalHostApi->devIds[i];
+                break;
+             }
+       }
+    }   
+
+    VDBUG( ( "Default in : %ld\n", auhalHostApi->defaultIn  ) );
+    VDBUG( ( "Default out: %ld\n", auhalHostApi->defaultOut ) );
+
+    return paNoError;
+}
+
+/* =================================================================================================== */
+/**
+ * @internal
+ * @brief Clip the desired size against the allowed IO buffer size range for the device.
+ */
+static PaError ClipToDeviceBufferSize( AudioDeviceID macCoreDeviceId,
+									int isInput, UInt32 desiredSize, UInt32 *allowedSize )
+{
+	UInt32 resultSize = desiredSize;
+	AudioValueRange audioRange;
+	UInt32 propSize = sizeof( audioRange );
+	PaError err = WARNING(AudioDeviceGetProperty( macCoreDeviceId, 0, isInput, kAudioDevicePropertyBufferFrameSizeRange, &propSize, &audioRange ) );
+	resultSize = MAX( resultSize, audioRange.mMinimum );
+	resultSize = MIN( resultSize, audioRange.mMaximum );
+	*allowedSize = resultSize;
+	return err;
+}
+
+/* =================================================================================================== */
+#if 0
+static void DumpDeviceProperties( AudioDeviceID macCoreDeviceId,
+                          int isInput )
+{
+    PaError err;
+    int i;
+    UInt32 propSize;
+    UInt32 deviceLatency;
+    UInt32 streamLatency;
+    UInt32 bufferFrames;
+    UInt32 safetyOffset;
+    AudioStreamID streamIDs[128];
+    
+    printf("\n======= latency query : macCoreDeviceId = %d, isInput %d =======\n", (int)macCoreDeviceId, isInput );    
+    
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyBufferFrameSize, &propSize, &bufferFrames));
+    printf("kAudioDevicePropertyBufferFrameSize: err = %d, propSize = %d, value = %d\n", err, propSize, bufferFrames );
+    
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertySafetyOffset, &propSize, &safetyOffset));
+    printf("kAudioDevicePropertySafetyOffset: err = %d, propSize = %d, value = %d\n", err, propSize, safetyOffset );
+    
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyLatency, &propSize, &deviceLatency));
+    printf("kAudioDevicePropertyLatency: err = %d, propSize = %d, value = %d\n", err, propSize, deviceLatency );
+    
+    AudioValueRange audioRange;
+    propSize = sizeof( audioRange );
+    err = WARNING(AudioDeviceGetProperty( macCoreDeviceId, 0, isInput, kAudioDevicePropertyBufferFrameSizeRange, &propSize, &audioRange ) );
+    printf("kAudioDevicePropertyBufferFrameSizeRange: err = %d, propSize = %u, minimum = %g\n", err, propSize, audioRange.mMinimum);
+    printf("kAudioDevicePropertyBufferFrameSizeRange: err = %d, propSize = %u, maximum = %g\n", err, propSize, audioRange.mMaximum );
+    
+    /* Get the streams from the device and query their latency. */
+    propSize = sizeof(streamIDs);
+    err  = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreams, &propSize, &streamIDs[0]));
+    int numStreams = propSize / sizeof(AudioStreamID);
+    for( i=0; i<numStreams; i++ )
+    {
+        printf("Stream #%d = %d---------------------- \n", i, streamIDs[i] );
+        
+        propSize = sizeof(UInt32);
+        err  = WARNING(AudioStreamGetProperty(streamIDs[i], 0, kAudioStreamPropertyLatency, &propSize, &streamLatency));
+        printf("  kAudioStreamPropertyLatency: err = %d, propSize = %d, value = %d\n", err, propSize, streamLatency );
+    }
+}
+#endif
+
+/* =================================================================================================== */
+/**
+ * @internal
+ * Calculate the fixed latency from the system and the device.
+ * Sum of kAudioStreamPropertyLatency +
+ *        kAudioDevicePropertySafetyOffset +
+ *        kAudioDevicePropertyLatency
+ *
+ * Some useful info from Jeff Moore on latency.
+ * http://osdir.com/ml/coreaudio-api/2010-01/msg00046.html
+ * http://osdir.com/ml/coreaudio-api/2009-07/msg00140.html
+ */
+static PaError CalculateFixedDeviceLatency( AudioDeviceID macCoreDeviceId, int isInput, UInt32 *fixedLatencyPtr )
+{
+    PaError err;
+    UInt32 propSize;
+    UInt32 deviceLatency;
+    UInt32 streamLatency;
+    UInt32 safetyOffset;
+    AudioStreamID streamIDs[1];
+    
+    // To get stream latency we have to get a streamID from the device.
+    // We are only going to look at the first stream so only fetch one stream.
+    propSize = sizeof(streamIDs);
+    err  = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreams, &propSize, &streamIDs[0]));
+    if( err != paNoError ) goto error;
+    if( propSize == sizeof(AudioStreamID) )
+    {        
+        propSize = sizeof(UInt32);
+        err  = WARNING(AudioStreamGetProperty(streamIDs[0], 0, kAudioStreamPropertyLatency, &propSize, &streamLatency));
+    }
+    
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertySafetyOffset, &propSize, &safetyOffset));
+    if( err != paNoError ) goto error;
+    
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyLatency, &propSize, &deviceLatency));
+    if( err != paNoError ) goto error;
+
+    *fixedLatencyPtr = deviceLatency + streamLatency + safetyOffset;
+    return err;
+error:
+    return err;
+}
+
+/* =================================================================================================== */
+static PaError CalculateDefaultDeviceLatencies( AudioDeviceID macCoreDeviceId,
+                                               int isInput, UInt32 *lowLatencyFramesPtr,
+                                               UInt32 *highLatencyFramesPtr )
+{
+    UInt32 propSize;
+    UInt32 bufferFrames = 0;
+    UInt32 fixedLatency = 0;
+    UInt32 clippedMinBufferSize = 0;
+    
+    //DumpDeviceProperties( macCoreDeviceId, isInput );
+    
+    PaError err = CalculateFixedDeviceLatency( macCoreDeviceId, isInput, &fixedLatency );
+    if( err != paNoError ) goto error;
+    
+    // For low latency use a small fixed size buffer clipped to the device range.
+    err = ClipToDeviceBufferSize( macCoreDeviceId, isInput, PA_MAC_SMALL_BUFFER_SIZE, &clippedMinBufferSize );
+    if( err != paNoError ) goto error;
+    
+    // For high latency use the default device buffer size.
+    propSize = sizeof(UInt32);
+    err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyBufferFrameSize, &propSize, &bufferFrames));
+    if( err != paNoError ) goto error;
+    
+    *lowLatencyFramesPtr = fixedLatency + clippedMinBufferSize;
+    *highLatencyFramesPtr = fixedLatency + bufferFrames;
+    
+    return err;
+error:
+    return err;
+}
+
+/* =================================================================================================== */
+
+static PaError GetChannelInfo( PaMacAUHAL *auhalHostApi,
+                               PaDeviceInfo *deviceInfo,
+                               AudioDeviceID macCoreDeviceId,
+                               int isInput)
+{
+    UInt32 propSize;
+    PaError err = paNoError;
+    UInt32 i;
+    int numChannels = 0;
+    AudioBufferList *buflist = NULL;
+    
+    VVDBUG(("GetChannelInfo()\n"));
+
+    /* Get the number of channels from the stream configuration.
+       Fail if we can't get this. */
+
+    err = ERR(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, NULL));
+    if (err)
+        return err;
+
+    buflist = PaUtil_AllocateMemory(propSize);
+    if( !buflist )
+       return paInsufficientMemory;
+    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, buflist));
+    if (err)
+        goto error;
+
+    for (i = 0; i < buflist->mNumberBuffers; ++i)
+        numChannels += buflist->mBuffers[i].mNumberChannels;
+
+    if (isInput)
+        deviceInfo->maxInputChannels = numChannels;
+    else
+        deviceInfo->maxOutputChannels = numChannels;
+      
+    if (numChannels > 0) /* do not try to retrieve the latency if there are no channels. */
+    {
+        /* Get the latency.  Don't fail if we can't get this. */
+        /* default to something reasonable */
+        deviceInfo->defaultLowInputLatency = .01;
+        deviceInfo->defaultHighInputLatency = .10;
+        deviceInfo->defaultLowOutputLatency = .01;
+        deviceInfo->defaultHighOutputLatency = .10;        
+        UInt32 lowLatencyFrames = 0;
+        UInt32 highLatencyFrames = 0;
+        err = CalculateDefaultDeviceLatencies( macCoreDeviceId, isInput, &lowLatencyFrames, &highLatencyFrames );
+        if( err == 0 )
+        {
+            
+            double lowLatencySeconds = lowLatencyFrames / deviceInfo->defaultSampleRate;
+            double highLatencySeconds = highLatencyFrames / deviceInfo->defaultSampleRate;
+            if (isInput)
+            {
+                deviceInfo->defaultLowInputLatency = lowLatencySeconds;
+                deviceInfo->defaultHighInputLatency = highLatencySeconds;
+            }
+            else
+            {
+                deviceInfo->defaultLowOutputLatency = lowLatencySeconds;
+                deviceInfo->defaultHighOutputLatency = highLatencySeconds;
+            }
+        }
+    }
+    PaUtil_FreeMemory( buflist );
+    return paNoError;
+ error:
+    PaUtil_FreeMemory( buflist );
+    return err;
+}
+
+/* =================================================================================================== */
+static PaError InitializeDeviceInfo( PaMacAUHAL *auhalHostApi,
+                                     PaDeviceInfo *deviceInfo,
+                                     AudioDeviceID macCoreDeviceId,
+                                     PaHostApiIndex hostApiIndex )
+{
+    Float64 sampleRate;
+    char *name;
+    PaError err = paNoError;
+    UInt32 propSize;
+
+    VVDBUG(("InitializeDeviceInfo(): macCoreDeviceId=%ld\n", macCoreDeviceId));
+
+    memset(deviceInfo, 0, sizeof(deviceInfo));
+
+    deviceInfo->structVersion = 2;
+    deviceInfo->hostApi = hostApiIndex;
+
+    /* Get the device name.  Fail if we can't get it. */
+    err = ERR(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, NULL));
+    if (err)
+        return err;
+
+    name = PaUtil_GroupAllocateMemory(auhalHostApi->allocations,propSize);
+    if ( !name )
+        return paInsufficientMemory;
+    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, name));
+    if (err)
+        return err;
+    deviceInfo->name = name;
+
+    /* Try to get the default sample rate.  Don't fail if we can't get this. */
+    propSize = sizeof(Float64);
+    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyNominalSampleRate, &propSize, &sampleRate));
+    if (err)
+        deviceInfo->defaultSampleRate = 0.0;
+    else
+        deviceInfo->defaultSampleRate = sampleRate;
+
+    /* Get the maximum number of input and output channels.  Fail if we can't get this. */
+
+    err = GetChannelInfo(auhalHostApi, deviceInfo, macCoreDeviceId, 1);
+    if (err)
+        return err;
+
+    err = GetChannelInfo(auhalHostApi, deviceInfo, macCoreDeviceId, 0);
+    if (err)
+        return err;
+
+    return paNoError;
+}
+
+PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i;
+    PaMacAUHAL *auhalHostApi = NULL;
+    PaDeviceInfo *deviceInfoArray;
+    int unixErr;
+
+    VVDBUG(("PaMacCore_Initialize(): hostApiIndex=%d\n", hostApiIndex));
+	
+	SInt32 major;
+	SInt32 minor;
+	Gestalt(gestaltSystemVersionMajor, &major);
+	Gestalt(gestaltSystemVersionMinor, &minor);
+	
+	// Starting with 10.6 systems, the HAL notification thread is created internally
+	if (major == 10 && minor >= 6) {
+		CFRunLoopRef theRunLoop = NULL;
+		AudioObjectPropertyAddress theAddress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+		OSStatus osErr = AudioObjectSetPropertyData (kAudioObjectSystemObject, &theAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
+		if (osErr != noErr) {
+			goto error;
+		}
+	}
+	
+    unixErr = initializeXRunListenerList();
+    if( 0 != unixErr ) {
+       return UNIX_ERR(unixErr);
+    }
+
+    auhalHostApi = (PaMacAUHAL*)PaUtil_AllocateMemory( sizeof(PaMacAUHAL) );
+    if( !auhalHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    auhalHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !auhalHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    auhalHostApi->devIds = NULL;
+    auhalHostApi->devCount = 0;
+
+    /* get the info we need about the devices */
+    result = gatherDeviceInfo( auhalHostApi );
+    if( result != paNoError )
+       goto error;
+
+    *hostApi = &auhalHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paCoreAudio;
+    (*hostApi)->info.name = "Core Audio";
+
+    (*hostApi)->info.defaultInputDevice = paNoDevice;
+    (*hostApi)->info.defaultOutputDevice = paNoDevice;
+
+    (*hostApi)->info.deviceCount = 0;  
+
+    if( auhalHostApi->devCount > 0 )
+    {
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                auhalHostApi->allocations, sizeof(PaDeviceInfo*) * auhalHostApi->devCount);
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaDeviceInfo*)PaUtil_GroupAllocateMemory(
+                auhalHostApi->allocations, sizeof(PaDeviceInfo) * auhalHostApi->devCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for( i=0; i < auhalHostApi->devCount; ++i )
+        {
+            int err;
+            err = InitializeDeviceInfo( auhalHostApi, &deviceInfoArray[i],
+                                      auhalHostApi->devIds[i],
+                                      hostApiIndex );
+            if (err == paNoError)
+            { /* copy some info and set the defaults */
+                (*hostApi)->deviceInfos[(*hostApi)->info.deviceCount] = &deviceInfoArray[i];
+                if (auhalHostApi->devIds[i] == auhalHostApi->defaultIn)
+                    (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
+                if (auhalHostApi->devIds[i] == auhalHostApi->defaultOut)
+                    (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
+                (*hostApi)->info.deviceCount++;
+            }
+            else
+            { /* there was an error. we need to shift the devices down, so we ignore this one */
+                int j;
+                auhalHostApi->devCount--;
+                for( j=i; j<auhalHostApi->devCount; ++j )
+                   auhalHostApi->devIds[j] = auhalHostApi->devIds[j+1];
+                i--;
+            }
+        }
+    }
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &auhalHostApi->callbackStreamInterface,
+                                      CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped,
+                                      IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable,
+                                      PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &auhalHostApi->blockingStreamInterface,
+                                      CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped,
+                                      IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream,
+                                      GetStreamReadAvailable,
+                                      GetStreamWriteAvailable );
+
+    return result;
+
+error:
+    if( auhalHostApi )
+    {
+        if( auhalHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( auhalHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( auhalHostApi->allocations );
+        }
+                
+        PaUtil_FreeMemory( auhalHostApi );
+    }
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    int unixErr;
+
+    PaMacAUHAL *auhalHostApi = (PaMacAUHAL*)hostApi;
+
+    VVDBUG(("Terminate()\n"));
+
+    unixErr = destroyXRunListenerList();
+    if( 0 != unixErr )
+       UNIX_ERR(unixErr);
+
+    /*
+        IMPLEMENT ME:
+            - clean up any resources not handled by the allocation group
+        TODO: Double check that everything is handled by alloc group
+    */
+
+    if( auhalHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( auhalHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( auhalHostApi->allocations );
+    }
+
+    PaUtil_FreeMemory( auhalHostApi );
+}
+
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+
+    VVDBUG(("IsFormatSupported(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld sampleRate=%g\n",
+                inputParameters  ? inputParameters->channelCount  : -1,
+                inputParameters  ? inputParameters->sampleFormat  : -1,
+                outputParameters ? outputParameters->channelCount : -1,
+                outputParameters ? outputParameters->sampleFormat : -1,
+                (float) sampleRate ));
+ 
+    /** These first checks are standard PA checks. We do some fancier checks
+        later. */
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( inputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( outputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support outputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+ 
+    /* FEEDBACK */
+    /*        I think the only way to check a given format SR combo is     */
+    /*        to try opening it. This could be disruptive, is that Okay?   */
+    /*        The alternative is to just read off available sample rates,  */
+    /*        but this will not work %100 of the time (eg, a device that   */
+    /*        supports N output at one rate but only N/2 at a higher rate.)*/
+
+    /* The following code opens the device with the requested parameters to
+       see if it works. */
+    {
+       PaError err;
+       PaStream *s;
+       err = OpenStream( hostApi, &s, inputParameters, outputParameters,
+                           sampleRate, 1024, 0, (PaStreamCallback *)1, NULL );
+       if( err != paNoError && err != paInvalidSampleRate )
+          DBUG( ( "OpenStream @ %g returned: %d: %s\n",
+                  (float) sampleRate, err, Pa_GetErrorText( err ) ) );
+       if( err ) 
+          return err;
+       err = CloseStream( s );
+       if( err ) {
+          /* FEEDBACK: is this more serious? should we assert? */
+          DBUG( ( "WARNING: could not close Stream. %d: %s\n",
+                  err, Pa_GetErrorText( err ) ) );
+       }
+    }
+
+    return paFormatIsSupported;
+}
+
+/* ================================================================================= */
+static void InitializeDeviceProperties( PaMacCoreDeviceProperties *deviceProperties )
+{
+    memset( deviceProperties, 0, sizeof(PaMacCoreDeviceProperties) );
+    deviceProperties->sampleRate = 1.0; // Better than random. Overwritten by actual values later on.
+    deviceProperties->samplePeriod = 1.0 / deviceProperties->sampleRate;
+}
+
+static Float64 CalculateSoftwareLatencyFromProperties( PaMacCoreStream *stream, PaMacCoreDeviceProperties *deviceProperties )
+{
+    UInt32 latencyFrames = deviceProperties->bufferFrameSize + deviceProperties->deviceLatency + deviceProperties->safetyOffset;
+    return latencyFrames * deviceProperties->samplePeriod; // same as dividing by sampleRate but faster
+}
+
+static Float64 CalculateHardwareLatencyFromProperties( PaMacCoreStream *stream, PaMacCoreDeviceProperties *deviceProperties )
+{
+    return deviceProperties->deviceLatency * deviceProperties->samplePeriod; // same as dividing by sampleRate but faster
+}
+
+/* Calculate values used to convert Apple timestamps into PA timestamps
+ * from the device properties. The final results of this calculation
+ * will be used in the audio callback function.
+ */
+static void UpdateTimeStampOffsets( PaMacCoreStream *stream )
+{
+    Float64 inputSoftwareLatency = 0.0;
+    Float64 inputHardwareLatency = 0.0;
+    Float64 outputSoftwareLatency = 0.0;
+    Float64 outputHardwareLatency = 0.0;
+    
+    if( stream->inputUnit != NULL )
+    {
+        inputSoftwareLatency = CalculateSoftwareLatencyFromProperties( stream, &stream->inputProperties );
+        inputHardwareLatency = CalculateHardwareLatencyFromProperties( stream, &stream->inputProperties );
+    }    
+    if( stream->outputUnit != NULL )
+    {
+        outputSoftwareLatency = CalculateSoftwareLatencyFromProperties( stream, &stream->outputProperties );
+        outputHardwareLatency = CalculateHardwareLatencyFromProperties( stream, &stream->outputProperties );
+    }    
+    
+    /* We only need a mutex around setting these variables as a group. */
+	pthread_mutex_lock( &stream->timingInformationMutex );
+    stream->timestampOffsetCombined = inputSoftwareLatency + outputSoftwareLatency;
+    stream->timestampOffsetInputDevice = inputHardwareLatency;
+    stream->timestampOffsetOutputDevice = outputHardwareLatency;
+	pthread_mutex_unlock( &stream->timingInformationMutex );
+}
+
+/* ================================================================================= */
+/* Query sample rate property. */
+static OSStatus UpdateSampleRateFromDeviceProperty( PaMacCoreStream *stream, AudioDeviceID deviceID, Boolean isInput )
+{
+    PaMacCoreDeviceProperties * deviceProperties = isInput ? &stream->inputProperties : &stream->outputProperties;
+	/* FIXME: not sure if this should be the sample rate of the output device or the output unit */
+	Float64 actualSampleRate = deviceProperties->sampleRate;
+	UInt32 propSize = sizeof(Float64);
+    OSStatus osErr = AudioDeviceGetProperty( deviceID, 0, isInput, kAudioDevicePropertyActualSampleRate, &propSize, &actualSampleRate);
+	if( (osErr == noErr) && (actualSampleRate > 1000.0) ) // avoid divide by zero if there's an error
+	{
+        deviceProperties->sampleRate = actualSampleRate;
+        deviceProperties->samplePeriod = 1.0 / actualSampleRate;
+    }
+    return osErr;
+}
+
+static OSStatus AudioDevicePropertyActualSampleRateListenerProc( AudioDeviceID inDevice, UInt32 inChannel, Boolean isInput, AudioDevicePropertyID inPropertyID, void *inClientData )
+{
+	PaMacCoreStream *stream = (PaMacCoreStream*)inClientData;
+    
+    // Make sure the callback is operating on a stream that is still valid!
+    assert( stream->streamRepresentation.magic == PA_STREAM_MAGIC );
+
+	OSStatus osErr = UpdateSampleRateFromDeviceProperty( stream, inDevice, isInput );
+    if( osErr == noErr )
+    {
+        UpdateTimeStampOffsets( stream );
+    }
+    return osErr;
+}
+
+/* ================================================================================= */
+static OSStatus QueryUInt32DeviceProperty( AudioDeviceID deviceID, Boolean isInput, AudioDevicePropertyID propertyID, UInt32 *outValue )
+{
+	UInt32 propertyValue = 0;
+	UInt32 propertySize = sizeof(UInt32);
+	OSStatus osErr = AudioDeviceGetProperty( deviceID, 0, isInput, propertyID, &propertySize, &propertyValue);
+	if( osErr == noErr )
+	{
+        *outValue = propertyValue;
+	}
+    return osErr;
+}
+
+static OSStatus AudioDevicePropertyGenericListenerProc( AudioDeviceID inDevice, UInt32 inChannel, Boolean isInput, AudioDevicePropertyID inPropertyID, void *inClientData )
+{
+    OSStatus osErr = noErr;
+	PaMacCoreStream *stream = (PaMacCoreStream*)inClientData;
+    
+    // Make sure the callback is operating on a stream that is still valid!
+    assert( stream->streamRepresentation.magic == PA_STREAM_MAGIC );
+    
+    PaMacCoreDeviceProperties *deviceProperties = isInput ? &stream->inputProperties : &stream->outputProperties;
+    UInt32 *valuePtr = NULL;
+    switch( inPropertyID )
+    {
+        case kAudioDevicePropertySafetyOffset:
+            valuePtr = &deviceProperties->safetyOffset;
+            break;
+                        
+        case kAudioDevicePropertyLatency:
+            valuePtr = &deviceProperties->deviceLatency;
+            break;
+            
+        case kAudioDevicePropertyBufferFrameSize:
+            valuePtr = &deviceProperties->bufferFrameSize;
+            break;            
+    }
+    if( valuePtr != NULL )
+    {
+        osErr = QueryUInt32DeviceProperty( inDevice, isInput, inPropertyID, valuePtr );
+        if( osErr == noErr )
+        {
+            UpdateTimeStampOffsets( stream );
+        }
+    }
+    return osErr;
+}
+
+/* ================================================================================= */
+/*
+ * Setup listeners in case device properties change during the run. */
+static OSStatus SetupDevicePropertyListeners( PaMacCoreStream *stream, AudioDeviceID deviceID, Boolean isInput )
+{
+    OSStatus osErr = noErr;
+    PaMacCoreDeviceProperties *deviceProperties = isInput ? &stream->inputProperties : &stream->outputProperties;
+    
+    // Start with the current values for the device properties.
+    UpdateSampleRateFromDeviceProperty( stream, deviceID, isInput );
+    
+    if( (osErr = QueryUInt32DeviceProperty( deviceID, isInput,
+                                           kAudioDevicePropertyLatency, &deviceProperties->deviceLatency )) != noErr ) return osErr;
+    if( (osErr = QueryUInt32DeviceProperty( deviceID, isInput,
+                                           kAudioDevicePropertyBufferFrameSize, &deviceProperties->bufferFrameSize )) != noErr ) return osErr;
+    if( (osErr = QueryUInt32DeviceProperty( deviceID, isInput,
+                                           kAudioDevicePropertySafetyOffset, &deviceProperties->safetyOffset )) != noErr ) return osErr;
+    
+    AudioDeviceAddPropertyListener( deviceID, 0, isInput, kAudioDevicePropertyActualSampleRate, 
+                                   AudioDevicePropertyActualSampleRateListenerProc, stream );
+    
+    AudioDeviceAddPropertyListener( deviceID, 0, isInput, kAudioStreamPropertyLatency, 
+                                   AudioDevicePropertyGenericListenerProc, stream );
+    AudioDeviceAddPropertyListener( deviceID, 0, isInput, kAudioDevicePropertyBufferFrameSize, 
+                                   AudioDevicePropertyGenericListenerProc, stream );
+    AudioDeviceAddPropertyListener( deviceID, 0, isInput, kAudioDevicePropertySafetyOffset, 
+                                   AudioDevicePropertyGenericListenerProc, stream );
+    
+    return osErr;
+}
+
+static void CleanupDevicePropertyListeners( PaMacCoreStream *stream, AudioDeviceID deviceID, Boolean isInput )
+{    
+    AudioDeviceRemovePropertyListener( deviceID, 0, isInput, kAudioDevicePropertyActualSampleRate, 
+                                   AudioDevicePropertyActualSampleRateListenerProc );
+    
+    AudioDeviceRemovePropertyListener( deviceID, 0, isInput, kAudioDevicePropertyLatency, 
+                                   AudioDevicePropertyGenericListenerProc );	
+    AudioDeviceRemovePropertyListener( deviceID, 0, isInput, kAudioDevicePropertyBufferFrameSize, 
+                                   AudioDevicePropertyGenericListenerProc );
+    AudioDeviceRemovePropertyListener( deviceID, 0, isInput, kAudioDevicePropertySafetyOffset, 
+                                   AudioDevicePropertyGenericListenerProc );
+}
+
+/* ================================================================================= */
+static PaError OpenAndSetupOneAudioUnit(
+                                   const PaMacCoreStream *stream,
+                                   const PaStreamParameters *inStreamParams,
+                                   const PaStreamParameters *outStreamParams,
+                                   const UInt32 requestedFramesPerBuffer,
+                                   UInt32 *actualInputFramesPerBuffer,
+                                   UInt32 *actualOutputFramesPerBuffer,
+                                   const PaMacAUHAL *auhalHostApi,
+                                   AudioUnit *audioUnit,
+                                   AudioConverterRef *srConverter,
+                                   AudioDeviceID *audioDevice,
+                                   const double sampleRate,
+                                   void *refCon )
+{
+    ComponentDescription desc;
+    Component comp;
+    /*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
+    AudioStreamBasicDescription desiredFormat;
+    OSStatus result = noErr;
+    PaError paResult = paNoError;
+    int line = 0;
+    UInt32 callbackKey;
+    AURenderCallbackStruct rcbs;
+    unsigned long macInputStreamFlags  = paMacCorePlayNice;
+    unsigned long macOutputStreamFlags = paMacCorePlayNice;
+    SInt32 const *inChannelMap = NULL;
+    SInt32 const *outChannelMap = NULL;
+    unsigned long inChannelMapSize = 0;
+    unsigned long outChannelMapSize = 0;
+
+    VVDBUG(("OpenAndSetupOneAudioUnit(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld, requestedFramesPerBuffer=%ld\n",
+                inStreamParams  ? inStreamParams->channelCount  : -1,
+                inStreamParams  ? inStreamParams->sampleFormat  : -1,
+                outStreamParams ? outStreamParams->channelCount : -1,
+                outStreamParams ? outStreamParams->sampleFormat : -1,
+                requestedFramesPerBuffer ));
+
+    /* -- handle the degenerate case  -- */
+    if( !inStreamParams && !outStreamParams ) {
+       *audioUnit = NULL;
+       *audioDevice = kAudioDeviceUnknown;
+       return paNoError;
+    }
+
+    /* -- get the user's api specific info, if they set any -- */
+    if( inStreamParams && inStreamParams->hostApiSpecificStreamInfo )
+    {
+       macInputStreamFlags=
+            ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
+                  ->flags;
+       inChannelMap = ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
+                  ->channelMap;
+       inChannelMapSize = ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
+                  ->channelMapSize;
+    }
+    if( outStreamParams && outStreamParams->hostApiSpecificStreamInfo )
+    {
+       macOutputStreamFlags=
+            ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
+                  ->flags;
+       outChannelMap = ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
+                  ->channelMap;
+       outChannelMapSize = ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
+                  ->channelMapSize; 
+    }
+    /* Override user's flags here, if desired for testing. */
+
+    /*
+     * The HAL AU is a Mac OS style "component".
+     * the first few steps deal with that.
+     * Later steps work on a combination of Mac OS
+     * components and the slightly lower level
+     * HAL.
+     */
+
+    /* -- describe the output type AudioUnit -- */
+    /*  Note: for the default AudioUnit, we could use the
+     *  componentSubType value kAudioUnitSubType_DefaultOutput;
+     *  but I don't think that's relevant here.
+     */
+    desc.componentType         = kAudioUnitType_Output;
+    desc.componentSubType      = kAudioUnitSubType_HALOutput;
+    desc.componentManufacturer = kAudioUnitManufacturer_Apple;
+    desc.componentFlags        = 0;
+    desc.componentFlagsMask    = 0;
+    /* -- find the component -- */
+    comp = FindNextComponent( NULL, &desc );
+    if( !comp )
+    {
+       DBUG( ( "AUHAL component not found." ) );
+       *audioUnit = NULL;
+       *audioDevice = kAudioDeviceUnknown;
+       return paUnanticipatedHostError;
+    }
+    /* -- open it -- */
+    result = OpenAComponent( comp, audioUnit );
+    if( result )
+    {
+       DBUG( ( "Failed to open AUHAL component." ) );
+       *audioUnit = NULL;
+       *audioDevice = kAudioDeviceUnknown;
+       return ERR( result );
+    }
+    /* -- prepare a little error handling logic / hackery -- */
+#define ERR_WRAP(mac_err) do { result = mac_err ; line = __LINE__ ; if ( result != noErr ) goto error ; } while(0)
+
+    /* -- if there is input, we have to explicitly enable input -- */
+    if( inStreamParams )
+    {
+       UInt32 enableIO = 1;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                 kAudioOutputUnitProperty_EnableIO,
+                 kAudioUnitScope_Input,
+                 INPUT_ELEMENT,
+                 &enableIO,
+                 sizeof(enableIO) ) );
+    }
+    /* -- if there is no output, we must explicitly disable output -- */
+    if( !outStreamParams )
+    {
+       UInt32 enableIO = 0;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                 kAudioOutputUnitProperty_EnableIO,
+                 kAudioUnitScope_Output,
+                 OUTPUT_ELEMENT,
+                 &enableIO,
+                 sizeof(enableIO) ) );
+    }
+
+    /* -- set the devices -- */
+    /* make sure input and output are the same device if we are doing input and
+       output. */
+    if( inStreamParams && outStreamParams )
+    {
+       assert( outStreamParams->device == inStreamParams->device );
+    }
+    if( inStreamParams )
+    {
+       *audioDevice = auhalHostApi->devIds[inStreamParams->device] ;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                    kAudioOutputUnitProperty_CurrentDevice,
+                    kAudioUnitScope_Global,
+                    INPUT_ELEMENT,
+                    audioDevice,
+                    sizeof(AudioDeviceID) ) );
+    }
+    if( outStreamParams && outStreamParams != inStreamParams )
+    {
+       *audioDevice = auhalHostApi->devIds[outStreamParams->device] ;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                    kAudioOutputUnitProperty_CurrentDevice,
+                    kAudioUnitScope_Global,
+                    OUTPUT_ELEMENT,
+                    audioDevice,
+                    sizeof(AudioDeviceID) ) );
+    }
+    /* -- add listener for dropouts -- */
+    result = AudioDeviceAddPropertyListener( *audioDevice,
+                                             0,
+                                             outStreamParams ? false : true,
+                                             kAudioDeviceProcessorOverload,
+                                             xrunCallback,
+                                             addToXRunListenerList( (void *)stream ) ) ;
+    if( result == kAudioHardwareIllegalOperationError ) {
+       // -- already registered, we're good
+    } else {
+       // -- not already registered, just check for errors
+       ERR_WRAP( result );
+    }
+    /* -- listen for stream start and stop -- */
+    ERR_WRAP( AudioUnitAddPropertyListener( *audioUnit,
+                                            kAudioOutputUnitProperty_IsRunning,
+                                            startStopCallback,
+                                            (void *)stream ) );
+
+    /* -- set format -- */
+    bzero( &desiredFormat, sizeof(desiredFormat) );
+    desiredFormat.mFormatID         = kAudioFormatLinearPCM ;
+    desiredFormat.mFormatFlags      = kAudioFormatFlagsNativeFloatPacked;
+    desiredFormat.mFramesPerPacket  = 1;
+    desiredFormat.mBitsPerChannel   = sizeof( float ) * 8;
+
+    result = 0;
+    /*  set device format first, but only touch the device if the user asked */
+    if( inStreamParams ) {
+       /*The callback never calls back if we don't set the FPB */
+       /*This seems wierd, because I would think setting anything on the device
+         would be disruptive.*/
+       paResult = setBestFramesPerBuffer( *audioDevice, FALSE,
+                                          requestedFramesPerBuffer,
+                                          actualInputFramesPerBuffer );
+       if( paResult ) goto error;
+       if( macInputStreamFlags & paMacCoreChangeDeviceParameters ) {
+          bool requireExact;
+          requireExact=macInputStreamFlags & paMacCoreFailIfConversionRequired;
+          paResult = setBestSampleRateForDevice( *audioDevice, FALSE,
+                                                 requireExact, sampleRate );
+          if( paResult ) goto error;
+       }
+       if( actualInputFramesPerBuffer && actualOutputFramesPerBuffer )
+          *actualOutputFramesPerBuffer = *actualInputFramesPerBuffer ;
+    }
+    if( outStreamParams && !inStreamParams ) {
+       /*The callback never calls back if we don't set the FPB */
+       /*This seems wierd, because I would think setting anything on the device
+         would be disruptive.*/
+       paResult = setBestFramesPerBuffer( *audioDevice, TRUE,
+                                          requestedFramesPerBuffer,
+                                          actualOutputFramesPerBuffer );
+       if( paResult ) goto error;
+       if( macOutputStreamFlags & paMacCoreChangeDeviceParameters ) {
+          bool requireExact;
+          requireExact=macOutputStreamFlags & paMacCoreFailIfConversionRequired;
+          paResult = setBestSampleRateForDevice( *audioDevice, TRUE,
+                                                 requireExact, sampleRate );
+          if( paResult ) goto error;
+       }
+    }
+
+    /* -- set the quality of the output converter -- */
+    if( outStreamParams ) {
+       UInt32 value = kAudioConverterQuality_Max;
+       switch( macOutputStreamFlags & 0x0700 ) {
+       case 0x0100: /*paMacCore_ConversionQualityMin:*/
+          value=kRenderQuality_Min;
+          break;
+       case 0x0200: /*paMacCore_ConversionQualityLow:*/
+          value=kRenderQuality_Low;
+          break;
+       case 0x0300: /*paMacCore_ConversionQualityMedium:*/
+          value=kRenderQuality_Medium;
+          break;
+       case 0x0400: /*paMacCore_ConversionQualityHigh:*/
+          value=kRenderQuality_High;
+          break;
+       }
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                    kAudioUnitProperty_RenderQuality,
+                    kAudioUnitScope_Global,
+                    OUTPUT_ELEMENT,
+                    &value,
+                    sizeof(value) ) );
+    }
+    /* now set the format on the Audio Units. */
+    if( outStreamParams )
+    {
+       desiredFormat.mSampleRate    =sampleRate;
+       desiredFormat.mBytesPerPacket=sizeof(float)*outStreamParams->channelCount;
+       desiredFormat.mBytesPerFrame =sizeof(float)*outStreamParams->channelCount;
+       desiredFormat.mChannelsPerFrame = outStreamParams->channelCount;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                            kAudioUnitProperty_StreamFormat,
+                            kAudioUnitScope_Input,
+                            OUTPUT_ELEMENT,
+                            &desiredFormat,
+                            sizeof(AudioStreamBasicDescription) ) );
+    }
+    if( inStreamParams )
+    {
+       AudioStreamBasicDescription sourceFormat;
+       UInt32 size = sizeof( AudioStreamBasicDescription );
+
+       /* keep the sample rate of the device, or we confuse AUHAL */
+       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
+                            kAudioUnitProperty_StreamFormat,
+                            kAudioUnitScope_Input,
+                            INPUT_ELEMENT,
+                            &sourceFormat,
+                            &size ) );
+       desiredFormat.mSampleRate = sourceFormat.mSampleRate;
+       desiredFormat.mBytesPerPacket=sizeof(float)*inStreamParams->channelCount;
+       desiredFormat.mBytesPerFrame =sizeof(float)*inStreamParams->channelCount;
+       desiredFormat.mChannelsPerFrame = inStreamParams->channelCount;
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                            kAudioUnitProperty_StreamFormat,
+                            kAudioUnitScope_Output,
+                            INPUT_ELEMENT,
+                            &desiredFormat,
+                            sizeof(AudioStreamBasicDescription) ) );
+    }
+    /* set the maximumFramesPerSlice */
+    /* not doing this causes real problems
+       (eg. the callback might not be called). The idea of setting both this
+       and the frames per buffer on the device is that we'll be most likely
+       to actually get the frame size we requested in the callback with the
+       minimum latency. */
+    if( outStreamParams ) {
+       UInt32 size = sizeof( *actualOutputFramesPerBuffer );
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                            kAudioUnitProperty_MaximumFramesPerSlice,
+                            kAudioUnitScope_Input,
+                            OUTPUT_ELEMENT,
+                            actualOutputFramesPerBuffer,
+                            sizeof(*actualOutputFramesPerBuffer) ) );
+       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
+                            kAudioUnitProperty_MaximumFramesPerSlice,
+                            kAudioUnitScope_Global,
+                            OUTPUT_ELEMENT,
+                            actualOutputFramesPerBuffer,
+                            &size ) );
+    }
+    if( inStreamParams ) {
+       /*UInt32 size = sizeof( *actualInputFramesPerBuffer );*/
+       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
+                            kAudioUnitProperty_MaximumFramesPerSlice,
+                            kAudioUnitScope_Output,
+                            INPUT_ELEMENT,
+                            actualInputFramesPerBuffer,
+                            sizeof(*actualInputFramesPerBuffer) ) );
+/* Don't know why this causes problems
+       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
+                            kAudioUnitProperty_MaximumFramesPerSlice,
+                            kAudioUnitScope_Global, //Output,
+                            INPUT_ELEMENT,
+                            actualInputFramesPerBuffer,
+                            &size ) );
+*/
+    }
+
+    /* -- if we have input, we may need to setup an SR converter -- */
+    /* even if we got the sample rate we asked for, we need to do
+       the conversion in case another program changes the underlying SR. */
+    /* FIXME: I think we need to monitor stream and change the converter if the incoming format changes. */
+    if( inStreamParams ) {
+       AudioStreamBasicDescription desiredFormat;
+       AudioStreamBasicDescription sourceFormat;
+       UInt32 sourceSize = sizeof( sourceFormat );
+       bzero( &desiredFormat, sizeof(desiredFormat) );
+       desiredFormat.mSampleRate       = sampleRate;
+       desiredFormat.mFormatID         = kAudioFormatLinearPCM ;
+       desiredFormat.mFormatFlags      = kAudioFormatFlagsNativeFloatPacked;
+       desiredFormat.mFramesPerPacket  = 1;
+       desiredFormat.mBitsPerChannel   = sizeof( float ) * 8;
+       desiredFormat.mBytesPerPacket=sizeof(float)*inStreamParams->channelCount;
+       desiredFormat.mBytesPerFrame =sizeof(float)*inStreamParams->channelCount;
+       desiredFormat.mChannelsPerFrame = inStreamParams->channelCount;
+
+       /* get the source format */
+       ERR_WRAP( AudioUnitGetProperty(
+                         *audioUnit,
+                         kAudioUnitProperty_StreamFormat,
+                         kAudioUnitScope_Output,
+                         INPUT_ELEMENT,
+                         &sourceFormat,
+                         &sourceSize ) );
+
+       if( desiredFormat.mSampleRate != sourceFormat.mSampleRate )
+       {
+          UInt32 value = kAudioConverterQuality_Max;
+          switch( macInputStreamFlags & 0x0700 ) {
+          case 0x0100: /*paMacCore_ConversionQualityMin:*/
+             value=kAudioConverterQuality_Min;
+             break;
+          case 0x0200: /*paMacCore_ConversionQualityLow:*/
+             value=kAudioConverterQuality_Low;
+             break;
+          case 0x0300: /*paMacCore_ConversionQualityMedium:*/
+             value=kAudioConverterQuality_Medium;
+             break;
+          case 0x0400: /*paMacCore_ConversionQualityHigh:*/
+             value=kAudioConverterQuality_High;
+             break;
+          }
+          VDBUG(( "Creating sample rate converter for input"
+                  " to convert from %g to %g\n",
+                  (float)sourceFormat.mSampleRate,
+                  (float)desiredFormat.mSampleRate ) );
+          /* create our converter */
+          ERR_WRAP( AudioConverterNew( 
+                             &sourceFormat,
+                             &desiredFormat,
+                             srConverter ) );
+          /* Set quality */
+          ERR_WRAP( AudioConverterSetProperty(
+                             *srConverter,
+                             kAudioConverterSampleRateConverterQuality,
+                             sizeof( value ),
+                             &value ) );
+       }
+    }
+    /* -- set IOProc (callback) -- */
+    callbackKey = outStreamParams ? kAudioUnitProperty_SetRenderCallback
+                                  : kAudioOutputUnitProperty_SetInputCallback ;
+    rcbs.inputProc = AudioIOProc;
+    rcbs.inputProcRefCon = refCon;
+    ERR_WRAP( AudioUnitSetProperty(
+                               *audioUnit,
+                               callbackKey,
+                               kAudioUnitScope_Output,
+                               outStreamParams ? OUTPUT_ELEMENT : INPUT_ELEMENT,
+                               &rcbs,
+                               sizeof(rcbs)) );
+
+    if( inStreamParams && outStreamParams && *srConverter )
+           ERR_WRAP( AudioUnitSetProperty(
+                               *audioUnit,
+                               kAudioOutputUnitProperty_SetInputCallback,
+                               kAudioUnitScope_Output,
+                               INPUT_ELEMENT,
+                               &rcbs,
+                               sizeof(rcbs)) );
+
+    /* channel mapping. */
+    if(inChannelMap)
+    {
+        UInt32 mapSize = inChannelMapSize *sizeof(SInt32);
+
+        //for each channel of desired input, map the channel from
+        //the device's output channel.
+        ERR_WRAP( AudioUnitSetProperty(*audioUnit,
+                                kAudioOutputUnitProperty_ChannelMap,
+                                kAudioUnitScope_Output,
+                                INPUT_ELEMENT,
+                                inChannelMap,
+                                mapSize));
+    }
+    if(outChannelMap)
+    {
+        UInt32 mapSize = outChannelMapSize *sizeof(SInt32);
+
+        //for each channel of desired output, map the channel from
+        //the device's output channel.
+        ERR_WRAP(AudioUnitSetProperty(*audioUnit,
+                                kAudioOutputUnitProperty_ChannelMap,
+                                kAudioUnitScope_Output,
+                                OUTPUT_ELEMENT,
+                                outChannelMap,
+                                mapSize));
+    }
+    /* initialize the audio unit */
+    ERR_WRAP( AudioUnitInitialize(*audioUnit) );
+
+    if( inStreamParams && outStreamParams )
+    {
+        VDBUG( ("Opened device %ld for input and output.\n", *audioDevice ) );
+    }
+    else if( inStreamParams )
+    {
+        VDBUG( ("Opened device %ld for input.\n", *audioDevice ) );
+    }
+    else if( outStreamParams )
+    {
+        VDBUG( ("Opened device %ld for output.\n", *audioDevice ) );
+    }
+    return paNoError;
+#undef ERR_WRAP
+
+    error:
+       CloseComponent( *audioUnit );
+       *audioUnit = NULL;
+       if( result )
+          return PaMacCore_SetError( result, line, 1 );
+       return paResult;
+}
+
+/* =================================================================================================== */
+
+static UInt32 CalculateOptimalBufferSize( PaMacAUHAL *auhalHostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  UInt32 fixedInputLatency,
+                                  UInt32 fixedOutputLatency,
+                                  double sampleRate,
+                                  UInt32 requestedFramesPerBuffer )
+{
+    UInt32 resultBufferSizeFrames = 0;  
+    // Use maximum of suggested input and output latencies.
+    if( inputParameters )
+    {
+        UInt32 suggestedLatencyFrames = inputParameters->suggestedLatency * sampleRate;
+        // Calculate a buffer size assuming we are double buffered.
+        SInt32 variableLatencyFrames = suggestedLatencyFrames - fixedInputLatency;
+        // Prevent negative latency.
+        variableLatencyFrames = MAX( variableLatencyFrames, 0 );       
+        resultBufferSizeFrames = MAX( resultBufferSizeFrames, (UInt32) variableLatencyFrames );
+    }
+    if( outputParameters )
+    {        
+        UInt32 suggestedLatencyFrames = outputParameters->suggestedLatency * sampleRate;
+        SInt32 variableLatencyFrames = suggestedLatencyFrames - fixedOutputLatency;
+        variableLatencyFrames = MAX( variableLatencyFrames, 0 );
+        resultBufferSizeFrames = MAX( resultBufferSizeFrames, (UInt32) variableLatencyFrames );
+    }
+    
+    if( requestedFramesPerBuffer != paFramesPerBufferUnspecified )
+    {
+        // make host buffer the next highest integer multiple of user frames per buffer
+        UInt32 n = (resultBufferSizeFrames + requestedFramesPerBuffer - 1) / requestedFramesPerBuffer;
+        resultBufferSizeFrames = n * requestedFramesPerBuffer;
+
+    }else{
+    	VDBUG( ("Block Size unspecified. Based on Latency, the user wants a Block Size near: %ld.\n",
+            resultBufferSizeFrames ) );
+    }
+    
+    // Clip to the capabilities of the device.
+    if( inputParameters )
+    {
+        ClipToDeviceBufferSize( auhalHostApi->devIds[inputParameters->device],
+                               true, // In the old code isInput was false!
+                               resultBufferSizeFrames, &resultBufferSizeFrames );
+    }
+    if( outputParameters )
+    {
+        ClipToDeviceBufferSize( auhalHostApi->devIds[outputParameters->device],
+                               false, resultBufferSizeFrames, &resultBufferSizeFrames );
+    }
+    VDBUG(("After querying hardware, setting block size to %ld.\n", resultBufferSizeFrames));
+
+    return resultBufferSizeFrames;
+}
+
+/* =================================================================================================== */
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long requestedFramesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaMacAUHAL *auhalHostApi = (PaMacAUHAL*)hostApi;
+    PaMacCoreStream *stream = 0;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+    UInt32 fixedInputLatency = 0;
+    UInt32 fixedOutputLatency = 0;
+    // Accumulate contributions to latency in these variables.
+    UInt32 inputLatencyFrames = 0;
+    UInt32 outputLatencyFrames = 0;
+    UInt32 suggestedLatencyFramesPerBuffer = requestedFramesPerBuffer;
+    
+    VVDBUG(("OpenStream(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld SR=%g, FPB=%ld\n",
+                inputParameters  ? inputParameters->channelCount  : -1,
+                inputParameters  ? inputParameters->sampleFormat  : -1,
+                outputParameters ? outputParameters->channelCount : -1,
+                outputParameters ? outputParameters->sampleFormat : -1,
+                (float) sampleRate,
+                requestedFramesPerBuffer ));
+    VDBUG( ("Opening Stream.\n") );
+	
+    /* These first few bits of code are from paSkeleton with few modifications. */
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+		/* @todo Blocking read/write on Mac is not yet supported. */
+		if( !streamCallback && inputSampleFormat & paNonInterleaved )
+		{
+			return paSampleFormatNotSupported;
+		}
+		
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* Host supports interleaved float32 */
+        hostInputSampleFormat = paFloat32;
+    }
+    else
+    {
+        inputChannelCount = 0;
+        inputSampleFormat = hostInputSampleFormat = paFloat32; /* Surpress 'uninitialised var' warnings. */
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        
+		/* @todo Blocking read/write on Mac is not yet supported. */
+		if( !streamCallback && outputSampleFormat & paNonInterleaved )
+		{
+			return paSampleFormatNotSupported;
+		}
+		
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* Host supports interleaved float32 */
+        hostOutputSampleFormat = paFloat32;
+    }
+    else
+    {
+        outputChannelCount = 0;
+        outputSampleFormat = hostOutputSampleFormat = paFloat32; /* Surpress 'uninitialized var' warnings. */
+    }
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+    stream = (PaMacCoreStream*)PaUtil_AllocateMemory( sizeof(PaMacCoreStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* If we fail after this point, we my be left in a bad state, with
+       some data structures setup and others not. So, first thing we
+       do is initialize everything so that if we fail, we know what hasn't
+       been touched.
+     */
+
+    stream->inputAudioBufferList.mBuffers[0].mData = NULL;
+    stream->inputRingBuffer.buffer = NULL;
+    bzero( &stream->blio, sizeof( PaMacBlio ) );
+/*
+    stream->blio.inputRingBuffer.buffer = NULL;
+    stream->blio.outputRingBuffer.buffer = NULL;
+    stream->blio.inputSampleFormat = inputParameters?inputParameters->sampleFormat:0;
+    stream->blio.inputSampleSize = computeSampleSizeFromFormat(stream->blio.inputSampleFormat);
+    stream->blio.outputSampleFormat=outputParameters?outputParameters->sampleFormat:0;
+    stream->blio.outputSampleSize = computeSampleSizeFromFormat(stream->blio.outputSampleFormat);
+*/
+    stream->inputSRConverter = NULL;
+    stream->inputUnit = NULL;
+    stream->outputUnit = NULL;
+    stream->inputFramesPerBuffer = 0;
+    stream->outputFramesPerBuffer = 0;
+    stream->bufferProcessorIsInitialized = FALSE;
+	stream->timingInformationMutexIsInitialized = 0;
+
+    /* assert( streamCallback ) ; */ /* only callback mode is implemented */
+    if( streamCallback )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                        &auhalHostApi->callbackStreamInterface,
+                                        streamCallback, userData );
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                        &auhalHostApi->blockingStreamInterface,
+                                        BlioCallback, &stream->blio );
+    }
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+    
+    if( inputParameters )
+    {
+        CalculateFixedDeviceLatency( auhalHostApi->devIds[inputParameters->device], true, &fixedInputLatency );
+        inputLatencyFrames += fixedInputLatency;
+    }
+    if( outputParameters )
+    {        
+        CalculateFixedDeviceLatency( auhalHostApi->devIds[outputParameters->device], false, &fixedOutputLatency );
+        outputLatencyFrames += fixedOutputLatency;
+
+    }
+    
+    suggestedLatencyFramesPerBuffer = CalculateOptimalBufferSize( auhalHostApi, inputParameters, outputParameters,
+                                                                 fixedInputLatency, fixedOutputLatency,
+                                                                 sampleRate, requestedFramesPerBuffer );
+    if( requestedFramesPerBuffer == paFramesPerBufferUnspecified )
+	{
+        requestedFramesPerBuffer = suggestedLatencyFramesPerBuffer;
+    }
+
+    /* -- Now we actually open and setup streams. -- */
+    if( inputParameters && outputParameters && outputParameters->device == inputParameters->device )
+    { /* full duplex. One device. */
+       UInt32 inputFramesPerBuffer  = (UInt32) stream->inputFramesPerBuffer;
+       UInt32 outputFramesPerBuffer = (UInt32) stream->outputFramesPerBuffer;
+       result = OpenAndSetupOneAudioUnit( stream,
+                                          inputParameters,
+                                          outputParameters,
+                                          suggestedLatencyFramesPerBuffer,
+                                          &inputFramesPerBuffer,
+                                          &outputFramesPerBuffer,
+                                          auhalHostApi,
+                                          &(stream->inputUnit),
+                                          &(stream->inputSRConverter),
+                                          &(stream->inputDevice),
+                                          sampleRate,
+                                          stream );
+       stream->inputFramesPerBuffer = inputFramesPerBuffer;
+       stream->outputFramesPerBuffer = outputFramesPerBuffer;
+       stream->outputUnit = stream->inputUnit;
+       stream->outputDevice = stream->inputDevice;
+       if( result != paNoError )
+           goto error;
+    }
+    else
+    { /* full duplex, different devices OR simplex */
+       UInt32 outputFramesPerBuffer = (UInt32) stream->outputFramesPerBuffer;
+       UInt32 inputFramesPerBuffer  = (UInt32) stream->inputFramesPerBuffer;
+       result = OpenAndSetupOneAudioUnit( stream,
+                                          NULL,
+                                          outputParameters,
+                                          suggestedLatencyFramesPerBuffer,
+                                          NULL,
+                                          &outputFramesPerBuffer,
+                                          auhalHostApi,
+                                          &(stream->outputUnit),
+                                          NULL,
+                                          &(stream->outputDevice),
+                                          sampleRate,
+                                          stream );
+       if( result != paNoError )
+           goto error;
+       result = OpenAndSetupOneAudioUnit( stream,
+                                          inputParameters,
+                                          NULL,
+                                          suggestedLatencyFramesPerBuffer,
+                                          &inputFramesPerBuffer,
+                                          NULL,
+                                          auhalHostApi,
+                                          &(stream->inputUnit),
+                                          &(stream->inputSRConverter),
+                                          &(stream->inputDevice),
+                                          sampleRate,
+                                          stream );
+       if( result != paNoError )
+           goto error;
+       stream->inputFramesPerBuffer = inputFramesPerBuffer;
+       stream->outputFramesPerBuffer = outputFramesPerBuffer;
+    }
+    
+    inputLatencyFrames += stream->inputFramesPerBuffer;
+    outputLatencyFrames += stream->outputFramesPerBuffer;
+    
+    if( stream->inputUnit ) {
+       const size_t szfl = sizeof(float);
+       /* setup the AudioBufferList used for input */
+       bzero( &stream->inputAudioBufferList, sizeof( AudioBufferList ) );
+       stream->inputAudioBufferList.mNumberBuffers = 1;
+       stream->inputAudioBufferList.mBuffers[0].mNumberChannels
+                 = inputChannelCount;
+       stream->inputAudioBufferList.mBuffers[0].mDataByteSize
+                 = stream->inputFramesPerBuffer*inputChannelCount*szfl;
+       stream->inputAudioBufferList.mBuffers[0].mData
+                 = (float *) calloc(
+                               stream->inputFramesPerBuffer*inputChannelCount,
+                               szfl );
+       if( !stream->inputAudioBufferList.mBuffers[0].mData )
+       {
+          result = paInsufficientMemory;
+          goto error;
+       }
+        
+       /*
+        * If input and output devs are different or we are doing SR conversion,
+        * we also need a
+        * ring buffer to store inpt data while waiting for output
+        * data.
+        */
+       if( (stream->outputUnit && (stream->inputUnit != stream->outputUnit))
+           || stream->inputSRConverter )
+       {
+          /* May want the ringSize ot initial position in
+             ring buffer to depend somewhat on sample rate change */
+
+          void *data;
+          long ringSize;
+
+          ringSize = computeRingBufferSize( inputParameters,
+                                            outputParameters,
+                                            stream->inputFramesPerBuffer,
+                                            stream->outputFramesPerBuffer,
+                                            sampleRate );
+          /*ringSize <<= 4; *//*16x bigger, for testing */
+
+
+          /*now, we need to allocate memory for the ring buffer*/
+          data = calloc( ringSize, szfl*inputParameters->channelCount );
+          if( !data )
+          {
+             result = paInsufficientMemory;
+             goto error;
+          }
+
+          /* now we can initialize the ring buffer */
+          PaUtil_InitializeRingBuffer( &stream->inputRingBuffer, szfl*inputParameters->channelCount, ringSize, data ) ;
+          /* advance the read point a little, so we are reading from the
+             middle of the buffer */
+          if( stream->outputUnit )
+             PaUtil_AdvanceRingBufferWriteIndex( &stream->inputRingBuffer, ringSize / RING_BUFFER_ADVANCE_DENOMINATOR );
+           
+           // Just adds to input latency between input device and PA full duplex callback.
+           inputLatencyFrames += ringSize;
+       }
+    }
+
+    /* -- initialize Blio Buffer Processors -- */
+    if( !streamCallback )
+    {
+       long ringSize;
+
+       ringSize = computeRingBufferSize( inputParameters,
+                                         outputParameters,
+                                         stream->inputFramesPerBuffer,
+                                         stream->outputFramesPerBuffer,
+                                         sampleRate );
+       result = initializeBlioRingBuffers( &stream->blio,
+              inputParameters?inputParameters->sampleFormat:0 ,
+              outputParameters?outputParameters->sampleFormat:0 ,
+              MAX(stream->inputFramesPerBuffer,stream->outputFramesPerBuffer),
+              ringSize,
+              inputParameters?inputChannelCount:0 ,
+              outputParameters?outputChannelCount:0 ) ;
+       if( result != paNoError )
+          goto error;
+        
+        inputLatencyFrames += ringSize;
+        outputLatencyFrames += ringSize;
+        
+    }
+
+    /* -- initialize Buffer Processor -- */
+    {
+       unsigned long maxHostFrames = stream->inputFramesPerBuffer;
+       if( stream->outputFramesPerBuffer > maxHostFrames )
+          maxHostFrames = stream->outputFramesPerBuffer;
+       result = PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                 inputChannelCount, inputSampleFormat,
+                 hostInputSampleFormat,
+                 outputChannelCount, outputSampleFormat,
+                 hostOutputSampleFormat,
+                 sampleRate,
+                 streamFlags,
+                 requestedFramesPerBuffer,
+                 /* If sample rate conversion takes place, the buffer size
+                    will not be known. */
+                 maxHostFrames,
+                 stream->inputSRConverter
+                              ? paUtilUnknownHostBufferSize
+                              : paUtilBoundedHostBufferSize,
+                 streamCallback ? streamCallback : BlioCallback,
+                 streamCallback ? userData : &stream->blio );
+       if( result != paNoError )
+           goto error;
+    }
+    stream->bufferProcessorIsInitialized = TRUE;
+
+    // Calculate actual latency from the sum of individual latencies.
+    if( inputParameters ) 
+    {
+        inputLatencyFrames += PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor);
+        stream->streamRepresentation.streamInfo.inputLatency = inputLatencyFrames / sampleRate;
+    }
+    else
+    {
+        stream->streamRepresentation.streamInfo.inputLatency = 0.0;
+    }
+    
+    if( outputParameters ) 
+    {
+        outputLatencyFrames += PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor);
+        stream->streamRepresentation.streamInfo.outputLatency = outputLatencyFrames / sampleRate;
+    }
+    else
+    {
+        stream->streamRepresentation.streamInfo.outputLatency = 0.0;
+    }
+    
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+    stream->sampleRate  = sampleRate;
+    stream->outDeviceSampleRate = 0;
+    if( stream->outputUnit ) {
+       Float64 rate;
+       UInt32 size = sizeof( rate );
+       result = ERR( AudioDeviceGetProperty( stream->outputDevice,
+                                    0,
+                                    FALSE,
+                                    kAudioDevicePropertyNominalSampleRate,
+                                    &size, &rate ) );
+       if( result )
+          goto error;
+       stream->outDeviceSampleRate = rate;
+    }
+    stream->inDeviceSampleRate = 0;
+    if( stream->inputUnit ) {
+       Float64 rate;
+       UInt32 size = sizeof( rate );
+       result = ERR( AudioDeviceGetProperty( stream->inputDevice,
+                                    0,
+                                    TRUE,
+                                    kAudioDevicePropertyNominalSampleRate,
+                                    &size, &rate ) );
+       if( result )
+          goto error;
+       stream->inDeviceSampleRate = rate;
+    }
+    stream->userInChan  = inputChannelCount;
+    stream->userOutChan = outputChannelCount;
+
+    // Setup property listeners for timestamp and latency calculations.
+	pthread_mutex_init( &stream->timingInformationMutex, NULL );
+	stream->timingInformationMutexIsInitialized = 1;
+    InitializeDeviceProperties( &stream->inputProperties );
+    InitializeDeviceProperties( &stream->outputProperties );
+	if( stream->outputUnit )
+    {
+        Boolean isInput = FALSE;
+        SetupDevicePropertyListeners( stream, stream->outputDevice, isInput );
+    }
+	if( stream->inputUnit )
+    {
+        Boolean isInput = TRUE;
+        SetupDevicePropertyListeners( stream, stream->inputDevice, isInput );
+	}
+    UpdateTimeStampOffsets( stream );
+    // Setup copies to be used by audio callback.
+    stream->timestampOffsetCombined_ioProcCopy = stream->timestampOffsetCombined;
+    stream->timestampOffsetInputDevice_ioProcCopy = stream->timestampOffsetInputDevice;
+    stream->timestampOffsetOutputDevice_ioProcCopy = stream->timestampOffsetOutputDevice;
+
+    stream->state = STOPPED;
+    stream->xrunFlags = 0;
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    CloseStream( stream );
+    return result;
+}
+
+
+#define HOST_TIME_TO_PA_TIME( x ) ( AudioConvertHostTimeToNanos( (x) ) * 1.0E-09) /* convert to nanoseconds and then to seconds */
+
+PaTime GetStreamTime( PaStream *s )
+{
+	return HOST_TIME_TO_PA_TIME( AudioGetCurrentHostTime() ); 
+}
+
+#define RING_BUFFER_EMPTY (1000)
+
+static OSStatus ringBufferIOProc( AudioConverterRef inAudioConverter, 
+                             UInt32*ioDataSize, 
+                             void** outData, 
+                             void*inUserData )
+{
+   void *dummyData;
+   ring_buffer_size_t dummySize;
+   PaUtilRingBuffer *rb = (PaUtilRingBuffer *) inUserData;
+
+   VVDBUG(("ringBufferIOProc()\n"));
+
+   if( PaUtil_GetRingBufferReadAvailable( rb ) == 0 ) {
+      *outData = NULL;
+      *ioDataSize = 0;
+      return RING_BUFFER_EMPTY;
+   }
+   assert(sizeof(UInt32) == sizeof(ring_buffer_size_t));
+   assert( ( (*ioDataSize) / rb->elementSizeBytes ) * rb->elementSizeBytes == (*ioDataSize) ) ;
+   (*ioDataSize) /= rb->elementSizeBytes ;
+   PaUtil_GetRingBufferReadRegions( rb, *ioDataSize,
+                                    outData, (ring_buffer_size_t *)ioDataSize, 
+                                    &dummyData, &dummySize );
+   assert( *ioDataSize );
+   PaUtil_AdvanceRingBufferReadIndex( rb, *ioDataSize );
+   (*ioDataSize) *= rb->elementSizeBytes ;
+
+   return noErr;
+}
+
+/*
+ * Called by the AudioUnit API to process audio from the sound card.
+ * This is where the magic happens.
+ */
+/* FEEDBACK: there is a lot of redundant code here because of how all the cases differ. This makes it hard to maintain, so if there are suggestinos for cleaning it up, I'm all ears. */
+static OSStatus AudioIOProc( void *inRefCon,
+                               AudioUnitRenderActionFlags *ioActionFlags,
+                               const AudioTimeStamp *inTimeStamp,
+                               UInt32 inBusNumber,
+                               UInt32 inNumberFrames,
+                               AudioBufferList *ioData )
+{
+   unsigned long framesProcessed     = 0;
+   PaStreamCallbackTimeInfo timeInfo = {0,0,0};
+   PaMacCoreStream *stream           = (PaMacCoreStream*)inRefCon;
+   const bool isRender               = inBusNumber == OUTPUT_ELEMENT;
+   int callbackResult                = paContinue ;
+   double hostTimeStampInPaTime      = HOST_TIME_TO_PA_TIME(inTimeStamp->mHostTime);
+
+   VVDBUG(("AudioIOProc()\n"));
+
+   PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+   /* -----------------------------------------------------------------*\
+      This output may be useful for debugging,
+      But printing durring the callback is a bad enough idea that
+      this is not enabled by enableing the usual debugging calls.
+   \* -----------------------------------------------------------------*/
+   /*
+   static int renderCount = 0;
+   static int inputCount = 0;
+   printf( "-------------------  starting reder/input\n" );
+   if( isRender )
+      printf("Render callback (%d):\t", ++renderCount);
+   else
+      printf("Input callback  (%d):\t", ++inputCount);
+   printf( "Call totals: %d (input), %d (render)\n", inputCount, renderCount );
+
+   printf( "--- inBusNumber: %lu\n", inBusNumber );
+   printf( "--- inNumberFrames: %lu\n", inNumberFrames );
+   printf( "--- %x ioData\n", (unsigned) ioData );
+   if( ioData )
+   {
+      int i=0;
+      printf( "--- ioData.mNumBuffers %lu: \n", ioData->mNumberBuffers );
+      for( i=0; i<ioData->mNumberBuffers; ++i )
+         printf( "--- ioData buffer %d size: %lu.\n", i, ioData->mBuffers[i].mDataByteSize );
+   }
+      ----------------------------------------------------------------- */
+
+	/* compute PaStreamCallbackTimeInfo */
+	
+	if( pthread_mutex_trylock( &stream->timingInformationMutex ) == 0 ){
+		/* snapshot the ioproc copy of timing information */
+		stream->timestampOffsetCombined_ioProcCopy = stream->timestampOffsetCombined;
+		stream->timestampOffsetInputDevice_ioProcCopy = stream->timestampOffsetInputDevice;
+		stream->timestampOffsetOutputDevice_ioProcCopy = stream->timestampOffsetOutputDevice;
+		pthread_mutex_unlock( &stream->timingInformationMutex );
+	}
+	
+	/* For timeInfo.currentTime we could calculate current time backwards from the HAL audio 
+	 output time to give a more accurate impression of the current timeslice but it doesn't 
+	 seem worth it at the moment since other PA host APIs don't do any better.
+	 */
+	timeInfo.currentTime = HOST_TIME_TO_PA_TIME( AudioGetCurrentHostTime() );
+	
+	/*
+	 For an input HAL AU, inTimeStamp is the time the samples are received from the hardware,
+	 for an output HAL AU inTimeStamp is the time the samples are sent to the hardware. 
+	 PA expresses timestamps in terms of when the samples enter the ADC or leave the DAC
+	 so we add or subtract kAudioDevicePropertyLatency below.
+	 */
+	
+	/* FIXME: not sure what to do below if the host timestamps aren't valid (kAudioTimeStampHostTimeValid isn't set)
+	 Could ask on CA mailing list if it is possible for it not to be set. If so, could probably grab a now timestamp
+	 at the top and compute from there (modulo scheduling jitter) or ask on mailing list for other options. */
+	
+	if( isRender )
+	{
+		if( stream->inputUnit ) /* full duplex */
+		{
+			if( stream->inputUnit == stream->outputUnit ) /* full duplex AUHAL IOProc */
+			{
+                // Ross and Phil agreed that the following calculation is correct based on an email from Jeff Moore:
+                // http://osdir.com/ml/coreaudio-api/2009-07/msg00140.html
+                // Basically the difference between the Apple output timestamp and the PA timestamp is kAudioDevicePropertyLatency.
+				timeInfo.inputBufferAdcTime = hostTimeStampInPaTime - 
+                    (stream->timestampOffsetCombined_ioProcCopy + stream->timestampOffsetInputDevice_ioProcCopy);
+ 				timeInfo.outputBufferDacTime = hostTimeStampInPaTime + stream->timestampOffsetOutputDevice_ioProcCopy;
+			}
+			else /* full duplex with ring-buffer from a separate input AUHAL ioproc */
+			{
+				/* FIXME: take the ring buffer latency into account */
+				timeInfo.inputBufferAdcTime = hostTimeStampInPaTime - 
+                    (stream->timestampOffsetCombined_ioProcCopy + stream->timestampOffsetInputDevice_ioProcCopy);
+				timeInfo.outputBufferDacTime = hostTimeStampInPaTime + stream->timestampOffsetOutputDevice_ioProcCopy;
+			}
+		}
+		else /* output only */
+		{
+			timeInfo.inputBufferAdcTime = 0;
+			timeInfo.outputBufferDacTime = hostTimeStampInPaTime + stream->timestampOffsetOutputDevice_ioProcCopy;
+		}
+	}
+	else /* input only */
+	{
+		timeInfo.inputBufferAdcTime = hostTimeStampInPaTime - stream->timestampOffsetInputDevice_ioProcCopy; 
+		timeInfo.outputBufferDacTime = 0;
+	}
+	
+   //printf( "---%g, %g, %g\n", timeInfo.inputBufferAdcTime, timeInfo.currentTime, timeInfo.outputBufferDacTime );
+
+   if( isRender && stream->inputUnit == stream->outputUnit
+                && !stream->inputSRConverter )
+   {
+      /* --------- Full Duplex, One Device, no SR Conversion -------
+       *
+       * This is the lowest latency case, and also the simplest.
+       * Input data and output data are available at the same time.
+       * we do not use the input SR converter or the input ring buffer.
+       *
+       */
+      OSStatus err = 0;
+      unsigned long frames;
+
+      /* -- start processing -- */
+      PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
+                                    &timeInfo,
+                                    stream->xrunFlags );
+      stream->xrunFlags = 0; //FIXME: this flag also gets set outside by a callback, which calls the xrunCallback function. It should be in the same thread as the main audio callback, but the apple docs just use the word "usually" so it may be possible to loose an xrun notification, if that callback happens here.
+
+      /* -- compute frames. do some checks -- */
+      assert( ioData->mNumberBuffers == 1 );
+      assert( ioData->mBuffers[0].mNumberChannels == stream->userOutChan );
+      frames = ioData->mBuffers[0].mDataByteSize;
+      frames /= sizeof( float ) * ioData->mBuffers[0].mNumberChannels;
+      /* -- copy and process input data -- */
+      err= AudioUnitRender(stream->inputUnit,
+                    ioActionFlags,
+                    inTimeStamp,
+                    INPUT_ELEMENT,
+                    inNumberFrames,
+                    &stream->inputAudioBufferList );
+      /* FEEDBACK: I'm not sure what to do when this call fails. There's nothing in the PA API to
+       * do about failures in the callback system. */
+      assert( !err );
+
+      PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
+      PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                          0,
+                          stream->inputAudioBufferList.mBuffers[0].mData,
+                          stream->inputAudioBufferList.mBuffers[0].mNumberChannels);
+      /* -- Copy and process output data -- */
+      PaUtil_SetOutputFrameCount( &(stream->bufferProcessor), frames );
+      PaUtil_SetInterleavedOutputChannels( &(stream->bufferProcessor),
+                                        0,
+                                        ioData->mBuffers[0].mData,
+                                        ioData->mBuffers[0].mNumberChannels);
+      /* -- complete processing -- */
+      framesProcessed =
+                 PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                             &callbackResult );
+   }
+   else if( isRender )
+   {
+      /* -------- Output Side of Full Duplex (Separate Devices or SR Conversion)
+       *       -- OR Simplex Output
+       *
+       * This case handles output data as in the full duplex case,
+       * and, if there is input data, reads it off the ring buffer 
+       * and into the PA buffer processor. If sample rate conversion
+       * is required on input, that is done here as well.
+       */
+      unsigned long frames;
+
+      /* Sometimes, when stopping a duplex stream we get erroneous
+         xrun flags, so if this is our last run, clear the flags. */
+      int xrunFlags = stream->xrunFlags;
+/*
+      if( xrunFlags & paInputUnderflow )
+         printf( "input underflow.\n" );
+      if( xrunFlags & paInputOverflow )
+         printf( "input overflow.\n" );
+*/
+      if( stream->state == STOPPING || stream->state == CALLBACK_STOPPED )
+         xrunFlags = 0;
+
+      /* -- start processing -- */
+      PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
+                                    &timeInfo,
+                                    xrunFlags );
+      stream->xrunFlags = 0; /* FEEDBACK: we only send flags to Buf Proc once */
+
+      /* -- Copy and process output data -- */
+      assert( ioData->mNumberBuffers == 1 );
+      frames = ioData->mBuffers[0].mDataByteSize;
+      frames /= sizeof( float ) * ioData->mBuffers[0].mNumberChannels;
+      assert( ioData->mBuffers[0].mNumberChannels == stream->userOutChan );
+      PaUtil_SetOutputFrameCount( &(stream->bufferProcessor), frames );
+      PaUtil_SetInterleavedOutputChannels( &(stream->bufferProcessor),
+                                     0,
+                                     ioData->mBuffers[0].mData,
+                                     ioData->mBuffers[0].mNumberChannels);
+
+      /* -- copy and process input data, and complete processing -- */
+      if( stream->inputUnit ) {
+         const int flsz = sizeof( float );
+         /* Here, we read the data out of the ring buffer, through the
+            audio converter. */
+         int inChan = stream->inputAudioBufferList.mBuffers[0].mNumberChannels;
+         if( stream->inputSRConverter )
+         {
+               OSStatus err;
+               UInt32 size;
+               float data[ inChan * frames ];
+               size = sizeof( data );
+               err = AudioConverterFillBuffer( 
+                             stream->inputSRConverter,
+                             ringBufferIOProc,
+                             &stream->inputRingBuffer,
+                             &size,
+                             (void *)&data );
+               if( err == RING_BUFFER_EMPTY )
+               { /*the ring buffer callback underflowed */
+                  err = 0;
+                  bzero( ((char *)data) + size, sizeof(data)-size );
+                  stream->xrunFlags |= paInputUnderflow;
+               }
+               ERR( err );
+               assert( !err );
+               
+               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
+               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                                   0,
+                                   data,
+                                   inChan );
+               framesProcessed =
+                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                                &callbackResult );
+         }
+         else
+         {
+            /* Without the AudioConverter is actually a bit more complex
+               because we have to do a little buffer processing that the
+               AudioConverter would otherwise handle for us. */
+            void *data1, *data2;
+            ring_buffer_size_t size1, size2;
+            PaUtil_GetRingBufferReadRegions( &stream->inputRingBuffer,
+                                             frames,
+                                             &data1, &size1,
+                                             &data2, &size2 );
+            if( size1 == frames ) {
+               /* simplest case: all in first buffer */
+               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
+               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                                   0,
+                                   data1,
+                                   inChan );
+               framesProcessed =
+                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                                &callbackResult );
+               PaUtil_AdvanceRingBufferReadIndex(&stream->inputRingBuffer, size1 );
+            } else if( size1 + size2 < frames ) {
+               /*we underflowed. take what data we can, zero the rest.*/
+               unsigned char data[frames*inChan*flsz];
+               if( size1 )
+                  memcpy( data, data1, size1 );
+               if( size2 )
+                  memcpy( data+size1, data2, size2 );
+               bzero( data+size1+size2, frames*flsz*inChan - size1 - size2 );
+
+               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
+               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                                   0,
+                                   data,
+                                   inChan );
+               framesProcessed =
+                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                                &callbackResult );
+               PaUtil_AdvanceRingBufferReadIndex( &stream->inputRingBuffer,
+                                                  size1+size2 );
+               /* flag underflow */
+               stream->xrunFlags |= paInputUnderflow;
+            } else {
+               /*we got all the data, but split between buffers*/
+               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), size1 );
+               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                                   0,
+                                   data1,
+                                   inChan );
+               PaUtil_Set2ndInputFrameCount( &(stream->bufferProcessor), size2 );
+               PaUtil_Set2ndInterleavedInputChannels( &(stream->bufferProcessor),
+                                   0,
+                                   data2,
+                                   inChan );
+               framesProcessed =
+                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                                &callbackResult );
+               PaUtil_AdvanceRingBufferReadIndex(&stream->inputRingBuffer, size1+size2 );
+            }
+         }
+      } else {
+         framesProcessed =
+                 PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                             &callbackResult );
+      }
+
+   }
+   else
+   {
+      /* ------------------ Input
+       *
+       * First, we read off the audio data and put it in the ring buffer.
+       * if this is an input-only stream, we need to process it more,
+       * otherwise, we let the output case deal with it.
+       */
+      OSStatus err = 0;
+      int chan = stream->inputAudioBufferList.mBuffers[0].mNumberChannels ;
+      /* FIXME: looping here may not actually be necessary, but it was something I tried in testing. */
+      do {
+         err= AudioUnitRender(stream->inputUnit,
+                 ioActionFlags,
+                 inTimeStamp,
+                 INPUT_ELEMENT,
+                 inNumberFrames,
+                 &stream->inputAudioBufferList );
+         if( err == -10874 )
+            inNumberFrames /= 2;
+      } while( err == -10874 && inNumberFrames > 1 );
+      /* FEEDBACK: I'm not sure what to do when this call fails */
+      ERR( err );
+      assert( !err );
+      if( stream->inputSRConverter || stream->outputUnit )
+      {
+         /* If this is duplex or we use a converter, put the data
+            into the ring buffer. */
+         long bytesIn, bytesOut;
+         bytesIn = sizeof( float ) * inNumberFrames * chan;
+         bytesOut = PaUtil_WriteRingBuffer( &stream->inputRingBuffer,
+                                            stream->inputAudioBufferList.mBuffers[0].mData,
+                                            inNumberFrames );
+         if( bytesIn != bytesOut )
+            stream->xrunFlags |= paInputOverflow ;
+      }
+      else
+      {
+         /* for simplex input w/o SR conversion,
+            just pop the data into the buffer processor.*/
+         PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
+                              &timeInfo,
+                              stream->xrunFlags );
+         stream->xrunFlags = 0;
+
+         PaUtil_SetInputFrameCount( &(stream->bufferProcessor), inNumberFrames);
+         PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                             0,
+                             stream->inputAudioBufferList.mBuffers[0].mData,
+                             chan );
+         framesProcessed =
+              PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                          &callbackResult );
+      }
+      if( !stream->outputUnit && stream->inputSRConverter )
+      {
+         /* ------------------ Simplex Input w/ SR Conversion
+          *
+          * if this is a simplex input stream, we need to read off the buffer,
+          * do our sample rate conversion and pass the results to the buffer
+          * processor.
+          * The logic here is complicated somewhat by the fact that we don't
+          * know how much data is available, so we loop on reasonably sized
+          * chunks, and let the BufferProcessor deal with the rest.
+          *
+          */
+         /*This might be too big or small depending on SR conversion*/
+         float data[ chan * inNumberFrames ];
+         OSStatus err;
+         do
+         { /*Run the buffer processor until we are out of data*/
+            UInt32 size;
+            long f;
+
+            size = sizeof( data );
+            err = AudioConverterFillBuffer( 
+                          stream->inputSRConverter,
+                          ringBufferIOProc,
+                          &stream->inputRingBuffer,
+                          &size,
+                          (void *)data );
+            if( err != RING_BUFFER_EMPTY )
+               ERR( err );
+            assert( err == 0 || err == RING_BUFFER_EMPTY );
+
+            f = size / ( chan * sizeof(float) );
+            PaUtil_SetInputFrameCount( &(stream->bufferProcessor), f );
+            if( f )
+            {
+               PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
+                                             &timeInfo,
+                                             stream->xrunFlags );
+               stream->xrunFlags = 0;
+
+               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
+                                0,
+                                data,
+                                chan );
+               framesProcessed =
+                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
+                                                &callbackResult );
+            }
+         } while( callbackResult == paContinue && !err );
+      }
+   }
+
+   switch( callbackResult )
+   {
+   case paContinue: break;
+   case paComplete:
+   case paAbort:
+      stream->state = CALLBACK_STOPPED ;
+      if( stream->outputUnit )
+         AudioOutputUnitStop(stream->outputUnit);
+      if( stream->inputUnit )
+         AudioOutputUnitStop(stream->inputUnit);
+      break;
+   }
+
+   PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+   return noErr;
+}
+
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    /* This may be called from a failed OpenStream.
+       Therefore, each piece of info is treated seperately. */
+    PaError result = paNoError;
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+
+    VVDBUG(("CloseStream()\n"));
+    VDBUG( ( "Closing stream.\n" ) );
+
+    if( stream ) {
+		
+		if( stream->outputUnit )
+        {
+            Boolean isInput = FALSE;
+            CleanupDevicePropertyListeners( stream, stream->outputDevice, isInput );
+		}
+		
+		if( stream->inputUnit )
+        {
+            Boolean isInput = TRUE;
+            CleanupDevicePropertyListeners( stream, stream->inputDevice, isInput );
+		}
+		
+       if( stream->outputUnit ) {
+          int count = removeFromXRunListenerList( stream );
+          if( count == 0 )
+             AudioDeviceRemovePropertyListener( stream->outputDevice,
+                                                0,
+                                                false,
+                                                kAudioDeviceProcessorOverload,
+                                                xrunCallback );
+       }
+       if( stream->inputUnit && stream->outputUnit != stream->inputUnit ) {
+          int count = removeFromXRunListenerList( stream );
+          if( count == 0 )
+             AudioDeviceRemovePropertyListener( stream->inputDevice,
+                                                0,
+                                                true,
+                                                kAudioDeviceProcessorOverload,
+                                                xrunCallback );
+       }
+       if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
+          AudioUnitUninitialize( stream->outputUnit );
+          CloseComponent( stream->outputUnit );
+       }
+       stream->outputUnit = NULL;
+       if( stream->inputUnit )
+       {
+          AudioUnitUninitialize( stream->inputUnit );
+          CloseComponent( stream->inputUnit );
+          stream->inputUnit = NULL;
+       }
+       if( stream->inputRingBuffer.buffer )
+          free( (void *) stream->inputRingBuffer.buffer );
+       stream->inputRingBuffer.buffer = NULL;
+       /*TODO: is there more that needs to be done on error
+               from AudioConverterDispose?*/
+       if( stream->inputSRConverter )
+          ERR( AudioConverterDispose( stream->inputSRConverter ) );
+       stream->inputSRConverter = NULL;
+       if( stream->inputAudioBufferList.mBuffers[0].mData )
+          free( stream->inputAudioBufferList.mBuffers[0].mData );
+       stream->inputAudioBufferList.mBuffers[0].mData = NULL;
+
+       result = destroyBlioRingBuffers( &stream->blio );
+       if( result )
+          return result;
+       if( stream->bufferProcessorIsInitialized )
+          PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+		
+       if( stream->timingInformationMutexIsInitialized )
+          pthread_mutex_destroy( &stream->timingInformationMutex );
+
+       PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+       PaUtil_FreeMemory( stream );
+    }
+
+    return result;
+}
+
+static PaError StartStream( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    OSStatus result = noErr;
+    VVDBUG(("StartStream()\n"));
+    VDBUG( ( "Starting stream.\n" ) );
+
+#define ERR_WRAP(mac_err) do { result = mac_err ; if ( result != noErr ) return ERR(result) ; } while(0)
+
+    /*FIXME: maybe want to do this on close/abort for faster start? */
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+    if(  stream->inputSRConverter )
+       ERR_WRAP( AudioConverterReset( stream->inputSRConverter ) );
+
+    /* -- start -- */
+    stream->state = ACTIVE;
+    if( stream->inputUnit ) {
+       ERR_WRAP( AudioOutputUnitStart(stream->inputUnit) );
+    }
+    if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
+       ERR_WRAP( AudioOutputUnitStart(stream->outputUnit) );
+    }
+	
+    return paNoError;
+#undef ERR_WRAP
+}
+
+// it's not clear from appl's docs that this really waits
+// until all data is flushed.
+static ComponentResult BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
+{
+    Boolean isRunning = 1;
+    while( isRunning ) {
+       UInt32 s = sizeof( isRunning );
+       ComponentResult err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element,  &isRunning, &s );
+       if( err )
+          return err;
+       Pa_Sleep( 100 );
+    }
+    return noErr;
+}
+
+static PaError StopStream( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    OSStatus result = noErr;
+    PaError paErr;
+    VVDBUG(("StopStream()\n"));
+
+    VDBUG( ("Waiting for BLIO.\n") );
+    waitUntilBlioWriteBufferIsFlushed( &stream->blio );
+    VDBUG( ( "Stopping stream.\n" ) );
+
+    stream->state = STOPPING;
+
+#define ERR_WRAP(mac_err) do { result = mac_err ; if ( result != noErr ) return ERR(result) ; } while(0)
+    /* -- stop and reset -- */
+    if( stream->inputUnit == stream->outputUnit && stream->inputUnit )
+    {
+       ERR_WRAP( AudioOutputUnitStop(stream->inputUnit) );
+       ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,0) );
+       ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,1) );
+       ERR_WRAP( AudioUnitReset(stream->inputUnit, kAudioUnitScope_Global, 1) );
+       ERR_WRAP( AudioUnitReset(stream->inputUnit, kAudioUnitScope_Global, 0) );
+    }
+    else
+    {
+       if( stream->inputUnit )
+       {
+          ERR_WRAP(AudioOutputUnitStop(stream->inputUnit) );
+          ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,1) );
+          ERR_WRAP(AudioUnitReset(stream->inputUnit,kAudioUnitScope_Global,1));
+       }
+       if( stream->outputUnit )
+       {
+          ERR_WRAP(AudioOutputUnitStop(stream->outputUnit));
+          ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->outputUnit,0) );
+          ERR_WRAP(AudioUnitReset(stream->outputUnit,kAudioUnitScope_Global,0));
+       }
+    }
+    if( stream->inputRingBuffer.buffer ) {
+       PaUtil_FlushRingBuffer( &stream->inputRingBuffer );
+       bzero( (void *)stream->inputRingBuffer.buffer,
+              stream->inputRingBuffer.bufferSize );
+       /* advance the write point a little, so we are reading from the
+          middle of the buffer. We'll need extra at the end because
+          testing has shown that this helps. */
+       if( stream->outputUnit )
+          PaUtil_AdvanceRingBufferWriteIndex( &stream->inputRingBuffer,
+                                              stream->inputRingBuffer.bufferSize
+                                              / RING_BUFFER_ADVANCE_DENOMINATOR );
+    }
+
+    stream->xrunFlags = 0;
+    stream->state = STOPPED;
+
+    paErr = resetBlioRingBuffers( &stream->blio );
+    if( paErr )
+       return paErr;
+
+    VDBUG( ( "Stream Stopped.\n" ) );
+    return paNoError;
+#undef ERR_WRAP
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    VVDBUG(("AbortStream()->StopStream()\n"));
+    VDBUG( ( "Aborting stream.\n" ) );
+    /* We have nothing faster than StopStream. */
+    return StopStream(s);
+}
+
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    VVDBUG(("IsStreamStopped()\n"));
+
+    return stream->state == STOPPED ? 1 : 0;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    VVDBUG(("IsStreamActive()\n"));
+    return ( stream->state == ACTIVE || stream->state == STOPPING );
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    VVDBUG(("GetStreamCpuLoad()\n"));
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
new file mode 100644
index 0000000000..b514f64119
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
@@ -0,0 +1,592 @@
+/*
+ * Implementation of the PortAudio API for Apple AUHAL
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+
+ This file contains the implementation
+ required for blocking I/O. It is separated from pa_mac_core.c simply to ease
+ development.
+*/
+
+#include "pa_mac_core_blocking.h"
+#include "pa_mac_core_internal.h"
+#include <assert.h>
+#ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
+# define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
+# define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
+#else
+# include <libkern/OSAtomic.h>
+#endif
+
+/*
+ * This function determines the size of a particular sample format.
+ * if the format is not recognized, this returns zero.
+ */
+static size_t computeSampleSizeFromFormat( PaSampleFormat format )
+{
+   switch( format & (~paNonInterleaved) ) {
+   case paFloat32: return 4;
+   case paInt32: return 4;
+   case paInt24: return 3;
+   case paInt16: return 2;
+   case paInt8: case paUInt8: return 1;
+   default: return 0;
+   }
+}
+/*
+ * Same as computeSampleSizeFromFormat, except that if
+ * the size is not a power of two, it returns the next power of two up
+ */
+static size_t computeSampleSizeFromFormatPow2( PaSampleFormat format )
+{
+   switch( format & (~paNonInterleaved) ) {
+   case paFloat32: return 4;
+   case paInt32: return 4;
+   case paInt24: return 4;
+   case paInt16: return 2;
+   case paInt8: case paUInt8: return 1;
+   default: return 0;
+   }
+}
+
+
+
+/*
+ * Functions for initializing, resetting, and destroying BLIO structures.
+ *
+ */
+
+/* This should be called with the relevant info when initializing a stream for
+   callback. */
+PaError initializeBlioRingBuffers(
+                                       PaMacBlio *blio,
+                                       PaSampleFormat inputSampleFormat,
+                                       PaSampleFormat outputSampleFormat,
+                                       size_t framesPerBuffer,
+                                       long ringBufferSize,
+                                       int inChan,
+                                       int outChan )
+{
+   void *data;
+   int result;
+   OSStatus err;
+
+   /* zeroify things */
+   bzero( blio, sizeof( PaMacBlio ) );
+   /* this is redundant, but the buffers are used to check
+      if the bufffers have been initialized, so we do it explicitly. */
+   blio->inputRingBuffer.buffer = NULL;
+   blio->outputRingBuffer.buffer = NULL;
+
+   /* initialize simple data */
+   blio->ringBufferFrames = ringBufferSize;
+   blio->inputSampleFormat = inputSampleFormat;
+   blio->inputSampleSizeActual = computeSampleSizeFromFormat(inputSampleFormat);
+   blio->inputSampleSizePow2 = computeSampleSizeFromFormatPow2(inputSampleFormat);
+   blio->outputSampleFormat = outputSampleFormat;
+   blio->outputSampleSizeActual = computeSampleSizeFromFormat(outputSampleFormat);
+   blio->outputSampleSizePow2 = computeSampleSizeFromFormatPow2(outputSampleFormat);
+
+   blio->framesPerBuffer = framesPerBuffer;
+   blio->inChan = inChan;
+   blio->outChan = outChan;
+   blio->statusFlags = 0;
+   blio->errors = paNoError;
+#ifdef PA_MAC_BLIO_MUTEX
+   blio->isInputEmpty = false;
+   blio->isOutputFull = false;
+#endif
+
+   /* setup ring buffers */
+#ifdef PA_MAC_BLIO_MUTEX
+   result = PaMacCore_SetUnixError( pthread_mutex_init(&(blio->inputMutex),NULL), 0 );
+   if( result )
+      goto error;
+   result = UNIX_ERR( pthread_cond_init( &(blio->inputCond), NULL ) );
+   if( result )
+      goto error;
+   result = UNIX_ERR( pthread_mutex_init(&(blio->outputMutex),NULL) );
+   if( result )
+      goto error;
+   result = UNIX_ERR( pthread_cond_init( &(blio->outputCond), NULL ) );
+#endif
+   if( inChan ) {
+      data = calloc( ringBufferSize, blio->inputSampleSizePow2*inChan );
+      if( !data )
+      {
+         result = paInsufficientMemory;
+         goto error;
+      }
+
+      err = PaUtil_InitializeRingBuffer(
+            &blio->inputRingBuffer,
+            1, ringBufferSize*blio->inputSampleSizePow2*inChan,
+            data );
+      assert( !err );
+   }
+   if( outChan ) {
+      data = calloc( ringBufferSize, blio->outputSampleSizePow2*outChan );
+      if( !data )
+      {
+         result = paInsufficientMemory;
+         goto error;
+      }
+
+      err = PaUtil_InitializeRingBuffer(
+            &blio->outputRingBuffer,
+            1, ringBufferSize*blio->outputSampleSizePow2*outChan,
+            data );
+      assert( !err );
+   }
+
+   result = resetBlioRingBuffers( blio );
+   if( result )
+      goto error;
+
+   return 0;
+
+ error:
+   destroyBlioRingBuffers( blio );
+   return result;
+}
+
+#ifdef PA_MAC_BLIO_MUTEX
+PaError blioSetIsInputEmpty( PaMacBlio *blio, bool isEmpty )
+{
+   PaError result = paNoError;
+   if( isEmpty == blio->isInputEmpty )
+      goto done;
+
+   /* we need to update the value. Here's what we do:
+    * - Lock the mutex, so noone else can write.
+    * - update the value.
+    * - unlock.
+    * - broadcast to all listeners.
+    */
+   result = UNIX_ERR( pthread_mutex_lock( &blio->inputMutex ) );
+   if( result )
+      goto done;
+   blio->isInputEmpty = isEmpty;
+   result = UNIX_ERR( pthread_mutex_unlock( &blio->inputMutex ) );
+   if( result )
+      goto done;
+   result = UNIX_ERR( pthread_cond_broadcast( &blio->inputCond ) );
+   if( result )
+      goto done;
+
+ done:
+   return result;
+}
+PaError blioSetIsOutputFull( PaMacBlio *blio, bool isFull )
+{
+   PaError result = paNoError;
+   if( isFull == blio->isOutputFull )
+      goto done;
+
+   /* we need to update the value. Here's what we do:
+    * - Lock the mutex, so noone else can write.
+    * - update the value.
+    * - unlock.
+    * - broadcast to all listeners.
+    */
+   result = UNIX_ERR( pthread_mutex_lock( &blio->outputMutex ) );
+   if( result )
+      goto done;
+   blio->isOutputFull = isFull;
+   result = UNIX_ERR( pthread_mutex_unlock( &blio->outputMutex ) );
+   if( result )
+      goto done;
+   result = UNIX_ERR( pthread_cond_broadcast( &blio->outputCond ) );
+   if( result )
+      goto done;
+
+ done:
+   return result;
+}
+#endif
+
+/* This should be called after stopping or aborting the stream, so that on next
+   start, the buffers will be ready. */
+PaError resetBlioRingBuffers( PaMacBlio *blio )
+{
+#ifdef PA_MAC__BLIO_MUTEX
+   int result;
+#endif
+   blio->statusFlags = 0;
+   if( blio->outputRingBuffer.buffer ) {
+      PaUtil_FlushRingBuffer( &blio->outputRingBuffer );
+      bzero( blio->outputRingBuffer.buffer,
+             blio->outputRingBuffer.bufferSize );
+      /* Advance buffer */
+      PaUtil_AdvanceRingBufferWriteIndex( &blio->outputRingBuffer, blio->ringBufferFrames*blio->outputSampleSizeActual*blio->outChan );
+      //PaUtil_AdvanceRingBufferWriteIndex( &blio->outputRingBuffer, blio->outputRingBuffer.bufferSize );
+
+      /* Update isOutputFull. */
+#ifdef PA_MAC__BLIO_MUTEX
+      result = blioSetIsOutputFull( blio, toAdvance == blio->outputRingBuffer.bufferSize );
+      if( result )
+         goto error;
+#endif
+/*
+      printf( "------%d\n" ,  blio->framesPerBuffer );
+      printf( "------%d\n" ,  blio->outChan );
+      printf( "------%d\n" ,  blio->outputSampleSize );
+      printf( "------%d\n" ,  blio->framesPerBuffer*blio->outChan*blio->outputSampleSize );
+*/
+   }
+   if( blio->inputRingBuffer.buffer ) {
+      PaUtil_FlushRingBuffer( &blio->inputRingBuffer );
+      bzero( blio->inputRingBuffer.buffer,
+             blio->inputRingBuffer.bufferSize );
+      /* Update isInputEmpty. */
+#ifdef PA_MAC__BLIO_MUTEX
+      result = blioSetIsInputEmpty( blio, true );
+      if( result )
+         goto error;
+#endif
+   }
+   return paNoError;
+#ifdef PA_MAC__BLIO_MUTEX
+ error:
+   return result;
+#endif
+}
+
+/*This should be called when you are done with the blio. It can safely be called
+  multiple times if there are no exceptions. */
+PaError destroyBlioRingBuffers( PaMacBlio *blio )
+{
+   PaError result = paNoError;
+   if( blio->inputRingBuffer.buffer ) {
+      free( blio->inputRingBuffer.buffer );
+#ifdef PA_MAC__BLIO_MUTEX
+      result = UNIX_ERR( pthread_mutex_destroy( & blio->inputMutex ) );
+      if( result ) return result;
+      result = UNIX_ERR( pthread_cond_destroy( & blio->inputCond ) );
+      if( result ) return result;
+#endif
+   }
+   blio->inputRingBuffer.buffer = NULL;
+   if( blio->outputRingBuffer.buffer ) {
+      free( blio->outputRingBuffer.buffer );
+#ifdef PA_MAC__BLIO_MUTEX
+      result = UNIX_ERR( pthread_mutex_destroy( & blio->outputMutex ) );
+      if( result ) return result;
+      result = UNIX_ERR( pthread_cond_destroy( & blio->outputCond ) );
+      if( result ) return result;
+#endif
+   }
+   blio->outputRingBuffer.buffer = NULL;
+
+   return result;
+}
+
+/*
+ * this is the BlioCallback function. It expects to recieve a PaMacBlio Object
+ * pointer as userData.
+ *
+ */
+int BlioCallback( const void *input, void *output, unsigned long frameCount,
+	const PaStreamCallbackTimeInfo* timeInfo,
+        PaStreamCallbackFlags statusFlags,
+        void *userData )
+{
+   PaMacBlio *blio = (PaMacBlio*)userData;
+   long avail;
+   long toRead;
+   long toWrite;
+   long read;
+   long written;
+
+   /* set flags returned by OS: */
+   OSAtomicOr32( statusFlags, &blio->statusFlags ) ;
+
+   /* --- Handle Input Buffer --- */
+   if( blio->inChan ) {
+      avail = PaUtil_GetRingBufferWriteAvailable( &blio->inputRingBuffer );
+
+      /* check for underflow */
+      if( avail < frameCount * blio->inputSampleSizeActual * blio->inChan )
+         OSAtomicOr32( paInputOverflow, &blio->statusFlags );
+
+      toRead = MIN( avail, frameCount * blio->inputSampleSizeActual * blio->inChan );
+
+      /* copy the data */
+      /*printf( "reading %d\n", toRead );*/
+      read = PaUtil_WriteRingBuffer( &blio->inputRingBuffer, input, toRead );
+      assert( toRead == read );
+#ifdef PA_MAC__BLIO_MUTEX
+      /* Priority inversion. See notes below. */
+      blioSetIsInputEmpty( blio, false );
+#endif
+   }
+
+
+   /* --- Handle Output Buffer --- */
+   if( blio->outChan ) {
+      avail = PaUtil_GetRingBufferReadAvailable( &blio->outputRingBuffer );
+
+      /* check for underflow */
+      if( avail < frameCount * blio->outputSampleSizeActual * blio->outChan )
+         OSAtomicOr32( paOutputUnderflow, &blio->statusFlags );
+
+      toWrite = MIN( avail, frameCount * blio->outputSampleSizeActual * blio->outChan );
+
+      if( toWrite != frameCount * blio->outputSampleSizeActual * blio->outChan )
+         bzero( ((char *)output)+toWrite,
+                frameCount * blio->outputSampleSizeActual * blio->outChan - toWrite );
+      /* copy the data */
+      /*printf( "writing %d\n", toWrite );*/
+      written = PaUtil_ReadRingBuffer( &blio->outputRingBuffer, output, toWrite );
+      assert( toWrite == written );
+#ifdef PA_MAC__BLIO_MUTEX
+      /* We have a priority inversion here. However, we will only have to
+         wait if this was true and is now false, which means we've got
+         some room in the buffer.
+         Hopefully problems will be minimized. */
+      blioSetIsOutputFull( blio, false );
+#endif
+   }
+
+   return paContinue;
+}
+
+PaError ReadStream( PaStream* stream,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
+    char *cbuf = (char *) buffer;
+    PaError ret = paNoError;
+    VVDBUG(("ReadStream()\n"));
+
+    while( frames > 0 ) {
+       long avail;
+       long toRead;
+       do {
+          avail = PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer );
+/*
+          printf( "Read Buffer is %%%g full: %ld of %ld.\n",
+                  100 * (float)avail / (float) blio->inputRingBuffer.bufferSize,
+                  avail, blio->inputRingBuffer.bufferSize );
+*/
+          if( avail == 0 ) {
+#ifdef PA_MAC_BLIO_MUTEX
+             /**block when empty*/
+             ret = UNIX_ERR( pthread_mutex_lock( &blio->inputMutex ) );
+             if( ret )
+                return ret;
+             while( blio->isInputEmpty ) {
+                ret = UNIX_ERR( pthread_cond_wait( &blio->inputCond, &blio->inputMutex ) );
+                if( ret )
+                   return ret;
+             }
+             ret = UNIX_ERR( pthread_mutex_unlock( &blio->inputMutex ) );
+             if( ret )
+                return ret;
+#else
+             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
+#endif
+          }
+       } while( avail == 0 );
+       toRead = MIN( avail, frames * blio->inputSampleSizeActual * blio->inChan );
+       toRead -= toRead % blio->inputSampleSizeActual * blio->inChan ;
+       PaUtil_ReadRingBuffer( &blio->inputRingBuffer, (void *)cbuf, toRead );
+       cbuf += toRead;
+       frames -= toRead / ( blio->inputSampleSizeActual * blio->inChan );
+
+       if( toRead == avail ) {
+#ifdef PA_MAC_BLIO_MUTEX
+          /* we just emptied the buffer, so we need to mark it as empty. */
+          ret = blioSetIsInputEmpty( blio, true );
+          if( ret )
+             return ret;
+          /* of course, in the meantime, the callback may have put some sats
+             in, so
+             so check for that, too, to avoid a race condition. */
+          if( PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer ) ) {
+             blioSetIsInputEmpty( blio, false );
+             if( ret )
+                return ret;
+          }
+#endif
+       }
+    }
+
+    /*   Report either paNoError or paInputOverflowed. */
+    /*   may also want to report other errors, but this is non-standard. */
+    ret = blio->statusFlags & paInputOverflow;
+
+    /* report underflow only once: */
+    if( ret ) {
+       OSAtomicAnd32( (uint32_t)(~paInputOverflow), &blio->statusFlags );
+       ret = paInputOverflowed;
+    }
+
+    return ret;
+}
+
+
+PaError WriteStream( PaStream* stream,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
+    char *cbuf = (char *) buffer;
+    PaError ret = paNoError;
+    VVDBUG(("WriteStream()\n"));
+
+    while( frames > 0 ) {
+       long avail = 0;
+       long toWrite;
+
+       do {
+          avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
+/*
+          printf( "Write Buffer is %%%g full: %ld of %ld.\n",
+                  100 - 100 * (float)avail / (float) blio->outputRingBuffer.bufferSize,
+                  avail, blio->outputRingBuffer.bufferSize );
+*/
+          if( avail == 0 ) {
+#ifdef PA_MAC_BLIO_MUTEX
+             /*block while full*/
+             ret = UNIX_ERR( pthread_mutex_lock( &blio->outputMutex ) );
+             if( ret )
+                return ret;
+             while( blio->isOutputFull ) {
+                ret = UNIX_ERR( pthread_cond_wait( &blio->outputCond, &blio->outputMutex ) );
+                if( ret )
+                   return ret;
+             }
+             ret = UNIX_ERR( pthread_mutex_unlock( &blio->outputMutex ) );
+             if( ret )
+                return ret;
+#else
+             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
+#endif
+          }
+       } while( avail == 0 );
+
+       toWrite = MIN( avail, frames * blio->outputSampleSizeActual * blio->outChan );
+       toWrite -= toWrite % blio->outputSampleSizeActual * blio->outChan ;
+       PaUtil_WriteRingBuffer( &blio->outputRingBuffer, (void *)cbuf, toWrite );
+       cbuf += toWrite;
+       frames -= toWrite / ( blio->outputSampleSizeActual * blio->outChan );
+
+#ifdef PA_MAC_BLIO_MUTEX
+       if( toWrite == avail ) {
+          /* we just filled up the buffer, so we need to mark it as filled. */
+          ret = blioSetIsOutputFull( blio, true );
+          if( ret )
+             return ret;
+          /* of course, in the meantime, we may have emptied the buffer, so
+             so check for that, too, to avoid a race condition. */
+          if( PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer ) ) {
+             blioSetIsOutputFull( blio, false );
+             if( ret )
+                return ret;
+          }
+       }
+#endif
+    }
+
+    /*   Report either paNoError or paOutputUnderflowed. */
+    /*   may also want to report other errors, but this is non-standard. */
+    ret = blio->statusFlags & paOutputUnderflow;
+
+    /* report underflow only once: */
+    if( ret ) {
+      OSAtomicAnd32( (uint32_t)(~paOutputUnderflow), &blio->statusFlags );
+      ret = paOutputUnderflowed;
+    }
+
+    return ret;
+}
+
+/*
+ *
+ */
+void waitUntilBlioWriteBufferIsFlushed( PaMacBlio *blio )
+{
+    if( blio->outputRingBuffer.buffer ) {
+       long avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
+       while( avail != blio->outputRingBuffer.bufferSize ) {
+          if( avail == 0 )
+             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
+          avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
+       }
+    }
+}
+
+
+signed long GetStreamReadAvailable( PaStream* stream )
+{
+    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
+    VVDBUG(("GetStreamReadAvailable()\n"));
+
+    return PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer )
+                         / ( blio->inputSampleSizeActual * blio->inChan );
+}
+
+
+signed long GetStreamWriteAvailable( PaStream* stream )
+{
+    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
+    VVDBUG(("GetStreamWriteAvailable()\n"));
+
+    return PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer )
+                         / ( blio->outputSampleSizeActual * blio->outChan );
+}
+
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
new file mode 100644
index 0000000000..a6f0ad5dc1
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
@@ -0,0 +1,136 @@
+/*
+ * Internal blocking interfaces for PortAudio Apple AUHAL implementation
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#ifndef PA_MAC_CORE_BLOCKING_H_
+#define PA_MAC_CORE_BLOCKING_H_
+
+#include "pa_ringbuffer.h"
+#include "portaudio.h"
+#include "pa_mac_core_utilities.h"
+
+/*
+ * Number of miliseconds to busy wait whil waiting for data in blocking calls.
+ */
+#define PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL (5)
+/*
+ * Define exactly one of these blocking methods
+ * PA_MAC_BLIO_MUTEX is not actively maintained.
+ */
+#define PA_MAC_BLIO_BUSY_WAIT
+/*
+#define PA_MAC_BLIO_MUTEX
+*/
+
+typedef struct {
+    PaUtilRingBuffer inputRingBuffer;
+    PaUtilRingBuffer outputRingBuffer;
+    size_t ringBufferFrames;
+    PaSampleFormat inputSampleFormat;
+    size_t inputSampleSizeActual;
+    size_t inputSampleSizePow2;
+    PaSampleFormat outputSampleFormat;
+    size_t outputSampleSizeActual;
+    size_t outputSampleSizePow2;
+
+    size_t framesPerBuffer;
+
+    int inChan;
+    int outChan;
+
+    //PaStreamCallbackFlags statusFlags;
+    uint32_t statusFlags;
+    PaError errors;
+
+    /* Here we handle blocking, using condition variables. */
+#ifdef  PA_MAC_BLIO_MUTEX
+    volatile bool isInputEmpty;
+    pthread_mutex_t inputMutex;
+    pthread_cond_t inputCond;
+
+    volatile bool isOutputFull;
+    pthread_mutex_t outputMutex;
+    pthread_cond_t outputCond;
+#endif
+}
+PaMacBlio;
+
+/*
+ * These functions operate on condition and related variables.
+ */
+
+PaError initializeBlioRingBuffers(
+                                       PaMacBlio *blio,
+                                       PaSampleFormat inputSampleFormat,
+                                       PaSampleFormat outputSampleFormat,
+                                       size_t framesPerBuffer,
+                                       long ringBufferSize,
+                                       int inChan,
+                                       int outChan );
+PaError destroyBlioRingBuffers( PaMacBlio *blio );
+PaError resetBlioRingBuffers( PaMacBlio *blio );
+
+int BlioCallback(
+        const void *input, void *output,
+        unsigned long frameCount,
+        const PaStreamCallbackTimeInfo* timeInfo,
+        PaStreamCallbackFlags statusFlags,
+        void *userData );
+
+void waitUntilBlioWriteBufferIsFlushed( PaMacBlio *blio );
+
+#endif /*PA_MAC_CORE_BLOCKING_H_*/
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
new file mode 100644
index 0000000000..462240bb4b
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
@@ -0,0 +1,194 @@
+/*
+ * Internal interfaces for PortAudio Apple AUHAL implementation
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file pa_mac_core
+ @ingroup hostapi_src
+ @author Bjorn Roche
+ @brief AUHAL implementation of PortAudio
+*/
+
+#ifndef PA_MAC_CORE_INTERNAL_H__
+#define PA_MAC_CORE_INTERNAL_H__
+
+#include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
+#include <AudioUnit/AudioUnit.h>
+#include <AudioToolbox/AudioToolbox.h>
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_allocation.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_ringbuffer.h"
+
+#include "pa_mac_core_blocking.h"
+
+/* function prototypes */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#define RING_BUFFER_ADVANCE_DENOMINATOR (4)
+
+PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+signed long GetStreamReadAvailable( PaStream* stream );
+signed long GetStreamWriteAvailable( PaStream* stream );
+/* PaMacAUHAL - host api datastructure specific to this implementation */
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    /* implementation specific data goes here */
+    long devCount;
+    AudioDeviceID *devIds; /*array of all audio devices*/
+    AudioDeviceID defaultIn;
+    AudioDeviceID defaultOut;
+}
+PaMacAUHAL;
+
+typedef struct PaMacCoreDeviceProperties
+{
+    /* Values in Frames from property queries. */
+    UInt32 safetyOffset;
+    UInt32 bufferFrameSize;
+    // UInt32 streamLatency; // Seems to be the same as deviceLatency!?
+    UInt32 deviceLatency;
+    /* Current device sample rate. May change! */
+    Float64 sampleRate;
+    Float64 samplePeriod; // reciprocal
+}
+PaMacCoreDeviceProperties;
+
+/* stream data structure specifically for this implementation */
+typedef struct PaMacCoreStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    /* implementation specific data goes here */
+    bool bufferProcessorIsInitialized;
+    AudioUnit inputUnit;
+    AudioUnit outputUnit;
+    AudioDeviceID inputDevice;
+    AudioDeviceID outputDevice;
+    size_t userInChan;
+    size_t userOutChan;
+    size_t inputFramesPerBuffer;
+    size_t outputFramesPerBuffer;
+    PaMacBlio blio;
+    /* We use this ring buffer when input and out devs are different. */
+    PaUtilRingBuffer inputRingBuffer;
+    /* We may need to do SR conversion on input. */
+    AudioConverterRef inputSRConverter;
+    /* We need to preallocate an inputBuffer for reading data. */
+    AudioBufferList inputAudioBufferList;
+    AudioTimeStamp startTime;
+    /* FIXME: instead of volatile, these should be properly memory barriered */
+    volatile uint32_t xrunFlags; /*PaStreamCallbackFlags*/
+    volatile enum {
+       STOPPED          = 0, /* playback is completely stopped,
+                                and the user has called StopStream(). */
+       CALLBACK_STOPPED = 1, /* callback has requested stop,
+                                but user has not yet called StopStream(). */
+       STOPPING         = 2, /* The stream is in the process of closing
+                                because the user has called StopStream.
+                                This state is just used internally;
+                                externally it is indistinguishable from
+                                ACTIVE.*/
+       ACTIVE           = 3  /* The stream is active and running. */
+    } state;
+    double sampleRate;
+    //these may be different from the stream sample rate due to SR conversion:
+    double outDeviceSampleRate;
+    double inDeviceSampleRate;
+	
+    PaMacCoreDeviceProperties  inputProperties;
+    PaMacCoreDeviceProperties  outputProperties;
+    
+	/* data updated by main thread and notifications, protected by timingInformationMutex */
+	int timingInformationMutexIsInitialized;
+	pthread_mutex_t timingInformationMutex;
+
+    /* These are written by the PA thread or from CoreAudio callbacks. Protected by the mutex. */
+    Float64 timestampOffsetCombined;
+    Float64 timestampOffsetInputDevice;
+    Float64 timestampOffsetOutputDevice;
+	
+	/* Offsets in seconds to be applied to Apple timestamps to convert them to PA timestamps.
+     * While the io proc is active, the following values are only accessed and manipulated by the ioproc */
+    Float64 timestampOffsetCombined_ioProcCopy;
+    Float64 timestampOffsetInputDevice_ioProcCopy;
+    Float64 timestampOffsetOutputDevice_ioProcCopy;
+    
+}
+PaMacCoreStream;
+
+#endif /* PA_MAC_CORE_INTERNAL_H__ */
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
new file mode 100644
index 0000000000..4ef89549b0
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
@@ -0,0 +1,913 @@
+/*
+ * $Id: pa_mac_core_old.c 1083 2006-08-23 07:30:49Z rossb $
+ * pa_mac_core.c
+ * Implementation of PortAudio for Mac OS X CoreAudio       
+ *                                                                                         
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Authors: Ross Bencina and Phil Burk
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+#include <CoreAudio/CoreAudio.h>
+#include <AudioToolbox/AudioToolbox.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <assert.h>
+
+#include "portaudio.h"
+#include "pa_trace.h"
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+
+// =====  constants  =====
+
+// =====  structs  =====
+#pragma mark structs
+
+// PaMacCoreHostApiRepresentation - host api datastructure specific to this implementation
+typedef struct PaMacCore_HAR
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+    
+    PaUtilAllocationGroup *allocations;
+    AudioDeviceID *macCoreDeviceIds;
+}
+PaMacCoreHostApiRepresentation;
+
+typedef struct PaMacCore_DI
+{
+    PaDeviceInfo inheritedDeviceInfo;
+}
+PaMacCoreDeviceInfo;
+
+// PaMacCoreStream - a stream data structure specifically for this implementation
+typedef struct PaMacCore_S
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+    
+    int primeStreamUsingCallback;
+    
+    AudioDeviceID inputDevice;
+    AudioDeviceID outputDevice;
+    
+    // Processing thread management --------------
+//    HANDLE abortEvent;
+//    HANDLE processingThread;
+//    DWORD processingThreadId;
+    
+    char throttleProcessingThreadOnOverload; // 0 -> don't throtte, non-0 -> throttle
+    int processingThreadPriority;
+    int highThreadPriority;
+    int throttledThreadPriority;
+    unsigned long throttledSleepMsecs;
+    
+    int isStopped;
+    volatile int isActive;
+    volatile int stopProcessing; // stop thread once existing buffers have been returned
+    volatile int abortProcessing; // stop thread immediately
+    
+//    DWORD allBuffersDurationMs; // used to calculate timeouts
+}
+PaMacCoreStream;
+
+// Data needed by the CoreAudio callback functions
+typedef struct PaMacCore_CD
+{
+    PaMacCoreStream *stream;
+    PaStreamCallback *callback;
+    void *userData;
+    PaUtilConverter *inputConverter;
+    PaUtilConverter *outputConverter;
+    void *inputBuffer;
+    void *outputBuffer;
+    int inputChannelCount;
+    int outputChannelCount;
+    PaSampleFormat inputSampleFormat;
+    PaSampleFormat outputSampleFormat;
+    PaUtilTriangularDitherGenerator *ditherGenerator;
+}
+PaMacClientData;
+
+// =====  CoreAudio-PortAudio bridge functions =====
+#pragma mark CoreAudio-PortAudio bridge functions
+
+// Maps CoreAudio OSStatus codes to PortAudio PaError codes
+static PaError conv_err(OSStatus error)
+{
+    PaError result;
+    
+    switch (error) {
+        case kAudioHardwareNoError:
+            result = paNoError; break;
+        case kAudioHardwareNotRunningError:
+            result = paInternalError; break;
+        case kAudioHardwareUnspecifiedError:
+            result = paInternalError; break;
+        case kAudioHardwareUnknownPropertyError:
+            result = paInternalError; break;
+        case kAudioHardwareBadPropertySizeError:
+            result = paInternalError; break;
+        case kAudioHardwareIllegalOperationError:
+            result = paInternalError; break;
+        case kAudioHardwareBadDeviceError:
+            result = paInvalidDevice; break;
+        case kAudioHardwareBadStreamError:
+            result = paBadStreamPtr; break;
+        case kAudioHardwareUnsupportedOperationError:
+            result = paInternalError; break;
+        case kAudioDeviceUnsupportedFormatError:
+            result = paSampleFormatNotSupported; break;
+        case kAudioDevicePermissionsError:
+            result = paDeviceUnavailable; break;
+        default:
+            result = paInternalError;
+    }
+    
+    return result;
+}
+
+/* This function is unused
+static AudioStreamBasicDescription *InitializeStreamDescription(const PaStreamParameters *parameters, double sampleRate)
+{
+    struct AudioStreamBasicDescription *streamDescription = PaUtil_AllocateMemory(sizeof(AudioStreamBasicDescription));
+    streamDescription->mSampleRate = sampleRate;
+    streamDescription->mFormatID = kAudioFormatLinearPCM;
+    streamDescription->mFormatFlags = 0;
+    streamDescription->mFramesPerPacket = 1;
+    
+    if (parameters->sampleFormat & paNonInterleaved) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsNonInterleaved;
+        streamDescription->mChannelsPerFrame = 1;
+        streamDescription->mBytesPerFrame = Pa_GetSampleSize(parameters->sampleFormat);
+        streamDescription->mBytesPerPacket = Pa_GetSampleSize(parameters->sampleFormat);
+    }
+    else {
+        streamDescription->mChannelsPerFrame = parameters->channelCount;
+    }
+    
+    streamDescription->mBytesPerFrame = Pa_GetSampleSize(parameters->sampleFormat) * streamDescription->mChannelsPerFrame;
+    streamDescription->mBytesPerPacket = streamDescription->mBytesPerFrame * streamDescription->mFramesPerPacket;
+    
+    if (parameters->sampleFormat & paFloat32) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsFloat;
+        streamDescription->mBitsPerChannel = 32;
+    }
+    else if (parameters->sampleFormat & paInt32) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+        streamDescription->mBitsPerChannel = 32;
+    }
+    else if (parameters->sampleFormat & paInt24) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+        streamDescription->mBitsPerChannel = 24;
+    }
+    else if (parameters->sampleFormat & paInt16) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+        streamDescription->mBitsPerChannel = 16;
+    }
+    else if (parameters->sampleFormat & paInt8) {
+        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+        streamDescription->mBitsPerChannel = 8;
+    }    
+    else if (parameters->sampleFormat & paInt32) {
+        streamDescription->mBitsPerChannel = 8;
+    }
+    
+    return streamDescription;
+}
+*/
+
+static PaStreamCallbackTimeInfo *InitializeTimeInfo(const AudioTimeStamp* now, const AudioTimeStamp* inputTime, const AudioTimeStamp* outputTime)
+{
+    PaStreamCallbackTimeInfo *timeInfo = PaUtil_AllocateMemory(sizeof(PaStreamCallbackTimeInfo));
+    
+    timeInfo->inputBufferAdcTime = inputTime->mSampleTime;
+    timeInfo->currentTime = now->mSampleTime;
+    timeInfo->outputBufferDacTime = outputTime->mSampleTime;
+    
+    return timeInfo;
+}
+
+// =====  support functions  =====
+#pragma mark support functions
+
+static void CleanUp(PaMacCoreHostApiRepresentation *macCoreHostApi)
+{
+    if( macCoreHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( macCoreHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( macCoreHostApi->allocations );
+    }
+    
+    PaUtil_FreeMemory( macCoreHostApi );    
+}
+
+static PaError GetChannelInfo(PaDeviceInfo *deviceInfo, AudioDeviceID macCoreDeviceId, int isInput)
+{
+    UInt32 propSize;
+    PaError err = paNoError;
+    UInt32 i;
+    int numChannels = 0;
+    AudioBufferList *buflist;
+
+    err = conv_err(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, NULL));
+    buflist = PaUtil_AllocateMemory(propSize);
+    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, buflist));
+    if (!err) {
+        for (i = 0; i < buflist->mNumberBuffers; ++i) {
+            numChannels += buflist->mBuffers[i].mNumberChannels;
+        }
+		
+		if (isInput)
+			deviceInfo->maxInputChannels = numChannels;
+		else
+			deviceInfo->maxOutputChannels = numChannels;
+		
+        int frameLatency;
+        propSize = sizeof(UInt32);
+        err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyLatency, &propSize, &frameLatency));
+        if (!err) {
+            double secondLatency = frameLatency / deviceInfo->defaultSampleRate;
+            if (isInput) {
+                deviceInfo->defaultLowInputLatency = secondLatency;
+                deviceInfo->defaultHighInputLatency = secondLatency;
+            }
+            else {
+                deviceInfo->defaultLowOutputLatency = secondLatency;
+                deviceInfo->defaultHighOutputLatency = secondLatency;
+            }
+        }
+    }
+    PaUtil_FreeMemory(buflist);
+    
+    return err;
+}
+
+static PaError InitializeDeviceInfo(PaMacCoreDeviceInfo *macCoreDeviceInfo,  AudioDeviceID macCoreDeviceId, PaHostApiIndex hostApiIndex )
+{
+    PaDeviceInfo *deviceInfo = &macCoreDeviceInfo->inheritedDeviceInfo;
+    deviceInfo->structVersion = 2;
+    deviceInfo->hostApi = hostApiIndex;
+    
+    PaError err = paNoError;
+    UInt32 propSize;
+
+    err = conv_err(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, NULL));
+    // FIXME: this allocation should be part of the allocations group
+    char *name = PaUtil_AllocateMemory(propSize);
+    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, name));
+    if (!err) {
+        deviceInfo->name = name;
+    }
+    
+    Float64 sampleRate;
+    propSize = sizeof(Float64);
+    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyNominalSampleRate, &propSize, &sampleRate));
+    if (!err) {
+        deviceInfo->defaultSampleRate = sampleRate;
+    }
+
+
+    // Get channel info
+    err = GetChannelInfo(deviceInfo, macCoreDeviceId, 1);
+    err = GetChannelInfo(deviceInfo, macCoreDeviceId, 0);
+
+    return err;
+}
+
+static PaError InitializeDeviceInfos( PaMacCoreHostApiRepresentation *macCoreHostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *hostApi;
+    PaMacCoreDeviceInfo *deviceInfoArray;
+
+    // initialise device counts and default devices under the assumption that there are no devices. These values are incremented below if and when devices are successfully initialized.
+    hostApi = &macCoreHostApi->inheritedHostApiRep;
+    hostApi->info.deviceCount = 0;
+    hostApi->info.defaultInputDevice = paNoDevice;
+    hostApi->info.defaultOutputDevice = paNoDevice;
+    
+    UInt32 propsize;
+    AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propsize, NULL);
+    int numDevices = propsize / sizeof(AudioDeviceID);
+    hostApi->info.deviceCount = numDevices;
+    if (numDevices > 0) {
+        hostApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                                            macCoreHostApi->allocations, sizeof(PaDeviceInfo*) * numDevices );
+        if( !hostApi->deviceInfos )
+        {
+            return paInsufficientMemory;
+        }
+
+        // allocate all device info structs in a contiguous block
+        deviceInfoArray = (PaMacCoreDeviceInfo*)PaUtil_GroupAllocateMemory(
+                                macCoreHostApi->allocations, sizeof(PaMacCoreDeviceInfo) * numDevices );
+        if( !deviceInfoArray )
+        {
+            return paInsufficientMemory;
+        }
+        
+        macCoreHostApi->macCoreDeviceIds = PaUtil_GroupAllocateMemory(macCoreHostApi->allocations, propsize);
+        AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &propsize, macCoreHostApi->macCoreDeviceIds);
+
+        AudioDeviceID defaultInputDevice, defaultOutputDevice;
+        propsize = sizeof(AudioDeviceID);
+        AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &propsize, &defaultInputDevice);
+        AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propsize, &defaultOutputDevice);
+        
+        UInt32 i;
+        for (i = 0; i < numDevices; ++i) {
+            if (macCoreHostApi->macCoreDeviceIds[i] == defaultInputDevice) {
+                hostApi->info.defaultInputDevice = i;
+            }
+            if (macCoreHostApi->macCoreDeviceIds[i] == defaultOutputDevice) {
+                hostApi->info.defaultOutputDevice = i;
+            }
+            InitializeDeviceInfo(&deviceInfoArray[i], macCoreHostApi->macCoreDeviceIds[i], hostApiIndex);
+            hostApi->deviceInfos[i] = &(deviceInfoArray[i].inheritedDeviceInfo);      
+        }
+    }
+
+    return result;
+}
+
+static OSStatus CheckFormat(AudioDeviceID macCoreDeviceId, const PaStreamParameters *parameters, double sampleRate, int isInput)
+{
+    UInt32 propSize = sizeof(AudioStreamBasicDescription);
+    AudioStreamBasicDescription *streamDescription = PaUtil_AllocateMemory(propSize);
+
+    streamDescription->mSampleRate = sampleRate;
+    streamDescription->mFormatID = 0;
+    streamDescription->mFormatFlags = 0;
+    streamDescription->mBytesPerPacket = 0;
+    streamDescription->mFramesPerPacket = 0;
+    streamDescription->mBytesPerFrame = 0;
+    streamDescription->mChannelsPerFrame = 0;
+    streamDescription->mBitsPerChannel = 0;
+    streamDescription->mReserved = 0;
+
+    OSStatus result = AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamFormatSupported, &propSize, streamDescription);
+    PaUtil_FreeMemory(streamDescription);
+    return result;
+}
+
+static OSStatus CopyInputData(PaMacClientData* destination, const AudioBufferList *source, unsigned long frameCount)
+{
+    int frameSpacing, channelSpacing;
+    if (destination->inputSampleFormat & paNonInterleaved) {
+        frameSpacing = 1;
+        channelSpacing = destination->inputChannelCount;
+    }
+    else {
+        frameSpacing = destination->inputChannelCount;
+        channelSpacing = 1;
+    }
+    
+    AudioBuffer const *inputBuffer = &source->mBuffers[0];
+    void *coreAudioBuffer = inputBuffer->mData;
+    void *portAudioBuffer = destination->inputBuffer;
+    UInt32 i, streamNumber, streamChannel;
+    for (i = streamNumber = streamChannel = 0; i < destination->inputChannelCount; ++i, ++streamChannel) {
+        if (streamChannel >= inputBuffer->mNumberChannels) {
+            ++streamNumber;
+            inputBuffer = &source->mBuffers[streamNumber];
+            coreAudioBuffer = inputBuffer->mData;
+            streamChannel = 0;
+        }
+        destination->inputConverter(portAudioBuffer, frameSpacing, coreAudioBuffer, inputBuffer->mNumberChannels, frameCount, destination->ditherGenerator);
+        coreAudioBuffer += sizeof(Float32);
+        portAudioBuffer += Pa_GetSampleSize(destination->inputSampleFormat) * channelSpacing;
+    }
+    return noErr;
+}
+
+static OSStatus CopyOutputData(AudioBufferList* destination, PaMacClientData *source, unsigned long frameCount)
+{
+    int frameSpacing, channelSpacing;
+    if (source->outputSampleFormat & paNonInterleaved) {
+        frameSpacing = 1;
+        channelSpacing = source->outputChannelCount;
+    }
+    else {
+        frameSpacing = source->outputChannelCount;
+        channelSpacing = 1;
+    }
+    
+    AudioBuffer *outputBuffer = &destination->mBuffers[0];
+    void *coreAudioBuffer = outputBuffer->mData;
+    void *portAudioBuffer = source->outputBuffer;
+    UInt32 i, streamNumber, streamChannel;
+    for (i = streamNumber = streamChannel = 0; i < source->outputChannelCount; ++i, ++streamChannel) {
+        if (streamChannel >= outputBuffer->mNumberChannels) {
+            ++streamNumber;
+            outputBuffer = &destination->mBuffers[streamNumber];
+            coreAudioBuffer = outputBuffer->mData;
+            streamChannel = 0;
+        }
+        source->outputConverter(coreAudioBuffer, outputBuffer->mNumberChannels, portAudioBuffer, frameSpacing, frameCount, NULL);
+        coreAudioBuffer += sizeof(Float32);
+        portAudioBuffer += Pa_GetSampleSize(source->outputSampleFormat) * channelSpacing;
+    }
+    return noErr;
+}
+
+static OSStatus AudioIOProc( AudioDeviceID inDevice,
+                      const AudioTimeStamp* inNow,
+                      const AudioBufferList* inInputData,
+                      const AudioTimeStamp* inInputTime,
+                      AudioBufferList* outOutputData, 
+                      const AudioTimeStamp* inOutputTime,
+                      void* inClientData)
+{
+    PaMacClientData *clientData = (PaMacClientData *)inClientData;
+    PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
+    
+    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
+    
+    AudioBuffer *outputBuffer = &outOutputData->mBuffers[0];
+    unsigned long frameCount = outputBuffer->mDataByteSize / (outputBuffer->mNumberChannels * sizeof(Float32));
+
+    if (clientData->inputBuffer) {
+        CopyInputData(clientData, inInputData, frameCount);
+    }
+    PaStreamCallbackResult result = clientData->callback(clientData->inputBuffer, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
+    if (clientData->outputBuffer) {
+        CopyOutputData(outOutputData, clientData, frameCount);
+    }
+
+    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
+    
+    if (result == paComplete || result == paAbort) {
+        Pa_StopStream(clientData->stream);
+    }
+
+    PaUtil_FreeMemory( timeInfo );
+    return noErr;
+}
+
+// This is not for input-only streams, this is for streams where the input device is different from the output device
+static OSStatus AudioInputProc( AudioDeviceID inDevice,
+                         const AudioTimeStamp* inNow,
+                         const AudioBufferList* inInputData,
+                         const AudioTimeStamp* inInputTime,
+                         AudioBufferList* outOutputData, 
+                         const AudioTimeStamp* inOutputTime,
+                         void* inClientData)
+{
+    PaMacClientData *clientData = (PaMacClientData *)inClientData;
+    PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
+
+    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
+
+    AudioBuffer const *inputBuffer = &inInputData->mBuffers[0];
+    unsigned long frameCount = inputBuffer->mDataByteSize / (inputBuffer->mNumberChannels * sizeof(Float32));
+
+    CopyInputData(clientData, inInputData, frameCount);
+    PaStreamCallbackResult result = clientData->callback(clientData->inputBuffer, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
+    
+    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
+    if( result == paComplete || result == paAbort )
+       Pa_StopStream(clientData->stream);
+    PaUtil_FreeMemory( timeInfo );
+    return noErr;
+}
+
+// This is not for output-only streams, this is for streams where the input device is different from the output device
+static OSStatus AudioOutputProc( AudioDeviceID inDevice,
+                          const AudioTimeStamp* inNow,
+                          const AudioBufferList* inInputData,
+                          const AudioTimeStamp* inInputTime,
+                          AudioBufferList* outOutputData, 
+                          const AudioTimeStamp* inOutputTime,
+                          void* inClientData)
+{
+    PaMacClientData *clientData = (PaMacClientData *)inClientData;
+    //PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
+
+    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
+
+    AudioBuffer *outputBuffer = &outOutputData->mBuffers[0];
+    unsigned long frameCount = outputBuffer->mDataByteSize / (outputBuffer->mNumberChannels * sizeof(Float32));
+
+    //clientData->callback(NULL, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
+
+    CopyOutputData(outOutputData, clientData, frameCount);
+
+    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
+    return noErr;
+}
+
+static PaError SetSampleRate(AudioDeviceID device, double sampleRate, int isInput)
+{
+    PaError result = paNoError;
+    
+    double actualSampleRate;
+    UInt32 propSize = sizeof(double);
+    result = conv_err(AudioDeviceSetProperty(device, NULL, 0, isInput, kAudioDevicePropertyNominalSampleRate, propSize, &sampleRate));
+    
+    result = conv_err(AudioDeviceGetProperty(device, 0, isInput, kAudioDevicePropertyNominalSampleRate, &propSize, &actualSampleRate));
+    
+    if (result == paNoError && actualSampleRate != sampleRate) {
+        result = paInvalidSampleRate;
+    }
+    
+    return result;    
+}
+
+static PaError SetFramesPerBuffer(AudioDeviceID device, unsigned long framesPerBuffer, int isInput)
+{
+    PaError result = paNoError;
+    UInt32 preferredFramesPerBuffer = framesPerBuffer;
+    //    while (preferredFramesPerBuffer > UINT32_MAX) {
+    //        preferredFramesPerBuffer /= 2;
+    //    }
+    
+    UInt32 actualFramesPerBuffer;
+    UInt32 propSize = sizeof(UInt32);
+    result = conv_err(AudioDeviceSetProperty(device, NULL, 0, isInput, kAudioDevicePropertyBufferFrameSize, propSize, &preferredFramesPerBuffer));
+    
+    result = conv_err(AudioDeviceGetProperty(device, 0, isInput, kAudioDevicePropertyBufferFrameSize, &propSize, &actualFramesPerBuffer));
+    
+    if (result != paNoError) {
+        // do nothing
+    }
+    else if (actualFramesPerBuffer > framesPerBuffer) {
+        result = paBufferTooSmall;
+    }
+    else if (actualFramesPerBuffer < framesPerBuffer) {
+        result = paBufferTooBig;
+    }
+    
+    return result;    
+}
+    
+static PaError SetUpUnidirectionalStream(AudioDeviceID device, double sampleRate, unsigned long framesPerBuffer, int isInput)
+{
+    PaError err = paNoError;
+    err = SetSampleRate(device, sampleRate, isInput);
+    if( err == paNoError )
+        err = SetFramesPerBuffer(device, framesPerBuffer, isInput);
+    return err;
+}
+
+// =====  PortAudio functions  =====
+#pragma mark PortAudio functions
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+    
+    PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+    
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation*)hostApi;
+    
+    CleanUp(macCoreHostApi);
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation*)hostApi;
+    PaDeviceInfo *deviceInfo;
+    
+    PaError result = paNoError;
+    if (inputParameters) {
+        deviceInfo = macCoreHostApi->inheritedHostApiRep.deviceInfos[inputParameters->device];
+        if (inputParameters->channelCount > deviceInfo->maxInputChannels)
+            result = paInvalidChannelCount;
+        else if (CheckFormat(macCoreHostApi->macCoreDeviceIds[inputParameters->device], inputParameters, sampleRate, 1) != kAudioHardwareNoError) {
+            result = paInvalidSampleRate;
+        }
+    }
+    if (outputParameters && result == paNoError) {
+        deviceInfo = macCoreHostApi->inheritedHostApiRep.deviceInfos[outputParameters->device];
+        if (outputParameters->channelCount > deviceInfo->maxOutputChannels)
+            result = paInvalidChannelCount;
+        else if (CheckFormat(macCoreHostApi->macCoreDeviceIds[outputParameters->device], outputParameters, sampleRate, 0) != kAudioHardwareNoError) {
+            result = paInvalidSampleRate;
+        }
+    }
+
+    return result;
+}
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError err = paNoError;
+    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation *)hostApi;
+    PaMacCoreStream *stream = PaUtil_AllocateMemory(sizeof(PaMacCoreStream));
+    stream->isActive = 0;
+    stream->isStopped = 1;
+    stream->inputDevice = kAudioDeviceUnknown;
+    stream->outputDevice = kAudioDeviceUnknown;
+    
+    PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                           ( (streamCallback)
+                                             ? &macCoreHostApi->callbackStreamInterface
+                                             : &macCoreHostApi->blockingStreamInterface ),
+                                           streamCallback, userData );
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+    
+    *s = (PaStream*)stream;
+    PaMacClientData *clientData = PaUtil_AllocateMemory(sizeof(PaMacClientData));
+    clientData->stream = stream;
+    clientData->callback = streamCallback;
+    clientData->userData = userData;
+    clientData->inputBuffer = 0;
+    clientData->outputBuffer = 0;
+    clientData->ditherGenerator = PaUtil_AllocateMemory(sizeof(PaUtilTriangularDitherGenerator));
+    PaUtil_InitializeTriangularDitherState(clientData->ditherGenerator);
+    
+    if (inputParameters != NULL) {
+        stream->inputDevice = macCoreHostApi->macCoreDeviceIds[inputParameters->device];
+        clientData->inputConverter = PaUtil_SelectConverter(paFloat32, inputParameters->sampleFormat, streamFlags);
+        clientData->inputBuffer = PaUtil_AllocateMemory(Pa_GetSampleSize(inputParameters->sampleFormat) * framesPerBuffer * inputParameters->channelCount);
+        clientData->inputChannelCount = inputParameters->channelCount;
+        clientData->inputSampleFormat = inputParameters->sampleFormat;
+        err = SetUpUnidirectionalStream(stream->inputDevice, sampleRate, framesPerBuffer, 1);
+    }
+    
+    if (err == paNoError && outputParameters != NULL) {
+        stream->outputDevice = macCoreHostApi->macCoreDeviceIds[outputParameters->device];
+        clientData->outputConverter = PaUtil_SelectConverter(outputParameters->sampleFormat, paFloat32, streamFlags);
+        clientData->outputBuffer = PaUtil_AllocateMemory(Pa_GetSampleSize(outputParameters->sampleFormat) * framesPerBuffer * outputParameters->channelCount);
+        clientData->outputChannelCount = outputParameters->channelCount;
+        clientData->outputSampleFormat = outputParameters->sampleFormat;
+        err = SetUpUnidirectionalStream(stream->outputDevice, sampleRate, framesPerBuffer, 0);
+    }
+
+    if (inputParameters == NULL || outputParameters == NULL || stream->inputDevice == stream->outputDevice) {
+        AudioDeviceID device = (inputParameters == NULL) ? stream->outputDevice : stream->inputDevice;
+
+        AudioDeviceAddIOProc(device, AudioIOProc, clientData);
+    }
+    else {
+        // using different devices for input and output
+        AudioDeviceAddIOProc(stream->inputDevice, AudioInputProc, clientData);
+        AudioDeviceAddIOProc(stream->outputDevice, AudioOutputProc, clientData);
+    }
+    
+    return err;
+}
+
+// Note: When CloseStream() is called, the multi-api layer ensures that the stream has already been stopped or aborted.
+static PaError CloseStream( PaStream* s )
+{
+    PaError err = paNoError;
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+
+    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
+
+    if (stream->inputDevice != kAudioDeviceUnknown) {
+        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
+            err = conv_err(AudioDeviceRemoveIOProc(stream->inputDevice, AudioIOProc));
+        }
+        else {
+            err = conv_err(AudioDeviceRemoveIOProc(stream->inputDevice, AudioInputProc));
+            err = conv_err(AudioDeviceRemoveIOProc(stream->outputDevice, AudioOutputProc));
+        }
+    }
+    else {
+        err = conv_err(AudioDeviceRemoveIOProc(stream->outputDevice, AudioIOProc));
+    }
+    
+    return err;
+}
+
+
+static PaError StartStream( PaStream *s )
+{
+    PaError err = paNoError;
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+
+    if (stream->inputDevice != kAudioDeviceUnknown) {
+        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
+            err = conv_err(AudioDeviceStart(stream->inputDevice, AudioIOProc));
+        }
+        else {
+            err = conv_err(AudioDeviceStart(stream->inputDevice, AudioInputProc));
+            err = conv_err(AudioDeviceStart(stream->outputDevice, AudioOutputProc));
+        }
+    }
+    else {
+        err = conv_err(AudioDeviceStart(stream->outputDevice, AudioIOProc));
+    }
+    
+    stream->isActive = 1;
+    stream->isStopped = 0;
+    return err;
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    PaError err = paNoError;
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    
+    if (stream->inputDevice != kAudioDeviceUnknown) {
+        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
+            err = conv_err(AudioDeviceStop(stream->inputDevice, AudioIOProc));
+        }
+        else {
+            err = conv_err(AudioDeviceStop(stream->inputDevice, AudioInputProc));
+            err = conv_err(AudioDeviceStop(stream->outputDevice, AudioOutputProc));
+        }
+    }
+    else {
+        err = conv_err(AudioDeviceStop(stream->outputDevice, AudioIOProc));
+    }
+    
+    stream->isActive = 0;
+    stream->isStopped = 1;
+    return err;
+}    
+
+static PaError StopStream( PaStream *s )
+{
+    // TODO: this should be nicer than abort
+    return AbortStream(s);
+}
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    
+    return stream->isStopped;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+
+    return stream->isActive;
+}
+
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    OSStatus err;
+    PaTime result;
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+
+    AudioTimeStamp *timeStamp = PaUtil_AllocateMemory(sizeof(AudioTimeStamp));
+    if (stream->inputDevice != kAudioDeviceUnknown) {
+        err = AudioDeviceGetCurrentTime(stream->inputDevice, timeStamp);
+    }
+    else {
+        err = AudioDeviceGetCurrentTime(stream->outputDevice, timeStamp);
+    }
+    
+    result = err ? 0 : timeStamp->mSampleTime;
+    PaUtil_FreeMemory(timeStamp);
+
+    return result;
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaMacCoreStream *stream = (PaMacCoreStream*)s;
+    
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+// As separate stream interfaces are used for blocking and callback streams, the following functions can be guaranteed to only be called for blocking streams.
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    return paInternalError;
+}
+
+
+static PaError WriteStream( PaStream* s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    return paInternalError;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    return paInternalError;
+}
+
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    return paInternalError;
+}
+
+// HostAPI-specific initialization function
+PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaMacCoreHostApiRepresentation) );
+    if( !macCoreHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    
+    macCoreHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !macCoreHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    
+    *hostApi = &macCoreHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paCoreAudio;
+    (*hostApi)->info.name = "CoreAudio";
+
+    result = InitializeDeviceInfos(macCoreHostApi, hostApiIndex);
+    if (result != paNoError) {
+        goto error;
+    }
+    
+    // Set up the proper callbacks to this HostApi's functions
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+    
+    PaUtil_InitializeStreamInterface( &macCoreHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+    
+    PaUtil_InitializeStreamInterface( &macCoreHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+    
+    return result;
+    
+error:
+        if( macCoreHostApi ) {
+            CleanUp(macCoreHostApi);
+        }
+    
+    return result;
+}
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
new file mode 100644
index 0000000000..63e616f052
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
@@ -0,0 +1,701 @@
+/*
+ * Helper and utility functions for pa_mac_core.c (Apple AUHAL implementation)
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#include "pa_mac_core_utilities.h"
+#include "pa_mac_core_internal.h"
+#include <libkern/OSAtomic.h>
+#include <strings.h>
+#include <pthread.h>
+#include <sys/time.h>
+
+PaError PaMacCore_SetUnixError( int err, int line )
+{
+   PaError ret;
+   const char *errorText;
+
+   if( err == 0 )
+   {
+      return paNoError;
+   }
+
+   ret = paNoError;
+   errorText = strerror( err );
+
+   /** Map Unix error to PaError. Pretty much the only one that maps
+       is ENOMEM. */
+   if( err == ENOMEM )
+      ret = paInsufficientMemory;
+   else
+      ret = paInternalError;
+
+   DBUG(("%d on line %d: msg='%s'\n", err, line, errorText));
+   PaUtil_SetLastHostErrorInfo( paCoreAudio, err, errorText );
+
+   return ret;
+}
+
+/*
+ * Translates MacOS generated errors into PaErrors
+ */
+PaError PaMacCore_SetError(OSStatus error, int line, int isError)
+{
+    /*FIXME: still need to handle possible ComponentResult values.*/
+    /*       unfortunately, they don't seem to be documented anywhere.*/
+    PaError result;
+    const char *errorType; 
+    const char *errorText;
+    
+    switch (error) {
+    case kAudioHardwareNoError:
+        return paNoError;
+    case kAudioHardwareNotRunningError:
+        errorText = "Audio Hardware Not Running";
+        result = paInternalError; break;
+    case kAudioHardwareUnspecifiedError: 
+        errorText = "Unspecified Audio Hardware Error";
+        result = paInternalError; break;
+    case kAudioHardwareUnknownPropertyError:
+        errorText = "Audio Hardware: Unknown Property";
+        result = paInternalError; break;
+    case kAudioHardwareBadPropertySizeError:
+        errorText = "Audio Hardware: Bad Property Size";
+        result = paInternalError; break;
+    case kAudioHardwareIllegalOperationError: 
+        errorText = "Audio Hardware: Illegal Operation";
+        result = paInternalError; break;
+    case kAudioHardwareBadDeviceError:
+        errorText = "Audio Hardware: Bad Device";
+        result = paInvalidDevice; break;
+    case kAudioHardwareBadStreamError:
+        errorText = "Audio Hardware: BadStream";
+        result = paBadStreamPtr; break;
+    case kAudioHardwareUnsupportedOperationError:
+        errorText = "Audio Hardware: Unsupported Operation";
+        result = paInternalError; break;
+    case kAudioDeviceUnsupportedFormatError:
+        errorText = "Audio Device: Unsupported Format";
+        result = paSampleFormatNotSupported; break;
+    case kAudioDevicePermissionsError:
+        errorText = "Audio Device: Permissions Error";
+        result = paDeviceUnavailable; break;
+    /* Audio Unit Errors: http://developer.apple.com/documentation/MusicAudio/Reference/CoreAudio/audio_units/chapter_5_section_3.html */
+    case kAudioUnitErr_InvalidProperty:
+        errorText = "Audio Unit: Invalid Property";
+        result = paInternalError; break;
+    case kAudioUnitErr_InvalidParameter:
+        errorText = "Audio Unit: Invalid Parameter";
+        result = paInternalError; break;
+    case kAudioUnitErr_NoConnection:
+        errorText = "Audio Unit: No Connection";
+        result = paInternalError; break;
+    case kAudioUnitErr_FailedInitialization:
+        errorText = "Audio Unit: Initialization Failed";
+        result = paInternalError; break;
+    case kAudioUnitErr_TooManyFramesToProcess:
+        errorText = "Audio Unit: Too Many Frames";
+        result = paInternalError; break;
+    case kAudioUnitErr_IllegalInstrument:
+        errorText = "Audio Unit: Illegal Instrument";
+        result = paInternalError; break;
+    case kAudioUnitErr_InstrumentTypeNotFound:
+        errorText = "Audio Unit: Instrument Type Not Found";
+        result = paInternalError; break;
+    case kAudioUnitErr_InvalidFile:
+        errorText = "Audio Unit: Invalid File";
+        result = paInternalError; break;
+    case kAudioUnitErr_UnknownFileType:
+        errorText = "Audio Unit: Unknown File Type";
+        result = paInternalError; break;
+    case kAudioUnitErr_FileNotSpecified:
+        errorText = "Audio Unit: File Not Specified";
+        result = paInternalError; break;
+    case kAudioUnitErr_FormatNotSupported:
+        errorText = "Audio Unit: Format Not Supported";
+        result = paInternalError; break;
+    case kAudioUnitErr_Uninitialized:
+        errorText = "Audio Unit: Unitialized";
+        result = paInternalError; break;
+    case kAudioUnitErr_InvalidScope:
+        errorText = "Audio Unit: Invalid Scope";
+        result = paInternalError; break;
+    case kAudioUnitErr_PropertyNotWritable:
+        errorText = "Audio Unit: PropertyNotWritable";
+        result = paInternalError; break;
+    case kAudioUnitErr_InvalidPropertyValue:
+        errorText = "Audio Unit: Invalid Property Value";
+        result = paInternalError; break;
+    case kAudioUnitErr_PropertyNotInUse:
+        errorText = "Audio Unit: Property Not In Use";
+        result = paInternalError; break;
+    case kAudioUnitErr_Initialized:
+        errorText = "Audio Unit: Initialized";
+        result = paInternalError; break;
+    case kAudioUnitErr_InvalidOfflineRender:
+        errorText = "Audio Unit: Invalid Offline Render";
+        result = paInternalError; break;
+    case kAudioUnitErr_Unauthorized:
+        errorText = "Audio Unit: Unauthorized";
+        result = paInternalError; break;
+    case kAudioUnitErr_CannotDoInCurrentContext:
+        errorText = "Audio Unit: cannot do in current context";
+        result = paInternalError; break;
+    default:
+        errorText = "Unknown Error";
+        result = paInternalError;
+    }
+
+    if (isError)
+        errorType = "Error";
+    else
+        errorType = "Warning";
+
+    char str[20];
+    // see if it appears to be a 4-char-code
+    *(UInt32 *)(str + 1) = CFSwapInt32HostToBig(error);
+    if (isprint(str[1]) && isprint(str[2]) && isprint(str[3]) && isprint(str[4]))
+    {
+        str[0] = str[5] = '\'';
+        str[6] = '\0';
+    } else {
+        // no, format it as an integer
+        sprintf(str, "%d", (int)error);
+    }
+
+    DBUG(("%s on line %d: err='%s', msg=%s\n", errorType, line, str, errorText));
+
+    PaUtil_SetLastHostErrorInfo( paCoreAudio, error, errorText );
+
+    return result;
+}
+
+/*
+ * This function computes an appropriate ring buffer size given
+ * a requested latency (in seconds), sample rate and framesPerBuffer.
+ *
+ * The returned ringBufferSize is computed using the following
+ * constraints:
+ *   - it must be at least 4.
+ *   - it must be at least 3x framesPerBuffer.
+ *   - it must be at least 2x the suggestedLatency.
+ *   - it must be a power of 2.
+ * This function attempts to compute the minimum such size.
+ *
+ * FEEDBACK: too liberal/conservative/another way?
+ */
+long computeRingBufferSize( const PaStreamParameters *inputParameters,
+                                   const PaStreamParameters *outputParameters,
+                                   long inputFramesPerBuffer,
+                                   long outputFramesPerBuffer,
+                                   double sampleRate )
+{
+   long ringSize;
+   int index;
+   int i;
+   double latency ;
+   long framesPerBuffer ;
+
+   VVDBUG(( "computeRingBufferSize()\n" ));
+
+   assert( inputParameters || outputParameters );
+
+   if( outputParameters && inputParameters )
+   {
+      latency = MAX( inputParameters->suggestedLatency, outputParameters->suggestedLatency );
+      framesPerBuffer = MAX( inputFramesPerBuffer, outputFramesPerBuffer );
+   } 
+   else if( outputParameters )
+   {
+      latency = outputParameters->suggestedLatency;
+      framesPerBuffer = outputFramesPerBuffer ;
+   }
+   else /* we have inputParameters  */
+   {
+      latency = inputParameters->suggestedLatency;
+      framesPerBuffer = inputFramesPerBuffer ;
+   }
+
+   ringSize = (long) ( latency * sampleRate * 2 + .5);
+   VDBUG( ( "suggested latency : %d\n", (int) (latency*sampleRate) ) );
+   if( ringSize < framesPerBuffer * 3 )
+      ringSize = framesPerBuffer * 3 ;
+   VDBUG(("framesPerBuffer:%d\n",(int)framesPerBuffer));
+   VDBUG(("Ringbuffer size (1): %d\n", (int)ringSize ));
+
+   /* make sure it's at least 4 */
+   ringSize = MAX( ringSize, 4 );
+
+   /* round up to the next power of 2 */
+   index = -1;
+   for( i=0; i<sizeof(long)*8; ++i )
+      if( ringSize >> i & 0x01 )
+         index = i;
+   assert( index > 0 );
+   if( ringSize <= ( 0x01 << index ) )
+      ringSize = 0x01 << index ;
+   else
+      ringSize = 0x01 << ( index + 1 );
+
+   VDBUG(( "Final Ringbuffer size (2): %d\n", (int)ringSize ));
+   return ringSize;
+}
+
+
+/*
+ * Durring testing of core audio, I found that serious crashes could occur
+ * if properties such as sample rate were changed multiple times in rapid
+ * succession. The function below could be used to with a condition variable.
+ * to prevent propertychanges from happening until the last property
+ * change is acknowledged. Instead, I implemented a busy-wait, which is simpler
+ * to implement b/c in second round of testing (nov '09) property changes occured
+ * quickly and so there was no real way to test the condition variable implementation.
+ * therefore, this function is not used, but it is aluded to in commented code below,
+ * since it represents a theoretically better implementation.
+ */
+
+OSStatus propertyProc(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData )
+{
+   // this is where we would set the condition variable
+   return noErr;
+}
+
+/* sets the value of the given property and waits for the change to 
+   be acknowledged, and returns the final value, which is not guaranteed
+   by this function to be the same as the desired value. Obviously, this
+   function can only be used for data whose input and output are the
+   same size and format, and their size and format are known in advance.
+   whether or not the call succeeds, if the data is successfully read,
+   it is returned in outPropertyData. If it is not read successfully,
+   outPropertyData is zeroed, which may or may not be useful in
+   determining if the property was read. */
+PaError AudioDeviceSetPropertyNowAndWaitForChange(
+    AudioDeviceID inDevice,
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID,
+    UInt32 inPropertyDataSize, 
+    const void *inPropertyData,
+    void *outPropertyData )
+{
+   OSStatus macErr;
+   UInt32 outPropertyDataSize = inPropertyDataSize;
+
+   /* First, see if it already has that value. If so, return. */
+   macErr = AudioDeviceGetProperty( inDevice, inChannel,
+                                 isInput, inPropertyID, 
+                                 &outPropertyDataSize, outPropertyData );
+   if( macErr ) {
+      memset( outPropertyData, 0, inPropertyDataSize );
+      goto failMac;
+   }
+   if( inPropertyDataSize!=outPropertyDataSize )
+      return paInternalError;
+   if( 0==memcmp( outPropertyData, inPropertyData, outPropertyDataSize ) )
+      return paNoError;
+
+   /* Ideally, we'd use a condition variable to determine changes.
+      we could set that up here. */
+
+   /* If we were using a cond variable, we'd do something useful here,
+      but for now, this is just to make 10.6 happy. */
+   macErr = AudioDeviceAddPropertyListener( inDevice, inChannel, isInput,
+                                   inPropertyID, propertyProc,
+                                   NULL ); 
+   if( macErr )
+      /* we couldn't add a listener. */
+      goto failMac;
+
+   /* set property */
+   macErr  = AudioDeviceSetProperty( inDevice, NULL, inChannel,
+                                 isInput, inPropertyID,
+                                 inPropertyDataSize, inPropertyData );
+   if( macErr )
+      goto failMac;
+
+   /* busy-wait up to 30 seconds for the property to change */
+   /* busy-wait is justified here only because the correct alternative (condition variable)
+      was hard to test, since most of the waiting ended up being for setting rather than
+      getting in OS X 10.5. This was not the case in earlier OS versions. */
+   struct timeval tv1, tv2;
+   gettimeofday( &tv1, NULL );
+   memcpy( &tv2, &tv1, sizeof( struct timeval ) );
+   while( tv2.tv_sec - tv1.tv_sec < 30 ) {
+      /* now read the property back out */
+      macErr = AudioDeviceGetProperty( inDevice, inChannel,
+                                    isInput, inPropertyID, 
+                                    &outPropertyDataSize, outPropertyData );
+      if( macErr ) {
+         memset( outPropertyData, 0, inPropertyDataSize );
+         goto failMac;
+      }
+      /* and compare... */
+      if( 0==memcmp( outPropertyData, inPropertyData, outPropertyDataSize ) ) {
+         AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput, inPropertyID, propertyProc );
+         return paNoError;
+      }
+      /* No match yet, so let's sleep and try again. */
+      Pa_Sleep( 100 );
+      gettimeofday( &tv2, NULL );
+   }
+   DBUG( ("Timeout waiting for device setting.\n" ) );
+   
+   AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput, inPropertyID, propertyProc );
+   return paNoError;
+
+ failMac:
+   AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput, inPropertyID, propertyProc );
+   return ERR( macErr );
+}
+
+/*
+ * Sets the sample rate the HAL device.
+ * if requireExact: set the sample rate or fail.
+ *
+ * otherwise      : set the exact sample rate.
+ *             If that fails, check for available sample rates, and choose one
+ *             higher than the requested rate. If there isn't a higher one,
+ *             just use the highest available.
+ */
+PaError setBestSampleRateForDevice( const AudioDeviceID device,
+                                    const bool isOutput,
+                                    const bool requireExact,
+                                    const Float64 desiredSrate )
+{
+   const bool isInput = isOutput ? 0 : 1;
+   Float64 srate;
+   UInt32 propsize = sizeof( Float64 );
+   OSErr err;
+   AudioValueRange *ranges;
+   int i=0;
+   Float64 max  = -1; /*the maximum rate available*/
+   Float64 best = -1; /*the lowest sample rate still greater than desired rate*/
+   VDBUG(("Setting sample rate for device %ld to %g.\n",device,(float)desiredSrate));
+
+   /* -- try setting the sample rate -- */
+   srate = 0;
+   err = AudioDeviceSetPropertyNowAndWaitForChange(
+                                 device, 0, isInput,
+                                 kAudioDevicePropertyNominalSampleRate,
+                                 propsize, &desiredSrate, &srate );
+
+   /* -- if the rate agrees, and was changed, we are done -- */
+   if( srate != 0 && srate == desiredSrate )
+      return paNoError;
+   /* -- if the rate agrees, and we got no errors, we are done -- */
+   if( !err && srate == desiredSrate )
+      return paNoError;
+   /* -- we've failed if the rates disagree and we are setting input -- */
+   if( requireExact )
+      return paInvalidSampleRate;
+
+   /* -- generate a list of available sample rates -- */
+   err = AudioDeviceGetPropertyInfo( device, 0, isInput,
+                                kAudioDevicePropertyAvailableNominalSampleRates,
+                                &propsize, NULL );
+   if( err )
+      return ERR( err );
+   ranges = (AudioValueRange *)calloc( 1, propsize );
+   if( !ranges )
+      return paInsufficientMemory;
+   err = AudioDeviceGetProperty( device, 0, isInput,
+                                kAudioDevicePropertyAvailableNominalSampleRates,
+                                &propsize, ranges );
+   if( err )
+   {
+      free( ranges );
+      return ERR( err );
+   }
+   VDBUG(("Requested sample rate of %g was not available.\n", (float)desiredSrate));
+   VDBUG(("%lu Available Sample Rates are:\n",propsize/sizeof(AudioValueRange)));
+#ifdef MAC_CORE_VERBOSE_DEBUG
+   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
+      VDBUG( ("\t%g-%g\n",
+              (float) ranges[i].mMinimum,
+              (float) ranges[i].mMaximum ) );
+#endif
+   VDBUG(("-----\n"));
+   
+   /* -- now pick the best available sample rate -- */
+   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
+   {
+      if( ranges[i].mMaximum > max ) max = ranges[i].mMaximum;
+      if( ranges[i].mMinimum > desiredSrate ) {
+         if( best < 0 )
+            best = ranges[i].mMinimum;
+         else if( ranges[i].mMinimum < best )
+            best = ranges[i].mMinimum;
+      }
+   }
+   if( best < 0 )
+      best = max;
+   VDBUG( ("Maximum Rate %g. best is %g.\n", max, best ) );
+   free( ranges );
+
+   /* -- set the sample rate -- */
+   propsize = sizeof( best );
+   srate = 0;
+   err = AudioDeviceSetPropertyNowAndWaitForChange(
+                                 device, 0, isInput,
+                                 kAudioDevicePropertyNominalSampleRate,
+                                 propsize, &best, &srate );
+
+   /* -- if the set rate matches, we are done -- */
+   if( srate != 0 && srate == best )
+      return paNoError;
+
+   if( err )
+      return ERR( err );
+
+   /* -- otherwise, something wierd happened: we didn't set the rate, and we got no errors. Just bail. */
+   return paInternalError;
+}
+
+
+/*
+   Attempts to set the requestedFramesPerBuffer. If it can't set the exact
+   value, it settles for something smaller if available. If nothing smaller
+   is available, it uses the smallest available size.
+   actualFramesPerBuffer will be set to the actual value on successful return.
+   OK to pass NULL to actualFramesPerBuffer.
+   The logic is very simmilar too setBestSampleRate only failure here is
+   not usually catastrophic.
+*/
+PaError setBestFramesPerBuffer( const AudioDeviceID device,
+                                const bool isOutput,
+                                UInt32 requestedFramesPerBuffer, 
+                                UInt32 *actualFramesPerBuffer )
+{
+    UInt32 afpb;
+    const bool isInput = !isOutput;
+    UInt32 propsize = sizeof(UInt32);
+    OSErr err;
+    AudioValueRange range;
+
+    if( actualFramesPerBuffer == NULL )
+    {
+        actualFramesPerBuffer = &afpb;
+    }
+
+    /* -- try and set exact FPB -- */
+    err = AudioDeviceSetProperty( device, NULL, 0, isInput,
+                                 kAudioDevicePropertyBufferFrameSize,
+                                 propsize, &requestedFramesPerBuffer);
+    err = AudioDeviceGetProperty( device, 0, isInput,
+                           kAudioDevicePropertyBufferFrameSize,
+                           &propsize, actualFramesPerBuffer);
+    if( err )
+    {
+        return ERR( err );
+    }
+    // Did we get the size we asked for?
+    if( *actualFramesPerBuffer == requestedFramesPerBuffer )
+    {
+        return paNoError; /* we are done */
+    }
+    
+    // Clip requested value against legal range for the device.
+    propsize = sizeof(AudioValueRange);
+    err = AudioDeviceGetProperty( device, 0, isInput,
+                                kAudioDevicePropertyBufferFrameSizeRange,
+                                &propsize, &range );
+    if( err )
+    {
+      return ERR( err );
+    }
+    if( requestedFramesPerBuffer < range.mMinimum )
+    {
+        requestedFramesPerBuffer = range.mMinimum;
+    }
+    else if( requestedFramesPerBuffer > range.mMaximum )
+    {
+        requestedFramesPerBuffer = range.mMaximum;
+    }
+    
+   /* --- set the buffer size (ignore errors) -- */
+    propsize = sizeof( UInt32 );
+   err = AudioDeviceSetProperty( device, NULL, 0, isInput,
+                                 kAudioDevicePropertyBufferFrameSize,
+                                 propsize, &requestedFramesPerBuffer );
+   /* --- read the property to check that it was set -- */
+   err = AudioDeviceGetProperty( device, 0, isInput,
+                                 kAudioDevicePropertyBufferFrameSize,
+                                 &propsize, actualFramesPerBuffer );
+
+   if( err )
+      return ERR( err );
+
+   return paNoError;
+}
+
+/**********************
+ *
+ * XRun stuff
+ *
+ **********************/
+
+struct PaMacXRunListNode_s {
+   PaMacCoreStream *stream;
+   struct PaMacXRunListNode_s *next;
+} ;
+
+typedef struct PaMacXRunListNode_s PaMacXRunListNode;
+
+/** Always empty, so that it can always be the one returned by
+    addToXRunListenerList. note that it's not a pointer. */
+static PaMacXRunListNode firstXRunListNode;
+static int xRunListSize;
+static pthread_mutex_t xrunMutex;
+
+OSStatus xrunCallback(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData)
+{
+   PaMacXRunListNode *node = (PaMacXRunListNode *) inClientData;
+
+   int ret = pthread_mutex_trylock( &xrunMutex ) ;
+
+   if( ret == 0 ) {
+
+      node = node->next ; //skip the first node
+
+      for( ; node; node=node->next ) {
+         PaMacCoreStream *stream = node->stream;
+
+         if( stream->state != ACTIVE )
+            continue; //if the stream isn't active, we don't care if the device is dropping
+
+         if( isInput ) {
+            if( stream->inputDevice == inDevice )
+               OSAtomicOr32( paInputOverflow, &stream->xrunFlags );
+         } else {
+            if( stream->outputDevice == inDevice )
+               OSAtomicOr32( paOutputUnderflow, &stream->xrunFlags );
+         }
+      }
+
+      pthread_mutex_unlock( &xrunMutex );
+   }
+
+   return 0;
+}
+
+int initializeXRunListenerList()
+{
+   xRunListSize = 0;
+   bzero( (void *) &firstXRunListNode, sizeof(firstXRunListNode) );
+   return pthread_mutex_init( &xrunMutex, NULL );
+}
+int destroyXRunListenerList()
+{
+   PaMacXRunListNode *node;
+   node = firstXRunListNode.next;
+   while( node ) {
+      PaMacXRunListNode *tmp = node;
+      node = node->next;
+      free( tmp );
+   }
+   xRunListSize = 0;
+   return pthread_mutex_destroy( &xrunMutex );
+}
+
+void *addToXRunListenerList( void *stream )
+{
+   pthread_mutex_lock( &xrunMutex );
+   PaMacXRunListNode *newNode;
+   // setup new node:
+   newNode = (PaMacXRunListNode *) malloc( sizeof( PaMacXRunListNode ) );
+   newNode->stream = (PaMacCoreStream *) stream;
+   newNode->next = firstXRunListNode.next;
+   // insert:
+   firstXRunListNode.next = newNode;
+   pthread_mutex_unlock( &xrunMutex );
+
+   return &firstXRunListNode;
+}
+
+int removeFromXRunListenerList( void *stream )
+{
+   pthread_mutex_lock( &xrunMutex );
+   PaMacXRunListNode *node, *prev;
+   prev = &firstXRunListNode;
+   node = firstXRunListNode.next;
+   while( node ) {
+      if( node->stream == stream ) {
+         //found it:
+         --xRunListSize;
+         prev->next = node->next;
+         free( node );
+         pthread_mutex_unlock( &xrunMutex );
+         return xRunListSize;
+      }
+      prev = prev->next;
+      node = node->next;
+   }
+
+   pthread_mutex_unlock( &xrunMutex );
+   // failure
+   return xRunListSize;
+}
+
diff --git a/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
new file mode 100644
index 0000000000..7c4afe52ca
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
@@ -0,0 +1,218 @@
+/*
+ * Helper and utility functions for pa_mac_core.c (Apple AUHAL implementation)
+ *
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
+ * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
+ *
+ * Dominic's code was based on code by Phil Burk, Darren Gibbs,
+ * Gord Peters, Stephane Letz, and Greg Pfiel.
+ *
+ * The following people also deserve acknowledgements:
+ *
+ * Olivier Tristan for feedback and testing
+ * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
+ * interface.
+ * 
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#ifndef PA_MAC_CORE_UTILITIES_H__
+#define PA_MAC_CORE_UTILITIES_H__
+
+#include <pthread.h>
+#include "portaudio.h"
+#include "pa_util.h"
+#include <AudioUnit/AudioUnit.h>
+#include <AudioToolbox/AudioToolbox.h>
+
+#ifndef MIN
+#define MIN(a, b)  (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define MAX(a, b)  (((a)<(b))?(b):(a))
+#endif
+
+#define ERR(mac_error) PaMacCore_SetError(mac_error, __LINE__, 1 ) 
+#define WARNING(mac_error) PaMacCore_SetError(mac_error, __LINE__, 0 )
+
+
+/* Help keep track of AUHAL element numbers */
+#define INPUT_ELEMENT  (1)
+#define OUTPUT_ELEMENT (0)
+
+/* Normal level of debugging: fine for most apps that don't mind the occational warning being printf'ed */
+/*
+ */
+#define MAC_CORE_DEBUG
+#ifdef MAC_CORE_DEBUG
+# define DBUG(MSG) do { printf("||PaMacCore (AUHAL)|| "); printf MSG ; fflush(stdout); } while(0)
+#else
+# define DBUG(MSG)
+#endif
+
+/* Verbose Debugging: useful for developement */
+/*
+#define MAC_CORE_VERBOSE_DEBUG
+*/
+#ifdef MAC_CORE_VERBOSE_DEBUG
+# define VDBUG(MSG) do { printf("||PaMacCore (v )|| "); printf MSG ; fflush(stdout); } while(0)
+#else
+# define VDBUG(MSG)
+#endif
+
+/* Very Verbose Debugging: Traces every call. */
+/*
+#define MAC_CORE_VERY_VERBOSE_DEBUG
+ */
+#ifdef MAC_CORE_VERY_VERBOSE_DEBUG
+# define VVDBUG(MSG) do { printf("||PaMacCore (vv)|| "); printf MSG ; fflush(stdout); } while(0)
+#else
+# define VVDBUG(MSG)
+#endif
+
+
+
+
+
+#define UNIX_ERR(err) PaMacCore_SetUnixError( err, __LINE__ )
+
+PaError PaMacCore_SetUnixError( int err, int line );
+
+/*
+ * Translates MacOS generated errors into PaErrors
+ */
+PaError PaMacCore_SetError(OSStatus error, int line, int isError);
+
+/*
+ * This function computes an appropriate ring buffer size given
+ * a requested latency (in seconds), sample rate and framesPerBuffer.
+ *
+ * The returned ringBufferSize is computed using the following
+ * constraints:
+ *   - it must be at least 4.
+ *   - it must be at least 3x framesPerBuffer.
+ *   - it must be at least 2x the suggestedLatency.
+ *   - it must be a power of 2.
+ * This function attempts to compute the minimum such size.
+ *
+ */
+long computeRingBufferSize( const PaStreamParameters *inputParameters,
+                                   const PaStreamParameters *outputParameters,
+                                   long inputFramesPerBuffer,
+                                   long outputFramesPerBuffer,
+                                   double sampleRate );
+
+OSStatus propertyProc(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData );
+
+/* sets the value of the given property and waits for the change to 
+   be acknowledged, and returns the final value, which is not guaranteed
+   by this function to be the same as the desired value. Obviously, this
+   function can only be used for data whose input and output are the
+   same size and format, and their size and format are known in advance.*/
+PaError AudioDeviceSetPropertyNowAndWaitForChange(
+    AudioDeviceID inDevice,
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID,
+    UInt32 inPropertyDataSize, 
+    const void *inPropertyData,
+    void *outPropertyData );
+
+/*
+ * Sets the sample rate the HAL device.
+ * if requireExact: set the sample rate or fail.
+ *
+ * otherwise      : set the exact sample rate.
+ *             If that fails, check for available sample rates, and choose one
+ *             higher than the requested rate. If there isn't a higher one,
+ *             just use the highest available.
+ */
+PaError setBestSampleRateForDevice( const AudioDeviceID device,
+                                    const bool isOutput,
+                                    const bool requireExact,
+                                    const Float64 desiredSrate );
+/*
+   Attempts to set the requestedFramesPerBuffer. If it can't set the exact
+   value, it settles for something smaller if available. If nothing smaller
+   is available, it uses the smallest available size.
+   actualFramesPerBuffer will be set to the actual value on successful return.
+   OK to pass NULL to actualFramesPerBuffer.
+   The logic is very simmilar too setBestSampleRate only failure here is
+   not usually catastrophic.
+*/
+PaError setBestFramesPerBuffer( const AudioDeviceID device,
+                                const bool isOutput,
+                                UInt32 requestedFramesPerBuffer, 
+                                UInt32 *actualFramesPerBuffer );
+
+
+/*********************
+ *
+ *  xrun handling
+ *
+ *********************/
+
+OSStatus xrunCallback(
+    AudioDeviceID inDevice, 
+    UInt32 inChannel, 
+    Boolean isInput, 
+    AudioDevicePropertyID inPropertyID, 
+    void* inClientData ) ;
+
+/** returns zero on success or a unix style error code. */
+int initializeXRunListenerList();
+/** returns zero on success or a unix style error code. */
+int destroyXRunListenerList();
+
+/**Returns the list, so that it can be passed to CorAudio.*/
+void *addToXRunListenerList( void *stream );
+/**Returns the number of Listeners in the list remaining.*/
+int removeFromXRunListenerList( void *stream );
+
+#endif /* PA_MAC_CORE_UTILITIES_H__*/
diff --git a/Externals/portaudio/src/hostapi/dsound/pa_win_ds.c b/Externals/portaudio/src/hostapi/dsound/pa_win_ds.c
new file mode 100644
index 0000000000..77d1924955
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/dsound/pa_win_ds.c
@@ -0,0 +1,3154 @@
+/*
+ * $Id: pa_win_ds.c 1779 2011-11-10 14:51:15Z rossb $
+ * Portable Audio I/O Library DirectSound implementation
+ *
+ * Authors: Phil Burk, Robert Marsanyi & Ross Bencina
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2007 Ross Bencina, Phil Burk, Robert Marsanyi
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup hostapi_src
+*/
+
+/* Until May 2011 PA/DS has used a multimedia timer to perform the callback.
+   We're replacing this with a new implementation using a thread and a different timer mechanim.
+   Defining PA_WIN_DS_USE_WMME_TIMER uses the old (pre-May 2011) behavior.
+*/
+//#define PA_WIN_DS_USE_WMME_TIMER
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h> /* strlen() */
+
+#define _WIN32_WINNT 0x0400 /* required to get waitable timer APIs */
+#include <initguid.h> /* make sure ds guids get defined */
+#include <windows.h>
+#include <objbase.h>
+
+
+/*
+  Use the earliest version of DX required, no need to polute the namespace
+*/
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+#define DIRECTSOUND_VERSION 0x0800
+#else
+#define DIRECTSOUND_VERSION 0x0300
+#endif
+#include <dsound.h>
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+#include <dsconf.h>
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+#ifndef UNDER_CE
+#include <process.h>
+#endif
+#endif
+
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_debugprint.h"
+
+#include "pa_win_ds.h"
+#include "pa_win_ds_dynlink.h"
+#include "pa_win_waveformat.h"
+#include "pa_win_wdmks_utils.h"
+#include "pa_win_coinitialize.h"
+
+#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+#pragma comment( lib, "dsound.lib" )
+#pragma comment( lib, "winmm.lib" )
+#pragma comment( lib, "kernel32.lib" )
+#endif
+
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+
+#if !defined(__CYGWIN__) && !defined(UNDER_CE)
+#define CREATE_THREAD (HANDLE)_beginthreadex
+#undef CLOSE_THREAD_HANDLE /* as per documentation we don't call CloseHandle on a thread created with _beginthreadex */
+#define PA_THREAD_FUNC static unsigned WINAPI
+#define PA_THREAD_ID unsigned
+#else
+#define CREATE_THREAD CreateThread
+#define CLOSE_THREAD_HANDLE CloseHandle
+#define PA_THREAD_FUNC static DWORD WINAPI
+#define PA_THREAD_ID DWORD
+#endif
+
+#if (defined(UNDER_CE))
+#pragma comment(lib, "Coredll.lib")
+#elif (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+#pragma comment(lib, "winmm.lib")
+#endif
+
+PA_THREAD_FUNC ProcessingThreadProc( void *pArg );
+
+#if !defined(UNDER_CE)
+#define PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT /* use waitable timer where possible, otherwise we use a WaitForSingleObject timeout */
+#endif
+
+#endif /* !PA_WIN_DS_USE_WMME_TIMER */
+
+
+/*
+ provided in newer platform sdks and x64
+ */
+#ifndef DWORD_PTR
+    #if defined(_WIN64)
+        #define DWORD_PTR unsigned __int64
+    #else
+        #define DWORD_PTR unsigned long
+    #endif
+#endif
+
+#define PRINT(x) PA_DEBUG(x);
+#define ERR_RPT(x) PRINT(x)
+#define DBUG(x)   PRINT(x)
+#define DBUGX(x)  PRINT(x)
+
+#define PA_USE_HIGH_LATENCY   (0)
+#if PA_USE_HIGH_LATENCY
+#define PA_DS_WIN_9X_DEFAULT_LATENCY_     (.500)
+#define PA_DS_WIN_NT_DEFAULT_LATENCY_     (.600)
+#else
+#define PA_DS_WIN_9X_DEFAULT_LATENCY_     (.140)
+#define PA_DS_WIN_NT_DEFAULT_LATENCY_     (.280)
+#endif
+
+#define PA_DS_WIN_WDM_DEFAULT_LATENCY_    (.120)
+
+#define SECONDS_PER_MSEC      (0.001)
+#define MSECS_PER_SECOND       (1000)
+
+/* prototypes for functions declared in this file */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+
+/* FIXME: should convert hr to a string */
+#define PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr ) \
+    PaUtil_SetLastHostErrorInfo( paDirectSound, hr, "DirectSound error" )
+
+/************************************************* DX Prototypes **********/
+static BOOL CALLBACK CollectGUIDsProc(LPGUID lpGUID,
+                                     LPCTSTR lpszDesc,
+                                     LPCTSTR lpszDrvName,
+                                     LPVOID lpContext );
+
+/************************************************************************************/
+/********************** Structures **************************************************/
+/************************************************************************************/
+/* PaWinDsHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct PaWinDsDeviceInfo
+{
+    PaDeviceInfo        inheritedDeviceInfo;
+    GUID                guid;
+    GUID                *lpGUID;
+    double              sampleRates[3];
+    char deviceInputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
+    char deviceOutputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
+} PaWinDsDeviceInfo;
+
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface    callbackStreamInterface;
+    PaUtilStreamInterface    blockingStreamInterface;
+
+    PaUtilAllocationGroup   *allocations;
+
+    /* implementation specific data goes here */
+
+    PaWinUtilComInitializationResult comInitializationResult;
+
+} PaWinDsHostApiRepresentation;
+
+
+/* PaWinDsStream - a stream data structure specifically for this implementation */
+
+typedef struct PaWinDsStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+/* DirectSound specific data. */
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+    LPDIRECTSOUNDFULLDUPLEX8 pDirectSoundFullDuplex8;
+#endif
+
+/* Output */
+    LPDIRECTSOUND        pDirectSound;
+    LPDIRECTSOUNDBUFFER  pDirectSoundPrimaryBuffer;
+    LPDIRECTSOUNDBUFFER  pDirectSoundOutputBuffer;
+    DWORD                outputBufferWriteOffsetBytes;     /* last write position */
+    INT                  outputBufferSizeBytes;
+    INT                  outputFrameSizeBytes;
+    /* Try to detect play buffer underflows. */
+    LARGE_INTEGER        perfCounterTicksPerBuffer; /* counter ticks it should take to play a full buffer */
+    LARGE_INTEGER        previousPlayTime;
+    DWORD                previousPlayCursor;
+    UINT                 outputUnderflowCount;
+    BOOL                 outputIsRunning;
+    INT                  finalZeroBytesWritten; /* used to determine when we've flushed the whole buffer */
+
+/* Input */
+    LPDIRECTSOUNDCAPTURE pDirectSoundCapture;
+    LPDIRECTSOUNDCAPTUREBUFFER   pDirectSoundInputBuffer;
+    INT                  inputFrameSizeBytes;
+    UINT                 readOffset;      /* last read position */
+    UINT                 inputBufferSizeBytes;
+
+    
+    int              hostBufferSizeFrames; /* input and output host ringbuffers have the same number of frames */
+    double           framesWritten;
+    double           secondsPerHostByte; /* Used to optimize latency calculation for outTime */
+    double           pollingPeriodSeconds;
+
+    PaStreamCallbackFlags callbackFlags;
+
+    PaStreamFlags    streamFlags;
+    int              callbackResult;
+    HANDLE           processingCompleted;
+    
+/* FIXME - move all below to PaUtilStreamRepresentation */
+    volatile int     isStarted;
+    volatile int     isActive;
+    volatile int     stopProcessing; /* stop thread once existing buffers have been returned */
+    volatile int     abortProcessing; /* stop thread immediately */
+
+    UINT             systemTimerResolutionPeriodMs; /* set to 0 if we were unable to set the timer period */ 
+
+#ifdef PA_WIN_DS_USE_WMME_TIMER
+    MMRESULT         timerID;
+#else
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+    HANDLE           waitableTimer;
+#endif
+    HANDLE           processingThread;
+    PA_THREAD_ID     processingThreadId;
+    HANDLE           processingThreadCompleted;
+#endif
+
+} PaWinDsStream;
+
+
+/* Set minimal latency based on the current OS version.
+ * NT has higher latency.
+ */
+static double PaWinDS_GetMinSystemLatencySeconds( void )
+{
+    double minLatencySeconds;
+    /* Set minimal latency based on whether NT or other OS.
+     * NT has higher latency.
+     */
+    OSVERSIONINFO osvi;
+	osvi.dwOSVersionInfoSize = sizeof( osvi );
+	GetVersionEx( &osvi );
+    DBUG(("PA - PlatformId = 0x%x\n", osvi.dwPlatformId ));
+    DBUG(("PA - MajorVersion = 0x%x\n", osvi.dwMajorVersion ));
+    DBUG(("PA - MinorVersion = 0x%x\n", osvi.dwMinorVersion ));
+    /* Check for NT */
+	if( (osvi.dwMajorVersion == 4) && (osvi.dwPlatformId == 2) )
+	{
+		minLatencySeconds = PA_DS_WIN_NT_DEFAULT_LATENCY_;
+	}
+	else if(osvi.dwMajorVersion >= 5)
+	{
+		minLatencySeconds = PA_DS_WIN_WDM_DEFAULT_LATENCY_;
+	}
+	else
+	{
+		minLatencySeconds = PA_DS_WIN_9X_DEFAULT_LATENCY_;
+	}
+    return minLatencySeconds;
+}
+
+
+/*************************************************************************
+** Return minimum workable latency required for this host. This is returned
+** As the default stream latency in PaDeviceInfo.
+** Latency can be optionally set by user by setting an environment variable. 
+** For example, to set latency to 200 msec, put:
+**
+**    set PA_MIN_LATENCY_MSEC=200
+**
+** in the AUTOEXEC.BAT file and reboot.
+** If the environment variable is not set, then the latency will be determined
+** based on the OS. Windows NT has higher latency than Win95.
+*/
+#define PA_LATENCY_ENV_NAME  ("PA_MIN_LATENCY_MSEC")
+#define PA_ENV_BUF_SIZE  (32)
+
+static double PaWinDs_GetMinLatencySeconds( double sampleRate )
+{
+    char      envbuf[PA_ENV_BUF_SIZE];
+    DWORD     hresult;
+    double    minLatencySeconds = 0;
+
+    /* Let user determine minimal latency by setting environment variable. */
+    hresult = GetEnvironmentVariable( PA_LATENCY_ENV_NAME, envbuf, PA_ENV_BUF_SIZE );
+    if( (hresult > 0) && (hresult < PA_ENV_BUF_SIZE) )
+    {
+        minLatencySeconds = atoi( envbuf ) * SECONDS_PER_MSEC;
+    }
+    else
+    {
+        minLatencySeconds = PaWinDS_GetMinSystemLatencySeconds();
+#if PA_USE_HIGH_LATENCY
+        PRINT(("PA - Minimum Latency set to %f msec!\n", minLatencySeconds * MSECS_PER_SECOND ));
+#endif
+    }
+
+    return minLatencySeconds;
+}
+
+
+/************************************************************************************
+** Duplicate the input string using the allocations allocator.
+** A NULL string is converted to a zero length string.
+** If memory cannot be allocated, NULL is returned.
+**/
+static char *DuplicateDeviceNameString( PaUtilAllocationGroup *allocations, const char* src )
+{
+    char *result = 0;
+    
+    if( src != NULL )
+    {
+        size_t len = strlen(src);
+        result = (char*)PaUtil_GroupAllocateMemory( allocations, (long)(len + 1) );
+        if( result )
+            memcpy( (void *) result, src, len+1 );
+    }
+    else
+    {
+        result = (char*)PaUtil_GroupAllocateMemory( allocations, 1 );
+        if( result )
+            result[0] = '\0';
+    }
+
+    return result;
+}
+
+/************************************************************************************
+** DSDeviceNameAndGUID, DSDeviceNameAndGUIDVector used for collecting preliminary
+** information during device enumeration.
+*/
+typedef struct DSDeviceNameAndGUID{
+    char *name; // allocated from parent's allocations, never deleted by this structure
+    GUID guid;
+    LPGUID lpGUID;
+    void *pnpInterface;  // wchar_t* interface path, allocated using the DS host api's allocation group
+} DSDeviceNameAndGUID;
+
+typedef struct DSDeviceNameAndGUIDVector{
+    PaUtilAllocationGroup *allocations;
+    PaError enumerationError;
+
+    int count;
+    int free;
+    DSDeviceNameAndGUID *items; // Allocated using LocalAlloc()
+} DSDeviceNameAndGUIDVector;
+
+typedef struct DSDeviceNamesAndGUIDs{
+    PaWinDsHostApiRepresentation *winDsHostApi;
+    DSDeviceNameAndGUIDVector inputNamesAndGUIDs;
+    DSDeviceNameAndGUIDVector outputNamesAndGUIDs;
+} DSDeviceNamesAndGUIDs;
+
+static PaError InitializeDSDeviceNameAndGUIDVector(
+        DSDeviceNameAndGUIDVector *guidVector, PaUtilAllocationGroup *allocations )
+{
+    PaError result = paNoError;
+
+    guidVector->allocations = allocations;
+    guidVector->enumerationError = paNoError;
+
+    guidVector->count = 0;
+    guidVector->free = 8;
+    guidVector->items = (DSDeviceNameAndGUID*)LocalAlloc( LMEM_FIXED, sizeof(DSDeviceNameAndGUID) * guidVector->free );
+    if( guidVector->items == NULL )
+        result = paInsufficientMemory;
+    
+    return result;
+}
+
+static PaError ExpandDSDeviceNameAndGUIDVector( DSDeviceNameAndGUIDVector *guidVector )
+{
+    PaError result = paNoError;
+    DSDeviceNameAndGUID *newItems;
+    int i;
+    
+    /* double size of vector */
+    int size = guidVector->count + guidVector->free;
+    guidVector->free += size;
+
+    newItems = (DSDeviceNameAndGUID*)LocalAlloc( LMEM_FIXED, sizeof(DSDeviceNameAndGUID) * size * 2 );
+    if( newItems == NULL )
+    {
+        result = paInsufficientMemory;
+    }
+    else
+    {
+        for( i=0; i < guidVector->count; ++i )
+        {
+            newItems[i].name = guidVector->items[i].name;
+            if( guidVector->items[i].lpGUID == NULL )
+            {
+                newItems[i].lpGUID = NULL;
+            }
+            else
+            {
+                newItems[i].lpGUID = &newItems[i].guid;
+                memcpy( &newItems[i].guid, guidVector->items[i].lpGUID, sizeof(GUID) );;
+            }
+            newItems[i].pnpInterface = guidVector->items[i].pnpInterface;
+        }
+
+        LocalFree( guidVector->items );
+        guidVector->items = newItems;
+    }                                
+
+    return result;
+}
+
+/*
+    it's safe to call DSDeviceNameAndGUIDVector multiple times
+*/
+static PaError TerminateDSDeviceNameAndGUIDVector( DSDeviceNameAndGUIDVector *guidVector )
+{
+    PaError result = paNoError;
+
+    if( guidVector->items != NULL )
+    {
+        if( LocalFree( guidVector->items ) != NULL )
+            result = paInsufficientMemory;              /** @todo this isn't the correct error to return from a deallocation failure */
+
+        guidVector->items = NULL;
+    }
+
+    return result;
+}
+
+/************************************************************************************
+** Collect preliminary device information during DirectSound enumeration 
+*/
+static BOOL CALLBACK CollectGUIDsProc(LPGUID lpGUID,
+                                     LPCTSTR lpszDesc,
+                                     LPCTSTR lpszDrvName,
+                                     LPVOID lpContext )
+{
+    DSDeviceNameAndGUIDVector *namesAndGUIDs = (DSDeviceNameAndGUIDVector*)lpContext;
+    PaError error;
+
+    (void) lpszDrvName; /* unused variable */
+
+    if( namesAndGUIDs->free == 0 )
+    {
+        error = ExpandDSDeviceNameAndGUIDVector( namesAndGUIDs );
+        if( error != paNoError )
+        {
+            namesAndGUIDs->enumerationError = error;
+            return FALSE;
+        }
+    }
+    
+    /* Set GUID pointer, copy GUID to storage in DSDeviceNameAndGUIDVector. */
+    if( lpGUID == NULL )
+    {
+        namesAndGUIDs->items[namesAndGUIDs->count].lpGUID = NULL;
+    }
+    else
+    {
+        namesAndGUIDs->items[namesAndGUIDs->count].lpGUID =
+                &namesAndGUIDs->items[namesAndGUIDs->count].guid;
+      
+        memcpy( &namesAndGUIDs->items[namesAndGUIDs->count].guid, lpGUID, sizeof(GUID) );
+    }
+
+    namesAndGUIDs->items[namesAndGUIDs->count].name =
+            DuplicateDeviceNameString( namesAndGUIDs->allocations, lpszDesc );
+    if( namesAndGUIDs->items[namesAndGUIDs->count].name == NULL )
+    {
+        namesAndGUIDs->enumerationError = paInsufficientMemory;
+        return FALSE;
+    }
+
+    namesAndGUIDs->items[namesAndGUIDs->count].pnpInterface = 0;
+
+    ++namesAndGUIDs->count;
+    --namesAndGUIDs->free;
+    
+    return TRUE;
+}
+
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+
+static void *DuplicateWCharString( PaUtilAllocationGroup *allocations, wchar_t *source )
+{
+    size_t len;
+    wchar_t *result;
+
+    len = wcslen( source );
+    result = (wchar_t*)PaUtil_GroupAllocateMemory( allocations, (long) ((len+1) * sizeof(wchar_t)) );
+    wcscpy( result, source );
+    return result;
+}
+
+static BOOL CALLBACK KsPropertySetEnumerateCallback( PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data, LPVOID context )
+{
+    int i;
+    DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs = (DSDeviceNamesAndGUIDs*)context;
+
+    if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER )
+    {
+        for( i=0; i < deviceNamesAndGUIDs->outputNamesAndGUIDs.count; ++i )
+        {
+            if( deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID
+                && memcmp( &data->DeviceId, deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
+            {
+                deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].pnpInterface = 
+                        (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
+                break;
+            }
+        }
+    }
+    else if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE )
+    {
+        for( i=0; i < deviceNamesAndGUIDs->inputNamesAndGUIDs.count; ++i )
+        {
+            if( deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID
+                && memcmp( &data->DeviceId, deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
+            {
+                deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].pnpInterface = 
+                        (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
+                break;
+            }
+        }
+    }
+
+    return TRUE;
+}
+
+
+static GUID pawin_CLSID_DirectSoundPrivate = 
+{ 0x11ab3ec0, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x00, 0xc0, 0x4f, 0xc2, 0x8a, 0xca };
+
+static GUID pawin_DSPROPSETID_DirectSoundDevice = 
+{ 0x84624f82, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x00, 0xc0, 0x4f, 0xc2, 0x8a, 0xca };
+
+static GUID pawin_IID_IKsPropertySet = 
+{ 0x31efac30, 0x515c, 0x11d0, 0xa9, 0xaa, 0x00, 0xaa, 0x00, 0x61, 0xbe, 0x93 };
+
+
+/*
+    FindDevicePnpInterfaces fills in the pnpInterface fields in deviceNamesAndGUIDs
+    with UNICODE file paths to the devices. The DS documentation mentions
+    at least two techniques by which these Interface paths can be found using IKsPropertySet on
+    the DirectSound class object. One is using the DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION 
+    property, and the other is using DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE.
+    I tried both methods and only the second worked. I found two postings on the
+    net from people who had the same problem with the first method, so I think the method used here is 
+    more common/likely to work. The probem is that IKsPropertySet_Get returns S_OK
+    but the fields of the device description are not filled in.
+
+    The mechanism we use works by registering an enumeration callback which is called for 
+    every DSound device. Our callback searches for a device in our deviceNamesAndGUIDs list
+    with the matching GUID and copies the pointer to the Interface path.
+    Note that we could have used this enumeration callback to perform the original 
+    device enumeration, however we choose not to so we can disable this step easily.
+
+    Apparently the IKsPropertySet mechanism was added in DirectSound 9c 2004
+    http://www.tech-archive.net/Archive/Development/microsoft.public.win32.programmer.mmedia/2004-12/0099.html
+
+        -- rossb
+*/
+static void FindDevicePnpInterfaces( DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs )
+{
+    IClassFactory *pClassFactory;
+   
+    if( paWinDsDSoundEntryPoints.DllGetClassObject(&pawin_CLSID_DirectSoundPrivate, &IID_IClassFactory, (PVOID *) &pClassFactory) == S_OK ){
+        IKsPropertySet *pPropertySet;
+        if( pClassFactory->lpVtbl->CreateInstance( pClassFactory, NULL, &pawin_IID_IKsPropertySet, (PVOID *) &pPropertySet) == S_OK ){
+            
+            DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data;
+            ULONG bytesReturned;
+
+            data.Callback = KsPropertySetEnumerateCallback;
+            data.Context = deviceNamesAndGUIDs;
+
+            IKsPropertySet_Get( pPropertySet,
+                &pawin_DSPROPSETID_DirectSoundDevice,
+                DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W,
+                NULL,
+                0,
+                &data,
+                sizeof(data),
+                &bytesReturned
+            );
+            
+            IKsPropertySet_Release( pPropertySet );
+        }
+        pClassFactory->lpVtbl->Release( pClassFactory );
+    }
+
+    /*
+        The following code fragment, which I chose not to use, queries for the 
+        device interface for a device with a specific GUID:
+
+        ULONG BytesReturned;
+        DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA Property;
+
+        memset (&Property, 0, sizeof(Property));
+        Property.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
+        Property.DeviceId = *lpGUID;  
+
+        hr = IKsPropertySet_Get( pPropertySet,
+            &pawin_DSPROPSETID_DirectSoundDevice,
+            DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W,
+            NULL,
+            0,
+            &Property,
+            sizeof(Property),
+            &BytesReturned
+        );
+
+        if( hr == S_OK )
+        {
+            //pnpInterface = Property.Interface;
+        }
+    */
+}
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+
+/* 
+    GUIDs for emulated devices which we blacklist below.
+    are there more than two of them??
+*/
+
+GUID IID_IRolandVSCEmulated1 = {0xc2ad1800, 0xb243, 0x11ce, 0xa8, 0xa4, 0x00, 0xaa, 0x00, 0x6c, 0x45, 0x01};
+GUID IID_IRolandVSCEmulated2 = {0xc2ad1800, 0xb243, 0x11ce, 0xa8, 0xa4, 0x00, 0xaa, 0x00, 0x6c, 0x45, 0x02};
+
+
+#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_  (13) /* must match array length below */
+static double defaultSampleRateSearchOrder_[] =
+    { 44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0, 192000.0,
+        16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
+
+/************************************************************************************
+** Extract capabilities from an output device, and add it to the device info list
+** if successful. This function assumes that there is enough room in the
+** device info list to accomodate all entries.
+**
+** The device will not be added to the device list if any errors are encountered.
+*/
+static PaError AddOutputDeviceInfoFromDirectSound(
+        PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
+{
+    PaUtilHostApiRepresentation  *hostApi = &winDsHostApi->inheritedHostApiRep;
+    PaWinDsDeviceInfo            *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
+    PaDeviceInfo                 *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
+    HRESULT                       hr;
+    LPDIRECTSOUND                 lpDirectSound;
+    DSCAPS                        caps;
+    int                           deviceOK = TRUE;
+    PaError                       result = paNoError;
+    int                           i;
+
+    /* Copy GUID to the device info structure. Set pointer. */
+    if( lpGUID == NULL )
+    {
+        winDsDeviceInfo->lpGUID = NULL;
+    }
+    else
+    {
+        memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
+        winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
+    }
+    
+    if( lpGUID )
+    {
+        if (IsEqualGUID (&IID_IRolandVSCEmulated1,lpGUID) ||
+            IsEqualGUID (&IID_IRolandVSCEmulated2,lpGUID) )
+        {
+            PA_DEBUG(("BLACKLISTED: %s \n",name));
+            return paNoError;
+        }
+    }
+
+    /* Create a DirectSound object for the specified GUID
+        Note that using CoCreateInstance doesn't work on windows CE.
+    */
+    hr = paWinDsDSoundEntryPoints.DirectSoundCreate( lpGUID, &lpDirectSound, NULL );
+
+    /** try using CoCreateInstance because DirectSoundCreate was hanging under
+        some circumstances - note this was probably related to the
+        #define BOOL short bug which has now been fixed
+        @todo delete this comment and the following code once we've ensured
+        there is no bug.
+    */
+    /*
+    hr = CoCreateInstance( &CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IDirectSound, (void**)&lpDirectSound );
+
+    if( hr == S_OK )
+    {
+        hr = IDirectSound_Initialize( lpDirectSound, lpGUID );
+    }
+    */
+    
+    if( hr != DS_OK )
+    {
+        if (hr == DSERR_ALLOCATED)
+            PA_DEBUG(("AddOutputDeviceInfoFromDirectSound %s DSERR_ALLOCATED\n",name));
+        DBUG(("Cannot create DirectSound for %s. Result = 0x%x\n", name, hr ));
+        if (lpGUID)
+            DBUG(("%s's GUID: {0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x, 0x%x} \n",
+                 name,
+                 lpGUID->Data1,
+                 lpGUID->Data2,
+                 lpGUID->Data3,
+                 lpGUID->Data4[0],
+                 lpGUID->Data4[1],
+                 lpGUID->Data4[2],
+                 lpGUID->Data4[3],
+                 lpGUID->Data4[4],
+                 lpGUID->Data4[5],
+                 lpGUID->Data4[6],
+                 lpGUID->Data4[7]));
+
+        deviceOK = FALSE;
+    }
+    else
+    {
+        /* Query device characteristics. */
+        memset( &caps, 0, sizeof(caps) ); 
+        caps.dwSize = sizeof(caps);
+        hr = IDirectSound_GetCaps( lpDirectSound, &caps );
+        if( hr != DS_OK )
+        {
+            DBUG(("Cannot GetCaps() for DirectSound device %s. Result = 0x%x\n", name, hr ));
+            deviceOK = FALSE;
+        }
+        else
+        {
+
+#if PA_USE_WMME
+            if( caps.dwFlags & DSCAPS_EMULDRIVER )
+            {
+                /* If WMME supported, then reject Emulated drivers because they are lousy. */
+                deviceOK = FALSE;
+            }
+#endif
+
+            if( deviceOK )
+            {
+                deviceInfo->maxInputChannels = 0;
+                winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
+
+                /* DS output capabilities only indicate supported number of channels
+                   using two flags which indicate mono and/or stereo.
+                   We assume that stereo devices may support more than 2 channels
+                   (as is the case with 5.1 devices for example) and so
+                   set deviceOutputChannelCountIsKnown to 0 (unknown).
+                   In this case OpenStream will try to open the device
+                   when the user requests more than 2 channels, rather than
+                   returning an error. 
+                */
+                if( caps.dwFlags & DSCAPS_PRIMARYSTEREO )
+                {
+                    deviceInfo->maxOutputChannels = 2;
+                    winDsDeviceInfo->deviceOutputChannelCountIsKnown = 0;
+                }
+                else
+                {
+                    deviceInfo->maxOutputChannels = 1;
+                    winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+                }
+
+                /* Guess channels count from speaker configuration. We do it only when 
+                   pnpInterface is NULL or when PAWIN_USE_WDMKS_DEVICE_INFO is undefined.
+                */
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+                if( !pnpInterface )
+#endif
+                {
+                    DWORD spkrcfg;
+                    if( SUCCEEDED(IDirectSound_GetSpeakerConfig( lpDirectSound, &spkrcfg )) )
+                    {
+                        int count = 0;
+                        switch (DSSPEAKER_CONFIG(spkrcfg))
+                        {
+                            case DSSPEAKER_HEADPHONE:        count = 2; break;
+                            case DSSPEAKER_MONO:             count = 1; break;
+                            case DSSPEAKER_QUAD:             count = 4; break;
+                            case DSSPEAKER_STEREO:           count = 2; break;
+                            case DSSPEAKER_SURROUND:         count = 4; break;
+                            case DSSPEAKER_5POINT1:          count = 6; break;
+                            case DSSPEAKER_7POINT1:          count = 8; break;
+#ifndef DSSPEAKER_7POINT1_SURROUND
+#define DSSPEAKER_7POINT1_SURROUND 0x00000008
+#endif                            
+                            case DSSPEAKER_7POINT1_SURROUND: count = 8; break;
+#ifndef DSSPEAKER_5POINT1_SURROUND
+#define DSSPEAKER_5POINT1_SURROUND 0x00000009
+#endif
+                            case DSSPEAKER_5POINT1_SURROUND: count = 6; break;
+                        }
+                        if( count )
+                        {
+                            deviceInfo->maxOutputChannels = count;
+                            winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+                        }
+                    }
+                }
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+                if( pnpInterface )
+                {
+                    int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( pnpInterface, /* isInput= */ 0  );
+                    if( count > 0 )
+                    {
+                        deviceInfo->maxOutputChannels = count;
+                        winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+                    }
+                }
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+                /* initialize defaultSampleRate */
+                
+                if( caps.dwFlags & DSCAPS_CONTINUOUSRATE )
+                {
+                    /* initialize to caps.dwMaxSecondarySampleRate incase none of the standard rates match */
+                    deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
+
+                    for( i = 0; i < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++i )
+                    {
+                        if( defaultSampleRateSearchOrder_[i] >= caps.dwMinSecondarySampleRate
+                                && defaultSampleRateSearchOrder_[i] <= caps.dwMaxSecondarySampleRate )
+                        {
+                            deviceInfo->defaultSampleRate = defaultSampleRateSearchOrder_[i];
+                            break;
+                        }
+                    }
+                }
+                else if( caps.dwMinSecondarySampleRate == caps.dwMaxSecondarySampleRate )
+                {
+                    if( caps.dwMinSecondarySampleRate == 0 )
+                    {
+                        /*
+                        ** On my Thinkpad 380Z, DirectSoundV6 returns min-max=0 !!
+                        ** But it supports continuous sampling.
+                        ** So fake range of rates, and hope it really supports it.
+                        */
+                        deviceInfo->defaultSampleRate = 48000.0f;  /* assume 48000 as the default */
+
+                        DBUG(("PA - Reported rates both zero. Setting to fake values for device #%s\n", name ));
+                    }
+                    else
+                    {
+	                    deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
+                    }
+                }
+                else if( (caps.dwMinSecondarySampleRate < 1000.0) && (caps.dwMaxSecondarySampleRate > 50000.0) )
+                {
+                    /* The EWS88MT drivers lie, lie, lie. The say they only support two rates, 100 & 100000.
+                    ** But we know that they really support a range of rates!
+                    ** So when we see a ridiculous set of rates, assume it is a range.
+                    */
+                  deviceInfo->defaultSampleRate = 48000.0f;  /* assume 48000 as the default */
+                  DBUG(("PA - Sample rate range used instead of two odd values for device #%s\n", name ));
+                }
+                else deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
+
+                //printf( "min %d max %d\n", caps.dwMinSecondarySampleRate, caps.dwMaxSecondarySampleRate );
+                // dwFlags | DSCAPS_CONTINUOUSRATE 
+
+                deviceInfo->defaultLowInputLatency = 0.;
+                deviceInfo->defaultHighInputLatency = 0.;
+
+                deviceInfo->defaultLowOutputLatency = PaWinDs_GetMinLatencySeconds( deviceInfo->defaultSampleRate );
+                deviceInfo->defaultHighOutputLatency = deviceInfo->defaultLowOutputLatency * 2;
+            }
+        }
+
+        IDirectSound_Release( lpDirectSound );
+    }
+
+    if( deviceOK )
+    {
+        deviceInfo->name = name;
+
+        if( lpGUID == NULL )
+            hostApi->info.defaultOutputDevice = hostApi->info.deviceCount;
+            
+        hostApi->info.deviceCount++;
+    }
+
+    return result;
+}
+
+
+/************************************************************************************
+** Extract capabilities from an input device, and add it to the device info list
+** if successful. This function assumes that there is enough room in the
+** device info list to accomodate all entries.
+**
+** The device will not be added to the device list if any errors are encountered.
+*/
+static PaError AddInputDeviceInfoFromDirectSoundCapture(
+        PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
+{
+    PaUtilHostApiRepresentation  *hostApi = &winDsHostApi->inheritedHostApiRep;
+    PaWinDsDeviceInfo            *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
+    PaDeviceInfo                 *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
+    HRESULT                       hr;
+    LPDIRECTSOUNDCAPTURE          lpDirectSoundCapture;
+    DSCCAPS                       caps;
+    int                           deviceOK = TRUE;
+    PaError                       result = paNoError;
+    
+    /* Copy GUID to the device info structure. Set pointer. */
+    if( lpGUID == NULL )
+    {
+        winDsDeviceInfo->lpGUID = NULL;
+    }
+    else
+    {
+        winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
+        memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
+    }
+
+    hr = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( lpGUID, &lpDirectSoundCapture, NULL );
+
+    /** try using CoCreateInstance because DirectSoundCreate was hanging under
+        some circumstances - note this was probably related to the
+        #define BOOL short bug which has now been fixed
+        @todo delete this comment and the following code once we've ensured
+        there is no bug.
+    */
+    /*
+    hr = CoCreateInstance( &CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IDirectSoundCapture, (void**)&lpDirectSoundCapture );
+    */
+    if( hr != DS_OK )
+    {
+        DBUG(("Cannot create Capture for %s. Result = 0x%x\n", name, hr ));
+        deviceOK = FALSE;
+    }
+    else
+    {
+        /* Query device characteristics. */
+        memset( &caps, 0, sizeof(caps) );
+        caps.dwSize = sizeof(caps);
+        hr = IDirectSoundCapture_GetCaps( lpDirectSoundCapture, &caps );
+        if( hr != DS_OK )
+        {
+            DBUG(("Cannot GetCaps() for Capture device %s. Result = 0x%x\n", name, hr ));
+            deviceOK = FALSE;
+        }
+        else
+        {
+#if PA_USE_WMME
+            if( caps.dwFlags & DSCAPS_EMULDRIVER )
+            {
+                /* If WMME supported, then reject Emulated drivers because they are lousy. */
+                deviceOK = FALSE;
+            }
+#endif
+
+            if( deviceOK )
+            {
+                deviceInfo->maxInputChannels = caps.dwChannels;
+                winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
+
+                deviceInfo->maxOutputChannels = 0;
+                winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+                if( pnpInterface )
+                {
+                    int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( pnpInterface, /* isInput= */ 1  );
+                    if( count > 0 )
+                    {
+                        deviceInfo->maxInputChannels = count;
+                        winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
+                    }
+                }
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+/*  constants from a WINE patch by Francois Gouget, see:
+    http://www.winehq.com/hypermail/wine-patches/2003/01/0290.html
+
+    ---
+    Date: Fri, 14 May 2004 10:38:12 +0200 (CEST)
+    From: Francois Gouget <fgouget@ ... .fr>
+    To: Ross Bencina <rbencina@ ... .au>
+    Subject: Re: Permission to use wine 48/96 wave patch in BSD licensed library
+
+    [snip]
+
+    I give you permission to use the patch below under the BSD license.
+    http://www.winehq.com/hypermail/wine-patches/2003/01/0290.html
+
+    [snip]
+*/
+#ifndef WAVE_FORMAT_48M08
+#define WAVE_FORMAT_48M08      0x00001000    /* 48     kHz, Mono,   8-bit  */
+#define WAVE_FORMAT_48S08      0x00002000    /* 48     kHz, Stereo, 8-bit  */
+#define WAVE_FORMAT_48M16      0x00004000    /* 48     kHz, Mono,   16-bit */
+#define WAVE_FORMAT_48S16      0x00008000    /* 48     kHz, Stereo, 16-bit */
+#define WAVE_FORMAT_96M08      0x00010000    /* 96     kHz, Mono,   8-bit  */
+#define WAVE_FORMAT_96S08      0x00020000    /* 96     kHz, Stereo, 8-bit  */
+#define WAVE_FORMAT_96M16      0x00040000    /* 96     kHz, Mono,   16-bit */
+#define WAVE_FORMAT_96S16      0x00080000    /* 96     kHz, Stereo, 16-bit */
+#endif
+
+                /* defaultSampleRate */
+                if( caps.dwChannels == 2 )
+                {
+                    if( caps.dwFormats & WAVE_FORMAT_4S16 )
+                        deviceInfo->defaultSampleRate = 44100.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_48S16 )
+                        deviceInfo->defaultSampleRate = 48000.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_2S16 )
+                        deviceInfo->defaultSampleRate = 22050.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_1S16 )
+                        deviceInfo->defaultSampleRate = 11025.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_96S16 )
+                        deviceInfo->defaultSampleRate = 96000.0;
+                    else
+                        deviceInfo->defaultSampleRate = 48000.0; /* assume 48000 as the default */
+                }
+                else if( caps.dwChannels == 1 )
+                {
+                    if( caps.dwFormats & WAVE_FORMAT_4M16 )
+                        deviceInfo->defaultSampleRate = 44100.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_48M16 )
+                        deviceInfo->defaultSampleRate = 48000.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_2M16 )
+                        deviceInfo->defaultSampleRate = 22050.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_1M16 )
+                        deviceInfo->defaultSampleRate = 11025.0;
+                    else if( caps.dwFormats & WAVE_FORMAT_96M16 )
+                        deviceInfo->defaultSampleRate = 96000.0;
+                    else
+                        deviceInfo->defaultSampleRate = 48000.0; /* assume 48000 as the default */
+                }
+                else deviceInfo->defaultSampleRate = 48000.0; /* assume 48000 as the default */
+
+                deviceInfo->defaultLowInputLatency = PaWinDs_GetMinLatencySeconds( deviceInfo->defaultSampleRate );
+                deviceInfo->defaultHighInputLatency = deviceInfo->defaultLowInputLatency * 2;
+        
+                deviceInfo->defaultLowOutputLatency = 0.;
+                deviceInfo->defaultHighOutputLatency = 0.;
+            }
+        }
+        
+        IDirectSoundCapture_Release( lpDirectSoundCapture );
+    }
+
+    if( deviceOK )
+    {
+        deviceInfo->name = name;
+
+        if( lpGUID == NULL )
+            hostApi->info.defaultInputDevice = hostApi->info.deviceCount;
+
+        hostApi->info.deviceCount++;
+    }
+
+    return result;
+}
+
+
+/***********************************************************************************/
+PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i, deviceCount;
+    PaWinDsHostApiRepresentation *winDsHostApi;
+    DSDeviceNamesAndGUIDs deviceNamesAndGUIDs;
+    PaWinDsDeviceInfo *deviceInfoArray;
+
+    PaWinDs_InitializeDSoundEntryPoints();
+
+    /* initialise guid vectors so they can be safely deleted on error */
+    deviceNamesAndGUIDs.winDsHostApi = NULL;
+    deviceNamesAndGUIDs.inputNamesAndGUIDs.items = NULL;
+    deviceNamesAndGUIDs.outputNamesAndGUIDs.items = NULL;
+
+    winDsHostApi = (PaWinDsHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinDsHostApiRepresentation) );
+    if( !winDsHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    result = PaWinUtil_CoInitialize( paDirectSound, &winDsHostApi->comInitializationResult );
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    winDsHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !winDsHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    *hostApi = &winDsHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paDirectSound;
+    (*hostApi)->info.name = "Windows DirectSound";
+    
+    (*hostApi)->info.deviceCount = 0;
+    (*hostApi)->info.defaultInputDevice = paNoDevice;
+    (*hostApi)->info.defaultOutputDevice = paNoDevice;
+
+    
+/* DSound - enumerate devices to count them and to gather their GUIDs */
+
+    result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs, winDsHostApi->allocations );
+    if( result != paNoError )
+        goto error;
+
+    result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs, winDsHostApi->allocations );
+    if( result != paNoError )
+        goto error;
+
+    paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.inputNamesAndGUIDs );
+
+    paWinDsDSoundEntryPoints.DirectSoundEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.outputNamesAndGUIDs );
+
+    if( deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError != paNoError )
+    {
+        result = deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError;
+        goto error;
+    }
+
+    if( deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError != paNoError )
+    {
+        result = deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError;
+        goto error;
+    }
+
+    deviceCount = deviceNamesAndGUIDs.inputNamesAndGUIDs.count + deviceNamesAndGUIDs.outputNamesAndGUIDs.count;
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+    if( deviceCount > 0 )
+    {
+        deviceNamesAndGUIDs.winDsHostApi = winDsHostApi;
+        FindDevicePnpInterfaces( &deviceNamesAndGUIDs );
+    }
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+    if( deviceCount > 0 )
+    {
+        /* allocate array for pointers to PaDeviceInfo structs */
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                winDsHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount );
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all PaDeviceInfo structs in a contiguous block */
+        deviceInfoArray = (PaWinDsDeviceInfo*)PaUtil_GroupAllocateMemory(
+                winDsHostApi->allocations, sizeof(PaWinDsDeviceInfo) * deviceCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for( i=0; i < deviceCount; ++i )
+        {
+            PaDeviceInfo *deviceInfo = &deviceInfoArray[i].inheritedDeviceInfo;
+            deviceInfo->structVersion = 2;
+            deviceInfo->hostApi = hostApiIndex;
+            deviceInfo->name = 0;
+            (*hostApi)->deviceInfos[i] = deviceInfo;
+        }
+
+        for( i=0; i < deviceNamesAndGUIDs.inputNamesAndGUIDs.count; ++i )
+        {
+            result = AddInputDeviceInfoFromDirectSoundCapture( winDsHostApi,
+                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].name,
+                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].lpGUID,
+                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].pnpInterface );
+            if( result != paNoError )
+                goto error;
+        }
+
+        for( i=0; i < deviceNamesAndGUIDs.outputNamesAndGUIDs.count; ++i )
+        {
+            result = AddOutputDeviceInfoFromDirectSound( winDsHostApi,
+                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].name,
+                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].lpGUID,
+                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].pnpInterface );
+            if( result != paNoError )
+                goto error;
+        }
+    }    
+
+    result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
+    if( result != paNoError )
+        goto error;
+
+    result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
+    if( result != paNoError )
+        goto error;
+
+    
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &winDsHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &winDsHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    return result;
+
+error:
+    TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
+    TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
+
+    Terminate( winDsHostApi );
+
+    return result;
+}
+
+
+/***********************************************************************************/
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
+
+    if( winDsHostApi ){
+        if( winDsHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( winDsHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( winDsHostApi->allocations );
+        }
+
+        PaWinUtil_CoUninitialize( paDirectSound, &winDsHostApi->comInitializationResult );
+
+        PaUtil_FreeMemory( winDsHostApi );
+    }
+
+    PaWinDs_TerminateDSoundEntryPoints();
+}
+
+static PaError ValidateWinDirectSoundSpecificStreamInfo(
+        const PaStreamParameters *streamParameters,
+        const PaWinDirectSoundStreamInfo *streamInfo )
+{
+	if( streamInfo )
+	{
+	    if( streamInfo->size != sizeof( PaWinDirectSoundStreamInfo )
+	            || streamInfo->version != 2 )
+	    {
+	        return paIncompatibleHostApiSpecificStreamInfo;
+	    }
+	}
+
+	return paNoError;
+}
+
+/***********************************************************************************/
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaError result;
+    PaWinDsDeviceInfo *inputWinDsDeviceInfo, *outputWinDsDeviceInfo;
+    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaWinDirectSoundStreamInfo *inputStreamInfo, *outputStreamInfo;
+
+    if( inputParameters )
+    {
+        inputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ inputParameters->device ];
+        inputDeviceInfo = &inputWinDsDeviceInfo->inheritedDeviceInfo;
+
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputWinDsDeviceInfo->deviceInputChannelCountIsKnown
+                && inputChannelCount > inputDeviceInfo->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        inputStreamInfo = (PaWinDirectSoundStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinDirectSoundSpecificStreamInfo( inputParameters, inputStreamInfo );
+		if( result != paNoError ) return result;
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ outputParameters->device ];
+        outputDeviceInfo = &outputWinDsDeviceInfo->inheritedDeviceInfo;
+
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputWinDsDeviceInfo->deviceOutputChannelCountIsKnown
+                && outputChannelCount > outputDeviceInfo->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        outputStreamInfo = (PaWinDirectSoundStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinDirectSoundSpecificStreamInfo( outputParameters, outputStreamInfo );
+		if( result != paNoError ) return result;
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+    
+    /*
+        IMPLEMENT ME:
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported if necessary
+
+            - check that the device supports sampleRate
+
+        Because the buffer adapter handles conversion between all standard
+        sample formats, the following checks are only required if paCustomFormat
+        is implemented, or under some other unusual conditions.
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+    */
+
+    return paFormatIsSupported;
+}
+
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+static HRESULT InitFullDuplexInputOutputBuffers( PaWinDsStream *stream,
+                                       PaWinDsDeviceInfo *inputDevice,
+                                       PaSampleFormat hostInputSampleFormat,
+                                       WORD inputChannelCount, 
+                                       int bytesPerInputBuffer,
+                                       PaWinWaveFormatChannelMask inputChannelMask,
+                                       PaWinDsDeviceInfo *outputDevice,
+                                       PaSampleFormat hostOutputSampleFormat,
+                                       WORD outputChannelCount, 
+                                       int bytesPerOutputBuffer,
+                                       PaWinWaveFormatChannelMask outputChannelMask,
+                                       unsigned long nFrameRate
+                                        )
+{
+    HRESULT hr;
+    DSCBUFFERDESC  captureDesc;
+    PaWinWaveFormat captureWaveFormat;
+    DSBUFFERDESC   secondaryRenderDesc;
+    PaWinWaveFormat renderWaveFormat;
+    LPDIRECTSOUNDBUFFER8 pRenderBuffer8;
+    LPDIRECTSOUNDCAPTUREBUFFER8 pCaptureBuffer8;
+
+    // capture buffer description
+
+    // only try wave format extensible. assume it's available on all ds 8 systems
+    PaWin_InitializeWaveFormatExtensible( &captureWaveFormat, inputChannelCount, 
+                hostInputSampleFormat, PaWin_SampleFormatToLinearWaveFormatTag( hostInputSampleFormat ),
+                nFrameRate, inputChannelMask );
+
+    ZeroMemory(&captureDesc, sizeof(DSCBUFFERDESC));
+    captureDesc.dwSize = sizeof(DSCBUFFERDESC);
+    captureDesc.dwFlags = 0;
+    captureDesc.dwBufferBytes = bytesPerInputBuffer;
+    captureDesc.lpwfxFormat = (WAVEFORMATEX*)&captureWaveFormat;
+
+    // render buffer description
+
+    PaWin_InitializeWaveFormatExtensible( &renderWaveFormat, outputChannelCount, 
+                hostOutputSampleFormat, PaWin_SampleFormatToLinearWaveFormatTag( hostOutputSampleFormat ),
+                nFrameRate, outputChannelMask );
+
+    ZeroMemory(&secondaryRenderDesc, sizeof(DSBUFFERDESC));
+    secondaryRenderDesc.dwSize = sizeof(DSBUFFERDESC);
+    secondaryRenderDesc.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
+    secondaryRenderDesc.dwBufferBytes = bytesPerOutputBuffer;
+    secondaryRenderDesc.lpwfxFormat = (WAVEFORMATEX*)&renderWaveFormat;
+
+    /* note that we don't create a primary buffer here at all */
+
+    hr = paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8( 
+            inputDevice->lpGUID, outputDevice->lpGUID,
+            &captureDesc, &secondaryRenderDesc,
+            GetDesktopWindow(), /* see InitOutputBuffer() for a discussion of whether this is a good idea */
+            DSSCL_EXCLUSIVE,
+            &stream->pDirectSoundFullDuplex8,
+            &pCaptureBuffer8,
+            &pRenderBuffer8,
+            NULL /* pUnkOuter must be NULL */ 
+        );
+
+    if( hr == DS_OK )
+    {
+        PA_DEBUG(("DirectSoundFullDuplexCreate succeeded!\n"));
+
+        /* retrieve the pre ds 8 buffer interfaces which are used by the rest of the code */
+
+        hr = IUnknown_QueryInterface( pCaptureBuffer8, &IID_IDirectSoundCaptureBuffer, (LPVOID *)&stream->pDirectSoundInputBuffer );
+        
+        if( hr == DS_OK )
+            hr = IUnknown_QueryInterface( pRenderBuffer8, &IID_IDirectSoundBuffer, (LPVOID *)&stream->pDirectSoundOutputBuffer );
+
+        /* release the ds 8 interfaces, we don't need them */
+        IUnknown_Release( pCaptureBuffer8 );
+        IUnknown_Release( pRenderBuffer8 );
+
+        if( !stream->pDirectSoundInputBuffer || !stream->pDirectSoundOutputBuffer ){
+            /* couldn't get pre ds 8 interfaces for some reason. clean up. */
+            if( stream->pDirectSoundInputBuffer )
+            {
+                IUnknown_Release( stream->pDirectSoundInputBuffer );
+                stream->pDirectSoundInputBuffer = NULL;
+            }
+
+            if( stream->pDirectSoundOutputBuffer )
+            {
+                IUnknown_Release( stream->pDirectSoundOutputBuffer );
+                stream->pDirectSoundOutputBuffer = NULL;
+            }
+            
+            IUnknown_Release( stream->pDirectSoundFullDuplex8 );
+            stream->pDirectSoundFullDuplex8 = NULL;
+        }
+    }
+    else
+    {
+        PA_DEBUG(("DirectSoundFullDuplexCreate failed. hr=%d\n", hr));
+    }
+
+    return hr;
+}
+#endif /* PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE */
+
+
+static HRESULT InitInputBuffer( PaWinDsStream *stream, PaWinDsDeviceInfo *device, PaSampleFormat sampleFormat, unsigned long nFrameRate, WORD nChannels, int bytesPerBuffer, PaWinWaveFormatChannelMask channelMask )
+{
+    DSCBUFFERDESC  captureDesc;
+    PaWinWaveFormat waveFormat;
+    HRESULT        result;
+    
+    if( (result = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( 
+            device->lpGUID, &stream->pDirectSoundCapture, NULL) ) != DS_OK ){
+         ERR_RPT(("PortAudio: DirectSoundCaptureCreate() failed!\n"));
+         return result;
+    }
+
+    // Setup the secondary buffer description
+    ZeroMemory(&captureDesc, sizeof(DSCBUFFERDESC));
+    captureDesc.dwSize = sizeof(DSCBUFFERDESC);
+    captureDesc.dwFlags = 0;
+    captureDesc.dwBufferBytes = bytesPerBuffer;
+    captureDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat;
+    
+    // Create the capture buffer
+
+    // first try WAVEFORMATEXTENSIBLE. if this fails, fall back to WAVEFORMATEX
+    PaWin_InitializeWaveFormatExtensible( &waveFormat, nChannels, 
+                sampleFormat, PaWin_SampleFormatToLinearWaveFormatTag( sampleFormat ),
+                nFrameRate, channelMask );
+
+    if( IDirectSoundCapture_CreateCaptureBuffer( stream->pDirectSoundCapture,
+                  &captureDesc, &stream->pDirectSoundInputBuffer, NULL) != DS_OK )
+    {
+        PaWin_InitializeWaveFormatEx( &waveFormat, nChannels, sampleFormat, 
+                PaWin_SampleFormatToLinearWaveFormatTag( sampleFormat ), nFrameRate );
+
+        if ((result = IDirectSoundCapture_CreateCaptureBuffer( stream->pDirectSoundCapture,
+                    &captureDesc, &stream->pDirectSoundInputBuffer, NULL)) != DS_OK) return result;
+    }
+
+    stream->readOffset = 0;  // reset last read position to start of buffer
+    return DS_OK;
+}
+
+
+static HRESULT InitOutputBuffer( PaWinDsStream *stream, PaWinDsDeviceInfo *device, PaSampleFormat sampleFormat, unsigned long nFrameRate, WORD nChannels, int bytesPerBuffer, PaWinWaveFormatChannelMask channelMask )
+{
+    HRESULT        result;
+    HWND           hWnd;
+    HRESULT        hr;
+    PaWinWaveFormat waveFormat;
+    DSBUFFERDESC   primaryDesc;
+    DSBUFFERDESC   secondaryDesc;
+    
+    if( (hr = paWinDsDSoundEntryPoints.DirectSoundCreate( 
+                device->lpGUID, &stream->pDirectSound, NULL )) != DS_OK ){
+        ERR_RPT(("PortAudio: DirectSoundCreate() failed!\n"));
+        return hr;
+    }
+
+    // We were using getForegroundWindow() but sometimes the ForegroundWindow may not be the
+    // applications's window. Also if that window is closed before the Buffer is closed
+    // then DirectSound can crash. (Thanks for Scott Patterson for reporting this.)
+    // So we will use GetDesktopWindow() which was suggested by Miller Puckette.
+    // hWnd = GetForegroundWindow();
+    //
+    //  FIXME: The example code I have on the net creates a hidden window that
+    //      is managed by our code - I think we should do that - one hidden
+    //      window for the whole of Pa_DS
+    //
+    hWnd = GetDesktopWindow();
+
+    // Set cooperative level to DSSCL_EXCLUSIVE so that we can get 16 bit output, 44.1 KHz.
+    // exclusive also prevents unexpected sounds from other apps during a performance.
+    if ((hr = IDirectSound_SetCooperativeLevel( stream->pDirectSound,
+              hWnd, DSSCL_EXCLUSIVE)) != DS_OK)
+    {
+        return hr;
+    }
+
+    // -----------------------------------------------------------------------
+    // Create primary buffer and set format just so we can specify our custom format.
+    // Otherwise we would be stuck with the default which might be 8 bit or 22050 Hz.
+    // Setup the primary buffer description
+    ZeroMemory(&primaryDesc, sizeof(DSBUFFERDESC));
+    primaryDesc.dwSize        = sizeof(DSBUFFERDESC);
+    primaryDesc.dwFlags       = DSBCAPS_PRIMARYBUFFER; // all panning, mixing, etc done by synth
+    primaryDesc.dwBufferBytes = 0;
+    primaryDesc.lpwfxFormat   = NULL;
+    // Create the buffer
+    if ((result = IDirectSound_CreateSoundBuffer( stream->pDirectSound,
+                  &primaryDesc, &stream->pDirectSoundPrimaryBuffer, NULL)) != DS_OK)
+        goto error;
+
+    // Set the primary buffer's format
+
+    // first try WAVEFORMATEXTENSIBLE. if this fails, fall back to WAVEFORMATEX
+    PaWin_InitializeWaveFormatExtensible( &waveFormat, nChannels, 
+                sampleFormat, PaWin_SampleFormatToLinearWaveFormatTag( sampleFormat ),
+                nFrameRate, channelMask );
+
+    if( IDirectSoundBuffer_SetFormat( stream->pDirectSoundPrimaryBuffer, (WAVEFORMATEX*)&waveFormat) != DS_OK )
+    {
+        PaWin_InitializeWaveFormatEx( &waveFormat, nChannels, sampleFormat, 
+                PaWin_SampleFormatToLinearWaveFormatTag( sampleFormat ), nFrameRate );
+
+        if((result = IDirectSoundBuffer_SetFormat( stream->pDirectSoundPrimaryBuffer, (WAVEFORMATEX*)&waveFormat)) != DS_OK)
+            goto error;
+    }
+
+    // ----------------------------------------------------------------------
+    // Setup the secondary buffer description
+    ZeroMemory(&secondaryDesc, sizeof(DSBUFFERDESC));
+    secondaryDesc.dwSize = sizeof(DSBUFFERDESC);
+    secondaryDesc.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
+    secondaryDesc.dwBufferBytes = bytesPerBuffer;
+    secondaryDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat; /* waveFormat contains whatever format was negotiated for the primary buffer above */
+    // Create the secondary buffer
+    if ((result = IDirectSound_CreateSoundBuffer( stream->pDirectSound,
+                  &secondaryDesc, &stream->pDirectSoundOutputBuffer, NULL)) != DS_OK)
+      goto error;
+    
+    return DS_OK;
+
+error:
+
+    if( stream->pDirectSoundPrimaryBuffer )
+    {
+        IDirectSoundBuffer_Release( stream->pDirectSoundPrimaryBuffer );
+        stream->pDirectSoundPrimaryBuffer = NULL;
+    }
+
+    return result;
+}
+
+
+static void CalculateBufferSettings( unsigned long *hostBufferSizeFrames, 
+                                    unsigned long *pollingPeriodFrames,
+                                    int isFullDuplex,
+                                    unsigned long suggestedInputLatencyFrames,
+                                    unsigned long suggestedOutputLatencyFrames,
+                                    double sampleRate, unsigned long userFramesPerBuffer )
+{
+    /* we allow the polling period to range between 1 and 100ms.
+       prior to August 2011 we limited the minimum polling period to 10ms.
+    */
+    unsigned long minimumPollingPeriodFrames = sampleRate / 1000; /* 1ms */
+    unsigned long maximumPollingPeriodFrames = sampleRate / 10; /* 100ms */ 
+    unsigned long pollingJitterFrames = sampleRate / 1000; /* 1ms */
+    
+    if( userFramesPerBuffer == paFramesPerBufferUnspecified )
+    {
+        unsigned long targetBufferingLatencyFrames = max( suggestedInputLatencyFrames, suggestedOutputLatencyFrames );
+
+        *pollingPeriodFrames = targetBufferingLatencyFrames / 4;
+        if( *pollingPeriodFrames < minimumPollingPeriodFrames )
+        {
+            *pollingPeriodFrames = minimumPollingPeriodFrames;
+        }
+        else if( *pollingPeriodFrames > maximumPollingPeriodFrames )
+        {
+            *pollingPeriodFrames = maximumPollingPeriodFrames;
+        }
+
+        *hostBufferSizeFrames = *pollingPeriodFrames 
+                + max( *pollingPeriodFrames + pollingJitterFrames, targetBufferingLatencyFrames);
+    }
+    else
+    {
+        unsigned long targetBufferingLatencyFrames = suggestedInputLatencyFrames;
+        if( isFullDuplex )
+        {
+            /* In full duplex streams we know that the buffer adapter adds userFramesPerBuffer
+               extra fixed latency. so we subtract it here as a fixed latency before computing
+               the buffer size. being careful not to produce an unrepresentable negative result.
+               
+               Note: this only works as expected if output latency is greater than input latency.
+               Otherwise we use input latency anyway since we do max(in,out).
+            */
+
+            if( userFramesPerBuffer < suggestedOutputLatencyFrames )
+            {
+                unsigned long adjustedSuggestedOutputLatencyFrames = 
+                        suggestedOutputLatencyFrames - userFramesPerBuffer;
+
+                /* maximum of input and adjusted output suggested latency */
+                if( adjustedSuggestedOutputLatencyFrames > targetBufferingLatencyFrames )
+                    targetBufferingLatencyFrames = adjustedSuggestedOutputLatencyFrames;
+            }
+        }
+        else
+        {
+            /* maximum of input and output suggested latency */
+            if( suggestedOutputLatencyFrames > suggestedInputLatencyFrames )
+                targetBufferingLatencyFrames = suggestedOutputLatencyFrames;
+        }   
+
+        *hostBufferSizeFrames = userFramesPerBuffer 
+                + max( userFramesPerBuffer + pollingJitterFrames, targetBufferingLatencyFrames);
+
+        *pollingPeriodFrames = max( max(1, userFramesPerBuffer / 4), targetBufferingLatencyFrames / 16 );
+
+        if( *pollingPeriodFrames > maximumPollingPeriodFrames )
+        {
+            *pollingPeriodFrames = maximumPollingPeriodFrames;
+        }
+    } 
+}
+
+
+static void SetStreamInfoLatencies( PaWinDsStream *stream, 
+                                   unsigned long userFramesPerBuffer, 
+                                   unsigned long pollingPeriodFrames,
+                                   double sampleRate )
+{
+    /* compute the stream info actual latencies based on framesPerBuffer, polling period, hostBufferSizeFrames, 
+    and the configuration of the buffer processor */
+
+    unsigned long effectiveFramesPerBuffer = (userFramesPerBuffer == paFramesPerBufferUnspecified)
+                                             ? pollingPeriodFrames
+                                             : userFramesPerBuffer;
+
+    if( stream->bufferProcessor.inputChannelCount > 0 )
+    {
+        /* stream info input latency is the minimum buffering latency 
+           (unlike suggested and default which are *maximums*) */
+        stream->streamRepresentation.streamInfo.inputLatency =
+                (double)(PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor)
+                    + effectiveFramesPerBuffer) / sampleRate;
+    }
+    else
+    {
+        stream->streamRepresentation.streamInfo.inputLatency = 0;
+    }
+
+    if( stream->bufferProcessor.outputChannelCount > 0 )
+    {
+        stream->streamRepresentation.streamInfo.outputLatency =
+                (double)(PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor)
+                    + (stream->hostBufferSizeFrames - effectiveFramesPerBuffer)) / sampleRate;
+    }
+    else
+    {
+        stream->streamRepresentation.streamInfo.outputLatency = 0;
+    }
+}
+
+
+/***********************************************************************************/
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
+    PaWinDsStream *stream = 0;
+    int bufferProcessorIsInitialized = 0;
+    int streamRepresentationIsInitialized = 0;
+    PaWinDsDeviceInfo *inputWinDsDeviceInfo, *outputWinDsDeviceInfo;
+    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+    unsigned long suggestedInputLatencyFrames, suggestedOutputLatencyFrames;
+    PaWinDirectSoundStreamInfo *inputStreamInfo, *outputStreamInfo;
+    PaWinWaveFormatChannelMask inputChannelMask, outputChannelMask;
+    unsigned long pollingPeriodFrames = 0;
+
+    if( inputParameters )
+    {
+        inputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ inputParameters->device ];
+        inputDeviceInfo = &inputWinDsDeviceInfo->inheritedDeviceInfo;
+
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+        suggestedInputLatencyFrames = (unsigned long)(inputParameters->suggestedLatency * sampleRate);
+
+        /* IDEA: the following 3 checks could be performed by default by pa_front
+            unless some flag indicated otherwise */
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputWinDsDeviceInfo->deviceInputChannelCountIsKnown
+                && inputChannelCount > inputDeviceInfo->maxInputChannels )
+            return paInvalidChannelCount;
+            
+        /* validate hostApiSpecificStreamInfo */
+        inputStreamInfo = (PaWinDirectSoundStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinDirectSoundSpecificStreamInfo( inputParameters, inputStreamInfo );
+		if( result != paNoError ) return result;
+
+        if( inputStreamInfo && inputStreamInfo->flags & paWinDirectSoundUseChannelMask )
+            inputChannelMask = inputStreamInfo->channelMask;
+        else
+            inputChannelMask = PaWin_DefaultChannelMask( inputChannelCount );
+    }
+    else
+    {
+        inputChannelCount = 0;
+		inputSampleFormat = 0;
+        suggestedInputLatencyFrames = 0;
+    }
+
+
+    if( outputParameters )
+    {
+        outputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ outputParameters->device ];
+        outputDeviceInfo = &outputWinDsDeviceInfo->inheritedDeviceInfo;
+
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        suggestedOutputLatencyFrames = (unsigned long)(outputParameters->suggestedLatency * sampleRate);
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support outputChannelCount */
+        if( outputWinDsDeviceInfo->deviceOutputChannelCountIsKnown
+                && outputChannelCount > outputDeviceInfo->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate hostApiSpecificStreamInfo */
+        outputStreamInfo = (PaWinDirectSoundStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinDirectSoundSpecificStreamInfo( outputParameters, outputStreamInfo );
+		if( result != paNoError ) return result;   
+
+        if( outputStreamInfo && outputStreamInfo->flags & paWinDirectSoundUseChannelMask )
+            outputChannelMask = outputStreamInfo->channelMask;
+        else
+            outputChannelMask = PaWin_DefaultChannelMask( outputChannelCount );
+    }
+    else
+    {
+        outputChannelCount = 0;
+		outputSampleFormat = 0;
+        suggestedOutputLatencyFrames = 0;
+    }
+
+
+    /*
+        IMPLEMENT ME:
+
+        ( the following two checks are taken care of by PaUtil_InitializeBufferProcessor() )
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+
+            - check that the device supports sampleRate
+
+            - alter sampleRate to a close allowable rate if possible / necessary
+
+            - validate suggestedInputLatency and suggestedOutputLatency parameters,
+                use default values where necessary
+    */
+
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+
+    stream = (PaWinDsStream*)PaUtil_AllocateMemory( sizeof(PaWinDsStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    memset( stream, 0, sizeof(PaWinDsStream) ); /* initialize all stream variables to 0 */
+
+    if( streamCallback )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &winDsHostApi->callbackStreamInterface, streamCallback, userData );
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &winDsHostApi->blockingStreamInterface, streamCallback, userData );
+    }
+    
+    streamRepresentationIsInitialized = 1;
+
+    stream->streamFlags = streamFlags;
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+
+    if( inputParameters )
+    {
+        /* IMPLEMENT ME - establish which  host formats are available */
+        PaSampleFormat nativeInputFormats = paInt16;
+        /* PaSampleFormat nativeFormats = paUInt8 | paInt16 | paInt24 | paInt32 | paFloat32; */
+
+        hostInputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( nativeInputFormats, inputParameters->sampleFormat );
+    }
+	else
+	{
+		hostInputSampleFormat = 0;
+	}
+
+    if( outputParameters )
+    {
+        /* IMPLEMENT ME - establish which  host formats are available */
+        PaSampleFormat nativeOutputFormats = paInt16;
+        /* PaSampleFormat nativeOutputFormats = paUInt8 | paInt16 | paInt24 | paInt32 | paFloat32; */
+
+        hostOutputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( nativeOutputFormats, outputParameters->sampleFormat );
+    }
+    else
+	{
+		hostOutputSampleFormat = 0;
+	}
+
+    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                    inputChannelCount, inputSampleFormat, hostInputSampleFormat,
+                    outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
+                    sampleRate, streamFlags, framesPerBuffer,
+                    0, /* ignored in paUtilVariableHostBufferSizePartialUsageAllowed mode. */
+                /* This next mode is required because DS can split the host buffer when it wraps around. */
+                    paUtilVariableHostBufferSizePartialUsageAllowed,
+                    streamCallback, userData );
+    if( result != paNoError )
+        goto error;
+
+    bufferProcessorIsInitialized = 1;
+
+   
+/* DirectSound specific initialization */ 
+    {
+        HRESULT          hr;
+        unsigned long    integerSampleRate = (unsigned long) (sampleRate + 0.5);
+        
+        stream->processingCompleted = CreateEvent( NULL, /* bManualReset = */ TRUE, /* bInitialState = */ FALSE, NULL );
+        if( stream->processingCompleted == NULL )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+#ifdef PA_WIN_DS_USE_WMME_TIMER
+        stream->timerID = 0;
+#endif
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+        stream->waitableTimer = (HANDLE)CreateWaitableTimer( 0, FALSE, NULL );
+        if( stream->waitableTimer == NULL )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( GetLastError() );
+            goto error;
+        }
+#endif
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+		stream->processingThreadCompleted = CreateEvent( NULL, /* bManualReset = */ TRUE, /* bInitialState = */ FALSE, NULL );
+        if( stream->processingThreadCompleted == NULL )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( GetLastError() );
+            goto error;
+        }
+#endif
+
+        /* set up i/o parameters */
+
+        CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames,
+                /* isFullDuplex = */ (inputParameters && outputParameters),
+                suggestedInputLatencyFrames,
+                suggestedOutputLatencyFrames, 
+                sampleRate, framesPerBuffer );
+
+        stream->pollingPeriodSeconds = pollingPeriodFrames / sampleRate;
+
+        /* ------------------ OUTPUT */
+        if( outputParameters )
+        {
+            LARGE_INTEGER  counterFrequency;
+
+            /*
+            PaDeviceInfo *deviceInfo = hostApi->deviceInfos[ outputParameters->device ];
+            DBUG(("PaHost_OpenStream: deviceID = 0x%x\n", outputParameters->device));
+            */
+            
+            int sampleSizeBytes = Pa_GetSampleSize(hostOutputSampleFormat);
+            stream->outputFrameSizeBytes = outputParameters->channelCount * sampleSizeBytes;
+
+            stream->outputBufferSizeBytes = stream->hostBufferSizeFrames * stream->outputFrameSizeBytes;
+            if( stream->outputBufferSizeBytes < DSBSIZE_MIN )
+            {
+                result = paBufferTooSmall;
+                goto error;
+            }
+            else if( stream->outputBufferSizeBytes > DSBSIZE_MAX )
+            {
+                result = paBufferTooBig;
+                goto error;
+            }
+
+            /* Calculate value used in latency calculation to avoid real-time divides. */
+            stream->secondsPerHostByte = 1.0 /
+                (stream->bufferProcessor.bytesPerHostOutputSample *
+                outputChannelCount * sampleRate);
+
+            stream->outputIsRunning = FALSE;
+            stream->outputUnderflowCount = 0;
+            
+            /* perfCounterTicksPerBuffer is used by QueryOutputSpace for overflow detection */
+            if( QueryPerformanceFrequency( &counterFrequency ) )
+            {
+                stream->perfCounterTicksPerBuffer.QuadPart = (counterFrequency.QuadPart * stream->hostBufferSizeFrames) / integerSampleRate;
+            }
+            else
+            {
+                stream->perfCounterTicksPerBuffer.QuadPart = 0;
+            }
+        }
+
+        /* ------------------ INPUT */
+        if( inputParameters )
+        {
+            /*
+            PaDeviceInfo *deviceInfo = hostApi->deviceInfos[ inputParameters->device ];
+            DBUG(("PaHost_OpenStream: deviceID = 0x%x\n", inputParameters->device));
+            */
+            
+            int sampleSizeBytes = Pa_GetSampleSize(hostInputSampleFormat);
+            stream->inputFrameSizeBytes = inputParameters->channelCount * sampleSizeBytes;
+
+            stream->inputBufferSizeBytes = stream->hostBufferSizeFrames * stream->inputFrameSizeBytes;
+            if( stream->inputBufferSizeBytes < DSBSIZE_MIN )
+            {
+                result = paBufferTooSmall;
+                goto error;
+            }
+            else if( stream->inputBufferSizeBytes > DSBSIZE_MAX )
+            {
+                result = paBufferTooBig;
+                goto error;
+            }
+        }
+
+        /* open/create the DirectSound buffers */
+
+        /* interface ptrs should be zeroed when stream is zeroed. */
+        assert( stream->pDirectSoundCapture == NULL );
+        assert( stream->pDirectSoundInputBuffer == NULL );
+        assert( stream->pDirectSound == NULL );
+        assert( stream->pDirectSoundPrimaryBuffer == NULL );
+        assert( stream->pDirectSoundOutputBuffer == NULL );
+        
+
+        if( inputParameters && outputParameters )
+        {
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+            /* try to use the full-duplex DX8 API to create the buffers.
+                if that fails we fall back to the half-duplex API below */
+
+            hr = InitFullDuplexInputOutputBuffers( stream,
+                                       (PaWinDsDeviceInfo*)hostApi->deviceInfos[inputParameters->device],
+                                       hostInputSampleFormat,
+                                       (WORD)inputParameters->channelCount, stream->inputBufferSizeBytes,
+                                       inputChannelMask,
+                                       (PaWinDsDeviceInfo*)hostApi->deviceInfos[outputParameters->device],
+                                       hostOutputSampleFormat,
+                                       (WORD)outputParameters->channelCount, stream->outputBufferSizeBytes,
+                                       outputChannelMask,
+                                       integerSampleRate
+                                        );
+            DBUG(("InitFullDuplexInputOutputBuffers() returns %x\n", hr));
+            /* ignore any error returned by InitFullDuplexInputOutputBuffers. 
+                we retry opening the buffers below */
+#endif /* PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE */
+        }
+
+        /*  create half duplex buffers. also used for full-duplex streams which didn't 
+            succeed when using the full duplex API. that could happen because
+            DX8 or greater isnt installed, the i/o devices aren't the same 
+            physical device. etc.
+        */
+
+        if( outputParameters && !stream->pDirectSoundOutputBuffer )
+        {
+            hr = InitOutputBuffer( stream,
+                                       (PaWinDsDeviceInfo*)hostApi->deviceInfos[outputParameters->device],
+                                       hostOutputSampleFormat,
+                                       integerSampleRate,
+                                       (WORD)outputParameters->channelCount, stream->outputBufferSizeBytes,
+                                       outputChannelMask );
+            DBUG(("InitOutputBuffer() returns %x\n", hr));
+            if( hr != DS_OK )
+            {
+                result = paUnanticipatedHostError;
+                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
+                goto error;
+            }
+        }
+
+        if( inputParameters && !stream->pDirectSoundInputBuffer )
+        {
+            hr = InitInputBuffer( stream,
+                                      (PaWinDsDeviceInfo*)hostApi->deviceInfos[inputParameters->device],
+                                      hostInputSampleFormat,
+                                      integerSampleRate,
+                                      (WORD)inputParameters->channelCount, stream->inputBufferSizeBytes,
+                                      inputChannelMask );
+            DBUG(("InitInputBuffer() returns %x\n", hr));
+            if( hr != DS_OK )
+            {
+                ERR_RPT(("PortAudio: DSW_InitInputBuffer() returns %x\n", hr));
+                result = paUnanticipatedHostError;
+                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
+                goto error;
+            }
+        }
+    }
+
+    SetStreamInfoLatencies( stream, framesPerBuffer, pollingPeriodFrames, sampleRate );
+
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    if( stream )
+    {
+        if( stream->processingCompleted != NULL )
+            CloseHandle( stream->processingCompleted );
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+        if( stream->waitableTimer != NULL )
+            CloseHandle( stream->waitableTimer );
+#endif
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+        if( stream->processingThreadCompleted != NULL )
+            CloseHandle( stream->processingThreadCompleted );
+#endif
+
+        if( stream->pDirectSoundOutputBuffer )
+        {
+            IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
+            IDirectSoundBuffer_Release( stream->pDirectSoundOutputBuffer );
+            stream->pDirectSoundOutputBuffer = NULL;
+        }
+
+        if( stream->pDirectSoundPrimaryBuffer )
+        {
+            IDirectSoundBuffer_Release( stream->pDirectSoundPrimaryBuffer );
+            stream->pDirectSoundPrimaryBuffer = NULL;
+        }
+
+        if( stream->pDirectSoundInputBuffer )
+        {
+            IDirectSoundCaptureBuffer_Stop( stream->pDirectSoundInputBuffer );
+            IDirectSoundCaptureBuffer_Release( stream->pDirectSoundInputBuffer );
+            stream->pDirectSoundInputBuffer = NULL;
+        }
+
+        if( stream->pDirectSoundCapture )
+        {
+            IDirectSoundCapture_Release( stream->pDirectSoundCapture );
+            stream->pDirectSoundCapture = NULL;
+        }
+
+        if( stream->pDirectSound )
+        {
+            IDirectSound_Release( stream->pDirectSound );
+            stream->pDirectSound = NULL;
+        }
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+        if( stream->pDirectSoundFullDuplex8 )
+        {
+            IDirectSoundFullDuplex_Release( stream->pDirectSoundFullDuplex8 );
+            stream->pDirectSoundFullDuplex8 = NULL;
+        }
+#endif
+        if( bufferProcessorIsInitialized )
+            PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+
+        if( streamRepresentationIsInitialized )
+            PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+
+        PaUtil_FreeMemory( stream );
+    }
+
+    return result;
+}
+
+
+/************************************************************************************
+ * Determine how much space can be safely written to in DS buffer.
+ * Detect underflows and overflows.
+ * Does not allow writing into safety gap maintained by DirectSound.
+ */
+static HRESULT QueryOutputSpace( PaWinDsStream *stream, long *bytesEmpty )
+{
+    HRESULT hr;
+    DWORD   playCursor;
+    DWORD   writeCursor;
+    long    numBytesEmpty;
+    long    playWriteGap;
+    // Query to see how much room is in buffer.
+    hr = IDirectSoundBuffer_GetCurrentPosition( stream->pDirectSoundOutputBuffer,
+            &playCursor, &writeCursor );
+    if( hr != DS_OK )
+    {
+        return hr;
+    }
+
+    // Determine size of gap between playIndex and WriteIndex that we cannot write into.
+    playWriteGap = writeCursor - playCursor;
+    if( playWriteGap < 0 ) playWriteGap += stream->outputBufferSizeBytes; // unwrap
+
+    /* DirectSound doesn't have a large enough playCursor so we cannot detect wrap-around. */
+    /* Attempt to detect playCursor wrap-around and correct it. */
+    if( stream->outputIsRunning && (stream->perfCounterTicksPerBuffer.QuadPart != 0) )
+    {
+        /* How much time has elapsed since last check. */
+        LARGE_INTEGER   currentTime;
+        LARGE_INTEGER   elapsedTime;
+        long            bytesPlayed;
+        long            bytesExpected;
+        long            buffersWrapped;
+
+        QueryPerformanceCounter( &currentTime );
+        elapsedTime.QuadPart = currentTime.QuadPart - stream->previousPlayTime.QuadPart;
+        stream->previousPlayTime = currentTime;
+
+        /* How many bytes does DirectSound say have been played. */
+        bytesPlayed = playCursor - stream->previousPlayCursor;
+        if( bytesPlayed < 0 ) bytesPlayed += stream->outputBufferSizeBytes; // unwrap
+        stream->previousPlayCursor = playCursor;
+
+        /* Calculate how many bytes we would have expected to been played by now. */
+        bytesExpected = (long) ((elapsedTime.QuadPart * stream->outputBufferSizeBytes) / stream->perfCounterTicksPerBuffer.QuadPart);
+        buffersWrapped = (bytesExpected - bytesPlayed) / stream->outputBufferSizeBytes;
+        if( buffersWrapped > 0 )
+        {
+            playCursor += (buffersWrapped * stream->outputBufferSizeBytes);
+            bytesPlayed += (buffersWrapped * stream->outputBufferSizeBytes);
+        }
+    }
+    numBytesEmpty = playCursor - stream->outputBufferWriteOffsetBytes;
+    if( numBytesEmpty < 0 ) numBytesEmpty += stream->outputBufferSizeBytes; // unwrap offset
+
+    /* Have we underflowed? */
+    if( numBytesEmpty > (stream->outputBufferSizeBytes - playWriteGap) )
+    {
+        if( stream->outputIsRunning )
+        {
+            stream->outputUnderflowCount += 1;
+        }
+
+        /*
+            From MSDN:
+                The write cursor indicates the position at which it is safe  
+            to write new data to the buffer. The write cursor always leads the
+            play cursor, typically by about 15 milliseconds' worth of audio
+            data.
+                It is always safe to change data that is behind the position 
+            indicated by the lpdwCurrentPlayCursor parameter.
+        */
+
+        stream->outputBufferWriteOffsetBytes = writeCursor;
+        numBytesEmpty = stream->outputBufferSizeBytes - playWriteGap;
+    }
+    *bytesEmpty = numBytesEmpty;
+    return hr;
+}
+
+/***********************************************************************************/
+static int TimeSlice( PaWinDsStream *stream )
+{
+    long              numFrames = 0;
+    long              bytesEmpty = 0;
+    long              bytesFilled = 0;
+    long              bytesToXfer = 0;
+    long              framesToXfer = 0; /* the number of frames we'll process this tick */
+    long              numInFramesReady = 0;
+    long              numOutFramesReady = 0;
+    long              bytesProcessed;
+    HRESULT           hresult;
+    double            outputLatency = 0;
+    double            inputLatency = 0;
+    PaStreamCallbackTimeInfo timeInfo = {0,0,0};
+    
+/* Input */
+    LPBYTE            lpInBuf1 = NULL;
+    LPBYTE            lpInBuf2 = NULL;
+    DWORD             dwInSize1 = 0;
+    DWORD             dwInSize2 = 0;
+/* Output */
+    LPBYTE            lpOutBuf1 = NULL;
+    LPBYTE            lpOutBuf2 = NULL;
+    DWORD             dwOutSize1 = 0;
+    DWORD             dwOutSize2 = 0;
+
+    /* How much input data is available? */
+    if( stream->bufferProcessor.inputChannelCount > 0 )
+    {
+        HRESULT hr;
+        DWORD capturePos;
+        DWORD readPos;
+        long  filled = 0;
+        // Query to see how much data is in buffer.
+        // We don't need the capture position but sometimes DirectSound doesn't handle NULLS correctly
+        // so let's pass a pointer just to be safe.
+        hr = IDirectSoundCaptureBuffer_GetCurrentPosition( stream->pDirectSoundInputBuffer, &capturePos, &readPos );
+        if( hr == DS_OK )
+        {
+            filled = readPos - stream->readOffset;
+            if( filled < 0 ) filled += stream->inputBufferSizeBytes; // unwrap offset
+            bytesFilled = filled;
+
+            inputLatency = ((double)bytesFilled) * stream->secondsPerHostByte;
+        }
+            // FIXME: what happens if IDirectSoundCaptureBuffer_GetCurrentPosition fails?
+
+        framesToXfer = numInFramesReady = bytesFilled / stream->inputFrameSizeBytes; 
+
+        /** @todo Check for overflow */
+    }
+
+    /* How much output room is available? */
+    if( stream->bufferProcessor.outputChannelCount > 0 )
+    {
+        UINT previousUnderflowCount = stream->outputUnderflowCount;
+        QueryOutputSpace( stream, &bytesEmpty );
+        framesToXfer = numOutFramesReady = bytesEmpty / stream->outputFrameSizeBytes;
+
+        /* Check for underflow */
+        if( stream->outputUnderflowCount != previousUnderflowCount )
+            stream->callbackFlags |= paOutputUnderflow;
+
+        /* We are about to compute audio into the first byte of empty space in the output buffer.
+           This audio will reach the DAC after all of the current (non-empty) audio
+           in the buffer has played. Therefore the output time is the current time
+           plus the time it takes to play the non-empty bytes in the buffer,
+           computed here:
+        */
+        outputLatency = ((double)(stream->outputBufferSizeBytes - bytesEmpty)) * stream->secondsPerHostByte;
+    }
+
+    /* if it's a full duplex stream, set framesToXfer to the minimum of input and output frames ready */
+    if( stream->bufferProcessor.inputChannelCount > 0 && stream->bufferProcessor.outputChannelCount > 0 )
+    {
+        framesToXfer = (numOutFramesReady < numInFramesReady) ? numOutFramesReady : numInFramesReady;
+    }
+
+    if( framesToXfer > 0 )
+    {
+        PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+    /* The outputBufferDacTime parameter should indicates the time at which
+        the first sample of the output buffer is heard at the DACs. */
+        timeInfo.currentTime = PaUtil_GetTime();
+
+        PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, stream->callbackFlags );
+        stream->callbackFlags = 0;
+        
+    /* Input */
+        if( stream->bufferProcessor.inputChannelCount > 0 )
+        {
+            timeInfo.inputBufferAdcTime = timeInfo.currentTime - inputLatency; 
+
+            bytesToXfer = framesToXfer * stream->inputFrameSizeBytes;
+            hresult = IDirectSoundCaptureBuffer_Lock ( stream->pDirectSoundInputBuffer,
+                stream->readOffset, bytesToXfer,
+                (void **) &lpInBuf1, &dwInSize1,
+                (void **) &lpInBuf2, &dwInSize2, 0);
+            if (hresult != DS_OK)
+            {
+                ERR_RPT(("DirectSound IDirectSoundCaptureBuffer_Lock failed, hresult = 0x%x\n",hresult));
+                /* PA_DS_SET_LAST_DIRECTSOUND_ERROR( hresult ); */
+                PaUtil_ResetBufferProcessor( &stream->bufferProcessor ); /* flush the buffer processor */
+                stream->callbackResult = paComplete;
+                goto error2;
+            }
+
+            numFrames = dwInSize1 / stream->inputFrameSizeBytes;
+            PaUtil_SetInputFrameCount( &stream->bufferProcessor, numFrames );
+            PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, lpInBuf1, 0 );
+        /* Is input split into two regions. */
+            if( dwInSize2 > 0 )
+            {
+                numFrames = dwInSize2 / stream->inputFrameSizeBytes;
+                PaUtil_Set2ndInputFrameCount( &stream->bufferProcessor, numFrames );
+                PaUtil_Set2ndInterleavedInputChannels( &stream->bufferProcessor, 0, lpInBuf2, 0 );
+            }
+        }
+
+    /* Output */
+        if( stream->bufferProcessor.outputChannelCount > 0 )
+        {
+            /*
+			We don't currently add outputLatency here because it appears to produce worse
+			results than non adding it. Need to do more testing to verify this.
+            */
+            /* timeInfo.outputBufferDacTime = timeInfo.currentTime + outputLatency; */
+            timeInfo.outputBufferDacTime = timeInfo.currentTime;
+
+            bytesToXfer = framesToXfer * stream->outputFrameSizeBytes;
+            hresult = IDirectSoundBuffer_Lock ( stream->pDirectSoundOutputBuffer,
+                stream->outputBufferWriteOffsetBytes, bytesToXfer,
+                (void **) &lpOutBuf1, &dwOutSize1,
+                (void **) &lpOutBuf2, &dwOutSize2, 0);
+            if (hresult != DS_OK)
+            {
+                ERR_RPT(("DirectSound IDirectSoundBuffer_Lock failed, hresult = 0x%x\n",hresult));
+                /* PA_DS_SET_LAST_DIRECTSOUND_ERROR( hresult ); */
+                PaUtil_ResetBufferProcessor( &stream->bufferProcessor ); /* flush the buffer processor */
+                stream->callbackResult = paComplete;
+                goto error1;
+            }
+
+            numFrames = dwOutSize1 / stream->outputFrameSizeBytes;
+            PaUtil_SetOutputFrameCount( &stream->bufferProcessor, numFrames );
+            PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, lpOutBuf1, 0 );
+
+        /* Is output split into two regions. */
+            if( dwOutSize2 > 0 )
+            {
+                numFrames = dwOutSize2 / stream->outputFrameSizeBytes;
+                PaUtil_Set2ndOutputFrameCount( &stream->bufferProcessor, numFrames );
+                PaUtil_Set2ndInterleavedOutputChannels( &stream->bufferProcessor, 0, lpOutBuf2, 0 );
+            }
+        }
+
+        numFrames = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &stream->callbackResult );
+        stream->framesWritten += numFrames;
+        
+        if( stream->bufferProcessor.outputChannelCount > 0 )
+        {
+        /* FIXME: an underflow could happen here */
+
+        /* Update our buffer offset and unlock sound buffer */
+            bytesProcessed = numFrames * stream->outputFrameSizeBytes;
+            stream->outputBufferWriteOffsetBytes = (stream->outputBufferWriteOffsetBytes + bytesProcessed) % stream->outputBufferSizeBytes;
+            IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, lpOutBuf1, dwOutSize1, lpOutBuf2, dwOutSize2);
+        }
+
+error1:
+        if( stream->bufferProcessor.inputChannelCount > 0 )
+        {
+        /* FIXME: an overflow could happen here */
+
+        /* Update our buffer offset and unlock sound buffer */
+            bytesProcessed = numFrames * stream->inputFrameSizeBytes;
+            stream->readOffset = (stream->readOffset + bytesProcessed) % stream->inputBufferSizeBytes;
+            IDirectSoundCaptureBuffer_Unlock( stream->pDirectSoundInputBuffer, lpInBuf1, dwInSize1, lpInBuf2, dwInSize2);
+        }
+error2:
+
+        PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, numFrames );        
+    }
+
+    if( stream->callbackResult == paComplete && !PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
+    {
+        /* don't return completed until the buffer processor has been drained */
+        return paContinue;
+    }
+    else
+    {
+        return stream->callbackResult;
+    }
+}
+/*******************************************************************/
+
+static HRESULT ZeroAvailableOutputSpace( PaWinDsStream *stream )
+{
+    HRESULT hr;
+    LPBYTE lpbuf1 = NULL;
+    LPBYTE lpbuf2 = NULL;
+    DWORD dwsize1 = 0;
+    DWORD dwsize2 = 0;
+    long  bytesEmpty;
+    hr = QueryOutputSpace( stream, &bytesEmpty );
+    if (hr != DS_OK) return hr;
+    if( bytesEmpty == 0 ) return DS_OK;
+    // Lock free space in the DS
+    hr = IDirectSoundBuffer_Lock( stream->pDirectSoundOutputBuffer, stream->outputBufferWriteOffsetBytes,
+                                    bytesEmpty, (void **) &lpbuf1, &dwsize1,
+                                    (void **) &lpbuf2, &dwsize2, 0);
+    if (hr == DS_OK)
+    {
+        // Copy the buffer into the DS
+        ZeroMemory(lpbuf1, dwsize1);
+        if(lpbuf2 != NULL)
+        {
+            ZeroMemory(lpbuf2, dwsize2);
+        }
+        // Update our buffer offset and unlock sound buffer
+        stream->outputBufferWriteOffsetBytes = (stream->outputBufferWriteOffsetBytes + dwsize1 + dwsize2) % stream->outputBufferSizeBytes;
+        IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
+
+        stream->finalZeroBytesWritten += dwsize1 + dwsize2;
+    }
+    return hr;
+}
+
+
+static void CALLBACK TimerCallback(UINT uID, UINT uMsg, DWORD_PTR dwUser, DWORD dw1, DWORD dw2)
+{
+    PaWinDsStream *stream;
+    int isFinished = 0;
+
+    /* suppress unused variable warnings */
+    (void) uID;
+    (void) uMsg;
+    (void) dw1;
+    (void) dw2;
+    
+    stream = (PaWinDsStream *) dwUser;
+    if( stream == NULL ) return;
+
+    if( stream->isActive )
+    {
+        if( stream->abortProcessing )
+        {
+            isFinished = 1;
+        }
+        else if( stream->stopProcessing )
+        {
+            if( stream->bufferProcessor.outputChannelCount > 0 )
+            {
+                ZeroAvailableOutputSpace( stream );
+                if( stream->finalZeroBytesWritten >= stream->outputBufferSizeBytes )
+                {
+                    /* once we've flushed the whole output buffer with zeros we know all data has been played */
+                    isFinished = 1;
+                }
+            }
+            else
+            {
+                isFinished = 1;
+            }
+        }
+        else
+        {
+            int callbackResult = TimeSlice( stream );
+            if( callbackResult != paContinue )
+            {
+                /* FIXME implement handling of paComplete and paAbort if possible 
+                   At the moment this should behave as if paComplete was called and 
+                   flush the buffer.
+                */
+
+                stream->stopProcessing = 1;
+            }
+        }
+
+        if( isFinished )
+        {
+            if( stream->streamRepresentation.streamFinishedCallback != 0 )
+                stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+
+            stream->isActive = 0; /* don't set this until the stream really is inactive */
+            SetEvent( stream->processingCompleted );
+        }
+    }
+}
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+
+static void CALLBACK WaitableTimerAPCProc(
+   LPVOID lpArg,               // Data value
+   DWORD dwTimerLowValue,      // Timer low value
+   DWORD dwTimerHighValue )    // Timer high value
+
+{
+    (void)dwTimerLowValue;
+    (void)dwTimerHighValue;
+
+    TimerCallback( 0, 0, (DWORD_PTR)lpArg, 0, 0 );
+}
+
+#endif /* PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT */
+
+
+PA_THREAD_FUNC ProcessingThreadProc( void *pArg )
+{
+    PaWinDsStream *stream = (PaWinDsStream *)pArg;
+    MMRESULT mmResult;
+    HANDLE hWaitableTimer;
+    LARGE_INTEGER dueTime;
+    int timerPeriodMs;
+
+    timerPeriodMs = stream->pollingPeriodSeconds * MSECS_PER_SECOND;
+    if( timerPeriodMs < 1 )
+        timerPeriodMs = 1;
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+    assert( stream->waitableTimer != NULL );
+
+    /* invoke first timeout immediately */
+    dueTime.LowPart = timerPeriodMs * 1000 * 10;
+    dueTime.HighPart = 0;
+
+    /* tick using waitable timer */
+    if( SetWaitableTimer( stream->waitableTimer, &dueTime, timerPeriodMs, WaitableTimerAPCProc, pArg, FALSE ) != 0 )
+    {
+        DWORD wfsoResult = 0;
+        do
+        {
+            /* wait for processingCompleted to be signaled or our timer APC to be called */
+            wfsoResult = WaitForSingleObjectEx( stream->processingCompleted, timerPeriodMs * 10, /* alertable = */ TRUE );
+
+        }while( wfsoResult == WAIT_TIMEOUT || wfsoResult == WAIT_IO_COMPLETION );
+    }
+
+    CancelWaitableTimer( stream->waitableTimer );
+
+#else
+
+    /* tick using WaitForSingleObject timout */
+    while ( WaitForSingleObject( stream->processingCompleted, timerPeriodMs ) == WAIT_TIMEOUT )
+    {
+        TimerCallback( 0, 0, (DWORD_PTR)pArg, 0, 0 );
+    }
+#endif /* PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT */
+
+    SetEvent( stream->processingThreadCompleted );
+
+    return 0;
+}
+
+#endif /* !PA_WIN_DS_USE_WMME_TIMER */
+
+/***********************************************************************************
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    CloseHandle( stream->processingCompleted );
+
+#ifdef PA_WIN_DS_USE_WAITABLE_TIMER_OBJECT
+    if( stream->waitableTimer != NULL )
+        CloseHandle( stream->waitableTimer );
+#endif
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+	CloseHandle( stream->processingThreadCompleted );
+#endif
+
+    // Cleanup the sound buffers
+    if( stream->pDirectSoundOutputBuffer )
+    {
+        IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
+        IDirectSoundBuffer_Release( stream->pDirectSoundOutputBuffer );
+        stream->pDirectSoundOutputBuffer = NULL;
+    }
+
+    if( stream->pDirectSoundPrimaryBuffer )
+    {
+        IDirectSoundBuffer_Release( stream->pDirectSoundPrimaryBuffer );
+        stream->pDirectSoundPrimaryBuffer = NULL;
+    }
+
+    if( stream->pDirectSoundInputBuffer )
+    {
+        IDirectSoundCaptureBuffer_Stop( stream->pDirectSoundInputBuffer );
+        IDirectSoundCaptureBuffer_Release( stream->pDirectSoundInputBuffer );
+        stream->pDirectSoundInputBuffer = NULL;
+    }
+
+    if( stream->pDirectSoundCapture )
+    {
+        IDirectSoundCapture_Release( stream->pDirectSoundCapture );
+        stream->pDirectSoundCapture = NULL;
+    }
+
+    if( stream->pDirectSound )
+    {
+        IDirectSound_Release( stream->pDirectSound );
+        stream->pDirectSound = NULL;
+    }
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+    if( stream->pDirectSoundFullDuplex8 )
+    {
+        IDirectSoundFullDuplex_Release( stream->pDirectSoundFullDuplex8 );
+        stream->pDirectSoundFullDuplex8 = NULL;
+    }
+#endif
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    PaUtil_FreeMemory( stream );
+
+    return result;
+}
+
+/***********************************************************************************/
+static HRESULT ClearOutputBuffer( PaWinDsStream *stream )
+{
+    PaError          result = paNoError;
+    unsigned char*   pDSBuffData;
+    DWORD            dwDataLen;
+    HRESULT          hr;
+
+    hr = IDirectSoundBuffer_SetCurrentPosition( stream->pDirectSoundOutputBuffer, 0 );
+    DBUG(("PaHost_ClearOutputBuffer: IDirectSoundBuffer_SetCurrentPosition returned = 0x%X.\n", hr));
+    if( hr != DS_OK )
+        return hr;
+
+    // Lock the DS buffer
+    if ((hr = IDirectSoundBuffer_Lock( stream->pDirectSoundOutputBuffer, 0, stream->outputBufferSizeBytes, (LPVOID*)&pDSBuffData,
+                                           &dwDataLen, NULL, 0, 0)) != DS_OK )
+        return hr;
+
+    // Zero the DS buffer
+    ZeroMemory(pDSBuffData, dwDataLen);
+    // Unlock the DS buffer
+    if ((hr = IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, pDSBuffData, dwDataLen, NULL, 0)) != DS_OK)
+        return hr;
+    
+    // Let DSound set the starting write position because if we set it to zero, it looks like the
+    // buffer is full to begin with. This causes a long pause before sound starts when using large buffers.
+    if ((hr = IDirectSoundBuffer_GetCurrentPosition( stream->pDirectSoundOutputBuffer,
+            &stream->previousPlayCursor, &stream->outputBufferWriteOffsetBytes )) != DS_OK)
+        return hr;
+
+    /* printf("DSW_InitOutputBuffer: playCursor = %d, writeCursor = %d\n", playCursor, dsw->dsw_WriteOffset ); */
+
+    return DS_OK;
+}
+
+static PaError StartStream( PaStream *s )
+{
+    PaError          result = paNoError;
+    PaWinDsStream   *stream = (PaWinDsStream*)s;
+    HRESULT          hr;
+        
+    stream->callbackResult = paContinue;
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+    
+    ResetEvent( stream->processingCompleted );
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+	ResetEvent( stream->processingThreadCompleted );
+#endif
+
+    if( stream->bufferProcessor.inputChannelCount > 0 )
+    {
+        // Start the buffer capture
+        if( stream->pDirectSoundInputBuffer != NULL ) // FIXME: not sure this check is necessary
+        {
+            hr = IDirectSoundCaptureBuffer_Start( stream->pDirectSoundInputBuffer, DSCBSTART_LOOPING );
+        }
+
+        DBUG(("StartStream: DSW_StartInput returned = 0x%X.\n", hr));
+        if( hr != DS_OK )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
+            goto error;
+        }
+    }
+
+    stream->framesWritten = 0;
+    stream->callbackFlags = 0;
+
+    stream->abortProcessing = 0;
+    stream->stopProcessing = 0;
+
+    if( stream->bufferProcessor.outputChannelCount > 0 )
+    {
+        QueryPerformanceCounter( &stream->previousPlayTime );
+        stream->finalZeroBytesWritten = 0;
+
+        hr = ClearOutputBuffer( stream );
+        if( hr != DS_OK )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
+            goto error;
+        }
+
+        if( stream->streamRepresentation.streamCallback && (stream->streamFlags & paPrimeOutputBuffersUsingStreamCallback) )
+        {
+            stream->callbackFlags = paPrimingOutput;
+
+            TimeSlice( stream );
+            /* we ignore the return value from TimeSlice here and start the stream as usual.
+                The first timer callback will detect if the callback has completed. */
+
+            stream->callbackFlags = 0;
+        }
+
+        // Start the buffer playback in a loop.
+        if( stream->pDirectSoundOutputBuffer != NULL ) // FIXME: not sure this needs to be checked here
+        {
+            hr = IDirectSoundBuffer_Play( stream->pDirectSoundOutputBuffer, 0, 0, DSBPLAY_LOOPING );
+            DBUG(("PaHost_StartOutput: IDirectSoundBuffer_Play returned = 0x%X.\n", hr));
+            if( hr != DS_OK )
+            {
+                result = paUnanticipatedHostError;
+                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
+                goto error;
+            }
+            stream->outputIsRunning = TRUE;
+        }
+    }
+
+    if( stream->streamRepresentation.streamCallback )
+    {
+        TIMECAPS timecaps;
+        int timerPeriodMs = stream->pollingPeriodSeconds * MSECS_PER_SECOND;
+        if( timerPeriodMs < 1 )
+            timerPeriodMs = 1;
+
+        /* set windows scheduler granularity only as fine as needed, no finer */
+        /* Although this is not fully documented by MS, it appears that
+           timeBeginPeriod() affects the scheduling granulatity of all timers
+           including Waitable Timer Objects. So we always call timeBeginPeriod, whether
+           we're using an MM timer callback via timeSetEvent or not.
+        */
+        assert( stream->systemTimerResolutionPeriodMs == 0 );
+        if( timeGetDevCaps( &timecaps, sizeof(TIMECAPS) == MMSYSERR_NOERROR && timecaps.wPeriodMin > 0 ) )
+        {
+            /* aim for resolution 4 times higher than polling rate */
+            stream->systemTimerResolutionPeriodMs = (stream->pollingPeriodSeconds * MSECS_PER_SECOND) / 4;
+            if( stream->systemTimerResolutionPeriodMs < timecaps.wPeriodMin )
+                stream->systemTimerResolutionPeriodMs = timecaps.wPeriodMin;
+            if( stream->systemTimerResolutionPeriodMs > timecaps.wPeriodMax )
+                stream->systemTimerResolutionPeriodMs = timecaps.wPeriodMax;
+
+            if( timeBeginPeriod( stream->systemTimerResolutionPeriodMs ) != MMSYSERR_NOERROR )
+                stream->systemTimerResolutionPeriodMs = 0; /* timeBeginPeriod failed, so we don't need to call timeEndPeriod() later */
+        }
+
+
+#ifdef PA_WIN_DS_USE_WMME_TIMER
+        /* Create timer that will wake us up so we can fill the DSound buffer. */
+        /* We have deprecated timeSetEvent because all MM timer callbacks
+           are serialised onto a single thread. Which creates problems with multiple
+           PA streams, or when also using timers for other time critical tasks
+        */
+        stream->timerID = timeSetEvent( timerPeriodMs, stream->systemTimerResolutionPeriodMs, (LPTIMECALLBACK) TimerCallback,
+                                             (DWORD_PTR) stream, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS );
+    
+        if( stream->timerID == 0 )
+        {
+            stream->isActive = 0;
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( GetLastError() );
+            goto error;
+        }
+#else
+		/* Create processing thread which calls TimerCallback */
+
+		stream->processingThread = CREATE_THREAD( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId );
+        if( !stream->processingThread )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( GetLastError() );
+            goto error;
+        }
+
+        if( !SetThreadPriority( stream->processingThread, THREAD_PRIORITY_TIME_CRITICAL ) )
+        {
+            result = paUnanticipatedHostError;
+            PA_DS_SET_LAST_DIRECTSOUND_ERROR( GetLastError() );
+            goto error;
+        }
+#endif
+    }
+
+    stream->isActive = 1;
+    stream->isStarted = 1;
+
+    assert( result == paNoError );
+    return result;
+
+error:
+
+    if( stream->pDirectSoundOutputBuffer != NULL && stream->outputIsRunning )
+        IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
+    stream->outputIsRunning = FALSE;
+
+#ifndef PA_WIN_DS_USE_WMME_TIMER
+    if( stream->processingThread )
+    {
+#ifdef CLOSE_THREAD_HANDLE
+        CLOSE_THREAD_HANDLE( stream->processingThread ); /* Delete thread. */
+#endif
+        stream->processingThread = NULL;
+    }
+#endif
+
+    return result;
+}
+
+
+/***********************************************************************************/
+static PaError StopStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+    HRESULT          hr;
+    int timeoutMsec;
+
+    if( stream->streamRepresentation.streamCallback )
+    {
+        stream->stopProcessing = 1;
+
+        /* Set timeout at 4 times maximum time we might wait. */
+        timeoutMsec = (int) (4 * MSECS_PER_SECOND * (stream->hostBufferSizeFrames / stream->streamRepresentation.streamInfo.sampleRate));
+
+        WaitForSingleObject( stream->processingCompleted, timeoutMsec );
+    }
+
+#ifdef PA_WIN_DS_USE_WMME_TIMER
+    if( stream->timerID != 0 )
+    {
+        timeKillEvent(stream->timerID);  /* Stop callback timer. */
+        stream->timerID = 0;
+    }
+#else
+    if( stream->processingThread )
+    {
+		if( WaitForSingleObject( stream->processingThreadCompleted, 30*100 ) == WAIT_TIMEOUT )
+			return paUnanticipatedHostError;
+
+#ifdef CLOSE_THREAD_HANDLE
+        CloseHandle( stream->processingThread ); /* Delete thread. */
+        stream->processingThread = NULL;
+#endif
+
+    }
+#endif
+
+    if( stream->systemTimerResolutionPeriodMs > 0 ){
+        timeEndPeriod( stream->systemTimerResolutionPeriodMs );
+        stream->systemTimerResolutionPeriodMs = 0;
+    }  
+
+    if( stream->bufferProcessor.outputChannelCount > 0 )
+    {
+        // Stop the buffer playback
+        if( stream->pDirectSoundOutputBuffer != NULL )
+        {
+            stream->outputIsRunning = FALSE;
+            // FIXME: what happens if IDirectSoundBuffer_Stop returns an error?
+            hr = IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
+
+            if( stream->pDirectSoundPrimaryBuffer )
+                IDirectSoundBuffer_Stop( stream->pDirectSoundPrimaryBuffer ); /* FIXME we never started the primary buffer so I'm not sure we need to stop it */
+        }
+    }
+
+    if( stream->bufferProcessor.inputChannelCount > 0 )
+    {
+        // Stop the buffer capture
+        if( stream->pDirectSoundInputBuffer != NULL )
+        {
+            // FIXME: what happens if IDirectSoundCaptureBuffer_Stop returns an error?
+            hr = IDirectSoundCaptureBuffer_Stop( stream->pDirectSoundInputBuffer );
+        }
+    }
+
+    stream->isStarted = 0;
+
+    return result;
+}
+
+
+/***********************************************************************************/
+static PaError AbortStream( PaStream *s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    stream->abortProcessing = 1;
+    return StopStream( s );
+}
+
+
+/***********************************************************************************/
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    return !stream->isStarted;
+}
+
+
+/***********************************************************************************/
+static PaError IsStreamActive( PaStream *s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    return stream->isActive;
+}
+
+/***********************************************************************************/
+static PaTime GetStreamTime( PaStream *s )
+{
+    /* suppress unused variable warnings */
+    (void) s;
+
+    return PaUtil_GetTime();
+}
+
+
+/***********************************************************************************/
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+/***********************************************************************************
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return paNoError;
+}
+
+
+/***********************************************************************************/
+static PaError WriteStream( PaStream* s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return paNoError;
+}
+
+
+/***********************************************************************************/
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return 0;
+}
+
+
+/***********************************************************************************/
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaWinDsStream *stream = (PaWinDsStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return 0;
+}
+
diff --git a/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
new file mode 100644
index 0000000000..c4e3c4ecab
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
@@ -0,0 +1,224 @@
+/*
+ * Interface for dynamically loading directsound and providing a dummy
+ * implementation if it isn't present.
+ *
+ * Author: Ross Bencina (some portions Phil Burk & Robert Marsanyi)
+ *
+ * For PortAudio Portable Real-Time Audio Library
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2006 Phil Burk, Robert Marsanyi and Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#include "pa_win_ds_dynlink.h"
+#include "pa_debugprint.h"
+
+PaWinDsDSoundEntryPoints paWinDsDSoundEntryPoints = { 0, 0, 0, 0, 0, 0, 0 };
+
+
+static HRESULT WINAPI DummyDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+{
+    (void)rclsid; /* unused parameter */
+    (void)riid; /* unused parameter */
+    (void)ppv; /* unused parameter */
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+static HRESULT WINAPI DummyDirectSoundCreate(LPGUID lpcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter)
+{
+    (void)lpcGuidDevice; /* unused parameter */
+    (void)ppDS; /* unused parameter */
+    (void)pUnkOuter; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DummyDirectSoundEnumerateW(LPDSENUMCALLBACKW lpDSEnumCallback, LPVOID lpContext)
+{
+    (void)lpDSEnumCallback; /* unused parameter */
+    (void)lpContext; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DummyDirectSoundEnumerateA(LPDSENUMCALLBACKA lpDSEnumCallback, LPVOID lpContext)
+{
+    (void)lpDSEnumCallback; /* unused parameter */
+    (void)lpContext; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DummyDirectSoundCaptureCreate(LPGUID lpcGUID, LPDIRECTSOUNDCAPTURE *lplpDSC, LPUNKNOWN pUnkOuter)
+{
+    (void)lpcGUID; /* unused parameter */
+    (void)lplpDSC; /* unused parameter */
+    (void)pUnkOuter; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DummyDirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW lpDSCEnumCallback, LPVOID lpContext)
+{
+    (void)lpDSCEnumCallback; /* unused parameter */
+    (void)lpContext; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DummyDirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA lpDSCEnumCallback, LPVOID lpContext)
+{
+    (void)lpDSCEnumCallback; /* unused parameter */
+    (void)lpContext; /* unused parameter */
+    return E_NOTIMPL;
+}
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+static HRESULT WINAPI DummyDirectSoundFullDuplexCreate8(
+         LPCGUID pcGuidCaptureDevice,
+         LPCGUID pcGuidRenderDevice,
+         LPCDSCBUFFERDESC pcDSCBufferDesc,
+         LPCDSBUFFERDESC pcDSBufferDesc,
+         HWND hWnd,
+         DWORD dwLevel,
+         LPDIRECTSOUNDFULLDUPLEX * ppDSFD,
+         LPDIRECTSOUNDCAPTUREBUFFER8 * ppDSCBuffer8,
+         LPDIRECTSOUNDBUFFER8 * ppDSBuffer8,
+         LPUNKNOWN pUnkOuter)
+{
+    (void)pcGuidCaptureDevice; /* unused parameter */
+    (void)pcGuidRenderDevice; /* unused parameter */
+    (void)pcDSCBufferDesc; /* unused parameter */
+    (void)pcDSBufferDesc; /* unused parameter */
+    (void)hWnd; /* unused parameter */
+    (void)dwLevel; /* unused parameter */
+    (void)ppDSFD; /* unused parameter */
+    (void)ppDSCBuffer8; /* unused parameter */
+    (void)ppDSBuffer8; /* unused parameter */
+    (void)pUnkOuter; /* unused parameter */
+
+    return E_NOTIMPL;
+}
+#endif /* PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE */
+
+void PaWinDs_InitializeDSoundEntryPoints(void)
+{
+    paWinDsDSoundEntryPoints.hInstance_ = LoadLibraryA("dsound.dll");
+    if( paWinDsDSoundEntryPoints.hInstance_ != NULL )
+    {
+        paWinDsDSoundEntryPoints.DllGetClassObject =
+                (HRESULT (WINAPI *)(REFCLSID, REFIID , LPVOID *))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DllGetClassObject" );
+        if( paWinDsDSoundEntryPoints.DllGetClassObject == NULL )
+            paWinDsDSoundEntryPoints.DllGetClassObject = DummyDllGetClassObject;
+
+        paWinDsDSoundEntryPoints.DirectSoundCreate =
+                (HRESULT (WINAPI *)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCreate" );
+        if( paWinDsDSoundEntryPoints.DirectSoundCreate == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundCreate = DummyDirectSoundCreate;
+
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateW =
+                (HRESULT (WINAPI *)(LPDSENUMCALLBACKW, LPVOID))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundEnumerateW" );
+        if( paWinDsDSoundEntryPoints.DirectSoundEnumerateW == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundEnumerateW = DummyDirectSoundEnumerateW;
+
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateA =
+                (HRESULT (WINAPI *)(LPDSENUMCALLBACKA, LPVOID))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundEnumerateA" );
+        if( paWinDsDSoundEntryPoints.DirectSoundEnumerateA == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundEnumerateA = DummyDirectSoundEnumerateA;
+
+        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate =
+                (HRESULT (WINAPI *)(LPGUID, LPDIRECTSOUNDCAPTURE *, LPUNKNOWN))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureCreate" );
+        if( paWinDsDSoundEntryPoints.DirectSoundCaptureCreate == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = DummyDirectSoundCaptureCreate;
+
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW =
+                (HRESULT (WINAPI *)(LPDSENUMCALLBACKW, LPVOID))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureEnumerateW" );
+        if( paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = DummyDirectSoundCaptureEnumerateW;
+
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA =
+                (HRESULT (WINAPI *)(LPDSENUMCALLBACKA, LPVOID))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureEnumerateA" );
+        if( paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = DummyDirectSoundCaptureEnumerateA;
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+        paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8 =
+                (HRESULT (WINAPI *)(LPCGUID, LPCGUID, LPCDSCBUFFERDESC, LPCDSBUFFERDESC,
+                                    HWND, DWORD, LPDIRECTSOUNDFULLDUPLEX *, LPDIRECTSOUNDCAPTUREBUFFER8 *, 
+                                    LPDIRECTSOUNDBUFFER8 *, LPUNKNOWN))
+                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundFullDuplexCreate" );
+        if( paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8 == NULL )
+            paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8 = DummyDirectSoundFullDuplexCreate8;
+#endif
+    }
+    else
+    {
+        DWORD errorCode = GetLastError(); // 126 (0x7E) == ERROR_MOD_NOT_FOUND
+        PA_DEBUG(("Couldn't load dsound.dll error code: %d \n",errorCode));
+
+        /* initialize with dummy entry points to make live easy when ds isn't present */
+        paWinDsDSoundEntryPoints.DirectSoundCreate = DummyDirectSoundCreate;
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateW = DummyDirectSoundEnumerateW;
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateA = DummyDirectSoundEnumerateA;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = DummyDirectSoundCaptureCreate;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = DummyDirectSoundCaptureEnumerateW;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = DummyDirectSoundCaptureEnumerateA;
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+        paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8 = DummyDirectSoundFullDuplexCreate8;
+#endif
+    }
+}
+
+
+void PaWinDs_TerminateDSoundEntryPoints(void)
+{
+    if( paWinDsDSoundEntryPoints.hInstance_ != NULL )
+    {
+        /* ensure that we crash reliably if the entry points arent initialised */
+        paWinDsDSoundEntryPoints.DirectSoundCreate = 0;
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateW = 0;
+        paWinDsDSoundEntryPoints.DirectSoundEnumerateA = 0;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = 0;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = 0;
+        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = 0;
+
+        FreeLibrary( paWinDsDSoundEntryPoints.hInstance_ );
+        paWinDsDSoundEntryPoints.hInstance_ = NULL;
+    }
+}
\ No newline at end of file
diff --git a/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
new file mode 100644
index 0000000000..fd6d8feda6
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
@@ -0,0 +1,106 @@
+/*
+ * Interface for dynamically loading directsound and providing a dummy
+ * implementation if it isn't present.
+ *
+ * Author: Ross Bencina (some portions Phil Burk & Robert Marsanyi)
+ *
+ * For PortAudio Portable Real-Time Audio Library
+ * For more information see: http://www.portaudio.com
+ * Copyright (c) 1999-2006 Phil Burk, Robert Marsanyi and Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#ifndef INCLUDED_PA_DSOUND_DYNLINK_H
+#define INCLUDED_PA_DSOUND_DYNLINK_H
+
+/* on Borland compilers, WIN32 doesn't seem to be defined by default, which
+    breaks dsound.h. Adding the define here fixes the problem. - rossb. */
+#ifdef __BORLANDC__
+#if !defined(WIN32)
+#define WIN32
+#endif
+#endif
+
+/*
+  Use the earliest version of DX required, no need to polute the namespace
+*/
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+#define DIRECTSOUND_VERSION 0x0800
+#else
+#define DIRECTSOUND_VERSION 0x0300
+#endif
+#include <dsound.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+typedef struct
+{
+    HINSTANCE hInstance_;
+    
+    HRESULT (WINAPI *DllGetClassObject)(REFCLSID , REFIID , LPVOID *);
+
+    HRESULT (WINAPI *DirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
+    HRESULT (WINAPI *DirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
+    HRESULT (WINAPI *DirectSoundEnumerateA)(LPDSENUMCALLBACKA, LPVOID);
+
+    HRESULT (WINAPI *DirectSoundCaptureCreate)(LPGUID, LPDIRECTSOUNDCAPTURE *, LPUNKNOWN);
+    HRESULT (WINAPI *DirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
+    HRESULT (WINAPI *DirectSoundCaptureEnumerateA)(LPDSENUMCALLBACKA, LPVOID);
+
+#ifdef PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE
+    HRESULT (WINAPI *DirectSoundFullDuplexCreate8)(
+                LPCGUID, LPCGUID, LPCDSCBUFFERDESC, LPCDSBUFFERDESC,
+                HWND, DWORD, LPDIRECTSOUNDFULLDUPLEX *, LPDIRECTSOUNDCAPTUREBUFFER8 *, 
+                LPDIRECTSOUNDBUFFER8 *, LPUNKNOWN );
+#endif
+}PaWinDsDSoundEntryPoints;
+
+extern PaWinDsDSoundEntryPoints paWinDsDSoundEntryPoints;
+
+void PaWinDs_InitializeDSoundEntryPoints(void);
+void PaWinDs_TerminateDSoundEntryPoints(void);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* INCLUDED_PA_DSOUND_DYNLINK_H */
diff --git a/Externals/portaudio/src/hostapi/jack/pa_jack.c b/Externals/portaudio/src/hostapi/jack/pa_jack.c
new file mode 100644
index 0000000000..25b7fd2d74
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/jack/pa_jack.c
@@ -0,0 +1,1765 @@
+/*
+ * $Id: pa_jack.c 1668 2011-05-02 17:07:11Z rossb $
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ * JACK Implementation by Joshua Haberman
+ *
+ * Copyright (c) 2004 Stefan Westerfeld <stefan@space.twc.de>
+ * Copyright (c) 2004 Arve Knudsen <aknuds-1@broadpark.no>
+ * Copyright (c) 2002 Joshua Haberman <joshua@haberman.com>
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#include <string.h>
+#include <regex.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <errno.h>  /* EBUSY */
+#include <signal.h> /* sig_atomic_t */
+#include <math.h>
+#include <semaphore.h>
+
+#include <jack/types.h>
+#include <jack/jack.h>
+
+#include "pa_util.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_process.h"
+#include "pa_allocation.h"
+#include "pa_cpuload.h"
+#include "pa_ringbuffer.h"
+#include "pa_debugprint.h"
+
+static pthread_t mainThread_;
+static char *jackErr_ = NULL;
+static const char* clientName_ = "PortAudio";
+
+#define STRINGIZE_HELPER(expr) #expr
+#define STRINGIZE(expr) STRINGIZE_HELPER(expr)
+
+/* Check PaError */
+#define ENSURE_PA(expr) \
+    do { \
+        PaError paErr; \
+        if( (paErr = (expr)) < paNoError ) \
+        { \
+            if( (paErr) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
+            { \
+                const char *err = jackErr_; \
+                if (! err ) err = "unknown error"; \
+                PaUtil_SetLastHostErrorInfo( paJACK, -1, err ); \
+            } \
+            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = paErr; \
+            goto error; \
+        } \
+    } while( 0 )
+
+#define UNLESS(expr, code) \
+    do { \
+        if( (expr) == 0 ) \
+        { \
+            if( (code) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
+            { \
+                const char *err = jackErr_; \
+                if (!err) err = "unknown error"; \
+                PaUtil_SetLastHostErrorInfo( paJACK, -1, err ); \
+            } \
+            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = (code); \
+            goto error; \
+        } \
+    } while( 0 )
+
+#define ASSERT_CALL(expr, success) \
+    do { \
+        int err = (expr); \
+        assert( err == success ); \
+    } while( 0 )
+
+/*
+ * Functions that directly map to the PortAudio stream interface
+ */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+/*static PaTime GetStreamInputLatency( PaStream *stream );*/
+/*static PaTime GetStreamOutputLatency( PaStream *stream );*/
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+
+
+/*
+ * Data specific to this API
+ */
+
+struct PaJackStream;
+
+typedef struct
+{
+    PaUtilHostApiRepresentation commonHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *deviceInfoMemory;
+
+    jack_client_t *jack_client;
+    int jack_buffer_size;
+    PaHostApiIndex hostApiIndex;
+
+    pthread_mutex_t mtx;
+    pthread_cond_t cond;
+    unsigned long inputBase, outputBase;
+
+    /* For dealing with the process thread */
+    volatile int xrun;     /* Received xrun notification from JACK? */
+    struct PaJackStream * volatile toAdd, * volatile toRemove;
+    struct PaJackStream *processQueue;
+    volatile sig_atomic_t jackIsDown;
+}
+PaJackHostApiRepresentation;
+
+/* PaJackStream - a stream data structure specifically for this implementation */
+
+typedef struct PaJackStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilBufferProcessor bufferProcessor;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaJackHostApiRepresentation *hostApi;
+
+    /* our input and output ports */
+    jack_port_t **local_input_ports;
+    jack_port_t **local_output_ports;
+
+    /* the input and output ports of the client we are connecting to */
+    jack_port_t **remote_input_ports;
+    jack_port_t **remote_output_ports;
+
+    int num_incoming_connections;
+    int num_outgoing_connections;
+
+    jack_client_t *jack_client;
+
+    /* The stream is running if it's still producing samples.
+     * The stream is active if samples it produced are still being heard.
+     */
+    volatile sig_atomic_t is_running;
+    volatile sig_atomic_t is_active;
+    /* Used to signal processing thread that stream should start or stop, respectively */
+    volatile sig_atomic_t doStart, doStop, doAbort;
+
+    jack_nframes_t t0;
+
+    PaUtilAllocationGroup *stream_memory;
+
+    /* These are useful in the process callback */
+
+    int callbackResult;
+    int isSilenced;
+    int xrun;
+
+    /* These are useful for the blocking API */
+
+    int                     isBlockingStream;
+    PaUtilRingBuffer        inFIFO;
+    PaUtilRingBuffer        outFIFO;
+    volatile sig_atomic_t   data_available;
+    sem_t                   data_semaphore;
+    int                     bytesPerFrame;
+    int                     samplesPerFrame;
+
+    struct PaJackStream *next;
+}
+PaJackStream;
+
+#define TRUE 1
+#define FALSE 0
+
+/*
+ * Functions specific to this API
+ */
+
+static int JackCallback( jack_nframes_t frames, void *userData );
+
+
+/*
+ *
+ * Implementation
+ *
+ */
+
+/* ---- blocking emulation layer ---- */
+
+/* Allocate buffer. */
+static PaError BlockingInitFIFO( PaUtilRingBuffer *rbuf, long numFrames, long bytesPerFrame )
+{
+    long numBytes = numFrames * bytesPerFrame;
+    char *buffer = (char *) malloc( numBytes );
+    if( buffer == NULL ) return paInsufficientMemory;
+    memset( buffer, 0, numBytes );
+    return (PaError) PaUtil_InitializeRingBuffer( rbuf, 1, numBytes, buffer );
+}
+
+/* Free buffer. */
+static PaError BlockingTermFIFO( PaUtilRingBuffer *rbuf )
+{
+    if( rbuf->buffer ) free( rbuf->buffer );
+    rbuf->buffer = NULL;
+    return paNoError;
+}
+
+static int
+BlockingCallback( const void                      *inputBuffer,
+                  void                            *outputBuffer,
+		  unsigned long                    framesPerBuffer,
+		  const PaStreamCallbackTimeInfo*  timeInfo,
+		  PaStreamCallbackFlags            statusFlags,
+		  void                             *userData )
+{
+    struct PaJackStream *stream = (PaJackStream *)userData;
+    long numBytes = stream->bytesPerFrame * framesPerBuffer;
+
+    /* This may get called with NULL inputBuffer during initial setup. */
+    if( inputBuffer != NULL )
+    {
+        PaUtil_WriteRingBuffer( &stream->inFIFO, inputBuffer, numBytes );
+    }
+    if( outputBuffer != NULL )
+    {
+        int numRead = PaUtil_ReadRingBuffer( &stream->outFIFO, outputBuffer, numBytes );
+        /* Zero out remainder of buffer if we run out of data. */
+        memset( (char *)outputBuffer + numRead, 0, numBytes - numRead );
+    }
+
+    if( !stream->data_available )
+    {
+        stream->data_available = 1;
+        sem_post( &stream->data_semaphore );
+    }
+    return paContinue;
+}
+
+static PaError
+BlockingBegin( PaJackStream *stream, int minimum_buffer_size )
+{
+    long    doRead = 0;
+    long    doWrite = 0;
+    PaError result = paNoError;
+    long    numFrames;
+
+    doRead = stream->local_input_ports != NULL;
+    doWrite = stream->local_output_ports != NULL;
+    /* <FIXME> */
+    stream->samplesPerFrame = 2;
+    stream->bytesPerFrame = sizeof(float) * stream->samplesPerFrame;
+    /* </FIXME> */
+    numFrames = 32;
+    while (numFrames < minimum_buffer_size)
+        numFrames *= 2;
+
+    if( doRead )
+    {
+        ENSURE_PA( BlockingInitFIFO( &stream->inFIFO, numFrames, stream->bytesPerFrame ) );
+    }
+    if( doWrite )
+    {
+        long numBytes;
+
+        ENSURE_PA( BlockingInitFIFO( &stream->outFIFO, numFrames, stream->bytesPerFrame ) );
+
+        /* Make Write FIFO appear full initially. */
+        numBytes = PaUtil_GetRingBufferWriteAvailable( &stream->outFIFO );
+        PaUtil_AdvanceRingBufferWriteIndex( &stream->outFIFO, numBytes );
+    }
+
+    stream->data_available = 0;
+    sem_init( &stream->data_semaphore, 0, 0 );
+
+error:
+    return result;
+}
+
+static void
+BlockingEnd( PaJackStream *stream )
+{
+    BlockingTermFIFO( &stream->inFIFO );
+    BlockingTermFIFO( &stream->outFIFO );
+
+    sem_destroy( &stream->data_semaphore );
+}
+
+static PaError BlockingReadStream( PaStream* s, void *data, unsigned long numFrames )
+{
+    PaError result = paNoError;
+    PaJackStream *stream = (PaJackStream *)s;
+
+    long bytesRead;
+    char *p = (char *) data;
+    long numBytes = stream->bytesPerFrame * numFrames;
+    while( numBytes > 0 )
+    {
+        bytesRead = PaUtil_ReadRingBuffer( &stream->inFIFO, p, numBytes );
+        numBytes -= bytesRead;
+        p += bytesRead;
+        if( numBytes > 0 )
+        {
+            /* see write for an explanation */
+            if( stream->data_available )
+                stream->data_available = 0;
+            else
+                sem_wait( &stream->data_semaphore );
+        }
+    }
+
+    return result;
+}
+
+static PaError BlockingWriteStream( PaStream* s, const void *data, unsigned long numFrames )
+{
+    PaError result = paNoError;
+    PaJackStream *stream = (PaJackStream *)s;
+    long bytesWritten;
+    char *p = (char *) data;
+    long numBytes = stream->bytesPerFrame * numFrames;
+    while( numBytes > 0 )
+    {
+        bytesWritten = PaUtil_WriteRingBuffer( &stream->outFIFO, p, numBytes );
+        numBytes -= bytesWritten;
+        p += bytesWritten;
+        if( numBytes > 0 )
+        {
+            /* we use the following algorithm:
+             *   (1) write data
+             *   (2) if some data didn't fit into the ringbuffer, set data_available to 0
+             *       to indicate to the audio that if space becomes available, we want to know
+             *   (3) retry to write data (because it might be that between (1) and (2)
+             *       new space in the buffer became available)
+             *   (4) if this failed, we are sure that the buffer is really empty and
+             *       we will definitely receive a notification when it becomes available
+             *       thus we can safely sleep
+             *
+             * if the algorithm bailed out in step (3) before, it leaks a count of 1
+             * on the semaphore; however, it doesn't matter, because if we block in (4),
+             * we also do it in a loop
+             */
+            if( stream->data_available )
+                stream->data_available = 0;
+            else
+                sem_wait( &stream->data_semaphore );
+        }
+    }
+
+    return result;
+}
+
+static signed long
+BlockingGetStreamReadAvailable( PaStream* s )
+{
+    PaJackStream *stream = (PaJackStream *)s;
+
+    int bytesFull = PaUtil_GetRingBufferReadAvailable( &stream->inFIFO );
+    return bytesFull / stream->bytesPerFrame;
+}
+
+static signed long
+BlockingGetStreamWriteAvailable( PaStream* s )
+{
+    PaJackStream *stream = (PaJackStream *)s;
+
+    int bytesEmpty = PaUtil_GetRingBufferWriteAvailable( &stream->outFIFO );
+    return bytesEmpty / stream->bytesPerFrame;
+}
+
+static PaError
+BlockingWaitEmpty( PaStream *s )
+{
+    PaJackStream *stream = (PaJackStream *)s;
+
+    while( PaUtil_GetRingBufferReadAvailable( &stream->outFIFO ) > 0 )
+    {
+        stream->data_available = 0;
+        sem_wait( &stream->data_semaphore );
+    }
+    return 0;
+}
+
+/* ---- jack driver ---- */
+
+/* BuildDeviceList():
+ *
+ * The process of determining a list of PortAudio "devices" from
+ * JACK's client/port system is fairly involved, so it is separated
+ * into its own routine.
+ */
+
+static PaError BuildDeviceList( PaJackHostApiRepresentation *jackApi )
+{
+    /* Utility macros for the repetitive process of allocating memory */
+
+    /* JACK has no concept of a device.  To JACK, there are clients
+     * which have an arbitrary number of ports.  To make this
+     * intelligible to PortAudio clients, we will group each JACK client
+     * into a device, and make each port of that client a channel */
+
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *commonApi = &jackApi->commonHostApiRep;
+
+    const char **jack_ports = NULL;
+    char **client_names = NULL;
+    char *regex_pattern = NULL;
+    int port_index, client_index, i;
+    double globalSampleRate;
+    regex_t port_regex;
+    unsigned long numClients = 0, numPorts = 0;
+    char *tmp_client_name = NULL;
+
+    commonApi->info.defaultInputDevice = paNoDevice;
+    commonApi->info.defaultOutputDevice = paNoDevice;
+    commonApi->info.deviceCount = 0;
+
+    /* Parse the list of ports, using a regex to grab the client names */
+    ASSERT_CALL( regcomp( &port_regex, "^[^:]*", REG_EXTENDED ), 0 );
+
+    /* since we are rebuilding the list of devices, free all memory
+     * associated with the previous list */
+    PaUtil_FreeAllAllocations( jackApi->deviceInfoMemory );
+
+    regex_pattern = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, jack_client_name_size() + 3 );
+    tmp_client_name = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, jack_client_name_size() );
+
+    /* We can only retrieve the list of clients indirectly, by first
+     * asking for a list of all ports, then parsing the port names
+     * according to the client_name:port_name convention (which is
+     * enforced by jackd)
+     * A: If jack_get_ports returns NULL, there's nothing for us to do */
+    UNLESS( (jack_ports = jack_get_ports( jackApi->jack_client, "", "", 0 )) && jack_ports[0], paNoError );
+    /* Find number of ports */
+    while( jack_ports[numPorts] )
+        ++numPorts;
+    /* At least there will be one port per client :) */
+    UNLESS( client_names = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, numPorts *
+                sizeof (char *) ), paInsufficientMemory );
+
+    /* Build a list of clients from the list of ports */
+    for( numClients = 0, port_index = 0; jack_ports[port_index] != NULL; port_index++ )
+    {
+        int client_seen = FALSE;
+        regmatch_t match_info;
+        const char *port = jack_ports[port_index];
+
+        /* extract the client name from the port name, using a regex
+         * that parses the clientname:portname syntax */
+        UNLESS( !regexec( &port_regex, port, 1, &match_info, 0 ), paInternalError );
+        assert(match_info.rm_eo - match_info.rm_so < jack_client_name_size());
+        memcpy( tmp_client_name, port + match_info.rm_so,
+                match_info.rm_eo - match_info.rm_so );
+        tmp_client_name[match_info.rm_eo - match_info.rm_so] = '\0';
+
+        /* do we know about this port's client yet? */
+        for( i = 0; i < numClients; i++ )
+        {
+            if( strcmp( tmp_client_name, client_names[i] ) == 0 )
+                client_seen = TRUE;
+        }
+
+        if (client_seen)
+            continue;   /* A: Nothing to see here, move along */
+
+        UNLESS( client_names[numClients] = (char*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
+                    strlen(tmp_client_name) + 1), paInsufficientMemory );
+
+        /* The alsa_pcm client should go in spot 0.  If this
+         * is the alsa_pcm client AND we are NOT about to put
+         * it in spot 0 put it in spot 0 and move whatever
+         * was already in spot 0 to the end. */
+        if( strcmp( "alsa_pcm", tmp_client_name ) == 0 && numClients > 0 )
+        {
+            /* alsa_pcm goes in spot 0 */
+            strcpy( client_names[ numClients ], client_names[0] );
+            strcpy( client_names[0], tmp_client_name );
+        }
+        else
+        {
+            /* put the new client at the end of the client list */
+            strcpy( client_names[ numClients ], tmp_client_name );
+        }
+        ++numClients;
+    }
+
+    /* Now we have a list of clients, which will become the list of
+     * PortAudio devices. */
+
+    /* there is one global sample rate all clients must conform to */
+
+    globalSampleRate = jack_get_sample_rate( jackApi->jack_client );
+    UNLESS( commonApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
+                sizeof(PaDeviceInfo*) * numClients ), paInsufficientMemory );
+
+    assert( commonApi->info.deviceCount == 0 );
+
+    /* Create a PaDeviceInfo structure for every client */
+    for( client_index = 0; client_index < numClients; client_index++ )
+    {
+        PaDeviceInfo *curDevInfo;
+        const char **clientPorts = NULL;
+
+        UNLESS( curDevInfo = (PaDeviceInfo*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
+                    sizeof(PaDeviceInfo) ), paInsufficientMemory );
+        UNLESS( curDevInfo->name = (char*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
+                    strlen(client_names[client_index]) + 1 ), paInsufficientMemory );
+        strcpy( (char *)curDevInfo->name, client_names[client_index] );
+
+        curDevInfo->structVersion = 2;
+        curDevInfo->hostApi = jackApi->hostApiIndex;
+
+        /* JACK is very inflexible: there is one sample rate the whole
+         * system must run at, and all clients must speak IEEE float. */
+        curDevInfo->defaultSampleRate = globalSampleRate;
+
+        /* To determine how many input and output channels are available,
+         * we re-query jackd with more specific parameters. */
+
+        sprintf( regex_pattern, "%s:.*", client_names[client_index] );
+
+        /* ... what are your output ports (that we could input from)? */
+        clientPorts = jack_get_ports( jackApi->jack_client, regex_pattern,
+                                     NULL, JackPortIsOutput);
+        curDevInfo->maxInputChannels = 0;
+        curDevInfo->defaultLowInputLatency = 0.;
+        curDevInfo->defaultHighInputLatency = 0.;
+        if( clientPorts )
+        {
+            jack_port_t *p = jack_port_by_name( jackApi->jack_client, clientPorts[0] );
+            curDevInfo->defaultLowInputLatency = curDevInfo->defaultHighInputLatency =
+                jack_port_get_latency( p ) / globalSampleRate;
+
+            for( i = 0; clientPorts[i] != NULL; i++)
+            {
+                /* The number of ports returned is the number of output channels.
+                 * We don't care what they are, we just care how many */
+                curDevInfo->maxInputChannels++;
+            }
+            free(clientPorts);
+        }
+
+        /* ... what are your input ports (that we could output to)? */
+        clientPorts = jack_get_ports( jackApi->jack_client, regex_pattern,
+                                     NULL, JackPortIsInput);
+        curDevInfo->maxOutputChannels = 0;
+        curDevInfo->defaultLowOutputLatency = 0.;
+        curDevInfo->defaultHighOutputLatency = 0.;
+        if( clientPorts )
+        {
+            jack_port_t *p = jack_port_by_name( jackApi->jack_client, clientPorts[0] );
+            curDevInfo->defaultLowOutputLatency = curDevInfo->defaultHighOutputLatency =
+                jack_port_get_latency( p ) / globalSampleRate;
+
+            for( i = 0; clientPorts[i] != NULL; i++)
+            {
+                /* The number of ports returned is the number of input channels.
+                 * We don't care what they are, we just care how many */
+                curDevInfo->maxOutputChannels++;
+            }
+            free(clientPorts);
+        }
+
+        /* Add this client to the list of devices */
+        commonApi->deviceInfos[client_index] = curDevInfo;
+        ++commonApi->info.deviceCount;
+        if( commonApi->info.defaultInputDevice == paNoDevice && curDevInfo->maxInputChannels > 0 )
+            commonApi->info.defaultInputDevice = client_index;
+        if( commonApi->info.defaultOutputDevice == paNoDevice && curDevInfo->maxOutputChannels > 0 )
+            commonApi->info.defaultOutputDevice = client_index;
+    }
+
+error:
+    regfree( &port_regex );
+    free( jack_ports );
+    return result;
+}
+
+static void UpdateSampleRate( PaJackStream *stream, double sampleRate )
+{
+    /* XXX: Maybe not the cleanest way of going about this? */
+    stream->cpuLoadMeasurer.samplingPeriod = stream->bufferProcessor.samplePeriod = 1. / sampleRate;
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+}
+
+static void JackErrorCallback( const char *msg )
+{
+    if( pthread_self() == mainThread_ )
+    {
+        assert( msg );
+        jackErr_ = realloc( jackErr_, strlen( msg ) + 1 );
+        strcpy( jackErr_, msg );
+    }
+}
+
+static void JackOnShutdown( void *arg )
+{
+    PaJackHostApiRepresentation *jackApi = (PaJackHostApiRepresentation *)arg;
+    PaJackStream *stream = jackApi->processQueue;
+
+    PA_DEBUG(( "%s: JACK server is shutting down\n", __FUNCTION__ ));
+    for( ; stream; stream = stream->next )
+    {
+        stream->is_active = 0;
+    }
+
+    /* Make sure that the main thread doesn't get stuck waiting on the condition */
+    ASSERT_CALL( pthread_mutex_lock( &jackApi->mtx ), 0 );
+    jackApi->jackIsDown = 1;
+    ASSERT_CALL( pthread_cond_signal( &jackApi->cond ), 0 );
+    ASSERT_CALL( pthread_mutex_unlock( &jackApi->mtx ), 0 );
+
+}
+
+static int JackSrCb( jack_nframes_t nframes, void *arg )
+{
+    PaJackHostApiRepresentation *jackApi = (PaJackHostApiRepresentation *)arg;
+    double sampleRate = (double)nframes;
+    PaJackStream *stream = jackApi->processQueue;
+
+    /* Update all streams in process queue */
+    PA_DEBUG(( "%s: Acting on change in JACK samplerate: %f\n", __FUNCTION__, sampleRate ));
+    for( ; stream; stream = stream->next )
+    {
+        if( stream->streamRepresentation.streamInfo.sampleRate != sampleRate )
+        {
+            PA_DEBUG(( "%s: Updating samplerate\n", __FUNCTION__ ));
+            UpdateSampleRate( stream, sampleRate );
+        }
+    }
+
+    return 0;
+}
+
+static int JackXRunCb(void *arg) {
+    PaJackHostApiRepresentation *hostApi = (PaJackHostApiRepresentation *)arg;
+    assert( hostApi );
+    hostApi->xrun = TRUE;
+    PA_DEBUG(( "%s: JACK signalled xrun\n", __FUNCTION__ ));
+    return 0;
+}
+
+PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi,
+                           PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation *jackHostApi;
+    int activated = 0;
+    jack_status_t jackStatus = 0;
+    *hostApi = NULL;    /* Initialize to NULL */
+
+    UNLESS( jackHostApi = (PaJackHostApiRepresentation*)
+        PaUtil_AllocateMemory( sizeof(PaJackHostApiRepresentation) ), paInsufficientMemory );
+    UNLESS( jackHostApi->deviceInfoMemory = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
+
+    mainThread_ = pthread_self();
+    ASSERT_CALL( pthread_mutex_init( &jackHostApi->mtx, NULL ), 0 );
+    ASSERT_CALL( pthread_cond_init( &jackHostApi->cond, NULL ), 0 );
+
+    /* Try to become a client of the JACK server.  If we cannot do
+     * this, then this API cannot be used.
+     *
+     * Without the JackNoStartServer option, the jackd server is started
+     * automatically which we do not want.
+     */
+
+    jackHostApi->jack_client = jack_client_open( clientName_, JackNoStartServer, &jackStatus );
+    if( !jackHostApi->jack_client )
+    {
+        /* the V19 development docs say that if an implementation
+         * detects that it cannot be used, it should return a NULL
+         * interface and paNoError */
+        PA_DEBUG(( "%s: Couldn't connect to JACK, status: %d\n", __FUNCTION__, jackStatus ));
+        result = paNoError;
+        goto error;
+    }
+
+    jackHostApi->hostApiIndex = hostApiIndex;
+
+    *hostApi = &jackHostApi->commonHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paJACK;
+    (*hostApi)->info.name = "JACK Audio Connection Kit";
+
+    /* Build a device list by querying the JACK server */
+    ENSURE_PA( BuildDeviceList( jackHostApi ) );
+
+    /* Register functions */
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &jackHostApi->callbackStreamInterface,
+                                      CloseStream, StartStream,
+                                      StopStream, AbortStream,
+                                      IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable,
+                                      PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &jackHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      BlockingReadStream, BlockingWriteStream,
+                                      BlockingGetStreamReadAvailable, BlockingGetStreamWriteAvailable );
+
+    jackHostApi->inputBase = jackHostApi->outputBase = 0;
+    jackHostApi->xrun = 0;
+    jackHostApi->toAdd = jackHostApi->toRemove = NULL;
+    jackHostApi->processQueue = NULL;
+    jackHostApi->jackIsDown = 0;
+
+    jack_on_shutdown( jackHostApi->jack_client, JackOnShutdown, jackHostApi );
+    jack_set_error_function( JackErrorCallback );
+    jackHostApi->jack_buffer_size = jack_get_buffer_size ( jackHostApi->jack_client );
+    /* Don't check for error, may not be supported (deprecated in at least jackdmp) */
+    jack_set_sample_rate_callback( jackHostApi->jack_client, JackSrCb, jackHostApi );
+    UNLESS( !jack_set_xrun_callback( jackHostApi->jack_client, JackXRunCb, jackHostApi ), paUnanticipatedHostError );
+    UNLESS( !jack_set_process_callback( jackHostApi->jack_client, JackCallback, jackHostApi ), paUnanticipatedHostError );
+    UNLESS( !jack_activate( jackHostApi->jack_client ), paUnanticipatedHostError );
+    activated = 1;
+
+    return result;
+
+error:
+    if( activated )
+        ASSERT_CALL( jack_deactivate( jackHostApi->jack_client ), 0 );
+
+    if( jackHostApi )
+    {
+        if( jackHostApi->jack_client )
+            ASSERT_CALL( jack_client_close( jackHostApi->jack_client ), 0 );
+
+        if( jackHostApi->deviceInfoMemory )
+        {
+            PaUtil_FreeAllAllocations( jackHostApi->deviceInfoMemory );
+            PaUtil_DestroyAllocationGroup( jackHostApi->deviceInfoMemory );
+        }
+
+        PaUtil_FreeMemory( jackHostApi );
+    }
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaJackHostApiRepresentation *jackHostApi = (PaJackHostApiRepresentation*)hostApi;
+
+    /* note: this automatically disconnects all ports, since a deactivated
+     * client is not allowed to have any ports connected */
+    ASSERT_CALL( jack_deactivate( jackHostApi->jack_client ), 0 );
+
+    ASSERT_CALL( pthread_mutex_destroy( &jackHostApi->mtx ), 0 );
+    ASSERT_CALL( pthread_cond_destroy( &jackHostApi->cond ), 0 );
+
+    ASSERT_CALL( jack_client_close( jackHostApi->jack_client ), 0 );
+
+    if( jackHostApi->deviceInfoMemory )
+    {
+        PaUtil_FreeAllAllocations( jackHostApi->deviceInfoMemory );
+        PaUtil_DestroyAllocationGroup( jackHostApi->deviceInfoMemory );
+    }
+
+    PaUtil_FreeMemory( jackHostApi );
+
+    free( jackErr_ );
+    jackErr_ = NULL;
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    int inputChannelCount = 0, outputChannelCount = 0;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+
+    /*
+        The following check is not necessary for JACK.
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+
+
+        Because the buffer adapter handles conversion between all standard
+        sample formats, the following checks are only required if paCustomFormat
+        is implemented, or under some other unusual conditions.
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+    */
+
+    /* check that the device supports sampleRate */
+
+#define ABS(x) ( (x) > 0 ? (x) : -(x) )
+    if( ABS(sampleRate - jack_get_sample_rate(((PaJackHostApiRepresentation *) hostApi)->jack_client )) > 1 )
+       return paInvalidSampleRate;
+#undef ABS
+
+    return paFormatIsSupported;
+}
+
+/* Basic stream initialization */
+static PaError InitializeStream( PaJackStream *stream, PaJackHostApiRepresentation *hostApi, int numInputChannels,
+        int numOutputChannels )
+{
+    PaError result = paNoError;
+    assert( stream );
+
+    memset( stream, 0, sizeof (PaJackStream) );
+    UNLESS( stream->stream_memory = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
+    stream->jack_client = hostApi->jack_client;
+    stream->hostApi = hostApi;
+
+    if( numInputChannels > 0 )
+    {
+        UNLESS( stream->local_input_ports =
+                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numInputChannels ),
+                paInsufficientMemory );
+        memset( stream->local_input_ports, 0, sizeof(jack_port_t*) * numInputChannels );
+        UNLESS( stream->remote_output_ports =
+                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numInputChannels ),
+                paInsufficientMemory );
+        memset( stream->remote_output_ports, 0, sizeof(jack_port_t*) * numInputChannels );
+    }
+    if( numOutputChannels > 0 )
+    {
+        UNLESS( stream->local_output_ports =
+                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numOutputChannels ),
+                paInsufficientMemory );
+        memset( stream->local_output_ports, 0, sizeof(jack_port_t*) * numOutputChannels );
+        UNLESS( stream->remote_input_ports =
+                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numOutputChannels ),
+                paInsufficientMemory );
+        memset( stream->remote_input_ports, 0, sizeof(jack_port_t*) * numOutputChannels );
+    }
+
+    stream->num_incoming_connections = numInputChannels;
+    stream->num_outgoing_connections = numOutputChannels;
+
+error:
+    return result;
+}
+
+/*!
+ * Free resources associated with stream, and eventually stream itself.
+ *
+ * Frees allocated memory, and closes opened pcms.
+ */
+static void CleanUpStream( PaJackStream *stream, int terminateStreamRepresentation, int terminateBufferProcessor )
+{
+    int i;
+    assert( stream );
+
+    if( stream->isBlockingStream )
+        BlockingEnd( stream );
+
+    for( i = 0; i < stream->num_incoming_connections; ++i )
+    {
+        if( stream->local_input_ports[i] )
+            ASSERT_CALL( jack_port_unregister( stream->jack_client, stream->local_input_ports[i] ), 0 );
+    }
+    for( i = 0; i < stream->num_outgoing_connections; ++i )
+    {
+        if( stream->local_output_ports[i] )
+            ASSERT_CALL( jack_port_unregister( stream->jack_client, stream->local_output_ports[i] ), 0 );
+    }
+
+    if( terminateStreamRepresentation )
+        PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    if( terminateBufferProcessor )
+        PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+
+    if( stream->stream_memory )
+    {
+        PaUtil_FreeAllAllocations( stream->stream_memory );
+        PaUtil_DestroyAllocationGroup( stream->stream_memory );
+    }
+    PaUtil_FreeMemory( stream );
+}
+
+static PaError WaitCondition( PaJackHostApiRepresentation *hostApi )
+{
+    PaError result = paNoError;
+    int err = 0;
+    PaTime pt = PaUtil_GetTime();
+    struct timespec ts;
+
+    ts.tv_sec = (time_t) floor( pt + 10 * 60 /* 10 minutes */ );
+    ts.tv_nsec = (long) ((pt - floor( pt )) * 1000000000);
+    /* XXX: Best enclose in loop, in case of spurious wakeups? */
+    err = pthread_cond_timedwait( &hostApi->cond, &hostApi->mtx, &ts );
+
+    /* Make sure we didn't time out */
+    UNLESS( err != ETIMEDOUT, paTimedOut );
+    UNLESS( !err, paInternalError );
+
+error:
+    return result;
+}
+
+static PaError AddStream( PaJackStream *stream )
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation *hostApi = stream->hostApi;
+    /* Add to queue of streams that should be processed */
+    ASSERT_CALL( pthread_mutex_lock( &hostApi->mtx ), 0 );
+    if( !hostApi->jackIsDown )
+    {
+        hostApi->toAdd = stream;
+        /* Unlock mutex and await signal from processing thread */
+        result = WaitCondition( stream->hostApi );
+    }
+    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
+    ENSURE_PA( result );
+
+    UNLESS( !hostApi->jackIsDown, paDeviceUnavailable );
+
+error:
+    return result;
+}
+
+/* Remove stream from processing queue */
+static PaError RemoveStream( PaJackStream *stream )
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation *hostApi = stream->hostApi;
+
+    /* Add to queue over streams that should be processed */
+    ASSERT_CALL( pthread_mutex_lock( &hostApi->mtx ), 0 );
+    if( !hostApi->jackIsDown )
+    {
+        hostApi->toRemove = stream;
+        /* Unlock mutex and await signal from processing thread */
+        result = WaitCondition( stream->hostApi );
+    }
+    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
+    ENSURE_PA( result );
+
+error:
+    return result;
+}
+
+/* Add stream to JACK callback processing queue */
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation *jackHostApi = (PaJackHostApiRepresentation*)hostApi;
+    PaJackStream *stream = NULL;
+    char *port_string = PaUtil_GroupAllocateMemory( jackHostApi->deviceInfoMemory, jack_port_name_size() );
+    unsigned long regexSz = jack_client_name_size() + 3;
+    char *regex_pattern = PaUtil_GroupAllocateMemory( jackHostApi->deviceInfoMemory, regexSz );
+    const char **jack_ports = NULL;
+    /* int jack_max_buffer_size = jack_get_buffer_size( jackHostApi->jack_client ); */
+    int i;
+    int inputChannelCount, outputChannelCount;
+    const double jackSr = jack_get_sample_rate( jackHostApi->jack_client );
+    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
+    int bpInitialized = 0, srInitialized = 0;   /* Initialized buffer processor and stream representation? */
+    unsigned long ofs;
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+    if( (streamFlags & paPrimeOutputBuffersUsingStreamCallback) != 0 )
+    {
+        streamFlags &= ~paPrimeOutputBuffersUsingStreamCallback;
+        /*return paInvalidFlag;*/   /* This implementation does not support buffer priming */
+    }
+
+    if( framesPerBuffer != paFramesPerBufferUnspecified )
+    {
+        /* Jack operates with power of two buffers, and we don't support non-integer buffer adaption (yet) */
+        /*UNLESS( !(framesPerBuffer & (framesPerBuffer - 1)), paBufferTooBig );*/  /* TODO: Add descriptive error code? */
+    }
+
+    /* Preliminary checks */
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+
+    /* ... check that the sample rate exactly matches the ONE acceptable rate
+     * A: This rate isn't necessarily constant though? */
+
+#define ABS(x) ( (x) > 0 ? (x) : -(x) )
+    if( ABS(sampleRate - jackSr) > 1 )
+       return paInvalidSampleRate;
+#undef ABS
+
+    UNLESS( stream = (PaJackStream*)PaUtil_AllocateMemory( sizeof(PaJackStream) ), paInsufficientMemory );
+    ENSURE_PA( InitializeStream( stream, jackHostApi, inputChannelCount, outputChannelCount ) );
+
+    /* the blocking emulation, if necessary */
+    stream->isBlockingStream = !streamCallback;
+    if( stream->isBlockingStream )
+    {
+        float latency = 0.001; /* 1ms is the absolute minimum we support */
+        int   minimum_buffer_frames = 0;
+
+        if( inputParameters && inputParameters->suggestedLatency > latency )
+            latency = inputParameters->suggestedLatency;
+        else if( outputParameters && outputParameters->suggestedLatency > latency )
+            latency = outputParameters->suggestedLatency;
+
+        /* the latency the user asked for indicates the minimum buffer size in frames */
+        minimum_buffer_frames = (int) (latency * jack_get_sample_rate( jackHostApi->jack_client ));
+
+        /* we also need to be able to store at least three full jack buffers to avoid dropouts */
+        if( jackHostApi->jack_buffer_size * 3 > minimum_buffer_frames )
+            minimum_buffer_frames = jackHostApi->jack_buffer_size * 3;
+
+        /* setup blocking API data structures (FIXME: can fail) */
+        BlockingBegin( stream, minimum_buffer_frames );
+
+        /* install our own callback for the blocking API */
+        streamCallback = BlockingCallback;
+        userData = stream;
+
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &jackHostApi->blockingStreamInterface, streamCallback, userData );
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &jackHostApi->callbackStreamInterface, streamCallback, userData );
+    }
+    srInitialized = 1;
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, jackSr );
+
+    /* create the JACK ports.  We cannot connect them until audio
+     * processing begins */
+
+    /* Register a unique set of ports for this stream
+     * TODO: Robust allocation of new port names */
+
+    ofs = jackHostApi->inputBase;
+    for( i = 0; i < inputChannelCount; i++ )
+    {
+        snprintf( port_string, jack_port_name_size(), "in_%lu", ofs + i );
+        UNLESS( stream->local_input_ports[i] = jack_port_register(
+              jackHostApi->jack_client, port_string,
+              JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0 ), paInsufficientMemory );
+    }
+    jackHostApi->inputBase += inputChannelCount;
+
+    ofs = jackHostApi->outputBase;
+    for( i = 0; i < outputChannelCount; i++ )
+    {
+        snprintf( port_string, jack_port_name_size(), "out_%lu", ofs + i );
+        UNLESS( stream->local_output_ports[i] = jack_port_register(
+             jackHostApi->jack_client, port_string,
+             JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ), paInsufficientMemory );
+    }
+    jackHostApi->outputBase += outputChannelCount;
+
+    /* look up the jack_port_t's for the remote ports.  We could do
+     * this at stream start time, but doing it here ensures the
+     * name lookup only happens once. */
+
+    if( inputChannelCount > 0 )
+    {
+        int err = 0;
+
+        /* Get output ports of our capture device */
+        snprintf( regex_pattern, regexSz, "%s:.*", hostApi->deviceInfos[ inputParameters->device ]->name );
+        UNLESS( jack_ports = jack_get_ports( jackHostApi->jack_client, regex_pattern,
+                                     NULL, JackPortIsOutput ), paUnanticipatedHostError );
+        for( i = 0; i < inputChannelCount && jack_ports[i]; i++ )
+        {
+            if( (stream->remote_output_ports[i] = jack_port_by_name(
+                 jackHostApi->jack_client, jack_ports[i] )) == NULL )
+            {
+                err = 1;
+                break;
+            }
+        }
+        free( jack_ports );
+        UNLESS( !err, paInsufficientMemory );
+
+        /* Fewer ports than expected? */
+        UNLESS( i == inputChannelCount, paInternalError );
+    }
+
+    if( outputChannelCount > 0 )
+    {
+        int err = 0;
+
+        /* Get input ports of our playback device */
+        snprintf( regex_pattern, regexSz, "%s:.*", hostApi->deviceInfos[ outputParameters->device ]->name );
+        UNLESS( jack_ports = jack_get_ports( jackHostApi->jack_client, regex_pattern,
+                                     NULL, JackPortIsInput ), paUnanticipatedHostError );
+        for( i = 0; i < outputChannelCount && jack_ports[i]; i++ )
+        {
+            if( (stream->remote_input_ports[i] = jack_port_by_name(
+                 jackHostApi->jack_client, jack_ports[i] )) == 0 )
+            {
+                err = 1;
+                break;
+            }
+        }
+        free( jack_ports );
+        UNLESS( !err , paInsufficientMemory );
+
+        /* Fewer ports than expected? */
+        UNLESS( i == outputChannelCount, paInternalError );
+    }
+
+    ENSURE_PA( PaUtil_InitializeBufferProcessor(
+                  &stream->bufferProcessor,
+                  inputChannelCount,
+                  inputSampleFormat,
+                  paFloat32 | paNonInterleaved, /* hostInputSampleFormat */
+                  outputChannelCount,
+                  outputSampleFormat,
+                  paFloat32 | paNonInterleaved, /* hostOutputSampleFormat */
+                  jackSr,
+                  streamFlags,
+                  framesPerBuffer,
+                  0,                            /* Ignored */
+                  paUtilUnknownHostBufferSize,  /* Buffer size may vary on JACK's discretion */
+                  streamCallback,
+                  userData ) );
+    bpInitialized = 1;
+
+    if( stream->num_incoming_connections > 0 )
+        stream->streamRepresentation.streamInfo.inputLatency = (jack_port_get_latency( stream->remote_output_ports[0] )
+                - jack_get_buffer_size( jackHostApi->jack_client )  /* One buffer is not counted as latency */
+            + PaUtil_GetBufferProcessorInputLatencyFrames( &stream->bufferProcessor )) / sampleRate;
+    if( stream->num_outgoing_connections > 0 )
+        stream->streamRepresentation.streamInfo.outputLatency = (jack_port_get_latency( stream->remote_input_ports[0] )
+                - jack_get_buffer_size( jackHostApi->jack_client )  /* One buffer is not counted as latency */
+            + PaUtil_GetBufferProcessorOutputLatencyFrames( &stream->bufferProcessor )) / sampleRate;
+
+    stream->streamRepresentation.streamInfo.sampleRate = jackSr;
+    stream->t0 = jack_frame_time( jackHostApi->jack_client );   /* A: Time should run from Pa_OpenStream */
+
+    /* Add to queue of opened streams */
+    ENSURE_PA( AddStream( stream ) );
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    if( stream )
+        CleanUpStream( stream, srInitialized, bpInitialized );
+
+    return result;
+}
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaJackStream *stream = (PaJackStream*)s;
+
+    /* Remove this stream from the processing queue */
+    ENSURE_PA( RemoveStream( stream ) );
+
+error:
+    CleanUpStream( stream, 1, 1 );
+    return result;
+}
+
+static PaError RealProcess( PaJackStream *stream, jack_nframes_t frames )
+{
+    PaError result = paNoError;
+    PaStreamCallbackTimeInfo timeInfo = {0,0,0};
+    int chn;
+    int framesProcessed;
+    const double sr = jack_get_sample_rate( stream->jack_client );    /* Shouldn't change during the process callback */
+    PaStreamCallbackFlags cbFlags = 0;
+
+    /* If the user has returned !paContinue from the callback we'll want to flush the internal buffers,
+     * when these are empty we can finally mark the stream as inactive */
+    if( stream->callbackResult != paContinue &&
+            PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
+    {
+        stream->is_active = 0;
+        if( stream->streamRepresentation.streamFinishedCallback )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+        PA_DEBUG(( "%s: Callback finished\n", __FUNCTION__ ));
+
+        goto end;
+    }
+
+    timeInfo.currentTime = (jack_frame_time( stream->jack_client ) - stream->t0) / sr;
+    if( stream->num_incoming_connections > 0 )
+        timeInfo.inputBufferAdcTime = timeInfo.currentTime - jack_port_get_latency( stream->remote_output_ports[0] )
+            / sr;
+    if( stream->num_outgoing_connections > 0 )
+        timeInfo.outputBufferDacTime = timeInfo.currentTime + jack_port_get_latency( stream->remote_input_ports[0] )
+            / sr;
+
+    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+    if( stream->xrun )
+    {
+        /* XXX: Any way to tell which of these occurred? */
+        cbFlags = paOutputUnderflow | paInputOverflow;
+        stream->xrun = FALSE;
+    }
+    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo,
+            cbFlags );
+
+    if( stream->num_incoming_connections > 0 )
+        PaUtil_SetInputFrameCount( &stream->bufferProcessor, frames );
+    if( stream->num_outgoing_connections > 0 )
+        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, frames );
+
+    for( chn = 0; chn < stream->num_incoming_connections; chn++ )
+    {
+        jack_default_audio_sample_t *channel_buf = (jack_default_audio_sample_t*)
+            jack_port_get_buffer( stream->local_input_ports[chn],
+                    frames );
+
+        PaUtil_SetNonInterleavedInputChannel( &stream->bufferProcessor,
+                chn,
+                channel_buf );
+    }
+
+    for( chn = 0; chn < stream->num_outgoing_connections; chn++ )
+    {
+        jack_default_audio_sample_t *channel_buf = (jack_default_audio_sample_t*)
+            jack_port_get_buffer( stream->local_output_ports[chn],
+                    frames );
+
+        PaUtil_SetNonInterleavedOutputChannel( &stream->bufferProcessor,
+                chn,
+                channel_buf );
+    }
+
+    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor,
+            &stream->callbackResult );
+    /* We've specified a host buffer size mode where every frame should be consumed by the buffer processor */
+    assert( framesProcessed == frames );
+
+    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+
+end:
+    return result;
+}
+
+/* Update the JACK callback's stream processing queue. */
+static PaError UpdateQueue( PaJackHostApiRepresentation *hostApi )
+{
+    PaError result = paNoError;
+    int queueModified = 0;
+    const double jackSr = jack_get_sample_rate( hostApi->jack_client );
+    int err;
+
+    if( (err = pthread_mutex_trylock( &hostApi->mtx )) != 0 )
+    {
+        assert( err == EBUSY );
+        return paNoError;
+    }
+
+    if( hostApi->toAdd )
+    {
+        if( hostApi->processQueue )
+        {
+            PaJackStream *node = hostApi->processQueue;
+            /* Advance to end of queue */
+            while( node->next )
+                node = node->next;
+
+            node->next = hostApi->toAdd;
+        }
+        else
+        {
+            /* The only queue entry. */
+            hostApi->processQueue = (PaJackStream *)hostApi->toAdd;
+        }
+
+        /* If necessary, update stream state */
+        if( hostApi->toAdd->streamRepresentation.streamInfo.sampleRate != jackSr )
+            UpdateSampleRate( hostApi->toAdd, jackSr );
+
+        hostApi->toAdd = NULL;
+        queueModified = 1;
+    }
+    if( hostApi->toRemove )
+    {
+        int removed = 0;
+        PaJackStream *node = hostApi->processQueue, *prev = NULL;
+        assert( hostApi->processQueue );
+
+        while( node )
+        {
+            if( node == hostApi->toRemove )
+            {
+                if( prev )
+                    prev->next = node->next;
+                else
+                    hostApi->processQueue = (PaJackStream *)node->next;
+
+                removed = 1;
+                break;
+            }
+
+            prev = node;
+            node = node->next;
+        }
+        UNLESS( removed, paInternalError );
+        hostApi->toRemove = NULL;
+        PA_DEBUG(( "%s: Removed stream from processing queue\n", __FUNCTION__ ));
+        queueModified = 1;
+    }
+
+    if( queueModified )
+    {
+        /* Signal that we've done what was asked of us */
+        ASSERT_CALL( pthread_cond_signal( &hostApi->cond ), 0 );
+    }
+
+error:
+    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
+
+    return result;
+}
+
+/* Audio processing callback invoked periodically from JACK. */
+static int JackCallback( jack_nframes_t frames, void *userData )
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation *hostApi = (PaJackHostApiRepresentation *)userData;
+    PaJackStream *stream = NULL;
+    int xrun = hostApi->xrun;
+    hostApi->xrun = 0;
+
+    assert( hostApi );
+
+    ENSURE_PA( UpdateQueue( hostApi ) );
+
+    /* Process each stream */
+    stream = hostApi->processQueue;
+    for( ; stream; stream = stream->next )
+    {
+        if( xrun )  /* Don't override if already set */
+            stream->xrun = 1;
+
+        /* See if this stream is to be started */
+        if( stream->doStart )
+        {
+            /* If we can't obtain a lock, we'll try next time */
+            int err = pthread_mutex_trylock( &stream->hostApi->mtx );
+            if( !err )
+            {
+                if( stream->doStart )   /* Could potentially change before obtaining the lock */
+                {
+                    stream->is_active = 1;
+                    stream->doStart = 0;
+                    PA_DEBUG(( "%s: Starting stream\n", __FUNCTION__ ));
+                    ASSERT_CALL( pthread_cond_signal( &stream->hostApi->cond ), 0 );
+                    stream->callbackResult = paContinue;
+                    stream->isSilenced = 0;
+                }
+
+                ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
+            }
+            else
+                assert( err == EBUSY );
+        }
+        else if( stream->doStop || stream->doAbort )    /* Should we stop/abort stream? */
+        {
+            if( stream->callbackResult == paContinue )     /* Ok, make it stop */
+            {
+                PA_DEBUG(( "%s: Stopping stream\n", __FUNCTION__ ));
+                stream->callbackResult = stream->doStop ? paComplete : paAbort;
+            }
+        }
+
+        if( stream->is_active )
+            ENSURE_PA( RealProcess( stream, frames ) );
+        /* If we have just entered inactive state, silence output */
+        if( !stream->is_active && !stream->isSilenced )
+        {
+            int i;
+
+            /* Silence buffer after entering inactive state */
+            PA_DEBUG(( "Silencing the output\n" ));
+            for( i = 0; i < stream->num_outgoing_connections; ++i )
+            {
+                jack_default_audio_sample_t *buffer = jack_port_get_buffer( stream->local_output_ports[i], frames );
+                memset( buffer, 0, sizeof (jack_default_audio_sample_t) * frames );
+            }
+
+            stream->isSilenced = 1;
+        }
+
+        if( stream->doStop || stream->doAbort )
+        {
+            /* See if RealProcess has acted on the request */
+            if( !stream->is_active )   /* Ok, signal to the main thread that we've carried out the operation */
+            {
+                /* If we can't obtain a lock, we'll try next time */
+                int err = pthread_mutex_trylock( &stream->hostApi->mtx );
+                if( !err )
+                {
+                    stream->doStop = stream->doAbort = 0;
+                    ASSERT_CALL( pthread_cond_signal( &stream->hostApi->cond ), 0 );
+                    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
+                }
+                else
+                    assert( err == EBUSY );
+            }
+        }
+    }
+
+    return 0;
+error:
+    return -1;
+}
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaJackStream *stream = (PaJackStream*)s;
+    int i;
+
+    /* Ready the processor */
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+
+    /* Connect the ports. Note that the ports may already have been connected by someone else in
+     * the meantime, in which case JACK returns EEXIST. */
+
+    if( stream->num_incoming_connections > 0 )
+    {
+        for( i = 0; i < stream->num_incoming_connections; i++ )
+        {
+            int r = jack_connect( stream->jack_client, jack_port_name( stream->remote_output_ports[i] ),
+                    jack_port_name( stream->local_input_ports[i] ) );
+           UNLESS( 0 == r || EEXIST == r, paUnanticipatedHostError );
+        }
+    }
+
+    if( stream->num_outgoing_connections > 0 )
+    {
+        for( i = 0; i < stream->num_outgoing_connections; i++ )
+        {
+            int r = jack_connect( stream->jack_client, jack_port_name( stream->local_output_ports[i] ),
+                    jack_port_name( stream->remote_input_ports[i] ) );
+           UNLESS( 0 == r || EEXIST == r, paUnanticipatedHostError );
+        }
+    }
+
+    stream->xrun = FALSE;
+
+    /* Enable processing */
+
+    ASSERT_CALL( pthread_mutex_lock( &stream->hostApi->mtx ), 0 );
+    stream->doStart = 1;
+
+    /* Wait for stream to be started */
+    result = WaitCondition( stream->hostApi );
+    /*
+    do
+    {
+        err = pthread_cond_timedwait( &stream->hostApi->cond, &stream->hostApi->mtx, &ts );
+    } while( !stream->is_active && !err );
+    */
+    if( result != paNoError )   /* Something went wrong, call off the stream start */
+    {
+        stream->doStart = 0;
+        stream->is_active = 0;  /* Cancel any processing */
+    }
+    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
+
+    ENSURE_PA( result );
+
+    stream->is_running = TRUE;
+    PA_DEBUG(( "%s: Stream started\n", __FUNCTION__ ));
+
+error:
+    return result;
+}
+
+static PaError RealStop( PaJackStream *stream, int abort )
+{
+    PaError result = paNoError;
+    int i;
+
+    if( stream->isBlockingStream )
+        BlockingWaitEmpty ( stream );
+
+    ASSERT_CALL( pthread_mutex_lock( &stream->hostApi->mtx ), 0 );
+    if( abort )
+        stream->doAbort = 1;
+    else
+        stream->doStop = 1;
+
+    /* Wait for stream to be stopped */
+    result = WaitCondition( stream->hostApi );
+    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
+    ENSURE_PA( result );
+
+    UNLESS( !stream->is_active, paInternalError );
+
+    PA_DEBUG(( "%s: Stream stopped\n", __FUNCTION__ ));
+
+error:
+    stream->is_running = FALSE;
+
+    /* Disconnect ports belonging to this stream */
+
+    if( !stream->hostApi->jackIsDown )  /* XXX: Well? */
+    {
+        for( i = 0; i < stream->num_incoming_connections; i++ )
+        {
+            if( jack_port_connected( stream->local_input_ports[i] ) )
+            {
+                UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ),
+                        paUnanticipatedHostError );
+            }
+        }
+        for( i = 0; i < stream->num_outgoing_connections; i++ )
+        {
+            if( jack_port_connected( stream->local_output_ports[i] ) )
+            {
+                UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ),
+                        paUnanticipatedHostError );
+            }
+        }
+    }
+
+    return result;
+}
+
+static PaError StopStream( PaStream *s )
+{
+    assert(s);
+    return RealStop( (PaJackStream *)s, 0 );
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    assert(s);
+    return RealStop( (PaJackStream *)s, 1 );
+}
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaJackStream *stream = (PaJackStream*)s;
+    return !stream->is_running;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaJackStream *stream = (PaJackStream*)s;
+    return stream->is_active;
+}
+
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    PaJackStream *stream = (PaJackStream*)s;
+
+    /* A: Is this relevant?? --> TODO: what if we're recording-only? */
+    return (jack_frame_time( stream->jack_client ) - stream->t0) / (PaTime)jack_get_sample_rate( stream->jack_client );
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaJackStream *stream = (PaJackStream*)s;
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+PaError PaJack_SetClientName( const char* name )
+{
+    if( strlen( name ) > jack_client_name_size() )
+    {
+        /* OK, I don't know any better error code */
+        return paInvalidFlag;
+    }
+    clientName_ = name;
+    return paNoError;
+}
+
+PaError PaJack_GetClientName(const char** clientName)
+{
+    PaError result = paNoError;
+    PaJackHostApiRepresentation* jackHostApi = NULL;
+    PaJackHostApiRepresentation** ref = &jackHostApi;
+    ENSURE_PA( PaUtil_GetHostApiRepresentation( (PaUtilHostApiRepresentation**)ref, paJACK ) );
+    *clientName = jack_get_client_name( jackHostApi->jack_client );
+
+error:
+    return result;
+}
diff --git a/Externals/portaudio/src/hostapi/oss/low_latency_tip.txt b/Externals/portaudio/src/hostapi/oss/low_latency_tip.txt
new file mode 100644
index 0000000000..2d982b79ba
Binary files /dev/null and b/Externals/portaudio/src/hostapi/oss/low_latency_tip.txt differ
diff --git a/Externals/portaudio/src/hostapi/oss/pa_unix_oss.c b/Externals/portaudio/src/hostapi/oss/pa_unix_oss.c
new file mode 100644
index 0000000000..b91577beeb
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/oss/pa_unix_oss.c
@@ -0,0 +1,2030 @@
+/*
+ * $Id: pa_unix_oss.c 1668 2011-05-02 17:07:11Z rossb $
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ * OSS implementation by:
+ *   Douglas Repetto
+ *   Phil Burk
+ *   Dominic Mazzoni
+ *   Arve Knudsen
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/poll.h>
+#include <limits.h>
+#include <semaphore.h>
+
+#ifdef HAVE_SYS_SOUNDCARD_H
+# include <sys/soundcard.h>
+# ifdef __NetBSD__
+#  define DEVICE_NAME_BASE           "/dev/audio"
+# else
+#  define DEVICE_NAME_BASE           "/dev/dsp"
+# endif
+#elif defined(HAVE_LINUX_SOUNDCARD_H)
+# include <linux/soundcard.h>
+# define DEVICE_NAME_BASE            "/dev/dsp"
+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
+# include <machine/soundcard.h> /* JH20010905 */
+# define DEVICE_NAME_BASE            "/dev/audio"
+#else
+# error No sound card header file
+#endif
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_unix_util.h"
+#include "pa_debugprint.h"
+
+static int sysErr_;
+static pthread_t mainThread_;
+
+/* Check return value of system call, and map it to PaError */
+#define ENSURE_(expr, code) \
+    do { \
+        if( UNLIKELY( (sysErr_ = (expr)) < 0 ) ) \
+        { \
+            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
+            if( (code) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
+            { \
+                PaUtil_SetLastHostErrorInfo( paOSS, sysErr_, strerror( errno ) ); \
+            } \
+            \
+            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = (code); \
+            goto error; \
+        } \
+    } while( 0 );
+
+#ifndef AFMT_S16_NE
+#define AFMT_S16_NE  Get_AFMT_S16_NE()
+/*********************************************************************
+ * Some versions of OSS do not define AFMT_S16_NE. So check CPU.
+ * PowerPC is Big Endian. X86 is Little Endian.
+ */
+static int Get_AFMT_S16_NE( void )
+{
+    long testData = 1;
+    char *ptr = (char *) &testData;
+    int isLittle = ( *ptr == 1 ); /* Does address point to least significant byte? */
+    return isLittle ? AFMT_S16_LE : AFMT_S16_BE;
+}
+#endif
+
+/* PaOSSHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    PaHostApiIndex hostApiIndex;
+}
+PaOSSHostApiRepresentation;
+
+/** Per-direction structure for PaOssStream.
+ *
+ * Aspect StreamChannels: In case the user requests to open the same device for both capture and playback,
+ * but with different number of channels we will have to adapt between the number of user and host
+ * channels for at least one direction, since the configuration space is the same for both directions
+ * of an OSS device.
+ */
+typedef struct
+{
+    int fd;
+    const char *devName;
+    int userChannelCount, hostChannelCount;
+    int userInterleaved;
+    void *buffer;
+    PaSampleFormat userFormat, hostFormat;
+    double latency;
+    unsigned long hostFrames, numBufs;
+    void **userBuffers; /* For non-interleaved blocking */
+} PaOssStreamComponent;
+
+/** Implementation specific representation of a PaStream.
+ *
+ */
+typedef struct PaOssStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    PaUtilThreading threading;
+
+    int sharedDevice;
+    unsigned long framesPerHostBuffer;
+    int triggered;  /* Have the devices been triggered yet (first start) */
+
+    int isActive;
+    int isStopped;
+
+    int lastPosPtr;
+    double lastStreamBytes;
+
+    int framesProcessed;
+
+    double sampleRate;
+
+    int callbackMode;
+    volatile int callbackStop, callbackAbort;
+
+    PaOssStreamComponent *capture, *playback;
+    unsigned long pollTimeout;
+    sem_t semaphore;
+}
+PaOssStream;
+
+typedef enum {
+    StreamMode_In,
+    StreamMode_Out
+} StreamMode;
+
+/* prototypes for functions declared in this file */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+static PaError BuildDeviceList( PaOSSHostApiRepresentation *hostApi );
+
+
+/** Initialize the OSS API implementation.
+ *
+ * This function will initialize host API datastructures and query host devices for information.
+ *
+ * Aspect DeviceCapabilities: Enumeration of host API devices is initiated from here
+ *
+ * Aspect FreeResources: If an error is encountered under way we have to free each resource allocated in this function,
+ * this happens with the usual "error" label.
+ */
+PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaOSSHostApiRepresentation *ossHostApi = NULL;
+
+    PA_UNLESS( ossHostApi = (PaOSSHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaOSSHostApiRepresentation) ),
+            paInsufficientMemory );
+    PA_UNLESS( ossHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
+    ossHostApi->hostApiIndex = hostApiIndex;
+
+    /* Initialize host API structure */
+    *hostApi = &ossHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paOSS;
+    (*hostApi)->info.name = "OSS";
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PA_ENSURE( BuildDeviceList( ossHostApi ) );
+
+    PaUtil_InitializeStreamInterface( &ossHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable,
+                                      PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &ossHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    mainThread_ = pthread_self();
+
+    return result;
+
+error:
+    if( ossHostApi )
+    {
+        if( ossHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( ossHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( ossHostApi->allocations );
+        }
+
+        PaUtil_FreeMemory( ossHostApi );
+    }
+    return result;
+}
+
+PaError PaUtil_InitializeDeviceInfo( PaDeviceInfo *deviceInfo, const char *name, PaHostApiIndex hostApiIndex, int maxInputChannels,
+        int maxOutputChannels, PaTime defaultLowInputLatency, PaTime defaultLowOutputLatency, PaTime defaultHighInputLatency,
+        PaTime defaultHighOutputLatency, double defaultSampleRate, PaUtilAllocationGroup *allocations  )
+{
+    PaError result = paNoError;
+
+    deviceInfo->structVersion = 2;
+    if( allocations )
+    {
+        size_t len = strlen( name ) + 1;
+        PA_UNLESS( deviceInfo->name = PaUtil_GroupAllocateMemory( allocations, len ), paInsufficientMemory );
+        strncpy( (char *)deviceInfo->name, name, len );
+    }
+    else
+        deviceInfo->name = name;
+
+    deviceInfo->hostApi = hostApiIndex;
+    deviceInfo->maxInputChannels = maxInputChannels;
+    deviceInfo->maxOutputChannels = maxOutputChannels;
+    deviceInfo->defaultLowInputLatency = defaultLowInputLatency;
+    deviceInfo->defaultLowOutputLatency = defaultLowOutputLatency;
+    deviceInfo->defaultHighInputLatency = defaultHighInputLatency;
+    deviceInfo->defaultHighOutputLatency = defaultHighOutputLatency;
+    deviceInfo->defaultSampleRate = defaultSampleRate;
+
+error:
+    return result;
+}
+
+static PaError QueryDirection( const char *deviceName, StreamMode mode, double *defaultSampleRate, int *maxChannelCount,
+        double *defaultLowLatency, double *defaultHighLatency )
+{
+    PaError result = paNoError;
+    int numChannels, maxNumChannels;
+    int busy = 0;
+    int devHandle = -1;
+    int sr;
+    *maxChannelCount = 0;  /* Default value in case this fails */
+
+    if ( (devHandle = open( deviceName, (mode == StreamMode_In ? O_RDONLY : O_WRONLY) | O_NONBLOCK ))  < 0 )
+    {
+        if( errno == EBUSY || errno == EAGAIN )
+        {
+            PA_DEBUG(( "%s: Device %s busy\n", __FUNCTION__, deviceName ));
+        }
+        else
+        {
+            /* Ignore ENOENT, which means we've tried a non-existent device */
+            if( errno != ENOENT )
+            {
+                PA_DEBUG(( "%s: Can't access device %s: %s\n", __FUNCTION__, deviceName, strerror( errno ) ));
+            }
+        }
+
+        return paDeviceUnavailable;
+    }
+
+    /* Negotiate for the maximum number of channels for this device. PLB20010927
+     * Consider up to 16 as the upper number of channels.
+     * Variable maxNumChannels should contain the actual upper limit after the call.
+     * Thanks to John Lazzaro and Heiko Purnhagen for suggestions.
+     */
+    maxNumChannels = 0;
+    for( numChannels = 1; numChannels <= 16; numChannels++ )
+    {
+        int temp = numChannels;
+        if( ioctl( devHandle, SNDCTL_DSP_CHANNELS, &temp ) < 0 )
+        {
+            busy = EAGAIN == errno || EBUSY == errno;
+            /* ioctl() failed so bail out if we already have stereo */
+            if( maxNumChannels >= 2 )
+                break;
+        }
+        else
+        {
+            /* ioctl() worked but bail out if it does not support numChannels.
+             * We don't want to leave gaps in the numChannels supported.
+             */
+            if( (numChannels > 2) && (temp != numChannels) )
+                break;
+            if( temp > maxNumChannels )
+                maxNumChannels = temp; /* Save maximum. */
+        }
+    }
+    /* A: We're able to open a device for capture if it's busy playing back and vice versa,
+     * but we can't configure anything */
+    if( 0 == maxNumChannels && busy )
+    {
+        result = paDeviceUnavailable;
+        goto error;
+    }
+
+    /* The above negotiation may fail for an old driver so try this older technique. */
+    if( maxNumChannels < 1 )
+    {
+        int stereo = 1;
+        if( ioctl( devHandle, SNDCTL_DSP_STEREO, &stereo ) < 0 )
+        {
+            maxNumChannels = 1;
+        }
+        else
+        {
+            maxNumChannels = (stereo) ? 2 : 1;
+        }
+        PA_DEBUG(( "%s: use SNDCTL_DSP_STEREO, maxNumChannels = %d\n", __FUNCTION__, maxNumChannels ));
+    }
+
+    /* During channel negotiation, the last ioctl() may have failed. This can
+     * also cause sample rate negotiation to fail. Hence the following, to return
+     * to a supported number of channels. SG20011005 */
+    {
+        /* use most reasonable default value */
+        int temp = PA_MIN( maxNumChannels, 2 );
+        ENSURE_( ioctl( devHandle, SNDCTL_DSP_CHANNELS, &temp ), paUnanticipatedHostError );
+    }
+
+    /* Get supported sample rate closest to 44100 Hz */
+    if( *defaultSampleRate < 0 )
+    {
+        sr = 44100;
+        ENSURE_( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ), paUnanticipatedHostError );
+
+        *defaultSampleRate = sr;
+    }
+
+    *maxChannelCount = maxNumChannels;
+    /* TODO */
+    *defaultLowLatency = 512. / *defaultSampleRate;
+    *defaultHighLatency = 2048. / *defaultSampleRate;
+
+error:
+    if( devHandle >= 0 )
+        close( devHandle );
+
+    return result;
+}
+
+/** Query OSS device.
+ *
+ * This is where PaDeviceInfo objects are constructed and filled in with relevant information.
+ *
+ * Aspect DeviceCapabilities: The inferred device capabilities are recorded in a PaDeviceInfo object that is constructed
+ * in place.
+ */
+static PaError QueryDevice( char *deviceName, PaOSSHostApiRepresentation *ossApi, PaDeviceInfo **deviceInfo )
+{
+    PaError result = paNoError;
+    double sampleRate = -1.;
+    int maxInputChannels, maxOutputChannels;
+    PaTime defaultLowInputLatency, defaultLowOutputLatency, defaultHighInputLatency, defaultHighOutputLatency;
+    PaError tmpRes = paNoError;
+    int busy = 0;
+    *deviceInfo = NULL;
+
+    /* douglas:
+       we have to do this querying in a slightly different order. apparently
+       some sound cards will give you different info based on their settins.
+       e.g. a card might give you stereo at 22kHz but only mono at 44kHz.
+       the correct order for OSS is: format, channels, sample rate
+    */
+
+    /* Aspect StreamChannels: The number of channels supported for a device may depend on the mode it is
+     * opened in, it may have more channels available for capture than playback and vice versa. Therefore
+     * we will open the device in both read- and write-only mode to determine the supported number.
+     */
+    if( (tmpRes = QueryDirection( deviceName, StreamMode_In, &sampleRate, &maxInputChannels, &defaultLowInputLatency,
+                &defaultHighInputLatency )) != paNoError )
+    {
+        if( tmpRes != paDeviceUnavailable )
+        {
+            PA_DEBUG(( "%s: Querying device %s for capture failed!\n", __FUNCTION__, deviceName ));
+            /* PA_ENSURE( tmpRes ); */
+        }
+        ++busy;
+    }
+    if( (tmpRes = QueryDirection( deviceName, StreamMode_Out, &sampleRate, &maxOutputChannels, &defaultLowOutputLatency,
+                &defaultHighOutputLatency )) != paNoError )
+    {
+        if( tmpRes != paDeviceUnavailable )
+        {
+            PA_DEBUG(( "%s: Querying device %s for playback failed!\n", __FUNCTION__, deviceName ));
+            /* PA_ENSURE( tmpRes ); */
+        }
+        ++busy;
+    }
+    assert( 0 <= busy && busy <= 2 );
+    if( 2 == busy )     /* Both directions are unavailable to us */
+    {
+        result = paDeviceUnavailable;
+        goto error;
+    }
+
+    PA_UNLESS( *deviceInfo = PaUtil_GroupAllocateMemory( ossApi->allocations, sizeof (PaDeviceInfo) ), paInsufficientMemory );
+    PA_ENSURE( PaUtil_InitializeDeviceInfo( *deviceInfo, deviceName, ossApi->hostApiIndex, maxInputChannels, maxOutputChannels,
+                defaultLowInputLatency, defaultLowOutputLatency, defaultHighInputLatency, defaultHighOutputLatency, sampleRate,
+                ossApi->allocations ) );
+
+error:
+    return result;
+}
+
+/** Query host devices.
+ *
+ * Loop over host devices and query their capabilitiesu
+ *
+ * Aspect DeviceCapabilities: This function calls QueryDevice on each device entry and receives a filled in PaDeviceInfo object
+ * per device, these are placed in the host api representation's deviceInfos array.
+ */
+static PaError BuildDeviceList( PaOSSHostApiRepresentation *ossApi )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation *commonApi = &ossApi->inheritedHostApiRep;
+    int i;
+    int numDevices = 0, maxDeviceInfos = 1;
+    PaDeviceInfo **deviceInfos = NULL;
+
+    /* These two will be set to the first working input and output device, respectively */
+    commonApi->info.defaultInputDevice = paNoDevice;
+    commonApi->info.defaultOutputDevice = paNoDevice;
+
+    /* Find devices by calling QueryDevice on each
+     * potential device names.  When we find a valid one,
+     * add it to a linked list.
+     * A: Set an arbitrary of 100 devices, should probably be a smarter way. */
+
+    for( i = 0; i < 100; i++ )
+    {
+       char deviceName[32];
+       PaDeviceInfo *deviceInfo;
+       int testResult;
+
+       if( i == 0 )
+          snprintf(deviceName, sizeof (deviceName), "%s", DEVICE_NAME_BASE);
+       else
+          snprintf(deviceName, sizeof (deviceName), "%s%d", DEVICE_NAME_BASE, i);
+
+       /* PA_DEBUG(("%s: trying device %s\n", __FUNCTION__, deviceName )); */
+       if( (testResult = QueryDevice( deviceName, ossApi, &deviceInfo )) != paNoError )
+       {
+           if( testResult != paDeviceUnavailable )
+               PA_ENSURE( testResult );
+
+           continue;
+       }
+
+       ++numDevices;
+       if( !deviceInfos || numDevices > maxDeviceInfos )
+       {
+           maxDeviceInfos *= 2;
+           PA_UNLESS( deviceInfos = (PaDeviceInfo **) realloc( deviceInfos, maxDeviceInfos * sizeof (PaDeviceInfo *) ),
+                   paInsufficientMemory );
+       }
+       {
+           int devIdx = numDevices - 1;
+           deviceInfos[devIdx] = deviceInfo;
+
+           if( commonApi->info.defaultInputDevice == paNoDevice && deviceInfo->maxInputChannels > 0 )
+               commonApi->info.defaultInputDevice = devIdx;
+           if( commonApi->info.defaultOutputDevice == paNoDevice && deviceInfo->maxOutputChannels > 0 )
+               commonApi->info.defaultOutputDevice = devIdx;
+       }
+    }
+
+    /* Make an array of PaDeviceInfo pointers out of the linked list */
+
+    PA_DEBUG(("PaOSS %s: Total number of devices found: %d\n", __FUNCTION__, numDevices));
+
+    commonApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+        ossApi->allocations, sizeof(PaDeviceInfo*) * numDevices );
+    memcpy( commonApi->deviceInfos, deviceInfos, numDevices * sizeof (PaDeviceInfo *) );
+
+    commonApi->info.deviceCount = numDevices;
+
+error:
+    free( deviceInfos );
+
+    return result;
+}
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaOSSHostApiRepresentation *ossHostApi = (PaOSSHostApiRepresentation*)hostApi;
+
+    if( ossHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( ossHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( ossHostApi->allocations );
+    }
+
+    PaUtil_FreeMemory( ossHostApi );
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaError result = paNoError;
+    PaDeviceIndex device;
+    PaDeviceInfo *deviceInfo;
+    char *deviceName;
+    int inputChannelCount, outputChannelCount;
+    int tempDevHandle = -1;
+    int flags;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+
+    if (inputChannelCount == 0 && outputChannelCount == 0)
+        return paInvalidChannelCount;
+
+    /* if full duplex, make sure that they're the same device */
+
+    if (inputChannelCount > 0 && outputChannelCount > 0 &&
+        inputParameters->device != outputParameters->device)
+        return paInvalidDevice;
+
+    /* if full duplex, also make sure that they're the same number of channels */
+
+    if (inputChannelCount > 0 && outputChannelCount > 0 &&
+        inputChannelCount != outputChannelCount)
+       return paInvalidChannelCount;
+
+    /* open the device so we can do more tests */
+
+    if( inputChannelCount > 0 )
+    {
+        result = PaUtil_DeviceIndexToHostApiDeviceIndex(&device, inputParameters->device, hostApi);
+        if (result != paNoError)
+            return result;
+    }
+    else
+    {
+        result = PaUtil_DeviceIndexToHostApiDeviceIndex(&device, outputParameters->device, hostApi);
+        if (result != paNoError)
+            return result;
+    }
+
+    deviceInfo = hostApi->deviceInfos[device];
+    deviceName = (char *)deviceInfo->name;
+
+    flags = O_NONBLOCK;
+    if (inputChannelCount > 0 && outputChannelCount > 0)
+       flags |= O_RDWR;
+    else if (inputChannelCount > 0)
+       flags |= O_RDONLY;
+    else
+       flags |= O_WRONLY;
+
+    ENSURE_( tempDevHandle = open( deviceInfo->name, flags ), paDeviceUnavailable );
+
+    /* PaOssStream_Configure will do the rest of the checking for us */
+    /* PA_ENSURE( PaOssStream_Configure( tempDevHandle, deviceName, outputChannelCount, &sampleRate ) ); */
+
+    /* everything succeeded! */
+
+ error:
+    if( tempDevHandle >= 0 )
+        close( tempDevHandle );
+
+    return result;
+}
+
+/** Validate stream parameters.
+ *
+ * Aspect StreamChannels: We verify that the number of channels is within the allowed range for the device
+ */
+static PaError ValidateParameters( const PaStreamParameters *parameters, const PaDeviceInfo *deviceInfo, StreamMode mode )
+{
+    int maxChans;
+
+    assert( parameters );
+
+    if( parameters->device == paUseHostApiSpecificDeviceSpecification )
+    {
+        return paInvalidDevice;
+    }
+
+    maxChans = (mode == StreamMode_In ? deviceInfo->maxInputChannels :
+        deviceInfo->maxOutputChannels);
+    if( parameters->channelCount > maxChans )
+    {
+        return paInvalidChannelCount;
+    }
+
+    return paNoError;
+}
+
+static PaError PaOssStreamComponent_Initialize( PaOssStreamComponent *component, const PaStreamParameters *parameters,
+        int callbackMode, int fd, const char *deviceName )
+{
+    PaError result = paNoError;
+    assert( component );
+
+    memset( component, 0, sizeof (PaOssStreamComponent) );
+
+    component->fd = fd;
+    component->devName = deviceName;
+    component->userChannelCount = parameters->channelCount;
+    component->userFormat = parameters->sampleFormat;
+    component->latency = parameters->suggestedLatency;
+    component->userInterleaved = !(parameters->sampleFormat & paNonInterleaved);
+
+    if( !callbackMode && !component->userInterleaved )
+    {
+        /* Pre-allocate non-interleaved user provided buffers */
+        PA_UNLESS( component->userBuffers = PaUtil_AllocateMemory( sizeof (void *) * component->userChannelCount ),
+                paInsufficientMemory );
+    }
+
+error:
+    return result;
+}
+
+static void PaOssStreamComponent_Terminate( PaOssStreamComponent *component )
+{
+    assert( component );
+
+    if( component->fd >= 0 )
+        close( component->fd );
+    if( component->buffer )
+        PaUtil_FreeMemory( component->buffer );
+
+    if( component->userBuffers )
+        PaUtil_FreeMemory( component->userBuffers );
+
+    PaUtil_FreeMemory( component );
+}
+
+static PaError ModifyBlocking( int fd, int blocking )
+{
+    PaError result = paNoError;
+    int fflags;
+
+    ENSURE_( fflags = fcntl( fd, F_GETFL ), paUnanticipatedHostError );
+
+    if( blocking )
+        fflags &= ~O_NONBLOCK;
+    else
+        fflags |= O_NONBLOCK;
+
+    ENSURE_( fcntl( fd, F_SETFL, fflags ), paUnanticipatedHostError );
+
+error:
+    return result;
+}
+
+/** Open input and output devices.
+ *
+ * @param idev: Returned input device file descriptor.
+ * @param odev: Returned output device file descriptor.
+ */
+static PaError OpenDevices( const char *idevName, const char *odevName, int *idev, int *odev )
+{
+    PaError result = paNoError;
+    int flags = O_NONBLOCK, duplex = 0;
+    *idev = *odev = -1;
+
+    if( idevName && odevName )
+    {
+        duplex = 1;
+        flags |= O_RDWR;
+    }
+    else if( idevName )
+        flags |= O_RDONLY;
+    else
+        flags |= O_WRONLY;
+
+    /* open first in nonblocking mode, in case it's busy...
+     * A: then unset the non-blocking attribute */
+    assert( flags & O_NONBLOCK );
+    if( idevName )
+    {
+        ENSURE_( *idev = open( idevName, flags ), paDeviceUnavailable );
+        PA_ENSURE( ModifyBlocking( *idev, 1 ) ); /* Blocking */
+    }
+    if( odevName )
+    {
+        if( !idevName )
+        {
+            ENSURE_( *odev = open( odevName, flags ), paDeviceUnavailable );
+            PA_ENSURE( ModifyBlocking( *odev, 1 ) ); /* Blocking */
+        }
+        else
+        {
+            ENSURE_( *odev = dup( *idev ), paUnanticipatedHostError );
+        }
+    }
+
+error:
+    return result;
+}
+
+static PaError PaOssStream_Initialize( PaOssStream *stream, const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters,
+        PaStreamCallback callback, void *userData, PaStreamFlags streamFlags,
+        PaOSSHostApiRepresentation *ossApi )
+{
+    PaError result = paNoError;
+    int idev, odev;
+    PaUtilHostApiRepresentation *hostApi = &ossApi->inheritedHostApiRep;
+    const char *idevName = NULL, *odevName = NULL;
+
+    assert( stream );
+
+    memset( stream, 0, sizeof (PaOssStream) );
+    stream->isStopped = 1;
+
+    PA_ENSURE( PaUtil_InitializeThreading( &stream->threading ) );
+
+    if( inputParameters && outputParameters )
+    {
+        if( inputParameters->device == outputParameters->device )
+            stream->sharedDevice = 1;
+    }
+
+    if( inputParameters )
+        idevName = hostApi->deviceInfos[inputParameters->device]->name;
+    if( outputParameters )
+        odevName = hostApi->deviceInfos[outputParameters->device]->name;
+    PA_ENSURE( OpenDevices( idevName, odevName, &idev, &odev ) );
+    if( inputParameters )
+    {
+        PA_UNLESS( stream->capture = PaUtil_AllocateMemory( sizeof (PaOssStreamComponent) ), paInsufficientMemory );
+        PA_ENSURE( PaOssStreamComponent_Initialize( stream->capture, inputParameters, callback != NULL, idev, idevName ) );
+    }
+    if( outputParameters )
+    {
+        PA_UNLESS( stream->playback = PaUtil_AllocateMemory( sizeof (PaOssStreamComponent) ), paInsufficientMemory );
+        PA_ENSURE( PaOssStreamComponent_Initialize( stream->playback, outputParameters, callback != NULL, odev, odevName ) );
+    }
+
+    if( callback != NULL )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &ossApi->callbackStreamInterface, callback, userData );
+        stream->callbackMode = 1;
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &ossApi->blockingStreamInterface, callback, userData );
+    }
+
+    ENSURE_( sem_init( &stream->semaphore, 0, 0 ), paInternalError );
+
+error:
+    return result;
+}
+
+static void PaOssStream_Terminate( PaOssStream *stream )
+{
+    assert( stream );
+
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    PaUtil_TerminateThreading( &stream->threading );
+
+    if( stream->capture )
+        PaOssStreamComponent_Terminate( stream->capture );
+    if( stream->playback )
+        PaOssStreamComponent_Terminate( stream->playback );
+
+    sem_destroy( &stream->semaphore );
+
+    PaUtil_FreeMemory( stream );
+}
+
+/** Translate from PA format to OSS native.
+ *
+ */
+static PaError Pa2OssFormat( PaSampleFormat paFormat, int *ossFormat )
+{
+    switch( paFormat )
+    {
+        case paUInt8:
+            *ossFormat = AFMT_U8;
+            break;
+        case paInt8:
+            *ossFormat = AFMT_S8;
+            break;
+        case paInt16:
+            *ossFormat = AFMT_S16_NE;
+            break;
+        default:
+            return paInternalError;     /* This shouldn't happen */
+    }
+
+    return paNoError;
+}
+
+/** Return the PA-compatible formats that this device can support.
+ *
+ */
+static PaError GetAvailableFormats( PaOssStreamComponent *component, PaSampleFormat *availableFormats )
+{
+    PaError result = paNoError;
+    int mask = 0;
+    PaSampleFormat frmts = 0;
+
+    ENSURE_( ioctl( component->fd, SNDCTL_DSP_GETFMTS, &mask ), paUnanticipatedHostError );
+    if( mask & AFMT_U8 )
+        frmts |= paUInt8;
+    if( mask & AFMT_S8 )
+        frmts |= paInt8;
+    if( mask & AFMT_S16_NE )
+        frmts |= paInt16;
+    else
+        result = paSampleFormatNotSupported;
+
+    *availableFormats = frmts;
+
+error:
+    return result;
+}
+
+static unsigned int PaOssStreamComponent_FrameSize( PaOssStreamComponent *component )
+{
+    return Pa_GetSampleSize( component->hostFormat ) * component->hostChannelCount;
+}
+
+/** Buffer size in bytes.
+ *
+ */
+static unsigned long PaOssStreamComponent_BufferSize( PaOssStreamComponent *component )
+{
+    return PaOssStreamComponent_FrameSize( component ) * component->hostFrames * component->numBufs;
+}
+
+static int CalcHigherLogTwo( int n )
+{
+    int log2 = 0;
+    while( (1<<log2) < n ) log2++;
+    return log2;
+}
+
+/** Configure stream component device parameters.
+ */
+static PaError PaOssStreamComponent_Configure( PaOssStreamComponent *component, double sampleRate, unsigned long
+        framesPerBuffer, StreamMode streamMode, PaOssStreamComponent *master )
+{
+    PaError result = paNoError;
+    int temp, nativeFormat;
+    int sr = (int)sampleRate;
+    PaSampleFormat availableFormats = 0, hostFormat = 0;
+    int chans = component->userChannelCount;
+    int frgmt;
+    int numBufs;
+    int bytesPerBuf;
+    unsigned long bufSz;
+    unsigned long fragSz;
+    audio_buf_info bufInfo;
+
+    /* We may have a situation where only one component (the master) is configured, if both point to the same device.
+     * In that case, the second component will copy settings from the other */
+    if( !master )
+    {
+        /* Aspect BufferSettings: If framesPerBuffer is unspecified we have to infer a suitable fragment size.
+         * The hardware need not respect the requested fragment size, so we may have to adapt.
+         */
+        if( framesPerBuffer == paFramesPerBufferUnspecified )
+        {
+            bufSz = (unsigned long)(component->latency * sampleRate);
+            fragSz = bufSz / 4;
+        }
+        else
+        {
+            fragSz = framesPerBuffer;
+            bufSz = (unsigned long)(component->latency * sampleRate) + fragSz; /* Latency + 1 buffer */
+        }
+
+        PA_ENSURE( GetAvailableFormats( component, &availableFormats ) );
+        hostFormat = PaUtil_SelectClosestAvailableFormat( availableFormats, component->userFormat );
+
+        /* OSS demands at least 2 buffers, and 16 bytes per buffer */
+        numBufs = (int)PA_MAX( bufSz / fragSz, 2 );
+        bytesPerBuf = PA_MAX( fragSz * Pa_GetSampleSize( hostFormat ) * chans, 16 );
+
+        /* The fragment parameters are encoded like this:
+         * Most significant byte: number of fragments
+         * Least significant byte: exponent of fragment size (i.e., for 256, 8)
+         */
+        frgmt = (numBufs << 16) + (CalcHigherLogTwo( bytesPerBuf ) & 0xffff);
+        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SETFRAGMENT, &frgmt ), paUnanticipatedHostError );
+
+        /* A: according to the OSS programmer's guide parameters should be set in this order:
+         * format, channels, rate */
+
+        /* This format should be deemed good before we get this far */
+        PA_ENSURE( Pa2OssFormat( hostFormat, &temp ) );
+        nativeFormat = temp;
+        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SETFMT, &temp ), paUnanticipatedHostError );
+        PA_UNLESS( temp == nativeFormat, paInternalError );
+
+        /* try to set the number of channels */
+        ENSURE_( ioctl( component->fd, SNDCTL_DSP_CHANNELS, &chans ), paSampleFormatNotSupported );   /* XXX: Should be paInvalidChannelCount? */
+        /* It's possible that the minimum number of host channels is greater than what the user requested */
+        PA_UNLESS( chans >= component->userChannelCount, paInvalidChannelCount );
+
+        /* try to set the sample rate */
+        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SPEED, &sr ), paInvalidSampleRate );
+
+        /* reject if there's no sample rate within 1% of the one requested */
+        if( (fabs( sampleRate - sr ) / sampleRate) > 0.01 )
+        {
+            PA_DEBUG(("%s: Wanted %f, closest sample rate was %d\n", __FUNCTION__, sampleRate, sr ));
+            PA_ENSURE( paInvalidSampleRate );
+        }
+
+        ENSURE_( ioctl( component->fd, streamMode == StreamMode_In ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &bufInfo ),
+                paUnanticipatedHostError );
+        component->numBufs = bufInfo.fragstotal;
+
+        /* This needs to be the last ioctl call before the first read/write, according to the OSS programmer's guide */
+        ENSURE_( ioctl( component->fd, SNDCTL_DSP_GETBLKSIZE, &bytesPerBuf ), paUnanticipatedHostError );
+
+        component->hostFrames = bytesPerBuf / Pa_GetSampleSize( hostFormat ) / chans;
+        component->hostChannelCount = chans;
+        component->hostFormat = hostFormat;
+    }
+    else
+    {
+        component->hostFormat = master->hostFormat;
+        component->hostFrames = master->hostFrames;
+        component->hostChannelCount = master->hostChannelCount;
+        component->numBufs = master->numBufs;
+    }
+
+    PA_UNLESS( component->buffer = PaUtil_AllocateMemory( PaOssStreamComponent_BufferSize( component ) ),
+            paInsufficientMemory );
+
+error:
+    return result;
+}
+
+static PaError PaOssStreamComponent_Read( PaOssStreamComponent *component, unsigned long *frames )
+{
+    PaError result = paNoError;
+    size_t len = *frames * PaOssStreamComponent_FrameSize( component );
+    ssize_t bytesRead;
+
+    ENSURE_( bytesRead = read( component->fd, component->buffer, len ), paUnanticipatedHostError );
+    *frames = bytesRead / PaOssStreamComponent_FrameSize( component );
+    /* TODO: Handle condition where number of frames read doesn't equal number of frames requested */
+
+error:
+    return result;
+}
+
+static PaError PaOssStreamComponent_Write( PaOssStreamComponent *component, unsigned long *frames )
+{
+    PaError result = paNoError;
+    size_t len = *frames * PaOssStreamComponent_FrameSize( component );
+    ssize_t bytesWritten;
+
+    ENSURE_( bytesWritten = write( component->fd, component->buffer, len ), paUnanticipatedHostError );
+    *frames = bytesWritten / PaOssStreamComponent_FrameSize( component );
+    /* TODO: Handle condition where number of frames written doesn't equal number of frames requested */
+
+error:
+    return result;
+}
+
+/** Configure the stream according to input/output parameters.
+ *
+ * Aspect StreamChannels: The minimum number of channels supported by the device may exceed that requested by
+ * the user, if so we'll record the actual number of host channels and adapt later.
+ */
+static PaError PaOssStream_Configure( PaOssStream *stream, double sampleRate, unsigned long framesPerBuffer,
+        double *inputLatency, double *outputLatency )
+{
+    PaError result = paNoError;
+    int duplex = stream->capture && stream->playback;
+    unsigned long framesPerHostBuffer = 0;
+
+    /* We should request full duplex first thing after opening the device */
+    if( duplex && stream->sharedDevice )
+        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETDUPLEX, 0 ), paUnanticipatedHostError );
+
+    if( stream->capture )
+    {
+        PaOssStreamComponent *component = stream->capture;
+        PA_ENSURE( PaOssStreamComponent_Configure( component, sampleRate, framesPerBuffer, StreamMode_In,
+                    NULL ) );
+
+        assert( component->hostChannelCount > 0 );
+        assert( component->hostFrames > 0 );
+
+        *inputLatency = (component->hostFrames * (component->numBufs - 1)) / sampleRate;
+    }
+    if( stream->playback )
+    {
+        PaOssStreamComponent *component = stream->playback, *master = stream->sharedDevice ? stream->capture : NULL;
+        PA_ENSURE( PaOssStreamComponent_Configure( component, sampleRate, framesPerBuffer, StreamMode_Out,
+                    master ) );
+
+        assert( component->hostChannelCount > 0 );
+        assert( component->hostFrames > 0 );
+
+        *outputLatency = (component->hostFrames * (component->numBufs - 1)) / sampleRate;
+    }
+
+    if( duplex )
+        framesPerHostBuffer = PA_MIN( stream->capture->hostFrames, stream->playback->hostFrames );
+    else if( stream->capture )
+        framesPerHostBuffer = stream->capture->hostFrames;
+    else if( stream->playback )
+        framesPerHostBuffer = stream->playback->hostFrames;
+
+    stream->framesPerHostBuffer = framesPerHostBuffer;
+    stream->pollTimeout = (int) ceil( 1e6 * framesPerHostBuffer / sampleRate );    /* Period in usecs, rounded up */
+
+    stream->sampleRate = stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+error:
+    return result;
+}
+
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
+
+/** Open a PA OSS stream.
+ *
+ * Aspect StreamChannels: The number of channels is specified per direction (in/out), and can differ between the
+ * two. However, OSS doesn't support separate configuration spaces for capture and playback so if both
+ * directions are the same device we will demand the same number of channels. The number of channels can range
+ * from 1 to the maximum supported by the device.
+ *
+ * Aspect BufferSettings: If framesPerBuffer != paFramesPerBufferUnspecified the number of frames per callback
+ * must reflect this, in addition the host latency per device should approximate the corresponding
+ * suggestedLatency. Based on these constraints we need to determine a number of frames per host buffer that
+ * both capture and playback can agree on (they can be different devices), the buffer processor can adapt
+ * between host and user buffer size, but the ratio should preferably be integral.
+ */
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaOSSHostApiRepresentation *ossHostApi = (PaOSSHostApiRepresentation*)hostApi;
+    PaOssStream *stream = NULL;
+    int inputChannelCount = 0, outputChannelCount = 0;
+    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0, inputHostFormat = 0, outputHostFormat = 0;
+    const PaDeviceInfo *inputDeviceInfo = 0, *outputDeviceInfo = 0;
+    int bpInitialized = 0;
+    double inLatency = 0., outLatency = 0.;
+    int i = 0;
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+    if( inputParameters )
+    {
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        inputDeviceInfo = hostApi->deviceInfos[inputParameters->device];
+        PA_ENSURE( ValidateParameters( inputParameters, inputDeviceInfo, StreamMode_In ) );
+
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+    }
+    if( outputParameters )
+    {
+        outputDeviceInfo = hostApi->deviceInfos[outputParameters->device];
+        PA_ENSURE( ValidateParameters( outputParameters, outputDeviceInfo, StreamMode_Out ) );
+
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+    }
+
+    /* Aspect StreamChannels: We currently demand that number of input and output channels are the same, if the same
+     * device is opened for both directions
+     */
+    if( inputChannelCount > 0 && outputChannelCount > 0 )
+    {
+        if( inputParameters->device == outputParameters->device )
+        {
+            if( inputParameters->channelCount != outputParameters->channelCount )
+                return paInvalidChannelCount;
+        }
+    }
+
+    /* Round framesPerBuffer to the next power-of-two to make OSS happy. */
+    if( framesPerBuffer != paFramesPerBufferUnspecified )
+    {
+        framesPerBuffer &= INT_MAX;
+        for (i = 1; framesPerBuffer > i; i <<= 1) ;
+        framesPerBuffer = i;
+    }
+
+    /* allocate and do basic initialization of the stream structure */
+    PA_UNLESS( stream = (PaOssStream*)PaUtil_AllocateMemory( sizeof(PaOssStream) ), paInsufficientMemory );
+    PA_ENSURE( PaOssStream_Initialize( stream, inputParameters, outputParameters, streamCallback, userData, streamFlags, ossHostApi ) );
+
+    PA_ENSURE( PaOssStream_Configure( stream, sampleRate, framesPerBuffer, &inLatency, &outLatency ) );
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+    if( inputParameters )
+    {
+        inputHostFormat = stream->capture->hostFormat;
+        stream->streamRepresentation.streamInfo.inputLatency = inLatency +
+            PaUtil_GetBufferProcessorInputLatencyFrames( &stream->bufferProcessor ) / sampleRate;
+    }
+    if( outputParameters )
+    {
+        outputHostFormat = stream->playback->hostFormat;
+        stream->streamRepresentation.streamInfo.outputLatency = outLatency +
+            PaUtil_GetBufferProcessorOutputLatencyFrames( &stream->bufferProcessor ) / sampleRate;
+    }
+
+    /* Initialize buffer processor with fixed host buffer size.
+     * Aspect StreamSampleFormat: Here we commit the user and host sample formats, PA infrastructure will
+     * convert between the two.
+     */
+    PA_ENSURE( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+              inputChannelCount, inputSampleFormat, inputHostFormat, outputChannelCount, outputSampleFormat,
+              outputHostFormat, sampleRate, streamFlags, framesPerBuffer, stream->framesPerHostBuffer,
+              paUtilFixedHostBufferSize, streamCallback, userData ) );
+    bpInitialized = 1;
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    if( bpInitialized )
+        PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    if( stream )
+        PaOssStream_Terminate( stream );
+
+    return result;
+}
+
+/*! Poll on I/O filedescriptors.
+
+  Poll till we've determined there's data for read or write. In the full-duplex case,
+  we don't want to hang around forever waiting for either input or output frames, so
+  whenever we have a timed out filedescriptor we check if we're nearing under/overrun
+  for the other direction (critical limit set at one buffer). If so, we exit the waiting
+  state, and go on with what we got. We align the number of frames on a host buffer
+  boundary because it is possible that the buffer size differs for the two directions and
+  the host buffer size is a compromise between the two.
+  */
+static PaError PaOssStream_WaitForFrames( PaOssStream *stream, unsigned long *frames )
+{
+    PaError result = paNoError;
+    int pollPlayback = 0, pollCapture = 0;
+    int captureAvail = INT_MAX, playbackAvail = INT_MAX, commonAvail;
+    audio_buf_info bufInfo;
+    /* int ofs = 0, nfds = stream->nfds; */
+    fd_set readFds, writeFds;
+    int nfds = 0;
+    struct timeval selectTimeval = {0, 0};
+    unsigned long timeout = stream->pollTimeout;    /* In usecs */
+    int captureFd = -1, playbackFd = -1;
+
+    assert( stream );
+    assert( frames );
+
+    if( stream->capture )
+    {
+        pollCapture = 1;
+        captureFd = stream->capture->fd;
+        /* stream->capture->pfd->events = POLLIN; */
+    }
+    if( stream->playback )
+    {
+        pollPlayback = 1;
+        playbackFd = stream->playback->fd;
+        /* stream->playback->pfd->events = POLLOUT; */
+    }
+
+    FD_ZERO( &readFds );
+    FD_ZERO( &writeFds );
+
+    while( pollPlayback || pollCapture )
+    {
+#ifdef PTHREAD_CANCELED
+        pthread_testcancel();
+#else
+        /* avoid indefinite waiting on thread not supporting cancelation */
+        if( stream->callbackStop || stream->callbackAbort )
+        {
+            PA_DEBUG(( "Cancelling PaOssStream_WaitForFrames\n" ));
+            (*frames) = 0;
+            return paNoError;
+        }
+#endif
+
+        /* select may modify the timeout parameter */
+        selectTimeval.tv_usec = timeout;
+        nfds = 0;
+
+        if( pollCapture )
+        {
+            FD_SET( captureFd, &readFds );
+            nfds = captureFd + 1;
+        }
+        if( pollPlayback )
+        {
+            FD_SET( playbackFd, &writeFds );
+            nfds = PA_MAX( nfds, playbackFd + 1 );
+        }
+        ENSURE_( select( nfds, &readFds, &writeFds, NULL, &selectTimeval ), paUnanticipatedHostError );
+        /*
+        if( poll( stream->pfds + ofs, nfds, stream->pollTimeout ) < 0 )
+        {
+
+            ENSURE_( -1, paUnanticipatedHostError );
+        }
+        */
+#ifdef PTHREAD_CANCELED
+        pthread_testcancel();
+#else
+        /* avoid indefinite waiting on thread not supporting cancelation */
+        if( stream->callbackStop || stream->callbackAbort )
+        {
+            PA_DEBUG(( "Cancelling PaOssStream_WaitForFrames\n" ));
+            (*frames) = 0;
+            return paNoError;
+        }
+#endif
+        if( pollCapture )
+        {
+            if( FD_ISSET( captureFd, &readFds ) )
+            {
+                FD_CLR( captureFd, &readFds );
+                pollCapture = 0;
+            }
+            /*
+            if( stream->capture->pfd->revents & POLLIN )
+            {
+                --nfds;
+                ++ofs;
+                pollCapture = 0;
+            }
+            */
+            else if( stream->playback ) /* Timed out, go on with playback? */
+            {
+                /*PA_DEBUG(( "%s: Trying to poll again for capture frames, pollTimeout: %d\n",
+                            __FUNCTION__, stream->pollTimeout ));*/
+            }
+        }
+        if( pollPlayback )
+        {
+            if( FD_ISSET( playbackFd, &writeFds ) )
+            {
+                FD_CLR( playbackFd, &writeFds );
+                pollPlayback = 0;
+            }
+            /*
+            if( stream->playback->pfd->revents & POLLOUT )
+            {
+                --nfds;
+                pollPlayback = 0;
+            }
+            */
+            else if( stream->capture )  /* Timed out, go on with capture? */
+            {
+                /*PA_DEBUG(( "%s: Trying to poll again for playback frames, pollTimeout: %d\n\n",
+                            __FUNCTION__, stream->pollTimeout ));*/
+            }
+        }
+    }
+
+    if( stream->capture )
+    {
+        ENSURE_( ioctl( captureFd, SNDCTL_DSP_GETISPACE, &bufInfo ), paUnanticipatedHostError );
+        captureAvail = bufInfo.fragments * stream->capture->hostFrames;
+        if( !captureAvail )
+            PA_DEBUG(( "%s: captureAvail: 0\n", __FUNCTION__ ));
+
+        captureAvail = captureAvail == 0 ? INT_MAX : captureAvail;      /* Disregard if zero */
+    }
+    if( stream->playback )
+    {
+        ENSURE_( ioctl( playbackFd, SNDCTL_DSP_GETOSPACE, &bufInfo ), paUnanticipatedHostError );
+        playbackAvail = bufInfo.fragments * stream->playback->hostFrames;
+        if( !playbackAvail )
+        {
+            PA_DEBUG(( "%s: playbackAvail: 0\n", __FUNCTION__ ));
+        }
+
+        playbackAvail = playbackAvail == 0 ? INT_MAX : playbackAvail;      /* Disregard if zero */
+    }
+
+    commonAvail = PA_MIN( captureAvail, playbackAvail );
+    if( commonAvail == INT_MAX )
+        commonAvail = 0;
+    commonAvail -= commonAvail % stream->framesPerHostBuffer;
+
+    assert( commonAvail != INT_MAX );
+    assert( commonAvail >= 0 );
+    *frames = commonAvail;
+
+error:
+    return result;
+}
+
+/** Prepare stream for capture/playback.
+ *
+ * In order to synchronize capture and playback properly we use the SETTRIGGER command.
+ */
+static PaError PaOssStream_Prepare( PaOssStream *stream )
+{
+    PaError result = paNoError;
+    int enableBits = 0;
+
+    if( stream->triggered )
+        return result;
+
+    /* The OSS reference instructs us to clear direction bits before setting them.*/
+    if( stream->playback )
+        ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+    if( stream->capture )
+        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+
+    if( stream->playback )
+    {
+        size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
+        memset( stream->playback->buffer, 0, bufSz );
+
+        /* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
+         * OSS will complain. */
+        PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
+        while (1)
+        {
+            if( write( stream->playback->fd, stream->playback->buffer, bufSz ) < 0 )
+                break;
+        }
+        PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) );
+    }
+
+    if( stream->sharedDevice )
+    {
+        enableBits = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT;
+        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+    }
+    else
+    {
+        if( stream->capture )
+        {
+            enableBits = PCM_ENABLE_INPUT;
+            ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+        }
+        if( stream->playback )
+        {
+            enableBits = PCM_ENABLE_OUTPUT;
+            ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
+        }
+    }
+
+    /* Ok, we have triggered the stream */
+    stream->triggered = 1;
+
+error:
+    return result;
+}
+
+/** Stop audio processing
+ *
+ */
+static PaError PaOssStream_Stop( PaOssStream *stream, int abort )
+{
+    PaError result = paNoError;
+
+    /* Looks like the only safe way to stop audio without reopening the device is SNDCTL_DSP_POST.
+     * Also disable capture/playback till the stream is started again.
+     */
+    int captureErr = 0, playbackErr = 0;
+    if( stream->capture )
+    {
+        if( (captureErr = ioctl( stream->capture->fd, SNDCTL_DSP_POST, 0 )) < 0 )
+        {
+            PA_DEBUG(( "%s: Failed to stop capture device, error: %d\n", __FUNCTION__, captureErr ));
+        }
+    }
+    if( stream->playback && !stream->sharedDevice )
+    {
+        if( (playbackErr = ioctl( stream->playback->fd, SNDCTL_DSP_POST, 0 )) < 0 )
+        {
+            PA_DEBUG(( "%s: Failed to stop playback device, error: %d\n", __FUNCTION__, playbackErr ));
+        }
+    }
+
+    if( captureErr || playbackErr )
+    {
+        result = paUnanticipatedHostError;
+    }
+
+    return result;
+}
+
+/** Clean up after thread exit.
+ *
+ * Aspect StreamState: If the user has registered a streamFinishedCallback it will be called here
+ */
+static void OnExit( void *data )
+{
+    PaOssStream *stream = (PaOssStream *) data;
+    assert( data );
+
+    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
+
+    PaOssStream_Stop( stream, stream->callbackAbort );
+
+    PA_DEBUG(( "OnExit: Stoppage\n" ));
+
+    /* Eventually notify user all buffers have played */
+    if( stream->streamRepresentation.streamFinishedCallback )
+        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+
+    stream->callbackAbort = 0;      /* Clear state */
+    stream->isActive = 0;
+}
+
+static PaError SetUpBuffers( PaOssStream *stream, unsigned long framesAvail )
+{
+    PaError result = paNoError;
+
+    if( stream->capture )
+    {
+        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, stream->capture->buffer,
+                stream->capture->hostChannelCount );
+        PaUtil_SetInputFrameCount( &stream->bufferProcessor, framesAvail );
+    }
+    if( stream->playback )
+    {
+        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, stream->playback->buffer,
+                stream->playback->hostChannelCount );
+        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, framesAvail );
+    }
+
+    return result;
+}
+
+/** Thread procedure for callback processing.
+ *
+ * Aspect StreamState: StartStream will wait on this to initiate audio processing, useful in case the
+ * callback should be used for buffer priming. When the stream is cancelled a separate function will
+ * take care of the transition to the Callback Finished state (the stream isn't considered Stopped
+ * before StopStream() or AbortStream() are called).
+ */
+static void *PaOSS_AudioThreadProc( void *userData )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)userData;
+    unsigned long framesAvail = 0, framesProcessed = 0;
+    int callbackResult = paContinue;
+    int triggered = stream->triggered;  /* See if SNDCTL_DSP_TRIGGER has been issued already */
+    int initiateProcessing = triggered;    /* Already triggered? */
+    PaStreamCallbackFlags cbFlags = 0;  /* We might want to keep state across iterations */
+    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /* TODO: IMPLEMENT ME */
+
+    /*
+#if ( SOUND_VERSION > 0x030904 )
+        audio_errinfo errinfo;
+#endif
+*/
+
+    assert( stream );
+
+    pthread_cleanup_push( &OnExit, stream );	/* Execute OnExit when exiting */
+
+    /* The first time the stream is started we use SNDCTL_DSP_TRIGGER to accurately start capture and
+     * playback in sync, when the stream is restarted after being stopped we simply start by reading/
+     * writing.
+     */
+    PA_ENSURE( PaOssStream_Prepare( stream ) );
+
+    /* If we are to initiate processing implicitly by reading/writing data, we start off in blocking mode */
+    if( initiateProcessing )
+    {
+        /* Make sure devices are in blocking mode */
+        if( stream->capture )
+            ModifyBlocking( stream->capture->fd, 1 );
+        if( stream->playback )
+            ModifyBlocking( stream->playback->fd, 1 );
+    }
+
+    while( 1 )
+    {
+#ifdef PTHREAD_CANCELED
+        pthread_testcancel();
+#else
+        if( stream->callbackAbort ) /* avoid indefinite waiting on thread not supporting cancelation */
+        {
+            PA_DEBUG(( "Aborting callback thread\n" ));
+            break;
+        }
+#endif
+        if( stream->callbackStop && callbackResult == paContinue )
+        {
+            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
+            callbackResult = paComplete;
+        }
+
+        /* Aspect StreamState: Because of the messy OSS scheme we can't explicitly trigger device start unless
+         * the stream has been recently started, we will have to go right ahead and read/write in blocking
+         * fashion to trigger operation. Therefore we begin with processing one host buffer before we switch
+         * to non-blocking mode.
+         */
+        if( !initiateProcessing )
+        {
+            /* Wait on available frames */
+            PA_ENSURE( PaOssStream_WaitForFrames( stream, &framesAvail ) );
+            assert( framesAvail % stream->framesPerHostBuffer == 0 );
+        }
+        else
+        {
+            framesAvail = stream->framesPerHostBuffer;
+        }
+
+        while( framesAvail > 0 )
+        {
+            unsigned long frames = framesAvail;
+
+#ifdef PTHREAD_CANCELED
+            pthread_testcancel();
+#else
+            if( stream->callbackStop )
+            {
+                PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
+                callbackResult = paComplete;
+            }
+
+            if( stream->callbackAbort ) /* avoid indefinite waiting on thread not supporting cancelation */
+            {
+                PA_DEBUG(( "Aborting callback thread\n" ));
+                break;
+            }
+#endif
+            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+            /* Read data */
+            if ( stream->capture )
+            {
+                PA_ENSURE( PaOssStreamComponent_Read( stream->capture, &frames ) );
+                if( frames < framesAvail )
+                {
+                    PA_DEBUG(( "Read %lu less frames than requested\n", framesAvail - frames ));
+                    framesAvail = frames;
+                }
+            }
+
+#if ( SOUND_VERSION >= 0x030904 )
+            /*
+               Check with OSS to see if there have been any under/overruns
+               since last time we checked.
+               */
+            /*
+            if( ioctl( stream->deviceHandle, SNDCTL_DSP_GETERROR, &errinfo ) >= 0 )
+            {
+                if( errinfo.play_underruns )
+                    cbFlags |= paOutputUnderflow ;
+                if( errinfo.record_underruns )
+                    cbFlags |= paInputUnderflow ;
+            }
+            else
+                PA_DEBUG(( "SNDCTL_DSP_GETERROR command failed: %s\n", strerror( errno ) ));
+                */
+#endif
+
+            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo,
+                    cbFlags );
+            cbFlags = 0;
+            PA_ENSURE( SetUpBuffers( stream, framesAvail ) );
+
+            framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor,
+                    &callbackResult );
+            assert( framesProcessed == framesAvail );
+            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+
+            if ( stream->playback )
+            {
+                frames = framesAvail;
+
+                PA_ENSURE( PaOssStreamComponent_Write( stream->playback, &frames ) );
+                if( frames < framesAvail )
+                {
+                    /* TODO: handle bytesWritten != bytesRequested (slippage?) */
+                    PA_DEBUG(( "Wrote %lu less frames than requested\n", framesAvail - frames ));
+                }
+            }
+
+            framesAvail -= framesProcessed;
+            stream->framesProcessed += framesProcessed;
+
+            if( callbackResult != paContinue )
+                break;
+        }
+
+        if( initiateProcessing || !triggered )
+        {
+            /* Non-blocking */
+            if( stream->capture )
+                PA_ENSURE( ModifyBlocking( stream->capture->fd, 0 ) );
+            if( stream->playback && !stream->sharedDevice )
+                PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
+
+            initiateProcessing = 0;
+            sem_post( &stream->semaphore );
+        }
+
+        if( callbackResult != paContinue )
+        {
+            stream->callbackAbort = callbackResult == paAbort;
+            if( stream->callbackAbort || PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
+                break;
+        }
+    }
+
+    pthread_cleanup_pop( 1 );
+
+error:
+    pthread_exit( NULL );
+}
+
+/** Close the stream.
+ *
+ */
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+
+    assert( stream );
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaOssStream_Terminate( stream );
+
+    return result;
+}
+
+/** Start the stream.
+ *
+ * Aspect StreamState: After returning, the stream shall be in the Active state, implying that an eventual
+ * callback will be repeatedly called in a separate thread. If a separate thread is started this function
+ * will block untill it has started processing audio, otherwise audio processing is started directly.
+ */
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+
+    stream->isActive = 1;
+    stream->isStopped = 0;
+    stream->lastPosPtr = 0;
+    stream->lastStreamBytes = 0;
+    stream->framesProcessed = 0;
+
+    /* only use the thread for callback streams */
+    if( stream->bufferProcessor.streamCallback )
+    {
+        PA_ENSURE( PaUtil_StartThreading( &stream->threading, &PaOSS_AudioThreadProc, stream ) );
+        sem_wait( &stream->semaphore );
+    }
+    else
+        PA_ENSURE( PaOssStream_Prepare( stream ) );
+
+error:
+    return result;
+}
+
+static PaError RealStop( PaOssStream *stream, int abort )
+{
+    PaError result = paNoError;
+
+    if( stream->callbackMode )
+    {
+        if( abort )
+            stream->callbackAbort = 1;
+        else
+            stream->callbackStop = 1;
+
+        PA_ENSURE( PaUtil_CancelThreading( &stream->threading, !abort, NULL ) );
+
+        stream->callbackStop = stream->callbackAbort = 0;
+    }
+    else
+        PA_ENSURE( PaOssStream_Stop( stream, abort ) );
+
+    stream->isStopped = 1;
+
+error:
+    return result;
+}
+
+/** Stop the stream.
+ *
+ * Aspect StreamState: This will cause the stream to transition to the Stopped state, playing all enqueued
+ * buffers.
+ */
+static PaError StopStream( PaStream *s )
+{
+    return RealStop( (PaOssStream *)s, 0 );
+}
+
+/** Abort the stream.
+ *
+ * Aspect StreamState: This will cause the stream to transition to the Stopped state, discarding all enqueued
+ * buffers. Note that the buffers are not currently correctly discarded, this is difficult without closing
+ * the OSS device.
+ */
+static PaError AbortStream( PaStream *s )
+{
+    return RealStop( (PaOssStream *)s, 1 );
+}
+
+/** Is the stream in the Stopped state.
+ *
+ */
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaOssStream *stream = (PaOssStream*)s;
+
+    return (stream->isStopped);
+}
+
+/** Is the stream in the Active state.
+ *
+ */
+static PaError IsStreamActive( PaStream *s )
+{
+    PaOssStream *stream = (PaOssStream*)s;
+
+    return (stream->isActive);
+}
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    PaOssStream *stream = (PaOssStream*)s;
+    count_info info;
+    int delta;
+
+    if( stream->playback ) {
+        if( ioctl( stream->playback->fd, SNDCTL_DSP_GETOPTR, &info) == 0 ) {
+            delta = ( info.bytes - stream->lastPosPtr ) /* & 0x000FFFFF*/;
+            return (float)(stream->lastStreamBytes + delta) / PaOssStreamComponent_FrameSize( stream->playback ) / stream->sampleRate;
+        }
+    }
+    else {
+        if (ioctl( stream->capture->fd, SNDCTL_DSP_GETIPTR, &info) == 0) {
+            delta = (info.bytes - stream->lastPosPtr) /*& 0x000FFFFF*/;
+            return (float)(stream->lastStreamBytes + delta) / PaOssStreamComponent_FrameSize( stream->capture ) / stream->sampleRate;
+        }
+    }
+
+    /* the ioctl failed, but we can still give a coarse estimate */
+
+    return stream->framesProcessed / stream->sampleRate;
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaOssStream *stream = (PaOssStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+/*
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+    int bytesRequested, bytesRead;
+    unsigned long framesRequested;
+    void *userBuffer;
+
+    /* If user input is non-interleaved, PaUtil_CopyInput will manipulate the channel pointers,
+     * so we copy the user provided pointers */
+    if( stream->bufferProcessor.userInputIsInterleaved )
+        userBuffer = buffer;
+    else /* Copy channels into local array */
+    {
+        userBuffer = stream->capture->userBuffers;
+        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->capture->userChannelCount );
+    }
+
+    while( frames )
+    {
+        framesRequested = PA_MIN( frames, stream->capture->hostFrames );
+
+	bytesRequested = framesRequested * PaOssStreamComponent_FrameSize( stream->capture );
+	ENSURE_( (bytesRead = read( stream->capture->fd, stream->capture->buffer, bytesRequested )),
+                 paUnanticipatedHostError );
+	if ( bytesRequested != bytesRead )
+	{
+	    PA_DEBUG(( "Requested %d bytes, read %d\n", bytesRequested, bytesRead ));
+	    return paUnanticipatedHostError;
+	}
+
+	PaUtil_SetInputFrameCount( &stream->bufferProcessor, stream->capture->hostFrames );
+	PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, stream->capture->buffer, stream->capture->hostChannelCount );
+        PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesRequested );
+	frames -= framesRequested;
+    }
+
+error:
+    return result;
+}
+
+
+static PaError WriteStream( PaStream *s, const void *buffer, unsigned long frames )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+    int bytesRequested, bytesWritten;
+    unsigned long framesConverted;
+    const void *userBuffer;
+
+    /* If user output is non-interleaved, PaUtil_CopyOutput will manipulate the channel pointers,
+     * so we copy the user provided pointers */
+    if( stream->bufferProcessor.userOutputIsInterleaved )
+        userBuffer = buffer;
+    else
+    {
+        /* Copy channels into local array */
+        userBuffer = stream->playback->userBuffers;
+        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->playback->userChannelCount );
+    }
+
+    while( frames )
+    {
+	PaUtil_SetOutputFrameCount( &stream->bufferProcessor, stream->playback->hostFrames );
+	PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, stream->playback->buffer, stream->playback->hostChannelCount );
+
+	framesConverted = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, frames );
+	frames -= framesConverted;
+
+	bytesRequested = framesConverted * PaOssStreamComponent_FrameSize( stream->playback );
+	ENSURE_( (bytesWritten = write( stream->playback->fd, stream->playback->buffer, bytesRequested )),
+                 paUnanticipatedHostError );
+
+	if ( bytesRequested != bytesWritten )
+	{
+	    PA_DEBUG(( "Requested %d bytes, wrote %d\n", bytesRequested, bytesWritten ));
+	    return paUnanticipatedHostError;
+	}
+    }
+
+error:
+    return result;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+    audio_buf_info info;
+
+    ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_GETISPACE, &info ), paUnanticipatedHostError );
+    return info.fragments * stream->capture->hostFrames;
+
+error:
+    return result;
+}
+
+
+/* TODO: Compute number of allocated bytes somewhere else, can we use ODELAY with capture */
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaError result = paNoError;
+    PaOssStream *stream = (PaOssStream*)s;
+    int delay = 0;
+#ifdef SNDCTL_DSP_GETODELAY
+    ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ), paUnanticipatedHostError );
+#endif
+    return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
+
+/* Conditionally compile this to avoid warning about unused label */
+#ifdef SNDCTL_DSP_GETODELAY
+error:
+    return result;
+#endif
+}
+
diff --git a/Externals/portaudio/src/hostapi/oss/recplay.c b/Externals/portaudio/src/hostapi/oss/recplay.c
new file mode 100644
index 0000000000..9d4c78cfa3
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/oss/recplay.c
@@ -0,0 +1,114 @@
+/*
+ * recplay.c
+ * Phil Burk
+ * Minimal record and playback test.
+ * 
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#ifndef __STDC__
+/* #include <getopt.h> */
+#endif /* __STDC__ */
+#include <fcntl.h>
+#ifdef __STDC__
+#include <string.h>
+#else /* __STDC__ */
+#include <strings.h>
+#endif /* __STDC__ */
+#include <sys/soundcard.h>
+
+#define NUM_BYTES   (64*1024)
+#define BLOCK_SIZE   (4*1024)
+
+#define AUDIO "/dev/dsp"
+
+char buffer[NUM_BYTES];
+
+int audioDev = 0;
+
+main (int argc, char *argv[])
+{
+    int   numLeft;
+    char *ptr;
+    int   num;
+    int   samplesize;
+
+    /********** RECORD ********************/
+    /* Open audio device. */
+    audioDev = open (AUDIO, O_RDONLY, 0);
+    if (audioDev == -1)
+    {
+        perror (AUDIO);
+        exit (-1);
+    }
+
+    /* Set to 16 bit samples. */
+    samplesize = 16;
+    ioctl(audioDev, SNDCTL_DSP_SAMPLESIZE, &samplesize);
+    if (samplesize != 16)
+    {
+        perror("Unable to set the sample size.");
+        exit(-1);
+    }
+
+    /* Record in blocks */
+    printf("Begin recording.\n");
+    numLeft = NUM_BYTES;
+    ptr = buffer;
+    while( numLeft >= BLOCK_SIZE )
+    {
+        if ( (num = read (audioDev, ptr, BLOCK_SIZE)) < 0 )
+        {
+            perror (AUDIO);
+            exit (-1);
+        }
+        else
+        {
+            printf("Read %d bytes\n", num);
+            ptr += num;
+            numLeft -= num;
+        }
+    }
+
+    close( audioDev );
+
+    /********** PLAYBACK ********************/
+    /* Open audio device for writing. */
+    audioDev = open (AUDIO, O_WRONLY, 0);
+    if (audioDev == -1)
+    {
+        perror (AUDIO);
+        exit (-1);
+    }
+
+    /* Set to 16 bit samples. */
+    samplesize = 16;
+    ioctl(audioDev, SNDCTL_DSP_SAMPLESIZE, &samplesize);
+    if (samplesize != 16)
+    {
+        perror("Unable to set the sample size.");
+        exit(-1);
+    }
+
+    /* Play in blocks */
+    printf("Begin playing.\n");
+    numLeft = NUM_BYTES;
+    ptr = buffer;
+    while( numLeft >= BLOCK_SIZE )
+    {
+        if ( (num = write (audioDev, ptr, BLOCK_SIZE)) < 0 )
+        {
+            perror (AUDIO);
+            exit (-1);
+        }
+        else
+        {
+            printf("Wrote %d bytes\n", num);
+            ptr += num;
+            numLeft -= num;
+        }
+    }
+
+    close( audioDev );
+}
diff --git a/Externals/portaudio/src/hostapi/skeleton/README.txt b/Externals/portaudio/src/hostapi/skeleton/README.txt
new file mode 100644
index 0000000000..39d4c8d2be
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/skeleton/README.txt
@@ -0,0 +1 @@
+pa_hostapi_skeleton.c provides a starting point for implementing support for a new host API with PortAudio. The idea is that you copy it to a new directory inside /hostapi and start editing.
\ No newline at end of file
diff --git a/Externals/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c b/Externals/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c
new file mode 100644
index 0000000000..24eb450096
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c
@@ -0,0 +1,818 @@
+/*
+ * $Id: pa_hostapi_skeleton.c 1668 2011-05-02 17:07:11Z rossb $
+ * Portable Audio I/O Library skeleton implementation
+ * demonstrates how to use the common functions to implement support
+ * for a host API
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup common_src
+
+ @brief Skeleton implementation of support for a host API.
+
+ This file is provided as a starting point for implementing support for
+ a new host API. It provides examples of how the common code can be used.
+
+ @note IMPLEMENT ME comments are used to indicate functionality
+ which much be customised for each implementation.
+*/
+
+
+#include <string.h> /* strlen() */
+
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+
+
+/* prototypes for functions declared in this file */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+
+/* IMPLEMENT ME: a macro like the following one should be used for reporting
+ host errors */
+#define PA_SKELETON_SET_LAST_HOST_ERROR( errorCode, errorText ) \
+    PaUtil_SetLastHostErrorInfo( paInDevelopment, errorCode, errorText )
+
+/* PaSkeletonHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+
+    /* implementation specific data goes here */
+}
+PaSkeletonHostApiRepresentation;  /* IMPLEMENT ME: rename this */
+
+
+PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i, deviceCount;
+    PaSkeletonHostApiRepresentation *skeletonHostApi;
+    PaDeviceInfo *deviceInfoArray;
+
+    skeletonHostApi = (PaSkeletonHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaSkeletonHostApiRepresentation) );
+    if( !skeletonHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    skeletonHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !skeletonHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    *hostApi = &skeletonHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paInDevelopment;            /* IMPLEMENT ME: change to correct type id */
+    (*hostApi)->info.name = "skeleton implementation";  /* IMPLEMENT ME: change to correct name */
+
+    (*hostApi)->info.defaultInputDevice = paNoDevice;  /* IMPLEMENT ME */
+    (*hostApi)->info.defaultOutputDevice = paNoDevice; /* IMPLEMENT ME */
+
+    (*hostApi)->info.deviceCount = 0;  
+
+    deviceCount = 0; /* IMPLEMENT ME */
+    
+    if( deviceCount > 0 )
+    {
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                skeletonHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount );
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaDeviceInfo*)PaUtil_GroupAllocateMemory(
+                skeletonHostApi->allocations, sizeof(PaDeviceInfo) * deviceCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for( i=0; i < deviceCount; ++i )
+        {
+            PaDeviceInfo *deviceInfo = &deviceInfoArray[i];
+            deviceInfo->structVersion = 2;
+            deviceInfo->hostApi = hostApiIndex;
+            deviceInfo->name = 0; /* IMPLEMENT ME: allocate block and copy name eg:
+                deviceName = (char*)PaUtil_GroupAllocateMemory( skeletonHostApi->allocations, strlen(srcName) + 1 );
+                if( !deviceName )
+                {
+                    result = paInsufficientMemory;
+                    goto error;
+                }
+                strcpy( deviceName, srcName );
+                deviceInfo->name = deviceName;
+            */
+
+            deviceInfo->maxInputChannels = 0;  /* IMPLEMENT ME */
+            deviceInfo->maxOutputChannels = 0;  /* IMPLEMENT ME */
+            
+            deviceInfo->defaultLowInputLatency = 0.;  /* IMPLEMENT ME */
+            deviceInfo->defaultLowOutputLatency = 0.;  /* IMPLEMENT ME */
+            deviceInfo->defaultHighInputLatency = 0.;  /* IMPLEMENT ME */
+            deviceInfo->defaultHighOutputLatency = 0.;  /* IMPLEMENT ME */  
+
+            deviceInfo->defaultSampleRate = 0.; /* IMPLEMENT ME */
+            
+            (*hostApi)->deviceInfos[i] = deviceInfo;
+            ++(*hostApi)->info.deviceCount;
+        }
+    }
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &skeletonHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &skeletonHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    return result;
+
+error:
+    if( skeletonHostApi )
+    {
+        if( skeletonHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( skeletonHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( skeletonHostApi->allocations );
+        }
+                
+        PaUtil_FreeMemory( skeletonHostApi );
+    }
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaSkeletonHostApiRepresentation *skeletonHostApi = (PaSkeletonHostApiRepresentation*)hostApi;
+
+    /*
+        IMPLEMENT ME:
+            - clean up any resources not handled by the allocation group
+    */
+
+    if( skeletonHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( skeletonHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( skeletonHostApi->allocations );
+    }
+
+    PaUtil_FreeMemory( skeletonHostApi );
+}
+
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( inputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( outputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+            
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support outputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+    
+    /*
+        IMPLEMENT ME:
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported if necessary
+
+            - check that the device supports sampleRate
+
+        Because the buffer adapter handles conversion between all standard
+        sample formats, the following checks are only required if paCustomFormat
+        is implemented, or under some other unusual conditions.
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from inputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+    */
+
+
+    /* suppress unused variable warnings */
+    (void) sampleRate;
+
+    return paFormatIsSupported;
+}
+
+/* PaSkeletonStream - a stream data structure specifically for this implementation */
+
+typedef struct PaSkeletonStream
+{ /* IMPLEMENT ME: rename this */
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    /* IMPLEMENT ME:
+            - implementation specific data goes here
+    */
+    unsigned long framesPerHostCallback; /* just an example */
+}
+PaSkeletonStream;
+
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaSkeletonHostApiRepresentation *skeletonHostApi = (PaSkeletonHostApiRepresentation*)hostApi;
+    PaSkeletonStream *stream = 0;
+    unsigned long framesPerHostBuffer = framesPerBuffer; /* these may not be equivalent for all implementations */
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+        /* IMPLEMENT ME - establish which  host formats are available */
+        hostInputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, inputSampleFormat );
+    }
+    else
+    {
+        inputChannelCount = 0;
+        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support inputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+        /* IMPLEMENT ME - establish which  host formats are available */
+        hostOutputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, outputSampleFormat );
+    }
+    else
+    {
+        outputChannelCount = 0;
+        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
+    }
+
+    /*
+        IMPLEMENT ME:
+
+        ( the following two checks are taken care of by PaUtil_InitializeBufferProcessor() FIXME - checks needed? )
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+
+            - check that the device supports sampleRate
+
+            - alter sampleRate to a close allowable rate if possible / necessary
+
+            - validate suggestedInputLatency and suggestedOutputLatency parameters,
+                use default values where necessary
+    */
+
+
+
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+
+    stream = (PaSkeletonStream*)PaUtil_AllocateMemory( sizeof(PaSkeletonStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    if( streamCallback )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &skeletonHostApi->callbackStreamInterface, streamCallback, userData );
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &skeletonHostApi->blockingStreamInterface, streamCallback, userData );
+    }
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+
+    /* we assume a fixed host buffer size in this example, but the buffer processor
+        can also support bounded and unknown host buffer sizes by passing 
+        paUtilBoundedHostBufferSize or paUtilUnknownHostBufferSize instead of
+        paUtilFixedHostBufferSize below. */
+        
+    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+              inputChannelCount, inputSampleFormat, hostInputSampleFormat,
+              outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
+              sampleRate, streamFlags, framesPerBuffer,
+              framesPerHostBuffer, paUtilFixedHostBufferSize,
+              streamCallback, userData );
+    if( result != paNoError )
+        goto error;
+
+
+    /*
+        IMPLEMENT ME: initialise the following fields with estimated or actual
+        values.
+    */
+    stream->streamRepresentation.streamInfo.inputLatency =
+            (PaTime)PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor) / sampleRate; /* inputLatency is specified in _seconds_ */
+    stream->streamRepresentation.streamInfo.outputLatency =
+            (PaTime)PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor) / sampleRate; /* outputLatency is specified in _seconds_ */
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+    
+    /*
+        IMPLEMENT ME:
+            - additional stream setup + opening
+    */
+
+    stream->framesPerHostCallback = framesPerHostBuffer;
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+    if( stream )
+        PaUtil_FreeMemory( stream );
+
+    return result;
+}
+
+/*
+    ExampleHostProcessingLoop() illustrates the kind of processing which may
+    occur in a host implementation.
+ 
+*/
+static void ExampleHostProcessingLoop( void *inputBuffer, void *outputBuffer, void *userData )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)userData;
+    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /* IMPLEMENT ME */
+    int callbackResult;
+    unsigned long framesProcessed;
+    
+    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+    
+    /*
+        IMPLEMENT ME:
+            - generate timing information
+            - handle buffer slips
+    */
+
+    /*
+        If you need to byte swap or shift inputBuffer to convert it into a
+        portaudio format, do it here.
+    */
+
+
+
+    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, 0 /* IMPLEMENT ME: pass underflow/overflow flags when necessary */ );
+
+    /*
+        depending on whether the host buffers are interleaved, non-interleaved
+        or a mixture, you will want to call PaUtil_SetInterleaved*Channels(),
+        PaUtil_SetNonInterleaved*Channel() or PaUtil_Set*Channel() here.
+    */
+    
+    PaUtil_SetInputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
+    PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
+            0, /* first channel of inputBuffer is channel 0 */
+            inputBuffer,
+            0 ); /* 0 - use inputChannelCount passed to init buffer processor */
+
+    PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
+    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
+            0, /* first channel of outputBuffer is channel 0 */
+            outputBuffer,
+            0 ); /* 0 - use outputChannelCount passed to init buffer processor */
+
+    /* you must pass a valid value of callback result to PaUtil_EndBufferProcessing()
+        in general you would pass paContinue for normal operation, and
+        paComplete to drain the buffer processor's internal output buffer.
+        You can check whether the buffer processor's output buffer is empty
+        using PaUtil_IsBufferProcessorOuputEmpty( bufferProcessor )
+    */
+    callbackResult = paContinue;
+    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+
+    
+    /*
+        If you need to byte swap or shift outputBuffer to convert it to
+        host format, do it here.
+    */
+
+    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+
+
+    if( callbackResult == paContinue )
+    {
+        /* nothing special to do */
+    }
+    else if( callbackResult == paAbort )
+    {
+        /* IMPLEMENT ME - finish playback immediately  */
+
+        /* once finished, call the finished callback */
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+    else
+    {
+        /* User callback has asked us to stop with paComplete or other non-zero value */
+
+        /* IMPLEMENT ME - finish playback once currently queued audio has completed  */
+
+        /* once finished, call the finished callback */
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+}
+
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /*
+        IMPLEMENT ME:
+            - additional stream closing + cleanup
+    */
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    PaUtil_FreeMemory( stream );
+
+    return result;
+}
+
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior */
+
+    /* suppress unused function warning. the code in ExampleHostProcessingLoop or
+       something similar should be implemented to feed samples to and from the
+       host after StartStream() is called.
+    */
+    (void) ExampleHostProcessingLoop;
+
+    return result;
+}
+
+
+static PaError StopStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior */
+
+    return result;
+}
+
+
+static PaError AbortStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior */
+
+    return result;
+}
+
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior */
+
+    return 0;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior */
+
+    return 0;
+}
+
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return 0;
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+/*
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return paNoError;
+}
+
+
+static PaError WriteStream( PaStream* s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return paNoError;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return 0;
+}
+
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaSkeletonStream *stream = (PaSkeletonStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+    
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+
+    return 0;
+}
+
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/AudioSessionTypes.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/AudioSessionTypes.h
new file mode 100644
index 0000000000..385e9007e3
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/AudioSessionTypes.h
@@ -0,0 +1,94 @@
+//
+// AudioSessionTypes.h -- Copyright Microsoft Corporation, All Rights Reserved.
+//
+// Description: Type definitions used by the audio session manager RPC/COM interfaces
+//
+#pragma once
+
+#ifndef __AUDIOSESSIONTYPES__
+#define __AUDIOSESSIONTYPES__
+
+#if defined(__midl)
+#define MIDL_SIZE_IS(x) [size_is(x)]
+#define MIDL_STRING [string]
+#define MIDL_ANYSIZE_ARRAY
+#else   // !defined(__midl)
+#define MIDL_SIZE_IS(x)
+#define MIDL_STRING
+#define MIDL_ANYSIZE_ARRAY ANYSIZE_ARRAY
+#endif  // defined(__midl)
+
+//-------------------------------------------------------------------------
+// Description: AudioClient share mode
+//                                   
+//     AUDCLNT_SHAREMODE_SHARED -    The device will be opened in shared mode and use the 
+//                                   WAS format.
+//     AUDCLNT_SHAREMODE_EXCLUSIVE - The device will be opened in exclusive mode and use the 
+//                                   application specified format.
+//
+typedef enum _AUDCLNT_SHAREMODE
+{ 
+    AUDCLNT_SHAREMODE_SHARED, 
+    AUDCLNT_SHAREMODE_EXCLUSIVE 
+} AUDCLNT_SHAREMODE;
+
+//-------------------------------------------------------------------------
+// Description: AudioClient stream flags
+// 
+// Can be a combination of AUDCLNT_STREAMFLAGS and AUDCLNT_SYSFXFLAGS:
+// 
+// AUDCLNT_STREAMFLAGS (this group of flags uses the high word, w/exception of high-bit which is reserved, 0x7FFF0000):
+//                                  
+//     AUDCLNT_STREAMFLAGS_CROSSPROCESS - Audio policy control for this stream will be shared with 
+//                                        with other process sessions that use the same audio session 
+//                                        GUID.
+//     AUDCLNT_STREAMFLAGS_LOOPBACK -     Initializes a renderer endpoint for a loopback audio application. 
+//                                        In this mode, a capture stream will be opened on the specified 
+//                                        renderer endpoint. Shared mode and a renderer endpoint is required.
+//                                        Otherwise the IAudioClient::Initialize call will fail. If the 
+//                                        initialize is successful, a capture stream will be available 
+//                                        from the IAudioClient object.
+//
+//     AUDCLNT_STREAMFLAGS_EVENTCALLBACK - An exclusive mode client will supply an event handle that will be
+//                                         signaled when an IRP completes (or a waveRT buffer completes) telling
+//                                         it to fill the next buffer
+//
+//     AUDCLNT_STREAMFLAGS_NOPERSIST -    Session state will not be persisted
+//
+// AUDCLNT_SYSFXFLAGS (these flags use low word 0x0000FFFF):
+//
+//     none defined currently
+//
+#define AUDCLNT_STREAMFLAGS_CROSSPROCESS  0x00010000
+#define AUDCLNT_STREAMFLAGS_LOOPBACK      0x00020000
+#define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000
+#define AUDCLNT_STREAMFLAGS_NOPERSIST     0x00080000
+
+//-------------------------------------------------------------------------
+// Description: Device share mode - sharing mode for the audio device.
+//
+//      DeviceShared - The device can be shared with other processes.
+//      DeviceExclusive - The device will only be used by this process.
+//
+typedef enum _DeviceShareMode
+{ 
+    DeviceShared, 
+    DeviceExclusive 
+} DeviceShareMode;
+
+
+//-------------------------------------------------------------------------
+// Description: AudioSession State.
+//
+//      AudioSessionStateInactive - The session has no active audio streams.
+//      AudioSessionStateActive - The session has active audio streams.
+//      AudioSessionStateExpired - The session is dormant.
+typedef enum _AudioSessionState
+{
+    AudioSessionStateInactive = 0,
+    AudioSessionStateActive = 1,
+    AudioSessionStateExpired = 2
+} AudioSessionState;
+
+#endif
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/FunctionDiscoveryKeys_devpkey.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/FunctionDiscoveryKeys_devpkey.h
new file mode 100644
index 0000000000..abfd661e67
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/FunctionDiscoveryKeys_devpkey.h
@@ -0,0 +1,186 @@
+
+/*++
+
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Module Name:
+
+    devpkey.h
+
+Abstract:
+
+    Defines property keys for the Plug and Play Device Property API.
+
+Author:
+
+    Jim Cavalaris (jamesca) 10-14-2003
+
+Environment:
+
+    User-mode only.
+
+Revision History:
+
+    14-October-2003     jamesca
+
+        Creation and initial implementation.
+
+    20-June-2006        dougb
+
+        Copied Jim's version replaced "DEFINE_DEVPROPKEY(DEVPKEY_" with "DEFINE_PROPERTYKEY(PKEY_"
+    
+--*/
+
+//#include <devpropdef.h>
+
+//
+// _NAME
+//
+
+DEFINE_PROPERTYKEY(PKEY_NAME,                          0xb725f130, 0x47ef, 0x101a, 0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac, 10);    // DEVPROP_TYPE_STRING
+
+//
+// Device properties
+// These PKEYs correspond to the old setupapi SPDRP_XXX properties
+//
+DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc,             0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_HardwareIds,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 3);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_CompatibleIds,          0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 4);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_Service,                0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 6);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_Class,                  0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 9);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_ClassGuid,              0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 10);    // DEVPROP_TYPE_GUID
+DEFINE_PROPERTYKEY(PKEY_Device_Driver,                 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 11);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_ConfigFlags,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 12);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_Manufacturer,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 13);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_LocationInfo,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 15);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_PDOName,                0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 16);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_Capabilities,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 17);    // DEVPROP_TYPE_UNINT32
+DEFINE_PROPERTYKEY(PKEY_Device_UINumber,               0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 18);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_UpperFilters,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 19);    // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_LowerFilters,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 20);    // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_BusTypeGuid,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 21);    // DEVPROP_TYPE_GUID
+DEFINE_PROPERTYKEY(PKEY_Device_LegacyBusType,          0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 22);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_BusNumber,              0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 23);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_EnumeratorName,         0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 24);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_Security,               0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 25);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR
+DEFINE_PROPERTYKEY(PKEY_Device_SecuritySDS,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 26);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DevType,                0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 27);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_Exclusive,              0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 28);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_Characteristics,        0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 29);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_Address,                0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 30);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_UINumberDescFormat,     0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 31);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_PowerData,              0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 32);    // DEVPROP_TYPE_BINARY
+DEFINE_PROPERTYKEY(PKEY_Device_RemovalPolicy,          0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 33);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_RemovalPolicyDefault,   0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 34);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_RemovalPolicyOverride,  0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 35);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_InstallState,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 36);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_LocationPaths,          0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 37);    // DEVPROP_TYPE_STRING_LIST
+
+//
+// Device properties
+// These PKEYs correspond to a device's status and problem code
+//
+DEFINE_PROPERTYKEY(PKEY_Device_DevNodeStatus,          0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 2);     // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_ProblemCode,            0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 3);     // DEVPROP_TYPE_UINT32
+
+//
+// Device properties
+// These PKEYs correspond to device relations
+//
+DEFINE_PROPERTYKEY(PKEY_Device_EjectionRelations,      0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 4);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_RemovalRelations,       0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 5);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_PowerRelations,         0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 6);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_BusRelations,           0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 7);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_Parent,                 0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 8);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_Children,               0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 9);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_Siblings,               0x4340a6c5, 0x93fa, 0x4706, 0x97, 0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 10);    // DEVPROP_TYPE_STRING_LIST
+
+//
+// Other Device properties
+//
+DEFINE_PROPERTYKEY(PKEY_Device_Reported,               0x80497100, 0x8c73, 0x48b9, 0xaa, 0xd9, 0xce, 0x38, 0x7e, 0x19, 0xc5, 0x6e, 2);     // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_Device_Legacy,                 0x80497100, 0x8c73, 0x48b9, 0xaa, 0xd9, 0xce, 0x38, 0x7e, 0x19, 0xc5, 0x6e, 3);     // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_Device_InstanceId,             0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 256);   // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Numa_Proximity_Domain,         0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 1);     // DEVPROP_TYPE_UINT32
+
+//
+// Device driver properties
+//
+DEFINE_PROPERTYKEY(PKEY_Device_DriverDate,             0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 2);      // DEVPROP_TYPE_FILETIME
+DEFINE_PROPERTYKEY(PKEY_Device_DriverVersion,          0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 3);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverDesc,             0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 4);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverInfPath,          0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 5);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverInfSection,       0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 6);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverInfSectionExt,    0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 7);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_MatchingDeviceId,       0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 8);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverProvider,         0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 9);      // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverPropPageProvider, 0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 10);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverCoInstallers,     0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 11);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_Device_ResourcePickerTags,     0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 12);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_ResourcePickerExceptions, 0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 13); // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DriverRank,             0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 14);     // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_DriverLogoLevel,        0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 15);     // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_Device_NoConnectSound,         0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 17);     // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_Device_GenericDriverInstalled, 0xa8b865dd, 0x2e3d, 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 18);     // DEVPROP_TYPE_BOOLEAN
+
+
+//
+// Device properties that were set by the driver package that was installed
+// on the device.
+//
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_Model,                  0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 2);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_VendorWebSite,          0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 3);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_DetailedDescription,    0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 4);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_DocumentationLink,      0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 5);     // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_Icon,                   0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 6);     // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_DrvPkg_BrandingIcon,           0xcf73bb51, 0x3abf, 0x44a2, 0x85, 0xe0, 0x9a, 0x3d, 0xc7, 0xa1, 0x21, 0x32, 7);     // DEVPROP_TYPE_STRING_LIST
+
+//
+// Device setup class properties
+// These PKEYs correspond to the old setupapi SPCRP_XXX properties
+//
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_UpperFilters,      0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 19);    // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_LowerFilters,      0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 20);    // DEVPROP_TYPE_STRING_LIST
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_Security,          0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 25);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_SecuritySDS,       0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 26);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_DevType,           0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 27);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_Exclusive,         0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 28);    // DEVPROP_TYPE_UINT32
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_Characteristics,   0x4321918b, 0xf69e, 0x470d, 0xa5, 0xde, 0x4d, 0x88, 0xc7, 0x5a, 0xd2, 0x4b, 29);    // DEVPROP_TYPE_UINT32
+
+//
+// Device setup class properties
+// These PKEYs correspond to registry values under the device class GUID key
+//
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_Name,              0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 2);  // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_ClassName,         0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 3);  // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_Icon,              0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 4);  // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_ClassInstaller,    0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 5);  // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_PropPageProvider,  0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 6);  // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_NoInstallClass,    0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 7);  // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_NoDisplayClass,    0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 8);  // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_SilentInstall,     0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 9);  // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_NoUseClass,        0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 10); // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_DefaultService,    0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 11); // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_IconPath,          0x259abffc, 0x50a7, 0x47ce, 0xaf, 0x8, 0x68, 0xc9, 0xa7, 0xd7, 0x33, 0x66, 12); // DEVPROP_TYPE_STRING_LIST
+
+//
+// Other Device setup class properties
+//
+DEFINE_PROPERTYKEY(PKEY_DeviceClass_ClassCoInstallers, 0x713d1703, 0xa2e2, 0x49f5, 0x92, 0x14, 0x56, 0x47, 0x2e, 0xf3, 0xda, 0x5c, 2); // DEVPROP_TYPE_STRING_LIST
+
+//
+// Device interface properties
+//
+DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName,  0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2); // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceInterface_Enabled,       0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 3); // DEVPROP_TYPE_BOOLEAN
+DEFINE_PROPERTYKEY(PKEY_DeviceInterface_ClassGuid,     0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 4); // DEVPROP_TYPE_GUID
+
+//
+// Device interface class properties
+//
+DEFINE_PROPERTYKEY(PKEY_DeviceInterfaceClass_DefaultInterface,  0x14c83a99, 0x0b3f, 0x44b7, 0xbe, 0x4c, 0xa1, 0x78, 0xd3, 0x99, 0x05, 0x64, 2); // DEVPROP_TYPE_STRING
+
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h
new file mode 100644
index 0000000000..bf77baf029
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h
@@ -0,0 +1,1177 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for audioclient.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __audioclient_h__
+#define __audioclient_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IAudioClient_FWD_DEFINED__
+#define __IAudioClient_FWD_DEFINED__
+typedef interface IAudioClient IAudioClient;
+#endif 	/* __IAudioClient_FWD_DEFINED__ */
+
+
+#ifndef __IAudioRenderClient_FWD_DEFINED__
+#define __IAudioRenderClient_FWD_DEFINED__
+typedef interface IAudioRenderClient IAudioRenderClient;
+#endif 	/* __IAudioRenderClient_FWD_DEFINED__ */
+
+
+#ifndef __IAudioCaptureClient_FWD_DEFINED__
+#define __IAudioCaptureClient_FWD_DEFINED__
+typedef interface IAudioCaptureClient IAudioCaptureClient;
+#endif 	/* __IAudioCaptureClient_FWD_DEFINED__ */
+
+
+#ifndef __IAudioClock_FWD_DEFINED__
+#define __IAudioClock_FWD_DEFINED__
+typedef interface IAudioClock IAudioClock;
+#endif 	/* __IAudioClock_FWD_DEFINED__ */
+
+
+#ifndef __ISimpleAudioVolume_FWD_DEFINED__
+#define __ISimpleAudioVolume_FWD_DEFINED__
+typedef interface ISimpleAudioVolume ISimpleAudioVolume;
+#endif 	/* __ISimpleAudioVolume_FWD_DEFINED__ */
+
+
+#ifndef __IAudioStreamVolume_FWD_DEFINED__
+#define __IAudioStreamVolume_FWD_DEFINED__
+typedef interface IAudioStreamVolume IAudioStreamVolume;
+#endif 	/* __IAudioStreamVolume_FWD_DEFINED__ */
+
+
+#ifndef __IChannelAudioVolume_FWD_DEFINED__
+#define __IChannelAudioVolume_FWD_DEFINED__
+typedef interface IChannelAudioVolume IChannelAudioVolume;
+#endif 	/* __IChannelAudioVolume_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "wtypes.h"
+#include "unknwn.h"
+#include "AudioSessionTypes.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_audioclient_0000_0000 */
+/* [local] */ 
+
+#if 0
+typedef /* [hidden][restricted] */ struct WAVEFORMATEX
+    {
+    WORD wFormatTag;
+    WORD nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD nBlockAlign;
+    WORD wBitsPerSample;
+    WORD cbSize;
+    } 	WAVEFORMATEX;
+
+#else
+#include <mmreg.h>
+#endif
+#if 0
+typedef /* [hidden][restricted] */ LONGLONG REFERENCE_TIME;
+
+#else
+#define _IKsControl_
+#include <ks.h>
+#include <ksmedia.h>
+#endif
+
+enum _AUDCLNT_BUFFERFLAGS
+    {	AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY	= 0x1,
+	AUDCLNT_BUFFERFLAGS_SILENT	= 0x2,
+	AUDCLNT_BUFFERFLAGS_TIMESTAMP_ERROR	= 0x4
+    } ;
+
+
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IAudioClient_INTERFACE_DEFINED__
+#define __IAudioClient_INTERFACE_DEFINED__
+
+/* interface IAudioClient */
+/* [local][unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IAudioClient;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("1CB9AD4C-DBFA-4c32-B178-C2F568A703B2")
+    IAudioClient : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Initialize( 
+            /* [in] */ 
+            __in  AUDCLNT_SHAREMODE ShareMode,
+            /* [in] */ 
+            __in  DWORD StreamFlags,
+            /* [in] */ 
+            __in  REFERENCE_TIME hnsBufferDuration,
+            /* [in] */ 
+            __in  REFERENCE_TIME hnsPeriodicity,
+            /* [in] */ 
+            __in  const WAVEFORMATEX *pFormat,
+            /* [in] */ 
+            __in_opt  LPCGUID AudioSessionGuid) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetBufferSize( 
+            /* [out] */ 
+            __out  UINT32 *pNumBufferFrames) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetStreamLatency( 
+            /* [out] */ 
+            __out  REFERENCE_TIME *phnsLatency) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetCurrentPadding( 
+            /* [out] */ 
+            __out  UINT32 *pNumPaddingFrames) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE IsFormatSupported( 
+            /* [in] */ 
+            __in  AUDCLNT_SHAREMODE ShareMode,
+            /* [in] */ 
+            __in  const WAVEFORMATEX *pFormat,
+            /* [unique][out] */ 
+            __out_opt  WAVEFORMATEX **ppClosestMatch) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetMixFormat( 
+            /* [out] */ 
+            __out  WAVEFORMATEX **ppDeviceFormat) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetDevicePeriod( 
+            /* [out] */ 
+            __out_opt  REFERENCE_TIME *phnsDefaultDevicePeriod,
+            /* [out] */ 
+            __out_opt  REFERENCE_TIME *phnsMinimumDevicePeriod) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Start( void) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Stop( void) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetEventHandle( 
+            /* [in] */ HANDLE eventHandle) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetService( 
+            /* [in] */ 
+            __in  REFIID riid,
+            /* [iid_is][out] */ 
+            __out  void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioClientVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioClient * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioClient * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Initialize )( 
+            IAudioClient * This,
+            /* [in] */ 
+            __in  AUDCLNT_SHAREMODE ShareMode,
+            /* [in] */ 
+            __in  DWORD StreamFlags,
+            /* [in] */ 
+            __in  REFERENCE_TIME hnsBufferDuration,
+            /* [in] */ 
+            __in  REFERENCE_TIME hnsPeriodicity,
+            /* [in] */ 
+            __in  const WAVEFORMATEX *pFormat,
+            /* [in] */ 
+            __in_opt  LPCGUID AudioSessionGuid);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetBufferSize )( 
+            IAudioClient * This,
+            /* [out] */ 
+            __out  UINT32 *pNumBufferFrames);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetStreamLatency )( 
+            IAudioClient * This,
+            /* [out] */ 
+            __out  REFERENCE_TIME *phnsLatency);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCurrentPadding )( 
+            IAudioClient * This,
+            /* [out] */ 
+            __out  UINT32 *pNumPaddingFrames);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsFormatSupported )( 
+            IAudioClient * This,
+            /* [in] */ 
+            __in  AUDCLNT_SHAREMODE ShareMode,
+            /* [in] */ 
+            __in  const WAVEFORMATEX *pFormat,
+            /* [unique][out] */ 
+            __out_opt  WAVEFORMATEX **ppClosestMatch);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetMixFormat )( 
+            IAudioClient * This,
+            /* [out] */ 
+            __out  WAVEFORMATEX **ppDeviceFormat);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDevicePeriod )( 
+            IAudioClient * This,
+            /* [out] */ 
+            __out_opt  REFERENCE_TIME *phnsDefaultDevicePeriod,
+            /* [out] */ 
+            __out_opt  REFERENCE_TIME *phnsMinimumDevicePeriod);
+        
+        HRESULT ( STDMETHODCALLTYPE *Start )( 
+            IAudioClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Stop )( 
+            IAudioClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Reset )( 
+            IAudioClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetEventHandle )( 
+            IAudioClient * This,
+            /* [in] */ HANDLE eventHandle);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetService )( 
+            IAudioClient * This,
+            /* [in] */ 
+            __in  REFIID riid,
+            /* [iid_is][out] */ 
+            __out  void **ppv);
+        
+        END_INTERFACE
+    } IAudioClientVtbl;
+
+    interface IAudioClient
+    {
+        CONST_VTBL struct IAudioClientVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioClient_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioClient_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioClient_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioClient_Initialize(This,ShareMode,StreamFlags,hnsBufferDuration,hnsPeriodicity,pFormat,AudioSessionGuid)	\
+    ( (This)->lpVtbl -> Initialize(This,ShareMode,StreamFlags,hnsBufferDuration,hnsPeriodicity,pFormat,AudioSessionGuid) ) 
+
+#define IAudioClient_GetBufferSize(This,pNumBufferFrames)	\
+    ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) ) 
+
+#define IAudioClient_GetStreamLatency(This,phnsLatency)	\
+    ( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) ) 
+
+#define IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
+    ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) ) 
+
+#define IAudioClient_IsFormatSupported(This,ShareMode,pFormat,ppClosestMatch)	\
+    ( (This)->lpVtbl -> IsFormatSupported(This,ShareMode,pFormat,ppClosestMatch) ) 
+
+#define IAudioClient_GetMixFormat(This,ppDeviceFormat)	\
+    ( (This)->lpVtbl -> GetMixFormat(This,ppDeviceFormat) ) 
+
+#define IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	\
+    ( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) ) 
+
+#define IAudioClient_Start(This)	\
+    ( (This)->lpVtbl -> Start(This) ) 
+
+#define IAudioClient_Stop(This)	\
+    ( (This)->lpVtbl -> Stop(This) ) 
+
+#define IAudioClient_Reset(This)	\
+    ( (This)->lpVtbl -> Reset(This) ) 
+
+#define IAudioClient_SetEventHandle(This,eventHandle)	\
+    ( (This)->lpVtbl -> SetEventHandle(This,eventHandle) ) 
+
+#define IAudioClient_GetService(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetService(This,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioClient_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioRenderClient_INTERFACE_DEFINED__
+#define __IAudioRenderClient_INTERFACE_DEFINED__
+
+/* interface IAudioRenderClient */
+/* [local][unique][helpstring][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IAudioRenderClient;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("F294ACFC-3146-4483-A7BF-ADDCA7C260E2")
+    IAudioRenderClient : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetBuffer( 
+            /* [in] */ 
+            __in  UINT32 NumFramesRequested,
+            /* [out] */ 
+            __out  BYTE **ppData) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE ReleaseBuffer( 
+            /* [in] */ 
+            __in  UINT32 NumFramesWritten,
+            /* [in] */ 
+            __in  DWORD dwFlags) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioRenderClientVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioRenderClient * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioRenderClient * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioRenderClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetBuffer )( 
+            IAudioRenderClient * This,
+            /* [in] */ 
+            __in  UINT32 NumFramesRequested,
+            /* [out] */ 
+            __out  BYTE **ppData);
+        
+        HRESULT ( STDMETHODCALLTYPE *ReleaseBuffer )( 
+            IAudioRenderClient * This,
+            /* [in] */ 
+            __in  UINT32 NumFramesWritten,
+            /* [in] */ 
+            __in  DWORD dwFlags);
+        
+        END_INTERFACE
+    } IAudioRenderClientVtbl;
+
+    interface IAudioRenderClient
+    {
+        CONST_VTBL struct IAudioRenderClientVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioRenderClient_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioRenderClient_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioRenderClient_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
+    ( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) ) 
+
+#define IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
+    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioRenderClient_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioCaptureClient_INTERFACE_DEFINED__
+#define __IAudioCaptureClient_INTERFACE_DEFINED__
+
+/* interface IAudioCaptureClient */
+/* [local][unique][helpstring][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IAudioCaptureClient;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("C8ADBD64-E71E-48a0-A4DE-185C395CD317")
+    IAudioCaptureClient : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetBuffer( 
+            /* [out] */ 
+            __out  BYTE **ppData,
+            /* [out] */ 
+            __out  UINT32 *pNumFramesToRead,
+            /* [out] */ 
+            __out  DWORD *pdwFlags,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64DevicePosition,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64QPCPosition) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE ReleaseBuffer( 
+            /* [in] */ 
+            __in  UINT32 NumFramesRead) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetNextPacketSize( 
+            /* [out] */ 
+            __out  UINT32 *pNumFramesInNextPacket) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioCaptureClientVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioCaptureClient * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioCaptureClient * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioCaptureClient * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetBuffer )( 
+            IAudioCaptureClient * This,
+            /* [out] */ 
+            __out  BYTE **ppData,
+            /* [out] */ 
+            __out  UINT32 *pNumFramesToRead,
+            /* [out] */ 
+            __out  DWORD *pdwFlags,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64DevicePosition,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64QPCPosition);
+        
+        HRESULT ( STDMETHODCALLTYPE *ReleaseBuffer )( 
+            IAudioCaptureClient * This,
+            /* [in] */ 
+            __in  UINT32 NumFramesRead);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetNextPacketSize )( 
+            IAudioCaptureClient * This,
+            /* [out] */ 
+            __out  UINT32 *pNumFramesInNextPacket);
+        
+        END_INTERFACE
+    } IAudioCaptureClientVtbl;
+
+    interface IAudioCaptureClient
+    {
+        CONST_VTBL struct IAudioCaptureClientVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioCaptureClient_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioCaptureClient_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioCaptureClient_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioCaptureClient_GetBuffer(This,ppData,pNumFramesToRead,pdwFlags,pu64DevicePosition,pu64QPCPosition)	\
+    ( (This)->lpVtbl -> GetBuffer(This,ppData,pNumFramesToRead,pdwFlags,pu64DevicePosition,pu64QPCPosition) ) 
+
+#define IAudioCaptureClient_ReleaseBuffer(This,NumFramesRead)	\
+    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesRead) ) 
+
+#define IAudioCaptureClient_GetNextPacketSize(This,pNumFramesInNextPacket)	\
+    ( (This)->lpVtbl -> GetNextPacketSize(This,pNumFramesInNextPacket) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioCaptureClient_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_audioclient_0000_0003 */
+/* [local] */ 
+
+#define AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ  0x00000001
+
+
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0003_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0003_v0_0_s_ifspec;
+
+#ifndef __IAudioClock_INTERFACE_DEFINED__
+#define __IAudioClock_INTERFACE_DEFINED__
+
+/* interface IAudioClock */
+/* [local][unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IAudioClock;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("CD63314F-3FBA-4a1b-812C-EF96358728E7")
+    IAudioClock : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetFrequency( 
+            /* [out] */ 
+            __out  UINT64 *pu64Frequency) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPosition( 
+            /* [out] */ 
+            __out  UINT64 *pu64Position,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64QPCPosition) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetCharacteristics( 
+            /* [out] */ 
+            __out  DWORD *pdwCharacteristics) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioClockVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioClock * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioClock * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioClock * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetFrequency )( 
+            IAudioClock * This,
+            /* [out] */ 
+            __out  UINT64 *pu64Frequency);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPosition )( 
+            IAudioClock * This,
+            /* [out] */ 
+            __out  UINT64 *pu64Position,
+            /* [unique][out] */ 
+            __out_opt  UINT64 *pu64QPCPosition);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCharacteristics )( 
+            IAudioClock * This,
+            /* [out] */ 
+            __out  DWORD *pdwCharacteristics);
+        
+        END_INTERFACE
+    } IAudioClockVtbl;
+
+    interface IAudioClock
+    {
+        CONST_VTBL struct IAudioClockVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioClock_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioClock_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioClock_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioClock_GetFrequency(This,pu64Frequency)	\
+    ( (This)->lpVtbl -> GetFrequency(This,pu64Frequency) ) 
+
+#define IAudioClock_GetPosition(This,pu64Position,pu64QPCPosition)	\
+    ( (This)->lpVtbl -> GetPosition(This,pu64Position,pu64QPCPosition) ) 
+
+#define IAudioClock_GetCharacteristics(This,pdwCharacteristics)	\
+    ( (This)->lpVtbl -> GetCharacteristics(This,pdwCharacteristics) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioClock_INTERFACE_DEFINED__ */
+
+
+#ifndef __ISimpleAudioVolume_INTERFACE_DEFINED__
+#define __ISimpleAudioVolume_INTERFACE_DEFINED__
+
+/* interface ISimpleAudioVolume */
+/* [local][unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_ISimpleAudioVolume;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("87CE5498-68D6-44E5-9215-6DA47EF883D8")
+    ISimpleAudioVolume : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE SetMasterVolume( 
+            /* [in] */ 
+            __in  float fLevel,
+            /* [unique][in] */ LPCGUID EventContext) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetMasterVolume( 
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetMute( 
+            /* [in] */ 
+            __in  const BOOL bMute,
+            /* [unique][in] */ LPCGUID EventContext) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetMute( 
+            /* [out] */ 
+            __out  BOOL *pbMute) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ISimpleAudioVolumeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ISimpleAudioVolume * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ISimpleAudioVolume * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ISimpleAudioVolume * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetMasterVolume )( 
+            ISimpleAudioVolume * This,
+            /* [in] */ 
+            __in  float fLevel,
+            /* [unique][in] */ LPCGUID EventContext);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetMasterVolume )( 
+            ISimpleAudioVolume * This,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetMute )( 
+            ISimpleAudioVolume * This,
+            /* [in] */ 
+            __in  const BOOL bMute,
+            /* [unique][in] */ LPCGUID EventContext);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetMute )( 
+            ISimpleAudioVolume * This,
+            /* [out] */ 
+            __out  BOOL *pbMute);
+        
+        END_INTERFACE
+    } ISimpleAudioVolumeVtbl;
+
+    interface ISimpleAudioVolume
+    {
+        CONST_VTBL struct ISimpleAudioVolumeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ISimpleAudioVolume_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ISimpleAudioVolume_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ISimpleAudioVolume_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ISimpleAudioVolume_SetMasterVolume(This,fLevel,EventContext)	\
+    ( (This)->lpVtbl -> SetMasterVolume(This,fLevel,EventContext) ) 
+
+#define ISimpleAudioVolume_GetMasterVolume(This,pfLevel)	\
+    ( (This)->lpVtbl -> GetMasterVolume(This,pfLevel) ) 
+
+#define ISimpleAudioVolume_SetMute(This,bMute,EventContext)	\
+    ( (This)->lpVtbl -> SetMute(This,bMute,EventContext) ) 
+
+#define ISimpleAudioVolume_GetMute(This,pbMute)	\
+    ( (This)->lpVtbl -> GetMute(This,pbMute) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ISimpleAudioVolume_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioStreamVolume_INTERFACE_DEFINED__
+#define __IAudioStreamVolume_INTERFACE_DEFINED__
+
+/* interface IAudioStreamVolume */
+/* [local][unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IAudioStreamVolume;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("93014887-242D-4068-8A15-CF5E93B90FE3")
+    IAudioStreamVolume : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetChannelCount( 
+            /* [out] */ 
+            __out  UINT32 *pdwCount) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetChannelVolume( 
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [in] */ 
+            __in  const float fLevel) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetChannelVolume( 
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetAllVolumes( 
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][in] */ 
+            __in_ecount(dwCount)  const float *pfVolumes) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAllVolumes( 
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][out] */ 
+            __out_ecount(dwCount)  float *pfVolumes) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioStreamVolumeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioStreamVolume * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioStreamVolume * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioStreamVolume * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioStreamVolume * This,
+            /* [out] */ 
+            __out  UINT32 *pdwCount);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetChannelVolume )( 
+            IAudioStreamVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [in] */ 
+            __in  const float fLevel);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetChannelVolume )( 
+            IAudioStreamVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetAllVolumes )( 
+            IAudioStreamVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][in] */ 
+            __in_ecount(dwCount)  const float *pfVolumes);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAllVolumes )( 
+            IAudioStreamVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][out] */ 
+            __out_ecount(dwCount)  float *pfVolumes);
+        
+        END_INTERFACE
+    } IAudioStreamVolumeVtbl;
+
+    interface IAudioStreamVolume
+    {
+        CONST_VTBL struct IAudioStreamVolumeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioStreamVolume_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioStreamVolume_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioStreamVolume_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioStreamVolume_GetChannelCount(This,pdwCount)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pdwCount) ) 
+
+#define IAudioStreamVolume_SetChannelVolume(This,dwIndex,fLevel)	\
+    ( (This)->lpVtbl -> SetChannelVolume(This,dwIndex,fLevel) ) 
+
+#define IAudioStreamVolume_GetChannelVolume(This,dwIndex,pfLevel)	\
+    ( (This)->lpVtbl -> GetChannelVolume(This,dwIndex,pfLevel) ) 
+
+#define IAudioStreamVolume_SetAllVolumes(This,dwCount,pfVolumes)	\
+    ( (This)->lpVtbl -> SetAllVolumes(This,dwCount,pfVolumes) ) 
+
+#define IAudioStreamVolume_GetAllVolumes(This,dwCount,pfVolumes)	\
+    ( (This)->lpVtbl -> GetAllVolumes(This,dwCount,pfVolumes) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioStreamVolume_INTERFACE_DEFINED__ */
+
+
+#ifndef __IChannelAudioVolume_INTERFACE_DEFINED__
+#define __IChannelAudioVolume_INTERFACE_DEFINED__
+
+/* interface IChannelAudioVolume */
+/* [local][unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IChannelAudioVolume;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("1C158861-B533-4B30-B1CF-E853E51C59B8")
+    IChannelAudioVolume : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetChannelCount( 
+            /* [out] */ 
+            __out  UINT32 *pdwCount) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetChannelVolume( 
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [in] */ 
+            __in  const float fLevel,
+            /* [unique][in] */ LPCGUID EventContext) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetChannelVolume( 
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetAllVolumes( 
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][in] */ 
+            __in_ecount(dwCount)  const float *pfVolumes,
+            /* [unique][in] */ LPCGUID EventContext) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAllVolumes( 
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][out] */ 
+            __out_ecount(dwCount)  float *pfVolumes) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IChannelAudioVolumeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IChannelAudioVolume * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IChannelAudioVolume * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IChannelAudioVolume * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IChannelAudioVolume * This,
+            /* [out] */ 
+            __out  UINT32 *pdwCount);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetChannelVolume )( 
+            IChannelAudioVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [in] */ 
+            __in  const float fLevel,
+            /* [unique][in] */ LPCGUID EventContext);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetChannelVolume )( 
+            IChannelAudioVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwIndex,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetAllVolumes )( 
+            IChannelAudioVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][in] */ 
+            __in_ecount(dwCount)  const float *pfVolumes,
+            /* [unique][in] */ LPCGUID EventContext);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAllVolumes )( 
+            IChannelAudioVolume * This,
+            /* [in] */ 
+            __in  UINT32 dwCount,
+            /* [size_is][out] */ 
+            __out_ecount(dwCount)  float *pfVolumes);
+        
+        END_INTERFACE
+    } IChannelAudioVolumeVtbl;
+
+    interface IChannelAudioVolume
+    {
+        CONST_VTBL struct IChannelAudioVolumeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IChannelAudioVolume_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IChannelAudioVolume_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IChannelAudioVolume_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IChannelAudioVolume_GetChannelCount(This,pdwCount)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pdwCount) ) 
+
+#define IChannelAudioVolume_SetChannelVolume(This,dwIndex,fLevel,EventContext)	\
+    ( (This)->lpVtbl -> SetChannelVolume(This,dwIndex,fLevel,EventContext) ) 
+
+#define IChannelAudioVolume_GetChannelVolume(This,dwIndex,pfLevel)	\
+    ( (This)->lpVtbl -> GetChannelVolume(This,dwIndex,pfLevel) ) 
+
+#define IChannelAudioVolume_SetAllVolumes(This,dwCount,pfVolumes,EventContext)	\
+    ( (This)->lpVtbl -> SetAllVolumes(This,dwCount,pfVolumes,EventContext) ) 
+
+#define IChannelAudioVolume_GetAllVolumes(This,dwCount,pfVolumes)	\
+    ( (This)->lpVtbl -> GetAllVolumes(This,dwCount,pfVolumes) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IChannelAudioVolume_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_audioclient_0000_0007 */
+/* [local] */ 
+
+#define FACILITY_AUDCLNT 0x889
+#define AUDCLNT_ERR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_AUDCLNT, n)
+#define AUDCLNT_SUCCESS(n) MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_AUDCLNT, n)
+#define AUDCLNT_E_NOT_INITIALIZED            AUDCLNT_ERR(0x001)
+#define AUDCLNT_E_ALREADY_INITIALIZED        AUDCLNT_ERR(0x002)
+#define AUDCLNT_E_WRONG_ENDPOINT_TYPE        AUDCLNT_ERR(0x003)
+#define AUDCLNT_E_DEVICE_INVALIDATED         AUDCLNT_ERR(0x004)
+#define AUDCLNT_E_NOT_STOPPED                AUDCLNT_ERR(0x005)
+#define AUDCLNT_E_BUFFER_TOO_LARGE           AUDCLNT_ERR(0x006)
+#define AUDCLNT_E_OUT_OF_ORDER               AUDCLNT_ERR(0x007)
+#define AUDCLNT_E_UNSUPPORTED_FORMAT         AUDCLNT_ERR(0x008)
+#define AUDCLNT_E_INVALID_SIZE               AUDCLNT_ERR(0x009)
+#define AUDCLNT_E_DEVICE_IN_USE              AUDCLNT_ERR(0x00a)
+#define AUDCLNT_E_BUFFER_OPERATION_PENDING   AUDCLNT_ERR(0x00b)
+#define AUDCLNT_E_THREAD_NOT_REGISTERED      AUDCLNT_ERR(0x00c)
+#define AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED AUDCLNT_ERR(0x00e)
+#define AUDCLNT_E_ENDPOINT_CREATE_FAILED     AUDCLNT_ERR(0x00f)
+#define AUDCLNT_E_SERVICE_NOT_RUNNING        AUDCLNT_ERR(0x010)
+#define AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED     AUDCLNT_ERR(0x011)
+#define AUDCLNT_E_EXCLUSIVE_MODE_ONLY          AUDCLNT_ERR(0x012)
+#define AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL AUDCLNT_ERR(0x013)
+#define AUDCLNT_E_EVENTHANDLE_NOT_SET          AUDCLNT_ERR(0x014)
+#define AUDCLNT_E_INCORRECT_BUFFER_SIZE        AUDCLNT_ERR(0x015)
+#define AUDCLNT_E_BUFFER_SIZE_ERROR            AUDCLNT_ERR(0x016)
+#define AUDCLNT_E_CPUUSAGE_EXCEEDED            AUDCLNT_ERR(0x017)
+#define AUDCLNT_S_BUFFER_EMPTY              AUDCLNT_SUCCESS(0x001)
+#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x002)
+#define AUDCLNT_S_POSITION_STALLED		   AUDCLNT_SUCCESS(0x003)
+
+
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0007_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_audioclient_0000_0007_v0_0_s_ifspec;
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h
new file mode 100644
index 0000000000..7a1f75c4ee
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h
@@ -0,0 +1,3275 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for devicetopology.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __devicetopology_h__
+#define __devicetopology_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IKsControl_FWD_DEFINED__
+#define __IKsControl_FWD_DEFINED__
+typedef interface IKsControl IKsControl;
+#endif 	/* __IKsControl_FWD_DEFINED__ */
+
+
+#ifndef __IPerChannelDbLevel_FWD_DEFINED__
+#define __IPerChannelDbLevel_FWD_DEFINED__
+typedef interface IPerChannelDbLevel IPerChannelDbLevel;
+#endif 	/* __IPerChannelDbLevel_FWD_DEFINED__ */
+
+
+#ifndef __IAudioVolumeLevel_FWD_DEFINED__
+#define __IAudioVolumeLevel_FWD_DEFINED__
+typedef interface IAudioVolumeLevel IAudioVolumeLevel;
+#endif 	/* __IAudioVolumeLevel_FWD_DEFINED__ */
+
+
+#ifndef __IAudioChannelConfig_FWD_DEFINED__
+#define __IAudioChannelConfig_FWD_DEFINED__
+typedef interface IAudioChannelConfig IAudioChannelConfig;
+#endif 	/* __IAudioChannelConfig_FWD_DEFINED__ */
+
+
+#ifndef __IAudioLoudness_FWD_DEFINED__
+#define __IAudioLoudness_FWD_DEFINED__
+typedef interface IAudioLoudness IAudioLoudness;
+#endif 	/* __IAudioLoudness_FWD_DEFINED__ */
+
+
+#ifndef __IAudioInputSelector_FWD_DEFINED__
+#define __IAudioInputSelector_FWD_DEFINED__
+typedef interface IAudioInputSelector IAudioInputSelector;
+#endif 	/* __IAudioInputSelector_FWD_DEFINED__ */
+
+
+#ifndef __IAudioOutputSelector_FWD_DEFINED__
+#define __IAudioOutputSelector_FWD_DEFINED__
+typedef interface IAudioOutputSelector IAudioOutputSelector;
+#endif 	/* __IAudioOutputSelector_FWD_DEFINED__ */
+
+
+#ifndef __IAudioMute_FWD_DEFINED__
+#define __IAudioMute_FWD_DEFINED__
+typedef interface IAudioMute IAudioMute;
+#endif 	/* __IAudioMute_FWD_DEFINED__ */
+
+
+#ifndef __IAudioBass_FWD_DEFINED__
+#define __IAudioBass_FWD_DEFINED__
+typedef interface IAudioBass IAudioBass;
+#endif 	/* __IAudioBass_FWD_DEFINED__ */
+
+
+#ifndef __IAudioMidrange_FWD_DEFINED__
+#define __IAudioMidrange_FWD_DEFINED__
+typedef interface IAudioMidrange IAudioMidrange;
+#endif 	/* __IAudioMidrange_FWD_DEFINED__ */
+
+
+#ifndef __IAudioTreble_FWD_DEFINED__
+#define __IAudioTreble_FWD_DEFINED__
+typedef interface IAudioTreble IAudioTreble;
+#endif 	/* __IAudioTreble_FWD_DEFINED__ */
+
+
+#ifndef __IAudioAutoGainControl_FWD_DEFINED__
+#define __IAudioAutoGainControl_FWD_DEFINED__
+typedef interface IAudioAutoGainControl IAudioAutoGainControl;
+#endif 	/* __IAudioAutoGainControl_FWD_DEFINED__ */
+
+
+#ifndef __IAudioPeakMeter_FWD_DEFINED__
+#define __IAudioPeakMeter_FWD_DEFINED__
+typedef interface IAudioPeakMeter IAudioPeakMeter;
+#endif 	/* __IAudioPeakMeter_FWD_DEFINED__ */
+
+
+#ifndef __IDeviceSpecificProperty_FWD_DEFINED__
+#define __IDeviceSpecificProperty_FWD_DEFINED__
+typedef interface IDeviceSpecificProperty IDeviceSpecificProperty;
+#endif 	/* __IDeviceSpecificProperty_FWD_DEFINED__ */
+
+
+#ifndef __IKsFormatSupport_FWD_DEFINED__
+#define __IKsFormatSupport_FWD_DEFINED__
+typedef interface IKsFormatSupport IKsFormatSupport;
+#endif 	/* __IKsFormatSupport_FWD_DEFINED__ */
+
+
+#ifndef __IKsJackDescription_FWD_DEFINED__
+#define __IKsJackDescription_FWD_DEFINED__
+typedef interface IKsJackDescription IKsJackDescription;
+#endif 	/* __IKsJackDescription_FWD_DEFINED__ */
+
+
+#ifndef __IPartsList_FWD_DEFINED__
+#define __IPartsList_FWD_DEFINED__
+typedef interface IPartsList IPartsList;
+#endif 	/* __IPartsList_FWD_DEFINED__ */
+
+
+#ifndef __IPart_FWD_DEFINED__
+#define __IPart_FWD_DEFINED__
+typedef interface IPart IPart;
+#endif 	/* __IPart_FWD_DEFINED__ */
+
+
+#ifndef __IConnector_FWD_DEFINED__
+#define __IConnector_FWD_DEFINED__
+typedef interface IConnector IConnector;
+#endif 	/* __IConnector_FWD_DEFINED__ */
+
+
+#ifndef __ISubunit_FWD_DEFINED__
+#define __ISubunit_FWD_DEFINED__
+typedef interface ISubunit ISubunit;
+#endif 	/* __ISubunit_FWD_DEFINED__ */
+
+
+#ifndef __IControlInterface_FWD_DEFINED__
+#define __IControlInterface_FWD_DEFINED__
+typedef interface IControlInterface IControlInterface;
+#endif 	/* __IControlInterface_FWD_DEFINED__ */
+
+
+#ifndef __IControlChangeNotify_FWD_DEFINED__
+#define __IControlChangeNotify_FWD_DEFINED__
+typedef interface IControlChangeNotify IControlChangeNotify;
+#endif 	/* __IControlChangeNotify_FWD_DEFINED__ */
+
+
+#ifndef __IDeviceTopology_FWD_DEFINED__
+#define __IDeviceTopology_FWD_DEFINED__
+typedef interface IDeviceTopology IDeviceTopology;
+#endif 	/* __IDeviceTopology_FWD_DEFINED__ */
+
+
+#ifndef __DeviceTopology_FWD_DEFINED__
+#define __DeviceTopology_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class DeviceTopology DeviceTopology;
+#else
+typedef struct DeviceTopology DeviceTopology;
+#endif /* __cplusplus */
+
+#endif 	/* __DeviceTopology_FWD_DEFINED__ */
+
+
+#ifndef __IPartsList_FWD_DEFINED__
+#define __IPartsList_FWD_DEFINED__
+typedef interface IPartsList IPartsList;
+#endif 	/* __IPartsList_FWD_DEFINED__ */
+
+
+#ifndef __IPerChannelDbLevel_FWD_DEFINED__
+#define __IPerChannelDbLevel_FWD_DEFINED__
+typedef interface IPerChannelDbLevel IPerChannelDbLevel;
+#endif 	/* __IPerChannelDbLevel_FWD_DEFINED__ */
+
+
+#ifndef __IAudioVolumeLevel_FWD_DEFINED__
+#define __IAudioVolumeLevel_FWD_DEFINED__
+typedef interface IAudioVolumeLevel IAudioVolumeLevel;
+#endif 	/* __IAudioVolumeLevel_FWD_DEFINED__ */
+
+
+#ifndef __IAudioLoudness_FWD_DEFINED__
+#define __IAudioLoudness_FWD_DEFINED__
+typedef interface IAudioLoudness IAudioLoudness;
+#endif 	/* __IAudioLoudness_FWD_DEFINED__ */
+
+
+#ifndef __IAudioInputSelector_FWD_DEFINED__
+#define __IAudioInputSelector_FWD_DEFINED__
+typedef interface IAudioInputSelector IAudioInputSelector;
+#endif 	/* __IAudioInputSelector_FWD_DEFINED__ */
+
+
+#ifndef __IAudioMute_FWD_DEFINED__
+#define __IAudioMute_FWD_DEFINED__
+typedef interface IAudioMute IAudioMute;
+#endif 	/* __IAudioMute_FWD_DEFINED__ */
+
+
+#ifndef __IAudioBass_FWD_DEFINED__
+#define __IAudioBass_FWD_DEFINED__
+typedef interface IAudioBass IAudioBass;
+#endif 	/* __IAudioBass_FWD_DEFINED__ */
+
+
+#ifndef __IAudioMidrange_FWD_DEFINED__
+#define __IAudioMidrange_FWD_DEFINED__
+typedef interface IAudioMidrange IAudioMidrange;
+#endif 	/* __IAudioMidrange_FWD_DEFINED__ */
+
+
+#ifndef __IAudioTreble_FWD_DEFINED__
+#define __IAudioTreble_FWD_DEFINED__
+typedef interface IAudioTreble IAudioTreble;
+#endif 	/* __IAudioTreble_FWD_DEFINED__ */
+
+
+#ifndef __IAudioAutoGainControl_FWD_DEFINED__
+#define __IAudioAutoGainControl_FWD_DEFINED__
+typedef interface IAudioAutoGainControl IAudioAutoGainControl;
+#endif 	/* __IAudioAutoGainControl_FWD_DEFINED__ */
+
+
+#ifndef __IAudioOutputSelector_FWD_DEFINED__
+#define __IAudioOutputSelector_FWD_DEFINED__
+typedef interface IAudioOutputSelector IAudioOutputSelector;
+#endif 	/* __IAudioOutputSelector_FWD_DEFINED__ */
+
+
+#ifndef __IAudioPeakMeter_FWD_DEFINED__
+#define __IAudioPeakMeter_FWD_DEFINED__
+typedef interface IAudioPeakMeter IAudioPeakMeter;
+#endif 	/* __IAudioPeakMeter_FWD_DEFINED__ */
+
+
+#ifndef __IDeviceSpecificProperty_FWD_DEFINED__
+#define __IDeviceSpecificProperty_FWD_DEFINED__
+typedef interface IDeviceSpecificProperty IDeviceSpecificProperty;
+#endif 	/* __IDeviceSpecificProperty_FWD_DEFINED__ */
+
+
+#ifndef __IKsFormatSupport_FWD_DEFINED__
+#define __IKsFormatSupport_FWD_DEFINED__
+typedef interface IKsFormatSupport IKsFormatSupport;
+#endif 	/* __IKsFormatSupport_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+#include "propidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_devicetopology_0000_0000 */
+/* [local] */ 
+
+#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
+//
+//   Flag for clients of IControlChangeNotify::OnNotify to allow those clients to identify hardware initiated notifications
+//
+#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 'draH'
+/* E2C2E9DE-09B1-4B04-84E5-07931225EE04 */
+DEFINE_GUID(EVENTCONTEXT_VOLUMESLIDER, 0xE2C2E9DE,0x09B1,0x4B04,0x84, 0xE5, 0x07, 0x93, 0x12, 0x25, 0xEE, 0x04);
+#define _IKsControl_
+#include "ks.h"
+#include "ksmedia.h"
+#ifndef _KS_
+typedef /* [public] */ struct __MIDL___MIDL_itf_devicetopology_0000_0000_0001
+    {
+    ULONG FormatSize;
+    ULONG Flags;
+    ULONG SampleSize;
+    ULONG Reserved;
+    GUID MajorFormat;
+    GUID SubFormat;
+    GUID Specifier;
+    } 	KSDATAFORMAT;
+
+typedef struct __MIDL___MIDL_itf_devicetopology_0000_0000_0001 *PKSDATAFORMAT;
+
+typedef /* [public][public][public][public][public][public][public][public][public][public] */ struct __MIDL___MIDL_itf_devicetopology_0000_0000_0002
+    {
+    union 
+        {
+        struct 
+            {
+            GUID Set;
+            ULONG Id;
+            ULONG Flags;
+            } 	;
+        LONGLONG Alignment;
+        } 	;
+    } 	KSIDENTIFIER;
+
+typedef struct __MIDL___MIDL_itf_devicetopology_0000_0000_0002 *PKSIDENTIFIER;
+
+typedef /* [public][public][public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0005
+    {	ePcxChanMap_FL_FR	= 0,
+	ePcxChanMap_FC_LFE	= ( ePcxChanMap_FL_FR + 1 ) ,
+	ePcxChanMap_BL_BR	= ( ePcxChanMap_FC_LFE + 1 ) ,
+	ePcxChanMap_FLC_FRC	= ( ePcxChanMap_BL_BR + 1 ) ,
+	ePcxChanMap_SL_SR	= ( ePcxChanMap_FLC_FRC + 1 ) ,
+	ePcxChanMap_Unknown	= ( ePcxChanMap_SL_SR + 1 ) 
+    } 	EChannelMapping;
+
+typedef /* [public][public][public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0006
+    {	eConnTypeUnknown	= 0,
+	eConnTypeEighth	= ( eConnTypeUnknown + 1 ) ,
+	eConnTypeQuarter	= ( eConnTypeEighth + 1 ) ,
+	eConnTypeAtapiInternal	= ( eConnTypeQuarter + 1 ) ,
+	eConnTypeRCA	= ( eConnTypeAtapiInternal + 1 ) ,
+	eConnTypeOptical	= ( eConnTypeRCA + 1 ) ,
+	eConnTypeOtherDigital	= ( eConnTypeOptical + 1 ) ,
+	eConnTypeOtherAnalog	= ( eConnTypeOtherDigital + 1 ) ,
+	eConnTypeMultichannelAnalogDIN	= ( eConnTypeOtherAnalog + 1 ) ,
+	eConnTypeXlrProfessional	= ( eConnTypeMultichannelAnalogDIN + 1 ) ,
+	eConnTypeRJ11Modem	= ( eConnTypeXlrProfessional + 1 ) ,
+	eConnTypeCombination	= ( eConnTypeRJ11Modem + 1 ) 
+    } 	EPcxConnectionType;
+
+typedef /* [public][public][public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0007
+    {	eGeoLocRear	= 0x1,
+	eGeoLocFront	= ( eGeoLocRear + 1 ) ,
+	eGeoLocLeft	= ( eGeoLocFront + 1 ) ,
+	eGeoLocRight	= ( eGeoLocLeft + 1 ) ,
+	eGeoLocTop	= ( eGeoLocRight + 1 ) ,
+	eGeoLocBottom	= ( eGeoLocTop + 1 ) ,
+	eGeoLocRearOPanel	= ( eGeoLocBottom + 1 ) ,
+	eGeoLocRiser	= ( eGeoLocRearOPanel + 1 ) ,
+	eGeoLocInsideMobileLid	= ( eGeoLocRiser + 1 ) ,
+	eGeoLocDrivebay	= ( eGeoLocInsideMobileLid + 1 ) ,
+	eGeoLocHDMI	= ( eGeoLocDrivebay + 1 ) ,
+	eGeoLocOutsideMobileLid	= ( eGeoLocHDMI + 1 ) ,
+	eGeoLocATAPI	= ( eGeoLocOutsideMobileLid + 1 ) ,
+	eGeoLocReserved5	= ( eGeoLocATAPI + 1 ) ,
+	eGeoLocReserved6	= ( eGeoLocReserved5 + 1 ) 
+    } 	EPcxGeoLocation;
+
+typedef /* [public][public][public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0008
+    {	eGenLocPrimaryBox	= 0,
+	eGenLocInternal	= ( eGenLocPrimaryBox + 1 ) ,
+	eGenLocSeperate	= ( eGenLocInternal + 1 ) ,
+	eGenLocOther	= ( eGenLocSeperate + 1 ) 
+    } 	EPcxGenLocation;
+
+typedef /* [public][public][public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0009
+    {	ePortConnJack	= 0,
+	ePortConnIntegratedDevice	= ( ePortConnJack + 1 ) ,
+	ePortConnBothIntegratedAndJack	= ( ePortConnIntegratedDevice + 1 ) ,
+	ePortConnUnknown	= ( ePortConnBothIntegratedAndJack + 1 ) 
+    } 	EPxcPortConnection;
+
+typedef /* [public][public] */ struct __MIDL___MIDL_itf_devicetopology_0000_0000_0010
+    {
+    EChannelMapping ChannelMapping;
+    COLORREF Color;
+    EPcxConnectionType ConnectionType;
+    EPcxGeoLocation GeoLocation;
+    EPcxGenLocation GenLocation;
+    EPxcPortConnection PortConnection;
+    BOOL IsConnected;
+    } 	KSJACK_DESCRIPTION;
+
+typedef struct __MIDL___MIDL_itf_devicetopology_0000_0000_0010 *PKSJACK_DESCRIPTION;
+
+typedef KSIDENTIFIER KSPROPERTY;
+
+typedef KSIDENTIFIER *PKSPROPERTY;
+
+typedef KSIDENTIFIER KSMETHOD;
+
+typedef KSIDENTIFIER *PKSMETHOD;
+
+typedef KSIDENTIFIER KSEVENT;
+
+typedef KSIDENTIFIER *PKSEVENT;
+
+#endif
+
+
+
+
+
+
+
+
+typedef /* [public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0011
+    {	In	= 0,
+	Out	= ( In + 1 ) 
+    } 	DataFlow;
+
+typedef /* [public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0012
+    {	Connector	= 0,
+	Subunit	= ( Connector + 1 ) 
+    } 	PartType;
+
+#define PARTTYPE_FLAG_CONNECTOR 0x00010000
+#define PARTTYPE_FLAG_SUBUNIT   0x00020000
+#define PARTTYPE_MASK           0x00030000
+#define PARTID_MASK             0x0000ffff
+typedef /* [public][public] */ 
+enum __MIDL___MIDL_itf_devicetopology_0000_0000_0013
+    {	Unknown_Connector	= 0,
+	Physical_Internal	= ( Unknown_Connector + 1 ) ,
+	Physical_External	= ( Physical_Internal + 1 ) ,
+	Software_IO	= ( Physical_External + 1 ) ,
+	Software_Fixed	= ( Software_IO + 1 ) ,
+	Network	= ( Software_Fixed + 1 ) 
+    } 	ConnectorType;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_devicetopology_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_devicetopology_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IKsControl_INTERFACE_DEFINED__
+#define __IKsControl_INTERFACE_DEFINED__
+
+/* interface IKsControl */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IKsControl;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("28F54685-06FD-11D2-B27A-00A0C9223196")
+    IKsControl : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE KsProperty( 
+            /* [in] */ PKSPROPERTY Property,
+            /* [in] */ ULONG PropertyLength,
+            /* [out][in] */ void *PropertyData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE KsMethod( 
+            /* [in] */ PKSMETHOD Method,
+            /* [in] */ ULONG MethodLength,
+            /* [out][in] */ void *MethodData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE KsEvent( 
+            /* [in] */ PKSEVENT Event,
+            /* [in] */ ULONG EventLength,
+            /* [out][in] */ void *EventData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IKsControlVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IKsControl * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IKsControl * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IKsControl * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *KsProperty )( 
+            IKsControl * This,
+            /* [in] */ PKSPROPERTY Property,
+            /* [in] */ ULONG PropertyLength,
+            /* [out][in] */ void *PropertyData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned);
+        
+        HRESULT ( STDMETHODCALLTYPE *KsMethod )( 
+            IKsControl * This,
+            /* [in] */ PKSMETHOD Method,
+            /* [in] */ ULONG MethodLength,
+            /* [out][in] */ void *MethodData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned);
+        
+        HRESULT ( STDMETHODCALLTYPE *KsEvent )( 
+            IKsControl * This,
+            /* [in] */ PKSEVENT Event,
+            /* [in] */ ULONG EventLength,
+            /* [out][in] */ void *EventData,
+            /* [in] */ ULONG DataLength,
+            /* [out] */ ULONG *BytesReturned);
+        
+        END_INTERFACE
+    } IKsControlVtbl;
+
+    interface IKsControl
+    {
+        CONST_VTBL struct IKsControlVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IKsControl_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IKsControl_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IKsControl_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IKsControl_KsProperty(This,Property,PropertyLength,PropertyData,DataLength,BytesReturned)	\
+    ( (This)->lpVtbl -> KsProperty(This,Property,PropertyLength,PropertyData,DataLength,BytesReturned) ) 
+
+#define IKsControl_KsMethod(This,Method,MethodLength,MethodData,DataLength,BytesReturned)	\
+    ( (This)->lpVtbl -> KsMethod(This,Method,MethodLength,MethodData,DataLength,BytesReturned) ) 
+
+#define IKsControl_KsEvent(This,Event,EventLength,EventData,DataLength,BytesReturned)	\
+    ( (This)->lpVtbl -> KsEvent(This,Event,EventLength,EventData,DataLength,BytesReturned) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IKsControl_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPerChannelDbLevel_INTERFACE_DEFINED__
+#define __IPerChannelDbLevel_INTERFACE_DEFINED__
+
+/* interface IPerChannelDbLevel */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IPerChannelDbLevel;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("C2F8E001-F205-4BC9-99BC-C13B1E048CCB")
+    IPerChannelDbLevel : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetChannelCount( 
+            /* [out] */ 
+            __out  UINT *pcChannels) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetLevelRange( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetLevel( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetLevel( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetLevelUniform( 
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetLevelAllChannels( 
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPerChannelDbLevelVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPerChannelDbLevel * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPerChannelDbLevel * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPerChannelDbLevel * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IPerChannelDbLevel * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevelRange )( 
+            IPerChannelDbLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IPerChannelDbLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevel )( 
+            IPerChannelDbLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelUniform )( 
+            IPerChannelDbLevel * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelAllChannels )( 
+            IPerChannelDbLevel * This,
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IPerChannelDbLevelVtbl;
+
+    interface IPerChannelDbLevel
+    {
+        CONST_VTBL struct IPerChannelDbLevelVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPerChannelDbLevel_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPerChannelDbLevel_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPerChannelDbLevel_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPerChannelDbLevel_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IPerChannelDbLevel_GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping)	\
+    ( (This)->lpVtbl -> GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping) ) 
+
+#define IPerChannelDbLevel_GetLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevelDB) ) 
+
+#define IPerChannelDbLevel_SetLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IPerChannelDbLevel_SetLevelUniform(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelUniform(This,fLevelDB,pguidEventContext) ) 
+
+#define IPerChannelDbLevel_SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPerChannelDbLevel_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioVolumeLevel_INTERFACE_DEFINED__
+#define __IAudioVolumeLevel_INTERFACE_DEFINED__
+
+/* interface IAudioVolumeLevel */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioVolumeLevel;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("7FB7B48F-531D-44A2-BCB3-5AD5A134B3DC")
+    IAudioVolumeLevel : public IPerChannelDbLevel
+    {
+    public:
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioVolumeLevelVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioVolumeLevel * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioVolumeLevel * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioVolumeLevel * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioVolumeLevel * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevelRange )( 
+            IAudioVolumeLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IAudioVolumeLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevel )( 
+            IAudioVolumeLevel * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelUniform )( 
+            IAudioVolumeLevel * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelAllChannels )( 
+            IAudioVolumeLevel * This,
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioVolumeLevelVtbl;
+
+    interface IAudioVolumeLevel
+    {
+        CONST_VTBL struct IAudioVolumeLevelVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioVolumeLevel_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioVolumeLevel_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioVolumeLevel_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioVolumeLevel_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IAudioVolumeLevel_GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping)	\
+    ( (This)->lpVtbl -> GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping) ) 
+
+#define IAudioVolumeLevel_GetLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevelDB) ) 
+
+#define IAudioVolumeLevel_SetLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IAudioVolumeLevel_SetLevelUniform(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelUniform(This,fLevelDB,pguidEventContext) ) 
+
+#define IAudioVolumeLevel_SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext) ) 
+
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioVolumeLevel_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioChannelConfig_INTERFACE_DEFINED__
+#define __IAudioChannelConfig_INTERFACE_DEFINED__
+
+/* interface IAudioChannelConfig */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioChannelConfig;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("BB11C46F-EC28-493C-B88A-5DB88062CE98")
+    IAudioChannelConfig : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetChannelConfig( 
+            /* [in] */ DWORD dwConfig,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetChannelConfig( 
+            /* [retval][out] */ DWORD *pdwConfig) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioChannelConfigVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioChannelConfig * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioChannelConfig * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioChannelConfig * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetChannelConfig )( 
+            IAudioChannelConfig * This,
+            /* [in] */ DWORD dwConfig,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelConfig )( 
+            IAudioChannelConfig * This,
+            /* [retval][out] */ DWORD *pdwConfig);
+        
+        END_INTERFACE
+    } IAudioChannelConfigVtbl;
+
+    interface IAudioChannelConfig
+    {
+        CONST_VTBL struct IAudioChannelConfigVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioChannelConfig_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioChannelConfig_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioChannelConfig_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioChannelConfig_SetChannelConfig(This,dwConfig,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetChannelConfig(This,dwConfig,pguidEventContext) ) 
+
+#define IAudioChannelConfig_GetChannelConfig(This,pdwConfig)	\
+    ( (This)->lpVtbl -> GetChannelConfig(This,pdwConfig) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioChannelConfig_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioLoudness_INTERFACE_DEFINED__
+#define __IAudioLoudness_INTERFACE_DEFINED__
+
+/* interface IAudioLoudness */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioLoudness;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("7D8B1437-DD53-4350-9C1B-1EE2890BD938")
+    IAudioLoudness : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetEnabled( 
+            /* [out] */ 
+            __out  BOOL *pbEnabled) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetEnabled( 
+            /* [in] */ 
+            __in  BOOL bEnable,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioLoudnessVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioLoudness * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioLoudness * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioLoudness * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetEnabled )( 
+            IAudioLoudness * This,
+            /* [out] */ 
+            __out  BOOL *pbEnabled);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetEnabled )( 
+            IAudioLoudness * This,
+            /* [in] */ 
+            __in  BOOL bEnable,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioLoudnessVtbl;
+
+    interface IAudioLoudness
+    {
+        CONST_VTBL struct IAudioLoudnessVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioLoudness_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioLoudness_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioLoudness_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioLoudness_GetEnabled(This,pbEnabled)	\
+    ( (This)->lpVtbl -> GetEnabled(This,pbEnabled) ) 
+
+#define IAudioLoudness_SetEnabled(This,bEnable,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetEnabled(This,bEnable,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioLoudness_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioInputSelector_INTERFACE_DEFINED__
+#define __IAudioInputSelector_INTERFACE_DEFINED__
+
+/* interface IAudioInputSelector */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioInputSelector;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("4F03DC02-5E6E-4653-8F72-A030C123D598")
+    IAudioInputSelector : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSelection( 
+            /* [out] */ 
+            __out  UINT *pnIdSelected) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetSelection( 
+            /* [in] */ 
+            __in  UINT nIdSelect,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioInputSelectorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioInputSelector * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioInputSelector * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioInputSelector * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSelection )( 
+            IAudioInputSelector * This,
+            /* [out] */ 
+            __out  UINT *pnIdSelected);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetSelection )( 
+            IAudioInputSelector * This,
+            /* [in] */ 
+            __in  UINT nIdSelect,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioInputSelectorVtbl;
+
+    interface IAudioInputSelector
+    {
+        CONST_VTBL struct IAudioInputSelectorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioInputSelector_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioInputSelector_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioInputSelector_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioInputSelector_GetSelection(This,pnIdSelected)	\
+    ( (This)->lpVtbl -> GetSelection(This,pnIdSelected) ) 
+
+#define IAudioInputSelector_SetSelection(This,nIdSelect,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetSelection(This,nIdSelect,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioInputSelector_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioOutputSelector_INTERFACE_DEFINED__
+#define __IAudioOutputSelector_INTERFACE_DEFINED__
+
+/* interface IAudioOutputSelector */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioOutputSelector;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("BB515F69-94A7-429e-8B9C-271B3F11A3AB")
+    IAudioOutputSelector : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSelection( 
+            /* [out] */ 
+            __out  UINT *pnIdSelected) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetSelection( 
+            /* [in] */ 
+            __in  UINT nIdSelect,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioOutputSelectorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioOutputSelector * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioOutputSelector * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioOutputSelector * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSelection )( 
+            IAudioOutputSelector * This,
+            /* [out] */ 
+            __out  UINT *pnIdSelected);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetSelection )( 
+            IAudioOutputSelector * This,
+            /* [in] */ 
+            __in  UINT nIdSelect,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioOutputSelectorVtbl;
+
+    interface IAudioOutputSelector
+    {
+        CONST_VTBL struct IAudioOutputSelectorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioOutputSelector_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioOutputSelector_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioOutputSelector_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioOutputSelector_GetSelection(This,pnIdSelected)	\
+    ( (This)->lpVtbl -> GetSelection(This,pnIdSelected) ) 
+
+#define IAudioOutputSelector_SetSelection(This,nIdSelect,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetSelection(This,nIdSelect,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioOutputSelector_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioMute_INTERFACE_DEFINED__
+#define __IAudioMute_INTERFACE_DEFINED__
+
+/* interface IAudioMute */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioMute;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("DF45AEEA-B74A-4B6B-AFAD-2366B6AA012E")
+    IAudioMute : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetMute( 
+            /* [in] */ 
+            __in  BOOL bMuted,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetMute( 
+            /* [out] */ 
+            __out  BOOL *pbMuted) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioMuteVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioMute * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioMute * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioMute * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetMute )( 
+            IAudioMute * This,
+            /* [in] */ 
+            __in  BOOL bMuted,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetMute )( 
+            IAudioMute * This,
+            /* [out] */ 
+            __out  BOOL *pbMuted);
+        
+        END_INTERFACE
+    } IAudioMuteVtbl;
+
+    interface IAudioMute
+    {
+        CONST_VTBL struct IAudioMuteVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioMute_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioMute_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioMute_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioMute_SetMute(This,bMuted,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetMute(This,bMuted,pguidEventContext) ) 
+
+#define IAudioMute_GetMute(This,pbMuted)	\
+    ( (This)->lpVtbl -> GetMute(This,pbMuted) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioMute_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioBass_INTERFACE_DEFINED__
+#define __IAudioBass_INTERFACE_DEFINED__
+
+/* interface IAudioBass */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioBass;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("A2B1A1D9-4DB3-425D-A2B2-BD335CB3E2E5")
+    IAudioBass : public IPerChannelDbLevel
+    {
+    public:
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioBassVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioBass * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioBass * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioBass * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioBass * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevelRange )( 
+            IAudioBass * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IAudioBass * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevel )( 
+            IAudioBass * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelUniform )( 
+            IAudioBass * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelAllChannels )( 
+            IAudioBass * This,
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioBassVtbl;
+
+    interface IAudioBass
+    {
+        CONST_VTBL struct IAudioBassVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioBass_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioBass_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioBass_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioBass_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IAudioBass_GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping)	\
+    ( (This)->lpVtbl -> GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping) ) 
+
+#define IAudioBass_GetLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevelDB) ) 
+
+#define IAudioBass_SetLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IAudioBass_SetLevelUniform(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelUniform(This,fLevelDB,pguidEventContext) ) 
+
+#define IAudioBass_SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext) ) 
+
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioBass_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioMidrange_INTERFACE_DEFINED__
+#define __IAudioMidrange_INTERFACE_DEFINED__
+
+/* interface IAudioMidrange */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioMidrange;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("5E54B6D7-B44B-40D9-9A9E-E691D9CE6EDF")
+    IAudioMidrange : public IPerChannelDbLevel
+    {
+    public:
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioMidrangeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioMidrange * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioMidrange * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioMidrange * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioMidrange * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevelRange )( 
+            IAudioMidrange * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IAudioMidrange * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevel )( 
+            IAudioMidrange * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelUniform )( 
+            IAudioMidrange * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelAllChannels )( 
+            IAudioMidrange * This,
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioMidrangeVtbl;
+
+    interface IAudioMidrange
+    {
+        CONST_VTBL struct IAudioMidrangeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioMidrange_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioMidrange_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioMidrange_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioMidrange_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IAudioMidrange_GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping)	\
+    ( (This)->lpVtbl -> GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping) ) 
+
+#define IAudioMidrange_GetLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevelDB) ) 
+
+#define IAudioMidrange_SetLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IAudioMidrange_SetLevelUniform(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelUniform(This,fLevelDB,pguidEventContext) ) 
+
+#define IAudioMidrange_SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext) ) 
+
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioMidrange_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioTreble_INTERFACE_DEFINED__
+#define __IAudioTreble_INTERFACE_DEFINED__
+
+/* interface IAudioTreble */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioTreble;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("0A717812-694E-4907-B74B-BAFA5CFDCA7B")
+    IAudioTreble : public IPerChannelDbLevel
+    {
+    public:
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioTrebleVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioTreble * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioTreble * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioTreble * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioTreble * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevelRange )( 
+            IAudioTreble * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfMinLevelDB,
+            /* [out] */ 
+            __out  float *pfMaxLevelDB,
+            /* [out] */ 
+            __out  float *pfStepping);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IAudioTreble * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevel )( 
+            IAudioTreble * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelUniform )( 
+            IAudioTreble * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetLevelAllChannels )( 
+            IAudioTreble * This,
+            /* [size_is][in] */ 
+            __in_ecount(cChannels)  float aLevelsDB[  ],
+            /* [in] */ 
+            __in  ULONG cChannels,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioTrebleVtbl;
+
+    interface IAudioTreble
+    {
+        CONST_VTBL struct IAudioTrebleVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioTreble_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioTreble_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioTreble_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioTreble_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IAudioTreble_GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping)	\
+    ( (This)->lpVtbl -> GetLevelRange(This,nChannel,pfMinLevelDB,pfMaxLevelDB,pfStepping) ) 
+
+#define IAudioTreble_GetLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevelDB) ) 
+
+#define IAudioTreble_SetLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IAudioTreble_SetLevelUniform(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelUniform(This,fLevelDB,pguidEventContext) ) 
+
+#define IAudioTreble_SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetLevelAllChannels(This,aLevelsDB,cChannels,pguidEventContext) ) 
+
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioTreble_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioAutoGainControl_INTERFACE_DEFINED__
+#define __IAudioAutoGainControl_INTERFACE_DEFINED__
+
+/* interface IAudioAutoGainControl */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioAutoGainControl;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("85401FD4-6DE4-4b9d-9869-2D6753A82F3C")
+    IAudioAutoGainControl : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetEnabled( 
+            /* [out] */ 
+            __out  BOOL *pbEnabled) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetEnabled( 
+            /* [in] */ 
+            __in  BOOL bEnable,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioAutoGainControlVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioAutoGainControl * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioAutoGainControl * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioAutoGainControl * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetEnabled )( 
+            IAudioAutoGainControl * This,
+            /* [out] */ 
+            __out  BOOL *pbEnabled);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetEnabled )( 
+            IAudioAutoGainControl * This,
+            /* [in] */ 
+            __in  BOOL bEnable,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IAudioAutoGainControlVtbl;
+
+    interface IAudioAutoGainControl
+    {
+        CONST_VTBL struct IAudioAutoGainControlVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioAutoGainControl_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioAutoGainControl_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioAutoGainControl_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioAutoGainControl_GetEnabled(This,pbEnabled)	\
+    ( (This)->lpVtbl -> GetEnabled(This,pbEnabled) ) 
+
+#define IAudioAutoGainControl_SetEnabled(This,bEnable,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetEnabled(This,bEnable,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioAutoGainControl_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioPeakMeter_INTERFACE_DEFINED__
+#define __IAudioPeakMeter_INTERFACE_DEFINED__
+
+/* interface IAudioPeakMeter */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioPeakMeter;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("DD79923C-0599-45e0-B8B6-C8DF7DB6E796")
+    IAudioPeakMeter : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetChannelCount( 
+            /* [out] */ 
+            __out  UINT *pcChannels) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetLevel( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioPeakMeterVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioPeakMeter * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioPeakMeter * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioPeakMeter * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioPeakMeter * This,
+            /* [out] */ 
+            __out  UINT *pcChannels);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLevel )( 
+            IAudioPeakMeter * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        END_INTERFACE
+    } IAudioPeakMeterVtbl;
+
+    interface IAudioPeakMeter
+    {
+        CONST_VTBL struct IAudioPeakMeterVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioPeakMeter_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioPeakMeter_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioPeakMeter_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioPeakMeter_GetChannelCount(This,pcChannels)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pcChannels) ) 
+
+#define IAudioPeakMeter_GetLevel(This,nChannel,pfLevel)	\
+    ( (This)->lpVtbl -> GetLevel(This,nChannel,pfLevel) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioPeakMeter_INTERFACE_DEFINED__ */
+
+
+#ifndef __IDeviceSpecificProperty_INTERFACE_DEFINED__
+#define __IDeviceSpecificProperty_INTERFACE_DEFINED__
+
+/* interface IDeviceSpecificProperty */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IDeviceSpecificProperty;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("3B22BCBF-2586-4af0-8583-205D391B807C")
+    IDeviceSpecificProperty : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetType( 
+            /* [out] */ 
+            __deref_out  VARTYPE *pVType) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetValue( 
+            /* [out] */ 
+            __out  void *pvValue,
+            /* [out][in] */ 
+            __inout  DWORD *pcbValue) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SetValue( 
+            /* [in] */ 
+            __in  void *pvValue,
+            /* [in] */ DWORD cbValue,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Get4BRange( 
+            /* [out] */ 
+            __deref_out  LONG *plMin,
+            /* [out] */ 
+            __deref_out  LONG *plMax,
+            /* [out] */ 
+            __deref_out  LONG *plStepping) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IDeviceSpecificPropertyVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IDeviceSpecificProperty * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IDeviceSpecificProperty * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IDeviceSpecificProperty * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetType )( 
+            IDeviceSpecificProperty * This,
+            /* [out] */ 
+            __deref_out  VARTYPE *pVType);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetValue )( 
+            IDeviceSpecificProperty * This,
+            /* [out] */ 
+            __out  void *pvValue,
+            /* [out][in] */ 
+            __inout  DWORD *pcbValue);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetValue )( 
+            IDeviceSpecificProperty * This,
+            /* [in] */ 
+            __in  void *pvValue,
+            /* [in] */ DWORD cbValue,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Get4BRange )( 
+            IDeviceSpecificProperty * This,
+            /* [out] */ 
+            __deref_out  LONG *plMin,
+            /* [out] */ 
+            __deref_out  LONG *plMax,
+            /* [out] */ 
+            __deref_out  LONG *plStepping);
+        
+        END_INTERFACE
+    } IDeviceSpecificPropertyVtbl;
+
+    interface IDeviceSpecificProperty
+    {
+        CONST_VTBL struct IDeviceSpecificPropertyVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IDeviceSpecificProperty_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IDeviceSpecificProperty_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IDeviceSpecificProperty_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IDeviceSpecificProperty_GetType(This,pVType)	\
+    ( (This)->lpVtbl -> GetType(This,pVType) ) 
+
+#define IDeviceSpecificProperty_GetValue(This,pvValue,pcbValue)	\
+    ( (This)->lpVtbl -> GetValue(This,pvValue,pcbValue) ) 
+
+#define IDeviceSpecificProperty_SetValue(This,pvValue,cbValue,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetValue(This,pvValue,cbValue,pguidEventContext) ) 
+
+#define IDeviceSpecificProperty_Get4BRange(This,plMin,plMax,plStepping)	\
+    ( (This)->lpVtbl -> Get4BRange(This,plMin,plMax,plStepping) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IDeviceSpecificProperty_INTERFACE_DEFINED__ */
+
+
+#ifndef __IKsFormatSupport_INTERFACE_DEFINED__
+#define __IKsFormatSupport_INTERFACE_DEFINED__
+
+/* interface IKsFormatSupport */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IKsFormatSupport;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("3CB4A69D-BB6F-4D2B-95B7-452D2C155DB5")
+    IKsFormatSupport : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IsFormatSupported( 
+            /* [size_is][in] */ PKSDATAFORMAT pKsFormat,
+            /* [in] */ 
+            __in  DWORD cbFormat,
+            /* [out] */ 
+            __out  BOOL *pbSupported) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDevicePreferredFormat( 
+            /* [out] */ PKSDATAFORMAT *ppKsFormat) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IKsFormatSupportVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IKsFormatSupport * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IKsFormatSupport * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IKsFormatSupport * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *IsFormatSupported )( 
+            IKsFormatSupport * This,
+            /* [size_is][in] */ PKSDATAFORMAT pKsFormat,
+            /* [in] */ 
+            __in  DWORD cbFormat,
+            /* [out] */ 
+            __out  BOOL *pbSupported);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDevicePreferredFormat )( 
+            IKsFormatSupport * This,
+            /* [out] */ PKSDATAFORMAT *ppKsFormat);
+        
+        END_INTERFACE
+    } IKsFormatSupportVtbl;
+
+    interface IKsFormatSupport
+    {
+        CONST_VTBL struct IKsFormatSupportVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IKsFormatSupport_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IKsFormatSupport_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IKsFormatSupport_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IKsFormatSupport_IsFormatSupported(This,pKsFormat,cbFormat,pbSupported)	\
+    ( (This)->lpVtbl -> IsFormatSupported(This,pKsFormat,cbFormat,pbSupported) ) 
+
+#define IKsFormatSupport_GetDevicePreferredFormat(This,ppKsFormat)	\
+    ( (This)->lpVtbl -> GetDevicePreferredFormat(This,ppKsFormat) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IKsFormatSupport_INTERFACE_DEFINED__ */
+
+
+#ifndef __IKsJackDescription_INTERFACE_DEFINED__
+#define __IKsJackDescription_INTERFACE_DEFINED__
+
+/* interface IKsJackDescription */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IKsJackDescription;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("4509F757-2D46-4637-8E62-CE7DB944F57B")
+    IKsJackDescription : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetJackCount( 
+            /* [out] */ 
+            __out  UINT *pcJacks) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetJackDescription( 
+            /* [in] */ UINT nJack,
+            /* [out] */ 
+            __out  KSJACK_DESCRIPTION *pDescription) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IKsJackDescriptionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IKsJackDescription * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IKsJackDescription * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IKsJackDescription * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetJackCount )( 
+            IKsJackDescription * This,
+            /* [out] */ 
+            __out  UINT *pcJacks);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetJackDescription )( 
+            IKsJackDescription * This,
+            /* [in] */ UINT nJack,
+            /* [out] */ 
+            __out  KSJACK_DESCRIPTION *pDescription);
+        
+        END_INTERFACE
+    } IKsJackDescriptionVtbl;
+
+    interface IKsJackDescription
+    {
+        CONST_VTBL struct IKsJackDescriptionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IKsJackDescription_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IKsJackDescription_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IKsJackDescription_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IKsJackDescription_GetJackCount(This,pcJacks)	\
+    ( (This)->lpVtbl -> GetJackCount(This,pcJacks) ) 
+
+#define IKsJackDescription_GetJackDescription(This,nJack,pDescription)	\
+    ( (This)->lpVtbl -> GetJackDescription(This,nJack,pDescription) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IKsJackDescription_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPartsList_INTERFACE_DEFINED__
+#define __IPartsList_INTERFACE_DEFINED__
+
+/* interface IPartsList */
+/* [object][unique][helpstring][uuid][local] */ 
+
+
+EXTERN_C const IID IID_IPartsList;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("6DAA848C-5EB0-45CC-AEA5-998A2CDA1FFB")
+    IPartsList : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ 
+            __out  UINT *pCount) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetPart( 
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IPart **ppPart) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPartsListVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPartsList * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPartsList * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPartsList * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPartsList * This,
+            /* [out] */ 
+            __out  UINT *pCount);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetPart )( 
+            IPartsList * This,
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IPart **ppPart);
+        
+        END_INTERFACE
+    } IPartsListVtbl;
+
+    interface IPartsList
+    {
+        CONST_VTBL struct IPartsListVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPartsList_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPartsList_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPartsList_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPartsList_GetCount(This,pCount)	\
+    ( (This)->lpVtbl -> GetCount(This,pCount) ) 
+
+#define IPartsList_GetPart(This,nIndex,ppPart)	\
+    ( (This)->lpVtbl -> GetPart(This,nIndex,ppPart) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPartsList_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPart_INTERFACE_DEFINED__
+#define __IPart_INTERFACE_DEFINED__
+
+/* interface IPart */
+/* [object][unique][helpstring][uuid][local] */ 
+
+
+EXTERN_C const IID IID_IPart;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("AE2DE0E4-5BCA-4F2D-AA46-5D13F8FDB3A9")
+    IPart : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetName( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrName) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetLocalId( 
+            /* [out] */ 
+            __out  UINT *pnId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetGlobalId( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrGlobalId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetPartType( 
+            /* [out] */ 
+            __out  PartType *pPartType) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSubType( 
+            /* [out] */ GUID *pSubType) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetControlInterfaceCount( 
+            /* [out] */ 
+            __out  UINT *pCount) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetControlInterface( 
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IControlInterface **ppInterfaceDesc) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE EnumPartsIncoming( 
+            /* [out] */ 
+            __out  IPartsList **ppParts) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE EnumPartsOutgoing( 
+            /* [out] */ 
+            __out  IPartsList **ppParts) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetTopologyObject( 
+            /* [out] */ 
+            __out  IDeviceTopology **ppTopology) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Activate( 
+            /* [in] */ 
+            __in  DWORD dwClsContext,
+            /* [in] */ 
+            __in  REFIID refiid,
+            /* [iid_is][out] */ 
+            __out_opt  void **ppvObject) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RegisterControlChangeCallback( 
+            /* [in] */ 
+            __in  REFGUID riid,
+            /* [in] */ 
+            __in  IControlChangeNotify *pNotify) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE UnregisterControlChangeCallback( 
+            /* [in] */ 
+            __in  IControlChangeNotify *pNotify) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPartVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPart * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPart * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPart * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetName )( 
+            IPart * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrName);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetLocalId )( 
+            IPart * This,
+            /* [out] */ 
+            __out  UINT *pnId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetGlobalId )( 
+            IPart * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrGlobalId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetPartType )( 
+            IPart * This,
+            /* [out] */ 
+            __out  PartType *pPartType);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSubType )( 
+            IPart * This,
+            /* [out] */ GUID *pSubType);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetControlInterfaceCount )( 
+            IPart * This,
+            /* [out] */ 
+            __out  UINT *pCount);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetControlInterface )( 
+            IPart * This,
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IControlInterface **ppInterfaceDesc);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *EnumPartsIncoming )( 
+            IPart * This,
+            /* [out] */ 
+            __out  IPartsList **ppParts);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *EnumPartsOutgoing )( 
+            IPart * This,
+            /* [out] */ 
+            __out  IPartsList **ppParts);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetTopologyObject )( 
+            IPart * This,
+            /* [out] */ 
+            __out  IDeviceTopology **ppTopology);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Activate )( 
+            IPart * This,
+            /* [in] */ 
+            __in  DWORD dwClsContext,
+            /* [in] */ 
+            __in  REFIID refiid,
+            /* [iid_is][out] */ 
+            __out_opt  void **ppvObject);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *RegisterControlChangeCallback )( 
+            IPart * This,
+            /* [in] */ 
+            __in  REFGUID riid,
+            /* [in] */ 
+            __in  IControlChangeNotify *pNotify);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *UnregisterControlChangeCallback )( 
+            IPart * This,
+            /* [in] */ 
+            __in  IControlChangeNotify *pNotify);
+        
+        END_INTERFACE
+    } IPartVtbl;
+
+    interface IPart
+    {
+        CONST_VTBL struct IPartVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPart_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPart_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPart_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPart_GetName(This,ppwstrName)	\
+    ( (This)->lpVtbl -> GetName(This,ppwstrName) ) 
+
+#define IPart_GetLocalId(This,pnId)	\
+    ( (This)->lpVtbl -> GetLocalId(This,pnId) ) 
+
+#define IPart_GetGlobalId(This,ppwstrGlobalId)	\
+    ( (This)->lpVtbl -> GetGlobalId(This,ppwstrGlobalId) ) 
+
+#define IPart_GetPartType(This,pPartType)	\
+    ( (This)->lpVtbl -> GetPartType(This,pPartType) ) 
+
+#define IPart_GetSubType(This,pSubType)	\
+    ( (This)->lpVtbl -> GetSubType(This,pSubType) ) 
+
+#define IPart_GetControlInterfaceCount(This,pCount)	\
+    ( (This)->lpVtbl -> GetControlInterfaceCount(This,pCount) ) 
+
+#define IPart_GetControlInterface(This,nIndex,ppInterfaceDesc)	\
+    ( (This)->lpVtbl -> GetControlInterface(This,nIndex,ppInterfaceDesc) ) 
+
+#define IPart_EnumPartsIncoming(This,ppParts)	\
+    ( (This)->lpVtbl -> EnumPartsIncoming(This,ppParts) ) 
+
+#define IPart_EnumPartsOutgoing(This,ppParts)	\
+    ( (This)->lpVtbl -> EnumPartsOutgoing(This,ppParts) ) 
+
+#define IPart_GetTopologyObject(This,ppTopology)	\
+    ( (This)->lpVtbl -> GetTopologyObject(This,ppTopology) ) 
+
+#define IPart_Activate(This,dwClsContext,refiid,ppvObject)	\
+    ( (This)->lpVtbl -> Activate(This,dwClsContext,refiid,ppvObject) ) 
+
+#define IPart_RegisterControlChangeCallback(This,riid,pNotify)	\
+    ( (This)->lpVtbl -> RegisterControlChangeCallback(This,riid,pNotify) ) 
+
+#define IPart_UnregisterControlChangeCallback(This,pNotify)	\
+    ( (This)->lpVtbl -> UnregisterControlChangeCallback(This,pNotify) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPart_INTERFACE_DEFINED__ */
+
+
+#ifndef __IConnector_INTERFACE_DEFINED__
+#define __IConnector_INTERFACE_DEFINED__
+
+/* interface IConnector */
+/* [object][unique][helpstring][uuid][local] */ 
+
+
+EXTERN_C const IID IID_IConnector;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("9c2c4058-23f5-41de-877a-df3af236a09e")
+    IConnector : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetType( 
+            /* [out] */ 
+            __out  ConnectorType *pType) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDataFlow( 
+            /* [out] */ 
+            __out  DataFlow *pFlow) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE ConnectTo( 
+            /* [in] */ 
+            __in  IConnector *pConnectTo) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Disconnect( void) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IsConnected( 
+            /* [out] */ 
+            __out  BOOL *pbConnected) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetConnectedTo( 
+            /* [out] */ 
+            __out  IConnector **ppConTo) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetConnectorIdConnectedTo( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrConnectorId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDeviceIdConnectedTo( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrDeviceId) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IConnectorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IConnector * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IConnector * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IConnector * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetType )( 
+            IConnector * This,
+            /* [out] */ 
+            __out  ConnectorType *pType);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDataFlow )( 
+            IConnector * This,
+            /* [out] */ 
+            __out  DataFlow *pFlow);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *ConnectTo )( 
+            IConnector * This,
+            /* [in] */ 
+            __in  IConnector *pConnectTo);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Disconnect )( 
+            IConnector * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *IsConnected )( 
+            IConnector * This,
+            /* [out] */ 
+            __out  BOOL *pbConnected);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetConnectedTo )( 
+            IConnector * This,
+            /* [out] */ 
+            __out  IConnector **ppConTo);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetConnectorIdConnectedTo )( 
+            IConnector * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrConnectorId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDeviceIdConnectedTo )( 
+            IConnector * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrDeviceId);
+        
+        END_INTERFACE
+    } IConnectorVtbl;
+
+    interface IConnector
+    {
+        CONST_VTBL struct IConnectorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IConnector_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IConnector_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IConnector_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IConnector_GetType(This,pType)	\
+    ( (This)->lpVtbl -> GetType(This,pType) ) 
+
+#define IConnector_GetDataFlow(This,pFlow)	\
+    ( (This)->lpVtbl -> GetDataFlow(This,pFlow) ) 
+
+#define IConnector_ConnectTo(This,pConnectTo)	\
+    ( (This)->lpVtbl -> ConnectTo(This,pConnectTo) ) 
+
+#define IConnector_Disconnect(This)	\
+    ( (This)->lpVtbl -> Disconnect(This) ) 
+
+#define IConnector_IsConnected(This,pbConnected)	\
+    ( (This)->lpVtbl -> IsConnected(This,pbConnected) ) 
+
+#define IConnector_GetConnectedTo(This,ppConTo)	\
+    ( (This)->lpVtbl -> GetConnectedTo(This,ppConTo) ) 
+
+#define IConnector_GetConnectorIdConnectedTo(This,ppwstrConnectorId)	\
+    ( (This)->lpVtbl -> GetConnectorIdConnectedTo(This,ppwstrConnectorId) ) 
+
+#define IConnector_GetDeviceIdConnectedTo(This,ppwstrDeviceId)	\
+    ( (This)->lpVtbl -> GetDeviceIdConnectedTo(This,ppwstrDeviceId) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IConnector_INTERFACE_DEFINED__ */
+
+
+#ifndef __ISubunit_INTERFACE_DEFINED__
+#define __ISubunit_INTERFACE_DEFINED__
+
+/* interface ISubunit */
+/* [object][unique][helpstring][uuid][local] */ 
+
+
+EXTERN_C const IID IID_ISubunit;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("82149A85-DBA6-4487-86BB-EA8F7FEFCC71")
+    ISubunit : public IUnknown
+    {
+    public:
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ISubunitVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ISubunit * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ISubunit * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ISubunit * This);
+        
+        END_INTERFACE
+    } ISubunitVtbl;
+
+    interface ISubunit
+    {
+        CONST_VTBL struct ISubunitVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ISubunit_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ISubunit_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ISubunit_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ISubunit_INTERFACE_DEFINED__ */
+
+
+#ifndef __IControlInterface_INTERFACE_DEFINED__
+#define __IControlInterface_INTERFACE_DEFINED__
+
+/* interface IControlInterface */
+/* [object][unique][helpstring][uuid][local] */ 
+
+
+EXTERN_C const IID IID_IControlInterface;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("45d37c3f-5140-444a-ae24-400789f3cbf3")
+    IControlInterface : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetName( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrName) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetIID( 
+            /* [out] */ 
+            __out  GUID *pIID) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IControlInterfaceVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IControlInterface * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IControlInterface * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IControlInterface * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetName )( 
+            IControlInterface * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrName);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetIID )( 
+            IControlInterface * This,
+            /* [out] */ 
+            __out  GUID *pIID);
+        
+        END_INTERFACE
+    } IControlInterfaceVtbl;
+
+    interface IControlInterface
+    {
+        CONST_VTBL struct IControlInterfaceVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IControlInterface_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IControlInterface_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IControlInterface_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IControlInterface_GetName(This,ppwstrName)	\
+    ( (This)->lpVtbl -> GetName(This,ppwstrName) ) 
+
+#define IControlInterface_GetIID(This,pIID)	\
+    ( (This)->lpVtbl -> GetIID(This,pIID) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IControlInterface_INTERFACE_DEFINED__ */
+
+
+#ifndef __IControlChangeNotify_INTERFACE_DEFINED__
+#define __IControlChangeNotify_INTERFACE_DEFINED__
+
+/* interface IControlChangeNotify */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IControlChangeNotify;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("A09513ED-C709-4d21-BD7B-5F34C47F3947")
+    IControlChangeNotify : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnNotify( 
+            /* [in] */ 
+            __in  DWORD dwSenderProcessId,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IControlChangeNotifyVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IControlChangeNotify * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IControlChangeNotify * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IControlChangeNotify * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnNotify )( 
+            IControlChangeNotify * This,
+            /* [in] */ 
+            __in  DWORD dwSenderProcessId,
+            /* [unique][in] */ 
+            __in_opt  LPCGUID pguidEventContext);
+        
+        END_INTERFACE
+    } IControlChangeNotifyVtbl;
+
+    interface IControlChangeNotify
+    {
+        CONST_VTBL struct IControlChangeNotifyVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IControlChangeNotify_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IControlChangeNotify_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IControlChangeNotify_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IControlChangeNotify_OnNotify(This,dwSenderProcessId,pguidEventContext)	\
+    ( (This)->lpVtbl -> OnNotify(This,dwSenderProcessId,pguidEventContext) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IControlChangeNotify_INTERFACE_DEFINED__ */
+
+
+#ifndef __IDeviceTopology_INTERFACE_DEFINED__
+#define __IDeviceTopology_INTERFACE_DEFINED__
+
+/* interface IDeviceTopology */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IDeviceTopology;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("2A07407E-6497-4A18-9787-32F79BD0D98F")
+    IDeviceTopology : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetConnectorCount( 
+            /* [out] */ 
+            __out  UINT *pCount) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetConnector( 
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IConnector **ppConnector) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSubunitCount( 
+            /* [out] */ 
+            __out  UINT *pCount) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSubunit( 
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __deref_out  ISubunit **ppSubunit) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetPartById( 
+            /* [in] */ 
+            __in  UINT nId,
+            /* [out] */ 
+            __deref_out  IPart **ppPart) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDeviceId( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrDeviceId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetSignalPath( 
+            /* [in] */ 
+            __in  IPart *pIPartFrom,
+            /* [in] */ 
+            __in  IPart *pIPartTo,
+            /* [in] */ 
+            __in  BOOL bRejectMixedPaths,
+            /* [out] */ 
+            __deref_out  IPartsList **ppParts) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IDeviceTopologyVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IDeviceTopology * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IDeviceTopology * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IDeviceTopology * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetConnectorCount )( 
+            IDeviceTopology * This,
+            /* [out] */ 
+            __out  UINT *pCount);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetConnector )( 
+            IDeviceTopology * This,
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __out  IConnector **ppConnector);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSubunitCount )( 
+            IDeviceTopology * This,
+            /* [out] */ 
+            __out  UINT *pCount);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSubunit )( 
+            IDeviceTopology * This,
+            /* [in] */ 
+            __in  UINT nIndex,
+            /* [out] */ 
+            __deref_out  ISubunit **ppSubunit);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetPartById )( 
+            IDeviceTopology * This,
+            /* [in] */ 
+            __in  UINT nId,
+            /* [out] */ 
+            __deref_out  IPart **ppPart);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDeviceId )( 
+            IDeviceTopology * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppwstrDeviceId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetSignalPath )( 
+            IDeviceTopology * This,
+            /* [in] */ 
+            __in  IPart *pIPartFrom,
+            /* [in] */ 
+            __in  IPart *pIPartTo,
+            /* [in] */ 
+            __in  BOOL bRejectMixedPaths,
+            /* [out] */ 
+            __deref_out  IPartsList **ppParts);
+        
+        END_INTERFACE
+    } IDeviceTopologyVtbl;
+
+    interface IDeviceTopology
+    {
+        CONST_VTBL struct IDeviceTopologyVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IDeviceTopology_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IDeviceTopology_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IDeviceTopology_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IDeviceTopology_GetConnectorCount(This,pCount)	\
+    ( (This)->lpVtbl -> GetConnectorCount(This,pCount) ) 
+
+#define IDeviceTopology_GetConnector(This,nIndex,ppConnector)	\
+    ( (This)->lpVtbl -> GetConnector(This,nIndex,ppConnector) ) 
+
+#define IDeviceTopology_GetSubunitCount(This,pCount)	\
+    ( (This)->lpVtbl -> GetSubunitCount(This,pCount) ) 
+
+#define IDeviceTopology_GetSubunit(This,nIndex,ppSubunit)	\
+    ( (This)->lpVtbl -> GetSubunit(This,nIndex,ppSubunit) ) 
+
+#define IDeviceTopology_GetPartById(This,nId,ppPart)	\
+    ( (This)->lpVtbl -> GetPartById(This,nId,ppPart) ) 
+
+#define IDeviceTopology_GetDeviceId(This,ppwstrDeviceId)	\
+    ( (This)->lpVtbl -> GetDeviceId(This,ppwstrDeviceId) ) 
+
+#define IDeviceTopology_GetSignalPath(This,pIPartFrom,pIPartTo,bRejectMixedPaths,ppParts)	\
+    ( (This)->lpVtbl -> GetSignalPath(This,pIPartFrom,pIPartTo,bRejectMixedPaths,ppParts) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IDeviceTopology_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __DevTopologyLib_LIBRARY_DEFINED__
+#define __DevTopologyLib_LIBRARY_DEFINED__
+
+/* library DevTopologyLib */
+/* [helpstring][version][uuid] */ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+EXTERN_C const IID LIBID_DevTopologyLib;
+
+EXTERN_C const CLSID CLSID_DeviceTopology;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("1DF639D0-5EC1-47AA-9379-828DC1AA8C59")
+DeviceTopology;
+#endif
+#endif /* __DevTopologyLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h
new file mode 100644
index 0000000000..81155d7a92
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h
@@ -0,0 +1,620 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for endpointvolume.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __endpointvolume_h__
+#define __endpointvolume_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IAudioEndpointVolumeCallback_FWD_DEFINED__
+#define __IAudioEndpointVolumeCallback_FWD_DEFINED__
+typedef interface IAudioEndpointVolumeCallback IAudioEndpointVolumeCallback;
+#endif 	/* __IAudioEndpointVolumeCallback_FWD_DEFINED__ */
+
+
+#ifndef __IAudioEndpointVolume_FWD_DEFINED__
+#define __IAudioEndpointVolume_FWD_DEFINED__
+typedef interface IAudioEndpointVolume IAudioEndpointVolume;
+#endif 	/* __IAudioEndpointVolume_FWD_DEFINED__ */
+
+
+#ifndef __IAudioMeterInformation_FWD_DEFINED__
+#define __IAudioMeterInformation_FWD_DEFINED__
+typedef interface IAudioMeterInformation IAudioMeterInformation;
+#endif 	/* __IAudioMeterInformation_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "unknwn.h"
+#include "devicetopology.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_endpointvolume_0000_0000 */
+/* [local] */ 
+
+typedef struct AUDIO_VOLUME_NOTIFICATION_DATA
+    {
+    GUID guidEventContext;
+    BOOL bMuted;
+    float fMasterVolume;
+    UINT nChannels;
+    float afChannelVolumes[ 1 ];
+    } 	AUDIO_VOLUME_NOTIFICATION_DATA;
+
+typedef struct AUDIO_VOLUME_NOTIFICATION_DATA *PAUDIO_VOLUME_NOTIFICATION_DATA;
+
+#define   ENDPOINT_HARDWARE_SUPPORT_VOLUME    0x00000001
+#define   ENDPOINT_HARDWARE_SUPPORT_MUTE      0x00000002
+#define   ENDPOINT_HARDWARE_SUPPORT_METER     0x00000004
+
+
+extern RPC_IF_HANDLE __MIDL_itf_endpointvolume_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_endpointvolume_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IAudioEndpointVolumeCallback_INTERFACE_DEFINED__
+#define __IAudioEndpointVolumeCallback_INTERFACE_DEFINED__
+
+/* interface IAudioEndpointVolumeCallback */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioEndpointVolumeCallback;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("657804FA-D6AD-4496-8A60-352752AF4F89")
+    IAudioEndpointVolumeCallback : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE OnNotify( 
+            PAUDIO_VOLUME_NOTIFICATION_DATA pNotify) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioEndpointVolumeCallbackVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioEndpointVolumeCallback * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioEndpointVolumeCallback * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioEndpointVolumeCallback * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *OnNotify )( 
+            IAudioEndpointVolumeCallback * This,
+            PAUDIO_VOLUME_NOTIFICATION_DATA pNotify);
+        
+        END_INTERFACE
+    } IAudioEndpointVolumeCallbackVtbl;
+
+    interface IAudioEndpointVolumeCallback
+    {
+        CONST_VTBL struct IAudioEndpointVolumeCallbackVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioEndpointVolumeCallback_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioEndpointVolumeCallback_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioEndpointVolumeCallback_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioEndpointVolumeCallback_OnNotify(This,pNotify)	\
+    ( (This)->lpVtbl -> OnNotify(This,pNotify) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioEndpointVolumeCallback_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioEndpointVolume_INTERFACE_DEFINED__
+#define __IAudioEndpointVolume_INTERFACE_DEFINED__
+
+/* interface IAudioEndpointVolume */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioEndpointVolume;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("5CDF2C82-841E-4546-9722-0CF74078229A")
+    IAudioEndpointVolume : public IUnknown
+    {
+    public:
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RegisterControlChangeNotify( 
+            /* [in] */ 
+            __in  IAudioEndpointVolumeCallback *pNotify) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UnregisterControlChangeNotify( 
+            /* [in] */ 
+            __in  IAudioEndpointVolumeCallback *pNotify) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetChannelCount( 
+            /* [out] */ 
+            __out  UINT *pnChannelCount) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetMasterVolumeLevel( 
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetMasterVolumeLevelScalar( 
+            /* [in] */ 
+            __in  float fLevel,
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMasterVolumeLevel( 
+            /* [out] */ 
+            __out  float *pfLevelDB) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMasterVolumeLevelScalar( 
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelVolumeLevel( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            float fLevelDB,
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelVolumeLevelScalar( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            float fLevel,
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetChannelVolumeLevel( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetChannelVolumeLevelScalar( 
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevel) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetMute( 
+            /* [in] */ 
+            __in  BOOL bMute,
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMute( 
+            /* [out] */ 
+            __out  BOOL *pbMute) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetVolumeStepInfo( 
+            /* [out] */ 
+            __out  UINT *pnStep,
+            /* [out] */ 
+            __out  UINT *pnStepCount) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VolumeStepUp( 
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VolumeStepDown( 
+            /* [unique][in] */ LPCGUID pguidEventContext) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE QueryHardwareSupport( 
+            /* [out] */ 
+            __out  DWORD *pdwHardwareSupportMask) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetVolumeRange( 
+            /* [out] */ 
+            __out  float *pflVolumeMindB,
+            /* [out] */ 
+            __out  float *pflVolumeMaxdB,
+            /* [out] */ 
+            __out  float *pflVolumeIncrementdB) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioEndpointVolumeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioEndpointVolume * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioEndpointVolume * This);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RegisterControlChangeNotify )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  IAudioEndpointVolumeCallback *pNotify);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UnregisterControlChangeNotify )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  IAudioEndpointVolumeCallback *pNotify);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetChannelCount )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  UINT *pnChannelCount);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetMasterVolumeLevel )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  float fLevelDB,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetMasterVolumeLevelScalar )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  float fLevel,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMasterVolumeLevel )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMasterVolumeLevelScalar )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetChannelVolumeLevel )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            float fLevelDB,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetChannelVolumeLevelScalar )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            float fLevel,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetChannelVolumeLevel )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevelDB);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetChannelVolumeLevelScalar )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  UINT nChannel,
+            /* [out] */ 
+            __out  float *pfLevel);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetMute )( 
+            IAudioEndpointVolume * This,
+            /* [in] */ 
+            __in  BOOL bMute,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMute )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  BOOL *pbMute);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetVolumeStepInfo )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  UINT *pnStep,
+            /* [out] */ 
+            __out  UINT *pnStepCount);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VolumeStepUp )( 
+            IAudioEndpointVolume * This,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VolumeStepDown )( 
+            IAudioEndpointVolume * This,
+            /* [unique][in] */ LPCGUID pguidEventContext);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *QueryHardwareSupport )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  DWORD *pdwHardwareSupportMask);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetVolumeRange )( 
+            IAudioEndpointVolume * This,
+            /* [out] */ 
+            __out  float *pflVolumeMindB,
+            /* [out] */ 
+            __out  float *pflVolumeMaxdB,
+            /* [out] */ 
+            __out  float *pflVolumeIncrementdB);
+        
+        END_INTERFACE
+    } IAudioEndpointVolumeVtbl;
+
+    interface IAudioEndpointVolume
+    {
+        CONST_VTBL struct IAudioEndpointVolumeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioEndpointVolume_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioEndpointVolume_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioEndpointVolume_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioEndpointVolume_RegisterControlChangeNotify(This,pNotify)	\
+    ( (This)->lpVtbl -> RegisterControlChangeNotify(This,pNotify) ) 
+
+#define IAudioEndpointVolume_UnregisterControlChangeNotify(This,pNotify)	\
+    ( (This)->lpVtbl -> UnregisterControlChangeNotify(This,pNotify) ) 
+
+#define IAudioEndpointVolume_GetChannelCount(This,pnChannelCount)	\
+    ( (This)->lpVtbl -> GetChannelCount(This,pnChannelCount) ) 
+
+#define IAudioEndpointVolume_SetMasterVolumeLevel(This,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetMasterVolumeLevel(This,fLevelDB,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_SetMasterVolumeLevelScalar(This,fLevel,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetMasterVolumeLevelScalar(This,fLevel,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_GetMasterVolumeLevel(This,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetMasterVolumeLevel(This,pfLevelDB) ) 
+
+#define IAudioEndpointVolume_GetMasterVolumeLevelScalar(This,pfLevel)	\
+    ( (This)->lpVtbl -> GetMasterVolumeLevelScalar(This,pfLevel) ) 
+
+#define IAudioEndpointVolume_SetChannelVolumeLevel(This,nChannel,fLevelDB,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetChannelVolumeLevel(This,nChannel,fLevelDB,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_SetChannelVolumeLevelScalar(This,nChannel,fLevel,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetChannelVolumeLevelScalar(This,nChannel,fLevel,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_GetChannelVolumeLevel(This,nChannel,pfLevelDB)	\
+    ( (This)->lpVtbl -> GetChannelVolumeLevel(This,nChannel,pfLevelDB) ) 
+
+#define IAudioEndpointVolume_GetChannelVolumeLevelScalar(This,nChannel,pfLevel)	\
+    ( (This)->lpVtbl -> GetChannelVolumeLevelScalar(This,nChannel,pfLevel) ) 
+
+#define IAudioEndpointVolume_SetMute(This,bMute,pguidEventContext)	\
+    ( (This)->lpVtbl -> SetMute(This,bMute,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_GetMute(This,pbMute)	\
+    ( (This)->lpVtbl -> GetMute(This,pbMute) ) 
+
+#define IAudioEndpointVolume_GetVolumeStepInfo(This,pnStep,pnStepCount)	\
+    ( (This)->lpVtbl -> GetVolumeStepInfo(This,pnStep,pnStepCount) ) 
+
+#define IAudioEndpointVolume_VolumeStepUp(This,pguidEventContext)	\
+    ( (This)->lpVtbl -> VolumeStepUp(This,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_VolumeStepDown(This,pguidEventContext)	\
+    ( (This)->lpVtbl -> VolumeStepDown(This,pguidEventContext) ) 
+
+#define IAudioEndpointVolume_QueryHardwareSupport(This,pdwHardwareSupportMask)	\
+    ( (This)->lpVtbl -> QueryHardwareSupport(This,pdwHardwareSupportMask) ) 
+
+#define IAudioEndpointVolume_GetVolumeRange(This,pflVolumeMindB,pflVolumeMaxdB,pflVolumeIncrementdB)	\
+    ( (This)->lpVtbl -> GetVolumeRange(This,pflVolumeMindB,pflVolumeMaxdB,pflVolumeIncrementdB) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioEndpointVolume_INTERFACE_DEFINED__ */
+
+
+#ifndef __IAudioMeterInformation_INTERFACE_DEFINED__
+#define __IAudioMeterInformation_INTERFACE_DEFINED__
+
+/* interface IAudioMeterInformation */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IAudioMeterInformation;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("C02216F6-8C67-4B5B-9D00-D008E73E0064")
+    IAudioMeterInformation : public IUnknown
+    {
+    public:
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetPeakValue( 
+            /* [out] */ float *pfPeak) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMeteringChannelCount( 
+            /* [out] */ 
+            __out  UINT *pnChannelCount) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetChannelsPeakValues( 
+            /* [in] */ UINT32 u32ChannelCount,
+            /* [size_is][out] */ float *afPeakValues) = 0;
+        
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE QueryHardwareSupport( 
+            /* [out] */ 
+            __out  DWORD *pdwHardwareSupportMask) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IAudioMeterInformationVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IAudioMeterInformation * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IAudioMeterInformation * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IAudioMeterInformation * This);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetPeakValue )( 
+            IAudioMeterInformation * This,
+            /* [out] */ float *pfPeak);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMeteringChannelCount )( 
+            IAudioMeterInformation * This,
+            /* [out] */ 
+            __out  UINT *pnChannelCount);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetChannelsPeakValues )( 
+            IAudioMeterInformation * This,
+            /* [in] */ UINT32 u32ChannelCount,
+            /* [size_is][out] */ float *afPeakValues);
+        
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *QueryHardwareSupport )( 
+            IAudioMeterInformation * This,
+            /* [out] */ 
+            __out  DWORD *pdwHardwareSupportMask);
+        
+        END_INTERFACE
+    } IAudioMeterInformationVtbl;
+
+    interface IAudioMeterInformation
+    {
+        CONST_VTBL struct IAudioMeterInformationVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IAudioMeterInformation_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IAudioMeterInformation_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IAudioMeterInformation_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IAudioMeterInformation_GetPeakValue(This,pfPeak)	\
+    ( (This)->lpVtbl -> GetPeakValue(This,pfPeak) ) 
+
+#define IAudioMeterInformation_GetMeteringChannelCount(This,pnChannelCount)	\
+    ( (This)->lpVtbl -> GetMeteringChannelCount(This,pnChannelCount) ) 
+
+#define IAudioMeterInformation_GetChannelsPeakValues(This,u32ChannelCount,afPeakValues)	\
+    ( (This)->lpVtbl -> GetChannelsPeakValues(This,u32ChannelCount,afPeakValues) ) 
+
+#define IAudioMeterInformation_QueryHardwareSupport(This,pdwHardwareSupportMask)	\
+    ( (This)->lpVtbl -> QueryHardwareSupport(This,pdwHardwareSupportMask) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IAudioMeterInformation_INTERFACE_DEFINED__ */
+
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/functiondiscoverykeys.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/functiondiscoverykeys.h
new file mode 100644
index 0000000000..7e07292bf3
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/functiondiscoverykeys.h
@@ -0,0 +1,255 @@
+#pragma once
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifndef DEFINE_API_PKEY
+#include <propkey.h>
+#endif
+
+#include <FunctionDiscoveryKeys_devpkey.h>
+
+// FMTID_FD = {904b03a2-471d-423c-a584-f3483238a146}
+DEFINE_GUID(FMTID_FD, 0x904b03a2, 0x471d, 0x423c, 0xa5, 0x84, 0xf3, 0x48, 0x32, 0x38, 0xa1, 0x46);
+DEFINE_API_PKEY(PKEY_FD_Visibility, VisibilityFlags, 0x904b03a2, 0x471d, 0x423c, 0xa5, 0x84, 0xf3, 0x48, 0x32, 0x38, 0xa1, 0x46, 0x00000001); //    VT_UINT
+#define FD_Visibility_Default   0
+#define FD_Visibility_Hidden    1
+
+// FMTID_Device = {78C34FC8-104A-4aca-9EA4-524D52996E57}
+DEFINE_GUID(FMTID_Device, 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57);
+
+DEFINE_API_PKEY(PKEY_Device_NotPresent,     DeviceNotPresent   , 0x904b03a2, 0x471d, 0x423c, 0xa5, 0x84, 0xf3, 0x48, 0x32, 0x38, 0xa1, 0x46, 0x00000002); //    VT_UINT
+DEFINE_API_PKEY(PKEY_Device_QueueSize,      DeviceQueueSize    , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000024); //    VT_UI4
+DEFINE_API_PKEY(PKEY_Device_Status,         DeviceStatus       , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000025); //    VT_LPWSTR
+DEFINE_API_PKEY(PKEY_Device_Comment,        DeviceComment      , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000026); //    VT_LPWSTR
+DEFINE_API_PKEY(PKEY_Device_Model,          DeviceModel        , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000027); //    VT_LPWSTR
+
+//  Name:     System.Device.BIOSVersion -- PKEY_Device_BIOSVersion
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)  Legacy code may treat this as VT_BSTR.
+//  FormatID: EAEE7F1D-6A33-44D1-9441-5F46DEF23198, 9
+DEFINE_PROPERTYKEY(PKEY_Device_BIOSVersion, 0xEAEE7F1D, 0x6A33, 0x44D1, 0x94, 0x41, 0x5F, 0x46, 0xDE, 0xF2, 0x31, 0x98, 9);
+
+DEFINE_API_PKEY(PKEY_Write_Time,            WriteTime          , 0xf53b7e1c, 0x77e0, 0x4450, 0x8c, 0x5f, 0xa7, 0x6c, 0xc7, 0xfd, 0xe0, 0x58, 0x00000100); //    VT_FILETIME
+
+#ifdef FD_XP
+DEFINE_API_PKEY(PKEY_Device_InstanceId, DeviceInstanceId   , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000100); //    VT_LPWSTR
+#endif
+DEFINE_API_PKEY(PKEY_Device_Interface,  DeviceInterface    , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00000101); //    VT_CLSID
+
+DEFINE_API_PKEY(PKEY_ExposedIIDs,           ExposedIIDs       , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00003002); //  VT_VECTOR | VT_CLSID
+DEFINE_API_PKEY(PKEY_ExposedCLSIDs,         ExposedCLSIDs     , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00003003); //  VT_VECTOR | VT_CLSID
+DEFINE_API_PKEY(PKEY_InstanceValidatorClsid,InstanceValidator , 0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x00003004); // VT_CLSID
+
+// FMTID_WSD = {92506491-FF95-4724-A05A-5B81885A7C92}
+DEFINE_GUID(FMTID_WSD, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92);
+
+DEFINE_API_PKEY(PKEY_WSD_AddressURI, WSD_AddressURI, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001000);   // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_WSD_Types, WSD_Types, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001001); // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_WSD_Scopes, WSD_Scopes, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001002);   // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_WSD_MetadataVersion, WSD_MetadataVersion, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001003); //VT_UI8
+DEFINE_API_PKEY(PKEY_WSD_AppSeqInstanceID, WSD_AppSeqInstanceID, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001004);   // VT_UI8
+DEFINE_API_PKEY(PKEY_WSD_AppSeqSessionID, WSD_AppSeqSessionID, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001005); // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_WSD_AppSeqMessageNumber, WSD_AppSeqMessageNumber, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00001006); // VT_UI8
+DEFINE_API_PKEY(PKEY_WSD_XAddrs, WSD_XAddrs, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00002000); // VT_LPWSTR or VT_VECTOR | VT_LPWSTR
+
+DEFINE_API_PKEY(PKEY_WSD_MetadataClean, WSD_MetadataClean, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00000001);   // VT_BOOL
+DEFINE_API_PKEY(PKEY_WSD_ServiceInfo, WSD_ServiceInfo, 0x92506491, 0xFF95, 0x4724, 0xA0, 0x5A, 0x5B, 0x81, 0x88, 0x5A, 0x7C, 0x92, 0x00000002);   // VT_VECTOR|VT_VARIANT (variants are VT_UNKNOWN)
+
+DEFINE_API_PKEY(PKEY_PUBSVCS_TYPE, PUBSVCS_TYPE, 0xF1B88AD3, 0x109C, 0x4FD2, 0xBA, 0x3F, 0x53, 0x5A, 0x76, 0x5F, 0x82, 0xF4, 0x00005001); // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_PUBSVCS_SCOPE, PUBSVCS_SCOPE, 0x2AE2B567, 0xEECB, 0x4A3E, 0xB7, 0x53, 0x54, 0xC7, 0x25, 0x49, 0x43, 0x66, 0x00005002);   // VT_LPWSTR | VT_VECTOR
+DEFINE_API_PKEY(PKEY_PUBSVCS_METADATA, PUBSVCS_METADATA, 0x63C6D5B8, 0xF73A, 0x4ACA, 0x96, 0x7E, 0x0C, 0xC7, 0x87, 0xE0, 0xB5, 0x59, 0x00005003); // VT_LPWSTR
+DEFINE_API_PKEY(PKEY_PUBSVCS_METADATA_VERSION, PUBSVCS_METADATA_VERSION, 0xC0C96C15, 0x1823, 0x4E5B, 0x93, 0x48, 0xE8, 0x25, 0x19, 0x92, 0x3F, 0x04, 0x00005004); // VT_UI8
+DEFINE_API_PKEY(PKEY_PUBSVCS_NETWORK_PROFILES_ALLOWED, PUBSVCS_NETWORK_PROFILES_ALLOWED, 0x63C6D5B8, 0xF73A, 0x4ACA, 0x96, 0x7E, 0x0C, 0xC7, 0x87, 0xE0, 0xB5, 0x59, 0x00005005); // VT_VECTOR | VT_LPWSTR
+DEFINE_API_PKEY(PKEY_PUBSVCS_NETWORK_PROFILES_DENIED, PUBSVCS_NETWORK_PROFILES_DENIED, 0x63C6D5B8, 0xF73A, 0x4ACA, 0x96, 0x7E, 0x0C, 0xC7, 0x87, 0xE0, 0xB5, 0x59, 0x00005006); // VT_VECTOR | VT_LPWSTR
+DEFINE_API_PKEY(PKEY_PUBSVCS_NETWORK_PROFILES_DEFAULT, PUBSVCS_NETWORK_PROFILES_DEFAULT, 0x63C6D5B8, 0xF73A, 0x4ACA, 0x96, 0x7E, 0x0C, 0xC7, 0x87, 0xE0, 0xB5, 0x59, 0x00005007); // VT_BOOL
+
+// FMTID_PNPX = {656A3BB3-ECC0-43FD-8477-4AE0404A96CD}
+DEFINE_GUID(FMTID_PNPX, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD);
+        // from Discovery messages
+DEFINE_PROPERTYKEY(PKEY_PNPX_GlobalIdentity, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001000);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_Types, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001001);   // VT_LPWSTR | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_PNPX_Scopes, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001002);   // VT_LPWSTR | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_PNPX_XAddrs, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001003);   // VT_LPWSTR | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_PNPX_MetadataVersion, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001004);   // VT_UI8
+DEFINE_PROPERTYKEY(PKEY_PNPX_ID, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001005);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_RootProxy, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001006);   // VT_BOOL
+
+        // for Directed Discovery
+DEFINE_PROPERTYKEY(PKEY_PNPX_RemoteAddress, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00001006);   // VT_LPWSTR
+
+        // from ThisModel metadata
+DEFINE_PROPERTYKEY(PKEY_PNPX_Manufacturer, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002000);   // VT_LPWSTR (localizable)
+DEFINE_PROPERTYKEY(PKEY_PNPX_ManufacturerUrl, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002001);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_ModelName, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002002);   // VT_LPWSTR (localizable)
+DEFINE_PROPERTYKEY(PKEY_PNPX_ModelNumber, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002003);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_ModelUrl, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002004);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_Upc, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002005);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_PresentationUrl, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00002006);   // VT_LPWSTR
+        // from ThisDevice metadata
+DEFINE_PROPERTYKEY(PKEY_PNPX_FriendlyName, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003000);   // VT_LPWSTR (localizable)
+DEFINE_PROPERTYKEY(PKEY_PNPX_FirmwareVersion, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003001);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_SerialNumber, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003002);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_DeviceCategory, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003004);   // VT_LPWSTR | VT_VECTOR
+        // DeviceCategory values
+#define PNPX_DEVICECATEGORY_COMPUTER                            L"Computers"
+#define PNPX_DEVICECATEGORY_INPUTDEVICE                         L"Input"
+#define PNPX_DEVICECATEGORY_PRINTER                             L"Printers"
+#define PNPX_DEVICECATEGORY_SCANNER                             L"Scanners"
+#define PNPX_DEVICECATEGORY_FAX                                 L"FAX"
+#define PNPX_DEVICECATEGORY_MFP                                 L"MFP"
+#define PNPX_DEVICECATEGORY_CAMERA                              L"Cameras"
+#define PNPX_DEVICECATEGORY_STORAGE                             L"Storage"
+#define PNPX_DEVICECATEGORY_NETWORK_INFRASTRUCTURE              L"NetworkInfrastructure"
+#define PNPX_DEVICECATEGORY_DISPLAYS                            L"Displays"
+#define PNPX_DEVICECATEGORY_MULTIMEDIA_DEVICE                   L"MediaDevices"
+#define PNPX_DEVICECATEGORY_GAMING_DEVICE                       L"Gaming"
+#define PNPX_DEVICECATEGORY_TELEPHONE                           L"Phones"
+#define PNPX_DEVICECATEGORY_HOME_AUTOMATION_SYSTEM              L"HomeAutomation"
+#define PNPX_DEVICECATEGORY_HOME_SECURITY_SYSTEM                L"HomeSecurity"
+#define PNPX_DEVICECATEGORY_OTHER                               L"Other"
+DEFINE_PROPERTYKEY(PKEY_PNPX_DeviceCategory_Desc, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003005);   // VT_LPWSTR | VT_VECTOR
+
+DEFINE_PROPERTYKEY(PKEY_PNPX_PhysicalAddress, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003006);   // VT_UI1 | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_PNPX_NetworkInterfaceLuid, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003007);   // VT_UI8
+DEFINE_PROPERTYKEY(PKEY_PNPX_NetworkInterfaceGuid, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003008);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_IpAddress, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00003009);   // VT_LPWSTR | VT_VECTOR
+        // from Relationship metadata
+DEFINE_PROPERTYKEY(PKEY_PNPX_ServiceAddress, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00004000);   // VT_LPWSTR | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_PNPX_ServiceId, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00004001);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_ServiceTypes, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00004002);   // VT_LPWSTR | VT_VECTOR
+        // Association DB PKEYs
+DEFINE_API_PKEY(PKEY_PNPX_Devnode, PnPXDevNode, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00000001); // VT_BOOL
+DEFINE_API_PKEY(PKEY_PNPX_AssociationState, AssociationState, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00000002); // VT_UINT
+DEFINE_API_PKEY(PKEY_PNPX_AssociatedInstanceId, AssociatedInstanceId, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00000003); // VT_LPWSTR
+        // for Computer Discovery
+DEFINE_PROPERTYKEY(PKEY_PNPX_DomainName, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00005000);   // VT_LPWSTR
+// Use PKEY_ComputerName (propkey.h) DEFINE_PROPERTYKEY(PKEY_PNPX_MachineName, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00005001);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_PNPX_ShareName, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00005002);   // VT_LPWSTR
+
+    // SSDP Provider custom properties
+DEFINE_PROPERTYKEY(PKEY_SSDP_AltLocationInfo, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00006000);   // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_SSDP_DevLifeTime, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00006001);   // VT_UI4
+DEFINE_PROPERTYKEY(PKEY_SSDP_NetworkInterface, 0x656A3BB3, 0xECC0, 0x43FD, 0x84, 0x77, 0x4A, 0xE0, 0x40, 0x4A, 0x96, 0xCD, 0x00006002);   // VT_BOOL
+
+// FMTID_PNPXDynamicProperty = {4FC5077E-B686-44BE-93E3-86CAFE368CCD}
+DEFINE_GUID(FMTID_PNPXDynamicProperty, 0x4FC5077E, 0xB686, 0x44BE, 0x93, 0xE3, 0x86, 0xCA, 0xFE, 0x36, 0x8C, 0xCD);
+
+DEFINE_PROPERTYKEY(PKEY_PNPX_Installable, 0x4FC5077E, 0xB686, 0x44BE, 0x93, 0xE3, 0x86, 0xCA, 0xFE, 0x36, 0x8C, 0xCD, 0x00000001); // VT_BOOL
+DEFINE_PROPERTYKEY(PKEY_PNPX_Associated, 0x4FC5077E, 0xB686, 0x44BE, 0x93, 0xE3, 0x86, 0xCA, 0xFE, 0x36, 0x8C, 0xCD, 0x00000002); // VT_BOOL
+// PKEY_PNPX_Installed to be deprecated in Longhorn Server timeframe
+// this PKEY really represents Associated state
+#define PKEY_PNPX_Installed PKEY_PNPX_Associated    // Deprecated! Please use PKEY_PNPX_Associated
+DEFINE_PROPERTYKEY(PKEY_PNPX_CompatibleTypes, 0x4FC5077E, 0xB686, 0x44BE, 0x93, 0xE3, 0x86, 0xCA, 0xFE, 0x36, 0x8C, 0xCD, 0x00000003); // VT_LPWSTR | VT_VECTOR
+
+    // WNET Provider properties
+DEFINE_PROPERTYKEY(PKEY_WNET_Scope, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000001); // VT_UINT
+DEFINE_PROPERTYKEY(PKEY_WNET_Type, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000002); // VT_UINT
+DEFINE_PROPERTYKEY(PKEY_WNET_DisplayType, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000003); // VT_UINT
+DEFINE_PROPERTYKEY(PKEY_WNET_Usage, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000004); // VT_UINT
+DEFINE_PROPERTYKEY(PKEY_WNET_LocalName, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000005); // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_WNET_RemoteName, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000006); // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_WNET_Comment, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000007); // VT_LPWSTR
+DEFINE_PROPERTYKEY(PKEY_WNET_Provider, 0xdebda43a, 0x37b3, 0x4383, 0x91, 0xE7, 0x44, 0x98, 0xda, 0x29, 0x95, 0xab, 0x00000008); // VT_LPWSTR
+
+
+    // WCN Provider properties
+
+DEFINE_PROPERTYKEY(PKEY_WCN_Version, 0x88190b80, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000001); // VT_UI1
+DEFINE_PROPERTYKEY(PKEY_WCN_RequestType, 0x88190b81, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000002); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_AuthType, 0x88190b82, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000003); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_EncryptType, 0x88190b83, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000004); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_ConnType, 0x88190b84, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000005); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_ConfigMethods, 0x88190b85, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000006); // VT_INT
+// map WCN DeviceType to PKEY_PNPX_DeviceCategory
+//DEFINE_PROPERTYKEY(PKEY_WCN_DeviceType, 0x88190b86, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000007); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_RfBand, 0x88190b87, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000008); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_AssocState, 0x88190b88, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x00000009); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_ConfigError, 0x88190b89, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000a); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_ConfigState, 0x88190b89, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000b); // VT_UI1
+DEFINE_PROPERTYKEY(PKEY_WCN_DevicePasswordId, 0x88190b89, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000c); // VT_INT
+DEFINE_PROPERTYKEY(PKEY_WCN_OSVersion, 0x88190b89, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000d); // VT_UINT
+DEFINE_PROPERTYKEY(PKEY_WCN_VendorExtension, 0x88190b8a, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000e); // VT_UI1 | VT_VECTOR
+DEFINE_PROPERTYKEY(PKEY_WCN_RegistrarType, 0x88190b8b, 0x4684, 0x11da, 0xa2, 0x6a, 0x00, 0x02, 0xb3, 0x98, 0x8e, 0x81, 0x0000000f); // VT_INT
+
+//-----------------------------------------------------------------------------
+// DriverPackage properties
+
+#define PKEY_DriverPackage_Model                PKEY_DrvPkg_Model
+#define PKEY_DriverPackage_VendorWebSite        PKEY_DrvPkg_VendorWebSite
+#define PKEY_DriverPackage_DetailedDescription  PKEY_DrvPkg_DetailedDescription
+#define PKEY_DriverPackage_DocumentationLink    PKEY_DrvPkg_DocumentationLink
+#define PKEY_DriverPackage_Icon                 PKEY_DrvPkg_Icon
+#define PKEY_DriverPackage_BrandingIcon         PKEY_DrvPkg_BrandingIcon
+
+//-----------------------------------------------------------------------------
+// Hardware properties
+
+DEFINE_PROPERTYKEY(PKEY_Hardware_Devinst, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 4097);
+
+//  Name:     System.Hardware.DisplayAttribute -- PKEY_Hardware_DisplayAttribute
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 5
+DEFINE_PROPERTYKEY(PKEY_Hardware_DisplayAttribute, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 5);
+
+//  Name:     System.Hardware.DriverDate -- PKEY_Hardware_DriverDate
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 11
+DEFINE_PROPERTYKEY(PKEY_Hardware_DriverDate, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 11);
+
+//  Name:     System.Hardware.DriverProvider -- PKEY_Hardware_DriverProvider
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 10
+DEFINE_PROPERTYKEY(PKEY_Hardware_DriverProvider, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 10);
+
+//  Name:     System.Hardware.DriverVersion -- PKEY_Hardware_DriverVersion
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 9
+DEFINE_PROPERTYKEY(PKEY_Hardware_DriverVersion, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 9);
+
+//  Name:     System.Hardware.Function -- PKEY_Hardware_Function
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 4099
+DEFINE_PROPERTYKEY(PKEY_Hardware_Function, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 4099);
+
+//  Name:     System.Hardware.Icon -- PKEY_Hardware_Icon
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 3
+DEFINE_PROPERTYKEY(PKEY_Hardware_Icon, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 3);
+
+//  Name:     System.Hardware.Image -- PKEY_Hardware_Image
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 4098
+DEFINE_PROPERTYKEY(PKEY_Hardware_Image, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 4098);
+
+//  Name:     System.Hardware.Manufacturer -- PKEY_Hardware_Manufacturer
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 6
+DEFINE_PROPERTYKEY(PKEY_Hardware_Manufacturer, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 6);
+
+//  Name:     System.Hardware.Model -- PKEY_Hardware_Model
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 7
+DEFINE_PROPERTYKEY(PKEY_Hardware_Model, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 7);
+
+//  Name:     System.Hardware.Name -- PKEY_Hardware_Name
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 2
+DEFINE_PROPERTYKEY(PKEY_Hardware_Name, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 2);
+
+//  Name:     System.Hardware.SerialNumber -- PKEY_Hardware_SerialNumber
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 8
+DEFINE_PROPERTYKEY(PKEY_Hardware_SerialNumber, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 8);
+
+//  Name:     System.Hardware.ShellAttributes -- PKEY_Hardware_ShellAttributes
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 4100
+DEFINE_PROPERTYKEY(PKEY_Hardware_ShellAttributes, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 4100);
+
+//  Name:     System.Hardware.Status -- PKEY_Hardware_Status
+//  Type:     Unspecified -- VT_NULL
+//  FormatID: 5EAF3EF2-E0CA-4598-BF06-71ED1D9DD953, 4096
+DEFINE_PROPERTYKEY(PKEY_Hardware_Status, 0x5EAF3EF2, 0xE0CA, 0x4598, 0xBF, 0x06, 0x71, 0xED, 0x1D, 0x9D, 0xD9, 0x53, 4096);
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/ks.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ks.h
new file mode 100644
index 0000000000..2261e6c273
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ks.h
@@ -0,0 +1,3666 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#ifndef _KS_
+#define _KS_
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifndef __MINGW_EXTENSION
+#if defined(__GNUC__) || defined(__GNUG__)
+#define __MINGW_EXTENSION __extension__
+#else
+#define __MINGW_EXTENSION
+#endif
+#endif 
+
+#ifdef __TCS__
+#define _KS_NO_ANONYMOUS_STRUCTURES_ 1
+#endif
+
+#ifdef  _KS_NO_ANONYMOUS_STRUCTURES_
+#define _KS_ANON_STRUCT(X)			struct X
+#else
+#define _KS_ANON_STRUCT(X)	__MINGW_EXTENSION struct
+#endif
+
+#ifndef _NTRTL_
+#ifndef DEFINE_GUIDEX
+#define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name
+#endif
+#ifndef STATICGUIDOF
+#define STATICGUIDOF(guid) STATIC_##guid
+#endif
+#endif /* _NTRTL_ */
+
+#ifndef SIZEOF_ARRAY
+#define SIZEOF_ARRAY(ar) (sizeof(ar)/sizeof((ar)[0]))
+#endif
+
+#define DEFINE_GUIDSTRUCT(g,n) DEFINE_GUIDEX(n)
+#define DEFINE_GUIDNAMED(n) n
+
+#define STATIC_GUID_NULL						\
+	0x00000000L,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+
+DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000",GUID_NULL);
+#define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL)
+
+#define IOCTL_KS_PROPERTY CTL_CODE(FILE_DEVICE_KS,0x000,METHOD_NEITHER,FILE_ANY_ACCESS)
+#define IOCTL_KS_ENABLE_EVENT CTL_CODE(FILE_DEVICE_KS,0x001,METHOD_NEITHER,FILE_ANY_ACCESS)
+#define IOCTL_KS_DISABLE_EVENT CTL_CODE(FILE_DEVICE_KS,0x002,METHOD_NEITHER,FILE_ANY_ACCESS)
+#define IOCTL_KS_METHOD CTL_CODE(FILE_DEVICE_KS,0x003,METHOD_NEITHER,FILE_ANY_ACCESS)
+#define IOCTL_KS_WRITE_STREAM CTL_CODE(FILE_DEVICE_KS,0x004,METHOD_NEITHER,FILE_WRITE_ACCESS)
+#define IOCTL_KS_READ_STREAM CTL_CODE(FILE_DEVICE_KS,0x005,METHOD_NEITHER,FILE_READ_ACCESS)
+#define IOCTL_KS_RESET_STATE CTL_CODE(FILE_DEVICE_KS,0x006,METHOD_NEITHER,FILE_ANY_ACCESS)
+
+typedef enum {
+  KSRESET_BEGIN,
+  KSRESET_END
+} KSRESET;
+
+typedef enum {
+  KSSTATE_STOP,
+  KSSTATE_ACQUIRE,
+  KSSTATE_PAUSE,
+  KSSTATE_RUN
+} KSSTATE,*PKSSTATE;
+
+#define KSPRIORITY_LOW		0x00000001
+#define KSPRIORITY_NORMAL	0x40000000
+#define KSPRIORITY_HIGH		0x80000000
+#define KSPRIORITY_EXCLUSIVE	0xFFFFFFFF
+
+typedef struct {
+  ULONG PriorityClass;
+  ULONG PrioritySubClass;
+} KSPRIORITY,*PKSPRIORITY;
+
+typedef struct {
+  __MINGW_EXTENSION union {
+    _KS_ANON_STRUCT(_IDENTIFIER)
+    {
+      GUID Set;
+      ULONG Id;
+      ULONG Flags;
+    };
+    LONGLONG Alignment;
+  };
+} KSIDENTIFIER,*PKSIDENTIFIER;
+
+typedef KSIDENTIFIER KSPROPERTY,*PKSPROPERTY,KSMETHOD,*PKSMETHOD,KSEVENT,*PKSEVENT;
+
+#define KSMETHOD_TYPE_NONE		0x00000000
+#define KSMETHOD_TYPE_READ		0x00000001
+#define KSMETHOD_TYPE_WRITE		0x00000002
+#define KSMETHOD_TYPE_MODIFY		0x00000003
+#define KSMETHOD_TYPE_SOURCE		0x00000004
+
+#define KSMETHOD_TYPE_SEND		0x00000001
+#define KSMETHOD_TYPE_SETSUPPORT	0x00000100
+#define KSMETHOD_TYPE_BASICSUPPORT	0x00000200
+
+#define KSMETHOD_TYPE_TOPOLOGY		0x10000000
+
+#define KSPROPERTY_TYPE_GET		0x00000001
+#define KSPROPERTY_TYPE_SET		0x00000002
+#define KSPROPERTY_TYPE_SETSUPPORT	0x00000100
+#define KSPROPERTY_TYPE_BASICSUPPORT	0x00000200
+#define KSPROPERTY_TYPE_RELATIONS	0x00000400
+#define KSPROPERTY_TYPE_SERIALIZESET	0x00000800
+#define KSPROPERTY_TYPE_UNSERIALIZESET	0x00001000
+#define KSPROPERTY_TYPE_SERIALIZERAW	0x00002000
+#define KSPROPERTY_TYPE_UNSERIALIZERAW	0x00004000
+#define KSPROPERTY_TYPE_SERIALIZESIZE	0x00008000
+#define KSPROPERTY_TYPE_DEFAULTVALUES	0x00010000
+
+#define KSPROPERTY_TYPE_TOPOLOGY	0x10000000
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG NodeId;
+  ULONG Reserved;
+} KSP_NODE,*PKSP_NODE;
+
+typedef struct {
+  KSMETHOD Method;
+  ULONG NodeId;
+  ULONG Reserved;
+} KSM_NODE,*PKSM_NODE;
+
+typedef struct {
+  KSEVENT Event;
+  ULONG NodeId;
+  ULONG Reserved;
+} KSE_NODE,*PKSE_NODE;
+
+#define STATIC_KSPROPTYPESETID_General					\
+	0x97E99BA0L,0xBDEA,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000",KSPROPTYPESETID_General);
+#define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General)
+
+typedef struct {
+  ULONG Size;
+  ULONG Count;
+} KSMULTIPLE_ITEM,*PKSMULTIPLE_ITEM;
+
+typedef struct {
+  ULONG AccessFlags;
+  ULONG DescriptionSize;
+  KSIDENTIFIER PropTypeSet;
+  ULONG MembersListCount;
+  ULONG Reserved;
+} KSPROPERTY_DESCRIPTION,*PKSPROPERTY_DESCRIPTION;
+
+#define KSPROPERTY_MEMBER_RANGES		0x00000001
+#define KSPROPERTY_MEMBER_STEPPEDRANGES		0x00000002
+#define KSPROPERTY_MEMBER_VALUES		0x00000003
+
+#define KSPROPERTY_MEMBER_FLAG_DEFAULT		0x00000001
+#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_MULTICHANNEL 0x00000002
+#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_UNIFORM	0x00000004
+
+typedef struct {
+  ULONG MembersFlags;
+  ULONG MembersSize;
+  ULONG MembersCount;
+  ULONG Flags;
+} KSPROPERTY_MEMBERSHEADER,*PKSPROPERTY_MEMBERSHEADER;
+
+typedef union {
+  _KS_ANON_STRUCT(_SIGNED)
+  {
+    LONG SignedMinimum;
+    LONG SignedMaximum;
+  };
+  _KS_ANON_STRUCT(_UNSIGNED)
+  {
+    ULONG UnsignedMinimum;
+    ULONG UnsignedMaximum;
+  };
+} KSPROPERTY_BOUNDS_LONG,*PKSPROPERTY_BOUNDS_LONG;
+
+typedef union {
+  _KS_ANON_STRUCT(_SIGNED64)
+  {
+    LONGLONG SignedMinimum;
+    LONGLONG SignedMaximum;
+  };
+  _KS_ANON_STRUCT(_UNSIGNED64)
+  {
+    DWORDLONG UnsignedMinimum;
+    DWORDLONG UnsignedMaximum;
+  };
+} KSPROPERTY_BOUNDS_LONGLONG,*PKSPROPERTY_BOUNDS_LONGLONG;
+
+typedef struct {
+  ULONG SteppingDelta;
+  ULONG Reserved;
+  KSPROPERTY_BOUNDS_LONG Bounds;
+} KSPROPERTY_STEPPING_LONG,*PKSPROPERTY_STEPPING_LONG;
+
+typedef struct {
+  DWORDLONG SteppingDelta;
+  KSPROPERTY_BOUNDS_LONGLONG Bounds;
+} KSPROPERTY_STEPPING_LONGLONG,*PKSPROPERTY_STEPPING_LONGLONG;
+
+#if defined(_NTDDK_)
+typedef struct _KSDEVICE_DESCRIPTOR KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR;
+typedef struct _KSDEVICE_DISPATCH KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH;
+typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE;
+typedef struct _KSFILTERFACTORY KSFILTERFACTORY, *PKSFILTERFACTORY;
+typedef struct _KSFILTER_DESCRIPTOR KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR;
+typedef struct _KSFILTER_DISPATCH KSFILTER_DISPATCH, *PKSFILTER_DISPATCH;
+typedef struct _KSFILTER KSFILTER, *PKSFILTER;
+typedef struct _KSPIN_DESCRIPTOR_EX KSPIN_DESCRIPTOR_EX, *PKSPIN_DESCRIPTOR_EX;
+typedef struct _KSPIN_DISPATCH KSPIN_DISPATCH, *PKSPIN_DISPATCH;
+typedef struct _KSCLOCK_DISPATCH KSCLOCK_DISPATCH, *PKSCLOCK_DISPATCH;
+typedef struct _KSALLOCATOR_DISPATCH KSALLOCATOR_DISPATCH, *PKSALLOCATOR_DISPATCH;
+typedef struct _KSPIN KSPIN, *PKSPIN;
+typedef struct _KSNODE_DESCRIPTOR KSNODE_DESCRIPTOR, *PKSNODE_DESCRIPTOR;
+typedef struct _KSSTREAM_POINTER_OFFSET KSSTREAM_POINTER_OFFSET, *PKSSTREAM_POINTER_OFFSET;
+typedef struct _KSSTREAM_POINTER KSSTREAM_POINTER, *PKSSTREAM_POINTER;
+typedef struct _KSMAPPING KSMAPPING, *PKSMAPPING;
+typedef struct _KSPROCESSPIN KSPROCESSPIN, *PKSPROCESSPIN;
+typedef struct _KSPROCESSPIN_INDEXENTRY KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY;
+#endif /* _NTDDK_ */
+
+typedef PVOID PKSWORKER;
+
+
+typedef struct {
+  ULONG NotificationType;
+  __MINGW_EXTENSION union {
+    struct {
+      HANDLE Event;
+      ULONG_PTR Reserved[2];
+    } EventHandle;
+    struct {
+      HANDLE Semaphore;
+      ULONG Reserved;
+      LONG Adjustment;
+    } SemaphoreHandle;
+#if defined(_NTDDK_)
+    struct {
+      PVOID Event;
+      KPRIORITY Increment;
+      ULONG_PTR Reserved;
+    } EventObject;
+    struct {
+      PVOID Semaphore;
+      KPRIORITY Increment;
+      LONG Adjustment;
+    } SemaphoreObject;
+    struct {
+      PKDPC Dpc;
+      ULONG ReferenceCount;
+      ULONG_PTR Reserved;
+    } Dpc;
+    struct {
+      PWORK_QUEUE_ITEM WorkQueueItem;
+      WORK_QUEUE_TYPE WorkQueueType;
+      ULONG_PTR Reserved;
+    } WorkItem;
+    struct {
+      PWORK_QUEUE_ITEM WorkQueueItem;
+      PKSWORKER KsWorkerObject;
+      ULONG_PTR Reserved;
+    } KsWorkItem;
+#endif /* _NTDDK_ */
+    struct {
+      PVOID Unused;
+      LONG_PTR Alignment[2];
+    } Alignment;
+  };
+} KSEVENTDATA,*PKSEVENTDATA;
+
+#define KSEVENTF_EVENT_HANDLE		0x00000001
+#define KSEVENTF_SEMAPHORE_HANDLE	0x00000002
+#if defined(_NTDDK_)
+#define KSEVENTF_EVENT_OBJECT		0x00000004
+#define KSEVENTF_SEMAPHORE_OBJECT	0x00000008
+#define KSEVENTF_DPC			0x00000010
+#define KSEVENTF_WORKITEM		0x00000020
+#define KSEVENTF_KSWORKITEM		0x00000080
+#endif /* _NTDDK_ */
+
+#define KSEVENT_TYPE_ENABLE		0x00000001
+#define KSEVENT_TYPE_ONESHOT		0x00000002
+#define KSEVENT_TYPE_ENABLEBUFFERED	0x00000004
+#define KSEVENT_TYPE_SETSUPPORT		0x00000100
+#define KSEVENT_TYPE_BASICSUPPORT	0x00000200
+#define KSEVENT_TYPE_QUERYBUFFER	0x00000400
+
+#define KSEVENT_TYPE_TOPOLOGY		0x10000000
+
+typedef struct {
+  KSEVENT Event;
+  PKSEVENTDATA EventData;
+  PVOID Reserved;
+} KSQUERYBUFFER,*PKSQUERYBUFFER;
+
+typedef struct {
+  ULONG Size;
+  ULONG Flags;
+  __MINGW_EXTENSION union {
+    HANDLE ObjectHandle;
+    PVOID ObjectPointer;
+  };
+  PVOID Reserved;
+  KSEVENT Event;
+  KSEVENTDATA EventData;
+} KSRELATIVEEVENT;
+
+#define KSRELATIVEEVENT_FLAG_HANDLE	0x00000001
+#define KSRELATIVEEVENT_FLAG_POINTER	0x00000002
+
+typedef struct {
+  KSEVENTDATA EventData;
+  LONGLONG MarkTime;
+} KSEVENT_TIME_MARK,*PKSEVENT_TIME_MARK;
+
+typedef struct {
+  KSEVENTDATA EventData;
+  LONGLONG TimeBase;
+  LONGLONG Interval;
+} KSEVENT_TIME_INTERVAL,*PKSEVENT_TIME_INTERVAL;
+
+typedef struct {
+  LONGLONG TimeBase;
+  LONGLONG Interval;
+} KSINTERVAL,*PKSINTERVAL;
+
+#define STATIC_KSPROPSETID_General					\
+	0x1464EDA5L,0x6A8F,0x11D1,0x9A,0xA7,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196",KSPROPSETID_General);
+#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General)
+
+typedef enum {
+  KSPROPERTY_GENERAL_COMPONENTID
+} KSPROPERTY_GENERAL;
+
+typedef struct {
+  GUID Manufacturer;
+  GUID Product;
+  GUID Component;
+  GUID Name;
+  ULONG Version;
+  ULONG Revision;
+} KSCOMPONENTID,*PKSCOMPONENTID;
+
+#define DEFINE_KSPROPERTY_ITEM_GENERAL_COMPONENTID(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_GENERAL_COMPONENTID,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSCOMPONENTID),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define STATIC_KSMETHODSETID_StreamIo	\
+	0x65D003CAL,0x1523,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("65D003CA-1523-11D2-B27A-00A0C9223196",KSMETHODSETID_StreamIo);
+#define KSMETHODSETID_StreamIo DEFINE_GUIDNAMED(KSMETHODSETID_StreamIo)
+
+typedef enum {
+  KSMETHOD_STREAMIO_READ,
+  KSMETHOD_STREAMIO_WRITE
+} KSMETHOD_STREAMIO;
+
+#define DEFINE_KSMETHOD_ITEM_STREAMIO_READ(Handler)			\
+	DEFINE_KSMETHOD_ITEM(						\
+				KSMETHOD_STREAMIO_READ,			\
+				KSMETHOD_TYPE_WRITE,			\
+				(Handler),				\
+				sizeof(KSMETHOD),			\
+				0,					\
+				NULL)
+
+#define DEFINE_KSMETHOD_ITEM_STREAMIO_WRITE(Handler)			\
+	DEFINE_KSMETHOD_ITEM(						\
+				KSMETHOD_STREAMIO_WRITE,		\
+				KSMETHOD_TYPE_READ,			\
+				(Handler),				\
+				sizeof(KSMETHOD),			\
+				0,					\
+				NULL)
+
+#define STATIC_KSPROPSETID_MediaSeeking					\
+	0xEE904F0CL,0xD09B,0x11D0,0xAB,0xE9,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("EE904F0C-D09B-11D0-ABE9-00A0C9223196",KSPROPSETID_MediaSeeking);
+#define KSPROPSETID_MediaSeeking DEFINE_GUIDNAMED(KSPROPSETID_MediaSeeking)
+
+typedef enum {
+  KSPROPERTY_MEDIASEEKING_CAPABILITIES,
+  KSPROPERTY_MEDIASEEKING_FORMATS,
+  KSPROPERTY_MEDIASEEKING_TIMEFORMAT,
+  KSPROPERTY_MEDIASEEKING_POSITION,
+  KSPROPERTY_MEDIASEEKING_STOPPOSITION,
+  KSPROPERTY_MEDIASEEKING_POSITIONS,
+  KSPROPERTY_MEDIASEEKING_DURATION,
+  KSPROPERTY_MEDIASEEKING_AVAILABLE,
+  KSPROPERTY_MEDIASEEKING_PREROLL,
+  KSPROPERTY_MEDIASEEKING_CONVERTTIMEFORMAT
+} KSPROPERTY_MEDIASEEKING;
+
+typedef enum {
+  KS_SEEKING_NoPositioning,
+  KS_SEEKING_AbsolutePositioning,
+  KS_SEEKING_RelativePositioning,
+  KS_SEEKING_IncrementalPositioning,
+  KS_SEEKING_PositioningBitsMask = 0x3,
+  KS_SEEKING_SeekToKeyFrame,
+  KS_SEEKING_ReturnTime = 0x8
+} KS_SEEKING_FLAGS;
+
+typedef enum {
+  KS_SEEKING_CanSeekAbsolute = 0x1,
+  KS_SEEKING_CanSeekForwards = 0x2,
+  KS_SEEKING_CanSeekBackwards = 0x4,
+  KS_SEEKING_CanGetCurrentPos = 0x8,
+  KS_SEEKING_CanGetStopPos = 0x10,
+  KS_SEEKING_CanGetDuration = 0x20,
+  KS_SEEKING_CanPlayBackwards = 0x40
+} KS_SEEKING_CAPABILITIES;
+
+typedef struct {
+  LONGLONG Current;
+  LONGLONG Stop;
+  KS_SEEKING_FLAGS CurrentFlags;
+  KS_SEEKING_FLAGS StopFlags;
+} KSPROPERTY_POSITIONS,*PKSPROPERTY_POSITIONS;
+
+typedef struct {
+  LONGLONG Earliest;
+  LONGLONG Latest;
+} KSPROPERTY_MEDIAAVAILABLE,*PKSPROPERTY_MEDIAAVAILABLE;
+
+typedef struct {
+  KSPROPERTY Property;
+  GUID SourceFormat;
+  GUID TargetFormat;
+  LONGLONG Time;
+} KSP_TIMEFORMAT,*PKSP_TIMEFORMAT;
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_CAPABILITIES(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_CAPABILITIES,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KS_SEEKING_CAPABILITIES),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_FORMATS(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_FORMATS,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_TIMEFORMAT(GetHandler,SetHandler) \
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_TIMEFORMAT,	\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(GUID),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_POSITION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_POSITION,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_STOPPOSITION(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_STOPPOSITION,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_POSITIONS(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_POSITIONS,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSPROPERTY_POSITIONS),		\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_DURATION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_DURATION,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_AVAILABLE(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_AVAILABLE,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSPROPERTY_MEDIAAVAILABLE),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_PREROLL(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_PREROLL,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_MEDIASEEKING_CONVERTTIMEFORMAT(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_MEDIASEEKING_CONVERTTIMEFORMAT, \
+				(Handler),				\
+				sizeof(KSP_TIMEFORMAT),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define STATIC_KSPROPSETID_Topology					\
+	0x720D4AC0L,0x7533,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("720D4AC0-7533-11D0-A5D6-28DB04C10000",KSPROPSETID_Topology);
+#define KSPROPSETID_Topology DEFINE_GUIDNAMED(KSPROPSETID_Topology)
+
+typedef enum {
+  KSPROPERTY_TOPOLOGY_CATEGORIES,
+  KSPROPERTY_TOPOLOGY_NODES,
+  KSPROPERTY_TOPOLOGY_CONNECTIONS,
+  KSPROPERTY_TOPOLOGY_NAME
+} KSPROPERTY_TOPOLOGY;
+
+#define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CATEGORIES(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_TOPOLOGY_CATEGORIES,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				NULL, NULL, 0,NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NODES(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_TOPOLOGY_NODES,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CONNECTIONS(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_TOPOLOGY_CONNECTIONS,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_TOPOLOGY_NAME,		\
+				(Handler),				\
+				sizeof(KSP_NODE),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_TOPOLOGYSET(TopologySet,Handler)		\
+DEFINE_KSPROPERTY_TABLE(TopologySet) {					\
+	DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CATEGORIES(Handler),		\
+	DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NODES(Handler),			\
+	DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CONNECTIONS(Handler),		\
+	DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler)			\
+}
+
+#define STATIC_KSCATEGORY_BRIDGE					\
+	0x085AFF00L,0x62CE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("085AFF00-62CE-11CF-A5D6-28DB04C10000",KSCATEGORY_BRIDGE);
+#define KSCATEGORY_BRIDGE DEFINE_GUIDNAMED(KSCATEGORY_BRIDGE)
+
+#define STATIC_KSCATEGORY_CAPTURE					\
+	0x65E8773DL,0x8F56,0x11D0,0xA3,0xB9,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("65E8773D-8F56-11D0-A3B9-00A0C9223196",KSCATEGORY_CAPTURE);
+#define KSCATEGORY_CAPTURE DEFINE_GUIDNAMED(KSCATEGORY_CAPTURE)
+
+#define STATIC_KSCATEGORY_RENDER					\
+	0x65E8773EL,0x8F56,0x11D0,0xA3,0xB9,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("65E8773E-8F56-11D0-A3B9-00A0C9223196",KSCATEGORY_RENDER);
+#define KSCATEGORY_RENDER DEFINE_GUIDNAMED(KSCATEGORY_RENDER)
+
+#define STATIC_KSCATEGORY_MIXER						\
+	0xAD809C00L,0x7B88,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("AD809C00-7B88-11D0-A5D6-28DB04C10000",KSCATEGORY_MIXER);
+#define KSCATEGORY_MIXER DEFINE_GUIDNAMED(KSCATEGORY_MIXER)
+
+#define STATIC_KSCATEGORY_SPLITTER					\
+	0x0A4252A0L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("0A4252A0-7E70-11D0-A5D6-28DB04C10000",KSCATEGORY_SPLITTER);
+#define KSCATEGORY_SPLITTER DEFINE_GUIDNAMED(KSCATEGORY_SPLITTER)
+
+#define STATIC_KSCATEGORY_DATACOMPRESSOR				\
+	0x1E84C900L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("1E84C900-7E70-11D0-A5D6-28DB04C10000",KSCATEGORY_DATACOMPRESSOR);
+#define KSCATEGORY_DATACOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATACOMPRESSOR)
+
+#define STATIC_KSCATEGORY_DATADECOMPRESSOR				\
+	0x2721AE20L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("2721AE20-7E70-11D0-A5D6-28DB04C10000",KSCATEGORY_DATADECOMPRESSOR);
+#define KSCATEGORY_DATADECOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATADECOMPRESSOR)
+
+#define STATIC_KSCATEGORY_DATATRANSFORM					\
+	0x2EB07EA0L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("2EB07EA0-7E70-11D0-A5D6-28DB04C10000",KSCATEGORY_DATATRANSFORM);
+#define KSCATEGORY_DATATRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_DATATRANSFORM)
+
+#define STATIC_KSCATEGORY_COMMUNICATIONSTRANSFORM			\
+	0xCF1DDA2CL,0x9743,0x11D0,0xA3,0xEE,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("CF1DDA2C-9743-11D0-A3EE-00A0C9223196",KSCATEGORY_COMMUNICATIONSTRANSFORM);
+#define KSCATEGORY_COMMUNICATIONSTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_COMMUNICATIONSTRANSFORM)
+
+#define STATIC_KSCATEGORY_INTERFACETRANSFORM				\
+	0xCF1DDA2DL,0x9743,0x11D0,0xA3,0xEE,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("CF1DDA2D-9743-11D0-A3EE-00A0C9223196",KSCATEGORY_INTERFACETRANSFORM);
+#define KSCATEGORY_INTERFACETRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_INTERFACETRANSFORM)
+
+#define STATIC_KSCATEGORY_MEDIUMTRANSFORM				\
+	0xCF1DDA2EL,0x9743,0x11D0,0xA3,0xEE,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("CF1DDA2E-9743-11D0-A3EE-00A0C9223196",KSCATEGORY_MEDIUMTRANSFORM);
+#define KSCATEGORY_MEDIUMTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_MEDIUMTRANSFORM)
+
+#define STATIC_KSCATEGORY_FILESYSTEM					\
+	0x760FED5EL,0x9357,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("760FED5E-9357-11D0-A3CC-00A0C9223196",KSCATEGORY_FILESYSTEM);
+#define KSCATEGORY_FILESYSTEM DEFINE_GUIDNAMED(KSCATEGORY_FILESYSTEM)
+
+#define STATIC_KSCATEGORY_CLOCK						\
+	0x53172480L,0x4791,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("53172480-4791-11D0-A5D6-28DB04C10000",KSCATEGORY_CLOCK);
+#define KSCATEGORY_CLOCK DEFINE_GUIDNAMED(KSCATEGORY_CLOCK)
+
+#define STATIC_KSCATEGORY_PROXY						\
+	0x97EBAACAL,0x95BD,0x11D0,0xA3,0xEA,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("97EBAACA-95BD-11D0-A3EA-00A0C9223196",KSCATEGORY_PROXY);
+#define KSCATEGORY_PROXY DEFINE_GUIDNAMED(KSCATEGORY_PROXY)
+
+#define STATIC_KSCATEGORY_QUALITY					\
+	0x97EBAACBL,0x95BD,0x11D0,0xA3,0xEA,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("97EBAACB-95BD-11D0-A3EA-00A0C9223196",KSCATEGORY_QUALITY);
+#define KSCATEGORY_QUALITY DEFINE_GUIDNAMED(KSCATEGORY_QUALITY)
+
+typedef struct {
+  ULONG FromNode;
+  ULONG FromNodePin;
+  ULONG ToNode;
+  ULONG ToNodePin;
+} KSTOPOLOGY_CONNECTION,*PKSTOPOLOGY_CONNECTION;
+
+typedef struct {
+  ULONG CategoriesCount;
+  const GUID *Categories;
+  ULONG TopologyNodesCount;
+  const GUID *TopologyNodes;
+  ULONG TopologyConnectionsCount;
+  const KSTOPOLOGY_CONNECTION *TopologyConnections;
+  const GUID *TopologyNodesNames;
+  ULONG Reserved;
+} KSTOPOLOGY,*PKSTOPOLOGY;
+
+#define KSFILTER_NODE	((ULONG)-1)
+#define KSALL_NODES	((ULONG)-1)
+
+typedef struct {
+  ULONG CreateFlags;
+  ULONG Node;
+} KSNODE_CREATE,*PKSNODE_CREATE;
+
+#define STATIC_KSTIME_FORMAT_NONE	STATIC_GUID_NULL
+#define KSTIME_FORMAT_NONE		GUID_NULL
+
+#define STATIC_KSTIME_FORMAT_FRAME					\
+	0x7b785570L,0x8c82,0x11cf,0xbc,0x0c,0x00,0xaa,0x00,0xac,0x74,0xf6
+DEFINE_GUIDSTRUCT("7b785570-8c82-11cf-bc0c-00aa00ac74f6",KSTIME_FORMAT_FRAME);
+#define KSTIME_FORMAT_FRAME DEFINE_GUIDNAMED(KSTIME_FORMAT_FRAME)
+
+#define STATIC_KSTIME_FORMAT_BYTE					\
+	0x7b785571L,0x8c82,0x11cf,0xbc,0x0c,0x00,0xaa,0x00,0xac,0x74,0xf6
+DEFINE_GUIDSTRUCT("7b785571-8c82-11cf-bc0c-00aa00ac74f6",KSTIME_FORMAT_BYTE);
+#define KSTIME_FORMAT_BYTE DEFINE_GUIDNAMED(KSTIME_FORMAT_BYTE)
+
+#define STATIC_KSTIME_FORMAT_SAMPLE					\
+	0x7b785572L,0x8c82,0x11cf,0xbc,0x0c,0x00,0xaa,0x00,0xac,0x74,0xf6
+DEFINE_GUIDSTRUCT("7b785572-8c82-11cf-bc0c-00aa00ac74f6",KSTIME_FORMAT_SAMPLE);
+#define KSTIME_FORMAT_SAMPLE DEFINE_GUIDNAMED(KSTIME_FORMAT_SAMPLE)
+
+#define STATIC_KSTIME_FORMAT_FIELD					\
+	0x7b785573L,0x8c82,0x11cf,0xbc,0x0c,0x00,0xaa,0x00,0xac,0x74,0xf6
+DEFINE_GUIDSTRUCT("7b785573-8c82-11cf-bc0c-00aa00ac74f6",KSTIME_FORMAT_FIELD);
+#define KSTIME_FORMAT_FIELD DEFINE_GUIDNAMED(KSTIME_FORMAT_FIELD)
+
+#define STATIC_KSTIME_FORMAT_MEDIA_TIME					\
+	0x7b785574L,0x8c82,0x11cf,0xbc,0x0c,0x00,0xaa,0x00,0xac,0x74,0xf6
+DEFINE_GUIDSTRUCT("7b785574-8c82-11cf-bc0c-00aa00ac74f6",KSTIME_FORMAT_MEDIA_TIME);
+#define KSTIME_FORMAT_MEDIA_TIME DEFINE_GUIDNAMED(KSTIME_FORMAT_MEDIA_TIME)
+
+typedef KSIDENTIFIER KSPIN_INTERFACE,*PKSPIN_INTERFACE;
+
+#define STATIC_KSINTERFACESETID_Standard				\
+	0x1A8766A0L,0x62CE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("1A8766A0-62CE-11CF-A5D6-28DB04C10000",KSINTERFACESETID_Standard);
+#define KSINTERFACESETID_Standard DEFINE_GUIDNAMED(KSINTERFACESETID_Standard)
+
+typedef enum {
+  KSINTERFACE_STANDARD_STREAMING,
+  KSINTERFACE_STANDARD_LOOPED_STREAMING,
+  KSINTERFACE_STANDARD_CONTROL
+} KSINTERFACE_STANDARD;
+
+#define STATIC_KSINTERFACESETID_FileIo					\
+	0x8C6F932CL,0xE771,0x11D0,0xB8,0xFF,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196",KSINTERFACESETID_FileIo);
+#define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo)
+
+typedef enum {
+  KSINTERFACE_FILEIO_STREAMING
+} KSINTERFACE_FILEIO;
+
+#define KSMEDIUM_TYPE_ANYINSTANCE		0
+
+#define STATIC_KSMEDIUMSETID_Standard					\
+	0x4747B320L,0x62CE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000",KSMEDIUMSETID_Standard);
+#define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard)
+
+#define KSMEDIUM_STANDARD_DEVIO KSMEDIUM_TYPE_ANYINSTANCE
+
+#define STATIC_KSPROPSETID_Pin						\
+	0x8C134960L,0x51AD,0x11CF,0x87,0x8A,0x94,0xF8,0x01,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("8C134960-51AD-11CF-878A-94F801C10000",KSPROPSETID_Pin);
+#define KSPROPSETID_Pin DEFINE_GUIDNAMED(KSPROPSETID_Pin)
+
+typedef enum {
+  KSPROPERTY_PIN_CINSTANCES,
+  KSPROPERTY_PIN_CTYPES,
+  KSPROPERTY_PIN_DATAFLOW,
+  KSPROPERTY_PIN_DATARANGES,
+  KSPROPERTY_PIN_DATAINTERSECTION,
+  KSPROPERTY_PIN_INTERFACES,
+  KSPROPERTY_PIN_MEDIUMS,
+  KSPROPERTY_PIN_COMMUNICATION,
+  KSPROPERTY_PIN_GLOBALCINSTANCES,
+  KSPROPERTY_PIN_NECESSARYINSTANCES,
+  KSPROPERTY_PIN_PHYSICALCONNECTION,
+  KSPROPERTY_PIN_CATEGORY,
+  KSPROPERTY_PIN_NAME,
+  KSPROPERTY_PIN_CONSTRAINEDDATARANGES,
+  KSPROPERTY_PIN_PROPOSEDATAFORMAT
+} KSPROPERTY_PIN;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG PinId;
+  ULONG Reserved;
+} KSP_PIN,*PKSP_PIN;
+
+#define KSINSTANCE_INDETERMINATE	((ULONG)-1)
+
+typedef struct {
+  ULONG PossibleCount;
+  ULONG CurrentCount;
+} KSPIN_CINSTANCES,*PKSPIN_CINSTANCES;
+
+typedef enum {
+  KSPIN_DATAFLOW_IN = 1,
+  KSPIN_DATAFLOW_OUT
+} KSPIN_DATAFLOW,*PKSPIN_DATAFLOW;
+
+#define KSDATAFORMAT_BIT_TEMPORAL_COMPRESSION	0
+#define KSDATAFORMAT_TEMPORAL_COMPRESSION	(1 << KSDATAFORMAT_BIT_TEMPORAL_COMPRESSION)
+#define KSDATAFORMAT_BIT_ATTRIBUTES		1
+#define KSDATAFORMAT_ATTRIBUTES			(1 << KSDATAFORMAT_BIT_ATTRIBUTES)
+
+#define KSDATARANGE_BIT_ATTRIBUTES		1
+#define KSDATARANGE_ATTRIBUTES			(1 << KSDATARANGE_BIT_ATTRIBUTES)
+#define KSDATARANGE_BIT_REQUIRED_ATTRIBUTES	2
+#define KSDATARANGE_REQUIRED_ATTRIBUTES		(1 << KSDATARANGE_BIT_REQUIRED_ATTRIBUTES)
+
+typedef union {
+  __MINGW_EXTENSION struct {
+    ULONG FormatSize;
+    ULONG Flags;
+    ULONG SampleSize;
+    ULONG Reserved;
+    GUID MajorFormat;
+    GUID SubFormat;
+    GUID Specifier;
+  };
+  LONGLONG Alignment;
+} KSDATAFORMAT,*PKSDATAFORMAT,KSDATARANGE,*PKSDATARANGE;
+
+#define KSATTRIBUTE_REQUIRED		0x00000001
+
+typedef struct {
+  ULONG Size;
+  ULONG Flags;
+  GUID Attribute;
+} KSATTRIBUTE,*PKSATTRIBUTE;
+
+#if defined(_NTDDK_)
+typedef struct {
+  ULONG Count;
+  PKSATTRIBUTE *Attributes;
+} KSATTRIBUTE_LIST,*PKSATTRIBUTE_LIST;
+#endif /* _NTDDK_ */
+
+typedef enum {
+  KSPIN_COMMUNICATION_NONE,
+  KSPIN_COMMUNICATION_SINK,
+  KSPIN_COMMUNICATION_SOURCE,
+  KSPIN_COMMUNICATION_BOTH,
+  KSPIN_COMMUNICATION_BRIDGE
+} KSPIN_COMMUNICATION,*PKSPIN_COMMUNICATION;
+
+typedef KSIDENTIFIER KSPIN_MEDIUM,*PKSPIN_MEDIUM;
+
+typedef struct {
+  KSPIN_INTERFACE Interface;
+  KSPIN_MEDIUM Medium;
+  ULONG PinId;
+  HANDLE PinToHandle;
+  KSPRIORITY Priority;
+} KSPIN_CONNECT,*PKSPIN_CONNECT;
+
+typedef struct {
+  ULONG Size;
+  ULONG Pin;
+  WCHAR SymbolicLinkName[1];
+} KSPIN_PHYSICALCONNECTION,*PKSPIN_PHYSICALCONNECTION;
+
+#if defined(_NTDDK_)
+typedef NTSTATUS (*PFNKSINTERSECTHANDLER) ( PIRP Irp, PKSP_PIN Pin,
+					    PKSDATARANGE DataRange,
+					    PVOID Data);
+typedef NTSTATUS (*PFNKSINTERSECTHANDLEREX)(PVOID Context, PIRP Irp,
+					    PKSP_PIN Pin,
+					    PKSDATARANGE DataRange,
+					    PKSDATARANGE MatchingDataRange,
+					    ULONG DataBufferSize,
+					    PVOID Data,
+					    PULONG DataSize);
+#endif /* _NTDDK_ */
+
+#define DEFINE_KSPIN_INTERFACE_TABLE(tablename)				\
+	const KSPIN_INTERFACE tablename[] =
+
+#define DEFINE_KSPIN_INTERFACE_ITEM(guid,_interFace)			\
+	{								\
+		STATICGUIDOF(guid),					\
+		(_interFace),						\
+		0							\
+	}
+
+#define DEFINE_KSPIN_MEDIUM_TABLE(tablename)				\
+	const KSPIN_MEDIUM tablename[] =
+
+#define DEFINE_KSPIN_MEDIUM_ITEM(guid,medium)				\
+		DEFINE_KSPIN_INTERFACE_ITEM(guid,medium)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_CINSTANCES,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(KSPIN_CINSTANCES),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_CTYPES(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_CTYPES,			\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(ULONG),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_DATAFLOW(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_DATAFLOW,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(KSPIN_DATAFLOW),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_DATARANGES(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_DATARANGES,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_DATAINTERSECTION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_DATAINTERSECTION,	\
+				(Handler),				\
+				sizeof(KSP_PIN) + sizeof(KSMULTIPLE_ITEM),\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_INTERFACES,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_MEDIUMS,			\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_COMMUNICATION,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(KSPIN_COMMUNICATION),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_GLOBALCINSTANCES(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_GLOBALCINSTANCES,	\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(KSPIN_CINSTANCES),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_NECESSARYINSTANCES(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_NECESSARYINSTANCES,	\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(ULONG),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_PHYSICALCONNECTION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_PHYSICALCONNECTION,	\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_CATEGORY,		\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				sizeof(GUID),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_NAME(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_NAME,			\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_CONSTRAINEDDATARANGES,	\
+				(Handler),				\
+				sizeof(KSP_PIN),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_PIN_PROPOSEDATAFORMAT,	\
+				NULL,					\
+				sizeof(KSP_PIN),			\
+				sizeof(KSDATAFORMAT),			\
+				(Handler), NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_PINSET(PinSet,PropGeneral,PropInstances,PropIntersection) \
+DEFINE_KSPROPERTY_TABLE(PinSet) {					\
+	DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(PropInstances),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_CTYPES(PropGeneral),			\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATAFLOW(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATARANGES(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATAINTERSECTION(PropIntersection),	\
+	DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral)			\
+}
+
+#define DEFINE_KSPROPERTY_PINSETCONSTRAINED(PinSet,PropGeneral,PropInstances,PropIntersection) \
+DEFINE_KSPROPERTY_TABLE(PinSet) {					\
+	DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(PropInstances),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_CTYPES(PropGeneral),			\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATAFLOW(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATARANGES(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_DATAINTERSECTION(PropIntersection),	\
+	DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),		\
+	DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral),			\
+	DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral)	\
+}
+
+#define STATIC_KSNAME_Filter						\
+	0x9b365890L,0x165f,0x11d0,0xa1,0x95,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("9b365890-165f-11d0-a195-0020afd156e4",KSNAME_Filter);
+#define KSNAME_Filter DEFINE_GUIDNAMED(KSNAME_Filter)
+
+#define KSSTRING_Filter		L"{9B365890-165F-11D0-A195-0020AFD156E4}"
+
+#define STATIC_KSNAME_Pin						\
+	0x146F1A80L,0x4791,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("146F1A80-4791-11D0-A5D6-28DB04C10000",KSNAME_Pin);
+#define KSNAME_Pin DEFINE_GUIDNAMED(KSNAME_Pin)
+
+#define KSSTRING_Pin		L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"
+
+#define STATIC_KSNAME_Clock						\
+	0x53172480L,0x4791,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("53172480-4791-11D0-A5D6-28DB04C10000",KSNAME_Clock);
+#define KSNAME_Clock DEFINE_GUIDNAMED(KSNAME_Clock)
+
+#define KSSTRING_Clock		L"{53172480-4791-11D0-A5D6-28DB04C10000}"
+
+#define STATIC_KSNAME_Allocator						\
+	0x642F5D00L,0x4791,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("642F5D00-4791-11D0-A5D6-28DB04C10000",KSNAME_Allocator);
+#define KSNAME_Allocator DEFINE_GUIDNAMED(KSNAME_Allocator)
+
+#define KSSTRING_Allocator	L"{642F5D00-4791-11D0-A5D6-28DB04C10000}"
+
+#define KSSTRING_AllocatorEx	L"{091BB63B-603F-11D1-B067-00A0C9062802}"
+
+#define STATIC_KSNAME_TopologyNode					\
+	0x0621061AL,0xEE75,0x11D0,0xB9,0x15,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("0621061A-EE75-11D0-B915-00A0C9223196",KSNAME_TopologyNode);
+#define KSNAME_TopologyNode DEFINE_GUIDNAMED(KSNAME_TopologyNode)
+
+#define KSSTRING_TopologyNode	L"{0621061A-EE75-11D0-B915-00A0C9223196}"
+
+#if defined(_NTDDK_)
+typedef struct {
+  ULONG InterfacesCount;
+  const KSPIN_INTERFACE *Interfaces;
+  ULONG MediumsCount;
+  const KSPIN_MEDIUM *Mediums;
+  ULONG DataRangesCount;
+  const PKSDATARANGE *DataRanges;
+  KSPIN_DATAFLOW DataFlow;
+  KSPIN_COMMUNICATION Communication;
+  const GUID *Category;
+  const GUID *Name;
+  __MINGW_EXTENSION union {
+    LONGLONG Reserved;
+    __MINGW_EXTENSION struct {
+      ULONG ConstrainedDataRangesCount;
+      PKSDATARANGE *ConstrainedDataRanges;
+    };
+  };
+} KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR;
+typedef const KSPIN_DESCRIPTOR *PCKSPIN_DESCRIPTOR;
+
+#define DEFINE_KSPIN_DESCRIPTOR_TABLE(tablename)			\
+	const KSPIN_DESCRIPTOR tablename[] =
+
+#define DEFINE_KSPIN_DESCRIPTOR_ITEM(InterfacesCount,Interfaces,MediumsCount, Mediums,DataRangesCount,DataRanges,DataFlow,Communication)\
+{									\
+		InterfacesCount, Interfaces, MediumsCount, Mediums,	\
+		DataRangesCount, DataRanges, DataFlow, Communication,	\
+		NULL, NULL, 0						\
+}
+
+#define DEFINE_KSPIN_DESCRIPTOR_ITEMEX(InterfacesCount,Interfaces,MediumsCount,Mediums,DataRangesCount,DataRanges,DataFlow,Communication,Category,Name)\
+{									\
+		InterfacesCount, Interfaces, MediumsCount, Mediums,	\
+		DataRangesCount, DataRanges, DataFlow, Communication,	\
+		Category, Name, 0					\
+}
+#endif /* _NTDDK_ */
+
+#define STATIC_KSDATAFORMAT_TYPE_WILDCARD	STATIC_GUID_NULL
+#define KSDATAFORMAT_TYPE_WILDCARD		GUID_NULL
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_WILDCARD	STATIC_GUID_NULL
+#define KSDATAFORMAT_SUBTYPE_WILDCARD		GUID_NULL
+
+#define STATIC_KSDATAFORMAT_TYPE_STREAM					\
+	0xE436EB83L,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70
+DEFINE_GUIDSTRUCT("E436EB83-524F-11CE-9F53-0020AF0BA770",KSDATAFORMAT_TYPE_STREAM);
+#define KSDATAFORMAT_TYPE_STREAM DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_STREAM)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_NONE				\
+	0xE436EB8EL,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70
+DEFINE_GUIDSTRUCT("E436EB8E-524F-11CE-9F53-0020AF0BA770",KSDATAFORMAT_SUBTYPE_NONE);
+#define KSDATAFORMAT_SUBTYPE_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_NONE)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_WILDCARD	STATIC_GUID_NULL
+#define KSDATAFORMAT_SPECIFIER_WILDCARD		GUID_NULL
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_FILENAME				\
+	0xAA797B40L,0xE974,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("AA797B40-E974-11CF-A5D6-28DB04C10000",KSDATAFORMAT_SPECIFIER_FILENAME);
+#define KSDATAFORMAT_SPECIFIER_FILENAME DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_FILENAME)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_FILEHANDLE			\
+	0x65E8773CL,0x8F56,0x11D0,0xA3,0xB9,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("65E8773C-8F56-11D0-A3B9-00A0C9223196",KSDATAFORMAT_SPECIFIER_FILEHANDLE);
+#define KSDATAFORMAT_SPECIFIER_FILEHANDLE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_FILEHANDLE)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_NONE				\
+	0x0F6417D6L,0xC318,0x11D0,0xA4,0x3F,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("0F6417D6-C318-11D0-A43F-00A0C9223196",KSDATAFORMAT_SPECIFIER_NONE);
+#define KSDATAFORMAT_SPECIFIER_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_NONE)
+
+#define STATIC_KSPROPSETID_Quality					\
+	0xD16AD380L,0xAC1A,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("D16AD380-AC1A-11CF-A5D6-28DB04C10000",KSPROPSETID_Quality);
+#define KSPROPSETID_Quality DEFINE_GUIDNAMED(KSPROPSETID_Quality)
+
+typedef enum {
+  KSPROPERTY_QUALITY_REPORT,
+  KSPROPERTY_QUALITY_ERROR
+} KSPROPERTY_QUALITY;
+
+#define DEFINE_KSPROPERTY_ITEM_QUALITY_REPORT(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_QUALITY_REPORT,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSQUALITY),			\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_QUALITY_ERROR(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_QUALITY_ERROR,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSERROR),			\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define STATIC_KSPROPSETID_Connection					\
+	0x1D58C920L,0xAC9B,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("1D58C920-AC9B-11CF-A5D6-28DB04C10000",KSPROPSETID_Connection);
+#define KSPROPSETID_Connection DEFINE_GUIDNAMED(KSPROPSETID_Connection)
+
+typedef enum {
+  KSPROPERTY_CONNECTION_STATE,
+  KSPROPERTY_CONNECTION_PRIORITY,
+  KSPROPERTY_CONNECTION_DATAFORMAT,
+  KSPROPERTY_CONNECTION_ALLOCATORFRAMING,
+  KSPROPERTY_CONNECTION_PROPOSEDATAFORMAT,
+  KSPROPERTY_CONNECTION_ACQUIREORDERING,
+  KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX,
+  KSPROPERTY_CONNECTION_STARTAT
+} KSPROPERTY_CONNECTION;
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_STATE,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSSTATE),			\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_PRIORITY(GetHandler,SetHandler) \
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_PRIORITY,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSPRIORITY),			\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(GetHandler,SetHandler)\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_DATAFORMAT,	\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_ALLOCATORFRAMING,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSALLOCATOR_FRAMING),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX,\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_PROPOSEDATAFORMAT(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_PROPOSEDATAFORMAT,\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSDATAFORMAT),			\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ACQUIREORDERING(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_ACQUIREORDERING,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(int),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CONNECTION_STARTAT(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CONNECTION_STARTAT,		\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSRELATIVEEVENT),		\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER	0x00000001
+#define KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY		0x00000002
+#define KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY	0x00000004
+#define KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE		0x00000008
+#define KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY	0x80000000
+
+#define KSALLOCATOR_OPTIONF_COMPATIBLE			0x00000001
+#define KSALLOCATOR_OPTIONF_SYSTEM_MEMORY		0x00000002
+#define KSALLOCATOR_OPTIONF_VALID			0x00000003
+
+#define KSALLOCATOR_FLAG_PARTIAL_READ_SUPPORT		0x00000010
+#define KSALLOCATOR_FLAG_DEVICE_SPECIFIC		0x00000020
+#define KSALLOCATOR_FLAG_CAN_ALLOCATE			0x00000040
+#define KSALLOCATOR_FLAG_INSIST_ON_FRAMESIZE_RATIO	0x00000080
+#define KSALLOCATOR_FLAG_NO_FRAME_INTEGRITY		0x00000100
+#define KSALLOCATOR_FLAG_MULTIPLE_OUTPUT		0x00000200
+#define KSALLOCATOR_FLAG_CYCLE				0x00000400
+#define KSALLOCATOR_FLAG_ALLOCATOR_EXISTS		0x00000800
+#define KSALLOCATOR_FLAG_INDEPENDENT_RANGES		0x00001000
+#define KSALLOCATOR_FLAG_ATTENTION_STEPPING		0x00002000
+
+typedef struct {
+  __MINGW_EXTENSION union {
+    ULONG OptionsFlags;
+    ULONG RequirementsFlags;
+  };
+#if defined(_NTDDK_)
+  POOL_TYPE PoolType;
+#else
+  ULONG PoolType;
+#endif /* _NTDDK_ */
+  ULONG Frames;
+  ULONG FrameSize;
+  ULONG FileAlignment;
+  ULONG Reserved;
+} KSALLOCATOR_FRAMING,*PKSALLOCATOR_FRAMING;
+
+#if defined(_NTDDK_)
+typedef PVOID (*PFNKSDEFAULTALLOCATE)(PVOID Context);
+typedef VOID (*PFNKSDEFAULTFREE)(PVOID Context, PVOID Buffer);
+typedef NTSTATUS (*PFNKSINITIALIZEALLOCATOR)(PVOID InitialContext,
+					PKSALLOCATOR_FRAMING AllocatorFraming,
+					PVOID* Context);
+typedef VOID (*PFNKSDELETEALLOCATOR) (PVOID Context);
+#endif /* _NTDDK_ */
+
+typedef struct {
+  ULONG MinFrameSize;
+  ULONG MaxFrameSize;
+  ULONG Stepping;
+} KS_FRAMING_RANGE,*PKS_FRAMING_RANGE;
+
+typedef struct {
+  KS_FRAMING_RANGE Range;
+  ULONG InPlaceWeight;
+  ULONG NotInPlaceWeight;
+} KS_FRAMING_RANGE_WEIGHTED,*PKS_FRAMING_RANGE_WEIGHTED;
+
+typedef struct {
+  ULONG RatioNumerator;
+  ULONG RatioDenominator;
+  ULONG RatioConstantMargin;
+} KS_COMPRESSION,*PKS_COMPRESSION;
+
+typedef struct {
+  GUID MemoryType;
+  GUID BusType;
+  ULONG MemoryFlags;
+  ULONG BusFlags;
+  ULONG Flags;
+  ULONG Frames;
+  ULONG FileAlignment;
+  ULONG MemoryTypeWeight;
+  KS_FRAMING_RANGE PhysicalRange;
+  KS_FRAMING_RANGE_WEIGHTED FramingRange;
+} KS_FRAMING_ITEM,*PKS_FRAMING_ITEM;
+
+typedef struct {
+  ULONG CountItems;
+  ULONG PinFlags;
+  KS_COMPRESSION OutputCompression;
+  ULONG PinWeight;
+  KS_FRAMING_ITEM FramingItem[1];
+} KSALLOCATOR_FRAMING_EX,*PKSALLOCATOR_FRAMING_EX;
+
+#define KSMEMORY_TYPE_WILDCARD		GUID_NULL
+#define STATIC_KSMEMORY_TYPE_WILDCARD	STATIC_GUID_NULL
+
+#define KSMEMORY_TYPE_DONT_CARE		GUID_NULL
+#define STATIC_KSMEMORY_TYPE_DONT_CARE	STATIC_GUID_NULL
+
+#define KS_TYPE_DONT_CARE		GUID_NULL
+#define STATIC_KS_TYPE_DONT_CARE	STATIC_GUID_NULL
+
+#define STATIC_KSMEMORY_TYPE_SYSTEM					\
+	0x091bb638L,0x603f,0x11d1,0xb0,0x67,0x00,0xa0,0xc9,0x06,0x28,0x02
+DEFINE_GUIDSTRUCT("091bb638-603f-11d1-b067-00a0c9062802",KSMEMORY_TYPE_SYSTEM);
+#define KSMEMORY_TYPE_SYSTEM DEFINE_GUIDNAMED(KSMEMORY_TYPE_SYSTEM)
+
+#define STATIC_KSMEMORY_TYPE_USER					\
+	0x8cb0fc28L,0x7893,0x11d1,0xb0,0x69,0x00,0xa0,0xc9,0x06,0x28,0x02
+DEFINE_GUIDSTRUCT("8cb0fc28-7893-11d1-b069-00a0c9062802",KSMEMORY_TYPE_USER);
+#define KSMEMORY_TYPE_USER DEFINE_GUIDNAMED(KSMEMORY_TYPE_USER)
+
+#define STATIC_KSMEMORY_TYPE_KERNEL_PAGED				\
+	0xd833f8f8L,0x7894,0x11d1,0xb0,0x69,0x00,0xa0,0xc9,0x06,0x28,0x02
+DEFINE_GUIDSTRUCT("d833f8f8-7894-11d1-b069-00a0c9062802",KSMEMORY_TYPE_KERNEL_PAGED);
+#define KSMEMORY_TYPE_KERNEL_PAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_PAGED)
+
+#define STATIC_KSMEMORY_TYPE_KERNEL_NONPAGED				\
+	0x4a6d5fc4L,0x7895,0x11d1,0xb0,0x69,0x00,0xa0,0xc9,0x06,0x28,0x02
+DEFINE_GUIDSTRUCT("4a6d5fc4-7895-11d1-b069-00a0c9062802",KSMEMORY_TYPE_KERNEL_NONPAGED);
+#define KSMEMORY_TYPE_KERNEL_NONPAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_NONPAGED)
+
+#define STATIC_KSMEMORY_TYPE_DEVICE_UNKNOWN				\
+	0x091bb639L,0x603f,0x11d1,0xb0,0x67,0x00,0xa0,0xc9,0x06,0x28,0x02
+DEFINE_GUIDSTRUCT("091bb639-603f-11d1-b067-00a0c9062802",KSMEMORY_TYPE_DEVICE_UNKNOWN);
+#define KSMEMORY_TYPE_DEVICE_UNKNOWN DEFINE_GUIDNAMED(KSMEMORY_TYPE_DEVICE_UNKNOWN)
+
+#define DECLARE_SIMPLE_FRAMING_EX(FramingExName,MemoryType,Flags,Frames,Alignment,MinFrameSize,MaxFrameSize) \
+const KSALLOCATOR_FRAMING_EX FramingExName =				\
+{									\
+	1,								\
+	0,								\
+	{								\
+		1,							\
+		1,							\
+		0							\
+	},								\
+	0,								\
+	{								\
+		{							\
+			MemoryType,					\
+			STATIC_KS_TYPE_DONT_CARE,			\
+			0,						\
+			0,						\
+			Flags,						\
+			Frames,						\
+			Alignment,					\
+			0,						\
+			{						\
+				0,					\
+				(ULONG)-1,				\
+				1					\
+			},						\
+			{						\
+				{					\
+					MinFrameSize,			\
+					MaxFrameSize,			\
+					1				\
+				},					\
+				0,					\
+				0					\
+			}						\
+		}							\
+	}								\
+}
+
+#define SetDefaultKsCompression(KsCompressionPointer)			\
+{									\
+	KsCompressionPointer->RatioNumerator = 1;			\
+	KsCompressionPointer->RatioDenominator = 1;			\
+	KsCompressionPointer->RatioConstantMargin = 0;			\
+}
+
+#define SetDontCareKsFramingRange(KsFramingRangePointer)		\
+{									\
+	KsFramingRangePointer->MinFrameSize = 0;			\
+	KsFramingRangePointer->MaxFrameSize = (ULONG) -1;		\
+	KsFramingRangePointer->Stepping = 1;				\
+}
+
+#define SetKsFramingRange(KsFramingRangePointer,P_MinFrameSize,P_MaxFrameSize) \
+{									\
+	KsFramingRangePointer->MinFrameSize = P_MinFrameSize;		\
+	KsFramingRangePointer->MaxFrameSize = P_MaxFrameSize;		\
+	KsFramingRangePointer->Stepping = 1;				\
+}
+
+#define SetKsFramingRangeWeighted(KsFramingRangeWeightedPointer,P_MinFrameSize,P_MaxFrameSize) \
+{									\
+	KS_FRAMING_RANGE *KsFramingRange =				\
+				&KsFramingRangeWeightedPointer->Range;	\
+	SetKsFramingRange(KsFramingRange,P_MinFrameSize,P_MaxFrameSize);\
+	KsFramingRangeWeightedPointer->InPlaceWeight = 0;		\
+	KsFramingRangeWeightedPointer->NotInPlaceWeight = 0;		\
+}
+
+#define INITIALIZE_SIMPLE_FRAMING_EX(FramingExPointer,P_MemoryType,P_Flags,P_Frames,P_Alignment,P_MinFrameSize,P_MaxFrameSize) \
+{									\
+	KS_COMPRESSION *KsCompression =					\
+			&FramingExPointer->OutputCompression;		\
+	KS_FRAMING_RANGE *KsFramingRange =				\
+			&FramingExPointer->FramingItem[0].PhysicalRange;\
+	KS_FRAMING_RANGE_WEIGHTED *KsFramingRangeWeighted =		\
+			&FramingExPointer->FramingItem[0].FramingRange;	\
+	FramingExPointer->CountItems = 1;				\
+	FramingExPointer->PinFlags = 0;					\
+	SetDefaultKsCompression(KsCompression);				\
+	FramingExPointer->PinWeight = 0;				\
+	FramingExPointer->FramingItem[0].MemoryType = P_MemoryType;	\
+	FramingExPointer->FramingItem[0].BusType = KS_TYPE_DONT_CARE;	\
+	FramingExPointer->FramingItem[0].MemoryFlags = 0;		\
+	FramingExPointer->FramingItem[0].BusFlags = 0;			\
+	FramingExPointer->FramingItem[0].Flags = P_Flags;		\
+	FramingExPointer->FramingItem[0].Frames = P_Frames;		\
+	FramingExPointer->FramingItem[0].FileAlignment = P_Alignment;	\
+	FramingExPointer->FramingItem[0].MemoryTypeWeight = 0;		\
+	SetDontCareKsFramingRange(KsFramingRange);			\
+	SetKsFramingRangeWeighted(KsFramingRangeWeighted,		\
+				  P_MinFrameSize,P_MaxFrameSize);	\
+}
+
+#define STATIC_KSEVENTSETID_StreamAllocator				\
+	0x75d95571L,0x073c,0x11d0,0xa1,0x61,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("75d95571-073c-11d0-a161-0020afd156e4",KSEVENTSETID_StreamAllocator);
+#define KSEVENTSETID_StreamAllocator DEFINE_GUIDNAMED(KSEVENTSETID_StreamAllocator)
+
+typedef enum {
+  KSEVENT_STREAMALLOCATOR_INTERNAL_FREEFRAME,
+  KSEVENT_STREAMALLOCATOR_FREEFRAME
+} KSEVENT_STREAMALLOCATOR;
+
+#define STATIC_KSMETHODSETID_StreamAllocator				\
+	0xcf6e4341L,0xec87,0x11cf,0xa1,0x30,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("cf6e4341-ec87-11cf-a130-0020afd156e4",KSMETHODSETID_StreamAllocator);
+#define KSMETHODSETID_StreamAllocator DEFINE_GUIDNAMED(KSMETHODSETID_StreamAllocator)
+
+typedef enum {
+  KSMETHOD_STREAMALLOCATOR_ALLOC,
+  KSMETHOD_STREAMALLOCATOR_FREE
+} KSMETHOD_STREAMALLOCATOR;
+
+#define DEFINE_KSMETHOD_ITEM_STREAMALLOCATOR_ALLOC(Handler)		\
+	DEFINE_KSMETHOD_ITEM(						\
+				KSMETHOD_STREAMALLOCATOR_ALLOC,		\
+				KSMETHOD_TYPE_WRITE,			\
+				(Handler),				\
+				sizeof(KSMETHOD),			\
+				sizeof(PVOID),				\
+				NULL)
+
+#define DEFINE_KSMETHOD_ITEM_STREAMALLOCATOR_FREE(Handler)		\
+	DEFINE_KSMETHOD_ITEM(						\
+				KSMETHOD_STREAMALLOCATOR_FREE,		\
+				KSMETHOD_TYPE_READ,			\
+				(Handler),				\
+				sizeof(KSMETHOD),			\
+				sizeof(PVOID),				\
+				NULL)
+
+#define DEFINE_KSMETHOD_ALLOCATORSET(AllocatorSet,MethodAlloc,MethodFree)\
+DEFINE_KSMETHOD_TABLE(AllocatorSet) {					\
+	DEFINE_KSMETHOD_ITEM_STREAMALLOCATOR_ALLOC(MethodAlloc),	\
+	DEFINE_KSMETHOD_ITEM_STREAMALLOCATOR_FREE(MethodFree)		\
+}
+
+#define STATIC_KSPROPSETID_StreamAllocator				\
+	0xcf6e4342L,0xec87,0x11cf,0xa1,0x30,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("cf6e4342-ec87-11cf-a130-0020afd156e4",KSPROPSETID_StreamAllocator);
+#define KSPROPSETID_StreamAllocator DEFINE_GUIDNAMED(KSPROPSETID_StreamAllocator)
+
+#if defined(_NTDDK_)
+typedef enum {
+  KSPROPERTY_STREAMALLOCATOR_FUNCTIONTABLE,
+  KSPROPERTY_STREAMALLOCATOR_STATUS
+} KSPROPERTY_STREAMALLOCATOR;
+
+#define DEFINE_KSPROPERTY_ITEM_STREAMALLOCATOR_FUNCTIONTABLE(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAMALLOCATOR_FUNCTIONTABLE,\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSSTREAMALLOCATOR_FUNCTIONTABLE),\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAMALLOCATOR_STATUS(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAMALLOCATOR_STATUS,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSSTREAMALLOCATOR_STATUS),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ALLOCATORSET(AllocatorSet,PropFunctionTable,PropStatus)\
+DEFINE_KSPROPERTY_TABLE(AllocatorSet) {					\
+	DEFINE_KSPROPERTY_ITEM_STREAMALLOCATOR_STATUS(PropStatus),	\
+	DEFINE_KSPROPERTY_ITEM_STREAMALLOCATOR_FUNCTIONTABLE(PropFunctionTable)\
+}
+
+typedef NTSTATUS (*PFNALLOCATOR_ALLOCATEFRAME) (PFILE_OBJECT FileObject,
+						PVOID *Frame);
+typedef VOID (*PFNALLOCATOR_FREEFRAME) (PFILE_OBJECT FileObject, PVOID Frame);
+
+typedef struct {
+  PFNALLOCATOR_ALLOCATEFRAME AllocateFrame;
+  PFNALLOCATOR_FREEFRAME FreeFrame;
+} KSSTREAMALLOCATOR_FUNCTIONTABLE, *PKSSTREAMALLOCATOR_FUNCTIONTABLE;
+#endif /* _NTDDK_ */
+
+typedef struct {
+  KSALLOCATOR_FRAMING Framing;
+  ULONG AllocatedFrames;
+  ULONG Reserved;
+} KSSTREAMALLOCATOR_STATUS,*PKSSTREAMALLOCATOR_STATUS;
+
+typedef struct {
+  KSALLOCATOR_FRAMING_EX Framing;
+  ULONG AllocatedFrames;
+  ULONG Reserved;
+} KSSTREAMALLOCATOR_STATUS_EX,*PKSSTREAMALLOCATOR_STATUS_EX;
+
+#define KSSTREAM_HEADER_OPTIONSF_SPLICEPOINT		0x00000001
+#define KSSTREAM_HEADER_OPTIONSF_PREROLL		0x00000002
+#define KSSTREAM_HEADER_OPTIONSF_DATADISCONTINUITY	0x00000004
+#define KSSTREAM_HEADER_OPTIONSF_TYPECHANGED		0x00000008
+#define KSSTREAM_HEADER_OPTIONSF_TIMEVALID		0x00000010
+#define KSSTREAM_HEADER_OPTIONSF_TIMEDISCONTINUITY	0x00000040
+#define KSSTREAM_HEADER_OPTIONSF_FLUSHONPAUSE		0x00000080
+#define KSSTREAM_HEADER_OPTIONSF_DURATIONVALID		0x00000100
+#define KSSTREAM_HEADER_OPTIONSF_ENDOFSTREAM		0x00000200
+#define KSSTREAM_HEADER_OPTIONSF_LOOPEDDATA		0x80000000
+
+typedef struct {
+  LONGLONG Time;
+  ULONG Numerator;
+  ULONG Denominator;
+} KSTIME,*PKSTIME;
+
+typedef struct {
+  ULONG Size;
+  ULONG TypeSpecificFlags;
+  KSTIME PresentationTime;
+  LONGLONG Duration;
+  ULONG FrameExtent;
+  ULONG DataUsed;
+  PVOID Data;
+  ULONG OptionsFlags;
+#ifdef _WIN64
+  ULONG Reserved;
+#endif
+} KSSTREAM_HEADER,*PKSSTREAM_HEADER;
+
+#define STATIC_KSPROPSETID_StreamInterface				\
+	0x1fdd8ee1L,0x9cd3,0x11d0,0x82,0xaa,0x00,0x00,0xf8,0x22,0xfe,0x8a
+DEFINE_GUIDSTRUCT("1fdd8ee1-9cd3-11d0-82aa-0000f822fe8a",KSPROPSETID_StreamInterface);
+#define KSPROPSETID_StreamInterface DEFINE_GUIDNAMED(KSPROPSETID_StreamInterface)
+
+typedef enum {
+  KSPROPERTY_STREAMINTERFACE_HEADERSIZE
+} KSPROPERTY_STREAMINTERFACE;
+
+#define DEFINE_KSPROPERTY_ITEM_STREAMINTERFACE_HEADERSIZE(GetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAMINTERFACE_HEADERSIZE,	\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(ULONG),				\
+				NULL,NULL,0,NULL,NULL,0)
+
+#define DEFINE_KSPROPERTY_STREAMINTERFACESET(StreamInterfaceSet,HeaderSizeHandler) \
+DEFINE_KSPROPERTY_TABLE(StreamInterfaceSet) {				\
+	DEFINE_KSPROPERTY_ITEM_STREAMINTERFACE_HEADERSIZE(HeaderSizeHandler)\
+}
+
+#define STATIC_KSPROPSETID_Stream					\
+	0x65aaba60L,0x98ae,0x11cf,0xa1,0x0d,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("65aaba60-98ae-11cf-a10d-0020afd156e4",KSPROPSETID_Stream);
+#define KSPROPSETID_Stream DEFINE_GUIDNAMED(KSPROPSETID_Stream)
+
+typedef enum {
+  KSPROPERTY_STREAM_ALLOCATOR,
+  KSPROPERTY_STREAM_QUALITY,
+  KSPROPERTY_STREAM_DEGRADATION,
+  KSPROPERTY_STREAM_MASTERCLOCK,
+  KSPROPERTY_STREAM_TIMEFORMAT,
+  KSPROPERTY_STREAM_PRESENTATIONTIME,
+  KSPROPERTY_STREAM_PRESENTATIONEXTENT,
+  KSPROPERTY_STREAM_FRAMETIME,
+  KSPROPERTY_STREAM_RATECAPABILITY,
+  KSPROPERTY_STREAM_RATE,
+  KSPROPERTY_STREAM_PIPE_ID
+} KSPROPERTY_STREAM;
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_ALLOCATOR(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_ALLOCATOR,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(HANDLE),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_QUALITY(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_QUALITY,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSQUALITY_MANAGER),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_DEGRADATION(GetHandler,SetHandler)\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_DEGRADATION,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(GetHandler,SetHandler)\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_MASTERCLOCK,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(HANDLE),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_TIMEFORMAT(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_TIMEFORMAT,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(GUID),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_PRESENTATIONTIME(GetHandler,SetHandler)\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_PRESENTATIONTIME,	\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSTIME),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_PRESENTATIONEXTENT(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_PRESENTATIONEXTENT,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(LONGLONG),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_FRAMETIME(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_FRAMETIME,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSFRAMETIME),			\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_RATECAPABILITY(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_RATECAPABILITY,	\
+				(Handler),				\
+				sizeof(KSRATE_CAPABILITY),		\
+				sizeof(KSRATE),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_RATE(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_RATE,			\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSRATE),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(GetHandler,SetHandler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_STREAM_PIPE_ID,		\
+				(GetHandler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(HANDLE),				\
+				(SetHandler),				\
+				NULL, 0, NULL, NULL, 0)
+
+typedef struct {
+  HANDLE QualityManager;
+  PVOID Context;
+} KSQUALITY_MANAGER,*PKSQUALITY_MANAGER;
+
+typedef struct {
+  LONGLONG Duration;
+  ULONG FrameFlags;
+  ULONG Reserved;
+} KSFRAMETIME,*PKSFRAMETIME;
+
+#define KSFRAMETIME_VARIABLESIZE	0x00000001
+
+typedef struct {
+  LONGLONG PresentationStart;
+  LONGLONG Duration;
+  KSPIN_INTERFACE Interface;
+  LONG Rate;
+  ULONG Flags;
+} KSRATE,*PKSRATE;
+
+#define KSRATE_NOPRESENTATIONSTART	0x00000001
+#define KSRATE_NOPRESENTATIONDURATION	0x00000002
+
+typedef struct {
+  KSPROPERTY Property;
+  KSRATE Rate;
+} KSRATE_CAPABILITY,*PKSRATE_CAPABILITY;
+
+#define STATIC_KSPROPSETID_Clock					\
+	0xDF12A4C0L,0xAC17,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("DF12A4C0-AC17-11CF-A5D6-28DB04C10000",KSPROPSETID_Clock);
+#define KSPROPSETID_Clock DEFINE_GUIDNAMED(KSPROPSETID_Clock)
+
+#define NANOSECONDS 10000000
+#define KSCONVERT_PERFORMANCE_TIME(Frequency,PerformanceTime)		\
+	((((ULONGLONG)(ULONG)(PerformanceTime).HighPart *NANOSECONDS / (Frequency)) << 32) +	\
+	 ((((((ULONGLONG)(ULONG)(PerformanceTime).HighPart *NANOSECONDS) % (Frequency)) << 32) +\
+	 ((ULONGLONG)(PerformanceTime).LowPart *NANOSECONDS)) / (Frequency)))
+
+typedef struct {
+  ULONG CreateFlags;
+} KSCLOCK_CREATE,*PKSCLOCK_CREATE;
+
+typedef struct {
+  LONGLONG Time;
+  LONGLONG SystemTime;
+} KSCORRELATED_TIME,*PKSCORRELATED_TIME;
+
+typedef struct {
+  LONGLONG Granularity;
+  LONGLONG Error;
+} KSRESOLUTION,*PKSRESOLUTION;
+
+typedef enum {
+  KSPROPERTY_CLOCK_TIME,
+  KSPROPERTY_CLOCK_PHYSICALTIME,
+  KSPROPERTY_CLOCK_CORRELATEDTIME,
+  KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME,
+  KSPROPERTY_CLOCK_RESOLUTION,
+  KSPROPERTY_CLOCK_STATE,
+#if defined(_NTDDK_)
+  KSPROPERTY_CLOCK_FUNCTIONTABLE
+#endif /* _NTDDK_ */
+} KSPROPERTY_CLOCK;
+
+#if defined(_NTDDK_)
+typedef LONGLONG (FASTCALL *PFNKSCLOCK_GETTIME)(PFILE_OBJECT FileObject);
+typedef LONGLONG (FASTCALL *PFNKSCLOCK_CORRELATEDTIME)(PFILE_OBJECT FileObject,
+							PLONGLONG SystemTime);
+
+typedef struct {
+   PFNKSCLOCK_GETTIME GetTime;
+   PFNKSCLOCK_GETTIME GetPhysicalTime;
+   PFNKSCLOCK_CORRELATEDTIME GetCorrelatedTime;
+   PFNKSCLOCK_CORRELATEDTIME GetCorrelatedPhysicalTime;
+} KSCLOCK_FUNCTIONTABLE, *PKSCLOCK_FUNCTIONTABLE;
+
+typedef BOOLEAN (*PFNKSSETTIMER)(PVOID Context, PKTIMER Timer,
+				 LARGE_INTEGER DueTime, PKDPC Dpc);
+typedef BOOLEAN (*PFNKSCANCELTIMER) (PVOID Context, PKTIMER Timer);
+typedef LONGLONG (FASTCALL *PFNKSCORRELATEDTIME)(PVOID Context,
+						 PLONGLONG SystemTime);
+
+typedef PVOID			PKSDEFAULTCLOCK;
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_TIME(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_TIME,			\
+				(Handler),				\
+				sizeof(KSPROPERTY), sizeof(LONGLONG),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_PHYSICALTIME(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_PHYSICALTIME,		\
+				(Handler),				\
+				sizeof(KSPROPERTY), sizeof(LONGLONG),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDTIME(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_CORRELATEDTIME,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSCORRELATED_TIME),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDPHYSICALTIME(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME,\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSCORRELATED_TIME),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_RESOLUTION(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_RESOLUTION,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),sizeof(KSRESOLUTION),\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_STATE(Handler)			\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_STATE,			\
+				(Handler),				\
+				sizeof(KSPROPERTY), sizeof(KSSTATE),	\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_CLOCK_FUNCTIONTABLE(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_CLOCK_FUNCTIONTABLE,		\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSCLOCK_FUNCTIONTABLE),		\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_CLOCKSET(ClockSet,PropTime,PropPhysicalTime,PropCorrelatedTime,PropCorrelatedPhysicalTime,PropResolution,PropState,PropFunctionTable)\
+DEFINE_KSPROPERTY_TABLE(ClockSet) {					\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_TIME(PropTime),			\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_PHYSICALTIME(PropPhysicalTime),	\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDTIME(PropCorrelatedTime),\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDPHYSICALTIME(PropCorrelatedPhysicalTime),\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_RESOLUTION(PropResolution),	\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_STATE(PropState),			\
+	DEFINE_KSPROPERTY_ITEM_CLOCK_FUNCTIONTABLE(PropFunctionTable),	\
+}
+#endif /* _NTDDK_ */
+
+#define STATIC_KSEVENTSETID_Clock					\
+	0x364D8E20L,0x62C7,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("364D8E20-62C7-11CF-A5D6-28DB04C10000",KSEVENTSETID_Clock);
+#define KSEVENTSETID_Clock DEFINE_GUIDNAMED(KSEVENTSETID_Clock)
+
+typedef enum {
+  KSEVENT_CLOCK_INTERVAL_MARK,
+  KSEVENT_CLOCK_POSITION_MARK
+} KSEVENT_CLOCK_POSITION;
+
+#define STATIC_KSEVENTSETID_Connection					\
+	0x7f4bcbe0L,0x9ea5,0x11cf,0xa5,0xd6,0x28,0xdb,0x04,0xc1,0x00,0x00
+DEFINE_GUIDSTRUCT("7f4bcbe0-9ea5-11cf-a5d6-28db04c10000",KSEVENTSETID_Connection);
+#define KSEVENTSETID_Connection DEFINE_GUIDNAMED(KSEVENTSETID_Connection)
+
+typedef enum {
+  KSEVENT_CONNECTION_POSITIONUPDATE,
+  KSEVENT_CONNECTION_DATADISCONTINUITY,
+  KSEVENT_CONNECTION_TIMEDISCONTINUITY,
+  KSEVENT_CONNECTION_PRIORITY,
+  KSEVENT_CONNECTION_ENDOFSTREAM
+} KSEVENT_CONNECTION;
+
+typedef struct {
+  PVOID Context;
+  ULONG Proportion;
+  LONGLONG DeltaTime;
+} KSQUALITY,*PKSQUALITY;
+
+typedef struct {
+  PVOID Context;
+  ULONG Status;
+} KSERROR,*PKSERROR;
+
+typedef KSIDENTIFIER KSDEGRADE,*PKSDEGRADE;
+
+#define STATIC_KSDEGRADESETID_Standard					\
+	0x9F564180L,0x704C,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("9F564180-704C-11D0-A5D6-28DB04C10000",KSDEGRADESETID_Standard);
+#define KSDEGRADESETID_Standard DEFINE_GUIDNAMED(KSDEGRADESETID_Standard)
+
+typedef enum {
+  KSDEGRADE_STANDARD_SAMPLE,
+  KSDEGRADE_STANDARD_QUALITY,
+  KSDEGRADE_STANDARD_COMPUTATION,
+  KSDEGRADE_STANDARD_SKIP
+} KSDEGRADE_STANDARD;
+
+#if defined(_NTDDK_)
+
+#define KSPROBE_STREAMREAD		0x00000000
+#define KSPROBE_STREAMWRITE		0x00000001
+#define KSPROBE_ALLOCATEMDL		0x00000010
+#define KSPROBE_PROBEANDLOCK		0x00000020
+#define KSPROBE_SYSTEMADDRESS		0x00000040
+#define KSPROBE_MODIFY			0x00000200
+#define KSPROBE_STREAMWRITEMODIFY	(KSPROBE_MODIFY | KSPROBE_STREAMWRITE)
+#define KSPROBE_ALLOWFORMATCHANGE	0x00000080
+#define KSSTREAM_READ			KSPROBE_STREAMREAD
+#define KSSTREAM_WRITE			KSPROBE_STREAMWRITE
+#define KSSTREAM_PAGED_DATA		0x00000000
+#define KSSTREAM_NONPAGED_DATA		0x00000100
+#define KSSTREAM_SYNCHRONOUS		0x00001000
+#define KSSTREAM_FAILUREEXCEPTION	0x00002000
+
+typedef NTSTATUS (*PFNKSCONTEXT_DISPATCH)(PVOID Context, PIRP Irp);
+typedef NTSTATUS (*PFNKSHANDLER)(PIRP Irp, PKSIDENTIFIER Request, PVOID Data);
+typedef BOOLEAN (*PFNKSFASTHANDLER)(PFILE_OBJECT FileObject,
+				    PKSIDENTIFIER Request,
+				    ULONG RequestLength, PVOID Data,
+				    ULONG DataLength,
+				    PIO_STATUS_BLOCK IoStatus);
+typedef NTSTATUS (*PFNKSALLOCATOR) (PIRP Irp, ULONG BufferSize,
+				    BOOLEAN InputOperation);
+
+typedef struct {
+  KSPROPERTY_MEMBERSHEADER MembersHeader;
+  const VOID *Members;
+} KSPROPERTY_MEMBERSLIST, *PKSPROPERTY_MEMBERSLIST;
+
+typedef struct {
+  KSIDENTIFIER PropTypeSet;
+  ULONG MembersListCount;
+  const KSPROPERTY_MEMBERSLIST *MembersList;
+} KSPROPERTY_VALUES, *PKSPROPERTY_VALUES;
+
+#define DEFINE_KSPROPERTY_TABLE(tablename)				\
+	const KSPROPERTY_ITEM tablename[] =
+
+#define DEFINE_KSPROPERTY_ITEM(PropertyId,GetHandler,MinProperty,MinData,SetHandler,Values,RelationsCount,Relations,SupportHandler,SerializedSize)\
+{									\
+			PropertyId, (PFNKSHANDLER)GetHandler,		\
+			MinProperty, MinData,				\
+			(PFNKSHANDLER)SetHandler,			\
+			(PKSPROPERTY_VALUES)Values, RelationsCount,	\
+			(PKSPROPERTY)Relations,				\
+			(PFNKSHANDLER)SupportHandler,			\
+			(ULONG)SerializedSize				\
+}
+
+typedef struct {
+  ULONG PropertyId;
+  __MINGW_EXTENSION union {
+    PFNKSHANDLER GetPropertyHandler;
+    BOOLEAN GetSupported;
+  };
+  ULONG MinProperty;
+  ULONG MinData;
+  __MINGW_EXTENSION union {
+    PFNKSHANDLER SetPropertyHandler;
+    BOOLEAN SetSupported;
+  };
+  const KSPROPERTY_VALUES *Values;
+  ULONG RelationsCount;
+  const KSPROPERTY *Relations;
+  PFNKSHANDLER SupportHandler;
+  ULONG SerializedSize;
+} KSPROPERTY_ITEM, *PKSPROPERTY_ITEM;
+
+#define DEFINE_KSFASTPROPERTY_ITEM(PropertyId, GetHandler, SetHandler)	\
+{									\
+			PropertyId, (PFNKSFASTHANDLER)GetHandler,	\
+			(PFNKSFASTHANDLER)SetHandler, 0			\
+}
+
+typedef struct {
+  ULONG PropertyId;
+  __MINGW_EXTENSION union {
+    PFNKSFASTHANDLER GetPropertyHandler;
+    BOOLEAN GetSupported;
+  };
+  __MINGW_EXTENSION union {
+    PFNKSFASTHANDLER SetPropertyHandler;
+    BOOLEAN SetSupported;
+  };
+  ULONG Reserved;
+} KSFASTPROPERTY_ITEM, *PKSFASTPROPERTY_ITEM;
+
+#define DEFINE_KSPROPERTY_SET(Set,PropertiesCount,PropertyItem,FastIoCount,FastIoTable)\
+{									\
+			Set,						\
+			PropertiesCount, PropertyItem,			\
+			FastIoCount, FastIoTable			\
+}
+
+#define DEFINE_KSPROPERTY_SET_TABLE(tablename)				\
+	const KSPROPERTY_SET tablename[] =
+
+typedef struct {
+  const GUID *Set;
+  ULONG PropertiesCount;
+  const KSPROPERTY_ITEM *PropertyItem;
+  ULONG FastIoCount;
+  const KSFASTPROPERTY_ITEM *FastIoTable;
+} KSPROPERTY_SET, *PKSPROPERTY_SET;
+
+#define DEFINE_KSMETHOD_TABLE(tablename)				\
+	const KSMETHOD_ITEM tablename[] =
+
+#define DEFINE_KSMETHOD_ITEM(MethodId,Flags,MethodHandler,MinMethod,MinData,SupportHandler)\
+{									\
+			MethodId, (PFNKSHANDLER)MethodHandler,		\
+			MinMethod, MinData,				\
+			SupportHandler, Flags				\
+}
+
+typedef struct {
+  ULONG MethodId;
+  __MINGW_EXTENSION union {
+    PFNKSHANDLER MethodHandler;
+    BOOLEAN MethodSupported;
+  };
+  ULONG MinMethod;
+  ULONG MinData;
+  PFNKSHANDLER SupportHandler;
+  ULONG Flags;
+} KSMETHOD_ITEM, *PKSMETHOD_ITEM;
+
+#define DEFINE_KSFASTMETHOD_ITEM(MethodId,MethodHandler)		\
+{									\
+			MethodId, (PFNKSFASTHANDLER)MethodHandler	\
+}
+
+typedef struct {
+  ULONG MethodId;
+  __MINGW_EXTENSION union {
+    PFNKSFASTHANDLER MethodHandler;
+    BOOLEAN MethodSupported;
+  };
+} KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM;
+
+#define DEFINE_KSMETHOD_SET(Set,MethodsCount,MethodItem,FastIoCount,FastIoTable)\
+{									\
+			Set,						\
+			MethodsCount, MethodItem,			\
+			FastIoCount, FastIoTable			\
+}
+
+#define DEFINE_KSMETHOD_SET_TABLE(tablename)				\
+	const KSMETHOD_SET tablename[] =
+
+typedef struct {
+  const GUID *Set;
+  ULONG MethodsCount;
+  const KSMETHOD_ITEM *MethodItem;
+  ULONG FastIoCount;
+  const KSFASTMETHOD_ITEM *FastIoTable;
+} KSMETHOD_SET, *PKSMETHOD_SET;
+
+typedef struct _KSEVENT_ENTRY	KSEVENT_ENTRY, *PKSEVENT_ENTRY;
+typedef NTSTATUS (*PFNKSADDEVENT)(PIRP Irp, PKSEVENTDATA EventData,
+				  struct _KSEVENT_ENTRY* EventEntry);
+typedef VOID (*PFNKSREMOVEEVENT)(PFILE_OBJECT FileObject,
+				 struct _KSEVENT_ENTRY* EventEntry);
+
+#define DEFINE_KSEVENT_TABLE(tablename)					\
+	const KSEVENT_ITEM tablename[] =
+
+#define DEFINE_KSEVENT_ITEM(EventId,DataInput,ExtraEntryData,AddHandler,RemoveHandler,SupportHandler)\
+{									\
+			EventId, DataInput, ExtraEntryData,		\
+			AddHandler, RemoveHandler, SupportHandler	\
+}
+
+typedef struct {
+  ULONG EventId;
+  ULONG DataInput;
+  ULONG ExtraEntryData;
+  PFNKSADDEVENT AddHandler;
+  PFNKSREMOVEEVENT RemoveHandler;
+  PFNKSHANDLER SupportHandler;
+} KSEVENT_ITEM, *PKSEVENT_ITEM;
+
+#define DEFINE_KSEVENT_SET(Set,EventsCount,EventItem)			\
+{									\
+			Set, EventsCount, EventItem			\
+}
+
+#define DEFINE_KSEVENT_SET_TABLE(tablename)				\
+	const KSEVENT_SET tablename[] =
+
+typedef struct {
+  const GUID *Set;
+  ULONG EventsCount;
+  const KSEVENT_ITEM *EventItem;
+} KSEVENT_SET, *PKSEVENT_SET;
+
+typedef struct {
+  KDPC Dpc;
+  ULONG ReferenceCount;
+  KSPIN_LOCK AccessLock;
+} KSDPC_ITEM, *PKSDPC_ITEM;
+
+typedef struct {
+  KSDPC_ITEM DpcItem;
+  LIST_ENTRY BufferList;
+} KSBUFFER_ITEM, *PKSBUFFER_ITEM;
+
+
+#define KSEVENT_ENTRY_DELETED		1
+#define KSEVENT_ENTRY_ONESHOT		2
+#define KSEVENT_ENTRY_BUFFERED		4
+
+struct _KSEVENT_ENTRY {
+  LIST_ENTRY ListEntry;
+  PVOID Object;
+  __MINGW_EXTENSION union {
+    PKSDPC_ITEM DpcItem;
+    PKSBUFFER_ITEM BufferItem;
+  };
+  PKSEVENTDATA EventData;
+  ULONG NotificationType;
+  const KSEVENT_SET *EventSet;
+  const KSEVENT_ITEM *EventItem;
+  PFILE_OBJECT FileObject;
+  ULONG SemaphoreAdjustment;
+  ULONG Reserved;
+  ULONG Flags;
+};
+
+typedef enum {
+  KSEVENTS_NONE,
+  KSEVENTS_SPINLOCK,
+  KSEVENTS_MUTEX,
+  KSEVENTS_FMUTEX,
+  KSEVENTS_FMUTEXUNSAFE,
+  KSEVENTS_INTERRUPT,
+  KSEVENTS_ERESOURCE
+} KSEVENTS_LOCKTYPE;
+
+#define KSDISPATCH_FASTIO			0x80000000
+
+typedef struct {
+  PDRIVER_DISPATCH Create;
+  PVOID Context;
+  UNICODE_STRING ObjectClass;
+  PSECURITY_DESCRIPTOR SecurityDescriptor;
+  ULONG Flags;
+} KSOBJECT_CREATE_ITEM, *PKSOBJECT_CREATE_ITEM;
+
+typedef VOID (*PFNKSITEMFREECALLBACK)(PKSOBJECT_CREATE_ITEM CreateItem);
+
+#define KSCREATE_ITEM_SECURITYCHANGED		0x00000001
+#define KSCREATE_ITEM_WILDCARD			0x00000002
+#define KSCREATE_ITEM_NOPARAMETERS		0x00000004
+#define KSCREATE_ITEM_FREEONSTOP		0x00000008
+
+#define DEFINE_KSCREATE_DISPATCH_TABLE( tablename )			\
+	KSOBJECT_CREATE_ITEM tablename[] =
+
+#define DEFINE_KSCREATE_ITEM(DispatchCreate,TypeName,Context)		\
+{									\
+			(DispatchCreate), (PVOID)(Context),		\
+			{						\
+				sizeof(TypeName) - sizeof(UNICODE_NULL),\
+				sizeof(TypeName),			\
+				(PWCHAR)(TypeName)			\
+			},						\
+			NULL, 0						\
+}
+
+#define DEFINE_KSCREATE_ITEMEX(DispatchCreate,TypeName,Context,Flags)	\
+{									\
+			(DispatchCreate),				\
+			(PVOID)(Context),				\
+			{						\
+				sizeof(TypeName) - sizeof(UNICODE_NULL),\
+				sizeof(TypeName),			\
+				(PWCHAR)(TypeName)			\
+			},						\
+			NULL, (Flags)					\
+}
+
+#define DEFINE_KSCREATE_ITEMNULL(DispatchCreate,Context)		\
+{									\
+			DispatchCreate, Context,			\
+			{						\
+				0, 0, NULL,				\
+			},						\
+			NULL, 0						\
+}
+
+typedef struct {
+  ULONG CreateItemsCount;
+  PKSOBJECT_CREATE_ITEM CreateItemsList;
+} KSOBJECT_CREATE, *PKSOBJECT_CREATE;
+
+typedef struct {
+  PDRIVER_DISPATCH DeviceIoControl;
+  PDRIVER_DISPATCH Read;
+  PDRIVER_DISPATCH Write;
+  PDRIVER_DISPATCH Flush;
+  PDRIVER_DISPATCH Close;
+  PDRIVER_DISPATCH QuerySecurity;
+  PDRIVER_DISPATCH SetSecurity;
+  PFAST_IO_DEVICE_CONTROL FastDeviceIoControl;
+  PFAST_IO_READ FastRead;
+  PFAST_IO_WRITE FastWrite;
+} KSDISPATCH_TABLE, *PKSDISPATCH_TABLE;
+
+#define DEFINE_KSDISPATCH_TABLE(tablename,DeviceIoControl,Read,Write,Flush,Close,QuerySecurity,SetSecurity,FastDeviceIoControl,FastRead,FastWrite)\
+	const KSDISPATCH_TABLE tablename =				\
+	{								\
+		DeviceIoControl,					\
+		Read,							\
+		Write,							\
+		Flush,							\
+		Close,							\
+		QuerySecurity,						\
+		SetSecurity,						\
+		FastDeviceIoControl,					\
+		FastRead,						\
+		FastWrite,						\
+	}
+
+#define KSCREATE_ITEM_IRP_STORAGE(Irp)					\
+	(*(PKSOBJECT_CREATE_ITEM *)&(Irp)->Tail.Overlay.DriverContext[0])
+#define KSEVENT_SET_IRP_STORAGE(Irp)					\
+	(*(const KSEVENT_SET **)&(Irp)->Tail.Overlay.DriverContext[0])
+#define KSEVENT_ITEM_IRP_STORAGE(Irp)					\
+	(*(const KSEVENT_ITEM **)&(Irp)->Tail.Overlay.DriverContext[3])
+#define KSEVENT_ENTRY_IRP_STORAGE(Irp)					\
+	(*(PKSEVENT_ENTRY *)&(Irp)->Tail.Overlay.DriverContext[0])
+#define KSMETHOD_SET_IRP_STORAGE(Irp)					\
+	(*(const KSMETHOD_SET **)&(Irp)->Tail.Overlay.DriverContext[0])
+#define KSMETHOD_ITEM_IRP_STORAGE(Irp)					\
+	(*(const KSMETHOD_ITEM **)&(Irp)->Tail.Overlay.DriverContext[3])
+#define KSMETHOD_TYPE_IRP_STORAGE(Irp)					\
+	(*(ULONG_PTR *)(&(Irp)->Tail.Overlay.DriverContext[2]))
+#define KSQUEUE_SPINLOCK_IRP_STORAGE(Irp)				\
+	(*(PKSPIN_LOCK *)&(Irp)->Tail.Overlay.DriverContext[1])
+#define KSPROPERTY_SET_IRP_STORAGE(Irp)					\
+	(*(const KSPROPERTY_SET **)&(Irp)->Tail.Overlay.DriverContext[0])
+#define KSPROPERTY_ITEM_IRP_STORAGE(Irp)				\
+	(*(const KSPROPERTY_ITEM **)&(Irp)->Tail.Overlay.DriverContext[3])
+#define KSPROPERTY_ATTRIBUTES_IRP_STORAGE(Irp)				\
+	(*(PKSATTRIBUTE_LIST *)&(Irp)->Tail.Overlay.DriverContext[2])
+
+typedef PVOID		KSDEVICE_HEADER, KSOBJECT_HEADER;
+
+typedef enum {
+  KsInvokeOnSuccess = 1,
+  KsInvokeOnError = 2,
+  KsInvokeOnCancel = 4
+} KSCOMPLETION_INVOCATION;
+
+typedef enum {
+  KsListEntryTail,
+  KsListEntryHead
+} KSLIST_ENTRY_LOCATION;
+
+typedef enum {
+  KsAcquireOnly,
+  KsAcquireAndRemove,
+  KsAcquireOnlySingleItem,
+  KsAcquireAndRemoveOnlySingleItem
+} KSIRP_REMOVAL_OPERATION;
+
+typedef enum {
+  KsStackCopyToNewLocation,
+  KsStackReuseCurrentLocation,
+  KsStackUseNewLocation
+} KSSTACK_USE;
+
+typedef enum {
+  KSTARGET_STATE_DISABLED,
+  KSTARGET_STATE_ENABLED
+} KSTARGET_STATE;
+
+typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)(PIRP Irp, PVOID Context);
+typedef VOID (*PFNREFERENCEDEVICEOBJECT)(PVOID Context);
+typedef VOID (*PFNDEREFERENCEDEVICEOBJECT)(PVOID Context);
+typedef NTSTATUS (*PFNQUERYREFERENCESTRING)(PVOID Context, PWCHAR *String);
+
+#define BUS_INTERFACE_REFERENCE_VERSION			0x100
+
+typedef struct {
+  INTERFACE Interface;
+
+  PFNREFERENCEDEVICEOBJECT ReferenceDeviceObject;
+  PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject;
+  PFNQUERYREFERENCESTRING QueryReferenceString;
+} BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE;
+
+#define STATIC_REFERENCE_BUS_INTERFACE		STATIC_KSMEDIUMSETID_Standard
+#define REFERENCE_BUS_INTERFACE			KSMEDIUMSETID_Standard
+
+#endif /* _NTDDK_ */
+
+#ifndef PACK_PRAGMAS_NOT_SUPPORTED
+#include <pshpack1.h>
+#endif
+
+typedef struct {
+  GUID PropertySet;
+  ULONG Count;
+} KSPROPERTY_SERIALHDR,*PKSPROPERTY_SERIALHDR;
+
+#ifndef PACK_PRAGMAS_NOT_SUPPORTED
+#include <poppack.h>
+#endif
+
+typedef struct {
+  KSIDENTIFIER PropTypeSet;
+  ULONG Id;
+  ULONG PropertyLength;
+} KSPROPERTY_SERIAL,*PKSPROPERTY_SERIAL;
+
+
+#if defined(_NTDDK_)
+
+#define IOCTL_KS_HANDSHAKE						\
+	CTL_CODE(FILE_DEVICE_KS, 0x007, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+typedef struct {
+  GUID ProtocolId;
+  PVOID Argument1;
+  PVOID Argument2;
+} KSHANDSHAKE, *PKSHANDSHAKE;
+
+typedef struct _KSGATE		KSGATE, *PKSGATE;
+
+struct _KSGATE {
+  LONG Count;
+  PKSGATE NextGate;
+};
+
+typedef PVOID KSOBJECT_BAG;
+
+
+typedef BOOLEAN (*PFNKSGENERATEEVENTCALLBACK)(PVOID Context,
+					      PKSEVENT_ENTRY EventEntry);
+
+typedef NTSTATUS (*PFNKSDEVICECREATE)(PKSDEVICE Device);
+
+typedef NTSTATUS (*PFNKSDEVICEPNPSTART)(PKSDEVICE Device,PIRP Irp,
+				PCM_RESOURCE_LIST TranslatedResourceList,
+				PCM_RESOURCE_LIST UntranslatedResourceList);
+
+typedef NTSTATUS (*PFNKSDEVICE)(PKSDEVICE Device);
+
+typedef NTSTATUS (*PFNKSDEVICEIRP)(PKSDEVICE Device,PIRP Irp);
+
+typedef void (*PFNKSDEVICEIRPVOID)(PKSDEVICE Device,PIRP Irp);
+
+typedef NTSTATUS (*PFNKSDEVICEQUERYCAPABILITIES)(PKSDEVICE Device,PIRP Irp,
+					 PDEVICE_CAPABILITIES Capabilities);
+
+typedef NTSTATUS (*PFNKSDEVICEQUERYPOWER)(PKSDEVICE Device,PIRP Irp,
+					  DEVICE_POWER_STATE DeviceTo,
+					  DEVICE_POWER_STATE DeviceFrom,
+					  SYSTEM_POWER_STATE SystemTo,
+					  SYSTEM_POWER_STATE SystemFrom,
+					  POWER_ACTION Action);
+
+typedef void (*PFNKSDEVICESETPOWER)(PKSDEVICE Device,PIRP Irp,
+				    DEVICE_POWER_STATE To,
+				    DEVICE_POWER_STATE From);
+
+typedef NTSTATUS (*PFNKSFILTERFACTORYVOID)(PKSFILTERFACTORY FilterFactory);
+
+typedef void (*PFNKSFILTERFACTORYPOWER)(PKSFILTERFACTORY FilterFactory,
+					DEVICE_POWER_STATE State);
+
+typedef NTSTATUS (*PFNKSFILTERIRP)(PKSFILTER Filter,PIRP Irp);
+
+typedef NTSTATUS (*PFNKSFILTERPROCESS)(PKSFILTER Filter,
+					PKSPROCESSPIN_INDEXENTRY Index);
+
+typedef NTSTATUS (*PFNKSFILTERVOID)(PKSFILTER Filter);
+
+typedef void (*PFNKSFILTERPOWER)(PKSFILTER Filter,DEVICE_POWER_STATE State);
+
+typedef NTSTATUS (*PFNKSPINIRP)(PKSPIN Pin,PIRP Irp);
+
+typedef NTSTATUS (*PFNKSPINSETDEVICESTATE)(PKSPIN Pin,KSSTATE ToState,
+					   KSSTATE FromState);
+
+typedef NTSTATUS (*PFNKSPINSETDATAFORMAT)(PKSPIN Pin,PKSDATAFORMAT OldFormat,
+					  PKSMULTIPLE_ITEM OldAttributeList,
+					  const KSDATARANGE *DataRange,
+					  const KSATTRIBUTE_LIST *AttributeRange);
+
+typedef NTSTATUS (*PFNKSPINHANDSHAKE)(PKSPIN Pin,PKSHANDSHAKE In,
+				      PKSHANDSHAKE Out);
+
+typedef NTSTATUS (*PFNKSPIN)(PKSPIN Pin);
+
+typedef void (*PFNKSPINVOID)(PKSPIN Pin);
+
+typedef void (*PFNKSPINPOWER)(PKSPIN Pin,DEVICE_POWER_STATE State);
+
+typedef BOOLEAN (*PFNKSPINSETTIMER)(PKSPIN Pin,PKTIMER Timer,
+				    LARGE_INTEGER DueTime,PKDPC Dpc);
+
+typedef BOOLEAN (*PFNKSPINCANCELTIMER)(PKSPIN Pin,PKTIMER Timer);
+
+typedef LONGLONG (FASTCALL *PFNKSPINCORRELATEDTIME)(PKSPIN Pin,
+						    PLONGLONG SystemTime);
+
+typedef void (*PFNKSPINRESOLUTION)(PKSPIN Pin,PKSRESOLUTION Resolution);
+
+typedef NTSTATUS (*PFNKSPININITIALIZEALLOCATOR)(PKSPIN Pin,
+					PKSALLOCATOR_FRAMING AllocatorFraming,
+					PVOID *Context);
+
+typedef void (*PFNKSSTREAMPOINTER)(PKSSTREAM_POINTER StreamPointer);
+
+
+typedef struct KSAUTOMATION_TABLE_ KSAUTOMATION_TABLE,*PKSAUTOMATION_TABLE;
+
+struct KSAUTOMATION_TABLE_ {
+  ULONG PropertySetsCount;
+  ULONG PropertyItemSize;
+  const KSPROPERTY_SET *PropertySets;
+  ULONG MethodSetsCount;
+  ULONG MethodItemSize;
+  const KSMETHOD_SET *MethodSets;
+  ULONG EventSetsCount;
+  ULONG EventItemSize;
+  const KSEVENT_SET *EventSets;
+#ifndef _WIN64
+  PVOID Alignment;
+#endif
+};
+
+#define DEFINE_KSAUTOMATION_TABLE(table)				\
+		const KSAUTOMATION_TABLE table =
+
+#define DEFINE_KSAUTOMATION_PROPERTIES(table)				\
+		SIZEOF_ARRAY(table),					\
+		sizeof(KSPROPERTY_ITEM),				\
+		table
+
+#define DEFINE_KSAUTOMATION_METHODS(table)				\
+		SIZEOF_ARRAY(table),					\
+		sizeof(KSMETHOD_ITEM),					\
+		table
+
+#define DEFINE_KSAUTOMATION_EVENTS(table)				\
+		SIZEOF_ARRAY(table),					\
+		sizeof(KSEVENT_ITEM),					\
+		table
+
+#define DEFINE_KSAUTOMATION_PROPERTIES_NULL				\
+		0,							\
+		sizeof(KSPROPERTY_ITEM),				\
+		NULL
+
+#define DEFINE_KSAUTOMATION_METHODS_NULL				\
+		0,							\
+		sizeof(KSMETHOD_ITEM),					\
+		NULL
+
+#define DEFINE_KSAUTOMATION_EVENTS_NULL					\
+		0,							\
+		sizeof(KSEVENT_ITEM),					\
+		NULL
+
+#define MIN_DEV_VER_FOR_QI		(0x100)
+
+struct _KSDEVICE_DISPATCH {
+  PFNKSDEVICECREATE Add;
+  PFNKSDEVICEPNPSTART Start;
+  PFNKSDEVICE PostStart;
+  PFNKSDEVICEIRP QueryStop;
+  PFNKSDEVICEIRPVOID CancelStop;
+  PFNKSDEVICEIRPVOID Stop;
+  PFNKSDEVICEIRP QueryRemove;
+  PFNKSDEVICEIRPVOID CancelRemove;
+  PFNKSDEVICEIRPVOID Remove;
+  PFNKSDEVICEQUERYCAPABILITIES QueryCapabilities;
+  PFNKSDEVICEIRPVOID SurpriseRemoval;
+  PFNKSDEVICEQUERYPOWER QueryPower;
+  PFNKSDEVICESETPOWER SetPower;
+  PFNKSDEVICEIRP QueryInterface;
+};
+
+struct _KSFILTER_DISPATCH {
+  PFNKSFILTERIRP Create;
+  PFNKSFILTERIRP Close;
+  PFNKSFILTERPROCESS Process;
+  PFNKSFILTERVOID Reset;
+};
+
+struct _KSPIN_DISPATCH {
+  PFNKSPINIRP Create;
+  PFNKSPINIRP Close;
+  PFNKSPIN Process;
+  PFNKSPINVOID Reset;
+  PFNKSPINSETDATAFORMAT SetDataFormat;
+  PFNKSPINSETDEVICESTATE SetDeviceState;
+  PFNKSPIN Connect;
+  PFNKSPINVOID Disconnect;
+  const KSCLOCK_DISPATCH *Clock;
+  const KSALLOCATOR_DISPATCH *Allocator;
+};
+
+struct _KSCLOCK_DISPATCH {
+  PFNKSPINSETTIMER SetTimer;
+  PFNKSPINCANCELTIMER CancelTimer;
+  PFNKSPINCORRELATEDTIME CorrelatedTime;
+  PFNKSPINRESOLUTION Resolution;
+};
+
+struct _KSALLOCATOR_DISPATCH {
+  PFNKSPININITIALIZEALLOCATOR InitializeAllocator;
+  PFNKSDELETEALLOCATOR DeleteAllocator;
+  PFNKSDEFAULTALLOCATE Allocate;
+  PFNKSDEFAULTFREE Free;
+};
+
+#define KSDEVICE_DESCRIPTOR_VERSION	(0x100)
+
+struct _KSDEVICE_DESCRIPTOR {
+  const KSDEVICE_DISPATCH *Dispatch;
+  ULONG FilterDescriptorsCount;
+  const KSFILTER_DESCRIPTOR*const *FilterDescriptors;
+  ULONG Version;
+};
+
+struct _KSFILTER_DESCRIPTOR {
+  const KSFILTER_DISPATCH *Dispatch;
+  const KSAUTOMATION_TABLE *AutomationTable;
+  ULONG Version;
+#define KSFILTER_DESCRIPTOR_VERSION	((ULONG)-1)
+  ULONG Flags;
+#define KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING		0x00000001
+#define KSFILTER_FLAG_CRITICAL_PROCESSING		0x00000002
+#define KSFILTER_FLAG_HYPERCRITICAL_PROCESSING		0x00000004
+#define KSFILTER_FLAG_RECEIVE_ZERO_LENGTH_SAMPLES	0x00000008
+#define KSFILTER_FLAG_DENY_USERMODE_ACCESS		0x80000000
+  const GUID *ReferenceGuid;
+  ULONG PinDescriptorsCount;
+  ULONG PinDescriptorSize;
+  const KSPIN_DESCRIPTOR_EX *PinDescriptors;
+  ULONG CategoriesCount;
+  const GUID *Categories;
+  ULONG NodeDescriptorsCount;
+  ULONG NodeDescriptorSize;
+  const KSNODE_DESCRIPTOR *NodeDescriptors;
+  ULONG ConnectionsCount;
+  const KSTOPOLOGY_CONNECTION *Connections;
+  const KSCOMPONENTID *ComponentId;
+};
+
+#define DEFINE_KSFILTER_DESCRIPTOR(descriptor)				\
+	const KSFILTER_DESCRIPTOR descriptor =
+
+#define DEFINE_KSFILTER_PIN_DESCRIPTORS(table)				\
+	SIZEOF_ARRAY(table),						\
+	sizeof(table[0]),						\
+	table
+
+#define DEFINE_KSFILTER_CATEGORIES(table)				\
+	SIZEOF_ARRAY(table),						\
+	table
+
+#define DEFINE_KSFILTER_CATEGORY(category)				\
+	1,								\
+	&(category)
+
+#define DEFINE_KSFILTER_CATEGORIES_NULL					\
+	0,								\
+	NULL
+
+#define DEFINE_KSFILTER_NODE_DESCRIPTORS(table)				\
+	SIZEOF_ARRAY(table),						\
+	sizeof(table[0]),						\
+	table
+
+#define DEFINE_KSFILTER_NODE_DESCRIPTORS_NULL				\
+	0,								\
+	sizeof(KSNODE_DESCRIPTOR),					\
+	NULL
+
+#define DEFINE_KSFILTER_CONNECTIONS(table)				\
+	SIZEOF_ARRAY(table),						\
+	table
+
+#define DEFINE_KSFILTER_DEFAULT_CONNECTIONS				\
+	0,								\
+	NULL
+
+#define DEFINE_KSFILTER_DESCRIPTOR_TABLE(table)				\
+	const KSFILTER_DESCRIPTOR*const table[] =
+
+struct _KSPIN_DESCRIPTOR_EX {
+  const KSPIN_DISPATCH *Dispatch;
+  const KSAUTOMATION_TABLE *AutomationTable;
+  KSPIN_DESCRIPTOR PinDescriptor;
+  ULONG Flags;
+#define KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING	KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING
+#define KSPIN_FLAG_CRITICAL_PROCESSING		KSFILTER_FLAG_CRITICAL_PROCESSING
+#define KSPIN_FLAG_HYPERCRITICAL_PROCESSING	KSFILTER_FLAG_HYPERCRITICAL_PROCESSING
+#define KSPIN_FLAG_ASYNCHRONOUS_PROCESSING			0x00000008
+#define KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING			0x00000010
+#define KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL		0x00000020
+#define KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING		0x00000040
+#define KSPIN_FLAG_ENFORCE_FIFO					0x00000080
+#define KSPIN_FLAG_GENERATE_MAPPINGS				0x00000100
+#define KSPIN_FLAG_DISTINCT_TRAILING_EDGE			0x00000200
+#define KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY			0x00010000
+#define KSPIN_FLAG_SPLITTER					0x00020000
+#define KSPIN_FLAG_USE_STANDARD_TRANSPORT			0x00040000
+#define KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT		0x00080000
+#define KSPIN_FLAG_FIXED_FORMAT					0x00100000
+#define KSPIN_FLAG_GENERATE_EOS_EVENTS				0x00200000
+#define KSPIN_FLAG_RENDERER			(KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY|KSPIN_FLAG_GENERATE_EOS_EVENTS)
+#define KSPIN_FLAG_IMPLEMENT_CLOCK				0x00400000
+#define KSPIN_FLAG_SOME_FRAMES_REQUIRED_FOR_PROCESSING		0x00800000
+#define KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE			0x01000000
+#define KSPIN_FLAG_DENY_USERMODE_ACCESS				0x80000000
+  ULONG InstancesPossible;
+  ULONG InstancesNecessary;
+  const KSALLOCATOR_FRAMING_EX *AllocatorFraming;
+  PFNKSINTERSECTHANDLEREX IntersectHandler;
+};
+
+#define DEFINE_KSPIN_DEFAULT_INTERFACES					\
+	0,								\
+	NULL
+
+#define DEFINE_KSPIN_DEFAULT_MEDIUMS					\
+	0,								\
+	NULL
+
+struct _KSNODE_DESCRIPTOR {
+  const KSAUTOMATION_TABLE *AutomationTable;
+  const GUID *Type;
+  const GUID *Name;
+#ifndef _WIN64
+  PVOID Alignment;
+#endif
+};
+
+#ifndef _WIN64
+#define DEFINE_NODE_DESCRIPTOR(automation,type,name)			\
+	{ (automation), (type), (name), NULL }
+#else
+#define DEFINE_NODE_DESCRIPTOR(automation,type,name)			\
+	{ (automation), (type), (name) }
+#endif
+
+struct _KSDEVICE {
+  const KSDEVICE_DESCRIPTOR *Descriptor;
+  KSOBJECT_BAG Bag;
+  PVOID Context;
+  PDEVICE_OBJECT FunctionalDeviceObject;
+  PDEVICE_OBJECT PhysicalDeviceObject;
+  PDEVICE_OBJECT NextDeviceObject;
+  BOOLEAN Started;
+  SYSTEM_POWER_STATE SystemPowerState;
+  DEVICE_POWER_STATE DevicePowerState;
+};
+
+struct _KSFILTERFACTORY {
+  const KSFILTER_DESCRIPTOR *FilterDescriptor;
+  KSOBJECT_BAG Bag;
+  PVOID Context;
+};
+
+struct _KSFILTER {
+  const KSFILTER_DESCRIPTOR *Descriptor;
+  KSOBJECT_BAG Bag;
+  PVOID Context;
+};
+
+struct _KSPIN {
+  const KSPIN_DESCRIPTOR_EX *Descriptor;
+  KSOBJECT_BAG Bag;
+  PVOID Context;
+  ULONG Id;
+  KSPIN_COMMUNICATION Communication;
+  BOOLEAN ConnectionIsExternal;
+  KSPIN_INTERFACE ConnectionInterface;
+  KSPIN_MEDIUM ConnectionMedium;
+  KSPRIORITY ConnectionPriority;
+  PKSDATAFORMAT ConnectionFormat;
+  PKSMULTIPLE_ITEM AttributeList;
+  ULONG StreamHeaderSize;
+  KSPIN_DATAFLOW DataFlow;
+  KSSTATE DeviceState;
+  KSRESET ResetState;
+  KSSTATE ClientState;
+};
+
+struct _KSMAPPING {
+  PHYSICAL_ADDRESS PhysicalAddress;
+  ULONG ByteCount;
+  ULONG Alignment;
+};
+
+struct _KSSTREAM_POINTER_OFFSET
+{
+#if defined(_NTDDK_)
+  __MINGW_EXTENSION union {
+    PUCHAR Data;
+    PKSMAPPING Mappings;
+  };
+#else
+  PUCHAR Data;
+#endif /* _NTDDK_ */
+#ifndef _WIN64
+  PVOID Alignment;
+#endif
+  ULONG Count;
+  ULONG Remaining;
+};
+
+struct _KSSTREAM_POINTER
+{
+  PVOID Context;
+  PKSPIN Pin;
+  PKSSTREAM_HEADER StreamHeader;
+  PKSSTREAM_POINTER_OFFSET Offset;
+  KSSTREAM_POINTER_OFFSET OffsetIn;
+  KSSTREAM_POINTER_OFFSET OffsetOut;
+};
+
+struct _KSPROCESSPIN {
+  PKSPIN Pin;
+  PKSSTREAM_POINTER StreamPointer;
+  PKSPROCESSPIN InPlaceCounterpart;
+  PKSPROCESSPIN DelegateBranch;
+  PKSPROCESSPIN CopySource;
+  PVOID Data;
+  ULONG BytesAvailable;
+  ULONG BytesUsed;
+  ULONG Flags;
+  BOOLEAN Terminate;
+};
+
+struct _KSPROCESSPIN_INDEXENTRY {
+  PKSPROCESSPIN *Pins;
+  ULONG Count;
+};
+
+typedef enum {
+  KsObjectTypeDevice,
+  KsObjectTypeFilterFactory,
+  KsObjectTypeFilter,
+  KsObjectTypePin
+} KSOBJECTTYPE;
+
+
+typedef void (*PFNKSFREE)(PVOID Data);
+
+typedef void (*PFNKSPINFRAMERETURN)(PKSPIN Pin,PVOID Data,ULONG Size,PMDL Mdl,
+				    PVOID Context,NTSTATUS Status);
+
+typedef void (*PFNKSPINIRPCOMPLETION)(PKSPIN Pin,PIRP Irp);
+
+
+#if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__)
+#ifndef _IKsControl_
+#define _IKsControl_
+
+typedef struct IKsControl *PIKSCONTROL;
+
+#ifndef DEFINE_ABSTRACT_UNKNOWN
+#define DEFINE_ABSTRACT_UNKNOWN()					\
+	STDMETHOD_(NTSTATUS,QueryInterface) (THIS_ 			\
+						REFIID InterfaceId,	\
+						PVOID *Interface	\
+					    ) PURE;			\
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;				\
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+#endif
+
+#undef INTERFACE
+#define INTERFACE IKsControl
+DECLARE_INTERFACE_(IKsControl,IUnknown)
+{
+  DEFINE_ABSTRACT_UNKNOWN()
+  STDMETHOD_(NTSTATUS,KsProperty)(THIS_
+					PKSPROPERTY Property,
+					ULONG PropertyLength,
+					PVOID PropertyData,
+					ULONG DataLength,
+					ULONG *BytesReturned
+				 ) PURE;
+  STDMETHOD_(NTSTATUS,KsMethod)	(THIS_
+					PKSMETHOD Method,
+					ULONG MethodLength,
+					PVOID MethodData,
+					ULONG DataLength,
+					ULONG *BytesReturned
+				 ) PURE;
+  STDMETHOD_(NTSTATUS,KsEvent)	(THIS_
+					PKSEVENT Event,
+					ULONG EventLength,
+					PVOID EventData,
+					ULONG DataLength,
+					ULONG *BytesReturned
+				) PURE;
+};
+typedef struct IKsReferenceClock *PIKSREFERENCECLOCK;
+
+#undef INTERFACE
+#define INTERFACE IKsReferenceClock
+DECLARE_INTERFACE_(IKsReferenceClock,IUnknown)
+{
+  DEFINE_ABSTRACT_UNKNOWN()
+  STDMETHOD_(LONGLONG,GetTime)		(THIS) PURE;
+  STDMETHOD_(LONGLONG,GetPhysicalTime)	(THIS) PURE;
+  STDMETHOD_(LONGLONG,GetCorrelatedTime)(THIS_
+  						PLONGLONG SystemTime
+  					) PURE;
+  STDMETHOD_(LONGLONG,GetCorrelatedPhysicalTime)(THIS_
+						PLONGLONG SystemTime
+					) PURE;
+  STDMETHOD_(NTSTATUS,GetResolution)	(THIS_
+						PKSRESOLUTION Resolution
+					) PURE;
+  STDMETHOD_(NTSTATUS,GetState)		(THIS_
+						PKSSTATE State
+					) PURE;
+};
+#undef INTERFACE
+
+#define INTERFACE IKsDeviceFunctions
+DECLARE_INTERFACE_(IKsDeviceFunctions,IUnknown)
+{
+  DEFINE_ABSTRACT_UNKNOWN()
+  STDMETHOD_(NTSTATUS,RegisterAdapterObjectEx)	(THIS_
+						  PADAPTER_OBJECT AdapterObject,
+						  PDEVICE_DESCRIPTION DeviceDescription,
+						  ULONG NumberOfMapRegisters,
+						  ULONG MaxMappingsByteCount,
+						  ULONG MappingTableStride
+						) PURE;
+};
+
+#undef INTERFACE
+#define STATIC_IID_IKsControl						\
+	0x28F54685L,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUID(IID_IKsControl,
+	0x28F54685L,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96);
+#define STATIC_IID_IKsFastClock						\
+	0xc9902485,0xc180,0x11d2,0x84,0x73,0xd4,0x23,0x94,0x45,0x9e,0x5e
+DEFINE_GUID(IID_IKsFastClock,
+	0xc9902485,0xc180,0x11d2,0x84,0x73,0xd4,0x23,0x94,0x45,0x9e,0x5e);
+#define STATIC_IID_IKsDeviceFunctions					\
+	0xe234f2e2,0xbd69,0x4f8c,0xb3,0xf2,0x7c,0xd7,0x9e,0xd4,0x66,0xbd
+DEFINE_GUID(IID_IKsDeviceFunctions,
+	0xe234f2e2,0xbd69,0x4f8c,0xb3,0xf2,0x7c,0xd7,0x9e,0xd4,0x66,0xbd);
+#endif /* _IKsControl_ */
+#endif /* defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) */
+
+#endif /* _NTDDK_ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _KSDDK_
+#define KSDDKAPI
+#else
+#define KSDDKAPI DECLSPEC_IMPORT
+#endif
+
+#if defined(_NTDDK_)
+
+KSDDKAPI NTSTATUS NTAPI KsEnableEvent
+			(PIRP Irp, ULONG EventSetsCount, const KSEVENT_SET *EventSet,
+			 PLIST_ENTRY EventsList, KSEVENTS_LOCKTYPE EventsFlags,
+			 PVOID EventsLock);
+
+KSDDKAPI NTSTATUS NTAPI KsEnableEventWithAllocator
+			(PIRP Irp, ULONG EventSetsCount, const KSEVENT_SET *EventSet,
+			 PLIST_ENTRY EventsList, KSEVENTS_LOCKTYPE EventsFlags,
+			 PVOID EventsLock, PFNKSALLOCATOR Allocator, ULONG EventItemSize);
+
+KSDDKAPI NTSTATUS NTAPI KsDisableEvent
+			(PIRP Irp, PLIST_ENTRY EventsList, KSEVENTS_LOCKTYPE EventsFlags,
+			 PVOID EventsLock);
+
+KSDDKAPI VOID NTAPI KsDiscardEvent (PKSEVENT_ENTRY EventEntry);
+
+KSDDKAPI VOID NTAPI KsFreeEventList
+			(PFILE_OBJECT FileObject, PLIST_ENTRY EventsList,
+			 KSEVENTS_LOCKTYPE EventsFlags, PVOID EventsLock);
+
+KSDDKAPI NTSTATUS NTAPI KsGenerateEvent (PKSEVENT_ENTRY EventEntry);
+
+KSDDKAPI NTSTATUS NTAPI KsGenerateDataEvent
+			(PKSEVENT_ENTRY EventEntry, ULONG DataSize, PVOID Data);
+
+KSDDKAPI VOID NTAPI KsGenerateEventList
+			(GUID *Set, ULONG EventId, PLIST_ENTRY EventsList,
+			 KSEVENTS_LOCKTYPE EventsFlags, PVOID EventsLock);
+
+KSDDKAPI NTSTATUS NTAPI KsPropertyHandler
+			(PIRP Irp, ULONG PropertySetsCount,
+			 const KSPROPERTY_SET *PropertySet);
+
+KSDDKAPI NTSTATUS NTAPI KsPropertyHandlerWithAllocator
+			(PIRP Irp, ULONG PropertySetsCount,
+			 const KSPROPERTY_SET *PropertySet, PFNKSALLOCATOR Allocator,
+			 ULONG PropertyItemSize);
+
+KSDDKAPI BOOLEAN NTAPI KsFastPropertyHandler
+			(PFILE_OBJECT FileObject, PKSPROPERTY Property,
+			 ULONG PropertyLength, PVOID Data, ULONG DataLength,
+			 PIO_STATUS_BLOCK IoStatus, ULONG PropertySetsCount,
+			 const KSPROPERTY_SET *PropertySet);
+
+KSDDKAPI NTSTATUS NTAPI KsMethodHandler
+			(PIRP Irp, ULONG MethodSetsCount,
+			 const KSMETHOD_SET *MethodSet);
+
+KSDDKAPI NTSTATUS NTAPI KsMethodHandlerWithAllocator
+			(PIRP Irp, ULONG MethodSetsCount,
+			 const KSMETHOD_SET *MethodSet, PFNKSALLOCATOR Allocator,
+			 ULONG MethodItemSize);
+
+KSDDKAPI BOOLEAN NTAPI KsFastMethodHandler
+			(PFILE_OBJECT FileObject, PKSMETHOD Method, ULONG MethodLength,
+			 PVOID Data, ULONG DataLength, PIO_STATUS_BLOCK IoStatus,
+			 ULONG MethodSetsCount, const KSMETHOD_SET *MethodSet);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateDefaultAllocator (PIRP Irp);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateDefaultAllocatorEx
+			(PIRP Irp, PVOID InitializeContext,
+			 PFNKSDEFAULTALLOCATE DefaultAllocate,
+			 PFNKSDEFAULTFREE DefaultFree,
+			 PFNKSINITIALIZEALLOCATOR InitializeAllocator,
+			 PFNKSDELETEALLOCATOR DeleteAllocator);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateAllocator
+			(HANDLE ConnectionHandle, PKSALLOCATOR_FRAMING AllocatorFraming,
+			 PHANDLE AllocatorHandle);
+
+KSDDKAPI NTSTATUS NTAPI KsValidateAllocatorCreateRequest
+			(PIRP Irp, PKSALLOCATOR_FRAMING *AllocatorFraming);
+
+KSDDKAPI NTSTATUS NTAPI KsValidateAllocatorFramingEx
+			(PKSALLOCATOR_FRAMING_EX Framing, ULONG BufferSize,
+			 const KSALLOCATOR_FRAMING_EX *PinFraming);
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateDefaultClock (PKSDEFAULTCLOCK *DefaultClock);
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateDefaultClockEx
+			(PKSDEFAULTCLOCK *DefaultClock, PVOID Context,
+			 PFNKSSETTIMER SetTimer, PFNKSCANCELTIMER CancelTimer,
+			 PFNKSCORRELATEDTIME CorrelatedTime,
+			 const KSRESOLUTION *Resolution, ULONG Flags);
+
+KSDDKAPI VOID NTAPI KsFreeDefaultClock (PKSDEFAULTCLOCK DefaultClock);
+KSDDKAPI NTSTATUS NTAPI KsCreateDefaultClock (PIRP Irp, PKSDEFAULTCLOCK DefaultClock);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateClock
+			(HANDLE ConnectionHandle, PKSCLOCK_CREATE ClockCreate,
+			 PHANDLE ClockHandle);
+
+KSDDKAPI NTSTATUS NTAPI KsValidateClockCreateRequest
+			(PIRP Irp, PKSCLOCK_CREATE *ClockCreate);
+
+KSDDKAPI KSSTATE NTAPI KsGetDefaultClockState (PKSDEFAULTCLOCK DefaultClock);
+KSDDKAPI VOID NTAPI KsSetDefaultClockState(PKSDEFAULTCLOCK DefaultClock, KSSTATE State);
+KSDDKAPI LONGLONG NTAPI KsGetDefaultClockTime (PKSDEFAULTCLOCK DefaultClock);
+KSDDKAPI VOID NTAPI KsSetDefaultClockTime(PKSDEFAULTCLOCK DefaultClock, LONGLONG Time);
+
+KSDDKAPI NTSTATUS NTAPI KsCreatePin
+			(HANDLE FilterHandle, PKSPIN_CONNECT Connect,
+			 ACCESS_MASK DesiredAccess, PHANDLE ConnectionHandle);
+
+KSDDKAPI NTSTATUS NTAPI KsValidateConnectRequest
+			(PIRP Irp, ULONG DescriptorsCount,
+			 const KSPIN_DESCRIPTOR *Descriptor, PKSPIN_CONNECT *Connect);
+
+KSDDKAPI NTSTATUS NTAPI KsPinPropertyHandler
+			(PIRP Irp, PKSPROPERTY Property, PVOID Data,
+			 ULONG DescriptorsCount, const KSPIN_DESCRIPTOR *Descriptor);
+
+KSDDKAPI NTSTATUS NTAPI KsPinDataIntersection
+			(PIRP Irp, PKSP_PIN Pin, PVOID Data, ULONG DescriptorsCount,
+			 const KSPIN_DESCRIPTOR *Descriptor,
+			 PFNKSINTERSECTHANDLER IntersectHandler);
+
+KSDDKAPI NTSTATUS NTAPI KsPinDataIntersectionEx
+			(PIRP Irp, PKSP_PIN Pin, PVOID Data, ULONG DescriptorsCount,
+			 const KSPIN_DESCRIPTOR *Descriptor, ULONG DescriptorSize,
+			 PFNKSINTERSECTHANDLEREX IntersectHandler, PVOID HandlerContext);
+
+KSDDKAPI NTSTATUS NTAPI KsHandleSizedListQuery
+			(PIRP Irp, ULONG DataItemsCount, ULONG DataItemSize,
+			 const VOID *DataItems);
+
+#ifndef MAKEINTRESOURCE
+#define MAKEINTRESOURCE(r)		((ULONG_PTR) (USHORT) r)
+#endif
+#ifndef RT_STRING
+#define RT_STRING			MAKEINTRESOURCE(6)
+#define RT_RCDATA			MAKEINTRESOURCE(10)
+#endif
+
+KSDDKAPI NTSTATUS NTAPI KsLoadResource
+			(PVOID ImageBase, POOL_TYPE PoolType, ULONG_PTR ResourceName,
+			 ULONG ResourceType, PVOID *Resource, PULONG ResourceSize);
+
+KSDDKAPI NTSTATUS NTAPI KsGetImageNameAndResourceId
+			(HANDLE RegKey, PUNICODE_STRING ImageName, PULONG_PTR ResourceId,
+			 PULONG ValueType);
+
+KSDDKAPI NTSTATUS NTAPI KsMapModuleName
+			(PDEVICE_OBJECT PhysicalDeviceObject, PUNICODE_STRING ModuleName,
+			 PUNICODE_STRING ImageName, PULONG_PTR ResourceId,
+			 PULONG ValueType);
+
+KSDDKAPI NTSTATUS NTAPI KsReferenceBusObject (KSDEVICE_HEADER Header);
+KSDDKAPI VOID NTAPI KsDereferenceBusObject (KSDEVICE_HEADER Header);
+KSDDKAPI NTSTATUS NTAPI KsDispatchQuerySecurity (PDEVICE_OBJECT DeviceObject, PIRP Irp);
+KSDDKAPI NTSTATUS NTAPI KsDispatchSetSecurity (PDEVICE_OBJECT DeviceObject, PIRP Irp);
+KSDDKAPI NTSTATUS NTAPI KsDispatchSpecificProperty (PIRP Irp, PFNKSHANDLER Handler);
+KSDDKAPI NTSTATUS NTAPI KsDispatchSpecificMethod (PIRP Irp, PFNKSHANDLER Handler);
+
+KSDDKAPI NTSTATUS NTAPI KsReadFile
+			(PFILE_OBJECT FileObject, PKEVENT Event, PVOID PortContext,
+			 PIO_STATUS_BLOCK IoStatusBlock, PVOID Buffer, ULONG Length,
+			 ULONG Key, KPROCESSOR_MODE RequestorMode);
+
+KSDDKAPI NTSTATUS NTAPI KsWriteFile
+			(PFILE_OBJECT FileObject, PKEVENT Event, PVOID PortContext,
+			 PIO_STATUS_BLOCK IoStatusBlock, PVOID Buffer, ULONG Length,
+			 ULONG Key, KPROCESSOR_MODE RequestorMode);
+
+KSDDKAPI NTSTATUS NTAPI KsQueryInformationFile
+			(PFILE_OBJECT FileObject, PVOID FileInformation, ULONG Length,
+			 FILE_INFORMATION_CLASS FileInformationClass);
+
+KSDDKAPI NTSTATUS NTAPI KsSetInformationFile
+			(PFILE_OBJECT FileObject, PVOID FileInformation, ULONG Length,
+			 FILE_INFORMATION_CLASS FileInformationClass);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamIo
+			(PFILE_OBJECT FileObject, PKEVENT Event, PVOID PortContext,
+			 PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext,
+			 KSCOMPLETION_INVOCATION CompletionInvocationFlags,
+			 PIO_STATUS_BLOCK IoStatusBlock, PVOID StreamHeaders, ULONG Length,
+			 ULONG Flags, KPROCESSOR_MODE RequestorMode);
+
+KSDDKAPI NTSTATUS NTAPI KsProbeStreamIrp(PIRP Irp, ULONG ProbeFlags, ULONG HeaderSize);
+KSDDKAPI NTSTATUS NTAPI KsAllocateExtraData(PIRP Irp, ULONG ExtraSize, PVOID *ExtraBuffer);
+KSDDKAPI VOID NTAPI KsNullDriverUnload (PDRIVER_OBJECT DriverObject);
+
+KSDDKAPI NTSTATUS NTAPI KsSetMajorFunctionHandler
+			(PDRIVER_OBJECT DriverObject, ULONG MajorFunction);
+
+KSDDKAPI NTSTATUS NTAPI KsDispatchInvalidDeviceRequest
+			(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+
+KSDDKAPI NTSTATUS NTAPI KsDefaultDeviceIoCompletion
+			(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+
+KSDDKAPI NTSTATUS NTAPI KsDispatchIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+
+KSDDKAPI BOOLEAN NTAPI KsDispatchFastIoDeviceControlFailure
+			(PFILE_OBJECT FileObject, BOOLEAN Wait, PVOID InputBuffer,
+			 ULONG InputBufferLength, PVOID OutputBuffer,
+			 ULONG OutputBufferLength, ULONG IoControlCode,
+			 PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject);
+
+KSDDKAPI BOOLEAN NTAPI KsDispatchFastReadFailure
+			(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset,
+			 ULONG Length, BOOLEAN Wait, ULONG LockKey, PVOID Buffer,
+			 PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject);
+
+#define KsDispatchFastWriteFailure		KsDispatchFastReadFailure
+
+KSDDKAPI VOID NTAPI KsCancelRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+KSDDKAPI VOID NTAPI KsCancelIo(PLIST_ENTRY QueueHead, PKSPIN_LOCK SpinLock);
+KSDDKAPI VOID NTAPI KsReleaseIrpOnCancelableQueue(PIRP Irp, PDRIVER_CANCEL DriverCancel);
+
+KSDDKAPI PIRP NTAPI KsRemoveIrpFromCancelableQueue
+			(PLIST_ENTRY QueueHead, PKSPIN_LOCK SpinLock,
+			 KSLIST_ENTRY_LOCATION ListLocation,
+			 KSIRP_REMOVAL_OPERATION RemovalOperation);
+
+KSDDKAPI NTSTATUS NTAPI KsMoveIrpsOnCancelableQueue
+			(PLIST_ENTRY SourceList, PKSPIN_LOCK SourceLock,
+			 PLIST_ENTRY DestinationList, PKSPIN_LOCK DestinationLock,
+			 KSLIST_ENTRY_LOCATION ListLocation,
+			 PFNKSIRPLISTCALLBACK ListCallback, PVOID Context);
+
+KSDDKAPI VOID NTAPI KsRemoveSpecificIrpFromCancelableQueue (PIRP Irp);
+
+KSDDKAPI VOID NTAPI KsAddIrpToCancelableQueue
+			(PLIST_ENTRY QueueHead, PKSPIN_LOCK SpinLock, PIRP Irp,
+			 KSLIST_ENTRY_LOCATION ListLocation, PDRIVER_CANCEL DriverCancel);
+
+KSDDKAPI NTSTATUS NTAPI KsAcquireResetValue(PIRP Irp, KSRESET *ResetValue);
+
+KSDDKAPI NTSTATUS NTAPI KsTopologyPropertyHandler
+			(PIRP Irp, PKSPROPERTY Property, PVOID Data,
+			 const KSTOPOLOGY *Topology);
+
+KSDDKAPI VOID NTAPI KsAcquireDeviceSecurityLock(KSDEVICE_HEADER Header, BOOLEAN Exclusive);
+KSDDKAPI VOID NTAPI KsReleaseDeviceSecurityLock (KSDEVICE_HEADER Header);
+KSDDKAPI NTSTATUS NTAPI KsDefaultDispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+KSDDKAPI NTSTATUS NTAPI KsDefaultDispatchPower(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+KSDDKAPI NTSTATUS NTAPI KsDefaultForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+
+KSDDKAPI VOID NTAPI KsSetDevicePnpAndBaseObject
+			(KSDEVICE_HEADER Header, PDEVICE_OBJECT PnpDeviceObject,
+			 PDEVICE_OBJECT BaseObject);
+
+KSDDKAPI PDEVICE_OBJECT NTAPI KsQueryDevicePnpObject (KSDEVICE_HEADER Header);
+KSDDKAPI ACCESS_MASK NTAPI KsQueryObjectAccessMask (KSOBJECT_HEADER Header);
+
+KSDDKAPI VOID NTAPI KsRecalculateStackDepth
+			(KSDEVICE_HEADER Header, BOOLEAN ReuseStackLocation);
+
+KSDDKAPI VOID NTAPI KsSetTargetState
+			(KSOBJECT_HEADER Header, KSTARGET_STATE TargetState);
+
+KSDDKAPI VOID NTAPI KsSetTargetDeviceObject
+			(KSOBJECT_HEADER Header, PDEVICE_OBJECT TargetDevice);
+
+KSDDKAPI VOID NTAPI KsSetPowerDispatch
+			(KSOBJECT_HEADER Header, PFNKSCONTEXT_DISPATCH PowerDispatch,
+			 PVOID PowerContext);
+
+KSDDKAPI PKSOBJECT_CREATE_ITEM NTAPI KsQueryObjectCreateItem (KSOBJECT_HEADER Header);
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateDeviceHeader
+			(KSDEVICE_HEADER *Header, ULONG ItemsCount,
+			 PKSOBJECT_CREATE_ITEM ItemsList);
+
+KSDDKAPI VOID NTAPI KsFreeDeviceHeader (KSDEVICE_HEADER Header);
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateObjectHeader
+			(KSOBJECT_HEADER *Header, ULONG ItemsCount,
+			 PKSOBJECT_CREATE_ITEM ItemsList, PIRP Irp,
+			 const KSDISPATCH_TABLE *Table);
+
+KSDDKAPI VOID NTAPI KsFreeObjectHeader (KSOBJECT_HEADER Header);
+
+KSDDKAPI NTSTATUS NTAPI KsAddObjectCreateItemToDeviceHeader
+			(KSDEVICE_HEADER Header, PDRIVER_DISPATCH Create, PVOID Context,
+			 PWSTR ObjectClass, PSECURITY_DESCRIPTOR SecurityDescriptor);
+
+KSDDKAPI NTSTATUS NTAPI KsAddObjectCreateItemToObjectHeader
+			(KSOBJECT_HEADER Header, PDRIVER_DISPATCH Create, PVOID Context,
+			 PWSTR ObjectClass, PSECURITY_DESCRIPTOR SecurityDescriptor);
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateObjectCreateItem
+			(KSDEVICE_HEADER Header, PKSOBJECT_CREATE_ITEM CreateItem,
+			 BOOLEAN AllocateEntry, PFNKSITEMFREECALLBACK ItemFreeCallback);
+
+KSDDKAPI NTSTATUS NTAPI KsFreeObjectCreateItem
+			(KSDEVICE_HEADER Header, PUNICODE_STRING CreateItem);
+
+KSDDKAPI NTSTATUS NTAPI KsFreeObjectCreateItemsByContext
+			(KSDEVICE_HEADER Header, PVOID Context);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateDefaultSecurity
+			(PSECURITY_DESCRIPTOR ParentSecurity,
+			 PSECURITY_DESCRIPTOR *DefaultSecurity);
+
+KSDDKAPI NTSTATUS NTAPI KsForwardIrp
+			(PIRP Irp, PFILE_OBJECT FileObject, BOOLEAN ReuseStackLocation);
+
+KSDDKAPI NTSTATUS NTAPI KsForwardAndCatchIrp
+			(PDEVICE_OBJECT DeviceObject, PIRP Irp, PFILE_OBJECT FileObject,
+			 KSSTACK_USE StackUse);
+
+KSDDKAPI NTSTATUS NTAPI KsSynchronousIoControlDevice
+			(PFILE_OBJECT FileObject, KPROCESSOR_MODE RequestorMode,
+			 ULONG IoControl, PVOID InBuffer, ULONG InSize, PVOID OutBuffer,
+			 ULONG OutSize, PULONG BytesReturned);
+
+KSDDKAPI NTSTATUS NTAPI KsUnserializeObjectPropertiesFromRegistry
+			(PFILE_OBJECT FileObject, HANDLE ParentKey,
+			 PUNICODE_STRING RegistryPath);
+
+KSDDKAPI NTSTATUS NTAPI KsCacheMedium
+			(PUNICODE_STRING SymbolicLink, PKSPIN_MEDIUM Medium,
+			 ULONG PinDirection);
+
+KSDDKAPI NTSTATUS NTAPI KsRegisterWorker
+			(WORK_QUEUE_TYPE WorkQueueType, PKSWORKER *Worker);
+
+KSDDKAPI NTSTATUS NTAPI KsRegisterCountedWorker
+			(WORK_QUEUE_TYPE WorkQueueType, PWORK_QUEUE_ITEM CountedWorkItem,
+			 PKSWORKER *Worker);
+
+KSDDKAPI VOID NTAPI KsUnregisterWorker (PKSWORKER Worker);
+KSDDKAPI NTSTATUS NTAPI KsQueueWorkItem(PKSWORKER Worker, PWORK_QUEUE_ITEM WorkItem);
+KSDDKAPI ULONG NTAPI KsIncrementCountedWorker (PKSWORKER Worker);
+KSDDKAPI ULONG NTAPI KsDecrementCountedWorker (PKSWORKER Worker);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateTopologyNode
+			(HANDLE ParentHandle, PKSNODE_CREATE NodeCreate,
+			 ACCESS_MASK DesiredAccess, PHANDLE NodeHandle);
+
+KSDDKAPI NTSTATUS NTAPI KsValidateTopologyNodeCreateRequest
+			(PIRP Irp, PKSTOPOLOGY Topology, PKSNODE_CREATE *NodeCreate);
+
+KSDDKAPI NTSTATUS NTAPI KsMergeAutomationTables
+			(PKSAUTOMATION_TABLE *AutomationTableAB,
+			 PKSAUTOMATION_TABLE AutomationTableA,
+			 PKSAUTOMATION_TABLE AutomationTableB,
+			 KSOBJECT_BAG Bag);
+
+KSDDKAPI NTSTATUS NTAPI KsInitializeDriver
+			(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName,
+			 const KSDEVICE_DESCRIPTOR *Descriptor);
+
+KSDDKAPI NTSTATUS NTAPI KsAddDevice
+			(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateDevice
+			(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject,
+			 const KSDEVICE_DESCRIPTOR *Descriptor, ULONG ExtensionSize,
+			 PKSDEVICE *Device);
+
+KSDDKAPI NTSTATUS NTAPI KsInitializeDevice
+			(PDEVICE_OBJECT FunctionalDeviceObject,
+			 PDEVICE_OBJECT PhysicalDeviceObject,
+			 PDEVICE_OBJECT NextDeviceObject,
+			 const KSDEVICE_DESCRIPTOR *Descriptor);
+
+KSDDKAPI void NTAPI KsTerminateDevice (PDEVICE_OBJECT DeviceObject);
+KSDDKAPI PKSDEVICE NTAPI KsGetDeviceForDeviceObject (PDEVICE_OBJECT FunctionalDeviceObject);
+KSDDKAPI void NTAPI KsAcquireDevice (PKSDEVICE Device);
+KSDDKAPI void NTAPI KsReleaseDevice (PKSDEVICE Device);
+
+KSDDKAPI void NTAPI KsDeviceRegisterAdapterObject
+			(PKSDEVICE Device, PADAPTER_OBJECT AdapterObject,
+			 ULONG MaxMappingsByteCount, ULONG MappingTableStride);
+
+KSDDKAPI ULONG NTAPI KsDeviceGetBusData
+			(PKSDEVICE Device, ULONG DataType, PVOID Buffer, ULONG Offset,
+			 ULONG Length);
+
+KSDDKAPI ULONG NTAPI KsDeviceSetBusData
+			(PKSDEVICE Device, ULONG DataType, PVOID Buffer, ULONG Offset,
+			 ULONG Length);
+
+KSDDKAPI NTSTATUS NTAPI KsCreateFilterFactory
+			(PDEVICE_OBJECT DeviceObject, const KSFILTER_DESCRIPTOR *Descriptor,
+			 PWSTR RefString, PSECURITY_DESCRIPTOR SecurityDescriptor,
+			 ULONG CreateItemFlags, PFNKSFILTERFACTORYPOWER SleepCallback,
+			 PFNKSFILTERFACTORYPOWER WakeCallback,
+			 PKSFILTERFACTORY *FilterFactory);
+
+#define KsDeleteFilterFactory(FilterFactory)												\
+	KsFreeObjectCreateItemsByContext( *(KSDEVICE_HEADER *)(										\
+						KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension),\
+					   FilterFactory)
+
+KSDDKAPI NTSTATUS NTAPI KsFilterFactoryUpdateCacheData
+			(PKSFILTERFACTORY FilterFactory,
+			 const KSFILTER_DESCRIPTOR *FilterDescriptor);
+
+KSDDKAPI NTSTATUS NTAPI KsFilterFactoryAddCreateItem
+			(PKSFILTERFACTORY FilterFactory, PWSTR RefString,
+			 PSECURITY_DESCRIPTOR SecurityDescriptor, ULONG CreateItemFlags);
+
+KSDDKAPI NTSTATUS NTAPI KsFilterFactorySetDeviceClassesState
+			(PKSFILTERFACTORY FilterFactory, BOOLEAN NewState);
+
+KSDDKAPI PUNICODE_STRING NTAPI KsFilterFactoryGetSymbolicLink
+			(PKSFILTERFACTORY FilterFactory);
+
+KSDDKAPI void NTAPI KsAddEvent(PVOID Object, PKSEVENT_ENTRY EventEntry);
+
+void __forceinline KsFilterAddEvent (PKSFILTER Filter, PKSEVENT_ENTRY EventEntry)
+{
+	KsAddEvent(Filter, EventEntry);
+}
+
+void __forceinline KsPinAddEvent (PKSPIN Pin, PKSEVENT_ENTRY EventEntry)
+{
+	KsAddEvent(Pin, EventEntry);
+}
+
+KSDDKAPI NTSTATUS NTAPI KsDefaultAddEventHandler
+			(PIRP Irp, PKSEVENTDATA EventData, PKSEVENT_ENTRY EventEntry);
+
+KSDDKAPI void NTAPI KsGenerateEvents
+			(PVOID Object, const GUID *EventSet, ULONG EventId,
+			 ULONG DataSize, PVOID Data, PFNKSGENERATEEVENTCALLBACK CallBack,
+			 PVOID CallBackContext);
+
+void __forceinline KsFilterGenerateEvents
+			(PKSFILTER Filter, const GUID *EventSet, ULONG EventId,
+			 ULONG DataSize, PVOID Data, PFNKSGENERATEEVENTCALLBACK CallBack,
+			 PVOID CallBackContext)
+{
+	KsGenerateEvents(Filter, EventSet, EventId, DataSize, Data, CallBack,
+			 CallBackContext);
+}
+
+void __forceinline KsPinGenerateEvents
+			(PKSPIN Pin, const GUID *EventSet, ULONG EventId,
+			 ULONG DataSize, PVOID Data, PFNKSGENERATEEVENTCALLBACK CallBack,
+			 PVOID CallBackContext)
+{
+	KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack,
+			 CallBackContext);
+}
+
+typedef enum {
+  KSSTREAM_POINTER_STATE_UNLOCKED = 0,
+  KSSTREAM_POINTER_STATE_LOCKED
+} KSSTREAM_POINTER_STATE;
+
+KSDDKAPI NTSTATUS NTAPI KsPinGetAvailableByteCount
+			(PKSPIN Pin, PLONG InputDataBytes, PLONG OutputBufferBytes);
+
+KSDDKAPI PKSSTREAM_POINTER NTAPI KsPinGetLeadingEdgeStreamPointer
+			(PKSPIN Pin, KSSTREAM_POINTER_STATE State);
+
+KSDDKAPI PKSSTREAM_POINTER NTAPI KsPinGetTrailingEdgeStreamPointer
+			(PKSPIN Pin, KSSTREAM_POINTER_STATE State);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamPointerSetStatusCode
+			(PKSSTREAM_POINTER StreamPointer, NTSTATUS Status);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamPointerLock (PKSSTREAM_POINTER StreamPointer);
+KSDDKAPI void NTAPI KsStreamPointerUnlock(PKSSTREAM_POINTER StreamPointer, BOOLEAN Eject);
+
+KSDDKAPI void NTAPI KsStreamPointerAdvanceOffsetsAndUnlock
+			(PKSSTREAM_POINTER StreamPointer, ULONG InUsed, ULONG OutUsed,
+			 BOOLEAN Eject);
+
+KSDDKAPI void NTAPI KsStreamPointerDelete (PKSSTREAM_POINTER StreamPointer);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamPointerClone
+			(PKSSTREAM_POINTER StreamPointer, PFNKSSTREAMPOINTER CancelCallback,
+			 ULONG ContextSize, PKSSTREAM_POINTER *CloneStreamPointer);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamPointerAdvanceOffsets
+			(PKSSTREAM_POINTER StreamPointer, ULONG InUsed, ULONG OutUsed,
+			 BOOLEAN Eject);
+
+KSDDKAPI NTSTATUS NTAPI KsStreamPointerAdvance (PKSSTREAM_POINTER StreamPointer);
+KSDDKAPI PMDL NTAPI KsStreamPointerGetMdl (PKSSTREAM_POINTER StreamPointer);
+
+KSDDKAPI PIRP NTAPI KsStreamPointerGetIrp
+			(PKSSTREAM_POINTER StreamPointer, PBOOLEAN FirstFrameInIrp,
+			 PBOOLEAN LastFrameInIrp);
+
+KSDDKAPI void NTAPI KsStreamPointerScheduleTimeout
+			(PKSSTREAM_POINTER StreamPointer, PFNKSSTREAMPOINTER Callback,
+			 ULONGLONG Interval);
+
+KSDDKAPI void NTAPI KsStreamPointerCancelTimeout (PKSSTREAM_POINTER StreamPointer);
+KSDDKAPI PKSSTREAM_POINTER NTAPI KsPinGetFirstCloneStreamPointer (PKSPIN Pin);
+
+KSDDKAPI PKSSTREAM_POINTER NTAPI KsStreamPointerGetNextClone
+			(PKSSTREAM_POINTER StreamPointer);
+
+KSDDKAPI NTSTATUS NTAPI KsPinHandshake(PKSPIN Pin, PKSHANDSHAKE In, PKSHANDSHAKE Out);
+KSDDKAPI void NTAPI KsCompletePendingRequest (PIRP Irp);
+KSDDKAPI KSOBJECTTYPE NTAPI KsGetObjectTypeFromIrp (PIRP Irp);
+KSDDKAPI PVOID NTAPI KsGetObjectFromFileObject (PFILE_OBJECT FileObject);
+KSDDKAPI KSOBJECTTYPE NTAPI KsGetObjectTypeFromFileObject (PFILE_OBJECT FileObject);
+
+PKSFILTER __forceinline KsGetFilterFromFileObject (PFILE_OBJECT FileObject)
+{
+	return (PKSFILTER) KsGetObjectFromFileObject(FileObject);
+}
+
+PKSPIN __forceinline KsGetPinFromFileObject (PFILE_OBJECT FileObject)
+{
+	return (PKSPIN) KsGetObjectFromFileObject(FileObject);
+}
+
+KSDDKAPI PKSGATE NTAPI KsFilterGetAndGate (PKSFILTER Filter);
+KSDDKAPI void NTAPI KsFilterAcquireProcessingMutex (PKSFILTER Filter);
+KSDDKAPI void NTAPI KsFilterReleaseProcessingMutex (PKSFILTER Filter);
+KSDDKAPI void NTAPI KsFilterAttemptProcessing(PKSFILTER Filter, BOOLEAN Asynchronous);
+KSDDKAPI PKSGATE NTAPI KsPinGetAndGate(PKSPIN Pin);
+KSDDKAPI void NTAPI KsPinAttachAndGate(PKSPIN Pin, PKSGATE AndGate);
+KSDDKAPI void NTAPI KsPinAttachOrGate (PKSPIN Pin, PKSGATE OrGate);
+KSDDKAPI void NTAPI KsPinAcquireProcessingMutex (PKSPIN Pin);
+KSDDKAPI void NTAPI KsPinReleaseProcessingMutex (PKSPIN Pin);
+KSDDKAPI BOOLEAN NTAPI KsProcessPinUpdate (PKSPROCESSPIN ProcessPin);
+
+KSDDKAPI void NTAPI KsPinGetCopyRelationships
+			(PKSPIN Pin, PKSPIN *CopySource, PKSPIN *DelegateBranch);
+
+KSDDKAPI void NTAPI KsPinAttemptProcessing(PKSPIN Pin, BOOLEAN Asynchronous);
+KSDDKAPI PVOID NTAPI KsGetParent (PVOID Object);
+
+PKSDEVICE __forceinline KsFilterFactoryGetParentDevice (PKSFILTERFACTORY FilterFactory)
+{
+	return (PKSDEVICE) KsGetParent((PVOID) FilterFactory);
+}
+
+PKSFILTERFACTORY __forceinline KsFilterGetParentFilterFactory (PKSFILTER Filter)
+{
+	return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter);
+}
+
+KSDDKAPI PKSFILTER NTAPI KsPinGetParentFilter (PKSPIN Pin);
+KSDDKAPI PVOID NTAPI KsGetFirstChild (PVOID Object);
+
+PKSFILTERFACTORY __forceinline KsDeviceGetFirstChildFilterFactory (PKSDEVICE Device)
+{
+	return (PKSFILTERFACTORY) KsGetFirstChild((PVOID) Device);
+}
+
+PKSFILTER __forceinline KsFilterFactoryGetFirstChildFilter (PKSFILTERFACTORY FilterFactory)
+{
+	return (PKSFILTER) KsGetFirstChild((PVOID) FilterFactory);
+}
+
+KSDDKAPI ULONG NTAPI KsFilterGetChildPinCount(PKSFILTER Filter, ULONG PinId);
+KSDDKAPI PKSPIN NTAPI KsFilterGetFirstChildPin(PKSFILTER Filter, ULONG PinId);
+KSDDKAPI PVOID NTAPI KsGetNextSibling (PVOID Object);
+KSDDKAPI PKSPIN NTAPI KsPinGetNextSiblingPin (PKSPIN Pin);
+
+PKSFILTERFACTORY __forceinline KsFilterFactoryGetNextSiblingFilterFactory
+			(PKSFILTERFACTORY FilterFactory)
+{
+	return (PKSFILTERFACTORY) KsGetNextSibling((PVOID) FilterFactory);
+}
+
+PKSFILTER __forceinline KsFilterGetNextSiblingFilter (PKSFILTER Filter)
+{
+	return (PKSFILTER) KsGetNextSibling((PVOID) Filter);
+}
+
+KSDDKAPI PKSDEVICE NTAPI KsGetDevice (PVOID Object);
+
+PKSDEVICE __forceinline KsFilterFactoryGetDevice (PKSFILTERFACTORY FilterFactory)
+{
+	return KsGetDevice((PVOID) FilterFactory);
+}
+
+PKSDEVICE __forceinline KsFilterGetDevice (PKSFILTER Filter)
+{
+	return KsGetDevice((PVOID) Filter);
+}
+
+PKSDEVICE __forceinline KsPinGetDevice (PKSPIN Pin)
+{
+	return KsGetDevice((PVOID) Pin);
+}
+
+KSDDKAPI PKSFILTER NTAPI KsGetFilterFromIrp (PIRP Irp);
+KSDDKAPI PKSPIN NTAPI KsGetPinFromIrp (PIRP Irp);
+KSDDKAPI ULONG NTAPI KsGetNodeIdFromIrp (PIRP Irp);
+KSDDKAPI void NTAPI KsAcquireControl (PVOID Object);
+KSDDKAPI void NTAPI KsReleaseControl (PVOID Object);
+
+void __forceinline KsFilterAcquireControl (PKSFILTER Filter)
+{
+	KsAcquireControl((PVOID) Filter);
+}
+
+void __forceinline KsFilterReleaseControl (PKSFILTER Filter)
+{
+	KsReleaseControl((PVOID) Filter);
+}
+
+void __forceinline KsPinAcquireControl (PKSPIN Pin)
+{
+	KsAcquireControl((PVOID) Pin);
+}
+
+void __forceinline KsPinReleaseControl (PKSPIN Pin)
+{
+	KsReleaseControl((PVOID) Pin);
+}
+
+KSDDKAPI NTSTATUS NTAPI KsAddItemToObjectBag
+			(KSOBJECT_BAG ObjectBag, PVOID Item, PFNKSFREE Free);
+
+KSDDKAPI ULONG NTAPI KsRemoveItemFromObjectBag
+			(KSOBJECT_BAG ObjectBag, PVOID Item, BOOLEAN Free);
+
+#define KsDiscard(Object,Pointer)					\
+	KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE)
+
+KSDDKAPI NTSTATUS NTAPI KsAllocateObjectBag(PKSDEVICE Device, KSOBJECT_BAG *ObjectBag);
+KSDDKAPI void NTAPI KsFreeObjectBag (KSOBJECT_BAG ObjectBag);
+
+KSDDKAPI NTSTATUS NTAPI KsCopyObjectBagItems
+			(KSOBJECT_BAG ObjectBagDestination, KSOBJECT_BAG ObjectBagSource);
+
+KSDDKAPI NTSTATUS NTAPI _KsEdit
+			(KSOBJECT_BAG ObjectBag, PVOID *PointerToPointerToItem,
+			 ULONG NewSize, ULONG OldSize, ULONG Tag);
+
+#define KsEdit(Object, PointerToPointer, Tag)						\
+	_KsEdit((Object)->Bag, (PVOID*)(PointerToPointer),				\
+		sizeof(**(PointerToPointer)), sizeof(**(PointerToPointer)), (Tag))
+
+#define KsEditSized(Object, PointerToPointer, NewSize, OldSize, Tag)			\
+	_KsEdit((Object)->Bag, (PVOID*)(PointerToPointer), (NewSize), (OldSize), (Tag))
+
+KSDDKAPI NTSTATUS NTAPI KsRegisterFilterWithNoKSPins
+			(PDEVICE_OBJECT DeviceObject, const GUID *InterfaceClassGUID,
+			 ULONG PinCount, WINBOOL *PinDirection, KSPIN_MEDIUM *MediumList,
+			 GUID *CategoryList);
+
+KSDDKAPI NTSTATUS NTAPI KsFilterCreatePinFactory
+			(PKSFILTER Filter, const KSPIN_DESCRIPTOR_EX *const PinDescriptor,
+			 PULONG PinID);
+
+KSDDKAPI NTSTATUS NTAPI KsFilterCreateNode
+			(PKSFILTER Filter, const KSNODE_DESCRIPTOR *const NodeDescriptor,
+			 PULONG NodeID);
+
+KSDDKAPI NTSTATUS NTAPI KsFilterAddTopologyConnections
+			(PKSFILTER Filter, ULONG NewConnectionsCount,
+			 const KSTOPOLOGY_CONNECTION *const NewTopologyConnections);
+
+KSDDKAPI NTSTATUS NTAPI KsPinGetConnectedPinInterface
+			(PKSPIN Pin, const GUID *InterfaceId, PVOID *Interface);
+
+KSDDKAPI PFILE_OBJECT NTAPI KsPinGetConnectedPinFileObject (PKSPIN Pin);
+KSDDKAPI PDEVICE_OBJECT NTAPI KsPinGetConnectedPinDeviceObject (PKSPIN Pin);
+
+KSDDKAPI NTSTATUS NTAPI KsPinGetConnectedFilterInterface
+			(PKSPIN Pin, const GUID *InterfaceId, PVOID *Interface);
+
+#if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__)
+KSDDKAPI NTSTATUS NTAPI KsPinGetReferenceClockInterface
+			(PKSPIN Pin, PIKSREFERENCECLOCK *Interface);
+#endif /* defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) */
+
+KSDDKAPI VOID NTAPI KsPinSetPinClockTime(PKSPIN Pin, LONGLONG Time);
+
+KSDDKAPI NTSTATUS NTAPI KsPinSubmitFrame
+			(PKSPIN Pin, PVOID Data, ULONG Size,
+			 PKSSTREAM_HEADER StreamHeader, PVOID Context);
+
+KSDDKAPI NTSTATUS NTAPI KsPinSubmitFrameMdl
+			(PKSPIN Pin, PMDL Mdl, PKSSTREAM_HEADER StreamHeader,
+			 PVOID Context);
+
+KSDDKAPI void NTAPI KsPinRegisterFrameReturnCallback
+			(PKSPIN Pin, PFNKSPINFRAMERETURN FrameReturn);
+
+KSDDKAPI void NTAPI KsPinRegisterIrpCompletionCallback
+			(PKSPIN Pin, PFNKSPINIRPCOMPLETION IrpCompletion);
+
+KSDDKAPI void NTAPI KsPinRegisterHandshakeCallback
+			(PKSPIN Pin, PFNKSPINHANDSHAKE Handshake);
+
+KSDDKAPI void NTAPI KsFilterRegisterPowerCallbacks
+			(PKSFILTER Filter, PFNKSFILTERPOWER Sleep, PFNKSFILTERPOWER Wake);
+
+KSDDKAPI void NTAPI KsPinRegisterPowerCallbacks
+			(PKSPIN Pin, PFNKSPINPOWER Sleep, PFNKSPINPOWER Wake);
+
+#if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__)
+KSDDKAPI PUNKNOWN NTAPI KsRegisterAggregatedClientUnknown
+			(PVOID Object, PUNKNOWN ClientUnknown);
+
+KSDDKAPI PUNKNOWN NTAPI KsGetOuterUnknown (PVOID Object);
+
+PUNKNOWN __forceinline KsDeviceRegisterAggregatedClientUnknown
+			(PKSDEVICE Device, PUNKNOWN ClientUnknown)
+{
+	return KsRegisterAggregatedClientUnknown((PVOID)Device, ClientUnknown);
+}
+
+PUNKNOWN __forceinline KsDeviceGetOuterUnknown (PKSDEVICE Device)
+{
+	return KsGetOuterUnknown((PVOID) Device);
+}
+
+PUNKNOWN __forceinline KsFilterFactoryRegisterAggregatedClientUnknown
+			(PKSFILTERFACTORY FilterFactory, PUNKNOWN ClientUnknown)
+{
+	return KsRegisterAggregatedClientUnknown((PVOID)FilterFactory, ClientUnknown);
+}
+
+PUNKNOWN __forceinline KsFilterFactoryGetOuterUnknown (PKSFILTERFACTORY FilterFactory)
+{
+	return KsGetOuterUnknown((PVOID)FilterFactory);
+}
+
+PUNKNOWN __forceinline KsFilterRegisterAggregatedClientUnknown
+			(PKSFILTER Filter, PUNKNOWN ClientUnknown)
+{
+	return KsRegisterAggregatedClientUnknown((PVOID)Filter, ClientUnknown);
+}
+
+PUNKNOWN __forceinline KsFilterGetOuterUnknown (PKSFILTER Filter)
+{
+	return KsGetOuterUnknown((PVOID)Filter);
+}
+
+PUNKNOWN __forceinline KsPinRegisterAggregatedClientUnknown
+			(PKSPIN Pin, PUNKNOWN ClientUnknown)
+{
+	return KsRegisterAggregatedClientUnknown((PVOID)Pin, ClientUnknown);
+}
+
+PUNKNOWN __forceinline KsPinGetOuterUnknown (PKSPIN Pin)
+{
+	return KsGetOuterUnknown((PVOID)Pin);
+}
+#endif /* defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) */
+
+#else /* _NTDDK_ */
+
+#ifndef KS_NO_CREATE_FUNCTIONS
+KSDDKAPI DWORD WINAPI KsCreateAllocator(HANDLE ConnectionHandle,PKSALLOCATOR_FRAMING AllocatorFraming,PHANDLE AllocatorHandle);
+KSDDKAPI DWORD NTAPI KsCreateClock(HANDLE ConnectionHandle,PKSCLOCK_CREATE ClockCreate,PHANDLE ClockHandle);
+KSDDKAPI DWORD WINAPI KsCreatePin(HANDLE FilterHandle,PKSPIN_CONNECT Connect,ACCESS_MASK DesiredAccess,PHANDLE ConnectionHandle);
+KSDDKAPI DWORD WINAPI KsCreateTopologyNode(HANDLE ParentHandle,PKSNODE_CREATE NodeCreate,ACCESS_MASK DesiredAccess,PHANDLE NodeHandle);
+#endif
+
+#endif /* _NTDDK_ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#define DENY_USERMODE_ACCESS(pIrp,CompleteRequest)			\
+	if(pIrp->RequestorMode!=KernelMode) {				\
+		pIrp->IoStatus.Information = 0;				\
+		pIrp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST;	\
+		if(CompleteRequest)					\
+			IoCompleteRequest (pIrp,IO_NO_INCREMENT);	\
+		return STATUS_INVALID_DEVICE_REQUEST;			\
+	}
+
+#endif /* _KS_ */
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksguid.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksguid.h
new file mode 100644
index 0000000000..f0774d06ce
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksguid.h
@@ -0,0 +1,28 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#define INITGUID
+#include <guiddef.h>
+
+#ifndef DECLSPEC_SELECTANY
+#define DECLSPEC_SELECTANY __declspec(selectany)
+#endif
+
+#ifdef DEFINE_GUIDEX
+#undef DEFINE_GUIDEX
+#endif
+
+#ifdef __cplusplus
+#define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID DECLSPEC_SELECTANY name = { STATICGUIDOF(name) }
+#else
+#define DEFINE_GUIDEX(name) const CDECL GUID DECLSPEC_SELECTANY name = { STATICGUIDOF(name) }
+#endif
+#ifndef STATICGUIDOF
+#define STATICGUIDOF(guid) STATIC_##guid
+#endif
+
+#ifndef DEFINE_WAVEFORMATEX_GUID
+#define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x),0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+#endif
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksmedia.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksmedia.h
new file mode 100644
index 0000000000..2242c1e03a
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksmedia.h
@@ -0,0 +1,4551 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#if !defined(_KS_)
+#warning ks.h must be included before ksmedia.h
+#include "ks.h"
+#endif
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#if !defined(_KSMEDIA_)
+#define _KSMEDIA_
+
+typedef struct {
+  KSPROPERTY Property;
+  KSMULTIPLE_ITEM MultipleItem;
+} KSMULTIPLE_DATA_PROP,*PKSMULTIPLE_DATA_PROP;
+
+#define STATIC_KSMEDIUMSETID_MidiBus					\
+	0x05908040L,0x3246,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("05908040-3246-11D0-A5D6-28DB04C10000",KSMEDIUMSETID_MidiBus);
+#define KSMEDIUMSETID_MidiBus DEFINE_GUIDNAMED(KSMEDIUMSETID_MidiBus)
+
+#define STATIC_KSMEDIUMSETID_VPBus					\
+	0xA18C15ECL,0xCE43,0x11D0,0xAB,0xE7,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("A18C15EC-CE43-11D0-ABE7-00A0C9223196",KSMEDIUMSETID_VPBus);
+#define KSMEDIUMSETID_VPBus DEFINE_GUIDNAMED(KSMEDIUMSETID_VPBus)
+
+#define STATIC_KSINTERFACESETID_Media					\
+	0x3A13EB40L,0x30A7,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("3A13EB40-30A7-11D0-A5D6-28DB04C10000",KSINTERFACESETID_Media);
+#define KSINTERFACESETID_Media DEFINE_GUIDNAMED(KSINTERFACESETID_Media)
+
+typedef enum {
+  KSINTERFACE_MEDIA_MUSIC,
+  KSINTERFACE_MEDIA_WAVE_BUFFERED,
+  KSINTERFACE_MEDIA_WAVE_QUEUED
+} KSINTERFACE_MEDIA;
+
+#ifndef INIT_USBAUDIO_MID
+#define INIT_USBAUDIO_MID(guid,id)					\
+{									\
+	(guid)->Data1 = 0x4e1cecd2 + (USHORT)(id);			\
+	(guid)->Data2 = 0x1679;						\
+	(guid)->Data3 = 0x463b;						\
+	(guid)->Data4[0] = 0xa7;					\
+	(guid)->Data4[1] = 0x2f;					\
+	(guid)->Data4[2] = 0xa5;					\
+	(guid)->Data4[3] = 0xbf;					\
+	(guid)->Data4[4] = 0x64;					\
+	(guid)->Data4[5] = 0xc8;					\
+	(guid)->Data4[6] = 0x6e;					\
+	(guid)->Data4[7] = 0xba;					\
+}
+#define EXTRACT_USBAUDIO_MID(guid)					\
+	(USHORT)((guid)->Data1 - 0x4e1cecd2)
+#define DEFINE_USBAUDIO_MID_GUID(id)					\
+	0x4e1cecd2+(USHORT)(id),0x1679,0x463b,0xa7,0x2f,0xa5,0xbf,0x64,0xc8,0x6e,0xba
+#define IS_COMPATIBLE_USBAUDIO_MID(guid)				\
+	(((guid)->Data1 >= 0x4e1cecd2) &&				\
+	 ((guid)->Data1 < 0x4e1cecd2 + 0xffff) &&			\
+	 ((guid)->Data2 == 0x1679) &&					\
+	 ((guid)->Data3 == 0x463b) &&					\
+	 ((guid)->Data4[0] == 0xa7) &&					\
+	 ((guid)->Data4[1] == 0x2f) &&					\
+	 ((guid)->Data4[2] == 0xa5) &&					\
+	 ((guid)->Data4[3] == 0xbf) &&					\
+	 ((guid)->Data4[4] == 0x64) &&					\
+	 ((guid)->Data4[5] == 0xc8) &&					\
+	 ((guid)->Data4[6] == 0x6e) &&					\
+	 ((guid)->Data4[7] == 0xba) )
+#endif /* INIT_USBAUDIO_MID */
+
+#ifndef INIT_USBAUDIO_PID
+#define INIT_USBAUDIO_PID(guid,id)					\
+{									\
+	(guid)->Data1 = 0xabcc5a5e + (USHORT)(id);			\
+	(guid)->Data2 = 0xc263;						\
+	(guid)->Data3 = 0x463b;						\
+	(guid)->Data4[0] = 0xa7;					\
+	(guid)->Data4[1] = 0x2f;					\
+	(guid)->Data4[2] = 0xa5;					\
+	(guid)->Data4[3] = 0xbf;					\
+	(guid)->Data4[4] = 0x64;					\
+	(guid)->Data4[5] = 0xc8;					\
+	(guid)->Data4[6] = 0x6e;					\
+	(guid)->Data4[7] = 0xba;					\
+}
+#define EXTRACT_USBAUDIO_PID(guid)					\
+	(USHORT)((guid)->Data1 - 0xabcc5a5e)
+#define DEFINE_USBAUDIO_PID_GUID(id)					\
+	0xabcc5a5e+(USHORT)(id),0xc263,0x463b,0xa7,0x2f,0xa5,0xbf,0x64,0xc8,0x6e,0xba
+#define IS_COMPATIBLE_USBAUDIO_PID(guid)				\
+	(((guid)->Data1 >= 0xabcc5a5e) &&				\
+	 ((guid)->Data1 < 0xabcc5a5e + 0xffff) &&			\
+	 ((guid)->Data2 == 0xc263) &&					\
+	 ((guid)->Data3 == 0x463b) &&					\
+	 ((guid)->Data4[0] == 0xa7) &&					\
+	 ((guid)->Data4[1] == 0x2f) &&					\
+	 ((guid)->Data4[2] == 0xa5) &&					\
+	 ((guid)->Data4[3] == 0xbf) &&					\
+	 ((guid)->Data4[4] == 0x64) &&					\
+	 ((guid)->Data4[5] == 0xc8) &&					\
+	 ((guid)->Data4[6] == 0x6e) &&					\
+	 ((guid)->Data4[7] == 0xba) )
+#endif /* INIT_USBAUDIO_PID */
+
+#ifndef INIT_USBAUDIO_PRODUCT_NAME
+#define INIT_USBAUDIO_PRODUCT_NAME(guid,vid,pid,strIndex)		\
+{									\
+	(guid)->Data1 = 0XFC575048 + (USHORT)(vid);			\
+	(guid)->Data2 = 0x2E08 + (USHORT)(pid);				\
+	(guid)->Data3 = 0x463B + (USHORT)(strIndex);			\
+	(guid)->Data4[0] = 0xA7;					\
+	(guid)->Data4[1] = 0x2F;					\
+	(guid)->Data4[2] = 0xA5;					\
+	(guid)->Data4[3] = 0xBF;					\
+	(guid)->Data4[4] = 0x64;					\
+	(guid)->Data4[5] = 0xC8;					\
+	(guid)->Data4[6] = 0x6E;					\
+	(guid)->Data4[7] = 0xBA;					\
+}
+#define DEFINE_USBAUDIO_PRODUCT_NAME(vid,pid,strIndex)			\
+	0xFC575048+(USHORT)(vid),0x2E08+(USHORT)(pid),0x463B+(USHORT)(strIndex),0xA7,0x2F,0xA5,0xBF,0x64,0xC8,0x6E,0xBA
+#endif /* INIT_USBAUDIO_PRODUCT_NAME */
+
+#define STATIC_KSCOMPONENTID_USBAUDIO					\
+	0x8F1275F0,0x26E9,0x4264,0xBA,0x4D,0x39,0xFF,0xF0,0x1D,0x94,0xAA
+DEFINE_GUIDSTRUCT("8F1275F0-26E9-4264-BA4D-39FFF01D94AA",KSCOMPONENTID_USBAUDIO);
+#define KSCOMPONENTID_USBAUDIO DEFINE_GUIDNAMED(KSCOMPONENTID_USBAUDIO)
+
+#define INIT_USB_TERMINAL(guid,id)					\
+{									\
+	(guid)->Data1 = 0xDFF219E0 + (USHORT)(id);			\
+	(guid)->Data2 = 0xF70F;						\
+	(guid)->Data3 = 0x11D0;						\
+	(guid)->Data4[0] = 0xb9;					\
+	(guid)->Data4[1] = 0x17;					\
+	(guid)->Data4[2] = 0x00;					\
+	(guid)->Data4[3] = 0xa0;					\
+	(guid)->Data4[4] = 0xc9;					\
+	(guid)->Data4[5] = 0x22;					\
+	(guid)->Data4[6] = 0x31;					\
+	(guid)->Data4[7] = 0x96;					\
+}
+#define EXTRACT_USB_TERMINAL(guid)					\
+	(USHORT)((guid)->Data1 - 0xDFF219E0)
+#define DEFINE_USB_TERMINAL_GUID(id)					\
+	0xDFF219E0+(USHORT)(id),0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#define STATIC_KSNODETYPE_MICROPHONE					\
+	DEFINE_USB_TERMINAL_GUID(0x0201)
+DEFINE_GUIDSTRUCT("DFF21BE1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_MICROPHONE);
+#define KSNODETYPE_MICROPHONE DEFINE_GUIDNAMED(KSNODETYPE_MICROPHONE)
+
+#define STATIC_KSNODETYPE_DESKTOP_MICROPHONE				\
+	DEFINE_USB_TERMINAL_GUID(0x0202)
+DEFINE_GUIDSTRUCT("DFF21BE2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DESKTOP_MICROPHONE);
+#define KSNODETYPE_DESKTOP_MICROPHONE DEFINE_GUIDNAMED(KSNODETYPE_DESKTOP_MICROPHONE)
+
+#define STATIC_KSNODETYPE_PERSONAL_MICROPHONE				\
+	DEFINE_USB_TERMINAL_GUID(0x0203)
+DEFINE_GUIDSTRUCT("DFF21BE3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_PERSONAL_MICROPHONE);
+#define KSNODETYPE_PERSONAL_MICROPHONE DEFINE_GUIDNAMED(KSNODETYPE_PERSONAL_MICROPHONE)
+
+#define STATIC_KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE			\
+	DEFINE_USB_TERMINAL_GUID(0x0204)
+DEFINE_GUIDSTRUCT("DFF21BE4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE);
+#define KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE DEFINE_GUIDNAMED(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE)
+
+#define STATIC_KSNODETYPE_MICROPHONE_ARRAY				\
+	DEFINE_USB_TERMINAL_GUID(0x0205)
+DEFINE_GUIDSTRUCT("DFF21BE5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_MICROPHONE_ARRAY);
+#define KSNODETYPE_MICROPHONE_ARRAY DEFINE_GUIDNAMED(KSNODETYPE_MICROPHONE_ARRAY)
+
+#define STATIC_KSNODETYPE_PROCESSING_MICROPHONE_ARRAY			\
+	DEFINE_USB_TERMINAL_GUID(0x0206)
+DEFINE_GUIDSTRUCT("DFF21BE6-F70F-11D0-B917-00A0C9223196",KSNODETYPE_PROCESSING_MICROPHONE_ARRAY);
+#define KSNODETYPE_PROCESSING_MICROPHONE_ARRAY DEFINE_GUIDNAMED(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY)
+
+#define STATIC_KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR			\
+	0x830a44f2,0xa32d,0x476b,0xbe,0x97,0x42,0x84,0x56,0x73,0xb3,0x5a
+DEFINE_GUIDSTRUCT("830a44f2-a32d-476b-be97-42845673b35a",KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR);
+#define KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR DEFINE_GUIDNAMED(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR)
+
+#define STATIC_KSNODETYPE_SPEAKER					\
+	DEFINE_USB_TERMINAL_GUID(0x0301)
+DEFINE_GUIDSTRUCT("DFF21CE1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_SPEAKER);
+#define KSNODETYPE_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_SPEAKER)
+
+#define STATIC_KSNODETYPE_HEADPHONES					\
+	DEFINE_USB_TERMINAL_GUID(0x0302)
+DEFINE_GUIDSTRUCT("DFF21CE2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_HEADPHONES);
+#define KSNODETYPE_HEADPHONES DEFINE_GUIDNAMED(KSNODETYPE_HEADPHONES)
+
+#define STATIC_KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO			\
+	DEFINE_USB_TERMINAL_GUID(0x0303)
+DEFINE_GUIDSTRUCT("DFF21CE3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO);
+#define KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO)
+
+#define STATIC_KSNODETYPE_DESKTOP_SPEAKER				\
+	DEFINE_USB_TERMINAL_GUID(0x0304)
+DEFINE_GUIDSTRUCT("DFF21CE4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DESKTOP_SPEAKER);
+#define KSNODETYPE_DESKTOP_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_DESKTOP_SPEAKER)
+
+#define STATIC_KSNODETYPE_ROOM_SPEAKER					\
+	DEFINE_USB_TERMINAL_GUID(0x0305)
+DEFINE_GUIDSTRUCT("DFF21CE5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_ROOM_SPEAKER);
+#define KSNODETYPE_ROOM_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_ROOM_SPEAKER)
+
+#define STATIC_KSNODETYPE_COMMUNICATION_SPEAKER				\
+	DEFINE_USB_TERMINAL_GUID(0x0306)
+DEFINE_GUIDSTRUCT("DFF21CE6-F70F-11D0-B917-00A0C9223196",KSNODETYPE_COMMUNICATION_SPEAKER);
+#define KSNODETYPE_COMMUNICATION_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_COMMUNICATION_SPEAKER)
+
+#define STATIC_KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER			\
+	DEFINE_USB_TERMINAL_GUID(0x0307)
+DEFINE_GUIDSTRUCT("DFF21CE7-F70F-11D0-B917-00A0C9223196",KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER);
+#define KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER)
+
+#define STATIC_KSNODETYPE_HANDSET					\
+	DEFINE_USB_TERMINAL_GUID(0x0401)
+DEFINE_GUIDSTRUCT("DFF21DE1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_HANDSET);
+#define KSNODETYPE_HANDSET DEFINE_GUIDNAMED(KSNODETYPE_HANDSET)
+
+#define STATIC_KSNODETYPE_HEADSET					\
+	DEFINE_USB_TERMINAL_GUID(0x0402)
+DEFINE_GUIDSTRUCT("DFF21DE2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_HEADSET);
+#define KSNODETYPE_HEADSET DEFINE_GUIDNAMED(KSNODETYPE_HEADSET)
+
+#define STATIC_KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION		\
+	DEFINE_USB_TERMINAL_GUID(0x0403)
+DEFINE_GUIDSTRUCT("DFF21DE3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION);
+#define KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION DEFINE_GUIDNAMED(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION)
+
+#define STATIC_KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE			\
+	DEFINE_USB_TERMINAL_GUID(0x0404)
+DEFINE_GUIDSTRUCT("DFF21DE4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE);
+#define KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE DEFINE_GUIDNAMED(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE)
+
+#define STATIC_KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE			\
+	DEFINE_USB_TERMINAL_GUID(0x0405)
+DEFINE_GUIDSTRUCT("DFF21DE5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE);
+#define KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE DEFINE_GUIDNAMED(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE)
+
+#define STATIC_KSNODETYPE_PHONE_LINE					\
+	DEFINE_USB_TERMINAL_GUID(0x0501)
+DEFINE_GUIDSTRUCT("DFF21EE1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_PHONE_LINE);
+#define KSNODETYPE_PHONE_LINE DEFINE_GUIDNAMED(KSNODETYPE_PHONE_LINE)
+
+#define STATIC_KSNODETYPE_TELEPHONE					\
+	DEFINE_USB_TERMINAL_GUID(0x0502)
+DEFINE_GUIDSTRUCT("DFF21EE2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_TELEPHONE);
+#define KSNODETYPE_TELEPHONE DEFINE_GUIDNAMED(KSNODETYPE_TELEPHONE)
+
+#define STATIC_KSNODETYPE_DOWN_LINE_PHONE				\
+	DEFINE_USB_TERMINAL_GUID(0x0503)
+DEFINE_GUIDSTRUCT("DFF21EE3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DOWN_LINE_PHONE);
+#define KSNODETYPE_DOWN_LINE_PHONE DEFINE_GUIDNAMED(KSNODETYPE_DOWN_LINE_PHONE)
+
+#define STATIC_KSNODETYPE_ANALOG_CONNECTOR				\
+	DEFINE_USB_TERMINAL_GUID(0x601)
+DEFINE_GUIDSTRUCT("DFF21FE1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_ANALOG_CONNECTOR);
+#define KSNODETYPE_ANALOG_CONNECTOR DEFINE_GUIDNAMED(KSNODETYPE_ANALOG_CONNECTOR)
+
+#define STATIC_KSNODETYPE_DIGITAL_AUDIO_INTERFACE			\
+	DEFINE_USB_TERMINAL_GUID(0x0602)
+DEFINE_GUIDSTRUCT("DFF21FE2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DIGITAL_AUDIO_INTERFACE);
+#define KSNODETYPE_DIGITAL_AUDIO_INTERFACE DEFINE_GUIDNAMED(KSNODETYPE_DIGITAL_AUDIO_INTERFACE)
+
+#define STATIC_KSNODETYPE_LINE_CONNECTOR				\
+	DEFINE_USB_TERMINAL_GUID(0x0603)
+DEFINE_GUIDSTRUCT("DFF21FE3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_LINE_CONNECTOR);
+#define KSNODETYPE_LINE_CONNECTOR DEFINE_GUIDNAMED(KSNODETYPE_LINE_CONNECTOR)
+
+#define STATIC_KSNODETYPE_LEGACY_AUDIO_CONNECTOR			\
+	DEFINE_USB_TERMINAL_GUID(0x0604)
+DEFINE_GUIDSTRUCT("DFF21FE4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_LEGACY_AUDIO_CONNECTOR);
+#define KSNODETYPE_LEGACY_AUDIO_CONNECTOR DEFINE_GUIDNAMED(KSNODETYPE_LEGACY_AUDIO_CONNECTOR)
+
+#define STATIC_KSNODETYPE_SPDIF_INTERFACE				\
+	DEFINE_USB_TERMINAL_GUID(0x0605)
+DEFINE_GUIDSTRUCT("DFF21FE5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_SPDIF_INTERFACE);
+#define KSNODETYPE_SPDIF_INTERFACE DEFINE_GUIDNAMED(KSNODETYPE_SPDIF_INTERFACE)
+
+#define STATIC_KSNODETYPE_1394_DA_STREAM				\
+	DEFINE_USB_TERMINAL_GUID(0x0606)
+DEFINE_GUIDSTRUCT("DFF21FE6-F70F-11D0-B917-00A0C9223196",KSNODETYPE_1394_DA_STREAM);
+#define KSNODETYPE_1394_DA_STREAM DEFINE_GUIDNAMED(KSNODETYPE_1394_DA_STREAM)
+
+#define STATIC_KSNODETYPE_1394_DV_STREAM_SOUNDTRACK			\
+	DEFINE_USB_TERMINAL_GUID(0x0607)
+DEFINE_GUIDSTRUCT("DFF21FE7-F70F-11D0-B917-00A0C9223196",KSNODETYPE_1394_DV_STREAM_SOUNDTRACK);
+#define KSNODETYPE_1394_DV_STREAM_SOUNDTRACK DEFINE_GUIDNAMED(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK)
+
+#define STATIC_KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE		\
+	DEFINE_USB_TERMINAL_GUID(0x0701)
+DEFINE_GUIDSTRUCT("DFF220E1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE);
+#define KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE DEFINE_GUIDNAMED(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE)
+
+#define STATIC_KSNODETYPE_EQUALIZATION_NOISE				\
+	DEFINE_USB_TERMINAL_GUID(0x0702)
+DEFINE_GUIDSTRUCT("DFF220E2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_EQUALIZATION_NOISE);
+#define KSNODETYPE_EQUALIZATION_NOISE DEFINE_GUIDNAMED(KSNODETYPE_EQUALIZATION_NOISE)
+
+#define STATIC_KSNODETYPE_CD_PLAYER					\
+	DEFINE_USB_TERMINAL_GUID(0x0703)
+DEFINE_GUIDSTRUCT("DFF220E3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_CD_PLAYER);
+#define KSNODETYPE_CD_PLAYER DEFINE_GUIDNAMED(KSNODETYPE_CD_PLAYER)
+
+#define STATIC_KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE			\
+	DEFINE_USB_TERMINAL_GUID(0x0704)
+DEFINE_GUIDSTRUCT("DFF220E4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE);
+#define KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE DEFINE_GUIDNAMED(KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE)
+
+#define STATIC_KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE		\
+	DEFINE_USB_TERMINAL_GUID(0x0705)
+DEFINE_GUIDSTRUCT("DFF220E5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE);
+#define KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE DEFINE_GUIDNAMED(KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE)
+
+#define STATIC_KSNODETYPE_MINIDISK					\
+	DEFINE_USB_TERMINAL_GUID(0x0706)
+DEFINE_GUIDSTRUCT("DFF220E6-F70F-11D0-B917-00A0C9223196",KSNODETYPE_MINIDISK);
+#define KSNODETYPE_MINIDISK DEFINE_GUIDNAMED(KSNODETYPE_MINIDISK)
+
+#define STATIC_KSNODETYPE_ANALOG_TAPE					\
+	DEFINE_USB_TERMINAL_GUID(0x0707)
+DEFINE_GUIDSTRUCT("DFF220E7-F70F-11D0-B917-00A0C9223196",KSNODETYPE_ANALOG_TAPE);
+#define KSNODETYPE_ANALOG_TAPE DEFINE_GUIDNAMED(KSNODETYPE_ANALOG_TAPE)
+
+#define STATIC_KSNODETYPE_PHONOGRAPH					\
+	DEFINE_USB_TERMINAL_GUID(0x0708)
+DEFINE_GUIDSTRUCT("DFF220E8-F70F-11D0-B917-00A0C9223196",KSNODETYPE_PHONOGRAPH);
+#define KSNODETYPE_PHONOGRAPH DEFINE_GUIDNAMED(KSNODETYPE_PHONOGRAPH)
+
+#define STATIC_KSNODETYPE_VCR_AUDIO					\
+	DEFINE_USB_TERMINAL_GUID(0x0708)
+DEFINE_GUIDSTRUCT("DFF220E9-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VCR_AUDIO);
+#define KSNODETYPE_VCR_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_VCR_AUDIO)
+
+#define STATIC_KSNODETYPE_VIDEO_DISC_AUDIO				\
+	DEFINE_USB_TERMINAL_GUID(0x070A)
+DEFINE_GUIDSTRUCT("DFF220EA-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_DISC_AUDIO);
+#define KSNODETYPE_VIDEO_DISC_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_DISC_AUDIO)
+
+#define STATIC_KSNODETYPE_DVD_AUDIO					\
+	DEFINE_USB_TERMINAL_GUID(0x070B)
+DEFINE_GUIDSTRUCT("DFF220EB-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DVD_AUDIO);
+#define KSNODETYPE_DVD_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_DVD_AUDIO)
+
+#define STATIC_KSNODETYPE_TV_TUNER_AUDIO				\
+	DEFINE_USB_TERMINAL_GUID(0x070C)
+DEFINE_GUIDSTRUCT("DFF220EC-F70F-11D0-B917-00A0C9223196",KSNODETYPE_TV_TUNER_AUDIO);
+#define KSNODETYPE_TV_TUNER_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_TV_TUNER_AUDIO)
+
+#define STATIC_KSNODETYPE_SATELLITE_RECEIVER_AUDIO			\
+	DEFINE_USB_TERMINAL_GUID(0x070D)
+DEFINE_GUIDSTRUCT("DFF220ED-F70F-11D0-B917-00A0C9223196",KSNODETYPE_SATELLITE_RECEIVER_AUDIO);
+#define KSNODETYPE_SATELLITE_RECEIVER_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_SATELLITE_RECEIVER_AUDIO)
+
+#define STATIC_KSNODETYPE_CABLE_TUNER_AUDIO				\
+	DEFINE_USB_TERMINAL_GUID(0x070E)
+DEFINE_GUIDSTRUCT("DFF220EE-F70F-11D0-B917-00A0C9223196",KSNODETYPE_CABLE_TUNER_AUDIO);
+#define KSNODETYPE_CABLE_TUNER_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_CABLE_TUNER_AUDIO)
+
+#define STATIC_KSNODETYPE_DSS_AUDIO					\
+	DEFINE_USB_TERMINAL_GUID(0x070F)
+DEFINE_GUIDSTRUCT("DFF220EF-F70F-11D0-B917-00A0C9223196",KSNODETYPE_DSS_AUDIO);
+#define KSNODETYPE_DSS_AUDIO DEFINE_GUIDNAMED(KSNODETYPE_DSS_AUDIO)
+
+#define STATIC_KSNODETYPE_RADIO_RECEIVER				\
+	DEFINE_USB_TERMINAL_GUID(0x0710)
+DEFINE_GUIDSTRUCT("DFF220F0-F70F-11D0-B917-00A0C9223196",KSNODETYPE_RADIO_RECEIVER);
+#define KSNODETYPE_RADIO_RECEIVER DEFINE_GUIDNAMED(KSNODETYPE_RADIO_RECEIVER)
+
+#define STATIC_KSNODETYPE_RADIO_TRANSMITTER				\
+	DEFINE_USB_TERMINAL_GUID(0x0711)
+DEFINE_GUIDSTRUCT("DFF220F1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_RADIO_TRANSMITTER);
+#define KSNODETYPE_RADIO_TRANSMITTER DEFINE_GUIDNAMED(KSNODETYPE_RADIO_TRANSMITTER)
+
+#define STATIC_KSNODETYPE_MULTITRACK_RECORDER				\
+	DEFINE_USB_TERMINAL_GUID(0x0712)
+DEFINE_GUIDSTRUCT("DFF220F2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_MULTITRACK_RECORDER);
+#define KSNODETYPE_MULTITRACK_RECORDER DEFINE_GUIDNAMED(KSNODETYPE_MULTITRACK_RECORDER)
+
+#define STATIC_KSNODETYPE_SYNTHESIZER					\
+	DEFINE_USB_TERMINAL_GUID(0x0713)
+DEFINE_GUIDSTRUCT("DFF220F3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_SYNTHESIZER);
+#define KSNODETYPE_SYNTHESIZER DEFINE_GUIDNAMED(KSNODETYPE_SYNTHESIZER)
+
+#define STATIC_KSNODETYPE_SWSYNTH					\
+	0x423274A0L,0x8B81,0x11D1,0xA0,0x50,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("423274A0-8B81-11D1-A050-0000F8004788",KSNODETYPE_SWSYNTH);
+#define KSNODETYPE_SWSYNTH DEFINE_GUIDNAMED(KSNODETYPE_SWSYNTH)
+
+#define STATIC_KSNODETYPE_SWMIDI					\
+	0xCB9BEFA0L,0xA251,0x11D1,0xA0,0x50,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("CB9BEFA0-A251-11D1-A050-0000F8004788",KSNODETYPE_SWMIDI);
+#define KSNODETYPE_SWMIDI DEFINE_GUIDNAMED(KSNODETYPE_SWMIDI)
+
+#define STATIC_KSNODETYPE_DRM_DESCRAMBLE				\
+	0xFFBB6E3FL,0xCCFE,0x4D84,0x90,0xD9,0x42,0x14,0x18,0xB0,0x3A,0x8E
+DEFINE_GUIDSTRUCT("FFBB6E3F-CCFE-4D84-90D9-421418B03A8E",KSNODETYPE_DRM_DESCRAMBLE);
+#define KSNODETYPE_DRM_DESCRAMBLE DEFINE_GUIDNAMED(KSNODETYPE_DRM_DESCRAMBLE)
+
+#define STATIC_KSCATEGORY_AUDIO						\
+	0x6994AD04L,0x93EF,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("6994AD04-93EF-11D0-A3CC-00A0C9223196",KSCATEGORY_AUDIO);
+#define KSCATEGORY_AUDIO DEFINE_GUIDNAMED(KSCATEGORY_AUDIO)
+
+#define STATIC_KSCATEGORY_VIDEO						\
+	0x6994AD05L,0x93EF,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("6994AD05-93EF-11D0-A3CC-00A0C9223196",KSCATEGORY_VIDEO);
+#define KSCATEGORY_VIDEO DEFINE_GUIDNAMED(KSCATEGORY_VIDEO)
+
+#define STATIC_KSCATEGORY_TEXT						\
+	0x6994AD06L,0x93EF,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("6994AD06-93EF-11D0-A3CC-00A0C9223196",KSCATEGORY_TEXT);
+#define KSCATEGORY_TEXT DEFINE_GUIDNAMED(KSCATEGORY_TEXT)
+
+#define STATIC_KSCATEGORY_NETWORK					\
+	0x67C9CC3CL,0x69C4,0x11D2,0x87,0x59,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("67C9CC3C-69C4-11D2-8759-00A0C9223196",KSCATEGORY_NETWORK);
+#define KSCATEGORY_NETWORK DEFINE_GUIDNAMED(KSCATEGORY_NETWORK)
+
+#define STATIC_KSCATEGORY_TOPOLOGY					\
+	0xDDA54A40L,0x1E4C,0x11D1,0xA0,0x50,0x40,0x57,0x05,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("DDA54A40-1E4C-11D1-A050-405705C10000",KSCATEGORY_TOPOLOGY);
+#define KSCATEGORY_TOPOLOGY DEFINE_GUIDNAMED(KSCATEGORY_TOPOLOGY)
+
+#define STATIC_KSCATEGORY_VIRTUAL					\
+	0x3503EAC4L,0x1F26,0x11D1,0x8A,0xB0,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("3503EAC4-1F26-11D1-8AB0-00A0C9223196",KSCATEGORY_VIRTUAL);
+#define KSCATEGORY_VIRTUAL DEFINE_GUIDNAMED(KSCATEGORY_VIRTUAL)
+
+#define STATIC_KSCATEGORY_ACOUSTIC_ECHO_CANCEL				\
+	0xBF963D80L,0xC559,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("BF963D80-C559-11D0-8A2B-00A0C9255AC1",KSCATEGORY_ACOUSTIC_ECHO_CANCEL);
+#define KSCATEGORY_ACOUSTIC_ECHO_CANCEL DEFINE_GUIDNAMED(KSCATEGORY_ACOUSTIC_ECHO_CANCEL)
+
+#define STATIC_KSCATEGORY_SYSAUDIO					\
+	0xA7C7A5B1L,0x5AF3,0x11D1,0x9C,0xED,0x00,0xA0,0x24,0xBF,0x04,0x07
+DEFINE_GUIDSTRUCT("A7C7A5B1-5AF3-11D1-9CED-00A024BF0407",KSCATEGORY_SYSAUDIO);
+#define KSCATEGORY_SYSAUDIO DEFINE_GUIDNAMED(KSCATEGORY_SYSAUDIO)
+
+#define STATIC_KSCATEGORY_WDMAUD					\
+	0x3E227E76L,0x690D,0x11D2,0x81,0x61,0x00,0x00,0xF8,0x77,0x5B,0xF1
+DEFINE_GUIDSTRUCT("3E227E76-690D-11D2-8161-0000F8775BF1",KSCATEGORY_WDMAUD);
+#define KSCATEGORY_WDMAUD DEFINE_GUIDNAMED(KSCATEGORY_WDMAUD)
+
+#define STATIC_KSCATEGORY_AUDIO_GFX					\
+	0x9BAF9572L,0x340C,0x11D3,0xAB,0xDC,0x00,0xA0,0xC9,0x0A,0xB1,0x6F
+DEFINE_GUIDSTRUCT("9BAF9572-340C-11D3-ABDC-00A0C90AB16F",KSCATEGORY_AUDIO_GFX);
+#define KSCATEGORY_AUDIO_GFX DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_GFX)
+
+#define STATIC_KSCATEGORY_AUDIO_SPLITTER				\
+	0x9EA331FAL,0xB91B,0x45F8,0x92,0x85,0xBD,0x2B,0xC7,0x7A,0xFC,0xDE
+DEFINE_GUIDSTRUCT("9EA331FA-B91B-45F8-9285-BD2BC77AFCDE",KSCATEGORY_AUDIO_SPLITTER);
+#define KSCATEGORY_AUDIO_SPLITTER DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_SPLITTER)
+
+#define STATIC_KSCATEGORY_SYNTHESIZER		STATIC_KSNODETYPE_SYNTHESIZER
+#define KSCATEGORY_SYNTHESIZER			KSNODETYPE_SYNTHESIZER
+
+#define STATIC_KSCATEGORY_DRM_DESCRAMBLE	STATIC_KSNODETYPE_DRM_DESCRAMBLE
+#define KSCATEGORY_DRM_DESCRAMBLE		KSNODETYPE_DRM_DESCRAMBLE
+
+#define STATIC_KSCATEGORY_AUDIO_DEVICE					\
+	0xFBF6F530L,0x07B9,0x11D2,0xA7,0x1E,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("FBF6F530-07B9-11D2-A71E-0000F8004788",KSCATEGORY_AUDIO_DEVICE);
+#define KSCATEGORY_AUDIO_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_DEVICE)
+
+#define STATIC_KSCATEGORY_PREFERRED_WAVEOUT_DEVICE			\
+	0xD6C5066EL,0x72C1,0x11D2,0x97,0x55,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("D6C5066E-72C1-11D2-9755-0000F8004788",KSCATEGORY_PREFERRED_WAVEOUT_DEVICE);
+#define KSCATEGORY_PREFERRED_WAVEOUT_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE)
+
+#define STATIC_KSCATEGORY_PREFERRED_WAVEIN_DEVICE			\
+	0xD6C50671L,0x72C1,0x11D2,0x97,0x55,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("D6C50671-72C1-11D2-9755-0000F8004788",KSCATEGORY_PREFERRED_WAVEIN_DEVICE);
+#define KSCATEGORY_PREFERRED_WAVEIN_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_WAVEIN_DEVICE)
+
+#define STATIC_KSCATEGORY_PREFERRED_MIDIOUT_DEVICE			\
+	0xD6C50674L,0x72C1,0x11D2,0x97,0x55,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("D6C50674-72C1-11D2-9755-0000F8004788",KSCATEGORY_PREFERRED_MIDIOUT_DEVICE);
+#define KSCATEGORY_PREFERRED_MIDIOUT_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE)
+
+#define STATIC_KSCATEGORY_WDMAUD_USE_PIN_NAME				\
+	0x47A4FA20L,0xA251,0x11D1,0xA0,0x50,0x00,0x00,0xF8,0x00,0x47,0x88
+DEFINE_GUIDSTRUCT("47A4FA20-A251-11D1-A050-0000F8004788",KSCATEGORY_WDMAUD_USE_PIN_NAME);
+#define KSCATEGORY_WDMAUD_USE_PIN_NAME DEFINE_GUIDNAMED(KSCATEGORY_WDMAUD_USE_PIN_NAME)
+
+#define STATIC_KSCATEGORY_ESCALANTE_PLATFORM_DRIVER			\
+	0x74f3aea8L,0x9768,0x11d1,0x8e,0x07,0x00,0xa0,0xc9,0x5e,0xc2,0x2e
+DEFINE_GUIDSTRUCT("74f3aea8-9768-11d1-8e07-00a0c95ec22e",KSCATEGORY_ESCALANTE_PLATFORM_DRIVER);
+#define KSCATEGORY_ESCALANTE_PLATFORM_DRIVER DEFINE_GUIDNAMED(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER)
+
+#define STATIC_KSDATAFORMAT_TYPE_VIDEO					\
+	0x73646976L,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+DEFINE_GUIDSTRUCT("73646976-0000-0010-8000-00aa00389b71",KSDATAFORMAT_TYPE_VIDEO);
+#define KSDATAFORMAT_TYPE_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_VIDEO)
+
+#define STATIC_KSDATAFORMAT_TYPE_AUDIO					\
+	0x73647561L,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+DEFINE_GUIDSTRUCT("73647561-0000-0010-8000-00aa00389b71",KSDATAFORMAT_TYPE_AUDIO);
+#define KSDATAFORMAT_TYPE_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUDIO)
+
+#define STATIC_KSDATAFORMAT_TYPE_TEXT					\
+	0x73747874L,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+DEFINE_GUIDSTRUCT("73747874-0000-0010-8000-00aa00389b71",KSDATAFORMAT_TYPE_TEXT);
+#define KSDATAFORMAT_TYPE_TEXT DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_TEXT)
+
+#if !defined(DEFINE_WAVEFORMATEX_GUID)
+#define DEFINE_WAVEFORMATEX_GUID(x)					\
+	(USHORT)(x),0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+#endif
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX			\
+	0x00000000L,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+DEFINE_GUIDSTRUCT("00000000-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_WAVEFORMATEX);
+#define KSDATAFORMAT_SUBTYPE_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX)
+
+#define INIT_WAVEFORMATEX_GUID(Guid,x)					\
+{									\
+	*(Guid) = KSDATAFORMAT_SUBTYPE_WAVEFORMATEX;			\
+	(Guid)->Data1 = (USHORT)(x);					\
+}
+
+#define EXTRACT_WAVEFORMATEX_ID(Guid)					\
+	(USHORT)((Guid)->Data1)
+
+#define IS_VALID_WAVEFORMATEX_GUID(Guid)				\
+	(!memcmp(((PUSHORT)&KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) + 1, ((PUSHORT)(Guid)) + 1,sizeof(GUID) - sizeof(USHORT)))
+
+#ifndef INIT_MMREG_MID
+#define INIT_MMREG_MID(guid,id)						\
+{									\
+	(guid)->Data1 = 0xd5a47fa7 + (USHORT)(id);			\
+	(guid)->Data2 = 0x6d98;						\
+	(guid)->Data3 = 0x11d1;						\
+	(guid)->Data4[0] = 0xa2;					\
+	(guid)->Data4[1] = 0x1a;					\
+	(guid)->Data4[2] = 0x00;					\
+	(guid)->Data4[3] = 0xa0;					\
+	(guid)->Data4[4] = 0xc9;					\
+	(guid)->Data4[5] = 0x22;					\
+	(guid)->Data4[6] = 0x31;					\
+	(guid)->Data4[7] = 0x96;					\
+}
+#define EXTRACT_MMREG_MID(guid)						\
+	(USHORT)((guid)->Data1 - 0xd5a47fa7)
+#define DEFINE_MMREG_MID_GUID(id)					\
+	0xd5a47fa7+(USHORT)(id),0x6d98,0x11d1,0xa2,0x1a,0x00,0xa0,0xc9,0x22,0x31,0x96
+
+#define IS_COMPATIBLE_MMREG_MID(guid)					\
+	(((guid)->Data1 >= 0xd5a47fa7) &&				\
+	 ((guid)->Data1 < 0xd5a47fa7 + 0xffff) &&			\
+	 ((guid)->Data2 == 0x6d98) &&					\
+	 ((guid)->Data3 == 0x11d1) &&					\
+	 ((guid)->Data4[0] == 0xa2) &&					\
+	 ((guid)->Data4[1] == 0x1a) &&					\
+	 ((guid)->Data4[2] == 0x00) &&					\
+	 ((guid)->Data4[3] == 0xa0) &&					\
+	 ((guid)->Data4[4] == 0xc9) &&					\
+	 ((guid)->Data4[5] == 0x22) &&					\
+	 ((guid)->Data4[6] == 0x31) &&					\
+	 ((guid)->Data4[7] == 0x96) )
+#endif /* INIT_MMREG_MID */
+
+#ifndef INIT_MMREG_PID
+#define INIT_MMREG_PID(guid,id)						\
+{									\
+	(guid)->Data1 = 0xe36dc2ac + (USHORT)(id);			\
+	(guid)->Data2 = 0x6d9a;						\
+	(guid)->Data3 = 0x11d1;						\
+	(guid)->Data4[0] = 0xa2;					\
+	(guid)->Data4[1] = 0x1a;					\
+	(guid)->Data4[2] = 0x00;					\
+	(guid)->Data4[3] = 0xa0;					\
+	(guid)->Data4[4] = 0xc9;					\
+	(guid)->Data4[5] = 0x22;					\
+	(guid)->Data4[6] = 0x31;					\
+	(guid)->Data4[7] = 0x96;					\
+}
+#define EXTRACT_MMREG_PID(guid)						\
+	(USHORT)((guid)->Data1 - 0xe36dc2ac)
+#define DEFINE_MMREG_PID_GUID(id)					\
+	0xe36dc2ac+(USHORT)(id),0x6d9a,0x11d1,0xa2,0x1a,0x00,0xa0,0xc9,0x22,0x31,0x96
+
+#define IS_COMPATIBLE_MMREG_PID(guid)					\
+	(((guid)->Data1 >= 0xe36dc2ac) &&				\
+	 ((guid)->Data1 < 0xe36dc2ac + 0xffff) &&			\
+	 ((guid)->Data2 == 0x6d9a) &&					\
+	 ((guid)->Data3 == 0x11d1) &&					\
+	 ((guid)->Data4[0] == 0xa2) &&					\
+	 ((guid)->Data4[1] == 0x1a) &&					\
+	 ((guid)->Data4[2] == 0x00) &&					\
+	 ((guid)->Data4[3] == 0xa0) &&					\
+	 ((guid)->Data4[4] == 0xc9) &&					\
+	 ((guid)->Data4[5] == 0x22) &&					\
+	 ((guid)->Data4[6] == 0x31) &&					\
+	 ((guid)->Data4[7] == 0x96) )
+#endif /* INIT_MMREG_PID */
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_ANALOG				\
+	0x6dba3190L,0x67bd,0x11cf,0xa0,0xf7,0x00,0x20,0xaf,0xd1,0x56,0xe4
+DEFINE_GUIDSTRUCT("6dba3190-67bd-11cf-a0f7-0020afd156e4",KSDATAFORMAT_SUBTYPE_ANALOG);
+#define KSDATAFORMAT_SUBTYPE_ANALOG DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ANALOG)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_PCM					\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_PCM)
+DEFINE_GUIDSTRUCT("00000001-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_PCM);
+#define KSDATAFORMAT_SUBTYPE_PCM DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_PCM)
+
+#ifdef _INC_MMREG
+#define STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT				\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_IEEE_FLOAT)
+DEFINE_GUIDSTRUCT("00000003-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_IEEE_FLOAT);
+#define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_DRM					\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_DRM)
+DEFINE_GUIDSTRUCT("00000009-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_DRM);
+#define KSDATAFORMAT_SUBTYPE_DRM DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DRM)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_ALAW				\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_ALAW)
+DEFINE_GUIDSTRUCT("00000006-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_ALAW);
+#define KSDATAFORMAT_SUBTYPE_ALAW DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ALAW)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MULAW				\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_MULAW)
+DEFINE_GUIDSTRUCT("00000007-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_MULAW);
+#define KSDATAFORMAT_SUBTYPE_MULAW DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MULAW)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_ADPCM				\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_ADPCM)
+DEFINE_GUIDSTRUCT("00000002-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_ADPCM);
+#define KSDATAFORMAT_SUBTYPE_ADPCM DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ADPCM)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG				\
+	DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_MPEG)
+DEFINE_GUIDSTRUCT("00000050-0000-0010-8000-00aa00389b71",KSDATAFORMAT_SUBTYPE_MPEG);
+#define KSDATAFORMAT_SUBTYPE_MPEG DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG)
+#endif /* _INC_MMREG */
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_VC_ID				\
+	0xAD98D184L,0xAAC3,0x11D0,0xA4,0x1C,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("AD98D184-AAC3-11D0-A41C-00A0C9223196",KSDATAFORMAT_SPECIFIER_VC_ID);
+#define KSDATAFORMAT_SPECIFIER_VC_ID DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_VC_ID)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_WAVEFORMATEX			\
+	0x05589f81L,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a
+DEFINE_GUIDSTRUCT("05589f81-c356-11ce-bf01-00aa0055595a",KSDATAFORMAT_SPECIFIER_WAVEFORMATEX);
+#define KSDATAFORMAT_SPECIFIER_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DSOUND				\
+	0x518590a2L,0xa184,0x11d0,0x85,0x22,0x00,0xc0,0x4f,0xd9,0xba,0xf3
+DEFINE_GUIDSTRUCT("518590a2-a184-11d0-8522-00c04fd9baf3",KSDATAFORMAT_SPECIFIER_DSOUND);
+#define KSDATAFORMAT_SPECIFIER_DSOUND DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DSOUND)
+
+#if defined(_INC_MMSYSTEM) || defined(_INC_MMREG)
+#if !defined(PACK_PRAGMAS_NOT_SUPPORTED)
+#include <pshpack1.h>
+#endif
+typedef struct {
+  KSDATAFORMAT DataFormat;
+  WAVEFORMATEX WaveFormatEx;
+} KSDATAFORMAT_WAVEFORMATEX,*PKSDATAFORMAT_WAVEFORMATEX;
+
+#ifndef _WAVEFORMATEXTENSIBLE_
+#define _WAVEFORMATEXTENSIBLE_
+typedef struct {
+  WAVEFORMATEX Format;
+  union {
+    WORD wValidBitsPerSample;
+    WORD wSamplesPerBlock;
+    WORD wReserved;
+  } Samples;
+  DWORD dwChannelMask;
+
+  GUID SubFormat;
+} WAVEFORMATEXTENSIBLE,*PWAVEFORMATEXTENSIBLE;
+#endif /* _WAVEFORMATEXTENSIBLE_ */
+
+#if !defined(WAVE_FORMAT_EXTENSIBLE)
+#define WAVE_FORMAT_EXTENSIBLE			0xFFFE
+#endif
+
+typedef struct {
+  ULONG Flags;
+  ULONG Control;
+  WAVEFORMATEX WaveFormatEx;
+} KSDSOUND_BUFFERDESC,*PKSDSOUND_BUFFERDESC;
+
+typedef struct {
+  KSDATAFORMAT DataFormat;
+  KSDSOUND_BUFFERDESC BufferDesc;
+} KSDATAFORMAT_DSOUND,*PKSDATAFORMAT_DSOUND;
+
+#if !defined(PACK_PRAGMAS_NOT_SUPPORTED)
+#include <poppack.h>
+#endif
+#endif /* defined(_INC_MMSYSTEM) || defined(_INC_MMREG) */
+
+#define KSDSOUND_BUFFER_PRIMARY			0x00000001
+#define KSDSOUND_BUFFER_STATIC			0x00000002
+#define KSDSOUND_BUFFER_LOCHARDWARE		0x00000004
+#define KSDSOUND_BUFFER_LOCSOFTWARE		0x00000008
+
+#define KSDSOUND_BUFFER_CTRL_3D			0x00000001
+#define KSDSOUND_BUFFER_CTRL_FREQUENCY		0x00000002
+#define KSDSOUND_BUFFER_CTRL_PAN		0x00000004
+#define KSDSOUND_BUFFER_CTRL_VOLUME		0x00000008
+#define KSDSOUND_BUFFER_CTRL_POSITIONNOTIFY	0x00000010
+
+typedef struct {
+  DWORDLONG PlayOffset;
+  DWORDLONG WriteOffset;
+} KSAUDIO_POSITION,*PKSAUDIO_POSITION;
+
+typedef struct _DS3DVECTOR {
+  __MINGW_EXTENSION union {
+    FLOAT x;
+    FLOAT dvX;
+  };
+  __MINGW_EXTENSION union {
+    FLOAT y;
+    FLOAT dvY;
+  };
+  __MINGW_EXTENSION union {
+    FLOAT z;
+    FLOAT dvZ;
+  };
+} DS3DVECTOR,*PDS3DVECTOR;
+
+#define STATIC_KSPROPSETID_DirectSound3DListener			\
+	0x437b3414L,0xd060,0x11d0,0x85,0x83,0x00,0xc0,0x4f,0xd9,0xba,0xf3
+DEFINE_GUIDSTRUCT("437b3414-d060-11d0-8583-00c04fd9baf3",KSPROPSETID_DirectSound3DListener);
+#define KSPROPSETID_DirectSound3DListener DEFINE_GUIDNAMED(KSPROPSETID_DirectSound3DListener)
+
+typedef enum {
+  KSPROPERTY_DIRECTSOUND3DLISTENER_ALL,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_POSITION,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_VELOCITY,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_ORIENTATION,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_DISTANCEFACTOR,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_ROLLOFFFACTOR,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_DOPPLERFACTOR,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_BATCH,
+  KSPROPERTY_DIRECTSOUND3DLISTENER_ALLOCATION
+} KSPROPERTY_DIRECTSOUND3DLISTENER;
+
+typedef struct {
+  DS3DVECTOR Position;
+  DS3DVECTOR Velocity;
+  DS3DVECTOR OrientFront;
+  DS3DVECTOR OrientTop;
+  FLOAT DistanceFactor;
+  FLOAT RolloffFactor;
+  FLOAT DopplerFactor;
+} KSDS3D_LISTENER_ALL,*PKSDS3D_LISTENER_ALL;
+
+typedef struct {
+  DS3DVECTOR Front;
+  DS3DVECTOR Top;
+} KSDS3D_LISTENER_ORIENTATION,*PKSDS3D_LISTENER_ORIENTATION;
+
+#define STATIC_KSPROPSETID_DirectSound3DBuffer				\
+	0x437b3411L,0xd060,0x11d0,0x85,0x83,0x00,0xc0,0x4f,0xd9,0xba,0xf3
+DEFINE_GUIDSTRUCT("437b3411-d060-11d0-8583-00c04fd9baf3",KSPROPSETID_DirectSound3DBuffer);
+#define KSPROPSETID_DirectSound3DBuffer DEFINE_GUIDNAMED(KSPROPSETID_DirectSound3DBuffer)
+
+typedef enum {
+  KSPROPERTY_DIRECTSOUND3DBUFFER_ALL,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_POSITION,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_VELOCITY,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_CONEANGLES,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_CONEORIENTATION,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_CONEOUTSIDEVOLUME,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_MINDISTANCE,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_MAXDISTANCE,
+  KSPROPERTY_DIRECTSOUND3DBUFFER_MODE
+} KSPROPERTY_DIRECTSOUND3DBUFFER;
+
+typedef struct {
+  DS3DVECTOR Position;
+  DS3DVECTOR Velocity;
+  ULONG InsideConeAngle;
+  ULONG OutsideConeAngle;
+  DS3DVECTOR ConeOrientation;
+  LONG ConeOutsideVolume;
+  FLOAT MinDistance;
+  FLOAT MaxDistance;
+  ULONG Mode;
+} KSDS3D_BUFFER_ALL,*PKSDS3D_BUFFER_ALL;
+
+typedef struct {
+  ULONG InsideConeAngle;
+  ULONG OutsideConeAngle;
+} KSDS3D_BUFFER_CONE_ANGLES,*PKSDS3D_BUFFER_CONE_ANGLES;
+
+#define KSAUDIO_STEREO_SPEAKER_GEOMETRY_HEADPHONE	(-1)
+#define KSAUDIO_STEREO_SPEAKER_GEOMETRY_MIN		5
+#define KSAUDIO_STEREO_SPEAKER_GEOMETRY_NARROW		10
+#define KSAUDIO_STEREO_SPEAKER_GEOMETRY_WIDE		20
+#define KSAUDIO_STEREO_SPEAKER_GEOMETRY_MAX		180
+
+#define KSDSOUND_3D_MODE_NORMAL			0x00000000
+#define KSDSOUND_3D_MODE_HEADRELATIVE		0x00000001
+#define KSDSOUND_3D_MODE_DISABLE		0x00000002
+
+#define KSDSOUND_BUFFER_CTRL_HRTF_3D		0x40000000
+
+typedef struct {
+  ULONG Size;
+  ULONG Enabled;
+  WINBOOL SwapChannels;
+  WINBOOL ZeroAzimuth;
+  WINBOOL CrossFadeOutput;
+  ULONG FilterSize;
+} KSDS3D_HRTF_PARAMS_MSG,*PKSDS3D_HRTF_PARAMS_MSG;
+
+typedef enum {
+  FULL_FILTER,
+  LIGHT_FILTER,
+  KSDS3D_FILTER_QUALITY_COUNT
+} KSDS3D_HRTF_FILTER_QUALITY;
+
+typedef struct {
+  ULONG Size;
+  KSDS3D_HRTF_FILTER_QUALITY Quality;
+  FLOAT SampleRate;
+  ULONG MaxFilterSize;
+  ULONG FilterTransientMuteLength;
+  ULONG FilterOverlapBufferLength;
+  ULONG OutputOverlapBufferLength;
+  ULONG Reserved;
+} KSDS3D_HRTF_INIT_MSG,*PKSDS3D_HRTF_INIT_MSG;
+
+typedef enum {
+  FLOAT_COEFF,
+  SHORT_COEFF,
+  KSDS3D_COEFF_COUNT
+} KSDS3D_HRTF_COEFF_FORMAT;
+
+typedef enum {
+  DIRECT_FORM,
+  CASCADE_FORM,
+  KSDS3D_FILTER_METHOD_COUNT
+} KSDS3D_HRTF_FILTER_METHOD;
+
+typedef enum {
+  DS3D_HRTF_VERSION_1
+} KSDS3D_HRTF_FILTER_VERSION;
+
+typedef struct {
+  KSDS3D_HRTF_FILTER_METHOD FilterMethod;
+  KSDS3D_HRTF_COEFF_FORMAT CoeffFormat;
+  KSDS3D_HRTF_FILTER_VERSION Version;
+  ULONG Reserved;
+} KSDS3D_HRTF_FILTER_FORMAT_MSG,*PKSDS3D_HRTF_FILTER_FORMAT_MSG;
+
+#define STATIC_KSPROPSETID_Hrtf3d					\
+	0xb66decb0L,0xa083,0x11d0,0x85,0x1e,0x00,0xc0,0x4f,0xd9,0xba,0xf3
+DEFINE_GUIDSTRUCT("b66decb0-a083-11d0-851e-00c04fd9baf3",KSPROPSETID_Hrtf3d);
+#define KSPROPSETID_Hrtf3d DEFINE_GUIDNAMED(KSPROPSETID_Hrtf3d)
+
+typedef enum {
+  KSPROPERTY_HRTF3D_PARAMS = 0,
+  KSPROPERTY_HRTF3D_INITIALIZE,
+  KSPROPERTY_HRTF3D_FILTER_FORMAT
+} KSPROPERTY_HRTF3D;
+
+typedef struct {
+  LONG Channel;
+  FLOAT VolSmoothScale;
+  FLOAT TotalDryAttenuation;
+  FLOAT TotalWetAttenuation;
+  LONG SmoothFrequency;
+  LONG Delay;
+} KSDS3D_ITD_PARAMS,*PKSDS3D_ITD_PARAMS;
+
+typedef struct {
+  ULONG Enabled;
+  KSDS3D_ITD_PARAMS LeftParams;
+  KSDS3D_ITD_PARAMS RightParams;
+  ULONG Reserved;
+} KSDS3D_ITD_PARAMS_MSG,*PKSDS3D_ITD_PARAMS_MSG;
+
+#define STATIC_KSPROPSETID_Itd3d					\
+	0x6429f090L,0x9fd9,0x11d0,0xa7,0x5b,0x00,0xa0,0xc9,0x03,0x65,0xe3
+DEFINE_GUIDSTRUCT("6429f090-9fd9-11d0-a75b-00a0c90365e3",KSPROPSETID_Itd3d);
+#define KSPROPSETID_Itd3d DEFINE_GUIDNAMED(KSPROPSETID_Itd3d)
+
+typedef enum {
+  KSPROPERTY_ITD3D_PARAMS = 0
+} KSPROPERTY_ITD3D;
+
+typedef struct {
+  KSDATARANGE DataRange;
+  ULONG MaximumChannels;
+  ULONG MinimumBitsPerSample;
+  ULONG MaximumBitsPerSample;
+  ULONG MinimumSampleFrequency;
+  ULONG MaximumSampleFrequency;
+} KSDATARANGE_AUDIO,*PKSDATARANGE_AUDIO;
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_RIFF				\
+	0x4995DAEEL,0x9EE6,0x11D0,0xA4,0x0E,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("4995DAEE-9EE6-11D0-A40E-00A0C9223196",KSDATAFORMAT_SUBTYPE_RIFF);
+#define KSDATAFORMAT_SUBTYPE_RIFF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_RIFF)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_RIFFWAVE				\
+	0xe436eb8bL,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70
+DEFINE_GUIDSTRUCT("e436eb8b-524f-11ce-9f53-0020af0ba770",KSDATAFORMAT_SUBTYPE_RIFFWAVE);
+#define KSDATAFORMAT_SUBTYPE_RIFFWAVE DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_RIFFWAVE)
+
+#define STATIC_KSPROPSETID_Bibliographic				\
+	0x07BA150EL,0xE2B1,0x11D0,0xAC,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("07BA150E-E2B1-11D0-AC17-00A0C9223196",KSPROPSETID_Bibliographic);
+#define KSPROPSETID_Bibliographic DEFINE_GUIDNAMED(KSPROPSETID_Bibliographic)
+
+typedef enum {
+  KSPROPERTY_BIBLIOGRAPHIC_LEADER = 'RDL ',
+  KSPROPERTY_BIBLIOGRAPHIC_LCCN = '010 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ISBN = '020 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ISSN = '220 ',
+  KSPROPERTY_BIBLIOGRAPHIC_CATALOGINGSOURCE = '040 ',
+  KSPROPERTY_BIBLIOGRAPHIC_MAINPERSONALNAME = '001 ',
+  KSPROPERTY_BIBLIOGRAPHIC_MAINCORPORATEBODY = '011 ',
+  KSPROPERTY_BIBLIOGRAPHIC_MAINMEETINGNAME = '111 ',
+  KSPROPERTY_BIBLIOGRAPHIC_MAINUNIFORMTITLE = '031 ',
+  KSPROPERTY_BIBLIOGRAPHIC_UNIFORMTITLE = '042 ',
+  KSPROPERTY_BIBLIOGRAPHIC_TITLESTATEMENT = '542 ',
+  KSPROPERTY_BIBLIOGRAPHIC_VARYINGFORMTITLE = '642 ',
+  KSPROPERTY_BIBLIOGRAPHIC_PUBLICATION = '062 ',
+  KSPROPERTY_BIBLIOGRAPHIC_PHYSICALDESCRIPTION = '003 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYTITLE = '044 ',
+  KSPROPERTY_BIBLIOGRAPHIC_SERIESSTATEMENT = '094 ',
+  KSPROPERTY_BIBLIOGRAPHIC_GENERALNOTE = '005 ',
+  KSPROPERTY_BIBLIOGRAPHIC_BIBLIOGRAPHYNOTE = '405 ',
+  KSPROPERTY_BIBLIOGRAPHIC_CONTENTSNOTE = '505 ',
+  KSPROPERTY_BIBLIOGRAPHIC_CREATIONCREDIT = '805 ',
+  KSPROPERTY_BIBLIOGRAPHIC_CITATION = '015 ',
+  KSPROPERTY_BIBLIOGRAPHIC_PARTICIPANT = '115 ',
+  KSPROPERTY_BIBLIOGRAPHIC_SUMMARY = '025 ',
+  KSPROPERTY_BIBLIOGRAPHIC_TARGETAUDIENCE = '125 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDFORMAVAILABLE = '035 ',
+  KSPROPERTY_BIBLIOGRAPHIC_SYSTEMDETAILS = '835 ',
+  KSPROPERTY_BIBLIOGRAPHIC_AWARDS = '685 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYPERSONALNAME = '006 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYTOPICALTERM = '056 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYGEOGRAPHIC = '156 ',
+  KSPROPERTY_BIBLIOGRAPHIC_INDEXTERMGENRE = '556 ',
+  KSPROPERTY_BIBLIOGRAPHIC_INDEXTERMCURRICULUM = '856 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYUNIFORMTITLE = '037 ',
+  KSPROPERTY_BIBLIOGRAPHIC_ADDEDENTRYRELATED = '047 ',
+  KSPROPERTY_BIBLIOGRAPHIC_SERIESSTATEMENTPERSONALNAME = '008 ',
+  KSPROPERTY_BIBLIOGRAPHIC_SERIESSTATEMENTUNIFORMTITLE = '038 '
+} KSPROPERTY_BIBLIOGRAPHIC;
+
+#define STATIC_KSPROPSETID_TopologyNode					\
+	0x45FFAAA1L,0x6E1B,0x11D0,0xBC,0xF2,0x44,0x45,0x53,0x54,0x00,0x00
+DEFINE_GUIDSTRUCT("45FFAAA1-6E1B-11D0-BCF2-444553540000",KSPROPSETID_TopologyNode);
+#define KSPROPSETID_TopologyNode DEFINE_GUIDNAMED(KSPROPSETID_TopologyNode)
+
+typedef enum {
+  KSPROPERTY_TOPOLOGYNODE_ENABLE = 1,
+  KSPROPERTY_TOPOLOGYNODE_RESET
+} KSPROPERTY_TOPOLOGYNODE;
+
+#define STATIC_KSPROPSETID_RtAudio					\
+	0xa855a48c,0x2f78,0x4729,0x90,0x51,0x19,0x68,0x74,0x6b,0x9e,0xef
+DEFINE_GUIDSTRUCT("A855A48C-2F78-4729-9051-1968746B9EEF",KSPROPSETID_RtAudio);
+#define KSPROPSETID_RtAudio DEFINE_GUIDNAMED(KSPROPSETID_RtAudio)
+
+typedef enum {
+  KSPROPERTY_RTAUDIO_GETPOSITIONFUNCTION
+} KSPROPERTY_RTAUDIO;
+
+#define STATIC_KSPROPSETID_DrmAudioStream				\
+	0x2f2c8ddd,0x4198,0x4fac,0xba,0x29,0x61,0xbb,0x5,0xb7,0xde,0x6
+DEFINE_GUIDSTRUCT("2F2C8DDD-4198-4fac-BA29-61BB05B7DE06",KSPROPSETID_DrmAudioStream);
+#define KSPROPSETID_DrmAudioStream DEFINE_GUIDNAMED(KSPROPSETID_DrmAudioStream)
+
+typedef enum {
+  KSPROPERTY_DRMAUDIOSTREAM_CONTENTID
+} KSPROPERTY_DRMAUDIOSTREAM;
+
+#define STATIC_KSPROPSETID_Audio					\
+	0x45FFAAA0L,0x6E1B,0x11D0,0xBC,0xF2,0x44,0x45,0x53,0x54,0x00,0x00
+DEFINE_GUIDSTRUCT("45FFAAA0-6E1B-11D0-BCF2-444553540000",KSPROPSETID_Audio);
+#define KSPROPSETID_Audio DEFINE_GUIDNAMED(KSPROPSETID_Audio)
+
+typedef enum {
+  KSPROPERTY_AUDIO_LATENCY = 1,
+  KSPROPERTY_AUDIO_COPY_PROTECTION,
+  KSPROPERTY_AUDIO_CHANNEL_CONFIG,
+  KSPROPERTY_AUDIO_VOLUMELEVEL,
+  KSPROPERTY_AUDIO_POSITION,
+  KSPROPERTY_AUDIO_DYNAMIC_RANGE,
+  KSPROPERTY_AUDIO_QUALITY,
+  KSPROPERTY_AUDIO_SAMPLING_RATE,
+  KSPROPERTY_AUDIO_DYNAMIC_SAMPLING_RATE,
+  KSPROPERTY_AUDIO_MIX_LEVEL_TABLE,
+  KSPROPERTY_AUDIO_MIX_LEVEL_CAPS,
+  KSPROPERTY_AUDIO_MUX_SOURCE,
+  KSPROPERTY_AUDIO_MUTE,
+  KSPROPERTY_AUDIO_BASS,
+  KSPROPERTY_AUDIO_MID,
+  KSPROPERTY_AUDIO_TREBLE,
+  KSPROPERTY_AUDIO_BASS_BOOST,
+  KSPROPERTY_AUDIO_EQ_LEVEL,
+  KSPROPERTY_AUDIO_NUM_EQ_BANDS,
+  KSPROPERTY_AUDIO_EQ_BANDS,
+  KSPROPERTY_AUDIO_AGC,
+  KSPROPERTY_AUDIO_DELAY,
+  KSPROPERTY_AUDIO_LOUDNESS,
+  KSPROPERTY_AUDIO_WIDE_MODE,
+  KSPROPERTY_AUDIO_WIDENESS,
+  KSPROPERTY_AUDIO_REVERB_LEVEL,
+  KSPROPERTY_AUDIO_CHORUS_LEVEL,
+  KSPROPERTY_AUDIO_DEV_SPECIFIC,
+  KSPROPERTY_AUDIO_DEMUX_DEST,
+  KSPROPERTY_AUDIO_STEREO_ENHANCE,
+  KSPROPERTY_AUDIO_MANUFACTURE_GUID,
+  KSPROPERTY_AUDIO_PRODUCT_GUID,
+  KSPROPERTY_AUDIO_CPU_RESOURCES,
+  KSPROPERTY_AUDIO_STEREO_SPEAKER_GEOMETRY,
+  KSPROPERTY_AUDIO_SURROUND_ENCODE,
+  KSPROPERTY_AUDIO_3D_INTERFACE,
+  KSPROPERTY_AUDIO_PEAKMETER,
+  KSPROPERTY_AUDIO_ALGORITHM_INSTANCE,
+  KSPROPERTY_AUDIO_FILTER_STATE,
+  KSPROPERTY_AUDIO_PREFERRED_STATUS
+} KSPROPERTY_AUDIO;
+
+#define KSAUDIO_QUALITY_WORST			0x0
+#define KSAUDIO_QUALITY_PC			0x1
+#define KSAUDIO_QUALITY_BASIC			0x2
+#define KSAUDIO_QUALITY_ADVANCED		0x3
+
+#define KSAUDIO_CPU_RESOURCES_NOT_HOST_CPU	0x00000000
+#define KSAUDIO_CPU_RESOURCES_HOST_CPU		0x7FFFFFFF
+
+typedef struct {
+  WINBOOL fCopyrighted;
+  WINBOOL fOriginal;
+} KSAUDIO_COPY_PROTECTION,*PKSAUDIO_COPY_PROTECTION;
+
+typedef struct {
+  LONG ActiveSpeakerPositions;
+} KSAUDIO_CHANNEL_CONFIG,*PKSAUDIO_CHANNEL_CONFIG;
+
+#define SPEAKER_FRONT_LEFT		0x1
+#define SPEAKER_FRONT_RIGHT		0x2
+#define SPEAKER_FRONT_CENTER		0x4
+#define SPEAKER_LOW_FREQUENCY		0x8
+#define SPEAKER_BACK_LEFT		0x10
+#define SPEAKER_BACK_RIGHT		0x20
+#define SPEAKER_FRONT_LEFT_OF_CENTER	0x40
+#define SPEAKER_FRONT_RIGHT_OF_CENTER	0x80
+#define SPEAKER_BACK_CENTER		0x100
+#define SPEAKER_SIDE_LEFT		0x200
+#define SPEAKER_SIDE_RIGHT		0x400
+#define SPEAKER_TOP_CENTER		0x800
+#define SPEAKER_TOP_FRONT_LEFT		0x1000
+#define SPEAKER_TOP_FRONT_CENTER	0x2000
+#define SPEAKER_TOP_FRONT_RIGHT		0x4000
+#define SPEAKER_TOP_BACK_LEFT		0x8000
+#define SPEAKER_TOP_BACK_CENTER		0x10000
+#define SPEAKER_TOP_BACK_RIGHT		0x20000
+
+#define SPEAKER_RESERVED		0x7FFC0000
+
+#define SPEAKER_ALL			0x80000000
+
+#define KSAUDIO_SPEAKER_DIRECTOUT	0
+#define KSAUDIO_SPEAKER_MONO		(SPEAKER_FRONT_CENTER)
+#define KSAUDIO_SPEAKER_STEREO		(SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT)
+#define KSAUDIO_SPEAKER_QUAD		(SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					 SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
+#define KSAUDIO_SPEAKER_SURROUND	(SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					 SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER)
+#define KSAUDIO_SPEAKER_5POINT1		(SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					 SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY |		\
+					 SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
+#define KSAUDIO_SPEAKER_7POINT1		(SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					 SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY |		\
+					 SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT |		\
+					 SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER)
+#define KSAUDIO_SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					  SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY |	\
+					  SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT)
+#define KSAUDIO_SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT |		\
+					  SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY |	\
+					  SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT |		\
+					  SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT)
+
+#define KSAUDIO_SPEAKER_5POINT1_BACK	KSAUDIO_SPEAKER_5POINT1
+#define KSAUDIO_SPEAKER_7POINT1_WIDE	KSAUDIO_SPEAKER_7POINT1
+
+#define KSAUDIO_SPEAKER_GROUND_FRONT_LEFT	SPEAKER_FRONT_LEFT
+#define KSAUDIO_SPEAKER_GROUND_FRONT_CENTER	SPEAKER_FRONT_CENTER
+#define KSAUDIO_SPEAKER_GROUND_FRONT_RIGHT	SPEAKER_FRONT_RIGHT
+#define KSAUDIO_SPEAKER_GROUND_REAR_LEFT	SPEAKER_BACK_LEFT
+#define KSAUDIO_SPEAKER_GROUND_REAR_RIGHT	SPEAKER_BACK_RIGHT
+#define KSAUDIO_SPEAKER_TOP_MIDDLE		SPEAKER_TOP_CENTER
+#define KSAUDIO_SPEAKER_SUPER_WOOFER		SPEAKER_LOW_FREQUENCY
+
+typedef struct {
+  ULONG QuietCompression;
+  ULONG LoudCompression;
+} KSAUDIO_DYNAMIC_RANGE,*PKSAUDIO_DYNAMIC_RANGE;
+
+typedef struct {
+  WINBOOL Mute;
+  LONG Level;
+} KSAUDIO_MIXLEVEL,*PKSAUDIO_MIXLEVEL;
+
+typedef struct {
+  WINBOOL Mute;
+  LONG Minimum;
+  LONG Maximum;
+  LONG Reset;
+} KSAUDIO_MIX_CAPS,*PKSAUDIO_MIX_CAPS;
+
+typedef struct {
+  ULONG InputChannels;
+  ULONG OutputChannels;
+  KSAUDIO_MIX_CAPS Capabilities[1];
+} KSAUDIO_MIXCAP_TABLE,*PKSAUDIO_MIXCAP_TABLE;
+
+typedef enum {
+  SE_TECH_NONE,
+  SE_TECH_ANALOG_DEVICES_PHAT,
+  SE_TECH_CREATIVE,
+  SE_TECH_NATIONAL_SEMI,
+  SE_TECH_YAMAHA_YMERSION,
+  SE_TECH_BBE,
+  SE_TECH_CRYSTAL_SEMI,
+  SE_TECH_QSOUND_QXPANDER,
+  SE_TECH_SPATIALIZER,
+  SE_TECH_SRS,
+  SE_TECH_PLATFORM_TECH,
+  SE_TECH_AKM,
+  SE_TECH_AUREAL,
+  SE_TECH_AZTECH,
+  SE_TECH_BINAURA,
+  SE_TECH_ESS_TECH,
+  SE_TECH_HARMAN_VMAX,
+  SE_TECH_NVIDEA,
+  SE_TECH_PHILIPS_INCREDIBLE,
+  SE_TECH_TEXAS_INST,
+  SE_TECH_VLSI_TECH
+} SE_TECHNIQUE;
+
+typedef struct {
+  SE_TECHNIQUE Technique;
+  ULONG Center;
+  ULONG Depth;
+  ULONG Reserved;
+} KSAUDIO_STEREO_ENHANCE,*PKSAUDIO_STEREO_ENHANCE;
+
+typedef enum {
+  KSPROPERTY_SYSAUDIO_NORMAL_DEFAULT = 0,
+  KSPROPERTY_SYSAUDIO_PLAYBACK_DEFAULT,
+  KSPROPERTY_SYSAUDIO_RECORD_DEFAULT,
+  KSPROPERTY_SYSAUDIO_MIDI_DEFAULT,
+  KSPROPERTY_SYSAUDIO_MIXER_DEFAULT
+} KSPROPERTY_SYSAUDIO_DEFAULT_TYPE;
+
+typedef struct {
+  WINBOOL Enable;
+  KSPROPERTY_SYSAUDIO_DEFAULT_TYPE DeviceType;
+  ULONG Flags;
+  ULONG Reserved;
+} KSAUDIO_PREFERRED_STATUS,*PKSAUDIO_PREFERRED_STATUS;
+
+#define STATIC_KSNODETYPE_DAC						\
+	0x507AE360L,0xC554,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("507AE360-C554-11D0-8A2B-00A0C9255AC1",KSNODETYPE_DAC);
+#define KSNODETYPE_DAC DEFINE_GUIDNAMED(KSNODETYPE_DAC)
+
+#define STATIC_KSNODETYPE_ADC						\
+	0x4D837FE0L,0xC555,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("4D837FE0-C555-11D0-8A2B-00A0C9255AC1",KSNODETYPE_ADC);
+#define KSNODETYPE_ADC DEFINE_GUIDNAMED(KSNODETYPE_ADC)
+
+#define STATIC_KSNODETYPE_SRC						\
+	0x9DB7B9E0L,0xC555,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("9DB7B9E0-C555-11D0-8A2B-00A0C9255AC1",KSNODETYPE_SRC);
+#define KSNODETYPE_SRC DEFINE_GUIDNAMED(KSNODETYPE_SRC)
+
+#define STATIC_KSNODETYPE_SUPERMIX					\
+	0xE573ADC0L,0xC555,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("E573ADC0-C555-11D0-8A2B-00A0C9255AC1",KSNODETYPE_SUPERMIX);
+#define KSNODETYPE_SUPERMIX DEFINE_GUIDNAMED(KSNODETYPE_SUPERMIX)
+
+#define STATIC_KSNODETYPE_MUX						\
+	0x2CEAF780L,0xC556,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("2CEAF780-C556-11D0-8A2B-00A0C9255AC1",KSNODETYPE_MUX);
+#define KSNODETYPE_MUX DEFINE_GUIDNAMED(KSNODETYPE_MUX)
+
+#define STATIC_KSNODETYPE_DEMUX						\
+	0xC0EB67D4L,0xE807,0x11D0,0x95,0x8A,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("C0EB67D4-E807-11D0-958A-00C04FB925D3",KSNODETYPE_DEMUX);
+#define KSNODETYPE_DEMUX DEFINE_GUIDNAMED(KSNODETYPE_DEMUX)
+
+#define STATIC_KSNODETYPE_SUM						\
+	0xDA441A60L,0xC556,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("DA441A60-C556-11D0-8A2B-00A0C9255AC1",KSNODETYPE_SUM);
+#define KSNODETYPE_SUM DEFINE_GUIDNAMED(KSNODETYPE_SUM)
+
+#define STATIC_KSNODETYPE_MUTE						\
+	0x02B223C0L,0xC557,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("02B223C0-C557-11D0-8A2B-00A0C9255AC1",KSNODETYPE_MUTE);
+#define KSNODETYPE_MUTE DEFINE_GUIDNAMED(KSNODETYPE_MUTE)
+
+#define STATIC_KSNODETYPE_VOLUME					\
+	0x3A5ACC00L,0xC557,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("3A5ACC00-C557-11D0-8A2B-00A0C9255AC1",KSNODETYPE_VOLUME);
+#define KSNODETYPE_VOLUME DEFINE_GUIDNAMED(KSNODETYPE_VOLUME)
+
+#define STATIC_KSNODETYPE_TONE						\
+	0x7607E580L,0xC557,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("7607E580-C557-11D0-8A2B-00A0C9255AC1",KSNODETYPE_TONE);
+#define KSNODETYPE_TONE DEFINE_GUIDNAMED(KSNODETYPE_TONE)
+
+#define STATIC_KSNODETYPE_EQUALIZER					\
+	0x9D41B4A0L,0xC557,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("9D41B4A0-C557-11D0-8A2B-00A0C9255AC1",KSNODETYPE_EQUALIZER);
+#define KSNODETYPE_EQUALIZER DEFINE_GUIDNAMED(KSNODETYPE_EQUALIZER)
+
+#define STATIC_KSNODETYPE_AGC						\
+	0xE88C9BA0L,0xC557,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("E88C9BA0-C557-11D0-8A2B-00A0C9255AC1",KSNODETYPE_AGC);
+#define KSNODETYPE_AGC DEFINE_GUIDNAMED(KSNODETYPE_AGC)
+
+#define STATIC_KSNODETYPE_NOISE_SUPPRESS				\
+	0xe07f903f,0x62fd,0x4e60,0x8c,0xdd,0xde,0xa7,0x23,0x66,0x65,0xb5
+DEFINE_GUIDSTRUCT("E07F903F-62FD-4e60-8CDD-DEA7236665B5",KSNODETYPE_NOISE_SUPPRESS);
+#define KSNODETYPE_NOISE_SUPPRESS DEFINE_GUIDNAMED(KSNODETYPE_NOISE_SUPPRESS)
+
+#define STATIC_KSNODETYPE_DELAY						\
+	0x144981E0L,0xC558,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("144981E0-C558-11D0-8A2B-00A0C9255AC1",KSNODETYPE_DELAY);
+#define KSNODETYPE_DELAY DEFINE_GUIDNAMED(KSNODETYPE_DELAY)
+
+#define STATIC_KSNODETYPE_LOUDNESS					\
+	0x41887440L,0xC558,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("41887440-C558-11D0-8A2B-00A0C9255AC1",KSNODETYPE_LOUDNESS);
+#define KSNODETYPE_LOUDNESS DEFINE_GUIDNAMED(KSNODETYPE_LOUDNESS)
+
+#define STATIC_KSNODETYPE_PROLOGIC_DECODER				\
+	0x831C2C80L,0xC558,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("831C2C80-C558-11D0-8A2B-00A0C9255AC1",KSNODETYPE_PROLOGIC_DECODER);
+#define KSNODETYPE_PROLOGIC_DECODER DEFINE_GUIDNAMED(KSNODETYPE_PROLOGIC_DECODER)
+
+#define STATIC_KSNODETYPE_STEREO_WIDE					\
+	0xA9E69800L,0xC558,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("A9E69800-C558-11D0-8A2B-00A0C9255AC1",KSNODETYPE_STEREO_WIDE);
+#define KSNODETYPE_STEREO_WIDE DEFINE_GUIDNAMED(KSNODETYPE_STEREO_WIDE)
+
+#define STATIC_KSNODETYPE_STEREO_ENHANCE				\
+	0xAF6878ACL,0xE83F,0x11D0,0x95,0x8A,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("AF6878AC-E83F-11D0-958A-00C04FB925D3",KSNODETYPE_STEREO_ENHANCE);
+#define KSNODETYPE_STEREO_ENHANCE DEFINE_GUIDNAMED(KSNODETYPE_STEREO_ENHANCE)
+
+#define STATIC_KSNODETYPE_REVERB					\
+	0xEF0328E0L,0xC558,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("EF0328E0-C558-11D0-8A2B-00A0C9255AC1",KSNODETYPE_REVERB);
+#define KSNODETYPE_REVERB DEFINE_GUIDNAMED(KSNODETYPE_REVERB)
+
+#define STATIC_KSNODETYPE_CHORUS					\
+	0x20173F20L,0xC559,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("20173F20-C559-11D0-8A2B-00A0C9255AC1",KSNODETYPE_CHORUS);
+#define KSNODETYPE_CHORUS DEFINE_GUIDNAMED(KSNODETYPE_CHORUS)
+
+#define STATIC_KSNODETYPE_3D_EFFECTS					\
+	0x55515860L,0xC559,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("55515860-C559-11D0-8A2B-00A0C9255AC1",KSNODETYPE_3D_EFFECTS);
+#define KSNODETYPE_3D_EFFECTS DEFINE_GUIDNAMED(KSNODETYPE_3D_EFFECTS)
+
+#define STATIC_KSNODETYPE_ACOUSTIC_ECHO_CANCEL STATIC_KSCATEGORY_ACOUSTIC_ECHO_CANCEL
+#define KSNODETYPE_ACOUSTIC_ECHO_CANCEL KSCATEGORY_ACOUSTIC_ECHO_CANCEL
+
+#define STATIC_KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL		\
+	0x1c22c56dL,0x9879,0x4f5b,0xa3,0x89,0x27,0x99,0x6d,0xdc,0x28,0x10
+DEFINE_GUIDSTRUCT("1C22C56D-9879-4f5b-A389-27996DDC2810",KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL);
+#define KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL DEFINE_GUIDNAMED(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL)
+
+#define STATIC_KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS		\
+	0x5ab0882eL,0x7274,0x4516,0x87,0x7d,0x4e,0xee,0x99,0xba,0x4f,0xd0
+DEFINE_GUIDSTRUCT("5AB0882E-7274-4516-877D-4EEE99BA4FD0",KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS);
+#define KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS DEFINE_GUIDNAMED(KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS)
+
+#define STATIC_KSALGORITHMINSTANCE_SYSTEM_AGC				\
+	0x950e55b9L,0x877c,0x4c67,0xbe,0x8,0xe4,0x7b,0x56,0x11,0x13,0xa
+DEFINE_GUIDSTRUCT("950E55B9-877C-4c67-BE08-E47B5611130A",KSALGORITHMINSTANCE_SYSTEM_AGC);
+#define KSALGORITHMINSTANCE_SYSTEM_AGC DEFINE_GUIDNAMED(KSALGORITHMINSTANCE_SYSTEM_AGC)
+
+#define STATIC_KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR	\
+	0xB6F5A0A0L,0x9E61,0x4F8C,0x91,0xE3,0x76,0xCF,0xF,0x3C,0x47,0x1F
+DEFINE_GUIDSTRUCT("B6F5A0A0-9E61-4f8c-91E3-76CF0F3C471F",KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR);
+#define KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR DEFINE_GUIDNAMED(KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR)
+
+#define STATIC_KSNODETYPE_MICROPHONE_ARRAY_PROCESSOR STATIC_KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR
+#define KSNODETYPE_MICROPHONE_ARRAY_PROCESSOR KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR
+
+#define STATIC_KSNODETYPE_DEV_SPECIFIC					\
+	0x941C7AC0L,0xC559,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1
+DEFINE_GUIDSTRUCT("941C7AC0-C559-11D0-8A2B-00A0C9255AC1",KSNODETYPE_DEV_SPECIFIC);
+#define KSNODETYPE_DEV_SPECIFIC DEFINE_GUIDNAMED(KSNODETYPE_DEV_SPECIFIC)
+
+#define STATIC_KSNODETYPE_PROLOGIC_ENCODER				\
+	0x8074C5B2L,0x3C66,0x11D2,0xB4,0x5A,0x30,0x78,0x30,0x2C,0x20,0x30
+DEFINE_GUIDSTRUCT("8074C5B2-3C66-11D2-B45A-3078302C2030",KSNODETYPE_PROLOGIC_ENCODER);
+#define KSNODETYPE_PROLOGIC_ENCODER DEFINE_GUIDNAMED(KSNODETYPE_PROLOGIC_ENCODER)
+#define KSNODETYPE_SURROUND_ENCODER KSNODETYPE_PROLOGIC_ENCODER
+
+#define STATIC_KSNODETYPE_PEAKMETER					\
+	0xa085651eL,0x5f0d,0x4b36,0xa8,0x69,0xd1,0x95,0xd6,0xab,0x4b,0x9e
+DEFINE_GUIDSTRUCT("A085651E-5F0D-4b36-A869-D195D6AB4B9E",KSNODETYPE_PEAKMETER);
+#define KSNODETYPE_PEAKMETER DEFINE_GUIDNAMED(KSNODETYPE_PEAKMETER)
+
+#define STATIC_KSAUDFNAME_BASS						\
+	0x185FEDE0L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE0-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_BASS);
+#define KSAUDFNAME_BASS DEFINE_GUIDNAMED(KSAUDFNAME_BASS)
+
+#define STATIC_KSAUDFNAME_TREBLE					\
+	0x185FEDE1L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE1-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_TREBLE);
+#define KSAUDFNAME_TREBLE DEFINE_GUIDNAMED(KSAUDFNAME_TREBLE)
+
+#define STATIC_KSAUDFNAME_3D_STEREO					\
+	0x185FEDE2L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE2-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_3D_STEREO);
+#define KSAUDFNAME_3D_STEREO DEFINE_GUIDNAMED(KSAUDFNAME_3D_STEREO)
+
+#define STATIC_KSAUDFNAME_MASTER_VOLUME					\
+	0x185FEDE3L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE3-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MASTER_VOLUME);
+#define KSAUDFNAME_MASTER_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_VOLUME)
+
+#define STATIC_KSAUDFNAME_MASTER_MUTE					\
+	0x185FEDE4L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE4-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MASTER_MUTE);
+#define KSAUDFNAME_MASTER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_MUTE)
+
+#define STATIC_KSAUDFNAME_WAVE_VOLUME					\
+	0x185FEDE5L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE5-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_WAVE_VOLUME);
+#define KSAUDFNAME_WAVE_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_VOLUME)
+
+#define STATIC_KSAUDFNAME_WAVE_MUTE					\
+	0x185FEDE6L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE6-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_WAVE_MUTE);
+#define KSAUDFNAME_WAVE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_MUTE)
+
+#define STATIC_KSAUDFNAME_MIDI_VOLUME					\
+	0x185FEDE7L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE7-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIDI_VOLUME);
+#define KSAUDFNAME_MIDI_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIDI_VOLUME)
+
+#define STATIC_KSAUDFNAME_MIDI_MUTE					\
+	0x185FEDE8L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE8-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIDI_MUTE);
+#define KSAUDFNAME_MIDI_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MIDI_MUTE)
+
+#define STATIC_KSAUDFNAME_CD_VOLUME					\
+	0x185FEDE9L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDE9-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_CD_VOLUME);
+#define KSAUDFNAME_CD_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_CD_VOLUME)
+
+#define STATIC_KSAUDFNAME_CD_MUTE					\
+	0x185FEDEAL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDEA-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_CD_MUTE);
+#define KSAUDFNAME_CD_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_CD_MUTE)
+
+#define STATIC_KSAUDFNAME_LINE_VOLUME					\
+	0x185FEDEBL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDEB-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_LINE_VOLUME);
+#define KSAUDFNAME_LINE_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_LINE_VOLUME)
+
+#define STATIC_KSAUDFNAME_LINE_MUTE					\
+	0x185FEDECL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDEC-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_LINE_MUTE);
+#define KSAUDFNAME_LINE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_LINE_MUTE)
+
+#define STATIC_KSAUDFNAME_MIC_VOLUME					\
+	0x185FEDEDL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDED-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIC_VOLUME);
+#define KSAUDFNAME_MIC_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_VOLUME)
+
+#define STATIC_KSAUDFNAME_MIC_MUTE					\
+	0x185FEDEEL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDEE-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIC_MUTE);
+#define KSAUDFNAME_MIC_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MIC_MUTE)
+
+#define STATIC_KSAUDFNAME_RECORDING_SOURCE				\
+	0x185FEDEFL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDEF-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_RECORDING_SOURCE);
+#define KSAUDFNAME_RECORDING_SOURCE DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_SOURCE)
+
+#define STATIC_KSAUDFNAME_PC_SPEAKER_VOLUME				\
+	0x185FEDF0L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF0-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_PC_SPEAKER_VOLUME);
+#define KSAUDFNAME_PC_SPEAKER_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER_VOLUME)
+
+#define STATIC_KSAUDFNAME_PC_SPEAKER_MUTE				\
+	0x185FEDF1L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF1-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_PC_SPEAKER_MUTE);
+#define KSAUDFNAME_PC_SPEAKER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER_MUTE)
+
+#define STATIC_KSAUDFNAME_MIDI_IN_VOLUME				\
+	0x185FEDF2L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF2-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIDI_IN_VOLUME);
+#define KSAUDFNAME_MIDI_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIDI_IN_VOLUME)
+
+#define STATIC_KSAUDFNAME_CD_IN_VOLUME					\
+	0x185FEDF3L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF3-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_CD_IN_VOLUME);
+#define KSAUDFNAME_CD_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_CD_IN_VOLUME)
+
+#define STATIC_KSAUDFNAME_LINE_IN_VOLUME				\
+	0x185FEDF4L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF4-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_LINE_IN_VOLUME);
+#define KSAUDFNAME_LINE_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_LINE_IN_VOLUME)
+
+#define STATIC_KSAUDFNAME_MIC_IN_VOLUME					\
+	0x185FEDF5L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF5-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIC_IN_VOLUME);
+#define KSAUDFNAME_MIC_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_IN_VOLUME)
+
+#define STATIC_KSAUDFNAME_WAVE_IN_VOLUME				\
+	0x185FEDF6L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF6-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_WAVE_IN_VOLUME);
+#define KSAUDFNAME_WAVE_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_IN_VOLUME)
+
+#define STATIC_KSAUDFNAME_VOLUME_CONTROL				\
+	0x185FEDF7L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF7-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_VOLUME_CONTROL);
+#define KSAUDFNAME_VOLUME_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_VOLUME_CONTROL)
+
+#define STATIC_KSAUDFNAME_MIDI						\
+	0x185FEDF8L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF8-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_MIDI);
+#define KSAUDFNAME_MIDI DEFINE_GUIDNAMED(KSAUDFNAME_MIDI)
+
+#define STATIC_KSAUDFNAME_LINE_IN					\
+	0x185FEDF9L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDF9-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_LINE_IN);
+#define KSAUDFNAME_LINE_IN DEFINE_GUIDNAMED(KSAUDFNAME_LINE_IN)
+
+#define STATIC_KSAUDFNAME_RECORDING_CONTROL				\
+	0x185FEDFAL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFA-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_RECORDING_CONTROL);
+#define KSAUDFNAME_RECORDING_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_CONTROL)
+
+#define STATIC_KSAUDFNAME_CD_AUDIO					\
+	0x185FEDFBL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFB-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_CD_AUDIO);
+#define KSAUDFNAME_CD_AUDIO DEFINE_GUIDNAMED(KSAUDFNAME_CD_AUDIO)
+
+#define STATIC_KSAUDFNAME_AUX_VOLUME					\
+	0x185FEDFCL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFC-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_AUX_VOLUME);
+#define KSAUDFNAME_AUX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_AUX_VOLUME)
+
+#define STATIC_KSAUDFNAME_AUX_MUTE					\
+	0x185FEDFDL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFD-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_AUX_MUTE);
+#define KSAUDFNAME_AUX_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_AUX_MUTE)
+
+#define STATIC_KSAUDFNAME_AUX						\
+	0x185FEDFEL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFE-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_AUX);
+#define KSAUDFNAME_AUX DEFINE_GUIDNAMED(KSAUDFNAME_AUX)
+
+#define STATIC_KSAUDFNAME_PC_SPEAKER					\
+	0x185FEDFFL,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEDFF-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_PC_SPEAKER);
+#define KSAUDFNAME_PC_SPEAKER DEFINE_GUIDNAMED(KSAUDFNAME_PC_SPEAKER)
+
+#define STATIC_KSAUDFNAME_WAVE_OUT_MIX					\
+	0x185FEE00L,0x9905,0x11D1,0x95,0xA9,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("185FEE00-9905-11D1-95A9-00C04FB925D3",KSAUDFNAME_WAVE_OUT_MIX);
+#define KSAUDFNAME_WAVE_OUT_MIX DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_OUT_MIX)
+
+#define STATIC_KSAUDFNAME_MONO_OUT					\
+	0xf9b41dc3L,0x96e2,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("F9B41DC3-96E2-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_OUT);
+#define KSAUDFNAME_MONO_OUT DEFINE_GUIDNAMED(KSAUDFNAME_MONO_OUT)
+
+#define STATIC_KSAUDFNAME_STEREO_MIX					\
+	0xdff077L,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("00DFF077-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_STEREO_MIX);
+#define KSAUDFNAME_STEREO_MIX DEFINE_GUIDNAMED(KSAUDFNAME_STEREO_MIX)
+
+#define STATIC_KSAUDFNAME_MONO_MIX					\
+	0xdff078L,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("00DFF078-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_MIX);
+#define KSAUDFNAME_MONO_MIX DEFINE_GUIDNAMED(KSAUDFNAME_MONO_MIX)
+
+#define STATIC_KSAUDFNAME_MONO_OUT_VOLUME				\
+	0x1ad247ebL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("1AD247EB-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_OUT_VOLUME);
+#define KSAUDFNAME_MONO_OUT_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MONO_OUT_VOLUME)
+
+#define STATIC_KSAUDFNAME_MONO_OUT_MUTE					\
+	0x1ad247ecL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("1AD247EC-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_OUT_MUTE);
+#define KSAUDFNAME_MONO_OUT_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MONO_OUT_MUTE)
+
+#define STATIC_KSAUDFNAME_STEREO_MIX_VOLUME				\
+	0x1ad247edL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("1AD247ED-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_STEREO_MIX_VOLUME);
+#define KSAUDFNAME_STEREO_MIX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_STEREO_MIX_VOLUME)
+
+#define STATIC_KSAUDFNAME_STEREO_MIX_MUTE				\
+	0x22b0eafdL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("22B0EAFD-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_STEREO_MIX_MUTE);
+#define KSAUDFNAME_STEREO_MIX_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_STEREO_MIX_MUTE)
+
+#define STATIC_KSAUDFNAME_MONO_MIX_VOLUME				\
+	0x22b0eafeL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("22B0EAFE-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_MIX_VOLUME);
+#define KSAUDFNAME_MONO_MIX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MONO_MIX_VOLUME)
+
+#define STATIC_KSAUDFNAME_MONO_MIX_MUTE					\
+	0x2bc31d69L,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("2BC31D69-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MONO_MIX_MUTE);
+#define KSAUDFNAME_MONO_MIX_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MONO_MIX_MUTE)
+
+#define STATIC_KSAUDFNAME_MICROPHONE_BOOST				\
+	0x2bc31d6aL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("2BC31D6A-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_MICROPHONE_BOOST);
+#define KSAUDFNAME_MICROPHONE_BOOST DEFINE_GUIDNAMED(KSAUDFNAME_MICROPHONE_BOOST)
+
+#define STATIC_KSAUDFNAME_ALTERNATE_MICROPHONE				\
+	0x2bc31d6bL,0x96e3,0x11d2,0xac,0x4c,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("2BC31D6B-96E3-11d2-AC4C-00C04F8EFB68",KSAUDFNAME_ALTERNATE_MICROPHONE);
+#define KSAUDFNAME_ALTERNATE_MICROPHONE DEFINE_GUIDNAMED(KSAUDFNAME_ALTERNATE_MICROPHONE)
+
+#define STATIC_KSAUDFNAME_3D_DEPTH					\
+	0x63ff5747L,0x991f,0x11d2,0xac,0x4d,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("63FF5747-991F-11d2-AC4D-00C04F8EFB68",KSAUDFNAME_3D_DEPTH);
+#define KSAUDFNAME_3D_DEPTH DEFINE_GUIDNAMED(KSAUDFNAME_3D_DEPTH)
+
+#define STATIC_KSAUDFNAME_3D_CENTER					\
+	0x9f0670b4L,0x991f,0x11d2,0xac,0x4d,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("9F0670B4-991F-11d2-AC4D-00C04F8EFB68",KSAUDFNAME_3D_CENTER);
+#define KSAUDFNAME_3D_CENTER DEFINE_GUIDNAMED(KSAUDFNAME_3D_CENTER)
+
+#define STATIC_KSAUDFNAME_VIDEO_VOLUME					\
+	0x9b46e708L,0x992a,0x11d2,0xac,0x4d,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("9B46E708-992A-11d2-AC4D-00C04F8EFB68",KSAUDFNAME_VIDEO_VOLUME);
+#define KSAUDFNAME_VIDEO_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO_VOLUME)
+
+#define STATIC_KSAUDFNAME_VIDEO_MUTE					\
+	0x9b46e709L,0x992a,0x11d2,0xac,0x4d,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("9B46E709-992A-11d2-AC4D-00C04F8EFB68",KSAUDFNAME_VIDEO_MUTE);
+#define KSAUDFNAME_VIDEO_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO_MUTE)
+
+#define STATIC_KSAUDFNAME_VIDEO						\
+	0x915daec4L,0xa434,0x11d2,0xac,0x52,0x0,0xc0,0x4f,0x8e,0xfb,0x68
+DEFINE_GUIDSTRUCT("915DAEC4-A434-11d2-AC52-00C04F8EFB68",KSAUDFNAME_VIDEO);
+#define KSAUDFNAME_VIDEO DEFINE_GUIDNAMED(KSAUDFNAME_VIDEO)
+
+#define STATIC_KSAUDFNAME_PEAKMETER					\
+	0x57e24340L,0xfc5b,0x4612,0xa5,0x62,0x72,0xb1,0x1a,0x29,0xdf,0xae
+DEFINE_GUIDSTRUCT("57E24340-FC5B-4612-A562-72B11A29DFAE",KSAUDFNAME_PEAKMETER);
+#define KSAUDFNAME_PEAKMETER DEFINE_GUIDNAMED(KSAUDFNAME_PEAKMETER)
+
+#define KSNODEPIN_STANDARD_IN		1
+#define KSNODEPIN_STANDARD_OUT		0
+
+#define KSNODEPIN_SUM_MUX_IN		1
+#define KSNODEPIN_SUM_MUX_OUT		0
+
+#define KSNODEPIN_DEMUX_IN		0
+#define KSNODEPIN_DEMUX_OUT		1
+
+#define KSNODEPIN_AEC_RENDER_IN		1
+#define KSNODEPIN_AEC_RENDER_OUT	0
+#define KSNODEPIN_AEC_CAPTURE_IN	2
+#define KSNODEPIN_AEC_CAPTURE_OUT	3
+
+#define STATIC_KSMETHODSETID_Wavetable					\
+	0xDCEF31EBL,0xD907,0x11D0,0x95,0x83,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("DCEF31EB-D907-11D0-9583-00C04FB925D3",KSMETHODSETID_Wavetable);
+#define KSMETHODSETID_Wavetable DEFINE_GUIDNAMED(KSMETHODSETID_Wavetable)
+
+typedef enum {
+  KSMETHOD_WAVETABLE_WAVE_ALLOC,
+  KSMETHOD_WAVETABLE_WAVE_FREE,
+  KSMETHOD_WAVETABLE_WAVE_FIND,
+  KSMETHOD_WAVETABLE_WAVE_WRITE
+} KSMETHOD_WAVETABLE;
+
+typedef struct {
+  KSIDENTIFIER Identifier;
+  ULONG Size;
+  WINBOOL Looped;
+  ULONG LoopPoint;
+  WINBOOL InROM;
+  KSDATAFORMAT Format;
+} KSWAVETABLE_WAVE_DESC,*PKSWAVETABLE_WAVE_DESC;
+
+#define STATIC_KSPROPSETID_Acoustic_Echo_Cancel				\
+	0xd7a4af8bL,0x3dc1,0x4902,0x91,0xea,0x8a,0x15,0xc9,0x0e,0x05,0xb2
+DEFINE_GUIDSTRUCT("D7A4AF8B-3DC1-4902-91EA-8A15C90E05B2",KSPROPSETID_Acoustic_Echo_Cancel);
+#define KSPROPSETID_Acoustic_Echo_Cancel DEFINE_GUIDNAMED(KSPROPSETID_Acoustic_Echo_Cancel)
+
+typedef enum {
+  KSPROPERTY_AEC_NOISE_FILL_ENABLE = 0,
+  KSPROPERTY_AEC_STATUS,
+  KSPROPERTY_AEC_MODE
+} KSPROPERTY_AEC;
+
+#define AEC_STATUS_FD_HISTORY_UNINITIALIZED		0x0
+#define AEC_STATUS_FD_HISTORY_CONTINUOUSLY_CONVERGED	0x1
+#define AEC_STATUS_FD_HISTORY_PREVIOUSLY_DIVERGED	0x2
+#define AEC_STATUS_FD_CURRENTLY_CONVERGED		0x8
+
+#define AEC_MODE_PASS_THROUGH				0x0
+#define AEC_MODE_HALF_DUPLEX				0x1
+#define AEC_MODE_FULL_DUPLEX				0x2
+
+#define STATIC_KSPROPSETID_Wave						\
+	0x924e54b0L,0x630f,0x11cf,0xad,0xa7,0x08,0x00,0x3e,0x30,0x49,0x4a
+DEFINE_GUIDSTRUCT("924e54b0-630f-11cf-ada7-08003e30494a",KSPROPSETID_Wave);
+#define KSPROPSETID_Wave DEFINE_GUIDNAMED(KSPROPSETID_Wave)
+
+typedef enum {
+  KSPROPERTY_WAVE_COMPATIBLE_CAPABILITIES,
+  KSPROPERTY_WAVE_INPUT_CAPABILITIES,
+  KSPROPERTY_WAVE_OUTPUT_CAPABILITIES,
+  KSPROPERTY_WAVE_BUFFER,
+  KSPROPERTY_WAVE_FREQUENCY,
+  KSPROPERTY_WAVE_VOLUME,
+  KSPROPERTY_WAVE_PAN
+} KSPROPERTY_WAVE;
+
+typedef struct {
+  ULONG ulDeviceType;
+} KSWAVE_COMPATCAPS,*PKSWAVE_COMPATCAPS;
+
+#define KSWAVE_COMPATCAPS_INPUT		0x00000000
+#define KSWAVE_COMPATCAPS_OUTPUT	0x00000001
+
+typedef struct {
+  ULONG MaximumChannelsPerConnection;
+  ULONG MinimumBitsPerSample;
+  ULONG MaximumBitsPerSample;
+  ULONG MinimumSampleFrequency;
+  ULONG MaximumSampleFrequency;
+  ULONG TotalConnections;
+  ULONG ActiveConnections;
+} KSWAVE_INPUT_CAPABILITIES,*PKSWAVE_INPUT_CAPABILITIES;
+
+typedef struct {
+  ULONG MaximumChannelsPerConnection;
+  ULONG MinimumBitsPerSample;
+  ULONG MaximumBitsPerSample;
+  ULONG MinimumSampleFrequency;
+  ULONG MaximumSampleFrequency;
+  ULONG TotalConnections;
+  ULONG StaticConnections;
+  ULONG StreamingConnections;
+  ULONG ActiveConnections;
+  ULONG ActiveStaticConnections;
+  ULONG ActiveStreamingConnections;
+  ULONG Total3DConnections;
+  ULONG Static3DConnections;
+  ULONG Streaming3DConnections;
+  ULONG Active3DConnections;
+  ULONG ActiveStatic3DConnections;
+  ULONG ActiveStreaming3DConnections;
+  ULONG TotalSampleMemory;
+  ULONG FreeSampleMemory;
+  ULONG LargestFreeContiguousSampleMemory;
+} KSWAVE_OUTPUT_CAPABILITIES,*PKSWAVE_OUTPUT_CAPABILITIES;
+
+typedef struct {
+  LONG LeftAttenuation;
+  LONG RightAttenuation;
+} KSWAVE_VOLUME,*PKSWAVE_VOLUME;
+
+#define KSWAVE_BUFFER_ATTRIBUTEF_LOOPING	0x00000001
+#define KSWAVE_BUFFER_ATTRIBUTEF_STATIC		0x00000002
+
+typedef struct {
+  ULONG Attributes;
+  ULONG BufferSize;
+  PVOID BufferAddress;
+} KSWAVE_BUFFER,*PKSWAVE_BUFFER;
+
+#define STATIC_KSMUSIC_TECHNOLOGY_PORT					\
+	0x86C92E60L,0x62E8,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("86C92E60-62E8-11CF-A5D6-28DB04C10000",KSMUSIC_TECHNOLOGY_PORT);
+#define KSMUSIC_TECHNOLOGY_PORT DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_PORT)
+
+#define STATIC_KSMUSIC_TECHNOLOGY_SQSYNTH				\
+	0x0ECF4380L,0x62E9,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("0ECF4380-62E9-11CF-A5D6-28DB04C10000",KSMUSIC_TECHNOLOGY_SQSYNTH);
+#define KSMUSIC_TECHNOLOGY_SQSYNTH DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_SQSYNTH)
+
+#define STATIC_KSMUSIC_TECHNOLOGY_FMSYNTH				\
+	0x252C5C80L,0x62E9,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("252C5C80-62E9-11CF-A5D6-28DB04C10000",KSMUSIC_TECHNOLOGY_FMSYNTH);
+#define KSMUSIC_TECHNOLOGY_FMSYNTH DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_FMSYNTH)
+
+#define STATIC_KSMUSIC_TECHNOLOGY_WAVETABLE				\
+	0x394EC7C0L,0x62E9,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("394EC7C0-62E9-11CF-A5D6-28DB04C10000",KSMUSIC_TECHNOLOGY_WAVETABLE);
+#define KSMUSIC_TECHNOLOGY_WAVETABLE DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_WAVETABLE)
+
+#define STATIC_KSMUSIC_TECHNOLOGY_SWSYNTH				\
+	0x37407736L,0x3620,0x11D1,0x85,0xD3,0x00,0x00,0xF8,0x75,0x43,0x80
+DEFINE_GUIDSTRUCT("37407736-3620-11D1-85D3-0000F8754380",KSMUSIC_TECHNOLOGY_SWSYNTH);
+#define KSMUSIC_TECHNOLOGY_SWSYNTH DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_SWSYNTH)
+
+#define STATIC_KSPROPSETID_WaveTable					\
+	0x8539E660L,0x62E9,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("8539E660-62E9-11CF-A5D6-28DB04C10000",KSPROPSETID_WaveTable);
+#define KSPROPSETID_WaveTable DEFINE_GUIDNAMED(KSPROPSETID_WaveTable)
+
+typedef enum {
+  KSPROPERTY_WAVETABLE_LOAD_SAMPLE,
+  KSPROPERTY_WAVETABLE_UNLOAD_SAMPLE,
+  KSPROPERTY_WAVETABLE_MEMORY,
+  KSPROPERTY_WAVETABLE_VERSION
+} KSPROPERTY_WAVETABLE;
+
+typedef struct {
+  KSDATARANGE DataRange;
+  GUID Technology;
+  ULONG Channels;
+  ULONG Notes;
+  ULONG ChannelMask;
+} KSDATARANGE_MUSIC,*PKSDATARANGE_MUSIC;
+
+#define STATIC_KSEVENTSETID_Cyclic					\
+	0x142C1AC0L,0x072A,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("142C1AC0-072A-11D0-A5D6-28DB04C10000",KSEVENTSETID_Cyclic);
+#define KSEVENTSETID_Cyclic DEFINE_GUIDNAMED(KSEVENTSETID_Cyclic)
+
+typedef enum {
+  KSEVENT_CYCLIC_TIME_INTERVAL
+} KSEVENT_CYCLIC_TIME;
+
+#define STATIC_KSPROPSETID_Cyclic					\
+	0x3FFEAEA0L,0x2BEE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("3FFEAEA0-2BEE-11CF-A5D6-28DB04C10000",KSPROPSETID_Cyclic);
+#define KSPROPSETID_Cyclic DEFINE_GUIDNAMED(KSPROPSETID_Cyclic)
+
+typedef enum {
+  KSPROPERTY_CYCLIC_POSITION
+} KSPROPERTY_CYCLIC;
+
+#define STATIC_KSEVENTSETID_AudioControlChange				\
+	0xE85E9698L,0xFA2F,0x11D1,0x95,0xBD,0x00,0xC0,0x4F,0xB9,0x25,0xD3
+DEFINE_GUIDSTRUCT("E85E9698-FA2F-11D1-95BD-00C04FB925D3",KSEVENTSETID_AudioControlChange);
+#define KSEVENTSETID_AudioControlChange DEFINE_GUIDNAMED(KSEVENTSETID_AudioControlChange)
+
+typedef enum {
+  KSEVENT_CONTROL_CHANGE
+} KSEVENT_AUDIO_CONTROL_CHANGE;
+
+#define STATIC_KSEVENTSETID_LoopedStreaming				\
+	0x4682B940L,0xC6EF,0x11D0,0x96,0xD8,0x00,0xAA,0x00,0x51,0xE5,0x1D
+DEFINE_GUIDSTRUCT("4682B940-C6EF-11D0-96D8-00AA0051E51D",KSEVENTSETID_LoopedStreaming);
+#define KSEVENTSETID_LoopedStreaming DEFINE_GUIDNAMED(KSEVENTSETID_LoopedStreaming)
+
+typedef enum {
+  KSEVENT_LOOPEDSTREAMING_POSITION
+} KSEVENT_LOOPEDSTREAMING;
+
+typedef struct {
+  KSEVENTDATA KsEventData;
+  DWORDLONG Position;
+} LOOPEDSTREAMING_POSITION_EVENT_DATA,*PLOOPEDSTREAMING_POSITION_EVENT_DATA;
+
+#define STATIC_KSPROPSETID_Sysaudio					\
+	0xCBE3FAA0L,0xCC75,0x11D0,0xB4,0x65,0x00,0x00,0x1A,0x18,0x18,0xE6
+DEFINE_GUIDSTRUCT("CBE3FAA0-CC75-11D0-B465-00001A1818E6",KSPROPSETID_Sysaudio);
+#define KSPROPSETID_Sysaudio DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio)
+
+typedef enum {
+  KSPROPERTY_SYSAUDIO_DEVICE_COUNT = 1,
+  KSPROPERTY_SYSAUDIO_DEVICE_FRIENDLY_NAME = 2,
+  KSPROPERTY_SYSAUDIO_DEVICE_INSTANCE = 3,
+  KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME = 4,
+  KSPROPERTY_SYSAUDIO_SELECT_GRAPH = 5,
+  KSPROPERTY_SYSAUDIO_CREATE_VIRTUAL_SOURCE = 6,
+  KSPROPERTY_SYSAUDIO_DEVICE_DEFAULT = 7,
+  KSPROPERTY_SYSAUDIO_INSTANCE_INFO = 14,
+  KSPROPERTY_SYSAUDIO_COMPONENT_ID = 16
+} KSPROPERTY_SYSAUDIO;
+
+typedef struct {
+  KSPROPERTY Property;
+  GUID PinCategory;
+  GUID PinName;
+} SYSAUDIO_CREATE_VIRTUAL_SOURCE,*PSYSAUDIO_CREATE_VIRTUAL_SOURCE;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG PinId;
+  ULONG NodeId;
+  ULONG Flags;
+  ULONG Reserved;
+} SYSAUDIO_SELECT_GRAPH,*PSYSAUDIO_SELECT_GRAPH;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Flags;
+  ULONG DeviceNumber;
+} SYSAUDIO_INSTANCE_INFO,*PSYSAUDIO_INSTANCE_INFO;
+
+#define SYSAUDIO_FLAGS_DONT_COMBINE_PINS	0x00000001
+
+#define STATIC_KSPROPSETID_Sysaudio_Pin					\
+	0xA3A53220L,0xC6E4,0x11D0,0xB4,0x65,0x00,0x00,0x1A,0x18,0x18,0xE6
+DEFINE_GUIDSTRUCT("A3A53220-C6E4-11D0-B465-00001A1818E6",KSPROPSETID_Sysaudio_Pin);
+#define KSPROPSETID_Sysaudio_Pin DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio_Pin)
+
+typedef enum {
+  KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE = 1
+} KSPROPERTY_SYSAUDIO_PIN;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG MixerPinId;
+  ULONG Reserved;
+} SYSAUDIO_ATTACH_VIRTUAL_SOURCE,*PSYSAUDIO_ATTACH_VIRTUAL_SOURCE;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG NodeId;
+  ULONG Reserved;
+} KSNODEPROPERTY,*PKSNODEPROPERTY;
+
+typedef struct {
+  KSNODEPROPERTY NodeProperty;
+  LONG Channel;
+  ULONG Reserved;
+} KSNODEPROPERTY_AUDIO_CHANNEL,*PKSNODEPROPERTY_AUDIO_CHANNEL;
+
+typedef struct {
+  KSNODEPROPERTY NodeProperty;
+  ULONG DevSpecificId;
+  ULONG DeviceInfo;
+  ULONG Length;
+} KSNODEPROPERTY_AUDIO_DEV_SPECIFIC,*PKSNODEPROPERTY_AUDIO_DEV_SPECIFIC;
+
+typedef struct {
+  KSNODEPROPERTY NodeProperty;
+  PVOID ListenerId;
+#ifndef _WIN64
+  ULONG Reserved;
+#endif
+} KSNODEPROPERTY_AUDIO_3D_LISTENER,*PKSNODEPROPERTY_AUDIO_3D_LISTENER;
+
+typedef struct {
+  KSNODEPROPERTY NodeProperty;
+  PVOID AppContext;
+  ULONG Length;
+#ifndef _WIN64
+  ULONG Reserved;
+#endif
+} KSNODEPROPERTY_AUDIO_PROPERTY,*PKSNODEPROPERTY_AUDIO_PROPERTY;
+
+#define STATIC_KSPROPSETID_AudioGfx					\
+	0x79a9312eL,0x59ae,0x43b0,0xa3,0x50,0x8b,0x5,0x28,0x4c,0xab,0x24
+DEFINE_GUIDSTRUCT("79A9312E-59AE-43b0-A350-8B05284CAB24",KSPROPSETID_AudioGfx);
+#define KSPROPSETID_AudioGfx DEFINE_GUIDNAMED(KSPROPSETID_AudioGfx)
+
+typedef enum {
+  KSPROPERTY_AUDIOGFX_RENDERTARGETDEVICEID,
+  KSPROPERTY_AUDIOGFX_CAPTURETARGETDEVICEID
+} KSPROPERTY_AUDIOGFX;
+
+#define STATIC_KSPROPSETID_Linear					\
+	0x5A2FFE80L,0x16B9,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("5A2FFE80-16B9-11D0-A5D6-28DB04C10000",KSPROPSETID_Linear);
+#define KSPROPSETID_Linear DEFINE_GUIDNAMED(KSPROPSETID_Linear)
+
+typedef enum {
+  KSPROPERTY_LINEAR_POSITION
+} KSPROPERTY_LINEAR;
+
+#define STATIC_KSDATAFORMAT_TYPE_MUSIC					\
+	0xE725D360L,0x62CC,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("E725D360-62CC-11CF-A5D6-28DB04C10000",KSDATAFORMAT_TYPE_MUSIC);
+#define KSDATAFORMAT_TYPE_MUSIC DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MUSIC)
+
+#define STATIC_KSDATAFORMAT_TYPE_MIDI					\
+	0x7364696DL,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71
+DEFINE_GUIDSTRUCT("7364696D-0000-0010-8000-00aa00389b71",KSDATAFORMAT_TYPE_MIDI);
+#define KSDATAFORMAT_TYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MIDI)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MIDI				\
+	0x1D262760L,0xE957,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("1D262760-E957-11CF-A5D6-28DB04C10000",KSDATAFORMAT_SUBTYPE_MIDI);
+#define KSDATAFORMAT_SUBTYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MIDI_BUS				\
+	0x2CA15FA0L,0x6CFE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00
+DEFINE_GUIDSTRUCT("2CA15FA0-6CFE-11CF-A5D6-28DB04C10000",KSDATAFORMAT_SUBTYPE_MIDI_BUS);
+#define KSDATAFORMAT_SUBTYPE_MIDI_BUS DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI_BUS)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_RIFFMIDI				\
+	0x4995DAF0L,0x9EE6,0x11D0,0xA4,0x0E,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("4995DAF0-9EE6-11D0-A40E-00A0C9223196",KSDATAFORMAT_SUBTYPE_RIFFMIDI);
+#define KSDATAFORMAT_SUBTYPE_RIFFMIDI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_RIFFMIDI)
+
+typedef struct {
+  ULONG TimeDeltaMs;
+
+  ULONG ByteCount;
+} KSMUSICFORMAT,*PKSMUSICFORMAT;
+
+#define STATIC_KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM		\
+	0x36523b11L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B11-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM);
+#define KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM)
+
+#define STATIC_KSDATAFORMAT_TYPE_STANDARD_PES_PACKET			\
+	0x36523b12L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B12-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_TYPE_STANDARD_PES_PACKET);
+#define KSDATAFORMAT_TYPE_STANDARD_PES_PACKET DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET)
+
+#define STATIC_KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER			\
+	0x36523b13L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B13-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER);
+#define KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO		\
+	0x36523b21L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B21-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO);
+#define KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO		\
+	0x36523b22L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B22-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO		\
+	0x36523b23L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B23-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO);
+#define KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO		\
+	0x36523b24L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B24-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO			\
+	0x36523b25L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B25-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO		\
+	0x36523b31L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B31-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO);
+#define KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO		\
+	0x36523b32L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B32-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO		\
+	0x36523b33L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B33-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO);
+#define KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO		\
+	0x36523b34L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B34-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO			\
+	0x36523b35L,0x8ee5,0x11d1,0x8c,0xa3,0x00,0x60,0xb0,0x57,0x66,0x4a
+DEFINE_GUIDSTRUCT("36523B35-8EE5-11d1-8CA3-0060B057664A",KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_DSS_VIDEO				\
+	0xa0af4f81L,0xe163,0x11d0,0xba,0xd9,0x00,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("a0af4f81-e163-11d0-bad9-00609744111a",KSDATAFORMAT_SUBTYPE_DSS_VIDEO);
+#define KSDATAFORMAT_SUBTYPE_DSS_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DSS_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_DSS_AUDIO				\
+		0xa0af4f82L,0xe163,0x11d0,0xba,0xd9,0x00,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("a0af4f82-e163-11d0-bad9-00609744111a",KSDATAFORMAT_SUBTYPE_DSS_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_DSS_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DSS_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG1Packet				\
+	0xe436eb80,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70
+DEFINE_GUIDSTRUCT("e436eb80-524f-11ce-9F53-0020af0ba770",KSDATAFORMAT_SUBTYPE_MPEG1Packet);
+#define KSDATAFORMAT_SUBTYPE_MPEG1Packet DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG1Packet)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG1Payload			\
+	0xe436eb81,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70
+DEFINE_GUIDSTRUCT("e436eb81-524f-11ce-9F53-0020af0ba770",KSDATAFORMAT_SUBTYPE_MPEG1Payload);
+#define KSDATAFORMAT_SUBTYPE_MPEG1Payload DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG1Payload)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG1Video				\
+	0xe436eb86,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70
+DEFINE_GUIDSTRUCT("e436eb86-524f-11ce-9f53-0020af0ba770",KSDATAFORMAT_SUBTYPE_MPEG1Video);
+#define KSDATAFORMAT_SUBTYPE_MPEG1Video DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG1Video)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO			\
+	0x05589f82L,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a
+DEFINE_GUIDSTRUCT("05589f82-c356-11ce-bf01-00aa0055595a",KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO);
+#define KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO)
+
+#define STATIC_KSDATAFORMAT_TYPE_MPEG2_PES				\
+	0xe06d8020L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8020-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_TYPE_MPEG2_PES);
+#define KSDATAFORMAT_TYPE_MPEG2_PES DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MPEG2_PES)
+
+#define STATIC_KSDATAFORMAT_TYPE_MPEG2_PROGRAM				\
+	0xe06d8022L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8022-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_TYPE_MPEG2_PROGRAM);
+#define KSDATAFORMAT_TYPE_MPEG2_PROGRAM DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MPEG2_PROGRAM)
+
+#define STATIC_KSDATAFORMAT_TYPE_MPEG2_TRANSPORT			\
+	0xe06d8023L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8023-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_TYPE_MPEG2_TRANSPORT);
+#define KSDATAFORMAT_TYPE_MPEG2_TRANSPORT DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO				\
+	0xe06d8026L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8026-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO);
+#define KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO			\
+	0xe06d80e3L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d80e3-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO);
+#define KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO)
+
+#define STATIC_KSPROPSETID_Mpeg2Vid					\
+	0xC8E11B60L,0x0CC9,0x11D0,0xBD,0x69,0x00,0x35,0x05,0xC1,0x03,0xA9
+DEFINE_GUIDSTRUCT("C8E11B60-0CC9-11D0-BD69-003505C103A9",KSPROPSETID_Mpeg2Vid);
+#define KSPROPSETID_Mpeg2Vid DEFINE_GUIDNAMED(KSPROPSETID_Mpeg2Vid)
+
+typedef enum {
+  KSPROPERTY_MPEG2VID_MODES,
+  KSPROPERTY_MPEG2VID_CUR_MODE,
+  KSPROPERTY_MPEG2VID_4_3_RECT,
+  KSPROPERTY_MPEG2VID_16_9_RECT,
+  KSPROPERTY_MPEG2VID_16_9_PANSCAN
+} KSPROPERTY_MPEG2VID;
+
+#define KSMPEGVIDMODE_PANSCAN	0x0001
+#define KSMPEGVIDMODE_LTRBOX	0x0002
+#define KSMPEGVIDMODE_SCALE	0x0004
+
+typedef struct _KSMPEGVID_RECT {
+  ULONG StartX;
+  ULONG StartY;
+  ULONG EndX;
+  ULONG EndY;
+} KSMPEGVID_RECT,*PKSMPEGVID_RECT;
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO				\
+	0xe06d802bL,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d802b-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO			\
+	0xe06d80e5L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d80e5-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_LPCM_AUDIO				\
+	0xe06d8032L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8032-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_LPCM_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_LPCM_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_LPCM_AUDIO			\
+	0xe06d80e6L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d80e6-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SPECIFIER_LPCM_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_LPCM_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_AC3_AUDIO				\
+	0xe06d802cL,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d802c-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_AC3_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_AC3_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_AC3_AUDIO				\
+	0xe06d80e4L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d80e4-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SPECIFIER_AC3_AUDIO);
+#define KSDATAFORMAT_SPECIFIER_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_AC3_AUDIO)
+
+#define STATIC_KSPROPSETID_AC3						\
+	0xBFABE720L,0x6E1F,0x11D0,0xBC,0xF2,0x44,0x45,0x53,0x54,0x00,0x00
+DEFINE_GUIDSTRUCT("BFABE720-6E1F-11D0-BCF2-444553540000",KSPROPSETID_AC3);
+#define KSPROPSETID_AC3 DEFINE_GUIDNAMED(KSPROPSETID_AC3)
+
+typedef enum {
+  KSPROPERTY_AC3_ERROR_CONCEALMENT = 1,
+  KSPROPERTY_AC3_ALTERNATE_AUDIO,
+  KSPROPERTY_AC3_DOWNMIX,
+  KSPROPERTY_AC3_BIT_STREAM_MODE,
+  KSPROPERTY_AC3_DIALOGUE_LEVEL,
+  KSPROPERTY_AC3_LANGUAGE_CODE,
+  KSPROPERTY_AC3_ROOM_TYPE
+} KSPROPERTY_AC3;
+
+typedef struct {
+  WINBOOL fRepeatPreviousBlock;
+  WINBOOL fErrorInCurrentBlock;
+} KSAC3_ERROR_CONCEALMENT,*PKSAC3_ERROR_CONCEALMENT;
+
+typedef struct {
+  WINBOOL fStereo;
+  ULONG DualMode;
+} KSAC3_ALTERNATE_AUDIO,*PKSAC3_ALTERNATE_AUDIO;
+
+#define KSAC3_ALTERNATE_AUDIO_1		1
+#define KSAC3_ALTERNATE_AUDIO_2		2
+#define KSAC3_ALTERNATE_AUDIO_BOTH	3
+
+typedef struct {
+  WINBOOL fDownMix;
+  WINBOOL fDolbySurround;
+} KSAC3_DOWNMIX,*PKSAC3_DOWNMIX;
+
+typedef struct {
+  LONG BitStreamMode;
+} KSAC3_BIT_STREAM_MODE,*PKSAC3_BIT_STREAM_MODE;
+
+#define KSAC3_SERVICE_MAIN_AUDIO	0
+#define KSAC3_SERVICE_NO_DIALOG		1
+#define KSAC3_SERVICE_VISUALLY_IMPAIRED	2
+#define KSAC3_SERVICE_HEARING_IMPAIRED	3
+#define KSAC3_SERVICE_DIALOG_ONLY	4
+#define KSAC3_SERVICE_COMMENTARY	5
+#define KSAC3_SERVICE_EMERGENCY_FLASH	6
+#define KSAC3_SERVICE_VOICE_OVER	7
+
+typedef struct {
+  ULONG DialogueLevel;
+} KSAC3_DIALOGUE_LEVEL,*PKSAC3_DIALOGUE_LEVEL;
+
+typedef struct {
+  WINBOOL fLargeRoom;
+} KSAC3_ROOM_TYPE,*PKSAC3_ROOM_TYPE;
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_DTS_AUDIO				\
+	0xe06d8033L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8033-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_DTS_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_DTS_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DTS_AUDIO)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_SDDS_AUDIO				\
+	0xe06d8034L,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d8034-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_SDDS_AUDIO);
+#define KSDATAFORMAT_SUBTYPE_SDDS_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO)
+
+#define STATIC_KSPROPSETID_AudioDecoderOut				\
+	0x6ca6e020L,0x43bd,0x11d0,0xbd,0x6a,0x00,0x35,0x05,0xc1,0x03,0xa9
+DEFINE_GUIDSTRUCT("6ca6e020-43bd-11d0-bd6a-003505c103a9",KSPROPSETID_AudioDecoderOut);
+#define KSPROPSETID_AudioDecoderOut DEFINE_GUIDNAMED(KSPROPSETID_AudioDecoderOut)
+
+typedef enum {
+  KSPROPERTY_AUDDECOUT_MODES,
+  KSPROPERTY_AUDDECOUT_CUR_MODE
+} KSPROPERTY_AUDDECOUT;
+
+#define KSAUDDECOUTMODE_STEREO_ANALOG	0x0001
+#define KSAUDDECOUTMODE_PCM_51		0x0002
+#define KSAUDDECOUTMODE_SPDIFF		0x0004
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_SUBPICTURE				\
+	0xe06d802dL,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea
+DEFINE_GUIDSTRUCT("e06d802d-db46-11cf-b4d1-00805f6cbbea",KSDATAFORMAT_SUBTYPE_SUBPICTURE);
+#define KSDATAFORMAT_SUBTYPE_SUBPICTURE DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_SUBPICTURE)
+
+#define STATIC_KSPROPSETID_DvdSubPic					\
+	0xac390460L,0x43af,0x11d0,0xbd,0x6a,0x00,0x35,0x05,0xc1,0x03,0xa9
+DEFINE_GUIDSTRUCT("ac390460-43af-11d0-bd6a-003505c103a9",KSPROPSETID_DvdSubPic);
+#define KSPROPSETID_DvdSubPic DEFINE_GUIDNAMED(KSPROPSETID_DvdSubPic)
+
+typedef enum {
+  KSPROPERTY_DVDSUBPIC_PALETTE,
+  KSPROPERTY_DVDSUBPIC_HLI,
+  KSPROPERTY_DVDSUBPIC_COMPOSIT_ON
+} KSPROPERTY_DVDSUBPIC;
+
+typedef struct _KS_DVD_YCrCb {
+  UCHAR Reserved;
+  UCHAR Y;
+  UCHAR Cr;
+  UCHAR Cb;
+} KS_DVD_YCrCb,*PKS_DVD_YCrCb;
+
+typedef struct _KS_DVD_YUV {
+  UCHAR Reserved;
+  UCHAR Y;
+  UCHAR V;
+  UCHAR U;
+} KS_DVD_YUV,*PKS_DVD_YUV;
+
+typedef struct _KSPROPERTY_SPPAL {
+  KS_DVD_YUV sppal[16];
+} KSPROPERTY_SPPAL,*PKSPROPERTY_SPPAL;
+
+typedef struct _KS_COLCON {
+  UCHAR emph1col:4;
+  UCHAR emph2col:4;
+  UCHAR backcol:4;
+  UCHAR patcol:4;
+  UCHAR emph1con:4;
+  UCHAR emph2con:4;
+  UCHAR backcon:4;
+  UCHAR patcon:4;
+} KS_COLCON,*PKS_COLCON;
+
+typedef struct _KSPROPERTY_SPHLI {
+  USHORT HLISS;
+  USHORT Reserved;
+  ULONG StartPTM;
+  ULONG EndPTM;
+  USHORT StartX;
+  USHORT StartY;
+  USHORT StopX;
+  USHORT StopY;
+  KS_COLCON ColCon;
+} KSPROPERTY_SPHLI,*PKSPROPERTY_SPHLI;
+
+typedef WINBOOL KSPROPERTY_COMPOSIT_ON,*PKSPROPERTY_COMPOSIT_ON;
+
+#define STATIC_KSPROPSETID_CopyProt					\
+	0x0E8A0A40L,0x6AEF,0x11D0,0x9E,0xD0,0x00,0xA0,0x24,0xCA,0x19,0xB3
+DEFINE_GUIDSTRUCT("0E8A0A40-6AEF-11D0-9ED0-00A024CA19B3",KSPROPSETID_CopyProt);
+#define KSPROPSETID_CopyProt DEFINE_GUIDNAMED(KSPROPSETID_CopyProt)
+
+typedef enum {
+  KSPROPERTY_DVDCOPY_CHLG_KEY = 0x01,
+  KSPROPERTY_DVDCOPY_DVD_KEY1,
+  KSPROPERTY_DVDCOPY_DEC_KEY2,
+  KSPROPERTY_DVDCOPY_TITLE_KEY,
+  KSPROPERTY_COPY_MACROVISION,
+  KSPROPERTY_DVDCOPY_REGION,
+  KSPROPERTY_DVDCOPY_SET_COPY_STATE,
+  KSPROPERTY_DVDCOPY_DISC_KEY = 0x80
+} KSPROPERTY_COPYPROT;
+
+typedef struct _KS_DVDCOPY_CHLGKEY {
+  BYTE ChlgKey[10];
+  BYTE Reserved[2];
+} KS_DVDCOPY_CHLGKEY,*PKS_DVDCOPY_CHLGKEY;
+
+typedef struct _KS_DVDCOPY_BUSKEY {
+  BYTE BusKey[5];
+  BYTE Reserved[1];
+} KS_DVDCOPY_BUSKEY,*PKS_DVDCOPY_BUSKEY;
+
+typedef struct _KS_DVDCOPY_DISCKEY {
+  BYTE DiscKey[2048];
+} KS_DVDCOPY_DISCKEY,*PKS_DVDCOPY_DISCKEY;
+
+typedef struct _KS_DVDCOPY_REGION {
+  UCHAR Reserved;
+  UCHAR RegionData;
+  UCHAR Reserved2[2];
+} KS_DVDCOPY_REGION,*PKS_DVDCOPY_REGION;
+
+typedef struct _KS_DVDCOPY_TITLEKEY {
+  ULONG KeyFlags;
+  ULONG ReservedNT[2];
+  UCHAR TitleKey[6];
+  UCHAR Reserved[2];
+} KS_DVDCOPY_TITLEKEY,*PKS_DVDCOPY_TITLEKEY;
+
+typedef struct _KS_COPY_MACROVISION {
+  ULONG MACROVISIONLevel;
+} KS_COPY_MACROVISION,*PKS_COPY_MACROVISION;
+
+typedef struct _KS_DVDCOPY_SET_COPY_STATE {
+  ULONG DVDCopyState;
+} KS_DVDCOPY_SET_COPY_STATE,*PKS_DVDCOPY_SET_COPY_STATE;
+
+typedef enum {
+  KS_DVDCOPYSTATE_INITIALIZE,
+  KS_DVDCOPYSTATE_INITIALIZE_TITLE,
+  KS_DVDCOPYSTATE_AUTHENTICATION_NOT_REQUIRED,
+  KS_DVDCOPYSTATE_AUTHENTICATION_REQUIRED,
+  KS_DVDCOPYSTATE_DONE
+} KS_DVDCOPYSTATE;
+
+typedef enum {
+  KS_MACROVISION_DISABLED,
+  KS_MACROVISION_LEVEL1,
+  KS_MACROVISION_LEVEL2,
+  KS_MACROVISION_LEVEL3
+} KS_COPY_MACROVISION_LEVEL,*PKS_COPY_MACROVISION_LEVEL;
+
+#define KS_DVD_CGMS_RESERVED_MASK	0x00000078
+
+#define KS_DVD_CGMS_COPY_PROTECT_MASK	0x00000018
+#define KS_DVD_CGMS_COPY_PERMITTED	0x00000000
+#define KS_DVD_CGMS_COPY_ONCE		0x00000010
+#define KS_DVD_CGMS_NO_COPY		0x00000018
+
+#define KS_DVD_COPYRIGHT_MASK		0x00000040
+#define KS_DVD_NOT_COPYRIGHTED		0x00000000
+#define KS_DVD_COPYRIGHTED		0x00000040
+
+#define KS_DVD_SECTOR_PROTECT_MASK	0x00000020
+#define KS_DVD_SECTOR_NOT_PROTECTED	0x00000000
+#define KS_DVD_SECTOR_PROTECTED		0x00000020
+
+#define STATIC_KSCATEGORY_TVTUNER					\
+	0xa799a800L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4
+DEFINE_GUIDSTRUCT("a799a800-a46d-11d0-a18c-00a02401dcd4",KSCATEGORY_TVTUNER);
+#define KSCATEGORY_TVTUNER DEFINE_GUIDNAMED(KSCATEGORY_TVTUNER)
+
+#define STATIC_KSCATEGORY_CROSSBAR					\
+	0xa799a801L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4
+DEFINE_GUIDSTRUCT("a799a801-a46d-11d0-a18c-00a02401dcd4",KSCATEGORY_CROSSBAR);
+#define KSCATEGORY_CROSSBAR DEFINE_GUIDNAMED(KSCATEGORY_CROSSBAR)
+
+#define STATIC_KSCATEGORY_TVAUDIO					\
+	0xa799a802L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4
+DEFINE_GUIDSTRUCT("a799a802-a46d-11d0-a18c-00a02401dcd4",KSCATEGORY_TVAUDIO);
+#define KSCATEGORY_TVAUDIO DEFINE_GUIDNAMED(KSCATEGORY_TVAUDIO)
+
+#define STATIC_KSCATEGORY_VPMUX						\
+	0xa799a803L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4
+DEFINE_GUIDSTRUCT("a799a803-a46d-11d0-a18c-00a02401dcd4",KSCATEGORY_VPMUX);
+#define KSCATEGORY_VPMUX DEFINE_GUIDNAMED(KSCATEGORY_VPMUX)
+
+#define STATIC_KSCATEGORY_VBICODEC					\
+	0x07dad660L,0x22f1,0x11d1,0xa9,0xf4,0x00,0xc0,0x4f,0xbb,0xde,0x8f
+DEFINE_GUIDSTRUCT("07dad660-22f1-11d1-a9f4-00c04fbbde8f",KSCATEGORY_VBICODEC);
+#define KSCATEGORY_VBICODEC DEFINE_GUIDNAMED(KSCATEGORY_VBICODEC)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_VPVideo				\
+	0x5a9b6a40L,0x1a22,0x11d1,0xba,0xd9,0x0,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("5a9b6a40-1a22-11d1-bad9-00609744111a",KSDATAFORMAT_SUBTYPE_VPVideo);
+#define KSDATAFORMAT_SUBTYPE_VPVideo DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_VPVideo)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_VPVBI				\
+	0x5a9b6a41L,0x1a22,0x11d1,0xba,0xd9,0x0,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("5a9b6a41-1a22-11d1-bad9-00609744111a",KSDATAFORMAT_SUBTYPE_VPVBI);
+#define KSDATAFORMAT_SUBTYPE_VPVBI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_VPVBI)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_VIDEOINFO				\
+	0x05589f80L,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a
+DEFINE_GUIDSTRUCT("05589f80-c356-11ce-bf01-00aa0055595a",KSDATAFORMAT_SPECIFIER_VIDEOINFO);
+#define KSDATAFORMAT_SPECIFIER_VIDEOINFO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_VIDEOINFO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_VIDEOINFO2			\
+	0xf72a76A0L,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("f72a76A0-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_SPECIFIER_VIDEOINFO2);
+#define KSDATAFORMAT_SPECIFIER_VIDEOINFO2 DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_VIDEOINFO2)
+
+#define STATIC_KSDATAFORMAT_TYPE_ANALOGVIDEO				\
+	0x0482dde1L,0x7817,0x11cf,0x8a,0x03,0x00,0xaa,0x00,0x6e,0xcb,0x65
+DEFINE_GUIDSTRUCT("0482dde1-7817-11cf-8a03-00aa006ecb65",KSDATAFORMAT_TYPE_ANALOGVIDEO);
+#define KSDATAFORMAT_TYPE_ANALOGVIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_ANALOGVIDEO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_ANALOGVIDEO			\
+	0x0482dde0L,0x7817,0x11cf,0x8a,0x03,0x00,0xaa,0x00,0x6e,0xcb,0x65
+DEFINE_GUIDSTRUCT("0482dde0-7817-11cf-8a03-00aa006ecb65",KSDATAFORMAT_SPECIFIER_ANALOGVIDEO);
+#define KSDATAFORMAT_SPECIFIER_ANALOGVIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_ANALOGVIDEO)
+
+#define STATIC_KSDATAFORMAT_TYPE_ANALOGAUDIO				\
+	0x0482dee1L,0x7817,0x11cf,0x8a,0x03,0x00,0xaa,0x00,0x6e,0xcb,0x65
+DEFINE_GUIDSTRUCT("0482DEE1-7817-11cf-8a03-00aa006ecb65",KSDATAFORMAT_TYPE_ANALOGAUDIO);
+#define KSDATAFORMAT_TYPE_ANALOGAUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_ANALOGAUDIO)
+
+#define STATIC_KSDATAFORMAT_SPECIFIER_VBI				\
+	0xf72a76e0L,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("f72a76e0-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_SPECIFIER_VBI);
+#define KSDATAFORMAT_SPECIFIER_VBI DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_VBI)
+
+#define STATIC_KSDATAFORMAT_TYPE_VBI					\
+	0xf72a76e1L,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("f72a76e1-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_TYPE_VBI);
+#define KSDATAFORMAT_TYPE_VBI DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_VBI)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_RAW8				\
+	0xca20d9a0,0x3e3e,0x11d1,0x9b,0xf9,0x0,0xc0,0x4f,0xbb,0xde,0xbf
+DEFINE_GUIDSTRUCT("ca20d9a0-3e3e-11d1-9bf9-00c04fbbdebf",KSDATAFORMAT_SUBTYPE_RAW8);
+#define KSDATAFORMAT_SUBTYPE_RAW8 DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_RAW8)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_CC					\
+	0x33214cc1,0x11f,0x11d2,0xb4,0xb1,0x0,0xa0,0xd1,0x2,0xcf,0xbe
+DEFINE_GUIDSTRUCT("33214CC1-011F-11D2-B4B1-00A0D102CFBE",KSDATAFORMAT_SUBTYPE_CC);
+#define KSDATAFORMAT_SUBTYPE_CC DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_CC)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_NABTS				\
+	0xf72a76e2L,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("f72a76e2-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_SUBTYPE_NABTS);
+#define KSDATAFORMAT_SUBTYPE_NABTS DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_NABTS)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_TELETEXT				\
+	0xf72a76e3L,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("f72a76e3-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_SUBTYPE_TELETEXT);
+#define KSDATAFORMAT_SUBTYPE_TELETEXT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_TELETEXT)
+
+#define KS_BI_RGB		0L
+#define KS_BI_RLE8		1L
+#define KS_BI_RLE4		2L
+#define KS_BI_BITFIELDS		3L
+
+typedef struct tagKS_RGBQUAD {
+  BYTE rgbBlue;
+  BYTE rgbGreen;
+  BYTE rgbRed;
+  BYTE rgbReserved;
+} KS_RGBQUAD,*PKS_RGBQUAD;
+
+#define KS_iPALETTE_COLORS	256
+#define KS_iEGA_COLORS		16
+#define KS_iMASK_COLORS		3
+#define KS_iTRUECOLOR		16
+#define KS_iRED			0
+#define KS_iGREEN		1
+#define KS_iBLUE		2
+#define KS_iPALETTE		8
+#define KS_iMAXBITS		8
+#define KS_SIZE_EGA_PALETTE	(KS_iEGA_COLORS *sizeof(KS_RGBQUAD))
+#define KS_SIZE_PALETTE		(KS_iPALETTE_COLORS *sizeof(KS_RGBQUAD))
+
+typedef struct tagKS_BITMAPINFOHEADER {
+  DWORD biSize;
+  LONG biWidth;
+  LONG biHeight;
+  WORD biPlanes;
+  WORD biBitCount;
+  DWORD biCompression;
+  DWORD biSizeImage;
+  LONG biXPelsPerMeter;
+  LONG biYPelsPerMeter;
+  DWORD biClrUsed;
+  DWORD biClrImportant;
+} KS_BITMAPINFOHEADER,*PKS_BITMAPINFOHEADER;
+
+typedef struct tag_KS_TRUECOLORINFO {
+  DWORD dwBitMasks[KS_iMASK_COLORS];
+  KS_RGBQUAD bmiColors[KS_iPALETTE_COLORS];
+} KS_TRUECOLORINFO,*PKS_TRUECOLORINFO;
+
+#define KS_WIDTHBYTES(bits)	((DWORD)(((bits)+31) & (~31)) / 8)
+#define KS_DIBWIDTHBYTES(bi)	(DWORD)KS_WIDTHBYTES((DWORD)(bi).biWidth *(DWORD)(bi).biBitCount)
+#define KS__DIBSIZE(bi)		(KS_DIBWIDTHBYTES(bi) *(DWORD)(bi).biHeight)
+#define KS_DIBSIZE(bi)		((bi).biHeight < 0 ? (-1)*(KS__DIBSIZE(bi)) : KS__DIBSIZE(bi))
+
+typedef LONGLONG REFERENCE_TIME;
+
+typedef struct tagKS_VIDEOINFOHEADER {
+  RECT rcSource;
+  RECT rcTarget;
+  DWORD dwBitRate;
+  DWORD dwBitErrorRate;
+  REFERENCE_TIME AvgTimePerFrame;
+  KS_BITMAPINFOHEADER bmiHeader;
+} KS_VIDEOINFOHEADER,*PKS_VIDEOINFOHEADER;
+
+typedef struct tagKS_VIDEOINFO {
+  RECT rcSource;
+  RECT rcTarget;
+  DWORD dwBitRate;
+  DWORD dwBitErrorRate;
+  REFERENCE_TIME AvgTimePerFrame;
+  KS_BITMAPINFOHEADER bmiHeader;
+  __MINGW_EXTENSION union {
+    KS_RGBQUAD bmiColors[KS_iPALETTE_COLORS];
+    DWORD dwBitMasks[KS_iMASK_COLORS];
+    KS_TRUECOLORINFO TrueColorInfo;
+  };
+} KS_VIDEOINFO,*PKS_VIDEOINFO;
+
+#define KS_SIZE_MASKS			(KS_iMASK_COLORS *sizeof(DWORD))
+#define KS_SIZE_PREHEADER		(FIELD_OFFSET(KS_VIDEOINFOHEADER,bmiHeader))
+
+#define KS_SIZE_VIDEOHEADER(pbmi)	((pbmi)->bmiHeader.biSize + KS_SIZE_PREHEADER)
+
+typedef struct tagKS_VBIINFOHEADER {
+  ULONG StartLine;
+  ULONG EndLine;
+  ULONG SamplingFrequency;
+  ULONG MinLineStartTime;
+  ULONG MaxLineStartTime;
+  ULONG ActualLineStartTime;
+  ULONG ActualLineEndTime;
+  ULONG VideoStandard;
+  ULONG SamplesPerLine;
+  ULONG StrideInBytes;
+  ULONG BufferSize;
+} KS_VBIINFOHEADER,*PKS_VBIINFOHEADER;
+
+#define KS_VBIDATARATE_NABTS		(5727272L)
+#define KS_VBIDATARATE_CC		(503493L)
+#define KS_VBISAMPLINGRATE_4X_NABTS	((long)(4*KS_VBIDATARATE_NABTS))
+#define KS_VBISAMPLINGRATE_47X_NABTS	((long)(27000000))
+#define KS_VBISAMPLINGRATE_5X_NABTS	((long)(5*KS_VBIDATARATE_NABTS))
+
+#define KS_47NABTS_SCALER		(KS_VBISAMPLINGRATE_47X_NABTS/(double)KS_VBIDATARATE_NABTS)
+
+typedef struct tagKS_AnalogVideoInfo {
+  RECT rcSource;
+  RECT rcTarget;
+  DWORD dwActiveWidth;
+  DWORD dwActiveHeight;
+  REFERENCE_TIME AvgTimePerFrame;
+} KS_ANALOGVIDEOINFO,*PKS_ANALOGVIDEOINFO;
+
+#define KS_TVTUNER_CHANGE_BEGIN_TUNE	0x0001L
+#define KS_TVTUNER_CHANGE_END_TUNE	0x0002L
+
+typedef struct tagKS_TVTUNER_CHANGE_INFO {
+  DWORD dwFlags;
+  DWORD dwCountryCode;
+  DWORD dwAnalogVideoStandard;
+  DWORD dwChannel;
+} KS_TVTUNER_CHANGE_INFO,*PKS_TVTUNER_CHANGE_INFO;
+
+typedef enum {
+  KS_MPEG2Level_Low,
+  KS_MPEG2Level_Main,
+  KS_MPEG2Level_High1440,
+  KS_MPEG2Level_High
+} KS_MPEG2Level;
+
+typedef enum {
+  KS_MPEG2Profile_Simple,
+  KS_MPEG2Profile_Main,
+  KS_MPEG2Profile_SNRScalable,
+  KS_MPEG2Profile_SpatiallyScalable,
+  KS_MPEG2Profile_High
+} KS_MPEG2Profile;
+
+#define KS_INTERLACE_IsInterlaced		0x00000001
+#define KS_INTERLACE_1FieldPerSample		0x00000002
+#define KS_INTERLACE_Field1First		0x00000004
+#define KS_INTERLACE_UNUSED			0x00000008
+#define KS_INTERLACE_FieldPatternMask		0x00000030
+#define KS_INTERLACE_FieldPatField1Only		0x00000000
+#define KS_INTERLACE_FieldPatField2Only		0x00000010
+#define KS_INTERLACE_FieldPatBothRegular	0x00000020
+#define KS_INTERLACE_FieldPatBothIrregular	0x00000030
+#define KS_INTERLACE_DisplayModeMask		0x000000c0
+#define KS_INTERLACE_DisplayModeBobOnly		0x00000000
+#define KS_INTERLACE_DisplayModeWeaveOnly	0x00000040
+#define KS_INTERLACE_DisplayModeBobOrWeave	0x00000080
+
+#define KS_MPEG2_DoPanScan			0x00000001
+#define KS_MPEG2_DVDLine21Field1		0x00000002
+#define KS_MPEG2_DVDLine21Field2		0x00000004
+#define KS_MPEG2_SourceIsLetterboxed		0x00000008
+#define KS_MPEG2_FilmCameraMode			0x00000010
+#define KS_MPEG2_LetterboxAnalogOut		0x00000020
+#define KS_MPEG2_DSS_UserData			0x00000040
+#define KS_MPEG2_DVB_UserData			0x00000080
+#define KS_MPEG2_27MhzTimebase			0x00000100
+
+typedef struct tagKS_VIDEOINFOHEADER2 {
+  RECT rcSource;
+  RECT rcTarget;
+  DWORD dwBitRate;
+  DWORD dwBitErrorRate;
+  REFERENCE_TIME AvgTimePerFrame;
+  DWORD dwInterlaceFlags;
+  DWORD dwCopyProtectFlags;
+  DWORD dwPictAspectRatioX;
+  DWORD dwPictAspectRatioY;
+  DWORD dwReserved1;
+  DWORD dwReserved2;
+  KS_BITMAPINFOHEADER bmiHeader;
+} KS_VIDEOINFOHEADER2,*PKS_VIDEOINFOHEADER2;
+
+typedef struct tagKS_MPEG1VIDEOINFO {
+  KS_VIDEOINFOHEADER hdr;
+  DWORD dwStartTimeCode;
+  DWORD cbSequenceHeader;
+  BYTE bSequenceHeader[1];
+} KS_MPEG1VIDEOINFO,*PKS_MPEG1VIDEOINFO;
+
+#define KS_MAX_SIZE_MPEG1_SEQUENCE_INFO	140
+#define KS_SIZE_MPEG1VIDEOINFO(pv)	(FIELD_OFFSET(KS_MPEG1VIDEOINFO,bSequenceHeader[0]) + (pv)->cbSequenceHeader)
+#define KS_MPEG1_SEQUENCE_INFO(pv)	((const BYTE *)(pv)->bSequenceHeader)
+
+typedef struct tagKS_MPEGVIDEOINFO2 {
+  KS_VIDEOINFOHEADER2 hdr;
+  DWORD dwStartTimeCode;
+  DWORD cbSequenceHeader;
+  DWORD dwProfile;
+  DWORD dwLevel;
+  DWORD dwFlags;
+  DWORD bSequenceHeader[1];
+} KS_MPEGVIDEOINFO2,*PKS_MPEGVIDEOINFO2;
+
+#define KS_SIZE_MPEGVIDEOINFO2(pv)	(FIELD_OFFSET(KS_MPEGVIDEOINFO2,bSequenceHeader[0]) + (pv)->cbSequenceHeader)
+#define KS_MPEG1_SEQUENCE_INFO(pv)	((const BYTE *)(pv)->bSequenceHeader)
+
+#define KS_MPEGAUDIOINFO_27MhzTimebase	0x00000001
+
+typedef struct tagKS_MPEAUDIOINFO {
+  DWORD dwFlags;
+  DWORD dwReserved1;
+  DWORD dwReserved2;
+  DWORD dwReserved3;
+} KS_MPEGAUDIOINFO,*PKS_MPEGAUDIOINFO;
+
+typedef struct tagKS_DATAFORMAT_VIDEOINFOHEADER {
+  KSDATAFORMAT DataFormat;
+  KS_VIDEOINFOHEADER VideoInfoHeader;
+} KS_DATAFORMAT_VIDEOINFOHEADER,*PKS_DATAFORMAT_VIDEOINFOHEADER;
+
+typedef struct tagKS_DATAFORMAT_VIDEOINFOHEADER2 {
+  KSDATAFORMAT DataFormat;
+  KS_VIDEOINFOHEADER2 VideoInfoHeader2;
+} KS_DATAFORMAT_VIDEOINFOHEADER2,*PKS_DATAFORMAT_VIDEOINFOHEADER2;
+
+typedef struct tagKS_DATAFORMAT_VIDEOINFO_PALETTE {
+  KSDATAFORMAT DataFormat;
+  KS_VIDEOINFO VideoInfo;
+} KS_DATAFORMAT_VIDEOINFO_PALETTE,*PKS_DATAFORMAT_VIDEOINFO_PALETTE;
+
+typedef struct tagKS_DATAFORMAT_VBIINFOHEADER {
+  KSDATAFORMAT DataFormat;
+  KS_VBIINFOHEADER VBIInfoHeader;
+} KS_DATAFORMAT_VBIINFOHEADER,*PKS_DATAFORMAT_VBIINFOHEADER;
+
+typedef struct _KS_VIDEO_STREAM_CONFIG_CAPS {
+  GUID guid;
+  ULONG VideoStandard;
+  SIZE InputSize;
+  SIZE MinCroppingSize;
+  SIZE MaxCroppingSize;
+  int CropGranularityX;
+  int CropGranularityY;
+  int CropAlignX;
+  int CropAlignY;
+  SIZE MinOutputSize;
+  SIZE MaxOutputSize;
+  int OutputGranularityX;
+  int OutputGranularityY;
+  int StretchTapsX;
+  int StretchTapsY;
+  int ShrinkTapsX;
+  int ShrinkTapsY;
+  LONGLONG MinFrameInterval;
+  LONGLONG MaxFrameInterval;
+  LONG MinBitsPerSecond;
+  LONG MaxBitsPerSecond;
+} KS_VIDEO_STREAM_CONFIG_CAPS,*PKS_VIDEO_STREAM_CONFIG_CAPS;
+
+typedef struct tagKS_DATARANGE_VIDEO {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_VIDEOINFOHEADER VideoInfoHeader;
+} KS_DATARANGE_VIDEO,*PKS_DATARANGE_VIDEO;
+
+typedef struct tagKS_DATARANGE_VIDEO2 {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_VIDEOINFOHEADER2 VideoInfoHeader;
+} KS_DATARANGE_VIDEO2,*PKS_DATARANGE_VIDEO2;
+
+typedef struct tagKS_DATARANGE_MPEG1_VIDEO {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_MPEG1VIDEOINFO VideoInfoHeader;
+} KS_DATARANGE_MPEG1_VIDEO,*PKS_DATARANGE_MPEG1_VIDEO;
+
+typedef struct tagKS_DATARANGE_MPEG2_VIDEO {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_MPEGVIDEOINFO2 VideoInfoHeader;
+} KS_DATARANGE_MPEG2_VIDEO,*PKS_DATARANGE_MPEG2_VIDEO;
+
+typedef struct tagKS_DATARANGE_VIDEO_PALETTE {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_VIDEOINFO VideoInfo;
+} KS_DATARANGE_VIDEO_PALETTE,*PKS_DATARANGE_VIDEO_PALETTE;
+
+typedef struct tagKS_DATARANGE_VIDEO_VBI {
+  KSDATARANGE DataRange;
+  WINBOOL bFixedSizeSamples;
+  WINBOOL bTemporalCompression;
+  DWORD StreamDescriptionFlags;
+  DWORD MemoryAllocationFlags;
+  KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps;
+  KS_VBIINFOHEADER VBIInfoHeader;
+} KS_DATARANGE_VIDEO_VBI,*PKS_DATARANGE_VIDEO_VBI;
+
+typedef struct tagKS_DATARANGE_ANALOGVIDEO {
+  KSDATARANGE DataRange;
+  KS_ANALOGVIDEOINFO AnalogVideoInfo;
+} KS_DATARANGE_ANALOGVIDEO,*PKS_DATARANGE_ANALOGVIDEO;
+
+#define KS_VIDEOSTREAM_PREVIEW		0x0001
+#define KS_VIDEOSTREAM_CAPTURE		0x0002
+#define KS_VIDEOSTREAM_VBI		0x0010
+#define KS_VIDEOSTREAM_NABTS		0x0020
+#define KS_VIDEOSTREAM_CC		0x0100
+#define KS_VIDEOSTREAM_EDS		0x0200
+#define KS_VIDEOSTREAM_TELETEXT		0x0400
+#define KS_VIDEOSTREAM_STILL		0x1000
+#define KS_VIDEOSTREAM_IS_VPE		0x8000
+
+#define KS_VIDEO_ALLOC_VPE_SYSTEM	0x0001
+#define KS_VIDEO_ALLOC_VPE_DISPLAY	0x0002
+#define KS_VIDEO_ALLOC_VPE_AGP		0x0004
+
+#define STATIC_KSPROPSETID_VBICAP_PROPERTIES				\
+	0xf162c607,0x7b35,0x496f,0xad,0x7f,0x2d,0xca,0x3b,0x46,0xb7,0x18
+DEFINE_GUIDSTRUCT("F162C607-7B35-496f-AD7F-2DCA3B46B718",KSPROPSETID_VBICAP_PROPERTIES);
+#define KSPROPSETID_VBICAP_PROPERTIES DEFINE_GUIDNAMED(KSPROPSETID_VBICAP_PROPERTIES)
+
+typedef enum {
+  KSPROPERTY_VBICAP_PROPERTIES_PROTECTION = 0x01
+} KSPROPERTY_VBICAP;
+
+typedef struct _VBICAP_PROPERTIES_PROTECTION_S {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  ULONG Status;
+} VBICAP_PROPERTIES_PROTECTION_S,*PVBICAP_PROPERTIES_PROTECTION_S;
+
+#define KS_VBICAP_PROTECTION_MV_PRESENT				0x0001L
+#define KS_VBICAP_PROTECTION_MV_HARDWARE			0x0002L
+#define KS_VBICAP_PROTECTION_MV_DETECTED			0x0004L
+
+#define KS_NABTS_GROUPID_ORIGINAL_CONTENT_BASE			0x800
+#define KS_NABTS_GROUPID_ORIGINAL_CONTENT_ADVERTISER_BASE	0x810
+
+#define KS_NABTS_GROUPID_PRODUCTION_COMPANY_CONTENT_BASE	0x820
+#define KS_NABTS_GROUPID_PRODUCTION_COMPANY_ADVERTISER_BASE	0x830
+
+#define KS_NABTS_GROUPID_SYNDICATED_SHOW_CONTENT_BASE		0x840
+#define KS_NABTS_GROUPID_SYNDICATED_SHOW_ADVERTISER_BASE	0x850
+
+#define KS_NABTS_GROUPID_NETWORK_WIDE_CONTENT_BASE		0x860
+#define KS_NABTS_GROUPID_NETWORK_WIDE_ADVERTISER_BASE		0x870
+
+#define KS_NABTS_GROUPID_TELEVISION_STATION_CONTENT_BASE	0x880
+#define KS_NABTS_GROUPID_TELEVISION_STATION_ADVERTISER_BASE	0x890
+
+#define KS_NABTS_GROUPID_LOCAL_CABLE_SYSTEM_CONTENT_BASE	0x8A0
+#define KS_NABTS_GROUPID_LOCAL_CABLE_SYSTEM_ADVERTISER_BASE	0x8B0
+
+#define KS_NABTS_GROUPID_MICROSOFT_RESERVED_TEST_DATA_BASE	0x8F0
+
+#define STATIC_KSDATAFORMAT_TYPE_NABTS					\
+	0xe757bca0,0x39ac,0x11d1,0xa9,0xf5,0x0,0xc0,0x4f,0xbb,0xde,0x8f
+DEFINE_GUIDSTRUCT("E757BCA0-39AC-11d1-A9F5-00C04FBBDE8F",KSDATAFORMAT_TYPE_NABTS);
+#define KSDATAFORMAT_TYPE_NABTS DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_NABTS)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_NABTS_FEC				\
+	0xe757bca1,0x39ac,0x11d1,0xa9,0xf5,0x0,0xc0,0x4f,0xbb,0xde,0x8f
+DEFINE_GUIDSTRUCT("E757BCA1-39AC-11d1-A9F5-00C04FBBDE8F",KSDATAFORMAT_SUBTYPE_NABTS_FEC);
+#define KSDATAFORMAT_SUBTYPE_NABTS_FEC DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_NABTS_FEC)
+
+#define MAX_NABTS_VBI_LINES_PER_FIELD	11
+#define NABTS_LINES_PER_BUNDLE		16
+#define NABTS_PAYLOAD_PER_LINE		28
+#define NABTS_BYTES_PER_LINE		36
+
+typedef struct _NABTSFEC_BUFFER {
+  ULONG dataSize;
+  USHORT groupID;
+  USHORT Reserved;
+  UCHAR data[NABTS_LINES_PER_BUNDLE *NABTS_PAYLOAD_PER_LINE];
+} NABTSFEC_BUFFER,*PNABTSFEC_BUFFER;
+
+#define STATIC_KSPROPSETID_VBICodecFiltering				\
+	0xcafeb0caL,0x8715,0x11d0,0xbd,0x6a,0x00,0x35,0xc0,0xed,0xba,0xbe
+DEFINE_GUIDSTRUCT("cafeb0ca-8715-11d0-bd6a-0035c0edbabe",KSPROPSETID_VBICodecFiltering);
+#define KSPROPSETID_VBICodecFiltering DEFINE_GUIDNAMED(KSPROPSETID_VBICodecFiltering)
+
+typedef enum {
+  KSPROPERTY_VBICODECFILTERING_SCANLINES_REQUESTED_BIT_ARRAY = 0x01,
+  KSPROPERTY_VBICODECFILTERING_SCANLINES_DISCOVERED_BIT_ARRAY,
+  KSPROPERTY_VBICODECFILTERING_SUBSTREAMS_REQUESTED_BIT_ARRAY,
+  KSPROPERTY_VBICODECFILTERING_SUBSTREAMS_DISCOVERED_BIT_ARRAY,
+  KSPROPERTY_VBICODECFILTERING_STATISTICS
+} KSPROPERTY_VBICODECFILTERING;
+
+typedef struct _VBICODECFILTERING_SCANLINES {
+  DWORD DwordBitArray[32];
+} VBICODECFILTERING_SCANLINES,*PVBICODECFILTERING_SCANLINES;
+
+typedef struct _VBICODECFILTERING_NABTS_SUBSTREAMS {
+  DWORD SubstreamMask[128];
+} VBICODECFILTERING_NABTS_SUBSTREAMS,*PVBICODECFILTERING_NABTS_SUBSTREAMS;
+
+typedef struct _VBICODECFILTERING_CC_SUBSTREAMS {
+  DWORD SubstreamMask;
+} VBICODECFILTERING_CC_SUBSTREAMS,*PVBICODECFILTERING_CC_SUBSTREAMS;
+
+#define KS_CC_SUBSTREAM_ODD		0x0001L
+#define KS_CC_SUBSTREAM_EVEN		0x0002L
+
+#define KS_CC_SUBSTREAM_FIELD1_MASK	0x00F0L
+#define KS_CC_SUBSTREAM_SERVICE_CC1	0x0010L
+#define KS_CC_SUBSTREAM_SERVICE_CC2	0x0020L
+#define KS_CC_SUBSTREAM_SERVICE_T1	0x0040L
+#define KS_CC_SUBSTREAM_SERVICE_T2	0x0080L
+
+#define KS_CC_SUBSTREAM_FIELD2_MASK	0x1F00L
+#define KS_CC_SUBSTREAM_SERVICE_CC3	0x0100L
+#define KS_CC_SUBSTREAM_SERVICE_CC4	0x0200L
+#define KS_CC_SUBSTREAM_SERVICE_T3	0x0400L
+#define KS_CC_SUBSTREAM_SERVICE_T4	0x0800L
+#define KS_CC_SUBSTREAM_SERVICE_XDS	0x1000L
+
+#define CC_MAX_HW_DECODE_LINES		12
+typedef struct _CC_BYTE_PAIR {
+  BYTE Decoded[2];
+  USHORT Reserved;
+} CC_BYTE_PAIR,*PCC_BYTE_PAIR;
+
+typedef struct _CC_HW_FIELD {
+  VBICODECFILTERING_SCANLINES ScanlinesRequested;
+  ULONG fieldFlags;
+  LONGLONG PictureNumber;
+  CC_BYTE_PAIR Lines[CC_MAX_HW_DECODE_LINES];
+} CC_HW_FIELD,*PCC_HW_FIELD;
+
+#ifndef PACK_PRAGMAS_NOT_SUPPORTED
+#include <pshpack1.h>
+#endif
+typedef struct _NABTS_BUFFER_LINE {
+  BYTE Confidence;
+  BYTE Bytes[NABTS_BYTES_PER_LINE];
+} NABTS_BUFFER_LINE,*PNABTS_BUFFER_LINE;
+
+#define NABTS_BUFFER_PICTURENUMBER_SUPPORT	1
+typedef struct _NABTS_BUFFER {
+  VBICODECFILTERING_SCANLINES ScanlinesRequested;
+  LONGLONG PictureNumber;
+  NABTS_BUFFER_LINE NabtsLines[MAX_NABTS_VBI_LINES_PER_FIELD];
+} NABTS_BUFFER,*PNABTS_BUFFER;
+#ifndef PACK_PRAGMAS_NOT_SUPPORTED
+#include <poppack.h>
+#endif
+
+#define WST_TVTUNER_CHANGE_BEGIN_TUNE	0x1000L
+#define WST_TVTUNER_CHANGE_END_TUNE	0x2000L
+
+#define MAX_WST_VBI_LINES_PER_FIELD	17
+#define WST_BYTES_PER_LINE		42
+
+typedef struct _WST_BUFFER_LINE {
+  BYTE Confidence;
+  BYTE Bytes[WST_BYTES_PER_LINE];
+} WST_BUFFER_LINE,*PWST_BUFFER_LINE;
+
+typedef struct _WST_BUFFER {
+  VBICODECFILTERING_SCANLINES ScanlinesRequested;
+  WST_BUFFER_LINE WstLines[MAX_WST_VBI_LINES_PER_FIELD];
+} WST_BUFFER,*PWST_BUFFER;
+
+typedef struct _VBICODECFILTERING_STATISTICS_COMMON {
+  DWORD InputSRBsProcessed;
+  DWORD OutputSRBsProcessed;
+  DWORD SRBsIgnored;
+  DWORD InputSRBsMissing;
+  DWORD OutputSRBsMissing;
+  DWORD OutputFailures;
+  DWORD InternalErrors;
+  DWORD ExternalErrors;
+  DWORD InputDiscontinuities;
+  DWORD DSPFailures;
+  DWORD TvTunerChanges;
+  DWORD VBIHeaderChanges;
+  DWORD LineConfidenceAvg;
+  DWORD BytesOutput;
+} VBICODECFILTERING_STATISTICS_COMMON,*PVBICODECFILTERING_STATISTICS_COMMON;
+
+typedef struct _VBICODECFILTERING_STATISTICS_COMMON_PIN {
+  DWORD SRBsProcessed;
+  DWORD SRBsIgnored;
+  DWORD SRBsMissing;
+  DWORD InternalErrors;
+  DWORD ExternalErrors;
+  DWORD Discontinuities;
+  DWORD LineConfidenceAvg;
+  DWORD BytesOutput;
+} VBICODECFILTERING_STATISTICS_COMMON_PIN,*PVBICODECFILTERING_STATISTICS_COMMON_PIN;
+
+typedef struct _VBICODECFILTERING_STATISTICS_NABTS {
+  VBICODECFILTERING_STATISTICS_COMMON Common;
+  DWORD FECBundleBadLines;
+  DWORD FECQueueOverflows;
+  DWORD FECCorrectedLines;
+  DWORD FECUncorrectableLines;
+  DWORD BundlesProcessed;
+  DWORD BundlesSent2IP;
+  DWORD FilteredLines;
+} VBICODECFILTERING_STATISTICS_NABTS,*PVBICODECFILTERING_STATISTICS_NABTS;
+
+typedef struct _VBICODECFILTERING_STATISTICS_NABTS_PIN {
+  VBICODECFILTERING_STATISTICS_COMMON_PIN Common;
+} VBICODECFILTERING_STATISTICS_NABTS_PIN,*PVBICODECFILTERING_STATISTICS_NABTS_PIN;
+
+typedef struct _VBICODECFILTERING_STATISTICS_CC {
+  VBICODECFILTERING_STATISTICS_COMMON Common;
+} VBICODECFILTERING_STATISTICS_CC,*PVBICODECFILTERING_STATISTICS_CC;
+
+typedef struct _VBICODECFILTERING_STATISTICS_CC_PIN {
+  VBICODECFILTERING_STATISTICS_COMMON_PIN Common;
+} VBICODECFILTERING_STATISTICS_CC_PIN,*PVBICODECFILTERING_STATISTICS_CC_PIN;
+
+typedef struct _VBICODECFILTERING_STATISTICS_TELETEXT {
+  VBICODECFILTERING_STATISTICS_COMMON Common;
+} VBICODECFILTERING_STATISTICS_TELETEXT,*PVBICODECFILTERING_STATISTICS_TELETEXT;
+
+typedef struct _VBICODECFILTERING_STATISTICS_TELETEXT_PIN {
+  VBICODECFILTERING_STATISTICS_COMMON_PIN Common;
+} VBICODECFILTERING_STATISTICS_TELETEXT_PIN,*PVBICODECFILTERING_STATISTICS_TELETEXT_PIN;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_SCANLINES Scanlines;
+} KSPROPERTY_VBICODECFILTERING_SCANLINES_S,*PKSPROPERTY_VBICODECFILTERING_SCANLINES_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_NABTS_SUBSTREAMS Substreams;
+} KSPROPERTY_VBICODECFILTERING_NABTS_SUBSTREAMS_S,*PKSPROPERTY_VBICODECFILTERING_NABTS_SUBSTREAMS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_CC_SUBSTREAMS Substreams;
+} KSPROPERTY_VBICODECFILTERING_CC_SUBSTREAMS_S,*PKSPROPERTY_VBICODECFILTERING_CC_SUBSTREAMS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_COMMON Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_COMMON_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_COMMON_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_COMMON_PIN Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_COMMON_PIN_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_COMMON_PIN_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_NABTS Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_NABTS_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_NABTS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_NABTS_PIN Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_NABTS_PIN_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_NABTS_PIN_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_CC Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_CC_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_CC_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  VBICODECFILTERING_STATISTICS_CC_PIN Statistics;
+} KSPROPERTY_VBICODECFILTERING_STATISTICS_CC_PIN_S,*PKSPROPERTY_VBICODECFILTERING_STATISTICS_CC_PIN_S;
+
+#define STATIC_PINNAME_VIDEO_CAPTURE					\
+	0xfb6c4281,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+#define STATIC_PINNAME_CAPTURE STATIC_PINNAME_VIDEO_CAPTURE
+DEFINE_GUIDSTRUCT("FB6C4281-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_CAPTURE);
+#define PINNAME_VIDEO_CAPTURE DEFINE_GUIDNAMED(PINNAME_VIDEO_CAPTURE)
+#define PINNAME_CAPTURE PINNAME_VIDEO_CAPTURE
+
+#define STATIC_PINNAME_VIDEO_CC_CAPTURE					\
+	0x1aad8061,0x12d,0x11d2,0xb4,0xb1,0x0,0xa0,0xd1,0x2,0xcf,0xbe
+#define STATIC_PINNAME_CC_CAPTURE STATIC_PINNAME_VIDEO_CC_CAPTURE
+DEFINE_GUIDSTRUCT("1AAD8061-012D-11d2-B4B1-00A0D102CFBE",PINNAME_VIDEO_CC_CAPTURE);
+#define PINNAME_VIDEO_CC_CAPTURE DEFINE_GUIDNAMED(PINNAME_VIDEO_CC_CAPTURE)
+
+#define STATIC_PINNAME_VIDEO_NABTS_CAPTURE				\
+	0x29703660,0x498a,0x11d2,0xb4,0xb1,0x0,0xa0,0xd1,0x2,0xcf,0xbe
+#define STATIC_PINNAME_NABTS_CAPTURE STATIC_PINNAME_VIDEO_NABTS_CAPTURE
+DEFINE_GUIDSTRUCT("29703660-498A-11d2-B4B1-00A0D102CFBE",PINNAME_VIDEO_NABTS_CAPTURE);
+#define PINNAME_VIDEO_NABTS_CAPTURE DEFINE_GUIDNAMED(PINNAME_VIDEO_NABTS_CAPTURE)
+
+#define STATIC_PINNAME_VIDEO_PREVIEW					\
+	0xfb6c4282,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+#define STATIC_PINNAME_PREVIEW STATIC_PINNAME_VIDEO_PREVIEW
+DEFINE_GUIDSTRUCT("FB6C4282-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_PREVIEW);
+#define PINNAME_VIDEO_PREVIEW DEFINE_GUIDNAMED(PINNAME_VIDEO_PREVIEW)
+#define PINNAME_PREVIEW PINNAME_VIDEO_PREVIEW
+
+#define STATIC_PINNAME_VIDEO_ANALOGVIDEOIN				\
+	0xfb6c4283,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4283-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_ANALOGVIDEOIN);
+#define PINNAME_VIDEO_ANALOGVIDEOIN DEFINE_GUIDNAMED(PINNAME_VIDEO_ANALOGVIDEOIN)
+
+#define STATIC_PINNAME_VIDEO_VBI					\
+	0xfb6c4284,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4284-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_VBI);
+#define PINNAME_VIDEO_VBI DEFINE_GUIDNAMED(PINNAME_VIDEO_VBI)
+
+#define STATIC_PINNAME_VIDEO_VIDEOPORT					\
+	0xfb6c4285,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4285-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_VIDEOPORT);
+#define PINNAME_VIDEO_VIDEOPORT DEFINE_GUIDNAMED(PINNAME_VIDEO_VIDEOPORT)
+
+#define STATIC_PINNAME_VIDEO_NABTS					\
+	0xfb6c4286,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4286-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_NABTS);
+#define PINNAME_VIDEO_NABTS DEFINE_GUIDNAMED(PINNAME_VIDEO_NABTS)
+
+#define STATIC_PINNAME_VIDEO_EDS					\
+	0xfb6c4287,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4287-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_EDS);
+#define PINNAME_VIDEO_EDS DEFINE_GUIDNAMED(PINNAME_VIDEO_EDS)
+
+#define STATIC_PINNAME_VIDEO_TELETEXT					\
+	0xfb6c4288,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4288-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_TELETEXT);
+#define PINNAME_VIDEO_TELETEXT DEFINE_GUIDNAMED(PINNAME_VIDEO_TELETEXT)
+
+#define STATIC_PINNAME_VIDEO_CC						\
+	0xfb6c4289,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C4289-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_CC);
+#define PINNAME_VIDEO_CC DEFINE_GUIDNAMED(PINNAME_VIDEO_CC)
+
+#define STATIC_PINNAME_VIDEO_STILL					\
+	0xfb6c428A,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C428A-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_STILL);
+#define PINNAME_VIDEO_STILL DEFINE_GUIDNAMED(PINNAME_VIDEO_STILL)
+
+#define STATIC_PINNAME_VIDEO_TIMECODE					\
+	0xfb6c428B,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C428B-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_TIMECODE);
+#define PINNAME_VIDEO_TIMECODE DEFINE_GUIDNAMED(PINNAME_VIDEO_TIMECODE)
+
+#define STATIC_PINNAME_VIDEO_VIDEOPORT_VBI				\
+	0xfb6c428C,0x353,0x11d1,0x90,0x5f,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("FB6C428C-0353-11d1-905F-0000C0CC16BA",PINNAME_VIDEO_VIDEOPORT_VBI);
+#define PINNAME_VIDEO_VIDEOPORT_VBI DEFINE_GUIDNAMED(PINNAME_VIDEO_VIDEOPORT_VBI)
+
+#define KS_VIDEO_FLAG_FRAME		0x0000L
+#define KS_VIDEO_FLAG_FIELD1		0x0001L
+#define KS_VIDEO_FLAG_FIELD2		0x0002L
+
+#define KS_VIDEO_FLAG_I_FRAME		0x0000L
+#define KS_VIDEO_FLAG_P_FRAME		0x0010L
+#define KS_VIDEO_FLAG_B_FRAME		0x0020L
+
+typedef struct tagKS_FRAME_INFO {
+  ULONG ExtendedHeaderSize;
+  DWORD dwFrameFlags;
+  LONGLONG PictureNumber;
+  LONGLONG DropCount;
+  HANDLE hDirectDraw;
+  HANDLE hSurfaceHandle;
+  RECT DirectDrawRect;
+
+  DWORD Reserved1;
+  DWORD Reserved2;
+  DWORD Reserved3;
+  DWORD Reserved4;
+} KS_FRAME_INFO,*PKS_FRAME_INFO;
+
+#define KS_VBI_FLAG_FIELD1		0x0001L
+#define KS_VBI_FLAG_FIELD2		0x0002L
+
+#define KS_VBI_FLAG_MV_PRESENT		0x0100L
+#define KS_VBI_FLAG_MV_HARDWARE		0x0200L
+#define KS_VBI_FLAG_MV_DETECTED		0x0400L
+
+#define KS_VBI_FLAG_TVTUNER_CHANGE	0x0010L
+#define KS_VBI_FLAG_VBIINFOHEADER_CHANGE 0x0020L
+
+typedef struct tagKS_VBI_FRAME_INFO {
+  ULONG ExtendedHeaderSize;
+  DWORD dwFrameFlags;
+  LONGLONG PictureNumber;
+  LONGLONG DropCount;
+  DWORD dwSamplingFrequency;
+  KS_TVTUNER_CHANGE_INFO TvTunerChangeInfo;
+  KS_VBIINFOHEADER VBIInfoHeader;
+} KS_VBI_FRAME_INFO,*PKS_VBI_FRAME_INFO;
+
+typedef enum
+{
+  KS_AnalogVideo_None = 0x00000000,
+  KS_AnalogVideo_NTSC_M = 0x00000001,
+  KS_AnalogVideo_NTSC_M_J = 0x00000002,
+  KS_AnalogVideo_NTSC_433 = 0x00000004,
+  KS_AnalogVideo_PAL_B = 0x00000010,
+  KS_AnalogVideo_PAL_D = 0x00000020,
+  KS_AnalogVideo_PAL_G = 0x00000040,
+  KS_AnalogVideo_PAL_H = 0x00000080,
+  KS_AnalogVideo_PAL_I = 0x00000100,
+  KS_AnalogVideo_PAL_M = 0x00000200,
+  KS_AnalogVideo_PAL_N = 0x00000400,
+  KS_AnalogVideo_PAL_60 = 0x00000800,
+  KS_AnalogVideo_SECAM_B = 0x00001000,
+  KS_AnalogVideo_SECAM_D = 0x00002000,
+  KS_AnalogVideo_SECAM_G = 0x00004000,
+  KS_AnalogVideo_SECAM_H = 0x00008000,
+  KS_AnalogVideo_SECAM_K = 0x00010000,
+  KS_AnalogVideo_SECAM_K1 = 0x00020000,
+  KS_AnalogVideo_SECAM_L = 0x00040000,
+  KS_AnalogVideo_SECAM_L1 = 0x00080000,
+  KS_AnalogVideo_PAL_N_COMBO = 0x00100000
+} KS_AnalogVideoStandard;
+
+#define KS_AnalogVideo_NTSC_Mask	0x00000007
+#define KS_AnalogVideo_PAL_Mask		0x00100FF0
+#define KS_AnalogVideo_SECAM_Mask	0x000FF000
+
+#define STATIC_PROPSETID_ALLOCATOR_CONTROL				\
+	0x53171960,0x148e,0x11d2,0x99,0x79,0x0,0x0,0xc0,0xcc,0x16,0xba
+DEFINE_GUIDSTRUCT("53171960-148E-11d2-9979-0000C0CC16BA",PROPSETID_ALLOCATOR_CONTROL);
+#define PROPSETID_ALLOCATOR_CONTROL DEFINE_GUIDNAMED(PROPSETID_ALLOCATOR_CONTROL)
+
+typedef enum {
+  KSPROPERTY_ALLOCATOR_CONTROL_HONOR_COUNT,
+  KSPROPERTY_ALLOCATOR_CONTROL_SURFACE_SIZE,
+  KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_CAPS,
+  KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_INTERLEAVE
+} KSPROPERTY_ALLOCATOR_CONTROL;
+
+typedef struct {
+  ULONG CX;
+  ULONG CY;
+} KSPROPERTY_ALLOCATOR_CONTROL_SURFACE_SIZE_S,*PKSPROPERTY_ALLOCATOR_CONTROL_SURFACE_SIZE_S;
+
+typedef struct {
+  ULONG InterleavedCapSupported;
+} KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_CAPS_S,*PKSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_CAPS_S;
+
+typedef struct {
+  ULONG InterleavedCapPossible;
+} KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_INTERLEAVE_S,*PKSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_INTERLEAVE_S;
+
+#define STATIC_PROPSETID_VIDCAP_VIDEOPROCAMP				\
+	0xC6E13360L,0x30AC,0x11d0,0xa1,0x8c,0x00,0xA0,0xC9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("C6E13360-30AC-11d0-A18C-00A0C9118956",PROPSETID_VIDCAP_VIDEOPROCAMP);
+#define PROPSETID_VIDCAP_VIDEOPROCAMP DEFINE_GUIDNAMED(PROPSETID_VIDCAP_VIDEOPROCAMP)
+
+typedef enum {
+  KSPROPERTY_VIDEOPROCAMP_BRIGHTNESS,
+  KSPROPERTY_VIDEOPROCAMP_CONTRAST,
+  KSPROPERTY_VIDEOPROCAMP_HUE,
+  KSPROPERTY_VIDEOPROCAMP_SATURATION,
+  KSPROPERTY_VIDEOPROCAMP_SHARPNESS,
+  KSPROPERTY_VIDEOPROCAMP_GAMMA,
+  KSPROPERTY_VIDEOPROCAMP_COLORENABLE,
+  KSPROPERTY_VIDEOPROCAMP_WHITEBALANCE,
+  KSPROPERTY_VIDEOPROCAMP_BACKLIGHT_COMPENSATION,
+  KSPROPERTY_VIDEOPROCAMP_GAIN,
+  KSPROPERTY_VIDEOPROCAMP_DIGITAL_MULTIPLIER,
+  KSPROPERTY_VIDEOPROCAMP_DIGITAL_MULTIPLIER_LIMIT,
+  KSPROPERTY_VIDEOPROCAMP_WHITEBALANCE_COMPONENT,
+  KSPROPERTY_VIDEOPROCAMP_POWERLINE_FREQUENCY
+} KSPROPERTY_VIDCAP_VIDEOPROCAMP;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_VIDEOPROCAMP_S,*PKSPROPERTY_VIDEOPROCAMP_S;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_VIDEOPROCAMP_NODE_S,*PKSPROPERTY_VIDEOPROCAMP_NODE_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value1;
+  ULONG Flags;
+  ULONG Capabilities;
+  LONG Value2;
+} KSPROPERTY_VIDEOPROCAMP_S2,*PKSPROPERTY_VIDEOPROCAMP_S2;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  LONG Value1;
+  ULONG Flags;
+  ULONG Capabilities;
+  LONG Value2;
+} KSPROPERTY_VIDEOPROCAMP_NODE_S2,*PKSPROPERTY_VIDEOPROCAMP_NODE_S2;
+
+#define KSPROPERTY_VIDEOPROCAMP_FLAGS_AUTO	0X0001L
+#define KSPROPERTY_VIDEOPROCAMP_FLAGS_MANUAL	0X0002L
+
+#define STATIC_PROPSETID_VIDCAP_SELECTOR				\
+	0x1ABDAECA,0x68B6,0x4F83,0x93,0x71,0xB4,0x13,0x90,0x7C,0x7B,0x9F
+DEFINE_GUIDSTRUCT("1ABDAECA-68B6-4F83-9371-B413907C7B9F",PROPSETID_VIDCAP_SELECTOR);
+#define PROPSETID_VIDCAP_SELECTOR DEFINE_GUIDNAMED(PROPSETID_VIDCAP_SELECTOR)
+
+typedef enum {
+  KSPROPERTY_SELECTOR_SOURCE_NODE_ID,
+  KSPROPERTY_SELECTOR_NUM_SOURCES
+} KSPROPERTY_VIDCAP_SELECTOR,*PKSPROPERTY_VIDCAP_SELECTOR;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_SELECTOR_S,*PKSPROPERTY_SELECTOR_S;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_SELECTOR_NODE_S,*PKSPROPERTY_SELECTOR_NODE_S;
+
+#define STATIC_PROPSETID_TUNER						\
+	0x6a2e0605L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0605-28e4-11d0-a18c-00a0c9118956",PROPSETID_TUNER);
+#define PROPSETID_TUNER DEFINE_GUIDNAMED(PROPSETID_TUNER)
+
+typedef enum {
+  KSPROPERTY_TUNER_CAPS,
+  KSPROPERTY_TUNER_MODE_CAPS,
+  KSPROPERTY_TUNER_MODE,
+  KSPROPERTY_TUNER_STANDARD,
+  KSPROPERTY_TUNER_FREQUENCY,
+  KSPROPERTY_TUNER_INPUT,
+  KSPROPERTY_TUNER_STATUS,
+  KSPROPERTY_TUNER_IF_MEDIUM
+} KSPROPERTY_TUNER;
+
+typedef enum {
+  KSPROPERTY_TUNER_MODE_TV = 0X0001,
+  KSPROPERTY_TUNER_MODE_FM_RADIO = 0X0002,
+  KSPROPERTY_TUNER_MODE_AM_RADIO = 0X0004,
+  KSPROPERTY_TUNER_MODE_DSS = 0X0008,
+  KSPROPERTY_TUNER_MODE_ATSC = 0X0010
+} KSPROPERTY_TUNER_MODES;
+
+typedef enum {
+  KS_TUNER_TUNING_EXACT = 1,
+  KS_TUNER_TUNING_FINE,
+  KS_TUNER_TUNING_COARSE
+} KS_TUNER_TUNING_FLAGS;
+
+typedef enum {
+  KS_TUNER_STRATEGY_PLL = 0X01,
+  KS_TUNER_STRATEGY_SIGNAL_STRENGTH = 0X02,
+  KS_TUNER_STRATEGY_DRIVER_TUNES = 0X04
+} KS_TUNER_STRATEGY;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG ModesSupported;
+  KSPIN_MEDIUM VideoMedium;
+  KSPIN_MEDIUM TVAudioMedium;
+  KSPIN_MEDIUM RadioAudioMedium;
+} KSPROPERTY_TUNER_CAPS_S,*PKSPROPERTY_TUNER_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  KSPIN_MEDIUM IFMedium;
+} KSPROPERTY_TUNER_IF_MEDIUM_S,*PKSPROPERTY_TUNER_IF_MEDIUM_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Mode;
+  ULONG StandardsSupported;
+  ULONG MinFrequency;
+  ULONG MaxFrequency;
+  ULONG TuningGranularity;
+  ULONG NumberOfInputs;
+  ULONG SettlingTime;
+  ULONG Strategy;
+} KSPROPERTY_TUNER_MODE_CAPS_S,*PKSPROPERTY_TUNER_MODE_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Mode;
+} KSPROPERTY_TUNER_MODE_S,*PKSPROPERTY_TUNER_MODE_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Frequency;
+  ULONG LastFrequency;
+  ULONG TuningFlags;
+  ULONG VideoSubChannel;
+  ULONG AudioSubChannel;
+  ULONG Channel;
+  ULONG Country;
+} KSPROPERTY_TUNER_FREQUENCY_S,*PKSPROPERTY_TUNER_FREQUENCY_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Standard;
+} KSPROPERTY_TUNER_STANDARD_S,*PKSPROPERTY_TUNER_STANDARD_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG InputIndex;
+} KSPROPERTY_TUNER_INPUT_S,*PKSPROPERTY_TUNER_INPUT_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG CurrentFrequency;
+  ULONG PLLOffset;
+  ULONG SignalStrength;
+  ULONG Busy;
+} KSPROPERTY_TUNER_STATUS_S,*PKSPROPERTY_TUNER_STATUS_S;
+
+#define STATIC_EVENTSETID_TUNER						\
+	0x6a2e0606L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0606-28e4-11d0-a18c-00a0c9118956",EVENTSETID_TUNER);
+#define EVENTSETID_TUNER DEFINE_GUIDNAMED(EVENTSETID_TUNER)
+
+typedef enum {
+  KSEVENT_TUNER_CHANGED
+} KSEVENT_TUNER;
+
+#define STATIC_KSNODETYPE_VIDEO_STREAMING				\
+	0xDFF229E1L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E1-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_STREAMING);
+#define KSNODETYPE_VIDEO_STREAMING DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_STREAMING)
+
+#define STATIC_KSNODETYPE_VIDEO_INPUT_TERMINAL				\
+	0xDFF229E2L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E2-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_INPUT_TERMINAL);
+#define KSNODETYPE_VIDEO_INPUT_TERMINAL DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_INPUT_TERMINAL)
+
+#define STATIC_KSNODETYPE_VIDEO_OUTPUT_TERMINAL				\
+	0xDFF229E3L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E3-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_OUTPUT_TERMINAL);
+#define KSNODETYPE_VIDEO_OUTPUT_TERMINAL DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_OUTPUT_TERMINAL)
+
+#define STATIC_KSNODETYPE_VIDEO_SELECTOR				\
+	0xDFF229E4L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E4-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_SELECTOR);
+#define KSNODETYPE_VIDEO_SELECTOR DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_SELECTOR)
+
+#define STATIC_KSNODETYPE_VIDEO_PROCESSING				\
+	0xDFF229E5L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E5-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_PROCESSING);
+#define KSNODETYPE_VIDEO_PROCESSING DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_PROCESSING)
+
+#define STATIC_KSNODETYPE_VIDEO_CAMERA_TERMINAL				\
+	0xDFF229E6L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E6-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_CAMERA_TERMINAL);
+#define KSNODETYPE_VIDEO_CAMERA_TERMINAL DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_CAMERA_TERMINAL)
+
+#define STATIC_KSNODETYPE_VIDEO_INPUT_MTT				\
+	0xDFF229E7L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E7-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_INPUT_MTT);
+#define KSNODETYPE_VIDEO_INPUT_MTT DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_INPUT_MTT)
+
+#define STATIC_KSNODETYPE_VIDEO_OUTPUT_MTT				\
+	0xDFF229E8L,0xF70F,0x11D0,0xB9,0x17,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("DFF229E8-F70F-11D0-B917-00A0C9223196",KSNODETYPE_VIDEO_OUTPUT_MTT);
+#define KSNODETYPE_VIDEO_OUTPUT_MTT DEFINE_GUIDNAMED(KSNODETYPE_VIDEO_OUTPUT_MTT)
+
+#define STATIC_PROPSETID_VIDCAP_VIDEOENCODER				\
+	0x6a2e0610L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0610-28e4-11d0-a18c-00a0c9118956",PROPSETID_VIDCAP_VIDEOENCODER);
+#define PROPSETID_VIDCAP_VIDEOENCODER DEFINE_GUIDNAMED(PROPSETID_VIDCAP_VIDEOENCODER)
+
+typedef enum {
+  KSPROPERTY_VIDEOENCODER_CAPS,
+  KSPROPERTY_VIDEOENCODER_STANDARD,
+  KSPROPERTY_VIDEOENCODER_COPYPROTECTION,
+  KSPROPERTY_VIDEOENCODER_CC_ENABLE
+} KSPROPERTY_VIDCAP_VIDEOENCODER;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_VIDEOENCODER_S,*PKSPROPERTY_VIDEOENCODER_S;
+
+#define STATIC_PROPSETID_VIDCAP_VIDEODECODER				\
+	0xC6E13350L,0x30AC,0x11d0,0xA1,0x8C,0x00,0xA0,0xC9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("C6E13350-30AC-11d0-A18C-00A0C9118956",PROPSETID_VIDCAP_VIDEODECODER);
+#define PROPSETID_VIDCAP_VIDEODECODER DEFINE_GUIDNAMED(PROPSETID_VIDCAP_VIDEODECODER)
+
+typedef enum {
+  KSPROPERTY_VIDEODECODER_CAPS,
+  KSPROPERTY_VIDEODECODER_STANDARD,
+  KSPROPERTY_VIDEODECODER_STATUS,
+  KSPROPERTY_VIDEODECODER_OUTPUT_ENABLE,
+  KSPROPERTY_VIDEODECODER_VCR_TIMING
+} KSPROPERTY_VIDCAP_VIDEODECODER;
+
+typedef enum {
+  KS_VIDEODECODER_FLAGS_CAN_DISABLE_OUTPUT = 0X0001,
+  KS_VIDEODECODER_FLAGS_CAN_USE_VCR_LOCKING = 0X0002,
+  KS_VIDEODECODER_FLAGS_CAN_INDICATE_LOCKED = 0X0004
+} KS_VIDEODECODER_FLAGS;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StandardsSupported;
+  ULONG Capabilities;
+  ULONG SettlingTime;
+  ULONG HSyncPerVSync;
+} KSPROPERTY_VIDEODECODER_CAPS_S,*PKSPROPERTY_VIDEODECODER_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG NumberOfLines;
+  ULONG SignalLocked;
+} KSPROPERTY_VIDEODECODER_STATUS_S,*PKSPROPERTY_VIDEODECODER_STATUS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Value;
+} KSPROPERTY_VIDEODECODER_S,*PKSPROPERTY_VIDEODECODER_S;
+
+#define STATIC_EVENTSETID_VIDEODECODER					\
+	0x6a2e0621L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0621-28e4-11d0-a18c-00a0c9118956",EVENTSETID_VIDEODECODER);
+#define EVENTSETID_VIDEODECODER DEFINE_GUIDNAMED(EVENTSETID_VIDEODECODER)
+
+typedef enum {
+  KSEVENT_VIDEODECODER_CHANGED
+} KSEVENT_VIDEODECODER;
+
+#define STATIC_PROPSETID_VIDCAP_CAMERACONTROL				\
+	0xC6E13370L,0x30AC,0x11d0,0xa1,0x8C,0x00,0xA0,0xC9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("C6E13370-30AC-11d0-A18C-00A0C9118956",PROPSETID_VIDCAP_CAMERACONTROL);
+#define PROPSETID_VIDCAP_CAMERACONTROL DEFINE_GUIDNAMED(PROPSETID_VIDCAP_CAMERACONTROL)
+
+typedef enum {
+  KSPROPERTY_CAMERACONTROL_PAN,
+  KSPROPERTY_CAMERACONTROL_TILT,
+  KSPROPERTY_CAMERACONTROL_ROLL,
+  KSPROPERTY_CAMERACONTROL_ZOOM,
+  KSPROPERTY_CAMERACONTROL_EXPOSURE,
+  KSPROPERTY_CAMERACONTROL_IRIS,
+  KSPROPERTY_CAMERACONTROL_FOCUS,
+  KSPROPERTY_CAMERACONTROL_SCANMODE,
+  KSPROPERTY_CAMERACONTROL_PRIVACY,
+  KSPROPERTY_CAMERACONTROL_PANTILT,
+  KSPROPERTY_CAMERACONTROL_PAN_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_TILT_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_ROLL_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_ZOOM_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_EXPOSURE_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_IRIS_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_FOCUS_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_PANTILT_RELATIVE,
+  KSPROPERTY_CAMERACONTROL_FOCAL_LENGTH
+} KSPROPERTY_VIDCAP_CAMERACONTROL;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_CAMERACONTROL_S,*PKSPROPERTY_CAMERACONTROL_S;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  LONG Value;
+  ULONG Flags;
+  ULONG Capabilities;
+} KSPROPERTY_CAMERACONTROL_NODE_S,PKSPROPERTY_CAMERACONTROL_NODE_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG Value1;
+  ULONG Flags;
+  ULONG Capabilities;
+  LONG Value2;
+} KSPROPERTY_CAMERACONTROL_S2,*PKSPROPERTY_CAMERACONTROL_S2;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  LONG Value1;
+  ULONG Flags;
+  ULONG Capabilities;
+  LONG Value2;
+} KSPROPERTY_CAMERACONTROL_NODE_S2,*PKSPROPERTY_CAMERACONTROL_NODE_S2;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONG lOcularFocalLength;
+  LONG lObjectiveFocalLengthMin;
+  LONG lObjectiveFocalLengthMax;
+} KSPROPERTY_CAMERACONTROL_FOCAL_LENGTH_S,*PKSPROPERTY_CAMERACONTROL_FOCAL_LENGTH_S;
+
+typedef struct {
+  KSNODEPROPERTY NodeProperty;
+  LONG lOcularFocalLength;
+  LONG lObjectiveFocalLengthMin;
+  LONG lObjectiveFocalLengthMax;
+} KSPROPERTY_CAMERACONTROL_NODE_FOCAL_LENGTH_S,*PKSPROPERTY_CAMERACONTROL_NODE_FOCAL_LENGTH_S;
+
+#define KSPROPERTY_CAMERACONTROL_FLAGS_AUTO	0X0001L
+#define KSPROPERTY_CAMERACONTROL_FLAGS_MANUAL	0X0002L
+
+#define KSPROPERTY_CAMERACONTROL_FLAGS_ABSOLUTE	0X0000L
+#define KSPROPERTY_CAMERACONTROL_FLAGS_RELATIVE	0X0010L
+
+#ifndef __EDevCtrl__
+#define __EDevCtrl__
+
+#define STATIC_PROPSETID_EXT_DEVICE					\
+	0xB5730A90L,0x1A2C,0x11cf,0x8c,0x23,0x00,0xAA,0x00,0x6B,0x68,0x14
+DEFINE_GUIDSTRUCT("B5730A90-1A2C-11cf-8C23-00AA006B6814",PROPSETID_EXT_DEVICE);
+#define PROPSETID_EXT_DEVICE DEFINE_GUIDNAMED(PROPSETID_EXT_DEVICE)
+
+typedef enum {
+  KSPROPERTY_EXTDEVICE_ID,
+  KSPROPERTY_EXTDEVICE_VERSION,
+  KSPROPERTY_EXTDEVICE_POWER_STATE,
+  KSPROPERTY_EXTDEVICE_PORT,
+  KSPROPERTY_EXTDEVICE_CAPABILITIES
+} KSPROPERTY_EXTDEVICE;
+
+typedef struct tagDEVCAPS{
+  LONG CanRecord;
+  LONG CanRecordStrobe;
+  LONG HasAudio;
+  LONG HasVideo;
+  LONG UsesFiles;
+  LONG CanSave;
+  LONG DeviceType;
+  LONG TCRead;
+  LONG TCWrite;
+  LONG CTLRead;
+  LONG IndexRead;
+  LONG Preroll;
+  LONG Postroll;
+  LONG SyncAcc;
+  LONG NormRate;
+  LONG CanPreview;
+  LONG CanMonitorSrc;
+  LONG CanTest;
+  LONG VideoIn;
+  LONG AudioIn;
+  LONG Calibrate;
+  LONG SeekType;
+  LONG SimulatedHardware;
+} DEVCAPS,*PDEVCAPS;
+
+typedef struct {
+  KSPROPERTY Property;
+  union {
+    DEVCAPS Capabilities;
+    ULONG DevPort;
+    ULONG PowerState;
+    WCHAR pawchString[MAX_PATH];
+    DWORD NodeUniqueID[2];
+  } u;
+} KSPROPERTY_EXTDEVICE_S,*PKSPROPERTY_EXTDEVICE_S;
+
+#define STATIC_PROPSETID_EXT_TRANSPORT					\
+	0xA03CD5F0L,0x3045,0x11cf,0x8c,0x44,0x00,0xAA,0x00,0x6B,0x68,0x14
+DEFINE_GUIDSTRUCT("A03CD5F0-3045-11cf-8C44-00AA006B6814",PROPSETID_EXT_TRANSPORT);
+#define PROPSETID_EXT_TRANSPORT DEFINE_GUIDNAMED(PROPSETID_EXT_TRANSPORT)
+
+typedef enum {
+  KSPROPERTY_EXTXPORT_CAPABILITIES,
+  KSPROPERTY_EXTXPORT_INPUT_SIGNAL_MODE,
+  KSPROPERTY_EXTXPORT_OUTPUT_SIGNAL_MODE,
+  KSPROPERTY_EXTXPORT_LOAD_MEDIUM,
+  KSPROPERTY_EXTXPORT_MEDIUM_INFO,
+  KSPROPERTY_EXTXPORT_STATE,
+  KSPROPERTY_EXTXPORT_STATE_NOTIFY,
+  KSPROPERTY_EXTXPORT_TIMECODE_SEARCH,
+  KSPROPERTY_EXTXPORT_ATN_SEARCH,
+  KSPROPERTY_EXTXPORT_RTC_SEARCH,
+  KSPROPERTY_RAW_AVC_CMD
+} KSPROPERTY_EXTXPORT;
+
+typedef struct tagTRANSPORTSTATUS {
+  LONG Mode;
+  LONG LastError;
+  LONG RecordInhibit;
+  LONG ServoLock;
+  LONG MediaPresent;
+  LONG MediaLength;
+  LONG MediaSize;
+  LONG MediaTrackCount;
+  LONG MediaTrackLength;
+  LONG MediaTrackSide;
+  LONG MediaType;
+  LONG LinkMode;
+  LONG NotifyOn;
+} TRANSPORTSTATUS,*PTRANSPORTSTATUS;
+
+typedef struct tagTRANSPORTBASICPARMS {
+  LONG TimeFormat;
+  LONG TimeReference;
+  LONG Superimpose;
+  LONG EndStopAction;
+  LONG RecordFormat;
+  LONG StepFrames;
+  LONG SetpField;
+  LONG Preroll;
+  LONG RecPreroll;
+  LONG Postroll;
+  LONG EditDelay;
+  LONG PlayTCDelay;
+  LONG RecTCDelay;
+  LONG EditField;
+  LONG FrameServo;
+  LONG ColorFrameServo;
+  LONG ServoRef;
+  LONG WarnGenlock;
+  LONG SetTracking;
+  TCHAR VolumeName[40];
+  LONG Ballistic[20];
+  LONG Speed;
+  LONG CounterFormat;
+  LONG TunerChannel;
+  LONG TunerNumber;
+  LONG TimerEvent;
+  LONG TimerStartDay;
+  LONG TimerStartTime;
+  LONG TimerStopDay;
+  LONG TimerStopTime;
+} TRANSPORTBASICPARMS,*PTRANSPORTBASICPARMS;
+
+typedef struct tagTRANSPORTVIDEOPARMS {
+  LONG OutputMode;
+  LONG Input;
+} TRANSPORTVIDEOPARMS,*PTRANSPORTVIDEOPARMS;
+
+typedef struct tagTRANSPORTAUDIOPARMS {
+  LONG EnableOutput;
+  LONG EnableRecord;
+  LONG EnableSelsync;
+  LONG Input;
+  LONG MonitorSource;
+} TRANSPORTAUDIOPARMS,*PTRANSPORTAUDIOPARMS;
+
+typedef struct {
+  WINBOOL MediaPresent;
+  ULONG MediaType;
+  WINBOOL RecordInhibit;
+} MEDIUM_INFO,*PMEDIUM_INFO;
+
+typedef struct {
+  ULONG Mode;
+  ULONG State;
+} TRANSPORT_STATE,*PTRANSPORT_STATE;
+
+typedef struct {
+  KSPROPERTY Property;
+  union {
+    ULONG Capabilities;
+    ULONG SignalMode;
+    ULONG LoadMedium;
+    MEDIUM_INFO MediumInfo;
+    TRANSPORT_STATE XPrtState;
+    struct {
+      BYTE frame;
+      BYTE second;
+      BYTE minute;
+      BYTE hour;
+    } Timecode;
+    DWORD dwTimecode;
+    DWORD dwAbsTrackNumber;
+    struct {
+      ULONG PayloadSize;
+      BYTE Payload[512];
+    } RawAVC;
+  } u;
+} KSPROPERTY_EXTXPORT_S,*PKSPROPERTY_EXTXPORT_S;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  union {
+    ULONG Capabilities;
+    ULONG SignalMode;
+    ULONG LoadMedium;
+    MEDIUM_INFO MediumInfo;
+    TRANSPORT_STATE XPrtState;
+    struct {
+      BYTE frame;
+      BYTE second;
+      BYTE minute;
+      BYTE hour;
+    } Timecode;
+    DWORD dwTimecode;
+    DWORD dwAbsTrackNumber;
+    struct {
+      ULONG PayloadSize;
+      BYTE Payload[512];
+    } RawAVC;
+  } u;
+} KSPROPERTY_EXTXPORT_NODE_S,*PKSPROPERTY_EXTXPORT_NODE_S;
+
+#define STATIC_PROPSETID_TIMECODE_READER				\
+	0x9B496CE1L,0x811B,0x11cf,0x8C,0x77,0x00,0xAA,0x00,0x6B,0x68,0x14
+DEFINE_GUIDSTRUCT("9B496CE1-811B-11cf-8C77-00AA006B6814",PROPSETID_TIMECODE_READER);
+#define PROPSETID_TIMECODE_READER DEFINE_GUIDNAMED(PROPSETID_TIMECODE_READER)
+
+typedef enum {
+  KSPROPERTY_TIMECODE_READER,
+  KSPROPERTY_ATN_READER,
+  KSPROPERTY_RTC_READER
+} KSPROPERTY_TIMECODE;
+
+#ifndef TIMECODE_DEFINED
+#define TIMECODE_DEFINED
+typedef union _timecode {
+  struct {
+    WORD wFrameRate;
+    WORD wFrameFract;
+    DWORD dwFrames;
+  };
+  DWORDLONG qw;
+} TIMECODE;
+typedef TIMECODE *PTIMECODE;
+
+typedef struct tagTIMECODE_SAMPLE {
+  LONGLONG qwTick;
+  TIMECODE timecode;
+  DWORD dwUser;
+  DWORD dwFlags;
+} TIMECODE_SAMPLE;
+
+typedef TIMECODE_SAMPLE *PTIMECODE_SAMPLE;
+#endif /* TIMECODE_DEFINED */
+
+typedef struct {
+  KSPROPERTY Property;
+  TIMECODE_SAMPLE TimecodeSamp;
+} KSPROPERTY_TIMECODE_S,*PKSPROPERTY_TIMECODE_S;
+
+typedef struct {
+  KSP_NODE NodeProperty;
+  TIMECODE_SAMPLE TimecodeSamp;
+} KSPROPERTY_TIMECODE_NODE_S,*PKSPROPERTY_TIMECODE_NODE_S;
+
+#define STATIC_KSEVENTSETID_EXTDEV_Command				\
+	0x109c7988L,0xb3cb,0x11d2,0xb4,0x8e,0x00,0x60,0x97,0xb3,0x39,0x1b
+DEFINE_GUIDSTRUCT("109c7988-b3cb-11d2-b48e-006097b3391b",KSEVENTSETID_EXTDEV_Command);
+#define KSEVENTSETID_EXTDEV_Command DEFINE_GUIDNAMED(KSEVENTSETID_EXTDEV_Command)
+
+typedef enum {
+  KSEVENT_EXTDEV_COMMAND_NOTIFY_INTERIM_READY,
+  KSEVENT_EXTDEV_COMMAND_CONTROL_INTERIM_READY,
+  KSEVENT_EXTDEV_COMMAND_BUSRESET,
+  KSEVENT_EXTDEV_TIMECODE_UPDATE,
+  KSEVENT_EXTDEV_OPERATION_MODE_UPDATE,
+  KSEVENT_EXTDEV_TRANSPORT_STATE_UPDATE,
+  KSEVENT_EXTDEV_NOTIFY_REMOVAL,
+  KSEVENT_EXTDEV_NOTIFY_MEDIUM_CHANGE
+} KSEVENT_DEVCMD;
+#endif /* __EDevCtrl__ */
+
+#define STATIC_PROPSETID_VIDCAP_CROSSBAR				\
+	0x6a2e0640L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0640-28e4-11d0-a18c-00a0c9118956",PROPSETID_VIDCAP_CROSSBAR);
+#define PROPSETID_VIDCAP_CROSSBAR DEFINE_GUIDNAMED(PROPSETID_VIDCAP_CROSSBAR)
+
+typedef enum {
+  KSPROPERTY_CROSSBAR_CAPS,
+  KSPROPERTY_CROSSBAR_PININFO,
+  KSPROPERTY_CROSSBAR_CAN_ROUTE,
+  KSPROPERTY_CROSSBAR_ROUTE
+} KSPROPERTY_VIDCAP_CROSSBAR;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG NumberOfInputs;
+  ULONG NumberOfOutputs;
+} KSPROPERTY_CROSSBAR_CAPS_S,*PKSPROPERTY_CROSSBAR_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  KSPIN_DATAFLOW Direction;
+  ULONG Index;
+  ULONG PinType;
+  ULONG RelatedPinIndex;
+  KSPIN_MEDIUM Medium;
+} KSPROPERTY_CROSSBAR_PININFO_S,*PKSPROPERTY_CROSSBAR_PININFO_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG IndexInputPin;
+  ULONG IndexOutputPin;
+  ULONG CanRoute;
+} KSPROPERTY_CROSSBAR_ROUTE_S,*PKSPROPERTY_CROSSBAR_ROUTE_S;
+
+#define STATIC_EVENTSETID_CROSSBAR					\
+	0x6a2e0641L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0641-28e4-11d0-a18c-00a0c9118956",EVENTSETID_CROSSBAR);
+#define EVENTSETID_CROSSBAR DEFINE_GUIDNAMED(EVENTSETID_CROSSBAR)
+
+typedef enum {
+  KSEVENT_CROSSBAR_CHANGED
+} KSEVENT_CROSSBAR;
+
+typedef enum {
+  KS_PhysConn_Video_Tuner = 1,
+  KS_PhysConn_Video_Composite,
+  KS_PhysConn_Video_SVideo,
+  KS_PhysConn_Video_RGB,
+  KS_PhysConn_Video_YRYBY,
+  KS_PhysConn_Video_SerialDigital,
+  KS_PhysConn_Video_ParallelDigital,
+  KS_PhysConn_Video_SCSI,
+  KS_PhysConn_Video_AUX,
+  KS_PhysConn_Video_1394,
+  KS_PhysConn_Video_USB,
+  KS_PhysConn_Video_VideoDecoder,
+  KS_PhysConn_Video_VideoEncoder,
+  KS_PhysConn_Video_SCART,
+  KS_PhysConn_Audio_Tuner = 4096,
+  KS_PhysConn_Audio_Line,
+  KS_PhysConn_Audio_Mic,
+  KS_PhysConn_Audio_AESDigital,
+  KS_PhysConn_Audio_SPDIFDigital,
+  KS_PhysConn_Audio_SCSI,
+  KS_PhysConn_Audio_AUX,
+  KS_PhysConn_Audio_1394,
+  KS_PhysConn_Audio_USB,
+  KS_PhysConn_Audio_AudioDecoder
+} KS_PhysicalConnectorType;
+
+#define STATIC_PROPSETID_VIDCAP_TVAUDIO					\
+	0x6a2e0650L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0650-28e4-11d0-a18c-00a0c9118956",PROPSETID_VIDCAP_TVAUDIO);
+#define PROPSETID_VIDCAP_TVAUDIO DEFINE_GUIDNAMED(PROPSETID_VIDCAP_TVAUDIO)
+
+typedef enum {
+  KSPROPERTY_TVAUDIO_CAPS,
+  KSPROPERTY_TVAUDIO_MODE,
+  KSPROPERTY_TVAUDIO_CURRENTLY_AVAILABLE_MODES
+} KSPROPERTY_VIDCAP_TVAUDIO;
+
+#define KS_TVAUDIO_MODE_MONO	0x0001
+#define KS_TVAUDIO_MODE_STEREO	0x0002
+#define KS_TVAUDIO_MODE_LANG_A	0x0010
+#define KS_TVAUDIO_MODE_LANG_B	0x0020
+#define KS_TVAUDIO_MODE_LANG_C	0x0040
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Capabilities;
+  KSPIN_MEDIUM InputMedium;
+  KSPIN_MEDIUM OutputMedium;
+} KSPROPERTY_TVAUDIO_CAPS_S,*PKSPROPERTY_TVAUDIO_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG Mode;
+} KSPROPERTY_TVAUDIO_S,*PKSPROPERTY_TVAUDIO_S;
+
+#define STATIC_KSEVENTSETID_VIDCAP_TVAUDIO				\
+	0x6a2e0651L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0651-28e4-11d0-a18c-00a0c9118956",KSEVENTSETID_VIDCAP_TVAUDIO);
+#define KSEVENTSETID_VIDCAP_TVAUDIO DEFINE_GUIDNAMED(KSEVENTSETID_VIDCAP_TVAUDIO)
+
+typedef enum {
+  KSEVENT_TVAUDIO_CHANGED
+} KSEVENT_TVAUDIO;
+
+#define STATIC_PROPSETID_VIDCAP_VIDEOCOMPRESSION			\
+	0xC6E13343L,0x30AC,0x11d0,0xA1,0x8C,0x00,0xA0,0xC9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("C6E13343-30AC-11d0-A18C-00A0C9118956",PROPSETID_VIDCAP_VIDEOCOMPRESSION);
+#define PROPSETID_VIDCAP_VIDEOCOMPRESSION DEFINE_GUIDNAMED(PROPSETID_VIDCAP_VIDEOCOMPRESSION)
+
+typedef enum {
+  KSPROPERTY_VIDEOCOMPRESSION_GETINFO,
+  KSPROPERTY_VIDEOCOMPRESSION_KEYFRAME_RATE,
+  KSPROPERTY_VIDEOCOMPRESSION_PFRAMES_PER_KEYFRAME,
+  KSPROPERTY_VIDEOCOMPRESSION_QUALITY,
+  KSPROPERTY_VIDEOCOMPRESSION_OVERRIDE_KEYFRAME,
+  KSPROPERTY_VIDEOCOMPRESSION_OVERRIDE_FRAME_SIZE,
+  KSPROPERTY_VIDEOCOMPRESSION_WINDOWSIZE
+} KSPROPERTY_VIDCAP_VIDEOCOMPRESSION;
+
+typedef enum {
+  KS_CompressionCaps_CanQuality = 1,
+  KS_CompressionCaps_CanCrunch = 2,
+  KS_CompressionCaps_CanKeyFrame = 4,
+  KS_CompressionCaps_CanBFrame = 8,
+  KS_CompressionCaps_CanWindow = 0x10
+} KS_CompressionCaps;
+
+typedef enum {
+  KS_StreamingHint_FrameInterval = 0x0100,
+  KS_StreamingHint_KeyFrameRate = 0x0200,
+  KS_StreamingHint_PFrameRate = 0x0400,
+  KS_StreamingHint_CompQuality = 0x0800,
+  KS_StreamingHint_CompWindowSize = 0x1000
+} KS_VideoStreamingHints;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  LONG DefaultKeyFrameRate;
+  LONG DefaultPFrameRate;
+  LONG DefaultQuality;
+  LONG NumberOfQualitySettings;
+  LONG Capabilities;
+} KSPROPERTY_VIDEOCOMPRESSION_GETINFO_S,*PKSPROPERTY_VIDEOCOMPRESSION_GETINFO_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  LONG Value;
+} KSPROPERTY_VIDEOCOMPRESSION_S,*PKSPROPERTY_VIDEOCOMPRESSION_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  LONG Value;
+  ULONG Flags;
+} KSPROPERTY_VIDEOCOMPRESSION_S1,*PKSPROPERTY_VIDEOCOMPRESSION_S1;
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_OVERLAY				\
+	0xe436eb7fL,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70
+DEFINE_GUIDSTRUCT("e436eb7f-524f-11ce-9f53-0020af0ba770",KSDATAFORMAT_SUBTYPE_OVERLAY);
+#define KSDATAFORMAT_SUBTYPE_OVERLAY DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_OVERLAY)
+
+#define STATIC_KSPROPSETID_OverlayUpdate				\
+	0x490EA5CFL,0x7681,0x11D1,0xA2,0x1C,0x00,0xA0,0xC9,0x22,0x31,0x96
+DEFINE_GUIDSTRUCT("490EA5CF-7681-11D1-A21C-00A0C9223196",KSPROPSETID_OverlayUpdate);
+#define KSPROPSETID_OverlayUpdate DEFINE_GUIDNAMED(KSPROPSETID_OverlayUpdate)
+
+typedef enum {
+  KSPROPERTY_OVERLAYUPDATE_INTERESTS,
+  KSPROPERTY_OVERLAYUPDATE_CLIPLIST = 0x1,
+  KSPROPERTY_OVERLAYUPDATE_PALETTE = 0x2,
+  KSPROPERTY_OVERLAYUPDATE_COLORKEY = 0x4,
+  KSPROPERTY_OVERLAYUPDATE_VIDEOPOSITION = 0x8,
+  KSPROPERTY_OVERLAYUPDATE_DISPLAYCHANGE = 0x10,
+  KSPROPERTY_OVERLAYUPDATE_COLORREF = 0x10000000
+} KSPROPERTY_OVERLAYUPDATE;
+
+typedef struct {
+  ULONG PelsWidth;
+  ULONG PelsHeight;
+  ULONG BitsPerPel;
+  WCHAR DeviceID[1];
+} KSDISPLAYCHANGE,*PKSDISPLAYCHANGE;
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_INTERESTS(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_INTERESTS,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(ULONG),				\
+				NULL, NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_PALETTE(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_PALETTE,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				0,					\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_COLORKEY(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_COLORKEY,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				sizeof(COLORKEY),			\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_CLIPLIST(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_CLIPLIST,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				2 *sizeof(RECT) + sizeof(RGNDATAHEADER),\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_VIDEOPOSITION(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_VIDEOPOSITION,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				2 *sizeof(RECT),			\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_DISPLAYCHANGE(Handler)	\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_DISPLAYCHANGE,	\
+				NULL,					\
+				sizeof(KSPROPERTY),			\
+				sizeof(KSDISPLAYCHANGE),		\
+				(Handler),				\
+				NULL, 0, NULL, NULL, 0)
+
+#define DEFINE_KSPROPERTY_ITEM_OVERLAYUPDATE_COLORREF(Handler)		\
+	DEFINE_KSPROPERTY_ITEM(						\
+				KSPROPERTY_OVERLAYUPDATE_COLORREF,	\
+				(Handler),				\
+				sizeof(KSPROPERTY),			\
+				sizeof(COLORREF),			\
+				NULL,					\
+				NULL, 0, NULL, NULL, 0)
+
+#define STATIC_PROPSETID_VIDCAP_VIDEOCONTROL				\
+	0x6a2e0670L,0x28e4,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("6a2e0670-28e4-11d0-a18c-00a0c9118956",PROPSETID_VIDCAP_VIDEOCONTROL);
+#define PROPSETID_VIDCAP_VIDEOCONTROL DEFINE_GUIDNAMED(PROPSETID_VIDCAP_VIDEOCONTROL)
+
+typedef enum {
+  KSPROPERTY_VIDEOCONTROL_CAPS,
+  KSPROPERTY_VIDEOCONTROL_ACTUAL_FRAME_RATE,
+  KSPROPERTY_VIDEOCONTROL_FRAME_RATES,
+  KSPROPERTY_VIDEOCONTROL_MODE
+} KSPROPERTY_VIDCAP_VIDEOCONTROL;
+
+typedef enum {
+  KS_VideoControlFlag_FlipHorizontal = 0x0001,
+  KS_VideoControlFlag_FlipVertical = 0x0002,
+  KS_Obsolete_VideoControlFlag_ExternalTriggerEnable = 0x0010,
+  KS_Obsolete_VideoControlFlag_Trigger = 0x0020,
+  KS_VideoControlFlag_ExternalTriggerEnable = 0x0004,
+  KS_VideoControlFlag_Trigger = 0x0008
+} KS_VideoControlFlags;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  ULONG VideoControlCaps;
+} KSPROPERTY_VIDEOCONTROL_CAPS_S,*PKSPROPERTY_VIDEOCONTROL_CAPS_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  LONG Mode;
+} KSPROPERTY_VIDEOCONTROL_MODE_S,*PKSPROPERTY_VIDEOCONTROL_MODE_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  ULONG RangeIndex;
+  SIZE Dimensions;
+  LONGLONG CurrentActualFrameRate;
+  LONGLONG CurrentMaxAvailableFrameRate;
+} KSPROPERTY_VIDEOCONTROL_ACTUAL_FRAME_RATE_S,*PKSPROPERTY_VIDEOCONTROL_ACTUAL_FRAME_RATE_S;
+
+typedef struct {
+  KSPROPERTY Property;
+  ULONG StreamIndex;
+  ULONG RangeIndex;
+  SIZE Dimensions;
+} KSPROPERTY_VIDEOCONTROL_FRAME_RATES_S,*PKSPROPERTY_VIDEOCONTROL_FRAME_RATES_S;
+
+#define STATIC_PROPSETID_VIDCAP_DROPPEDFRAMES				\
+	0xC6E13344L,0x30AC,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56
+DEFINE_GUIDSTRUCT("C6E13344-30AC-11d0-A18C-00A0C9118956",PROPSETID_VIDCAP_DROPPEDFRAMES);
+#define PROPSETID_VIDCAP_DROPPEDFRAMES DEFINE_GUIDNAMED(PROPSETID_VIDCAP_DROPPEDFRAMES)
+
+typedef enum {
+  KSPROPERTY_DROPPEDFRAMES_CURRENT
+} KSPROPERTY_VIDCAP_DROPPEDFRAMES;
+
+typedef struct {
+  KSPROPERTY Property;
+  LONGLONG PictureNumber;
+  LONGLONG DropCount;
+  ULONG AverageFrameSize;
+} KSPROPERTY_DROPPEDFRAMES_CURRENT_S,*PKSPROPERTY_DROPPEDFRAMES_CURRENT_S;
+
+#define STATIC_KSPROPSETID_VPConfig					\
+	0xbc29a660L,0x30e3,0x11d0,0x9e,0x69,0x00,0xc0,0x4f,0xd7,0xc1,0x5b
+DEFINE_GUIDSTRUCT("bc29a660-30e3-11d0-9e69-00c04fd7c15b",KSPROPSETID_VPConfig);
+#define KSPROPSETID_VPConfig DEFINE_GUIDNAMED(KSPROPSETID_VPConfig)
+
+#define STATIC_KSPROPSETID_VPVBIConfig					\
+	0xec529b00L,0x1a1f,0x11d1,0xba,0xd9,0x0,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("ec529b00-1a1f-11d1-bad9-00609744111a",KSPROPSETID_VPVBIConfig);
+#define KSPROPSETID_VPVBIConfig DEFINE_GUIDNAMED(KSPROPSETID_VPVBIConfig)
+
+typedef enum {
+  KSPROPERTY_VPCONFIG_NUMCONNECTINFO,
+  KSPROPERTY_VPCONFIG_GETCONNECTINFO,
+  KSPROPERTY_VPCONFIG_SETCONNECTINFO,
+  KSPROPERTY_VPCONFIG_VPDATAINFO,
+  KSPROPERTY_VPCONFIG_MAXPIXELRATE,
+  KSPROPERTY_VPCONFIG_INFORMVPINPUT,
+  KSPROPERTY_VPCONFIG_NUMVIDEOFORMAT,
+  KSPROPERTY_VPCONFIG_GETVIDEOFORMAT,
+  KSPROPERTY_VPCONFIG_SETVIDEOFORMAT,
+  KSPROPERTY_VPCONFIG_INVERTPOLARITY,
+  KSPROPERTY_VPCONFIG_DECIMATIONCAPABILITY,
+  KSPROPERTY_VPCONFIG_SCALEFACTOR,
+  KSPROPERTY_VPCONFIG_DDRAWHANDLE,
+  KSPROPERTY_VPCONFIG_VIDEOPORTID,
+  KSPROPERTY_VPCONFIG_DDRAWSURFACEHANDLE,
+  KSPROPERTY_VPCONFIG_SURFACEPARAMS
+} KSPROPERTY_VPCONFIG;
+
+#define STATIC_CLSID_KsIBasicAudioInterfaceHandler			\
+	0xb9f8ac3e,0x0f71,0x11d2,0xb7,0x2c,0x00,0xc0,0x4f,0xb6,0xbd,0x3d
+DEFINE_GUIDSTRUCT("b9f8ac3e-0f71-11d2-b72c-00c04fb6bd3d",CLSID_KsIBasicAudioInterfaceHandler);
+#define CLSID_KsIBasicAudioInterfaceHandler DEFINE_GUIDNAMED(CLSID_KsIBasicAudioInterfaceHandler)
+
+#ifdef __IVPType__
+typedef struct {
+  AMVPSIZE Size;
+  DWORD MaxPixelsPerSecond;
+  DWORD Reserved;
+} KSVPMAXPIXELRATE,*PKSVPMAXPIXELRATE;
+
+typedef struct {
+  KSPROPERTY Property;
+  AMVPSIZE Size;
+} KSVPSIZE_PROP,*PKSVPSIZE_PROP;
+
+typedef struct {
+  DWORD dwPitch;
+  DWORD dwXOrigin;
+  DWORD dwYOrigin;
+} KSVPSURFACEPARAMS,*PKSVPSURFACEPARAMS;
+#else /* __IVPType__ */
+
+#ifndef __DDRAW_INCLUDED__
+#define DDPF_FOURCC 0x00000004l
+
+typedef struct _DDPIXELFORMAT
+{
+  DWORD dwSize;
+  DWORD dwFlags;
+  DWORD dwFourCC;
+  __MINGW_EXTENSION union
+  {
+    DWORD dwRGBBitCount;
+    DWORD dwYUVBitCount;
+    DWORD dwZBufferBitDepth;
+    DWORD dwAlphaBitDepth;
+  };
+  __MINGW_EXTENSION union
+  {
+    DWORD dwRBitMask;
+    DWORD dwYBitMask;
+  };
+  __MINGW_EXTENSION union
+  {
+    DWORD dwGBitMask;
+    DWORD dwUBitMask;
+  };
+  __MINGW_EXTENSION union
+  {
+    DWORD dwBBitMask;
+    DWORD dwVBitMask;
+  };
+  __MINGW_EXTENSION union
+  {
+    DWORD dwRGBAlphaBitMask;
+    DWORD dwYUVAlphaBitMask;
+    DWORD dwRGBZBitMask;
+    DWORD dwYUVZBitMask;
+  };
+} DDPIXELFORMAT,*LPDDPIXELFORMAT;
+#endif /* __DDRAW_INCLUDED__ */
+
+#ifndef __DVP_INCLUDED__
+typedef struct _DDVIDEOPORTCONNECT {
+  DWORD dwSize;
+  DWORD dwPortWidth;
+  GUID guidTypeID;
+  DWORD dwFlags;
+  ULONG_PTR dwReserved1;
+} DDVIDEOPORTCONNECT,*LPDDVIDEOPORTCONNECT;
+
+#define DDVPTYPE_E_HREFH_VREFH						\
+	0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8
+
+#define DDVPTYPE_E_HREFL_VREFL						\
+	0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8
+#endif /* __DVP_INCLUDED__ */
+
+typedef enum
+{
+  KS_PixAspectRatio_NTSC4x3,
+  KS_PixAspectRatio_NTSC16x9,
+  KS_PixAspectRatio_PAL4x3,
+  KS_PixAspectRatio_PAL16x9
+} KS_AMPixAspectRatio;
+
+typedef enum
+{
+  KS_AMVP_DO_NOT_CARE,
+  KS_AMVP_BEST_BANDWIDTH,
+  KS_AMVP_INPUT_SAME_AS_OUTPUT
+} KS_AMVP_SELECTFORMATBY;
+
+typedef enum
+{
+  KS_AMVP_MODE_WEAVE,
+  KS_AMVP_MODE_BOBINTERLEAVED,
+  KS_AMVP_MODE_BOBNONINTERLEAVED,
+  KS_AMVP_MODE_SKIPEVEN,
+  KS_AMVP_MODE_SKIPODD
+} KS_AMVP_MODE;
+
+typedef struct tagKS_AMVPDIMINFO
+{
+  DWORD dwFieldWidth;
+  DWORD dwFieldHeight;
+  DWORD dwVBIWidth;
+  DWORD dwVBIHeight;
+  RECT rcValidRegion;
+} KS_AMVPDIMINFO,*PKS_AMVPDIMINFO;
+
+typedef struct tagKS_AMVPDATAINFO
+{
+  DWORD dwSize;
+  DWORD dwMicrosecondsPerField;
+  KS_AMVPDIMINFO amvpDimInfo;
+  DWORD dwPictAspectRatioX;
+  DWORD dwPictAspectRatioY;
+  WINBOOL bEnableDoubleClock;
+  WINBOOL bEnableVACT;
+  WINBOOL bDataIsInterlaced;
+  LONG lHalfLinesOdd;
+  WINBOOL bFieldPolarityInverted;
+  DWORD dwNumLinesInVREF;
+  LONG lHalfLinesEven;
+  DWORD dwReserved1;
+} KS_AMVPDATAINFO,*PKS_AMVPDATAINFO;
+
+typedef struct tagKS_AMVPSIZE
+{
+  DWORD dwWidth;
+  DWORD dwHeight;
+} KS_AMVPSIZE,*PKS_AMVPSIZE;
+
+typedef struct {
+  KS_AMVPSIZE Size;
+  DWORD MaxPixelsPerSecond;
+  DWORD Reserved;
+} KSVPMAXPIXELRATE,*PKSVPMAXPIXELRATE;
+
+typedef struct {
+  KSPROPERTY Property;
+  KS_AMVPSIZE Size;
+} KSVPSIZE_PROP,*PKSVPSIZE_PROP;
+
+typedef struct {
+  DWORD dwPitch;
+  DWORD dwXOrigin;
+  DWORD dwYOrigin;
+} KSVPSURFACEPARAMS,*PKSVPSURFACEPARAMS;
+#endif /* __IVPType__ */
+
+#define STATIC_KSEVENTSETID_VPNotify					\
+	0x20c5598eL,0xd3c8,0x11d0,0x8d,0xfc,0x00,0xc0,0x4f,0xd7,0xc0,0x8b
+DEFINE_GUIDSTRUCT("20c5598e-d3c8-11d0-8dfc-00c04fd7c08b",KSEVENTSETID_VPNotify);
+#define KSEVENTSETID_VPNotify DEFINE_GUIDNAMED(KSEVENTSETID_VPNotify)
+
+typedef enum {
+  KSEVENT_VPNOTIFY_FORMATCHANGE
+} KSEVENT_VPNOTIFY;
+
+#define STATIC_KSEVENTSETID_VIDCAPTOSTI					\
+	0xdb47de20,0xf628,0x11d1,0xba,0x41,0x0,0xa0,0xc9,0xd,0x2b,0x5
+DEFINE_GUIDSTRUCT("DB47DE20-F628-11d1-BA41-00A0C90D2B05",KSEVENTSETID_VIDCAPTOSTI);
+#define KSEVENTSETID_VIDCAPNotify DEFINE_GUIDNAMED(KSEVENTSETID_VIDCAPTOSTI)
+
+typedef enum {
+  KSEVENT_VIDCAPTOSTI_EXT_TRIGGER,
+  KSEVENT_VIDCAP_AUTO_UPDATE,
+  KSEVENT_VIDCAP_SEARCH
+} KSEVENT_VIDCAPTOSTI;
+
+typedef enum {
+  KSPROPERTY_EXTENSION_UNIT_INFO,
+  KSPROPERTY_EXTENSION_UNIT_CONTROL,
+  KSPROPERTY_EXTENSION_UNIT_PASS_THROUGH = 0xffff
+} KSPROPERTY_EXTENSION_UNIT,*PKSPROPERTY_EXTENSION_UNIT;
+
+#define STATIC_KSEVENTSETID_VPVBINotify					\
+	0xec529b01L,0x1a1f,0x11d1,0xba,0xd9,0x0,0x60,0x97,0x44,0x11,0x1a
+DEFINE_GUIDSTRUCT("ec529b01-1a1f-11d1-bad9-00609744111a",KSEVENTSETID_VPVBINotify);
+#define KSEVENTSETID_VPVBINotify DEFINE_GUIDNAMED(KSEVENTSETID_VPVBINotify)
+
+typedef enum {
+  KSEVENT_VPVBINOTIFY_FORMATCHANGE
+} KSEVENT_VPVBINOTIFY;
+
+#define STATIC_KSDATAFORMAT_TYPE_AUXLine21Data				\
+	0x670aea80L,0x3a82,0x11d0,0xb7,0x9b,0x00,0xaa,0x00,0x37,0x67,0xa7
+DEFINE_GUIDSTRUCT("670aea80-3a82-11d0-b79b-00aa003767a7",KSDATAFORMAT_TYPE_AUXLine21Data);
+#define KSDATAFORMAT_TYPE_AUXLine21Data DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUXLine21Data)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_Line21_BytePair			\
+	0x6e8d4a22L,0x310c,0x11d0,0xb7,0x9a,0x00,0xaa,0x00,0x37,0x67,0xa7
+DEFINE_GUIDSTRUCT("6e8d4a22-310c-11d0-b79a-00aa003767a7",KSDATAFORMAT_SUBTYPE_Line21_BytePair);
+#define KSDATAFORMAT_SUBTYPE_Line21_BytePair DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_Line21_BytePair)
+
+#define STATIC_KSDATAFORMAT_SUBTYPE_Line21_GOPPacket			\
+	0x6e8d4a23L,0x310c,0x11d0,0xb7,0x9a,0x00,0xaa,0x00,0x37,0x67,0xa7
+DEFINE_GUIDSTRUCT("6e8d4a23-310c-11d0-b79a-00aa003767a7",KSDATAFORMAT_SUBTYPE_Line21_GOPPacket);
+#define KSDATAFORMAT_SUBTYPE_Line21_GOPPacket DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket)
+
+typedef struct _KSGOP_USERDATA {
+  ULONG sc;
+  ULONG reserved1;
+  BYTE cFields;
+  CHAR l21Data[3];
+} KSGOP_USERDATA,*PKSGOP_USERDATA;
+
+#define STATIC_KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK			\
+	0xed0b916a,0x044d,0x11d1,0xaa,0x78,0x00,0xc0,0x4f,0xc3,0x1d,0x60
+DEFINE_GUIDSTRUCT("ed0b916a-044d-11d1-aa78-00c04fc31d60",KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK);
+#define KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK)
+
+#define KS_AM_UseNewCSSKey			0x1
+
+#define STATIC_KSPROPSETID_TSRateChange					\
+	0xa503c5c0,0x1d1d,0x11d1,0xad,0x80,0x44,0x45,0x53,0x54,0x0,0x0
+DEFINE_GUIDSTRUCT("A503C5C0-1D1D-11D1-AD80-444553540000",KSPROPSETID_TSRateChange);
+#define KSPROPSETID_TSRateChange DEFINE_GUIDNAMED(KSPROPSETID_TSRateChange)
+
+typedef enum {
+  KS_AM_RATE_SimpleRateChange = 1,
+  KS_AM_RATE_ExactRateChange = 2,
+  KS_AM_RATE_MaxFullDataRate = 3,
+  KS_AM_RATE_Step = 4
+} KS_AM_PROPERTY_TS_RATE_CHANGE;
+
+typedef struct {
+  REFERENCE_TIME StartTime;
+  LONG Rate;
+} KS_AM_SimpleRateChange,*PKS_AM_SimpleRateChange;
+
+typedef struct {
+  REFERENCE_TIME OutputZeroTime;
+  LONG Rate;
+} KS_AM_ExactRateChange,*PKS_AM_ExactRateChange;
+
+typedef LONG KS_AM_MaxFullDataRate;
+typedef DWORD KS_AM_Step;
+
+#define STATIC_KSCATEGORY_ENCODER					\
+	0x19689bf6,0xc384,0x48fd,0xad,0x51,0x90,0xe5,0x8c,0x79,0xf7,0xb
+DEFINE_GUIDSTRUCT("19689BF6-C384-48fd-AD51-90E58C79F70B",KSCATEGORY_ENCODER);
+#define KSCATEGORY_ENCODER DEFINE_GUIDNAMED(KSCATEGORY_ENCODER)
+
+#define STATIC_KSCATEGORY_MULTIPLEXER					\
+	0x7a5de1d3,0x1a1,0x452c,0xb4,0x81,0x4f,0xa2,0xb9,0x62,0x71,0xe8
+DEFINE_GUIDSTRUCT("7A5DE1D3-01A1-452c-B481-4FA2B96271E8",KSCATEGORY_MULTIPLEXER);
+#define KSCATEGORY_MULTIPLEXER DEFINE_GUIDNAMED(KSCATEGORY_MULTIPLEXER)
+
+#ifndef __ENCODER_API_GUIDS__
+#define __ENCODER_API_GUIDS__
+
+#define STATIC_ENCAPIPARAM_BITRATE					\
+	0x49cc4c43,0xca83,0x4ad4,0xa9,0xaf,0xf3,0x69,0x6a,0xf6,0x66,0xdf
+DEFINE_GUIDSTRUCT("49CC4C43-CA83-4ad4-A9AF-F3696AF666DF",ENCAPIPARAM_BITRATE);
+#define ENCAPIPARAM_BITRATE DEFINE_GUIDNAMED(ENCAPIPARAM_BITRATE)
+
+#define STATIC_ENCAPIPARAM_PEAK_BITRATE					\
+	0x703f16a9,0x3d48,0x44a1,0xb0,0x77,0x1,0x8d,0xff,0x91,0x5d,0x19
+DEFINE_GUIDSTRUCT("703F16A9-3D48-44a1-B077-018DFF915D19",ENCAPIPARAM_PEAK_BITRATE);
+#define ENCAPIPARAM_PEAK_BITRATE DEFINE_GUIDNAMED(ENCAPIPARAM_PEAK_BITRATE)
+
+#define STATIC_ENCAPIPARAM_BITRATE_MODE					\
+	0xee5fb25c,0xc713,0x40d1,0x9d,0x58,0xc0,0xd7,0x24,0x1e,0x25,0xf
+DEFINE_GUIDSTRUCT("EE5FB25C-C713-40d1-9D58-C0D7241E250F",ENCAPIPARAM_BITRATE_MODE);
+#define ENCAPIPARAM_BITRATE_MODE DEFINE_GUIDNAMED(ENCAPIPARAM_BITRATE_MODE)
+
+#define STATIC_CODECAPI_CHANGELISTS					\
+	0x62b12acf,0xf6b0,0x47d9,0x94,0x56,0x96,0xf2,0x2c,0x4e,0x0b,0x9d
+DEFINE_GUIDSTRUCT("62B12ACF-F6B0-47D9-9456-96F22C4E0B9D",CODECAPI_CHANGELISTS);
+#define CODECAPI_CHANGELISTS DEFINE_GUIDNAMED(CODECAPI_CHANGELISTS)
+
+#define STATIC_CODECAPI_VIDEO_ENCODER					\
+	0x7112e8e1,0x3d03,0x47ef,0x8e,0x60,0x03,0xf1,0xcf,0x53,0x73,0x01
+DEFINE_GUIDSTRUCT("7112E8E1-3D03-47EF-8E60-03F1CF537301",CODECAPI_VIDEO_ENCODER);
+#define CODECAPI_VIDEO_ENCODER DEFINE_GUIDNAMED(CODECAPI_VIDEO_ENCODER)
+
+#define STATIC_CODECAPI_AUDIO_ENCODER					\
+	0xb9d19a3e,0xf897,0x429c,0xbc,0x46,0x81,0x38,0xb7,0x27,0x2b,0x2d
+DEFINE_GUIDSTRUCT("B9D19A3E-F897-429C-BC46-8138B7272B2D",CODECAPI_AUDIO_ENCODER);
+#define CODECAPI_AUDIO_ENCODER DEFINE_GUIDNAMED(CODECAPI_AUDIO_ENCODER)
+
+#define STATIC_CODECAPI_SETALLDEFAULTS					\
+	0x6c5e6a7c,0xacf8,0x4f55,0xa9,0x99,0x1a,0x62,0x81,0x09,0x05,0x1b
+DEFINE_GUIDSTRUCT("6C5E6A7C-ACF8-4F55-A999-1A628109051B",CODECAPI_SETALLDEFAULTS);
+#define CODECAPI_SETALLDEFAULTS DEFINE_GUIDNAMED(CODECAPI_SETALLDEFAULTS)
+
+#define STATIC_CODECAPI_ALLSETTINGS					\
+	0x6a577e92,0x83e1,0x4113,0xad,0xc2,0x4f,0xce,0xc3,0x2f,0x83,0xa1
+DEFINE_GUIDSTRUCT("6A577E92-83E1-4113-ADC2-4FCEC32F83A1",CODECAPI_ALLSETTINGS);
+#define CODECAPI_ALLSETTINGS DEFINE_GUIDNAMED(CODECAPI_ALLSETTINGS)
+
+#define STATIC_CODECAPI_SUPPORTSEVENTS					\
+	0x0581af97,0x7693,0x4dbd,0x9d,0xca,0x3f,0x9e,0xbd,0x65,0x85,0xa1
+DEFINE_GUIDSTRUCT("0581AF97-7693-4DBD-9DCA-3F9EBD6585A1",CODECAPI_SUPPORTSEVENTS);
+#define CODECAPI_SUPPORTSEVENTS DEFINE_GUIDNAMED(CODECAPI_SUPPORTSEVENTS)
+
+#define STATIC_CODECAPI_CURRENTCHANGELIST				\
+	0x1cb14e83,0x7d72,0x4657,0x83,0xfd,0x47,0xa2,0xc5,0xb9,0xd1,0x3d
+DEFINE_GUIDSTRUCT("1CB14E83-7D72-4657-83FD-47A2C5B9D13D",CODECAPI_CURRENTCHANGELIST);
+#define CODECAPI_CURRENTCHANGELIST DEFINE_GUIDNAMED(CODECAPI_CURRENTCHANGELIST)
+#endif /* __ENCODER_API_GUIDS__ */
+
+#ifndef __ENCODER_API_DEFINES__
+#define __ENCODER_API_DEFINES__
+typedef enum {
+  ConstantBitRate = 0,
+  VariableBitRateAverage,
+  VariableBitRatePeak
+} VIDEOENCODER_BITRATE_MODE;
+#endif /* __ENCODER_API_DEFINES__ */
+
+#define STATIC_KSPROPSETID_Jack\
+    0x4509f757, 0x2d46, 0x4637, 0x8e, 0x62, 0xce, 0x7d, 0xb9, 0x44, 0xf5, 0x7b
+DEFINE_GUIDSTRUCT("4509F757-2D46-4637-8E62-CE7DB944F57B", KSPROPSETID_Jack);
+#define KSPROPSETID_Jack DEFINE_GUIDNAMED(KSPROPSETID_Jack)
+
+typedef enum {
+    KSPROPERTY_JACK_DESCRIPTION = 1,
+    KSPROPERTY_JACK_DESCRIPTION2,
+    KSPROPERTY_JACK_SINK_INFO
+} KSPROPERTY_JACK;
+
+typedef enum
+{
+    eConnTypeUnknown,
+    eConnType3Point5mm,
+    eConnTypeQuarter,
+    eConnTypeAtapiInternal,
+    eConnTypeRCA,
+    eConnTypeOptical,
+    eConnTypeOtherDigital,
+    eConnTypeOtherAnalog,
+    eConnTypeMultichannelAnalogDIN,
+    eConnTypeXlrProfessional,
+    eConnTypeRJ11Modem,
+    eConnTypeCombination
+} EPcxConnectionType;
+
+typedef enum
+{
+    eGeoLocRear = 0x1,
+    eGeoLocFront,
+    eGeoLocLeft,
+    eGeoLocRight,
+    eGeoLocTop,
+    eGeoLocBottom,
+    eGeoLocRearPanel,
+    eGeoLocRiser,
+    eGeoLocInsideMobileLid,
+    eGeoLocDrivebay,
+    eGeoLocHDMI,
+    eGeoLocOutsideMobileLid,
+    eGeoLocATAPI,
+    eGeoLocReserved5,
+    eGeoLocReserved6,
+    EPcxGeoLocation_enum_count
+} EPcxGeoLocation;
+
+typedef enum
+{
+    eGenLocPrimaryBox = 0,
+    eGenLocInternal,
+    eGenLocSeparate,
+    eGenLocOther,
+    EPcxGenLocation_enum_count
+} EPcxGenLocation;
+
+typedef enum
+{
+    ePortConnJack = 0,
+    ePortConnIntegratedDevice,
+    ePortConnBothIntegratedAndJack,
+    ePortConnUnknown
+} EPxcPortConnection;
+
+typedef struct 
+{
+    DWORD                 ChannelMapping;
+    COLORREF              Color;
+    EPcxConnectionType    ConnectionType;
+    EPcxGeoLocation       GeoLocation;
+    EPcxGenLocation       GenLocation;
+    EPxcPortConnection    PortConnection;
+    BOOL                  IsConnected;
+} KSJACK_DESCRIPTION, *PKSJACK_DESCRIPTION;
+
+typedef enum 
+{
+    KSJACK_SINK_CONNECTIONTYPE_HDMI = 0,           
+    KSJACK_SINK_CONNECTIONTYPE_DISPLAYPORT,         
+} KSJACK_SINK_CONNECTIONTYPE;
+
+#define MAX_SINK_DESCRIPTION_NAME_LENGTH 32
+typedef struct _tagKSJACK_SINK_INFORMATION
+{
+  KSJACK_SINK_CONNECTIONTYPE ConnType;              
+  WORD  ManufacturerId;                            
+  WORD  ProductId;                                  
+  WORD  AudioLatency;                               
+  BOOL  HDCPCapable;                                
+  BOOL  AICapable;                                  
+  UCHAR SinkDescriptionLength;                      
+  WCHAR SinkDescription[MAX_SINK_DESCRIPTION_NAME_LENGTH];
+  LUID  PortId;                                 
+}  KSJACK_SINK_INFORMATION, *PKSJACK_SINK_INFORMATION;
+
+#define JACKDESC2_PRESENCE_DETECT_CAPABILITY       0x00000001 
+#define JACKDESC2_DYNAMIC_FORMAT_CHANGE_CAPABILITY 0x00000002
+
+typedef struct _tagKSJACK_DESCRIPTION2
+{
+  DWORD              DeviceStateInfo;
+  DWORD              JackCapabilities;
+} KSJACK_DESCRIPTION2, *PKSJACK_DESCRIPTION2;
+
+#endif /* _KSMEDIA_ */
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksproxy.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksproxy.h
new file mode 100644
index 0000000000..e6e049dabd
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksproxy.h
@@ -0,0 +1,639 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#ifndef __KSPROXY__
+#define __KSPROXY__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef KSDDKAPI
+#ifdef _KSDDK_
+#define KSDDKAPI
+#else
+#define KSDDKAPI DECLSPEC_IMPORT
+#endif
+
+#define STATIC_IID_IKsObject						\
+	0x423c13a2L,0x2070,0x11d0,0x9e,0xf7,0x00,0xaa,0x00,0xa2,0x16,0xa1
+
+#define STATIC_IID_IKsPinEx						\
+	0x7bb38260L,0xd19c,0x11d2,0xb3,0x8a,0x00,0xa0,0xc9,0x5e,0xc2,0x2e
+
+#define STATIC_IID_IKsPin						\
+	0xb61178d1L,0xa2d9,0x11cf,0x9e,0x53,0x00,0xaa,0x00,0xa2,0x16,0xa1
+
+#define STATIC_IID_IKsPinPipe						\
+	0xe539cd90L,0xa8b4,0x11d1,0x81,0x89,0x00,0xa0,0xc9,0x06,0x28,0x02
+
+#define STATIC_IID_IKsDataTypeHandler					\
+	0x5ffbaa02L,0x49a3,0x11d0,0x9f,0x36,0x00,0xaa,0x00,0xa2,0x16,0xa1
+
+#define STATIC_IID_IKsDataTypeCompletion				\
+	0x827D1A0EL,0x0F73,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#define STATIC_IID_IKsInterfaceHandler					\
+	0xD3ABC7E0L,0x9A61,0x11D0,0xA4,0x0D,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#define STATIC_IID_IKsClockPropertySet					\
+	0x5C5CBD84L,0xE755,0x11D0,0xAC,0x18,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#define STATIC_IID_IKsAllocator						\
+	0x8da64899L,0xc0d9,0x11d0,0x84,0x13,0x00,0x00,0xf8,0x22,0xfe,0x8a
+
+#define STATIC_IID_IKsAllocatorEx					\
+	0x091bb63aL,0x603f,0x11d1,0xb0,0x67,0x00,0xa0,0xc9,0x06,0x28,0x02
+
+#ifndef STATIC_IID_IKsPropertySet
+#define STATIC_IID_IKsPropertySet					\
+	0x31EFAC30L,0x515C,0x11d0,0xA9,0xAA,0x00,0xAA,0x00,0x61,0xBE,0x93
+#endif
+
+#define STATIC_IID_IKsTopology						\
+	0x28F54683L,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#ifndef STATIC_IID_IKsControl
+#define STATIC_IID_IKsControl						\
+	0x28F54685L,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96
+#endif
+
+#define STATIC_IID_IKsAggregateControl					\
+	0x7F40EAC0L,0x3947,0x11D2,0x87,0x4E,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#define STATIC_CLSID_Proxy						\
+	0x17CCA71BL,0xECD7,0x11D0,0xB9,0x08,0x00,0xA0,0xC9,0x22,0x31,0x96
+
+#ifdef _KS_
+
+DEFINE_GUIDEX(IID_IKsObject);
+
+DEFINE_GUIDEX(IID_IKsPin);
+
+DEFINE_GUIDEX(IID_IKsPinEx);
+
+DEFINE_GUIDEX(IID_IKsPinPipe);
+
+DEFINE_GUIDEX(IID_IKsDataTypeHandler);
+
+DEFINE_GUIDEX(IID_IKsDataTypeCompletion);
+
+DEFINE_GUIDEX(IID_IKsInterfaceHandler);
+
+DEFINE_GUIDEX(IID_IKsClockPropertySet);
+
+DEFINE_GUIDEX(IID_IKsAllocator);
+
+DEFINE_GUIDEX(IID_IKsAllocatorEx);
+
+#define IID_IKsQualityForwarder KSCATEGORY_QUALITY
+#define STATIC_IID_IKsQualityForwarder STATIC_KSCATEGORY_QUALITY
+
+typedef enum {
+  KsAllocatorMode_User,
+  KsAllocatorMode_Kernel
+} KSALLOCATORMODE;
+
+typedef enum {
+  FramingProp_Uninitialized,
+  FramingProp_None,
+  FramingProp_Old,
+  FramingProp_Ex
+} FRAMING_PROP;
+
+typedef FRAMING_PROP *PFRAMING_PROP;
+
+typedef enum {
+  Framing_Cache_Update,
+  Framing_Cache_ReadLast,
+  Framing_Cache_ReadOrig,
+  Framing_Cache_Write
+} FRAMING_CACHE_OPS;
+
+typedef struct {
+  LONGLONG MinTotalNominator;
+  LONGLONG MaxTotalNominator;
+  LONGLONG TotalDenominator;
+} OPTIMAL_WEIGHT_TOTALS;
+
+typedef struct IPin IPin;
+typedef struct IKsPin IKsPin;
+typedef struct IKsAllocator IKsAllocator;
+typedef struct IKsAllocatorEx IKsAllocatorEx;
+
+#define AllocatorStrategy_DontCare			0
+#define AllocatorStrategy_MinimizeNumberOfFrames	0x00000001
+#define AllocatorStrategy_MinimizeFrameSize		0x00000002
+#define AllocatorStrategy_MinimizeNumberOfAllocators	0x00000004
+#define AllocatorStrategy_MaximizeSpeed			0x00000008
+
+#define PipeFactor_None					0
+#define PipeFactor_UserModeUpstream			0x00000001
+#define PipeFactor_UserModeDownstream			0x00000002
+#define PipeFactor_MemoryTypes				0x00000004
+#define PipeFactor_Flags				0x00000008
+#define PipeFactor_PhysicalRanges			0x00000010
+#define PipeFactor_OptimalRanges			0x00000020
+#define PipeFactor_FixedCompression			0x00000040
+#define PipeFactor_UnknownCompression			0x00000080
+
+#define PipeFactor_Buffers				0x00000100
+#define PipeFactor_Align				0x00000200
+#define PipeFactor_PhysicalEnd				0x00000400
+#define PipeFactor_LogicalEnd				0x00000800
+
+typedef enum {
+  PipeState_DontCare,
+  PipeState_RangeNotFixed,
+  PipeState_RangeFixed,
+  PipeState_CompressionUnknown,
+  PipeState_Finalized
+} PIPE_STATE;
+
+typedef struct _PIPE_DIMENSIONS {
+  KS_COMPRESSION AllocatorPin;
+  KS_COMPRESSION MaxExpansionPin;
+  KS_COMPRESSION EndPin;
+} PIPE_DIMENSIONS,*PPIPE_DIMENSIONS;
+
+typedef enum {
+  Pipe_Allocator_None,
+  Pipe_Allocator_FirstPin,
+  Pipe_Allocator_LastPin,
+  Pipe_Allocator_MiddlePin
+} PIPE_ALLOCATOR_PLACE;
+
+typedef PIPE_ALLOCATOR_PLACE *PPIPE_ALLOCATOR_PLACE;
+
+typedef enum {
+  KS_MemoryTypeDontCare = 0,
+  KS_MemoryTypeKernelPaged,
+  KS_MemoryTypeKernelNonPaged,
+  KS_MemoryTypeDeviceHostMapped,
+  KS_MemoryTypeDeviceSpecific,
+  KS_MemoryTypeUser,
+  KS_MemoryTypeAnyHost
+} KS_LogicalMemoryType;
+
+typedef KS_LogicalMemoryType *PKS_LogicalMemoryType;
+
+typedef struct _PIPE_TERMINATION {
+  ULONG Flags;
+  ULONG OutsideFactors;
+  ULONG Weigth;
+  KS_FRAMING_RANGE PhysicalRange;
+  KS_FRAMING_RANGE_WEIGHTED OptimalRange;
+  KS_COMPRESSION Compression;
+} PIPE_TERMINATION;
+
+typedef struct _ALLOCATOR_PROPERTIES_EX
+{
+  long cBuffers;
+  long cbBuffer;
+  long cbAlign;
+  long cbPrefix;
+
+  GUID MemoryType;
+  GUID BusType;
+  PIPE_STATE State;
+  PIPE_TERMINATION Input;
+  PIPE_TERMINATION Output;
+  ULONG Strategy;
+  ULONG Flags;
+  ULONG Weight;
+  KS_LogicalMemoryType LogicalMemoryType;
+  PIPE_ALLOCATOR_PLACE AllocatorPlace;
+  PIPE_DIMENSIONS Dimensions;
+  KS_FRAMING_RANGE PhysicalRange;
+  IKsAllocatorEx *PrevSegment;
+  ULONG CountNextSegments;
+  IKsAllocatorEx **NextSegments;
+  ULONG InsideFactors;
+  ULONG NumberPins;
+} ALLOCATOR_PROPERTIES_EX;
+
+typedef ALLOCATOR_PROPERTIES_EX *PALLOCATOR_PROPERTIES_EX;
+
+#ifdef __STREAMS__
+
+struct IKsClockPropertySet;
+#undef INTERFACE
+#define INTERFACE IKsClockPropertySet
+DECLARE_INTERFACE_(IKsClockPropertySet,IUnknown)
+{
+  STDMETHOD(KsGetTime)			(THIS_
+						LONGLONG *Time
+					) PURE;
+  STDMETHOD(KsSetTime)			(THIS_
+						LONGLONG Time
+					) PURE;
+  STDMETHOD(KsGetPhysicalTime)		(THIS_
+						LONGLONG *Time
+					) PURE;
+  STDMETHOD(KsSetPhysicalTime)		(THIS_
+						LONGLONG Time
+					) PURE;
+  STDMETHOD(KsGetCorrelatedTime)	(THIS_
+						KSCORRELATED_TIME *CorrelatedTime
+					) PURE;
+  STDMETHOD(KsSetCorrelatedTime)	(THIS_
+						KSCORRELATED_TIME *CorrelatedTime
+					) PURE;
+  STDMETHOD(KsGetCorrelatedPhysicalTime)(THIS_
+						KSCORRELATED_TIME *CorrelatedTime
+					) PURE;
+  STDMETHOD(KsSetCorrelatedPhysicalTime)(THIS_
+						KSCORRELATED_TIME *CorrelatedTime
+					) PURE;
+  STDMETHOD(KsGetResolution)		(THIS_
+						KSRESOLUTION *Resolution
+					) PURE;
+  STDMETHOD(KsGetState)			(THIS_
+						KSSTATE *State
+					) PURE;
+};
+
+struct IKsAllocator;
+#undef INTERFACE
+#define INTERFACE IKsAllocator
+DECLARE_INTERFACE_(IKsAllocator,IUnknown)
+{
+  STDMETHOD_(HANDLE,KsGetAllocatorHandle)(THIS) PURE;
+  STDMETHOD_(KSALLOCATORMODE,KsGetAllocatorMode)(THIS) PURE;
+  STDMETHOD(KsGetAllocatorStatus)	(THIS_
+						PKSSTREAMALLOCATOR_STATUS AllocatorStatus
+					) PURE;
+  STDMETHOD_(VOID,KsSetAllocatorMode)	(THIS_
+						KSALLOCATORMODE Mode
+					) PURE;
+};
+
+struct IKsAllocatorEx;
+#undef INTERFACE
+#define INTERFACE IKsAllocatorEx
+DECLARE_INTERFACE_(IKsAllocatorEx,IKsAllocator)
+{
+  STDMETHOD_(PALLOCATOR_PROPERTIES_EX,KsGetProperties)(THIS) PURE;
+  STDMETHOD_(VOID,KsSetProperties)	(THIS_
+						PALLOCATOR_PROPERTIES_EX
+					) PURE;
+  STDMETHOD_(VOID,KsSetAllocatorHandle)	(THIS_
+						HANDLE AllocatorHandle
+					) PURE;
+  STDMETHOD_(HANDLE,KsCreateAllocatorAndGetHandle)(THIS_
+						IKsPin *KsPin
+					) PURE;
+};
+
+typedef enum {
+  KsPeekOperation_PeekOnly,
+  KsPeekOperation_AddRef
+} KSPEEKOPERATION;
+
+typedef struct _KSSTREAM_SEGMENT *PKSSTREAM_SEGMENT;
+struct IKsPin;
+
+#undef INTERFACE
+#define INTERFACE IKsPin
+DECLARE_INTERFACE_(IKsPin,IUnknown)
+{
+  STDMETHOD(KsQueryMediums)		(THIS_
+						PKSMULTIPLE_ITEM *MediumList
+					) PURE;
+  STDMETHOD(KsQueryInterfaces)		(THIS_
+						PKSMULTIPLE_ITEM *InterfaceList
+					) PURE;
+  STDMETHOD(KsCreateSinkPinHandle)	(THIS_
+						KSPIN_INTERFACE& Interface,
+						KSPIN_MEDIUM& Medium
+					) PURE;
+  STDMETHOD(KsGetCurrentCommunication)	(THIS_
+						KSPIN_COMMUNICATION *Communication,
+						KSPIN_INTERFACE *Interface,
+						KSPIN_MEDIUM *Medium
+					) PURE;
+  STDMETHOD(KsPropagateAcquire)		(THIS) PURE;
+  STDMETHOD(KsDeliver)			(THIS_
+						IMediaSample *Sample,
+						ULONG Flags
+					) PURE;
+  STDMETHOD(KsMediaSamplesCompleted)	(THIS_
+						PKSSTREAM_SEGMENT StreamSegment
+					) PURE;
+  STDMETHOD_(IMemAllocator *,KsPeekAllocator)(THIS_
+						KSPEEKOPERATION Operation
+					) PURE;
+  STDMETHOD(KsReceiveAllocator)		(THIS_
+						IMemAllocator *MemAllocator
+					) PURE;
+  STDMETHOD(KsRenegotiateAllocator)	(THIS) PURE;
+  STDMETHOD_(LONG,KsIncrementPendingIoCount)(THIS) PURE;
+  STDMETHOD_(LONG,KsDecrementPendingIoCount)(THIS) PURE;
+  STDMETHOD(KsQualityNotify)		(THIS_
+						ULONG Proportion,
+						REFERENCE_TIME TimeDelta
+					) PURE;
+};
+
+struct IKsPinEx;
+#undef INTERFACE
+#define INTERFACE IKsPinEx
+DECLARE_INTERFACE_(IKsPinEx,IKsPin)
+{
+  STDMETHOD_(VOID,KsNotifyError)	(THIS_
+						IMediaSample *Sample,
+						HRESULT hr
+					) PURE;
+};
+
+struct IKsPinPipe;
+#undef INTERFACE
+#define INTERFACE IKsPinPipe
+DECLARE_INTERFACE_(IKsPinPipe,IUnknown)
+{
+  STDMETHOD(KsGetPinFramingCache)	(THIS_
+						PKSALLOCATOR_FRAMING_EX *FramingEx,
+						PFRAMING_PROP FramingProp,
+						FRAMING_CACHE_OPS Option
+					) PURE;
+  STDMETHOD(KsSetPinFramingCache)	(THIS_
+						PKSALLOCATOR_FRAMING_EX FramingEx,
+						PFRAMING_PROP FramingProp,
+						FRAMING_CACHE_OPS Option
+					) PURE;
+  STDMETHOD_(IPin*,KsGetConnectedPin)	(THIS) PURE;
+  STDMETHOD_(IKsAllocatorEx*,KsGetPipe)	(THIS_
+						KSPEEKOPERATION Operation
+					) PURE;
+  STDMETHOD(KsSetPipe)			(THIS_
+						IKsAllocatorEx *KsAllocator
+					) PURE;
+  STDMETHOD_(ULONG,KsGetPipeAllocatorFlag)(THIS) PURE;
+  STDMETHOD(KsSetPipeAllocatorFlag)	(THIS_
+						ULONG Flag
+					) PURE;
+  STDMETHOD_(GUID,KsGetPinBusCache)	(THIS) PURE;
+  STDMETHOD(KsSetPinBusCache)		(THIS_
+						GUID Bus
+					) PURE;
+  STDMETHOD_(PWCHAR,KsGetPinName)	(THIS) PURE;
+  STDMETHOD_(PWCHAR,KsGetFilterName)	(THIS) PURE;
+};
+
+struct IKsPinFactory;
+#undef INTERFACE
+#define INTERFACE IKsPinFactory
+DECLARE_INTERFACE_(IKsPinFactory,IUnknown)
+{
+  STDMETHOD(KsPinFactory)		(THIS_
+						ULONG *PinFactory
+					) PURE;
+};
+
+typedef enum {
+  KsIoOperation_Write,
+  KsIoOperation_Read
+} KSIOOPERATION;
+
+struct IKsDataTypeHandler;
+#undef INTERFACE
+#define INTERFACE IKsDataTypeHandler
+DECLARE_INTERFACE_(IKsDataTypeHandler,IUnknown)
+{
+  STDMETHOD(KsCompleteIoOperation)	(THIS_
+						IMediaSample *Sample,
+						PVOID StreamHeader,
+						KSIOOPERATION IoOperation,
+						WINBOOL Cancelled
+					) PURE;
+  STDMETHOD(KsIsMediaTypeInRanges)	(THIS_
+						PVOID DataRanges
+					) PURE;
+  STDMETHOD(KsPrepareIoOperation)	(THIS_
+						IMediaSample *Sample,
+						PVOID StreamHeader,
+						KSIOOPERATION IoOperation
+					) PURE;
+  STDMETHOD(KsQueryExtendedSize)	(THIS_
+						ULONG *ExtendedSize
+					) PURE;
+  STDMETHOD(KsSetMediaType)		(THIS_
+						const AM_MEDIA_TYPE *AmMediaType
+					) PURE;
+};
+
+struct IKsDataTypeCompletion;
+#undef INTERFACE
+#define INTERFACE IKsDataTypeCompletion
+DECLARE_INTERFACE_(IKsDataTypeCompletion,IUnknown)
+{
+  STDMETHOD(KsCompleteMediaType)	(THIS_
+						HANDLE FilterHandle,
+						ULONG PinFactoryId,
+						AM_MEDIA_TYPE *AmMediaType
+					) PURE;
+};
+
+struct IKsInterfaceHandler;
+#undef INTERFACE
+#define INTERFACE IKsInterfaceHandler
+DECLARE_INTERFACE_(IKsInterfaceHandler,IUnknown)
+{
+  STDMETHOD(KsSetPin)			(THIS_
+						IKsPin *KsPin
+					) PURE;
+  STDMETHOD(KsProcessMediaSamples)	(THIS_
+						IKsDataTypeHandler *KsDataTypeHandler,
+						IMediaSample **SampleList,
+						PLONG SampleCount,
+						KSIOOPERATION IoOperation,
+						PKSSTREAM_SEGMENT *StreamSegment
+					) PURE;
+  STDMETHOD(KsCompleteIo)		(THIS_
+						PKSSTREAM_SEGMENT StreamSegment
+					) PURE;
+};
+
+typedef struct _KSSTREAM_SEGMENT {
+  IKsInterfaceHandler *KsInterfaceHandler;
+  IKsDataTypeHandler *KsDataTypeHandler;
+  KSIOOPERATION IoOperation;
+  HANDLE CompletionEvent;
+} KSSTREAM_SEGMENT;
+
+struct IKsObject;
+#undef INTERFACE
+#define INTERFACE IKsObject
+DECLARE_INTERFACE_(IKsObject,IUnknown)
+{
+  STDMETHOD_(HANDLE,KsGetObjectHandle)	(THIS) PURE;
+};
+
+struct IKsQualityForwarder;
+#undef INTERFACE
+#define INTERFACE IKsQualityForwarder
+DECLARE_INTERFACE_(IKsQualityForwarder,IKsObject)
+{
+  STDMETHOD_(VOID,KsFlushClient)	(THIS_
+						IKsPin *Pin
+					) PURE;
+};
+
+struct IKsNotifyEvent;
+#undef INTERFACE
+#define INTERFACE IKsNotifyEvent
+DECLARE_INTERFACE_(IKsNotifyEvent,IUnknown)
+{
+  STDMETHOD(KsNotifyEvent)		(THIS_
+						ULONG Event,
+						ULONG_PTR lParam1,
+						ULONG_PTR lParam2
+					) PURE;
+};
+
+KSDDKAPI HRESULT WINAPI KsResolveRequiredAttributes(PKSDATARANGE DataRange,PKSMULTIPLE_ITEM Attributes);
+KSDDKAPI HRESULT WINAPI KsOpenDefaultDevice(REFGUID Category,ACCESS_MASK Access,PHANDLE DeviceHandle);
+KSDDKAPI HRESULT WINAPI KsSynchronousDeviceControl(HANDLE Handle,ULONG IoControl,PVOID InBuffer,ULONG InLength,PVOID OutBuffer,ULONG OutLength,PULONG BytesReturned);
+KSDDKAPI HRESULT WINAPI KsGetMultiplePinFactoryItems(HANDLE FilterHandle,ULONG PinFactoryId,ULONG PropertyId,PVOID *Items);
+KSDDKAPI HRESULT WINAPI KsGetMediaTypeCount(HANDLE FilterHandle,ULONG PinFactoryId,ULONG *MediaTypeCount);
+KSDDKAPI HRESULT WINAPI KsGetMediaType(int Position,AM_MEDIA_TYPE *AmMediaType,HANDLE FilterHandle,ULONG PinFactoryId);
+#endif /* __STREAMS__ */
+
+#ifndef _IKsPropertySet_
+DEFINE_GUIDEX(IID_IKsPropertySet);
+#endif
+
+#ifndef _IKsControl_
+DEFINE_GUIDEX(IID_IKsControl);
+#endif
+
+DEFINE_GUIDEX(IID_IKsAggregateControl);
+#ifndef _IKsTopology_
+DEFINE_GUIDEX(IID_IKsTopology);
+#endif
+DEFINE_GUIDSTRUCT("17CCA71B-ECD7-11D0-B908-00A0C9223196",CLSID_Proxy);
+#define CLSID_Proxy DEFINE_GUIDNAMED(CLSID_Proxy)
+
+#else /* _KS_ */
+
+#ifndef _IKsPropertySet_
+DEFINE_GUID(IID_IKsPropertySet,STATIC_IID_IKsPropertySet);
+#endif
+
+DEFINE_GUID(CLSID_Proxy,STATIC_CLSID_Proxy);
+
+#endif /* _KS_ */
+
+#ifndef _IKsPropertySet_
+#define _IKsPropertySet_
+#define KSPROPERTY_SUPPORT_GET 1
+#define KSPROPERTY_SUPPORT_SET 2
+
+#ifdef DECLARE_INTERFACE_
+struct IKsPropertySet;
+#undef INTERFACE
+#define INTERFACE IKsPropertySet
+DECLARE_INTERFACE_(IKsPropertySet,IUnknown)
+{
+  STDMETHOD(Set)			(THIS_
+						REFGUID PropSet,
+						ULONG Id,
+						LPVOID InstanceData,
+						ULONG InstanceLength,
+						LPVOID PropertyData,
+						ULONG DataLength
+					) PURE;
+  STDMETHOD(Get)			(THIS_
+						REFGUID PropSet,
+						ULONG Id,
+						LPVOID InstanceData,
+						ULONG InstanceLength,
+						LPVOID PropertyData,
+						ULONG DataLength,
+						ULONG *BytesReturned
+					) PURE;
+  STDMETHOD(QuerySupported)		(THIS_
+						REFGUID PropSet,
+						ULONG Id,
+						ULONG *TypeSupport
+					) PURE;
+};
+#endif /* DECLARE_INTERFACE_ */
+#endif /* _IKsPropertySet_ */
+
+#ifndef _IKsControl_
+#define _IKsControl_
+#ifdef DECLARE_INTERFACE_
+struct IKsControl;
+#undef INTERFACE
+#define INTERFACE IKsControl
+DECLARE_INTERFACE_(IKsControl,IUnknown)
+{
+  STDMETHOD(KsProperty)			(THIS_
+						PKSPROPERTY Property,
+						ULONG PropertyLength,
+						LPVOID PropertyData,
+						ULONG DataLength,
+						ULONG *BytesReturned
+					) PURE;
+  STDMETHOD(KsMethod)			(THIS_
+						PKSMETHOD Method,
+						ULONG MethodLength,
+						LPVOID MethodData,
+						ULONG DataLength,
+						ULONG *BytesReturned
+					) PURE;
+  STDMETHOD(KsEvent)			(THIS_
+						PKSEVENT Event,
+						ULONG EventLength,
+						LPVOID EventData,
+						ULONG DataLength,
+						ULONG *BytesReturned
+					) PURE;
+};
+#endif /* DECLARE_INTERFACE_ */
+#endif /* _IKsControl_ */
+
+#ifdef DECLARE_INTERFACE_
+struct IKsAggregateControl;
+#undef INTERFACE
+#define INTERFACE IKsAggregateControl
+DECLARE_INTERFACE_(IKsAggregateControl,IUnknown)
+{
+  STDMETHOD(KsAddAggregate)		(THIS_
+						REFGUID AggregateClass
+					) PURE;
+  STDMETHOD(KsRemoveAggregate)		(THIS_
+						REFGUID AggregateClass
+					) PURE;
+};
+#endif /* DECLARE_INTERFACE_ */
+
+#ifndef _IKsTopology_
+#define _IKsTopology_
+#ifdef DECLARE_INTERFACE_
+struct IKsTopology;
+#undef INTERFACE
+#define INTERFACE IKsTopology
+DECLARE_INTERFACE_(IKsTopology,IUnknown)
+{
+  STDMETHOD(CreateNodeInstance)		(THIS_
+						ULONG NodeId,
+						ULONG Flags,
+						ACCESS_MASK DesiredAccess,
+						IUnknown *UnkOuter,
+						REFGUID InterfaceId,
+						LPVOID *Interface
+					) PURE;
+};
+#endif /* DECLARE_INTERFACE_ */
+#endif /* _IKsTopology_ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __KSPROXY__ */
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksuuids.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksuuids.h
new file mode 100644
index 0000000000..7d0efff65c
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/ksuuids.h
@@ -0,0 +1,159 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+
+OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK,
+		0x36523B13,0x8EE5,0x11d1,0x8C,0xA3,0x00,0x60,0xB0,0x57,0x66,0x4A)
+
+OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES,
+		0xe06d8020,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIATYPE_MPEG2_SECTIONS,
+		0x455f176c,0x4b06,0x47ce,0x9a,0xef,0x8c,0xae,0xf7,0x3d,0xf7,0xb5)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_ATSC_SI,
+		0xb3c7397c,0xd303,0x414d,0xb3,0x3c,0x4e,0xd2,0xc9,0xd2,0x97,0x33)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVB_SI,
+		0xe9dd31a3,0x221d,0x4adb,0x85,0x32,0x9a,0xf3,0x9,0xc1,0xa4,0x8)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2DATA,
+		0xc892e55b,0x252d,0x42b5,0xa3,0x16,0xd9,0x97,0xe7,0xa5,0xd9,0x95)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO,
+		0xe06d8026,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO,
+		0xe06d80e3,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_VIDEOINFO2,
+		0xf72a76A0L,0xeb0a,0x11d0,0xac,0xe4,0x0,0x0,0xc0,0xcc,0x16,0xba)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM,
+		0xe06d8022,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT,
+		0xe06d8023,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT_STRIDE,
+		0x138aa9a4,0x1ee2,0x4c5b,0x98,0x8e,0x19,0xab,0xfd,0xbc,0x8a,0x11)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO,
+		0xe06d802b,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3,
+		0xe06d802c,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE,
+		0xe06d802d,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,
+		0xe06d8032,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DTS,
+		0xe06d8033,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS,
+		0xe06d8034,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK,
+		0xed0b916a,0x044d,0x11d1,0xaa,0x78,0x00,0xc0,0x04f,0xc3,0x1d,0x60)
+
+OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION,
+		0xe06d802e,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI,
+		0xe06d802f,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI,
+		0xe06d8030,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER,
+		0xe06d8031,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_MPEG2Video,
+		0xe06d80e3,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_DolbyAC3,
+		0xe06d80e4,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_MPEG2Audio,
+		0xe06d80e5,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio,
+		0xe06d80e6,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x05f,0x6c,0xbb,0xea)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_AC3,
+		0xBFABE720,0x6E1F,0x11D0,0xBC,0xF2,0x44,0x45,0x53,0x54,0x00,0x00)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic,
+		0xac390460,0x43af,0x11d0,0xbd,0x6a,0x00,0x35,0x05,0xc1,0x03,0xa9)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt,
+		0x0E8A0A40,0x6AEF,0x11D0,0x9E,0xD0,0x00,0xA0,0x24,0xCA,0x19,0xB3)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange,
+		0xa503c5c0,0x1d1d,0x11d1,0xad,0x80,0x44,0x45,0x53,0x54,0x0,0x0)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange,
+		0x3577eb09,0x9582,0x477f,0xb2,0x9c,0xb0,0xc4,0x52,0xa4,0xff,0x9a)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke,
+		0xae4720ae,0xaa71,0x42d8,0xb8,0x2a,0xff,0xfd,0xf5,0x8b,0x76,0xfd)
+
+OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep,
+		0xc830acbd,0xab07,0x492f,0x88,0x52,0x45,0xb6,0x98,0x7c,0x29,0x79)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE,
+		0x65E8773DL,0x8F56,0x11D0,0xA3,0xB9,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,
+		0x65E8773EL,0x8F56,0x11D0,0xA3,0xB9,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,
+		0x1E84C900L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,
+		0x6994AD04L,0x93EF,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,
+		0x6994AD05L,0x93EF,0x11D0,0xA3,0xCC,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,
+		0xa799a800L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,
+		0xa799a801L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,
+		0xa799a802L,0xa46d,0x11d0,0xa1,0x8c,0x00,0xa0,0x24,0x01,0xdc,0xd4)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,
+		0x07dad660L,0x22f1,0x11d1,0xa9,0xf4,0x00,0xc0,0x4f,0xbb,0xde,0x8f)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC_MI,
+		0x9c24a977,0x951,0x451a,0x80,0x6,0xe,0x49,0xbd,0x28,0xcd,0x5f)
+
+OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,
+		0x0A4252A0L,0x7E70,0x11D0,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00)
+
+OUR_GUID_ENTRY(IID_IKsInterfaceHandler,
+		0xD3ABC7E0L,0x9A61,0x11D0,0xA4,0x0D,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(IID_IKsDataTypeHandler,
+		0x5FFBAA02L,0x49A3,0x11D0,0x9F,0x36,0x00,0xAA,0x00,0xA2,0x16,0xA1)
+
+OUR_GUID_ENTRY(IID_IKsPin,
+		0xb61178d1L,0xa2d9,0x11cf,0x9e,0x53,0x00,0xaa,0x00,0xa2,0x16,0xa1)
+
+OUR_GUID_ENTRY(IID_IKsControl,
+		0x28F54685L,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(IID_IKsPinFactory,
+		0xCD5EBE6BL,0x8B6E,0x11D1,0x8A,0xE0,0x00,0xA0,0xC9,0x22,0x31,0x96)
+
+OUR_GUID_ENTRY(AM_INTERFACESETID_Standard,
+		0x1A8766A0L,0x62CE,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00)
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h
new file mode 100644
index 0000000000..a75e4758ed
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h
@@ -0,0 +1,929 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for mmdeviceapi.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __mmdeviceapi_h__
+#define __mmdeviceapi_h__
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IMMNotificationClient_FWD_DEFINED__
+#define __IMMNotificationClient_FWD_DEFINED__
+typedef interface IMMNotificationClient IMMNotificationClient;
+#endif 	/* __IMMNotificationClient_FWD_DEFINED__ */
+
+
+#ifndef __IMMDevice_FWD_DEFINED__
+#define __IMMDevice_FWD_DEFINED__
+typedef interface IMMDevice IMMDevice;
+#endif 	/* __IMMDevice_FWD_DEFINED__ */
+
+
+#ifndef __IMMDeviceCollection_FWD_DEFINED__
+#define __IMMDeviceCollection_FWD_DEFINED__
+typedef interface IMMDeviceCollection IMMDeviceCollection;
+#endif 	/* __IMMDeviceCollection_FWD_DEFINED__ */
+
+
+#ifndef __IMMEndpoint_FWD_DEFINED__
+#define __IMMEndpoint_FWD_DEFINED__
+typedef interface IMMEndpoint IMMEndpoint;
+#endif 	/* __IMMEndpoint_FWD_DEFINED__ */
+
+
+#ifndef __IMMDeviceEnumerator_FWD_DEFINED__
+#define __IMMDeviceEnumerator_FWD_DEFINED__
+typedef interface IMMDeviceEnumerator IMMDeviceEnumerator;
+#endif 	/* __IMMDeviceEnumerator_FWD_DEFINED__ */
+
+
+#ifndef __IMMDeviceActivator_FWD_DEFINED__
+#define __IMMDeviceActivator_FWD_DEFINED__
+typedef interface IMMDeviceActivator IMMDeviceActivator;
+#endif 	/* __IMMDeviceActivator_FWD_DEFINED__ */
+
+
+#ifndef __MMDeviceEnumerator_FWD_DEFINED__
+#define __MMDeviceEnumerator_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class MMDeviceEnumerator MMDeviceEnumerator;
+#else
+typedef struct MMDeviceEnumerator MMDeviceEnumerator;
+#endif /* __cplusplus */
+
+#endif 	/* __MMDeviceEnumerator_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "unknwn.h"
+#include "propsys.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_mmdeviceapi_0000_0000 */
+/* [local] */ 
+
+#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
+#define E_UNSUPPORTED_TYPE HRESULT_FROM_WIN32(ERROR_UNSUPPORTED_TYPE)
+#define DEVICE_STATE_ACTIVE      0x00000001
+#define DEVICE_STATE_DISABLED    0x00000002
+#define DEVICE_STATE_NOTPRESENT  0x00000004
+#define DEVICE_STATE_UNPLUGGED   0x00000008
+#define DEVICE_STATEMASK_ALL     0x0000000f
+#ifdef DEFINE_PROPERTYKEY
+#undef DEFINE_PROPERTYKEY
+#endif
+#ifdef INITGUID
+#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) EXTERN_C const PROPERTYKEY name = { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
+#else
+#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) EXTERN_C const PROPERTYKEY name
+#endif // INITGUID
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_FormFactor, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 0); 
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_ControlPanelPageProvider, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 1); 
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_Association, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 2);
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_PhysicalSpeakers, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 3);
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_GUID, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 4);
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_Disable_SysFx, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 5);
+#define ENDPOINT_SYSFX_ENABLED          0x00000000  // System Effects are enabled.
+#define ENDPOINT_SYSFX_DISABLED         0x00000001  // System Effects are disabled.
+DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_FullRangeSpeakers, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e, 6);
+DEFINE_PROPERTYKEY(PKEY_AudioEngine_DeviceFormat, 0xf19f064d, 0x82c, 0x4e27, 0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c, 0); 
+typedef struct tagDIRECTX_AUDIO_ACTIVATION_PARAMS
+    {
+    DWORD cbDirectXAudioActivationParams;
+    GUID guidAudioSession;
+    DWORD dwAudioStreamFlags;
+    } 	DIRECTX_AUDIO_ACTIVATION_PARAMS;
+
+typedef struct tagDIRECTX_AUDIO_ACTIVATION_PARAMS *PDIRECTX_AUDIO_ACTIVATION_PARAMS;
+
+typedef /* [public][public][public][public][public] */ 
+enum __MIDL___MIDL_itf_mmdeviceapi_0000_0000_0001
+    {	eRender	= 0,
+	eCapture	= ( eRender + 1 ) ,
+	eAll	= ( eCapture + 1 ) ,
+	EDataFlow_enum_count	= ( eAll + 1 ) 
+    } 	EDataFlow;
+
+typedef /* [public][public][public] */ 
+enum __MIDL___MIDL_itf_mmdeviceapi_0000_0000_0002
+    {	eConsole	= 0,
+	eMultimedia	= ( eConsole + 1 ) ,
+	eCommunications	= ( eMultimedia + 1 ) ,
+	ERole_enum_count	= ( eCommunications + 1 ) 
+    } 	ERole;
+
+typedef /* [public] */ 
+enum __MIDL___MIDL_itf_mmdeviceapi_0000_0000_0003
+    {	RemoteNetworkDevice	= 0,
+	Speakers	= ( RemoteNetworkDevice + 1 ) ,
+	LineLevel	= ( Speakers + 1 ) ,
+	Headphones	= ( LineLevel + 1 ) ,
+	Microphone	= ( Headphones + 1 ) ,
+	Headset	= ( Microphone + 1 ) ,
+	Handset	= ( Headset + 1 ) ,
+	UnknownDigitalPassthrough	= ( Handset + 1 ) ,
+	SPDIF	= ( UnknownDigitalPassthrough + 1 ) ,
+	HDMI	= ( SPDIF + 1 ) ,
+	UnknownFormFactor	= ( HDMI + 1 ) 
+    } 	EndpointFormFactor;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_mmdeviceapi_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_mmdeviceapi_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IMMNotificationClient_INTERFACE_DEFINED__
+#define __IMMNotificationClient_INTERFACE_DEFINED__
+
+/* interface IMMNotificationClient */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMNotificationClient;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("7991EEC9-7E89-4D85-8390-6C703CEC60C0")
+    IMMNotificationClient : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnDeviceStateChanged( 
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId,
+            /* [in] */ 
+            __in  DWORD dwNewState) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnDeviceAdded( 
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnDeviceRemoved( 
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged( 
+            /* [in] */ 
+            __in  EDataFlow flow,
+            /* [in] */ 
+            __in  ERole role,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDefaultDeviceId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnPropertyValueChanged( 
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId,
+            /* [in] */ 
+            __in  const PROPERTYKEY key) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMNotificationClientVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMNotificationClient * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMNotificationClient * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMNotificationClient * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnDeviceStateChanged )( 
+            IMMNotificationClient * This,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId,
+            /* [in] */ 
+            __in  DWORD dwNewState);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnDeviceAdded )( 
+            IMMNotificationClient * This,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnDeviceRemoved )( 
+            IMMNotificationClient * This,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnDefaultDeviceChanged )( 
+            IMMNotificationClient * This,
+            /* [in] */ 
+            __in  EDataFlow flow,
+            /* [in] */ 
+            __in  ERole role,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDefaultDeviceId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OnPropertyValueChanged )( 
+            IMMNotificationClient * This,
+            /* [in] */ 
+            __in  LPCWSTR pwstrDeviceId,
+            /* [in] */ 
+            __in  const PROPERTYKEY key);
+        
+        END_INTERFACE
+    } IMMNotificationClientVtbl;
+
+    interface IMMNotificationClient
+    {
+        CONST_VTBL struct IMMNotificationClientVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMNotificationClient_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMNotificationClient_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMNotificationClient_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMNotificationClient_OnDeviceStateChanged(This,pwstrDeviceId,dwNewState)	\
+    ( (This)->lpVtbl -> OnDeviceStateChanged(This,pwstrDeviceId,dwNewState) ) 
+
+#define IMMNotificationClient_OnDeviceAdded(This,pwstrDeviceId)	\
+    ( (This)->lpVtbl -> OnDeviceAdded(This,pwstrDeviceId) ) 
+
+#define IMMNotificationClient_OnDeviceRemoved(This,pwstrDeviceId)	\
+    ( (This)->lpVtbl -> OnDeviceRemoved(This,pwstrDeviceId) ) 
+
+#define IMMNotificationClient_OnDefaultDeviceChanged(This,flow,role,pwstrDefaultDeviceId)	\
+    ( (This)->lpVtbl -> OnDefaultDeviceChanged(This,flow,role,pwstrDefaultDeviceId) ) 
+
+#define IMMNotificationClient_OnPropertyValueChanged(This,pwstrDeviceId,key)	\
+    ( (This)->lpVtbl -> OnPropertyValueChanged(This,pwstrDeviceId,key) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMNotificationClient_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMMDevice_INTERFACE_DEFINED__
+#define __IMMDevice_INTERFACE_DEFINED__
+
+/* interface IMMDevice */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMDevice;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("D666063F-1587-4E43-81F1-B948E807363F")
+    IMMDevice : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Activate( 
+            /* [in] */ 
+            __in  REFIID iid,
+            /* [in] */ 
+            __in  DWORD dwClsCtx,
+            /* [unique][in] */ 
+            __in_opt  PROPVARIANT *pActivationParams,
+            /* [iid_is][out] */ 
+            __out  void **ppInterface) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OpenPropertyStore( 
+            /* [in] */ 
+            __in  DWORD stgmAccess,
+            /* [out] */ 
+            __out  IPropertyStore **ppProperties) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetId( 
+            /* [out] */ 
+            __deref_out  LPWSTR *ppstrId) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetState( 
+            /* [out] */ 
+            __out  DWORD *pdwState) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMDeviceVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMDevice * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMDevice * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMDevice * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Activate )( 
+            IMMDevice * This,
+            /* [in] */ 
+            __in  REFIID iid,
+            /* [in] */ 
+            __in  DWORD dwClsCtx,
+            /* [unique][in] */ 
+            __in_opt  PROPVARIANT *pActivationParams,
+            /* [iid_is][out] */ 
+            __out  void **ppInterface);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *OpenPropertyStore )( 
+            IMMDevice * This,
+            /* [in] */ 
+            __in  DWORD stgmAccess,
+            /* [out] */ 
+            __out  IPropertyStore **ppProperties);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetId )( 
+            IMMDevice * This,
+            /* [out] */ 
+            __deref_out  LPWSTR *ppstrId);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetState )( 
+            IMMDevice * This,
+            /* [out] */ 
+            __out  DWORD *pdwState);
+        
+        END_INTERFACE
+    } IMMDeviceVtbl;
+
+    interface IMMDevice
+    {
+        CONST_VTBL struct IMMDeviceVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMDevice_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMDevice_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMDevice_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppInterface)	\
+    ( (This)->lpVtbl -> Activate(This,iid,dwClsCtx,pActivationParams,ppInterface) ) 
+
+#define IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties)	\
+    ( (This)->lpVtbl -> OpenPropertyStore(This,stgmAccess,ppProperties) ) 
+
+#define IMMDevice_GetId(This,ppstrId)	\
+    ( (This)->lpVtbl -> GetId(This,ppstrId) ) 
+
+#define IMMDevice_GetState(This,pdwState)	\
+    ( (This)->lpVtbl -> GetState(This,pdwState) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMDevice_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMMDeviceCollection_INTERFACE_DEFINED__
+#define __IMMDeviceCollection_INTERFACE_DEFINED__
+
+/* interface IMMDeviceCollection */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMDeviceCollection;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("0BD7A1BE-7A1A-44DB-8397-CC5392387B5E")
+    IMMDeviceCollection : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ 
+            __out  UINT *pcDevices) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Item( 
+            /* [in] */ 
+            __in  UINT nDevice,
+            /* [out] */ 
+            __out  IMMDevice **ppDevice) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMDeviceCollectionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMDeviceCollection * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMDeviceCollection * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMDeviceCollection * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IMMDeviceCollection * This,
+            /* [out] */ 
+            __out  UINT *pcDevices);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Item )( 
+            IMMDeviceCollection * This,
+            /* [in] */ 
+            __in  UINT nDevice,
+            /* [out] */ 
+            __out  IMMDevice **ppDevice);
+        
+        END_INTERFACE
+    } IMMDeviceCollectionVtbl;
+
+    interface IMMDeviceCollection
+    {
+        CONST_VTBL struct IMMDeviceCollectionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMDeviceCollection_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMDeviceCollection_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMDeviceCollection_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMDeviceCollection_GetCount(This,pcDevices)	\
+    ( (This)->lpVtbl -> GetCount(This,pcDevices) ) 
+
+#define IMMDeviceCollection_Item(This,nDevice,ppDevice)	\
+    ( (This)->lpVtbl -> Item(This,nDevice,ppDevice) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMDeviceCollection_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMMEndpoint_INTERFACE_DEFINED__
+#define __IMMEndpoint_INTERFACE_DEFINED__
+
+/* interface IMMEndpoint */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMEndpoint;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("1BE09788-6894-4089-8586-9A2A6C265AC5")
+    IMMEndpoint : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDataFlow( 
+            /* [out] */ 
+            __out  EDataFlow *pDataFlow) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMEndpointVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMEndpoint * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMEndpoint * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMEndpoint * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDataFlow )( 
+            IMMEndpoint * This,
+            /* [out] */ 
+            __out  EDataFlow *pDataFlow);
+        
+        END_INTERFACE
+    } IMMEndpointVtbl;
+
+    interface IMMEndpoint
+    {
+        CONST_VTBL struct IMMEndpointVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMEndpoint_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMEndpoint_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMEndpoint_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMEndpoint_GetDataFlow(This,pDataFlow)	\
+    ( (This)->lpVtbl -> GetDataFlow(This,pDataFlow) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMEndpoint_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMMDeviceEnumerator_INTERFACE_DEFINED__
+#define __IMMDeviceEnumerator_INTERFACE_DEFINED__
+
+/* interface IMMDeviceEnumerator */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMDeviceEnumerator;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("A95664D2-9614-4F35-A746-DE8DB63617E6")
+    IMMDeviceEnumerator : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE EnumAudioEndpoints( 
+            /* [in] */ 
+            __in  EDataFlow dataFlow,
+            /* [in] */ 
+            __in  DWORD dwStateMask,
+            /* [out] */ 
+            __out  IMMDeviceCollection **ppDevices) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDefaultAudioEndpoint( 
+            /* [in] */ 
+            __in  EDataFlow dataFlow,
+            /* [in] */ 
+            __in  ERole role,
+            /* [out] */ 
+            __out  IMMDevice **ppEndpoint) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetDevice( 
+            /*  */ 
+            __in  LPCWSTR pwstrId,
+            /* [out] */ 
+            __out  IMMDevice **ppDevice) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RegisterEndpointNotificationCallback( 
+            /* [in] */ 
+            __in  IMMNotificationClient *pClient) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE UnregisterEndpointNotificationCallback( 
+            /* [in] */ 
+            __in  IMMNotificationClient *pClient) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMDeviceEnumeratorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMDeviceEnumerator * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMDeviceEnumerator * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMDeviceEnumerator * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *EnumAudioEndpoints )( 
+            IMMDeviceEnumerator * This,
+            /* [in] */ 
+            __in  EDataFlow dataFlow,
+            /* [in] */ 
+            __in  DWORD dwStateMask,
+            /* [out] */ 
+            __out  IMMDeviceCollection **ppDevices);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDefaultAudioEndpoint )( 
+            IMMDeviceEnumerator * This,
+            /* [in] */ 
+            __in  EDataFlow dataFlow,
+            /* [in] */ 
+            __in  ERole role,
+            /* [out] */ 
+            __out  IMMDevice **ppEndpoint);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetDevice )( 
+            IMMDeviceEnumerator * This,
+            /*  */ 
+            __in  LPCWSTR pwstrId,
+            /* [out] */ 
+            __out  IMMDevice **ppDevice);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *RegisterEndpointNotificationCallback )( 
+            IMMDeviceEnumerator * This,
+            /* [in] */ 
+            __in  IMMNotificationClient *pClient);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *UnregisterEndpointNotificationCallback )( 
+            IMMDeviceEnumerator * This,
+            /* [in] */ 
+            __in  IMMNotificationClient *pClient);
+        
+        END_INTERFACE
+    } IMMDeviceEnumeratorVtbl;
+
+    interface IMMDeviceEnumerator
+    {
+        CONST_VTBL struct IMMDeviceEnumeratorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMDeviceEnumerator_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMDeviceEnumerator_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMDeviceEnumerator_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)	\
+    ( (This)->lpVtbl -> EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) ) 
+
+#define IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)	\
+    ( (This)->lpVtbl -> GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) ) 
+
+#define IMMDeviceEnumerator_GetDevice(This,pwstrId,ppDevice)	\
+    ( (This)->lpVtbl -> GetDevice(This,pwstrId,ppDevice) ) 
+
+#define IMMDeviceEnumerator_RegisterEndpointNotificationCallback(This,pClient)	\
+    ( (This)->lpVtbl -> RegisterEndpointNotificationCallback(This,pClient) ) 
+
+#define IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(This,pClient)	\
+    ( (This)->lpVtbl -> UnregisterEndpointNotificationCallback(This,pClient) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMDeviceEnumerator_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMMDeviceActivator_INTERFACE_DEFINED__
+#define __IMMDeviceActivator_INTERFACE_DEFINED__
+
+/* interface IMMDeviceActivator */
+/* [unique][helpstring][nonextensible][uuid][local][object] */ 
+
+
+EXTERN_C const IID IID_IMMDeviceActivator;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("3B0D0EA4-D0A9-4B0E-935B-09516746FAC0")
+    IMMDeviceActivator : public IUnknown
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Activate( 
+            /* [in] */ 
+            __in  REFIID iid,
+            /* [in] */ 
+            __in  IMMDevice *pDevice,
+            /* [in] */ 
+            __in_opt  PROPVARIANT *pActivationParams,
+            /* [iid_is][out] */ 
+            __out  void **ppInterface) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMMDeviceActivatorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMMDeviceActivator * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMMDeviceActivator * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMMDeviceActivator * This);
+        
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Activate )( 
+            IMMDeviceActivator * This,
+            /* [in] */ 
+            __in  REFIID iid,
+            /* [in] */ 
+            __in  IMMDevice *pDevice,
+            /* [in] */ 
+            __in_opt  PROPVARIANT *pActivationParams,
+            /* [iid_is][out] */ 
+            __out  void **ppInterface);
+        
+        END_INTERFACE
+    } IMMDeviceActivatorVtbl;
+
+    interface IMMDeviceActivator
+    {
+        CONST_VTBL struct IMMDeviceActivatorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMMDeviceActivator_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMMDeviceActivator_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMMDeviceActivator_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMMDeviceActivator_Activate(This,iid,pDevice,pActivationParams,ppInterface)	\
+    ( (This)->lpVtbl -> Activate(This,iid,pDevice,pActivationParams,ppInterface) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMMDeviceActivator_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_mmdeviceapi_0000_0006 */
+/* [local] */ 
+
+typedef /* [public] */ struct __MIDL___MIDL_itf_mmdeviceapi_0000_0006_0001
+    {
+    LPARAM AddPageParam;
+    IMMDevice *pEndpoint;
+    IMMDevice *pPnpInterface;
+    IMMDevice *pPnpDevnode;
+    } 	AudioExtensionParams;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_mmdeviceapi_0000_0006_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_mmdeviceapi_0000_0006_v0_0_s_ifspec;
+
+
+#ifndef __MMDeviceAPILib_LIBRARY_DEFINED__
+#define __MMDeviceAPILib_LIBRARY_DEFINED__
+
+/* library MMDeviceAPILib */
+/* [helpstring][version][uuid] */ 
+
+
+EXTERN_C const IID LIBID_MMDeviceAPILib;
+
+EXTERN_C const CLSID CLSID_MMDeviceEnumerator;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("BCDE0395-E52F-467C-8E3D-C4579291692E")
+MMDeviceEnumerator;
+#endif
+#endif /* __MMDeviceAPILib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/propidl.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propidl.h
new file mode 100644
index 0000000000..96298650b1
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propidl.h
@@ -0,0 +1,1275 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for propidl.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __propidl_h__
+#define __propidl_h__
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#define interface struct
+#include "sal.h"
+#include "rpcsal.h"
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */
+
+#ifndef __IPropertyStorage_FWD_DEFINED__
+#define __IPropertyStorage_FWD_DEFINED__
+typedef interface IPropertyStorage IPropertyStorage;
+#endif 	/* __IPropertyStorage_FWD_DEFINED__ */
+
+
+#ifndef __IPropertySetStorage_FWD_DEFINED__
+#define __IPropertySetStorage_FWD_DEFINED__
+typedef interface IPropertySetStorage IPropertySetStorage;
+#endif 	/* __IPropertySetStorage_FWD_DEFINED__ */
+
+
+#ifndef __IEnumSTATPROPSTG_FWD_DEFINED__
+#define __IEnumSTATPROPSTG_FWD_DEFINED__
+typedef interface IEnumSTATPROPSTG IEnumSTATPROPSTG;
+#endif 	/* __IEnumSTATPROPSTG_FWD_DEFINED__ */
+
+
+#ifndef __IEnumSTATPROPSETSTG_FWD_DEFINED__
+#define __IEnumSTATPROPSETSTG_FWD_DEFINED__
+typedef interface IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG;
+#endif 	/* __IEnumSTATPROPSETSTG_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "objidl.h"
+#include "oaidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+/* interface __MIDL_itf_propidl_0000_0000 */
+/* [local] */
+
+//+-------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//--------------------------------------------------------------------------
+#if ( _MSC_VER >= 800 )
+#if _MSC_VER >= 1200
+#pragma warning(push)
+#endif
+#pragma warning(disable:4201)    /* Nameless struct/union */
+#pragma warning(disable:4237)    /* obsolete member named 'bool' */
+#endif
+#if ( _MSC_VER >= 1020 )
+#pragma once
+#endif
+
+
+
+typedef struct tagVersionedStream
+    {
+    GUID guidVersion;
+    IStream *pStream;
+    } 	VERSIONEDSTREAM;
+
+typedef struct tagVersionedStream *LPVERSIONEDSTREAM;
+
+
+// Flags for IPropertySetStorage::Create
+#define	PROPSETFLAG_DEFAULT	( 0 )
+
+#define	PROPSETFLAG_NONSIMPLE	( 1 )
+
+#define	PROPSETFLAG_ANSI	( 2 )
+
+//   (This flag is only supported on StgCreatePropStg & StgOpenPropStg
+#define	PROPSETFLAG_UNBUFFERED	( 4 )
+
+//   (This flag causes a version-1 property set to be created
+#define	PROPSETFLAG_CASE_SENSITIVE	( 8 )
+
+
+// Flags for the reservied PID_BEHAVIOR property
+#define	PROPSET_BEHAVIOR_CASE_SENSITIVE	( 1 )
+
+#ifdef MIDL_PASS
+// This is the PROPVARIANT definition for marshaling.
+typedef struct tag_inner_PROPVARIANT PROPVARIANT;
+
+#else
+// This is the standard C layout of the PROPVARIANT.
+typedef struct tagPROPVARIANT PROPVARIANT;
+#endif
+typedef struct tagCAC
+    {
+    ULONG cElems;
+    CHAR *pElems;
+    } 	CAC;
+#ifdef WIN64
+typedef struct tagCAUB
+    {
+    ULONG cElems;
+    UCHAR *pElems;
+    } 	CAUB;
+
+typedef struct tagCAI
+    {
+    ULONG cElems;
+    SHORT *pElems;
+    } 	CAI;
+
+typedef struct tagCAUI
+    {
+    ULONG cElems;
+    USHORT *pElems;
+    } 	CAUI;
+
+typedef struct tagCAL
+    {
+    ULONG cElems;
+    LONG *pElems;
+    } 	CAL;
+
+typedef struct tagCAUL
+    {
+    ULONG cElems;
+    ULONG *pElems;
+    } 	CAUL;
+
+typedef struct tagCAFLT
+    {
+    ULONG cElems;
+    FLOAT *pElems;
+    } 	CAFLT;
+
+typedef struct tagCADBL
+    {
+    ULONG cElems;
+    DOUBLE *pElems;
+    } 	CADBL;
+
+typedef struct tagCACY
+    {
+    ULONG cElems;
+    CY *pElems;
+    } 	CACY;
+
+typedef struct tagCADATE
+    {
+    ULONG cElems;
+    DATE *pElems;
+    } 	CADATE;
+
+typedef struct tagCABSTR
+    {
+    ULONG cElems;
+    BSTR *pElems;
+    } 	CABSTR;
+
+typedef struct tagCABSTRBLOB
+    {
+    ULONG cElems;
+    BSTRBLOB *pElems;
+    } 	CABSTRBLOB;
+
+typedef struct tagCABOOL
+    {
+    ULONG cElems;
+    VARIANT_BOOL *pElems;
+    } 	CABOOL;
+
+typedef struct tagCASCODE
+    {
+    ULONG cElems;
+    SCODE *pElems;
+    } 	CASCODE;
+
+typedef struct tagCAPROPVARIANT
+    {
+    ULONG cElems;
+    PROPVARIANT *pElems;
+    } 	CAPROPVARIANT;
+
+typedef struct tagCAH
+    {
+    ULONG cElems;
+    LARGE_INTEGER *pElems;
+    } 	CAH;
+
+typedef struct tagCAUH
+    {
+    ULONG cElems;
+    ULARGE_INTEGER *pElems;
+    } 	CAUH;
+
+typedef struct tagCALPSTR
+    {
+    ULONG cElems;
+    LPSTR *pElems;
+    } 	CALPSTR;
+
+typedef struct tagCALPWSTR
+    {
+    ULONG cElems;
+    LPWSTR *pElems;
+    } 	CALPWSTR;
+
+typedef struct tagCAFILETIME
+    {
+    ULONG cElems;
+    FILETIME *pElems;
+    } 	CAFILETIME;
+
+typedef struct tagCACLIPDATA
+    {
+    ULONG cElems;
+    CLIPDATA *pElems;
+    } 	CACLIPDATA;
+
+typedef struct tagCACLSID
+    {
+    ULONG cElems;
+    CLSID *pElems;
+    } 	CACLSID;
+#endif
+#ifdef MIDL_PASS
+// This is the PROPVARIANT padding layout for marshaling.
+typedef BYTE PROPVAR_PAD1;
+
+typedef BYTE PROPVAR_PAD2;
+
+typedef ULONG PROPVAR_PAD3;
+
+#else
+// This is the standard C layout of the structure.
+typedef WORD PROPVAR_PAD1;
+typedef WORD PROPVAR_PAD2;
+typedef WORD PROPVAR_PAD3;
+#define tag_inner_PROPVARIANT
+#endif
+#ifdef WIN64
+#ifndef MIDL_PASS
+struct tagPROPVARIANT {
+  union {
+#endif
+struct tag_inner_PROPVARIANT
+    {
+    VARTYPE vt;
+    PROPVAR_PAD1 wReserved1;
+    PROPVAR_PAD2 wReserved2;
+    PROPVAR_PAD3 wReserved3;
+    /* [switch_type] */ union
+        {
+         /* Empty union arm */
+        CHAR cVal;
+        UCHAR bVal;
+        SHORT iVal;
+        USHORT uiVal;
+        LONG lVal;
+        ULONG ulVal;
+        INT intVal;
+        UINT uintVal;
+        LARGE_INTEGER hVal;
+        ULARGE_INTEGER uhVal;
+        FLOAT fltVal;
+        DOUBLE dblVal;
+        VARIANT_BOOL boolVal;
+        //_VARIANT_BOOL bool;
+        SCODE scode;
+        CY cyVal;
+        DATE date;
+        FILETIME filetime;
+        CLSID *puuid;
+        CLIPDATA *pclipdata;
+        BSTR bstrVal;
+        BSTRBLOB bstrblobVal;
+        BLOB blob;
+        LPSTR pszVal;
+        LPWSTR pwszVal;
+        IUnknown *punkVal;
+        IDispatch *pdispVal;
+        IStream *pStream;
+        IStorage *pStorage;
+        LPVERSIONEDSTREAM pVersionedStream;
+        LPSAFEARRAY parray;
+        CAC cac;
+        CAUB caub;
+        CAI cai;
+        CAUI caui;
+        CAL cal;
+        CAUL caul;
+        CAH cah;
+        CAUH cauh;
+        CAFLT caflt;
+        CADBL cadbl;
+        CABOOL cabool;
+        CASCODE cascode;
+        CACY cacy;
+        CADATE cadate;
+        CAFILETIME cafiletime;
+        CACLSID cauuid;
+        CACLIPDATA caclipdata;
+        CABSTR cabstr;
+        CABSTRBLOB cabstrblob;
+        CALPSTR calpstr;
+        CALPWSTR calpwstr;
+        CAPROPVARIANT capropvar;
+        CHAR *pcVal;
+        UCHAR *pbVal;
+        SHORT *piVal;
+        USHORT *puiVal;
+        LONG *plVal;
+        ULONG *pulVal;
+        INT *pintVal;
+        UINT *puintVal;
+        FLOAT *pfltVal;
+        DOUBLE *pdblVal;
+        VARIANT_BOOL *pboolVal;
+        DECIMAL *pdecVal;
+        SCODE *pscode;
+        CY *pcyVal;
+        DATE *pdate;
+        BSTR *pbstrVal;
+        IUnknown **ppunkVal;
+        IDispatch **ppdispVal;
+        LPSAFEARRAY *pparray;
+        PROPVARIANT *pvarVal;
+        } 	;
+    } ;
+#ifndef MIDL_PASS
+    DECIMAL decVal;
+  };
+};
+#endif
+#endif
+#ifdef MIDL_PASS
+// This is the LPPROPVARIANT definition for marshaling.
+typedef struct tag_inner_PROPVARIANT *LPPROPVARIANT;
+
+typedef const PROPVARIANT *REFPROPVARIANT;
+
+#else
+
+// This is the standard C layout of the PROPVARIANT.
+#ifdef WIN64
+typedef struct tagPROPVARIANT * LPPROPVARIANT;
+#endif
+
+#ifndef _REFPROPVARIANT_DEFINED
+#define _REFPROPVARIANT_DEFINED
+#ifdef __cplusplus
+#define REFPROPVARIANT const PROPVARIANT &
+#else
+#define REFPROPVARIANT const PROPVARIANT * __MIDL_CONST
+#endif
+#endif
+
+#endif // MIDL_PASS
+
+// Reserved global Property IDs
+#define	PID_DICTIONARY	( 0 )
+
+#define	PID_CODEPAGE	( 0x1 )
+
+#define	PID_FIRST_USABLE	( 0x2 )
+
+#define	PID_FIRST_NAME_DEFAULT	( 0xfff )
+
+#define	PID_LOCALE	( 0x80000000 )
+
+#define	PID_MODIFY_TIME	( 0x80000001 )
+
+#define	PID_SECURITY	( 0x80000002 )
+
+#define	PID_BEHAVIOR	( 0x80000003 )
+
+#define	PID_ILLEGAL	( 0xffffffff )
+
+// Range which is read-only to downlevel implementations
+#define	PID_MIN_READONLY	( 0x80000000 )
+
+#define	PID_MAX_READONLY	( 0xbfffffff )
+
+// Property IDs for the DiscardableInformation Property Set
+
+#define PIDDI_THUMBNAIL          0x00000002L // VT_BLOB
+
+// Property IDs for the SummaryInformation Property Set
+
+#define PIDSI_TITLE               0x00000002L  // VT_LPSTR
+#define PIDSI_SUBJECT             0x00000003L  // VT_LPSTR
+#define PIDSI_AUTHOR              0x00000004L  // VT_LPSTR
+#define PIDSI_KEYWORDS            0x00000005L  // VT_LPSTR
+#define PIDSI_COMMENTS            0x00000006L  // VT_LPSTR
+#define PIDSI_TEMPLATE            0x00000007L  // VT_LPSTR
+#define PIDSI_LASTAUTHOR          0x00000008L  // VT_LPSTR
+#define PIDSI_REVNUMBER           0x00000009L  // VT_LPSTR
+#define PIDSI_EDITTIME            0x0000000aL  // VT_FILETIME (UTC)
+#define PIDSI_LASTPRINTED         0x0000000bL  // VT_FILETIME (UTC)
+#define PIDSI_CREATE_DTM          0x0000000cL  // VT_FILETIME (UTC)
+#define PIDSI_LASTSAVE_DTM        0x0000000dL  // VT_FILETIME (UTC)
+#define PIDSI_PAGECOUNT           0x0000000eL  // VT_I4
+#define PIDSI_WORDCOUNT           0x0000000fL  // VT_I4
+#define PIDSI_CHARCOUNT           0x00000010L  // VT_I4
+#define PIDSI_THUMBNAIL           0x00000011L  // VT_CF
+#define PIDSI_APPNAME             0x00000012L  // VT_LPSTR
+#define PIDSI_DOC_SECURITY        0x00000013L  // VT_I4
+
+// Property IDs for the DocSummaryInformation Property Set
+
+#define PIDDSI_CATEGORY          0x00000002 // VT_LPSTR
+#define PIDDSI_PRESFORMAT        0x00000003 // VT_LPSTR
+#define PIDDSI_BYTECOUNT         0x00000004 // VT_I4
+#define PIDDSI_LINECOUNT         0x00000005 // VT_I4
+#define PIDDSI_PARCOUNT          0x00000006 // VT_I4
+#define PIDDSI_SLIDECOUNT        0x00000007 // VT_I4
+#define PIDDSI_NOTECOUNT         0x00000008 // VT_I4
+#define PIDDSI_HIDDENCOUNT       0x00000009 // VT_I4
+#define PIDDSI_MMCLIPCOUNT       0x0000000A // VT_I4
+#define PIDDSI_SCALE             0x0000000B // VT_BOOL
+#define PIDDSI_HEADINGPAIR       0x0000000C // VT_VARIANT | VT_VECTOR
+#define PIDDSI_DOCPARTS          0x0000000D // VT_LPSTR | VT_VECTOR
+#define PIDDSI_MANAGER           0x0000000E // VT_LPSTR
+#define PIDDSI_COMPANY           0x0000000F // VT_LPSTR
+#define PIDDSI_LINKSDIRTY        0x00000010 // VT_BOOL
+
+
+//  FMTID_MediaFileSummaryInfo - Property IDs
+
+#define PIDMSI_EDITOR                   0x00000002L  // VT_LPWSTR
+#define PIDMSI_SUPPLIER                 0x00000003L  // VT_LPWSTR
+#define PIDMSI_SOURCE                   0x00000004L  // VT_LPWSTR
+#define PIDMSI_SEQUENCE_NO              0x00000005L  // VT_LPWSTR
+#define PIDMSI_PROJECT                  0x00000006L  // VT_LPWSTR
+#define PIDMSI_STATUS                   0x00000007L  // VT_UI4
+#define PIDMSI_OWNER                    0x00000008L  // VT_LPWSTR
+#define PIDMSI_RATING                   0x00000009L  // VT_LPWSTR
+#define PIDMSI_PRODUCTION               0x0000000AL  // VT_FILETIME (UTC)
+#define PIDMSI_COPYRIGHT                0x0000000BL  // VT_LPWSTR
+
+//  PIDMSI_STATUS value definitions
+
+enum PIDMSI_STATUS_VALUE
+    {	PIDMSI_STATUS_NORMAL	= 0,
+	PIDMSI_STATUS_NEW	= ( PIDMSI_STATUS_NORMAL + 1 ) ,
+	PIDMSI_STATUS_PRELIM	= ( PIDMSI_STATUS_NEW + 1 ) ,
+	PIDMSI_STATUS_DRAFT	= ( PIDMSI_STATUS_PRELIM + 1 ) ,
+	PIDMSI_STATUS_INPROGRESS	= ( PIDMSI_STATUS_DRAFT + 1 ) ,
+	PIDMSI_STATUS_EDIT	= ( PIDMSI_STATUS_INPROGRESS + 1 ) ,
+	PIDMSI_STATUS_REVIEW	= ( PIDMSI_STATUS_EDIT + 1 ) ,
+	PIDMSI_STATUS_PROOF	= ( PIDMSI_STATUS_REVIEW + 1 ) ,
+	PIDMSI_STATUS_FINAL	= ( PIDMSI_STATUS_PROOF + 1 ) ,
+	PIDMSI_STATUS_OTHER	= 0x7fff
+    } ;
+#define	PRSPEC_INVALID	( 0xffffffff )
+
+#define	PRSPEC_LPWSTR	( 0 )
+
+#define	PRSPEC_PROPID	( 1 )
+
+#ifdef WIN64
+typedef struct tagPROPSPEC
+    {
+    ULONG ulKind;
+    /* [switch_type] */ union
+        {
+        PROPID propid;
+        LPOLESTR lpwstr;
+         /* Empty union arm */
+        } 	;
+    } 	PROPSPEC;
+
+typedef struct tagSTATPROPSTG
+    {
+    LPOLESTR lpwstrName;
+    PROPID propid;
+    VARTYPE vt;
+    } 	STATPROPSTG;
+#endif
+
+// Macros for parsing the OS Version of the Property Set Header
+#define PROPSETHDR_OSVER_KIND(dwOSVer)      HIWORD( (dwOSVer) )
+#define PROPSETHDR_OSVER_MAJOR(dwOSVer)     LOBYTE(LOWORD( (dwOSVer) ))
+#define PROPSETHDR_OSVER_MINOR(dwOSVer)     HIBYTE(LOWORD( (dwOSVer) ))
+#define PROPSETHDR_OSVERSION_UNKNOWN        0xFFFFFFFF
+#ifdef WIN64
+typedef struct tagSTATPROPSETSTG
+    {
+    FMTID fmtid;
+    CLSID clsid;
+    DWORD grfFlags;
+    FILETIME mtime;
+    FILETIME ctime;
+    FILETIME atime;
+    DWORD dwOSVersion;
+    } 	STATPROPSETSTG;
+#endif
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IPropertyStorage_INTERFACE_DEFINED__
+#define __IPropertyStorage_INTERFACE_DEFINED__
+
+/* interface IPropertyStorage */
+/* [unique][uuid][object] */
+
+
+EXTERN_C const IID IID_IPropertyStorage;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("00000138-0000-0000-C000-000000000046")
+    IPropertyStorage : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE ReadMultiple(
+            /* [in] */ ULONG cpspec,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ],
+            /* [size_is][out] */ __RPC__out_ecount_full(cpspec) PROPVARIANT rgpropvar[  ]) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE WriteMultiple(
+            /* [in] */ ULONG cpspec,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ],
+            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPVARIANT rgpropvar[  ],
+            /* [in] */ PROPID propidNameFirst) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE DeleteMultiple(
+            /* [in] */ ULONG cpspec,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ]) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE ReadPropertyNames(
+            /* [in] */ ULONG cpropid,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ],
+            /* [size_is][out] */ __RPC__out_ecount_full(cpropid) LPOLESTR rglpwstrName[  ]) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE WritePropertyNames(
+            /* [in] */ ULONG cpropid,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ],
+            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const LPOLESTR rglpwstrName[  ]) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE DeletePropertyNames(
+            /* [in] */ ULONG cpropid,
+            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ]) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Commit(
+            /* [in] */ DWORD grfCommitFlags) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Revert( void) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Enum(
+            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSTG **ppenum) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE SetTimes(
+            /* [in] */ __RPC__in const FILETIME *pctime,
+            /* [in] */ __RPC__in const FILETIME *patime,
+            /* [in] */ __RPC__in const FILETIME *pmtime) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE SetClass(
+            /* [in] */ __RPC__in REFCLSID clsid) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Stat(
+            /* [out] */ __RPC__out STATPROPSETSTG *pstatpsstg) = 0;
+
+    };
+
+#else 	/* C style interface */
+
+//    typedef struct IPropertyStorageVtbl
+//    {
+//        BEGIN_INTERFACE
+//
+//        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+//            IPropertyStorage * This,
+//            /* [in] */ __RPC__in REFIID riid,
+//            /* [iid_is][out] */
+//            __RPC__deref_out  void **ppvObject);
+//
+//        ULONG ( STDMETHODCALLTYPE *AddRef )(
+//            IPropertyStorage * This);
+//
+//        ULONG ( STDMETHODCALLTYPE *Release )(
+//            IPropertyStorage * This);
+//
+//        HRESULT ( STDMETHODCALLTYPE *ReadMultiple )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpspec,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ],
+//            /* [size_is][out] */ __RPC__out_ecount_full(cpspec) PROPVARIANT rgpropvar[  ]);
+//
+//        HRESULT ( STDMETHODCALLTYPE *WriteMultiple )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpspec,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ],
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPVARIANT rgpropvar[  ],
+//            /* [in] */ PROPID propidNameFirst);
+//
+//        HRESULT ( STDMETHODCALLTYPE *DeleteMultiple )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpspec,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpspec) const PROPSPEC rgpspec[  ]);
+//
+//        HRESULT ( STDMETHODCALLTYPE *ReadPropertyNames )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpropid,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ],
+//            /* [size_is][out] */ __RPC__out_ecount_full(cpropid) LPOLESTR rglpwstrName[  ]);
+//
+//        HRESULT ( STDMETHODCALLTYPE *WritePropertyNames )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpropid,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ],
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const LPOLESTR rglpwstrName[  ]);
+//
+//        HRESULT ( STDMETHODCALLTYPE *DeletePropertyNames )(
+//            IPropertyStorage * This,
+//            /* [in] */ ULONG cpropid,
+//            /* [size_is][in] */ __RPC__in_ecount_full(cpropid) const PROPID rgpropid[  ]);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Commit )(
+//            IPropertyStorage * This,
+//            /* [in] */ DWORD grfCommitFlags);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Revert )(
+//            IPropertyStorage * This);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Enum )(
+//            IPropertyStorage * This,
+//            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSTG **ppenum);
+//
+//        HRESULT ( STDMETHODCALLTYPE *SetTimes )(
+//            IPropertyStorage * This,
+//            /* [in] */ __RPC__in const FILETIME *pctime,
+//            /* [in] */ __RPC__in const FILETIME *patime,
+//            /* [in] */ __RPC__in const FILETIME *pmtime);
+//
+//        HRESULT ( STDMETHODCALLTYPE *SetClass )(
+//            IPropertyStorage * This,
+//            /* [in] */ __RPC__in REFCLSID clsid);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Stat )(
+//            IPropertyStorage * This,
+//            /* [out] */ __RPC__out STATPROPSETSTG *pstatpsstg);
+//
+//        END_INTERFACE
+//    } IPropertyStorageVtbl;
+//
+//    interface IPropertyStorage
+//    {
+//        CONST_VTBL struct IPropertyStorageVtbl *lpVtbl;
+//    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IPropertyStorage_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
+
+#define IPropertyStorage_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) )
+
+#define IPropertyStorage_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) )
+
+
+#define IPropertyStorage_ReadMultiple(This,cpspec,rgpspec,rgpropvar)	\
+    ( (This)->lpVtbl -> ReadMultiple(This,cpspec,rgpspec,rgpropvar) )
+
+#define IPropertyStorage_WriteMultiple(This,cpspec,rgpspec,rgpropvar,propidNameFirst)	\
+    ( (This)->lpVtbl -> WriteMultiple(This,cpspec,rgpspec,rgpropvar,propidNameFirst) )
+
+#define IPropertyStorage_DeleteMultiple(This,cpspec,rgpspec)	\
+    ( (This)->lpVtbl -> DeleteMultiple(This,cpspec,rgpspec) )
+
+#define IPropertyStorage_ReadPropertyNames(This,cpropid,rgpropid,rglpwstrName)	\
+    ( (This)->lpVtbl -> ReadPropertyNames(This,cpropid,rgpropid,rglpwstrName) )
+
+#define IPropertyStorage_WritePropertyNames(This,cpropid,rgpropid,rglpwstrName)	\
+    ( (This)->lpVtbl -> WritePropertyNames(This,cpropid,rgpropid,rglpwstrName) )
+
+#define IPropertyStorage_DeletePropertyNames(This,cpropid,rgpropid)	\
+    ( (This)->lpVtbl -> DeletePropertyNames(This,cpropid,rgpropid) )
+
+#define IPropertyStorage_Commit(This,grfCommitFlags)	\
+    ( (This)->lpVtbl -> Commit(This,grfCommitFlags) )
+
+#define IPropertyStorage_Revert(This)	\
+    ( (This)->lpVtbl -> Revert(This) )
+
+#define IPropertyStorage_Enum(This,ppenum)	\
+    ( (This)->lpVtbl -> Enum(This,ppenum) )
+
+#define IPropertyStorage_SetTimes(This,pctime,patime,pmtime)	\
+    ( (This)->lpVtbl -> SetTimes(This,pctime,patime,pmtime) )
+
+#define IPropertyStorage_SetClass(This,clsid)	\
+    ( (This)->lpVtbl -> SetClass(This,clsid) )
+
+#define IPropertyStorage_Stat(This,pstatpsstg)	\
+    ( (This)->lpVtbl -> Stat(This,pstatpsstg) )
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyStorage_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertySetStorage_INTERFACE_DEFINED__
+#define __IPropertySetStorage_INTERFACE_DEFINED__
+
+/* interface IPropertySetStorage */
+/* [unique][uuid][object] */
+
+typedef /* [unique] */  __RPC_unique_pointer IPropertySetStorage *LPPROPERTYSETSTORAGE;
+
+
+EXTERN_C const IID IID_IPropertySetStorage;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("0000013A-0000-0000-C000-000000000046")
+    IPropertySetStorage : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Create(
+            /* [in] */ __RPC__in REFFMTID rfmtid,
+            /* [unique][in] */ __RPC__in_opt const CLSID *pclsid,
+            /* [in] */ DWORD grfFlags,
+            /* [in] */ DWORD grfMode,
+            /* [out] */ __RPC__deref_out_opt IPropertyStorage **ppprstg) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Open(
+            /* [in] */ __RPC__in REFFMTID rfmtid,
+            /* [in] */ DWORD grfMode,
+            /* [out] */ __RPC__deref_out_opt IPropertyStorage **ppprstg) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Delete(
+            /* [in] */ __RPC__in REFFMTID rfmtid) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Enum(
+            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSETSTG **ppenum) = 0;
+
+    };
+
+#else 	/* C style interface */
+
+//    typedef struct IPropertySetStorageVtbl
+//    {
+//        BEGIN_INTERFACE
+//
+//        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+//            IPropertySetStorage * This,
+//            /* [in] */ __RPC__in REFIID riid,
+//            /* [iid_is][out] */
+//            __RPC__deref_out  void **ppvObject);
+//
+//        ULONG ( STDMETHODCALLTYPE *AddRef )(
+//            IPropertySetStorage * This);
+//
+//        ULONG ( STDMETHODCALLTYPE *Release )(
+//            IPropertySetStorage * This);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Create )(
+//            IPropertySetStorage * This,
+//            /* [in] */ __RPC__in REFFMTID rfmtid,
+//            /* [unique][in] */ __RPC__in_opt const CLSID *pclsid,
+//            /* [in] */ DWORD grfFlags,
+//            /* [in] */ DWORD grfMode,
+//            /* [out] */ __RPC__deref_out_opt IPropertyStorage **ppprstg);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Open )(
+//            IPropertySetStorage * This,
+//            /* [in] */ __RPC__in REFFMTID rfmtid,
+//            /* [in] */ DWORD grfMode,
+//            /* [out] */ __RPC__deref_out_opt IPropertyStorage **ppprstg);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Delete )(
+//            IPropertySetStorage * This,
+//            /* [in] */ __RPC__in REFFMTID rfmtid);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Enum )(
+//            IPropertySetStorage * This,
+//            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSETSTG **ppenum);
+//
+//        END_INTERFACE
+//    } IPropertySetStorageVtbl;
+//
+//    interface IPropertySetStorage
+//    {
+//        CONST_VTBL struct IPropertySetStorageVtbl *lpVtbl;
+//    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IPropertySetStorage_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
+
+#define IPropertySetStorage_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) )
+
+#define IPropertySetStorage_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) )
+
+
+#define IPropertySetStorage_Create(This,rfmtid,pclsid,grfFlags,grfMode,ppprstg)	\
+    ( (This)->lpVtbl -> Create(This,rfmtid,pclsid,grfFlags,grfMode,ppprstg) )
+
+#define IPropertySetStorage_Open(This,rfmtid,grfMode,ppprstg)	\
+    ( (This)->lpVtbl -> Open(This,rfmtid,grfMode,ppprstg) )
+
+#define IPropertySetStorage_Delete(This,rfmtid)	\
+    ( (This)->lpVtbl -> Delete(This,rfmtid) )
+
+#define IPropertySetStorage_Enum(This,ppenum)	\
+    ( (This)->lpVtbl -> Enum(This,ppenum) )
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertySetStorage_INTERFACE_DEFINED__ */
+
+
+#ifndef __IEnumSTATPROPSTG_INTERFACE_DEFINED__
+#define __IEnumSTATPROPSTG_INTERFACE_DEFINED__
+
+/* interface IEnumSTATPROPSTG */
+/* [unique][uuid][object] */
+
+//typedef /* [unique] */  __RPC_unique_pointer IEnumSTATPROPSTG *LPENUMSTATPROPSTG;
+
+
+EXTERN_C const IID IID_IEnumSTATPROPSTG;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("00000139-0000-0000-C000-000000000046")
+    IEnumSTATPROPSTG : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Next(
+            /* [in] */ ULONG celt,
+            /* [length_is][size_is][out] */ STATPROPSTG *rgelt,
+            /* [out] */ ULONG *pceltFetched) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Skip(
+            /* [in] */ ULONG celt) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Clone(
+            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSTG **ppenum) = 0;
+
+    };
+
+#else 	/* C style interface */
+
+//    typedef struct IEnumSTATPROPSTGVtbl
+//    {
+//        BEGIN_INTERFACE
+//
+//        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+//            IEnumSTATPROPSTG * This,
+//            /* [in] */ __RPC__in REFIID riid,
+//            /* [iid_is][out] */
+//            __RPC__deref_out  void **ppvObject);
+//
+//        ULONG ( STDMETHODCALLTYPE *AddRef )(
+//            IEnumSTATPROPSTG * This);
+//
+//        ULONG ( STDMETHODCALLTYPE *Release )(
+//            IEnumSTATPROPSTG * This);
+//
+//        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Next )(
+//            IEnumSTATPROPSTG * This,
+//            /* [in] */ ULONG celt,
+//            /* [length_is][size_is][out] */ STATPROPSTG *rgelt,
+//            /* [out] */ ULONG *pceltFetched);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Skip )(
+//            IEnumSTATPROPSTG * This,
+//            /* [in] */ ULONG celt);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Reset )(
+//            IEnumSTATPROPSTG * This);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Clone )(
+//            IEnumSTATPROPSTG * This,
+//            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSTG **ppenum);
+//
+//        END_INTERFACE
+//    } IEnumSTATPROPSTGVtbl;
+//
+//    interface IEnumSTATPROPSTG
+//    {
+//        CONST_VTBL struct IEnumSTATPROPSTGVtbl *lpVtbl;
+//    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IEnumSTATPROPSTG_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
+
+#define IEnumSTATPROPSTG_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) )
+
+#define IEnumSTATPROPSTG_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) )
+
+
+#define IEnumSTATPROPSTG_Next(This,celt,rgelt,pceltFetched)	\
+    ( (This)->lpVtbl -> Next(This,celt,rgelt,pceltFetched) )
+
+#define IEnumSTATPROPSTG_Skip(This,celt)	\
+    ( (This)->lpVtbl -> Skip(This,celt) )
+
+#define IEnumSTATPROPSTG_Reset(This)	\
+    ( (This)->lpVtbl -> Reset(This) )
+
+#define IEnumSTATPROPSTG_Clone(This,ppenum)	\
+    ( (This)->lpVtbl -> Clone(This,ppenum) )
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_RemoteNext_Proxy(
+    IEnumSTATPROPSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ __RPC__out_ecount_part(celt, *pceltFetched) STATPROPSTG *rgelt,
+    /* [out] */ __RPC__out ULONG *pceltFetched);
+
+
+void __RPC_STUB IEnumSTATPROPSTG_RemoteNext_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __IEnumSTATPROPSTG_INTERFACE_DEFINED__ */
+
+
+#ifndef __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__
+#define __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__
+
+/* interface IEnumSTATPROPSETSTG */
+/* [unique][uuid][object] */
+
+typedef /* [unique] */  __RPC_unique_pointer IEnumSTATPROPSETSTG *LPENUMSTATPROPSETSTG;
+
+
+EXTERN_C const IID IID_IEnumSTATPROPSETSTG;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("0000013B-0000-0000-C000-000000000046")
+    IEnumSTATPROPSETSTG : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Next(
+            /* [in] */ ULONG celt,
+            /* [length_is][size_is][out] */ STATPROPSETSTG *rgelt,
+            /* [out] */ ULONG *pceltFetched) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Skip(
+            /* [in] */ ULONG celt) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0;
+
+        virtual HRESULT STDMETHODCALLTYPE Clone(
+            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSETSTG **ppenum) = 0;
+
+    };
+
+#else 	/* C style interface */
+
+//    typedef struct IEnumSTATPROPSETSTGVtbl
+//    {
+//        BEGIN_INTERFACE
+//
+//        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+//            IEnumSTATPROPSETSTG * This,
+//            /* [in] */ __RPC__in REFIID riid,
+//            /* [iid_is][out] */
+//            __RPC__deref_out  void **ppvObject);
+//
+//        ULONG ( STDMETHODCALLTYPE *AddRef )(
+//            IEnumSTATPROPSETSTG * This);
+//
+//        ULONG ( STDMETHODCALLTYPE *Release )(
+//            IEnumSTATPROPSETSTG * This);
+//
+//        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Next )(
+//            IEnumSTATPROPSETSTG * This,
+//            /* [in] */ ULONG celt,
+//            /* [length_is][size_is][out] */ STATPROPSETSTG *rgelt,
+//            /* [out] */ ULONG *pceltFetched);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Skip )(
+//            IEnumSTATPROPSETSTG * This,
+//            /* [in] */ ULONG celt);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Reset )(
+//            IEnumSTATPROPSETSTG * This);
+//
+//        HRESULT ( STDMETHODCALLTYPE *Clone )(
+//            IEnumSTATPROPSETSTG * This,
+//            /* [out] */ __RPC__deref_out_opt IEnumSTATPROPSETSTG **ppenum);
+//
+//        END_INTERFACE
+//    } IEnumSTATPROPSETSTGVtbl;
+//
+//    interface IEnumSTATPROPSETSTG
+//    {
+//        CONST_VTBL struct IEnumSTATPROPSETSTGVtbl *lpVtbl;
+//    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IEnumSTATPROPSETSTG_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
+
+#define IEnumSTATPROPSETSTG_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) )
+
+#define IEnumSTATPROPSETSTG_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) )
+
+
+#define IEnumSTATPROPSETSTG_Next(This,celt,rgelt,pceltFetched)	\
+    ( (This)->lpVtbl -> Next(This,celt,rgelt,pceltFetched) )
+
+#define IEnumSTATPROPSETSTG_Skip(This,celt)	\
+    ( (This)->lpVtbl -> Skip(This,celt) )
+
+#define IEnumSTATPROPSETSTG_Reset(This)	\
+    ( (This)->lpVtbl -> Reset(This) )
+
+#define IEnumSTATPROPSETSTG_Clone(This,ppenum)	\
+    ( (This)->lpVtbl -> Clone(This,ppenum) )
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_RemoteNext_Proxy(
+    IEnumSTATPROPSETSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ __RPC__out_ecount_part(celt, *pceltFetched) STATPROPSETSTG *rgelt,
+    /* [out] */ __RPC__out ULONG *pceltFetched);
+
+
+void __RPC_STUB IEnumSTATPROPSETSTG_RemoteNext_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propidl_0000_0004 */
+/* [local] */
+
+typedef /* [unique] */  __RPC_unique_pointer IPropertyStorage *LPPROPERTYSTORAGE;
+
+WINOLEAPI PropVariantCopy ( PROPVARIANT * pvarDest, const PROPVARIANT * pvarSrc );
+WINOLEAPI PropVariantClear ( PROPVARIANT * pvar );
+WINOLEAPI FreePropVariantArray ( ULONG cVariants, PROPVARIANT * rgvars );
+
+#define _PROPVARIANTINIT_DEFINED_
+#   ifdef __cplusplus
+inline void PropVariantInit ( PROPVARIANT * pvar )
+{
+    memset ( pvar, 0, sizeof(PROPVARIANT) );
+}
+#   else
+#   define PropVariantInit(pvar) memset ( (pvar), 0, sizeof(PROPVARIANT) )
+#   endif
+
+
+#ifndef _STGCREATEPROPSTG_DEFINED_
+WINOLEAPI StgCreatePropStg( IUnknown* pUnk, REFFMTID fmtid, const CLSID *pclsid, DWORD grfFlags, DWORD dwReserved, IPropertyStorage **ppPropStg );
+WINOLEAPI StgOpenPropStg( IUnknown* pUnk, REFFMTID fmtid, DWORD grfFlags, DWORD dwReserved, IPropertyStorage **ppPropStg );
+WINOLEAPI StgCreatePropSetStg( IStorage *pStorage, DWORD dwReserved, IPropertySetStorage **ppPropSetStg);
+
+#define CCH_MAX_PROPSTG_NAME    31
+__checkReturn WINOLEAPI FmtIdToPropStgName( const FMTID *pfmtid, __out_ecount(CCH_MAX_PROPSTG_NAME+1) LPOLESTR oszName );
+WINOLEAPI PropStgNameToFmtId( __in __nullterminated const LPOLESTR oszName, FMTID *pfmtid );
+#endif
+#ifndef _SERIALIZEDPROPERTYVALUE_DEFINED_
+#define _SERIALIZEDPROPERTYVALUE_DEFINED_
+typedef struct tagSERIALIZEDPROPERTYVALUE		// prop
+{
+    DWORD	dwType;
+    BYTE	rgb[1];
+} SERIALIZEDPROPERTYVALUE;
+#endif
+
+EXTERN_C SERIALIZEDPROPERTYVALUE* __stdcall
+StgConvertVariantToProperty(
+            __in const PROPVARIANT* pvar,
+            USHORT CodePage,
+            __out_bcount_opt(*pcb) SERIALIZEDPROPERTYVALUE* pprop,
+            __inout ULONG* pcb,
+            PROPID pid,
+            __reserved BOOLEAN fReserved,
+            __out_opt ULONG* pcIndirect);
+
+#ifdef __cplusplus
+class PMemoryAllocator;
+
+EXTERN_C BOOLEAN __stdcall
+StgConvertPropertyToVariant(
+            __in const SERIALIZEDPROPERTYVALUE* pprop,
+            USHORT CodePage,
+            __out PROPVARIANT* pvar,
+            __in PMemoryAllocator* pma);
+#endif
+#if _MSC_VER >= 1200
+#pragma warning(pop)
+#else
+#pragma warning(default:4201)    /* Nameless struct/union */
+#pragma warning(default:4237)    /* keywords bool, true, false, etc.. */
+#endif
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0004_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0004_v0_0_s_ifspec;
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * );
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * );
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * );
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * );
+
+unsigned long             __RPC_USER  LPSAFEARRAY_UserSize(     unsigned long *, unsigned long            , LPSAFEARRAY * );
+unsigned char * __RPC_USER  LPSAFEARRAY_UserMarshal(  unsigned long *, unsigned char *, LPSAFEARRAY * );
+unsigned char * __RPC_USER  LPSAFEARRAY_UserUnmarshal(unsigned long *, unsigned char *, LPSAFEARRAY * );
+void                      __RPC_USER  LPSAFEARRAY_UserFree(     unsigned long *, LPSAFEARRAY * );
+
+unsigned long             __RPC_USER  BSTR_UserSize64(     unsigned long *, unsigned long            , BSTR * );
+unsigned char * __RPC_USER  BSTR_UserMarshal64(  unsigned long *, unsigned char *, BSTR * );
+unsigned char * __RPC_USER  BSTR_UserUnmarshal64(unsigned long *, unsigned char *, BSTR * );
+void                      __RPC_USER  BSTR_UserFree64(     unsigned long *, BSTR * );
+
+unsigned long             __RPC_USER  LPSAFEARRAY_UserSize64(     unsigned long *, unsigned long            , LPSAFEARRAY * );
+unsigned char * __RPC_USER  LPSAFEARRAY_UserMarshal64(  unsigned long *, unsigned char *, LPSAFEARRAY * );
+unsigned char * __RPC_USER  LPSAFEARRAY_UserUnmarshal64(unsigned long *, unsigned char *, LPSAFEARRAY * );
+void                      __RPC_USER  LPSAFEARRAY_UserFree64(     unsigned long *, LPSAFEARRAY * );
+
+/* [local] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Next_Proxy(
+    IEnumSTATPROPSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ STATPROPSTG *rgelt,
+    /* [out] */ ULONG *pceltFetched);
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Next_Stub(
+    IEnumSTATPROPSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ __RPC__out_ecount_part(celt, *pceltFetched) STATPROPSTG *rgelt,
+    /* [out] */ __RPC__out ULONG *pceltFetched);
+
+/* [local] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Next_Proxy(
+    IEnumSTATPROPSETSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ STATPROPSETSTG *rgelt,
+    /* [out] */ ULONG *pceltFetched);
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Next_Stub(
+    IEnumSTATPROPSETSTG * This,
+    /* [in] */ ULONG celt,
+    /* [length_is][size_is][out] */ __RPC__out_ecount_part(celt, *pceltFetched) STATPROPSETSTG *rgelt,
+    /* [out] */ __RPC__out ULONG *pceltFetched);
+
+
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkey.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkey.h
new file mode 100644
index 0000000000..69e71a5191
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkey.h
@@ -0,0 +1,4274 @@
+//===========================================================================
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//===========================================================================
+
+
+#ifndef _INC_PROPKEY
+#define _INC_PROPKEY
+
+#ifndef DEFINE_API_PKEY
+#define DEFINE_API_PKEY(name, managed_name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
+        DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid)
+#endif
+
+#include <propkeydef.h>
+
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0501
+#else
+#if (_WIN32_IE < 0x0400) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0500)
+#error _WIN32_IE setting conflicts with _WIN32_WINNT setting
+#endif
+#endif
+
+ 
+//-----------------------------------------------------------------------------
+// Audio properties
+
+//  Name:     System.Audio.ChannelCount -- PKEY_Audio_ChannelCount
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 7 (PIDASI_CHANNEL_COUNT)
+//
+//  Indicates the channel count for the audio file.  Values: 1 (mono), 2 (stereo).
+DEFINE_PROPERTYKEY(PKEY_Audio_ChannelCount, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 7);
+
+// Possible discrete values for PKEY_Audio_ChannelCount are:
+#define AUDIO_CHANNELCOUNT_MONO             1ul
+#define AUDIO_CHANNELCOUNT_STEREO           2ul
+
+//  Name:     System.Audio.Compression -- PKEY_Audio_Compression
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 10 (PIDASI_COMPRESSION)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Audio_Compression, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 10);
+
+//  Name:     System.Audio.EncodingBitrate -- PKEY_Audio_EncodingBitrate
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 4 (PIDASI_AVG_DATA_RATE)
+//
+//  Indicates the average data rate in Hz for the audio file in "bits per second".
+DEFINE_PROPERTYKEY(PKEY_Audio_EncodingBitrate, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 4);
+
+//  Name:     System.Audio.Format -- PKEY_Audio_Format
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)  Legacy code may treat this as VT_BSTR.
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 2 (PIDASI_FORMAT)
+//
+//  Indicates the format of the audio file.
+DEFINE_PROPERTYKEY(PKEY_Audio_Format, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 2);
+
+//  Name:     System.Audio.IsVariableBitRate -- PKEY_Audio_IsVariableBitRate
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: E6822FEE-8C17-4D62-823C-8E9CFCBD1D5C, 100
+DEFINE_PROPERTYKEY(PKEY_Audio_IsVariableBitRate, 0xE6822FEE, 0x8C17, 0x4D62, 0x82, 0x3C, 0x8E, 0x9C, 0xFC, 0xBD, 0x1D, 0x5C, 100);
+
+//  Name:     System.Audio.PeakValue -- PKEY_Audio_PeakValue
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 2579E5D0-1116-4084-BD9A-9B4F7CB4DF5E, 100
+DEFINE_PROPERTYKEY(PKEY_Audio_PeakValue, 0x2579E5D0, 0x1116, 0x4084, 0xBD, 0x9A, 0x9B, 0x4F, 0x7C, 0xB4, 0xDF, 0x5E, 100);
+
+//  Name:     System.Audio.SampleRate -- PKEY_Audio_SampleRate
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 5 (PIDASI_SAMPLE_RATE)
+//
+//  Indicates the audio sample rate for the audio file in "samples per second".
+DEFINE_PROPERTYKEY(PKEY_Audio_SampleRate, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 5);
+
+//  Name:     System.Audio.SampleSize -- PKEY_Audio_SampleSize
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 6 (PIDASI_SAMPLE_SIZE)
+//
+//  Indicates the audio sample size for the audio file in "bits per sample".
+DEFINE_PROPERTYKEY(PKEY_Audio_SampleSize, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 6);
+
+//  Name:     System.Audio.StreamName -- PKEY_Audio_StreamName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 9 (PIDASI_STREAM_NAME)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Audio_StreamName, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 9);
+
+//  Name:     System.Audio.StreamNumber -- PKEY_Audio_StreamNumber
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 8 (PIDASI_STREAM_NUMBER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Audio_StreamNumber, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 8);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// Calendar properties
+
+//  Name:     System.Calendar.Duration -- PKEY_Calendar_Duration
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 293CA35A-09AA-4DD2-B180-1FE245728A52, 100
+//
+//  The duration as specified in a string.
+DEFINE_PROPERTYKEY(PKEY_Calendar_Duration, 0x293CA35A, 0x09AA, 0x4DD2, 0xB1, 0x80, 0x1F, 0xE2, 0x45, 0x72, 0x8A, 0x52, 100);
+
+//  Name:     System.Calendar.IsOnline -- PKEY_Calendar_IsOnline
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: BFEE9149-E3E2-49A7-A862-C05988145CEC, 100
+//
+//  Identifies if the event is an online event.
+DEFINE_PROPERTYKEY(PKEY_Calendar_IsOnline, 0xBFEE9149, 0xE3E2, 0x49A7, 0xA8, 0x62, 0xC0, 0x59, 0x88, 0x14, 0x5C, 0xEC, 100);
+
+//  Name:     System.Calendar.IsRecurring -- PKEY_Calendar_IsRecurring
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 315B9C8D-80A9-4EF9-AE16-8E746DA51D70, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_IsRecurring, 0x315B9C8D, 0x80A9, 0x4EF9, 0xAE, 0x16, 0x8E, 0x74, 0x6D, 0xA5, 0x1D, 0x70, 100);
+
+//  Name:     System.Calendar.Location -- PKEY_Calendar_Location
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F6272D18-CECC-40B1-B26A-3911717AA7BD, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_Location, 0xF6272D18, 0xCECC, 0x40B1, 0xB2, 0x6A, 0x39, 0x11, 0x71, 0x7A, 0xA7, 0xBD, 100);
+
+//  Name:     System.Calendar.OptionalAttendeeAddresses -- PKEY_Calendar_OptionalAttendeeAddresses
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D55BAE5A-3892-417A-A649-C6AC5AAAEAB3, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_OptionalAttendeeAddresses, 0xD55BAE5A, 0x3892, 0x417A, 0xA6, 0x49, 0xC6, 0xAC, 0x5A, 0xAA, 0xEA, 0xB3, 100);
+
+//  Name:     System.Calendar.OptionalAttendeeNames -- PKEY_Calendar_OptionalAttendeeNames
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 09429607-582D-437F-84C3-DE93A2B24C3C, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_OptionalAttendeeNames, 0x09429607, 0x582D, 0x437F, 0x84, 0xC3, 0xDE, 0x93, 0xA2, 0xB2, 0x4C, 0x3C, 100);
+
+//  Name:     System.Calendar.OrganizerAddress -- PKEY_Calendar_OrganizerAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 744C8242-4DF5-456C-AB9E-014EFB9021E3, 100
+//
+//  Address of the organizer organizing the event.
+DEFINE_PROPERTYKEY(PKEY_Calendar_OrganizerAddress, 0x744C8242, 0x4DF5, 0x456C, 0xAB, 0x9E, 0x01, 0x4E, 0xFB, 0x90, 0x21, 0xE3, 100);
+
+//  Name:     System.Calendar.OrganizerName -- PKEY_Calendar_OrganizerName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: AAA660F9-9865-458E-B484-01BC7FE3973E, 100
+//
+//  Name of the organizer organizing the event.
+DEFINE_PROPERTYKEY(PKEY_Calendar_OrganizerName, 0xAAA660F9, 0x9865, 0x458E, 0xB4, 0x84, 0x01, 0xBC, 0x7F, 0xE3, 0x97, 0x3E, 100);
+
+//  Name:     System.Calendar.ReminderTime -- PKEY_Calendar_ReminderTime
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 72FC5BA4-24F9-4011-9F3F-ADD27AFAD818, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_ReminderTime, 0x72FC5BA4, 0x24F9, 0x4011, 0x9F, 0x3F, 0xAD, 0xD2, 0x7A, 0xFA, 0xD8, 0x18, 100);
+
+//  Name:     System.Calendar.RequiredAttendeeAddresses -- PKEY_Calendar_RequiredAttendeeAddresses
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 0BA7D6C3-568D-4159-AB91-781A91FB71E5, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_RequiredAttendeeAddresses, 0x0BA7D6C3, 0x568D, 0x4159, 0xAB, 0x91, 0x78, 0x1A, 0x91, 0xFB, 0x71, 0xE5, 100);
+
+//  Name:     System.Calendar.RequiredAttendeeNames -- PKEY_Calendar_RequiredAttendeeNames
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: B33AF30B-F552-4584-936C-CB93E5CDA29F, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_RequiredAttendeeNames, 0xB33AF30B, 0xF552, 0x4584, 0x93, 0x6C, 0xCB, 0x93, 0xE5, 0xCD, 0xA2, 0x9F, 100);
+
+//  Name:     System.Calendar.Resources -- PKEY_Calendar_Resources
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 00F58A38-C54B-4C40-8696-97235980EAE1, 100
+DEFINE_PROPERTYKEY(PKEY_Calendar_Resources, 0x00F58A38, 0xC54B, 0x4C40, 0x86, 0x96, 0x97, 0x23, 0x59, 0x80, 0xEA, 0xE1, 100);
+
+//  Name:     System.Calendar.ShowTimeAs -- PKEY_Calendar_ShowTimeAs
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: 5BF396D4-5EB2-466F-BDE9-2FB3F2361D6E, 100
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Calendar_ShowTimeAs, 0x5BF396D4, 0x5EB2, 0x466F, 0xBD, 0xE9, 0x2F, 0xB3, 0xF2, 0x36, 0x1D, 0x6E, 100);
+
+// Possible discrete values for PKEY_Calendar_ShowTimeAs are:
+#define CALENDAR_SHOWTIMEAS_FREE            0u
+#define CALENDAR_SHOWTIMEAS_TENTATIVE       1u
+#define CALENDAR_SHOWTIMEAS_BUSY            2u
+#define CALENDAR_SHOWTIMEAS_OOF             3u
+
+//  Name:     System.Calendar.ShowTimeAsText -- PKEY_Calendar_ShowTimeAsText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 53DA57CF-62C0-45C4-81DE-7610BCEFD7F5, 100
+//  
+//  This is the user-friendly form of System.Calendar.ShowTimeAs.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Calendar_ShowTimeAsText, 0x53DA57CF, 0x62C0, 0x45C4, 0x81, 0xDE, 0x76, 0x10, 0xBC, 0xEF, 0xD7, 0xF5, 100);
+ 
+//-----------------------------------------------------------------------------
+// Communication properties
+
+
+
+//  Name:     System.Communication.AccountName -- PKEY_Communication_AccountName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 9
+//
+//  Account Name
+DEFINE_PROPERTYKEY(PKEY_Communication_AccountName, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 9);
+
+//  Name:     System.Communication.Suffix -- PKEY_Communication_Suffix
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 807B653A-9E91-43EF-8F97-11CE04EE20C5, 100
+DEFINE_PROPERTYKEY(PKEY_Communication_Suffix, 0x807B653A, 0x9E91, 0x43EF, 0x8F, 0x97, 0x11, 0xCE, 0x04, 0xEE, 0x20, 0xC5, 100);
+
+//  Name:     System.Communication.TaskStatus -- PKEY_Communication_TaskStatus
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: BE1A72C6-9A1D-46B7-AFE7-AFAF8CEF4999, 100
+DEFINE_PROPERTYKEY(PKEY_Communication_TaskStatus, 0xBE1A72C6, 0x9A1D, 0x46B7, 0xAF, 0xE7, 0xAF, 0xAF, 0x8C, 0xEF, 0x49, 0x99, 100);
+
+// Possible discrete values for PKEY_Communication_TaskStatus are:
+#define TASKSTATUS_NOTSTARTED               0u
+#define TASKSTATUS_INPROGRESS               1u
+#define TASKSTATUS_COMPLETE                 2u
+#define TASKSTATUS_WAITING                  3u
+#define TASKSTATUS_DEFERRED                 4u
+
+//  Name:     System.Communication.TaskStatusText -- PKEY_Communication_TaskStatusText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A6744477-C237-475B-A075-54F34498292A, 100
+//  
+//  This is the user-friendly form of System.Communication.TaskStatus.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Communication_TaskStatusText, 0xA6744477, 0xC237, 0x475B, 0xA0, 0x75, 0x54, 0xF3, 0x44, 0x98, 0x29, 0x2A, 100);
+ 
+//-----------------------------------------------------------------------------
+// Computer properties
+
+
+
+//  Name:     System.Computer.DecoratedFreeSpace -- PKEY_Computer_DecoratedFreeSpace
+//  Type:     Multivalue UInt64 -- VT_VECTOR | VT_UI8  (For variants: VT_ARRAY | VT_UI8)
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 7  (Filesystem Volume Properties)
+//
+//  Free space and total space: "%s free of %s"
+DEFINE_PROPERTYKEY(PKEY_Computer_DecoratedFreeSpace, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 7);
+ 
+//-----------------------------------------------------------------------------
+// Contact properties
+
+
+
+//  Name:     System.Contact.Anniversary -- PKEY_Contact_Anniversary
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 9AD5BADB-CEA7-4470-A03D-B84E51B9949E, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Anniversary, 0x9AD5BADB, 0xCEA7, 0x4470, 0xA0, 0x3D, 0xB8, 0x4E, 0x51, 0xB9, 0x94, 0x9E, 100);
+
+//  Name:     System.Contact.AssistantName -- PKEY_Contact_AssistantName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CD102C9C-5540-4A88-A6F6-64E4981C8CD1, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_AssistantName, 0xCD102C9C, 0x5540, 0x4A88, 0xA6, 0xF6, 0x64, 0xE4, 0x98, 0x1C, 0x8C, 0xD1, 100);
+
+//  Name:     System.Contact.AssistantTelephone -- PKEY_Contact_AssistantTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 9A93244D-A7AD-4FF8-9B99-45EE4CC09AF6, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_AssistantTelephone, 0x9A93244D, 0xA7AD, 0x4FF8, 0x9B, 0x99, 0x45, 0xEE, 0x4C, 0xC0, 0x9A, 0xF6, 100);
+
+//  Name:     System.Contact.Birthday -- PKEY_Contact_Birthday
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 47
+DEFINE_PROPERTYKEY(PKEY_Contact_Birthday, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 47);
+
+//  Name:     System.Contact.BusinessAddress -- PKEY_Contact_BusinessAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 730FB6DD-CF7C-426B-A03F-BD166CC9EE24, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddress, 0x730FB6DD, 0xCF7C, 0x426B, 0xA0, 0x3F, 0xBD, 0x16, 0x6C, 0xC9, 0xEE, 0x24, 100);
+
+//  Name:     System.Contact.BusinessAddressCity -- PKEY_Contact_BusinessAddressCity
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 402B5934-EC5A-48C3-93E6-85E86A2D934E, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressCity, 0x402B5934, 0xEC5A, 0x48C3, 0x93, 0xE6, 0x85, 0xE8, 0x6A, 0x2D, 0x93, 0x4E, 100);
+
+//  Name:     System.Contact.BusinessAddressCountry -- PKEY_Contact_BusinessAddressCountry
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: B0B87314-FCF6-4FEB-8DFF-A50DA6AF561C, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressCountry, 0xB0B87314, 0xFCF6, 0x4FEB, 0x8D, 0xFF, 0xA5, 0x0D, 0xA6, 0xAF, 0x56, 0x1C, 100);
+
+//  Name:     System.Contact.BusinessAddressPostalCode -- PKEY_Contact_BusinessAddressPostalCode
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E1D4A09E-D758-4CD1-B6EC-34A8B5A73F80, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressPostalCode, 0xE1D4A09E, 0xD758, 0x4CD1, 0xB6, 0xEC, 0x34, 0xA8, 0xB5, 0xA7, 0x3F, 0x80, 100);
+
+//  Name:     System.Contact.BusinessAddressPostOfficeBox -- PKEY_Contact_BusinessAddressPostOfficeBox
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: BC4E71CE-17F9-48D5-BEE9-021DF0EA5409, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressPostOfficeBox, 0xBC4E71CE, 0x17F9, 0x48D5, 0xBE, 0xE9, 0x02, 0x1D, 0xF0, 0xEA, 0x54, 0x09, 100);
+
+//  Name:     System.Contact.BusinessAddressState -- PKEY_Contact_BusinessAddressState
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 446F787F-10C4-41CB-A6C4-4D0343551597, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressState, 0x446F787F, 0x10C4, 0x41CB, 0xA6, 0xC4, 0x4D, 0x03, 0x43, 0x55, 0x15, 0x97, 100);
+
+//  Name:     System.Contact.BusinessAddressStreet -- PKEY_Contact_BusinessAddressStreet
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DDD1460F-C0BF-4553-8CE4-10433C908FB0, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessAddressStreet, 0xDDD1460F, 0xC0BF, 0x4553, 0x8C, 0xE4, 0x10, 0x43, 0x3C, 0x90, 0x8F, 0xB0, 100);
+
+//  Name:     System.Contact.BusinessFaxNumber -- PKEY_Contact_BusinessFaxNumber
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 91EFF6F3-2E27-42CA-933E-7C999FBE310B, 100
+//
+//  Business fax number of the contact.
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessFaxNumber, 0x91EFF6F3, 0x2E27, 0x42CA, 0x93, 0x3E, 0x7C, 0x99, 0x9F, 0xBE, 0x31, 0x0B, 100);
+
+//  Name:     System.Contact.BusinessHomePage -- PKEY_Contact_BusinessHomePage
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 56310920-2491-4919-99CE-EADB06FAFDB2, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessHomePage, 0x56310920, 0x2491, 0x4919, 0x99, 0xCE, 0xEA, 0xDB, 0x06, 0xFA, 0xFD, 0xB2, 100);
+
+//  Name:     System.Contact.BusinessTelephone -- PKEY_Contact_BusinessTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6A15E5A0-0A1E-4CD7-BB8C-D2F1B0C929BC, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_BusinessTelephone, 0x6A15E5A0, 0x0A1E, 0x4CD7, 0xBB, 0x8C, 0xD2, 0xF1, 0xB0, 0xC9, 0x29, 0xBC, 100);
+
+//  Name:     System.Contact.CallbackTelephone -- PKEY_Contact_CallbackTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: BF53D1C3-49E0-4F7F-8567-5A821D8AC542, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_CallbackTelephone, 0xBF53D1C3, 0x49E0, 0x4F7F, 0x85, 0x67, 0x5A, 0x82, 0x1D, 0x8A, 0xC5, 0x42, 100);
+
+//  Name:     System.Contact.CarTelephone -- PKEY_Contact_CarTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8FDC6DEA-B929-412B-BA90-397A257465FE, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_CarTelephone, 0x8FDC6DEA, 0xB929, 0x412B, 0xBA, 0x90, 0x39, 0x7A, 0x25, 0x74, 0x65, 0xFE, 100);
+
+//  Name:     System.Contact.Children -- PKEY_Contact_Children
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D4729704-8EF1-43EF-9024-2BD381187FD5, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Children, 0xD4729704, 0x8EF1, 0x43EF, 0x90, 0x24, 0x2B, 0xD3, 0x81, 0x18, 0x7F, 0xD5, 100);
+
+//  Name:     System.Contact.CompanyMainTelephone -- PKEY_Contact_CompanyMainTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8589E481-6040-473D-B171-7FA89C2708ED, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_CompanyMainTelephone, 0x8589E481, 0x6040, 0x473D, 0xB1, 0x71, 0x7F, 0xA8, 0x9C, 0x27, 0x08, 0xED, 100);
+
+//  Name:     System.Contact.Department -- PKEY_Contact_Department
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: FC9F7306-FF8F-4D49-9FB6-3FFE5C0951EC, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Department, 0xFC9F7306, 0xFF8F, 0x4D49, 0x9F, 0xB6, 0x3F, 0xFE, 0x5C, 0x09, 0x51, 0xEC, 100);
+
+//  Name:     System.Contact.EmailAddress -- PKEY_Contact_EmailAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F8FA7FA3-D12B-4785-8A4E-691A94F7A3E7, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_EmailAddress, 0xF8FA7FA3, 0xD12B, 0x4785, 0x8A, 0x4E, 0x69, 0x1A, 0x94, 0xF7, 0xA3, 0xE7, 100);
+
+//  Name:     System.Contact.EmailAddress2 -- PKEY_Contact_EmailAddress2
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 38965063-EDC8-4268-8491-B7723172CF29, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_EmailAddress2, 0x38965063, 0xEDC8, 0x4268, 0x84, 0x91, 0xB7, 0x72, 0x31, 0x72, 0xCF, 0x29, 100);
+
+//  Name:     System.Contact.EmailAddress3 -- PKEY_Contact_EmailAddress3
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 644D37B4-E1B3-4BAD-B099-7E7C04966ACA, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_EmailAddress3, 0x644D37B4, 0xE1B3, 0x4BAD, 0xB0, 0x99, 0x7E, 0x7C, 0x04, 0x96, 0x6A, 0xCA, 100);
+
+//  Name:     System.Contact.EmailAddresses -- PKEY_Contact_EmailAddresses
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 84D8F337-981D-44B3-9615-C7596DBA17E3, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_EmailAddresses, 0x84D8F337, 0x981D, 0x44B3, 0x96, 0x15, 0xC7, 0x59, 0x6D, 0xBA, 0x17, 0xE3, 100);
+
+//  Name:     System.Contact.EmailName -- PKEY_Contact_EmailName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CC6F4F24-6083-4BD4-8754-674D0DE87AB8, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_EmailName, 0xCC6F4F24, 0x6083, 0x4BD4, 0x87, 0x54, 0x67, 0x4D, 0x0D, 0xE8, 0x7A, 0xB8, 100);
+
+//  Name:     System.Contact.FileAsName -- PKEY_Contact_FileAsName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F1A24AA7-9CA7-40F6-89EC-97DEF9FFE8DB, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_FileAsName, 0xF1A24AA7, 0x9CA7, 0x40F6, 0x89, 0xEC, 0x97, 0xDE, 0xF9, 0xFF, 0xE8, 0xDB, 100);
+
+//  Name:     System.Contact.FirstName -- PKEY_Contact_FirstName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 14977844-6B49-4AAD-A714-A4513BF60460, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_FirstName, 0x14977844, 0x6B49, 0x4AAD, 0xA7, 0x14, 0xA4, 0x51, 0x3B, 0xF6, 0x04, 0x60, 100);
+
+//  Name:     System.Contact.FullName -- PKEY_Contact_FullName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 635E9051-50A5-4BA2-B9DB-4ED056C77296, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_FullName, 0x635E9051, 0x50A5, 0x4BA2, 0xB9, 0xDB, 0x4E, 0xD0, 0x56, 0xC7, 0x72, 0x96, 100);
+
+//  Name:     System.Contact.Gender -- PKEY_Contact_Gender
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 3C8CEE58-D4F0-4CF9-B756-4E5D24447BCD, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Gender, 0x3C8CEE58, 0xD4F0, 0x4CF9, 0xB7, 0x56, 0x4E, 0x5D, 0x24, 0x44, 0x7B, 0xCD, 100);
+
+//  Name:     System.Contact.Hobbies -- PKEY_Contact_Hobbies
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 5DC2253F-5E11-4ADF-9CFE-910DD01E3E70, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Hobbies, 0x5DC2253F, 0x5E11, 0x4ADF, 0x9C, 0xFE, 0x91, 0x0D, 0xD0, 0x1E, 0x3E, 0x70, 100);
+
+//  Name:     System.Contact.HomeAddress -- PKEY_Contact_HomeAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 98F98354-617A-46B8-8560-5B1B64BF1F89, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddress, 0x98F98354, 0x617A, 0x46B8, 0x85, 0x60, 0x5B, 0x1B, 0x64, 0xBF, 0x1F, 0x89, 100);
+
+//  Name:     System.Contact.HomeAddressCity -- PKEY_Contact_HomeAddressCity
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 65
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressCity, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 65);
+
+//  Name:     System.Contact.HomeAddressCountry -- PKEY_Contact_HomeAddressCountry
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 08A65AA1-F4C9-43DD-9DDF-A33D8E7EAD85, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressCountry, 0x08A65AA1, 0xF4C9, 0x43DD, 0x9D, 0xDF, 0xA3, 0x3D, 0x8E, 0x7E, 0xAD, 0x85, 100);
+
+//  Name:     System.Contact.HomeAddressPostalCode -- PKEY_Contact_HomeAddressPostalCode
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8AFCC170-8A46-4B53-9EEE-90BAE7151E62, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressPostalCode, 0x8AFCC170, 0x8A46, 0x4B53, 0x9E, 0xEE, 0x90, 0xBA, 0xE7, 0x15, 0x1E, 0x62, 100);
+
+//  Name:     System.Contact.HomeAddressPostOfficeBox -- PKEY_Contact_HomeAddressPostOfficeBox
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7B9F6399-0A3F-4B12-89BD-4ADC51C918AF, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressPostOfficeBox, 0x7B9F6399, 0x0A3F, 0x4B12, 0x89, 0xBD, 0x4A, 0xDC, 0x51, 0xC9, 0x18, 0xAF, 100);
+
+//  Name:     System.Contact.HomeAddressState -- PKEY_Contact_HomeAddressState
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C89A23D0-7D6D-4EB8-87D4-776A82D493E5, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressState, 0xC89A23D0, 0x7D6D, 0x4EB8, 0x87, 0xD4, 0x77, 0x6A, 0x82, 0xD4, 0x93, 0xE5, 100);
+
+//  Name:     System.Contact.HomeAddressStreet -- PKEY_Contact_HomeAddressStreet
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 0ADEF160-DB3F-4308-9A21-06237B16FA2A, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeAddressStreet, 0x0ADEF160, 0xDB3F, 0x4308, 0x9A, 0x21, 0x06, 0x23, 0x7B, 0x16, 0xFA, 0x2A, 100);
+
+//  Name:     System.Contact.HomeFaxNumber -- PKEY_Contact_HomeFaxNumber
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 660E04D6-81AB-4977-A09F-82313113AB26, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeFaxNumber, 0x660E04D6, 0x81AB, 0x4977, 0xA0, 0x9F, 0x82, 0x31, 0x31, 0x13, 0xAB, 0x26, 100);
+
+//  Name:     System.Contact.HomeTelephone -- PKEY_Contact_HomeTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 20
+DEFINE_PROPERTYKEY(PKEY_Contact_HomeTelephone, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 20);
+
+//  Name:     System.Contact.IMAddress -- PKEY_Contact_IMAddress
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D68DBD8A-3374-4B81-9972-3EC30682DB3D, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_IMAddress, 0xD68DBD8A, 0x3374, 0x4B81, 0x99, 0x72, 0x3E, 0xC3, 0x06, 0x82, 0xDB, 0x3D, 100);
+
+//  Name:     System.Contact.Initials -- PKEY_Contact_Initials
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F3D8F40D-50CB-44A2-9718-40CB9119495D, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Initials, 0xF3D8F40D, 0x50CB, 0x44A2, 0x97, 0x18, 0x40, 0xCB, 0x91, 0x19, 0x49, 0x5D, 100);
+
+//  Name:     System.Contact.JA.CompanyNamePhonetic -- PKEY_Contact_JA_CompanyNamePhonetic
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 897B3694-FE9E-43E6-8066-260F590C0100, 2
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Contact_JA_CompanyNamePhonetic, 0x897B3694, 0xFE9E, 0x43E6, 0x80, 0x66, 0x26, 0x0F, 0x59, 0x0C, 0x01, 0x00, 2);
+
+//  Name:     System.Contact.JA.FirstNamePhonetic -- PKEY_Contact_JA_FirstNamePhonetic
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 897B3694-FE9E-43E6-8066-260F590C0100, 3
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Contact_JA_FirstNamePhonetic, 0x897B3694, 0xFE9E, 0x43E6, 0x80, 0x66, 0x26, 0x0F, 0x59, 0x0C, 0x01, 0x00, 3);
+
+//  Name:     System.Contact.JA.LastNamePhonetic -- PKEY_Contact_JA_LastNamePhonetic
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 897B3694-FE9E-43E6-8066-260F590C0100, 4
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Contact_JA_LastNamePhonetic, 0x897B3694, 0xFE9E, 0x43E6, 0x80, 0x66, 0x26, 0x0F, 0x59, 0x0C, 0x01, 0x00, 4);
+
+//  Name:     System.Contact.JobTitle -- PKEY_Contact_JobTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 6
+DEFINE_PROPERTYKEY(PKEY_Contact_JobTitle, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 6);
+
+//  Name:     System.Contact.Label -- PKEY_Contact_Label
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 97B0AD89-DF49-49CC-834E-660974FD755B, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Label, 0x97B0AD89, 0xDF49, 0x49CC, 0x83, 0x4E, 0x66, 0x09, 0x74, 0xFD, 0x75, 0x5B, 100);
+
+//  Name:     System.Contact.LastName -- PKEY_Contact_LastName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8F367200-C270-457C-B1D4-E07C5BCD90C7, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_LastName, 0x8F367200, 0xC270, 0x457C, 0xB1, 0xD4, 0xE0, 0x7C, 0x5B, 0xCD, 0x90, 0xC7, 100);
+
+//  Name:     System.Contact.MailingAddress -- PKEY_Contact_MailingAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C0AC206A-827E-4650-95AE-77E2BB74FCC9, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_MailingAddress, 0xC0AC206A, 0x827E, 0x4650, 0x95, 0xAE, 0x77, 0xE2, 0xBB, 0x74, 0xFC, 0xC9, 100);
+
+//  Name:     System.Contact.MiddleName -- PKEY_Contact_MiddleName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 71
+DEFINE_PROPERTYKEY(PKEY_Contact_MiddleName, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 71);
+
+//  Name:     System.Contact.MobileTelephone -- PKEY_Contact_MobileTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 35
+DEFINE_PROPERTYKEY(PKEY_Contact_MobileTelephone, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 35);
+
+//  Name:     System.Contact.NickName -- PKEY_Contact_NickName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 74
+DEFINE_PROPERTYKEY(PKEY_Contact_NickName, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 74);
+
+//  Name:     System.Contact.OfficeLocation -- PKEY_Contact_OfficeLocation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 7
+DEFINE_PROPERTYKEY(PKEY_Contact_OfficeLocation, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 7);
+
+//  Name:     System.Contact.OtherAddress -- PKEY_Contact_OtherAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 508161FA-313B-43D5-83A1-C1ACCF68622C, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddress, 0x508161FA, 0x313B, 0x43D5, 0x83, 0xA1, 0xC1, 0xAC, 0xCF, 0x68, 0x62, 0x2C, 100);
+
+//  Name:     System.Contact.OtherAddressCity -- PKEY_Contact_OtherAddressCity
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6E682923-7F7B-4F0C-A337-CFCA296687BF, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressCity, 0x6E682923, 0x7F7B, 0x4F0C, 0xA3, 0x37, 0xCF, 0xCA, 0x29, 0x66, 0x87, 0xBF, 100);
+
+//  Name:     System.Contact.OtherAddressCountry -- PKEY_Contact_OtherAddressCountry
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8F167568-0AAE-4322-8ED9-6055B7B0E398, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressCountry, 0x8F167568, 0x0AAE, 0x4322, 0x8E, 0xD9, 0x60, 0x55, 0xB7, 0xB0, 0xE3, 0x98, 100);
+
+//  Name:     System.Contact.OtherAddressPostalCode -- PKEY_Contact_OtherAddressPostalCode
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 95C656C1-2ABF-4148-9ED3-9EC602E3B7CD, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressPostalCode, 0x95C656C1, 0x2ABF, 0x4148, 0x9E, 0xD3, 0x9E, 0xC6, 0x02, 0xE3, 0xB7, 0xCD, 100);
+
+//  Name:     System.Contact.OtherAddressPostOfficeBox -- PKEY_Contact_OtherAddressPostOfficeBox
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 8B26EA41-058F-43F6-AECC-4035681CE977, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressPostOfficeBox, 0x8B26EA41, 0x058F, 0x43F6, 0xAE, 0xCC, 0x40, 0x35, 0x68, 0x1C, 0xE9, 0x77, 100);
+
+//  Name:     System.Contact.OtherAddressState -- PKEY_Contact_OtherAddressState
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 71B377D6-E570-425F-A170-809FAE73E54E, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressState, 0x71B377D6, 0xE570, 0x425F, 0xA1, 0x70, 0x80, 0x9F, 0xAE, 0x73, 0xE5, 0x4E, 100);
+
+//  Name:     System.Contact.OtherAddressStreet -- PKEY_Contact_OtherAddressStreet
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: FF962609-B7D6-4999-862D-95180D529AEA, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_OtherAddressStreet, 0xFF962609, 0xB7D6, 0x4999, 0x86, 0x2D, 0x95, 0x18, 0x0D, 0x52, 0x9A, 0xEA, 100);
+
+//  Name:     System.Contact.PagerTelephone -- PKEY_Contact_PagerTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D6304E01-F8F5-4F45-8B15-D024A6296789, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PagerTelephone, 0xD6304E01, 0xF8F5, 0x4F45, 0x8B, 0x15, 0xD0, 0x24, 0xA6, 0x29, 0x67, 0x89, 100);
+
+//  Name:     System.Contact.PersonalTitle -- PKEY_Contact_PersonalTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 69
+DEFINE_PROPERTYKEY(PKEY_Contact_PersonalTitle, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 69);
+
+//  Name:     System.Contact.PrimaryAddressCity -- PKEY_Contact_PrimaryAddressCity
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C8EA94F0-A9E3-4969-A94B-9C62A95324E0, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressCity, 0xC8EA94F0, 0xA9E3, 0x4969, 0xA9, 0x4B, 0x9C, 0x62, 0xA9, 0x53, 0x24, 0xE0, 100);
+
+//  Name:     System.Contact.PrimaryAddressCountry -- PKEY_Contact_PrimaryAddressCountry
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E53D799D-0F3F-466E-B2FF-74634A3CB7A4, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressCountry, 0xE53D799D, 0x0F3F, 0x466E, 0xB2, 0xFF, 0x74, 0x63, 0x4A, 0x3C, 0xB7, 0xA4, 100);
+
+//  Name:     System.Contact.PrimaryAddressPostalCode -- PKEY_Contact_PrimaryAddressPostalCode
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 18BBD425-ECFD-46EF-B612-7B4A6034EDA0, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressPostalCode, 0x18BBD425, 0xECFD, 0x46EF, 0xB6, 0x12, 0x7B, 0x4A, 0x60, 0x34, 0xED, 0xA0, 100);
+
+//  Name:     System.Contact.PrimaryAddressPostOfficeBox -- PKEY_Contact_PrimaryAddressPostOfficeBox
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DE5EF3C7-46E1-484E-9999-62C5308394C1, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressPostOfficeBox, 0xDE5EF3C7, 0x46E1, 0x484E, 0x99, 0x99, 0x62, 0xC5, 0x30, 0x83, 0x94, 0xC1, 100);
+
+//  Name:     System.Contact.PrimaryAddressState -- PKEY_Contact_PrimaryAddressState
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F1176DFE-7138-4640-8B4C-AE375DC70A6D, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressState, 0xF1176DFE, 0x7138, 0x4640, 0x8B, 0x4C, 0xAE, 0x37, 0x5D, 0xC7, 0x0A, 0x6D, 100);
+
+//  Name:     System.Contact.PrimaryAddressStreet -- PKEY_Contact_PrimaryAddressStreet
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 63C25B20-96BE-488F-8788-C09C407AD812, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryAddressStreet, 0x63C25B20, 0x96BE, 0x488F, 0x87, 0x88, 0xC0, 0x9C, 0x40, 0x7A, 0xD8, 0x12, 100);
+
+//  Name:     System.Contact.PrimaryEmailAddress -- PKEY_Contact_PrimaryEmailAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 48
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryEmailAddress, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 48);
+
+//  Name:     System.Contact.PrimaryTelephone -- PKEY_Contact_PrimaryTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 25
+DEFINE_PROPERTYKEY(PKEY_Contact_PrimaryTelephone, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 25);
+
+//  Name:     System.Contact.Profession -- PKEY_Contact_Profession
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7268AF55-1CE4-4F6E-A41F-B6E4EF10E4A9, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_Profession, 0x7268AF55, 0x1CE4, 0x4F6E, 0xA4, 0x1F, 0xB6, 0xE4, 0xEF, 0x10, 0xE4, 0xA9, 100);
+
+//  Name:     System.Contact.SpouseName -- PKEY_Contact_SpouseName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 9D2408B6-3167-422B-82B0-F583B7A7CFE3, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_SpouseName, 0x9D2408B6, 0x3167, 0x422B, 0x82, 0xB0, 0xF5, 0x83, 0xB7, 0xA7, 0xCF, 0xE3, 100);
+
+//  Name:     System.Contact.Suffix -- PKEY_Contact_Suffix
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 176DC63C-2688-4E89-8143-A347800F25E9, 73
+DEFINE_PROPERTYKEY(PKEY_Contact_Suffix, 0x176DC63C, 0x2688, 0x4E89, 0x81, 0x43, 0xA3, 0x47, 0x80, 0x0F, 0x25, 0xE9, 73);
+
+//  Name:     System.Contact.TelexNumber -- PKEY_Contact_TelexNumber
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C554493C-C1F7-40C1-A76C-EF8C0614003E, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_TelexNumber, 0xC554493C, 0xC1F7, 0x40C1, 0xA7, 0x6C, 0xEF, 0x8C, 0x06, 0x14, 0x00, 0x3E, 100);
+
+//  Name:     System.Contact.TTYTDDTelephone -- PKEY_Contact_TTYTDDTelephone
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: AAF16BAC-2B55-45E6-9F6D-415EB94910DF, 100
+DEFINE_PROPERTYKEY(PKEY_Contact_TTYTDDTelephone, 0xAAF16BAC, 0x2B55, 0x45E6, 0x9F, 0x6D, 0x41, 0x5E, 0xB9, 0x49, 0x10, 0xDF, 100);
+
+//  Name:     System.Contact.WebPage -- PKEY_Contact_WebPage
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 18
+DEFINE_PROPERTYKEY(PKEY_Contact_WebPage, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 18);
+ 
+//-----------------------------------------------------------------------------
+// Core properties
+
+
+
+//  Name:     System.AcquisitionID -- PKEY_AcquisitionID
+//  Type:     Int32 -- VT_I4
+//  FormatID: 65A98875-3C80-40AB-ABBC-EFDAF77DBEE2, 100
+//
+//  Hash to determine acquisition session.
+DEFINE_PROPERTYKEY(PKEY_AcquisitionID, 0x65A98875, 0x3C80, 0x40AB, 0xAB, 0xBC, 0xEF, 0xDA, 0xF7, 0x7D, 0xBE, 0xE2, 100);
+
+//  Name:     System.ApplicationName -- PKEY_ApplicationName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)  Legacy code may treat this as VT_LPSTR.
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 18 (PIDSI_APPNAME)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_ApplicationName, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 18);
+
+//  Name:     System.Author -- PKEY_Author
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)  Legacy code may treat this as VT_LPSTR.
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 4 (PIDSI_AUTHOR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Author, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 4);
+
+//  Name:     System.Capacity -- PKEY_Capacity
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 3 (PID_VOLUME_CAPACITY)  (Filesystem Volume Properties)
+//
+//  The amount of total space in bytes.
+DEFINE_PROPERTYKEY(PKEY_Capacity, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 3);
+
+//  Name:     System.Category -- PKEY_Category
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 2 (PIDDSI_CATEGORY)
+//
+//  Legacy code treats this as VT_LPSTR.
+DEFINE_PROPERTYKEY(PKEY_Category, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 2);
+
+//  Name:     System.Comment -- PKEY_Comment
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)  Legacy code may treat this as VT_LPSTR.
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 6 (PIDSI_COMMENTS)
+//
+//  Comments.
+DEFINE_PROPERTYKEY(PKEY_Comment, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 6);
+
+//  Name:     System.Company -- PKEY_Company
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 15 (PIDDSI_COMPANY)
+//
+//  The company or publisher.
+DEFINE_PROPERTYKEY(PKEY_Company, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 15);
+
+//  Name:     System.ComputerName -- PKEY_ComputerName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 5 (PID_COMPUTERNAME)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_ComputerName, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 5);
+
+//  Name:     System.ContainedItems -- PKEY_ContainedItems
+//  Type:     Multivalue Guid -- VT_VECTOR | VT_CLSID  (For variants: VT_ARRAY | VT_CLSID)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 29
+//  
+//  The list of type of items, this item contains. For example, this item contains urls, attachments etc.
+//  This is represented as a vector array of GUIDs where each GUID represents certain type.
+DEFINE_PROPERTYKEY(PKEY_ContainedItems, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 29);
+
+//  Name:     System.ContentStatus -- PKEY_ContentStatus
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 27
+DEFINE_PROPERTYKEY(PKEY_ContentStatus, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 27);
+
+//  Name:     System.ContentType -- PKEY_ContentType
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 26
+DEFINE_PROPERTYKEY(PKEY_ContentType, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 26);
+
+//  Name:     System.Copyright -- PKEY_Copyright
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 11 (PIDMSI_COPYRIGHT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Copyright, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 11);
+
+//  Name:     System.DateAccessed -- PKEY_DateAccessed
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 16 (PID_STG_ACCESSTIME)
+//
+//  The time of the last access to the item.  The Indexing Service friendly name is 'access'.
+DEFINE_PROPERTYKEY(PKEY_DateAccessed, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 16);
+
+//  Name:     System.DateAcquired -- PKEY_DateAcquired
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 2CBAA8F5-D81F-47CA-B17A-F8D822300131, 100
+//  
+//  The time the file entered the system via acquisition.  This is not the same as System.DateImported.
+//  Examples are when pictures are acquired from a camera, or when music is purchased online.
+DEFINE_PROPERTYKEY(PKEY_DateAcquired, 0x2CBAA8F5, 0xD81F, 0x47CA, 0xB1, 0x7A, 0xF8, 0xD8, 0x22, 0x30, 0x01, 0x31, 100);
+
+//  Name:     System.DateArchived -- PKEY_DateArchived
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 43F8D7B7-A444-4F87-9383-52271C9B915C, 100
+DEFINE_PROPERTYKEY(PKEY_DateArchived, 0x43F8D7B7, 0xA444, 0x4F87, 0x93, 0x83, 0x52, 0x27, 0x1C, 0x9B, 0x91, 0x5C, 100);
+
+//  Name:     System.DateCompleted -- PKEY_DateCompleted
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 72FAB781-ACDA-43E5-B155-B2434F85E678, 100
+DEFINE_PROPERTYKEY(PKEY_DateCompleted, 0x72FAB781, 0xACDA, 0x43E5, 0xB1, 0x55, 0xB2, 0x43, 0x4F, 0x85, 0xE6, 0x78, 100);
+
+//  Name:     System.DateCreated -- PKEY_DateCreated
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 15 (PID_STG_CREATETIME)
+//
+//  The date and time the item was created. The Indexing Service friendly name is 'create'.
+DEFINE_PROPERTYKEY(PKEY_DateCreated, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 15);
+
+//  Name:     System.DateImported -- PKEY_DateImported
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 18258
+//
+//  The time the file is imported into a separate database.  This is not the same as System.DateAcquired.  (Eg, 2003:05:22 13:55:04)
+DEFINE_PROPERTYKEY(PKEY_DateImported, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 18258);
+
+//  Name:     System.DateModified -- PKEY_DateModified
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 14 (PID_STG_WRITETIME)
+//
+//  The date and time of the last write to the item. The Indexing Service friendly name is 'write'.
+DEFINE_PROPERTYKEY(PKEY_DateModified, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 14);
+
+//  Name:     System.DueDate -- PKEY_DueDate
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 3F8472B5-E0AF-4DB2-8071-C53FE76AE7CE, 100
+DEFINE_PROPERTYKEY(PKEY_DueDate, 0x3F8472B5, 0xE0AF, 0x4DB2, 0x80, 0x71, 0xC5, 0x3F, 0xE7, 0x6A, 0xE7, 0xCE, 100);
+
+//  Name:     System.EndDate -- PKEY_EndDate
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: C75FAA05-96FD-49E7-9CB4-9F601082D553, 100
+DEFINE_PROPERTYKEY(PKEY_EndDate, 0xC75FAA05, 0x96FD, 0x49E7, 0x9C, 0xB4, 0x9F, 0x60, 0x10, 0x82, 0xD5, 0x53, 100);
+
+//  Name:     System.FileAllocationSize -- PKEY_FileAllocationSize
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 18 (PID_STG_ALLOCSIZE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_FileAllocationSize, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 18);
+
+//  Name:     System.FileAttributes -- PKEY_FileAttributes
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 13 (PID_STG_ATTRIBUTES)
+//  
+//  This is the WIN32_FIND_DATA dwFileAttributes for the file-based item.
+DEFINE_PROPERTYKEY(PKEY_FileAttributes, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 13);
+
+//  Name:     System.FileCount -- PKEY_FileCount
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 12
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_FileCount, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 12);
+
+//  Name:     System.FileDescription -- PKEY_FileDescription
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSFMTID_VERSION) 0CEF7D53-FA64-11D1-A203-0000F81FEDEE, 3 (PIDVSI_FileDescription)
+//  
+//  This is a user-friendly description of the file.
+DEFINE_PROPERTYKEY(PKEY_FileDescription, 0x0CEF7D53, 0xFA64, 0x11D1, 0xA2, 0x03, 0x00, 0x00, 0xF8, 0x1F, 0xED, 0xEE, 3);
+
+//  Name:     System.FileExtension -- PKEY_FileExtension
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E4F10A3C-49E6-405D-8288-A23BD4EEAA6C, 100
+//  
+//  This is the file extension of the file based item, including the leading period.  
+//  
+//  If System.FileName is VT_EMPTY, then this property should be too.  Otherwise, it should be derived
+//  appropriately by the data source from System.FileName.  If System.FileName does not have a file 
+//  extension, this value should be VT_EMPTY.
+//  
+//  To obtain the type of any item (including an item that is not a file), use System.ItemType.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                ".txt"
+//      "\\server\share\mydir\goodnews.doc"   ".doc"
+//      "\\server\share\numbers.xls"          ".xls"
+//      "\\server\share\folder"               VT_EMPTY
+//      "c:\foo\MyFolder"                     VT_EMPTY
+//      [desktop]                             VT_EMPTY
+DEFINE_PROPERTYKEY(PKEY_FileExtension, 0xE4F10A3C, 0x49E6, 0x405D, 0x82, 0x88, 0xA2, 0x3B, 0xD4, 0xEE, 0xAA, 0x6C, 100);
+
+//  Name:     System.FileFRN -- PKEY_FileFRN
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 21 (PID_STG_FRN)
+//  
+//  This is the unique file ID, also known as the File Reference Number. For a given file, this is the same value
+//  as is found in the structure variable FILE_ID_BOTH_DIR_INFO.FileId, via GetFileInformationByHandleEx().
+DEFINE_PROPERTYKEY(PKEY_FileFRN, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 21);
+
+//  Name:     System.FileName -- PKEY_FileName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 41CF5AE0-F75A-4806-BD87-59C7D9248EB9, 100
+//  
+//  This is the file name (including extension) of the file.
+//  
+//  It is possible that the item might not exist on a filesystem (ie, it may not be opened 
+//  using CreateFile).  Nonetheless, if the item is represented as a file from the logical sense 
+//  (and its name follows standard Win32 file-naming syntax), then the data source should emit this property.
+//  
+//  If an item is not a file, then the value for this property is VT_EMPTY.  See 
+//  System.ItemNameDisplay.
+//  
+//  This has the same value as System.ParsingName for items that are provided by the Shell's file folder.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "hello.txt"
+//      "\\server\share\mydir\goodnews.doc"   "goodnews.doc"
+//      "\\server\share\numbers.xls"          "numbers.xls"
+//      "c:\foo\MyFolder"                     "MyFolder"
+//      (email message)                       VT_EMPTY
+//      (song on portable device)             "song.wma"
+DEFINE_PROPERTYKEY(PKEY_FileName, 0x41CF5AE0, 0xF75A, 0x4806, 0xBD, 0x87, 0x59, 0xC7, 0xD9, 0x24, 0x8E, 0xB9, 100);
+
+//  Name:     System.FileOwner -- PKEY_FileOwner
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Misc) 9B174B34-40FF-11D2-A27E-00C04FC30871, 4 (PID_MISC_OWNER)
+//  
+//  This is the owner of the file, according to the file system.
+DEFINE_PROPERTYKEY(PKEY_FileOwner, 0x9B174B34, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 4);
+
+//  Name:     System.FileVersion -- PKEY_FileVersion
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSFMTID_VERSION) 0CEF7D53-FA64-11D1-A203-0000F81FEDEE, 4 (PIDVSI_FileVersion)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_FileVersion, 0x0CEF7D53, 0xFA64, 0x11D1, 0xA2, 0x03, 0x00, 0x00, 0xF8, 0x1F, 0xED, 0xEE, 4);
+
+//  Name:     System.FindData -- PKEY_FindData
+//  Type:     Buffer -- VT_VECTOR | VT_UI1  (For variants: VT_ARRAY | VT_UI1)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 0 (PID_FINDDATA)
+//
+//  WIN32_FIND_DATAW in buffer of bytes.
+DEFINE_PROPERTYKEY(PKEY_FindData, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 0);
+
+//  Name:     System.FlagColor -- PKEY_FlagColor
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: 67DF94DE-0CA7-4D6F-B792-053A3E4F03CF, 100
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_FlagColor, 0x67DF94DE, 0x0CA7, 0x4D6F, 0xB7, 0x92, 0x05, 0x3A, 0x3E, 0x4F, 0x03, 0xCF, 100);
+
+// Possible discrete values for PKEY_FlagColor are:
+#define FLAGCOLOR_PURPLE                    1u
+#define FLAGCOLOR_ORANGE                    2u
+#define FLAGCOLOR_GREEN                     3u
+#define FLAGCOLOR_YELLOW                    4u
+#define FLAGCOLOR_BLUE                      5u
+#define FLAGCOLOR_RED                       6u
+
+//  Name:     System.FlagColorText -- PKEY_FlagColorText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 45EAE747-8E2A-40AE-8CBF-CA52ABA6152A, 100
+//  
+//  This is the user-friendly form of System.FlagColor.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_FlagColorText, 0x45EAE747, 0x8E2A, 0x40AE, 0x8C, 0xBF, 0xCA, 0x52, 0xAB, 0xA6, 0x15, 0x2A, 100);
+
+//  Name:     System.FlagStatus -- PKEY_FlagStatus
+//  Type:     Int32 -- VT_I4
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 12
+//
+//  Status of Flag.  Values: (0=none 1=white 2=Red).  cdoPR_FLAG_STATUS
+DEFINE_PROPERTYKEY(PKEY_FlagStatus, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 12);
+
+// Possible discrete values for PKEY_FlagStatus are:
+#define FLAGSTATUS_NOTFLAGGED               0l
+#define FLAGSTATUS_COMPLETED                1l
+#define FLAGSTATUS_FOLLOWUP                 2l
+
+//  Name:     System.FlagStatusText -- PKEY_FlagStatusText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DC54FD2E-189D-4871-AA01-08C2F57A4ABC, 100
+//  
+//  This is the user-friendly form of System.FlagStatus.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_FlagStatusText, 0xDC54FD2E, 0x189D, 0x4871, 0xAA, 0x01, 0x08, 0xC2, 0xF5, 0x7A, 0x4A, 0xBC, 100);
+
+//  Name:     System.FreeSpace -- PKEY_FreeSpace
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 2 (PID_VOLUME_FREE)  (Filesystem Volume Properties)
+//
+//  The amount of free space in bytes.
+DEFINE_PROPERTYKEY(PKEY_FreeSpace, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 2);
+
+//  Name:     System.Identity -- PKEY_Identity
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A26F4AFC-7346-4299-BE47-EB1AE613139F, 100
+DEFINE_PROPERTYKEY(PKEY_Identity, 0xA26F4AFC, 0x7346, 0x4299, 0xBE, 0x47, 0xEB, 0x1A, 0xE6, 0x13, 0x13, 0x9F, 100);
+
+//  Name:     System.Importance -- PKEY_Importance
+//  Type:     Int32 -- VT_I4
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 11
+DEFINE_PROPERTYKEY(PKEY_Importance, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 11);
+
+// Possible range of values for PKEY_Importance are:
+#define IMPORTANCE_LOW_MIN                  0l
+#define IMPORTANCE_LOW_SET                  1l
+#define IMPORTANCE_LOW_MAX                  1l
+
+#define IMPORTANCE_NORMAL_MIN               2l
+#define IMPORTANCE_NORMAL_SET               3l
+#define IMPORTANCE_NORMAL_MAX               4l
+
+#define IMPORTANCE_HIGH_MIN                 5l
+#define IMPORTANCE_HIGH_SET                 5l
+#define IMPORTANCE_HIGH_MAX                 5l
+
+
+//  Name:     System.ImportanceText -- PKEY_ImportanceText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A3B29791-7713-4E1D-BB40-17DB85F01831, 100
+//  
+//  This is the user-friendly form of System.Importance.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_ImportanceText, 0xA3B29791, 0x7713, 0x4E1D, 0xBB, 0x40, 0x17, 0xDB, 0x85, 0xF0, 0x18, 0x31, 100);
+
+//  Name:     System.IsAttachment -- PKEY_IsAttachment
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: F23F425C-71A1-4FA8-922F-678EA4A60408, 100
+//
+//  Identifies if this item is an attachment.
+DEFINE_PROPERTYKEY(PKEY_IsAttachment, 0xF23F425C, 0x71A1, 0x4FA8, 0x92, 0x2F, 0x67, 0x8E, 0xA4, 0xA6, 0x04, 0x08, 100);
+
+//  Name:     System.IsDeleted -- PKEY_IsDeleted
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 5CDA5FC8-33EE-4FF3-9094-AE7BD8868C4D, 100
+DEFINE_PROPERTYKEY(PKEY_IsDeleted, 0x5CDA5FC8, 0x33EE, 0x4FF3, 0x90, 0x94, 0xAE, 0x7B, 0xD8, 0x86, 0x8C, 0x4D, 100);
+
+//  Name:     System.IsFlagged -- PKEY_IsFlagged
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 5DA84765-E3FF-4278-86B0-A27967FBDD03, 100
+DEFINE_PROPERTYKEY(PKEY_IsFlagged, 0x5DA84765, 0xE3FF, 0x4278, 0x86, 0xB0, 0xA2, 0x79, 0x67, 0xFB, 0xDD, 0x03, 100);
+
+//  Name:     System.IsFlaggedComplete -- PKEY_IsFlaggedComplete
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: A6F360D2-55F9-48DE-B909-620E090A647C, 100
+DEFINE_PROPERTYKEY(PKEY_IsFlaggedComplete, 0xA6F360D2, 0x55F9, 0x48DE, 0xB9, 0x09, 0x62, 0x0E, 0x09, 0x0A, 0x64, 0x7C, 100);
+
+//  Name:     System.IsIncomplete -- PKEY_IsIncomplete
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 346C8BD1-2E6A-4C45-89A4-61B78E8E700F, 100
+//
+//  Identifies if the message was not completely received for some error condition.
+DEFINE_PROPERTYKEY(PKEY_IsIncomplete, 0x346C8BD1, 0x2E6A, 0x4C45, 0x89, 0xA4, 0x61, 0xB7, 0x8E, 0x8E, 0x70, 0x0F, 100);
+
+//  Name:     System.IsRead -- PKEY_IsRead
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 10
+//
+//  Has the item been read?
+DEFINE_PROPERTYKEY(PKEY_IsRead, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 10);
+
+//  Name:     System.IsSendToTarget -- PKEY_IsSendToTarget
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 33
+//
+//  Provided by certain shell folders. Return TRUE if the folder is a valid Send To target.
+DEFINE_PROPERTYKEY(PKEY_IsSendToTarget, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 33);
+
+//  Name:     System.IsShared -- PKEY_IsShared
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: EF884C5B-2BFE-41BB-AAE5-76EEDF4F9902, 100
+//
+//  Is this item shared?
+DEFINE_PROPERTYKEY(PKEY_IsShared, 0xEF884C5B, 0x2BFE, 0x41BB, 0xAA, 0xE5, 0x76, 0xEE, 0xDF, 0x4F, 0x99, 0x02, 100);
+
+//  Name:     System.ItemAuthors -- PKEY_ItemAuthors
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D0A04F0A-462A-48A4-BB2F-3706E88DBD7D, 100
+//  
+//  This is the generic list of authors associated with an item. 
+//  
+//  For example, the artist name for a track is the item author.
+DEFINE_PROPERTYKEY(PKEY_ItemAuthors, 0xD0A04F0A, 0x462A, 0x48A4, 0xBB, 0x2F, 0x37, 0x06, 0xE8, 0x8D, 0xBD, 0x7D, 100);
+
+//  Name:     System.ItemDate -- PKEY_ItemDate
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: F7DB74B4-4287-4103-AFBA-F1B13DCD75CF, 100
+//  
+//  This is the main date for an item. The date of interest. 
+//  
+//  For example, for photos this maps to System.Photo.DateTaken.
+DEFINE_PROPERTYKEY(PKEY_ItemDate, 0xF7DB74B4, 0x4287, 0x4103, 0xAF, 0xBA, 0xF1, 0xB1, 0x3D, 0xCD, 0x75, 0xCF, 100);
+
+//  Name:     System.ItemFolderNameDisplay -- PKEY_ItemFolderNameDisplay
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 2 (PID_STG_DIRECTORY)
+//  
+//  This is the user-friendly display name of the parent folder of an item.
+//  
+//  If System.ItemFolderPathDisplay is VT_EMPTY, then this property should be too.  Otherwise, it 
+//  should be derived appropriately by the data source from System.ItemFolderPathDisplay.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "bar"
+//      "\\server\share\mydir\goodnews.doc"   "mydir"
+//      "\\server\share\numbers.xls"          "share"
+//      "c:\foo\MyFolder"                     "foo"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "Inbox"
+DEFINE_PROPERTYKEY(PKEY_ItemFolderNameDisplay, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 2);
+
+//  Name:     System.ItemFolderPathDisplay -- PKEY_ItemFolderPathDisplay
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 6
+//  
+//  This is the user-friendly display path of the parent folder of an item.
+//  
+//  If System.ItemPathDisplay is VT_EMPTY, then this property should be too.  Otherwise, it should 
+//  be derived appropriately by the data source from System.ItemPathDisplay.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "c:\foo\bar"
+//      "\\server\share\mydir\goodnews.doc"   "\\server\share\mydir"
+//      "\\server\share\numbers.xls"          "\\server\share"
+//      "c:\foo\MyFolder"                     "c:\foo"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "/Mailbox Account/Inbox"
+DEFINE_PROPERTYKEY(PKEY_ItemFolderPathDisplay, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 6);
+
+//  Name:     System.ItemFolderPathDisplayNarrow -- PKEY_ItemFolderPathDisplayNarrow
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DABD30ED-0043-4789-A7F8-D013A4736622, 100
+//  
+//  This is the user-friendly display path of the parent folder of an item.  The format of the string
+//  should be tailored such that the folder name comes first, to optimize for a narrow viewing column.
+//  
+//  If the folder is a file folder, the value includes localized names if they are present.
+//  
+//  If System.ItemFolderPathDisplay is VT_EMPTY, then this property should be too.  Otherwise, it should
+//  be derived appropriately by the data source from System.ItemFolderPathDisplay.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "bar (c:\foo)"
+//      "\\server\share\mydir\goodnews.doc"   "mydir (\\server\share)"
+//      "\\server\share\numbers.xls"          "share (\\server)"
+//      "c:\foo\MyFolder"                     "foo (c:\)"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "Inbox (/Mailbox Account)"
+DEFINE_PROPERTYKEY(PKEY_ItemFolderPathDisplayNarrow, 0xDABD30ED, 0x0043, 0x4789, 0xA7, 0xF8, 0xD0, 0x13, 0xA4, 0x73, 0x66, 0x22, 100);
+
+//  Name:     System.ItemName -- PKEY_ItemName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6B8DA074-3B5C-43BC-886F-0A2CDCE00B6F, 100
+//  
+//  This is the base-name of the System.ItemNameDisplay.
+//  
+//  If the item is a file this property
+//  includes the extension in all cases, and will be localized if a localized name is available.
+//  
+//  If the item is a message, then the value of this property does not include the forwarding or
+//  reply prefixes (see System.ItemNamePrefix).
+DEFINE_PROPERTYKEY(PKEY_ItemName, 0x6B8DA074, 0x3B5C, 0x43BC, 0x88, 0x6F, 0x0A, 0x2C, 0xDC, 0xE0, 0x0B, 0x6F, 100);
+
+//  Name:     System.ItemNameDisplay -- PKEY_ItemNameDisplay
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 10 (PID_STG_NAME)
+//  
+//  This is the display name in "most complete" form.  This is the best effort unique representation
+//  of the name of an item that makes sense for end users to read.  It is the concatentation of
+//  System.ItemNamePrefix and System.ItemName.
+//  
+//  If the item is a file this property
+//  includes the extension in all cases, and will be localized if a localized name is available.
+//  
+//  There are acceptable cases when System.FileName is not VT_EMPTY, yet the value of this property 
+//  is completely different.  Email messages are a key example.  If the item is an email message, 
+//  the item name is likely the subject.  In that case, the value must be the concatenation of the
+//  System.ItemNamePrefix and System.ItemName.  Since the value of System.ItemNamePrefix excludes
+//  any trailing whitespace, the concatenation must include a whitespace when generating System.ItemNameDisplay.
+//  
+//  Note that this property is not guaranteed to be unique, but the idea is to promote the most likely
+//  candidate that can be unique and also makes sense for end users. For example, for documents, you
+//  might think about using System.Title as the System.ItemNameDisplay, but in practice the title of
+//  the documents may not be useful or unique enough to be of value as the sole System.ItemNameDisplay.  
+//  Instead, providing the value of System.FileName as the value of System.ItemNameDisplay is a better
+//  candidate.  In Windows Mail, the emails are stored in the file system as .eml files and the 
+//  System.FileName for those files are not human-friendly as they contain GUIDs. In this example, 
+//  promoting System.Subject as System.ItemNameDisplay makes more sense.
+//  
+//  Compatibility notes:
+//  
+//  Shell folder implementations on Vista: use PKEY_ItemNameDisplay for the name column when
+//  you want Explorer to call ISF::GetDisplayNameOf(SHGDN_NORMAL) to get the value of the name. Use
+//  another PKEY (like PKEY_ItemName) when you want Explorer to call either the folder's property store or
+//  ISF2::GetDetailsEx in order to get the value of the name.
+//  
+//  Shell folder implementations on XP: the first column needs to be the name column, and Explorer
+//  will call ISF::GetDisplayNameOf to get the value of the name.  The PKEY/SCID does not matter.
+//  
+//  Example values:
+//  
+//      File:          "hello.txt"
+//      Message:       "Re: Let's talk about Tom's argyle socks!"
+//      Device folder: "song.wma"
+//      Folder:        "Documents"
+DEFINE_PROPERTYKEY(PKEY_ItemNameDisplay, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 10);
+
+//  Name:     System.ItemNamePrefix -- PKEY_ItemNamePrefix
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D7313FF1-A77A-401C-8C99-3DBDD68ADD36, 100
+//  
+//  This is the prefix of an item, used for email messages.
+//  where the subject begins with "Re:" which is the prefix.
+//  
+//  If the item is a file, then the value of this property is VT_EMPTY.
+//  
+//  If the item is a message, then the value of this property is the forwarding or reply 
+//  prefixes (including delimiting colon, but no whitespace), or VT_EMPTY if there is no prefix.
+//  
+//  Example values:
+//  
+//  System.ItemNamePrefix    System.ItemName      System.ItemNameDisplay
+//  ---------------------    -------------------  ----------------------
+//  VT_EMPTY                 "Great day"          "Great day"
+//  "Re:"                    "Great day"          "Re: Great day"
+//  "Fwd: "                  "Monthly budget"     "Fwd: Monthly budget"
+//  VT_EMPTY                 "accounts.xls"       "accounts.xls"
+DEFINE_PROPERTYKEY(PKEY_ItemNamePrefix, 0xD7313FF1, 0xA77A, 0x401C, 0x8C, 0x99, 0x3D, 0xBD, 0xD6, 0x8A, 0xDD, 0x36, 100);
+
+//  Name:     System.ItemParticipants -- PKEY_ItemParticipants
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D4D0AA16-9948-41A4-AA85-D97FF9646993, 100
+//  
+//  This is the generic list of people associated with an item and who contributed 
+//  to the item. 
+//  
+//  For example, this is the combination of people in the To list, Cc list and 
+//  sender of an email message.
+DEFINE_PROPERTYKEY(PKEY_ItemParticipants, 0xD4D0AA16, 0x9948, 0x41A4, 0xAA, 0x85, 0xD9, 0x7F, 0xF9, 0x64, 0x69, 0x93, 100);
+
+//  Name:     System.ItemPathDisplay -- PKEY_ItemPathDisplay
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 7
+//  
+//  This is the user-friendly display path to the item.
+//  
+//  If the item is a file or folder this property
+//  includes the extension in all cases, and will be localized if a localized name is available.
+//  
+//  For other items,this is the user-friendly equivalent, assuming the item exists in hierarchical storage.
+//  
+//  Unlike System.ItemUrl, this property value does not include the URL scheme.
+//  
+//  To parse an item path, use System.ItemUrl or System.ParsingPath.  To reference shell 
+//  namespace items using shell APIs, use System.ParsingPath.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "c:\foo\bar\hello.txt"
+//      "\\server\share\mydir\goodnews.doc"   "\\server\share\mydir\goodnews.doc"
+//      "\\server\share\numbers.xls"          "\\server\share\numbers.xls"
+//      "c:\foo\MyFolder"                     "c:\foo\MyFolder"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "/Mailbox Account/Inbox/'Re: Hello!'"
+DEFINE_PROPERTYKEY(PKEY_ItemPathDisplay, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 7);
+
+//  Name:     System.ItemPathDisplayNarrow -- PKEY_ItemPathDisplayNarrow
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 8
+//  
+//  This is the user-friendly display path to the item. The format of the string should be 
+//  tailored such that the name comes first, to optimize for a narrow viewing column.
+//  
+//  If the item is a file, the value excludes the file extension, and includes localized names if they are present.
+//  If the item is a message, the value includes the System.ItemNamePrefix.
+//  
+//  To parse an item path, use System.ItemUrl or System.ParsingPath.
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "hello (c:\foo\bar)"
+//      "\\server\share\mydir\goodnews.doc"   "goodnews (\\server\share\mydir)"
+//      "\\server\share\folder"               "folder (\\server\share)"
+//      "c:\foo\MyFolder"                     "MyFolder (c:\foo)"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "Re: Hello! (/Mailbox Account/Inbox)"
+DEFINE_PROPERTYKEY(PKEY_ItemPathDisplayNarrow, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 8);
+
+//  Name:     System.ItemType -- PKEY_ItemType
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 11
+//  
+//  This is the canonical type of the item and is intended to be programmatically
+//  parsed.
+//  
+//  If there is no canonical type, the value is VT_EMPTY.
+//  
+//  If the item is a file (ie, System.FileName is not VT_EMPTY), the value is the same as
+//  System.FileExtension.
+//  
+//  Use System.ItemTypeText when you want to display the type to end users in a view.  (If
+//   the item is a file, passing the System.ItemType value to PSFormatForDisplay will
+//   result in the same value as System.ItemTypeText.)
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                ".txt"
+//      "\\server\share\mydir\goodnews.doc"   ".doc"
+//      "\\server\share\folder"               "Directory"
+//      "c:\foo\MyFolder"                     "Directory"
+//      [desktop]                             "Folder"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "MAPI/IPM.Message"
+DEFINE_PROPERTYKEY(PKEY_ItemType, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 11);
+
+//  Name:     System.ItemTypeText -- PKEY_ItemTypeText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 4 (PID_STG_STORAGETYPE)
+//  
+//  This is the user friendly type name of the item.  This is not intended to be
+//  programmatically parsed.
+//  
+//  If System.ItemType is VT_EMPTY, the value of this property is also VT_EMPTY.
+//  
+//  If the item is a file, the value of this property is the same as if you passed the 
+//  file's System.ItemType value to PSFormatForDisplay.
+//  
+//  This property should not be confused with System.Kind, where System.Kind is a high-level
+//  user friendly kind name. For example, for a document, System.Kind = "Document" and 
+//  System.Item.Type = ".doc" and System.Item.TypeText = "Microsoft Word Document"
+//  
+//  Example values:
+//  
+//      If the path is...                     The property value is...
+//      -----------------                     ------------------------
+//      "c:\foo\bar\hello.txt"                "Text File"
+//      "\\server\share\mydir\goodnews.doc"   "Microsoft Word Document"
+//      "\\server\share\folder"               "File Folder"
+//      "c:\foo\MyFolder"                     "File Folder"
+//      "/Mailbox Account/Inbox/'Re: Hello!'" "Outlook E-Mail Message"
+DEFINE_PROPERTYKEY(PKEY_ItemTypeText, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 4);
+
+//  Name:     System.ItemUrl -- PKEY_ItemUrl
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Query) 49691C90-7E17-101A-A91C-08002B2ECDA9, 9 (PROPID_QUERY_VIRTUALPATH)
+//  
+//  This always represents a well formed URL that points to the item.  
+//  
+//  To reference shell namespace items using shell APIs, use System.ParsingPath.
+//  
+//  Example values:
+//  
+//      Files:    "file:///c:/foo/bar/hello.txt"
+//                "csc://{GUID}/..."
+//      Messages: "mapi://..."
+DEFINE_PROPERTYKEY(PKEY_ItemUrl, 0x49691C90, 0x7E17, 0x101A, 0xA9, 0x1C, 0x08, 0x00, 0x2B, 0x2E, 0xCD, 0xA9, 9);
+
+//  Name:     System.Keywords -- PKEY_Keywords
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)  Legacy code may treat this as VT_LPSTR.
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 5 (PIDSI_KEYWORDS)
+//
+//  The keywords for the item.  Also referred to as tags.
+DEFINE_PROPERTYKEY(PKEY_Keywords, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 5);
+
+//  Name:     System.Kind -- PKEY_Kind
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 1E3EE840-BC2B-476C-8237-2ACD1A839B22, 3
+//  
+//  System.Kind is used to map extensions to various .Search folders.
+//  Extensions are mapped to Kinds at HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\KindMap
+//  The list of kinds is not extensible.
+DEFINE_PROPERTYKEY(PKEY_Kind, 0x1E3EE840, 0xBC2B, 0x476C, 0x82, 0x37, 0x2A, 0xCD, 0x1A, 0x83, 0x9B, 0x22, 3);
+
+// Possible discrete values for PKEY_Kind are:
+#define KIND_CALENDAR                       L"calendar"
+#define KIND_COMMUNICATION                  L"communication"
+#define KIND_CONTACT                        L"contact"
+#define KIND_DOCUMENT                       L"document"
+#define KIND_EMAIL                          L"email"
+#define KIND_FEED                           L"feed"
+#define KIND_FOLDER                         L"folder"
+#define KIND_GAME                           L"game"
+#define KIND_INSTANTMESSAGE                 L"instantmessage"
+#define KIND_JOURNAL                        L"journal"
+#define KIND_LINK                           L"link"
+#define KIND_MOVIE                          L"movie"
+#define KIND_MUSIC                          L"music"
+#define KIND_NOTE                           L"note"
+#define KIND_PICTURE                        L"picture"
+#define KIND_PROGRAM                        L"program"
+#define KIND_RECORDEDTV                     L"recordedtv"
+#define KIND_SEARCHFOLDER                   L"searchfolder"
+#define KIND_TASK                           L"task"
+#define KIND_VIDEO                          L"video"
+#define KIND_WEBHISTORY                     L"webhistory"
+
+//  Name:     System.KindText -- PKEY_KindText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F04BEF95-C585-4197-A2B7-DF46FDC9EE6D, 100
+//  
+//  This is the user-friendly form of System.Kind.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_KindText, 0xF04BEF95, 0xC585, 0x4197, 0xA2, 0xB7, 0xDF, 0x46, 0xFD, 0xC9, 0xEE, 0x6D, 100);
+
+//  Name:     System.Language -- PKEY_Language
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 28
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Language, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 28);
+
+//  Name:     System.MileageInformation -- PKEY_MileageInformation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: FDF84370-031A-4ADD-9E91-0D775F1C6605, 100
+DEFINE_PROPERTYKEY(PKEY_MileageInformation, 0xFDF84370, 0x031A, 0x4ADD, 0x9E, 0x91, 0x0D, 0x77, 0x5F, 0x1C, 0x66, 0x05, 100);
+
+//  Name:     System.MIMEType -- PKEY_MIMEType
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 0B63E350-9CCC-11D0-BCDB-00805FCCCE04, 5
+//
+//  The MIME type.  Eg, for EML files: 'message/rfc822'.
+DEFINE_PROPERTYKEY(PKEY_MIMEType, 0x0B63E350, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 5);
+
+//  Name:     System.Null -- PKEY_Null
+//  Type:     Null -- VT_NULL
+//  FormatID: 00000000-0000-0000-0000-000000000000, 0
+DEFINE_PROPERTYKEY(PKEY_Null, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0);
+
+//  Name:     System.OfflineAvailability -- PKEY_OfflineAvailability
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: A94688B6-7D9F-4570-A648-E3DFC0AB2B3F, 100
+DEFINE_PROPERTYKEY(PKEY_OfflineAvailability, 0xA94688B6, 0x7D9F, 0x4570, 0xA6, 0x48, 0xE3, 0xDF, 0xC0, 0xAB, 0x2B, 0x3F, 100);
+
+// Possible discrete values for PKEY_OfflineAvailability are:
+#define OFFLINEAVAILABILITY_NOT_AVAILABLE   0ul
+#define OFFLINEAVAILABILITY_AVAILABLE       1ul
+#define OFFLINEAVAILABILITY_ALWAYS_AVAILABLE 2ul
+
+//  Name:     System.OfflineStatus -- PKEY_OfflineStatus
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 6D24888F-4718-4BDA-AFED-EA0FB4386CD8, 100
+DEFINE_PROPERTYKEY(PKEY_OfflineStatus, 0x6D24888F, 0x4718, 0x4BDA, 0xAF, 0xED, 0xEA, 0x0F, 0xB4, 0x38, 0x6C, 0xD8, 100);
+
+// Possible discrete values for PKEY_OfflineStatus are:
+#define OFFLINESTATUS_ONLINE                0ul
+#define OFFLINESTATUS_OFFLINE               1ul
+#define OFFLINESTATUS_OFFLINE_FORCED        2ul
+#define OFFLINESTATUS_OFFLINE_SLOW          3ul
+#define OFFLINESTATUS_OFFLINE_ERROR         4ul
+#define OFFLINESTATUS_OFFLINE_ITEM_VERSION_CONFLICT 5ul
+#define OFFLINESTATUS_OFFLINE_SUSPENDED     6ul
+
+//  Name:     System.OriginalFileName -- PKEY_OriginalFileName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSFMTID_VERSION) 0CEF7D53-FA64-11D1-A203-0000F81FEDEE, 6
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_OriginalFileName, 0x0CEF7D53, 0xFA64, 0x11D1, 0xA2, 0x03, 0x00, 0x00, 0xF8, 0x1F, 0xED, 0xEE, 6);
+
+//  Name:     System.ParentalRating -- PKEY_ParentalRating
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 21 (PIDMSI_PARENTAL_RATING)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_ParentalRating, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 21);
+
+//  Name:     System.ParentalRatingReason -- PKEY_ParentalRatingReason
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 10984E0A-F9F2-4321-B7EF-BAF195AF4319, 100
+DEFINE_PROPERTYKEY(PKEY_ParentalRatingReason, 0x10984E0A, 0xF9F2, 0x4321, 0xB7, 0xEF, 0xBA, 0xF1, 0x95, 0xAF, 0x43, 0x19, 100);
+
+//  Name:     System.ParentalRatingsOrganization -- PKEY_ParentalRatingsOrganization
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A7FE0840-1344-46F0-8D37-52ED712A4BF9, 100
+DEFINE_PROPERTYKEY(PKEY_ParentalRatingsOrganization, 0xA7FE0840, 0x1344, 0x46F0, 0x8D, 0x37, 0x52, 0xED, 0x71, 0x2A, 0x4B, 0xF9, 100);
+
+//  Name:     System.ParsingBindContext -- PKEY_ParsingBindContext
+//  Type:     Any -- VT_NULL  Legacy code may treat this as VT_UNKNOWN.
+//  FormatID: DFB9A04D-362F-4CA3-B30B-0254B17B5B84, 100
+//  
+//  used to get the IBindCtx for an item for parsing
+DEFINE_PROPERTYKEY(PKEY_ParsingBindContext, 0xDFB9A04D, 0x362F, 0x4CA3, 0xB3, 0x0B, 0x02, 0x54, 0xB1, 0x7B, 0x5B, 0x84, 100);
+
+//  Name:     System.ParsingName -- PKEY_ParsingName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 24
+//  
+//  The shell namespace name of an item relative to a parent folder.  This name may be passed to 
+//  IShellFolder::ParseDisplayName() of the parent shell folder.
+DEFINE_PROPERTYKEY(PKEY_ParsingName, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 24);
+
+//  Name:     System.ParsingPath -- PKEY_ParsingPath
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 30
+//  
+//  This is the shell namespace path to the item.  This path may be passed to 
+//  SHParseDisplayName to parse the path to the correct shell folder.
+//  
+//  If the item is a file, the value is identical to System.ItemPathDisplay.
+//  
+//  If the item cannot be accessed through the shell namespace, this value is VT_EMPTY.
+DEFINE_PROPERTYKEY(PKEY_ParsingPath, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 30);
+
+//  Name:     System.PerceivedType -- PKEY_PerceivedType
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 9
+//
+//  The perceived type of a shell item, based upon its canonical type.
+DEFINE_PROPERTYKEY(PKEY_PerceivedType, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 9);
+
+// For the enumerated values of PKEY_PerceivedType, see the PERCEIVED_TYPE_* values in shtypes.idl.
+
+//  Name:     System.PercentFull -- PKEY_PercentFull
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 5  (Filesystem Volume Properties)
+//
+//  The amount filled as a percentage, multiplied by 100 (ie, the valid range is 0 through 100).
+DEFINE_PROPERTYKEY(PKEY_PercentFull, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 5);
+
+//  Name:     System.Priority -- PKEY_Priority
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: 9C1FCF74-2D97-41BA-B4AE-CB2E3661A6E4, 5
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Priority, 0x9C1FCF74, 0x2D97, 0x41BA, 0xB4, 0xAE, 0xCB, 0x2E, 0x36, 0x61, 0xA6, 0xE4, 5);
+
+// Possible discrete values for PKEY_Priority are:
+#define PRIORITY_PROP_LOW                   0u
+#define PRIORITY_PROP_NORMAL                1u
+#define PRIORITY_PROP_HIGH                  2u
+
+//  Name:     System.PriorityText -- PKEY_PriorityText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D98BE98B-B86B-4095-BF52-9D23B2E0A752, 100
+//  
+//  This is the user-friendly form of System.Priority.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_PriorityText, 0xD98BE98B, 0xB86B, 0x4095, 0xBF, 0x52, 0x9D, 0x23, 0xB2, 0xE0, 0xA7, 0x52, 100);
+
+//  Name:     System.Project -- PKEY_Project
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 39A7F922-477C-48DE-8BC8-B28441E342E3, 100
+DEFINE_PROPERTYKEY(PKEY_Project, 0x39A7F922, 0x477C, 0x48DE, 0x8B, 0xC8, 0xB2, 0x84, 0x41, 0xE3, 0x42, 0xE3, 100);
+
+//  Name:     System.ProviderItemID -- PKEY_ProviderItemID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F21D9941-81F0-471A-ADEE-4E74B49217ED, 100
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_ProviderItemID, 0xF21D9941, 0x81F0, 0x471A, 0xAD, 0xEE, 0x4E, 0x74, 0xB4, 0x92, 0x17, 0xED, 100);
+
+//  Name:     System.Rating -- PKEY_Rating
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 9 (PIDMSI_RATING)
+//  
+//  Indicates the users preference rating of an item on a scale of 0-99 (0 = unrated, 1-12 = One Star, 
+//  13-37 = Two Stars, 38-62 = Three Stars, 63-87 = Four Stars, 88-99 = Five Stars).
+DEFINE_PROPERTYKEY(PKEY_Rating, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 9);
+
+// Use the following constants to convert between visual stars and the ratings value:
+#define RATING_UNRATED_MIN                  0ul
+#define RATING_UNRATED_SET                  0ul
+#define RATING_UNRATED_MAX                  0ul
+
+#define RATING_ONE_STAR_MIN                 1ul
+#define RATING_ONE_STAR_SET                 1ul
+#define RATING_ONE_STAR_MAX                 12ul
+
+#define RATING_TWO_STARS_MIN                13ul
+#define RATING_TWO_STARS_SET                25ul
+#define RATING_TWO_STARS_MAX                37ul
+
+#define RATING_THREE_STARS_MIN              38ul
+#define RATING_THREE_STARS_SET              50ul
+#define RATING_THREE_STARS_MAX              62ul
+
+#define RATING_FOUR_STARS_MIN               63ul
+#define RATING_FOUR_STARS_SET               75ul
+#define RATING_FOUR_STARS_MAX               87ul
+
+#define RATING_FIVE_STARS_MIN               88ul
+#define RATING_FIVE_STARS_SET               99ul
+#define RATING_FIVE_STARS_MAX               99ul
+
+
+//  Name:     System.RatingText -- PKEY_RatingText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 90197CA7-FD8F-4E8C-9DA3-B57E1E609295, 100
+//  
+//  This is the user-friendly form of System.Rating.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_RatingText, 0x90197CA7, 0xFD8F, 0x4E8C, 0x9D, 0xA3, 0xB5, 0x7E, 0x1E, 0x60, 0x92, 0x95, 100);
+
+//  Name:     System.Sensitivity -- PKEY_Sensitivity
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: F8D3F6AC-4874-42CB-BE59-AB454B30716A, 100
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Sensitivity, 0xF8D3F6AC, 0x4874, 0x42CB, 0xBE, 0x59, 0xAB, 0x45, 0x4B, 0x30, 0x71, 0x6A, 100);
+
+// Possible discrete values for PKEY_Sensitivity are:
+#define SENSITIVITY_PROP_NORMAL             0u
+#define SENSITIVITY_PROP_PERSONAL           1u
+#define SENSITIVITY_PROP_PRIVATE            2u
+#define SENSITIVITY_PROP_CONFIDENTIAL       3u
+
+//  Name:     System.SensitivityText -- PKEY_SensitivityText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D0C7F054-3F72-4725-8527-129A577CB269, 100
+//  
+//  This is the user-friendly form of System.Sensitivity.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_SensitivityText, 0xD0C7F054, 0x3F72, 0x4725, 0x85, 0x27, 0x12, 0x9A, 0x57, 0x7C, 0xB2, 0x69, 100);
+
+//  Name:     System.SFGAOFlags -- PKEY_SFGAOFlags
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 25
+//
+//  IShellFolder::GetAttributesOf flags, with SFGAO_PKEYSFGAOMASK attributes masked out.
+DEFINE_PROPERTYKEY(PKEY_SFGAOFlags, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 25);
+
+//  Name:     System.SharedWith -- PKEY_SharedWith
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: EF884C5B-2BFE-41BB-AAE5-76EEDF4F9902, 200
+//
+//  Who is the item shared with?
+DEFINE_PROPERTYKEY(PKEY_SharedWith, 0xEF884C5B, 0x2BFE, 0x41BB, 0xAA, 0xE5, 0x76, 0xEE, 0xDF, 0x4F, 0x99, 0x02, 200);
+
+//  Name:     System.ShareUserRating -- PKEY_ShareUserRating
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 12 (PIDMSI_SHARE_USER_RATING)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_ShareUserRating, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 12);
+
+//  Name:     System.Shell.OmitFromView -- PKEY_Shell_OmitFromView
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DE35258C-C695-4CBC-B982-38B0AD24CED0, 2
+//  
+//  Set this to a string value of 'True' to omit this item from shell views
+DEFINE_PROPERTYKEY(PKEY_Shell_OmitFromView, 0xDE35258C, 0xC695, 0x4CBC, 0xB9, 0x82, 0x38, 0xB0, 0xAD, 0x24, 0xCE, 0xD0, 2);
+
+//  Name:     System.SimpleRating -- PKEY_SimpleRating
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: A09F084E-AD41-489F-8076-AA5BE3082BCA, 100
+//  
+//  Indicates the users preference rating of an item on a scale of 0-5 (0=unrated, 1=One Star, 2=Two Stars, 3=Three Stars,
+//  4=Four Stars, 5=Five Stars)
+DEFINE_PROPERTYKEY(PKEY_SimpleRating, 0xA09F084E, 0xAD41, 0x489F, 0x80, 0x76, 0xAA, 0x5B, 0xE3, 0x08, 0x2B, 0xCA, 100);
+
+//  Name:     System.Size -- PKEY_Size
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 12 (PID_STG_SIZE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Size, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 12);
+
+//  Name:     System.SoftwareUsed -- PKEY_SoftwareUsed
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 305
+//
+//  PropertyTagSoftwareUsed
+DEFINE_PROPERTYKEY(PKEY_SoftwareUsed, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 305);
+
+//  Name:     System.SourceItem -- PKEY_SourceItem
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 668CDFA5-7A1B-4323-AE4B-E527393A1D81, 100
+DEFINE_PROPERTYKEY(PKEY_SourceItem, 0x668CDFA5, 0x7A1B, 0x4323, 0xAE, 0x4B, 0xE5, 0x27, 0x39, 0x3A, 0x1D, 0x81, 100);
+
+//  Name:     System.StartDate -- PKEY_StartDate
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 48FD6EC8-8A12-4CDF-A03E-4EC5A511EDDE, 100
+DEFINE_PROPERTYKEY(PKEY_StartDate, 0x48FD6EC8, 0x8A12, 0x4CDF, 0xA0, 0x3E, 0x4E, 0xC5, 0xA5, 0x11, 0xED, 0xDE, 100);
+
+//  Name:     System.Status -- PKEY_Status
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_IntSite) 000214A1-0000-0000-C000-000000000046, 9
+DEFINE_PROPERTYKEY(PKEY_Status, 0x000214A1, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 9);
+
+//  Name:     System.Subject -- PKEY_Subject
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 3 (PIDSI_SUBJECT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Subject, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 3);
+
+//  Name:     System.Thumbnail -- PKEY_Thumbnail
+//  Type:     Clipboard -- VT_CF
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 17 (PIDSI_THUMBNAIL)
+//
+//  A data that represents the thumbnail in VT_CF format.
+DEFINE_PROPERTYKEY(PKEY_Thumbnail, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 17);
+
+//  Name:     System.ThumbnailCacheId -- PKEY_ThumbnailCacheId
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: 446D16B1-8DAD-4870-A748-402EA43D788C, 100
+//  
+//  Unique value that can be used as a key to cache thumbnails. The value changes when the name, volume, or data modified 
+//  of an item changes.
+DEFINE_PROPERTYKEY(PKEY_ThumbnailCacheId, 0x446D16B1, 0x8DAD, 0x4870, 0xA7, 0x48, 0x40, 0x2E, 0xA4, 0x3D, 0x78, 0x8C, 100);
+
+//  Name:     System.ThumbnailStream -- PKEY_ThumbnailStream
+//  Type:     Stream -- VT_STREAM
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 27
+//
+//  Data that represents the thumbnail in VT_STREAM format that GDI+/WindowsCodecs supports (jpg, png, etc).
+DEFINE_PROPERTYKEY(PKEY_ThumbnailStream, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 27);
+
+//  Name:     System.Title -- PKEY_Title
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)  Legacy code may treat this as VT_LPSTR.
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 2 (PIDSI_TITLE)
+//
+//  Title of item.
+DEFINE_PROPERTYKEY(PKEY_Title, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 2);
+
+//  Name:     System.TotalFileSize -- PKEY_TotalFileSize
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 14
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_TotalFileSize, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 14);
+
+//  Name:     System.Trademarks -- PKEY_Trademarks
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSFMTID_VERSION) 0CEF7D53-FA64-11D1-A203-0000F81FEDEE, 9 (PIDVSI_Trademarks)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Trademarks, 0x0CEF7D53, 0xFA64, 0x11D1, 0xA2, 0x03, 0x00, 0x00, 0xF8, 0x1F, 0xED, 0xEE, 9);
+ 
+//-----------------------------------------------------------------------------
+// Document properties
+
+
+
+//  Name:     System.Document.ByteCount -- PKEY_Document_ByteCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 4 (PIDDSI_BYTECOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_ByteCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 4);
+
+//  Name:     System.Document.CharacterCount -- PKEY_Document_CharacterCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 16 (PIDSI_CHARCOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_CharacterCount, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 16);
+
+//  Name:     System.Document.ClientID -- PKEY_Document_ClientID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 276D7BB0-5B34-4FB0-AA4B-158ED12A1809, 100
+DEFINE_PROPERTYKEY(PKEY_Document_ClientID, 0x276D7BB0, 0x5B34, 0x4FB0, 0xAA, 0x4B, 0x15, 0x8E, 0xD1, 0x2A, 0x18, 0x09, 100);
+
+//  Name:     System.Document.Contributor -- PKEY_Document_Contributor
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: F334115E-DA1B-4509-9B3D-119504DC7ABB, 100
+DEFINE_PROPERTYKEY(PKEY_Document_Contributor, 0xF334115E, 0xDA1B, 0x4509, 0x9B, 0x3D, 0x11, 0x95, 0x04, 0xDC, 0x7A, 0xBB, 100);
+
+//  Name:     System.Document.DateCreated -- PKEY_Document_DateCreated
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 12 (PIDSI_CREATE_DTM)
+//  
+//  This property is stored in the document, not obtained from the file system.
+DEFINE_PROPERTYKEY(PKEY_Document_DateCreated, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 12);
+
+//  Name:     System.Document.DatePrinted -- PKEY_Document_DatePrinted
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 11 (PIDSI_LASTPRINTED)
+//
+//  Legacy name: "DocLastPrinted".
+DEFINE_PROPERTYKEY(PKEY_Document_DatePrinted, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 11);
+
+//  Name:     System.Document.DateSaved -- PKEY_Document_DateSaved
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 13 (PIDSI_LASTSAVE_DTM)
+//
+//  Legacy name: "DocLastSavedTm".
+DEFINE_PROPERTYKEY(PKEY_Document_DateSaved, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 13);
+
+//  Name:     System.Document.Division -- PKEY_Document_Division
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 1E005EE6-BF27-428B-B01C-79676ACD2870, 100
+DEFINE_PROPERTYKEY(PKEY_Document_Division, 0x1E005EE6, 0xBF27, 0x428B, 0xB0, 0x1C, 0x79, 0x67, 0x6A, 0xCD, 0x28, 0x70, 100);
+
+//  Name:     System.Document.DocumentID -- PKEY_Document_DocumentID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E08805C8-E395-40DF-80D2-54F0D6C43154, 100
+DEFINE_PROPERTYKEY(PKEY_Document_DocumentID, 0xE08805C8, 0xE395, 0x40DF, 0x80, 0xD2, 0x54, 0xF0, 0xD6, 0xC4, 0x31, 0x54, 100);
+
+//  Name:     System.Document.HiddenSlideCount -- PKEY_Document_HiddenSlideCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 9 (PIDDSI_HIDDENCOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_HiddenSlideCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 9);
+
+//  Name:     System.Document.LastAuthor -- PKEY_Document_LastAuthor
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 8 (PIDSI_LASTAUTHOR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_LastAuthor, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 8);
+
+//  Name:     System.Document.LineCount -- PKEY_Document_LineCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 5 (PIDDSI_LINECOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_LineCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 5);
+
+//  Name:     System.Document.Manager -- PKEY_Document_Manager
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 14 (PIDDSI_MANAGER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_Manager, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 14);
+
+//  Name:     System.Document.MultimediaClipCount -- PKEY_Document_MultimediaClipCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 10 (PIDDSI_MMCLIPCOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_MultimediaClipCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 10);
+
+//  Name:     System.Document.NoteCount -- PKEY_Document_NoteCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 8 (PIDDSI_NOTECOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_NoteCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 8);
+
+//  Name:     System.Document.PageCount -- PKEY_Document_PageCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 14 (PIDSI_PAGECOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_PageCount, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 14);
+
+//  Name:     System.Document.ParagraphCount -- PKEY_Document_ParagraphCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 6 (PIDDSI_PARCOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_ParagraphCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 6);
+
+//  Name:     System.Document.PresentationFormat -- PKEY_Document_PresentationFormat
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 3 (PIDDSI_PRESFORMAT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_PresentationFormat, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 3);
+
+//  Name:     System.Document.RevisionNumber -- PKEY_Document_RevisionNumber
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 9 (PIDSI_REVNUMBER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_RevisionNumber, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 9);
+
+//  Name:     System.Document.Security -- PKEY_Document_Security
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 19
+//
+//  Access control information, from SummaryInfo propset
+DEFINE_PROPERTYKEY(PKEY_Document_Security, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 19);
+
+//  Name:     System.Document.SlideCount -- PKEY_Document_SlideCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 7 (PIDDSI_SLIDECOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_SlideCount, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 7);
+
+//  Name:     System.Document.Template -- PKEY_Document_Template
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 7 (PIDSI_TEMPLATE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_Template, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 7);
+
+//  Name:     System.Document.TotalEditingTime -- PKEY_Document_TotalEditingTime
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 10 (PIDSI_EDITTIME)
+//
+//  100ns units, not milliseconds. VT_FILETIME for IPropertySetStorage handlers (legacy)
+DEFINE_PROPERTYKEY(PKEY_Document_TotalEditingTime, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 10);
+
+//  Name:     System.Document.Version -- PKEY_Document_Version
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DocumentSummaryInformation) D5CDD502-2E9C-101B-9397-08002B2CF9AE, 29
+DEFINE_PROPERTYKEY(PKEY_Document_Version, 0xD5CDD502, 0x2E9C, 0x101B, 0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE, 29);
+
+//  Name:     System.Document.WordCount -- PKEY_Document_WordCount
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_SummaryInformation) F29F85E0-4FF9-1068-AB91-08002B27B3D9, 15 (PIDSI_WORDCOUNT)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Document_WordCount, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 15);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// DRM properties
+
+//  Name:     System.DRM.DatePlayExpires -- PKEY_DRM_DatePlayExpires
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_DRM) AEAC19E4-89AE-4508-B9B7-BB867ABEE2ED, 6 (PIDDRSI_PLAYEXPIRES)
+//
+//  Indicates when play expires for digital rights management.
+DEFINE_PROPERTYKEY(PKEY_DRM_DatePlayExpires, 0xAEAC19E4, 0x89AE, 0x4508, 0xB9, 0xB7, 0xBB, 0x86, 0x7A, 0xBE, 0xE2, 0xED, 6);
+
+//  Name:     System.DRM.DatePlayStarts -- PKEY_DRM_DatePlayStarts
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_DRM) AEAC19E4-89AE-4508-B9B7-BB867ABEE2ED, 5 (PIDDRSI_PLAYSTARTS)
+//
+//  Indicates when play starts for digital rights management.
+DEFINE_PROPERTYKEY(PKEY_DRM_DatePlayStarts, 0xAEAC19E4, 0x89AE, 0x4508, 0xB9, 0xB7, 0xBB, 0x86, 0x7A, 0xBE, 0xE2, 0xED, 5);
+
+//  Name:     System.DRM.Description -- PKEY_DRM_Description
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_DRM) AEAC19E4-89AE-4508-B9B7-BB867ABEE2ED, 3 (PIDDRSI_DESCRIPTION)
+//
+//  Displays the description for digital rights management.
+DEFINE_PROPERTYKEY(PKEY_DRM_Description, 0xAEAC19E4, 0x89AE, 0x4508, 0xB9, 0xB7, 0xBB, 0x86, 0x7A, 0xBE, 0xE2, 0xED, 3);
+
+//  Name:     System.DRM.IsProtected -- PKEY_DRM_IsProtected
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: (FMTID_DRM) AEAC19E4-89AE-4508-B9B7-BB867ABEE2ED, 2 (PIDDRSI_PROTECTED)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_DRM_IsProtected, 0xAEAC19E4, 0x89AE, 0x4508, 0xB9, 0xB7, 0xBB, 0x86, 0x7A, 0xBE, 0xE2, 0xED, 2);
+
+//  Name:     System.DRM.PlayCount -- PKEY_DRM_PlayCount
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_DRM) AEAC19E4-89AE-4508-B9B7-BB867ABEE2ED, 4 (PIDDRSI_PLAYCOUNT)
+//
+//  Indicates the play count for digital rights management.
+DEFINE_PROPERTYKEY(PKEY_DRM_PlayCount, 0xAEAC19E4, 0x89AE, 0x4508, 0xB9, 0xB7, 0xBB, 0x86, 0x7A, 0xBE, 0xE2, 0xED, 4);
+ 
+//-----------------------------------------------------------------------------
+// GPS properties
+
+//  Name:     System.GPS.Altitude -- PKEY_GPS_Altitude
+//  Type:     Double -- VT_R8
+//  FormatID: 827EDB4F-5B73-44A7-891D-FDFFABEA35CA, 100
+//  
+//  Indicates the altitude based on the reference in PKEY_GPS_AltitudeRef.  Calculated from PKEY_GPS_AltitudeNumerator and 
+//  PKEY_GPS_AltitudeDenominator
+DEFINE_PROPERTYKEY(PKEY_GPS_Altitude, 0x827EDB4F, 0x5B73, 0x44A7, 0x89, 0x1D, 0xFD, 0xFF, 0xAB, 0xEA, 0x35, 0xCA, 100);
+
+//  Name:     System.GPS.AltitudeDenominator -- PKEY_GPS_AltitudeDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 78342DCB-E358-4145-AE9A-6BFE4E0F9F51, 100
+//
+//  Denominator of PKEY_GPS_Altitude
+DEFINE_PROPERTYKEY(PKEY_GPS_AltitudeDenominator, 0x78342DCB, 0xE358, 0x4145, 0xAE, 0x9A, 0x6B, 0xFE, 0x4E, 0x0F, 0x9F, 0x51, 100);
+
+//  Name:     System.GPS.AltitudeNumerator -- PKEY_GPS_AltitudeNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 2DAD1EB7-816D-40D3-9EC3-C9773BE2AADE, 100
+//
+//  Numerator of PKEY_GPS_Altitude
+DEFINE_PROPERTYKEY(PKEY_GPS_AltitudeNumerator, 0x2DAD1EB7, 0x816D, 0x40D3, 0x9E, 0xC3, 0xC9, 0x77, 0x3B, 0xE2, 0xAA, 0xDE, 100);
+
+//  Name:     System.GPS.AltitudeRef -- PKEY_GPS_AltitudeRef
+//  Type:     Byte -- VT_UI1
+//  FormatID: 46AC629D-75EA-4515-867F-6DC4321C5844, 100
+//
+//  Indicates the reference for the altitude property. (eg: above sea level, below sea level, absolute value)
+DEFINE_PROPERTYKEY(PKEY_GPS_AltitudeRef, 0x46AC629D, 0x75EA, 0x4515, 0x86, 0x7F, 0x6D, 0xC4, 0x32, 0x1C, 0x58, 0x44, 100);
+
+//  Name:     System.GPS.AreaInformation -- PKEY_GPS_AreaInformation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 972E333E-AC7E-49F1-8ADF-A70D07A9BCAB, 100
+//
+//  Represents the name of the GPS area
+DEFINE_PROPERTYKEY(PKEY_GPS_AreaInformation, 0x972E333E, 0xAC7E, 0x49F1, 0x8A, 0xDF, 0xA7, 0x0D, 0x07, 0xA9, 0xBC, 0xAB, 100);
+
+//  Name:     System.GPS.Date -- PKEY_GPS_Date
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 3602C812-0F3B-45F0-85AD-603468D69423, 100
+//
+//  Date and time of the GPS record
+DEFINE_PROPERTYKEY(PKEY_GPS_Date, 0x3602C812, 0x0F3B, 0x45F0, 0x85, 0xAD, 0x60, 0x34, 0x68, 0xD6, 0x94, 0x23, 100);
+
+//  Name:     System.GPS.DestBearing -- PKEY_GPS_DestBearing
+//  Type:     Double -- VT_R8
+//  FormatID: C66D4B3C-E888-47CC-B99F-9DCA3EE34DEA, 100
+//  
+//  Indicates the bearing to the destination point.  Calculated from PKEY_GPS_DestBearingNumerator and 
+//  PKEY_GPS_DestBearingDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_DestBearing, 0xC66D4B3C, 0xE888, 0x47CC, 0xB9, 0x9F, 0x9D, 0xCA, 0x3E, 0xE3, 0x4D, 0xEA, 100);
+
+//  Name:     System.GPS.DestBearingDenominator -- PKEY_GPS_DestBearingDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 7ABCF4F8-7C3F-4988-AC91-8D2C2E97ECA5, 100
+//
+//  Denominator of PKEY_GPS_DestBearing
+DEFINE_PROPERTYKEY(PKEY_GPS_DestBearingDenominator, 0x7ABCF4F8, 0x7C3F, 0x4988, 0xAC, 0x91, 0x8D, 0x2C, 0x2E, 0x97, 0xEC, 0xA5, 100);
+
+//  Name:     System.GPS.DestBearingNumerator -- PKEY_GPS_DestBearingNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: BA3B1DA9-86EE-4B5D-A2A4-A271A429F0CF, 100
+//
+//  Numerator of PKEY_GPS_DestBearing
+DEFINE_PROPERTYKEY(PKEY_GPS_DestBearingNumerator, 0xBA3B1DA9, 0x86EE, 0x4B5D, 0xA2, 0xA4, 0xA2, 0x71, 0xA4, 0x29, 0xF0, 0xCF, 100);
+
+//  Name:     System.GPS.DestBearingRef -- PKEY_GPS_DestBearingRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 9AB84393-2A0F-4B75-BB22-7279786977CB, 100
+//
+//  Indicates the reference used for the giving the bearing to the destination point.  (eg: true direction, magnetic direction)
+DEFINE_PROPERTYKEY(PKEY_GPS_DestBearingRef, 0x9AB84393, 0x2A0F, 0x4B75, 0xBB, 0x22, 0x72, 0x79, 0x78, 0x69, 0x77, 0xCB, 100);
+
+//  Name:     System.GPS.DestDistance -- PKEY_GPS_DestDistance
+//  Type:     Double -- VT_R8
+//  FormatID: A93EAE04-6804-4F24-AC81-09B266452118, 100
+//  
+//  Indicates the distance to the destination point.  Calculated from PKEY_GPS_DestDistanceNumerator and 
+//  PKEY_GPS_DestDistanceDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_DestDistance, 0xA93EAE04, 0x6804, 0x4F24, 0xAC, 0x81, 0x09, 0xB2, 0x66, 0x45, 0x21, 0x18, 100);
+
+//  Name:     System.GPS.DestDistanceDenominator -- PKEY_GPS_DestDistanceDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 9BC2C99B-AC71-4127-9D1C-2596D0D7DCB7, 100
+//
+//  Denominator of PKEY_GPS_DestDistance
+DEFINE_PROPERTYKEY(PKEY_GPS_DestDistanceDenominator, 0x9BC2C99B, 0xAC71, 0x4127, 0x9D, 0x1C, 0x25, 0x96, 0xD0, 0xD7, 0xDC, 0xB7, 100);
+
+//  Name:     System.GPS.DestDistanceNumerator -- PKEY_GPS_DestDistanceNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 2BDA47DA-08C6-4FE1-80BC-A72FC517C5D0, 100
+//
+//  Numerator of PKEY_GPS_DestDistance
+DEFINE_PROPERTYKEY(PKEY_GPS_DestDistanceNumerator, 0x2BDA47DA, 0x08C6, 0x4FE1, 0x80, 0xBC, 0xA7, 0x2F, 0xC5, 0x17, 0xC5, 0xD0, 100);
+
+//  Name:     System.GPS.DestDistanceRef -- PKEY_GPS_DestDistanceRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: ED4DF2D3-8695-450B-856F-F5C1C53ACB66, 100
+//
+//  Indicates the unit used to express the distance to the destination.  (eg: kilometers, miles, knots)
+DEFINE_PROPERTYKEY(PKEY_GPS_DestDistanceRef, 0xED4DF2D3, 0x8695, 0x450B, 0x85, 0x6F, 0xF5, 0xC1, 0xC5, 0x3A, 0xCB, 0x66, 100);
+
+//  Name:     System.GPS.DestLatitude -- PKEY_GPS_DestLatitude
+//  Type:     Multivalue Double -- VT_VECTOR | VT_R8  (For variants: VT_ARRAY | VT_R8)
+//  FormatID: 9D1D7CC5-5C39-451C-86B3-928E2D18CC47, 100
+//  
+//  Indicates the latitude of the destination point.  This is an array of three values.  Index 0 is the degrees, index 1 
+//  is the minutes, index 2 is the seconds.  Each is calculated from the values in PKEY_GPS_DestLatitudeNumerator and 
+//  PKEY_GPS_DestLatitudeDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLatitude, 0x9D1D7CC5, 0x5C39, 0x451C, 0x86, 0xB3, 0x92, 0x8E, 0x2D, 0x18, 0xCC, 0x47, 100);
+
+//  Name:     System.GPS.DestLatitudeDenominator -- PKEY_GPS_DestLatitudeDenominator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: 3A372292-7FCA-49A7-99D5-E47BB2D4E7AB, 100
+//
+//  Denominator of PKEY_GPS_DestLatitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLatitudeDenominator, 0x3A372292, 0x7FCA, 0x49A7, 0x99, 0xD5, 0xE4, 0x7B, 0xB2, 0xD4, 0xE7, 0xAB, 100);
+
+//  Name:     System.GPS.DestLatitudeNumerator -- PKEY_GPS_DestLatitudeNumerator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: ECF4B6F6-D5A6-433C-BB92-4076650FC890, 100
+//
+//  Numerator of PKEY_GPS_DestLatitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLatitudeNumerator, 0xECF4B6F6, 0xD5A6, 0x433C, 0xBB, 0x92, 0x40, 0x76, 0x65, 0x0F, 0xC8, 0x90, 100);
+
+//  Name:     System.GPS.DestLatitudeRef -- PKEY_GPS_DestLatitudeRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CEA820B9-CE61-4885-A128-005D9087C192, 100
+//
+//  Indicates whether the latitude destination point is north or south latitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLatitudeRef, 0xCEA820B9, 0xCE61, 0x4885, 0xA1, 0x28, 0x00, 0x5D, 0x90, 0x87, 0xC1, 0x92, 100);
+
+//  Name:     System.GPS.DestLongitude -- PKEY_GPS_DestLongitude
+//  Type:     Multivalue Double -- VT_VECTOR | VT_R8  (For variants: VT_ARRAY | VT_R8)
+//  FormatID: 47A96261-CB4C-4807-8AD3-40B9D9DBC6BC, 100
+//  
+//  Indicates the latitude of the destination point.  This is an array of three values.  Index 0 is the degrees, index 1 
+//  is the minutes, index 2 is the seconds.  Each is calculated from the values in PKEY_GPS_DestLongitudeNumerator and 
+//  PKEY_GPS_DestLongitudeDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLongitude, 0x47A96261, 0xCB4C, 0x4807, 0x8A, 0xD3, 0x40, 0xB9, 0xD9, 0xDB, 0xC6, 0xBC, 100);
+
+//  Name:     System.GPS.DestLongitudeDenominator -- PKEY_GPS_DestLongitudeDenominator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: 425D69E5-48AD-4900-8D80-6EB6B8D0AC86, 100
+//
+//  Denominator of PKEY_GPS_DestLongitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLongitudeDenominator, 0x425D69E5, 0x48AD, 0x4900, 0x8D, 0x80, 0x6E, 0xB6, 0xB8, 0xD0, 0xAC, 0x86, 100);
+
+//  Name:     System.GPS.DestLongitudeNumerator -- PKEY_GPS_DestLongitudeNumerator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: A3250282-FB6D-48D5-9A89-DBCACE75CCCF, 100
+//
+//  Numerator of PKEY_GPS_DestLongitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLongitudeNumerator, 0xA3250282, 0xFB6D, 0x48D5, 0x9A, 0x89, 0xDB, 0xCA, 0xCE, 0x75, 0xCC, 0xCF, 100);
+
+//  Name:     System.GPS.DestLongitudeRef -- PKEY_GPS_DestLongitudeRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 182C1EA6-7C1C-4083-AB4B-AC6C9F4ED128, 100
+//
+//  Indicates whether the longitude destination point is east or west longitude
+DEFINE_PROPERTYKEY(PKEY_GPS_DestLongitudeRef, 0x182C1EA6, 0x7C1C, 0x4083, 0xAB, 0x4B, 0xAC, 0x6C, 0x9F, 0x4E, 0xD1, 0x28, 100);
+
+//  Name:     System.GPS.Differential -- PKEY_GPS_Differential
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: AAF4EE25-BD3B-4DD7-BFC4-47F77BB00F6D, 100
+//
+//  Indicates whether differential correction was applied to the GPS receiver
+DEFINE_PROPERTYKEY(PKEY_GPS_Differential, 0xAAF4EE25, 0xBD3B, 0x4DD7, 0xBF, 0xC4, 0x47, 0xF7, 0x7B, 0xB0, 0x0F, 0x6D, 100);
+
+//  Name:     System.GPS.DOP -- PKEY_GPS_DOP
+//  Type:     Double -- VT_R8
+//  FormatID: 0CF8FB02-1837-42F1-A697-A7017AA289B9, 100
+//
+//  Indicates the GPS DOP (data degree of precision).  Calculated from PKEY_GPS_DOPNumerator and PKEY_GPS_DOPDenominator
+DEFINE_PROPERTYKEY(PKEY_GPS_DOP, 0x0CF8FB02, 0x1837, 0x42F1, 0xA6, 0x97, 0xA7, 0x01, 0x7A, 0xA2, 0x89, 0xB9, 100);
+
+//  Name:     System.GPS.DOPDenominator -- PKEY_GPS_DOPDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: A0BE94C5-50BA-487B-BD35-0654BE8881ED, 100
+//
+//  Denominator of PKEY_GPS_DOP
+DEFINE_PROPERTYKEY(PKEY_GPS_DOPDenominator, 0xA0BE94C5, 0x50BA, 0x487B, 0xBD, 0x35, 0x06, 0x54, 0xBE, 0x88, 0x81, 0xED, 100);
+
+//  Name:     System.GPS.DOPNumerator -- PKEY_GPS_DOPNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 47166B16-364F-4AA0-9F31-E2AB3DF449C3, 100
+//
+//  Numerator of PKEY_GPS_DOP
+DEFINE_PROPERTYKEY(PKEY_GPS_DOPNumerator, 0x47166B16, 0x364F, 0x4AA0, 0x9F, 0x31, 0xE2, 0xAB, 0x3D, 0xF4, 0x49, 0xC3, 100);
+
+//  Name:     System.GPS.ImgDirection -- PKEY_GPS_ImgDirection
+//  Type:     Double -- VT_R8
+//  FormatID: 16473C91-D017-4ED9-BA4D-B6BAA55DBCF8, 100
+//  
+//  Indicates direction of the image when it was captured.  Calculated from PKEY_GPS_ImgDirectionNumerator and 
+//  PKEY_GPS_ImgDirectionDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_ImgDirection, 0x16473C91, 0xD017, 0x4ED9, 0xBA, 0x4D, 0xB6, 0xBA, 0xA5, 0x5D, 0xBC, 0xF8, 100);
+
+//  Name:     System.GPS.ImgDirectionDenominator -- PKEY_GPS_ImgDirectionDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 10B24595-41A2-4E20-93C2-5761C1395F32, 100
+//
+//  Denominator of PKEY_GPS_ImgDirection
+DEFINE_PROPERTYKEY(PKEY_GPS_ImgDirectionDenominator, 0x10B24595, 0x41A2, 0x4E20, 0x93, 0xC2, 0x57, 0x61, 0xC1, 0x39, 0x5F, 0x32, 100);
+
+//  Name:     System.GPS.ImgDirectionNumerator -- PKEY_GPS_ImgDirectionNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: DC5877C7-225F-45F7-BAC7-E81334B6130A, 100
+//
+//  Numerator of PKEY_GPS_ImgDirection
+DEFINE_PROPERTYKEY(PKEY_GPS_ImgDirectionNumerator, 0xDC5877C7, 0x225F, 0x45F7, 0xBA, 0xC7, 0xE8, 0x13, 0x34, 0xB6, 0x13, 0x0A, 100);
+
+//  Name:     System.GPS.ImgDirectionRef -- PKEY_GPS_ImgDirectionRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A4AAA5B7-1AD0-445F-811A-0F8F6E67F6B5, 100
+//
+//  Indicates reference for giving the direction of the image when it was captured.  (eg: true direction, magnetic direction)
+DEFINE_PROPERTYKEY(PKEY_GPS_ImgDirectionRef, 0xA4AAA5B7, 0x1AD0, 0x445F, 0x81, 0x1A, 0x0F, 0x8F, 0x6E, 0x67, 0xF6, 0xB5, 100);
+
+//  Name:     System.GPS.Latitude -- PKEY_GPS_Latitude
+//  Type:     Multivalue Double -- VT_VECTOR | VT_R8  (For variants: VT_ARRAY | VT_R8)
+//  FormatID: 8727CFFF-4868-4EC6-AD5B-81B98521D1AB, 100
+//  
+//  Indicates the latitude.  This is an array of three values.  Index 0 is the degrees, index 1 is the minutes, index 2 
+//  is the seconds.  Each is calculated from the values in PKEY_GPS_LatitudeNumerator and PKEY_GPS_LatitudeDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_Latitude, 0x8727CFFF, 0x4868, 0x4EC6, 0xAD, 0x5B, 0x81, 0xB9, 0x85, 0x21, 0xD1, 0xAB, 100);
+
+//  Name:     System.GPS.LatitudeDenominator -- PKEY_GPS_LatitudeDenominator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: 16E634EE-2BFF-497B-BD8A-4341AD39EEB9, 100
+//
+//  Denominator of PKEY_GPS_Latitude
+DEFINE_PROPERTYKEY(PKEY_GPS_LatitudeDenominator, 0x16E634EE, 0x2BFF, 0x497B, 0xBD, 0x8A, 0x43, 0x41, 0xAD, 0x39, 0xEE, 0xB9, 100);
+
+//  Name:     System.GPS.LatitudeNumerator -- PKEY_GPS_LatitudeNumerator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: 7DDAAAD1-CCC8-41AE-B750-B2CB8031AEA2, 100
+//
+//  Numerator of PKEY_GPS_Latitude
+DEFINE_PROPERTYKEY(PKEY_GPS_LatitudeNumerator, 0x7DDAAAD1, 0xCCC8, 0x41AE, 0xB7, 0x50, 0xB2, 0xCB, 0x80, 0x31, 0xAE, 0xA2, 100);
+
+//  Name:     System.GPS.LatitudeRef -- PKEY_GPS_LatitudeRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 029C0252-5B86-46C7-ACA0-2769FFC8E3D4, 100
+//
+//  Indicates whether latitude is north or south latitude 
+DEFINE_PROPERTYKEY(PKEY_GPS_LatitudeRef, 0x029C0252, 0x5B86, 0x46C7, 0xAC, 0xA0, 0x27, 0x69, 0xFF, 0xC8, 0xE3, 0xD4, 100);
+
+//  Name:     System.GPS.Longitude -- PKEY_GPS_Longitude
+//  Type:     Multivalue Double -- VT_VECTOR | VT_R8  (For variants: VT_ARRAY | VT_R8)
+//  FormatID: C4C4DBB2-B593-466B-BBDA-D03D27D5E43A, 100
+//  
+//  Indicates the longitude.  This is an array of three values.  Index 0 is the degrees, index 1 is the minutes, index 2 
+//  is the seconds.  Each is calculated from the values in PKEY_GPS_LongitudeNumerator and PKEY_GPS_LongitudeDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_Longitude, 0xC4C4DBB2, 0xB593, 0x466B, 0xBB, 0xDA, 0xD0, 0x3D, 0x27, 0xD5, 0xE4, 0x3A, 100);
+
+//  Name:     System.GPS.LongitudeDenominator -- PKEY_GPS_LongitudeDenominator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: BE6E176C-4534-4D2C-ACE5-31DEDAC1606B, 100
+//
+//  Denominator of PKEY_GPS_Longitude
+DEFINE_PROPERTYKEY(PKEY_GPS_LongitudeDenominator, 0xBE6E176C, 0x4534, 0x4D2C, 0xAC, 0xE5, 0x31, 0xDE, 0xDA, 0xC1, 0x60, 0x6B, 100);
+
+//  Name:     System.GPS.LongitudeNumerator -- PKEY_GPS_LongitudeNumerator
+//  Type:     Multivalue UInt32 -- VT_VECTOR | VT_UI4  (For variants: VT_ARRAY | VT_UI4)
+//  FormatID: 02B0F689-A914-4E45-821D-1DDA452ED2C4, 100
+//
+//  Numerator of PKEY_GPS_Longitude
+DEFINE_PROPERTYKEY(PKEY_GPS_LongitudeNumerator, 0x02B0F689, 0xA914, 0x4E45, 0x82, 0x1D, 0x1D, 0xDA, 0x45, 0x2E, 0xD2, 0xC4, 100);
+
+//  Name:     System.GPS.LongitudeRef -- PKEY_GPS_LongitudeRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 33DCF22B-28D5-464C-8035-1EE9EFD25278, 100
+//
+//  Indicates whether longitude is east or west longitude
+DEFINE_PROPERTYKEY(PKEY_GPS_LongitudeRef, 0x33DCF22B, 0x28D5, 0x464C, 0x80, 0x35, 0x1E, 0xE9, 0xEF, 0xD2, 0x52, 0x78, 100);
+
+//  Name:     System.GPS.MapDatum -- PKEY_GPS_MapDatum
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 2CA2DAE6-EDDC-407D-BEF1-773942ABFA95, 100
+//
+//  Indicates the geodetic survey data used by the GPS receiver
+DEFINE_PROPERTYKEY(PKEY_GPS_MapDatum, 0x2CA2DAE6, 0xEDDC, 0x407D, 0xBE, 0xF1, 0x77, 0x39, 0x42, 0xAB, 0xFA, 0x95, 100);
+
+//  Name:     System.GPS.MeasureMode -- PKEY_GPS_MeasureMode
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A015ED5D-AAEA-4D58-8A86-3C586920EA0B, 100
+//
+//  Indicates the GPS measurement mode.  (eg: 2-dimensional, 3-dimensional)
+DEFINE_PROPERTYKEY(PKEY_GPS_MeasureMode, 0xA015ED5D, 0xAAEA, 0x4D58, 0x8A, 0x86, 0x3C, 0x58, 0x69, 0x20, 0xEA, 0x0B, 100);
+
+//  Name:     System.GPS.ProcessingMethod -- PKEY_GPS_ProcessingMethod
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 59D49E61-840F-4AA9-A939-E2099B7F6399, 100
+//
+//  Indicates the name of the method used for location finding
+DEFINE_PROPERTYKEY(PKEY_GPS_ProcessingMethod, 0x59D49E61, 0x840F, 0x4AA9, 0xA9, 0x39, 0xE2, 0x09, 0x9B, 0x7F, 0x63, 0x99, 100);
+
+//  Name:     System.GPS.Satellites -- PKEY_GPS_Satellites
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 467EE575-1F25-4557-AD4E-B8B58B0D9C15, 100
+//
+//  Indicates the GPS satellites used for measurements
+DEFINE_PROPERTYKEY(PKEY_GPS_Satellites, 0x467EE575, 0x1F25, 0x4557, 0xAD, 0x4E, 0xB8, 0xB5, 0x8B, 0x0D, 0x9C, 0x15, 100);
+
+//  Name:     System.GPS.Speed -- PKEY_GPS_Speed
+//  Type:     Double -- VT_R8
+//  FormatID: DA5D0862-6E76-4E1B-BABD-70021BD25494, 100
+//  
+//  Indicates the speed of the GPS receiver movement.  Calculated from PKEY_GPS_SpeedNumerator and 
+//  PKEY_GPS_SpeedDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_Speed, 0xDA5D0862, 0x6E76, 0x4E1B, 0xBA, 0xBD, 0x70, 0x02, 0x1B, 0xD2, 0x54, 0x94, 100);
+
+//  Name:     System.GPS.SpeedDenominator -- PKEY_GPS_SpeedDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 7D122D5A-AE5E-4335-8841-D71E7CE72F53, 100
+//
+//  Denominator of PKEY_GPS_Speed
+DEFINE_PROPERTYKEY(PKEY_GPS_SpeedDenominator, 0x7D122D5A, 0xAE5E, 0x4335, 0x88, 0x41, 0xD7, 0x1E, 0x7C, 0xE7, 0x2F, 0x53, 100);
+
+//  Name:     System.GPS.SpeedNumerator -- PKEY_GPS_SpeedNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: ACC9CE3D-C213-4942-8B48-6D0820F21C6D, 100
+//
+//  Numerator of PKEY_GPS_Speed
+DEFINE_PROPERTYKEY(PKEY_GPS_SpeedNumerator, 0xACC9CE3D, 0xC213, 0x4942, 0x8B, 0x48, 0x6D, 0x08, 0x20, 0xF2, 0x1C, 0x6D, 100);
+
+//  Name:     System.GPS.SpeedRef -- PKEY_GPS_SpeedRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: ECF7F4C9-544F-4D6D-9D98-8AD79ADAF453, 100
+//  
+//  Indicates the unit used to express the speed of the GPS receiver movement.  (eg: kilometers per hour, 
+//  miles per hour, knots).
+DEFINE_PROPERTYKEY(PKEY_GPS_SpeedRef, 0xECF7F4C9, 0x544F, 0x4D6D, 0x9D, 0x98, 0x8A, 0xD7, 0x9A, 0xDA, 0xF4, 0x53, 100);
+
+//  Name:     System.GPS.Status -- PKEY_GPS_Status
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 125491F4-818F-46B2-91B5-D537753617B2, 100
+//  
+//  Indicates the status of the GPS receiver when the image was recorded.  (eg: measurement in progress, 
+//  measurement interoperability).
+DEFINE_PROPERTYKEY(PKEY_GPS_Status, 0x125491F4, 0x818F, 0x46B2, 0x91, 0xB5, 0xD5, 0x37, 0x75, 0x36, 0x17, 0xB2, 100);
+
+//  Name:     System.GPS.Track -- PKEY_GPS_Track
+//  Type:     Double -- VT_R8
+//  FormatID: 76C09943-7C33-49E3-9E7E-CDBA872CFADA, 100
+//  
+//  Indicates the direction of the GPS receiver movement.  Calculated from PKEY_GPS_TrackNumerator and 
+//  PKEY_GPS_TrackDenominator.
+DEFINE_PROPERTYKEY(PKEY_GPS_Track, 0x76C09943, 0x7C33, 0x49E3, 0x9E, 0x7E, 0xCD, 0xBA, 0x87, 0x2C, 0xFA, 0xDA, 100);
+
+//  Name:     System.GPS.TrackDenominator -- PKEY_GPS_TrackDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: C8D1920C-01F6-40C0-AC86-2F3A4AD00770, 100
+//
+//  Denominator of PKEY_GPS_Track
+DEFINE_PROPERTYKEY(PKEY_GPS_TrackDenominator, 0xC8D1920C, 0x01F6, 0x40C0, 0xAC, 0x86, 0x2F, 0x3A, 0x4A, 0xD0, 0x07, 0x70, 100);
+
+//  Name:     System.GPS.TrackNumerator -- PKEY_GPS_TrackNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 702926F4-44A6-43E1-AE71-45627116893B, 100
+//
+//  Numerator of PKEY_GPS_Track
+DEFINE_PROPERTYKEY(PKEY_GPS_TrackNumerator, 0x702926F4, 0x44A6, 0x43E1, 0xAE, 0x71, 0x45, 0x62, 0x71, 0x16, 0x89, 0x3B, 100);
+
+//  Name:     System.GPS.TrackRef -- PKEY_GPS_TrackRef
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 35DBE6FE-44C3-4400-AAAE-D2C799C407E8, 100
+//
+//  Indicates reference for the direction of the GPS receiver movement.  (eg: true direction, magnetic direction)
+DEFINE_PROPERTYKEY(PKEY_GPS_TrackRef, 0x35DBE6FE, 0x44C3, 0x4400, 0xAA, 0xAE, 0xD2, 0xC7, 0x99, 0xC4, 0x07, 0xE8, 100);
+
+//  Name:     System.GPS.VersionID -- PKEY_GPS_VersionID
+//  Type:     Buffer -- VT_VECTOR | VT_UI1  (For variants: VT_ARRAY | VT_UI1)
+//  FormatID: 22704DA4-C6B2-4A99-8E56-F16DF8C92599, 100
+//
+//  Indicates the version of the GPS information
+DEFINE_PROPERTYKEY(PKEY_GPS_VersionID, 0x22704DA4, 0xC6B2, 0x4A99, 0x8E, 0x56, 0xF1, 0x6D, 0xF8, 0xC9, 0x25, 0x99, 100);
+ 
+//-----------------------------------------------------------------------------
+// Image properties
+
+
+
+//  Name:     System.Image.BitDepth -- PKEY_Image_BitDepth
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 7 (PIDISI_BITDEPTH)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Image_BitDepth, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 7);
+
+//  Name:     System.Image.ColorSpace -- PKEY_Image_ColorSpace
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 40961
+//
+//  PropertyTagExifColorSpace
+DEFINE_PROPERTYKEY(PKEY_Image_ColorSpace, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 40961);
+
+// Possible discrete values for PKEY_Image_ColorSpace are:
+#define IMAGE_COLORSPACE_SRGB               1u
+#define IMAGE_COLORSPACE_UNCALIBRATED       0xFFFFu
+
+//  Name:     System.Image.CompressedBitsPerPixel -- PKEY_Image_CompressedBitsPerPixel
+//  Type:     Double -- VT_R8
+//  FormatID: 364B6FA9-37AB-482A-BE2B-AE02F60D4318, 100
+//
+//  Calculated from PKEY_Image_CompressedBitsPerPixelNumerator and PKEY_Image_CompressedBitsPerPixelDenominator.
+DEFINE_PROPERTYKEY(PKEY_Image_CompressedBitsPerPixel, 0x364B6FA9, 0x37AB, 0x482A, 0xBE, 0x2B, 0xAE, 0x02, 0xF6, 0x0D, 0x43, 0x18, 100);
+
+//  Name:     System.Image.CompressedBitsPerPixelDenominator -- PKEY_Image_CompressedBitsPerPixelDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 1F8844E1-24AD-4508-9DFD-5326A415CE02, 100
+//
+//  Denominator of PKEY_Image_CompressedBitsPerPixel.
+DEFINE_PROPERTYKEY(PKEY_Image_CompressedBitsPerPixelDenominator, 0x1F8844E1, 0x24AD, 0x4508, 0x9D, 0xFD, 0x53, 0x26, 0xA4, 0x15, 0xCE, 0x02, 100);
+
+//  Name:     System.Image.CompressedBitsPerPixelNumerator -- PKEY_Image_CompressedBitsPerPixelNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: D21A7148-D32C-4624-8900-277210F79C0F, 100
+//
+//  Numerator of PKEY_Image_CompressedBitsPerPixel.
+DEFINE_PROPERTYKEY(PKEY_Image_CompressedBitsPerPixelNumerator, 0xD21A7148, 0xD32C, 0x4624, 0x89, 0x00, 0x27, 0x72, 0x10, 0xF7, 0x9C, 0x0F, 100);
+
+//  Name:     System.Image.Compression -- PKEY_Image_Compression
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 259
+//
+//  Indicates the image compression level.  PropertyTagCompression.
+DEFINE_PROPERTYKEY(PKEY_Image_Compression, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 259);
+
+// Possible discrete values for PKEY_Image_Compression are:
+#define IMAGE_COMPRESSION_UNCOMPRESSED      1u
+#define IMAGE_COMPRESSION_CCITT_T3          2u
+#define IMAGE_COMPRESSION_CCITT_T4          3u
+#define IMAGE_COMPRESSION_CCITT_T6          4u
+#define IMAGE_COMPRESSION_LZW               5u
+#define IMAGE_COMPRESSION_JPEG              6u
+#define IMAGE_COMPRESSION_PACKBITS          32773u
+
+//  Name:     System.Image.CompressionText -- PKEY_Image_CompressionText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 3F08E66F-2F44-4BB9-A682-AC35D2562322, 100
+//  
+//  This is the user-friendly form of System.Image.Compression.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Image_CompressionText, 0x3F08E66F, 0x2F44, 0x4BB9, 0xA6, 0x82, 0xAC, 0x35, 0xD2, 0x56, 0x23, 0x22, 100);
+
+//  Name:     System.Image.Dimensions -- PKEY_Image_Dimensions
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 13 (PIDISI_DIMENSIONS)
+//
+//  Indicates the dimensions of the image.
+DEFINE_PROPERTYKEY(PKEY_Image_Dimensions, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 13);
+
+//  Name:     System.Image.HorizontalResolution -- PKEY_Image_HorizontalResolution
+//  Type:     Double -- VT_R8
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 5 (PIDISI_RESOLUTIONX)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Image_HorizontalResolution, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 5);
+
+//  Name:     System.Image.HorizontalSize -- PKEY_Image_HorizontalSize
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 3 (PIDISI_CX)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Image_HorizontalSize, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 3);
+
+//  Name:     System.Image.ImageID -- PKEY_Image_ImageID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 10DABE05-32AA-4C29-BF1A-63E2D220587F, 100
+DEFINE_PROPERTYKEY(PKEY_Image_ImageID, 0x10DABE05, 0x32AA, 0x4C29, 0xBF, 0x1A, 0x63, 0xE2, 0xD2, 0x20, 0x58, 0x7F, 100);
+
+//  Name:     System.Image.ResolutionUnit -- PKEY_Image_ResolutionUnit
+//  Type:     Int16 -- VT_I2
+//  FormatID: 19B51FA6-1F92-4A5C-AB48-7DF0ABD67444, 100
+DEFINE_PROPERTYKEY(PKEY_Image_ResolutionUnit, 0x19B51FA6, 0x1F92, 0x4A5C, 0xAB, 0x48, 0x7D, 0xF0, 0xAB, 0xD6, 0x74, 0x44, 100);
+
+//  Name:     System.Image.VerticalResolution -- PKEY_Image_VerticalResolution
+//  Type:     Double -- VT_R8
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 6 (PIDISI_RESOLUTIONY)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Image_VerticalResolution, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 6);
+
+//  Name:     System.Image.VerticalSize -- PKEY_Image_VerticalSize
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 4 (PIDISI_CY)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Image_VerticalSize, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 4);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// Journal properties
+
+//  Name:     System.Journal.Contacts -- PKEY_Journal_Contacts
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: DEA7C82C-1D89-4A66-9427-A4E3DEBABCB1, 100
+DEFINE_PROPERTYKEY(PKEY_Journal_Contacts, 0xDEA7C82C, 0x1D89, 0x4A66, 0x94, 0x27, 0xA4, 0xE3, 0xDE, 0xBA, 0xBC, 0xB1, 100);
+
+//  Name:     System.Journal.EntryType -- PKEY_Journal_EntryType
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 95BEB1FC-326D-4644-B396-CD3ED90E6DDF, 100
+DEFINE_PROPERTYKEY(PKEY_Journal_EntryType, 0x95BEB1FC, 0x326D, 0x4644, 0xB3, 0x96, 0xCD, 0x3E, 0xD9, 0x0E, 0x6D, 0xDF, 100);
+ 
+//-----------------------------------------------------------------------------
+// Link properties
+
+
+
+//  Name:     System.Link.Comment -- PKEY_Link_Comment
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_LINK) B9B4B3FC-2B51-4A42-B5D8-324146AFCF25, 5
+DEFINE_PROPERTYKEY(PKEY_Link_Comment, 0xB9B4B3FC, 0x2B51, 0x4A42, 0xB5, 0xD8, 0x32, 0x41, 0x46, 0xAF, 0xCF, 0x25, 5);
+
+//  Name:     System.Link.DateVisited -- PKEY_Link_DateVisited
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 5CBF2787-48CF-4208-B90E-EE5E5D420294, 23  (PKEYs relating to URLs.  Used by IE History.)
+DEFINE_PROPERTYKEY(PKEY_Link_DateVisited, 0x5CBF2787, 0x48CF, 0x4208, 0xB9, 0x0E, 0xEE, 0x5E, 0x5D, 0x42, 0x02, 0x94, 23);
+
+//  Name:     System.Link.Description -- PKEY_Link_Description
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 5CBF2787-48CF-4208-B90E-EE5E5D420294, 21  (PKEYs relating to URLs.  Used by IE History.)
+DEFINE_PROPERTYKEY(PKEY_Link_Description, 0x5CBF2787, 0x48CF, 0x4208, 0xB9, 0x0E, 0xEE, 0x5E, 0x5D, 0x42, 0x02, 0x94, 21);
+
+//  Name:     System.Link.Status -- PKEY_Link_Status
+//  Type:     Int32 -- VT_I4
+//  FormatID: (PSGUID_LINK) B9B4B3FC-2B51-4A42-B5D8-324146AFCF25, 3 (PID_LINK_TARGET_TYPE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Link_Status, 0xB9B4B3FC, 0x2B51, 0x4A42, 0xB5, 0xD8, 0x32, 0x41, 0x46, 0xAF, 0xCF, 0x25, 3);
+
+// Possible discrete values for PKEY_Link_Status are:
+#define LINK_STATUS_RESOLVED                1l
+#define LINK_STATUS_BROKEN                  2l
+
+//  Name:     System.Link.TargetExtension -- PKEY_Link_TargetExtension
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: 7A7D76F4-B630-4BD7-95FF-37CC51A975C9, 2
+//
+//  The file extension of the link target.  See System.File.Extension
+DEFINE_PROPERTYKEY(PKEY_Link_TargetExtension, 0x7A7D76F4, 0xB630, 0x4BD7, 0x95, 0xFF, 0x37, 0xCC, 0x51, 0xA9, 0x75, 0xC9, 2);
+
+//  Name:     System.Link.TargetParsingPath -- PKEY_Link_TargetParsingPath
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_LINK) B9B4B3FC-2B51-4A42-B5D8-324146AFCF25, 2 (PID_LINK_TARGET)
+//  
+//  This is the shell namespace path to the target of the link item.  This path may be passed to 
+//  SHParseDisplayName to parse the path to the correct shell folder.
+//  
+//  If the target item is a file, the value is identical to System.ItemPathDisplay.
+//  
+//  If the target item cannot be accessed through the shell namespace, this value is VT_EMPTY.
+DEFINE_PROPERTYKEY(PKEY_Link_TargetParsingPath, 0xB9B4B3FC, 0x2B51, 0x4A42, 0xB5, 0xD8, 0x32, 0x41, 0x46, 0xAF, 0xCF, 0x25, 2);
+
+//  Name:     System.Link.TargetSFGAOFlags -- PKEY_Link_TargetSFGAOFlags
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_LINK) B9B4B3FC-2B51-4A42-B5D8-324146AFCF25, 8
+//  
+//  IShellFolder::GetAttributesOf flags for the target of a link, with SFGAO_PKEYSFGAOMASK 
+//  attributes masked out.
+DEFINE_PROPERTYKEY(PKEY_Link_TargetSFGAOFlags, 0xB9B4B3FC, 0x2B51, 0x4A42, 0xB5, 0xD8, 0x32, 0x41, 0x46, 0xAF, 0xCF, 0x25, 8);
+ 
+//-----------------------------------------------------------------------------
+// Media properties
+
+
+
+//  Name:     System.Media.AuthorUrl -- PKEY_Media_AuthorUrl
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 32 (PIDMSI_AUTHOR_URL)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_AuthorUrl, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 32);
+
+//  Name:     System.Media.AverageLevel -- PKEY_Media_AverageLevel
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 09EDD5B6-B301-43C5-9990-D00302EFFD46, 100
+DEFINE_PROPERTYKEY(PKEY_Media_AverageLevel, 0x09EDD5B6, 0xB301, 0x43C5, 0x99, 0x90, 0xD0, 0x03, 0x02, 0xEF, 0xFD, 0x46, 100);
+
+//  Name:     System.Media.ClassPrimaryID -- PKEY_Media_ClassPrimaryID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 13 (PIDMSI_CLASS_PRIMARY_ID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_ClassPrimaryID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 13);
+
+//  Name:     System.Media.ClassSecondaryID -- PKEY_Media_ClassSecondaryID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 14 (PIDMSI_CLASS_SECONDARY_ID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_ClassSecondaryID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 14);
+
+//  Name:     System.Media.CollectionGroupID -- PKEY_Media_CollectionGroupID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 24 (PIDMSI_COLLECTION_GROUP_ID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_CollectionGroupID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 24);
+
+//  Name:     System.Media.CollectionID -- PKEY_Media_CollectionID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 25 (PIDMSI_COLLECTION_ID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_CollectionID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 25);
+
+//  Name:     System.Media.ContentDistributor -- PKEY_Media_ContentDistributor
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 18 (PIDMSI_CONTENTDISTRIBUTOR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_ContentDistributor, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 18);
+
+//  Name:     System.Media.ContentID -- PKEY_Media_ContentID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 26 (PIDMSI_CONTENT_ID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_ContentID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 26);
+
+//  Name:     System.Media.CreatorApplication -- PKEY_Media_CreatorApplication
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 27 (PIDMSI_TOOL_NAME)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_CreatorApplication, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 27);
+
+//  Name:     System.Media.CreatorApplicationVersion -- PKEY_Media_CreatorApplicationVersion
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 28 (PIDMSI_TOOL_VERSION)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_CreatorApplicationVersion, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 28);
+
+//  Name:     System.Media.DateEncoded -- PKEY_Media_DateEncoded
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 2E4B640D-5019-46D8-8881-55414CC5CAA0, 100
+//
+//  DateTime is in UTC (in the doc, not file system).
+DEFINE_PROPERTYKEY(PKEY_Media_DateEncoded, 0x2E4B640D, 0x5019, 0x46D8, 0x88, 0x81, 0x55, 0x41, 0x4C, 0xC5, 0xCA, 0xA0, 100);
+
+//  Name:     System.Media.DateReleased -- PKEY_Media_DateReleased
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DE41CC29-6971-4290-B472-F59F2E2F31E2, 100
+DEFINE_PROPERTYKEY(PKEY_Media_DateReleased, 0xDE41CC29, 0x6971, 0x4290, 0xB4, 0x72, 0xF5, 0x9F, 0x2E, 0x2F, 0x31, 0xE2, 100);
+
+//  Name:     System.Media.Duration -- PKEY_Media_Duration
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: (FMTID_AudioSummaryInformation) 64440490-4C8B-11D1-8B70-080036B11A03, 3 (PIDASI_TIMELENGTH)
+//
+//  100ns units, not milliseconds
+DEFINE_PROPERTYKEY(PKEY_Media_Duration, 0x64440490, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 3);
+
+//  Name:     System.Media.DVDID -- PKEY_Media_DVDID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 15 (PIDMSI_DVDID)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_DVDID, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 15);
+
+//  Name:     System.Media.EncodedBy -- PKEY_Media_EncodedBy
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 36 (PIDMSI_ENCODED_BY)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_EncodedBy, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 36);
+
+//  Name:     System.Media.EncodingSettings -- PKEY_Media_EncodingSettings
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 37 (PIDMSI_ENCODING_SETTINGS)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_EncodingSettings, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 37);
+
+//  Name:     System.Media.FrameCount -- PKEY_Media_FrameCount
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (PSGUID_IMAGESUMMARYINFORMATION) 6444048F-4C8B-11D1-8B70-080036B11A03, 12 (PIDISI_FRAMECOUNT)
+//
+//  Indicates the frame count for the image.
+DEFINE_PROPERTYKEY(PKEY_Media_FrameCount, 0x6444048F, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 12);
+
+//  Name:     System.Media.MCDI -- PKEY_Media_MCDI
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 16 (PIDMSI_MCDI)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_MCDI, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 16);
+
+//  Name:     System.Media.MetadataContentProvider -- PKEY_Media_MetadataContentProvider
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 17 (PIDMSI_PROVIDER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_MetadataContentProvider, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 17);
+
+//  Name:     System.Media.Producer -- PKEY_Media_Producer
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 22 (PIDMSI_PRODUCER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_Producer, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 22);
+
+//  Name:     System.Media.PromotionUrl -- PKEY_Media_PromotionUrl
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 33 (PIDMSI_PROMOTION_URL)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_PromotionUrl, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 33);
+
+//  Name:     System.Media.ProtectionType -- PKEY_Media_ProtectionType
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 38
+//  
+//  If media is protected, how is it protected?
+DEFINE_PROPERTYKEY(PKEY_Media_ProtectionType, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 38);
+
+//  Name:     System.Media.ProviderRating -- PKEY_Media_ProviderRating
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 39
+//  
+//  Rating (0 - 99) supplied by metadata provider
+DEFINE_PROPERTYKEY(PKEY_Media_ProviderRating, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 39);
+
+//  Name:     System.Media.ProviderStyle -- PKEY_Media_ProviderStyle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 40
+//  
+//  Style of music or video, supplied by metadata provider
+DEFINE_PROPERTYKEY(PKEY_Media_ProviderStyle, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 40);
+
+//  Name:     System.Media.Publisher -- PKEY_Media_Publisher
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 30 (PIDMSI_PUBLISHER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_Publisher, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 30);
+
+//  Name:     System.Media.SubscriptionContentId -- PKEY_Media_SubscriptionContentId
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 9AEBAE7A-9644-487D-A92C-657585ED751A, 100
+DEFINE_PROPERTYKEY(PKEY_Media_SubscriptionContentId, 0x9AEBAE7A, 0x9644, 0x487D, 0xA9, 0x2C, 0x65, 0x75, 0x85, 0xED, 0x75, 0x1A, 100);
+
+//  Name:     System.Media.SubTitle -- PKEY_Media_SubTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 38 (PIDSI_MUSIC_SUB_TITLE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_SubTitle, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 38);
+
+//  Name:     System.Media.UniqueFileIdentifier -- PKEY_Media_UniqueFileIdentifier
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 35 (PIDMSI_UNIQUE_FILE_IDENTIFIER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_UniqueFileIdentifier, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 35);
+
+//  Name:     System.Media.UserNoAutoInfo -- PKEY_Media_UserNoAutoInfo
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 41
+//  
+//  If true, do NOT alter this file's metadata. Set by user.
+DEFINE_PROPERTYKEY(PKEY_Media_UserNoAutoInfo, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 41);
+
+//  Name:     System.Media.UserWebUrl -- PKEY_Media_UserWebUrl
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 34 (PIDMSI_USER_WEB_URL)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_UserWebUrl, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 34);
+
+//  Name:     System.Media.Writer -- PKEY_Media_Writer
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 23 (PIDMSI_WRITER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_Writer, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 23);
+
+//  Name:     System.Media.Year -- PKEY_Media_Year
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 5 (PIDSI_MUSIC_YEAR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Media_Year, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 5);
+ 
+//-----------------------------------------------------------------------------
+// Message properties
+
+
+
+//  Name:     System.Message.AttachmentContents -- PKEY_Message_AttachmentContents
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 3143BF7C-80A8-4854-8880-E2E40189BDD0, 100
+DEFINE_PROPERTYKEY(PKEY_Message_AttachmentContents, 0x3143BF7C, 0x80A8, 0x4854, 0x88, 0x80, 0xE2, 0xE4, 0x01, 0x89, 0xBD, 0xD0, 100);
+
+//  Name:     System.Message.AttachmentNames -- PKEY_Message_AttachmentNames
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 21
+//
+//  The names of the attachments in a message
+DEFINE_PROPERTYKEY(PKEY_Message_AttachmentNames, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 21);
+
+//  Name:     System.Message.BccAddress -- PKEY_Message_BccAddress
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 2
+//
+//  Addresses in Bcc: field
+DEFINE_PROPERTYKEY(PKEY_Message_BccAddress, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 2);
+
+//  Name:     System.Message.BccName -- PKEY_Message_BccName
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 3
+//
+//  person names in Bcc: field
+DEFINE_PROPERTYKEY(PKEY_Message_BccName, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 3);
+
+//  Name:     System.Message.CcAddress -- PKEY_Message_CcAddress
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 4
+//
+//  Addresses in Cc: field
+DEFINE_PROPERTYKEY(PKEY_Message_CcAddress, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 4);
+
+//  Name:     System.Message.CcName -- PKEY_Message_CcName
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 5
+//
+//  person names in Cc: field
+DEFINE_PROPERTYKEY(PKEY_Message_CcName, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 5);
+
+//  Name:     System.Message.ConversationID -- PKEY_Message_ConversationID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: DC8F80BD-AF1E-4289-85B6-3DFC1B493992, 100
+DEFINE_PROPERTYKEY(PKEY_Message_ConversationID, 0xDC8F80BD, 0xAF1E, 0x4289, 0x85, 0xB6, 0x3D, 0xFC, 0x1B, 0x49, 0x39, 0x92, 100);
+
+//  Name:     System.Message.ConversationIndex -- PKEY_Message_ConversationIndex
+//  Type:     Buffer -- VT_VECTOR | VT_UI1  (For variants: VT_ARRAY | VT_UI1)
+//  FormatID: DC8F80BD-AF1E-4289-85B6-3DFC1B493992, 101
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Message_ConversationIndex, 0xDC8F80BD, 0xAF1E, 0x4289, 0x85, 0xB6, 0x3D, 0xFC, 0x1B, 0x49, 0x39, 0x92, 101);
+
+//  Name:     System.Message.DateReceived -- PKEY_Message_DateReceived
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 20
+//
+//  Date and Time communication was received
+DEFINE_PROPERTYKEY(PKEY_Message_DateReceived, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 20);
+
+//  Name:     System.Message.DateSent -- PKEY_Message_DateSent
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 19
+//
+//  Date and Time communication was sent
+DEFINE_PROPERTYKEY(PKEY_Message_DateSent, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 19);
+
+//  Name:     System.Message.FromAddress -- PKEY_Message_FromAddress
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 13
+DEFINE_PROPERTYKEY(PKEY_Message_FromAddress, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 13);
+
+//  Name:     System.Message.FromName -- PKEY_Message_FromName
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 14
+//
+//  Address in from field as person name
+DEFINE_PROPERTYKEY(PKEY_Message_FromName, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 14);
+
+//  Name:     System.Message.HasAttachments -- PKEY_Message_HasAttachments
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 9C1FCF74-2D97-41BA-B4AE-CB2E3661A6E4, 8
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Message_HasAttachments, 0x9C1FCF74, 0x2D97, 0x41BA, 0xB4, 0xAE, 0xCB, 0x2E, 0x36, 0x61, 0xA6, 0xE4, 8);
+
+//  Name:     System.Message.IsFwdOrReply -- PKEY_Message_IsFwdOrReply
+//  Type:     Int32 -- VT_I4
+//  FormatID: 9A9BC088-4F6D-469E-9919-E705412040F9, 100
+DEFINE_PROPERTYKEY(PKEY_Message_IsFwdOrReply, 0x9A9BC088, 0x4F6D, 0x469E, 0x99, 0x19, 0xE7, 0x05, 0x41, 0x20, 0x40, 0xF9, 100);
+
+//  Name:     System.Message.MessageClass -- PKEY_Message_MessageClass
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CD9ED458-08CE-418F-A70E-F912C7BB9C5C, 103
+//  
+//  What type of outlook msg this is (meeting, task, mail, etc.)
+DEFINE_PROPERTYKEY(PKEY_Message_MessageClass, 0xCD9ED458, 0x08CE, 0x418F, 0xA7, 0x0E, 0xF9, 0x12, 0xC7, 0xBB, 0x9C, 0x5C, 103);
+
+//  Name:     System.Message.SenderAddress -- PKEY_Message_SenderAddress
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 0BE1C8E7-1981-4676-AE14-FDD78F05A6E7, 100
+DEFINE_PROPERTYKEY(PKEY_Message_SenderAddress, 0x0BE1C8E7, 0x1981, 0x4676, 0xAE, 0x14, 0xFD, 0xD7, 0x8F, 0x05, 0xA6, 0xE7, 100);
+
+//  Name:     System.Message.SenderName -- PKEY_Message_SenderName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 0DA41CFA-D224-4A18-AE2F-596158DB4B3A, 100
+DEFINE_PROPERTYKEY(PKEY_Message_SenderName, 0x0DA41CFA, 0xD224, 0x4A18, 0xAE, 0x2F, 0x59, 0x61, 0x58, 0xDB, 0x4B, 0x3A, 100);
+
+//  Name:     System.Message.Store -- PKEY_Message_Store
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 15
+//
+//  The store (aka protocol handler) FILE, MAIL, OUTLOOKEXPRESS
+DEFINE_PROPERTYKEY(PKEY_Message_Store, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 15);
+
+//  Name:     System.Message.ToAddress -- PKEY_Message_ToAddress
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 16
+//
+//  Addresses in To: field
+DEFINE_PROPERTYKEY(PKEY_Message_ToAddress, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 16);
+
+//  Name:     System.Message.ToDoTitle -- PKEY_Message_ToDoTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: BCCC8A3C-8CEF-42E5-9B1C-C69079398BC7, 100
+DEFINE_PROPERTYKEY(PKEY_Message_ToDoTitle, 0xBCCC8A3C, 0x8CEF, 0x42E5, 0x9B, 0x1C, 0xC6, 0x90, 0x79, 0x39, 0x8B, 0xC7, 100);
+
+//  Name:     System.Message.ToName -- PKEY_Message_ToName
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD, 17
+//
+//  Person names in To: field
+DEFINE_PROPERTYKEY(PKEY_Message_ToName, 0xE3E0584C, 0xB788, 0x4A5A, 0xBB, 0x20, 0x7F, 0x5A, 0x44, 0xC9, 0xAC, 0xDD, 17);
+ 
+//-----------------------------------------------------------------------------
+// Music properties
+
+//  Name:     System.Music.AlbumArtist -- PKEY_Music_AlbumArtist
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 13 (PIDSI_MUSIC_ALBUM_ARTIST)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_AlbumArtist, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 13);
+
+//  Name:     System.Music.AlbumTitle -- PKEY_Music_AlbumTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 4 (PIDSI_MUSIC_ALBUM)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_AlbumTitle, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 4);
+
+//  Name:     System.Music.Artist -- PKEY_Music_Artist
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 2 (PIDSI_MUSIC_ARTIST)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Artist, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 2);
+
+//  Name:     System.Music.BeatsPerMinute -- PKEY_Music_BeatsPerMinute
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 35 (PIDSI_MUSIC_BEATS_PER_MINUTE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_BeatsPerMinute, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 35);
+
+//  Name:     System.Music.Composer -- PKEY_Music_Composer
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 19 (PIDMSI_COMPOSER)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Composer, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 19);
+
+//  Name:     System.Music.Conductor -- PKEY_Music_Conductor
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 36 (PIDSI_MUSIC_CONDUCTOR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Conductor, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 36);
+
+//  Name:     System.Music.ContentGroupDescription -- PKEY_Music_ContentGroupDescription
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 33 (PIDSI_MUSIC_CONTENT_GROUP_DESCRIPTION)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_ContentGroupDescription, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 33);
+
+//  Name:     System.Music.Genre -- PKEY_Music_Genre
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 11 (PIDSI_MUSIC_GENRE)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Genre, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 11);
+
+//  Name:     System.Music.InitialKey -- PKEY_Music_InitialKey
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 34 (PIDSI_MUSIC_INITIAL_KEY)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_InitialKey, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 34);
+
+//  Name:     System.Music.Lyrics -- PKEY_Music_Lyrics
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 12 (PIDSI_MUSIC_LYRICS)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Lyrics, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 12);
+
+//  Name:     System.Music.Mood -- PKEY_Music_Mood
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 39 (PIDSI_MUSIC_MOOD)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Mood, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 39);
+
+//  Name:     System.Music.PartOfSet -- PKEY_Music_PartOfSet
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 37 (PIDSI_MUSIC_PART_OF_SET)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_PartOfSet, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 37);
+
+//  Name:     System.Music.Period -- PKEY_Music_Period
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 31 (PIDMSI_PERIOD)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_Period, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 31);
+
+//  Name:     System.Music.SynchronizedLyrics -- PKEY_Music_SynchronizedLyrics
+//  Type:     Blob -- VT_BLOB
+//  FormatID: 6B223B6A-162E-4AA9-B39F-05D678FC6D77, 100
+DEFINE_PROPERTYKEY(PKEY_Music_SynchronizedLyrics, 0x6B223B6A, 0x162E, 0x4AA9, 0xB3, 0x9F, 0x05, 0xD6, 0x78, 0xFC, 0x6D, 0x77, 100);
+
+//  Name:     System.Music.TrackNumber -- PKEY_Music_TrackNumber
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_MUSIC) 56A3372E-CE9C-11D2-9F0E-006097C686F6, 7 (PIDSI_MUSIC_TRACK)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Music_TrackNumber, 0x56A3372E, 0xCE9C, 0x11D2, 0x9F, 0x0E, 0x00, 0x60, 0x97, 0xC6, 0x86, 0xF6, 7);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// Note properties
+
+//  Name:     System.Note.Color -- PKEY_Note_Color
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: 4776CAFA-BCE4-4CB1-A23E-265E76D8EB11, 100
+DEFINE_PROPERTYKEY(PKEY_Note_Color, 0x4776CAFA, 0xBCE4, 0x4CB1, 0xA2, 0x3E, 0x26, 0x5E, 0x76, 0xD8, 0xEB, 0x11, 100);
+
+// Possible discrete values for PKEY_Note_Color are:
+#define NOTE_COLOR_BLUE                     0u
+#define NOTE_COLOR_GREEN                    1u
+#define NOTE_COLOR_PINK                     2u
+#define NOTE_COLOR_YELLOW                   3u
+#define NOTE_COLOR_WHITE                    4u
+#define NOTE_COLOR_LIGHTGREEN               5u
+
+//  Name:     System.Note.ColorText -- PKEY_Note_ColorText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 46B4E8DE-CDB2-440D-885C-1658EB65B914, 100
+//  
+//  This is the user-friendly form of System.Note.Color.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Note_ColorText, 0x46B4E8DE, 0xCDB2, 0x440D, 0x88, 0x5C, 0x16, 0x58, 0xEB, 0x65, 0xB9, 0x14, 100);
+ 
+//-----------------------------------------------------------------------------
+// Photo properties
+
+
+
+//  Name:     System.Photo.Aperture -- PKEY_Photo_Aperture
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37378
+//
+//  PropertyTagExifAperture.  Calculated from PKEY_Photo_ApertureNumerator and PKEY_Photo_ApertureDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_Aperture, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37378);
+
+//  Name:     System.Photo.ApertureDenominator -- PKEY_Photo_ApertureDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: E1A9A38B-6685-46BD-875E-570DC7AD7320, 100
+//
+//  Denominator of PKEY_Photo_Aperture
+DEFINE_PROPERTYKEY(PKEY_Photo_ApertureDenominator, 0xE1A9A38B, 0x6685, 0x46BD, 0x87, 0x5E, 0x57, 0x0D, 0xC7, 0xAD, 0x73, 0x20, 100);
+
+//  Name:     System.Photo.ApertureNumerator -- PKEY_Photo_ApertureNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 0337ECEC-39FB-4581-A0BD-4C4CC51E9914, 100
+//
+//  Numerator of PKEY_Photo_Aperture
+DEFINE_PROPERTYKEY(PKEY_Photo_ApertureNumerator, 0x0337ECEC, 0x39FB, 0x4581, 0xA0, 0xBD, 0x4C, 0x4C, 0xC5, 0x1E, 0x99, 0x14, 100);
+
+//  Name:     System.Photo.Brightness -- PKEY_Photo_Brightness
+//  Type:     Double -- VT_R8
+//  FormatID: 1A701BF6-478C-4361-83AB-3701BB053C58, 100 (PropertyTagExifBrightness)
+//  
+//  This is the brightness of the photo.
+//  
+//  Calculated from PKEY_Photo_BrightnessNumerator and PKEY_Photo_BrightnessDenominator.
+//  
+//  The units are "APEX", normally in the range of -99.99 to 99.99. If the numerator of 
+//  the recorded value is FFFFFFFF.H, "Unknown" should be indicated.
+DEFINE_PROPERTYKEY(PKEY_Photo_Brightness, 0x1A701BF6, 0x478C, 0x4361, 0x83, 0xAB, 0x37, 0x01, 0xBB, 0x05, 0x3C, 0x58, 100);
+
+//  Name:     System.Photo.BrightnessDenominator -- PKEY_Photo_BrightnessDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 6EBE6946-2321-440A-90F0-C043EFD32476, 100
+//
+//  Denominator of PKEY_Photo_Brightness
+DEFINE_PROPERTYKEY(PKEY_Photo_BrightnessDenominator, 0x6EBE6946, 0x2321, 0x440A, 0x90, 0xF0, 0xC0, 0x43, 0xEF, 0xD3, 0x24, 0x76, 100);
+
+//  Name:     System.Photo.BrightnessNumerator -- PKEY_Photo_BrightnessNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 9E7D118F-B314-45A0-8CFB-D654B917C9E9, 100
+//
+//  Numerator of PKEY_Photo_Brightness
+DEFINE_PROPERTYKEY(PKEY_Photo_BrightnessNumerator, 0x9E7D118F, 0xB314, 0x45A0, 0x8C, 0xFB, 0xD6, 0x54, 0xB9, 0x17, 0xC9, 0xE9, 100);
+
+//  Name:     System.Photo.CameraManufacturer -- PKEY_Photo_CameraManufacturer
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 271 (PropertyTagEquipMake)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Photo_CameraManufacturer, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 271);
+
+//  Name:     System.Photo.CameraModel -- PKEY_Photo_CameraModel
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 272 (PropertyTagEquipModel)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Photo_CameraModel, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 272);
+
+//  Name:     System.Photo.CameraSerialNumber -- PKEY_Photo_CameraSerialNumber
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 273
+//
+//  Serial number of camera that produced this photo
+DEFINE_PROPERTYKEY(PKEY_Photo_CameraSerialNumber, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 273);
+
+//  Name:     System.Photo.Contrast -- PKEY_Photo_Contrast
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 2A785BA9-8D23-4DED-82E6-60A350C86A10, 100
+//  
+//  This indicates the direction of contrast processing applied by the camera 
+//  when the image was shot.
+DEFINE_PROPERTYKEY(PKEY_Photo_Contrast, 0x2A785BA9, 0x8D23, 0x4DED, 0x82, 0xE6, 0x60, 0xA3, 0x50, 0xC8, 0x6A, 0x10, 100);
+
+// Possible discrete values for PKEY_Photo_Contrast are:
+#define PHOTO_CONTRAST_NORMAL               0ul
+#define PHOTO_CONTRAST_SOFT                 1ul
+#define PHOTO_CONTRAST_HARD                 2ul
+
+//  Name:     System.Photo.ContrastText -- PKEY_Photo_ContrastText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 59DDE9F2-5253-40EA-9A8B-479E96C6249A, 100
+//  
+//  This is the user-friendly form of System.Photo.Contrast.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_ContrastText, 0x59DDE9F2, 0x5253, 0x40EA, 0x9A, 0x8B, 0x47, 0x9E, 0x96, 0xC6, 0x24, 0x9A, 100);
+
+//  Name:     System.Photo.DateTaken -- PKEY_Photo_DateTaken
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 36867
+//
+//  PropertyTagExifDTOrig
+DEFINE_PROPERTYKEY(PKEY_Photo_DateTaken, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 36867);
+
+//  Name:     System.Photo.DigitalZoom -- PKEY_Photo_DigitalZoom
+//  Type:     Double -- VT_R8
+//  FormatID: F85BF840-A925-4BC2-B0C4-8E36B598679E, 100
+//
+//  PropertyTagExifDigitalZoom.  Calculated from PKEY_Photo_DigitalZoomNumerator and PKEY_Photo_DigitalZoomDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_DigitalZoom, 0xF85BF840, 0xA925, 0x4BC2, 0xB0, 0xC4, 0x8E, 0x36, 0xB5, 0x98, 0x67, 0x9E, 100);
+
+//  Name:     System.Photo.DigitalZoomDenominator -- PKEY_Photo_DigitalZoomDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 745BAF0E-E5C1-4CFB-8A1B-D031A0A52393, 100
+//
+//  Denominator of PKEY_Photo_DigitalZoom
+DEFINE_PROPERTYKEY(PKEY_Photo_DigitalZoomDenominator, 0x745BAF0E, 0xE5C1, 0x4CFB, 0x8A, 0x1B, 0xD0, 0x31, 0xA0, 0xA5, 0x23, 0x93, 100);
+
+//  Name:     System.Photo.DigitalZoomNumerator -- PKEY_Photo_DigitalZoomNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 16CBB924-6500-473B-A5BE-F1599BCBE413, 100
+//
+//  Numerator of PKEY_Photo_DigitalZoom
+DEFINE_PROPERTYKEY(PKEY_Photo_DigitalZoomNumerator, 0x16CBB924, 0x6500, 0x473B, 0xA5, 0xBE, 0xF1, 0x59, 0x9B, 0xCB, 0xE4, 0x13, 100);
+
+//  Name:     System.Photo.Event -- PKEY_Photo_Event
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 18248
+//
+//  The event at which the photo was taken
+DEFINE_PROPERTYKEY(PKEY_Photo_Event, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 18248);
+
+//  Name:     System.Photo.EXIFVersion -- PKEY_Photo_EXIFVersion
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D35F743A-EB2E-47F2-A286-844132CB1427, 100
+//
+//  The EXIF version.
+DEFINE_PROPERTYKEY(PKEY_Photo_EXIFVersion, 0xD35F743A, 0xEB2E, 0x47F2, 0xA2, 0x86, 0x84, 0x41, 0x32, 0xCB, 0x14, 0x27, 100);
+
+//  Name:     System.Photo.ExposureBias -- PKEY_Photo_ExposureBias
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37380
+//
+//  PropertyTagExifExposureBias.  Calculated from PKEY_Photo_ExposureBiasNumerator and PKEY_Photo_ExposureBiasDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureBias, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37380);
+
+//  Name:     System.Photo.ExposureBiasDenominator -- PKEY_Photo_ExposureBiasDenominator
+//  Type:     Int32 -- VT_I4
+//  FormatID: AB205E50-04B7-461C-A18C-2F233836E627, 100
+//
+//  Denominator of PKEY_Photo_ExposureBias
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureBiasDenominator, 0xAB205E50, 0x04B7, 0x461C, 0xA1, 0x8C, 0x2F, 0x23, 0x38, 0x36, 0xE6, 0x27, 100);
+
+//  Name:     System.Photo.ExposureBiasNumerator -- PKEY_Photo_ExposureBiasNumerator
+//  Type:     Int32 -- VT_I4
+//  FormatID: 738BF284-1D87-420B-92CF-5834BF6EF9ED, 100
+//
+//  Numerator of PKEY_Photo_ExposureBias
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureBiasNumerator, 0x738BF284, 0x1D87, 0x420B, 0x92, 0xCF, 0x58, 0x34, 0xBF, 0x6E, 0xF9, 0xED, 100);
+
+//  Name:     System.Photo.ExposureIndex -- PKEY_Photo_ExposureIndex
+//  Type:     Double -- VT_R8
+//  FormatID: 967B5AF8-995A-46ED-9E11-35B3C5B9782D, 100
+//
+//  PropertyTagExifExposureIndex.  Calculated from PKEY_Photo_ExposureIndexNumerator and PKEY_Photo_ExposureIndexDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureIndex, 0x967B5AF8, 0x995A, 0x46ED, 0x9E, 0x11, 0x35, 0xB3, 0xC5, 0xB9, 0x78, 0x2D, 100);
+
+//  Name:     System.Photo.ExposureIndexDenominator -- PKEY_Photo_ExposureIndexDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 93112F89-C28B-492F-8A9D-4BE2062CEE8A, 100
+//
+//  Denominator of PKEY_Photo_ExposureIndex
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureIndexDenominator, 0x93112F89, 0xC28B, 0x492F, 0x8A, 0x9D, 0x4B, 0xE2, 0x06, 0x2C, 0xEE, 0x8A, 100);
+
+//  Name:     System.Photo.ExposureIndexNumerator -- PKEY_Photo_ExposureIndexNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: CDEDCF30-8919-44DF-8F4C-4EB2FFDB8D89, 100
+//
+//  Numerator of PKEY_Photo_ExposureIndex
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureIndexNumerator, 0xCDEDCF30, 0x8919, 0x44DF, 0x8F, 0x4C, 0x4E, 0xB2, 0xFF, 0xDB, 0x8D, 0x89, 100);
+
+//  Name:     System.Photo.ExposureProgram -- PKEY_Photo_ExposureProgram
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 34850 (PropertyTagExifExposureProg)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureProgram, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 34850);
+
+// Possible discrete values for PKEY_Photo_ExposureProgram are:
+#define PHOTO_EXPOSUREPROGRAM_UNKNOWN       0ul
+#define PHOTO_EXPOSUREPROGRAM_MANUAL        1ul
+#define PHOTO_EXPOSUREPROGRAM_NORMAL        2ul
+#define PHOTO_EXPOSUREPROGRAM_APERTURE      3ul
+#define PHOTO_EXPOSUREPROGRAM_SHUTTER       4ul
+#define PHOTO_EXPOSUREPROGRAM_CREATIVE      5ul
+#define PHOTO_EXPOSUREPROGRAM_ACTION        6ul
+#define PHOTO_EXPOSUREPROGRAM_PORTRAIT      7ul
+#define PHOTO_EXPOSUREPROGRAM_LANDSCAPE     8ul
+
+//  Name:     System.Photo.ExposureProgramText -- PKEY_Photo_ExposureProgramText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: FEC690B7-5F30-4646-AE47-4CAAFBA884A3, 100
+//  
+//  This is the user-friendly form of System.Photo.ExposureProgram.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureProgramText, 0xFEC690B7, 0x5F30, 0x4646, 0xAE, 0x47, 0x4C, 0xAA, 0xFB, 0xA8, 0x84, 0xA3, 100);
+
+//  Name:     System.Photo.ExposureTime -- PKEY_Photo_ExposureTime
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 33434
+//
+//  PropertyTagExifExposureTime.  Calculated from  PKEY_Photo_ExposureTimeNumerator and PKEY_Photo_ExposureTimeDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureTime, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 33434);
+
+//  Name:     System.Photo.ExposureTimeDenominator -- PKEY_Photo_ExposureTimeDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 55E98597-AD16-42E0-B624-21599A199838, 100
+//
+//  Denominator of PKEY_Photo_ExposureTime
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureTimeDenominator, 0x55E98597, 0xAD16, 0x42E0, 0xB6, 0x24, 0x21, 0x59, 0x9A, 0x19, 0x98, 0x38, 100);
+
+//  Name:     System.Photo.ExposureTimeNumerator -- PKEY_Photo_ExposureTimeNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 257E44E2-9031-4323-AC38-85C552871B2E, 100
+//
+//  Numerator of PKEY_Photo_ExposureTime
+DEFINE_PROPERTYKEY(PKEY_Photo_ExposureTimeNumerator, 0x257E44E2, 0x9031, 0x4323, 0xAC, 0x38, 0x85, 0xC5, 0x52, 0x87, 0x1B, 0x2E, 100);
+
+//  Name:     System.Photo.Flash -- PKEY_Photo_Flash
+//  Type:     Byte -- VT_UI1
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37385
+//
+//  PropertyTagExifFlash
+DEFINE_PROPERTYKEY(PKEY_Photo_Flash, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37385);
+
+// Possible discrete values for PKEY_Photo_Flash are:
+#define PHOTO_FLASH_NONE                    0
+#define PHOTO_FLASH_FLASH                   1
+#define PHOTO_FLASH_WITHOUTSTROBE           5
+#define PHOTO_FLASH_WITHSTROBE              7
+
+//  Name:     System.Photo.FlashEnergy -- PKEY_Photo_FlashEnergy
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 41483
+//
+//  PropertyTagExifFlashEnergy.  Calculated from PKEY_Photo_FlashEnergyNumerator and PKEY_Photo_FlashEnergyDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashEnergy, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 41483);
+
+//  Name:     System.Photo.FlashEnergyDenominator -- PKEY_Photo_FlashEnergyDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: D7B61C70-6323-49CD-A5FC-C84277162C97, 100
+//
+//  Denominator of PKEY_Photo_FlashEnergy
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashEnergyDenominator, 0xD7B61C70, 0x6323, 0x49CD, 0xA5, 0xFC, 0xC8, 0x42, 0x77, 0x16, 0x2C, 0x97, 100);
+
+//  Name:     System.Photo.FlashEnergyNumerator -- PKEY_Photo_FlashEnergyNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: FCAD3D3D-0858-400F-AAA3-2F66CCE2A6BC, 100
+//
+//  Numerator of PKEY_Photo_FlashEnergy
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashEnergyNumerator, 0xFCAD3D3D, 0x0858, 0x400F, 0xAA, 0xA3, 0x2F, 0x66, 0xCC, 0xE2, 0xA6, 0xBC, 100);
+
+//  Name:     System.Photo.FlashManufacturer -- PKEY_Photo_FlashManufacturer
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: AABAF6C9-E0C5-4719-8585-57B103E584FE, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashManufacturer, 0xAABAF6C9, 0xE0C5, 0x4719, 0x85, 0x85, 0x57, 0xB1, 0x03, 0xE5, 0x84, 0xFE, 100);
+
+//  Name:     System.Photo.FlashModel -- PKEY_Photo_FlashModel
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: FE83BB35-4D1A-42E2-916B-06F3E1AF719E, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashModel, 0xFE83BB35, 0x4D1A, 0x42E2, 0x91, 0x6B, 0x06, 0xF3, 0xE1, 0xAF, 0x71, 0x9E, 100);
+
+//  Name:     System.Photo.FlashText -- PKEY_Photo_FlashText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6B8B68F6-200B-47EA-8D25-D8050F57339F, 100
+//  
+//  This is the user-friendly form of System.Photo.Flash.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_FlashText, 0x6B8B68F6, 0x200B, 0x47EA, 0x8D, 0x25, 0xD8, 0x05, 0x0F, 0x57, 0x33, 0x9F, 100);
+
+//  Name:     System.Photo.FNumber -- PKEY_Photo_FNumber
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 33437
+//
+//  PropertyTagExifFNumber.  Calculated from PKEY_Photo_FNumberNumerator and PKEY_Photo_FNumberDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_FNumber, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 33437);
+
+//  Name:     System.Photo.FNumberDenominator -- PKEY_Photo_FNumberDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: E92A2496-223B-4463-A4E3-30EABBA79D80, 100
+//
+//  Denominator of PKEY_Photo_FNumber
+DEFINE_PROPERTYKEY(PKEY_Photo_FNumberDenominator, 0xE92A2496, 0x223B, 0x4463, 0xA4, 0xE3, 0x30, 0xEA, 0xBB, 0xA7, 0x9D, 0x80, 100);
+
+//  Name:     System.Photo.FNumberNumerator -- PKEY_Photo_FNumberNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 1B97738A-FDFC-462F-9D93-1957E08BE90C, 100
+//
+//  Numerator of PKEY_Photo_FNumber
+DEFINE_PROPERTYKEY(PKEY_Photo_FNumberNumerator, 0x1B97738A, 0xFDFC, 0x462F, 0x9D, 0x93, 0x19, 0x57, 0xE0, 0x8B, 0xE9, 0x0C, 100);
+
+//  Name:     System.Photo.FocalLength -- PKEY_Photo_FocalLength
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37386
+//
+//  PropertyTagExifFocalLength.  Calculated from PKEY_Photo_FocalLengthNumerator and PKEY_Photo_FocalLengthDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalLength, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37386);
+
+//  Name:     System.Photo.FocalLengthDenominator -- PKEY_Photo_FocalLengthDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 305BC615-DCA1-44A5-9FD4-10C0BA79412E, 100
+//
+//  Denominator of PKEY_Photo_FocalLength
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalLengthDenominator, 0x305BC615, 0xDCA1, 0x44A5, 0x9F, 0xD4, 0x10, 0xC0, 0xBA, 0x79, 0x41, 0x2E, 100);
+
+//  Name:     System.Photo.FocalLengthInFilm -- PKEY_Photo_FocalLengthInFilm
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: A0E74609-B84D-4F49-B860-462BD9971F98, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalLengthInFilm, 0xA0E74609, 0xB84D, 0x4F49, 0xB8, 0x60, 0x46, 0x2B, 0xD9, 0x97, 0x1F, 0x98, 100);
+
+//  Name:     System.Photo.FocalLengthNumerator -- PKEY_Photo_FocalLengthNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 776B6B3B-1E3D-4B0C-9A0E-8FBAF2A8492A, 100
+//
+//  Numerator of PKEY_Photo_FocalLength
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalLengthNumerator, 0x776B6B3B, 0x1E3D, 0x4B0C, 0x9A, 0x0E, 0x8F, 0xBA, 0xF2, 0xA8, 0x49, 0x2A, 100);
+
+//  Name:     System.Photo.FocalPlaneXResolution -- PKEY_Photo_FocalPlaneXResolution
+//  Type:     Double -- VT_R8
+//  FormatID: CFC08D97-C6F7-4484-89DD-EBEF4356FE76, 100
+//  
+//  PropertyTagExifFocalXRes.  Calculated from PKEY_Photo_FocalPlaneXResolutionNumerator and 
+//  PKEY_Photo_FocalPlaneXResolutionDenominator.
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneXResolution, 0xCFC08D97, 0xC6F7, 0x4484, 0x89, 0xDD, 0xEB, 0xEF, 0x43, 0x56, 0xFE, 0x76, 100);
+
+//  Name:     System.Photo.FocalPlaneXResolutionDenominator -- PKEY_Photo_FocalPlaneXResolutionDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 0933F3F5-4786-4F46-A8E8-D64DD37FA521, 100
+//
+//  Denominator of PKEY_Photo_FocalPlaneXResolution
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneXResolutionDenominator, 0x0933F3F5, 0x4786, 0x4F46, 0xA8, 0xE8, 0xD6, 0x4D, 0xD3, 0x7F, 0xA5, 0x21, 100);
+
+//  Name:     System.Photo.FocalPlaneXResolutionNumerator -- PKEY_Photo_FocalPlaneXResolutionNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: DCCB10AF-B4E2-4B88-95F9-031B4D5AB490, 100
+//
+//  Numerator of PKEY_Photo_FocalPlaneXResolution
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneXResolutionNumerator, 0xDCCB10AF, 0xB4E2, 0x4B88, 0x95, 0xF9, 0x03, 0x1B, 0x4D, 0x5A, 0xB4, 0x90, 100);
+
+//  Name:     System.Photo.FocalPlaneYResolution -- PKEY_Photo_FocalPlaneYResolution
+//  Type:     Double -- VT_R8
+//  FormatID: 4FFFE4D0-914F-4AC4-8D6F-C9C61DE169B1, 100
+//  
+//  PropertyTagExifFocalYRes.  Calculated from PKEY_Photo_FocalPlaneYResolutionNumerator and 
+//  PKEY_Photo_FocalPlaneYResolutionDenominator.
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneYResolution, 0x4FFFE4D0, 0x914F, 0x4AC4, 0x8D, 0x6F, 0xC9, 0xC6, 0x1D, 0xE1, 0x69, 0xB1, 100);
+
+//  Name:     System.Photo.FocalPlaneYResolutionDenominator -- PKEY_Photo_FocalPlaneYResolutionDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 1D6179A6-A876-4031-B013-3347B2B64DC8, 100
+//
+//  Denominator of PKEY_Photo_FocalPlaneYResolution
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneYResolutionDenominator, 0x1D6179A6, 0xA876, 0x4031, 0xB0, 0x13, 0x33, 0x47, 0xB2, 0xB6, 0x4D, 0xC8, 100);
+
+//  Name:     System.Photo.FocalPlaneYResolutionNumerator -- PKEY_Photo_FocalPlaneYResolutionNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: A2E541C5-4440-4BA8-867E-75CFC06828CD, 100
+//
+//  Numerator of PKEY_Photo_FocalPlaneYResolution
+DEFINE_PROPERTYKEY(PKEY_Photo_FocalPlaneYResolutionNumerator, 0xA2E541C5, 0x4440, 0x4BA8, 0x86, 0x7E, 0x75, 0xCF, 0xC0, 0x68, 0x28, 0xCD, 100);
+
+//  Name:     System.Photo.GainControl -- PKEY_Photo_GainControl
+//  Type:     Double -- VT_R8
+//  FormatID: FA304789-00C7-4D80-904A-1E4DCC7265AA, 100 (PropertyTagExifGainControl)
+//  
+//  This indicates the degree of overall image gain adjustment.
+//  
+//  Calculated from PKEY_Photo_GainControlNumerator and PKEY_Photo_GainControlDenominator.
+DEFINE_PROPERTYKEY(PKEY_Photo_GainControl, 0xFA304789, 0x00C7, 0x4D80, 0x90, 0x4A, 0x1E, 0x4D, 0xCC, 0x72, 0x65, 0xAA, 100);
+
+// Possible discrete values for PKEY_Photo_GainControl are:
+#define PHOTO_GAINCONTROL_NONE              0.0
+#define PHOTO_GAINCONTROL_LOWGAINUP         1.0
+#define PHOTO_GAINCONTROL_HIGHGAINUP        2.0
+#define PHOTO_GAINCONTROL_LOWGAINDOWN       3.0
+#define PHOTO_GAINCONTROL_HIGHGAINDOWN      4.0
+
+//  Name:     System.Photo.GainControlDenominator -- PKEY_Photo_GainControlDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 42864DFD-9DA4-4F77-BDED-4AAD7B256735, 100
+//
+//  Denominator of PKEY_Photo_GainControl
+DEFINE_PROPERTYKEY(PKEY_Photo_GainControlDenominator, 0x42864DFD, 0x9DA4, 0x4F77, 0xBD, 0xED, 0x4A, 0xAD, 0x7B, 0x25, 0x67, 0x35, 100);
+
+//  Name:     System.Photo.GainControlNumerator -- PKEY_Photo_GainControlNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 8E8ECF7C-B7B8-4EB8-A63F-0EE715C96F9E, 100
+//
+//  Numerator of PKEY_Photo_GainControl
+DEFINE_PROPERTYKEY(PKEY_Photo_GainControlNumerator, 0x8E8ECF7C, 0xB7B8, 0x4EB8, 0xA6, 0x3F, 0x0E, 0xE7, 0x15, 0xC9, 0x6F, 0x9E, 100);
+
+//  Name:     System.Photo.GainControlText -- PKEY_Photo_GainControlText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C06238B2-0BF9-4279-A723-25856715CB9D, 100
+//  
+//  This is the user-friendly form of System.Photo.GainControl.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_GainControlText, 0xC06238B2, 0x0BF9, 0x4279, 0xA7, 0x23, 0x25, 0x85, 0x67, 0x15, 0xCB, 0x9D, 100);
+
+//  Name:     System.Photo.ISOSpeed -- PKEY_Photo_ISOSpeed
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 34855
+//
+//  PropertyTagExifISOSpeed
+DEFINE_PROPERTYKEY(PKEY_Photo_ISOSpeed, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 34855);
+
+//  Name:     System.Photo.LensManufacturer -- PKEY_Photo_LensManufacturer
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E6DDCAF7-29C5-4F0A-9A68-D19412EC7090, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_LensManufacturer, 0xE6DDCAF7, 0x29C5, 0x4F0A, 0x9A, 0x68, 0xD1, 0x94, 0x12, 0xEC, 0x70, 0x90, 100);
+
+//  Name:     System.Photo.LensModel -- PKEY_Photo_LensModel
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: E1277516-2B5F-4869-89B1-2E585BD38B7A, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_LensModel, 0xE1277516, 0x2B5F, 0x4869, 0x89, 0xB1, 0x2E, 0x58, 0x5B, 0xD3, 0x8B, 0x7A, 100);
+
+//  Name:     System.Photo.LightSource -- PKEY_Photo_LightSource
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37384
+//
+//  PropertyTagExifLightSource
+DEFINE_PROPERTYKEY(PKEY_Photo_LightSource, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37384);
+
+// Possible discrete values for PKEY_Photo_LightSource are:
+#define PHOTO_LIGHTSOURCE_UNKNOWN           0ul
+#define PHOTO_LIGHTSOURCE_DAYLIGHT          1ul
+#define PHOTO_LIGHTSOURCE_FLUORESCENT       2ul
+#define PHOTO_LIGHTSOURCE_TUNGSTEN          3ul
+#define PHOTO_LIGHTSOURCE_STANDARD_A        17ul
+#define PHOTO_LIGHTSOURCE_STANDARD_B        18ul
+#define PHOTO_LIGHTSOURCE_STANDARD_C        19ul
+#define PHOTO_LIGHTSOURCE_D55               20ul
+#define PHOTO_LIGHTSOURCE_D65               21ul
+#define PHOTO_LIGHTSOURCE_D75               22ul
+
+//  Name:     System.Photo.MakerNote -- PKEY_Photo_MakerNote
+//  Type:     Buffer -- VT_VECTOR | VT_UI1  (For variants: VT_ARRAY | VT_UI1)
+//  FormatID: FA303353-B659-4052-85E9-BCAC79549B84, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_MakerNote, 0xFA303353, 0xB659, 0x4052, 0x85, 0xE9, 0xBC, 0xAC, 0x79, 0x54, 0x9B, 0x84, 100);
+
+//  Name:     System.Photo.MakerNoteOffset -- PKEY_Photo_MakerNoteOffset
+//  Type:     UInt64 -- VT_UI8
+//  FormatID: 813F4124-34E6-4D17-AB3E-6B1F3C2247A1, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_MakerNoteOffset, 0x813F4124, 0x34E6, 0x4D17, 0xAB, 0x3E, 0x6B, 0x1F, 0x3C, 0x22, 0x47, 0xA1, 100);
+
+//  Name:     System.Photo.MaxAperture -- PKEY_Photo_MaxAperture
+//  Type:     Double -- VT_R8
+//  FormatID: 08F6D7C2-E3F2-44FC-AF1E-5AA5C81A2D3E, 100
+//
+//  Calculated from PKEY_Photo_MaxApertureNumerator and PKEY_Photo_MaxApertureDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_MaxAperture, 0x08F6D7C2, 0xE3F2, 0x44FC, 0xAF, 0x1E, 0x5A, 0xA5, 0xC8, 0x1A, 0x2D, 0x3E, 100);
+
+//  Name:     System.Photo.MaxApertureDenominator -- PKEY_Photo_MaxApertureDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: C77724D4-601F-46C5-9B89-C53F93BCEB77, 100
+//
+//  Denominator of PKEY_Photo_MaxAperture
+DEFINE_PROPERTYKEY(PKEY_Photo_MaxApertureDenominator, 0xC77724D4, 0x601F, 0x46C5, 0x9B, 0x89, 0xC5, 0x3F, 0x93, 0xBC, 0xEB, 0x77, 100);
+
+//  Name:     System.Photo.MaxApertureNumerator -- PKEY_Photo_MaxApertureNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: C107E191-A459-44C5-9AE6-B952AD4B906D, 100
+//
+//  Numerator of PKEY_Photo_MaxAperture
+DEFINE_PROPERTYKEY(PKEY_Photo_MaxApertureNumerator, 0xC107E191, 0xA459, 0x44C5, 0x9A, 0xE6, 0xB9, 0x52, 0xAD, 0x4B, 0x90, 0x6D, 100);
+
+//  Name:     System.Photo.MeteringMode -- PKEY_Photo_MeteringMode
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37383
+//
+//  PropertyTagExifMeteringMode
+DEFINE_PROPERTYKEY(PKEY_Photo_MeteringMode, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37383);
+
+// Possible discrete values for PKEY_Photo_MeteringMode are:
+#define PHOTO_METERINGMODE_UNKNOWN          0u
+#define PHOTO_METERINGMODE_AVERAGE          1u
+#define PHOTO_METERINGMODE_CENTER           2u
+#define PHOTO_METERINGMODE_SPOT             3u
+#define PHOTO_METERINGMODE_MULTISPOT        4u
+#define PHOTO_METERINGMODE_PATTERN          5u
+#define PHOTO_METERINGMODE_PARTIAL          6u
+
+//  Name:     System.Photo.MeteringModeText -- PKEY_Photo_MeteringModeText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: F628FD8C-7BA8-465A-A65B-C5AA79263A9E, 100
+//  
+//  This is the user-friendly form of System.Photo.MeteringMode.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_MeteringModeText, 0xF628FD8C, 0x7BA8, 0x465A, 0xA6, 0x5B, 0xC5, 0xAA, 0x79, 0x26, 0x3A, 0x9E, 100);
+
+//  Name:     System.Photo.Orientation -- PKEY_Photo_Orientation
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 274 (PropertyTagOrientation)
+//  
+//  This is the image orientation viewed in terms of rows and columns.
+DEFINE_PROPERTYKEY(PKEY_Photo_Orientation, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 274);
+
+// Possible discrete values for PKEY_Photo_Orientation are:
+#define PHOTO_ORIENTATION_NORMAL            1u
+#define PHOTO_ORIENTATION_FLIPHORIZONTAL    2u
+#define PHOTO_ORIENTATION_ROTATE180         3u
+#define PHOTO_ORIENTATION_FLIPVERTICAL      4u
+#define PHOTO_ORIENTATION_TRANSPOSE         5u
+#define PHOTO_ORIENTATION_ROTATE270         6u
+#define PHOTO_ORIENTATION_TRANSVERSE        7u
+#define PHOTO_ORIENTATION_ROTATE90          8u
+
+//  Name:     System.Photo.OrientationText -- PKEY_Photo_OrientationText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A9EA193C-C511-498A-A06B-58E2776DCC28, 100
+//  
+//  This is the user-friendly form of System.Photo.Orientation.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_OrientationText, 0xA9EA193C, 0xC511, 0x498A, 0xA0, 0x6B, 0x58, 0xE2, 0x77, 0x6D, 0xCC, 0x28, 100);
+
+//  Name:     System.Photo.PhotometricInterpretation -- PKEY_Photo_PhotometricInterpretation
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: 341796F1-1DF9-4B1C-A564-91BDEFA43877, 100
+//  
+//  This is the pixel composition. In JPEG compressed data, a JPEG marker is used 
+//  instead of this property.
+DEFINE_PROPERTYKEY(PKEY_Photo_PhotometricInterpretation, 0x341796F1, 0x1DF9, 0x4B1C, 0xA5, 0x64, 0x91, 0xBD, 0xEF, 0xA4, 0x38, 0x77, 100);
+
+// Possible discrete values for PKEY_Photo_PhotometricInterpretation are:
+#define PHOTO_PHOTOMETRIC_RGB               2u
+#define PHOTO_PHOTOMETRIC_YCBCR             6u
+
+//  Name:     System.Photo.PhotometricInterpretationText -- PKEY_Photo_PhotometricInterpretationText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 821437D6-9EAB-4765-A589-3B1CBBD22A61, 100
+//  
+//  This is the user-friendly form of System.Photo.PhotometricInterpretation.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_PhotometricInterpretationText, 0x821437D6, 0x9EAB, 0x4765, 0xA5, 0x89, 0x3B, 0x1C, 0xBB, 0xD2, 0x2A, 0x61, 100);
+
+//  Name:     System.Photo.ProgramMode -- PKEY_Photo_ProgramMode
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 6D217F6D-3F6A-4825-B470-5F03CA2FBE9B, 100
+//  
+//  This is the class of the program used by the camera to set exposure when the 
+//  picture is taken.
+DEFINE_PROPERTYKEY(PKEY_Photo_ProgramMode, 0x6D217F6D, 0x3F6A, 0x4825, 0xB4, 0x70, 0x5F, 0x03, 0xCA, 0x2F, 0xBE, 0x9B, 100);
+
+// Possible discrete values for PKEY_Photo_ProgramMode are:
+#define PHOTO_PROGRAMMODE_NOTDEFINED        0ul
+#define PHOTO_PROGRAMMODE_MANUAL            1ul
+#define PHOTO_PROGRAMMODE_NORMAL            2ul
+#define PHOTO_PROGRAMMODE_APERTURE          3ul
+#define PHOTO_PROGRAMMODE_SHUTTER           4ul
+#define PHOTO_PROGRAMMODE_CREATIVE          5ul
+#define PHOTO_PROGRAMMODE_ACTION            6ul
+#define PHOTO_PROGRAMMODE_PORTRAIT          7ul
+#define PHOTO_PROGRAMMODE_LANDSCAPE         8ul
+
+//  Name:     System.Photo.ProgramModeText -- PKEY_Photo_ProgramModeText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7FE3AA27-2648-42F3-89B0-454E5CB150C3, 100
+//  
+//  This is the user-friendly form of System.Photo.ProgramMode.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_ProgramModeText, 0x7FE3AA27, 0x2648, 0x42F3, 0x89, 0xB0, 0x45, 0x4E, 0x5C, 0xB1, 0x50, 0xC3, 100);
+
+//  Name:     System.Photo.RelatedSoundFile -- PKEY_Photo_RelatedSoundFile
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 318A6B45-087F-4DC2-B8CC-05359551FC9E, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_RelatedSoundFile, 0x318A6B45, 0x087F, 0x4DC2, 0xB8, 0xCC, 0x05, 0x35, 0x95, 0x51, 0xFC, 0x9E, 100);
+
+//  Name:     System.Photo.Saturation -- PKEY_Photo_Saturation
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 49237325-A95A-4F67-B211-816B2D45D2E0, 100
+//  
+//  This indicates the direction of saturation processing applied by the camera when 
+//  the image was shot.
+DEFINE_PROPERTYKEY(PKEY_Photo_Saturation, 0x49237325, 0xA95A, 0x4F67, 0xB2, 0x11, 0x81, 0x6B, 0x2D, 0x45, 0xD2, 0xE0, 100);
+
+// Possible discrete values for PKEY_Photo_Saturation are:
+#define PHOTO_SATURATION_NORMAL             0ul
+#define PHOTO_SATURATION_LOW                1ul
+#define PHOTO_SATURATION_HIGH               2ul
+
+//  Name:     System.Photo.SaturationText -- PKEY_Photo_SaturationText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 61478C08-B600-4A84-BBE4-E99C45F0A072, 100
+//  
+//  This is the user-friendly form of System.Photo.Saturation.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_SaturationText, 0x61478C08, 0xB600, 0x4A84, 0xBB, 0xE4, 0xE9, 0x9C, 0x45, 0xF0, 0xA0, 0x72, 100);
+
+//  Name:     System.Photo.Sharpness -- PKEY_Photo_Sharpness
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: FC6976DB-8349-4970-AE97-B3C5316A08F0, 100
+//  
+//  This indicates the direction of sharpness processing applied by the camera when 
+//  the image was shot.
+DEFINE_PROPERTYKEY(PKEY_Photo_Sharpness, 0xFC6976DB, 0x8349, 0x4970, 0xAE, 0x97, 0xB3, 0xC5, 0x31, 0x6A, 0x08, 0xF0, 100);
+
+// Possible discrete values for PKEY_Photo_Sharpness are:
+#define PHOTO_SHARPNESS_NORMAL              0ul
+#define PHOTO_SHARPNESS_SOFT                1ul
+#define PHOTO_SHARPNESS_HARD                2ul
+
+//  Name:     System.Photo.SharpnessText -- PKEY_Photo_SharpnessText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 51EC3F47-DD50-421D-8769-334F50424B1E, 100
+//  
+//  This is the user-friendly form of System.Photo.Sharpness.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_SharpnessText, 0x51EC3F47, 0xDD50, 0x421D, 0x87, 0x69, 0x33, 0x4F, 0x50, 0x42, 0x4B, 0x1E, 100);
+
+//  Name:     System.Photo.ShutterSpeed -- PKEY_Photo_ShutterSpeed
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37377
+//
+//  PropertyTagExifShutterSpeed.  Calculated from PKEY_Photo_ShutterSpeedNumerator and PKEY_Photo_ShutterSpeedDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_ShutterSpeed, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37377);
+
+//  Name:     System.Photo.ShutterSpeedDenominator -- PKEY_Photo_ShutterSpeedDenominator
+//  Type:     Int32 -- VT_I4
+//  FormatID: E13D8975-81C7-4948-AE3F-37CAE11E8FF7, 100
+//
+//  Denominator of PKEY_Photo_ShutterSpeed
+DEFINE_PROPERTYKEY(PKEY_Photo_ShutterSpeedDenominator, 0xE13D8975, 0x81C7, 0x4948, 0xAE, 0x3F, 0x37, 0xCA, 0xE1, 0x1E, 0x8F, 0xF7, 100);
+
+//  Name:     System.Photo.ShutterSpeedNumerator -- PKEY_Photo_ShutterSpeedNumerator
+//  Type:     Int32 -- VT_I4
+//  FormatID: 16EA4042-D6F4-4BCA-8349-7C78D30FB333, 100
+//
+//  Numerator of PKEY_Photo_ShutterSpeed
+DEFINE_PROPERTYKEY(PKEY_Photo_ShutterSpeedNumerator, 0x16EA4042, 0xD6F4, 0x4BCA, 0x83, 0x49, 0x7C, 0x78, 0xD3, 0x0F, 0xB3, 0x33, 100);
+
+//  Name:     System.Photo.SubjectDistance -- PKEY_Photo_SubjectDistance
+//  Type:     Double -- VT_R8
+//  FormatID: (FMTID_ImageProperties) 14B81DA1-0135-4D31-96D9-6CBFC9671A99, 37382
+//
+//  PropertyTagExifSubjectDist.  Calculated from PKEY_Photo_SubjectDistanceNumerator and PKEY_Photo_SubjectDistanceDenominator
+DEFINE_PROPERTYKEY(PKEY_Photo_SubjectDistance, 0x14B81DA1, 0x0135, 0x4D31, 0x96, 0xD9, 0x6C, 0xBF, 0xC9, 0x67, 0x1A, 0x99, 37382);
+
+//  Name:     System.Photo.SubjectDistanceDenominator -- PKEY_Photo_SubjectDistanceDenominator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 0C840A88-B043-466D-9766-D4B26DA3FA77, 100
+//
+//  Denominator of PKEY_Photo_SubjectDistance
+DEFINE_PROPERTYKEY(PKEY_Photo_SubjectDistanceDenominator, 0x0C840A88, 0xB043, 0x466D, 0x97, 0x66, 0xD4, 0xB2, 0x6D, 0xA3, 0xFA, 0x77, 100);
+
+//  Name:     System.Photo.SubjectDistanceNumerator -- PKEY_Photo_SubjectDistanceNumerator
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 8AF4961C-F526-43E5-AA81-DB768219178D, 100
+//
+//  Numerator of PKEY_Photo_SubjectDistance
+DEFINE_PROPERTYKEY(PKEY_Photo_SubjectDistanceNumerator, 0x8AF4961C, 0xF526, 0x43E5, 0xAA, 0x81, 0xDB, 0x76, 0x82, 0x19, 0x17, 0x8D, 100);
+
+//  Name:     System.Photo.TranscodedForSync -- PKEY_Photo_TranscodedForSync
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 9A8EBB75-6458-4E82-BACB-35C0095B03BB, 100
+DEFINE_PROPERTYKEY(PKEY_Photo_TranscodedForSync, 0x9A8EBB75, 0x6458, 0x4E82, 0xBA, 0xCB, 0x35, 0xC0, 0x09, 0x5B, 0x03, 0xBB, 100);
+
+//  Name:     System.Photo.WhiteBalance -- PKEY_Photo_WhiteBalance
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: EE3D3D8A-5381-4CFA-B13B-AAF66B5F4EC9, 100
+//  
+//  This indicates the white balance mode set when the image was shot.
+DEFINE_PROPERTYKEY(PKEY_Photo_WhiteBalance, 0xEE3D3D8A, 0x5381, 0x4CFA, 0xB1, 0x3B, 0xAA, 0xF6, 0x6B, 0x5F, 0x4E, 0xC9, 100);
+
+// Possible discrete values for PKEY_Photo_WhiteBalance are:
+#define PHOTO_WHITEBALANCE_AUTO             0ul
+#define PHOTO_WHITEBALANCE_MANUAL           1ul
+
+//  Name:     System.Photo.WhiteBalanceText -- PKEY_Photo_WhiteBalanceText
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6336B95E-C7A7-426D-86FD-7AE3D39C84B4, 100
+//  
+//  This is the user-friendly form of System.Photo.WhiteBalance.  Not intended to be parsed 
+//  programmatically.
+DEFINE_PROPERTYKEY(PKEY_Photo_WhiteBalanceText, 0x6336B95E, 0xC7A7, 0x426D, 0x86, 0xFD, 0x7A, 0xE3, 0xD3, 0x9C, 0x84, 0xB4, 100);
+ 
+//-----------------------------------------------------------------------------
+// PropGroup properties
+
+//  Name:     System.PropGroup.Advanced -- PKEY_PropGroup_Advanced
+//  Type:     Null -- VT_NULL
+//  FormatID: 900A403B-097B-4B95-8AE2-071FDAEEB118, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Advanced, 0x900A403B, 0x097B, 0x4B95, 0x8A, 0xE2, 0x07, 0x1F, 0xDA, 0xEE, 0xB1, 0x18, 100);
+
+//  Name:     System.PropGroup.Audio -- PKEY_PropGroup_Audio
+//  Type:     Null -- VT_NULL
+//  FormatID: 2804D469-788F-48AA-8570-71B9C187E138, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Audio, 0x2804D469, 0x788F, 0x48AA, 0x85, 0x70, 0x71, 0xB9, 0xC1, 0x87, 0xE1, 0x38, 100);
+
+//  Name:     System.PropGroup.Calendar -- PKEY_PropGroup_Calendar
+//  Type:     Null -- VT_NULL
+//  FormatID: 9973D2B5-BFD8-438A-BA94-5349B293181A, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Calendar, 0x9973D2B5, 0xBFD8, 0x438A, 0xBA, 0x94, 0x53, 0x49, 0xB2, 0x93, 0x18, 0x1A, 100);
+
+//  Name:     System.PropGroup.Camera -- PKEY_PropGroup_Camera
+//  Type:     Null -- VT_NULL
+//  FormatID: DE00DE32-547E-4981-AD4B-542F2E9007D8, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Camera, 0xDE00DE32, 0x547E, 0x4981, 0xAD, 0x4B, 0x54, 0x2F, 0x2E, 0x90, 0x07, 0xD8, 100);
+
+//  Name:     System.PropGroup.Contact -- PKEY_PropGroup_Contact
+//  Type:     Null -- VT_NULL
+//  FormatID: DF975FD3-250A-4004-858F-34E29A3E37AA, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Contact, 0xDF975FD3, 0x250A, 0x4004, 0x85, 0x8F, 0x34, 0xE2, 0x9A, 0x3E, 0x37, 0xAA, 100);
+
+//  Name:     System.PropGroup.Content -- PKEY_PropGroup_Content
+//  Type:     Null -- VT_NULL
+//  FormatID: D0DAB0BA-368A-4050-A882-6C010FD19A4F, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Content, 0xD0DAB0BA, 0x368A, 0x4050, 0xA8, 0x82, 0x6C, 0x01, 0x0F, 0xD1, 0x9A, 0x4F, 100);
+
+//  Name:     System.PropGroup.Description -- PKEY_PropGroup_Description
+//  Type:     Null -- VT_NULL
+//  FormatID: 8969B275-9475-4E00-A887-FF93B8B41E44, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Description, 0x8969B275, 0x9475, 0x4E00, 0xA8, 0x87, 0xFF, 0x93, 0xB8, 0xB4, 0x1E, 0x44, 100);
+
+//  Name:     System.PropGroup.FileSystem -- PKEY_PropGroup_FileSystem
+//  Type:     Null -- VT_NULL
+//  FormatID: E3A7D2C1-80FC-4B40-8F34-30EA111BDC2E, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_FileSystem, 0xE3A7D2C1, 0x80FC, 0x4B40, 0x8F, 0x34, 0x30, 0xEA, 0x11, 0x1B, 0xDC, 0x2E, 100);
+
+//  Name:     System.PropGroup.General -- PKEY_PropGroup_General
+//  Type:     Null -- VT_NULL
+//  FormatID: CC301630-B192-4C22-B372-9F4C6D338E07, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_General, 0xCC301630, 0xB192, 0x4C22, 0xB3, 0x72, 0x9F, 0x4C, 0x6D, 0x33, 0x8E, 0x07, 100);
+
+//  Name:     System.PropGroup.GPS -- PKEY_PropGroup_GPS
+//  Type:     Null -- VT_NULL
+//  FormatID: F3713ADA-90E3-4E11-AAE5-FDC17685B9BE, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_GPS, 0xF3713ADA, 0x90E3, 0x4E11, 0xAA, 0xE5, 0xFD, 0xC1, 0x76, 0x85, 0xB9, 0xBE, 100);
+
+//  Name:     System.PropGroup.Image -- PKEY_PropGroup_Image
+//  Type:     Null -- VT_NULL
+//  FormatID: E3690A87-0FA8-4A2A-9A9F-FCE8827055AC, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Image, 0xE3690A87, 0x0FA8, 0x4A2A, 0x9A, 0x9F, 0xFC, 0xE8, 0x82, 0x70, 0x55, 0xAC, 100);
+
+//  Name:     System.PropGroup.Media -- PKEY_PropGroup_Media
+//  Type:     Null -- VT_NULL
+//  FormatID: 61872CF7-6B5E-4B4B-AC2D-59DA84459248, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Media, 0x61872CF7, 0x6B5E, 0x4B4B, 0xAC, 0x2D, 0x59, 0xDA, 0x84, 0x45, 0x92, 0x48, 100);
+
+//  Name:     System.PropGroup.MediaAdvanced -- PKEY_PropGroup_MediaAdvanced
+//  Type:     Null -- VT_NULL
+//  FormatID: 8859A284-DE7E-4642-99BA-D431D044B1EC, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_MediaAdvanced, 0x8859A284, 0xDE7E, 0x4642, 0x99, 0xBA, 0xD4, 0x31, 0xD0, 0x44, 0xB1, 0xEC, 100);
+
+//  Name:     System.PropGroup.Message -- PKEY_PropGroup_Message
+//  Type:     Null -- VT_NULL
+//  FormatID: 7FD7259D-16B4-4135-9F97-7C96ECD2FA9E, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Message, 0x7FD7259D, 0x16B4, 0x4135, 0x9F, 0x97, 0x7C, 0x96, 0xEC, 0xD2, 0xFA, 0x9E, 100);
+
+//  Name:     System.PropGroup.Music -- PKEY_PropGroup_Music
+//  Type:     Null -- VT_NULL
+//  FormatID: 68DD6094-7216-40F1-A029-43FE7127043F, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Music, 0x68DD6094, 0x7216, 0x40F1, 0xA0, 0x29, 0x43, 0xFE, 0x71, 0x27, 0x04, 0x3F, 100);
+
+//  Name:     System.PropGroup.Origin -- PKEY_PropGroup_Origin
+//  Type:     Null -- VT_NULL
+//  FormatID: 2598D2FB-5569-4367-95DF-5CD3A177E1A5, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Origin, 0x2598D2FB, 0x5569, 0x4367, 0x95, 0xDF, 0x5C, 0xD3, 0xA1, 0x77, 0xE1, 0xA5, 100);
+
+//  Name:     System.PropGroup.PhotoAdvanced -- PKEY_PropGroup_PhotoAdvanced
+//  Type:     Null -- VT_NULL
+//  FormatID: 0CB2BF5A-9EE7-4A86-8222-F01E07FDADAF, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_PhotoAdvanced, 0x0CB2BF5A, 0x9EE7, 0x4A86, 0x82, 0x22, 0xF0, 0x1E, 0x07, 0xFD, 0xAD, 0xAF, 100);
+
+//  Name:     System.PropGroup.RecordedTV -- PKEY_PropGroup_RecordedTV
+//  Type:     Null -- VT_NULL
+//  FormatID: E7B33238-6584-4170-A5C0-AC25EFD9DA56, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_RecordedTV, 0xE7B33238, 0x6584, 0x4170, 0xA5, 0xC0, 0xAC, 0x25, 0xEF, 0xD9, 0xDA, 0x56, 100);
+
+//  Name:     System.PropGroup.Video -- PKEY_PropGroup_Video
+//  Type:     Null -- VT_NULL
+//  FormatID: BEBE0920-7671-4C54-A3EB-49FDDFC191EE, 100
+DEFINE_PROPERTYKEY(PKEY_PropGroup_Video, 0xBEBE0920, 0x7671, 0x4C54, 0xA3, 0xEB, 0x49, 0xFD, 0xDF, 0xC1, 0x91, 0xEE, 100);
+ 
+//-----------------------------------------------------------------------------
+// PropList properties
+
+
+
+//  Name:     System.PropList.ConflictPrompt -- PKEY_PropList_ConflictPrompt
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 11
+//  
+//  The list of properties to show in the file operation conflict resolution dialog. Properties with empty 
+//  values will not be displayed. Register under the regvalue of "ConflictPrompt".
+DEFINE_PROPERTYKEY(PKEY_PropList_ConflictPrompt, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 11);
+
+//  Name:     System.PropList.ExtendedTileInfo -- PKEY_PropList_ExtendedTileInfo
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 9
+//  
+//  The list of properties to show in the listview on extended tiles. Register under the regvalue of 
+//  "ExtendedTileInfo".
+DEFINE_PROPERTYKEY(PKEY_PropList_ExtendedTileInfo, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 9);
+
+//  Name:     System.PropList.FileOperationPrompt -- PKEY_PropList_FileOperationPrompt
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 10
+//  
+//  The list of properties to show in the file operation confirmation dialog. Properties with empty values 
+//  will not be displayed. If this list is not specified, then the InfoTip property list is used instead. 
+//  Register under the regvalue of "FileOperationPrompt".
+DEFINE_PROPERTYKEY(PKEY_PropList_FileOperationPrompt, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 10);
+
+//  Name:     System.PropList.FullDetails -- PKEY_PropList_FullDetails
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 2
+//  
+//  The list of all the properties to show in the details page.  Property groups can be included in this list 
+//  in order to more easily organize the UI.  Register under the regvalue of "FullDetails".
+DEFINE_PROPERTYKEY(PKEY_PropList_FullDetails, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 2);
+
+//  Name:     System.PropList.InfoTip -- PKEY_PropList_InfoTip
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 4 (PID_PROPLIST_INFOTIP)
+//  
+//  The list of properties to show in the infotip. Properties with empty values will not be displayed. Register 
+//  under the regvalue of "InfoTip".
+DEFINE_PROPERTYKEY(PKEY_PropList_InfoTip, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 4);
+
+//  Name:     System.PropList.NonPersonal -- PKEY_PropList_NonPersonal
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 49D1091F-082E-493F-B23F-D2308AA9668C, 100
+//  
+//  The list of properties that are considered 'non-personal'. When told to remove all non-personal properties 
+//  from a given file, the system will leave these particular properties untouched. Register under the regvalue 
+//  of "NonPersonal".
+DEFINE_PROPERTYKEY(PKEY_PropList_NonPersonal, 0x49D1091F, 0x082E, 0x493F, 0xB2, 0x3F, 0xD2, 0x30, 0x8A, 0xA9, 0x66, 0x8C, 100);
+
+//  Name:     System.PropList.PreviewDetails -- PKEY_PropList_PreviewDetails
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 8
+//
+//  The list of properties to display in the preview pane.  Register under the regvalue of "PreviewDetails".
+DEFINE_PROPERTYKEY(PKEY_PropList_PreviewDetails, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 8);
+
+//  Name:     System.PropList.PreviewTitle -- PKEY_PropList_PreviewTitle
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 6
+//  
+//  The one or two properties to display in the preview pane title section.  The optional second property is 
+//  displayed as a subtitle.  Register under the regvalue of "PreviewTitle".
+DEFINE_PROPERTYKEY(PKEY_PropList_PreviewTitle, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 6);
+
+//  Name:     System.PropList.QuickTip -- PKEY_PropList_QuickTip
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 5 (PID_PROPLIST_QUICKTIP)
+//  
+//  The list of properties to show in the infotip when the item is on a slow network. Properties with empty 
+//  values will not be displayed. Register under the regvalue of "QuickTip".
+DEFINE_PROPERTYKEY(PKEY_PropList_QuickTip, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 5);
+
+//  Name:     System.PropList.TileInfo -- PKEY_PropList_TileInfo
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: C9944A21-A406-48FE-8225-AEC7E24C211B, 3 (PID_PROPLIST_TILEINFO)
+//  
+//  The list of properties to show in the listview on tiles. Register under the regvalue of "TileInfo".
+DEFINE_PROPERTYKEY(PKEY_PropList_TileInfo, 0xC9944A21, 0xA406, 0x48FE, 0x82, 0x25, 0xAE, 0xC7, 0xE2, 0x4C, 0x21, 0x1B, 3);
+
+//  Name:     System.PropList.XPDetailsPanel -- PKEY_PropList_XPDetailsPanel
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_WebView) F2275480-F782-4291-BD94-F13693513AEC, 0 (PID_DISPLAY_PROPERTIES)
+//
+//  The list of properties to display in the XP webview details panel. Obsolete.
+DEFINE_PROPERTYKEY(PKEY_PropList_XPDetailsPanel, 0xF2275480, 0xF782, 0x4291, 0xBD, 0x94, 0xF1, 0x36, 0x93, 0x51, 0x3A, 0xEC, 0);
+ 
+//-----------------------------------------------------------------------------
+// RecordedTV properties
+
+
+
+//  Name:     System.RecordedTV.ChannelNumber -- PKEY_RecordedTV_ChannelNumber
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 7
+//
+//  Example: 42
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_ChannelNumber, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 7);
+
+//  Name:     System.RecordedTV.Credits -- PKEY_RecordedTV_Credits
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 4
+//
+//  Example: "Don Messick/Frank Welker/Casey Kasem/Heather North/Nicole Jaffe;;;"
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_Credits, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 4);
+
+//  Name:     System.RecordedTV.DateContentExpires -- PKEY_RecordedTV_DateContentExpires
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 15
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_DateContentExpires, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 15);
+
+//  Name:     System.RecordedTV.EpisodeName -- PKEY_RecordedTV_EpisodeName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 2
+//
+//  Example: "Nowhere to Hyde"
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_EpisodeName, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 2);
+
+//  Name:     System.RecordedTV.IsATSCContent -- PKEY_RecordedTV_IsATSCContent
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 16
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsATSCContent, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 16);
+
+//  Name:     System.RecordedTV.IsClosedCaptioningAvailable -- PKEY_RecordedTV_IsClosedCaptioningAvailable
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 12
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsClosedCaptioningAvailable, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 12);
+
+//  Name:     System.RecordedTV.IsDTVContent -- PKEY_RecordedTV_IsDTVContent
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 17
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsDTVContent, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 17);
+
+//  Name:     System.RecordedTV.IsHDContent -- PKEY_RecordedTV_IsHDContent
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 18
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsHDContent, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 18);
+
+//  Name:     System.RecordedTV.IsRepeatBroadcast -- PKEY_RecordedTV_IsRepeatBroadcast
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 13
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsRepeatBroadcast, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 13);
+
+//  Name:     System.RecordedTV.IsSAP -- PKEY_RecordedTV_IsSAP
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 14
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_IsSAP, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 14);
+
+//  Name:     System.RecordedTV.NetworkAffiliation -- PKEY_RecordedTV_NetworkAffiliation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 2C53C813-FB63-4E22-A1AB-0B331CA1E273, 100
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_NetworkAffiliation, 0x2C53C813, 0xFB63, 0x4E22, 0xA1, 0xAB, 0x0B, 0x33, 0x1C, 0xA1, 0xE2, 0x73, 100);
+
+//  Name:     System.RecordedTV.OriginalBroadcastDate -- PKEY_RecordedTV_OriginalBroadcastDate
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 4684FE97-8765-4842-9C13-F006447B178C, 100
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_OriginalBroadcastDate, 0x4684FE97, 0x8765, 0x4842, 0x9C, 0x13, 0xF0, 0x06, 0x44, 0x7B, 0x17, 0x8C, 100);
+
+//  Name:     System.RecordedTV.ProgramDescription -- PKEY_RecordedTV_ProgramDescription
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 3
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_ProgramDescription, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 3);
+
+//  Name:     System.RecordedTV.RecordingTime -- PKEY_RecordedTV_RecordingTime
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: A5477F61-7A82-4ECA-9DDE-98B69B2479B3, 100
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_RecordingTime, 0xA5477F61, 0x7A82, 0x4ECA, 0x9D, 0xDE, 0x98, 0xB6, 0x9B, 0x24, 0x79, 0xB3, 100);
+
+//  Name:     System.RecordedTV.StationCallSign -- PKEY_RecordedTV_StationCallSign
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 6D748DE2-8D38-4CC3-AC60-F009B057C557, 5
+//
+//  Example: "TOONP"
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_StationCallSign, 0x6D748DE2, 0x8D38, 0x4CC3, 0xAC, 0x60, 0xF0, 0x09, 0xB0, 0x57, 0xC5, 0x57, 5);
+
+//  Name:     System.RecordedTV.StationName -- PKEY_RecordedTV_StationName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 1B5439E7-EBA1-4AF8-BDD7-7AF1D4549493, 100
+DEFINE_PROPERTYKEY(PKEY_RecordedTV_StationName, 0x1B5439E7, 0xEBA1, 0x4AF8, 0xBD, 0xD7, 0x7A, 0xF1, 0xD4, 0x54, 0x94, 0x93, 100);
+ 
+//-----------------------------------------------------------------------------
+// Search properties
+
+
+
+//  Name:     System.Search.AutoSummary -- PKEY_Search_AutoSummary
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 560C36C0-503A-11CF-BAA1-00004C752A9A, 2
+//
+//  General Summary of the document.
+DEFINE_PROPERTYKEY(PKEY_Search_AutoSummary, 0x560C36C0, 0x503A, 0x11CF, 0xBA, 0xA1, 0x00, 0x00, 0x4C, 0x75, 0x2A, 0x9A, 2);
+
+//  Name:     System.Search.ContainerHash -- PKEY_Search_ContainerHash
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: BCEEE283-35DF-4D53-826A-F36A3EEFC6BE, 100
+//
+//  Hash code used to identify attachments to be deleted based on a common container url
+DEFINE_PROPERTYKEY(PKEY_Search_ContainerHash, 0xBCEEE283, 0x35DF, 0x4D53, 0x82, 0x6A, 0xF3, 0x6A, 0x3E, 0xEF, 0xC6, 0xBE, 100);
+
+//  Name:     System.Search.Contents -- PKEY_Search_Contents
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Storage) B725F130-47EF-101A-A5F1-02608C9EEBAC, 19 (PID_STG_CONTENTS)
+//  
+//  The contents of the item. This property is for query restrictions only; it cannot be retrieved in a 
+//  query result. The Indexing Service friendly name is 'contents'.
+DEFINE_PROPERTYKEY(PKEY_Search_Contents, 0xB725F130, 0x47EF, 0x101A, 0xA5, 0xF1, 0x02, 0x60, 0x8C, 0x9E, 0xEB, 0xAC, 19);
+
+//  Name:     System.Search.EntryID -- PKEY_Search_EntryID
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_Query) 49691C90-7E17-101A-A91C-08002B2ECDA9, 5 (PROPID_QUERY_WORKID)
+//  
+//  The entry ID for an item within a given catalog in the Windows Search Index.
+//  This value may be recycled, and therefore is not considered unique over time.
+DEFINE_PROPERTYKEY(PKEY_Search_EntryID, 0x49691C90, 0x7E17, 0x101A, 0xA9, 0x1C, 0x08, 0x00, 0x2B, 0x2E, 0xCD, 0xA9, 5);
+
+//  Name:     System.Search.GatherTime -- PKEY_Search_GatherTime
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 0B63E350-9CCC-11D0-BCDB-00805FCCCE04, 8
+//
+//  The Datetime that the Windows Search Gatherer process last pushed properties of this document to the Windows Search Gatherer Plugins.
+DEFINE_PROPERTYKEY(PKEY_Search_GatherTime, 0x0B63E350, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 8);
+
+//  Name:     System.Search.IsClosedDirectory -- PKEY_Search_IsClosedDirectory
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 0B63E343-9CCC-11D0-BCDB-00805FCCCE04, 23
+//
+//  If this property is emitted with a value of TRUE, then it indicates that this URL's last modified time applies to all of it's children, and if this URL is deleted then all of it's children are deleted as well.  For example, this would be emitted as TRUE when emitting the URL of an email so that all attachments are tied to the last modified time of that email.
+DEFINE_PROPERTYKEY(PKEY_Search_IsClosedDirectory, 0x0B63E343, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 23);
+
+//  Name:     System.Search.IsFullyContained -- PKEY_Search_IsFullyContained
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 0B63E343-9CCC-11D0-BCDB-00805FCCCE04, 24
+//
+//  Any child URL of a URL which has System.Search.IsClosedDirectory=TRUE must emit System.Search.IsFullyContained=TRUE.  This ensures that the URL is not deleted at the end of a crawl because it hasn't been visited (which is the normal mechanism for detecting deletes).  For example an email attachment would emit this property
+DEFINE_PROPERTYKEY(PKEY_Search_IsFullyContained, 0x0B63E343, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 24);
+
+//  Name:     System.Search.QueryFocusedSummary -- PKEY_Search_QueryFocusedSummary
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 560C36C0-503A-11CF-BAA1-00004C752A9A, 3
+//
+//  Query Focused Summary of the document.
+DEFINE_PROPERTYKEY(PKEY_Search_QueryFocusedSummary, 0x560C36C0, 0x503A, 0x11CF, 0xBA, 0xA1, 0x00, 0x00, 0x4C, 0x75, 0x2A, 0x9A, 3);
+
+//  Name:     System.Search.Rank -- PKEY_Search_Rank
+//  Type:     Int32 -- VT_I4
+//  FormatID: (FMTID_Query) 49691C90-7E17-101A-A91C-08002B2ECDA9, 3 (PROPID_QUERY_RANK)
+//  
+//  Relevance rank of row. Ranges from 0-1000. Larger numbers = better matches.  Query-time only, not 
+//  defined in Search schema, retrievable but not searchable.
+DEFINE_PROPERTYKEY(PKEY_Search_Rank, 0x49691C90, 0x7E17, 0x101A, 0xA9, 0x1C, 0x08, 0x00, 0x2B, 0x2E, 0xCD, 0xA9, 3);
+
+//  Name:     System.Search.Store -- PKEY_Search_Store
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: A06992B3-8CAF-4ED7-A547-B259E32AC9FC, 100
+//
+//  The identifier for the protocol handler that produced this item. (E.g. MAPI, CSC, FILE etc.)
+DEFINE_PROPERTYKEY(PKEY_Search_Store, 0xA06992B3, 0x8CAF, 0x4ED7, 0xA5, 0x47, 0xB2, 0x59, 0xE3, 0x2A, 0xC9, 0xFC, 100);
+
+//  Name:     System.Search.UrlToIndex -- PKEY_Search_UrlToIndex
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 0B63E343-9CCC-11D0-BCDB-00805FCCCE04, 2
+//
+//  This property should be emitted by a container IFilter for each child URL within the container.  The children will eventually be crawled by the indexer if they are within scope.
+DEFINE_PROPERTYKEY(PKEY_Search_UrlToIndex, 0x0B63E343, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 2);
+
+//  Name:     System.Search.UrlToIndexWithModificationTime -- PKEY_Search_UrlToIndexWithModificationTime
+//  Type:     Multivalue Any -- VT_VECTOR | VT_NULL  (For variants: VT_ARRAY | VT_NULL)
+//  FormatID: 0B63E343-9CCC-11D0-BCDB-00805FCCCE04, 12
+//
+//  This property is the same as System.Search.UrlToIndex except that it includes the time the URL was last modified.  This is an optimization for the indexer as it doesn't have to call back into the protocol handler to ask for this information to determine if the content needs to be indexed again.  The property is a vector with two elements, a VT_LPWSTR with the URL and a VT_FILETIME for the last modified time.
+DEFINE_PROPERTYKEY(PKEY_Search_UrlToIndexWithModificationTime, 0x0B63E343, 0x9CCC, 0x11D0, 0xBC, 0xDB, 0x00, 0x80, 0x5F, 0xCC, 0xCE, 0x04, 12);
+ 
+//-----------------------------------------------------------------------------
+// Shell properties
+
+
+
+//  Name:     System.DescriptionID -- PKEY_DescriptionID
+//  Type:     Buffer -- VT_VECTOR | VT_UI1  (For variants: VT_ARRAY | VT_UI1)
+//  FormatID: (FMTID_ShellDetails) 28636AA6-953D-11D2-B5D6-00C04FD918D0, 2 (PID_DESCRIPTIONID)
+//
+//  The contents of a SHDESCRIPTIONID structure as a buffer of bytes.
+DEFINE_PROPERTYKEY(PKEY_DescriptionID, 0x28636AA6, 0x953D, 0x11D2, 0xB5, 0xD6, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0, 2);
+
+//  Name:     System.Link.TargetSFGAOFlagsStrings -- PKEY_Link_TargetSFGAOFlagsStrings
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D6942081-D53B-443D-AD47-5E059D9CD27A, 3
+//  
+//  Expresses the SFGAO flags of a link as string values and is used as a query optimization.  See 
+//  PKEY_Shell_SFGAOFlagsStrings for possible values of this.
+DEFINE_PROPERTYKEY(PKEY_Link_TargetSFGAOFlagsStrings, 0xD6942081, 0xD53B, 0x443D, 0xAD, 0x47, 0x5E, 0x05, 0x9D, 0x9C, 0xD2, 0x7A, 3);
+
+//  Name:     System.Link.TargetUrl -- PKEY_Link_TargetUrl
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 5CBF2787-48CF-4208-B90E-EE5E5D420294, 2  (PKEYs relating to URLs.  Used by IE History.)
+DEFINE_PROPERTYKEY(PKEY_Link_TargetUrl, 0x5CBF2787, 0x48CF, 0x4208, 0xB9, 0x0E, 0xEE, 0x5E, 0x5D, 0x42, 0x02, 0x94, 2);
+
+//  Name:     System.Shell.SFGAOFlagsStrings -- PKEY_Shell_SFGAOFlagsStrings
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: D6942081-D53B-443D-AD47-5E059D9CD27A, 2
+//
+//  Expresses the SFGAO flags as string values and is used as a query optimization.
+DEFINE_PROPERTYKEY(PKEY_Shell_SFGAOFlagsStrings, 0xD6942081, 0xD53B, 0x443D, 0xAD, 0x47, 0x5E, 0x05, 0x9D, 0x9C, 0xD2, 0x7A, 2);
+
+// Possible discrete values for PKEY_Shell_SFGAOFlagsStrings are:
+#define SFGAOSTR_FILESYS                    L"filesys"               // SFGAO_FILESYSTEM
+#define SFGAOSTR_FILEANC                    L"fileanc"               // SFGAO_FILESYSANCESTOR
+#define SFGAOSTR_STORAGEANC                 L"storageanc"               // SFGAO_STORAGEANCESTOR
+#define SFGAOSTR_STREAM                     L"stream"               // SFGAO_STREAM
+#define SFGAOSTR_LINK                       L"link"               // SFGAO_LINK
+#define SFGAOSTR_HIDDEN                     L"hidden"               // SFGAO_HIDDEN
+#define SFGAOSTR_FOLDER                     L"folder"               // SFGAO_FOLDER
+#define SFGAOSTR_NONENUM                    L"nonenum"               // SFGAO_NONENUMERATED
+#define SFGAOSTR_BROWSABLE                  L"browsable"               // SFGAO_BROWSABLE
+ 
+//-----------------------------------------------------------------------------
+// Software properties
+
+
+
+//  Name:     System.Software.DateLastUsed -- PKEY_Software_DateLastUsed
+//  Type:     DateTime -- VT_FILETIME  (For variants: VT_DATE)
+//  FormatID: 841E4F90-FF59-4D16-8947-E81BBFFAB36D, 16
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Software_DateLastUsed, 0x841E4F90, 0xFF59, 0x4D16, 0x89, 0x47, 0xE8, 0x1B, 0xBF, 0xFA, 0xB3, 0x6D, 16);
+
+//  Name:     System.Software.ProductName -- PKEY_Software_ProductName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (PSFMTID_VERSION) 0CEF7D53-FA64-11D1-A203-0000F81FEDEE, 7
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Software_ProductName, 0x0CEF7D53, 0xFA64, 0x11D1, 0xA2, 0x03, 0x00, 0x00, 0xF8, 0x1F, 0xED, 0xEE, 7);
+ 
+//-----------------------------------------------------------------------------
+// Sync properties
+
+
+
+//  Name:     System.Sync.Comments -- PKEY_Sync_Comments
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 13
+DEFINE_PROPERTYKEY(PKEY_Sync_Comments, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 13);
+
+//  Name:     System.Sync.ConflictDescription -- PKEY_Sync_ConflictDescription
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CE50C159-2FB8-41FD-BE68-D3E042E274BC, 4
+DEFINE_PROPERTYKEY(PKEY_Sync_ConflictDescription, 0xCE50C159, 0x2FB8, 0x41FD, 0xBE, 0x68, 0xD3, 0xE0, 0x42, 0xE2, 0x74, 0xBC, 4);
+
+//  Name:     System.Sync.ConflictFirstLocation -- PKEY_Sync_ConflictFirstLocation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CE50C159-2FB8-41FD-BE68-D3E042E274BC, 6
+DEFINE_PROPERTYKEY(PKEY_Sync_ConflictFirstLocation, 0xCE50C159, 0x2FB8, 0x41FD, 0xBE, 0x68, 0xD3, 0xE0, 0x42, 0xE2, 0x74, 0xBC, 6);
+
+//  Name:     System.Sync.ConflictSecondLocation -- PKEY_Sync_ConflictSecondLocation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CE50C159-2FB8-41FD-BE68-D3E042E274BC, 7
+DEFINE_PROPERTYKEY(PKEY_Sync_ConflictSecondLocation, 0xCE50C159, 0x2FB8, 0x41FD, 0xBE, 0x68, 0xD3, 0xE0, 0x42, 0xE2, 0x74, 0xBC, 7);
+
+//  Name:     System.Sync.HandlerCollectionID -- PKEY_Sync_HandlerCollectionID
+//  Type:     Guid -- VT_CLSID
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 2
+DEFINE_PROPERTYKEY(PKEY_Sync_HandlerCollectionID, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 2);
+
+//  Name:     System.Sync.HandlerID -- PKEY_Sync_HandlerID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 3
+DEFINE_PROPERTYKEY(PKEY_Sync_HandlerID, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 3);
+
+//  Name:     System.Sync.HandlerName -- PKEY_Sync_HandlerName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CE50C159-2FB8-41FD-BE68-D3E042E274BC, 2
+DEFINE_PROPERTYKEY(PKEY_Sync_HandlerName, 0xCE50C159, 0x2FB8, 0x41FD, 0xBE, 0x68, 0xD3, 0xE0, 0x42, 0xE2, 0x74, 0xBC, 2);
+
+//  Name:     System.Sync.HandlerType -- PKEY_Sync_HandlerType
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 8
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Sync_HandlerType, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 8);
+
+// Possible discrete values for PKEY_Sync_HandlerType are:
+#define SYNC_HANDLERTYPE_OTHER              0ul
+#define SYNC_HANDLERTYPE_PROGRAMS           1ul
+#define SYNC_HANDLERTYPE_DEVICES            2ul
+#define SYNC_HANDLERTYPE_FOLDERS            3ul
+#define SYNC_HANDLERTYPE_WEBSERVICES        4ul
+#define SYNC_HANDLERTYPE_COMPUTERS          5ul
+
+//  Name:     System.Sync.HandlerTypeLabel -- PKEY_Sync_HandlerTypeLabel
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 9
+//  
+//  
+DEFINE_PROPERTYKEY(PKEY_Sync_HandlerTypeLabel, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 9);
+
+//  Name:     System.Sync.ItemID -- PKEY_Sync_ItemID
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 7BD5533E-AF15-44DB-B8C8-BD6624E1D032, 6
+DEFINE_PROPERTYKEY(PKEY_Sync_ItemID, 0x7BD5533E, 0xAF15, 0x44DB, 0xB8, 0xC8, 0xBD, 0x66, 0x24, 0xE1, 0xD0, 0x32, 6);
+
+//  Name:     System.Sync.ItemName -- PKEY_Sync_ItemName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: CE50C159-2FB8-41FD-BE68-D3E042E274BC, 3
+DEFINE_PROPERTYKEY(PKEY_Sync_ItemName, 0xCE50C159, 0x2FB8, 0x41FD, 0xBE, 0x68, 0xD3, 0xE0, 0x42, 0xE2, 0x74, 0xBC, 3);
+ 
+//-----------------------------------------------------------------------------
+// Task properties
+
+//  Name:     System.Task.BillingInformation -- PKEY_Task_BillingInformation
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: D37D52C6-261C-4303-82B3-08B926AC6F12, 100
+DEFINE_PROPERTYKEY(PKEY_Task_BillingInformation, 0xD37D52C6, 0x261C, 0x4303, 0x82, 0xB3, 0x08, 0xB9, 0x26, 0xAC, 0x6F, 0x12, 100);
+
+//  Name:     System.Task.CompletionStatus -- PKEY_Task_CompletionStatus
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 084D8A0A-E6D5-40DE-BF1F-C8820E7C877C, 100
+DEFINE_PROPERTYKEY(PKEY_Task_CompletionStatus, 0x084D8A0A, 0xE6D5, 0x40DE, 0xBF, 0x1F, 0xC8, 0x82, 0x0E, 0x7C, 0x87, 0x7C, 100);
+
+//  Name:     System.Task.Owner -- PKEY_Task_Owner
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: 08C7CC5F-60F2-4494-AD75-55E3E0B5ADD0, 100
+DEFINE_PROPERTYKEY(PKEY_Task_Owner, 0x08C7CC5F, 0x60F2, 0x4494, 0xAD, 0x75, 0x55, 0xE3, 0xE0, 0xB5, 0xAD, 0xD0, 100);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// Video properties
+
+//  Name:     System.Video.Compression -- PKEY_Video_Compression
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 10 (PIDVSI_COMPRESSION)
+//
+//  Indicates the level of compression for the video stream.  "Compression".
+DEFINE_PROPERTYKEY(PKEY_Video_Compression, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 10);
+
+//  Name:     System.Video.Director -- PKEY_Video_Director
+//  Type:     Multivalue String -- VT_VECTOR | VT_LPWSTR  (For variants: VT_ARRAY | VT_BSTR)
+//  FormatID: (PSGUID_MEDIAFILESUMMARYINFORMATION) 64440492-4C8B-11D1-8B70-080036B11A03, 20 (PIDMSI_DIRECTOR)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Video_Director, 0x64440492, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 20);
+
+//  Name:     System.Video.EncodingBitrate -- PKEY_Video_EncodingBitrate
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 8 (PIDVSI_DATA_RATE)
+//
+//  Indicates the data rate in "bits per second" for the video stream. "DataRate".
+DEFINE_PROPERTYKEY(PKEY_Video_EncodingBitrate, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 8);
+
+//  Name:     System.Video.FourCC -- PKEY_Video_FourCC
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 44
+//  
+//  Indicates the 4CC for the video stream.
+DEFINE_PROPERTYKEY(PKEY_Video_FourCC, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 44);
+
+//  Name:     System.Video.FrameHeight -- PKEY_Video_FrameHeight
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 4
+//
+//  Indicates the frame height for the video stream.
+DEFINE_PROPERTYKEY(PKEY_Video_FrameHeight, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 4);
+
+//  Name:     System.Video.FrameRate -- PKEY_Video_FrameRate
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 6 (PIDVSI_FRAME_RATE)
+//
+//  Indicates the frame rate in "frames per millisecond" for the video stream.  "FrameRate".
+DEFINE_PROPERTYKEY(PKEY_Video_FrameRate, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 6);
+
+//  Name:     System.Video.FrameWidth -- PKEY_Video_FrameWidth
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 3
+//
+//  Indicates the frame width for the video stream.
+DEFINE_PROPERTYKEY(PKEY_Video_FrameWidth, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 3);
+
+//  Name:     System.Video.HorizontalAspectRatio -- PKEY_Video_HorizontalAspectRatio
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 42
+//  
+//  Indicates the horizontal portion of the aspect ratio. The X portion of XX:YY,
+//  like 16:9.
+DEFINE_PROPERTYKEY(PKEY_Video_HorizontalAspectRatio, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 42);
+
+//  Name:     System.Video.SampleSize -- PKEY_Video_SampleSize
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 9 (PIDVSI_SAMPLE_SIZE)
+//
+//  Indicates the sample size in bits for the video stream.  "SampleSize".
+DEFINE_PROPERTYKEY(PKEY_Video_SampleSize, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 9);
+
+//  Name:     System.Video.StreamName -- PKEY_Video_StreamName
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 2 (PIDVSI_STREAM_NAME)
+//
+//  Indicates the name for the video stream. "StreamName".
+DEFINE_PROPERTYKEY(PKEY_Video_StreamName, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 2);
+
+//  Name:     System.Video.StreamNumber -- PKEY_Video_StreamNumber
+//  Type:     UInt16 -- VT_UI2
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 11 (PIDVSI_STREAM_NUMBER)
+//
+//  "Stream Number".
+DEFINE_PROPERTYKEY(PKEY_Video_StreamNumber, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 11);
+
+//  Name:     System.Video.TotalBitrate -- PKEY_Video_TotalBitrate
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 43 (PIDVSI_TOTAL_BITRATE)
+//
+//  Indicates the total data rate in "bits per second" for all video and audio streams.
+DEFINE_PROPERTYKEY(PKEY_Video_TotalBitrate, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 43);
+
+//  Name:     System.Video.VerticalAspectRatio -- PKEY_Video_VerticalAspectRatio
+//  Type:     UInt32 -- VT_UI4
+//  FormatID: (FMTID_VideoSummaryInformation) 64440491-4C8B-11D1-8B70-080036B11A03, 45
+//  
+//  Indicates the vertical portion of the aspect ratio. The Y portion of 
+//  XX:YY, like 16:9.
+DEFINE_PROPERTYKEY(PKEY_Video_VerticalAspectRatio, 0x64440491, 0x4C8B, 0x11D1, 0x8B, 0x70, 0x08, 0x00, 0x36, 0xB1, 0x1A, 0x03, 45);
+
+ 
+ 
+//-----------------------------------------------------------------------------
+// Volume properties
+
+//  Name:     System.Volume.FileSystem -- PKEY_Volume_FileSystem
+//  Type:     String -- VT_LPWSTR  (For variants: VT_BSTR)
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 4 (PID_VOLUME_FILESYSTEM)  (Filesystem Volume Properties)
+//
+//  Indicates the filesystem of the volume.
+DEFINE_PROPERTYKEY(PKEY_Volume_FileSystem, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 4);
+
+//  Name:     System.Volume.IsMappedDrive -- PKEY_Volume_IsMappedDrive
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: 149C0B69-2C2D-48FC-808F-D318D78C4636, 2
+DEFINE_PROPERTYKEY(PKEY_Volume_IsMappedDrive, 0x149C0B69, 0x2C2D, 0x48FC, 0x80, 0x8F, 0xD3, 0x18, 0xD7, 0x8C, 0x46, 0x36, 2);
+
+//  Name:     System.Volume.IsRoot -- PKEY_Volume_IsRoot
+//  Type:     Boolean -- VT_BOOL
+//  FormatID: (FMTID_Volume) 9B174B35-40FF-11D2-A27E-00C04FC30871, 10  (Filesystem Volume Properties)
+//
+//  
+DEFINE_PROPERTYKEY(PKEY_Volume_IsRoot, 0x9B174B35, 0x40FF, 0x11D2, 0xA2, 0x7E, 0x00, 0xC0, 0x4F, 0xC3, 0x08, 0x71, 10);
+
+#endif  /* _INC_PROPKEY */
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkeydef.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkeydef.h
new file mode 100644
index 0000000000..a361044e56
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propkeydef.h
@@ -0,0 +1,26 @@
+#ifndef PID_FIRST_USABLE
+#define PID_FIRST_USABLE 2
+#endif
+
+#ifndef REFPROPERTYKEY
+#ifdef __cplusplus
+#define REFPROPERTYKEY const PROPERTYKEY &
+#else // !__cplusplus
+#define REFPROPERTYKEY const PROPERTYKEY * __MIDL_CONST
+#endif // __cplusplus
+#endif //REFPROPERTYKEY
+
+#ifdef DEFINE_PROPERTYKEY
+#undef DEFINE_PROPERTYKEY
+#endif
+
+#ifdef INITGUID
+#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name = { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
+#else
+#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) EXTERN_C const PROPERTYKEY name
+#endif // INITGUID
+
+#ifndef IsEqualPropertyKey
+#define IsEqualPropertyKey(a, b)   (((a).pid == (b).pid) && IsEqualIID((a).fmtid, (b).fmtid) )
+#endif  // IsEqualPropertyKey
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/propsys.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propsys.h
new file mode 100644
index 0000000000..5ed560803f
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/propsys.h
@@ -0,0 +1,3605 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for propsys.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __propsys_h__
+#define __propsys_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IInitializeWithFile_FWD_DEFINED__
+#define __IInitializeWithFile_FWD_DEFINED__
+typedef interface IInitializeWithFile IInitializeWithFile;
+#endif 	/* __IInitializeWithFile_FWD_DEFINED__ */
+
+
+#ifndef __IInitializeWithStream_FWD_DEFINED__
+#define __IInitializeWithStream_FWD_DEFINED__
+typedef interface IInitializeWithStream IInitializeWithStream;
+#endif 	/* __IInitializeWithStream_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyStore_FWD_DEFINED__
+#define __IPropertyStore_FWD_DEFINED__
+typedef interface IPropertyStore IPropertyStore;
+#endif 	/* __IPropertyStore_FWD_DEFINED__ */
+
+
+#ifndef __INamedPropertyStore_FWD_DEFINED__
+#define __INamedPropertyStore_FWD_DEFINED__
+typedef interface INamedPropertyStore INamedPropertyStore;
+#endif 	/* __INamedPropertyStore_FWD_DEFINED__ */
+
+
+#ifndef __IObjectWithPropertyKey_FWD_DEFINED__
+#define __IObjectWithPropertyKey_FWD_DEFINED__
+typedef interface IObjectWithPropertyKey IObjectWithPropertyKey;
+#endif 	/* __IObjectWithPropertyKey_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyChange_FWD_DEFINED__
+#define __IPropertyChange_FWD_DEFINED__
+typedef interface IPropertyChange IPropertyChange;
+#endif 	/* __IPropertyChange_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyChangeArray_FWD_DEFINED__
+#define __IPropertyChangeArray_FWD_DEFINED__
+typedef interface IPropertyChangeArray IPropertyChangeArray;
+#endif 	/* __IPropertyChangeArray_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyStoreCapabilities_FWD_DEFINED__
+#define __IPropertyStoreCapabilities_FWD_DEFINED__
+typedef interface IPropertyStoreCapabilities IPropertyStoreCapabilities;
+#endif 	/* __IPropertyStoreCapabilities_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyStoreCache_FWD_DEFINED__
+#define __IPropertyStoreCache_FWD_DEFINED__
+typedef interface IPropertyStoreCache IPropertyStoreCache;
+#endif 	/* __IPropertyStoreCache_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyEnumType_FWD_DEFINED__
+#define __IPropertyEnumType_FWD_DEFINED__
+typedef interface IPropertyEnumType IPropertyEnumType;
+#endif 	/* __IPropertyEnumType_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyEnumTypeList_FWD_DEFINED__
+#define __IPropertyEnumTypeList_FWD_DEFINED__
+typedef interface IPropertyEnumTypeList IPropertyEnumTypeList;
+#endif 	/* __IPropertyEnumTypeList_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyDescription_FWD_DEFINED__
+#define __IPropertyDescription_FWD_DEFINED__
+typedef interface IPropertyDescription IPropertyDescription;
+#endif 	/* __IPropertyDescription_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionAliasInfo_FWD_DEFINED__
+#define __IPropertyDescriptionAliasInfo_FWD_DEFINED__
+typedef interface IPropertyDescriptionAliasInfo IPropertyDescriptionAliasInfo;
+#endif 	/* __IPropertyDescriptionAliasInfo_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionSearchInfo_FWD_DEFINED__
+#define __IPropertyDescriptionSearchInfo_FWD_DEFINED__
+typedef interface IPropertyDescriptionSearchInfo IPropertyDescriptionSearchInfo;
+#endif 	/* __IPropertyDescriptionSearchInfo_FWD_DEFINED__ */
+
+
+#ifndef __IPropertySystem_FWD_DEFINED__
+#define __IPropertySystem_FWD_DEFINED__
+typedef interface IPropertySystem IPropertySystem;
+#endif 	/* __IPropertySystem_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionList_FWD_DEFINED__
+#define __IPropertyDescriptionList_FWD_DEFINED__
+typedef interface IPropertyDescriptionList IPropertyDescriptionList;
+#endif 	/* __IPropertyDescriptionList_FWD_DEFINED__ */
+
+
+#ifndef __IPropertyStoreFactory_FWD_DEFINED__
+#define __IPropertyStoreFactory_FWD_DEFINED__
+typedef interface IPropertyStoreFactory IPropertyStoreFactory;
+#endif 	/* __IPropertyStoreFactory_FWD_DEFINED__ */
+
+
+#ifndef __IDelayedPropertyStoreFactory_FWD_DEFINED__
+#define __IDelayedPropertyStoreFactory_FWD_DEFINED__
+typedef interface IDelayedPropertyStoreFactory IDelayedPropertyStoreFactory;
+#endif 	/* __IDelayedPropertyStoreFactory_FWD_DEFINED__ */
+
+
+#ifndef __IPersistSerializedPropStorage_FWD_DEFINED__
+#define __IPersistSerializedPropStorage_FWD_DEFINED__
+typedef interface IPersistSerializedPropStorage IPersistSerializedPropStorage;
+#endif 	/* __IPersistSerializedPropStorage_FWD_DEFINED__ */
+
+
+#ifndef __IPropertySystemChangeNotify_FWD_DEFINED__
+#define __IPropertySystemChangeNotify_FWD_DEFINED__
+typedef interface IPropertySystemChangeNotify IPropertySystemChangeNotify;
+#endif 	/* __IPropertySystemChangeNotify_FWD_DEFINED__ */
+
+
+#ifndef __ICreateObject_FWD_DEFINED__
+#define __ICreateObject_FWD_DEFINED__
+typedef interface ICreateObject ICreateObject;
+#endif 	/* __ICreateObject_FWD_DEFINED__ */
+
+
+#ifndef __InMemoryPropertyStore_FWD_DEFINED__
+#define __InMemoryPropertyStore_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class InMemoryPropertyStore InMemoryPropertyStore;
+#else
+typedef struct InMemoryPropertyStore InMemoryPropertyStore;
+#endif /* __cplusplus */
+
+#endif 	/* __InMemoryPropertyStore_FWD_DEFINED__ */
+
+
+#ifndef __PropertySystem_FWD_DEFINED__
+#define __PropertySystem_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class PropertySystem PropertySystem;
+#else
+typedef struct PropertySystem PropertySystem;
+#endif /* __cplusplus */
+
+#endif 	/* __PropertySystem_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "objidl.h"
+#include "oleidl.h"
+#include "ocidl.h"
+#include "shtypes.h"
+#include "structuredquery.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_propsys_0000_0000 */
+/* [local] */ 
+
+#ifndef PSSTDAPI
+#if defined(_PROPSYS_)
+#define PSSTDAPI          STDAPI
+#define PSSTDAPI_(type)   STDAPI_(type)
+#else
+#define PSSTDAPI          EXTERN_C DECLSPEC_IMPORT HRESULT STDAPICALLTYPE
+#define PSSTDAPI_(type)   EXTERN_C DECLSPEC_IMPORT type STDAPICALLTYPE
+#endif
+#endif // PSSTDAPI
+#if 0
+typedef PROPERTYKEY *REFPROPERTYKEY;
+
+#endif // 0
+#include <propkeydef.h>
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IInitializeWithFile_INTERFACE_DEFINED__
+#define __IInitializeWithFile_INTERFACE_DEFINED__
+
+/* interface IInitializeWithFile */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IInitializeWithFile;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("b7d14566-0509-4cce-a71f-0a554233bd9b")
+    IInitializeWithFile : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Initialize( 
+            /* [string][in] */ __RPC__in LPCWSTR pszFilePath,
+            /* [in] */ DWORD grfMode) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IInitializeWithFileVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IInitializeWithFile * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IInitializeWithFile * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IInitializeWithFile * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Initialize )( 
+            IInitializeWithFile * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszFilePath,
+            /* [in] */ DWORD grfMode);
+        
+        END_INTERFACE
+    } IInitializeWithFileVtbl;
+
+    interface IInitializeWithFile
+    {
+        CONST_VTBL struct IInitializeWithFileVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IInitializeWithFile_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IInitializeWithFile_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IInitializeWithFile_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IInitializeWithFile_Initialize(This,pszFilePath,grfMode)	\
+    ( (This)->lpVtbl -> Initialize(This,pszFilePath,grfMode) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IInitializeWithFile_INTERFACE_DEFINED__ */
+
+
+#ifndef __IInitializeWithStream_INTERFACE_DEFINED__
+#define __IInitializeWithStream_INTERFACE_DEFINED__
+
+/* interface IInitializeWithStream */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IInitializeWithStream;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("b824b49d-22ac-4161-ac8a-9916e8fa3f7f")
+    IInitializeWithStream : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Initialize( 
+            /* [in] */ IStream *pstream,
+            /* [in] */ DWORD grfMode) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IInitializeWithStreamVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IInitializeWithStream * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IInitializeWithStream * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IInitializeWithStream * This);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Initialize )( 
+            IInitializeWithStream * This,
+            /* [in] */ IStream *pstream,
+            /* [in] */ DWORD grfMode);
+        
+        END_INTERFACE
+    } IInitializeWithStreamVtbl;
+
+    interface IInitializeWithStream
+    {
+        CONST_VTBL struct IInitializeWithStreamVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IInitializeWithStream_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IInitializeWithStream_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IInitializeWithStream_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IInitializeWithStream_Initialize(This,pstream,grfMode)	\
+    ( (This)->lpVtbl -> Initialize(This,pstream,grfMode) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IInitializeWithStream_RemoteInitialize_Proxy( 
+    IInitializeWithStream * This,
+    /* [in] */ __RPC__in_opt IStream *pstream,
+    /* [in] */ DWORD grfMode);
+
+
+void __RPC_STUB IInitializeWithStream_RemoteInitialize_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __IInitializeWithStream_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyStore_INTERFACE_DEFINED__
+#define __IPropertyStore_INTERFACE_DEFINED__
+
+/* interface IPropertyStore */
+/* [unique][object][helpstring][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyStore;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99")
+    IPropertyStore : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ __RPC__out DWORD *cProps) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAt( 
+            /* [in] */ DWORD iProp,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetValue( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PROPVARIANT *pv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetValue( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Commit( void) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyStoreVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyStore * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyStore * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyStore * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPropertyStore * This,
+            /* [out] */ __RPC__out DWORD *cProps);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAt )( 
+            IPropertyStore * This,
+            /* [in] */ DWORD iProp,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValue )( 
+            IPropertyStore * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PROPVARIANT *pv);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetValue )( 
+            IPropertyStore * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *Commit )( 
+            IPropertyStore * This);
+        
+        END_INTERFACE
+    } IPropertyStoreVtbl;
+
+    interface IPropertyStore
+    {
+        CONST_VTBL struct IPropertyStoreVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyStore_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyStore_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyStore_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyStore_GetCount(This,cProps)	\
+    ( (This)->lpVtbl -> GetCount(This,cProps) ) 
+
+#define IPropertyStore_GetAt(This,iProp,pkey)	\
+    ( (This)->lpVtbl -> GetAt(This,iProp,pkey) ) 
+
+#define IPropertyStore_GetValue(This,key,pv)	\
+    ( (This)->lpVtbl -> GetValue(This,key,pv) ) 
+
+#define IPropertyStore_SetValue(This,key,propvar)	\
+    ( (This)->lpVtbl -> SetValue(This,key,propvar) ) 
+
+#define IPropertyStore_Commit(This)	\
+    ( (This)->lpVtbl -> Commit(This) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyStore_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0003 */
+/* [local] */ 
+
+typedef /* [unique] */  __RPC_unique_pointer IPropertyStore *LPPROPERTYSTORE;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0003_v0_0_s_ifspec;
+
+#ifndef __INamedPropertyStore_INTERFACE_DEFINED__
+#define __INamedPropertyStore_INTERFACE_DEFINED__
+
+/* interface INamedPropertyStore */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_INamedPropertyStore;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("71604b0f-97b0-4764-8577-2f13e98a1422")
+    INamedPropertyStore : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetNamedValue( 
+            /* [string][in] */ __RPC__in LPCWSTR pszName,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetNamedValue( 
+            /* [string][in] */ __RPC__in LPCWSTR pszName,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetNameCount( 
+            /* [out] */ __RPC__out DWORD *pdwCount) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetNameAt( 
+            /* [in] */ DWORD iProp,
+            /* [out] */ __RPC__deref_out_opt BSTR *pbstrName) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct INamedPropertyStoreVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            INamedPropertyStore * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            INamedPropertyStore * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            INamedPropertyStore * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetNamedValue )( 
+            INamedPropertyStore * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszName,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetNamedValue )( 
+            INamedPropertyStore * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszName,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetNameCount )( 
+            INamedPropertyStore * This,
+            /* [out] */ __RPC__out DWORD *pdwCount);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetNameAt )( 
+            INamedPropertyStore * This,
+            /* [in] */ DWORD iProp,
+            /* [out] */ __RPC__deref_out_opt BSTR *pbstrName);
+        
+        END_INTERFACE
+    } INamedPropertyStoreVtbl;
+
+    interface INamedPropertyStore
+    {
+        CONST_VTBL struct INamedPropertyStoreVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define INamedPropertyStore_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define INamedPropertyStore_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define INamedPropertyStore_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define INamedPropertyStore_GetNamedValue(This,pszName,ppropvar)	\
+    ( (This)->lpVtbl -> GetNamedValue(This,pszName,ppropvar) ) 
+
+#define INamedPropertyStore_SetNamedValue(This,pszName,propvar)	\
+    ( (This)->lpVtbl -> SetNamedValue(This,pszName,propvar) ) 
+
+#define INamedPropertyStore_GetNameCount(This,pdwCount)	\
+    ( (This)->lpVtbl -> GetNameCount(This,pdwCount) ) 
+
+#define INamedPropertyStore_GetNameAt(This,iProp,pbstrName)	\
+    ( (This)->lpVtbl -> GetNameAt(This,iProp,pbstrName) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __INamedPropertyStore_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0004 */
+/* [local] */ 
+
+/* [v1_enum] */ 
+enum tagGETPROPERTYSTOREFLAGS
+    {	GPS_DEFAULT	= 0,
+	GPS_HANDLERPROPERTIESONLY	= 0x1,
+	GPS_READWRITE	= 0x2,
+	GPS_TEMPORARY	= 0x4,
+	GPS_FASTPROPERTIESONLY	= 0x8,
+	GPS_OPENSLOWITEM	= 0x10,
+	GPS_DELAYCREATION	= 0x20,
+	GPS_BESTEFFORT	= 0x40,
+	GPS_MASK_VALID	= 0x7f
+    } ;
+typedef int GETPROPERTYSTOREFLAGS;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0004_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0004_v0_0_s_ifspec;
+
+#ifndef __IObjectWithPropertyKey_INTERFACE_DEFINED__
+#define __IObjectWithPropertyKey_INTERFACE_DEFINED__
+
+/* interface IObjectWithPropertyKey */
+/* [uuid][object] */ 
+
+
+EXTERN_C const IID IID_IObjectWithPropertyKey;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("fc0ca0a7-c316-4fd2-9031-3e628e6d4f23")
+    IObjectWithPropertyKey : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE SetPropertyKey( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyKey( 
+            /* [out] */ __RPC__out PROPERTYKEY *pkey) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IObjectWithPropertyKeyVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IObjectWithPropertyKey * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IObjectWithPropertyKey * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IObjectWithPropertyKey * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetPropertyKey )( 
+            IObjectWithPropertyKey * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyKey )( 
+            IObjectWithPropertyKey * This,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        END_INTERFACE
+    } IObjectWithPropertyKeyVtbl;
+
+    interface IObjectWithPropertyKey
+    {
+        CONST_VTBL struct IObjectWithPropertyKeyVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IObjectWithPropertyKey_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IObjectWithPropertyKey_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IObjectWithPropertyKey_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IObjectWithPropertyKey_SetPropertyKey(This,key)	\
+    ( (This)->lpVtbl -> SetPropertyKey(This,key) ) 
+
+#define IObjectWithPropertyKey_GetPropertyKey(This,pkey)	\
+    ( (This)->lpVtbl -> GetPropertyKey(This,pkey) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IObjectWithPropertyKey_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0005 */
+/* [local] */ 
+
+typedef /* [v1_enum] */ 
+enum tagPKA_FLAGS
+    {	PKA_SET	= 0,
+	PKA_APPEND	= ( PKA_SET + 1 ) ,
+	PKA_DELETE	= ( PKA_APPEND + 1 ) 
+    } 	PKA_FLAGS;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0005_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0005_v0_0_s_ifspec;
+
+#ifndef __IPropertyChange_INTERFACE_DEFINED__
+#define __IPropertyChange_INTERFACE_DEFINED__
+
+/* interface IPropertyChange */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyChange;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("f917bc8a-1bba-4478-a245-1bde03eb9431")
+    IPropertyChange : public IObjectWithPropertyKey
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE ApplyToPropVariant( 
+            /* [in] */ __RPC__in REFPROPVARIANT propvarIn,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarOut) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyChangeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyChange * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyChange * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyChange * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetPropertyKey )( 
+            IPropertyChange * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyKey )( 
+            IPropertyChange * This,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *ApplyToPropVariant )( 
+            IPropertyChange * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvarIn,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarOut);
+        
+        END_INTERFACE
+    } IPropertyChangeVtbl;
+
+    interface IPropertyChange
+    {
+        CONST_VTBL struct IPropertyChangeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyChange_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyChange_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyChange_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyChange_SetPropertyKey(This,key)	\
+    ( (This)->lpVtbl -> SetPropertyKey(This,key) ) 
+
+#define IPropertyChange_GetPropertyKey(This,pkey)	\
+    ( (This)->lpVtbl -> GetPropertyKey(This,pkey) ) 
+
+
+#define IPropertyChange_ApplyToPropVariant(This,propvarIn,ppropvarOut)	\
+    ( (This)->lpVtbl -> ApplyToPropVariant(This,propvarIn,ppropvarOut) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyChange_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyChangeArray_INTERFACE_DEFINED__
+#define __IPropertyChangeArray_INTERFACE_DEFINED__
+
+/* interface IPropertyChangeArray */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyChangeArray;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("380f5cad-1b5e-42f2-805d-637fd392d31e")
+    IPropertyChangeArray : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ __RPC__out UINT *pcOperations) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAt( 
+            /* [in] */ UINT iIndex,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE InsertAt( 
+            /* [in] */ UINT iIndex,
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Append( 
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE AppendOrReplace( 
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RemoveAt( 
+            /* [in] */ UINT iIndex) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE IsKeyInArray( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyChangeArrayVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyChangeArray * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyChangeArray * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyChangeArray * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPropertyChangeArray * This,
+            /* [out] */ __RPC__out UINT *pcOperations);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAt )( 
+            IPropertyChangeArray * This,
+            /* [in] */ UINT iIndex,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *InsertAt )( 
+            IPropertyChangeArray * This,
+            /* [in] */ UINT iIndex,
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange);
+        
+        HRESULT ( STDMETHODCALLTYPE *Append )( 
+            IPropertyChangeArray * This,
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange);
+        
+        HRESULT ( STDMETHODCALLTYPE *AppendOrReplace )( 
+            IPropertyChangeArray * This,
+            /* [in] */ __RPC__in_opt IPropertyChange *ppropChange);
+        
+        HRESULT ( STDMETHODCALLTYPE *RemoveAt )( 
+            IPropertyChangeArray * This,
+            /* [in] */ UINT iIndex);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsKeyInArray )( 
+            IPropertyChangeArray * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key);
+        
+        END_INTERFACE
+    } IPropertyChangeArrayVtbl;
+
+    interface IPropertyChangeArray
+    {
+        CONST_VTBL struct IPropertyChangeArrayVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyChangeArray_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyChangeArray_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyChangeArray_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyChangeArray_GetCount(This,pcOperations)	\
+    ( (This)->lpVtbl -> GetCount(This,pcOperations) ) 
+
+#define IPropertyChangeArray_GetAt(This,iIndex,riid,ppv)	\
+    ( (This)->lpVtbl -> GetAt(This,iIndex,riid,ppv) ) 
+
+#define IPropertyChangeArray_InsertAt(This,iIndex,ppropChange)	\
+    ( (This)->lpVtbl -> InsertAt(This,iIndex,ppropChange) ) 
+
+#define IPropertyChangeArray_Append(This,ppropChange)	\
+    ( (This)->lpVtbl -> Append(This,ppropChange) ) 
+
+#define IPropertyChangeArray_AppendOrReplace(This,ppropChange)	\
+    ( (This)->lpVtbl -> AppendOrReplace(This,ppropChange) ) 
+
+#define IPropertyChangeArray_RemoveAt(This,iIndex)	\
+    ( (This)->lpVtbl -> RemoveAt(This,iIndex) ) 
+
+#define IPropertyChangeArray_IsKeyInArray(This,key)	\
+    ( (This)->lpVtbl -> IsKeyInArray(This,key) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyChangeArray_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyStoreCapabilities_INTERFACE_DEFINED__
+#define __IPropertyStoreCapabilities_INTERFACE_DEFINED__
+
+/* interface IPropertyStoreCapabilities */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyStoreCapabilities;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("c8e2d566-186e-4d49-bf41-6909ead56acc")
+    IPropertyStoreCapabilities : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE IsPropertyWritable( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyStoreCapabilitiesVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyStoreCapabilities * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyStoreCapabilities * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyStoreCapabilities * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsPropertyWritable )( 
+            IPropertyStoreCapabilities * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key);
+        
+        END_INTERFACE
+    } IPropertyStoreCapabilitiesVtbl;
+
+    interface IPropertyStoreCapabilities
+    {
+        CONST_VTBL struct IPropertyStoreCapabilitiesVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyStoreCapabilities_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyStoreCapabilities_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyStoreCapabilities_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyStoreCapabilities_IsPropertyWritable(This,key)	\
+    ( (This)->lpVtbl -> IsPropertyWritable(This,key) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyStoreCapabilities_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyStoreCache_INTERFACE_DEFINED__
+#define __IPropertyStoreCache_INTERFACE_DEFINED__
+
+/* interface IPropertyStoreCache */
+/* [unique][object][uuid] */ 
+
+typedef /* [v1_enum] */ 
+enum _PSC_STATE
+    {	PSC_NORMAL	= 0,
+	PSC_NOTINSOURCE	= 1,
+	PSC_DIRTY	= 2,
+	PSC_READONLY	= 3
+    } 	PSC_STATE;
+
+
+EXTERN_C const IID IID_IPropertyStoreCache;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("3017056d-9a91-4e90-937d-746c72abbf4f")
+    IPropertyStoreCache : public IPropertyStore
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetState( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PSC_STATE *pstate) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetValueAndState( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar,
+            /* [out] */ __RPC__out PSC_STATE *pstate) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetState( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ PSC_STATE state) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetValueAndState( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [unique][in] */ __RPC__in_opt const PROPVARIANT *ppropvar,
+            /* [in] */ PSC_STATE state) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyStoreCacheVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyStoreCache * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyStoreCache * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPropertyStoreCache * This,
+            /* [out] */ __RPC__out DWORD *cProps);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAt )( 
+            IPropertyStoreCache * This,
+            /* [in] */ DWORD iProp,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValue )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PROPVARIANT *pv);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetValue )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *Commit )( 
+            IPropertyStoreCache * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetState )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PSC_STATE *pstate);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValueAndState )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar,
+            /* [out] */ __RPC__out PSC_STATE *pstate);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetState )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ PSC_STATE state);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetValueAndState )( 
+            IPropertyStoreCache * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [unique][in] */ __RPC__in_opt const PROPVARIANT *ppropvar,
+            /* [in] */ PSC_STATE state);
+        
+        END_INTERFACE
+    } IPropertyStoreCacheVtbl;
+
+    interface IPropertyStoreCache
+    {
+        CONST_VTBL struct IPropertyStoreCacheVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyStoreCache_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyStoreCache_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyStoreCache_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyStoreCache_GetCount(This,cProps)	\
+    ( (This)->lpVtbl -> GetCount(This,cProps) ) 
+
+#define IPropertyStoreCache_GetAt(This,iProp,pkey)	\
+    ( (This)->lpVtbl -> GetAt(This,iProp,pkey) ) 
+
+#define IPropertyStoreCache_GetValue(This,key,pv)	\
+    ( (This)->lpVtbl -> GetValue(This,key,pv) ) 
+
+#define IPropertyStoreCache_SetValue(This,key,propvar)	\
+    ( (This)->lpVtbl -> SetValue(This,key,propvar) ) 
+
+#define IPropertyStoreCache_Commit(This)	\
+    ( (This)->lpVtbl -> Commit(This) ) 
+
+
+#define IPropertyStoreCache_GetState(This,key,pstate)	\
+    ( (This)->lpVtbl -> GetState(This,key,pstate) ) 
+
+#define IPropertyStoreCache_GetValueAndState(This,key,ppropvar,pstate)	\
+    ( (This)->lpVtbl -> GetValueAndState(This,key,ppropvar,pstate) ) 
+
+#define IPropertyStoreCache_SetState(This,key,state)	\
+    ( (This)->lpVtbl -> SetState(This,key,state) ) 
+
+#define IPropertyStoreCache_SetValueAndState(This,key,ppropvar,state)	\
+    ( (This)->lpVtbl -> SetValueAndState(This,key,ppropvar,state) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyStoreCache_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyEnumType_INTERFACE_DEFINED__
+#define __IPropertyEnumType_INTERFACE_DEFINED__
+
+/* interface IPropertyEnumType */
+/* [unique][object][uuid] */ 
+
+/* [v1_enum] */ 
+enum tagPROPENUMTYPE
+    {	PET_DISCRETEVALUE	= 0,
+	PET_RANGEDVALUE	= 1,
+	PET_DEFAULTVALUE	= 2,
+	PET_ENDRANGE	= 3
+    } ;
+typedef enum tagPROPENUMTYPE PROPENUMTYPE;
+
+
+EXTERN_C const IID IID_IPropertyEnumType;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("11e1fbf9-2d56-4a6b-8db3-7cd193a471f2")
+    IPropertyEnumType : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetEnumType( 
+            /* [out] */ __RPC__out PROPENUMTYPE *penumtype) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetValue( 
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetRangeMinValue( 
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarMin) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetRangeSetValue( 
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarSet) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetDisplayText( 
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszDisplay) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyEnumTypeVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyEnumType * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyEnumType * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyEnumType * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEnumType )( 
+            IPropertyEnumType * This,
+            /* [out] */ __RPC__out PROPENUMTYPE *penumtype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValue )( 
+            IPropertyEnumType * This,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRangeMinValue )( 
+            IPropertyEnumType * This,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarMin);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRangeSetValue )( 
+            IPropertyEnumType * This,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarSet);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayText )( 
+            IPropertyEnumType * This,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszDisplay);
+        
+        END_INTERFACE
+    } IPropertyEnumTypeVtbl;
+
+    interface IPropertyEnumType
+    {
+        CONST_VTBL struct IPropertyEnumTypeVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyEnumType_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyEnumType_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyEnumType_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyEnumType_GetEnumType(This,penumtype)	\
+    ( (This)->lpVtbl -> GetEnumType(This,penumtype) ) 
+
+#define IPropertyEnumType_GetValue(This,ppropvar)	\
+    ( (This)->lpVtbl -> GetValue(This,ppropvar) ) 
+
+#define IPropertyEnumType_GetRangeMinValue(This,ppropvarMin)	\
+    ( (This)->lpVtbl -> GetRangeMinValue(This,ppropvarMin) ) 
+
+#define IPropertyEnumType_GetRangeSetValue(This,ppropvarSet)	\
+    ( (This)->lpVtbl -> GetRangeSetValue(This,ppropvarSet) ) 
+
+#define IPropertyEnumType_GetDisplayText(This,ppszDisplay)	\
+    ( (This)->lpVtbl -> GetDisplayText(This,ppszDisplay) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyEnumType_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyEnumTypeList_INTERFACE_DEFINED__
+#define __IPropertyEnumTypeList_INTERFACE_DEFINED__
+
+/* interface IPropertyEnumTypeList */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyEnumTypeList;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("a99400f4-3d84-4557-94ba-1242fb2cc9a6")
+    IPropertyEnumTypeList : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ __RPC__out UINT *pctypes) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAt( 
+            /* [in] */ UINT itype,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetConditionAt( 
+            /* [in] */ UINT nIndex,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE FindMatchingIndex( 
+            /* [in] */ __RPC__in REFPROPVARIANT propvarCmp,
+            /* [out] */ __RPC__out UINT *pnIndex) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyEnumTypeListVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyEnumTypeList * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyEnumTypeList * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyEnumTypeList * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPropertyEnumTypeList * This,
+            /* [out] */ __RPC__out UINT *pctypes);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAt )( 
+            IPropertyEnumTypeList * This,
+            /* [in] */ UINT itype,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetConditionAt )( 
+            IPropertyEnumTypeList * This,
+            /* [in] */ UINT nIndex,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *FindMatchingIndex )( 
+            IPropertyEnumTypeList * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvarCmp,
+            /* [out] */ __RPC__out UINT *pnIndex);
+        
+        END_INTERFACE
+    } IPropertyEnumTypeListVtbl;
+
+    interface IPropertyEnumTypeList
+    {
+        CONST_VTBL struct IPropertyEnumTypeListVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyEnumTypeList_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyEnumTypeList_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyEnumTypeList_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyEnumTypeList_GetCount(This,pctypes)	\
+    ( (This)->lpVtbl -> GetCount(This,pctypes) ) 
+
+#define IPropertyEnumTypeList_GetAt(This,itype,riid,ppv)	\
+    ( (This)->lpVtbl -> GetAt(This,itype,riid,ppv) ) 
+
+#define IPropertyEnumTypeList_GetConditionAt(This,nIndex,riid,ppv)	\
+    ( (This)->lpVtbl -> GetConditionAt(This,nIndex,riid,ppv) ) 
+
+#define IPropertyEnumTypeList_FindMatchingIndex(This,propvarCmp,pnIndex)	\
+    ( (This)->lpVtbl -> FindMatchingIndex(This,propvarCmp,pnIndex) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyEnumTypeList_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyDescription_INTERFACE_DEFINED__
+#define __IPropertyDescription_INTERFACE_DEFINED__
+
+/* interface IPropertyDescription */
+/* [unique][object][uuid] */ 
+
+/* [v1_enum] */ 
+enum tagPROPDESC_TYPE_FLAGS
+    {	PDTF_DEFAULT	= 0,
+	PDTF_MULTIPLEVALUES	= 0x1,
+	PDTF_ISINNATE	= 0x2,
+	PDTF_ISGROUP	= 0x4,
+	PDTF_CANGROUPBY	= 0x8,
+	PDTF_CANSTACKBY	= 0x10,
+	PDTF_ISTREEPROPERTY	= 0x20,
+	PDTF_INCLUDEINFULLTEXTQUERY	= 0x40,
+	PDTF_ISVIEWABLE	= 0x80,
+	PDTF_ISQUERYABLE	= 0x100,
+	PDTF_ISSYSTEMPROPERTY	= 0x80000000,
+	PDTF_MASK_ALL	= 0x800001ff
+    } ;
+typedef int PROPDESC_TYPE_FLAGS;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_VIEW_FLAGS
+    {	PDVF_DEFAULT	= 0,
+	PDVF_CENTERALIGN	= 0x1,
+	PDVF_RIGHTALIGN	= 0x2,
+	PDVF_BEGINNEWGROUP	= 0x4,
+	PDVF_FILLAREA	= 0x8,
+	PDVF_SORTDESCENDING	= 0x10,
+	PDVF_SHOWONLYIFPRESENT	= 0x20,
+	PDVF_SHOWBYDEFAULT	= 0x40,
+	PDVF_SHOWINPRIMARYLIST	= 0x80,
+	PDVF_SHOWINSECONDARYLIST	= 0x100,
+	PDVF_HIDELABEL	= 0x200,
+	PDVF_HIDDEN	= 0x800,
+	PDVF_CANWRAP	= 0x1000,
+	PDVF_MASK_ALL	= 0x1bff
+    } ;
+typedef int PROPDESC_VIEW_FLAGS;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_DISPLAYTYPE
+    {	PDDT_STRING	= 0,
+	PDDT_NUMBER	= 1,
+	PDDT_BOOLEAN	= 2,
+	PDDT_DATETIME	= 3,
+	PDDT_ENUMERATED	= 4
+    } ;
+typedef enum tagPROPDESC_DISPLAYTYPE PROPDESC_DISPLAYTYPE;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_GROUPING_RANGE
+    {	PDGR_DISCRETE	= 0,
+	PDGR_ALPHANUMERIC	= 1,
+	PDGR_SIZE	= 2,
+	PDGR_DYNAMIC	= 3,
+	PDGR_DATE	= 4,
+	PDGR_PERCENT	= 5,
+	PDGR_ENUMERATED	= 6
+    } ;
+typedef enum tagPROPDESC_GROUPING_RANGE PROPDESC_GROUPING_RANGE;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_FORMAT_FLAGS
+    {	PDFF_DEFAULT	= 0,
+	PDFF_PREFIXNAME	= 0x1,
+	PDFF_FILENAME	= 0x2,
+	PDFF_ALWAYSKB	= 0x4,
+	PDFF_RESERVED_RIGHTTOLEFT	= 0x8,
+	PDFF_SHORTTIME	= 0x10,
+	PDFF_LONGTIME	= 0x20,
+	PDFF_HIDETIME	= 0x40,
+	PDFF_SHORTDATE	= 0x80,
+	PDFF_LONGDATE	= 0x100,
+	PDFF_HIDEDATE	= 0x200,
+	PDFF_RELATIVEDATE	= 0x400,
+	PDFF_USEEDITINVITATION	= 0x800,
+	PDFF_READONLY	= 0x1000,
+	PDFF_NOAUTOREADINGORDER	= 0x2000
+    } ;
+typedef int PROPDESC_FORMAT_FLAGS;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_SORTDESCRIPTION
+    {	PDSD_GENERAL	= 0,
+	PDSD_A_Z	= 1,
+	PDSD_LOWEST_HIGHEST	= 2,
+	PDSD_SMALLEST_BIGGEST	= 3,
+	PDSD_OLDEST_NEWEST	= 4
+    } ;
+typedef enum tagPROPDESC_SORTDESCRIPTION PROPDESC_SORTDESCRIPTION;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_RELATIVEDESCRIPTION_TYPE
+    {	PDRDT_GENERAL	= 0,
+	PDRDT_DATE	= 1,
+	PDRDT_SIZE	= 2,
+	PDRDT_COUNT	= 3,
+	PDRDT_REVISION	= 4,
+	PDRDT_LENGTH	= 5,
+	PDRDT_DURATION	= 6,
+	PDRDT_SPEED	= 7,
+	PDRDT_RATE	= 8,
+	PDRDT_RATING	= 9,
+	PDRDT_PRIORITY	= 10
+    } ;
+typedef enum tagPROPDESC_RELATIVEDESCRIPTION_TYPE PROPDESC_RELATIVEDESCRIPTION_TYPE;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_AGGREGATION_TYPE
+    {	PDAT_DEFAULT	= 0,
+	PDAT_FIRST	= 1,
+	PDAT_SUM	= 2,
+	PDAT_AVERAGE	= 3,
+	PDAT_DATERANGE	= 4,
+	PDAT_UNION	= 5,
+	PDAT_MAX	= 6,
+	PDAT_MIN	= 7
+    } ;
+typedef enum tagPROPDESC_AGGREGATION_TYPE PROPDESC_AGGREGATION_TYPE;
+
+/* [v1_enum] */ 
+enum tagPROPDESC_CONDITION_TYPE
+    {	PDCOT_NONE	= 0,
+	PDCOT_STRING	= 1,
+	PDCOT_SIZE	= 2,
+	PDCOT_DATETIME	= 3,
+	PDCOT_BOOLEAN	= 4,
+	PDCOT_NUMBER	= 5
+    } ;
+typedef enum tagPROPDESC_CONDITION_TYPE PROPDESC_CONDITION_TYPE;
+
+
+EXTERN_C const IID IID_IPropertyDescription;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("6f79d558-3e96-4549-a1d1-7d75d2288814")
+    IPropertyDescription : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyKey( 
+            /* [out] */ __RPC__out PROPERTYKEY *pkey) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetCanonicalName( 
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyType( 
+            /* [out] */ __RPC__out VARTYPE *pvartype) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetDisplayName( 
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetEditInvitation( 
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszInvite) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetTypeFlags( 
+            /* [in] */ PROPDESC_TYPE_FLAGS mask,
+            /* [out] */ __RPC__out PROPDESC_TYPE_FLAGS *ppdtFlags) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetViewFlags( 
+            /* [out] */ __RPC__out PROPDESC_VIEW_FLAGS *ppdvFlags) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnWidth( 
+            /* [out] */ __RPC__out UINT *pcxChars) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetDisplayType( 
+            /* [out] */ __RPC__out PROPDESC_DISPLAYTYPE *pdisplaytype) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetColumnState( 
+            /* [out] */ __RPC__out SHCOLSTATEF *pcsFlags) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetGroupingRange( 
+            /* [out] */ __RPC__out PROPDESC_GROUPING_RANGE *pgr) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetRelativeDescriptionType( 
+            /* [out] */ __RPC__out PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetRelativeDescription( 
+            /* [in] */ __RPC__in REFPROPVARIANT propvar1,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar2,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc1,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc2) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetSortDescription( 
+            /* [out] */ __RPC__out PROPDESC_SORTDESCRIPTION *psd) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetSortDescriptionLabel( 
+            /* [in] */ BOOL fDescending,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDescription) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAggregationType( 
+            /* [out] */ __RPC__out PROPDESC_AGGREGATION_TYPE *paggtype) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetConditionType( 
+            /* [out] */ __RPC__out PROPDESC_CONDITION_TYPE *pcontype,
+            /* [out] */ __RPC__out CONDITION_OPERATION *popDefault) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetEnumTypeList( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE CoerceToCanonicalValue( 
+            /* [out][in] */ PROPVARIANT *ppropvar) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE FormatForDisplay( 
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdfFlags,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE IsValueCanonical( 
+            /* [in] */ __RPC__in REFPROPVARIANT propvar) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyDescriptionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyDescription * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyDescription * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyDescription * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyKey )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCanonicalName )( 
+            IPropertyDescription * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyType )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out VARTYPE *pvartype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayName )( 
+            IPropertyDescription * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEditInvitation )( 
+            IPropertyDescription * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszInvite);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetTypeFlags )( 
+            IPropertyDescription * This,
+            /* [in] */ PROPDESC_TYPE_FLAGS mask,
+            /* [out] */ __RPC__out PROPDESC_TYPE_FLAGS *ppdtFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetViewFlags )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_VIEW_FLAGS *ppdvFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDefaultColumnWidth )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out UINT *pcxChars);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayType )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_DISPLAYTYPE *pdisplaytype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetColumnState )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out SHCOLSTATEF *pcsFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetGroupingRange )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_GROUPING_RANGE *pgr);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescriptionType )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescription )( 
+            IPropertyDescription * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar1,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar2,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc1,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc2);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescription )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_SORTDESCRIPTION *psd);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescriptionLabel )( 
+            IPropertyDescription * This,
+            /* [in] */ BOOL fDescending,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDescription);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAggregationType )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_AGGREGATION_TYPE *paggtype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetConditionType )( 
+            IPropertyDescription * This,
+            /* [out] */ __RPC__out PROPDESC_CONDITION_TYPE *pcontype,
+            /* [out] */ __RPC__out CONDITION_OPERATION *popDefault);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEnumTypeList )( 
+            IPropertyDescription * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *CoerceToCanonicalValue )( 
+            IPropertyDescription * This,
+            /* [out][in] */ PROPVARIANT *ppropvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *FormatForDisplay )( 
+            IPropertyDescription * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdfFlags,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsValueCanonical )( 
+            IPropertyDescription * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        END_INTERFACE
+    } IPropertyDescriptionVtbl;
+
+    interface IPropertyDescription
+    {
+        CONST_VTBL struct IPropertyDescriptionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyDescription_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyDescription_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyDescription_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyDescription_GetPropertyKey(This,pkey)	\
+    ( (This)->lpVtbl -> GetPropertyKey(This,pkey) ) 
+
+#define IPropertyDescription_GetCanonicalName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetCanonicalName(This,ppszName) ) 
+
+#define IPropertyDescription_GetPropertyType(This,pvartype)	\
+    ( (This)->lpVtbl -> GetPropertyType(This,pvartype) ) 
+
+#define IPropertyDescription_GetDisplayName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetDisplayName(This,ppszName) ) 
+
+#define IPropertyDescription_GetEditInvitation(This,ppszInvite)	\
+    ( (This)->lpVtbl -> GetEditInvitation(This,ppszInvite) ) 
+
+#define IPropertyDescription_GetTypeFlags(This,mask,ppdtFlags)	\
+    ( (This)->lpVtbl -> GetTypeFlags(This,mask,ppdtFlags) ) 
+
+#define IPropertyDescription_GetViewFlags(This,ppdvFlags)	\
+    ( (This)->lpVtbl -> GetViewFlags(This,ppdvFlags) ) 
+
+#define IPropertyDescription_GetDefaultColumnWidth(This,pcxChars)	\
+    ( (This)->lpVtbl -> GetDefaultColumnWidth(This,pcxChars) ) 
+
+#define IPropertyDescription_GetDisplayType(This,pdisplaytype)	\
+    ( (This)->lpVtbl -> GetDisplayType(This,pdisplaytype) ) 
+
+#define IPropertyDescription_GetColumnState(This,pcsFlags)	\
+    ( (This)->lpVtbl -> GetColumnState(This,pcsFlags) ) 
+
+#define IPropertyDescription_GetGroupingRange(This,pgr)	\
+    ( (This)->lpVtbl -> GetGroupingRange(This,pgr) ) 
+
+#define IPropertyDescription_GetRelativeDescriptionType(This,prdt)	\
+    ( (This)->lpVtbl -> GetRelativeDescriptionType(This,prdt) ) 
+
+#define IPropertyDescription_GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2)	\
+    ( (This)->lpVtbl -> GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2) ) 
+
+#define IPropertyDescription_GetSortDescription(This,psd)	\
+    ( (This)->lpVtbl -> GetSortDescription(This,psd) ) 
+
+#define IPropertyDescription_GetSortDescriptionLabel(This,fDescending,ppszDescription)	\
+    ( (This)->lpVtbl -> GetSortDescriptionLabel(This,fDescending,ppszDescription) ) 
+
+#define IPropertyDescription_GetAggregationType(This,paggtype)	\
+    ( (This)->lpVtbl -> GetAggregationType(This,paggtype) ) 
+
+#define IPropertyDescription_GetConditionType(This,pcontype,popDefault)	\
+    ( (This)->lpVtbl -> GetConditionType(This,pcontype,popDefault) ) 
+
+#define IPropertyDescription_GetEnumTypeList(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetEnumTypeList(This,riid,ppv) ) 
+
+#define IPropertyDescription_CoerceToCanonicalValue(This,ppropvar)	\
+    ( (This)->lpVtbl -> CoerceToCanonicalValue(This,ppropvar) ) 
+
+#define IPropertyDescription_FormatForDisplay(This,propvar,pdfFlags,ppszDisplay)	\
+    ( (This)->lpVtbl -> FormatForDisplay(This,propvar,pdfFlags,ppszDisplay) ) 
+
+#define IPropertyDescription_IsValueCanonical(This,propvar)	\
+    ( (This)->lpVtbl -> IsValueCanonical(This,propvar) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IPropertyDescription_RemoteCoerceToCanonicalValue_Proxy( 
+    IPropertyDescription * This,
+    /* [in] */ __RPC__in REFPROPVARIANT propvar,
+    /* [out] */ __RPC__out PROPVARIANT *ppropvar);
+
+
+void __RPC_STUB IPropertyDescription_RemoteCoerceToCanonicalValue_Stub(
+    IRpcStubBuffer *This,
+    IRpcChannelBuffer *_pRpcChannelBuffer,
+    PRPC_MESSAGE _pRpcMessage,
+    DWORD *_pdwStubPhase);
+
+
+
+#endif 	/* __IPropertyDescription_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionAliasInfo_INTERFACE_DEFINED__
+#define __IPropertyDescriptionAliasInfo_INTERFACE_DEFINED__
+
+/* interface IPropertyDescriptionAliasInfo */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyDescriptionAliasInfo;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("f67104fc-2af9-46fd-b32d-243c1404f3d1")
+    IPropertyDescriptionAliasInfo : public IPropertyDescription
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetSortByAlias( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAdditionalSortByAliases( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyDescriptionAliasInfoVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyDescriptionAliasInfo * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyDescriptionAliasInfo * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyKey )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCanonicalName )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyType )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out VARTYPE *pvartype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayName )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEditInvitation )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszInvite);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetTypeFlags )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ PROPDESC_TYPE_FLAGS mask,
+            /* [out] */ __RPC__out PROPDESC_TYPE_FLAGS *ppdtFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetViewFlags )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_VIEW_FLAGS *ppdvFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDefaultColumnWidth )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out UINT *pcxChars);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayType )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_DISPLAYTYPE *pdisplaytype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetColumnState )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out SHCOLSTATEF *pcsFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetGroupingRange )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_GROUPING_RANGE *pgr);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescriptionType )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescription )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar1,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar2,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc1,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc2);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescription )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_SORTDESCRIPTION *psd);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescriptionLabel )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ BOOL fDescending,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDescription);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAggregationType )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_AGGREGATION_TYPE *paggtype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetConditionType )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out] */ __RPC__out PROPDESC_CONDITION_TYPE *pcontype,
+            /* [out] */ __RPC__out CONDITION_OPERATION *popDefault);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEnumTypeList )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *CoerceToCanonicalValue )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [out][in] */ PROPVARIANT *ppropvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *FormatForDisplay )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdfFlags,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsValueCanonical )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortByAlias )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAdditionalSortByAliases )( 
+            IPropertyDescriptionAliasInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        END_INTERFACE
+    } IPropertyDescriptionAliasInfoVtbl;
+
+    interface IPropertyDescriptionAliasInfo
+    {
+        CONST_VTBL struct IPropertyDescriptionAliasInfoVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyDescriptionAliasInfo_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyDescriptionAliasInfo_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyDescriptionAliasInfo_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyDescriptionAliasInfo_GetPropertyKey(This,pkey)	\
+    ( (This)->lpVtbl -> GetPropertyKey(This,pkey) ) 
+
+#define IPropertyDescriptionAliasInfo_GetCanonicalName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetCanonicalName(This,ppszName) ) 
+
+#define IPropertyDescriptionAliasInfo_GetPropertyType(This,pvartype)	\
+    ( (This)->lpVtbl -> GetPropertyType(This,pvartype) ) 
+
+#define IPropertyDescriptionAliasInfo_GetDisplayName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetDisplayName(This,ppszName) ) 
+
+#define IPropertyDescriptionAliasInfo_GetEditInvitation(This,ppszInvite)	\
+    ( (This)->lpVtbl -> GetEditInvitation(This,ppszInvite) ) 
+
+#define IPropertyDescriptionAliasInfo_GetTypeFlags(This,mask,ppdtFlags)	\
+    ( (This)->lpVtbl -> GetTypeFlags(This,mask,ppdtFlags) ) 
+
+#define IPropertyDescriptionAliasInfo_GetViewFlags(This,ppdvFlags)	\
+    ( (This)->lpVtbl -> GetViewFlags(This,ppdvFlags) ) 
+
+#define IPropertyDescriptionAliasInfo_GetDefaultColumnWidth(This,pcxChars)	\
+    ( (This)->lpVtbl -> GetDefaultColumnWidth(This,pcxChars) ) 
+
+#define IPropertyDescriptionAliasInfo_GetDisplayType(This,pdisplaytype)	\
+    ( (This)->lpVtbl -> GetDisplayType(This,pdisplaytype) ) 
+
+#define IPropertyDescriptionAliasInfo_GetColumnState(This,pcsFlags)	\
+    ( (This)->lpVtbl -> GetColumnState(This,pcsFlags) ) 
+
+#define IPropertyDescriptionAliasInfo_GetGroupingRange(This,pgr)	\
+    ( (This)->lpVtbl -> GetGroupingRange(This,pgr) ) 
+
+#define IPropertyDescriptionAliasInfo_GetRelativeDescriptionType(This,prdt)	\
+    ( (This)->lpVtbl -> GetRelativeDescriptionType(This,prdt) ) 
+
+#define IPropertyDescriptionAliasInfo_GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2)	\
+    ( (This)->lpVtbl -> GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2) ) 
+
+#define IPropertyDescriptionAliasInfo_GetSortDescription(This,psd)	\
+    ( (This)->lpVtbl -> GetSortDescription(This,psd) ) 
+
+#define IPropertyDescriptionAliasInfo_GetSortDescriptionLabel(This,fDescending,ppszDescription)	\
+    ( (This)->lpVtbl -> GetSortDescriptionLabel(This,fDescending,ppszDescription) ) 
+
+#define IPropertyDescriptionAliasInfo_GetAggregationType(This,paggtype)	\
+    ( (This)->lpVtbl -> GetAggregationType(This,paggtype) ) 
+
+#define IPropertyDescriptionAliasInfo_GetConditionType(This,pcontype,popDefault)	\
+    ( (This)->lpVtbl -> GetConditionType(This,pcontype,popDefault) ) 
+
+#define IPropertyDescriptionAliasInfo_GetEnumTypeList(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetEnumTypeList(This,riid,ppv) ) 
+
+#define IPropertyDescriptionAliasInfo_CoerceToCanonicalValue(This,ppropvar)	\
+    ( (This)->lpVtbl -> CoerceToCanonicalValue(This,ppropvar) ) 
+
+#define IPropertyDescriptionAliasInfo_FormatForDisplay(This,propvar,pdfFlags,ppszDisplay)	\
+    ( (This)->lpVtbl -> FormatForDisplay(This,propvar,pdfFlags,ppszDisplay) ) 
+
+#define IPropertyDescriptionAliasInfo_IsValueCanonical(This,propvar)	\
+    ( (This)->lpVtbl -> IsValueCanonical(This,propvar) ) 
+
+
+#define IPropertyDescriptionAliasInfo_GetSortByAlias(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetSortByAlias(This,riid,ppv) ) 
+
+#define IPropertyDescriptionAliasInfo_GetAdditionalSortByAliases(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetAdditionalSortByAliases(This,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyDescriptionAliasInfo_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionSearchInfo_INTERFACE_DEFINED__
+#define __IPropertyDescriptionSearchInfo_INTERFACE_DEFINED__
+
+/* interface IPropertyDescriptionSearchInfo */
+/* [unique][object][uuid] */ 
+
+/* [v1_enum] */ 
+enum tagPROPDESC_SEARCHINFO_FLAGS
+    {	PDSIF_DEFAULT	= 0,
+	PDSIF_ININVERTEDINDEX	= 0x1,
+	PDSIF_ISCOLUMN	= 0x2,
+	PDSIF_ISCOLUMNSPARSE	= 0x4
+    } ;
+typedef int PROPDESC_SEARCHINFO_FLAGS;
+
+typedef /* [v1_enum] */ 
+enum tagPROPDESC_COLUMNINDEX_TYPE
+    {	PDCIT_NONE	= 0,
+	PDCIT_ONDISK	= 1,
+	PDCIT_INMEMORY	= 2
+    } 	PROPDESC_COLUMNINDEX_TYPE;
+
+
+EXTERN_C const IID IID_IPropertyDescriptionSearchInfo;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("078f91bd-29a2-440f-924e-46a291524520")
+    IPropertyDescriptionSearchInfo : public IPropertyDescription
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetSearchInfoFlags( 
+            /* [out] */ __RPC__out PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetColumnIndexType( 
+            /* [out] */ __RPC__out PROPDESC_COLUMNINDEX_TYPE *ppdciType) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetProjectionString( 
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszProjection) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetMaxSize( 
+            /* [out] */ __RPC__out UINT *pcbMaxSize) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyDescriptionSearchInfoVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyDescriptionSearchInfo * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyDescriptionSearchInfo * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyKey )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPERTYKEY *pkey);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCanonicalName )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out VARTYPE *pvartype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayName )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEditInvitation )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszInvite);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetTypeFlags )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ PROPDESC_TYPE_FLAGS mask,
+            /* [out] */ __RPC__out PROPDESC_TYPE_FLAGS *ppdtFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetViewFlags )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_VIEW_FLAGS *ppdvFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDefaultColumnWidth )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out UINT *pcxChars);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_DISPLAYTYPE *pdisplaytype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetColumnState )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out SHCOLSTATEF *pcsFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetGroupingRange )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_GROUPING_RANGE *pgr);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescriptionType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelativeDescription )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar1,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar2,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc1,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDesc2);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescription )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_SORTDESCRIPTION *psd);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSortDescriptionLabel )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ BOOL fDescending,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDescription);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAggregationType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_AGGREGATION_TYPE *paggtype);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetConditionType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_CONDITION_TYPE *pcontype,
+            /* [out] */ __RPC__out CONDITION_OPERATION *popDefault);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEnumTypeList )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *CoerceToCanonicalValue )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out][in] */ PROPVARIANT *ppropvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *FormatForDisplay )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdfFlags,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsValueCanonical )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSearchInfoFlags )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetColumnIndexType )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out PROPDESC_COLUMNINDEX_TYPE *ppdciType);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetProjectionString )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszProjection);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetMaxSize )( 
+            IPropertyDescriptionSearchInfo * This,
+            /* [out] */ __RPC__out UINT *pcbMaxSize);
+        
+        END_INTERFACE
+    } IPropertyDescriptionSearchInfoVtbl;
+
+    interface IPropertyDescriptionSearchInfo
+    {
+        CONST_VTBL struct IPropertyDescriptionSearchInfoVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyDescriptionSearchInfo_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyDescriptionSearchInfo_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyDescriptionSearchInfo_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyDescriptionSearchInfo_GetPropertyKey(This,pkey)	\
+    ( (This)->lpVtbl -> GetPropertyKey(This,pkey) ) 
+
+#define IPropertyDescriptionSearchInfo_GetCanonicalName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetCanonicalName(This,ppszName) ) 
+
+#define IPropertyDescriptionSearchInfo_GetPropertyType(This,pvartype)	\
+    ( (This)->lpVtbl -> GetPropertyType(This,pvartype) ) 
+
+#define IPropertyDescriptionSearchInfo_GetDisplayName(This,ppszName)	\
+    ( (This)->lpVtbl -> GetDisplayName(This,ppszName) ) 
+
+#define IPropertyDescriptionSearchInfo_GetEditInvitation(This,ppszInvite)	\
+    ( (This)->lpVtbl -> GetEditInvitation(This,ppszInvite) ) 
+
+#define IPropertyDescriptionSearchInfo_GetTypeFlags(This,mask,ppdtFlags)	\
+    ( (This)->lpVtbl -> GetTypeFlags(This,mask,ppdtFlags) ) 
+
+#define IPropertyDescriptionSearchInfo_GetViewFlags(This,ppdvFlags)	\
+    ( (This)->lpVtbl -> GetViewFlags(This,ppdvFlags) ) 
+
+#define IPropertyDescriptionSearchInfo_GetDefaultColumnWidth(This,pcxChars)	\
+    ( (This)->lpVtbl -> GetDefaultColumnWidth(This,pcxChars) ) 
+
+#define IPropertyDescriptionSearchInfo_GetDisplayType(This,pdisplaytype)	\
+    ( (This)->lpVtbl -> GetDisplayType(This,pdisplaytype) ) 
+
+#define IPropertyDescriptionSearchInfo_GetColumnState(This,pcsFlags)	\
+    ( (This)->lpVtbl -> GetColumnState(This,pcsFlags) ) 
+
+#define IPropertyDescriptionSearchInfo_GetGroupingRange(This,pgr)	\
+    ( (This)->lpVtbl -> GetGroupingRange(This,pgr) ) 
+
+#define IPropertyDescriptionSearchInfo_GetRelativeDescriptionType(This,prdt)	\
+    ( (This)->lpVtbl -> GetRelativeDescriptionType(This,prdt) ) 
+
+#define IPropertyDescriptionSearchInfo_GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2)	\
+    ( (This)->lpVtbl -> GetRelativeDescription(This,propvar1,propvar2,ppszDesc1,ppszDesc2) ) 
+
+#define IPropertyDescriptionSearchInfo_GetSortDescription(This,psd)	\
+    ( (This)->lpVtbl -> GetSortDescription(This,psd) ) 
+
+#define IPropertyDescriptionSearchInfo_GetSortDescriptionLabel(This,fDescending,ppszDescription)	\
+    ( (This)->lpVtbl -> GetSortDescriptionLabel(This,fDescending,ppszDescription) ) 
+
+#define IPropertyDescriptionSearchInfo_GetAggregationType(This,paggtype)	\
+    ( (This)->lpVtbl -> GetAggregationType(This,paggtype) ) 
+
+#define IPropertyDescriptionSearchInfo_GetConditionType(This,pcontype,popDefault)	\
+    ( (This)->lpVtbl -> GetConditionType(This,pcontype,popDefault) ) 
+
+#define IPropertyDescriptionSearchInfo_GetEnumTypeList(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetEnumTypeList(This,riid,ppv) ) 
+
+#define IPropertyDescriptionSearchInfo_CoerceToCanonicalValue(This,ppropvar)	\
+    ( (This)->lpVtbl -> CoerceToCanonicalValue(This,ppropvar) ) 
+
+#define IPropertyDescriptionSearchInfo_FormatForDisplay(This,propvar,pdfFlags,ppszDisplay)	\
+    ( (This)->lpVtbl -> FormatForDisplay(This,propvar,pdfFlags,ppszDisplay) ) 
+
+#define IPropertyDescriptionSearchInfo_IsValueCanonical(This,propvar)	\
+    ( (This)->lpVtbl -> IsValueCanonical(This,propvar) ) 
+
+
+#define IPropertyDescriptionSearchInfo_GetSearchInfoFlags(This,ppdsiFlags)	\
+    ( (This)->lpVtbl -> GetSearchInfoFlags(This,ppdsiFlags) ) 
+
+#define IPropertyDescriptionSearchInfo_GetColumnIndexType(This,ppdciType)	\
+    ( (This)->lpVtbl -> GetColumnIndexType(This,ppdciType) ) 
+
+#define IPropertyDescriptionSearchInfo_GetProjectionString(This,ppszProjection)	\
+    ( (This)->lpVtbl -> GetProjectionString(This,ppszProjection) ) 
+
+#define IPropertyDescriptionSearchInfo_GetMaxSize(This,pcbMaxSize)	\
+    ( (This)->lpVtbl -> GetMaxSize(This,pcbMaxSize) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyDescriptionSearchInfo_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0014 */
+/* [local] */ 
+
+/* [v1_enum] */ 
+enum tagPROPDESC_ENUMFILTER
+    {	PDEF_ALL	= 0,
+	PDEF_SYSTEM	= 1,
+	PDEF_NONSYSTEM	= 2,
+	PDEF_VIEWABLE	= 3,
+	PDEF_QUERYABLE	= 4,
+	PDEF_INFULLTEXTQUERY	= 5,
+	PDEF_COLUMN	= 6
+    } ;
+typedef enum tagPROPDESC_ENUMFILTER PROPDESC_ENUMFILTER;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0014_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0014_v0_0_s_ifspec;
+
+#ifndef __IPropertySystem_INTERFACE_DEFINED__
+#define __IPropertySystem_INTERFACE_DEFINED__
+
+/* interface IPropertySystem */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertySystem;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("ca724e8a-c3e6-442b-88a4-6fb0db8035a3")
+    IPropertySystem : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyDescription( 
+            /* [in] */ __RPC__in REFPROPERTYKEY propkey,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyDescriptionByName( 
+            /* [string][in] */ __RPC__in LPCWSTR pszCanonicalName,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyDescriptionListFromString( 
+            /* [string][in] */ __RPC__in LPCWSTR pszPropList,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE EnumeratePropertyDescriptions( 
+            /* [in] */ PROPDESC_ENUMFILTER filterOn,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE FormatForDisplay( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdff,
+            /* [size_is][string][out] */ __RPC__out_ecount_full_string(cchText) LPWSTR pszText,
+            /* [in] */ DWORD cchText) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE FormatForDisplayAlloc( 
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdff,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RegisterPropertySchema( 
+            /* [string][in] */ __RPC__in LPCWSTR pszPath) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE UnregisterPropertySchema( 
+            /* [string][in] */ __RPC__in LPCWSTR pszPath) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RefreshPropertySchema( void) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertySystemVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertySystem * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertySystem * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertySystem * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyDescription )( 
+            IPropertySystem * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY propkey,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyDescriptionByName )( 
+            IPropertySystem * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszCanonicalName,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyDescriptionListFromString )( 
+            IPropertySystem * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszPropList,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *EnumeratePropertyDescriptions )( 
+            IPropertySystem * This,
+            /* [in] */ PROPDESC_ENUMFILTER filterOn,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *FormatForDisplay )( 
+            IPropertySystem * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdff,
+            /* [size_is][string][out] */ __RPC__out_ecount_full_string(cchText) LPWSTR pszText,
+            /* [in] */ DWORD cchText);
+        
+        HRESULT ( STDMETHODCALLTYPE *FormatForDisplayAlloc )( 
+            IPropertySystem * This,
+            /* [in] */ __RPC__in REFPROPERTYKEY key,
+            /* [in] */ __RPC__in REFPROPVARIANT propvar,
+            /* [in] */ PROPDESC_FORMAT_FLAGS pdff,
+            /* [string][out] */ __RPC__deref_out_opt_string LPWSTR *ppszDisplay);
+        
+        HRESULT ( STDMETHODCALLTYPE *RegisterPropertySchema )( 
+            IPropertySystem * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszPath);
+        
+        HRESULT ( STDMETHODCALLTYPE *UnregisterPropertySchema )( 
+            IPropertySystem * This,
+            /* [string][in] */ __RPC__in LPCWSTR pszPath);
+        
+        HRESULT ( STDMETHODCALLTYPE *RefreshPropertySchema )( 
+            IPropertySystem * This);
+        
+        END_INTERFACE
+    } IPropertySystemVtbl;
+
+    interface IPropertySystem
+    {
+        CONST_VTBL struct IPropertySystemVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertySystem_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertySystem_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertySystem_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertySystem_GetPropertyDescription(This,propkey,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyDescription(This,propkey,riid,ppv) ) 
+
+#define IPropertySystem_GetPropertyDescriptionByName(This,pszCanonicalName,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyDescriptionByName(This,pszCanonicalName,riid,ppv) ) 
+
+#define IPropertySystem_GetPropertyDescriptionListFromString(This,pszPropList,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyDescriptionListFromString(This,pszPropList,riid,ppv) ) 
+
+#define IPropertySystem_EnumeratePropertyDescriptions(This,filterOn,riid,ppv)	\
+    ( (This)->lpVtbl -> EnumeratePropertyDescriptions(This,filterOn,riid,ppv) ) 
+
+#define IPropertySystem_FormatForDisplay(This,key,propvar,pdff,pszText,cchText)	\
+    ( (This)->lpVtbl -> FormatForDisplay(This,key,propvar,pdff,pszText,cchText) ) 
+
+#define IPropertySystem_FormatForDisplayAlloc(This,key,propvar,pdff,ppszDisplay)	\
+    ( (This)->lpVtbl -> FormatForDisplayAlloc(This,key,propvar,pdff,ppszDisplay) ) 
+
+#define IPropertySystem_RegisterPropertySchema(This,pszPath)	\
+    ( (This)->lpVtbl -> RegisterPropertySchema(This,pszPath) ) 
+
+#define IPropertySystem_UnregisterPropertySchema(This,pszPath)	\
+    ( (This)->lpVtbl -> UnregisterPropertySchema(This,pszPath) ) 
+
+#define IPropertySystem_RefreshPropertySchema(This)	\
+    ( (This)->lpVtbl -> RefreshPropertySchema(This) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertySystem_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyDescriptionList_INTERFACE_DEFINED__
+#define __IPropertyDescriptionList_INTERFACE_DEFINED__
+
+/* interface IPropertyDescriptionList */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyDescriptionList;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("1f9fc1d0-c39b-4b26-817f-011967d3440e")
+    IPropertyDescriptionList : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetCount( 
+            /* [out] */ __RPC__out UINT *pcElem) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetAt( 
+            /* [in] */ UINT iElem,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyDescriptionListVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyDescriptionList * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyDescriptionList * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyDescriptionList * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetCount )( 
+            IPropertyDescriptionList * This,
+            /* [out] */ __RPC__out UINT *pcElem);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetAt )( 
+            IPropertyDescriptionList * This,
+            /* [in] */ UINT iElem,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        END_INTERFACE
+    } IPropertyDescriptionListVtbl;
+
+    interface IPropertyDescriptionList
+    {
+        CONST_VTBL struct IPropertyDescriptionListVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyDescriptionList_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyDescriptionList_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyDescriptionList_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyDescriptionList_GetCount(This,pcElem)	\
+    ( (This)->lpVtbl -> GetCount(This,pcElem) ) 
+
+#define IPropertyDescriptionList_GetAt(This,iElem,riid,ppv)	\
+    ( (This)->lpVtbl -> GetAt(This,iElem,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyDescriptionList_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertyStoreFactory_INTERFACE_DEFINED__
+#define __IPropertyStoreFactory_INTERFACE_DEFINED__
+
+/* interface IPropertyStoreFactory */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertyStoreFactory;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("bc110b6d-57e8-4148-a9c6-91015ab2f3a5")
+    IPropertyStoreFactory : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyStore( 
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [unique][in] */ __RPC__in_opt IUnknown *pUnkFactory,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyStoreForKeys( 
+            /* [unique][in] */ __RPC__in_opt const PROPERTYKEY *rgKeys,
+            /* [in] */ UINT cKeys,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertyStoreFactoryVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertyStoreFactory * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertyStoreFactory * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertyStoreFactory * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyStore )( 
+            IPropertyStoreFactory * This,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [unique][in] */ __RPC__in_opt IUnknown *pUnkFactory,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyStoreForKeys )( 
+            IPropertyStoreFactory * This,
+            /* [unique][in] */ __RPC__in_opt const PROPERTYKEY *rgKeys,
+            /* [in] */ UINT cKeys,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        END_INTERFACE
+    } IPropertyStoreFactoryVtbl;
+
+    interface IPropertyStoreFactory
+    {
+        CONST_VTBL struct IPropertyStoreFactoryVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertyStoreFactory_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertyStoreFactory_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertyStoreFactory_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertyStoreFactory_GetPropertyStore(This,flags,pUnkFactory,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyStore(This,flags,pUnkFactory,riid,ppv) ) 
+
+#define IPropertyStoreFactory_GetPropertyStoreForKeys(This,rgKeys,cKeys,flags,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyStoreForKeys(This,rgKeys,cKeys,flags,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertyStoreFactory_INTERFACE_DEFINED__ */
+
+
+#ifndef __IDelayedPropertyStoreFactory_INTERFACE_DEFINED__
+#define __IDelayedPropertyStoreFactory_INTERFACE_DEFINED__
+
+/* interface IDelayedPropertyStoreFactory */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IDelayedPropertyStoreFactory;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("40d4577f-e237-4bdb-bd69-58f089431b6a")
+    IDelayedPropertyStoreFactory : public IPropertyStoreFactory
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetDelayedPropertyStore( 
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [in] */ DWORD dwStoreId,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IDelayedPropertyStoreFactoryVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IDelayedPropertyStoreFactory * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IDelayedPropertyStoreFactory * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IDelayedPropertyStoreFactory * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyStore )( 
+            IDelayedPropertyStoreFactory * This,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [unique][in] */ __RPC__in_opt IUnknown *pUnkFactory,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyStoreForKeys )( 
+            IDelayedPropertyStoreFactory * This,
+            /* [unique][in] */ __RPC__in_opt const PROPERTYKEY *rgKeys,
+            /* [in] */ UINT cKeys,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetDelayedPropertyStore )( 
+            IDelayedPropertyStoreFactory * This,
+            /* [in] */ GETPROPERTYSTOREFLAGS flags,
+            /* [in] */ DWORD dwStoreId,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        END_INTERFACE
+    } IDelayedPropertyStoreFactoryVtbl;
+
+    interface IDelayedPropertyStoreFactory
+    {
+        CONST_VTBL struct IDelayedPropertyStoreFactoryVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IDelayedPropertyStoreFactory_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IDelayedPropertyStoreFactory_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IDelayedPropertyStoreFactory_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IDelayedPropertyStoreFactory_GetPropertyStore(This,flags,pUnkFactory,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyStore(This,flags,pUnkFactory,riid,ppv) ) 
+
+#define IDelayedPropertyStoreFactory_GetPropertyStoreForKeys(This,rgKeys,cKeys,flags,riid,ppv)	\
+    ( (This)->lpVtbl -> GetPropertyStoreForKeys(This,rgKeys,cKeys,flags,riid,ppv) ) 
+
+
+#define IDelayedPropertyStoreFactory_GetDelayedPropertyStore(This,flags,dwStoreId,riid,ppv)	\
+    ( (This)->lpVtbl -> GetDelayedPropertyStore(This,flags,dwStoreId,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IDelayedPropertyStoreFactory_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0018 */
+/* [local] */ 
+
+/* [v1_enum] */ 
+enum tagPERSIST_SPROPSTORE_FLAGS
+    {	FPSPS_READONLY	= 0x1
+    } ;
+typedef int PERSIST_SPROPSTORE_FLAGS;
+
+typedef struct tagSERIALIZEDPROPSTORAGE SERIALIZEDPROPSTORAGE;
+
+typedef SERIALIZEDPROPSTORAGE __unaligned *PUSERIALIZEDPROPSTORAGE;
+
+typedef const SERIALIZEDPROPSTORAGE __unaligned *PCUSERIALIZEDPROPSTORAGE;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0018_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0018_v0_0_s_ifspec;
+
+#ifndef __IPersistSerializedPropStorage_INTERFACE_DEFINED__
+#define __IPersistSerializedPropStorage_INTERFACE_DEFINED__
+
+/* interface IPersistSerializedPropStorage */
+/* [object][local][unique][uuid] */ 
+
+
+EXTERN_C const IID IID_IPersistSerializedPropStorage;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("e318ad57-0aa0-450f-aca5-6fab7103d917")
+    IPersistSerializedPropStorage : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE SetFlags( 
+            /* [in] */ PERSIST_SPROPSTORE_FLAGS flags) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetPropertyStorage( 
+            /* [in] */ 
+            __in_bcount(cb)  PCUSERIALIZEDPROPSTORAGE psps,
+            /* [in] */ 
+            __in  DWORD cb) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetPropertyStorage( 
+            /* [out] */ 
+            __deref_out_bcount(*pcb)  SERIALIZEDPROPSTORAGE **ppsps,
+            /* [out] */ 
+            __out  DWORD *pcb) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPersistSerializedPropStorageVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPersistSerializedPropStorage * This,
+            /* [in] */ REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPersistSerializedPropStorage * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPersistSerializedPropStorage * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetFlags )( 
+            IPersistSerializedPropStorage * This,
+            /* [in] */ PERSIST_SPROPSTORE_FLAGS flags);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetPropertyStorage )( 
+            IPersistSerializedPropStorage * This,
+            /* [in] */ 
+            __in_bcount(cb)  PCUSERIALIZEDPROPSTORAGE psps,
+            /* [in] */ 
+            __in  DWORD cb);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetPropertyStorage )( 
+            IPersistSerializedPropStorage * This,
+            /* [out] */ 
+            __deref_out_bcount(*pcb)  SERIALIZEDPROPSTORAGE **ppsps,
+            /* [out] */ 
+            __out  DWORD *pcb);
+        
+        END_INTERFACE
+    } IPersistSerializedPropStorageVtbl;
+
+    interface IPersistSerializedPropStorage
+    {
+        CONST_VTBL struct IPersistSerializedPropStorageVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPersistSerializedPropStorage_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPersistSerializedPropStorage_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPersistSerializedPropStorage_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPersistSerializedPropStorage_SetFlags(This,flags)	\
+    ( (This)->lpVtbl -> SetFlags(This,flags) ) 
+
+#define IPersistSerializedPropStorage_SetPropertyStorage(This,psps,cb)	\
+    ( (This)->lpVtbl -> SetPropertyStorage(This,psps,cb) ) 
+
+#define IPersistSerializedPropStorage_GetPropertyStorage(This,ppsps,pcb)	\
+    ( (This)->lpVtbl -> GetPropertyStorage(This,ppsps,pcb) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPersistSerializedPropStorage_INTERFACE_DEFINED__ */
+
+
+#ifndef __IPropertySystemChangeNotify_INTERFACE_DEFINED__
+#define __IPropertySystemChangeNotify_INTERFACE_DEFINED__
+
+/* interface IPropertySystemChangeNotify */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IPropertySystemChangeNotify;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("fa955fd9-38be-4879-a6ce-824cf52d609f")
+    IPropertySystemChangeNotify : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE SchemaRefreshed( void) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IPropertySystemChangeNotifyVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IPropertySystemChangeNotify * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IPropertySystemChangeNotify * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IPropertySystemChangeNotify * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *SchemaRefreshed )( 
+            IPropertySystemChangeNotify * This);
+        
+        END_INTERFACE
+    } IPropertySystemChangeNotifyVtbl;
+
+    interface IPropertySystemChangeNotify
+    {
+        CONST_VTBL struct IPropertySystemChangeNotifyVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IPropertySystemChangeNotify_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IPropertySystemChangeNotify_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IPropertySystemChangeNotify_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IPropertySystemChangeNotify_SchemaRefreshed(This)	\
+    ( (This)->lpVtbl -> SchemaRefreshed(This) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IPropertySystemChangeNotify_INTERFACE_DEFINED__ */
+
+
+#ifndef __ICreateObject_INTERFACE_DEFINED__
+#define __ICreateObject_INTERFACE_DEFINED__
+
+/* interface ICreateObject */
+/* [object][unique][uuid] */ 
+
+
+EXTERN_C const IID IID_ICreateObject;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("75121952-e0d0-43e5-9380-1d80483acf72")
+    ICreateObject : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE CreateObject( 
+            /* [in] */ __RPC__in REFCLSID clsid,
+            /* [unique][in] */ __RPC__in_opt IUnknown *pUnkOuter,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ICreateObjectVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ICreateObject * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ICreateObject * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ICreateObject * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *CreateObject )( 
+            ICreateObject * This,
+            /* [in] */ __RPC__in REFCLSID clsid,
+            /* [unique][in] */ __RPC__in_opt IUnknown *pUnkOuter,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ __RPC__deref_out_opt void **ppv);
+        
+        END_INTERFACE
+    } ICreateObjectVtbl;
+
+    interface ICreateObject
+    {
+        CONST_VTBL struct ICreateObjectVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ICreateObject_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ICreateObject_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ICreateObject_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ICreateObject_CreateObject(This,clsid,pUnkOuter,riid,ppv)	\
+    ( (This)->lpVtbl -> CreateObject(This,clsid,pUnkOuter,riid,ppv) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ICreateObject_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_propsys_0000_0021 */
+/* [local] */ 
+
+// Format a property value for display purposes
+PSSTDAPI PSFormatForDisplay(
+    __in REFPROPERTYKEY propkey,
+    __in REFPROPVARIANT propvar,
+    __in PROPDESC_FORMAT_FLAGS pdfFlags,
+    __out_ecount(cchText) LPWSTR pwszText,
+    __in DWORD cchText);
+
+PSSTDAPI PSFormatForDisplayAlloc(
+    __in REFPROPERTYKEY key,
+    __in REFPROPVARIANT propvar,
+    __in PROPDESC_FORMAT_FLAGS pdff,
+    __deref_out PWSTR *ppszDisplay);
+
+PSSTDAPI PSFormatPropertyValue(
+    __in IPropertyStore *pps,
+    __in IPropertyDescription *ppd,
+    __in PROPDESC_FORMAT_FLAGS pdff,
+    __deref_out LPWSTR *ppszDisplay);
+
+
+#define PKEY_PIDSTR_MAX     10   // will take care of any long integer value
+#define GUIDSTRING_MAX      (1 + 8 + 1 + 4 + 1 + 4 + 1 + 4 + 1 + 12 + 1 + 1)  // "{12345678-1234-1234-1234-123456789012}"
+#define PKEYSTR_MAX         (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)
+
+// Convert a PROPERTYKEY to and from a PWSTR
+PSSTDAPI PSStringFromPropertyKey(
+    __in REFPROPERTYKEY pkey,
+    __out_ecount(cch) LPWSTR psz,
+    __in UINT cch);
+
+PSSTDAPI PSPropertyKeyFromString(
+    __in LPCWSTR pszString,
+    __out PROPERTYKEY *pkey);
+
+
+// Creates an in-memory property store
+// Returns an IPropertyStore, IPersistSerializedPropStorage, and related interfaces interface
+PSSTDAPI PSCreateMemoryPropertyStore(
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Create a read-only, delay-bind multiplexing property store
+// Returns an IPropertyStore interface or related interfaces
+PSSTDAPI PSCreateDelayedMultiplexPropertyStore(
+    __in GETPROPERTYSTOREFLAGS flags,
+    __in IDelayedPropertyStoreFactory *pdpsf,
+    __in_ecount(cStores) const DWORD *rgStoreIds,
+    __in DWORD cStores,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Create a read-only property store from one or more sources (which each must support either IPropertyStore or IPropertySetStorage)
+// Returns an IPropertyStore interface or related interfaces
+PSSTDAPI PSCreateMultiplexPropertyStore(
+    __in_ecount(cStores) IUnknown **prgpunkStores,
+    __in DWORD cStores,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Create a container for IPropertyChanges
+// Returns an IPropertyChangeArray interface
+PSSTDAPI PSCreatePropertyChangeArray(
+    __in_ecount_opt(cChanges) const PROPERTYKEY *rgpropkey,
+    __in_ecount_opt(cChanges) const PKA_FLAGS *rgflags,
+    __in_ecount_opt(cChanges) const PROPVARIANT *rgpropvar,
+    __in UINT cChanges,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Create a simple property change
+// Returns an IPropertyChange interface
+PSSTDAPI PSCreateSimplePropertyChange(
+    __in PKA_FLAGS flags,
+    __in REFPROPERTYKEY key,
+    __in REFPROPVARIANT propvar,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Get a property description
+// Returns an IPropertyDescription interface
+PSSTDAPI PSGetPropertyDescription(
+    __in REFPROPERTYKEY propkey,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+PSSTDAPI PSGetPropertyDescriptionByName(
+    __in LPCWSTR pszCanonicalName,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Lookup a per-machine registered file property handler
+PSSTDAPI PSLookupPropertyHandlerCLSID(
+    __in PCWSTR pszFilePath,
+    __out CLSID *pclsid);
+// Get a property handler, on Vista or downlevel to XP
+// punkItem is a shell item created with an SHCreateItemXXX API
+// Returns an IPropertyStore
+PSSTDAPI PSGetItemPropertyHandler(
+    __in IUnknown *punkItem,
+    __in BOOL fReadWrite,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Get a property handler, on Vista or downlevel to XP
+// punkItem is a shell item created with an SHCreateItemXXX API
+// punkCreateObject supports ICreateObject
+// Returns an IPropertyStore
+PSSTDAPI PSGetItemPropertyHandlerWithCreateObject(
+    __in IUnknown *punkItem,
+    __in BOOL fReadWrite,
+    __in IUnknown *punkCreateObject,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Get or set a property value from a store
+PSSTDAPI PSGetPropertyValue(
+    __in IPropertyStore *pps,
+    __in IPropertyDescription *ppd,
+    __out PROPVARIANT *ppropvar);
+
+PSSTDAPI PSSetPropertyValue(
+    __in IPropertyStore *pps,
+    __in IPropertyDescription *ppd,
+    __in REFPROPVARIANT propvar);
+
+
+// Interact with the set of property descriptions
+PSSTDAPI PSRegisterPropertySchema(
+    __in PCWSTR pszPath);
+
+PSSTDAPI PSUnregisterPropertySchema(
+    __in PCWSTR pszPath);
+
+PSSTDAPI PSRefreshPropertySchema();
+
+// Returns either: IPropertyDescriptionList or IEnumUnknown interfaces
+PSSTDAPI PSEnumeratePropertyDescriptions(
+    __in PROPDESC_ENUMFILTER filterOn,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Convert between a PROPERTYKEY and its canonical name
+PSSTDAPI PSGetPropertyKeyFromName(
+    __in PCWSTR pszName,
+    __out PROPERTYKEY *ppropkey);
+
+PSSTDAPI PSGetNameFromPropertyKey(
+    __in REFPROPERTYKEY propkey,
+    __deref_out PWSTR *ppszCanonicalName);
+
+
+// Coerce and canonicalize a property value
+PSSTDAPI PSCoerceToCanonicalValue(
+    __in REFPROPERTYKEY key,
+    __inout PROPVARIANT *ppropvar);
+
+
+// Convert a 'prop:' string into a list of property descriptions
+// Returns an IPropertyDescriptionList interface
+PSSTDAPI PSGetPropertyDescriptionListFromString(
+    __in LPCWSTR pszPropList,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Wrap an IPropertySetStorage interface in an IPropertyStore interface
+// Returns an IPropertyStore or related interface
+PSSTDAPI PSCreatePropertyStoreFromPropertySetStorage(
+    __in IPropertySetStorage *ppss,
+    DWORD grfMode,
+    REFIID riid,
+    __deref_out void **ppv);
+
+
+// punkSource must support IPropertyStore or IPropertySetStorage
+// On success, the returned ppv is guaranteed to support IPropertyStore.
+// If punkSource already supports IPropertyStore, no wrapper is created.
+PSSTDAPI PSCreatePropertyStoreFromObject(
+    __in IUnknown *punk,
+    __in DWORD grfMode,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// punkSource must support IPropertyStore
+// riid may be IPropertyStore, IPropertySetStorage, IPropertyStoreCapabilities, or IObjectProvider
+PSSTDAPI PSCreateAdapterFromPropertyStore(
+    __in IPropertyStore *pps,
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Talk to the property system using an interface
+// Returns an IPropertySystem interface
+PSSTDAPI PSGetPropertySystem(
+    __in REFIID riid,
+    __deref_out void **ppv);
+
+
+// Obtain a value from serialized property storage
+PSSTDAPI PSGetPropertyFromPropertyStorage(
+    __in_bcount(cb) PCUSERIALIZEDPROPSTORAGE psps, 
+    __in DWORD cb, 
+    __in REFPROPERTYKEY rpkey, 
+    __out PROPVARIANT *ppropvar);
+
+
+// Obtain a named value from serialized property storage
+PSSTDAPI PSGetNamedPropertyFromPropertyStorage(
+    __in_bcount(cb) PCUSERIALIZEDPROPSTORAGE psps, 
+    __in DWORD cb, 
+    __in LPCWSTR pszName, 
+    __out PROPVARIANT *ppropvar);
+
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0021_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0021_v0_0_s_ifspec;
+
+
+#ifndef __PropSysObjects_LIBRARY_DEFINED__
+#define __PropSysObjects_LIBRARY_DEFINED__
+
+/* library PropSysObjects */
+/* [version][lcid][uuid] */ 
+
+
+EXTERN_C const IID LIBID_PropSysObjects;
+
+EXTERN_C const CLSID CLSID_InMemoryPropertyStore;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("9a02e012-6303-4e1e-b9a1-630f802592c5")
+InMemoryPropertyStore;
+#endif
+
+EXTERN_C const CLSID CLSID_PropertySystem;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("b8967f85-58ae-4f46-9fb2-5d7904798f4b")
+PropertySystem;
+#endif
+#endif /* __PropSysObjects_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  LPSAFEARRAY_UserSize(     unsigned long *, unsigned long            , LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserMarshal(  unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserUnmarshal(unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+void                      __RPC_USER  LPSAFEARRAY_UserFree(     unsigned long *, LPSAFEARRAY * ); 
+
+unsigned long             __RPC_USER  BSTR_UserSize64(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal64(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal64(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree64(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  LPSAFEARRAY_UserSize64(     unsigned long *, unsigned long            , LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserMarshal64(  unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserUnmarshal64(unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+void                      __RPC_USER  LPSAFEARRAY_UserFree64(     unsigned long *, LPSAFEARRAY * ); 
+
+/* [local] */ HRESULT STDMETHODCALLTYPE IInitializeWithStream_Initialize_Proxy( 
+    IInitializeWithStream * This,
+    /* [in] */ IStream *pstream,
+    /* [in] */ DWORD grfMode);
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IInitializeWithStream_Initialize_Stub( 
+    IInitializeWithStream * This,
+    /* [in] */ __RPC__in_opt IStream *pstream,
+    /* [in] */ DWORD grfMode);
+
+/* [local] */ HRESULT STDMETHODCALLTYPE IPropertyDescription_CoerceToCanonicalValue_Proxy( 
+    IPropertyDescription * This,
+    /* [out][in] */ PROPVARIANT *ppropvar);
+
+
+/* [call_as] */ HRESULT STDMETHODCALLTYPE IPropertyDescription_CoerceToCanonicalValue_Stub( 
+    IPropertyDescription * This,
+    /* [in] */ __RPC__in REFPROPVARIANT propvar,
+    /* [out] */ __RPC__out PROPVARIANT *ppropvar);
+
+
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/rpcsal.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/rpcsal.h
new file mode 100644
index 0000000000..ba9836a84a
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/rpcsal.h
@@ -0,0 +1,113 @@
+#pragma once
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#define RPC_range(min,max)
+
+#define __RPC__in           
+#define __RPC__in_string
+#define __RPC__in_opt_string
+#define __RPC__deref_opt_in_opt
+#define __RPC__opt_in_opt_string
+#define __RPC__in_ecount(size) 
+#define __RPC__in_ecount_full(size)
+#define __RPC__in_ecount_full_string(size)
+#define __RPC__in_ecount_part(size, length)
+#define __RPC__in_ecount_full_opt(size)
+#define __RPC__in_ecount_full_opt_string(size)
+#define __RPC__inout_ecount_full_opt_string(size)
+#define __RPC__in_ecount_part_opt(size, length)
+
+#define __RPC__deref_in 
+#define __RPC__deref_in_string
+#define __RPC__deref_opt_in
+#define __RPC__deref_in_opt
+#define __RPC__deref_in_ecount(size) 
+#define __RPC__deref_in_ecount_part(size, length) 
+#define __RPC__deref_in_ecount_full(size) 
+#define __RPC__deref_in_ecount_full_opt(size)
+#define __RPC__deref_in_ecount_full_string(size)
+#define __RPC__deref_in_ecount_full_opt_string(size)
+#define __RPC__deref_in_ecount_opt(size) 
+#define __RPC__deref_in_ecount_opt_string(size)
+#define __RPC__deref_in_ecount_part_opt(size, length) 
+
+// [out]
+#define __RPC__out     
+#define __RPC__out_ecount(size) 
+#define __RPC__out_ecount_part(size, length) 
+#define __RPC__out_ecount_full(size)
+#define __RPC__out_ecount_full_string(size)
+
+// [in,out] 
+#define __RPC__inout                                   
+#define __RPC__inout_string
+#define __RPC__opt_inout
+#define __RPC__inout_ecount(size)                     
+#define __RPC__inout_ecount_part(size, length)    
+#define __RPC__inout_ecount_full(size)          
+#define __RPC__inout_ecount_full_string(size)          
+
+// [in,unique] 
+#define __RPC__in_opt       
+#define __RPC__in_ecount_opt(size)   
+
+
+// [in,out,unique] 
+#define __RPC__inout_opt    
+#define __RPC__inout_ecount_opt(size)  
+#define __RPC__inout_ecount_part_opt(size, length) 
+#define __RPC__inout_ecount_full_opt(size)     
+#define __RPC__inout_ecount_full_string(size)
+
+// [out] **
+#define __RPC__deref_out   
+#define __RPC__deref_out_string
+#define __RPC__deref_out_opt 
+#define __RPC__deref_out_opt_string
+#define __RPC__deref_out_ecount(size) 
+#define __RPC__deref_out_ecount_part(size, length) 
+#define __RPC__deref_out_ecount_full(size)  
+#define __RPC__deref_out_ecount_full_string(size)
+
+
+// [in,out] **, second pointer decoration. 
+#define __RPC__deref_inout    
+#define __RPC__deref_inout_string
+#define __RPC__deref_inout_opt 
+#define __RPC__deref_inout_opt_string
+#define __RPC__deref_inout_ecount_full(size)
+#define __RPC__deref_inout_ecount_full_string(size)
+#define __RPC__deref_inout_ecount_opt(size) 
+#define __RPC__deref_inout_ecount_part_opt(size, length) 
+#define __RPC__deref_inout_ecount_full_opt(size) 
+#define __RPC__deref_inout_ecount_full_opt_string(size) 
+
+// #define __RPC_out_opt    out_opt is not allowed in rpc
+
+// [in,out,unique] 
+#define __RPC__deref_opt_inout  
+#define __RPC__deref_opt_inout_string
+#define __RPC__deref_opt_inout_ecount(size)     
+#define __RPC__deref_opt_inout_ecount_part(size, length) 
+#define __RPC__deref_opt_inout_ecount_full(size) 
+#define __RPC__deref_opt_inout_ecount_full_string(size)
+
+#define __RPC__deref_out_ecount_opt(size) 
+#define __RPC__deref_out_ecount_part_opt(size, length) 
+#define __RPC__deref_out_ecount_full_opt(size) 
+#define __RPC__deref_out_ecount_full_opt_string(size)
+
+#define __RPC__deref_opt_inout_opt      
+#define __RPC__deref_opt_inout_opt_string
+#define __RPC__deref_opt_inout_ecount_opt(size)   
+#define __RPC__deref_opt_inout_ecount_part_opt(size, length) 
+#define __RPC__deref_opt_inout_ecount_full_opt(size) 
+#define __RPC__deref_opt_inout_ecount_full_opt_string(size) 
+
+#define __RPC_full_pointer  
+#define __RPC_unique_pointer
+#define __RPC_ref_pointer
+#define __RPC_string                               
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/sal.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/sal.h
new file mode 100644
index 0000000000..3f99ab9a92
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/sal.h
@@ -0,0 +1,252 @@
+#pragma once
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+/*#define __null*/ // << Conflicts with GCC internal type __null
+#define __notnull
+#define __maybenull
+#define __readonly
+#define __notreadonly
+#define __maybereadonly
+#define __valid
+#define __notvalid
+#define __maybevalid
+#define __readableTo(extent)
+#define __elem_readableTo(size)
+#define __byte_readableTo(size)
+#define __writableTo(size)
+#define __elem_writableTo(size)
+#define __byte_writableTo(size)
+#define __deref
+#define __pre
+#define __post
+#define __precond(expr)
+#define __postcond(expr)
+#define __exceptthat
+#define __execeptthat
+#define __inner_success(expr)
+#define __inner_checkReturn
+#define __inner_typefix(ctype)
+#define __inner_override
+#define __inner_callback
+#define __inner_blocksOn(resource)
+#define __inner_fallthrough_dec
+#define __inner_fallthrough
+#define __refparam
+#define __inner_control_entrypoint(category)
+#define __inner_data_entrypoint(category)
+
+#define __ecount(size)
+#define __bcount(size)
+#define __in
+#define __in_ecount(size)
+#define __in_bcount(size)
+#define __in_z
+#define __in_ecount_z(size)
+#define __in_bcount_z(size)
+#define __in_nz
+#define __in_ecount_nz(size)
+#define __in_bcount_nz(size)
+#define __out
+#define __out_ecount(size)
+#define __out_bcount(size)
+#define __out_ecount_part(size,length)
+#define __out_bcount_part(size,length)
+#define __out_ecount_full(size)
+#define __out_bcount_full(size)
+#define __out_z
+#define __out_z_opt
+#define __out_ecount_z(size)
+#define __out_bcount_z(size)
+#define __out_ecount_part_z(size,length)
+#define __out_bcount_part_z(size,length)
+#define __out_ecount_full_z(size)
+#define __out_bcount_full_z(size)
+#define __out_nz
+#define __out_nz_opt
+#define __out_ecount_nz(size)
+#define __out_bcount_nz(size)
+#define __inout
+#define __inout_ecount(size)
+#define __inout_bcount(size)
+#define __inout_ecount_part(size,length)
+#define __inout_bcount_part(size,length)
+#define __inout_ecount_full(size)
+#define __inout_bcount_full(size)
+#define __inout_z
+#define __inout_ecount_z(size)
+#define __inout_bcount_z(size)
+#define __inout_nz
+#define __inout_ecount_nz(size)
+#define __inout_bcount_nz(size)
+#define __ecount_opt(size)
+#define __bcount_opt(size)
+#define __in_opt
+#define __in_ecount_opt(size)
+#define __in_bcount_opt(size)
+#define __in_z_opt
+#define __in_ecount_z_opt(size)
+#define __in_bcount_z_opt(size)
+#define __in_nz_opt
+#define __in_ecount_nz_opt(size)
+#define __in_bcount_nz_opt(size)
+#define __out_opt
+#define __out_ecount_opt(size)
+#define __out_bcount_opt(size)
+#define __out_ecount_part_opt(size,length)
+#define __out_bcount_part_opt(size,length)
+#define __out_ecount_full_opt(size)
+#define __out_bcount_full_opt(size)
+#define __out_ecount_z_opt(size)
+#define __out_bcount_z_opt(size)
+#define __out_ecount_part_z_opt(size,length)
+#define __out_bcount_part_z_opt(size,length)
+#define __out_ecount_full_z_opt(size)
+#define __out_bcount_full_z_opt(size)
+#define __out_ecount_nz_opt(size)
+#define __out_bcount_nz_opt(size)
+#define __inout_opt
+#define __inout_ecount_opt(size)
+#define __inout_bcount_opt(size)
+#define __inout_ecount_part_opt(size,length)
+#define __inout_bcount_part_opt(size,length)
+#define __inout_ecount_full_opt(size)
+#define __inout_bcount_full_opt(size)
+#define __inout_z_opt
+#define __inout_ecount_z_opt(size)
+#define __inout_ecount_z_opt(size)
+#define __inout_bcount_z_opt(size)
+#define __inout_nz_opt
+#define __inout_ecount_nz_opt(size)
+#define __inout_bcount_nz_opt(size)
+#define __deref_ecount(size)
+#define __deref_bcount(size)
+#define __deref_out
+#define __deref_out_ecount(size)
+#define __deref_out_bcount(size)
+#define __deref_out_ecount_part(size,length)
+#define __deref_out_bcount_part(size,length)
+#define __deref_out_ecount_full(size)
+#define __deref_out_bcount_full(size)
+#define __deref_out_z
+#define __deref_out_ecount_z(size)
+#define __deref_out_bcount_z(size)
+#define __deref_out_nz
+#define __deref_out_ecount_nz(size)
+#define __deref_out_bcount_nz(size)
+#define __deref_inout
+#define __deref_inout_z
+#define __deref_inout_ecount(size)
+#define __deref_inout_bcount(size)
+#define __deref_inout_ecount_part(size,length)
+#define __deref_inout_bcount_part(size,length)
+#define __deref_inout_ecount_full(size)
+#define __deref_inout_bcount_full(size)
+#define __deref_inout_z
+#define __deref_inout_ecount_z(size)
+#define __deref_inout_bcount_z(size)
+#define __deref_inout_nz
+#define __deref_inout_ecount_nz(size)
+#define __deref_inout_bcount_nz(size)
+#define __deref_ecount_opt(size)
+#define __deref_bcount_opt(size)
+#define __deref_out_opt
+#define __deref_out_ecount_opt(size)
+#define __deref_out_bcount_opt(size)
+#define __deref_out_ecount_part_opt(size,length)
+#define __deref_out_bcount_part_opt(size,length)
+#define __deref_out_ecount_full_opt(size)
+#define __deref_out_bcount_full_opt(size)
+#define __deref_out_z_opt
+#define __deref_out_ecount_z_opt(size)
+#define __deref_out_bcount_z_opt(size)
+#define __deref_out_nz_opt
+#define __deref_out_ecount_nz_opt(size)
+#define __deref_out_bcount_nz_opt(size)
+#define __deref_inout_opt
+#define __deref_inout_ecount_opt(size)
+#define __deref_inout_bcount_opt(size)
+#define __deref_inout_ecount_part_opt(size,length)
+#define __deref_inout_bcount_part_opt(size,length)
+#define __deref_inout_ecount_full_opt(size)
+#define __deref_inout_bcount_full_opt(size)
+#define __deref_inout_z_opt
+#define __deref_inout_ecount_z_opt(size)
+#define __deref_inout_bcount_z_opt(size)
+#define __deref_inout_nz_opt
+#define __deref_inout_ecount_nz_opt(size)
+#define __deref_inout_bcount_nz_opt(size)
+#define __deref_opt_ecount(size)
+#define __deref_opt_bcount(size)
+#define __deref_opt_out
+#define __deref_opt_out_z
+#define __deref_opt_out_ecount(size)
+#define __deref_opt_out_bcount(size)
+#define __deref_opt_out_ecount_part(size,length)
+#define __deref_opt_out_bcount_part(size,length)
+#define __deref_opt_out_ecount_full(size)
+#define __deref_opt_out_bcount_full(size)
+#define __deref_opt_inout
+#define __deref_opt_inout_ecount(size)
+#define __deref_opt_inout_bcount(size)
+#define __deref_opt_inout_ecount_part(size,length)
+#define __deref_opt_inout_bcount_part(size,length)
+#define __deref_opt_inout_ecount_full(size)
+#define __deref_opt_inout_bcount_full(size)
+#define __deref_opt_inout_z
+#define __deref_opt_inout_ecount_z(size)
+#define __deref_opt_inout_bcount_z(size)
+#define __deref_opt_inout_nz
+#define __deref_opt_inout_ecount_nz(size)
+#define __deref_opt_inout_bcount_nz(size)
+#define __deref_opt_ecount_opt(size)
+#define __deref_opt_bcount_opt(size)
+#define __deref_opt_out_opt
+#define __deref_opt_out_ecount_opt(size)
+#define __deref_opt_out_bcount_opt(size)
+#define __deref_opt_out_ecount_part_opt(size,length)
+#define __deref_opt_out_bcount_part_opt(size,length)
+#define __deref_opt_out_ecount_full_opt(size)
+#define __deref_opt_out_bcount_full_opt(size)
+#define __deref_opt_out_z_opt
+#define __deref_opt_out_ecount_z_opt(size)
+#define __deref_opt_out_bcount_z_opt(size)
+#define __deref_opt_out_nz_opt
+#define __deref_opt_out_ecount_nz_opt(size)
+#define __deref_opt_out_bcount_nz_opt(size)
+#define __deref_opt_inout_opt
+#define __deref_opt_inout_ecount_opt(size)
+#define __deref_opt_inout_bcount_opt(size)
+#define __deref_opt_inout_ecount_part_opt(size,length)
+#define __deref_opt_inout_bcount_part_opt(size,length)
+#define __deref_opt_inout_ecount_full_opt(size)
+#define __deref_opt_inout_bcount_full_opt(size)
+#define __deref_opt_inout_z_opt
+#define __deref_opt_inout_ecount_z_opt(size)
+#define __deref_opt_inout_bcount_z_opt(size)
+#define __deref_opt_inout_nz_opt
+#define __deref_opt_inout_ecount_nz_opt(size)
+#define __deref_opt_inout_bcount_nz_opt(size)
+
+#define __success(expr)
+#define __nullterminated
+#define __nullnullterminated
+#define __reserved
+#define __checkReturn
+#define __typefix(ctype)
+#define __override
+#define __callback
+#define __format_string
+#define __blocksOn(resource)
+#define __control_entrypoint(category)
+#define __data_entrypoint(category)
+
+#ifndef __fallthrough
+    #define __fallthrough __inner_fallthrough
+#endif
+
+#ifndef __analysis_assume
+    #define __analysis_assume(expr)
+#endif
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/sdkddkver.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/sdkddkver.h
new file mode 100644
index 0000000000..bc9008659a
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/sdkddkver.h
@@ -0,0 +1,225 @@
+/*
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Module Name:
+
+    sdkddkver.h
+
+Abstract:
+
+    Master include file for versioning windows SDK/DDK.
+
+*/
+
+#ifndef _INC_SDKDDKVER
+#define _INC_SDKDDKVER
+
+#pragma once
+
+//
+// _WIN32_WINNT version constants
+//
+#define _WIN32_WINNT_NT4                    0x0400
+#define _WIN32_WINNT_WIN2K                  0x0500
+#define _WIN32_WINNT_WINXP                  0x0501
+#define _WIN32_WINNT_WS03                   0x0502
+#define _WIN32_WINNT_LONGHORN               0x0600
+
+//
+// _WIN32_IE_ version constants
+//
+#define _WIN32_IE_IE20                      0x0200
+#define _WIN32_IE_IE30                      0x0300
+#define _WIN32_IE_IE302                     0x0302
+#define _WIN32_IE_IE40                      0x0400
+#define _WIN32_IE_IE401                     0x0401
+#define _WIN32_IE_IE50                      0x0500
+#define _WIN32_IE_IE501                     0x0501
+#define _WIN32_IE_IE55                      0x0550
+#define _WIN32_IE_IE60                      0x0600
+#define _WIN32_IE_IE60SP1                   0x0601
+#define _WIN32_IE_IE60SP2                   0x0603
+#define _WIN32_IE_IE70                      0x0700
+
+//
+// IE <-> OS version mapping
+//
+// NT4 supports IE versions 2.0 -> 6.0 SP1
+#define _WIN32_IE_NT4                       _WIN32_IE_IE20
+#define _WIN32_IE_NT4SP1                    _WIN32_IE_IE20
+#define _WIN32_IE_NT4SP2                    _WIN32_IE_IE20
+#define _WIN32_IE_NT4SP3                    _WIN32_IE_IE302
+#define _WIN32_IE_NT4SP4                    _WIN32_IE_IE401
+#define _WIN32_IE_NT4SP5                    _WIN32_IE_IE401
+#define _WIN32_IE_NT4SP6                    _WIN32_IE_IE50
+// Win98 supports IE versions 4.01 -> 6.0 SP1
+#define _WIN32_IE_WIN98                     _WIN32_IE_IE401
+// Win98SE supports IE versions 5.0 -> 6.0 SP1
+#define _WIN32_IE_WIN98SE                   _WIN32_IE_IE50
+// WinME supports IE versions 5.5 -> 6.0 SP1
+#define _WIN32_IE_WINME                     _WIN32_IE_IE55
+// Win2k supports IE versions 5.01 -> 6.0 SP1
+#define _WIN32_IE_WIN2K                     _WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP1                  _WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP2                  _WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP3                  _WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP4                  _WIN32_IE_IE501
+#define _WIN32_IE_XP                        _WIN32_IE_IE60
+#define _WIN32_IE_XPSP1                     _WIN32_IE_IE60SP1
+#define _WIN32_IE_XPSP2                     _WIN32_IE_IE60SP2
+#define _WIN32_IE_WS03                      0x0602
+#define _WIN32_IE_WS03SP1                   _WIN32_IE_IE60SP2
+#define _WIN32_IE_LONGHORN                  _WIN32_IE_IE70
+
+
+//
+// NTDDI version constants
+//
+#define NTDDI_WIN2K                         0x05000000
+#define NTDDI_WIN2KSP1                      0x05000100
+#define NTDDI_WIN2KSP2                      0x05000200
+#define NTDDI_WIN2KSP3                      0x05000300
+#define NTDDI_WIN2KSP4                      0x05000400
+
+#define NTDDI_WINXP                         0x05010000
+#define NTDDI_WINXPSP1                      0x05010100
+#define NTDDI_WINXPSP2                      0x05010200
+
+#define NTDDI_WS03                          0x05020000
+#define NTDDI_WS03SP1                       0x05020100
+
+#define NTDDI_LONGHORN                      0x06000000
+
+//
+// masks for version macros
+//
+#define OSVERSION_MASK      0xFFFF0000
+#define SPVERSION_MASK      0x0000FF00
+#define SUBVERSION_MASK     0x000000FF
+
+
+//
+// macros to extract various version fields from the NTDDI version
+//
+#define OSVER(Version)  ((Version) & OSVERSION_MASK)
+#define SPVER(Version)  (((Version) & SPVERSION_MASK) >> 8)
+#define SUBVER(Version) (((Version) & SUBVERSION_MASK) )
+
+
+#if defined(DECLSPEC_DEPRECATED_DDK)
+
+// deprecate in 2k or later
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
+#define DECLSPEC_DEPRECATED_DDK_WIN2K DECLSPEC_DEPRECATED_DDK
+#else
+#define DECLSPEC_DEPRECATED_DDK_WIN2K
+#endif
+
+// deprecate in XP or later
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+#define DECLSPEC_DEPRECATED_DDK_WINXP DECLSPEC_DEPRECATED_DDK
+#else
+#define DECLSPEC_DEPRECATED_DDK_WINXP
+#endif
+
+// deprecate in WS03 or later
+#if (NTDDI_VERSION >= NTDDI_WS03)
+#define DECLSPEC_DEPRECATED_DDK_WIN2003 DECLSPEC_DEPRECATED_DDK
+#else
+#define DECLSPEC_DEPRECATED_DDK_WIN2003
+#endif
+
+// deprecate in WS03 or later
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#define DECLSPEC_DEPRECATED_DDK_LONGHORN DECLSPEC_DEPRECATED_DDK
+#else
+#define DECLSPEC_DEPRECATED_DDK_LONGHORN
+#endif
+
+#endif // defined(DECLSPEC_DEPRECATED_DDK)
+
+
+//
+// if versions aren't already defined, default to most current
+//
+
+#define NTDDI_VERSION_FROM_WIN32_WINNT2(ver)    ver##0000
+#define NTDDI_VERSION_FROM_WIN32_WINNT(ver)     NTDDI_VERSION_FROM_WIN32_WINNT2(ver)
+
+#if !defined(_WIN32_WINNT) && !defined(_CHICAGO_)
+#define  _WIN32_WINNT   0x0600
+#endif
+
+#ifndef NTDDI_VERSION
+#ifdef _WIN32_WINNT
+// set NTDDI_VERSION based on _WIN32_WINNT
+#define NTDDI_VERSION   NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
+#else
+#define NTDDI_VERSION   0x06000000
+#endif
+#endif
+
+#ifndef WINVER
+#ifdef _WIN32_WINNT
+// set WINVER based on _WIN32_WINNT
+#define WINVER          _WIN32_WINNT
+#else
+#define WINVER          0x0600
+#endif
+#endif
+
+#ifndef _WIN32_IE
+#ifdef _WIN32_WINNT
+// set _WIN32_IE based on _WIN32_WINNT
+#if (_WIN32_WINNT <= _WIN32_WINNT_NT4)
+#define _WIN32_IE       _WIN32_IE_IE50
+#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
+#define _WIN32_IE       _WIN32_IE_IE501
+#elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP)
+#define _WIN32_IE       _WIN32_IE_IE60
+#elif (_WIN32_WINNT <= _WIN32_WINNT_WS03)
+#define _WIN32_IE       0x0602
+#else
+#define _WIN32_IE       0x0700
+#endif
+#else
+#define _WIN32_IE       0x0700
+#endif
+#endif
+
+//
+// Sanity check for compatible versions
+//
+#if defined(_WIN32_WINNT) && !defined(MIDL_PASS) && !defined(RC_INVOKED)
+
+#if (defined(WINVER) && (WINVER < 0x0400) && (_WIN32_WINNT > 0x0400))
+#error WINVER setting conflicts with _WIN32_WINNT setting
+#endif
+
+#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K))
+#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
+#endif
+
+#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP))
+#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
+#endif
+
+#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03))
+#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
+#endif
+
+#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_LONGHORN) && (_WIN32_WINNT != _WIN32_WINNT_LONGHORN))
+#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
+#endif
+
+#if ((_WIN32_WINNT < _WIN32_WINNT_WIN2K) && (_WIN32_IE > _WIN32_IE_IE60SP1))
+#error _WIN32_WINNT settings conflicts with _WIN32_IE setting
+#endif
+
+#endif  // defined(_WIN32_WINNT) && !defined(MIDL_PASS) && !defined(_WINRESRC_)
+
+
+#endif  // !_INC_SDKDDKVER
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/shtypes.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/shtypes.h
new file mode 100644
index 0000000000..5221d060f5
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/shtypes.h
@@ -0,0 +1,468 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for shtypes.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+
+#ifndef __shtypes_h__
+#define __shtypes_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+/* header files for imported files */
+#include "wtypes.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_shtypes_0000_0000 */
+/* [local] */ 
+
+//+-------------------------------------------------------------------------
+//
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//
+//--------------------------------------------------------------------------
+//===========================================================================
+//
+// Object identifiers in the explorer's name space (ItemID and IDList)
+//
+//  All the items that the user can browse with the explorer (such as files,
+// directories, servers, work-groups, etc.) has an identifier which is unique
+// among items within the parent folder. Those identifiers are called item
+// IDs (SHITEMID). Since all its parent folders have their own item IDs,
+// any items can be uniquely identified by a list of item IDs, which is called
+// an ID list (ITEMIDLIST).
+//
+//  ID lists are almost always allocated by the task allocator (see some
+// description below as well as OLE 2.0 SDK) and may be passed across
+// some of shell interfaces (such as IShellFolder). Each item ID in an ID list
+// is only meaningful to its parent folder (which has generated it), and all
+// the clients must treat it as an opaque binary data except the first two
+// bytes, which indicates the size of the item ID.
+//
+//  When a shell extension -- which implements the IShellFolder interace --
+// generates an item ID, it may put any information in it, not only the data
+// with that it needs to identifies the item, but also some additional
+// information, which would help implementing some other functions efficiently.
+// For example, the shell's IShellFolder implementation of file system items
+// stores the primary (long) name of a file or a directory as the item
+// identifier, but it also stores its alternative (short) name, size and date
+// etc.
+//
+//  When an ID list is passed to one of shell APIs (such as SHGetPathFromIDList),
+// it is always an absolute path -- relative from the root of the name space,
+// which is the desktop folder. When an ID list is passed to one of IShellFolder
+// member function, it is always a relative path from the folder (unless it
+// is explicitly specified).
+//
+//===========================================================================
+//
+// SHITEMID -- Item ID  (mkid)
+//     USHORT      cb;             // Size of the ID (including cb itself)
+//     BYTE        abID[];         // The item ID (variable length)
+//
+#include <pshpack1.h>
+typedef struct _SHITEMID
+    {
+    USHORT cb;
+    BYTE abID[ 1 ];
+    } 	SHITEMID;
+
+#include <poppack.h>
+#if defined(_M_IX86)
+#define __unaligned
+#endif // __unaligned
+typedef SHITEMID __unaligned *LPSHITEMID;
+
+typedef const SHITEMID __unaligned *LPCSHITEMID;
+
+//
+// ITEMIDLIST -- List if item IDs (combined with 0-terminator)
+//
+#include <pshpack1.h>
+typedef struct _ITEMIDLIST
+    {
+    SHITEMID mkid;
+    } 	ITEMIDLIST;
+
+#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
+typedef struct _ITEMIDLIST_RELATIVE : ITEMIDLIST {} ITEMIDLIST_RELATIVE;
+typedef struct _ITEMID_CHILD : ITEMIDLIST_RELATIVE {} ITEMID_CHILD;
+typedef struct _ITEMIDLIST_ABSOLUTE : ITEMIDLIST_RELATIVE {} ITEMIDLIST_ABSOLUTE;
+#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))
+typedef ITEMIDLIST ITEMIDLIST_RELATIVE;
+
+typedef ITEMIDLIST ITEMID_CHILD;
+
+typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE;
+
+#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
+#include <poppack.h>
+typedef /* [unique] */  __RPC_unique_pointer BYTE_BLOB *wirePIDL;
+
+typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST;
+
+typedef /* [wire_marshal] */ const ITEMIDLIST __unaligned *LPCITEMIDLIST;
+
+#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
+typedef /* [wire_marshal] */ ITEMIDLIST_ABSOLUTE *PIDLIST_ABSOLUTE;
+
+typedef /* [wire_marshal] */ const ITEMIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE;
+
+typedef /* [wire_marshal] */ const ITEMIDLIST_ABSOLUTE __unaligned *PCUIDLIST_ABSOLUTE;
+
+typedef /* [wire_marshal] */ ITEMIDLIST_RELATIVE *PIDLIST_RELATIVE;
+
+typedef /* [wire_marshal] */ const ITEMIDLIST_RELATIVE *PCIDLIST_RELATIVE;
+
+typedef /* [wire_marshal] */ ITEMIDLIST_RELATIVE __unaligned *PUIDLIST_RELATIVE;
+
+typedef /* [wire_marshal] */ const ITEMIDLIST_RELATIVE __unaligned *PCUIDLIST_RELATIVE;
+
+typedef /* [wire_marshal] */ ITEMID_CHILD *PITEMID_CHILD;
+
+typedef /* [wire_marshal] */ const ITEMID_CHILD *PCITEMID_CHILD;
+
+typedef /* [wire_marshal] */ ITEMID_CHILD __unaligned *PUITEMID_CHILD;
+
+typedef /* [wire_marshal] */ const ITEMID_CHILD __unaligned *PCUITEMID_CHILD;
+
+typedef const PCUITEMID_CHILD *PCUITEMID_CHILD_ARRAY;
+
+typedef const PCUIDLIST_RELATIVE *PCUIDLIST_RELATIVE_ARRAY;
+
+typedef const PCIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE_ARRAY;
+
+typedef const PCUIDLIST_ABSOLUTE *PCUIDLIST_ABSOLUTE_ARRAY;
+
+#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))
+#define PIDLIST_ABSOLUTE         LPITEMIDLIST
+#define PCIDLIST_ABSOLUTE        LPCITEMIDLIST
+#define PCUIDLIST_ABSOLUTE       LPCITEMIDLIST
+#define PIDLIST_RELATIVE         LPITEMIDLIST
+#define PCIDLIST_RELATIVE        LPCITEMIDLIST
+#define PUIDLIST_RELATIVE        LPITEMIDLIST
+#define PCUIDLIST_RELATIVE       LPCITEMIDLIST
+#define PITEMID_CHILD            LPITEMIDLIST
+#define PCITEMID_CHILD           LPCITEMIDLIST
+#define PUITEMID_CHILD           LPITEMIDLIST
+#define PCUITEMID_CHILD          LPCITEMIDLIST
+#define PCUITEMID_CHILD_ARRAY    LPCITEMIDLIST *
+#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *
+#define PCIDLIST_ABSOLUTE_ARRAY  LPCITEMIDLIST *
+#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *
+#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
+#ifdef MIDL_PASS
+typedef struct _WIN32_FIND_DATAA
+    {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD dwReserved0;
+    DWORD dwReserved1;
+    CHAR cFileName[ 260 ];
+    CHAR cAlternateFileName[ 14 ];
+    } 	WIN32_FIND_DATAA;
+
+typedef struct _WIN32_FIND_DATAA *PWIN32_FIND_DATAA;
+
+typedef struct _WIN32_FIND_DATAA *LPWIN32_FIND_DATAA;
+
+typedef struct _WIN32_FIND_DATAW
+    {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD dwReserved0;
+    DWORD dwReserved1;
+    WCHAR cFileName[ 260 ];
+    WCHAR cAlternateFileName[ 14 ];
+    } 	WIN32_FIND_DATAW;
+
+typedef struct _WIN32_FIND_DATAW *PWIN32_FIND_DATAW;
+
+typedef struct _WIN32_FIND_DATAW *LPWIN32_FIND_DATAW;
+
+#endif // MIDL_PASS
+//-------------------------------------------------------------------------
+//
+// struct STRRET
+//
+// structure for returning strings from IShellFolder member functions
+//
+//-------------------------------------------------------------------------
+//
+//  uType indicate which union member to use 
+//    STRRET_WSTR    Use STRRET.pOleStr     must be freed by caller of GetDisplayNameOf
+//    STRRET_OFFSET  Use STRRET.uOffset     Offset into SHITEMID for ANSI string 
+//    STRRET_CSTR    Use STRRET.cStr        ANSI Buffer
+//
+typedef /* [v1_enum] */ 
+enum tagSTRRET_TYPE
+    {	STRRET_WSTR	= 0,
+	STRRET_OFFSET	= 0x1,
+	STRRET_CSTR	= 0x2
+    } 	STRRET_TYPE;
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(push)
+#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union */
+#pragma once
+#endif
+#include <pshpack8.h>
+typedef struct _STRRET
+    {
+    UINT uType;
+    union 
+        {
+        LPWSTR pOleStr;
+        UINT uOffset;
+        char cStr[ 260 ];
+        } 	DUMMYUNIONNAME;
+    } 	STRRET;
+
+#include <poppack.h>
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif
+typedef STRRET *LPSTRRET;
+
+//-------------------------------------------------------------------------
+//
+// struct SHELLDETAILS
+//
+// structure for returning strings from IShellDetails
+//
+//-------------------------------------------------------------------------
+//
+//  fmt;            // LVCFMT_* value (header only)
+//  cxChar;         // Number of 'average' characters (header only)
+//  str;            // String information
+//
+#include <pshpack1.h>
+typedef struct _SHELLDETAILS
+    {
+    int fmt;
+    int cxChar;
+    STRRET str;
+    } 	SHELLDETAILS;
+
+typedef struct _SHELLDETAILS *LPSHELLDETAILS;
+
+#include <poppack.h>
+
+#if (_WIN32_IE >= _WIN32_IE_IE60SP2)
+typedef /* [v1_enum] */ 
+enum tagPERCEIVED
+    {	PERCEIVED_TYPE_FIRST	= -3,
+	PERCEIVED_TYPE_CUSTOM	= -3,
+	PERCEIVED_TYPE_UNSPECIFIED	= -2,
+	PERCEIVED_TYPE_FOLDER	= -1,
+	PERCEIVED_TYPE_UNKNOWN	= 0,
+	PERCEIVED_TYPE_TEXT	= 1,
+	PERCEIVED_TYPE_IMAGE	= 2,
+	PERCEIVED_TYPE_AUDIO	= 3,
+	PERCEIVED_TYPE_VIDEO	= 4,
+	PERCEIVED_TYPE_COMPRESSED	= 5,
+	PERCEIVED_TYPE_DOCUMENT	= 6,
+	PERCEIVED_TYPE_SYSTEM	= 7,
+	PERCEIVED_TYPE_APPLICATION	= 8,
+	PERCEIVED_TYPE_GAMEMEDIA	= 9,
+	PERCEIVED_TYPE_CONTACTS	= 10,
+	PERCEIVED_TYPE_LAST	= 10
+    } 	PERCEIVED;
+
+#define PERCEIVEDFLAG_UNDEFINED     0x0000
+#define PERCEIVEDFLAG_SOFTCODED     0x0001
+#define PERCEIVEDFLAG_HARDCODED     0x0002
+#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004
+#define PERCEIVEDFLAG_GDIPLUS       0x0010
+#define PERCEIVEDFLAG_WMSDK         0x0020
+#define PERCEIVEDFLAG_ZIPFOLDER     0x0040
+typedef DWORD PERCEIVEDFLAG;
+
+#endif  // _WIN32_IE_IE60SP2
+
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+typedef struct _COMDLG_FILTERSPEC
+    {
+    LPCWSTR pszName;
+    LPCWSTR pszSpec;
+    } 	COMDLG_FILTERSPEC;
+
+typedef struct tagMACHINE_ID
+    {
+    char szName[ 16 ];
+    } 	MACHINE_ID;
+
+typedef struct tagDOMAIN_RELATIVE_OBJECTID
+    {
+    GUID guidVolume;
+    GUID guidObject;
+    } 	DOMAIN_RELATIVE_OBJECTID;
+
+typedef GUID KNOWNFOLDERID;
+
+#if 0
+typedef KNOWNFOLDERID *REFKNOWNFOLDERID;
+
+#endif // 0
+#ifdef __cplusplus
+#define REFKNOWNFOLDERID const KNOWNFOLDERID &
+#else // !__cplusplus
+#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST
+#endif // __cplusplus
+#endif  // NTDDI_LONGHORN
+typedef GUID FOLDERTYPEID;
+
+#if 0
+typedef FOLDERTYPEID *REFFOLDERTYPEID;
+
+#endif // 0
+#ifdef __cplusplus
+#define REFFOLDERTYPEID const FOLDERTYPEID &
+#else // !__cplusplus
+#define REFFOLDERTYPEID const FOLDERTYPEID * __MIDL_CONST
+#endif // __cplusplus
+typedef GUID TASKOWNERID;
+
+#if 0
+typedef TASKOWNERID *REFTASKOWNERID;
+
+#endif // 0
+#ifdef __cplusplus
+#define REFTASKOWNERID const TASKOWNERID &
+#else // !__cplusplus
+#define REFTASKOWNERID const TASKOWNERID * __MIDL_CONST
+#endif // __cplusplus
+#ifndef LF_FACESIZE
+typedef struct tagLOGFONTA
+    {
+    LONG lfHeight;
+    LONG lfWidth;
+    LONG lfEscapement;
+    LONG lfOrientation;
+    LONG lfWeight;
+    BYTE lfItalic;
+    BYTE lfUnderline;
+    BYTE lfStrikeOut;
+    BYTE lfCharSet;
+    BYTE lfOutPrecision;
+    BYTE lfClipPrecision;
+    BYTE lfQuality;
+    BYTE lfPitchAndFamily;
+    CHAR lfFaceName[ 32 ];
+    } 	LOGFONTA;
+
+typedef struct tagLOGFONTW
+    {
+    LONG lfHeight;
+    LONG lfWidth;
+    LONG lfEscapement;
+    LONG lfOrientation;
+    LONG lfWeight;
+    BYTE lfItalic;
+    BYTE lfUnderline;
+    BYTE lfStrikeOut;
+    BYTE lfCharSet;
+    BYTE lfOutPrecision;
+    BYTE lfClipPrecision;
+    BYTE lfQuality;
+    BYTE lfPitchAndFamily;
+    WCHAR lfFaceName[ 32 ];
+    } 	LOGFONTW;
+
+typedef LOGFONTA LOGFONT;
+
+#endif // LF_FACESIZE
+typedef /* [v1_enum] */ 
+enum tagSHCOLSTATE
+    {	SHCOLSTATE_TYPE_STR	= 0x1,
+	SHCOLSTATE_TYPE_INT	= 0x2,
+	SHCOLSTATE_TYPE_DATE	= 0x3,
+	SHCOLSTATE_TYPEMASK	= 0xf,
+	SHCOLSTATE_ONBYDEFAULT	= 0x10,
+	SHCOLSTATE_SLOW	= 0x20,
+	SHCOLSTATE_EXTENDED	= 0x40,
+	SHCOLSTATE_SECONDARYUI	= 0x80,
+	SHCOLSTATE_HIDDEN	= 0x100,
+	SHCOLSTATE_PREFER_VARCMP	= 0x200,
+	SHCOLSTATE_PREFER_FMTCMP	= 0x400,
+	SHCOLSTATE_NOSORTBYFOLDERNESS	= 0x800,
+	SHCOLSTATE_VIEWONLY	= 0x10000,
+	SHCOLSTATE_BATCHREAD	= 0x20000,
+	SHCOLSTATE_NO_GROUPBY	= 0x40000,
+	SHCOLSTATE_FIXED_WIDTH	= 0x1000,
+	SHCOLSTATE_NODPISCALE	= 0x2000,
+	SHCOLSTATE_FIXED_RATIO	= 0x4000,
+	SHCOLSTATE_DISPLAYMASK	= 0xf000
+    } 	SHCOLSTATE;
+
+typedef DWORD SHCOLSTATEF;
+
+typedef PROPERTYKEY SHCOLUMNID;
+
+typedef const SHCOLUMNID *LPCSHCOLUMNID;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_shtypes_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_shtypes_0000_0000_v0_0_s_ifspec;
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h b/Externals/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h
new file mode 100644
index 0000000000..bca20a9ada
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h
@@ -0,0 +1,2478 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0499 */
+/* Compiler settings for structuredquery.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __structuredquery_h__
+#define __structuredquery_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IQueryParser_FWD_DEFINED__
+#define __IQueryParser_FWD_DEFINED__
+typedef interface IQueryParser IQueryParser;
+#endif 	/* __IQueryParser_FWD_DEFINED__ */
+
+
+#ifndef __IConditionFactory_FWD_DEFINED__
+#define __IConditionFactory_FWD_DEFINED__
+typedef interface IConditionFactory IConditionFactory;
+#endif 	/* __IConditionFactory_FWD_DEFINED__ */
+
+
+#ifndef __IQuerySolution_FWD_DEFINED__
+#define __IQuerySolution_FWD_DEFINED__
+typedef interface IQuerySolution IQuerySolution;
+#endif 	/* __IQuerySolution_FWD_DEFINED__ */
+
+
+#ifndef __ICondition_FWD_DEFINED__
+#define __ICondition_FWD_DEFINED__
+typedef interface ICondition ICondition;
+#endif 	/* __ICondition_FWD_DEFINED__ */
+
+
+#ifndef __IConditionGenerator_FWD_DEFINED__
+#define __IConditionGenerator_FWD_DEFINED__
+typedef interface IConditionGenerator IConditionGenerator;
+#endif 	/* __IConditionGenerator_FWD_DEFINED__ */
+
+
+#ifndef __IRichChunk_FWD_DEFINED__
+#define __IRichChunk_FWD_DEFINED__
+typedef interface IRichChunk IRichChunk;
+#endif 	/* __IRichChunk_FWD_DEFINED__ */
+
+
+#ifndef __IInterval_FWD_DEFINED__
+#define __IInterval_FWD_DEFINED__
+typedef interface IInterval IInterval;
+#endif 	/* __IInterval_FWD_DEFINED__ */
+
+
+#ifndef __IMetaData_FWD_DEFINED__
+#define __IMetaData_FWD_DEFINED__
+typedef interface IMetaData IMetaData;
+#endif 	/* __IMetaData_FWD_DEFINED__ */
+
+
+#ifndef __IEntity_FWD_DEFINED__
+#define __IEntity_FWD_DEFINED__
+typedef interface IEntity IEntity;
+#endif 	/* __IEntity_FWD_DEFINED__ */
+
+
+#ifndef __IRelationship_FWD_DEFINED__
+#define __IRelationship_FWD_DEFINED__
+typedef interface IRelationship IRelationship;
+#endif 	/* __IRelationship_FWD_DEFINED__ */
+
+
+#ifndef __INamedEntity_FWD_DEFINED__
+#define __INamedEntity_FWD_DEFINED__
+typedef interface INamedEntity INamedEntity;
+#endif 	/* __INamedEntity_FWD_DEFINED__ */
+
+
+#ifndef __ISchemaProvider_FWD_DEFINED__
+#define __ISchemaProvider_FWD_DEFINED__
+typedef interface ISchemaProvider ISchemaProvider;
+#endif 	/* __ISchemaProvider_FWD_DEFINED__ */
+
+
+#ifndef __ITokenCollection_FWD_DEFINED__
+#define __ITokenCollection_FWD_DEFINED__
+typedef interface ITokenCollection ITokenCollection;
+#endif 	/* __ITokenCollection_FWD_DEFINED__ */
+
+
+#ifndef __INamedEntityCollector_FWD_DEFINED__
+#define __INamedEntityCollector_FWD_DEFINED__
+typedef interface INamedEntityCollector INamedEntityCollector;
+#endif 	/* __INamedEntityCollector_FWD_DEFINED__ */
+
+
+#ifndef __ISchemaLocalizerSupport_FWD_DEFINED__
+#define __ISchemaLocalizerSupport_FWD_DEFINED__
+typedef interface ISchemaLocalizerSupport ISchemaLocalizerSupport;
+#endif 	/* __ISchemaLocalizerSupport_FWD_DEFINED__ */
+
+
+#ifndef __IQueryParserManager_FWD_DEFINED__
+#define __IQueryParserManager_FWD_DEFINED__
+typedef interface IQueryParserManager IQueryParserManager;
+#endif 	/* __IQueryParserManager_FWD_DEFINED__ */
+
+
+#ifndef __QueryParser_FWD_DEFINED__
+#define __QueryParser_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class QueryParser QueryParser;
+#else
+typedef struct QueryParser QueryParser;
+#endif /* __cplusplus */
+
+#endif 	/* __QueryParser_FWD_DEFINED__ */
+
+
+#ifndef __NegationCondition_FWD_DEFINED__
+#define __NegationCondition_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class NegationCondition NegationCondition;
+#else
+typedef struct NegationCondition NegationCondition;
+#endif /* __cplusplus */
+
+#endif 	/* __NegationCondition_FWD_DEFINED__ */
+
+
+#ifndef __CompoundCondition_FWD_DEFINED__
+#define __CompoundCondition_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class CompoundCondition CompoundCondition;
+#else
+typedef struct CompoundCondition CompoundCondition;
+#endif /* __cplusplus */
+
+#endif 	/* __CompoundCondition_FWD_DEFINED__ */
+
+
+#ifndef __LeafCondition_FWD_DEFINED__
+#define __LeafCondition_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class LeafCondition LeafCondition;
+#else
+typedef struct LeafCondition LeafCondition;
+#endif /* __cplusplus */
+
+#endif 	/* __LeafCondition_FWD_DEFINED__ */
+
+
+#ifndef __ConditionFactory_FWD_DEFINED__
+#define __ConditionFactory_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class ConditionFactory ConditionFactory;
+#else
+typedef struct ConditionFactory ConditionFactory;
+#endif /* __cplusplus */
+
+#endif 	/* __ConditionFactory_FWD_DEFINED__ */
+
+
+#ifndef __Interval_FWD_DEFINED__
+#define __Interval_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class Interval Interval;
+#else
+typedef struct Interval Interval;
+#endif /* __cplusplus */
+
+#endif 	/* __Interval_FWD_DEFINED__ */
+
+
+#ifndef __QueryParserManager_FWD_DEFINED__
+#define __QueryParserManager_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class QueryParserManager QueryParserManager;
+#else
+typedef struct QueryParserManager QueryParserManager;
+#endif /* __cplusplus */
+
+#endif 	/* __QueryParserManager_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+#include "propidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+/* interface __MIDL_itf_structuredquery_0000_0000 */
+/* [local] */ 
+
+
+
+
+
+
+
+
+
+
+
+typedef /* [v1_enum] */ 
+enum tagCONDITION_TYPE
+    {	CT_AND_CONDITION	= 0,
+	CT_OR_CONDITION	= ( CT_AND_CONDITION + 1 ) ,
+	CT_NOT_CONDITION	= ( CT_OR_CONDITION + 1 ) ,
+	CT_LEAF_CONDITION	= ( CT_NOT_CONDITION + 1 ) 
+    } 	CONDITION_TYPE;
+
+typedef /* [v1_enum] */ 
+enum tagCONDITION_OPERATION
+    {	COP_IMPLICIT	= 0,
+	COP_EQUAL	= ( COP_IMPLICIT + 1 ) ,
+	COP_NOTEQUAL	= ( COP_EQUAL + 1 ) ,
+	COP_LESSTHAN	= ( COP_NOTEQUAL + 1 ) ,
+	COP_GREATERTHAN	= ( COP_LESSTHAN + 1 ) ,
+	COP_LESSTHANOREQUAL	= ( COP_GREATERTHAN + 1 ) ,
+	COP_GREATERTHANOREQUAL	= ( COP_LESSTHANOREQUAL + 1 ) ,
+	COP_VALUE_STARTSWITH	= ( COP_GREATERTHANOREQUAL + 1 ) ,
+	COP_VALUE_ENDSWITH	= ( COP_VALUE_STARTSWITH + 1 ) ,
+	COP_VALUE_CONTAINS	= ( COP_VALUE_ENDSWITH + 1 ) ,
+	COP_VALUE_NOTCONTAINS	= ( COP_VALUE_CONTAINS + 1 ) ,
+	COP_DOSWILDCARDS	= ( COP_VALUE_NOTCONTAINS + 1 ) ,
+	COP_WORD_EQUAL	= ( COP_DOSWILDCARDS + 1 ) ,
+	COP_WORD_STARTSWITH	= ( COP_WORD_EQUAL + 1 ) ,
+	COP_APPLICATION_SPECIFIC	= ( COP_WORD_STARTSWITH + 1 ) 
+    } 	CONDITION_OPERATION;
+
+typedef /* [v1_enum] */ 
+enum tagSTRUCTURED_QUERY_SINGLE_OPTION
+    {	SQSO_SCHEMA	= 0,
+	SQSO_LOCALE_WORD_BREAKING	= ( SQSO_SCHEMA + 1 ) ,
+	SQSO_WORD_BREAKER	= ( SQSO_LOCALE_WORD_BREAKING + 1 ) ,
+	SQSO_NATURAL_SYNTAX	= ( SQSO_WORD_BREAKER + 1 ) ,
+	SQSO_AUTOMATIC_WILDCARD	= ( SQSO_NATURAL_SYNTAX + 1 ) ,
+	SQSO_TRACE_LEVEL	= ( SQSO_AUTOMATIC_WILDCARD + 1 ) ,
+	SQSO_LANGUAGE_KEYWORDS	= ( SQSO_TRACE_LEVEL + 1 ) 
+    } 	STRUCTURED_QUERY_SINGLE_OPTION;
+
+typedef /* [v1_enum] */ 
+enum tagSTRUCTURED_QUERY_MULTIOPTION
+    {	SQMO_VIRTUAL_PROPERTY	= 0,
+	SQMO_DEFAULT_PROPERTY	= ( SQMO_VIRTUAL_PROPERTY + 1 ) ,
+	SQMO_GENERATOR_FOR_TYPE	= ( SQMO_DEFAULT_PROPERTY + 1 ) 
+    } 	STRUCTURED_QUERY_MULTIOPTION;
+
+typedef /* [v1_enum] */ 
+enum tagSTRUCTURED_QUERY_PARSE_ERROR
+    {	SQPE_NONE	= 0,
+	SQPE_EXTRA_OPENING_PARENTHESIS	= ( SQPE_NONE + 1 ) ,
+	SQPE_EXTRA_CLOSING_PARENTHESIS	= ( SQPE_EXTRA_OPENING_PARENTHESIS + 1 ) ,
+	SQPE_IGNORED_MODIFIER	= ( SQPE_EXTRA_CLOSING_PARENTHESIS + 1 ) ,
+	SQPE_IGNORED_CONNECTOR	= ( SQPE_IGNORED_MODIFIER + 1 ) ,
+	SQPE_IGNORED_KEYWORD	= ( SQPE_IGNORED_CONNECTOR + 1 ) ,
+	SQPE_UNHANDLED	= ( SQPE_IGNORED_KEYWORD + 1 ) 
+    } 	STRUCTURED_QUERY_PARSE_ERROR;
+
+/* [v1_enum] */ 
+enum tagSTRUCTURED_QUERY_RESOLVE_OPTION
+    {	SQRO_DONT_RESOLVE_DATETIME	= 0x1,
+	SQRO_ALWAYS_ONE_INTERVAL	= 0x2,
+	SQRO_DONT_SIMPLIFY_CONDITION_TREES	= 0x4,
+	SQRO_DONT_MAP_RELATIONS	= 0x8,
+	SQRO_DONT_RESOLVE_RANGES	= 0x10,
+	SQRO_DONT_REMOVE_UNRESTRICTED_KEYWORDS	= 0x20,
+	SQRO_DONT_SPLIT_WORDS	= 0x40,
+	SQRO_IGNORE_PHRASE_ORDER	= 0x80
+    } ;
+typedef int STRUCTURED_QUERY_RESOLVE_OPTION;
+
+typedef /* [v1_enum] */ 
+enum tagINTERVAL_LIMIT_KIND
+    {	ILK_EXPLICIT_INCLUDED	= 0,
+	ILK_EXPLICIT_EXCLUDED	= ( ILK_EXPLICIT_INCLUDED + 1 ) ,
+	ILK_NEGATIVE_INFINITY	= ( ILK_EXPLICIT_EXCLUDED + 1 ) ,
+	ILK_POSITIVE_INFINITY	= ( ILK_NEGATIVE_INFINITY + 1 ) 
+    } 	INTERVAL_LIMIT_KIND;
+
+typedef /* [v1_enum] */ 
+enum tagQUERY_PARSER_MANAGER_OPTION
+    {	QPMO_SCHEMA_BINARY_NAME	= 0,
+	QPMO_PRELOCALIZED_SCHEMA_BINARY_PATH	= ( QPMO_SCHEMA_BINARY_NAME + 1 ) ,
+	QPMO_UNLOCALIZED_SCHEMA_BINARY_PATH	= ( QPMO_PRELOCALIZED_SCHEMA_BINARY_PATH + 1 ) ,
+	QPMO_LOCALIZED_SCHEMA_BINARY_PATH	= ( QPMO_UNLOCALIZED_SCHEMA_BINARY_PATH + 1 ) ,
+	QPMO_APPEND_LCID_TO_LOCALIZED_PATH	= ( QPMO_LOCALIZED_SCHEMA_BINARY_PATH + 1 ) ,
+	QPMO_LOCALIZER_SUPPORT	= ( QPMO_APPEND_LCID_TO_LOCALIZED_PATH + 1 ) 
+    } 	QUERY_PARSER_MANAGER_OPTION;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0000_v0_0_s_ifspec;
+
+#ifndef __IQueryParser_INTERFACE_DEFINED__
+#define __IQueryParser_INTERFACE_DEFINED__
+
+/* interface IQueryParser */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IQueryParser;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("2EBDEE67-3505-43f8-9946-EA44ABC8E5B0")
+    IQueryParser : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Parse( 
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ __RPC__in_opt IEnumUnknown *pCustomProperties,
+            /* [retval][out] */ __RPC__deref_out_opt IQuerySolution **ppSolution) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetOption( 
+            /* [in] */ STRUCTURED_QUERY_SINGLE_OPTION option,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetOption( 
+            /* [in] */ STRUCTURED_QUERY_SINGLE_OPTION option,
+            /* [retval][out] */ __RPC__out PROPVARIANT *pOptionValue) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetMultiOption( 
+            /* [in] */ STRUCTURED_QUERY_MULTIOPTION option,
+            /* [in] */ __RPC__in LPCWSTR pszOptionKey,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetSchemaProvider( 
+            /* [retval][out] */ __RPC__deref_out_opt ISchemaProvider **ppSchemaProvider) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RestateToString( 
+            /* [in] */ __RPC__in_opt ICondition *pCondition,
+            /* [in] */ BOOL fUseEnglish,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszQueryString) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE ParsePropertyValue( 
+            /* [in] */ __RPC__in LPCWSTR pszPropertyName,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [retval][out] */ __RPC__deref_out_opt IQuerySolution **ppSolution) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RestatePropertyValueToString( 
+            /* [in] */ __RPC__in_opt ICondition *pCondition,
+            /* [in] */ BOOL fUseEnglish,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszPropertyName,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszQueryString) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IQueryParserVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IQueryParser * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IQueryParser * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IQueryParser * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Parse )( 
+            IQueryParser * This,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ __RPC__in_opt IEnumUnknown *pCustomProperties,
+            /* [retval][out] */ __RPC__deref_out_opt IQuerySolution **ppSolution);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetOption )( 
+            IQueryParser * This,
+            /* [in] */ STRUCTURED_QUERY_SINGLE_OPTION option,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetOption )( 
+            IQueryParser * This,
+            /* [in] */ STRUCTURED_QUERY_SINGLE_OPTION option,
+            /* [retval][out] */ __RPC__out PROPVARIANT *pOptionValue);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetMultiOption )( 
+            IQueryParser * This,
+            /* [in] */ STRUCTURED_QUERY_MULTIOPTION option,
+            /* [in] */ __RPC__in LPCWSTR pszOptionKey,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSchemaProvider )( 
+            IQueryParser * This,
+            /* [retval][out] */ __RPC__deref_out_opt ISchemaProvider **ppSchemaProvider);
+        
+        HRESULT ( STDMETHODCALLTYPE *RestateToString )( 
+            IQueryParser * This,
+            /* [in] */ __RPC__in_opt ICondition *pCondition,
+            /* [in] */ BOOL fUseEnglish,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszQueryString);
+        
+        HRESULT ( STDMETHODCALLTYPE *ParsePropertyValue )( 
+            IQueryParser * This,
+            /* [in] */ __RPC__in LPCWSTR pszPropertyName,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [retval][out] */ __RPC__deref_out_opt IQuerySolution **ppSolution);
+        
+        HRESULT ( STDMETHODCALLTYPE *RestatePropertyValueToString )( 
+            IQueryParser * This,
+            /* [in] */ __RPC__in_opt ICondition *pCondition,
+            /* [in] */ BOOL fUseEnglish,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszPropertyName,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszQueryString);
+        
+        END_INTERFACE
+    } IQueryParserVtbl;
+
+    interface IQueryParser
+    {
+        CONST_VTBL struct IQueryParserVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IQueryParser_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IQueryParser_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IQueryParser_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IQueryParser_Parse(This,pszInputString,pCustomProperties,ppSolution)	\
+    ( (This)->lpVtbl -> Parse(This,pszInputString,pCustomProperties,ppSolution) ) 
+
+#define IQueryParser_SetOption(This,option,pOptionValue)	\
+    ( (This)->lpVtbl -> SetOption(This,option,pOptionValue) ) 
+
+#define IQueryParser_GetOption(This,option,pOptionValue)	\
+    ( (This)->lpVtbl -> GetOption(This,option,pOptionValue) ) 
+
+#define IQueryParser_SetMultiOption(This,option,pszOptionKey,pOptionValue)	\
+    ( (This)->lpVtbl -> SetMultiOption(This,option,pszOptionKey,pOptionValue) ) 
+
+#define IQueryParser_GetSchemaProvider(This,ppSchemaProvider)	\
+    ( (This)->lpVtbl -> GetSchemaProvider(This,ppSchemaProvider) ) 
+
+#define IQueryParser_RestateToString(This,pCondition,fUseEnglish,ppszQueryString)	\
+    ( (This)->lpVtbl -> RestateToString(This,pCondition,fUseEnglish,ppszQueryString) ) 
+
+#define IQueryParser_ParsePropertyValue(This,pszPropertyName,pszInputString,ppSolution)	\
+    ( (This)->lpVtbl -> ParsePropertyValue(This,pszPropertyName,pszInputString,ppSolution) ) 
+
+#define IQueryParser_RestatePropertyValueToString(This,pCondition,fUseEnglish,ppszPropertyName,ppszQueryString)	\
+    ( (This)->lpVtbl -> RestatePropertyValueToString(This,pCondition,fUseEnglish,ppszPropertyName,ppszQueryString) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IQueryParser_INTERFACE_DEFINED__ */
+
+
+#ifndef __IConditionFactory_INTERFACE_DEFINED__
+#define __IConditionFactory_INTERFACE_DEFINED__
+
+/* interface IConditionFactory */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IConditionFactory;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("A5EFE073-B16F-474f-9F3E-9F8B497A3E08")
+    IConditionFactory : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE MakeNot( 
+            /* [in] */ __RPC__in_opt ICondition *pSubCondition,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE MakeAndOr( 
+            /* [in] */ CONDITION_TYPE nodeType,
+            /* [in] */ __RPC__in_opt IEnumUnknown *pSubConditions,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE MakeLeaf( 
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszPropertyName,
+            /* [in] */ CONDITION_OPERATION op,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValueType,
+            /* [in] */ __RPC__in const PROPVARIANT *pValue,
+            /* [in] */ __RPC__in_opt IRichChunk *pPropertyNameTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pOperationTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pValueTerm,
+            /* [in] */ BOOL expand,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Resolve( 
+            /* [in] */ 
+            __in  ICondition *pConditionTree,
+            /* [in] */ 
+            __in  STRUCTURED_QUERY_RESOLVE_OPTION sqro,
+            /* [ref][in] */ 
+            __in_opt  const SYSTEMTIME *pstReferenceTime,
+            /* [retval][out] */ 
+            __out  ICondition **ppResolvedConditionTree) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IConditionFactoryVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IConditionFactory * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IConditionFactory * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IConditionFactory * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeNot )( 
+            IConditionFactory * This,
+            /* [in] */ __RPC__in_opt ICondition *pSubCondition,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeAndOr )( 
+            IConditionFactory * This,
+            /* [in] */ CONDITION_TYPE nodeType,
+            /* [in] */ __RPC__in_opt IEnumUnknown *pSubConditions,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeLeaf )( 
+            IConditionFactory * This,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszPropertyName,
+            /* [in] */ CONDITION_OPERATION op,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValueType,
+            /* [in] */ __RPC__in const PROPVARIANT *pValue,
+            /* [in] */ __RPC__in_opt IRichChunk *pPropertyNameTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pOperationTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pValueTerm,
+            /* [in] */ BOOL expand,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Resolve )( 
+            IConditionFactory * This,
+            /* [in] */ 
+            __in  ICondition *pConditionTree,
+            /* [in] */ 
+            __in  STRUCTURED_QUERY_RESOLVE_OPTION sqro,
+            /* [ref][in] */ 
+            __in_opt  const SYSTEMTIME *pstReferenceTime,
+            /* [retval][out] */ 
+            __out  ICondition **ppResolvedConditionTree);
+        
+        END_INTERFACE
+    } IConditionFactoryVtbl;
+
+    interface IConditionFactory
+    {
+        CONST_VTBL struct IConditionFactoryVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IConditionFactory_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IConditionFactory_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IConditionFactory_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IConditionFactory_MakeNot(This,pSubCondition,simplify,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeNot(This,pSubCondition,simplify,ppResultQuery) ) 
+
+#define IConditionFactory_MakeAndOr(This,nodeType,pSubConditions,simplify,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeAndOr(This,nodeType,pSubConditions,simplify,ppResultQuery) ) 
+
+#define IConditionFactory_MakeLeaf(This,pszPropertyName,op,pszValueType,pValue,pPropertyNameTerm,pOperationTerm,pValueTerm,expand,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeLeaf(This,pszPropertyName,op,pszValueType,pValue,pPropertyNameTerm,pOperationTerm,pValueTerm,expand,ppResultQuery) ) 
+
+#define IConditionFactory_Resolve(This,pConditionTree,sqro,pstReferenceTime,ppResolvedConditionTree)	\
+    ( (This)->lpVtbl -> Resolve(This,pConditionTree,sqro,pstReferenceTime,ppResolvedConditionTree) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IConditionFactory_INTERFACE_DEFINED__ */
+
+
+#ifndef __IQuerySolution_INTERFACE_DEFINED__
+#define __IQuerySolution_INTERFACE_DEFINED__
+
+/* interface IQuerySolution */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IQuerySolution;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("D6EBC66B-8921-4193-AFDD-A1789FB7FF57")
+    IQuerySolution : public IConditionFactory
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetQuery( 
+            /* [out] */ 
+            __out_opt  ICondition **ppQueryNode,
+            /* [out] */ 
+            __out_opt  IEntity **ppMainType) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetErrors( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppParseErrors) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetLexicalData( 
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszInputString,
+            /* [out] */ 
+            __out_opt  ITokenCollection **ppTokens,
+            /* [out] */ 
+            __out_opt  LCID *pLocale,
+            /* [out] */ 
+            __out_opt  IUnknown **ppWordBreaker) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IQuerySolutionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IQuerySolution * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IQuerySolution * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IQuerySolution * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeNot )( 
+            IQuerySolution * This,
+            /* [in] */ __RPC__in_opt ICondition *pSubCondition,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeAndOr )( 
+            IQuerySolution * This,
+            /* [in] */ CONDITION_TYPE nodeType,
+            /* [in] */ __RPC__in_opt IEnumUnknown *pSubConditions,
+            /* [in] */ BOOL simplify,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        HRESULT ( STDMETHODCALLTYPE *MakeLeaf )( 
+            IQuerySolution * This,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszPropertyName,
+            /* [in] */ CONDITION_OPERATION op,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValueType,
+            /* [in] */ __RPC__in const PROPVARIANT *pValue,
+            /* [in] */ __RPC__in_opt IRichChunk *pPropertyNameTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pOperationTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pValueTerm,
+            /* [in] */ BOOL expand,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppResultQuery);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Resolve )( 
+            IQuerySolution * This,
+            /* [in] */ 
+            __in  ICondition *pConditionTree,
+            /* [in] */ 
+            __in  STRUCTURED_QUERY_RESOLVE_OPTION sqro,
+            /* [ref][in] */ 
+            __in_opt  const SYSTEMTIME *pstReferenceTime,
+            /* [retval][out] */ 
+            __out  ICondition **ppResolvedConditionTree);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetQuery )( 
+            IQuerySolution * This,
+            /* [out] */ 
+            __out_opt  ICondition **ppQueryNode,
+            /* [out] */ 
+            __out_opt  IEntity **ppMainType);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetErrors )( 
+            IQuerySolution * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppParseErrors);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetLexicalData )( 
+            IQuerySolution * This,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszInputString,
+            /* [out] */ 
+            __out_opt  ITokenCollection **ppTokens,
+            /* [out] */ 
+            __out_opt  LCID *pLocale,
+            /* [out] */ 
+            __out_opt  IUnknown **ppWordBreaker);
+        
+        END_INTERFACE
+    } IQuerySolutionVtbl;
+
+    interface IQuerySolution
+    {
+        CONST_VTBL struct IQuerySolutionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IQuerySolution_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IQuerySolution_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IQuerySolution_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IQuerySolution_MakeNot(This,pSubCondition,simplify,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeNot(This,pSubCondition,simplify,ppResultQuery) ) 
+
+#define IQuerySolution_MakeAndOr(This,nodeType,pSubConditions,simplify,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeAndOr(This,nodeType,pSubConditions,simplify,ppResultQuery) ) 
+
+#define IQuerySolution_MakeLeaf(This,pszPropertyName,op,pszValueType,pValue,pPropertyNameTerm,pOperationTerm,pValueTerm,expand,ppResultQuery)	\
+    ( (This)->lpVtbl -> MakeLeaf(This,pszPropertyName,op,pszValueType,pValue,pPropertyNameTerm,pOperationTerm,pValueTerm,expand,ppResultQuery) ) 
+
+#define IQuerySolution_Resolve(This,pConditionTree,sqro,pstReferenceTime,ppResolvedConditionTree)	\
+    ( (This)->lpVtbl -> Resolve(This,pConditionTree,sqro,pstReferenceTime,ppResolvedConditionTree) ) 
+
+
+#define IQuerySolution_GetQuery(This,ppQueryNode,ppMainType)	\
+    ( (This)->lpVtbl -> GetQuery(This,ppQueryNode,ppMainType) ) 
+
+#define IQuerySolution_GetErrors(This,riid,ppParseErrors)	\
+    ( (This)->lpVtbl -> GetErrors(This,riid,ppParseErrors) ) 
+
+#define IQuerySolution_GetLexicalData(This,ppszInputString,ppTokens,pLocale,ppWordBreaker)	\
+    ( (This)->lpVtbl -> GetLexicalData(This,ppszInputString,ppTokens,pLocale,ppWordBreaker) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IQuerySolution_INTERFACE_DEFINED__ */
+
+
+#ifndef __ICondition_INTERFACE_DEFINED__
+#define __ICondition_INTERFACE_DEFINED__
+
+/* interface ICondition */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_ICondition;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("0FC988D4-C935-4b97-A973-46282EA175C8")
+    ICondition : public IPersistStream
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetConditionType( 
+            /* [retval][out] */ __RPC__out CONDITION_TYPE *pNodeType) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetSubConditions( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppv) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetComparisonInfo( 
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszPropertyName,
+            /* [out] */ 
+            __out_opt  CONDITION_OPERATION *pOperation,
+            /* [out] */ 
+            __out_opt  PROPVARIANT *pValue) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetValueType( 
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszValueTypeName) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetValueNormalization( 
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszNormalization) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetInputTerms( 
+            /* [out] */ 
+            __out_opt  IRichChunk **ppPropertyTerm,
+            /* [out] */ 
+            __out_opt  IRichChunk **ppOperationTerm,
+            /* [out] */ 
+            __out_opt  IRichChunk **ppValueTerm) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Clone( 
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppc) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IConditionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ICondition * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ICondition * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ICondition * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetClassID )( 
+            ICondition * This,
+            /* [out] */ __RPC__out CLSID *pClassID);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsDirty )( 
+            ICondition * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Load )( 
+            ICondition * This,
+            /* [unique][in] */ __RPC__in_opt IStream *pStm);
+        
+        HRESULT ( STDMETHODCALLTYPE *Save )( 
+            ICondition * This,
+            /* [unique][in] */ __RPC__in_opt IStream *pStm,
+            /* [in] */ BOOL fClearDirty);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSizeMax )( 
+            ICondition * This,
+            /* [out] */ __RPC__out ULARGE_INTEGER *pcbSize);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetConditionType )( 
+            ICondition * This,
+            /* [retval][out] */ __RPC__out CONDITION_TYPE *pNodeType);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetSubConditions )( 
+            ICondition * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppv);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetComparisonInfo )( 
+            ICondition * This,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszPropertyName,
+            /* [out] */ 
+            __out_opt  CONDITION_OPERATION *pOperation,
+            /* [out] */ 
+            __out_opt  PROPVARIANT *pValue);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValueType )( 
+            ICondition * This,
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszValueTypeName);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValueNormalization )( 
+            ICondition * This,
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszNormalization);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetInputTerms )( 
+            ICondition * This,
+            /* [out] */ 
+            __out_opt  IRichChunk **ppPropertyTerm,
+            /* [out] */ 
+            __out_opt  IRichChunk **ppOperationTerm,
+            /* [out] */ 
+            __out_opt  IRichChunk **ppValueTerm);
+        
+        HRESULT ( STDMETHODCALLTYPE *Clone )( 
+            ICondition * This,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppc);
+        
+        END_INTERFACE
+    } IConditionVtbl;
+
+    interface ICondition
+    {
+        CONST_VTBL struct IConditionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ICondition_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ICondition_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ICondition_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ICondition_GetClassID(This,pClassID)	\
+    ( (This)->lpVtbl -> GetClassID(This,pClassID) ) 
+
+
+#define ICondition_IsDirty(This)	\
+    ( (This)->lpVtbl -> IsDirty(This) ) 
+
+#define ICondition_Load(This,pStm)	\
+    ( (This)->lpVtbl -> Load(This,pStm) ) 
+
+#define ICondition_Save(This,pStm,fClearDirty)	\
+    ( (This)->lpVtbl -> Save(This,pStm,fClearDirty) ) 
+
+#define ICondition_GetSizeMax(This,pcbSize)	\
+    ( (This)->lpVtbl -> GetSizeMax(This,pcbSize) ) 
+
+
+#define ICondition_GetConditionType(This,pNodeType)	\
+    ( (This)->lpVtbl -> GetConditionType(This,pNodeType) ) 
+
+#define ICondition_GetSubConditions(This,riid,ppv)	\
+    ( (This)->lpVtbl -> GetSubConditions(This,riid,ppv) ) 
+
+#define ICondition_GetComparisonInfo(This,ppszPropertyName,pOperation,pValue)	\
+    ( (This)->lpVtbl -> GetComparisonInfo(This,ppszPropertyName,pOperation,pValue) ) 
+
+#define ICondition_GetValueType(This,ppszValueTypeName)	\
+    ( (This)->lpVtbl -> GetValueType(This,ppszValueTypeName) ) 
+
+#define ICondition_GetValueNormalization(This,ppszNormalization)	\
+    ( (This)->lpVtbl -> GetValueNormalization(This,ppszNormalization) ) 
+
+#define ICondition_GetInputTerms(This,ppPropertyTerm,ppOperationTerm,ppValueTerm)	\
+    ( (This)->lpVtbl -> GetInputTerms(This,ppPropertyTerm,ppOperationTerm,ppValueTerm) ) 
+
+#define ICondition_Clone(This,ppc)	\
+    ( (This)->lpVtbl -> Clone(This,ppc) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ICondition_INTERFACE_DEFINED__ */
+
+
+#ifndef __IConditionGenerator_INTERFACE_DEFINED__
+#define __IConditionGenerator_INTERFACE_DEFINED__
+
+/* interface IConditionGenerator */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IConditionGenerator;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("92D2CC58-4386-45a3-B98C-7E0CE64A4117")
+    IConditionGenerator : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Initialize( 
+            /* [in] */ __RPC__in_opt ISchemaProvider *pSchemaProvider) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RecognizeNamedEntities( 
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ LCID lcid,
+            /* [in] */ __RPC__in_opt ITokenCollection *pTokenCollection,
+            /* [out][in] */ __RPC__inout_opt INamedEntityCollector *pNamedEntities) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GenerateForLeaf( 
+            /* [in] */ __RPC__in_opt IConditionFactory *pConditionFactory,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszPropertyName,
+            /* [in] */ CONDITION_OPERATION op,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValueType,
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValue2,
+            /* [in] */ __RPC__in_opt IRichChunk *pPropertyNameTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pOperationTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pValueTerm,
+            /* [in] */ BOOL automaticWildcard,
+            /* [out] */ __RPC__out BOOL *pNoStringQuery,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppQueryExpression) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE DefaultPhrase( 
+            /* [unique][in] */ LPCWSTR pszValueType,
+            /* [in] */ const PROPVARIANT *ppropvar,
+            /* [in] */ BOOL fUseEnglish,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IConditionGeneratorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IConditionGenerator * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IConditionGenerator * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IConditionGenerator * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Initialize )( 
+            IConditionGenerator * This,
+            /* [in] */ __RPC__in_opt ISchemaProvider *pSchemaProvider);
+        
+        HRESULT ( STDMETHODCALLTYPE *RecognizeNamedEntities )( 
+            IConditionGenerator * This,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ LCID lcid,
+            /* [in] */ __RPC__in_opt ITokenCollection *pTokenCollection,
+            /* [out][in] */ __RPC__inout_opt INamedEntityCollector *pNamedEntities);
+        
+        HRESULT ( STDMETHODCALLTYPE *GenerateForLeaf )( 
+            IConditionGenerator * This,
+            /* [in] */ __RPC__in_opt IConditionFactory *pConditionFactory,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszPropertyName,
+            /* [in] */ CONDITION_OPERATION op,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValueType,
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [unique][in] */ __RPC__in_opt LPCWSTR pszValue2,
+            /* [in] */ __RPC__in_opt IRichChunk *pPropertyNameTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pOperationTerm,
+            /* [in] */ __RPC__in_opt IRichChunk *pValueTerm,
+            /* [in] */ BOOL automaticWildcard,
+            /* [out] */ __RPC__out BOOL *pNoStringQuery,
+            /* [retval][out] */ __RPC__deref_out_opt ICondition **ppQueryExpression);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *DefaultPhrase )( 
+            IConditionGenerator * This,
+            /* [unique][in] */ LPCWSTR pszValueType,
+            /* [in] */ const PROPVARIANT *ppropvar,
+            /* [in] */ BOOL fUseEnglish,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase);
+        
+        END_INTERFACE
+    } IConditionGeneratorVtbl;
+
+    interface IConditionGenerator
+    {
+        CONST_VTBL struct IConditionGeneratorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IConditionGenerator_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IConditionGenerator_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IConditionGenerator_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IConditionGenerator_Initialize(This,pSchemaProvider)	\
+    ( (This)->lpVtbl -> Initialize(This,pSchemaProvider) ) 
+
+#define IConditionGenerator_RecognizeNamedEntities(This,pszInputString,lcid,pTokenCollection,pNamedEntities)	\
+    ( (This)->lpVtbl -> RecognizeNamedEntities(This,pszInputString,lcid,pTokenCollection,pNamedEntities) ) 
+
+#define IConditionGenerator_GenerateForLeaf(This,pConditionFactory,pszPropertyName,op,pszValueType,pszValue,pszValue2,pPropertyNameTerm,pOperationTerm,pValueTerm,automaticWildcard,pNoStringQuery,ppQueryExpression)	\
+    ( (This)->lpVtbl -> GenerateForLeaf(This,pConditionFactory,pszPropertyName,op,pszValueType,pszValue,pszValue2,pPropertyNameTerm,pOperationTerm,pValueTerm,automaticWildcard,pNoStringQuery,ppQueryExpression) ) 
+
+#define IConditionGenerator_DefaultPhrase(This,pszValueType,ppropvar,fUseEnglish,ppszPhrase)	\
+    ( (This)->lpVtbl -> DefaultPhrase(This,pszValueType,ppropvar,fUseEnglish,ppszPhrase) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IConditionGenerator_INTERFACE_DEFINED__ */
+
+
+#ifndef __IRichChunk_INTERFACE_DEFINED__
+#define __IRichChunk_INTERFACE_DEFINED__
+
+/* interface IRichChunk */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IRichChunk;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("4FDEF69C-DBC9-454e-9910-B34F3C64B510")
+    IRichChunk : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetData( 
+            /* [out] */ 
+            __out_opt  ULONG *pFirstPos,
+            /* [out] */ 
+            __out_opt  ULONG *pLength,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppsz,
+            /* [out] */ 
+            __out_opt  PROPVARIANT *pValue) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IRichChunkVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IRichChunk * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IRichChunk * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IRichChunk * This);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetData )( 
+            IRichChunk * This,
+            /* [out] */ 
+            __out_opt  ULONG *pFirstPos,
+            /* [out] */ 
+            __out_opt  ULONG *pLength,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppsz,
+            /* [out] */ 
+            __out_opt  PROPVARIANT *pValue);
+        
+        END_INTERFACE
+    } IRichChunkVtbl;
+
+    interface IRichChunk
+    {
+        CONST_VTBL struct IRichChunkVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IRichChunk_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IRichChunk_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IRichChunk_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IRichChunk_GetData(This,pFirstPos,pLength,ppsz,pValue)	\
+    ( (This)->lpVtbl -> GetData(This,pFirstPos,pLength,ppsz,pValue) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IRichChunk_INTERFACE_DEFINED__ */
+
+
+#ifndef __IInterval_INTERFACE_DEFINED__
+#define __IInterval_INTERFACE_DEFINED__
+
+/* interface IInterval */
+/* [unique][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IInterval;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("6BF0A714-3C18-430b-8B5D-83B1C234D3DB")
+    IInterval : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetLimits( 
+            /* [out] */ __RPC__out INTERVAL_LIMIT_KIND *pilkLower,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarLower,
+            /* [out] */ __RPC__out INTERVAL_LIMIT_KIND *pilkUpper,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarUpper) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IIntervalVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IInterval * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IInterval * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IInterval * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetLimits )( 
+            IInterval * This,
+            /* [out] */ __RPC__out INTERVAL_LIMIT_KIND *pilkLower,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarLower,
+            /* [out] */ __RPC__out INTERVAL_LIMIT_KIND *pilkUpper,
+            /* [out] */ __RPC__out PROPVARIANT *ppropvarUpper);
+        
+        END_INTERFACE
+    } IIntervalVtbl;
+
+    interface IInterval
+    {
+        CONST_VTBL struct IIntervalVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IInterval_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IInterval_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IInterval_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IInterval_GetLimits(This,pilkLower,ppropvarLower,pilkUpper,ppropvarUpper)	\
+    ( (This)->lpVtbl -> GetLimits(This,pilkLower,ppropvarLower,pilkUpper,ppropvarUpper) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IInterval_INTERFACE_DEFINED__ */
+
+
+#ifndef __IMetaData_INTERFACE_DEFINED__
+#define __IMetaData_INTERFACE_DEFINED__
+
+/* interface IMetaData */
+/* [unique][uuid][object][helpstring] */ 
+
+
+EXTERN_C const IID IID_IMetaData;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("780102B0-C43B-4876-BC7B-5E9BA5C88794")
+    IMetaData : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetData( 
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszKey,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszValue) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IMetaDataVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMetaData * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMetaData * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMetaData * This);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetData )( 
+            IMetaData * This,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszKey,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppszValue);
+        
+        END_INTERFACE
+    } IMetaDataVtbl;
+
+    interface IMetaData
+    {
+        CONST_VTBL struct IMetaDataVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMetaData_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMetaData_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMetaData_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMetaData_GetData(This,ppszKey,ppszValue)	\
+    ( (This)->lpVtbl -> GetData(This,ppszKey,ppszValue) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMetaData_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_structuredquery_0000_0008 */
+/* [local] */ 
+
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0008_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0008_v0_0_s_ifspec;
+
+#ifndef __IEntity_INTERFACE_DEFINED__
+#define __IEntity_INTERFACE_DEFINED__
+
+/* interface IEntity */
+/* [unique][object][uuid][helpstring] */ 
+
+
+EXTERN_C const IID IID_IEntity;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("24264891-E80B-4fd3-B7CE-4FF2FAE8931F")
+    IEntity : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Name( 
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszName) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Base( 
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pBaseEntity) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Relationships( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pRelationships) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetRelationship( 
+            /* [in] */ __RPC__in LPCWSTR pszRelationName,
+            /* [retval][out] */ __RPC__deref_out_opt IRelationship **pRelationship) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE MetaData( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE NamedEntities( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pNamedEntities) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetNamedEntity( 
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [retval][out] */ __RPC__deref_out_opt INamedEntity **ppNamedEntity) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE DefaultPhrase( 
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IEntityVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IEntity * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IEntity * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IEntity * This);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Name )( 
+            IEntity * This,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *Base )( 
+            IEntity * This,
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pBaseEntity);
+        
+        HRESULT ( STDMETHODCALLTYPE *Relationships )( 
+            IEntity * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pRelationships);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetRelationship )( 
+            IEntity * This,
+            /* [in] */ __RPC__in LPCWSTR pszRelationName,
+            /* [retval][out] */ __RPC__deref_out_opt IRelationship **pRelationship);
+        
+        HRESULT ( STDMETHODCALLTYPE *MetaData )( 
+            IEntity * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData);
+        
+        HRESULT ( STDMETHODCALLTYPE *NamedEntities )( 
+            IEntity * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pNamedEntities);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetNamedEntity )( 
+            IEntity * This,
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [retval][out] */ __RPC__deref_out_opt INamedEntity **ppNamedEntity);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *DefaultPhrase )( 
+            IEntity * This,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase);
+        
+        END_INTERFACE
+    } IEntityVtbl;
+
+    interface IEntity
+    {
+        CONST_VTBL struct IEntityVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IEntity_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IEntity_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IEntity_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IEntity_Name(This,ppszName)	\
+    ( (This)->lpVtbl -> Name(This,ppszName) ) 
+
+#define IEntity_Base(This,pBaseEntity)	\
+    ( (This)->lpVtbl -> Base(This,pBaseEntity) ) 
+
+#define IEntity_Relationships(This,riid,pRelationships)	\
+    ( (This)->lpVtbl -> Relationships(This,riid,pRelationships) ) 
+
+#define IEntity_GetRelationship(This,pszRelationName,pRelationship)	\
+    ( (This)->lpVtbl -> GetRelationship(This,pszRelationName,pRelationship) ) 
+
+#define IEntity_MetaData(This,riid,pMetaData)	\
+    ( (This)->lpVtbl -> MetaData(This,riid,pMetaData) ) 
+
+#define IEntity_NamedEntities(This,riid,pNamedEntities)	\
+    ( (This)->lpVtbl -> NamedEntities(This,riid,pNamedEntities) ) 
+
+#define IEntity_GetNamedEntity(This,pszValue,ppNamedEntity)	\
+    ( (This)->lpVtbl -> GetNamedEntity(This,pszValue,ppNamedEntity) ) 
+
+#define IEntity_DefaultPhrase(This,ppszPhrase)	\
+    ( (This)->lpVtbl -> DefaultPhrase(This,ppszPhrase) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IEntity_INTERFACE_DEFINED__ */
+
+
+#ifndef __IRelationship_INTERFACE_DEFINED__
+#define __IRelationship_INTERFACE_DEFINED__
+
+/* interface IRelationship */
+/* [unique][object][uuid][helpstring] */ 
+
+
+EXTERN_C const IID IID_IRelationship;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("2769280B-5108-498c-9C7F-A51239B63147")
+    IRelationship : public IUnknown
+    {
+    public:
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE Name( 
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszName) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE IsReal( 
+            /* [retval][out] */ __RPC__out BOOL *pIsReal) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Destination( 
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pDestinationEntity) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE MetaData( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE DefaultPhrase( 
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IRelationshipVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IRelationship * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IRelationship * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IRelationship * This);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Name )( 
+            IRelationship * This,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszName);
+        
+        HRESULT ( STDMETHODCALLTYPE *IsReal )( 
+            IRelationship * This,
+            /* [retval][out] */ __RPC__out BOOL *pIsReal);
+        
+        HRESULT ( STDMETHODCALLTYPE *Destination )( 
+            IRelationship * This,
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pDestinationEntity);
+        
+        HRESULT ( STDMETHODCALLTYPE *MetaData )( 
+            IRelationship * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *DefaultPhrase )( 
+            IRelationship * This,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase);
+        
+        END_INTERFACE
+    } IRelationshipVtbl;
+
+    interface IRelationship
+    {
+        CONST_VTBL struct IRelationshipVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IRelationship_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IRelationship_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IRelationship_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IRelationship_Name(This,ppszName)	\
+    ( (This)->lpVtbl -> Name(This,ppszName) ) 
+
+#define IRelationship_IsReal(This,pIsReal)	\
+    ( (This)->lpVtbl -> IsReal(This,pIsReal) ) 
+
+#define IRelationship_Destination(This,pDestinationEntity)	\
+    ( (This)->lpVtbl -> Destination(This,pDestinationEntity) ) 
+
+#define IRelationship_MetaData(This,riid,pMetaData)	\
+    ( (This)->lpVtbl -> MetaData(This,riid,pMetaData) ) 
+
+#define IRelationship_DefaultPhrase(This,ppszPhrase)	\
+    ( (This)->lpVtbl -> DefaultPhrase(This,ppszPhrase) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IRelationship_INTERFACE_DEFINED__ */
+
+
+#ifndef __INamedEntity_INTERFACE_DEFINED__
+#define __INamedEntity_INTERFACE_DEFINED__
+
+/* interface INamedEntity */
+/* [unique][uuid][object][helpstring] */ 
+
+
+EXTERN_C const IID IID_INamedEntity;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("ABDBD0B1-7D54-49fb-AB5C-BFF4130004CD")
+    INamedEntity : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE GetValue( 
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszValue) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE DefaultPhrase( 
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct INamedEntityVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            INamedEntity * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            INamedEntity * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            INamedEntity * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetValue )( 
+            INamedEntity * This,
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszValue);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *DefaultPhrase )( 
+            INamedEntity * This,
+            /* [retval][out] */ 
+            __deref_opt_out  LPWSTR *ppszPhrase);
+        
+        END_INTERFACE
+    } INamedEntityVtbl;
+
+    interface INamedEntity
+    {
+        CONST_VTBL struct INamedEntityVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define INamedEntity_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define INamedEntity_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define INamedEntity_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define INamedEntity_GetValue(This,ppszValue)	\
+    ( (This)->lpVtbl -> GetValue(This,ppszValue) ) 
+
+#define INamedEntity_DefaultPhrase(This,ppszPhrase)	\
+    ( (This)->lpVtbl -> DefaultPhrase(This,ppszPhrase) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __INamedEntity_INTERFACE_DEFINED__ */
+
+
+#ifndef __ISchemaProvider_INTERFACE_DEFINED__
+#define __ISchemaProvider_INTERFACE_DEFINED__
+
+/* interface ISchemaProvider */
+/* [unique][object][uuid][helpstring] */ 
+
+
+EXTERN_C const IID IID_ISchemaProvider;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("8CF89BCB-394C-49b2-AE28-A59DD4ED7F68")
+    ISchemaProvider : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Entities( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pEntities) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE RootEntity( 
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pRootEntity) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE GetEntity( 
+            /* [in] */ __RPC__in LPCWSTR pszEntityName,
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pEntity) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE MetaData( 
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE Localize( 
+            /* [in] */ LCID lcid,
+            /* [in] */ __RPC__in_opt ISchemaLocalizerSupport *pSchemaLocalizerSupport) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SaveBinary( 
+            /* [in] */ __RPC__in LPCWSTR pszSchemaBinaryPath) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE LookupAuthoredNamedEntity( 
+            /* [in] */ __RPC__in_opt IEntity *pEntity,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ __RPC__in_opt ITokenCollection *pTokenCollection,
+            /* [in] */ ULONG cTokensBegin,
+            /* [out] */ __RPC__out ULONG *pcTokensLength,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszValue) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ISchemaProviderVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ISchemaProvider * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ISchemaProvider * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Entities )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pEntities);
+        
+        HRESULT ( STDMETHODCALLTYPE *RootEntity )( 
+            ISchemaProvider * This,
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pRootEntity);
+        
+        HRESULT ( STDMETHODCALLTYPE *GetEntity )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in LPCWSTR pszEntityName,
+            /* [retval][out] */ __RPC__deref_out_opt IEntity **pEntity);
+        
+        HRESULT ( STDMETHODCALLTYPE *MetaData )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **pMetaData);
+        
+        HRESULT ( STDMETHODCALLTYPE *Localize )( 
+            ISchemaProvider * This,
+            /* [in] */ LCID lcid,
+            /* [in] */ __RPC__in_opt ISchemaLocalizerSupport *pSchemaLocalizerSupport);
+        
+        HRESULT ( STDMETHODCALLTYPE *SaveBinary )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in LPCWSTR pszSchemaBinaryPath);
+        
+        HRESULT ( STDMETHODCALLTYPE *LookupAuthoredNamedEntity )( 
+            ISchemaProvider * This,
+            /* [in] */ __RPC__in_opt IEntity *pEntity,
+            /* [in] */ __RPC__in LPCWSTR pszInputString,
+            /* [in] */ __RPC__in_opt ITokenCollection *pTokenCollection,
+            /* [in] */ ULONG cTokensBegin,
+            /* [out] */ __RPC__out ULONG *pcTokensLength,
+            /* [out] */ __RPC__deref_out_opt LPWSTR *ppszValue);
+        
+        END_INTERFACE
+    } ISchemaProviderVtbl;
+
+    interface ISchemaProvider
+    {
+        CONST_VTBL struct ISchemaProviderVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ISchemaProvider_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ISchemaProvider_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ISchemaProvider_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ISchemaProvider_Entities(This,riid,pEntities)	\
+    ( (This)->lpVtbl -> Entities(This,riid,pEntities) ) 
+
+#define ISchemaProvider_RootEntity(This,pRootEntity)	\
+    ( (This)->lpVtbl -> RootEntity(This,pRootEntity) ) 
+
+#define ISchemaProvider_GetEntity(This,pszEntityName,pEntity)	\
+    ( (This)->lpVtbl -> GetEntity(This,pszEntityName,pEntity) ) 
+
+#define ISchemaProvider_MetaData(This,riid,pMetaData)	\
+    ( (This)->lpVtbl -> MetaData(This,riid,pMetaData) ) 
+
+#define ISchemaProvider_Localize(This,lcid,pSchemaLocalizerSupport)	\
+    ( (This)->lpVtbl -> Localize(This,lcid,pSchemaLocalizerSupport) ) 
+
+#define ISchemaProvider_SaveBinary(This,pszSchemaBinaryPath)	\
+    ( (This)->lpVtbl -> SaveBinary(This,pszSchemaBinaryPath) ) 
+
+#define ISchemaProvider_LookupAuthoredNamedEntity(This,pEntity,pszInputString,pTokenCollection,cTokensBegin,pcTokensLength,ppszValue)	\
+    ( (This)->lpVtbl -> LookupAuthoredNamedEntity(This,pEntity,pszInputString,pTokenCollection,cTokensBegin,pcTokensLength,ppszValue) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ISchemaProvider_INTERFACE_DEFINED__ */
+
+
+#ifndef __ITokenCollection_INTERFACE_DEFINED__
+#define __ITokenCollection_INTERFACE_DEFINED__
+
+/* interface ITokenCollection */
+/* [unique][object][uuid][helpstring] */ 
+
+
+EXTERN_C const IID IID_ITokenCollection;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("22D8B4F2-F577-4adb-A335-C2AE88416FAB")
+    ITokenCollection : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE NumberOfTokens( 
+            __RPC__in ULONG *pCount) = 0;
+        
+        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetToken( 
+            /* [in] */ ULONG i,
+            /* [out] */ 
+            __out_opt  ULONG *pBegin,
+            /* [out] */ 
+            __out_opt  ULONG *pLength,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppsz) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ITokenCollectionVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ITokenCollection * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ITokenCollection * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ITokenCollection * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *NumberOfTokens )( 
+            ITokenCollection * This,
+            __RPC__in ULONG *pCount);
+        
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *GetToken )( 
+            ITokenCollection * This,
+            /* [in] */ ULONG i,
+            /* [out] */ 
+            __out_opt  ULONG *pBegin,
+            /* [out] */ 
+            __out_opt  ULONG *pLength,
+            /* [out] */ 
+            __deref_opt_out  LPWSTR *ppsz);
+        
+        END_INTERFACE
+    } ITokenCollectionVtbl;
+
+    interface ITokenCollection
+    {
+        CONST_VTBL struct ITokenCollectionVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ITokenCollection_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ITokenCollection_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ITokenCollection_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ITokenCollection_NumberOfTokens(This,pCount)	\
+    ( (This)->lpVtbl -> NumberOfTokens(This,pCount) ) 
+
+#define ITokenCollection_GetToken(This,i,pBegin,pLength,ppsz)	\
+    ( (This)->lpVtbl -> GetToken(This,i,pBegin,pLength,ppsz) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ITokenCollection_INTERFACE_DEFINED__ */
+
+
+/* interface __MIDL_itf_structuredquery_0000_0013 */
+/* [local] */ 
+
+typedef /* [public][public][v1_enum] */ 
+enum __MIDL___MIDL_itf_structuredquery_0000_0013_0001
+    {	NEC_LOW	= 0,
+	NEC_MEDIUM	= ( NEC_LOW + 1 ) ,
+	NEC_HIGH	= ( NEC_MEDIUM + 1 ) 
+    } 	NAMED_ENTITY_CERTAINTY;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0013_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_structuredquery_0000_0013_v0_0_s_ifspec;
+
+#ifndef __INamedEntityCollector_INTERFACE_DEFINED__
+#define __INamedEntityCollector_INTERFACE_DEFINED__
+
+/* interface INamedEntityCollector */
+/* [unique][object][uuid][helpstring] */ 
+
+
+EXTERN_C const IID IID_INamedEntityCollector;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("AF2440F6-8AFC-47d0-9A7F-396A0ACFB43D")
+    INamedEntityCollector : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Add( 
+            /* [in] */ ULONG beginSpan,
+            /* [in] */ ULONG endSpan,
+            /* [in] */ ULONG beginActual,
+            /* [in] */ ULONG endActual,
+            /* [in] */ __RPC__in_opt IEntity *pType,
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [in] */ NAMED_ENTITY_CERTAINTY certainty) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct INamedEntityCollectorVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            INamedEntityCollector * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            INamedEntityCollector * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            INamedEntityCollector * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Add )( 
+            INamedEntityCollector * This,
+            /* [in] */ ULONG beginSpan,
+            /* [in] */ ULONG endSpan,
+            /* [in] */ ULONG beginActual,
+            /* [in] */ ULONG endActual,
+            /* [in] */ __RPC__in_opt IEntity *pType,
+            /* [in] */ __RPC__in LPCWSTR pszValue,
+            /* [in] */ NAMED_ENTITY_CERTAINTY certainty);
+        
+        END_INTERFACE
+    } INamedEntityCollectorVtbl;
+
+    interface INamedEntityCollector
+    {
+        CONST_VTBL struct INamedEntityCollectorVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define INamedEntityCollector_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define INamedEntityCollector_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define INamedEntityCollector_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define INamedEntityCollector_Add(This,beginSpan,endSpan,beginActual,endActual,pType,pszValue,certainty)	\
+    ( (This)->lpVtbl -> Add(This,beginSpan,endSpan,beginActual,endActual,pType,pszValue,certainty) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __INamedEntityCollector_INTERFACE_DEFINED__ */
+
+
+#ifndef __ISchemaLocalizerSupport_INTERFACE_DEFINED__
+#define __ISchemaLocalizerSupport_INTERFACE_DEFINED__
+
+/* interface ISchemaLocalizerSupport */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_ISchemaLocalizerSupport;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("CA3FDCA2-BFBE-4eed-90D7-0CAEF0A1BDA1")
+    ISchemaLocalizerSupport : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE Localize( 
+            /* [in] */ __RPC__in LPCWSTR pszGlobalString,
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszLocalString) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct ISchemaLocalizerSupportVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            ISchemaLocalizerSupport * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            ISchemaLocalizerSupport * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            ISchemaLocalizerSupport * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *Localize )( 
+            ISchemaLocalizerSupport * This,
+            /* [in] */ __RPC__in LPCWSTR pszGlobalString,
+            /* [retval][out] */ __RPC__deref_out_opt LPWSTR *ppszLocalString);
+        
+        END_INTERFACE
+    } ISchemaLocalizerSupportVtbl;
+
+    interface ISchemaLocalizerSupport
+    {
+        CONST_VTBL struct ISchemaLocalizerSupportVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define ISchemaLocalizerSupport_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define ISchemaLocalizerSupport_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define ISchemaLocalizerSupport_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define ISchemaLocalizerSupport_Localize(This,pszGlobalString,ppszLocalString)	\
+    ( (This)->lpVtbl -> Localize(This,pszGlobalString,ppszLocalString) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __ISchemaLocalizerSupport_INTERFACE_DEFINED__ */
+
+
+#ifndef __IQueryParserManager_INTERFACE_DEFINED__
+#define __IQueryParserManager_INTERFACE_DEFINED__
+
+/* interface IQueryParserManager */
+/* [unique][object][uuid] */ 
+
+
+EXTERN_C const IID IID_IQueryParserManager;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("A879E3C4-AF77-44fb-8F37-EBD1487CF920")
+    IQueryParserManager : public IUnknown
+    {
+    public:
+        virtual HRESULT STDMETHODCALLTYPE CreateLoadedParser( 
+            /* [in] */ __RPC__in LPCWSTR pszCatalog,
+            /* [in] */ LANGID langidForKeywords,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppQueryParser) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE InitializeOptions( 
+            /* [in] */ BOOL fUnderstandNQS,
+            /* [in] */ BOOL fAutoWildCard,
+            /* [in] */ __RPC__in_opt IQueryParser *pQueryParser) = 0;
+        
+        virtual HRESULT STDMETHODCALLTYPE SetOption( 
+            /* [in] */ QUERY_PARSER_MANAGER_OPTION option,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue) = 0;
+        
+    };
+    
+#else 	/* C style interface */
+
+    typedef struct IQueryParserManagerVtbl
+    {
+        BEGIN_INTERFACE
+        
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IQueryParserManager * This,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][out] */ 
+            __RPC__deref_out  void **ppvObject);
+        
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IQueryParserManager * This);
+        
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IQueryParserManager * This);
+        
+        HRESULT ( STDMETHODCALLTYPE *CreateLoadedParser )( 
+            IQueryParserManager * This,
+            /* [in] */ __RPC__in LPCWSTR pszCatalog,
+            /* [in] */ LANGID langidForKeywords,
+            /* [in] */ __RPC__in REFIID riid,
+            /* [iid_is][retval][out] */ __RPC__deref_out_opt void **ppQueryParser);
+        
+        HRESULT ( STDMETHODCALLTYPE *InitializeOptions )( 
+            IQueryParserManager * This,
+            /* [in] */ BOOL fUnderstandNQS,
+            /* [in] */ BOOL fAutoWildCard,
+            /* [in] */ __RPC__in_opt IQueryParser *pQueryParser);
+        
+        HRESULT ( STDMETHODCALLTYPE *SetOption )( 
+            IQueryParserManager * This,
+            /* [in] */ QUERY_PARSER_MANAGER_OPTION option,
+            /* [in] */ __RPC__in const PROPVARIANT *pOptionValue);
+        
+        END_INTERFACE
+    } IQueryParserManagerVtbl;
+
+    interface IQueryParserManager
+    {
+        CONST_VTBL struct IQueryParserManagerVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IQueryParserManager_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IQueryParserManager_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IQueryParserManager_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IQueryParserManager_CreateLoadedParser(This,pszCatalog,langidForKeywords,riid,ppQueryParser)	\
+    ( (This)->lpVtbl -> CreateLoadedParser(This,pszCatalog,langidForKeywords,riid,ppQueryParser) ) 
+
+#define IQueryParserManager_InitializeOptions(This,fUnderstandNQS,fAutoWildCard,pQueryParser)	\
+    ( (This)->lpVtbl -> InitializeOptions(This,fUnderstandNQS,fAutoWildCard,pQueryParser) ) 
+
+#define IQueryParserManager_SetOption(This,option,pOptionValue)	\
+    ( (This)->lpVtbl -> SetOption(This,option,pOptionValue) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IQueryParserManager_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __StructuredQuery1_LIBRARY_DEFINED__
+#define __StructuredQuery1_LIBRARY_DEFINED__
+
+/* library StructuredQuery1 */
+/* [version][uuid] */ 
+
+
+EXTERN_C const IID LIBID_StructuredQuery1;
+
+EXTERN_C const CLSID CLSID_QueryParser;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("B72F8FD8-0FAB-4dd9-BDBF-245A6CE1485B")
+QueryParser;
+#endif
+
+EXTERN_C const CLSID CLSID_NegationCondition;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("8DE9C74C-605A-4acd-BEE3-2B222AA2D23D")
+NegationCondition;
+#endif
+
+EXTERN_C const CLSID CLSID_CompoundCondition;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("116F8D13-101E-4fa5-84D4-FF8279381935")
+CompoundCondition;
+#endif
+
+EXTERN_C const CLSID CLSID_LeafCondition;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("52F15C89-5A17-48e1-BBCD-46A3F89C7CC2")
+LeafCondition;
+#endif
+
+EXTERN_C const CLSID CLSID_ConditionFactory;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("E03E85B0-7BE3-4000-BA98-6C13DE9FA486")
+ConditionFactory;
+#endif
+
+EXTERN_C const CLSID CLSID_Interval;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("D957171F-4BF9-4de2-BCD5-C70A7CA55836")
+Interval;
+#endif
+
+EXTERN_C const CLSID CLSID_QueryParserManager;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("5088B39A-29B4-4d9d-8245-4EE289222F66")
+QueryParserManager;
+#endif
+#endif /* __StructuredQuery1_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  LPSAFEARRAY_UserSize(     unsigned long *, unsigned long            , LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserMarshal(  unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+unsigned char * __RPC_USER  LPSAFEARRAY_UserUnmarshal(unsigned long *, unsigned char *, LPSAFEARRAY * ); 
+void                      __RPC_USER  LPSAFEARRAY_UserFree(     unsigned long *, LPSAFEARRAY * ); 
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
diff --git a/Externals/portaudio/src/hostapi/wasapi/pa_win_wasapi.c b/Externals/portaudio/src/hostapi/wasapi/pa_win_wasapi.c
new file mode 100644
index 0000000000..0172e47144
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/pa_win_wasapi.c
@@ -0,0 +1,5156 @@
+/*
+ * Portable Audio I/O Library WASAPI implementation
+ * Copyright (c) 2006-2010 David Viens, Dmitry Kostjuchenko
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup hostapi_src
+ @brief WASAPI implementation of support for a host API.
+ @note pa_wasapi currently requires minimum VC 2005, and the latest Vista SDK
+*/
+
+#define WIN32_LEAN_AND_MEAN // exclude rare headers
+#include <windows.h>
+#include <stdio.h>
+#include <process.h>
+#include <assert.h>
+#include <mmsystem.h>
+#include <mmreg.h>  // must be before other Wasapi headers
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+	#include <Avrt.h>
+	#define COBJMACROS
+	#include <Audioclient.h>
+	#include <endpointvolume.h>
+	#define INITGUID // Avoid additional linkage of static libs, excessive code will be optimized out by the compiler
+	#include <mmdeviceapi.h>
+	#include <functiondiscoverykeys.h>
+    #include <devicetopology.h>	// Used to get IKsJackDescription interface
+	#undef INITGUID
+#endif
+#ifndef __MWERKS__
+#include <malloc.h>
+#include <memory.h>
+#endif /* __MWERKS__ */
+
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_win_wasapi.h"
+#include "pa_debugprint.h"
+#include "pa_ringbuffer.h"
+
+#include "pa_win_coinitialize.h"
+
+#ifndef NTDDI_VERSION
+ 
+    #undef WINVER
+    #undef _WIN32_WINNT
+    #define WINVER       0x0600 // VISTA
+	#define _WIN32_WINNT WINVER
+
+	#ifndef _AVRT_ //<< fix MinGW dummy compile by defining missing type: AVRT_PRIORITY
+        typedef enum _AVRT_PRIORITY
+        {
+            AVRT_PRIORITY_LOW = -1,
+            AVRT_PRIORITY_NORMAL,
+            AVRT_PRIORITY_HIGH,
+            AVRT_PRIORITY_CRITICAL
+        } AVRT_PRIORITY, *PAVRT_PRIORITY;
+	#endif
+
+	#include <basetyps.h> // << for IID/CLSID
+    #include <rpcsal.h>
+    #include <sal.h>
+
+	#ifndef __LPCGUID_DEFINED__
+		#define __LPCGUID_DEFINED__
+		typedef const GUID *LPCGUID;
+	#endif
+
+    #ifndef PROPERTYKEY_DEFINED
+        #define PROPERTYKEY_DEFINED
+        typedef struct _tagpropertykey
+        {
+            GUID fmtid;
+            DWORD pid;
+        } 	PROPERTYKEY;
+    #endif
+
+    #ifdef __midl_proxy
+        #define __MIDL_CONST
+    #else
+        #define __MIDL_CONST const
+    #endif
+
+    #ifdef WIN64
+        #include <wtypes.h>
+        typedef LONG NTSTATUS;
+        #define FASTCALL
+        #include <oleidl.h>
+        #include <objidl.h>
+     #else
+        typedef struct _BYTE_BLOB
+        {
+            unsigned long clSize;
+            unsigned char abData[ 1 ];
+        } 	BYTE_BLOB;
+        typedef /* [unique] */  __RPC_unique_pointer BYTE_BLOB *UP_BYTE_BLOB;
+        typedef LONGLONG REFERENCE_TIME;
+        #define NONAMELESSUNION
+    #endif
+    
+    #ifndef WAVE_FORMAT_IEEE_FLOAT
+        #define WAVE_FORMAT_IEEE_FLOAT 0x0003 // 32-bit floating-point
+    #endif    
+    
+    #ifndef __MINGW_EXTENSION
+        #if defined(__GNUC__) || defined(__GNUG__)
+            #define __MINGW_EXTENSION __extension__
+        #else
+            #define __MINGW_EXTENSION
+        #endif
+    #endif 
+
+    #include <sdkddkver.h>
+    #include <propkeydef.h>
+    #define COBJMACROS
+    #define INITGUID // Avoid additional linkage of static libs, excessive code will be optimized out by the compiler
+    #include <audioclient.h>
+    #include <mmdeviceapi.h>
+    #include <endpointvolume.h>
+    #include <functiondiscoverykeys.h>
+	#include <devicetopology.h>	// Used to get IKsJackDescription interface
+    #undef INITGUID
+
+#endif // NTDDI_VERSION
+
+#ifndef GUID_SECT
+    #define GUID_SECT
+#endif
+
+#define __DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#define __DEFINE_IID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const IID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#define __DEFINE_CLSID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const CLSID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#define PA_DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    __DEFINE_CLSID(pa_CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+#define PA_DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    __DEFINE_IID(pa_IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+
+// "1CB9AD4C-DBFA-4c32-B178-C2F568A703B2"
+PA_DEFINE_IID(IAudioClient,         1cb9ad4c, dbfa, 4c32, b1, 78, c2, f5, 68, a7, 03, b2);
+// "1BE09788-6894-4089-8586-9A2A6C265AC5"
+PA_DEFINE_IID(IMMEndpoint,          1be09788, 6894, 4089, 85, 86, 9a, 2a, 6c, 26, 5a, c5);
+// "A95664D2-9614-4F35-A746-DE8DB63617E6"
+PA_DEFINE_IID(IMMDeviceEnumerator,  a95664d2, 9614, 4f35, a7, 46, de, 8d, b6, 36, 17, e6);
+// "BCDE0395-E52F-467C-8E3D-C4579291692E"
+PA_DEFINE_CLSID(IMMDeviceEnumerator,bcde0395, e52f, 467c, 8e, 3d, c4, 57, 92, 91, 69, 2e);
+// "F294ACFC-3146-4483-A7BF-ADDCA7C260E2"
+PA_DEFINE_IID(IAudioRenderClient,   f294acfc, 3146, 4483, a7, bf, ad, dc, a7, c2, 60, e2);
+// "C8ADBD64-E71E-48a0-A4DE-185C395CD317"
+PA_DEFINE_IID(IAudioCaptureClient,  c8adbd64, e71e, 48a0, a4, de, 18, 5c, 39, 5c, d3, 17);
+// *2A07407E-6497-4A18-9787-32F79BD0D98F*  Or this??
+PA_DEFINE_IID(IDeviceTopology,      2A07407E, 6497, 4A18, 97, 87, 32, f7, 9b, d0, d9, 8f);
+// *AE2DE0E4-5BCA-4F2D-AA46-5D13F8FDB3A9*
+PA_DEFINE_IID(IPart,                AE2DE0E4, 5BCA, 4F2D, aa, 46, 5d, 13, f8, fd, b3, a9);
+// *4509F757-2D46-4637-8E62-CE7DB944F57B*
+PA_DEFINE_IID(IKsJackDescription,   4509F757, 2D46, 4637, 8e, 62, ce, 7d, b9, 44, f5, 7b);
+// Media formats:
+__DEFINE_GUID(pa_KSDATAFORMAT_SUBTYPE_PCM,        0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
+__DEFINE_GUID(pa_KSDATAFORMAT_SUBTYPE_ADPCM,      0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
+__DEFINE_GUID(pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
+
+/* use CreateThread for CYGWIN/Windows Mobile, _beginthreadex for all others */
+#if !defined(__CYGWIN__) && !defined(_WIN32_WCE)
+	#define CREATE_THREAD(PROC) (HANDLE)_beginthreadex( NULL, 0, (PROC), stream, 0, &stream->dwThreadId )
+	#define PA_THREAD_FUNC static unsigned WINAPI
+	#define PA_THREAD_ID unsigned
+#else
+	#define CREATE_THREAD(PROC) CreateThread( NULL, 0, (PROC), stream, 0, &stream->dwThreadId )
+	#define PA_THREAD_FUNC static DWORD WINAPI
+	#define PA_THREAD_ID DWORD
+#endif
+
+// Thread function forward decl.
+PA_THREAD_FUNC ProcThreadEvent(void *param);
+PA_THREAD_FUNC ProcThreadPoll(void *param);
+
+// Availabe from Windows 7
+#ifndef AUDCLNT_E_BUFFER_ERROR
+	#define AUDCLNT_E_BUFFER_ERROR AUDCLNT_ERR(0x018)
+#endif
+#ifndef AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED
+	#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x019)
+#endif
+#ifndef AUDCLNT_E_INVALID_DEVICE_PERIOD
+	#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x020)
+#endif
+
+#define MAX_STR_LEN 512
+
+enum { S_INPUT = 0, S_OUTPUT = 1, S_COUNT = 2, S_FULLDUPLEX = 0 };
+
+// Number of packets which compose single contignous buffer. With trial and error it was calculated
+// that WASAPI Input sub-system uses 6 packets per whole buffer. Please provide more information
+// or corrections if available.
+enum { WASAPI_PACKETS_PER_INPUT_BUFFER = 6 };
+
+#define STATIC_ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
+
+#define PRINT(x) PA_DEBUG(x);
+
+#define PA_SKELETON_SET_LAST_HOST_ERROR( errorCode, errorText ) \
+    PaUtil_SetLastHostErrorInfo( paWASAPI, errorCode, errorText )
+
+#define PA_WASAPI__IS_FULLDUPLEX(STREAM) ((STREAM)->in.clientProc && (STREAM)->out.clientProc)
+
+#ifndef IF_FAILED_JUMP
+#define IF_FAILED_JUMP(hr, label) if(FAILED(hr)) goto label;
+#endif
+
+#ifndef IF_FAILED_INTERNAL_ERROR_JUMP
+#define IF_FAILED_INTERNAL_ERROR_JUMP(hr, error, label) if(FAILED(hr)) { error = paInternalError; goto label; }
+#endif
+
+#define SAFE_CLOSE(h) if ((h) != NULL) { CloseHandle((h)); (h) = NULL; }
+#define SAFE_RELEASE(punk) if ((punk) != NULL) { (punk)->lpVtbl->Release((punk)); (punk) = NULL; }
+
+// Mixer function
+typedef void (*MixMonoToStereoF) (void *__to, void *__from, UINT32 count);
+
+// AVRT is the new "multimedia schedulling stuff"
+typedef BOOL   (WINAPI *FAvRtCreateThreadOrderingGroup)  (PHANDLE,PLARGE_INTEGER,GUID*,PLARGE_INTEGER);
+typedef BOOL   (WINAPI *FAvRtDeleteThreadOrderingGroup)  (HANDLE);
+typedef BOOL   (WINAPI *FAvRtWaitOnThreadOrderingGroup)  (HANDLE);
+typedef HANDLE (WINAPI *FAvSetMmThreadCharacteristics)   (LPCTSTR,LPDWORD);
+typedef BOOL   (WINAPI *FAvRevertMmThreadCharacteristics)(HANDLE);
+typedef BOOL   (WINAPI *FAvSetMmThreadPriority)          (HANDLE,AVRT_PRIORITY);
+
+static HMODULE hDInputDLL = 0;
+FAvRtCreateThreadOrderingGroup   pAvRtCreateThreadOrderingGroup = NULL;
+FAvRtDeleteThreadOrderingGroup   pAvRtDeleteThreadOrderingGroup = NULL;
+FAvRtWaitOnThreadOrderingGroup   pAvRtWaitOnThreadOrderingGroup = NULL;
+FAvSetMmThreadCharacteristics    pAvSetMmThreadCharacteristics = NULL;
+FAvRevertMmThreadCharacteristics pAvRevertMmThreadCharacteristics = NULL;
+FAvSetMmThreadPriority           pAvSetMmThreadPriority = NULL;
+
+#define _GetProc(fun, type, name)  {                                                        \
+                                        fun = (type) GetProcAddress(hDInputDLL,name);       \
+                                        if (fun == NULL) {                                  \
+                                            PRINT(("GetProcAddr failed for %s" ,name));     \
+                                            return FALSE;                                   \
+                                        }                                                   \
+                                    }                                                       \
+
+// ------------------------------------------------------------------------------------------
+/* prototypes for functions declared in this file */
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+// dummy entry point for other compilers and sdks
+// currently built using RC1 SDK (5600)
+//#if _MSC_VER < 1400
+//PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+//{
+    //return paNoError;
+//}
+//#else
+
+// ------------------------------------------------------------------------------------------
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+// ------------------------------------------------------------------------------------------
+/*
+ These are fields that can be gathered from IDevice and IAudioDevice PRIOR to Initialize, and
+ done in first pass i assume that neither of these will cause the Driver to "load", but again,
+ who knows how they implement their stuff
+ */
+typedef struct PaWasapiDeviceInfo
+{
+    // Device
+    IMMDevice *device;
+
+	// from GetId
+    WCHAR szDeviceID[MAX_STR_LEN];
+
+	// from GetState
+    DWORD state;
+
+    // Fields filled from IMMEndpoint'sGetDataFlow
+    EDataFlow flow;
+
+    // Fields filled from IAudioDevice (_prior_ to Initialize)
+    // from GetDevicePeriod(
+    REFERENCE_TIME DefaultDevicePeriod;
+    REFERENCE_TIME MinimumDevicePeriod;
+
+    // from GetMixFormat
+    // WAVEFORMATEX *MixFormat;//needs to be CoTaskMemFree'd after use!
+
+	// Default format (setup through Control Panel by user)
+	WAVEFORMATEXTENSIBLE DefaultFormat;
+
+	// Formfactor
+	EndpointFormFactor formFactor;
+}
+PaWasapiDeviceInfo;
+
+// ------------------------------------------------------------------------------------------
+/* PaWasapiHostApiRepresentation - host api datastructure specific to this implementation */
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface       callbackStreamInterface;
+    PaUtilStreamInterface       blockingStreamInterface;
+
+    PaUtilAllocationGroup      *allocations;
+
+    /* implementation specific data goes here */
+
+    PaWinUtilComInitializationResult comInitializationResult;
+
+    //in case we later need the synch
+    IMMDeviceEnumerator *enumerator;
+
+    //this is the REAL number of devices, whether they are usefull to PA or not!
+    UINT32 deviceCount;
+
+    WCHAR defaultRenderer [MAX_STR_LEN];
+    WCHAR defaultCapturer [MAX_STR_LEN];
+
+    PaWasapiDeviceInfo *devInfo;
+
+	// Is true when WOW64 Vista/7 Workaround is needed
+	BOOL useWOW64Workaround;
+}
+PaWasapiHostApiRepresentation;
+
+// ------------------------------------------------------------------------------------------
+/* PaWasapiAudioClientParams - audio client parameters */
+typedef struct PaWasapiAudioClientParams
+{
+	PaWasapiDeviceInfo *device_info;
+	PaStreamParameters  stream_params;
+	PaWasapiStreamInfo  wasapi_params;
+	UINT32              frames_per_buffer;
+	double              sample_rate;
+	BOOL                blocking;
+	BOOL                full_duplex;
+	BOOL                wow64_workaround;
+}
+PaWasapiAudioClientParams;
+
+// ------------------------------------------------------------------------------------------
+/* PaWasapiStream - a stream data structure specifically for this implementation */
+typedef struct PaWasapiSubStream
+{
+    IAudioClient        *clientParent;
+	IStream				*clientStream;
+	IAudioClient		*clientProc;
+
+    WAVEFORMATEXTENSIBLE wavex;
+    UINT32               bufferSize;
+    REFERENCE_TIME       deviceLatency;
+    REFERENCE_TIME       period;
+	double				 latencySeconds;
+    UINT32				 framesPerHostCallback;
+	AUDCLNT_SHAREMODE    shareMode;
+	UINT32               streamFlags; // AUDCLNT_STREAMFLAGS_EVENTCALLBACK, ...
+	UINT32               flags;
+	PaWasapiAudioClientParams params; //!< parameters
+
+	// Buffers
+	UINT32               buffers;			//!< number of buffers used (from host side)
+	UINT32               framesPerBuffer;	//!< number of frames per 1 buffer
+	BOOL                 userBufferAndHostMatch;
+
+	// Used for Mono >> Stereo workaround, if driver does not support it
+	// (in Exclusive mode WASAPI usually refuses to operate with Mono (1-ch)
+	void                *monoBuffer;	 //!< pointer to buffer
+	UINT32               monoBufferSize; //!< buffer size in bytes
+	MixMonoToStereoF     monoMixer;		 //!< pointer to mixer function
+
+	PaUtilRingBuffer    *tailBuffer;       //!< buffer with trailing sample for blocking mode operations (only for Input)
+	void                *tailBufferMemory; //!< tail buffer memory region
+}
+PaWasapiSubStream;
+
+// ------------------------------------------------------------------------------------------
+/* PaWasapiHostProcessor - redirects processing data */
+typedef struct PaWasapiHostProcessor
+{
+    PaWasapiHostProcessorCallback processor;
+    void *userData;
+}
+PaWasapiHostProcessor;
+
+// ------------------------------------------------------------------------------------------
+typedef struct PaWasapiStream
+{
+	/* IMPLEMENT ME: rename this */
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer      cpuLoadMeasurer;
+    PaUtilBufferProcessor      bufferProcessor;
+
+    // input
+	PaWasapiSubStream          in;
+    IAudioCaptureClient       *captureClientParent;
+	IStream                   *captureClientStream;
+	IAudioCaptureClient       *captureClient;
+    IAudioEndpointVolume      *inVol;
+
+	// output
+	PaWasapiSubStream          out;
+    IAudioRenderClient        *renderClientParent;
+	IStream                   *renderClientStream;
+	IAudioRenderClient        *renderClient;
+	IAudioEndpointVolume      *outVol;
+
+	// event handles for event-driven processing mode
+	HANDLE event[S_COUNT];
+
+	// buffer mode
+	PaUtilHostBufferSizeMode bufferMode;
+
+	// must be volatile to avoid race condition on user query while
+	// thread is being started
+    volatile BOOL running;
+
+    PA_THREAD_ID dwThreadId;
+    HANDLE hThread;
+	HANDLE hCloseRequest;
+	HANDLE hThreadStart;        //!< signalled by thread on start
+	HANDLE hThreadExit;         //!< signalled by thread on exit
+	HANDLE hBlockingOpStreamRD;
+	HANDLE hBlockingOpStreamWR;
+
+    // Host callback Output overrider
+	PaWasapiHostProcessor hostProcessOverrideOutput;
+
+    // Host callback Input overrider
+	PaWasapiHostProcessor hostProcessOverrideInput;
+
+	// Defines blocking/callback interface used
+	BOOL bBlocking;
+
+	// Av Task (MM thread management)
+	HANDLE hAvTask;
+
+	// Thread priority level
+	PaWasapiThreadPriority nThreadPriority;
+}
+PaWasapiStream;
+
+// Local stream methods
+void _StreamOnStop(PaWasapiStream *stream);
+void _StreamFinish(PaWasapiStream *stream);
+void _StreamCleanup(PaWasapiStream *stream);
+HRESULT _PollGetOutputFramesAvailable(PaWasapiStream *stream, UINT32 *available);
+HRESULT _PollGetInputFramesAvailable(PaWasapiStream *stream, UINT32 *available);
+void *PaWasapi_ReallocateMemory(void *ptr, size_t size);
+void PaWasapi_FreeMemory(void *ptr);
+
+// Local statics
+
+// ------------------------------------------------------------------------------------------
+#define LogHostError(HRES) __LogHostError(HRES, __FUNCTION__, __FILE__, __LINE__)
+static HRESULT __LogHostError(HRESULT res, const char *func, const char *file, int line)
+{
+    const char *text = NULL;
+    switch (res)
+	{
+	case S_OK: return res;
+	case E_POINTER                              :text ="E_POINTER"; break;
+	case E_INVALIDARG                           :text ="E_INVALIDARG"; break;
+
+	case AUDCLNT_E_NOT_INITIALIZED              :text ="AUDCLNT_E_NOT_INITIALIZED"; break;
+	case AUDCLNT_E_ALREADY_INITIALIZED          :text ="AUDCLNT_E_ALREADY_INITIALIZED"; break;
+	case AUDCLNT_E_WRONG_ENDPOINT_TYPE          :text ="AUDCLNT_E_WRONG_ENDPOINT_TYPE"; break;
+	case AUDCLNT_E_DEVICE_INVALIDATED           :text ="AUDCLNT_E_DEVICE_INVALIDATED"; break;
+	case AUDCLNT_E_NOT_STOPPED                  :text ="AUDCLNT_E_NOT_STOPPED"; break;
+	case AUDCLNT_E_BUFFER_TOO_LARGE             :text ="AUDCLNT_E_BUFFER_TOO_LARGE"; break;
+	case AUDCLNT_E_OUT_OF_ORDER                 :text ="AUDCLNT_E_OUT_OF_ORDER"; break;
+	case AUDCLNT_E_UNSUPPORTED_FORMAT           :text ="AUDCLNT_E_UNSUPPORTED_FORMAT"; break;
+	case AUDCLNT_E_INVALID_SIZE                 :text ="AUDCLNT_E_INVALID_SIZE"; break;
+	case AUDCLNT_E_DEVICE_IN_USE                :text ="AUDCLNT_E_DEVICE_IN_USE"; break;
+	case AUDCLNT_E_BUFFER_OPERATION_PENDING     :text ="AUDCLNT_E_BUFFER_OPERATION_PENDING"; break;
+	case AUDCLNT_E_THREAD_NOT_REGISTERED        :text ="AUDCLNT_E_THREAD_NOT_REGISTERED"; break;
+	case AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED   :text ="AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED"; break;
+	case AUDCLNT_E_ENDPOINT_CREATE_FAILED       :text ="AUDCLNT_E_ENDPOINT_CREATE_FAILED"; break;
+	case AUDCLNT_E_SERVICE_NOT_RUNNING          :text ="AUDCLNT_E_SERVICE_NOT_RUNNING"; break;
+	case AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED     :text ="AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED"; break;
+	case AUDCLNT_E_EXCLUSIVE_MODE_ONLY          :text ="AUDCLNT_E_EXCLUSIVE_MODE_ONLY"; break;
+	case AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL :text ="AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL"; break;
+	case AUDCLNT_E_EVENTHANDLE_NOT_SET          :text ="AUDCLNT_E_EVENTHANDLE_NOT_SET"; break;
+	case AUDCLNT_E_INCORRECT_BUFFER_SIZE        :text ="AUDCLNT_E_INCORRECT_BUFFER_SIZE"; break;
+	case AUDCLNT_E_BUFFER_SIZE_ERROR            :text ="AUDCLNT_E_BUFFER_SIZE_ERROR"; break;
+	case AUDCLNT_E_CPUUSAGE_EXCEEDED            :text ="AUDCLNT_E_CPUUSAGE_EXCEEDED"; break;
+	case AUDCLNT_E_BUFFER_ERROR					:text ="AUDCLNT_E_BUFFER_ERROR"; break;
+	case AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED		:text ="AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED"; break;
+	case AUDCLNT_E_INVALID_DEVICE_PERIOD		:text ="AUDCLNT_E_INVALID_DEVICE_PERIOD"; break;
+
+	case AUDCLNT_S_BUFFER_EMPTY                 :text ="AUDCLNT_S_BUFFER_EMPTY"; break;
+	case AUDCLNT_S_THREAD_ALREADY_REGISTERED    :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break;
+	case AUDCLNT_S_POSITION_STALLED				:text ="AUDCLNT_S_POSITION_STALLED"; break;
+
+	// other windows common errors:
+	case CO_E_NOTINITIALIZED                    :text ="CO_E_NOTINITIALIZED: you must call CoInitialize() before Pa_OpenStream()"; break;
+
+	default:
+		text = "UNKNOWN ERROR";
+    }
+	PRINT(("WASAPI ERROR HRESULT: 0x%X : %s\n [FUNCTION: %s FILE: %s {LINE: %d}]\n", res, text, func, file, line));
+	PA_SKELETON_SET_LAST_HOST_ERROR(res, text);
+	return res;
+}
+
+// ------------------------------------------------------------------------------------------
+#define LogPaError(PAERR) __LogPaError(PAERR, __FUNCTION__, __FILE__, __LINE__)
+static PaError __LogPaError(PaError err, const char *func, const char *file, int line)
+{
+	if (err == paNoError)
+		return err;
+	PRINT(("WASAPI ERROR PAERROR: %i : %s\n [FUNCTION: %s FILE: %s {LINE: %d}]\n", err, Pa_GetErrorText(err), func, file, line));
+	return err;
+}
+
+// ------------------------------------------------------------------------------------------
+/*! \class ThreadSleepScheduler
+           Allows to emulate thread sleep of less than 1 millisecond under Windows. Scheduler
+		   calculates number of times the thread must run untill next sleep of 1 millisecond.
+		   It does not make thread sleeping for real number of microseconds but rather controls
+		   how many of imaginary microseconds the thread task can allow thread to sleep.
+*/
+typedef struct ThreadIdleScheduler
+{
+	UINT32 m_idle_microseconds; //!< number of microseconds to sleep
+	UINT32 m_next_sleep;        //!< next sleep round
+	UINT32 m_i;					//!< current round iterator position
+	UINT32 m_resolution;		//!< resolution in number of milliseconds
+}
+ThreadIdleScheduler;
+//! Setup scheduler.
+static void ThreadIdleScheduler_Setup(ThreadIdleScheduler *sched, UINT32 resolution, UINT32 microseconds)
+{
+	assert(microseconds != 0);
+	assert(resolution != 0);
+	assert((resolution * 1000) >= microseconds);
+
+	memset(sched, 0, sizeof(*sched));
+
+	sched->m_idle_microseconds = microseconds;
+	sched->m_resolution        = resolution;
+	sched->m_next_sleep        = (resolution * 1000) / microseconds;
+}
+//! Iterate and check if can sleep.
+static UINT32 ThreadIdleScheduler_NextSleep(ThreadIdleScheduler *sched)
+{
+	// advance and check if thread can sleep
+	if (++ sched->m_i == sched->m_next_sleep)
+	{
+		sched->m_i = 0;
+		return sched->m_resolution;
+	}
+	return 0;
+}
+
+// ------------------------------------------------------------------------------------------
+/*static double nano100ToMillis(REFERENCE_TIME ref)
+{
+    //  1 nano = 0.000000001 seconds
+    //100 nano = 0.0000001   seconds
+    //100 nano = 0.0001   milliseconds
+    return ((double)ref)*0.0001;
+}*/
+
+// ------------------------------------------------------------------------------------------
+static double nano100ToSeconds(REFERENCE_TIME ref)
+{
+    //  1 nano = 0.000000001 seconds
+    //100 nano = 0.0000001   seconds
+    //100 nano = 0.0001   milliseconds
+    return ((double)ref)*0.0000001;
+}
+
+// ------------------------------------------------------------------------------------------
+/*static REFERENCE_TIME MillisTonano100(double ref)
+{
+    //  1 nano = 0.000000001 seconds
+    //100 nano = 0.0000001   seconds
+    //100 nano = 0.0001   milliseconds
+    return (REFERENCE_TIME)(ref/0.0001);
+}*/
+
+// ------------------------------------------------------------------------------------------
+static REFERENCE_TIME SecondsTonano100(double ref)
+{
+    //  1 nano = 0.000000001 seconds
+    //100 nano = 0.0000001   seconds
+    //100 nano = 0.0001   milliseconds
+    return (REFERENCE_TIME)(ref/0.0000001);
+}
+
+// ------------------------------------------------------------------------------------------
+// Makes Hns period from frames and sample rate
+static REFERENCE_TIME MakeHnsPeriod(UINT32 nFrames, DWORD nSamplesPerSec)
+{
+	return (REFERENCE_TIME)((10000.0 * 1000 / nSamplesPerSec * nFrames) + 0.5);
+}
+
+// ------------------------------------------------------------------------------------------
+// Converts PaSampleFormat to bits per sample value
+static WORD PaSampleFormatToBitsPerSample(PaSampleFormat format_id)
+{
+	switch (format_id & ~paNonInterleaved)
+	{
+		case paFloat32:
+		case paInt32: return 32;
+		case paInt24: return 24;
+		case paInt16: return 16;
+		case paInt8:
+		case paUInt8: return 8;
+	}
+	return 0;
+}
+
+// ------------------------------------------------------------------------------------------
+// Converts PaSampleFormat to bits per sample value
+/*static WORD PaSampleFormatToBytesPerSample(PaSampleFormat format_id)
+{
+	return PaSampleFormatToBitsPerSample(format_id) >> 3; // 'bits/8'
+}*/
+
+// ------------------------------------------------------------------------------------------
+// Converts Hns period into number of frames
+static UINT32 MakeFramesFromHns(REFERENCE_TIME hnsPeriod, UINT32 nSamplesPerSec)
+{
+    UINT32 nFrames = (UINT32)(	// frames =
+        1.0 * hnsPeriod *		// hns *
+        nSamplesPerSec /		// (frames / s) /
+        1000 /					// (ms / s) /
+        10000					// (hns / s) /
+        + 0.5					// rounding
+    );
+	return nFrames;
+}
+
+// Aligning function type
+typedef UINT32 (*ALIGN_FUNC) (UINT32 v, UINT32 align);
+
+// ------------------------------------------------------------------------------------------
+// Aligns 'v' backwards
+static UINT32 ALIGN_BWD(UINT32 v, UINT32 align)
+{
+	return ((v - (align ? v % align : 0)));
+}
+
+// ------------------------------------------------------------------------------------------
+// Aligns 'v' forward
+static UINT32 ALIGN_FWD(UINT32 v, UINT32 align)
+{
+	UINT32 remainder = (align ? (v % align) : 0);
+	if (remainder == 0)
+		return v;
+	return v + (align - remainder);
+}
+
+// ------------------------------------------------------------------------------------------
+// Get next value power of 2
+UINT32 ALIGN_NEXT_POW2(UINT32 v)
+{
+	UINT32 v2 = 1;
+	while (v > (v2 <<= 1)) { }
+	v = v2;
+	return v;
+}
+
+// ------------------------------------------------------------------------------------------
+// Aligns WASAPI buffer to 128 byte packet boundary. HD Audio will fail to play if buffer
+// is misaligned. This problem was solved in Windows 7 were AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED
+// is thrown although we must align for Vista anyway.
+static UINT32 AlignFramesPerBuffer(UINT32 nFrames, UINT32 nSamplesPerSec, UINT32 nBlockAlign,
+								   ALIGN_FUNC pAlignFunc)
+{
+#define HDA_PACKET_SIZE (128)
+
+	long frame_bytes = nFrames * nBlockAlign;
+	long packets;
+
+	// align to packet size
+	frame_bytes  = pAlignFunc(frame_bytes, HDA_PACKET_SIZE); // use ALIGN_FWD if bigger but safer period is more desired
+
+	// atlest 1 frame must be available
+	if (frame_bytes < HDA_PACKET_SIZE)
+		frame_bytes = HDA_PACKET_SIZE;
+
+	nFrames      = frame_bytes / nBlockAlign;
+	packets      = frame_bytes / HDA_PACKET_SIZE;
+
+	frame_bytes = packets * HDA_PACKET_SIZE;
+	nFrames     = frame_bytes / nBlockAlign;
+
+	return nFrames;
+
+#undef HDA_PACKET_SIZE
+}
+
+// ------------------------------------------------------------------------------------------
+static UINT32 GetFramesSleepTime(UINT32 nFrames, UINT32 nSamplesPerSec)
+{
+	REFERENCE_TIME nDuration;
+	if (nSamplesPerSec == 0)
+		return 0;
+#define REFTIMES_PER_SEC  10000000
+#define REFTIMES_PER_MILLISEC  10000
+	// Calculate the actual duration of the allocated buffer.
+	nDuration = (REFERENCE_TIME)((double)REFTIMES_PER_SEC * nFrames / nSamplesPerSec);
+	return (UINT32)(nDuration/REFTIMES_PER_MILLISEC/2);
+}
+
+// ------------------------------------------------------------------------------------------
+static UINT32 GetFramesSleepTimeMicroseconds(UINT32 nFrames, UINT32 nSamplesPerSec)
+{
+	REFERENCE_TIME nDuration;
+	if (nSamplesPerSec == 0)
+		return 0;
+#define REFTIMES_PER_SEC  10000000
+#define REFTIMES_PER_MILLISEC  10000
+	// Calculate the actual duration of the allocated buffer.
+	nDuration = (REFERENCE_TIME)((double)REFTIMES_PER_SEC * nFrames / nSamplesPerSec);
+	return (UINT32)(nDuration/10/2);
+}
+
+// ------------------------------------------------------------------------------------------
+static BOOL SetupAVRT()
+{
+    hDInputDLL = LoadLibraryA("avrt.dll");
+    if (hDInputDLL == NULL)
+        return FALSE;
+
+    _GetProc(pAvRtCreateThreadOrderingGroup,  FAvRtCreateThreadOrderingGroup,  "AvRtCreateThreadOrderingGroup");
+    _GetProc(pAvRtDeleteThreadOrderingGroup,  FAvRtDeleteThreadOrderingGroup,  "AvRtDeleteThreadOrderingGroup");
+    _GetProc(pAvRtWaitOnThreadOrderingGroup,  FAvRtWaitOnThreadOrderingGroup,  "AvRtWaitOnThreadOrderingGroup");
+    _GetProc(pAvSetMmThreadCharacteristics,   FAvSetMmThreadCharacteristics,   "AvSetMmThreadCharacteristicsA");
+	_GetProc(pAvRevertMmThreadCharacteristics,FAvRevertMmThreadCharacteristics,"AvRevertMmThreadCharacteristics");
+    _GetProc(pAvSetMmThreadPriority,          FAvSetMmThreadPriority,          "AvSetMmThreadPriority");
+
+	return pAvRtCreateThreadOrderingGroup &&
+		pAvRtDeleteThreadOrderingGroup &&
+		pAvRtWaitOnThreadOrderingGroup &&
+		pAvSetMmThreadCharacteristics &&
+		pAvRevertMmThreadCharacteristics &&
+		pAvSetMmThreadPriority;
+}
+
+// ------------------------------------------------------------------------------------------
+static void CloseAVRT()
+{
+	if (hDInputDLL != NULL)
+		FreeLibrary(hDInputDLL);
+	hDInputDLL = NULL;
+}
+
+// ------------------------------------------------------------------------------------------
+static BOOL IsWow64()
+{
+	// http://msdn.microsoft.com/en-us/library/ms684139(VS.85).aspx
+
+	typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
+	LPFN_ISWOW64PROCESS fnIsWow64Process;
+
+    BOOL bIsWow64 = FALSE;
+
+    // IsWow64Process is not available on all supported versions of Windows.
+    // Use GetModuleHandle to get a handle to the DLL that contains the function
+    // and GetProcAddress to get a pointer to the function if available.
+
+    fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress(
+        GetModuleHandle(TEXT("kernel32")), TEXT("IsWow64Process"));
+
+    if (fnIsWow64Process == NULL)
+		return FALSE;
+
+    if (!fnIsWow64Process(GetCurrentProcess(), &bIsWow64))
+		return FALSE;
+
+    return bIsWow64;
+}
+
+// ------------------------------------------------------------------------------------------
+typedef enum EWindowsVersion
+{
+	WINDOWS_UNKNOWN			 = 0,
+	WINDOWS_VISTA_SERVER2008 = (1 << 0),
+	WINDOWS_7_SERVER2008R2	 = (1 << 1),
+	WINDOWS_FUTURE           = (1 << 2)
+}
+EWindowsVersion;
+// Defines Windows 7/Windows Server 2008 R2 and up (future versions)
+#define WINDOWS_7_SERVER2008R2_AND_UP (WINDOWS_7_SERVER2008R2|WINDOWS_FUTURE)
+// The function is limited to Vista/7 mostly as we need just to find out Vista/WOW64 combination
+// in order to use WASAPI WOW64 workarounds.
+static UINT32 GetWindowsVersion()
+{
+	static UINT32 version = WINDOWS_UNKNOWN;
+
+	if (version == WINDOWS_UNKNOWN)
+	{
+		DWORD dwVersion = 0;
+		DWORD dwMajorVersion = 0;
+		DWORD dwMinorVersion = 0;
+		DWORD dwBuild = 0;
+
+		typedef DWORD (WINAPI *LPFN_GETVERSION)(VOID);
+		LPFN_GETVERSION fnGetVersion;
+
+		fnGetVersion = (LPFN_GETVERSION) GetProcAddress(GetModuleHandle(TEXT("kernel32")), TEXT("GetVersion"));
+		if (fnGetVersion == NULL)
+			return WINDOWS_UNKNOWN;
+
+		dwVersion = fnGetVersion();
+
+		// Get the Windows version
+		dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
+		dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
+
+		// Get the build number
+		if (dwVersion < 0x80000000)
+			dwBuild = (DWORD)(HIWORD(dwVersion));
+
+		switch (dwMajorVersion)
+		{
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5:
+			break; // skip lower
+		case 6:
+			switch (dwMinorVersion)
+			{
+			case 0:
+				version |= WINDOWS_VISTA_SERVER2008;
+				break;
+			case 1:
+				version |= WINDOWS_7_SERVER2008R2;
+				break;
+			default:
+				version |= WINDOWS_FUTURE;
+			}
+			break;
+		default:
+			version |= WINDOWS_FUTURE;
+		}
+	}
+
+	return version;
+}
+
+// ------------------------------------------------------------------------------------------
+static BOOL UseWOW64Workaround()
+{
+	// note: WOW64 bug is common to Windows Vista x64, thus we fall back to safe Poll-driven
+	//       method. Windows 7 x64 seems has WOW64 bug fixed.
+
+	return (IsWow64() && (GetWindowsVersion() & WINDOWS_VISTA_SERVER2008));
+}
+
+// ------------------------------------------------------------------------------------------
+typedef enum EMixerDir { MIX_DIR__1TO2, MIX_DIR__2TO1, MIX_DIR__2TO1_L } EMixerDir;
+
+// ------------------------------------------------------------------------------------------
+#define _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(TYPE)\
+	TYPE * __restrict to   = __to;\
+	TYPE * __restrict from = __from;\
+	TYPE * __restrict end  = from + count;\
+	while (from != end)\
+	{\
+		*to ++ = *from;\
+		*to ++ = *from;\
+		++ from;\
+	}
+
+// ------------------------------------------------------------------------------------------
+#define _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_FLT32(TYPE)\
+	TYPE * __restrict to   = (TYPE *)__to;\
+	TYPE * __restrict from = (TYPE *)__from;\
+	TYPE * __restrict end  = to + count;\
+	while (to != end)\
+	{\
+		*to ++ = (TYPE)((float)(from[0] + from[1]) * 0.5f);\
+		from += 2;\
+	}
+
+// ------------------------------------------------------------------------------------------
+#define _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT32(TYPE)\
+	TYPE * __restrict to   = (TYPE *)__to;\
+	TYPE * __restrict from = (TYPE *)__from;\
+	TYPE * __restrict end  = to + count;\
+	while (to != end)\
+	{\
+		*to ++ = (TYPE)(((INT32)from[0] + (INT32)from[1]) >> 1);\
+		from += 2;\
+	}
+
+// ------------------------------------------------------------------------------------------
+#define _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT64(TYPE)\
+	TYPE * __restrict to   = (TYPE *)__to;\
+	TYPE * __restrict from = (TYPE *)__from;\
+	TYPE * __restrict end  = to + count;\
+	while (to != end)\
+	{\
+		*to ++ = (TYPE)(((INT64)from[0] + (INT64)from[1]) >> 1);\
+		from += 2;\
+	}
+
+// ------------------------------------------------------------------------------------------
+#define _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(TYPE)\
+	TYPE * __restrict to   = (TYPE *)__to;\
+	TYPE * __restrict from = (TYPE *)__from;\
+	TYPE * __restrict end  = to + count;\
+	while (to != end)\
+	{\
+		*to ++ = from[0];\
+		from += 2;\
+	}
+
+// ------------------------------------------------------------------------------------------
+static void _MixMonoToStereo_1TO2_8(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(BYTE); }
+static void _MixMonoToStereo_1TO2_16(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(short); }
+static void _MixMonoToStereo_1TO2_24(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(int); /* !!! int24 data is contained in 32-bit containers*/ }
+static void _MixMonoToStereo_1TO2_32(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(int); }
+static void _MixMonoToStereo_1TO2_32f(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_1_TO_2(float); }
+
+// ------------------------------------------------------------------------------------------
+static void _MixMonoToStereo_2TO1_8(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT32(BYTE); }
+static void _MixMonoToStereo_2TO1_16(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT32(short); }
+static void _MixMonoToStereo_2TO1_24(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT32(int); /* !!! int24 data is contained in 32-bit containers*/ }
+static void _MixMonoToStereo_2TO1_32(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_INT64(int); }
+static void _MixMonoToStereo_2TO1_32f(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_FLT32(float); }
+
+// ------------------------------------------------------------------------------------------
+static void _MixMonoToStereo_2TO1_8_L(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(BYTE); }
+static void _MixMonoToStereo_2TO1_16_L(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(short); }
+static void _MixMonoToStereo_2TO1_24_L(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(int); /* !!! int24 data is contained in 32-bit containers*/ }
+static void _MixMonoToStereo_2TO1_32_L(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(int); }
+static void _MixMonoToStereo_2TO1_32f_L(void *__to, void *__from, UINT32 count) { _WASAPI_MONO_TO_STEREO_MIXER_2_TO_1_L(float); }
+
+// ------------------------------------------------------------------------------------------
+static MixMonoToStereoF _GetMonoToStereoMixer(PaSampleFormat format, EMixerDir dir)
+{
+	switch (dir)
+	{
+	case MIX_DIR__1TO2:
+		switch (format & ~paNonInterleaved)
+		{
+		case paUInt8:	return _MixMonoToStereo_1TO2_8;
+		case paInt16:	return _MixMonoToStereo_1TO2_16;
+		case paInt24:	return _MixMonoToStereo_1TO2_24;
+		case paInt32:	return _MixMonoToStereo_1TO2_32;
+		case paFloat32: return _MixMonoToStereo_1TO2_32f;
+		}
+		break;
+
+	case MIX_DIR__2TO1:
+		switch (format & ~paNonInterleaved)
+		{
+		case paUInt8:	return _MixMonoToStereo_2TO1_8;
+		case paInt16:	return _MixMonoToStereo_2TO1_16;
+		case paInt24:	return _MixMonoToStereo_2TO1_24;
+		case paInt32:	return _MixMonoToStereo_2TO1_32;
+		case paFloat32: return _MixMonoToStereo_2TO1_32f;
+		}
+		break;
+
+	case MIX_DIR__2TO1_L:
+		switch (format & ~paNonInterleaved)
+		{
+		case paUInt8:	return _MixMonoToStereo_2TO1_8_L;
+		case paInt16:	return _MixMonoToStereo_2TO1_16_L;
+		case paInt24:	return _MixMonoToStereo_2TO1_24_L;
+		case paInt32:	return _MixMonoToStereo_2TO1_32_L;
+		case paFloat32: return _MixMonoToStereo_2TO1_32f_L;
+		}
+		break;
+	}
+
+	return NULL;
+}
+
+// ------------------------------------------------------------------------------------------
+PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    PaWasapiHostApiRepresentation *paWasapi;
+    PaDeviceInfo *deviceInfoArray;
+    HRESULT hr = S_OK;
+    IMMDeviceCollection* pEndPoints = NULL;
+	UINT i;
+
+    if (!SetupAVRT())
+	{
+        PRINT(("WASAPI: No AVRT! (not VISTA?)"));
+        return paNoError;
+    }
+
+    paWasapi = (PaWasapiHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );
+    if (paWasapi == NULL)
+	{
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    result = PaWinUtil_CoInitialize( paWASAPI, &paWasapi->comInitializationResult );
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    paWasapi->allocations = PaUtil_CreateAllocationGroup();
+    if (paWasapi->allocations == NULL)
+	{
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    *hostApi                             = &paWasapi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion		 = 1;
+    (*hostApi)->info.type				 = paWASAPI;
+    (*hostApi)->info.name				 = "Windows WASAPI";
+    (*hostApi)->info.deviceCount		 = 0;
+    (*hostApi)->info.defaultInputDevice	 = paNoDevice;
+    (*hostApi)->info.defaultOutputDevice = paNoDevice;
+
+    paWasapi->enumerator = NULL;
+    hr = CoCreateInstance(&pa_CLSID_IMMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER,
+             &pa_IID_IMMDeviceEnumerator, (void **)&paWasapi->enumerator);
+    
+	// We need to set the result to a value otherwise we will return paNoError
+	// [IF_FAILED_JUMP(hResult, error);]
+	IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+    // getting default device ids in the eMultimedia "role"
+    {
+        {
+            IMMDevice *defaultRenderer = NULL;
+            hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(paWasapi->enumerator, eRender, eMultimedia, &defaultRenderer);
+            if (hr != S_OK)
+			{
+				if (hr != E_NOTFOUND) {
+					// We need to set the result to a value otherwise we will return paNoError
+					// [IF_FAILED_JUMP(hResult, error);]
+					IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+				}
+			}
+			else
+			{
+				WCHAR *pszDeviceId = NULL;
+				hr = IMMDevice_GetId(defaultRenderer, &pszDeviceId);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hResult, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+				wcsncpy(paWasapi->defaultRenderer, pszDeviceId, MAX_STR_LEN-1);
+				CoTaskMemFree(pszDeviceId);
+				IMMDevice_Release(defaultRenderer);
+			}
+        }
+
+        {
+            IMMDevice *defaultCapturer = NULL;
+            hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(paWasapi->enumerator, eCapture, eMultimedia, &defaultCapturer);
+            if (hr != S_OK)
+			{
+				if (hr != E_NOTFOUND) {
+					// We need to set the result to a value otherwise we will return paNoError
+					// [IF_FAILED_JUMP(hResult, error);]
+					IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+				}
+			}
+			else
+			{
+				WCHAR *pszDeviceId = NULL;
+				hr = IMMDevice_GetId(defaultCapturer, &pszDeviceId);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hResult, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+				wcsncpy(paWasapi->defaultCapturer, pszDeviceId, MAX_STR_LEN-1);
+				CoTaskMemFree(pszDeviceId);
+				IMMDevice_Release(defaultCapturer);
+			}
+        }
+    }
+
+    hr = IMMDeviceEnumerator_EnumAudioEndpoints(paWasapi->enumerator, eAll, DEVICE_STATE_ACTIVE, &pEndPoints);
+	// We need to set the result to a value otherwise we will return paNoError
+	// [IF_FAILED_JUMP(hResult, error);]
+	IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+    hr = IMMDeviceCollection_GetCount(pEndPoints, &paWasapi->deviceCount);
+	// We need to set the result to a value otherwise we will return paNoError
+	// [IF_FAILED_JUMP(hResult, error);]
+	IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+    paWasapi->devInfo = (PaWasapiDeviceInfo *)PaUtil_AllocateMemory(sizeof(PaWasapiDeviceInfo) * paWasapi->deviceCount);
+	for (i = 0; i < paWasapi->deviceCount; ++i)
+		memset(&paWasapi->devInfo[i], 0, sizeof(PaWasapiDeviceInfo));
+
+    if (paWasapi->deviceCount > 0)
+    {
+        (*hostApi)->deviceInfos = (PaDeviceInfo **)PaUtil_GroupAllocateMemory(
+                paWasapi->allocations, sizeof(PaDeviceInfo *) * paWasapi->deviceCount);
+        if ((*hostApi)->deviceInfos == NULL)
+		{
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaDeviceInfo *)PaUtil_GroupAllocateMemory(
+                paWasapi->allocations, sizeof(PaDeviceInfo) * paWasapi->deviceCount);
+        if (deviceInfoArray == NULL)
+		{
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for (i = 0; i < paWasapi->deviceCount; ++i)
+		{
+			DWORD state				  = 0;
+            PaDeviceInfo *deviceInfo  = &deviceInfoArray[i];
+            deviceInfo->structVersion = 2;
+            deviceInfo->hostApi       = hostApiIndex;
+
+			PA_DEBUG(("WASAPI: device idx: %02d\n", i));
+			PA_DEBUG(("WASAPI: ---------------\n"));
+
+            hr = IMMDeviceCollection_Item(pEndPoints, i, &paWasapi->devInfo[i].device);
+			// We need to set the result to a value otherwise we will return paNoError
+			// [IF_FAILED_JUMP(hResult, error);]
+			IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+            // getting ID
+            {
+                WCHAR *pszDeviceId = NULL;
+                hr = IMMDevice_GetId(paWasapi->devInfo[i].device, &pszDeviceId);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hr, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+                wcsncpy(paWasapi->devInfo[i].szDeviceID, pszDeviceId, MAX_STR_LEN-1);
+                CoTaskMemFree(pszDeviceId);
+
+                if (lstrcmpW(paWasapi->devInfo[i].szDeviceID, paWasapi->defaultCapturer) == 0)
+				{// we found the default input!
+                    (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
+                }
+                if (lstrcmpW(paWasapi->devInfo[i].szDeviceID, paWasapi->defaultRenderer) == 0)
+				{// we found the default output!
+                    (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
+                }
+            }
+
+            hr = IMMDevice_GetState(paWasapi->devInfo[i].device, &paWasapi->devInfo[i].state);
+			// We need to set the result to a value otherwise we will return paNoError
+			// [IF_FAILED_JUMP(hResult, error);]
+			IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+            if (paWasapi->devInfo[i].state != DEVICE_STATE_ACTIVE)
+			{
+                PRINT(("WASAPI device: %d is not currently available (state:%d)\n",i,state));
+            }
+
+            {
+                IPropertyStore *pProperty;
+                hr = IMMDevice_OpenPropertyStore(paWasapi->devInfo[i].device, STGM_READ, &pProperty);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hResult, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+                // "Friendly" Name
+                {
+					char *deviceName;
+                    PROPVARIANT value;
+                    PropVariantInit(&value);
+                    hr = IPropertyStore_GetValue(pProperty, &PKEY_Device_FriendlyName, &value);
+					// We need to set the result to a value otherwise we will return paNoError
+					// [IF_FAILED_JUMP(hResult, error);]
+					IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+                    deviceInfo->name = NULL;
+                    deviceName = (char *)PaUtil_GroupAllocateMemory(paWasapi->allocations, MAX_STR_LEN + 1);
+                    if (deviceName == NULL)
+					{
+                        result = paInsufficientMemory;
+                        goto error;
+                    }
+					if (value.pwszVal)
+						wcstombs(deviceName, value.pwszVal, MAX_STR_LEN-1);
+					else
+						_snprintf(deviceName, MAX_STR_LEN-1, "baddev%d", i);
+                    deviceInfo->name = deviceName;
+                    PropVariantClear(&value);
+					PA_DEBUG(("WASAPI:%d| name[%s]\n", i, deviceInfo->name));
+                }
+
+                // Default format
+                {
+                    PROPVARIANT value;
+                    PropVariantInit(&value);
+                    hr = IPropertyStore_GetValue(pProperty, &PKEY_AudioEngine_DeviceFormat, &value);
+					// We need to set the result to a value otherwise we will return paNoError
+					// [IF_FAILED_JUMP(hResult, error);]
+					IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+					memcpy(&paWasapi->devInfo[i].DefaultFormat, value.blob.pBlobData, min(sizeof(paWasapi->devInfo[i].DefaultFormat), value.blob.cbSize));
+                    // cleanup
+                    PropVariantClear(&value);
+                }
+
+                // Formfactor
+                {
+                    PROPVARIANT value;
+                    PropVariantInit(&value);
+                    hr = IPropertyStore_GetValue(pProperty, &PKEY_AudioEndpoint_FormFactor, &value);
+					// We need to set the result to a value otherwise we will return paNoError
+					// [IF_FAILED_JUMP(hResult, error);]
+					IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+					// set
+					#if defined(DUMMYUNIONNAME) && defined(NONAMELESSUNION)
+						// avoid breaking strict-aliasing rules in such line: (EndpointFormFactor)(*((UINT *)(((WORD *)&value.wReserved3)+1)));
+						UINT v;
+						memcpy(&v, (((WORD *)&value.wReserved3)+1), sizeof(v));
+						paWasapi->devInfo[i].formFactor = (EndpointFormFactor)v;
+					#else
+						paWasapi->devInfo[i].formFactor = (EndpointFormFactor)value.uintVal;
+					#endif
+					PA_DEBUG(("WASAPI:%d| form-factor[%d]\n", i, paWasapi->devInfo[i].formFactor));
+                    // cleanup
+                    PropVariantClear(&value);
+                }
+
+				SAFE_RELEASE(pProperty);
+            }
+
+
+            // Endpoint data
+            {
+                IMMEndpoint *endpoint = NULL;
+                hr = IMMDevice_QueryInterface(paWasapi->devInfo[i].device, &pa_IID_IMMEndpoint, (void **)&endpoint);
+                if (SUCCEEDED(hr))
+				{
+                    hr = IMMEndpoint_GetDataFlow(endpoint, &paWasapi->devInfo[i].flow);
+                    SAFE_RELEASE(endpoint);
+                }
+            }
+
+            // Getting a temporary IAudioClient for more fields
+            // we make sure NOT to call Initialize yet!
+            {
+                IAudioClient *tmpClient = NULL;
+
+                hr = IMMDevice_Activate(paWasapi->devInfo[i].device, &pa_IID_IAudioClient,
+					CLSCTX_INPROC_SERVER, NULL, (void **)&tmpClient);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hResult, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+                hr = IAudioClient_GetDevicePeriod(tmpClient,
+                    &paWasapi->devInfo[i].DefaultDevicePeriod,
+                    &paWasapi->devInfo[i].MinimumDevicePeriod);
+				// We need to set the result to a value otherwise we will return paNoError
+				// [IF_FAILED_JUMP(hResult, error);]
+				IF_FAILED_INTERNAL_ERROR_JUMP(hr, result, error);
+
+                //hr = tmpClient->GetMixFormat(&paWasapi->devInfo[i].MixFormat);
+
+				// Release client
+				SAFE_RELEASE(tmpClient);
+
+				if (hr != S_OK)
+				{
+					//davidv: this happened with my hardware, previously for that same device in DirectSound:
+					//Digital Output (Realtek AC'97 Audio)'s GUID: {0x38f2cf50,0x7b4c,0x4740,0x86,0xeb,0xd4,0x38,0x66,0xd8,0xc8, 0x9f}
+					//so something must be _really_ wrong with this device, TODO handle this better. We kind of need GetMixFormat
+					LogHostError(hr);
+					// We need to set the result to a value otherwise we will return paNoError
+					result = paInternalError;
+					goto error;
+				}
+            }
+
+            // we can now fill in portaudio device data
+            deviceInfo->maxInputChannels  = 0;
+            deviceInfo->maxOutputChannels = 0;
+			deviceInfo->defaultSampleRate = paWasapi->devInfo[i].DefaultFormat.Format.nSamplesPerSec;
+            switch (paWasapi->devInfo[i].flow)
+			{
+			case eRender: {
+                deviceInfo->maxOutputChannels		 = paWasapi->devInfo[i].DefaultFormat.Format.nChannels;
+                deviceInfo->defaultHighOutputLatency = nano100ToSeconds(paWasapi->devInfo[i].DefaultDevicePeriod);
+                deviceInfo->defaultLowOutputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);
+				PA_DEBUG(("WASAPI:%d| def.SR[%d] max.CH[%d] latency{hi[%f] lo[%f]}\n", i, (UINT32)deviceInfo->defaultSampleRate,
+					deviceInfo->maxOutputChannels, (float)deviceInfo->defaultHighOutputLatency, (float)deviceInfo->defaultLowOutputLatency));
+				break;}
+			case eCapture: {
+                deviceInfo->maxInputChannels		= paWasapi->devInfo[i].DefaultFormat.Format.nChannels;
+                deviceInfo->defaultHighInputLatency = nano100ToSeconds(paWasapi->devInfo[i].DefaultDevicePeriod);
+                deviceInfo->defaultLowInputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);
+				PA_DEBUG(("WASAPI:%d| def.SR[%d] max.CH[%d] latency{hi[%f] lo[%f]}\n", i, (UINT32)deviceInfo->defaultSampleRate,
+					deviceInfo->maxInputChannels, (float)deviceInfo->defaultHighInputLatency, (float)deviceInfo->defaultLowInputLatency));
+				break; }
+            default:
+                PRINT(("WASAPI:%d| bad Data Flow!\n", i));
+				// We need to set the result to a value otherwise we will return paNoError
+				result = paInternalError;
+                //continue; // do not skip from list, allow to initialize
+            break;
+            }
+
+            (*hostApi)->deviceInfos[i] = deviceInfo;
+            ++(*hostApi)->info.deviceCount;
+        }
+    }
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &paWasapi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &paWasapi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+
+	// findout if platform workaround is required
+	paWasapi->useWOW64Workaround = UseWOW64Workaround();
+
+    SAFE_RELEASE(pEndPoints);
+
+	PRINT(("WASAPI: initialized ok\n"));
+
+    return paNoError;
+
+error:
+
+	PRINT(("WASAPI: failed %s error[%d|%s]\n", __FUNCTION__, result, Pa_GetErrorText(result)));
+
+    SAFE_RELEASE(pEndPoints);
+
+	Terminate((PaUtilHostApiRepresentation *)paWasapi);
+
+	// Safety if error was not set so that we do not think initialize was a success
+	if (result == paNoError) {
+		result = paInternalError;
+	}
+
+    return result;
+}
+
+// ------------------------------------------------------------------------------------------
+static void Terminate( PaUtilHostApiRepresentation *hostApi )
+{
+	UINT i;
+    PaWasapiHostApiRepresentation *paWasapi = (PaWasapiHostApiRepresentation*)hostApi;
+	if (paWasapi == NULL)
+		return;
+
+	// Release IMMDeviceEnumerator
+    SAFE_RELEASE(paWasapi->enumerator);
+
+    for (i = 0; i < paWasapi->deviceCount; ++i)
+	{
+        PaWasapiDeviceInfo *info = &paWasapi->devInfo[i];
+        SAFE_RELEASE(info->device);
+
+		//if (info->MixFormat)
+        //    CoTaskMemFree(info->MixFormat);
+    }
+    PaUtil_FreeMemory(paWasapi->devInfo);
+
+    if (paWasapi->allocations)
+	{
+        PaUtil_FreeAllAllocations(paWasapi->allocations);
+        PaUtil_DestroyAllocationGroup(paWasapi->allocations);
+    }
+
+    PaWinUtil_CoUninitialize( paWASAPI, &paWasapi->comInitializationResult );
+
+    PaUtil_FreeMemory(paWasapi);
+
+	// Close AVRT
+	CloseAVRT();
+}
+
+// ------------------------------------------------------------------------------------------
+static PaWasapiHostApiRepresentation *_GetHostApi(PaError *_error)
+{
+	PaError error;
+
+	PaUtilHostApiRepresentation *pApi;
+	if ((error = PaUtil_GetHostApiRepresentation(&pApi, paWASAPI)) != paNoError)
+	{
+		if (_error != NULL)
+			(*_error) = error;
+
+		return NULL;
+	}
+	return (PaWasapiHostApiRepresentation *)pApi;
+}
+
+// ------------------------------------------------------------------------------------------
+int PaWasapi_GetDeviceDefaultFormat( void *pFormat, unsigned int nFormatSize, PaDeviceIndex nDevice )
+{
+	PaError ret;
+	PaWasapiHostApiRepresentation *paWasapi;
+	UINT32 size;
+	PaDeviceIndex index;
+
+	if (pFormat == NULL)
+		return paBadBufferPtr;
+	if (nFormatSize <= 0)
+		return paBufferTooSmall;
+
+	// Get API
+	paWasapi = _GetHostApi(&ret);
+	if (paWasapi == NULL)
+		return ret;
+
+	// Get device index
+	ret = PaUtil_DeviceIndexToHostApiDeviceIndex(&index, nDevice, &paWasapi->inheritedHostApiRep);
+    if (ret != paNoError)
+        return ret;
+
+	// Validate index
+	if ((UINT32)index >= paWasapi->deviceCount)
+		return paInvalidDevice;
+
+	size = min(nFormatSize, (UINT32)sizeof(paWasapi->devInfo[ index ].DefaultFormat));
+	memcpy(pFormat, &paWasapi->devInfo[ index ].DefaultFormat, size);
+
+	return size;
+}
+
+// ------------------------------------------------------------------------------------------
+int PaWasapi_GetDeviceRole( PaDeviceIndex nDevice )
+{
+	PaError ret;
+	PaDeviceIndex index;
+
+	// Get API
+	PaWasapiHostApiRepresentation *paWasapi = _GetHostApi(&ret);
+	if (paWasapi == NULL)
+		return paNotInitialized;
+
+	// Get device index
+	ret = PaUtil_DeviceIndexToHostApiDeviceIndex(&index, nDevice, &paWasapi->inheritedHostApiRep);
+    if (ret != paNoError)
+        return ret;
+
+	// Validate index
+	if ((UINT32)index >= paWasapi->deviceCount)
+		return paInvalidDevice;
+
+	return paWasapi->devInfo[ index ].formFactor;
+}
+
+// ------------------------------------------------------------------------------------------
+PaError PaWasapi_GetFramesPerHostBuffer( PaStream *pStream, unsigned int *nInput, unsigned int *nOutput )
+{
+    PaWasapiStream *stream = (PaWasapiStream *)pStream;
+	if (stream == NULL)
+		return paBadStreamPtr;
+
+	if (nInput != NULL)
+		(*nInput) = stream->in.framesPerHostCallback;
+
+	if (nOutput != NULL)
+		(*nOutput) = stream->out.framesPerHostCallback;
+
+	return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+static void LogWAVEFORMATEXTENSIBLE(const WAVEFORMATEXTENSIBLE *in)
+{
+    const WAVEFORMATEX *old = (WAVEFORMATEX *)in;
+	switch (old->wFormatTag)
+	{
+	case WAVE_FORMAT_EXTENSIBLE: {
+
+		PRINT(("wFormatTag     =WAVE_FORMAT_EXTENSIBLE\n"));
+
+		if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))
+		{
+			PRINT(("SubFormat      =KSDATAFORMAT_SUBTYPE_IEEE_FLOAT\n"));
+		}
+		else
+		if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_PCM))
+		{
+			PRINT(("SubFormat      =KSDATAFORMAT_SUBTYPE_PCM\n"));
+		}
+		else
+		{
+			PRINT(("SubFormat      =CUSTOM GUID{%d:%d:%d:%d%d%d%d%d%d%d%d}\n",
+										in->SubFormat.Data1,
+										in->SubFormat.Data2,
+										in->SubFormat.Data3,
+										(int)in->SubFormat.Data4[0],
+										(int)in->SubFormat.Data4[1],
+										(int)in->SubFormat.Data4[2],
+										(int)in->SubFormat.Data4[3],
+										(int)in->SubFormat.Data4[4],
+										(int)in->SubFormat.Data4[5],
+										(int)in->SubFormat.Data4[6],
+										(int)in->SubFormat.Data4[7]));
+		}
+		PRINT(("Samples.wValidBitsPerSample =%d\n",  in->Samples.wValidBitsPerSample));
+		PRINT(("dwChannelMask  =0x%X\n",in->dwChannelMask));
+
+		break; }
+
+	case WAVE_FORMAT_PCM:        PRINT(("wFormatTag     =WAVE_FORMAT_PCM\n")); break;
+	case WAVE_FORMAT_IEEE_FLOAT: PRINT(("wFormatTag     =WAVE_FORMAT_IEEE_FLOAT\n")); break;
+	default: 
+		PRINT(("wFormatTag     =UNKNOWN(%d)\n",old->wFormatTag)); break;
+	}
+
+	PRINT(("nChannels      =%d\n",old->nChannels));
+	PRINT(("nSamplesPerSec =%d\n",old->nSamplesPerSec));
+	PRINT(("nAvgBytesPerSec=%d\n",old->nAvgBytesPerSec));
+	PRINT(("nBlockAlign    =%d\n",old->nBlockAlign));
+	PRINT(("wBitsPerSample =%d\n",old->wBitsPerSample));
+	PRINT(("cbSize         =%d\n",old->cbSize));
+}
+
+// ------------------------------------------------------------------------------------------
+static PaSampleFormat WaveToPaFormat(const WAVEFORMATEXTENSIBLE *in)
+{
+    const WAVEFORMATEX *old = (WAVEFORMATEX *)in;
+
+    switch (old->wFormatTag)
+	{
+    case WAVE_FORMAT_EXTENSIBLE: {
+        if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))
+		{
+            if (in->Samples.wValidBitsPerSample == 32)
+                return paFloat32;
+        }
+        else
+		if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_PCM))
+		{
+            switch (old->wBitsPerSample)
+			{
+                case 32: return paInt32;
+                case 24: return paInt24;
+                case  8: return paUInt8;
+                case 16: return paInt16;
+            }
+        }
+		break; }
+
+    case WAVE_FORMAT_IEEE_FLOAT:
+		return paFloat32;
+
+    case WAVE_FORMAT_PCM: {
+        switch (old->wBitsPerSample)
+		{
+            case 32: return paInt32;
+            case 24: return paInt24;
+            case  8: return paUInt8;
+            case 16: return paInt16;
+        }
+		break; }
+    }
+
+    return paCustomFormat;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError MakeWaveFormatFromParams(WAVEFORMATEXTENSIBLE *wavex, const PaStreamParameters *params,
+									double sampleRate)
+{
+	WORD bitsPerSample;
+	WAVEFORMATEX *old;
+	DWORD channelMask = 0;
+	PaWasapiStreamInfo *streamInfo = (PaWasapiStreamInfo *)params->hostApiSpecificStreamInfo;
+
+	// Get user assigned channel mask
+	if ((streamInfo != NULL) && (streamInfo->flags & paWinWasapiUseChannelMask))
+		channelMask = streamInfo->channelMask;
+
+	// Convert PaSampleFormat to bits per sample
+	if ((bitsPerSample = PaSampleFormatToBitsPerSample(params->sampleFormat)) == 0)
+		return paSampleFormatNotSupported;
+
+    memset(wavex, 0, sizeof(*wavex));
+
+    old					 = (WAVEFORMATEX *)wavex;
+    old->nChannels       = (WORD)params->channelCount;
+    old->nSamplesPerSec  = (DWORD)sampleRate;
+	if ((old->wBitsPerSample = bitsPerSample) > 16)
+	{
+		old->wBitsPerSample = 32; // 20 or 24 bits must go in 32 bit containers (ints)
+	}
+    old->nBlockAlign     = (old->nChannels * (old->wBitsPerSample/8));
+    old->nAvgBytesPerSec = (old->nSamplesPerSec * old->nBlockAlign);
+
+    // WAVEFORMATEX
+    if ((params->channelCount <= 2) && ((bitsPerSample == 16) || (bitsPerSample == 8)))
+	{
+        old->cbSize		= 0;
+        old->wFormatTag	= WAVE_FORMAT_PCM;
+    }
+    // WAVEFORMATEXTENSIBLE
+    else
+	{
+        old->wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+        old->cbSize		= sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
+
+        if ((params->sampleFormat & ~paNonInterleaved) == paFloat32)
+            wavex->SubFormat = pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+        else
+            wavex->SubFormat = pa_KSDATAFORMAT_SUBTYPE_PCM;
+
+        wavex->Samples.wValidBitsPerSample = bitsPerSample; //no extra padding!
+
+		// Set channel mask
+		if (channelMask != 0)
+		{
+			wavex->dwChannelMask = channelMask;
+		}
+		else
+		{
+			switch (params->channelCount)
+			{
+			case 1:  wavex->dwChannelMask = KSAUDIO_SPEAKER_MONO; break;
+			case 2:  wavex->dwChannelMask = KSAUDIO_SPEAKER_STEREO; break;
+			case 3:  wavex->dwChannelMask = KSAUDIO_SPEAKER_STEREO|SPEAKER_LOW_FREQUENCY; break;
+			case 4:  wavex->dwChannelMask = KSAUDIO_SPEAKER_QUAD; break;
+			case 5:  wavex->dwChannelMask = KSAUDIO_SPEAKER_QUAD|SPEAKER_LOW_FREQUENCY; break;
+#ifdef KSAUDIO_SPEAKER_5POINT1_SURROUND
+			case 6:  wavex->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; break;
+#else
+			case 6:  wavex->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; break;
+#endif
+#ifdef KSAUDIO_SPEAKER_5POINT1_SURROUND
+			case 7:  wavex->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND|SPEAKER_BACK_CENTER; break;
+#else
+			case 7:  wavex->dwChannelMask = KSAUDIO_SPEAKER_5POINT1|SPEAKER_BACK_CENTER; break;
+#endif	
+#ifdef KSAUDIO_SPEAKER_7POINT1_SURROUND
+			case 8:  wavex->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; break;
+#else
+			case 8:  wavex->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; break;
+#endif
+
+			default: wavex->dwChannelMask = 0;
+			}
+		}
+	}
+    return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+/*static void wasapiFillWFEXT( WAVEFORMATEXTENSIBLE* pwfext, PaSampleFormat sampleFormat, double sampleRate, int channelCount)
+{
+    PA_DEBUG(( "sampleFormat = %lx\n" , sampleFormat ));
+    PA_DEBUG(( "sampleRate = %f\n" , sampleRate ));
+    PA_DEBUG(( "chanelCount = %d\n", channelCount ));
+
+    pwfext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    pwfext->Format.nChannels = (WORD)channelCount;
+    pwfext->Format.nSamplesPerSec = (DWORD)sampleRate;
+    if(channelCount == 1)
+        pwfext->dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT;
+    else
+        pwfext->dwChannelMask = KSAUDIO_SPEAKER_STEREO;
+    if(sampleFormat == paFloat32)
+    {
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
+        pwfext->Format.wBitsPerSample = 32;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 32;
+        pwfext->SubFormat = pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+    }
+    else if(sampleFormat == paInt32)
+    {
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
+        pwfext->Format.wBitsPerSample = 32;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 32;
+        pwfext->SubFormat = pa_KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    else if(sampleFormat == paInt24)
+    {
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
+        pwfext->Format.wBitsPerSample = 32; // 24-bit in 32-bit int container
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 24;
+        pwfext->SubFormat = pa_KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    else if(sampleFormat == paInt16)
+    {
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 2);
+        pwfext->Format.wBitsPerSample = 16;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 16;
+        pwfext->SubFormat = pa_KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    pwfext->Format.nAvgBytesPerSec = pwfext->Format.nSamplesPerSec * pwfext->Format.nBlockAlign;
+}*/
+
+// ------------------------------------------------------------------------------------------
+static PaError GetClosestFormat(IAudioClient *myClient, double sampleRate,
+	const PaStreamParameters *_params, AUDCLNT_SHAREMODE shareMode, WAVEFORMATEXTENSIBLE *outWavex,
+	BOOL output)
+{
+	PaError answer                   = paInvalidSampleRate;
+	WAVEFORMATEX *sharedClosestMatch = NULL;
+	HRESULT hr                       = !S_OK;
+	PaStreamParameters params       = (*_params);
+
+	/* It was not noticed that 24-bit Input producing no output while device accepts this format.
+	   To fix this issue let's ask for 32-bits and let PA converters convert host 32-bit data
+	   to 24-bit for user-space. The bug concerns Vista, if Windows 7 supports 24-bits for Input
+	   please report to PortAudio developers to exclude Windows 7.
+	*/
+	/*if ((params.sampleFormat == paInt24) && (output == FALSE))
+		params.sampleFormat = paFloat32;*/ // <<< The silence was due to missing Int32_To_Int24_Dither implementation
+
+    MakeWaveFormatFromParams(outWavex, &params, sampleRate);
+
+	hr = IAudioClient_IsFormatSupported(myClient, shareMode, &outWavex->Format, (shareMode == AUDCLNT_SHAREMODE_SHARED ? &sharedClosestMatch : NULL));
+	if (hr == S_OK)
+		answer = paFormatIsSupported;
+    else
+	if (sharedClosestMatch)
+	{
+		WORD bitsPerSample;
+        WAVEFORMATEXTENSIBLE *ext = (WAVEFORMATEXTENSIBLE*)sharedClosestMatch;
+
+		GUID subf_guid = GUID_NULL;
+		if (sharedClosestMatch->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+		{
+			memcpy(outWavex, sharedClosestMatch, sizeof(WAVEFORMATEXTENSIBLE));
+			subf_guid = ext->SubFormat;
+		}
+		else
+			memcpy(outWavex, sharedClosestMatch, sizeof(WAVEFORMATEX));
+
+        CoTaskMemFree(sharedClosestMatch);
+
+		// Make supported by default
+		answer = paFormatIsSupported;
+
+		// Validate SampleRate
+		if ((DWORD)sampleRate != outWavex->Format.nSamplesPerSec)
+			return paInvalidSampleRate;
+
+		// Validate Channel count
+		if ((WORD)params.channelCount != outWavex->Format.nChannels)
+		{
+			// If mono, then driver does not support 1 channel, we use internal workaround
+			// of tiny software mixing functionality, e.g. we provide to user buffer 1 channel
+			// but then mix into 2 for device buffer
+			if ((params.channelCount == 1) && (outWavex->Format.nChannels == 2))
+				return paFormatIsSupported;
+			else
+				return paInvalidChannelCount;
+		}
+
+		// Validate Sample format
+		if ((bitsPerSample = PaSampleFormatToBitsPerSample(params.sampleFormat)) == 0)
+			return paSampleFormatNotSupported;
+
+		// Validate Sample format: bit size (WASAPI does not limit 'bit size')
+		//if (bitsPerSample != outWavex->Format.wBitsPerSample)
+		//	return paSampleFormatNotSupported;
+
+		// Validate Sample format: paFloat32 (WASAPI does not limit 'bit type')
+		//if ((params->sampleFormat == paFloat32) && (subf_guid != KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))
+		//	return paSampleFormatNotSupported;
+
+		// Validate Sample format: paInt32 (WASAPI does not limit 'bit type')
+		//if ((params->sampleFormat == paInt32) && (subf_guid != KSDATAFORMAT_SUBTYPE_PCM))
+		//	return paSampleFormatNotSupported;
+	}
+	else
+	{
+		static const int BestToWorst[] = { paFloat32, paInt24, paInt16 };
+		int i;
+
+		// Try combination stereo and we will use built-in mono-stereo mixer then
+		if (params.channelCount == 1)
+		{
+			WAVEFORMATEXTENSIBLE stereo = { 0 };
+
+			PaStreamParameters stereo_params = params;
+			stereo_params.channelCount = 2;
+
+			MakeWaveFormatFromParams(&stereo, &stereo_params, sampleRate);
+
+			hr = IAudioClient_IsFormatSupported(myClient, shareMode, &stereo.Format, (shareMode == AUDCLNT_SHAREMODE_SHARED ? &sharedClosestMatch : NULL));
+			if (hr == S_OK)
+			{
+				memcpy(outWavex, &stereo, sizeof(WAVEFORMATEXTENSIBLE));
+				CoTaskMemFree(sharedClosestMatch);
+				return (answer = paFormatIsSupported);
+			}
+
+			// Try selecting suitable sample type
+			for (i = 0; i < STATIC_ARRAY_SIZE(BestToWorst); ++i)
+			{
+				WAVEFORMATEXTENSIBLE sample = { 0 };
+
+				PaStreamParameters sample_params = stereo_params;
+				sample_params.sampleFormat = BestToWorst[i];
+
+				MakeWaveFormatFromParams(&sample, &sample_params, sampleRate);
+
+				hr = IAudioClient_IsFormatSupported(myClient, shareMode, &sample.Format, (shareMode == AUDCLNT_SHAREMODE_SHARED ? &sharedClosestMatch : NULL));
+				if (hr == S_OK)
+				{
+					memcpy(outWavex, &sample, sizeof(WAVEFORMATEXTENSIBLE));
+					CoTaskMemFree(sharedClosestMatch);
+					return (answer = paFormatIsSupported);
+				}
+			}
+		}
+
+		// Try selecting suitable sample type
+		for (i = 0; i < STATIC_ARRAY_SIZE(BestToWorst); ++i)
+		{
+			WAVEFORMATEXTENSIBLE spfmt = { 0 };
+
+			PaStreamParameters spfmt_params = params;
+			spfmt_params.sampleFormat = BestToWorst[i];
+
+			MakeWaveFormatFromParams(&spfmt, &spfmt_params, sampleRate);
+
+			hr = IAudioClient_IsFormatSupported(myClient, shareMode, &spfmt.Format, (shareMode == AUDCLNT_SHAREMODE_SHARED ? &sharedClosestMatch : NULL));
+			if (hr == S_OK)
+			{
+				memcpy(outWavex, &spfmt, sizeof(WAVEFORMATEXTENSIBLE));
+				CoTaskMemFree(sharedClosestMatch);
+				answer = paFormatIsSupported;
+				break;
+			}
+		}
+
+		// Nothing helped
+		LogHostError(hr);
+	}
+
+	return answer;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError IsStreamParamsValid(struct PaUtilHostApiRepresentation *hostApi,
+                                   const  PaStreamParameters *inputParameters,
+                                   const  PaStreamParameters *outputParameters,
+                                   double sampleRate)
+{
+	if (hostApi == NULL)
+		return paHostApiNotFound;
+	if ((UINT32)sampleRate == 0)
+		return paInvalidSampleRate;
+
+	if (inputParameters != NULL)
+    {
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+		if (inputParameters->sampleFormat & paCustomFormat)
+            return paSampleFormatNotSupported;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if (inputParameters->device == paUseHostApiSpecificDeviceSpecification)
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if (inputParameters->channelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels)
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if (inputParameters->hostApiSpecificStreamInfo)
+		{
+			PaWasapiStreamInfo *inputStreamInfo = (PaWasapiStreamInfo *)inputParameters->hostApiSpecificStreamInfo;
+	        if ((inputStreamInfo->size != sizeof(PaWasapiStreamInfo)) ||
+	            (inputStreamInfo->version != 1) ||
+                (inputStreamInfo->hostApiType != paWASAPI))
+	        {
+	            return paIncompatibleHostApiSpecificStreamInfo;
+	        }
+		}
+
+        return paNoError;
+    }
+
+    if (outputParameters != NULL)
+    {
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if (outputParameters->sampleFormat & paCustomFormat)
+            return paSampleFormatNotSupported;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+        if (outputParameters->device == paUseHostApiSpecificDeviceSpecification)
+            return paInvalidDevice;
+
+        /* check that output device can support outputChannelCount */
+        if (outputParameters->channelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels)
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if(outputParameters->hostApiSpecificStreamInfo)
+        {
+			PaWasapiStreamInfo *outputStreamInfo = (PaWasapiStreamInfo *)outputParameters->hostApiSpecificStreamInfo;
+	        if ((outputStreamInfo->size != sizeof(PaWasapiStreamInfo)) ||
+	            (outputStreamInfo->version != 1) ||
+                (outputStreamInfo->hostApiType != paWASAPI))
+	        {
+	            return paIncompatibleHostApiSpecificStreamInfo;
+	        }
+        }
+
+		return paNoError;
+    }
+
+	return (inputParameters || outputParameters ? paNoError : paInternalError);
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const  PaStreamParameters *inputParameters,
+                                  const  PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+	IAudioClient *tmpClient = NULL;
+	PaWasapiHostApiRepresentation *paWasapi = (PaWasapiHostApiRepresentation*)hostApi;
+	PaWasapiStreamInfo *inputStreamInfo = NULL, *outputStreamInfo = NULL;
+
+	// Validate PaStreamParameters
+	PaError error;
+	if ((error = IsStreamParamsValid(hostApi, inputParameters, outputParameters, sampleRate)) != paNoError)
+		return error;
+
+    if (inputParameters != NULL)
+    {
+		WAVEFORMATEXTENSIBLE wavex;
+		HRESULT hr;
+		PaError answer;
+		AUDCLNT_SHAREMODE shareMode = AUDCLNT_SHAREMODE_SHARED;
+		inputStreamInfo = (PaWasapiStreamInfo *)inputParameters->hostApiSpecificStreamInfo;
+
+		if (inputStreamInfo && (inputStreamInfo->flags & paWinWasapiExclusive))
+			shareMode  = AUDCLNT_SHAREMODE_EXCLUSIVE;
+
+		hr = IMMDevice_Activate(paWasapi->devInfo[inputParameters->device].device,
+			&pa_IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&tmpClient);
+		if (hr != S_OK)
+		{
+			LogHostError(hr);
+			return paInvalidDevice;
+		}
+
+		answer = GetClosestFormat(tmpClient, sampleRate, inputParameters, shareMode, &wavex, FALSE);
+		SAFE_RELEASE(tmpClient);
+
+		if (answer != paFormatIsSupported)
+			return answer;
+    }
+
+    if (outputParameters != NULL)
+    {
+		HRESULT hr;
+		WAVEFORMATEXTENSIBLE wavex;
+		PaError answer;
+		AUDCLNT_SHAREMODE shareMode = AUDCLNT_SHAREMODE_SHARED;
+        outputStreamInfo = (PaWasapiStreamInfo *)outputParameters->hostApiSpecificStreamInfo;
+
+		if (outputStreamInfo && (outputStreamInfo->flags & paWinWasapiExclusive))
+			shareMode  = AUDCLNT_SHAREMODE_EXCLUSIVE;
+
+		hr = IMMDevice_Activate(paWasapi->devInfo[outputParameters->device].device,
+			&pa_IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&tmpClient);
+		if (hr != S_OK)
+		{
+			LogHostError(hr);
+			return paInvalidDevice;
+		}
+
+		answer = GetClosestFormat(tmpClient, sampleRate, outputParameters, shareMode, &wavex, TRUE);
+		SAFE_RELEASE(tmpClient);
+
+		if (answer != paFormatIsSupported)
+			return answer;
+    }
+
+    return paFormatIsSupported;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaUint32 PaUtil_GetFramesPerHostBuffer(PaUint32 userFramesPerBuffer, PaTime suggestedLatency, double sampleRate, PaUint32 TimerJitterMs)
+{
+	PaUint32 frames = userFramesPerBuffer + max( userFramesPerBuffer, (PaUint32)(suggestedLatency * sampleRate) );
+    frames += (PaUint32)((sampleRate * 0.001) * TimerJitterMs);
+	return frames;
+}
+
+// ------------------------------------------------------------------------------------------
+static void _RecalculateBuffersCount(PaWasapiSubStream *sub, UINT32 userFramesPerBuffer, UINT32 framesPerLatency, BOOL fullDuplex)
+{
+	// Count buffers (must be at least 1)
+	sub->buffers = (userFramesPerBuffer ? framesPerLatency / userFramesPerBuffer : 0);
+	if (sub->buffers == 0)
+		sub->buffers = 1;
+
+	// Determine amount of buffers used:
+	// - Full-duplex mode will lead to period difference, thus only 1.
+	// - Input mode, only 1, as WASAPI allows extraction of only 1 packet.
+	// - For Shared mode we use double buffering.
+	if ((sub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE) || fullDuplex)
+	{
+		// Exclusive mode does not allow >1 buffers be used for Event interface, e.g. GetBuffer
+		// call must acquire max buffer size and it all must be processed.
+		if (sub->streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)
+			sub->userBufferAndHostMatch = 1;
+
+		// Use paUtilBoundedHostBufferSize because exclusive mode will starve and produce
+		// bad quality of audio
+		sub->buffers = 1;
+	}
+}
+
+// ------------------------------------------------------------------------------------------
+static void _CalculateAlignedPeriod(PaWasapiSubStream *pSub, UINT32 *nFramesPerLatency,
+									ALIGN_FUNC pAlignFunc)
+{
+	// Align frames to HD Audio packet size of 128 bytes for Exclusive mode only.
+	// Not aligning on Windows Vista will cause Event timeout, although Windows 7 will
+	// return AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED error to realign buffer. Aligning is necessary
+	// for Exclusive mode only! when audio data is feeded directly to hardware.
+	if (pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
+	{
+		(*nFramesPerLatency) = AlignFramesPerBuffer((*nFramesPerLatency),
+			pSub->wavex.Format.nSamplesPerSec, pSub->wavex.Format.nBlockAlign, pAlignFunc);
+	}
+
+	// Calculate period
+	pSub->period = MakeHnsPeriod((*nFramesPerLatency), pSub->wavex.Format.nSamplesPerSec);
+}
+
+// ------------------------------------------------------------------------------------------
+static HRESULT CreateAudioClient(PaWasapiStream *pStream, PaWasapiSubStream *pSub, BOOL output, PaError *pa_error)
+{
+	PaError error;
+    HRESULT hr;
+
+	const PaWasapiDeviceInfo *pInfo  = pSub->params.device_info;
+	const PaStreamParameters *params = &pSub->params.stream_params;
+	UINT32 framesPerLatency          = pSub->params.frames_per_buffer;
+	double sampleRate                = pSub->params.sample_rate;
+	BOOL blocking                    = pSub->params.blocking;
+	BOOL fullDuplex                  = pSub->params.full_duplex;
+
+	const UINT32 userFramesPerBuffer = framesPerLatency;
+    IAudioClient *audioClient	     = NULL;
+
+	// Validate parameters
+    if (!pSub || !pInfo || !params)
+        return E_POINTER;
+	if ((UINT32)sampleRate == 0)
+        return E_INVALIDARG;
+
+    // Get the audio client
+    hr = IMMDevice_Activate(pInfo->device, &pa_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&audioClient);
+	if (hr != S_OK)
+	{
+		LogHostError(hr);
+		goto done;
+	}
+
+	// Get closest format
+	if ((error = GetClosestFormat(audioClient, sampleRate, params, pSub->shareMode, &pSub->wavex, output)) != paFormatIsSupported)
+	{
+		if (pa_error)
+			(*pa_error) = error;
+
+		LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT);
+		goto done; // fail, format not supported
+	}
+
+	// Check for Mono <<>> Stereo workaround
+	if ((params->channelCount == 1) && (pSub->wavex.Format.nChannels == 2))
+	{
+		/*if (blocking)
+		{
+			LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT);
+			goto done; // fail, blocking mode not supported
+		}*/
+
+		// select mixer
+		pSub->monoMixer = _GetMonoToStereoMixer(WaveToPaFormat(&pSub->wavex), (pInfo->flow == eRender ? MIX_DIR__1TO2 : MIX_DIR__2TO1_L));
+		if (pSub->monoMixer == NULL)
+		{
+			LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT);
+			goto done; // fail, no mixer for format
+		}
+	}
+
+#if 0
+	// Add suggestd latency
+	framesPerLatency += MakeFramesFromHns(SecondsTonano100(params->suggestedLatency), pSub->wavex.Format.nSamplesPerSec);
+#else
+	// Calculate host buffer size
+	if ((pSub->shareMode != AUDCLNT_SHAREMODE_EXCLUSIVE) &&
+		(!pSub->streamFlags || ((pSub->streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) == 0)))
+	{
+		framesPerLatency = PaUtil_GetFramesPerHostBuffer(userFramesPerBuffer,
+			params->suggestedLatency, pSub->wavex.Format.nSamplesPerSec, 0/*,
+			(pSub->streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK ? 0 : 1)*/);
+	}
+	else
+	{
+		REFERENCE_TIME overall;
+
+		// Work 1:1 with user buffer (only polling allows to use >1)
+		framesPerLatency += MakeFramesFromHns(SecondsTonano100(params->suggestedLatency), pSub->wavex.Format.nSamplesPerSec);
+
+		// Use Polling if overall latency is > 5ms as it allows to use 100% CPU in a callback,
+		// or user specified latency parameter
+		overall = MakeHnsPeriod(framesPerLatency, pSub->wavex.Format.nSamplesPerSec);
+		if ((overall >= (106667*2)/*21.33ms*/) || ((INT32)(params->suggestedLatency*100000.0) != 0/*0.01 msec granularity*/))
+		{
+			framesPerLatency = PaUtil_GetFramesPerHostBuffer(userFramesPerBuffer,
+				params->suggestedLatency, pSub->wavex.Format.nSamplesPerSec, 0/*,
+				(streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK ? 0 : 1)*/);
+
+			// Use Polling interface
+			pSub->streamFlags &= ~AUDCLNT_STREAMFLAGS_EVENTCALLBACK;
+			PRINT(("WASAPI: CreateAudioClient: forcing POLL mode\n"));
+		}
+	}
+#endif
+
+	// For full-duplex output resize buffer to be the same as for input
+	if (output && fullDuplex)
+		framesPerLatency = pStream->in.framesPerHostCallback;
+
+	// Avoid 0 frames
+	if (framesPerLatency == 0)
+		framesPerLatency = MakeFramesFromHns(pInfo->DefaultDevicePeriod, pSub->wavex.Format.nSamplesPerSec);
+
+	//! Exclusive Input stream renders data in 6 packets, we must set then the size of
+	//! single packet, total buffer size, e.g. required latency will be PacketSize * 6
+	if (!output && (pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE))
+	{
+		framesPerLatency /= WASAPI_PACKETS_PER_INPUT_BUFFER;
+	}
+
+	// Calculate aligned period
+	_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_BWD);
+
+	/*! Enforce min/max period for device in Shared mode to avoid bad audio quality.
+        Avoid doing so for Exclusive mode as alignment will suffer.
+	*/
+	if (pSub->shareMode == AUDCLNT_SHAREMODE_SHARED)
+	{
+		if (pSub->period < pInfo->DefaultDevicePeriod)
+		{
+			pSub->period = pInfo->DefaultDevicePeriod;
+			// Recalculate aligned period
+			framesPerLatency = MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec);
+			_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_BWD);
+		}
+	}
+	else
+	{
+		if (pSub->period < pInfo->MinimumDevicePeriod)
+		{
+			pSub->period = pInfo->MinimumDevicePeriod;
+			// Recalculate aligned period
+			framesPerLatency = MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec);
+			_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_FWD);
+		}
+	}
+
+	/*! Windows 7 does not allow to set latency lower than minimal device period and will
+	    return error: AUDCLNT_E_INVALID_DEVICE_PERIOD. Under Vista we enforce the same behavior
+	    manually for unified behavior on all platforms.
+	*/
+	{
+		/*!	AUDCLNT_E_BUFFER_SIZE_ERROR: Applies to Windows 7 and later.
+			Indicates that the buffer duration value requested by an exclusive-mode client is
+			out of range. The requested duration value for pull mode must not be greater than
+			500 milliseconds; for push mode the duration value must not be greater than 2 seconds.
+		*/
+		if (pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
+		{
+			static const REFERENCE_TIME MAX_BUFFER_EVENT_DURATION = 500  * 10000;
+			static const REFERENCE_TIME MAX_BUFFER_POLL_DURATION  = 2000 * 10000;
+
+			if (pSub->streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)	// pull mode, max 500ms
+			{
+				if (pSub->period > MAX_BUFFER_EVENT_DURATION)
+				{
+					pSub->period = MAX_BUFFER_EVENT_DURATION;
+					// Recalculate aligned period
+					framesPerLatency = MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec);
+					_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_BWD);
+				}
+			}
+			else														// push mode, max 2000ms
+			{
+				if (pSub->period > MAX_BUFFER_POLL_DURATION)
+				{
+					pSub->period = MAX_BUFFER_POLL_DURATION;
+					// Recalculate aligned period
+					framesPerLatency = MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec);
+					_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_BWD);
+				}
+			}
+		}
+	}
+
+	// Open the stream and associate it with an audio session
+    hr = IAudioClient_Initialize(audioClient,
+        pSub->shareMode,
+        pSub->streamFlags,
+		pSub->period,
+		(pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? pSub->period : 0),
+		&pSub->wavex.Format,
+        NULL);
+
+	/*! WASAPI is tricky on large device buffer, sometimes 2000ms can be allocated sometimes
+	    less. There is no known guaranteed level thus we make subsequent tries by decreasing
+		buffer by 100ms per try.
+	*/
+	while ((hr == E_OUTOFMEMORY) && (pSub->period > (100 * 10000)))
+	{
+		PRINT(("WASAPI: CreateAudioClient: decreasing buffer size to %d milliseconds\n", (pSub->period / 10000)));
+
+		// Decrease by 100ms and try again
+		pSub->period -= (100 * 10000);
+
+		// Recalculate aligned period
+		framesPerLatency = MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec);
+		_CalculateAlignedPeriod(pSub, &framesPerLatency, ALIGN_BWD);
+
+        // Release the previous allocations
+        SAFE_RELEASE(audioClient);
+
+        // Create a new audio client
+        hr = IMMDevice_Activate(pInfo->device, &pa_IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&audioClient);
+    	if (hr != S_OK)
+		{
+			LogHostError(hr);
+			goto done;
+		}
+
+		// Open the stream and associate it with an audio session
+		hr = IAudioClient_Initialize(audioClient,
+			pSub->shareMode,
+			pSub->streamFlags,
+			pSub->period,
+			(pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? pSub->period : 0),
+			&pSub->wavex.Format,
+			NULL);
+	}
+
+	/*! WASAPI buffer size failure. Fallback to using default size.
+	*/
+	if (hr == AUDCLNT_E_BUFFER_SIZE_ERROR)
+	{
+		// Use default
+		pSub->period = pInfo->DefaultDevicePeriod;
+
+		PRINT(("WASAPI: CreateAudioClient: correcting buffer size to device default\n"));
+
+        // Release the previous allocations
+        SAFE_RELEASE(audioClient);
+
+        // Create a new audio client
+        hr = IMMDevice_Activate(pInfo->device, &pa_IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&audioClient);
+    	if (hr != S_OK)
+		{
+			LogHostError(hr);
+			goto done;
+		}
+
+		// Open the stream and associate it with an audio session
+		hr = IAudioClient_Initialize(audioClient,
+			pSub->shareMode,
+			pSub->streamFlags,
+			pSub->period,
+			(pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? pSub->period : 0),
+			&pSub->wavex.Format,
+			NULL);
+	}
+
+    /*! If the requested buffer size is not aligned. Can be triggered by Windows 7 and up.
+	    Should not be be triggered ever as we do align buffers always with _CalculateAlignedPeriod.
+	*/
+    if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
+    {
+		UINT32 frames = 0;
+
+        // Get the next aligned frame
+        hr = IAudioClient_GetBufferSize(audioClient, &frames);
+		if (hr != S_OK)
+		{
+			LogHostError(hr);
+			goto done;
+		}
+
+		PRINT(("WASAPI: CreateAudioClient: aligning buffer size to % frames\n", frames));
+
+        // Release the previous allocations
+        SAFE_RELEASE(audioClient);
+
+        // Create a new audio client
+        hr = IMMDevice_Activate(pInfo->device, &pa_IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&audioClient);
+    	if (hr != S_OK)
+		{
+			LogHostError(hr);
+			goto done;
+		}
+
+		// Get closest format
+		if ((error = GetClosestFormat(audioClient, sampleRate, params, pSub->shareMode, &pSub->wavex, output)) != paFormatIsSupported)
+		{
+			if (pa_error)
+				(*pa_error) = error;
+
+			LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT); // fail, format not supported
+			goto done;
+		}
+
+		// Check for Mono >> Stereo workaround
+		if ((params->channelCount == 1) && (pSub->wavex.Format.nChannels == 2))
+		{
+			/*if (blocking)
+			{
+				LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT);
+				goto done; // fail, blocking mode not supported
+			}*/
+
+			// Select mixer
+			pSub->monoMixer = _GetMonoToStereoMixer(WaveToPaFormat(&pSub->wavex), (pInfo->flow == eRender ? MIX_DIR__1TO2 : MIX_DIR__2TO1_L));
+			if (pSub->monoMixer == NULL)
+			{
+				LogHostError(hr = AUDCLNT_E_UNSUPPORTED_FORMAT);
+				goto done; // fail, no mixer for format
+			}
+		}
+
+		// Calculate period
+		pSub->period = MakeHnsPeriod(frames, pSub->wavex.Format.nSamplesPerSec);
+
+        // Open the stream and associate it with an audio session
+        hr = IAudioClient_Initialize(audioClient,
+            pSub->shareMode,
+            pSub->streamFlags,
+			pSub->period,
+			(pSub->shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? pSub->period : 0),
+            &pSub->wavex.Format,
+            NULL);
+    	if (hr != S_OK)
+		{
+			LogHostError(hr);
+			goto done;
+		}
+    }
+    else
+	if (hr != S_OK)
+    {
+		LogHostError(hr);
+		goto done;
+    }
+
+    // Set client
+	pSub->clientParent = audioClient;
+    IAudioClient_AddRef(pSub->clientParent);
+
+	// Recalculate buffers count
+	_RecalculateBuffersCount(pSub,
+		userFramesPerBuffer,
+		MakeFramesFromHns(pSub->period, pSub->wavex.Format.nSamplesPerSec),
+		fullDuplex);
+
+done:
+
+    // Clean up
+    SAFE_RELEASE(audioClient);
+    return hr;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError ActivateAudioClientOutput(PaWasapiStream *stream)
+{
+	HRESULT hr;
+	PaError result;
+
+	UINT32 maxBufferSize   = 0;
+	PaTime buffer_latency  = 0;
+	UINT32 framesPerBuffer = stream->out.params.frames_per_buffer;
+
+	// Create Audio client
+	hr = CreateAudioClient(stream, &stream->out, TRUE, &result);
+    if (hr != S_OK)
+	{
+		LogPaError(result = paInvalidDevice);
+		goto error;
+    }
+	LogWAVEFORMATEXTENSIBLE(&stream->out.wavex);
+
+	// Activate volume
+	stream->outVol = NULL;
+    /*hr = info->device->Activate(
+        __uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL,
+        (void**)&stream->outVol);
+    if (hr != S_OK)
+        return paInvalidDevice;*/
+
+    // Get max possible buffer size to check if it is not less than that we request
+    hr = IAudioClient_GetBufferSize(stream->out.clientParent, &maxBufferSize);
+    if (hr != S_OK)
+	{
+		LogHostError(hr);
+		LogPaError(result = paInvalidDevice);
+		goto error;
+	}
+
+    // Correct buffer to max size if it maxed out result of GetBufferSize
+	stream->out.bufferSize = maxBufferSize;
+
+	// Get interface latency (actually uneeded as we calculate latency from the size
+	// of maxBufferSize).
+    hr = IAudioClient_GetStreamLatency(stream->out.clientParent, &stream->out.deviceLatency);
+    if (hr != S_OK)
+	{
+		LogHostError(hr);
+		LogPaError(result = paInvalidDevice);
+		goto error;
+	}
+	//stream->out.latencySeconds = nano100ToSeconds(stream->out.deviceLatency);
+
+    // Number of frames that are required at each period
+	stream->out.framesPerHostCallback = maxBufferSize;
+
+	// Calculate frames per single buffer, if buffers > 1 then always framesPerBuffer
+	stream->out.framesPerBuffer =
+		(stream->out.userBufferAndHostMatch ? stream->out.framesPerHostCallback : framesPerBuffer);
+
+	// Calculate buffer latency
+	buffer_latency = (PaTime)maxBufferSize / stream->out.wavex.Format.nSamplesPerSec;
+
+	// Append buffer latency to interface latency in shared mode (see GetStreamLatency notes)
+	stream->out.latencySeconds = buffer_latency;
+
+	PRINT(("WASAPI::OpenStream(output): framesPerUser[ %d ] framesPerHost[ %d ] latency[ %.02fms ] exclusive[ %s ] wow64_fix[ %s ] mode[ %s ]\n", (UINT32)framesPerBuffer, (UINT32)stream->out.framesPerHostCallback, (float)(stream->out.latencySeconds*1000.0f), (stream->out.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? "YES" : "NO"), (stream->out.params.wow64_workaround ? "YES" : "NO"), (stream->out.streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK ? "EVENT" : "POLL")));
+
+	return paNoError;
+
+error:
+
+	return result;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError ActivateAudioClientInput(PaWasapiStream *stream)
+{
+	HRESULT hr;
+	PaError result;
+
+	UINT32 maxBufferSize   = 0;
+	PaTime buffer_latency  = 0;
+	UINT32 framesPerBuffer = stream->in.params.frames_per_buffer;
+
+	// Create Audio client
+	hr = CreateAudioClient(stream, &stream->in, FALSE, &result);
+    if (hr != S_OK)
+	{
+		LogPaError(result = paInvalidDevice);
+		goto error;
+    }
+	LogWAVEFORMATEXTENSIBLE(&stream->in.wavex);
+
+	// Create volume mgr
+	stream->inVol = NULL;
+    /*hr = info->device->Activate(
+        __uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL,
+        (void**)&stream->inVol);
+    if (hr != S_OK)
+        return paInvalidDevice;*/
+
+    // Get max possible buffer size to check if it is not less than that we request
+    hr = IAudioClient_GetBufferSize(stream->in.clientParent, &maxBufferSize);
+    if (hr != S_OK)
+	{
+		LogHostError(hr);
+		LogPaError(result = paInvalidDevice);
+		goto error;
+	}
+
+    // Correct buffer to max size if it maxed out result of GetBufferSize
+	stream->in.bufferSize = maxBufferSize;
+
+	// Get interface latency (actually uneeded as we calculate latency from the size
+	// of maxBufferSize).
+    hr = IAudioClient_GetStreamLatency(stream->in.clientParent, &stream->in.deviceLatency);
+    if (hr != S_OK)
+	{
+		LogHostError(hr);
+		LogPaError(result = paInvalidDevice);
+		goto error;
+	}
+	//stream->in.latencySeconds = nano100ToSeconds(stream->in.deviceLatency);
+
+    // Number of frames that are required at each period
+	stream->in.framesPerHostCallback = maxBufferSize;
+
+	// Calculate frames per single buffer, if buffers > 1 then always framesPerBuffer
+	stream->in.framesPerBuffer =
+		(stream->in.userBufferAndHostMatch ? stream->in.framesPerHostCallback : framesPerBuffer);
+
+	// Calculate buffer latency
+	buffer_latency = (PaTime)maxBufferSize / stream->in.wavex.Format.nSamplesPerSec;
+
+	// Append buffer latency to interface latency in shared mode (see GetStreamLatency notes)
+	stream->in.latencySeconds = buffer_latency;
+
+	PRINT(("WASAPI::OpenStream(input): framesPerUser[ %d ] framesPerHost[ %d ] latency[ %.02fms ] exclusive[ %s ] wow64_fix[ %s ] mode[ %s ]\n", (UINT32)framesPerBuffer, (UINT32)stream->in.framesPerHostCallback, (float)(stream->in.latencySeconds*1000.0f), (stream->in.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? "YES" : "NO"), (stream->in.params.wow64_workaround ? "YES" : "NO"), (stream->in.streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK ? "EVENT" : "POLL")));
+
+	return paNoError;
+
+error:
+
+	return result;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+	HRESULT hr;
+    PaWasapiHostApiRepresentation *paWasapi = (PaWasapiHostApiRepresentation*)hostApi;
+    PaWasapiStream *stream = NULL;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+	PaWasapiStreamInfo *inputStreamInfo = NULL, *outputStreamInfo = NULL;
+	PaWasapiDeviceInfo *info = NULL;
+	ULONG framesPerHostCallback;
+	PaUtilHostBufferSizeMode bufferMode;
+	const BOOL fullDuplex = ((inputParameters != NULL) && (outputParameters != NULL));
+
+	// validate PaStreamParameters
+	if ((result = IsStreamParamsValid(hostApi, inputParameters, outputParameters, sampleRate)) != paNoError)
+		return LogPaError(result);
+
+    // Validate platform specific flags
+    if ((streamFlags & paPlatformSpecificFlags) != 0)
+	{
+		LogPaError(result = paInvalidFlag); /* unexpected platform specific flag */
+		goto error;
+	}
+
+	// Allocate memory for PaWasapiStream
+    if ((stream = (PaWasapiStream *)PaUtil_AllocateMemory(sizeof(PaWasapiStream))) == NULL)
+	{
+        LogPaError(result = paInsufficientMemory);
+        goto error;
+    }
+
+	// Default thread priority is Audio: for exclusive mode we will use Pro Audio.
+	stream->nThreadPriority = eThreadPriorityAudio;
+
+	// Set default number of frames: paFramesPerBufferUnspecified
+	if (framesPerBuffer == paFramesPerBufferUnspecified)
+	{
+		UINT32 framesPerBufferIn  = 0, framesPerBufferOut = 0;
+		if (inputParameters != NULL)
+		{
+			info = &paWasapi->devInfo[inputParameters->device];
+			framesPerBufferIn = MakeFramesFromHns(info->DefaultDevicePeriod, (UINT32)sampleRate);
+		}
+		if (outputParameters != NULL)
+		{
+			info = &paWasapi->devInfo[outputParameters->device];
+			framesPerBufferOut = MakeFramesFromHns(info->DefaultDevicePeriod, (UINT32)sampleRate);
+		}
+		// choosing maximum default size
+		framesPerBuffer = max(framesPerBufferIn, framesPerBufferOut);
+	}
+	if (framesPerBuffer == 0)
+		framesPerBuffer = ((UINT32)sampleRate / 100) * 2;
+
+	// Try create device: Input
+	if (inputParameters != NULL)
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+		inputStreamInfo   = (PaWasapiStreamInfo *)inputParameters->hostApiSpecificStreamInfo;
+        info              = &paWasapi->devInfo[inputParameters->device];
+		stream->in.flags  = (inputStreamInfo ? inputStreamInfo->flags : 0);
+
+		// Select Exclusive/Shared mode
+		stream->in.shareMode = AUDCLNT_SHAREMODE_SHARED;
+        if ((inputStreamInfo != NULL) && (inputStreamInfo->flags & paWinWasapiExclusive))
+		{
+			// Boost thread priority
+			stream->nThreadPriority = eThreadPriorityProAudio;
+			// Make Exclusive
+			stream->in.shareMode = AUDCLNT_SHAREMODE_EXCLUSIVE;
+		}
+
+		// If user provided explicit thread priority level, use it
+        if ((inputStreamInfo != NULL) && (inputStreamInfo->flags & paWinWasapiThreadPriority))
+		{
+			if ((inputStreamInfo->threadPriority > eThreadPriorityNone) &&
+				(inputStreamInfo->threadPriority <= eThreadPriorityWindowManager))
+				stream->nThreadPriority = inputStreamInfo->threadPriority;
+		}
+
+		// Choose processing mode
+		stream->in.streamFlags = (stream->in.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? AUDCLNT_STREAMFLAGS_EVENTCALLBACK : 0);
+		if (paWasapi->useWOW64Workaround)
+			stream->in.streamFlags = 0; // polling interface
+		else
+		if (streamCallback == NULL)
+			stream->in.streamFlags = 0; // polling interface
+		else
+		if ((inputStreamInfo != NULL) && (inputStreamInfo->flags & paWinWasapiPolling))
+			stream->in.streamFlags = 0; // polling interface
+		else
+		if (fullDuplex)
+			stream->in.streamFlags = 0; // polling interface is implemented for full-duplex mode also
+
+		// Fill parameters for Audio Client creation
+		stream->in.params.device_info       = info;
+		stream->in.params.stream_params     = (*inputParameters);
+		if (inputStreamInfo != NULL)
+		{
+			stream->in.params.wasapi_params = (*inputStreamInfo);
+			stream->in.params.stream_params.hostApiSpecificStreamInfo = &stream->in.params.wasapi_params;
+		}
+		stream->in.params.frames_per_buffer = framesPerBuffer;
+		stream->in.params.sample_rate       = sampleRate;
+		stream->in.params.blocking          = (streamCallback == NULL);
+		stream->in.params.full_duplex       = fullDuplex;
+		stream->in.params.wow64_workaround  = paWasapi->useWOW64Workaround;
+
+		// Create and activate audio client
+		hr = ActivateAudioClientInput(stream);
+        if (hr != S_OK)
+		{
+			LogPaError(result = paInvalidDevice);
+			goto error;
+        }
+
+		// Get closest format
+        hostInputSampleFormat = PaUtil_SelectClosestAvailableFormat( WaveToPaFormat(&stream->in.wavex), inputSampleFormat );
+
+        // Set user-side custom host processor
+        if ((inputStreamInfo != NULL) &&
+            (inputStreamInfo->flags & paWinWasapiRedirectHostProcessor))
+        {
+            stream->hostProcessOverrideInput.processor = inputStreamInfo->hostProcessorInput;
+            stream->hostProcessOverrideInput.userData = userData;
+        }
+
+		// Only get IAudioCaptureClient input once here instead of getting it at multiple places based on the use
+		hr = IAudioClient_GetService(stream->in.clientParent, &pa_IID_IAudioCaptureClient, (void **)&stream->captureClientParent);
+		if (hr != S_OK)
+		{
+			LogHostError(hr);
+			LogPaError(result = paUnanticipatedHostError);
+			goto error;
+		}
+
+		// Create ring buffer for blocking mode (It is needed because we fetch Input packets, not frames,
+		// and thus we have to save partial packet if such remains unread)
+		if (stream->in.params.blocking == TRUE)
+		{
+			UINT32 bufferFrames = ALIGN_NEXT_POW2((stream->in.framesPerHostCallback / WASAPI_PACKETS_PER_INPUT_BUFFER) * 2);
+			UINT32 frameSize    = stream->in.wavex.Format.nBlockAlign;
+
+			// buffer
+			if ((stream->in.tailBuffer = PaUtil_AllocateMemory(sizeof(PaUtilRingBuffer))) == NULL)
+			{
+				LogPaError(result = paInsufficientMemory);
+				goto error;
+			}
+			memset(stream->in.tailBuffer, 0, sizeof(PaUtilRingBuffer));
+
+			// buffer memory region
+			stream->in.tailBufferMemory = PaUtil_AllocateMemory(frameSize * bufferFrames);
+			if (stream->in.tailBufferMemory == NULL)
+			{
+				LogPaError(result = paInsufficientMemory);
+				goto error;
+			}
+
+			// initialize
+			if (PaUtil_InitializeRingBuffer(stream->in.tailBuffer, frameSize, bufferFrames,	stream->in.tailBufferMemory) != 0)
+			{
+				LogPaError(result = paInternalError);
+				goto error;
+			}
+		}
+	}
+    else
+    {
+        inputChannelCount = 0;
+        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
+    }
+
+	// Try create device: Output
+    if (outputParameters != NULL)
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+		outputStreamInfo   = (PaWasapiStreamInfo *)outputParameters->hostApiSpecificStreamInfo;
+		info               = &paWasapi->devInfo[outputParameters->device];
+		stream->out.flags  = (outputStreamInfo ? outputStreamInfo->flags : 0);
+
+		// Select Exclusive/Shared mode
+		stream->out.shareMode = AUDCLNT_SHAREMODE_SHARED;
+        if ((outputStreamInfo != NULL) && (outputStreamInfo->flags & paWinWasapiExclusive))
+		{
+			// Boost thread priority
+			stream->nThreadPriority = eThreadPriorityProAudio;
+			// Make Exclusive
+			stream->out.shareMode = AUDCLNT_SHAREMODE_EXCLUSIVE;
+		}
+
+		// If user provided explicit thread priority level, use it
+        if ((outputStreamInfo != NULL) && (outputStreamInfo->flags & paWinWasapiThreadPriority))
+		{
+			if ((outputStreamInfo->threadPriority > eThreadPriorityNone) &&
+				(outputStreamInfo->threadPriority <= eThreadPriorityWindowManager))
+				stream->nThreadPriority = outputStreamInfo->threadPriority;
+		}
+
+		// Choose processing mode
+		stream->out.streamFlags = (stream->out.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE ? AUDCLNT_STREAMFLAGS_EVENTCALLBACK : 0);
+		if (paWasapi->useWOW64Workaround)
+			stream->out.streamFlags = 0; // polling interface
+		else
+		if (streamCallback == NULL)
+			stream->out.streamFlags = 0; // polling interface
+		else
+		if ((outputStreamInfo != NULL) && (outputStreamInfo->flags & paWinWasapiPolling))
+			stream->out.streamFlags = 0; // polling interface
+		else
+		if (fullDuplex)
+			stream->out.streamFlags = 0; // polling interface is implemented for full-duplex mode also
+
+		// Fill parameters for Audio Client creation
+		stream->out.params.device_info       = info;
+		stream->out.params.stream_params     = (*outputParameters);
+		if (inputStreamInfo != NULL)
+		{
+			stream->out.params.wasapi_params = (*outputStreamInfo);
+			stream->out.params.stream_params.hostApiSpecificStreamInfo = &stream->out.params.wasapi_params;
+		}
+		stream->out.params.frames_per_buffer = framesPerBuffer;
+		stream->out.params.sample_rate       = sampleRate;
+		stream->out.params.blocking          = (streamCallback == NULL);
+		stream->out.params.full_duplex       = fullDuplex;
+		stream->out.params.wow64_workaround  = paWasapi->useWOW64Workaround;
+
+		// Create and activate audio client
+		hr = ActivateAudioClientOutput(stream);
+        if (hr != S_OK)
+		{
+			LogPaError(result = paInvalidDevice);
+			goto error;
+        }
+
+		// Get closest format
+        hostOutputSampleFormat = PaUtil_SelectClosestAvailableFormat( WaveToPaFormat(&stream->out.wavex), outputSampleFormat );
+
+        // Set user-side custom host processor
+        if ((outputStreamInfo != NULL) &&
+            (outputStreamInfo->flags & paWinWasapiRedirectHostProcessor))
+        {
+            stream->hostProcessOverrideOutput.processor = outputStreamInfo->hostProcessorOutput;
+            stream->hostProcessOverrideOutput.userData = userData;
+        }
+
+		// Only get IAudioCaptureClient output once here instead of getting it at multiple places based on the use
+		hr = IAudioClient_GetService(stream->out.clientParent, &pa_IID_IAudioRenderClient, (void **)&stream->renderClientParent);
+		if (hr != S_OK)
+		{
+			LogHostError(hr);
+			LogPaError(result = paUnanticipatedHostError);
+			goto error;
+		}
+	}
+    else
+    {
+        outputChannelCount = 0;
+        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
+    }
+
+	// log full-duplex
+	if (fullDuplex)
+		PRINT(("WASAPI::OpenStream: full-duplex mode\n"));
+
+	// paWinWasapiPolling must be on/or not on both streams
+	if ((inputParameters != NULL) && (outputParameters != NULL))
+	{
+		if ((inputStreamInfo != NULL) && (outputStreamInfo != NULL))
+		{
+			if (((inputStreamInfo->flags & paWinWasapiPolling) &&
+				!(outputStreamInfo->flags & paWinWasapiPolling))
+				||
+				(!(inputStreamInfo->flags & paWinWasapiPolling) &&
+				 (outputStreamInfo->flags & paWinWasapiPolling)))
+			{
+				LogPaError(result = paInvalidFlag);
+				goto error;
+			}
+		}
+	}
+
+	// Initialize stream representation
+    if (streamCallback)
+    {
+		stream->bBlocking = FALSE;
+        PaUtil_InitializeStreamRepresentation(&stream->streamRepresentation,
+                                              &paWasapi->callbackStreamInterface,
+											  streamCallback, userData);
+    }
+    else
+    {
+		stream->bBlocking = TRUE;
+        PaUtil_InitializeStreamRepresentation(&stream->streamRepresentation,
+                                              &paWasapi->blockingStreamInterface,
+											  streamCallback, userData);
+    }
+
+	// Initialize CPU measurer
+    PaUtil_InitializeCpuLoadMeasurer(&stream->cpuLoadMeasurer, sampleRate);
+
+	if (outputParameters && inputParameters)
+	{
+		// serious problem #1 - No, Not a problem, especially concerning Exclusive mode.
+		// Input device in exclusive mode somehow is getting large buffer always, thus we
+		// adjust Output latency to reflect it, thus period will differ but playback will be
+		// normal.
+		/*if (stream->in.period != stream->out.period)
+		{
+			PRINT(("WASAPI: OpenStream: period discrepancy\n"));
+			LogPaError(result = paBadIODeviceCombination);
+			goto error;
+		}*/
+
+		// serious problem #2 - No, Not a problem, as framesPerHostCallback take into account
+		// sample size while it is not a problem for PA full-duplex, we must care of
+		// preriod only!
+		/*if (stream->out.framesPerHostCallback != stream->in.framesPerHostCallback)
+		{
+			PRINT(("WASAPI: OpenStream: framesPerHostCallback discrepancy\n"));
+			goto error;
+		}*/
+	}
+
+	// Calculate frames per host for processor
+	framesPerHostCallback = (outputParameters ? stream->out.framesPerBuffer : stream->in.framesPerBuffer);
+
+	// Choose correct mode of buffer processing:
+	// Exclusive/Shared non paWinWasapiPolling mode: paUtilFixedHostBufferSize - always fixed
+	// Exclusive/Shared paWinWasapiPolling mode: paUtilBoundedHostBufferSize - may vary for Exclusive or Full-duplex
+	bufferMode = paUtilFixedHostBufferSize;
+	if (inputParameters) // !!! WASAPI IAudioCaptureClient::GetBuffer extracts not number of frames but 1 packet, thus we always must adapt
+		bufferMode = paUtilBoundedHostBufferSize;
+	else
+	if (outputParameters)
+	{
+		if ((stream->out.buffers == 1) &&
+			(!stream->out.streamFlags || ((stream->out.streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) == 0)))
+			bufferMode = paUtilBoundedHostBufferSize;
+	}
+	stream->bufferMode = bufferMode;
+
+    // Initialize buffer processor
+    result =  PaUtil_InitializeBufferProcessor(
+		&stream->bufferProcessor,
+        inputChannelCount,
+		inputSampleFormat,
+		hostInputSampleFormat,
+        outputChannelCount,
+		outputSampleFormat,
+		hostOutputSampleFormat,
+        sampleRate,
+		streamFlags,
+		framesPerBuffer,
+        framesPerHostCallback,
+		bufferMode,
+        streamCallback,
+		userData);
+    if (result != paNoError)
+	{
+		LogPaError(result);
+        goto error;
+	}
+
+	// Set Input latency
+    stream->streamRepresentation.streamInfo.inputLatency =
+            ((double)PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor) / sampleRate)
+			+ ((inputParameters)?stream->in.latencySeconds : 0);
+
+	// Set Output latency
+    stream->streamRepresentation.streamInfo.outputLatency =
+            ((double)PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor) / sampleRate)
+			+ ((outputParameters)?stream->out.latencySeconds : 0);
+
+	// Set SR
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+    (*s) = (PaStream *)stream;
+    return result;
+
+error:
+
+    if (stream != NULL)
+		CloseStream(stream);
+
+    return result;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+
+	// abort active stream
+	if (IsStreamActive(s))
+	{
+		result = AbortStream(s);
+	}
+
+    SAFE_RELEASE(stream->captureClientParent);
+    SAFE_RELEASE(stream->renderClientParent);
+    SAFE_RELEASE(stream->out.clientParent);
+    SAFE_RELEASE(stream->in.clientParent);
+	SAFE_RELEASE(stream->inVol);
+	SAFE_RELEASE(stream->outVol);
+
+	CloseHandle(stream->event[S_INPUT]);
+	CloseHandle(stream->event[S_OUTPUT]);
+
+	_StreamCleanup(stream);
+
+	PaWasapi_FreeMemory(stream->in.monoBuffer);
+	PaWasapi_FreeMemory(stream->out.monoBuffer);
+
+	PaUtil_FreeMemory(stream->in.tailBuffer);
+	PaUtil_FreeMemory(stream->in.tailBufferMemory);
+
+	PaUtil_FreeMemory(stream->out.tailBuffer);
+	PaUtil_FreeMemory(stream->out.tailBufferMemory);
+
+    PaUtil_TerminateBufferProcessor(&stream->bufferProcessor);
+    PaUtil_TerminateStreamRepresentation(&stream->streamRepresentation);
+    PaUtil_FreeMemory(stream);
+
+    return result;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT UnmarshalSubStreamComPointers(PaWasapiSubStream *substream) 
+{
+	HRESULT hResult = S_OK;
+	HRESULT hFirstBadResult = S_OK;
+	substream->clientProc = NULL;
+
+	// IAudioClient
+	hResult = CoGetInterfaceAndReleaseStream(substream->clientStream, &pa_IID_IAudioClient, (LPVOID*)&substream->clientProc);
+	substream->clientStream = NULL;
+	if (hResult != S_OK) 
+	{
+		hFirstBadResult = (hFirstBadResult == S_OK) ? hResult : hFirstBadResult;
+	}
+
+	return hFirstBadResult;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT UnmarshalStreamComPointers(PaWasapiStream *stream) 
+{
+	HRESULT hResult = S_OK;
+	HRESULT hFirstBadResult = S_OK;
+	stream->captureClient = NULL;
+	stream->renderClient = NULL;
+	stream->in.clientProc = NULL;
+	stream->out.clientProc = NULL;
+
+	if (NULL != stream->in.clientParent) 
+	{
+		// SubStream pointers
+		hResult = UnmarshalSubStreamComPointers(&stream->in);
+		if (hResult != S_OK) 
+		{
+			hFirstBadResult = (hFirstBadResult == S_OK) ? hResult : hFirstBadResult;
+		}
+
+		// IAudioCaptureClient
+		hResult = CoGetInterfaceAndReleaseStream(stream->captureClientStream, &pa_IID_IAudioCaptureClient, (LPVOID*)&stream->captureClient);
+		stream->captureClientStream = NULL;
+		if (hResult != S_OK) 
+		{
+			hFirstBadResult = (hFirstBadResult == S_OK) ? hResult : hFirstBadResult;
+		}
+	}
+
+	if (NULL != stream->out.clientParent) 
+	{
+		// SubStream pointers
+		hResult = UnmarshalSubStreamComPointers(&stream->out);
+		if (hResult != S_OK) 
+		{
+			hFirstBadResult = (hFirstBadResult == S_OK) ? hResult : hFirstBadResult;
+		}
+
+		// IAudioRenderClient
+		hResult = CoGetInterfaceAndReleaseStream(stream->renderClientStream, &pa_IID_IAudioRenderClient, (LPVOID*)&stream->renderClient);
+		stream->renderClientStream = NULL;
+		if (hResult != S_OK) 
+		{
+			hFirstBadResult = (hFirstBadResult == S_OK) ? hResult : hFirstBadResult;
+		}
+	}
+
+	return hFirstBadResult;
+}
+
+// -----------------------------------------------------------------------------------------
+void ReleaseUnmarshaledSubComPointers(PaWasapiSubStream *substream) 
+{
+	SAFE_RELEASE(substream->clientProc);
+}
+
+// -----------------------------------------------------------------------------------------
+void ReleaseUnmarshaledComPointers(PaWasapiStream *stream) 
+{
+	// Release AudioClient services first
+	SAFE_RELEASE(stream->captureClient);
+	SAFE_RELEASE(stream->renderClient);
+
+	// Release AudioClients
+	ReleaseUnmarshaledSubComPointers(&stream->in);
+	ReleaseUnmarshaledSubComPointers(&stream->out);
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT MarshalSubStreamComPointers(PaWasapiSubStream *substream) 
+{
+	HRESULT hResult;
+	substream->clientStream = NULL;
+
+	// IAudioClient
+	hResult = CoMarshalInterThreadInterfaceInStream(&pa_IID_IAudioClient, (LPUNKNOWN)substream->clientParent, &substream->clientStream);
+	if (hResult != S_OK)
+		goto marshal_sub_error;
+
+	return hResult;
+
+	// If marshaling error occurred, make sure to release everything.
+marshal_sub_error:
+
+	UnmarshalSubStreamComPointers(substream);
+	ReleaseUnmarshaledSubComPointers(substream);
+	return hResult;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT MarshalStreamComPointers(PaWasapiStream *stream) 
+{
+	HRESULT hResult = S_OK;
+	stream->captureClientStream = NULL;
+	stream->in.clientStream = NULL;
+	stream->renderClientStream = NULL;
+	stream->out.clientStream = NULL;
+
+	if (NULL != stream->in.clientParent) 
+	{
+		// SubStream pointers
+		hResult = MarshalSubStreamComPointers(&stream->in);
+		if (hResult != S_OK) 
+			goto marshal_error;
+
+		// IAudioCaptureClient
+		hResult = CoMarshalInterThreadInterfaceInStream(&pa_IID_IAudioCaptureClient, (LPUNKNOWN)stream->captureClientParent, &stream->captureClientStream);
+		if (hResult != S_OK) 
+			goto marshal_error;
+	}
+
+	if (NULL != stream->out.clientParent) 
+	{
+		// SubStream pointers
+		hResult = MarshalSubStreamComPointers(&stream->out);
+		if (hResult != S_OK) 
+			goto marshal_error;
+
+		// IAudioRenderClient
+		hResult = CoMarshalInterThreadInterfaceInStream(&pa_IID_IAudioRenderClient, (LPUNKNOWN)stream->renderClientParent, &stream->renderClientStream);
+		if (hResult != S_OK) 
+			goto marshal_error;
+	}
+
+	return hResult;
+
+	// If marshaling error occurred, make sure to release everything.
+marshal_error:
+
+	UnmarshalStreamComPointers(stream);
+	ReleaseUnmarshaledComPointers(stream);
+	return hResult;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError StartStream( PaStream *s )
+{
+	HRESULT hr;
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+	PaError result = paNoError;
+
+	// check if stream is active already
+	if (IsStreamActive(s))
+		return paStreamIsNotStopped;
+
+    PaUtil_ResetBufferProcessor(&stream->bufferProcessor);
+
+	// Cleanup handles (may be necessary if stream was stopped by itself due to error)
+	_StreamCleanup(stream);
+
+	// Create close event
+	if ((stream->hCloseRequest = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) 
+	{
+		result = paInsufficientMemory;
+		goto start_error;
+	}
+
+	// Create thread
+	if (!stream->bBlocking)
+	{
+		// Create thread events
+		stream->hThreadStart = CreateEvent(NULL, TRUE, FALSE, NULL);
+		stream->hThreadExit  = CreateEvent(NULL, TRUE, FALSE, NULL);
+		if ((stream->hThreadStart == NULL) || (stream->hThreadExit == NULL))
+		{
+			result = paInsufficientMemory;
+			goto start_error;
+		}
+
+		// Marshal WASAPI interface pointers for safe use in thread created below.
+		if ((hr = MarshalStreamComPointers(stream)) != S_OK) 
+		{
+			PRINT(("Failed marshaling stream COM pointers."));
+			result = paUnanticipatedHostError;
+			goto nonblocking_start_error;
+		}
+
+		if ((stream->in.clientParent  && (stream->in.streamFlags  & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) ||
+			(stream->out.clientParent && (stream->out.streamFlags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)))
+		{
+			if ((stream->hThread = CREATE_THREAD(ProcThreadEvent)) == NULL) 
+			{
+				PRINT(("Failed creating thread: ProcThreadEvent."));
+				result = paUnanticipatedHostError;
+				goto nonblocking_start_error;
+			}
+		}
+		else
+		{
+			if ((stream->hThread = CREATE_THREAD(ProcThreadPoll)) == NULL) 
+			{
+				PRINT(("Failed creating thread: ProcThreadPoll."));
+				result = paUnanticipatedHostError;
+				goto nonblocking_start_error;
+			}
+		}
+
+		// Wait for thread to start
+		if (WaitForSingleObject(stream->hThreadStart, 60*1000) == WAIT_TIMEOUT) 
+		{
+			PRINT(("Failed starting thread: timeout."));
+			result = paUnanticipatedHostError;
+			goto nonblocking_start_error;
+		}
+	}
+	else
+	{
+		// Create blocking operation events (non-signaled event means - blocking operation is pending)
+		if (stream->out.clientParent != NULL) 
+		{
+			if ((stream->hBlockingOpStreamWR = CreateEvent(NULL, TRUE, TRUE, NULL)) == NULL) 
+			{
+				result = paInsufficientMemory;
+				goto start_error;
+			}
+		}
+		if (stream->in.clientParent != NULL) 
+		{
+			if ((stream->hBlockingOpStreamRD = CreateEvent(NULL, TRUE, TRUE, NULL)) == NULL) 
+			{
+				result = paInsufficientMemory;
+				goto start_error;
+			}
+		}
+
+		// Initialize event & start INPUT stream
+		if (stream->in.clientParent != NULL)
+		{
+			if ((hr = IAudioClient_Start(stream->in.clientParent)) != S_OK)
+			{
+				LogHostError(hr);
+				result = paUnanticipatedHostError;
+				goto start_error;
+			}
+		}
+
+		// Initialize event & start OUTPUT stream
+		if (stream->out.clientParent != NULL)
+		{
+			// Start
+			if ((hr = IAudioClient_Start(stream->out.clientParent)) != S_OK)
+			{
+				LogHostError(hr);
+				result = paUnanticipatedHostError;
+				goto start_error;
+			}
+		}
+
+		// Set parent to working pointers to use shared functions.
+		stream->captureClient  = stream->captureClientParent;
+		stream->renderClient   = stream->renderClientParent;
+		stream->in.clientProc  = stream->in.clientParent;
+		stream->out.clientProc = stream->out.clientParent;
+
+		// Signal: stream running.
+		stream->running = TRUE;
+	}
+
+    return result;
+
+nonblocking_start_error:
+
+	// Set hThreadExit event to prevent blocking during cleanup
+	SetEvent(stream->hThreadExit);
+	UnmarshalStreamComPointers(stream);
+	ReleaseUnmarshaledComPointers(stream);
+
+start_error:
+
+	StopStream(s);
+	return result;
+}
+
+// ------------------------------------------------------------------------------------------
+void _StreamFinish(PaWasapiStream *stream)
+{
+	// Issue command to thread to stop processing and wait for thread exit
+	if (!stream->bBlocking)
+	{
+		SignalObjectAndWait(stream->hCloseRequest, stream->hThreadExit, INFINITE, FALSE);
+	}
+	else
+	// Blocking mode does not own thread
+	{
+		// Signal close event and wait for each of 2 blocking operations to complete
+		if (stream->out.clientParent)
+			SignalObjectAndWait(stream->hCloseRequest, stream->hBlockingOpStreamWR, INFINITE, TRUE);
+		if (stream->out.clientParent)
+			SignalObjectAndWait(stream->hCloseRequest, stream->hBlockingOpStreamRD, INFINITE, TRUE);
+
+		// Process stop
+		_StreamOnStop(stream);
+	}
+
+	// Cleanup handles
+	_StreamCleanup(stream);
+
+    stream->running = FALSE;
+}
+
+// ------------------------------------------------------------------------------------------
+void _StreamCleanup(PaWasapiStream *stream)
+{
+	// Close thread handles to allow restart
+	SAFE_CLOSE(stream->hThread);
+	SAFE_CLOSE(stream->hThreadStart);
+	SAFE_CLOSE(stream->hThreadExit);
+	SAFE_CLOSE(stream->hCloseRequest);
+	SAFE_CLOSE(stream->hBlockingOpStreamRD);
+	SAFE_CLOSE(stream->hBlockingOpStreamWR);
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError StopStream( PaStream *s )
+{
+	// Finish stream
+	_StreamFinish((PaWasapiStream *)s);
+    return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError AbortStream( PaStream *s )
+{
+	// Finish stream
+	_StreamFinish((PaWasapiStream *)s);
+    return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError IsStreamStopped( PaStream *s )
+{
+	return !((PaWasapiStream *)s)->running;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError IsStreamActive( PaStream *s )
+{
+    return ((PaWasapiStream *)s)->running;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaTime GetStreamTime( PaStream *s )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+
+    return PaUtil_GetTime();
+}
+
+// ------------------------------------------------------------------------------------------
+static double GetStreamCpuLoad( PaStream* s )
+{
+	return PaUtil_GetCpuLoad(&((PaWasapiStream *)s)->cpuLoadMeasurer);
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError ReadStream( PaStream* s, void *_buffer, unsigned long frames )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+
+	HRESULT hr = S_OK;
+	BYTE *user_buffer = (BYTE *)_buffer;
+	BYTE *wasapi_buffer = NULL;
+	DWORD flags = 0;
+	UINT32 i, available, sleep = 0;
+	unsigned long processed;
+	ThreadIdleScheduler sched;
+
+	// validate
+	if (!stream->running)
+		return paStreamIsStopped;
+	if (stream->captureClient == NULL)
+		return paBadStreamPtr;
+
+	// Notify blocking op has begun
+	ResetEvent(stream->hBlockingOpStreamRD);
+
+	// Use thread scheduling for 500 microseconds (emulated) when wait time for frames is less than
+	// 1 milliseconds, emulation helps to normalize CPU consumption and avoids too busy waiting
+	ThreadIdleScheduler_Setup(&sched, 1, 250/* microseconds */);
+
+    // Make a local copy of the user buffer pointer(s), this is necessary
+	// because PaUtil_CopyOutput() advances these pointers every time it is called
+    if (!stream->bufferProcessor.userInputIsInterleaved)
+    {
+		user_buffer = (BYTE *)alloca(sizeof(BYTE *) * stream->bufferProcessor.inputChannelCount);
+        if (user_buffer == NULL)
+            return paInsufficientMemory;
+
+        for (i = 0; i < stream->bufferProcessor.inputChannelCount; ++i)
+            ((BYTE **)user_buffer)[i] = ((BYTE **)_buffer)[i];
+    }
+
+	// Findout if there are tail frames, flush them all before reading hardware
+	if ((available = PaUtil_GetRingBufferReadAvailable(stream->in.tailBuffer)) != 0)
+	{
+		ring_buffer_size_t buf1_size = 0, buf2_size = 0, read, desired;
+		void *buf1 = NULL, *buf2 = NULL;
+
+		// Limit desired to amount of requested frames
+		desired = available;
+		if (desired > frames)
+			desired = frames;
+		
+		// Get pointers to read regions
+		read = PaUtil_GetRingBufferReadRegions(stream->in.tailBuffer, desired, &buf1, &buf1_size, &buf2, &buf2_size);
+
+		if (buf1 != NULL)
+		{
+			// Register available frames to processor
+			PaUtil_SetInputFrameCount(&stream->bufferProcessor, buf1_size);
+
+			// Register host buffer pointer to processor
+			PaUtil_SetInterleavedInputChannels(&stream->bufferProcessor, 0, buf1, stream->bufferProcessor.inputChannelCount);
+
+			// Copy user data to host buffer (with conversion if applicable)
+			processed = PaUtil_CopyInput(&stream->bufferProcessor, (void **)&user_buffer, buf1_size);
+			frames -= processed;
+		}
+
+		if (buf2 != NULL)
+		{
+			// Register available frames to processor
+			PaUtil_SetInputFrameCount(&stream->bufferProcessor, buf2_size);
+
+			// Register host buffer pointer to processor
+			PaUtil_SetInterleavedInputChannels(&stream->bufferProcessor, 0, buf2, stream->bufferProcessor.inputChannelCount);
+
+			// Copy user data to host buffer (with conversion if applicable)
+			processed = PaUtil_CopyInput(&stream->bufferProcessor, (void **)&user_buffer, buf2_size);
+			frames -= processed;
+		}
+
+		// Advance
+		PaUtil_AdvanceRingBufferReadIndex(stream->in.tailBuffer, read);
+	}
+
+	// Read hardware
+	while (frames != 0)
+	{
+		// Check if blocking call must be interrupted
+		if (WaitForSingleObject(stream->hCloseRequest, sleep) != WAIT_TIMEOUT)
+			break;
+
+		// Get available frames (must be finding out available frames before call to IAudioCaptureClient_GetBuffer
+		// othervise audio glitches will occur inExclusive mode as it seems that WASAPI has some scheduling/
+		// processing problems when such busy polling with IAudioCaptureClient_GetBuffer occurs)
+		if ((hr = _PollGetInputFramesAvailable(stream, &available)) != S_OK)
+		{
+			LogHostError(hr);
+			return paUnanticipatedHostError;
+		}
+
+		// Wait for more frames to become available
+		if (available == 0)
+		{
+			// Exclusive mode may require latency of 1 millisecond, thus we shall sleep
+			// around 500 microseconds (emulated) to collect packets in time
+			if (stream->in.shareMode != AUDCLNT_SHAREMODE_EXCLUSIVE)
+			{
+				UINT32 sleep_frames = (frames < stream->in.framesPerHostCallback ? frames : stream->in.framesPerHostCallback);
+
+				sleep  = GetFramesSleepTime(sleep_frames, stream->in.wavex.Format.nSamplesPerSec);
+				sleep /= 4; // wait only for 1/4 of the buffer
+
+				// WASAPI input provides packets, thus expiring packet will result in bad audio
+				// limit waiting time to 2 seconds (will always work for smallest buffer in Shared)
+				if (sleep > 2)
+					sleep = 2;
+
+				// Avoid busy waiting, schedule next 1 millesecond wait
+				if (sleep == 0)
+					sleep = ThreadIdleScheduler_NextSleep(&sched);
+			}
+			else
+			{
+				if ((sleep = ThreadIdleScheduler_NextSleep(&sched)) != 0)
+				{
+					Sleep(sleep);
+					sleep = 0;
+				}
+			}
+
+			continue;
+		}
+
+		// Get the available data in the shared buffer.
+		if ((hr = IAudioCaptureClient_GetBuffer(stream->captureClient, &wasapi_buffer, &available, &flags, NULL, NULL)) != S_OK)
+		{
+			// Buffer size is too small, waiting
+			if (hr != AUDCLNT_S_BUFFER_EMPTY)
+			{
+				LogHostError(hr);
+				goto end;
+			}
+
+			continue;
+		}
+
+		// Register available frames to processor
+        PaUtil_SetInputFrameCount(&stream->bufferProcessor, available);
+
+		// Register host buffer pointer to processor
+        PaUtil_SetInterleavedInputChannels(&stream->bufferProcessor, 0, wasapi_buffer, stream->bufferProcessor.inputChannelCount);
+
+		// Copy user data to host buffer (with conversion if applicable)
+		processed = PaUtil_CopyInput(&stream->bufferProcessor, (void **)&user_buffer, frames);
+		frames -= processed;
+
+		// Save tail into buffer
+		if ((frames == 0) && (available > processed))
+		{
+			UINT32 bytes_processed = processed * stream->in.wavex.Format.nBlockAlign;
+			UINT32 frames_to_save  = available - processed;
+
+			PaUtil_WriteRingBuffer(stream->in.tailBuffer, wasapi_buffer + bytes_processed, frames_to_save);
+		}
+
+		// Release host buffer
+		if ((hr = IAudioCaptureClient_ReleaseBuffer(stream->captureClient, available)) != S_OK)
+		{
+			LogHostError(hr);
+			goto end;
+		}
+	}
+
+end:
+
+	// Notify blocking op has ended
+	SetEvent(stream->hBlockingOpStreamRD);
+
+	return (hr != S_OK ? paUnanticipatedHostError : paNoError);
+}
+
+// ------------------------------------------------------------------------------------------
+static PaError WriteStream( PaStream* s, const void *_buffer, unsigned long frames )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+
+	//UINT32 frames;
+	const BYTE *user_buffer = (const BYTE *)_buffer;
+	BYTE *wasapi_buffer;
+	HRESULT hr = S_OK;
+	UINT32 i, available, sleep = 0;
+	unsigned long processed;
+	ThreadIdleScheduler sched;
+
+	// validate
+	if (!stream->running)
+		return paStreamIsStopped;
+	if (stream->renderClient == NULL)
+		return paBadStreamPtr;
+
+	// Notify blocking op has begun
+	ResetEvent(stream->hBlockingOpStreamWR);
+
+	// Use thread scheduling for 500 microseconds (emulated) when wait time for frames is less than
+	// 1 milliseconds, emulation helps to normalize CPU consumption and avoids too busy waiting
+	ThreadIdleScheduler_Setup(&sched, 1, 500/* microseconds */);
+
+    // Make a local copy of the user buffer pointer(s), this is necessary
+	// because PaUtil_CopyOutput() advances these pointers every time it is called
+    if (!stream->bufferProcessor.userOutputIsInterleaved)
+    {
+        user_buffer = (const BYTE *)alloca(sizeof(const BYTE *) * stream->bufferProcessor.outputChannelCount);
+        if (user_buffer == NULL)
+            return paInsufficientMemory;
+
+        for (i = 0; i < stream->bufferProcessor.outputChannelCount; ++i)
+            ((const BYTE **)user_buffer)[i] = ((const BYTE **)_buffer)[i];
+    }
+
+	// Blocking (potentially, untill 'frames' are consumed) loop
+	while (frames != 0)
+	{
+		// Check if blocking call must be interrupted
+		if (WaitForSingleObject(stream->hCloseRequest, sleep) != WAIT_TIMEOUT)
+			break;
+
+		// Get frames available
+		if ((hr = _PollGetOutputFramesAvailable(stream, &available)) != S_OK)
+		{
+			LogHostError(hr);
+			goto end;
+		}
+
+		// Wait for more frames to become available
+		if (available == 0)
+		{
+			UINT32 sleep_frames = (frames < stream->out.framesPerHostCallback ? frames : stream->out.framesPerHostCallback);
+
+			sleep  = GetFramesSleepTime(sleep_frames, stream->out.wavex.Format.nSamplesPerSec);
+			sleep /= 2; // wait only for half of the buffer
+
+			// Avoid busy waiting, schedule next 1 millesecond wait
+			if (sleep == 0)
+				sleep = ThreadIdleScheduler_NextSleep(&sched);
+
+			continue;
+		}
+
+		// Keep in 'frmaes' range
+		if (available > frames)
+			available = frames;
+
+		// Get pointer to host buffer
+		if ((hr = IAudioRenderClient_GetBuffer(stream->renderClient, available, &wasapi_buffer)) != S_OK)
+		{
+			// Buffer size is too big, waiting
+			if (hr == AUDCLNT_E_BUFFER_TOO_LARGE)
+				continue;
+
+			LogHostError(hr);
+			goto end;
+		}
+
+		// Keep waiting again (on Vista it was noticed that WASAPI could SOMETIMES return NULL pointer 
+		// to buffer without returning AUDCLNT_E_BUFFER_TOO_LARGE instead)
+		if (wasapi_buffer == NULL)
+			continue;
+
+		// Register available frames to processor
+        PaUtil_SetOutputFrameCount(&stream->bufferProcessor, available);
+
+		// Register host buffer pointer to processor
+        PaUtil_SetInterleavedOutputChannels(&stream->bufferProcessor, 0, wasapi_buffer,	stream->bufferProcessor.outputChannelCount);
+
+		// Copy user data to host buffer (with conversion if applicable), this call will advance
+		// pointer 'user_buffer' to consumed portion of data
+		processed = PaUtil_CopyOutput(&stream->bufferProcessor, (const void **)&user_buffer, frames);
+		frames -= processed;
+
+		// Release host buffer
+		if ((hr = IAudioRenderClient_ReleaseBuffer(stream->renderClient, available, 0)) != S_OK)
+		{
+			LogHostError(hr);
+			goto end;
+		}
+	}
+
+end:
+
+	// Notify blocking op has ended
+	SetEvent(stream->hBlockingOpStreamWR);
+
+	return (hr != S_OK ? paUnanticipatedHostError : paNoError);
+}
+
+unsigned long PaUtil_GetOutputFrameCount( PaUtilBufferProcessor* bp )
+{
+	return bp->hostOutputFrameCount[0];
+}
+
+// ------------------------------------------------------------------------------------------
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+
+	HRESULT hr;
+	UINT32  available = 0;
+
+	// validate
+	if (!stream->running)
+		return paStreamIsStopped;
+	if (stream->captureClient == NULL)
+		return paBadStreamPtr;
+
+	// available in hardware buffer
+	if ((hr = _PollGetInputFramesAvailable(stream, &available)) != S_OK)
+	{
+		LogHostError(hr);
+		return paUnanticipatedHostError;
+	}
+
+	// available in software tail buffer
+	available += PaUtil_GetRingBufferReadAvailable(stream->in.tailBuffer);
+
+    return available;
+}
+
+// ------------------------------------------------------------------------------------------
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)s;
+	HRESULT hr;
+	UINT32  available = 0;
+
+	// validate
+	if (!stream->running)
+		return paStreamIsStopped;
+	if (stream->renderClient == NULL)
+		return paBadStreamPtr;
+
+	if ((hr = _PollGetOutputFramesAvailable(stream, &available)) != S_OK)
+	{
+		LogHostError(hr);
+		return paUnanticipatedHostError;
+	}
+
+	return (signed long)available;
+}
+
+
+// ------------------------------------------------------------------------------------------
+static void WaspiHostProcessingLoop( void *inputBuffer,  long inputFrames,
+                                     void *outputBuffer, long outputFrames,
+                                     void *userData )
+{
+    PaWasapiStream *stream = (PaWasapiStream*)userData;
+    PaStreamCallbackTimeInfo timeInfo = {0,0,0};
+	PaStreamCallbackFlags flags = 0;
+    int callbackResult;
+    unsigned long framesProcessed;
+	HRESULT hr;
+	UINT32 pending;
+
+    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+    /*
+		Pa_GetStreamTime:
+            - generate timing information
+            - handle buffer slips
+    */
+	timeInfo.currentTime = PaUtil_GetTime();
+	// Query input latency
+	if (stream->in.clientProc != NULL)
+	{
+		PaTime pending_time;
+		if ((hr = IAudioClient_GetCurrentPadding(stream->in.clientProc, &pending)) == S_OK)
+			pending_time = (PaTime)pending / (PaTime)stream->in.wavex.Format.nSamplesPerSec;
+		else
+			pending_time = (PaTime)stream->in.latencySeconds;
+
+		timeInfo.inputBufferAdcTime = timeInfo.currentTime + pending_time;
+	}
+	// Query output current latency
+	if (stream->out.clientProc != NULL)
+	{
+		PaTime pending_time;
+		if ((hr = IAudioClient_GetCurrentPadding(stream->out.clientProc, &pending)) == S_OK)
+			pending_time = (PaTime)pending / (PaTime)stream->out.wavex.Format.nSamplesPerSec;
+		else
+			pending_time = (PaTime)stream->out.latencySeconds;
+
+		timeInfo.outputBufferDacTime = timeInfo.currentTime + pending_time;
+	}
+
+    /*
+        If you need to byte swap or shift inputBuffer to convert it into a
+        portaudio format, do it here.
+    */
+
+    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, flags );
+
+    /*
+        depending on whether the host buffers are interleaved, non-interleaved
+        or a mixture, you will want to call PaUtil_SetInterleaved*Channels(),
+        PaUtil_SetNonInterleaved*Channel() or PaUtil_Set*Channel() here.
+    */
+
+    if (stream->bufferProcessor.inputChannelCount > 0)
+    {
+        PaUtil_SetInputFrameCount( &stream->bufferProcessor, inputFrames );
+        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
+            0, /* first channel of inputBuffer is channel 0 */
+            inputBuffer,
+            0 ); /* 0 - use inputChannelCount passed to init buffer processor */
+    }
+
+    if (stream->bufferProcessor.outputChannelCount > 0)
+    {
+        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, outputFrames);
+        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
+            0, /* first channel of outputBuffer is channel 0 */
+            outputBuffer,
+            0 ); /* 0 - use outputChannelCount passed to init buffer processor */
+    }
+
+    /* you must pass a valid value of callback result to PaUtil_EndBufferProcessing()
+        in general you would pass paContinue for normal operation, and
+        paComplete to drain the buffer processor's internal output buffer.
+        You can check whether the buffer processor's output buffer is empty
+        using PaUtil_IsBufferProcessorOuputEmpty( bufferProcessor )
+    */
+    callbackResult = paContinue;
+    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+
+    /*
+        If you need to byte swap or shift outputBuffer to convert it to
+        host format, do it here.
+    */
+
+	PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+
+    if (callbackResult == paContinue)
+    {
+        /* nothing special to do */
+    }
+    else
+	if (callbackResult == paAbort)
+    {
+		// stop stream
+        SetEvent(stream->hCloseRequest);
+    }
+    else
+    {
+		// stop stream
+        SetEvent(stream->hCloseRequest);
+    }
+}
+
+// ------------------------------------------------------------------------------------------
+HANDLE MMCSS_activate(const char *name)
+{
+    DWORD task_idx = 0;
+    HANDLE hTask = pAvSetMmThreadCharacteristics(name, &task_idx);
+    if (hTask == NULL)
+	{
+        PRINT(("WASAPI: AvSetMmThreadCharacteristics failed!\n"));
+    }
+
+    /*BOOL priority_ok = pAvSetMmThreadPriority(hTask, AVRT_PRIORITY_NORMAL);
+    if (priority_ok == FALSE)
+	{
+        PRINT(("WASAPI: AvSetMmThreadPriority failed!\n"));
+    }*/
+
+	// debug
+    {
+        int    cur_priority		  = GetThreadPriority(GetCurrentThread());
+        DWORD  cur_priority_class = GetPriorityClass(GetCurrentProcess());
+		PRINT(("WASAPI: thread[ priority-0x%X class-0x%X ]\n", cur_priority, cur_priority_class));
+    }
+
+	return hTask;
+}
+
+// ------------------------------------------------------------------------------------------
+void MMCSS_deactivate(HANDLE hTask)
+{
+	if (!hTask)
+		return;
+
+	if (pAvRevertMmThreadCharacteristics(hTask) == FALSE)
+	{
+        PRINT(("WASAPI: AvRevertMmThreadCharacteristics failed!\n"));
+    }
+}
+
+// ------------------------------------------------------------------------------------------
+PaError PaWasapi_ThreadPriorityBoost(void **hTask, PaWasapiThreadPriority nPriorityClass)
+{
+	static const char *mmcs_name[] =
+	{
+		NULL,
+		"Audio",
+		"Capture",
+		"Distribution",
+		"Games",
+		"Playback",
+		"Pro Audio",
+		"Window Manager"
+	};
+	HANDLE task;
+
+	if (hTask == NULL)
+		return paUnanticipatedHostError;
+
+	if ((UINT32)nPriorityClass >= STATIC_ARRAY_SIZE(mmcs_name))
+		return paUnanticipatedHostError;
+
+	task = MMCSS_activate(mmcs_name[nPriorityClass]);
+	if (task == NULL)
+		return paUnanticipatedHostError;
+
+	(*hTask) = task;
+	return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+PaError PaWasapi_ThreadPriorityRevert(void *hTask)
+{
+	if (hTask == NULL)
+		return paUnanticipatedHostError;
+
+	MMCSS_deactivate((HANDLE)hTask);
+
+	return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+// Described at:
+// http://msdn.microsoft.com/en-us/library/dd371387(v=VS.85).aspx
+
+PaError PaWasapi_GetJackCount(PaDeviceIndex nDevice, int *jcount)
+{
+	PaError ret;
+	HRESULT hr = S_OK;
+	PaDeviceIndex index;
+    IDeviceTopology *pDeviceTopology = NULL;
+    IConnector *pConnFrom = NULL;
+    IConnector *pConnTo = NULL;
+    IPart *pPart = NULL;
+    IKsJackDescription *pJackDesc = NULL;
+	UINT jackCount = 0;
+
+	PaWasapiHostApiRepresentation *paWasapi = _GetHostApi(&ret);
+	if (paWasapi == NULL)
+		return paNotInitialized;
+
+	// Get device index.
+	ret = PaUtil_DeviceIndexToHostApiDeviceIndex(&index, nDevice, &paWasapi->inheritedHostApiRep);
+    if (ret != paNoError)
+        return ret;
+
+	// Validate index.
+	if ((UINT32)index >= paWasapi->deviceCount)
+		return paInvalidDevice;
+
+	// Get the endpoint device's IDeviceTopology interface.
+	hr = IMMDevice_Activate(paWasapi->devInfo[index].device, &pa_IID_IDeviceTopology,
+		CLSCTX_INPROC_SERVER, NULL, (void**)&pDeviceTopology);
+	IF_FAILED_JUMP(hr, error);
+
+    // The device topology for an endpoint device always contains just one connector (connector number 0).
+	hr = IDeviceTopology_GetConnector(pDeviceTopology, 0, &pConnFrom);
+	IF_FAILED_JUMP(hr, error);
+
+    // Step across the connection to the jack on the adapter.
+	hr = IConnector_GetConnectedTo(pConnFrom, &pConnTo);
+    if (HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+    {
+        // The adapter device is not currently active.
+        hr = E_NOINTERFACE;
+    }
+	IF_FAILED_JUMP(hr, error);
+
+	// Get the connector's IPart interface.
+	hr = IConnector_QueryInterface(pConnTo, &pa_IID_IPart, (void**)&pPart);
+	IF_FAILED_JUMP(hr, error);
+
+	// Activate the connector's IKsJackDescription interface.
+	hr = IPart_Activate(pPart, CLSCTX_INPROC_SERVER, &pa_IID_IKsJackDescription, (void**)&pJackDesc);
+	IF_FAILED_JUMP(hr, error);
+
+	// Return jack count for this device.
+	hr = IKsJackDescription_GetJackCount(pJackDesc, &jackCount);
+	IF_FAILED_JUMP(hr, error);
+
+	// Set.
+	(*jcount) = jackCount;
+
+	// Ok.
+	ret = paNoError;
+
+error:
+
+	SAFE_RELEASE(pDeviceTopology);
+	SAFE_RELEASE(pConnFrom);
+	SAFE_RELEASE(pConnTo);
+	SAFE_RELEASE(pPart);
+	SAFE_RELEASE(pJackDesc);
+
+	LogHostError(hr);
+	return paNoError;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaWasapiJackConnectionType ConvertJackConnectionTypeWASAPIToPA(int connType)
+{
+	switch (connType)
+	{
+		case eConnTypeUnknown:			return eJackConnTypeUnknown;
+#ifdef _KS_
+		case eConnType3Point5mm:		return eJackConnType3Point5mm;
+#else
+		case eConnTypeEighth:		    return eJackConnType3Point5mm;
+#endif
+		case eConnTypeQuarter:			return eJackConnTypeQuarter;
+		case eConnTypeAtapiInternal:	return eJackConnTypeAtapiInternal;
+		case eConnTypeRCA:				return eJackConnTypeRCA;
+		case eConnTypeOptical:			return eJackConnTypeOptical;
+		case eConnTypeOtherDigital:		return eJackConnTypeOtherDigital;
+		case eConnTypeOtherAnalog:		return eJackConnTypeOtherAnalog;
+		case eConnTypeMultichannelAnalogDIN: return eJackConnTypeMultichannelAnalogDIN;
+		case eConnTypeXlrProfessional:	return eJackConnTypeXlrProfessional;
+		case eConnTypeRJ11Modem:		return eJackConnTypeRJ11Modem;
+		case eConnTypeCombination:		return eJackConnTypeCombination;
+	}
+	return eJackConnTypeUnknown;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaWasapiJackGeoLocation ConvertJackGeoLocationWASAPIToPA(int geoLoc)
+{
+	switch (geoLoc)
+	{
+	case eGeoLocRear:				return eJackGeoLocRear;
+	case eGeoLocFront:				return eJackGeoLocFront;
+	case eGeoLocLeft:				return eJackGeoLocLeft;
+	case eGeoLocRight:				return eJackGeoLocRight;
+	case eGeoLocTop:				return eJackGeoLocTop;
+	case eGeoLocBottom:				return eJackGeoLocBottom;
+#ifdef _KS_
+	case eGeoLocRearPanel:			return eJackGeoLocRearPanel;
+#else
+	case eGeoLocRearOPanel:         return eJackGeoLocRearPanel;
+#endif
+	case eGeoLocRiser:				return eJackGeoLocRiser;
+	case eGeoLocInsideMobileLid:	return eJackGeoLocInsideMobileLid;
+	case eGeoLocDrivebay:			return eJackGeoLocDrivebay;
+	case eGeoLocHDMI:				return eJackGeoLocHDMI;
+	case eGeoLocOutsideMobileLid:	return eJackGeoLocOutsideMobileLid;
+	case eGeoLocATAPI:				return eJackGeoLocATAPI;
+	}
+	return eJackGeoLocUnk;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaWasapiJackGenLocation ConvertJackGenLocationWASAPIToPA(int genLoc)
+{
+	switch (genLoc)
+	{
+	case eGenLocPrimaryBox:	return eJackGenLocPrimaryBox;
+	case eGenLocInternal:	return eJackGenLocInternal;
+#ifdef _KS_
+	case eGenLocSeparate:	return eJackGenLocSeparate;
+#else
+	case eGenLocSeperate:	return eJackGenLocSeparate;
+#endif
+	case eGenLocOther:		return eJackGenLocOther;
+	}
+	return eJackGenLocPrimaryBox;
+}
+
+// ------------------------------------------------------------------------------------------
+static PaWasapiJackPortConnection ConvertJackPortConnectionWASAPIToPA(int portConn)
+{
+	switch (portConn)
+	{
+	case ePortConnJack:					return eJackPortConnJack;
+	case ePortConnIntegratedDevice:		return eJackPortConnIntegratedDevice;
+	case ePortConnBothIntegratedAndJack:return eJackPortConnBothIntegratedAndJack;
+	case ePortConnUnknown:				return eJackPortConnUnknown;
+	}
+	return eJackPortConnJack;
+}
+
+// ------------------------------------------------------------------------------------------
+// Described at:
+// http://msdn.microsoft.com/en-us/library/dd371387(v=VS.85).aspx
+
+PaError PaWasapi_GetJackDescription(PaDeviceIndex nDevice, int jindex, PaWasapiJackDescription *pJackDescription)
+{
+	PaError ret;
+	HRESULT hr = S_OK;
+	PaDeviceIndex index;
+    IDeviceTopology *pDeviceTopology = NULL;
+    IConnector *pConnFrom = NULL;
+    IConnector *pConnTo = NULL;
+    IPart *pPart = NULL;
+    IKsJackDescription *pJackDesc = NULL;
+	KSJACK_DESCRIPTION jack = { 0 };
+
+	PaWasapiHostApiRepresentation *paWasapi = _GetHostApi(&ret);
+	if (paWasapi == NULL)
+		return paNotInitialized;
+
+	// Get device index.
+	ret = PaUtil_DeviceIndexToHostApiDeviceIndex(&index, nDevice, &paWasapi->inheritedHostApiRep);
+    if (ret != paNoError)
+        return ret;
+
+	// Validate index.
+	if ((UINT32)index >= paWasapi->deviceCount)
+		return paInvalidDevice;
+
+	// Get the endpoint device's IDeviceTopology interface.
+	hr = IMMDevice_Activate(paWasapi->devInfo[index].device, &pa_IID_IDeviceTopology,
+		CLSCTX_INPROC_SERVER, NULL, (void**)&pDeviceTopology);
+	IF_FAILED_JUMP(hr, error);
+
+    // The device topology for an endpoint device always contains just one connector (connector number 0).
+	hr = IDeviceTopology_GetConnector(pDeviceTopology, 0, &pConnFrom);
+	IF_FAILED_JUMP(hr, error);
+
+    // Step across the connection to the jack on the adapter.
+	hr = IConnector_GetConnectedTo(pConnFrom, &pConnTo);
+    if (HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+    {
+        // The adapter device is not currently active.
+        hr = E_NOINTERFACE;
+    }
+	IF_FAILED_JUMP(hr, error);
+
+	// Get the connector's IPart interface.
+	hr = IConnector_QueryInterface(pConnTo, &pa_IID_IPart, (void**)&pPart);
+	IF_FAILED_JUMP(hr, error);
+
+	// Activate the connector's IKsJackDescription interface.
+	hr = IPart_Activate(pPart, CLSCTX_INPROC_SERVER, &pa_IID_IKsJackDescription, (void**)&pJackDesc);
+	IF_FAILED_JUMP(hr, error);
+
+	// Test to return jack description struct for index 0.
+	hr = IKsJackDescription_GetJackDescription(pJackDesc, jindex, &jack);
+	IF_FAILED_JUMP(hr, error);
+
+	// Convert WASAPI values to PA format.
+	pJackDescription->channelMapping = jack.ChannelMapping;
+	pJackDescription->color          = jack.Color;
+	pJackDescription->connectionType = ConvertJackConnectionTypeWASAPIToPA(jack.ConnectionType);
+	pJackDescription->genLocation    = ConvertJackGenLocationWASAPIToPA(jack.GenLocation);
+	pJackDescription->geoLocation    = ConvertJackGeoLocationWASAPIToPA(jack.GeoLocation);
+	pJackDescription->isConnected    = jack.IsConnected;
+	pJackDescription->portConnection = ConvertJackPortConnectionWASAPIToPA(jack.PortConnection);
+
+	// Ok.
+	ret = paNoError;
+
+error:
+
+	SAFE_RELEASE(pDeviceTopology);
+	SAFE_RELEASE(pConnFrom);
+	SAFE_RELEASE(pConnTo);
+	SAFE_RELEASE(pPart);
+	SAFE_RELEASE(pJackDesc);
+
+	LogHostError(hr);
+	return ret;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT _PollGetOutputFramesAvailable(PaWasapiStream *stream, UINT32 *available)
+{
+	HRESULT hr;
+	UINT32 frames  = stream->out.framesPerHostCallback,
+		   padding = 0;
+
+	(*available) = 0;
+
+	// get read position
+	if ((hr = IAudioClient_GetCurrentPadding(stream->out.clientProc, &padding)) != S_OK)
+		return LogHostError(hr);
+
+	// get available
+	frames -= padding;
+
+	// set
+	(*available) = frames;
+	return hr;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT _PollGetInputFramesAvailable(PaWasapiStream *stream, UINT32 *available)
+{
+	HRESULT hr;
+
+	(*available) = 0;
+
+	// GetCurrentPadding() has opposite meaning to Output stream 
+	if ((hr = IAudioClient_GetCurrentPadding(stream->in.clientProc, available)) != S_OK)
+		return LogHostError(hr);
+
+	return hr;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT ProcessOutputBuffer(PaWasapiStream *stream, PaWasapiHostProcessor *processor, UINT32 frames)
+{
+	HRESULT hr;
+	BYTE *data = NULL;
+
+	// Get buffer
+	if ((hr = IAudioRenderClient_GetBuffer(stream->renderClient, frames, &data)) != S_OK)
+	{
+		if (stream->out.shareMode == AUDCLNT_SHAREMODE_SHARED)
+		{
+			// Using GetCurrentPadding to overcome AUDCLNT_E_BUFFER_TOO_LARGE in
+			// shared mode results in no sound in Event-driven mode (MSDN does not
+			// document this, or is it WASAPI bug?), thus we better
+			// try to acquire buffer next time when GetBuffer allows to do so.
+#if 0
+			// Get Read position
+			UINT32 padding = 0;
+			hr = IAudioClient_GetCurrentPadding(stream->out.clientProc, &padding);
+			if (hr != S_OK)
+				return LogHostError(hr);
+
+			// Get frames to write
+			frames -= padding;
+			if (frames == 0)
+				return S_OK;
+
+			if ((hr = IAudioRenderClient_GetBuffer(stream->renderClient, frames, &data)) != S_OK)
+				return LogHostError(hr);
+#else
+			if (hr == AUDCLNT_E_BUFFER_TOO_LARGE)
+				return S_OK; // be silent in shared mode, try again next time
+#endif
+		}
+		else
+			return LogHostError(hr);
+	}
+
+	// Process data
+	if (stream->out.monoMixer != NULL)
+	{
+		// expand buffer
+		UINT32 mono_frames_size = frames * (stream->out.wavex.Format.wBitsPerSample / 8);
+		if (mono_frames_size > stream->out.monoBufferSize)
+			stream->out.monoBuffer = PaWasapi_ReallocateMemory(stream->out.monoBuffer, (stream->out.monoBufferSize = mono_frames_size));
+
+		// process
+		processor[S_OUTPUT].processor(NULL, 0, (BYTE *)stream->out.monoBuffer, frames, processor[S_OUTPUT].userData);
+
+		// mix 1 to 2 channels
+		stream->out.monoMixer(data, stream->out.monoBuffer, frames);
+	}
+	else
+	{
+		processor[S_OUTPUT].processor(NULL, 0, data, frames, processor[S_OUTPUT].userData);
+	}
+
+	// Release buffer
+	if ((hr = IAudioRenderClient_ReleaseBuffer(stream->renderClient, frames, 0)) != S_OK)
+		LogHostError(hr);
+
+	return hr;
+}
+
+// ------------------------------------------------------------------------------------------
+HRESULT ProcessInputBuffer(PaWasapiStream *stream, PaWasapiHostProcessor *processor)
+{
+	HRESULT hr = S_OK;
+	UINT32 frames;
+	BYTE *data = NULL;
+	DWORD flags = 0;
+
+	for (;;)
+	{
+		// Check if blocking call must be interrupted
+		if (WaitForSingleObject(stream->hCloseRequest, 0) != WAIT_TIMEOUT)
+			break;
+
+		// Findout if any frames available
+		frames = 0;
+		if ((hr = _PollGetInputFramesAvailable(stream, &frames)) != S_OK)
+			return hr;
+
+		// Empty/consumed buffer
+		if (frames == 0)
+			break;
+
+		// Get the available data in the shared buffer.
+		if ((hr = IAudioCaptureClient_GetBuffer(stream->captureClient, &data, &frames, &flags, NULL, NULL)) != S_OK)
+		{
+			if (hr == AUDCLNT_S_BUFFER_EMPTY)
+			{
+				hr = S_OK;
+				break; // Empty/consumed buffer
+			}
+
+			return LogHostError(hr);
+			break;
+		}
+
+		// Detect silence
+		// if (flags & AUDCLNT_BUFFERFLAGS_SILENT)
+		//	data = NULL;
+
+		// Process data
+		if (stream->in.monoMixer != NULL)
+		{
+			// expand buffer
+			UINT32 mono_frames_size = frames * (stream->in.wavex.Format.wBitsPerSample / 8);
+			if (mono_frames_size > stream->in.monoBufferSize)
+				stream->in.monoBuffer = PaWasapi_ReallocateMemory(stream->in.monoBuffer, (stream->in.monoBufferSize = mono_frames_size));
+
+			// mix 1 to 2 channels
+			stream->in.monoMixer(stream->in.monoBuffer, data, frames);
+
+			// process
+			processor[S_INPUT].processor((BYTE *)stream->in.monoBuffer, frames, NULL, 0, processor[S_INPUT].userData);
+		}
+		else
+		{
+			processor[S_INPUT].processor(data, frames, NULL, 0, processor[S_INPUT].userData);
+		}
+
+		// Release buffer
+		if ((hr = IAudioCaptureClient_ReleaseBuffer(stream->captureClient, frames)) != S_OK)
+			return LogHostError(hr);
+
+		//break;
+	}
+
+	return hr;
+}
+
+// ------------------------------------------------------------------------------------------
+void _StreamOnStop(PaWasapiStream *stream)
+{
+	// Stop INPUT/OUTPUT clients
+	if (!stream->bBlocking) 
+	{
+		if (stream->in.clientProc != NULL)
+			IAudioClient_Stop(stream->in.clientProc);
+		if (stream->out.clientProc != NULL)
+			IAudioClient_Stop(stream->out.clientProc);
+	} 
+	else 
+	{
+		if (stream->in.clientParent != NULL)
+			IAudioClient_Stop(stream->in.clientParent);
+		if (stream->out.clientParent != NULL)
+			IAudioClient_Stop(stream->out.clientParent);
+	}
+
+	// Restore thread priority
+	if (stream->hAvTask != NULL)
+	{
+		PaWasapi_ThreadPriorityRevert(stream->hAvTask);
+		stream->hAvTask = NULL;
+	}
+
+    // Notify
+    if (stream->streamRepresentation.streamFinishedCallback != NULL)
+        stream->streamRepresentation.streamFinishedCallback(stream->streamRepresentation.userData);
+}
+
+// ------------------------------------------------------------------------------------------
+PA_THREAD_FUNC ProcThreadEvent(void *param)
+{
+    PaWasapiHostProcessor processor[S_COUNT];
+	HRESULT hr;
+	DWORD dwResult;
+    PaWasapiStream *stream = (PaWasapiStream *)param;
+	PaWasapiHostProcessor defaultProcessor;
+	BOOL set_event[S_COUNT] = { FALSE, FALSE };
+	BOOL bWaitAllEvents = FALSE;
+	BOOL bThreadComInitialized = FALSE;
+
+	/*
+	If COM is already initialized CoInitialize will either return
+	FALSE, or RPC_E_CHANGED_MODE if it was initialized in a different
+	threading mode. In either case we shouldn't consider it an error
+	but we need to be careful to not call CoUninitialize() if 
+	RPC_E_CHANGED_MODE was returned.
+	*/
+	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+	if (FAILED(hr) && (hr != RPC_E_CHANGED_MODE))
+	{
+		PRINT(("WASAPI: failed ProcThreadEvent CoInitialize"));
+		return paUnanticipatedHostError;
+	}
+	if (hr != RPC_E_CHANGED_MODE)
+		bThreadComInitialized = TRUE;
+
+	// Unmarshal stream pointers for safe COM operation
+	hr = UnmarshalStreamComPointers(stream);
+	if (hr != S_OK) {
+		PRINT(("Error unmarshaling stream COM pointers. HRESULT: %i\n", hr));
+		goto thread_end;
+	}
+
+	// Waiting on all events in case of Full-Duplex/Exclusive mode.
+	if ((stream->in.clientProc != NULL) && (stream->out.clientProc != NULL))
+	{
+		bWaitAllEvents = (stream->in.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE) &&
+			(stream->out.shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE);
+	}
+
+    // Setup data processors
+    defaultProcessor.processor = WaspiHostProcessingLoop;
+    defaultProcessor.userData  = stream;
+    processor[S_INPUT] = (stream->hostProcessOverrideInput.processor != NULL ? stream->hostProcessOverrideInput : defaultProcessor);
+    processor[S_OUTPUT] = (stream->hostProcessOverrideOutput.processor != NULL ? stream->hostProcessOverrideOutput : defaultProcessor);
+
+	// Boost thread priority
+	PaWasapi_ThreadPriorityBoost((void **)&stream->hAvTask, stream->nThreadPriority);
+
+	// Create events
+	if (stream->event[S_OUTPUT] == NULL)
+	{
+		stream->event[S_OUTPUT] = CreateEvent(NULL, FALSE, FALSE, NULL);
+		set_event[S_OUTPUT] = TRUE;
+	}
+	if (stream->event[S_INPUT] == NULL)
+	{
+		stream->event[S_INPUT]  = CreateEvent(NULL, FALSE, FALSE, NULL);
+		set_event[S_INPUT] = TRUE;
+	}
+	if ((stream->event[S_OUTPUT] == NULL) || (stream->event[S_INPUT] == NULL))
+	{
+		PRINT(("WASAPI Thread: failed creating Input/Output event handle\n"));
+		goto thread_error;
+	}
+
+	// Initialize event & start INPUT stream
+	if (stream->in.clientProc)
+	{
+		// Create & set handle
+		if (set_event[S_INPUT])
+		{
+			if ((hr = IAudioClient_SetEventHandle(stream->in.clientProc, stream->event[S_INPUT])) != S_OK)
+			{
+				LogHostError(hr);
+				goto thread_error;
+			}
+		}
+
+		// Start
+		if ((hr = IAudioClient_Start(stream->in.clientProc)) != S_OK)
+		{
+			LogHostError(hr);
+			goto thread_error;
+		}
+	}
+
+	// Initialize event & start OUTPUT stream
+	if (stream->out.clientProc)
+	{
+		// Create & set handle
+		if (set_event[S_OUTPUT])
+		{
+			if ((hr = IAudioClient_SetEventHandle(stream->out.clientProc, stream->event[S_OUTPUT])) != S_OK)
+			{
+				LogHostError(hr);
+				goto thread_error;
+			}
+		}
+
+		// Preload buffer before start
+		if ((hr = ProcessOutputBuffer(stream, processor, stream->out.framesPerBuffer)) != S_OK)
+		{
+			LogHostError(hr);
+			goto thread_error;
+		}
+
+		// Start
+		if ((hr = IAudioClient_Start(stream->out.clientProc)) != S_OK)
+		{
+			LogHostError(hr);
+			goto thread_error;
+		}
+
+	}
+
+	// Signal: stream running
+	stream->running = TRUE;
+
+	// Notify: thread started
+	SetEvent(stream->hThreadStart);
+
+	// Processing Loop
+	for (;;)
+    {
+	    // 10 sec timeout (on timeout stream will auto-stop when processed by WAIT_TIMEOUT case)
+        dwResult = WaitForMultipleObjects(S_COUNT, stream->event, bWaitAllEvents, 10*1000);
+
+		// Check for close event (after wait for buffers to avoid any calls to user
+		// callback when hCloseRequest was set)
+		if (WaitForSingleObject(stream->hCloseRequest, 0) != WAIT_TIMEOUT)
+			break;
+
+		// Process S_INPUT/S_OUTPUT
+		switch (dwResult)
+		{
+		case WAIT_TIMEOUT: {
+			PRINT(("WASAPI Thread: WAIT_TIMEOUT - probably bad audio driver or Vista x64 bug: use paWinWasapiPolling instead\n"));
+			goto thread_end;
+			break; }
+
+		// Input stream
+		case WAIT_OBJECT_0 + S_INPUT: {
+
+            if (stream->captureClient == NULL)
+                break;
+
+			if ((hr = ProcessInputBuffer(stream, processor)) != S_OK)
+			{
+				LogHostError(hr);
+				goto thread_error;
+			}
+
+			break; }
+
+		// Output stream
+		case WAIT_OBJECT_0 + S_OUTPUT: {
+
+            if (stream->renderClient == NULL)
+                break;
+
+			if ((hr = ProcessOutputBuffer(stream, processor, stream->out.framesPerBuffer)) != S_OK)
+			{
+				LogHostError(hr);
+				goto thread_error;
+			}
+
+			break; }
+		}
+	}
+
+thread_end:
+
+	// Process stop
+	_StreamOnStop(stream);
+
+	// Release unmarshaled COM pointers
+	ReleaseUnmarshaledComPointers(stream);
+
+	// Cleanup COM for this thread
+	if (bThreadComInitialized == TRUE)
+		CoUninitialize();
+
+	// Notify: not running
+	stream->running = FALSE;
+
+	// Notify: thread exited
+	SetEvent(stream->hThreadExit);
+
+	return 0;
+
+thread_error:
+
+	// Prevent deadlocking in Pa_StreamStart
+	SetEvent(stream->hThreadStart);
+
+	// Exit
+	goto thread_end;
+}
+
+// ------------------------------------------------------------------------------------------
+PA_THREAD_FUNC ProcThreadPoll(void *param)
+{
+    PaWasapiHostProcessor processor[S_COUNT];
+	HRESULT hr;
+    PaWasapiStream *stream = (PaWasapiStream *)param;
+	PaWasapiHostProcessor defaultProcessor;
+	INT32 i;
+	ThreadIdleScheduler scheduler;
+
+	// Calculate the actual duration of the allocated buffer.
+	DWORD sleep_ms     = 0;
+	DWORD sleep_ms_in;
+	DWORD sleep_ms_out;
+
+	BOOL bThreadComInitialized = FALSE;
+
+	/*
+	If COM is already initialized CoInitialize will either return
+	FALSE, or RPC_E_CHANGED_MODE if it was initialized in a different
+	threading mode. In either case we shouldn't consider it an error
+	but we need to be careful to not call CoUninitialize() if 
+	RPC_E_CHANGED_MODE was returned.
+	*/
+	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+	if (FAILED(hr) && (hr != RPC_E_CHANGED_MODE))
+	{
+		PRINT(("WASAPI: failed ProcThreadPoll CoInitialize"));
+		return paUnanticipatedHostError;
+	}
+	if (hr != RPC_E_CHANGED_MODE)
+		bThreadComInitialized = TRUE;
+
+	// Unmarshal stream pointers for safe COM operation
+	hr = UnmarshalStreamComPointers(stream);
+	if (hr != S_OK) 
+	{
+		PRINT(("Error unmarshaling stream COM pointers. HRESULT: %i\n", hr));
+		return 0;
+	}
+
+	// Calculate timeout for next polling attempt.
+	sleep_ms_in  = GetFramesSleepTime(stream->in.framesPerHostCallback/WASAPI_PACKETS_PER_INPUT_BUFFER, stream->in.wavex.Format.nSamplesPerSec);
+	sleep_ms_out = GetFramesSleepTime(stream->out.framesPerBuffer, stream->out.wavex.Format.nSamplesPerSec);
+
+	// WASAPI Input packets tend to expire very easily, let's limit sleep time to 2 milliseconds
+	// for all cases. Please propose better solution if any.
+	if (sleep_ms_in > 2)
+		sleep_ms_in = 2;
+
+	// Adjust polling time for non-paUtilFixedHostBufferSize. Input stream is not adjustable as it is being
+	// polled according its packet length.
+	if (stream->bufferMode != paUtilFixedHostBufferSize)
+	{
+		//sleep_ms_in = GetFramesSleepTime(stream->bufferProcessor.framesPerUserBuffer, stream->in.wavex.Format.nSamplesPerSec);
+		sleep_ms_out = GetFramesSleepTime(stream->bufferProcessor.framesPerUserBuffer, stream->out.wavex.Format.nSamplesPerSec);
+	}
+
+	// Choose smallest
+	if ((sleep_ms_in != 0) && (sleep_ms_out != 0))
+		sleep_ms = min(sleep_ms_in, sleep_ms_out);
+	else
+	{
+		sleep_ms = (sleep_ms_in ? sleep_ms_in : sleep_ms_out);
+	}
+	// Make sure not 0, othervise use ThreadIdleScheduler
+	if (sleep_ms == 0)
+	{
+		sleep_ms_in  = GetFramesSleepTimeMicroseconds(stream->in.framesPerHostCallback/WASAPI_PACKETS_PER_INPUT_BUFFER, stream->in.wavex.Format.nSamplesPerSec);
+		sleep_ms_out = GetFramesSleepTimeMicroseconds(stream->bufferProcessor.framesPerUserBuffer, stream->out.wavex.Format.nSamplesPerSec);
+
+		// Choose smallest
+		if ((sleep_ms_in != 0) && (sleep_ms_out != 0))
+			sleep_ms = min(sleep_ms_in, sleep_ms_out);
+		else
+		{
+			sleep_ms = (sleep_ms_in ? sleep_ms_in : sleep_ms_out);
+		}
+
+		// Setup thread sleep scheduler
+		ThreadIdleScheduler_Setup(&scheduler, 1, sleep_ms/* microseconds here */);
+		sleep_ms = 0;
+	}
+
+    // Setup data processors
+    defaultProcessor.processor = WaspiHostProcessingLoop;
+    defaultProcessor.userData  = stream;
+    processor[S_INPUT] = (stream->hostProcessOverrideInput.processor != NULL ? stream->hostProcessOverrideInput : defaultProcessor);
+    processor[S_OUTPUT] = (stream->hostProcessOverrideOutput.processor != NULL ? stream->hostProcessOverrideOutput : defaultProcessor);
+
+	// Boost thread priority
+	PaWasapi_ThreadPriorityBoost((void **)&stream->hAvTask, stream->nThreadPriority);
+
+	// Initialize event & start INPUT stream
+	if (stream->in.clientProc)
+	{
+		if ((hr = IAudioClient_Start(stream->in.clientProc)) != S_OK)
+		{
+			LogHostError(hr);
+			goto thread_error;
+		}
+	}
+
+	// Initialize event & start OUTPUT stream
+	if (stream->out.clientProc)
+	{
+		// Preload buffer (obligatory, othervise ->Start() will fail), avoid processing
+		// when in full-duplex mode as it requires input processing as well
+		if (!PA_WASAPI__IS_FULLDUPLEX(stream))
+		{
+			UINT32 frames = 0;
+			if ((hr = _PollGetOutputFramesAvailable(stream, &frames)) == S_OK)
+            {
+				if (stream->bufferMode == paUtilFixedHostBufferSize)
+				{
+					if (frames >= stream->out.framesPerBuffer)
+					{
+						frames = stream->out.framesPerBuffer;
+
+						if ((hr = ProcessOutputBuffer(stream, processor, frames)) != S_OK)
+						{
+							LogHostError(hr); // not fatal, just log
+						}
+					}
+				}
+				else
+				{
+					if (frames != 0)
+					{
+						if ((hr = ProcessOutputBuffer(stream, processor, frames)) != S_OK)
+						{
+							LogHostError(hr); // not fatal, just log
+						}
+					}
+				}
+            }
+            else
+			{
+				LogHostError(hr); // not fatal, just log
+			}
+		}
+
+		// Start
+		if ((hr = IAudioClient_Start(stream->out.clientProc)) != S_OK)
+		{
+			LogHostError(hr);
+			goto thread_error;
+		}
+	}
+
+	// Signal: stream running
+	stream->running = TRUE;
+
+	// Notify: thread started
+	SetEvent(stream->hThreadStart);
+
+	if (!PA_WASAPI__IS_FULLDUPLEX(stream))
+	{
+		// Processing Loop
+		UINT32 next_sleep = sleep_ms;
+		while (WaitForSingleObject(stream->hCloseRequest, next_sleep) == WAIT_TIMEOUT)
+		{
+			// Get next sleep time
+			if (sleep_ms == 0)
+			{
+				next_sleep = ThreadIdleScheduler_NextSleep(&scheduler);
+			}
+
+			for (i = 0; i < S_COUNT; ++i)
+			{
+				// Process S_INPUT/S_OUTPUT
+				switch (i)
+				{
+				// Input stream
+				case S_INPUT: {
+
+					if (stream->captureClient == NULL)
+						break;
+
+					if ((hr = ProcessInputBuffer(stream, processor)) != S_OK)
+					{
+						LogHostError(hr);
+						goto thread_error;
+					}
+
+					break; }
+
+				// Output stream
+				case S_OUTPUT: {
+
+					UINT32 frames;
+					if (stream->renderClient == NULL)
+						break;
+
+					// get available frames
+					if ((hr = _PollGetOutputFramesAvailable(stream, &frames)) != S_OK)
+					{
+						LogHostError(hr);
+						goto thread_error;
+					}
+
+					// output
+					if (stream->bufferMode == paUtilFixedHostBufferSize)
+					{
+						if (frames >= stream->out.framesPerBuffer)
+						{
+							if ((hr = ProcessOutputBuffer(stream, processor, stream->out.framesPerBuffer)) != S_OK)
+							{
+								LogHostError(hr);
+								goto thread_error;
+							}
+						}
+					}
+					else
+					{
+						if (frames != 0)
+						{
+							if ((hr = ProcessOutputBuffer(stream, processor, frames)) != S_OK)
+							{
+								LogHostError(hr);
+								goto thread_error;
+							}
+						}
+					}
+
+					break; }
+				}
+			}
+		}
+	}
+	else
+	{
+#if 0
+		// Processing Loop
+		while (WaitForSingleObject(stream->hCloseRequest, 1) == WAIT_TIMEOUT)
+		{
+			UINT32 i_frames = 0, i_processed = 0;
+			BYTE *i_data = NULL, *o_data = NULL, *o_data_host = NULL;
+			DWORD i_flags = 0;
+			UINT32 o_frames = 0;
+
+			// get host input buffer
+			if ((hr = IAudioCaptureClient_GetBuffer(stream->captureClient, &i_data, &i_frames, &i_flags, NULL, NULL)) != S_OK)
+			{
+				if (hr == AUDCLNT_S_BUFFER_EMPTY)
+					continue; // no data in capture buffer
+
+				LogHostError(hr);
+				break;
+			}
+
+			// get available frames
+			if ((hr = _PollGetOutputFramesAvailable(stream, &o_frames)) != S_OK)
+			{
+				// release input buffer
+				IAudioCaptureClient_ReleaseBuffer(stream->captureClient, 0);
+
+				LogHostError(hr);
+				break;
+			}
+
+			// process equal ammount of frames
+			if (o_frames >= i_frames)
+			{
+				// process input ammount of frames
+				UINT32 o_processed = i_frames;
+
+				// get host output buffer
+				if ((hr = IAudioRenderClient_GetBuffer(stream->procRCClient, o_processed, &o_data)) == S_OK)
+				{
+					// processed amount of i_frames
+					i_processed = i_frames;
+					o_data_host = o_data;
+
+					// convert output mono
+					if (stream->out.monoMixer)
+					{
+						UINT32 mono_frames_size = o_processed * (stream->out.wavex.Format.wBitsPerSample / 8);
+						// expand buffer
+						if (mono_frames_size > stream->out.monoBufferSize)
+						{
+							stream->out.monoBuffer = PaWasapi_ReallocateMemory(stream->out.monoBuffer, (stream->out.monoBufferSize = mono_frames_size));
+							if (stream->out.monoBuffer == NULL)
+							{
+								// release input buffer
+								IAudioCaptureClient_ReleaseBuffer(stream->captureClient, 0);
+								// release output buffer
+								IAudioRenderClient_ReleaseBuffer(stream->renderClient, 0, 0);
+
+								LogPaError(paInsufficientMemory);
+								break;
+							}
+						}
+
+						// replace buffer pointer
+						o_data = (BYTE *)stream->out.monoBuffer;
+					}
+
+					// convert input mono
+					if (stream->in.monoMixer)
+					{
+						UINT32 mono_frames_size = i_processed * (stream->in.wavex.Format.wBitsPerSample / 8);
+						// expand buffer
+						if (mono_frames_size > stream->in.monoBufferSize)
+						{
+							stream->in.monoBuffer = PaWasapi_ReallocateMemory(stream->in.monoBuffer, (stream->in.monoBufferSize = mono_frames_size));
+							if (stream->in.monoBuffer == NULL)
+							{
+								// release input buffer
+								IAudioCaptureClient_ReleaseBuffer(stream->captureClient, 0);
+								// release output buffer
+								IAudioRenderClient_ReleaseBuffer(stream->renderClient, 0, 0);
+
+								LogPaError(paInsufficientMemory);
+								break;
+							}
+						}
+
+						// mix 2 to 1 input channels
+						stream->in.monoMixer(stream->in.monoBuffer, i_data, i_processed);
+
+						// replace buffer pointer
+						i_data = (BYTE *)stream->in.monoBuffer;
+					}
+
+					// process
+					processor[S_FULLDUPLEX].processor(i_data, i_processed, o_data, o_processed, processor[S_FULLDUPLEX].userData);
+
+					// mix 1 to 2 output channels
+					if (stream->out.monoBuffer)
+						stream->out.monoMixer(o_data_host, stream->out.monoBuffer, o_processed);
+
+					// release host output buffer
+					if ((hr = IAudioRenderClient_ReleaseBuffer(stream->renderClient, o_processed, 0)) != S_OK)
+						LogHostError(hr);
+				}
+				else
+				{
+					if (stream->out.shareMode != AUDCLNT_SHAREMODE_SHARED)
+						LogHostError(hr); // be silent in shared mode, try again next time
+				}
+			}
+
+			// release host input buffer
+			if ((hr = IAudioCaptureClient_ReleaseBuffer(stream->captureClient, i_processed)) != S_OK)
+			{
+				LogHostError(hr);
+				break;
+			}
+		}
+#else
+		// Processing Loop
+		UINT32 next_sleep = sleep_ms;
+		while (WaitForSingleObject(stream->hCloseRequest, next_sleep) == WAIT_TIMEOUT)
+		{
+			UINT32 i_frames = 0, i_processed = 0;
+			BYTE *i_data = NULL, *o_data = NULL, *o_data_host = NULL;
+			DWORD i_flags = 0;
+			UINT32 o_frames = 0;
+
+			// Get next sleep time
+			if (sleep_ms == 0)
+			{
+				next_sleep = ThreadIdleScheduler_NextSleep(&scheduler);
+			}
+
+			// get available frames
+			if ((hr = _PollGetOutputFramesAvailable(stream, &o_frames)) != S_OK)
+			{
+				LogHostError(hr);
+				break;
+			}
+
+			while (o_frames != 0)
+			{
+				// get host input buffer
+				if ((hr = IAudioCaptureClient_GetBuffer(stream->captureClient, &i_data, &i_frames, &i_flags, NULL, NULL)) != S_OK)
+				{
+					if (hr == AUDCLNT_S_BUFFER_EMPTY)
+						break; // no data in capture buffer
+
+					LogHostError(hr);
+					break;
+				}
+
+				// process equal ammount of frames
+				if (o_frames >= i_frames)
+				{
+					// process input ammount of frames
+					UINT32 o_processed = i_frames;
+
+					// get host output buffer
+					if ((hr = IAudioRenderClient_GetBuffer(stream->renderClient, o_processed, &o_data)) == S_OK)
+					{
+						// processed amount of i_frames
+						i_processed = i_frames;
+						o_data_host = o_data;
+
+						// convert output mono
+						if (stream->out.monoMixer)
+						{
+							UINT32 mono_frames_size = o_processed * (stream->out.wavex.Format.wBitsPerSample / 8);
+							// expand buffer
+							if (mono_frames_size > stream->out.monoBufferSize)
+							{
+								stream->out.monoBuffer = PaWasapi_ReallocateMemory(stream->out.monoBuffer, (stream->out.monoBufferSize = mono_frames_size));
+								if (stream->out.monoBuffer == NULL)
+								{
+									// release input buffer
+									IAudioCaptureClient_ReleaseBuffer(stream->captureClient, 0);
+									// release output buffer
+									IAudioRenderClient_ReleaseBuffer(stream->renderClient, 0, 0);
+
+									LogPaError(paInsufficientMemory);
+									goto thread_error;
+								}
+							}
+
+							// replace buffer pointer
+							o_data = (BYTE *)stream->out.monoBuffer;
+						}
+
+						// convert input mono
+						if (stream->in.monoMixer)
+						{
+							UINT32 mono_frames_size = i_processed * (stream->in.wavex.Format.wBitsPerSample / 8);
+							// expand buffer
+							if (mono_frames_size > stream->in.monoBufferSize)
+							{
+								stream->in.monoBuffer = PaWasapi_ReallocateMemory(stream->in.monoBuffer, (stream->in.monoBufferSize = mono_frames_size));
+								if (stream->in.monoBuffer == NULL)
+								{
+									// release input buffer
+									IAudioCaptureClient_ReleaseBuffer(stream->captureClient, 0);
+									// release output buffer
+									IAudioRenderClient_ReleaseBuffer(stream->renderClient, 0, 0);
+
+									LogPaError(paInsufficientMemory);
+									goto thread_error;
+								}
+							}
+
+							// mix 2 to 1 input channels
+							stream->in.monoMixer(stream->in.monoBuffer, i_data, i_processed);
+
+							// replace buffer pointer
+							i_data = (BYTE *)stream->in.monoBuffer;
+						}
+
+						// process
+						processor[S_FULLDUPLEX].processor(i_data, i_processed, o_data, o_processed, processor[S_FULLDUPLEX].userData);
+
+						// mix 1 to 2 output channels
+						if (stream->out.monoBuffer)
+							stream->out.monoMixer(o_data_host, stream->out.monoBuffer, o_processed);
+
+						// release host output buffer
+						if ((hr = IAudioRenderClient_ReleaseBuffer(stream->renderClient, o_processed, 0)) != S_OK)
+							LogHostError(hr);
+
+						o_frames -= o_processed;
+					}
+					else
+					{
+						if (stream->out.shareMode != AUDCLNT_SHAREMODE_SHARED)
+							LogHostError(hr); // be silent in shared mode, try again next time
+					}
+				}
+				else
+				{
+					i_processed = 0;
+					goto fd_release_buffer_in;
+				}
+
+fd_release_buffer_in:
+
+				// release host input buffer
+				if ((hr = IAudioCaptureClient_ReleaseBuffer(stream->captureClient, i_processed)) != S_OK)
+				{
+					LogHostError(hr);
+					break;
+				}
+
+				// break processing, input hasn't been accumulated yet
+				if (i_processed == 0)
+					break;
+			}
+		}
+#endif
+	}
+
+thread_end:
+
+	// Process stop
+	_StreamOnStop(stream);
+
+	// Release unmarshaled COM pointers
+	ReleaseUnmarshaledComPointers(stream);
+
+	// Cleanup COM for this thread
+	if (bThreadComInitialized == TRUE)
+		CoUninitialize();
+
+	// Notify: not running
+	stream->running = FALSE;
+
+	// Notify: thread exited
+	SetEvent(stream->hThreadExit);
+
+	return 0;
+
+thread_error:
+
+	// Prevent deadlocking in Pa_StreamStart
+	SetEvent(stream->hThreadStart);
+
+	// Exit
+	goto thread_end;
+}
+
+// ------------------------------------------------------------------------------------------
+void *PaWasapi_ReallocateMemory(void *ptr, size_t size)
+{
+	return realloc(ptr, size);
+}
+
+// ------------------------------------------------------------------------------------------
+void PaWasapi_FreeMemory(void *ptr)
+{
+	free(ptr);
+}
+
+//#endif //VC 2005
+
+
+
+
+#if 0
+			if(bFirst) {
+				float masteur;
+				hr = stream->outVol->GetMasterVolumeLevelScalar(&masteur);
+				if (hr != S_OK)
+					LogHostError(hr);
+				float chan1, chan2;
+				hr = stream->outVol->GetChannelVolumeLevelScalar(0, &chan1);
+				if (hr != S_OK)
+					LogHostError(hr);
+				hr = stream->outVol->GetChannelVolumeLevelScalar(1, &chan2);
+				if (hr != S_OK)
+					LogHostError(hr);
+
+				BOOL bMute;
+				hr = stream->outVol->GetMute(&bMute);
+				if (hr != S_OK)
+					LogHostError(hr);
+
+				stream->outVol->SetMasterVolumeLevelScalar(0.5, NULL);
+				stream->outVol->SetChannelVolumeLevelScalar(0, 0.5, NULL);
+				stream->outVol->SetChannelVolumeLevelScalar(1, 0.5, NULL);
+				stream->outVol->SetMute(FALSE, NULL);
+				bFirst = FALSE;
+			}
+#endif
diff --git a/Externals/portaudio/src/hostapi/wasapi/readme.txt b/Externals/portaudio/src/hostapi/wasapi/readme.txt
new file mode 100644
index 0000000000..08fedeb074
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wasapi/readme.txt
@@ -0,0 +1,25 @@
+**************
+* WASAPI API *
+**************
+
+----------------------------------------
+Microsoft Visual Studio 2005SP1/2008/10
+----------------------------------------
+No specific actions are needed to compile WASAPI API under Visual Studio.
+You are only required to install min. Windows Vista SDK (v6.0A) prior
+compilation.
+
+----------------------------------------
+MinGW (GCC 32-bit)/ MinGW64 (GCC 64-bit)
+----------------------------------------
+To compile under MinGW you are required to include 'mingw-include' directory
+which contains necessary files with WASAPI API. These files are modified
+in order to be compiled by MinGW compiler. These files are taken from 
+Windows Vista SDK (v6.0A). MinGW compilation is tested and proved to be
+fully working under 32-bit and 64-bit modes.
+MinGW   (32-bit) tested: gcc version 4.4.0 (GCC)
+MinGW64 (64-bit) tested: gcc version 4.4.4 20100226 (prerelease) (GCC)
+
+PortAudio
+/Dmitry Kostjuchenko/
+04.03.2010
\ No newline at end of file
diff --git a/Externals/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/Externals/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
new file mode 100644
index 0000000000..60a61e474b
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
@@ -0,0 +1,3308 @@
+/*
+ * $Id: pa_win_wdmks.c 1606 2011-02-17 15:56:04Z rob_bielik $
+ * PortAudio Windows WDM-KS interface
+ *
+ * Author: Andrew Baldwin
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2004 Andrew Baldwin, Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup hostapi_src
+ @brief Portaudio WDM-KS host API.
+
+ @note This is the implementation of the Portaudio host API using the
+ Windows WDM/Kernel Streaming API in order to enable very low latency
+ playback and recording on all modern Windows platforms (e.g. 2K, XP)
+ Note: This API accesses the device drivers below the usual KMIXER
+ component which is normally used to enable multi-client mixing and
+ format conversion. That means that it will lock out all other users
+ of a device for the duration of active stream using those devices
+*/
+
+#include <stdio.h>
+
+/* Debugging/tracing support */
+
+#define PA_LOGE_
+#define PA_LOGL_
+
+#ifdef __GNUC__
+    #include <initguid.h>
+    #define _WIN32_WINNT 0x0501
+    #define WINVER 0x0501
+#endif
+
+#include <string.h> /* strlen() */
+#include <assert.h>
+
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "portaudio.h"
+#include "pa_debugprint.h"
+
+#include <windows.h>
+#include <winioctl.h>
+#include <process.h>
+
+#ifdef __GNUC__
+    #undef PA_LOGE_
+    #define PA_LOGE_ PA_DEBUG(("%s {\n",__FUNCTION__))
+    #undef PA_LOGL_
+    #define PA_LOGL_ PA_DEBUG(("} %s\n",__FUNCTION__))
+    /* These defines are set in order to allow the WIndows DirectX
+     * headers to compile with a GCC compiler such as MinGW
+     * NOTE: The headers may generate a few warning in GCC, but
+     * they should compile */
+    #define _INC_MMSYSTEM
+    #define _INC_MMREG
+    #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
+    #define DEFINE_GUID_THUNK(name,guid) DEFINE_GUID(name,guid)
+    #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK( n, STATIC_##n )
+    #if !defined( DEFINE_WAVEFORMATEX_GUID )
+        #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
+    #endif
+    #define  WAVE_FORMAT_ADPCM      0x0002
+    #define  WAVE_FORMAT_IEEE_FLOAT 0x0003
+    #define  WAVE_FORMAT_ALAW       0x0006
+    #define  WAVE_FORMAT_MULAW      0x0007
+    #define  WAVE_FORMAT_MPEG       0x0050
+    #define  WAVE_FORMAT_DRM        0x0009
+    #define DYNAMIC_GUID_THUNK(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+    #define DYNAMIC_GUID(data) DYNAMIC_GUID_THUNK(data)
+#endif
+
+#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+#pragma comment( lib, "setupapi.lib" )
+#endif
+
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#ifndef __CYGWIN__
+#define CREATE_THREAD (HANDLE)_beginthreadex( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#else
+#define CREATE_THREAD CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#endif
+
+/* use ExitThread for CYGWIN, _endthreadex for all others */
+#ifndef __CYGWIN__
+#define EXIT_THREAD _endthreadex(0)
+#else
+#define EXIT_THREAD ExitThread(0)
+#endif
+
+#ifdef _MSC_VER
+    #define NOMMIDS
+    #define DYNAMIC_GUID(data) {data}
+    #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
+    #undef DEFINE_GUID
+    #define DEFINE_GUID(n,data) EXTERN_C const GUID n = {data}
+    #define DEFINE_GUID_THUNK(n,data) DEFINE_GUID(n,data)
+    #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
+#endif
+
+#include <mmreg.h>
+#include <ks.h>
+#include <ksmedia.h>
+#include <tchar.h>
+#include <assert.h>
+#include <stdio.h>
+
+/* These next definitions allow the use of the KSUSER DLL */
+typedef KSDDKAPI DWORD WINAPI KSCREATEPIN(HANDLE, PKSPIN_CONNECT, ACCESS_MASK, PHANDLE);
+extern HMODULE      DllKsUser;
+extern KSCREATEPIN* FunctionKsCreatePin;
+
+/* Forward definition to break circular type reference between pin and filter */
+struct __PaWinWdmFilter;
+typedef struct __PaWinWdmFilter PaWinWdmFilter;
+
+/* The Pin structure
+ * A pin is an input or output node, e.g. for audio flow */
+typedef struct __PaWinWdmPin
+{
+    HANDLE                      handle;
+    PaWinWdmFilter*             parentFilter;
+    unsigned long               pinId;
+    KSPIN_CONNECT*              pinConnect;
+    unsigned long               pinConnectSize;
+    KSDATAFORMAT_WAVEFORMATEX*  ksDataFormatWfx;
+    KSPIN_COMMUNICATION         communication;
+    KSDATARANGE*                dataRanges;
+    KSMULTIPLE_ITEM*            dataRangesItem;
+    KSPIN_DATAFLOW              dataFlow;
+    KSPIN_CINSTANCES            instances;
+    unsigned long               frameSize;
+    int                         maxChannels;
+    unsigned long               formats;
+    int                         bestSampleRate;
+}
+PaWinWdmPin;
+
+/* The Filter structure
+ * A filter has a number of pins and a "friendly name" */
+struct __PaWinWdmFilter
+{
+    HANDLE         handle;
+    int            pinCount;
+    PaWinWdmPin**  pins;
+    TCHAR          filterName[MAX_PATH];
+    TCHAR          friendlyName[MAX_PATH];
+    int            maxInputChannels;
+    int            maxOutputChannels;
+    unsigned long  formats;
+    int            usageCount;
+    int            bestSampleRate;
+};
+
+/* PaWinWdmHostApiRepresentation - host api datastructure specific to this implementation */
+typedef struct __PaWinWdmHostApiRepresentation
+{
+    PaUtilHostApiRepresentation  inheritedHostApiRep;
+    PaUtilStreamInterface        callbackStreamInterface;
+    PaUtilStreamInterface        blockingStreamInterface;
+
+    PaUtilAllocationGroup*       allocations;
+    PaWinWdmFilter**             filters;
+    int                          filterCount;
+}
+PaWinWdmHostApiRepresentation;
+
+typedef struct __PaWinWdmDeviceInfo
+{
+    PaDeviceInfo     inheritedDeviceInfo;
+    PaWinWdmFilter*  filter;
+}
+PaWinWdmDeviceInfo;
+
+typedef struct __DATAPACKET
+{
+    KSSTREAM_HEADER  Header;
+    OVERLAPPED       Signal;
+} DATAPACKET;
+
+/* PaWinWdmStream - a stream data structure specifically for this implementation */
+typedef struct __PaWinWdmStream
+{
+    PaUtilStreamRepresentation  streamRepresentation;
+    PaUtilCpuLoadMeasurer       cpuLoadMeasurer;
+    PaUtilBufferProcessor       bufferProcessor;
+
+    PaWinWdmPin*                recordingPin;
+    PaWinWdmPin*                playbackPin;
+    char*                       hostBuffer;
+    unsigned long               framesPerHostIBuffer;
+    unsigned long               framesPerHostOBuffer;
+    int                         bytesPerInputFrame;
+    int                         bytesPerOutputFrame;
+    int                         streamStarted;
+    int                         streamActive;
+    int                         streamStop;
+    int                         streamAbort;
+    int                         oldProcessPriority;
+    HANDLE                      streamThread;
+    HANDLE                      events[5];  /* 2 play + 2 record packets + abort events */
+    DATAPACKET                  packets[4]; /* 2 play + 2 record */
+    PaStreamFlags               streamFlags;
+    /* These values handle the case where the user wants to use fewer
+     * channels than the device has */
+    int                         userInputChannels;
+    int                         deviceInputChannels;
+    int                         userOutputChannels;
+    int                         deviceOutputChannels;
+    int                         inputSampleSize;
+    int                         outputSampleSize;
+}
+PaWinWdmStream;
+
+#include <setupapi.h>
+
+HMODULE      DllKsUser = NULL;
+KSCREATEPIN* FunctionKsCreatePin = NULL;
+
+/* prototypes for functions declared in this file */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+/* Low level I/O functions */
+static PaError WdmSyncIoctl(HANDLE handle,
+    unsigned long ioctlNumber,
+    void* inBuffer,
+    unsigned long inBufferCount,
+    void* outBuffer,
+    unsigned long outBufferCount,
+    unsigned long* bytesReturned);
+static PaError WdmGetPropertySimple(HANDLE handle,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount,
+    void* instance,
+    unsigned long instanceCount);
+static PaError WdmSetPropertySimple(HANDLE handle,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount,
+    void* instance,
+    unsigned long instanceCount);
+static PaError WdmGetPinPropertySimple(HANDLE  handle,
+    unsigned long pinId,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount);
+static PaError WdmGetPinPropertyMulti(HANDLE  handle,
+    unsigned long pinId,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    KSMULTIPLE_ITEM** ksMultipleItem);
+
+/** Pin management functions */
+static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, PaError* error);
+static void PinFree(PaWinWdmPin* pin);
+static void PinClose(PaWinWdmPin* pin);
+static PaError PinInstantiate(PaWinWdmPin* pin);
+/*static PaError PinGetState(PaWinWdmPin* pin, KSSTATE* state); NOT USED */
+static PaError PinSetState(PaWinWdmPin* pin, KSSTATE state);
+static PaError PinSetFormat(PaWinWdmPin* pin, const WAVEFORMATEX* format);
+static PaError PinIsFormatSupported(PaWinWdmPin* pin, const WAVEFORMATEX* format);
+
+/* Filter management functions */
+static PaWinWdmFilter* FilterNew(
+    TCHAR* filterName,
+    TCHAR* friendlyName,
+    PaError* error);
+static void FilterFree(PaWinWdmFilter* filter);
+static PaWinWdmPin* FilterCreateRenderPin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error);
+static PaWinWdmPin* FilterFindViableRenderPin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error);
+static PaError FilterCanCreateRenderPin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex);
+static PaWinWdmPin* FilterCreateCapturePin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error);
+static PaWinWdmPin* FilterFindViableCapturePin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error);
+static PaError FilterCanCreateCapturePin(
+    PaWinWdmFilter* filter,
+    const WAVEFORMATEX* pwfx);
+static PaError FilterUse(
+    PaWinWdmFilter* filter);
+static void FilterRelease(
+    PaWinWdmFilter* filter);
+
+/* Interface functions */
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError IsFormatSupported(
+    struct PaUtilHostApiRepresentation *hostApi,
+    const PaStreamParameters *inputParameters,
+    const PaStreamParameters *outputParameters,
+    double sampleRate );
+static PaError OpenStream(
+    struct PaUtilHostApiRepresentation *hostApi,
+    PaStream** s,
+    const PaStreamParameters *inputParameters,
+    const PaStreamParameters *outputParameters,
+    double sampleRate,
+    unsigned long framesPerBuffer,
+    PaStreamFlags streamFlags,
+    PaStreamCallback *streamCallback,
+    void *userData );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream(
+    PaStream* stream,
+    void *buffer,
+    unsigned long frames );
+static PaError WriteStream(
+    PaStream* stream,
+    const void *buffer,
+    unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+/* Utility functions */
+static unsigned long GetWfexSize(const WAVEFORMATEX* wfex);
+static PaError BuildFilterList(PaWinWdmHostApiRepresentation* wdmHostApi);
+static BOOL PinWrite(HANDLE h, DATAPACKET* p);
+static BOOL PinRead(HANDLE h, DATAPACKET* p);
+static void DuplicateFirstChannelInt16(void* buffer, int channels, int samples);
+static void DuplicateFirstChannelInt24(void* buffer, int channels, int samples);
+static DWORD WINAPI ProcessingThread(LPVOID pParam);
+
+/* Function bodies */
+
+static unsigned long GetWfexSize(const WAVEFORMATEX* wfex)
+{
+    if( wfex->wFormatTag == WAVE_FORMAT_PCM )
+    {
+        return sizeof( WAVEFORMATEX );
+    }
+    else
+    {
+        return (sizeof( WAVEFORMATEX ) + wfex->cbSize);
+    }
+}
+
+/*
+Low level pin/filter access functions
+*/
+static PaError WdmSyncIoctl(
+    HANDLE handle,
+    unsigned long ioctlNumber,
+    void* inBuffer,
+    unsigned long inBufferCount,
+    void* outBuffer,
+    unsigned long outBufferCount,
+    unsigned long* bytesReturned)
+{
+    PaError result = paNoError;
+    OVERLAPPED overlapped;
+    int boolResult;
+    unsigned long dummyBytesReturned;
+    unsigned long error;
+
+    if( !bytesReturned )
+    {
+        /* User a dummy as the caller hasn't supplied one */
+        bytesReturned = &dummyBytesReturned;
+    }
+
+    FillMemory((void *)&overlapped,sizeof(overlapped),0);
+    overlapped.hEvent = CreateEvent(NULL,FALSE,FALSE,NULL);
+    if( !overlapped.hEvent )
+    {
+          result = paInsufficientMemory;
+        goto error;
+    }
+    overlapped.hEvent = (HANDLE)((DWORD_PTR)overlapped.hEvent | 0x1);
+
+    boolResult = DeviceIoControl(handle, ioctlNumber, inBuffer, inBufferCount,
+        outBuffer, outBufferCount, bytesReturned, &overlapped);
+    if( !boolResult )
+    {
+        error = GetLastError();
+        if( error == ERROR_IO_PENDING )
+        {
+            error = WaitForSingleObject(overlapped.hEvent,INFINITE);
+            if( error != WAIT_OBJECT_0 )
+            {
+                result = paUnanticipatedHostError;
+                goto error;
+            }
+        }
+        else if((( error == ERROR_INSUFFICIENT_BUFFER ) ||
+                  ( error == ERROR_MORE_DATA )) &&
+                  ( ioctlNumber == IOCTL_KS_PROPERTY ) &&
+                  ( outBufferCount == 0 ))
+        {
+            boolResult = TRUE;
+        }
+        else
+        {
+            result = paUnanticipatedHostError;
+        }
+    }
+    if( !boolResult )
+        *bytesReturned = 0;
+
+error:
+    if( overlapped.hEvent )
+    {
+            CloseHandle( overlapped.hEvent );
+    }
+    return result;
+}
+
+static PaError WdmGetPropertySimple(HANDLE handle,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount,
+    void* instance,
+    unsigned long instanceCount)
+{
+    PaError result;
+    KSPROPERTY* ksProperty;
+    unsigned long propertyCount;
+
+    propertyCount = sizeof(KSPROPERTY) + instanceCount;
+    ksProperty = (KSPROPERTY*)PaUtil_AllocateMemory( propertyCount );
+    if( !ksProperty )
+    {
+        return paInsufficientMemory;
+    }
+
+    FillMemory((void*)ksProperty,sizeof(ksProperty),0);
+    ksProperty->Set = *guidPropertySet;
+    ksProperty->Id = property;
+    ksProperty->Flags = KSPROPERTY_TYPE_GET;
+
+    if( instance )
+    {
+        memcpy( (void*)(((char*)ksProperty)+sizeof(KSPROPERTY)), instance, instanceCount );
+    }
+
+    result = WdmSyncIoctl(
+                handle,
+                IOCTL_KS_PROPERTY,
+                ksProperty,
+                propertyCount,
+                value,
+                valueCount,
+                NULL);
+
+    PaUtil_FreeMemory( ksProperty );
+    return result;
+}
+
+static PaError WdmSetPropertySimple(
+    HANDLE handle,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount,
+    void* instance,
+    unsigned long instanceCount)
+{
+    PaError result;
+    KSPROPERTY* ksProperty;
+    unsigned long propertyCount  = 0;
+
+    propertyCount = sizeof(KSPROPERTY) + instanceCount;
+    ksProperty = (KSPROPERTY*)PaUtil_AllocateMemory( propertyCount );
+    if( !ksProperty )
+    {
+        return paInsufficientMemory;
+    }
+
+    ksProperty->Set = *guidPropertySet;
+    ksProperty->Id = property;
+    ksProperty->Flags = KSPROPERTY_TYPE_SET;
+
+    if( instance )
+    {
+        memcpy((void*)((char*)ksProperty + sizeof(KSPROPERTY)), instance, instanceCount);
+    }
+
+    result = WdmSyncIoctl(
+                handle,
+                IOCTL_KS_PROPERTY,
+                ksProperty,
+                propertyCount,
+                value,
+                valueCount,
+                NULL);
+
+    PaUtil_FreeMemory( ksProperty );
+    return result;
+}
+
+static PaError WdmGetPinPropertySimple(
+    HANDLE  handle,
+    unsigned long pinId,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    void* value,
+    unsigned long valueCount)
+{
+    PaError result;
+
+    KSP_PIN ksPProp;
+    ksPProp.Property.Set = *guidPropertySet;
+    ksPProp.Property.Id = property;
+    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
+    ksPProp.PinId = pinId;
+    ksPProp.Reserved = 0;
+
+    result = WdmSyncIoctl(
+                handle,
+                IOCTL_KS_PROPERTY,
+                &ksPProp,
+                sizeof(KSP_PIN),
+                value,
+                valueCount,
+                NULL);
+
+    return result;
+}
+
+static PaError WdmGetPinPropertyMulti(
+    HANDLE handle,
+    unsigned long pinId,
+    const GUID* const guidPropertySet,
+    unsigned long property,
+    KSMULTIPLE_ITEM** ksMultipleItem)
+{
+    PaError result;
+    unsigned long multipleItemSize = 0;
+    KSP_PIN ksPProp;
+
+    ksPProp.Property.Set = *guidPropertySet;
+    ksPProp.Property.Id = property;
+    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
+    ksPProp.PinId = pinId;
+    ksPProp.Reserved = 0;
+
+    result = WdmSyncIoctl(
+                handle,
+                IOCTL_KS_PROPERTY,
+                &ksPProp.Property,
+                sizeof(KSP_PIN),
+                NULL,
+                0,
+                &multipleItemSize);
+    if( result != paNoError )
+    {
+        return result;
+    }
+
+    *ksMultipleItem = (KSMULTIPLE_ITEM*)PaUtil_AllocateMemory( multipleItemSize );
+    if( !*ksMultipleItem )
+    {
+        return paInsufficientMemory;
+    }
+
+    result = WdmSyncIoctl(
+                handle,
+                IOCTL_KS_PROPERTY,
+                &ksPProp,
+                sizeof(KSP_PIN),
+                (void*)*ksMultipleItem,
+                multipleItemSize,
+                NULL);
+
+    if( result != paNoError )
+    {
+        PaUtil_FreeMemory( ksMultipleItem );
+    }
+
+    return result;
+}
+
+
+/*
+Create a new pin object belonging to a filter
+The pin object holds all the configuration information about the pin
+before it is opened, and then the handle of the pin after is opened
+*/
+static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, PaError* error)
+{
+    PaWinWdmPin* pin;
+    PaError result;
+    unsigned long i;
+    KSMULTIPLE_ITEM* item = NULL;
+    KSIDENTIFIER* identifier;
+    KSDATARANGE* dataRange;
+
+    PA_LOGE_;
+    PA_DEBUG(("Creating pin %d:\n",pinId));
+
+    /* Allocate the new PIN object */
+    pin = (PaWinWdmPin*)PaUtil_AllocateMemory( sizeof(PaWinWdmPin) );
+    if( !pin )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* Zero the pin object */
+    /* memset( (void*)pin, 0, sizeof(PaWinWdmPin) ); */
+
+    pin->parentFilter = parentFilter;
+    pin->pinId = pinId;
+
+    /* Allocate a connect structure */
+    pin->pinConnectSize = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX);
+    pin->pinConnect = (KSPIN_CONNECT*)PaUtil_AllocateMemory( pin->pinConnectSize );
+    if( !pin->pinConnect )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* Configure the connect structure with default values */
+    pin->pinConnect->Interface.Set               = KSINTERFACESETID_Standard;
+    pin->pinConnect->Interface.Id                = KSINTERFACE_STANDARD_STREAMING;
+    pin->pinConnect->Interface.Flags             = 0;
+    pin->pinConnect->Medium.Set                  = KSMEDIUMSETID_Standard;
+    pin->pinConnect->Medium.Id                   = KSMEDIUM_TYPE_ANYINSTANCE;
+    pin->pinConnect->Medium.Flags                = 0;
+    pin->pinConnect->PinId                       = pinId;
+    pin->pinConnect->PinToHandle                 = NULL;
+    pin->pinConnect->Priority.PriorityClass      = KSPRIORITY_NORMAL;
+    pin->pinConnect->Priority.PrioritySubClass   = 1;
+    pin->ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX*)(pin->pinConnect + 1);
+    pin->ksDataFormatWfx->DataFormat.FormatSize  = sizeof(KSDATAFORMAT_WAVEFORMATEX);
+    pin->ksDataFormatWfx->DataFormat.Flags       = 0;
+    pin->ksDataFormatWfx->DataFormat.Reserved    = 0;
+    pin->ksDataFormatWfx->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO;
+    pin->ksDataFormatWfx->DataFormat.SubFormat   = KSDATAFORMAT_SUBTYPE_PCM;
+    pin->ksDataFormatWfx->DataFormat.Specifier   = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX;
+
+    pin->frameSize = 0; /* Unknown until we instantiate pin */
+
+    /* Get the COMMUNICATION property */
+    result = WdmGetPinPropertySimple(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_COMMUNICATION,
+        &pin->communication,
+        sizeof(KSPIN_COMMUNICATION));
+    if( result != paNoError )
+        goto error;
+
+    if( /*(pin->communication != KSPIN_COMMUNICATION_SOURCE) &&*/
+         (pin->communication != KSPIN_COMMUNICATION_SINK) &&
+         (pin->communication != KSPIN_COMMUNICATION_BOTH) )
+    {
+        PA_DEBUG(("Not source/sink\n"));
+        result = paInvalidDevice;
+        goto error;
+    }
+
+    /* Get dataflow information */
+    result = WdmGetPinPropertySimple(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_DATAFLOW,
+        &pin->dataFlow,
+        sizeof(KSPIN_DATAFLOW));
+
+    if( result != paNoError )
+        goto error;
+
+    /* Get the INTERFACE property list */
+    result = WdmGetPinPropertyMulti(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_INTERFACES,
+        &item);
+
+    if( result != paNoError )
+        goto error;
+
+    identifier = (KSIDENTIFIER*)(item+1);
+
+    /* Check that at least one interface is STANDARD_STREAMING */
+    result = paUnanticipatedHostError;
+    for( i = 0; i < item->Count; i++ )
+    {
+        if( !memcmp( (void*)&identifier[i].Set, (void*)&KSINTERFACESETID_Standard, sizeof( GUID ) ) &&
+            ( identifier[i].Id == KSINTERFACE_STANDARD_STREAMING ) )
+        {
+            result = paNoError;
+            break;
+        }
+    }
+
+    if( result != paNoError )
+    {
+        PA_DEBUG(("No standard streaming\n"));
+        goto error;
+    }
+
+    /* Don't need interfaces any more */
+    PaUtil_FreeMemory( item );
+    item = NULL;
+
+    /* Get the MEDIUM properties list */
+    result = WdmGetPinPropertyMulti(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_MEDIUMS,
+        &item);
+
+    if( result != paNoError )
+        goto error;
+
+    identifier = (KSIDENTIFIER*)(item+1); /* Not actually necessary... */
+
+    /* Check that at least one medium is STANDARD_DEVIO */
+    result = paUnanticipatedHostError;
+    for( i = 0; i < item->Count; i++ )
+    {
+        if( !memcmp( (void*)&identifier[i].Set, (void*)&KSMEDIUMSETID_Standard, sizeof( GUID ) ) &&
+           ( identifier[i].Id == KSMEDIUM_STANDARD_DEVIO ) )
+        {
+            result = paNoError;
+            break;
+        }
+    }
+
+    if( result != paNoError )
+    {
+        PA_DEBUG(("No standard devio\n"));
+        goto error;
+    }
+    /* Don't need mediums any more */
+    PaUtil_FreeMemory( item );
+    item = NULL;
+
+    /* Get DATARANGES */
+    result = WdmGetPinPropertyMulti(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_DATARANGES,
+        &pin->dataRangesItem);
+
+    if( result != paNoError )
+        goto error;
+
+    pin->dataRanges = (KSDATARANGE*)(pin->dataRangesItem +1);
+
+    /* Check that at least one datarange supports audio */
+    result = paUnanticipatedHostError;
+    dataRange = pin->dataRanges;
+    pin->maxChannels = 0;
+    pin->bestSampleRate = 0;
+    pin->formats = 0;
+    for( i = 0; i <pin->dataRangesItem->Count; i++)
+    {
+        PA_DEBUG(("DR major format %x\n",*(unsigned long*)(&(dataRange->MajorFormat))));
+        /* Check that subformat is WAVEFORMATEX, PCM or WILDCARD */
+        if( IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat) ||
+            !memcmp((void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_PCM, sizeof ( GUID ) ) ||
+            ( !memcmp((void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof ( GUID ) ) &&
+            ( !memcmp((void*)&dataRange->MajorFormat, (void*)&KSDATAFORMAT_TYPE_AUDIO, sizeof ( GUID ) ) ) ) )
+        {
+            result = paNoError;
+            /* Record the maximum possible channels with this pin */
+            PA_DEBUG(("MaxChannel: %d\n",pin->maxChannels));
+            if( (int)((KSDATARANGE_AUDIO*)dataRange)->MaximumChannels > pin->maxChannels )
+            {
+                pin->maxChannels = ((KSDATARANGE_AUDIO*)dataRange)->MaximumChannels;
+                /*PA_DEBUG(("MaxChannel: %d\n",pin->maxChannels));*/
+            }
+            /* Record the formats (bit depths) that are supported */
+            if( ((KSDATARANGE_AUDIO*)dataRange)->MinimumBitsPerSample <= 16 )
+            {
+                pin->formats |= paInt16;
+                PA_DEBUG(("Format 16 bit supported\n"));
+            }
+            if( ((KSDATARANGE_AUDIO*)dataRange)->MaximumBitsPerSample >= 24 )
+            {
+                pin->formats |= paInt24;
+                PA_DEBUG(("Format 24 bit supported\n"));
+            }
+            if( ( pin->bestSampleRate != 48000) &&
+                (((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency >= 48000) &&
+                (((KSDATARANGE_AUDIO*)dataRange)->MinimumSampleFrequency <= 48000) )
+            {
+                pin->bestSampleRate = 48000;
+                PA_DEBUG(("48kHz supported\n"));
+            }
+            else if(( pin->bestSampleRate != 48000) && ( pin->bestSampleRate != 44100 ) &&
+                (((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency >= 44100) &&
+                (((KSDATARANGE_AUDIO*)dataRange)->MinimumSampleFrequency <= 44100) )
+            {
+                pin->bestSampleRate = 44100;
+                PA_DEBUG(("44.1kHz supported\n"));
+            }
+            else
+            {
+                pin->bestSampleRate = ((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency;
+            }
+        }
+        dataRange = (KSDATARANGE*)( ((char*)dataRange) + dataRange->FormatSize);
+    }
+
+    if( result != paNoError )
+        goto error;
+
+    /* Get instance information */
+    result = WdmGetPinPropertySimple(
+        parentFilter->handle,
+        pinId,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_CINSTANCES,
+        &pin->instances,
+        sizeof(KSPIN_CINSTANCES));
+
+    if( result != paNoError )
+        goto error;
+
+    /* Success */
+    *error = paNoError;
+    PA_DEBUG(("Pin created successfully\n"));
+    PA_LOGL_;
+    return pin;
+
+error:
+    /*
+    Error cleanup
+    */
+    PaUtil_FreeMemory( item );
+    if( pin )
+    {
+        PaUtil_FreeMemory( pin->pinConnect );
+        PaUtil_FreeMemory( pin->dataRangesItem );
+        PaUtil_FreeMemory( pin );
+    }
+    *error = result;
+    PA_LOGL_;
+    return NULL;
+}
+
+/*
+Safely free all resources associated with the pin
+*/
+static void PinFree(PaWinWdmPin* pin)
+{
+    PA_LOGE_;
+    if( pin )
+    {
+        PinClose(pin);
+        if( pin->pinConnect )
+        {
+            PaUtil_FreeMemory( pin->pinConnect );
+        }
+        if( pin->dataRangesItem )
+        {
+            PaUtil_FreeMemory( pin->dataRangesItem );
+        }
+        PaUtil_FreeMemory( pin );
+    }
+    PA_LOGL_;
+}
+
+/*
+If the pin handle is open, close it
+*/
+static void PinClose(PaWinWdmPin* pin)
+{
+    PA_LOGE_;
+    if( pin == NULL )
+    {
+        PA_DEBUG(("Closing NULL pin!"));
+        PA_LOGL_;
+        return;
+    }
+    if( pin->handle != NULL )
+    {
+        PinSetState( pin, KSSTATE_PAUSE );
+        PinSetState( pin, KSSTATE_STOP );
+        CloseHandle( pin->handle );
+        pin->handle = NULL;
+        FilterRelease(pin->parentFilter);
+    }
+    PA_LOGL_;
+}
+
+/*
+Set the state of this (instantiated) pin
+*/
+static PaError PinSetState(PaWinWdmPin* pin, KSSTATE state)
+{
+    PaError result;
+
+    PA_LOGE_;
+    if( pin == NULL )
+        return paInternalError;
+    if( pin->handle == NULL )
+        return paInternalError;
+
+    result = WdmSetPropertySimple(
+        pin->handle,
+        &KSPROPSETID_Connection,
+        KSPROPERTY_CONNECTION_STATE,
+        &state,
+        sizeof(state),
+        NULL,
+        0);
+    PA_LOGL_;
+    return result;
+}
+
+static PaError PinInstantiate(PaWinWdmPin* pin)
+{
+    PaError result;
+    unsigned long createResult;
+    KSALLOCATOR_FRAMING ksaf;
+    KSALLOCATOR_FRAMING_EX ksafex;
+
+    PA_LOGE_;
+
+    if( pin == NULL )
+        return paInternalError;
+    if(!pin->pinConnect)
+        return paInternalError;
+
+    FilterUse(pin->parentFilter);
+
+    createResult = FunctionKsCreatePin(
+        pin->parentFilter->handle,
+        pin->pinConnect,
+        GENERIC_WRITE | GENERIC_READ,
+        &pin->handle
+        );
+
+    PA_DEBUG(("Pin create result = %x\n",createResult));
+    if( createResult != ERROR_SUCCESS )
+    {
+        FilterRelease(pin->parentFilter);
+        pin->handle = NULL;
+        return paInvalidDevice;
+    }
+
+    result = WdmGetPropertySimple(
+        pin->handle,
+        &KSPROPSETID_Connection,
+        KSPROPERTY_CONNECTION_ALLOCATORFRAMING,
+        &ksaf,
+        sizeof(ksaf),
+        NULL,
+        0);
+
+    if( result != paNoError )
+    {
+        result = WdmGetPropertySimple(
+            pin->handle,
+            &KSPROPSETID_Connection,
+            KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX,
+            &ksafex,
+            sizeof(ksafex),
+            NULL,
+            0);
+        if( result == paNoError )
+        {
+            pin->frameSize = ksafex.FramingItem[0].FramingRange.Range.MinFrameSize;
+        }
+    }
+    else
+    {
+        pin->frameSize = ksaf.FrameSize;
+    }
+
+    PA_LOGL_;
+
+    return paNoError;
+}
+
+/* NOT USED
+static PaError PinGetState(PaWinWdmPin* pin, KSSTATE* state)
+{
+    PaError result;
+
+    if( state == NULL )
+        return paInternalError;
+    if( pin == NULL )
+        return paInternalError;
+    if( pin->handle == NULL )
+        return paInternalError;
+
+    result = WdmGetPropertySimple(
+        pin->handle,
+        KSPROPSETID_Connection,
+        KSPROPERTY_CONNECTION_STATE,
+        state,
+        sizeof(KSSTATE),
+        NULL,
+        0);
+
+    return result;
+}
+*/
+static PaError PinSetFormat(PaWinWdmPin* pin, const WAVEFORMATEX* format)
+{
+    unsigned long size;
+    void* newConnect;
+
+    PA_LOGE_;
+
+    if( pin == NULL )
+        return paInternalError;
+    if( format == NULL )
+        return paInternalError;
+
+    size = GetWfexSize(format) + sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX) - sizeof(WAVEFORMATEX);
+
+    if( pin->pinConnectSize != size )
+    {
+        newConnect = PaUtil_AllocateMemory( size );
+        if( newConnect == NULL )
+            return paInsufficientMemory;
+        memcpy( newConnect, (void*)pin->pinConnect, min(pin->pinConnectSize,size) );
+        PaUtil_FreeMemory( pin->pinConnect );
+        pin->pinConnect = (KSPIN_CONNECT*)newConnect;
+        pin->pinConnectSize = size;
+        pin->ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX*)((KSPIN_CONNECT*)newConnect + 1);
+        pin->ksDataFormatWfx->DataFormat.FormatSize = size - sizeof(KSPIN_CONNECT);
+    }
+
+    memcpy( (void*)&(pin->ksDataFormatWfx->WaveFormatEx), format, GetWfexSize(format) );
+    pin->ksDataFormatWfx->DataFormat.SampleSize = (unsigned short)(format->nChannels * (format->wBitsPerSample / 8));
+
+    PA_LOGL_;
+
+    return paNoError;
+}
+
+static PaError PinIsFormatSupported(PaWinWdmPin* pin, const WAVEFORMATEX* format)
+{
+    KSDATARANGE_AUDIO* dataRange;
+    unsigned long count;
+    GUID guid = DYNAMIC_GUID( DEFINE_WAVEFORMATEX_GUID(format->wFormatTag) );
+    PaError result = paInvalidDevice;
+
+    PA_LOGE_;
+
+    if( format->wFormatTag == WAVE_FORMAT_EXTENSIBLE )
+    {
+        guid = ((WAVEFORMATEXTENSIBLE*)format)->SubFormat;
+    }
+    dataRange = (KSDATARANGE_AUDIO*)pin->dataRanges;
+    for(count = 0; count<pin->dataRangesItem->Count; count++)
+    {
+        if(( !memcmp(&(dataRange->DataRange.MajorFormat),&KSDATAFORMAT_TYPE_AUDIO,sizeof(GUID)) ) ||
+           ( !memcmp(&(dataRange->DataRange.MajorFormat),&KSDATAFORMAT_TYPE_WILDCARD,sizeof(GUID)) ))
+        {
+            /* This is an audio or wildcard datarange... */
+            if(( !memcmp(&(dataRange->DataRange.SubFormat),&KSDATAFORMAT_SUBTYPE_WILDCARD,sizeof(GUID)) ) ||
+                ( !memcmp(&(dataRange->DataRange.SubFormat),&guid,sizeof(GUID)) ))
+            {
+                if(( !memcmp(&(dataRange->DataRange.Specifier),&KSDATAFORMAT_SPECIFIER_WILDCARD,sizeof(GUID)) ) ||
+                  ( !memcmp(&(dataRange->DataRange.Specifier),&KSDATAFORMAT_SPECIFIER_WAVEFORMATEX,sizeof(GUID) )))
+                {
+
+                    PA_DEBUG(("Pin:%x, DataRange:%d\n",(void*)pin,count));
+                    PA_DEBUG(("\tFormatSize:%d, SampleSize:%d\n",dataRange->DataRange.FormatSize,dataRange->DataRange.SampleSize));
+                    PA_DEBUG(("\tMaxChannels:%d\n",dataRange->MaximumChannels));
+                    PA_DEBUG(("\tBits:%d-%d\n",dataRange->MinimumBitsPerSample,dataRange->MaximumBitsPerSample));
+                    PA_DEBUG(("\tSampleRate:%d-%d\n",dataRange->MinimumSampleFrequency,dataRange->MaximumSampleFrequency));
+
+                    if( dataRange->MaximumChannels < format->nChannels )
+                    {
+                        result = paInvalidChannelCount;
+                        continue;
+                    }
+                    if( dataRange->MinimumBitsPerSample > format->wBitsPerSample )
+                    {
+                        result = paSampleFormatNotSupported;
+                        continue;
+                    }
+                    if( dataRange->MaximumBitsPerSample < format->wBitsPerSample )
+                    {
+                        result = paSampleFormatNotSupported;
+                        continue;
+                    }
+                    if( dataRange->MinimumSampleFrequency > format->nSamplesPerSec )
+                    {
+                        result = paInvalidSampleRate;
+                        continue;
+                    }
+                    if( dataRange->MaximumSampleFrequency < format->nSamplesPerSec )
+                    {
+                        result = paInvalidSampleRate;
+                        continue;
+                    }
+                    /* Success! */
+                    PA_LOGL_;
+                    return paNoError;
+                }
+            }
+        }
+        dataRange = (KSDATARANGE_AUDIO*)( ((char*)dataRange) + dataRange->DataRange.FormatSize);
+    }
+
+    PA_LOGL_;
+
+    return result;
+}
+
+/**
+ * Create a new filter object
+ */
+static PaWinWdmFilter* FilterNew(TCHAR* filterName, TCHAR* friendlyName, PaError* error)
+{
+    PaWinWdmFilter* filter;
+    PaError result;
+    int pinId;
+    int valid;
+
+
+    /* Allocate the new filter object */
+    filter = (PaWinWdmFilter*)PaUtil_AllocateMemory( sizeof(PaWinWdmFilter) );
+    if( !filter )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* Zero the filter object - done by AllocateMemory */
+    /* memset( (void*)filter, 0, sizeof(PaWinWdmFilter) ); */
+
+    /* Copy the filter name */
+    _tcsncpy(filter->filterName, filterName, MAX_PATH);
+
+    /* Copy the friendly name */
+    _tcsncpy(filter->friendlyName, friendlyName, MAX_PATH);
+
+    /* Open the filter handle */
+    result = FilterUse(filter);
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    /* Get pin count */
+    result = WdmGetPinPropertySimple
+        (
+        filter->handle,
+        0,
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_CTYPES,
+        &filter->pinCount,
+        sizeof(filter->pinCount)
+        );
+
+    if( result != paNoError)
+    {
+        goto error;
+    }
+
+    /* Allocate pointer array to hold the pins */
+    filter->pins = (PaWinWdmPin**)PaUtil_AllocateMemory( sizeof(PaWinWdmPin*) * filter->pinCount );
+    if( !filter->pins )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    /* Create all the pins we can */
+    filter->maxInputChannels = 0;
+    filter->maxOutputChannels = 0;
+    filter->bestSampleRate = 0;
+
+    valid = 0;
+    for(pinId = 0; pinId < filter->pinCount; pinId++)
+    {
+        /* Create the pin with this Id */
+        PaWinWdmPin* newPin;
+        newPin = PinNew(filter, pinId, &result);
+        if( result == paInsufficientMemory )
+            goto error;
+        if( newPin != NULL )
+        {
+            filter->pins[pinId] = newPin;
+            valid = 1;
+
+            /* Get the max output channel count */
+            if(( newPin->dataFlow == KSPIN_DATAFLOW_IN ) &&
+                (( newPin->communication == KSPIN_COMMUNICATION_SINK) ||
+                 ( newPin->communication == KSPIN_COMMUNICATION_BOTH)))
+            {
+                if(newPin->maxChannels > filter->maxOutputChannels)
+                    filter->maxOutputChannels = newPin->maxChannels;
+                filter->formats |= newPin->formats;
+            }
+            /* Get the max input channel count */
+            if(( newPin->dataFlow == KSPIN_DATAFLOW_OUT ) &&
+                (( newPin->communication == KSPIN_COMMUNICATION_SINK) ||
+                 ( newPin->communication == KSPIN_COMMUNICATION_BOTH)))
+            {
+                if(newPin->maxChannels > filter->maxInputChannels)
+                    filter->maxInputChannels = newPin->maxChannels;
+                filter->formats |= newPin->formats;
+            }
+
+            if(newPin->bestSampleRate > filter->bestSampleRate)
+            {
+                filter->bestSampleRate = newPin->bestSampleRate;
+            }
+        }
+    }
+
+    if(( filter->maxInputChannels == 0) && ( filter->maxOutputChannels == 0))
+    {
+        /* No input or output... not valid */
+        valid = 0;
+    }
+
+    if( !valid )
+    {
+        /* No valid pin was found on this filter so we destroy it */
+        result = paDeviceUnavailable;
+        goto error;
+    }
+
+    /* Close the filter handle for now
+     * It will be opened later when needed */
+    FilterRelease(filter);
+
+    *error = paNoError;
+    return filter;
+
+error:
+    /*
+    Error cleanup
+    */
+    if( filter )
+    {
+        for( pinId = 0; pinId < filter->pinCount; pinId++ )
+            PinFree(filter->pins[pinId]);
+        PaUtil_FreeMemory( filter->pins );
+        if( filter->handle )
+            CloseHandle( filter->handle );
+        PaUtil_FreeMemory( filter );
+    }
+    *error = result;
+    return NULL;
+}
+
+/**
+ * Free a previously created filter
+ */
+static void FilterFree(PaWinWdmFilter* filter)
+{
+    int pinId;
+    PA_LOGL_;
+    if( filter )
+    {
+        for( pinId = 0; pinId < filter->pinCount; pinId++ )
+            PinFree(filter->pins[pinId]);
+        PaUtil_FreeMemory( filter->pins );
+        if( filter->handle )
+            CloseHandle( filter->handle );
+        PaUtil_FreeMemory( filter );
+    }
+    PA_LOGE_;
+}
+
+/**
+ * Reopen the filter handle if necessary so it can be used
+ **/
+static PaError FilterUse(PaWinWdmFilter* filter)
+{
+    assert( filter );
+
+    PA_LOGE_;
+    if( filter->handle == NULL )
+    {
+        /* Open the filter */
+        filter->handle = CreateFile(
+            filter->filterName,
+            GENERIC_READ | GENERIC_WRITE,
+            0,
+            NULL,
+            OPEN_EXISTING,
+            FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
+            NULL);
+
+        if( filter->handle == NULL )
+        {
+            return paDeviceUnavailable;
+        }
+    }
+    filter->usageCount++;
+    PA_LOGL_;
+    return paNoError;
+}
+
+/**
+ * Release the filter handle if nobody is using it
+ **/
+static void FilterRelease(PaWinWdmFilter* filter)
+{
+    assert( filter );
+    assert( filter->usageCount > 0 );
+
+    PA_LOGE_;
+    filter->usageCount--;
+    if( filter->usageCount == 0 )
+    {
+        if( filter->handle != NULL )
+        {
+            CloseHandle( filter->handle );
+            filter->handle = NULL;
+        }
+    }
+    PA_LOGL_;
+}
+
+/**
+ * Create a render (playback) Pin using the supplied format
+ **/
+static PaWinWdmPin* FilterCreateRenderPin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error)
+{
+    PaError result;
+    PaWinWdmPin* pin;
+
+    assert( filter );
+
+    pin = FilterFindViableRenderPin(filter,wfex,&result);
+    if(!pin)
+    {
+        goto error;
+    }
+    result = PinSetFormat(pin,wfex);
+    if( result != paNoError )
+    {
+        goto error;
+    }
+    result = PinInstantiate(pin);
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    *error = paNoError;
+    return pin;
+
+error:
+    *error = result;
+    return NULL;
+}
+
+/**
+ * Find a pin that supports the given format
+ **/
+static PaWinWdmPin* FilterFindViableRenderPin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error)
+{
+    int pinId;
+    PaWinWdmPin*  pin;
+    PaError result = paDeviceUnavailable;
+    *error = paNoError;
+
+    assert( filter );
+
+    for( pinId = 0; pinId<filter->pinCount; pinId++ )
+    {
+        pin = filter->pins[pinId];
+        if( pin != NULL )
+        {
+            if(( pin->dataFlow == KSPIN_DATAFLOW_IN ) &&
+                (( pin->communication == KSPIN_COMMUNICATION_SINK) ||
+                 ( pin->communication == KSPIN_COMMUNICATION_BOTH)))
+            {
+                result = PinIsFormatSupported( pin, wfex );
+                if( result == paNoError )
+                {
+                    return pin;
+                }
+            }
+        }
+    }
+
+    *error = result;
+    return NULL;
+}
+
+/**
+ * Check if there is a pin that should playback
+ * with the supplied format
+ **/
+static PaError FilterCanCreateRenderPin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex)
+{
+    PaWinWdmPin* pin;
+    PaError result;
+
+    assert ( filter );
+
+    pin = FilterFindViableRenderPin(filter,wfex,&result);
+    /* result will be paNoError if pin found
+     * or else an error code indicating what is wrong with the format
+     **/
+    return result;
+}
+
+/**
+ * Create a capture (record) Pin using the supplied format
+ **/
+static PaWinWdmPin* FilterCreateCapturePin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error)
+{
+    PaError result;
+    PaWinWdmPin* pin;
+
+    assert( filter );
+
+    pin = FilterFindViableCapturePin(filter,wfex,&result);
+    if(!pin)
+    {
+        goto error;
+    }
+
+    result = PinSetFormat(pin,wfex);
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    result = PinInstantiate(pin);
+    if( result != paNoError )
+    {
+        goto error;
+    }
+
+    *error = paNoError;
+    return pin;
+
+error:
+    *error = result;
+    return NULL;
+}
+
+/**
+ * Find a capture pin that supports the given format
+ **/
+static PaWinWdmPin* FilterFindViableCapturePin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex,
+    PaError* error)
+{
+    int pinId;
+    PaWinWdmPin*  pin;
+    PaError result = paDeviceUnavailable;
+    *error = paNoError;
+
+    assert( filter );
+
+    for( pinId = 0; pinId<filter->pinCount; pinId++ )
+    {
+        pin = filter->pins[pinId];
+        if( pin != NULL )
+        {
+            if(( pin->dataFlow == KSPIN_DATAFLOW_OUT ) &&
+                (( pin->communication == KSPIN_COMMUNICATION_SINK) ||
+                 ( pin->communication == KSPIN_COMMUNICATION_BOTH)))
+            {
+                result = PinIsFormatSupported( pin, wfex );
+                if( result == paNoError )
+                {
+                    return pin;
+                }
+            }
+        }
+    }
+
+    *error = result;
+    return NULL;
+}
+
+/**
+ * Check if there is a pin that should playback
+ * with the supplied format
+ **/
+static PaError FilterCanCreateCapturePin(PaWinWdmFilter* filter,
+    const WAVEFORMATEX* wfex)
+{
+    PaWinWdmPin* pin;
+    PaError result;
+
+    assert ( filter );
+
+    pin = FilterFindViableCapturePin(filter,wfex,&result);
+    /* result will be paNoError if pin found
+     * or else an error code indicating what is wrong with the format
+     **/
+    return result;
+}
+
+/**
+ * Build the list of available filters
+ * Use the SetupDi API to enumerate all devices in the KSCATEGORY_AUDIO which 
+ * have a KSCATEGORY_RENDER or KSCATEGORY_CAPTURE alias. For each of these 
+ * devices initialise a PaWinWdmFilter structure by calling our NewFilter() 
+ * function. We enumerate devices twice, once to count how many there are, 
+ * and once to initialize the PaWinWdmFilter structures.
+ */
+static PaError BuildFilterList(PaWinWdmHostApiRepresentation* wdmHostApi)
+{
+    PaError result = paNoError;
+    HDEVINFO handle = NULL;
+    int device;
+    int invalidDevices;
+    int slot;
+    SP_DEVICE_INTERFACE_DATA interfaceData;
+    SP_DEVICE_INTERFACE_DATA aliasData;
+    SP_DEVINFO_DATA devInfoData;
+    int noError;
+    const int sizeInterface = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + (MAX_PATH * sizeof(WCHAR));
+    unsigned char interfaceDetailsArray[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + (MAX_PATH * sizeof(WCHAR))];
+    SP_DEVICE_INTERFACE_DETAIL_DATA* devInterfaceDetails = (SP_DEVICE_INTERFACE_DETAIL_DATA*)interfaceDetailsArray;
+    TCHAR friendlyName[MAX_PATH];
+    HKEY hkey;
+    DWORD sizeFriendlyName;
+    DWORD type;
+    PaWinWdmFilter* newFilter;
+    GUID* category = (GUID*)&KSCATEGORY_AUDIO;
+    GUID* alias_render = (GUID*)&KSCATEGORY_RENDER;
+    GUID* alias_capture = (GUID*)&KSCATEGORY_CAPTURE;
+    DWORD hasAlias;
+
+    PA_LOGE_;
+
+    devInterfaceDetails->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
+
+    /* Open a handle to search for devices (filters) */
+    handle = SetupDiGetClassDevs(category,NULL,NULL,DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+    if( handle == NULL )
+    {
+        return paUnanticipatedHostError;
+    }
+    PA_DEBUG(("Setup called\n"));
+
+    /* First let's count the number of devices so we can allocate a list */
+    invalidDevices = 0;
+    for( device = 0;;device++ )
+    {
+        interfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+        interfaceData.Reserved = 0;
+        aliasData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+        aliasData.Reserved = 0;
+        noError = SetupDiEnumDeviceInterfaces(handle,NULL,category,device,&interfaceData);
+        PA_DEBUG(("Enum called\n"));
+        if( !noError )
+            break; /* No more devices */
+
+        /* Check this one has the render or capture alias */
+        hasAlias = 0;
+        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_render,&aliasData);
+        PA_DEBUG(("noError = %d\n",noError));
+        if(noError)
+        {
+            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
+            {
+                PA_DEBUG(("Device %d has render alias\n",device));
+                hasAlias |= 1; /* Has render alias */
+            }
+            else
+            {
+                PA_DEBUG(("Device %d has no render alias\n",device));
+            }
+        }
+        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_capture,&aliasData);
+        if(noError)
+        {
+            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
+            {
+                PA_DEBUG(("Device %d has capture alias\n",device));
+                hasAlias |= 2; /* Has capture alias */
+            }
+            else
+            {
+                PA_DEBUG(("Device %d has no capture alias\n",device));
+            }
+        }
+        if(!hasAlias)
+            invalidDevices++; /* This was not a valid capture or render audio device */
+
+    }
+    /* Remember how many there are */
+    wdmHostApi->filterCount = device-invalidDevices;
+
+    PA_DEBUG(("Interfaces found: %d\n",device-invalidDevices));
+
+    /* Now allocate the list of pointers to devices */
+    wdmHostApi->filters  = (PaWinWdmFilter**)PaUtil_AllocateMemory( sizeof(PaWinWdmFilter*) * device );
+    if( !wdmHostApi->filters )
+    {
+        if(handle != NULL)
+            SetupDiDestroyDeviceInfoList(handle);
+        return paInsufficientMemory;
+    }
+
+    /* Now create filter objects for each interface found */
+    slot = 0;
+    for( device = 0;;device++ )
+    {
+        interfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+        interfaceData.Reserved = 0;
+        aliasData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+        aliasData.Reserved = 0;
+        devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+        devInfoData.Reserved = 0;
+
+        noError = SetupDiEnumDeviceInterfaces(handle,NULL,category,device,&interfaceData);
+        if( !noError )
+            break; /* No more devices */
+
+        /* Check this one has the render or capture alias */
+        hasAlias = 0;
+        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_render,&aliasData);
+        if(noError)
+        {
+            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
+            {
+                PA_DEBUG(("Device %d has render alias\n",device));
+                hasAlias |= 1; /* Has render alias */
+            }
+        }
+        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_capture,&aliasData);
+        if(noError)
+        {
+            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
+            {
+                PA_DEBUG(("Device %d has capture alias\n",device));
+                hasAlias |= 2; /* Has capture alias */
+            }
+        }
+        if(!hasAlias)
+            continue; /* This was not a valid capture or render audio device */
+
+        noError = SetupDiGetDeviceInterfaceDetail(handle,&interfaceData,devInterfaceDetails,sizeInterface,NULL,&devInfoData);
+        if( noError )
+        {
+            /* Try to get the "friendly name" for this interface */
+            sizeFriendlyName = sizeof(friendlyName);
+            /* Fix contributed by Ben Allison
+             * Removed KEY_SET_VALUE from flags on following call
+             * as its causes failure when running without admin rights
+             * and it was not required */
+            hkey=SetupDiOpenDeviceInterfaceRegKey(handle,&interfaceData,0,KEY_QUERY_VALUE);
+            if(hkey!=INVALID_HANDLE_VALUE)
+            {
+                noError = RegQueryValueEx(hkey,TEXT("FriendlyName"),0,&type,(BYTE*)friendlyName,&sizeFriendlyName);
+                if( noError == ERROR_SUCCESS )
+                {
+                    PA_DEBUG(("Interface %d, Name: %s\n",device,friendlyName));
+                    RegCloseKey(hkey);
+                }
+                else
+                {
+                    friendlyName[0] = 0;
+                }
+            }
+            newFilter = FilterNew(devInterfaceDetails->DevicePath,friendlyName,&result);
+            if( result == paNoError )
+            {
+                PA_DEBUG(("Filter created\n"));
+                wdmHostApi->filters[slot] = newFilter;
+                slot++;
+            }
+            else
+            {
+                PA_DEBUG(("Filter NOT created\n"));
+                /* As there are now less filters than we initially thought
+                 * we must reduce the count by one */
+                wdmHostApi->filterCount--;
+            }
+        }
+    }
+
+    /* Clean up */
+    if(handle != NULL)
+        SetupDiDestroyDeviceInfoList(handle);
+
+    return paNoError;
+}
+
+PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i, deviceCount;
+    PaWinWdmHostApiRepresentation *wdmHostApi;
+    PaWinWdmDeviceInfo *deviceInfoArray;
+    PaWinWdmFilter* pFilter;
+    PaWinWdmDeviceInfo *wdmDeviceInfo;
+    PaDeviceInfo *deviceInfo;
+
+    PA_LOGE_;
+
+    /*
+    Attempt to load the KSUSER.DLL without which we cannot create pins
+    We will unload this on termination
+    */
+    if(DllKsUser == NULL)
+    {
+        DllKsUser = LoadLibrary(TEXT("ksuser.dll"));
+        if(DllKsUser == NULL)
+            goto error;
+    }
+
+    FunctionKsCreatePin = (KSCREATEPIN*)GetProcAddress(DllKsUser, "KsCreatePin");
+    if(FunctionKsCreatePin == NULL)
+        goto error;
+
+    wdmHostApi = (PaWinWdmHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinWdmHostApiRepresentation) );
+    if( !wdmHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    wdmHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !wdmHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    result = BuildFilterList( wdmHostApi );
+    if( result != paNoError )
+    {
+        goto error;
+    }
+    deviceCount = wdmHostApi->filterCount;
+
+    *hostApi = &wdmHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paWDMKS;
+    (*hostApi)->info.name = "Windows WDM-KS";
+    (*hostApi)->info.defaultInputDevice = paNoDevice;
+    (*hostApi)->info.defaultOutputDevice = paNoDevice;
+
+    if( deviceCount > 0 )
+    {
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+               wdmHostApi->allocations, sizeof(PaWinWdmDeviceInfo*) * deviceCount );
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaWinWdmDeviceInfo*)PaUtil_GroupAllocateMemory(
+                wdmHostApi->allocations, sizeof(PaWinWdmDeviceInfo) * deviceCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for( i=0; i < deviceCount; ++i )
+        {
+            wdmDeviceInfo = &deviceInfoArray[i];
+            deviceInfo = &wdmDeviceInfo->inheritedDeviceInfo;
+            pFilter = wdmHostApi->filters[i];
+            if( pFilter == NULL )
+                continue;
+            wdmDeviceInfo->filter = pFilter;
+            deviceInfo->structVersion = 2;
+            deviceInfo->hostApi = hostApiIndex;
+            deviceInfo->name = (char*)pFilter->friendlyName;
+            PA_DEBUG(("Device found name: %s\n",(char*)pFilter->friendlyName));
+            deviceInfo->maxInputChannels = pFilter->maxInputChannels;
+            if(deviceInfo->maxInputChannels > 0)
+            {
+                /* Set the default input device to the first device we find with
+                 * more than zero input channels
+                 **/
+                if((*hostApi)->info.defaultInputDevice == paNoDevice)
+                {
+                    (*hostApi)->info.defaultInputDevice = i;
+                }
+            }
+
+            deviceInfo->maxOutputChannels = pFilter->maxOutputChannels;
+            if(deviceInfo->maxOutputChannels > 0)
+            {
+                /* Set the default output device to the first device we find with
+                 * more than zero output channels
+                 **/
+                if((*hostApi)->info.defaultOutputDevice == paNoDevice)
+                {
+                    (*hostApi)->info.defaultOutputDevice = i;
+                }
+            }
+
+            /* These low values are not very useful because
+             * a) The lowest latency we end up with can depend on many factors such
+             *    as the device buffer sizes/granularities, sample rate, channels and format
+             * b) We cannot know the device buffer sizes until we try to open/use it at
+             *    a particular setting
+             * So: we give 512x48000Hz frames as the default low input latency
+             **/
+            deviceInfo->defaultLowInputLatency = (512.0/48000.0);
+            deviceInfo->defaultLowOutputLatency = (512.0/48000.0);
+            deviceInfo->defaultHighInputLatency = (4096.0/48000.0);
+            deviceInfo->defaultHighOutputLatency = (4096.0/48000.0);
+            deviceInfo->defaultSampleRate = (double)(pFilter->bestSampleRate);
+
+            (*hostApi)->deviceInfos[i] = deviceInfo;
+        }
+    }
+
+    (*hostApi)->info.deviceCount = deviceCount;
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &wdmHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &wdmHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    PA_LOGL_;
+    return result;
+
+error:
+    if( DllKsUser != NULL )
+    {
+        FreeLibrary( DllKsUser );
+        DllKsUser = NULL;
+    }
+
+    if( wdmHostApi )
+    {
+        PaUtil_FreeMemory( wdmHostApi->filters );
+        if( wdmHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( wdmHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( wdmHostApi->allocations );
+        }
+        PaUtil_FreeMemory( wdmHostApi );
+    }
+    PA_LOGL_;
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
+    int i;
+    PA_LOGE_;
+
+    if( wdmHostApi->filters )
+    {
+        for( i=0; i<wdmHostApi->filterCount; i++)
+        {
+            if( wdmHostApi->filters[i] != NULL )
+            {
+                FilterFree( wdmHostApi->filters[i] );
+                wdmHostApi->filters[i] = NULL;
+            }
+        }
+    }
+    PaUtil_FreeMemory( wdmHostApi->filters );
+    if( wdmHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( wdmHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( wdmHostApi->allocations );
+    }
+    PaUtil_FreeMemory( wdmHostApi );
+    PA_LOGL_;
+}
+
+static void FillWFEXT( WAVEFORMATEXTENSIBLE* pwfext, PaSampleFormat sampleFormat, double sampleRate, int channelCount)
+{
+    PA_LOGE_;
+    PA_DEBUG(( "sampleFormat = %lx\n" , sampleFormat ));
+    PA_DEBUG(( "sampleRate = %f\n" , sampleRate ));
+    PA_DEBUG(( "chanelCount = %d\n", channelCount ));
+
+    pwfext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    pwfext->Format.nChannels = channelCount;
+    pwfext->Format.nSamplesPerSec = (int)sampleRate;
+    if(channelCount == 1)
+        pwfext->dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT;
+    else
+        pwfext->dwChannelMask = KSAUDIO_SPEAKER_STEREO;
+    if(sampleFormat == paFloat32)
+    {
+        pwfext->Format.nBlockAlign = channelCount * 4;
+        pwfext->Format.wBitsPerSample = 32;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 32;
+        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+    }
+    else if(sampleFormat == paInt32)
+    {
+        pwfext->Format.nBlockAlign = channelCount * 4;
+        pwfext->Format.wBitsPerSample = 32;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 32;
+        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    else if(sampleFormat == paInt24)
+    {
+        pwfext->Format.nBlockAlign = channelCount * 3;
+        pwfext->Format.wBitsPerSample = 24;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 24;
+        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    else if(sampleFormat == paInt16)
+    {
+        pwfext->Format.nBlockAlign = channelCount * 2;
+        pwfext->Format.wBitsPerSample = 16;
+        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
+        pwfext->Samples.wValidBitsPerSample = 16;
+        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+    }
+    pwfext->Format.nAvgBytesPerSec = pwfext->Format.nSamplesPerSec * pwfext->Format.nBlockAlign;
+
+    PA_LOGL_;
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
+    PaWinWdmFilter* pFilter;
+    int result = paFormatIsSupported;
+    WAVEFORMATEXTENSIBLE wfx;
+
+    PA_LOGE_;
+
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( inputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support inputChannelCount */
+        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+        /* Check that the input format is supported */
+        FillWFEXT(&wfx,paInt16,sampleRate,inputChannelCount);
+
+        pFilter = wdmHostApi->filters[inputParameters->device];
+        result = FilterCanCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx);
+        if( result != paNoError )
+        {
+            /* Try a WAVE_FORMAT_PCM instead */
+            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+            wfx.Format.cbSize = 0;
+            wfx.Samples.wValidBitsPerSample = 0;
+            wfx.dwChannelMask = 0;
+            wfx.SubFormat = GUID_NULL;
+            result = FilterCanCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx);
+            if( result != paNoError )
+                 return result;
+        }
+    }
+    else
+    {
+        inputChannelCount = 0;
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( outputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support outputChannelCount */
+        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+        /* Check that the output format is supported */
+        FillWFEXT(&wfx,paInt16,sampleRate,outputChannelCount);
+
+        pFilter = wdmHostApi->filters[outputParameters->device];
+        result = FilterCanCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx);
+        if( result != paNoError )
+        {
+            /* Try a WAVE_FORMAT_PCM instead */
+            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+            wfx.Format.cbSize = 0;
+            wfx.Samples.wValidBitsPerSample = 0;
+            wfx.dwChannelMask = 0;
+            wfx.SubFormat = GUID_NULL;
+            result = FilterCanCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx);
+            if( result != paNoError )
+                 return result;
+        }
+
+    }
+    else
+    {
+        outputChannelCount = 0;
+    }
+
+    /*
+        IMPLEMENT ME:
+
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported if necessary
+
+            - check that the device supports sampleRate
+
+        Because the buffer adapter handles conversion between all standard
+        sample formats, the following checks are only required if paCustomFormat
+        is implemented, or under some other unusual conditions.
+
+            - check that input device can support inputSampleFormat, or that
+                we have the capability to convert from inputSampleFormat to
+                a native format
+
+            - check that output device can support outputSampleFormat, or that
+                we have the capability to convert from outputSampleFormat to
+                a native format
+    */
+    if((inputChannelCount == 0)&&(outputChannelCount == 0))
+            result = paSampleFormatNotSupported; /* Not right error */
+
+    PA_LOGL_;
+    return result;
+}
+
+/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result = paNoError;
+    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
+    PaWinWdmStream *stream = 0;
+    /* unsigned long framesPerHostBuffer; these may not be equivalent for all implementations */
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+    int userInputChannels,userOutputChannels;
+    int size;
+    PaWinWdmFilter* pFilter;
+    WAVEFORMATEXTENSIBLE wfx;
+
+    PA_LOGE_;
+    PA_DEBUG(("OpenStream:sampleRate = %f\n",sampleRate));
+    PA_DEBUG(("OpenStream:framesPerBuffer = %lu\n",framesPerBuffer));
+
+    if( inputParameters )
+    {
+        userInputChannels = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that input device can support stream->userInputChannels */
+        if( userInputChannels > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
+            return paInvalidChannelCount;
+
+        /* validate inputStreamInfo */
+        if( inputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+    }
+    else
+    {
+        userInputChannels = 0;
+        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
+    }
+
+    if( outputParameters )
+    {
+        userOutputChannels = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+
+        /* unless alternate device specification is supported, reject the use of
+            paUseHostApiSpecificDeviceSpecification */
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
+            return paInvalidDevice;
+
+        /* check that output device can support stream->userInputChannels */
+        if( userOutputChannels > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
+            return paInvalidChannelCount;
+
+        /* validate outputStreamInfo */
+        if( outputParameters->hostApiSpecificStreamInfo )
+            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
+
+    }
+    else
+    {
+        userOutputChannels = 0;
+        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
+    }
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+    stream = (PaWinWdmStream*)PaUtil_AllocateMemory( sizeof(PaWinWdmStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    /* Zero the stream object */
+    /* memset((void*)stream,0,sizeof(PaWinWdmStream)); */
+
+    if( streamCallback )
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &wdmHostApi->callbackStreamInterface, streamCallback, userData );
+    }
+    else
+    {
+        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                               &wdmHostApi->blockingStreamInterface, streamCallback, userData );
+    }
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+    /* Instantiate the input pin if necessary */
+    if(userInputChannels > 0)
+    {
+        result = paSampleFormatNotSupported;
+        pFilter = wdmHostApi->filters[inputParameters->device];
+        stream->userInputChannels = userInputChannels;
+
+        if(((inputSampleFormat & ~paNonInterleaved) & pFilter->formats) != 0)
+        {   /* inputSampleFormat is supported, so try to use it */
+            hostInputSampleFormat = inputSampleFormat;
+            FillWFEXT(&wfx, hostInputSampleFormat, sampleRate, stream->userInputChannels);
+            stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
+            stream->recordingPin = FilterCreateCapturePin(pFilter, (const WAVEFORMATEX*)&wfx, &result);
+            stream->deviceInputChannels = stream->userInputChannels;
+        }
+        
+        if(result != paNoError)
+        {   /* Search through all PaSampleFormats to find one that works */
+            hostInputSampleFormat = paFloat32;
+
+            do {
+                FillWFEXT(&wfx, hostInputSampleFormat, sampleRate, stream->userInputChannels);
+                stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
+                stream->recordingPin = FilterCreateCapturePin(pFilter, (const WAVEFORMATEX*)&wfx, &result);
+                stream->deviceInputChannels = stream->userInputChannels;
+                
+                if(stream->recordingPin == NULL) result = paSampleFormatNotSupported;
+                if(result != paNoError)    hostInputSampleFormat <<= 1;
+            }
+            while(result != paNoError && hostInputSampleFormat <= paUInt8);
+        }
+
+        if(result != paNoError)
+        {    /* None of the PaSampleFormats worked.  Set the hostInputSampleFormat to the best fit
+             * and try a PCM format.
+             **/
+            hostInputSampleFormat =
+                PaUtil_SelectClosestAvailableFormat( pFilter->formats, inputSampleFormat );
+
+            /* Try a WAVE_FORMAT_PCM instead */
+            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+            wfx.Format.cbSize = 0;
+            wfx.Samples.wValidBitsPerSample = 0;
+            wfx.dwChannelMask = 0;
+            wfx.SubFormat = GUID_NULL;
+            stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
+            if(stream->recordingPin == NULL) result = paSampleFormatNotSupported;
+        }
+
+        if( result != paNoError )
+        {
+            /* Some or all KS devices can only handle the exact number of channels
+             * they specify. But PortAudio clients expect to be able to
+             * at least specify mono I/O on a multi-channel device
+             * If this is the case, then we will do the channel mapping internally
+             **/
+            if( stream->userInputChannels < pFilter->maxInputChannels )
+            {
+                FillWFEXT(&wfx,hostInputSampleFormat,sampleRate,pFilter->maxInputChannels);
+                stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
+                stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
+                stream->deviceInputChannels = pFilter->maxInputChannels;
+
+                if( result != paNoError )
+                {
+                    /* Try a WAVE_FORMAT_PCM instead */
+                    wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+                    wfx.Format.cbSize = 0;
+                    wfx.Samples.wValidBitsPerSample = 0;
+                    wfx.dwChannelMask = 0;
+                    wfx.SubFormat = GUID_NULL;
+                    stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
+                }
+            }
+        }
+
+        if(stream->recordingPin == NULL)
+        {
+            goto error;
+        }
+
+        switch(hostInputSampleFormat)
+        {
+            case paInt16: stream->inputSampleSize = 2; break;
+            case paInt24: stream->inputSampleSize = 3; break;
+            case paInt32:
+            case paFloat32:    stream->inputSampleSize = 4; break;
+        }
+
+        stream->recordingPin->frameSize /= stream->bytesPerInputFrame;
+        PA_DEBUG(("Pin output frames: %d\n",stream->recordingPin->frameSize));
+    }
+    else
+    {
+        stream->recordingPin = NULL;
+        stream->bytesPerInputFrame = 0;
+    }
+
+    /* Instantiate the output pin if necessary */
+    if(userOutputChannels > 0)
+    {
+        result = paSampleFormatNotSupported;
+        pFilter = wdmHostApi->filters[outputParameters->device];
+        stream->userOutputChannels = userOutputChannels;
+
+        if(((outputSampleFormat & ~paNonInterleaved) & pFilter->formats) != 0)
+        {
+            hostOutputSampleFormat = outputSampleFormat;
+            FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,stream->userOutputChannels);
+            stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
+            stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
+            stream->deviceOutputChannels = stream->userOutputChannels;
+        }
+
+        if(result != paNoError)
+        {
+            hostOutputSampleFormat = paFloat32;
+
+            do {
+                FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,stream->userOutputChannels);
+                stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
+                stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
+                stream->deviceOutputChannels = stream->userOutputChannels;
+
+                if(stream->playbackPin == NULL) result = paSampleFormatNotSupported;
+                if(result != paNoError)    hostOutputSampleFormat <<= 1;
+            }
+            while(result != paNoError && hostOutputSampleFormat <= paUInt8);
+        }
+
+        if(result != paNoError)
+        {
+            hostOutputSampleFormat =
+                PaUtil_SelectClosestAvailableFormat( pFilter->formats, outputSampleFormat );
+       
+            /* Try a WAVE_FORMAT_PCM instead */
+            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+            wfx.Format.cbSize = 0;
+            wfx.Samples.wValidBitsPerSample = 0;
+            wfx.dwChannelMask = 0;
+            wfx.SubFormat = GUID_NULL;
+            stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
+            if(stream->playbackPin == NULL) result = paSampleFormatNotSupported;
+        }
+            
+        if( result != paNoError )
+        {
+            /* Some or all KS devices can only handle the exact number of channels
+             * they specify. But PortAudio clients expect to be able to
+             * at least specify mono I/O on a multi-channel device
+             * If this is the case, then we will do the channel mapping internally
+             **/
+            if( stream->userOutputChannels < pFilter->maxOutputChannels )
+            {
+                FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,pFilter->maxOutputChannels);
+                stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
+                stream->playbackPin = FilterCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
+                stream->deviceOutputChannels = pFilter->maxOutputChannels;
+                if( result != paNoError )
+                {
+                    /* Try a WAVE_FORMAT_PCM instead */
+                    wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
+                    wfx.Format.cbSize = 0;
+                    wfx.Samples.wValidBitsPerSample = 0;
+                    wfx.dwChannelMask = 0;
+                    wfx.SubFormat = GUID_NULL;
+                    stream->playbackPin = FilterCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
+                }
+            }
+        }
+
+        if(stream->playbackPin == NULL)
+        {
+            goto error;
+        }
+
+        switch(hostOutputSampleFormat)
+        {
+            case paInt16: stream->outputSampleSize = 2; break;
+            case paInt24: stream->outputSampleSize = 3; break;
+            case paInt32:
+            case paFloat32: stream->outputSampleSize = 4; break;
+        }
+
+        stream->playbackPin->frameSize /= stream->bytesPerOutputFrame;
+        PA_DEBUG(("Pin output frames: %d\n",stream->playbackPin->frameSize));
+    }
+    else
+    {
+        stream->playbackPin = NULL;
+        stream->bytesPerOutputFrame = 0;
+    }
+
+    /* Calculate the framesPerHostXxxxBuffer size based upon the suggested latency values */
+
+    /* Record the buffer length */
+    if(inputParameters)
+    {
+        /* Calculate the frames from the user's value - add a bit to round up */
+            stream->framesPerHostIBuffer = (unsigned long)((inputParameters->suggestedLatency*sampleRate)+0.0001);
+        if(stream->framesPerHostIBuffer > (unsigned long)sampleRate)
+        { /* Upper limit is 1 second */
+              stream->framesPerHostIBuffer = (unsigned long)sampleRate;
+        }
+        else if(stream->framesPerHostIBuffer < stream->recordingPin->frameSize)
+        {
+              stream->framesPerHostIBuffer = stream->recordingPin->frameSize;
+        }
+        PA_DEBUG(("Input frames chosen:%ld\n",stream->framesPerHostIBuffer));
+    }
+
+    if(outputParameters)
+    {
+        /* Calculate the frames from the user's value - add a bit to round up */
+        stream->framesPerHostOBuffer = (unsigned long)((outputParameters->suggestedLatency*sampleRate)+0.0001);
+        if(stream->framesPerHostOBuffer > (unsigned long)sampleRate)
+        { /* Upper limit is 1 second */
+                  stream->framesPerHostOBuffer = (unsigned long)sampleRate;
+        }
+        else if(stream->framesPerHostOBuffer < stream->playbackPin->frameSize)
+        {
+              stream->framesPerHostOBuffer = stream->playbackPin->frameSize;
+        }
+        PA_DEBUG(("Output frames chosen:%ld\n",stream->framesPerHostOBuffer));
+    }
+
+    /* Host buffer size is bounded to the largest of the input and output
+    frame sizes */
+
+    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+              stream->userInputChannels, inputSampleFormat, hostInputSampleFormat,
+              stream->userOutputChannels, outputSampleFormat, hostOutputSampleFormat,
+              sampleRate, streamFlags, framesPerBuffer,
+              max(stream->framesPerHostOBuffer,stream->framesPerHostIBuffer),
+              paUtilBoundedHostBufferSize,
+              streamCallback, userData );
+    if( result != paNoError )
+        goto error;
+
+    stream->streamRepresentation.streamInfo.inputLatency =
+            ((double)stream->framesPerHostIBuffer) / sampleRate;
+    stream->streamRepresentation.streamInfo.outputLatency =
+            ((double)stream->framesPerHostOBuffer) / sampleRate;
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+      PA_DEBUG(("BytesPerInputFrame = %d\n",stream->bytesPerInputFrame));
+      PA_DEBUG(("BytesPerOutputFrame = %d\n",stream->bytesPerOutputFrame));
+
+    /* Allocate all the buffers for host I/O */
+    size = 2 * (stream->framesPerHostIBuffer*stream->bytesPerInputFrame +  stream->framesPerHostOBuffer*stream->bytesPerOutputFrame);
+    PA_DEBUG(("Buffer size = %d\n",size));
+    stream->hostBuffer = (char*)PaUtil_AllocateMemory(size);
+    PA_DEBUG(("Buffer allocated\n"));
+    if( !stream->hostBuffer )
+    {
+        PA_DEBUG(("Cannot allocate host buffer!\n"));
+        result = paInsufficientMemory;
+        goto error;
+    }
+    PA_DEBUG(("Buffer start = %p\n",stream->hostBuffer));
+    /* memset(stream->hostBuffer,0,size); */
+
+    /* Set up the packets */
+    stream->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ResetEvent(stream->events[0]); /* Record buffer 1 */
+    stream->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ResetEvent(stream->events[1]); /* Record buffer 2 */
+    stream->events[2] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ResetEvent(stream->events[2]); /* Play buffer 1 */
+    stream->events[3] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ResetEvent(stream->events[3]); /* Play buffer 2 */
+    stream->events[4] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ResetEvent(stream->events[4]); /* Abort event */
+    if(stream->userInputChannels > 0)
+    {
+        DATAPACKET *p = &(stream->packets[0]);
+        p->Signal.hEvent = stream->events[0];
+        p->Header.Data = stream->hostBuffer;
+        p->Header.FrameExtent = stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
+        p->Header.DataUsed = 0;
+        p->Header.Size = sizeof(p->Header);
+        p->Header.PresentationTime.Numerator = 1;
+        p->Header.PresentationTime.Denominator = 1;
+
+        p = &(stream->packets[1]);
+        p->Signal.hEvent = stream->events[1];
+        p->Header.Data = stream->hostBuffer + stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
+        p->Header.FrameExtent = stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
+        p->Header.DataUsed = 0;
+        p->Header.Size = sizeof(p->Header);
+        p->Header.PresentationTime.Numerator = 1;
+        p->Header.PresentationTime.Denominator = 1;
+    }
+    if(stream->userOutputChannels > 0)
+    {
+        DATAPACKET *p = &(stream->packets[2]);
+        p->Signal.hEvent = stream->events[2];
+        p->Header.Data = stream->hostBuffer + 2*stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
+        p->Header.FrameExtent = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
+        p->Header.DataUsed = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
+        p->Header.Size = sizeof(p->Header);
+        p->Header.PresentationTime.Numerator = 1;
+        p->Header.PresentationTime.Denominator = 1;
+    
+        p = &(stream->packets[3]);
+        p->Signal.hEvent = stream->events[3];
+        p->Header.Data = stream->hostBuffer + 2*stream->framesPerHostIBuffer*stream->bytesPerInputFrame + stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
+        p->Header.FrameExtent = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
+        p->Header.DataUsed = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
+        p->Header.Size = sizeof(p->Header);
+        p->Header.PresentationTime.Numerator = 1;
+        p->Header.PresentationTime.Denominator = 1;
+    }
+
+    stream->streamStarted = 0;
+    stream->streamActive = 0;
+    stream->streamStop = 0;
+    stream->streamAbort = 0;
+    stream->streamFlags = streamFlags;
+    stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
+
+    *s = (PaStream*)stream;
+
+    PA_LOGL_;
+    return result;
+
+error:
+    size = 5;
+    while(size--)
+    {
+        if(stream->events[size] != NULL)
+        {
+            CloseHandle(stream->events[size]);
+            stream->events[size] = NULL;
+        }
+    }
+    if(stream->hostBuffer)
+        PaUtil_FreeMemory( stream->hostBuffer );
+
+    if(stream->playbackPin)
+        PinClose(stream->playbackPin);
+    if(stream->recordingPin)
+        PinClose(stream->recordingPin);
+
+    if( stream )
+        PaUtil_FreeMemory( stream );
+
+    PA_LOGL_;
+    return result;
+}
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result = paNoError;
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    int size;
+
+    PA_LOGE_;
+
+    assert(!stream->streamStarted);
+    assert(!stream->streamActive);
+
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    size = 5;
+    while(size--)
+    {
+        if(stream->events[size] != NULL)
+        {
+            CloseHandle(stream->events[size]);
+            stream->events[size] = NULL;
+        }
+    }
+    if(stream->hostBuffer)
+        PaUtil_FreeMemory( stream->hostBuffer );
+
+    if(stream->playbackPin)
+        PinClose(stream->playbackPin);
+    if(stream->recordingPin)
+        PinClose(stream->recordingPin);
+
+    PaUtil_FreeMemory( stream );
+
+    PA_LOGL_;
+    return result;
+}
+
+/*
+Write the supplied packet to the pin
+Asynchronous
+Should return false on success
+*/
+static BOOL PinWrite(HANDLE h, DATAPACKET* p)
+{
+    unsigned long cbReturned = 0;
+    return DeviceIoControl(h,IOCTL_KS_WRITE_STREAM,NULL,0,
+                            &p->Header,p->Header.Size,&cbReturned,&p->Signal);
+}
+
+/*
+Read to the supplied packet from the pin
+Asynchronous
+Should return false on success
+*/
+static BOOL PinRead(HANDLE h, DATAPACKET* p)
+{
+    unsigned long cbReturned = 0;
+    return DeviceIoControl(h,IOCTL_KS_READ_STREAM,NULL,0,
+                            &p->Header,p->Header.Size,&cbReturned,&p->Signal);
+}
+
+/*
+Copy the first interleaved channel of 16 bit data to the other channels
+*/
+static void DuplicateFirstChannelInt16(void* buffer, int channels, int samples)
+{
+    unsigned short* data = (unsigned short*)buffer;
+    int channel;
+    unsigned short sourceSample;
+    while( samples-- )
+    {
+        sourceSample = *data++;
+        channel = channels-1;
+        while( channel-- )
+        {
+            *data++ = sourceSample;
+        }
+    }
+}
+
+/*
+Copy the first interleaved channel of 24 bit data to the other channels
+*/
+static void DuplicateFirstChannelInt24(void* buffer, int channels, int samples)
+{
+    unsigned char* data = (unsigned char*)buffer;
+    int channel;
+    unsigned char sourceSample[3];
+    while( samples-- )
+    {
+        sourceSample[0] = data[0];
+        sourceSample[1] = data[1];
+        sourceSample[2] = data[2];
+        data += 3;
+        channel = channels-1;
+        while( channel-- )
+        {
+            data[0] = sourceSample[0];
+            data[1] = sourceSample[1];
+            data[2] = sourceSample[2];
+            data += 3;
+        }
+    }
+}
+
+/*
+Copy the first interleaved channel of 32 bit data to the other channels
+*/
+static void DuplicateFirstChannelInt32(void* buffer, int channels, int samples)
+{
+    unsigned long* data = (unsigned long*)buffer;
+    int channel;
+    unsigned long sourceSample;
+    while( samples-- )
+    {
+        sourceSample = *data++;
+        channel = channels-1;
+        while( channel-- )
+        {
+            *data++ = sourceSample;
+        }
+    }
+}
+
+static DWORD WINAPI ProcessingThread(LPVOID pParam)
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)pParam;
+    PaStreamCallbackTimeInfo ti;
+    int cbResult = paContinue;
+    int inbuf = 0;
+    int outbuf = 0;
+    int pending = 0;
+    PaError result;
+    unsigned long wait;
+    unsigned long eventSignaled;
+    int fillPlaybuf = 0;
+    int emptyRecordbuf = 0;
+    int framesProcessed;
+    unsigned long timeout;
+    int i;
+    int doChannelCopy;
+    int priming = 0;
+    PaStreamCallbackFlags underover = 0;
+
+    PA_LOGE_;
+
+    ti.inputBufferAdcTime = 0.0;
+    ti.currentTime = 0.0;
+    ti.outputBufferDacTime = 0.0;
+
+    /* Get double buffering going */
+
+    /* Submit buffers */
+    if(stream->playbackPin)
+    {
+        result = PinSetState(stream->playbackPin, KSSTATE_RUN);
+
+        PA_DEBUG(("play state run = %d;",(int)result));
+        SetEvent(stream->events[outbuf+2]);
+        outbuf = (outbuf+1)&1;
+        SetEvent(stream->events[outbuf+2]);
+        outbuf = (outbuf+1)&1;
+        pending += 2;
+        priming += 4;
+    }
+    if(stream->recordingPin)
+    {
+        result = PinSetState(stream->recordingPin, KSSTATE_RUN);
+
+        PA_DEBUG(("recording state run = %d;",(int)result));
+        PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
+        inbuf = (inbuf+1)&1; /* Increment and wrap */
+        PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
+        inbuf = (inbuf+1)&1; /* Increment and wrap */
+        /* FIXME - do error checking */
+        pending += 2;
+    }
+    PA_DEBUG(("Out buffer len:%f\n",(2000*stream->framesPerHostOBuffer) / stream->streamRepresentation.streamInfo.sampleRate));
+    PA_DEBUG(("In buffer len:%f\n",(2000*stream->framesPerHostIBuffer) / stream->streamRepresentation.streamInfo.sampleRate));
+    timeout = max(
+       ((2000*(DWORD)stream->framesPerHostOBuffer) / (DWORD)stream->streamRepresentation.streamInfo.sampleRate),
+       ((2000*(DWORD)stream->framesPerHostIBuffer) / (DWORD)stream->streamRepresentation.streamInfo.sampleRate));
+    timeout = max(timeout,1);
+    PA_DEBUG(("Timeout = %ld\n",timeout));
+
+    while(!stream->streamAbort)
+    {
+        fillPlaybuf = 0;
+        emptyRecordbuf = 0;
+
+        /* Wait for next input or output buffer to be finished with*/
+        assert(pending>0);
+
+        if(stream->streamStop)
+        {
+            PA_DEBUG(("ss1:pending=%d ",pending));
+        }
+        wait = WaitForMultipleObjects(5, stream->events, FALSE, 0);
+        if( wait == WAIT_TIMEOUT )
+        {
+            /* No (under|over)flow has ocurred */
+            wait = WaitForMultipleObjects(5, stream->events, FALSE, timeout);
+            eventSignaled = wait - WAIT_OBJECT_0;
+        }
+        else
+        {
+            eventSignaled = wait - WAIT_OBJECT_0;
+            if( eventSignaled < 2 )
+            {
+                underover |= paInputOverflow;
+                PA_DEBUG(("Input overflow\n"));
+            }
+            else if(( eventSignaled < 4 )&&(!priming))
+            {
+                underover |= paOutputUnderflow;
+                PA_DEBUG(("Output underflow\n"));
+            }
+        }
+
+        if(stream->streamStop)
+        {
+            PA_DEBUG(("ss2:wait=%ld",wait));
+        }
+        if(wait == WAIT_FAILED)
+        {
+            PA_DEBUG(("Wait fail = %ld! ",wait));
+            break;
+        }
+        if(wait == WAIT_TIMEOUT)
+        {
+            continue;
+        }
+
+        if(eventSignaled < 2)
+        { /* Recording input buffer has been filled */
+            if(stream->playbackPin)
+            {
+                /* First check if also the next playback buffer has been signaled */
+                wait = WaitForSingleObject(stream->events[outbuf+2],0);
+                if(wait == WAIT_OBJECT_0)
+                {
+                    /* Yes, so do both buffers at same time */
+                    fillPlaybuf = 1;
+                    pending--;
+                    /* Was this an underflow situation? */
+                    if( underover )
+                        underover |= paOutputUnderflow; /* Yes! */
+                }
+            }
+            emptyRecordbuf = 1;
+            pending--;
+        }
+        else if(eventSignaled < 4)
+        { /* Playback output buffer has been emptied */
+            if(stream->recordingPin)
+            {
+                /* First check if also the next recording buffer has been signaled */
+                wait = WaitForSingleObject(stream->events[inbuf],0);
+                if(wait == WAIT_OBJECT_0)
+                { /* Yes, so do both buffers at same time */
+                    emptyRecordbuf = 1;
+                    pending--;
+                    /* Was this an overflow situation? */
+                    if( underover )
+                        underover |= paInputOverflow; /* Yes! */
+                }
+            }
+            fillPlaybuf = 1;
+            pending--;
+        }
+        else
+        {
+            /* Abort event! */
+            assert(stream->streamAbort); /* Should have been set */
+            PA_DEBUG(("ABORTING "));
+            break;
+        }
+        ResetEvent(stream->events[eventSignaled]);
+
+        if(stream->streamStop)
+        {
+            PA_DEBUG(("Stream stop! pending=%d",pending));
+            cbResult = paComplete; /* Stop, but play remaining buffers */
+        }
+
+        /* Do necessary buffer processing (which will invoke user callback if necessary */
+        doChannelCopy = 0;
+        if(cbResult==paContinue)
+        {
+            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+            if((stream->bufferProcessor.hostInputFrameCount[0] + stream->bufferProcessor.hostInputFrameCount[1]) ==
+                (stream->bufferProcessor.hostOutputFrameCount[0] + stream->bufferProcessor.hostOutputFrameCount[1]) )
+                PaUtil_BeginBufferProcessing(&stream->bufferProcessor,&ti,underover);
+            underover = 0; /* Reset the (under|over)flow status */
+            if(fillPlaybuf)
+            {
+                PaUtil_SetOutputFrameCount(&stream->bufferProcessor,0);
+                if( stream->userOutputChannels == 1 )
+                {
+                    /* Write the single user channel to the first interleaved block */
+                    PaUtil_SetOutputChannel(&stream->bufferProcessor,0,stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels);
+                    /* We will do a copy to the other channels after the data has been written */
+                    doChannelCopy = 1;
+                }
+                else
+                {
+                    for(i=0;i<stream->userOutputChannels;i++)
+                    {
+                        /* Only write the user output channels. Leave the rest blank */
+                        PaUtil_SetOutputChannel(&stream->bufferProcessor,i,((unsigned char*)(stream->packets[outbuf+2].Header.Data))+(i*stream->outputSampleSize),stream->deviceOutputChannels);
+                    }
+                }
+            }
+            if(emptyRecordbuf)
+            {
+                PaUtil_SetInputFrameCount(&stream->bufferProcessor,stream->packets[inbuf].Header.DataUsed/stream->bytesPerInputFrame);
+                for(i=0;i<stream->userInputChannels;i++)
+                {
+                    /* Only read as many channels as the user wants */
+                    PaUtil_SetInputChannel(&stream->bufferProcessor,i,((unsigned char*)(stream->packets[inbuf].Header.Data))+(i*stream->inputSampleSize),stream->deviceInputChannels);
+                }
+            }
+            
+            if (stream->recordingPin && stream->playbackPin) /* full duplex */
+            {
+                /* Only call the EndBufferProcessing function when the total input frames == total output frames */
+
+                if((stream->bufferProcessor.hostInputFrameCount[0] + stream->bufferProcessor.hostInputFrameCount[1]) ==
+                        (stream->bufferProcessor.hostOutputFrameCount[0] + stream->bufferProcessor.hostOutputFrameCount[1]) )
+                {
+                    framesProcessed = PaUtil_EndBufferProcessing(&stream->bufferProcessor,&cbResult);
+                }
+                else
+                {
+                    framesProcessed = 0;
+                }
+            }
+            else 
+            {
+                framesProcessed = PaUtil_EndBufferProcessing(&stream->bufferProcessor,&cbResult);
+            }
+
+            if( doChannelCopy )
+            {
+                /* Copy the first output channel to the other channels */
+                switch(stream->outputSampleSize)
+                {
+                    case 2:
+                        DuplicateFirstChannelInt16(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
+                        break;
+                    case 3:
+                        DuplicateFirstChannelInt24(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
+                        break;
+                    case 4:
+                        DuplicateFirstChannelInt32(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
+                        break;
+                    default:
+                        assert(0); /* Unsupported format! */
+                        break;
+                }
+            }
+            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+        }
+        else
+        {
+            fillPlaybuf = 0;
+            emptyRecordbuf = 0;
+        }
+            
+        /*
+        if(cbResult != paContinue)
+        {
+            PA_DEBUG(("cbResult=%d, pending=%d:",cbResult,pending));
+        }
+        */
+        /* Submit buffers */
+        if((fillPlaybuf)&&(cbResult!=paAbort))
+        {
+            if(!PinWrite(stream->playbackPin->handle,&stream->packets[outbuf+2]))
+                outbuf = (outbuf+1)&1; /* Increment and wrap */
+            pending++;
+            if( priming )
+                priming--; /* Have to prime twice */
+        }
+        if((emptyRecordbuf)&&(cbResult==paContinue))
+        {
+            stream->packets[inbuf].Header.DataUsed = 0; /* Reset for reuse */
+            PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
+            inbuf = (inbuf+1)&1; /* Increment and wrap */
+            pending++;
+        }
+        if(pending==0)
+        {
+            PA_DEBUG(("pending==0 finished...;"));
+            break;
+        }
+        if((!stream->playbackPin)&&(cbResult!=paContinue))
+        {
+            PA_DEBUG(("record only cbResult=%d...;",cbResult));
+            break;
+        }
+    }
+
+    PA_DEBUG(("Finished thread"));
+
+    /* Finished, either normally or aborted */
+    if(stream->playbackPin)
+    {
+        result = PinSetState(stream->playbackPin, KSSTATE_PAUSE);
+        result = PinSetState(stream->playbackPin, KSSTATE_STOP);
+    }
+    if(stream->recordingPin)
+    {
+        result = PinSetState(stream->recordingPin, KSSTATE_PAUSE);
+        result = PinSetState(stream->recordingPin, KSSTATE_STOP);
+    }
+
+    stream->streamActive = 0;
+
+    if((!stream->streamStop)&&(!stream->streamAbort))
+    {
+          /* Invoke the user stream finished callback */
+          /* Only do it from here if not being stopped/aborted by user */
+          if( stream->streamRepresentation.streamFinishedCallback != 0 )
+              stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+    stream->streamStop = 0;
+    stream->streamAbort = 0;
+
+    /* Reset process priority if necessary */
+    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
+    {
+        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
+        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
+    }
+
+    PA_LOGL_;
+    EXIT_THREAD;
+    return 0;
+}
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    DWORD dwID;
+    BOOL ret;
+    int size;
+
+    PA_LOGE_;
+
+    stream->streamStop = 0;
+    stream->streamAbort = 0;
+    size = 5;
+    while(size--)
+    {
+        if(stream->events[size] != NULL)
+        {
+            ResetEvent(stream->events[size]);
+        }
+    }
+
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+
+    stream->oldProcessPriority = GetPriorityClass(GetCurrentProcess());
+    /* Uncomment the following line to enable dynamic boosting of the process
+     * priority to real time for best low latency support
+     * Disabled by default because RT processes can easily block the OS */
+    /*ret = SetPriorityClass(GetCurrentProcess(),REALTIME_PRIORITY_CLASS);
+      PA_DEBUG(("Class ret = %d;",ret));*/
+
+    stream->streamStarted = 1;
+    stream->streamThread = (HANDLE)_beginthreadex(NULL, 0, ProcessingThread, stream, 0, &dwID);
+    if(stream->streamThread == NULL)
+    {
+        stream->streamStarted = 0;
+        result = paInsufficientMemory;
+        goto end;
+    }
+    ret = SetThreadPriority(stream->streamThread,THREAD_PRIORITY_TIME_CRITICAL);
+    PA_DEBUG(("Priority ret = %d;",ret));
+    /* Make the stream active */
+    stream->streamActive = 1;
+
+end:
+    PA_LOGL_;
+    return result;
+}
+
+
+static PaError StopStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    int doCb = 0;
+
+    PA_LOGE_;
+
+    if(stream->streamActive)
+    {
+        doCb = 1;
+        stream->streamStop = 1;
+        while(stream->streamActive)
+        {
+            PA_DEBUG(("W."));
+            Sleep(10); /* Let thread sleep for 10 msec */
+        }
+    }
+
+    PA_DEBUG(("Terminating thread"));
+    if(stream->streamStarted && stream->streamThread)
+    {
+        TerminateThread(stream->streamThread,0);
+        stream->streamThread = NULL;
+    }
+
+    stream->streamStarted = 0;
+
+    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
+    {
+        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
+        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
+    }
+
+    if(doCb)
+    {
+        /* Do user callback now after all state has been reset */
+        /* This means it should be safe for the called function */
+        /* to invoke e.g. StartStream */
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+             stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+
+    PA_LOGL_;
+    return result;
+}
+
+static PaError AbortStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    int doCb = 0;
+
+    PA_LOGE_;
+
+    if(stream->streamActive)
+    {
+        doCb = 1;
+        stream->streamAbort = 1;
+        SetEvent(stream->events[4]); /* Signal immediately */
+        while(stream->streamActive)
+        {
+            Sleep(10);
+        }
+    }
+
+    if(stream->streamStarted && stream->streamThread)
+    {
+        TerminateThread(stream->streamThread,0);
+        stream->streamThread = NULL;
+    }
+
+    stream->streamStarted = 0;
+
+    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
+    {
+        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
+        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
+    }
+
+    if(doCb)
+    {
+        /* Do user callback now after all state has been reset */
+        /* This means it should be safe for the called function */
+        /* to invoke e.g. StartStream */
+        if( stream->streamRepresentation.streamFinishedCallback != 0 )
+            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+    }
+
+    stream->streamActive = 0;
+    stream->streamStarted = 0;
+
+    PA_LOGL_;
+    return result;
+}
+
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    int result = 0;
+
+    PA_LOGE_;
+
+    if(!stream->streamStarted)
+        result = 1;
+
+    PA_LOGL_;
+    return result;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    int result = 0;
+
+    PA_LOGE_;
+
+    if(stream->streamActive)
+        result = 1;
+
+    PA_LOGL_;
+    return result;
+}
+
+
+static PaTime GetStreamTime( PaStream* s )
+{
+    PA_LOGE_;
+    PA_LOGL_;
+    (void)s;
+    return PaUtil_GetTime();
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+    double result;
+    PA_LOGE_;
+    result = PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+    PA_LOGL_;
+    return result;
+}
+
+
+/*
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+
+    PA_LOGE_;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+    PA_LOGL_;
+    return paNoError;
+}
+
+
+static PaError WriteStream( PaStream* s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+
+    PA_LOGE_;
+
+    /* suppress unused variable warnings */
+    (void) buffer;
+    (void) frames;
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+    PA_LOGL_;
+    return paNoError;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+
+    PA_LOGE_;
+
+    /* suppress unused variable warnings */
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+    PA_LOGL_;
+    return 0;
+}
+
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaWinWdmStream *stream = (PaWinWdmStream*)s;
+
+    PA_LOGE_;
+    /* suppress unused variable warnings */
+    (void) stream;
+
+    /* IMPLEMENT ME, see portaudio.h for required behavior*/
+    PA_LOGL_;
+    return 0;
+}
\ No newline at end of file
diff --git a/Externals/portaudio/src/hostapi/wdmks/readme.txt b/Externals/portaudio/src/hostapi/wdmks/readme.txt
new file mode 100644
index 0000000000..1a381fe79f
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wdmks/readme.txt
@@ -0,0 +1,82 @@
+Notes about WDM-KS host API
+---------------------------
+
+Status history
+--------------
+10th November 2005:
+Made following changes:
+ * OpenStream: Try all PaSampleFormats internally if the the chosen
+     format is not supported natively.  This fixed several problems
+     with soundcards that soundcards that did not take kindly to
+     using 24-bit 3-byte formats.
+ * OpenStream: Make the minimum framesPerHostIBuffer (and framesPerHostOBuffer)
+     the default frameSize for the playback/recording pin.
+ * ProcessingThread: Added a switch to only call PaUtil_EndBufferProcessing
+     if the total input frames equals the total output frames
+
+5th September 2004:
+This is the first public version of the code. It should be considered
+an alpha release with zero guarantee not to crash on any particular 
+system. So far it has only been tested in the author's development
+environment, which means a Win2k/SP2 PIII laptop with integrated 
+SoundMAX driver and USB Tascam US-428 compiled with both MinGW
+(GCC 3.3) and MSVC++6 using the MS DirectX 9 SDK.
+It has been most widely tested with the MinGW build, with most of the
+test programs (particularly paqa_devs and paqa_errs) passing.
+There are some notable failures: patest_out_underflow and both of the
+blocking I/O tests (as blocking I/O is not implemented).
+At this point the code needs to be tested with a much wider variety 
+of configurations and feedback provided from testers regarding
+both working and failing cases.
+
+What is the WDM-KS host API?
+----------------------------
+PortAudio for Windows currently has 3 functional host implementations.
+MME uses the oldest Windows audio API which does not offer good
+play/record latency. 
+DirectX improves this, but still imposes a penalty
+of 10s of milliseconds due to the system mixing of streams from
+multiple applications. 
+ASIO offers very good latency, but requires special drivers which are
+not always available for cheaper audio hardware. Also, when ASIO 
+drivers are available, they are not always so robust because they 
+bypass all of the standardised Windows device driver architecture 
+and hit the hardware their own way.
+Alternatively there are a couple of free (but closed source) ASIO 
+implementations which connect to the lower level Windows 
+"Kernel Streaming" API, but again these require special installation 
+by the user, and can be limited in functionality or difficult to use. 
+
+This is where the PortAudio "WDM-KS" host implementation comes in.
+It directly connects PortAudio to the same Kernel Streaming API which
+those ASIO bridges use. This avoids the mixing penatly of DirectX, 
+giving at least as good latency as any ASIO driver, but it has the
+advantage of working with ANY Windows audio hardware which is available
+through the normal MME/DirectX routes without the user requiring 
+any additional device drivers to be installed, and allowing all 
+device selection to be done through the normal PortAudio API.
+
+Note that in general you should only be using this host API if your 
+application has a real requirement for very low latency audio (<20ms), 
+either because you are generating sounds in real-time based upon 
+user input, or you a processing recorded audio in real time.
+
+The only thing to be aware of is that using the KS interface will
+block that device from being used by the rest of system through
+the higher level APIs, or conversely, if the system is using
+a device, the KS API will not be able to use it. MS recommend that
+you should keep the device open only when your application has focus.
+In PortAudio terms, this means having a stream Open on a WDMKS device.
+
+Usage
+-----
+To add the WDMKS backend to your program which is already using 
+PortAudio, you must undefine PA_NO_WDMKS from your build file,
+and include the pa_win_wdmks\pa_win_wdmks.c into your build.
+The file should compile in both C and C++.
+You will need a DirectX SDK installed on your system for the
+ks.h and ksmedia.h header files.
+You will need to link to the system "setupapi" library.
+Note that if you use MinGW, you will get more warnings from 
+the DX header files when using GCC(C), and still a few warnings
+with G++(CPP).
\ No newline at end of file
diff --git a/Externals/portaudio/src/hostapi/wmme/pa_win_wmme.c b/Externals/portaudio/src/hostapi/wmme/pa_win_wmme.c
new file mode 100644
index 0000000000..ec891a94ed
--- /dev/null
+++ b/Externals/portaudio/src/hostapi/wmme/pa_win_wmme.c
@@ -0,0 +1,4007 @@
+/*
+ * $Id: pa_win_wmme.c 1739 2011-08-25 07:15:31Z rossb $
+ * pa_win_wmme.c
+ * Implementation of PortAudio for Windows MultiMedia Extensions (WMME)       
+ *                                                                                         
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Authors: Ross Bencina and Phil Burk
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/* Modification History:
+ PLB = Phil Burk
+ JM = Julien Maillard
+ RDB = Ross Bencina
+ PLB20010402 - sDevicePtrs now allocates based on sizeof(pointer)
+ PLB20010413 - check for excessive numbers of channels
+ PLB20010422 - apply Mike Berry's changes for CodeWarrior on PC
+               including conditional inclusion of memory.h,
+               and explicit typecasting on memory allocation
+ PLB20010802 - use GlobalAlloc for sDevicesPtr instead of PaHost_AllocFastMemory
+ PLB20010816 - pass process instead of thread to SetPriorityClass()
+ PLB20010927 - use number of frames instead of real-time for CPULoad calculation.
+ JM20020118 - prevent hung thread when buffers underflow.
+ PLB20020321 - detect Win XP versus NT, 9x; fix DBUG typo; removed init of CurrentCount
+ RDB20020411 - various renaming cleanups, factored streamData alloc and cpu usage init
+ RDB20020417 - stopped counting WAVE_MAPPER when there were no real devices
+               refactoring, renaming and fixed a few edge case bugs
+ RDB20020531 - converted to V19 framework
+ ** NOTE  maintanance history is now stored in CVS **
+*/
+
+/** @file
+	@ingroup hostapi_src
+
+    @brief Win32 host API implementation for the Windows MultiMedia Extensions (WMME) audio API.
+*/
+
+/*
+    How it works:
+
+    For both callback and blocking read/write streams we open the MME devices
+    in CALLBACK_EVENT mode. In this mode, MME signals an Event object whenever
+    it has finished with a buffer (either filled it for input, or played it
+    for output). Where necessary, we block waiting for Event objects using
+    WaitMultipleObjects().
+
+    When implementing a PA callback stream, we set up a high priority thread
+    which waits on the MME buffer Events and drains/fills the buffers when
+    they are ready.
+
+    When implementing a PA blocking read/write stream, we simply wait on these
+    Events (when necessary) inside the ReadStream() and WriteStream() functions.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <windows.h>
+#include <mmsystem.h>
+#ifndef UNDER_CE
+#include <process.h>
+#endif
+#include <assert.h>
+/* PLB20010422 - "memory.h" doesn't work on CodeWarrior for PC. Thanks Mike Berry for the mod. */
+#ifndef __MWERKS__
+#include <malloc.h>
+#include <memory.h>
+#endif /* __MWERKS__ */
+
+#include "portaudio.h"
+#include "pa_trace.h"
+#include "pa_util.h"
+#include "pa_allocation.h"
+#include "pa_hostapi.h"
+#include "pa_stream.h"
+#include "pa_cpuload.h"
+#include "pa_process.h"
+#include "pa_debugprint.h"
+
+#include "pa_win_wmme.h"
+#include "pa_win_waveformat.h"
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+#include "pa_win_wdmks_utils.h"
+#ifndef DRV_QUERYDEVICEINTERFACE
+#define DRV_QUERYDEVICEINTERFACE     (DRV_RESERVED + 12)
+#endif
+#ifndef DRV_QUERYDEVICEINTERFACESIZE
+#define DRV_QUERYDEVICEINTERFACESIZE (DRV_RESERVED + 13)
+#endif
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+/* use CreateThread for CYGWIN, _beginthreadex for all others */
+#if !defined(__CYGWIN__) && !defined(_WIN32_WCE)
+#define CREATE_THREAD (HANDLE)_beginthreadex( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#define PA_THREAD_FUNC static unsigned WINAPI
+#define PA_THREAD_ID unsigned
+#else
+#define CREATE_THREAD CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId )
+#define PA_THREAD_FUNC static DWORD WINAPI
+#define PA_THREAD_ID DWORD
+#endif
+#if (defined(_WIN32_WCE))
+#pragma comment(lib, "Coredll.lib")
+#elif (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+#pragma comment(lib, "winmm.lib")
+#endif
+
+/*
+ provided in newer platform sdks
+ */
+#ifndef DWORD_PTR
+    #if defined(_WIN64)
+        #define DWORD_PTR unsigned __int64
+    #else
+        #define DWORD_PTR unsigned long
+    #endif
+#endif
+
+/************************************************* Constants ********/
+
+#define PA_MME_USE_HIGH_DEFAULT_LATENCY_    (0)  /* For debugging glitches. */
+
+#if PA_MME_USE_HIGH_DEFAULT_LATENCY_
+ #define PA_MME_WIN_9X_DEFAULT_LATENCY_                             (0.4)
+ #define PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_                       (4)
+ #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_	        (4)
+ #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_	        (4)
+ #define PA_MME_HOST_BUFFER_GRANULARITY_FRAMES_WHEN_UNSPECIFIED_	(16)
+ #define PA_MME_MAX_HOST_BUFFER_SECS_				                (0.3)       /* Do not exceed unless user buffer exceeds */
+ #define PA_MME_MAX_HOST_BUFFER_BYTES_				                (32 * 1024) /* Has precedence over PA_MME_MAX_HOST_BUFFER_SECS_, some drivers are known to crash with buffer sizes > 32k */
+#else
+ #define PA_MME_WIN_9X_DEFAULT_LATENCY_                             (0.2)
+ #define PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_                       (2)
+ #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_	        (3)         /* always use at least 3 input buffers for full duplex */
+ #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_	        (2)
+ #define PA_MME_HOST_BUFFER_GRANULARITY_FRAMES_WHEN_UNSPECIFIED_	(16)
+ #define PA_MME_MAX_HOST_BUFFER_SECS_				                (0.1)       /* Do not exceed unless user buffer exceeds */
+ #define PA_MME_MAX_HOST_BUFFER_BYTES_				                (32 * 1024) /* Has precedence over PA_MME_MAX_HOST_BUFFER_SECS_, some drivers are known to crash with buffer sizes > 32k */
+#endif
+
+/* Use higher latency for NT because it is even worse at real-time
+   operation than Win9x.
+*/
+#define PA_MME_WIN_NT_DEFAULT_LATENCY_                              (0.4)
+
+/* Default low latency for WDM based systems. This is based on a rough
+   survey of workable latency settings using patest_wmme_find_best_latency_params.c.
+   See pdf attached to ticket 185 for a graph of the survey results:
+   http://www.portaudio.com/trac/ticket/185
+   
+   Workable latencies varied between 40ms and ~80ms on different systems (different
+   combinations of hardware, 32 and 64 bit, WinXP, Vista and Win7. We didn't
+   get enough Vista results to know if Vista has systemically worse latency.
+   For now we choose a safe value across all Windows versions here.
+*/
+#define PA_MME_WIN_WDM_DEFAULT_LATENCY_                             (0.090)
+
+
+/* When client suggestedLatency could result in many host buffers, we aim to have around 8, 
+   based off Windows documentation that suggests that the kmixer uses 8 buffers. This choice
+   is somewhat arbitrary here, since we havn't observed significant stability degredation 
+   with using either more, or less buffers.     
+*/
+#define PA_MME_TARGET_HOST_BUFFER_COUNT_    8
+
+#define PA_MME_MIN_TIMEOUT_MSEC_        (1000)
+
+static const char constInputMapperSuffix_[] = " - Input";
+static const char constOutputMapperSuffix_[] = " - Output";
+
+/*
+copies TCHAR string to explicit char string
+*/
+char *StrTCpyToC(char *to, const TCHAR *from)
+{
+#if !defined(_UNICODE) && !defined(UNICODE)
+	return strcpy(to, from);
+#else
+	int count = wcslen(from);
+	if (count != 0)
+		if (WideCharToMultiByte(CP_ACP, 0, from, count, to, count, NULL, NULL) == 0)
+			return NULL;
+	return to;
+#endif
+}
+
+/*
+returns length of TCHAR string
+*/
+size_t StrTLen(const TCHAR *str)
+{
+#if !defined(_UNICODE) && !defined(UNICODE)
+	return strlen(str);
+#else
+	return wcslen(str);	
+#endif
+}
+
+/********************************************************************/
+
+typedef struct PaWinMmeStream PaWinMmeStream;     /* forward declaration */
+
+/* prototypes for functions declared in this file */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** stream,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData );
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate );
+static PaError CloseStream( PaStream* stream );
+static PaError StartStream( PaStream *stream );
+static PaError StopStream( PaStream *stream );
+static PaError AbortStream( PaStream *stream );
+static PaError IsStreamStopped( PaStream *s );
+static PaError IsStreamActive( PaStream *stream );
+static PaTime GetStreamTime( PaStream *stream );
+static double GetStreamCpuLoad( PaStream* stream );
+static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
+static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
+static signed long GetStreamReadAvailable( PaStream* stream );
+static signed long GetStreamWriteAvailable( PaStream* stream );
+
+
+/* macros for setting last host error information */
+
+#ifdef UNICODE
+
+#define PA_MME_SET_LAST_WAVEIN_ERROR( mmresult ) \
+    {                                                                   \
+        wchar_t mmeErrorTextWide[ MAXERRORLENGTH ];                     \
+        char mmeErrorText[ MAXERRORLENGTH ];                            \
+        waveInGetErrorText( mmresult, mmeErrorTextWide, MAXERRORLENGTH );   \
+        WideCharToMultiByte( CP_ACP, WC_COMPOSITECHECK | WC_DEFAULTCHAR,\
+            mmeErrorTextWide, -1, mmeErrorText, MAXERRORLENGTH, NULL, NULL );  \
+        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
+    }
+
+#define PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult ) \
+    {                                                                   \
+        wchar_t mmeErrorTextWide[ MAXERRORLENGTH ];                     \
+        char mmeErrorText[ MAXERRORLENGTH ];                            \
+        waveOutGetErrorText( mmresult, mmeErrorTextWide, MAXERRORLENGTH );  \
+        WideCharToMultiByte( CP_ACP, WC_COMPOSITECHECK | WC_DEFAULTCHAR,\
+            mmeErrorTextWide, -1, mmeErrorText, MAXERRORLENGTH, NULL, NULL );  \
+        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
+    }
+    
+#else /* !UNICODE */
+
+#define PA_MME_SET_LAST_WAVEIN_ERROR( mmresult ) \
+    {                                                                   \
+        char mmeErrorText[ MAXERRORLENGTH ];                            \
+        waveInGetErrorText( mmresult, mmeErrorText, MAXERRORLENGTH );   \
+        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
+    }
+
+#define PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult ) \
+    {                                                                   \
+        char mmeErrorText[ MAXERRORLENGTH ];                            \
+        waveOutGetErrorText( mmresult, mmeErrorText, MAXERRORLENGTH );  \
+        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
+    }
+
+#endif /* UNICODE */
+
+
+static void PaMme_SetLastSystemError( DWORD errorCode )
+{
+    char *lpMsgBuf;
+    FormatMessage(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+        NULL,
+        errorCode,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPTSTR) &lpMsgBuf,
+        0,
+        NULL
+    );
+    PaUtil_SetLastHostErrorInfo( paMME, errorCode, lpMsgBuf );
+    LocalFree( lpMsgBuf );
+}
+
+#define PA_MME_SET_LAST_SYSTEM_ERROR( errorCode ) \
+    PaMme_SetLastSystemError( errorCode )
+
+
+/* PaError returning wrappers for some commonly used win32 functions
+    note that we allow passing a null ptr to have no effect.
+*/
+
+static PaError CreateEventWithPaError( HANDLE *handle,
+        LPSECURITY_ATTRIBUTES lpEventAttributes,
+        BOOL bManualReset,
+        BOOL bInitialState,
+        LPCTSTR lpName )
+{
+    PaError result = paNoError;
+
+    *handle = NULL;
+    
+    *handle = CreateEvent( lpEventAttributes, bManualReset, bInitialState, lpName );
+    if( *handle == NULL )
+    {
+        result = paUnanticipatedHostError;
+        PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
+    }
+
+    return result;
+}
+
+
+static PaError ResetEventWithPaError( HANDLE handle )
+{
+    PaError result = paNoError;
+
+    if( handle )
+    {
+        if( ResetEvent( handle ) == 0 )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
+        }
+    }
+
+    return result;
+}
+
+
+static PaError CloseHandleWithPaError( HANDLE handle )
+{
+    PaError result = paNoError;
+    
+    if( handle )
+    {
+        if( CloseHandle( handle ) == 0 )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
+        }
+    }
+    
+    return result;
+}
+
+
+/* PaWinMmeHostApiRepresentation - host api datastructure specific to this implementation */
+
+typedef struct
+{
+    PaUtilHostApiRepresentation inheritedHostApiRep;
+    PaUtilStreamInterface callbackStreamInterface;
+    PaUtilStreamInterface blockingStreamInterface;
+
+    PaUtilAllocationGroup *allocations;
+    
+    int inputDeviceCount, outputDeviceCount;
+
+    /** winMmeDeviceIds is an array of WinMme device ids.
+        fields in the range [0, inputDeviceCount) are input device ids,
+        and [inputDeviceCount, inputDeviceCount + outputDeviceCount) are output
+        device ids.
+     */ 
+    UINT *winMmeDeviceIds;
+}
+PaWinMmeHostApiRepresentation;
+
+
+typedef struct
+{
+    PaDeviceInfo inheritedDeviceInfo;
+    DWORD dwFormats; /**<< standard formats bitmask from the WAVEINCAPS and WAVEOUTCAPS structures */
+    char deviceInputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
+    char deviceOutputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
+}
+PaWinMmeDeviceInfo;
+
+
+/*************************************************************************
+ * Returns recommended device ID.
+ * On the PC, the recommended device can be specified by the user by
+ * setting an environment variable. For example, to use device #1.
+ *
+ *    set PA_RECOMMENDED_OUTPUT_DEVICE=1
+ *
+ * The user should first determine the available device ID by using
+ * the supplied application "pa_devs".
+ */
+#define PA_ENV_BUF_SIZE_  (32)
+#define PA_REC_IN_DEV_ENV_NAME_  ("PA_RECOMMENDED_INPUT_DEVICE")
+#define PA_REC_OUT_DEV_ENV_NAME_  ("PA_RECOMMENDED_OUTPUT_DEVICE")
+static PaDeviceIndex GetEnvDefaultDeviceID( char *envName )
+{
+    PaDeviceIndex recommendedIndex = paNoDevice;
+    DWORD   hresult;
+    char    envbuf[PA_ENV_BUF_SIZE_];
+
+#ifndef WIN32_PLATFORM_PSPC /* no GetEnvironmentVariable on PocketPC */
+
+    /* Let user determine default device by setting environment variable. */
+    hresult = GetEnvironmentVariable( envName, envbuf, PA_ENV_BUF_SIZE_ );
+    if( (hresult > 0) && (hresult < PA_ENV_BUF_SIZE_) )
+    {
+        recommendedIndex = atoi( envbuf );
+    }
+#endif
+
+    return recommendedIndex;
+}
+
+
+static void InitializeDefaultDeviceIdsFromEnv( PaWinMmeHostApiRepresentation *hostApi )
+{
+    PaDeviceIndex device;
+
+    /* input */
+    device = GetEnvDefaultDeviceID( PA_REC_IN_DEV_ENV_NAME_ );
+    if( device != paNoDevice &&
+            ( device >= 0 && device < hostApi->inheritedHostApiRep.info.deviceCount ) &&
+            hostApi->inheritedHostApiRep.deviceInfos[ device ]->maxInputChannels > 0 )
+    {
+        hostApi->inheritedHostApiRep.info.defaultInputDevice = device;
+    }
+
+    /* output */
+    device = GetEnvDefaultDeviceID( PA_REC_OUT_DEV_ENV_NAME_ );
+    if( device != paNoDevice &&
+            ( device >= 0 && device < hostApi->inheritedHostApiRep.info.deviceCount ) &&
+            hostApi->inheritedHostApiRep.deviceInfos[ device ]->maxOutputChannels > 0 )
+    {
+        hostApi->inheritedHostApiRep.info.defaultOutputDevice = device;
+    }
+}
+
+
+/** Convert external PA ID to a windows multimedia device ID
+*/
+static UINT LocalDeviceIndexToWinMmeDeviceId( PaWinMmeHostApiRepresentation *hostApi, PaDeviceIndex device )
+{
+    assert( device >= 0 && device < hostApi->inputDeviceCount + hostApi->outputDeviceCount );
+
+	return hostApi->winMmeDeviceIds[ device ];
+}
+
+
+static int SampleFormatAndWinWmmeSpecificFlagsToLinearWaveFormatTag( PaSampleFormat sampleFormat, unsigned long winMmeSpecificFlags )
+{
+    int waveFormatTag = 0;
+
+    if( winMmeSpecificFlags & paWinMmeWaveFormatDolbyAc3Spdif )
+        waveFormatTag = PAWIN_WAVE_FORMAT_DOLBY_AC3_SPDIF;
+    else if( winMmeSpecificFlags & paWinMmeWaveFormatWmaSpdif )
+        waveFormatTag = PAWIN_WAVE_FORMAT_WMA_SPDIF;
+    else
+        waveFormatTag = PaWin_SampleFormatToLinearWaveFormatTag( sampleFormat );
+
+    return waveFormatTag;
+}
+
+
+static PaError QueryInputWaveFormatEx( int deviceId, WAVEFORMATEX *waveFormatEx )
+{
+    MMRESULT mmresult;
+    
+    switch( mmresult = waveInOpen( NULL, deviceId, waveFormatEx, 0, 0, WAVE_FORMAT_QUERY ) )
+    {
+        case MMSYSERR_NOERROR:
+            return paNoError;
+        case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
+            return paDeviceUnavailable;
+        case MMSYSERR_NODRIVER:	    /* No device driver is present. */
+            return paDeviceUnavailable;
+        case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
+            return paInsufficientMemory;
+        case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
+            return paSampleFormatNotSupported;
+                    
+        case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
+            /* falls through */
+        default:
+            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+            return paUnanticipatedHostError;
+    }
+}
+
+
+static PaError QueryOutputWaveFormatEx( int deviceId, WAVEFORMATEX *waveFormatEx )
+{
+    MMRESULT mmresult;
+    
+    switch( mmresult = waveOutOpen( NULL, deviceId, waveFormatEx, 0, 0, WAVE_FORMAT_QUERY ) )
+    {
+        case MMSYSERR_NOERROR:
+            return paNoError;
+        case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
+            return paDeviceUnavailable;
+        case MMSYSERR_NODRIVER:	    /* No device driver is present. */
+            return paDeviceUnavailable;
+        case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
+            return paInsufficientMemory;
+        case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
+            return paSampleFormatNotSupported;
+                    
+        case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
+            /* falls through */
+        default:
+            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+            return paUnanticipatedHostError;
+    }
+}
+
+
+static PaError QueryFormatSupported( PaDeviceInfo *deviceInfo,
+        PaError (*waveFormatExQueryFunction)(int, WAVEFORMATEX*),
+        int winMmeDeviceId, int channels, double sampleRate, unsigned long winMmeSpecificFlags )
+{
+    PaWinMmeDeviceInfo *winMmeDeviceInfo = (PaWinMmeDeviceInfo*)deviceInfo;
+    PaWinWaveFormat waveFormat;
+    PaSampleFormat sampleFormat;
+    int waveFormatTag;
+    
+    /* @todo at the moment we only query with 16 bit sample format and directout speaker config*/
+
+    sampleFormat = paInt16;
+    waveFormatTag = SampleFormatAndWinWmmeSpecificFlagsToLinearWaveFormatTag( sampleFormat, winMmeSpecificFlags );
+
+    if( waveFormatTag == PaWin_SampleFormatToLinearWaveFormatTag( paInt16 ) ){
+    
+        /* attempt bypass querying the device for linear formats */
+
+        if( sampleRate == 11025.0
+            && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_1M16))
+                || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_1S16)) ) ){
+
+            return paNoError;
+        }
+
+        if( sampleRate == 22050.0
+            && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_2M16))
+                || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_2S16)) ) ){
+
+            return paNoError;
+        }
+
+        if( sampleRate == 44100.0
+            && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_4M16))
+                || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_4S16)) ) ){
+
+            return paNoError;
+        }
+    }
+
+
+    /* first, attempt to query the device using WAVEFORMATEXTENSIBLE, 
+       if this fails we fall back to WAVEFORMATEX */
+
+    PaWin_InitializeWaveFormatExtensible( &waveFormat, channels, sampleFormat, waveFormatTag,
+            sampleRate, PAWIN_SPEAKER_DIRECTOUT );
+
+    if( waveFormatExQueryFunction( winMmeDeviceId, (WAVEFORMATEX*)&waveFormat ) == paNoError )
+        return paNoError;
+
+    PaWin_InitializeWaveFormatEx( &waveFormat, channels, sampleFormat, waveFormatTag, sampleRate );
+
+    return waveFormatExQueryFunction( winMmeDeviceId, (WAVEFORMATEX*)&waveFormat );
+}
+
+
+#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_  (13) /* must match array length below */
+static double defaultSampleRateSearchOrder_[] =
+    { 44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0, 192000.0,
+        16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
+
+static void DetectDefaultSampleRate( PaWinMmeDeviceInfo *winMmeDeviceInfo, int winMmeDeviceId,
+        PaError (*waveFormatExQueryFunction)(int, WAVEFORMATEX*), int maxChannels )
+{
+    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
+    int i;
+    
+    deviceInfo->defaultSampleRate = 0.;
+
+    for( i=0; i < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++i )
+    {
+        double sampleRate = defaultSampleRateSearchOrder_[ i ]; 
+        PaError paerror = QueryFormatSupported( deviceInfo, waveFormatExQueryFunction, winMmeDeviceId, maxChannels, sampleRate, 0 );
+        if( paerror == paNoError )
+        {
+            deviceInfo->defaultSampleRate = sampleRate;
+            break;
+        }
+    }
+}
+
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+static int QueryWaveInKSFilterMaxChannels( int waveInDeviceId, int *maxChannels )
+{
+    void *devicePath;
+    DWORD devicePathSize;
+    int result = 0;
+
+    if( waveInMessage((HWAVEIN)waveInDeviceId, DRV_QUERYDEVICEINTERFACESIZE,
+            (DWORD_PTR)&devicePathSize, 0 ) != MMSYSERR_NOERROR )
+        return 0;
+
+    devicePath = PaUtil_AllocateMemory( devicePathSize );
+    if( !devicePath )
+        return 0;
+
+    /* apparently DRV_QUERYDEVICEINTERFACE returns a unicode interface path, although this is undocumented */
+    if( waveInMessage((HWAVEIN)waveInDeviceId, DRV_QUERYDEVICEINTERFACE,
+            (DWORD_PTR)devicePath, devicePathSize ) == MMSYSERR_NOERROR )
+    {
+        int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( devicePath, /* isInput= */ 1  );
+        if( count > 0 )
+        {
+            *maxChannels = count;
+            result = 1;
+        }
+    }
+
+    PaUtil_FreeMemory( devicePath );
+
+    return result;
+}
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+
+static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeHostApi,
+        PaWinMmeDeviceInfo *winMmeDeviceInfo, UINT winMmeInputDeviceId, int *success )
+{
+    PaError result = paNoError;
+    char *deviceName; /* non-const ptr */
+    MMRESULT mmresult;
+    WAVEINCAPS wic;
+    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
+    
+    *success = 0;
+
+    mmresult = waveInGetDevCaps( winMmeInputDeviceId, &wic, sizeof( WAVEINCAPS ) );
+    if( mmresult == MMSYSERR_NOMEM )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    else if( mmresult != MMSYSERR_NOERROR )
+    {
+        /* instead of returning paUnanticipatedHostError we return
+            paNoError, but leave success set as 0. This allows
+            Pa_Initialize to just ignore this device, without failing
+            the entire initialisation process.
+        */
+        return paNoError;
+    }           
+
+    if( winMmeInputDeviceId == WAVE_MAPPER )
+    {
+        /* Append I/O suffix to WAVE_MAPPER device. */
+        deviceName = (char *)PaUtil_GroupAllocateMemory(
+                    winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_) );
+        if( !deviceName )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+        StrTCpyToC( deviceName, wic.szPname );
+        strcat( deviceName, constInputMapperSuffix_ );
+    }
+    else
+    {
+        deviceName = (char*)PaUtil_GroupAllocateMemory(
+                    winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 );
+        if( !deviceName )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+        StrTCpyToC( deviceName, wic.szPname  );
+    }
+    deviceInfo->name = deviceName;
+
+    if( wic.wChannels == 0xFFFF || wic.wChannels < 1 || wic.wChannels > 255 ){
+        /* For Windows versions using WDM (possibly Windows 98 ME and later)
+         * the kernel mixer sits between the application and the driver. As a result,
+         * wave*GetDevCaps often kernel mixer channel counts, which are unlimited.
+         * When this happens we assume the device is stereo and set a flag
+         * so that other channel counts can be tried with OpenStream -- i.e. when
+         * device*ChannelCountIsKnown is false, OpenStream will try whatever
+         * channel count you supply.
+         * see also InitializeOutputDeviceInfo() below.
+     */
+
+        PA_DEBUG(("Pa_GetDeviceInfo: Num input channels reported as %d! Changed to 2.\n", wic.wChannels ));
+        deviceInfo->maxInputChannels = 2;
+        winMmeDeviceInfo->deviceInputChannelCountIsKnown = 0;
+    }else{
+        deviceInfo->maxInputChannels = wic.wChannels;
+        winMmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
+    }
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+    winMmeDeviceInfo->deviceInputChannelCountIsKnown = 
+            QueryWaveInKSFilterMaxChannels( winMmeInputDeviceId, &deviceInfo->maxInputChannels );
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+    winMmeDeviceInfo->dwFormats = wic.dwFormats;
+
+    DetectDefaultSampleRate( winMmeDeviceInfo, winMmeInputDeviceId,
+            QueryInputWaveFormatEx, deviceInfo->maxInputChannels );
+
+    *success = 1;
+    
+error:
+    return result;
+}
+
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+static int QueryWaveOutKSFilterMaxChannels( int waveOutDeviceId, int *maxChannels )
+{
+    void *devicePath;
+    DWORD devicePathSize;
+    int result = 0;
+
+    if( waveOutMessage((HWAVEOUT)waveOutDeviceId, DRV_QUERYDEVICEINTERFACESIZE,
+            (DWORD_PTR)&devicePathSize, 0 ) != MMSYSERR_NOERROR )
+        return 0;
+
+    devicePath = PaUtil_AllocateMemory( devicePathSize );
+    if( !devicePath )
+        return 0;
+
+    /* apparently DRV_QUERYDEVICEINTERFACE returns a unicode interface path, although this is undocumented */
+    if( waveOutMessage((HWAVEOUT)waveOutDeviceId, DRV_QUERYDEVICEINTERFACE,
+            (DWORD_PTR)devicePath, devicePathSize ) == MMSYSERR_NOERROR )
+    {
+        int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( devicePath, /* isInput= */ 0  );
+        if( count > 0 )
+        {
+            *maxChannels = count;
+            result = 1;
+        }
+    }
+
+    PaUtil_FreeMemory( devicePath );
+
+    return result;
+}
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+
+static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeHostApi,
+        PaWinMmeDeviceInfo *winMmeDeviceInfo, UINT winMmeOutputDeviceId, int *success )
+{
+    PaError result = paNoError;
+    char *deviceName; /* non-const ptr */
+    MMRESULT mmresult;
+    WAVEOUTCAPS woc;
+    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+    int wdmksDeviceOutputChannelCountIsKnown;
+#endif
+
+    *success = 0;
+
+    mmresult = waveOutGetDevCaps( winMmeOutputDeviceId, &woc, sizeof( WAVEOUTCAPS ) );
+    if( mmresult == MMSYSERR_NOMEM )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    else if( mmresult != MMSYSERR_NOERROR )
+    {
+        /* instead of returning paUnanticipatedHostError we return
+            paNoError, but leave success set as 0. This allows
+            Pa_Initialize to just ignore this device, without failing
+            the entire initialisation process.
+        */
+        return paNoError;
+    }
+
+    if( winMmeOutputDeviceId == WAVE_MAPPER )
+    {
+        /* Append I/O suffix to WAVE_MAPPER device. */
+        deviceName = (char *)PaUtil_GroupAllocateMemory(
+                    winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_) );
+        if( !deviceName )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+        StrTCpyToC( deviceName, woc.szPname );
+        strcat( deviceName, constOutputMapperSuffix_ );
+    }
+    else
+    {
+        deviceName = (char*)PaUtil_GroupAllocateMemory(
+                    winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 );
+        if( !deviceName )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+        StrTCpyToC( deviceName, woc.szPname  );
+    }
+    deviceInfo->name = deviceName;
+
+    if( woc.wChannels == 0xFFFF || woc.wChannels < 1 || woc.wChannels > 255 ){
+        /* For Windows versions using WDM (possibly Windows 98 ME and later)
+         * the kernel mixer sits between the application and the driver. As a result,
+         * wave*GetDevCaps often kernel mixer channel counts, which are unlimited.
+         * When this happens we assume the device is stereo and set a flag
+         * so that other channel counts can be tried with OpenStream -- i.e. when
+         * device*ChannelCountIsKnown is false, OpenStream will try whatever
+         * channel count you supply.
+         * see also InitializeInputDeviceInfo() above.
+     */
+
+        PA_DEBUG(("Pa_GetDeviceInfo: Num output channels reported as %d! Changed to 2.\n", woc.wChannels ));
+        deviceInfo->maxOutputChannels = 2;
+        winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 0;
+    }else{
+        deviceInfo->maxOutputChannels = woc.wChannels;
+        winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+    }
+
+#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
+    wdmksDeviceOutputChannelCountIsKnown = QueryWaveOutKSFilterMaxChannels( 
+			winMmeOutputDeviceId, &deviceInfo->maxOutputChannels );
+    if( wdmksDeviceOutputChannelCountIsKnown && !winMmeDeviceInfo->deviceOutputChannelCountIsKnown )
+        winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
+
+    winMmeDeviceInfo->dwFormats = woc.dwFormats;
+
+    DetectDefaultSampleRate( winMmeDeviceInfo, winMmeOutputDeviceId,
+            QueryOutputWaveFormatEx, deviceInfo->maxOutputChannels );
+
+    *success = 1;
+    
+error:
+    return result;
+}
+
+
+static void GetDefaultLatencies( PaTime *defaultLowLatency, PaTime *defaultHighLatency )
+{
+    OSVERSIONINFO osvi;
+    osvi.dwOSVersionInfoSize = sizeof( osvi );
+	GetVersionEx( &osvi );
+
+    /* Check for NT */
+    if( (osvi.dwMajorVersion == 4) && (osvi.dwPlatformId == 2) )
+    {
+        *defaultLowLatency = PA_MME_WIN_NT_DEFAULT_LATENCY_;
+    }
+    else if(osvi.dwMajorVersion >= 5)
+    {
+        *defaultLowLatency  = PA_MME_WIN_WDM_DEFAULT_LATENCY_;
+    }
+    else
+    {
+        *defaultLowLatency  = PA_MME_WIN_9X_DEFAULT_LATENCY_;
+    }     
+
+    *defaultHighLatency = *defaultLowLatency * 2;
+}
+
+
+PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
+{
+    PaError result = paNoError;
+    int i;
+    PaWinMmeHostApiRepresentation *winMmeHostApi;
+    int inputDeviceCount, outputDeviceCount, maximumPossibleDeviceCount;
+    PaWinMmeDeviceInfo *deviceInfoArray;
+    int deviceInfoInitializationSucceeded;
+    PaTime defaultLowLatency, defaultHighLatency;
+    DWORD waveInPreferredDevice, waveOutPreferredDevice;
+    DWORD preferredDeviceStatusFlags;
+
+    winMmeHostApi = (PaWinMmeHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinMmeHostApiRepresentation) );
+    if( !winMmeHostApi )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    winMmeHostApi->allocations = PaUtil_CreateAllocationGroup();
+    if( !winMmeHostApi->allocations )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    *hostApi = &winMmeHostApi->inheritedHostApiRep;
+    (*hostApi)->info.structVersion = 1;
+    (*hostApi)->info.type = paMME;
+    (*hostApi)->info.name = "MME";
+
+    
+    /* initialise device counts and default devices under the assumption that
+        there are no devices. These values are incremented below if and when
+        devices are successfully initialized.
+    */
+    (*hostApi)->info.deviceCount = 0;
+    (*hostApi)->info.defaultInputDevice = paNoDevice;
+    (*hostApi)->info.defaultOutputDevice = paNoDevice;
+    winMmeHostApi->inputDeviceCount = 0;
+    winMmeHostApi->outputDeviceCount = 0;
+
+#if !defined(DRVM_MAPPER_PREFERRED_GET)
+/* DRVM_MAPPER_PREFERRED_GET is defined in mmddk.h but we avoid a dependency on the DDK by defining it here */
+#define DRVM_MAPPER_PREFERRED_GET    (0x2000+21)
+#endif
+
+    /* the following calls assume that if wave*Message fails the preferred device parameter won't be modified */
+    preferredDeviceStatusFlags = 0;
+    waveInPreferredDevice = -1;
+    waveInMessage( (HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&waveInPreferredDevice, (DWORD_PTR)&preferredDeviceStatusFlags );
+
+    preferredDeviceStatusFlags = 0;
+    waveOutPreferredDevice = -1;
+    waveOutMessage( (HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&waveOutPreferredDevice, (DWORD_PTR)&preferredDeviceStatusFlags );
+
+    maximumPossibleDeviceCount = 0;
+
+    inputDeviceCount = waveInGetNumDevs();
+    if( inputDeviceCount > 0 )
+    	maximumPossibleDeviceCount += inputDeviceCount + 1;	/* assume there is a WAVE_MAPPER */
+
+    outputDeviceCount = waveOutGetNumDevs();
+    if( outputDeviceCount > 0 )
+	    maximumPossibleDeviceCount += outputDeviceCount + 1;	/* assume there is a WAVE_MAPPER */
+
+
+    if( maximumPossibleDeviceCount > 0 ){
+
+        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
+                winMmeHostApi->allocations, sizeof(PaDeviceInfo*) * maximumPossibleDeviceCount );
+        if( !(*hostApi)->deviceInfos )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        /* allocate all device info structs in a contiguous block */
+        deviceInfoArray = (PaWinMmeDeviceInfo*)PaUtil_GroupAllocateMemory(
+                winMmeHostApi->allocations, sizeof(PaWinMmeDeviceInfo) * maximumPossibleDeviceCount );
+        if( !deviceInfoArray )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        winMmeHostApi->winMmeDeviceIds = (UINT*)PaUtil_GroupAllocateMemory(
+                winMmeHostApi->allocations, sizeof(int) * maximumPossibleDeviceCount );
+        if( !winMmeHostApi->winMmeDeviceIds )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        GetDefaultLatencies( &defaultLowLatency, &defaultHighLatency );
+
+        if( inputDeviceCount > 0 ){
+            /* -1 is the WAVE_MAPPER */
+            for( i = -1; i < inputDeviceCount; ++i ){
+                UINT winMmeDeviceId = (UINT)((i==-1) ? WAVE_MAPPER : i);
+                PaWinMmeDeviceInfo *wmmeDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
+                PaDeviceInfo *deviceInfo = &wmmeDeviceInfo->inheritedDeviceInfo;
+                deviceInfo->structVersion = 2;
+                deviceInfo->hostApi = hostApiIndex;
+
+                deviceInfo->maxInputChannels = 0;
+                wmmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
+                deviceInfo->maxOutputChannels = 0;
+                wmmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+
+                deviceInfo->defaultLowInputLatency = defaultLowLatency;
+                deviceInfo->defaultLowOutputLatency = defaultLowLatency;
+                deviceInfo->defaultHighInputLatency = defaultHighLatency;
+                deviceInfo->defaultHighOutputLatency = defaultHighLatency;
+
+                result = InitializeInputDeviceInfo( winMmeHostApi, wmmeDeviceInfo,
+                        winMmeDeviceId, &deviceInfoInitializationSucceeded );
+                if( result != paNoError )
+                    goto error;
+
+                if( deviceInfoInitializationSucceeded ){
+                    if( (*hostApi)->info.defaultInputDevice == paNoDevice ){
+                        /* if there is currently no default device, use the first one available */
+                        (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
+                    
+                    }else if( winMmeDeviceId == waveInPreferredDevice ){
+                        /* set the default device to the system preferred device */
+                        (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
+                    }
+
+                    winMmeHostApi->winMmeDeviceIds[ (*hostApi)->info.deviceCount ] = winMmeDeviceId;
+                    (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
+
+                    winMmeHostApi->inputDeviceCount++;
+                    (*hostApi)->info.deviceCount++;
+                }
+            }
+        }
+
+        if( outputDeviceCount > 0 ){
+            /* -1 is the WAVE_MAPPER */
+            for( i = -1; i < outputDeviceCount; ++i ){
+                UINT winMmeDeviceId = (UINT)((i==-1) ? WAVE_MAPPER : i);
+                PaWinMmeDeviceInfo *wmmeDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
+                PaDeviceInfo *deviceInfo = &wmmeDeviceInfo->inheritedDeviceInfo;
+                deviceInfo->structVersion = 2;
+                deviceInfo->hostApi = hostApiIndex;
+
+                deviceInfo->maxInputChannels = 0;
+                wmmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
+                deviceInfo->maxOutputChannels = 0;
+                wmmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
+
+                deviceInfo->defaultLowInputLatency = defaultLowLatency;
+                deviceInfo->defaultLowOutputLatency = defaultLowLatency;
+                deviceInfo->defaultHighInputLatency = defaultHighLatency;
+                deviceInfo->defaultHighOutputLatency = defaultHighLatency; 
+
+                result = InitializeOutputDeviceInfo( winMmeHostApi, wmmeDeviceInfo,
+                        winMmeDeviceId, &deviceInfoInitializationSucceeded );
+                if( result != paNoError )
+                    goto error;
+
+                if( deviceInfoInitializationSucceeded ){
+                    if( (*hostApi)->info.defaultOutputDevice == paNoDevice ){
+                        /* if there is currently no default device, use the first one available */
+                        (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
+
+                    }else if( winMmeDeviceId == waveOutPreferredDevice ){
+                        /* set the default device to the system preferred device */
+                        (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
+                    }
+
+                    winMmeHostApi->winMmeDeviceIds[ (*hostApi)->info.deviceCount ] = winMmeDeviceId;
+                    (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
+
+                    winMmeHostApi->outputDeviceCount++;
+                    (*hostApi)->info.deviceCount++;
+                }
+            }
+        }
+    }
+    
+    InitializeDefaultDeviceIdsFromEnv( winMmeHostApi );
+
+    (*hostApi)->Terminate = Terminate;
+    (*hostApi)->OpenStream = OpenStream;
+    (*hostApi)->IsFormatSupported = IsFormatSupported;
+
+    PaUtil_InitializeStreamInterface( &winMmeHostApi->callbackStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, GetStreamCpuLoad,
+                                      PaUtil_DummyRead, PaUtil_DummyWrite,
+                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
+
+    PaUtil_InitializeStreamInterface( &winMmeHostApi->blockingStreamInterface, CloseStream, StartStream,
+                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
+                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
+                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
+
+    return result;
+
+error:
+    if( winMmeHostApi )
+    {
+        if( winMmeHostApi->allocations )
+        {
+            PaUtil_FreeAllAllocations( winMmeHostApi->allocations );
+            PaUtil_DestroyAllocationGroup( winMmeHostApi->allocations );
+        }
+        
+        PaUtil_FreeMemory( winMmeHostApi );
+    }
+
+    return result;
+}
+
+
+static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
+{
+    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
+
+    if( winMmeHostApi->allocations )
+    {
+        PaUtil_FreeAllAllocations( winMmeHostApi->allocations );
+        PaUtil_DestroyAllocationGroup( winMmeHostApi->allocations );
+    }
+
+    PaUtil_FreeMemory( winMmeHostApi );
+}
+
+
+static PaError IsInputChannelCountSupported( PaWinMmeDeviceInfo* deviceInfo, int channelCount )
+{
+    PaError result = paNoError;
+
+    if( channelCount > 0
+            && deviceInfo->deviceInputChannelCountIsKnown
+            && channelCount > deviceInfo->inheritedDeviceInfo.maxInputChannels ){
+
+        result = paInvalidChannelCount; 
+    }
+
+    return result;
+}
+
+static PaError IsOutputChannelCountSupported( PaWinMmeDeviceInfo* deviceInfo, int channelCount )
+{
+    PaError result = paNoError;
+
+    if( channelCount > 0
+            && deviceInfo->deviceOutputChannelCountIsKnown
+            && channelCount > deviceInfo->inheritedDeviceInfo.maxOutputChannels ){
+
+        result = paInvalidChannelCount; 
+    }
+
+    return result;
+}
+
+static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
+                                  const PaStreamParameters *inputParameters,
+                                  const PaStreamParameters *outputParameters,
+                                  double sampleRate )
+{
+    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
+    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
+    int inputChannelCount, outputChannelCount;
+    int inputMultipleDeviceChannelCount, outputMultipleDeviceChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    PaWinMmeStreamInfo *inputStreamInfo, *outputStreamInfo;
+    UINT winMmeInputDeviceId, winMmeOutputDeviceId;
+    unsigned int i;
+    PaError paerror;
+
+    /* The calls to QueryFormatSupported below are intended to detect invalid
+        sample rates. If we assume that the channel count and format are OK,
+        then the only thing that could fail is the sample rate. This isn't
+        strictly true, but I can't think of a better way to test that the
+        sample rate is valid.
+    */  
+    
+    if( inputParameters )
+    {
+        inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+        inputStreamInfo = inputParameters->hostApiSpecificStreamInfo;
+        
+        /* all standard sample formats are supported by the buffer adapter,
+             this implementation doesn't support any custom sample formats */
+        if( inputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+
+        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification
+                && inputStreamInfo && (inputStreamInfo->flags & paWinMmeUseMultipleDevices) )
+        {
+            inputMultipleDeviceChannelCount = 0;
+            for( i=0; i< inputStreamInfo->deviceCount; ++i )
+            {
+                inputMultipleDeviceChannelCount += inputStreamInfo->devices[i].channelCount;
+                    
+                inputDeviceInfo = hostApi->deviceInfos[ inputStreamInfo->devices[i].device ];
+
+                /* check that input device can support inputChannelCount */
+                if( inputStreamInfo->devices[i].channelCount < 1 )
+                    return paInvalidChannelCount;
+
+                paerror = IsInputChannelCountSupported( (PaWinMmeDeviceInfo*)inputDeviceInfo, 
+                        inputStreamInfo->devices[i].channelCount );
+                if( paerror != paNoError )
+                    return paerror;
+
+                /* test for valid sample rate, see comment above */
+                winMmeInputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, inputStreamInfo->devices[i].device );
+                paerror = QueryFormatSupported( inputDeviceInfo, QueryInputWaveFormatEx, 
+                        winMmeInputDeviceId, inputStreamInfo->devices[i].channelCount, sampleRate, 
+                        ((inputStreamInfo) ? inputStreamInfo->flags : 0) );
+                if( paerror != paNoError )
+                    return paInvalidSampleRate;
+            }
+                
+            if( inputMultipleDeviceChannelCount != inputChannelCount )
+                return paIncompatibleHostApiSpecificStreamInfo;                  
+        }
+        else
+        {
+            if( inputStreamInfo && (inputStreamInfo->flags & paWinMmeUseMultipleDevices) )
+                return paIncompatibleHostApiSpecificStreamInfo; /* paUseHostApiSpecificDeviceSpecification was not supplied as the input device */
+
+            inputDeviceInfo = hostApi->deviceInfos[ inputParameters->device ];
+
+            /* check that input device can support inputChannelCount */
+            paerror = IsInputChannelCountSupported( (PaWinMmeDeviceInfo*)inputDeviceInfo, inputChannelCount );
+            if( paerror != paNoError )
+                return paerror;
+
+            /* test for valid sample rate, see comment above */
+            winMmeInputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, inputParameters->device );
+            paerror = QueryFormatSupported( inputDeviceInfo, QueryInputWaveFormatEx, 
+                    winMmeInputDeviceId, inputChannelCount, sampleRate,
+                    ((inputStreamInfo) ? inputStreamInfo->flags : 0) );
+            if( paerror != paNoError )
+                return paInvalidSampleRate;
+        }
+    }
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        outputStreamInfo = outputParameters->hostApiSpecificStreamInfo;
+
+        /* all standard sample formats are supported by the buffer adapter,
+            this implementation doesn't support any custom sample formats */
+        if( outputSampleFormat & paCustomFormat )
+            return paSampleFormatNotSupported;
+
+        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification
+                && outputStreamInfo && (outputStreamInfo->flags & paWinMmeUseMultipleDevices) )
+        {
+            outputMultipleDeviceChannelCount = 0;
+            for( i=0; i< outputStreamInfo->deviceCount; ++i )
+            {
+                outputMultipleDeviceChannelCount += outputStreamInfo->devices[i].channelCount;
+                    
+                outputDeviceInfo = hostApi->deviceInfos[ outputStreamInfo->devices[i].device ];
+
+                /* check that output device can support outputChannelCount */
+                if( outputStreamInfo->devices[i].channelCount < 1 )
+                    return paInvalidChannelCount;
+
+                paerror = IsOutputChannelCountSupported( (PaWinMmeDeviceInfo*)outputDeviceInfo, 
+                        outputStreamInfo->devices[i].channelCount );
+                if( paerror != paNoError )
+                    return paerror;
+
+                /* test for valid sample rate, see comment above */
+                winMmeOutputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, outputStreamInfo->devices[i].device );
+                paerror = QueryFormatSupported( outputDeviceInfo, QueryOutputWaveFormatEx, 
+                        winMmeOutputDeviceId, outputStreamInfo->devices[i].channelCount, sampleRate,
+                        ((outputStreamInfo) ? outputStreamInfo->flags : 0) );
+                if( paerror != paNoError )
+                    return paInvalidSampleRate;
+            }
+                
+            if( outputMultipleDeviceChannelCount != outputChannelCount )
+                return paIncompatibleHostApiSpecificStreamInfo;            
+        }
+        else
+        {
+            if( outputStreamInfo && (outputStreamInfo->flags & paWinMmeUseMultipleDevices) )
+                return paIncompatibleHostApiSpecificStreamInfo; /* paUseHostApiSpecificDeviceSpecification was not supplied as the output device */
+
+            outputDeviceInfo = hostApi->deviceInfos[ outputParameters->device ];
+
+            /* check that output device can support outputChannelCount */
+            paerror = IsOutputChannelCountSupported( (PaWinMmeDeviceInfo*)outputDeviceInfo, outputChannelCount );
+            if( paerror != paNoError )
+                return paerror;
+
+            /* test for valid sample rate, see comment above */
+            winMmeOutputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, outputParameters->device );
+            paerror = QueryFormatSupported( outputDeviceInfo, QueryOutputWaveFormatEx, 
+                    winMmeOutputDeviceId, outputChannelCount, sampleRate,
+                    ((outputStreamInfo) ? outputStreamInfo->flags : 0) );
+            if( paerror != paNoError )
+                return paInvalidSampleRate;
+        }
+    }
+    
+    /*
+            - if a full duplex stream is requested, check that the combination
+                of input and output parameters is supported
+
+            - check that the device supports sampleRate
+
+            for mme all we can do is test that the input and output devices
+            support the requested sample rate and number of channels. we
+            cannot test for full duplex compatibility.
+    */                                             
+
+    return paFormatIsSupported;
+}
+
+
+static unsigned long ComputeHostBufferCountForFixedBufferSizeFrames(
+        unsigned long suggestedLatencyFrames,
+        unsigned long hostBufferSizeFrames,
+        unsigned long minimumBufferCount )
+{
+    /* Calculate the number of buffers of length hostFramesPerBuffer 
+       that fit in suggestedLatencyFrames, rounding up to the next integer.
+
+       The value (hostBufferSizeFrames - 1) below is to ensure the buffer count is rounded up.
+    */
+    unsigned long resultBufferCount = ((suggestedLatencyFrames + (hostBufferSizeFrames - 1)) / hostBufferSizeFrames);
+
+    /* We always need one extra buffer for processing while the rest are queued/playing.
+       i.e. latency is framesPerBuffer * (bufferCount - 1)
+    */
+    resultBufferCount += 1;
+
+    if( resultBufferCount < minimumBufferCount ) /* clamp to minimum buffer count */
+        resultBufferCount = minimumBufferCount;
+
+    return resultBufferCount;
+}
+
+
+static unsigned long ComputeHostBufferSizeGivenHardUpperLimit( 
+        unsigned long userFramesPerBuffer,
+        unsigned long absoluteMaximumBufferSizeFrames )
+{
+    static unsigned long primes_[] = { 2, 3, 5, 7, 11, 13, 17, 19, 23, 
+            29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 0 }; /* zero terminated */
+
+    unsigned long result = userFramesPerBuffer;
+    int i;
+
+    assert( absoluteMaximumBufferSizeFrames > 67 ); /* assume maximum is large and we're only factoring by small primes */
+
+    /* search for the largest integer factor of userFramesPerBuffer less 
+       than or equal to absoluteMaximumBufferSizeFrames */
+
+    /* repeatedly divide by smallest prime factors until a buffer size 
+       smaller than absoluteMaximumBufferSizeFrames is found */
+    while( result > absoluteMaximumBufferSizeFrames ){
+
+        /* search for the smallest prime factor of result */
+        for( i=0; primes_[i] != 0; ++i ) 
+        {
+            unsigned long p = primes_[i];
+            unsigned long divided = result / p;
+            if( divided*p == result )
+            {
+                result = divided;
+                break; /* continue with outer while loop */
+            }
+        }
+        if( primes_[i] == 0 )
+        { /* loop failed to find a prime factor, return an approximate result */
+            unsigned long d = (userFramesPerBuffer + (absoluteMaximumBufferSizeFrames-1))
+                    / absoluteMaximumBufferSizeFrames;
+            return userFramesPerBuffer / d;
+        }
+    }
+
+    return result;
+}
+
+
+static PaError SelectHostBufferSizeFramesAndHostBufferCount(
+        unsigned long suggestedLatencyFrames,
+        unsigned long userFramesPerBuffer,
+        unsigned long minimumBufferCount,
+        unsigned long preferredMaximumBufferSizeFrames, /* try not to exceed this. for example, don't exceed when coalescing buffers */
+        unsigned long absoluteMaximumBufferSizeFrames,  /* never exceed this, a hard limit */
+        unsigned long *hostBufferSizeFrames,
+        unsigned long *hostBufferCount )
+{
+    unsigned long effectiveUserFramesPerBuffer;
+    unsigned long numberOfUserBuffersPerHostBuffer;
+
+
+    if( userFramesPerBuffer == paFramesPerBufferUnspecified ){
+
+        effectiveUserFramesPerBuffer = PA_MME_HOST_BUFFER_GRANULARITY_FRAMES_WHEN_UNSPECIFIED_;
+
+    }else{
+
+        if( userFramesPerBuffer > absoluteMaximumBufferSizeFrames ){
+
+            /* user has requested a user buffer that's larger than absoluteMaximumBufferSizeFrames.
+               try to choose a buffer size that is equal or smaller than absoluteMaximumBufferSizeFrames
+               but is also an integer factor of userFramesPerBuffer, so as to distribute computation evenly.
+               the buffer processor will handle the block adaption between host and user buffer sizes.
+               see http://www.portaudio.com/trac/ticket/189 for discussion.
+            */
+
+            effectiveUserFramesPerBuffer = ComputeHostBufferSizeGivenHardUpperLimit( userFramesPerBuffer, absoluteMaximumBufferSizeFrames );
+            assert( effectiveUserFramesPerBuffer <= absoluteMaximumBufferSizeFrames );
+
+            /* try to ensure that duration of host buffering is at least as 
+                large as duration of user buffer. */
+            if( suggestedLatencyFrames < userFramesPerBuffer )
+                suggestedLatencyFrames = userFramesPerBuffer; 
+
+        }else{
+
+            effectiveUserFramesPerBuffer = userFramesPerBuffer;
+        }
+    }
+                        
+    /* compute a host buffer count based on suggestedLatencyFrames and our granularity */
+
+    *hostBufferSizeFrames = effectiveUserFramesPerBuffer;
+
+    *hostBufferCount = ComputeHostBufferCountForFixedBufferSizeFrames(
+            suggestedLatencyFrames, *hostBufferSizeFrames, minimumBufferCount );
+
+    if( *hostBufferSizeFrames >= userFramesPerBuffer )
+    {
+        /*
+            If there are too many host buffers we would like to coalesce 
+            them by packing an integer number of user buffers into each host buffer.
+            We try to coalesce such that hostBufferCount will lie between 
+            PA_MME_TARGET_HOST_BUFFER_COUNT_ and (PA_MME_TARGET_HOST_BUFFER_COUNT_*2)-1.
+            We limit coalescing to avoid exceeding either absoluteMaximumBufferSizeFrames and
+            preferredMaximumBufferSizeFrames. 
+
+            First, compute a coalescing factor: the number of user buffers per host buffer.
+            The goal is to achieve PA_MME_TARGET_HOST_BUFFER_COUNT_ total buffer count.
+            Since our latency is computed based on (*hostBufferCount - 1) we compute a
+            coalescing factor based on (*hostBufferCount - 1) and (PA_MME_TARGET_HOST_BUFFER_COUNT_-1).
+
+            The + (PA_MME_TARGET_HOST_BUFFER_COUNT_-2) term below is intended to round up.
+        */
+        numberOfUserBuffersPerHostBuffer = ((*hostBufferCount - 1) + (PA_MME_TARGET_HOST_BUFFER_COUNT_-2)) / (PA_MME_TARGET_HOST_BUFFER_COUNT_ - 1);
+        
+        if( numberOfUserBuffersPerHostBuffer > 1 )
+        {
+            unsigned long maxCoalescedBufferSizeFrames = (absoluteMaximumBufferSizeFrames < preferredMaximumBufferSizeFrames) /* minimum of our limits */
+                            ? absoluteMaximumBufferSizeFrames
+                            : preferredMaximumBufferSizeFrames;
+
+            unsigned long maxUserBuffersPerHostBuffer = maxCoalescedBufferSizeFrames / effectiveUserFramesPerBuffer; /* don't coalesce more than this */
+
+            if( numberOfUserBuffersPerHostBuffer > maxUserBuffersPerHostBuffer )
+                numberOfUserBuffersPerHostBuffer = maxUserBuffersPerHostBuffer;
+
+            *hostBufferSizeFrames = effectiveUserFramesPerBuffer * numberOfUserBuffersPerHostBuffer;
+
+            /* recompute hostBufferCount to approximate suggestedLatencyFrames now that hostBufferSizeFrames is larger */
+            *hostBufferCount = ComputeHostBufferCountForFixedBufferSizeFrames(
+                    suggestedLatencyFrames, *hostBufferSizeFrames, minimumBufferCount );
+        }
+    }
+
+    return paNoError;
+}
+
+
+static PaError CalculateMaxHostSampleFrameSizeBytes(
+        int channelCount,
+        PaSampleFormat hostSampleFormat,
+        const PaWinMmeStreamInfo *streamInfo,
+        int *hostSampleFrameSizeBytes )
+{
+    unsigned int i;
+    /* PA WMME streams may aggregate multiple WMME devices. When the stream addresses 
+       more than one device in a single direction, maxDeviceChannelCount is the maximum 
+       number of channels used by a single device.
+    */
+    int maxDeviceChannelCount = channelCount;
+    int hostSampleSizeBytes = Pa_GetSampleSize( hostSampleFormat );
+    if( hostSampleSizeBytes < 0 )
+    {
+        return hostSampleSizeBytes; /* the value of hostSampleSize here is an error code, not a sample size */
+    }
+
+    if( streamInfo && ( streamInfo->flags & paWinMmeUseMultipleDevices ) )
+    {
+        maxDeviceChannelCount = streamInfo->devices[0].channelCount;
+        for( i=1; i< streamInfo->deviceCount; ++i )
+        {
+            if( streamInfo->devices[i].channelCount > maxDeviceChannelCount )
+                maxDeviceChannelCount = streamInfo->devices[i].channelCount;
+        }
+    }
+
+    *hostSampleFrameSizeBytes = hostSampleSizeBytes * maxDeviceChannelCount;
+
+    return paNoError;
+}
+
+
+/* CalculateBufferSettings() fills the framesPerHostInputBuffer, hostInputBufferCount,
+   framesPerHostOutputBuffer and hostOutputBufferCount parameters based on the values
+   of the other parameters.
+*/
+
+static PaError CalculateBufferSettings(
+        unsigned long *hostFramesPerInputBuffer, unsigned long *hostInputBufferCount,
+        unsigned long *hostFramesPerOutputBuffer, unsigned long *hostOutputBufferCount,
+        int inputChannelCount, PaSampleFormat hostInputSampleFormat,
+        PaTime suggestedInputLatency, const PaWinMmeStreamInfo *inputStreamInfo,
+        int outputChannelCount, PaSampleFormat hostOutputSampleFormat,
+        PaTime suggestedOutputLatency, const PaWinMmeStreamInfo *outputStreamInfo,
+        double sampleRate, unsigned long userFramesPerBuffer )
+{
+    PaError result = paNoError;
+    
+    if( inputChannelCount > 0 ) /* stream has input */
+    {
+        int hostInputFrameSizeBytes;
+        result = CalculateMaxHostSampleFrameSizeBytes( 
+                inputChannelCount, hostInputSampleFormat, inputStreamInfo, &hostInputFrameSizeBytes );
+        if( result != paNoError )
+            goto error;
+
+        if( inputStreamInfo
+                && ( inputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
+        {
+            /* input - using low level latency parameters if provided */
+
+            if( inputStreamInfo->bufferCount <= 0
+                    || inputStreamInfo->framesPerBuffer <= 0 )
+            {
+                result = paIncompatibleHostApiSpecificStreamInfo;
+                goto error;
+            }
+
+            *hostFramesPerInputBuffer = inputStreamInfo->framesPerBuffer;
+            *hostInputBufferCount = inputStreamInfo->bufferCount;
+        }
+        else
+        {
+            /* input - not using low level latency parameters, so compute 
+               hostFramesPerInputBuffer and hostInputBufferCount
+               based on userFramesPerBuffer and suggestedInputLatency. */
+
+            unsigned long minimumBufferCount = (outputChannelCount > 0)
+                    ? PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_
+                    : PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_;
+
+            result = SelectHostBufferSizeFramesAndHostBufferCount(
+                    (unsigned long)(suggestedInputLatency * sampleRate), /* (truncate) */
+                    userFramesPerBuffer,
+                    minimumBufferCount,
+                    (unsigned long)(PA_MME_MAX_HOST_BUFFER_SECS_ * sampleRate), /* in frames. preferred maximum */
+                    (PA_MME_MAX_HOST_BUFFER_BYTES_ / hostInputFrameSizeBytes),  /* in frames. a hard limit. note truncation due to 
+                                                                                division is intentional here to limit max bytes */
+                    hostFramesPerInputBuffer,
+                    hostInputBufferCount );
+            if( result != paNoError )
+                goto error;
+        }
+    }
+    else
+    {
+        *hostFramesPerInputBuffer = 0;
+        *hostInputBufferCount = 0;
+    }
+
+    if( outputChannelCount > 0 ) /* stream has output */
+    {
+        if( outputStreamInfo
+                && ( outputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
+        {
+            /* output - using low level latency parameters */
+
+            if( outputStreamInfo->bufferCount <= 0
+                    || outputStreamInfo->framesPerBuffer <= 0 )
+            {
+                result = paIncompatibleHostApiSpecificStreamInfo;
+                goto error;
+            }
+
+            *hostFramesPerOutputBuffer = outputStreamInfo->framesPerBuffer;
+            *hostOutputBufferCount = outputStreamInfo->bufferCount;
+
+            if( inputChannelCount > 0 ) /* full duplex */
+            {
+                /* harmonize hostFramesPerInputBuffer and hostFramesPerOutputBuffer */
+
+                if( *hostFramesPerInputBuffer != *hostFramesPerOutputBuffer )
+                {
+                    if( inputStreamInfo
+                            && ( inputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
+                    { 
+                        /* a custom StreamInfo was used for specifying both input
+                            and output buffer sizes. We require that the larger buffer size
+                            must be a multiple of the smaller buffer size */
+
+                        if( *hostFramesPerInputBuffer < *hostFramesPerOutputBuffer )
+                        {
+                            if( *hostFramesPerOutputBuffer % *hostFramesPerInputBuffer != 0 )
+                            {
+                                result = paIncompatibleHostApiSpecificStreamInfo;
+                                goto error;
+                            }
+                        }
+                        else
+                        {
+                            assert( *hostFramesPerInputBuffer > *hostFramesPerOutputBuffer );
+                            if( *hostFramesPerInputBuffer % *hostFramesPerOutputBuffer != 0 )
+                            {
+                                result = paIncompatibleHostApiSpecificStreamInfo;
+                                goto error;
+                            }
+                        }                        
+                    }
+                    else
+                    {
+                        /* a custom StreamInfo was not used for specifying the input buffer size,
+                            so use the output buffer size, and approximately the suggested input latency. */
+
+                        *hostFramesPerInputBuffer = *hostFramesPerOutputBuffer;
+
+                        *hostInputBufferCount = ComputeHostBufferCountForFixedBufferSizeFrames(
+                                (unsigned long)(suggestedInputLatency * sampleRate), 
+                                *hostFramesPerInputBuffer, 
+                                PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_ );
+                    }
+                }
+            }
+        }
+        else
+        {
+            /* output - no low level latency parameters, so compute hostFramesPerOutputBuffer and hostOutputBufferCount
+                based on userFramesPerBuffer and suggestedOutputLatency. */
+
+            int hostOutputFrameSizeBytes;
+            result = CalculateMaxHostSampleFrameSizeBytes( 
+                    outputChannelCount, hostOutputSampleFormat, outputStreamInfo, &hostOutputFrameSizeBytes );
+            if( result != paNoError )
+                goto error;
+
+            /* compute the output buffer size and count */
+
+            result = SelectHostBufferSizeFramesAndHostBufferCount(
+                    (unsigned long)(suggestedOutputLatency * sampleRate), /* (truncate) */
+                    userFramesPerBuffer,
+                    PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_,
+                    (unsigned long)(PA_MME_MAX_HOST_BUFFER_SECS_ * sampleRate), /* in frames. preferred maximum */
+                    (PA_MME_MAX_HOST_BUFFER_BYTES_ / hostOutputFrameSizeBytes),  /* in frames. a hard limit. note truncation due to 
+                                                                                 division is intentional here to limit max bytes */
+                    hostFramesPerOutputBuffer,
+                    hostOutputBufferCount );
+            if( result != paNoError )
+                goto error;
+
+            if( inputChannelCount > 0 ) /* full duplex */
+            {
+                /* harmonize hostFramesPerInputBuffer and hostFramesPerOutputBuffer */
+
+                /* ensure that both input and output buffer sizes are the same.
+                    if they don't match at this stage, choose the smallest one
+                    and use that for input and output and recompute the corresponding
+                    buffer count accordingly.
+                */
+
+                if( *hostFramesPerOutputBuffer != *hostFramesPerInputBuffer )
+                {
+                    if( hostFramesPerInputBuffer < hostFramesPerOutputBuffer )
+                    {
+                        *hostFramesPerOutputBuffer = *hostFramesPerInputBuffer;
+
+                        *hostOutputBufferCount = ComputeHostBufferCountForFixedBufferSizeFrames(
+                                (unsigned long)(suggestedOutputLatency * sampleRate), 
+                                *hostOutputBufferCount, 
+                                PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_ );
+                    }
+                    else
+                    {
+                        *hostFramesPerInputBuffer = *hostFramesPerOutputBuffer;
+
+                        *hostInputBufferCount = ComputeHostBufferCountForFixedBufferSizeFrames(
+                                (unsigned long)(suggestedInputLatency * sampleRate), 
+                                *hostFramesPerInputBuffer, 
+                                PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_ );
+                    }
+                }   
+            }
+        }
+    }
+    else
+    {
+        *hostFramesPerOutputBuffer = 0;
+        *hostOutputBufferCount = 0;
+    }
+
+error:
+    return result;
+}
+
+
+typedef struct
+{
+    HANDLE bufferEvent;
+    void *waveHandles;
+    unsigned int deviceCount;
+    /* unsigned int channelCount; */
+    WAVEHDR **waveHeaders;                  /* waveHeaders[device][buffer] */
+    unsigned int bufferCount;
+    unsigned int currentBufferIndex;
+    unsigned int framesPerBuffer;
+    unsigned int framesUsedInCurrentBuffer;
+}PaWinMmeSingleDirectionHandlesAndBuffers;
+
+/* prototypes for functions operating on PaWinMmeSingleDirectionHandlesAndBuffers */
+
+static void InitializeSingleDirectionHandlesAndBuffers( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers );
+static PaError InitializeWaveHandles( PaWinMmeHostApiRepresentation *winMmeHostApi,
+        PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
+        unsigned long winMmeSpecificFlags,
+        unsigned long bytesPerHostSample,
+        double sampleRate, PaWinMmeDeviceAndChannelCount *devices,
+        unsigned int deviceCount, PaWinWaveFormatChannelMask channelMask, int isInput );
+static PaError TerminateWaveHandles( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput, int currentlyProcessingAnError );
+static PaError InitializeWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
+        unsigned long hostBufferCount,
+        PaSampleFormat hostSampleFormat,
+        unsigned long framesPerHostBuffer,
+        PaWinMmeDeviceAndChannelCount *devices,
+        int isInput );
+static void TerminateWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput );
+
+
+static void InitializeSingleDirectionHandlesAndBuffers( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
+{
+    handlesAndBuffers->bufferEvent = 0;
+    handlesAndBuffers->waveHandles = 0;
+    handlesAndBuffers->deviceCount = 0;
+    handlesAndBuffers->waveHeaders = 0;
+    handlesAndBuffers->bufferCount = 0;
+}    
+
+static PaError InitializeWaveHandles( PaWinMmeHostApiRepresentation *winMmeHostApi,
+        PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
+        unsigned long winMmeSpecificFlags,
+        unsigned long bytesPerHostSample,
+        double sampleRate, PaWinMmeDeviceAndChannelCount *devices,
+        unsigned int deviceCount, PaWinWaveFormatChannelMask channelMask, int isInput )
+{
+    PaError result;
+    MMRESULT mmresult;
+    signed int i, j;
+    PaSampleFormat sampleFormat;
+    int waveFormatTag;
+
+    /* for error cleanup we expect that InitializeSingleDirectionHandlesAndBuffers()
+        has already been called to zero some fields */       
+
+    result = CreateEventWithPaError( &handlesAndBuffers->bufferEvent, NULL, FALSE, FALSE, NULL );
+    if( result != paNoError ) goto error;
+
+    if( isInput )
+        handlesAndBuffers->waveHandles = (void*)PaUtil_AllocateMemory( sizeof(HWAVEIN) * deviceCount );
+    else
+        handlesAndBuffers->waveHandles = (void*)PaUtil_AllocateMemory( sizeof(HWAVEOUT) * deviceCount );
+    if( !handlesAndBuffers->waveHandles )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    handlesAndBuffers->deviceCount = deviceCount;
+
+    for( i = 0; i < (signed int)deviceCount; ++i )
+    {
+        if( isInput )
+            ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] = 0;
+        else
+            ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] = 0;
+    }
+
+    /* @todo at the moment we only use 16 bit sample format */
+    sampleFormat = paInt16;
+    waveFormatTag = SampleFormatAndWinWmmeSpecificFlagsToLinearWaveFormatTag( sampleFormat, winMmeSpecificFlags );
+
+    for( i = 0; i < (signed int)deviceCount; ++i )
+    {
+        PaWinWaveFormat waveFormat;
+        UINT winMmeDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, devices[i].device );
+    
+        /* @todo: consider providing a flag or #define to not try waveformat extensible 
+           this could just initialize j to 1 the first time round. */
+
+        for( j = 0; j < 2; ++j )
+        {
+            switch(j){
+                case 0:     
+                    /* first, attempt to open the device using WAVEFORMATEXTENSIBLE, 
+                        if this fails we fall back to WAVEFORMATEX */
+
+                    PaWin_InitializeWaveFormatExtensible( &waveFormat, devices[i].channelCount, 
+                            sampleFormat, waveFormatTag, sampleRate, channelMask );
+                    break;
+                
+                case 1:
+                    /* retry with WAVEFORMATEX */
+
+                    PaWin_InitializeWaveFormatEx( &waveFormat, devices[i].channelCount, 
+                            sampleFormat, waveFormatTag, sampleRate );
+                    break;
+            }
+
+            /* REVIEW: consider not firing an event for input when a full duplex
+                stream is being used. this would probably depend on the
+                neverDropInput flag. */
+
+            if( isInput )
+            {
+                mmresult = waveInOpen( &((HWAVEIN*)handlesAndBuffers->waveHandles)[i], winMmeDeviceId, 
+                                    (WAVEFORMATEX*)&waveFormat,
+                               (DWORD_PTR)handlesAndBuffers->bufferEvent, (DWORD_PTR)0, CALLBACK_EVENT );
+            }
+            else
+            {
+                mmresult = waveOutOpen( &((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], winMmeDeviceId, 
+                                    (WAVEFORMATEX*)&waveFormat,
+                                (DWORD_PTR)handlesAndBuffers->bufferEvent, (DWORD_PTR)0, CALLBACK_EVENT );
+            }
+
+            if( mmresult == MMSYSERR_NOERROR )
+            {
+                break; /* success */
+            }
+            else if( j == 0 )
+            {
+                continue; /* try again with WAVEFORMATEX */
+            }
+            else
+            {
+                switch( mmresult )
+                {
+                    case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
+                        result = paDeviceUnavailable;
+                        break;
+                    case MMSYSERR_NODRIVER:	    /* No device driver is present. */
+                        result = paDeviceUnavailable;
+                        break;
+                    case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
+                        result = paInsufficientMemory;
+                        break;
+
+                    case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
+                        /* falls through */
+
+                    case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
+                                                    /* This can also occur if we try to open the device with an unsupported
+                                                     * number of channels. This is attempted when device*ChannelCountIsKnown is
+                                                     * set to 0. 
+                                                     */
+                        /* falls through */
+                    default:
+                        result = paUnanticipatedHostError;
+                        if( isInput )
+                        {
+                            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                        }
+                        else
+                        {
+                            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                        }
+                }
+                goto error;
+            }
+        }
+    }
+
+    return result;
+
+error:
+    TerminateWaveHandles( handlesAndBuffers, isInput, 1 /* currentlyProcessingAnError */ );
+
+    return result;
+}
+
+
+static PaError TerminateWaveHandles( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput, int currentlyProcessingAnError )
+{
+    PaError result = paNoError;
+    MMRESULT mmresult;
+    signed int i;
+    
+    if( handlesAndBuffers->waveHandles )
+    {
+        for( i = handlesAndBuffers->deviceCount-1; i >= 0; --i )
+        {
+            if( isInput )
+            {
+                if( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] )
+                    mmresult = waveInClose( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] );
+                else
+                    mmresult = MMSYSERR_NOERROR;
+            }
+            else
+            {
+                if( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] )
+                    mmresult = waveOutClose( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] );
+                else
+                    mmresult = MMSYSERR_NOERROR;
+            }
+
+            if( mmresult != MMSYSERR_NOERROR &&
+                !currentlyProcessingAnError ) /* don't update the error state if we're already processing an error */
+            {
+                result = paUnanticipatedHostError;
+                if( isInput )
+                {
+                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                }
+                else
+                {
+                    PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                }
+                /* note that we don't break here, we try to continue closing devices */
+            }
+        }
+
+        PaUtil_FreeMemory( handlesAndBuffers->waveHandles );
+        handlesAndBuffers->waveHandles = 0;
+    }
+
+    if( handlesAndBuffers->bufferEvent )
+    {
+        result = CloseHandleWithPaError( handlesAndBuffers->bufferEvent );
+        handlesAndBuffers->bufferEvent = 0;
+    }
+    
+    return result;
+}
+
+
+static PaError InitializeWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
+        unsigned long hostBufferCount,
+        PaSampleFormat hostSampleFormat,
+        unsigned long framesPerHostBuffer,
+        PaWinMmeDeviceAndChannelCount *devices,
+        int isInput )
+{
+    PaError result = paNoError;
+    MMRESULT mmresult;
+    WAVEHDR *deviceWaveHeaders;
+    signed int i, j;
+
+    /* for error cleanup we expect that InitializeSingleDirectionHandlesAndBuffers()
+        has already been called to zero some fields */
+        
+
+    /* allocate an array of pointers to arrays of wave headers, one array of
+        wave headers per device */
+    handlesAndBuffers->waveHeaders = (WAVEHDR**)PaUtil_AllocateMemory( sizeof(WAVEHDR*) * handlesAndBuffers->deviceCount );
+    if( !handlesAndBuffers->waveHeaders )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+    
+    for( i = 0; i < (signed int)handlesAndBuffers->deviceCount; ++i )
+        handlesAndBuffers->waveHeaders[i] = 0;
+
+    handlesAndBuffers->bufferCount = hostBufferCount;
+
+    for( i = 0; i < (signed int)handlesAndBuffers->deviceCount; ++i )
+    {
+        int bufferBytes = Pa_GetSampleSize( hostSampleFormat ) *
+                framesPerHostBuffer * devices[i].channelCount;
+        if( bufferBytes < 0 )
+        {
+            result = paInternalError;
+            goto error;
+        }
+
+        /* Allocate an array of wave headers for device i */
+        deviceWaveHeaders = (WAVEHDR *) PaUtil_AllocateMemory( sizeof(WAVEHDR)*hostBufferCount );
+        if( !deviceWaveHeaders )
+        {
+            result = paInsufficientMemory;
+            goto error;
+        }
+
+        for( j=0; j < (signed int)hostBufferCount; ++j )
+            deviceWaveHeaders[j].lpData = 0;
+
+        handlesAndBuffers->waveHeaders[i] = deviceWaveHeaders;
+
+        /* Allocate a buffer for each wave header */
+        for( j=0; j < (signed int)hostBufferCount; ++j )
+        {
+            deviceWaveHeaders[j].lpData = (char *)PaUtil_AllocateMemory( bufferBytes );
+            if( !deviceWaveHeaders[j].lpData )
+            {
+                result = paInsufficientMemory;
+                goto error;
+            }
+            deviceWaveHeaders[j].dwBufferLength = bufferBytes;
+            deviceWaveHeaders[j].dwUser = 0xFFFFFFFF; /* indicates that *PrepareHeader() has not yet been called, for error clean up code */
+
+            if( isInput )
+            {
+                mmresult = waveInPrepareHeader( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
+                if( mmresult != MMSYSERR_NOERROR )
+                {
+                    result = paUnanticipatedHostError;
+                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                    goto error;
+                }
+            }
+            else /* output */
+            {
+                mmresult = waveOutPrepareHeader( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
+                if( mmresult != MMSYSERR_NOERROR )
+                {
+                    result = paUnanticipatedHostError;
+                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                    goto error;
+                }
+            }
+            deviceWaveHeaders[j].dwUser = devices[i].channelCount;
+        }
+    }
+
+    return result;
+
+error:
+    TerminateWaveHeaders( handlesAndBuffers, isInput );
+    
+    return result;
+}
+
+
+static void TerminateWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput )
+{
+    signed int i, j;
+    WAVEHDR *deviceWaveHeaders;
+    
+    if( handlesAndBuffers->waveHeaders )
+    {
+        for( i = handlesAndBuffers->deviceCount-1; i >= 0 ; --i )
+        {
+            deviceWaveHeaders = handlesAndBuffers->waveHeaders[i];  /* wave headers for device i */
+            if( deviceWaveHeaders )
+            {
+                for( j = handlesAndBuffers->bufferCount-1; j >= 0; --j )
+                {
+                    if( deviceWaveHeaders[j].lpData )
+                    {
+                        if( deviceWaveHeaders[j].dwUser != 0xFFFFFFFF )
+                        {
+                            if( isInput )
+                                waveInUnprepareHeader( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
+                            else
+                                waveOutUnprepareHeader( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
+                        }
+
+                        PaUtil_FreeMemory( deviceWaveHeaders[j].lpData );
+                    }
+                }
+
+                PaUtil_FreeMemory( deviceWaveHeaders );
+            }
+        }
+
+        PaUtil_FreeMemory( handlesAndBuffers->waveHeaders );
+        handlesAndBuffers->waveHeaders = 0;
+    }
+}
+
+
+
+/* PaWinMmeStream - a stream data structure specifically for this implementation */
+/* note that struct PaWinMmeStream is typedeffed to PaWinMmeStream above. */
+struct PaWinMmeStream
+{
+    PaUtilStreamRepresentation streamRepresentation;
+    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
+    PaUtilBufferProcessor bufferProcessor;
+
+    int primeStreamUsingCallback;
+
+    PaWinMmeSingleDirectionHandlesAndBuffers input;
+    PaWinMmeSingleDirectionHandlesAndBuffers output;
+
+    /* Processing thread management -------------- */
+    HANDLE abortEvent;
+    HANDLE processingThread;
+    PA_THREAD_ID processingThreadId;
+
+    char throttleProcessingThreadOnOverload; /* 0 -> don't throtte, non-0 -> throttle */
+    int processingThreadPriority;
+    int highThreadPriority;
+    int throttledThreadPriority;
+    unsigned long throttledSleepMsecs;
+
+    int isStopped;
+    volatile int isActive;
+    volatile int stopProcessing; /* stop thread once existing buffers have been returned */
+    volatile int abortProcessing; /* stop thread immediately */
+
+    DWORD allBuffersDurationMs; /* used to calculate timeouts */
+};
+
+/* updates deviceCount if PaWinMmeUseMultipleDevices is used */
+
+static PaError ValidateWinMmeSpecificStreamInfo(
+        const PaStreamParameters *streamParameters,
+        const PaWinMmeStreamInfo *streamInfo,
+        unsigned long *winMmeSpecificFlags,
+        char *throttleProcessingThreadOnOverload,
+        unsigned long *deviceCount )
+{
+	if( streamInfo )
+	{
+	    if( streamInfo->size != sizeof( PaWinMmeStreamInfo )
+	            || streamInfo->version != 1 )
+	    {
+	        return paIncompatibleHostApiSpecificStreamInfo;
+	    }
+
+        *winMmeSpecificFlags = streamInfo->flags;
+
+	    if( streamInfo->flags & paWinMmeDontThrottleOverloadedProcessingThread )
+	        *throttleProcessingThreadOnOverload = 0;
+            
+	    if( streamInfo->flags & paWinMmeUseMultipleDevices )
+	    {
+	        if( streamParameters->device != paUseHostApiSpecificDeviceSpecification )
+	            return paInvalidDevice;
+	
+			*deviceCount = streamInfo->deviceCount;
+		}	
+	}
+
+	return paNoError;
+}
+
+static PaError RetrieveDevicesFromStreamParameters(
+        struct PaUtilHostApiRepresentation *hostApi,
+        const PaStreamParameters *streamParameters,
+        const PaWinMmeStreamInfo *streamInfo,
+        PaWinMmeDeviceAndChannelCount *devices,
+        unsigned long deviceCount )
+{
+    PaError result = paNoError;
+    unsigned int i;
+    int totalChannelCount;
+    PaDeviceIndex hostApiDevice;
+    
+	if( streamInfo && streamInfo->flags & paWinMmeUseMultipleDevices )
+	{
+		totalChannelCount = 0;
+	    for( i=0; i < deviceCount; ++i )
+	    {
+	        /* validate that the device number is within range */
+	        result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice,
+	                        streamInfo->devices[i].device, hostApi );
+	        if( result != paNoError )
+	            return result;
+	        
+	        devices[i].device = hostApiDevice;
+	        devices[i].channelCount = streamInfo->devices[i].channelCount;
+	
+	        totalChannelCount += devices[i].channelCount;
+	    }
+	
+	    if( totalChannelCount != streamParameters->channelCount )
+	    {
+	        /* channelCount must match total channels specified by multiple devices */
+	        return paInvalidChannelCount; /* REVIEW use of this error code */
+	    }
+	}	
+	else
+	{		
+	    devices[0].device = streamParameters->device;
+	    devices[0].channelCount = streamParameters->channelCount;
+	}
+
+    return result;
+}
+
+static PaError ValidateInputChannelCounts(
+        struct PaUtilHostApiRepresentation *hostApi,
+        PaWinMmeDeviceAndChannelCount *devices,
+        unsigned long deviceCount )
+{
+    unsigned int i;
+    PaWinMmeDeviceInfo *inputDeviceInfo;
+    PaError paerror;
+
+	for( i=0; i < deviceCount; ++i )
+	{
+        if( devices[i].channelCount < 1 )
+        	return paInvalidChannelCount;
+
+        inputDeviceInfo = 
+                (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ];
+
+        paerror = IsInputChannelCountSupported( inputDeviceInfo, devices[i].channelCount );
+        if( paerror != paNoError )
+            return paerror;
+	}
+
+    return paNoError;
+}
+
+static PaError ValidateOutputChannelCounts(
+        struct PaUtilHostApiRepresentation *hostApi,
+        PaWinMmeDeviceAndChannelCount *devices,
+        unsigned long deviceCount )
+{
+    unsigned int i;
+    PaWinMmeDeviceInfo *outputDeviceInfo;
+    PaError paerror;
+
+	for( i=0; i < deviceCount; ++i )
+	{
+        if( devices[i].channelCount < 1 )
+        	return paInvalidChannelCount;
+
+        outputDeviceInfo = 
+                (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ];
+
+        paerror = IsOutputChannelCountSupported( outputDeviceInfo, devices[i].channelCount );
+        if( paerror != paNoError )
+            return paerror;
+	}
+
+    return paNoError;
+}
+
+
+/* the following macros are intended to improve the readability of the following code */
+#define PA_IS_INPUT_STREAM_( stream ) ( stream ->input.waveHandles )
+#define PA_IS_OUTPUT_STREAM_( stream ) ( stream ->output.waveHandles )
+#define PA_IS_FULL_DUPLEX_STREAM_( stream ) ( stream ->input.waveHandles && stream ->output.waveHandles )
+#define PA_IS_HALF_DUPLEX_STREAM_( stream ) ( !(stream ->input.waveHandles && stream ->output.waveHandles) )
+
+static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
+                           PaStream** s,
+                           const PaStreamParameters *inputParameters,
+                           const PaStreamParameters *outputParameters,
+                           double sampleRate,
+                           unsigned long framesPerBuffer,
+                           PaStreamFlags streamFlags,
+                           PaStreamCallback *streamCallback,
+                           void *userData )
+{
+    PaError result;
+    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
+    PaWinMmeStream *stream = 0;
+    int bufferProcessorIsInitialized = 0;
+    int streamRepresentationIsInitialized = 0;
+    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
+    int inputChannelCount, outputChannelCount;
+    PaSampleFormat inputSampleFormat, outputSampleFormat;
+    double suggestedInputLatency, suggestedOutputLatency;
+    PaWinMmeStreamInfo *inputStreamInfo, *outputStreamInfo;
+    PaWinWaveFormatChannelMask inputChannelMask, outputChannelMask;
+    unsigned long framesPerHostInputBuffer;
+    unsigned long hostInputBufferCount;
+    unsigned long framesPerHostOutputBuffer;
+    unsigned long hostOutputBufferCount;
+    unsigned long framesPerBufferProcessorCall;
+    PaWinMmeDeviceAndChannelCount *inputDevices = 0;  /* contains all devices and channel counts as local host api ids, even when PaWinMmeUseMultipleDevices is not used */
+    unsigned long winMmeSpecificInputFlags = 0;
+    unsigned long inputDeviceCount = 0;            
+    PaWinMmeDeviceAndChannelCount *outputDevices = 0;
+    unsigned long winMmeSpecificOutputFlags = 0;
+    unsigned long outputDeviceCount = 0;                /* contains all devices and channel counts as local host api ids, even when PaWinMmeUseMultipleDevices is not used */
+    char throttleProcessingThreadOnOverload = 1;
+
+    
+    if( inputParameters )
+    {
+		inputChannelCount = inputParameters->channelCount;
+        inputSampleFormat = inputParameters->sampleFormat;
+        suggestedInputLatency = inputParameters->suggestedLatency;
+
+      	inputDeviceCount = 1;
+
+		/* validate input hostApiSpecificStreamInfo */
+        inputStreamInfo = (PaWinMmeStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinMmeSpecificStreamInfo( inputParameters, inputStreamInfo,
+                &winMmeSpecificInputFlags,
+				&throttleProcessingThreadOnOverload,
+				&inputDeviceCount );
+		if( result != paNoError ) return result;
+
+		inputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * inputDeviceCount );
+        if( !inputDevices ) return paInsufficientMemory;
+
+		result = RetrieveDevicesFromStreamParameters( hostApi, inputParameters, inputStreamInfo, inputDevices, inputDeviceCount );
+		if( result != paNoError ) return result;
+
+		result = ValidateInputChannelCounts( hostApi, inputDevices, inputDeviceCount );
+		if( result != paNoError ) return result;
+
+        hostInputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, inputSampleFormat );
+
+        if( inputDeviceCount != 1 ){
+            /* always use direct speakers when using multi-device multichannel mode */
+            inputChannelMask = PAWIN_SPEAKER_DIRECTOUT;           
+        }
+        else
+        {
+            if( inputStreamInfo && inputStreamInfo->flags & paWinMmeUseChannelMask )
+                inputChannelMask = inputStreamInfo->channelMask;
+            else
+                inputChannelMask = PaWin_DefaultChannelMask( inputDevices[0].channelCount );
+        }
+	}
+    else
+    {
+        inputChannelCount = 0;
+        inputSampleFormat = 0;
+        suggestedInputLatency = 0.;
+        inputStreamInfo = 0;
+        hostInputSampleFormat = 0;
+    }
+
+
+    if( outputParameters )
+    {
+        outputChannelCount = outputParameters->channelCount;
+        outputSampleFormat = outputParameters->sampleFormat;
+        suggestedOutputLatency = outputParameters->suggestedLatency;
+
+        outputDeviceCount = 1;
+
+		/* validate output hostApiSpecificStreamInfo */
+        outputStreamInfo = (PaWinMmeStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
+		result = ValidateWinMmeSpecificStreamInfo( outputParameters, outputStreamInfo,
+                &winMmeSpecificOutputFlags,
+				&throttleProcessingThreadOnOverload,
+				&outputDeviceCount );
+		if( result != paNoError ) return result;
+
+		outputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * outputDeviceCount );
+        if( !outputDevices ) return paInsufficientMemory;
+
+		result = RetrieveDevicesFromStreamParameters( hostApi, outputParameters, outputStreamInfo, outputDevices, outputDeviceCount );
+		if( result != paNoError ) return result;
+
+		result = ValidateOutputChannelCounts( hostApi, outputDevices, outputDeviceCount );
+		if( result != paNoError ) return result;
+
+        hostOutputSampleFormat =
+            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, outputSampleFormat );
+
+        if( outputDeviceCount != 1 ){
+            /* always use direct speakers when using multi-device multichannel mode */
+            outputChannelMask = PAWIN_SPEAKER_DIRECTOUT;           
+        }
+        else
+        {
+            if( outputStreamInfo && outputStreamInfo->flags & paWinMmeUseChannelMask )
+                outputChannelMask = outputStreamInfo->channelMask;
+            else
+                outputChannelMask = PaWin_DefaultChannelMask( outputDevices[0].channelCount );
+        }
+    }
+    else
+    {
+        outputChannelCount = 0;
+        outputSampleFormat = 0;
+        outputStreamInfo = 0;
+        hostOutputSampleFormat = 0;
+        suggestedOutputLatency = 0.;
+    }
+
+
+    /*
+        IMPLEMENT ME:
+            - alter sampleRate to a close allowable rate if possible / necessary
+    */
+
+
+    /* validate platform specific flags */
+    if( (streamFlags & paPlatformSpecificFlags) != 0 )
+        return paInvalidFlag; /* unexpected platform specific flag */
+
+
+    /* always disable clipping and dithering if we are outputting a raw spdif stream */
+    if( (winMmeSpecificOutputFlags & paWinMmeWaveFormatDolbyAc3Spdif)
+            || (winMmeSpecificOutputFlags & paWinMmeWaveFormatWmaSpdif) ){
+
+        streamFlags = streamFlags | paClipOff | paDitherOff;
+    }
+
+
+    result = CalculateBufferSettings( &framesPerHostInputBuffer, &hostInputBufferCount,
+                &framesPerHostOutputBuffer, &hostOutputBufferCount,
+                inputChannelCount, hostInputSampleFormat, suggestedInputLatency, inputStreamInfo,
+                outputChannelCount, hostOutputSampleFormat, suggestedOutputLatency, outputStreamInfo,
+                sampleRate, framesPerBuffer );
+    if( result != paNoError ) goto error;
+
+
+    stream = (PaWinMmeStream*)PaUtil_AllocateMemory( sizeof(PaWinMmeStream) );
+    if( !stream )
+    {
+        result = paInsufficientMemory;
+        goto error;
+    }
+
+    InitializeSingleDirectionHandlesAndBuffers( &stream->input );
+    InitializeSingleDirectionHandlesAndBuffers( &stream->output );
+
+    stream->abortEvent = 0;
+    stream->processingThread = 0;
+
+    stream->throttleProcessingThreadOnOverload = throttleProcessingThreadOnOverload;
+
+    PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
+                                           ( (streamCallback)
+                                            ? &winMmeHostApi->callbackStreamInterface
+                                            : &winMmeHostApi->blockingStreamInterface ),
+                                           streamCallback, userData );
+    streamRepresentationIsInitialized = 1;
+
+    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
+
+
+    if( inputParameters && outputParameters ) /* full duplex */
+    {
+        if( framesPerHostInputBuffer < framesPerHostOutputBuffer )
+        {
+            assert( (framesPerHostOutputBuffer % framesPerHostInputBuffer) == 0 ); /* CalculateBufferSettings() should guarantee this condition */
+
+            framesPerBufferProcessorCall = framesPerHostInputBuffer;
+        }
+        else
+        {
+            assert( (framesPerHostInputBuffer % framesPerHostOutputBuffer) == 0 ); /* CalculateBufferSettings() should guarantee this condition */
+            
+            framesPerBufferProcessorCall = framesPerHostOutputBuffer;
+        }
+    }
+    else if( inputParameters )
+    {
+        framesPerBufferProcessorCall = framesPerHostInputBuffer;
+    }
+    else if( outputParameters )
+    {
+        framesPerBufferProcessorCall = framesPerHostOutputBuffer;
+    }
+
+    stream->input.framesPerBuffer = framesPerHostInputBuffer;
+    stream->output.framesPerBuffer = framesPerHostOutputBuffer;
+
+    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
+                    inputChannelCount, inputSampleFormat, hostInputSampleFormat,
+                    outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
+                    sampleRate, streamFlags, framesPerBuffer,
+                    framesPerBufferProcessorCall, paUtilFixedHostBufferSize,
+                    streamCallback, userData );
+    if( result != paNoError ) goto error;
+    
+    bufferProcessorIsInitialized = 1;
+
+    /* stream info input latency is the minimum buffering latency (unlike suggested and default which are *maximums*) */
+    stream->streamRepresentation.streamInfo.inputLatency =
+            (double)(PaUtil_GetBufferProcessorInputLatencyFrames(&stream->bufferProcessor)
+                + framesPerHostInputBuffer) / sampleRate;
+    stream->streamRepresentation.streamInfo.outputLatency =
+            (double)(PaUtil_GetBufferProcessorOutputLatencyFrames(&stream->bufferProcessor)
+                + (framesPerHostOutputBuffer * (hostOutputBufferCount-1))) / sampleRate;
+    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
+
+    stream->primeStreamUsingCallback = ( (streamFlags&paPrimeOutputBuffersUsingStreamCallback) && streamCallback ) ? 1 : 0;
+
+    /* time to sleep when throttling due to >100% cpu usage.
+        -a quater of a buffer's duration */
+    stream->throttledSleepMsecs =
+            (unsigned long)(stream->bufferProcessor.framesPerHostBuffer *
+             stream->bufferProcessor.samplePeriod * .25 * 1000);
+
+    stream->isStopped = 1;
+    stream->isActive = 0;
+
+
+    /* for maximum compatibility with multi-device multichannel drivers,
+        we first open all devices, then we prepare all buffers, finally
+        we start all devices ( in StartStream() ). teardown in reverse order.
+    */
+
+    if( inputParameters )
+    {
+        result = InitializeWaveHandles( winMmeHostApi, &stream->input,
+                winMmeSpecificInputFlags,
+                stream->bufferProcessor.bytesPerHostInputSample, sampleRate,
+                inputDevices, inputDeviceCount, inputChannelMask, 1 /* isInput */ );
+        if( result != paNoError ) goto error;
+    }
+    
+    if( outputParameters )
+    {
+        result = InitializeWaveHandles( winMmeHostApi, &stream->output,
+                winMmeSpecificOutputFlags,
+                stream->bufferProcessor.bytesPerHostOutputSample, sampleRate,
+                outputDevices, outputDeviceCount, outputChannelMask, 0 /* isInput */ );
+        if( result != paNoError ) goto error;
+    }
+
+    if( inputParameters )
+    {
+        result = InitializeWaveHeaders( &stream->input, hostInputBufferCount,
+                hostInputSampleFormat, framesPerHostInputBuffer, inputDevices, 1 /* isInput */ );
+        if( result != paNoError ) goto error;
+    }
+
+    if( outputParameters )
+    {
+        result = InitializeWaveHeaders( &stream->output, hostOutputBufferCount,
+                hostOutputSampleFormat, framesPerHostOutputBuffer, outputDevices, 0 /* not isInput */ );
+        if( result != paNoError ) goto error;
+
+        stream->allBuffersDurationMs = (DWORD) (1000.0 * (framesPerHostOutputBuffer * stream->output.bufferCount) / sampleRate);
+    }
+    else
+    {
+        stream->allBuffersDurationMs = (DWORD) (1000.0 * (framesPerHostInputBuffer * stream->input.bufferCount) / sampleRate);
+    }
+
+    
+    if( streamCallback )
+    {
+        /* abort event is only needed for callback streams */
+        result = CreateEventWithPaError( &stream->abortEvent, NULL, TRUE, FALSE, NULL );
+        if( result != paNoError ) goto error;
+    }
+
+    *s = (PaStream*)stream;
+
+    return result;
+
+error:
+
+    if( stream )
+    {
+        if( stream->abortEvent )
+            CloseHandle( stream->abortEvent );
+            
+        TerminateWaveHeaders( &stream->output, 0 /* not isInput */ );
+        TerminateWaveHeaders( &stream->input, 1 /* isInput */ );
+
+        TerminateWaveHandles( &stream->output, 0 /* not isInput */, 1 /* currentlyProcessingAnError */ );
+        TerminateWaveHandles( &stream->input, 1 /* isInput */, 1 /* currentlyProcessingAnError */ );
+
+        if( bufferProcessorIsInitialized )
+            PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+
+        if( streamRepresentationIsInitialized )
+            PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+
+        PaUtil_FreeMemory( stream );
+    }
+
+    return result;
+}
+
+
+/* return non-zero if all current buffers are done */
+static int BuffersAreDone( WAVEHDR **waveHeaders, unsigned int deviceCount, int bufferIndex )
+{
+    unsigned int i;
+    
+    for( i=0; i < deviceCount; ++i )
+    {
+        if( !(waveHeaders[i][ bufferIndex ].dwFlags & WHDR_DONE) )
+        {
+            return 0;
+        }         
+    }
+
+    return 1;
+}
+
+static int CurrentInputBuffersAreDone( PaWinMmeStream *stream )
+{
+    return BuffersAreDone( stream->input.waveHeaders, stream->input.deviceCount, stream->input.currentBufferIndex );
+}
+
+static int CurrentOutputBuffersAreDone( PaWinMmeStream *stream )
+{
+    return BuffersAreDone( stream->output.waveHeaders, stream->output.deviceCount, stream->output.currentBufferIndex );
+}
+
+
+/* return non-zero if any buffers are queued */
+static int NoBuffersAreQueued( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
+{
+    unsigned int i, j;
+
+    if( handlesAndBuffers->waveHandles )
+    {
+        for( i=0; i < handlesAndBuffers->bufferCount; ++i )
+        {
+            for( j=0; j < handlesAndBuffers->deviceCount; ++j )
+            {
+                if( !( handlesAndBuffers->waveHeaders[ j ][ i ].dwFlags & WHDR_DONE) )
+                {
+                    return 0;
+                }
+            }
+        }
+    }
+
+    return 1;
+}
+
+
+#define PA_CIRCULAR_INCREMENT_( current, max )\
+    ( (((current) + 1) >= (max)) ? (0) : (current+1) )
+
+#define PA_CIRCULAR_DECREMENT_( current, max )\
+    ( ((current) == 0) ? ((max)-1) : (current-1) )
+    
+
+static signed long GetAvailableFrames( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
+{
+    signed long result = 0;
+    unsigned int i;
+    
+    if( BuffersAreDone( handlesAndBuffers->waveHeaders, handlesAndBuffers->deviceCount, handlesAndBuffers->currentBufferIndex ) )
+    {
+        /* we could calculate the following in O(1) if we kept track of the
+            last done buffer */
+        result = handlesAndBuffers->framesPerBuffer - handlesAndBuffers->framesUsedInCurrentBuffer;
+
+        i = PA_CIRCULAR_INCREMENT_( handlesAndBuffers->currentBufferIndex, handlesAndBuffers->bufferCount );
+        while( i != handlesAndBuffers->currentBufferIndex )
+        {
+            if( BuffersAreDone( handlesAndBuffers->waveHeaders, handlesAndBuffers->deviceCount, i ) )
+            {
+                result += handlesAndBuffers->framesPerBuffer;
+                i = PA_CIRCULAR_INCREMENT_( i, handlesAndBuffers->bufferCount );
+            }
+            else
+                break;
+        }
+    }
+
+    return result;
+}
+
+
+static PaError AdvanceToNextInputBuffer( PaWinMmeStream *stream )
+{
+    PaError result = paNoError;
+    MMRESULT mmresult;
+    unsigned int i;
+
+    for( i=0; i < stream->input.deviceCount; ++i )
+    {
+        stream->input.waveHeaders[i][ stream->input.currentBufferIndex ].dwFlags &= ~WHDR_DONE;
+        mmresult = waveInAddBuffer( ((HWAVEIN*)stream->input.waveHandles)[i],
+                                    &stream->input.waveHeaders[i][ stream->input.currentBufferIndex ],
+                                    sizeof(WAVEHDR) );
+        if( mmresult != MMSYSERR_NOERROR )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+        }
+    }
+
+    stream->input.currentBufferIndex =
+            PA_CIRCULAR_INCREMENT_( stream->input.currentBufferIndex, stream->input.bufferCount );
+
+    stream->input.framesUsedInCurrentBuffer = 0;
+
+    return result;
+}
+
+
+static PaError AdvanceToNextOutputBuffer( PaWinMmeStream *stream )
+{
+    PaError result = paNoError;
+    MMRESULT mmresult;
+    unsigned int i;
+
+    for( i=0; i < stream->output.deviceCount; ++i )
+    {
+        mmresult = waveOutWrite( ((HWAVEOUT*)stream->output.waveHandles)[i],
+                                 &stream->output.waveHeaders[i][ stream->output.currentBufferIndex ],
+                                 sizeof(WAVEHDR) );
+        if( mmresult != MMSYSERR_NOERROR )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+        }
+    }
+
+    stream->output.currentBufferIndex =
+            PA_CIRCULAR_INCREMENT_( stream->output.currentBufferIndex, stream->output.bufferCount );
+
+    stream->output.framesUsedInCurrentBuffer = 0;
+    
+    return result;
+}
+
+
+/* requeue all but the most recent input with the driver. Used for catching
+    up after a total input buffer underrun */
+static PaError CatchUpInputBuffers( PaWinMmeStream *stream )
+{
+    PaError result = paNoError;
+    unsigned int i;
+    
+    for( i=0; i < stream->input.bufferCount - 1; ++i )
+    {
+        result = AdvanceToNextInputBuffer( stream );
+        if( result != paNoError )
+            break;
+    }
+
+    return result;
+}
+
+
+/* take the most recent output and duplicate it to all other output buffers
+    and requeue them. Used for catching up after a total output buffer underrun.
+*/
+static PaError CatchUpOutputBuffers( PaWinMmeStream *stream )
+{
+    PaError result = paNoError;
+    unsigned int i, j;
+    unsigned int previousBufferIndex =
+            PA_CIRCULAR_DECREMENT_( stream->output.currentBufferIndex, stream->output.bufferCount );
+
+    for( i=0; i < stream->output.bufferCount - 1; ++i )
+    {
+        for( j=0; j < stream->output.deviceCount; ++j )
+        {
+            if( stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].lpData
+                    != stream->output.waveHeaders[j][ previousBufferIndex ].lpData )
+            {
+                CopyMemory( stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].lpData,
+                            stream->output.waveHeaders[j][ previousBufferIndex ].lpData,
+                            stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].dwBufferLength );
+            }
+        }
+
+        result = AdvanceToNextOutputBuffer( stream );
+        if( result != paNoError )
+            break;
+    }
+
+    return result;
+}
+
+
+PA_THREAD_FUNC ProcessingThreadProc( void *pArg )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream *)pArg;
+    HANDLE events[3];
+    int eventCount = 0;
+    DWORD result = paNoError;
+    DWORD waitResult;
+    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
+    int hostBuffersAvailable;
+    signed int hostInputBufferIndex, hostOutputBufferIndex;
+    PaStreamCallbackFlags statusFlags;
+    int callbackResult;
+    int done = 0;
+    unsigned int channel, i;
+    unsigned long framesProcessed;
+    
+    /* prepare event array for call to WaitForMultipleObjects() */
+    if( stream->input.bufferEvent )
+        events[eventCount++] = stream->input.bufferEvent;
+    if( stream->output.bufferEvent )
+        events[eventCount++] = stream->output.bufferEvent;
+    events[eventCount++] = stream->abortEvent;
+
+    statusFlags = 0; /** @todo support paInputUnderflow, paOutputOverflow and paNeverDropInput */
+    
+    /* loop until something causes us to stop */
+    do{
+        /* wait for MME to signal that a buffer is available, or for
+            the PA abort event to be signaled.
+
+          When this indicates that one or more buffers are available
+          NoBuffersAreQueued() and Current*BuffersAreDone are used below to
+          poll for additional done buffers. NoBuffersAreQueued() will fail
+          to identify an underrun/overflow if the driver doesn't mark all done
+          buffers prior to signalling the event. Some drivers do this
+          (eg RME Digi96, and others don't eg VIA PC 97 input). This isn't a
+          huge problem, it just means that we won't always be able to detect
+          underflow/overflow.
+        */
+        waitResult = WaitForMultipleObjects( eventCount, events, FALSE /* wait all = FALSE */, timeout );
+        if( waitResult == WAIT_FAILED )
+        {
+            result = paUnanticipatedHostError;
+            /** @todo FIXME/REVIEW: can't return host error info from an asyncronous thread. see http://www.portaudio.com/trac/ticket/143 */
+            done = 1;
+        }
+        else if( waitResult == WAIT_TIMEOUT )
+        {
+            /* if a timeout is encountered, continue */
+        }
+
+        if( stream->abortProcessing )
+        {
+            /* Pa_AbortStream() has been called, stop processing immediately */
+            done = 1;
+        }
+        else if( stream->stopProcessing )
+        {
+            /* Pa_StopStream() has been called or the user callback returned
+                non-zero, processing will continue until all output buffers
+                are marked as done. The stream will stop immediately if it
+                is input-only.
+            */
+
+            if( PA_IS_OUTPUT_STREAM_(stream) )
+            {
+                if( NoBuffersAreQueued( &stream->output ) )
+                    done = 1; /* Will cause thread to return. */
+            }
+            else
+            {
+                /* input only stream */
+                done = 1; /* Will cause thread to return. */
+            }
+        }
+        else
+        {
+            hostBuffersAvailable = 1;
+
+            /* process all available host buffers */
+            do
+            {
+                hostInputBufferIndex = -1;
+                hostOutputBufferIndex = -1;
+                
+                if( PA_IS_INPUT_STREAM_(stream) )
+                {
+                    if( CurrentInputBuffersAreDone( stream ) )
+                    {
+                        if( NoBuffersAreQueued( &stream->input ) )
+                        {
+                            /** @todo
+                               if all of the other buffers are also ready then
+                               we discard all but the most recent. This is an
+                               input buffer overflow. FIXME: these buffers should
+                               be passed to the callback in a paNeverDropInput
+                               stream. http://www.portaudio.com/trac/ticket/142
+
+                               note that it is also possible for an input overflow
+                               to happen while the callback is processing a buffer.
+                               that is handled further down.
+                            */
+                            result = CatchUpInputBuffers( stream );
+                            if( result != paNoError )
+                                done = 1;
+
+                            statusFlags |= paInputOverflow;
+                        }
+
+                        hostInputBufferIndex = stream->input.currentBufferIndex;
+                    }
+                }
+
+                if( PA_IS_OUTPUT_STREAM_(stream) )
+                {
+                    if( CurrentOutputBuffersAreDone( stream ) )
+                    {
+                        /* ok, we have an output buffer */
+                        
+                        if( NoBuffersAreQueued( &stream->output ) )
+                        {
+                            /*
+                            if all of the other buffers are also ready, catch up by copying
+                            the most recently generated buffer into all but one of the output
+                            buffers.
+
+                            note that this catch up code only handles the case where all
+                            buffers have been played out due to this thread not having
+                            woken up at all. a more common case occurs when this thread
+                            is woken up, processes one buffer, but takes too long, and as
+                            a result all the other buffers have become un-queued. that
+                            case is handled further down.
+                            */
+
+                            result = CatchUpOutputBuffers( stream );
+                            if( result != paNoError )
+                                done = 1;
+
+                            statusFlags |= paOutputUnderflow;
+                        }
+
+                        hostOutputBufferIndex = stream->output.currentBufferIndex;
+                    }
+                }
+
+               
+                if( (PA_IS_FULL_DUPLEX_STREAM_(stream) && hostInputBufferIndex != -1 && hostOutputBufferIndex != -1) ||
+                        (PA_IS_HALF_DUPLEX_STREAM_(stream) && ( hostInputBufferIndex != -1 || hostOutputBufferIndex != -1 ) ) )
+                {
+                    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement inputBufferAdcTime */
+
+
+                    if( PA_IS_OUTPUT_STREAM_(stream) )
+                    {
+                        /* set timeInfo.currentTime and calculate timeInfo.outputBufferDacTime
+                            from the current wave out position */
+                        MMTIME mmtime;
+                        double timeBeforeGetPosition, timeAfterGetPosition;
+                        double time;
+                        long framesInBufferRing; 		
+                        long writePosition;
+                        long playbackPosition;
+                        HWAVEOUT firstWaveOutDevice = ((HWAVEOUT*)stream->output.waveHandles)[0];
+                        
+                        mmtime.wType = TIME_SAMPLES;
+                        timeBeforeGetPosition = PaUtil_GetTime();
+                        waveOutGetPosition( firstWaveOutDevice, &mmtime, sizeof(MMTIME) );
+                        timeAfterGetPosition = PaUtil_GetTime();
+
+                        timeInfo.currentTime = timeAfterGetPosition;
+
+                        /* approximate time at which wave out position was measured
+                            as half way between timeBeforeGetPosition and timeAfterGetPosition */
+                        time = timeBeforeGetPosition + (timeAfterGetPosition - timeBeforeGetPosition) * .5;
+                        
+                        framesInBufferRing = stream->output.bufferCount * stream->bufferProcessor.framesPerHostBuffer;
+                        playbackPosition = mmtime.u.sample % framesInBufferRing;
+
+                        writePosition = stream->output.currentBufferIndex * stream->bufferProcessor.framesPerHostBuffer
+                                + stream->output.framesUsedInCurrentBuffer;
+                       
+                        if( playbackPosition >= writePosition ){
+                            timeInfo.outputBufferDacTime =
+                                    time + ((double)( writePosition + (framesInBufferRing - playbackPosition) ) * stream->bufferProcessor.samplePeriod );
+                        }else{
+                            timeInfo.outputBufferDacTime =
+                                    time + ((double)( writePosition - playbackPosition ) * stream->bufferProcessor.samplePeriod );
+                        }
+                    }
+
+
+                    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
+
+                    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, statusFlags  );
+
+                    /* reset status flags once they have been passed to the buffer processor */
+                    statusFlags = 0;
+
+                    if( PA_IS_INPUT_STREAM_(stream) )
+                    {
+                        PaUtil_SetInputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
+
+                        channel = 0;
+                        for( i=0; i<stream->input.deviceCount; ++i )
+                        {
+                             /* we have stored the number of channels in the buffer in dwUser */
+                            int channelCount = (int)stream->input.waveHeaders[i][ hostInputBufferIndex ].dwUser;
+                            
+                            PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, channel,
+                                    stream->input.waveHeaders[i][ hostInputBufferIndex ].lpData +
+                                        stream->input.framesUsedInCurrentBuffer * channelCount *
+                                        stream->bufferProcessor.bytesPerHostInputSample,
+                                    channelCount );
+                                    
+
+                            channel += channelCount;
+                        }
+                    }
+
+                    if( PA_IS_OUTPUT_STREAM_(stream) )
+                    {
+                        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
+                        
+                        channel = 0;
+                        for( i=0; i<stream->output.deviceCount; ++i )
+                        {
+                            /* we have stored the number of channels in the buffer in dwUser */
+                            int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
+
+                            PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
+                                    stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
+                                        stream->output.framesUsedInCurrentBuffer * channelCount *
+                                        stream->bufferProcessor.bytesPerHostOutputSample,
+                                    channelCount );
+
+                            channel += channelCount;
+                        }
+                    }
+
+                    callbackResult = paContinue;
+                    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+
+                    stream->input.framesUsedInCurrentBuffer += framesProcessed;
+                    stream->output.framesUsedInCurrentBuffer += framesProcessed;
+
+                    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
+
+                    if( callbackResult == paContinue )
+                    {
+                        /* nothing special to do */
+                    }
+                    else if( callbackResult == paAbort )
+                    {
+                        stream->abortProcessing = 1;
+                        done = 1;
+                        /** @todo FIXME: should probably reset the output device immediately once the callback returns paAbort 
+                            see: http://www.portaudio.com/trac/ticket/141
+                        */
+                        result = paNoError;
+                    }
+                    else
+                    {
+                        /* User callback has asked us to stop with paComplete or other non-zero value */
+                        stream->stopProcessing = 1; /* stop once currently queued audio has finished */
+                        result = paNoError;
+                    }
+
+
+                    if( PA_IS_INPUT_STREAM_(stream)
+                            && stream->stopProcessing == 0 && stream->abortProcessing == 0
+                            && stream->input.framesUsedInCurrentBuffer == stream->input.framesPerBuffer )
+                    {
+                        if( NoBuffersAreQueued( &stream->input ) )
+                        {
+                            /** @todo need to handle PaNeverDropInput here where necessary */
+                            result = CatchUpInputBuffers( stream );
+                            if( result != paNoError )
+                                done = 1;
+
+                            statusFlags |= paInputOverflow;
+                        }
+
+                        result = AdvanceToNextInputBuffer( stream );
+                        if( result != paNoError )
+                            done = 1;
+                    }
+
+                    
+                    if( PA_IS_OUTPUT_STREAM_(stream) && !stream->abortProcessing )
+                    {
+                        if( stream->stopProcessing &&
+                                stream->output.framesUsedInCurrentBuffer < stream->output.framesPerBuffer )
+                        {
+                            /* zero remaining samples in output output buffer and flush */
+
+                            stream->output.framesUsedInCurrentBuffer += PaUtil_ZeroOutput( &stream->bufferProcessor,
+                                    stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
+
+                            /* we send the entire buffer to the output devices, but we could
+                                just send a partial buffer, rather than zeroing the unused
+                                samples.
+                            */
+                        }
+
+                        if( stream->output.framesUsedInCurrentBuffer == stream->output.framesPerBuffer )
+                        {
+                            /* check for underflow before enquing the just-generated buffer,
+                                but recover from underflow after enquing it. This ensures
+                                that the most recent audio segment is repeated */
+                            int outputUnderflow = NoBuffersAreQueued( &stream->output );
+
+                            result = AdvanceToNextOutputBuffer( stream );
+                            if( result != paNoError )
+                                done = 1;
+
+                            if( outputUnderflow && !done && !stream->stopProcessing )
+                            {
+                                /* Recover from underflow in the case where the
+                                    underflow occured while processing the buffer
+                                    we just finished */
+
+                                result = CatchUpOutputBuffers( stream );
+                                if( result != paNoError )
+                                    done = 1;
+
+                                statusFlags |= paOutputUnderflow;
+                            }
+                        }
+                    }
+                    
+                    if( stream->throttleProcessingThreadOnOverload != 0 )
+                    {
+                        if( stream->stopProcessing || stream->abortProcessing )
+                        {
+                            if( stream->processingThreadPriority != stream->highThreadPriority )
+                            {
+                                SetThreadPriority( stream->processingThread, stream->highThreadPriority );
+                                stream->processingThreadPriority = stream->highThreadPriority;
+                            }
+                        }
+                        else if( PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer ) > 1. )
+                        {
+                            if( stream->processingThreadPriority != stream->throttledThreadPriority )
+                            {
+                                SetThreadPriority( stream->processingThread, stream->throttledThreadPriority );
+                                stream->processingThreadPriority = stream->throttledThreadPriority;
+                            }
+
+                            /* sleep to give other processes a go */
+                            Sleep( stream->throttledSleepMsecs );
+                        }
+                        else
+                        {
+                            if( stream->processingThreadPriority != stream->highThreadPriority )
+                            {
+                                SetThreadPriority( stream->processingThread, stream->highThreadPriority );
+                                stream->processingThreadPriority = stream->highThreadPriority;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    hostBuffersAvailable = 0;
+                }
+            }
+            while( hostBuffersAvailable &&
+                    stream->stopProcessing == 0 &&
+                    stream->abortProcessing == 0 &&
+                    !done );
+        }
+    }
+    while( !done );
+
+    stream->isActive = 0;
+
+    if( stream->streamRepresentation.streamFinishedCallback != 0 )
+        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
+
+    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
+    
+    return result;
+}
+
+
+/*
+    When CloseStream() is called, the multi-api layer ensures that
+    the stream has already been stopped or aborted.
+*/
+static PaError CloseStream( PaStream* s )
+{
+    PaError result;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+
+    result = CloseHandleWithPaError( stream->abortEvent );
+    if( result != paNoError ) goto error;
+    
+    TerminateWaveHeaders( &stream->output, 0 /* not isInput */ );
+    TerminateWaveHeaders( &stream->input, 1 /* isInput */ );
+
+    TerminateWaveHandles( &stream->output, 0 /* not isInput */, 0 /* not currentlyProcessingAnError */ );
+    TerminateWaveHandles( &stream->input, 1 /* isInput */, 0 /* not currentlyProcessingAnError */ );
+    
+    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
+    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
+    PaUtil_FreeMemory( stream );
+
+error:
+    /** @todo REVIEW: what is the best way to clean up a stream if an error is detected? */
+    return result;
+}
+
+
+static PaError StartStream( PaStream *s )
+{
+    PaError result;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    MMRESULT mmresult;
+    unsigned int i, j;
+    int callbackResult;
+	unsigned int channel;
+ 	unsigned long framesProcessed;
+	PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement this for stream priming */
+    
+    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
+    
+    if( PA_IS_INPUT_STREAM_(stream) )
+    {
+        for( i=0; i<stream->input.bufferCount; ++i )
+        {
+            for( j=0; j<stream->input.deviceCount; ++j )
+            {
+                stream->input.waveHeaders[j][i].dwFlags &= ~WHDR_DONE;
+                mmresult = waveInAddBuffer( ((HWAVEIN*)stream->input.waveHandles)[j], &stream->input.waveHeaders[j][i], sizeof(WAVEHDR) );
+                if( mmresult != MMSYSERR_NOERROR )
+                {
+                    result = paUnanticipatedHostError;
+                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                    goto error;
+                }
+            }
+        }
+        stream->input.currentBufferIndex = 0;
+        stream->input.framesUsedInCurrentBuffer = 0;
+    }
+
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+    {
+        for( i=0; i<stream->output.deviceCount; ++i )
+        {
+            if( (mmresult = waveOutPause( ((HWAVEOUT*)stream->output.waveHandles)[i] )) != MMSYSERR_NOERROR )
+            {
+                result = paUnanticipatedHostError;
+                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                goto error;
+            }
+        }
+
+        for( i=0; i<stream->output.bufferCount; ++i )
+        {
+            if( stream->primeStreamUsingCallback )
+            {
+
+                stream->output.framesUsedInCurrentBuffer = 0;
+                do{
+
+                    PaUtil_BeginBufferProcessing( &stream->bufferProcessor,
+                            &timeInfo,
+                            paPrimingOutput | ((stream->input.bufferCount > 0 ) ? paInputUnderflow : 0));
+
+                    if( stream->input.bufferCount > 0 )
+                        PaUtil_SetNoInput( &stream->bufferProcessor );
+
+                    PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
+
+                    channel = 0;
+                    for( j=0; j<stream->output.deviceCount; ++j )
+                    {
+                        /* we have stored the number of channels in the buffer in dwUser */
+                        int channelCount = (int)stream->output.waveHeaders[j][i].dwUser;
+
+                        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
+                                stream->output.waveHeaders[j][i].lpData +
+                                stream->output.framesUsedInCurrentBuffer * channelCount *
+                                stream->bufferProcessor.bytesPerHostOutputSample,
+                                channelCount );
+
+                        /* we have stored the number of channels in the buffer in dwUser */
+                        channel += channelCount;
+                    }
+
+                    callbackResult = paContinue;
+                    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
+                    stream->output.framesUsedInCurrentBuffer += framesProcessed;
+
+                    if( callbackResult != paContinue )
+                    {
+                        /** @todo fix this, what do we do if callback result is non-zero during stream
+                            priming?
+
+                            for complete: play out primed waveHeaders as usual
+                            for abort: clean up immediately.
+                       */
+                    }
+
+                }while( stream->output.framesUsedInCurrentBuffer != stream->output.framesPerBuffer );
+
+            }
+            else
+            {
+                for( j=0; j<stream->output.deviceCount; ++j )
+                {
+                    ZeroMemory( stream->output.waveHeaders[j][i].lpData, stream->output.waveHeaders[j][i].dwBufferLength );
+                }
+            }   
+
+            /* we queue all channels of a single buffer frame (accross all
+                devices, because some multidevice multichannel drivers work
+                better this way */
+            for( j=0; j<stream->output.deviceCount; ++j )
+            {
+                mmresult = waveOutWrite( ((HWAVEOUT*)stream->output.waveHandles)[j], &stream->output.waveHeaders[j][i], sizeof(WAVEHDR) );
+                if( mmresult != MMSYSERR_NOERROR )
+                {
+                    result = paUnanticipatedHostError;
+                    PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                    goto error;
+                }
+            }
+        }
+        stream->output.currentBufferIndex = 0;
+        stream->output.framesUsedInCurrentBuffer = 0;
+    }
+
+
+    stream->isStopped = 0;
+    stream->isActive = 1;
+    stream->stopProcessing = 0;
+    stream->abortProcessing = 0;
+
+    result = ResetEventWithPaError( stream->input.bufferEvent );
+    if( result != paNoError ) goto error;
+
+    result = ResetEventWithPaError( stream->output.bufferEvent );
+    if( result != paNoError ) goto error;
+    
+    
+    if( stream->streamRepresentation.streamCallback )
+    {
+        /* callback stream */
+
+        result = ResetEventWithPaError( stream->abortEvent );
+        if( result != paNoError ) goto error;
+
+        /* Create thread that waits for audio buffers to be ready for processing. */
+        stream->processingThread = CREATE_THREAD;
+        if( !stream->processingThread )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
+            goto error;
+        }
+
+        /** @todo could have mme specific stream parameters to allow the user
+            to set the callback thread priorities */
+        stream->highThreadPriority = THREAD_PRIORITY_TIME_CRITICAL;
+        stream->throttledThreadPriority = THREAD_PRIORITY_NORMAL;
+
+        if( !SetThreadPriority( stream->processingThread, stream->highThreadPriority ) )
+        {
+            result = paUnanticipatedHostError;
+            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
+            goto error;
+        }
+        stream->processingThreadPriority = stream->highThreadPriority;
+    }
+    else
+    {
+        /* blocking read/write stream */
+
+    }
+
+    if( PA_IS_INPUT_STREAM_(stream) )
+    {
+        for( i=0; i < stream->input.deviceCount; ++i )
+        {
+            mmresult = waveInStart( ((HWAVEIN*)stream->input.waveHandles)[i] );
+            PA_DEBUG(("Pa_StartStream: waveInStart returned = 0x%X.\n", mmresult));
+            if( mmresult != MMSYSERR_NOERROR )
+            {
+                result = paUnanticipatedHostError;
+                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                goto error;
+            }
+        }
+    }
+
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+    {
+        for( i=0; i < stream->output.deviceCount; ++i )
+        {
+            if( (mmresult = waveOutRestart( ((HWAVEOUT*)stream->output.waveHandles)[i] )) != MMSYSERR_NOERROR )
+            {
+                result = paUnanticipatedHostError;
+                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                goto error;
+            }
+        }
+    }
+
+    return result;
+
+error:
+    /** @todo FIXME: implement recovery as best we can
+    This should involve rolling back to a state as-if this function had never been called
+    */
+    return result;
+}
+
+
+static PaError StopStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    int timeout;
+    DWORD waitResult;
+    MMRESULT mmresult;
+    signed int hostOutputBufferIndex;
+    unsigned int channel, waitCount, i;                  
+    
+    /** @todo
+        REVIEW: the error checking in this function needs review. the basic
+        idea is to return from this function in a known state - for example
+        there is no point avoiding calling waveInReset just because
+        the thread times out.
+    */
+
+    if( stream->processingThread )
+    {
+        /* callback stream */
+
+        /* Tell processing thread to stop generating more data and to let current data play out. */
+        stream->stopProcessing = 1;
+
+        /* Calculate timeOut longer than longest time it could take to return all buffers. */
+        timeout = (int)(stream->allBuffersDurationMs * 1.5);
+        if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
+            timeout = PA_MME_MIN_TIMEOUT_MSEC_;
+
+        PA_DEBUG(("WinMME StopStream: waiting for background thread.\n"));
+
+        waitResult = WaitForSingleObject( stream->processingThread, timeout );
+        if( waitResult == WAIT_TIMEOUT )
+        {
+            /* try to abort */
+            stream->abortProcessing = 1;
+            SetEvent( stream->abortEvent );
+            waitResult = WaitForSingleObject( stream->processingThread, timeout );
+            if( waitResult == WAIT_TIMEOUT )
+            {
+                PA_DEBUG(("WinMME StopStream: timed out while waiting for background thread to finish.\n"));
+                result = paTimedOut;
+            }
+        }
+
+        CloseHandle( stream->processingThread );
+        stream->processingThread = NULL;
+    }
+    else
+    {
+        /* blocking read / write stream */
+
+        if( PA_IS_OUTPUT_STREAM_(stream) )
+        {
+            if( stream->output.framesUsedInCurrentBuffer > 0 )
+            {
+                /* there are still unqueued frames in the current buffer, so flush them */
+
+                hostOutputBufferIndex = stream->output.currentBufferIndex;
+
+                PaUtil_SetOutputFrameCount( &stream->bufferProcessor,
+                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
+                
+                channel = 0;
+                for( i=0; i<stream->output.deviceCount; ++i )
+                {
+                    /* we have stored the number of channels in the buffer in dwUser */
+                    int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
+
+                    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
+                            stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
+                                stream->output.framesUsedInCurrentBuffer * channelCount *
+                                stream->bufferProcessor.bytesPerHostOutputSample,
+                            channelCount );
+
+                    channel += channelCount;
+                }
+
+                PaUtil_ZeroOutput( &stream->bufferProcessor,
+                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
+
+                /* we send the entire buffer to the output devices, but we could
+                    just send a partial buffer, rather than zeroing the unused
+                    samples.
+                */
+                AdvanceToNextOutputBuffer( stream );
+            }
+            
+
+            timeout = (stream->allBuffersDurationMs / stream->output.bufferCount) + 1;
+            if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
+                timeout = PA_MME_MIN_TIMEOUT_MSEC_;
+
+            waitCount = 0;
+            while( !NoBuffersAreQueued( &stream->output ) && waitCount <= stream->output.bufferCount )
+            {
+                /* wait for MME to signal that a buffer is available */
+                waitResult = WaitForSingleObject( stream->output.bufferEvent, timeout );
+                if( waitResult == WAIT_FAILED )
+                {
+                    break;
+                }
+                else if( waitResult == WAIT_TIMEOUT )
+                {
+                    /* keep waiting */
+                }
+
+                ++waitCount;
+            }
+        }
+    }
+
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+    {
+        for( i =0; i < stream->output.deviceCount; ++i )
+        {
+            mmresult = waveOutReset( ((HWAVEOUT*)stream->output.waveHandles)[i] );
+            if( mmresult != MMSYSERR_NOERROR )
+            {
+                result = paUnanticipatedHostError;
+                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+            }
+        }
+    }
+
+    if( PA_IS_INPUT_STREAM_(stream) )
+    {
+        for( i=0; i < stream->input.deviceCount; ++i )
+        {
+            mmresult = waveInReset( ((HWAVEIN*)stream->input.waveHandles)[i] );
+            if( mmresult != MMSYSERR_NOERROR )
+            {
+                result = paUnanticipatedHostError;
+                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+            }
+        }
+    }
+
+    stream->isStopped = 1;
+    stream->isActive = 0;
+
+    return result;
+}
+
+
+static PaError AbortStream( PaStream *s )
+{
+    PaError result = paNoError;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    int timeout;
+    DWORD waitResult;
+    MMRESULT mmresult;
+    unsigned int i;
+    
+    /** @todo
+        REVIEW: the error checking in this function needs review. the basic
+        idea is to return from this function in a known state - for example
+        there is no point avoiding calling waveInReset just because
+        the thread times out.
+    */
+
+    if( stream->processingThread )
+    {
+        /* callback stream */
+        
+        /* Tell processing thread to abort immediately */
+        stream->abortProcessing = 1;
+        SetEvent( stream->abortEvent );
+    }
+
+
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+    {
+        for( i =0; i < stream->output.deviceCount; ++i )
+        {
+            mmresult = waveOutReset( ((HWAVEOUT*)stream->output.waveHandles)[i] );
+            if( mmresult != MMSYSERR_NOERROR )
+            {
+                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
+                return paUnanticipatedHostError;
+            }
+        }
+    }
+
+    if( PA_IS_INPUT_STREAM_(stream) )
+    {
+        for( i=0; i < stream->input.deviceCount; ++i )
+        {
+            mmresult = waveInReset( ((HWAVEIN*)stream->input.waveHandles)[i] );
+            if( mmresult != MMSYSERR_NOERROR )
+            {
+                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
+                return paUnanticipatedHostError;
+            }
+        }
+    }
+
+
+    if( stream->processingThread )
+    {
+        /* callback stream */
+        
+        PA_DEBUG(("WinMME AbortStream: waiting for background thread.\n"));
+
+        /* Calculate timeOut longer than longest time it could take to return all buffers. */
+        timeout = (int)(stream->allBuffersDurationMs * 1.5);
+        if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
+            timeout = PA_MME_MIN_TIMEOUT_MSEC_;
+            
+        waitResult = WaitForSingleObject( stream->processingThread, timeout );
+        if( waitResult == WAIT_TIMEOUT )
+        {
+            PA_DEBUG(("WinMME AbortStream: timed out while waiting for background thread to finish.\n"));
+            return paTimedOut;
+        }
+
+        CloseHandle( stream->processingThread );
+        stream->processingThread = NULL;
+    }
+
+    stream->isStopped = 1;
+    stream->isActive = 0;
+
+    return result;
+}
+
+
+static PaError IsStreamStopped( PaStream *s )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+
+    return stream->isStopped;
+}
+
+
+static PaError IsStreamActive( PaStream *s )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+
+    return stream->isActive;
+}
+
+
+static PaTime GetStreamTime( PaStream *s )
+{
+    (void) s; /* unused parameter */
+    
+    return PaUtil_GetTime();
+}
+
+
+static double GetStreamCpuLoad( PaStream* s )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+
+    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
+}
+
+
+/*
+    As separate stream interfaces are used for blocking and callback
+    streams, the following functions can be guaranteed to only be called
+    for blocking streams.
+*/
+
+static PaError ReadStream( PaStream* s,
+                           void *buffer,
+                           unsigned long frames )
+{
+    PaError result = paNoError;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    void *userBuffer;
+    unsigned long framesRead = 0;
+    unsigned long framesProcessed;
+    signed int hostInputBufferIndex;
+    DWORD waitResult;
+    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
+    unsigned int channel, i;
+    
+    if( PA_IS_INPUT_STREAM_(stream) )
+    {
+        /* make a local copy of the user buffer pointer(s). this is necessary
+            because PaUtil_CopyInput() advances these pointers every time
+            it is called.
+        */
+        if( stream->bufferProcessor.userInputIsInterleaved )
+        {
+            userBuffer = buffer;
+        }
+        else
+        {
+            userBuffer = (void*)alloca( sizeof(void*) * stream->bufferProcessor.inputChannelCount );
+            if( !userBuffer )
+                return paInsufficientMemory;
+            for( i = 0; i<stream->bufferProcessor.inputChannelCount; ++i )
+                ((void**)userBuffer)[i] = ((void**)buffer)[i];
+        }
+        
+        do{
+            if( CurrentInputBuffersAreDone( stream ) )
+            {
+                if( NoBuffersAreQueued( &stream->input ) )
+                {
+                    /** @todo REVIEW: consider what to do if the input overflows.
+                        do we requeue all of the buffers? should we be running
+                        a thread to make sure they are always queued? 
+                        see: http://www.portaudio.com/trac/ticket/117
+                        */
+
+                    result = paInputOverflowed;
+                }
+
+                hostInputBufferIndex = stream->input.currentBufferIndex;
+
+                PaUtil_SetInputFrameCount( &stream->bufferProcessor,
+                        stream->input.framesPerBuffer - stream->input.framesUsedInCurrentBuffer );
+                
+                channel = 0;
+                for( i=0; i<stream->input.deviceCount; ++i )
+                {
+                    /* we have stored the number of channels in the buffer in dwUser */
+                    int channelCount = (int)stream->input.waveHeaders[i][ hostInputBufferIndex ].dwUser;
+
+                    PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, channel,
+                            stream->input.waveHeaders[i][ hostInputBufferIndex ].lpData +
+                                stream->input.framesUsedInCurrentBuffer * channelCount *
+                                stream->bufferProcessor.bytesPerHostInputSample,
+                            channelCount );
+
+                    channel += channelCount;
+                }
+                
+                framesProcessed = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, frames - framesRead );
+
+                stream->input.framesUsedInCurrentBuffer += framesProcessed;
+                if( stream->input.framesUsedInCurrentBuffer == stream->input.framesPerBuffer )
+                {
+                    result = AdvanceToNextInputBuffer( stream );
+                    if( result != paNoError )
+                        break;
+                }
+
+                framesRead += framesProcessed;      
+
+            }else{
+                /* wait for MME to signal that a buffer is available */
+                waitResult = WaitForSingleObject( stream->input.bufferEvent, timeout );
+                if( waitResult == WAIT_FAILED )
+                {
+                    result = paUnanticipatedHostError;
+                    break;
+                }
+                else if( waitResult == WAIT_TIMEOUT )
+                {
+                    /* if a timeout is encountered, continue,
+                        perhaps we should give up eventually
+                    */
+                }         
+            }
+        }while( framesRead < frames );
+    }
+    else
+    {
+        result = paCanNotReadFromAnOutputOnlyStream;
+    }
+
+    return result;
+}
+
+
+static PaError WriteStream( PaStream* s,
+                            const void *buffer,
+                            unsigned long frames )
+{
+    PaError result = paNoError;
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    const void *userBuffer;
+    unsigned long framesWritten = 0;
+    unsigned long framesProcessed;
+    signed int hostOutputBufferIndex;
+    DWORD waitResult;
+    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
+    unsigned int channel, i;
+
+        
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+    {
+        /* make a local copy of the user buffer pointer(s). this is necessary
+            because PaUtil_CopyOutput() advances these pointers every time
+            it is called.
+        */
+        if( stream->bufferProcessor.userOutputIsInterleaved )
+        {
+            userBuffer = buffer;
+        }
+        else
+        {
+            userBuffer = (const void*)alloca( sizeof(void*) * stream->bufferProcessor.outputChannelCount );
+            if( !userBuffer )
+                return paInsufficientMemory;
+            for( i = 0; i<stream->bufferProcessor.outputChannelCount; ++i )
+                ((const void**)userBuffer)[i] = ((const void**)buffer)[i];
+        }
+
+        do{
+            if( CurrentOutputBuffersAreDone( stream ) )
+            {
+                if( NoBuffersAreQueued( &stream->output ) )
+                {
+                    /** @todo REVIEW: consider what to do if the output
+                    underflows. do we requeue all the existing buffers with
+                    zeros? should we run a separate thread to keep the buffers
+                    enqueued at all times? 
+                    see: http://www.portaudio.com/trac/ticket/117
+                    */
+
+                    result = paOutputUnderflowed;
+                }
+
+                hostOutputBufferIndex = stream->output.currentBufferIndex;
+
+                PaUtil_SetOutputFrameCount( &stream->bufferProcessor,
+                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
+                
+                channel = 0;
+                for( i=0; i<stream->output.deviceCount; ++i )
+                {
+                    /* we have stored the number of channels in the buffer in dwUser */
+                    int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
+
+                    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
+                            stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
+                                stream->output.framesUsedInCurrentBuffer * channelCount *
+                                stream->bufferProcessor.bytesPerHostOutputSample,
+                            channelCount );
+
+                    channel += channelCount;
+                }
+                
+                framesProcessed = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, frames - framesWritten );
+
+                stream->output.framesUsedInCurrentBuffer += framesProcessed;
+                if( stream->output.framesUsedInCurrentBuffer == stream->output.framesPerBuffer )
+                {
+                    result = AdvanceToNextOutputBuffer( stream );
+                    if( result != paNoError )
+                        break;
+                }
+
+                framesWritten += framesProcessed;
+            }
+            else
+            {
+                /* wait for MME to signal that a buffer is available */
+                waitResult = WaitForSingleObject( stream->output.bufferEvent, timeout );
+                if( waitResult == WAIT_FAILED )
+                {
+                    result = paUnanticipatedHostError;
+                    break;
+                }
+                else if( waitResult == WAIT_TIMEOUT )
+                {
+                    /* if a timeout is encountered, continue,
+                        perhaps we should give up eventually
+                    */
+                }             
+            }        
+        }while( framesWritten < frames );
+    }
+    else
+    {
+        result = paCanNotWriteToAnInputOnlyStream;
+    }
+    
+    return result;
+}
+
+
+static signed long GetStreamReadAvailable( PaStream* s )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    
+    if( PA_IS_INPUT_STREAM_(stream) )
+        return GetAvailableFrames( &stream->input );
+    else
+        return paCanNotReadFromAnOutputOnlyStream;
+}
+
+
+static signed long GetStreamWriteAvailable( PaStream* s )
+{
+    PaWinMmeStream *stream = (PaWinMmeStream*)s;
+    
+    if( PA_IS_OUTPUT_STREAM_(stream) )
+        return GetAvailableFrames( &stream->output );
+    else
+        return paCanNotWriteToAnInputOnlyStream;
+}
+
+
+/* NOTE: the following functions are MME-stream specific, and are called directly
+    by client code. We need to check for many more error conditions here because
+    we don't have the benefit of pa_front.c's parameter checking.
+*/
+
+static PaError GetWinMMEStreamPointer( PaWinMmeStream **stream, PaStream *s )
+{
+    PaError result;
+    PaUtilHostApiRepresentation *hostApi;
+    PaWinMmeHostApiRepresentation *winMmeHostApi;
+    
+    result = PaUtil_ValidateStreamPointer( s );
+    if( result != paNoError )
+        return result;
+
+    result = PaUtil_GetHostApiRepresentation( &hostApi, paMME );
+    if( result != paNoError )
+        return result;
+
+    winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
+    
+    /* note, the following would be easier if there was a generic way of testing
+        that a stream belongs to a specific host API */
+    
+    if( PA_STREAM_REP( s )->streamInterface == &winMmeHostApi->callbackStreamInterface
+            || PA_STREAM_REP( s )->streamInterface == &winMmeHostApi->blockingStreamInterface )
+    {
+        /* s is a WinMME stream */
+        *stream = (PaWinMmeStream *)s;
+        return paNoError;
+    }
+    else
+    {
+        return paIncompatibleStreamHostApi;
+    }
+}
+
+
+int PaWinMME_GetStreamInputHandleCount( PaStream* s )
+{
+    PaWinMmeStream *stream;
+    PaError result = GetWinMMEStreamPointer( &stream, s );
+
+    if( result == paNoError )
+        return (PA_IS_INPUT_STREAM_(stream)) ? stream->input.deviceCount : 0;
+    else
+        return result;
+}
+
+
+HWAVEIN PaWinMME_GetStreamInputHandle( PaStream* s, int handleIndex )
+{
+    PaWinMmeStream *stream;
+    PaError result = GetWinMMEStreamPointer( &stream, s );
+
+    if( result == paNoError
+            && PA_IS_INPUT_STREAM_(stream)
+            && handleIndex >= 0
+            && (unsigned int)handleIndex < stream->input.deviceCount )
+        return ((HWAVEIN*)stream->input.waveHandles)[handleIndex];
+    else
+        return 0;
+}
+
+
+int PaWinMME_GetStreamOutputHandleCount( PaStream* s)
+{
+    PaWinMmeStream *stream;
+    PaError result = GetWinMMEStreamPointer( &stream, s );
+
+    if( result == paNoError )
+        return (PA_IS_OUTPUT_STREAM_(stream)) ? stream->output.deviceCount : 0;
+    else
+        return result;
+}
+
+
+HWAVEOUT PaWinMME_GetStreamOutputHandle( PaStream* s, int handleIndex )
+{
+    PaWinMmeStream *stream;
+    PaError result = GetWinMMEStreamPointer( &stream, s );
+
+    if( result == paNoError
+            && PA_IS_OUTPUT_STREAM_(stream)
+            && handleIndex >= 0
+            && (unsigned int)handleIndex < stream->output.deviceCount )
+        return ((HWAVEOUT*)stream->output.waveHandles)[handleIndex];
+    else
+        return 0;
+}
diff --git a/Externals/portaudio/src/os/unix/pa_unix_hostapis.c b/Externals/portaudio/src/os/unix/pa_unix_hostapis.c
new file mode 100644
index 0000000000..4399b875b1
--- /dev/null
+++ b/Externals/portaudio/src/os/unix/pa_unix_hostapis.c
@@ -0,0 +1,103 @@
+/*
+ * $Id: pa_unix_hostapis.c 1740 2011-08-25 07:17:48Z philburk $
+ * Portable Audio I/O Library UNIX initialization table
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
+
+#include "pa_hostapi.h"
+
+PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaAlsa_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+/* Added for IRIX, Pieter, oct 2, 2003: */
+PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+/* Linux AudioScience HPI */
+PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+/** Note that on Linux, ALSA is placed before OSS so that the former is preferred over the latter.
+ */
+
+PaUtilHostApiInitializer *paHostApiInitializers[] =
+    {
+#ifdef __linux__
+
+#if PA_USE_ALSA
+        PaAlsa_Initialize,
+#endif
+
+#if PA_USE_OSS
+        PaOSS_Initialize,
+#endif
+
+#else   /* __linux__ */
+
+#if PA_USE_OSS
+        PaOSS_Initialize,
+#endif
+
+#if PA_USE_ALSA
+        PaAlsa_Initialize,
+#endif
+
+#endif  /* __linux__ */
+
+#if PA_USE_JACK
+        PaJack_Initialize,
+#endif
+                    /* Added for IRIX, Pieter, oct 2, 2003: */
+#if PA_USE_SGI 
+        PaSGI_Initialize,
+#endif
+
+#if PA_USE_ASIHPI
+        PaAsiHpi_Initialize,
+#endif
+
+#if PA_USE_COREAUDIO
+        PaMacCore_Initialize,
+#endif
+
+#if PA_USE_SKELETON
+        PaSkeleton_Initialize,
+#endif
+
+        0   /* NULL terminated array */
+    };
diff --git a/Externals/portaudio/src/os/unix/pa_unix_util.c b/Externals/portaudio/src/os/unix/pa_unix_util.c
new file mode 100644
index 0000000000..18f806c507
--- /dev/null
+++ b/Externals/portaudio/src/os/unix/pa_unix_util.c
@@ -0,0 +1,710 @@
+/*
+ * $Id: pa_unix_util.c 1510 2010-06-10 08:05:29Z dmitrykos $
+ * Portable Audio I/O Library
+ * UNIX platform-specific support functions
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2000 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
+ 
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <string.h> /* For memset */
+#include <math.h>
+#include <errno.h>
+
+#if defined(__APPLE__) && !defined(HAVE_MACH_ABSOLUTE_TIME)
+#define HAVE_MACH_ABSOLUTE_TIME
+#endif
+#ifdef HAVE_MACH_ABSOLUTE_TIME
+#include <mach/mach_time.h>
+#endif
+
+#include "pa_util.h"
+#include "pa_unix_util.h"
+#include "pa_debugprint.h"
+
+/*
+   Track memory allocations to avoid leaks.
+ */
+
+#if PA_TRACK_MEMORY
+static int numAllocations_ = 0;
+#endif
+
+
+void *PaUtil_AllocateMemory( long size )
+{
+    void *result = malloc( size );
+
+#if PA_TRACK_MEMORY
+    if( result != NULL ) numAllocations_ += 1;
+#endif
+    return result;
+}
+
+
+void PaUtil_FreeMemory( void *block )
+{
+    if( block != NULL )
+    {
+        free( block );
+#if PA_TRACK_MEMORY
+        numAllocations_ -= 1;
+#endif
+
+    }
+}
+
+
+int PaUtil_CountCurrentlyAllocatedBlocks( void )
+{
+#if PA_TRACK_MEMORY
+    return numAllocations_;
+#else
+    return 0;
+#endif
+}
+
+
+void Pa_Sleep( long msec )
+{
+#ifdef HAVE_NANOSLEEP
+    struct timespec req = {0}, rem = {0};
+    PaTime time = msec / 1.e3;
+    req.tv_sec = (time_t)time;
+    assert(time - req.tv_sec < 1.0);
+    req.tv_nsec = (long)((time - req.tv_sec) * 1.e9);
+    nanosleep(&req, &rem);
+    /* XXX: Try sleeping the remaining time (contained in rem) if interrupted by a signal? */
+#else
+    while( msec > 999 )     /* For OpenBSD and IRIX, argument */
+        {                   /* to usleep must be < 1000000.   */
+        usleep( 999000 );
+        msec -= 999;
+        }
+    usleep( msec * 1000 );
+#endif
+}
+
+#ifdef HAVE_MACH_ABSOLUTE_TIME
+/*
+    Discussion on the CoreAudio mailing list suggests that calling
+    gettimeofday (or anything else in the BSD layer) is not real-time
+    safe, so we use mach_absolute_time on OSX. This implementation is 
+    based on these two links:
+
+    Technical Q&A QA1398 - Mach Absolute Time Units
+    http://developer.apple.com/mac/library/qa/qa2004/qa1398.html
+
+    Tutorial: Performance and Time.
+    http://www.macresearch.org/tutorial_performance_and_time
+*/
+
+/* Scaler to convert the result of mach_absolute_time to seconds */
+static double machSecondsConversionScaler_ = 0.0; 
+#endif
+
+void PaUtil_InitializeClock( void )
+{
+#ifdef HAVE_MACH_ABSOLUTE_TIME
+    mach_timebase_info_data_t info;
+    kern_return_t err = mach_timebase_info( &info );
+    if( err == 0  )
+        machSecondsConversionScaler_ = 1e-9 * (double) info.numer / (double) info.denom;
+#endif
+}
+
+
+PaTime PaUtil_GetTime( void )
+{
+#ifdef HAVE_MACH_ABSOLUTE_TIME
+    return mach_absolute_time() * machSecondsConversionScaler_;
+#elif defined(HAVE_CLOCK_GETTIME)
+    struct timespec tp;
+    clock_gettime(CLOCK_REALTIME, &tp);
+    return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
+#else
+    struct timeval tv;
+    gettimeofday( &tv, NULL );
+    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
+#endif
+}
+
+PaError PaUtil_InitializeThreading( PaUtilThreading *threading )
+{
+    (void) paUtilErr_;
+    return paNoError;
+}
+
+void PaUtil_TerminateThreading( PaUtilThreading *threading )
+{
+}
+
+PaError PaUtil_StartThreading( PaUtilThreading *threading, void *(*threadRoutine)(void *), void *data )
+{
+    pthread_create( &threading->callbackThread, NULL, threadRoutine, data );
+    return paNoError;
+}
+
+PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *exitResult )
+{
+    PaError result = paNoError;
+    void *pret;
+
+    if( exitResult )
+        *exitResult = paNoError;
+
+    /* If pthread_cancel is not supported (Android platform) whole this function can lead to indefinite waiting if 
+       working thread (callbackThread) has'n received any stop signals from outside, please keep 
+       this in mind when considering using PaUtil_CancelThreading
+    */
+#ifdef PTHREAD_CANCELED
+    /* Only kill the thread if it isn't in the process of stopping (flushing adaptation buffers) */
+    if( !wait )
+        pthread_cancel( threading->callbackThread );   /* XXX: Safe to call this if the thread has exited on its own? */
+#endif
+    pthread_join( threading->callbackThread, &pret );
+
+#ifdef PTHREAD_CANCELED
+    if( pret && PTHREAD_CANCELED != pret )
+#else
+    /* !wait means the thread may have been canceled */
+    if( pret && wait )
+#endif
+    {
+        if( exitResult )
+            *exitResult = *(PaError *) pret;
+        free( pret );
+    }
+
+    return result;
+}
+
+/* Threading */
+/* paUnixMainThread 
+ * We have to be a bit careful with defining this global variable,
+ * as explained below. */
+#ifdef __APPLE__
+/* apple/gcc has a "problem" with global vars and dynamic libs.
+   Initializing it seems to fix the problem.
+   Described a bit in this thread:
+   http://gcc.gnu.org/ml/gcc/2005-06/msg00179.html
+*/
+pthread_t paUnixMainThread = 0;
+#else
+/*pthreads are opaque. We don't know that asigning it an int value
+  always makes sense, so we don't initialize it unless we have to.*/
+pthread_t paUnixMainThread = 0;
+#endif
+
+PaError PaUnixThreading_Initialize()
+{
+    paUnixMainThread = pthread_self();
+    return paNoError;
+}
+
+static PaError BoostPriority( PaUnixThread* self )
+{
+    PaError result = paNoError;
+    struct sched_param spm = { 0 };
+    /* Priority should only matter between contending FIFO threads? */
+    spm.sched_priority = 1;
+
+    assert( self );
+
+    if( pthread_setschedparam( self->thread, SCHED_FIFO, &spm ) != 0 )
+    {
+        PA_UNLESS( errno == EPERM, paInternalError );  /* Lack permission to raise priority */
+        PA_DEBUG(( "Failed bumping priority\n" ));
+        result = 0;
+    }
+    else
+    {
+        result = 1; /* Success */
+    }
+error:
+    return result;
+}
+
+PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void* threadArg, PaTime waitForChild,
+        int rtSched )
+{
+    PaError result = paNoError;
+    pthread_attr_t attr;
+    int started = 0;
+
+    memset( self, 0, sizeof (PaUnixThread) );
+    PaUnixMutex_Initialize( &self->mtx );
+    PA_ASSERT_CALL( pthread_cond_init( &self->cond, NULL ), 0 );
+
+    self->parentWaiting = 0 != waitForChild;
+
+    /* Spawn thread */
+
+/* Temporarily disabled since we should test during configuration for presence of required mman.h header */
+#if 0
+#if defined _POSIX_MEMLOCK && (_POSIX_MEMLOCK != -1)
+    if( rtSched )
+    {
+        if( mlockall( MCL_CURRENT | MCL_FUTURE ) < 0 )
+        {
+            int savedErrno = errno;             /* In case errno gets overwritten */
+            assert( savedErrno != EINVAL );     /* Most likely a programmer error */
+            PA_UNLESS( (savedErrno == EPERM), paInternalError );
+            PA_DEBUG(( "%s: Failed locking memory\n", __FUNCTION__ ));
+        }
+        else
+            PA_DEBUG(( "%s: Successfully locked memory\n", __FUNCTION__ ));
+    }
+#endif
+#endif
+
+    PA_UNLESS( !pthread_attr_init( &attr ), paInternalError );
+    /* Priority relative to other processes */
+    PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError );   
+
+    PA_UNLESS( !pthread_create( &self->thread, &attr, threadFunc, threadArg ), paInternalError );
+    started = 1;
+
+    if( rtSched )
+    {
+#if 0
+        if( self->useWatchdog )
+        {
+            int err;
+            struct sched_param wdSpm = { 0 };
+            /* Launch watchdog, watchdog sets callback thread priority */
+            int prio = PA_MIN( self->rtPrio + 4, sched_get_priority_max( SCHED_FIFO ) );
+            wdSpm.sched_priority = prio;
+
+            PA_UNLESS( !pthread_attr_init( &attr ), paInternalError );
+            PA_UNLESS( !pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ), paInternalError );
+            PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError );
+            PA_UNLESS( !pthread_attr_setschedpolicy( &attr, SCHED_FIFO ), paInternalError );
+            PA_UNLESS( !pthread_attr_setschedparam( &attr, &wdSpm ), paInternalError );
+            if( (err = pthread_create( &self->watchdogThread, &attr, &WatchdogFunc, self )) )
+            {
+                PA_UNLESS( err == EPERM, paInternalError );
+                /* Permission error, go on without realtime privileges */
+                PA_DEBUG(( "Failed bumping priority\n" ));
+            }
+            else
+            {
+                int policy;
+                self->watchdogRunning = 1;
+                PA_ENSURE_SYSTEM( pthread_getschedparam( self->watchdogThread, &policy, &wdSpm ), 0 );
+                /* Check if priority is right, policy could potentially differ from SCHED_FIFO (but that's alright) */
+                if( wdSpm.sched_priority != prio )
+                {
+                    PA_DEBUG(( "Watchdog priority not set correctly (%d)\n", wdSpm.sched_priority ));
+                    PA_ENSURE( paInternalError );
+                }
+            }
+        }
+        else
+#endif
+            PA_ENSURE( BoostPriority( self ) );
+
+        {
+            int policy;
+            struct sched_param spm;
+            pthread_getschedparam(self->thread, &policy, &spm);
+        }
+    }
+    
+    if( self->parentWaiting )
+    {
+        PaTime till;
+        struct timespec ts;
+        int res = 0;
+        PaTime now;
+
+        PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
+
+        /* Wait for stream to be started */
+        now = PaUtil_GetTime();
+        till = now + waitForChild;
+
+        while( self->parentWaiting && !res )
+        {
+            if( waitForChild > 0 )
+            {
+                ts.tv_sec = (time_t) floor( till );
+                ts.tv_nsec = (long) ((till - floor( till )) * 1e9);
+                res = pthread_cond_timedwait( &self->cond, &self->mtx.mtx, &ts );
+            }
+            else
+            {
+                res = pthread_cond_wait( &self->cond, &self->mtx.mtx );
+            }
+        }
+
+        PA_ENSURE( PaUnixMutex_Unlock( &self->mtx ) );
+
+        PA_UNLESS( !res || ETIMEDOUT == res, paInternalError );
+        PA_DEBUG(( "%s: Waited for %g seconds for stream to start\n", __FUNCTION__, PaUtil_GetTime() - now ));
+        if( ETIMEDOUT == res )
+        {
+            PA_ENSURE( paTimedOut );
+        }
+    }
+
+end:
+    return result;
+error:
+    if( started )
+    {
+        PaUnixThread_Terminate( self, 0, NULL );
+    }
+
+    goto end;
+}
+
+PaError PaUnixThread_Terminate( PaUnixThread* self, int wait, PaError* exitResult )
+{
+    PaError result = paNoError;
+    void* pret;
+
+    if( exitResult )
+    {
+        *exitResult = paNoError;
+    }
+#if 0
+    if( watchdogExitResult )
+        *watchdogExitResult = paNoError;
+
+    if( th->watchdogRunning )
+    {
+        pthread_cancel( th->watchdogThread );
+        PA_ENSURE_SYSTEM( pthread_join( th->watchdogThread, &pret ), 0 );
+
+        if( pret && pret != PTHREAD_CANCELED )
+        {
+            if( watchdogExitResult )
+                *watchdogExitResult = *(PaError *) pret;
+            free( pret );
+        }
+    }
+#endif
+
+    /* Only kill the thread if it isn't in the process of stopping (flushing adaptation buffers) */
+    /* TODO: Make join time out */
+    self->stopRequested = wait;
+    if( !wait )
+    {
+        PA_DEBUG(( "%s: Canceling thread %d\n", __FUNCTION__, self->thread ));
+        /* XXX: Safe to call this if the thread has exited on its own? */
+#ifdef PTHREAD_CANCELED
+        pthread_cancel( self->thread );
+#endif
+    }
+    PA_DEBUG(( "%s: Joining thread %d\n", __FUNCTION__, self->thread ));
+    PA_ENSURE_SYSTEM( pthread_join( self->thread, &pret ), 0 );
+
+#ifdef PTHREAD_CANCELED
+    if( pret && PTHREAD_CANCELED != pret )
+#else
+    /* !wait means the thread may have been canceled */
+    if( pret && wait )
+#endif
+    {
+        if( exitResult )
+        {
+            *exitResult = *(PaError*)pret;
+        }
+        free( pret );
+    }
+
+error:
+    PA_ASSERT_CALL( PaUnixMutex_Terminate( &self->mtx ), paNoError );
+    PA_ASSERT_CALL( pthread_cond_destroy( &self->cond ), 0 );
+
+    return result;
+}
+
+PaError PaUnixThread_PrepareNotify( PaUnixThread* self )
+{
+    PaError result = paNoError;
+    PA_UNLESS( self->parentWaiting, paInternalError );
+
+    PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
+    self->locked = 1;
+
+error:
+    return result;
+}
+
+PaError PaUnixThread_NotifyParent( PaUnixThread* self )
+{
+    PaError result = paNoError;
+    PA_UNLESS( self->parentWaiting, paInternalError );
+
+    if( !self->locked )
+    {
+        PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
+        self->locked = 1;
+    }
+    self->parentWaiting = 0;
+    pthread_cond_signal( &self->cond );
+    PA_ENSURE( PaUnixMutex_Unlock( &self->mtx ) );
+    self->locked = 0;
+
+error:
+    return result;
+}
+
+int PaUnixThread_StopRequested( PaUnixThread* self )
+{
+    return self->stopRequested;
+}
+
+PaError PaUnixMutex_Initialize( PaUnixMutex* self )
+{
+    PaError result = paNoError;
+    PA_ASSERT_CALL( pthread_mutex_init( &self->mtx, NULL ), 0 );
+    return result;
+}
+
+PaError PaUnixMutex_Terminate( PaUnixMutex* self )
+{
+    PaError result = paNoError;
+    PA_ASSERT_CALL( pthread_mutex_destroy( &self->mtx ), 0 );
+    return result;
+}
+
+/** Lock mutex.
+ *
+ * We're disabling thread cancellation while the thread is holding a lock, so mutexes are 
+ * properly unlocked at termination time.
+ */
+PaError PaUnixMutex_Lock( PaUnixMutex* self )
+{
+    PaError result = paNoError;
+    
+#ifdef PTHREAD_CANCEL
+	int oldState;
+    PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &oldState ), 0 );
+#endif
+    PA_ENSURE_SYSTEM( pthread_mutex_lock( &self->mtx ), 0 );
+
+error:
+    return result;
+}
+
+/** Unlock mutex.
+ *
+ * Thread cancellation is enabled again after the mutex is properly unlocked.
+ */
+PaError PaUnixMutex_Unlock( PaUnixMutex* self )
+{
+    PaError result = paNoError;
+
+    PA_ENSURE_SYSTEM( pthread_mutex_unlock( &self->mtx ), 0 );
+#ifdef PTHREAD_CANCEL
+	int oldState;
+    PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &oldState ), 0 );
+#endif
+
+error:
+    return result;
+}
+
+
+#if 0
+static void OnWatchdogExit( void *userData )
+{
+    PaAlsaThreading *th = (PaAlsaThreading *) userData;
+    struct sched_param spm = { 0 };
+    assert( th );
+
+    PA_ASSERT_CALL( pthread_setschedparam( th->callbackThread, SCHED_OTHER, &spm ), 0 );    /* Lower before exiting */
+    PA_DEBUG(( "Watchdog exiting\n" ));
+}
+
+static void *WatchdogFunc( void *userData )
+{
+    PaError result = paNoError, *pres = NULL;
+    int err;
+    PaAlsaThreading *th = (PaAlsaThreading *) userData;
+    unsigned intervalMsec = 500;
+    const PaTime maxSeconds = 3.;   /* Max seconds between callbacks */
+    PaTime timeThen = PaUtil_GetTime(), timeNow, timeElapsed, cpuTimeThen, cpuTimeNow, cpuTimeElapsed;
+    double cpuLoad, avgCpuLoad = 0.;
+    int throttled = 0;
+
+    assert( th );
+
+    /* Execute OnWatchdogExit when exiting */
+    pthread_cleanup_push( &OnWatchdogExit, th );
+
+    /* Boost priority of callback thread */
+    PA_ENSURE( result = BoostPriority( th ) );
+    if( !result )
+    {
+        /* Boost failed, might as well exit */
+        pthread_exit( NULL );
+    }
+
+    cpuTimeThen = th->callbackCpuTime;
+    {
+        int policy;
+        struct sched_param spm = { 0 };
+        pthread_getschedparam( pthread_self(), &policy, &spm );
+        PA_DEBUG(( "%s: Watchdog priority is %d\n", __FUNCTION__, spm.sched_priority ));
+    }
+
+    while( 1 )
+    {
+        double lowpassCoeff = 0.9, lowpassCoeff1 = 0.99999 - lowpassCoeff;
+        
+        /* Test before and after in case whatever underlying sleep call isn't interrupted by pthread_cancel */
+        pthread_testcancel();
+        Pa_Sleep( intervalMsec );
+        pthread_testcancel();
+
+        if( PaUtil_GetTime() - th->callbackTime > maxSeconds )
+        {
+            PA_DEBUG(( "Watchdog: Terminating callback thread\n" ));
+            /* Tell thread to terminate */
+            err = pthread_kill( th->callbackThread, SIGKILL );
+            pthread_exit( NULL );
+        }
+
+        PA_DEBUG(( "%s: PortAudio reports CPU load: %g\n", __FUNCTION__, PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) ));
+
+        /* Check if we should throttle, or unthrottle :P */
+        cpuTimeNow = th->callbackCpuTime;
+        cpuTimeElapsed = cpuTimeNow - cpuTimeThen;
+        cpuTimeThen = cpuTimeNow;
+
+        timeNow = PaUtil_GetTime();
+        timeElapsed = timeNow - timeThen;
+        timeThen = timeNow;
+        cpuLoad = cpuTimeElapsed / timeElapsed;
+        avgCpuLoad = avgCpuLoad * lowpassCoeff + cpuLoad * lowpassCoeff1;
+        /*
+        if( throttled )
+            PA_DEBUG(( "Watchdog: CPU load: %g, %g\n", avgCpuLoad, cpuTimeElapsed ));
+            */
+        if( PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) > .925 )
+        {
+            static int policy;
+            static struct sched_param spm = { 0 };
+            static const struct sched_param defaultSpm = { 0 };
+            PA_DEBUG(( "%s: Throttling audio thread, priority %d\n", __FUNCTION__, spm.sched_priority ));
+
+            pthread_getschedparam( th->callbackThread, &policy, &spm );
+            if( !pthread_setschedparam( th->callbackThread, SCHED_OTHER, &defaultSpm ) )
+            {
+                throttled = 1;
+            }
+            else
+                PA_DEBUG(( "Watchdog: Couldn't lower priority of audio thread: %s\n", strerror( errno ) ));
+
+            /* Give other processes a go, before raising priority again */
+            PA_DEBUG(( "%s: Watchdog sleeping for %lu msecs before unthrottling\n", __FUNCTION__, th->throttledSleepTime ));
+            Pa_Sleep( th->throttledSleepTime );
+
+            /* Reset callback priority */
+            if( pthread_setschedparam( th->callbackThread, SCHED_FIFO, &spm ) != 0 )
+            {
+                PA_DEBUG(( "%s: Couldn't raise priority of audio thread: %s\n", __FUNCTION__, strerror( errno ) ));
+            }
+
+            if( PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) >= .99 )
+                intervalMsec = 50;
+            else
+                intervalMsec = 100;
+
+            /*
+            lowpassCoeff = .97;
+            lowpassCoeff1 = .99999 - lowpassCoeff;
+            */
+        }
+        else if( throttled && avgCpuLoad < .8 )
+        {
+            intervalMsec = 500;
+            throttled = 0;
+
+            /*
+            lowpassCoeff = .9;
+            lowpassCoeff1 = .99999 - lowpassCoeff;
+            */
+        }
+    }
+
+    pthread_cleanup_pop( 1 );   /* Execute cleanup on exit */
+
+error:
+    /* Shouldn't get here in the normal case */
+
+    /* Pass on error code */
+    pres = malloc( sizeof (PaError) );
+    *pres = result;
+    
+    pthread_exit( pres );
+}
+
+static void CallbackUpdate( PaAlsaThreading *th )
+{
+    th->callbackTime = PaUtil_GetTime();
+    th->callbackCpuTime = PaUtil_GetCpuLoad( th->cpuLoadMeasurer );
+}
+
+/*
+static void *CanaryFunc( void *userData )
+{
+    const unsigned intervalMsec = 1000;
+    PaUtilThreading *th = (PaUtilThreading *) userData;
+
+    while( 1 )
+    {
+        th->canaryTime = PaUtil_GetTime();
+
+        pthread_testcancel();
+        Pa_Sleep( intervalMsec );
+    }
+
+    pthread_exit( NULL );
+}
+*/
+#endif
diff --git a/Externals/portaudio/src/os/unix/pa_unix_util.h b/Externals/portaudio/src/os/unix/pa_unix_util.h
new file mode 100644
index 0000000000..e900f87726
--- /dev/null
+++ b/Externals/portaudio/src/os/unix/pa_unix_util.h
@@ -0,0 +1,224 @@
+/*
+ * $Id: pa_unix_util.h 1241 2007-07-23 20:08:31Z aknudsen $
+ * Portable Audio I/O Library
+ * UNIX platform-specific support functions
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2000 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
+
+#ifndef PA_UNIX_UTIL_H
+#define PA_UNIX_UTIL_H
+
+#include "pa_cpuload.h"
+#include <assert.h>
+#include <pthread.h>
+#include <signal.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#define PA_MIN(x,y) ( (x) < (y) ? (x) : (y) )
+#define PA_MAX(x,y) ( (x) > (y) ? (x) : (y) )
+
+/* Utilize GCC branch prediction for error tests */
+#if defined __GNUC__ && __GNUC__ >= 3
+#define UNLIKELY(expr) __builtin_expect( (expr), 0 )
+#else
+#define UNLIKELY(expr) (expr)
+#endif
+
+#define STRINGIZE_HELPER(expr) #expr
+#define STRINGIZE(expr) STRINGIZE_HELPER(expr)
+
+#define PA_UNLESS(expr, code) \
+    do { \
+        if( UNLIKELY( (expr) == 0 ) ) \
+        { \
+            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = (code); \
+            goto error; \
+        } \
+    } while (0);
+
+static PaError paUtilErr_;          /* Used with PA_ENSURE */
+
+/* Check PaError */
+#define PA_ENSURE(expr) \
+    do { \
+        if( UNLIKELY( (paUtilErr_ = (expr)) < paNoError ) ) \
+        { \
+            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
+            result = paUtilErr_; \
+            goto error; \
+        } \
+    } while (0);
+
+#define PA_ASSERT_CALL(expr, success) \
+    paUtilErr_ = (expr); \
+    assert( success == paUtilErr_ );
+
+#define PA_ENSURE_SYSTEM(expr, success) \
+    do { \
+        if( UNLIKELY( (paUtilErr_ = (expr)) != success ) ) \
+        { \
+            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
+            if( pthread_equal(pthread_self(), paUnixMainThread) ) \
+            { \
+                PaUtil_SetLastHostErrorInfo( paALSA, paUtilErr_, strerror( paUtilErr_ ) ); \
+            } \
+            PaUtil_DebugPrint( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" ); \
+            result = paUnanticipatedHostError; \
+            goto error; \
+        } \
+    } while( 0 );
+
+typedef struct {
+    pthread_t callbackThread;
+} PaUtilThreading;
+
+PaError PaUtil_InitializeThreading( PaUtilThreading *threading );
+void PaUtil_TerminateThreading( PaUtilThreading *threading );
+PaError PaUtil_StartThreading( PaUtilThreading *threading, void *(*threadRoutine)(void *), void *data );
+PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *exitResult );
+
+/* State accessed by utility functions */
+
+/*
+void PaUnix_SetRealtimeScheduling( int rt );
+
+void PaUtil_InitializeThreading( PaUtilThreading *th, PaUtilCpuLoadMeasurer *clm );
+
+PaError PaUtil_CreateCallbackThread( PaUtilThreading *th, void *(*CallbackThreadFunc)( void * ), PaStream *s );
+
+PaError PaUtil_KillCallbackThread( PaUtilThreading *th, PaError *exitResult );
+
+void PaUtil_CallbackUpdate( PaUtilThreading *th );
+*/
+
+extern pthread_t paUnixMainThread;
+
+typedef struct
+{
+    pthread_mutex_t mtx;
+} PaUnixMutex;
+
+PaError PaUnixMutex_Initialize( PaUnixMutex* self );
+PaError PaUnixMutex_Terminate( PaUnixMutex* self );
+PaError PaUnixMutex_Lock( PaUnixMutex* self );
+PaError PaUnixMutex_Unlock( PaUnixMutex* self );
+
+typedef struct
+{
+    pthread_t thread;
+    int parentWaiting;
+    int stopRequested;
+    int locked;
+    PaUnixMutex mtx;
+    pthread_cond_t cond;
+    volatile sig_atomic_t stopRequest;
+} PaUnixThread;
+
+/** Initialize global threading state.
+ */
+PaError PaUnixThreading_Initialize();
+
+/** Perish, passing on eventual error code.
+ *
+ * A thin wrapper around pthread_exit, will automatically pass on any error code to the joining thread.
+ * If the result indicates an error, i.e. it is not equal to paNoError, this function will automatically
+ * allocate a pointer so the error is passed on with pthread_exit. If the result indicates that all is
+ * well however, only a NULL pointer will be handed to pthread_exit. Thus, the joining thread should
+ * check whether a non-NULL result pointer is obtained from pthread_join and make sure to free it.
+ * @param result: The error code to pass on to the joining thread.
+ */
+#define PaUnixThreading_EXIT(result) \
+    do { \
+        PaError* pres = NULL; \
+        if( paNoError != (result) ) \
+        { \
+            pres = malloc( sizeof (PaError) ); \
+            *pres = (result); \
+        } \
+        pthread_exit( pres ); \
+    } while (0);
+
+/** Spawn a thread.
+ *
+ * Intended for spawning the callback thread from the main thread. This function can even block (for a certain
+ * time or indefinitely) untill notified by the callback thread (using PaUnixThread_NotifyParent), which can be
+ * useful in order to make sure that callback has commenced before returning from Pa_StartStream.
+ * @param threadFunc: The function to be executed in the child thread.
+ * @param waitForChild: If not 0, wait for child thread to call PaUnixThread_NotifyParent. Less than 0 means
+ * wait for ever, greater than 0 wait for the specified time.
+ * @param rtSched: Enable realtime scheduling?
+ * @return: If timed out waiting on child, paTimedOut.
+ */
+PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void* threadArg, PaTime waitForChild,
+        int rtSched );
+
+/** Terminate thread.
+ *
+ * @param wait: If true, request that background thread stop and wait untill it does, else cancel it.
+ * @param exitResult: If non-null this will upon return contain the exit status of the thread.
+ */
+PaError PaUnixThread_Terminate( PaUnixThread* self, int wait, PaError* exitResult );
+
+/** Prepare to notify waiting parent thread.
+ *
+ * An internal lock must be held before the parent is notified in PaUnixThread_NotifyParent, call this to
+ * acquire it beforehand.
+ * @return: If parent is not waiting, paInternalError.
+ */
+PaError PaUnixThread_PrepareNotify( PaUnixThread* self );
+
+/** Notify waiting parent thread.
+ *
+ * @return: If parent timed out waiting, paTimedOut. If parent was never waiting, paInternalError.
+ */
+PaError PaUnixThread_NotifyParent( PaUnixThread* self );
+
+/** Has the parent thread requested this thread to stop?
+ */
+int PaUnixThread_StopRequested( PaUnixThread* self );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif
diff --git a/Externals/portaudio/src/os/win/pa_win_coinitialize.c b/Externals/portaudio/src/os/win/pa_win_coinitialize.c
new file mode 100644
index 0000000000..5c31716c0f
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_coinitialize.c
@@ -0,0 +1,144 @@
+/*
+ * Microsoft COM initialization routines
+ * Copyright (c) 1999-2011 Ross Bencina, Dmitry Kostjuchenko
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2011 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+
+ @brief Microsoft COM initialization routines.
+*/
+
+#include <windows.h>
+#include <objbase.h>
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_debugprint.h"
+
+#include "pa_win_coinitialize.h"
+
+
+#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) && !defined(_WIN32_WCE) /* MSC version 6 and above */
+#pragma comment( lib, "ole32.lib" )
+#endif
+
+
+/* use some special bit patterns here to try to guard against uninitialized memory errors */
+#define PAWINUTIL_COM_INITIALIZED       (0xb38f)
+#define PAWINUTIL_COM_NOT_INITIALIZED   (0xf1cd)
+
+
+PaError PaWinUtil_CoInitialize( PaHostApiTypeId hostApiType, PaWinUtilComInitializationResult *comInitializationResult )
+{
+    HRESULT hr;
+
+    comInitializationResult->state = PAWINUTIL_COM_NOT_INITIALIZED;
+
+    /*
+        If COM is already initialized CoInitialize will either return
+        FALSE, or RPC_E_CHANGED_MODE if it was initialised in a different
+        threading mode. In either case we shouldn't consider it an error
+        but we need to be careful to not call CoUninitialize() if 
+        RPC_E_CHANGED_MODE was returned.
+    */
+
+    hr = CoInitialize(0); /* use legacy-safe equivalent to CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) */
+    if( FAILED(hr) && hr != RPC_E_CHANGED_MODE )
+    {
+        PA_DEBUG(("CoInitialize(0) failed. hr=%d\n", hr));
+
+        if( hr == E_OUTOFMEMORY )
+            return paInsufficientMemory;
+
+        {
+            char *lpMsgBuf;
+            FormatMessage(
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                NULL,
+                hr,
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL
+            );
+            PaUtil_SetLastHostErrorInfo( hostApiType, hr, lpMsgBuf );
+            LocalFree( lpMsgBuf );
+        }
+
+        return paUnanticipatedHostError;
+    }
+
+    if( hr != RPC_E_CHANGED_MODE )
+    {
+        comInitializationResult->state = PAWINUTIL_COM_INITIALIZED;
+
+        /*
+            Memorize calling thread id and report warning on Uninitialize if 
+            calling thread is different as CoInitialize must match CoUninitialize 
+            in the same thread.
+        */
+        comInitializationResult->initializingThreadId = GetCurrentThreadId();
+    }
+
+    return paNoError;
+}
+
+
+void PaWinUtil_CoUninitialize( PaHostApiTypeId hostApiType, PaWinUtilComInitializationResult *comInitializationResult )
+{
+    if( comInitializationResult->state != PAWINUTIL_COM_NOT_INITIALIZED
+            && comInitializationResult->state != PAWINUTIL_COM_INITIALIZED ){
+    
+        PA_DEBUG(("ERROR: PaWinUtil_CoUninitialize called without calling PaWinUtil_CoInitialize\n"));
+    }
+
+    if( comInitializationResult->state == PAWINUTIL_COM_INITIALIZED )
+    {
+        DWORD currentThreadId = GetCurrentThreadId();
+		if( comInitializationResult->initializingThreadId != currentThreadId )
+		{
+			PA_DEBUG(("ERROR: failed PaWinUtil_CoUninitialize calling thread[%d] does not match initializing thread[%d]\n",
+				currentThreadId, comInitializationResult->initializingThreadId));
+		}
+		else
+		{
+			CoUninitialize();
+
+            comInitializationResult->state = PAWINUTIL_COM_NOT_INITIALIZED;
+		}
+    }
+}
\ No newline at end of file
diff --git a/Externals/portaudio/src/os/win/pa_win_coinitialize.h b/Externals/portaudio/src/os/win/pa_win_coinitialize.h
new file mode 100644
index 0000000000..687ab83187
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_coinitialize.h
@@ -0,0 +1,94 @@
+/*
+ * Microsoft COM initialization routines
+ * Copyright (c) 1999-2011 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+
+ @brief Microsoft COM initialization routines.
+*/
+
+#ifndef PA_WIN_COINITIALIZE_H
+#define PA_WIN_COINITIALIZE_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+/**
+ @brief Data type used to hold the result of an attempt to initialize COM
+    using PaWinUtil_CoInitialize. Must be retained between a call to 
+    PaWinUtil_CoInitialize and a matching call to PaWinUtil_CoUninitialize.
+*/
+typedef struct PaWinUtilComInitializationResult{
+    int state;
+    int initializingThreadId;
+} PaWinUtilComInitializationResult;
+
+
+/**
+ @brief Initialize Microsoft COM subsystem on the current thread.
+
+ @param hostApiType the host API type id of the caller. Used for error reporting.
+
+ @param comInitializationResult An output parameter. The value pointed to by 
+        this parameter stores information required by PaWinUtil_CoUninitialize 
+        to correctly uninitialize COM. The value should be retained and later 
+        passed to PaWinUtil_CoUninitialize.
+
+ If PaWinUtil_CoInitialize returns paNoError, the caller must later call
+ PaWinUtil_CoUninitialize once.
+*/
+PaError PaWinUtil_CoInitialize( PaHostApiTypeId hostApiType, PaWinUtilComInitializationResult *comInitializationResult );
+
+
+/**
+ @brief Uninitialize the Microsoft COM subsystem on the current thread using 
+ the result of a previous call to PaWinUtil_CoInitialize. Must be called on the same
+ thread as PaWinUtil_CoInitialize.
+
+ @param hostApiType the host API type id of the caller. Used for error reporting.
+
+ @param comInitializationResult An input parameter. A pointer to a value previously
+ initialized by a call to PaWinUtil_CoInitialize.
+*/
+void PaWinUtil_CoUninitialize( PaHostApiTypeId hostApiType, PaWinUtilComInitializationResult *comInitializationResult );
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_WIN_COINITIALIZE_H */
diff --git a/Externals/portaudio/src/os/win/pa_win_hostapis.c b/Externals/portaudio/src/os/win/pa_win_hostapis.c
new file mode 100644
index 0000000000..5d22438799
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_hostapis.c
@@ -0,0 +1,102 @@
+/*
+ * $Id: pa_win_hostapis.c 1728 2011-08-18 03:31:51Z rossb $
+ * Portable Audio I/O Library Windows initialization table
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+
+    @brief Win32 host API initialization function table.
+*/
+
+/* This is needed to make this source file depend on CMake option changes
+   and at the same time make it transparent for clients not using CMake.
+*/
+#ifdef PORTAUDIO_CMAKE_GENERATED
+#include "options_cmake.h"
+#endif
+
+#include "pa_hostapi.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+PaUtilHostApiInitializer *paHostApiInitializers[] =
+    {
+
+#if PA_USE_WMME
+        PaWinMme_Initialize,
+#endif
+
+#if PA_USE_DS
+        PaWinDs_Initialize,
+#endif
+
+#if PA_USE_ASIO
+        PaAsio_Initialize,
+#endif
+
+#if PA_USE_WASAPI
+		PaWasapi_Initialize,
+#endif
+
+#if PA_USE_WDMKS
+        PaWinWdm_Initialize,
+#endif
+
+#if PA_USE_SKELETON
+        PaSkeleton_Initialize, /* just for testing. last in list so it isn't marked as default. */
+#endif
+
+        0   /* NULL terminated array */
+    };
+
+
diff --git a/Externals/portaudio/src/os/win/pa_win_util.c b/Externals/portaudio/src/os/win/pa_win_util.c
new file mode 100644
index 0000000000..a9c55d0f8a
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_util.c
@@ -0,0 +1,153 @@
+/*
+ * $Id: pa_win_util.c 1584 2011-02-02 18:58:17Z rossb $
+ * Portable Audio I/O Library
+ * Win32 platform-specific support functions
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2008 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+
+ @brief Win32 implementation of platform-specific PaUtil support functions.
+*/
+ 
+#include <windows.h>
+#include <mmsystem.h> /* for timeGetTime() */
+
+#include "pa_util.h"
+
+#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) && !defined(_WIN32_WCE) /* MSC version 6 and above */
+#pragma comment( lib, "winmm.lib" )
+#endif
+
+
+/*
+   Track memory allocations to avoid leaks.
+ */
+
+#if PA_TRACK_MEMORY
+static int numAllocations_ = 0;
+#endif
+
+
+void *PaUtil_AllocateMemory( long size )
+{
+    void *result = GlobalAlloc( GPTR, size );
+
+#if PA_TRACK_MEMORY
+    if( result != NULL ) numAllocations_ += 1;
+#endif
+    return result;
+}
+
+
+void PaUtil_FreeMemory( void *block )
+{
+    if( block != NULL )
+    {
+        GlobalFree( block );
+#if PA_TRACK_MEMORY
+        numAllocations_ -= 1;
+#endif
+
+    }
+}
+
+
+int PaUtil_CountCurrentlyAllocatedBlocks( void )
+{
+#if PA_TRACK_MEMORY
+    return numAllocations_;
+#else
+    return 0;
+#endif
+}
+
+
+void Pa_Sleep( long msec )
+{
+    Sleep( msec );
+}
+
+static int usePerformanceCounter_;
+static double secondsPerTick_;
+
+void PaUtil_InitializeClock( void )
+{
+    LARGE_INTEGER ticksPerSecond;
+
+    if( QueryPerformanceFrequency( &ticksPerSecond ) != 0 )
+    {
+        usePerformanceCounter_ = 1;
+        secondsPerTick_ = 1.0 / (double)ticksPerSecond.QuadPart;
+    }
+    else
+    {
+        usePerformanceCounter_ = 0;
+    }
+}
+
+
+double PaUtil_GetTime( void )
+{
+    LARGE_INTEGER time;
+
+    if( usePerformanceCounter_ )
+    {
+        /*
+            Note: QueryPerformanceCounter has a known issue where it can skip forward
+            by a few seconds (!) due to a hardware bug on some PCI-ISA bridge hardware.
+            This is documented here:
+            http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q274323&
+
+            The work-arounds are not very paletable and involve querying GetTickCount 
+            at every time step.
+
+            Using rdtsc is not a good option on multi-core systems.
+
+            For now we just use QueryPerformanceCounter(). It's good, most of the time.
+        */
+        QueryPerformanceCounter( &time );
+        return time.QuadPart * secondsPerTick_;
+    }
+    else
+    {
+#ifndef UNDER_CE    	
+        return timeGetTime() * .001;
+#else
+        return GetTickCount() * .001;
+#endif                
+    }
+}
diff --git a/Externals/portaudio/src/os/win/pa_win_waveformat.c b/Externals/portaudio/src/os/win/pa_win_waveformat.c
new file mode 100644
index 0000000000..beae5825e4
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_waveformat.c
@@ -0,0 +1,154 @@
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * Windows WAVEFORMAT* data structure utilities
+ * portaudio.h should be included before this file.
+ *
+ * Copyright (c) 2007 Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+#include <windows.h>
+#include <mmsystem.h>
+
+#include "portaudio.h"
+#include "pa_win_waveformat.h"
+
+
+#if !defined(WAVE_FORMAT_EXTENSIBLE)
+#define  WAVE_FORMAT_EXTENSIBLE         0xFFFE
+#endif
+
+static GUID pawin_ksDataFormatSubtypeGuidBase = 
+	{ (USHORT)(WAVE_FORMAT_PCM), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
+
+
+int PaWin_SampleFormatToLinearWaveFormatTag( PaSampleFormat sampleFormat )
+{
+    if( sampleFormat == paFloat32 )
+        return PAWIN_WAVE_FORMAT_IEEE_FLOAT;
+    
+    return PAWIN_WAVE_FORMAT_PCM;
+}
+
+
+void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, 
+		int numChannels, PaSampleFormat sampleFormat, int waveFormatTag, double sampleRate )
+{
+	WAVEFORMATEX *waveFormatEx = (WAVEFORMATEX*)waveFormat;
+    int bytesPerSample = Pa_GetSampleSize(sampleFormat);
+	unsigned long bytesPerFrame = numChannels * bytesPerSample;
+	
+    waveFormatEx->wFormatTag = waveFormatTag;
+	waveFormatEx->nChannels = (WORD)numChannels;
+	waveFormatEx->nSamplesPerSec = (DWORD)sampleRate;
+	waveFormatEx->nAvgBytesPerSec = waveFormatEx->nSamplesPerSec * bytesPerFrame;
+	waveFormatEx->nBlockAlign = (WORD)bytesPerFrame;
+	waveFormatEx->wBitsPerSample = bytesPerSample * 8;
+	waveFormatEx->cbSize = 0;
+}
+
+
+void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, 
+		int numChannels, PaSampleFormat sampleFormat, int waveFormatTag, double sampleRate,
+		PaWinWaveFormatChannelMask channelMask )
+{
+	WAVEFORMATEX *waveFormatEx = (WAVEFORMATEX*)waveFormat;
+    int bytesPerSample = Pa_GetSampleSize(sampleFormat);
+	unsigned long bytesPerFrame = numChannels * bytesPerSample;
+    GUID guid;
+
+	waveFormatEx->wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+	waveFormatEx->nChannels = (WORD)numChannels;
+	waveFormatEx->nSamplesPerSec = (DWORD)sampleRate;
+	waveFormatEx->nAvgBytesPerSec = waveFormatEx->nSamplesPerSec * bytesPerFrame;
+	waveFormatEx->nBlockAlign = (WORD)bytesPerFrame;
+	waveFormatEx->wBitsPerSample = bytesPerSample * 8;
+	waveFormatEx->cbSize = 22;
+
+	*((WORD*)&waveFormat->fields[PAWIN_INDEXOF_WVALIDBITSPERSAMPLE]) =
+			waveFormatEx->wBitsPerSample;
+
+	*((DWORD*)&waveFormat->fields[PAWIN_INDEXOF_DWCHANNELMASK]) = channelMask;
+		
+    guid = pawin_ksDataFormatSubtypeGuidBase;
+    guid.Data1 = (USHORT)waveFormatTag;
+    *((GUID*)&waveFormat->fields[PAWIN_INDEXOF_SUBFORMAT]) = guid;
+}
+
+
+PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels )
+{
+	switch( numChannels ){
+		case 1:
+			return PAWIN_SPEAKER_MONO;
+		case 2:
+			return PAWIN_SPEAKER_STEREO; 
+		case 3:
+            return PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_FRONT_RIGHT;
+		case 4:
+			return PAWIN_SPEAKER_QUAD;
+		case 5:
+            return PAWIN_SPEAKER_QUAD | PAWIN_SPEAKER_FRONT_CENTER;
+		case 6:
+            /* The meaning of the PAWIN_SPEAKER_5POINT1 flag has changed over time:
+                http://msdn2.microsoft.com/en-us/library/aa474707.aspx
+               We use PAWIN_SPEAKER_5POINT1 (not PAWIN_SPEAKER_5POINT1_SURROUND)
+               because on some cards (eg Audigy) PAWIN_SPEAKER_5POINT1_SURROUND 
+               results in a virtual mixdown placing the rear output in the 
+               front _and_ rear speakers.
+            */
+			return PAWIN_SPEAKER_5POINT1; 
+        /* case 7: */
+		case 8:
+			return PAWIN_SPEAKER_7POINT1;
+	}
+
+    /* Apparently some Audigy drivers will output silence 
+       if the direct-out constant (0) is used. So this is not ideal.    
+    */
+	return  PAWIN_SPEAKER_DIRECTOUT;
+
+    /* Note that Alec Rogers proposed the following as an alternate method to 
+        generate the default channel mask, however it doesn't seem to be an improvement
+        over the above, since some drivers will matrix outputs mapping to non-present
+        speakers accross multiple physical speakers.
+
+        if(nChannels==1) {
+            pwfFormat->dwChannelMask = SPEAKER_FRONT_CENTER;
+        }
+        else {
+            pwfFormat->dwChannelMask = 0;
+            for(i=0; i<nChannels; i++)
+                pwfFormat->dwChannelMask = (pwfFormat->dwChannelMask << 1) | 0x1;
+        }
+    */
+}
diff --git a/Externals/portaudio/src/os/win/pa_win_wdmks_utils.c b/Externals/portaudio/src/os/win/pa_win_wdmks_utils.c
new file mode 100644
index 0000000000..0dc0b4bdea
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_wdmks_utils.c
@@ -0,0 +1,297 @@
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * Windows WDM KS utilities
+ *
+ * Copyright (c) 1999 - 2007 Andrew Baldwin, Ross Bencina
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+#include <windows.h>
+#include <mmreg.h>
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+    #define WAVE_FORMAT_IEEE_FLOAT 0x0003   // MinGW32 does not define this
+#endif    
+#ifndef _WAVEFORMATEXTENSIBLE_
+    #define _WAVEFORMATEXTENSIBLE_          // MinGW32 does not define this
+#endif
+#ifndef _INC_MMREG
+    #define _INC_MMREG                      // for STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
+#endif
+#include <winioctl.h>						// MinGW32 does not define this automatically
+#include <ks.h>
+#include <ksmedia.h>
+#include <stdio.h>                          // just for some development printfs
+
+#include "portaudio.h"
+#include "pa_util.h"
+#include "pa_win_wdmks_utils.h"
+
+#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB)
+    #if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
+        #pragma comment( lib, "ksguid.lib" )
+    #endif
+    #define pa_KSDATAFORMAT_TYPE_AUDIO            KSDATAFORMAT_TYPE_AUDIO
+    #define pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
+    #define pa_KSDATAFORMAT_SUBTYPE_PCM           KSDATAFORMAT_SUBTYPE_PCM
+    #define pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  KSDATAFORMAT_SUBTYPE_WAVEFORMATEX
+    #define pa_KSMEDIUMSETID_Standard             KSMEDIUMSETID_Standard
+    #define pa_KSINTERFACESETID_Standard          KSINTERFACESETID_Standard
+    #define pa_KSPROPSETID_Pin                    KSPROPSETID_Pin
+#else
+    static const GUID pa_KSDATAFORMAT_TYPE_AUDIO            = { STATIC_KSDATAFORMAT_TYPE_AUDIO };
+    static const GUID pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    = { STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT };
+    static const GUID pa_KSDATAFORMAT_SUBTYPE_PCM           = { STATIC_KSDATAFORMAT_SUBTYPE_PCM };
+    static const GUID pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  = { STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX };
+    static const GUID pa_KSMEDIUMSETID_Standard             = { STATIC_KSMEDIUMSETID_Standard };
+    static const GUID pa_KSINTERFACESETID_Standard          = { STATIC_KSINTERFACESETID_Standard };
+    static const GUID pa_KSPROPSETID_Pin                    = { STATIC_KSPROPSETID_Pin };
+#endif
+
+
+#define pa_IS_VALID_WAVEFORMATEX_GUID(Guid)\
+    (!memcmp(((PUSHORT)&pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) + 1, ((PUSHORT)(Guid)) + 1, sizeof(GUID) - sizeof(USHORT)))
+
+
+
+static PaError WdmGetPinPropertySimple(
+    HANDLE  handle,
+    unsigned long pinId,
+    unsigned long property,
+    void* value,
+    unsigned long valueSize )
+{
+    DWORD bytesReturned;
+    KSP_PIN ksPProp;
+    ksPProp.Property.Set = pa_KSPROPSETID_Pin;
+    ksPProp.Property.Id = property;
+    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
+    ksPProp.PinId = pinId;
+    ksPProp.Reserved = 0;
+
+    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp, sizeof(KSP_PIN),
+            value, valueSize, &bytesReturned, NULL ) == 0 || bytesReturned != valueSize )
+    {
+        return paUnanticipatedHostError;
+    }
+    else
+    {
+        return paNoError;
+    }
+}
+
+
+static PaError WdmGetPinPropertyMulti(
+    HANDLE handle,
+    unsigned long pinId,
+    unsigned long property,
+    KSMULTIPLE_ITEM** ksMultipleItem)
+{
+    unsigned long multipleItemSize = 0;
+    KSP_PIN ksPProp;
+    DWORD bytesReturned;
+
+    *ksMultipleItem = 0;
+
+    ksPProp.Property.Set = pa_KSPROPSETID_Pin;
+    ksPProp.Property.Id = property;
+    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
+    ksPProp.PinId = pinId;
+    ksPProp.Reserved = 0;
+
+    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp.Property,
+            sizeof(KSP_PIN), NULL, 0, &multipleItemSize, NULL ) == 0 && GetLastError() != ERROR_MORE_DATA )
+    {
+        return paUnanticipatedHostError;
+    }
+
+    *ksMultipleItem = (KSMULTIPLE_ITEM*)PaUtil_AllocateMemory( multipleItemSize );
+    if( !*ksMultipleItem )
+    {
+        return paInsufficientMemory;
+    }
+
+    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp, sizeof(KSP_PIN),
+            (void*)*ksMultipleItem,  multipleItemSize, &bytesReturned, NULL ) == 0 || bytesReturned != multipleItemSize )
+    {
+        PaUtil_FreeMemory( ksMultipleItem );
+        return paUnanticipatedHostError;
+    }
+
+    return paNoError;
+}
+
+
+static int GetKSFilterPinCount( HANDLE deviceHandle )
+{
+    DWORD result;
+
+    if( WdmGetPinPropertySimple( deviceHandle, 0, KSPROPERTY_PIN_CTYPES, &result, sizeof(result) ) == paNoError ){
+        return result;
+    }else{
+        return 0;
+    }
+}
+
+
+static KSPIN_COMMUNICATION GetKSFilterPinPropertyCommunication( HANDLE deviceHandle, int pinId )
+{
+    KSPIN_COMMUNICATION result;
+
+    if( WdmGetPinPropertySimple( deviceHandle, pinId, KSPROPERTY_PIN_COMMUNICATION, &result, sizeof(result) ) == paNoError ){
+        return result;
+    }else{
+        return KSPIN_COMMUNICATION_NONE;
+    }
+}
+
+
+static KSPIN_DATAFLOW GetKSFilterPinPropertyDataflow( HANDLE deviceHandle, int pinId )
+{
+    KSPIN_DATAFLOW result;
+
+    if( WdmGetPinPropertySimple( deviceHandle, pinId, KSPROPERTY_PIN_DATAFLOW, &result, sizeof(result) ) == paNoError ){
+        return result;
+    }else{
+        return (KSPIN_DATAFLOW)0;
+    }
+}
+
+
+static int KSFilterPinPropertyIdentifiersInclude( 
+        HANDLE deviceHandle, int pinId, unsigned long property, const GUID *identifierSet, unsigned long identifierId  )
+{
+    KSMULTIPLE_ITEM* item = NULL;
+    KSIDENTIFIER* identifier;
+    int i;
+    int result = 0;
+
+    if( WdmGetPinPropertyMulti( deviceHandle, pinId, property, &item) != paNoError )
+        return 0;
+    
+    identifier = (KSIDENTIFIER*)(item+1);
+
+    for( i = 0; i < (int)item->Count; i++ )
+    {
+        if( !memcmp( (void*)&identifier[i].Set, (void*)identifierSet, sizeof( GUID ) ) &&
+           ( identifier[i].Id == identifierId ) )
+        {
+            result = 1;
+            break;
+        }
+    }
+
+    PaUtil_FreeMemory( item );
+
+    return result;
+}
+
+
+/* return the maximum channel count supported by any pin on the device. 
+   if isInput is non-zero we query input pins, otherwise output pins.
+*/
+int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInput )
+{
+    HANDLE deviceHandle;
+	ULONG i;
+    int pinCount, pinId;
+    int result = 0;
+    KSPIN_DATAFLOW requiredDataflowDirection = (isInput ? KSPIN_DATAFLOW_OUT : KSPIN_DATAFLOW_IN );
+    
+    if( !wcharDevicePath )
+        return 0;
+
+    deviceHandle = CreateFileW( (LPCWSTR)wcharDevicePath, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL );
+    if( deviceHandle == INVALID_HANDLE_VALUE )
+        return 0;
+
+    pinCount = GetKSFilterPinCount( deviceHandle );
+    for( pinId = 0; pinId < pinCount; ++pinId )
+    {
+        KSPIN_COMMUNICATION communication = GetKSFilterPinPropertyCommunication( deviceHandle, pinId );
+        KSPIN_DATAFLOW dataflow = GetKSFilterPinPropertyDataflow( deviceHandle, pinId );
+        if( ( dataflow == requiredDataflowDirection ) &&
+                (( communication == KSPIN_COMMUNICATION_SINK) ||
+                 ( communication == KSPIN_COMMUNICATION_BOTH)) 
+             && ( KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+                    KSPROPERTY_PIN_INTERFACES, &pa_KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_STREAMING )
+                || KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+                    KSPROPERTY_PIN_INTERFACES, &pa_KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_LOOPED_STREAMING ) )
+             && KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
+                    KSPROPERTY_PIN_MEDIUMS, &pa_KSMEDIUMSETID_Standard, KSMEDIUM_STANDARD_DEVIO ) )
+         {
+            KSMULTIPLE_ITEM* item = NULL;
+            if( WdmGetPinPropertyMulti( deviceHandle, pinId, KSPROPERTY_PIN_DATARANGES, &item ) == paNoError )
+            {
+                KSDATARANGE *dataRange = (KSDATARANGE*)(item+1);
+
+                for( i=0; i < item->Count; ++i ){
+
+                    if( pa_IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat)
+                            || memcmp( (void*)&dataRange->SubFormat, (void*)&pa_KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID) ) == 0
+                            || memcmp( (void*)&dataRange->SubFormat, (void*)&pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID) ) == 0
+                            || ( ( memcmp( (void*)&dataRange->MajorFormat, (void*)&pa_KSDATAFORMAT_TYPE_AUDIO, sizeof(GUID) ) == 0 )
+                                && ( memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID) ) == 0 ) ) )
+                    {
+                        KSDATARANGE_AUDIO *dataRangeAudio = (KSDATARANGE_AUDIO*)dataRange;
+                        
+                        /*
+                        printf( ">>> %d %d %d %d %S\n", isInput, dataflow, communication, dataRangeAudio->MaximumChannels, devicePath );
+                       
+                        if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, sizeof(GUID) ) == 0 )
+                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\n" );
+                        else if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_DSOUND, sizeof(GUID) ) == 0 )
+                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_DSOUND\n" );
+                        else if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_WILDCARD, sizeof(GUID) ) == 0 )
+                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_WILDCARD\n" );
+                        else
+                            printf( "\tspecifier: ?\n" );
+                        */
+
+                        /*
+                            We assume that very high values for MaximumChannels are not useful and indicate
+                            that the driver isn't prepared to tell us the real number of channels which it supports.
+                        */
+                        if( dataRangeAudio->MaximumChannels  < 0xFFFFUL && (int)dataRangeAudio->MaximumChannels > result )
+                            result = (int)dataRangeAudio->MaximumChannels;
+                    }
+                    
+                    dataRange = (KSDATARANGE*)( ((char*)dataRange) + dataRange->FormatSize);
+                }
+
+                PaUtil_FreeMemory( item );
+            }
+        }
+    }
+    
+    CloseHandle( deviceHandle );
+    return result;
+}
diff --git a/Externals/portaudio/src/os/win/pa_win_wdmks_utils.h b/Externals/portaudio/src/os/win/pa_win_wdmks_utils.h
new file mode 100644
index 0000000000..b8e923a615
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_win_wdmks_utils.h
@@ -0,0 +1,65 @@
+#ifndef PA_WIN_WDMKS_UTILS_H
+#define PA_WIN_WDMKS_UTILS_H
+
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * Windows WDM KS utilities
+ *
+ * Copyright (c) 1999 - 2007 Ross Bencina, Andrew Baldwin
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @brief Utilities for working with the Windows WDM KS API
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+    Query for the maximum number of channels supported by any pin of the
+    specified device. Returns 0 if the query fails for any reason.
+
+    @param wcharDevicePath A system level PnP interface path, supplied as a WCHAR unicode string.
+    Declard as void* to avoid introducing a dependency on wchar_t here.
+
+    @param isInput A flag specifying whether to query for input (non-zero) or output (zero) channels.
+*/
+int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInput );
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PA_WIN_WDMKS_UTILS_H */
\ No newline at end of file
diff --git a/Externals/portaudio/src/os/win/pa_x86_plain_converters.c b/Externals/portaudio/src/os/win/pa_x86_plain_converters.c
new file mode 100644
index 0000000000..4fcde40cb0
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_x86_plain_converters.c
@@ -0,0 +1,1219 @@
+/*
+ * Plain Intel IA32 assembly implementations of PortAudio sample converter functions.
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+*/
+
+#include "pa_x86_plain_converters.h"
+
+#include "pa_converters.h"
+#include "pa_dither.h"
+
+/*
+    the main reason these versions are faster than the equivalent C versions
+    is that float -> int casting is expensive in C on x86 because the rounding
+    mode needs to be changed for every cast. these versions only set
+    the rounding mode once outside the loop.
+
+    small additional speed gains are made by the way that clamping is
+    implemented.
+
+TODO:
+    o- inline dither code
+    o- implement Dither only (no-clip) versions
+    o- implement int8 and uint8 versions
+    o- test thouroughly
+
+    o- the packed 24 bit functions could benefit from unrolling and avoiding
+        byte and word sized register access.
+*/
+
+/* -------------------------------------------------------------------------- */
+
+/*
+#define PA_CLIP_( val, min, max )\
+    { val = ((val) < (min)) ? (min) : (((val) > (max)) ? (max) : (val)); }
+*/
+
+/*
+    the following notes were used to determine whether a floating point
+    value should be saturated (ie >1 or <-1) by loading it into an integer
+    register. these should be rewritten so that they make sense.
+
+    an ieee floating point value
+
+    1.xxxxxxxxxxxxxxxxxxxx?
+
+
+    is less than  or equal to 1 and greater than or equal to -1 either:
+
+        if the mantissa is 0 and the unbiased exponent is 0
+
+        OR
+
+        if the unbiased exponent < 0
+
+    this translates to:
+
+        if the mantissa is 0 and the biased exponent is 7F
+
+        or
+
+        if the biased exponent is less than 7F
+
+
+    therefore the value is greater than 1 or less than -1 if
+
+        the mantissa is not 0 and the biased exponent is 7F
+
+        or
+
+        if the biased exponent is greater than 7F
+
+
+    in other words, if we mask out the sign bit, the value is
+    greater than 1 or less than -1 if its integer representation is greater than:
+
+    0 01111111 0000 0000 0000 0000 0000 000
+
+    0011 1111 1000 0000 0000 0000 0000 0000 => 0x3F800000
+*/
+
+/* -------------------------------------------------------------------------- */
+
+static const short fpuControlWord_ = 0x033F; /*round to nearest, 64 bit precision, all exceptions masked*/
+static const double int32Scaler_ = 0x7FFFFFFF;
+static const double ditheredInt32Scaler_ = 0x7FFFFFFE;
+static const double int24Scaler_ = 0x7FFFFF;
+static const double ditheredInt24Scaler_ = 0x7FFFFE;
+static const double int16Scaler_ = 0x7FFF;
+static const double ditheredInt16Scaler_ = 0x7FFE;
+
+#define PA_DITHER_BITS_   (15)
+/* Multiply by PA_FLOAT_DITHER_SCALE_ to get a float between -2.0 and +1.99999 */
+#define PA_FLOAT_DITHER_SCALE_  (1.0F / ((1<<PA_DITHER_BITS_)-1))
+static const float const_float_dither_scale_ = PA_FLOAT_DITHER_SCALE_;
+#define PA_DITHER_SHIFT_  ((32 - PA_DITHER_BITS_) + 1)
+
+/* -------------------------------------------------------------------------- */
+
+#if defined(_WIN64) || defined(_WIN32_WCE)
+
+/*
+	-EMT64/AMD64 uses different asm
+	-VC2005 doesnt allow _WIN64 with inline assembly either!
+ */
+void PaUtil_InitializeX86PlainConverters( void )
+{
+}
+
+#else
+
+
+static void Float32_To_Int32(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    signed long *dest =  (signed long*)destinationBuffer;
+    (void)ditherGenerator; // unused parameter
+
+    while( count-- )
+    {
+        // REVIEW
+        double scaled = *src * 0x7FFFFFFF;
+        *dest = (signed long) scaled;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+*/
+
+    short savedFpuControlWord;
+
+    (void) ditherGenerator; /* unused parameter */
+
+
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32 and int32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+    
+        mov     edi, destinationBuffer
+        
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int32Scaler_             // stack:  (int)0x7FFFFFFF
+
+    Float32_To_Int32_loop:
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFFFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFFFF, (int)0x7FFFFFFF
+        /*
+            note: we could store to a temporary qword here which would cause
+            wraparound distortion instead of int indefinite 0x10. that would
+            be more work, and given that not enabling clipping is only advisable
+            when you know that your signal isn't going to clip it isn't worth it.
+        */
+        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  (int)0x7FFFFFFF
+
+        add     edi, ebx                // increment destination ptr
+        //lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int32_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    signed long *dest =  (signed long*)destinationBuffer;
+    (void) ditherGenerator; // unused parameter
+
+    while( count-- )
+    {
+        // REVIEW
+        double scaled = *src * 0x7FFFFFFF;
+        PA_CLIP_( scaled, -2147483648., 2147483647.  );
+        *dest = (signed long) scaled;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+*/
+
+    short savedFpuControlWord;
+
+    (void) ditherGenerator; /* unused parameter */
+
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32 and int32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+    
+        mov     edi, destinationBuffer
+        
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int32Scaler_             // stack:  (int)0x7FFFFFFF
+
+    Float32_To_Int32_Clip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int32_Clip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFFFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFFFF, (int)0x7FFFFFFF
+        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  (int)0x7FFFFFFF
+        jmp     Float32_To_Int32_Clip_stored
+    
+    Float32_To_Int32_Clip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     edx, 0x7FFFFFFF         // convert to maximum range integers
+        mov     dword ptr [edi], edx
+
+    Float32_To_Int32_Clip_stored:
+
+        //add     edi, ebx                // increment destination ptr
+        lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int32_Clip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int32_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+    /*
+    float *src = (float*)sourceBuffer;
+    signed long *dest =  (signed long*)destinationBuffer;
+
+    while( count-- )
+    {
+        // REVIEW
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        // use smaller scaler to prevent overflow when we add the dither
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        PA_CLIP_( dithered, -2147483648., 2147483647.  );
+        *dest = (signed long) dithered;
+
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+    */
+
+    short savedFpuControlWord;
+
+    // spill storage:
+    signed long sourceByteStride;
+    signed long highpassedDither;
+
+    // dither state:
+    unsigned long ditherPrevious = ditherGenerator->previous;
+    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
+    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
+                    
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32 and int32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+    
+        mov     edi, destinationBuffer
+        
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     ditheredInt32Scaler_    // stack:  int scaler
+
+    Float32_To_Int32_DitherClip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int32_DitherClip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, int scaler
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
+
+        /*
+        // call PaUtil_GenerateFloatTriangularDither with C calling convention
+        mov     sourceByteStride, eax   // save eax
+        mov     sourceEnd, ecx          // save ecx
+        push    ditherGenerator         // pass ditherGenerator parameter on stack
+	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
+	    pop     edx                     // clear parameter off stack
+        mov     ecx, sourceEnd          // restore ecx
+        mov     eax, sourceByteStride   // restore eax
+        */
+
+    // generate dither
+        mov     sourceByteStride, eax   // save eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed1
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     ditherRandSeed1, eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed2
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     edx, ditherRandSeed1
+        shr     edx, PA_DITHER_SHIFT_
+        mov     ditherRandSeed2, eax
+        shr     eax, PA_DITHER_SHIFT_
+        //add     eax, edx                // eax -> current
+        lea     eax, [eax+edx]
+        mov     edx, ditherPrevious
+        neg     edx
+        lea     edx, [eax+edx]          // highpass = current - previous
+        mov     highpassedDither, edx
+        mov     ditherPrevious, eax     // previous = current
+        mov     eax, sourceByteStride   // restore eax
+        fild    highpassedDither
+        fmul    const_float_dither_scale_
+    // end generate dither, dither signal in st(0)
+    
+        faddp   st(1), st(0)            // stack: dither + value*(int scaler), int scaler
+        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  int scaler
+        jmp     Float32_To_Int32_DitherClip_stored
+    
+    Float32_To_Int32_DitherClip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     edx, 0x7FFFFFFF         // convert to maximum range integers
+        mov     dword ptr [edi], edx
+
+    Float32_To_Int32_DitherClip_stored:
+
+        //add     edi, ebx              // increment destination ptr
+        lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int32_DitherClip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+
+    ditherGenerator->previous = ditherPrevious;
+    ditherGenerator->randSeed1 = ditherRandSeed1;
+    ditherGenerator->randSeed2 = ditherRandSeed2;
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    signed long temp;
+
+    (void) ditherGenerator; // unused parameter
+    
+    while( count-- )
+    {
+        // convert to 32 bit and drop the low 8 bits
+        double scaled = *src * 0x7FFFFFFF;
+        temp = (signed long) scaled;
+
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+*/
+
+    short savedFpuControlWord;
+    
+    signed long tempInt32;
+
+    (void) ditherGenerator; /* unused parameter */
+                 
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 3                  // sizeof int24
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int24Scaler_             // stack:  (int)0x7FFFFF
+
+    Float32_To_Int24_loop:
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFF, (int)0x7FFFFF
+        fistp   tempInt32               // pop st(0) into tempInt32, stack:  (int)0x7FFFFF
+        mov     edx, tempInt32
+
+        mov     byte ptr [edi], DL
+        shr     edx, 8
+        //mov     byte ptr [edi+1], DL
+        //mov     byte ptr [edi+2], DH
+        mov     word ptr [edi+1], DX
+
+        //add     edi, ebx                // increment destination ptr
+        lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int24_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    signed long temp;
+
+    (void) ditherGenerator; // unused parameter
+    
+    while( count-- )
+    {
+        // convert to 32 bit and drop the low 8 bits
+        double scaled = *src * 0x7FFFFFFF;
+        PA_CLIP_( scaled, -2147483648., 2147483647.  );
+        temp = (signed long) scaled;
+
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+*/
+
+    short savedFpuControlWord;
+    
+    signed long tempInt32;
+
+    (void) ditherGenerator; /* unused parameter */
+                 
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 3                  // sizeof int24
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int24Scaler_             // stack:  (int)0x7FFFFF
+
+    Float32_To_Int24_Clip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int24_Clip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFF, (int)0x7FFFFF
+        fistp   tempInt32               // pop st(0) into tempInt32, stack:  (int)0x7FFFFF
+        mov     edx, tempInt32
+        jmp     Float32_To_Int24_Clip_store
+    
+    Float32_To_Int24_Clip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     edx, 0x7FFFFF           // convert to maximum range integers
+
+    Float32_To_Int24_Clip_store:
+
+        mov     byte ptr [edi], DL
+        shr     edx, 8
+        //mov     byte ptr [edi+1], DL
+        //mov     byte ptr [edi+2], DH
+        mov     word ptr [edi+1], DX
+
+        //add     edi, ebx                // increment destination ptr
+        lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int24_Clip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int24_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    unsigned char *dest = (unsigned char*)destinationBuffer;
+    signed long temp;
+    
+    while( count-- )
+    {
+        // convert to 32 bit and drop the low 8 bits
+
+        // FIXME: the dither amplitude here appears to be too small by 8 bits
+        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        // use smaller scaler to prevent overflow when we add the dither
+        double dithered = ((double)*src * (2147483646.0)) + dither;
+        PA_CLIP_( dithered, -2147483648., 2147483647.  );
+        
+        temp = (signed long) dithered;
+
+        dest[0] = (unsigned char)(temp >> 8);
+        dest[1] = (unsigned char)(temp >> 16);
+        dest[2] = (unsigned char)(temp >> 24);
+
+        src += sourceStride;
+        dest += destinationStride * 3;
+    }
+*/
+
+    short savedFpuControlWord;
+
+    // spill storage:
+    signed long sourceByteStride;
+    signed long highpassedDither;
+
+    // dither state:
+    unsigned long ditherPrevious = ditherGenerator->previous;
+    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
+    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
+    
+    signed long tempInt32;
+                 
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 3                  // sizeof int24
+        mov     ebx, destinationStride
+        imul    ebx, edx
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     ditheredInt24Scaler_    // stack:  int scaler
+
+    Float32_To_Int24_DitherClip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int24_DitherClip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, int scaler
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
+
+    /*
+        // call PaUtil_GenerateFloatTriangularDither with C calling convention
+        mov     sourceByteStride, eax   // save eax
+        mov     sourceEnd, ecx          // save ecx
+        push    ditherGenerator         // pass ditherGenerator parameter on stack
+	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
+	    pop     edx                     // clear parameter off stack
+        mov     ecx, sourceEnd          // restore ecx
+        mov     eax, sourceByteStride   // restore eax
+    */
+    
+    // generate dither
+        mov     sourceByteStride, eax   // save eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed1
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     ditherRandSeed1, eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed2
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     edx, ditherRandSeed1
+        shr     edx, PA_DITHER_SHIFT_
+        mov     ditherRandSeed2, eax
+        shr     eax, PA_DITHER_SHIFT_
+        //add     eax, edx                // eax -> current
+        lea     eax, [eax+edx]
+        mov     edx, ditherPrevious
+        neg     edx
+        lea     edx, [eax+edx]          // highpass = current - previous
+        mov     highpassedDither, edx
+        mov     ditherPrevious, eax     // previous = current
+        mov     eax, sourceByteStride   // restore eax
+        fild    highpassedDither
+        fmul    const_float_dither_scale_
+    // end generate dither, dither signal in st(0)
+
+        faddp   st(1), st(0)            // stack: dither * value*(int scaler), int scaler
+        fistp   tempInt32               // pop st(0) into tempInt32, stack:  int scaler
+        mov     edx, tempInt32
+        jmp     Float32_To_Int24_DitherClip_store
+    
+    Float32_To_Int24_DitherClip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     edx, 0x7FFFFF           // convert to maximum range integers
+
+    Float32_To_Int24_DitherClip_store:
+
+        mov     byte ptr [edi], DL
+        shr     edx, 8
+        //mov     byte ptr [edi+1], DL
+        //mov     byte ptr [edi+2], DH
+        mov     word ptr [edi+1], DX
+
+        //add     edi, ebx                // increment destination ptr
+        lea     edi, [edi+ebx]
+
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int24_DitherClip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+
+    ditherGenerator->previous = ditherPrevious;
+    ditherGenerator->randSeed1 = ditherRandSeed1;
+    ditherGenerator->randSeed2 = ditherRandSeed2;
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    signed short *dest =  (signed short*)destinationBuffer;
+    (void)ditherGenerator; // unused parameter
+
+    while( count-- )
+    {
+
+        short samp = (short) (*src * (32767.0f));
+        *dest = samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+*/
+
+    short savedFpuControlWord;
+   
+    (void) ditherGenerator; /* unused parameter */
+
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx                // source byte stride
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 2                  // sizeof int16
+        mov     ebx, destinationStride
+        imul    ebx, edx                // destination byte stride
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int16Scaler_            // stack:  (int)0x7FFF
+
+    Float32_To_Int16_loop:
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFF, (int)0x7FFF
+        fistp   word ptr [edi]          // store scaled int into dest, stack:  (int)0x7FFF
+
+        add     edi, ebx                // increment destination ptr
+        //lea     edi, [edi+ebx]
+        
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int16_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16_Clip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    signed short *dest =  (signed short*)destinationBuffer;
+    (void)ditherGenerator; // unused parameter
+
+    while( count-- )
+    {
+        long samp = (signed long) (*src * (32767.0f));
+        PA_CLIP_( samp, -0x8000, 0x7FFF );
+        *dest = (signed short) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+*/
+
+    short savedFpuControlWord;
+   
+    (void) ditherGenerator; /* unused parameter */
+
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx                // source byte stride
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 2                  // sizeof int16
+        mov     ebx, destinationStride
+        imul    ebx, edx                // destination byte stride
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     int16Scaler_            // stack:  (int)0x7FFF
+
+    Float32_To_Int16_Clip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int16_Clip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, (int)0x7FFF
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFF, (int)0x7FFF
+        fistp   word ptr [edi]          // store scaled int into dest, stack:  (int)0x7FFF
+        jmp     Float32_To_Int16_Clip_stored
+    
+    Float32_To_Int16_Clip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     dx, 0x7FFF              // convert to maximum range integers
+        mov     word ptr [edi], dx      // store clamped into into dest
+
+    Float32_To_Int16_Clip_stored:
+
+        add     edi, ebx                // increment destination ptr
+        //lea     edi, [edi+ebx]
+        
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int16_Clip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
+static void Float32_To_Int16_DitherClip(
+    void *destinationBuffer, signed int destinationStride,
+    void *sourceBuffer, signed int sourceStride,
+    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
+{
+/*
+    float *src = (float*)sourceBuffer;
+    signed short *dest =  (signed short*)destinationBuffer;
+    (void)ditherGenerator; // unused parameter
+
+    while( count-- )
+    {
+
+        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
+        // use smaller scaler to prevent overflow when we add the dither 
+        float dithered = (*src * (32766.0f)) + dither;
+        signed long samp = (signed long) dithered;
+        PA_CLIP_( samp, -0x8000, 0x7FFF );
+        *dest = (signed short) samp;
+
+        src += sourceStride;
+        dest += destinationStride;
+    }
+*/
+
+    short savedFpuControlWord;
+
+    // spill storage:
+    signed long sourceByteStride;
+    signed long highpassedDither;
+
+    // dither state:
+    unsigned long ditherPrevious = ditherGenerator->previous;
+    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
+    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
+
+    __asm{
+        // esi -> source ptr
+        // eax -> source byte stride
+        // edi -> destination ptr
+        // ebx -> destination byte stride
+        // ecx -> source end ptr
+        // edx -> temp
+
+        mov     esi, sourceBuffer
+
+        mov     edx, 4                  // sizeof float32
+        mov     eax, sourceStride
+        imul    eax, edx                // source byte stride
+
+        mov     ecx, count
+        imul    ecx, eax
+        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
+
+        mov     edi, destinationBuffer
+
+        mov     edx, 2                  // sizeof int16
+        mov     ebx, destinationStride
+        imul    ebx, edx                // destination byte stride
+
+        fwait
+        fstcw   savedFpuControlWord
+        fldcw   fpuControlWord_
+
+        fld     ditheredInt16Scaler_    // stack:  int scaler
+
+    Float32_To_Int16_DitherClip_loop:
+
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+
+        and     edx, 0x7FFFFFFF         // mask off sign
+        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
+
+        jg      Float32_To_Int16_DitherClip_clamp
+
+        // load unscaled value into st(0)
+        fld     dword ptr [esi]         // stack:  value, int scaler
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
+
+        /*
+        // call PaUtil_GenerateFloatTriangularDither with C calling convention
+        mov     sourceByteStride, eax   // save eax
+        mov     sourceEnd, ecx          // save ecx
+        push    ditherGenerator         // pass ditherGenerator parameter on stack
+	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
+	    pop     edx                     // clear parameter off stack
+        mov     ecx, sourceEnd          // restore ecx
+        mov     eax, sourceByteStride   // restore eax
+        */
+
+    // generate dither
+        mov     sourceByteStride, eax   // save eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed1
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     ditherRandSeed1, eax
+        mov     edx, 196314165
+        mov     eax, ditherRandSeed2
+        mul     edx                     // eax:edx = eax * 196314165
+        //add     eax, 907633515
+        lea     eax, [eax+907633515]
+        mov     edx, ditherRandSeed1
+        shr     edx, PA_DITHER_SHIFT_
+        mov     ditherRandSeed2, eax
+        shr     eax, PA_DITHER_SHIFT_
+        //add     eax, edx                // eax -> current
+        lea     eax, [eax+edx]            // current = randSeed1>>x + randSeed2>>x
+        mov     edx, ditherPrevious
+        neg     edx
+        lea     edx, [eax+edx]          // highpass = current - previous
+        mov     highpassedDither, edx
+        mov     ditherPrevious, eax     // previous = current
+        mov     eax, sourceByteStride   // restore eax
+        fild    highpassedDither
+        fmul    const_float_dither_scale_
+    // end generate dither, dither signal in st(0)
+        
+        faddp   st(1), st(0)            // stack: dither * value*(int scaler), int scaler
+        fistp   word ptr [edi]          // store scaled int into dest, stack:  int scaler
+        jmp     Float32_To_Int16_DitherClip_stored
+    
+    Float32_To_Int16_DitherClip_clamp:
+        mov     edx, dword ptr [esi]    // load floating point value into integer register
+        shr     edx, 31                 // move sign bit into bit 0
+        add     esi, eax                // increment source ptr
+        //lea     esi, [esi+eax]
+        add     dx, 0x7FFF              // convert to maximum range integers
+        mov     word ptr [edi], dx      // store clamped into into dest
+
+    Float32_To_Int16_DitherClip_stored:
+
+        add     edi, ebx                // increment destination ptr
+        //lea     edi, [edi+ebx]
+        
+        cmp     esi, ecx                // has src ptr reached end?
+        jne     Float32_To_Int16_DitherClip_loop
+
+        ffree   st(0)
+        fincstp
+
+        fwait
+        fnclex
+        fldcw   savedFpuControlWord
+    }
+
+    ditherGenerator->previous = ditherPrevious;
+    ditherGenerator->randSeed1 = ditherRandSeed1;
+    ditherGenerator->randSeed2 = ditherRandSeed2;
+}
+
+/* -------------------------------------------------------------------------- */
+
+void PaUtil_InitializeX86PlainConverters( void )
+{
+    paConverters.Float32_To_Int32 = Float32_To_Int32;
+    paConverters.Float32_To_Int32_Clip = Float32_To_Int32_Clip;
+    paConverters.Float32_To_Int32_DitherClip = Float32_To_Int32_DitherClip;
+
+    paConverters.Float32_To_Int24 = Float32_To_Int24;
+    paConverters.Float32_To_Int24_Clip = Float32_To_Int24_Clip;
+    paConverters.Float32_To_Int24_DitherClip = Float32_To_Int24_DitherClip;
+    
+    paConverters.Float32_To_Int16 = Float32_To_Int16;
+    paConverters.Float32_To_Int16_Clip = Float32_To_Int16_Clip;
+    paConverters.Float32_To_Int16_DitherClip = Float32_To_Int16_DitherClip;
+}
+
+#endif
+
+/* -------------------------------------------------------------------------- */
diff --git a/Externals/portaudio/src/os/win/pa_x86_plain_converters.h b/Externals/portaudio/src/os/win/pa_x86_plain_converters.h
new file mode 100644
index 0000000000..1623115d6b
--- /dev/null
+++ b/Externals/portaudio/src/os/win/pa_x86_plain_converters.h
@@ -0,0 +1,60 @@
+/*
+ * Plain Intel IA32 assembly implementations of PortAudio sample converter functions.
+ * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
+ *
+ * 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+/** @file
+ @ingroup win_src
+*/
+
+#ifndef PA_X86_PLAIN_CONVERTERS_H
+#define PA_X86_PLAIN_CONVERTERS_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+
+/**
+ @brief Install optimized converter functions suitable for all IA32 processors
+
+ It is recommended to call PaUtil_InitializeX86PlainConverters prior to calling Pa_Initialize
+*/
+void PaUtil_InitializeX86PlainConverters( void );
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* PA_X86_PLAIN_CONVERTERS_H */
diff --git a/Externals/portaudio/x64/Debug/portaudio.lib b/Externals/portaudio/x64/Debug/portaudio.lib
deleted file mode 100644
index a092624370..0000000000
Binary files a/Externals/portaudio/x64/Debug/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/x64/Debug/portaudio.pdb b/Externals/portaudio/x64/Debug/portaudio.pdb
deleted file mode 100644
index fd5cd214b4..0000000000
Binary files a/Externals/portaudio/x64/Debug/portaudio.pdb and /dev/null differ
diff --git a/Externals/portaudio/x64/DebugFast/portaudio.lib b/Externals/portaudio/x64/DebugFast/portaudio.lib
deleted file mode 100644
index 3029595193..0000000000
Binary files a/Externals/portaudio/x64/DebugFast/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/x64/DebugFast/portaudio.pdb b/Externals/portaudio/x64/DebugFast/portaudio.pdb
deleted file mode 100644
index 3642ec683a..0000000000
Binary files a/Externals/portaudio/x64/DebugFast/portaudio.pdb and /dev/null differ
diff --git a/Externals/portaudio/x64/Release/portaudio.lib b/Externals/portaudio/x64/Release/portaudio.lib
deleted file mode 100644
index 3029595193..0000000000
Binary files a/Externals/portaudio/x64/Release/portaudio.lib and /dev/null differ
diff --git a/Externals/portaudio/x64/Release/portaudio.pdb b/Externals/portaudio/x64/Release/portaudio.pdb
deleted file mode 100644
index 3642ec683a..0000000000
Binary files a/Externals/portaudio/x64/Release/portaudio.pdb and /dev/null differ
diff --git a/Externals/soundtouch/AAFilter.cpp b/Externals/soundtouch/AAFilter.cpp
index 010fb511b2..b3bb947bd6 100644
--- a/Externals/soundtouch/AAFilter.cpp
+++ b/Externals/soundtouch/AAFilter.cpp
@@ -12,10 +12,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2009-01-11 11:34:24 +0000 (Sun, 11 Jan 2009) $
+// Last changed  : $Date: 2014-01-06 08:40:22 +1100 (Mon, 06 Jan 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: AAFilter.cpp 45 2009-01-11 11:34:24Z oparviai $
+// $Id: AAFilter.cpp 177 2014-01-05 21:40:22Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -52,6 +52,30 @@ using namespace soundtouch;
 #define PI        3.141592655357989
 #define TWOPI    (2 * PI)
 
+// define this to save AA filter coefficients to a file
+// #define _DEBUG_SAVE_AAFILTER_COEFFICIENTS   1
+
+#ifdef _DEBUG_SAVE_AAFILTER_COEFFICIENTS
+    #include <stdio.h>
+
+    static void _DEBUG_SAVE_AAFIR_COEFFS(SAMPLETYPE *coeffs, int len)
+    {
+        FILE *fptr = fopen("aa_filter_coeffs.txt", "wt");
+        if (fptr == NULL) return;
+
+        for (int i = 0; i < len; i ++)
+        {
+            double temp = coeffs[i];
+            fprintf(fptr, "%lf\n", temp);
+        }
+        fclose(fptr);
+    }
+
+#else
+    #define _DEBUG_SAVE_AAFIR_COEFFS(x, y)
+#endif
+
+
 /*****************************************************************************
  *
  * Implementation of the class 'AAFilter'
@@ -99,7 +123,7 @@ void AAFilter::calculateCoeffs()
 {
     uint i;
     double cntTemp, temp, tempCoeff,h, w;
-    double fc2, wc;
+    double wc;
     double scaleCoeff, sum;
     double *work;
     SAMPLETYPE *coeffs;
@@ -112,8 +136,7 @@ void AAFilter::calculateCoeffs()
     work = new double[length];
     coeffs = new SAMPLETYPE[length];
 
-    fc2 = 2.0 * cutoffFreq; 
-    wc = PI * fc2;
+    wc = 2.0 * PI * cutoffFreq;
     tempCoeff = TWOPI / (double)length;
 
     sum = 0;
@@ -124,7 +147,7 @@ void AAFilter::calculateCoeffs()
         temp = cntTemp * wc;
         if (temp != 0) 
         {
-            h = fc2 * sin(temp) / temp;                     // sinc function
+            h = sin(temp) / temp;                     // sinc function
         } 
         else 
         {
@@ -153,17 +176,21 @@ void AAFilter::calculateCoeffs()
 
     for (i = 0; i < length; i ++) 
     {
-        // scale & round to nearest integer
         temp = work[i] * scaleCoeff;
+//#if SOUNDTOUCH_INTEGER_SAMPLES
+        // scale & round to nearest integer
         temp += (temp >= 0) ? 0.5 : -0.5;
         // ensure no overfloods
         assert(temp >= -32768 && temp <= 32767);
+//#endif
         coeffs[i] = (SAMPLETYPE)temp;
     }
 
     // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384
     pFIR->setCoefficients(coeffs, length, 14);
 
+    _DEBUG_SAVE_AAFIR_COEFFS(coeffs, length);
+
     delete[] work;
     delete[] coeffs;
 }
@@ -178,6 +205,31 @@ uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples
 }
 
 
+/// Applies the filter to the given src & dest pipes, so that processed amount of
+/// samples get removed from src, and produced amount added to dest 
+/// Note : The amount of outputted samples is by value of 'filter length' 
+/// smaller than the amount of input samples.
+uint AAFilter::evaluate(FIFOSampleBuffer &dest, FIFOSampleBuffer &src) const
+{
+    SAMPLETYPE *pdest;
+    const SAMPLETYPE *psrc;
+    uint numSrcSamples;
+    uint result;
+    int numChannels = src.getChannels();
+
+    assert(numChannels == dest.getChannels());
+
+    numSrcSamples = src.numSamples();
+    psrc = src.ptrBegin();
+    pdest = dest.ptrEnd(numSrcSamples);
+    result = pFIR->evaluate(pdest, psrc, numSrcSamples, numChannels);
+    src.receiveSamples(result);
+    dest.putSamples(result);
+
+    return result;
+}
+
+
 uint AAFilter::getLength() const
 {
     return pFIR->getLength();
diff --git a/Externals/soundtouch/AAFilter.h b/Externals/soundtouch/AAFilter.h
index d8b1cd2c66..3a9e16331b 100644
--- a/Externals/soundtouch/AAFilter.h
+++ b/Externals/soundtouch/AAFilter.h
@@ -13,10 +13,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2008-02-10 16:26:55 +0000 (Sun, 10 Feb 2008) $
+// Last changed  : $Date: 2014-01-08 06:41:23 +1100 (Wed, 08 Jan 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: AAFilter.h 11 2008-02-10 16:26:55Z oparviai $
+// $Id: AAFilter.h 187 2014-01-07 19:41:23Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -45,6 +45,7 @@
 #define AAFilter_H
 
 #include "STTypes.h"
+#include "FIFOSampleBuffer.h"
 
 namespace soundtouch
 {
@@ -84,6 +85,14 @@ public:
                   const SAMPLETYPE *src, 
                   uint numSamples, 
                   uint numChannels) const;
+
+    /// Applies the filter to the given src & dest pipes, so that processed amount of
+    /// samples get removed from src, and produced amount added to dest 
+    /// Note : The amount of outputted samples is by value of 'filter length' 
+    /// smaller than the amount of input samples.
+    uint evaluate(FIFOSampleBuffer &dest, 
+                  FIFOSampleBuffer &src) const;
+
 };
 
 }
diff --git a/Externals/soundtouch/BPMDetect.cpp b/Externals/soundtouch/BPMDetect.cpp
index be2478388f..88a2d9f601 100644
--- a/Externals/soundtouch/BPMDetect.cpp
+++ b/Externals/soundtouch/BPMDetect.cpp
@@ -26,7 +26,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-08-30 19:45:25 +0000 (Thu, 30 Aug 2012) $
+// Last changed  : $Date: 2012-08-31 05:45:25 +1000 (Fri, 31 Aug 2012) $
 // File revision : $Revision: 4 $
 //
 // $Id: BPMDetect.cpp 149 2012-08-30 19:45:25Z oparviai $
diff --git a/Externals/soundtouch/CMakeLists.txt b/Externals/soundtouch/CMakeLists.txt
index a09aac1946..b7a2e5dc05 100644
--- a/Externals/soundtouch/CMakeLists.txt
+++ b/Externals/soundtouch/CMakeLists.txt
@@ -4,6 +4,9 @@ set(SRCS
 	cpu_detect_x86.cpp
 	FIFOSampleBuffer.cpp
 	FIRFilter.cpp
+	InterpolateCubic.cpp
+	InterpolateLinear.cpp
+	InterpolateShannon.cpp
 	mmx_optimized.cpp
 	PeakFinder.cpp
 	RateTransposer.cpp
diff --git a/Externals/soundtouch/FIFOSampleBuffer.cpp b/Externals/soundtouch/FIFOSampleBuffer.cpp
index be6060e3c3..7a54d8795a 100644
--- a/Externals/soundtouch/FIFOSampleBuffer.cpp
+++ b/Externals/soundtouch/FIFOSampleBuffer.cpp
@@ -15,7 +15,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// Last changed  : $Date: 2012-11-09 05:53:01 +1100 (Fri, 09 Nov 2012) $
 // File revision : $Revision: 4 $
 //
 // $Id: FIFOSampleBuffer.cpp 160 2012-11-08 18:53:01Z oparviai $
@@ -86,6 +86,10 @@ void FIFOSampleBuffer::setChannels(int numChannels)
     samplesInBuffer = usedBytes / channels;
 }
 
+int FIFOSampleBuffer::getChannels()
+{
+	return channels;
+}
 
 // if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and
 // zeroes this pointer by copying samples from the 'bufferPos' pointer 
diff --git a/Externals/soundtouch/FIFOSampleBuffer.h b/Externals/soundtouch/FIFOSampleBuffer.h
index e44d611eb7..746af0ec11 100644
--- a/Externals/soundtouch/FIFOSampleBuffer.h
+++ b/Externals/soundtouch/FIFOSampleBuffer.h
@@ -161,6 +161,7 @@ public:
 
     /// Sets number of channels, 1 = mono, 2 = stereo.
     void setChannels(int numChannels);
+	int getChannels();
 
     /// Returns nonzero if there aren't any samples available for outputting.
     virtual int isEmpty() const;
diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp
index 54c808d006..b79b2d08c9 100644
--- a/Externals/soundtouch/FIRFilter.cpp
+++ b/Externals/soundtouch/FIRFilter.cpp
@@ -11,7 +11,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// Last changed  : $Date: 2013-06-13 01:24:44 +1000 (Thu, 13 Jun 2013) $
 // File revision : $Revision: 4 $
 //
 // $Id: FIRFilter.cpp 171 2013-06-12 15:24:44Z oparviai $
@@ -217,7 +217,6 @@ uint FIRFilter::evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uin
             sum[c] = 0;
         }
     }
-    free(sum);
     return numSamples - length;
 }
 
diff --git a/Externals/soundtouch/FIRFilter.h b/Externals/soundtouch/FIRFilter.h
index a498032fe8..14694cb2eb 100644
--- a/Externals/soundtouch/FIRFilter.h
+++ b/Externals/soundtouch/FIRFilter.h
@@ -11,7 +11,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// Last changed  : $Date: 2013-06-13 01:24:44 +1000 (Thu, 13 Jun 2013) $
 // File revision : $Revision: 4 $
 //
 // $Id: FIRFilter.h 171 2013-06-12 15:24:44Z oparviai $
diff --git a/Externals/soundtouch/InterpolateCubic.cpp b/Externals/soundtouch/InterpolateCubic.cpp
new file mode 100644
index 0000000000..8aa7374c74
--- /dev/null
+++ b/Externals/soundtouch/InterpolateCubic.cpp
@@ -0,0 +1,200 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Cubic interpolation routine.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateCubic.cpp 179 2014-01-06 18:41:42Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <stddef.h>
+#include <math.h>
+#include "InterpolateCubic.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+// cubic interpolation coefficients
+static const float _coeffs[]= 
+{ -0.5f,  1.0f, -0.5f, 0.0f,
+   1.5f, -2.5f,  0.0f, 1.0f,
+  -1.5f,  2.0f,  0.5f, 0.0f,
+   0.5f, -0.5f,  0.0f, 0.0f};
+
+
+InterpolateCubic::InterpolateCubic()
+{
+    fract = 0;
+}
+
+
+void InterpolateCubic::resetRegisters()
+{
+    fract = 0;
+}
+
+
+/// Transpose mono audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeMono(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 4;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        float out;
+        const float x3 = 1.0f;
+        const float x2 = (float)fract;    // x
+        const float x1 = x2*x2;           // x^2
+        const float x0 = x1*x2;           // x^3
+        float y0, y1, y2, y3;
+
+        assert(fract < 1.0);
+
+        y0 =  _coeffs[0] * x0 +  _coeffs[1] * x1 +  _coeffs[2] * x2 +  _coeffs[3] * x3;
+        y1 =  _coeffs[4] * x0 +  _coeffs[5] * x1 +  _coeffs[6] * x2 +  _coeffs[7] * x3;
+        y2 =  _coeffs[8] * x0 +  _coeffs[9] * x1 + _coeffs[10] * x2 + _coeffs[11] * x3;
+        y3 = _coeffs[12] * x0 + _coeffs[13] * x1 + _coeffs[14] * x2 + _coeffs[15] * x3;
+
+        out = y0 * psrc[0] + y1 * psrc[1] + y2 * psrc[2] + y3 * psrc[3];
+
+        pdest[i] = (SAMPLETYPE)out;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        psrc += whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeStereo(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 4;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        const float x3 = 1.0f;
+        const float x2 = (float)fract;    // x
+        const float x1 = x2*x2;           // x^2
+        const float x0 = x1*x2;           // x^3
+        float y0, y1, y2, y3;
+        float out0, out1;
+
+        assert(fract < 1.0);
+
+        y0 =  _coeffs[0] * x0 +  _coeffs[1] * x1 +  _coeffs[2] * x2 +  _coeffs[3] * x3;
+        y1 =  _coeffs[4] * x0 +  _coeffs[5] * x1 +  _coeffs[6] * x2 +  _coeffs[7] * x3;
+        y2 =  _coeffs[8] * x0 +  _coeffs[9] * x1 + _coeffs[10] * x2 + _coeffs[11] * x3;
+        y3 = _coeffs[12] * x0 + _coeffs[13] * x1 + _coeffs[14] * x2 + _coeffs[15] * x3;
+
+        out0 = y0 * psrc[0] + y1 * psrc[2] + y2 * psrc[4] + y3 * psrc[6];
+        out1 = y0 * psrc[1] + y1 * psrc[3] + y2 * psrc[5] + y3 * psrc[7];
+
+        pdest[2*i]   = (SAMPLETYPE)out0;
+        pdest[2*i+1] = (SAMPLETYPE)out1;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        psrc += 2*whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+/// Transpose multi-channel audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeMulti(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 4;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        const float x3 = 1.0f;
+        const float x2 = (float)fract;    // x
+        const float x1 = x2*x2;           // x^2
+        const float x0 = x1*x2;           // x^3
+        float y0, y1, y2, y3;
+
+        assert(fract < 1.0);
+
+        y0 =  _coeffs[0] * x0 +  _coeffs[1] * x1 +  _coeffs[2] * x2 +  _coeffs[3] * x3;
+        y1 =  _coeffs[4] * x0 +  _coeffs[5] * x1 +  _coeffs[6] * x2 +  _coeffs[7] * x3;
+        y2 =  _coeffs[8] * x0 +  _coeffs[9] * x1 + _coeffs[10] * x2 + _coeffs[11] * x3;
+        y3 = _coeffs[12] * x0 + _coeffs[13] * x1 + _coeffs[14] * x2 + _coeffs[15] * x3;
+
+        for (int c = 0; c < numChannels; c ++)
+        {
+            float out;
+            out = y0 * psrc[c] + y1 * psrc[c + numChannels] + y2 * psrc[c + 2 * numChannels] + y3 * psrc[c + 3 * numChannels];
+            pdest[0] = (SAMPLETYPE)out;
+            pdest ++;
+        }
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        psrc += numChannels*whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
diff --git a/Externals/soundtouch/InterpolateCubic.h b/Externals/soundtouch/InterpolateCubic.h
new file mode 100644
index 0000000000..e0e302b233
--- /dev/null
+++ b/Externals/soundtouch/InterpolateCubic.h
@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Cubic interpolation routine.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateCubic.h 179 2014-01-06 18:41:42Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateCubic_H_
+#define _InterpolateCubic_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class InterpolateCubic : public TransposerBase
+{
+protected:
+    virtual void resetRegisters();
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+
+    float fract;
+
+public:
+    InterpolateCubic();
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/InterpolateLinear.cpp b/Externals/soundtouch/InterpolateLinear.cpp
new file mode 100644
index 0000000000..ae26e69a1e
--- /dev/null
+++ b/Externals/soundtouch/InterpolateLinear.cpp
@@ -0,0 +1,299 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Linear interpolation algorithm.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateLinear.cpp 180 2014-01-06 19:16:02Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <assert.h>
+#include <stdlib.h>
+#include "InterpolateLinear.h"
+
+using namespace soundtouch;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// InterpolateLinearInteger - integer arithmetic implementation
+// 
+
+/// fixed-point interpolation routine precision
+#define SCALE    65536
+
+
+// Constructor
+InterpolateLinearInteger::InterpolateLinearInteger() : TransposerBase()
+{
+    // Notice: use local function calling syntax for sake of clarity, 
+    // to indicate the fact that C++ constructor can't call virtual functions.
+    resetRegisters();
+    setRate(1.0f);
+}
+
+
+void InterpolateLinearInteger::resetRegisters()
+{
+    iFract = 0;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        LONG_SAMPLETYPE temp;
+    
+        assert(iFract < SCALE);
+
+        temp = (SCALE - iFract) * src[0] + iFract * src[1];
+        dest[i] = (SAMPLETYPE)(temp / SCALE);
+        i++;
+
+        iFract += iRate;
+
+        int iWhole = iFract / SCALE;
+        iFract -= iWhole * SCALE;
+        srcCount += iWhole;
+        src += iWhole;
+    }
+    srcSamples = srcCount;
+
+    return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Stereo' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        LONG_SAMPLETYPE temp0;
+        LONG_SAMPLETYPE temp1;
+    
+        assert(iFract < SCALE);
+
+        temp0 = (SCALE - iFract) * src[0] + iFract * src[2];
+        temp1 = (SCALE - iFract) * src[1] + iFract * src[3];
+        dest[0] = (SAMPLETYPE)(temp0 / SCALE);
+        dest[1] = (SAMPLETYPE)(temp1 / SCALE);
+        dest += 2;
+        i++;
+
+        iFract += iRate;
+
+        int iWhole = iFract / SCALE;
+        iFract -= iWhole * SCALE;
+        srcCount += iWhole;
+        src += 2*iWhole;
+    }
+    srcSamples = srcCount;
+
+    return i;
+}
+
+
+int InterpolateLinearInteger::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        LONG_SAMPLETYPE temp, vol1;
+    
+        assert(iFract < SCALE);
+        vol1 = (SCALE - iFract);
+        for (int c = 0; c < numChannels; c ++)
+        {
+            temp = vol1 * src[c] + iFract * src[c + numChannels];
+            dest[0] = (SAMPLETYPE)(temp / SCALE);
+            dest ++;
+        }
+        i++;
+
+        iFract += iRate;
+
+        int iWhole = iFract / SCALE;
+        iFract -= iWhole * SCALE;
+        srcCount += iWhole;
+        src += iWhole * numChannels;
+    }
+    srcSamples = srcCount;
+
+    return i;
+}
+
+
+// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
+// iRate, larger faster iRates.
+void InterpolateLinearInteger::setRate(float newRate)
+{
+    iRate = (int)(newRate * SCALE + 0.5f);
+    TransposerBase::setRate(newRate);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// InterpolateLinearFloat - floating point arithmetic implementation
+// 
+//////////////////////////////////////////////////////////////////////////////
+
+
+// Constructor
+InterpolateLinearFloat::InterpolateLinearFloat() : TransposerBase()
+{
+    // Notice: use local function calling syntax for sake of clarity, 
+    // to indicate the fact that C++ constructor can't call virtual functions.
+    resetRegisters();
+    setRate(1.0f);
+}
+
+
+void InterpolateLinearFloat::resetRegisters()
+{
+    fract = 0;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        double out;
+        assert(fract < 1.0);
+
+        out = (1.0 - fract) * src[0] + fract * src[1];
+        dest[i] = (SAMPLETYPE)out;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        src += whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        double out0, out1;
+        assert(fract < 1.0);
+
+        out0 = (1.0 - fract) * src[0] + fract * src[2];
+        out1 = (1.0 - fract) * src[1] + fract * src[3];
+        dest[2*i]   = (SAMPLETYPE)out0;
+        dest[2*i+1] = (SAMPLETYPE)out1;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        src += 2*whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+int InterpolateLinearFloat::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 1;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        float temp, vol1;
+    
+        vol1 = (1.0f- fract);
+        for (int c = 0; c < numChannels; c ++)
+        {
+            temp = vol1 * src[c] + fract * src[c + numChannels];
+            *dest = (SAMPLETYPE)temp;
+            dest ++;
+        }
+        i++;
+
+        fract += rate;
+
+        int iWhole = (int)fract;
+        fract -= iWhole;
+        srcCount += iWhole;
+        src += iWhole * numChannels;
+    }
+    srcSamples = srcCount;
+
+    return i;
+}
diff --git a/Externals/soundtouch/InterpolateLinear.h b/Externals/soundtouch/InterpolateLinear.h
new file mode 100644
index 0000000000..b76299f889
--- /dev/null
+++ b/Externals/soundtouch/InterpolateLinear.h
@@ -0,0 +1,92 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Linear interpolation routine.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateLinear.h 179 2014-01-06 18:41:42Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateLinear_H_
+#define _InterpolateLinear_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Linear transposer class that uses integer arithmetics
+class InterpolateLinearInteger : public TransposerBase
+{
+protected:
+    int iFract;
+    int iRate;
+
+    virtual void resetRegisters();
+
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples);
+public:
+    InterpolateLinearInteger();
+
+    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
+    /// rate, larger faster rates.
+    virtual void setRate(float newRate);
+};
+
+
+/// Linear transposer class that uses floating point arithmetics
+class InterpolateLinearFloat : public TransposerBase
+{
+protected:
+    float fract;
+
+    virtual void resetRegisters();
+
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples);
+
+public:
+    InterpolateLinearFloat();
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/InterpolateShannon.cpp b/Externals/soundtouch/InterpolateShannon.cpp
new file mode 100644
index 0000000000..1085fd14cb
--- /dev/null
+++ b/Externals/soundtouch/InterpolateShannon.cpp
@@ -0,0 +1,185 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample interpolation routine using 8-tap band-limited Shannon interpolation 
+/// with kaiser window.
+///
+/// Notice. This algorithm is remarkably much heavier than linear or cubic
+/// interpolation, and not remarkably better than cubic algorithm. Thus mostly
+/// for experimental purposes
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateShannon.cpp 195 2014-04-06 15:57:21Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include "InterpolateShannon.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+
+/// Kaiser window with beta = 2.0
+/// Values scaled down by 5% to avoid overflows
+static const double _kaiser8[8] = 
+{
+   0.41778693317814,
+   0.64888025049173,
+   0.83508562409944,
+   0.93887857733412,
+   0.93887857733412,
+   0.83508562409944,
+   0.64888025049173,
+   0.41778693317814
+};
+
+
+InterpolateShannon::InterpolateShannon()
+{
+    fract = 0;
+}
+
+
+void InterpolateShannon::resetRegisters()
+{
+    fract = 0;
+}
+
+
+#define PI 3.1415926536
+#define sinc(x) (sin(PI * (x)) / (PI * (x)))
+
+/// Transpose mono audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeMono(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 8;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        double out;
+        assert(fract < 1.0);
+
+        out  = psrc[0] * sinc(-3.0 - fract) * _kaiser8[0];
+        out += psrc[1] * sinc(-2.0 - fract) * _kaiser8[1];
+        out += psrc[2] * sinc(-1.0 - fract) * _kaiser8[2];
+        if (fract < 1e-6)
+        {
+            out += psrc[3] * _kaiser8[3];     // sinc(0) = 1
+        }
+        else
+        {
+            out += psrc[3] * sinc(- fract) * _kaiser8[3];
+        }
+        out += psrc[4] * sinc( 1.0 - fract) * _kaiser8[4];
+        out += psrc[5] * sinc( 2.0 - fract) * _kaiser8[5];
+        out += psrc[6] * sinc( 3.0 - fract) * _kaiser8[6];
+        out += psrc[7] * sinc( 4.0 - fract) * _kaiser8[7];
+
+        pdest[i] = (SAMPLETYPE)out;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        psrc += whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeStereo(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    int i;
+    int srcSampleEnd = srcSamples - 8;
+    int srcCount = 0;
+
+    i = 0;
+    while (srcCount < srcSampleEnd)
+    {
+        double out0, out1, w;
+        assert(fract < 1.0);
+
+        w = sinc(-3.0 - fract) * _kaiser8[0];
+        out0 = psrc[0] * w; out1 = psrc[1] * w;
+        w = sinc(-2.0 - fract) * _kaiser8[1];
+        out0 += psrc[2] * w; out1 += psrc[3] * w;
+        w = sinc(-1.0 - fract) * _kaiser8[2];
+        out0 += psrc[4] * w; out1 += psrc[5] * w;
+        w = _kaiser8[3] * ((fract < 1e-5) ? 1.0 : sinc(- fract));   // sinc(0) = 1
+        out0 += psrc[6] * w; out1 += psrc[7] * w;
+        w = sinc( 1.0 - fract) * _kaiser8[4];
+        out0 += psrc[8] * w; out1 += psrc[9] * w;
+        w = sinc( 2.0 - fract) * _kaiser8[5];
+        out0 += psrc[10] * w; out1 += psrc[11] * w;
+        w = sinc( 3.0 - fract) * _kaiser8[6];
+        out0 += psrc[12] * w; out1 += psrc[13] * w;
+        w = sinc( 4.0 - fract) * _kaiser8[7];
+        out0 += psrc[14] * w; out1 += psrc[15] * w;
+
+        pdest[2*i]   = (SAMPLETYPE)out0;
+        pdest[2*i+1] = (SAMPLETYPE)out1;
+        i ++;
+
+        // update position fraction
+        fract += rate;
+        // update whole positions
+        int whole = (int)fract;
+        fract -= whole;
+        psrc += 2*whole;
+        srcCount += whole;
+    }
+    srcSamples = srcCount;
+    return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeMulti(SAMPLETYPE *pdest, 
+                    const SAMPLETYPE *psrc, 
+                    int &srcSamples)
+{
+    // not implemented
+    assert(false);
+    return 0;
+}
diff --git a/Externals/soundtouch/InterpolateShannon.h b/Externals/soundtouch/InterpolateShannon.h
new file mode 100644
index 0000000000..701640f7db
--- /dev/null
+++ b/Externals/soundtouch/InterpolateShannon.h
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample interpolation routine using 8-tap band-limited Shannon interpolation 
+/// with kaiser window.
+///
+/// Notice. This algorithm is remarkably much heavier than linear or cubic
+/// interpolation, and not remarkably better than cubic algorithm. Thus mostly
+/// for experimental purposes
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// $Id: InterpolateShannon.h 179 2014-01-06 18:41:42Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateShannon_H_
+#define _InterpolateShannon_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class InterpolateShannon : public TransposerBase
+{
+protected:
+    void resetRegisters();
+    int transposeMono(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    int transposeStereo(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    int transposeMulti(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+
+    float fract;
+
+public:
+    InterpolateShannon();
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/PeakFinder.cpp b/Externals/soundtouch/PeakFinder.cpp
index 0426b4a677..0479910131 100644
--- a/Externals/soundtouch/PeakFinder.cpp
+++ b/Externals/soundtouch/PeakFinder.cpp
@@ -11,7 +11,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-12-28 19:52:47 +0000 (Fri, 28 Dec 2012) $
+// Last changed  : $Date: 2012-12-29 06:52:47 +1100 (Sat, 29 Dec 2012) $
 // File revision : $Revision: 4 $
 //
 // $Id: PeakFinder.cpp 164 2012-12-28 19:52:47Z oparviai $
diff --git a/Externals/soundtouch/PeakFinder.h b/Externals/soundtouch/PeakFinder.h
index e94a554ed3..b00a2a8206 100644
--- a/Externals/soundtouch/PeakFinder.h
+++ b/Externals/soundtouch/PeakFinder.h
@@ -9,7 +9,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2011-12-30 20:33:46 +0000 (Fri, 30 Dec 2011) $
+// Last changed  : $Date: 2011-12-31 07:33:46 +1100 (Sat, 31 Dec 2011) $
 // File revision : $Revision: 4 $
 //
 // $Id: PeakFinder.h 132 2011-12-30 20:33:46Z oparviai $
diff --git a/Externals/soundtouch/RateTransposer.cpp b/Externals/soundtouch/RateTransposer.cpp
index 4944c4bf4e..5af10082b1 100644
--- a/Externals/soundtouch/RateTransposer.cpp
+++ b/Externals/soundtouch/RateTransposer.cpp
@@ -10,10 +10,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-14 17:34:33 +0000 (Fri, 14 Jun 2013) $
+// Last changed  : $Date: 2014-04-07 01:57:21 +1000 (Mon, 07 Apr 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: RateTransposer.cpp 172 2013-06-14 17:34:33Z oparviai $
+// $Id: RateTransposer.cpp 195 2014-04-06 15:57:21Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -43,95 +43,25 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "RateTransposer.h"
+#include "InterpolateLinear.h"
+#include "InterpolateCubic.h"
+#include "InterpolateShannon.h"
 #include "AAFilter.h"
 
 using namespace soundtouch;
 
-
-/// A linear samplerate transposer class that uses integer arithmetics.
-/// for the transposing.
-class RateTransposerInteger : public RateTransposer
-{
-protected:
-    int iSlopeCount;
-    int iRate;
-    SAMPLETYPE *sPrevSample;
-
-    virtual void resetRegisters();
-
-    virtual int transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples);
-    virtual int transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples);
-    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples);
-public:
-    RateTransposerInteger();
-    virtual ~RateTransposerInteger();
-
-    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
-    /// rate, larger faster rates.
-    virtual void setRate(float newRate);
-
-};
-
-
-/// A linear samplerate transposer class that uses floating point arithmetics
-/// for the transposing.
-class RateTransposerFloat : public RateTransposer
-{
-protected:
-    float fSlopeCount;
-    SAMPLETYPE *sPrevSample;
-
-    virtual void resetRegisters();
-
-    virtual int transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples);
-    virtual int transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples);
-    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples);
-
-public:
-    RateTransposerFloat();
-    virtual ~RateTransposerFloat();
-};
-
-
-
-
-// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-// depending on if we've a MMX/SSE/etc-capable CPU available or not.
-void * RateTransposer::operator new(size_t s)
-{
-    ST_THROW_RT_ERROR("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!");
-    return newInstance();
-}
-
-
-RateTransposer *RateTransposer::newInstance()
-{
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-    return ::new RateTransposerInteger;
-#else
-    return ::new RateTransposerFloat;
-#endif
-}
+// Define default interpolation algorithm here
+TransposerBase::ALGORITHM TransposerBase::algorithm = TransposerBase::CUBIC;
 
 
 // Constructor
 RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
 {
-    numChannels = 2;
-    bUseAAFilter = TRUE;
-    fRate = 0;
+    bUseAAFilter = true;
 
-    // Instantiates the anti-alias filter with default tap length
-    // of 32
-    pAAFilter = new AAFilter(32);
+    // Instantiates the anti-alias filter
+    pAAFilter = new AAFilter(64);
+    pTransposer = TransposerBase::newInstance();
 }
 
 
@@ -139,19 +69,20 @@ RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
 RateTransposer::~RateTransposer()
 {
     delete pAAFilter;
+    delete pTransposer;
 }
 
 
 
 /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
-void RateTransposer::enableAAFilter(BOOL newMode)
+void RateTransposer::enableAAFilter(bool newMode)
 {
     bUseAAFilter = newMode;
 }
 
 
 /// Returns nonzero if anti-alias filter is enabled.
-BOOL RateTransposer::isAAFilterEnabled() const
+bool RateTransposer::isAAFilterEnabled() const
 {
     return bUseAAFilter;
 }
@@ -170,7 +101,7 @@ void RateTransposer::setRate(float newRate)
 {
     double fCutoff;
 
-    fRate = newRate;
+    pTransposer->setRate(newRate);
 
     // design a new anti-alias filter
     if (newRate > 1.0f) 
@@ -185,22 +116,6 @@ void RateTransposer::setRate(float newRate)
 }
 
 
-// Outputs as many samples of the 'outputBuffer' as possible, and if there's
-// any room left, outputs also as many of the incoming samples as possible.
-// The goal is to drive the outputBuffer empty.
-//
-// It's allowed for 'output' and 'input' parameters to point to the same
-// memory position.
-/*
-void RateTransposer::flushStoreBuffer()
-{
-    if (storeBuffer.isEmpty()) return;
-
-    outputBuffer.moveSamples(storeBuffer);
-}
-*/
-
-
 // Adds 'nSamples' pcs of samples from the 'samples' memory position into
 // the input of the object.
 void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples)
@@ -209,70 +124,6 @@ void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples)
 }
 
 
-
-// Transposes up the sample rate, causing the observed playback 'rate' of the
-// sound to decrease
-void RateTransposer::upsample(const SAMPLETYPE *src, uint nSamples)
-{
-    uint count, sizeTemp, num;
-
-    // If the parameter 'uRate' value is smaller than 'SCALE', first transpose
-    // the samples and then apply the anti-alias filter to remove aliasing.
-
-    // First check that there's enough room in 'storeBuffer' 
-    // (+16 is to reserve some slack in the destination buffer)
-    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
-
-    // Transpose the samples, store the result into the end of "storeBuffer"
-    count = transpose(storeBuffer.ptrEnd(sizeTemp), src, nSamples);
-    storeBuffer.putSamples(count);
-
-    // Apply the anti-alias filter to samples in "store output", output the
-    // result to "dest"
-    num = storeBuffer.numSamples();
-    count = pAAFilter->evaluate(outputBuffer.ptrEnd(num), 
-        storeBuffer.ptrBegin(), num, (uint)numChannels);
-    outputBuffer.putSamples(count);
-
-    // Remove the processed samples from "storeBuffer"
-    storeBuffer.receiveSamples(count);
-}
-
-
-// Transposes down the sample rate, causing the observed playback 'rate' of the
-// sound to increase
-void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples)
-{
-    uint count, sizeTemp;
-
-    // If the parameter 'uRate' value is larger than 'SCALE', first apply the
-    // anti-alias filter to remove high frequencies (prevent them from folding
-    // over the lover frequencies), then transpose.
-
-    // Add the new samples to the end of the storeBuffer
-    storeBuffer.putSamples(src, nSamples);
-
-    // Anti-alias filter the samples to prevent folding and output the filtered 
-    // data to tempBuffer. Note : because of the FIR filter length, the
-    // filtering routine takes in 'filter_length' more samples than it outputs.
-    assert(tempBuffer.isEmpty());
-    sizeTemp = storeBuffer.numSamples();
-
-    count = pAAFilter->evaluate(tempBuffer.ptrEnd(sizeTemp), 
-        storeBuffer.ptrBegin(), sizeTemp, (uint)numChannels);
-
-    if (count == 0) return;
-
-    // Remove the filtered samples from 'storeBuffer'
-    storeBuffer.receiveSamples(count);
-
-    // Transpose the samples (+16 is to reserve some slack in the destination buffer)
-    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
-    count = transpose(outputBuffer.ptrEnd(sizeTemp), tempBuffer.ptrBegin(), count);
-    outputBuffer.putSamples(count);
-}
-
-
 // Transposes sample rate by applying anti-alias filter to prevent folding. 
 // Returns amount of samples returned in the "dest" buffer.
 // The maximum amount of samples that can be returned at a time is set by
@@ -280,51 +131,45 @@ void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples)
 void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples)
 {
     uint count;
-    uint sizeReq;
 
     if (nSamples == 0) return;
-    assert(pAAFilter);
+
+    // Store samples to input buffer
+    inputBuffer.putSamples(src, nSamples);
 
     // If anti-alias filter is turned off, simply transpose without applying
     // the filter
-    if (bUseAAFilter == FALSE) 
+    if (bUseAAFilter == false) 
     {
-        sizeReq = (uint)((float)nSamples / fRate + 1.0f);
-        count = transpose(outputBuffer.ptrEnd(sizeReq), src, nSamples);
-        outputBuffer.putSamples(count);
+        count = pTransposer->transpose(outputBuffer, inputBuffer);
         return;
     }
 
+    assert(pAAFilter);
+
     // Transpose with anti-alias filter
-    if (fRate < 1.0f) 
+    if (pTransposer->rate < 1.0f) 
     {
-        upsample(src, nSamples);
+        // If the parameter 'Rate' value is smaller than 1, first transpose
+        // the samples and then apply the anti-alias filter to remove aliasing.
+
+        // Transpose the samples, store the result to end of "midBuffer"
+        pTransposer->transpose(midBuffer, inputBuffer);
+
+        // Apply the anti-alias filter for transposed samples in midBuffer
+        pAAFilter->evaluate(outputBuffer, midBuffer);
     } 
     else  
     {
-        downsample(src, nSamples);
-    }
-}
+        // If the parameter 'Rate' value is larger than 1, first apply the
+        // anti-alias filter to remove high frequencies (prevent them from folding
+        // over the lover frequencies), then transpose.
 
+        // Apply the anti-alias filter for samples in inputBuffer
+        pAAFilter->evaluate(midBuffer, inputBuffer);
 
-// Transposes the sample rate of the given samples using linear interpolation. 
-// Returns the number of samples returned in the "dest" buffer
-inline int RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-#ifndef USE_MULTICH_ALWAYS
-    if (numChannels == 1)
-    {
-        return transposeMono(dest, src, nSamples);
-    }
-    else if (numChannels == 2) 
-    {
-        return transposeStereo(dest, src, nSamples);
-    } 
-    else 
-#endif // USE_MULTICH_ALWAYS
-    {
-        assert(numChannels > 0);
-        return transposeMulti(dest, src, nSamples);
+        // Transpose the AA-filtered samples in "midBuffer"
+        pTransposer->transpose(outputBuffer, midBuffer);
     }
 }
 
@@ -333,17 +178,13 @@ inline int RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, ui
 void RateTransposer::setChannels(int nChannels)
 {
     assert(nChannels > 0);
-    if (numChannels == nChannels) return;
 
-//    assert(nChannels == 1 || nChannels == 2);
-    numChannels = nChannels;
+    if (pTransposer->numChannels == nChannels) return;
+    pTransposer->setChannels(nChannels);
 
-    storeBuffer.setChannels(numChannels);
-    tempBuffer.setChannels(numChannels);
-    outputBuffer.setChannels(numChannels);
-
-    // Inits the linear interpolation registers
-    resetRegisters();
+    inputBuffer.setChannels(nChannels);
+    midBuffer.setChannels(nChannels);
+    outputBuffer.setChannels(nChannels);
 }
 
 
@@ -351,7 +192,8 @@ void RateTransposer::setChannels(int nChannels)
 void RateTransposer::clear()
 {
     outputBuffer.clear();
-    storeBuffer.clear();
+    midBuffer.clear();
+    inputBuffer.clear();
 }
 
 
@@ -362,387 +204,99 @@ int RateTransposer::isEmpty() const
 
     res = FIFOProcessor::isEmpty();
     if (res == 0) return 0;
-    return storeBuffer.isEmpty();
+    return inputBuffer.isEmpty();
 }
 
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// RateTransposerInteger - integer arithmetic implementation
+// TransposerBase - Base class for interpolation
 // 
 
-/// fixed-point interpolation routine precision
-#define SCALE    65536
-
-// Constructor
-RateTransposerInteger::RateTransposerInteger() : RateTransposer()
+// static function to set interpolation algorithm
+void TransposerBase::setAlgorithm(TransposerBase::ALGORITHM a)
 {
-    // Notice: use local function calling syntax for sake of clarity, 
-    // to indicate the fact that C++ constructor can't call virtual functions.
-    sPrevSample=0;
-    RateTransposerInteger::resetRegisters();
-    RateTransposerInteger::setRate(1.0f);
-}
-
-
-RateTransposerInteger::~RateTransposerInteger()
-{
-    if (sPrevSample) delete[] sPrevSample;
-}
-
-
-void RateTransposerInteger::resetRegisters()
-{
-    iSlopeCount = 0;
-    delete[] sPrevSample;
-    sPrevSample = new SAMPLETYPE[numChannels];
-    memset(sPrevSample, 0, numChannels * sizeof(SAMPLETYPE));
-}
-
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-int RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    int i, remain;
-    LONG_SAMPLETYPE temp, vol1;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    remain = nSamples - 1;
-    i = 0;
-
-    // Process the last sample saved from the previous call first...
-    while (iSlopeCount <= SCALE) 
-    {
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = vol1 * sPrevSample[0] + iSlopeCount * src[0];
-        dest[i] = (SAMPLETYPE)(temp / SCALE);
-        i++;
-        iSlopeCount += iRate;
-    }
-    // now always (iSlopeCount > SCALE)
-    iSlopeCount -= SCALE;
-
-    while (1)
-    {
-        while (iSlopeCount > SCALE) 
-        {
-            iSlopeCount -= SCALE;
-            src ++;
-            remain --;
-            if (remain == 0) goto end;
-        }
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = src[0] * vol1 + iSlopeCount * src[1];
-        dest[i] = (SAMPLETYPE)(temp / SCALE);
-
-        i++;
-        iSlopeCount += iRate;
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSample[0] = src[0];
-
-    return i;
+    TransposerBase::algorithm = a;
 }
 
 
 // Transposes the sample rate of the given samples using linear interpolation. 
-// 'Stereo' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-int RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+// Returns the number of samples returned in the "dest" buffer
+int TransposerBase::transpose(FIFOSampleBuffer &dest, FIFOSampleBuffer &src)
 {
-    int i, remain;
-    LONG_SAMPLETYPE temp, vol1;
+    int numSrcSamples = src.numSamples();
+    int sizeDemand = (int)((float)numSrcSamples / rate) + 8;
+    int numOutput;
+    SAMPLETYPE *psrc = src.ptrBegin();
+    SAMPLETYPE *pdest = dest.ptrEnd(sizeDemand);
 
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    remain = nSamples - 1;
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (iSlopeCount <= SCALE) 
+#ifndef USE_MULTICH_ALWAYS
+    if (numChannels == 1)
     {
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = vol1 * sPrevSample[0] + iSlopeCount * src[0];
-        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
-        temp = vol1 * sPrevSample[1] + iSlopeCount * src[1];
-        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
-        i++;
-        iSlopeCount += iRate;
+        numOutput = transposeMono(pdest, psrc, numSrcSamples);
     }
-    // now always (iSlopeCount > SCALE)
-    iSlopeCount -= SCALE;
-
-    while (1)
+    else if (numChannels == 2) 
     {
-        while (iSlopeCount > SCALE) 
-        {
-            iSlopeCount -= SCALE;
-            remain --;
-            src += 2;
-            if (remain == 0) goto end;
-        }
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = src[0] * vol1 + iSlopeCount * src[2];
-        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
-        temp = src[1] * vol1 + iSlopeCount * src[3];
-        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
-
-        i++;
-        iSlopeCount += iRate;
+        numOutput = transposeStereo(pdest, psrc, numSrcSamples);
+    } 
+    else 
+#endif // USE_MULTICH_ALWAYS
+    {
+        assert(numChannels > 0);
+        numOutput = transposeMulti(pdest, psrc, numSrcSamples);
     }
-end:
-    // Store the last sample for the next round
-    sPrevSample[0] = src[0];
-    sPrevSample[1] = src[1];
-
-    return i;
+    dest.putSamples(numOutput);
+    src.receiveSamples(numSrcSamples);
+    return numOutput;
 }
 
 
-int RateTransposerInteger::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+TransposerBase::TransposerBase()
 {
-    int i, remaining;
-    LONG_SAMPLETYPE temp, vol1;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    remaining = nSamples - 1;
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (iSlopeCount <= SCALE)
-    {
-        for (int c = 0; c < numChannels; c ++)
-        {
-            vol1 = (SCALE - iSlopeCount);
-            temp = vol1 * sPrevSample[c] + iSlopeCount * src[c];
-            *dest = (SAMPLETYPE)(temp / SCALE);
-            dest ++;
-        }
-        i++;
-
-        iSlopeCount += iRate;
-    }
-    // now always (iSlopeCount > SCALE)
-    iSlopeCount -= SCALE;
-
-    while (1)
-    {
-        while (iSlopeCount > SCALE) 
-        {
-            iSlopeCount -= SCALE;
-            src += numChannels;
-            remaining --;
-            if (remaining == 0) goto end;
-        }
-
-        for (int c = 0; c < numChannels; c ++)
-        {
-            vol1 = (SCALE - iSlopeCount);
-            temp = src[c] * vol1 + iSlopeCount * src[c + numChannels];
-            *dest = (SAMPLETYPE)(temp / SCALE);
-            dest++;
-        }
-
-        i++;
-        iSlopeCount += iRate;
-    }
-end:
-    // Store the last sample for the next round
-    memcpy(sPrevSample, src, numChannels * sizeof(SAMPLETYPE));
-
-    return i;
-}
-
-// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
-// iRate, larger faster iRates.
-void RateTransposerInteger::setRate(float newRate)
-{
-    iRate = (int)(newRate * SCALE + 0.5f);
-    RateTransposer::setRate(newRate);
+    numChannels = 0;
+    rate = 1.0f;
 }
 
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// RateTransposerFloat - floating point arithmetic implementation
-// 
-//////////////////////////////////////////////////////////////////////////////
-
-// Constructor
-RateTransposerFloat::RateTransposerFloat() : RateTransposer()
+TransposerBase::~TransposerBase()
 {
-    // Notice: use local function calling syntax for sake of clarity, 
-    // to indicate the fact that C++ constructor can't call virtual functions.
-    sPrevSample = NULL;
-    RateTransposerFloat::resetRegisters();
-    RateTransposerFloat::setRate(1.0f);
 }
 
 
-RateTransposerFloat::~RateTransposerFloat()
+void TransposerBase::setChannels(int channels)
 {
-    delete[] sPrevSample;
+    numChannels = channels;
+    resetRegisters();
 }
 
 
-void RateTransposerFloat::resetRegisters()
+void TransposerBase::setRate(float newRate)
 {
-    fSlopeCount = 0;
-    delete[] sPrevSample;
-    sPrevSample = new SAMPLETYPE[numChannels];
-    memset(sPrevSample, 0, numChannels * sizeof(SAMPLETYPE));
+    rate = newRate;
 }
 
 
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-int RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+// static factory function
+TransposerBase *TransposerBase::newInstance()
 {
-    int i, remain;
-
-    remain = 0;
-    i = 0;
-
-    // Process the last sample saved from the previous call first...
-    while (fSlopeCount <= 1.0f) 
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+    // Notice: For integer arithmetics support only linear algorithm (due to simplest calculus)
+    return ::new InterpolateLinearInteger;
+#else
+    switch (algorithm)
     {
-        dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[0] + fSlopeCount * src[0]);
-        i++;
-        fSlopeCount += fRate;
-    }
-    fSlopeCount -= 1.0f;
+        case LINEAR:
+            return new InterpolateLinearFloat;
 
-    if (nSamples > 1)
-    {
-        while (1)
-        {
-            while (fSlopeCount > 1.0f) 
-            {
-                fSlopeCount -= 1.0f;
-                src ++;
-                remain --;
-                if (remain == 0) goto end;
-            }
-            dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[0] + fSlopeCount * src[1]);
-            i++;
-            fSlopeCount += fRate;
-        }
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSample[0] = src[0];
+        case CUBIC:
+            return new InterpolateCubic;
 
-    return i;
-}
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-int RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    int i, remain;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    remain = nSamples - 1;
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (fSlopeCount <= 1.0f) 
-    {
-        dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[0] + fSlopeCount * src[0]);
-        dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[1] + fSlopeCount * src[1]);
-        i++;
-        fSlopeCount += fRate;
-    }
-    // now always (iSlopeCount > 1.0f)
-    fSlopeCount -= 1.0f;
-
-    if (nSamples > 1)
-    {
-        while (1)
-        {
-            while (fSlopeCount > 1.0f) 
-            {
-                fSlopeCount -= 1.0f;
-                remain --;
-                src += 2;
-                if (remain == 0) goto end;
-            }
-
-            dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[0] 
-                + fSlopeCount * src[2]);
-            dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[1] 
-                + fSlopeCount * src[3]);
-
-            i++;
-            fSlopeCount += fRate;
-        }
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSample[0] = src[0];
-    sPrevSample[1] = src[1];
-
-    return i;
-}
-
-int RateTransposerFloat::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    int i, remaining;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    remaining = nSamples - 1;
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (fSlopeCount <= 1.0f) 
-    {
-        for (int c = 0; c < numChannels; c ++)
-        {
-            *dest = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[c] + fSlopeCount * src[c]);
-            dest ++;
-        }
-        i++;
-        fSlopeCount += fRate;
-    }
-    // now always (iSlopeCount > 1.0f)
-    fSlopeCount -= 1.0f;
-
-    while (remaining > 0)
-    {
-        while (fSlopeCount > 1.0f) 
-        {
-            fSlopeCount -= 1.0f;
-            src += numChannels;
-            remaining --;
-            if (remaining == 0) goto end;
-        }
-
-        for (int c = 0; c < numChannels; c ++)
-        {
-            *dest = (SAMPLETYPE)((1.0f - fSlopeCount) * src[c] 
-                + fSlopeCount * src[c + numChannels]);
-            dest++;
-        }
-
-        i++;
-        fSlopeCount += fRate;
-    }
-
-end:
-    // Store the last sample for the next round
-    memcpy(sPrevSample, src, numChannels * sizeof(SAMPLETYPE));
-
-    return i;
+        case SHANNON:
+            return new InterpolateShannon;
+
+        default:
+            assert(false);
+            return NULL;
+    }
+#endif
 }
diff --git a/Externals/soundtouch/RateTransposer.h b/Externals/soundtouch/RateTransposer.h
index 81cf28ba23..caf97ed540 100644
--- a/Externals/soundtouch/RateTransposer.h
+++ b/Externals/soundtouch/RateTransposer.h
@@ -14,10 +14,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// Last changed  : $Date: 2014-04-07 01:57:21 +1000 (Mon, 07 Apr 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: RateTransposer.h 171 2013-06-12 15:24:44Z oparviai $
+// $Id: RateTransposer.h 195 2014-04-06 15:57:21Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -55,51 +55,71 @@
 namespace soundtouch
 {
 
+/// Abstract base class for transposer implementations (linear, advanced vs integer, float etc)
+class TransposerBase
+{
+public:
+        enum ALGORITHM {
+        LINEAR = 0,
+        CUBIC,
+        SHANNON
+    };
+
+protected:
+    virtual void resetRegisters() = 0;
+
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples)  = 0;
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples) = 0;
+    virtual int transposeMulti(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples) = 0;
+
+    static ALGORITHM algorithm;
+
+public:
+    float rate;
+    int numChannels;
+
+    TransposerBase();
+    virtual ~TransposerBase();
+
+    virtual int transpose(FIFOSampleBuffer &dest, FIFOSampleBuffer &src);
+    virtual void setRate(float newRate);
+    virtual void setChannels(int channels);
+
+    // static factory function
+    static TransposerBase *newInstance();
+
+    // static function to set interpolation algorithm
+    static void setAlgorithm(ALGORITHM a);
+};
+
+
 /// A common linear samplerate transposer class.
 ///
-/// Note: Use function "RateTransposer::newInstance()" to create a new class 
-/// instance instead of the "new" operator; that function automatically 
-/// chooses a correct implementation depending on if integer or floating 
-/// arithmetics are to be used.
 class RateTransposer : public FIFOProcessor
 {
 protected:
     /// Anti-alias filter object
     AAFilter *pAAFilter;
-
-    float fRate;
-
-    int numChannels;
+    TransposerBase *pTransposer;
 
     /// Buffer for collecting samples to feed the anti-alias filter between
     /// two batches
-    FIFOSampleBuffer storeBuffer;
+    FIFOSampleBuffer inputBuffer;
 
     /// Buffer for keeping samples between transposing & anti-alias filter
-    FIFOSampleBuffer tempBuffer;
+    FIFOSampleBuffer midBuffer;
 
     /// Output sample buffer
     FIFOSampleBuffer outputBuffer;
 
-    BOOL bUseAAFilter;
+    bool bUseAAFilter;
 
-    virtual void resetRegisters() = 0;
-
-    virtual int transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples) = 0;
-    virtual int transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples) = 0;
-    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) = 0;
-    inline int transpose(SAMPLETYPE *dest, 
-                   const SAMPLETYPE *src, 
-                   uint numSamples);
-
-    void downsample(const SAMPLETYPE *src, 
-                    uint numSamples);
-    void upsample(const SAMPLETYPE *src, 
-                 uint numSamples);
 
     /// Transposes sample rate by applying anti-alias filter to prevent folding. 
     /// Returns amount of samples returned in the "dest" buffer.
@@ -108,34 +128,33 @@ protected:
     void processSamples(const SAMPLETYPE *src, 
                         uint numSamples);
 
-
 public:
     RateTransposer();
     virtual ~RateTransposer();
 
     /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
     /// depending on if we're to use integer or floating point arithmetics.
-    static void *operator new(size_t s);
+//    static void *operator new(size_t s);
 
     /// Use this function instead of "new" operator to create a new instance of this class. 
     /// This function automatically chooses a correct implementation, depending on if 
     /// integer ot floating point arithmetics are to be used.
-    static RateTransposer *newInstance();
+//    static RateTransposer *newInstance();
 
     /// Returns the output buffer object
     FIFOSamplePipe *getOutput() { return &outputBuffer; };
 
     /// Returns the store buffer object
-    FIFOSamplePipe *getStore() { return &storeBuffer; };
+//    FIFOSamplePipe *getStore() { return &storeBuffer; };
 
     /// Return anti-alias filter object
     AAFilter *getAAFilter();
 
     /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
-    void enableAAFilter(BOOL newMode);
+    void enableAAFilter(bool newMode);
 
     /// Returns nonzero if anti-alias filter is enabled.
-    BOOL isAAFilterEnabled() const;
+    bool isAAFilterEnabled() const;
 
     /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
     /// rate, larger faster rates.
diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp
index 7c35d86697..94a2b23956 100644
--- a/Externals/soundtouch/SoundTouch.cpp
+++ b/Externals/soundtouch/SoundTouch.cpp
@@ -41,10 +41,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// Last changed  : $Date: 2014-04-07 01:57:21 +1000 (Mon, 07 Apr 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: SoundTouch.cpp 171 2013-06-12 15:24:44Z oparviai $
+// $Id: SoundTouch.cpp 195 2014-04-06 15:57:21Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -97,7 +97,7 @@ SoundTouch::SoundTouch()
 {
     // Initialize rate transposer and tempo changer instances
 
-    pRateTransposer = RateTransposer::newInstance();
+    pRateTransposer = new RateTransposer();
     pTDStretch = TDStretch::newInstance();
 
     setOutPipe(pTDStretch);
@@ -111,7 +111,7 @@ SoundTouch::SoundTouch()
     calcEffectiveRateAndTempo();
 
     channels = 0;
-    bSrateSet = FALSE;
+    bSrateSet = false;
 }
 
 
@@ -255,7 +255,7 @@ void SoundTouch::calcEffectiveRateAndTempo()
             tempoOut = pTDStretch->getOutput();
             tempoOut->moveSamples(*output);
             // move samples in pitch transposer's store buffer to tempo changer's input
-            pTDStretch->moveSamples(*pRateTransposer->getStore());
+            // deprecated : pTDStretch->moveSamples(*pRateTransposer->getStore());
 
             output = pTDStretch;
         }
@@ -283,7 +283,7 @@ void SoundTouch::calcEffectiveRateAndTempo()
 // Sets sample rate.
 void SoundTouch::setSampleRate(uint srate)
 {
-    bSrateSet = TRUE;
+    bSrateSet = true;
     // set sample rate, leave other tempo changer parameters as they are.
     pTDStretch->setParameters((int)srate);
 }
@@ -293,7 +293,7 @@ void SoundTouch::setSampleRate(uint srate)
 // the input of the object.
 void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
 {
-    if (bSrateSet == FALSE) 
+    if (bSrateSet == false) 
     {
         ST_THROW_RT_ERROR("SoundTouch : Sample rate not defined");
     } 
@@ -383,13 +383,12 @@ void SoundTouch::flush()
     pTDStretch->clearInput();
     // yet leave the 'tempoChanger' output intouched as that's where the
     // flushed samples are!
-    free(buff);
 }
 
 
 // Changes a setting controlling the processing system behaviour. See the
 // 'SETTING_...' defines for available setting ID's.
-BOOL SoundTouch::setSetting(int settingId, int value)
+bool SoundTouch::setSetting(int settingId, int value)
 {
     int sampleRate, sequenceMs, seekWindowMs, overlapMs;
 
@@ -400,36 +399,36 @@ BOOL SoundTouch::setSetting(int settingId, int value)
     {
         case SETTING_USE_AA_FILTER :
             // enables / disabless anti-alias filter
-            pRateTransposer->enableAAFilter((value != 0) ? TRUE : FALSE);
-            return TRUE;
+            pRateTransposer->enableAAFilter((value != 0) ? true : false);
+            return true;
 
         case SETTING_AA_FILTER_LENGTH :
             // sets anti-alias filter length
             pRateTransposer->getAAFilter()->setLength(value);
-            return TRUE;
+            return true;
 
         case SETTING_USE_QUICKSEEK :
             // enables / disables tempo routine quick seeking algorithm
-            pTDStretch->enableQuickSeek((value != 0) ? TRUE : FALSE);
-            return TRUE;
+            pTDStretch->enableQuickSeek((value != 0) ? true : false);
+            return true;
 
         case SETTING_SEQUENCE_MS:
             // change time-stretch sequence duration parameter
             pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs);
-            return TRUE;
+            return true;
 
         case SETTING_SEEKWINDOW_MS:
             // change time-stretch seek window length parameter
             pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs);
-            return TRUE;
+            return true;
 
         case SETTING_OVERLAP_MS:
             // change time-stretch overlap length parameter
             pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value);
-            return TRUE;
+            return true;
 
         default :
-            return FALSE;
+            return false;
     }
 }
 
diff --git a/Externals/soundtouch/SoundTouch.h b/Externals/soundtouch/SoundTouch.h
index d76a7219fd..445334ca33 100644
--- a/Externals/soundtouch/SoundTouch.h
+++ b/Externals/soundtouch/SoundTouch.h
@@ -79,10 +79,10 @@ namespace soundtouch
 {
 
 /// Soundtouch library version string
-#define SOUNDTOUCH_VERSION          "1.7.2 (dev)"
+#define SOUNDTOUCH_VERSION          "1.8.1 (r198)"
 
 /// SoundTouch library version id
-#define SOUNDTOUCH_VERSION_ID       (10702)
+#define SOUNDTOUCH_VERSION_ID       (10801)
 
 //
 // Available setting IDs for the 'setSetting' & 'get_setting' functions:
@@ -248,7 +248,7 @@ public:
     /// 'SETTING_...' defines for available setting ID's.
     /// 
     /// \return 'TRUE' if the setting was succesfully changed
-    BOOL setSetting(int settingId,   ///< Setting ID number. see SETTING_... defines.
+    bool setSetting(int settingId,   ///< Setting ID number. see SETTING_... defines.
                     int value        ///< New setting value.
                     );
 
diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj
index 70d6d81f65..ebcaba69f1 100644
--- a/Externals/soundtouch/SoundTouch.vcxproj
+++ b/Externals/soundtouch/SoundTouch.vcxproj
@@ -1,340 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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>{68A5DD20-7057-448B-8FE0-B6AC8D205509}</ProjectGuid>
-    <SccProjectName />
-    <SccLocalPath />
+    <ProjectGuid>{EC082900-B4D8-42E9-9663-77F02F6936AE}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </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" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Win64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>Release/SoundTouch.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <ObjectFileName>Release/</ObjectFileName>
-      <ProgramDataBaseFileName>Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Lib>
-      <OutputFile>Win32\SoundTouch.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040b</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>Release/SoundTouch.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <ObjectFileName>Release/</ObjectFileName>
-      <ProgramDataBaseFileName>Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <Lib>
-      <OutputFile>Win64\SoundTouch.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040b</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>Debug/SoundTouch.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <ObjectFileName>Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>Debug/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Lib>
-      <OutputFile>Win32\SoundTouchD.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040b</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>Debug/SoundTouch.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <ObjectFileName>Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>Debug/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Lib>
-      <OutputFile>Win64\SoundTouchD.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040b</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="AAFilter.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="cpu_detect_x86.cpp" />
-    <ClCompile Include="FIFOSampleBuffer.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="FIRFilter.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="mmx_optimized.cpp" />
-    <ClCompile Include="RateTransposer.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SoundTouch.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="sse_optimized.cpp" />
-    <ClCompile Include="TDStretch.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="AAFilter.cpp" />
     <ClCompile Include="BPMDetect.cpp" />
+    <ClCompile Include="cpu_detect_x86.cpp" />
+    <ClCompile Include="FIFOSampleBuffer.cpp" />
+    <ClCompile Include="FIRFilter.cpp" />
+    <ClCompile Include="InterpolateCubic.cpp" />
+    <ClCompile Include="InterpolateLinear.cpp" />
+    <ClCompile Include="InterpolateShannon.cpp" />
+    <ClCompile Include="mmx_optimized.cpp" />
     <ClCompile Include="PeakFinder.cpp" />
+    <ClCompile Include="RateTransposer.cpp" />
+    <ClCompile Include="SoundTouch.cpp" />
+    <ClCompile Include="sse_optimized.cpp" />
+    <ClCompile Include="TDStretch.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AAFilter.h" />
@@ -343,13 +57,19 @@
     <ClInclude Include="FIFOSampleBuffer.h" />
     <ClInclude Include="FIFOSamplePipe.h" />
     <ClInclude Include="FIRFilter.h" />
+    <ClInclude Include="InterpolateCubic.h" />
+    <ClInclude Include="InterpolateLinear.h" />
+    <ClInclude Include="InterpolateShannon.h" />
     <ClInclude Include="PeakFinder.h" />
     <ClInclude Include="RateTransposer.h" />
     <ClInclude Include="SoundTouch.h" />
     <ClInclude Include="STTypes.h" />
     <ClInclude Include="TDStretch.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Externals/soundtouch/SoundTouch.vcxproj.filters b/Externals/soundtouch/SoundTouch.vcxproj.filters
deleted file mode 100644
index 1dee5b2a6e..0000000000
--- a/Externals/soundtouch/SoundTouch.vcxproj.filters
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{b7786182-6345-4203-8b48-39eec5ec85dc}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Source Files\bpm">
-      <UniqueIdentifier>{75380bb9-1e58-4186-a9cd-ec7cd284e6a5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AAFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cpu_detect_x86.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIFOSampleBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FIRFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mmx_optimized.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RateTransposer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SoundTouch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sse_optimized.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TDStretch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPMDetect.cpp">
-      <Filter>Source Files\bpm</Filter>
-    </ClCompile>
-    <ClCompile Include="PeakFinder.cpp">
-      <Filter>Source Files\bpm</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="FIFOSampleBuffer.h" />
-    <ClInclude Include="FIFOSamplePipe.h" />
-    <ClInclude Include="FIRFilter.h" />
-    <ClInclude Include="PeakFinder.h" />
-    <ClInclude Include="RateTransposer.h" />
-    <ClInclude Include="SoundTouch.h" />
-    <ClInclude Include="STTypes.h" />
-    <ClInclude Include="TDStretch.h" />
-    <ClInclude Include="AAFilter.h" />
-    <ClInclude Include="BPMDetect.h" />
-    <ClInclude Include="cpu_detect.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Externals/soundtouch/TDStretch.cpp b/Externals/soundtouch/TDStretch.cpp
index 292404a91a..5a7acf526e 100644
--- a/Externals/soundtouch/TDStretch.cpp
+++ b/Externals/soundtouch/TDStretch.cpp
@@ -13,10 +13,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-14 17:34:33 +0000 (Fri, 14 Jun 2013) $
+// Last changed  : $Date: 2014-04-07 01:57:21 +1000 (Mon, 07 Apr 2014) $
 // File revision : $Revision: 1.12 $
 //
-// $Id: TDStretch.cpp 172 2013-06-14 17:34:33Z oparviai $
+// $Id: TDStretch.cpp 195 2014-04-06 15:57:21Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -84,15 +84,15 @@ static const short _scanOffsets[5][24]={
 
 TDStretch::TDStretch() : FIFOProcessor(&outputBuffer)
 {
-    bQuickSeek = FALSE;
+    bQuickSeek = false;
     channels = 2;
 
     pMidBuffer = NULL;
     pMidBufferUnaligned = NULL;
     overlapLength = 0;
 
-    bAutoSeqSetting = TRUE;
-    bAutoSeekSetting = TRUE;
+    bAutoSeqSetting = true;
+    bAutoSeekSetting = true;
 
 //    outDebt = 0;
     skipFract = 0;
@@ -132,23 +132,23 @@ void TDStretch::setParameters(int aSampleRate, int aSequenceMS,
     if (aSequenceMS > 0)
     {
         this->sequenceMs = aSequenceMS;
-        bAutoSeqSetting = FALSE;
+        bAutoSeqSetting = false;
     } 
     else if (aSequenceMS == 0)
     {
         // if zero, use automatic setting
-        bAutoSeqSetting = TRUE;
+        bAutoSeqSetting = true;
     }
 
     if (aSeekWindowMS > 0) 
     {
         this->seekWindowMs = aSeekWindowMS;
-        bAutoSeekSetting = FALSE;
+        bAutoSeekSetting = false;
     } 
     else if (aSeekWindowMS == 0) 
     {
         // if zero, use automatic setting
-        bAutoSeekSetting = TRUE;
+        bAutoSeekSetting = true;
     }
 
     calcSeqParameters();
@@ -231,14 +231,14 @@ void TDStretch::clear()
 
 // Enables/disables the quick position seeking algorithm. Zero to disable, nonzero
 // to enable
-void TDStretch::enableQuickSeek(BOOL enable)
+void TDStretch::enableQuickSeek(bool enable)
 {
     bQuickSeek = enable;
 }
 
 
 // Returns nonzero if the quick seeking algorithm is enabled.
-BOOL TDStretch::isQuickSeekEnabled() const
+bool TDStretch::isQuickSeekEnabled() const
 {
     return bQuickSeek;
 }
@@ -293,6 +293,7 @@ int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos)
 {
     int bestOffs;
     double bestCorr, corr;
+    double norm;
     int i;
 
     bestCorr = FLT_MIN;
@@ -300,11 +301,15 @@ int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos)
 
     // Scans for the best correlation value by testing each possible position
     // over the permitted range.
-    for (i = 0; i < seekLength; i ++) 
+    bestCorr = calcCrossCorr(refPos, pMidBuffer, norm);
+    for (i = 1; i < seekLength; i ++) 
     {
         // Calculates correlation value for the mixing position corresponding
-        // to 'i'
-        corr = calcCrossCorr(refPos + channels * i, pMidBuffer);
+        // to 'i'. Now call "calcCrossCorrAccumulate" that is otherwise same as
+        // "calcCrossCorr", but saves time by reusing & updating previously stored 
+        // "norm" value
+        corr = calcCrossCorrAccumulate(refPos + channels * i, pMidBuffer, norm);
+
         // heuristic rule to slightly favour values close to mid of the range
         double tmp = (double)(2 * i - seekLength) / (double)seekLength;
         corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
@@ -352,12 +357,13 @@ int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos)
         j = 0;
         while (_scanOffsets[scanCount][j]) 
         {
+            double norm;
             tempOffset = corrOffset + _scanOffsets[scanCount][j];
             if (tempOffset >= seekLength) break;
 
             // Calculates correlation value for the mixing position corresponding
             // to 'tempOffset'
-            corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer);
+            corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer, norm);
             // heuristic rule to slightly favour values close to mid of the range
             double tmp = (double)(2 * tempOffset - seekLength) / seekLength;
             corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
@@ -729,32 +735,72 @@ void TDStretch::calculateOverlapLength(int aoverlapMs)
 }
 
 
-double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare) const
+double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare, double &norm) const
 {
     long corr;
-    long norm;
+    long lnorm;
     int i;
 
-    corr = norm = 0;
+    corr = lnorm = 0;
     // Same routine for stereo and mono. For stereo, unroll loop for better
     // efficiency and gives slightly better resolution against rounding. 
     // For mono it same routine, just  unrolls loop by factor of 4
     for (i = 0; i < channels * overlapLength; i += 4) 
     {
         corr += (mixingPos[i] * compare[i] + 
-                 mixingPos[i + 1] * compare[i + 1] +
-                 mixingPos[i + 2] * compare[i + 2] + 
+                 mixingPos[i + 1] * compare[i + 1]) >> overlapDividerBits;  // notice: do intermediate division here to avoid integer overflow
+        corr += (mixingPos[i + 2] * compare[i + 2] + 
                  mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits;
-        norm += (mixingPos[i] * mixingPos[i] + 
-                 mixingPos[i + 1] * mixingPos[i + 1] +
-                 mixingPos[i + 2] * mixingPos[i + 2] + 
-                 mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits;
+        lnorm += (mixingPos[i] * mixingPos[i] + 
+                  mixingPos[i + 1] * mixingPos[i + 1]) >> overlapDividerBits; // notice: do intermediate division here to avoid integer overflow
+        lnorm += (mixingPos[i + 2] * mixingPos[i + 2] + 
+                  mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits;
     }
 
     // Normalize result by dividing by sqrt(norm) - this step is easiest 
     // done using floating point operation
-    if (norm == 0) norm = 1;    // to avoid div by zero
-    return (double)corr / sqrt((double)norm);
+    norm = (double)lnorm;
+    return (double)corr / sqrt((norm < 1e-9) ? 1.0 : norm);
+}
+
+
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretch::calcCrossCorrAccumulate(const short *mixingPos, const short *compare, double &norm) const
+{
+    long corr;
+    long lnorm;
+    int i;
+
+    // cancel first normalizer tap from previous round
+    lnorm = 0;
+    for (i = 1; i <= channels; i ++)
+    {
+        lnorm -= (mixingPos[-i] * mixingPos[-i]) >> overlapDividerBits;
+    }
+
+    corr = 0;
+    // Same routine for stereo and mono. For stereo, unroll loop for better
+    // efficiency and gives slightly better resolution against rounding. 
+    // For mono it same routine, just  unrolls loop by factor of 4
+    for (i = 0; i < channels * overlapLength; i += 4) 
+    {
+        corr += (mixingPos[i] * compare[i] + 
+                 mixingPos[i + 1] * compare[i + 1]) >> overlapDividerBits;  // notice: do intermediate division here to avoid integer overflow
+        corr += (mixingPos[i + 2] * compare[i + 2] + 
+                 mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits;
+    }
+
+    // update normalizer with last samples of this round
+    for (int j = 0; j < channels; j ++)
+    {
+        i --;
+        lnorm += (mixingPos[i] * mixingPos[i]) >> overlapDividerBits;
+    }
+    norm += (double)lnorm;
+
+    // Normalize result by dividing by sqrt(norm) - this step is easiest 
+    // done using floating point operation
+    return (double)corr / sqrt((norm < 1e-9) ? 1.0 : norm);
 }
 
 #endif // SOUNDTOUCH_INTEGER_SAMPLES
@@ -834,10 +880,10 @@ void TDStretch::calculateOverlapLength(int overlapInMsec)
 }
 
 
-double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) const
+/// Calculate cross-correlation
+double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare, double &norm) const
 {
     double corr;
-    double norm;
     int i;
 
     corr = norm = 0;
@@ -859,8 +905,43 @@ double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) co
                 mixingPos[i + 3] * mixingPos[i + 3];
     }
 
-    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
-    return corr / sqrt(norm);
+    return corr / sqrt((norm < 1e-9 ? 1.0 : norm));
 }
 
+
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretch::calcCrossCorrAccumulate(const float *mixingPos, const float *compare, double &norm) const
+{
+    double corr;
+    int i;
+
+    corr = 0;
+
+    // cancel first normalizer tap from previous round
+    for (i = 1; i <= channels; i ++)
+    {
+        norm -= mixingPos[-i] * mixingPos[-i];
+    }
+
+    // Same routine for stereo and mono. For Stereo, unroll by factor of 2.
+    // For mono it's same routine yet unrollsd by factor of 4.
+    for (i = 0; i < channels * overlapLength; i += 4) 
+    {
+        corr += mixingPos[i] * compare[i] +
+                mixingPos[i + 1] * compare[i + 1] +
+                mixingPos[i + 2] * compare[i + 2] +
+                mixingPos[i + 3] * compare[i + 3];
+    }
+
+    // update normalizer with last samples of this round
+    for (int j = 0; j < channels; j ++)
+    {
+        i --;
+        norm += mixingPos[i] * mixingPos[i];
+    }
+
+    return corr / sqrt((norm < 1e-9 ? 1.0 : norm));
+}
+
+
 #endif // SOUNDTOUCH_FLOAT_SAMPLES
diff --git a/Externals/soundtouch/TDStretch.h b/Externals/soundtouch/TDStretch.h
index 43610c9d33..aaadee737e 100644
--- a/Externals/soundtouch/TDStretch.h
+++ b/Externals/soundtouch/TDStretch.h
@@ -13,10 +13,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// Last changed  : $Date: 2014-04-07 01:57:21 +1000 (Mon, 07 Apr 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: TDStretch.h 171 2013-06-12 15:24:44Z oparviai $
+// $Id: TDStretch.h 195 2014-04-06 15:57:21Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -125,21 +125,22 @@ protected:
     float skipFract;
     FIFOSampleBuffer outputBuffer;
     FIFOSampleBuffer inputBuffer;
-    BOOL bQuickSeek;
+    bool bQuickSeek;
 
     int sampleRate;
     int sequenceMs;
     int seekWindowMs;
     int overlapMs;
-    BOOL bAutoSeqSetting;
-    BOOL bAutoSeekSetting;
+    bool bAutoSeqSetting;
+    bool bAutoSeekSetting;
 
     void acceptNewOverlapLength(int newOverlapLength);
 
     virtual void clearCrossCorrState();
     void calculateOverlapLength(int overlapMs);
 
-    virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare) const;
+    virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare, double &norm) const;
+    virtual double calcCrossCorrAccumulate(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare, double &norm) const;
 
     virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos);
     virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos);
@@ -194,10 +195,10 @@ public:
 
     /// Enables/disables the quick position seeking algorithm. Zero to disable, 
     /// nonzero to enable
-    void enableQuickSeek(BOOL enable);
+    void enableQuickSeek(bool enable);
 
     /// Returns nonzero if the quick seeking algorithm is enabled.
-    BOOL isQuickSeekEnabled() const;
+    bool isQuickSeekEnabled() const;
 
     /// Sets routine control parameters. These control are certain time constants
     /// defining how the sound is stretched to the desired duration.
@@ -248,7 +249,8 @@ public:
     class TDStretchMMX : public TDStretch
     {
     protected:
-        double calcCrossCorr(const short *mixingPos, const short *compare) const;
+        double calcCrossCorr(const short *mixingPos, const short *compare, double &norm) const;
+        double calcCrossCorrAccumulate(const short *mixingPos, const short *compare, double &norm) const;
         virtual void overlapStereo(short *output, const short *input) const;
         virtual void clearCrossCorrState();
     };
@@ -260,7 +262,8 @@ public:
     class TDStretchSSE : public TDStretch
     {
     protected:
-        double calcCrossCorr(const float *mixingPos, const float *compare) const;
+        double calcCrossCorr(const float *mixingPos, const float *compare, double &norm) const;
+        double calcCrossCorrAccumulate(const float *mixingPos, const float *compare, double &norm) const;
     };
 
 #endif /// SOUNDTOUCH_ALLOW_SSE
diff --git a/Externals/soundtouch/cpu_detect.h b/Externals/soundtouch/cpu_detect.h
index dc285e90fd..7322619dd0 100644
--- a/Externals/soundtouch/cpu_detect.h
+++ b/Externals/soundtouch/cpu_detect.h
@@ -12,7 +12,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2008-02-10 16:26:55 +0000 (Sun, 10 Feb 2008) $
+// Last changed  : $Date: 2008-02-11 03:26:55 +1100 (Mon, 11 Feb 2008) $
 // File revision : $Revision: 4 $
 //
 // $Id: cpu_detect.h 11 2008-02-10 16:26:55Z oparviai $
diff --git a/Externals/soundtouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp
index dff64d0b14..35b5f32c55 100644
--- a/Externals/soundtouch/cpu_detect_x86.cpp
+++ b/Externals/soundtouch/cpu_detect_x86.cpp
@@ -11,10 +11,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-11-08 18:44:37 +0000 (Thu, 08 Nov 2012) $
+// Last changed  : $Date: 2014-01-08 05:24:28 +1100 (Wed, 08 Jan 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: cpu_detect_x86.cpp 159 2012-11-08 18:44:37Z oparviai $
+// $Id: cpu_detect_x86.cpp 183 2014-01-07 18:24:28Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -42,19 +42,20 @@
 #include "cpu_detect.h"
 #include "STTypes.h"
 
+
 #if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
 
-    #if defined(__GNUC__) && defined(__i386__)
-        // gcc
-        #include "cpuid.h"
-    #elif defined(_M_IX86)
-        // windows non-gcc
-        #include <intrin.h>
-        #define bit_MMX     (1 << 23)
-        #define bit_SSE     (1 << 25)
-        #define bit_SSE2    (1 << 26)
-    #endif
+   #if defined(__GNUC__) && defined(__i386__)
+       // gcc
+       #include "cpuid.h"
+   #elif defined(_M_IX86)
+       // windows non-gcc
+       #include <intrin.h>
+   #endif
 
+   #define bit_MMX     (1 << 23)
+   #define bit_SSE     (1 << 25)
+   #define bit_SSE2    (1 << 26)
 #endif
 
 
diff --git a/Externals/soundtouch/mmx_optimized.cpp b/Externals/soundtouch/mmx_optimized.cpp
index 9b1fc1a41d..0ff6addc2f 100644
--- a/Externals/soundtouch/mmx_optimized.cpp
+++ b/Externals/soundtouch/mmx_optimized.cpp
@@ -20,10 +20,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// Last changed  : $Date: 2014-01-08 05:25:40 +1100 (Wed, 08 Jan 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: mmx_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
+// $Id: mmx_optimized.cpp 184 2014-01-07 18:25:40Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -68,7 +68,7 @@ using namespace soundtouch;
 
 
 // Calculates cross correlation of two buffers
-double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const
+double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2, double &dnorm) const
 {
     const __m64 *pVec1, *pVec2;
     __m64 shifter;
@@ -93,19 +93,19 @@ double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const
         // _mm_add_pi32 : 2*32bit add
         // _m_psrad     : 32bit right-shift
 
-        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]),
-                            _mm_madd_pi16(pVec1[1], pVec2[1]));
-        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]),
-                             _mm_madd_pi16(pVec1[1], pVec1[1]));
-        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
-        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
+        temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[1], pVec2[1]), shifter));
+        temp2 = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[1], pVec1[1]), shifter));
+        accu = _mm_add_pi32(accu, temp);
+        normaccu = _mm_add_pi32(normaccu, temp2);
 
-        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]),
-                            _mm_madd_pi16(pVec1[3], pVec2[3]));
-        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]),
-                             _mm_madd_pi16(pVec1[3], pVec1[3]));
-        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
-        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
+        temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[3], pVec2[3]), shifter));
+        temp2 = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[3], pVec1[3]), shifter));
+        accu = _mm_add_pi32(accu, temp);
+        normaccu = _mm_add_pi32(normaccu, temp2);
 
         pVec1 += 4;
         pVec2 += 4;
@@ -125,14 +125,81 @@ double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const
 
     // Normalize result by dividing by sqrt(norm) - this step is easiest 
     // done using floating point operation
-    if (norm == 0) norm = 1;    // to avoid div by zero
+    dnorm = (double)norm;
 
-    return (double)corr / sqrt((double)norm);
+    return (double)corr / sqrt(dnorm < 1e-9 ? 1.0 : dnorm);
     // Note: Warning about the missing EMMS instruction is harmless
     // as it'll be called elsewhere.
 }
 
 
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretchMMX::calcCrossCorrAccumulate(const short *pV1, const short *pV2, double &dnorm) const
+{
+    const __m64 *pVec1, *pVec2;
+    __m64 shifter;
+    __m64 accu;
+    long corr, lnorm;
+    int i;
+   
+    // cancel first normalizer tap from previous round
+    lnorm = 0;
+    for (i = 1; i <= channels; i ++)
+    {
+        lnorm -= (pV1[-i] * pV1[-i]) >> overlapDividerBits;
+    }
+
+    pVec1 = (__m64*)pV1;
+    pVec2 = (__m64*)pV2;
+
+    shifter = _m_from_int(overlapDividerBits);
+    accu = _mm_setzero_si64();
+
+    // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples 
+    // during each round for improved CPU-level parallellization.
+    for (i = 0; i < channels * overlapLength / 16; i ++)
+    {
+        __m64 temp;
+
+        // dictionary of instructions:
+        // _m_pmaddwd   : 4*16bit multiply-add, resulting two 32bits = [a0*b0+a1*b1 ; a2*b2+a3*b3]
+        // _mm_add_pi32 : 2*32bit add
+        // _m_psrad     : 32bit right-shift
+
+        temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[1], pVec2[1]), shifter));
+        accu = _mm_add_pi32(accu, temp);
+
+        temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]), shifter),
+                            _mm_sra_pi32(_mm_madd_pi16(pVec1[3], pVec2[3]), shifter));
+        accu = _mm_add_pi32(accu, temp);
+
+        pVec1 += 4;
+        pVec2 += 4;
+    }
+
+    // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1
+    // and finally store the result into the variable "corr"
+
+    accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32));
+    corr = _m_to_int(accu);
+
+    // Clear MMS state
+    _m_empty();
+
+    // update normalizer with last samples of this round
+    pV1 = (short *)pVec1;
+    for (int j = 1; j <= channels; j ++)
+    {
+        lnorm += (pV1[-j] * pV1[-j]) >> overlapDividerBits;
+    }
+    dnorm += (double)lnorm;
+
+    // Normalize result by dividing by sqrt(norm) - this step is easiest 
+    // done using floating point operation
+    return (double)corr / sqrt((dnorm < 1e-9) ? 1.0 : dnorm);
+}
+
 
 void TDStretchMMX::clearCrossCorrState()
 {
diff --git a/Externals/soundtouch/sse_optimized.cpp b/Externals/soundtouch/sse_optimized.cpp
index f77ea02dd3..2c72514154 100644
--- a/Externals/soundtouch/sse_optimized.cpp
+++ b/Externals/soundtouch/sse_optimized.cpp
@@ -23,10 +23,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// Last changed  : $Date: 2014-01-08 05:25:40 +1100 (Wed, 08 Jan 2014) $
 // File revision : $Revision: 4 $
 //
-// $Id: sse_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
+// $Id: sse_optimized.cpp 184 2014-01-07 18:25:40Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -71,7 +71,7 @@ using namespace soundtouch;
 #include <math.h>
 
 // Calculates cross correlation of two buffers
-double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const
+double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2, double &norm) const
 {
     int i;
     const float *pVec1;
@@ -141,11 +141,10 @@ double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const
 
     // return value = vSum[0] + vSum[1] + vSum[2] + vSum[3]
     float *pvNorm = (float*)&vNorm;
-    double norm = sqrt(pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]);
-    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
+    norm = (pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]);
 
     float *pvSum = (float*)&vSum;
-    return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / norm;
+    return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / sqrt(norm < 1e-9 ? 1.0 : norm);
 
     /* This is approximately corresponding routine in C-language yet without normalization:
     double corr, norm;
@@ -182,6 +181,16 @@ double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const
 }
 
 
+
+double TDStretchSSE::calcCrossCorrAccumulate(const float *pV1, const float *pV2, double &norm) const
+{
+    // call usual calcCrossCorr function because SSE does not show big benefit of 
+    // accumulating "norm" value, and also the "norm" rolling algorithm would get 
+    // complicated due to SSE-specific alignment-vs-nonexact correlation rules.
+    return calcCrossCorr(pV1, pV2, norm);
+}
+
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // implementation of SSE optimized functions of class 'FIRFilter'
diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt
index 5b9891bb11..617a5266c9 100644
--- a/Externals/wxWidgets3/CMakeLists.txt
+++ b/Externals/wxWidgets3/CMakeLists.txt
@@ -1,4 +1,4 @@
-# gtk, msw, osx and shared files as of r70933
+# gtk, msw, osx and shared files as of r75363
 
 set(SRCS_AUI
 	"src/aui/auibar.cpp"
@@ -6,6 +6,7 @@ set(SRCS_AUI
 	"src/aui/dockart.cpp"
 	"src/aui/floatpane.cpp"
 	"src/aui/framemanager.cpp"
+	"src/aui/tabart.cpp"
 	"src/aui/tabmdi.cpp")
 
 set(SRCS_COMMON
@@ -151,6 +152,7 @@ set(SRCS_COMMON
 	#"src/common/memory.cpp"
 	"src/common/menucmn.cpp"
 	"src/common/mimecmn.cpp"
+	"src/common/modalhook.cpp"
 	"src/common/module.cpp"
 	"src/common/mousemanager.cpp"
 	"src/common/msgout.cpp"
@@ -168,6 +170,7 @@ set(SRCS_COMMON
 	"src/common/platinfo.cpp"
 	"src/common/popupcmn.cpp"
 	"src/common/powercmn.cpp"
+	"src/common/preferencescmn.cpp"
 	"src/common/prntbase.cpp"
 	"src/common/process.cpp"
 	"src/common/protocol.cpp"
@@ -216,6 +219,8 @@ set(SRCS_COMMON
 	"src/common/textcmn.cpp"
 	"src/common/textentrycmn.cpp"
 	"src/common/textfile.cpp"
+	"src/common/textmeasurecmn.cpp"
+	"src/common/threadinfo.cpp"
 	"src/common/time.cpp"
 	"src/common/timercmn.cpp"
 	"src/common/timerimpl.cpp"
@@ -236,6 +241,7 @@ set(SRCS_COMMON
 	"src/common/valtext.cpp"
 	"src/common/variant.cpp"
 	#"src/common/webview.cpp"
+	#"src/common/webviewfshandler.cpp"
 	"src/common/wfstream.cpp"
 	"src/common/wincmn.cpp"
 	"src/common/windowid.cpp"
@@ -317,6 +323,7 @@ set(SRCS_GENERIC
 	"src/generic/statusbr.cpp"
 	"src/generic/tabg.cpp"
 	"src/generic/textdlgg.cpp"
+	"src/generic/textmeasure.cpp"
 	"src/generic/timectrlg.cpp"
 	#"src/generic/timer.cpp"
 	"src/generic/tipdlg.cpp"
@@ -333,7 +340,8 @@ set(SRCS_GENERICGTK
 	"src/generic/accel.cpp"
 	"src/generic/icon.cpp"
 	"src/generic/imaglist.cpp"
-	"src/generic/paletteg.cpp")
+	"src/generic/paletteg.cpp"
+	"src/generic/preferencesg.cpp")
 
 set(SRCS_GENERICOSX
 	"src/generic/animateg.cpp"
@@ -345,6 +353,7 @@ set(SRCS_GENERICOSX
 	"src/generic/fontpickerg.cpp")
 
 set(SRCS_GTK
+	"src/aui/tabartgtk.cpp"
 	"src/gtk/aboutdlg.cpp"
 	"src/gtk/animate.cpp"
 	"src/gtk/anybutton.cpp"
@@ -403,6 +412,7 @@ set(SRCS_GTK
 	"src/gtk/nativewin.cpp"
 	"src/gtk/nonownedwnd.cpp"
 	"src/gtk/notebook.cpp"
+	"src/gtk/notifmsg.cpp"
 	"src/gtk/pen.cpp"
 	"src/gtk/popupwin.cpp"
 	#"src/gtk/print.cpp"
@@ -425,6 +435,7 @@ set(SRCS_GTK
 	"src/gtk/taskbar.cpp"
 	"src/gtk/textctrl.cpp"
 	"src/gtk/textentry.cpp"
+	"src/gtk/textmeasure.cpp"
 	"src/gtk/tglbtn.cpp"
 	"src/gtk/timer.cpp"
 	"src/gtk/toolbar.cpp"
@@ -483,6 +494,7 @@ set(SRCS_MSW
 	"src/msw/dragimag.cpp"
 	"src/msw/enhmeta.cpp"
 	"src/msw/evtloop.cpp"
+	#"src/msw/evtloopconsole.cpp"
 	"src/msw/fdrepdlg.cpp"
 	"src/msw/filedlg.cpp"
 	"src/msw/font.cpp"
@@ -533,6 +545,7 @@ set(SRCS_MSW
 	"src/msw/ole/dropsrc.cpp"
 	"src/msw/ole/droptgt.cpp"
 	"src/msw/ole/oleutils.cpp"
+	"src/msw/ole/safearray.cpp"
 	"src/msw/ole/uuid.cpp"
 	"src/msw/ownerdrw.cpp"
 	"src/msw/palette.cpp"
@@ -559,7 +572,7 @@ set(SRCS_MSW
 	"src/msw/sound.cpp"
 	"src/msw/spinbutt.cpp"
 	"src/msw/spinctrl.cpp"
-	#"src/msw/stackwalk.cpp"
+	"src/msw/stackwalk.cpp"
 	"src/msw/statbmp.cpp"
 	"src/msw/statbox.cpp"
 	"src/msw/statline.cpp"
@@ -569,6 +582,7 @@ set(SRCS_MSW
 	"src/msw/taskbar.cpp"
 	"src/msw/textctrl.cpp"
 	"src/msw/textentry.cpp"
+	"src/msw/textmeasure.cpp"
 	"src/msw/tglbtn.cpp"
 	"src/msw/thread.cpp"
 	"src/msw/timectrl.cpp"
@@ -582,6 +596,7 @@ set(SRCS_MSW
 	"src/msw/utils.cpp"
 	"src/msw/utilsexc.cpp"
 	"src/msw/utilsgui.cpp"
+	"src/msw/utilswin.cpp"
 	"src/msw/uxtheme.cpp"
 	"src/msw/version.rc"
 	"src/msw/volume.cpp"
@@ -635,7 +650,6 @@ set(SRCS_OSX
 	"src/osx/slider_osx.cpp"
 	"src/osx/sound_osx.cpp"
 	"src/osx/spinbutt_osx.cpp"
-	"src/osx/spinctrl_osx.cpp"
 	"src/osx/srchctrl_osx.cpp"
 	"src/osx/statbox_osx.cpp"
 	"src/osx/statline_osx.cpp"
@@ -816,11 +830,12 @@ set(SRCS_UNIX
 	#"src/unix/net.cpp"
 	"src/unix/snglinst.cpp"
 	"src/unix/sockunix.cpp"
-	#"src/unix/stackwalk.cpp"
+	"src/unix/stackwalk.cpp"
 	"src/unix/stdpaths.cpp"
 	"src/unix/threadpsx.cpp"
 	"src/unix/timerunx.cpp"
-	"src/unix/utilsunx.cpp")
+	"src/unix/utilsunx.cpp"
+	"src/unix/wakeuppipe.cpp")
 
 set(SRCS_UNIXGTK
 	"src/unix/dialup.cpp"
@@ -846,15 +861,14 @@ set(SRCS
 	${SRCS_COMMON}
 	${SRCS_GENERIC})
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
 	add_definitions(-D__WXOSX_COCOA__)
 	set(SRCS
 		${SRCS}
 		${SRCS_GENERICOSX}
 		${SRCS_OSX}
 		${SRCS_UNIX})
-	include_directories(../libpng)
-	add_subdirectory(../libpng ../libpng)
 	set(LIBS
 		png
 		iconv
@@ -866,8 +880,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		${COREFUND_LIBRARY}
 		${CORESERV_LIBRARY}
 		${IOK_LIBRARY}
+		${OPENGL_LIBRARY}
 		${QUICKTIME_LIBRARY})
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
 	add_definitions(-D__WXGTK__)
 	set(SRCS
 		${SRCS}
@@ -888,8 +904,8 @@ else()
 endif()
 
 add_definitions(-DWXBUILDING)
-add_definitions(-Wno-deprecated-declarations)
-add_definitions(-Wno-shadow)
+# wxWidgets warnings are not our problem.
+add_definitions(-w)
 
 enable_precompiled_headers(include/wx/wxprec.h src/common/dummy.cpp SRCS)
 add_library(wx STATIC ${PNG_SRCS} ${SRCS})
diff --git a/Externals/wxWidgets3/art/addbookm.xpm b/Externals/wxWidgets3/art/addbookm.xpm
index 0b4f695c2c..fb13ff161d 100644
--- a/Externals/wxWidgets3/art/addbookm.xpm
+++ b/Externals/wxWidgets3/art/addbookm.xpm
@@ -1,24 +1,24 @@
-/* XPM */
-static const char *const addbookm_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-". c Black",
-"X c #00C000",
-"  c None",
-/* pixels */
-"        ....... ",
-"        .XXXXX. ",
-"   ..   .XXXXX. ",
-"   ..   .XXXXX. ",
-" ...... .XXXXX. ",
-" ...... .XXXXX. ",
-"   ..   .XXXXX. ",
-"   ..   .XXXXX. ",
-"        .XXXXX. ",
-"        .XXXXX. ",
-"        .XXXXX. ",
-"        .XXXXX. ",
-"        .XX.XX. ",
-"        .X. .X. ",
-"        ..   .. "
-};
+/* XPM */
+static const char *const addbookm_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+". c Black",
+"X c #00C000",
+"  c None",
+/* pixels */
+"        ....... ",
+"        .XXXXX. ",
+"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
+" ...... .XXXXX. ",
+" ...... .XXXXX. ",
+"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
+"        .XXXXX. ",
+"        .XXXXX. ",
+"        .XXXXX. ",
+"        .XXXXX. ",
+"        .XX.XX. ",
+"        .X. .X. ",
+"        ..   .. "
+};
diff --git a/Externals/wxWidgets3/art/back.xpm b/Externals/wxWidgets3/art/back.xpm
index d5c1de519d..38b0f4b7dd 100644
--- a/Externals/wxWidgets3/art/back.xpm
+++ b/Externals/wxWidgets3/art/back.xpm
@@ -1,21 +1,21 @@
-/* XPM */
-static const char *const back_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"      .         ",
-"     ..         ",
-"    .X.         ",
-"   .XX........  ",
-"  .XXXXXXXXXX.  ",
-" .XXXXXXXXXXX.  ",
-" .XXXXXXXXXXX.  ",
-"  .XXXXXXXXXX.  ",
-"   .XX........  ",
-"    .X.         ",
-"     ..         ",
-"      .         ",
-"                "};
+/* XPM */
+static const char *const back_xpm[] = {
+"16 15 3 1",
+" 	c None",
+".	c Black",
+"X	c Gray100",
+"                ",
+"                ",
+"      .         ",
+"     ..         ",
+"    .X.         ",
+"   .XX........  ",
+"  .XXXXXXXXXX.  ",
+" .XXXXXXXXXXX.  ",
+" .XXXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
+"   .XX........  ",
+"    .X.         ",
+"     ..         ",
+"      .         ",
+"                "};
diff --git a/Externals/wxWidgets3/art/cdrom.xpm b/Externals/wxWidgets3/art/cdrom.xpm
index e3bc19b96b..fecc52ec74 100644
--- a/Externals/wxWidgets3/art/cdrom.xpm
+++ b/Externals/wxWidgets3/art/cdrom.xpm
@@ -1,57 +1,57 @@
-/* XPM */
-static const char *const cdrom_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-"= c #9BACC2",
-"y c #547B99",
-"$ c #FFFFFF",
-"@ c #839CB5",
-"o c #547897",
-"4 c #4D7492",
-"% c #F1F4F7",
-"X c #5A809C",
-"< c #8497A5",
-"0 c #7898AD",
-"+ c #CAD2DC",
-"r c #ACAEB2",
-"2 c #BECAD9",
-"* c #65839D",
-"e c #DCE2EA",
-"- c #ADBED2",
-"t c #597B9A",
-"  c None",
-"1 c #467291",
-"9 c #D6DFE7",
-"O c #7393AB",
-"u c #49708B",
-"5 c #A0BACB",
-"& c #AABFCD",
-"8 c #B9CBD5",
-"; c #B4C4D3",
-": c #6F90A6",
-"3 c #A8B6CA",
-"# c #ADBACE",
-"w c #E4E9ED",
-". c #8EA9BC",
-"> c #B3BFD1",
-", c #C2CBDB",
-"6 c #C0D1DC",
-"7 c #A2B3C5",
-"q c #5D7C93",
-/* pixels */
-"     .XooOo+    ",
-"    X@#$$$%o&   ",
-"   *=-;$$$$$o+  ",
-"  +O#;-$$$$$$:  ",
-"  o=>,-<1<$2-o  ",
-"  o3>--1$122-*  ",
-"  o=--$<4<22-X  ",
-"  o5$$$$$26;7*  ",
-"   X%$$$$2;-X8  ",
-"  90*9$$$-7Xqo  ",
-" wXwe@O44X4<r<o ",
-" X8628>22222<<*4",
-" ttyyyoo4441uuuo",
-" t>$$$$$$$$$$$>o",
-" XXXtyyyoo44411u"
-};
+/* XPM */
+static const char *const cdrom_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 36 1",
+"= c #9BACC2",
+"y c #547B99",
+"$ c #FFFFFF",
+"@ c #839CB5",
+"o c #547897",
+"4 c #4D7492",
+"% c #F1F4F7",
+"X c #5A809C",
+"< c #8497A5",
+"0 c #7898AD",
+"+ c #CAD2DC",
+"r c #ACAEB2",
+"2 c #BECAD9",
+"* c #65839D",
+"e c #DCE2EA",
+"- c #ADBED2",
+"t c #597B9A",
+"  c None",
+"1 c #467291",
+"9 c #D6DFE7",
+"O c #7393AB",
+"u c #49708B",
+"5 c #A0BACB",
+"& c #AABFCD",
+"8 c #B9CBD5",
+"; c #B4C4D3",
+": c #6F90A6",
+"3 c #A8B6CA",
+"# c #ADBACE",
+"w c #E4E9ED",
+". c #8EA9BC",
+"> c #B3BFD1",
+", c #C2CBDB",
+"6 c #C0D1DC",
+"7 c #A2B3C5",
+"q c #5D7C93",
+/* pixels */
+"     .XooOo+    ",
+"    X@#$$$%o&   ",
+"   *=-;$$$$$o+  ",
+"  +O#;-$$$$$$:  ",
+"  o=>,-<1<$2-o  ",
+"  o3>--1$122-*  ",
+"  o=--$<4<22-X  ",
+"  o5$$$$$26;7*  ",
+"   X%$$$$2;-X8  ",
+"  90*9$$$-7Xqo  ",
+" wXwe@O44X4<r<o ",
+" X8628>22222<<*4",
+" ttyyyoo4441uuuo",
+" t>$$$$$$$$$$$>o",
+" XXXtyyyoo44411u"
+};
diff --git a/Externals/wxWidgets3/art/copy.xpm b/Externals/wxWidgets3/art/copy.xpm
index f393cd23e6..9143caa9b2 100644
--- a/Externals/wxWidgets3/art/copy.xpm
+++ b/Externals/wxWidgets3/art/copy.xpm
@@ -1,44 +1,44 @@
-/* XPM */
-static const char *const copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"o c #97C4E7",
-"* c #FFFFFF",
-"@ c #60A9DA",
-"= c #D1E5F5",
-"& c #C3DDF1",
-". c #7EA6C0",
-"  c None",
-"X c #2F93CD",
-"O c #85BBE2",
-", c #EFF6FC",
-"; c #DEEDF8",
-"+ c #72B2DD",
-"3 c #F7FBFD",
-"4 c #FAFCFE",
-": c #DAEAF7",
-"< c #E9F3FA",
-"1 c #E2EFF8",
-"- c #FDFDFE",
-"% c #B6D5EE",
-"$ c #A5CCEA",
-"> c #E5F0F9",
-"# c #AFD1EC",
-"2 c #F4F9FD",
-/* pixels */
-" .....XX        ",
-" .oO+@X#X       ",
-" .$oO+X##X      ",
-" .%$o........   ",
-" .&%$.*=&#o.-.  ",
-" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
-" .....**-432,>. ",
-"     .***-432,. ",
-"     .......... "
-};
+/* XPM */
+static const char *const copy_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 23 1",
+"o c #97C4E7",
+"* c #FFFFFF",
+"@ c #60A9DA",
+"= c #D1E5F5",
+"& c #C3DDF1",
+". c #7EA6C0",
+"  c None",
+"X c #2F93CD",
+"O c #85BBE2",
+", c #EFF6FC",
+"; c #DEEDF8",
+"+ c #72B2DD",
+"3 c #F7FBFD",
+"4 c #FAFCFE",
+": c #DAEAF7",
+"< c #E9F3FA",
+"1 c #E2EFF8",
+"- c #FDFDFE",
+"% c #B6D5EE",
+"$ c #A5CCEA",
+"> c #E5F0F9",
+"# c #AFD1EC",
+"2 c #F4F9FD",
+/* pixels */
+" .....XX        ",
+" .oO+@X#X       ",
+" .$oO+X##X      ",
+" .%$o........   ",
+" .&%$.*=&#o.-.  ",
+" .=&%.*;=&#.--. ",
+" .:=&.*>;=&.... ",
+" .>:=.*,>;=&#o. ",
+" .<1:.*2,>:=&#. ",
+" .2<1.*32,>:=&. ",
+" .32<.*432,>:=. ",
+" .32<.*-432,>:. ",
+" .....**-432,>. ",
+"     .***-432,. ",
+"     .......... "
+};
diff --git a/Externals/wxWidgets3/art/cross.xpm b/Externals/wxWidgets3/art/cross.xpm
index 407fa9bfa1..20ab3f3466 100644
--- a/Externals/wxWidgets3/art/cross.xpm
+++ b/Externals/wxWidgets3/art/cross.xpm
@@ -1,17 +1,17 @@
-/* XPM */
-static const char *const cross_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"10 10 2 1",
-"  c Gray0",
-"# c None",
-/* pixels */
-" ######## ",
-"   ####   ",
-"#   ##   #",
-"##      ##",
-"###    ###",
-"###    ###",
-"##      ##",
-"#   ##   #",
-"   ####   ",
-"  ######  "};
+/* XPM */
+static const char *const cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 2 1",
+"  c Gray0",
+"# c None",
+/* pixels */
+" ######## ",
+"   ####   ",
+"#   ##   #",
+"##      ##",
+"###    ###",
+"###    ###",
+"##      ##",
+"#   ##   #",
+"   ####   ",
+"  ######  "};
diff --git a/Externals/wxWidgets3/art/cut.xpm b/Externals/wxWidgets3/art/cut.xpm
index e638157f59..eacd7f94b3 100644
--- a/Externals/wxWidgets3/art/cut.xpm
+++ b/Externals/wxWidgets3/art/cut.xpm
@@ -1,46 +1,46 @@
-/* XPM */
-static const char *const cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
-"  c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
-/* pixels */
-"   .X     .o    ",
-"   O.+   @.     ",
-"    O.   ..     ",
-"    O#$ %.&     ",
-"     O.*..      ",
-"     #%#..      ",
-"     O=-..      ",
-"     #%#;.      ",
-"     OO:=O      ",
-"  >,,<, ,<,,1   ",
-" ><23<1 1<32<1  ",
-" ,2 4<   <5 2,  ",
-" <, ,2   2, ,<  ",
-" 23,<5   5<,32  ",
-" 6225     522>  "
-};
+/* XPM */
+static const char *const cut_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 25 1",
+"6 c #D8BDC0",
+": c #C3C3C4",
+"- c #FFFFFF",
+". c #6C6D70",
+"2 c #AD3A45",
+"o c #DBDBDB",
+"# c #939495",
+"< c #E42234",
+"& c #C3C5C8",
+"; c #C6CCD3",
+"% c #B7B7B8",
+"  c None",
+"* c #DFE0E2",
+"5 c #B69596",
+"3 c #9C2A35",
+"1 c #CFCFD0",
+", c #AB5C64",
+"+ c #D2D3D4",
+"$ c #BCBDBE",
+"@ c #C6C8CA",
+"> c #CDC0C1",
+"O c #826F72",
+"X c #979BA0",
+"4 c #9B8687",
+"= c #9FA0A0",
+/* pixels */
+"   .X     .o    ",
+"   O.+   @.     ",
+"    O.   ..     ",
+"    O#$ %.&     ",
+"     O.*..      ",
+"     #%#..      ",
+"     O=-..      ",
+"     #%#;.      ",
+"     OO:=O      ",
+"  >,,<, ,<,,1   ",
+" ><23<1 1<32<1  ",
+" ,2 4<   <5 2,  ",
+" <, ,2   2, ,<  ",
+" 23,<5   5<,32  ",
+" 6225     522>  "
+};
diff --git a/Externals/wxWidgets3/art/deffile.xpm b/Externals/wxWidgets3/art/deffile.xpm
index d7546a53f4..182fbe4180 100644
--- a/Externals/wxWidgets3/art/deffile.xpm
+++ b/Externals/wxWidgets3/art/deffile.xpm
@@ -1,54 +1,54 @@
-/* XPM */
-static const char *const deffile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 32 1",
-"= c #97C4E7",
-": c #72A8D2",
-"1 c #FFFFFF",
-"w c #839CB5",
-"X c #6B98B8",
-". c #5A89A6",
-"@ c #3A749C",
-", c #D1E5F5",
-"< c #67A1CF",
-"> c #F1F4F7",
-"e c #85A7BC",
-"% c #C3DDF1",
-"0 c #749BB4",
-"2 c #7EA6C0",
-"; c #5F9BC8",
-"  c None",
-"O c #538DB3",
-"- c #85BBE2",
-"$ c #D6DFE7",
-"9 c #EFF6FC",
-"o c #6591AE",
-"4 c #F7FBFD",
-"8 c #FAFCFE",
-"6 c #DAEAF7",
-"7 c #E9F3FA",
-"q c #FDFDFE",
-"3 c #E2EFF8",
-"# c #8EA9BC",
-"& c #B6D5EE",
-"* c #A5CCEA",
-"5 c #F4F9FD",
-"+ c #4581AA",
-/* pixels */
-"  ..XooO+@#$    ",
-"  .%%&*=-;:;>   ",
-"  .,,%&*=<1=X>  ",
-"  #%%%%&*211=X  ",
-"  #3-----<oXoO  ",
-"  #3456,%&*=-O  ",
-"  #3--------=O  ",
-"  #355736,%&*o  ",
-"  #3--------&o  ",
-"  #38459736,%X  ",
-"  #3--------,0  ",
-"  #31q84597360  ",
-"  #3--------3w  ",
-"  #3111q84597e  ",
-"  ##########e#  ",
-"                "
-};
+/* XPM */
+static const char *const deffile_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 32 1",
+"= c #97C4E7",
+": c #72A8D2",
+"1 c #FFFFFF",
+"w c #839CB5",
+"X c #6B98B8",
+". c #5A89A6",
+"@ c #3A749C",
+", c #D1E5F5",
+"< c #67A1CF",
+"> c #F1F4F7",
+"e c #85A7BC",
+"% c #C3DDF1",
+"0 c #749BB4",
+"2 c #7EA6C0",
+"; c #5F9BC8",
+"  c None",
+"O c #538DB3",
+"- c #85BBE2",
+"$ c #D6DFE7",
+"9 c #EFF6FC",
+"o c #6591AE",
+"4 c #F7FBFD",
+"8 c #FAFCFE",
+"6 c #DAEAF7",
+"7 c #E9F3FA",
+"q c #FDFDFE",
+"3 c #E2EFF8",
+"# c #8EA9BC",
+"& c #B6D5EE",
+"* c #A5CCEA",
+"5 c #F4F9FD",
+"+ c #4581AA",
+/* pixels */
+"  ..XooO+@#$    ",
+"  .%%&*=-;:;>   ",
+"  .,,%&*=<1=X>  ",
+"  #%%%%&*211=X  ",
+"  #3-----<oXoO  ",
+"  #3456,%&*=-O  ",
+"  #3--------=O  ",
+"  #355736,%&*o  ",
+"  #3--------&o  ",
+"  #38459736,%X  ",
+"  #3--------,0  ",
+"  #31q84597360  ",
+"  #3--------3w  ",
+"  #3111q84597e  ",
+"  ##########e#  ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/delbookm.xpm b/Externals/wxWidgets3/art/delbookm.xpm
index a42227270e..6007ee188e 100644
--- a/Externals/wxWidgets3/art/delbookm.xpm
+++ b/Externals/wxWidgets3/art/delbookm.xpm
@@ -1,24 +1,24 @@
-/* XPM */
-static const char *const delbookm_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-". c Black",
-"  c None",
-"X c #FF4040",
-/* pixels */
-"        ....... ",
-"        .XXXXX. ",
-"  .   . .XXXXX. ",
-"  .. .. .XXXXX. ",
-"   ...  .XXXXX. ",
-"    .   .XXXXX. ",
-"   ...  .XXXXX. ",
-"  .. .. .XXXXX. ",
-"  .   . .XXXXX. ",
-"        .XXXXX. ",
-"        .XXXXX. ",
-"        .XXXXX. ",
-"        .XX.XX. ",
-"        .X. .X. ",
-"        ..   .. "
-};
+/* XPM */
+static const char *const delbookm_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+". c Black",
+"  c None",
+"X c #FF4040",
+/* pixels */
+"        ....... ",
+"        .XXXXX. ",
+"  .   . .XXXXX. ",
+"  .. .. .XXXXX. ",
+"   ...  .XXXXX. ",
+"    .   .XXXXX. ",
+"   ...  .XXXXX. ",
+"  .. .. .XXXXX. ",
+"  .   . .XXXXX. ",
+"        .XXXXX. ",
+"        .XXXXX. ",
+"        .XXXXX. ",
+"        .XX.XX. ",
+"        .X. .X. ",
+"        ..   .. "
+};
diff --git a/Externals/wxWidgets3/art/delete.xpm b/Externals/wxWidgets3/art/delete.xpm
index fe411d301e..6d586d3e93 100644
--- a/Externals/wxWidgets3/art/delete.xpm
+++ b/Externals/wxWidgets3/art/delete.xpm
@@ -1,42 +1,42 @@
-/* XPM */
-static const char *const delete_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-"2 c #A5AEBD",
-"* c #5478B4",
-"< c #95A3BB",
-"O c #9AA7BC",
-"; c #758EB7",
-"$ c #6986B6",
-"# c #4971B2",
-"& c #8A9CBA",
-"X c #8598B9",
-"  c None",
-"o c #ABB2BE",
-"- c #7F95B9",
-"= c #4E74B3",
-"1 c #A0ABBC",
-"+ c #6F8AB7",
-". c #B5B9BF",
-"@ c #3E69B1",
-", c #90A0BA",
-": c #6483B5",
-"> c #5A7BB4",
-"% c #5F7FB5",
-/* pixels */
-"                ",
-"    .Xo      OO ",
-"    +@#.    $@% ",
-"    &@@X  .*@*o ",
-"     =@= .*@*.  ",
-"     -@@X*@*.   ",
-"     .#@@@$.    ",
-"      ;@@:      ",
-"     ;@@@+      ",
-"   .>@#%@@.     ",
-"  o*@*oO@@,     ",
-" <#@*. .@@=     ",
-"&@@$    :@@1    ",
-";#&     2#>.    ",
-"                "
-};
+/* XPM */
+static const char *const delete_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 21 1",
+"2 c #A5AEBD",
+"* c #5478B4",
+"< c #95A3BB",
+"O c #9AA7BC",
+"; c #758EB7",
+"$ c #6986B6",
+"# c #4971B2",
+"& c #8A9CBA",
+"X c #8598B9",
+"  c None",
+"o c #ABB2BE",
+"- c #7F95B9",
+"= c #4E74B3",
+"1 c #A0ABBC",
+"+ c #6F8AB7",
+". c #B5B9BF",
+"@ c #3E69B1",
+", c #90A0BA",
+": c #6483B5",
+"> c #5A7BB4",
+"% c #5F7FB5",
+/* pixels */
+"                ",
+"    .Xo      OO ",
+"    +@#.    $@% ",
+"    &@@X  .*@*o ",
+"     =@= .*@*.  ",
+"     -@@X*@*.   ",
+"     .#@@@$.    ",
+"      ;@@:      ",
+"     ;@@@+      ",
+"   .>@#%@@.     ",
+"  o*@*oO@@,     ",
+" <#@*. .@@=     ",
+"&@@$    :@@1    ",
+";#&     2#>.    ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/dir_up.xpm b/Externals/wxWidgets3/art/dir_up.xpm
index dd85ff25cd..f644d93e6d 100644
--- a/Externals/wxWidgets3/art/dir_up.xpm
+++ b/Externals/wxWidgets3/art/dir_up.xpm
@@ -1,52 +1,52 @@
-/* XPM */
-static const char *const dir_up_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 31 1",
-"6 c #9BACC2",
-"o c #9AEA53",
-"7 c #94A5BD",
-"8 c #547897",
-"5 c #839CB5",
-"@ c #376485",
-"$ c #5A809C",
-"# c #7F99B4",
-": c #D1D9E5",
-"< c #EAEDF3",
-"& c #446A8C",
-"q c #65839D",
-"> c #DCE2EA",
-", c #E1E6EE",
-"2 c #F5F6F7",
-"O c #8DA0B9",
-"  c None",
-"% c #467291",
-". c #305F81",
-"X c #7393AB",
-"+ c #6A89A2",
-"4 c #A8B6CA",
-"1 c #EEF1F3",
-"3 c #F8F9FA",
-"0 c #215579",
-"9 c #7F97B0",
-"* c #B3BFD1",
-"w c #7A90AC",
-"- c #C2CBDB",
-"; c #CAD6E1",
-"= c #BBC4D6",
-/* pixels */
-"         ..     ",
-"        X.o.    ",
-"....   X.ooo.   ",
-".OO+....ooooo.  ",
-".OOOOOO@@ooo..  ",
-".OOOO#OO@ooo.$  ",
-".OOOOOOO@ooo.$  ",
-".O%............&",
-".O&*=-;:>,<1231.",
-".+.4*=-;:>,<12$.",
-"..564*=-;:>,<1. ",
-".@O764*=-;:>,<. ",
-".89O764*=-;:>$$ ",
-"0qw9O764*=-;:.  ",
-"0.............  "
-};
+/* XPM */
+static const char *const dir_up_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 31 1",
+"6 c #9BACC2",
+"o c #9AEA53",
+"7 c #94A5BD",
+"8 c #547897",
+"5 c #839CB5",
+"@ c #376485",
+"$ c #5A809C",
+"# c #7F99B4",
+": c #D1D9E5",
+"< c #EAEDF3",
+"& c #446A8C",
+"q c #65839D",
+"> c #DCE2EA",
+", c #E1E6EE",
+"2 c #F5F6F7",
+"O c #8DA0B9",
+"  c None",
+"% c #467291",
+". c #305F81",
+"X c #7393AB",
+"+ c #6A89A2",
+"4 c #A8B6CA",
+"1 c #EEF1F3",
+"3 c #F8F9FA",
+"0 c #215579",
+"9 c #7F97B0",
+"* c #B3BFD1",
+"w c #7A90AC",
+"- c #C2CBDB",
+"; c #CAD6E1",
+"= c #BBC4D6",
+/* pixels */
+"         ..     ",
+"        X.o.    ",
+"....   X.ooo.   ",
+".OO+....ooooo.  ",
+".OOOOOO@@ooo..  ",
+".OOOO#OO@ooo.$  ",
+".OOOOOOO@ooo.$  ",
+".O%............&",
+".O&*=-;:>,<1231.",
+".+.4*=-;:>,<12$.",
+"..564*=-;:>,<1. ",
+".@O764*=-;:>,<. ",
+".89O764*=-;:>$$ ",
+"0qw9O764*=-;:.  ",
+"0.............  "
+};
diff --git a/Externals/wxWidgets3/art/down.xpm b/Externals/wxWidgets3/art/down.xpm
index 5a0e4c98fb..88b0a9fdc9 100644
--- a/Externals/wxWidgets3/art/down.xpm
+++ b/Externals/wxWidgets3/art/down.xpm
@@ -1,21 +1,21 @@
-/* XPM */
-static const char *const down_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"     ......     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"  ....XXXX....  ",
-"   .XXXXXXXX.   ",
-"    .XXXXXX.    ",
-"     .XXXX.     ",
-"      .XX.      ",
-"       ..       ",
-"                "};
+/* XPM */
+static const char *const down_xpm[] = {
+"16 15 3 1",
+" 	c None",
+".	c Black",
+"X	c Gray100",
+"                ",
+"     ......     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"  ....XXXX....  ",
+"   .XXXXXXXX.   ",
+"    .XXXXXX.    ",
+"     .XXXX.     ",
+"      .XX.      ",
+"       ..       ",
+"                "};
diff --git a/Externals/wxWidgets3/art/exefile.xpm b/Externals/wxWidgets3/art/exefile.xpm
index 54a5e49c33..f814a597e8 100644
--- a/Externals/wxWidgets3/art/exefile.xpm
+++ b/Externals/wxWidgets3/art/exefile.xpm
@@ -1,73 +1,73 @@
-/* XPM */
-static const char *const exefile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 51 1",
-"% c #E8E8EC",
-"= c #E8E8ED",
-"z c #CACAD4",
-"8 c #D9D9E1",
-"p c #D2D2DA",
-"u c #E1E1E7",
-"a c #D2D2DB",
-"< c #E9E9ED",
-"q c #DADAE1",
-"+ c #F1F1F4",
-"g c #D3D3DB",
-"1 c #E2E2E8",
-"x c #D3D3DC",
-"5 c #00A5FF",
-"$ c #EAEAEE",
-"4 c #DBDBE2",
-"h c #CCCCD6",
-"y c #D4D4DC",
-"r c #E3E3E9",
-"d c #D4D4DD",
-"7 c #DCDCE2",
-": c #EBEBEF",
-"0 c #DCDCE3",
-"  c None",
-"O c #F3F3F5",
-"> c #E4E4E9",
-"& c #F3F3F6",
-"j c #D5D5DD",
-"6 c #E4E4EA",
-". c #C6C6D5",
-"# c #ECECF0",
-"f c #CECED7",
-"l c #CECED8",
-"e c #D6D6DE",
-"; c #EDEDF0",
-"3 c #DEDEE4",
-", c #EDEDF1",
-"c c #CFCFD8",
-"o c #F5F5F7",
-"- c #E6E6EB",
-"w c #D7D7DF",
-"v c #C8C8D3",
-"i c #DFDFE5",
-"@ c #EEEEF2",
-"s c #D0D0D9",
-"X c #9494AD",
-"9 c #D8D8DF",
-"t c #D8D8E0",
-"* c #EFEFF2",
-"2 c #E0E0E6",
-"k c #D1D1DA",
-/* pixels */
-"  ........X     ",
-"  .oO+@#$%XX    ",
-"  .&+*#$=-XXX   ",
-"  .+*;:=->XXXX  ",
-"  .*,:<->1234X  ",
-"  .,5:5612378X  ",
-"  5,5559530qwX  ",
-"  55555550q9eX  ",
-" 5555r5555teyX  ",
-"  55rui559eypX  ",
-" 5555i5555yasX  ",
-"  5555555dasfX  ",
-"  5355595gsfhX  ",
-"  .3595jgklhzX  ",
-"  .0qwjxkchzvX  ",
-"  XXXXXXXXXXXX  "
-};
+/* XPM */
+static const char *const exefile_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 51 1",
+"% c #E8E8EC",
+"= c #E8E8ED",
+"z c #CACAD4",
+"8 c #D9D9E1",
+"p c #D2D2DA",
+"u c #E1E1E7",
+"a c #D2D2DB",
+"< c #E9E9ED",
+"q c #DADAE1",
+"+ c #F1F1F4",
+"g c #D3D3DB",
+"1 c #E2E2E8",
+"x c #D3D3DC",
+"5 c #00A5FF",
+"$ c #EAEAEE",
+"4 c #DBDBE2",
+"h c #CCCCD6",
+"y c #D4D4DC",
+"r c #E3E3E9",
+"d c #D4D4DD",
+"7 c #DCDCE2",
+": c #EBEBEF",
+"0 c #DCDCE3",
+"  c None",
+"O c #F3F3F5",
+"> c #E4E4E9",
+"& c #F3F3F6",
+"j c #D5D5DD",
+"6 c #E4E4EA",
+". c #C6C6D5",
+"# c #ECECF0",
+"f c #CECED7",
+"l c #CECED8",
+"e c #D6D6DE",
+"; c #EDEDF0",
+"3 c #DEDEE4",
+", c #EDEDF1",
+"c c #CFCFD8",
+"o c #F5F5F7",
+"- c #E6E6EB",
+"w c #D7D7DF",
+"v c #C8C8D3",
+"i c #DFDFE5",
+"@ c #EEEEF2",
+"s c #D0D0D9",
+"X c #9494AD",
+"9 c #D8D8DF",
+"t c #D8D8E0",
+"* c #EFEFF2",
+"2 c #E0E0E6",
+"k c #D1D1DA",
+/* pixels */
+"  ........X     ",
+"  .oO+@#$%XX    ",
+"  .&+*#$=-XXX   ",
+"  .+*;:=->XXXX  ",
+"  .*,:<->1234X  ",
+"  .,5:5612378X  ",
+"  5,5559530qwX  ",
+"  55555550q9eX  ",
+" 5555r5555teyX  ",
+"  55rui559eypX  ",
+" 5555i5555yasX  ",
+"  5555555dasfX  ",
+"  5355595gsfhX  ",
+"  .3595jgklhzX  ",
+"  .0qwjxkchzvX  ",
+"  XXXXXXXXXXXX  "
+};
diff --git a/Externals/wxWidgets3/art/fileopen.xpm b/Externals/wxWidgets3/art/fileopen.xpm
index 997efdea19..636a904123 100644
--- a/Externals/wxWidgets3/art/fileopen.xpm
+++ b/Externals/wxWidgets3/art/fileopen.xpm
@@ -1,57 +1,57 @@
-/* XPM */
-static const char *const fileopen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-"6 c #9BACC2",
-"< c #9AEA53",
-"9 c #94A5BD",
-"5 c #839CB5",
-"; c #4D7492",
-". c #376485",
-"$ c #7F99B4",
-"r c #D1D9E5",
-"7 c #EAEDF3",
-"@ c #CAD2DC",
-"% c #718BA7",
-"t c #BECAD9",
-"& c #65839D",
-"0 c #DCE2EA",
-"4 c #F5F6F7",
-"w c #597B9A",
-"O c #8DA0B9",
-"  c None",
-"+ c #467291",
-"u c #305F81",
-"= c #B4C4D3",
-"# c #CAE2AA",
-"1 c #FAFCFE",
-"3 c #A8B6CA",
-"q c #E4E9ED",
-"8 c #EEF1F3",
-"X c #215579",
-"2 c #7F97B0",
-": c #B3BFD1",
-"y c #7A90AC",
-", c #C2CBDB",
-"- c #ADD668",
-"* c #B6D791",
-"e c #CAD6E1",
-"o c #DFF0D0",
-"> c #BBC4D6",
-/* pixels */
-"                ",
-"     ....       ",
-"XXXXX .oo.      ",
-"XOOOO+@.#o.     ",
-"XOOOO$%&.*oXXX  ",
-"XOOOOOOO.*oX=X  ",
-"XOXXXX...-oXXXX;",
-"XOX:>,.<<<<<oX1;",
-"X2X3:>,.<<<oX4=;",
-"XX563:>>.<oX78; ",
-"XXO963:>>.X0q7; ",
-"Xw2O963:>>er0t; ",
-"X&y2O963:>,er;  ",
-"uXXXXXXXXXXXX;  ",
-"                "
-};
+/* XPM */
+static const char *const fileopen_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 36 1",
+"6 c #9BACC2",
+"< c #9AEA53",
+"9 c #94A5BD",
+"5 c #839CB5",
+"; c #4D7492",
+". c #376485",
+"$ c #7F99B4",
+"r c #D1D9E5",
+"7 c #EAEDF3",
+"@ c #CAD2DC",
+"% c #718BA7",
+"t c #BECAD9",
+"& c #65839D",
+"0 c #DCE2EA",
+"4 c #F5F6F7",
+"w c #597B9A",
+"O c #8DA0B9",
+"  c None",
+"+ c #467291",
+"u c #305F81",
+"= c #B4C4D3",
+"# c #CAE2AA",
+"1 c #FAFCFE",
+"3 c #A8B6CA",
+"q c #E4E9ED",
+"8 c #EEF1F3",
+"X c #215579",
+"2 c #7F97B0",
+": c #B3BFD1",
+"y c #7A90AC",
+", c #C2CBDB",
+"- c #ADD668",
+"* c #B6D791",
+"e c #CAD6E1",
+"o c #DFF0D0",
+"> c #BBC4D6",
+/* pixels */
+"                ",
+"     ....       ",
+"XXXXX .oo.      ",
+"XOOOO+@.#o.     ",
+"XOOOO$%&.*oXXX  ",
+"XOOOOOOO.*oX=X  ",
+"XOXXXX...-oXXXX;",
+"XOX:>,.<<<<<oX1;",
+"X2X3:>,.<<<oX4=;",
+"XX563:>>.<oX78; ",
+"XXO963:>>.X0q7; ",
+"Xw2O963:>>er0t; ",
+"X&y2O963:>,er;  ",
+"uXXXXXXXXXXXX;  ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/filesave.xpm b/Externals/wxWidgets3/art/filesave.xpm
index f571025cd6..b1ffda3346 100644
--- a/Externals/wxWidgets3/art/filesave.xpm
+++ b/Externals/wxWidgets3/art/filesave.xpm
@@ -1,42 +1,42 @@
-/* XPM */
-static const char *const filesave_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-"O c #FFFFFF",
-"> c #D5D6D8",
-"; c #446A8C",
-"1 c #CAD2DC",
-": c #C0C7D1",
-"  c #5F666D",
-"% c #A5B0BA",
-"o c #65839D",
-", c #DCE2EA",
-"< c #C3C5C8",
-"- c #E1E6EE",
-"* c #C6CCD3",
-". c None",
-"$ c #305F81",
-"2 c #D6DFE7",
-"= c #D2D9E0",
-"& c #B7BFC7",
-"X c #1B4467",
-"# c #BCBDBE",
-"@ c #7A90AC",
-"+ c #5D7C93",
-/* pixels */
-"               .",
-" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
-".             .."
-};
+/* XPM */
+static const char *const filesave_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 21 1",
+"O c #FFFFFF",
+"> c #D5D6D8",
+"; c #446A8C",
+"1 c #CAD2DC",
+": c #C0C7D1",
+"  c #5F666D",
+"% c #A5B0BA",
+"o c #65839D",
+", c #DCE2EA",
+"< c #C3C5C8",
+"- c #E1E6EE",
+"* c #C6CCD3",
+". c None",
+"$ c #305F81",
+"2 c #D6DFE7",
+"= c #D2D9E0",
+"& c #B7BFC7",
+"X c #1B4467",
+"# c #BCBDBE",
+"@ c #7A90AC",
+"+ c #5D7C93",
+/* pixels */
+"               .",
+" XoOOOOOOOOO+X .",
+" @oO#######O+@ .",
+" @oOOOOOOOOO+@ .",
+" @oO#######O+@ .",
+" @oOOOOOOOOO+@ .",
+" @@+++++++++@@ .",
+" @@@@@@@@@@@@@ .",
+" @@@$$$$$$$$@@ .",
+" @@$%%%&*=-O$@ .",
+" @@$%X;;*=-O$@ .",
+" @@$%X;;:>,O$@ .",
+" @@$%X;;<12O$@ .",
+" @@$<<2OOOOO$@ .",
+".             .."
+};
diff --git a/Externals/wxWidgets3/art/filesaveas.xpm b/Externals/wxWidgets3/art/filesaveas.xpm
index 7562f4cc47..4ca8e26227 100644
--- a/Externals/wxWidgets3/art/filesaveas.xpm
+++ b/Externals/wxWidgets3/art/filesaveas.xpm
@@ -1,44 +1,44 @@
-/* XPM */
-static const char *const filesaveas_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"X c Black",
-"+ c #FFFFFF",
-"< c #D5D6D8",
-"> c #446A8C",
-"3 c #CAD2DC",
-", c #C0C7D1",
-"  c #5F666D",
-"* c #A5B0BA",
-"O c #65839D",
-"1 c #DCE2EA",
-"2 c #C3C5C8",
-": c #E1E6EE",
-". c #FFFF00",
-"- c #C6CCD3",
-"@ c None",
-"& c #305F81",
-"4 c #D6DFE7",
-"; c #D2D9E0",
-"= c #B7BFC7",
-"o c #1B4467",
-"$ c #BCBDBE",
-"# c #7A90AC",
-"% c #5D7C93",
-/* pixels */
-"         .X .XX.",
-" oO+++++++.X.X.@",
-" #O+$$$$$XX...XX",
-" #O++++++.......",
-" #O+$$$$$XX...XX",
-" #O+++++++.X.X.@",
-" ##%%%%%%.X%.X .",
-" ############# @",
-" ###&&&&&&&&## @",
-" ##&***=-;:+&# @",
-" ##&*o>>-;:+&# @",
-" ##&*o>>,<1+&# @",
-" ##&*o>>234+&# @",
-" ##&224+++++&# @",
-"@             @@"
-};
+/* XPM */
+static const char *const filesaveas_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 23 1",
+"X c Black",
+"+ c #FFFFFF",
+"< c #D5D6D8",
+"> c #446A8C",
+"3 c #CAD2DC",
+", c #C0C7D1",
+"  c #5F666D",
+"* c #A5B0BA",
+"O c #65839D",
+"1 c #DCE2EA",
+"2 c #C3C5C8",
+": c #E1E6EE",
+". c #FFFF00",
+"- c #C6CCD3",
+"@ c None",
+"& c #305F81",
+"4 c #D6DFE7",
+"; c #D2D9E0",
+"= c #B7BFC7",
+"o c #1B4467",
+"$ c #BCBDBE",
+"# c #7A90AC",
+"% c #5D7C93",
+/* pixels */
+"         .X .XX.",
+" oO+++++++.X.X.@",
+" #O+$$$$$XX...XX",
+" #O++++++.......",
+" #O+$$$$$XX...XX",
+" #O+++++++.X.X.@",
+" ##%%%%%%.X%.X .",
+" ############# @",
+" ###&&&&&&&&## @",
+" ##&***=-;:+&# @",
+" ##&*o>>-;:+&# @",
+" ##&*o>>,<1+&# @",
+" ##&*o>>234+&# @",
+" ##&224+++++&# @",
+"@             @@"
+};
diff --git a/Externals/wxWidgets3/art/find.xpm b/Externals/wxWidgets3/art/find.xpm
index a31ecde63f..d5f24f8e41 100644
--- a/Externals/wxWidgets3/art/find.xpm
+++ b/Externals/wxWidgets3/art/find.xpm
@@ -1,62 +1,62 @@
-/* XPM */
-static const char *const find_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 41 1",
-"y c #A06959",
-"9 c #A7DAF2",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"d c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
-"  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
-/* pixels */
-"       .XooXO   ",
-"      +@###$+%  ",
-"     .&#*==-;@@ ",
-"     o:*>,<--:X ",
-"     12>-345-#% ",
-"     12>678392% ",
-"     %$*,3059q& ",
-"     @Oq,wwer@@ ",
-"      t@q22q&+  ",
-"    yyui+%o%p   ",
-"   yasy         ",
-"  yasdy         ",
-" yasdy          ",
-" ysdy           ",
-"  yy            "
-};
+/* XPM */
+static const char *const find_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 41 1",
+"y c #A06959",
+"9 c #A7DAF2",
+"$ c #B5CAD7",
+"> c #35B4E1",
+"t c #6B98B8",
+"w c #B6E0F4",
+"q c #AEC9D7",
+"1 c #5A89A6",
+"+ c #98B3C6",
+"4 c #EAF6FC",
+"3 c #DEF1FA",
+"= c #4CBCE3",
+"d c #DB916B",
+"X c #85A7BC",
+"s c #D8BCA4",
+"o c #749BB4",
+"e c #BCD9EF",
+"* c #62B4DD",
+"< c #91D2EF",
+"a c #E6DED2",
+"0 c #E9F4FB",
+"  c None",
+"@ c #A0BACB",
+"O c #AABFCD",
+"i c #6591AE",
+": c #B9CBD5",
+"- c #71C5E7",
+"5 c #D3ECF8",
+"% c #81A3B9",
+"6 c #8AD0EE",
+"8 c #FDFDFE",
+"p c #8EA9BC",
+"r c #B6D5EE",
+", c #81CCEB",
+". c #ACC4D3",
+"; c #AFD1DE",
+"7 c #EFF8FC",
+"u c #C2CBDB",
+"# c #C0D1DC",
+"2 c #CAD6E1",
+"& c #8FB0C3",
+/* pixels */
+"       .XooXO   ",
+"      +@###$+%  ",
+"     .&#*==-;@@ ",
+"     o:*>,<--:X ",
+"     12>-345-#% ",
+"     12>678392% ",
+"     %$*,3059q& ",
+"     @Oq,wwer@@ ",
+"      t@q22q&+  ",
+"    yyui+%o%p   ",
+"   yasy         ",
+"  yasdy         ",
+" yasdy          ",
+" ysdy           ",
+"  yy            "
+};
diff --git a/Externals/wxWidgets3/art/findrepl.xpm b/Externals/wxWidgets3/art/findrepl.xpm
index 5d688ba4bc..55380e5c06 100644
--- a/Externals/wxWidgets3/art/findrepl.xpm
+++ b/Externals/wxWidgets3/art/findrepl.xpm
@@ -1,63 +1,63 @@
-/* XPM */
-static const char *const findrepl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 42 1",
-"y c #A06959",
-"9 c #A7DAF2",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"d c #008000",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"f c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
-"  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
-/* pixels */
-"      .XooXO    ",
-"     +@###$+%   ",
-"    .&#*==-;@@  ",
-"    o:*>,<--:X  ",
-"    12>-345-#%  ",
-"    12>678392%  ",
-"    %$*,3059q&  ",
-"    @Oq,wwer@@  ",
-"     t@q22q&+   ",
-"   yyui+%o%p    ",
-"  yasy   d   d  ",
-" yasfy  dd   dd ",
-"yasfy  ddddddddd",
-"ysfy    dd   dd ",
-" yy      d   d  "
-};
+/* XPM */
+static const char *const findrepl_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 42 1",
+"y c #A06959",
+"9 c #A7DAF2",
+"$ c #B5CAD7",
+"> c #35B4E1",
+"t c #6B98B8",
+"w c #B6E0F4",
+"q c #AEC9D7",
+"1 c #5A89A6",
+"+ c #98B3C6",
+"4 c #EAF6FC",
+"d c #008000",
+"3 c #DEF1FA",
+"= c #4CBCE3",
+"f c #DB916B",
+"X c #85A7BC",
+"s c #D8BCA4",
+"o c #749BB4",
+"e c #BCD9EF",
+"* c #62B4DD",
+"< c #91D2EF",
+"a c #E6DED2",
+"0 c #E9F4FB",
+"  c None",
+"@ c #A0BACB",
+"O c #AABFCD",
+"i c #6591AE",
+": c #B9CBD5",
+"- c #71C5E7",
+"5 c #D3ECF8",
+"% c #81A3B9",
+"6 c #8AD0EE",
+"8 c #FDFDFE",
+"p c #8EA9BC",
+"r c #B6D5EE",
+", c #81CCEB",
+". c #ACC4D3",
+"; c #AFD1DE",
+"7 c #EFF8FC",
+"u c #C2CBDB",
+"# c #C0D1DC",
+"2 c #CAD6E1",
+"& c #8FB0C3",
+/* pixels */
+"      .XooXO    ",
+"     +@###$+%   ",
+"    .&#*==-;@@  ",
+"    o:*>,<--:X  ",
+"    12>-345-#%  ",
+"    12>678392%  ",
+"    %$*,3059q&  ",
+"    @Oq,wwer@@  ",
+"     t@q22q&+   ",
+"   yyui+%o%p    ",
+"  yasy   d   d  ",
+" yasfy  dd   dd ",
+"yasfy  ddddddddd",
+"ysfy    dd   dd ",
+" yy      d   d  "
+};
diff --git a/Externals/wxWidgets3/art/floppy.xpm b/Externals/wxWidgets3/art/floppy.xpm
index f6057b14fa..0c685efbcb 100644
--- a/Externals/wxWidgets3/art/floppy.xpm
+++ b/Externals/wxWidgets3/art/floppy.xpm
@@ -1,39 +1,39 @@
-/* XPM */
-static const char *const floppy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 18 1",
-"& c #E3E4E6",
-"+ c #FFFFFF",
-". c #446A8C",
-"o c #697787",
-"> c #5F666D",
-"* c #B2B3B3",
-"  c None",
-", c #4B4C4D",
-"= c #DCDBDA",
-"$ c #1B4467",
-": c #E4E9ED",
-"@ c #979BA0",
-"X c #203646",
-"O c #215579",
-"- c #545B63",
-"; c #636465",
-"# c #CAD6E1",
-"% c #7F8286",
-/* pixels */
-"  .XoooooooXO   ",
-"  .o+++++++.O   ",
-"  .o+OOOOO+.O   ",
-"  .o+++++++.O   ",
-"  .o@@@@@@@.O   ",
-"  ..........O   ",
-"  ..#+++++#.O   ",
-"  ..+$O+++#.O   ",
-"  ..+$O+++#.O   ",
-" %&.........*%  ",
-"%=+++++++++++&% ",
-"--------------; ",
-"-:::::::::::::- ",
-"-:X:XXXXXXXXX:> ",
-"-*************, "
-};
+/* XPM */
+static const char *const floppy_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 18 1",
+"& c #E3E4E6",
+"+ c #FFFFFF",
+". c #446A8C",
+"o c #697787",
+"> c #5F666D",
+"* c #B2B3B3",
+"  c None",
+", c #4B4C4D",
+"= c #DCDBDA",
+"$ c #1B4467",
+": c #E4E9ED",
+"@ c #979BA0",
+"X c #203646",
+"O c #215579",
+"- c #545B63",
+"; c #636465",
+"# c #CAD6E1",
+"% c #7F8286",
+/* pixels */
+"  .XoooooooXO   ",
+"  .o+++++++.O   ",
+"  .o+OOOOO+.O   ",
+"  .o+++++++.O   ",
+"  .o@@@@@@@.O   ",
+"  ..........O   ",
+"  ..#+++++#.O   ",
+"  ..+$O+++#.O   ",
+"  ..+$O+++#.O   ",
+" %&.........*%  ",
+"%=+++++++++++&% ",
+"--------------; ",
+"-:::::::::::::- ",
+"-:X:XXXXXXXXX:> ",
+"-*************, "
+};
diff --git a/Externals/wxWidgets3/art/folder.xpm b/Externals/wxWidgets3/art/folder.xpm
index 98e52a70b8..a116dcbd7b 100644
--- a/Externals/wxWidgets3/art/folder.xpm
+++ b/Externals/wxWidgets3/art/folder.xpm
@@ -1,43 +1,43 @@
-/* XPM */
-static const char *const folder_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 22 1",
-"> c #9BACC2",
-". c #547897",
-"1 c #7F99B4",
-"X c #D1D9E5",
-"< c #EAEDF3",
-"+ c #CAD2DC",
-"3 c #718BA7",
-"O c #BECAD9",
-"$ c #E1E6EE",
-"* c #F5F6F7",
-", c #8DA0B9",
-"  c None",
-"# c #D6DFE7",
-"@ c #D2D9E0",
-"- c #FAFCFE",
-"; c #ADBACE",
-"& c #EEF1F3",
-"= c #F8F9FA",
-"o c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"% c #E5EAF1",
-/* pixels */
-"                ",
-" .....          ",
-" .XXXX.         ",
-" .............  ",
-" .oO+@#$%&*=-.  ",
-" .oO+@#$%&*=-.  ",
-" .;oO+X#$%&*=.  ",
-" .:;oO+X#$%&*.  ",
-" .>:;oO+X#$%&.  ",
-" .,>:;oO+X#$<.  ",
-" .1,>:;oO+X#$.  ",
-" .21,>:;oO+X#.  ",
-" .321,>:;oO+X.  ",
-" .............  ",
-"                "
-};
+/* XPM */
+static const char *const folder_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 22 1",
+"> c #9BACC2",
+". c #547897",
+"1 c #7F99B4",
+"X c #D1D9E5",
+"< c #EAEDF3",
+"+ c #CAD2DC",
+"3 c #718BA7",
+"O c #BECAD9",
+"$ c #E1E6EE",
+"* c #F5F6F7",
+", c #8DA0B9",
+"  c None",
+"# c #D6DFE7",
+"@ c #D2D9E0",
+"- c #FAFCFE",
+"; c #ADBACE",
+"& c #EEF1F3",
+"= c #F8F9FA",
+"o c #B3BFD1",
+"2 c #7A90AC",
+": c #A2B3C5",
+"% c #E5EAF1",
+/* pixels */
+"                ",
+" .....          ",
+" .XXXX.         ",
+" .............  ",
+" .oO+@#$%&*=-.  ",
+" .oO+@#$%&*=-.  ",
+" .;oO+X#$%&*=.  ",
+" .:;oO+X#$%&*.  ",
+" .>:;oO+X#$%&.  ",
+" .,>:;oO+X#$<.  ",
+" .1,>:;oO+X#$.  ",
+" .21,>:;oO+X#.  ",
+" .321,>:;oO+X.  ",
+" .............  ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/folder_open.xpm b/Externals/wxWidgets3/art/folder_open.xpm
index 154441d2a9..dd450e73b9 100644
--- a/Externals/wxWidgets3/art/folder_open.xpm
+++ b/Externals/wxWidgets3/art/folder_open.xpm
@@ -1,52 +1,52 @@
-/* XPM */
-static const char *const folder_open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 31 1",
-"6 c #9BACC2",
-"w c #547B99",
-"5 c #94A5BD",
-". c #376485",
-"; c #F1F4F7",
-"o c #7F99B4",
-"2 c #D1D9E5",
-"- c #EAEDF3",
-"O c #718BA7",
-"0 c #65839D",
-"* c #DCE2EA",
-": c #F5F6F7",
-"7 c #597B9A",
-"X c #8DA0B9",
-"  c None",
-"+ c #467291",
-"q c #305F81",
-"& c #D6DFE7",
-"3 c #6A89A2",
-"1 c #A8B6CA",
-"= c #E4E9ED",
-"> c #F8F9FA",
-", c #FDFDFE",
-"9 c #215579",
-"8 c #7F97B0",
-"@ c #B3BFD1",
-"< c #7A90AC",
-"$ c #C2CBDB",
-"4 c #A2B3C5",
-"% c #CAD6E1",
-"# c #BBC4D6",
-/* pixels */
-"                ",
-".....           ",
-".XXXo.          ",
-".XXXXO........  ",
-".XXXXXXXXXXXX.  ",
-".XXXXXXXXXXXX.  ",
-".X++++++++++++++",
-".X+@#$%&*=-;:>,+",
-".<.1@#$%2*=-;:23",
-"..X41@#$%2*=-;3 ",
-"..X561@#$%2*=-3 ",
-".78X561@#$%2*%3 ",
-"90<8X561@#$%23  ",
-"q++++++++++++w  ",
-"                "
-};
+/* XPM */
+static const char *const folder_open_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 31 1",
+"6 c #9BACC2",
+"w c #547B99",
+"5 c #94A5BD",
+". c #376485",
+"; c #F1F4F7",
+"o c #7F99B4",
+"2 c #D1D9E5",
+"- c #EAEDF3",
+"O c #718BA7",
+"0 c #65839D",
+"* c #DCE2EA",
+": c #F5F6F7",
+"7 c #597B9A",
+"X c #8DA0B9",
+"  c None",
+"+ c #467291",
+"q c #305F81",
+"& c #D6DFE7",
+"3 c #6A89A2",
+"1 c #A8B6CA",
+"= c #E4E9ED",
+"> c #F8F9FA",
+", c #FDFDFE",
+"9 c #215579",
+"8 c #7F97B0",
+"@ c #B3BFD1",
+"< c #7A90AC",
+"$ c #C2CBDB",
+"4 c #A2B3C5",
+"% c #CAD6E1",
+"# c #BBC4D6",
+/* pixels */
+"                ",
+".....           ",
+".XXXo.          ",
+".XXXXO........  ",
+".XXXXXXXXXXXX.  ",
+".XXXXXXXXXXXX.  ",
+".X++++++++++++++",
+".X+@#$%&*=-;:>,+",
+".<.1@#$%2*=-;:23",
+"..X41@#$%2*=-;3 ",
+"..X561@#$%2*=-3 ",
+".78X561@#$%2*%3 ",
+"90<8X561@#$%23  ",
+"q++++++++++++w  ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/forward.xpm b/Externals/wxWidgets3/art/forward.xpm
index 81f62b0344..d17eef486e 100644
--- a/Externals/wxWidgets3/art/forward.xpm
+++ b/Externals/wxWidgets3/art/forward.xpm
@@ -1,21 +1,21 @@
-/* XPM */
-static const char *const forward_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"                ",
-"         .      ",
-"         ..     ",
-"         .X.    ",
-"  ........XX.   ",
-"  .XXXXXXXXXX.  ",
-"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXX.  ",
-"  ........XX.   ",
-"         .X.    ",
-"         ..     ",
-"         .      ",
-"                "};
+/* XPM */
+static const char *const forward_xpm[] = {
+"16 15 3 1",
+" 	c None",
+".	c Black",
+"X	c Gray100",
+"                ",
+"                ",
+"         .      ",
+"         ..     ",
+"         .X.    ",
+"  ........XX.   ",
+"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXXX. ",
+"  .XXXXXXXXXXX. ",
+"  .XXXXXXXXXX.  ",
+"  ........XX.   ",
+"         .X.    ",
+"         ..     ",
+"         .      ",
+"                "};
diff --git a/Externals/wxWidgets3/art/gtk/error.xpm b/Externals/wxWidgets3/art/gtk/error.xpm
index 559715c64c..2505d3d4a8 100644
--- a/Externals/wxWidgets3/art/gtk/error.xpm
+++ b/Externals/wxWidgets3/art/gtk/error.xpm
@@ -1,58 +1,58 @@
-/* XPM */
-static const char *const error_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 4 1",
-"  c None",
-"X c #242424",
-"o c #DCDF00",
-". c #C00000",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                    .....                       ",
-"                .............                   ",
-"              .................                 ",
-"             ...................                ",
-"           .......................              ",
-"          .........................             ",
-"         ...........................            ",
-"         ...........................X           ",
-"        .............................X          ",
-"       ...............................          ",
-"       ...............................X         ",
-"      .................................X        ",
-"      .................................X        ",
-"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
-"      .................................XX       ",
-"       ...............................XXX       ",
-"       ...............................XXX       ",
-"        .............................XXX        ",
-"         ...........................XXXX        ",
-"         ...........................XXX         ",
-"          .........................XXX          ",
-"           .......................XXXX          ",
-"            X...................XXXXX           ",
-"             X.................XXXXX            ",
-"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const error_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 4 1",
+"  c None",
+"X c #242424",
+"o c #DCDF00",
+". c #C00000",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                    .....                       ",
+"                .............                   ",
+"              .................                 ",
+"             ...................                ",
+"           .......................              ",
+"          .........................             ",
+"         ...........................            ",
+"         ...........................X           ",
+"        .............................X          ",
+"       ...............................          ",
+"       ...............................X         ",
+"      .................................X        ",
+"      .................................X        ",
+"      .................................XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      .................................XX       ",
+"      .................................XX       ",
+"       ...............................XXX       ",
+"       ...............................XXX       ",
+"        .............................XXX        ",
+"         ...........................XXXX        ",
+"         ...........................XXX         ",
+"          .........................XXX          ",
+"           .......................XXXX          ",
+"            X...................XXXXX           ",
+"             X.................XXXXX            ",
+"               X.............XXXXX              ",
+"                XXXX.....XXXXXXXX               ",
+"                  XXXXXXXXXXXXX                 ",
+"                      XXXXX                     ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/gtk/info.xpm b/Externals/wxWidgets3/art/gtk/info.xpm
index fe32e61982..8883955448 100644
--- a/Externals/wxWidgets3/art/gtk/info.xpm
+++ b/Externals/wxWidgets3/art/gtk/info.xpm
@@ -1,63 +1,63 @@
-/* XPM */
-static const char *const info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                     .....                      ",
-"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                    @@@@@@@                     ",
-"                      ###                       ",
-"                      $$$                       ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const info_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 9 1",
+"$ c Black",
+"O c #FFFFFF",
+"@ c #808080",
+"+ c #000080",
+"o c #E8EB01",
+"  c None",
+"X c #FFFF40",
+"# c #C0C0C0",
+". c #ABAD01",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                     .....                      ",
+"                   ..XXXXX..                    ",
+"                 ..XXXXXXXXo..                  ",
+"                .XXXOXXXXXXXoo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
+"               .XOOOXX+++XXXXoo.                ",
+"               .XOOXXX+++XXXXXo.                ",
+"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
+"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
+"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXX+++XXXoo.                 ",
+"                 .XXXX+++XXoo.                  ",
+"                  .XXXXXXXXo.                   ",
+"                  ..XXXXXXo..                   ",
+"                   .XXXXXo..                    ",
+"                   @#######@                    ",
+"                   @@@@@@@@@                    ",
+"                   @#######@                    ",
+"                   @@@@@@@@@                    ",
+"                   @#######@                    ",
+"                    @@@@@@@                     ",
+"                      ###                       ",
+"                      $$$                       ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/gtk/question.xpm b/Externals/wxWidgets3/art/gtk/question.xpm
index cb0001ec80..701f4457ba 100644
--- a/Externals/wxWidgets3/art/gtk/question.xpm
+++ b/Externals/wxWidgets3/art/gtk/question.xpm
@@ -1,75 +1,75 @@
-/* XPM */
-static const char *const question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
-"  c None",
-"& c #202020",
-"X c #AAAA00",
-"@ c #949400",
-": c #303030",
-"1 c #383838",
-"% c #2A2A00",
-", c #404040",
-"= c #B4B400",
-"- c #484848",
-"# c #151500",
-"< c #9F9F00",
-"2 c #6A6A00",
-"* c #353500",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                   .........                    ",
-"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
-"                   ........                     ",
-"                                                ",
-"                                                ",
-"                   .......                      ",
-"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
-"                   .......                      ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const question_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 21 1",
+". c Black",
+"> c #696969",
+"O c #1F1F00",
+"+ c #181818",
+"o c #F6F900",
+"; c #3F3F00",
+"$ c #111111",
+"  c None",
+"& c #202020",
+"X c #AAAA00",
+"@ c #949400",
+": c #303030",
+"1 c #383838",
+"% c #2A2A00",
+", c #404040",
+"= c #B4B400",
+"- c #484848",
+"# c #151500",
+"< c #9F9F00",
+"2 c #6A6A00",
+"* c #353500",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                   .........                    ",
+"                 ...XXXXXXX..                   ",
+"               ..XXXXoooooXXXO+                 ",
+"             ..XXooooooooooooX@..               ",
+"            ..XoooooooooooooooXX#.              ",
+"           $%XoooooooooooooooooXX#.             ",
+"          &.XoooooooXXXXXXooooooXX..            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
+"         $.XoooooX%.$     .*oooooo=..           ",
+"         .XooooooX..      -.XoooooX..           ",
+"         .XoooooX..+       .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
+"                          +.XoooooX..           ",
+"                         ,.Xoooooo<..           ",
+"                        1#XooooooXO..           ",
+"                       &#XooooooX2..            ",
+"                      $%XooooooXX..             ",
+"                     $%XooooooXX..              ",
+"                    $%XooooooXX..               ",
+"                   &.XooooooXX..                ",
+"                   .XooooooXX..                 ",
+"                  &.XoooooXX..                  ",
+"                  ..XooooXX..                   ",
+"                  ..XooooX...                   ",
+"                  ..XXooXX..&                   ",
+"                  ...XXXXX..                    ",
+"                   ........                     ",
+"                                                ",
+"                                                ",
+"                   .......                      ",
+"                  ..XXXXX..                     ",
+"                 ..XXoooXX..                    ",
+"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
+"                 ..XXoooXX..                    ",
+"                  ..XXXXX..                     ",
+"                   .......                      ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/gtk/warning.xpm b/Externals/wxWidgets3/art/gtk/warning.xpm
index 58aee153fe..35e60316c3 100644
--- a/Externals/wxWidgets3/art/gtk/warning.xpm
+++ b/Externals/wxWidgets3/art/gtk/warning.xpm
@@ -1,63 +1,63 @@
-/* XPM */
-static const char *const warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"@ c Black",
-"o c #A6A800",
-"+ c #8A8C00",
-"$ c #B8BA00",
-"  c None",
-"O c #6E7000",
-"X c #DCDF00",
-". c #C00000",
-"# c #373800",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                      .                         ",
-"                     ...                        ",
-"                     ...                        ",
-"                    .....                       ",
-"                   ...X..                       ",
-"                   ..XXX..                      ",
-"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
-"       ..............................           ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const warning_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 9 1",
+"@ c Black",
+"o c #A6A800",
+"+ c #8A8C00",
+"$ c #B8BA00",
+"  c None",
+"O c #6E7000",
+"X c #DCDF00",
+". c #C00000",
+"# c #373800",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                      .                         ",
+"                     ...                        ",
+"                     ...                        ",
+"                    .....                       ",
+"                   ...X..                       ",
+"                   ..XXX..                      ",
+"                  ...XXX...                     ",
+"                  ..XXXXX..                     ",
+"                 ..XXXXXX...                    ",
+"                ...XXoO+XX..                    ",
+"                ..XXXO@#XXX..                   ",
+"               ..XXXXO@#XXX...                  ",
+"              ...XXXXO@#XXXX..                  ",
+"              ..XXXXXO@#XXXX...                 ",
+"             ...XXXXXo@OXXXXX..                 ",
+"            ...XXXXXXo@OXXXXXX..                ",
+"            ..XXXXXXX$@OXXXXXX...               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ..............................           ",
+"       ..............................           ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/harddisk.xpm b/Externals/wxWidgets3/art/harddisk.xpm
index d21ebf3c3b..3151a7f308 100644
--- a/Externals/wxWidgets3/art/harddisk.xpm
+++ b/Externals/wxWidgets3/art/harddisk.xpm
@@ -1,60 +1,60 @@
-/* XPM */
-static const char *const harddisk_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 39 1",
-"7 c #E3E4E6",
-"4 c #FFFFFF",
-"5 c #839CB5",
-". c #547897",
-"1 c #4D7492",
-"@ c #376485",
-"o c #7A92A3",
-"u c #D1D9E5",
-"y c #446A8C",
-"i c #51B03D",
-"> c #CAD2DC",
-"O c #718BA7",
-"2 c #65839D",
-"6 c #DCE2EA",
-"0 c #C3C5C8",
-"9 c #F5F6F7",
-": c #EBEBEC",
-"< c #597B9A",
-"t c #C6CCD3",
-"  c None",
-"* c #DFE0E2",
-"e c #467291",
-"a c #526E8B",
-", c #7393AB",
-"p c #130A0B",
-"# c #AABFCD",
-"r c #B4C4D3",
-"; c #CFCFD0",
-"X c #6F90A6",
-"+ c #6A89A2",
-"- c #D2D3D4",
-"= c #DCDBDA",
-"w c #E4E9ED",
-"q c #C6C8CA",
-"% c #215579",
-"$ c #E7E7E7",
-"3 c #7F97B0",
-"8 c #C0D1DC",
-"& c #5D7C93",
-/* pixels */
-"                ",
-"   .XoooXO+@    ",
-"  #$$%%%%$$$X   ",
-"  &$*==-;$$$&   ",
-"  &:>+,<1234o5  ",
-" ###+67;;78242  ",
-" &4,49*0q*9we4. ",
-" &4+49*,,*9wo4. ",
-"&4%r,67;;782t%4.",
-"&44468rrrr84444,",
-"y11111111111111e",
-"1uu1:::::::::::1",
-"1uu1::::::::ip:1",
-"auu&:::::::::::1",
-"1111111111111111"
-};
+/* XPM */
+static const char *const harddisk_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 39 1",
+"7 c #E3E4E6",
+"4 c #FFFFFF",
+"5 c #839CB5",
+". c #547897",
+"1 c #4D7492",
+"@ c #376485",
+"o c #7A92A3",
+"u c #D1D9E5",
+"y c #446A8C",
+"i c #51B03D",
+"> c #CAD2DC",
+"O c #718BA7",
+"2 c #65839D",
+"6 c #DCE2EA",
+"0 c #C3C5C8",
+"9 c #F5F6F7",
+": c #EBEBEC",
+"< c #597B9A",
+"t c #C6CCD3",
+"  c None",
+"* c #DFE0E2",
+"e c #467291",
+"a c #526E8B",
+", c #7393AB",
+"p c #130A0B",
+"# c #AABFCD",
+"r c #B4C4D3",
+"; c #CFCFD0",
+"X c #6F90A6",
+"+ c #6A89A2",
+"- c #D2D3D4",
+"= c #DCDBDA",
+"w c #E4E9ED",
+"q c #C6C8CA",
+"% c #215579",
+"$ c #E7E7E7",
+"3 c #7F97B0",
+"8 c #C0D1DC",
+"& c #5D7C93",
+/* pixels */
+"                ",
+"   .XoooXO+@    ",
+"  #$$%%%%$$$X   ",
+"  &$*==-;$$$&   ",
+"  &:>+,<1234o5  ",
+" ###+67;;78242  ",
+" &4,49*0q*9we4. ",
+" &4+49*,,*9wo4. ",
+"&4%r,67;;782t%4.",
+"&44468rrrr84444,",
+"y11111111111111e",
+"1uu1:::::::::::1",
+"1uu1::::::::ip:1",
+"auu&:::::::::::1",
+"1111111111111111"
+};
diff --git a/Externals/wxWidgets3/art/helpicon.xpm b/Externals/wxWidgets3/art/helpicon.xpm
index 9b4cd44450..356c452399 100644
--- a/Externals/wxWidgets3/art/helpicon.xpm
+++ b/Externals/wxWidgets3/art/helpicon.xpm
@@ -1,44 +1,44 @@
-/* XPM */
-static const char *const helpicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Gray0",
-". c Blue",
-"X c #808080808080",
-"o c #c0c0c0c0c0c0",
-"O c Gray100",
-"+ c None",
-/* pixels */
-"+++++++++++XXXXXXXX+++++++++++++",
-"++++++++XXXoOOOOOOoXXX++++++++++",
-"++++++XXoOOOOOOOOOOOOoXX++++++++",
-"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
-"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
-"+++XOOOOOOOo......oOOOOOOO +++++",
-"++XOOOOOOOo.oOO....oOOOOOOO ++++",
-"+XoOOOOOOO..OOOO....OOOOOOOo +++",
-"+XOOOOOOOO....OO....OOOOOOOO X++",
-"XoOOOOOOOO....Oo....OOOOOOOOo X+",
-"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
-"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
-"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
-"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
-"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
-"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
-"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
-"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
-"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
-"++++++  oOOOOOOOOOOOOo  XXXX++++",
-"+++++++X   oOOOOOOo   XXXXX+++++",
-"++++++++XXX   oOOO XXXXXXX++++++",
-"++++++++++XXXX OOO XXXXX++++++++",
-"+++++++++++++X OOO XX+++++++++++",
-"+++++++++++++++ OO XX+++++++++++",
-"++++++++++++++++ O XX+++++++++++",
-"+++++++++++++++++  XX+++++++++++",
-"++++++++++++++++++XXX+++++++++++",
-"+++++++++++++++++++XX+++++++++++"
-};
+/* XPM */
+static const char *const helpicon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+"  c Gray0",
+". c Blue",
+"X c #808080808080",
+"o c #c0c0c0c0c0c0",
+"O c Gray100",
+"+ c None",
+/* pixels */
+"+++++++++++XXXXXXXX+++++++++++++",
+"++++++++XXXoOOOOOOoXXX++++++++++",
+"++++++XXoOOOOOOOOOOOOoXX++++++++",
+"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
+"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
+"+++XOOOOOOOo......oOOOOOOO +++++",
+"++XOOOOOOOo.oOO....oOOOOOOO ++++",
+"+XoOOOOOOO..OOOO....OOOOOOOo +++",
+"+XOOOOOOOO....OO....OOOOOOOO X++",
+"XoOOOOOOOO....Oo....OOOOOOOOo X+",
+"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
+"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
+"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
+"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
+"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
+"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
+"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
+"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
+"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
+"++++++  oOOOOOOOOOOOOo  XXXX++++",
+"+++++++X   oOOOOOOo   XXXXX+++++",
+"++++++++XXX   oOOO XXXXXXX++++++",
+"++++++++++XXXX OOO XXXXX++++++++",
+"+++++++++++++X OOO XX+++++++++++",
+"+++++++++++++++ OO XX+++++++++++",
+"++++++++++++++++ O XX+++++++++++",
+"+++++++++++++++++  XX+++++++++++",
+"++++++++++++++++++XXX+++++++++++",
+"+++++++++++++++++++XX+++++++++++"
+};
diff --git a/Externals/wxWidgets3/art/home.xpm b/Externals/wxWidgets3/art/home.xpm
index d0da8d26b8..d246b1d72e 100644
--- a/Externals/wxWidgets3/art/home.xpm
+++ b/Externals/wxWidgets3/art/home.xpm
@@ -1,24 +1,24 @@
-/* XPM */
-static const char *const home_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-". c Black",
-"X c #FFFFFF",
-"  c None",
-/* pixels */
-"      ....      ",
-"     .XXXX.     ",
-"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
-"  .XXXXXXXXXX.  ",
-" .............. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .X.....X....X. ",
-" .X.   .X.  .X. ",
-" .X.   .X.  .X. ",
-" .X.....X.  .X. ",
-" .XXXXXXX.  .X. ",
-" .........  ... "
-};
+/* XPM */
+static const char *const home_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+". c Black",
+"X c #FFFFFF",
+"  c None",
+/* pixels */
+"      ....      ",
+"     .XXXX.     ",
+"    .XXXXXX.    ",
+"   .XXXXXXXX.   ",
+"  .XXXXXXXXXX.  ",
+" .............. ",
+" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
+" .X.....X....X. ",
+" .X.   .X.  .X. ",
+" .X.   .X.  .X. ",
+" .X.....X.  .X. ",
+" .XXXXXXX.  .X. ",
+" .........  ... "
+};
diff --git a/Externals/wxWidgets3/art/htmbook.xpm b/Externals/wxWidgets3/art/htmbook.xpm
index d0456ee6d5..e49b4685f9 100644
--- a/Externals/wxWidgets3/art/htmbook.xpm
+++ b/Externals/wxWidgets3/art/htmbook.xpm
@@ -1,25 +1,25 @@
-/* XPM */
-static const char *const htmbook_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c Black",
-"X	c #000080",
-"o	c #c0c0c0",
-"O	c #808080",
-"+	c Gray100",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
-"     .X.o..     ",
-"      ...       "};
+/* XPM */
+static const char *const htmbook_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c Black",
+"X	c #000080",
+"o	c #c0c0c0",
+"O	c #808080",
+"+	c Gray100",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".oXXXXXXXXXX.   ",
+".XoXXXXXXXXXX.  ",
+".XXoXXXXXXXXXX. ",
+".XXXoXXXXXXXXX..",
+".XXXXoXXXXXX..O ",
+" .XXXXoXXX..O+O ",
+"  .XXXXo..O++o..",
+"   .XXX.O+++o.. ",
+"    .XX.o+o..   ",
+"     .X.o..     ",
+"      ...       "};
diff --git a/Externals/wxWidgets3/art/htmfoldr.xpm b/Externals/wxWidgets3/art/htmfoldr.xpm
index 4f84e8aeff..dacef687b1 100644
--- a/Externals/wxWidgets3/art/htmfoldr.xpm
+++ b/Externals/wxWidgets3/art/htmfoldr.xpm
@@ -1,25 +1,25 @@
-/* XPM */
-static const char *const htmfoldr_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c Black",
-"X	c #000080",
-"o	c #c0c0c0",
-"O	c #808080",
-"+	c Gray100",
-"                ",
-"       ..       ",
-"     ..XX.      ",
-"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
-"     .X.o..     ",
-"      ...       "};
+/* XPM */
+static const char *const htmfoldr_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c Black",
+"X	c #000080",
+"o	c #c0c0c0",
+"O	c #808080",
+"+	c Gray100",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".oXXXXXXXXXX.   ",
+".XoXXXXXXXXXX.  ",
+".XXoXXXXXXXXXX. ",
+".XXXoXXXXXXXXX..",
+".XXXXoXXXXXX..O ",
+" .XXXXoXXX..O+O ",
+"  .XXXXo..O++o..",
+"   .XXX.O+++o.. ",
+"    .XX.o+o..   ",
+"     .X.o..     ",
+"      ...       "};
diff --git a/Externals/wxWidgets3/art/htmoptns.xpm b/Externals/wxWidgets3/art/htmoptns.xpm
index 0d178ab2e1..8806749ea4 100644
--- a/Externals/wxWidgets3/art/htmoptns.xpm
+++ b/Externals/wxWidgets3/art/htmoptns.xpm
@@ -1,20 +1,20 @@
-/* XPM */
-static const char *const htmoptns_xpm[] = {
-"16 15 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"      ..        ",
-"      ...       ",
-"     ....       ",
-"     . ...      ",
-"    .. ...      ",
-"    .   ..      ",
-"   ..   ...     ",
-"   .     ..     ",
-"   .........    ",
-"  ..     ...    ",
-"  .       ...   ",
-" ..       ...   ",
-" ....   ....... ",
-"                "};
+/* XPM */
+static const char *const htmoptns_xpm[] = {
+"16 15 2 1",
+" 	c None",
+".	c #000000",
+"                ",
+"      ..        ",
+"      ...       ",
+"     ....       ",
+"     . ...      ",
+"    .. ...      ",
+"    .   ..      ",
+"   ..   ...     ",
+"   .     ..     ",
+"   .........    ",
+"  ..     ...    ",
+"  .       ...   ",
+" ..       ...   ",
+" ....   ....... ",
+"                "};
diff --git a/Externals/wxWidgets3/art/htmpage.xpm b/Externals/wxWidgets3/art/htmpage.xpm
index f7d9f472ab..e4fa3fbc71 100644
--- a/Externals/wxWidgets3/art/htmpage.xpm
+++ b/Externals/wxWidgets3/art/htmpage.xpm
@@ -1,23 +1,23 @@
-/* XPM */
-static const char *const htmpage_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #808080",
-"X	c Gray100",
-"o	c Black",
-"                ",
-"  ..........    ",
-"  .XXXXXXXX..   ",
-"  .XXXXXXXXooo  ",
-"  .X......XXXo  ",
-"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
-"  .XXXXXXXXXXo  ",
-"  oooooooooooo  "};
+/* XPM */
+static const char *const htmpage_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #808080",
+"X	c Gray100",
+"o	c Black",
+"                ",
+"  ..........    ",
+"  .XXXXXXXX..   ",
+"  .XXXXXXXXooo  ",
+"  .X......XXXo  ",
+"  .XXXXXXXXXXo  ",
+"  .X........Xo  ",
+"  .XXXXXXXXXXo  ",
+"  .X........Xo  ",
+"  .XXXXXXXXXXo  ",
+"  .X........Xo  ",
+"  .XXXXXXXXXXo  ",
+"  .X........Xo  ",
+"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
+"  oooooooooooo  "};
diff --git a/Externals/wxWidgets3/art/htmsidep.xpm b/Externals/wxWidgets3/art/htmsidep.xpm
index 19bb863730..30f6a92392 100644
--- a/Externals/wxWidgets3/art/htmsidep.xpm
+++ b/Externals/wxWidgets3/art/htmsidep.xpm
@@ -1,27 +1,27 @@
-/* XPM */
-static const char *const htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 6 1",
-". c Black",
-"X c #FFFFFF",
-"+ c #808080",
-"  c None",
-"O c #0000C0",
-"o c #C0C0C0",
-/* pixels */
-"                ",
-" .............. ",
-" .XXXX.ooooooo. ",
-" .XOXX.oo...oo. ",
-" .XXOX.ooooooo. ",
-" .OOOO.o...+.o. ",
-" .XXOX.ooooooo. ",
-" .XOXX.ooooooo. ",
-" .XXXX.o..+ooo. ",
-" .XXOX.ooooooo. ",
-" .XOXX.o...+.o. ",
-" .OOOO.ooooooo. ",
-" .XOXX.o.+...o. ",
-" .XXOX.ooooooo. ",
-" .............. "
-};
+/* XPM */
+static const char *const htmsidep_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 6 1",
+". c Black",
+"X c #FFFFFF",
+"+ c #808080",
+"  c None",
+"O c #0000C0",
+"o c #C0C0C0",
+/* pixels */
+"                ",
+" .............. ",
+" .XXXX.ooooooo. ",
+" .XOXX.oo...oo. ",
+" .XXOX.ooooooo. ",
+" .OOOO.o...+.o. ",
+" .XXOX.ooooooo. ",
+" .XOXX.ooooooo. ",
+" .XXXX.o..+ooo. ",
+" .XXOX.ooooooo. ",
+" .XOXX.o...+.o. ",
+" .OOOO.ooooooo. ",
+" .XOXX.o.+...o. ",
+" .XXOX.ooooooo. ",
+" .............. "
+};
diff --git a/Externals/wxWidgets3/art/listview.xpm b/Externals/wxWidgets3/art/listview.xpm
index 2d8afc4198..30f748abb4 100644
--- a/Externals/wxWidgets3/art/listview.xpm
+++ b/Externals/wxWidgets3/art/listview.xpm
@@ -1,25 +1,25 @@
-/* XPM */
-static const char *const listview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 4 1",
-"  c Black",
-". c #FFFFFF",
-"X c #000084",
-"o c #848484",
-/* pixels */
-"                ",
-" .............. ",
-" .XXX.......... ",
-" .XXX.  o   o . ",
-" .XXX.......... ",
-" .............. ",
-" .XXX.......... ",
-" .XXX.   o    . ",
-" .XXX.......... ",
-" .............. ",
-" .XXX.......... ",
-" .XXX. o    o . ",
-" .XXX.......... ",
-" .............. ",
-"                "
-};
+/* XPM */
+static const char *const listview_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"  c Black",
+". c #FFFFFF",
+"X c #000084",
+"o c #848484",
+/* pixels */
+"                ",
+" .............. ",
+" .XXX.......... ",
+" .XXX.  o   o . ",
+" .XXX.......... ",
+" .............. ",
+" .XXX.......... ",
+" .XXX.   o    . ",
+" .XXX.......... ",
+" .............. ",
+" .XXX.......... ",
+" .XXX. o    o . ",
+" .XXX.......... ",
+" .............. ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/missimg.xpm b/Externals/wxWidgets3/art/missimg.xpm
index 599aca7896..80eecbcf2a 100644
--- a/Externals/wxWidgets3/art/missimg.xpm
+++ b/Externals/wxWidgets3/art/missimg.xpm
@@ -1,43 +1,43 @@
-/* XPM */
-static const char *const missimg_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 5 1",
-"X c Black",
-"o c #FFFFFF",
-"  c None",
-". c #C0C0C0",
-"O c #E0E0E0",
-/* pixels */
-" .............................X ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
-" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
-"    XXXXX    XOOOOOOOOOOOOOOooX ",
-"              XOOOXXXOOOOOOOooX ",
-"               XXX   XXOOOOOooX ",
-"                       XOOOOooX ",
-" .                      XOOOooX ",
-" ..                      XXOooX ",
-" .o..                      XooX ",
-" .ooO...                    XXX ",
-" .ooOOOO..........              ",
-" .ooOOOOOOOOOOOOOO..            ",
-" .ooOOOOOOOOOOOOOOOO..          ",
-" .ooOOOOOOOOOOOOOOOOOO......... ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
-" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
-};
+/* XPM */
+static const char *const missimg_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 5 1",
+"X c Black",
+"o c #FFFFFF",
+"  c None",
+". c #C0C0C0",
+"O c #E0E0E0",
+/* pixels */
+" .............................X ",
+" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
+" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
+"    XXXXX    XOOOOOOOOOOOOOOooX ",
+"              XOOOXXXOOOOOOOooX ",
+"               XXX   XXOOOOOooX ",
+"                       XOOOOooX ",
+" .                      XOOOooX ",
+" ..                      XXOooX ",
+" .o..                      XooX ",
+" .ooO...                    XXX ",
+" .ooOOOO..........              ",
+" .ooOOOOOOOOOOOOOO..            ",
+" .ooOOOOOOOOOOOOOOOO..          ",
+" .ooOOOOOOOOOOOOOOOOOO......... ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
+" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
+};
diff --git a/Externals/wxWidgets3/art/motif/error.xpm b/Externals/wxWidgets3/art/motif/error.xpm
index 559715c64c..2505d3d4a8 100644
--- a/Externals/wxWidgets3/art/motif/error.xpm
+++ b/Externals/wxWidgets3/art/motif/error.xpm
@@ -1,58 +1,58 @@
-/* XPM */
-static const char *const error_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 4 1",
-"  c None",
-"X c #242424",
-"o c #DCDF00",
-". c #C00000",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                    .....                       ",
-"                .............                   ",
-"              .................                 ",
-"             ...................                ",
-"           .......................              ",
-"          .........................             ",
-"         ...........................            ",
-"         ...........................X           ",
-"        .............................X          ",
-"       ...............................          ",
-"       ...............................X         ",
-"      .................................X        ",
-"      .................................X        ",
-"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
-"      .................................XX       ",
-"       ...............................XXX       ",
-"       ...............................XXX       ",
-"        .............................XXX        ",
-"         ...........................XXXX        ",
-"         ...........................XXX         ",
-"          .........................XXX          ",
-"           .......................XXXX          ",
-"            X...................XXXXX           ",
-"             X.................XXXXX            ",
-"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const error_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 4 1",
+"  c None",
+"X c #242424",
+"o c #DCDF00",
+". c #C00000",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                    .....                       ",
+"                .............                   ",
+"              .................                 ",
+"             ...................                ",
+"           .......................              ",
+"          .........................             ",
+"         ...........................            ",
+"         ...........................X           ",
+"        .............................X          ",
+"       ...............................          ",
+"       ...............................X         ",
+"      .................................X        ",
+"      .................................X        ",
+"      .................................XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      .................................XX       ",
+"      .................................XX       ",
+"       ...............................XXX       ",
+"       ...............................XXX       ",
+"        .............................XXX        ",
+"         ...........................XXXX        ",
+"         ...........................XXX         ",
+"          .........................XXX          ",
+"           .......................XXXX          ",
+"            X...................XXXXX           ",
+"             X.................XXXXX            ",
+"               X.............XXXXX              ",
+"                XXXX.....XXXXXXXX               ",
+"                  XXXXXXXXXXXXX                 ",
+"                      XXXXX                     ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/motif/info.xpm b/Externals/wxWidgets3/art/motif/info.xpm
index fe32e61982..8883955448 100644
--- a/Externals/wxWidgets3/art/motif/info.xpm
+++ b/Externals/wxWidgets3/art/motif/info.xpm
@@ -1,63 +1,63 @@
-/* XPM */
-static const char *const info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                     .....                      ",
-"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
-"                    @@@@@@@                     ",
-"                      ###                       ",
-"                      $$$                       ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const info_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 9 1",
+"$ c Black",
+"O c #FFFFFF",
+"@ c #808080",
+"+ c #000080",
+"o c #E8EB01",
+"  c None",
+"X c #FFFF40",
+"# c #C0C0C0",
+". c #ABAD01",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                     .....                      ",
+"                   ..XXXXX..                    ",
+"                 ..XXXXXXXXo..                  ",
+"                .XXXOXXXXXXXoo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
+"               .XOOOXX+++XXXXoo.                ",
+"               .XOOXXX+++XXXXXo.                ",
+"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
+"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
+"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXX+++XXXoo.                 ",
+"                 .XXXX+++XXoo.                  ",
+"                  .XXXXXXXXo.                   ",
+"                  ..XXXXXXo..                   ",
+"                   .XXXXXo..                    ",
+"                   @#######@                    ",
+"                   @@@@@@@@@                    ",
+"                   @#######@                    ",
+"                   @@@@@@@@@                    ",
+"                   @#######@                    ",
+"                    @@@@@@@                     ",
+"                      ###                       ",
+"                      $$$                       ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/motif/question.xpm b/Externals/wxWidgets3/art/motif/question.xpm
index cb0001ec80..701f4457ba 100644
--- a/Externals/wxWidgets3/art/motif/question.xpm
+++ b/Externals/wxWidgets3/art/motif/question.xpm
@@ -1,75 +1,75 @@
-/* XPM */
-static const char *const question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
-"  c None",
-"& c #202020",
-"X c #AAAA00",
-"@ c #949400",
-": c #303030",
-"1 c #383838",
-"% c #2A2A00",
-", c #404040",
-"= c #B4B400",
-"- c #484848",
-"# c #151500",
-"< c #9F9F00",
-"2 c #6A6A00",
-"* c #353500",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                   .........                    ",
-"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
-"                   ........                     ",
-"                                                ",
-"                                                ",
-"                   .......                      ",
-"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
-"                   .......                      ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const question_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 21 1",
+". c Black",
+"> c #696969",
+"O c #1F1F00",
+"+ c #181818",
+"o c #F6F900",
+"; c #3F3F00",
+"$ c #111111",
+"  c None",
+"& c #202020",
+"X c #AAAA00",
+"@ c #949400",
+": c #303030",
+"1 c #383838",
+"% c #2A2A00",
+", c #404040",
+"= c #B4B400",
+"- c #484848",
+"# c #151500",
+"< c #9F9F00",
+"2 c #6A6A00",
+"* c #353500",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                   .........                    ",
+"                 ...XXXXXXX..                   ",
+"               ..XXXXoooooXXXO+                 ",
+"             ..XXooooooooooooX@..               ",
+"            ..XoooooooooooooooXX#.              ",
+"           $%XoooooooooooooooooXX#.             ",
+"          &.XoooooooXXXXXXooooooXX..            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
+"         $.XoooooX%.$     .*oooooo=..           ",
+"         .XooooooX..      -.XoooooX..           ",
+"         .XoooooX..+       .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
+"                          +.XoooooX..           ",
+"                         ,.Xoooooo<..           ",
+"                        1#XooooooXO..           ",
+"                       &#XooooooX2..            ",
+"                      $%XooooooXX..             ",
+"                     $%XooooooXX..              ",
+"                    $%XooooooXX..               ",
+"                   &.XooooooXX..                ",
+"                   .XooooooXX..                 ",
+"                  &.XoooooXX..                  ",
+"                  ..XooooXX..                   ",
+"                  ..XooooX...                   ",
+"                  ..XXooXX..&                   ",
+"                  ...XXXXX..                    ",
+"                   ........                     ",
+"                                                ",
+"                                                ",
+"                   .......                      ",
+"                  ..XXXXX..                     ",
+"                 ..XXoooXX..                    ",
+"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
+"                 ..XXoooXX..                    ",
+"                  ..XXXXX..                     ",
+"                   .......                      ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/motif/warning.xpm b/Externals/wxWidgets3/art/motif/warning.xpm
index 58aee153fe..35e60316c3 100644
--- a/Externals/wxWidgets3/art/motif/warning.xpm
+++ b/Externals/wxWidgets3/art/motif/warning.xpm
@@ -1,63 +1,63 @@
-/* XPM */
-static const char *const warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"@ c Black",
-"o c #A6A800",
-"+ c #8A8C00",
-"$ c #B8BA00",
-"  c None",
-"O c #6E7000",
-"X c #DCDF00",
-". c #C00000",
-"# c #373800",
-/* pixels */
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                      .                         ",
-"                     ...                        ",
-"                     ...                        ",
-"                    .....                       ",
-"                   ...X..                       ",
-"                   ..XXX..                      ",
-"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
-"       ..............................           ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "
-};
+/* XPM */
+static const char *const warning_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 9 1",
+"@ c Black",
+"o c #A6A800",
+"+ c #8A8C00",
+"$ c #B8BA00",
+"  c None",
+"O c #6E7000",
+"X c #DCDF00",
+". c #C00000",
+"# c #373800",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                      .                         ",
+"                     ...                        ",
+"                     ...                        ",
+"                    .....                       ",
+"                   ...X..                       ",
+"                   ..XXX..                      ",
+"                  ...XXX...                     ",
+"                  ..XXXXX..                     ",
+"                 ..XXXXXX...                    ",
+"                ...XXoO+XX..                    ",
+"                ..XXXO@#XXX..                   ",
+"               ..XXXXO@#XXX...                  ",
+"              ...XXXXO@#XXXX..                  ",
+"              ..XXXXXO@#XXXX...                 ",
+"             ...XXXXXo@OXXXXX..                 ",
+"            ...XXXXXXo@OXXXXXX..                ",
+"            ..XXXXXXX$@OXXXXXX...               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ..............................           ",
+"       ..............................           ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "
+};
diff --git a/Externals/wxWidgets3/art/new.xpm b/Externals/wxWidgets3/art/new.xpm
index 15826c8d22..6a0b133350 100644
--- a/Externals/wxWidgets3/art/new.xpm
+++ b/Externals/wxWidgets3/art/new.xpm
@@ -1,50 +1,50 @@
-/* XPM */
-static const char *const new_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 29 1",
-"* c #97C4E7",
-"- c #72A8D2",
-": c #FFFFFF",
-"9 c #839CB5",
-"o c #6B98B8",
-"X c #5A89A6",
-"# c #3A749C",
-", c #D1E5F5",
-"0 c #85A7BC",
-"$ c #C3DDF1",
-"8 c #749BB4",
-"; c #5F9BC8",
-"  c None",
-"+ c #538DB3",
-"= c #85BBE2",
-"3 c #EFF6FC",
-"O c #6591AE",
-"5 c #F7FBFD",
-"7 c #FAFCFE",
-"< c #DAEAF7",
-"4 c #E9F3FA",
-"6 c #FDFDFE",
-"1 c #E2EFF8",
-". c #8EA9BC",
-"% c #B6D5EE",
-"& c #A5CCEA",
-"> c #ACE95B",
-"2 c #F4F9FD",
-"@ c #4581AA",
-/* pixels */
-"   .XoOO+@#.    ",
-"   .$$%&*=O-;   ",
-"  @@@@$%&*O:*o  ",
-"  @>>@$$%&O::*o ",
-"@@@>>@@@$%OOoO+ ",
-"@>>>>>>@,$%&*=+ ",
-"@>>>>>>@<,$%&*+ ",
-"@@@>>@@@1<,$%&O ",
-"  @>>@2341<,$%O ",
-"  @@@@52341<,$o ",
-"   .:6752341<,8 ",
-"   .::6752341<8 ",
-"   .:::67523419 ",
-"   .::::6752340 ",
-"   ............ "
-};
+/* XPM */
+static const char *const new_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 29 1",
+"* c #97C4E7",
+"- c #72A8D2",
+": c #FFFFFF",
+"9 c #839CB5",
+"o c #6B98B8",
+"X c #5A89A6",
+"# c #3A749C",
+", c #D1E5F5",
+"0 c #85A7BC",
+"$ c #C3DDF1",
+"8 c #749BB4",
+"; c #5F9BC8",
+"  c None",
+"+ c #538DB3",
+"= c #85BBE2",
+"3 c #EFF6FC",
+"O c #6591AE",
+"5 c #F7FBFD",
+"7 c #FAFCFE",
+"< c #DAEAF7",
+"4 c #E9F3FA",
+"6 c #FDFDFE",
+"1 c #E2EFF8",
+". c #8EA9BC",
+"% c #B6D5EE",
+"& c #A5CCEA",
+"> c #ACE95B",
+"2 c #F4F9FD",
+"@ c #4581AA",
+/* pixels */
+"   .XoOO+@#.    ",
+"   .$$%&*=O-;   ",
+"  @@@@$%&*O:*o  ",
+"  @>>@$$%&O::*o ",
+"@@@>>@@@$%OOoO+ ",
+"@>>>>>>@,$%&*=+ ",
+"@>>>>>>@<,$%&*+ ",
+"@@@>>@@@1<,$%&O ",
+"  @>>@2341<,$%O ",
+"  @@@@52341<,$o ",
+"   .:6752341<,8 ",
+"   .::6752341<8 ",
+"   .:::67523419 ",
+"   .::::6752340 ",
+"   ............ "
+};
diff --git a/Externals/wxWidgets3/art/new_dir.xpm b/Externals/wxWidgets3/art/new_dir.xpm
index f49515e71b..d100eea753 100644
--- a/Externals/wxWidgets3/art/new_dir.xpm
+++ b/Externals/wxWidgets3/art/new_dir.xpm
@@ -1,43 +1,43 @@
-/* XPM */
-static const char *const new_dir_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 22 1",
-"X c Black",
-"> c #9BACC2",
-"o c #547897",
-"1 c #7F99B4",
-"O c #D1D9E5",
-"< c #EAEDF3",
-"# c #CAD2DC",
-"3 c #718BA7",
-"@ c #BECAD9",
-"& c #E1E6EE",
-"; c #F5F6F7",
-". c #FFFF00",
-", c #8DA0B9",
-"  c None",
-"% c #D6DFE7",
-"$ c #D2D9E0",
-"- c #ADBACE",
-"= c #EEF1F3",
-"+ c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"* c #E5EAF1",
-/* pixels */
-"         .X .XX.",
-" ooooo    .X.X. ",
-" oOOOOo  XX...XX",
-" oooooooo.......",
-" o+@#$%&*XX...XX",
-" o+@#$%&*=.X.X. ",
-" o-+@#O%&.X;.X .",
-" o:-+@#O%&*=;o  ",
-" o>:-+@#O%&*=o  ",
-" o,>:-+@#O%&<o  ",
-" o1,>:-+@#O%&o  ",
-" o21,>:-+@#O%o  ",
-" o321,>:-+@#Oo  ",
-" ooooooooooooo  ",
-"                "
-};
+/* XPM */
+static const char *const new_dir_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 22 1",
+"X c Black",
+"> c #9BACC2",
+"o c #547897",
+"1 c #7F99B4",
+"O c #D1D9E5",
+"< c #EAEDF3",
+"# c #CAD2DC",
+"3 c #718BA7",
+"@ c #BECAD9",
+"& c #E1E6EE",
+"; c #F5F6F7",
+". c #FFFF00",
+", c #8DA0B9",
+"  c None",
+"% c #D6DFE7",
+"$ c #D2D9E0",
+"- c #ADBACE",
+"= c #EEF1F3",
+"+ c #B3BFD1",
+"2 c #7A90AC",
+": c #A2B3C5",
+"* c #E5EAF1",
+/* pixels */
+"         .X .XX.",
+" ooooo    .X.X. ",
+" oOOOOo  XX...XX",
+" oooooooo.......",
+" o+@#$%&*XX...XX",
+" o+@#$%&*=.X.X. ",
+" o-+@#O%&.X;.X .",
+" o:-+@#O%&*=;o  ",
+" o>:-+@#O%&*=o  ",
+" o,>:-+@#O%&<o  ",
+" o1,>:-+@#O%&o  ",
+" o21,>:-+@#O%o  ",
+" o321,>:-+@#Oo  ",
+" ooooooooooooo  ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/paste.xpm b/Externals/wxWidgets3/art/paste.xpm
index a2155a3e9b..2458378f86 100644
--- a/Externals/wxWidgets3/art/paste.xpm
+++ b/Externals/wxWidgets3/art/paste.xpm
@@ -1,46 +1,46 @@
-/* XPM */
-static const char *const paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"< c #FEECE4",
-"> c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
-"  c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
-/* pixels */
-"   ......       ",
-" .XoOOOOoo.     ",
-".+XOOOOOOX@.    ",
-".+XXXXXXXX@.    ",
-".#++$$%@.....   ",
-".##++$$%.&*.=.  ",
-".-##++$$.;&.==. ",
-".--##++$.:;.... ",
-".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
-".45<<>--....... ",
-".6453<>----.    ",
-"............    "
-};
+/* XPM */
+static const char *const paste_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 25 1",
+"< c #FEECE4",
+"> c #FEE3D7",
+"O c #FFFFFF",
+"o c #7B767D",
+"% c #F79586",
+"& c #CAE1F3",
+"@ c #F08B62",
+"# c #FCCBB8",
+"- c #FDD8C9",
+"4 c #FFF8F4",
+"5 c #FFF5F0",
+"  c None",
+"$ c #F8AA8F",
+", c #EFF6FC",
+"1 c #F7FBFD",
+"2 c #FAFCFE",
+"; c #DAEAF7",
+": c #E9F3FA",
+"6 c #FFFAF8",
+". c #3C78A6",
+"3 c #FFF1ED",
+"X c #9B8687",
+"+ c #FBBCA4",
+"* c #B6D5EE",
+"= c #F4F9FD",
+/* pixels */
+"   ......       ",
+" .XoOOOOoo.     ",
+".+XOOOOOOX@.    ",
+".+XXXXXXXX@.    ",
+".#++$$%@.....   ",
+".##++$$%.&*.=.  ",
+".-##++$$.;&.==. ",
+".--##++$.:;.... ",
+".>--##++.,:;&*. ",
+".<>--##+.1,:;&. ",
+".<<>--##.21,:;. ",
+".3<<>--#.O21=:. ",
+".45<<>--....... ",
+".6453<>----.    ",
+"............    "
+};
diff --git a/Externals/wxWidgets3/art/print.xpm b/Externals/wxWidgets3/art/print.xpm
index 9afe540134..dbdfe6b4d9 100644
--- a/Externals/wxWidgets3/art/print.xpm
+++ b/Externals/wxWidgets3/art/print.xpm
@@ -1,60 +1,60 @@
-/* XPM */
-static const char *const print_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 39 1",
-"< c #E3E4E6",
-"+ c #C3C3C4",
-"i c #FFFFFF",
-": c #74879B",
-"# c #5A89A6",
-"a c #F1F4F7",
-"r c #5A809C",
-"@ c #BDCCD9",
-"e c #7A92A4",
-"% c #3F6F93",
-"t c #9FA2A6",
-"3 c #939495",
-"w c #5F666D",
-"9 c #65839E",
-"5 c #4A7291",
-"$ c #4B7F9E",
-"  c None",
-"O c #DFE0E2",
-"o c #F3F3F3",
-"; c #84A5BB",
-"& c #467291",
-". c #7897AD",
-"* c #407598",
-"4 c #CFCFD0",
-"7 c #6F90A6",
-"y c #6A89A2",
-"0 c #AAADB2",
-"1 c #D2D3D4",
-"u c #4F7592",
-", c #BCBDBE",
-"p c #57778E",
-"q c #979BA0",
-"2 c #ABABAC",
-"- c #E7E7E7",
-"= c #D6DEE6",
-"> c #9FA0A0",
-"8 c #829EB5",
-"X c #8FB0C3",
-"6 c #5D7C93",
-/* pixels */
-"   .XXXXXXXX    ",
-"   .oooooooX    ",
-"   .OOOOOOOX    ",
-"   .+++++++X    ",
-"@##$%&&&&&%*##@ ",
-"$=-;:>,<123$-=$ ",
-".44.5678.96$44. ",
-"7,,,,,,,,,,,,,7 ",
-"900qwwwwwwwe009 ",
-"rtt9ryyyyyyuttr ",
-"6qq6iiiiiii%qq6 ",
-"633paiiiiii%336 ",
-"XXX*iiiiiii%XXX ",
-"   6iiiiiii%    ",
-"   $XXXXXXX#    "
-};
+/* XPM */
+static const char *const print_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 39 1",
+"< c #E3E4E6",
+"+ c #C3C3C4",
+"i c #FFFFFF",
+": c #74879B",
+"# c #5A89A6",
+"a c #F1F4F7",
+"r c #5A809C",
+"@ c #BDCCD9",
+"e c #7A92A4",
+"% c #3F6F93",
+"t c #9FA2A6",
+"3 c #939495",
+"w c #5F666D",
+"9 c #65839E",
+"5 c #4A7291",
+"$ c #4B7F9E",
+"  c None",
+"O c #DFE0E2",
+"o c #F3F3F3",
+"; c #84A5BB",
+"& c #467291",
+". c #7897AD",
+"* c #407598",
+"4 c #CFCFD0",
+"7 c #6F90A6",
+"y c #6A89A2",
+"0 c #AAADB2",
+"1 c #D2D3D4",
+"u c #4F7592",
+", c #BCBDBE",
+"p c #57778E",
+"q c #979BA0",
+"2 c #ABABAC",
+"- c #E7E7E7",
+"= c #D6DEE6",
+"> c #9FA0A0",
+"8 c #829EB5",
+"X c #8FB0C3",
+"6 c #5D7C93",
+/* pixels */
+"   .XXXXXXXX    ",
+"   .oooooooX    ",
+"   .OOOOOOOX    ",
+"   .+++++++X    ",
+"@##$%&&&&&%*##@ ",
+"$=-;:>,<123$-=$ ",
+".44.5678.96$44. ",
+"7,,,,,,,,,,,,,7 ",
+"900qwwwwwwwe009 ",
+"rtt9ryyyyyyuttr ",
+"6qq6iiiiiii%qq6 ",
+"633paiiiiii%336 ",
+"XXX*iiiiiii%XXX ",
+"   6iiiiiii%    ",
+"   $XXXXXXX#    "
+};
diff --git a/Externals/wxWidgets3/art/quit.xpm b/Externals/wxWidgets3/art/quit.xpm
index df8abd675d..885bbd0fa4 100644
--- a/Externals/wxWidgets3/art/quit.xpm
+++ b/Externals/wxWidgets3/art/quit.xpm
@@ -1,90 +1,90 @@
-/* XPM */
-static const char *const quit_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 69 1",
-"@ c Black",
-"i c #9AEA53",
-"D c #7E9BB1",
-"H c #839FB4",
-", c #B7C7D3",
-"8 c #BCCBD6",
-"7 c #C1CFDA",
-"v c #92ABBD",
-"- c #D0DBE2",
-"O c #547897",
-"+ c #376485",
-"L c #7090A8",
-"t c #AEC0CE",
-"g c #B3C4D1",
-"S c #84A0B4",
-"G c #89A4B8",
-"> c #BDCCD7",
-"F c #5A809C",
-"2 c #C2D0DA",
-"k c #93ACBE",
-"= c #D6E0E6",
-"* c #446A8C",
-"z c #A5B9C8",
-"# c #DEE5EB",
-"0 c #AFC1CE",
-"r c #B4C5D2",
-"p c #B9C9D5",
-"A c #8AA5B8",
-"M c #92AABD",
-"j c #A6BAC9",
-"K c #7796AC",
-"l c #ABBECC",
-"o c #E4EAEF",
-"9 c #B5C6D2",
-"  c None",
-"; c #C9D6DF",
-"X c #305F81",
-"m c #98AFC0",
-"V c #9DB3C3",
-"% c #D1DBE3",
-"u c #A2B7C6",
-"y c #A7BBCA",
-"h c #ACBFCD",
-"4 c #B6C7D3",
-"w c #C0CFD9",
-"d c #982106",
-"B c #85A0B5",
-"6 c #C8D4DE",
-"c c #99B0C1",
-"x c #9EB4C4",
-"$ c #D7E0E7",
-"q c #A8BCCA",
-"s c #ADC0CD",
-"3 c #BCCCD7",
-"N c #8BA5B9",
-": c #C4D1DB",
-"1 c #C9D5DE",
-"f c #9AB1C2",
-"n c #A4B9C8",
-"a c #B3C5D1",
-". c #215579",
-"J c #7D9AB0",
-"& c #829EB5",
-"e c #BBCAD6",
-"b c #8CA6B9",
-"Z c #91AABC",
-"C c #96AEC0",
-"< c #CFDAE2",
-"5 c #AFC2CF",
-/* pixels */
-" ..XXXXXXXXXX   ",
-" XoO+X@@@@@@X   ",
-" X#$%&X*@@@@X   ",
-" X=-;:>,X@@@X   ",
-" X<12345X@@@X   ",
-" X67890qX@XXX   ",
-" XwertyuX@XiX   ",
-" XpasddfX++iiX  ",
-" XghjddkXiiiiiX ",
-" XlzxcvbXiiiiiiX",
-" XnxmMNBXiiiiiX ",
-" XVCZASDXXXiiX  ",
-" XXFGHJKX XiX   ",
-"   FXXFLX XX    ",
-"      XX*       "
-};
+/* XPM */
+static const char *const quit_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 69 1",
+"@ c Black",
+"i c #9AEA53",
+"D c #7E9BB1",
+"H c #839FB4",
+", c #B7C7D3",
+"8 c #BCCBD6",
+"7 c #C1CFDA",
+"v c #92ABBD",
+"- c #D0DBE2",
+"O c #547897",
+"+ c #376485",
+"L c #7090A8",
+"t c #AEC0CE",
+"g c #B3C4D1",
+"S c #84A0B4",
+"G c #89A4B8",
+"> c #BDCCD7",
+"F c #5A809C",
+"2 c #C2D0DA",
+"k c #93ACBE",
+"= c #D6E0E6",
+"* c #446A8C",
+"z c #A5B9C8",
+"# c #DEE5EB",
+"0 c #AFC1CE",
+"r c #B4C5D2",
+"p c #B9C9D5",
+"A c #8AA5B8",
+"M c #92AABD",
+"j c #A6BAC9",
+"K c #7796AC",
+"l c #ABBECC",
+"o c #E4EAEF",
+"9 c #B5C6D2",
+"  c None",
+"; c #C9D6DF",
+"X c #305F81",
+"m c #98AFC0",
+"V c #9DB3C3",
+"% c #D1DBE3",
+"u c #A2B7C6",
+"y c #A7BBCA",
+"h c #ACBFCD",
+"4 c #B6C7D3",
+"w c #C0CFD9",
+"d c #982106",
+"B c #85A0B5",
+"6 c #C8D4DE",
+"c c #99B0C1",
+"x c #9EB4C4",
+"$ c #D7E0E7",
+"q c #A8BCCA",
+"s c #ADC0CD",
+"3 c #BCCCD7",
+"N c #8BA5B9",
+": c #C4D1DB",
+"1 c #C9D5DE",
+"f c #9AB1C2",
+"n c #A4B9C8",
+"a c #B3C5D1",
+". c #215579",
+"J c #7D9AB0",
+"& c #829EB5",
+"e c #BBCAD6",
+"b c #8CA6B9",
+"Z c #91AABC",
+"C c #96AEC0",
+"< c #CFDAE2",
+"5 c #AFC2CF",
+/* pixels */
+" ..XXXXXXXXXX   ",
+" XoO+X@@@@@@X   ",
+" X#$%&X*@@@@X   ",
+" X=-;:>,X@@@X   ",
+" X<12345X@@@X   ",
+" X67890qX@XXX   ",
+" XwertyuX@XiX   ",
+" XpasddfX++iiX  ",
+" XghjddkXiiiiiX ",
+" XlzxcvbXiiiiiiX",
+" XnxmMNBXiiiiiX ",
+" XVCZASDXXXiiX  ",
+" XXFGHJKX XiX   ",
+"   FXXFLX XX    ",
+"      XX*       "
+};
diff --git a/Externals/wxWidgets3/art/redo.xpm b/Externals/wxWidgets3/art/redo.xpm
index d20afdcc8c..84ed3553ca 100644
--- a/Externals/wxWidgets3/art/redo.xpm
+++ b/Externals/wxWidgets3/art/redo.xpm
@@ -1,58 +1,58 @@
-/* XPM */
-static const char *const redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #9BACC2",
-"; c #4C7398",
-"3 c #547B99",
-"* c #547897",
-"# c #5A89A6",
-"8 c #3A749C",
-"5 c #5A809C",
-", c #7F99B4",
-"& c #3F6F93",
-"9 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"e c #A5B3C8",
-"w c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"o c #236289",
-"r c #ADBED2",
-"= c #597B9A",
-"2 c #8DA0B9",
-"  c None",
-"% c #467291",
-"1 c #7393AB",
-"i c #4C809F",
-"- c #A0BACB",
-"O c #6591AE",
-"X c #407598",
-"6 c #6F90A6",
-"t c #D2D9E0",
-"7 c #ADBACE",
-"@ c #326A8F",
-"0 c #467A9C",
-". c #ACC4D3",
-"< c #7F97B0",
-"y c #B3BFD1",
-"q c #A2B3C5",
-"$ c #8FB0C3",
-/* pixels */
-"   .XoooO       ",
-"  +o@@@@@o#    +",
-" $@%%&@&%%&@  +o",
-" X*=@+-+@*=;@#&@",
-" @:=+    @=:=*:@",
-" &>:$     @:>>>@",
-" &,<X     X>,,,&",
-" +123    @<2222&",
-"  X44X  #@56<44X",
-"  O1748    .9#&o",
-"   0qwe8        ",
-"    8rty8       ",
-"     8wu+       ",
-"      i##       ",
-"                "
-};
+/* XPM */
+static const char *const redo_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 37 1",
+"4 c #9BACC2",
+"; c #4C7398",
+"3 c #547B99",
+"* c #547897",
+"# c #5A89A6",
+"8 c #3A749C",
+"5 c #5A809C",
+", c #7F99B4",
+"& c #3F6F93",
+"9 c #85A7BC",
+"+ c #749BB4",
+"> c #718BA7",
+"e c #A5B3C8",
+"w c #BECAD9",
+": c #65839D",
+"u c #E1E6EE",
+"o c #236289",
+"r c #ADBED2",
+"= c #597B9A",
+"2 c #8DA0B9",
+"  c None",
+"% c #467291",
+"1 c #7393AB",
+"i c #4C809F",
+"- c #A0BACB",
+"O c #6591AE",
+"X c #407598",
+"6 c #6F90A6",
+"t c #D2D9E0",
+"7 c #ADBACE",
+"@ c #326A8F",
+"0 c #467A9C",
+". c #ACC4D3",
+"< c #7F97B0",
+"y c #B3BFD1",
+"q c #A2B3C5",
+"$ c #8FB0C3",
+/* pixels */
+"   .XoooO       ",
+"  +o@@@@@o#    +",
+" $@%%&@&%%&@  +o",
+" X*=@+-+@*=;@#&@",
+" @:=+    @=:=*:@",
+" &>:$     @:>>>@",
+" &,<X     X>,,,&",
+" +123    @<2222&",
+"  X44X  #@56<44X",
+"  O1748    .9#&o",
+"   0qwe8        ",
+"    8rty8       ",
+"     8wu+       ",
+"      i##       ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/removable.xpm b/Externals/wxWidgets3/art/removable.xpm
index 5b1d46b7dd..e066fd4df7 100644
--- a/Externals/wxWidgets3/art/removable.xpm
+++ b/Externals/wxWidgets3/art/removable.xpm
@@ -1,44 +1,44 @@
-/* XPM */
-static const char *const removable_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"@ c #C3C3C4",
-"4 c #FFFFFF",
-"o c #D5D6D8",
-"> c #7A92A3",
-". c #8497A5",
-"% c #ACAEB2",
-"2 c #4A7898",
-": c #DCE2EA",
-", c #F5F6F7",
-"= c #EBEBEC",
-"$ c #B7B7B8",
-"  c None",
-"X c #DFE0E2",
-"* c #A6A8AD",
-"1 c #4C809F",
-"3 c #407598",
-"O c #CFCFD0",
-"; c #9EA2A8",
-"# c #BCBDBE",
-"+ c #C6C8CA",
-"- c #979BA0",
-"& c #E7E7E7",
-"< c #8FB0C3",
-/* pixels */
-"   .........    ",
-"   .XoO+@#$%.   ",
-"   .XoO+@#$%.   ",
-"  .&XoO+@#$%*.  ",
-"  .&XoO+@#$%*.  ",
-" .=&XoO+@#$%*-. ",
-" .=&XoO+@#$%*;. ",
-".:=&XoO+@#$%*;>.",
-".,=&XoO+@#$%*;-.",
-"<..............<",
-"<,=&XoO+@#$%%%%.",
-"<O1111122233*4*.",
-"<OOOOOOOOOOO***.",
-" <<<<<<<<<<<<<< ",
-"                "
-};
+/* XPM */
+static const char *const removable_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 23 1",
+"@ c #C3C3C4",
+"4 c #FFFFFF",
+"o c #D5D6D8",
+"> c #7A92A3",
+". c #8497A5",
+"% c #ACAEB2",
+"2 c #4A7898",
+": c #DCE2EA",
+", c #F5F6F7",
+"= c #EBEBEC",
+"$ c #B7B7B8",
+"  c None",
+"X c #DFE0E2",
+"* c #A6A8AD",
+"1 c #4C809F",
+"3 c #407598",
+"O c #CFCFD0",
+"; c #9EA2A8",
+"# c #BCBDBE",
+"+ c #C6C8CA",
+"- c #979BA0",
+"& c #E7E7E7",
+"< c #8FB0C3",
+/* pixels */
+"   .........    ",
+"   .XoO+@#$%.   ",
+"   .XoO+@#$%.   ",
+"  .&XoO+@#$%*.  ",
+"  .&XoO+@#$%*.  ",
+" .=&XoO+@#$%*-. ",
+" .=&XoO+@#$%*;. ",
+".:=&XoO+@#$%*;>.",
+".,=&XoO+@#$%*;-.",
+"<..............<",
+"<,=&XoO+@#$%%%%.",
+"<O1111122233*4*.",
+"<OOOOOOOOOOO***.",
+" <<<<<<<<<<<<<< ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/repview.xpm b/Externals/wxWidgets3/art/repview.xpm
index 17ff8686b4..cebebffe51 100644
--- a/Externals/wxWidgets3/art/repview.xpm
+++ b/Externals/wxWidgets3/art/repview.xpm
@@ -1,24 +1,24 @@
-/* XPM */
-static const char *const repview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c Black",
-"X c #FFFFFF",
-". c #C0C0C0",
-/* pixels */
-"                ",
-" .............. ",
-" .  .    .    . ",
-" .............. ",
-" .............. ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
-"                "
-};
+/* XPM */
+static const char *const repview_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c Black",
+"X c #FFFFFF",
+". c #C0C0C0",
+/* pixels */
+"                ",
+" .............. ",
+" .  .    .    . ",
+" .............. ",
+" .............. ",
+" XXXXXXXXXXXXXX ",
+" X  X    X    X ",
+" XXXXXXXXXXXXXX ",
+" X  X    X    X ",
+" XXXXXXXXXXXXXX ",
+" X  X    X    X ",
+" XXXXXXXXXXXXXX ",
+" X  X    X    X ",
+" XXXXXXXXXXXXXX ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/tick.xpm b/Externals/wxWidgets3/art/tick.xpm
index 487b67c25a..a1a48c0446 100644
--- a/Externals/wxWidgets3/art/tick.xpm
+++ b/Externals/wxWidgets3/art/tick.xpm
@@ -1,17 +1,17 @@
-/* XPM */
-static const char *const tick_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"10 10 2 1",
-". c Gray0",
-"  c None",
-/* pixels */
-"          ",
-"        ..",
-"       ...",
-"      ... ",
-"..   ...  ",
-"... ...   ",
-" .....    ",
-"  ...     ",
-"   .      ",
-"          "};
+/* XPM */
+static const char *const tick_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 2 1",
+". c Gray0",
+"  c None",
+/* pixels */
+"          ",
+"        ..",
+"       ...",
+"      ... ",
+"..   ...  ",
+"... ...   ",
+" .....    ",
+"  ...     ",
+"   .      ",
+"          "};
diff --git a/Externals/wxWidgets3/art/tipicon.xpm b/Externals/wxWidgets3/art/tipicon.xpm
index 9b1a749474..0a166ca013 100644
--- a/Externals/wxWidgets3/art/tipicon.xpm
+++ b/Externals/wxWidgets3/art/tipicon.xpm
@@ -1,47 +1,47 @@
-/* XPM */
-static const char *const tipicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-"  c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-"                                ",
-"             .....              ",
-"           ..XXXXX..            ",
-"         ..XXXXXXXXo..          ",
-"        .XXXOXXXXXXXoo.         ",
-"        .XOOXXX+XXXXXo.         ",
-"       .XOOOXX+++XXXXoo.        ",
-"       .XOOXXX+++XXXXXo.        ",
-"      .XOOOXXX+++XXXXXXo.       ",
-"      .XOOXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXXX.       ",
-"      .XXXXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXoo.       ",
-"       .XXXXXX+++XXXXXo.        ",
-"       .XXXXXXX+XXXXXXo.        ",
-"        .XXXXXXXXXXXXo.         ",
-"        .XXXXX+++XXXoo.         ",
-"         .XXXX+++XXoo.          ",
-"          .XXXXXXXXo.           ",
-"          ..XXXXXXo..           ",
-"           .XXXXXo..            ",
-"           @#######@            ",
-"           @@@@@@@@@            ",
-"           @#######@            ",
-"           @@@@@@@@@            ",
-"           @#######@            ",
-"            @@@@@@@             ",
-"              ###               ",
-"              $$$               ",
-"                                ",
-"                                ",
-"                                "
-};
+/* XPM */
+static const char *const tipicon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"$ c Black",
+"O c #FFFFFF",
+"@ c #808080",
+"+ c #000080",
+"o c #E8EB01",
+"  c None",
+"X c #FFFF40",
+"# c #C0C0C0",
+". c #ABAD01",
+/* pixels */
+"                                ",
+"             .....              ",
+"           ..XXXXX..            ",
+"         ..XXXXXXXXo..          ",
+"        .XXXOXXXXXXXoo.         ",
+"        .XOOXXX+XXXXXo.         ",
+"       .XOOOXX+++XXXXoo.        ",
+"       .XOOXXX+++XXXXXo.        ",
+"      .XOOOXXX+++XXXXXXo.       ",
+"      .XOOXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXXX.       ",
+"      .XXXXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXoo.       ",
+"       .XXXXXX+++XXXXXo.        ",
+"       .XXXXXXX+XXXXXXo.        ",
+"        .XXXXXXXXXXXXo.         ",
+"        .XXXXX+++XXXoo.         ",
+"         .XXXX+++XXoo.          ",
+"          .XXXXXXXXo.           ",
+"          ..XXXXXXo..           ",
+"           .XXXXXo..            ",
+"           @#######@            ",
+"           @@@@@@@@@            ",
+"           @#######@            ",
+"           @@@@@@@@@            ",
+"           @#######@            ",
+"            @@@@@@@             ",
+"              ###               ",
+"              $$$               ",
+"                                ",
+"                                ",
+"                                "
+};
diff --git a/Externals/wxWidgets3/art/toparent.xpm b/Externals/wxWidgets3/art/toparent.xpm
index 606fa3d201..b707ce737e 100644
--- a/Externals/wxWidgets3/art/toparent.xpm
+++ b/Externals/wxWidgets3/art/toparent.xpm
@@ -1,21 +1,21 @@
-/* XPM */
-static const char *const toparent_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"      ..        ",
-"     .XX.       ",
-"    .XXXX.      ",
-"   .XXXXXX.     ",
-"  .XXXXXXXX.    ",
-" ....XXXX....   ",
-"    .XXXX.      ",
-"    .XXXX.....  ",
-"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
-"    ..........  ",
-"                "};
+/* XPM */
+static const char *const toparent_xpm[] = {
+"16 15 3 1",
+" 	c None",
+".	c Black",
+"X	c Gray100",
+"                ",
+"      ..        ",
+"     .XX.       ",
+"    .XXXX.      ",
+"   .XXXXXX.     ",
+"  .XXXXXXXX.    ",
+" ....XXXX....   ",
+"    .XXXX.      ",
+"    .XXXX.....  ",
+"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
+"    ..........  ",
+"                "};
diff --git a/Externals/wxWidgets3/art/undo.xpm b/Externals/wxWidgets3/art/undo.xpm
index 3f6eaddd70..8c8996ad6e 100644
--- a/Externals/wxWidgets3/art/undo.xpm
+++ b/Externals/wxWidgets3/art/undo.xpm
@@ -1,58 +1,58 @@
-/* XPM */
-static const char *const undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #9BACC2",
-"* c #4C7398",
-"2 c #547B99",
-"- c #547897",
-"@ c #5A89A6",
-"8 c #3A749C",
-"6 c #5A809C",
-", c #7F99B4",
-"$ c #3F6F93",
-"7 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"0 c #A5B3C8",
-"q c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"X c #236289",
-"y c #ADBED2",
-"= c #597B9A",
-"1 c #8DA0B9",
-"  c None",
-"% c #467291",
-"3 c #7393AB",
-"i c #4C809F",
-"; c #A0BACB",
-". c #6591AE",
-"o c #407598",
-"5 c #6F90A6",
-"t c #D2D9E0",
-"9 c #ADBACE",
-"# c #326A8F",
-"e c #467A9C",
-"O c #ACC4D3",
-"< c #7F97B0",
-"r c #B3BFD1",
-"w c #A2B3C5",
-"& c #8FB0C3",
-/* pixels */
-"       .XXXoO   ",
-"+    @X#####X+  ",
-"X+  #$%%$#$%%#& ",
-"#$@#*=-#+;+#=-o ",
-"#:-=:=#    +=:# ",
-"#>>>:#     &:>$ ",
-"$,,,>o     o<,$ ",
-"$1111<#    213+ ",
-"o44<56#@  o44o  ",
-"X$@7O    8493.  ",
-"        80qwe   ",
-"       8rty8    ",
-"       +uq8     ",
-"       @@i      ",
-"                "
-};
+/* XPM */
+static const char *const undo_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 37 1",
+"4 c #9BACC2",
+"* c #4C7398",
+"2 c #547B99",
+"- c #547897",
+"@ c #5A89A6",
+"8 c #3A749C",
+"6 c #5A809C",
+", c #7F99B4",
+"$ c #3F6F93",
+"7 c #85A7BC",
+"+ c #749BB4",
+"> c #718BA7",
+"0 c #A5B3C8",
+"q c #BECAD9",
+": c #65839D",
+"u c #E1E6EE",
+"X c #236289",
+"y c #ADBED2",
+"= c #597B9A",
+"1 c #8DA0B9",
+"  c None",
+"% c #467291",
+"3 c #7393AB",
+"i c #4C809F",
+"; c #A0BACB",
+". c #6591AE",
+"o c #407598",
+"5 c #6F90A6",
+"t c #D2D9E0",
+"9 c #ADBACE",
+"# c #326A8F",
+"e c #467A9C",
+"O c #ACC4D3",
+"< c #7F97B0",
+"r c #B3BFD1",
+"w c #A2B3C5",
+"& c #8FB0C3",
+/* pixels */
+"       .XXXoO   ",
+"+    @X#####X+  ",
+"X+  #$%%$#$%%#& ",
+"#$@#*=-#+;+#=-o ",
+"#:-=:=#    +=:# ",
+"#>>>:#     &:>$ ",
+"$,,,>o     o<,$ ",
+"$1111<#    213+ ",
+"o44<56#@  o44o  ",
+"X$@7O    8493.  ",
+"        80qwe   ",
+"       8rty8    ",
+"       +uq8     ",
+"       @@i      ",
+"                "
+};
diff --git a/Externals/wxWidgets3/art/up.xpm b/Externals/wxWidgets3/art/up.xpm
index a93009f95c..f29ed3d386 100644
--- a/Externals/wxWidgets3/art/up.xpm
+++ b/Externals/wxWidgets3/art/up.xpm
@@ -1,21 +1,21 @@
-/* XPM */
-static const char *const up_xpm[] = {
-"16 15 3 1",
-" 	c None",
-".	c Black",
-"X	c Gray100",
-"                ",
-"       ..       ",
-"      .XX.      ",
-"     .XXXX.     ",
-"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
-"  ....XXXX....  ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     .XXXX.     ",
-"     ......     ",
-"                "};
+/* XPM */
+static const char *const up_xpm[] = {
+"16 15 3 1",
+" 	c None",
+".	c Black",
+"X	c Gray100",
+"                ",
+"       ..       ",
+"      .XX.      ",
+"     .XXXX.     ",
+"    .XXXXXX.    ",
+"   .XXXXXXXX.   ",
+"  ....XXXX....  ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     .XXXX.     ",
+"     ......     ",
+"                "};
diff --git a/Externals/wxWidgets3/art/wxwin16x16.xpm b/Externals/wxWidgets3/art/wxwin16x16.xpm
index ed1848ea75..119185329a 100644
--- a/Externals/wxWidgets3/art/wxwin16x16.xpm
+++ b/Externals/wxWidgets3/art/wxwin16x16.xpm
@@ -1,161 +1,161 @@
-/* XPM */
-static const char *const wxwin16x16_xpm[] = {
-"16 16 142 2",
-"  	c None",
-". 	c #7171C0",
-"+ 	c #7D7DC7",
-"@ 	c #8181CE",
-"# 	c #7979CE",
-"$ 	c #7171CE",
-"% 	c #6868CD",
-"& 	c #5050C0",
-"* 	c #7C7CCB",
-"= 	c #D3D3FC",
-"- 	c #C0C0FF",
-"; 	c #B1B1FF",
-"> 	c #A4A4FF",
-", 	c #9696FF",
-"' 	c #6B6BE3",
-") 	c #3E3EC0",
-"! 	c #7B7BD3",
-"~ 	c #CFCFFF",
-"{ 	c #A7A7FF",
-"] 	c #8989FF",
-"^ 	c #7B7BFF",
-"/ 	c #5E5EEB",
-"( 	c #3333BF",
-"_ 	c #6969D3",
-": 	c #BEBEFF",
-"< 	c #8E8EFF",
-"[ 	c #5E5EFF",
-"} 	c #4C4CFD",
-"| 	c #6464C6",
-"1 	c #A4A478",
-"2 	c #BFBF63",
-"3 	c #BFBF5C",
-"4 	c #BFBF56",
-"5 	c #BFBF51",
-"6 	c #C17474",
-"7 	c #BF7070",
-"8 	c #BF6969",
-"9 	c #BF6363",
-"0 	c #544AC7",
-"a 	c #A8A8FF",
-"b 	c #7070FF",
-"c 	c #5050FF",
-"d 	c #3F3FFF",
-"e 	c #8C8CBA",
-"f 	c #F6F6C8",
-"g 	c #FBFBBB",
-"h 	c #FBFBAE",
-"i 	c #FBFBA1",
-"j 	c #F9F993",
-"k 	c #D7D760",
-"l 	c #D28D8D",
-"m 	c #EEB8B8",
-"n 	c #EFAAAA",
-"o 	c #EF9E9E",
-"p 	c #7C5ABC",
-"q 	c #8D8DFF",
-"r 	c #4747FF",
-"s 	c #3535FF",
-"t 	c #2B2BFF",
-"u 	c #AAAAA7",
-"v 	c #FFFFD2",
-"w 	c #FFFFA9",
-"x 	c #FFFF9A",
-"y 	c #FFFF8D",
-"z 	c #FFFF80",
-"A 	c #E4E45B",
-"B 	c #E39F9F",
-"C 	c #FFCCCC",
-"D 	c #FFA9A9",
-"E 	c #FF9C9C",
-"F 	c #B469A0",
-"G 	c #3E3DE7",
-"H 	c #2828EF",
-"I 	c #1E1EEF",
-"J 	c #1515EF",
-"K 	c #A5A595",
-"L 	c #FFFFC2",
-"M 	c #FFFF8F",
-"N 	c #F7F765",
-"O 	c #F2F251",
-"P 	c #DBDB3A",
-"Q 	c #E48E8E",
-"R 	c #FFBABA",
-"S 	c #FF8E8E",
-"T 	c #FF8181",
-"U 	c #FF6868",
-"V 	c #E54D60",
-"W 	c #AC2E56",
-"X 	c #0B0BBF",
-"Y 	c #0606BF",
-"Z 	c #C8C85D",
-"` 	c #FEFEB1",
-" .	c #FEFE74",
-"..	c #F4F456",
-"+.	c #EFEF42",
-"@.	c #EFEF38",
-"#.	c #D7D725",
-"$.	c #E47676",
-"%.	c #FFA8A8",
-"&.	c #FF7373",
-"*.	c #FF5555",
-"=.	c #FF4343",
-"-.	c #FF3939",
-";.	c #DA2323",
-">.	c #CFCF3C",
-",.	c #F6F694",
-"'.	c #F0F047",
-").	c #EFEF2E",
-"!.	c #EFEF24",
-"~.	c #D7D715",
-"{.	c #E45757",
-"].	c #FF8888",
-"^.	c #FF4646",
-"/.	c #FF2F2F",
-"(.	c #FF2525",
-"_.	c #DA1414",
-":.	c #C3C328",
-"<.	c #EBEB55",
-"[.	c #ECEC2F",
-"}.	c #ECEC24",
-"|.	c #ECEC1A",
-"1.	c #EBEB10",
-"2.	c #CDCD06",
-"3.	c #DD3A3A",
-"4.	c #FF6060",
-"5.	c #FF1B1B",
-"6.	c #FE1111",
-"7.	c #D10707",
-"8.	c #B8B819",
-"9.	c #B7B715",
-"0.	c #B7B710",
-"a.	c #B7B70B",
-"b.	c #B7B706",
-"c.	c #B7B701",
-"d.	c #B7B700",
-"e.	c #BF1A1A",
-"f.	c #CC1919",
-"g.	c #CE1414",
-"h.	c #CE0E0E",
-"i.	c #CE0808",
-"j.	c #C90202",
-"k.	c #C00000",
-"                                ",
-"                                ",
-"        . + @ # $ % &           ",
-"        * = - ; > , ' )         ",
-"        ! ~ { , ] ^ / (         ",
-"        _ : < ^ [ } | 1 2 3 4 5 ",
-"6 7 8 9 0 a b c d e f g h i j k ",
-"l m n o p q r s t u v w x y z A ",
-"B C D E F G H I J K L M z N O P ",
-"Q R S T U V W X Y Z `  ...+.@.#.",
-"$.%.&.*.=.-.;.    >.,.'.@.).!.~.",
-"{.].^.-./.(._.    :.<.[.}.|.1.2.",
-"3.4./.(.5.6.7.    8.9.0.a.b.c.d.",
-"e.f.g.h.i.j.k.                  ",
-"                                ",
-"                                "};
+/* XPM */
+static const char *const wxwin16x16_xpm[] = {
+"16 16 142 2",
+"  	c None",
+". 	c #7171C0",
+"+ 	c #7D7DC7",
+"@ 	c #8181CE",
+"# 	c #7979CE",
+"$ 	c #7171CE",
+"% 	c #6868CD",
+"& 	c #5050C0",
+"* 	c #7C7CCB",
+"= 	c #D3D3FC",
+"- 	c #C0C0FF",
+"; 	c #B1B1FF",
+"> 	c #A4A4FF",
+", 	c #9696FF",
+"' 	c #6B6BE3",
+") 	c #3E3EC0",
+"! 	c #7B7BD3",
+"~ 	c #CFCFFF",
+"{ 	c #A7A7FF",
+"] 	c #8989FF",
+"^ 	c #7B7BFF",
+"/ 	c #5E5EEB",
+"( 	c #3333BF",
+"_ 	c #6969D3",
+": 	c #BEBEFF",
+"< 	c #8E8EFF",
+"[ 	c #5E5EFF",
+"} 	c #4C4CFD",
+"| 	c #6464C6",
+"1 	c #A4A478",
+"2 	c #BFBF63",
+"3 	c #BFBF5C",
+"4 	c #BFBF56",
+"5 	c #BFBF51",
+"6 	c #C17474",
+"7 	c #BF7070",
+"8 	c #BF6969",
+"9 	c #BF6363",
+"0 	c #544AC7",
+"a 	c #A8A8FF",
+"b 	c #7070FF",
+"c 	c #5050FF",
+"d 	c #3F3FFF",
+"e 	c #8C8CBA",
+"f 	c #F6F6C8",
+"g 	c #FBFBBB",
+"h 	c #FBFBAE",
+"i 	c #FBFBA1",
+"j 	c #F9F993",
+"k 	c #D7D760",
+"l 	c #D28D8D",
+"m 	c #EEB8B8",
+"n 	c #EFAAAA",
+"o 	c #EF9E9E",
+"p 	c #7C5ABC",
+"q 	c #8D8DFF",
+"r 	c #4747FF",
+"s 	c #3535FF",
+"t 	c #2B2BFF",
+"u 	c #AAAAA7",
+"v 	c #FFFFD2",
+"w 	c #FFFFA9",
+"x 	c #FFFF9A",
+"y 	c #FFFF8D",
+"z 	c #FFFF80",
+"A 	c #E4E45B",
+"B 	c #E39F9F",
+"C 	c #FFCCCC",
+"D 	c #FFA9A9",
+"E 	c #FF9C9C",
+"F 	c #B469A0",
+"G 	c #3E3DE7",
+"H 	c #2828EF",
+"I 	c #1E1EEF",
+"J 	c #1515EF",
+"K 	c #A5A595",
+"L 	c #FFFFC2",
+"M 	c #FFFF8F",
+"N 	c #F7F765",
+"O 	c #F2F251",
+"P 	c #DBDB3A",
+"Q 	c #E48E8E",
+"R 	c #FFBABA",
+"S 	c #FF8E8E",
+"T 	c #FF8181",
+"U 	c #FF6868",
+"V 	c #E54D60",
+"W 	c #AC2E56",
+"X 	c #0B0BBF",
+"Y 	c #0606BF",
+"Z 	c #C8C85D",
+"` 	c #FEFEB1",
+" .	c #FEFE74",
+"..	c #F4F456",
+"+.	c #EFEF42",
+"@.	c #EFEF38",
+"#.	c #D7D725",
+"$.	c #E47676",
+"%.	c #FFA8A8",
+"&.	c #FF7373",
+"*.	c #FF5555",
+"=.	c #FF4343",
+"-.	c #FF3939",
+";.	c #DA2323",
+">.	c #CFCF3C",
+",.	c #F6F694",
+"'.	c #F0F047",
+").	c #EFEF2E",
+"!.	c #EFEF24",
+"~.	c #D7D715",
+"{.	c #E45757",
+"].	c #FF8888",
+"^.	c #FF4646",
+"/.	c #FF2F2F",
+"(.	c #FF2525",
+"_.	c #DA1414",
+":.	c #C3C328",
+"<.	c #EBEB55",
+"[.	c #ECEC2F",
+"}.	c #ECEC24",
+"|.	c #ECEC1A",
+"1.	c #EBEB10",
+"2.	c #CDCD06",
+"3.	c #DD3A3A",
+"4.	c #FF6060",
+"5.	c #FF1B1B",
+"6.	c #FE1111",
+"7.	c #D10707",
+"8.	c #B8B819",
+"9.	c #B7B715",
+"0.	c #B7B710",
+"a.	c #B7B70B",
+"b.	c #B7B706",
+"c.	c #B7B701",
+"d.	c #B7B700",
+"e.	c #BF1A1A",
+"f.	c #CC1919",
+"g.	c #CE1414",
+"h.	c #CE0E0E",
+"i.	c #CE0808",
+"j.	c #C90202",
+"k.	c #C00000",
+"                                ",
+"                                ",
+"        . + @ # $ % &           ",
+"        * = - ; > , ' )         ",
+"        ! ~ { , ] ^ / (         ",
+"        _ : < ^ [ } | 1 2 3 4 5 ",
+"6 7 8 9 0 a b c d e f g h i j k ",
+"l m n o p q r s t u v w x y z A ",
+"B C D E F G H I J K L M z N O P ",
+"Q R S T U V W X Y Z `  ...+.@.#.",
+"$.%.&.*.=.-.;.    >.,.'.@.).!.~.",
+"{.].^.-./.(._.    :.<.[.}.|.1.2.",
+"3.4./.(.5.6.7.    8.9.0.a.b.c.d.",
+"e.f.g.h.i.j.k.                  ",
+"                                ",
+"                                "};
diff --git a/Externals/wxWidgets3/art/wxwin32x32.xpm b/Externals/wxWidgets3/art/wxwin32x32.xpm
index 25aed5e590..d318f0aadb 100644
--- a/Externals/wxWidgets3/art/wxwin32x32.xpm
+++ b/Externals/wxWidgets3/art/wxwin32x32.xpm
@@ -1,442 +1,442 @@
-/* XPM */
-static const char *const wxwin32x32_xpm[] = {
-"32 32 407 2",
-"  	c None",
-". 	c #7373C1",
-"+ 	c #6E6EBF",
-"@ 	c #6B6BBF",
-"# 	c #6868BF",
-"$ 	c #6464BF",
-"% 	c #6161BF",
-"& 	c #5E5EBF",
-"* 	c #5A5ABF",
-"= 	c #5959C0",
-"- 	c #7171C0",
-"; 	c #7272C1",
-"> 	c #8686CE",
-", 	c #8686D0",
-"' 	c #8282D0",
-") 	c #7D7DD0",
-"! 	c #7979D0",
-"~ 	c #7575D0",
-"{ 	c #7171D0",
-"] 	c #6D6DD0",
-"^ 	c #6666CD",
-"/ 	c #5151C1",
-"( 	c #4C4CBF",
-"_ 	c #7171C1",
-": 	c #7272C2",
-"< 	c #C1C1F2",
-"[ 	c #D7D7FF",
-"} 	c #C9C9FF",
-"| 	c #C2C2FF",
-"1 	c #BBBBFF",
-"2 	c #B4B4FF",
-"3 	c #AEAEFF",
-"4 	c #A7A7FF",
-"5 	c #A0A0FF",
-"6 	c #9A9AFF",
-"7 	c #8484F2",
-"8 	c #4949C2",
-"9 	c #4444C1",
-"0 	c #6A6AC0",
-"a 	c #8989D4",
-"b 	c #DADAFF",
-"c 	c #C0C0FF",
-"d 	c #9393FF",
-"e 	c #8C8CFF",
-"f 	c #8686FF",
-"g 	c #5454D4",
-"h 	c #3E3EC0",
-"i 	c #6363BF",
-"j 	c #8686D8",
-"k 	c #D4D4FF",
-"l 	c #D2D2FF",
-"m 	c #7F7FFF",
-"n 	c #7878FF",
-"o 	c #4F4FD7",
-"p 	c #3737BF",
-"q 	c #5C5CBF",
-"r 	c #7D7DD8",
-"s 	c #CCCCFF",
-"t 	c #CACAFF",
-"u 	c #A8A8FF",
-"v 	c #7070FF",
-"w 	c #6B6BFF",
-"x 	c #4545D7",
-"y 	c #3030BF",
-"z 	c #5555BF",
-"A 	c #7373D8",
-"B 	c #C3C3FF",
-"C 	c #9C9CFF",
-"D 	c #8D8DFF",
-"E 	c #7777FF",
-"F 	c #6262FF",
-"G 	c #5252FF",
-"H 	c #4B4BFF",
-"I 	c #4848FF",
-"J 	c #3232D7",
-"K 	c #2626BF",
-"L 	c #4E4EBF",
-"M 	c #6A6AD8",
-"N 	c #B9B9FF",
-"O 	c #9090FF",
-"P 	c #6F6FFF",
-"Q 	c #5555FF",
-"R 	c #4646FF",
-"S 	c #4B4BF5",
-"T 	c #8282B4",
-"U 	c #93938E",
-"V 	c #B1B173",
-"W 	c #BFBF68",
-"X 	c #BFBF65",
-"Y 	c #BFBF62",
-"Z 	c #BFBF5E",
-"` 	c #BFBF5B",
-" .	c #BFBF57",
-"..	c #BFBF54",
-"+.	c #BFBF51",
-"@.	c #5858D8",
-"#.	c #B2B2FF",
-"$.	c #B1B1FF",
-"%.	c #8484FF",
-"&.	c #7272FF",
-"*.	c #6767FF",
-"=.	c #4F4FFF",
-"-.	c #4747FF",
-";.	c #4242FF",
-">.	c #4141FA",
-",.	c #ABAB8A",
-"'.	c #E4E4AA",
-").	c #F5F5C3",
-"!.	c #F6F6BE",
-"~.	c #F6F6B7",
-"{.	c #F6F6B1",
-"].	c #F6F6AB",
-"^.	c #F6F6A5",
-"/.	c #F6F69E",
-"(.	c #F6F698",
-"_.	c #F1F18C",
-":.	c #D0D05F",
-"<.	c #BFBF48",
-"[.	c #C17474",
-"}.	c #C07171",
-"|.	c #BF6E6E",
-"1.	c #BF6B6B",
-"2.	c #BF6868",
-"3.	c #BF6464",
-"4.	c #BF6161",
-"5.	c #7C498C",
-"6.	c #4242D8",
-"7.	c #A4A4FF",
-"8.	c #5959FF",
-"9.	c #3D3DFF",
-"0.	c #3838FF",
-"a.	c #6666CA",
-"b.	c #DCDC98",
-"c.	c #FFFFDD",
-"d.	c #FFFFD7",
-"e.	c #FFFFC0",
-"f.	c #FFFFB8",
-"g.	c #FFFFB2",
-"h.	c #FFFFAB",
-"i.	c #FFFFA4",
-"j.	c #FFFF9D",
-"k.	c #FFFF97",
-"l.	c #FFFF90",
-"m.	c #FBFB85",
-"n.	c #C2C244",
-"o.	c #C37676",
-"p.	c #DA9B9B",
-"q.	c #DF9F9F",
-"r.	c #DF9A9A",
-"s.	c #DF9494",
-"t.	c #DF8F8F",
-"u.	c #DF8A8A",
-"v.	c #B47094",
-"w.	c #3B3BD8",
-"x.	c #9292FF",
-"y.	c #5656FF",
-"z.	c #3333FF",
-"A.	c #2E2EFF",
-"B.	c #7070B6",
-"C.	c #E7E79F",
-"D.	c #FFFFDE",
-"E.	c #FFFFCF",
-"F.	c #FFFFB5",
-"G.	c #FFFF9E",
-"H.	c #FFFF8A",
-"I.	c #FFFF83",
-"J.	c #FFFF7C",
-"K.	c #C8C843",
-"L.	c #C06D6D",
-"M.	c #F1BEBE",
-"N.	c #FFDBDB",
-"O.	c #FFCBCB",
-"P.	c #FFC0C0",
-"Q.	c #FFBABA",
-"R.	c #FFB3B3",
-"S.	c #FFACAC",
-"T.	c #CE89AC",
-"U.	c #3333D7",
-"V.	c #8787FF",
-"W.	c #4D4DFF",
-"X.	c #2929FF",
-"Y.	c #2424FF",
-"Z.	c #6B6BB3",
-"`.	c #E7E795",
-" +	c #FFFFC6",
-".+	c #FFFFA8",
-"++	c #FFFF76",
-"@+	c #FFFF6F",
-"#+	c #C8C83C",
-"$+	c #C77474",
-"%+	c #FFD3D3",
-"&+	c #FFDEDE",
-"*+	c #FFC4C4",
-"=+	c #FFA6A6",
-"-+	c #FF9F9F",
-";+	c #F3929A",
-">+	c #2F29C3",
-",+	c #4C4CFB",
-"'+	c #6868FF",
-")+	c #3939FF",
-"!+	c #1F1FFF",
-"~+	c #1A1AFF",
-"{+	c #6666B0",
-"]+	c #E7E78A",
-"^+	c #FFFFD0",
-"/+	c #FFFFBD",
-"(+	c #FFFF9B",
-"_+	c #FFFF91",
-":+	c #FAFA6E",
-"<+	c #F5F55F",
-"[+	c #F5F558",
-"}+	c #F7F756",
-"|+	c #C7C732",
-"1+	c #C86E6E",
-"2+	c #FFC9C9",
-"3+	c #FFD7D7",
-"4+	c #FFB8B8",
-"5+	c #FF9898",
-"6+	c #FF9292",
-"7+	c #FF8B8B",
-"8+	c #B16098",
-"9+	c #2420C6",
-"0+	c #2222DD",
-"a+	c #1F1FDF",
-"b+	c #1B1BDF",
-"c+	c #1818DF",
-"d+	c #1414DF",
-"e+	c #1010DF",
-"f+	c #0C0CDF",
-"g+	c #5F5F9C",
-"h+	c #E7E77F",
-"i+	c #FFFFC9",
-"j+	c #FFFFB4",
-"k+	c #FFFF8E",
-"l+	c #FFFF7D",
-"m+	c #FEFE75",
-"n+	c #F4F45D",
-"o+	c #EFEF4F",
-"p+	c #EFEF4A",
-"q+	c #EFEF44",
-"r+	c #EFEF3F",
-"s+	c #BFBF22",
-"t+	c #C86666",
-"u+	c #FFBFBF",
-"v+	c #FFD0D0",
-"w+	c #FFADAD",
-"x+	c #FF8484",
-"y+	c #FF7E7E",
-"z+	c #FF7373",
-"A+	c #E75F70",
-"B+	c #B0457F",
-"C+	c #9A3776",
-"D+	c #5F1D7C",
-"E+	c #0C0CBF",
-"F+	c #0909BF",
-"G+	c #0707BF",
-"H+	c #0404BF",
-"I+	c #878766",
-"J+	c #E6E674",
-"K+	c #FFFFC2",
-"L+	c #FFFF82",
-"M+	c #FEFE6E",
-"N+	c #F3F355",
-"O+	c #EFEF45",
-"P+	c #EFEF40",
-"Q+	c #EFEF3B",
-"R+	c #EFEF36",
-"S+	c #BFBF1C",
-"T+	c #C85F5F",
-"U+	c #FFB4B4",
-"V+	c #FFA2A2",
-"W+	c #FF7575",
-"X+	c #FF5E5E",
-"Y+	c #FF5050",
-"Z+	c #FF4A4A",
-"`+	c #FF4545",
-" @	c #E73535",
-".@	c #BF2121",
-"+@	c #B7B733",
-"@@	c #DCDC55",
-"#@	c #FDFDB7",
-"$@	c #FFFFA2",
-"%@	c #FFFF75",
-"&@	c #FCFC64",
-"*@	c #F2F24E",
-"=@	c #EFEF31",
-"-@	c #EFEF2C",
-";@	c #BFBF16",
-">@	c #C85656",
-",@	c #FFAAAA",
-"'@	c #FFC2C2",
-")@	c #FF9797",
-"!@	c #FF7777",
-"~@	c #FF6E6E",
-"{@	c #FF5454",
-"]@	c #FF4040",
-"^@	c #FF3B3B",
-"/@	c #E72C2C",
-"(@	c #BF1919",
-"_@	c #B7B72E",
-":@	c #DADA48",
-"<@	c #F7F7A6",
-"[@	c #F6F689",
-"}@	c #F2F254",
-"|@	c #EFEF27",
-"1@	c #EFEF22",
-"2@	c #BFBF10",
-"3@	c #C84040",
-"4@	c #FF9A9A",
-"5@	c #FFBBBB",
-"6@	c #FF7171",
-"7@	c #FF6666",
-"8@	c #FF4E4E",
-"9@	c #FF4646",
-"0@	c #FF4141",
-"a@	c #FF3C3C",
-"b@	c #FF3737",
-"c@	c #FF3232",
-"d@	c #E72424",
-"e@	c #BF1414",
-"f@	c #B7B729",
-"g@	c #DADA3F",
-"h@	c #F7F7A1",
-"i@	c #F4F480",
-"j@	c #F0F047",
-"k@	c #EFEF1D",
-"l@	c #EFEF18",
-"m@	c #BFBF0B",
-"n@	c #C83636",
-"o@	c #FFABAB",
-"p@	c #FF7676",
-"q@	c #FF2D2D",
-"r@	c #FF2828",
-"s@	c #E71C1C",
-"t@	c #BF0F0F",
-"u@	c #B7B724",
-"v@	c #D1D132",
-"w@	c #F4F478",
-"x@	c #EFEF13",
-"y@	c #ECEC0E",
-"z@	c #BABA05",
-"A@	c #C83030",
-"B@	c #FF6161",
-"C@	c #FF2323",
-"D@	c #FF1E1E",
-"E@	c #E71414",
-"F@	c #BF0A0A",
-"G@	c #B8B820",
-"H@	c #B9B91F",
-"I@	c #DADA2C",
-"J@	c #E9E931",
-"K@	c #EAEA2A",
-"L@	c #EAEA25",
-"M@	c #EAEA20",
-"N@	c #EAEA1C",
-"O@	c #EAEA17",
-"P@	c #EAEA12",
-"Q@	c #EAEA0D",
-"R@	c #E5E508",
-"S@	c #C7C703",
-"T@	c #B7B701",
-"U@	c #C52929",
-"V@	c #FF5858",
-"W@	c #FF1919",
-"X@	c #FF1414",
-"Y@	c #E30C0C",
-"Z@	c #BF0606",
-"`@	c #B8B819",
-" #	c #B7B717",
-".#	c #B7B714",
-"+#	c #B7B711",
-"@#	c #B7B70F",
-"##	c #B7B70C",
-"$#	c #B7B70A",
-"%#	c #B7B707",
-"&#	c #B7B705",
-"*#	c #B7B702",
-"=#	c #B7B700",
-"-#	c #BF2020",
-";#	c #E63131",
-">#	c #FF5555",
-",#	c #FF3A3A",
-"'#	c #FF0F0F",
-")#	c #FA0A0A",
-"!#	c #C90303",
-"~#	c #C00202",
-"{#	c #C01C1C",
-"]#	c #CB1B1B",
-"^#	c #D01A1A",
-"/#	c #D01616",
-"(#	c #D01313",
-"_#	c #D01010",
-":#	c #D00D0D",
-"<#	c #D00A0A",
-"[#	c #D00707",
-"}#	c #CF0303",
-"|#	c #C30101",
-"1#	c #C00000",
-"2#	c #C21414",
-"3#	c #BF1111",
-"4#	c #BF0E0E",
-"5#	c #BF0C0C",
-"6#	c #BF0909",
-"7#	c #BF0707",
-"8#	c #BF0404",
-"9#	c #BF0202",
-"0#	c #C50000",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                      . + @ # $ % & * =                         ",
-"                  - ; > , ' ) ! ~ { ] ^ / (                     ",
-"                _ : < [ } | 1 2 3 4 5 6 7 8 9                   ",
-"                0 a b b c 2 3 4 5 6 d e f g h                   ",
-"                i j k l 2 4 5 6 d e f m n o p                   ",
-"                q r s t u 6 d e f m n v w x y                   ",
-"                z A B | C D f m E F G H I J K                   ",
-"                L M 1 N O m n P Q H R S T U V W X Y Z `  ...+.  ",
-"                p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
-"  [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.",
-"}.o.p.q.r.s.t.u.v.w.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.",
-"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+",
-"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+",
-"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+",
-"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+",
-"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@        +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
-">@,@'@)@y+!@~@{@Z+`+]@^@/@(@        _@:@<@[@}@O+P+Q+R+=@-@|@1@2@",
-"3@4@5@7+6@7@8@9@0@a@b@c@d@e@        f@g@h@i@j@Q+R+=@-@|@1@k@l@m@",
-"n@y+o@p@{@9@0@a@b@c@q@r@s@t@        u@v@i@w@Q+=@-@|@1@k@l@x@y@z@",
-"A@p@-+B@0@a@b@c@q@r@C@D@E@F@        G@H@I@J@K@L@M@N@O@P@Q@R@S@T@",
-"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@          `@ #.#+#@###$#%#&#*#=#=#  ",
-"-#;#>#,#q@r@C@D@W@X@'#)#!#~#                                    ",
-"{#(@]#^#/#(#_#:#<#[#}#|#1#                                      ",
-"    2#3#4#5#6#7#8#9#1#0#                                        ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                "};
+/* XPM */
+static const char *const wxwin32x32_xpm[] = {
+"32 32 407 2",
+"  	c None",
+". 	c #7373C1",
+"+ 	c #6E6EBF",
+"@ 	c #6B6BBF",
+"# 	c #6868BF",
+"$ 	c #6464BF",
+"% 	c #6161BF",
+"& 	c #5E5EBF",
+"* 	c #5A5ABF",
+"= 	c #5959C0",
+"- 	c #7171C0",
+"; 	c #7272C1",
+"> 	c #8686CE",
+", 	c #8686D0",
+"' 	c #8282D0",
+") 	c #7D7DD0",
+"! 	c #7979D0",
+"~ 	c #7575D0",
+"{ 	c #7171D0",
+"] 	c #6D6DD0",
+"^ 	c #6666CD",
+"/ 	c #5151C1",
+"( 	c #4C4CBF",
+"_ 	c #7171C1",
+": 	c #7272C2",
+"< 	c #C1C1F2",
+"[ 	c #D7D7FF",
+"} 	c #C9C9FF",
+"| 	c #C2C2FF",
+"1 	c #BBBBFF",
+"2 	c #B4B4FF",
+"3 	c #AEAEFF",
+"4 	c #A7A7FF",
+"5 	c #A0A0FF",
+"6 	c #9A9AFF",
+"7 	c #8484F2",
+"8 	c #4949C2",
+"9 	c #4444C1",
+"0 	c #6A6AC0",
+"a 	c #8989D4",
+"b 	c #DADAFF",
+"c 	c #C0C0FF",
+"d 	c #9393FF",
+"e 	c #8C8CFF",
+"f 	c #8686FF",
+"g 	c #5454D4",
+"h 	c #3E3EC0",
+"i 	c #6363BF",
+"j 	c #8686D8",
+"k 	c #D4D4FF",
+"l 	c #D2D2FF",
+"m 	c #7F7FFF",
+"n 	c #7878FF",
+"o 	c #4F4FD7",
+"p 	c #3737BF",
+"q 	c #5C5CBF",
+"r 	c #7D7DD8",
+"s 	c #CCCCFF",
+"t 	c #CACAFF",
+"u 	c #A8A8FF",
+"v 	c #7070FF",
+"w 	c #6B6BFF",
+"x 	c #4545D7",
+"y 	c #3030BF",
+"z 	c #5555BF",
+"A 	c #7373D8",
+"B 	c #C3C3FF",
+"C 	c #9C9CFF",
+"D 	c #8D8DFF",
+"E 	c #7777FF",
+"F 	c #6262FF",
+"G 	c #5252FF",
+"H 	c #4B4BFF",
+"I 	c #4848FF",
+"J 	c #3232D7",
+"K 	c #2626BF",
+"L 	c #4E4EBF",
+"M 	c #6A6AD8",
+"N 	c #B9B9FF",
+"O 	c #9090FF",
+"P 	c #6F6FFF",
+"Q 	c #5555FF",
+"R 	c #4646FF",
+"S 	c #4B4BF5",
+"T 	c #8282B4",
+"U 	c #93938E",
+"V 	c #B1B173",
+"W 	c #BFBF68",
+"X 	c #BFBF65",
+"Y 	c #BFBF62",
+"Z 	c #BFBF5E",
+"` 	c #BFBF5B",
+" .	c #BFBF57",
+"..	c #BFBF54",
+"+.	c #BFBF51",
+"@.	c #5858D8",
+"#.	c #B2B2FF",
+"$.	c #B1B1FF",
+"%.	c #8484FF",
+"&.	c #7272FF",
+"*.	c #6767FF",
+"=.	c #4F4FFF",
+"-.	c #4747FF",
+";.	c #4242FF",
+">.	c #4141FA",
+",.	c #ABAB8A",
+"'.	c #E4E4AA",
+").	c #F5F5C3",
+"!.	c #F6F6BE",
+"~.	c #F6F6B7",
+"{.	c #F6F6B1",
+"].	c #F6F6AB",
+"^.	c #F6F6A5",
+"/.	c #F6F69E",
+"(.	c #F6F698",
+"_.	c #F1F18C",
+":.	c #D0D05F",
+"<.	c #BFBF48",
+"[.	c #C17474",
+"}.	c #C07171",
+"|.	c #BF6E6E",
+"1.	c #BF6B6B",
+"2.	c #BF6868",
+"3.	c #BF6464",
+"4.	c #BF6161",
+"5.	c #7C498C",
+"6.	c #4242D8",
+"7.	c #A4A4FF",
+"8.	c #5959FF",
+"9.	c #3D3DFF",
+"0.	c #3838FF",
+"a.	c #6666CA",
+"b.	c #DCDC98",
+"c.	c #FFFFDD",
+"d.	c #FFFFD7",
+"e.	c #FFFFC0",
+"f.	c #FFFFB8",
+"g.	c #FFFFB2",
+"h.	c #FFFFAB",
+"i.	c #FFFFA4",
+"j.	c #FFFF9D",
+"k.	c #FFFF97",
+"l.	c #FFFF90",
+"m.	c #FBFB85",
+"n.	c #C2C244",
+"o.	c #C37676",
+"p.	c #DA9B9B",
+"q.	c #DF9F9F",
+"r.	c #DF9A9A",
+"s.	c #DF9494",
+"t.	c #DF8F8F",
+"u.	c #DF8A8A",
+"v.	c #B47094",
+"w.	c #3B3BD8",
+"x.	c #9292FF",
+"y.	c #5656FF",
+"z.	c #3333FF",
+"A.	c #2E2EFF",
+"B.	c #7070B6",
+"C.	c #E7E79F",
+"D.	c #FFFFDE",
+"E.	c #FFFFCF",
+"F.	c #FFFFB5",
+"G.	c #FFFF9E",
+"H.	c #FFFF8A",
+"I.	c #FFFF83",
+"J.	c #FFFF7C",
+"K.	c #C8C843",
+"L.	c #C06D6D",
+"M.	c #F1BEBE",
+"N.	c #FFDBDB",
+"O.	c #FFCBCB",
+"P.	c #FFC0C0",
+"Q.	c #FFBABA",
+"R.	c #FFB3B3",
+"S.	c #FFACAC",
+"T.	c #CE89AC",
+"U.	c #3333D7",
+"V.	c #8787FF",
+"W.	c #4D4DFF",
+"X.	c #2929FF",
+"Y.	c #2424FF",
+"Z.	c #6B6BB3",
+"`.	c #E7E795",
+" +	c #FFFFC6",
+".+	c #FFFFA8",
+"++	c #FFFF76",
+"@+	c #FFFF6F",
+"#+	c #C8C83C",
+"$+	c #C77474",
+"%+	c #FFD3D3",
+"&+	c #FFDEDE",
+"*+	c #FFC4C4",
+"=+	c #FFA6A6",
+"-+	c #FF9F9F",
+";+	c #F3929A",
+">+	c #2F29C3",
+",+	c #4C4CFB",
+"'+	c #6868FF",
+")+	c #3939FF",
+"!+	c #1F1FFF",
+"~+	c #1A1AFF",
+"{+	c #6666B0",
+"]+	c #E7E78A",
+"^+	c #FFFFD0",
+"/+	c #FFFFBD",
+"(+	c #FFFF9B",
+"_+	c #FFFF91",
+":+	c #FAFA6E",
+"<+	c #F5F55F",
+"[+	c #F5F558",
+"}+	c #F7F756",
+"|+	c #C7C732",
+"1+	c #C86E6E",
+"2+	c #FFC9C9",
+"3+	c #FFD7D7",
+"4+	c #FFB8B8",
+"5+	c #FF9898",
+"6+	c #FF9292",
+"7+	c #FF8B8B",
+"8+	c #B16098",
+"9+	c #2420C6",
+"0+	c #2222DD",
+"a+	c #1F1FDF",
+"b+	c #1B1BDF",
+"c+	c #1818DF",
+"d+	c #1414DF",
+"e+	c #1010DF",
+"f+	c #0C0CDF",
+"g+	c #5F5F9C",
+"h+	c #E7E77F",
+"i+	c #FFFFC9",
+"j+	c #FFFFB4",
+"k+	c #FFFF8E",
+"l+	c #FFFF7D",
+"m+	c #FEFE75",
+"n+	c #F4F45D",
+"o+	c #EFEF4F",
+"p+	c #EFEF4A",
+"q+	c #EFEF44",
+"r+	c #EFEF3F",
+"s+	c #BFBF22",
+"t+	c #C86666",
+"u+	c #FFBFBF",
+"v+	c #FFD0D0",
+"w+	c #FFADAD",
+"x+	c #FF8484",
+"y+	c #FF7E7E",
+"z+	c #FF7373",
+"A+	c #E75F70",
+"B+	c #B0457F",
+"C+	c #9A3776",
+"D+	c #5F1D7C",
+"E+	c #0C0CBF",
+"F+	c #0909BF",
+"G+	c #0707BF",
+"H+	c #0404BF",
+"I+	c #878766",
+"J+	c #E6E674",
+"K+	c #FFFFC2",
+"L+	c #FFFF82",
+"M+	c #FEFE6E",
+"N+	c #F3F355",
+"O+	c #EFEF45",
+"P+	c #EFEF40",
+"Q+	c #EFEF3B",
+"R+	c #EFEF36",
+"S+	c #BFBF1C",
+"T+	c #C85F5F",
+"U+	c #FFB4B4",
+"V+	c #FFA2A2",
+"W+	c #FF7575",
+"X+	c #FF5E5E",
+"Y+	c #FF5050",
+"Z+	c #FF4A4A",
+"`+	c #FF4545",
+" @	c #E73535",
+".@	c #BF2121",
+"+@	c #B7B733",
+"@@	c #DCDC55",
+"#@	c #FDFDB7",
+"$@	c #FFFFA2",
+"%@	c #FFFF75",
+"&@	c #FCFC64",
+"*@	c #F2F24E",
+"=@	c #EFEF31",
+"-@	c #EFEF2C",
+";@	c #BFBF16",
+">@	c #C85656",
+",@	c #FFAAAA",
+"'@	c #FFC2C2",
+")@	c #FF9797",
+"!@	c #FF7777",
+"~@	c #FF6E6E",
+"{@	c #FF5454",
+"]@	c #FF4040",
+"^@	c #FF3B3B",
+"/@	c #E72C2C",
+"(@	c #BF1919",
+"_@	c #B7B72E",
+":@	c #DADA48",
+"<@	c #F7F7A6",
+"[@	c #F6F689",
+"}@	c #F2F254",
+"|@	c #EFEF27",
+"1@	c #EFEF22",
+"2@	c #BFBF10",
+"3@	c #C84040",
+"4@	c #FF9A9A",
+"5@	c #FFBBBB",
+"6@	c #FF7171",
+"7@	c #FF6666",
+"8@	c #FF4E4E",
+"9@	c #FF4646",
+"0@	c #FF4141",
+"a@	c #FF3C3C",
+"b@	c #FF3737",
+"c@	c #FF3232",
+"d@	c #E72424",
+"e@	c #BF1414",
+"f@	c #B7B729",
+"g@	c #DADA3F",
+"h@	c #F7F7A1",
+"i@	c #F4F480",
+"j@	c #F0F047",
+"k@	c #EFEF1D",
+"l@	c #EFEF18",
+"m@	c #BFBF0B",
+"n@	c #C83636",
+"o@	c #FFABAB",
+"p@	c #FF7676",
+"q@	c #FF2D2D",
+"r@	c #FF2828",
+"s@	c #E71C1C",
+"t@	c #BF0F0F",
+"u@	c #B7B724",
+"v@	c #D1D132",
+"w@	c #F4F478",
+"x@	c #EFEF13",
+"y@	c #ECEC0E",
+"z@	c #BABA05",
+"A@	c #C83030",
+"B@	c #FF6161",
+"C@	c #FF2323",
+"D@	c #FF1E1E",
+"E@	c #E71414",
+"F@	c #BF0A0A",
+"G@	c #B8B820",
+"H@	c #B9B91F",
+"I@	c #DADA2C",
+"J@	c #E9E931",
+"K@	c #EAEA2A",
+"L@	c #EAEA25",
+"M@	c #EAEA20",
+"N@	c #EAEA1C",
+"O@	c #EAEA17",
+"P@	c #EAEA12",
+"Q@	c #EAEA0D",
+"R@	c #E5E508",
+"S@	c #C7C703",
+"T@	c #B7B701",
+"U@	c #C52929",
+"V@	c #FF5858",
+"W@	c #FF1919",
+"X@	c #FF1414",
+"Y@	c #E30C0C",
+"Z@	c #BF0606",
+"`@	c #B8B819",
+" #	c #B7B717",
+".#	c #B7B714",
+"+#	c #B7B711",
+"@#	c #B7B70F",
+"##	c #B7B70C",
+"$#	c #B7B70A",
+"%#	c #B7B707",
+"&#	c #B7B705",
+"*#	c #B7B702",
+"=#	c #B7B700",
+"-#	c #BF2020",
+";#	c #E63131",
+">#	c #FF5555",
+",#	c #FF3A3A",
+"'#	c #FF0F0F",
+")#	c #FA0A0A",
+"!#	c #C90303",
+"~#	c #C00202",
+"{#	c #C01C1C",
+"]#	c #CB1B1B",
+"^#	c #D01A1A",
+"/#	c #D01616",
+"(#	c #D01313",
+"_#	c #D01010",
+":#	c #D00D0D",
+"<#	c #D00A0A",
+"[#	c #D00707",
+"}#	c #CF0303",
+"|#	c #C30101",
+"1#	c #C00000",
+"2#	c #C21414",
+"3#	c #BF1111",
+"4#	c #BF0E0E",
+"5#	c #BF0C0C",
+"6#	c #BF0909",
+"7#	c #BF0707",
+"8#	c #BF0404",
+"9#	c #BF0202",
+"0#	c #C50000",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                      . + @ # $ % & * =                         ",
+"                  - ; > , ' ) ! ~ { ] ^ / (                     ",
+"                _ : < [ } | 1 2 3 4 5 6 7 8 9                   ",
+"                0 a b b c 2 3 4 5 6 d e f g h                   ",
+"                i j k l 2 4 5 6 d e f m n o p                   ",
+"                q r s t u 6 d e f m n v w x y                   ",
+"                z A B | C D f m E F G H I J K                   ",
+"                L M 1 N O m n P Q H R S T U V W X Y Z `  ...+.  ",
+"                p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
+"  [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.",
+"}.o.p.q.r.s.t.u.v.w.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.",
+"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+",
+"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+",
+"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+",
+"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+",
+"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@        +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
+">@,@'@)@y+!@~@{@Z+`+]@^@/@(@        _@:@<@[@}@O+P+Q+R+=@-@|@1@2@",
+"3@4@5@7+6@7@8@9@0@a@b@c@d@e@        f@g@h@i@j@Q+R+=@-@|@1@k@l@m@",
+"n@y+o@p@{@9@0@a@b@c@q@r@s@t@        u@v@i@w@Q+=@-@|@1@k@l@x@y@z@",
+"A@p@-+B@0@a@b@c@q@r@C@D@E@F@        G@H@I@J@K@L@M@N@O@P@Q@R@S@T@",
+"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@          `@ #.#+#@###$#%#&#*#=#=#  ",
+"-#;#>#,#q@r@C@D@W@X@'#)#!#~#                                    ",
+"{#(@]#^#/#(#_#:#<#[#}#|#1#                                      ",
+"    2#3#4#5#6#7#8#9#1#0#                                        ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};
diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
index d99f6f8b94..a8e473b01a 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
@@ -1,30 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="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>
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\wx\aboutdlg.h" />
@@ -309,9 +293,11 @@
     <ClInclude Include="..\..\include\wx\memtext.h" />
     <ClInclude Include="..\..\include\wx\menu.h" />
     <ClInclude Include="..\..\include\wx\menuitem.h" />
+    <ClInclude Include="..\..\include\wx\meta\removeref.h" />
     <ClInclude Include="..\..\include\wx\metafile.h" />
     <ClInclude Include="..\..\include\wx\mimetype.h" />
     <ClInclude Include="..\..\include\wx\minifram.h" />
+    <ClInclude Include="..\..\include\wx\modalhook.h" />
     <ClInclude Include="..\..\include\wx\module.h" />
     <ClInclude Include="..\..\include\wx\mousemanager.h" />
     <ClInclude Include="..\..\include\wx\mousestate.h" />
@@ -361,6 +347,7 @@
     <ClInclude Include="..\..\include\wx\msw\dragimag.h" />
     <ClInclude Include="..\..\include\wx\msw\enhmeta.h" />
     <ClInclude Include="..\..\include\wx\msw\evtloop.h" />
+    <ClInclude Include="..\..\include\wx\msw\evtloopconsole.h" />
     <ClInclude Include="..\..\include\wx\msw\fdrepdlg.h" />
     <ClInclude Include="..\..\include\wx\msw\filedlg.h" />
     <ClInclude Include="..\..\include\wx\msw\font.h" />
@@ -381,6 +368,7 @@
     <ClInclude Include="..\..\include\wx\msw\icon.h" />
     <ClInclude Include="..\..\include\wx\msw\imaglist.h" />
     <ClInclude Include="..\..\include\wx\msw\iniconf.h" />
+    <ClInclude Include="..\..\include\wx\msw\init.h" />
     <ClInclude Include="..\..\include\wx\msw\joystick.h" />
     <ClInclude Include="..\..\include\wx\msw\libraries.h" />
     <ClInclude Include="..\..\include\wx\msw\listbox.h" />
@@ -418,6 +406,7 @@
     <ClInclude Include="..\..\include\wx\msw\printwin.h" />
     <ClInclude Include="..\..\include\wx\msw\private.h" />
     <ClInclude Include="..\..\include\wx\msw\private\button.h" />
+    <ClInclude Include="..\..\include\wx\msw\private\comptr.h" />
     <ClInclude Include="..\..\include\wx\msw\private\datecontrols.h" />
     <ClInclude Include="..\..\include\wx\msw\private\dc.h" />
     <ClInclude Include="..\..\include\wx\msw\private\fswatcher.h" />
@@ -425,7 +414,9 @@
     <ClInclude Include="..\..\include\wx\msw\private\keyboard.h" />
     <ClInclude Include="..\..\include\wx\msw\private\metrics.h" />
     <ClInclude Include="..\..\include\wx\msw\private\msgdlg.h" />
+    <ClInclude Include="..\..\include\wx\msw\private\pipestream.h" />
     <ClInclude Include="..\..\include\wx\msw\private\sockmsw.h" />
+    <ClInclude Include="..\..\include\wx\msw\private\textmeasure.h" />
     <ClInclude Include="..\..\include\wx\msw\private\timer.h" />
     <ClInclude Include="..\..\include\wx\msw\progdlg.h" />
     <ClInclude Include="..\..\include\wx\msw\radiobox.h" />
@@ -438,20 +429,10 @@
     <ClInclude Include="..\..\include\wx\msw\scrolbar.h" />
     <ClInclude Include="..\..\include\wx\msw\seh.h" />
     <ClInclude Include="..\..\include\wx\msw\setup0.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\setup_inc.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\slider.h" />
     <ClInclude Include="..\..\include\wx\msw\sound.h" />
@@ -479,6 +460,7 @@
     <ClInclude Include="..\..\include\wx\msw\uxthemep.h" />
     <ClInclude Include="..\..\include\wx\msw\webviewhistoryitem_ie.h" />
     <ClInclude Include="..\..\include\wx\msw\webview_ie.h" />
+    <ClInclude Include="..\..\include\wx\msw\webview_missing.h" />
     <ClInclude Include="..\..\include\wx\msw\window.h" />
     <ClInclude Include="..\..\include\wx\msw\winundef.h" />
     <ClInclude Include="..\..\include\wx\msw\wrapcctl.h" />
@@ -507,6 +489,7 @@
     <ClInclude Include="..\..\include\wx\popupwin.h" />
     <ClInclude Include="..\..\include\wx\position.h" />
     <ClInclude Include="..\..\include\wx\power.h" />
+    <ClInclude Include="..\..\include\wx\preferences.h" />
     <ClInclude Include="..\..\include\wx\print.h" />
     <ClInclude Include="..\..\include\wx\printdlg.h" />
     <ClInclude Include="..\..\include\wx\prntbase.h" />
@@ -543,6 +526,7 @@
     <ClInclude Include="..\..\include\wx\setup_inc.h" />
     <ClInclude Include="..\..\include\wx\setup_redirect.h" />
     <ClInclude Include="..\..\include\wx\sharedptr.h" />
+    <ClInclude Include="..\..\include\wx\simplebook.h" />
     <ClInclude Include="..\..\include\wx\sizer.h" />
     <ClInclude Include="..\..\include\wx\slider.h" />
     <ClInclude Include="..\..\include\wx\snglinst.h" />
@@ -575,6 +559,7 @@
     <ClInclude Include="..\..\include\wx\tarstrm.h" />
     <ClInclude Include="..\..\include\wx\taskbar.h" />
     <ClInclude Include="..\..\include\wx\tbarbase.h" />
+    <ClInclude Include="..\..\include\wx\testing.h" />
     <ClInclude Include="..\..\include\wx\textbuf.h" />
     <ClInclude Include="..\..\include\wx\textcompleter.h" />
     <ClInclude Include="..\..\include\wx\textctrl.h" />
@@ -627,9 +612,11 @@
     <ClInclude Include="..\..\include\wx\weakref.h" />
     <ClInclude Include="..\..\include\wx\webview.h" />
     <ClInclude Include="..\..\include\wx\webviewarchivehandler.h" />
+    <ClInclude Include="..\..\include\wx\webviewfshandler.h" />
     <ClInclude Include="..\..\include\wx\wfstream.h" />
     <ClInclude Include="..\..\include\wx\window.h" />
     <ClInclude Include="..\..\include\wx\windowid.h" />
+    <ClInclude Include="..\..\include\wx\windowptr.h" />
     <ClInclude Include="..\..\include\wx\withimages.h" />
     <ClInclude Include="..\..\include\wx\wizard.h" />
     <ClInclude Include="..\..\include\wx\wrapsizer.h" />
@@ -673,20 +660,10 @@
     <ClInclude Include="..\..\include\wx\zstream.h" />
     <ClInclude Include="..\..\wx\setup.h" />
     <ClInclude Include="..\..\wx\wxcocoa.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\wx\wxgtk.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\wx\wxmsw.h" />
   </ItemGroup>
@@ -696,15 +673,11 @@
     <ClCompile Include="..\..\src\aui\dockart.cpp" />
     <ClCompile Include="..\..\src\aui\floatpane.cpp" />
     <ClCompile Include="..\..\src\aui\framemanager.cpp" />
+    <ClCompile Include="..\..\src\aui\tabart.cpp" />
     <ClCompile Include="..\..\src\aui\tabmdi.cpp" />
     <ClCompile Include="..\..\src\common\accelcmn.cpp" />
     <ClCompile Include="..\..\src\common\accesscmn.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\affinematrix2d.cpp" />
     <ClCompile Include="..\..\src\common\anidecod.cpp" />
@@ -764,42 +737,22 @@
     <ClCompile Include="..\..\src\common\dpycmn.cpp" />
     <ClCompile Include="..\..\src\common\dseldlg.cpp" />
     <ClCompile Include="..\..\src\common\dummy.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\..\src\common\dynarray.cpp" />
     <ClCompile Include="..\..\src\common\dynlib.cpp" />
     <ClCompile Include="..\..\src\common\dynload.cpp" />
     <ClCompile Include="..\..\src\common\effects.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\encconv.cpp" />
     <ClCompile Include="..\..\src\common\event.cpp" />
     <ClCompile Include="..\..\src\common\evtloopcmn.cpp" />
     <ClCompile Include="..\..\src\common\execcmn.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\extended.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\..\src\common\fddlgcmn.cpp" />
     <ClCompile Include="..\..\src\common\fdiodispatcher.cpp" />
@@ -822,23 +775,13 @@
     <ClCompile Include="..\..\src\common\fontenumcmn.cpp" />
     <ClCompile Include="..\..\src\common\fontmap.cpp" />
     <ClCompile Include="..\..\src\common\fontmgrcmn.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\fontpickercmn.cpp" />
     <ClCompile Include="..\..\src\common\fontutilcmn.cpp" />
     <ClCompile Include="..\..\src\common\framecmn.cpp" />
     <ClCompile Include="..\..\src\common\fswatchercmn.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\fs_arc.cpp" />
     <ClCompile Include="..\..\src\common\fs_filter.cpp" />
@@ -866,69 +809,29 @@
     <ClCompile Include="..\..\src\common\image.cpp" />
     <ClCompile Include="..\..\src\common\imagfill.cpp" />
     <ClCompile Include="..\..\src\common\imaggif.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagiff.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagjpeg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagpcx.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagpng.cpp" />
     <ClCompile Include="..\..\src\common\imagpnm.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagtga.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagtiff.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\imagxpm.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\init.cpp" />
     <ClCompile Include="..\..\src\common\intl.cpp" />
@@ -941,32 +844,18 @@
     <ClCompile Include="..\..\src\common\log.cpp" />
     <ClCompile Include="..\..\src\common\longlong.cpp" />
     <ClCompile Include="..\..\src\common\markupparser.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\matrix.cpp" />
     <ClCompile Include="..\..\src\common\mediactrlcmn.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\memory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\menucmn.cpp" />
     <ClCompile Include="..\..\src\common\mimecmn.cpp" />
+    <ClCompile Include="..\..\src\common\modalhook.cpp" />
     <ClCompile Include="..\..\src\common\module.cpp" />
     <ClCompile Include="..\..\src\common\mousemanager.cpp" />
     <ClCompile Include="..\..\src\common\msgout.cpp" />
@@ -984,6 +873,7 @@
     <ClCompile Include="..\..\src\common\platinfo.cpp" />
     <ClCompile Include="..\..\src\common\popupcmn.cpp" />
     <ClCompile Include="..\..\src\common\powercmn.cpp" />
+    <ClCompile Include="..\..\src\common\preferencescmn.cpp" />
     <ClCompile Include="..\..\src\common\prntbase.cpp" />
     <ClCompile Include="..\..\src\common\process.cpp" />
     <ClCompile Include="..\..\src\common\protocol.cpp" />
@@ -992,12 +882,7 @@
     <ClCompile Include="..\..\src\common\radiocmn.cpp" />
     <ClCompile Include="..\..\src\common\rearrangectrl.cpp" />
     <ClCompile Include="..\..\src\common\regex.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\rendcmn.cpp" />
     <ClCompile Include="..\..\src\common\rgncmn.cpp" />
@@ -1013,12 +898,7 @@
     <ClCompile Include="..\..\src\common\slidercmn.cpp" />
     <ClCompile Include="..\..\src\common\socket.cpp" />
     <ClCompile Include="..\..\src\common\socketiohandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\spinbtncmn.cpp" />
     <ClCompile Include="..\..\src\common\spinctrlcmn.cpp" />
@@ -1047,6 +927,8 @@
     <ClCompile Include="..\..\src\common\textcmn.cpp" />
     <ClCompile Include="..\..\src\common\textentrycmn.cpp" />
     <ClCompile Include="..\..\src\common\textfile.cpp" />
+    <ClCompile Include="..\..\src\common\textmeasurecmn.cpp" />
+    <ClCompile Include="..\..\src\common\threadinfo.cpp" />
     <ClCompile Include="..\..\src\common\time.cpp" />
     <ClCompile Include="..\..\src\common\timercmn.cpp" />
     <ClCompile Include="..\..\src\common\timerimpl.cpp" />
@@ -1067,14 +949,10 @@
     <ClCompile Include="..\..\src\common\valtext.cpp" />
     <ClCompile Include="..\..\src\common\variant.cpp" />
     <ClCompile Include="..\..\src\common\webview.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\webviewarchivehandler.cpp" />
+    <ClCompile Include="..\..\src\common\webviewfshandler.cpp" />
     <ClCompile Include="..\..\src\common\wfstream.cpp" />
     <ClCompile Include="..\..\src\common\wincmn.cpp" />
     <ClCompile Include="..\..\src\common\windowid.cpp" />
@@ -1084,104 +962,47 @@
     <ClCompile Include="..\..\src\common\xlocale.cpp" />
     <ClCompile Include="..\..\src\common\xpmdecod.cpp" />
     <ClCompile Include="..\..\src\common\xti.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\xtistrm.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\xtixml.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\zipstrm.cpp" />
     <ClCompile Include="..\..\src\common\zstream.cpp" />
     <ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
-    <ClCompile Include="..\..\src\generic\accel.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\animateg.cpp" />
     <ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
     <ClCompile Include="..\..\src\generic\bmpcboxg.cpp" />
     <ClCompile Include="..\..\src\generic\busyinfo.cpp" />
     <ClCompile Include="..\..\src\generic\buttonbar.cpp" />
     <ClCompile Include="..\..\src\generic\calctrlg.cpp" />
-    <ClCompile Include="..\..\src\generic\caret.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\choicbkg.cpp" />
     <ClCompile Include="..\..\src\generic\choicdgg.cpp" />
     <ClCompile Include="..\..\src\generic\clrpickerg.cpp" />
     <ClCompile Include="..\..\src\generic\collpaneg.cpp" />
-    <ClCompile Include="..\..\src\generic\colour.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\colrdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\combog.cpp" />
     <ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp" />
     <ClCompile Include="..\..\src\generic\datavgen.cpp" />
     <ClCompile Include="..\..\src\generic\datectlg.cpp" />
     <ClCompile Include="..\..\src\generic\dbgrptg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\dcpsg.cpp" />
     <ClCompile Include="..\..\src\generic\dirctrlg.cpp" />
     <ClCompile Include="..\..\src\generic\dirdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\dragimgg.cpp" />
     <ClCompile Include="..\..\src\generic\editlbox.cpp" />
-    <ClCompile Include="..\..\src\generic\fdrepdlg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\filectrlg.cpp" />
     <ClCompile Include="..\..\src\generic\filedlgg.cpp" />
     <ClCompile Include="..\..\src\generic\filepickerg.cpp" />
     <ClCompile Include="..\..\src\generic\fontdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\fontpickerg.cpp" />
     <ClCompile Include="..\..\src\generic\fswatcherg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\graphicc.cpp" />
     <ClCompile Include="..\..\src\generic\grid.cpp" />
@@ -1189,99 +1010,37 @@
     <ClCompile Include="..\..\src\generic\grideditors.cpp" />
     <ClCompile Include="..\..\src\generic\gridsel.cpp" />
     <ClCompile Include="..\..\src\generic\headerctrlg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\helpext.cpp" />
     <ClCompile Include="..\..\src\generic\htmllbox.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
-    <ClCompile Include="..\..\src\generic\icon.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\generic\imaglist.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\infobar.cpp" />
     <ClCompile Include="..\..\src\generic\laywin.cpp" />
     <ClCompile Include="..\..\src\generic\listbkg.cpp" />
-    <ClCompile Include="..\..\src\generic\listctrl.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\logg.cpp" />
     <ClCompile Include="..\..\src\generic\markuptext.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\mask.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\mdig.cpp" />
     <ClCompile Include="..\..\src\generic\msgdlgg.cpp" />
-    <ClCompile Include="..\..\src\generic\notebook.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
     <ClCompile Include="..\..\src\generic\numdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\odcombo.cpp" />
     <ClCompile Include="..\..\src\generic\paletteg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\printps.cpp" />
     <ClCompile Include="..\..\src\generic\prntdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\progdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\propdlg.cpp" />
     <ClCompile Include="..\..\src\generic\regiong.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\generic\renderg.cpp" />
     <ClCompile Include="..\..\src\generic\richmsgdlgg.cpp" />
@@ -1294,27 +1053,11 @@
     <ClCompile Include="..\..\src\generic\splitter.cpp" />
     <ClCompile Include="..\..\src\generic\srchctlg.cpp" />
     <ClCompile Include="..\..\src\generic\statbmpg.cpp" />
-    <ClCompile Include="..\..\src\generic\statline.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\stattextg.cpp" />
     <ClCompile Include="..\..\src\generic\statusbr.cpp" />
     <ClCompile Include="..\..\src\generic\tabg.cpp" />
     <ClCompile Include="..\..\src\generic\textdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\timectrlg.cpp" />
-    <ClCompile Include="..\..\src\generic\timer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\tipdlg.cpp" />
     <ClCompile Include="..\..\src\generic\tipwin.cpp" />
     <ClCompile Include="..\..\src\generic\toolbkg.cpp" />
@@ -1370,6 +1113,7 @@
     <ClCompile Include="..\..\src\msw\dragimag.cpp" />
     <ClCompile Include="..\..\src\msw\enhmeta.cpp" />
     <ClCompile Include="..\..\src\msw\evtloop.cpp" />
+    <ClCompile Include="..\..\src\msw\evtloopconsole.cpp" />
     <ClCompile Include="..\..\src\msw\fdrepdlg.cpp" />
     <ClCompile Include="..\..\src\msw\filedlg.cpp" />
     <ClCompile Include="..\..\src\msw\font.cpp" />
@@ -1378,12 +1122,7 @@
     <ClCompile Include="..\..\src\msw\fontutil.cpp" />
     <ClCompile Include="..\..\src\msw\frame.cpp" />
     <ClCompile Include="..\..\src\msw\fswatcher.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\gauge.cpp" />
     <ClCompile Include="..\..\src\msw\gdiimage.cpp" />
@@ -1400,51 +1139,26 @@
     <ClCompile Include="..\..\src\msw\imaglist.cpp" />
     <ClCompile Include="..\..\src\msw\iniconf.cpp" />
     <ClCompile Include="..\..\src\msw\joystick.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\listbox.cpp" />
     <ClCompile Include="..\..\src\msw\listctrl.cpp" />
     <ClCompile Include="..\..\src\msw\main.cpp" />
     <ClCompile Include="..\..\src\msw\mdi.cpp" />
     <ClCompile Include="..\..\src\msw\mediactrl_am.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\mediactrl_qt.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\mediactrl_wmp10.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\menu.cpp" />
     <ClCompile Include="..\..\src\msw\menuitem.cpp" />
     <ClCompile Include="..\..\src\msw\metafile.cpp" />
     <ClCompile Include="..\..\src\msw\microwin.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\mimetype.cpp" />
     <ClCompile Include="..\..\src\msw\minifram.cpp" />
@@ -1462,6 +1176,7 @@
     <ClCompile Include="..\..\src\msw\ole\dropsrc.cpp" />
     <ClCompile Include="..\..\src\msw\ole\droptgt.cpp" />
     <ClCompile Include="..\..\src\msw\ole\oleutils.cpp" />
+    <ClCompile Include="..\..\src\msw\ole\safearray.cpp" />
     <ClCompile Include="..\..\src\msw\ole\uuid.cpp" />
     <ClCompile Include="..\..\src\msw\ownerdrw.cpp" />
     <ClCompile Include="..\..\src\msw\palette.cpp" />
@@ -1499,6 +1214,7 @@
     <ClCompile Include="..\..\src\msw\taskbar.cpp" />
     <ClCompile Include="..\..\src\msw\textctrl.cpp" />
     <ClCompile Include="..\..\src\msw\textentry.cpp" />
+    <ClCompile Include="..\..\src\msw\textmeasure.cpp" />
     <ClCompile Include="..\..\src\msw\tglbtn.cpp" />
     <ClCompile Include="..\..\src\msw\thread.cpp" />
     <ClCompile Include="..\..\src\msw\timectrl.cpp" />
@@ -1512,24 +1228,15 @@
     <ClCompile Include="..\..\src\msw\utils.cpp" />
     <ClCompile Include="..\..\src\msw\utilsexc.cpp" />
     <ClCompile Include="..\..\src\msw\utilsgui.cpp" />
+    <ClCompile Include="..\..\src\msw\utilswin.cpp" />
     <ClCompile Include="..\..\src\msw\uxtheme.cpp" />
     <ClCompile Include="..\..\src\msw\volume.cpp" />
     <ClCompile Include="..\..\src\msw\webview_ie.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\window.cpp" />
     <ClCompile Include="..\..\src\msw\winestub.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1538,148 +1245,48 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\libpng\png\png.vcxproj">
-      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\zlib\zlib.vcxproj">
-      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxWidgets</ProjectName>
     <ProjectGuid>{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}</ProjectGuid>
-    <RootNamespace>wxBase28</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_Debug.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.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="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_Debug.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.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="..\..\..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\..\..\Source\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
     <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
+    <Import Project="..\..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile />
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
       <PreprocessorDefinitions>__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
-      <PreprocessorDefinitions>__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile />
-    <Lib />
-    <Bscmake />
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
+      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
index e11b02d82e..19d1a6c4c7 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Setup Headers">
@@ -678,12 +678,18 @@
     <ClInclude Include="..\..\include\wx\metafile.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\meta\removeref.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\mimetype.h">
       <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\minifram.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\modalhook.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\module.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -768,6 +774,9 @@
     <ClInclude Include="..\..\include\wx\power.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\preferences.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\print.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -876,6 +885,9 @@
     <ClInclude Include="..\..\include\wx\sharedptr.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\simplebook.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\sizer.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -972,6 +984,9 @@
     <ClInclude Include="..\..\include\wx\tbarbase.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\testing.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\textbuf.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1128,6 +1143,9 @@
     <ClInclude Include="..\..\include\wx\webviewarchivehandler.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\webviewfshandler.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\wfstream.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1137,6 +1155,9 @@
     <ClInclude Include="..\..\include\wx\windowid.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\windowptr.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\withimages.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1380,6 +1401,9 @@
     <ClInclude Include="..\..\include\wx\msw\evtloop.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\evtloopconsole.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\fdrepdlg.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1437,6 +1461,9 @@
     <ClInclude Include="..\..\include\wx\msw\iniconf.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\init.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\joystick.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1653,6 +1680,9 @@
     <ClInclude Include="..\..\include\wx\msw\button.h">
       <Filter>Headers\MSW\private</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\private\comptr.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\private\datecontrols.h">
       <Filter>Headers\MSW\private</Filter>
     </ClInclude>
@@ -1674,9 +1704,15 @@
     <ClInclude Include="..\..\include\wx\msw\private\msgdlg.h">
       <Filter>Headers\MSW\private</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\private\pipestream.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\private\sockmsw.h">
       <Filter>Headers\MSW\private</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\private\textmeasure.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\private\timer.h">
       <Filter>Headers\MSW\private</Filter>
     </ClInclude>
@@ -1686,6 +1722,9 @@
     <ClInclude Include="..\..\include\wx\msw\fswatcher.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\webview_missing.h">
+      <Filter>Headers\MSW</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\dc.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1955,6 +1994,9 @@
     <ClCompile Include="..\..\src\aui\framemanager.cpp">
       <Filter>AUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\aui\tabart.cpp">
+      <Filter>AUI</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\aui\tabmdi.cpp">
       <Filter>AUI</Filter>
     </ClCompile>
@@ -2390,6 +2432,9 @@
     <ClCompile Include="..\..\src\common\mimecmn.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\modalhook.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\module.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -2441,6 +2486,9 @@
     <ClCompile Include="..\..\src\common\powercmn.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\preferencescmn.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\prntbase.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -2648,6 +2696,9 @@
     <ClCompile Include="..\..\src\common\webview.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\webviewfshandler.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\webviewarchivehandler.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -2693,9 +2744,6 @@
     <ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\accel.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\animateg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2714,9 +2762,6 @@
     <ClCompile Include="..\..\src\generic\calctrlg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\caret.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\choicbkg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2729,9 +2774,6 @@
     <ClCompile Include="..\..\src\generic\collpaneg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\colour.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\colrdlgg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2765,9 +2807,6 @@
     <ClCompile Include="..\..\src\generic\editlbox.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\fdrepdlg.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\filectrlg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2813,12 +2852,6 @@
     <ClCompile Include="..\..\src\generic\hyperlinkg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\icon.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\generic\imaglist.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\infobar.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2828,9 +2861,6 @@
     <ClCompile Include="..\..\src\generic\listbkg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\listctrl.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\logg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2846,9 +2876,6 @@
     <ClCompile Include="..\..\src\generic\msgdlgg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\notebook.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\notifmsgg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2909,9 +2936,6 @@
     <ClCompile Include="..\..\src\generic\statbmpg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\statline.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\stattextg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -2927,9 +2951,6 @@
     <ClCompile Include="..\..\src\generic\timectrlg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\generic\timer.cpp">
-      <Filter>Generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\tipdlg.cpp">
       <Filter>Generic</Filter>
     </ClCompile>
@@ -3095,6 +3116,9 @@
     <ClCompile Include="..\..\src\msw\evtloop.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\evtloopconsole.cpp">
+      <Filter>MSW</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\fdrepdlg.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3332,6 +3356,9 @@
     <ClCompile Include="..\..\src\msw\textentry.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\textmeasure.cpp">
+      <Filter>MSW</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\tglbtn.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3371,6 +3398,9 @@
     <ClCompile Include="..\..\src\msw\utilsgui.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\utilswin.cpp">
+      <Filter>MSW</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\uxtheme.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3410,6 +3440,9 @@
     <ClCompile Include="..\..\src\msw\ole\uuid.cpp">
       <Filter>MSW\ole</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\textmeasurecmn.cpp" />
+    <ClCompile Include="..\..\src\common\threadinfo.cpp" />
+    <ClCompile Include="..\..\src\msw\ole\safearray.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\common\unictabl.inc">
diff --git a/Externals/wxWidgets3/build_wx.sh b/Externals/wxWidgets3/build_wx.sh
index 82670d6e9f..89281b442c 100755
--- a/Externals/wxWidgets3/build_wx.sh
+++ b/Externals/wxWidgets3/build_wx.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-svn co -r 70933 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
+svn co -r 75363 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
 cd wxWidgets
 
 case $OSTYPE in
diff --git a/Externals/wxWidgets3/include/msvc/wx/setup.h b/Externals/wxWidgets3/include/msvc/wx/setup.h
new file mode 100644
index 0000000000..7a8d472c78
--- /dev/null
+++ b/Externals/wxWidgets3/include/msvc/wx/setup.h
@@ -0,0 +1,256 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        msvc/wx/setup.h
+// Purpose:     wrapper around the real wx/setup.h for Visual C++
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2004-12-12
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER
+    #error "This file should only be included when using Microsoft Visual C++"
+#endif
+
+// VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
+// the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
+// explicitly!
+
+#include "wx/version.h"
+#include "wx/cpp.h"
+
+// notice that wxSUFFIX_DEBUG is a string but wxSUFFIX itself must be an
+// identifier as string concatenation is not done inside #include where we
+// need it
+#ifdef _DEBUG
+    #define wxSUFFIX_DEBUG "d"
+    #ifdef _UNICODE
+        #define wxSUFFIX ud
+    #else // !_UNICODE
+        #define wxSUFFIX d
+    #endif // _UNICODE/!_UNICODE
+#else
+    #define wxSUFFIX_DEBUG ""
+    #ifdef _UNICODE
+        #define wxSUFFIX u
+    #else // !_UNICODE
+        // don't define wxSUFFIX at all as preprocessor operations don't work
+        // with empty values so we need to check for this case specially below
+    #endif // _UNICODE/!_UNICODE
+#endif
+
+// compiler-specific prefix: by default it's always just "vc" for compatibility
+// reasons but if you use multiple MSVC versions you probably build them with
+// COMPILER_PREFIX=vcXX and in this case you may want to either predefine
+// wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate
+// version depending on the compiler used
+#ifdef wxMSVC_VERSION
+    #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION)
+#elif defined(wxMSVC_VERSION_AUTO)
+    #if _MSC_VER == 1200
+        #define wxCOMPILER_PREFIX vc60
+    #elif _MSC_VER == 1300
+        #define wxCOMPILER_PREFIX vc70
+    #elif _MSC_VER == 1310
+        #define wxCOMPILER_PREFIX vc71
+    #elif _MSC_VER == 1400
+        #define wxCOMPILER_PREFIX vc80
+    #elif _MSC_VER == 1500
+        #define wxCOMPILER_PREFIX vc90
+    #elif _MSC_VER == 1600
+        #define wxCOMPILER_PREFIX vc100
+    #elif _MSC_VER == 1700
+        #define wxCOMPILER_PREFIX vc110
+    #elif _MSC_VER == 1800
+        #define wxCOMPILER_PREFIX vc120
+    #else
+        #error "Unknown MSVC compiler version, please report to wx-dev."
+    #endif
+#else
+    #define wxCOMPILER_PREFIX vc
+#endif
+
+// architecture-specific part: not used (again, for compatibility), for x86
+#if defined(_M_X64)
+    #define wxARCH_SUFFIX _x64
+#elif defined(_M_IA64)
+    #define wxARCH_SUFFIX _ia64
+#else // assume _M_IX86
+    #define wxARCH_SUFFIX
+#endif
+
+// Ensure the library configuration is defined
+#ifndef wxCFG
+    #define wxCFG
+#endif
+
+// Construct the path for the subdirectory under /lib/ that the included setup.h
+// will be used from
+#ifdef WXUSINGDLL
+    #define wxLIB_SUBDIR \
+        wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll, wxCFG)
+#else // !DLL
+    #define wxLIB_SUBDIR \
+        wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib, wxCFG)
+#endif // DLL/!DLL
+
+// The user can predefine a different prefix if not using the default MSW port
+// with MSVC.
+#ifndef wxTOOLKIT_PREFIX
+    #if defined(__WXGTK__)
+        #define wxTOOLKIT_PREFIX gtk2
+    #else
+        #define wxTOOLKIT_PREFIX msw
+    #endif
+#endif // wxTOOLKIT_PREFIX
+
+// the real setup.h header file we need is in the build-specific directory,
+// construct the path to it
+#ifdef wxSUFFIX
+    #define wxSETUPH_PATH \
+        wxCONCAT6(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, wxSUFFIX, /wx/setup.h)
+#else // suffix is empty
+    #define wxSETUPH_PATH \
+        wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, /wx/setup.h)
+#endif
+
+#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
+
+#include wxSETUPH_PATH_STR
+
+
+// the library names depend on the build, these macro builds the correct
+// library name for the given base name
+#ifdef wxSUFFIX
+    #define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX)
+#else // suffix is empty
+    #define wxSUFFIX_STR ""
+#endif
+#define wxSHORT_VERSION_STRING \
+    wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)
+
+#define wxWX_LIB_NAME(name, subname) \
+    "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname
+
+#define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name)
+#define wxTOOLKIT_LIB_NAME(name) wxWX_LIB_NAME(wxSTRINGIZE(wxTOOLKIT_PREFIX), "_" name)
+
+// This one is for 3rd party libraries: they don't have the version number
+// in their names and usually exist in ANSI version only (except for regex)
+//
+// 3rd party libraries are also are not linked in when using DLLs as they're
+// embedded inside our own DLLs and don't need to be linked with the user code.
+#define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG
+
+// special version for regex as it does have a Unicode version
+#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
+
+#pragma comment(lib, wxWX_LIB_NAME("base", ""))
+
+#ifndef wxNO_NET_LIB
+    #ifndef WXUSINGDLL
+        #pragma comment(lib, "wsock32")
+    #endif
+    #pragma comment(lib, wxBASE_LIB_NAME("net"))
+#endif
+#ifndef wxNO_XML_LIB
+    #pragma comment(lib, wxBASE_LIB_NAME("xml"))
+#endif
+#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
+    #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
+#endif
+
+#if wxUSE_GUI
+    #if wxUSE_XML && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
+    #endif
+    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
+    #endif
+    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
+    #endif
+    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
+    #endif
+    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
+    #endif
+
+    #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))
+
+    #ifndef wxNO_ADV_LIB
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
+    #endif
+
+    #ifndef wxNO_HTML_LIB
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
+    #endif
+    #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl"))
+    #endif
+    #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
+    #endif
+    #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc"))
+    #endif
+    #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui"))
+    #endif
+    #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid"))
+    #endif
+    #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon"))
+    #endif
+    #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext"))
+    #endif
+    #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
+    #endif
+    #if wxUSE_STC && !defined(wxNO_STC_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
+        #ifndef WXUSINGDLL
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+        #endif
+    #endif
+    #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
+    #endif
+#endif // wxUSE_GUI
+
+
+#ifndef WXUSINGDLL
+    // Make sure all required system libraries are added to the linker too when
+    // using static libraries.
+    #pragma comment(lib, "kernel32")
+    #pragma comment(lib, "user32")
+    #pragma comment(lib, "gdi32")
+    #pragma comment(lib, "comdlg32")
+    #pragma comment(lib, "winspool")
+    #pragma comment(lib, "winmm")
+    #pragma comment(lib, "shell32")
+    #pragma comment(lib, "comctl32")
+    #pragma comment(lib, "ole32")
+    #pragma comment(lib, "oleaut32")
+    #pragma comment(lib, "uuid")
+    #pragma comment(lib, "rpcrt4")
+    #pragma comment(lib, "advapi32")
+    #if wxUSE_URL_NATIVE
+        #pragma comment(lib, "wininet")
+    #endif
+
+    #ifdef __WXGTK__
+        #pragma comment(lib, "gtk-win32-2.0.lib")
+        #pragma comment(lib, "gdk-win32-2.0.lib")
+        #pragma comment(lib, "pangocairo-1.0.lib")
+        #pragma comment(lib, "gdk_pixbuf-2.0.lib")
+        #pragma comment(lib, "cairo.lib")
+        #pragma comment(lib, "pango-1.0.lib")
+        #pragma comment(lib, "gobject-2.0.lib")
+        #pragma comment(lib, "gthread-2.0.lib")
+        #pragma comment(lib, "glib-2.0.lib")
+    #endif
+#endif // !WXUSINGDLL
diff --git a/Externals/wxWidgets3/include/wx/aboutdlg.h b/Externals/wxWidgets3/include/wx/aboutdlg.h
index 0552f91fd1..975b5def27 100644
--- a/Externals/wxWidgets3/include/wx/aboutdlg.h
+++ b/Externals/wxWidgets3/include/wx/aboutdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxAboutDialog class
 // Author:      Vadim Zeitlin
 // Created:     2006-10-07
-// RCS-ID:      $Id: aboutdlg.h 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/accel.h b/Externals/wxWidgets3/include/wx/accel.h
index 200feffe4d..5226b8b35a 100644
--- a/Externals/wxWidgets3/include/wx/accel.h
+++ b/Externals/wxWidgets3/include/wx/accel.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
-// RCS-ID:      $Id: accel.h 68718 2011-08-16 11:55:39Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -118,7 +117,12 @@ public:
     // returns a wxString for the this accelerator.
     // this function formats it using the <flags>-<keycode> format
     // where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
-    wxString ToString() const;
+    wxString ToString() const { return AsPossiblyLocalizedString(true); }
+
+    // same as above but without translating, useful if the string is meant to
+    // be stored in a file or otherwise stored, instead of being shown to the
+    // user
+    wxString ToRawString() const { return AsPossiblyLocalizedString(false); }
 
     // returns true if the given string correctly initialized this object
     // (i.e. if IsOk() returns true after this call)
@@ -126,6 +130,8 @@ public:
 
 
 private:
+    wxString AsPossiblyLocalizedString(bool localized) const;
+
     // common part of Create() and FromString()
     static bool ParseAccel(const wxString& str, int *flags, int *keycode);
 
diff --git a/Externals/wxWidgets3/include/wx/access.h b/Externals/wxWidgets3/include/wx/access.h
index 0ca94a7e10..70cbaf1389 100644
--- a/Externals/wxWidgets3/include/wx/access.h
+++ b/Externals/wxWidgets3/include/wx/access.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
-// RCS-ID:      $Id: access.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/affinematrix2d.h b/Externals/wxWidgets3/include/wx/affinematrix2d.h
index 6516cd46f5..28055f8d35 100644
--- a/Externals/wxWidgets3/include/wx/affinematrix2d.h
+++ b/Externals/wxWidgets3/include/wx/affinematrix2d.h
@@ -36,7 +36,7 @@ public:
     virtual bool IsEqual(const wxAffineMatrix2DBase& t) const;
     virtual void Translate(wxDouble dx, wxDouble dy);
     virtual void Scale(wxDouble xScale, wxDouble yScale);
-    virtual void Rotate(wxDouble ccRadians);
+    virtual void Rotate(wxDouble cRadians);
 
 protected:
     virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const;
diff --git a/Externals/wxWidgets3/include/wx/afterstd.h b/Externals/wxWidgets3/include/wx/afterstd.h
index 40969fd4b6..16075fe5d7 100644
--- a/Externals/wxWidgets3/include/wx/afterstd.h
+++ b/Externals/wxWidgets3/include/wx/afterstd.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id: afterstd.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,7 +12,7 @@
     See the comments in beforestd.h.
  */
 
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/winundef.h"
 #endif
 
diff --git a/Externals/wxWidgets3/include/wx/anidecod.h b/Externals/wxWidgets3/include/wx/anidecod.h
index f2d0a300ba..2923887b49 100644
--- a/Externals/wxWidgets3/include/wx/anidecod.h
+++ b/Externals/wxWidgets3/include/wx/anidecod.h
@@ -2,7 +2,6 @@
 // Name:        wx/anidecod.h
 // Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
 // Author:      Francesco Montorsi
-// CVS-ID:      $Id: anidecod.h 66716 2011-01-19 12:28:31Z DS $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/animate.h b/Externals/wxWidgets3/include/wx/animate.h
index 072a379f2f..6243fb4568 100644
--- a/Externals/wxWidgets3/include/wx/animate.h
+++ b/Externals/wxWidgets3/include/wx/animate.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by: Francesco Montorsi
 // Created:     13/8/99
-// RCS-ID:      $Id: animate.h 56651 2008-11-02 22:16:14Z FM $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/animdecod.h b/Externals/wxWidgets3/include/wx/animdecod.h
index eacfe5d729..58177e68fd 100644
--- a/Externals/wxWidgets3/include/wx/animdecod.h
+++ b/Externals/wxWidgets3/include/wx/animdecod.h
@@ -2,7 +2,6 @@
 // Name:        wx/animdecod.h
 // Purpose:     wxAnimationDecoder
 // Author:      Francesco Montorsi
-// CVS-ID:      $Id: animdecod.h 62789 2009-12-05 19:57:58Z PC $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/any.h b/Externals/wxWidgets3/include/wx/any.h
index b38a1d491c..c2cd7a79f4 100644
--- a/Externals/wxWidgets3/include/wx/any.h
+++ b/Externals/wxWidgets3/include/wx/any.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     07/05/2009
-// RCS-ID:      $Id: any.h 66621 2011-01-07 17:22:59Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -912,6 +911,8 @@ public:
     WXANY_IMPLEMENT_INT_EQ_OP(wxLongLong_t, wxULongLong_t)
 #endif
 
+    wxGCC_WARNING_SUPPRESS(float-equal)
+
     bool operator==(float value) const
     {
         if ( !wxAnyValueTypeImpl<float>::IsSameClass(m_type) )
@@ -932,6 +933,8 @@ public:
                 (wxAnyValueTypeImpl<double>::GetValue(m_buffer));
     }
 
+    wxGCC_WARNING_RESTORE(float-equal)
+
     bool operator==(bool value) const
     {
         if ( !wxAnyValueTypeImpl<bool>::IsSameClass(m_type) )
diff --git a/Externals/wxWidgets3/include/wx/anybutton.h b/Externals/wxWidgets3/include/wx/anybutton.h
index 4275c6bfd8..ebeac3b551 100644
--- a/Externals/wxWidgets3/include/wx/anybutton.h
+++ b/Externals/wxWidgets3/include/wx/anybutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButtonBase class
 // Author:      Vadim Zetlin
 // Created:     2000-08-15 (extracted from button.h)
-// RCS-ID:      $Id: anybutton.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zetlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/anystr.h b/Externals/wxWidgets3/include/wx/anystr.h
index b330f8022f..8eebaf9b03 100644
--- a/Externals/wxWidgets3/include/wx/anystr.h
+++ b/Externals/wxWidgets3/include/wx/anystr.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyStrPtr class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-03-23
-// RCS-ID:      $Id: anystr.h 59829 2009-03-25 09:54:10Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/app.h b/Externals/wxWidgets3/include/wx/app.h
index 64f1220629..a886dce955 100644
--- a/Externals/wxWidgets3/include/wx/app.h
+++ b/Externals/wxWidgets3/include/wx/app.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: app.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -103,6 +102,9 @@ public:
     // be done here. When OnRun() returns, the programs starts shutting down.
     virtual int OnRun();
 
+    // Called before the first events are handled, called from within MainLoop()
+    virtual void OnLaunched();
+    
     // This is called by wxEventLoopBase::SetActive(): you should put the code
     // which needs an active event loop here.
     // Note that this function is called whenever an event loop is activated;
@@ -228,6 +230,14 @@ public:
     // for it
     static wxAppTraits *GetTraitsIfExists();
 
+    // Return some valid traits object.
+    //
+    // This method checks if we have wxTheApp and returns its traits if it does
+    // exist and the traits are non-NULL, similarly to GetTraitsIfExists(), but
+    // falls back to wxConsoleAppTraits to ensure that it always returns
+    // something valid.
+    static wxAppTraits& GetValidTraits();
+
     // returns the main event loop instance, i.e. the event loop which is started
     // by OnRun() and which dispatches all events sent from the native toolkit
     // to the application (except when new event loops are temporarily set-up).
@@ -236,6 +246,18 @@ public:
     wxEventLoopBase* GetMainLoop() const
         { return m_mainLoop; }
 
+    // This function sets the C locale to the default locale for the current
+    // environment. It is advised to call this to ensure that the underlying
+    // toolkit uses the locale in which the numbers and monetary amounts are
+    // shown in the format expected by user and so on.
+    //
+    // Notice that this does _not_ change the global C++ locale, you need to do
+    // it explicitly if you want.
+    //
+    // Finally, notice that while this function is virtual, it is not supposed
+    // to be overridden outside of the library itself.
+    virtual void SetCLocale();
+
 
     // event processing functions
     // --------------------------
@@ -494,7 +516,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
 };
 
-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)
     #include "wx/unix/app.h"
 #else
     // this has to be a class and not a typedef as we forward declare it
@@ -519,7 +541,7 @@ public:
         // very first initialization function
         //
         // Override: very rarely
-    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual bool Initialize(int& _argc, wxChar **_argv);
 
         // a platform-dependent version of OnInit(): the code here is likely to
         // depend on the toolkit. default version does nothing.
@@ -636,10 +658,9 @@ public:
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
 #if WXWIN_COMPATIBILITY_2_6
-    // OBSOLETE: don't use, always returns true
-    //
     // returns true if the program is successfully initialized
-    wxDEPRECATED( bool Initialized() );
+    wxDEPRECATED_MSG("always returns true now, don't call")
+    bool Initialized();
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
@@ -766,13 +787,26 @@ public:
 // your compiler really, really wants main() to be in your main program (e.g.
 // hello.cpp). Now wxIMPLEMENT_APP should add this code if required.
 
-#define wxIMPLEMENT_WXWIN_MAIN_CONSOLE                                        \
-    int main(int argc, char **argv)                                           \
-    {                                                                         \
-        wxDISABLE_DEBUG_SUPPORT();                                            \
+// For compilers that support it, prefer to use wmain() as this ensures any
+// Unicode strings can be passed as command line parameters and not just those
+// representable in the current locale.
+#if wxUSE_UNICODE && defined(__VISUALC__)
+    #define wxIMPLEMENT_WXWIN_MAIN_CONSOLE                                    \
+        int wmain(int argc, wchar_t **argv)                                   \
+        {                                                                     \
+            wxDISABLE_DEBUG_SUPPORT();                                        \
                                                                               \
-        return wxEntry(argc, argv);                                           \
-    }
+            return wxEntry(argc, argv);                                       \
+        }
+#else // Use standard main()
+    #define wxIMPLEMENT_WXWIN_MAIN_CONSOLE                                    \
+        int main(int argc, char **argv)                                       \
+        {                                                                     \
+            wxDISABLE_DEBUG_SUPPORT();                                        \
+                                                                              \
+            return wxEntry(argc, argv);                                       \
+        }
+#endif
 
 // port-specific header could have defined it already in some special way
 #ifndef wxIMPLEMENT_WXWIN_MAIN
@@ -795,6 +829,7 @@ public:
 // Use this macro if you want to define your own main() or WinMain() function
 // and call wxEntry() from there.
 #define wxIMPLEMENT_APP_NO_MAIN(appname)                                    \
+    appname& wxGetApp() { return *static_cast<appname*>(wxApp::GetInstance()); }    \
     wxAppConsole *wxCreateApp()                                             \
     {                                                                       \
         wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,         \
@@ -802,9 +837,7 @@ public:
         return new appname;                                                 \
     }                                                                       \
     wxAppInitializer                                                        \
-        wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
-    appname& wxGetApp() { return *static_cast<appname*>(wxApp::GetInstance()); }    \
-    wxDECLARE_APP(appname)
+        wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp)
 
 // Same as wxIMPLEMENT_APP() normally but doesn't include themes support in
 // wxUniversal builds
diff --git a/Externals/wxWidgets3/include/wx/apptrait.h b/Externals/wxWidgets3/include/wx/apptrait.h
index 4dbf8d218c..da1b39b1d3 100644
--- a/Externals/wxWidgets3/include/wx/apptrait.h
+++ b/Externals/wxWidgets3/include/wx/apptrait.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003
-// RCS-ID:      $Id: apptrait.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -77,12 +76,6 @@ public:
     // except in the case of wxMac and wxCocoa
     virtual wxStandardPaths& GetStandardPaths();
 
-#if wxUSE_INTL
-    // called during wxApp initialization to set the locale to correspond to
-    // the user default (i.e. system locale under Windows, LC_ALL under Unix)
-    virtual void SetLocale();
-#endif // wxUSE_INTL
-
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/include/wx/archive.h b/Externals/wxWidgets3/include/wx/archive.h
index f57e1189d6..9f284668dd 100644
--- a/Externals/wxWidgets3/include/wx/archive.h
+++ b/Externals/wxWidgets3/include/wx/archive.h
@@ -2,7 +2,6 @@
 // Name:        wx/archive.h
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: archive.h 66780 2011-01-27 11:00:26Z SC $
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/arrimpl.cpp b/Externals/wxWidgets3/include/wx/arrimpl.cpp
index 945da1b586..0ef9e74890 100644
--- a/Externals/wxWidgets3/include/wx/arrimpl.cpp
+++ b/Externals/wxWidgets3/include/wx/arrimpl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.10.97
-// RCS-ID:      $Id: arrimpl.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -91,13 +90,13 @@ void name::Insert(const T& item, size_t uiIndex, size_t nInsert)              \
     base_array::operator[](uiIndex + i) = new T(item);                        \
 }                                                                             \
                                                                               \
-int name::Index(const T& Item, bool bFromEnd) const                           \
+int name::Index(const T& item, bool bFromEnd) const                           \
 {                                                                             \
   if ( bFromEnd ) {                                                           \
     if ( size() > 0 ) {                                                       \
       size_t ui = size() - 1;                                                 \
       do {                                                                    \
-        if ( (T*)base_array::operator[](ui) == &Item )                        \
+        if ( (T*)base_array::operator[](ui) == &item )                        \
           return static_cast<int>(ui);                                     \
         ui--;                                                                 \
       }                                                                       \
@@ -106,7 +105,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
   }                                                                           \
   else {                                                                      \
     for( size_t ui = 0; ui < size(); ui++ ) {                                 \
-      if( (T*)base_array::operator[](ui) == &Item )                           \
+      if( (T*)base_array::operator[](ui) == &item )                           \
         return static_cast<int>(ui);                                       \
     }                                                                         \
   }                                                                           \
diff --git a/Externals/wxWidgets3/include/wx/arrstr.h b/Externals/wxWidgets3/include/wx/arrstr.h
index 76343c71e5..db67c8ef08 100644
--- a/Externals/wxWidgets3/include/wx/arrstr.h
+++ b/Externals/wxWidgets3/include/wx/arrstr.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id: arrstr.h 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -425,7 +424,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // by default, these functions use the escape character to escape the
-// separators occuring inside the string to be joined, this can be disabled by
+// separators occurring inside the string to be joined, this can be disabled by
 // passing '\0' as escape
 
 WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,
diff --git a/Externals/wxWidgets3/include/wx/artprov.h b/Externals/wxWidgets3/include/wx/artprov.h
index af3402965e..3e95ed98fe 100644
--- a/Externals/wxWidgets3/include/wx/artprov.h
+++ b/Externals/wxWidgets3/include/wx/artprov.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     18/03/2002
-// RCS-ID:      $Id: artprov.h 66966 2011-02-19 12:32:59Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/atomic.h b/Externals/wxWidgets3/include/wx/atomic.h
index 0c53ebef93..1439d29484 100644
--- a/Externals/wxWidgets3/include/wx/atomic.h
+++ b/Externals/wxWidgets3/include/wx/atomic.h
@@ -3,7 +3,6 @@
 // Purpose:     functions to manipulate atomically integers and pointers
 // Author:      Armel Asselin
 // Created:     12/13/2006
-// RCS-ID:      $Id: atomic.h 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) Armel Asselin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/aui/aui.h b/Externals/wxWidgets3/include/wx/aui/aui.h
index 80129a35a1..df3a9166a1 100644
--- a/Externals/wxWidgets3/include/wx/aui/aui.h
+++ b/Externals/wxWidgets3/include/wx/aui/aui.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: aui.h 55231 2008-08-24 09:28:07Z BIW $
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/aui/auibar.h b/Externals/wxWidgets3/include/wx/aui/auibar.h
index 3440840a3b..52e2525215 100644
--- a/Externals/wxWidgets3/include/wx/aui/auibar.h
+++ b/Externals/wxWidgets3/include/wx/aui/auibar.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2008-08-04
-// RCS-ID:      $Id: auibar.h 69594 2011-10-30 16:51:10Z VZ $
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,7 @@ enum wxAuiToolBarStyle
     // analogous to wxAUI_TB_VERTICAL, but forces the toolbar
     // to be horizontal
     wxAUI_TB_HORIZONTAL    = 1 << 7,
+    wxAUI_TB_PLAIN_BACKGROUND = 1 << 8,
     wxAUI_TB_HORZ_TEXT     = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT),
     wxAUI_ORIENTATION_MASK = (wxAUI_TB_VERTICAL | wxAUI_TB_HORIZONTAL),
     wxAUI_TB_DEFAULT_STYLE = 0
@@ -211,7 +211,14 @@ public:
     void SetActive(bool b) { m_active = b; }
     bool IsActive() const { return m_active; }
 
-    void SetHasDropDown(bool b) { m_dropDown = b; }
+    void SetHasDropDown(bool b)
+    {
+        wxCHECK_RET( !b || m_kind == wxITEM_NORMAL,
+                     wxS("Only normal tools can have drop downs") );
+
+        m_dropDown = b;
+    }
+
     bool HasDropDown() const { return m_dropDown; }
 
     void SetSticky(bool b) { m_sticky = b; }
@@ -275,6 +282,11 @@ public:
                          wxWindow* wnd,
                          const wxRect& rect) = 0;
 
+    virtual void DrawPlainBackground(
+                                  wxDC& dc,
+                                  wxWindow* wnd,
+                                  const wxRect& rect) = 0;
+
     virtual void DrawLabel(
                          wxDC& dc,
                          wxWindow* wnd,
@@ -356,6 +368,10 @@ public:
                 wxWindow* wnd,
                 const wxRect& rect);
 
+    virtual void DrawPlainBackground(wxDC& dc,
+                                  wxWindow* wnd,
+                                  const wxRect& rect);
+
     virtual void DrawLabel(
                 wxDC& dc,
                 wxWindow* wnd,
@@ -439,16 +455,27 @@ protected:
 class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
 {
 public:
+    wxAuiToolBar() { Init(); }
 
     wxAuiToolBar(wxWindow* parent,
-                 wxWindowID id = -1,
-                 const wxPoint& position = wxDefaultPosition,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 long style = wxAUI_TB_DEFAULT_STYLE);
+                 long style = wxAUI_TB_DEFAULT_STYLE)
+    {
+        Init();
+        Create(parent, id, pos, size, style);
+    }
+
     virtual ~wxAuiToolBar();
 
-    void SetWindowStyleFlag(long style);
-    long GetWindowStyleFlag() const;
+    bool Create(wxWindow* parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxAUI_TB_DEFAULT_STYLE);
+
+    virtual void SetWindowStyleFlag(long style);
 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;
@@ -581,6 +608,7 @@ public:
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
 
 protected:
+    void Init();
 
     virtual void OnCustomRender(wxDC& WXUNUSED(dc),
                                 const wxAuiToolBarItem& WXUNUSED(item),
@@ -651,7 +679,6 @@ protected:
     bool m_dragging;
     bool m_gripperVisible;
     bool m_overflowVisible;
-    long m_style;
 
     bool RealizeHelper(wxClientDC& dc, bool horizontal);
     static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);
@@ -676,11 +703,11 @@ private:
 
 #ifndef SWIG
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
 
 typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 
@@ -688,34 +715,41 @@ typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
     wxEVENT_HANDLER_CAST(wxAuiToolBarEventFunction, func)
 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))
 #define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn))
 #define EVT_AUITOOLBAR_RIGHT_CLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn))
 #define EVT_AUITOOLBAR_MIDDLE_CLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn))
 #define EVT_AUITOOLBAR_BEGIN_DRAG(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn))
 
 #else
 
 // wxpython/swig event work
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG;
+%constant wxEventType wxEVT_AUITOOLBAR_TOOL_DROPDOWN;
+%constant wxEventType wxEVT_AUITOOLBAR_OVERFLOW_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_RIGHT_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_MIDDLE_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_BEGIN_DRAG;
 
 %pythoncode {
-    EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, 1 )
-    EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, 1 )
-    EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, 1 )
-    EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, 1 )
-    EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, 1 )
+    EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, 1 )
+    EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, 1 )
+    EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_RIGHT_CLICK, 1 )
+    EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_MIDDLE_CLICK, 1 )
+    EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUITOOLBAR_BEGIN_DRAG, 1 )
 }
 #endif  // SWIG
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN    wxEVT_AUITOOLBAR_TOOL_DROPDOWN
+#define wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK   wxEVT_AUITOOLBAR_OVERFLOW_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK      wxEVT_AUITOOLBAR_RIGHT_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK     wxEVT_AUITOOLBAR_MIDDLE_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG       wxEVT_AUITOOLBAR_BEGIN_DRAG
+
 #endif  // wxUSE_AUI
 #endif  // _WX_AUIBAR_H_
 
diff --git a/Externals/wxWidgets3/include/wx/aui/auibook.h b/Externals/wxWidgets3/include/wx/aui/auibook.h
index e8e4527ff6..17b3fdae9f 100644
--- a/Externals/wxWidgets3/include/wx/aui/auibook.h
+++ b/Externals/wxWidgets3/include/wx/aui/auibook.h
@@ -2,7 +2,7 @@
 // Name:        wx/aui/auibook.h
 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
-// Modified by:
+// Modified by: Jens Lody
 // Created:     2006-06-28
 // Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
@@ -21,10 +21,10 @@
 
 #if wxUSE_AUI
 
+#include "wx/aui/tabart.h"
 #include "wx/aui/framemanager.h"
-#include "wx/aui/dockart.h"
-#include "wx/aui/floatpane.h"
 #include "wx/bookctrl.h"
+#include "wx/containr.h"
 
 
 class wxAuiNotebook;
@@ -95,6 +95,7 @@ class WXDLLIMPEXP_AUI wxAuiNotebookPage
 public:
     wxWindow* window;     // page's associated window
     wxString caption;     // caption displayed on the tab
+    wxString tooltip;     // tooltip displayed when hovering over tab title
     wxBitmap bitmap;      // tab's bitmap
     wxRect rect;          // tab's hit rectangle
     bool active;          // true if the page is currently active
@@ -119,254 +120,6 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButt
 #endif
 
 
-// tab art class
-
-class WXDLLIMPEXP_AUI wxAuiTabArt
-{
-public:
-
-    wxAuiTabArt() { }
-    virtual ~wxAuiTabArt() { }
-
-    virtual wxAuiTabArt* Clone() = 0;
-    virtual void SetFlags(unsigned int flags) = 0;
-
-    virtual void SetSizingInfo(const wxSize& tabCtrlSize,
-                               size_t tabCount) = 0;
-
-    virtual void SetNormalFont(const wxFont& font) = 0;
-    virtual void SetSelectedFont(const wxFont& font) = 0;
-    virtual void SetMeasuringFont(const wxFont& font) = 0;
-    virtual void SetColour(const wxColour& colour) = 0;
-    virtual void SetActiveColour(const wxColour& colour) = 0;
-
-    virtual void DrawBackground(
-                         wxDC& dc,
-                         wxWindow* wnd,
-                         const wxRect& rect) = 0;
-
-    virtual void DrawTab(wxDC& dc,
-                         wxWindow* wnd,
-                         const wxAuiNotebookPage& pane,
-                         const wxRect& inRect,
-                         int closeButtonState,
-                         wxRect* outTabRect,
-                         wxRect* outButtonRect,
-                         int* xExtent) = 0;
-
-    virtual void DrawButton(
-                         wxDC& dc,
-                         wxWindow* wnd,
-                         const wxRect& inRect,
-                         int bitmapId,
-                         int buttonState,
-                         int orientation,
-                         wxRect* outRect) = 0;
-
-    virtual wxSize GetTabSize(
-                         wxDC& dc,
-                         wxWindow* wnd,
-                         const wxString& caption,
-                         const wxBitmap& bitmap,
-                         bool active,
-                         int closeButtonState,
-                         int* xExtent) = 0;
-
-    virtual int ShowDropDown(
-                         wxWindow* wnd,
-                         const wxAuiNotebookPageArray& items,
-                         int activeIdx) = 0;
-
-    virtual int GetIndentSize() = 0;
-
-    virtual int GetBestTabCtrlSize(
-                         wxWindow* wnd,
-                         const wxAuiNotebookPageArray& pages,
-                         const wxSize& requiredBmpSize) = 0;
-};
-
-
-class WXDLLIMPEXP_AUI wxAuiDefaultTabArt : public wxAuiTabArt
-{
-
-public:
-
-    wxAuiDefaultTabArt();
-    virtual ~wxAuiDefaultTabArt();
-
-    wxAuiTabArt* Clone();
-    void SetFlags(unsigned int flags);
-    void SetSizingInfo(const wxSize& tabCtrlSize,
-                       size_t tabCount);
-
-    void SetNormalFont(const wxFont& font);
-    void SetSelectedFont(const wxFont& font);
-    void SetMeasuringFont(const wxFont& font);
-    void SetColour(const wxColour& colour);
-    void SetActiveColour(const wxColour& colour);
-
-    void DrawBackground(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRect& rect);
-
-    void DrawTab(wxDC& dc,
-                 wxWindow* wnd,
-                 const wxAuiNotebookPage& pane,
-                 const wxRect& inRect,
-                 int closeButtonState,
-                 wxRect* outTabRect,
-                 wxRect* outButtonRect,
-                 int* xExtent);
-
-    void DrawButton(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRect& inRect,
-                 int bitmapId,
-                 int buttonState,
-                 int orientation,
-                 wxRect* outRect);
-
-    int GetIndentSize();
-
-    wxSize GetTabSize(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxString& caption,
-                 const wxBitmap& bitmap,
-                 bool active,
-                 int closeButtonState,
-                 int* xExtent);
-
-    int ShowDropDown(
-                 wxWindow* wnd,
-                 const wxAuiNotebookPageArray& items,
-                 int activeIdx);
-
-    int GetBestTabCtrlSize(wxWindow* wnd,
-                 const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize);
-
-protected:
-
-    wxFont m_normalFont;
-    wxFont m_selectedFont;
-    wxFont m_measuringFont;
-    wxColour m_baseColour;
-    wxPen m_baseColourPen;
-    wxPen m_borderPen;
-    wxBrush m_baseColourBrush;
-    wxColour m_activeColour;
-    wxBitmap m_activeCloseBmp;
-    wxBitmap m_disabledCloseBmp;
-    wxBitmap m_activeLeftBmp;
-    wxBitmap m_disabledLeftBmp;
-    wxBitmap m_activeRightBmp;
-    wxBitmap m_disabledRightBmp;
-    wxBitmap m_activeWindowListBmp;
-    wxBitmap m_disabledWindowListBmp;
-
-    int m_fixedTabWidth;
-    int m_tabCtrlHeight;
-    unsigned int m_flags;
-};
-
-
-class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
-{
-
-public:
-
-    wxAuiSimpleTabArt();
-    virtual ~wxAuiSimpleTabArt();
-
-    wxAuiTabArt* Clone();
-    void SetFlags(unsigned int flags);
-
-    void SetSizingInfo(const wxSize& tabCtrlSize,
-                       size_t tabCount);
-
-    void SetNormalFont(const wxFont& font);
-    void SetSelectedFont(const wxFont& font);
-    void SetMeasuringFont(const wxFont& font);
-    void SetColour(const wxColour& colour);
-    void SetActiveColour(const wxColour& colour);
-
-    void DrawBackground(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRect& rect);
-
-    void DrawTab(wxDC& dc,
-                 wxWindow* wnd,
-                 const wxAuiNotebookPage& pane,
-                 const wxRect& inRect,
-                 int closeButtonState,
-                 wxRect* outTabRect,
-                 wxRect* outButtonRect,
-                 int* xExtent);
-
-    void DrawButton(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRect& inRect,
-                 int bitmapId,
-                 int buttonState,
-                 int orientation,
-                 wxRect* outRect);
-
-    int GetIndentSize();
-
-    wxSize GetTabSize(
-                 wxDC& dc,
-                 wxWindow* wnd,
-                 const wxString& caption,
-                 const wxBitmap& bitmap,
-                 bool active,
-                 int closeButtonState,
-                 int* xExtent);
-
-    int ShowDropDown(
-                 wxWindow* wnd,
-                 const wxAuiNotebookPageArray& items,
-                 int activeIdx);
-
-    int GetBestTabCtrlSize(wxWindow* wnd,
-                 const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize);
-
-protected:
-
-    wxFont m_normalFont;
-    wxFont m_selectedFont;
-    wxFont m_measuringFont;
-    wxPen m_normalBkPen;
-    wxPen m_selectedBkPen;
-    wxBrush m_normalBkBrush;
-    wxBrush m_selectedBkBrush;
-    wxBrush m_bkBrush;
-    wxBitmap m_activeCloseBmp;
-    wxBitmap m_disabledCloseBmp;
-    wxBitmap m_activeLeftBmp;
-    wxBitmap m_disabledLeftBmp;
-    wxBitmap m_activeRightBmp;
-    wxBitmap m_disabledRightBmp;
-    wxBitmap m_activeWindowListBmp;
-    wxBitmap m_disabledWindowListBmp;
-
-    int m_fixedTabWidth;
-    unsigned int m_flags;
-};
-
-
-
-
-
-
-
-
-
 class WXDLLIMPEXP_AUI wxAuiTabContainer
 {
 public:
@@ -536,13 +289,16 @@ public:
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
 
-    size_t GetPageCount() const;
-    wxWindow* GetPage(size_t pageIdx) const;
+    virtual size_t GetPageCount() const;
+    virtual wxWindow* GetPage(size_t pageIdx) const;
     int GetPageIndex(wxWindow* pageWnd) const;
 
     bool SetPageText(size_t page, const wxString& text);
     wxString GetPageText(size_t pageIdx) const;
 
+    bool SetPageToolTip(size_t page, const wxString& text);
+    wxString GetPageToolTip(size_t pageIdx) const;
+
     bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
     wxBitmap GetPageBitmap(size_t pageIdx) const;
 
@@ -571,9 +327,6 @@ public:
     // Gets the height of the notebook for a given page height
     int GetHeightForPageHeight(int pageHeight);
 
-    // Advances the selection, generation page selection events
-    void AdvanceSelection(bool forward = true);
-
     // Shows the window menu
     bool ShowWindowMenu();
 
@@ -583,9 +336,6 @@ public:
     // we don't want focus for ourselves
     // virtual bool AcceptsFocus() const { return false; }
 
-    // Redo sizing after thawing
-    virtual void Thaw();
-
     //wxBookCtrlBase functions
 
     virtual void SetPageSize (const wxSize &size);
@@ -594,8 +344,6 @@ public:
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
 
-    wxWindow* GetCurrentPage () const;
-
     virtual int ChangeSelection(size_t n);
 
     virtual bool AddPage(wxWindow *page, const wxString &text, bool select, 
@@ -611,6 +359,9 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
+    // Redo sizing after thawing
+    virtual void DoThaw();
+
     // these can be overridden
 
     // update the height, return true if it was done or false if the new height
@@ -693,21 +444,21 @@ protected:
 
 #ifndef SWIG
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent);
 
 typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
 
@@ -715,73 +466,91 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
     wxEVENT_HANDLER_CAST(wxAuiNotebookEventFunction, func)
 
 #define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CLOSED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BUTTON(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_END_DRAG(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_DRAG_DONE(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_DONE, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_TAB_MIDDLE_DOWN(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_TAB_MIDDLE_UP(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_TAB_RIGHT_DOWN(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_TAB_RIGHT_UP(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BG_DCLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, winid, wxAuiNotebookEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BG_DCLICK, winid, wxAuiNotebookEventHandler(fn))
 #else
 
 // wxpython/swig event work
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BUTTON;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_END_DRAG;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP;
-%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK;
+%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSE;
+%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSED;
+%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGED;
+%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGING;
+%constant wxEventType wxEVT_AUINOTEBOOK_BUTTON;
+%constant wxEventType wxEVT_AUINOTEBOOK_BEGIN_DRAG;
+%constant wxEventType wxEVT_AUINOTEBOOK_END_DRAG;
+%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_MOTION;
+%constant wxEventType wxEVT_AUINOTEBOOK_ALLOW_DND;
+%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_DONE;
+%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN;
+%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP;
+%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN;
+%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_UP;
+%constant wxEventType wxEVT_AUINOTEBOOK_BG_DCLICK;
 
 %pythoncode {
-    EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 )
-    EVT_AUINOTEBOOK_PAGE_CLOSED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 1 )
-    EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 )
-    EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 )
-    EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 )
-    EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 )
-    EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 )
-    EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 )
-    EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 )
-    EVT_AUINOTEBOOK_DRAG_DONE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 1 )
-    EVT__AUINOTEBOOK_TAB_MIDDLE_DOWN = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 1 )
-    EVT__AUINOTEBOOK_TAB_MIDDLE_UP = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 1 )
-    EVT__AUINOTEBOOK_TAB_RIGHT_DOWN = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 1 )
-    EVT__AUINOTEBOOK_TAB_RIGHT_UP = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 1 )
-    EVT_AUINOTEBOOK_BG_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 1 )
+    EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSE, 1 )
+    EVT_AUINOTEBOOK_PAGE_CLOSED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSED, 1 )
+    EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGED, 1 )
+    EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGING, 1 )
+    EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BUTTON, 1 )
+    EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BEGIN_DRAG, 1 )
+    EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_END_DRAG, 1 )
+    EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_MOTION, 1 )
+    EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_AUINOTEBOOK_ALLOW_DND, 1 )
+    EVT_AUINOTEBOOK_DRAG_DONE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_DONE, 1 )
+    EVT__AUINOTEBOOK_TAB_MIDDLE_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, 1 )
+    EVT__AUINOTEBOOK_TAB_MIDDLE_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, 1 )
+    EVT__AUINOTEBOOK_TAB_RIGHT_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, 1 )
+    EVT__AUINOTEBOOK_TAB_RIGHT_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, 1 )
+    EVT_AUINOTEBOOK_BG_DCLICK = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BG_DCLICK, 1 )
 }
 #endif
 
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE        wxEVT_AUINOTEBOOK_PAGE_CLOSE
+#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED       wxEVT_AUINOTEBOOK_PAGE_CLOSED
+#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED      wxEVT_AUINOTEBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING     wxEVT_AUINOTEBOOK_PAGE_CHANGING
+#define wxEVT_COMMAND_AUINOTEBOOK_BUTTON            wxEVT_AUINOTEBOOK_BUTTON
+#define wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG        wxEVT_AUINOTEBOOK_BEGIN_DRAG
+#define wxEVT_COMMAND_AUINOTEBOOK_END_DRAG          wxEVT_AUINOTEBOOK_END_DRAG
+#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION       wxEVT_AUINOTEBOOK_DRAG_MOTION
+#define wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND         wxEVT_AUINOTEBOOK_ALLOW_DND
+#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE         wxEVT_AUINOTEBOOK_DRAG_DONE
+#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN   wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN
+#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP     wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP
+#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN    wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN
+#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP      wxEVT_AUINOTEBOOK_TAB_RIGHT_UP
+#define wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK         wxEVT_AUINOTEBOOK_BG_DCLICK
+#define wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG       wxEVT_AUINOTEBOOK_CANCEL_DRAG
+
 #endif  // wxUSE_AUI
 #endif  // _WX_AUINOTEBOOK_H_
diff --git a/Externals/wxWidgets3/include/wx/aui/dockart.h b/Externals/wxWidgets3/include/wx/aui/dockart.h
index fbc2ba7593..744cad56c4 100644
--- a/Externals/wxWidgets3/include/wx/aui/dockart.h
+++ b/Externals/wxWidgets3/include/wx/aui/dockart.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: dockart.h 69590 2011-10-30 14:20:03Z VZ $
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/aui/floatpane.h b/Externals/wxWidgets3/include/wx/aui/floatpane.h
index d88614555d..bf158933b8 100644
--- a/Externals/wxWidgets3/include/wx/aui/floatpane.h
+++ b/Externals/wxWidgets3/include/wx/aui/floatpane.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: floatpane.h 69590 2011-10-30 14:20:03Z VZ $
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/aui/framemanager.h b/Externals/wxWidgets3/include/wx/aui/framemanager.h
index c11491617f..4f6b4641b1 100644
--- a/Externals/wxWidgets3/include/wx/aui/framemanager.h
+++ b/Externals/wxWidgets3/include/wx/aui/framemanager.h
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: framemanager.h 70807 2012-03-04 20:31:34Z VZ $
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/aui/tabart.h b/Externals/wxWidgets3/include/wx/aui/tabart.h
new file mode 100644
index 0000000000..3de076c9e3
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/aui/tabart.h
@@ -0,0 +1,324 @@
+//////////////////////////////////////////////////////////////////////////////
+// Name:        wx/aui/tabart.h
+// Purpose:     wxaui: wx advanced user interface - notebook
+// Author:      Benjamin I. Williams
+// Modified by: Jens Lody (extracted from wx/aui/auibook.h)
+// Created:     2012-03-21
+// Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
+// Licence:     wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef _WX_AUI_TABART_H_
+#define _WX_AUI_TABART_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_AUI
+
+#include "wx/colour.h"
+#include "wx/gdicmn.h"
+#include "wx/font.h"
+#include "wx/pen.h"
+#include "wx/brush.h"
+#include "wx/bitmap.h"
+
+
+class wxAuiNotebookPage;
+class wxAuiNotebookPageArray;
+class wxWindow;
+class wxDC;
+
+
+// tab art class
+
+class WXDLLIMPEXP_AUI wxAuiTabArt
+{
+public:
+
+    wxAuiTabArt() { }
+    virtual ~wxAuiTabArt() { }
+
+    virtual wxAuiTabArt* Clone() = 0;
+    virtual void SetFlags(unsigned int flags) = 0;
+
+    virtual void SetSizingInfo(const wxSize& tabCtrlSize,
+                               size_t tabCount) = 0;
+
+    virtual void SetNormalFont(const wxFont& font) = 0;
+    virtual void SetSelectedFont(const wxFont& font) = 0;
+    virtual void SetMeasuringFont(const wxFont& font) = 0;
+    virtual void SetColour(const wxColour& colour) = 0;
+    virtual void SetActiveColour(const wxColour& colour) = 0;
+
+    virtual void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect) = 0;
+
+    virtual void DrawBackground(
+                         wxDC& dc,
+                         wxWindow* wnd,
+                         const wxRect& rect) = 0;
+
+    virtual void DrawTab(wxDC& dc,
+                         wxWindow* wnd,
+                         const wxAuiNotebookPage& pane,
+                         const wxRect& inRect,
+                         int closeButtonState,
+                         wxRect* outTabRect,
+                         wxRect* outButtonRect,
+                         int* xExtent) = 0;
+
+    virtual void DrawButton(
+                         wxDC& dc,
+                         wxWindow* wnd,
+                         const wxRect& inRect,
+                         int bitmapId,
+                         int buttonState,
+                         int orientation,
+                         wxRect* outRect) = 0;
+
+    virtual wxSize GetTabSize(
+                         wxDC& dc,
+                         wxWindow* wnd,
+                         const wxString& caption,
+                         const wxBitmap& bitmap,
+                         bool active,
+                         int closeButtonState,
+                         int* xExtent) = 0;
+
+    virtual int ShowDropDown(
+                         wxWindow* wnd,
+                         const wxAuiNotebookPageArray& items,
+                         int activeIdx) = 0;
+
+    virtual int GetIndentSize() = 0;
+
+    virtual int GetBorderWidth(
+                         wxWindow* wnd) = 0;
+
+    virtual int GetAdditionalBorderSpace(
+                         wxWindow* wnd) = 0;
+
+    virtual int GetBestTabCtrlSize(
+                         wxWindow* wnd,
+                         const wxAuiNotebookPageArray& pages,
+                         const wxSize& requiredBmpSize) = 0;
+};
+
+
+class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt
+{
+
+public:
+
+    wxAuiGenericTabArt();
+    virtual ~wxAuiGenericTabArt();
+
+    wxAuiTabArt* Clone();
+    void SetFlags(unsigned int flags);
+    void SetSizingInfo(const wxSize& tabCtrlSize,
+                       size_t tabCount);
+
+    void SetNormalFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font);
+    void SetColour(const wxColour& colour);
+    void SetActiveColour(const wxColour& colour);
+
+    void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+
+    void DrawBackground(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+
+    void DrawTab(wxDC& dc,
+                 wxWindow* wnd,
+                 const wxAuiNotebookPage& pane,
+                 const wxRect& inRect,
+                 int closeButtonState,
+                 wxRect* outTabRect,
+                 wxRect* outButtonRect,
+                 int* xExtent);
+
+    void DrawButton(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& inRect,
+                 int bitmapId,
+                 int buttonState,
+                 int orientation,
+                 wxRect* outRect);
+
+    int GetIndentSize();
+
+    int GetBorderWidth(
+                 wxWindow* wnd);
+
+    int GetAdditionalBorderSpace(
+                 wxWindow* wnd);
+
+    wxSize GetTabSize(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxString& caption,
+                 const wxBitmap& bitmap,
+                 bool active,
+                 int closeButtonState,
+                 int* xExtent);
+
+    int ShowDropDown(
+                 wxWindow* wnd,
+                 const wxAuiNotebookPageArray& items,
+                 int activeIdx);
+
+    int GetBestTabCtrlSize(wxWindow* wnd,
+                 const wxAuiNotebookPageArray& pages,
+                 const wxSize& requiredBmpSize);
+
+protected:
+
+    wxFont m_normalFont;
+    wxFont m_selectedFont;
+    wxFont m_measuringFont;
+    wxColour m_baseColour;
+    wxPen m_baseColourPen;
+    wxPen m_borderPen;
+    wxBrush m_baseColourBrush;
+    wxColour m_activeColour;
+    wxBitmap m_activeCloseBmp;
+    wxBitmap m_disabledCloseBmp;
+    wxBitmap m_activeLeftBmp;
+    wxBitmap m_disabledLeftBmp;
+    wxBitmap m_activeRightBmp;
+    wxBitmap m_disabledRightBmp;
+    wxBitmap m_activeWindowListBmp;
+    wxBitmap m_disabledWindowListBmp;
+
+    int m_fixedTabWidth;
+    int m_tabCtrlHeight;
+    unsigned int m_flags;
+};
+
+
+class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
+{
+
+public:
+
+    wxAuiSimpleTabArt();
+    virtual ~wxAuiSimpleTabArt();
+
+    wxAuiTabArt* Clone();
+    void SetFlags(unsigned int flags);
+
+    void SetSizingInfo(const wxSize& tabCtrlSize,
+                       size_t tabCount);
+
+    void SetNormalFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font);
+    void SetColour(const wxColour& colour);
+    void SetActiveColour(const wxColour& colour);
+
+    void DrawBorder(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+
+    void DrawBackground(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+
+    void DrawTab(wxDC& dc,
+                 wxWindow* wnd,
+                 const wxAuiNotebookPage& pane,
+                 const wxRect& inRect,
+                 int closeButtonState,
+                 wxRect* outTabRect,
+                 wxRect* outButtonRect,
+                 int* xExtent);
+
+    void DrawButton(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& inRect,
+                 int bitmapId,
+                 int buttonState,
+                 int orientation,
+                 wxRect* outRect);
+
+    int GetIndentSize();
+
+    int GetBorderWidth(
+                 wxWindow* wnd);
+
+    int GetAdditionalBorderSpace(
+                 wxWindow* wnd);
+
+    wxSize GetTabSize(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxString& caption,
+                 const wxBitmap& bitmap,
+                 bool active,
+                 int closeButtonState,
+                 int* xExtent);
+
+    int ShowDropDown(
+                 wxWindow* wnd,
+                 const wxAuiNotebookPageArray& items,
+                 int activeIdx);
+
+    int GetBestTabCtrlSize(wxWindow* wnd,
+                 const wxAuiNotebookPageArray& pages,
+                 const wxSize& requiredBmpSize);
+
+protected:
+
+    wxFont m_normalFont;
+    wxFont m_selectedFont;
+    wxFont m_measuringFont;
+    wxPen m_normalBkPen;
+    wxPen m_selectedBkPen;
+    wxBrush m_normalBkBrush;
+    wxBrush m_selectedBkBrush;
+    wxBrush m_bkBrush;
+    wxBitmap m_activeCloseBmp;
+    wxBitmap m_disabledCloseBmp;
+    wxBitmap m_activeLeftBmp;
+    wxBitmap m_disabledLeftBmp;
+    wxBitmap m_activeRightBmp;
+    wxBitmap m_disabledRightBmp;
+    wxBitmap m_activeWindowListBmp;
+    wxBitmap m_disabledWindowListBmp;
+
+    int m_fixedTabWidth;
+    unsigned int m_flags;
+};
+
+#ifndef __WXUNIVERSAL__
+    #if defined(__WXGTK20__) && !defined(__WXGTK3__)
+        #define wxHAS_NATIVE_TABART
+        #include "wx/aui/tabartgtk.h"
+        #define wxAuiDefaultTabArt wxAuiGtkTabArt
+    #endif
+#endif // !__WXUNIVERSAL__
+
+#ifndef wxHAS_NATIVE_TABART
+    #define wxAuiDefaultTabArt wxAuiGenericTabArt
+#endif
+
+#endif  // wxUSE_AUI
+
+#endif  // _WX_AUI_TABART_H_
diff --git a/Externals/wxWidgets3/include/wx/aui/tabartgtk.h b/Externals/wxWidgets3/include/wx/aui/tabartgtk.h
new file mode 100644
index 0000000000..85fe9e2a50
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/aui/tabartgtk.h
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/aui/tabartgtk.h
+// Purpose:     declaration of the wxAuiGTKTabArt
+// Author:      Jens Lody and Teodor Petrov
+// Modified by:
+// Created:     2012-03-23
+// Copyright:   (c) 2012 Jens Lody <jens@codeblocks.org>
+//                  and Teodor Petrov
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_AUI_TABARTGTK_H_
+#define _WX_AUI_TABARTGTK_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_AUI
+
+#include "wx/aui/tabart.h"
+#include "wx/gdicmn.h"
+
+class wxWindow;
+class wxDC;
+
+class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
+{
+public:
+    wxAuiGtkTabArt();
+
+    virtual wxAuiTabArt* Clone();
+    virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+    virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+    virtual void DrawTab(wxDC& dc,
+                         wxWindow* wnd,
+                         const wxAuiNotebookPage& page,
+                         const wxRect& in_rect,
+                         int close_button_state,
+                         wxRect* out_tab_rect,
+                         wxRect* out_button_rect,
+                         int* x_extent);
+    void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id,
+                    int button_state, int orientation, wxRect* out_rect);
+    int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages,
+                            const wxSize& required_bmp_size);
+    int GetBorderWidth(wxWindow* wnd);
+    int GetAdditionalBorderSpace(wxWindow* wnd);
+    virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
+                              const wxBitmap& bitmap, bool active,
+                              int close_button_state, int* x_extent);
+};
+
+#endif  // wxUSE_AUI
+
+#endif // _WX_AUI_TABARTGTK_H_
diff --git a/Externals/wxWidgets3/include/wx/aui/tabmdi.h b/Externals/wxWidgets3/include/wx/aui/tabmdi.h
index 6a680845b3..8750831747 100644
--- a/Externals/wxWidgets3/include/wx/aui/tabmdi.h
+++ b/Externals/wxWidgets3/include/wx/aui/tabmdi.h
@@ -4,7 +4,6 @@
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Created:     29/07/2002
-// RCS-ID:      $Id: tabmdi.h 70909 2012-03-15 13:49:54Z VZ $
 // Copyright:   (c) Hans Van Leemputten
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -85,7 +84,6 @@ public:
 
 protected:
     wxAuiMDIClientWindow*   m_pClientWindow;
-    wxAuiMDIChildFrame*     m_pActiveChild;
     wxEvent*                m_pLastEvt;
 
 #if wxUSE_MENUS
@@ -250,6 +248,11 @@ public:
                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);
+    virtual wxAuiMDIChildFrame* GetActiveChild();
+    virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
+    {
+        SetSelection(GetPageIndex(pChildFrame));
+    }
 
 protected:
 
diff --git a/Externals/wxWidgets3/include/wx/bannerwindow.h b/Externals/wxWidgets3/include/wx/bannerwindow.h
index 1ce3bc3170..1f1fb24611 100644
--- a/Externals/wxWidgets3/include/wx/bannerwindow.h
+++ b/Externals/wxWidgets3/include/wx/bannerwindow.h
@@ -3,7 +3,6 @@
 // Purpose:     wxBannerWindow class declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-08-16
-// RCS-ID:      $Id: bannerwindow.h 69859 2011-11-28 18:58:52Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/base64.h b/Externals/wxWidgets3/include/wx/base64.h
index 4ccaf97d59..96c6dd80ef 100644
--- a/Externals/wxWidgets3/include/wx/base64.h
+++ b/Externals/wxWidgets3/include/wx/base64.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of BASE64 encoding/decoding functionality
 // Author:      Charles Reimers, Vadim Zeitlin
 // Created:     2007-06-18
-// RCS-ID:      $Id: base64.h 62614 2009-11-11 14:38:40Z VZ $
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/beforestd.h b/Externals/wxWidgets3/include/wx/beforestd.h
index 2a1a98cc76..cc335d317b 100644
--- a/Externals/wxWidgets3/include/wx/beforestd.h
+++ b/Externals/wxWidgets3/include/wx/beforestd.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id: beforestd.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/bitmap.h b/Externals/wxWidgets3/include/wx/bitmap.h
index ab9046803c..bcb189c5d3 100644
--- a/Externals/wxWidgets3/include/wx/bitmap.h
+++ b/Externals/wxWidgets3/include/wx/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     22.04.01
-// RCS-ID:      $Id: bitmap.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxDC;
 
 // ----------------------------------------------------------------------------
 // wxVariant support
@@ -83,6 +83,23 @@ protected:
 #define wxBITMAP_SCREEN_DEPTH       (-1)
 
 
+// ----------------------------------------------------------------------------
+// wxBitmapHelpers: container for various bitmap methods common to all ports.
+// ----------------------------------------------------------------------------
+
+// Unfortunately, currently wxBitmap does not inherit from wxBitmapBase on all
+// platforms and this is not easy to fix. So we extract at least some common
+// methods into this class from which both wxBitmapBase (and hence wxBitmap on
+// all platforms where it does inherit from it) and wxBitmap in wxMSW and other
+// exceptional ports (only wxPM and old wxCocoa) inherit.
+class WXDLLIMPEXP_CORE wxBitmapHelpers
+{
+public:
+    // Create a new wxBitmap from the PNG data in the given buffer.
+    static wxBitmap NewFromPNGData(const void* data, size_t size);
+};
+
+
 // All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as
 // base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as
 // base class since it allows some code reuse there.
@@ -132,12 +149,12 @@ private:
     DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };
 
-
 // ----------------------------------------------------------------------------
 // wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject,
+                                      public wxBitmapHelpers
 {
 public:
     /*
@@ -157,6 +174,8 @@ public:
 
     virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
     virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
+    virtual bool CreateScaled(int w, int h, int d, double logicalScale)
+        { return Create(wxRound(w*logicalScale), wxRound(h*logicalScale), d); }
 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
@@ -165,6 +184,13 @@ public:
     wxSize GetSize() const
         { return wxSize(GetWidth(), GetHeight()); }
 
+    // support for scaled bitmaps
+    virtual double GetScaleFactor() const { return 1.0; }
+    virtual double GetScaledWidth() const { return GetWidth() / GetScaleFactor(); }
+    virtual double GetScaledHeight() const { return GetHeight() / GetScaleFactor(); }
+    virtual wxSize GetScaledSize() const
+        { return wxSize(wxRound(GetScaledWidth()), wxRound(GetScaledHeight())); }
+
 #if wxUSE_IMAGE
     virtual wxImage ConvertToImage() const = 0;
 
@@ -243,7 +269,11 @@ protected:
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
     #include "wx/x11/bitmap.h"
 #elif defined(__WXGTK20__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
+    #ifdef __WINDOWS__
+        #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
+    #else
+        #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
+    #endif
     #include "wx/gtk/bitmap.h"
 #elif defined(__WXGTK__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
@@ -275,7 +305,13 @@ wxBitmap::
 #endif
 ConvertToDisabled(unsigned char brightness) const
 {
-    return ConvertToImage().ConvertToDisabled(brightness);
+    // XXX comex: scale support
+    wxImage disabledImage = ConvertToImage().ConvertToDisabled(brightness);
+    #ifdef __APPLE__
+    return wxBitmap(disabledImage, -1, GetScaleFactor());
+    #else
+    return disabledImage;
+    #endif
 }
 #endif // wxUSE_IMAGE
 
diff --git a/Externals/wxWidgets3/include/wx/bmpbuttn.h b/Externals/wxWidgets3/include/wx/bmpbuttn.h
index c2632b88f6..ead0ba81ec 100644
--- a/Externals/wxWidgets3/include/wx/bmpbuttn.h
+++ b/Externals/wxWidgets3/include/wx/bmpbuttn.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id: bmpbuttn.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,8 @@
     #define wxHAS_BUTTON_BITMAP
 #endif
 
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
@@ -64,6 +65,12 @@ public:
                                 validator, name);
     }
 
+    // Special creation function for a standard "Close" bitmap. It allows to
+    // simply create a close button with the image appropriate for the common
+    // platform.
+    static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid);
+
+
     // set/get the margins around the button
     virtual void SetMargins(int x, int y)
     {
diff --git a/Externals/wxWidgets3/include/wx/bmpcbox.h b/Externals/wxWidgets3/include/wx/bmpcbox.h
index 671c10a05c..dd69525741 100644
--- a/Externals/wxWidgets3/include/wx/bmpcbox.h
+++ b/Externals/wxWidgets3/include/wx/bmpcbox.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     Aug-31-2006
 // Copyright:   (c) Jaakko Salli
-// RCS-ID:      $Id: bmpcbox.h 63204 2010-01-22 15:52:20Z JJ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/bookctrl.h b/Externals/wxWidgets3/include/wx/bookctrl.h
index b3a6809690..8b4fbb2fce 100644
--- a/Externals/wxWidgets3/include/wx/bookctrl.h
+++ b/Externals/wxWidgets3/include/wx/bookctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id: bookctrl.h 69082 2011-09-14 08:24:06Z SJL $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -95,7 +94,7 @@ public:
     virtual size_t GetPageCount() const { return m_pages.size(); }
 
     // get the panel which represents the given page
-    wxWindow *GetPage(size_t n) const { return m_pages[n]; }
+    virtual wxWindow *GetPage(size_t n) const { return m_pages[n]; }
 
     // get the current page or NULL if none
     wxWindow *GetCurrentPage() const
@@ -215,6 +214,9 @@ public:
         }
     }
 
+    // return the index of the given page or wxNOT_FOUND
+    int FindPage(const wxWindow* page) const;
+
     // hit test: returns which page is hit and, optionally, where (icon, label)
     virtual int HitTest(const wxPoint& WXUNUSED(pt),
                         long * WXUNUSED(flags) = NULL) const
@@ -253,6 +255,10 @@ protected:
     // false otherwise.
     bool DoSetSelectionAfterInsertion(size_t n, bool bSelect);
 
+    // Update the selection after removing the page at the given index,
+    // typically called from the derived class overridden DoRemovePage().
+    void DoSetSelectionAfterRemoval(size_t n);
+
     // set the selection to the given page, sending the events (which can
     // possibly prevent the page change from taking place) if SendEvent flag is
     // included
@@ -277,6 +283,11 @@ protected:
         { wxFAIL_MSG(wxT("Override this function!")); }
 
 
+    // The derived class also may override the following method, also called
+    // from DoSetSelection(), to show/hide pages differently.
+    virtual void DoShowPage(wxWindow* page, bool show) { page->Show(show); }
+
+
     // Should we accept NULL page pointers in Add/InsertPage()?
     //
     // Default is no but derived classes may override it if they can treat NULL
@@ -284,7 +295,11 @@ protected:
     // having nodes without any associated page)
     virtual bool AllowNullPage() const { return false; }
 
-    // remove the page and return a pointer to it
+    // Remove the page and return a pointer to it.
+    //
+    // It also needs to update the current selection if necessary, i.e. if the
+    // page being removed comes before the selected one and the helper method
+    // DoSetSelectionAfterRemoval() can be used for this.
     virtual wxWindow *DoRemovePage(size_t page) = 0;
 
     // our best size is the size which fits all our pages
@@ -399,20 +414,24 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
     // dedicated to majority of desktops
     #include "wx/notebook.h"
     #define wxBookCtrl                             wxNotebook
-    #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
-    #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+    #define wxEVT_BOOKCTRL_PAGE_CHANGED            wxEVT_NOTEBOOK_PAGE_CHANGED
+    #define wxEVT_BOOKCTRL_PAGE_CHANGING           wxEVT_NOTEBOOK_PAGE_CHANGING
     #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn)      EVT_NOTEBOOK_PAGE_CHANGED(id, fn)
     #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn)     EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
 #else
     // dedicated to Smartphones
     #include "wx/choicebk.h"
     #define wxBookCtrl                             wxChoicebook
-    #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
-    #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
+    #define wxEVT_BOOKCTRL_PAGE_CHANGED            wxEVT_CHOICEBOOK_PAGE_CHANGED
+    #define wxEVT_BOOKCTRL_PAGE_CHANGING           wxEVT_CHOICEBOOK_PAGE_CHANGING
     #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn)      EVT_CHOICEBOOK_PAGE_CHANGED(id, fn)
     #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn)     EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)
 #endif
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_BOOKCTRL_PAGE_CHANGED
+#define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_BOOKCTRL_PAGE_CHANGING
+
 #if WXWIN_COMPATIBILITY_2_6
     #define wxBC_TOP                               wxBK_TOP
     #define wxBC_BOTTOM                            wxBK_BOTTOM
diff --git a/Externals/wxWidgets3/include/wx/brush.h b/Externals/wxWidgets3/include/wx/brush.h
index 7dbb89425d..1bf2c3005c 100644
--- a/Externals/wxWidgets3/include/wx/brush.h
+++ b/Externals/wxWidgets3/include/wx/brush.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: brush.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,14 +26,14 @@ enum wxBrushStyle
     wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
     wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
     wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
-    wxBRUSHSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH,
-    wxBRUSHSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH,
-    wxBRUSHSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH,
-    wxBRUSHSTYLE_CROSS_HATCH = wxCROSS_HATCH,
-    wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH,
-    wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH,
-    wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH,
-    wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH
+    wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
+    wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
+    wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
+    wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
+    wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
+    wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
+    wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
+    wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
 };
 
 
diff --git a/Externals/wxWidgets3/include/wx/buffer.h b/Externals/wxWidgets3/include/wx/buffer.h
index 8b57207f1d..9891494d97 100644
--- a/Externals/wxWidgets3/include/wx/buffer.h
+++ b/Externals/wxWidgets3/include/wx/buffer.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.04.99
-// RCS-ID:      $Id: buffer.h 70417 2012-01-20 22:11:51Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -230,7 +229,8 @@ protected:
     static CharType *StrCopy(const CharType *src, size_t len)
     {
         CharType *dst = (CharType*)malloc(sizeof(CharType) * (len + 1));
-        memcpy(dst, src, sizeof(CharType) * (len + 1));
+        if ( dst )
+            memcpy(dst, src, sizeof(CharType) * (len + 1));
         return dst;
     }
 
@@ -268,9 +268,22 @@ public:
 
     wxCharTypeBuffer(size_t len)
     {
-        this->m_data =
-            new Data((CharType *)malloc((len + 1)*sizeof(CharType)), len);
-        this->m_data->Get()[len] = (CharType)0;
+        CharType* const str = (CharType *)malloc((len + 1)*sizeof(CharType));
+        if ( str )
+        {
+            str[len] = (CharType)0;
+
+            // There is a potential memory leak here if new throws because it
+            // fails to allocate Data, we ought to use new(nothrow) here, but
+            // this might fail to compile under some platforms so until this
+            // can be fully tested, just live with this (rather unlikely, as
+            // Data is a small object) potential leak.
+            this->m_data = new Data(str, len);
+        }
+        else
+        {
+            this->m_data = this->GetNullData();
+        }
     }
 
     wxCharTypeBuffer(const wxCharTypeBuffer& src)
@@ -438,7 +451,7 @@ public:
 
     friend class wxMemoryBuffer;
 
-    // everyting is private as it can only be used by wxMemoryBuffer
+    // everything is private as it can only be used by wxMemoryBuffer
 private:
     wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize)
         : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0)
diff --git a/Externals/wxWidgets3/include/wx/build.h b/Externals/wxWidgets3/include/wx/build.h
index ac0393fb99..0959a29782 100644
--- a/Externals/wxWidgets3/include/wx/build.h
+++ b/Externals/wxWidgets3/include/wx/build.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     07.05.02
-// RCS-ID:      $Id: build.h 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/busyinfo.h b/Externals/wxWidgets3/include/wx/busyinfo.h
index ae63552870..600c86c634 100644
--- a/Externals/wxWidgets3/include/wx/busyinfo.h
+++ b/Externals/wxWidgets3/include/wx/busyinfo.h
@@ -3,7 +3,6 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id: busyinfo.h 37158 2006-01-26 15:40:46Z ABX $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/button.h b/Externals/wxWidgets3/include/wx/button.h
index d164eee800..71dbee41de 100644
--- a/Externals/wxWidgets3/include/wx/button.h
+++ b/Externals/wxWidgets3/include/wx/button.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zetlin
 // Modified by:
 // Created:     15.08.00
-// RCS-ID:      $Id: button.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zetlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/calctrl.h b/Externals/wxWidgets3/include/wx/calctrl.h
index 7c2921d8e0..16a84748d2 100644
--- a/Externals/wxWidgets3/include/wx/calctrl.h
+++ b/Externals/wxWidgets3/include/wx/calctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.12.99
-// RCS-ID:      $Id: calctrl.h 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/caret.h b/Externals/wxWidgets3/include/wx/caret.h
index 6ba5814b9f..e6e9728ff8 100644
--- a/Externals/wxWidgets3/include/wx/caret.h
+++ b/Externals/wxWidgets3/include/wx/caret.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id: caret.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/chartype.h b/Externals/wxWidgets3/include/wx/chartype.h
index d122b4c71c..5217258d1b 100644
--- a/Externals/wxWidgets3/include/wx/chartype.h
+++ b/Externals/wxWidgets3/include/wx/chartype.h
@@ -4,7 +4,6 @@
  * Author:      Joel Farley, Ove Kåven
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
- * RCS-ID:      $Id: chartype.h 70345 2012-01-15 01:05:28Z VZ $
  * Copyright:   (c) 1998-2006 wxWidgets dev team
  * Licence:     wxWindows licence
  */
@@ -48,16 +47,11 @@
 
    Actually MinGW has tchar.h, but it does not include wchar.h
  */
-#if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
     #ifndef HAVE_WCHAR_H
         #define HAVE_WCHAR_H
     #endif
 #endif
-#if defined(__MWERKS__) && !defined(__MACH__)
-    #ifndef HAVE_WCSLEN
-        #define HAVE_WCSLEN
-    #endif
-#endif
 
 #ifdef HAVE_WCHAR_H
     /* the current (as of Nov 2002) version of cygwin has a bug in its */
diff --git a/Externals/wxWidgets3/include/wx/checkbox.h b/Externals/wxWidgets3/include/wx/checkbox.h
index 507bf31fea..e0978a0d13 100644
--- a/Externals/wxWidgets3/include/wx/checkbox.h
+++ b/Externals/wxWidgets3/include/wx/checkbox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.09.00
-// RCS-ID:      $Id: checkbox.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/checkeddelete.h b/Externals/wxWidgets3/include/wx/checkeddelete.h
index 3dad109fad..fd295faf8b 100644
--- a/Externals/wxWidgets3/include/wx/checkeddelete.h
+++ b/Externals/wxWidgets3/include/wx/checkeddelete.h
@@ -3,7 +3,6 @@
 // Purpose:     wxCHECKED_DELETE() macro
 // Author:      Vadim Zeitlin
 // Created:     2009-02-03
-// RCS-ID:      $Id: checkeddelete.h 58634 2009-02-03 12:01:46Z VZ $
 // Copyright:   (c) 2002-2009 wxWidgets dev team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,6 +10,8 @@
 #ifndef _WX_CHECKEDDELETE_H_
 #define _WX_CHECKEDDELETE_H_
 
+#include "wx/cpp.h"
+
 // TODO: provide wxCheckedDelete[Array]() template functions too
 
 // ----------------------------------------------------------------------------
@@ -26,28 +27,17 @@
    still force a semicolon after the macro
 */
 
-#ifdef __WATCOMC__
-    #define wxFOR_ONCE(name)              for(int name=0; name<1; name++)
-    #define wxPRE_NO_WARNING_SCOPE(name)  wxFOR_ONCE(wxMAKE_UNIQUE_NAME(name))
-    #define wxPOST_NO_WARNING_SCOPE(name)
-#else
-    #define wxPRE_NO_WARNING_SCOPE(name)  do
-    #define wxPOST_NO_WARNING_SCOPE(name) while ( wxFalse )
-#endif
-
 #define wxCHECKED_DELETE(ptr)                                                 \
-    wxPRE_NO_WARNING_SCOPE(scope_var1)                                        \
-    {                                                                         \
+    wxSTATEMENT_MACRO_BEGIN                                                   \
         typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete ptr;                                                           \
-    } wxPOST_NO_WARNING_SCOPE(scope_var1)
+    wxSTATEMENT_MACRO_END
 
 #define wxCHECKED_DELETE_ARRAY(ptr)                                           \
-    wxPRE_NO_WARNING_SCOPE(scope_var2)                                        \
-    {                                                                         \
+    wxSTATEMENT_MACRO_BEGIN                                                   \
         typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete [] ptr;                                                        \
-    } wxPOST_NO_WARNING_SCOPE(scope_var2)
+    wxSTATEMENT_MACRO_END
 
 
 #endif // _WX_CHECKEDDELETE_H_
diff --git a/Externals/wxWidgets3/include/wx/checklst.h b/Externals/wxWidgets3/include/wx/checklst.h
index 0092bc9e0e..3c54304d0e 100644
--- a/Externals/wxWidgets3/include/wx/checklst.h
+++ b/Externals/wxWidgets3/include/wx/checklst.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.00
-// RCS-ID:      $Id: checklst.h 65210 2010-08-08 11:35:55Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,8 @@ public:
     virtual bool IsChecked(unsigned int item) const = 0;
     virtual void Check(unsigned int item, bool check = true) = 0;
 
+    virtual unsigned int GetCheckedItems(wxArrayInt& checkedItems) const;
+
     wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase);
 };
 
diff --git a/Externals/wxWidgets3/include/wx/chkconf.h b/Externals/wxWidgets3/include/wx/chkconf.h
index 80f104911b..47fa8ee467 100644
--- a/Externals/wxWidgets3/include/wx/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     09.08.00
- * RCS-ID:      $Id: chkconf.h 70703 2012-02-26 20:24:25Z VZ $
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -92,6 +91,14 @@
 #   endif
 #endif /* wxUSE_ANY */
 
+#ifndef wxUSE_COMPILER_TLS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_COMPILER_TLS 0
+#   endif
+#endif /* !defined(wxUSE_COMPILER_TLS) */
+
 #ifndef wxUSE_CONSOLE_EVENTLOOP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."
@@ -928,6 +935,14 @@
 #   endif
 #endif /* !defined(wxUSE_POPUPWIN) */
 
+#ifndef wxUSE_PREFERENCES_EDITOR
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PREFERENCES_EDITOR must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_PREFERENCES_EDITOR 0
+#   endif
+#endif /* !defined(wxUSE_PREFERENCES_EDITOR) */
+
 #ifndef wxUSE_PRINTING_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PRINTING_ARCHITECTURE must be defined, please read comment near the top of this file."
@@ -1203,8 +1218,11 @@
 
 #if defined(__WXWINCE__)
 #  include "wx/msw/wince/chkconf.h"
-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)
 #  include "wx/msw/chkconf.h"
+#  if defined(__WXGTK__)
+#      include "wx/gtk/chkconf.h"
+#  endif
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXCOCOA__)
@@ -1225,9 +1243,9 @@
 
 /*
     __UNIX__ is also defined under Cygwin but we shouldn't perform these checks
-    there if we're building wxMSW.
+    there if we're building Windows ports.
  */
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
 #   include "wx/unix/chkconf.h"
 #endif
 
@@ -1451,7 +1469,7 @@
  */
 #if wxUSE_GUI
 
-#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) && !defined(__GCCXML__)
+#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW"
 #   else
@@ -2181,6 +2199,33 @@
 #   endif
 #endif /* wxUSE_WEBVIEW && !any web view backend */
 
+#if wxUSE_PREFERENCES_EDITOR
+    /*
+        We can use either a generic implementation, using wxNotebook, or a
+        native one under wxOSX/Cocoa but then we must be using the native
+        toolbar.
+    */
+#   if !wxUSE_NOTEBOOK
+#       ifdef __WXOSX_COCOA__
+#           if !wxUSE_TOOLBAR || !wxOSX_USE_NATIVE_TOOLBAR
+#               ifdef wxABORT_ON_CONFIG_ERROR
+#                   error "wxUSE_PREFERENCES_EDITOR requires native toolbar in wxOSX"
+#               else
+#                   undef wxUSE_PREFERENCES_EDITOR
+#                   define wxUSE_PREFERENCES_EDITOR 0
+#               endif
+#           endif
+#       else
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_PREFERENCES_EDITOR requires wxNotebook"
+#           else
+#               undef wxUSE_PREFERENCES_EDITOR
+#               define wxUSE_PREFERENCES_EDITOR 0
+#           endif
+#       endif
+#   endif
+#endif /* wxUSE_PREFERENCES_EDITOR */
+
 #endif /* wxUSE_GUI */
 
 #endif /* _WX_CHKCONF_H_ */
diff --git a/Externals/wxWidgets3/include/wx/choicdlg.h b/Externals/wxWidgets3/include/wx/choicdlg.h
index 36e36757cf..0ab4c076d6 100644
--- a/Externals/wxWidgets3/include/wx/choicdlg.h
+++ b/Externals/wxWidgets3/include/wx/choicdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: choicdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,11 +11,12 @@
 #ifndef _WX_CHOICDLG_H_BASE_
 #define _WX_CHOICDLG_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_CHOICEDLG
 
 #include "wx/generic/choicdgg.h"
 
 #endif
 
-#endif
-    // _WX_CHOICDLG_H_BASE_
+#endif // _WX_CHOICDLG_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/choice.h b/Externals/wxWidgets3/include/wx/choice.h
index e7854fb3cc..3a848f9f3c 100644
--- a/Externals/wxWidgets3/include/wx/choice.h
+++ b/Externals/wxWidgets3/include/wx/choice.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id: choice.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,6 +57,13 @@ public:
     // override wxItemContainer::IsSorted
     virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
 
+protected:
+    // The generic implementation doesn't determine the height correctly and
+    // doesn't account for the width of the arrow but does take into account
+    // the string widths, so the derived classes should override it and set the
+    // height and add the arrow width to the size returned by this version.
+    virtual wxSize DoGetBestSize() const;
+
 private:
     wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
 };
diff --git a/Externals/wxWidgets3/include/wx/choicebk.h b/Externals/wxWidgets3/include/wx/choicebk.h
index abd37cbb7d..335ede165e 100644
--- a/Externals/wxWidgets3/include/wx/choicebk.h
+++ b/Externals/wxWidgets3/include/wx/choicebk.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from wx/listbook.h
 // Created:     15.09.04
-// RCS-ID:      $Id: choicebk.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) Vadim Zeitlin, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,11 +17,12 @@
 
 #include "wx/bookctrl.h"
 #include "wx/choice.h"
+#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxChoice;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
 // wxChoicebook flags
 #define wxCHB_DEFAULT          wxBK_DEFAULT
@@ -36,7 +36,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGI
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled<wxBookCtrlBase>
 {
 public:
     wxChoicebook() { }
@@ -111,15 +111,19 @@ private:
 // ----------------------------------------------------------------------------
 
 // wxChoicebookEvent is obsolete and defined for compatibility only
-typedef wxBookCtrlEvent wxChoicebookEvent;
+#define wxChoicebookEvent wxBookCtrlEvent
 typedef wxBookCtrlEventFunction wxChoicebookEventFunction;
 #define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)
 
 #define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED    wxEVT_CHOICEBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING   wxEVT_CHOICEBOOK_PAGE_CHANGING
 
 #endif // wxUSE_CHOICEBOOK
 
diff --git a/Externals/wxWidgets3/include/wx/clipbrd.h b/Externals/wxWidgets3/include/wx/clipbrd.h
index f9ff4df6af..5399be27d5 100644
--- a/Externals/wxWidgets3/include/wx/clipbrd.h
+++ b/Externals/wxWidgets3/include/wx/clipbrd.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.10.99
-// RCS-ID:      $Id: clipbrd.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/clntdata.h b/Externals/wxWidgets3/include/wx/clntdata.h
index 177bf31c22..a41ccc0ea9 100644
--- a/Externals/wxWidgets3/include/wx/clntdata.h
+++ b/Externals/wxWidgets3/include/wx/clntdata.h
@@ -4,7 +4,6 @@
 // Author:      Robin Dunn
 // Modified by:
 // Created:     9-Oct-2001
-// RCS-ID:      $Id: clntdata.h 47730 2007-07-26 13:54:14Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/clrpicker.h b/Externals/wxWidgets3/include/wx/clrpicker.h
index 38bc05465e..1794ee68c9 100644
--- a/Externals/wxWidgets3/include/wx/clrpicker.h
+++ b/Externals/wxWidgets3/include/wx/clrpicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id: clrpicker.h 58718 2009-02-07 18:59:25Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -98,7 +97,7 @@ protected:
 class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase
 {
 public:
-    wxColourPickerCtrl() : m_bIgnoreNextTextCtrlUpdate(false) {}
+    wxColourPickerCtrl() {}
     virtual ~wxColourPickerCtrl() {}
 
 
@@ -107,7 +106,6 @@ public:
         const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxColourPickerCtrlNameStr)
-        : m_bIgnoreNextTextCtrlUpdate(false)
         { Create(parent, id, col, pos, size, style, validator, name); }
 
     bool Create(wxWindow *parent, wxWindowID id,
@@ -148,9 +146,6 @@ protected:
     virtual long GetPickerStyle(long style) const
         { return (style & wxCLRP_SHOW_LABEL); }
 
-    // true if the next UpdateTextCtrl() call is to ignore
-    bool m_bIgnoreNextTextCtrlUpdate;
-
 private:
     DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
 };
@@ -160,14 +155,14 @@ private:
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent );
 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
 public:
     wxColourPickerEvent() {}
     wxColourPickerEvent(wxObject *generator, int id, const wxColour &col)
-        : wxCommandEvent(wxEVT_COMMAND_COLOURPICKER_CHANGED, id),
+        : wxCommandEvent(wxEVT_COLOURPICKER_CHANGED, id),
           m_colour(col)
     {
         SetEventObject(generator);
@@ -196,9 +191,12 @@ typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
     wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func)
 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
 
 
+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLOURPICKER_CHANGED   wxEVT_COLOURPICKER_CHANGED
+
 #endif // wxUSE_COLOURPICKERCTRL
 
 #endif // _WX_CLRPICKER_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/cmdargs.h b/Externals/wxWidgets3/include/wx/cmdargs.h
index 3819af475f..e4167f0fd6 100644
--- a/Externals/wxWidgets3/include/wx/cmdargs.h
+++ b/Externals/wxWidgets3/include/wx/cmdargs.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxCmdLineArgsArray helper class
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// RCS-ID:      $Id: cmdargs.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cmdline.h b/Externals/wxWidgets3/include/wx/cmdline.h
index 8d02fa3a68..3dd41b9fe4 100644
--- a/Externals/wxWidgets3/include/wx/cmdline.h
+++ b/Externals/wxWidgets3/include/wx/cmdline.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.01.00
-// RCS-ID:      $Id: cmdline.h 69797 2011-11-22 13:18:58Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cmdproc.h b/Externals/wxWidgets3/include/wx/cmdproc.h
index e1692cbef5..c6125096a0 100644
--- a/Externals/wxWidgets3/include/wx/cmdproc.h
+++ b/Externals/wxWidgets3/include/wx/cmdproc.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart (extracted from docview.h by VZ)
 // Modified by:
 // Created:     05.11.00
-// RCS-ID:      $Id: cmdproc.h 70459 2012-01-25 00:05:09Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cmndata.h b/Externals/wxWidgets3/include/wx/cmndata.h
index ce330fde5e..c8e345af56 100644
--- a/Externals/wxWidgets3/include/wx/cmndata.h
+++ b/Externals/wxWidgets3/include/wx/cmndata.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart and others
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: cmndata.h 70636 2012-02-20 21:55:55Z VZ $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h b/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
index 4c3390db5d..192d282782 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/01/26
-// RCS-ID:      $Id: NSApplication.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003,2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSBox.h b/Externals/wxWidgets3/include/wx/cocoa/NSBox.h
index 6bb62b5556..39cbe3de5f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSBox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSBox.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/19
-// RCS-ID:      $Id: NSBox.h 58022 2009-01-11 12:00:51Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSButton.h b/Externals/wxWidgets3/include/wx/cocoa/NSButton.h
index 4cbcbb7a71..7e32aac07d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSButton.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSButton.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: NSButton.h 38031 2006-03-12 15:10:23Z VZ $
 // Copyright:   (c) 2002-2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSControl.h b/Externals/wxWidgets3/include/wx/cocoa/NSControl.h
index 7fd8ee2664..f921c337d1 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSControl.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSControl.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: NSControl.h 58022 2009-01-11 12:00:51Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSMenu.h b/Externals/wxWidgets3/include/wx/cocoa/NSMenu.h
index ad0cbd592e..a413ad45a6 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSMenu.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSMenu.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: NSMenu.h 49523 2007-10-29 16:18:59Z DE $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSPanel.h b/Externals/wxWidgets3/include/wx/cocoa/NSPanel.h
index 0426742d85..25acf54c42 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSPanel.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSPanel.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: NSPanel.h 42046 2006-10-16 09:30:01Z ABX $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSScroller.h b/Externals/wxWidgets3/include/wx/cocoa/NSScroller.h
index 9031df7909..3cafc5815a 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSScroller.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSScroller.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/27
-// RCS-ID:      $Id: NSScroller.h 38031 2006-03-12 15:10:23Z VZ $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSSlider.h b/Externals/wxWidgets3/include/wx/cocoa/NSSlider.h
index 62edaeb422..0f278984ee 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSSlider.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSSlider.h
@@ -4,7 +4,6 @@
 // Author:      Mark Oxenham
 // Modified by: David Elliott
 // Created:     2007/08/10
-// RCS-ID:      $Id: NSSlider.h 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2007 Software 2000 Ltd. All rights reserved.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSTabView.h b/Externals/wxWidgets3/include/wx/cocoa/NSTabView.h
index 21b6a29109..8c4320d0ae 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSTabView.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSTabView.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/08
-// RCS-ID:      $Id: NSTabView.h 38031 2006-03-12 15:10:23Z VZ $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSTableDataSource.h b/Externals/wxWidgets3/include/wx/cocoa/NSTableDataSource.h
index fbb4213bac..39e96a8343 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSTableDataSource.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSTableDataSource.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/05
-// RCS-ID:      $Id: NSTableDataSource.h 48106 2007-08-15 16:10:19Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSTableView.h b/Externals/wxWidgets3/include/wx/cocoa/NSTableView.h
index 2c47e7b54b..749a844d03 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSTableView.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSTableView.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/05
-// RCS-ID:      $Id: NSTableView.h 38031 2006-03-12 15:10:23Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSTextField.h b/Externals/wxWidgets3/include/wx/cocoa/NSTextField.h
index f497dc7412..5632318677 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSTextField.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSTextField.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: NSTextField.h 58022 2009-01-11 12:00:51Z FM $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSView.h b/Externals/wxWidgets3/include/wx/cocoa/NSView.h
index fbc17f20d4..3095fb1738 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSView.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSView.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: NSView.h 51576 2008-02-06 20:10:07Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSWindow.h b/Externals/wxWidgets3/include/wx/cocoa/NSWindow.h
index 0f4349db19..228ffe3ed0 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSWindow.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSWindow.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: NSWindow.h 49523 2007-10-29 16:18:59Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/ObjcAssociate.h b/Externals/wxWidgets3/include/wx/cocoa/ObjcAssociate.h
index 45fd153efe..a6bf6e2ce4 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/ObjcAssociate.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/ObjcAssociate.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/03
-// RCS-ID:      $Id: ObjcAssociate.h 42046 2006-10-16 09:30:01Z ABX $
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/ObjcRef.h b/Externals/wxWidgets3/include/wx/cocoa/ObjcRef.h
index 89c10199b5..d4aa6d91ec 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/ObjcRef.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/ObjcRef.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/03/28
-// RCS-ID:      $Id: ObjcRef.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2004 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/app.h b/Externals/wxWidgets3/include/wx/cocoa/app.h
index e0503fd9c6..dffb0cae63 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/app.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/app.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id: app.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/autorelease.h b/Externals/wxWidgets3/include/wx/cocoa/autorelease.h
index 8006e36a46..cd5f6b3e26 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/autorelease.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/autorelease.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/11
-// RCS-ID:      $Id: autorelease.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/bitmap.h b/Externals/wxWidgets3/include/wx/cocoa/bitmap.h
index ac7e113b9c..392b50b5b9 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/bitmap.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19
-// RCS-ID:      $Id: bitmap.h 59526 2009-03-14 13:57:51Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,7 +63,8 @@ protected:
 // wxBitmap
 // ========================================================================
 
-class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject,
+                                 public wxBitmapHelpers
 {
 // ------------------------------------------------------------------------
 // initialization
diff --git a/Externals/wxWidgets3/include/wx/cocoa/bmpbuttn.h b/Externals/wxWidgets3/include/wx/cocoa/bmpbuttn.h
index 3517aa972a..10a1394872 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/bmpbuttn.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/bmpbuttn.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: bmpbuttn.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/brush.h b/Externals/wxWidgets3/include/wx/cocoa/brush.h
index 82facc206a..d67294beac 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/brush.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/brush.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
-// RCS-ID:      $Id: brush.h 54273 2008-06-17 17:28:26Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/button.h b/Externals/wxWidgets3/include/wx/cocoa/button.h
index f328a9a338..d58d0fb6bd 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/button.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/button.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/29
-// RCS-ID:      $Id: button.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/checkbox.h b/Externals/wxWidgets3/include/wx/cocoa/checkbox.h
index 7dee9d265d..ba811c54e8 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/checkbox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/checkbox.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: checkbox.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/checklst.h b/Externals/wxWidgets3/include/wx/cocoa/checklst.h
index 0a7ab329db..8f07894342 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/checklst.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/checklst.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: checklst.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/chkconf.h b/Externals/wxWidgets3/include/wx/cocoa/chkconf.h
index 0b2516cc44..77ccadfe68 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/chkconf.h
@@ -3,7 +3,6 @@
  * Purpose:     wxCocoa-specific config settings checks
  * Author:      Vadim Zeitlin
  * Created:     2008-09-11
- * RCS-ID:      $Id: chkconf.h 67497 2011-04-15 19:18:34Z DS $
  * Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
diff --git a/Externals/wxWidgets3/include/wx/cocoa/choice.h b/Externals/wxWidgets3/include/wx/cocoa/choice.h
index 594372ea9a..7fe2c06e8d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/choice.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/choice.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: choice.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/clipbrd.h b/Externals/wxWidgets3/include/wx/cocoa/clipbrd.h
index bab90b9d77..8571f8f56d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/clipbrd.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/clipbrd.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/23
-// RCS-ID:      $Id: clipbrd.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/colour.h b/Externals/wxWidgets3/include/wx/cocoa/colour.h
index 5a0fe6b5cc..97593a3e3f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/colour.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/colour.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/06/17
-// RCS-ID:      $Id: colour.h 54125 2008-06-11 19:17:41Z SC $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/combobox.h b/Externals/wxWidgets3/include/wx/cocoa/combobox.h
index 5762ab9830..dc09cf216c 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/combobox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2005/02/16
-// RCS-ID:      $Id: combobox.h 59263 2009-03-02 12:25:01Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/control.h b/Externals/wxWidgets3/include/wx/cocoa/control.h
index 052140632e..cb493202a6 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/control.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/control.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: control.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/cursor.h b/Externals/wxWidgets3/include/wx/cocoa/cursor.h
index 5f2e476287..54209f0b19 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/cursor.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/cursor.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id: cursor.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dataform.h b/Externals/wxWidgets3/include/wx/cocoa/dataform.h
index 2ada9b1530..870ddb0470 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dataform.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dataform.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/23
-// RCS-ID:      $Id: dataform.h 46254 2007-05-30 22:02:19Z VS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dataobj.h b/Externals/wxWidgets3/include/wx/cocoa/dataobj.h
index ce7249e95a..d525029f9c 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dataobj.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dataobj.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/23
-// RCS-ID:      $Id: dataobj.h 48095 2007-08-15 13:05:35Z VS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dataobj2.h b/Externals/wxWidgets3/include/wx/cocoa/dataobj2.h
index 49bb62b052..b824fe933e 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dataobj2.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dataobj2.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/23
-// RCS-ID:      $Id: dataobj2.h 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dc.h b/Externals/wxWidgets3/include/wx/cocoa/dc.h
index e388eccaec..0d4fec2065 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dc.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dc.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01
-// RCS-ID:      $Id: dc.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -165,9 +164,9 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
 };
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dcclient.h b/Externals/wxWidgets3/include/wx/cocoa/dcclient.h
index 353f0e6a2b..631c6ffd33 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dcclient.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dcclient.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/01
-// RCS-ID:      $Id: dcclient.h 50462 2007-12-04 04:22:16Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dcmemory.h b/Externals/wxWidgets3/include/wx/cocoa/dcmemory.h
index 565df57236..33846293c3 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dcmemory.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dcmemory.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: dcmemory.h 57907 2009-01-08 14:21:53Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dcscreen.h b/Externals/wxWidgets3/include/wx/cocoa/dcscreen.h
index 2c921e2ca6..af7d4ee54e 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dcscreen.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dcscreen.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: dcscreen.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dialog.h b/Externals/wxWidgets3/include/wx/cocoa/dialog.h
index b9af3e5bc1..632df8f1bb 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dialog.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dialog.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/15
-// RCS-ID:      $Id: dialog.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/dirdlg.h b/Externals/wxWidgets3/include/wx/cocoa/dirdlg.h
index 2d2ffd3b6f..207f79baac 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/dirdlg.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/dirdlg.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by: Hiroyuki Nakamura(maloninc)
 // Created:     2006-01-10
-// RCS-ID:      $Id: dirdlg.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/evtloop.h b/Externals/wxWidgets3/include/wx/cocoa/evtloop.h
index 99b990dc0a..366e46cb1b 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/evtloop.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxGUIEventLoop for wxCocoa
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
-// RCS-ID:      $Id: evtloop.h 58911 2009-02-15 14:25:08Z FM $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,8 +19,7 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
 public:
     wxGUIEventLoop() { m_exitcode = 0; }
 
-    virtual int Run();
-    virtual void Exit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual int DispatchTimeout(unsigned long timeout);
@@ -29,6 +27,8 @@ public:
     virtual bool YieldFor(long eventsToProcess);
 
 protected:
+    virtual int DoRun();
+
     int m_exitcode;
 
     wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);
diff --git a/Externals/wxWidgets3/include/wx/cocoa/filedlg.h b/Externals/wxWidgets3/include/wx/cocoa/filedlg.h
index 45b8b8be19..b888be18e7 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/filedlg.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/filedlg.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-10-02
-// RCS-ID:      $Id: filedlg.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/font.h b/Externals/wxWidgets3/include/wx/cocoa/font.h
index 4783532b44..c9c245f9e1 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/font.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/font.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: font.h 70445 2012-01-23 11:28:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,6 +37,20 @@ public:
      */
     wxFont() { }
 
+    wxFont(const wxFontInfo& info)
+    {
+        Create(info.GetPointSize(),
+               info.GetFamily(),
+               info.GetStyle(),
+               info.GetWeight(),
+               info.IsUnderlined(),
+               info.GetFaceName(),
+               info.GetEncoding());
+
+        if ( info.IsUsingSizeInPixels() )
+            SetPixelSize(info.GetPixelSize());
+    }
+
     /*! @abstract   Platform-independent construction with individual properties
      */
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
@@ -75,19 +88,6 @@ public:
         SetPixelSize(pixelSize);
     }
 
-    wxFont(int pointSize,
-           wxFontFamily family,
-           int flags = wxFONTFLAG_DEFAULT,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(pointSize, family,
-               GetStyleFromFlags(flags),
-               GetWeightFromFlags(flags),
-               GetUnderlinedFromFlags(flags),
-               face, encoding);
-    }
-
     /*! @abstract   Construction with opaque wxNativeFontInfo
      */
     wxFont(const wxNativeFontInfo& info)
diff --git a/Externals/wxWidgets3/include/wx/cocoa/frame.h b/Externals/wxWidgets3/include/wx/cocoa/frame.h
index 0f62c5fbdc..ebdb56ed34 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/frame.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/frame.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: frame.h 60337 2009-04-25 12:59:09Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/gauge.h b/Externals/wxWidgets3/include/wx/cocoa/gauge.h
index 0ee7b991d4..ffadb1c27b 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/gauge.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/gauge.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/15
-// RCS-ID:      $Id: gauge.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/glcanvas.h b/Externals/wxWidgets3/include/wx/cocoa/glcanvas.h
index 3a58bc1b0a..927c3e05ee 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/glcanvas.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/glcanvas.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/09/29
-// RCS-ID:      $Id: glcanvas.h 47254 2007-07-09 10:09:52Z VS $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/icon.h b/Externals/wxWidgets3/include/wx/cocoa/icon.h
index e4b48aa082..ac041ba354 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/icon.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/icon.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/11
-// RCS-ID:      $Id: icon.h 65887 2010-10-23 21:47:22Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/listbox.h b/Externals/wxWidgets3/include/wx/cocoa/listbox.h
index 257c172c34..a9f233aa8a 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/listbox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/listbox.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: listbox.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/log.h b/Externals/wxWidgets3/include/wx/cocoa/log.h
index 9532068fe7..82f9319a48 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/log.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/log.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/02/07
-// RCS-ID:      $Id: log.h 27408 2004-05-23 20:53:33Z JS $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/mbarman.h b/Externals/wxWidgets3/include/wx/cocoa/mbarman.h
index 33c2f72f4c..0223cb5c74 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/mbarman.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/mbarman.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/09/04
-// RCS-ID:      $Id: mbarman.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/mdi.h b/Externals/wxWidgets3/include/wx/cocoa/mdi.h
index b2a547aaa2..6cef55caf2 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/mdi.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/mdi.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     2003/09/08
-// RCS-ID:      $Id: mdi.h 56674 2008-11-04 02:46:19Z VZ $
 // Copyright:   (c) 2003 David Elliott
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/cocoa/menu.h b/Externals/wxWidgets3/include/wx/cocoa/menu.h
index a2fe37c21e..0cb304126f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/menu.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/menu.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: menu.h 58022 2009-01-11 12:00:51Z FM $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/menuitem.h b/Externals/wxWidgets3/include/wx/cocoa/menuitem.h
index 9029b6d056..23983171bb 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/menuitem.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/menuitem.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/13
-// RCS-ID:      $Id: menuitem.h 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/msgdlg.h b/Externals/wxWidgets3/include/wx/cocoa/msgdlg.h
index 1f6527983b..4a313c44af 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/msgdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMessageDialog class
 // Author:      Gareth Simpson
 // Created:     2007-10-29
-// RCS-ID:      $Id: msgdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/cocoa/notebook.h b/Externals/wxWidgets3/include/wx/cocoa/notebook.h
index fade3ac3a6..0fe99e91a1 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/notebook.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/notebook.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/08
-// RCS-ID:      $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/NSMenu.h b/Externals/wxWidgets3/include/wx/cocoa/objc/NSMenu.h
index 96796116fb..780d306058 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/NSMenu.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/NSMenu.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007/04/20 (move from NSMenu.mm)
-// RCS-ID:      $Id: NSMenu.h 48106 2007-08-15 16:10:19Z DE $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/NSSlider.h b/Externals/wxWidgets3/include/wx/cocoa/objc/NSSlider.h
index 4e94a28cfd..3534d8576f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/NSSlider.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/NSSlider.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007/08/10 (move from NSSlider.mm)
-// RCS-ID:      $Id: NSSlider.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 Software 2000 Ltd.
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/NSView.h b/Externals/wxWidgets3/include/wx/cocoa/objc/NSView.h
index f937cffa83..f4c5f04ebf 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/NSView.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/NSView.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007/04/20 (move from NSView.mm)
-// RCS-ID:      $Id: NSView.h 46229 2007-05-28 04:22:10Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/NSWindow.h b/Externals/wxWidgets3/include/wx/cocoa/objc/NSWindow.h
index df1e67306c..bed9e59838 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/NSWindow.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/NSWindow.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007/04/20 (move from NSWindow.mm)
-// RCS-ID:      $Id: NSWindow.h 47988 2007-08-09 18:15:50Z DE $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h b/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
index 5c8eead739..bedbf44677 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
@@ -7,7 +7,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2007/05/15
-// RCS-ID:      $Id: objc_uniquifying.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Software 2000 Ltd.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/pen.h b/Externals/wxWidgets3/include/wx/cocoa/pen.h
index 1412cf8d25..66a0c7f367 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/pen.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/pen.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/02 (stubs from 22.03.2003)
-// RCS-ID:      $Id: pen.h 54273 2008-06-17 17:28:26Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/private/fontfactory.h b/Externals/wxWidgets3/include/wx/cocoa/private/fontfactory.h
index 2872e7fe52..7cbfcfe0d1 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/private/fontfactory.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/private/fontfactory.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007-10-13
-// RCS-ID:      $Id: fontfactory.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   2007 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h b/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
index dcfc64d484..fe07ff9fa1 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2008/02/14
-// RCS-ID:      $Id: scrollview.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003- David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/private/timer.h b/Externals/wxWidgets3/include/wx/cocoa/private/timer.h
index f6e707bba3..1dec2cf7fb 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/private/timer.h
@@ -2,7 +2,6 @@
 // Name:        wx/cocoa/private/timer.h
 // Purpose:     Cocoa wxTimer class
 // Author:      Ryan Norton
-// Id:          $Id: timer.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/radiobox.h b/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
index cc5fbe545f..a56a0c654b 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: radiobox.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/radiobut.h b/Externals/wxWidgets3/include/wx/cocoa/radiobut.h
index 175e3b8965..4a78b617c2 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/radiobut.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/radiobut.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: radiobut.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/region.h b/Externals/wxWidgets3/include/wx/cocoa/region.h
index 610b2e68f7..c9aed9592d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/region.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/region.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/12
-// RCS-ID:      $Id: region.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/scrolbar.h b/Externals/wxWidgets3/include/wx/cocoa/scrolbar.h
index ae86af1322..a051896ef7 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/scrolbar.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/scrolbar.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/25
-// RCS-ID:      $Id: scrolbar.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/slider.h b/Externals/wxWidgets3/include/wx/cocoa/slider.h
index 6aa00cb34e..5e73aa1796 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/slider.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/slider.h
@@ -5,7 +5,6 @@
 //              Mark Oxenham
 // Modified by:
 // Created:     2003/06/19
-// RCS-ID:      $Id: slider.h 66844 2011-02-05 16:36:30Z VZ $
 // Copyright:   (c) 2003 David Elliott
 //              (c) 2007 Software 2000 Ltd.
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/cocoa/sound.h b/Externals/wxWidgets3/include/wx/cocoa/sound.h
index 09bc45523d..362e2e288d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/sound.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/sound.h
@@ -5,7 +5,6 @@
 // Authors:     David Elliott, Ryan Norton
 // Modified by:
 // Created:     2004-10-02
-// RCS-ID:      $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) 2004 David Elliott, Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/spinbutt.h b/Externals/wxWidgets3/include/wx/cocoa/spinbutt.h
index 0e5ad4b80d..d4dc80dfc0 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/spinbutt.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/spinbutt.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/14
-// RCS-ID:      $Id: spinbutt.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/statbmp.h b/Externals/wxWidgets3/include/wx/cocoa/statbmp.h
index 255940e55e..f06b129d9f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: statbmp.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/statbox.h b/Externals/wxWidgets3/include/wx/cocoa/statbox.h
index 7b73c1b540..f19579850c 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/statbox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/statbox.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: statbox.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/statline.h b/Externals/wxWidgets3/include/wx/cocoa/statline.h
index 58d3beec1c..3834a37637 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/statline.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/statline.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: statline.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/stattext.h b/Externals/wxWidgets3/include/wx/cocoa/stattext.h
index dd1e8b4daa..176d53a0be 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/stattext.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/stattext.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: stattext.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/string.h b/Externals/wxWidgets3/include/wx/cocoa/string.h
index e61f5bfc07..65112a053a 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/string.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/string.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/04/13
-// RCS-ID:      $Id: string.h 54721 2008-07-19 19:59:59Z VZ $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/taskbar.h b/Externals/wxWidgets3/include/wx/cocoa/taskbar.h
index 9d23714b46..9c52bfc6c8 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/taskbar.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/taskbar.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/01/24
-// RCS-ID:      $Id: taskbar.h 50646 2007-12-12 01:35:53Z VZ $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/textctrl.h b/Externals/wxWidgets3/include/wx/cocoa/textctrl.h
index e07bf8653c..d7b8c0aa7c 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/textctrl.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/textctrl.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: textctrl.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/toolbar.h b/Externals/wxWidgets3/include/wx/cocoa/toolbar.h
index fbf432ee12..ce57dee03f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/toolbar.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/toolbar.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/17
-// RCS-ID:      $Id: toolbar.h 48095 2007-08-15 13:05:35Z VS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/tooltip.h b/Externals/wxWidgets3/include/wx/cocoa/tooltip.h
index f269485546..a096a54236 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/tooltip.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/tooltip.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id: tooltip.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/toplevel.h b/Externals/wxWidgets3/include/wx/cocoa/toplevel.h
index 4d138c3ed3..d0768294d3 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/toplevel.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/08
-// RCS-ID:      $Id: toplevel.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/trackingrectmanager.h b/Externals/wxWidgets3/include/wx/cocoa/trackingrectmanager.h
index e7bd1a3581..eac59b07b4 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/trackingrectmanager.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/trackingrectmanager.h
@@ -5,7 +5,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2007/05/02
-// RCS-ID:      $Id: trackingrectmanager.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Software 2000 Ltd.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cocoa/window.h b/Externals/wxWidgets3/include/wx/cocoa/window.h
index 9503574827..a060f37892 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/window.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/window.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
-// RCS-ID:      $Id: window.h 60984 2009-06-10 16:41:41Z VZ $
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/collpane.h b/Externals/wxWidgets3/include/wx/collpane.h
index 5311be7cb9..40c8939b01 100644
--- a/Externals/wxWidgets3/include/wx/collpane.h
+++ b/Externals/wxWidgets3/include/wx/collpane.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
-// RCS-ID:      $Id: collpane.h 58718 2009-02-07 18:59:25Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -53,14 +52,14 @@ public:
 
 class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
     wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed)
-        : wxCommandEvent(wxEVT_COMMAND_COLLPANE_CHANGED, id),
+        : wxCommandEvent(wxEVT_COLLAPSIBLEPANE_CHANGED, id),
         m_bCollapsed(collapsed)
     {
         SetEventObject(generator);
@@ -89,7 +88,7 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
 
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
@@ -101,6 +100,9 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 
+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLLPANE_CHANGED   wxEVT_COLLAPSIBLEPANE_CHANGED
+
 #endif // wxUSE_COLLPANE
 
 #endif // _WX_COLLAPSABLE_PANE_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/colordlg.h b/Externals/wxWidgets3/include/wx/colordlg.h
index 4632e99698..b4156d1460 100644
--- a/Externals/wxWidgets3/include/wx/colordlg.h
+++ b/Externals/wxWidgets3/include/wx/colordlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitiln
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colordlg.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/colour.h b/Externals/wxWidgets3/include/wx/colour.h
index 0c9cf08565..eec5542803 100644
--- a/Externals/wxWidgets3/include/wx/colour.h
+++ b/Externals/wxWidgets3/include/wx/colour.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:
-// RCS-ID:      $Id: colour.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -167,6 +166,7 @@ public:
     static void          ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, int ialpha);
 
     wxColour ChangeLightness(int ialpha) const;
+    wxColour& MakeDisabled(unsigned char brightness = 255);
 
     // old, deprecated
     // ---------------
diff --git a/Externals/wxWidgets3/include/wx/colourdata.h b/Externals/wxWidgets3/include/wx/colourdata.h
index d12c5b3aa6..5a755ae078 100644
--- a/Externals/wxWidgets3/include/wx/colourdata.h
+++ b/Externals/wxWidgets3/include/wx/colourdata.h
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/colourdata.h
 // Author:      Julian Smart
-// RCS-ID:      $Id: colourdata.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/combo.h b/Externals/wxWidgets3/include/wx/combo.h
index f624f7cd59..6a040b3d22 100644
--- a/Externals/wxWidgets3/include/wx/combo.h
+++ b/Externals/wxWidgets3/include/wx/combo.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.h 69942 2011-12-07 14:05:11Z VZ $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -471,6 +470,10 @@ public:
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return m_mainCtrlWnd; }
 
+    // also set the embedded wxTextCtrl colours
+    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour);
+
 protected:
 
     // Returns true if hint text should be drawn in the control
@@ -541,11 +544,10 @@ protected:
     void DestroyPopup();
 
     // override the base class virtuals involved in geometry calculations
+    // The common version only sets a default width, so the derived classes
+    // should override it and set the height and change the width as needed.
     virtual wxSize DoGetBestSize() const;
-
-    // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
@@ -558,7 +560,7 @@ protected:
     //             just recalculate.
     void CalculateAreas( int btnWidth = 0 );
 
-    // Standard textctrl positioning routine. Just give it platform-dependant
+    // Standard textctrl positioning routine. Just give it platform-dependent
     // textctrl coordinate adjustment.
     virtual void PositionTextCtrl( int textCtrlXAdjust = 0,
                                    int textCtrlYAdjust = 0);
@@ -699,7 +701,7 @@ protected:
     // area used by the button
     wxSize                  m_btnSize;
 
-    // platform-dependant customization and other flags
+    // platform-dependent customization and other flags
     wxUint32                m_iFlags;
 
     // custom style for m_text
diff --git a/Externals/wxWidgets3/include/wx/combobox.h b/Externals/wxWidgets3/include/wx/combobox.h
index a28dae2454..93b3699553 100644
--- a/Externals/wxWidgets3/include/wx/combobox.h
+++ b/Externals/wxWidgets3/include/wx/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.12.00
-// RCS-ID:      $Id: combobox.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1996-2000 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,10 @@
 
 #if wxUSE_COMBOBOX
 
+// For compatibility with 2.8 include this header to allow using wxTE_XXX
+// styles with wxComboBox without explicitly including it in the user code.
+#include "wx/textctrl.h"
+
 extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/include/wx/commandlinkbutton.h b/Externals/wxWidgets3/include/wx/commandlinkbutton.h
index 3a2a8a967e..0aaa0ec65a 100644
--- a/Externals/wxWidgets3/include/wx/commandlinkbutton.h
+++ b/Externals/wxWidgets3/include/wx/commandlinkbutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxCommandLinkButtonBase and wxGenericCommandLinkButton classes
 // Author:      Rickard Westerlund
 // Created:     2010-06-11
-// RCS-ID:      $Id: commandlinkbutton.h 65350 2010-08-18 22:48:48Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/compiler.h b/Externals/wxWidgets3/include/wx/compiler.h
new file mode 100644
index 0000000000..5ad4df8561
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/compiler.h
@@ -0,0 +1,176 @@
+/*
+ * Name:        wx/compiler.h
+ * Purpose:     Compiler-specific macro definitions.
+ * Author:      Vadim Zeitlin
+ * Created:     2013-07-13 (extracted from wx/platform.h)
+ * Copyright:   (c) 1997-2013 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#ifndef _WX_COMPILER_H_
+#define _WX_COMPILER_H_
+
+/*
+    Compiler detection and related helpers.
+ */
+
+/*
+    Notice that Intel compiler can be used as Microsoft Visual C++ add-on and
+    so we should define both __INTELC__ and __VISUALC__ for it.
+*/
+#ifdef __INTEL_COMPILER
+#   define __INTELC__
+#endif
+
+#if defined(_MSC_VER)
+    /*
+       define another standard symbol for Microsoft Visual C++: the standard
+       one (_MSC_VER) is also defined by some other compilers.
+     */
+#   define __VISUALC__ _MSC_VER
+
+    /*
+      define special symbols for different VC version instead of writing tests
+      for magic numbers such as 1200, 1300 &c repeatedly
+    */
+#if __VISUALC__ < 1100
+#   error "This Visual C++ version is too old and not supported any longer."
+#elif __VISUALC__ < 1200
+#   define __VISUALC5__
+#elif __VISUALC__ < 1300
+#   define __VISUALC6__
+#elif __VISUALC__ < 1400
+#   define __VISUALC7__
+#elif __VISUALC__ < 1500
+#   define __VISUALC8__
+#elif __VISUALC__ < 1600
+#   define __VISUALC9__
+#elif __VISUALC__ < 1700
+#   define __VISUALC10__
+#elif __VISUALC__ < 1800
+#   define __VISUALC11__
+#elif __VISUALC__ < 1900
+#   define __VISUALC12__
+#else
+#   pragma message("Please update wx/compiler.h to recognize this VC++ version")
+#endif
+
+#elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
+#   define __BORLANDC__
+#elif defined(__WATCOMC__)
+#elif defined(__SC__)
+#   define __SYMANTECC__
+#elif defined(__SUNPRO_CC)
+#   ifndef __SUNCC__
+#       define __SUNCC__ __SUNPRO_CC
+#   endif /* Sun CC */
+#elif defined(__SC__)
+#    ifdef __DMC__
+#         define __DIGITALMARS__
+#    else
+#         define __SYMANTEC__
+#    endif
+#endif  /* compiler */
+
+/*
+   Macros for checking compiler version.
+*/
+
+/*
+   This macro can be used to test the gcc version and can be used like this:
+
+#    if wxCHECK_GCC_VERSION(3, 1)
+        ... we have gcc 3.1 or later ...
+#    else
+        ... no gcc at all or gcc < 3.1 ...
+#    endif
+*/
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+    #define wxCHECK_GCC_VERSION( major, minor ) \
+        ( ( __GNUC__ > (major) ) \
+            || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) )
+#else
+    #define wxCHECK_GCC_VERSION( major, minor ) 0
+#endif
+
+/*
+   This macro can be used to test the Visual C++ version.
+*/
+#ifndef __VISUALC__
+#   define wxVISUALC_VERSION(major) 0
+#   define wxCHECK_VISUALC_VERSION(major) 0
+#else
+#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
+#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
+#endif
+
+/**
+    This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
+ */
+#ifdef __SUNCC__
+    /*
+       __SUNCC__ is 0xVRP where V is major version, R release and P patch level
+     */
+    #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
+#else
+    #define wxCHECK_SUNCC_VERSION(maj, min) (0)
+#endif
+
+#ifndef __WATCOMC__
+#   define wxWATCOM_VERSION(major,minor) 0
+#   define wxCHECK_WATCOM_VERSION(major,minor) 0
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
+#   define WX_WATCOM_ONLY_CODE( x )
+#else
+#   if __WATCOMC__ < 1200
+#       error "Only Open Watcom is supported in this release"
+#   endif
+
+#   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
+#   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
+#   define WX_WATCOM_ONLY_CODE( x )  x
+#endif
+
+/*
+   This macro can be used to check that the version of mingw32 CRT is at least
+   maj.min
+ */
+
+/* Check for Mingw runtime version: */
+#ifdef __MINGW32__
+    /* Include the header defining __MINGW32_{MAJ,MIN}OR_VERSION */
+    #include <_mingw.h>
+
+    #define wxCHECK_MINGW32_VERSION( major, minor ) \
+ ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
+      || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
+
+/*
+    MinGW-w64 project provides compilers for both Win32 and Win64 but only
+    defines the same __MINGW32__ symbol for the former as MinGW32 toolchain
+    which is quite different (notably doesn't provide many SDK headers that
+    MinGW-w64 does include). So we define a separate symbol which, unlike the
+    predefined __MINGW64__, can be used to detect this toolchain in both 32 and
+    64 bit builds.
+
+    And define __MINGW32_TOOLCHAIN__ for consistency and also because it's
+    convenient as we often want to have some workarounds only for the (old)
+    MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__.
+ */
+#   ifdef __MINGW64_VERSION_MAJOR
+#       ifndef __MINGW64_TOOLCHAIN__
+#           define __MINGW64_TOOLCHAIN__
+#       endif
+#   else
+#       ifndef __MINGW32_TOOLCHAIN__
+#           define __MINGW32_TOOLCHAIN__
+#       endif
+#   endif
+#else
+    #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
+#endif
+
+#endif // _WX_COMPILER_H_
diff --git a/Externals/wxWidgets3/include/wx/compositewin.h b/Externals/wxWidgets3/include/wx/compositewin.h
index 2c6503aaeb..a46c257708 100644
--- a/Externals/wxWidgets3/include/wx/compositewin.h
+++ b/Externals/wxWidgets3/include/wx/compositewin.h
@@ -3,7 +3,6 @@
 // Purpose:     wxCompositeWindow<> declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-01-02
-// RCS-ID:      $Id: compositewin.h 69470 2011-10-19 16:20:01Z VS $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/confbase.h b/Externals/wxWidgets3/include/wx/confbase.h
index 5d79dfafd6..9fd9df782a 100644
--- a/Externals/wxWidgets3/include/wx/confbase.h
+++ b/Externals/wxWidgets3/include/wx/confbase.h
@@ -5,7 +5,6 @@
 // Author:      Karsten Ballueder & Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.h)
-// RCS-ID:      $Id: confbase.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1997 Karsten Ballueder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
@@ -73,7 +72,7 @@ enum
 // abstract base class wxConfigBase which defines the interface for derived
 // classes
 //
-// wxConfig organizes the items in a tree-like structure (modeled after the
+// wxConfig organizes the items in a tree-like structure (modelled after the
 // Unix/Dos filesystem). There are groups (directories) and keys (files).
 // There is always one current group given by the current path.
 //
diff --git a/Externals/wxWidgets3/include/wx/config.h b/Externals/wxWidgets3/include/wx/config.h
index 672e0a5cf2..4df4b8dd08 100644
--- a/Externals/wxWidgets3/include/wx/config.h
+++ b/Externals/wxWidgets3/include/wx/config.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: config.h 70808 2012-03-04 20:31:42Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/containr.h b/Externals/wxWidgets3/include/wx/containr.h
index a509df834c..277909e559 100644
--- a/Externals/wxWidgets3/include/wx/containr.h
+++ b/Externals/wxWidgets3/include/wx/containr.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.01
-// RCS-ID:      $Id: containr.h 70805 2012-03-04 09:42:51Z SC $
 // Copyright:   (c) 2001, 2011 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -42,9 +41,12 @@ public:
     {
         m_winParent = NULL;
 
-        // do accept focus initially, we'll stop doing it if/when any children
-        // are added
-        m_acceptsFocus = true;
+        // By default, we accept focus ourselves.
+        m_acceptsFocusSelf = true;
+
+        // But we don't have any children accepting it yet.
+        m_acceptsFocusChildren = false;
+
         m_inSetFocus = false;
         m_winLastFocused = NULL;
     }
@@ -57,31 +59,36 @@ public:
         m_winParent = winParent;
     }
 
+    // This can be called by the window to indicate that it never wants to have
+    // the focus for itself.
+    void DisableSelfFocus()
+        { m_acceptsFocusSelf = false; UpdateParentCanFocus(); }
+
+    // This can be called to undo the effect of a previous DisableSelfFocus()
+    // (otherwise calling it is not necessary as the window does accept focus
+    // by default).
+    void EnableSelfFocus()
+        { m_acceptsFocusSelf = true; UpdateParentCanFocus(); }
+
     // should be called from SetFocus(), returns false if we did nothing with
     // the focus and the default processing should take place
     bool DoSetFocus();
 
-    // should be called when we decide that we should [stop] accepting focus
-    void SetCanFocus(bool acceptsFocus);
-
     // returns whether we should accept focus ourselves or not
-    bool AcceptsFocus() const { return m_acceptsFocus; }
+    bool AcceptsFocus() const;
 
-    // returns whether we or one of our children accepts focus: we always do
-    // because if we don't have any focusable children it probably means that
-    // we're not being used as a container at all (think of wxGrid or generic
-    // wxListCtrl) and so should get focus for ourselves
-    bool AcceptsFocusRecursively() const { return true; }
+    // Returns whether we or one of our children accepts focus.
+    bool AcceptsFocusRecursively() const
+        { return AcceptsFocus() ||
+            (m_acceptsFocusChildren && HasAnyChildrenAcceptingFocus()); }
 
-    // this is used to determine whether we can accept focus when Tab or
-    // another navigation key is pressed -- we alsways can, for the same reason
-    // as mentioned above for AcceptsFocusRecursively()
-    bool AcceptsFocusFromKeyboard() const { return true; }
+    // We accept focus from keyboard if we accept it at all.
+    bool AcceptsFocusFromKeyboard() const { return AcceptsFocusRecursively(); }
 
     // Call this when the number of children of the window changes.
-    // If we have any children, this panel (used just as container for
-    // them) shouldn't get focus for itself.
-    void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); }
+    //
+    // Returns true if we have any focusable children, false otherwise.
+    bool UpdateCanFocusChildren();
 
 protected:
     // set the focus to the child which had it the last time
@@ -90,6 +97,10 @@ protected:
     // return true if we have any children accepting focus
     bool HasAnyFocusableChildren() const;
 
+    // return true if we have any children that do accept focus right now
+    bool HasAnyChildrenAcceptingFocus() const;
+
+
     // the parent window we manage the children for
     wxWindow *m_winParent;
 
@@ -97,9 +108,19 @@ protected:
     wxWindow *m_winLastFocused;
 
 private:
-    // value returned by AcceptsFocus(), should be changed using SetCanFocus()
-    // only
-    bool m_acceptsFocus;
+    // Update the window status to reflect whether it is getting focus or not.
+    void UpdateParentCanFocus();
+
+    // Indicates whether the associated window can ever have focus itself.
+    //
+    // Usually this is the case, e.g. a wxPanel can be used either as a
+    // container for its children or just as a normal window which can be
+    // focused. But sometimes, e.g. for wxStaticBox, we can never have focus
+    // ourselves and can only get it if we have any focusable children.
+    bool m_acceptsFocusSelf;
+
+    // Cached value remembering whether we have any children accepting focus.
+    bool m_acceptsFocusChildren;
 
     // a guard against infinite recursion
     bool m_inSetFocus;
@@ -198,7 +219,13 @@ public:
     {
         BaseWindowClass::AddChild(child);
 
-        m_container.UpdateCanFocus();
+        if ( m_container.UpdateCanFocusChildren() )
+        {
+            // Under MSW we must have wxTAB_TRAVERSAL style for TAB navigation
+            // to work.
+            if ( !BaseWindowClass::HasFlag(wxTAB_TRAVERSAL) )
+                BaseWindowClass::ToggleWindowStyle(wxTAB_TRAVERSAL);
+        }
     }
 
     WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child)
@@ -209,7 +236,9 @@ public:
 
         BaseWindowClass::RemoveChild(child);
 
-        m_container.UpdateCanFocus();
+        // We could reset wxTAB_TRAVERSAL here but it doesn't seem to do any
+        // harm to keep it.
+        m_container.UpdateCanFocusChildren();
     }
 
     WXDLLIMPEXP_INLINE_CORE virtual void SetFocus()
@@ -223,11 +252,6 @@ public:
         BaseWindowClass::SetFocus();
     }
 
-    void AcceptFocus(bool acceptFocus)
-    {
-        m_container.SetCanFocus(acceptFocus);
-    }
-
 protected:
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
     void OnNavigationKey(wxNavigationKeyEvent& event)
@@ -271,10 +295,6 @@ public:                                                                       \
     virtual void RemoveChild(wxWindowBase *child);                            \
     virtual void SetFocus();                                                  \
     void SetFocusIgnoringChildren();                                          \
-    void AcceptFocus(bool acceptFocus)                                        \
-    {                                                                         \
-        m_container.SetCanFocus(acceptFocus);                                 \
-    }                                                                         \
                                                                               \
 protected:                                                                    \
     wxControlContainer m_container
@@ -290,7 +310,7 @@ protected:                                                                    \
     {                                                                         \
         basename::AddChild(child);                                            \
                                                                               \
-        m_container.UpdateCanFocus();                                         \
+        m_container.UpdateCanFocusChildren();                                 \
     }                                                                         \
                                                                               \
     bool classname::AcceptsFocusRecursively() const                           \
@@ -328,7 +348,7 @@ protected:                                                                    \
     {                                                                         \
         basename::RemoveChild(child);                                         \
                                                                               \
-        m_container.UpdateCanFocus();                                         \
+        m_container.UpdateCanFocusChildren();                                 \
     }                                                                         \
                                                                               \
     void classname::SetFocusIgnoringChildren()                                \
@@ -363,7 +383,7 @@ public:                                                                       \
                                                                               \
         basename::RemoveChild(child);                                         \
                                                                               \
-        m_container.UpdateCanFocus();                                         \
+        m_container.UpdateCanFocusChildren();                                 \
     }                                                                         \
                                                                               \
     void classname::OnNavigationKey( wxNavigationKeyEvent& event )            \
diff --git a/Externals/wxWidgets3/include/wx/control.h b/Externals/wxWidgets3/include/wx/control.h
index 778ec1870e..cd7bc9e268 100644
--- a/Externals/wxWidgets3/include/wx/control.h
+++ b/Externals/wxWidgets3/include/wx/control.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id: control.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -134,6 +133,10 @@ public:
     // wxControl-specific processing after processing the update event
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
+    wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const
+        { return DoGetSizeFromTextSize(xlen, ylen); }
+    wxSize GetSizeFromTextSize(const wxSize& tsize) const
+        { return DoGetSizeFromTextSize(tsize.x, tsize.y); }
 
 
     // static utilities for mnemonics char (&) handling
@@ -192,6 +195,8 @@ protected:
     virtual bool DoSetLabelMarkup(const wxString& markup);
 #endif // wxUSE_MARKUP
 
+    // override this to return the total control's size from a string size
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;
diff --git a/Externals/wxWidgets3/include/wx/convauto.h b/Externals/wxWidgets3/include/wx/convauto.h
index 0d9303959d..0912368f64 100644
--- a/Externals/wxWidgets3/include/wx/convauto.h
+++ b/Externals/wxWidgets3/include/wx/convauto.h
@@ -3,7 +3,6 @@
 // Purpose:     wxConvAuto class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-04-03
-// RCS-ID:      $Id: convauto.h 69675 2011-11-05 11:23:41Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cpp.h b/Externals/wxWidgets3/include/wx/cpp.h
index 5837fe190c..b5ce014e4d 100644
--- a/Externals/wxWidgets3/include/wx/cpp.h
+++ b/Externals/wxWidgets3/include/wx/cpp.h
@@ -3,7 +3,6 @@
  *  Purpose:     Various preprocessor helpers
  *  Author:      Vadim Zeitlin
  *  Created:     2006-09-30
- *  RCS-ID:      $Id: cpp.h 66054 2010-11-07 13:16:20Z VZ $
  *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
  *  Licence:     wxWindows licence
  */
@@ -13,13 +12,27 @@
 #ifndef _WX_CPP_H_
 #define _WX_CPP_H_
 
+#include "wx/compiler.h"    /* wxCHECK_XXX_VERSION() macros */
+
 /* wxCONCAT works like preprocessor ## operator but also works with macros */
 #define wxCONCAT_HELPER(text, line) text ## line
-#define wxCONCAT(text, line)        wxCONCAT_HELPER(text, line)
 
-#define wxCONCAT3(x1, x2, x3) wxCONCAT(wxCONCAT(x1, x2), x3)
-#define wxCONCAT4(x1, x2, x3, x4) wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
-#define wxCONCAT5(x1, x2, x3, x4, x5) wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
+#define wxCONCAT(x1, x2) \
+    wxCONCAT_HELPER(x1, x2)
+#define wxCONCAT3(x1, x2, x3) \
+    wxCONCAT(wxCONCAT(x1, x2), x3)
+#define wxCONCAT4(x1, x2, x3, x4) \
+    wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
+#define wxCONCAT5(x1, x2, x3, x4, x5) \
+    wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
+#define wxCONCAT6(x1, x2, x3, x4, x5, x6) \
+    wxCONCAT(wxCONCAT5(x1, x2, x3, x4, x5), x6)
+#define wxCONCAT7(x1, x2, x3, x4, x5, x6, x7) \
+    wxCONCAT(wxCONCAT6(x1, x2, x3, x4, x5, x6), x7)
+#define wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8) \
+    wxCONCAT(wxCONCAT7(x1, x2, x3, x4, x5, x6, x7), x8)
+#define wxCONCAT9(x1, x2, x3, x4, x5, x6, x7, x8, x9) \
+    wxCONCAT(wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8), x9)
 
 /* wxSTRINGIZE works as the preprocessor # operator but also works with macros */
 #define wxSTRINGIZE_HELPER(x)       #x
@@ -67,6 +80,28 @@
  */
 #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
 
+/*
+    Helpers for defining macros that expand into a single statement.
+
+    The standatd solution is to use "do { ... } while (0)" statement but MSVC
+    generates a C4127 "condition expression is constant" warning for it so we
+    use something which is just complicated enough to not be recognized as a
+    constant but still simple enough to be optimized away.
+
+    Another solution would be to use __pragma() to temporarily disable C4127.
+
+    Notice that wxASSERT_ARG_TYPE in wx/strvargarg.h relies on these macros
+    creating some kind of a loop because it uses "break".
+ */
+#ifdef __WATCOMC__
+    #define wxFOR_ONCE(name) for(int name=0; name<1; name++)
+    #define wxSTATEMENT_MACRO_BEGIN wxFOR_ONCE(wxMAKE_UNIQUE_NAME(wxmacro)) {
+    #define wxSTATEMENT_MACRO_END }
+#else
+    #define wxSTATEMENT_MACRO_BEGIN  do {
+    #define wxSTATEMENT_MACRO_END } while ( (void)0, 0 )
+#endif
+
 /*
     Define __WXFUNCTION__ which is like standard __FUNCTION__ but defined as
     NULL for the compilers which don't support the latter.
@@ -89,5 +124,64 @@
     #endif
 #endif /* __WXFUNCTION__ already defined */
 
+
+/* Auto-detect variadic macros support unless explicitly disabled. */
+#if !defined(HAVE_VARIADIC_MACROS) && !defined(wxNO_VARIADIC_MACROS)
+    /* Any C99 or C++11 compiler should have them. */
+    #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+        (defined(__cplusplus) && __cplusplus >= 201103L)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_GCC_VERSION(3,0)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_VISUALC_VERSION(8)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_WATCOM_VERSION(1,2)
+        #define HAVE_VARIADIC_MACROS
+    #endif
+#endif /* !HAVE_VARIADIC_MACROS */
+
+
+
+#ifdef HAVE_VARIADIC_MACROS
+/*
+   wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
+   for every remaining argument 'x', with 'pos' being its 1-based index in
+   *reverse* order (with the last argument being numbered 1).
+
+   For example, wxCALL_FOR_EACH(test, a, b, c) expands into this:
+
+       test(3, a) \
+       test(2, b) \
+       test(1, c)
+
+   Up to eight arguments are supported.
+
+   (With thanks to https://groups.google.com/d/topic/comp.std.c/d-6Mj5Lko_s/discussion
+   and http://stackoverflow.com/questions/1872220/is-it-possible-to-iterate-over-arguments-in-variadic-macros)
+*/
+#define wxCALL_FOR_EACH_NARG(...)   wxCALL_FOR_EACH_NARG_((__VA_ARGS__, wxCALL_FOR_EACH_RSEQ_N()))
+#define wxCALL_FOR_EACH_NARG_(args) wxCALL_FOR_EACH_ARG_N args
+#define wxCALL_FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N
+#define wxCALL_FOR_EACH_RSEQ_N() 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+#define wxCALL_FOR_EACH_1(what, x)        what(1, x)
+#define wxCALL_FOR_EACH_2(what, x, ...)   what(2, x)  wxCALL_FOR_EACH_1(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_3(what, x, ...)   what(3, x)  wxCALL_FOR_EACH_2(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_4(what, x, ...)   what(4, x)  wxCALL_FOR_EACH_3(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_5(what, x, ...)   what(5, x)  wxCALL_FOR_EACH_4(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_6(what, x, ...)   what(6, x)  wxCALL_FOR_EACH_5(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_7(what, x, ...)   what(7, x)  wxCALL_FOR_EACH_6(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_8(what, x, ...)   what(8, x)  wxCALL_FOR_EACH_7(what,  __VA_ARGS__)
+
+#define wxCALL_FOR_EACH_(N, args) \
+    wxCONCAT(wxCALL_FOR_EACH_, N) args
+
+#define wxCALL_FOR_EACH(what, ...) \
+    wxCALL_FOR_EACH_(wxCALL_FOR_EACH_NARG(__VA_ARGS__), (what, __VA_ARGS__))
+
+#else
+    #define wxCALL_FOR_EACH  Error_wx_CALL_FOR_EACH_requires_variadic_macros_support
+#endif /* HAVE_VARIADIC_MACROS */
+
 #endif /* _WX_CPP_H_ */
 
diff --git a/Externals/wxWidgets3/include/wx/cppunit.h b/Externals/wxWidgets3/include/wx/cppunit.h
index 7c5a114bf5..89edd9165f 100644
--- a/Externals/wxWidgets3/include/wx/cppunit.h
+++ b/Externals/wxWidgets3/include/wx/cppunit.h
@@ -3,7 +3,6 @@
 // Purpose:     wrapper header for CppUnit headers
 // Author:      Vadim Zeitlin
 // Created:     15.02.04
-// RCS-ID:      $Id: cppunit.h 69241 2011-09-30 14:00:52Z JJ $
 // Copyright:   (c) 2004 Vadim Zeitlin
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/crt.h b/Externals/wxWidgets3/include/wx/crt.h
index 3ba993907a..9b939fd0f9 100644
--- a/Externals/wxWidgets3/include/wx/crt.h
+++ b/Externals/wxWidgets3/include/wx/crt.h
@@ -3,7 +3,6 @@
 // Purpose:     Header to include all headers with wrappers for CRT functions
 // Author:      Robert Roebling
 // Created:     2007-05-30
-// RCS-ID:      $Id: crt.h 49444 2007-10-26 06:19:08Z PC $
 // Copyright:   (c) 2007 wxWidgets dev team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/cshelp.h b/Externals/wxWidgets3/include/wx/cshelp.h
index 0cc915177c..723ac14e0a 100644
--- a/Externals/wxWidgets3/include/wx/cshelp.h
+++ b/Externals/wxWidgets3/include/wx/cshelp.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     08/09/2000
-// RCS-ID:      $Id: cshelp.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ctrlsub.h b/Externals/wxWidgets3/include/wx/ctrlsub.h
index 198aae24c6..88832e5b75 100644
--- a/Externals/wxWidgets3/include/wx/ctrlsub.h
+++ b/Externals/wxWidgets3/include/wx/ctrlsub.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id: ctrlsub.h 68460 2011-07-30 11:30:08Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -441,6 +440,12 @@ public:
     // colour
     virtual bool ShouldInheritColours() const { return false; }
 
+
+    // Implementation only from now on.
+
+    // Generate an event of the given type for the selection change.
+    void SendSelectionChangedEvent(wxEventType eventType);
+
 protected:
     // fill in the client object or data field of the event as appropriate
     //
diff --git a/Externals/wxWidgets3/include/wx/cursor.h b/Externals/wxWidgets3/include/wx/cursor.h
index a0ce868609..bdde8cdf66 100644
--- a/Externals/wxWidgets3/include/wx/cursor.h
+++ b/Externals/wxWidgets3/include/wx/cursor.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: cursor.h 70353 2012-01-15 14:46:41Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -41,7 +40,11 @@ public:
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XBM
     #include "wx/motif/cursor.h"
 #elif defined(__WXGTK20__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #ifdef __WINDOWS__
+        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #else
+        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #endif
     #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
diff --git a/Externals/wxWidgets3/include/wx/custombgwin.h b/Externals/wxWidgets3/include/wx/custombgwin.h
index 62ef32261f..73890a4654 100644
--- a/Externals/wxWidgets3/include/wx/custombgwin.h
+++ b/Externals/wxWidgets3/include/wx/custombgwin.h
@@ -3,7 +3,6 @@
 // Purpose:     Class adding support for custom window backgrounds.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-10
-// RCS-ID:      $Id: custombgwin.h 69930 2011-12-04 23:57:36Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/dataobj.h b/Externals/wxWidgets3/include/wx/dataobj.h
index f611b34e86..d099f4b6b1 100644
--- a/Externals/wxWidgets3/include/wx/dataobj.h
+++ b/Externals/wxWidgets3/include/wx/dataobj.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
 // Created:     26.05.99
-// RCS-ID:      $Id: dataobj.h 63381 2010-02-04 01:02:43Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -334,6 +333,45 @@ private:
     #endif
 #endif // wxUSE_UNICODE
 
+class WXDLLIMPEXP_CORE wxHTMLDataObject : public wxDataObjectSimple
+{
+public:
+    // ctor: you can specify the text here or in SetText(), or override
+    // GetText()
+    wxHTMLDataObject(const wxString& html = wxEmptyString)
+        : wxDataObjectSimple(wxDF_HTML),
+          m_html(html)
+        {
+        }
+
+    // virtual functions which you may override if you want to provide text on
+    // demand only - otherwise, the trivial default versions will be used
+    virtual size_t GetLength() const { return m_html.Len() + 1; }
+    virtual wxString GetHTML() const { return m_html; }
+    virtual void SetHTML(const wxString& html) { m_html = html; }
+    
+    virtual size_t GetDataSize() const;
+    virtual bool GetDataHere(void *buf) const;
+    virtual bool SetData(size_t len, const void *buf);
+    
+    // Must provide overloads to avoid hiding them (and warnings about it)
+    virtual size_t GetDataSize(const wxDataFormat&) const
+    {
+        return GetDataSize();
+    }
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    {
+        return GetDataHere(buf);
+    }
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    {
+        return SetData(len, buf);
+    }
+
+private:
+    wxString m_html;
+};
+
 class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple
 {
 public:
diff --git a/Externals/wxWidgets3/include/wx/dataview.h b/Externals/wxWidgets3/include/wx/dataview.h
index 3e81791cd0..2aa4a60d7d 100644
--- a/Externals/wxWidgets3/include/wx/dataview.h
+++ b/Externals/wxWidgets3/include/wx/dataview.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Bo Yang
 // Created:     08.01.06
-// RCS-ID:      $Id: dataview.h 70377 2012-01-17 14:05:17Z VS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,6 +18,7 @@
 #include "wx/textctrl.h"
 #include "wx/headercol.h"
 #include "wx/variant.h"
+#include "wx/dnd.h"             // For wxDragResult declaration only.
 #include "wx/dynarray.h"
 #include "wx/icon.h"
 #include "wx/itemid.h"
@@ -228,7 +228,7 @@ public:
         return true;
     }
 
-    // define hierachy
+    // define hierarchy
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0;
     virtual bool IsContainer( const wxDataViewItem &item ) const = 0;
     // Is the container just a header or an item with all columns
@@ -376,12 +376,6 @@ public:
     virtual unsigned GetRow( const wxDataViewItem &item ) const;
     wxDataViewItem GetItem( unsigned int row ) const;
 
-    // compare based on index
-
-    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending ) const;
-    virtual bool HasDefaultCompare() const;
-
     // implement base methods
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
@@ -437,7 +431,6 @@ public:
 
 private:
     unsigned int m_size;
-    bool m_ordered;
 };
 #endif
 
@@ -767,7 +760,9 @@ public:
 #if wxUSE_DRAG_AND_DROP
         , m_dataObject(NULL),
         m_dataBuffer(NULL),
-        m_dataSize(0)
+        m_dataSize(0),
+        m_dragFlags(0),
+        m_dropEffect(wxDragNone)
 #endif
         { }
 
@@ -786,7 +781,9 @@ public:
         , m_dataObject(event.m_dataObject),
         m_dataFormat(event.m_dataFormat),
         m_dataBuffer(event.m_dataBuffer),
-        m_dataSize(event.m_dataSize)
+        m_dataSize(event.m_dataSize),
+        m_dragFlags(event.m_dragFlags),
+        m_dropEffect(event.m_dropEffect)
 #endif
         { }
 
@@ -802,7 +799,7 @@ public:
     const wxVariant &GetValue() const { return m_value; }
     void SetValue( const wxVariant &value ) { m_value = value; }
 
-    // for wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE only
+    // for wxEVT_DATAVIEW_ITEM_EDITING_DONE only
     bool IsEditCancelled() const { return m_editCancelled; }
     void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
 
@@ -814,7 +811,7 @@ public:
     wxPoint GetPosition() const { return m_pos; }
     void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
 
-    // For wxEVT_COMMAND_DATAVIEW_CACHE_HINT
+    // For wxEVT_DATAVIEW_CACHE_HINT
     int GetCacheFrom() const { return m_cacheFrom; }
     int GetCacheTo() const { return m_cacheTo; }
     void SetCache(int from, int to) { m_cacheFrom = from; m_cacheTo = to; }
@@ -832,6 +829,10 @@ public:
     size_t GetDataSize() const { return m_dataSize; }
     void SetDataBuffer( void* buf ) { m_dataBuffer = buf;}
     void *GetDataBuffer() const { return m_dataBuffer; }
+    void SetDragFlags( int flags ) { m_dragFlags = flags; }
+    int GetDragFlags() const { return m_dragFlags; }
+    void SetDropEffect( wxDragResult effect ) { m_dropEffect = effect; }
+    wxDragResult GetDropEffect() const { return m_dropEffect; }
 #endif // wxUSE_DRAG_AND_DROP
 
     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
@@ -853,36 +854,39 @@ protected:
     wxDataFormat        m_dataFormat;
     void*               m_dataBuffer;
     size_t              m_dataSize;
+
+    int                 m_dragFlags;
+    wxDragResult        m_dropEffect;
 #endif // wxUSE_DRAG_AND_DROP
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_CACHE_HINT, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_DROP, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent );
 
 typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 
@@ -890,7 +894,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
     wxEVENT_HANDLER_CAST(wxDataViewEventFunction, func)
 
 #define wx__DECLARE_DATAVIEWEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_DATAVIEW_ ## evt, id, wxDataViewEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_DATAVIEW_ ## evt, id, wxDataViewEventHandler(fn))
 
 #define EVT_DATAVIEW_SELECTION_CHANGED(id, fn) wx__DECLARE_DATAVIEWEVT(SELECTION_CHANGED, id, fn)
 
@@ -907,7 +911,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #define EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_CONTEXT_MENU, id, fn)
 
 #define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn)
-#define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
+#define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn)
 #define EVT_DATAVIEW_COLUMN_REORDERED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_REORDERED, id, fn)
 #define EVT_DATAVIEW_CACHE_HINT(id, fn) wx__DECLARE_DATAVIEWEVT(CACHE_HINT, id, fn)
@@ -916,6 +920,9 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #define EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_DROP_POSSIBLE, id, fn)
 #define EVT_DATAVIEW_ITEM_DROP(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_DROP, id, fn)
 
+// Old and not documented synonym, don't use.
+#define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, fn)
+
 #ifdef wxHAS_GENERIC_DATAVIEWCTRL
     #include "wx/generic/dataview.h"
 #elif defined(__WXGTK20__)
@@ -933,24 +940,20 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 class WXDLLIMPEXP_ADV wxDataViewListStoreLine
 {
 public:
-    wxDataViewListStoreLine( wxClientData *data = NULL )
+    wxDataViewListStoreLine( wxUIntPtr data = 0 )
     {
         m_data = data;
     }
-    virtual ~wxDataViewListStoreLine()
-    {
-        delete m_data;
-    }
 
-    void SetData( wxClientData *data )
-        { if (m_data) delete m_data; m_data = data; }
-    wxClientData *GetData() const
+    void SetData( wxUIntPtr data )
+        { m_data = data; }
+    wxUIntPtr GetData() const
         { return m_data; }
 
     wxVector<wxVariant>  m_values;
 
 private:
-    wxClientData    *m_data;
+    wxUIntPtr m_data;
 };
 
 
@@ -964,11 +967,17 @@ public:
     void InsertColumn( unsigned int pos, const wxString &varianttype );
     void AppendColumn( const wxString &varianttype );
 
-    void AppendItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );
-    void PrependItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );
-    void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL );
+    void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
+    void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
+    void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = 0 );
     void DeleteItem( unsigned int pos );
     void DeleteAllItems();
+    void ClearColumns();
+
+    unsigned int GetItemCount() const;
+
+    void SetItemData( const wxDataViewItem& item, wxUIntPtr data );
+    wxUIntPtr GetItemData( const wxDataViewItem& item ) const;
 
     // override base virtuals
 
@@ -1032,6 +1041,7 @@ public:
     virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
+    virtual bool ClearColumns();
 
     wxDataViewColumn *AppendTextColumn( const wxString &label,
           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
@@ -1046,11 +1056,11 @@ public:
           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
           int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
 
-    void AppendItem( const wxVector<wxVariant> &values, wxClientData *data = NULL )
+    void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
         { GetStore()->AppendItem( values, data ); }
-    void PrependItem( const wxVector<wxVariant> &values, wxClientData *data = NULL )
+    void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
         { GetStore()->PrependItem( values, data ); }
-    void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL )
+    void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = 0 )
         { GetStore()->InsertItem( row, values, data ); }
     void DeleteItem( unsigned row )
         { GetStore()->DeleteItem( row ); }
@@ -1075,6 +1085,14 @@ public:
     bool GetToggleValue( unsigned int row, unsigned int col ) const
         { wxVariant value; GetStore()->GetValueByRow( value, row, col ); return value.GetBool(); }
 
+    void SetItemData( const wxDataViewItem& item, wxUIntPtr data )
+        { GetStore()->SetItemData( item, data ); }
+    wxUIntPtr GetItemData( const wxDataViewItem& item ) const
+        { return GetStore()->GetItemData( item ); }
+
+    int GetItemCount() const
+        { return GetStore()->GetItemCount(); }
+
     void OnSize( wxSizeEvent &event );
 
 private:
@@ -1307,6 +1325,27 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
 };
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED           wxEVT_DATAVIEW_SELECTION_CHANGED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED              wxEVT_DATAVIEW_ITEM_ACTIVATED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED              wxEVT_DATAVIEW_ITEM_COLLAPSED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED               wxEVT_DATAVIEW_ITEM_EXPANDED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING             wxEVT_DATAVIEW_ITEM_COLLAPSING
+#define wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING              wxEVT_DATAVIEW_ITEM_EXPANDING
+#define wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING          wxEVT_DATAVIEW_ITEM_START_EDITING
+#define wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED        wxEVT_DATAVIEW_ITEM_EDITING_STARTED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE           wxEVT_DATAVIEW_ITEM_EDITING_DONE
+#define wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED          wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
+#define wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU           wxEVT_DATAVIEW_ITEM_CONTEXT_MENU
+#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK         wxEVT_DATAVIEW_COLUMN_HEADER_CLICK
+#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK   wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK
+#define wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED               wxEVT_DATAVIEW_COLUMN_SORTED
+#define wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED            wxEVT_DATAVIEW_COLUMN_REORDERED
+#define wxEVT_COMMAND_DATAVIEW_CACHE_HINT                  wxEVT_DATAVIEW_CACHE_HINT
+#define wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG             wxEVT_DATAVIEW_ITEM_BEGIN_DRAG
+#define wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE          wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE
+#define wxEVT_COMMAND_DATAVIEW_ITEM_DROP                   wxEVT_DATAVIEW_ITEM_DROP
+
 #endif // wxUSE_DATAVIEWCTRL
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/datectrl.h b/Externals/wxWidgets3/include/wx/datectrl.h
index 8b16f0a9f2..6fa4367c0a 100644
--- a/Externals/wxWidgets3/include/wx/datectrl.h
+++ b/Externals/wxWidgets3/include/wx/datectrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
-// RCS-ID:      $Id: datectrl.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/dateevt.h b/Externals/wxWidgets3/include/wx/dateevt.h
index 7b10dd63b7..4131ab383e 100644
--- a/Externals/wxWidgets3/include/wx/dateevt.h
+++ b/Externals/wxWidgets3/include/wx/dateevt.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-10
-// RCS-ID:      $Id: dateevt.h 69224 2011-09-29 13:43:15Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/datetime.h b/Externals/wxWidgets3/include/wx/datetime.h
index 79cf5f1b7a..f500985f28 100644
--- a/Externals/wxWidgets3/include/wx/datetime.h
+++ b/Externals/wxWidgets3/include/wx/datetime.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id: datetime.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -222,124 +221,6 @@ public:
         // TODO Hebrew, Chinese, Maya, ... (just kidding) (or then may be not?)
     };
 
-        // these values only are used to identify the different dates of
-        // adoption of the Gregorian calendar (see IsGregorian())
-        //
-        // All data and comments taken verbatim from "The Calendar FAQ (v 2.0)"
-        // by Claus Tøndering, http://www.pip.dknet.dk/~c-t/calendar.html
-        // except for the comments "we take".
-        //
-        // Symbol "->" should be read as "was followed by" in the comments
-        // which follow.
-    enum GregorianAdoption
-    {
-        Gr_Unknown,    // no data for this country or it's too uncertain to use
-        Gr_Standard,   // on the day 0 of Gregorian calendar: 15 Oct 1582
-
-        Gr_Alaska,             // Oct 1867 when Alaska became part of the USA
-        Gr_Albania,            // Dec 1912
-
-        Gr_Austria = Gr_Unknown,    // Different regions on different dates
-        Gr_Austria_Brixen,          // 5 Oct 1583 -> 16 Oct 1583
-        Gr_Austria_Salzburg = Gr_Austria_Brixen,
-        Gr_Austria_Tyrol = Gr_Austria_Brixen,
-        Gr_Austria_Carinthia,       // 14 Dec 1583 -> 25 Dec 1583
-        Gr_Austria_Styria = Gr_Austria_Carinthia,
-
-        Gr_Belgium,            // Then part of the Netherlands
-
-        Gr_Bulgaria = Gr_Unknown, // Unknown precisely (from 1915 to 1920)
-        Gr_Bulgaria_1,         //      18 Mar 1916 -> 1 Apr 1916
-        Gr_Bulgaria_2,         //      31 Mar 1916 -> 14 Apr 1916
-        Gr_Bulgaria_3,         //      3 Sep 1920 -> 17 Sep 1920
-
-        Gr_Canada = Gr_Unknown,   // Different regions followed the changes in
-                               // Great Britain or France
-
-        Gr_China = Gr_Unknown,    // Different authorities say:
-        Gr_China_1,            //      18 Dec 1911 -> 1 Jan 1912
-        Gr_China_2,            //      18 Dec 1928 -> 1 Jan 1929
-
-        Gr_Czechoslovakia,     // (Bohemia and Moravia) 6 Jan 1584 -> 17 Jan 1584
-        Gr_Denmark,            // (including Norway) 18 Feb 1700 -> 1 Mar 1700
-        Gr_Egypt,              // 1875
-        Gr_Estonia,            // 1918
-        Gr_Finland,            // Then part of Sweden
-
-        Gr_France,             // 9 Dec 1582 -> 20 Dec 1582
-        Gr_France_Alsace,      //      4 Feb 1682 -> 16 Feb 1682
-        Gr_France_Lorraine,    //      16 Feb 1760 -> 28 Feb 1760
-        Gr_France_Strasbourg,  // February 1682
-
-        Gr_Germany = Gr_Unknown,  // Different states on different dates:
-        Gr_Germany_Catholic,   //      1583-1585 (we take 1584)
-        Gr_Germany_Prussia,    //      22 Aug 1610 -> 2 Sep 1610
-        Gr_Germany_Protestant, //      18 Feb 1700 -> 1 Mar 1700
-
-        Gr_GreatBritain,       // 2 Sep 1752 -> 14 Sep 1752 (use 'cal(1)')
-
-        Gr_Greece,             // 9 Mar 1924 -> 23 Mar 1924
-        Gr_Hungary,            // 21 Oct 1587 -> 1 Nov 1587
-        Gr_Ireland = Gr_GreatBritain,
-        Gr_Italy = Gr_Standard,
-
-        Gr_Japan = Gr_Unknown,    // Different authorities say:
-        Gr_Japan_1,            //      19 Dec 1872 -> 1 Jan 1873
-        Gr_Japan_2,            //      19 Dec 1892 -> 1 Jan 1893
-        Gr_Japan_3,            //      18 Dec 1918 -> 1 Jan 1919
-
-        Gr_Latvia,             // 1915-1918 (we take 1915)
-        Gr_Lithuania,          // 1915
-        Gr_Luxemburg,          // 14 Dec 1582 -> 25 Dec 1582
-        Gr_Netherlands = Gr_Belgium, // (including Belgium) 1 Jan 1583
-
-        // this is too weird to take into account: the Gregorian calendar was
-        // introduced twice in Groningen, first time 28 Feb 1583 was followed
-        // by 11 Mar 1583, then it has gone back to Julian in the summer of
-        // 1584 and then 13 Dec 1700 -> 12 Jan 1701 - which is
-        // the date we take here
-        Gr_Netherlands_Groningen,  // 13 Dec 1700 -> 12 Jan 1701
-        Gr_Netherlands_Gelderland, // 30 Jun 1700 -> 12 Jul 1700
-        Gr_Netherlands_Utrecht,    // (and Overijssel) 30 Nov 1700->12 Dec 1700
-        Gr_Netherlands_Friesland,  // (and Drenthe) 31 Dec 1700 -> 12 Jan 1701
-
-        Gr_Norway = Gr_Denmark,       // Then part of Denmark
-        Gr_Poland = Gr_Standard,
-        Gr_Portugal = Gr_Standard,
-        Gr_Romania,                // 31 Mar 1919 -> 14 Apr 1919
-        Gr_Russia,                 // 31 Jan 1918 -> 14 Feb 1918
-        Gr_Scotland = Gr_GreatBritain,
-        Gr_Spain = Gr_Standard,
-
-        // Sweden has a curious history. Sweden decided to make a gradual
-        // change from the Julian to the Gregorian calendar. By dropping every
-        // leap year from 1700 through 1740 the eleven superfluous days would
-        // be omitted and from 1 Mar 1740 they would be in sync with the
-        // Gregorian calendar. (But in the meantime they would be in sync with
-        // nobody!)
-        //
-        // So 1700 (which should have been a leap year in the Julian calendar)
-        // was not a leap year in Sweden. However, by mistake 1704 and 1708
-        // became leap years. This left Sweden out of synchronisation with
-        // both the Julian and the Gregorian world, so they decided to go back
-        // to the Julian calendar. In order to do this, they inserted an extra
-        // day in 1712, making that year a double leap year! So in 1712,
-        // February had 30 days in Sweden.
-        //
-        // Later, in 1753, Sweden changed to the Gregorian calendar by
-        // dropping 11 days like everyone else.
-        Gr_Sweden = Gr_Finland,       // 17 Feb 1753 -> 1 Mar 1753
-
-        Gr_Switzerland = Gr_Unknown,// Different cantons used different dates
-        Gr_Switzerland_Catholic,    //      1583, 1584 or 1597 (we take 1584)
-        Gr_Switzerland_Protestant,  //      31 Dec 1700 -> 12 Jan 1701
-
-        Gr_Turkey,                 // 1 Jan 1927
-        Gr_USA = Gr_GreatBritain,
-        Gr_Wales = Gr_GreatBritain,
-        Gr_Yugoslavia              // 1919
-    };
-
         // the country parameter is used so far for calculating the start and
         // the end of DST period and for deciding whether the date is a work
         // day or not
@@ -408,7 +289,7 @@ public:
     // helper classes
     // ------------------------------------------------------------------------
 
-        // a class representing a time zone: basicly, this is just an offset
+        // a class representing a time zone: basically, this is just an offset
         // (in seconds) from GMT
     class WXDLLIMPEXP_BASE TimeZone
     {
@@ -693,7 +574,7 @@ public:
         // default assignment operator is ok
 
     // calendar calculations (functions which set the date only leave the time
-    // unchanged, e.g. don't explictly zero it): SetXXX() functions modify the
+    // unchanged, e.g. don't explicitly zero it): SetXXX() functions modify the
     // object itself, GetXXX() ones return a new object.
     // ------------------------------------------------------------------------
 
@@ -909,14 +790,6 @@ public:
         // because the holidays are different in different countries
     bool IsWorkDay(Country country = Country_Default) const;
 
-        // is this date later than Gregorian calendar introduction for the
-        // given country (see enum GregorianAdoption)?
-        //
-        // NB: this function shouldn't be considered as absolute authority in
-        //     the matter. Besides, for some countries the exact date of
-        //     adoption of the Gregorian calendar is simply unknown.
-    bool IsGregorianDate(GregorianAdoption country = Gr_Standard) const;
-
     // dos date and time format
     // ------------------------------------------------------------------------
 
@@ -1063,6 +936,8 @@ public:
     inline wxTimeSpan Subtract(const wxDateTime& dt) const;
     inline wxTimeSpan operator-(const wxDateTime& dt2) const;
 
+    wxDateSpan DiffAsDateSpan(const wxDateTime& dt) const;
+
     // conversion to/from text
     // ------------------------------------------------------------------------
 
@@ -1205,6 +1080,52 @@ public:
                                      : wxAnyStrPtr();
     }
 
+    // In addition to wxAnyStrPtr versions above we also must provide the
+    // overloads for C strings as we must return a pointer into the original
+    // string and not inside a temporary wxString which would have been created
+    // if the overloads above were used.
+    //
+    // And then we also have to provide the overloads for wxCStrData, as usual.
+    // Unfortunately those ones can't return anything as we don't have any
+    // sufficiently long-lived wxAnyStrPtr to return from them: any temporary
+    // strings it would point to would be destroyed when this function returns
+    // making it impossible to dereference the return value. So we just don't
+    // return anything from here which at least allows to keep compatibility
+    // with the code not testing the return value. Other uses of this method
+    // need to be converted to use one of the new bool-returning overloads
+    // above.
+    void ParseRfc822Date(const wxCStrData& date)
+        { ParseRfc822Date(wxString(date)); }
+    const char* ParseRfc822Date(const char* date);
+    const wchar_t* ParseRfc822Date(const wchar_t* date);
+
+    void ParseFormat(const wxCStrData& date,
+                     const wxString& format = wxDefaultDateTimeFormat,
+                     const wxDateTime& dateDef = wxDefaultDateTime)
+        { ParseFormat(wxString(date), format, dateDef); }
+    const char* ParseFormat(const char* date,
+                            const wxString& format = wxDefaultDateTimeFormat,
+                            const wxDateTime& dateDef = wxDefaultDateTime);
+    const wchar_t* ParseFormat(const wchar_t* date,
+                               const wxString& format = wxDefaultDateTimeFormat,
+                               const wxDateTime& dateDef = wxDefaultDateTime);
+
+    void ParseDateTime(const wxCStrData& datetime)
+        { ParseDateTime(wxString(datetime)); }
+    const char* ParseDateTime(const char* datetime);
+    const wchar_t* ParseDateTime(const wchar_t* datetime);
+
+    void ParseDate(const wxCStrData& date)
+        { ParseDate(wxString(date)); }
+    const char* ParseDate(const char* date);
+    const wchar_t* ParseDate(const wchar_t* date);
+
+    void ParseTime(const wxCStrData& time)
+        { ParseTime(wxString(time)); }
+    const char* ParseTime(const char* time);
+    const wchar_t* ParseTime(const wchar_t* time);
+
+
     // implementation
     // ------------------------------------------------------------------------
 
@@ -1531,6 +1452,8 @@ public:
     int GetYears() const { return m_years; }
         // get number of months
     int GetMonths() const { return m_months; }
+        // returns 12*GetYears() + GetMonths()
+    int GetTotalMonths() const { return 12*m_years + m_months; }
         // get number of weeks
     int GetWeeks() const { return m_weeks; }
         // get number of days
@@ -1731,9 +1654,16 @@ inline wxDateTime wxDateTime::Today()
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 inline wxDateTime& wxDateTime::Set(time_t timet)
 {
-    // assign first to avoid long multiplication overflow!
-    m_time = timet - WX_TIME_BASE_OFFSET ;
-    m_time *= TIME_T_FACTOR;
+    if ( timet == (time_t)-1 )
+    {
+        m_time = wxInvalidDateTime.m_time;
+    }
+    else
+    {
+        // assign first to avoid long multiplication overflow!
+        m_time = timet - WX_TIME_BASE_OFFSET;
+        m_time *= TIME_T_FACTOR;
+    }
 
     return *this;
 }
@@ -2069,9 +1999,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
 
 inline int wxTimeSpan::GetMinutes() const
 {
-    // explicit cast to int suppresses a warning with CodeWarrior and possibly
-    // others (changing the return type to long from int is impossible in 2.8)
-    return (int)((GetSeconds() / 60l).GetLo());
+    // For compatibility, this method (and the other accessors) return int,
+    // even though GetLo() actually returns unsigned long with greater range.
+    return static_cast<int>((GetSeconds() / 60l).GetLo());
 }
 
 inline int wxTimeSpan::GetHours() const
diff --git a/Externals/wxWidgets3/include/wx/datetimectrl.h b/Externals/wxWidgets3/include/wx/datetimectrl.h
index 8632d5f12e..30f23dfffe 100644
--- a/Externals/wxWidgets3/include/wx/datetimectrl.h
+++ b/Externals/wxWidgets3/include/wx/datetimectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxDateTimePickerCtrl class.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22
-// RCS-ID:      $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/datstrm.h b/Externals/wxWidgets3/include/wx/datstrm.h
index a3b99180c7..477da30ec6 100644
--- a/Externals/wxWidgets3/include/wx/datstrm.h
+++ b/Externals/wxWidgets3/include/wx/datstrm.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Mickael Gilabert
 // Created:     28/06/1998
-// RCS-ID:      $Id: datstrm.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,15 +17,64 @@
 
 #if wxUSE_STREAMS
 
-class WXDLLIMPEXP_BASE wxDataInputStream
+// Common wxDataInputStream and wxDataOutputStream parameters.
+class WXDLLIMPEXP_BASE wxDataStreamBase
 {
 public:
+    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
+
+    // By default we use extended precision (80 bit) format for both float and
+    // doubles. Call this function to switch to alternative representation in
+    // which IEEE 754 single precision (32 bits) is used for floats and double
+    // precision (64 bits) is used for doubles.
+    void UseBasicPrecisions()
+    {
+#if wxUSE_APPLE_IEEE
+        m_useExtendedPrecision = false;
+#endif // wxUSE_APPLE_IEEE
+    }
+
+    // UseExtendedPrecision() is not very useful as it corresponds to the
+    // default value, only call it in your code if you want the compilation
+    // fail with the error when using wxWidgets library compiled without
+    // extended precision support.
+#if wxUSE_APPLE_IEEE
+    void UseExtendedPrecision()
+    {
+        m_useExtendedPrecision = true;
+    }
+#endif // wxUSE_APPLE_IEEE
+
 #if wxUSE_UNICODE
-    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8 );
-#else
-    wxDataInputStream(wxInputStream& s);
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
 #endif
-    ~wxDataInputStream();
+
+protected:
+    // Ctor and dtor are both protected, this class is never used directly but
+    // only by its derived classes.
+    wxDataStreamBase(const wxMBConv& conv);
+    ~wxDataStreamBase();
+
+
+    bool m_be_order;
+
+#if wxUSE_APPLE_IEEE
+    bool m_useExtendedPrecision;
+#endif // wxUSE_APPLE_IEEE
+
+#if wxUSE_UNICODE
+    wxMBConv *m_conv;
+#endif
+
+    wxDECLARE_NO_COPY_CLASS(wxDataStreamBase);
+};
+
+
+class WXDLLIMPEXP_BASE wxDataInputStream : public wxDataStreamBase
+{
+public:
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8);
 
     bool IsOk() { return m_input->IsOk(); }
 
@@ -40,6 +88,7 @@ public:
     wxUint16 Read16();
     wxUint8 Read8();
     double ReadDouble();
+    float ReadFloat();
     wxString ReadString();
 
 #if wxHAS_INT64
@@ -58,6 +107,7 @@ public:
     void Read16(wxUint16 *buffer, size_t size);
     void Read8(wxUint8 *buffer, size_t size);
     void ReadDouble(double *buffer, size_t size);
+    void ReadFloat(float *buffer, size_t size);
 
     wxDataInputStream& operator>>(wxString& s);
     wxDataInputStream& operator>>(wxInt8& c);
@@ -74,35 +124,19 @@ public:
     wxDataInputStream& operator>>(wxULongLong& i);
     wxDataInputStream& operator>>(wxLongLong& i);
 #endif
-    wxDataInputStream& operator>>(double& i);
+    wxDataInputStream& operator>>(double& d);
     wxDataInputStream& operator>>(float& f);
 
-    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
-
-#if wxUSE_UNICODE
-    void SetConv( const wxMBConv &conv );
-    wxMBConv *GetConv() const { return m_conv; }
-#endif
-
 protected:
     wxInputStream *m_input;
-    bool m_be_order;
-#if wxUSE_UNICODE
-    wxMBConv *m_conv;
-#endif
 
     wxDECLARE_NO_COPY_CLASS(wxDataInputStream);
 };
 
-class WXDLLIMPEXP_BASE wxDataOutputStream
+class WXDLLIMPEXP_BASE wxDataOutputStream : public wxDataStreamBase
 {
 public:
-#if wxUSE_UNICODE
-    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8 );
-#else
-    wxDataOutputStream(wxOutputStream& s);
-#endif
-    ~wxDataOutputStream();
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8);
 
     bool IsOk() { return m_output->IsOk(); }
 
@@ -118,6 +152,7 @@ public:
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);
     void WriteDouble(double d);
+    void WriteFloat(float f);
     void WriteString(const wxString& string);
 
 #if wxHAS_INT64
@@ -136,6 +171,7 @@ public:
     void Write16(const wxUint16 *buffer, size_t size);
     void Write8(const wxUint8 *buffer, size_t size);
     void WriteDouble(const double *buffer, size_t size);
+    void WriteFloat(const float *buffer, size_t size);
 
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
@@ -152,22 +188,11 @@ public:
     wxDataOutputStream& operator<<(const wxULongLong &i);
     wxDataOutputStream& operator<<(const wxLongLong &i);
 #endif
-    wxDataOutputStream& operator<<(double f);
+    wxDataOutputStream& operator<<(double d);
     wxDataOutputStream& operator<<(float f);
 
-    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
-
-#if wxUSE_UNICODE
-    void SetConv( const wxMBConv &conv );
-    wxMBConv *GetConv() const { return m_conv; }
-#endif
-
 protected:
     wxOutputStream *m_output;
-    bool m_be_order;
-#if wxUSE_UNICODE
-    wxMBConv *m_conv;
-#endif
 
     wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);
 };
diff --git a/Externals/wxWidgets3/include/wx/dc.h b/Externals/wxWidgets3/include/wx/dc.h
index 2e66988c37..d13720500b 100644
--- a/Externals/wxWidgets3/include/wx/dc.h
+++ b/Externals/wxWidgets3/include/wx/dc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05/25/99
-// RCS-ID:      $Id: dc.h 68935 2011-08-27 23:26:53Z RD $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -283,6 +282,8 @@ public:
         return NULL;
     }
 
+    virtual void* GetHandle() const { return NULL; }
+    
     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;
@@ -431,8 +432,12 @@ public:
 
     // clipping
 
+    // Note that this pure virtual method has an implementation that updates
+    // the values returned by DoGetClippingBox() and so can be called from the
+    // derived class overridden version if it makes sense (i.e. if the clipping
+    // box coordinates are not already updated in some other way).
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height) = 0;
+                                     wxCoord w, wxCoord h) = 0;
 
     // NB: this function works with device coordinates, not the logical ones!
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0;
@@ -515,6 +520,8 @@ public:
 
     // this needs to overidden if the axis is inverted
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
+    
+    virtual double GetContentScaleFactor() const { return m_contentScaleFactor; }
 
 #ifdef __WXMSW__
     // Native Windows functions using the underlying HDC don't honour GDI+
@@ -598,15 +605,15 @@ public:
         { return wxNullBitmap; }
 
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset ) = 0;
     virtual void DrawLines(const wxPointList *list,
                            wxCoord xoffset, wxCoord yoffset );
 
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                            wxCoord xoffset, wxCoord yoffset,
                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE) = 0;
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+    virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle);
     void DrawPolygon(const wxPointList *list,
@@ -618,7 +625,7 @@ public:
     void DrawSpline(wxCoord x1, wxCoord y1,
                             wxCoord x2, wxCoord y2,
                             wxCoord x3, wxCoord y3);
-    void DrawSpline(int n, wxPoint points[]);
+    void DrawSpline(int n, const wxPoint points[]);
     void DrawSpline(const wxPointList *points) { DoDrawSpline(points); }
 
     virtual void DoDrawSpline(const wxPointList *points);
@@ -741,6 +748,8 @@ protected:
     double m_scaleX, m_scaleY;  // calculated from logical scale and user scale
 
     int m_signX, m_signY;  // Used by SetAxisOrientation() to invert the axes
+    
+    double m_contentScaleFactor; // used by high resolution displays (retina)
 
     // what is a mm on a screen you don't know the size of?
     double       m_mm_to_pix_x,
@@ -787,6 +796,9 @@ public:
     wxWindow *GetWindow() const
         { return m_pimpl->GetWindow(); }
 
+    void *GetHandle() const
+        { return m_pimpl->GetHandle(); }
+
     bool IsOk() const
         { return m_pimpl && m_pimpl->IsOk(); }
 
@@ -821,6 +833,9 @@ public:
     virtual int GetResolution() const
         { return m_pimpl->GetResolution(); }
 
+    double GetContentScaleFactor() const
+        { return m_pimpl->GetContentScaleFactor(); }
+
     // Right-To-Left (RTL) modes
 
     void SetLayoutDirection(wxLayoutDirection dir)
@@ -1130,7 +1145,7 @@ public:
     void DrawPoint(const wxPoint& pt)
         { m_pimpl->DoDrawPoint(pt.x, pt.y); }
 
-    void DrawLines(int n, wxPoint points[],
+    void DrawLines(int n, const wxPoint points[],
                    wxCoord xoffset = 0, wxCoord yoffset = 0)
         { m_pimpl->DoDrawLines(n, points, xoffset, yoffset); }
     void DrawLines(const wxPointList *list,
@@ -1141,7 +1156,7 @@ public:
                                  wxCoord xoffset = 0, wxCoord yoffset = 0) );
 #endif  // WXWIN_COMPATIBILITY_2_8
 
-    void DrawPolygon(int n, wxPoint points[],
+    void DrawPolygon(int n, const wxPoint points[],
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
         { m_pimpl->DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); }
@@ -1149,7 +1164,7 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
         { m_pimpl->DrawPolygon( list, xoffset, yoffset, fillStyle ); }
-    void DrawPolyPolygon(int n, int count[], wxPoint points[],
+    void DrawPolyPolygon(int n, const int count[], const wxPoint points[],
                          wxCoord xoffset = 0, wxCoord yoffset = 0,
                          wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
         { m_pimpl->DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
@@ -1272,7 +1287,7 @@ public:
                     wxCoord x2, wxCoord y2,
                     wxCoord x3, wxCoord y3)
         { m_pimpl->DrawSpline(x1,y1,x2,y2,x3,y3); }
-    void DrawSpline(int n, wxPoint points[])
+    void DrawSpline(int n, const wxPoint points[])
         { m_pimpl->DrawSpline(n,points); }
     void DrawSpline(const wxPointList *points)
         { m_pimpl->DrawSpline(points); }
diff --git a/Externals/wxWidgets3/include/wx/dcbuffer.h b/Externals/wxWidgets3/include/wx/dcbuffer.h
index 5e150eca83..f4d27c7fb8 100644
--- a/Externals/wxWidgets3/include/wx/dcbuffer.h
+++ b/Externals/wxWidgets3/include/wx/dcbuffer.h
@@ -4,7 +4,6 @@
 // Author:      Ron Lee <ron@debian.org>
 // Modified by: Vadim Zeitlin (refactored, added bg preservation)
 // Created:     16/03/02
-// RCS-ID:      $Id: dcbuffer.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Ron Lee
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -134,6 +133,8 @@ private:
     // the buffering style
     int m_style;
 
+    wxSize m_area;
+    
     DECLARE_DYNAMIC_CLASS(wxBufferedDC)
     wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
 };
diff --git a/Externals/wxWidgets3/include/wx/dcclient.h b/Externals/wxWidgets3/include/wx/dcclient.h
index c036a7d3ad..f4bf74f75f 100644
--- a/Externals/wxWidgets3/include/wx/dcclient.h
+++ b/Externals/wxWidgets3/include/wx/dcclient.h
@@ -3,7 +3,6 @@
 // Purpose:     wxClientDC base header
 // Author:      Julian Smart
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dcclient.h 50385 2007-11-30 20:56:12Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dcgraph.h b/Externals/wxWidgets3/include/wx/dcgraph.h
index b636f239de..06cca91298 100644
--- a/Externals/wxWidgets3/include/wx/dcgraph.h
+++ b/Externals/wxWidgets3/include/wx/dcgraph.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id: dcgraph.h 68935 2011-08-27 23:26:53Z RD $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -68,9 +67,6 @@ public:
 
     virtual ~wxGCDCImpl();
 
-    void Init();
-
-
     // implement base class pure virtuals
     // ----------------------------------
 
@@ -102,8 +98,6 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-    virtual void SetMapMode(wxMappingMode mode);
-
     virtual void SetLogicalFunction(wxRasterOperationMode function);
 
     virtual void SetTextForeground(const wxColour& colour);
@@ -114,6 +108,8 @@ public:
     wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
+    virtual void* GetHandle() const;
+
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);
@@ -180,12 +176,12 @@ public:
     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+    virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
                                    wxPolygonFillMode fillStyle);
 
@@ -206,9 +202,12 @@ public:
 #endif // __WXMSW__
 
 protected:
+    // unused int parameter distinguishes this version, which does not create a
+    // wxGraphicsContext, in the expectation that the derived class will do it
+    wxGCDCImpl(wxDC* owner, int);
+
     // scaling variables
     bool m_logicalFunctionSupported;
-    double       m_mm_to_pix_x, m_mm_to_pix_y;
     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;
 
@@ -216,6 +215,9 @@ protected:
 
     wxGraphicsContext* m_graphicContext;
 
+private:
+    void Init(wxGraphicsContext*);
+
     DECLARE_CLASS(wxGCDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };
diff --git a/Externals/wxWidgets3/include/wx/dcmemory.h b/Externals/wxWidgets3/include/wx/dcmemory.h
index 80f21e69d6..d5f301c942 100644
--- a/Externals/wxWidgets3/include/wx/dcmemory.h
+++ b/Externals/wxWidgets3/include/wx/dcmemory.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dcmemory.h 61724 2009-08-21 10:41:26Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dcmirror.h b/Externals/wxWidgets3/include/wx/dcmirror.h
index f6667d7c8f..42deb9771c 100644
--- a/Externals/wxWidgets3/include/wx/dcmirror.h
+++ b/Externals/wxWidgets3/include/wx/dcmirror.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.07.2003
-// RCS-ID:      $Id: dcmirror.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -66,6 +65,9 @@ public:
     virtual void SetLogicalFunction(wxRasterOperationMode function)
         { m_dc.SetLogicalFunction(function); }
 
+    virtual void* GetHandle() const
+        { return m_dc.GetHandle(); }
+
 protected:
     // returns x and y if not mirroring or y and x if mirroring
     wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; }
@@ -79,27 +81,23 @@ protected:
     wxCoord *GetX(wxCoord *x, wxCoord *y) const { return m_mirror ? y : x; }
     wxCoord *GetY(wxCoord *x, wxCoord *y) const { return m_mirror ? x : y; }
 
-    // exchange x and y unconditionally
-    static void Swap(wxCoord& x, wxCoord& y)
-    {
-        wxCoord t = x;
-        x = y;
-        y = t;
-    }
-
     // exchange x and y components of all points in the array if necessary
-    void Mirror(int n, wxPoint points[]) const
+    wxPoint* Mirror(int n, const wxPoint*& points) const
     {
+        wxPoint* points_alloc = NULL;
         if ( m_mirror )
         {
+            points_alloc = new wxPoint[n];
             for ( int i = 0; i < n; i++ )
             {
-                Swap(points[i].x, points[i].y);
+                points_alloc[i].x = points[i].y;
+                points_alloc[i].y = points[i].x;
             }
+            points = points_alloc;
         }
+        return points_alloc;
     }
 
-
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE)
@@ -223,28 +221,28 @@ protected:
         m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h));
     }
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset)
     {
-        Mirror(n, points);
+        wxPoint* points_alloc = Mirror(n, points);
 
         m_dc.DoDrawLines(n, points,
                          GetX(xoffset, yoffset), GetY(xoffset, yoffset));
 
-        Mirror(n, points);
+        delete[] points_alloc;
     }
 
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
     {
-        Mirror(n, points);
+        wxPoint* points_alloc = Mirror(n, points);
 
         m_dc.DoDrawPolygon(n, points,
                            GetX(xoffset, yoffset), GetY(xoffset, yoffset),
                            fillStyle);
 
-        Mirror(n, points);
+        delete[] points_alloc;
     }
 
     virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
diff --git a/Externals/wxWidgets3/include/wx/dcprint.h b/Externals/wxWidgets3/include/wx/dcprint.h
index b1b563c775..6d84731116 100644
--- a/Externals/wxWidgets3/include/wx/dcprint.h
+++ b/Externals/wxWidgets3/include/wx/dcprint.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dcprint.h 56783 2008-11-15 11:10:34Z FM $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dcps.h b/Externals/wxWidgets3/include/wx/dcps.h
index 2615d33243..659eb595f1 100644
--- a/Externals/wxWidgets3/include/wx/dcps.h
+++ b/Externals/wxWidgets3/include/wx/dcps.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dcps.h 33948 2005-05-04 18:57:50Z JS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dcscreen.h b/Externals/wxWidgets3/include/wx/dcscreen.h
index 85ceb8dd82..391e91aacf 100644
--- a/Externals/wxWidgets3/include/wx/dcscreen.h
+++ b/Externals/wxWidgets3/include/wx/dcscreen.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dcscreen.h 61724 2009-08-21 10:41:26Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dcsvg.h b/Externals/wxWidgets3/include/wx/dcsvg.h
index 2321a227eb..c6485ff131 100644
--- a/Externals/wxWidgets3/include/wx/dcsvg.h
+++ b/Externals/wxWidgets3/include/wx/dcsvg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Chris Elliott
-// RCS-ID:      $Id: dcsvg.h 61724 2009-08-21 10:41:26Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -54,10 +53,7 @@ public:
         wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
     }
 
-    virtual void DestroyClippingRegion()
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::void Call not yet implemented"));
-    }
+    virtual void DestroyClippingRegion();
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
@@ -96,6 +92,8 @@ public:
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
 
+    virtual void* GetHandle() const { return NULL; }
+
 private:
    virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
    {
@@ -127,12 +125,12 @@ private:
 
    virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 
-   virtual void DoDrawLines(int n, wxPoint points[],
+   virtual void DoDrawLines(int n, const wxPoint points[],
                             wxCoord xoffset = 0, wxCoord yoffset = 0);
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 
-   virtual void DoDrawPolygon(int n, wxPoint points[],
+   virtual void DoDrawPolygon(int n, const wxPoint points[],
                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 
@@ -173,10 +171,7 @@ private:
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented"));
    }
 
-   virtual void DoSetClippingRegion( int WXUNUSED(x),  int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegion not yet implemented"));
-   }
+   virtual void DoSetClippingRegion(int x,  int y, int width, int height);
 
    virtual void DoGetSizeMM( int *width, int *height ) const;
 
@@ -184,20 +179,33 @@ private:
 
    void Init (const wxString &filename, int width, int height, double dpi);
 
-   void NewGraphics();
-
    void write( const wxString &s );
 
 private:
+   // If m_graphics_changed is true, close the current <g> element and start a
+   // new one for the last pen/brush change.
+   void NewGraphicsIfNeeded();
+
+   // Open a new graphics group setting up all the attributes according to
+   // their current values in wxDC.
+   void DoStartNewGraphics();
+
    wxFileOutputStream *m_outfile;
    wxString            m_filename;
    int                 m_sub_images; // number of png format images we have
    bool                m_OK;
-   bool                m_graphics_changed;
+   bool                m_graphics_changed;  // set by Set{Brush,Pen}()
    int                 m_width, m_height;
    double              m_dpi;
 
-private:
+   // The clipping nesting level is incremented by every call to
+   // SetClippingRegion() and reset when DestroyClippingRegion() is called.
+   size_t m_clipNestingLevel;
+
+   // Unique ID for every clipping graphics group: this is simply always
+   // incremented in each SetClippingRegion() call.
+   size_t m_clipUniqueId;
+
    DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/dde.h b/Externals/wxWidgets3/include/wx/dde.h
index 1c15a1f3ce..d6524e1ff6 100644
--- a/Externals/wxWidgets3/include/wx/dde.h
+++ b/Externals/wxWidgets3/include/wx/dde.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dde.h 70808 2012-03-04 20:31:42Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/debug.h b/Externals/wxWidgets3/include/wx/debug.h
index 589ae85f67..f80f7be680 100644
--- a/Externals/wxWidgets3/include/wx/debug.h
+++ b/Externals/wxWidgets3/include/wx/debug.h
@@ -3,7 +3,6 @@
 // Purpose:     Misc debug functions and macros
 // Author:      Vadim Zeitlin
 // Created:     29/01/98
-// RCS-ID:      $Id: debug.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -178,28 +177,28 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
 //
 // also notice that these functions can't be inline as wxString is not defined
 // yet (and can't be as wxString code itself may use assertions)
-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
                                         int line,
                                         const char *func,
                                         const char *cond);
 
-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const char *msg);
 
-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
                                         int line,
                                         const char *func,
                                         const char *cond,
-                                        const wxChar *msg);
+                                        const wxChar *msg) ;
 #endif /* wxUSE_UNICODE */
 
 // this version is for compatibility with wx 2.8 Unicode build only, we don't
 // use it ourselves any more except in ANSI-only build in which case it is all
 // we need
-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file,
                                         int line,
                                         const char *func,
                                         const wxChar *cond,
@@ -208,24 +207,24 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *file,
 // these overloads work when msg passed to debug macro is a string and we
 // also have to provide wxCStrData overload to resolve ambiguity which would
 // otherwise arise from wxASSERT( s.c_str() )
-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
                                         int line,
                                         const wxString& func,
                                         const wxString& cond,
                                         const wxString& msg);
 
-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
                                         int line,
                                         const wxString& func,
                                         const wxString& cond);
 
-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const wxCStrData& msg);
 
-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
                                         int line,
                                         const char *func,
                                         const char *cond,
@@ -251,22 +250,41 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
     this macro only does anything if wxDEBUG_LEVEL >= 2.
  */
 #if wxDEBUG_LEVEL
-    // call this function to break into the debugger unconditionally (assuming
-    // the program is running under debugger, of course)
-    extern void WXDLLIMPEXP_BASE wxTrap();
-
-    // assert checks if the condition is true and calls the assert handler with
-    // the provided message if it isn't
+    // wxTrap() can be used to break into the debugger unconditionally
+    // (assuming the program is running under debugger, of course).
     //
-    // NB: the macro is defined like this to ensure that nested if/else
-    //     statements containing it are compiled in the same way whether it is
-    //     defined as empty or not; also notice that we can't use ";" instead
-    //     of "{}" as some compilers warn about "possible unwanted ;" then
+    // If possible, we prefer to define it as a macro rather than as a function
+    // to open the debugger at the position where we trapped and not inside the
+    // trap function itself which is not very useful.
+    #if wxCHECK_VISUALC_VERSION(7)
+        #define wxTrap() __debugbreak()
+    #else
+        extern WXDLLIMPEXP_BASE void wxTrap();
+    #endif // Win VisualC
+
+    // Global flag used to indicate that assert macros should call wxTrap(): it
+    // is set by the default assert handler if the user answers yes to the
+    // question of whether to trap.
+    extern WXDLLIMPEXP_DATA_BASE(bool) wxTrapInAssert;
+
+    // This macro checks if the condition is true and calls the assert handler
+    // with the provided message if it isn't and finally traps if the special
+    // flag indicating that it should do it was set by the handler.
+    //
+    // Notice that we don't use the handler return value for compatibility
+    // reasons (if we changed its return type, we'd need to change wxApp::
+    // OnAssertFailure() too which would break user code overriding it), hence
+    // the need for the ugly global flag.
     #define wxASSERT_MSG(cond, msg)                                           \
-        if ( !wxTheAssertHandler || (cond) )                                  \
-        {}                                                                    \
-        else                                                                  \
-            wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg)
+        wxSTATEMENT_MACRO_BEGIN                                               \
+            if ( wxTheAssertHandler && !(cond) &&                             \
+                    (wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__,           \
+                                #cond, msg), wxTrapInAssert) )                \
+            {                                                                 \
+                wxTrapInAssert = false;                                       \
+                wxTrap();                                                     \
+            }                                                                 \
+        wxSTATEMENT_MACRO_END
 
     // a version without any additional message, don't use unless condition
     // itself is fully self-explanatory
@@ -274,11 +292,17 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
 
     // wxFAIL is a special form of assert: it always triggers (and so is
     // usually used in normally unreachable code)
-    #define wxFAIL_COND_MSG(cond, msg) \
-        if ( !wxTheAssertHandler )                                            \
-        {}                                                                    \
-        else                                                                  \
-            wxOnAssert(__FILE__, __LINE__,  __WXFUNCTION__, cond, msg)
+    #define wxFAIL_COND_MSG(cond, msg)                                        \
+        wxSTATEMENT_MACRO_BEGIN                                               \
+            if ( wxTheAssertHandler &&                                        \
+                    (wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__,           \
+                                cond, msg), wxTrapInAssert) )                \
+            {                                                                 \
+                wxTrapInAssert = false;                                       \
+                wxTrap();                                                     \
+            }                                                                 \
+        wxSTATEMENT_MACRO_END
+
     #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("Assert failure", msg)
     #define wxFAIL wxFAIL_MSG((const char*)NULL)
 #else // !wxDEBUG_LEVEL
@@ -437,10 +461,9 @@ template<int x> struct static_assert_test{};
 /*
     Return true if we're running under debugger.
 
-    Currently this only really works under Win32 and Mac in CodeWarrior builds,
-    it always returns false in other cases.
+    Currently only really works under Win32 and just returns false elsewhere.
  */
-#if defined(__WXMAC__) || defined(__WIN32__)
+#if defined(__WIN32__)
     extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
 #else // !Mac
     inline bool wxIsDebuggerRunning() { return false; }
diff --git a/Externals/wxWidgets3/include/wx/debugrpt.h b/Externals/wxWidgets3/include/wx/debugrpt.h
index 4aae1055a1..421bede975 100644
--- a/Externals/wxWidgets3/include/wx/debugrpt.h
+++ b/Externals/wxWidgets3/include/wx/debugrpt.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxDebugReport class
 // Author:      Vadim Zeitlin
 // Created:     2005-01-17
-// RCS-ID:      $Id: debugrpt.h 61663 2009-08-14 00:06:03Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/defs.h b/Externals/wxWidgets3/include/wx/defs.h
index 27e685a535..48a823c7b9 100644
--- a/Externals/wxWidgets3/include/wx/defs.h
+++ b/Externals/wxWidgets3/include/wx/defs.h
@@ -4,7 +4,6 @@
  *  Author:      Julian Smart and others
  *  Modified by: Ryan Norton (Converted to C)
  *  Created:     01/02/97
- *  RCS-ID:      $Id: defs.h 70353 2012-01-15 14:46:41Z VZ $
  *  Copyright:   (c) Julian Smart
  *  Licence:     wxWindows licence
  */
@@ -30,7 +29,7 @@
 #ifdef __cplusplus
 /*  Make sure the environment is set correctly */
 #   if defined(__WXMSW__) && defined(__X__)
-#       error "Target can't be both X and Windows"
+#       error "Target can't be both X and MSW"
 #   elif !defined(__WXMOTIF__) && \
          !defined(__WXMSW__)   && \
          !defined(__WXGTK__)   && \
@@ -175,6 +174,18 @@
 #   define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name)
 #endif
 
+/*
+   Clang Support
+ */
+ 
+#ifndef WX_HAS_CLANG_FEATURE
+#   ifndef __has_feature      
+#       define WX_HAS_CLANG_FEATURE(x) 0 
+#   else
+#       define WX_HAS_CLANG_FEATURE(x) __has_feature(x)
+#   endif
+#endif
+
 /*  ---------------------------------------------------------------------------- */
 /*  wxWidgets version and compatibility defines */
 /*  ---------------------------------------------------------------------------- */
@@ -205,7 +216,7 @@
 
 /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
 /* when using Windows sockets. */
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) && defined(__WXMSW__)
 #define __USE_W32_SOCKETS
 #endif
 
@@ -252,9 +263,6 @@ typedef short int WXTYPE;
     #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
         /*  BC++ 4.52 doesn't support explicit, CBuilder 1 does */
         #define HAVE_EXPLICIT
-    #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
-        /*  Metrowerks CW6 or higher has explicit */
-        #define HAVE_EXPLICIT
     #elif defined(__DIGITALMARS__)
         #define HAVE_EXPLICIT
     #elif defined(__WATCOMC__)
@@ -302,8 +310,10 @@ typedef short int WXTYPE;
     inline T wx_truncate_cast_impl(X x)
     {
         #pragma warning(push)
-        /* conversion from 'X' to 'T', possible loss of data */
+        /* conversion from 'size_t' to 'type', possible loss of data */
         #pragma warning(disable: 4267)
+        /* conversion from 'type1' to 'type2', possible loss of data */
+        #pragma warning(disable: 4242)
 
         return x;
 
@@ -347,6 +357,32 @@ typedef short int WXTYPE;
     #endif
 #endif
 
+#if defined(__has_include)
+    #if !defined(HAVE_TYPE_TRAITS) && __has_include(<type_traits>)
+        #define HAVE_TYPE_TRAITS
+    #endif
+
+    #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)
+        #define HAVE_TR1_TYPE_TRAITS
+    #endif
+
+    #if !defined(HAVE_STD_UNORDERED_MAP) && __has_include(<unordered_map>)
+        #define HAVE_STD_UNORDERED_MAP
+    #endif
+
+    #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
+        #define HAVE_TR1_UNORDERED_MAP
+    #endif
+
+    #if !defined(HAVE_STD_UNORDERED_SET) && __has_include(<unordered_set>)
+        #define HAVE_STD_UNORDERED_SET
+    #endif
+
+    #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
+        #define HAVE_TR1_UNORDERED_SET
+    #endif
+#endif // defined(__has_include)
+
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */
 
 /* could be already defined by configure or the user */
@@ -390,13 +426,6 @@ typedef short int WXTYPE;
     #endif /* va_copy/!va_copy */
 #endif /* wxVaCopy */
 
-#ifndef HAVE_VARIADIC_MACROS
-    #if wxCHECK_WATCOM_VERSION(1,2)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-#endif /* HAVE_VARIADIC_MACROS */
-
-
 #ifndef HAVE_WOSTREAM
     /*
         Mingw <= 3.4 and all versions of Cygwin don't have std::wostream
@@ -461,7 +490,7 @@ typedef short int WXTYPE;
     #define wxSTDCALL
 #endif /*  platform */
 
-/*  LINKAGEMODE mode is empty for everyting except OS/2 */
+/*  LINKAGEMODE mode is empty for everything except OS/2 */
 #ifndef LINKAGEMODE
     #define LINKAGEMODE
 #endif /*  LINKAGEMODE */
@@ -513,16 +542,71 @@ typedef short int WXTYPE;
 #   define WX_ATTRIBUTE_PRINTF_5 WX_ATTRIBUTE_PRINTF(5, 6)
 #endif /* !defined(WX_ATTRIBUTE_PRINTF) */
 
-
-/*  Macro to issue warning when using deprecated functions with gcc3 or MSVC7: */
-#if wxCHECK_GCC_VERSION(3, 1)
-    #define wxDEPRECATED(x) __attribute__((deprecated)) x
-#elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
-    #define wxDEPRECATED(x) __declspec(deprecated) x
-#else
-    #define wxDEPRECATED(x) x
+#ifndef WX_ATTRIBUTE_NORETURN
+#   if WX_HAS_CLANG_FEATURE(attribute_analyzer_noreturn)
+#       define WX_ATTRIBUTE_NORETURN __attribute__((analyzer_noreturn))
+#   elif defined( __GNUC__ )
+#       define WX_ATTRIBUTE_NORETURN __attribute__ ((noreturn))
+#   elif wxCHECK_VISUALC_VERSION(7)
+#       define WX_ATTRIBUTE_NORETURN __declspec(noreturn)
+#   else
+#       define WX_ATTRIBUTE_NORETURN
+#   endif
 #endif
 
+#if defined(__GNUC__)
+    #define WX_ATTRIBUTE_UNUSED __attribute__ ((unused))
+#else
+    #define WX_ATTRIBUTE_UNUSED
+#endif
+
+/*
+    Macros for marking functions as being deprecated.
+
+    The preferred macro in the new code is wxDEPRECATED_MSG() which allows to
+    explain why is the function deprecated. Almost all the existing code uses
+    the older wxDEPRECATED() or its variants currently, but this will hopefully
+    change in the future.
+ */
+
+/* The basic compiler-specific construct to generate a deprecation warning. */
+#ifdef __clang__
+    #define wxDEPRECATED_DECL __attribute__((deprecated))
+#elif wxCHECK_GCC_VERSION(3, 1)
+    #define wxDEPRECATED_DECL __attribute__((deprecated))
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
+    #define wxDEPRECATED_DECL __declspec(deprecated)
+#else
+    #define wxDEPRECATED_DECL
+#endif
+
+/*
+    Macro taking the deprecation message. It applies to the next declaration.
+
+    If the compiler doesn't support showing the message, this degrades to a
+    simple wxDEPRECATED(), i.e. at least gives a warning, if possible.
+ */
+#if defined(__clang__) && defined(__has_extension)
+    #if __has_extension(attribute_deprecated_with_message)
+        #define wxDEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
+    #else
+        #define wxDEPRECATED_MSG(msg) __attribute__((deprecated))
+    #endif
+#elif wxCHECK_GCC_VERSION(4, 5)
+    #define wxDEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
+#elif wxCHECK_VISUALC_VERSION(8)
+    #define wxDEPRECATED_MSG(msg) __declspec(deprecated("deprecated: " msg))
+#else
+    #define wxDEPRECATED_MSG(msg) wxDEPRECATED_DECL
+#endif
+
+/*
+    Macro taking the declaration that it deprecates. Prefer to use
+    wxDEPRECATED_MSG() instead as it's simpler (wrapping the entire declaration
+    makes the code unclear) and allows to specify the explanation.
+ */
+#define wxDEPRECATED(x) wxDEPRECATED_DECL x
+
 #if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4)
     /*
         We need to add dummy "inline" to allow gcc < 3.4 to handle the
@@ -559,6 +643,27 @@ typedef short int WXTYPE;
 #   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
 #endif
 
+/*
+   Macros to suppress and restore gcc warnings, requires g++ >= 4.6 and don't
+   do anything otherwise.
+
+   Example of use:
+
+        wxGCC_WARNING_SUPPRESS(float-equal)
+        inline bool wxIsSameDouble(double x, double y) { return x == y; }
+        wxGCC_WARNING_RESTORE(float-equal)
+ */
+#if wxCHECK_GCC_VERSION(4, 6)
+#   define wxGCC_WARNING_SUPPRESS(x) \
+        _Pragma (wxSTRINGIZE(GCC diagnostic push)) \
+        _Pragma (wxSTRINGIZE(GCC diagnostic ignored wxSTRINGIZE(wxCONCAT(-W,x))))
+#   define wxGCC_WARNING_RESTORE(x) \
+       _Pragma (wxSTRINGIZE(GCC diagnostic pop))
+#else /* gcc < 4.6 or not gcc at all */
+#   define wxGCC_WARNING_SUPPRESS(x)
+#   define wxGCC_WARNING_RESTORE(x)
+#endif
+
 /*
     Combination of the two variants above: should be used for deprecated
     functions which are defined inline and are used by wxWidgets itself.
@@ -577,14 +682,6 @@ typedef short int WXTYPE;
 #include <stddef.h>
 #endif
 
-
-#if defined(__GNUC__)
-    #define WX_ATTRIBUTE_UNUSED __attribute__ ((unused))
-#else
-    #define WX_ATTRIBUTE_UNUSED
-#endif
-
-
 #ifdef __cplusplus
 
 // everybody gets the assert and other debug macros
@@ -657,9 +754,13 @@ typedef short int WXTYPE;
     m(==,x,y,z) m(!=,x,y,z) m(>=,x,y,z) m(<=,x,y,z) m(>,x,y,z) m(<,x,y,z)
 
 /*
-    This is only used with wxDEFINE_COMPARISON_REV: it passes both the normal
-    and the reversed comparison operators to the macro.
+    These are only used with wxDEFINE_COMPARISON_[BY_]REV: they pass both the
+    normal and the reversed comparison operators to the macro.
  */
+#define wxFOR_ALL_COMPARISONS_2_REV(m, x, y) \
+    m(==,x,y,==) m(!=,x,y,!=) m(>=,x,y,<=) \
+    m(<=,x,y,>=) m(>,x,y,<) m(<,x,y,>)
+
 #define wxFOR_ALL_COMPARISONS_3_REV(m, x, y, z) \
     m(==,x,y,z,==) m(!=,x,y,z,!=) m(>=,x,y,z,<=) \
     m(<=,x,y,z,>=) m(>,x,y,z,<) m(<,x,y,z,>)
@@ -671,6 +772,9 @@ typedef short int WXTYPE;
 #define wxDEFINE_COMPARISON_REV(op, T1, T2, cmp, oprev) \
     inline bool operator op(T2 y, T1 x) { return cmp(x, y, oprev); }
 
+#define wxDEFINE_COMPARISON_BY_REV(op, T1, T2, oprev) \
+    inline bool operator op(T1 x, T2 y) { return y oprev x; }
+
 /*
     Define all 6 comparison operators (==, !=, <, <=, >, >=) for the given
     types in the specified order. The implementation is provided by the cmp
@@ -680,6 +784,14 @@ typedef short int WXTYPE;
 #define wxDEFINE_COMPARISONS(T1, T2, cmp) \
     wxFOR_ALL_COMPARISONS_3(wxDEFINE_COMPARISON, T1, T2, cmp)
 
+/*
+    Define all 6 comparison operators (==, !=, <, <=, >, >=) for the given
+    types in the specified order, implemented in terms of existing operators
+    for the reverse order.
+ */
+#define wxDEFINE_COMPARISONS_BY_REV(T1, T2) \
+    wxFOR_ALL_COMPARISONS_2_REV(wxDEFINE_COMPARISON_BY_REV, T1, T2)
+
 /*
     This macro allows to define all 12 comparison operators (6 operators for
     both orders of arguments) for the given types using the provided "cmp"
@@ -748,13 +860,6 @@ typedef short int WXTYPE;
 /*  compiler specific settings */
 /*  ---------------------------------------------------------------------------- */
 
-#if defined(__MWERKS__)
-    #undef try
-    #undef except
-    #undef finally
-    #define except(x) catch(...)
-#endif /*  Metrowerks */
-
 #if wxONLY_WATCOM_EARLIER_THAN(1,4)
     typedef short mode_t;
 #endif
@@ -762,13 +867,10 @@ typedef short int WXTYPE;
 /*  where should i put this? we need to make sure of this as it breaks */
 /*  the <iostream> code. */
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
-#  ifndef __MWERKS__
-/*  #undef __WXDEBUG__ */
 #    ifdef wxUSE_DEBUG_NEW_ALWAYS
 #    undef wxUSE_DEBUG_NEW_ALWAYS
 #    define wxUSE_DEBUG_NEW_ALWAYS 0
 #    endif
-#  endif
 #endif
 
 /*  ---------------------------------------------------------------------------- */
@@ -785,9 +887,7 @@ enum {  wxDefaultCoord = -1 };
 /*  ---------------------------------------------------------------------------- */
 
 #if defined(__MINGW32__)
-  #if !defined(__MWERKS__)
     #include <sys/types.h>
-  #endif
 #endif
 
 /*  chars are always one byte (by definition), shorts are always two (in */
@@ -853,6 +953,10 @@ typedef wxUint16 wxWord;
             #define SIZEOF_LONG 4
         #endif
 
+        #ifndef SIZEOF_LONG_LONG
+            #define SIZEOF_LONG_LONG 8
+        #endif
+
         #ifndef SIZEOF_WCHAR_T
             /* Windows uses UTF-16 */
             #define SIZEOF_WCHAR_T 2
@@ -994,7 +1098,7 @@ typedef wxUint32 wxDword;
    architectures to be able to pass wxLongLong_t to the standard functions
    prototyped as taking "long long" such as strtoll().
  */
-#if (defined(__VISUALC__) && defined(__WIN32__))
+#if (defined(__VISUALC__) || defined(__INTELC__)) && defined(__WIN32__)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec "I64"
@@ -1014,15 +1118,6 @@ typedef wxUint32 wxDword;
     #define wxLongLong_t long long
     #define wxLongLongSuffix ll
     #define wxLongLongFmtSpec "I64"
-#elif defined(__MWERKS__)
-    #if __option(longlong)
-        #define wxLongLong_t long long
-        #define wxLongLongSuffix ll
-        #define wxLongLongFmtSpec "ll"
-    #else
-        #error "The 64 bit integer support in CodeWarrior has been disabled."
-        #error "See the documentation on the 'longlong' pragma."
-    #endif
 #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
     #define wxLongLong_t long long
 #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
@@ -1084,6 +1179,17 @@ typedef wxUint32 wxDword;
 
 #endif
 
+/*
+    Helper macro for conditionally compiling some code only if wxLongLong_t is
+    available and is a type different from the other integer types (i.e. not
+    long).
+ */
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+    #define wxIF_LONG_LONG_TYPE(x) x
+#else
+    #define wxIF_LONG_LONG_TYPE(x)
+#endif
+
 
 /* Make sure ssize_t is defined (a signed type the same size as size_t). */
 /* (HAVE_SSIZE_T is not already defined by configure) */
@@ -1122,7 +1228,9 @@ typedef wxUint32 wxDword;
     each time we cast it to a pointer or a handle (which results in hundreds
     of warnings as Win32 API often passes pointers in them)
  */
-#if wxCHECK_VISUALC_VERSION(7)
+// (dolphin-emu) Just disable __w64 usage. It's not meant to be used anymore,
+// even on 32bit builds.
+#if 0
     #define wxW64 __w64
 #else
     #define wxW64
@@ -1216,11 +1324,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 /*            calculations */
 
 typedef float wxFloat32;
-#if (defined( __WXMAC__ ) || defined(__WXCOCOA__))  && defined (__MWERKS__)
-    typedef short double wxFloat64;
-#else
-    typedef double wxFloat64;
-#endif
+typedef double wxFloat64;
 
 typedef double wxDouble;
 
@@ -1280,6 +1384,63 @@ typedef double wxDouble;
 #endif
 
 
+/*
+    Helper macro expanding into the given "m" macro invoked with each of the
+    integer types as parameter (notice that this does not include char/unsigned
+    char and bool but does include wchar_t).
+ */
+#define wxDO_FOR_INT_TYPES(m) \
+    m(short) \
+    m(unsigned short) \
+    m(int) \
+    m(unsigned int) \
+    m(long) \
+    m(unsigned long) \
+    wxIF_LONG_LONG_TYPE( m(wxLongLong_t) ) \
+    wxIF_LONG_LONG_TYPE( m(wxULongLong_t) ) \
+    wxIF_WCHAR_T_TYPE( m(wchar_t) )
+
+/*
+    Same as wxDO_FOR_INT_TYPES() but does include char and unsigned char.
+
+    Notice that we use "char" and "unsigned char" here but not "signed char"
+    which would be more correct as "char" could be unsigned by default. But
+    wxWidgets code currently supposes that char is signed and we'd need to
+    clean up assumptions about it, notably in wx/unichar.h, to be able to use
+    "signed char" here.
+ */
+#define wxDO_FOR_CHAR_INT_TYPES(m) \
+    m(char) \
+    m(unsigned char) \
+    wxDO_FOR_INT_TYPES(m)
+
+/*
+    Same as wxDO_FOR_INT_TYPES() above except that m macro takes the
+    type as the first argument and some extra argument, passed from this macro
+    itself, as the second one.
+ */
+#define wxDO_FOR_INT_TYPES_1(m, arg) \
+    m(short, arg) \
+    m(unsigned short, arg) \
+    m(int, arg) \
+    m(unsigned int, arg) \
+    m(long, arg) \
+    m(unsigned long, arg) \
+    wxIF_LONG_LONG_TYPE( m(wxLongLong_t, arg) ) \
+    wxIF_LONG_LONG_TYPE( m(wxULongLong_t, arg) ) \
+    wxIF_WCHAR_T_TYPE( m(wchar_t, arg) )
+
+/*
+    Combination of wxDO_FOR_CHAR_INT_TYPES() and wxDO_FOR_INT_TYPES_1():
+    invokes the given macro with the specified argument as its second parameter
+    for all char and int types.
+ */
+#define wxDO_FOR_CHAR_INT_TYPES_1(m, arg) \
+    m(char, arg) \
+    m(unsigned char, arg) \
+    wxDO_FOR_INT_TYPES_1(m, arg)
+
+
 /*  ---------------------------------------------------------------------------- */
 /*  byte ordering related definition and macros */
 /*  ---------------------------------------------------------------------------- */
@@ -1298,36 +1459,6 @@ typedef double wxDouble;
 
 /*  byte swapping */
 
-#if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
-/*  assembler versions for these */
-#ifdef __POWERPC__
-    inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
-        {return (__lhbrx( &i , 0 ) );}
-    inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
-        {return (__lhbrx( &i , 0 ) );}
-    inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
-        {return (__lwbrx( &i , 0 ) );}
-    inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
-        {return (__lwbrx( &i , 0 ) );}
-#else
-    #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
-    pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
-        = { 0xE158 };
-
-    #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
-    pascal wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value)
-        = { 0xE158 };
-
-    #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
-    pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
-        = { 0xE158, 0x4840, 0xE158 };
-
-    #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
-    pascal wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value)
-        = { 0xE158, 0x4840, 0xE158 };
-
-#endif
-#else /*  !MWERKS */
 #define wxUINT16_SWAP_ALWAYS(val) \
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
@@ -1351,7 +1482,6 @@ typedef double wxDouble;
     (((wxUint32) (val) & (wxUint32) 0x0000ff00U) <<  8) | \
     (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >>  8) | \
     (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24)))
-#endif
 /*  machine specific byte swapping */
 
 #ifdef wxLongLong_t
@@ -1928,9 +2058,10 @@ enum wxBorder
 #define wxMORE                  0x00010000
 #define wxSETUP                 0x00020000
 #define wxICON_NONE             0x00040000
+#define wxICON_AUTH_NEEDED      0x00080000
 
 #define wxICON_MASK \
-    (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE)
+    (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE|wxICON_AUTH_NEEDED)
 
 /*
  * Background styles. See wxWindow::SetBackgroundStyle
@@ -2164,8 +2295,13 @@ enum wxStandardID
     wxID_OSX_HIDE = wxID_OSX_MENU_FIRST,
     wxID_OSX_HIDEOTHERS,
     wxID_OSX_SHOWALL,
+#if wxABI_VERSION >= 30001
+    wxID_OSX_SERVICES,
+    wxID_OSX_MENU_LAST = wxID_OSX_SERVICES,
+#else
     wxID_OSX_MENU_LAST = wxID_OSX_SHOWALL,
-    
+#endif
+
     /*  IDs used by generic file dialog (13 consecutive starting from this value) */
     wxID_FILEDLGG = 5900,
 
@@ -2267,6 +2403,28 @@ enum wxHitTest
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 
+// Hatch styles used by both pen and brush styles.
+//
+// NB: Do not use these constants directly, they're for internal use only, use
+//     wxBRUSHSTYLE_XXX_HATCH and wxPENSTYLE_XXX_HATCH instead.
+enum wxHatchStyle
+{
+    wxHATCHSTYLE_INVALID = -1,
+
+    /*
+        The value of the first style is chosen to fit with
+        wxDeprecatedGUIConstants values below, don't change it.
+     */
+    wxHATCHSTYLE_FIRST = 111,
+    wxHATCHSTYLE_BDIAGONAL = wxHATCHSTYLE_FIRST,
+    wxHATCHSTYLE_CROSSDIAG,
+    wxHATCHSTYLE_FDIAGONAL,
+    wxHATCHSTYLE_CROSS,
+    wxHATCHSTYLE_HORIZONTAL,
+    wxHATCHSTYLE_VERTICAL,
+    wxHATCHSTYLE_LAST = wxHATCHSTYLE_VERTICAL
+};
+
 /*
     WARNING: the following styles are deprecated; use the
              wxFontFamily, wxFontStyle, wxFontWeight, wxBrushStyle,
@@ -2315,14 +2473,14 @@ enum wxDeprecatedGUIConstants
     /*  drawn with a Pen, and without any Brush -- and it can be stippled. */
     wxSTIPPLE =          110,
 
-    wxBDIAGONAL_HATCH,     /* In wxWidgets < 2.6 use WX_HATCH macro  */
-    wxCROSSDIAG_HATCH,     /* to verify these wx*_HATCH are in style */
-    wxFDIAGONAL_HATCH,     /* of wxBrush. In wxWidgets >= 2.6 use    */
-    wxCROSS_HATCH,         /* wxBrush::IsHatch() instead.            */
-    wxHORIZONTAL_HATCH,
-    wxVERTICAL_HATCH,
-    wxFIRST_HATCH = wxBDIAGONAL_HATCH,
-    wxLAST_HATCH = wxVERTICAL_HATCH
+    wxBDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
+    wxCROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
+    wxFDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
+    wxCROSS_HATCH = wxHATCHSTYLE_CROSS,
+    wxHORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
+    wxVERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
+    wxFIRST_HATCH = wxHATCHSTYLE_FIRST,
+    wxLAST_HATCH = wxHATCHSTYLE_LAST
 };
 #endif
 
@@ -2793,10 +2951,15 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 
 /*  --------------------------------------------------------------------------- */
 /*  macros that enable wxWidgets apps to be compiled in absence of the */
-/*  sytem headers, although some platform specific types are used in the */
+/*  system headers, although some platform specific types are used in the */
 /*  platform specific (implementation) parts of the headers */
 /*  --------------------------------------------------------------------------- */
 
+#ifdef __DARWIN__
+#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref;
+#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref;
+#endif
+
 #ifdef __WXMAC__
 
 #define WX_OPAQUE_TYPE( name ) struct wxOpaque##name
@@ -2833,9 +2996,6 @@ typedef const void * CFTypeRef;
 
 /* typedef const struct __CFString * CFStringRef; */
 
-#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref;
-#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref;
-
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString )
 typedef struct __CFString * CFMutableStringRef;
 
@@ -2908,7 +3068,7 @@ typedef unsigned int NSUInteger;
  */
 
 /*  NOTE: This ought to work with other compilers too, but I'm being cautious */
-#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__)
+#if (defined(__GNUC__) && defined(__APPLE__))
 /* It's desirable to have type safety for Objective-C(++) code as it does
 at least catch typos of method names among other things.  However, it
 is not possible to declare an Objective-C class from plain old C or C++
@@ -2928,7 +3088,7 @@ typedef klass *WX_##klass
 typedef struct klass *WX_##klass
 #endif /*  defined(__OBJC__) */
 
-#else /*  not Apple's GNU or CodeWarrior */
+#else /*  not Apple's gcc */
 #warning "Objective-C types will not be checked by the compiler."
 /*  NOTE: typedef struct objc_object *id; */
 /*  IOW, we're declaring these using the id type without using that name, */
@@ -2938,7 +3098,7 @@ typedef struct klass *WX_##klass
 #define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
 typedef struct objc_object *WX_##klass
 
-#endif /*  (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__) */
+#endif /*  (defined(__GNUC__) && defined(__APPLE__)) */
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);
@@ -2961,6 +3121,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
 DECLARE_WXCOCOA_OBJC_CLASS(NSNotification);
 DECLARE_WXCOCOA_OBJC_CLASS(NSObject);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPanel);
+DECLARE_WXCOCOA_OBJC_CLASS(NSResponder);
 DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSound);
 DECLARE_WXCOCOA_OBJC_CLASS(NSStatusItem);
@@ -3058,7 +3219,9 @@ typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 
+#ifdef __WXMSW__
 typedef WXHWND          WXWidget;
+#endif
 
 #ifdef __WIN64__
 typedef unsigned __int64   WXWPARAM;
@@ -3231,14 +3394,14 @@ typedef struct _GdkDragContext  GdkDragContext;
     typedef unsigned long GdkAtom;
 #endif
 
-#if !defined(__WXGTK30__)
+#if !defined(__WXGTK3__)
     typedef struct _GdkColormap GdkColormap;
     typedef struct _GdkFont GdkFont;
     typedef struct _GdkGC GdkGC;
     typedef struct _GdkRegion GdkRegion;
 #endif
 
-#if defined(__WXGTK30__)
+#if defined(__WXGTK3__)
     typedef struct _GdkWindow GdkWindow;
 #elif defined(__WXGTK20__)
     typedef struct _GdkDrawable GdkWindow;
@@ -3294,9 +3457,9 @@ typedef const void* WXWidget;
 /*  included before or after wxWidgets classes, and therefore must be */
 /*  disabled here before any significant wxWidgets headers are included. */
 #ifdef __cplusplus
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 #include "wx/msw/winundef.h"
-#endif /* __WXMSW__ */
+#endif /* __WINDOWS__ */
 #endif /* __cplusplus */
 
 
@@ -3338,7 +3501,8 @@ typedef const void* WXWidget;
 /*  If a manifest is being automatically generated, add common controls 6 to it */
 /*  --------------------------------------------------------------------------- */
 
-#if (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \
+#if wxUSE_GUI && \
+    (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \
     ( defined _MSC_FULL_VER && _MSC_FULL_VER >= 140040130 )
 
 #define WX_CC_MANIFEST(cpu)                     \
@@ -3361,5 +3525,13 @@ typedef const void* WXWidget;
 
 #endif /* !wxUSE_NO_MANIFEST && _MSC_FULL_VER >= 140040130 */
 
+/* wxThread and wxProcess priorities */
+enum
+{
+    wxPRIORITY_MIN     = 0u,   /* lowest possible priority */
+    wxPRIORITY_DEFAULT = 50u,  /* normal priority */
+    wxPRIORITY_MAX     = 100u  /* highest possible priority */
+};
+
 #endif
     /*  _WX_DEFS_H_ */
diff --git a/Externals/wxWidgets3/include/wx/dialog.h b/Externals/wxWidgets3/include/wx/dialog.h
index 3ce0c53ccc..7110151356 100644
--- a/Externals/wxWidgets3/include/wx/dialog.h
+++ b/Externals/wxWidgets3/include/wx/dialog.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.99
-// RCS-ID:      $Id: dialog.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,8 +11,9 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
-#include "wx/defs.h"
 #include "wx/toplevel.h"
+#include "wx/containr.h"
+#include "wx/sharedptr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
@@ -65,10 +65,10 @@ enum wxDialogModality
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
-class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxDialogBase : public wxNavigationEnabled<wxTopLevelWindow>
 {
 public:
-    wxDialogBase() { Init(); }
+    wxDialogBase();
     virtual ~wxDialogBase() { }
 
     // define public wxDialog methods to be implemented by the derived classes
@@ -80,6 +80,11 @@ public:
     virtual void ShowWindowModal () ;
     virtual void SendWindowModalDialogEvent ( wxEventType type );
 
+#ifdef wxHAS_EVENT_BIND
+    template<typename Functor>
+    void ShowWindowModalThenDo(const Functor& onEndModal);
+#endif // wxHAS_EVENT_BIND
+
     // Modal dialogs have a return code - usually the id of the last
     // pressed button
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
@@ -242,9 +247,6 @@ protected:
     static bool                         sm_layoutAdaptation;
 
 private:
-    // common part of all ctors
-    void Init();
-
     // helper of GetParentForModalDialog(): returns the passed in window if it
     // can be used as our parent or NULL if it can't
     wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;
@@ -395,5 +397,45 @@ typedef void (wxEvtHandler::*wxWindowModalDialogEventFunction)(wxWindowModalDial
 #define EVT_WINDOW_MODAL_DIALOG_CLOSED(winid, func) \
     wx__DECLARE_EVT1(wxEVT_WINDOW_MODAL_DIALOG_CLOSED, winid, wxWindowModalDialogEventHandler(func))
 
+#ifdef wxHAS_EVENT_BIND
+template<typename Functor>
+class wxWindowModalDialogEventFunctor
+{
+public:
+    wxWindowModalDialogEventFunctor(const Functor& f)
+        : m_f(new Functor(f))
+    {}
+
+    void operator()(wxWindowModalDialogEvent& event)
+    {
+        if ( m_f )
+        {
+            // We only want to call this handler once. Also, by deleting
+            // the functor here, its data (such as wxWindowPtr pointing to
+            // the dialog) are freed immediately after exiting this operator().
+            wxSharedPtr<Functor> functor(m_f);
+            m_f.reset();
+
+            (*functor)(event.GetReturnCode());
+        }
+        else // was already called once
+        {
+            event.Skip();
+        }
+    }
+
+private:
+    wxSharedPtr<Functor> m_f;
+};
+
+template<typename Functor>
+void wxDialogBase::ShowWindowModalThenDo(const Functor& onEndModal)
+{
+    Bind(wxEVT_WINDOW_MODAL_DIALOG_CLOSED,
+         wxWindowModalDialogEventFunctor<Functor>(onEndModal));
+    ShowWindowModal();
+}
+#endif // wxHAS_EVENT_BIND
+
 #endif
     // _WX_DIALOG_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/dialup.h b/Externals/wxWidgets3/include/wx/dialup.h
index ba591ebe71..7688d4a1f8 100644
--- a/Externals/wxWidgets3/include/wx/dialup.h
+++ b/Externals/wxWidgets3/include/wx/dialup.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
-// RCS-ID:      $Id: dialup.h 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/dir.h b/Externals/wxWidgets3/include/wx/dir.h
index a4ad56ce18..f23862e0a9 100644
--- a/Externals/wxWidgets3/include/wx/dir.h
+++ b/Externals/wxWidgets3/include/wx/dir.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id: dir.h 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,14 +21,17 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // constants
 // ----------------------------------------------------------------------------
 
-// these flags define what kind of filenames is included in the list of files
-// enumerated by GetFirst/GetNext
+// These flags affect the behaviour of GetFirst/GetNext() and Traverse().
+// They define what types are included in the list of items they produce.
+// Note that wxDIR_NO_FOLLOW is relevant only on Unix and ignored under systems
+// not supporting symbolic links.
 enum wxDirFlags
 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories
     wxDIR_HIDDEN    = 0x0004,       // include hidden files
     wxDIR_DOTDOT    = 0x0008,       // include '.' and '..'
+    wxDIR_NO_FOLLOW = 0x0010,       // don't dereference any symlink
 
     // by default, enumerate everything except '.' and '..'
     wxDIR_DEFAULT   = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN
@@ -94,18 +96,25 @@ public:
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 
-    // dtor cleans up the associated resources
-    ~wxDir();
+    // dtor calls Close() automatically
+    ~wxDir() { Close(); }
 
     // open the directory for enumerating
     bool Open(const wxString& dir);
 
+    // close the directory, Open() can be called again later
+    void Close();
+
     // returns true if the directory was successfully opened
     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)
     wxString GetName() const;
 
+    // Same as GetName() but does include the trailing separator, unless the
+    // string is empty (only for invalid directories).
+    wxString GetNameWithSep() const;
+
 
     // file enumeration routines
     // -------------------------
diff --git a/Externals/wxWidgets3/include/wx/dirctrl.h b/Externals/wxWidgets3/include/wx/dirctrl.h
index 704f8bb768..1d9d1ba186 100644
--- a/Externals/wxWidgets3/include/wx/dirctrl.h
+++ b/Externals/wxWidgets3/include/wx/dirctrl.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dirctrl.h 33948 2005-05-04 18:57:50Z JS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dirdlg.h b/Externals/wxWidgets3/include/wx/dirdlg.h
index 16f7beef5d..b7b7474ab5 100644
--- a/Externals/wxWidgets3/include/wx/dirdlg.h
+++ b/Externals/wxWidgets3/include/wx/dirdlg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: dirdlg.h 70353 2012-01-15 14:46:41Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/display.h b/Externals/wxWidgets3/include/wx/display.h
index c04e8b55b3..4678672138 100644
--- a/Externals/wxWidgets3/include/wx/display.h
+++ b/Externals/wxWidgets3/include/wx/display.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDisplay class
 // Author:      Royce Mitchell III, Vadim Zeitlin
 // Created:     06/21/02
-// RCS-ID:      $Id: display.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2002-2006 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/display_impl.h b/Externals/wxWidgets3/include/wx/display_impl.h
index e228214779..b6674ebfad 100644
--- a/Externals/wxWidgets3/include/wx/display_impl.h
+++ b/Externals/wxWidgets3/include/wx/display_impl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDisplayImpl class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-03-15
-// RCS-ID:      $Id: display_impl.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2002-2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/dlimpexp.h b/Externals/wxWidgets3/include/wx/dlimpexp.h
index 1042938b40..800b745fa6 100644
--- a/Externals/wxWidgets3/include/wx/dlimpexp.h
+++ b/Externals/wxWidgets3/include/wx/dlimpexp.h
@@ -4,7 +4,6 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     16.10.2003 (extracted from wx/defs.h)
- * RCS-ID:      $Id: dlimpexp.h 69049 2011-09-10 18:09:12Z SJL $
  * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -57,11 +56,6 @@
 #        define WXEXPORT _Export
 #        define WXIMPORT _Export
 #    endif
-#elif defined(__WXMAC__) || defined(__WXCOCOA__)
-#    ifdef __MWERKS__
-#        define WXEXPORT __declspec(export)
-#        define WXIMPORT __declspec(import)
-#    endif
 #elif defined(__CYGWIN__)
 #    define WXEXPORT __declspec(dllexport)
 #    define WXIMPORT __declspec(dllimport)
@@ -97,8 +91,8 @@
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
 #    define WXMAKINGDLL_AUI
-#    define WXMAKINGDLL_RIBBON
 #    define WXMAKINGDLL_PROPGRID
+#    define WXMAKINGDLL_RIBBON
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
 #    define WXMAKINGDLL_STC
@@ -229,14 +223,6 @@
 #    define WXDLLIMPEXP_AUI
 #endif
 
-#ifdef WXMAKINGDLL_RIBBON
-#    define WXDLLIMPEXP_RIBBON WXEXPORT
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_RIBBON WXIMPORT
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_RIBBON
-#endif
-
 #ifdef WXMAKINGDLL_PROPGRID
 #    define WXDLLIMPEXP_PROPGRID WXEXPORT
 #    define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
@@ -248,6 +234,14 @@
 #    define WXDLLIMPEXP_DATA_PROPGRID(type) type
 #endif
 
+#ifdef WXMAKINGDLL_RIBBON
+#    define WXDLLIMPEXP_RIBBON WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_RIBBON WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_RIBBON
+#endif
+
 #ifdef WXMAKINGDLL_RICHTEXT
 #    define WXDLLIMPEXP_RICHTEXT WXEXPORT
 #elif defined(WXUSINGDLL)
@@ -304,6 +298,7 @@
     #define WXDLLIMPEXP_FWD_XRC
     #define WXDLLIMPEXP_FWD_AUI
     #define WXDLLIMPEXP_FWD_PROPGRID
+    #define WXDLLIMPEXP_FWD_RIBBON
     #define WXDLLIMPEXP_FWD_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA
     #define WXDLLIMPEXP_FWD_STC
@@ -320,6 +315,7 @@
     #define WXDLLIMPEXP_FWD_XRC       WXDLLIMPEXP_XRC
     #define WXDLLIMPEXP_FWD_AUI       WXDLLIMPEXP_AUI
     #define WXDLLIMPEXP_FWD_PROPGRID  WXDLLIMPEXP_PROPGRID
+    #define WXDLLIMPEXP_FWD_RIBBON    WXDLLIMPEXP_RIBBON
     #define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
     #define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
diff --git a/Externals/wxWidgets3/include/wx/dnd.h b/Externals/wxWidgets3/include/wx/dnd.h
index 7b832d109c..9d9f2e25ca 100644
--- a/Externals/wxWidgets3/include/wx/dnd.h
+++ b/Externals/wxWidgets3/include/wx/dnd.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
 // Created:     26.05.99
-// RCS-ID:      $Id: dnd.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -66,7 +65,7 @@ public:
         { m_data = NULL; }
     virtual ~wxDropSourceBase() { }
 
-    // set the data which is transfered by drag and drop
+    // set the data which is transferred by drag and drop
     void SetData(wxDataObject& data)
       { m_data = &data; }
 
diff --git a/Externals/wxWidgets3/include/wx/docmdi.h b/Externals/wxWidgets3/include/wx/docmdi.h
index a24492492a..e7dcb7ad02 100644
--- a/Externals/wxWidgets3/include/wx/docmdi.h
+++ b/Externals/wxWidgets3/include/wx/docmdi.h
@@ -3,7 +3,6 @@
 // Purpose:     Frame classes for MDI document/view applications
 // Author:      Julian Smart
 // Created:     01/02/97
-// RCS-ID:      $Id: docmdi.h 64295 2010-05-12 14:34:18Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2010 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/docview.h b/Externals/wxWidgets3/include/wx/docview.h
index e15414e65f..78bf44d4b4 100644
--- a/Externals/wxWidgets3/include/wx/docview.h
+++ b/Externals/wxWidgets3/include/wx/docview.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: docview.h 70098 2011-12-23 05:59:59Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,7 @@
 #include "wx/string.h"
 #include "wx/frame.h"
 #include "wx/filehistory.h"
+#include "wx/vector.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/print.h"
@@ -60,6 +60,10 @@ enum
 
 #define wxMAX_FILE_HISTORY 9
 
+typedef wxVector<wxDocument*> wxDocVector;
+typedef wxVector<wxView*> wxViewVector;
+typedef wxVector<wxDocTemplate*> wxDocTemplateVector;
+
 class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler
 {
 public:
@@ -81,6 +85,9 @@ public:
     bool GetDocumentSaved() const { return m_savedYet; }
     void SetDocumentSaved(bool saved = true) { m_savedYet = saved; }
 
+    // activate the first view of the document if any
+    void Activate();
+
     // return true if the document hasn't been modified since the last time it
     // was saved (implying that it returns false if it was never saved, even if
     // the document is not modified)
@@ -140,8 +147,14 @@ public:
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);
+
+#ifndef __VISUALC6__
+    wxViewVector GetViewsVector() const;
+#endif // !__VISUALC6__
+
     wxList& GetViews() { return m_documentViews; }
     const wxList& GetViews() const { return m_documentViews; }
+
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = NULL, wxObject *hint = NULL);
@@ -266,6 +279,9 @@ public:
     // destroyed
     void SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame);
 
+    // get the associated frame, may be NULL during destruction
+    wxDocChildFrameAnyBase* GetDocChildFrame() const { return m_docChildFrame; }
+
 protected:
     // hook the document into event handlers chain here
     virtual bool TryBefore(wxEvent& event);
@@ -432,6 +448,9 @@ public:
     // Find template from document class info, may return NULL.
     wxDocTemplate* FindTemplate(const wxClassInfo* documentClassInfo);
 
+    // Find document from file name, may return NULL.
+    wxDocument* FindDocumentByPath(const wxString& path) const;
+
     wxDocument *GetCurrentDocument() const;
 
     void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; }
@@ -455,6 +474,17 @@ public:
     virtual void ActivateView(wxView *view, bool activate = true);
     virtual wxView *GetCurrentView() const { return m_currentView; }
 
+    // This method tries to find an active view harder than GetCurrentView():
+    // if the latter is NULL, it also checks if we don't have just a single
+    // view and returns it then.
+    wxView *GetAnyUsableView() const;
+
+
+#ifndef __VISUALC6__
+    wxDocVector GetDocumentsVector() const;
+    wxDocTemplateVector GetTemplatesVector() const;
+#endif // !__VISUALC6__
+
     wxList& GetDocuments() { return m_docs; }
     wxList& GetTemplates() { return m_templates; }
 
@@ -529,15 +559,6 @@ protected:
     // return the command processor for the current document, if any
     wxCommandProcessor *GetCurrentCommandProcessor() const;
 
-    // this method tries to find an active view harder than GetCurrentView():
-    // if the latter is NULL, it also checks if we don't have just a single
-    // view and returns it then
-    wxView *GetActiveView() const;
-
-    // activate the first view of the given document if any
-    void ActivateDocument(wxDocument *doc);
-
-
     int               m_defaultDocumentNameCounter;
     int               m_maxDocsOpen;
     wxList            m_docs;
@@ -579,9 +600,10 @@ public:
         m_childDocument = NULL;
         m_childView = NULL;
         m_win = NULL;
+        m_lastEvent = NULL;
     }
 
-    // full ctor equivalent to using the default one and Create(0
+    // full ctor equivalent to using the default one and Create()
     wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win)
     {
         Create(doc, view, win);
@@ -620,14 +642,19 @@ public:
 
     wxWindow *GetWindow() const { return m_win; }
 
+    // implementation only
+
+    // Check if this event had been just processed in this frame.
+    bool HasAlreadyProcessed(wxEvent& event) const
+    {
+        return m_lastEvent == &event;
+    }
+
 protected:
     // we're not a wxEvtHandler but we provide this wxEvtHandler-like function
     // which is called from TryBefore() of the derived classes to give our view
     // a chance to process the message before the frame event handlers are used
-    bool TryProcessEvent(wxEvent& event)
-    {
-        return m_childView && m_childView->ProcessEventLocally(event);
-    }
+    bool TryProcessEvent(wxEvent& event);
 
     // called from EVT_CLOSE handler in the frame: check if we can close and do
     // cleanup if so; veto the event otherwise
@@ -641,6 +668,10 @@ protected:
     // allows us to avoid having any virtual functions in this class
     wxWindow* m_win;
 
+private:
+    // Pointer to the last processed event used to avoid sending the same event
+    // twice to wxDocManager, from here and from wxDocParentFrameAnyBase.
+    wxEvent* m_lastEvent;
 
     wxDECLARE_NO_COPY_CLASS(wxDocChildFrameAnyBase);
 };
@@ -811,11 +842,22 @@ private:
 class WXDLLIMPEXP_CORE wxDocParentFrameAnyBase
 {
 public:
-    wxDocParentFrameAnyBase() { m_docManager = NULL; }
+    wxDocParentFrameAnyBase(wxWindow* frame)
+        : m_frame(frame)
+    {
+        m_docManager = NULL;
+    }
 
     wxDocManager *GetDocumentManager() const { return m_docManager; }
 
 protected:
+    // This is similar to wxDocChildFrameAnyBase method with the same name:
+    // while we're not an event handler ourselves and so can't override
+    // TryBefore(), we provide a helper that the derived template class can use
+    // from its TryBefore() implementation.
+    bool TryProcessEvent(wxEvent& event);
+
+    wxWindow* const m_frame;
     wxDocManager *m_docManager;
 
     wxDECLARE_NO_COPY_CLASS(wxDocParentFrameAnyBase);
@@ -828,7 +870,7 @@ class WXDLLIMPEXP_CORE wxDocParentFrameAny : public BaseFrame,
                                              public wxDocParentFrameAnyBase
 {
 public:
-    wxDocParentFrameAny() { }
+    wxDocParentFrameAny() : wxDocParentFrameAnyBase(this) { }
     wxDocParentFrameAny(wxDocManager *manager,
                         wxFrame *frame,
                         wxWindowID id,
@@ -837,6 +879,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxString& name = wxFrameNameStr)
+        : wxDocParentFrameAnyBase(this)
     {
         Create(manager, frame, id, title, pos, size, style, name);
     }
@@ -855,7 +898,7 @@ public:
         if ( !BaseFrame::Create(frame, id, title, pos, size, style, name) )
             return false;
 
-        this->Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED,
+        this->Connect(wxID_EXIT, wxEVT_MENU,
                       wxCommandEventHandler(wxDocParentFrameAny::OnExit));
         this->Connect(wxEVT_CLOSE_WINDOW,
                       wxCloseEventHandler(wxDocParentFrameAny::OnCloseWindow));
@@ -867,10 +910,11 @@ protected:
     // hook the document manager into event handling chain here
     virtual bool TryBefore(wxEvent& event)
     {
-        if ( m_docManager && m_docManager->ProcessEventLocally(event) )
-            return true;
-
-        return BaseFrame::TryBefore(event);
+        // It is important to send the event to the base class first as
+        // wxMDIParentFrame overrides its TryBefore() to send the menu events
+        // to the currently active child frame and the child must get them
+        // before our own TryProcessEvent() is executed, not afterwards.
+        return BaseFrame::TryBefore(event) || TryProcessEvent(event);
     }
 
 private:
@@ -995,6 +1039,23 @@ enum
 };
 #endif // WXWIN_COMPATIBILITY_2_8
 
+#ifndef __VISUALC6__
+inline wxViewVector wxDocument::GetViewsVector() const
+{
+    return m_documentViews.AsVector<wxView*>();
+}
+
+inline wxDocVector wxDocManager::GetDocumentsVector() const
+{
+    return m_docs.AsVector<wxDocument*>();
+}
+
+inline wxDocTemplateVector wxDocManager::GetTemplatesVector() const
+{
+    return m_templates.AsVector<wxDocTemplate*>();
+}
+#endif // !__VISUALC6__
+
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 #endif // _WX_DOCH__
diff --git a/Externals/wxWidgets3/include/wx/dragimag.h b/Externals/wxWidgets3/include/wx/dragimag.h
index 3f04a404ab..4143ca8898 100644
--- a/Externals/wxWidgets3/include/wx/dragimag.h
+++ b/Externals/wxWidgets3/include/wx/dragimag.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: dragimag.h 47254 2007-07-09 10:09:52Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/dvrenderers.h b/Externals/wxWidgets3/include/wx/dvrenderers.h
index 7c372739b8..775bc1a2d8 100644
--- a/Externals/wxWidgets3/include/wx/dvrenderers.h
+++ b/Externals/wxWidgets3/include/wx/dvrenderers.h
@@ -3,7 +3,6 @@
 // Purpose:     Declare all wxDataViewCtrl classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-08 (extracted from wx/dataview.h)
-// RCS-ID:      $Id: dvrenderers.h 70050 2011-12-19 12:54:38Z VZ $
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -164,6 +163,17 @@ public:
     virtual bool IsCustomRenderer() const { return false; }
 
 
+    // Implementation only from now on.
+
+    // Return the alignment of this renderer if it's specified (i.e. has value
+    // different from the default wxDVR_DEFAULT_ALIGNMENT) or the alignment of
+    // the column it is used for otherwise.
+    //
+    // Unlike GetAlignment(), this always returns a valid combination of
+    // wxALIGN_XXX flags (although possibly wxALIGN_NOT) and never returns
+    // wxDVR_DEFAULT_ALIGNMENT.
+    int GetEffectiveAlignment() const;
+
 protected:
     // Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
     void DestroyEditControl();
diff --git a/Externals/wxWidgets3/include/wx/dynarray.h b/Externals/wxWidgets3/include/wx/dynarray.h
index 09237e0a77..6495030f0c 100644
--- a/Externals/wxWidgets3/include/wx/dynarray.h
+++ b/Externals/wxWidgets3/include/wx/dynarray.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.97
-// RCS-ID:      $Id: dynarray.h 69688 2011-11-05 15:20:32Z VS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -128,6 +127,8 @@ public:                                                             \
   name() : std::vector<T>() { }                                     \
   name(size_type n) : std::vector<T>(n) { }                         \
   name(size_type n, const_reference v) : std::vector<T>(n, v) { }   \
+  template <class InputIterator>                                    \
+  name(InputIterator first, InputIterator last) : std::vector<T>(first, last) { } \
                                                                     \
   void Empty() { clear(); }                                         \
   void Clear() { clear(); }                                         \
@@ -249,7 +250,7 @@ protected:                                                          \
   typedef const value_type* const_iterator;                         \
   typedef value_type& reference;                                    \
   typedef const value_type& const_reference;                        \
-  typedef int difference_type;                                      \
+  typedef ptrdiff_t difference_type;                                \
   typedef size_t size_type;                                         \
                                                                     \
   void assign(const_iterator first, const_iterator last);           \
@@ -274,8 +275,13 @@ protected:                                                          \
   void pop_back() { RemoveAt(size() - 1); }                         \
   void push_back(const value_type& v) { Add(v); }                   \
   void reserve(size_type n) { Alloc(n); }                           \
-  void resize(size_type n, value_type v = value_type())             \
-    { SetCount(n, v); }                                             \
+  void resize(size_type count, value_type defval = value_type())    \
+  {                                                                 \
+    if ( count < m_nCount )                                         \
+      m_nCount = count;                                             \
+    else                                                            \
+      SetCount(count, defval);                                      \
+  }                                                                 \
                                                                     \
   iterator begin() { return m_pItems; }                             \
   iterator end() { return m_pItems + m_nCount; }                    \
diff --git a/Externals/wxWidgets3/include/wx/dynlib.h b/Externals/wxWidgets3/include/wx/dynlib.h
index 4e4e411dbc..5487ccc949 100644
--- a/Externals/wxWidgets3/include/wx/dynlib.h
+++ b/Externals/wxWidgets3/include/wx/dynlib.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     20/07/98
-// RCS-ID:      $Id: dynlib.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -232,7 +231,7 @@ public:
     static wxDllType         GetProgramHandle();
 
     // return the platform standard DLL extension (with leading dot)
-    static const wxString& GetDllExt() { return ms_dllext; }
+    static wxString GetDllExt(wxDynamicLibraryCategory cat = wxDL_LIBRARY);
 
     wxDynamicLibrary() : m_handle(0) { }
     wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT)
@@ -359,7 +358,7 @@ public:
     // the returned handle reference count is not incremented so it doesn't
     // need to be freed using FreeLibrary() but it also means that it can
     // become invalid if the DLL is unloaded
-    static WXHMODULE MSWGetModuleHandle(const char *name, void *addr);
+    static WXHMODULE MSWGetModuleHandle(const wxString& name, void *addr);
 #endif // __WINDOWS__
 
 protected:
@@ -372,9 +371,6 @@ protected:
 #endif // wxHAVE_DYNLIB_ERROR
 
 
-    // platform specific shared lib suffix.
-    static const wxString ms_dllext;
-
     // the handle to DLL or NULL
     wxDllType m_handle;
 
diff --git a/Externals/wxWidgets3/include/wx/dynload.h b/Externals/wxWidgets3/include/wx/dynload.h
index 29575b5b08..7cb4d25bac 100644
--- a/Externals/wxWidgets3/include/wx/dynload.h
+++ b/Externals/wxWidgets3/include/wx/dynload.h
@@ -5,7 +5,6 @@
 //               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
 // Modified by:
 // Created:      03/12/01
-// RCS-ID:       $Id: dynload.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -82,8 +81,11 @@ public:
 
 private:
 
-    const wxClassInfo    *m_before; // sm_first before loading this lib
-    const wxClassInfo    *m_after;  // ..and after.
+    // These pointers may be NULL but if they are not, then m_ourLast follows
+    // m_ourFirst in the linked list, i.e. can be found by calling GetNext() a
+    // sufficient number of times.
+    const wxClassInfo    *m_ourFirst; // first class info in this plugin
+    const wxClassInfo    *m_ourLast;  // ..and the last one
 
     size_t          m_linkcount;    // Ref count of library link calls
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
diff --git a/Externals/wxWidgets3/include/wx/editlbox.h b/Externals/wxWidgets3/include/wx/editlbox.h
index 890d74e333..7aad2ac205 100644
--- a/Externals/wxWidgets3/include/wx/editlbox.h
+++ b/Externals/wxWidgets3/include/wx/editlbox.h
@@ -2,7 +2,6 @@
 // Name:        wx/editlbox.h
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: editlbox.h 56651 2008-11-02 22:16:14Z FM $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -89,6 +88,10 @@ protected:
 
     DECLARE_CLASS(wxEditableListBox)
     DECLARE_EVENT_TABLE()
+
+private:
+    void SwapItems(long i1, long i2);
+
 };
 
 #endif  // wxUSE_EDITABLELISTBOX
diff --git a/Externals/wxWidgets3/include/wx/effects.h b/Externals/wxWidgets3/include/wx/effects.h
index e12835d025..adaf951c10 100644
--- a/Externals/wxWidgets3/include/wx/effects.h
+++ b/Externals/wxWidgets3/include/wx/effects.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     25/4/2000
-// RCS-ID:      $Id: effects.h 54372 2008-06-26 11:16:40Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/encconv.h b/Externals/wxWidgets3/include/wx/encconv.h
index 5447fb5980..bc464785c8 100644
--- a/Externals/wxWidgets3/include/wx/encconv.h
+++ b/Externals/wxWidgets3/include/wx/encconv.h
@@ -76,7 +76,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //              try some (lossy) substitutions - e.g. replace
             //              unconvertable latin capitals with acute by ordinary
             //              capitals, replace en-dash or em-dash by '-' etc.
-            //     both modes gurantee that output string will have same length
+            //     both modes guarantee that output string will have same length
             //     as input string
             //
             // Returns false if given conversion is impossible, true otherwise
@@ -109,9 +109,9 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             //
             // Equivalence is defined in terms of convertibility:
             // 2 encodings are equivalent if you can convert text between
-            // then without loosing information (it may - and will - happen
-            // that you loose special chars like quotation marks or em-dashes
-            // but you shouldn't loose any diacritics and language-specific
+            // then without losing information (it may - and will - happen
+            // that you lose special chars like quotation marks or em-dashes
+            // but you shouldn't lose any diacritics and language-specific
             // characters when converting between equivalent encodings).
             //
             // Convert() method is not limited to converting between
diff --git a/Externals/wxWidgets3/include/wx/encinfo.h b/Externals/wxWidgets3/include/wx/encinfo.h
index bbe7229723..27b1453847 100644
--- a/Externals/wxWidgets3/include/wx/encinfo.h
+++ b/Externals/wxWidgets3/include/wx/encinfo.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
-// RCS-ID:      $Id: encinfo.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/event.h b/Externals/wxWidgets3/include/wx/event.h
index 19610b0f18..61ec19c5b3 100644
--- a/Externals/wxWidgets3/include/wx/event.h
+++ b/Externals/wxWidgets3/include/wx/event.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: event.h 70703 2012-02-26 20:24:25Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,14 @@
     #include "wx/meta/convertible.h"
 #endif
 
+// Currently VC6 and VC7 are known to not be able to compile CallAfter() code,
+// so disable it for them.
+#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(8)
+    #include "wx/meta/removeref.h"
+
+    #define wxHAS_CALL_AFTER
+#endif
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
@@ -621,6 +628,7 @@ extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST;
     // Need events declared to do this
 class WXDLLIMPEXP_FWD_BASE wxIdleEvent;
 class WXDLLIMPEXP_FWD_BASE wxThreadEvent;
+class WXDLLIMPEXP_FWD_BASE wxAsyncMethodCallEvent;
 class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
 class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
 class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
@@ -660,29 +668,30 @@ class WXDLLIMPEXP_FWD_CORE wxHelpEvent;
 
 
     // Command events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_BUTTON, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHOICE, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX_DCLICK, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKLISTBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SLIDER, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBUTTON, wxCommandEvent);
 
-// wxEVT_COMMAND_SCROLLBAR_UPDATED is deprecated, use wxEVT_SCROLL... events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent);
+// wxEVT_SCROLLBAR is deprecated, use wxEVT_SCROLL... events
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLBAR, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_VLBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_RCLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_DROPDOWN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_ENTER, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_DROPDOWN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_CLOSEUP, wxCommandEvent);
 
-    // Thread events
+    // Thread and asynchronous method call events
 wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_ASYNC_METHOD_CALL, wxAsyncMethodCallEvent);
 
     // Mouse event types
 wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent);
@@ -801,9 +810,9 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent);
 wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent);
 
     // Clipboard events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_COPY, wxClipboardTextEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_CUT, wxClipboardTextEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_PASTE, wxClipboardTextEvent);
 
     // Generic command events
     // Note: a click is a higher-level event than button down/up
@@ -820,7 +829,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent);
 wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent);
 
 // these 2 events are the same
-#define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED
+#define wxEVT_TOOL wxEVT_MENU
 
 // ----------------------------------------------------------------------------
 // Compatibility
@@ -830,7 +839,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent);
 // wx/textctrl.h in all ports [yet], so declare it here as well
 //
 // still, any new code using it should include wx/textctrl.h explicitly
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent);
 
 
 // ----------------------------------------------------------------------------
@@ -930,6 +939,10 @@ public:
     int GetId() const { return m_id; }
     void SetId(int Id) { m_id = Id; }
 
+    // Returns the user data optionally associated with the event handler when
+    // using Connect() or Bind().
+    wxObject *GetEventUserData() const { return m_callbackUserData; }
+
     // Can instruct event processor that we wish to ignore this event
     // (treat as if the event table entry had not been found): this must be done
     // to allow the event processing by the base classes (calling event.Skip()
@@ -972,6 +985,9 @@ public:
         m_propagationLevel = propagationLevel;
     }
 
+    // This method is for internal use only and allows to get the object that
+    // is propagating this event upwards the window hierarchy, if any.
+    wxEvtHandler* GetPropagatedFrom() const { return m_propagatedFrom; }
 
     // This is for internal use only and is only called by
     // wxEvtHandler::ProcessEvent() to check whether it's the first time this
@@ -986,6 +1002,24 @@ public:
         return false;
     }
 
+    // This is for internal use only and is used for setting, testing and
+    // resetting of m_willBeProcessedAgain flag.
+    void SetWillBeProcessedAgain()
+    {
+        m_willBeProcessedAgain = true;
+    }
+
+    bool WillBeProcessedAgain()
+    {
+        if ( m_willBeProcessedAgain )
+        {
+            m_willBeProcessedAgain = false;
+            return true;
+        }
+
+        return false;
+    }
+
     // This is also used only internally by ProcessEvent() to check if it
     // should process the event normally or only restrict the search for the
     // event handler to this object itself.
@@ -1024,6 +1058,10 @@ protected:
     // the parent window (if any)
     int               m_propagationLevel;
 
+    // The object that the event is being propagated from, initially NULL and
+    // only set by wxPropagateOnce.
+    wxEvtHandler*     m_propagatedFrom;
+
     bool              m_skipped;
     bool              m_isCommandEvent;
 
@@ -1033,12 +1071,17 @@ protected:
     // once for this event
     bool m_wasProcessed;
 
+    // This one is initially false too, but can be set to true to indicate that
+    // the event will be passed to another handler if it's not processed in
+    // this one.
+    bool m_willBeProcessedAgain;
+
 protected:
     wxEvent(const wxEvent&);            // for implementing Clone()
     wxEvent& operator=(const wxEvent&); // for derived classes operator=()
 
 private:
-    // it needs to access our m_propagationLevel
+    // It needs to access our m_propagationLevel and m_propagatedFrom fields.
     friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce;
 
     // and this one needs to access our m_handlerToProcessOnlyIn
@@ -1072,26 +1115,35 @@ private:
 };
 
 /*
- * Another one to temporarily lower propagation level.
+ * Helper used to indicate that an event is propagated upwards the window
+ * hierarchy by the given window.
  */
 class WXDLLIMPEXP_BASE wxPropagateOnce
 {
 public:
-    wxPropagateOnce(wxEvent& event) : m_event(event)
+    // The handler argument should normally be non-NULL to allow the parent
+    // event handler to know that it's being used to process an event coming
+    // from the child, it's only NULL by default for backwards compatibility.
+    wxPropagateOnce(wxEvent& event, wxEvtHandler* handler = NULL)
+        : m_event(event),
+          m_propagatedFromOld(event.m_propagatedFrom)
     {
         wxASSERT_MSG( m_event.m_propagationLevel > 0,
                         wxT("shouldn't be used unless ShouldPropagate()!") );
 
         m_event.m_propagationLevel--;
+        m_event.m_propagatedFrom = handler;
     }
 
     ~wxPropagateOnce()
     {
+        m_event.m_propagatedFrom = m_propagatedFromOld;
         m_event.m_propagationLevel++;
     }
 
 private:
     wxEvent& m_event;
+    wxEvtHandler* const m_propagatedFromOld;
 
     wxDECLARE_NO_COPY_CLASS(wxPropagateOnce);
 };
@@ -1244,7 +1296,7 @@ public:
     {
         // make sure our string member (which uses COW, aka refcounting) is not
         // shared by other wxString instances:
-        SetString(GetString().c_str());
+        SetString(GetString().Clone());
     }
 
     virtual wxEvent *Clone() const
@@ -1262,26 +1314,217 @@ private:
 };
 
 
+// Asynchronous method call events: these event are processed by wxEvtHandler
+// itself and result in a call to its Execute() method which simply calls the
+// specified method. The difference with a simple method call is that this is
+// done asynchronously, i.e. at some later time, instead of immediately when
+// the event object is constructed.
+
+#ifdef wxHAS_CALL_AFTER
+
+// This is a base class used to process all method calls.
+class wxAsyncMethodCallEvent : public wxEvent
+{
+public:
+    wxAsyncMethodCallEvent(wxObject* object)
+        : wxEvent(wxID_ANY, wxEVT_ASYNC_METHOD_CALL)
+    {
+        SetEventObject(object);
+    }
+
+    wxAsyncMethodCallEvent(const wxAsyncMethodCallEvent& other)
+        : wxEvent(other)
+    {
+    }
+
+    virtual void Execute() = 0;
+};
+
+// This is a version for calling methods without parameters.
+template <typename T>
+class wxAsyncMethodCallEvent0 : public wxAsyncMethodCallEvent
+{
+public:
+    typedef T ObjectType;
+    typedef void (ObjectType::*MethodType)();
+
+    wxAsyncMethodCallEvent0(ObjectType* object,
+                            MethodType method)
+        : wxAsyncMethodCallEvent(object),
+          m_object(object),
+          m_method(method)
+    {
+    }
+
+    wxAsyncMethodCallEvent0(const wxAsyncMethodCallEvent0& other)
+        : wxAsyncMethodCallEvent(other),
+          m_object(other.m_object),
+          m_method(other.m_method)
+    {
+    }
+
+    virtual wxEvent *Clone() const
+    {
+        return new wxAsyncMethodCallEvent0(*this);
+    }
+
+    virtual void Execute()
+    {
+        (m_object->*m_method)();
+    }
+
+private:
+    ObjectType* const m_object;
+    const MethodType m_method;
+};
+
+// This is a version for calling methods with a single parameter.
+template <typename T, typename T1>
+class wxAsyncMethodCallEvent1 : public wxAsyncMethodCallEvent
+{
+public:
+    typedef T ObjectType;
+    typedef void (ObjectType::*MethodType)(T1 x1);
+    typedef typename wxRemoveRef<T1>::type ParamType1;
+
+    wxAsyncMethodCallEvent1(ObjectType* object,
+                            MethodType method,
+                            const ParamType1& x1)
+        : wxAsyncMethodCallEvent(object),
+          m_object(object),
+          m_method(method),
+          m_param1(x1)
+    {
+    }
+
+    wxAsyncMethodCallEvent1(const wxAsyncMethodCallEvent1& other)
+        : wxAsyncMethodCallEvent(other),
+          m_object(other.m_object),
+          m_method(other.m_method),
+          m_param1(other.m_param1)
+    {
+    }
+
+    virtual wxEvent *Clone() const
+    {
+        return new wxAsyncMethodCallEvent1(*this);
+    }
+
+    virtual void Execute()
+    {
+        (m_object->*m_method)(m_param1);
+    }
+
+private:
+    ObjectType* const m_object;
+    const MethodType m_method;
+    const ParamType1 m_param1;
+};
+
+// This is a version for calling methods with two parameters.
+template <typename T, typename T1, typename T2>
+class wxAsyncMethodCallEvent2 : public wxAsyncMethodCallEvent
+{
+public:
+    typedef T ObjectType;
+    typedef void (ObjectType::*MethodType)(T1 x1, T2 x2);
+    typedef typename wxRemoveRef<T1>::type ParamType1;
+    typedef typename wxRemoveRef<T2>::type ParamType2;
+
+    wxAsyncMethodCallEvent2(ObjectType* object,
+                            MethodType method,
+                            const ParamType1& x1,
+                            const ParamType2& x2)
+        : wxAsyncMethodCallEvent(object),
+          m_object(object),
+          m_method(method),
+          m_param1(x1),
+          m_param2(x2)
+    {
+    }
+
+    wxAsyncMethodCallEvent2(const wxAsyncMethodCallEvent2& other)
+        : wxAsyncMethodCallEvent(other),
+          m_object(other.m_object),
+          m_method(other.m_method),
+          m_param1(other.m_param1),
+          m_param2(other.m_param2)
+    {
+    }
+
+    virtual wxEvent *Clone() const
+    {
+        return new wxAsyncMethodCallEvent2(*this);
+    }
+
+    virtual void Execute()
+    {
+        (m_object->*m_method)(m_param1, m_param2);
+    }
+
+private:
+    ObjectType* const m_object;
+    const MethodType m_method;
+    const ParamType1 m_param1;
+    const ParamType2 m_param2;
+};
+
+// This is a version for calling any functors
+template <typename T>
+class wxAsyncMethodCallEventFunctor : public wxAsyncMethodCallEvent
+{
+public:
+    typedef T FunctorType;
+
+    wxAsyncMethodCallEventFunctor(wxObject *object, const FunctorType& fn)
+        : wxAsyncMethodCallEvent(object),
+          m_fn(fn)
+    {
+    }
+
+    wxAsyncMethodCallEventFunctor(const wxAsyncMethodCallEventFunctor& other)
+        : wxAsyncMethodCallEvent(other),
+          m_fn(other.m_fn)
+    {
+    }
+
+    virtual wxEvent *Clone() const
+    {
+        return new wxAsyncMethodCallEventFunctor(*this);
+    }
+
+    virtual void Execute()
+    {
+        m_fn();
+    }
+
+private:
+    FunctorType m_fn;
+};
+
+#endif // wxHAS_CALL_AFTER
+
+
 #if wxUSE_GUI
 
 
 // Item or menu event class
 /*
- wxEVT_COMMAND_BUTTON_CLICKED
- wxEVT_COMMAND_CHECKBOX_CLICKED
- wxEVT_COMMAND_CHOICE_SELECTED
- wxEVT_COMMAND_LISTBOX_SELECTED
- wxEVT_COMMAND_LISTBOX_DOUBLECLICKED
- wxEVT_COMMAND_TEXT_UPDATED
- wxEVT_COMMAND_TEXT_ENTER
- wxEVT_COMMAND_MENU_SELECTED
- wxEVT_COMMAND_SLIDER_UPDATED
- wxEVT_COMMAND_RADIOBOX_SELECTED
- wxEVT_COMMAND_RADIOBUTTON_SELECTED
- wxEVT_COMMAND_SCROLLBAR_UPDATED
- wxEVT_COMMAND_VLBOX_SELECTED
- wxEVT_COMMAND_COMBOBOX_SELECTED
- wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
+ wxEVT_BUTTON
+ wxEVT_CHECKBOX
+ wxEVT_CHOICE
+ wxEVT_LISTBOX
+ wxEVT_LISTBOX_DCLICK
+ wxEVT_TEXT
+ wxEVT_TEXT_ENTER
+ wxEVT_MENU
+ wxEVT_SLIDER
+ wxEVT_RADIOBOX
+ wxEVT_RADIOBUTTON
+ wxEVT_SCROLLBAR
+ wxEVT_VLBOX
+ wxEVT_COMBOBOX
+ wxEVT_TOGGLEBUTTON
 */
 
 class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent,
@@ -1295,7 +1538,12 @@ public:
           wxEventBasicPayloadMixin(event),
           m_clientData(event.m_clientData),
           m_clientObject(event.m_clientObject)
-        { }
+    {
+        // Because GetString() can retrieve the string text only on demand, we
+        // need to copy it explicitly.
+        if ( m_cmdString.empty() )
+            m_cmdString = event.GetString();
+    }
 
     // Set/Get client data from controls
     void SetClientData(void* clientData) { m_clientData = clientData; }
@@ -1448,6 +1696,12 @@ private:
  wxEVT_RIGHT_DCLICK
 */
 
+enum wxMouseWheelAxis
+{
+    wxMOUSE_WHEEL_VERTICAL,
+    wxMOUSE_WHEEL_HORIZONTAL
+};
+
 class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent,
                                       public wxMouseState
 {
@@ -1535,15 +1789,19 @@ public:
     // should occur for each delta.
     int GetWheelDelta() const { return m_wheelDelta; }
 
-    // Gets the axis the wheel operation concerns, 0 being the y axis as on
-    // most mouse wheels, 1 is the x axis for things like MightyMouse scrolls
-    // or horizontal trackpad scrolling
-    int GetWheelAxis() const { return m_wheelAxis; }
+    // Gets the axis the wheel operation concerns; wxMOUSE_WHEEL_VERTICAL
+    // (most common case) or wxMOUSE_WHEEL_HORIZONTAL (for horizontal scrolling
+    // using e.g. a trackpad).
+    wxMouseWheelAxis GetWheelAxis() const { return m_wheelAxis; }
 
     // Returns the configured number of lines (or whatever) to be scrolled per
-    // wheel action.  Defaults to one.
+    // wheel action. Defaults to three.
     int GetLinesPerAction() const { return m_linesPerAction; }
 
+    // Returns the configured number of columns (or whatever) to be scrolled per
+    // wheel action. Defaults to three.
+    int GetColumnsPerAction() const { return m_columnsPerAction; }
+
     // Is the system set to do page scrolling?
     bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
 
@@ -1560,10 +1818,11 @@ public:
 public:
     int           m_clickCount;
 
-    int           m_wheelAxis;
+    wxMouseWheelAxis m_wheelAxis;
     int           m_wheelRotation;
     int           m_wheelDelta;
     int           m_linesPerAction;
+    int           m_columnsPerAction;
 
 protected:
     void Assign(const wxMouseEvent& evt);
@@ -1679,24 +1938,29 @@ public:
     // Find the position of the event
     void GetPosition(wxCoord *xpos, wxCoord *ypos) const
     {
-        if (xpos) *xpos = m_x;
-        if (ypos) *ypos = m_y;
+        if (xpos)
+            *xpos = GetX();
+        if (ypos)
+            *ypos = GetY();
     }
 
+    // This version if provided only for backwards compatiblity, don't use.
     void GetPosition(long *xpos, long *ypos) const
     {
-        if (xpos) *xpos = (long)m_x;
-        if (ypos) *ypos = (long)m_y;
+        if (xpos)
+            *xpos = GetX();
+        if (ypos)
+            *ypos = GetY();
     }
 
     wxPoint GetPosition() const
-        { return wxPoint(m_x, m_y); }
+        { return wxPoint(GetX(), GetY()); }
 
     // Get X position
-    wxCoord GetX() const { return m_x; }
+    wxCoord GetX() const;
 
     // Get Y position
-    wxCoord GetY() const { return m_y; }
+    wxCoord GetY() const;
 
     // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal
     // key events even though the event had been handled (by default they would
@@ -1728,6 +1992,8 @@ public:
     }
 
 public:
+    // Do not use these fields directly, they are initialized on demand, so
+    // call GetX() and GetY() or GetPosition() instead.
     wxCoord       m_x, m_y;
 
     long          m_keyCode;
@@ -1760,6 +2026,7 @@ private:
     {
         m_x = evt.m_x;
         m_y = evt.m_y;
+        m_hasPosition = evt.m_hasPosition;
 
         m_keyCode = evt.m_keyCode;
 
@@ -1770,11 +2037,19 @@ private:
 #endif
     }
 
+    // Initialize m_x and m_y using the current mouse cursor position if
+    // necessary.
+    void InitPositionIfNecessary() const;
+
     // If this flag is true, the normal key events should still be generated
     // even if wxEVT_CHAR_HOOK had been handled. By default it is false as
     // handling wxEVT_CHAR_HOOK suppresses all the subsequent events.
     bool m_allowNext;
 
+    // If true, m_x and m_y were already initialized. If false, try to get them
+    // when they're requested.
+    bool m_hasPosition;
+
     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };
 
@@ -2000,19 +2275,36 @@ private:
 class WXDLLIMPEXP_CORE wxActivateEvent : public wxEvent
 {
 public:
-    wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = true, int Id = 0)
-        : wxEvent(Id, type)
-        { m_active = active; }
+    // Type of activation. For now we can only detect if it was by mouse or by
+    // some other method and even this is only available under wxMSW.
+    enum Reason
+    {
+        Reason_Mouse,
+        Reason_Unknown
+    };
+
+    wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = true,
+                    int Id = 0, Reason activationReason = Reason_Unknown)
+        : wxEvent(Id, type),
+        m_activationReason(activationReason)
+    {
+        m_active = active;
+    }
     wxActivateEvent(const wxActivateEvent& event)
         : wxEvent(event)
-    { m_active = event.m_active; }
+    {
+        m_active = event.m_active;
+        m_activationReason = event.m_activationReason;
+    }
 
     bool GetActive() const { return m_active; }
+    Reason GetActivationReason() const { return m_activationReason;}
 
     virtual wxEvent *Clone() const { return new wxActivateEvent(*this); }
 
 private:
     bool m_active;
+    Reason m_activationReason;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent)
@@ -2774,9 +3066,9 @@ private:
 // NOTE : under windows these events are *NOT* generated automatically
 // for a Rich Edit text control.
 /*
-wxEVT_COMMAND_TEXT_COPY
-wxEVT_COMMAND_TEXT_CUT
-wxEVT_COMMAND_TEXT_PASTE
+wxEVT_TEXT_COPY
+wxEVT_TEXT_CUT
+wxEVT_TEXT_PASTE
 */
 
 class WXDLLIMPEXP_CORE wxClipboardTextEvent : public wxCommandEvent
@@ -2991,7 +3283,7 @@ public:
 protected:
     // Init the hash table with the entries of the static event table.
     void InitHashTable();
-    // Helper funtion of InitHashTable() to insert 1 entry into the hash table.
+    // Helper function of InitHashTable() to insert 1 entry into the hash table.
     void AddEntry(const wxEventTableEntry &entry);
     // Allocate and init with null pointers the base hash table.
     void AllocEventTypeTable(size_t size);
@@ -3113,6 +3405,52 @@ public:
         // NOTE: uses AddPendingEvent(); call only from secondary threads
 #endif
 
+#ifdef wxHAS_CALL_AFTER
+    // Asynchronous method calls: these methods schedule the given method
+    // pointer for a later call (during the next idle event loop iteration).
+    //
+    // Notice that the method is called on this object itself, so the object
+    // CallAfter() is called on must have the correct dynamic type.
+    //
+    // These method can be used from another thread.
+
+    template <typename T>
+    void CallAfter(void (T::*method)())
+    {
+        QueueEvent(
+            new wxAsyncMethodCallEvent0<T>(static_cast<T*>(this), method)
+        );
+    }
+
+    // Notice that we use P1 and not T1 for the parameter to allow passing
+    // parameters that are convertible to the type taken by the method
+    // instead of being exactly the same, to be closer to the usual method call
+    // semantics.
+    template <typename T, typename T1, typename P1>
+    void CallAfter(void (T::*method)(T1 x1), P1 x1)
+    {
+        QueueEvent(
+            new wxAsyncMethodCallEvent1<T, T1>(
+                static_cast<T*>(this), method, x1)
+        );
+    }
+
+    template <typename T, typename T1, typename T2, typename P1, typename P2>
+    void CallAfter(void (T::*method)(T1 x1, T2 x2), P1 x1, P2 x2)
+    {
+        QueueEvent(
+            new wxAsyncMethodCallEvent2<T, T1, T2>(
+                static_cast<T*>(this), method, x1, x2)
+        );
+    }
+
+    template <typename T>
+    void CallAfter(const T& fn)
+    {
+        QueueEvent(new wxAsyncMethodCallEventFunctor<T>(this, fn));
+    }
+#endif // wxHAS_CALL_AFTER
+
 
     // Connecting and disconnecting
     // ----------------------------
@@ -3975,33 +4313,33 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #endif // WXWIN_COMPATIBILITY_2_6
 
 // Convenience macros for commonly-used commands
-#define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHECKBOX_CLICKED, winid, wxCommandEventHandler(func))
-#define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICE_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_LISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOX_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_LISTBOX_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, winid, wxCommandEventHandler(func))
-#define EVT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_MENU_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_MENU_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_MENU_SELECTED, id1, id2, wxCommandEventHandler(func))
+#define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKBOX, winid, wxCommandEventHandler(func))
+#define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_CHOICE, winid, wxCommandEventHandler(func))
+#define EVT_LISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX, winid, wxCommandEventHandler(func))
+#define EVT_LISTBOX_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX_DCLICK, winid, wxCommandEventHandler(func))
+#define EVT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_MENU, winid, wxCommandEventHandler(func))
+#define EVT_MENU_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_MENU, id1, id2, wxCommandEventHandler(func))
 #if defined(__SMARTPHONE__)
 #  define EVT_BUTTON(winid, func) EVT_MENU(winid, func)
 #else
-#  define EVT_BUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_BUTTON_CLICKED, winid, wxCommandEventHandler(func))
+#  define EVT_BUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_BUTTON, winid, wxCommandEventHandler(func))
 #endif
-#define EVT_SLIDER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_SLIDER_UPDATED, winid, wxCommandEventHandler(func))
-#define EVT_RADIOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RADIOBOX_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_RADIOBUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RADIOBUTTON_SELECTED, winid, wxCommandEventHandler(func))
+#define EVT_SLIDER(winid, func) wx__DECLARE_EVT1(wxEVT_SLIDER, winid, wxCommandEventHandler(func))
+#define EVT_RADIOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBOX, winid, wxCommandEventHandler(func))
+#define EVT_RADIOBUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBUTTON, winid, wxCommandEventHandler(func))
 // EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events
-#define EVT_SCROLLBAR(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_SCROLLBAR_UPDATED, winid, wxCommandEventHandler(func))
-#define EVT_VLBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_VLBOX_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_COMBOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_SELECTED, winid, wxCommandEventHandler(func))
-#define EVT_TOOL(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_CLICKED, winid, wxCommandEventHandler(func))
-#define EVT_TOOL_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, winid, wxCommandEventHandler(func))
-#define EVT_TOOL_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_CLICKED, id1, id2, wxCommandEventHandler(func))
-#define EVT_TOOL_RCLICKED(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_RCLICKED, winid, wxCommandEventHandler(func))
-#define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func))
-#define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_ENTER, winid, wxCommandEventHandler(func))
-#define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, winid, wxCommandEventHandler(func))
-#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func))
-#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func))
+#define EVT_SCROLLBAR(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLLBAR, winid, wxCommandEventHandler(func))
+#define EVT_VLBOX(winid, func) wx__DECLARE_EVT1(wxEVT_VLBOX, winid, wxCommandEventHandler(func))
+#define EVT_COMBOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX, winid, wxCommandEventHandler(func))
+#define EVT_TOOL(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL, winid, wxCommandEventHandler(func))
+#define EVT_TOOL_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_DROPDOWN, winid, wxCommandEventHandler(func))
+#define EVT_TOOL_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL, id1, id2, wxCommandEventHandler(func))
+#define EVT_TOOL_RCLICKED(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_RCLICKED, winid, wxCommandEventHandler(func))
+#define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func))
+#define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_ENTER, winid, wxCommandEventHandler(func))
+#define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKLISTBOX, winid, wxCommandEventHandler(func))
+#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func))
+#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func))
 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func))
@@ -4044,14 +4382,12 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_COMMAND_CONTEXT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_CONTEXT_MENU, winid, wxContextMenuEventHandler(func))
 
 // Clipboard text Events
-#define EVT_TEXT_CUT(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_CUT, winid, wxClipboardTextEventHandler(func))
-#define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_COPY, winid, wxClipboardTextEventHandler(func))
-#define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func))
+#define EVT_TEXT_CUT(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_CUT, winid, wxClipboardTextEventHandler(func))
+#define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_COPY, winid, wxClipboardTextEventHandler(func))
+#define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_PASTE, winid, wxClipboardTextEventHandler(func))
 
 // Thread events
 #define EVT_THREAD(id, func)  wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func))
-// alias for backward compatibility with 2.9.0:
-#define wxEVT_COMMAND_THREAD wxEVT_THREAD
 
 // ----------------------------------------------------------------------------
 // Helper functions
@@ -4115,11 +4451,11 @@ WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
 #define DECLARE_EVENT_TABLE()                          wxDECLARE_EVENT_TABLE();
 #define BEGIN_EVENT_TABLE(a,b)                         wxBEGIN_EVENT_TABLE(a,b)
 #define BEGIN_EVENT_TABLE_TEMPLATE1(a,b,c)             wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c)
-#define BEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d)           wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d)
-#define BEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e)         wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e)
-#define BEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f)       wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f)
-#define BEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g)     wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f,g)
-#define BEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h)   wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f,g,h)
+#define BEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d)           wxBEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d)
+#define BEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e)         wxBEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e)
+#define BEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f)       wxBEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f)
+#define BEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g)     wxBEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g)
+#define BEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h)   wxBEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h)
 #define END_EVENT_TABLE()                              wxEND_EVENT_TABLE()
 
 // other obsolete event declaration/definition macros; we don't need them any longer
@@ -4135,4 +4471,31 @@ WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 #define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name)
 
+// alias for backward compatibility with 2.9.0:
+#define wxEVT_COMMAND_THREAD                  wxEVT_THREAD
+// other old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_BUTTON_CLICKED          wxEVT_BUTTON
+#define wxEVT_COMMAND_CHECKBOX_CLICKED        wxEVT_CHECKBOX
+#define wxEVT_COMMAND_CHOICE_SELECTED         wxEVT_CHOICE
+#define wxEVT_COMMAND_LISTBOX_SELECTED        wxEVT_LISTBOX
+#define wxEVT_COMMAND_LISTBOX_DOUBLECLICKED   wxEVT_LISTBOX_DCLICK
+#define wxEVT_COMMAND_CHECKLISTBOX_TOGGLED    wxEVT_CHECKLISTBOX
+#define wxEVT_COMMAND_MENU_SELECTED           wxEVT_MENU
+#define wxEVT_COMMAND_TOOL_CLICKED            wxEVT_TOOL
+#define wxEVT_COMMAND_SLIDER_UPDATED          wxEVT_SLIDER
+#define wxEVT_COMMAND_RADIOBOX_SELECTED       wxEVT_RADIOBOX
+#define wxEVT_COMMAND_RADIOBUTTON_SELECTED    wxEVT_RADIOBUTTON
+#define wxEVT_COMMAND_SCROLLBAR_UPDATED       wxEVT_SCROLLBAR
+#define wxEVT_COMMAND_VLBOX_SELECTED          wxEVT_VLBOX
+#define wxEVT_COMMAND_COMBOBOX_SELECTED       wxEVT_COMBOBOX
+#define wxEVT_COMMAND_TOOL_RCLICKED           wxEVT_TOOL_RCLICKED
+#define wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED   wxEVT_TOOL_DROPDOWN
+#define wxEVT_COMMAND_TOOL_ENTER              wxEVT_TOOL_ENTER
+#define wxEVT_COMMAND_COMBOBOX_DROPDOWN       wxEVT_COMBOBOX_DROPDOWN
+#define wxEVT_COMMAND_COMBOBOX_CLOSEUP        wxEVT_COMBOBOX_CLOSEUP
+#define wxEVT_COMMAND_TEXT_COPY               wxEVT_TEXT_COPY
+#define wxEVT_COMMAND_TEXT_CUT                wxEVT_TEXT_CUT
+#define wxEVT_COMMAND_TEXT_PASTE              wxEVT_TEXT_PASTE
+#define wxEVT_COMMAND_TEXT_UPDATED            wxEVT_TEXT
+
 #endif // _WX_EVENT_H_
diff --git a/Externals/wxWidgets3/include/wx/eventfilter.h b/Externals/wxWidgets3/include/wx/eventfilter.h
index 5a110cb7c5..30eac4d363 100644
--- a/Externals/wxWidgets3/include/wx/eventfilter.h
+++ b/Externals/wxWidgets3/include/wx/eventfilter.h
@@ -3,7 +3,6 @@
 // Purpose:     wxEventFilter class declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-11-21
-// RCS-ID:      $Id: eventfilter.h 70302 2012-01-09 14:04:25Z DS $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/evtloop.h b/Externals/wxWidgets3/include/wx/evtloop.h
index 97a3548d8e..8dd5d6eb7b 100644
--- a/Externals/wxWidgets3/include/wx/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/evtloop.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
-// RCS-ID:      $Id: evtloop.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
 
 // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
 //       monitored using MsgWaitForMultipleObjects())
-#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__CYGWIN__))
+#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__))
     #define wxUSE_EVENTLOOP_SOURCE 1
 #else
     #define wxUSE_EVENTLOOP_SOURCE 0
@@ -79,16 +78,19 @@ public:
 
 #if wxUSE_EVENTLOOP_SOURCE
     // create a new event loop source wrapping the given file descriptor and
-    // start monitoring it
-    virtual wxEventLoopSource *
-      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) = 0;
+    // monitor it for events occurring on this descriptor in all event loops
+    static wxEventLoopSource *
+      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
 #endif // wxUSE_EVENTLOOP_SOURCE
 
     // dispatch&processing
     // -------------------
 
     // start the event loop, return the exit code when it is finished
-    virtual int Run() = 0;
+    //
+    // notice that wx ports should override DoRun(), this method is virtual
+    // only to allow overriding it in the user code for custom event loops
+    virtual int Run();
 
     // is this event loop running now?
     //
@@ -97,7 +99,15 @@ public:
     bool IsRunning() const;
 
     // exit from the loop with the given exit code
-    virtual void Exit(int rc = 0) = 0;
+    //
+    // this can be only used to exit the currently running loop, use
+    // ScheduleExit() if this might not be the case
+    virtual void Exit(int rc = 0);
+
+    // ask the event loop to exit with the given exit code, can be used even if
+    // this loop is not running right now but the loop must have been started,
+    // i.e. Run() should have been already called
+    virtual void ScheduleExit(int rc = 0) = 0;
 
     // return true if any events are available
     virtual bool Pending() const = 0;
@@ -169,22 +179,38 @@ public:
 
 
 protected:
+    // real implementation of Run()
+    virtual int DoRun() = 0;
+
     // this function should be called before the event loop terminates, whether
     // this happens normally (because of Exit() call) or abnormally (because of
     // an exception thrown from inside the loop)
     virtual void OnExit();
 
+    // Return true if we're currently inside our Run(), even if another nested
+    // event loop is currently running, unlike IsRunning() (which should have
+    // been really called IsActive() but it's too late to change this now).
+    bool IsInsideRun() const { return m_isInsideRun; }
+
+
     // the pointer to currently active loop
     static wxEventLoopBase *ms_activeLoop;
 
+    // should we exit the loop?
+    bool m_shouldExit;
+
     // YieldFor() helpers:
     bool m_isInsideYield;
     long m_eventsToProcessInsideYield;
 
+private:
+    // this flag is set on entry into Run() and reset before leaving it
+    bool m_isInsideRun;
+
     wxDECLARE_NO_COPY_CLASS(wxEventLoopBase);
 };
 
-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))
+#if defined(__WINDOWS__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))
 
 // this class can be used to implement a standard event loop logic using
 // Pending() and Dispatch()
@@ -195,15 +221,15 @@ class WXDLLIMPEXP_BASE wxEventLoopManual : public wxEventLoopBase
 public:
     wxEventLoopManual();
 
-    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
-    // terminating when Exit() is called
-    virtual int Run();
-
     // sets the "should exit" flag and wakes up the loop so that it terminates
     // soon
-    virtual void Exit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0);
 
 protected:
+    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
+    // terminating when Exit() is called
+    virtual int DoRun();
+
     // may be overridden to perform some action at the start of each new event
     // loop iteration
     virtual void OnNextIteration() { }
@@ -212,9 +238,6 @@ protected:
     // the loop exit code
     int m_exitcode;
 
-    // should we exit the loop?
-    bool m_shouldExit;
-
 private:
     // process all already pending events and dispatch a new one (blocking
     // until it appears in the event queue if necessary)
@@ -233,19 +256,29 @@ private:
 // integration with MFC) but currently this is not done for all ports yet (e.g.
 // wxX11) so fall back to the old wxGUIEventLoop definition below for them
 
-#if defined(__WXMSW__)
-    // this header defines both console and GUI loops for MSW
-    #include "wx/msw/evtloop.h"
-#elif defined(__WXOSX__)
+#if defined(__DARWIN__)
     // CoreFoundation-based event loop is currently in wxBase so include it in
     // any case too (although maybe it actually shouldn't be there at all)
-    #include "wx/osx/evtloop.h"
-#elif wxUSE_GUI
+    #include "wx/osx/core/evtloop.h"
+#endif
+
+// include the header defining wxConsoleEventLoop
+#if defined(__UNIX__) && !defined(__WXMSW__)
+    #include "wx/unix/evtloop.h"
+#elif defined(__WINDOWS__)
+    #include "wx/msw/evtloopconsole.h"
+#endif
+
+#if wxUSE_GUI
 
 // include the appropriate header defining wxGUIEventLoop
 
-#if defined(__WXCOCOA__)
+#if defined(__WXMSW__)
+    #include "wx/msw/evtloop.h"
+#elif defined(__WXCOCOA__)
     #include "wx/cocoa/evtloop.h"
+#elif defined(__WXOSX__)
+    #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
 #elif defined(__WXGTK20__)
@@ -262,21 +295,7 @@ public:
     wxGUIEventLoop() { m_impl = NULL; }
     virtual ~wxGUIEventLoop();
 
-#if wxUSE_EVENTLOOP_SOURCE
-    // We need to define a base class pure virtual method but we can't provide
-    // a generic implementation for it so simply fail.
-    virtual wxEventLoopSource *
-    AddSourceForFD(int WXUNUSED(fd),
-                   wxEventLoopSourceHandler * WXUNUSED(handler),
-                   int WXUNUSED(flags))
-    {
-        wxFAIL_MSG( "support for event loop sources not implemented" );
-        return NULL;
-    }
-#endif // wxUSE_EVENTLOOP_SOURCE
-
-    virtual int Run();
-    virtual void Exit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual int DispatchTimeout(unsigned long timeout)
@@ -297,6 +316,8 @@ public:
     virtual bool YieldFor(long eventsToProcess);
 
 protected:
+    virtual int DoRun();
+
     // the pointer to the port specific implementation class
     wxEventLoopImpl *m_impl;
 
@@ -307,11 +328,6 @@ protected:
 
 #endif // wxUSE_GUI
 
-// include the header defining wxConsoleEventLoop for Unix systems
-#if defined(__UNIX__) && !defined(__CYGWIN__)
-#include "wx/unix/evtloop.h"
-#endif
-
 #if wxUSE_GUI
     // we use a class rather than a typedef because wxEventLoop is
     // forward-declared in many places
@@ -319,7 +335,7 @@ protected:
 #else // !wxUSE_GUI
     // we can't define wxEventLoop differently in GUI and base libraries so use
     // a #define to still allow writing wxEventLoop in the user code
-    #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WXMSW__) || defined(__UNIX__))
+    #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WINDOWS__) || defined(__UNIX__))
         #define wxEventLoop wxConsoleEventLoop
     #else // we still must define it somehow for the code below...
         #define wxEventLoop wxEventLoopBase
diff --git a/Externals/wxWidgets3/include/wx/evtloopsrc.h b/Externals/wxWidgets3/include/wx/evtloopsrc.h
index 20d8770b76..cb3e5c6a90 100644
--- a/Externals/wxWidgets3/include/wx/evtloopsrc.h
+++ b/Externals/wxWidgets3/include/wx/evtloopsrc.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21
-// RCS-ID:      $Id: evtloopsrc.h 69559 2011-10-27 21:10:30Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,6 +10,9 @@
 #ifndef _WX_EVTLOOPSRC_H_
 #define _WX_EVTLOOPSRC_H_
 
+// Include the header to get wxUSE_EVENTLOOP_SOURCE definition from it.
+#include "wx/evtloop.h"
+
 // ----------------------------------------------------------------------------
 // wxEventLoopSource: a source of events which may be added to wxEventLoop
 // ----------------------------------------------------------------------------
@@ -89,9 +91,11 @@ inline wxEventLoopSource::~wxEventLoopSource() { }
 
 #if defined(__WXGTK20__)
     #include "wx/gtk/evtloopsrc.h"
-#elif defined(__WXOSX__)
+#endif
+
+#if defined(__DARWIN__)
     #include "wx/osx/evtloopsrc.h"
-#endif // platform
+#endif
 
 #endif // wxUSE_EVENTLOOP_SOURCE
 
diff --git a/Externals/wxWidgets3/include/wx/except.h b/Externals/wxWidgets3/include/wx/except.h
index aecf1594c6..75589163e3 100644
--- a/Externals/wxWidgets3/include/wx/except.h
+++ b/Externals/wxWidgets3/include/wx/except.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     17.09.2003
-// RCS-ID:      $Id: except.h 64993 2010-07-17 11:55:10Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/fdrepdlg.h b/Externals/wxWidgets3/include/wx/fdrepdlg.h
index ad433cb2c2..709dcb156b 100644
--- a/Externals/wxWidgets3/include/wx/fdrepdlg.h
+++ b/Externals/wxWidgets3/include/wx/fdrepdlg.h
@@ -4,7 +4,6 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id: fdrepdlg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,8 +66,8 @@ public:
     wxFindReplaceData(wxUint32 flags) { Init(); SetFlags(flags); }
 
     // accessors
-    const wxString& GetFindString() { return m_FindWhat; }
-    const wxString& GetReplaceString() { return m_ReplaceWith; }
+    const wxString& GetFindString() const { return m_FindWhat; }
+    const wxString& GetReplaceString() const { return m_ReplaceWith; }
 
     int GetFlags() const { return m_Flags; }
 
@@ -165,11 +164,11 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent)
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND, wxFindDialogEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_NEXT, wxFindDialogEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_REPLACE, wxFindDialogEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_REPLACE_ALL, wxFindDialogEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND_CLOSE, wxFindDialogEvent );
 
 typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
@@ -177,19 +176,26 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
     wxEVENT_HANDLER_CAST(wxFindDialogEventFunction, func)
 
 #define EVT_FIND(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FIND, id, wxFindDialogEventHandler(fn))
 
 #define EVT_FIND_NEXT(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_NEXT, id, wxFindDialogEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FIND_NEXT, id, wxFindDialogEventHandler(fn))
 
 #define EVT_FIND_REPLACE(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE, id, wxFindDialogEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FIND_REPLACE, id, wxFindDialogEventHandler(fn))
 
 #define EVT_FIND_REPLACE_ALL(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn))
 
 #define EVT_FIND_CLOSE(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_CLOSE, id, wxFindDialogEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FIND_CLOSE, id, wxFindDialogEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_FIND               wxEVT_FIND
+#define wxEVT_COMMAND_FIND_NEXT          wxEVT_FIND_NEXT
+#define wxEVT_COMMAND_FIND_REPLACE       wxEVT_FIND_REPLACE
+#define wxEVT_COMMAND_FIND_REPLACE_ALL   wxEVT_FIND_REPLACE_ALL
+#define wxEVT_COMMAND_FIND_CLOSE         wxEVT_FIND_CLOSE
 
 #endif // wxUSE_FINDREPLDLG
 
diff --git a/Externals/wxWidgets3/include/wx/features.h b/Externals/wxWidgets3/include/wx/features.h
index 0d8469917b..765f0f7f1f 100644
--- a/Externals/wxWidgets3/include/wx/features.h
+++ b/Externals/wxWidgets3/include/wx/features.h
@@ -5,7 +5,6 @@
 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
-*  RCS-ID:      $Id: features.h 69961 2011-12-08 15:58:45Z VZ $
 *  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 *  Licence:     wxWindows licence
 */
@@ -117,7 +116,8 @@
  */
 #if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) \
         || (defined(__SUNCC__) && __SUNCC__ >= 0x5100) \
-        || (defined(__xlC__) && __xlC__ >= 0x700)
+        || (defined(__xlC__) && __xlC__ >= 0x700) \
+        || defined(__INTELC__)
     #define wxHAS_EVENT_BIND
 #endif
 
diff --git a/Externals/wxWidgets3/include/wx/ffile.h b/Externals/wxWidgets3/include/wx/ffile.h
index a3c457fb9e..91a7c28ed4 100644
--- a/Externals/wxWidgets3/include/wx/ffile.h
+++ b/Externals/wxWidgets3/include/wx/ffile.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
-// RCS-ID:      $Id: ffile.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +49,7 @@ public:
   // assign an existing file descriptor and get it back from wxFFile object
   void Attach(FILE *lfp, const wxString& name = wxEmptyString)
     { Close(); m_fp = lfp; m_name = name; }
-  void Detach() { m_fp = NULL; }
+  FILE* Detach() { FILE* fpOld = m_fp; m_fp = NULL; return fpOld; }
   FILE *fp() const { return m_fp; }
 
   // read/write (unbuffered)
diff --git a/Externals/wxWidgets3/include/wx/file.h b/Externals/wxWidgets3/include/wx/file.h
index 7fa7377c6d..00ac471abf 100644
--- a/Externals/wxWidgets3/include/wx/file.h
+++ b/Externals/wxWidgets3/include/wx/file.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: file.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,7 +18,7 @@
 
 #include  "wx/string.h"
 #include  "wx/filefn.h"
-#include  "wx/strconv.h"
+#include  "wx/convauto.h"
 
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO
@@ -66,16 +65,18 @@ public:
 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int lfd) { Close(); m_fd = lfd; m_lasterror = 0; }
-  void Detach()       { m_fd = fd_invalid;  }
+  int  Detach() { int fdOld = m_fd; m_fd = fd_invalid; return fdOld; }
   int  fd() const { return m_fd; }
 
   // read/write (unbuffered)
+    // read all data from the file into a string (useful for text files)
+  bool ReadAll(wxString *str, const wxMBConv& conv = wxConvAuto());
     // returns number of bytes read or wxInvalidOffset on error
   ssize_t Read(void *pBuf, size_t nCount);
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
-  bool Write(const wxString& s, const wxMBConv& conv = wxMBConvUTF8());
+  bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto());
     // flush data not yet written
   bool Flush();
 
diff --git a/Externals/wxWidgets3/include/wx/fileconf.h b/Externals/wxWidgets3/include/wx/fileconf.h
index ab8e78dc96..c16129a5b1 100644
--- a/Externals/wxWidgets3/include/wx/fileconf.h
+++ b/Externals/wxWidgets3/include/wx/fileconf.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
-// RCS-ID:      $Id: fileconf.h 60643 2009-05-15 18:02:41Z VZ $
 // Copyright:   (c) 1997 Karsten Ballueder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/filectrl.h b/Externals/wxWidgets3/include/wx/filectrl.h
index 157009ec13..e4c302f7d5 100644
--- a/Externals/wxWidgets3/include/wx/filectrl.h
+++ b/Externals/wxWidgets3/include/wx/filectrl.h
@@ -5,7 +5,6 @@
 // Author:      Diaa M. Sami
 // Modified by:
 // Created:     Jul-07-2007
-// RCS-ID:      $Id: filectrl.h 64429 2010-05-29 10:35:47Z VZ $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/filedlg.h b/Externals/wxWidgets3/include/wx/filedlg.h
index 45178d2d43..d105493cc2 100644
--- a/Externals/wxWidgets3/include/wx/filedlg.h
+++ b/Externals/wxWidgets3/include/wx/filedlg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: filedlg.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -122,6 +121,9 @@ public:
     virtual wxString GetWildcard() const { return m_wildCard; }
     virtual int GetFilterIndex() const { return m_filterIndex; }
 
+    virtual wxString GetCurrentlySelectedFilename() const
+        { return m_currentlySelectedFilename; }
+
     // this function is called with wxFileDialog as parameter and should
     // create the window containing the extra controls we want to show in it
     typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
@@ -155,6 +157,13 @@ protected:
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;
+
+    // Currently selected, but not yet necessarily accepted by the user, file.
+    // This should be updated whenever the selection in the control changes by
+    // the platform-specific code to provide a useful implementation of
+    // GetCurrentlySelectedFilename().
+    wxString      m_currentlySelectedFilename;
+
     wxWindow*     m_extraControl;
 
     // returns true if control is created (if it already exists returns false)
diff --git a/Externals/wxWidgets3/include/wx/filefn.h b/Externals/wxWidgets3/include/wx/filefn.h
index ebd0c373c4..95b3051c05 100644
--- a/Externals/wxWidgets3/include/wx/filefn.h
+++ b/Externals/wxWidgets3/include/wx/filefn.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: filefn.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,22 +21,9 @@
     #include <time.h>
 #endif
 
-#ifdef __WXWINCE__
-// Nothing
-#elif !defined(__MWERKS__)
+#ifndef __WXWINCE__
     #include <sys/types.h>
     #include <sys/stat.h>
-#else
-    #ifdef __MACH__
-        #include <sys/types.h>
-        #include <utime.h>
-        #include <sys/stat.h>
-        #include <unistd.h>
-    #else
-        #include <stat.h>
-        #include <unistd.h>
-        #include <unix.h>
-    #endif
 #endif
 
 #ifdef __OS2__
@@ -58,7 +44,7 @@
 #endif
 
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
+#if !defined( __GNUWIN32__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
     #include <direct.h>
     #include <dos.h>
     #include <io.h>
@@ -106,12 +92,10 @@
     #endif
 #endif
 
-#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) )
+#if defined(__VISUALC__) && !defined(__WXWINCE__)
     typedef _off_t off_t;
 #elif defined(__SYMANTEC__)
     typedef long off_t;
-#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
-    typedef long off_t;
 #endif
 
 enum wxSeekMode
@@ -186,6 +170,7 @@ enum wxPosixPermissions
     #define wxFileOffsetFmtSpec wxT("I64")
     WXDLLIMPEXP_BASE int wxCRT_Open(const wxChar *filename, int oflag, int WXUNUSED(pmode));
     WXDLLIMPEXP_BASE int wxCRT_Access(const wxChar *name, int WXUNUSED(how));
+    WXDLLIMPEXP_BASE int wxCRT_Chmod(const wxChar *name, int WXUNUSED(how));
     WXDLLIMPEXP_BASE int wxClose(int fd);
     WXDLLIMPEXP_BASE int wxFsync(int WXUNUSED(fd));
     WXDLLIMPEXP_BASE int wxRead(int fd, void *buf, unsigned int count);
@@ -206,7 +191,6 @@ enum wxPosixPermissions
         defined(__MINGW64__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \
                                 wxCHECK_W32API_VERSION(0, 5)) || \
-        defined(__MWERKS__) || \
         defined(__DMC__) || \
         defined(__WATCOMC__) || \
         defined(__BORLANDC__) \
@@ -220,7 +204,7 @@ enum wxPosixPermissions
     #if defined(__VISUALC__)
         #define wxHAS_HUGE_FILES 1
     #elif defined(__MINGW32__) || defined(__MINGW64__)
-        #define wxHAS_HUGE_FILES 1
+        #define wxHAS_HUGE_FILES 1f
     #elif defined(_LARGE_FILES)
         #define wxHAS_HUGE_FILES 1
     #endif
@@ -236,9 +220,8 @@ enum wxPosixPermissions
         #define wxFtell ftello64
     #endif
 
-    // other Windows compilers (DMC, Watcom, Metrowerks and Borland) don't have
-    // huge file support (or at least not all functions needed for it by wx)
-    // currently
+    // other Windows compilers (DMC, Watcom, and Borland) don't have huge file
+    // support (or at least not all functions needed for it by wx) currently
 
     // types
 
@@ -309,20 +292,8 @@ enum wxPosixPermissions
     // complications
     #define   wxClose      wxPOSIX_IDENT(close)
 
-    #if defined(__MWERKS__)
-        #if __MSL__ >= 0x6000
-            #define wxRead(fd, buf, nCount)  _read(fd, (void *)buf, nCount)
-            #define wxWrite(fd, buf, nCount) _write(fd, (void *)buf, nCount)
-        #else
-            #define wxRead(fd, buf, nCount)\
-                  _read(fd, (const char *)buf, nCount)
-            #define wxWrite(fd, buf, nCount)\
-                  _write(fd, (const char *)buf, nCount)
-        #endif
-    #else // __MWERKS__
-        #define wxRead         wxPOSIX_IDENT(read)
-        #define wxWrite        wxPOSIX_IDENT(write)
-    #endif
+    #define wxRead         wxPOSIX_IDENT(read)
+    #define wxWrite        wxPOSIX_IDENT(write)
 
     #ifdef wxHAS_HUGE_FILES
         #ifndef __MINGW64__
@@ -360,6 +331,7 @@ enum wxPosixPermissions
     // first the ANSI versions
     #define   wxCRT_OpenA       wxPOSIX_IDENT(open)
     #define   wxCRT_AccessA     wxPOSIX_IDENT(access)
+    #define   wxCRT_ChmodA      wxPOSIX_IDENT(chmod)
     #define   wxCRT_MkDirA      wxPOSIX_IDENT(mkdir)
     #define   wxCRT_RmDirA      wxPOSIX_IDENT(rmdir)
     #ifdef wxHAS_HUGE_FILES
@@ -391,6 +363,7 @@ enum wxPosixPermissions
         #endif
 
         #define   wxCRT_AccessW     _waccess
+        #define   wxCRT_ChmodW      _wchmod
         #define   wxCRT_MkDirW      _wmkdir
         #define   wxCRT_RmDirW      _wrmdir
         #ifdef wxHAS_HUGE_FILES
@@ -409,6 +382,8 @@ enum wxPosixPermissions
                                                int flags, int mode);
             WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name,
                                                  int mode);
+            WXDLLIMPEXP_BASE int wxMSLU__wchmod(const wxChar *name,
+                                                 int mode);
             WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
             WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
 
@@ -418,12 +393,14 @@ enum wxPosixPermissions
             #define   wxCRT_Open       wxMSLU__wopen
 
             #define   wxCRT_Access     wxMSLU__waccess
+            #define   wxCRT_Chmod      wxMSLU__wchmod
             #define   wxCRT_MkDir      wxMSLU__wmkdir
             #define   wxCRT_RmDir      wxMSLU__wrmdir
             #define   wxCRT_Stat       wxMSLU__wstat
         #else // !wxUSE_UNICODE_MSLU
             #define wxCRT_Open      wxCRT_OpenW
             #define wxCRT_Access    wxCRT_AccessW
+            #define wxCRT_Chmod     wxCRT_ChmodW
             #define wxCRT_MkDir     wxCRT_MkDirW
             #define wxCRT_RmDir     wxCRT_RmDirW
             #define wxCRT_Stat      wxCRT_StatW
@@ -431,6 +408,7 @@ enum wxPosixPermissions
     #else // !wxUSE_UNICODE
         #define wxCRT_Open      wxCRT_OpenA
         #define wxCRT_Access    wxCRT_AccessA
+        #define wxCRT_Chmod     wxCRT_ChmodA
         #define wxCRT_MkDir     wxCRT_MkDirA
         #define wxCRT_RmDir     wxCRT_RmDirA
         #define wxCRT_Stat      wxCRT_StatA
@@ -498,7 +476,6 @@ enum wxPosixPermissions
     #define   wxSeek       lseek
     #define   wxFsync      fsync
     #define   wxEof        eof
-
     #define   wxCRT_MkDir      mkdir
     #define   wxCRT_RmDir      rmdir
 
@@ -510,6 +487,7 @@ enum wxPosixPermissions
     #define   wxCRT_Stat       stat
     #define   wxCRT_Lstat      lstat
     #define   wxCRT_Access     access
+    #define   wxCRT_Chmod      chmod
 
     #define wxHAS_NATIVE_LSTAT
 #endif // platforms
@@ -531,6 +509,8 @@ enum wxPosixPermissions
 
 inline int wxAccess(const wxString& path, mode_t mode)
     { return wxCRT_Access(path.fn_str(), mode); }
+inline int wxChmod(const wxString& path, mode_t mode)
+    { return wxCRT_Chmod(path.fn_str(), mode); }
 inline int wxOpen(const wxString& path, int flags, mode_t mode)
     { return wxCRT_Open(path.fn_str(), flags, mode); }
 
diff --git a/Externals/wxWidgets3/include/wx/filehistory.h b/Externals/wxWidgets3/include/wx/filehistory.h
index 83afeaa3ec..b6cb1cb501 100644
--- a/Externals/wxWidgets3/include/wx/filehistory.h
+++ b/Externals/wxWidgets3/include/wx/filehistory.h
@@ -3,7 +3,6 @@
 // Purpose:     wxFileHistory class
 // Author:      Julian Smart, Vaclav Slavik
 // Created:     2010-05-03
-// RCS-ID:      $Id: filehistory.h 70503 2012-02-03 17:27:13Z VZ $
 // Copyright:   (c) Julian Smart, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/filename.h b/Externals/wxWidgets3/include/wx/filename.h
index e1454406b7..1a16e14050 100644
--- a/Externals/wxWidgets3/include/wx/filename.h
+++ b/Externals/wxWidgets3/include/wx/filename.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.00
-// RCS-ID:      $Id: filename.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2000 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,17 +11,6 @@
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 
-/*
-    TODO:
-
-    1. support for drives under Windows
-    2. more file operations:
-        a) chmod()
-        b) [acm]time() - get and set
-        c) rename()?
-    3. SameFileAs() function to compare inodes under Unix
- */
-
 #include "wx/arrstr.h"
 #include "wx/filefn.h"
 #include "wx/datetime.h"
@@ -108,6 +96,22 @@ enum
     wxPATH_RMDIR_RECURSIVE  = 0x0002   // delete all recursively (dangerous!)
 };
 
+// FileExists flags
+enum
+{
+    wxFILE_EXISTS_REGULAR   = 0x0001,  // check for existence of a regular file
+    wxFILE_EXISTS_DIR       = 0x0002,  // check for existence of a directory
+    wxFILE_EXISTS_SYMLINK   = 0x1004,  // check for existence of a symbolic link;
+                                       // also sets wxFILE_EXISTS_NO_FOLLOW as
+                                       // it would never be satisfied otherwise
+    wxFILE_EXISTS_DEVICE    = 0x0008,  // check for existence of a device
+    wxFILE_EXISTS_FIFO      = 0x0016,  // check for existence of a FIFO
+    wxFILE_EXISTS_SOCKET    = 0x0032,  // check for existence of a socket
+                                       // gap for future types
+    wxFILE_EXISTS_NO_FOLLOW = 0x1000,  // don't dereference a contained symlink
+    wxFILE_EXISTS_ANY       = 0x1FFF   // check for existence of anything
+};
+
 #if wxUSE_LONGLONG
 // error code of wxFileName::GetSize()
 extern WXDLLIMPEXP_DATA_BASE(const wxULongLong) wxInvalidSize;
@@ -132,13 +136,13 @@ public:
         // is contructed (the name will be empty), otherwise a file name and
         // extension are extracted from it
     wxFileName( const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE )
-        { Assign( fullpath, format ); }
+        { Assign( fullpath, format ); m_dontFollowLinks = false; }
 
         // from a directory name and a file name
     wxFileName(const wxString& path,
                const wxString& name,
                wxPathFormat format = wxPATH_NATIVE)
-        { Assign(path, name, format); }
+        { Assign(path, name, format); m_dontFollowLinks = false; }
 
         // from a volume, directory name, file base name and extension
     wxFileName(const wxString& volume,
@@ -146,14 +150,14 @@ public:
                const wxString& name,
                const wxString& ext,
                wxPathFormat format = wxPATH_NATIVE)
-        { Assign(volume, path, name, ext, format); }
+        { Assign(volume, path, name, ext, format); m_dontFollowLinks = false; }
 
         // from a directory name, file base name and extension
     wxFileName(const wxString& path,
                const wxString& name,
                const wxString& ext,
                wxPathFormat format = wxPATH_NATIVE)
-        { Assign(path, name, ext, format); }
+        { Assign(path, name, ext, format); m_dontFollowLinks = false; }
 
         // the same for delayed initialization
 
@@ -224,8 +228,8 @@ public:
 
         // does anything at all with this name (i.e. file, directory or some
         // other file system object such as a device, socket, ...) exist?
-    bool Exists() const { return Exists(GetFullPath()); }
-    static bool Exists(const wxString& path);
+    bool Exists(int flags = wxFILE_EXISTS_ANY) const;
+    static bool Exists(const wxString& path, int flags = wxFILE_EXISTS_ANY);
 
 
         // checks on most common flags for files/directories;
@@ -250,6 +254,10 @@ public:
     bool IsFileExecutable() const { return wxIsExecutable(GetFullPath()); }
     static bool IsFileExecutable(const wxString &path) { return wxFileExists(path) && wxIsExecutable(path); }
 
+        // set the file permissions to a combination of wxPosixPermissions enum
+        // values
+    bool SetPermissions(int permissions);
+
 
     // time functions
 #if wxUSE_DATETIME
@@ -367,6 +375,26 @@ public:
         { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE |
                            wxPATH_NORM_TILDE, cwd, format); }
 
+
+    // If the path is a symbolic link (Unix-only), indicate that all
+    // filesystem operations on this path should be performed on the link
+    // itself and not on the file it points to, as is the case by default.
+    //
+    // No effect if this is not a symbolic link.
+    void DontFollowLink()
+    {
+        m_dontFollowLinks = true;
+    }
+
+    // If the path is a symbolic link (Unix-only), returns whether various
+    // file operations should act on the link itself, or on its target.
+    //
+    // This does not test if the path is really a symlink or not.
+    bool ShouldFollowLink() const
+    {
+        return !m_dontFollowLinks;
+    }
+
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
         // if the path is a shortcut, return the target and optionally,
         // the arguments
@@ -454,16 +482,16 @@ public:
 
     // Dir accessors
     size_t GetDirCount() const { return m_dirs.size(); }
-    void AppendDir(const wxString& dir);
+    bool AppendDir(const wxString& dir);
     void PrependDir(const wxString& dir);
-    void InsertDir(size_t before, const wxString& dir);
+    bool InsertDir(size_t before, const wxString& dir);
     void RemoveDir(size_t pos);
     void RemoveLastDir() { RemoveDir(GetDirCount() - 1); }
 
     // Other accessors
     void SetExt( const wxString &ext )          { m_ext = ext; m_hasExt = !m_ext.empty(); }
-    void ClearExt()                             { m_ext = wxEmptyString; m_hasExt = false; }
-    void SetEmptyExt()                          { m_ext = wxT(""); m_hasExt = true; }
+    void ClearExt()                             { m_ext.clear(); m_hasExt = false; }
+    void SetEmptyExt()                          { m_ext.clear(); m_hasExt = true; }
     wxString GetExt() const                     { return m_ext; }
     bool HasExt() const                         { return m_hasExt; }
 
@@ -555,12 +583,12 @@ public:
 
         // returns the size in a human readable form
     wxString
-    GetHumanReadableSize(const wxString& nullsize = _("Not available"),
+    GetHumanReadableSize(const wxString& nullsize = wxGetTranslation("Not available"),
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,
-                         const wxString& nullsize = _("Not available"),
+                         const wxString& nullsize = wxGetTranslation("Not available"),
                          int precision = 1,
                          wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG
@@ -606,6 +634,11 @@ private:
     // the difference is important as file with name "foo" and without
     // extension has full name "foo" while with empty extension it is "foo."
     bool            m_hasExt;
+
+    // by default, symlinks are dereferenced but this flag can be set with
+    // DontFollowLink() to change this and make different operations work on
+    // this file path itself instead of the target of the symlink
+    bool            m_dontFollowLinks;
 };
 
 #endif // _WX_FILENAME_H_
diff --git a/Externals/wxWidgets3/include/wx/filepicker.h b/Externals/wxWidgets3/include/wx/filepicker.h
index 7796ac33b3..5264ddb3ea 100644
--- a/Externals/wxWidgets3/include/wx/filepicker.h
+++ b/Externals/wxWidgets3/include/wx/filepicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: filepicker.h 70043 2011-12-18 12:34:47Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -59,8 +58,8 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent );
 
 // ----------------------------------------------------------------------------
 // event types and macros
@@ -72,9 +71,9 @@ typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent&
     wxEVENT_HANDLER_CAST(wxFileDirPickerEventFunction, func)
 
 #define EVT_FILEPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FILEPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FILEPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
 #define EVT_DIRPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
 
 // ----------------------------------------------------------------------------
 // wxFileDirPickerWidgetBase: a generic abstract interface which must be
@@ -129,7 +128,7 @@ protected:
 //       requires that all classes being mapped as wx{File|Dir}PickerWidget have the
 //       same prototype for the contructor...
 // since GTK >= 2.6, there is GtkFileButton
-#if defined(__WXGTK26__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/filepicker.h"
     #define wxFilePickerWidget      wxFileButton
     #define wxDirPickerWidget       wxDirButton
@@ -148,7 +147,7 @@ protected:
 class WXDLLIMPEXP_CORE wxFileDirPickerCtrlBase : public wxPickerBase
 {
 public:
-    wxFileDirPickerCtrlBase() : m_bIgnoreNextTextCtrlUpdate(false) {}
+    wxFileDirPickerCtrlBase() {}
 
 protected:
     // NB: no default values since this function will never be used
@@ -183,11 +182,6 @@ public:        // internal functions
     // event handler for our picker
     void OnFileDirChange(wxFileDirPickerEvent &);
 
-    // Returns TRUE if the current path is a valid one
-    // (i.e. a valid file for a wxFilePickerWidget or a valid
-    //  folder for a wxDirPickerWidget).
-    virtual bool CheckPath(const wxString &str) const = 0;
-
     // TRUE if any textctrl change should update the current working directory
     virtual bool IsCwdToUpdate() const = 0;
 
@@ -209,9 +203,6 @@ protected:
 
 protected:
 
-    // true if the next UpdateTextCtrl() call is to ignore
-    bool m_bIgnoreNextTextCtrlUpdate;
-
     // m_picker object as wxFileDirPickerWidgetBase interface
     wxFileDirPickerWidgetBase *m_pickerIface;
 };
@@ -275,9 +266,6 @@ public:
 
 public:     // overrides
 
-    // return true if the given path is valid for this control
-    bool CheckPath(const wxString& path) const;
-
     // return the text control value in canonical form
     wxString GetTextCtrlValue() const;
 
@@ -285,11 +273,11 @@ public:     // overrides
         { return HasFlag(wxFLP_CHANGE_DIR); }
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+        { return wxEVT_FILEPICKER_CHANGED; }
 
     virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
     {
-        sender->Connect( wxEVT_COMMAND_FILEPICKER_CHANGED,
+        sender->Connect( wxEVT_FILEPICKER_CHANGED,
             wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
             NULL, eventSink );
     }
@@ -379,19 +367,17 @@ public:
 
 public:     // overrides
 
-    bool CheckPath(const wxString &path) const;
-
     wxString GetTextCtrlValue() const;
 
     bool IsCwdToUpdate() const
         { return HasFlag(wxDIRP_CHANGE_DIR); }
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+        { return wxEVT_DIRPICKER_CHANGED; }
 
     virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
     {
-        sender->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED,
+        sender->Connect( wxEVT_DIRPICKER_CHANGED,
             wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
             NULL, eventSink );
     }
@@ -426,5 +412,9 @@ private:
 
 #endif      // wxUSE_DIRPICKERCTRL
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_FILEPICKER_CHANGED   wxEVT_FILEPICKER_CHANGED
+#define wxEVT_COMMAND_DIRPICKER_CHANGED    wxEVT_DIRPICKER_CHANGED
+
 #endif // _WX_FILEDIRPICKER_H_BASE_
 
diff --git a/Externals/wxWidgets3/include/wx/filesys.h b/Externals/wxWidgets3/include/wx/filesys.h
index d9d40edeaf..3bd6e426c7 100644
--- a/Externals/wxWidgets3/include/wx/filesys.h
+++ b/Externals/wxWidgets3/include/wx/filesys.h
@@ -3,7 +3,6 @@
 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id: filesys.h 58757 2009-02-08 11:45:59Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -293,7 +292,20 @@ protected:
     static wxString ms_root;
 };
 
+// Stream reading data from wxFSFile: this allows to use virtual files with any
+// wx functions accepting streams.
+class WXDLLIMPEXP_BASE wxFSInputStream : public wxWrapperInputStream
+{
+public:
+    // Notice that wxFS_READ is implied in flags.
+    wxFSInputStream(const wxString& filename, int flags = 0);
+    virtual ~wxFSInputStream();
 
+private:
+    wxFSFile* m_file;
+
+    wxDECLARE_NO_COPY_CLASS(wxFSInputStream);
+};
 
 #endif
   // wxUSE_FILESYSTEM
diff --git a/Externals/wxWidgets3/include/wx/flags.h b/Externals/wxWidgets3/include/wx/flags.h
index 1b15bbe4f4..c45bafabdc 100644
--- a/Externals/wxWidgets3/include/wx/flags.h
+++ b/Externals/wxWidgets3/include/wx/flags.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: flags.h 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/fmappriv.h b/Externals/wxWidgets3/include/wx/fmappriv.h
index 658ad6350d..6637088626 100644
--- a/Externals/wxWidgets3/include/wx/fmappriv.h
+++ b/Externals/wxWidgets3/include/wx/fmappriv.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
-// RCS-ID:      $Id: fmappriv.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/font.h b/Externals/wxWidgets3/include/wx/font.h
index 6e3c5237ab..10a6f0e5d7 100644
--- a/Externals/wxWidgets3/include/wx/font.h
+++ b/Externals/wxWidgets3/include/wx/font.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99
-// RCS-ID:      $Id: font.h 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -111,6 +110,145 @@ enum wxFontFlag
                       wxFONTFLAG_STRIKETHROUGH
 };
 
+// ----------------------------------------------------------------------------
+// wxFontInfo describes a wxFont
+// ----------------------------------------------------------------------------
+
+class wxFontInfo
+{
+public:
+    // Default ctor uses the default font size appropriate for the current
+    // platform.
+    wxFontInfo()
+        { InitPointSize(-1); }
+
+    // These ctors specify the font size, either in points or in pixels.
+    wxEXPLICIT wxFontInfo(int pointSize)
+        { InitPointSize(pointSize); }
+    wxEXPLICIT wxFontInfo(const wxSize& pixelSize) : m_pixelSize(pixelSize)
+        { Init(); }
+
+    // Setters for the various attributes. All of them return the object itself
+    // so that the calls to them could be chained.
+    wxFontInfo& Family(wxFontFamily family)
+        { m_family = family; return *this; }
+    wxFontInfo& FaceName(const wxString& faceName)
+        { m_faceName = faceName; return *this; }
+
+    wxFontInfo& Bold(bool bold = true)
+        { SetFlag(wxFONTFLAG_BOLD, bold); return *this; }
+    wxFontInfo& Light(bool light = true)
+        { SetFlag(wxFONTFLAG_LIGHT, light); return *this; }
+
+    wxFontInfo& Italic(bool italic = true)
+        { SetFlag(wxFONTFLAG_ITALIC, italic); return *this; }
+    wxFontInfo& Slant(bool slant = true)
+        { SetFlag(wxFONTFLAG_SLANT, slant); return *this; }
+
+    wxFontInfo& AntiAliased(bool antiAliased = true)
+        { SetFlag(wxFONTFLAG_ANTIALIASED, antiAliased); return *this; }
+    wxFontInfo& Underlined(bool underlined = true)
+        { SetFlag(wxFONTFLAG_UNDERLINED, underlined); return *this; }
+    wxFontInfo& Strikethrough(bool strikethrough = true)
+        { SetFlag(wxFONTFLAG_STRIKETHROUGH, strikethrough); return *this; }
+
+    wxFontInfo& Encoding(wxFontEncoding encoding)
+        { m_encoding = encoding; return *this; }
+
+
+    // Set all flags at once.
+    wxFontInfo& AllFlags(int flags)
+        { m_flags = flags; return *this; }
+
+
+    // Accessors are mostly meant to be used by wxFont itself to extract the
+    // various pieces of the font description.
+
+    bool IsUsingSizeInPixels() const { return m_pixelSize != wxDefaultSize; }
+    int GetPointSize() const { return m_pointSize; }
+    wxSize GetPixelSize() const { return m_pixelSize; }
+    wxFontFamily GetFamily() const { return m_family; }
+    const wxString& GetFaceName() const { return m_faceName; }
+
+    wxFontStyle GetStyle() const
+    {
+        return m_flags & wxFONTFLAG_ITALIC
+                        ? wxFONTSTYLE_ITALIC
+                        : m_flags & wxFONTFLAG_SLANT
+                            ? wxFONTSTYLE_SLANT
+                            : wxFONTSTYLE_NORMAL;
+    }
+
+    wxFontWeight GetWeight() const
+    {
+        return m_flags & wxFONTFLAG_LIGHT
+                        ? wxFONTWEIGHT_LIGHT
+                        : m_flags & wxFONTFLAG_BOLD
+                            ? wxFONTWEIGHT_BOLD
+                            : wxFONTWEIGHT_NORMAL;
+    }
+
+    bool IsAntiAliased() const
+    {
+        return (m_flags & wxFONTFLAG_ANTIALIASED) != 0;
+    }
+
+    bool IsUnderlined() const
+    {
+        return (m_flags & wxFONTFLAG_UNDERLINED) != 0;
+    }
+
+    bool IsStrikethrough() const
+    {
+        return (m_flags & wxFONTFLAG_STRIKETHROUGH) != 0;
+    }
+
+    wxFontEncoding GetEncoding() const { return m_encoding; }
+
+
+    // Default copy ctor, assignment operator and dtor are OK.
+
+private:
+    // Common part of all ctor, initializing everything except the size (which
+    // is initialized by the ctors themselves).
+    void Init()
+    {
+        m_family = wxFONTFAMILY_DEFAULT;
+        m_flags = wxFONTFLAG_DEFAULT;
+        m_encoding = wxFONTENCODING_DEFAULT;
+    }
+
+    void InitPointSize(int pointSize)
+    {
+        Init();
+
+        m_pointSize = pointSize;
+        m_pixelSize = wxDefaultSize;
+    }
+
+    // Turn on or off the given bit in m_flags depending on the value of the
+    // boolean argument.
+    void SetFlag(int flag, bool on)
+    {
+        if ( on )
+            m_flags |= flag;
+        else
+            m_flags &= ~flag;
+    }
+
+    // The size information: if m_pixelSize is valid (!= wxDefaultSize), then
+    // it is used. Otherwise m_pointSize is used, taking into account that if
+    // it is == -1, it means that the platform dependent font size should be
+    // used.
+    int m_pointSize;
+    wxSize m_pixelSize;
+
+    wxFontFamily m_family;
+    wxString m_faceName;
+    int m_flags;
+    wxFontEncoding m_encoding;
+};
+
 // ----------------------------------------------------------------------------
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
@@ -124,6 +262,7 @@ public:
         derived classes should provide the following ctors:
 
     wxFont();
+    wxFont(const wxFontInfo& info);
     wxFont(const wxString& nativeFontInfoString);
     wxFont(const wxNativeFontInfo& info);
     wxFont(int size,
@@ -293,7 +432,7 @@ protected:
     virtual wxFontFamily DoGetFamily() const = 0;
 
 
-    // Helper functions to recover wxFONTSTYLE/wxFONTWEIGHT and underlined flg
+    // Helper functions to recover wxFONTSTYLE/wxFONTWEIGHT and underlined flag
     // values from flags containing a combination of wxFONTFLAG_XXX.
     static wxFontStyle GetStyleFromFlags(int flags)
     {
@@ -318,6 +457,10 @@ protected:
         return (flags & wxFONTFLAG_UNDERLINED) != 0;
     }
 
+    static bool GetStrikethroughFromFlags(int flags)
+    {
+        return (flags & wxFONTFLAG_STRIKETHROUGH) != 0;
+    }
 
 private:
     // the currently default encoding: by default, it's the default system
diff --git a/Externals/wxWidgets3/include/wx/fontdata.h b/Externals/wxWidgets3/include/wx/fontdata.h
index c850dbc8db..87571ce940 100644
--- a/Externals/wxWidgets3/include/wx/fontdata.h
+++ b/Externals/wxWidgets3/include/wx/fontdata.h
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/fontdata.h
 // Author:      Julian Smart
-// RCS-ID:      $Id: fontdata.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/fontdlg.h b/Externals/wxWidgets3/include/wx/fontdlg.h
index b040d15e58..74a6e6fccf 100644
--- a/Externals/wxWidgets3/include/wx/fontdlg.h
+++ b/Externals/wxWidgets3/include/wx/fontdlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.05.02
-// RCS-ID:      $Id: fontdlg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,8 +36,6 @@ public:
     bool Create(wxWindow *parent, const wxFontData& data)
         { InitFontData(&data); return Create(parent); }
 
-    virtual ~wxFontDialogBase();
-
     // retrieve the font data
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
diff --git a/Externals/wxWidgets3/include/wx/fontenc.h b/Externals/wxWidgets3/include/wx/fontenc.h
index 08ac5b6031..5263997ae9 100644
--- a/Externals/wxWidgets3/include/wx/fontenc.h
+++ b/Externals/wxWidgets3/include/wx/fontenc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.03.00
-// RCS-ID:      $Id: fontenc.h 65056 2010-07-23 23:32:40Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,6 +64,8 @@ enum wxFontEncoding
     wxFONTENCODING_CP1255,          // WinHebrew
     wxFONTENCODING_CP1256,          // WinArabic
     wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
+    wxFONTENCODING_CP1258,          // WinVietnamese
+    wxFONTENCODING_CP1361,          // Johab Korean character set.
     wxFONTENCODING_CP12_MAX,
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
@@ -151,7 +152,11 @@ enum wxFontEncoding
     wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS
 
         // Korean (CP 949 not actually the same but close enough)
-    wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949
+    wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949,
+    wxFONTENCODING_JOHAB = wxFONTENCODING_CP1361,
+
+        // Vietnamese
+    wxFONTENCODING_VIETNAMESE = wxFONTENCODING_CP1258
 };
 
 #endif // _WX_FONTENC_H_
diff --git a/Externals/wxWidgets3/include/wx/fontenum.h b/Externals/wxWidgets3/include/wx/fontenum.h
index e3b6867128..782dc7fd9e 100644
--- a/Externals/wxWidgets3/include/wx/fontenum.h
+++ b/Externals/wxWidgets3/include/wx/fontenum.h
@@ -5,7 +5,6 @@
 // Modified by: extended to enumerate more than just font facenames and works
 //              not only on Windows now (VZ)
 // Created:     04/01/98
-// RCS-ID:      $Id: fontenum.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/fontmap.h b/Externals/wxWidgets3/include/wx/fontmap.h
index 368d9beb97..c640daa83f 100644
--- a/Externals/wxWidgets3/include/wx/fontmap.h
+++ b/Externals/wxWidgets3/include/wx/fontmap.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.11.99
-// RCS-ID:      $Id: fontmap.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/fontpicker.h b/Externals/wxWidgets3/include/wx/fontpicker.h
index 75c1d961ec..1bacc3a4a0 100644
--- a/Externals/wxWidgets3/include/wx/fontpicker.h
+++ b/Externals/wxWidgets3/include/wx/fontpicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: fontpicker.h 58718 2009-02-07 18:59:25Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -100,8 +99,7 @@ class WXDLLIMPEXP_CORE wxFontPickerCtrl : public wxPickerBase
 {
 public:
     wxFontPickerCtrl()
-        : m_bIgnoreNextTextCtrlUpdate(false),
-        m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
+        : m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
     {
     }
 
@@ -116,8 +114,7 @@ public:
                      long style = wxFNTP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = wxFontPickerCtrlNameStr)
-        : m_bIgnoreNextTextCtrlUpdate(false),
-          m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
+        : m_nMaxPointSize(wxFNTP_MAXPOINT_SIZE)
     {
         Create(parent, id, initial, pos, size, style, validator, name);
     }
@@ -165,9 +162,6 @@ protected:
     long GetPickerStyle(long style) const
         { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); }
 
-    // true if the next UpdateTextCtrl() call is to ignore
-    bool m_bIgnoreNextTextCtrlUpdate;
-
     // the maximum pointsize allowed to the user
     unsigned int m_nMaxPointSize;
 
@@ -180,14 +174,14 @@ private:
 // wxFontPickerEvent: used by wxFontPickerCtrl only
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FONTPICKER_CHANGED, wxFontPickerEvent );
 
 class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent
 {
 public:
     wxFontPickerEvent() {}
     wxFontPickerEvent(wxObject *generator, int id, const wxFont &f)
-        : wxCommandEvent(wxEVT_COMMAND_FONTPICKER_CHANGED, id),
+        : wxCommandEvent(wxEVT_FONTPICKER_CHANGED, id),
           m_font(f)
     {
         SetEventObject(generator);
@@ -215,7 +209,10 @@ typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&);
     wxEVENT_HANDLER_CAST(wxFontPickerEventFunction, func)
 
 #define EVT_FONTPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_FONTPICKER_CHANGED   wxEVT_FONTPICKER_CHANGED
 
 
 #endif // wxUSE_FONTPICKERCTRL
diff --git a/Externals/wxWidgets3/include/wx/fontutil.h b/Externals/wxWidgets3/include/wx/fontutil.h
index 232ef8a8e3..a4e0a7d4d5 100644
--- a/Externals/wxWidgets3/include/wx/fontutil.h
+++ b/Externals/wxWidgets3/include/wx/fontutil.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id: fontutil.h 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -71,6 +70,11 @@ class WXDLLIMPEXP_CORE wxNativeFontInfo
 public:
 #if wxUSE_PANGO
     PangoFontDescription *description;
+
+    // Pango font description doesn't have these attributes, so we store them
+    // separately and handle them ourselves in {To,From}String() methods.
+    bool m_underlined;
+    bool m_strikethrough;
 #elif defined(_WX_X_FONTLIKE)
     // the members can't be accessed directly as we only parse the
     // xFontName on demand
@@ -138,9 +142,7 @@ public:
         return *this;
     }
 
-#if wxOSX_USE_CORE_TEXT
     void Init(CTFontDescriptorRef descr);
-#endif
     void Init(const wxNativeFontInfo& info);
     void Init(int size,
                   wxFontFamily family,
diff --git a/Externals/wxWidgets3/include/wx/frame.h b/Externals/wxWidgets3/include/wx/frame.h
index 396dd98f5a..41927f775a 100644
--- a/Externals/wxWidgets3/include/wx/frame.h
+++ b/Externals/wxWidgets3/include/wx/frame.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.11.99
-// RCS-ID:      $Id: frame.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -205,6 +204,10 @@ protected:
     // frame
     virtual void AttachMenuBar(wxMenuBar *menubar);
 
+    // Return true if we should update the menu item state from idle event
+    // handler or false if we should delay it until the menu is opened.
+    static bool ShouldUpdateMenuFromIdle();
+
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 
diff --git a/Externals/wxWidgets3/include/wx/fs_arc.h b/Externals/wxWidgets3/include/wx/fs_arc.h
index d4957504c3..e65b8fc7b6 100644
--- a/Externals/wxWidgets3/include/wx/fs_arc.h
+++ b/Externals/wxWidgets3/include/wx/fs_arc.h
@@ -3,7 +3,6 @@
 // Purpose:     Archive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
-// CVS-ID:      $Id: fs_arc.h 58757 2009-02-08 11:45:59Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/fs_filter.h b/Externals/wxWidgets3/include/wx/fs_filter.h
index 807eccbd6f..8e8afda4e2 100644
--- a/Externals/wxWidgets3/include/wx/fs_filter.h
+++ b/Externals/wxWidgets3/include/wx/fs_filter.h
@@ -3,7 +3,6 @@
 // Purpose:     Filter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id: fs_filter.h 58757 2009-02-08 11:45:59Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/fs_zip.h b/Externals/wxWidgets3/include/wx/fs_zip.h
index 8d39e9fc4d..197a46a5ef 100644
--- a/Externals/wxWidgets3/include/wx/fs_zip.h
+++ b/Externals/wxWidgets3/include/wx/fs_zip.h
@@ -3,7 +3,6 @@
 // Purpose:     wxZipFSHandler typedef for compatibility
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id: fs_zip.h 42713 2006-10-30 11:56:12Z ABX $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/fswatcher.h b/Externals/wxWidgets3/include/wx/fswatcher.h
index 239a5b4dad..056780d348 100644
--- a/Externals/wxWidgets3/include/wx/fswatcher.h
+++ b/Externals/wxWidgets3/include/wx/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     wxFileSystemWatcherBase
 // Author:      Bartosz Bekier
 // Created:     2009-05-23
-// RCS-ID:      $Id: fswatcher.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -44,15 +43,18 @@ enum
     wxFSW_EVENT_RENAME = 0x04,
     wxFSW_EVENT_MODIFY = 0x08,
     wxFSW_EVENT_ACCESS = 0x10,
+    wxFSW_EVENT_ATTRIB = 0x20, // Currently this is wxGTK-only
 
     // error events
-    wxFSW_EVENT_WARNING = 0x20,
-    wxFSW_EVENT_ERROR = 0x40,
-
+    wxFSW_EVENT_WARNING = 0x40,
+    wxFSW_EVENT_ERROR = 0x80,
     wxFSW_EVENT_ALL = wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE |
                          wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
-                         wxFSW_EVENT_ACCESS |
+                         wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB |
                          wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR
+#ifdef wxHAS_INOTIFY
+    ,wxFSW_EVENT_UNMOUNT = 0x2000
+#endif
 };
 
 // Type of the path watched, used only internally for now.
@@ -64,6 +66,13 @@ enum wxFSWPathType
     wxFSWPath_Tree      // Watch a directory and all its children recursively.
 };
 
+// Type of the warning for the events notifying about them.
+enum wxFSWWarningType
+{
+    wxFSW_WARNING_NONE,
+    wxFSW_WARNING_GENERAL,
+    wxFSW_WARNING_OVERFLOW
+};
 
 /**
  * Event containing information about file system change.
@@ -75,24 +84,36 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_FSWATCHER,
 class WXDLLIMPEXP_BASE wxFileSystemWatcherEvent: public wxEvent
 {
 public:
-    wxFileSystemWatcherEvent(int changeType, int watchid = wxID_ANY) :
+    // Constructor for any kind of events, also used as default ctor.
+    wxFileSystemWatcherEvent(int changeType = 0, int watchid = wxID_ANY) :
         wxEvent(watchid, wxEVT_FSWATCHER),
-        m_changeType(changeType)
+        m_changeType(changeType),
+        m_warningType(wxFSW_WARNING_NONE)
     {
     }
 
-    wxFileSystemWatcherEvent(int changeType, const wxString& errorMsg,
+    // Constructor for the error or warning events.
+    wxFileSystemWatcherEvent(int changeType,
+                             wxFSWWarningType warningType,
+                             const wxString& errorMsg = wxString(),
                              int watchid = wxID_ANY) :
         wxEvent(watchid, wxEVT_FSWATCHER),
-        m_changeType(changeType), m_errorMsg(errorMsg)
+        m_changeType(changeType),
+        m_warningType(warningType),
+        m_errorMsg(errorMsg)
     {
     }
 
+    // Constructor for the normal events carrying information about the changes.
     wxFileSystemWatcherEvent(int changeType,
                              const wxFileName& path, const wxFileName& newPath,
                              int watchid = wxID_ANY) :
          wxEvent(watchid, wxEVT_FSWATCHER),
-         m_changeType(changeType), m_path(path), m_newPath(newPath)
+         m_changeType(changeType),
+         m_warningType(wxFSW_WARNING_NONE),
+         m_path(path),
+         m_newPath(newPath)
+
     {
     }
 
@@ -144,12 +165,13 @@ public:
         evt->m_errorMsg = m_errorMsg.Clone();
         evt->m_path = wxFileName(m_path.GetFullPath().Clone());
         evt->m_newPath = wxFileName(m_newPath.GetFullPath().Clone());
+        evt->m_warningType = m_warningType;
         return evt;
     }
 
     virtual wxEventCategory GetEventCategory() const
     {
-        // TODO this has to be merged with "similiar" categories and changed
+        // TODO this has to be merged with "similar" categories and changed
         return wxEVT_CATEGORY_UNKNOWN;
     }
 
@@ -166,6 +188,11 @@ public:
         return m_errorMsg;
     }
 
+    wxFSWWarningType GetWarningType() const
+    {
+        return m_warningType;
+    }
+
     /**
      * Returns a wxString describing an event useful for debugging or testing
      */
@@ -173,9 +200,12 @@ public:
 
 protected:
     int m_changeType;
+    wxFSWWarningType m_warningType;
     wxFileName m_path;
     wxFileName m_newPath;
     wxString m_errorMsg;
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent)
 };
 
 typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)
@@ -196,12 +226,16 @@ class wxFSWatchInfo
 {
 public:
     wxFSWatchInfo() :
-        m_events(-1), m_type(wxFSWPath_None)
+        m_events(-1), m_type(wxFSWPath_None), m_refcount(-1)
     {
     }
 
-    wxFSWatchInfo(const wxString& path, int events, wxFSWPathType type) :
-        m_path(path), m_events(events), m_type(type)
+    wxFSWatchInfo(const wxString& path,
+                  int events,
+                  wxFSWPathType type,
+                  const wxString& filespec = wxString()) :
+        m_path(path), m_filespec(filespec), m_events(events), m_type(type),
+        m_refcount(1)
     {
     }
 
@@ -210,6 +244,8 @@ public:
         return m_path;
     }
 
+    const wxString& GetFilespec() const { return m_filespec; }
+
     int GetFlags() const
     {
         return m_events;
@@ -220,10 +256,27 @@ public:
         return m_type;
     }
 
+    // Reference counting of watch entries is used to avoid watching the same
+    // file system path multiple times (this can happen even accidentally, e.g.
+    // when you have a recursive watch and then decide to watch some file or
+    // directory under it separately).
+    int IncRef()
+    {
+        return ++m_refcount;
+    }
+
+    int DecRef()
+    {
+        wxASSERT_MSG( m_refcount > 0, wxS("Trying to decrement a zero count") );
+        return --m_refcount;
+    }
+
 protected:
     wxString m_path;
+    wxString m_filespec;      // For tree watches, holds any filespec to apply
     int m_events;
     wxFSWPathType m_type;
+    int m_refcount;
 };
 
 WX_DECLARE_STRING_HASH_MAP(wxFSWatchInfo, wxFSWatchInfoMap);
@@ -260,7 +313,7 @@ public:
      * of particular type.
      */
     virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL,
-                         const wxString& filter = wxEmptyString);
+                         const wxString& filespec = wxEmptyString);
 
     /**
      * Removes path from the list of watched paths.
@@ -305,6 +358,14 @@ public:
             m_owner = handler;
     }
 
+
+    // This is a semi-private function used by wxWidgets itself only.
+    //
+    // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and
+    // updates m_watches if the new path was successfully added.
+    bool AddAny(const wxFileName& path, int events, wxFSWPathType type,
+                const wxString& filespec = wxString());
+
 protected:
 
     static wxString GetCanonicalPath(const wxFileName& path)
@@ -320,10 +381,6 @@ protected:
         return path_copy.GetFullPath();
     }
 
-    // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and
-    // updates m_watches if the new path was successfully added.
-    bool DoAdd(const wxFileName& path, int events, wxFSWPathType type);
-
 
     wxFSWatchInfoMap m_watches;        // path=>wxFSWatchInfo map
     wxFSWatcherImpl* m_service;     // file system events service
diff --git a/Externals/wxWidgets3/include/wx/gauge.h b/Externals/wxWidgets3/include/wx/gauge.h
index cec0dc48b0..93ae86fcc4 100644
--- a/Externals/wxWidgets3/include/wx/gauge.h
+++ b/Externals/wxWidgets3/include/wx/gauge.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1996-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gbsizer.h b/Externals/wxWidgets3/include/wx/gbsizer.h
index 51dc057d3d..dea46c15ab 100644
--- a/Externals/wxWidgets3/include/wx/gbsizer.h
+++ b/Externals/wxWidgets3/include/wx/gbsizer.h
@@ -6,7 +6,6 @@
 //
 // Author:      Robin Dunn
 // Created:     03-Nov-2003
-// RCS-ID:      $Id: gbsizer.h 69970 2011-12-10 04:34:06Z RD $
 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,6 +66,14 @@ public:
 
     // default copy ctor and assignment operator are okay.
 
+    // Factor constructor creating an invalid wxGBSpan: this is mostly supposed
+    // to be used as return value for functions returning wxGBSpan in case of
+    // errors.
+    static wxGBSpan Invalid()
+    {
+        return wxGBSpan(NULL);
+    }
+
     int GetRowspan() const { return m_rowspan; }
     int GetColspan() const { return m_colspan; }
     void SetRowspan(int rowspan)
@@ -87,6 +94,13 @@ public:
     bool operator!=(const wxGBSpan& o) const { return !(*this == o); }
 
 private:
+    // This private ctor is used by Invalid() only.
+    wxGBSpan(struct InvalidCtorTag*)
+    {
+        m_rowspan =
+        m_colspan = -1;
+    }
+
     void Init()
     {
         m_rowspan =
diff --git a/Externals/wxWidgets3/include/wx/gdicmn.h b/Externals/wxWidgets3/include/wx/gdicmn.h
index d69b5f89be..6ce652d49f 100644
--- a/Externals/wxWidgets3/include/wx/gdicmn.h
+++ b/Externals/wxWidgets3/include/wx/gdicmn.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gdicmn.h 70789 2012-03-04 00:28:58Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -174,7 +173,7 @@ enum wxStockCursor
     wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK/Linux
  */
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
 #elif defined(__WXPM__)
@@ -204,7 +203,7 @@ enum wxStockCursor
    under Unix bitmaps live in XPMs and under Windows they're in ressources.
  */
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
     #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
 #elif defined(__WXGTK__)   || \
       defined(__WXMOTIF__) || \
@@ -218,6 +217,28 @@ enum wxStockCursor
     #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
 #endif // platform
 
+// Macro for creating wxBitmap from in-memory PNG data.
+//
+// It reads PNG data from name_png static byte arrays that can be created using
+// e.g. misc/scripts/png2c.py.
+//
+// This macro exists mostly as a helper for wxBITMAP_PNG() below but also
+// because it's slightly more convenient to use than NewFromPNGData() directly.
+#define wxBITMAP_PNG_FROM_DATA(name) \
+    wxBitmap::NewFromPNGData(name##_png, WXSIZEOF(name##_png))
+
+// Similar to wxBITMAP but used for the bitmaps in PNG format.
+//
+// Under Windows they should be embedded into the resource file using RT_RCDATA
+// resource type and under OS X the PNG file with the specified name must be
+// available in the resource subdirectory of the bundle. Elsewhere, this is
+// exactly the same thing as wxBITMAP_PNG_FROM_DATA() described above.
+#if defined(__WINDOWS__) || defined(__WXOSX__)
+    #define wxBITMAP_PNG(name) wxBitmap(wxS(#name), wxBITMAP_TYPE_PNG_RESOURCE)
+#else
+    #define wxBITMAP_PNG(name) wxBITMAP_PNG_FROM_DATA(name)
+#endif
+
 // ===========================================================================
 // classes
 // ===========================================================================
@@ -255,6 +276,13 @@ public:
         { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
     void DecTo(const wxSize& sz)
         { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }
+    void DecToIfSpecified(const wxSize& sz)
+    {
+        if ( sz.x != wxDefaultCoord && sz.x < x )
+            x = sz.x;
+        if ( sz.y != wxDefaultCoord && sz.y < y )
+            y = sz.y;
+    }
 
     void IncBy(int dx, int dy) { x += dx; y += dy; }
     void IncBy(const wxPoint& pt);
@@ -352,27 +380,27 @@ inline wxSize operator/(const wxSize& s, long i)
 
 inline wxSize operator*(const wxSize& s, long i)
 {
-    return wxSize(s.x * i, s.y * i);
+    return wxSize(int(s.x * i), int(s.y * i));
 }
 
 inline wxSize operator*(long i, const wxSize& s)
 {
-    return wxSize(s.x * i, s.y * i);
+    return wxSize(int(s.x * i), int(s.y * i));
 }
 
 inline wxSize operator/(const wxSize& s, unsigned long i)
 {
-    return wxSize(s.x / i, s.y / i);
+    return wxSize(int(s.x / i), int(s.y / i));
 }
 
 inline wxSize operator*(const wxSize& s, unsigned long i)
 {
-    return wxSize(s.x * i, s.y * i);
+    return wxSize(int(s.x * i), int(s.y * i));
 }
 
 inline wxSize operator*(unsigned long i, const wxSize& s)
 {
-    return wxSize(s.x * i, s.y * i);
+    return wxSize(int(s.x * i), int(s.y * i));
 }
 
 inline wxSize operator*(const wxSize& s, double i)
@@ -626,12 +654,12 @@ inline wxPoint operator/(const wxPoint& s, long i)
 
 inline wxPoint operator*(const wxPoint& s, long i)
 {
-    return wxPoint(s.x * i, s.y * i);
+    return wxPoint(int(s.x * i), int(s.y * i));
 }
 
 inline wxPoint operator*(long i, const wxPoint& s)
 {
-    return wxPoint(s.x * i, s.y * i);
+    return wxPoint(int(s.x * i), int(s.y * i));
 }
 
 inline wxPoint operator/(const wxPoint& s, unsigned long i)
@@ -641,12 +669,12 @@ inline wxPoint operator/(const wxPoint& s, unsigned long i)
 
 inline wxPoint operator*(const wxPoint& s, unsigned long i)
 {
-    return wxPoint(s.x * i, s.y * i);
+    return wxPoint(int(s.x * i), int(s.y * i));
 }
 
 inline wxPoint operator*(unsigned long i, const wxPoint& s)
 {
-    return wxPoint(s.x * i, s.y * i);
+    return wxPoint(int(s.x * i), int(s.y * i));
 }
 
 inline wxPoint operator*(const wxPoint& s, double i)
diff --git a/Externals/wxWidgets3/include/wx/gdiobj.h b/Externals/wxWidgets3/include/wx/gdiobj.h
index 5e07df0d81..903dfe083d 100644
--- a/Externals/wxWidgets3/include/wx/gdiobj.h
+++ b/Externals/wxWidgets3/include/wx/gdiobj.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: gdiobj.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h b/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h
index f5b1365953..36e0cad438 100644
--- a/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/aboutdlgg.h
@@ -3,7 +3,6 @@
 // Purpose:     generic wxAboutBox() implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-10-07
-// RCS-ID:      $Id: aboutdlgg.h 70413 2012-01-20 22:11:32Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/accel.h b/Externals/wxWidgets3/include/wx/generic/accel.h
index d0d76f7bf0..44f8e07e83 100644
--- a/Externals/wxWidgets3/include/wx/generic/accel.h
+++ b/Externals/wxWidgets3/include/wx/generic/accel.h
@@ -2,7 +2,6 @@
 // Name:        wx/generic/accel.h
 // Purpose:     wxAcceleratorTable class
 // Author:      Robert Roebling
-// RCS-ID:      $Id: accel.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/animate.h b/Externals/wxWidgets3/include/wx/generic/animate.h
index 16562ce351..818daf890c 100644
--- a/Externals/wxWidgets3/include/wx/generic/animate.h
+++ b/Externals/wxWidgets3/include/wx/generic/animate.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by: Francesco Montorsi
 // Created:     13/8/99
-// RCS-ID:      $Id: animate.h 53629 2008-05-17 22:51:52Z VZ $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/bmpcbox.h b/Externals/wxWidgets3/include/wx/generic/bmpcbox.h
index 851fb971d4..d5e5cbb169 100644
--- a/Externals/wxWidgets3/include/wx/generic/bmpcbox.h
+++ b/Externals/wxWidgets3/include/wx/generic/bmpcbox.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Aug-30-2006
-// RCS-ID:      $Id: bmpcbox.h 54382 2008-06-27 13:47:45Z RR $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/busyinfo.h b/Externals/wxWidgets3/include/wx/generic/busyinfo.h
index b656f99760..7f56edb26d 100644
--- a/Externals/wxWidgets3/include/wx/generic/busyinfo.h
+++ b/Externals/wxWidgets3/include/wx/generic/busyinfo.h
@@ -3,7 +3,6 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id: busyinfo.h 62789 2009-12-05 19:57:58Z PC $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/buttonbar.h b/Externals/wxWidgets3/include/wx/generic/buttonbar.h
index 91443dbf14..e933a3ca2c 100644
--- a/Externals/wxWidgets3/include/wx/generic/buttonbar.h
+++ b/Externals/wxWidgets3/include/wx/generic/buttonbar.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech
 // Modified by:
 // Created:     2006-04-13
-// Id:          $Id: buttonbar.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
 //              SciTech Software, Inc.
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/generic/calctrlg.h b/Externals/wxWidgets3/include/wx/generic/calctrlg.h
index f7af5fa97c..8e430b6231 100644
--- a/Externals/wxWidgets3/include/wx/generic/calctrlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/calctrlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.12.99
-// RCS-ID:      $Id: calctrlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/caret.h b/Externals/wxWidgets3/include/wx/generic/caret.h
index 99f78ddd59..67041cf20d 100644
--- a/Externals/wxWidgets3/include/wx/generic/caret.h
+++ b/Externals/wxWidgets3/include/wx/generic/caret.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:
 // Created:     25.05.99
-// RCS-ID:      $Id: caret.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/choicdgg.h b/Externals/wxWidgets3/include/wx/generic/choicdgg.h
index 431c686b59..2d92b44276 100644
--- a/Externals/wxWidgets3/include/wx/generic/choicdgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/choicdgg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     01/02/97
-// RCS-ID:      $Id: choicdgg.h 70642 2012-02-20 21:56:18Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/clrpickerg.h b/Externals/wxWidgets3/include/wx/generic/clrpickerg.h
index 4012a9cc75..de32125e00 100644
--- a/Externals/wxWidgets3/include/wx/generic/clrpickerg.h
+++ b/Externals/wxWidgets3/include/wx/generic/clrpickerg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id: clrpickerg.h 66615 2011-01-07 05:26:57Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/collpaneg.h b/Externals/wxWidgets3/include/wx/generic/collpaneg.h
index e06b361b18..ec0777115d 100644
--- a/Externals/wxWidgets3/include/wx/generic/collpaneg.h
+++ b/Externals/wxWidgets3/include/wx/generic/collpaneg.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
-// RCS-ID:      $Id: collpaneg.h 68366 2011-07-24 22:19:33Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/colour.h b/Externals/wxWidgets3/include/wx/generic/colour.h
index c07d8c77f0..5db020cacd 100644
--- a/Externals/wxWidgets3/include/wx/generic/colour.h
+++ b/Externals/wxWidgets3/include/wx/generic/colour.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colour.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/colrdlgg.h b/Externals/wxWidgets3/include/wx/generic/colrdlgg.h
index 82248cbc1c..a83abd8ce3 100644
--- a/Externals/wxWidgets3/include/wx/generic/colrdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/colrdlgg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colrdlgg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/combo.h b/Externals/wxWidgets3/include/wx/generic/combo.h
index 2632d66618..f271563ae2 100644
--- a/Externals/wxWidgets3/include/wx/generic/combo.h
+++ b/Externals/wxWidgets3/include/wx/generic/combo.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.h 67255 2011-03-20 10:59:22Z JMS $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/ctrlsub.h b/Externals/wxWidgets3/include/wx/generic/ctrlsub.h
index eda02c745b..0dd113dcf9 100644
--- a/Externals/wxWidgets3/include/wx/generic/ctrlsub.h
+++ b/Externals/wxWidgets3/include/wx/generic/ctrlsub.h
@@ -3,7 +3,6 @@
 // Purpose:     common functionality of wxItemContainer-derived controls
 // Author:      Vadim Zeitlin
 // Created:     2007-07-25
-// RCS-ID:      $Id: ctrlsub.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/custombgwin.h b/Externals/wxWidgets3/include/wx/generic/custombgwin.h
index a7ed85d995..8004195498 100644
--- a/Externals/wxWidgets3/include/wx/generic/custombgwin.h
+++ b/Externals/wxWidgets3/include/wx/generic/custombgwin.h
@@ -3,7 +3,6 @@
 // Purpose:     Generic implementation of wxCustomBackgroundWindow.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-10
-// RCS-ID:      $Id: custombgwin.h 69378 2011-10-11 17:07:43Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/dataview.h b/Externals/wxWidgets3/include/wx/generic/dataview.h
index af16d65218..f3ac8ee598 100644
--- a/Externals/wxWidgets3/include/wx/generic/dataview.h
+++ b/Externals/wxWidgets3/include/wx/generic/dataview.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewCtrl generic implementation header
 // Author:      Robert Roebling
 // Modified By: Bo Yang
-// Id:          $Id: dataview.h 70717 2012-02-27 18:54:02Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +69,7 @@ public:
 
     virtual bool IsSortKey() const { return m_sort; }
 
-    virtual void UnsetAsSortKey() { m_sort = false; UpdateDisplay(); }
+    virtual void UnsetAsSortKey();
 
     virtual void SetSortOrder(bool ascending);
 
@@ -182,6 +181,8 @@ public:
 
     virtual void SetFocus();
 
+    virtual bool SetFont(const wxFont & font);
+
 #if wxUSE_DRAG_AND_DROP
     virtual bool EnableDragSource( const wxDataFormat &format );
     virtual bool EnableDropTarget( const wxDataFormat &format );
@@ -226,6 +227,9 @@ public:     // utility functions not part of the API
     // return the index of the given column in m_cols
     int GetColumnIndex(const wxDataViewColumn *column) const;
 
+    // Return the index of the column having the given model index.
+    int GetModelColumnIndex(unsigned int model_column) const;
+
     // return the column displayed at the given position in the control
     wxDataViewColumn *GetColumnAt(unsigned int pos) const;
 
@@ -242,10 +246,18 @@ private:
     void UpdateColWidths();
 
     wxDataViewColumnList      m_cols;
-    // cached column best widths or 0 if not computed, values are for
+    // cached column best widths information, values are for
     // respective columns from m_cols and the arrays have same size
-    wxVector<int>             m_colsBestWidths;
-    // m_colsBestWidths partially invalid, needs recomputing
+    struct CachedColWidthInfo
+    {
+        CachedColWidthInfo() : width(0), dirty(true) {}
+        int width;  // cached width or 0 if not computed
+        bool dirty; // column was invalidated, header needs updating
+    };
+    wxVector<CachedColWidthInfo> m_colsBestWidths;
+    // This indicates that at least one entry in m_colsBestWidths has 'dirty'
+    // flag set. It's cheaper to check one flag in OnInternalIdle() than to
+    // iterate over m_colsBestWidths to check if anything needs to be done.
     bool                      m_colsDirty;
 
     wxDataViewModelNotifier  *m_notifier;
diff --git a/Externals/wxWidgets3/include/wx/generic/datectrl.h b/Externals/wxWidgets3/include/wx/generic/datectrl.h
index fe7dd57299..47e656634b 100644
--- a/Externals/wxWidgets3/include/wx/generic/datectrl.h
+++ b/Externals/wxWidgets3/include/wx/generic/datectrl.h
@@ -4,7 +4,6 @@
 // Author:      Andreas Pflug
 // Modified by:
 // Created:     2005-01-19
-// RCS-ID:      $Id: datectrl.h 70736 2012-02-28 14:41:30Z VZ $
 // Copyright:   (c) 2005 Andreas Pflug <pgadmin@pse-consulting.de>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/dcpsg.h b/Externals/wxWidgets3/include/wx/generic/dcpsg.h
index 19f374bf7a..ea423475d5 100644
--- a/Externals/wxWidgets3/include/wx/generic/dcpsg.h
+++ b/Externals/wxWidgets3/include/wx/generic/dcpsg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:
-// RCS-ID:      $Id: dcpsg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -94,6 +93,8 @@ public:
     virtual int GetResolution() const;
     virtual wxRect GetPaperRect() const;
 
+    virtual void* GetHandle() const { return NULL; }
+    
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
                      wxFloodFillStyle style = wxFLOOD_SURFACE);
@@ -103,11 +104,11 @@ protected:
     void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
-    void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
-    void DoDrawPolygon(int n, wxPoint points[],
+    void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
+    void DoDrawPolygon(int n, const wxPoint points[],
                        wxCoord xoffset = 0, wxCoord yoffset = 0,
                        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+    void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                            wxCoord xoffset = 0, wxCoord yoffset = 0,
                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
diff --git a/Externals/wxWidgets3/include/wx/generic/dirctrlg.h b/Externals/wxWidgets3/include/wx/generic/dirctrlg.h
index 5fcbcfb175..bdaa3df33b 100644
--- a/Externals/wxWidgets3/include/wx/generic/dirctrlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/dirctrlg.h
@@ -7,7 +7,6 @@
 // Author:      Robert Roebling, Harm van der Heijden, Julian Smart et al
 // Modified by:
 // Created:     21/3/2000
-// RCS-ID:      $Id: dirctrlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,10 +38,8 @@ enum
     wxDIRCTRL_DIR_ONLY       = 0x0010,
     // When setting the default path, select the first file in the directory
     wxDIRCTRL_SELECT_FIRST   = 0x0020,
-#if WXWIN_COMPATIBILITY_2_8
-    // Unused, for compatibility only
+    // Show the filter list
     wxDIRCTRL_SHOW_FILTERS   = 0x0040,
-#endif // WXWIN_COMPATIBILITY_2_8
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels
@@ -111,6 +108,8 @@ public:
     void OnCollapseItem(wxTreeEvent &event );
     void OnBeginEditItem(wxTreeEvent &event );
     void OnEndEditItem(wxTreeEvent &event );
+    void OnTreeSelChange(wxTreeEvent &event);
+    void OnItemActivated(wxTreeEvent &event);
     void OnSize(wxSizeEvent &event );
 
     // Try to expand as much of the given path as possible.
@@ -161,6 +160,8 @@ public:
     // If the path string has been used (we're at the leaf), done is set to true
     virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
 
+    wxString GetPath(wxTreeItemId itemId) const;
+
     // Resize the components of the control
     virtual void DoResize();
 
@@ -190,6 +191,7 @@ protected:
 
 private:
     void PopulateNode(wxTreeItemId node);
+    wxDirItemData* GetItemData(wxTreeItemId itemId);
 
     bool            m_showHidden;
     wxTreeItemId    m_rootId;
@@ -207,6 +209,15 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
 };
 
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent );
+
+#define wx__DECLARE_DIRCTRL_EVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_DIRCTRL_ ## evt, id, wxTreeEventHandler(fn))
+
+#define EVT_DIRCTRL_SELECTIONCHANGED(id, fn) wx__DECLARE_DIRCTRL_EVT(SELECTIONCHANGED, id, fn)
+#define EVT_DIRCTRL_FILEACTIVATED(id, fn) wx__DECLARE_DIRCTRL_EVT(FILEACTIVATED, id, fn)
+
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
@@ -299,5 +310,9 @@ extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
 
 #endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_DIRCTRL_SELECTIONCHANGED wxEVT_DIRCTRL_SELECTIONCHANGED
+#define wxEVT_COMMAND_DIRCTRL_FILEACTIVATED   wxEVT_DIRCTRL_FILEACTIVATED
+
 #endif
     // _WX_DIRCTRLG_H_
diff --git a/Externals/wxWidgets3/include/wx/generic/dirdlgg.h b/Externals/wxWidgets3/include/wx/generic/dirdlgg.h
index c5ce093f44..cc8b5a874b 100644
--- a/Externals/wxWidgets3/include/wx/generic/dirdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/dirdlgg.h
@@ -7,7 +7,6 @@
 // Author:      Robert Roebling, Harm van der Heijden, Julian Smart et al
 // Modified by:
 // Created:     21/3/2000
-// RCS-ID:      $Id: dirdlgg.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/dragimgg.h b/Externals/wxWidgets3/include/wx/generic/dragimgg.h
index ff3b72e12b..9c90e163f2 100644
--- a/Externals/wxWidgets3/include/wx/generic/dragimgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/dragimgg.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000
-// RCS-ID:      $Id: dragimgg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h b/Externals/wxWidgets3/include/wx/generic/dvrenderer.h
index 8e4eb7761c..75889a8108 100644
--- a/Externals/wxWidgets3/include/wx/generic/dvrenderer.h
+++ b/Externals/wxWidgets3/include/wx/generic/dvrenderer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewRenderer for generic wxDataViewCtrl implementation
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/generic/dataview.h)
-// RCS-ID:      $Id: dvrenderer.h 69473 2011-10-19 16:20:17Z VS $
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h b/Externals/wxWidgets3/include/wx/generic/dvrenderers.h
index e5ca2c71ec..6f80c773a5 100644
--- a/Externals/wxWidgets3/include/wx/generic/dvrenderers.h
+++ b/Externals/wxWidgets3/include/wx/generic/dvrenderers.h
@@ -3,7 +3,6 @@
 // Purpose:     All generic wxDataViewCtrl renderer classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/generic/dataview.h)
-// RCS-ID:      $Id: dvrenderers.h 69473 2011-10-19 16:20:17Z VS $
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h b/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h
index f4a961d6a8..d1ad8d1b88 100644
--- a/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/fdrepdlg.h
@@ -4,7 +4,6 @@
 // Author:      Markus Greither
 // Modified by:
 // Created:     25/05/2001
-// RCS-ID:      $Id: fdrepdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/filectrlg.h b/Externals/wxWidgets3/include/wx/generic/filectrlg.h
index 24034654ac..ba26118d7f 100644
--- a/Externals/wxWidgets3/include/wx/generic/filectrlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/filectrlg.h
@@ -4,7 +4,6 @@
 // Author:      Diaa M. Sami
 // Modified by:
 // Created:     Jul-07-2007
-// RCS-ID:      $Id: filectrlg.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,7 +13,7 @@
 
 #if wxUSE_FILECTRL
 
-#include "wx/panel.h"
+#include "wx/containr.h"
 #include "wx/listctrl.h"
 #include "wx/filectrl.h"
 #include "wx/filename.h"
@@ -182,7 +181,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxPanel,
+class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,
                                            public wxFileCtrlBase
 {
 public:
diff --git a/Externals/wxWidgets3/include/wx/generic/filedlgg.h b/Externals/wxWidgets3/include/wx/generic/filedlgg.h
index a1e348f7f3..7d14e523fb 100644
--- a/Externals/wxWidgets3/include/wx/generic/filedlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/filedlgg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: filedlgg.h 62722 2009-11-26 16:17:00Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/filepickerg.h b/Externals/wxWidgets3/include/wx/generic/filepickerg.h
index f1283915c1..d88daa556a 100644
--- a/Externals/wxWidgets3/include/wx/generic/filepickerg.h
+++ b/Externals/wxWidgets3/include/wx/generic/filepickerg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: filepickerg.h 70043 2011-12-18 12:34:47Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,8 +16,8 @@
 #include "wx/dirdlg.h"
 
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
 
 
 //-----------------------------------------------------------------------------
@@ -148,7 +147,7 @@ public:     // overridable
     virtual wxDialog *CreateDialog();
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+        { return wxEVT_FILEPICKER_CHANGED; }
 
 protected:
     void UpdateDialogPath(wxDialog *p)
@@ -156,10 +155,6 @@ protected:
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 
-    // Set the initial directory for the dialog but without overriding the
-    // directory of the currently selected file, if any.
-    void DoSetInitialDirectory(wxFileDialog* dialog, const wxString& dir);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 };
@@ -207,7 +202,7 @@ public:     // overridable
     virtual wxDialog *CreateDialog();
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+        { return wxEVT_DIRPICKER_CHANGED; }
 
 protected:
     void UpdateDialogPath(wxDialog *p)
@@ -219,5 +214,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)
 };
 
+// old wxEVT_COMMAND_* constants
+//#define wxEVT_COMMAND_DIRPICKER_CHANGED wxEVT_DIRPICKER_CHANGED
+//#define wxEVT_COMMAND_FILEPICKER_CHANGED wxEVT_FILEPICKER_CHANGED
 
 #endif // _WX_FILEDIRPICKER_H_
diff --git a/Externals/wxWidgets3/include/wx/generic/fontdlgg.h b/Externals/wxWidgets3/include/wx/generic/fontdlgg.h
index 9001d63e28..a16fa6e2e8 100644
--- a/Externals/wxWidgets3/include/wx/generic/fontdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/fontdlgg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: fontdlgg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/fontpickerg.h b/Externals/wxWidgets3/include/wx/generic/fontpickerg.h
index 5145cc4c4a..8090450038 100644
--- a/Externals/wxWidgets3/include/wx/generic/fontpickerg.h
+++ b/Externals/wxWidgets3/include/wx/generic/fontpickerg.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: fontpickerg.h 66615 2011-01-07 05:26:57Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/fswatcher.h b/Externals/wxWidgets3/include/wx/generic/fswatcher.h
index a450810065..efd7631b47 100644
--- a/Externals/wxWidgets3/include/wx/generic/fswatcher.h
+++ b/Externals/wxWidgets3/include/wx/generic/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     wxPollingFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher.h 62474 2009-10-22 11:35:43Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/grid.h b/Externals/wxWidgets3/include/wx/generic/grid.h
index 21b380023e..c58cec3742 100644
--- a/Externals/wxWidgets3/include/wx/generic/grid.h
+++ b/Externals/wxWidgets3/include/wx/generic/grid.h
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grid.h 70825 2012-03-06 10:23:44Z SC $
 // Copyright:   (c) Michael Bedward
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,6 +64,20 @@ enum wxGridDirection
     wxGRID_ROW
 };
 
+// Flags used with wxGrid::Render() to select parts of the grid to draw.
+enum wxGridRenderStyle
+{
+    wxGRID_DRAW_ROWS_HEADER = 0x001,
+    wxGRID_DRAW_COLS_HEADER = 0x002,
+    wxGRID_DRAW_CELL_LINES = 0x004,
+    wxGRID_DRAW_BOX_RECT = 0x008,
+    wxGRID_DRAW_SELECTION = 0x010,
+    wxGRID_DRAW_DEFAULT = wxGRID_DRAW_ROWS_HEADER |
+                          wxGRID_DRAW_COLS_HEADER |
+                          wxGRID_DRAW_CELL_LINES |
+                          wxGRID_DRAW_BOX_RECT
+};
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
@@ -115,7 +128,7 @@ class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer, public wx
 public:
     wxGridCellWorker() { }
 
-    // interpret renderer parameters: arbitrary string whose interpretatin is
+    // interpret renderer parameters: arbitrary string whose interpretation is
     // left to the derived classes
     virtual void SetParameters(const wxString& params);
 
@@ -178,11 +191,11 @@ class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker
 public:
     wxGridCellEditor();
 
-    bool IsCreated() { return m_control != NULL; }
-    wxControl* GetControl() { return m_control; }
+    bool IsCreated() const { return m_control != NULL; }
+    wxControl* GetControl() const { return m_control; }
     void SetControl(wxControl* control) { m_control = control; }
 
-    wxGridCellAttr* GetCellAttr() { return m_attr; }
+    wxGridCellAttr* GetCellAttr() const { return m_attr; }
     void SetCellAttr(wxGridCellAttr* attr) { m_attr = attr; }
 
     // Creates the actual edit control
@@ -199,7 +212,9 @@ public:
 
     // Draws the part of the cell not occupied by the control: the base class
     // version just fills it with background colour from the attribute
-    virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    virtual void PaintBackground(wxDC& dc,
+                                 const wxRect& rectCell,
+                                 const wxGridCellAttr& attr);
 
 
     // The methods called by wxGrid when a cell is edited: first BeginEdit() is
@@ -811,7 +826,7 @@ public:
 
     // these are pure virtual in wxGridTableBase
     //
-    virtual int GetNumberRows() { return m_data.size(); }
+    virtual int GetNumberRows() { return static_cast<int>(m_data.size()); }
     virtual int GetNumberCols() { return m_numCols; }
     virtual wxString GetValue( int row, int col );
     virtual void SetValue( int row, int col, const wxString& s );
@@ -904,6 +919,15 @@ public:
         wxGridSelectRowsOrColumns = wxGridSelectRows | wxGridSelectColumns
     };
 
+    // Different behaviour of the TAB key when the end (or the beginning, for
+    // Shift-TAB) of the current row is reached:
+    enum TabBehaviour
+    {
+        Tab_Stop,   // Do nothing, this is default.
+        Tab_Wrap,   // Move to the next (or previous) row.
+        Tab_Leave   // Move to the next (or previous) control.
+    };
+
     // creation and destruction
     // ------------------------
 
@@ -1030,6 +1054,14 @@ public:
                             int verticalAlignment = wxALIGN_TOP,
                             int textOrientation = wxHORIZONTAL ) const;
 
+    // ------ grid render function for printing
+    //
+    void Render( wxDC& dc,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 const wxGridCellCoords& topLeft = wxGridCellCoords(-1, -1),
+                 const wxGridCellCoords& bottomRight = wxGridCellCoords(-1, -1),
+                 int style = wxGRID_DRAW_DEFAULT );
 
     // Split a string containing newline characters into an array of
     // strings and return the number of lines
@@ -1150,6 +1182,8 @@ public:
     bool MoveCursorLeftBlock( bool expandSelection );
     bool MoveCursorRightBlock( bool expandSelection );
 
+    void SetTabBehaviour(TabBehaviour behaviour) { m_tabBehaviour = behaviour; }
+
 
     // ------ label and gridline formatting
     //
@@ -1335,13 +1369,13 @@ public:
     // ------ row and col sizes
     void     SetDefaultRowSize( int height, bool resizeExistingRows = false );
     void     SetRowSize( int row, int height );
-    void     HideRow(int row) { SetRowSize(row, 0); }
-    void     ShowRow(int row) { SetRowSize(row, -1); }
+    void     HideRow(int row) { DoSetRowSize(row, 0); }
+    void     ShowRow(int row) { DoSetRowSize(row, -1); }
 
     void     SetDefaultColSize( int width, bool resizeExistingCols = false );
     void     SetColSize( int col, int width );
-    void     HideCol(int col) { SetColSize(col, 0); }
-    void     ShowCol(int col) { SetColSize(col, -1); }
+    void     HideCol(int col) { DoSetColSize(col, 0); }
+    void     ShowCol(int col) { DoSetColSize(col, -1); }
 
     // the row and column sizes can be also set all at once using
     // wxGridSizesInfo which holds all of them at once
@@ -2052,6 +2086,8 @@ protected:
     bool       m_editable;              // applies to whole grid
     bool       m_cellEditCtrlEnabled;   // is in-place edit currently shown?
 
+    TabBehaviour m_tabBehaviour;        // determines how the TAB key behaves
+
     void Init();        // common part of all ctors
     void Create();
     void CreateColumnWindow();
@@ -2079,8 +2115,9 @@ protected:
     int SendEvent(const wxEventType evtType, const wxString& s = wxString())
         { return SendEvent(evtType, m_currentCellCoords, s); }
 
-    // send wxEVT_GRID_{ROW,COL}_SIZE
-    void SendGridSizeEvent(wxEventType type,
+    // send wxEVT_GRID_{ROW,COL}_SIZE or wxEVT_GRID_COL_AUTO_SIZE, return true
+    // if the event was processed, false otherwise
+    bool SendGridSizeEvent(wxEventType type,
                            int row, int col,
                            const wxMouseEvent& mouseEv);
 
@@ -2090,6 +2127,7 @@ protected:
     void OnKeyUp( wxKeyEvent& );
     void OnChar( wxKeyEvent& );
     void OnEraseBackground( wxEraseEvent& );
+    void OnHideEditor( wxCommandEvent& );
 
 
     bool SetCurrentCell( const wxGridCellCoords& coords );
@@ -2133,6 +2171,22 @@ private:
     // redraw the grid lines, should be called after changing their attributes
     void RedrawGridLines();
 
+    // draw all grid lines in the given cell region (unlike the public
+    // DrawAllGridLines() which just draws all of them)
+    void DrawRangeGridLines(wxDC& dc, const wxRegion& reg,
+                            const wxGridCellCoords& topLeft,
+                            const wxGridCellCoords& bottomRight);
+
+    // draw all lines from top to bottom row and left to right column in the
+    // rectangle determined by (top, left)-(bottom, right) -- but notice that
+    // the caller must have set up the clipping correctly, this rectangle is
+    // only used here for optimization
+    void DoDrawGridLines(wxDC& dc,
+                         int top, int left,
+                         int bottom, int right,
+                         int topRow, int leftCol,
+                         int bottomRight, int rightCol);
+
     // common part of Clip{Horz,Vert}GridLines
     void DoClipGridLines(bool& var, bool clip);
 
@@ -2203,6 +2257,8 @@ private:
     void DoEndDragResizeCol(const wxMouseEvent& event);
     void DoEndMoveCol(int pos);
 
+    // process a TAB keypress
+    void DoGridProcessTab(wxKeyboardState& kbdState);
 
     // common implementations of methods defined for both rows and columns
     void DeselectLine(int line, const wxGridOperations& oper);
@@ -2236,6 +2292,35 @@ private:
     void DoDisableLineResize(int line, wxGridFixedIndicesSet *& setFixed);
     bool DoCanResizeLine(int line, const wxGridFixedIndicesSet *setFixed) const;
 
+    // Helper of Render(): get grid size, origin offset and fill cell arrays
+    void GetRenderSizes( const wxGridCellCoords& topLeft,
+                         const wxGridCellCoords& bottomRight,
+                         wxPoint& pointOffSet, wxSize& sizeGrid,
+                         wxGridCellCoordsArray& renderCells,
+                         wxArrayInt& arrayCols, wxArrayInt& arrayRows );
+
+    // Helper of Render(): set the scale to draw the cells at the right size.
+    void SetRenderScale( wxDC& dc, const wxPoint& pos, const wxSize& size,
+                         const wxSize& sizeGrid );
+
+    // Helper of Render(): get render start position from passed parameter
+    wxPoint GetRenderPosition( wxDC& dc, const wxPoint& position );
+
+    // Helper of Render(): draws a box around the rendered area
+    void DoRenderBox( wxDC& dc, const int& style,
+                      const wxPoint& pointOffSet,
+                      const wxSize& sizeCellArea,
+                      const wxGridCellCoords& topLeft,
+                      const wxGridCellCoords& bottomRight );
+
+    // Implementation of public Set{Row,Col}Size() and {Hide,Show}{Row,Col}().
+    // They interpret their height or width parameter slightly different from
+    // the public methods where -1 in it means "auto fit to the label" for the
+    // compatibility reasons. Here it means "show a previously hidden row or
+    // column" while 0 means "hide it" just as in the public methods. And any
+    // positive values are handled naturally, i.e. they just specify the size.
+    void DoSetRowSize( int row, int height );
+    void DoSetColSize( int col, int width );
 
 
     // these sets contain the indices of fixed, i.e. non-resizable
@@ -2521,6 +2606,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridE
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, wxGridSizeEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, wxGridSizeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGING, wxGridEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGED, wxGridEvent );
@@ -2531,6 +2617,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, wxGridEdit
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_MOVE, wxGridEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SORT, wxGridEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_GRID_TABBING, wxGridEvent );
 
 typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
 typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&);
@@ -2571,6 +2658,7 @@ typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreat
 #define EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id, fn)  wx__DECLARE_GRIDEVT(LABEL_RIGHT_DCLICK, id, fn)
 #define EVT_GRID_CMD_ROW_SIZE(id, fn)            wx__DECLARE_GRIDSIZEEVT(ROW_SIZE, id, fn)
 #define EVT_GRID_CMD_COL_SIZE(id, fn)            wx__DECLARE_GRIDSIZEEVT(COL_SIZE, id, fn)
+#define EVT_GRID_CMD_COL_AUTO_SIZE(id, fn)       wx__DECLARE_GRIDSIZEEVT(COL_AUTO_SIZE, id, fn)
 #define EVT_GRID_CMD_COL_MOVE(id, fn)            wx__DECLARE_GRIDEVT(COL_MOVE, id, fn)
 #define EVT_GRID_CMD_COL_SORT(id, fn)            wx__DECLARE_GRIDEVT(COL_SORT, id, fn)
 #define EVT_GRID_CMD_RANGE_SELECT(id, fn)        wx__DECLARE_GRIDRANGESELEVT(RANGE_SELECT, id, fn)
@@ -2581,6 +2669,7 @@ typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreat
 #define EVT_GRID_CMD_EDITOR_HIDDEN(id, fn)       wx__DECLARE_GRIDEVT(EDITOR_HIDDEN, id, fn)
 #define EVT_GRID_CMD_EDITOR_CREATED(id, fn)      wx__DECLARE_GRIDEDITOREVT(EDITOR_CREATED, id, fn)
 #define EVT_GRID_CMD_CELL_BEGIN_DRAG(id, fn)     wx__DECLARE_GRIDEVT(CELL_BEGIN_DRAG, id, fn)
+#define EVT_GRID_CMD_TABBING(id, fn)             wx__DECLARE_GRIDEVT(TABBING, id, fn)
 
 // same as above but for any id (exists mainly for backwards compatibility but
 // then it's also true that you rarely have multiple grid in the same window)
@@ -2594,6 +2683,7 @@ typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreat
 #define EVT_GRID_LABEL_RIGHT_DCLICK(fn)  EVT_GRID_CMD_LABEL_RIGHT_DCLICK(wxID_ANY, fn)
 #define EVT_GRID_ROW_SIZE(fn)            EVT_GRID_CMD_ROW_SIZE(wxID_ANY, fn)
 #define EVT_GRID_COL_SIZE(fn)            EVT_GRID_CMD_COL_SIZE(wxID_ANY, fn)
+#define EVT_GRID_COL_AUTO_SIZE(fn)       EVT_GRID_CMD_COL_AUTO_SIZE(wxID_ANY, fn)
 #define EVT_GRID_COL_MOVE(fn)            EVT_GRID_CMD_COL_MOVE(wxID_ANY, fn)
 #define EVT_GRID_COL_SORT(fn)            EVT_GRID_CMD_COL_SORT(wxID_ANY, fn)
 #define EVT_GRID_RANGE_SELECT(fn)        EVT_GRID_CMD_RANGE_SELECT(wxID_ANY, fn)
@@ -2604,6 +2694,7 @@ typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreat
 #define EVT_GRID_EDITOR_HIDDEN(fn)       EVT_GRID_CMD_EDITOR_HIDDEN(wxID_ANY, fn)
 #define EVT_GRID_EDITOR_CREATED(fn)      EVT_GRID_CMD_EDITOR_CREATED(wxID_ANY, fn)
 #define EVT_GRID_CELL_BEGIN_DRAG(fn)     EVT_GRID_CMD_CELL_BEGIN_DRAG(wxID_ANY, fn)
+#define EVT_GRID_TABBING(fn)             EVT_GRID_CMD_TABBING(wxID_ANY, fn)
 
 // we used to have a single wxEVT_GRID_CELL_CHANGE event but it was split into
 // wxEVT_GRID_CELL_CHANGING and CHANGED ones in wx 2.9.0, however the CHANGED
diff --git a/Externals/wxWidgets3/include/wx/generic/gridctrl.h b/Externals/wxWidgets3/include/wx/generic/gridctrl.h
index 2cc9859025..efcb233c8d 100644
--- a/Externals/wxWidgets3/include/wx/generic/gridctrl.h
+++ b/Externals/wxWidgets3/include/wx/generic/gridctrl.h
@@ -4,7 +4,6 @@
 // Author:      Paul Gammans, Roger Gammans
 // Modified by:
 // Created:     11/04/2001
-// RCS-ID:      $Id: gridctrl.h 69856 2011-11-28 13:23:33Z VZ $
 // Copyright:   (c) The Computer Surgery (paul@compsurg.co.uk)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -249,6 +248,28 @@ private:
                                 const wxRect& rect,
                                 int row, int col);
 
+    // Helper methods of GetTextLines()
+
+    // Break a single logical line of text into several physical lines, all of
+    // which are added to the lines array. The lines are broken at maxWidth and
+    // the dc is used for measuring text extent only.
+    void BreakLine(wxDC& dc,
+                   const wxString& logicalLine,
+                   wxCoord maxWidth,
+                   wxArrayString& lines);
+
+    // Break a word, which is supposed to be wider than maxWidth, into several
+    // lines, which are added to lines array and the last, incomplete, of which
+    // is returned in line output parameter.
+    //
+    // Returns the width of the last line.
+    wxCoord BreakWord(wxDC& dc,
+                      const wxString& word,
+                      wxCoord maxWidth,
+                      wxArrayString& lines,
+                      wxString& line);
+
+
 };
 
 #endif  // wxUSE_GRID
diff --git a/Externals/wxWidgets3/include/wx/generic/grideditors.h b/Externals/wxWidgets3/include/wx/generic/grideditors.h
index c3309e0470..c45106d3e8 100644
--- a/Externals/wxWidgets3/include/wx/generic/grideditors.h
+++ b/Externals/wxWidgets3/include/wx/generic/grideditors.h
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grideditors.h 70693 2012-02-25 23:49:55Z VZ $
 // Copyright:   (c) Michael Bedward
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,8 @@
 
 #if wxUSE_GRID
 
+#include "wx/scopedptr.h"
+
 class wxGridCellEditorEvtHandler : public wxEvtHandler
 {
 public:
@@ -52,14 +53,16 @@ private:
 class WXDLLIMPEXP_ADV wxGridCellTextEditor : public wxGridCellEditor
 {
 public:
-    wxGridCellTextEditor();
+    wxEXPLICIT wxGridCellTextEditor(size_t maxChars = 0);
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);
     virtual void SetSize(const wxRect& rect);
 
-    virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    virtual void PaintBackground(wxDC& dc,
+                                 const wxRect& rectCell,
+                                 const wxGridCellAttr& attr);
 
     virtual bool IsAcceptedKey(wxKeyEvent& event);
     virtual void BeginEdit(int row, int col, wxGrid* grid);
@@ -73,9 +76,9 @@ public:
 
     // parameters string format is "max_width"
     virtual void SetParameters(const wxString& params);
+    virtual void SetValidator(const wxValidator& validator);
 
-    virtual wxGridCellEditor *Clone() const
-        { return new wxGridCellTextEditor; }
+    virtual wxGridCellEditor *Clone() const;
 
     // added GetValue so we can get the value which is in the control
     virtual wxString GetValue() const;
@@ -90,8 +93,9 @@ protected:
     void DoReset(const wxString& startValue);
 
 private:
-    size_t   m_maxChars;        // max number of chars allowed
-    wxString m_value;
+    size_t                   m_maxChars;        // max number of chars allowed
+    wxScopedPtr<wxValidator> m_validator;
+    wxString                 m_value;
 
     wxDECLARE_NO_COPY_CLASS(wxGridCellTextEditor);
 };
@@ -297,7 +301,9 @@ public:
 
     virtual void SetSize(const wxRect& rect);
 
-    virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    virtual void PaintBackground(wxDC& dc,
+                                 const wxRect& rectCell,
+                                 const wxGridCellAttr& attr);
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
diff --git a/Externals/wxWidgets3/include/wx/generic/gridsel.h b/Externals/wxWidgets3/include/wx/generic/gridsel.h
index 640e810af5..76135532c1 100644
--- a/Externals/wxWidgets3/include/wx/generic/gridsel.h
+++ b/Externals/wxWidgets3/include/wx/generic/gridsel.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Neis
 // Modified by:
 // Created:     20/02/2000
-// RCS-ID:      $Id: gridsel.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Stefan Neis
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/headerctrlg.h b/Externals/wxWidgets3/include/wx/generic/headerctrlg.h
index a9246d2c8d..d2eceb2bfc 100644
--- a/Externals/wxWidgets3/include/wx/generic/headerctrlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/headerctrlg.h
@@ -3,7 +3,6 @@
 // Purpose:     Generic wxHeaderCtrl implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-12-01
-// RCS-ID:      $Id: headerctrlg.h 61024 2009-06-12 16:15:35Z RR $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,6 +47,10 @@ public:
 
     virtual ~wxHeaderCtrl();
 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    
 private:
     // implement base class pure virtuals
     virtual void DoSetCount(unsigned int count);
@@ -59,9 +62,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order);
     virtual wxArrayInt DoGetColumnsOrder() const;
 
-    // override wxWindow methods which must be implemented by a new control
-    virtual wxSize DoGetBestSize() const;
-
     // common part of all ctors
     void Init();
 
@@ -116,7 +116,7 @@ private:
 
     // start (if m_colBeingResized is -1) or continue resizing the column
     //
-    // this generates wxEVT_COMMAND_HEADER_BEGIN_RESIZE/RESIZING events and can
+    // this generates wxEVT_HEADER_BEGIN_RESIZE/RESIZING events and can
     // cancel the operation if the user handler decides so
     void StartOrContinueResizing(unsigned int col, int xPhysical);
 
diff --git a/Externals/wxWidgets3/include/wx/generic/helpext.h b/Externals/wxWidgets3/include/wx/generic/helpext.h
index 19d7641062..fe0c3e7eb2 100644
--- a/Externals/wxWidgets3/include/wx/generic/helpext.h
+++ b/Externals/wxWidgets3/include/wx/generic/helpext.h
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder (Ballueder@usa.net)
 // Modified by:
 // Copyright:   (c) Karsten Ballueder 1998
-// RCS-ID:      $Id: helpext.h 58227 2009-01-19 13:55:27Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/generic/hyperlink.h b/Externals/wxWidgets3/include/wx/generic/hyperlink.h
index c834a7fd3b..eb73388869 100644
--- a/Externals/wxWidgets3/include/wx/generic/hyperlink.h
+++ b/Externals/wxWidgets3/include/wx/generic/hyperlink.h
@@ -4,7 +4,6 @@
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Created:     04/02/2005
-// RCS-ID:      $Id: hyperlink.h 67948 2011-06-15 21:56:23Z VZ $
 // Copyright:   (c) 2005 David Norris
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/icon.h b/Externals/wxWidgets3/include/wx/generic/icon.h
index 7d0f49e72c..7a336d37ce 100644
--- a/Externals/wxWidgets3/include/wx/generic/icon.h
+++ b/Externals/wxWidgets3/include/wx/generic/icon.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id: icon.h 57692 2008-12-31 15:27:00Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/imaglist.h b/Externals/wxWidgets3/include/wx/generic/imaglist.h
index a16ed15a76..8fc145e03f 100644
--- a/Externals/wxWidgets3/include/wx/generic/imaglist.h
+++ b/Externals/wxWidgets3/include/wx/generic/imaglist.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:          $Id: imaglist.h 62789 2009-12-05 19:57:58Z PC $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/infobar.h b/Externals/wxWidgets3/include/wx/generic/infobar.h
index a7dd267ffa..4a6bf2b3c1 100644
--- a/Externals/wxWidgets3/include/wx/generic/infobar.h
+++ b/Externals/wxWidgets3/include/wx/generic/infobar.h
@@ -3,7 +3,6 @@
 // Purpose:     generic wxInfoBar class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
-// RCS-ID:      $Id: infobar.h 64213 2010-05-05 12:20:08Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,6 +79,9 @@ public:
     // (default font is a larger and bold version of the normal one)
     virtual bool SetFont(const wxFont& font);
 
+    // same thing with the colour: this affects the text colour
+    virtual bool SetForegroundColour(const wxColor& colour);
+
 protected:
     // info bar shouldn't have any border by default, the colour difference
     // between it and the main window separates it well enough
diff --git a/Externals/wxWidgets3/include/wx/generic/laywin.h b/Externals/wxWidgets3/include/wx/generic/laywin.h
index 3f8e38c5c5..a38fd97fc1 100644
--- a/Externals/wxWidgets3/include/wx/generic/laywin.h
+++ b/Externals/wxWidgets3/include/wx/generic/laywin.h
@@ -7,7 +7,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: laywin.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/listctrl.h b/Externals/wxWidgets3/include/wx/generic/listctrl.h
index 19622cac39..7e18eeccbf 100644
--- a/Externals/wxWidgets3/include/wx/generic/listctrl.h
+++ b/Externals/wxWidgets3/include/wx/generic/listctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Generic list control
 // Author:      Robert Roebling
 // Created:     01/02/97
-// RCS-ID:      $Id: listctrl.h 70282 2012-01-07 15:09:43Z VZ $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,6 +10,7 @@
 #ifndef _WX_GENERIC_LISTCTRL_H_
 #define _WX_GENERIC_LISTCTRL_H_
 
+#include "wx/containr.h"
 #include "wx/scrolwin.h"
 #include "wx/textctrl.h"
 
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
 // wxListCtrl
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxListCtrlBase,
+class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxNavigationEnabled<wxListCtrlBase>,
                                           public wxScrollHelper
 {
 public:
@@ -143,6 +143,8 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
+    virtual void EnableBellOnNoMatch(bool on = true);
+
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete, don't use
     wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
@@ -188,7 +190,6 @@ public:
 #endif
 
     virtual bool ShouldInheritColours() const { return false; }
-    virtual void SetFocus();
 
     // implementation
     // --------------
@@ -209,11 +210,6 @@ protected:
 
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
-    // take into account the coordinates difference between the container
-    // window and the list control window itself here
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-
     virtual wxSize DoGetBestClientSize() const;
 
     // return the text for the given column of the given item
@@ -227,9 +223,6 @@ protected:
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 
-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-
     // it calls our OnGetXXX() functions
     friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
 
diff --git a/Externals/wxWidgets3/include/wx/generic/logg.h b/Externals/wxWidgets3/include/wx/generic/logg.h
index 3ef9eacdc3..303b441e81 100644
--- a/Externals/wxWidgets3/include/wx/generic/logg.h
+++ b/Externals/wxWidgets3/include/wx/generic/logg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: logg.h 67656 2011-04-30 10:57:04Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,9 +126,6 @@ public:
     wxFrame *GetFrame() const;
 
     // overridables
-        // called immediately after the log frame creation allowing for
-        // any extra initializations
-    virtual void OnFrameCreate(wxFrame *frame);
         // called if the user closes the window interactively, will not be
         // called if it is destroyed for another reason (such as when program
         // exits) - return true from here to allow the frame to close, false
diff --git a/Externals/wxWidgets3/include/wx/generic/mask.h b/Externals/wxWidgets3/include/wx/generic/mask.h
index 54969b8c23..f6aad1a86d 100644
--- a/Externals/wxWidgets3/include/wx/generic/mask.h
+++ b/Externals/wxWidgets3/include/wx/generic/mask.h
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxMask
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28
-// RCS-ID:      $Id: mask.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/mdig.h b/Externals/wxWidgets3/include/wx/generic/mdig.h
index ae8ba70cd6..7c433edc40 100644
--- a/Externals/wxWidgets3/include/wx/generic/mdig.h
+++ b/Externals/wxWidgets3/include/wx/generic/mdig.h
@@ -4,7 +4,6 @@
 // Author:      Hans Van Leemputten
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     29/07/2002
-// RCS-ID:      $Id: mdig.h 59164 2009-02-26 16:16:31Z VZ $
 // Copyright:   (c) 2002 Hans Van Leemputten
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h b/Externals/wxWidgets3/include/wx/generic/msgdlgg.h
index 73fe48b4a7..66bd5484ea 100644
--- a/Externals/wxWidgets3/include/wx/generic/msgdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/msgdlgg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: msgdlgg.h 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/notebook.h b/Externals/wxWidgets3/include/wx/generic/notebook.h
index e2c405e7ab..e328e0bfcf 100644
--- a/Externals/wxWidgets3/include/wx/generic/notebook.h
+++ b/Externals/wxWidgets3/include/wx/generic/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     wxNotebook class (a.k.a. property sheet, tabbed dialog)
 // Author:      Julian Smart
 // Modified by:
-// RCS-ID:      $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/notifmsg.h b/Externals/wxWidgets3/include/wx/generic/notifmsg.h
index e9f08ae1c4..1cd74ba7f0 100644
--- a/Externals/wxWidgets3/include/wx/generic/notifmsg.h
+++ b/Externals/wxWidgets3/include/wx/generic/notifmsg.h
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxGenericNotificationMessage
 // Author:      Vadim Zeitlin
 // Created:     2007-11-24
-// RCS-ID:      $Id: notifmsg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/numdlgg.h b/Externals/wxWidgets3/include/wx/generic/numdlgg.h
index 24657fb77a..ac45ce915c 100644
--- a/Externals/wxWidgets3/include/wx/generic/numdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/numdlgg.h
@@ -4,7 +4,6 @@
 // Author:      John Labenski
 // Modified by:
 // Created:     07.02.04 (extracted from textdlgg.cpp)
-// RCS-ID:      $Id: numdlgg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/paletteg.h b/Externals/wxWidgets3/include/wx/generic/paletteg.h
index a0e396850a..0f6f5a4918 100644
--- a/Externals/wxWidgets3/include/wx/generic/paletteg.h
+++ b/Externals/wxWidgets3/include/wx/generic/paletteg.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// RCS-ID:      $Id: paletteg.h 50727 2007-12-15 17:54:20Z VZ $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/panelg.h b/Externals/wxWidgets3/include/wx/generic/panelg.h
index 79dfe85c5c..5c02cb35d8 100644
--- a/Externals/wxWidgets3/include/wx/generic/panelg.h
+++ b/Externals/wxWidgets3/include/wx/generic/panelg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: panelg.h 70098 2011-12-23 05:59:59Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/printps.h b/Externals/wxWidgets3/include/wx/generic/printps.h
index f6bf9bc68a..388307297c 100644
--- a/Externals/wxWidgets3/include/wx/generic/printps.h
+++ b/Externals/wxWidgets3/include/wx/generic/printps.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: printps.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/private/grid.h b/Externals/wxWidgets3/include/wx/generic/private/grid.h
index ab763a9c22..7ef99700cf 100644
--- a/Externals/wxWidgets3/include/wx/generic/private/grid.h
+++ b/Externals/wxWidgets3/include/wx/generic/private/grid.h
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grid.h 69861 2011-11-28 19:15:59Z VZ $
 // Copyright:   (c) Michael Bedward
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,10 @@
 
 #if wxUSE_GRID
 
+// Internally used (and hence intentionally not exported) event telling wxGrid
+// to hide the currently shown editor.
+wxDECLARE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent );
+
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
@@ -553,7 +556,7 @@ public:
     // NB: As GetLineAt(), currently this is always identity for rows.
     virtual int GetLinePos(const wxGrid *grid, int line) const = 0;
 
-    // Return the index of the line just before the given one.
+    // Return the index of the line just before the given one or wxNOT_FOUND.
     virtual int GetLineBefore(const wxGrid* grid, int line) const = 0;
 
     // Get the row or column label window
@@ -626,7 +629,7 @@ public:
         { return line; } // TODO: implement row reordering
 
     virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const
-        { return line ? line - 1 : line; }
+        { return line - 1; }
 
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridRowLabelWindow(); }
@@ -692,7 +695,10 @@ public:
         { return grid->GetColPos(line); }
 
     virtual int GetLineBefore(const wxGrid* grid, int line) const
-        { return grid->GetColAt(wxMax(0, grid->GetColPos(line) - 1)); }
+    {
+        int posBefore = grid->GetColPos(line) - 1;
+        return posBefore >= 0 ? grid->GetColAt(posBefore) : wxNOT_FOUND;
+    }
 
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridColLabelWindow(); }
diff --git a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h b/Externals/wxWidgets3/include/wx/generic/private/listctrl.h
index 3d7838a883..32afaada6f 100644
--- a/Externals/wxWidgets3/include/wx/generic/private/listctrl.h
+++ b/Externals/wxWidgets3/include/wx/generic/private/listctrl.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/listctrl.h
+// Name:        wx/generic/private/listctrl.h
 // Purpose:     private definitions of wxListCtrl helpers
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)
-// Id:          $Id: listctrl.h 70285 2012-01-07 15:09:54Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -336,22 +335,27 @@ protected:
 public:
     wxListHeaderWindow();
 
-    wxListHeaderWindow( wxWindow *win,
-                        wxWindowID id,
-                        wxListMainWindow *owner,
-                        const wxPoint &pos = wxDefaultPosition,
-                        const wxSize &size = wxDefaultSize,
-                        long style = 0,
-                        const wxString &name = wxT("wxlistctrlcolumntitles") );
+    // We provide only Create(), not the ctor, because we need to create the
+    // C++ object before creating the window, see the explanations in
+    // CreateOrDestroyHeaderWindowAsNeeded()
+    bool Create( wxWindow *win,
+                 wxWindowID id,
+                 wxListMainWindow *owner,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxT("wxlistctrlcolumntitles") );
 
     virtual ~wxListHeaderWindow();
 
+    // We never need focus as we don't have any keyboard interface.
+    virtual bool AcceptsFocus() const { return false; }
+
     void DrawCurrent();
     void AdjustDC( wxDC& dc );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );
-    void OnSetFocus( wxFocusEvent &event );
 
     // needs refresh
     bool m_dirty;
@@ -388,6 +392,27 @@ public:
     void Notify();
 };
 
+//-----------------------------------------------------------------------------
+// wxListFindTimer (internal)
+//-----------------------------------------------------------------------------
+
+class wxListFindTimer: public wxTimer
+{
+public:
+    // reset the current prefix after half a second of inactivity
+    enum { DELAY = 500 };
+
+    wxListFindTimer( wxListMainWindow *owner )
+        : m_owner(owner)
+    {
+    }
+
+    virtual void Notify();
+
+private:
+    wxListMainWindow *m_owner;
+};
+
 //-----------------------------------------------------------------------------
 // wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
@@ -448,10 +473,8 @@ public:
     wxListMainWindow();
     wxListMainWindow( wxWindow *parent,
                       wxWindowID id,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = 0,
-                      const wxString &name = wxT("listctrlmainwindow") );
+                      const wxPoint& pos,
+                      const wxSize& size );
 
     virtual ~wxListMainWindow();
 
@@ -556,6 +579,11 @@ public:
     bool OnRenameAccept(size_t itemEdit, const wxString& value);
     void OnRenameCancelled(size_t itemEdit);
 
+    void OnFindTimer();
+    // set whether or not to ring the find bell
+    // (does nothing on MSW - bell is always rung)
+    void EnableBellOnNoMatch( bool on );
+
     void OnMouse( wxMouseEvent &event );
 
     // called to switch the selection from the current item to newCurrent,
@@ -644,7 +672,7 @@ public:
     long FindItem( const wxPoint& pt );
     long HitTest( int x, int y, int &flags ) const;
     void InsertItem( wxListItem &item );
-    void InsertColumn( long col, const wxListItem &item );
+    long InsertColumn( long col, const wxListItem &item );
     int GetItemWidthWithImage(wxListItem * item);
     void SortItems( wxListCtrlCompare fn, wxIntPtr data );
 
@@ -729,6 +757,15 @@ protected:
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;
+
+    // incremental search data
+    wxString             m_findPrefix;
+    wxTimer             *m_findTimer;
+    // This flag is set to 0 if the bell is disabled, 1 if it is enabled and -1
+    // if it is globally enabled but has been temporarily disabled because we
+    // had already beeped for this particular search.
+    int                  m_findBell;
+
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;
@@ -779,6 +816,9 @@ protected:
     // force us to recalculate the range of visible lines
     void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; }
 
+    // find the first item starting with the given prefix after the given item
+    size_t PrefixFindItem(size_t item, const wxString& prefix) const;
+
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {
diff --git a/Externals/wxWidgets3/include/wx/generic/private/markuptext.h b/Externals/wxWidgets3/include/wx/generic/private/markuptext.h
index e918dca7be..1d9569229e 100644
--- a/Externals/wxWidgets3/include/wx/generic/private/markuptext.h
+++ b/Externals/wxWidgets3/include/wx/generic/private/markuptext.h
@@ -3,7 +3,6 @@
 // Purpose:     Generic wxMarkupText class for managing text with markup.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-21
-// RCS-ID:      $Id: markuptext.h 67064 2011-02-27 12:48:21Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h b/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h
index 0ca479dadb..ad356f51f8 100644
--- a/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h
+++ b/Externals/wxWidgets3/include/wx/generic/private/richtooltip.h
@@ -3,13 +3,12 @@
 // Purpose:     wxRichToolTipGenericImpl declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18
-// RCS-ID:      $Id: richtooltip.h 69488 2011-10-20 16:20:19Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_
-#define _GENERIC_PRIVATE_RICHTOOLTIP_H_
+#define _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_
 
 #include "wx/icon.h"
 #include "wx/colour.h"
@@ -30,17 +29,19 @@ public:
         // This is pretty arbitrary, we could follow MSW and use some multiple
         // of double-click time here.
         m_timeout = 5000;
+        m_delay = 0;
     }
 
     virtual void SetBackgroundColour(const wxColour& col,
                                      const wxColour& colEnd);
     virtual void SetCustomIcon(const wxIcon& icon);
     virtual void SetStandardIcon(int icon);
-    virtual void SetTimeout(unsigned milliseconds);
+    virtual void SetTimeout(unsigned milliseconds,
+                            unsigned millisecondsDelay = 0);
     virtual void SetTipKind(wxTipKind tipKind);
     virtual void SetTitleFont(const wxFont& font);
 
-    virtual void ShowFor(wxWindow* win);
+    virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL);
 
 protected:
     wxString m_title,
@@ -52,7 +53,8 @@ private:
     wxColour m_colStart,
              m_colEnd;
 
-    unsigned m_timeout;
+    unsigned m_timeout,
+             m_delay;
 
     wxTipKind m_tipKind;
 
diff --git a/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h b/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h
new file mode 100644
index 0000000000..2b31d02831
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/generic/private/textmeasure.h
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/private/textmeasure.h
+// Purpose:     Generic wxTextMeasure declaration.
+// Author:      Vadim Zeitlin
+// Created:     2012-10-17
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GENERIC_PRIVATE_TEXTMEASURE_H_
+#define _WX_GENERIC_PRIVATE_TEXTMEASURE_H_
+
+// ----------------------------------------------------------------------------
+// wxTextMeasure for the platforms without native support.
+// ----------------------------------------------------------------------------
+
+class wxTextMeasure : public wxTextMeasureBase
+{
+public:
+    wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
+        : wxTextMeasureBase(dc, font) {}
+    wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
+        : wxTextMeasureBase(win, font) {}
+
+protected:
+    virtual void DoGetTextExtent(const wxString& string,
+                               wxCoord *width,
+                               wxCoord *height,
+                               wxCoord *descent = NULL,
+                               wxCoord *externalLeading = NULL);
+
+    virtual bool DoGetPartialTextExtents(const wxString& text,
+                                         wxArrayInt& widths,
+                                         double scaleX);
+
+    wxDECLARE_NO_COPY_CLASS(wxTextMeasure);
+};
+
+#endif // _WX_GENERIC_PRIVATE_TEXTMEASURE_H_
diff --git a/Externals/wxWidgets3/include/wx/generic/private/timer.h b/Externals/wxWidgets3/include/wx/generic/private/timer.h
index 0be9a3bfe8..6d96389ce8 100644
--- a/Externals/wxWidgets3/include/wx/generic/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/generic/private/timer.h
@@ -2,7 +2,6 @@
 // Name:        wx/generic/private/timer.h
 // Purpose:     Generic implementation of wxTimer class
 // Author:      Vaclav Slavik
-// Id:          $Id: timer.h 50646 2007-12-12 01:35:53Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h b/Externals/wxWidgets3/include/wx/generic/prntdlgg.h
index e3317e1cc6..6c8f7bd5a7 100644
--- a/Externals/wxWidgets3/include/wx/generic/prntdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/prntdlgg.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: prntdlgg.h 70636 2012-02-20 21:55:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/progdlgg.h b/Externals/wxWidgets3/include/wx/generic/progdlgg.h
index 38b69241db..d29452f1f0 100644
--- a/Externals/wxWidgets3/include/wx/generic/progdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/progdlgg.h
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by: Francesco Montorsi
 // Created:     09.05.1999
-// RCS-ID:      $Id: progdlgg.h 70512 2012-02-05 14:18:25Z VZ $
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/propdlg.h b/Externals/wxWidgets3/include/wx/generic/propdlg.h
index 307400265e..6cb63efad9 100644
--- a/Externals/wxWidgets3/include/wx/generic/propdlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/propdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-03-12
-// RCS-ID:      $Id: propdlg.h 58579 2009-02-01 04:48:19Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/region.h b/Externals/wxWidgets3/include/wx/generic/region.h
index d796becf1c..1c5048dbf2 100644
--- a/Externals/wxWidgets3/include/wx/generic/region.h
+++ b/Externals/wxWidgets3/include/wx/generic/region.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/12
-// RCS-ID:      $Id: region.h 58738 2009-02-07 23:20:45Z KO $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h b/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h
index 9d075ef767..5446f87fef 100644
--- a/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/richmsgdlgg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericRichMessageDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-04
-// RCS-ID:      $Id: richmsgdlgg.h 65356 2010-08-19 00:06:12Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/sashwin.h b/Externals/wxWidgets3/include/wx/generic/sashwin.h
index 068911aa8b..e4f34d8296 100644
--- a/Externals/wxWidgets3/include/wx/generic/sashwin.h
+++ b/Externals/wxWidgets3/include/wx/generic/sashwin.h
@@ -6,7 +6,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: sashwin.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/scrolwin.h b/Externals/wxWidgets3/include/wx/generic/scrolwin.h
index 35883b8bc1..863cdf923e 100644
--- a/Externals/wxWidgets3/include/wx/generic/scrolwin.h
+++ b/Externals/wxWidgets3/include/wx/generic/scrolwin.h
@@ -3,7 +3,6 @@
 // Purpose:     generic wxScrollHelper
 // Author:      Vadim Zeitlin
 // Created:     2008-12-24 (replacing old file with the same name)
-// RCS-ID:      $Id: scrolwin.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +21,7 @@ public:
 
     // implement base class pure virtuals
     virtual void AdjustScrollbars();
+    virtual bool IsScrollbarShown(int orient) const;
 
 protected:
     virtual void DoScroll(int x, int y);
diff --git a/Externals/wxWidgets3/include/wx/generic/spinctlg.h b/Externals/wxWidgets3/include/wx/generic/spinctlg.h
index 36c777940e..a35cc8a4a4 100644
--- a/Externals/wxWidgets3/include/wx/generic/spinctlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/spinctlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.10.99
-// RCS-ID:      $Id: spinctlg.h 70432 2012-01-21 17:03:52Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +21,8 @@
 
 #if wxUSE_SPINBTN
 
+#include "wx/compositewin.h"
+
 class WXDLLIMPEXP_FWD_CORE wxSpinButton;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
@@ -40,7 +41,8 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
 // function ambiguity.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase
+class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase
+                : public wxNavigationEnabled<wxCompositeWindow<wxSpinCtrlBase> >
 {
 public:
     wxSpinCtrlGenericBase() { Init(); }
@@ -85,6 +87,8 @@ public:
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif // wxUSE_TOOLTIPS
 
+    virtual bool SetBackgroundColour(const wxColour& colour);
+
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }
     wxSpinButton *GetSpinButton() const { return m_spinButton; }
@@ -105,6 +109,7 @@ public:
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 #ifdef __WXMSW__
@@ -112,9 +117,15 @@ protected:
     virtual void DoEnable(bool enable);
 #endif // __WXMSW__
 
+    enum SendEvent
+    {
+        SendEvent_None,
+        SendEvent_Text
+    };
+
     // generic double valued functions
     double DoGetValue() const { return m_value; }
-    bool DoSetValue(double val);
+    bool DoSetValue(double val, SendEvent sendEvent);
     void DoSetRange(double min_val, double max_val);
     void DoSetIncrement(double inc);
 
@@ -124,11 +135,15 @@ protected:
     // can also change the text control if its value is invalid
     //
     // return true if our value has changed
-    bool SyncSpinToText();
+    bool SyncSpinToText(SendEvent sendEvent);
 
     // Send the correct event type
     virtual void DoSendEvent() = 0;
 
+    // Convert the text to/from the corresponding value.
+    virtual bool DoTextToValue(const wxString& text, double *val) = 0;
+    virtual wxString DoValueToText(double val) = 0;
+
     // check if the value is in range
     bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
 
@@ -141,7 +156,6 @@ protected:
     double m_max;
     double m_increment;
     bool   m_snap_to_ticks;
-    wxString m_format;
 
     int m_spin_value;
 
@@ -153,6 +167,9 @@ private:
     // common part of all ctors
     void Init();
 
+    // Implement pure virtual function inherited from wxCompositeWindow.
+    virtual wxWindowList GetCompositeWindowParts() const;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -190,7 +207,7 @@ public:
 
         bool ok = wxTextCtrl::Create(parent, id, value, pos, size, style,
                                      wxDefaultValidator, name);
-        DoSetValue(initial);
+        DoSetValue(initial, SendEvent_None);
 
         return ok;
     }
@@ -226,9 +243,20 @@ protected:
         return n;
     }
 
-    bool DoSetValue(double val)
+    bool DoSetValue(double val, SendEvent sendEvent)
     {
-        wxTextCtrl::SetValue(wxString::Format(m_format.c_str(), val));
+        wxString str(wxString::Format(m_format, val));
+        switch ( sendEvent )
+        {
+            case SendEvent_None:
+                wxTextCtrl::ChangeValue(str);
+                break;
+
+            case SendEvent_Text:
+                wxTextCtrl::SetValue(str);
+                break;
+        }
+
         return true;
     }
     void DoSetRange(double min_val, double max_val)
@@ -257,7 +285,7 @@ protected:
 class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGenericBase
 {
 public:
-    wxSpinCtrl() {}
+    wxSpinCtrl() { Init(); }
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
@@ -267,6 +295,8 @@ public:
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {
+        Init();
+
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
@@ -292,13 +322,28 @@ public:
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue( int value )              { DoSetValue(value); }
+    void SetValue( int value )              { DoSetValue(value, SendEvent_None); }
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement(int inc) { DoSetIncrement(inc); }
 
+    virtual int GetBase() const { return m_base; }
+    virtual bool SetBase(int base);
+
 protected:
     virtual void DoSendEvent();
 
+    virtual bool DoTextToValue(const wxString& text, double *val);
+    virtual wxString DoValueToText(double val);
+
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+
+    int m_base;
+
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
@@ -311,7 +356,7 @@ protected:
 class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGenericBase
 {
 public:
-    wxSpinCtrlDouble() : m_digits(0) { }
+    wxSpinCtrlDouble() { Init(); }
     wxSpinCtrlDouble(wxWindow *parent,
                      wxWindowID id = wxID_ANY,
                      const wxString& value = wxEmptyString,
@@ -322,7 +367,8 @@ public:
                      double inc = 1,
                      const wxString& name = wxT("wxSpinCtrlDouble"))
     {
-        m_digits = 0;
+        Init();
+
         Create(parent, id, value, pos, size, style,
                min, max, initial, inc, name);
     }
@@ -352,16 +398,34 @@ public:
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue(double value)                 { DoSetValue(value); }
+    void SetValue(double value)                 { DoSetValue(value, SendEvent_None); }
     void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); }
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);
 
+    // We don't implement bases support for floating point numbers, this is not
+    // very useful in practice.
+    virtual int GetBase() const { return 10; }
+    virtual bool SetBase(int WXUNUSED(base)) { return 0; }
+
 protected:
     virtual void DoSendEvent();
 
+    virtual bool DoTextToValue(const wxString& text, double *val);
+    virtual wxString DoValueToText(double val);
+
     unsigned m_digits;
 
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_digits = 0;
+        m_format = wxS("%g");
+    }
+
+    wxString m_format;
+
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/generic/splash.h b/Externals/wxWidgets3/include/wx/generic/splash.h
index a98704a639..24ad733d5d 100644
--- a/Externals/wxWidgets3/include/wx/generic/splash.h
+++ b/Externals/wxWidgets3/include/wx/generic/splash.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     28/6/2000
-// RCS-ID:      $Id: splash.h 69796 2011-11-22 13:18:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/splitter.h b/Externals/wxWidgets3/include/wx/generic/splitter.h
index 47bdebceed..61128a3959 100644
--- a/Externals/wxWidgets3/include/wx/generic/splitter.h
+++ b/Externals/wxWidgets3/include/wx/generic/splitter.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: splitter.h 70840 2012-03-08 13:23:39Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -212,7 +211,7 @@ public:
     virtual void DrawSashTracker(int x, int y);
 
     // Tests for x, y over sash
-    virtual bool SashHitTest(int x, int y, int tolerance = 5);
+    virtual bool SashHitTest(int x, int y);
 
     // Resizes subwindows
     virtual void SizeWindows();
@@ -334,16 +333,16 @@ public:
     // all
     void SetSashPosition(int pos)
     {
-        wxASSERT( GetEventType() == wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
-                || GetEventType() == wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING);
+        wxASSERT( GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGED
+                || GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGING);
 
         m_data.pos = pos;
     }
 
     int GetSashPosition() const
     {
-        wxASSERT( GetEventType() == wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
-                || GetEventType() == wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING);
+        wxASSERT( GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGED
+                || GetEventType() == wxEVT_SPLITTER_SASH_POS_CHANGING);
 
         return m_data.pos;
     }
@@ -351,7 +350,7 @@ public:
     // UNSPLIT event methods
     wxWindow *GetWindowBeingRemoved() const
     {
-        wxASSERT( GetEventType() == wxEVT_COMMAND_SPLITTER_UNSPLIT );
+        wxASSERT( GetEventType() == wxEVT_SPLITTER_UNSPLIT );
 
         return m_data.win;
     }
@@ -359,14 +358,14 @@ public:
     // DCLICK event methods
     int GetX() const
     {
-        wxASSERT( GetEventType() == wxEVT_COMMAND_SPLITTER_DOUBLECLICKED );
+        wxASSERT( GetEventType() == wxEVT_SPLITTER_DOUBLECLICKED );
 
         return m_data.pt.x;
     }
 
     int GetY() const
     {
-        wxASSERT( GetEventType() == wxEVT_COMMAND_SPLITTER_DOUBLECLICKED );
+        wxASSERT( GetEventType() == wxEVT_SPLITTER_DOUBLECLICKED );
 
         return m_data.pt.y;
     }
@@ -396,7 +395,7 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
     wxEVENT_HANDLER_CAST(wxSplitterEventFunction, func)
 
 #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))
 
 #define EVT_SPLITTER_SASH_POS_CHANGED(id, fn) \
     wx__DECLARE_SPLITTEREVT(SASH_POS_CHANGED, id, fn)
@@ -410,4 +409,11 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 #define EVT_SPLITTER_UNSPLIT(id, fn) \
     wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn)
 
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED    wxEVT_SPLITTER_SASH_POS_CHANGED
+#define wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING   wxEVT_SPLITTER_SASH_POS_CHANGING
+#define wxEVT_COMMAND_SPLITTER_DOUBLECLICKED       wxEVT_SPLITTER_DOUBLECLICKED
+#define wxEVT_COMMAND_SPLITTER_UNSPLIT             wxEVT_SPLITTER_UNSPLIT
+
 #endif // _WX_GENERIC_SPLITTER_H_
diff --git a/Externals/wxWidgets3/include/wx/generic/srchctlg.h b/Externals/wxWidgets3/include/wx/generic/srchctlg.h
index 864efcd142..c61ddee751 100644
--- a/Externals/wxWidgets3/include/wx/generic/srchctlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/srchctlg.h
@@ -3,7 +3,6 @@
 // Purpose:     generic wxSearchCtrl class
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctlg.h 68911 2011-08-27 12:13:23Z VZ $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -219,7 +218,7 @@ protected:
     virtual wxBitmap RenderSearchBitmap( int x, int y, bool renderDrop );
     virtual wxBitmap RenderCancelBitmap( int x, int y );
 
-    virtual void OnSearchButton( wxCommandEvent& event );
+    void OnCancelButton( wxCommandEvent& event );
 
     void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );
diff --git a/Externals/wxWidgets3/include/wx/generic/statbmpg.h b/Externals/wxWidgets3/include/wx/generic/statbmpg.h
index 930e3943b9..f3d198df4e 100644
--- a/Externals/wxWidgets3/include/wx/generic/statbmpg.h
+++ b/Externals/wxWidgets3/include/wx/generic/statbmpg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericStaticBitmap header
 // Author:      Marcin Wojdyr, Stefan Csomor
 // Created:     2008-06-16
-// RCS-ID:      $Id: statbmpg.h 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   wxWidgets developers
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -61,8 +60,8 @@ public:
 private:
     wxSize GetBitmapSize()
     {
-        return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
-                             : wxSize(16, 16); // this is completely arbitrary
+        return m_bitmap.IsOk() ? m_bitmap.GetScaledSize()
+                               : wxSize(16, 16); // this is completely arbitrary
     }
 
     void OnPaint(wxPaintEvent& event);
diff --git a/Externals/wxWidgets3/include/wx/generic/statline.h b/Externals/wxWidgets3/include/wx/generic/statline.h
index 8a9fee1b1e..8a7ccbf088 100644
--- a/Externals/wxWidgets3/include/wx/generic/statline.h
+++ b/Externals/wxWidgets3/include/wx/generic/statline.h
@@ -3,7 +3,6 @@
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/stattextg.h b/Externals/wxWidgets3/include/wx/generic/stattextg.h
index 306b59217a..918a4f4eb3 100644
--- a/Externals/wxWidgets3/include/wx/generic/stattextg.h
+++ b/Externals/wxWidgets3/include/wx/generic/stattextg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericStaticText header
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26
-// Id:          $Id: stattextg.h 67067 2011-02-27 12:48:38Z VZ $
 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/statusbr.h b/Externals/wxWidgets3/include/wx/generic/statusbr.h
index dc2a3f88a4..bff20807e3 100644
--- a/Externals/wxWidgets3/include/wx/generic/statusbr.h
+++ b/Externals/wxWidgets3/include/wx/generic/statusbr.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
-// RCS-ID:      $Id: statusbr.h 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -91,8 +90,9 @@ protected:
     // common part of all ctors
     void Init();
 
-    // the last known height of the client rect
-    int               m_lastClientHeight;
+    // the last known size, fields widths must be updated whenever it's out of
+    // date
+    wxSize m_lastClientSize;
 
     // the absolute widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;
@@ -106,6 +106,9 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
+    // Update m_lastClientSize and m_widthsAbs from the current size.
+    void DoUpdateFieldWidths();
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
diff --git a/Externals/wxWidgets3/include/wx/generic/tabg.h b/Externals/wxWidgets3/include/wx/generic/tabg.h
index ea21a32a6d..d376b3b510 100644
--- a/Externals/wxWidgets3/include/wx/generic/tabg.h
+++ b/Externals/wxWidgets3/include/wx/generic/tabg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: tabg.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/textdlgg.h b/Externals/wxWidgets3/include/wx/generic/textdlgg.h
index f27e0b0296..023d497c30 100644
--- a/Externals/wxWidgets3/include/wx/generic/textdlgg.h
+++ b/Externals/wxWidgets3/include/wx/generic/textdlgg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: textdlgg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,16 +36,33 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];
 class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog
 {
 public:
+    wxTextEntryDialog()
+    {
+        m_textctrl = NULL;
+    }
+
     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
                       const wxString& caption = wxGetTextFromUserPromptStr,
                       const wxString& value = wxEmptyString,
                       long style = wxTextEntryDialogStyle,
-                      const wxPoint& pos = wxDefaultPosition);
+                      const wxPoint& pos = wxDefaultPosition)
+    {
+        Create(parent, message, caption, value, style, pos);
+    }
+
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& caption = wxGetTextFromUserPromptStr,
+                const wxString& value = wxEmptyString,
+                long style = wxTextEntryDialogStyle,
+                const wxPoint& pos = wxDefaultPosition);
 
     void SetValue(const wxString& val);
     wxString GetValue() const { return m_value; }
 
+    void SetMaxLength(unsigned long len);
+
 #if wxUSE_VALIDATORS
     void SetTextValidator( const wxTextValidator& validator );
 #if WXWIN_COMPATIBILITY_2_8
@@ -54,8 +70,10 @@ public:
 #endif
     void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE );
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
-#endif
-  // wxUSE_VALIDATORS
+#endif // wxUSE_VALIDATORS
+
+    virtual bool TransferDataToWindow();
+    virtual bool TransferDataFromWindow();
 
     // implementation only
     void OnOK(wxCommandEvent& event);
diff --git a/Externals/wxWidgets3/include/wx/generic/timectrl.h b/Externals/wxWidgets3/include/wx/generic/timectrl.h
index c04ab8f254..20b02498bd 100644
--- a/Externals/wxWidgets3/include/wx/generic/timectrl.h
+++ b/Externals/wxWidgets3/include/wx/generic/timectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Generic implementation of wxTimePickerCtrl.
 // Author:      Paul Breen, Vadim Zeitlin
 // Created:     2011-09-22
-// RCS-ID:      $Id: timectrl.h 69489 2011-10-20 16:45:48Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/generic/treectlg.h b/Externals/wxWidgets3/include/wx/generic/treectlg.h
index 45be6d54a9..53b3942835 100644
--- a/Externals/wxWidgets3/include/wx/generic/treectlg.h
+++ b/Externals/wxWidgets3/include/wx/generic/treectlg.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: treectlg.h 65587 2010-09-22 10:06:39Z SJL $
 // Copyright:   (c) 1997,1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,7 +64,6 @@ public:
                 const wxValidator &validator = wxDefaultValidator,
                 const wxString& name = wxTreeCtrlNameStr);
 
-
     // implement base class pure virtuals
     // ----------------------------------
 
@@ -169,6 +167,8 @@ public:
     virtual void EndEditLabel(const wxTreeItemId& item,
                               bool discardChanges = false);
 
+    virtual void EnableBellOnNoMatch(bool on = true);
+
     virtual void SortChildren(const wxTreeItemId& item);
 
     // items geometry
@@ -275,6 +275,10 @@ protected:
     // incremental search data
     wxString             m_findPrefix;
     wxTimer             *m_findTimer;
+    // This flag is set to 0 if the bell is disabled, 1 if it is enabled and -1
+    // if it is globally enabled but has been temporarily disabled because we
+    // had already beeped for this particular search.
+    int                  m_findBell;
 
     bool                 m_dropEffectAboveItem;
 
@@ -352,6 +356,10 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
+    // Reset the state of the last find (i.e. keyboard incremental search)
+    // operation.
+    void ResetFindState();
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
     wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
diff --git a/Externals/wxWidgets3/include/wx/generic/wizard.h b/Externals/wxWidgets3/include/wx/generic/wizard.h
index 4f5e2ef67c..2161870077 100644
--- a/Externals/wxWidgets3/include/wx/generic/wizard.h
+++ b/Externals/wxWidgets3/include/wx/generic/wizard.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Created:     28.09.99
-// RCS-ID:      $Id: wizard.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/geometry.h b/Externals/wxWidgets3/include/wx/geometry.h
index d8981c5756..37d3a74539 100644
--- a/Externals/wxWidgets3/include/wx/geometry.h
+++ b/Externals/wxWidgets3/include/wx/geometry.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99
-// RCS-ID:      $Id: geometry.h 70493 2012-01-31 19:39:43Z VZ $
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -526,9 +525,9 @@ public:
 */
         // single attribute accessors
 
-    inline wxPoint2DDouble GetPosition()
+    wxPoint2DDouble GetPosition() const
         { return wxPoint2DDouble(m_x, m_y); }
-    inline wxSize GetSize()
+    wxSize GetSize() const
         { return wxSize((int) m_width, (int) m_height); }
 
     // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
@@ -655,8 +654,8 @@ public:
 
         // single attribute accessors
 
-      inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); }
-       inline wxSize GetSize() { return wxSize(m_width, m_height); }
+       wxPoint2DInt GetPosition() const { return wxPoint2DInt(m_x, m_y); }
+       wxSize GetSize() const { return wxSize(m_width, m_height); }
 
         // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
         // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
@@ -778,7 +777,7 @@ inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const
     return !(*this == rect);
 }
 
-class wxTransform2D
+class WXDLLIMPEXP_CORE wxTransform2D
 {
 public :
     virtual ~wxTransform2D() { }
@@ -793,24 +792,6 @@ public :
     virtual wxRect2DInt        InverseTransform( const wxRect2DInt &r ) const ;
 };
 
-inline void    wxTransform2D::Transform( wxRect2DInt* r ) const
-    { wxPoint2DInt a = r->GetLeftTop() , b = r->GetRightBottom(); Transform( &a ); Transform( &b ); *r = wxRect2DInt( a , b ); }
-
-inline wxPoint2DInt    wxTransform2D::Transform( const wxPoint2DInt &pt ) const
-    { wxPoint2DInt res = pt; Transform( &res ); return res; }
-
-inline wxRect2DInt     wxTransform2D::Transform( const wxRect2DInt &r ) const
-    { wxRect2DInt res = r; Transform( &res ); return res; }
-
-inline void    wxTransform2D::InverseTransform( wxRect2DInt* r ) const
-    { wxPoint2DInt a = r->GetLeftTop() , b = r->GetRightBottom(); InverseTransform( &a ); InverseTransform( &b ); *r = wxRect2DInt( a , b ); }
-
-inline wxPoint2DInt    wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const
-    { wxPoint2DInt res = pt; InverseTransform( &res ); return res; }
-
-inline wxRect2DInt     wxTransform2D::InverseTransform( const wxRect2DInt &r ) const
-    { wxRect2DInt res = r; InverseTransform( &res ); return res; }
-
 
 #endif // wxUSE_GEOMETRY
 
diff --git a/Externals/wxWidgets3/include/wx/gifdecod.h b/Externals/wxWidgets3/include/wx/gifdecod.h
index 01b5e96d7f..f0b84fc4bf 100644
--- a/Externals/wxWidgets3/include/wx/gifdecod.h
+++ b/Externals/wxWidgets3/include/wx/gifdecod.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02
-// CVS-ID:      $Id: gifdecod.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/glcanvas.h b/Externals/wxWidgets3/include/wx/glcanvas.h
index c0ae3dbdf9..688d4788b0 100644
--- a/Externals/wxWidgets3/include/wx/glcanvas.h
+++ b/Externals/wxWidgets3/include/wx/glcanvas.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: glcanvas.h 70165 2011-12-29 14:42:13Z SN $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/graphics.h b/Externals/wxWidgets3/include/wx/graphics.h
index 0b2420faa8..46f60b6884 100644
--- a/Externals/wxWidgets3/include/wx/graphics.h
+++ b/Externals/wxWidgets3/include/wx/graphics.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id: graphics.h 69485 2011-10-20 04:49:12Z RD $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -107,6 +106,7 @@ class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap;
 //
 
 class WXDLLIMPEXP_FWD_CORE wxGraphicsObjectRefData;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmapData;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrixData;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPathData;
 
@@ -174,6 +174,13 @@ public:
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE
+    
+    void* GetNativeBitmap() const;
+
+    const wxGraphicsBitmapData* GetBitmapData() const
+    { return (const wxGraphicsBitmapData*) GetRefData(); }
+    wxGraphicsBitmapData* GetBitmapData()
+    { return (wxGraphicsBitmapData*) GetRefData(); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap)
@@ -390,7 +397,7 @@ public:
     void Add(wxColour col, float pos) { Add(wxGraphicsGradientStop(col, pos)); }
 
     // Get the number of stops.
-    unsigned GetCount() const { return m_stops.size(); }
+    size_t GetCount() const { return m_stops.size(); }
 
     // Return the stop at the given index (which must be valid).
     wxGraphicsGradientStop Item(unsigned n) const { return m_stops.at(n); }
@@ -510,6 +517,16 @@ public:
     virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
         wxDouble tx=0.0, wxDouble ty=0.0) const;
 
+    wxGraphicsMatrix CreateMatrix( const wxAffineMatrix2DBase& mat ) const
+    {
+        wxMatrix2D mat2D;
+        wxPoint2DDouble tr;
+        mat.Get(&mat2D, &tr);
+
+        return CreateMatrix(mat2D.m_11, mat2D.m_12, mat2D.m_21, mat2D.m_22,
+                            tr.m_x, tr.m_y);
+    }
+
     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState() = 0;
 
@@ -547,7 +564,7 @@ public:
     virtual bool SetCompositionMode(wxCompositionMode op) = 0;
 
     // returns the size of the graphics context in device coordinates
-    void GetSize(wxDouble* width, wxDouble* height)
+    void GetSize(wxDouble* width, wxDouble* height) const
     {
         if ( width )
             *width = m_width;
diff --git a/Externals/wxWidgets3/include/wx/grid.h b/Externals/wxWidgets3/include/wx/grid.h
index 406cd3533c..02055658ed 100644
--- a/Externals/wxWidgets3/include/wx/grid.h
+++ b/Externals/wxWidgets3/include/wx/grid.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: grid.h 58510 2009-01-30 09:08:37Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/accel.h b/Externals/wxWidgets3/include/wx/gtk/accel.h
index e2107d9e61..09ffb61cc1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/accel.h
+++ b/Externals/wxWidgets3/include/wx/gtk/accel.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: accel.h 33948 2005-05-04 18:57:50Z JS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/animate.h b/Externals/wxWidgets3/include/wx/gtk/animate.h
index b48fb3a543..1cda545a41 100644
--- a/Externals/wxWidgets3/include/wx/gtk/animate.h
+++ b/Externals/wxWidgets3/include/wx/gtk/animate.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by: Francesco Montorsi
 // Created:     13/8/99
-// RCS-ID:      $Id: animate.h 70520 2012-02-05 22:53:39Z SN $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -95,8 +94,6 @@ public:
         Create(parent, id, anim, pos, size, style, name);
     }
 
-    void Init();
-
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxAnimation& anim = wxNullAnimation,
                 const wxPoint& pos = wxDefaultPosition,
@@ -146,6 +143,9 @@ protected:      // internal vars
 
 private:
     typedef wxAnimationCtrlBase base_type;
+
+    void Init();
+
     DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
     DECLARE_EVENT_TABLE()
 };
diff --git a/Externals/wxWidgets3/include/wx/gtk/anybutton.h b/Externals/wxWidgets3/include/wx/gtk/anybutton.h
index 7dee3e096d..604c72c72a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/anybutton.h
+++ b/Externals/wxWidgets3/include/wx/gtk/anybutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK wxAnyButton class declaration
 // Author:      Robert Roebling
 // Created:     1998-05-20 (extracted from button.h)
-// Id:          $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/app.h b/Externals/wxWidgets3/include/wx/gtk/app.h
index 00028aca9d..6f112a3c88 100644
--- a/Externals/wxWidgets3/include/wx/gtk/app.h
+++ b/Externals/wxWidgets3/include/wx/gtk/app.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/app.h
 // Purpose:     wxApp definition for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id: app.h 69020 2011-09-07 16:56:50Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -56,6 +55,13 @@ public:
     // must return XVisualInfo pointer (it is not freed by caller)
     virtual void *GetXVisualInfo() { return NULL; }
 
+    // Check if we're using a global menu. Currently this is only true when
+    // running under Ubuntu Unity and global menu is not disabled.
+    //
+    // This is mostly used in the implementation in order to work around
+    // various bugs arising due to this.
+    static bool GTKIsUsingGlobalMenu();
+
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     // Maemo-specific method: get the main program object
     HildonProgram *GetHildonProgram();
diff --git a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h b/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h
index 91197215b6..098e9b1123 100644
--- a/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h
+++ b/Externals/wxWidgets3/include/wx/gtk/assertdlg_gtk.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/assertdlg_gtk.h
 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi
-// Id:          $Id: assertdlg_gtk.h 67338 2011-03-30 05:35:24Z PC $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
@@ -72,7 +71,6 @@ void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
 /* appends a stack frame to the dialog */
 void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
                                           const gchar *function,
-                                          const gchar *arguments,
                                           const gchar *sourcefile,
                                           guint line_number);
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/bitmap.h b/Externals/wxWidgets3/include/wx/gtk/bitmap.h
index a6e6634320..d035f2c2c1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/bitmap.h
+++ b/Externals/wxWidgets3/include/wx/gtk/bitmap.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
-// RCS-ID:      $Id: bitmap.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,10 @@
 #ifndef _WX_GTK_BITMAP_H_
 #define _WX_GTK_BITMAP_H_
 
+#ifdef __WXGTK3__
+typedef struct _cairo cairo_t;
+typedef struct _cairo_surface cairo_surface_t;
+#endif
 typedef struct _GdkPixbuf GdkPixbuf;
 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
@@ -28,16 +31,29 @@ public:
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     virtual ~wxMask();
+    wxBitmap GetBitmap() const;
 
     // implementation
-    GdkPixmap* m_bitmap;
-    GdkPixmap* GetBitmap() const;
+#ifdef __WXGTK3__
+    wxMask(cairo_surface_t*);
+    operator cairo_surface_t*() const;
+#else
+    wxMask(GdkPixmap*);
+    operator GdkPixmap*() const;
+#endif
 
 protected:
     virtual void FreeData();
     virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
 
+private:
+#ifdef __WXGTK3__
+    cairo_surface_t* m_bitmap;
+#else
+    GdkPixmap* m_bitmap;
+#endif
+
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
@@ -62,14 +78,17 @@ public:
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE
-    wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH )
-        { (void)CreateFromImage(image, depth); }
+    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
 #endif // wxUSE_IMAGE
+    wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
     virtual ~wxBitmap();
 
     bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
     bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
+    bool Create(int width, int height, const wxDC& WXUNUSED(dc))
+        { return Create(width,height); }
+    
 
     virtual int GetHeight() const;
     virtual int GetWidth() const;
@@ -105,11 +124,18 @@ public:
     void SetHeight( int height );
     void SetWidth( int width );
     void SetDepth( int depth );
-    void SetPixbuf(GdkPixbuf* pixbuf);
 
+#ifdef __WXGTK3__
+    GdkPixbuf* GetPixbufNoMask() const;
+    cairo_t* CairoCreate() const;
+    void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
+    void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
+#else
     GdkPixmap *GetPixmap() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;
+    wxBitmap(GdkPixmap* pixmap);
+#endif
     GdkPixbuf *GetPixbuf() const;
 
     // raw bitmap access support functions
@@ -119,14 +145,17 @@ public:
     bool HasAlpha() const;
 
 protected:
+#ifndef __WXGTK3__
 #if wxUSE_IMAGE
     bool CreateFromImage(const wxImage& image, int depth);
 #endif // wxUSE_IMAGE
+#endif
 
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
 private:
+#ifndef __WXGTK3__
     void SetPixmap(GdkPixmap* pixmap);
 #if wxUSE_IMAGE
     // to be called from CreateFromImage only!
@@ -144,6 +173,7 @@ public:
     // removes other representations from memory, keeping only 'keep'
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
+#endif
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
diff --git a/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h b/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h
index 0bc69997ca..f70e28ceb7 100644
--- a/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h
+++ b/Externals/wxWidgets3/include/wx/gtk/bmpbuttn.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: bmpbuttn.h 61221 2009-06-27 22:22:48Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h b/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h
index 8da02bda13..f5d00a517b 100644
--- a/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/bmpcbox.h
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19
-// RCS-ID:      $Id: bmpcbox.h 61448 2009-07-18 08:33:55Z JMS $
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/brush.h b/Externals/wxWidgets3/include/wx/gtk/brush.h
index c23da5f79d..37a4845e6e 100644
--- a/Externals/wxWidgets3/include/wx/gtk/brush.h
+++ b/Externals/wxWidgets3/include/wx/gtk/brush.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/brush.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: brush.h 54273 2008-06-17 17:28:26Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/button.h b/Externals/wxWidgets3/include/wx/gtk/button.h
index 6b8988ed7e..9e7a57d890 100644
--- a/Externals/wxWidgets3/include/wx/gtk/button.h
+++ b/Externals/wxWidgets3/include/wx/gtk/button.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/button.h
 // Purpose:     wxGTK wxButton class declaration
 // Author:      Robert Roebling
-// Id:          $Id: button.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/calctrl.h b/Externals/wxWidgets3/include/wx/gtk/calctrl.h
index a0cab6253f..3fce698ee5 100644
--- a/Externals/wxWidgets3/include/wx/gtk/calctrl.h
+++ b/Externals/wxWidgets3/include/wx/gtk/calctrl.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/calctrl.h
 // Purpose:     wxGtkCalendarCtrl control
 // Author:      Marcin Wojdyr
-// RCS-ID:      $Id: calctrl.h 67987 2011-06-19 22:46:36Z VZ $
 // Copyright:   (C) 2008 Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/checkbox.h b/Externals/wxWidgets3/include/wx/gtk/checkbox.h
index 3a575127e0..69985fc457 100644
--- a/Externals/wxWidgets3/include/wx/gtk/checkbox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/checkbox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: checkbox.h 62786 2009-12-05 19:26:39Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,7 @@ class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
+    ~wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
diff --git a/Externals/wxWidgets3/include/wx/gtk/checklst.h b/Externals/wxWidgets3/include/wx/gtk/checklst.h
index e81fd9686c..3cfbd76407 100644
--- a/Externals/wxWidgets3/include/wx/gtk/checklst.h
+++ b/Externals/wxWidgets3/include/wx/gtk/checklst.h
@@ -3,32 +3,18 @@
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:
-// RCS-ID:      $Id: checklst.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCHECKLISTH__
-#define __GTKCHECKLISTH__
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// there is no "right" choice of the checkbox indicators, so allow the user to
-// define them himself if he wants
-#ifndef wxCHECKLBOX_CHECKED
-    #define wxCHECKLBOX_CHECKED   wxT('x')
-    #define wxCHECKLBOX_UNCHECKED wxT(' ')
-
-    #define wxCHECKLBOX_STRING    wxT("[ ] ")
-#endif
+#ifndef _WX_GTKCHECKLIST_H_
+#define _WX_GTKCHECKLIST_H_
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
 {
 public:
     wxCheckListBox();
@@ -36,7 +22,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
-            const wxString *choices = (const wxString *)NULL,
+            const wxString *choices = NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
@@ -48,8 +34,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
 
-    bool IsChecked(unsigned int index) const;
-    void Check(unsigned int index, bool check = true);
+    virtual bool IsChecked(unsigned int index) const;
+    virtual void Check(unsigned int index, bool check = true);
 
     int GetItemHeight() const;
 
@@ -59,4 +45,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
-#endif   //__GTKCHECKLISTH__
+#endif   // _WX_GTKCHECKLIST_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/chkconf.h b/Externals/wxWidgets3/include/wx/gtk/chkconf.h
index 5566d4cef6..84595b256c 100644
--- a/Externals/wxWidgets3/include/wx/gtk/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/gtk/chkconf.h
@@ -3,7 +3,6 @@
  * Purpose:     wxGTK-specific settings consistency checks
  * Author:      Vadim Zeitlin
  * Created:     2007-07-19 (extracted from wx/chkconf.h)
- * RCS-ID:      $Id: chkconf.h 47564 2007-07-19 15:47:11Z VZ $
  * Copyright:   (c) 2000-2007 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -29,3 +28,71 @@
 #        endif
 #    endif
 #endif /* wxUSE_JOYSTICK */
+
+#if wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
+#   undef  wxUSE_POSTSCRIPT
+#   define wxUSE_POSTSCRIPT 1
+#endif
+
+#if wxUSE_OWNER_DRAWN
+#   undef  wxUSE_OWNER_DRAWN
+#   define wxUSE_OWNER_DRAWN 0
+#endif
+
+#if wxUSE_METAFILE
+#   undef  wxUSE_METAFILE
+#   define wxUSE_METAFILE 0
+#endif
+
+#if wxUSE_ENH_METAFILE
+#   undef  wxUSE_ENH_METAFILE
+#   define wxUSE_ENH_METAFILE 0
+#endif
+
+#ifndef __UNIX__
+
+#   undef  wxUSE_WEBVIEW
+#   define wxUSE_WEBVIEW 0
+#   undef  wxUSE_WEBVIEW_WEBKIT
+#   define wxUSE_WEBVIEW_WEBKIT 0
+
+#   undef  wxUSE_MEDIACTRL
+#   define wxUSE_MEDIACTRL 0
+
+    /*
+        We could use GDK_WINDOWING_X11 for those but this would require
+        including gdk/gdk.h and we don't want to do it from here, so assume
+        we're not using X11 if we're not under Unix.
+     */
+
+#   undef  wxUSE_UIACTIONSIMULATOR
+#   define wxUSE_UIACTIONSIMULATOR 0
+
+#   undef  wxUSE_GLCANVAS
+#   define wxUSE_GLCANVAS 0
+
+#endif /* __UNIX__ */
+
+/*
+    We always need Cairo with wxGTK, enable it if necessary (this can only
+    happen under Windows).
+ */
+#ifdef __WINDOWS__
+
+#if !wxUSE_CAIRO
+#   undef  wxUSE_CAIRO
+#   define wxUSE_CAIRO 1
+#endif
+
+#endif  /* __WINDOWS__ */
+
+#ifdef __WXGTK3__
+    #if !wxUSE_GRAPHICS_CONTEXT
+        #ifdef wxABORT_ON_CONFIG_ERROR
+            #error "GTK+ 3 support requires wxGraphicsContext"
+        #else
+            #undef wxUSE_GRAPHICS_CONTEXT
+            #define wxUSE_GRAPHICS_CONTEXT 1
+        #endif
+    #endif
+#endif
diff --git a/Externals/wxWidgets3/include/wx/gtk/choice.h b/Externals/wxWidgets3/include/wx/gtk/choice.h
index 026eac4a1f..d952a0fa2c 100644
--- a/Externals/wxWidgets3/include/wx/gtk/choice.h
+++ b/Externals/wxWidgets3/include/wx/gtk/choice.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: choice.h 65818 2010-10-15 23:46:32Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,8 +63,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
-    void SendSelectionChangedEvent(wxEventType evt_type);
-
     int GetSelection() const;
     void SetSelection(int n);
 
@@ -95,6 +92,7 @@ protected:
     int m_stringCellIndex;
 
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
diff --git a/Externals/wxWidgets3/include/wx/gtk/clipbrd.h b/Externals/wxWidgets3/include/wx/gtk/clipbrd.h
index 51af594ef7..28d84df815 100644
--- a/Externals/wxWidgets3/include/wx/gtk/clipbrd.h
+++ b/Externals/wxWidgets3/include/wx/gtk/clipbrd.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/clipbrd.h
 // Purpose:     wxClipboard for wxGTK
 // Author:      Robert Roebling, Vadim Zeitlin
-// Id:          $Id: clipbrd.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 //              (c) 2007 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -118,6 +117,9 @@ private:
     GtkWidget *m_clipboardWidget;  // for getting and offering data
     GtkWidget *m_targetsWidget;    // for getting list of supported formats
 
+    // ID of the connection to "selection_get" signal, initially 0.
+    unsigned long m_idSelectionGetHandler;
+
     bool m_open;
     bool m_formatSupported;
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/clrpicker.h b/Externals/wxWidgets3/include/wx/gtk/clrpicker.h
index e21dd85c51..4a375fb849 100644
--- a/Externals/wxWidgets3/include/wx/gtk/clrpicker.h
+++ b/Externals/wxWidgets3/include/wx/gtk/clrpicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: clrpicker.h 49668 2007-11-06 00:32:34Z MR $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -52,8 +51,8 @@ protected:
 
 public:     // used by the GTK callback only
 
-    void SetGdkColor(const GdkColor& gdkColor)
-        { m_colour = wxColor(gdkColor); }
+    void GTKSetColour(const wxColour& colour)
+        { m_colour = colour; }
 
     wxWindow *m_topParent;
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/collpane.h b/Externals/wxWidgets3/include/wx/gtk/collpane.h
index 6ae545e257..7503b8e1b2 100644
--- a/Externals/wxWidgets3/include/wx/gtk/collpane.h
+++ b/Externals/wxWidgets3/include/wx/gtk/collpane.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
-// RCS-ID:      $Id: collpane.h 58632 2009-02-03 09:53:33Z RR $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,11 +34,6 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
-    void Init()
-    {
-        m_bIgnoreNextChange = false;
-    }
-
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
@@ -69,6 +63,11 @@ public:     // used by GTK callbacks
     wxString m_strLabel;
 
 private:
+    void Init()
+    {
+        m_bIgnoreNextChange = false;
+    }
+
     void OnSize(wxSizeEvent&);
     virtual void AddChildGTK(wxWindowGTK* child);
     GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
diff --git a/Externals/wxWidgets3/include/wx/gtk/colordlg.h b/Externals/wxWidgets3/include/wx/gtk/colordlg.h
index b0cac3cfe7..a1fdbb75ec 100644
--- a/Externals/wxWidgets3/include/wx/gtk/colordlg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/colordlg.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04
-// RCS-ID:      $Id: colordlg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/colour.h b/Externals/wxWidgets3/include/wx/gtk/colour.h
index 54ed5ec5b8..d48d707cbe 100644
--- a/Externals/wxWidgets3/include/wx/gtk/colour.h
+++ b/Externals/wxWidgets3/include/wx/gtk/colour.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: colour.h 50897 2007-12-22 15:03:58Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,10 @@
 #ifndef _WX_GTK_COLOUR_H_
 #define _WX_GTK_COLOUR_H_
 
+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;
+#endif
+
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
@@ -21,6 +24,9 @@ public:
     // ------------
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);
+#ifdef __WXGTK3__
+    wxColour(const GdkRGBA& gdkRGBA);
+#endif
 
     virtual ~wxColour();
 
@@ -33,8 +39,12 @@ public:
     unsigned char Alpha() const;
 
     // Implementation part
+#ifdef __WXGTK3__
+    operator const GdkRGBA*() const;
+#else
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
+#endif
     const GdkColor *GetColor() const;
 
 protected:
@@ -43,7 +53,6 @@ protected:
 
     virtual bool FromString(const wxString& str);
 
-private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/combobox.h b/Externals/wxWidgets3/include/wx/gtk/combobox.h
index 87154df510..c655991e3c 100644
--- a/Externals/wxWidgets3/include/wx/gtk/combobox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/combobox.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:          $Id: combobox.h 70880 2012-03-11 23:55:19Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -56,6 +55,7 @@ public:
         Init();
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
+    ~wxComboBox();
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
@@ -144,6 +144,8 @@ protected:
     // custom list stores.
     virtual void GTKCreateComboBoxWidget();
 
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
     virtual GtkEntry *GetEntry() const
         { return m_entry; }
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/control.h b/Externals/wxWidgets3/include/wx/gtk/control.h
index 3d00b42278..454d1fc90d 100644
--- a/Externals/wxWidgets3/include/wx/gtk/control.h
+++ b/Externals/wxWidgets3/include/wx/gtk/control.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/control.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: control.h 70714 2012-02-27 17:49:33Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,20 +11,15 @@
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;
+typedef struct _GtkEntry GtkEntry;
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
-// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
-extern "C" {
-    typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
-    typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
-    typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
-}
-
 class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
+    typedef wxControlBase base_type;
 public:
     wxControl();
     wxControl(wxWindow *parent, wxWindowID id,
@@ -43,8 +37,10 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
-
     virtual wxVisualAttributes GetDefaultAttributes() const;
+#ifdef __WXGTK3__
+    virtual bool SetFont(const wxFont& font);
+#endif
 
 protected:
     virtual wxSize DoGetBestSize() const;
@@ -76,19 +72,6 @@ protected:
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                                           bool useBase = false,
                                           int state = 0);
-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
-                                          bool useBase = false,
-                                          int state = 0);
-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
-                                          bool useBase = false,
-                                          int state = 0);
-
-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
-                                          bool useBase = false,
-                                          int state = 0);
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
@@ -97,6 +80,12 @@ protected:
     // Fix sensitivity due to bug in GTK+ < 2.14
     void GTKFixSensitivity(bool onlyIfUnderMouse = true);
 
+    // Ask GTK+ for preferred size. Use it after setting the font.
+    wxSize GTKGetPreferredSize(GtkWidget* widget) const;
+
+    // Inner margins in a GtkEntry
+    wxPoint GTKGetEntryMargins(GtkEntry* entry) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)
 };
diff --git a/Externals/wxWidgets3/include/wx/gtk/cursor.h b/Externals/wxWidgets3/include/wx/gtk/cursor.h
index 583d9889e1..e1915efc1d 100644
--- a/Externals/wxWidgets3/include/wx/gtk/cursor.h
+++ b/Externals/wxWidgets3/include/wx/gtk/cursor.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/cursor.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: cursor.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/dataform.h b/Externals/wxWidgets3/include/wx/gtk/dataform.h
index 6ec92c66c2..b7c3be71f3 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dataform.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dataform.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
-// RCS-ID:      $Id: dataform.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/dataobj.h b/Externals/wxWidgets3/include/wx/gtk/dataobj.h
index 108250ee08..859093fcb2 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dataobj.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dataobj.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dataobj.h
 // Purpose:     declaration of the wxDataObject
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dataobj.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/dataobj2.h b/Externals/wxWidgets3/include/wx/gtk/dataobj2.h
index 1e6f81919d..62f380a429 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dataobj2.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dataobj2.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Robert Roebling
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
-// RCS-ID:      $Id: dataobj2.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,7 +48,6 @@ public:
     }
 
 protected:
-    void Init() { m_pngData = NULL; m_pngSize = 0; }
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 
@@ -57,6 +55,9 @@ protected:
     void       *m_pngData;
 
     void DoConvertToPng();
+
+private:
+    void Init() { m_pngData = NULL; m_pngSize = 0; }
 };
 
 // ----------------------------------------------------------------------------
@@ -93,34 +94,19 @@ public:
 // wxURLDataObject is a specialization of wxDataObject for URLs
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite
 {
 public:
     wxURLDataObject(const wxString& url = wxEmptyString);
 
-    wxString GetURL() const { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
+    wxString GetURL() const;
+    void SetURL(const wxString& url);
 
 private:
-    wxString m_url;
+    class wxTextURIListDataObject* const m_dobjURIList;
+    wxTextDataObject* const m_dobjText;
+
+    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
 };
 
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/dataview.h b/Externals/wxWidgets3/include/wx/gtk/dataview.h
index 75463bd02d..44d2af93b2 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dataview.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dataview.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dataview.h
 // Purpose:     wxDataViewCtrl GTK+2 implementation header
 // Author:      Robert Roebling
-// Id:          $Id: dataview.h 70377 2012-01-17 14:05:17Z VS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/dc.h b/Externals/wxWidgets3/include/wx/gtk/dc.h
index 3a2cc8afdc..7eb9dd1267 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dc.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dc.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dc.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: dc.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,107 @@
 #ifndef _WX_GTKDC_H_
 #define _WX_GTKDC_H_
 
+#ifdef __WXGTK3__
+
+#include "wx/dcgraph.h"
+
+class wxGTKCairoDCImpl: public wxGCDCImpl
+{
+    typedef wxGCDCImpl base_type;
+public:
+    wxGTKCairoDCImpl(wxDC* owner);
+    wxGTKCairoDCImpl(wxDC* owner, int);
+    wxGTKCairoDCImpl(wxDC* owner, wxWindow* window);
+
+    virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask);
+    virtual void DoDrawIcon(const wxIcon& icon, int x, int y);
+#if wxUSE_IMAGE
+    virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style);
+#endif
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const;
+    virtual bool DoGetPixel(int x, int y, wxColour* col) const;
+    virtual void DoGetSize(int* width, int* height) const;
+    virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask);
+    virtual void* GetCairoContext() const;
+
+protected:
+    int m_width, m_height;
+
+    wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxWindowDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxWindowDCImpl(wxWindowDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxClientDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxClientDCImpl(wxClientDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxPaintDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxPaintDCImpl(wxPaintDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxScreenDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxScreenDCImpl(wxScreenDC* owner);
+
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxMemoryDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxMemoryDCImpl(wxMemoryDC* owner);
+    wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap);
+    wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc);
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+
+private:
+    void Setup();
+    wxBitmap m_bitmap;
+
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxGTKCairoDC: public wxDC
+{
+    typedef wxDC base_type;
+public:
+    wxGTKCairoDC(cairo_t* cr);
+
+    wxDECLARE_NO_COPY_CLASS(wxGTKCairoDC);
+};
+
+#else
+
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
@@ -35,7 +135,8 @@ public:
     virtual void EndPage() { }
 
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
-
+    virtual void* GetHandle() const { return GetGDKWindow(); }
+    
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
@@ -50,4 +151,5 @@ public:
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 
+#endif
 #endif // _WX_GTKDC_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/dcclient.h b/Externals/wxWidgets3/include/wx/gtk/dcclient.h
index c3eb92fcea..53469796a1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dcclient.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dcclient.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dcclient.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: dcclient.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,10 +10,6 @@
 #define _WX_GTKDCCLIENT_H_
 
 #include "wx/gtk/dc.h"
-#include "wx/dcclient.h"
-#include "wx/region.h"
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl
@@ -44,9 +39,9 @@ public:
                                     double sa, double ea );
     virtual void DoDrawPoint( wxCoord x, wxCoord y );
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/dcmemory.h b/Externals/wxWidgets3/include/wx/gtk/dcmemory.h
index ede21042bd..8afb45c52e 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dcmemory.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dcmemory.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dcmemory.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,7 +38,8 @@ public:
     // overridden from wxDCImpl
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
-
+    virtual void* GetHandle() const;
+    
     // overridden for wxMemoryDC Impl
     virtual void DoSelect(const wxBitmap& bitmap);
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/dcscreen.h b/Externals/wxWidgets3/include/wx/gtk/dcscreen.h
index 3fef9b1a6e..c91926b910 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dcscreen.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dcscreen.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dcscreen.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: dcscreen.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +24,7 @@ public:
 
     virtual void DoGetSize(int *width, int *height) const;
 
-protected:
+private:
     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
diff --git a/Externals/wxWidgets3/include/wx/gtk/dialog.h b/Externals/wxWidgets3/include/wx/gtk/dialog.h
index 4ad6d18bdc..fcd7cd3db8 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dialog.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dialog.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:
-// Id:          $Id: dialog.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,17 +38,14 @@ public:
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
-    void SetModal( bool modal );
-
-    // implementation
-    // --------------
-
-    bool       m_modalShowing;
 
 private:
     // common part of all ctors
     void Init();
+
+    bool m_modalShowing;
     wxGUIEventLoop *m_modalLoop;
+
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h b/Externals/wxWidgets3/include/wx/gtk/dirdlg.h
index 78e8c02a96..8a05d55796 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dirdlg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dirdlg.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dirdlg.h
 // Purpose:     wxDirDialog
 // Author:      Francesco Montorsi
-// Id:          $Id: dirdlg.h 70898 2012-03-14 12:32:27Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,6 +41,11 @@ public:     // overrides from wxGenericDirDialog
     void SetPath(const wxString& path);
 
 
+    // Implementation only.
+
+    void GTKOnAccept();
+    void GTKOnCancel();
+
 protected:
     // override this from wxTLW since the native
     // form doesn't have any m_wxwindow
@@ -51,10 +55,9 @@ protected:
 
 
 private:
-    void OnFakeOk( wxCommandEvent &event );
+    wxString m_selectedDirectory;
 
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
-    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKDIRDLGH__
diff --git a/Externals/wxWidgets3/include/wx/gtk/dnd.h b/Externals/wxWidgets3/include/wx/gtk/dnd.h
index f7725017b5..0aea7b41f6 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dnd.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dnd.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dnd.h 69020 2011-09-07 16:56:50Z PC $
 // Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -81,6 +80,17 @@ public:
 
     virtual ~wxDropSource();
 
+    // set the icon corresponding to given drag result
+    void SetIcon(wxDragResult res, const wxIcon& icon)
+    {
+        if ( res == wxDragCopy )
+            m_iconCopy = icon;
+        else if ( res == wxDragMove )
+            m_iconMove = icon;
+        else
+            m_iconNone = icon;
+    }
+
     // start drag action
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h
index a8a75dc4fd..dfaba5609a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dvrenderer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewRenderer for GTK wxDataViewCtrl implementation
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/gtk/dataview.h)
-// RCS-ID:      $Id: dvrenderer.h 69020 2011-09-07 16:56:50Z PC $
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h b/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h
index 95b84d416b..385fa73a0b 100644
--- a/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h
+++ b/Externals/wxWidgets3/include/wx/gtk/dvrenderers.h
@@ -3,7 +3,6 @@
 // Purpose:     All GTK wxDataViewCtrl renderer classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/gtk/dataview.h)
-// RCS-ID:      $Id: dvrenderers.h 70300 2012-01-09 06:31:07Z PC $
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -12,7 +11,12 @@
 #ifndef _WX_GTK_DVRENDERERS_H_
 #define _WX_GTK_DVRENDERERS_H_
 
-typedef struct _GdkRectangle GdkRectangle;
+#ifdef __WXGTK3__
+    typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
+    typedef cairo_rectangle_int_t GdkRectangle;
+#else
+    typedef struct _GdkRectangle GdkRectangle;
+#endif
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
@@ -137,10 +141,9 @@ public:
 
     virtual GtkCellRendererText *GtkGetTextRenderer() const;
 
-protected:
+private:
     bool Init(wxDataViewCellMode mode, int align);
 
-private:
     // Called from GtkGetTextRenderer() to really create the renderer if
     // necessary.
     void GtkInitTextRenderer();
diff --git a/Externals/wxWidgets3/include/wx/gtk/evtloop.h b/Externals/wxWidgets3/include/wx/gtk/evtloop.h
index 7a5e31033f..ba8db406d5 100644
--- a/Externals/wxWidgets3/include/wx/gtk/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/gtk/evtloop.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK event loop implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-12-27
-// RCS-ID:      $Id: evtloop.h 62475 2009-10-22 11:36:35Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,22 +21,19 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
 public:
     wxGUIEventLoop();
 
-    virtual int Run();
-    virtual void Exit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual int DispatchTimeout(unsigned long timeout);
     virtual void WakeUp();
     virtual bool YieldFor(long eventsToProcess);
 
-#if wxUSE_EVENTLOOP_SOURCE
-    virtual wxEventLoopSource *
-      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
-#endif // wxUSE_EVENTLOOP_SOURCE
-
     void StoreGdkEventForLaterProcessing(GdkEvent* ev)
         { m_arrGdkEvents.Add(ev); }
 
+protected:
+    virtual int DoRun();
+
 private:
     // the exit code of this event loop
     int m_exitcode;
diff --git a/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h b/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h
index 6a59895f64..f80523424d 100644
--- a/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h
+++ b/Externals/wxWidgets3/include/wx/gtk/evtloopsrc.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTKEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21
-// RCS-ID:      $Id: evtloopsrc.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/filectrl.h b/Externals/wxWidgets3/include/wx/gtk/filectrl.h
index 1551923ec3..3de17e3af8 100644
--- a/Externals/wxWidgets3/include/wx/gtk/filectrl.h
+++ b/Externals/wxWidgets3/include/wx/gtk/filectrl.h
@@ -4,7 +4,6 @@
 // Author:      Diaa M. Sami
 // Modified by:
 // Created:     Aug-10-2007
-// RCS-ID:      $Id: filectrl.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -88,9 +87,8 @@ public:
         Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
     }
 
-    virtual ~wxGtkFileCtrl() {}
+    virtual ~wxGtkFileCtrl();
 
-    void Init();
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,
@@ -134,6 +132,9 @@ protected:
     wxGtkFileChooser    m_fc;
     wxString            m_wildCard;
 
+private:
+    void Init();
+
     DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/filedlg.h b/Externals/wxWidgets3/include/wx/gtk/filedlg.h
index 667e94a359..377734db79 100644
--- a/Externals/wxWidgets3/include/wx/gtk/filedlg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/filedlg.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/filedlg.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: filedlg.h 70898 2012-03-14 12:32:27Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,7 +42,6 @@ public:
 
     virtual wxString GetPath() const;
     virtual void GetPaths(wxArrayString& paths) const;
-    virtual wxString GetDirectory() const;
     virtual wxString GetFilename() const;
     virtual void GetFilenames(wxArrayString& files) const;
     virtual int GetFilterIndex() const;
@@ -59,6 +57,9 @@ public:
 
     virtual bool SupportsExtraControl() const { return true; }
 
+    // Implementation only.
+    void GTKSelectionChanged(const wxString& filename);
+
 
 protected:
     // override this from wxTLW since the native
diff --git a/Externals/wxWidgets3/include/wx/gtk/filehistory.h b/Externals/wxWidgets3/include/wx/gtk/filehistory.h
index 9125f89928..70a93d6f5e 100644
--- a/Externals/wxWidgets3/include/wx/gtk/filehistory.h
+++ b/Externals/wxWidgets3/include/wx/gtk/filehistory.h
@@ -3,7 +3,6 @@
 // Purpose:     GTK+ bits for wxFileHistory
 // Author:      Vaclav Slavik
 // Created:     2010-05-06
-// RCS-ID:      $Id: filehistory.h 64240 2010-05-07 06:45:48Z VS $
 // Copyright:   (c) 2010 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/filepicker.h b/Externals/wxWidgets3/include/wx/gtk/filepicker.h
index ad6be66083..27e1fdc779 100644
--- a/Externals/wxWidgets3/include/wx/gtk/filepicker.h
+++ b/Externals/wxWidgets3/include/wx/gtk/filepicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: filepicker.h 70043 2011-12-18 12:34:47Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -34,13 +33,6 @@
         return NULL;                                                          \
     }                                                                         \
                                                                               \
-    virtual bool Destroy()                                                    \
-    {                                                                         \
-        if (m_dialog)                                                         \
-            m_dialog->Destroy();                                              \
-        return wxButton::Destroy();                                           \
-    }                                                                         \
-                                                                              \
     /* even if wx derive from wxGenericFileButton, i.e. from wxButton, our */ \
     /* native GTK+ widget does not derive from GtkButton thus *all* uses   */ \
     /* GTK_BUTTON(m_widget) macro done by wxButton must be bypassed to     */ \
@@ -107,8 +99,6 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
-    virtual bool GTKShouldConnectSizeRequest() const { return false; }
-
     wxDialog *m_dialog;
 
 private:
@@ -178,13 +168,6 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
-    // common part of all ctors
-    void Init()
-    {
-        m_dialog = NULL;
-        m_bIgnoreNextChange = false;
-    }
-
     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only
@@ -194,6 +177,12 @@ public:    // used by the GTK callback only
     void GTKUpdatePath(const char *gtkpath);
 
 private:
+    void Init()
+    {
+        m_dialog = NULL;
+        m_bIgnoreNextChange = false;
+    }
+
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/font.h b/Externals/wxWidgets3/include/wx/gtk/font.h
index 53bc2d6441..a218a29dfe 100644
--- a/Externals/wxWidgets3/include/wx/gtk/font.h
+++ b/Externals/wxWidgets3/include/wx/gtk/font.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/font.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: font.h 70476 2012-01-29 08:14:34Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,7 +18,8 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 public:
     wxFont() { }
 
-    // wxGTK-specific
+    wxFont(const wxFontInfo& info);
+
     wxFont(const wxString& nativeFontInfoString)
     {
         Create(nativeFontInfoString);
@@ -63,12 +63,6 @@ public:
         SetPixelSize(pixelSize);
     }
 
-    wxFont(int pointSize,
-           wxFontFamily family,
-           int flags = wxFONTFLAG_DEFAULT,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
@@ -119,15 +113,14 @@ public:
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
-    // common part of all ctors
-    void Init();
-
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
     virtual wxFontFamily DoGetFamily() const;
 
 private:
+    void Init();
+
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/fontdlg.h b/Externals/wxWidgets3/include/wx/gtk/fontdlg.h
index 18db2771c0..4c5b57a3e3 100644
--- a/Externals/wxWidgets3/include/wx/gtk/fontdlg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/fontdlg.h
@@ -3,13 +3,12 @@
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Created:
-// RCS-ID:      $Id: fontdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTK_FONTDLGH__
-#define __GTK_FONTDLGH__
+#ifndef _WX_GTK_FONTDLG_H_
+#define _WX_GTK_FONTDLG_H_
 
 //-----------------------------------------------------------------------------
 // wxFontDialog
@@ -26,9 +25,6 @@ public:
 
     virtual ~wxFontDialog();
 
-    // implementation only
-    void SetChosenFont(const char *name);
-
 #if WXWIN_COMPATIBILITY_2_6
     // deprecated interface, don't use
     wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
@@ -38,7 +34,6 @@ protected:
     // create the GTK dialog
     virtual bool DoCreate(wxWindow *parent);
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h b/Externals/wxWidgets3/include/wx/gtk/fontpicker.h
index 505090e762..65bb5c9593 100644
--- a/Externals/wxWidgets3/include/wx/gtk/fontpicker.h
+++ b/Externals/wxWidgets3/include/wx/gtk/fontpicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id: fontpicker.h 69020 2011-09-07 16:56:50Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/frame.h b/Externals/wxWidgets3/include/wx/gtk/frame.h
index a4a4bbe6f0..1f172c43c1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/frame.h
+++ b/Externals/wxWidgets3/include/wx/gtk/frame.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/frame.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: frame.h 66648 2011-01-08 06:42:41Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,9 +63,6 @@ public:
     virtual bool SendIdleEvents(wxIdleEvent& event);
 
 protected:
-    // common part of all ctors
-    void Init();
-
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoGetClientSize( int *width, int *height ) const;
 
@@ -76,6 +72,8 @@ protected:
 #endif // wxUSE_MENUS_NATIVE
 
 private:
+    void Init();
+
     long m_fsSaveFlag;
 
     DECLARE_DYNAMIC_CLASS(wxFrame)
diff --git a/Externals/wxWidgets3/include/wx/gtk/gauge.h b/Externals/wxWidgets3/include/wx/gtk/gauge.h
index 7f065f2657..8df47461e5 100644
--- a/Externals/wxWidgets3/include/wx/gtk/gauge.h
+++ b/Externals/wxWidgets3/include/wx/gtk/gauge.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/gauge.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: gauge.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -71,15 +70,14 @@ public:
         m_gaugePos;
 
 protected:
-    // common part of all ctors
-    void Init() { m_rangeMax = m_gaugePos = 0; }
-
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
     virtual wxSize DoGetBestSize() const;
 
 private:
+    void Init() { m_rangeMax = m_gaugePos = 0; }
+
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/glcanvas.h b/Externals/wxWidgets3/include/wx/gtk/glcanvas.h
index 1d7d925501..01591149b5 100644
--- a/Externals/wxWidgets3/include/wx/gtk/glcanvas.h
+++ b/Externals/wxWidgets3/include/wx/gtk/glcanvas.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
-// RCS-ID:      $Id: glcanvas.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,7 @@ public:
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
 
     // implement wxGLCanvasX11 methods
     // --------------------------------
@@ -93,6 +93,9 @@ public:
     void OnInternalIdle();
 
     bool              m_exposed;
+#ifdef __WXGTK3__
+    cairo_t* m_cairoPaintContext;
+#endif
 
 #if WXWIN_COMPATIBILITY_2_8
     wxGLContext      *m_sharedContext;
diff --git a/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h b/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
index 5b0eca3b5a..e69de29bb2 100644
--- a/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
+++ b/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
@@ -1,350 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/gnome/gprint.h
-// Author:      Robert Roebling
-// Purpose:     GNOME printing support
-// Created:     09/20/04
-// RCS-ID:      $Id: gprint.h 67280 2011-03-22 14:17:38Z DS $
-// Copyright:   Robert Roebling
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GTK_GPRINT_H_
-#define _WX_GTK_GPRINT_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_LIBGNOMEPRINT
-
-#include "wx/print.h"
-#include "wx/printdlg.h"
-#include "wx/dc.h"
-#include "wx/module.h"
-
-typedef struct _GnomePrintJob GnomePrintJob;
-typedef struct _GnomePrintContext GnomePrintContext;
-typedef struct _GnomePrintConfig GnomePrintConfig;
-
-// ----------------------------------------------------------------------------
-// wxGnomePrintModule
-// ----------------------------------------------------------------------------
-
-class wxGnomePrintModule: public wxModule
-{
-public:
-    wxGnomePrintModule() {}
-    bool OnInit();
-    void OnExit();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
-};
-
-//----------------------------------------------------------------------------
-// wxGnomePrintNativeData
-//----------------------------------------------------------------------------
-
-class wxGnomePrintNativeData: public wxPrintNativeDataBase
-{
-public:
-    wxGnomePrintNativeData();
-    virtual ~wxGnomePrintNativeData();
-
-    virtual bool TransferTo( wxPrintData &data );
-    virtual bool TransferFrom( const wxPrintData &data );
-
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return true; }
-
-    GnomePrintConfig* GetPrintConfig() { return m_config; }
-    void SetPrintJob( GnomePrintJob *job ) { m_job = job; }
-    GnomePrintJob* GetPrintJob() { return m_job; }
-
-
-private:
-    GnomePrintConfig  *m_config;
-    GnomePrintJob     *m_job;
-
-    DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData)
-};
-
-//----------------------------------------------------------------------------
-// wxGnomePrintFactory
-//----------------------------------------------------------------------------
-
-class wxGnomePrintFactory: public wxPrintFactory
-{
-public:
-    virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
-
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
-                                                    wxPrintout *printout = NULL,
-                                                    wxPrintDialogData *data = NULL );
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
-                                                    wxPrintout *printout,
-                                                    wxPrintData *data );
-
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintDialogData *data = NULL );
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintData *data );
-
-    virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
-                                                          wxPageSetupDialogData * data = NULL );
-
-#if wxUSE_NEW_DC
-    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
-#else
-    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
-#endif
-
-    virtual bool HasPrintSetupDialog();
-    virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
-    virtual bool HasOwnPrintToFile();
-    virtual bool HasPrinterLine();
-    virtual wxString CreatePrinterLine();
-    virtual bool HasStatusLine();
-    virtual wxString CreateStatusLine();
-
-    virtual wxPrintNativeDataBase *CreatePrintNativeData();
-};
-
-//----------------------------------------------------------------------------
-// wxGnomePrintDialog
-//----------------------------------------------------------------------------
-
-class wxGnomePrintDialog: public wxPrintDialogBase
-{
-public:
-    wxGnomePrintDialog( wxWindow *parent,
-                         wxPrintDialogData* data = NULL );
-    wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);
-    virtual ~wxGnomePrintDialog();
-
-    wxPrintData& GetPrintData()
-        { return m_printDialogData.GetPrintData(); }
-    wxPrintDialogData& GetPrintDialogData()
-        { return m_printDialogData; }
-
-    wxDC *GetPrintDC();
-
-    virtual int ShowModal();
-
-    virtual bool Validate();
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-protected:
-    // Implement some base class methods to do nothing to avoid asserts and
-    // GTK warnings, since this is not a real wxDialog.
-    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                           int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
-    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
-                              int WXUNUSED(width), int WXUNUSED(height)) {}
-
-private:
-    void Init();
-    wxPrintDialogData   m_printDialogData;
-
-    DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog)
-};
-
-//----------------------------------------------------------------------------
-// wxGnomePageSetupDialog
-//----------------------------------------------------------------------------
-
-class wxGnomePageSetupDialog: public wxPageSetupDialogBase
-{
-public:
-    wxGnomePageSetupDialog( wxWindow *parent,
-                            wxPageSetupDialogData* data = NULL );
-    virtual ~wxGnomePageSetupDialog();
-
-    virtual wxPageSetupDialogData& GetPageSetupDialogData();
-
-    virtual int ShowModal();
-
-    virtual bool Validate();
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-protected:
-    // Implement some base class methods to do nothing to avoid asserts and
-    // GTK warnings, since this is not a real wxDialog.
-    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                           int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
-    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
-                              int WXUNUSED(width), int WXUNUSED(height)) {}
-
-private:
-    wxPageSetupDialogData   m_pageDialogData;
-
-    DECLARE_DYNAMIC_CLASS(wxGnomePageSetupDialog)
-};
-
-//----------------------------------------------------------------------------
-// wxGnomePrinter
-//----------------------------------------------------------------------------
-
-class wxGnomePrinter: public wxPrinterBase
-{
-public:
-    wxGnomePrinter(wxPrintDialogData *data = NULL);
-    virtual ~wxGnomePrinter();
-
-    virtual bool Print(wxWindow *parent,
-                       wxPrintout *printout,
-                       bool prompt = true);
-    virtual wxDC* PrintDialog(wxWindow *parent);
-    virtual bool Setup(wxWindow *parent);
-
-private:
-    bool               m_native_preview;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrinter)
-    wxDECLARE_NO_COPY_CLASS(wxGnomePrinter);
-};
-
-//-----------------------------------------------------------------------------
-// wxGnomePrinterDC
-//-----------------------------------------------------------------------------
-
-#if wxUSE_NEW_DC
-class wxGnomePrinterDCImpl : public wxDCImpl
-#else
-#define wxGnomePrinterDCImpl wxGnomePrinterDC
-class wxGnomePrinterDC : public wxDC
-#endif
-{
-public:
-#if wxUSE_NEW_DC
-    wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
-#else
-    wxGnomePrinterDC( const wxPrintData& data );
-#endif
-    virtual ~wxGnomePrinterDCImpl();
-
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-
-    bool CanDrawBitmap() const { return true; }
-    void Clear();
-    void SetFont( const wxFont& font );
-    void SetPen( const wxPen& pen );
-    void SetBrush( const wxBrush& brush );
-    void SetLogicalFunction( wxRasterOperationMode function );
-    void SetBackground( const wxBrush& brush );
-    void DestroyClippingRegion();
-    bool StartDoc(const wxString& message);
-    void EndDoc();
-    void StartPage();
-    void EndPage();
-    wxCoord GetCharHeight() const;
-    wxCoord GetCharWidth() const;
-    bool CanGetTextExtent() const { return true; }
-    wxSize GetPPI() const;
-    virtual int GetDepth() const { return 24; }
-    void SetBackgroundMode(int WXUNUSED(mode)) { }
-    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
-
-protected:
-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
-                    wxFloodFillStyle style=wxFLOOD_SURFACE );
-    bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
-    void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-    void DoCrossHair(wxCoord x, wxCoord y);
-    void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
-    void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
-    void DoDrawPoint(wxCoord x, wxCoord y);
-    void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
-    void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
-    void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
-    void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-#if wxUSE_SPLINES
-    void DoDrawSpline(const wxPointList *points);
-#endif
-    bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-            wxDC *source, wxCoord xsrc, wxCoord ysrc,
-            wxRasterOperationMode = wxCOPY, bool useMask = false,
-            wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
-    void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
-    void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false  );
-    void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
-    void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
-    void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) )
-    {
-        wxFAIL_MSG( "not implemented" );
-    }
-    void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
-                     wxCoord *descent = NULL,
-                     wxCoord *externalLeading = NULL,
-                     const wxFont *theFont = NULL ) const;
-    void DoGetSize(int* width, int* height) const;
-    void DoGetSizeMM(int *width, int *height) const;
-
-    void SetPrintData(const wxPrintData& data);
-    wxPrintData& GetPrintData() { return m_printData; }
-
-    // overridden for wxPrinterDC Impl
-    virtual wxRect GetPaperRect() const;
-    virtual int GetResolution() const;
-
-private:
-    wxPrintData             m_printData;
-    PangoContext           *m_context;
-    PangoLayout            *m_layout;
-    PangoFontDescription   *m_fontdesc;
-
-    unsigned char           m_currentRed;
-    unsigned char           m_currentGreen;
-    unsigned char           m_currentBlue;
-
-    double                  m_pageHeight;
-
-    GnomePrintContext      *m_gpc;
-    GnomePrintJob*          m_job;
-
-    void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrinterDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxGnomePrinterDCImpl);
-};
-
-// ----------------------------------------------------------------------------
-// wxGnomePrintPreview: programmer creates an object of this class to preview a
-// wxPrintout.
-// ----------------------------------------------------------------------------
-
-class wxGnomePrintPreview : public wxPrintPreviewBase
-{
-public:
-    wxGnomePrintPreview(wxPrintout *printout,
-                             wxPrintout *printoutForPrinting = NULL,
-                             wxPrintDialogData *data = NULL);
-    wxGnomePrintPreview(wxPrintout *printout,
-                             wxPrintout *printoutForPrinting,
-                             wxPrintData *data);
-
-    virtual ~wxGnomePrintPreview();
-
-    virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
-
-private:
-    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
-
-private:
-    DECLARE_CLASS(wxGnomePrintPreview)
-};
-
-
-#endif
-    // wxUSE_LIBGNOMEPRINT
-
-#endif
diff --git a/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h b/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h
index 536da8c1f2..559f14f569 100644
--- a/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h
+++ b/Externals/wxWidgets3/include/wx/gtk/gnome/gvfs.h
@@ -3,7 +3,6 @@
 // Author:      Robert Roebling
 // Purpose:     GNOME VFS support
 // Created:     17/03/06
-// RCS-ID:      $Id: gvfs.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/hildon/notifmsg.h b/Externals/wxWidgets3/include/wx/gtk/hildon/notifmsg.h
index 3365527053..ade115fe8a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/hildon/notifmsg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/hildon/notifmsg.h
@@ -3,7 +3,6 @@
 // Purpose:     Hildon implementation of wxNotificationMessage
 // Author:      Vadim Zeitlin
 // Created:     2007-11-21
-// RCS-ID:      $Id: notifmsg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h b/Externals/wxWidgets3/include/wx/gtk/hyperlink.h
index 7fdb40f020..0b6ce6bf9a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/hyperlink.h
+++ b/Externals/wxWidgets3/include/wx/gtk/hyperlink.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     14/2/2007
-// RCS-ID:      $Id: hyperlink.h 67378 2011-04-02 20:43:29Z PC $
 // Copyright:   (c) 2007 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/infobar.h b/Externals/wxWidgets3/include/wx/gtk/infobar.h
index 72df919e24..45563eb275 100644
--- a/Externals/wxWidgets3/include/wx/gtk/infobar.h
+++ b/Externals/wxWidgets3/include/wx/gtk/infobar.h
@@ -3,7 +3,6 @@
 // Purpose:     native implementation of wxInfoBar for GTK+ 2.18 and later
 // Author:      Vadim Zeitlin
 // Created:     2009-09-26
-// RCS-ID:      $Id: infobar.h 64213 2010-05-05 12:20:08Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -54,7 +53,6 @@ public:
     void GTKResponse(int btnid);
 
 protected:
-    virtual bool GTKShouldConnectSizeRequest() const { return false; }
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
diff --git a/Externals/wxWidgets3/include/wx/gtk/listbox.h b/Externals/wxWidgets3/include/wx/gtk/listbox.h
index b2862a935f..c40bda6a27 100644
--- a/Externals/wxWidgets3/include/wx/gtk/listbox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/listbox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/listbox.h
 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling
-// Id:          $Id: listbox.h 67298 2011-03-23 17:36:10Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,7 +9,7 @@
 #ifndef _WX_GTK_LISTBOX_H_
 #define _WX_GTK_LISTBOX_H_
 
-struct _GtkTreeEntry;
+struct _wxTreeEntry;
 struct _GtkTreeIter;
 
 //-----------------------------------------------------------------------------
@@ -91,7 +90,7 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
-    struct _GtkTreeEntry* GTKGetEntry(unsigned pos) const;
+    struct _wxTreeEntry* GTKGetEntry(unsigned pos) const;
 
     void GTKDisableEvents();
     void GTKEnableEvents();
@@ -111,6 +110,7 @@ protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
 
     virtual void DoSetFirstItem(int n);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
@@ -123,9 +123,6 @@ protected:
     // get the index for the given iterator, return wxNOT_FOUND on failure
     int GTKGetIndexFor(_GtkTreeIter& iter) const;
 
-    // set the specified item
-    void GTKSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
-
     // common part of DoSetFirstItem() and EnsureVisible()
     void DoScrollToCell(int n, float alignY, float alignX);
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/mdi.h b/Externals/wxWidgets3/include/wx/gtk/mdi.h
index 6b7b50da20..02a61eb899 100644
--- a/Externals/wxWidgets3/include/wx/gtk/mdi.h
+++ b/Externals/wxWidgets3/include/wx/gtk/mdi.h
@@ -3,7 +3,6 @@
 // Purpose:     TDI-based MDI implementation for wxGTK
 // Author:      Robert Roebling
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
-// Id:          $Id: mdi.h 69528 2011-10-25 16:56:57Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -67,11 +66,11 @@ public:
     virtual void OnInternalIdle();
 
 protected:
-    void Init();
     virtual void DoGetClientSize(int* width, int* height) const;
 
 private:
     friend class wxMDIChildFrame;
+    void Init();
 
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 };
diff --git a/Externals/wxWidgets3/include/wx/gtk/menu.h b/Externals/wxWidgets3/include/wx/gtk/menu.h
index 25302e3ace..fec12ba977 100644
--- a/Externals/wxWidgets3/include/wx/gtk/menu.h
+++ b/Externals/wxWidgets3/include/wx/gtk/menu.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/menu.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,7 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+    ~wxMenuBar();
 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );
@@ -40,22 +40,21 @@ public:
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
-    // wxMenuBar is not a top level window but it still doesn't need a parent
-    // window
-    virtual bool GTKNeedsParent() const { return false; }
-
     virtual void Attach(wxFrame *frame);
     virtual void Detach();
 
-    // implementation only from now on
-    GtkWidget       *m_menubar; // Public for hildon support
-
 private:
     // common part of Append and Insert
     void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);
 
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
+    // wxMenuBar is not a top level window but it still doesn't need a parent
+    // window
+    virtual bool GTKNeedsParent() const { return false; }
+
+    GtkWidget* m_menubar;
+
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 
@@ -82,7 +81,8 @@ public:
     // Returns the title, with mnemonics translated to wx format
     wxString GetTitle() const;
 
-    // TODO: virtual void SetTitle(const wxString& title);
+    // Sets the title, with mnemonics translated to gtk format
+    virtual void SetTitle(const wxString& title);
 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
diff --git a/Externals/wxWidgets3/include/wx/gtk/menuitem.h b/Externals/wxWidgets3/include/wx/gtk/menuitem.h
index 778eb8af83..c17ad03a97 100644
--- a/Externals/wxWidgets3/include/wx/gtk/menuitem.h
+++ b/Externals/wxWidgets3/include/wx/gtk/menuitem.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
-// RCS-ID:      $Id: menuitem.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,14 +35,13 @@ public:
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     // implementation
-    void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
+    void SetMenuItem(GtkWidget *menuItem);
     GtkWidget *GetMenuItem() const { return m_menuItem; }
     void SetGtkLabel();
 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
-    wxDEPRECATED(
-    inline
+    wxDEPRECATED_CONSTRUCTOR(
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
diff --git a/Externals/wxWidgets3/include/wx/gtk/minifram.h b/Externals/wxWidgets3/include/wx/gtk/minifram.h
index ebcbeec33f..748f266a9a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/minifram.h
+++ b/Externals/wxWidgets3/include/wx/gtk/minifram.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/minifram.h
 // Purpose:     wxMiniFrame class
 // Author:      Robert Roebling
-// RCS-ID:      $Id: minifram.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,7 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
+    ~wxMiniFrame();
 
     bool Create(wxWindow *parent,
             wxWindowID id,
diff --git a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h b/Externals/wxWidgets3/include/wx/gtk/msgdlg.h
index 90cc21da1f..670d7f9782 100644
--- a/Externals/wxWidgets3/include/wx/gtk/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/gtk/msgdlg.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
-// RCS-ID:      $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h b/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h
index 8dcb75a696..70e853c1ce 100644
--- a/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h
+++ b/Externals/wxWidgets3/include/wx/gtk/nonownedwnd.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK-specific wxNonOwnedWindow declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-12
-// RCS-ID:      $Id: nonownedwnd.h 69462 2011-10-18 21:56:52Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/notebook.h b/Externals/wxWidgets3/include/wx/gtk/notebook.h
index 50cedf0171..6edbb84fb1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/notebook.h
+++ b/Externals/wxWidgets3/include/wx/gtk/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
-// RCS-ID:      $Id: notebook.h 70112 2011-12-24 18:19:26Z VZ $
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -107,9 +106,6 @@ public:
     bool DoPhase(int phase);
 #endif
 
-    // common part of all ctors
-    void Init();
-
     // Called by GTK event handler when the current page is definitely changed.
     void GTKOnPageChanged();
 
@@ -138,6 +134,7 @@ private:
     // the padding set by SetPadding()
     int m_padding;
 
+    void Init();
     virtual void AddChildGTK(wxWindowGTK* child);
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)
diff --git a/Externals/wxWidgets3/include/wx/gtk/notifmsg.h b/Externals/wxWidgets3/include/wx/gtk/notifmsg.h
new file mode 100644
index 0000000000..9135b3aee8
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/notifmsg.h
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/notifmsg.h
+// Purpose:     wxNotificationMessage for wxGTK.
+// Author:      Vadim Zeitlin
+// Created:     2012-07-25
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_NOTIFMSG_H_
+#define _WX_GTK_NOTIFMSG_H_
+
+typedef struct _NotifyNotification NotifyNotification;
+
+// ----------------------------------------------------------------------------
+// wxNotificationMessage
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase
+{
+public:
+    wxNotificationMessage() { Init(); }
+    wxNotificationMessage(const wxString& title,
+                          const wxString& message = wxString(),
+                          wxWindow *parent = NULL,
+                          int flags = wxICON_INFORMATION)
+        : wxNotificationMessageBase(title, message, parent, flags)
+    {
+        Init();
+    }
+
+    virtual ~wxNotificationMessage();
+
+
+    virtual bool Show(int timeout = Timeout_Auto);
+    virtual bool Close();
+
+    // Set the name of the icon to use, overriding the default icon determined
+    // by the flags. Call with empty string to reset custom icon.
+    bool GTKSetIconName(const wxString& name);
+
+private:
+    void Init() { m_notification = NULL; }
+
+    NotifyNotification* m_notification;
+    wxString m_iconName;
+
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
+};
+
+#endif // _WX_GTK_NOTIFMSG_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/pen.h b/Externals/wxWidgets3/include/wx/gtk/pen.h
index 137066611c..85aa102747 100644
--- a/Externals/wxWidgets3/include/wx/gtk/pen.h
+++ b/Externals/wxWidgets3/include/wx/gtk/pen.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/pen.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: pen.h 69020 2011-09-07 16:56:50Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/popupwin.h b/Externals/wxWidgets3/include/wx/gtk/popupwin.h
index 616ae41618..1c848795b9 100644
--- a/Externals/wxWidgets3/include/wx/gtk/popupwin.h
+++ b/Externals/wxWidgets3/include/wx/gtk/popupwin.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:
-// Id:          $Id: popupwin.h 70739 2012-02-28 17:25:59Z PC $
 // Copyright:   (c) 2001 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/print.h b/Externals/wxWidgets3/include/wx/gtk/print.h
index 3dceebb115..e4eae1cef3 100644
--- a/Externals/wxWidgets3/include/wx/gtk/print.h
+++ b/Externals/wxWidgets3/include/wx/gtk/print.h
@@ -3,7 +3,6 @@
 // Author:      Anthony Bretaudeau
 // Purpose:     GTK printing support
 // Created:     2007-08-25
-// RCS-ID:      $Id: print.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,8 +18,6 @@
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"
 #include "wx/dc.h"
-#include "wx/cairo.h"
-
 
 typedef struct _GtkPrintOperation GtkPrintOperation;
 typedef struct _GtkPrintContext GtkPrintContext;
@@ -197,6 +194,7 @@ public:
     void SetPrintConfig( GtkPrintSettings * config );
 
     GtkPrintOperation* GetPrintJob() { return m_job; }
+    void SetPrintJob(GtkPrintOperation *job) { m_job = job; }
 
     GtkPrintContext *GetPrintContext() { return m_context; }
     void SetPrintContext(GtkPrintContext *context) {m_context = context; }
@@ -206,6 +204,8 @@ public:
     void SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup);
 
 private:
+    // NB: m_config is created and owned by us, but the other objects are not
+    //     and their accessors don't change their ref count.
     GtkPrintSettings    *m_config;
     GtkPrintOperation   *m_job;
     GtkPrintContext     *m_context;
@@ -227,7 +227,8 @@ public:
     bool IsOk() const;
 
     virtual void* GetCairoContext() const;
-
+    virtual void* GetHandle() const;
+    
     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );
@@ -264,9 +265,9 @@ protected:
     void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
-    void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
-    void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
+    void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
+    void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
+    void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
diff --git a/Externals/wxWidgets3/include/wx/gtk/private.h b/Externals/wxWidgets3/include/wx/gtk/private.h
index 321ba28f3c..4c52f53c50 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.03.02
-// RCS-ID:      $Id: private.h 70475 2012-01-29 08:00:15Z PC $
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,6 +16,11 @@
 #include "wx/gtk/private/string.h"
 #include "wx/gtk/private/gtk2-compat.h"
 
+#ifndef G_VALUE_INIT
+    // introduced in GLib 2.30
+    #define G_VALUE_INIT { 0, { { 0 } } }
+#endif
+
 // pango_version_check symbol is quite recent ATM (4/2007)... so we
 // use our own wrapper which implements a smart trick.
 // Use this function as you'd use pango_version_check:
@@ -28,7 +32,7 @@
 extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 #if wxUSE_UNICODE
-    #define wxGTK_CONV(s) s.utf8_str()
+    #define wxGTK_CONV(s) (s).utf8_str()
     #define wxGTK_CONV_ENC(s, enc) wxGTK_CONV((s))
     #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s))
     #define wxGTK_CONV_SYS(s) wxGTK_CONV((s))
@@ -87,6 +91,17 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
     #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s))
 #endif
 
+// Define a macro for converting wxString to char* in appropriate encoding for
+// the file names.
+#ifdef G_OS_WIN32
+    // Under MSW, UTF-8 file name encodings are always used.
+    #define wxGTK_CONV_FN(s) (s).utf8_str()
+#else
+    // Under Unix use GLib file name encoding (which is also UTF-8 by default
+    // but may be different from it).
+    #define wxGTK_CONV_FN(s) (s).fn_str()
+#endif
+
 // ----------------------------------------------------------------------------
 // various private helper functions
 // ----------------------------------------------------------------------------
@@ -99,17 +114,18 @@ namespace wxGTKPrivate
 //
 // the returned widgets shouldn't be destroyed, this is done automatically on
 // shutdown
-GtkWidget *GetButtonWidget();
-GtkWidget *GetCheckButtonWidget();
-GtkWidget *GetComboBoxWidget();
-GtkWidget *GetEntryWidget();
-GtkWidget *GetHeaderButtonWidgetFirst();
-GtkWidget *GetHeaderButtonWidgetLast();
-GtkWidget *GetHeaderButtonWidget();
-GtkWidget *GetRadioButtonWidget();
-GtkWidget *GetSplitterWidget();
-GtkWidget *GetTextEntryWidget();
-GtkWidget *GetTreeWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetButtonWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetCheckButtonWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetComboBoxWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetEntryWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetFirst();
+WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetLast();
+WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetNotebookWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetRadioButtonWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(wxOrientation orient = wxHORIZONTAL);
+WXDLLIMPEXP_CORE GtkWidget *GetTextEntryWidget();
+WXDLLIMPEXP_CORE GtkWidget *GetTreeWidget();
 
 } // wxGTKPrivate
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h b/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h
new file mode 100644
index 0000000000..b282e99ca5
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/private/dialogcount.h
@@ -0,0 +1,48 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/dialogcount.h
+// Purpose:     Helper for temporarily changing wxOpenModalDialogsCount global.
+// Author:      Vadim Zeitlin
+// Created:     2013-03-21
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_DIALOGCOUNT_H_
+#define _WX_GTK_PRIVATE_DIALOGCOUNT_H_
+
+#include "wx/defs.h"
+
+// This global variable contains the number of currently opened modal dialogs.
+// When it is non null, the global menu used in Ubuntu Unity needs to be
+// explicitly disabled as this doesn't currently happen on its own due to a bug
+// in Unity, see https://bugs.launchpad.net/indicator-appmenu/+bug/674605
+//
+// For this to work, all modal dialogs must use wxOpenModalDialogLocker class
+// below to increment this variable while they are indeed being modally shown.
+//
+// This variable is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;
+
+// ----------------------------------------------------------------------------
+// wxOpenModalDialogLocker: Create an object of this class to increment
+//                          wxOpenModalDialogsCount during its lifetime.
+// ----------------------------------------------------------------------------
+
+class wxOpenModalDialogLocker
+{
+public:
+    wxOpenModalDialogLocker()
+    {
+        wxOpenModalDialogsCount++;
+    }
+
+    ~wxOpenModalDialogLocker()
+    {
+        wxOpenModalDialogsCount--;
+    }
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxOpenModalDialogLocker);
+};
+
+#endif // _WX_GTK_PRIVATE_DIALOGCOUNT_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/error.h b/Externals/wxWidgets3/include/wx/gtk/private/error.h
new file mode 100644
index 0000000000..5432b18bf3
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/private/error.h
@@ -0,0 +1,45 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        gtk/private/error.h
+// Purpose:     Wrapper around GError.
+// Author:      Vadim Zeitlin
+// Created:     2012-07-25
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_ERROR_H_
+#define _WX_GTK_PRIVATE_ERROR_H_
+
+// ----------------------------------------------------------------------------
+// wxGtkError wraps GError and releases it automatically.
+// ----------------------------------------------------------------------------
+
+// Create an object of this class and pass the result of its Out() method to a
+// function taking "GError**", then use GetMessage() if the function returned
+// false.
+class wxGtkError
+{
+public:
+    wxGtkError() { m_error = NULL; }
+    ~wxGtkError() { if ( m_error ) g_error_free(m_error); }
+
+    GError** Out()
+    {
+        // This would result in a GError leak.
+        wxASSERT_MSG( !m_error, wxS("Can't reuse the same object.") );
+
+        return &m_error;
+    }
+
+    wxString GetMessage() const
+    {
+        return wxString::FromUTF8(m_error->message);
+    }
+
+private:
+    GError* m_error;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkError);
+};
+
+#endif // _WX_GTK_PRIVATE_ERROR_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/event.h b/Externals/wxWidgets3/include/wx/gtk/private/event.h
index 7c1254fea8..eda9e6e7f4 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/event.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/event.h
@@ -3,7 +3,6 @@
 // Purpose:     Helper functions for working with GDK and wx events
 // Author:      Vaclav Slavik
 // Created:     2011-10-14
-// RCS-ID:      $Id$
 // Copyright:   (c) 2011 Vaclav Slavik
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h b/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h
index d3a2ac872a..b63b0c74cd 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/gdkconv.h
@@ -3,7 +3,6 @@
 // Purpose:     Helper functions for converting between GDK and wx types
 // Author:      Vadim Zeitlin
 // Created:     2009-11-10
-// RCS-ID:      $Id: gdkconv.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h b/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h
index fddeaafca9..20e9358d90 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/gtk2-compat.h
@@ -3,7 +3,6 @@
 // Purpose:     Compatibility code for older GTK+ versions
 // Author:      Vaclav Slavik
 // Created:     2011-03-25
-// RCS-ID:      $Id$
 // Copyright:   (c) 2011 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,7 +25,7 @@
 //         functions even if GTK_CHECK_VERSION would indicate the function is
 //         already available in GTK+.
 
-#if !GTK_CHECK_VERSION(3,0,0) && !(defined(GTK_DISABLE_DEPRECATED) || defined(GSEAL_ENABLE))
+#ifndef __WXGTK3__
 
 // ----------------------------------------------------------------------------
 // the following were introduced in GTK+ 2.8
@@ -55,16 +54,13 @@ static inline gpointer wx_g_object_ref_sink(gpointer object)
 #define g_object_ref_sink wx_g_object_ref_sink
 
 // ----------------------------------------------------------------------------
-// the following were introduced in GTK+ 2.12 and GtkAboutDialog itself is not
-// in 2.4 so skip this if we don't have it.
-#if GTK_CHECK_VERSION(2,6,0)
+// the following were introduced in GTK+ 2.12
 
 static inline void wx_gtk_about_dialog_set_program_name(GtkAboutDialog* about, const gchar* name)
 {
     gtk_about_dialog_set_name(about, name);
 }
 #define gtk_about_dialog_set_program_name wx_gtk_about_dialog_set_program_name
-#endif // 2.6.0
 
 // ----------------------------------------------------------------------------
 // the following were introduced in GTK+ 2.14
@@ -129,18 +125,6 @@ static inline guint16 wx_gtk_entry_get_text_length(GtkEntry* entry)
 }
 #define gtk_entry_get_text_length wx_gtk_entry_get_text_length
 
-static inline GtkWidget* wx_gtk_font_selection_dialog_get_cancel_button(GtkFontSelectionDialog* fsd)
-{
-    return fsd->cancel_button;
-}
-#define gtk_font_selection_dialog_get_cancel_button wx_gtk_font_selection_dialog_get_cancel_button
-
-static inline GtkWidget* wx_gtk_font_selection_dialog_get_ok_button(GtkFontSelectionDialog* fsd)
-{
-    return fsd->ok_button;
-}
-#define gtk_font_selection_dialog_get_ok_button wx_gtk_font_selection_dialog_get_ok_button
-
 static inline const guchar* wx_gtk_selection_data_get_data(GtkSelectionData* selection_data)
 {
     return selection_data->data;
@@ -342,9 +326,66 @@ static inline GdkWindow* wx_gtk_entry_get_text_window(GtkEntry* entry)
 }
 #define gtk_entry_get_text_window wx_gtk_entry_get_text_window
 
+// ----------------------------------------------------------------------------
+// the following were introduced in GTK+ 2.22
+
+static inline GdkWindow* wx_gtk_button_get_event_window(GtkButton* button)
+{
+    return button->event_window;
+}
+#define gtk_button_get_event_window wx_gtk_button_get_event_window
+
+static inline GdkDragAction wx_gdk_drag_context_get_actions(GdkDragContext* context)
+{
+    return context->actions;
+}
+#define gdk_drag_context_get_actions wx_gdk_drag_context_get_actions
+
+static inline GdkDragAction wx_gdk_drag_context_get_selected_action(GdkDragContext* context)
+{
+    return context->action;
+}
+#define gdk_drag_context_get_selected_action wx_gdk_drag_context_get_selected_action
+
+static inline GdkDragAction wx_gdk_drag_context_get_suggested_action(GdkDragContext* context)
+{
+    return context->suggested_action;
+}
+#define gdk_drag_context_get_suggested_action wx_gdk_drag_context_get_suggested_action
+
+static inline GList* wx_gdk_drag_context_list_targets(GdkDragContext* context)
+{
+    return context->targets;
+}
+#define gdk_drag_context_list_targets wx_gdk_drag_context_list_targets
+
+static inline gint wx_gdk_visual_get_depth(GdkVisual* visual)
+{
+    return visual->depth;
+}
+#define gdk_visual_get_depth wx_gdk_visual_get_depth
+
+static inline gboolean wx_gtk_window_has_group(GtkWindow* window)
+{
+    return window->group != NULL;
+}
+#define gtk_window_has_group wx_gtk_window_has_group
+
 // ----------------------------------------------------------------------------
 // the following were introduced in GTK+ 2.24
 
+static inline GdkDisplay* wx_gdk_window_get_display(GdkWindow* window)
+{
+    return gdk_drawable_get_display(window);
+}
+#define gdk_window_get_display wx_gdk_window_get_display
+
+static inline GdkScreen* wx_gdk_window_get_screen(GdkWindow* window)
+{
+    return gdk_drawable_get_screen(window);
+}
+#define gdk_window_get_screen wx_gdk_window_get_screen
+
 static inline gint wx_gdk_window_get_height(GdkWindow* window)
 {
     int h;
@@ -369,8 +410,106 @@ static inline void wx_gdk_cairo_set_source_window(cairo_t* cr, GdkWindow* window
 #define gdk_cairo_set_source_window wx_gdk_cairo_set_source_window
 #endif
 
-#endif // !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+// ----------------------------------------------------------------------------
+// the following were introduced in GTK+ 3.0
 
+static inline void wx_gdk_window_get_geometry(GdkWindow* window, gint* x, gint* y, gint* width, gint* height)
+{
+    gdk_window_get_geometry(window, x, y, width, height, NULL);
+}
+#define gdk_window_get_geometry wx_gdk_window_get_geometry
 
+static inline GtkWidget* wx_gtk_tree_view_column_get_button(GtkTreeViewColumn* tree_column)
+{
+    return tree_column->button;
+}
+#define gtk_tree_view_column_get_button wx_gtk_tree_view_column_get_button
+
+static inline GtkWidget* wx_gtk_box_new(GtkOrientation orientation, gint spacing)
+{
+    GtkWidget* widget;
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        widget = gtk_hbox_new(false, spacing);
+    else
+        widget = gtk_vbox_new(false, spacing);
+    return widget;
+}
+#define gtk_box_new wx_gtk_box_new
+
+static inline GtkWidget* wx_gtk_button_box_new(GtkOrientation orientation)
+{
+    GtkWidget* widget;
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        widget = gtk_hbutton_box_new();
+    else
+        widget = gtk_vbutton_box_new();
+    return widget;
+}
+#define gtk_button_box_new wx_gtk_button_box_new
+
+static inline GtkWidget* wx_gtk_scale_new(GtkOrientation orientation, GtkAdjustment* adjustment)
+{
+    GtkWidget* widget;
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        widget = gtk_hscale_new(adjustment);
+    else
+        widget = gtk_vscale_new(adjustment);
+    return widget;
+}
+#define gtk_scale_new wx_gtk_scale_new
+
+static inline GtkWidget* wx_gtk_scrollbar_new(GtkOrientation orientation, GtkAdjustment* adjustment)
+{
+    GtkWidget* widget;
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        widget = gtk_hscrollbar_new(adjustment);
+    else
+        widget = gtk_vscrollbar_new(adjustment);
+    return widget;
+}
+#define gtk_scrollbar_new wx_gtk_scrollbar_new
+
+static inline GtkWidget* wx_gtk_separator_new(GtkOrientation orientation)
+{
+    GtkWidget* widget;
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        widget = gtk_hseparator_new();
+    else
+        widget = gtk_vseparator_new();
+    return widget;
+}
+#define gtk_separator_new wx_gtk_separator_new
+
+static inline void wx_gtk_widget_get_preferred_height(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    GtkRequisition req;
+    gtk_widget_size_request(widget, &req);
+    if (minimum)
+        *minimum = req.height;
+    if (natural)
+        *natural = req.height;
+}
+#define gtk_widget_get_preferred_height wx_gtk_widget_get_preferred_height
+
+static inline void wx_gtk_widget_get_preferred_width(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    GtkRequisition req;
+    gtk_widget_size_request(widget, &req);
+    if (minimum)
+        *minimum = req.width;
+    if (natural)
+        *natural = req.width;
+}
+#define gtk_widget_get_preferred_width wx_gtk_widget_get_preferred_width
+
+static inline void wx_gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition* minimum, GtkRequisition* natural)
+{
+    GtkRequisition* req = minimum;
+    if (req == NULL)
+        req = natural;
+    gtk_widget_size_request(widget, req);
+}
+#define gtk_widget_get_preferred_size wx_gtk_widget_get_preferred_size
+
+#endif // !__WXGTK3__
 #endif // _WX_GTK_PRIVATE_COMPAT_H_
-
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/list.h b/Externals/wxWidgets3/include/wx/gtk/private/list.h
index 0ec669317d..15ddf71cae 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/list.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/list.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGtkList class.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-21
-// RCS-ID:      $Id: list.h 68842 2011-08-22 12:41:00Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h b/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h
index 72c41570e5..2c3a2a5a58 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/messagetype.h
@@ -3,7 +3,6 @@
 // Purpose:     translate between wx and GtkMessageType
 // Author:      Vadim Zeitlin
 // Created:     2009-09-27
-// RCS-ID:      $Id: messagetype.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h b/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h
index 07a363ba53..0b6e4ba45a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/mnemonics.h
@@ -3,7 +3,6 @@
 // Purpose:     helper functions for dealing with GTK+ mnemonics
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// RCS-ID:      $Id: mnemonics.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/object.h b/Externals/wxWidgets3/include/wx/gtk/private/object.h
index f420d65134..472e4c3ede 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/object.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/object.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGtkObject class declaration
 // Author:      Vadim Zeitlin
 // Created:     2008-08-27
-// RCS-ID:      $Id: object.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/string.h b/Externals/wxWidgets3/include/wx/gtk/private/string.h
index 75b4fc3e4f..bd188d10f8 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/string.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/string.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGtkString class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-10-19
-// RCS-ID:      $Id: string.h 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h b/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h
new file mode 100644
index 0000000000..d27b096f26
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/private/textmeasure.h
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/textmeasure.h
+// Purpose:     wxGTK-specific declaration of wxTextMeasure class
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_TEXTMEASURE_H_
+#define _WX_GTK_PRIVATE_TEXTMEASURE_H_
+
+// ----------------------------------------------------------------------------
+// wxTextMeasure
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl;
+
+class wxTextMeasure : public wxTextMeasureBase
+{
+public:
+    wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
+        : wxTextMeasureBase(dc, font)
+    {
+        Init();
+    }
+
+    wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
+        : wxTextMeasureBase(win, font)
+    {
+        Init();
+    }
+
+protected:
+    // Common part of both ctors.
+    void Init();
+
+    virtual void BeginMeasuring();
+    virtual void EndMeasuring();
+
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *width,
+                                 wxCoord *height,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL);
+
+    virtual bool DoGetPartialTextExtents(const wxString& text,
+                                         wxArrayInt& widths,
+                                         double scaleX);
+
+    // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses
+    // Cairo and not Pango for this. However it's still used even with GTK+ 3
+    // for window text measuring, so the context and the layout are still
+    // needed.
+#ifndef __WXGTK3__
+    wxWindowDCImpl *m_wdc;
+#endif // GTK+ < 3
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextMeasure);
+};
+
+#endif // _WX_GTK_PRIVATE_TEXTMEASURE_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/timer.h b/Externals/wxWidgets3/include/wx/gtk/private/timer.h
index 509303cda6..89f1355bba 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/timer.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/private/timer.h
 // Purpose:     wxTimerImpl for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id: timer.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h b/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h
new file mode 100644
index 0000000000..17abe2fc77
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/private/treeentry_gtk.h
@@ -0,0 +1,58 @@
+/* ///////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/treeentry_gtk.h
+// Purpose:     GtkTreeEntry - a string/userdata combo for use with treeview
+// Author:      Ryan Norton
+// Copyright:   (c) 2006 Ryan Norton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////// */
+
+#ifndef _WX_GTK_TREE_ENTRY_H_
+#define _WX_GTK_TREE_ENTRY_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <gtk/gtk.h> /* for gpointer and gchar* etc. */
+
+#define WX_TYPE_TREE_ENTRY          wx_tree_entry_get_type()
+#define WX_TREE_ENTRY(obj)          G_TYPE_CHECK_INSTANCE_CAST(obj, wx_tree_entry_get_type(), wxTreeEntry)
+#define WX_IS_TREE_ENTRY(obj)       G_TYPE_CHECK_INSTANCE_TYPE(obj, wx_tree_entry_get_type())
+
+typedef struct _wxTreeEntry wxTreeEntry;
+
+typedef void (*wxTreeEntryDestroy)(wxTreeEntry* entry, void* context);
+
+struct _wxTreeEntry
+{
+    GObject parent;                     /* object instance */
+    gchar*  label;                      /* label - always copied by this object except on get */
+    gchar*  collate_key;                /* collate key used for string comparisons/sorting */
+    gpointer userdata;                  /* untouched userdata */
+    wxTreeEntryDestroy destroy_func;    /* called upon destruction - use for freeing userdata etc. */
+    gpointer destroy_func_data;         /* context passed to destroy_func */
+};
+
+wxTreeEntry* wx_tree_entry_new(void);
+
+GType wx_tree_entry_get_type(void);
+
+char* wx_tree_entry_get_collate_key(wxTreeEntry* entry);
+
+char* wx_tree_entry_get_label(wxTreeEntry* entry);
+
+void* wx_tree_entry_get_userdata(wxTreeEntry* entry);
+
+void wx_tree_entry_set_label(wxTreeEntry* entry, const char* label);
+
+void wx_tree_entry_set_userdata(wxTreeEntry* entry, void* userdata);
+
+void wx_tree_entry_set_destroy_func(wxTreeEntry* entry,
+                                        wxTreeEntryDestroy destroy_func,
+                                        gpointer destroy_func_data);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _WX_GTK_TREE_ENTRY_H_ */
diff --git a/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h b/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h
index 5d49572227..0fd421f3bc 100644
--- a/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h
+++ b/Externals/wxWidgets3/include/wx/gtk/private/win_gtk.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/private/win_gtk.h
 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Robert Roebling
-// Id:          $Id: win_gtk.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
@@ -10,8 +9,6 @@
 #ifndef _WX_GTK_PIZZA_H_
 #define _WX_GTK_PIZZA_H_
 
-#include <gtk/gtk.h>
-
 #define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza)
 #define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type())
 
@@ -23,16 +20,16 @@ struct WXDLLIMPEXP_CORE wxPizza
 
     static GtkWidget* New(long windowStyle = 0);
     static GType type();
-    void move(GtkWidget* widget, int x, int y);
-    void put(GtkWidget* widget, int x, int y);
+    void move(GtkWidget* widget, int x, int y, int width, int height);
+    void put(GtkWidget* widget, int x, int y, int width, int height);
     void scroll(int dx, int dy);
-    void get_border_widths(int& x, int& y);
+    void get_border(GtkBorder& border);
 
     GtkFixed m_fixed;
+    GList* m_children;
     int m_scroll_x;
     int m_scroll_y;
-    int m_border_style;
-    bool m_is_scrollable;
+    int m_windowStyle;
 };
 
 #endif // _WX_GTK_PIZZA_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/radiobox.h b/Externals/wxWidgets3/include/wx/gtk/radiobox.h
index ced13bc390..a7f6bd9125 100644
--- a/Externals/wxWidgets3/include/wx/gtk/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/radiobox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/radiobox.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: radiobox.h 67298 2011-03-23 17:36:10Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +27,7 @@ class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
 {
 public:
     // ctors and dtor
-    wxRadioBox() { Init(); }
+    wxRadioBox() { }
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
@@ -41,8 +40,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
-        Init();
-
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 
@@ -57,8 +54,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
-        Init();
-
         Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/radiobut.h b/Externals/wxWidgets3/include/wx/gtk/radiobut.h
index 60b508b148..165370aa12 100644
--- a/Externals/wxWidgets3/include/wx/gtk/radiobut.h
+++ b/Externals/wxWidgets3/include/wx/gtk/radiobut.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/radiobut.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: radiobut.h 62785 2009-12-05 19:25:04Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/region.h b/Externals/wxWidgets3/include/wx/gtk/region.h
index 18b2f26169..a2231a1950 100644
--- a/Externals/wxWidgets3/include/wx/gtk/region.h
+++ b/Externals/wxWidgets3/include/wx/gtk/region.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/region.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: region.h 69815 2011-11-25 00:52:24Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,10 @@
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
+#ifdef __WXGTK3__
+typedef struct _cairo_region cairo_region_t;
+#endif
+
 // ----------------------------------------------------------------------------
 // wxRegion
 // ----------------------------------------------------------------------------
@@ -56,12 +59,12 @@ public:
     virtual void Clear();
     virtual bool IsEmpty() const;
 
-public:
-    // Init with GdkRegion, set ref count to 2 so that
-    // the C++ class will not destroy the region!
-    wxRegion( GdkRegion *region );
-
+#ifdef __WXGTK3__
+    cairo_region_t* GetRegion() const;
+#else
+    wxRegion(const GdkRegion* region);
     GdkRegion *GetRegion() const;
+#endif
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
diff --git a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h b/Externals/wxWidgets3/include/wx/gtk/scrolbar.h
index 2ab5353ed8..e49bb7a2ce 100644
--- a/Externals/wxWidgets3/include/wx/gtk/scrolbar.h
+++ b/Externals/wxWidgets3/include/wx/gtk/scrolbar.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/scrolbar.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: scrolbar.h 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/scrolwin.h b/Externals/wxWidgets3/include/wx/gtk/scrolwin.h
index d7f188bb90..c36040ce88 100644
--- a/Externals/wxWidgets3/include/wx/gtk/scrolwin.h
+++ b/Externals/wxWidgets3/include/wx/gtk/scrolwin.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Created:     01/02/97
-// RCS-ID:      $Id: scrolwin.h 58773 2009-02-08 20:51:44Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,8 @@ public:
                                bool noRefresh = false);
     virtual void AdjustScrollbars();
 
+    virtual bool IsScrollbarShown(int orient) const;
+
 protected:
     virtual void DoScroll(int x, int y);
     virtual void DoShowScrollbars(wxScrollbarVisibility horz,
diff --git a/Externals/wxWidgets3/include/wx/gtk/setup0.h b/Externals/wxWidgets3/include/wx/gtk/setup0.h
new file mode 100644
index 0000000000..ba0bee22fc
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/gtk/setup0.h
@@ -0,0 +1,1665 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/setup.h
+// Purpose:     Configuration for the library
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SETUP_H_
+#define _WX_SETUP_H_
+
+/* --- start common options --- */
+// ----------------------------------------------------------------------------
+// global settings
+// ----------------------------------------------------------------------------
+
+// define this to 0 when building wxBase library - this can also be done from
+// makefile/project file overriding the value here
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI            1
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// compatibility settings
+// ----------------------------------------------------------------------------
+
+// This setting determines the compatibility with 2.6 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_6 0
+
+// This setting determines the compatibility with 2.8 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_8 1
+
+// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
+// default system font is used for wxWindow::GetCharWidth/Height() instead of
+// the current font.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxDIALOG_UNIT_COMPATIBILITY   0
+
+// ----------------------------------------------------------------------------
+// debugging settings
+// ----------------------------------------------------------------------------
+
+// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
+// need to define it here. You may do it for two reasons: either completely
+// disable/compile out the asserts in release version (then do it inside #ifdef
+// NDEBUG) or, on the contrary, enable more asserts, including the usually
+// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
+//
+// #ifdef NDEBUG
+//  #define wxDEBUG_LEVEL 0
+// #else
+//  #define wxDEBUG_LEVEL 2
+// #endif
+
+// wxHandleFatalExceptions() may be used to catch the program faults at run
+// time and, instead of terminating the program with a usual GPF message box,
+// call the user-defined wxApp::OnFatalException() function. If you set
+// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
+//
+// This setting is for Win32 only and can only be enabled if your compiler
+// supports Win32 structured exception handling (currently only VC++ does)
+//
+// Default is 1
+//
+// Recommended setting: 1 if your compiler supports it.
+#define wxUSE_ON_FATAL_EXCEPTION 1
+
+// Set this to 1 to be able to generate a human-readable (unlike
+// machine-readable minidump created by wxCrashReport::Generate()) stack back
+// trace when your program crashes using wxStackWalker
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, set to 0 if your programs never crash
+#define wxUSE_STACKWALKER 1
+
+// Set this to 1 to compile in wxDebugReport class which allows you to create
+// and optionally upload to your web site a debug report consisting of back
+// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, it is compiled into a separate library so there
+//                         is no overhead if you don't use it
+#define wxUSE_DEBUGREPORT 1
+
+// Generic comment about debugging settings: they are very useful if you don't
+// use any other memory leak detection tools such as Purify/BoundsChecker, but
+// are probably redundant otherwise. Also, Visual C++ CRT has the same features
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
+// may prefer to use it instead of built in memory debugging code because it is
+// faster and more fool proof.
+//
+// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
+// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
+// and if __NO_VC_CRTDBG__ is not defined.
+
+// The rest of the options in this section are obsolete and not supported,
+// enable them at your own risk.
+
+// If 1, enables wxDebugContext, for writing error messages to file, etc. If
+// __WXDEBUG__ is not defined, will still use the normal memory operators.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_DEBUG_CONTEXT 0
+
+// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
+// __WXDEBUG__ is also defined.
+//
+// WARNING: this code may not work with all architectures, especially if
+// alignment is an issue. This switch is currently ignored for mingw / cygwin
+//
+// Default is 0
+//
+// Recommended setting: 1 if you are not using a memory debugging tool, else 0
+#define wxUSE_MEMORY_TRACING 0
+
+// In debug mode, cause new and delete to be redefined globally.
+// If this causes problems (e.g. link errors which is a common problem
+// especially if you use another library which also redefines the global new
+// and delete), set this to 0.
+// This switch is currently ignored for mingw / cygwin
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
+// this causes problems (e.g. link errors), set this to 0. You may need to set
+// this to 0 if using templates (at least for VC++). This switch is currently
+// ignored for MinGW/Cygwin.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+
+
+// ----------------------------------------------------------------------------
+// Unicode support
+// ----------------------------------------------------------------------------
+
+// These settings are obsolete: the library is always built in Unicode mode
+// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
+// absolutely necessary -- updating it is strongly recommended as the ANSI mode
+// will disappear completely in future wxWidgets releases.
+#ifndef wxUSE_UNICODE
+    #define wxUSE_UNICODE 1
+#endif
+
+// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
+#define wxUSE_WCHAR_T 1
+
+// ----------------------------------------------------------------------------
+// global features
+// ----------------------------------------------------------------------------
+
+// Compile library in exception-safe mode? If set to 1, the library will try to
+// behave correctly in presence of exceptions (even though it still will not
+// use the exceptions itself) and notify the user code about any unhandled
+// exceptions. If set to 0, propagation of the exceptions through the library
+// code will lead to undefined behaviour -- but the code itself will be
+// slightly smaller and faster.
+//
+// Note that like wxUSE_THREADS this option is automatically set to 0 if
+// wxNO_EXCEPTIONS is defined.
+//
+// Default is 1
+//
+// Recommended setting: depends on whether you intend to use C++ exceptions
+//                      in your own code (1 if you do, 0 if you don't)
+#define wxUSE_EXCEPTIONS    1
+
+// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
+//
+// Default is 0
+//
+// Recommended setting: 0 (this is still work in progress...)
+#define wxUSE_EXTENDED_RTTI 0
+
+// Support for message/error logging. This includes wxLogXXX() functions and
+// wxLog and derived classes. Don't set this to 0 unless you really know what
+// you are doing.
+//
+// Default is 1
+//
+// Recommended setting: 1 (always)
+#define wxUSE_LOG 1
+
+// Recommended setting: 1
+#define wxUSE_LOGWINDOW 1
+
+// Recommended setting: 1
+#define wxUSE_LOGGUI 1
+
+// Recommended setting: 1
+#define wxUSE_LOG_DIALOG 1
+
+// Support for command line parsing using wxCmdLineParser class.
+//
+// Default is 1
+//
+// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
+#define wxUSE_CMDLINE_PARSER 1
+
+// Support for multithreaded applications: if 1, compile in thread classes
+// (thread.h) and make the library a bit more thread safe. Although thread
+// support is quite stable by now, you may still consider recompiling the
+// library without it if you have no use for it - this will result in a
+// somewhat smaller and faster operation.
+//
+// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
+// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
+// build/msw/config.* file this value will have no effect.
+//
+// Default is 1
+//
+// Recommended setting: 0 unless you do plan to develop MT applications
+#define wxUSE_THREADS 1
+
+// If enabled, compiles wxWidgets streams classes
+//
+// wx stream classes are used for image IO, process IO redirection, network
+// protocols implementation and much more and so disabling this results in a
+// lot of other functionality being lost.
+//
+// Default is 1
+//
+// Recommended setting: 1 as setting it to 0 disables many other things
+#define wxUSE_STREAMS       1
+
+// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
+// Note that if the system's implementation does not support positional
+// parameters, setting this to 1 forces the use of the wxWidgets implementation
+// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
+// many Unix systems but usually doesn't under Windows.
+//
+// Positional parameters are very useful when translating a program since using
+// them in formatting strings allow translators to correctly reorder the
+// translated sentences.
+//
+// Default is 1
+//
+// Recommended setting: 1 if you want to support multiple languages
+#define wxUSE_PRINTF_POS_PARAMS      1
+
+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1
+
+// ----------------------------------------------------------------------------
+// Interoperability with the standard library.
+// ----------------------------------------------------------------------------
+
+// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
+// library, even at the cost of backwards compatibility.
+//
+// Default is 0
+//
+// Recommended setting: 0 as the options below already provide a relatively
+// good level of interoperability and changing this option arguably isn't worth
+// diverging from the official builds of the library.
+#define wxUSE_STL 0
+
+// This is not a real option but is used as the default value for
+// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
+//
+// Currently the Digital Mars and Watcom compilers come without standard C++
+// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
+// them (e.g. from STLPort).
+//
+// VC++ 5.0 does include standard C++ library headers, however they produce
+// many warnings that can't be turned off when compiled at warning level 4.
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0
+#else
+    #define wxUSE_STD_DEFAULT  1
+#endif
+
+// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
+// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
+// usually more limited) implementations are used which allows to avoid the
+// dependency on the C++ run-time library.
+//
+// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
+// support using standard containers and that VC6 needs non-default options for
+// such build to avoid getting "fatal error C1076: compiler limit : internal
+// heap limit reached; use /Zm to specify a higher limit" in its own standard
+// headers, so you need to ensure you do increase the heap size before enabling
+// this option for this compiler.
+//
+// Default is 0 for compatibility reasons.
+//
+// Recommended setting: 1 unless compatibility with the official wxWidgets
+// build and/or the existing code is a concern.
+#define wxUSE_STD_CONTAINERS 0
+
+// Use standard C++ streams if 1 instead of wx streams in some places. If
+// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
+// standard streams library.
+//
+// Notice that enabling this does not replace wx streams with std streams
+// everywhere, in a lot of places wx streams are used no matter what.
+//
+// Default is 1 if compiler supports it.
+//
+// Recommended setting: 1 if you use the standard streams anyhow and so
+//                      dependency on the standard streams library is not a
+//                      problem
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+// Enable minimal interoperability with the standard C++ string class if 1.
+// "Minimal" means that wxString can be constructed from std::string or
+// std::wstring but can't be implicitly converted to them. You need to enable
+// the option below for the latter.
+//
+// Default is 1 for most compilers.
+//
+// Recommended setting: 1 unless you want to ensure your program doesn't use
+//                      the standard C++ library at all.
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
+// Make wxString as much interchangeable with std::[w]string as possible, in
+// particular allow implicit conversion of wxString to either of these classes.
+// This comes at a price (or a benefit, depending on your point of view) of not
+// allowing implicit conversion to "const char *" and "const wchar_t *".
+//
+// Because a lot of existing code relies on these conversions, this option is
+// disabled by default but can be enabled for your build if you don't care
+// about compatibility.
+//
+// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
+//
+// Recommended setting: 0 to remain compatible with the official builds of
+// wxWidgets.
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
+// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
+//
+// Note that newer compilers (including VC++ 7.1 and later) don't support
+// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
+//
+// Default is 0.
+//
+// Recommended setting: 0, only set to 1 if you use a really old compiler
+#define wxUSE_IOSTREAMH     0
+
+
+// ----------------------------------------------------------------------------
+// non GUI features selection
+// ----------------------------------------------------------------------------
+
+// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
+// integer which is implemented in terms of native 64 bit integers if any or
+// uses emulation otherwise.
+//
+// This class is required by wxDateTime and so you should enable it if you want
+// to use wxDateTime. For most modern platforms, it will use the native 64 bit
+// integers in which case (almost) all of its functions are inline and it
+// almost does not take any space, so there should be no reason to switch it
+// off.
+//
+// Recommended setting: 1
+#define wxUSE_LONGLONG      1
+
+// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
+// storing binary data in wxConfig on most platforms.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_BASE64        1
+
+// Set this to 1 to be able to use wxEventLoop even in console applications
+// (i.e. using base library only, without GUI). This is mostly useful for
+// processing socket events but is also necessary to use timers in console
+// applications
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_CONSOLE_EVENTLOOP 1
+
+// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
+// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
+//
+// Default is 1
+//
+// Recommended setting: 1 (wxFile is highly recommended as it is required by
+// i18n code, wxFileConfig and others)
+#define wxUSE_FILE          1
+#define wxUSE_FFILE         1
+
+// Use wxFSVolume class providing access to the configured/active mount points
+//
+// Default is 1
+//
+// Recommended setting: 1 (but may be safely disabled if you don't use it)
+#define wxUSE_FSVOLUME      1
+
+// Use wxStandardPaths class which allows to retrieve some standard locations
+// in the file system
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be disabled to save space, but not much)
+#define wxUSE_STDPATHS      1
+
+// use wxTextBuffer class: required by wxTextFile
+#define wxUSE_TEXTBUFFER    1
+
+// use wxTextFile class: requires wxFile and wxTextBuffer, required by
+// wxFileConfig
+#define wxUSE_TEXTFILE      1
+
+// i18n support: _() macro, wxLocale class. Requires wxTextFile.
+#define wxUSE_INTL          1
+
+// Provide wxFoo_l() functions similar to standard foo() functions but taking
+// an extra locale parameter.
+//
+// Notice that this is fully implemented only for the systems providing POSIX
+// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
+// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
+// only work for the current user locale and "C" locale. You can use
+// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
+//
+// Default is 1
+//
+// Recommended setting: 1 but may be disabled if you are writing programs
+// running only in C locale anyhow
+#define wxUSE_XLOCALE       1
+
+// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
+// allow to manipulate dates, times and time intervals. wxDateTime replaces the
+// old wxTime and wxDate classes which are still provided for backwards
+// compatibility (and implemented in terms of wxDateTime).
+//
+// Note that this class is relatively new and is still officially in alpha
+// stage because some features are not yet (fully) implemented. It is already
+// quite useful though and should only be disabled if you are aiming at
+// absolutely minimal version of the library.
+//
+// Requires: wxUSE_LONGLONG
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_DATETIME      1
+
+// Set wxUSE_TIMER to 1 to compile wxTimer class
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_TIMER         1
+
+// Use wxStopWatch clas.
+//
+// Default is 1
+//
+// Recommended setting: 1 (needed by wxSocket)
+#define wxUSE_STOPWATCH     1
+
+// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_FSWATCHER     1
+
+// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
+// which allow the application to store its settings in the persistent
+// storage. Setting this to 1 will also enable on-demand creation of the
+// global config object in wxApp.
+//
+// See also wxUSE_CONFIG_NATIVE below.
+//
+// Recommended setting: 1
+#define wxUSE_CONFIG        1
+
+// If wxUSE_CONFIG is 1, you may choose to use either the native config
+// classes under Windows (using .INI files under Win16 and the registry under
+// Win32) or the portable text file format used by the config classes under
+// Unix.
+//
+// Default is 1 to use native classes. Note that you may still use
+// wxFileConfig even if you set this to 1 - just the config object created by
+// default for the applications needs will be a wxRegConfig or wxIniConfig and
+// not wxFileConfig.
+//
+// Recommended setting: 1
+#define wxUSE_CONFIG_NATIVE   1
+
+// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
+// to connect/disconnect from the network and be notified whenever the dial-up
+// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_DIALUP_MANAGER   1
+
+// Compile in classes for run-time DLL loading and function calling.
+// Required by wxUSE_DIALUP_MANAGER.
+//
+// This setting is for Win32 only
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_DYNLIB_CLASS    1
+
+// experimental, don't use for now
+#define wxUSE_DYNAMIC_LOADER  1
+
+// Set to 1 to use socket classes
+#define wxUSE_SOCKETS       1
+
+// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
+//
+// Notice that currently setting this option under Windows will result in
+// programs which can only run on recent OS versions (with ws2_32.dll
+// installed) which is why it is disabled by default.
+//
+// Default is 1.
+//
+// Recommended setting: 1 if you need IPv6 support
+#define wxUSE_IPV6          0
+
+// Set to 1 to enable virtual file systems (required by wxHTML)
+#define wxUSE_FILESYSTEM    1
+
+// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ZIP        1
+
+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+
+// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_INET       1
+
+// wxArchive classes for accessing archives such as zip and tar
+#define wxUSE_ARCHIVE_STREAMS     1
+
+// Set to 1 to compile wxZipInput/OutputStream classes.
+#define wxUSE_ZIPSTREAM     1
+
+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+
+// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
+// wxUSE_LIBPNG
+#define wxUSE_ZLIB          1
+
+// If enabled, the code written by Apple will be used to write, in a portable
+// way, float on the disk. See extended.c for the license which is different
+// from wxWidgets one.
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you don't like the license terms (unlikely)
+#define wxUSE_APPLE_IEEE          1
+
+// Joystick support class
+#define wxUSE_JOYSTICK            1
+
+// wxFontEnumerator class
+#define wxUSE_FONTENUM 1
+
+// wxFontMapper class
+#define wxUSE_FONTMAP 1
+
+// wxMimeTypesManager class
+#define wxUSE_MIMETYPE 1
+
+// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
+// or wxURL you need to set this to 1.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_PROTOCOL 1
+
+// The settings for the individual URL schemes
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+// Define this to use wxURL class.
+#define wxUSE_URL 1
+
+// Define this to use native platform url and protocol support.
+// Currently valid only for MS-Windows.
+// Note: if you set this to 1, you can open ftp/http/gopher sites
+// and obtain a valid input stream for these sites
+// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
+// Doing so reduces the code size.
+//
+// This code is experimental and subject to change.
+#define wxUSE_URL_NATIVE 0
+
+// Support for wxVariant class used in several places throughout the library,
+// notably in wxDataViewCtrl API.
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you want to reduce the library size as much as
+// possible in which case setting this to 0 can gain up to 100KB.
+#define wxUSE_VARIANT 1
+
+// Support for wxAny class, the successor for wxVariant.
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you want to reduce the library size by a small amount,
+// or your compiler cannot for some reason cope with complexity of templates used.
+#define wxUSE_ANY 1
+
+// Support for regular expression matching via wxRegEx class: enable this to
+// use POSIX regular expressions in your code. You need to compile regex
+// library from src/regex to use it under Windows.
+//
+// Default is 0
+//
+// Recommended setting: 1 if your compiler supports it, if it doesn't please
+// contribute us a makefile for src/regex for it
+#define wxUSE_REGEX       1
+
+// wxSystemOptions class
+#define wxUSE_SYSTEM_OPTIONS 1
+
+// wxSound class
+#define wxUSE_SOUND      1
+
+// Use wxMediaCtrl
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_MEDIACTRL     1
+
+// Use wxWidget's XRC XML-based resource system.  Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#define wxUSE_XRC       1
+
+// XML parsing classes. Note that their API will change in the future, so
+// using wxXmlDocument and wxXmlNode in your app is not recommended.
+//
+// Default is the same as wxUSE_XRC, i.e. 1 by default.
+//
+// Recommended setting: 1 (required by XRC)
+#define wxUSE_XML       wxUSE_XRC
+
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
+// Use wxWidget's Ribbon classes for interfaces
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_RIBBON    1
+
+// Use wxPropertyGrid.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_PROPGRID  1
+
+// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_STC 1
+
+// Use wxWidget's web viewing classes
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_WEBVIEW 1
+
+// Use the IE wxWebView backend
+//
+// Default is 1 on MSW
+//
+// Recommended setting: 1
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 1
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+// Use the WebKit wxWebView backend
+//
+// Default is 1 on GTK and OSX
+//
+// Recommended setting: 1
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 1
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
+
+// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
+// 2D drawing API.  (Still somewhat experimental)
+//
+// Please note that on Windows gdiplus.dll is loaded dynamically which means
+// that nothing special needs to be done as long as you don't use
+// wxGraphicsContext at all or only use it on XP and later systems but you
+// still do need to distribute it yourself for an application using
+// wxGraphicsContext to be runnable on pre-XP systems.
+//
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.
+//
+// Recommended setting: 1 if supported by the compilation environment
+
+// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
+// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
+#       define wxUSE_GRAPHICS_CONTEXT 1
+#   else
+        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
+        // here if you use MSVC 6 with a newer SDK
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+    // Disable support for other Windows compilers, enable it if your compiler
+    // comes with new enough SDK or you installed the headers manually.
+    //
+    // Notice that this will be set by configure under non-Windows platforms
+    // anyhow so the value there is not important.
+#   define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+// Enable wxGraphicsContext implementation using Cairo library.
+//
+// This is not needed under Windows and detected automatically by configure
+// under other systems, however you may set this to 1 manually if you installed
+// Cairo under Windows yourself and prefer to use it instead the native GDI+
+// implementation.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_CAIRO 0
+
+
+// ----------------------------------------------------------------------------
+// Individual GUI controls
+// ----------------------------------------------------------------------------
+
+// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
+// (without it, wxControl class is not compiled)
+//
+// Default is 1
+//
+// Recommended setting: 1 (don't change except for very special programs)
+#define wxUSE_CONTROLS     1
+
+// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
+// Currently markup is supported only by a few controls and only some ports but
+// their number will increase with time.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0 if you want to save on code size)
+#define wxUSE_MARKUP       1
+
+// wxPopupWindow class is a top level transient window. It is currently used
+// to implement wxTipWindow
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
+#define wxUSE_POPUPWIN     1
+
+// wxTipWindow allows to implement the custom tooltips, it is used by the
+// context help classes. Requires wxUSE_POPUPWIN.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0)
+#define wxUSE_TIPWINDOW    1
+
+// Each of the settings below corresponds to one wxWidgets control. They are
+// all switched on by default but may be disabled if you are sure that your
+// program (including any standard dialogs it can show!) doesn't need them and
+// if you desperately want to save some space. If you use any of these you must
+// set wxUSE_CONTROLS as well.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
+#define wxUSE_BUTTON        1   // wxButton
+#define wxUSE_BMPBUTTON     1   // wxBitmapButton
+#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
+#define wxUSE_CHECKBOX      1   // wxCheckBox
+#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHOICE        1   // wxChoice
+#define wxUSE_COLLPANE      1   // wxCollapsiblePane
+#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
+#define wxUSE_COMBOBOX      1   // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
+#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
+#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
+#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
+#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
+#define wxUSE_FILECTRL      1   // wxFileCtrl
+#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
+#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
+#define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
+#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
+#define wxUSE_LISTBOX       1   // wxListBox
+#define wxUSE_LISTCTRL      1   // wxListCtrl
+#define wxUSE_RADIOBOX      1   // wxRadioBox
+#define wxUSE_RADIOBTN      1   // wxRadioButton
+#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
+#define wxUSE_SCROLLBAR     1   // wxScrollBar
+#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
+#define wxUSE_SLIDER        1   // wxSlider
+#define wxUSE_SPINBTN       1   // wxSpinButton
+#define wxUSE_SPINCTRL      1   // wxSpinCtrl
+#define wxUSE_STATBOX       1   // wxStaticBox
+#define wxUSE_STATLINE      1   // wxStaticLine
+#define wxUSE_STATTEXT      1   // wxStaticText
+#define wxUSE_STATBMP       1   // wxStaticBitmap
+#define wxUSE_TEXTCTRL      1   // wxTextCtrl
+#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
+#define wxUSE_TOGGLEBTN     1   // requires wxButton
+#define wxUSE_TREECTRL      1   // wxTreeCtrl
+#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
+
+// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
+// below either wxStatusBar95 or a generic wxStatusBar will be used.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_STATUSBAR    1
+
+// Two status bar implementations are available under Win32: the generic one
+// or the wrapper around native control. For native look and feel the native
+// version should be used.
+//
+// Default is 1 for the platforms where native status bar is supported.
+//
+// Recommended setting: 1 (there is no advantage in using the generic one)
+#define wxUSE_NATIVE_STATUSBAR        1
+
+// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
+// classes at all. Otherwise, use the native toolbar class unless
+// wxUSE_TOOLBAR_NATIVE is 0.
+//
+// Default is 1 for all settings.
+//
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
+
+// wxNotebook is a control with several "tabs" located on one of its sides. It
+// may be used to logically organise the data presented to the user instead of
+// putting everything in one huge dialog. It replaces wxTabControl and related
+// classes of wxWin 1.6x.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_NOTEBOOK 1
+
+// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_LISTBOOK 1
+
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
+// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TREEBOOK 1
+
+// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
+// tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TOOLBOOK 1
+
+// wxTaskBarIcon is a small notification icon shown in the system toolbar or
+// dock.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be set to 0 if you don't need it)
+#define wxUSE_TASKBARICON 1
+
+// wxGrid class
+//
+// Default is 1, set to 0 to cut down compilation time and binaries size if you
+// don't use it.
+//
+// Recommended setting: 1
+//
+#define wxUSE_GRID         1
+
+// wxMiniFrame class: a frame with narrow title bar
+//
+// Default is 1.
+//
+// Recommended setting: 1 (it doesn't cost almost anything)
+#define wxUSE_MINIFRAME 1
+
+// wxComboCtrl and related classes: combobox with custom popup window and
+// not necessarily a listbox.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
+//                      it used by wxComboBox
+#define wxUSE_COMBOCTRL 1
+
+// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
+// items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0, except where it is
+//                      needed as a base class for generic wxBitmapComboBox.
+#define wxUSE_ODCOMBOBOX 1
+
+// wxBitmapComboBox is a combobox that can have images in front of text items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0
+#define wxUSE_BITMAPCOMBOBOX 1
+
+// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
+// up and down in it. It is also used as part of wxRearrangeDialog.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0 (currently used only by
+// wxHeaderCtrl)
+#define wxUSE_REARRANGECTRL 1
+
+// ----------------------------------------------------------------------------
+// Miscellaneous GUI stuff
+// ----------------------------------------------------------------------------
+
+// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
+#define wxUSE_ACCEL 1
+
+// Use the standard art provider. The icons returned by this provider are
+// embedded into the library as XPMs so disabling it reduces the library size
+// somewhat but this should only be done if you use your own custom art
+// provider returning the icons or never use any icons not provided by the
+// native art provider (which might not be implemented at all for some
+// platforms) or by the Tango icons provider (if it's not itself disabled
+// below).
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you use your own custom art provider.
+#define wxUSE_ARTPROVIDER_STD 1
+
+// Use art provider providing Tango icons: this art provider has higher quality
+// icons than the default ones using smaller size XPM icons without
+// transparency but the embedded PNG icons add to the library size.
+//
+// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
+// the GTK+ stock icons replaces it so it is normally not necessary.
+//
+// Recommended setting: 1 but can be turned off to reduce the library size.
+#define wxUSE_ARTPROVIDER_TANGO 1
+
+// Hotkey support (currently Windows only)
+#define wxUSE_HOTKEY 1
+
+// Use wxCaret: a class implementing a "cursor" in a text control (called caret
+// under Windows).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (can be safely set to 0, not used by the library)
+#define wxUSE_CARET         1
+
+// Use wxDisplay class: it allows enumerating all displays on a system and
+// their geometries as well as finding the display on which the given point or
+// window lies.
+//
+// Default is 1.
+//
+// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
+#define wxUSE_DISPLAY       1
+
+// Miscellaneous geometry code: needed for Canvas library
+#define wxUSE_GEOMETRY            1
+
+// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
+// wxListCtrl.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (set it to 0 if you don't use any of the controls
+// enumerated above, then this class is mostly useless too)
+#define wxUSE_IMAGLIST      1
+
+// Use wxInfoBar class.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be disabled without problems as nothing
+// depends on it)
+#define wxUSE_INFOBAR       1
+
+// Use wxMenu, wxMenuBar, wxMenuItem.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (can't be disabled under MSW)
+#define wxUSE_MENUS         1
+
+// Use wxNotificationMessage.
+//
+// wxNotificationMessage allows to show non-intrusive messages to the user
+// using balloons, banners, popups or whatever is the appropriate method for
+// the current platform.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_NOTIFICATION_MESSAGE 1
+
+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_PREFERENCES_EDITOR 1
+
+// wxRichToolTip is a customizable tooltip class which has more functionality
+// than the stock (but native, unlike this class) wxToolTip.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
+#define wxUSE_RICHTOOLTIP 1
+
+// Use wxSashWindow class.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_SASH          1
+
+// Use wxSplitterWindow class.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_SPLITTER      1
+
+// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TOOLTIPS      1
+
+// wxValidator class and related methods
+#define wxUSE_VALIDATORS 1
+
+// Use reference counted ID management: this means that wxWidgets will track
+// the automatically allocated ids (those used when you use wxID_ANY when
+// creating a window, menu or toolbar item &c) instead of just supposing that
+// the program never runs out of them. This is mostly useful only under wxMSW
+// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
+// long-running programs can run into problems with ids reuse without this. On
+// the other platforms, where the ids have the full int range, this shouldn't
+// be necessary.
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 1
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
+
+// ----------------------------------------------------------------------------
+// common dialogs
+// ----------------------------------------------------------------------------
+
+// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
+// file selector, printer dialog). Switching this off also switches off the
+// printing architecture and interactive wxPrinterDC.
+//
+// Default is 1
+//
+// Recommended setting: 1 (unless it really doesn't work)
+#define wxUSE_COMMON_DIALOGS 1
+
+// wxBusyInfo displays window with message when app is busy. Works in same way
+// as wxBusyCursor
+#define wxUSE_BUSYINFO      1
+
+// Use single/multiple choice dialogs.
+//
+// Default is 1
+//
+// Recommended setting: 1 (used in the library itself)
+#define wxUSE_CHOICEDLG     1
+
+// Use colour picker dialog
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_COLOURDLG     1
+
+// wxDirDlg class for getting a directory name from user
+#define wxUSE_DIRDLG 1
+
+// TODO: setting to choose the generic or native one
+
+// Use file open/save dialogs.
+//
+// Default is 1
+//
+// Recommended setting: 1 (used in many places in the library itself)
+#define wxUSE_FILEDLG       1
+
+// Use find/replace dialogs.
+//
+// Default is 1
+//
+// Recommended setting: 1 (but may be safely set to 0)
+#define wxUSE_FINDREPLDLG       1
+
+// Use font picker dialog
+//
+// Default is 1
+//
+// Recommended setting: 1 (used in the library itself)
+#define wxUSE_FONTDLG       1
+
+// Use wxMessageDialog and wxMessageBox.
+//
+// Default is 1
+//
+// Recommended setting: 1 (used in the library itself)
+#define wxUSE_MSGDLG        1
+
+// progress dialog class for lengthy operations
+#define wxUSE_PROGRESSDLG 1
+
+// support for startup tips (wxShowTip &c)
+#define wxUSE_STARTUP_TIPS 1
+
+// text entry dialog and wxGetTextFromUser function
+#define wxUSE_TEXTDLG 1
+
+// number entry dialog
+#define wxUSE_NUMBERDLG 1
+
+// splash screen class
+#define wxUSE_SPLASH 1
+
+// wizards
+#define wxUSE_WIZARDDLG 1
+
+// Compile in wxAboutBox() function showing the standard "About" dialog.
+//
+// Default is 1
+//
+// Recommended setting: 1 but can be set to 0 to save some space if you don't
+//                      use this function
+#define wxUSE_ABOUTDLG 1
+
+// wxFileHistory class
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_FILE_HISTORY 1
+
+// ----------------------------------------------------------------------------
+// Metafiles support
+// ----------------------------------------------------------------------------
+
+// Windows supports the graphics format known as metafile which is, though not
+// portable, is widely used under Windows and so is supported by wxWin (under
+// Windows only, of course). Win16 (Win3.1) used the so-called "Window
+// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
+// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
+// default, WMFs will be used under Win16 and EMFs under Win32. This may be
+// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
+// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
+// in any metafile related classes at all.
+//
+// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
+//
+// Recommended setting: default or 0 for everything for portable programs.
+#define wxUSE_METAFILE              1
+#define wxUSE_ENH_METAFILE          1
+#define wxUSE_WIN_METAFILES_ALWAYS  0
+
+// ----------------------------------------------------------------------------
+// Big GUI components
+// ----------------------------------------------------------------------------
+
+// Set to 0 to disable MDI support.
+//
+// Requires wxUSE_NOTEBOOK under platforms other than MSW.
+//
+// Default is 1.
+//
+// Recommended setting: 1, can be safely set to 0.
+#define wxUSE_MDI 1
+
+// Set to 0 to disable document/view architecture
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+
+// Set to 0 to disable MDI document/view architecture
+//
+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
+#define wxUSE_MDI_ARCHITECTURE    1
+
+// Set to 0 to disable print/preview architecture code
+#define wxUSE_PRINTING_ARCHITECTURE  1
+
+// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
+// much more.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
+// smaller library.
+#define wxUSE_HTML          1
+
+// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
+// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
+// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
+// list of libraries used to link your application (although this is done
+// implicitly for Microsoft Visual C++ users).
+//
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
+//
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1
+
+// wxRichTextCtrl allows editing of styled text.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 if you want compile a
+// smaller library.
+#define wxUSE_RICHTEXT       1
+
+// ----------------------------------------------------------------------------
+// Data transfer
+// ----------------------------------------------------------------------------
+
+// Use wxClipboard class for clipboard copy/paste.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CLIPBOARD     1
+
+// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
+// drop
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_DATAOBJ       1
+
+// Use wxDropTarget and wxDropSource classes for drag and drop (this is
+// different from "built in" drag and drop in wxTreeCtrl which is always
+// available). Requires wxUSE_DATAOBJ.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_DRAG_AND_DROP 1
+
+// Use wxAccessible for enhanced and customisable accessibility.
+// Depends on wxUSE_OLE.
+//
+// Default is 0.
+//
+// Recommended setting (at present): 0
+#define wxUSE_ACCESSIBILITY 0
+
+// ----------------------------------------------------------------------------
+// miscellaneous settings
+// ----------------------------------------------------------------------------
+
+// wxSingleInstanceChecker class allows to verify at startup if another program
+// instance is running.
+//
+// Default is 1
+//
+// Recommended setting: 1 (the class is tiny, disabling it won't save much
+// space)
+#define wxUSE_SNGLINST_CHECKER  1
+
+#define wxUSE_DRAGIMAGE 1
+
+#define wxUSE_IPC         1
+                                // 0 for no interprocess comms
+#define wxUSE_HELP        1
+                                // 0 for no help facility
+
+// Should we use MS HTML help for wxHelpController? If disabled, neither
+// wxCHMHelpController nor wxBestHelpController are available.
+//
+// Default is 1 under MSW, 0 is always used for the other platforms.
+//
+// Recommended setting: 1, only set to 0 if you have trouble compiling
+// wxCHMHelpController (could be a problem with really ancient compilers)
+#define wxUSE_MS_HTML_HELP 1
+
+
+// Use wxHTML-based help controller?
+#define wxUSE_WXHTML_HELP 1
+
+#define wxUSE_CONSTRAINTS 1
+                                // 0 for no window layout constraint system
+
+#define wxUSE_SPLINES     1
+                                // 0 for no splines
+
+#define wxUSE_MOUSEWHEEL        1
+                                // Include mouse wheel support
+
+// Compile wxUIActionSimulator class?
+#define wxUSE_UIACTIONSIMULATOR 1
+
+// ----------------------------------------------------------------------------
+// wxDC classes for various output formats
+// ----------------------------------------------------------------------------
+
+// Set to 1 for PostScript device context.
+#define wxUSE_POSTSCRIPT  0
+
+// Set to 1 to use font metric files in GetTextExtent
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+
+// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
+// to create files in SVG (Scalable Vector Graphics) format.
+#define wxUSE_SVG 1
+
+// Should wxDC provide SetTransformMatrix() and related methods?
+//
+// Default is 1 but can be set to 0 if this functionality is not used. Notice
+// that currently only wxMSW supports this so setting this to 0 doesn't change
+// much for non-MSW platforms (although it will still save a few bytes
+// probably).
+//
+// Recommended setting: 1.
+#define wxUSE_DC_TRANSFORM_MATRIX 1
+
+// ----------------------------------------------------------------------------
+// image format support
+// ----------------------------------------------------------------------------
+
+// wxImage supports many different image formats which can be configured at
+// compile-time. BMP is always supported, others are optional and can be safely
+// disabled if you don't plan to use images in such format sometimes saving
+// substantial amount of code in the final library.
+//
+// Some formats require an extra library which is included in wxWin sources
+// which is mentioned if it is the case.
+
+// Set to 1 for wxImage support (recommended).
+#define wxUSE_IMAGE         1
+
+// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
+#define wxUSE_LIBPNG        1
+
+// Set to 1 for JPEG format support (requires libjpeg)
+#define wxUSE_LIBJPEG       1
+
+// Set to 1 for TIFF format support (requires libtiff)
+#define wxUSE_LIBTIFF       1
+
+// Set to 1 for TGA format support (loading only)
+#define wxUSE_TGA           1
+
+// Set to 1 for GIF format support
+#define wxUSE_GIF           1
+
+// Set to 1 for PNM format support
+#define wxUSE_PNM           1
+
+// Set to 1 for PCX format support
+#define wxUSE_PCX           1
+
+// Set to 1 for IFF format support (Amiga format)
+#define wxUSE_IFF           0
+
+// Set to 1 for XPM format support
+#define wxUSE_XPM           1
+
+// Set to 1 for MS Icons and Cursors format support
+#define wxUSE_ICO_CUR       1
+
+// Set to 1 to compile in wxPalette class
+#define wxUSE_PALETTE       1
+
+// ----------------------------------------------------------------------------
+// wxUniversal-only options
+// ----------------------------------------------------------------------------
+
+// Set to 1 to enable compilation of all themes, this is the default
+#define wxUSE_ALL_THEMES    1
+
+// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
+// is unset, if it is set these options are not used; notice that metal theme
+// uses Win32 one
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+
+
+/* --- end common options --- */
+
+/* --- start MSW options --- */
+// ----------------------------------------------------------------------------
+// Windows-only settings
+// ----------------------------------------------------------------------------
+
+// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
+// and want to run your programs under Windows 9x and not only NT/2000/XP.
+// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
+// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
+// that you will have to modify the makefiles to include unicows.lib import
+// library as the first library (see installation instructions in install.txt
+// to learn how to do it when building the library or samples).
+//
+// If your compiler doesn't have unicows.lib, you can get a version of it at
+// http://libunicows.sourceforge.net
+//
+// Default is 0
+//
+// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
+#ifndef wxUSE_UNICODE_MSLU
+    #define wxUSE_UNICODE_MSLU 0
+#endif
+
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
+// will override some other settings (see below)
+//
+// Default is 0.
+//
+// Recommended setting: 0 unless you really have to use MFC
+#define wxUSE_MFC           0
+
+// Set this to 1 for generic OLE support: this is required for drag-and-drop,
+// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
+// can't compile/doesn't have the OLE headers.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_OLE           1
+
+// Set this to 1 to enable wxAutomationObject class.
+//
+// Default is 1.
+//
+// Recommended setting: 1 if you need to control other applications via OLE
+// Automation, can be safely set to 0 otherwise
+#define wxUSE_OLE_AUTOMATION 1
+
+// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
+// controls in wx.
+//
+// Default is 1.
+//
+// Recommended setting: 1, required by wxMediaCtrl
+#define wxUSE_ACTIVEX 1
+
+// wxDC caching implementation
+#define wxUSE_DC_CACHEING 1
+
+// Set this to 1 to enable wxDIB class used internally for manipulating
+// wxBitmap data.
+//
+// Default is 1, set it to 0 only if you don't use wxImage neither
+//
+// Recommended setting: 1 (without it conversion to/from wxImage won't work)
+#define wxUSE_WXDIB 1
+
+// Set to 0 to disable PostScript print/preview architecture code under Windows
+// (just use Windows printing).
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+// Set this to 1 to compile in wxRegKey class.
+//
+// Default is 1
+//
+// Recommended setting: 1, this is used internally by wx in a few places
+#define wxUSE_REGKEY 1
+
+// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
+// which allows to put more than ~32Kb of text in it even under Win9x (NT
+// doesn't have such limitation).
+//
+// Default is 1 for compilers which support it
+//
+// Recommended setting: 1, only set it to 0 if your compiler doesn't have
+//                      or can't compile <richedit.h>
+#define wxUSE_RICHEDIT  1
+
+// Set this to 1 to use extra features of richedit v2 and later controls
+//
+// Default is 1 for compilers which support it
+//
+// Recommended setting: 1
+#define wxUSE_RICHEDIT2 1
+
+// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
+// is required by wxUSE_CHECKLISTBOX.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 for a small library size reduction
+#define wxUSE_OWNER_DRAWN 1
+
+// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
+// is required by native wxNotificationMessage implementation.
+//
+// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
+// the necessary declarations.
+//
+// Recommended setting: 1, set to 0 for a tiny library size reduction
+#define wxUSE_TASKBARICON_BALLOONS 1
+
+// Set to 1 to compile MS Windows XP theme engine support
+#define wxUSE_UXTHEME           1
+
+// Set to 1 to use InkEdit control (Tablet PC), if available
+#define wxUSE_INKEDIT  0
+
+// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
+//
+// Default is 0.
+//
+// Recommended setting: 0, nobody uses .INI files any more
+#define wxUSE_INICONF 0
+
+// ----------------------------------------------------------------------------
+// Generic versions of native controls
+// ----------------------------------------------------------------------------
+
+// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
+// native wxDatePickerCtrl
+//
+// Default is 0.
+//
+// Recommended setting: 0, this is mainly used for testing
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
+// native wxTimePickerCtrl for the platforms that have the latter (MSW).
+//
+// Default is 0.
+//
+// Recommended setting: 0, this is mainly used for testing
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
+// ----------------------------------------------------------------------------
+// Crash debugging helpers
+// ----------------------------------------------------------------------------
+
+// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
+// dumps of your program when it crashes (or at any other moment)
+//
+// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
+//
+// Recommended setting: 1, set to 0 if your programs never crash
+#define wxUSE_CRASHREPORT 1
+/* --- end MSW options --- */
+
+// GTK-specific options used when not using configure. As we can't test for the
+// exact GTK version (without including GTK+ headers that we don't want to
+// include from our own public headers), just assume a recent GTK 2.x.
+#define __WXGTK20__
+#define __WXGTK210__
+#define __WXGTK218__
+//#define __WXGTK3__
+
+#endif // _WX_SETUP_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/slider.h b/Externals/wxWidgets3/include/wx/gtk/slider.h
index 01fc6136f0..f8833c4685 100644
--- a/Externals/wxWidgets3/include/wx/gtk/slider.h
+++ b/Externals/wxWidgets3/include/wx/gtk/slider.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/slider.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: slider.h 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@ public:
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
     }
+    ~wxSlider();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
diff --git a/Externals/wxWidgets3/include/wx/gtk/spinbutt.h b/Externals/wxWidgets3/include/wx/gtk/spinbutt.h
index a38cd703c1..4bd71f4746 100644
--- a/Externals/wxWidgets3/include/wx/gtk/spinbutt.h
+++ b/Externals/wxWidgets3/include/wx/gtk/spinbutt.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:
-// RCS-ID:      $Id: spinbutt.h 62785 2009-12-05 19:25:04Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,8 +47,6 @@ public:
     virtual bool Enable( bool enable = true );
 
     // implementation
-    void OnSize( wxSizeEvent &event );
-
     int m_pos;
 
 protected:
@@ -62,9 +59,7 @@ protected:
 private:
     typedef wxSpinButtonBase base_type;
 
-    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
-#endif
-    // _WX_GTK_SPINBUTT_H_
+#endif // _WX_GTK_SPINBUTT_H_
diff --git a/Externals/wxWidgets3/include/wx/gtk/spinctrl.h b/Externals/wxWidgets3/include/wx/gtk/spinctrl.h
index d0c4d35ebd..ef7b6edb7d 100644
--- a/Externals/wxWidgets3/include/wx/gtk/spinctrl.h
+++ b/Externals/wxWidgets3/include/wx/gtk/spinctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
-// RCS-ID:      $Id: spinctrl.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -73,13 +72,15 @@ protected:
     void GtkEnableEvents() const;
 
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlGTKBase)
+    friend class wxSpinCtrlEventDisabler;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -90,7 +91,7 @@ protected:
 class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGTKBase
 {
 public:
-    wxSpinCtrl() {}
+    wxSpinCtrl() { Init(); }
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
@@ -100,6 +101,8 @@ public:
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxS("wxSpinCtrl"))
     {
+        Init();
+
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
@@ -128,6 +131,18 @@ public:
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement(int inc) { DoSetIncrement(inc); }
 
+    virtual int GetBase() const { return m_base; }
+    virtual bool SetBase(int base);
+
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+
+    int m_base;
+
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
@@ -181,6 +196,9 @@ public:
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);
 
+    virtual int GetBase() const { return 10; }
+    virtual bool SetBase(int WXUNUSED(base)) { return false; }
+
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/statbmp.h b/Externals/wxWidgets3/include/wx/gtk/statbmp.h
index 2c98b31496..b7bba950d0 100644
--- a/Externals/wxWidgets3/include/wx/gtk/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/gtk/statbmp.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/statbmp.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statbmp.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/statbox.h b/Externals/wxWidgets3/include/wx/gtk/statbox.h
index 0d9ab6f624..80dbb7f594 100644
--- a/Externals/wxWidgets3/include/wx/gtk/statbox.h
+++ b/Externals/wxWidgets3/include/wx/gtk/statbox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/statbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statbox.h 70738 2012-02-28 17:06:56Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/statline.h b/Externals/wxWidgets3/include/wx/gtk/statline.h
index 04f9e56822..aa4077671f 100644
--- a/Externals/wxWidgets3/include/wx/gtk/statline.h
+++ b/Externals/wxWidgets3/include/wx/gtk/statline.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/statline.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statline.h 43874 2006-12-09 14:52:59Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/stattext.h b/Externals/wxWidgets3/include/wx/gtk/stattext.h
index 7412e70449..f6d88cb83a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/stattext.h
+++ b/Externals/wxWidgets3/include/wx/gtk/stattext.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/stattext.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: stattext.h 67062 2011-02-27 12:48:07Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,10 +47,6 @@ protected:
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
     virtual wxSize DoGetBestSize() const;
 
     virtual wxString DoGetLabel() const;
diff --git a/Externals/wxWidgets3/include/wx/gtk/taskbar.h b/Externals/wxWidgets3/include/wx/gtk/taskbar.h
index ba47591d5f..03bd8daff0 100644
--- a/Externals/wxWidgets3/include/wx/gtk/taskbar.h
+++ b/Externals/wxWidgets3/include/wx/gtk/taskbar.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTaskBarIcon class for GTK2
 // Author:      Paul Cornett
 // Created:     2009-02-08
-// RCS-ID:      $Id: taskbar.h 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) 2009 Paul Cornett
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,7 +13,7 @@
 class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
 {
 public:
-    wxTaskBarIcon();
+    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
     ~wxTaskBarIcon();
     virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString());
     virtual bool RemoveIcon();
diff --git a/Externals/wxWidgets3/include/wx/gtk/textctrl.h b/Externals/wxWidgets3/include/wx/gtk/textctrl.h
index fb214dc5f9..9fefd91975 100644
--- a/Externals/wxWidgets3/include/wx/gtk/textctrl.h
+++ b/Externals/wxWidgets3/include/wx/gtk/textctrl.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:          $Id: textctrl.h 68450 2011-07-29 15:11:54Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -145,28 +144,26 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnEnabled(bool enable);
-
     // overridden wxWindow virtual methods
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
     virtual void DoFreeze();
     virtual void DoThaw();
 
-    // common part of all ctors
-    void Init();
-
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
+    // Override this to use either GtkEntry or GtkTextView IME depending on the
+    // kind of control we are.
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+
     virtual wxPoint DoPositionToCoords(long pos) const;
 
     // wrappers hiding the differences between functions doing the same thing
@@ -179,6 +176,8 @@ protected:
     void GTKSetJustification();
 
 private:
+    void Init();
+
     // overridden wxTextEntry virtual methods
     virtual GtkEditable *GetEditable() const;
     virtual GtkEntry *GetEntry() const;
diff --git a/Externals/wxWidgets3/include/wx/gtk/textentry.h b/Externals/wxWidgets3/include/wx/gtk/textentry.h
index c9084a53f4..3d9da824ec 100644
--- a/Externals/wxWidgets3/include/wx/gtk/textentry.h
+++ b/Externals/wxWidgets3/include/wx/gtk/textentry.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24
-// RCS-ID:      $Id: textentry.h 67509 2011-04-16 17:27:04Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,6 +10,7 @@
 #ifndef _WX_GTK_TEXTENTRY_H_
 #define _WX_GTK_TEXTENTRY_H_
 
+typedef struct _GdkEventKey GdkEventKey;
 typedef struct _GtkEditable GtkEditable;
 typedef struct _GtkEntry GtkEntry;
 
@@ -48,10 +48,25 @@ public:
 
     virtual void SetMaxLength(unsigned long len);
 
+#ifdef __WXGTK3__
+    virtual bool SetHint(const wxString& hint);
+    virtual wxString GetHint() const;
+#endif
+
     // implementation only from now on
     void SendMaxLenEvent();
+    bool GTKEntryOnInsertText(const char* text);
 
 protected:
+    // This method must be called from the derived class Create() to connect
+    // the handlers for the clipboard (cut/copy/paste) events.
+    void GTKConnectClipboardSignals(GtkWidget* entry);
+
+    // And this one to connect "insert-text" signal.
+    void GTKConnectInsertTextSignal(GtkEntry* entry);
+
+
+    virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
 
     // margins functions
@@ -60,6 +75,9 @@ protected:
 
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
 
+    // Override the base class method to use GtkEntry IM context.
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+
 private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable
diff --git a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h b/Externals/wxWidgets3/include/wx/gtk/tglbtn.h
index 514f5e4e7e..d6975311f4 100644
--- a/Externals/wxWidgets3/include/wx/gtk/tglbtn.h
+++ b/Externals/wxWidgets3/include/wx/gtk/tglbtn.h
@@ -5,7 +5,6 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,13 +14,6 @@
 
 #include "wx/bitmap.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxToggleButton;
-class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
-
 //-----------------------------------------------------------------------------
 // wxToggleButton
 //-----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/include/wx/gtk/toolbar.h b/Externals/wxWidgets3/include/wx/gtk/toolbar.h
index ea71a5c91b..d504b6c2e8 100644
--- a/Externals/wxWidgets3/include/wx/gtk/toolbar.h
+++ b/Externals/wxWidgets3/include/wx/gtk/toolbar.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/toolbar.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
-// RCS-ID:      $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -73,6 +72,9 @@ public:
     // --------------------------
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; }
+
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/tooltip.h b/Externals/wxWidgets3/include/wx/gtk/tooltip.h
index e82880d638..25c682b428 100644
--- a/Externals/wxWidgets3/include/wx/gtk/tooltip.h
+++ b/Externals/wxWidgets3/include/wx/gtk/tooltip.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/tooltip.h
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
-// Id:          $Id: tooltip.h 67298 2011-03-23 17:36:10Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/gtk/toplevel.h b/Externals/wxWidgets3/include/wx/gtk/toplevel.h
index c17f62ed77..9f9374b06b 100644
--- a/Externals/wxWidgets3/include/wx/gtk/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/gtk/toplevel.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/toplevel.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: toplevel.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -95,6 +94,8 @@ public:
 
     virtual void GTKHandleRealized();
 
+    void GTKConfigureEvent(int x, int y);
+
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 
@@ -109,7 +110,11 @@ public:
                   m_gdkDecor;
 
     // size of WM decorations
-    wxSize m_decorSize;
+    struct DecorSize
+    {
+        int left, right, top, bottom;
+    };
+    DecorSize m_decorSize;
 
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
@@ -120,7 +125,7 @@ public:
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
-    void GTKUpdateDecorSize(const wxSize& decorSize);
+    void GTKUpdateDecorSize(const DecorSize& decorSize);
 
 protected:
     // give hints to the Window Manager for how the size
@@ -128,9 +133,6 @@ protected:
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);
-    // common part of all ctors
-    void Init();
-
     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
@@ -148,7 +150,11 @@ protected:
     bool m_deferShow;
 
 private:
-    wxSize& GetCachedDecorSize();
+    void Init();
+    DecorSize& GetCachedDecorSize();
+
+    // size hint increments
+    int m_incWidth, m_incHeight;
 
     // is the frame currently iconized?
     bool m_isIconized;
diff --git a/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h
index cfb7e08aaa..e1a01bf811 100644
--- a/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h
+++ b/Externals/wxWidgets3/include/wx/gtk/webview_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/gtk/wx/webview.h
 // Purpose:     GTK webkit backend for web view component
 // Author:      Robert Roebling, Marianne Gagnon
-// Id:          $Id: webview_webkit.h 70768 2012-03-01 16:44:31Z PC $
 // Copyright:   (c) 2010 Marianne Gagnon, 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,7 +9,7 @@
 #ifndef _WX_GTK_WEBKITCTRL_H_
 #define _WX_GTK_WEBKITCTRL_H_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
@@ -26,7 +25,7 @@ typedef struct _WebKitWebView WebKitWebView;
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
-    wxWebViewWebKit() { Init(); }
+    wxWebViewWebKit();
 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,
@@ -35,8 +34,6 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {
-        Init();
-
         Create(parent, id, url, pos, size, style, name);
     }
 
@@ -47,6 +44,8 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr);
 
+    virtual ~wxWebViewWebKit();
+
     virtual bool Enable( bool enable = true );
 
     // implementation
@@ -59,10 +58,11 @@ public:
     virtual void LoadURL(const wxString& url);
     virtual void GoBack();
     virtual void GoForward();
-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
     virtual bool CanGoBack() const;
     virtual bool CanGoForward() const;
     virtual void ClearHistory();
+    virtual void EnableContextMenu(bool enable = true);
     virtual void EnableHistory(bool enable = true);
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
@@ -71,9 +71,6 @@ public:
     virtual wxString GetCurrentTitle() const;
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
-    //We do not want to hide the other overloads
-    using wxWebView::SetPage;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);
     virtual void Print();
     virtual bool IsBusy() const;
 
@@ -97,6 +94,9 @@ public:
     virtual void Undo();
     virtual void Redo();
 
+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT);
+
     //Editing functions
     virtual void SetEditable(bool enable = true);
     virtual bool IsEditable() const;
@@ -110,11 +110,13 @@ public:
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);
-    
+
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 
+    virtual void* GetNativeBackend() const { return m_web_view; }
+
     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in
      * very recent versions of webkit this getter doesn't say everything we need
@@ -128,8 +130,12 @@ public:
     //We use this flag to stop recursion when we load a page from the navigation
     //callback, mainly when loading a VFS page
     bool m_guard;
+    //This flag is use to indicate when a navigation event is the result of a
+    //create-web-view signal and so we need to send a new window event
+    bool m_creating;
 
 protected:
+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
@@ -140,6 +146,9 @@ private:
     void SetWebkitZoom(float level);
     float GetWebkitZoom() const;
 
+    //Find helper function
+    void FindClear();
+
     // focus event handler: calls GTKUpdateBitmap()
     void GTKOnFocus(wxFocusEvent& event);
 
@@ -148,9 +157,30 @@ private:
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
+    //variables used for Find()
+    int m_findFlags;
+    wxString m_findText;
+    int m_findPosition;
+    int m_findCount;
+
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
+class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
+{
+public:
+    virtual wxWebView* Create() { return new wxWebViewWebKit; }
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr)
+    { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
+};
+
+
 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h
index cbadf4ef5f..a798efdda6 100644
--- a/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h
+++ b/Externals/wxWidgets3/include/wx/gtk/webviewhistoryitem_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/gtk/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for GTK
 // Author:      Steven Lamerton
-// Id:          $Id: webviewhistoryitem_webkit.h 69770 2011-11-17 01:23:03Z RD $
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
-    wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) :
                      m_url(url), m_title(title) {}
     wxString GetUrl() { return m_url; }
     wxString GetTitle() { return m_title; }
diff --git a/Externals/wxWidgets3/include/wx/gtk/window.h b/Externals/wxWidgets3/include/wx/gtk/window.h
index 7238d6149b..6c36ce99c1 100644
--- a/Externals/wxWidgets3/include/wx/gtk/window.h
+++ b/Externals/wxWidgets3/include/wx/gtk/window.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/window.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: window.h 70569 2012-02-11 16:26:52Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,9 +11,16 @@
 
 #include "wx/dynarray.h"
 
-// helper structure that holds class that holds GtkIMContext object and
-// some additional data needed for key events processing
-struct wxGtkIMData;
+#ifdef __WXGTK3__
+    typedef struct _cairo cairo_t;
+    typedef struct _GtkStyleProvider GtkStyleProvider;
+    #define WXUNUSED_IN_GTK3(x)
+#else
+    #define WXUNUSED_IN_GTK3(x) x
+#endif
+
+typedef struct _GdkEventKey GdkEventKey;
+typedef struct _GtkIMContext GtkIMContext;
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows);
 
@@ -52,8 +58,6 @@ public:
     // implement base class (pure) virtual methods
     // -------------------------------------------
 
-    virtual bool Destroy();
-
     virtual void Raise();
     virtual void Lower();
 
@@ -140,12 +144,13 @@ public:
     // Internal addition of child windows
     void DoAddChild(wxWindowGTK *child);
 
-    // This methods sends wxPaintEvents to the window. It reads the
-    // update region, breaks it up into rects and sends an event
-    // for each rect. It is also responsible for background erase
-    // events and NC paint events. It is called from "draw" and
-    // "expose" handlers as well as from ::Update()
-    void GtkSendPaintEvents();
+    // This method sends wxPaintEvents to the window.
+    // It is also responsible for background erase events.
+#ifdef __WXGTK3__
+    void GTKSendPaintEvents(cairo_t* cr);
+#else
+    void GTKSendPaintEvents(const GdkRegion* region);
+#endif
 
     // The methods below are required because many native widgets
     // are composed of several subwidgets and setting a style for
@@ -177,11 +182,6 @@ public:
     static wxLayoutDirection GTKGetLayout(GtkWidget *widget);
     static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir);
 
-    // return true if this window must have a non-NULL parent, false if it can
-    // be created without parent (normally only top level windows but in wxGTK
-    // there is also the exception of wxMenuBar)
-    virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
-
     // This is called when capture is taken from the window. It will
     // fire off capture lost events.
     void GTKReleaseMouseAndNotify();
@@ -196,6 +196,7 @@ public:
     // Called when m_widget becomes realized. Derived classes must call the
     // base class method if they override it.
     virtual void GTKHandleRealized();
+    void GTKHandleUnrealize();
 
 protected:
     // for controls composed of multiple GTK widgets, return true to eliminate
@@ -247,7 +248,11 @@ public:
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
-    int                  m_oldClientWidth,m_oldClientHeight;
+    int m_clientWidth, m_clientHeight;
+    // Whether the client size variables above are known to be correct
+    // (because they have been validated by a size-allocate) and should
+    // be used to report client size
+    bool m_useCachedClientSize;
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
@@ -265,7 +270,39 @@ public:
     void GTKDisableFocusOutEvent();
     void GTKEnableFocusOutEvent();
 
-    wxGtkIMData         *m_imData;
+
+    // Input method support
+
+    // The IM context used for generic, i.e. non-native, windows.
+    //
+    // It might be a good idea to avoid allocating it unless key events from
+    // this window are really needed but currently we do it unconditionally.
+    //
+    // For native widgets (i.e. those for which IsOfStandardClass() returns
+    // true) it is NULL.
+    GtkIMContext* m_imContext;
+
+    // Pointer to the event being currently processed by the IME or NULL if not
+    // inside key handling.
+    GdkEventKey* m_imKeyEvent;
+
+    // This method generalizes gtk_im_context_filter_keypress(): for the
+    // generic windows it does just that but it's overridden by the classes
+    // wrapping native widgets that use IM themselves and so provide specific
+    // methods for accessing it such gtk_entry_im_context_filter_keypress().
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+
+    // This method must be called from the derived classes "insert-text" signal
+    // handlers to check if the text is not being inserted by the IM and, if
+    // this is the case, generate appropriate wxEVT_CHAR events for it.
+    //
+    // Returns true if we did generate and process events corresponding to this
+    // text or false if we didn't handle it.
+    bool GTKOnInsertText(const char* text);
+
+    // This is just a helper of GTKOnInsertText() which is also used by GTK+
+    // "commit" signal handler.
+    bool GTKDoInsertTextFromIM(const char* text);
 
 
     // indices for the arrays below
@@ -300,14 +337,11 @@ public:
     // extra (wxGTK-specific) flags
     bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
     bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"
-    bool                 m_hasVMT:1;            // set after PostCreation() is called
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_clipPaintRegion:1;   // true after ScrollWindow()
     wxRegion             m_nativeUpdateRegion;  // not transformed for RTL
     bool                 m_dirtyTabOrder:1;     // tab order changed, GTK focus
                                                 // chain needs update
-    bool                 m_needsStyleChange:1;  // May not be able to change
-                                                // background style until OnIdle
     bool                 m_mouseButtonDown:1;
 
     bool                 m_showOnIdle:1;        // postpone showing the window until idle
@@ -344,13 +378,19 @@ protected:
 
     void GTKFreezeWidget(GtkWidget *w);
     void GTKThawWidget(GtkWidget *w);
+    void GTKDisconnect(void* instance);
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
-    // common part of all ctors (not virtual because called from ctor)
-    void Init();
+    // Create a GtkScrolledWindow containing the given widget (usually
+    // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
+    // the widget passed to it.
+    //
+    // Can be only called if we have either wxHSCROLL or wxVSCROLL in our
+    // style.
+    void GTKCreateScrolledWindowWith(GtkWidget* view);
 
     virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move);
     virtual bool DoNavigateIn(int flags);
@@ -359,20 +399,21 @@ protected:
     // Copies m_children tab order to GTK focus chain:
     void RealizeTabOrder();
 
+#ifndef __WXGTK3__
     // Called by ApplyWidgetStyle (which is called by SetFont() and
     // SetXXXColour etc to apply style changed to native widgets) to create
-    // modified GTK style with non-standard attributes. If forceStyle=true,
-    // creates empty GtkRcStyle if there are no modifications, otherwise
-    // returns NULL in such case.
-    GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false);
+    // modified GTK style with non-standard attributes.
+    GtkRcStyle* GTKCreateWidgetStyle();
+#endif
 
-    // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void GTKApplyWidgetStyle(bool forceStyle = false);
+    void GTKApplyWidgetStyle(bool forceStyle = false);
 
     // helper function to ease native widgets wrapping, called by
     // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
+    void GTKApplyStyle(GtkWidget* widget, GtkRcStyle* style);
+
     // sets the border of a given GtkScrolledWindow from a wx style
     static void GTKScrolledWindowSetBorder(GtkWidget* w, int style);
 
@@ -382,14 +423,16 @@ protected:
     // just as it does.
     unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback);
 
-    // Return true from here if PostCreation() should connect to size_request
-    // signal: this is done by default but doesn't work for some native
-    // controls which override this function to return false
-    virtual bool GTKShouldConnectSizeRequest() const { return !IsTopLevel(); }
-
     void ConstrainSize();
 
 private:
+    void Init();
+
+    // return true if this window must have a non-NULL parent, false if it can
+    // be created without parent (normally only top level windows but in wxGTK
+    // there is also the exception of wxMenuBar)
+    virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
+
     enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the
@@ -400,6 +443,19 @@ private:
     bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units);
     virtual void AddChildGTK(wxWindowGTK* child);
 
+#ifdef __WXGTK3__
+    // paint context is stashed here so wxPaintDC can use it
+    cairo_t* m_paintContext;
+    // style provider for "background-image"
+    GtkStyleProvider* m_styleProvider;
+
+public:
+    cairo_t* GTKPaintContext() const
+    {
+        return m_paintContext;
+    }
+#endif
+
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
     wxDECLARE_NO_COPY_CLASS(wxWindowGTK);
 };
diff --git a/Externals/wxWidgets3/include/wx/hash.h b/Externals/wxWidgets3/include/wx/hash.h
index c30644fcfb..452040ba31 100644
--- a/Externals/wxWidgets3/include/wx/hash.h
+++ b/Externals/wxWidgets3/include/wx/hash.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
-// RCS-ID:      $Id: hash.h 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/hashmap.h b/Externals/wxWidgets3/include/wx/hashmap.h
index f7288a6df0..ed26c35418 100644
--- a/Externals/wxWidgets3/include/wx/hashmap.h
+++ b/Externals/wxWidgets3/include/wx/hashmap.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     29/01/2002
-// RCS-ID:      $Id: hashmap.h 69568 2011-10-27 22:26:10Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -467,7 +466,7 @@ inline bool never_grow( size_t, size_t ) { return false; }
 inline bool never_shrink( size_t, size_t ) { return false; }
 inline bool grow_lf70( size_t buckets, size_t items )
 {
-    return float(items)/float(buckets) >= 0.85;
+    return float(items)/float(buckets) >= 0.85f;
 }
 
 #endif // various hash map implementations
@@ -483,8 +482,9 @@ inline bool grow_lf70( size_t buckets, size_t items )
 #ifndef wxNEEDS_WX_HASH_MAP
 
 // integer types
-class WXDLLIMPEXP_BASE wxIntegerHash
+struct WXDLLIMPEXP_BASE wxIntegerHash
 {
+private:
     WX_HASH_MAP_NAMESPACE::hash<long> longHash;
     WX_HASH_MAP_NAMESPACE::hash<unsigned long> ulongHash;
     WX_HASH_MAP_NAMESPACE::hash<int> intHash;
@@ -527,9 +527,8 @@ public:
 #else // wxNEEDS_WX_HASH_MAP
 
 // integer types
-class WXDLLIMPEXP_BASE wxIntegerHash
+struct WXDLLIMPEXP_BASE wxIntegerHash
 {
-public:
     wxIntegerHash() { }
     unsigned long operator()( long x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned long x ) const { return x; }
@@ -547,9 +546,8 @@ public:
 
 #endif // !wxNEEDS_WX_HASH_MAP/wxNEEDS_WX_HASH_MAP
 
-class WXDLLIMPEXP_BASE wxIntegerEqual
+struct WXDLLIMPEXP_BASE wxIntegerEqual
 {
-public:
     wxIntegerEqual() { }
     bool operator()( long a, long b ) const { return a == b; }
     bool operator()( unsigned long a, unsigned long b ) const { return a == b; }
@@ -566,9 +564,8 @@ public:
 };
 
 // pointers
-class WXDLLIMPEXP_BASE wxPointerHash
+struct WXDLLIMPEXP_BASE wxPointerHash
 {
-public:
     wxPointerHash() { }
 
 #ifdef wxNEEDS_WX_HASH_MAP
@@ -580,9 +577,8 @@ public:
     wxPointerHash& operator=(const wxPointerHash&) { return *this; }
 };
 
-class WXDLLIMPEXP_BASE wxPointerEqual
+struct WXDLLIMPEXP_BASE wxPointerEqual
 {
-public:
     wxPointerEqual() { }
     bool operator()( const void* a, const void* b ) const { return a == b; }
 
@@ -590,9 +586,8 @@ public:
 };
 
 // wxString, char*, wchar_t*
-class WXDLLIMPEXP_BASE wxStringHash
+struct WXDLLIMPEXP_BASE wxStringHash
 {
-public:
     wxStringHash() {}
     unsigned long operator()( const wxString& x ) const
         { return stringHash( x.wx_str() ); }
@@ -616,9 +611,8 @@ public:
     wxStringHash& operator=(const wxStringHash&) { return *this; }
 };
 
-class WXDLLIMPEXP_BASE wxStringEqual
+struct WXDLLIMPEXP_BASE wxStringEqual
 {
-public:
     wxStringEqual() {}
     bool operator()( const wxString& a, const wxString& b ) const
         { return a == b; }
@@ -689,8 +683,7 @@ public: \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \
     { \
-        /* explicit cast needed to suppress CodeWarrior warnings */ \
-        return (size_type)(GetNode( key ) ? 1 : 0); \
+        return GetNode( key ) ? 1u : 0u; \
     } \
 }
 
diff --git a/Externals/wxWidgets3/include/wx/hashset.h b/Externals/wxWidgets3/include/wx/hashset.h
index e5f4d10eca..8cd1becf9b 100644
--- a/Externals/wxWidgets3/include/wx/hashset.h
+++ b/Externals/wxWidgets3/include/wx/hashset.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     11/08/2003
-// RCS-ID:      $Id: hashset.h 69568 2011-10-27 22:26:10Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -46,7 +45,7 @@
 
 // we need to define the class declared by _WX_DECLARE_HASH_SET as a class and
 // not a typedef to allow forward declaring it
-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )  \
+#define _WX_DECLARE_HASH_SET_IMPL( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )  \
 CLASSEXP CLASSNAME                                                            \
     : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >             \
 {                                                                             \
@@ -69,6 +68,31 @@ public:                                                                       \
     {}                                                                        \
 }
 
+// In some standard library implementations (in particular, the libstdc++ that
+// ships with g++ 4.7), std::unordered_set inherits privately from its hasher
+// and comparator template arguments for purposes of empty base optimization.
+// As a result, in the declaration of a class deriving from std::unordered_set
+// the names of the hasher and comparator classes are interpreted as naming
+// the base class which is inaccessible.
+// The workaround is to prefix the class names with 'struct'; however, don't
+// do this on MSVC because it causes a warning there if the class was
+// declared as a 'class' rather than a 'struct' (and MSVC's std::unordered_set
+// implementation does not suffer from the access problem).
+#ifdef _MSC_VER
+#define WX_MAYBE_PREFIX_WITH_STRUCT(STRUCTNAME) STRUCTNAME
+#else
+#define WX_MAYBE_PREFIX_WITH_STRUCT(STRUCTNAME) struct STRUCTNAME
+#endif
+
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )   \
+    _WX_DECLARE_HASH_SET_IMPL(                                                \
+        KEY_T,                                                                \
+        WX_MAYBE_PREFIX_WITH_STRUCT(HASH_T),                                  \
+        WX_MAYBE_PREFIX_WITH_STRUCT(KEY_EQ_T),                                \
+        PTROP,                                                                \
+        CLASSNAME,                                                            \
+        CLASSEXP)
+
 #else // no appropriate STL class, use our own implementation
 
 // this is a complex way of defining an easily inlineable identity function...
diff --git a/Externals/wxWidgets3/include/wx/headercol.h b/Externals/wxWidgets3/include/wx/headercol.h
index 34231fe83e..1002c0f562 100644
--- a/Externals/wxWidgets3/include/wx/headercol.h
+++ b/Externals/wxWidgets3/include/wx/headercol.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxHeaderColumn class
 // Author:      Vadim Zeitlin
 // Created:     2008-12-02
-// RCS-ID:      $Id: headercol.h 69174 2011-09-21 15:07:46Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/headerctrl.h b/Externals/wxWidgets3/include/wx/headerctrl.h
index 5477ea568d..78d7117b9f 100644
--- a/Externals/wxWidgets3/include/wx/headerctrl.h
+++ b/Externals/wxWidgets3/include/wx/headerctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxHeaderCtrlBase class: interface of wxHeaderCtrl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-01
-// RCS-ID:      $Id: headerctrl.h 70338 2012-01-14 16:51:57Z VS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -210,6 +209,10 @@ protected:
     // indices after the number of columns changed
     void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count);
 
+protected:
+    // this window doesn't look nice with the border so don't use it by default
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
 private:
     // methods implementing our public API and defined in platform-specific
     // implementations
@@ -222,8 +225,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0;
     virtual wxArrayInt DoGetColumnsOrder() const = 0;
 
-    // this window doesn't look nice with the border so don't use it by default
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // event handlers
     void OnSeparatorDClick(wxHeaderCtrlEvent& event);
@@ -352,7 +353,10 @@ private:
     void Init();
 
     // bring the column count in sync with the number of columns we store
-    void UpdateColumnCount() { SetColumnCount(m_cols.size()); }
+    void UpdateColumnCount()
+    {
+        SetColumnCount(static_cast<int>(m_cols.size()));
+    }
 
 
     // all our current columns
@@ -418,24 +422,24 @@ private:
 };
 
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_CLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_END_RESIZE, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent );
 
 typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
 
@@ -443,7 +447,7 @@ typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
     wxEVENT_HANDLER_CAST(wxHeaderCtrlEventFunction, func)
 
 #define wx__DECLARE_HEADER_EVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_HEADER_ ## evt, id, wxHeaderCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_HEADER_ ## evt, id, wxHeaderCtrlEventHandler(fn))
 
 #define EVT_HEADER_CLICK(id, fn) wx__DECLARE_HEADER_EVT(CLICK, id, fn)
 #define EVT_HEADER_RIGHT_CLICK(id, fn) wx__DECLARE_HEADER_EVT(RIGHT_CLICK, id, fn)
@@ -464,6 +468,21 @@ typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
 
 #define EVT_HEADER_DRAGGING_CANCELLED(id, fn) wx__DECLARE_HEADER_EVT(DRAGGING_CANCELLED, id, fn)
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_HEADER_CLICK                wxEVT_HEADER_CLICK
+#define wxEVT_COMMAND_HEADER_RIGHT_CLICK          wxEVT_HEADER_RIGHT_CLICK
+#define wxEVT_COMMAND_HEADER_MIDDLE_CLICK         wxEVT_HEADER_MIDDLE_CLICK
+#define wxEVT_COMMAND_HEADER_DCLICK               wxEVT_HEADER_DCLICK
+#define wxEVT_COMMAND_HEADER_RIGHT_DCLICK         wxEVT_HEADER_RIGHT_DCLICK
+#define wxEVT_COMMAND_HEADER_MIDDLE_DCLICK        wxEVT_HEADER_MIDDLE_DCLICK
+#define wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK     wxEVT_HEADER_SEPARATOR_DCLICK
+#define wxEVT_COMMAND_HEADER_BEGIN_RESIZE         wxEVT_HEADER_BEGIN_RESIZE
+#define wxEVT_COMMAND_HEADER_RESIZING             wxEVT_HEADER_RESIZING
+#define wxEVT_COMMAND_HEADER_END_RESIZE           wxEVT_HEADER_END_RESIZE
+#define wxEVT_COMMAND_HEADER_BEGIN_REORDER        wxEVT_HEADER_BEGIN_REORDER
+#define wxEVT_COMMAND_HEADER_END_REORDER          wxEVT_HEADER_END_REORDER
+#define wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED   wxEVT_HEADER_DRAGGING_CANCELLED
+
 #endif // wxUSE_HEADERCTRL
 
 #endif // _WX_HEADERCTRL_H_
diff --git a/Externals/wxWidgets3/include/wx/help.h b/Externals/wxWidgets3/include/wx/help.h
index e76d713189..17539c1b32 100644
--- a/Externals/wxWidgets3/include/wx/help.h
+++ b/Externals/wxWidgets3/include/wx/help.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: help.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/helpbase.h b/Externals/wxWidgets3/include/wx/helpbase.h
index e133370528..9a924fd38e 100644
--- a/Externals/wxWidgets3/include/wx/helpbase.h
+++ b/Externals/wxWidgets3/include/wx/helpbase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: helpbase.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/helphtml.h b/Externals/wxWidgets3/include/wx/helphtml.h
index 15d9bfe19b..87bc81dfbd 100644
--- a/Externals/wxWidgets3/include/wx/helphtml.h
+++ b/Externals/wxWidgets3/include/wx/helphtml.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-05-24
-// RCS-ID:      $Id: helphtml.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/helpwin.h b/Externals/wxWidgets3/include/wx/helpwin.h
index f519067623..b73a62ebaf 100644
--- a/Externals/wxWidgets3/include/wx/helpwin.h
+++ b/Externals/wxWidgets3/include/wx/helpwin.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: helpwin.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/htmllbox.h b/Externals/wxWidgets3/include/wx/htmllbox.h
index 8e051b371f..27c3a36c30 100644
--- a/Externals/wxWidgets3/include/wx/htmllbox.h
+++ b/Externals/wxWidgets3/include/wx/htmllbox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id: htmllbox.h 68460 2011-07-30 11:30:08Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/hyperlink.h b/Externals/wxWidgets3/include/wx/hyperlink.h
index 5d0decb63a..db183d5a2e 100644
--- a/Externals/wxWidgets3/include/wx/hyperlink.h
+++ b/Externals/wxWidgets3/include/wx/hyperlink.h
@@ -4,7 +4,6 @@
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Created:     04/02/2005
-// RCS-ID:      $Id: hyperlink.h 66696 2011-01-16 23:24:21Z VZ $
 // Copyright:   (c) 2005 David Norris
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -88,7 +87,7 @@ public:
 
 class WXDLLIMPEXP_FWD_ADV wxHyperlinkEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_HYPERLINK, wxHyperlinkEvent );
 
 //
 // An event fired when the user clicks on the label in a hyperlink control.
@@ -99,7 +98,7 @@ class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent
 public:
     wxHyperlinkEvent() {}
     wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url)
-        : wxCommandEvent(wxEVT_COMMAND_HYPERLINK, id),
+        : wxCommandEvent(wxEVT_HYPERLINK, id),
           m_url(url)
     {
         SetEventObject(generator);
@@ -132,7 +131,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
     wxEVENT_HANDLER_CAST(wxHyperlinkEventFunction, func)
 
 #define EVT_HYPERLINK(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_HYPERLINK, id, wxHyperlinkEventHandler(fn))
 
 
 #if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
@@ -166,6 +165,8 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
     };
 #endif
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_HYPERLINK   wxEVT_HYPERLINK
 
 #endif // wxUSE_HYPERLINKCTRL
 
diff --git a/Externals/wxWidgets3/include/wx/icon.h b/Externals/wxWidgets3/include/wx/icon.h
index 421f7c5ba6..27bb3e6921 100644
--- a/Externals/wxWidgets3/include/wx/icon.h
+++ b/Externals/wxWidgets3/include/wx/icon.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: icon.h 70353 2012-01-15 14:46:41Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -30,7 +29,11 @@
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #ifdef __WINDOWS__
+    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
+  #else
+    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #endif
   #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
diff --git a/Externals/wxWidgets3/include/wx/iconbndl.h b/Externals/wxWidgets3/include/wx/iconbndl.h
index f0bbb403d9..50ad64261d 100644
--- a/Externals/wxWidgets3/include/wx/iconbndl.h
+++ b/Externals/wxWidgets3/include/wx/iconbndl.h
@@ -4,7 +4,6 @@
 // Author:      Mattia barbon
 // Modified by:
 // Created:     23.03.02
-// RCS-ID:      $Id: iconbndl.h 70455 2012-01-24 22:17:47Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/iconloc.h b/Externals/wxWidgets3/include/wx/iconloc.h
index c2c6ef5485..9baaaa5297 100644
--- a/Externals/wxWidgets3/include/wx/iconloc.h
+++ b/Externals/wxWidgets3/include/wx/iconloc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id: iconloc.h 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagbmp.h b/Externals/wxWidgets3/include/wx/imagbmp.h
index 123c2176e3..262373a70e 100644
--- a/Externals/wxWidgets3/include/wx/imagbmp.h
+++ b/Externals/wxWidgets3/include/wx/imagbmp.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagbmp.h
 // Purpose:     wxImage BMP, ICO, CUR and ANI handlers
 // Author:      Robert Roebling, Chris Elliott
-// RCS-ID:      $Id: imagbmp.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Robert Roebling, Chris Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/image.h b/Externals/wxWidgets3/include/wx/image.h
index 70167b104c..3e7f39eb0d 100644
--- a/Externals/wxWidgets3/include/wx/image.h
+++ b/Externals/wxWidgets3/include/wx/image.h
@@ -2,7 +2,6 @@
 // Name:        wx/image.h
 // Purpose:     wxImage class
 // Author:      Robert Roebling
-// RCS-ID:      $Id: image.h 69760 2011-11-14 13:35:52Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -71,7 +70,7 @@ enum wxImageResizeQuality
     wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST,
 
     // highest (but best) quality
-    wxIMAGE_QUALITY_HIGH
+    wxIMAGE_QUALITY_HIGH = 4
 };
 
 // alpha channel values: fully transparent, default threshold separating
diff --git a/Externals/wxWidgets3/include/wx/imaggif.h b/Externals/wxWidgets3/include/wx/imaggif.h
index 1650e6ead1..1d76a632c8 100644
--- a/Externals/wxWidgets3/include/wx/imaggif.h
+++ b/Externals/wxWidgets3/include/wx/imaggif.h
@@ -2,7 +2,6 @@
 // Name:        wx/imaggif.h
 // Purpose:     wxImage GIF handler
 // Author:      Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
-// RCS-ID:      $Id: imaggif.h 66800 2011-01-28 07:27:34Z DS $
 // Copyright:   (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagiff.h b/Externals/wxWidgets3/include/wx/imagiff.h
index 6778722cd6..f7307ba5e1 100644
--- a/Externals/wxWidgets3/include/wx/imagiff.h
+++ b/Externals/wxWidgets3/include/wx/imagiff.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagiff.h
 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann
-// RCS-ID:      $Id: imagiff.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagjpeg.h b/Externals/wxWidgets3/include/wx/imagjpeg.h
index 0c2161bab3..53f6e06170 100644
--- a/Externals/wxWidgets3/include/wx/imagjpeg.h
+++ b/Externals/wxWidgets3/include/wx/imagjpeg.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagjpeg.h
 // Purpose:     wxImage JPEG handler
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: imagjpeg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imaglist.h b/Externals/wxWidgets3/include/wx/imaglist.h
index 9e5719a145..72255ac710 100644
--- a/Externals/wxWidgets3/include/wx/imaglist.h
+++ b/Externals/wxWidgets3/include/wx/imaglist.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: imaglist.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/imagpcx.h b/Externals/wxWidgets3/include/wx/imagpcx.h
index 2321d4e0b0..cc9d54fa8a 100644
--- a/Externals/wxWidgets3/include/wx/imagpcx.h
+++ b/Externals/wxWidgets3/include/wx/imagpcx.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagpcx.h
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// RCS-ID:      $Id: imagpcx.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagpng.h b/Externals/wxWidgets3/include/wx/imagpng.h
index ad19bf3e92..55adcd5f97 100644
--- a/Externals/wxWidgets3/include/wx/imagpng.h
+++ b/Externals/wxWidgets3/include/wx/imagpng.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagpng.h
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagpng.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagpnm.h b/Externals/wxWidgets3/include/wx/imagpnm.h
index 439cfd30a0..aab7c76faa 100644
--- a/Externals/wxWidgets3/include/wx/imagpnm.h
+++ b/Externals/wxWidgets3/include/wx/imagpnm.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagpnm.h
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
-// RCS-ID:      $Id: imagpnm.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Sylvain Bougnoux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagtga.h b/Externals/wxWidgets3/include/wx/imagtga.h
index 54d5ef0e09..d11083785f 100644
--- a/Externals/wxWidgets3/include/wx/imagtga.h
+++ b/Externals/wxWidgets3/include/wx/imagtga.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagtga.h
 // Purpose:     wxImage TGA handler
 // Author:      Seth Jackson
-// RCS-ID:      $Id: imagtga.h 59461 2009-03-09 23:13:34Z VZ $
 // Copyright:   (c) 2005 Seth Jackson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagtiff.h b/Externals/wxWidgets3/include/wx/imagtiff.h
index e9b00aa989..9182e67173 100644
--- a/Externals/wxWidgets3/include/wx/imagtiff.h
+++ b/Externals/wxWidgets3/include/wx/imagtiff.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagtiff.h
 // Purpose:     wxImage TIFF handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagtiff.h 68785 2011-08-19 03:47:40Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/imagxpm.h b/Externals/wxWidgets3/include/wx/imagxpm.h
index a128b7ebac..16477b2d57 100644
--- a/Externals/wxWidgets3/include/wx/imagxpm.h
+++ b/Externals/wxWidgets3/include/wx/imagxpm.h
@@ -2,7 +2,6 @@
 // Name:        wx/imagxpm.h
 // Purpose:     wxImage XPM handler
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: imagxpm.h 59460 2009-03-09 23:08:36Z VZ $
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/infobar.h b/Externals/wxWidgets3/include/wx/infobar.h
index eca08e3260..be390a856e 100644
--- a/Externals/wxWidgets3/include/wx/infobar.h
+++ b/Externals/wxWidgets3/include/wx/infobar.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
-// RCS-ID:      $Id: infobar.h 64213 2010-05-05 12:20:08Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/init.h b/Externals/wxWidgets3/include/wx/init.h
index 2070d84319..6ce8e82876 100644
--- a/Externals/wxWidgets3/include/wx/init.h
+++ b/Externals/wxWidgets3/include/wx/init.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
-// RCS-ID:      $Id: init.h 64531 2010-06-09 13:23:13Z FM $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -53,6 +52,12 @@ extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);
 
 #endif// wxUSE_UNICODE
 
+// Under Windows we define additional wxEntry() overloads with signature
+// compatible with WinMain() and not the traditional main().
+#if wxUSE_GUI && defined(__WINDOWS__)
+    #include "wx/msw/init.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // Using the library without (explicit) application object: you may avoid using
 // wxDECLARE_APP and wxIMPLEMENT_APP macros and call the functions below instead at
diff --git a/Externals/wxWidgets3/include/wx/intl.h b/Externals/wxWidgets3/include/wx/intl.h
index a2785fd97f..fea4d2d65b 100644
--- a/Externals/wxWidgets3/include/wx/intl.h
+++ b/Externals/wxWidgets3/include/wx/intl.h
@@ -5,7 +5,6 @@
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - plural forms support)
 // Created:     29/01/98
-// RCS-ID:      $Id: intl.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -308,12 +307,6 @@ public:
         return wxGetTranslation(origString, origString2, n, domain);
     }
 
-    // this is hack to work around a problem with wxGetTranslation() which
-    // returns const wxString& and not wxString, so when it returns untranslated
-    // string, it needs to have a copy of it somewhere
-    static const wxString& GetUntranslatedString(const wxString& str)
-        { return wxTranslations::GetUntranslatedString(str); }
-
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }
 
diff --git a/Externals/wxWidgets3/include/wx/iosfwrap.h b/Externals/wxWidgets3/include/wx/iosfwrap.h
index 020d45882d..13fb1f7f89 100644
--- a/Externals/wxWidgets3/include/wx/iosfwrap.h
+++ b/Externals/wxWidgets3/include/wx/iosfwrap.h
@@ -4,7 +4,6 @@
 // Author:      Jan van Dijk <jan@etpmod.phys.tue.nl>
 // Modified by:
 // Created:     18.12.2002
-// RCS-ID:      $Id: iosfwrap.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ioswrap.h b/Externals/wxWidgets3/include/wx/ioswrap.h
index 50ba04a1dc..5805588ead 100644
--- a/Externals/wxWidgets3/include/wx/ioswrap.h
+++ b/Externals/wxWidgets3/include/wx/ioswrap.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.02.99
-// RCS-ID:      $Id: ioswrap.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ipc.h b/Externals/wxWidgets3/include/wx/ipc.h
index 14650aea1d..36542e5f09 100644
--- a/Externals/wxWidgets3/include/wx/ipc.h
+++ b/Externals/wxWidgets3/include/wx/ipc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.04.02
-// RCS-ID:      $Id: ipc.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2002 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ipcbase.h b/Externals/wxWidgets3/include/wx/ipcbase.h
index 87d7bcdca3..4d69958e4c 100644
--- a/Externals/wxWidgets3/include/wx/ipcbase.h
+++ b/Externals/wxWidgets3/include/wx/ipcbase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     4/1/98
-// RCS-ID:      $Id: ipcbase.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/itemid.h b/Externals/wxWidgets3/include/wx/itemid.h
index ff867ef3ec..99897e9c17 100644
--- a/Externals/wxWidgets3/include/wx/itemid.h
+++ b/Externals/wxWidgets3/include/wx/itemid.h
@@ -3,7 +3,6 @@
 // Purpose:     wxItemId class declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-17
-// RCS-ID:      $Id: itemid.h 68916 2011-08-27 14:11:03Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/joystick.h b/Externals/wxWidgets3/include/wx/joystick.h
index ba36f5e956..733ad7de8a 100644
--- a/Externals/wxWidgets3/include/wx/joystick.h
+++ b/Externals/wxWidgets3/include/wx/joystick.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) wxWidgets Team
-// RCS-ID:      $Id: joystick.h 70808 2012-03-04 20:31:42Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/kbdstate.h b/Externals/wxWidgets3/include/wx/kbdstate.h
index d3f927f77a..ab0df32d1c 100644
--- a/Externals/wxWidgets3/include/wx/kbdstate.h
+++ b/Externals/wxWidgets3/include/wx/kbdstate.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxKeyboardState class
 // Author:      Vadim Zeitlin
 // Created:     2008-09-19
-// RCS-ID:      $Id: kbdstate.h 70579 2012-02-13 15:23:33Z SC $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,7 +54,14 @@ public:
     }
 
     // returns true if any modifiers at all are pressed
-    bool HasModifiers() const { return GetModifiers() != wxMOD_NONE; }
+    bool HasAnyModifiers() const { return GetModifiers() != wxMOD_NONE; }
+
+    // returns true if any modifiers changing the usual key interpretation are
+    // pressed, notably excluding Shift
+    bool HasModifiers() const
+    {
+        return ControlDown() || RawControlDown() || AltDown();
+    }
 
     // accessors for individual modifier keys
     bool ControlDown() const { return m_controlDown; }
diff --git a/Externals/wxWidgets3/include/wx/language.h b/Externals/wxWidgets3/include/wx/language.h
index d37f1da48c..2d196b6639 100644
--- a/Externals/wxWidgets3/include/wx/language.h
+++ b/Externals/wxWidgets3/include/wx/language.h
@@ -3,7 +3,6 @@
 // Purpose:     wxLanguage enum
 // Author:      Vadim Zeitlin
 // Created:     2010-04-23
-// RCS-ID:      $Id: language.h 64225 2010-05-06 12:40:11Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/layout.h b/Externals/wxWidgets3/include/wx/layout.h
index a94ed4f759..30d46c2490 100644
--- a/Externals/wxWidgets3/include/wx/layout.h
+++ b/Externals/wxWidgets3/include/wx/layout.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: layout.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/laywin.h b/Externals/wxWidgets3/include/wx/laywin.h
index c27d1e7dbe..e3f6b6eeea 100644
--- a/Externals/wxWidgets3/include/wx/laywin.h
+++ b/Externals/wxWidgets3/include/wx/laywin.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: laywin.h 33948 2005-05-04 18:57:50Z JS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/link.h b/Externals/wxWidgets3/include/wx/link.h
index 394f2422ea..c422fc17af 100644
--- a/Externals/wxWidgets3/include/wx/link.h
+++ b/Externals/wxWidgets3/include/wx/link.h
@@ -3,7 +3,6 @@
 // Purpose:     macros to force linking modules which might otherwise be
 //              discarded by the linker
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: link.h 35722 2005-09-26 12:29:25Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/list.h b/Externals/wxWidgets3/include/wx/list.h
index a74a8fc7b8..160b3b8ba4 100644
--- a/Externals/wxWidgets3/include/wx/list.h
+++ b/Externals/wxWidgets3/include/wx/list.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     29/01/98
-// RCS-ID:      $Id: list.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
+#include "wx/vector.h"
 
 #if wxUSE_STD_CONTAINERS
     #include "wx/beforestd.h"
@@ -148,21 +148,22 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
     decl _WX_LIST_HELPER_##liT                                                \
     {                                                                         \
         typedef elT _WX_LIST_ITEM_TYPE_##liT;                                 \
+        typedef std::list<elT> BaseListType;                                  \
     public:                                                                   \
+        static BaseListType EmptyList;                                        \
         static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X );             \
     };                                                                        \
                                                                               \
     WX_LIST_VC6_WORKAROUND(elT, liT, decl)                                    \
-    decl liT : public std::list<elT>                                          \
+    class liT : public std::list<elT>                                          \
     {                                                                         \
     private:                                                                  \
         typedef std::list<elT> BaseListType;                                  \
-        static BaseListType EmptyList;                                        \
                                                                               \
         bool m_destroy;                                                       \
                                                                               \
     public:                                                                   \
-        decl compatibility_iterator                                           \
+        class compatibility_iterator                                           \
         {                                                                     \
         private:                                                              \
             /* Workaround for broken VC6 nested class name resolution */      \
@@ -174,7 +175,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
                                                                               \
         public:                                                               \
             compatibility_iterator()                                          \
-                : m_iter(EmptyList.end()), m_list( NULL ) {}                  \
+                : m_iter(_WX_LIST_HELPER_##liT::EmptyList.end()), m_list( NULL ) {}                  \
             compatibility_iterator( liT* li, iterator i )                     \
                 : m_iter( i ), m_list( li ) {}                                \
             compatibility_iterator( const liT* li, iterator i )               \
@@ -216,7 +217,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
             }                                                                 \
             int IndexOf() const                                               \
             {                                                                 \
-                return *this ? std::distance( m_list->begin(), m_iter )       \
+                return *this ? (int)std::distance( m_list->begin(), m_iter )  \
                              : wxNOT_FOUND;                                   \
             }                                                                 \
         };                                                                    \
@@ -1214,6 +1215,23 @@ public:
     // compatibility methods
     void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
 #endif // !wxUSE_STD_CONTAINERS
+
+#ifndef __VISUALC6__
+    template<typename T>
+    wxVector<T> AsVector() const
+    {
+        wxVector<T> vector(size());
+        size_t i = 0;
+
+        for ( const_iterator it = begin(); it != end(); ++it )
+        {
+            vector[i++] = static_cast<T>(*it);
+        }
+
+        return vector;
+    }
+#endif // !__VISUALC6__
+
 };
 
 #if !wxUSE_STD_CONTAINERS
diff --git a/Externals/wxWidgets3/include/wx/listbase.h b/Externals/wxWidgets3/include/wx/listbase.h
index b28b9f64a3..5e6fb7cae3 100644
--- a/Externals/wxWidgets3/include/wx/listbase.h
+++ b/Externals/wxWidgets3/include/wx/listbase.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.12.99
-// RCS-ID:      $Id: listbase.h 70286 2012-01-07 16:11:10Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -415,7 +414,7 @@ public:
     //
     // Returns the index of the newly inserted column or -1 on error.
     long AppendColumn(const wxString& heading,
-                      int format = wxLIST_FORMAT_LEFT,
+                      wxListColumnFormat format = wxLIST_FORMAT_LEFT,
                       int width = -1);
 
     // Add a new column to the control at the position "col".
@@ -446,6 +445,8 @@ public:
     virtual int GetColumnWidth(int col) const = 0;
     virtual bool SetColumnWidth(int col, int width) = 0;
 
+    // return the attribute for the item (may return NULL if none)
+    virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
     // Other miscellaneous accessors.
     // ------------------------------
@@ -454,12 +455,23 @@ public:
     bool InReportView() const { return HasFlag(wxLC_REPORT); }
     bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
+    // Enable or disable beep when incremental match doesn't find any item.
+    // Only implemented in the generic version currently.
+    virtual void EnableBellOnNoMatch(bool WXUNUSED(on) = true) { }
+
+    void EnableAlternateRowColours(bool enable = true);
+    void SetAlternateRowColour(const wxColour& colour);
+
 protected:
     // Real implementations methods to which our public forwards.
     virtual long DoInsertColumn(long col, const wxListItem& info) = 0;
 
     // Overridden methods of the base class.
     virtual wxSize DoGetBestClientSize() const;
+
+private:
+    // user defined color to draw row lines, may be invalid
+    wxListItemAttr m_alternateRowColour;
 };
 
 // ----------------------------------------------------------------------------
@@ -498,15 +510,15 @@ public:
     const wxString& GetLabel() const { return m_item.m_text; }
     const wxString& GetText() const { return m_item.m_text; }
     int GetImage() const { return m_item.m_image; }
-    long GetData() const { return static_cast<long>(m_item.m_data); }
+    wxUIntPtr GetData() const { return m_item.m_data; }
     long GetMask() const { return m_item.m_mask; }
     const wxListItem& GetItem() const { return m_item; }
 
-    // for wxEVT_COMMAND_LIST_CACHE_HINT only
+    // for wxEVT_LIST_CACHE_HINT only
     long GetCacheFrom() const { return m_oldItemIndex; }
     long GetCacheTo() const { return m_itemIndex; }
 
-    // was label editing canceled? (for wxEVT_COMMAND_LIST_END_LABEL_EDIT only)
+    // was label editing canceled? (for wxEVT_LIST_END_LABEL_EDIT only)
     bool IsEditCancelled() const { return m_editCancelled; }
     void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
 
@@ -514,7 +526,7 @@ public:
 
 //protected: -- not for backwards compatibility
     int           m_code;
-    long          m_oldItemIndex; // only for wxEVT_COMMAND_LIST_CACHE_HINT
+    long          m_oldItemIndex; // only for wxEVT_LIST_CACHE_HINT
     long          m_itemIndex;
     int           m_col;
     wxPoint       m_pointDrag;
@@ -532,27 +544,27 @@ private:
 // wxListCtrl event macros
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_RDRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_DELETE_ITEM, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_DRAG, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_RDRAG, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_BEGIN_LABEL_EDIT, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_END_LABEL_EDIT, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_DELETE_ITEM, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_DELETE_ALL_ITEMS, wxListEvent );
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_KEY_DOWN, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_INSERT_ITEM, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_CACHE_HINT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_DRAGGING, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_END_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_FOCUSED, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_SELECTED, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_DESELECTED, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_KEY_DOWN, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_INSERT_ITEM, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_CLICK, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_RIGHT_CLICK, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_ACTIVATED, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_CACHE_HINT, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_RIGHT_CLICK, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_BEGIN_DRAG, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_DRAGGING, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_COL_END_DRAG, wxListEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LIST_ITEM_FOCUSED, wxListEvent );
 
 typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 
@@ -560,7 +572,7 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
     wxEVENT_HANDLER_CAST(wxListEventFunction, func)
 
 #define wx__DECLARE_LISTEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_LIST_ ## evt, id, wxListEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_LIST_ ## evt, id, wxListEventHandler(fn))
 
 #define EVT_LIST_BEGIN_DRAG(id, fn) wx__DECLARE_LISTEVT(BEGIN_DRAG, id, fn)
 #define EVT_LIST_BEGIN_RDRAG(id, fn) wx__DECLARE_LISTEVT(BEGIN_RDRAG, id, fn)
@@ -586,6 +598,28 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 
 #define EVT_LIST_CACHE_HINT(id, fn) wx__DECLARE_LISTEVT(CACHE_HINT, id, fn)
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_LIST_BEGIN_DRAG          wxEVT_LIST_BEGIN_DRAG
+#define wxEVT_COMMAND_LIST_BEGIN_RDRAG         wxEVT_LIST_BEGIN_RDRAG
+#define wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT    wxEVT_LIST_BEGIN_LABEL_EDIT
+#define wxEVT_COMMAND_LIST_END_LABEL_EDIT      wxEVT_LIST_END_LABEL_EDIT
+#define wxEVT_COMMAND_LIST_DELETE_ITEM         wxEVT_LIST_DELETE_ITEM
+#define wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS    wxEVT_LIST_DELETE_ALL_ITEMS
+#define wxEVT_COMMAND_LIST_ITEM_SELECTED       wxEVT_LIST_ITEM_SELECTED
+#define wxEVT_COMMAND_LIST_ITEM_DESELECTED     wxEVT_LIST_ITEM_DESELECTED
+#define wxEVT_COMMAND_LIST_KEY_DOWN            wxEVT_LIST_KEY_DOWN
+#define wxEVT_COMMAND_LIST_INSERT_ITEM         wxEVT_LIST_INSERT_ITEM
+#define wxEVT_COMMAND_LIST_COL_CLICK           wxEVT_LIST_COL_CLICK
+#define wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK    wxEVT_LIST_ITEM_RIGHT_CLICK
+#define wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK   wxEVT_LIST_ITEM_MIDDLE_CLICK
+#define wxEVT_COMMAND_LIST_ITEM_ACTIVATED      wxEVT_LIST_ITEM_ACTIVATED
+#define wxEVT_COMMAND_LIST_CACHE_HINT          wxEVT_LIST_CACHE_HINT
+#define wxEVT_COMMAND_LIST_COL_RIGHT_CLICK     wxEVT_LIST_COL_RIGHT_CLICK
+#define wxEVT_COMMAND_LIST_COL_BEGIN_DRAG      wxEVT_LIST_COL_BEGIN_DRAG
+#define wxEVT_COMMAND_LIST_COL_DRAGGING        wxEVT_LIST_COL_DRAGGING
+#define wxEVT_COMMAND_LIST_COL_END_DRAG        wxEVT_LIST_COL_END_DRAG
+#define wxEVT_COMMAND_LIST_ITEM_FOCUSED        wxEVT_LIST_ITEM_FOCUSED
+
 
 #endif
     // _WX_LISTCTRL_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/listbook.h b/Externals/wxWidgets3/include/wx/listbook.h
index f7e4bfc389..1c7cdbd923 100644
--- a/Externals/wxWidgets3/include/wx/listbook.h
+++ b/Externals/wxWidgets3/include/wx/listbook.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id: listbook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,12 +16,13 @@
 #if wxUSE_LISTBOOK
 
 #include "wx/bookctrl.h"
+#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxListView;
 class WXDLLIMPEXP_FWD_CORE wxListEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
 // wxListbook flags
 #define wxLB_DEFAULT          wxBK_DEFAULT
@@ -36,7 +36,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
 // wxListbook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxListbook : public wxNavigationEnabled<wxBookCtrlBase>
 {
 public:
     wxListbook() { }
@@ -87,9 +87,8 @@ protected:
     wxBookCtrlEvent* CreatePageChangingEvent() const;
     void MakeChangedEvent(wxBookCtrlEvent &event);
 
-    // get flags for different list control modes
-    long GetListCtrlIconViewFlags() const;
-    long GetListCtrlReportViewFlags() const;
+    // Get the correct wxListCtrl flags to use depending on our own flags.
+    long GetListCtrlFlags() const;
 
     // event handlers
     void OnListSelected(wxListEvent& event);
@@ -116,10 +115,14 @@ typedef wxBookCtrlEventFunction wxListbookEventFunction;
 #define wxListbookEventHandler(func) wxBookCtrlEventHandler(func)
 
 #define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED    wxEVT_LISTBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING   wxEVT_LISTBOOK_PAGE_CHANGING
 
 #endif // wxUSE_LISTBOOK
 
diff --git a/Externals/wxWidgets3/include/wx/listbox.h b/Externals/wxWidgets3/include/wx/listbox.h
index ee900dce9d..afb0220036 100644
--- a/Externals/wxWidgets3/include/wx/listbox.h
+++ b/Externals/wxWidgets3/include/wx/listbox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id: listbox.h 65935 2010-10-27 23:21:55Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/listctrl.h b/Externals/wxWidgets3/include/wx/listctrl.h
index 5f17cfde7d..51aca4a1b1 100644
--- a/Externals/wxWidgets3/include/wx/listctrl.h
+++ b/Externals/wxWidgets3/include/wx/listctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.12.99
-// RCS-ID:      $Id: listctrl.h 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/listimpl.cpp b/Externals/wxWidgets3/include/wx/listimpl.cpp
index 771b41dcc2..f3a4a1bdfe 100644
--- a/Externals/wxWidgets3/include/wx/listimpl.cpp
+++ b/Externals/wxWidgets3/include/wx/listimpl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16/11/98
-// RCS-ID:      $Id: listimpl.cpp 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
     {                                                                         \
         delete X;                                                             \
     }                                                                         \
-    name::BaseListType name::EmptyList;
+    _WX_LIST_HELPER_##name::BaseListType _WX_LIST_HELPER_##name::EmptyList;
 
 #else // !wxUSE_STD_CONTAINERS
     #undef WX_DEFINE_LIST_2
diff --git a/Externals/wxWidgets3/include/wx/log.h b/Externals/wxWidgets3/include/wx/log.h
index 8f0679b243..be0a245a49 100644
--- a/Externals/wxWidgets3/include/wx/log.h
+++ b/Externals/wxWidgets3/include/wx/log.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: log.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,7 @@
 #define _WX_LOG_H_
 
 #include "wx/defs.h"
+#include "wx/cpp.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -1330,28 +1330,42 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 // following arguments are not even evaluated which is good as it avoids
 // unnecessary overhead)
 //
-// Note: the strange if/else construct is needed to make the following code
+// Note: the strange (because executing at most once) for() loop because we
+//       must arrange for wxDO_LOG() to be at the end of the macro and using a
+//       more natural "if (IsLevelEnabled()) wxDO_LOG()" would result in wrong
+//       behaviour for the following code ("else" would bind to the wrong "if"):
 //
 //          if ( cond )
 //              wxLogError("!!!");
 //          else
 //              ...
 //
-//       work as expected, without it the second "else" would match the "if"
-//       inside wxLogError(). Unfortunately code like
+//       See also #11829 for the problems with other simpler approaches,
+//       notably the need for two macros due to buggy __LINE__ in MSVC.
 //
-//          if ( cond )
-//              wxLogError("!!!");
-//
-//       now provokes "suggest explicit braces to avoid ambiguous 'else'"
-//       warnings from g++ 4.3 and later with -Wparentheses on but they can be
-//       easily fixed by adding curly braces around wxLogError() and at least
-//       the code still does do the right thing.
+// Note 2: Unfortunately we can't use the same solution for all compilers
+//         because the loop-based one results in problems with MSVC6 due to its
+//         wrong (pre-C++98) rules for the scope of the variables declared
+//         inside the loop, as this prevents us from using wxLogXXX() in switch
+//         statement clauses ("initialization of loopvar skipped by case"). So
+//         for now, i.e. while we still support VC6, use the previous solution
+//         for it (FIXME-VC6).
+#ifdef __VISUALC6__
 #define wxDO_LOG_IF_ENABLED(level)                                            \
     if ( !wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT) )             \
     {}                                                                        \
     else                                                                      \
         wxDO_LOG(level)
+#else
+#define wxDO_LOG_IF_ENABLED_HELPER(level, loopvar)                            \
+    for ( bool loopvar = false;                                               \
+          !loopvar && wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT);  \
+          loopvar = true )                                                    \
+        wxDO_LOG(level)
+
+#define wxDO_LOG_IF_ENABLED(level)                                            \
+    wxDO_LOG_IF_ENABLED_HELPER(level, wxMAKE_UNIQUE_NAME(wxlogcheck))
+#endif
 
 // wxLogFatalError() is special as it can't be disabled
 #define wxLogFatalError wxDO_LOG(FatalError)
@@ -1437,7 +1451,7 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
         else                                                                  \
             wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).Log
 
-    #define wxVLogStatus(format, argptr) \
+    #define wxVLogStatus \
         wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).LogV
 #endif // wxUSE_GUI
 
diff --git a/Externals/wxWidgets3/include/wx/longlong.h b/Externals/wxWidgets3/include/wx/longlong.h
index e190ec804b..8a2848c54a 100644
--- a/Externals/wxWidgets3/include/wx/longlong.h
+++ b/Externals/wxWidgets3/include/wx/longlong.h
@@ -5,7 +5,6 @@
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id: longlong.h 68472 2011-07-31 13:25:33Z VS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1067,7 +1066,7 @@ inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return u
 inline wxLongLong operator-(unsigned long l, const wxULongLong& ull)
 {
     wxULongLong ret = wxULongLong(l) - ull;
-    return wxLongLong((long)ret.GetHi(),ret.GetLo());
+    return wxLongLong((wxInt32)ret.GetHi(),ret.GetLo());
 }
 
 #if wxUSE_LONGLONG_NATIVE && wxUSE_STREAMS
diff --git a/Externals/wxWidgets3/include/wx/math.h b/Externals/wxWidgets3/include/wx/math.h
index 0978a84dcc..89a1b94473 100644
--- a/Externals/wxWidgets3/include/wx/math.h
+++ b/Externals/wxWidgets3/include/wx/math.h
@@ -4,7 +4,6 @@
 * Author:      John Labenski and others
 * Modified by:
 * Created:     02/02/03
-* RCS-ID:      $Id: math.h 70796 2012-03-04 00:29:31Z VZ $
 * Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
@@ -52,20 +51,29 @@
 #endif
 
 
-/* unknown __VISAGECC__, __SYMANTECCC__ */
+#ifdef __cplusplus
 
-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+/* Any C++11 compiler should provide isfinite() */
+#if __cplusplus >= 201103
+    #include <cmath>
+    #define wxFinite(x) std::isfinite(x)
+#elif defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #define wxFinite(x) _finite(x)
-#elif defined(__MINGW64__)
+#elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__)
     /*
         add more compilers with C99 support here: using C99 isfinite() is
         preferable to using BSD-ish finite()
      */
-    #define wxFinite(x) isfinite(x)
+    #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
+        // these <cmath> headers #undef isfinite
+        #define wxFinite(x) std::isfinite(x)
+    #else
+        #define wxFinite(x) isfinite(x)
+    #endif
 #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
-      defined(__HPUX__)||defined(__MWERKS__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
+      defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
 #ifdef __SOLARIS__
 #include <ieeefp.h>
 #endif
@@ -79,52 +87,52 @@
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
-      defined(__HPUX__)||defined(__MWERKS__)
+      defined(__HPUX__)
     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))
 #endif
 
-#ifdef __cplusplus
+#ifdef __INTELC__
 
-    #ifdef __INTELC__
-
-        inline bool wxIsSameDouble(double x, double y)
-        {
-            // VZ: this warning, given for operators==() and !=() is not wrong, as ==
-            //     shouldn't be used with doubles, but we get too many of them and
-            //     removing these operators is probably not a good idea
-            //
-            //     Maybe we should always compare doubles up to some "epsilon" precision
-            #pragma warning(push)
-
-            // floating-point equality and inequality comparisons are unreliable
-            #pragma warning(disable: 1572)
-
-            return x == y;
-
-            #pragma warning(pop)
-        }
-
-    #else /* !__INTELC__ */
-
-        inline bool wxIsSameDouble(double x, double y) { return x == y; }
-
-    #endif /* __INTELC__/!__INTELC__ */
-
-    inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
-
-    inline int wxRound(double x)
+    inline bool wxIsSameDouble(double x, double y)
     {
-        wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
-                      wxT("argument out of supported range") );
+        // VZ: this warning, given for operators==() and !=() is not wrong, as ==
+        //     shouldn't be used with doubles, but we get too many of them and
+        //     removing these operators is probably not a good idea
+        //
+        //     Maybe we should always compare doubles up to some "epsilon" precision
+        #pragma warning(push)
 
-        #if defined(HAVE_ROUND)
-            return int(round(x));
-        #else
-            return (int)(x < 0 ? x - 0.5 : x + 0.5);
-        #endif
+        // floating-point equality and inequality comparisons are unreliable
+        #pragma warning(disable: 1572)
+
+        return x == y;
+
+        #pragma warning(pop)
     }
+
+#else /* !__INTELC__ */
+    wxGCC_WARNING_SUPPRESS(float-equal)
+    inline bool wxIsSameDouble(double x, double y) { return x == y; }
+    wxGCC_WARNING_RESTORE(float-equal)
+
+#endif /* __INTELC__/!__INTELC__ */
+
+inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
+
+inline int wxRound(double x)
+{
+    wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
+                  wxT("argument out of supported range") );
+
+    #if defined(HAVE_ROUND)
+        return int(round(x));
+    #else
+        return (int)(x < 0 ? x - 0.5 : x + 0.5);
+    #endif
+}
+
 #endif /* __cplusplus */
 
 
diff --git a/Externals/wxWidgets3/include/wx/matrix.h b/Externals/wxWidgets3/include/wx/matrix.h
index b23ff530fc..859c2a28d1 100644
--- a/Externals/wxWidgets3/include/wx/matrix.h
+++ b/Externals/wxWidgets3/include/wx/matrix.h
@@ -4,7 +4,6 @@
 // Author:       Chris Breeze, Julian Smart
 // Modified by:  Klaas Holwerda
 // Created:      01/02/97
-// RCS-ID:       $Id: matrix.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:    (c) Julian Smart, Chris Breeze
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/mdi.h b/Externals/wxWidgets3/include/wx/mdi.h
index df6283eb2a..837c132822 100644
--- a/Externals/wxWidgets3/include/wx/mdi.h
+++ b/Externals/wxWidgets3/include/wx/mdi.h
@@ -5,7 +5,6 @@
 //              Vadim Zeitlin (base MDI classes refactoring)
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2008 Vadim Zeitlin
-// RCS-ID:      $Id: mdi.h 70790 2012-03-04 00:29:03Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -123,6 +122,10 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
 protected:
+    // Override to pass menu/toolbar events to the active child first.
+    virtual bool TryBefore(wxEvent& event);
+
+
     // This is wxMDIClientWindow for all the native implementations but not for
     // the generic MDI version which has its own wxGenericMDIClientWindow and
     // so we store it as just a base class pointer because we don't need its
@@ -369,6 +372,31 @@ inline wxMDIClientWindow *wxMDIParentFrameBase::OnCreateClient()
     return new wxMDIClientWindow;
 }
 
+inline bool wxMDIParentFrameBase::TryBefore(wxEvent& event)
+{
+    // Menu (and toolbar) events should be sent to the active child frame
+    // first, if any.
+    if ( event.GetEventType() == wxEVT_MENU ||
+            event.GetEventType() == wxEVT_UPDATE_UI )
+    {
+        wxMDIChildFrame * const child = GetActiveChild();
+        if ( child )
+        {
+            // However avoid sending the event back to the child if it's
+            // currently being propagated to us from it.
+            wxWindow* const
+                from = static_cast<wxWindow*>(event.GetPropagatedFrom());
+            if ( !from || !from->IsDescendant(child) )
+            {
+                if ( child->ProcessWindowEventLocally(event) )
+                    return true;
+            }
+        }
+    }
+
+    return wxFrame::TryBefore(event);
+}
+
 #endif // wxUSE_MDI
 
 #endif // _WX_MDI_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/mediactrl.h b/Externals/wxWidgets3/include/wx/mediactrl.h
index 2757cf7641..4d0fd7b0f1 100644
--- a/Externals/wxWidgets3/include/wx/mediactrl.h
+++ b/Externals/wxWidgets3/include/wx/mediactrl.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -242,7 +241,7 @@ protected:
 // for wxMediaCtrl.  Backends are searched alphabetically -
 // the one with the earliest letter is tried first.
 //
-// Note that this is currently not API or ABI compatable -
+// Note that this is currently not API or ABI compatible -
 // so statically link or make the client compile on-site.
 //
 // ----------------------------------------------------------------------------
@@ -392,7 +391,7 @@ protected:
 };
 
 // ----------------------------------------------------------------------------
-// End compilation gaurd
+// End compilation guard
 // ----------------------------------------------------------------------------
 #endif // wxUSE_MEDIACTRL
 
diff --git a/Externals/wxWidgets3/include/wx/memconf.h b/Externals/wxWidgets3/include/wx/memconf.h
index 392abba040..3dbec634e1 100644
--- a/Externals/wxWidgets3/include/wx/memconf.h
+++ b/Externals/wxWidgets3/include/wx/memconf.h
@@ -6,7 +6,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.01.00
-// RCS-ID:      $Id: memconf.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/memory.h b/Externals/wxWidgets3/include/wx/memory.h
index 17f1149b7b..834ae4efd6 100644
--- a/Externals/wxWidgets3/include/wx/memory.h
+++ b/Externals/wxWidgets3/include/wx/memory.h
@@ -4,7 +4,6 @@
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: memory.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,14 +42,14 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
 
 #if defined(__SUNCC__)
     #define wxUSE_ARRAY_MEMORY_OPERATORS 0
-#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
     #define wxUSE_ARRAY_MEMORY_OPERATORS 1
 #elif defined (__SGI_CC_)
     // only supported by -n32 compilers
     #ifndef __EDG_ABI_COMPATIBILITY_VERSION
         #define wxUSE_ARRAY_MEMORY_OPERATORS 0
     #endif
-#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
     #define wxUSE_ARRAY_MEMORY_OPERATORS 1
 #else
     // ::operator new[] is a recent C++ feature, so assume it's not supported
@@ -110,8 +109,8 @@ void operator delete[] (void * buf);
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 #endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
 
-// VC++ 6.0 and MWERKS
-#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
+// VC++ 6.0
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) )
 inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
     wxDebugFree(pData, false);
diff --git a/Externals/wxWidgets3/include/wx/menu.h b/Externals/wxWidgets3/include/wx/menu.h
index 552ca8b286..e4dedcf2dd 100644
--- a/Externals/wxWidgets3/include/wx/menu.h
+++ b/Externals/wxWidgets3/include/wx/menu.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.10.99
-// RCS-ID:      $Id: menu.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/menuitem.h b/Externals/wxWidgets3/include/wx/menuitem.h
index 3c0fdfc41b..4eb80b7b5b 100644
--- a/Externals/wxWidgets3/include/wx/menuitem.h
+++ b/Externals/wxWidgets3/include/wx/menuitem.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.10.99
-// RCS-ID:      $Id: menuitem.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -82,7 +81,13 @@ public:
     void SetKind(wxItemKind kind) { m_kind = kind; }
     bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; }
 
-    virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
+    bool IsCheck() const { return m_kind == wxITEM_CHECK; }
+    bool IsRadio() const { return m_kind == wxITEM_RADIO; }
+
+    virtual void SetCheckable(bool checkable)
+        { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
+
+    // Notice that this doesn't quite match SetCheckable().
     bool IsCheckable() const
         { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
 
diff --git a/Externals/wxWidgets3/include/wx/meta/convertible.h b/Externals/wxWidgets3/include/wx/meta/convertible.h
index 84dba133c5..4599937821 100644
--- a/Externals/wxWidgets3/include/wx/meta/convertible.h
+++ b/Externals/wxWidgets3/include/wx/meta/convertible.h
@@ -3,7 +3,6 @@
 // Purpose:     Test if types are convertible
 // Author:      Arne Steinarson
 // Created:     2008-01-10
-// RCS-ID:      $Id: convertible.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2008 Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/if.h b/Externals/wxWidgets3/include/wx/meta/if.h
index 02df945708..f6f3672fc7 100644
--- a/Externals/wxWidgets3/include/wx/meta/if.h
+++ b/Externals/wxWidgets3/include/wx/meta/if.h
@@ -3,7 +3,6 @@
 // Purpose:     declares wxIf<> metaprogramming construct
 // Author:      Vaclav Slavik
 // Created:     2008-01-22
-// RCS-ID:      $Id: if.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2008 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/implicitconversion.h b/Externals/wxWidgets3/include/wx/meta/implicitconversion.h
index 2057ec89c4..d596a6b248 100644
--- a/Externals/wxWidgets3/include/wx/meta/implicitconversion.h
+++ b/Externals/wxWidgets3/include/wx/meta/implicitconversion.h
@@ -3,7 +3,6 @@
 // Purpose:     Determine resulting type from implicit conversion
 // Author:      Vaclav Slavik
 // Created:     2010-10-22
-// RCS-ID:      $Id: implicitconversion.h 66054 2010-11-07 13:16:20Z VZ $
 // Copyright:   (c) 2010 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/int2type.h b/Externals/wxWidgets3/include/wx/meta/int2type.h
index 53a1c4ea0a..7b8d5dc02c 100644
--- a/Externals/wxWidgets3/include/wx/meta/int2type.h
+++ b/Externals/wxWidgets3/include/wx/meta/int2type.h
@@ -3,7 +3,6 @@
 // Purpose:     Generate a unique type from a constant integer
 // Author:      Arne Steinarson
 // Created:     2008-01-10
-// RCS-ID:      $Id: int2type.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2008 Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/movable.h b/Externals/wxWidgets3/include/wx/meta/movable.h
index 0217a121c7..e3a9f9e96c 100644
--- a/Externals/wxWidgets3/include/wx/meta/movable.h
+++ b/Externals/wxWidgets3/include/wx/meta/movable.h
@@ -3,7 +3,6 @@
 // Purpose:     Test if a type is movable using memmove() etc.
 // Author:      Vaclav Slavik
 // Created:     2008-01-21
-// RCS-ID:      $Id: movable.h 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 2008 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/pod.h b/Externals/wxWidgets3/include/wx/meta/pod.h
index ad9b42de14..b9dde13d65 100644
--- a/Externals/wxWidgets3/include/wx/meta/pod.h
+++ b/Externals/wxWidgets3/include/wx/meta/pod.h
@@ -3,7 +3,6 @@
 // Purpose:     Test if a type is POD
 // Author:      Vaclav Slavik, Jaakko Salli
 // Created:     2010-06-14
-// RCS-ID:      $Id: pod.h 64589 2010-06-14 15:12:37Z JMS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/meta/removeref.h b/Externals/wxWidgets3/include/wx/meta/removeref.h
new file mode 100644
index 0000000000..e199d033f7
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/meta/removeref.h
@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/meta/removeref.h
+// Purpose:     Allows to remove a reference from a type.
+// Author:      Vadim Zeitlin
+// Created:     2012-10-21
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_META_REMOVEREF_H_
+#define _WX_META_REMOVEREF_H_
+
+// wxRemoveRef<> is similar to C++11 std::remove_reference<> but works with all
+// compilers (but, to compensate for this, doesn't work with rvalue references).
+
+// Except that it doesn't work with VC++ 6 as there doesn't seem to be any way
+// to partially specialize a template for references with it.
+#ifndef __VISUALC6__
+
+template <typename T>
+struct wxRemoveRef
+{
+    typedef T type;
+};
+
+template <typename T>
+struct wxRemoveRef<T&>
+{
+    typedef T type;
+};
+
+#define wxHAS_REMOVEREF
+
+#endif // !__VISUALC6__
+
+#endif // _WX_META_REMOVEREF_H_
diff --git a/Externals/wxWidgets3/include/wx/metafile.h b/Externals/wxWidgets3/include/wx/metafile.h
index feaac82e7f..c34d8acef3 100644
--- a/Externals/wxWidgets3/include/wx/metafile.h
+++ b/Externals/wxWidgets3/include/wx/metafile.h
@@ -4,7 +4,6 @@
 // Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id: metafile.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/mimetype.h b/Externals/wxWidgets3/include/wx/mimetype.h
index a7933cd989..b3ae6b77b0 100644
--- a/Externals/wxWidgets3/include/wx/mimetype.h
+++ b/Externals/wxWidgets3/include/wx/mimetype.h
@@ -5,7 +5,6 @@
 // Modified by:
 //  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
 // Created:     23.09.98
-// RCS-ID:      $Id: mimetype.h 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/minifram.h b/Externals/wxWidgets3/include/wx/minifram.h
index 8907b69ba4..f769c5a691 100644
--- a/Externals/wxWidgets3/include/wx/minifram.h
+++ b/Externals/wxWidgets3/include/wx/minifram.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: minifram.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/modalhook.h b/Externals/wxWidgets3/include/wx/modalhook.h
new file mode 100644
index 0000000000..55341f9bd9
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/modalhook.h
@@ -0,0 +1,104 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/modalhook.h
+// Purpose:     Allows to hook into showing modal dialogs.
+// Author:      Vadim Zeitlin
+// Created:     2013-05-19
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MODALHOOK_H_
+#define _WX_MODALHOOK_H_
+
+#include "wx/vector.h"
+
+class WXDLLIMPEXP_FWD_CORE wxDialog;
+
+// ----------------------------------------------------------------------------
+// Class allowing to be notified about any modal dialog calls.
+// ----------------------------------------------------------------------------
+
+// To be notified about entering and exiting modal dialogs and possibly to
+// replace them with something else (e.g. just return a predefined value for
+// testing), define an object of this class, override its Enter() and
+// possibly Exit() methods and call Register() on it.
+class WXDLLIMPEXP_CORE wxModalDialogHook
+{
+public:
+    // Default ctor doesn't do anything, call Register() to activate the hook.
+    wxModalDialogHook() { }
+
+    // Dtor unregisters the hook if it had been registered.
+    virtual ~wxModalDialogHook() { DoUnregister(); }
+
+    // Register this hook as being active, i.e. its Enter() and Exit() methods
+    // will be called.
+    //
+    // Notice that the order of registration matters: the last hook registered
+    // is called first, and if its Enter() returns something != wxID_NONE, the
+    // subsequent hooks are skipped.
+    void Register();
+
+    // Unregister this hook. Notice that is done automatically from the dtor.
+    void Unregister();
+
+    // Called from wxWidgets code before showing any modal dialogs and calls
+    // Enter() for every registered hook.
+    static int CallEnter(wxDialog* dialog);
+
+    // Called from wxWidgets code after dismissing the dialog and calls Exit()
+    // for every registered hook.
+    static void CallExit(wxDialog* dialog);
+
+protected:
+    // Called by wxWidgets before showing any modal dialogs, override this to
+    // be notified about this and return anything but wxID_NONE to skip showing
+    // the modal dialog entirely and just return the specified result.
+    virtual int Enter(wxDialog* dialog) = 0;
+
+    // Called by wxWidgets after dismissing the modal dialog. Notice that it
+    // won't be called if Enter() hadn't been.
+    virtual void Exit(wxDialog* WXUNUSED(dialog)) { }
+
+private:
+    // Unregister the given hook, return true if it was done or false if the
+    // hook wasn't found.
+    bool DoUnregister();
+
+    // All the hooks in reverse registration order (i.e. in call order).
+    typedef wxVector<wxModalDialogHook*> Hooks;
+    static Hooks ms_hooks;
+
+    wxDECLARE_NO_COPY_CLASS(wxModalDialogHook);
+};
+
+// Helper object used by WX_MODAL_DIALOG_HOOK below to ensure that CallExit()
+// is called on scope exit.
+class wxModalDialogHookExitGuard
+{
+public:
+    wxEXPLICIT wxModalDialogHookExitGuard(wxDialog* dialog)
+        : m_dialog(dialog)
+    {
+    }
+
+    ~wxModalDialogHookExitGuard()
+    {
+        wxModalDialogHook::CallExit(m_dialog);
+    }
+
+private:
+    wxDialog* const m_dialog;
+
+    wxDECLARE_NO_COPY_CLASS(wxModalDialogHookExitGuard);
+};
+
+// This macro needs to be used at the top of every implementation of
+// ShowModal() in order for wxModalDialogHook to work.
+#define WX_HOOK_MODAL_DIALOG()                                                \
+    const int modalDialogHookRC = wxModalDialogHook::CallEnter(this);         \
+    if ( modalDialogHookRC != wxID_NONE )                                     \
+        return modalDialogHookRC;                                             \
+    wxModalDialogHookExitGuard modalDialogHookExit(this)
+
+#endif // _WX_MODALHOOK_H_
diff --git a/Externals/wxWidgets3/include/wx/module.h b/Externals/wxWidgets3/include/wx/module.h
index 7076830254..96600b76ca 100644
--- a/Externals/wxWidgets3/include/wx/module.h
+++ b/Externals/wxWidgets3/include/wx/module.h
@@ -4,7 +4,6 @@
 // Author:      Wolfram Gloger/adapted by Guilhem Lavaux
 // Modified by:
 // Created:     04/11/98
-// RCS-ID:      $Id: module.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/mousemanager.h b/Externals/wxWidgets3/include/wx/mousemanager.h
index e9f88713a7..caa2abeaec 100644
--- a/Externals/wxWidgets3/include/wx/mousemanager.h
+++ b/Externals/wxWidgets3/include/wx/mousemanager.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMouseEventsManager class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-04-20
-// RCS-ID:      $Id: mousemanager.h 60839 2009-05-31 14:43:01Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/mousestate.h b/Externals/wxWidgets3/include/wx/mousestate.h
index 334b13fb15..2ea1cc5bf1 100644
--- a/Externals/wxWidgets3/include/wx/mousestate.h
+++ b/Externals/wxWidgets3/include/wx/mousestate.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxMouseState class
 // Author:      Vadim Zeitlin
 // Created:     2008-09-19 (extracted from wx/utils.h)
-// RCS-ID:      $Id: mousestate.h 70098 2011-12-23 05:59:59Z PC $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -100,13 +99,11 @@ public:
 
             case wxMOUSE_BTN_NONE:
             case wxMOUSE_BTN_MAX:
-                wxFAIL_MSG(wxS("invalid parameter"));
-                return false;
-
-            default:
-                wxFAIL_MSG(wxS("unknown parameter"));
-                return false;
+                break;
         }
+
+        wxFAIL_MSG(wxS("invalid parameter"));
+        return false;
     }
 
 
diff --git a/Externals/wxWidgets3/include/wx/msgdlg.h b/Externals/wxWidgets3/include/wx/msgdlg.h
index 6da9e0cd7f..8a234ac48f 100644
--- a/Externals/wxWidgets3/include/wx/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/msgdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: msgdlg.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -125,8 +124,12 @@ public:
         wxASSERT_MSG( !(style & wxYES) || !(style & wxOK),
                       "wxOK and wxYES/wxNO can't be used together" );
 
-        wxASSERT_MSG( (style & wxYES) || (style & wxOK),
-                      "one of wxOK and wxYES/wxNO must be used" );
+        // It is common to specify just the icon, without wxOK, in the existing
+        // code, especially one written by Windows programmers as MB_OK is 0
+        // and so they're used to omitting wxOK. Don't complain about it but
+        // just add wxOK implicitly for compatibility.
+        if ( !(style & wxYES) && !(style & wxOK) )
+            style |= wxOK;
 
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
                       "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
@@ -205,8 +208,9 @@ public:
         { return m_help.empty() ? GetDefaultHelpLabel() : m_help; }
 
     // based on message dialog style, returns exactly one of: wxICON_NONE,
-    // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION
-    long GetEffectiveIcon() const
+    // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION,
+    // wxICON_AUTH_NEEDED
+    virtual long GetEffectiveIcon() const
     {
         if ( m_dialogStyle & wxICON_NONE )
             return wxICON_NONE;
diff --git a/Externals/wxWidgets3/include/wx/msgout.h b/Externals/wxWidgets3/include/wx/msgout.h
index aca920bd0d..63b39b92c2 100644
--- a/Externals/wxWidgets3/include/wx/msgout.h
+++ b/Externals/wxWidgets3/include/wx/msgout.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
-// RCS-ID:      $Id: msgout.h 61459 2009-07-18 23:22:51Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msgqueue.h b/Externals/wxWidgets3/include/wx/msgqueue.h
index 479de02b20..8b8da87d18 100644
--- a/Externals/wxWidgets3/include/wx/msgqueue.h
+++ b/Externals/wxWidgets3/include/wx/msgqueue.h
@@ -3,7 +3,6 @@
 // Purpose:     Message queues for inter-thread communication
 // Author:      Evgeniy Tarassov
 // Created:     2007-10-31
-// RCS-ID:      $Id: msgqueue.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (C) 2007 TT-Solutions SARL
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/mstream.h b/Externals/wxWidgets3/include/wx/mstream.h
index 7755376691..435aebdfb8 100644
--- a/Externals/wxWidgets3/include/wx/mstream.h
+++ b/Externals/wxWidgets3/include/wx/mstream.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id: mstream.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/accel.h b/Externals/wxWidgets3/include/wx/msw/accel.h
index b4dece3ddf..182662c209 100644
--- a/Externals/wxWidgets3/include/wx/msw/accel.h
+++ b/Externals/wxWidgets3/include/wx/msw/accel.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     31/7/98
-// RCS-ID:      $Id: accel.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/anybutton.h b/Externals/wxWidgets3/include/wx/msw/anybutton.h
index cda386e798..e8226d51c3 100644
--- a/Externals/wxWidgets3/include/wx/msw/anybutton.h
+++ b/Externals/wxWidgets3/include/wx/msw/anybutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton class
 // Author:      Julian Smart
 // Created:     1997-02-01 (extracted from button.h)
-// RCS-ID:      $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/app.h b/Externals/wxWidgets3/include/wx/msw/app.h
index 9020ffd48c..fa108cc125 100644
--- a/Externals/wxWidgets3/include/wx/msw/app.h
+++ b/Externals/wxWidgets3/include/wx/msw/app.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: app.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +29,7 @@ public:
     virtual ~wxApp();
 
     // override base class (pure) virtuals
-    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual bool Initialize(int& _argc, wxChar **_argv);
     virtual void CleanUp();
 
     virtual void WakeUpIdle();
@@ -126,81 +125,5 @@ inline int wxApp::GetShell32Version()
 
 #endif // __WXWINCE__
 
-// ----------------------------------------------------------------------------
-// MSW-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition
-// ----------------------------------------------------------------------------
-
-// we need HINSTANCE declaration to define WinMain()
-#include "wx/msw/wrapwin.h"
-
-#ifndef SW_SHOWNORMAL
-    #define SW_SHOWNORMAL 1
-#endif
-
-// WinMain() is always ANSI, even in Unicode build, under normal Windows
-// but is always Unicode under CE
-#ifdef __WXWINCE__
-    typedef wchar_t *wxCmdLineArgType;
-#else
-    typedef char *wxCmdLineArgType;
-#endif
-
-// wxMSW-only overloads of wxEntry() and wxEntryStart() which take the
-// parameters passed to WinMain() instead of those passed to main()
-extern WXDLLIMPEXP_CORE bool
-    wxEntryStart(HINSTANCE hInstance,
-                HINSTANCE hPrevInstance = NULL,
-                wxCmdLineArgType pCmdLine = NULL,
-                int nCmdShow = SW_SHOWNORMAL);
-
-extern WXDLLIMPEXP_CORE int
-    wxEntry(HINSTANCE hInstance,
-            HINSTANCE hPrevInstance = NULL,
-            wxCmdLineArgType pCmdLine = NULL,
-            int nCmdShow = SW_SHOWNORMAL);
-
-#if defined(__BORLANDC__) && wxUSE_UNICODE
-    // Borland C++ has the following nonstandard behaviour: when the -WU
-    // command line flag is used, the linker expects to find wWinMain instead
-    // of WinMain. This flag causes the compiler to define _UNICODE and
-    // UNICODE symbols and there's no way to detect its use, so we have to
-    // define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works
-    // for both code compiled with and without -WU.
-    // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
-    // for more details.
-    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                      \
-        extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
-                                      HINSTANCE hPrevInstance,              \
-                                      wchar_t * WXUNUSED(lpCmdLine),        \
-                                      int nCmdShow)                         \
-        {                                                                   \
-            wxDISABLE_DEBUG_SUPPORT();                                      \
-                                                                            \
-            /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
-            /*     wchar_t*, but fortunately it's not used anywhere    */   \
-            /*     and we can simply pass NULL in:                     */   \
-            return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
-        }
-#else
-    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
-#endif // defined(__BORLANDC__) && wxUSE_UNICODE
-
-#define wxIMPLEMENT_WXWIN_MAIN                                              \
-    extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
-                                  HINSTANCE hPrevInstance,                  \
-                                  wxCmdLineArgType WXUNUSED(lpCmdLine),     \
-                                  int nCmdShow)                             \
-    {                                                                       \
-        wxDISABLE_DEBUG_SUPPORT();                                          \
-                                                                            \
-        /* NB: We pass NULL in place of lpCmdLine to behave the same as  */ \
-        /*     Borland-specific wWinMain() above. If it becomes needed   */ \
-        /*     to pass lpCmdLine to wxEntry() here, you'll have to fix   */ \
-        /*     wWinMain() above too.                                     */ \
-        return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
-    }                                                                       \
-    wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
-
-
 #endif // _WX_APP_H_
 
diff --git a/Externals/wxWidgets3/include/wx/msw/apptbase.h b/Externals/wxWidgets3/include/wx/msw/apptbase.h
index 42548e4369..65a1b5bff3 100644
--- a/Externals/wxWidgets3/include/wx/msw/apptbase.h
+++ b/Externals/wxWidgets3/include/wx/msw/apptbase.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id: apptbase.h 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/apptrait.h b/Externals/wxWidgets3/include/wx/msw/apptrait.h
index 2ef84e7cc1..f190da6dab 100644
--- a/Externals/wxWidgets3/include/wx/msw/apptrait.h
+++ b/Externals/wxWidgets3/include/wx/msw/apptrait.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id: apptrait.h 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,8 @@ public:
 
 #if wxUSE_GUI
 
+#if defined(__WXMSW__)
+
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
@@ -58,6 +59,38 @@ public:
 #endif // !__WXWINCE__
 };
 
+#elif defined(__WXGTK__)
+
+class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
+{
+public:
+    virtual wxEventLoopBase *CreateEventLoop();
+    virtual void *BeforeChildWaitLoop() { return NULL; }
+    virtual void AfterChildWaitLoop(void *WXUNUSED(data)) { }
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
+
+#if wxUSE_THREADS && defined(__WXGTK20__)
+    virtual void MutexGuiEnter();
+    virtual void MutexGuiLeave();
+#endif
+
+#if wxUSE_THREADS
+    virtual bool DoMessageFromThreadWait() { return true; }
+    virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
+        { return DoSimpleWaitForThread(hThread); }
+#endif // wxUSE_THREADS
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
+
+#ifndef __WXWINCE__
+    virtual bool CanUseStderr() { return false; }
+    virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; }
+#endif // !__WXWINCE__
+};
+
+#endif
+
 #endif // wxUSE_GUI
 
 #endif // _WX_MSW_APPTRAIT_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/bitmap.h b/Externals/wxWidgets3/include/wx/msw/bitmap.h
index 37cd4dabdb..ef07317b1d 100644
--- a/Externals/wxWidgets3/include/wx/msw/bitmap.h
+++ b/Externals/wxWidgets3/include/wx/msw/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: bitmap.h 66086 2010-11-10 13:51:51Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,7 @@
 #define _WX_BITMAP_H_
 
 #include "wx/msw/gdiimage.h"
+#include "wx/math.h"
 #include "wx/palette.h"
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
@@ -43,7 +43,8 @@ enum wxBitmapTransparency
 // NOTE: for wxMSW we don't use the wxBitmapBase base class declared in bitmap.h!
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
+class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage,
+                                  public wxBitmapHelpers
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
@@ -143,6 +144,9 @@ public:
 
     virtual bool Create(int width, int height, const wxDC& dc);
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
+    virtual bool CreateScaled(int w, int h, int d, double logicalScale)
+        { return Create(wxRound(w*logicalScale), wxRound(h*logicalScale), d); }
+
     virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
     virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
 
@@ -159,7 +163,6 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
-    wxBitmap GetMaskBitmap() const;
     void SetMask(wxMask *mask);
 
     // these functions are internal and shouldn't be used, they risk to
@@ -167,6 +170,13 @@ public:
     bool HasAlpha() const;
     void UseAlpha();
 
+    // support for scaled bitmaps
+    virtual double GetScaleFactor() const { return 1.0; }
+    virtual double GetScaledWidth() const { return GetWidth() / GetScaleFactor(); }
+    virtual double GetScaledHeight() const { return GetHeight() / GetScaleFactor(); }
+    virtual wxSize GetScaledSize() const
+        { return wxSize(wxRound(GetScaledWidth()), wxRound(GetScaledHeight())); }
+
     // implementation only from now on
     // -------------------------------
 
@@ -237,6 +247,8 @@ public:
     bool Create(const wxBitmap& bitmap, int paletteIndex);
     bool Create(const wxBitmap& bitmap);
 
+    wxBitmap GetBitmap() const;
+
     // Implementation
     WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
     void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
diff --git a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h b/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h
index 894260f4a0..e435673c2b 100644
--- a/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h
+++ b/Externals/wxWidgets3/include/wx/msw/bmpbuttn.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: bmpbuttn.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/bmpcbox.h b/Externals/wxWidgets3/include/wx/msw/bmpcbox.h
index 33a7eb1bef..0462c46217 100644
--- a/Externals/wxWidgets3/include/wx/msw/bmpcbox.h
+++ b/Externals/wxWidgets3/include/wx/msw/bmpcbox.h
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-04-06
-// RCS-ID:      $Id: bmpcbox.h 65091 2010-07-25 07:39:17Z JMS $
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/brush.h b/Externals/wxWidgets3/include/wx/msw/brush.h
index 21b8ce5fce..9665fd1133 100644
--- a/Externals/wxWidgets3/include/wx/msw/brush.h
+++ b/Externals/wxWidgets3/include/wx/msw/brush.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: brush.h 54273 2008-06-17 17:28:26Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/button.h b/Externals/wxWidgets3/include/wx/msw/button.h
index ac3545b6eb..26979a8939 100644
--- a/Externals/wxWidgets3/include/wx/msw/button.h
+++ b/Externals/wxWidgets3/include/wx/msw/button.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: button.h 69984 2011-12-11 17:03:56Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/calctrl.h b/Externals/wxWidgets3/include/wx/msw/calctrl.h
index e4a4932659..c5c51d9fde 100644
--- a/Externals/wxWidgets3/include/wx/msw/calctrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/calctrl.h
@@ -2,7 +2,6 @@
 // Name:        wx/msw/calctrl.h
 // Purpose:     wxCalendarCtrl control implementation for MSW
 // Author:      Vadim Zeitlin
-// RCS-ID:      $Id: calctrl.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (C) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/caret.h b/Externals/wxWidgets3/include/wx/msw/caret.h
index ed0e6cacaa..c179032d08 100644
--- a/Externals/wxWidgets3/include/wx/msw/caret.h
+++ b/Externals/wxWidgets3/include/wx/msw/caret.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id: caret.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/checkbox.h b/Externals/wxWidgets3/include/wx/msw/checkbox.h
index 9eebea0ae5..c1f0eff868 100644
--- a/Externals/wxWidgets3/include/wx/msw/checkbox.h
+++ b/Externals/wxWidgets3/include/wx/msw/checkbox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: checkbox.h 54008 2008-06-07 01:54:44Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -52,15 +51,18 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
+    // make the checkbox owner drawn or reset it to normal style
+    void MSWMakeOwnerDrawn(bool ownerDrawn);
+
+    // implementation only from now on
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;
 
     virtual void DoSet3StateValue(wxCheckBoxState value);
     virtual wxCheckBoxState DoGet3StateValue() const;
 
-    // make the checkbox owner drawn or reset it to normal style
-    void MakeOwnerDrawn(bool ownerDrawn);
-
     // return true if this checkbox is owner drawn
     bool IsOwnerDrawn() const;
 
diff --git a/Externals/wxWidgets3/include/wx/msw/checklst.h b/Externals/wxWidgets3/include/wx/msw/checklst.h
index 4814b0cce7..21b8651ac0 100644
--- a/Externals/wxWidgets3/include/wx/msw/checklst.h
+++ b/Externals/wxWidgets3/include/wx/msw/checklst.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id: checklst.h 63226 2010-01-23 13:22:00Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -73,7 +72,7 @@ protected:
     // send an "item checked" event
     void SendEvent(unsigned int uiIndex)
     {
-        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+        wxCommandEvent event(wxEVT_CHECKLISTBOX, GetId());
         event.SetInt(uiIndex);
         event.SetEventObject(this);
         event.SetString(GetString(uiIndex));
diff --git a/Externals/wxWidgets3/include/wx/msw/chkconf.h b/Externals/wxWidgets3/include/wx/msw/chkconf.h
index 637155d5f8..367f9e411e 100644
--- a/Externals/wxWidgets3/include/wx/msw/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/msw/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Julian Smart
  * Modified by:
  * Created:     01/02/97
- * RCS-ID:      $Id: chkconf.h 69845 2011-11-27 19:52:13Z VZ $
  * Copyright:   (c) Julian Smart
  * Licence:     wxWindows licence
  */
@@ -155,12 +154,6 @@
 #    define wxUSE_STACKWALKER 0
 #endif /* compiler doesn't support SEH */
 
-/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
-#if defined(__MWERKS__)
-#    undef wxUSE_DEBUG_NEW_ALWAYS
-#    define wxUSE_DEBUG_NEW_ALWAYS      0
-#endif
-
 #if defined(__GNUWIN32__)
     /* These don't work as expected for mingw32 and cygwin32 */
 #   undef  wxUSE_MEMORY_TRACING
diff --git a/Externals/wxWidgets3/include/wx/msw/choice.h b/Externals/wxWidgets3/include/wx/msw/choice.h
index e63382568c..a6c5703efc 100644
--- a/Externals/wxWidgets3/include/wx/msw/choice.h
+++ b/Externals/wxWidgets3/include/wx/msw/choice.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     01/02/97
-// RCS-ID:      $Id: choice.h 62960 2009-12-21 15:20:37Z JMS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,6 +11,8 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
+struct tagCOMBOBOXINFO;
+
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
@@ -66,6 +67,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
+    virtual bool Show(bool show = true);
+
     virtual void SetLabel(const wxString& label);
 
     virtual unsigned int GetCount() const;
@@ -102,7 +105,8 @@ protected:
     // common part of all ctors
     void Init()
     {
-        m_lastAcceptedSelection = wxID_NONE;
+        m_lastAcceptedSelection =
+        m_pendingSelection = wxID_NONE;
         m_heightOwn = wxDefaultCoord;
     }
 
@@ -123,6 +127,10 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
+    // Show or hide the popup part of the control.
+    void MSWDoPopupOrDismiss(bool show);
 
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
@@ -131,6 +139,10 @@ protected:
     // set the height of the visible part of the control to m_heightOwn
     void MSWUpdateVisibleHeight();
 
+    // Call GetComboBoxInfo() and return false if it's not supported by this
+    // system. Notice that the caller must initialize info.cbSize.
+    bool MSWGetComboBoxInfo(tagCOMBOBOXINFO* info) const;
+
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
@@ -150,10 +162,13 @@ protected:
     virtual void MSWEndDeferWindowPos();
 #endif // wxUSE_DEFERRED_SIZING
 
-    // last "completed" selection, i.e. not the transient one while the user is
-    // browsing the popup list: this is only used when != wxID_NONE which is
-    // the case while the drop down is opened
-    int m_lastAcceptedSelection;
+    // These variables are only used while the drop down is opened.
+    //
+    // The first one contains the item that had been originally selected before
+    // the drop down was opened and the second one the item we should select
+    // when the drop down is closed again.
+    int m_lastAcceptedSelection,
+        m_pendingSelection;
 
     // the height of the control itself if it was set explicitly or
     // wxDefaultCoord if it hadn't
diff --git a/Externals/wxWidgets3/include/wx/msw/clipbrd.h b/Externals/wxWidgets3/include/wx/msw/clipbrd.h
index 729f2324fb..53e8a169f9 100644
--- a/Externals/wxWidgets3/include/wx/msw/clipbrd.h
+++ b/Externals/wxWidgets3/include/wx/msw/clipbrd.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: clipbrd.h 61485 2009-07-20 23:54:08Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/colordlg.h b/Externals/wxWidgets3/include/wx/msw/colordlg.h
index d4ff522142..76c7a37c74 100644
--- a/Externals/wxWidgets3/include/wx/msw/colordlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/colordlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colordlg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/colour.h b/Externals/wxWidgets3/include/wx/msw/colour.h
index ec68a14c98..4b359fb370 100644
--- a/Externals/wxWidgets3/include/wx/msw/colour.h
+++ b/Externals/wxWidgets3/include/wx/msw/colour.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colour.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/combo.h b/Externals/wxWidgets3/include/wx/msw/combo.h
index 05724ea602..50dc6eba4f 100644
--- a/Externals/wxWidgets3/include/wx/msw/combo.h
+++ b/Externals/wxWidgets3/include/wx/msw/combo.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.h 67276 2011-03-22 09:56:40Z JMS $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/combobox.h b/Externals/wxWidgets3/include/wx/msw/combobox.h
index 5b7c63d67a..5fc7cc5cf1 100644
--- a/Externals/wxWidgets3/include/wx/msw/combobox.h
+++ b/Externals/wxWidgets3/include/wx/msw/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: combobox.h 68808 2011-08-21 12:06:16Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -92,6 +91,7 @@ public:
     virtual void SetSelection(long from, long to)
         { wxTextEntry::SetSelection(from, to); }
     virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual bool ContainsHWND(WXHWND hWnd) const;
     virtual void GetSelection(long *from, long *to) const;
 
     virtual bool IsEditable() const;
@@ -130,7 +130,11 @@ protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif
-    void MSWDoPopupOrDismiss(bool show);
+
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
+    // Override this one to avoid eating events from our popup listbox.
+    virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const;
 
     // this is the implementation of GetEditHWND() which can also be used when
     // we don't have the edit control, it simply returns NULL then
diff --git a/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h b/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h
index ea674840f1..bc4d4804d0 100644
--- a/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h
+++ b/Externals/wxWidgets3/include/wx/msw/commandlinkbutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxCommandLinkButton class
 // Author:      Rickard Westerlund
 // Created:     2010-06-11
-// RCS-ID:      $Id: commandlinkbutton.h 65327 2010-08-17 14:48:50Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/control.h b/Externals/wxWidgets3/include/wx/msw/control.h
index cfcf22f9fc..35bf74e9fe 100644
--- a/Externals/wxWidgets3/include/wx/msw/control.h
+++ b/Externals/wxWidgets3/include/wx/msw/control.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: control.h 62151 2009-09-26 16:43:06Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -122,6 +121,9 @@ protected:
     // one
     virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
 
+    // Look in our GetSubcontrols() for the windows with the given ID.
+    virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const;
+
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
diff --git a/Externals/wxWidgets3/include/wx/msw/crashrpt.h b/Externals/wxWidgets3/include/wx/msw/crashrpt.h
index 613b39a693..f354b482c2 100644
--- a/Externals/wxWidgets3/include/wx/msw/crashrpt.h
+++ b/Externals/wxWidgets3/include/wx/msw/crashrpt.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.2003
-// RCS-ID:      $Id: crashrpt.h 53816 2008-05-29 13:28:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ctrlsub.h b/Externals/wxWidgets3/include/wx/msw/ctrlsub.h
index a8a71384ba..068be29e58 100644
--- a/Externals/wxWidgets3/include/wx/msw/ctrlsub.h
+++ b/Externals/wxWidgets3/include/wx/msw/ctrlsub.h
@@ -3,7 +3,6 @@
 // Purpose:     common functionality of wxItemContainer-derived controls
 // Author:      Vadim Zeitlin
 // Created:     2007-07-25
-// RCS-ID:      $Id: ctrlsub.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/cursor.h b/Externals/wxWidgets3/include/wx/msw/cursor.h
index 28702c0400..aef2e2a516 100644
--- a/Externals/wxWidgets3/include/wx/msw/cursor.h
+++ b/Externals/wxWidgets3/include/wx/msw/cursor.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: cursor.h 55884 2008-09-25 17:56:07Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/custombgwin.h b/Externals/wxWidgets3/include/wx/msw/custombgwin.h
index fe5481f710..ca8d8bfc42 100644
--- a/Externals/wxWidgets3/include/wx/msw/custombgwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/custombgwin.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMSW implementation of wxCustomBackgroundWindow
 // Author:      Vadim Zeitlin
 // Created:     2011-10-10
-// RCS-ID:      $Id: custombgwin.h 69378 2011-10-11 17:07:43Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/datectrl.h b/Externals/wxWidgets3/include/wx/msw/datectrl.h
index 7015019f53..7ec52f0349 100644
--- a/Externals/wxWidgets3/include/wx/msw/datectrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/datectrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
-// RCS-ID:      $Id: datectrl.h 69222 2011-09-29 13:43:02Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,7 +54,9 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
+#if wxUSE_INTL
     virtual wxLocaleInfo MSWGetFormat() const;
+#endif // wxUSE_INTL
     virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); }
     virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/datetimectrl.h b/Externals/wxWidgets3/include/wx/msw/datetimectrl.h
index 0c783511c2..dcb4d4ee19 100644
--- a/Externals/wxWidgets3/include/wx/msw/datetimectrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/datetimectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDateTimePickerCtrl for Windows.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22 (extracted from wx/msw/datectrl.h).
-// RCS-ID:      $Id: datetimectrl.h 69489 2011-10-20 16:45:48Z VZ $
 // Copyright:   (c) 2005-2011 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -56,12 +55,14 @@ protected:
     // override these methods anyhow, it does work -- but is definitely ugly
     // and need to be changed (but how?) in the future.
 
+#if wxUSE_INTL
     // Override to return the date/time format used by this control.
     virtual wxLocaleInfo MSWGetFormat() const /* = 0 */
     {
         wxFAIL_MSG( "Unreachable" );
         return wxLOCALE_TIME_FMT;
     }
+#endif // wxUSE_INTL
 
     // Override to indicate whether we can have no date at all.
     virtual bool MSWAllowsNone() const /* = 0 */
diff --git a/Externals/wxWidgets3/include/wx/msw/dc.h b/Externals/wxWidgets3/include/wx/msw/dc.h
index 48fa925c24..8ec5a94729 100644
--- a/Externals/wxWidgets3/include/wx/msw/dc.h
+++ b/Externals/wxWidgets3/include/wx/msw/dc.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dc.h 67588 2011-04-23 16:03:10Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -126,6 +125,8 @@ public:
         m_clipX2 = 0;
     }
 
+    void* GetHandle() const { return (void*)GetHDC(); }
+    
     const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
     wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; }
 
@@ -247,12 +248,12 @@ public:
 
     virtual void DoGetSizeMM(int* width, int* height) const;
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+    virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
                                    wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
diff --git a/Externals/wxWidgets3/include/wx/msw/dcclient.h b/Externals/wxWidgets3/include/wx/msw/dcclient.h
index 22ec737e30..9399e5c4be 100644
--- a/Externals/wxWidgets3/include/wx/msw/dcclient.h
+++ b/Externals/wxWidgets3/include/wx/msw/dcclient.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcclient.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,16 +18,8 @@
 #include "wx/dc.h"
 #include "wx/msw/dc.h"
 #include "wx/dcclient.h"
-#include "wx/dynarray.h"
 
-// ----------------------------------------------------------------------------
-// array types
-// ----------------------------------------------------------------------------
-
-// this one if used by wxPaintDC only
-struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+class wxPaintDCInfo;
 
 // ----------------------------------------------------------------------------
 // DC classes
@@ -86,11 +77,13 @@ public:
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);
 
-protected:
-    static wxArrayDCInfo ms_cache;
+    // This must be called by the code handling WM_PAINT to remove the DC
+    // cached for this window for the duration of this message processing.
+    static void EndPaint(wxWindow *win);
 
-    // find the entry for this DC in the cache (keyed by the window)
-    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
+protected:
+    // Find the DC for this window in the cache, return NULL if not found.
+    static wxPaintDCInfo *FindInCache(wxWindow* win);
 
     DECLARE_CLASS(wxPaintDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
diff --git a/Externals/wxWidgets3/include/wx/msw/dcmemory.h b/Externals/wxWidgets3/include/wx/msw/dcmemory.h
index 8f5c6b39f8..59fdbc11b9 100644
--- a/Externals/wxWidgets3/include/wx/msw/dcmemory.h
+++ b/Externals/wxWidgets3/include/wx/msw/dcmemory.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcmemory.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/dcprint.h b/Externals/wxWidgets3/include/wx/msw/dcprint.h
index a6a876067d..85a60246dd 100644
--- a/Externals/wxWidgets3/include/wx/msw/dcprint.h
+++ b/Externals/wxWidgets3/include/wx/msw/dcprint.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcprint.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/dcscreen.h b/Externals/wxWidgets3/include/wx/msw/dcscreen.h
index aef59cbb0a..f85bbe2ff3 100644
--- a/Externals/wxWidgets3/include/wx/msw/dcscreen.h
+++ b/Externals/wxWidgets3/include/wx/msw/dcscreen.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcscreen.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/dde.h b/Externals/wxWidgets3/include/wx/msw/dde.h
index d3f024deee..558f66c40e 100644
--- a/Externals/wxWidgets3/include/wx/msw/dde.h
+++ b/Externals/wxWidgets3/include/wx/msw/dde.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dde.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/debughlp.h b/Externals/wxWidgets3/include/wx/msw/debughlp.h
index f5c34ec2b3..715814d0ae 100644
--- a/Externals/wxWidgets3/include/wx/msw/debughlp.h
+++ b/Externals/wxWidgets3/include/wx/msw/debughlp.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08 (extracted from msw/crashrpt.cpp)
-// RCS-ID:      $Id: debughlp.h 69845 2011-11-27 19:52:13Z VZ $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,18 +19,21 @@
 #endif // __WXWINCE__
 #include "wx/msw/private.h"
 
-// we need to determine whether we have the declarations for the function in
-// debughlp.dll version 5.81 (at least) and we check for DBHLPAPI to test this
-//
-// reasons:
-//  - VC6 version of imagehlp.h doesn't define it
-//  - VC7 one does
-//  - testing for compiler version doesn't work as you can install and use
-//    the new SDK headers with VC6
-//
-// in any case, the user may override by defining wxUSE_DBGHELP himself
+// All known versions of imagehlp.h define API_VERSION_NUMBER but it's not
+// documented, so deal with the possibility that it's not defined just in case.
+#ifndef API_VERSION_NUMBER
+    #define API_VERSION_NUMBER 0
+#endif
+
+// wxUSE_DBGHELP is a bit special as it is not defined in wx/setup.h and we try
+// to auto-detect whether we should be using debug help API or not ourselves
+// below. However if the auto-detection fails, you can always predefine it as 0
+// to avoid even trying.
 #ifndef wxUSE_DBGHELP
-    #ifdef DBHLPAPI
+    // The version of imagehlp.h from VC6 (7) is too old and is missing some
+    // required symbols while the version from VC7 (9) is good enough. As we
+    // don't know anything about version 8, don't use it unless we can test it.
+    #if API_VERSION_NUMBER >= 9
         #define wxUSE_DBGHELP 1
     #else
         #define wxUSE_DBGHELP 0
diff --git a/Externals/wxWidgets3/include/wx/msw/dialog.h b/Externals/wxWidgets3/include/wx/msw/dialog.h
index ad192925e1..5e6157426a 100644
--- a/Externals/wxWidgets3/include/wx/msw/dialog.h
+++ b/Externals/wxWidgets3/include/wx/msw/dialog.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dialog.h 70511 2012-02-05 14:18:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/dib.h b/Externals/wxWidgets3/include/wx/msw/dib.h
index f996d0de70..28663c35fa 100644
--- a/Externals/wxWidgets3/include/wx/msw/dib.h
+++ b/Externals/wxWidgets3/include/wx/msw/dib.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// RCS-ID:      $Id: dib.h 65959 2010-10-30 23:50:50Z VZ $
 // Copyright:   (c) 1997-2003 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,13 +11,16 @@
 #ifndef _WX_MSW_DIB_H_
 #define _WX_MSW_DIB_H_
 
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
 
+#ifdef __WXMSW__
+    #include "wx/bitmap.h"
+#endif // __WXMSW__
+
 // ----------------------------------------------------------------------------
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------
@@ -37,9 +39,11 @@ public:
     wxDIB(int width, int height, int depth)
         { Init(); (void)Create(width, height, depth); }
 
+#ifdef __WXMSW__
     // create a DIB from the DDB
     wxDIB(const wxBitmap& bmp)
         { Init(); (void)Create(bmp); }
+#endif // __WXMSW__
 
     // create a DIB from the Windows DDB
     wxDIB(HBITMAP hbmp)
@@ -53,7 +57,9 @@ public:
 
     // same as the corresponding ctors but with return value
     bool Create(int width, int height, int depth);
+#ifdef __WXMSW__
     bool Create(const wxBitmap& bmp) { return Create(GetHbitmapOf(bmp)); }
+#endif
     bool Create(HBITMAP hbmp);
     bool Load(const wxString& filename);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/dirdlg.h b/Externals/wxWidgets3/include/wx/msw/dirdlg.h
index 5e570c2274..b6939581ee 100644
--- a/Externals/wxWidgets3/include/wx/msw/dirdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/dirdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dirdlg.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,11 @@ public:
     virtual int ShowModal();
 
 private:
+    // The real implementations of ShowModal(), used for Windows versions
+    // before and since Vista.
+    int ShowSHBrowseForFolder(WXHWND owner);
+    int ShowIFileDialog(WXHWND owner);
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/msw/dragimag.h b/Externals/wxWidgets3/include/wx/msw/dragimag.h
index 5118833235..e08723511a 100644
--- a/Externals/wxWidgets3/include/wx/msw/dragimag.h
+++ b/Externals/wxWidgets3/include/wx/msw/dragimag.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
-// RCS-ID:      $Id: dragimag.h 70584 2012-02-15 00:35:25Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/enhmeta.h b/Externals/wxWidgets3/include/wx/msw/enhmeta.h
index e1168ec707..3951bd7f5a 100644
--- a/Externals/wxWidgets3/include/wx/msw/enhmeta.h
+++ b/Externals/wxWidgets3/include/wx/msw/enhmeta.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id: enhmeta.h 68317 2011-07-21 13:49:59Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/evtloop.h b/Externals/wxWidgets3/include/wx/msw/evtloop.h
index 2d9b2e3e12..dee2c03db3 100644
--- a/Externals/wxWidgets3/include/wx/msw/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/msw/evtloop.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/evtloop.h
-// Purpose:     wxEventLoop class for MSW
+// Purpose:     wxEventLoop class for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
-// RCS-ID:      $Id: evtloop.h 59161 2009-02-26 14:15:20Z VZ $
 // Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,36 +11,15 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
-#if wxUSE_GUI
 #include "wx/dynarray.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/window.h"
-#endif
+#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
-{
-public:
-    wxMSWEventLoopBase();
-
-    // implement base class pure virtuals
-    virtual bool Pending() const;
-
-protected:
-    // get the next message from queue and return true or return false if we
-    // got WM_QUIT or an error occurred
-    bool GetNextMessage(WXMSG *msg);
-
-    // same as above but with a timeout and return value can be -1 meaning that
-    // time out expired in addition to
-    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
-};
-
-#if wxUSE_GUI
-
 WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
@@ -93,27 +71,4 @@ private:
     static wxWindowMSW *ms_winCritical;
 };
 
-#else // !wxUSE_GUI
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
-{
-public:
-    wxConsoleEventLoop() { }
-
-    // override/implement base class virtuals
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
-
-    // MSW-specific function to process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-
 #endif // _WX_MSW_EVTLOOP_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h b/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h
new file mode 100644
index 0000000000..36da6f640a
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/evtloopconsole.h
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/evtloopconsole.h
+// Purpose:     wxConsoleEventLoop class for Windows
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2004-07-31
+// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_EVTLOOPCONSOLE_H_
+#define _WX_MSW_EVTLOOPCONSOLE_H_
+
+class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
+{
+public:
+    wxMSWEventLoopBase();
+
+    // implement base class pure virtuals
+    virtual bool Pending() const;
+
+protected:
+    // get the next message from queue and return true or return false if we
+    // got WM_QUIT or an error occurred
+    bool GetNextMessage(WXMSG *msg);
+
+    // same as above but with a timeout and return value can be -1 meaning that
+    // time out expired in addition to
+    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
+};
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
+{
+public:
+    wxConsoleEventLoop() { }
+
+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
+
+    // Windows-specific function to process a single message
+    virtual void ProcessMessage(WXMSG *msg);
+};
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // _WX_MSW_EVTLOOPCONSOLE_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h b/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h
index 7b86e7f014..af4de0d207 100644
--- a/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/fdrepdlg.h
@@ -4,7 +4,6 @@
 // Author:      Markus Greither
 // Modified by: 31.07.01: VZ: integrated into wxWidgets
 // Created:     23/03/2001
-// RCS-ID:      $Id: fdrepdlg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/filedlg.h b/Externals/wxWidgets3/include/wx/msw/filedlg.h
index 54a5c6c5c4..a1958bace7 100644
--- a/Externals/wxWidgets3/include/wx/msw/filedlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/filedlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: filedlg.h 62722 2009-11-26 16:17:00Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -44,6 +43,9 @@ public:
     // called from the hook procedure on CDN_INITDONE reception
     virtual void MSWOnInitDone(WXHWND hDlg);
 
+    // called from the hook procedure on CDN_SELCHANGE.
+    void MSWOnSelChange(WXHWND hDlg);
+
 protected:
 
 #if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
diff --git a/Externals/wxWidgets3/include/wx/msw/font.h b/Externals/wxWidgets3/include/wx/msw/font.h
index 8c29e0e6dd..275c6d9962 100644
--- a/Externals/wxWidgets3/include/wx/msw/font.h
+++ b/Externals/wxWidgets3/include/wx/msw/font.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: font.h 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,6 +23,8 @@ public:
     // ctors and such
     wxFont() { }
 
+    wxFont(const wxFontInfo& info);
+
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
@@ -91,12 +92,6 @@ public:
         Create(info, hFont);
     }
 
-    wxFont(int pointSize,
-           wxFontFamily family,
-           int flags = wxFONTFLAG_DEFAULT,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
     wxFont(const wxString& fontDesc);
 
 
diff --git a/Externals/wxWidgets3/include/wx/msw/fontdlg.h b/Externals/wxWidgets3/include/wx/msw/fontdlg.h
index 69ebb06f6d..ea7e7ef7e8 100644
--- a/Externals/wxWidgets3/include/wx/msw/fontdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/fontdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: fontdlg.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/frame.h b/Externals/wxWidgets3/include/wx/msw/frame.h
index 7483e1c992..54ad3beec4 100644
--- a/Externals/wxWidgets3/include/wx/msw/frame.h
+++ b/Externals/wxWidgets3/include/wx/msw/frame.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: frame.h 70511 2012-02-05 14:18:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,7 +76,6 @@ public:
     // event handlers
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
     // tooltip management
 #if wxUSE_TOOLTIPS
@@ -105,6 +103,9 @@ public:
     // get the currently active menu: this is the same as the frame menu for
     // normal frames but is overridden by wxMDIParentFrame
     virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
+
+    // Look up the menu in the menu bar.
+    virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
 #endif // wxUSE_MENUS
 
 protected:
@@ -131,18 +132,6 @@ protected:
     // wxMDIChildFrame
     bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg);
 
-#if wxUSE_MENUS
-    // handle WM_EXITMENULOOP message for Win95 only
-    bool HandleExitMenuLoop(WXWORD isPopup);
-
-    // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE
-    bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu);
-
-    // Command part of HandleMenuPopup() and HandleExitMenuLoop().
-    bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup);
-#endif // wxUSE_MENUS
-
-
     virtual bool IsMDIChild() const { return false; }
 
     // get default (wxWidgets) icon for the frame
diff --git a/Externals/wxWidgets3/include/wx/msw/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/fswatcher.h
index ea7ca41379..b73ee66188 100644
--- a/Externals/wxWidgets3/include/wx/msw/fswatcher.h
+++ b/Externals/wxWidgets3/include/wx/msw/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMSWFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher.h 67693 2011-05-03 23:31:39Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/gauge.h b/Externals/wxWidgets3/include/wx/msw/gauge.h
index a8632310c2..ac820e99b7 100644
--- a/Externals/wxWidgets3/include/wx/msw/gauge.h
+++ b/Externals/wxWidgets3/include/wx/msw/gauge.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/gccpriv.h b/Externals/wxWidgets3/include/wx/msw/gccpriv.h
index db4c72a84d..31453015b2 100644
--- a/Externals/wxWidgets3/include/wx/msw/gccpriv.h
+++ b/Externals/wxWidgets3/include/wx/msw/gccpriv.h
@@ -4,7 +4,6 @@
  Author:      Vadim Zeitlin
  Modified by:
  Created:
- RCS-ID:      $Id: gccpriv.h 36155 2005-11-10 16:16:05Z ABX $
  Copyright:   (c) Vadim Zeitlin
  Licence:     wxWindows Licence
 */
@@ -74,15 +73,6 @@
     #define __CYGWIN10__
 #endif
 
-/* Check for Mingw runtime version: */
-#if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
-    #define wxCHECK_MINGW32_VERSION( major, minor ) \
- ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
-      || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
-#else
-    #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
-#endif
-
 /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
    so let's define them ourselves: */
 #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \
diff --git a/Externals/wxWidgets3/include/wx/msw/gdiimage.h b/Externals/wxWidgets3/include/wx/msw/gdiimage.h
index ab5145938e..d085e50a4a 100644
--- a/Externals/wxWidgets3/include/wx/msw/gdiimage.h
+++ b/Externals/wxWidgets3/include/wx/msw/gdiimage.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id: gdiimage.h 66374 2010-12-14 18:43:49Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/genrcdefs.h b/Externals/wxWidgets3/include/wx/msw/genrcdefs.h
index ee8bb676a8..809419b3f9 100644
--- a/Externals/wxWidgets3/include/wx/msw/genrcdefs.h
+++ b/Externals/wxWidgets3/include/wx/msw/genrcdefs.h
@@ -2,7 +2,6 @@
  * Name:        wx/msw/genrcdefs.h
  * Purpose:     Emit preprocessor symbols into rcdefs.h for resource compiler
  * Author:      Mike Wetherell
- * RCS-ID:      $Id: genrcdefs.h 46936 2007-06-25 14:04:34Z VS $
  * Copyright:   (c) 2005 Mike Wetherell
  * Licence:     wxWindows licence
  */
@@ -13,10 +12,14 @@ EMIT(#ifndef _WX_RCDEFS_H)
 EMIT(#define _WX_RCDEFS_H)
 
 #ifdef _MSC_FULL_VER
-EMIT(#define WX_MSC_FULL_VER _MSC_FULL_VER)
+#if _MSC_FULL_VER < 140040130
+EMIT(#define wxUSE_RC_MANIFEST 1)
+#endif
+#else
+EMIT(#define wxUSE_RC_MANIFEST 1)
 #endif
 
-#ifdef _M_AMD64
+#if defined _M_AMD64 || defined __x86_64__
 EMIT(#define WX_CPU_AMD64)
 #endif
 
@@ -24,7 +27,7 @@ EMIT(#define WX_CPU_AMD64)
 EMIT(#define WX_CPU_ARM)
 #endif
 
-#ifdef _M_IA64
+#if defined _M_IA64 || defined __ia64__
 EMIT(#define WX_CPU_IA64)
 #endif
 
diff --git a/Externals/wxWidgets3/include/wx/msw/glcanvas.h b/Externals/wxWidgets3/include/wx/msw/glcanvas.h
index 10566677ac..52b82f42a0 100644
--- a/Externals/wxWidgets3/include/wx/msw/glcanvas.h
+++ b/Externals/wxWidgets3/include/wx/msw/glcanvas.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: glcanvas.h 54202 2008-06-14 01:44:13Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/headerctrl.h b/Externals/wxWidgets3/include/wx/msw/headerctrl.h
index 7ddf38241a..db702c5a19 100644
--- a/Externals/wxWidgets3/include/wx/msw/headerctrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/headerctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMSW native wxHeaderCtrl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-01
-// RCS-ID:      $Id: headerctrl.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +45,14 @@ public:
 
     virtual ~wxHeaderCtrl();
 
-
+    
+protected:
+    // override wxWindow methods which must be implemented by a new control
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    
 private:
     // implement base class pure virtuals
     virtual void DoSetCount(unsigned int count);
@@ -58,12 +64,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order);
     virtual wxArrayInt DoGetColumnsOrder() const;
 
-    // override wxWindow methods which must be implemented by a new control
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
     // override MSW-specific methods needed for new control
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
@@ -126,6 +126,9 @@ private:
     // the offset of the window used to emulate scrolling it
     int m_scrollOffset;
 
+    // actual column we are dragging or -1 if not dragging anything
+    int m_colBeingDragged;
+
     wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
 };
 
diff --git a/Externals/wxWidgets3/include/wx/msw/helpbest.h b/Externals/wxWidgets3/include/wx/msw/helpbest.h
index 88eba1dc3f..4deffa4adb 100644
--- a/Externals/wxWidgets3/include/wx/msw/helpbest.h
+++ b/Externals/wxWidgets3/include/wx/msw/helpbest.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     02/04/2001
-// RCS-ID:      $Id: helpbest.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/helpchm.h b/Externals/wxWidgets3/include/wx/msw/helpchm.h
index d3fdc9272b..17cda8ce00 100644
--- a/Externals/wxWidgets3/include/wx/msw/helpchm.h
+++ b/Externals/wxWidgets3/include/wx/msw/helpchm.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     16/04/2000
-// RCS-ID:      $Id: helpchm.h 67880 2011-06-07 14:28:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +62,7 @@ protected:
     // the first 2 HtmlHelp() parameters
     bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
     {
-        return CallHtmlHelp(GetParentWindow(), GetValidFilename().wx_str(),
+        return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(),
                             cmd, param);
     }
 
diff --git a/Externals/wxWidgets3/include/wx/msw/helpwin.h b/Externals/wxWidgets3/include/wx/msw/helpwin.h
index 828d2b6b4f..7cc5545435 100644
--- a/Externals/wxWidgets3/include/wx/msw/helpwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/helpwin.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: helpwin.h 67882 2011-06-07 16:48:36Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/hyperlink.h b/Externals/wxWidgets3/include/wx/msw/hyperlink.h
index a12bae3f9b..847695b273 100644
--- a/Externals/wxWidgets3/include/wx/msw/hyperlink.h
+++ b/Externals/wxWidgets3/include/wx/msw/hyperlink.h
@@ -3,7 +3,6 @@
 // Purpose:     Hyperlink control
 // Author:      Rickard Westerlund
 // Created:     2010-08-04
-// RCS-ID:      $Id: hyperlink.h 65334 2010-08-17 16:55:32Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/icon.h b/Externals/wxWidgets3/include/wx/msw/icon.h
index a94556179a..4737e449a4 100644
--- a/Externals/wxWidgets3/include/wx/msw/icon.h
+++ b/Externals/wxWidgets3/include/wx/msw/icon.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: icon.h 56644 2008-11-02 02:39:52Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,6 +64,8 @@ public:
                           wxBitmapType type = wxICON_DEFAULT_TYPE,
                           int desiredWidth = -1, int desiredHeight = -1);
 
+    bool CreateFromHICON(WXHICON icon);
+
     // implementation only from now on
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
diff --git a/Externals/wxWidgets3/include/wx/msw/imaglist.h b/Externals/wxWidgets3/include/wx/msw/imaglist.h
index e0086f91b9..3f831f1832 100644
--- a/Externals/wxWidgets3/include/wx/msw/imaglist.h
+++ b/Externals/wxWidgets3/include/wx/msw/imaglist.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: imaglist.h 59036 2009-02-19 20:26:00Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/iniconf.h b/Externals/wxWidgets3/include/wx/msw/iniconf.h
index e22bc7d38c..63ebd00141 100644
--- a/Externals/wxWidgets3/include/wx/msw/iniconf.h
+++ b/Externals/wxWidgets3/include/wx/msw/iniconf.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.07.98
-// RCS-ID:      $Id: iniconf.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/init.h b/Externals/wxWidgets3/include/wx/msw/init.h
new file mode 100644
index 0000000000..014dedbd09
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/init.h
@@ -0,0 +1,90 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/init.h
+// Purpose:     Windows-specific wxEntry() overload
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_INIT_H_
+#define _WX_MSW_INIT_H_
+
+// ----------------------------------------------------------------------------
+// Windows-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition
+// ----------------------------------------------------------------------------
+
+// we need HINSTANCE declaration to define WinMain()
+#include "wx/msw/wrapwin.h"
+
+#ifndef SW_SHOWNORMAL
+    #define SW_SHOWNORMAL 1
+#endif
+
+// WinMain() is always ANSI, even in Unicode build, under normal Windows
+// but is always Unicode under CE
+#ifdef __WXWINCE__
+    typedef wchar_t *wxCmdLineArgType;
+#else
+    typedef char *wxCmdLineArgType;
+#endif
+
+// Windows-only overloads of wxEntry() and wxEntryStart() which take the
+// parameters passed to WinMain() instead of those passed to main()
+extern WXDLLIMPEXP_CORE bool
+    wxEntryStart(HINSTANCE hInstance,
+                HINSTANCE hPrevInstance = NULL,
+                wxCmdLineArgType pCmdLine = NULL,
+                int nCmdShow = SW_SHOWNORMAL);
+
+extern WXDLLIMPEXP_CORE int
+    wxEntry(HINSTANCE hInstance,
+            HINSTANCE hPrevInstance = NULL,
+            wxCmdLineArgType pCmdLine = NULL,
+            int nCmdShow = SW_SHOWNORMAL);
+
+#if defined(__BORLANDC__) && wxUSE_UNICODE
+    // Borland C++ has the following nonstandard behaviour: when the -WU
+    // command line flag is used, the linker expects to find wWinMain instead
+    // of WinMain. This flag causes the compiler to define _UNICODE and
+    // UNICODE symbols and there's no way to detect its use, so we have to
+    // define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works
+    // for both code compiled with and without -WU.
+    // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
+    // for more details.
+    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                      \
+        extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
+                                      HINSTANCE hPrevInstance,              \
+                                      wchar_t * WXUNUSED(lpCmdLine),        \
+                                      int nCmdShow)                         \
+        {                                                                   \
+            wxDISABLE_DEBUG_SUPPORT();                                      \
+                                                                            \
+            /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
+            /*     wchar_t*, but fortunately it's not used anywhere    */   \
+            /*     and we can simply pass NULL in:                     */   \
+            return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
+        }
+#else
+    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+#endif // defined(__BORLANDC__) && wxUSE_UNICODE
+
+#define wxIMPLEMENT_WXWIN_MAIN                                              \
+    extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
+                                  HINSTANCE hPrevInstance,                  \
+                                  wxCmdLineArgType WXUNUSED(lpCmdLine),     \
+                                  int nCmdShow)                             \
+    {                                                                       \
+        wxDISABLE_DEBUG_SUPPORT();                                          \
+                                                                            \
+        /* NB: We pass NULL in place of lpCmdLine to behave the same as  */ \
+        /*     Borland-specific wWinMain() above. If it becomes needed   */ \
+        /*     to pass lpCmdLine to wxEntry() here, you'll have to fix   */ \
+        /*     wWinMain() above too.                                     */ \
+        return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
+    }                                                                       \
+    wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+
+
+#endif // _WX_MSW_INIT_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/joystick.h b/Externals/wxWidgets3/include/wx/msw/joystick.h
index eeb5d9a3d6..b3f5e57105 100644
--- a/Externals/wxWidgets3/include/wx/msw/joystick.h
+++ b/Externals/wxWidgets3/include/wx/msw/joystick.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: joystick.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/libraries.h b/Externals/wxWidgets3/include/wx/msw/libraries.h
index 09ff8996d9..86e47195d1 100644
--- a/Externals/wxWidgets3/include/wx/msw/libraries.h
+++ b/Externals/wxWidgets3/include/wx/msw/libraries.h
@@ -3,7 +3,6 @@
  * Purpose:     Pragmas for linking libs conditionally
  * Author:      Michael Wetherell
  * Modified by:
- * RCS-ID:      $Id: libraries.h 37045 2006-01-21 22:50:46Z MW $
  * Copyright:   (c) 2005 Michael Wetherell
  * Licence:     wxWindows licence
  */
diff --git a/Externals/wxWidgets3/include/wx/msw/listbox.h b/Externals/wxWidgets3/include/wx/msw/listbox.h
index 77080b3664..8d8bd01a87 100644
--- a/Externals/wxWidgets3/include/wx/msw/listbox.h
+++ b/Externals/wxWidgets3/include/wx/msw/listbox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: listbox.h 64548 2010-06-10 10:40:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -151,8 +150,6 @@ public:
 
     virtual void OnInternalIdle();
 
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
 protected:
     virtual wxSize DoGetBestClientSize() const;
 
@@ -194,10 +191,6 @@ private:
     // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
     bool m_updateHorizontalExtent;
 
-    // flag set to true when we get a keyboard event and reset to false when we
-    // get a mouse one: this is used to find the correct item for the selection
-    // event
-    bool m_selectedByKeyboard;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };
diff --git a/Externals/wxWidgets3/include/wx/msw/listctrl.h b/Externals/wxWidgets3/include/wx/msw/listctrl.h
index ff49f754bb..e3f0a7d1df 100644
--- a/Externals/wxWidgets3/include/wx/msw/listctrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/listctrl.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Created:     01/02/97
-// RCS-ID:      $Id: listctrl.h 70282 2012-01-07 15:09:43Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -384,6 +383,14 @@ protected:
     // common part of all ctors
     void Init();
 
+    // Implement constrained best size calculation.
+    virtual int DoGetBestClientHeight(int width) const
+        { return MSWGetBestViewRect(width, -1).y; }
+    virtual int DoGetBestClientWidth(int height) const
+        { return MSWGetBestViewRect(-1, height).x; }
+
+    wxSize MSWGetBestViewRect(int x, int y) const;
+
     // Implement base class pure virtual methods.
     long DoInsertColumn(long col, const wxListItem& info);
 
@@ -431,9 +438,6 @@ protected:
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 
-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-
     // return the attribute for the given item and column (may return NULL if none)
     virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
     {
diff --git a/Externals/wxWidgets3/include/wx/msw/mdi.h b/Externals/wxWidgets3/include/wx/msw/mdi.h
index 7fc574568a..a699a3125c 100644
--- a/Externals/wxWidgets3/include/wx/msw/mdi.h
+++ b/Externals/wxWidgets3/include/wx/msw/mdi.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     01/02/97
-// RCS-ID:      $Id: mdi.h 61986 2009-09-21 08:44:42Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -110,9 +109,6 @@ public:
 #endif // wxUSE_MENUS
 
 protected:
-    // override to pass menu/toolbar events to the active child first
-    virtual bool TryBefore(wxEvent& event);
-
 #if wxUSE_MENUS_NATIVE
     virtual void InternalSetMenuBar();
 #endif // wxUSE_MENUS_NATIVE
diff --git a/Externals/wxWidgets3/include/wx/msw/menu.h b/Externals/wxWidgets3/include/wx/msw/menu.h
index 53bea80f91..5f4c9f1853 100644
--- a/Externals/wxWidgets3/include/wx/msw/menu.h
+++ b/Externals/wxWidgets3/include/wx/msw/menu.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (wxMenuItem is now in separate file)
 // Created:     01/02/97
-// RCS-ID:      $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/menuitem.h b/Externals/wxWidgets3/include/wx/msw/menuitem.h
index 1ccc75bdea..d76bd11950 100644
--- a/Externals/wxWidgets3/include/wx/msw/menuitem.h
+++ b/Externals/wxWidgets3/include/wx/msw/menuitem.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id: menuitem.h 70801 2012-03-04 00:29:55Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/metafile.h b/Externals/wxWidgets3/include/wx/msw/metafile.h
index c1d022225e..8991f58c91 100644
--- a/Externals/wxWidgets3/include/wx/msw/metafile.h
+++ b/Externals/wxWidgets3/include/wx/msw/metafile.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     01/02/97
-// RCS-ID:      $Id: metafile.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/microwin.h b/Externals/wxWidgets3/include/wx/msw/microwin.h
index 29940abfaa..bb9861ab10 100644
--- a/Externals/wxWidgets3/include/wx/msw/microwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/microwin.h
@@ -4,7 +4,6 @@
 // Purpose:     Extra implementation for MicroWindows
 // Author:      Julian Smart
 // Created:     2001-05-31
-// RCS-ID:      $Id: microwin.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/mimetype.h b/Externals/wxWidgets3/include/wx/msw/mimetype.h
index d3a7bef054..90a7013b6f 100644
--- a/Externals/wxWidgets3/include/wx/msw/mimetype.h
+++ b/Externals/wxWidgets3/include/wx/msw/mimetype.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id: mimetype.h 54434 2008-06-30 11:58:41Z RR $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/minifram.h b/Externals/wxWidgets3/include/wx/msw/minifram.h
index d798228293..5e12562ebc 100644
--- a/Externals/wxWidgets3/include/wx/msw/minifram.h
+++ b/Externals/wxWidgets3/include/wx/msw/minifram.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: minifram.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/missing.h b/Externals/wxWidgets3/include/wx/msw/missing.h
index 34184c596d..e7522ee753 100644
--- a/Externals/wxWidgets3/include/wx/msw/missing.h
+++ b/Externals/wxWidgets3/include/wx/msw/missing.h
@@ -3,7 +3,6 @@
 // Purpose:     Declarations for parts of the Win32 SDK that are missing in
 //              the versions that come with some compilers
 // Created:     2002/04/23
-// RCS-ID:      $Id: missing.h 69844 2011-11-27 19:50:53Z VZ $
 // Copyright:   (c) 2002 Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,12 +76,18 @@
     #ifndef WM_MOUSEWHEEL
         #define WM_MOUSEWHEEL           0x020A
     #endif
+    #ifndef WM_MOUSEHWHEEL
+        #define WM_MOUSEHWHEEL          0x020E
+    #endif
     #ifndef WHEEL_DELTA
         #define WHEEL_DELTA             120
     #endif
     #ifndef SPI_GETWHEELSCROLLLINES
         #define SPI_GETWHEELSCROLLLINES 104
     #endif
+    #ifndef SPI_GETWHEELSCROLLCHARS
+        #define SPI_GETWHEELSCROLLCHARS 108
+    #endif
 #endif // wxUSE_MOUSEWHEEL
 
 // Needed by window.cpp
@@ -648,6 +653,10 @@ typedef struct
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 #endif
 
+#ifndef MUI_LANGUAGE_NAME
+#define MUI_LANGUAGE_NAME 0x8
+#endif
+
 //We need to check if we are using MinGW or mingw-w64 as their
 //definitions are different
 
@@ -655,7 +664,7 @@ typedef struct
 #include <_mingw.h>
 #endif
 
-#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+#ifdef __MINGW32_TOOLCHAIN__
 typedef enum CommandStateChangeConstants {
     CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
     CSC_NAVIGATEFORWARD = 0x1,
diff --git a/Externals/wxWidgets3/include/wx/msw/msgdlg.h b/Externals/wxWidgets3/include/wx/msw/msgdlg.h
index 68358de1c1..3562a362c3 100644
--- a/Externals/wxWidgets3/include/wx/msw/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/msgdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: msgdlg.h 66237 2010-11-22 12:49:07Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +26,8 @@ public:
 
     virtual int ShowModal();
 
+    virtual long GetEffectiveIcon() const;
+
     // implementation-specific
 
     // return the font used for the text in the message box
diff --git a/Externals/wxWidgets3/include/wx/msw/mslu.h b/Externals/wxWidgets3/include/wx/msw/mslu.h
index eccf13a26d..d8b9441b38 100644
--- a/Externals/wxWidgets3/include/wx/msw/mslu.h
+++ b/Externals/wxWidgets3/include/wx/msw/mslu.h
@@ -5,7 +5,6 @@
 // Modified by: Vadim Zeitlin to move out various functions to other files
 //              to fix header inter-dependencies
 // Created:     2002/02/17
-// RCS-ID:      $Id: mslu.h 42462 2006-10-26 19:06:51Z VZ $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/msvcrt.h b/Externals/wxWidgets3/include/wx/msw/msvcrt.h
index 317c41b24c..e92a88d841 100644
--- a/Externals/wxWidgets3/include/wx/msw/msvcrt.h
+++ b/Externals/wxWidgets3/include/wx/msw/msvcrt.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.1999
-// RCS-ID:      $Id: msvcrt.h 59725 2009-03-22 12:53:48Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,7 +37,12 @@
     #endif
 
     #include <stdlib.h>
-    #ifndef _CRTBLD
+
+    // Defining _CRTBLD should never be necessary at all, but keep it for now
+    // as there is no time to retest all the compilers before 3.0 release.
+    // Definitely do not use it with MSVS 2013 as defining it results in errors
+    // if the standard <assert.h> is included afterwards.
+    #if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12)
         // Needed when building with pure MS SDK
         #define _CRTBLD
     #endif
diff --git a/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h b/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h
index 789a836aea..72e3e6b072 100644
--- a/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h
+++ b/Externals/wxWidgets3/include/wx/msw/nonownedwnd.h
@@ -3,7 +3,6 @@
 // Purpose:     wxNonOwnedWindow declaration for wxMSW.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-09
-// RCS-ID:      $Id: nonownedwnd.h 69462 2011-10-18 21:56:52Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/notebook.h b/Externals/wxWidgets3/include/wx/msw/notebook.h
index bfed8f9794..ceda97127a 100644
--- a/Externals/wxWidgets3/include/wx/msw/notebook.h
+++ b/Externals/wxWidgets3/include/wx/msw/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version
-// RCS-ID:      $Id: notebook.h 69793 2011-11-22 13:18:45Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/notifmsg.h b/Externals/wxWidgets3/include/wx/msw/notifmsg.h
index f995230bd3..b7e0e0e867 100644
--- a/Externals/wxWidgets3/include/wx/msw/notifmsg.h
+++ b/Externals/wxWidgets3/include/wx/msw/notifmsg.h
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNotificationMessage for Windows
 // Author:      Vadim Zeitlin
 // Created:     2007-12-01
-// RCS-ID:      $Id: notifmsg.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,8 +22,9 @@ public:
     wxNotificationMessage() { Init(); }
     wxNotificationMessage(const wxString& title,
                           const wxString& message = wxString(),
-                          wxWindow *parent = NULL)
-        : wxNotificationMessageBase(title, message, parent)
+                          wxWindow *parent = NULL,
+                          int flags = wxICON_INFORMATION)
+        : wxNotificationMessageBase(title, message, parent, flags)
     {
         Init();
     }
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/access.h b/Externals/wxWidgets3/include/wx/msw/ole/access.h
index 0dd88bb4da..980943edb8 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/access.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/access.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
-// RCS-ID:      $Id: access.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2003 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/activex.h b/Externals/wxWidgets3/include/wx/msw/ole/activex.h
index 2acd893ace..76dca3c36e 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/activex.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/activex.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     8/18/05
-// RCS-ID:      $Id: activex.h 70361 2012-01-15 19:05:34Z SJL $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/automtn.h b/Externals/wxWidgets3/include/wx/msw/ole/automtn.h
index 3687aab7d7..1d1eb33af3 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/automtn.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/automtn.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/6/98
-// RCS-ID:      $Id: automtn.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,7 @@
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
+typedef unsigned long   WXLCID;
 
 #ifdef GetObject
 #undef GetObject
@@ -106,9 +106,32 @@ public:
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
 
-public:
+    // Returns the locale identifier used in automation calls. The default is
+    // LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the
+    // locale identifier from the one that created them.
+    WXLCID GetLCID() const;
+
+    // Sets the locale identifier to be used in automation calls performed by
+    // this object. The default is LOCALE_SYSTEM_DEFAULT.
+    void SetLCID(WXLCID lcid);
+
+    // Returns the flags used for conversions between wxVariant and OLE
+    // VARIANT, see wxOleConvertVariantFlags. The default value is
+    // wxOleConvertVariant_Default but all the objects obtained by GetObject()
+    // inherit the flags from the one that created them.
+    long GetConvertVariantFlags() const;
+
+    // Sets the flags used for conversions between wxVariant and OLE VARIANT,
+    // see wxOleConvertVariantFlags (default is wxOleConvertVariant_Default.
+    void SetConvertVariantFlags(long flags);
+
+public: // public for compatibility only, don't use m_dispatchPtr directly.
     WXIDISPATCH*  m_dispatchPtr;
 
+private:
+    WXLCID m_lcid;
+    long   m_convertVariantFlags;
+
     wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };
 
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataform.h b/Externals/wxWidgets3/include/wx/msw/ole/dataform.h
index 45e0e5e6d0..26959099f7 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/dataform.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/dataform.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.10.99 (extracted from msw/ole/dataobj.h)
-// RCS-ID:      $Id: dataform.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -40,14 +39,10 @@ public:
     // default copy ctor/assignment operators ok
 
     // comparison (must have both versions)
-    bool operator==(wxDataFormatId format) const
-        { return m_format == (NativeFormat)format; }
-    bool operator!=(wxDataFormatId format) const
-        { return m_format != (NativeFormat)format; }
-    bool operator==(const wxDataFormat& format) const
-        { return m_format == format.m_format; }
-    bool operator!=(const wxDataFormat& format) const
-        { return m_format != format.m_format; }
+    bool operator==(wxDataFormatId format) const;
+    bool operator!=(wxDataFormatId format) const;
+    bool operator==(const wxDataFormat& format) const;
+    bool operator!=(const wxDataFormat& format) const;
 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h b/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h
index 4bbd1c1b36..cc1002766a 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/dataobj.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id: dataobj.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h b/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h
index 34ca81437f..9b97e9fb0a 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/dataobj2.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.10.99
-// RCS-ID:      $Id: dataobj2.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h b/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h
index cf8fcf4fac..1c5f692702 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/dropsrc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
-// RCS-ID:      $Id: dropsrc.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h b/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h
index 9f815330cb..4cb9d3907d 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/droptgt.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
-// RCS-ID:      $Id: droptgt.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,6 +18,7 @@
 // ----------------------------------------------------------------------------
 
 class  wxIDropTarget;
+struct wxIDropTargetHelper;
 struct IDataObject;
 
 // ----------------------------------------------------------------------------
@@ -60,12 +60,26 @@ public:
     // GetData() when it's called from inside OnData()
     void MSWSetDataSource(IDataObject *pIDataSource);
 
+    // These functions take care of all things necessary to support native drag
+    // images.
+    //
+    // {Init,End}DragImageSupport() are called during Register/Revoke,
+    // UpdateDragImageOnXXX() functions are called on the corresponding drop
+    // target events.
+    void MSWInitDragImageSupport();
+    void MSWEndDragImageSupport();
+    void MSWUpdateDragImageOnData(wxCoord x, wxCoord y, wxDragResult res);
+    void MSWUpdateDragImageOnDragOver(wxCoord x, wxCoord y, wxDragResult res);
+    void MSWUpdateDragImageOnEnter(wxCoord x, wxCoord y, wxDragResult res);
+    void MSWUpdateDragImageOnLeave();
+
 private:
     // helper used by IsAcceptedData() and GetData()
     wxDataFormat MSWGetSupportedFormat(IDataObject *pIDataSource) const;
 
-    wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
-    IDataObject   *m_pIDataSource; // the pointer to the source data object
+    wxIDropTarget     *m_pIDropTarget; // the pointer to our COM interface
+    IDataObject       *m_pIDataSource; // the pointer to the source data object
+    wxIDropTargetHelper *m_dropTargetHelper; // the drop target helper
 
     wxDECLARE_NO_COPY_CLASS(wxDropTarget);
 };
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h b/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h
index dffb3b266e..c9f7eb88c8 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/oleutils.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.02.1998
-// RCS-ID:      $Id: oleutils.h 70162 2011-12-29 11:26:05Z SN $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +49,7 @@ inline bool wxOleInitialize()
     // needs non-default mode.
     if ( hr != RPC_E_CHANGED_MODE && FAILED(hr) )
     {
-        wxLogError(_("Cannot initialize OLE"));
+        wxLogError(wxGetTranslation("Cannot initialize OLE"));
 
         return false;
     }
@@ -192,7 +191,7 @@ private:
 // VZ: I don't know it's not done for compilers other than VC++ but I leave it
 //     as is. Please note, though, that tracing OLE interface calls may be
 //     incredibly useful when debugging OLE programs.
-#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ >= 1000) ) || defined(__MWERKS__) )
+#if defined(__WXDEBUG__) && (( defined(__VISUALC__) && (__VISUALC__ >= 1000) ))
 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------
@@ -237,8 +236,105 @@ private:
 // Convert variants
 class WXDLLIMPEXP_FWD_BASE wxVariant;
 
-WXDLLIMPEXP_CORE bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
-WXDLLIMPEXP_CORE bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
+// wrapper for CURRENCY type used in VARIANT (VARIANT.vt == VT_CY)
+class WXDLLIMPEXP_CORE wxVariantDataCurrency : public wxVariantData
+{
+public:
+    wxVariantDataCurrency() { VarCyFromR8(0.0, &m_value); }
+    wxVariantDataCurrency(CURRENCY value) { m_value = value; }
+
+    CURRENCY GetValue() const { return m_value; }
+    void SetValue(CURRENCY value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+
+    wxVariantData* Clone() const { return new wxVariantDataCurrency(m_value); }
+    virtual wxString GetType() const { return wxS("currency"); }
+
+    DECLARE_WXANY_CONVERSION()
+
+private:
+    CURRENCY m_value;
+};
+
+
+// wrapper for SCODE type used in VARIANT (VARIANT.vt == VT_ERROR)
+class WXDLLIMPEXP_CORE wxVariantDataErrorCode : public wxVariantData
+{
+public:
+    wxVariantDataErrorCode(SCODE value = S_OK) { m_value = value; }
+
+    SCODE GetValue() const { return m_value; }
+    void SetValue(SCODE value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+
+    wxVariantData* Clone() const { return new wxVariantDataErrorCode(m_value); }
+    virtual wxString GetType() const { return wxS("errorcode"); }
+
+    DECLARE_WXANY_CONVERSION()
+
+private:
+    SCODE m_value;
+};
+
+// wrapper for SAFEARRAY, used for passing multidimensional arrays in wxVariant
+class WXDLLIMPEXP_CORE wxVariantDataSafeArray : public wxVariantData
+{
+public:
+    wxEXPLICIT wxVariantDataSafeArray(SAFEARRAY* value = NULL)
+    {
+        m_value = value;
+    }
+
+    SAFEARRAY* GetValue() const { return m_value; }
+    void SetValue(SAFEARRAY* value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+
+    wxVariantData* Clone() const { return new wxVariantDataSafeArray(m_value); }
+    virtual wxString GetType() const { return wxS("safearray"); }
+
+    DECLARE_WXANY_CONVERSION()
+
+private:
+    SAFEARRAY* m_value;
+};
+
+// Used by wxAutomationObject for its wxConvertOleToVariant() calls.
+enum wxOleConvertVariantFlags
+{
+    wxOleConvertVariant_Default = 0,
+
+    // If wxOleConvertVariant_ReturnSafeArrays  flag is set, SAFEARRAYs
+    // contained in OLE VARIANTs will be returned as wxVariants
+    // with wxVariantDataSafeArray type instead of wxVariants
+    // with the list type containing the (flattened) SAFEARRAY's elements.
+    wxOleConvertVariant_ReturnSafeArrays = 1
+};
+
+WXDLLIMPEXP_CORE
+bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
+
+WXDLLIMPEXP_CORE
+bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant,
+                           long flags = wxOleConvertVariant_Default);
+
 #endif // wxUSE_VARIANT
 
 // Convert string to Unicode
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/safearray.h b/Externals/wxWidgets3/include/wx/msw/ole/safearray.h
new file mode 100644
index 0000000000..04dc335fdc
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/ole/safearray.h
@@ -0,0 +1,394 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        msw/ole/safearray.h
+// Purpose:     Helpers for working with OLE SAFEARRAYs.
+// Author:      PB
+// Created:     2012-09-23
+// Copyright:   (c) 2012 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSW_OLE_SAFEARRAY_H_
+#define _MSW_OLE_SAFEARRAY_H_
+
+#include "wx/msw/ole/oleutils.h"
+
+#if wxUSE_OLE && wxUSE_VARIANT
+
+/*
+    wxSafeArray is wxWidgets wrapper for working with MS Windows SAFEARRAYs.
+    It also has convenience functions for converting between SAFEARRAY
+    and wxVariant with list type or wxArrayString.
+*/
+
+// The base class with type-independent methods. It exists solely in order to
+// reduce the template bloat.
+class WXDLLIMPEXP_CORE wxSafeArrayBase
+{
+public:
+    // If owns a SAFEARRAY, it's unlocked and destroyed.
+    virtual ~wxSafeArrayBase() { Destroy(); }
+
+    // Unlocks and destroys the owned SAFEARRAY.
+    void Destroy();
+
+    // Unlocks the owned SAFEARRAY, returns it and gives up its ownership.
+    SAFEARRAY* Detach();
+
+    // Returns true if has a valid SAFEARRAY.
+    bool HasArray() const { return m_array != NULL; }
+
+    // Returns the number of dimensions.
+    size_t GetDim() const;
+
+    // Returns lower bound for dimension dim in bound. Dimensions start at 1.
+    bool GetLBound(size_t dim, long& bound) const;
+
+    // Returns upper bound for dimension dim in bound. Dimensions start at 1.
+    bool GetUBound(size_t dim, long& bound) const;
+
+    // Returns element count for dimension dim. Dimensions start at 1.
+    size_t GetCount(size_t dim) const;
+
+protected:
+    // Default constructor, protected so the class can't be used on its own,
+    // it's only used as a base class of wxSafeArray<>.
+    wxSafeArrayBase()
+    {
+        m_array = NULL;
+    }
+
+    bool Lock();
+    bool Unlock();
+
+    SAFEARRAY* m_array;
+};
+
+// wxSafeArrayConvertor<> must be specialized for the type in order to allow
+// using it with wxSafeArray<>.
+//
+// We specialize it below for the standard types.
+template <VARTYPE varType>
+struct wxSafeArrayConvertor {};
+
+/**
+    Macro for specializing wxSafeArrayConvertor for simple types.
+
+    The template parameters are:
+        - externType: basic C data type, e.g. wxFloat64 or wxInt32
+        - varType: corresponding VARIANT type constant, e.g. VT_R8 or VT_I4.
+*/
+#define wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(externType, varType) \
+template <>                                                 \
+struct wxSafeArrayConvertor<varType>                        \
+{                                                           \
+    typedef externType externT;                             \
+    typedef externT    internT;                             \
+    static bool ToArray(const externT& from, internT& to)   \
+    {                                                       \
+        to = from;                                          \
+        return true;                                        \
+    }                                                       \
+    static bool FromArray(const internT& from, externT& to) \
+    {                                                       \
+        to = from;                                          \
+        return true;                                        \
+    }                                                       \
+}
+
+wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxInt16, VT_I2);
+wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxInt32, VT_I4);
+wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxFloat32, VT_R4);
+wxSPECIALIZE_WXSAFEARRAY_CONVERTOR_SIMPLE(wxFloat64, VT_R8);
+
+// Specialization for VT_BSTR using wxString.
+template <>
+struct wxSafeArrayConvertor<VT_BSTR>
+{
+    typedef wxString externT;
+    typedef BSTR internT;
+
+    static bool ToArray(const wxString& from, BSTR& to)
+    {
+        BSTR bstr = wxConvertStringToOle(from);
+
+        if ( !bstr && !from.empty() )
+        {
+            // BSTR can be NULL for empty strings but if the string was
+            // not empty, it means we failed to allocate memory for it.
+            return false;
+        }
+        to = bstr;
+        return true;
+    }
+
+    static bool FromArray(const BSTR from, wxString& to)
+    {
+        to = wxConvertStringFromOle(from);
+        return true;
+    }
+};
+
+// Specialization for VT_VARIANT using wxVariant.
+template <>
+struct wxSafeArrayConvertor<VT_VARIANT>
+{
+    typedef wxVariant externT;
+    typedef VARIANT internT;
+
+    static bool ToArray(const wxVariant& from, VARIANT& to)
+    {
+        return wxConvertVariantToOle(from, to);
+    }
+
+    static bool FromArray(const VARIANT& from, wxVariant& to)
+    {
+        return wxConvertOleToVariant(from, to);
+    }
+};
+
+
+template <VARTYPE varType>
+class wxSafeArray : public wxSafeArrayBase
+{
+public:
+    typedef wxSafeArrayConvertor<varType> Convertor;
+    typedef typename Convertor::internT internT;
+    typedef typename Convertor::externT externT;
+
+    // Default constructor.
+    wxSafeArray()
+    {
+        m_array = NULL;
+    }
+
+    // Creates and locks a zero-based one-dimensional SAFEARRAY with the given
+    // number of elements.
+    bool Create(size_t count)
+    {
+        SAFEARRAYBOUND bound;
+
+        bound.lLbound = 0;
+        bound.cElements = count;
+        return Create(&bound, 1);
+    }
+
+    // Creates and locks a SAFEARRAY. See SafeArrayCreate() in MSDN
+    // documentation for more information.
+    bool Create(SAFEARRAYBOUND* bound, size_t dimensions)
+    {
+        wxCHECK_MSG( !m_array, false, wxS("Can't be created twice") );
+
+        m_array = SafeArrayCreate(varType, dimensions, bound);
+        if ( !m_array )
+            return false;
+
+        return Lock();
+    }
+
+    /**
+        Creates a 0-based one-dimensional SAFEARRAY from wxVariant with the
+        list type.
+
+        Can be called only for wxSafeArray<VT_VARIANT>.
+    */
+    bool CreateFromListVariant(const wxVariant& variant)
+    {
+        wxCHECK(varType == VT_VARIANT, false);
+        wxCHECK(variant.GetType() == wxS("list"), false);
+
+        if ( !Create(variant.GetCount()) )
+            return false;
+
+        VARIANT* data = static_cast<VARIANT*>(m_array->pvData);
+
+        for ( size_t i = 0; i < variant.GetCount(); i++)
+        {
+            if ( !Convertor::ToArray(variant[i], data[i]) )
+                return false;
+        }
+        return true;
+    }
+
+    /**
+        Creates a 0-based one-dimensional SAFEARRAY from wxArrayString.
+
+        Can be called only for wxSafeArray<VT_BSTR>.
+    */
+    bool CreateFromArrayString(const wxArrayString& strings)
+    {
+        wxCHECK(varType == VT_BSTR, false);
+
+        if ( !Create(strings.size()) )
+            return false;
+
+        BSTR* data = static_cast<BSTR*>(m_array->pvData);
+
+        for ( size_t i = 0; i < strings.size(); i++ )
+        {
+            if ( !Convertor::ToArray(strings[i], data[i]) )
+                return false;
+        }
+        return true;
+    }
+
+    /**
+        Attaches and locks an existing SAFEARRAY.
+        The array must have the same VARTYPE as this wxSafeArray was
+        instantiated with.
+    */
+    bool Attach(SAFEARRAY* array)
+    {
+        wxCHECK_MSG(!m_array && array, false,
+                    wxS("Can only attach a valid array to an uninitialized one") );
+
+        VARTYPE vt;
+        HRESULT hr = SafeArrayGetVartype(array, &vt);
+        if ( FAILED(hr) )
+        {
+            wxLogApiError(wxS("SafeArrayGetVarType()"), hr);
+            return false;
+        }
+
+        wxCHECK_MSG(vt == varType, false,
+                    wxS("Attaching array of invalid type"));
+
+        m_array = array;
+        return Lock();
+    }
+
+    /**
+        Indices have the same row-column order as rgIndices in
+        SafeArrayPutElement(), i.e. they follow BASIC rules, NOT C ones.
+    */
+    bool SetElement(long* indices, const externT& element)
+    {
+        wxCHECK_MSG( m_array, false, wxS("Uninitialized array") );
+        wxCHECK_MSG( indices, false, wxS("Invalid index") );
+
+        internT* data;
+
+        if ( FAILED( SafeArrayPtrOfIndex(m_array, indices, (void**)&data) ) )
+            return false;
+
+        return Convertor::ToArray(element, *data);
+    }
+
+    /**
+        Indices have the same row-column order as rgIndices in
+        SafeArrayPutElement(), i.e. they follow BASIC rules, NOT C ones.
+    */
+    bool GetElement(long* indices, externT& element) const
+    {
+        wxCHECK_MSG( m_array, false, wxS("Uninitialized array") );
+        wxCHECK_MSG( indices, false, wxS("Invalid index") );
+
+        internT* data;
+
+        if ( FAILED( SafeArrayPtrOfIndex(m_array, indices, (void**)&data) ) )
+            return false;
+
+        return Convertor::FromArray(*data, element);
+    }
+
+    /**
+        Converts the array to a wxVariant with the list type, regardless of the
+        underlying SAFEARRAY type.
+
+        If the array is multidimensional, it is flattened using the alghoritm
+        originally employed in wxConvertOleToVariant().
+    */
+    bool ConvertToVariant(wxVariant& variant) const
+    {
+        wxCHECK_MSG( m_array, false, wxS("Uninitialized array") );
+
+        size_t dims = m_array->cDims;
+        size_t count = 1;
+
+        for ( size_t i = 0; i < dims; i++ )
+            count *= m_array->rgsabound[i].cElements;
+
+        const internT* data = static_cast<const internT*>(m_array->pvData);
+        externT element;
+
+        variant.ClearList();
+        for ( size_t i1 = 0; i1 < count; i1++ )
+        {
+            if ( !Convertor::FromArray(data[i1], element) )
+            {
+                variant.ClearList();
+                return false;
+            }
+            variant.Append(element);
+        }
+        return true;
+    }
+
+    /**
+        Converts an array to an ArrayString.
+
+        Can be called only for wxSafeArray<VT_BSTR>. If the array is
+        multidimensional, it is flattened using the alghoritm originally
+        employed in wxConvertOleToVariant().
+    */
+    bool ConvertToArrayString(wxArrayString& strings) const
+    {
+        wxCHECK_MSG( m_array, false, wxS("Uninitialized array") );
+        wxCHECK(varType == VT_BSTR, false);
+
+        size_t dims = m_array->cDims;
+        size_t count = 1;
+
+        for ( size_t i = 0; i < dims; i++ )
+            count *= m_array->rgsabound[i].cElements;
+
+        const BSTR* data = static_cast<const BSTR*>(m_array->pvData);
+        wxString element;
+
+        strings.clear();
+        strings.reserve(count);
+        for ( size_t i1 = 0; i1 < count; i1++ )
+        {
+            if ( !Convertor::FromArray(data[i1], element) )
+            {
+                strings.clear();
+                return false;
+            }
+            strings.push_back(element);
+        }
+        return true;
+    }
+
+    static bool ConvertToVariant(SAFEARRAY* psa, wxVariant& variant)
+    {
+        wxSafeArray<varType> sa;
+        bool result = false;
+
+        if ( sa.Attach(psa) )
+            result = sa.ConvertToVariant(variant);
+
+        if ( sa.HasArray() )
+            sa.Detach();
+
+        return result;
+    }
+
+    static bool ConvertToArrayString(SAFEARRAY* psa, wxArrayString& strings)
+    {
+        wxSafeArray<varType> sa;
+        bool result = false;
+
+        if ( sa.Attach(psa) )
+            result = sa.ConvertToArrayString(strings);
+
+        if ( sa.HasArray() )
+            sa.Detach();
+
+        return result;
+    }
+
+    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSafeArray, varType);
+};
+
+#endif // wxUSE_OLE && wxUSE_VARIANT
+
+#endif // _MSW_OLE_SAFEARRAY_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/ole/uuid.h b/Externals/wxWidgets3/include/wx/msw/ole/uuid.h
index c1753bb5ee..2408450611 100644
--- a/Externals/wxWidgets3/include/wx/msw/ole/uuid.h
+++ b/Externals/wxWidgets3/include/wx/msw/ole/uuid.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.07.97
-// RCS-ID:      $Id: uuid.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 //
diff --git a/Externals/wxWidgets3/include/wx/msw/ownerdrw.h b/Externals/wxWidgets3/include/wx/msw/ownerdrw.h
index a8a67ca96f..789a7f2d77 100644
--- a/Externals/wxWidgets3/include/wx/msw/ownerdrw.h
+++ b/Externals/wxWidgets3/include/wx/msw/ownerdrw.h
@@ -4,7 +4,6 @@
 // Author:      Marcin Malich
 // Modified by:
 // Created:     2009-09-22
-// RCS-ID:      $Id: ownerdrw.h 63220 2010-01-23 13:21:12Z VZ $
 // Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/palette.h b/Externals/wxWidgets3/include/wx/msw/palette.h
index 35560e6012..78477b4320 100644
--- a/Externals/wxWidgets3/include/wx/msw/palette.h
+++ b/Externals/wxWidgets3/include/wx/msw/palette.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: palette.h 70040 2011-12-17 23:52:47Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/panel.h b/Externals/wxWidgets3/include/wx/msw/panel.h
index 9a2ab283c1..4762bef191 100644
--- a/Externals/wxWidgets3/include/wx/msw/panel.h
+++ b/Externals/wxWidgets3/include/wx/msw/panel.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
-// RCS-ID:      $Id: panel.h 70098 2011-12-23 05:59:59Z PC $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/pen.h b/Externals/wxWidgets3/include/wx/msw/pen.h
index b55df15962..cb68780b43 100644
--- a/Externals/wxWidgets3/include/wx/msw/pen.h
+++ b/Externals/wxWidgets3/include/wx/msw/pen.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
 // Created:     01/02/97
-// RCS-ID:      $Id: pen.h 54273 2008-06-17 17:28:26Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/popupwin.h b/Externals/wxWidgets3/include/wx/msw/popupwin.h
index eb45b36d2a..d95c1dabc0 100644
--- a/Externals/wxWidgets3/include/wx/msw/popupwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/popupwin.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
-// RCS-ID:      $Id: popupwin.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
+    virtual void SetFocus();
     virtual bool Show(bool show = true);
 
     // return the style to be used for the popup windows
diff --git a/Externals/wxWidgets3/include/wx/msw/printdlg.h b/Externals/wxWidgets3/include/wx/msw/printdlg.h
index a8362bdd06..2955b89b3c 100644
--- a/Externals/wxWidgets3/include/wx/msw/printdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/printdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: printdlg.h 70636 2012-02-20 21:55:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/printwin.h b/Externals/wxWidgets3/include/wx/msw/printwin.h
index d594083c97..e5ef80b043 100644
--- a/Externals/wxWidgets3/include/wx/msw/printwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/printwin.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: printwin.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private.h b/Externals/wxWidgets3/include/wx/msw/private.h
index 75f5c65382..0f966b841b 100644
--- a/Externals/wxWidgets3/include/wx/msw/private.h
+++ b/Externals/wxWidgets3/include/wx/msw/private.h
@@ -6,7 +6,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: private.h 69758 2011-11-14 12:51:53Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -169,9 +168,9 @@ extern LONG APIENTRY _EXPORT
 
 // This one is a macro so that it can be tested with #ifdef, it will be
 // undefined if it cannot be implemented for a given compiler.
-// Vc++, bcc, dmc, ow, mingw, codewarrior (and rsxnt) have _get_osfhandle.
-// Cygwin has get_osfhandle. Others are currently unknown, e.g. Salford,
-// Intel, Visual Age.
+// Vc++, bcc, dmc, ow, mingw akk have _get_osfhandle() and Cygwin has
+// get_osfhandle. Others are currently unknown, e.g. Salford, Intel, Visual
+// Age.
 #if defined(__WXWINCE__)
     #define wxGetOSFHandle(fd) ((HANDLE)fd)
     #define wxOpenOSFHandle(h, flags) ((int)wxPtrToUInt(h))
@@ -181,8 +180,7 @@ extern LONG APIENTRY _EXPORT
    || defined(__BORLANDC__) \
    || defined(__DMC__) \
    || defined(__WATCOMC__) \
-   || defined(__MINGW32__) \
-   || (defined(__MWERKS__) && defined(__MSL__))
+   || defined(__MINGW32__)
     #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
     #define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))
     #define wx_fdopen _fdopen
@@ -219,6 +217,21 @@ struct WinStruct : public T
 };
 
 
+// Macros for converting wxString to the type expected by API functions.
+//
+// Normally it is enough to just use wxString::t_str() which is implicitly
+// convertible to LPCTSTR, but in some cases an explicit conversion is required.
+//
+// In such cases wxMSW_CONV_LPCTSTR() should be used. But if an API function
+// takes a non-const pointer, wxMSW_CONV_LPTSTR() which casts away the
+// constness (but doesn't make it possible to really modify the returned
+// pointer, of course) should be used. And if a string is passed as LPARAM, use
+// wxMSW_CONV_LPARAM() which does the required ugly reinterpret_cast<> too.
+#define wxMSW_CONV_LPCTSTR(s) static_cast<const wxChar *>((s).t_str())
+#define wxMSW_CONV_LPTSTR(s) const_cast<wxChar *>(wxMSW_CONV_LPCTSTR(s))
+#define wxMSW_CONV_LPARAM(s) reinterpret_cast<LPARAM>(wxMSW_CONV_LPCTSTR(s))
+
+
 #if wxUSE_GUI
 
 #include "wx/gdicmn.h"
@@ -418,8 +431,9 @@ private:
 class WindowHDC
 {
 public:
+    WindowHDC() : m_hwnd(NULL), m_hdc(NULL) { }
     WindowHDC(HWND hwnd) { m_hdc = ::GetDC(m_hwnd = hwnd); }
-   ~WindowHDC() { ::ReleaseDC(m_hwnd, m_hdc); }
+   ~WindowHDC() { if ( m_hwnd && m_hdc ) { ::ReleaseDC(m_hwnd, m_hdc); } }
 
     operator HDC() const { return m_hdc; }
 
@@ -781,7 +795,7 @@ public:
     {
         if ( IsRegistered() )
         {
-            if ( !::UnregisterClass(m_clsname.wx_str(), wxGetInstance()) )
+            if ( !::UnregisterClass(m_clsname.t_str(), wxGetInstance()) )
             {
                 wxLogLastError(wxT("UnregisterClass"));
             }
@@ -917,7 +931,7 @@ enum wxWinVersion
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
 
-#if wxUSE_GUI
+#if wxUSE_GUI && defined(__WXMSW__)
 
 // cursor stuff
 extern HCURSOR wxGetCurrentBusyCursor();    // from msw/utils.cpp
@@ -1054,6 +1068,6 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data)
 
 #endif // __WIN64__/__WIN32__
 
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && __WXMSW__
 
 #endif // _WX_PRIVATE_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/private/button.h b/Externals/wxWidgets3/include/wx/msw/private/button.h
index c45bcf167a..9f605c66a3 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/button.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/button.h
@@ -3,7 +3,6 @@
 // Purpose:     helper functions used with native BUTTON control
 // Author:      Vadim Zeitlin
 // Created:     2008-06-07
-// RCS-ID:      $Id: button.h 68922 2011-08-27 14:11:28Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/comptr.h b/Externals/wxWidgets3/include/wx/msw/private/comptr.h
new file mode 100644
index 0000000000..194cf54f90
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/private/comptr.h
@@ -0,0 +1,129 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/private/comptr.h
+// Purpose:     Smart pointer for COM interfaces.
+// Author:      PB
+// Created:     2012-04-16
+// Copyright:   (c) 2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_PRIVATE_COMPTR_H_
+#define _WX_MSW_PRIVATE_COMPTR_H_
+
+// ----------------------------------------------------------------------------
+// wxCOMPtr: A minimalistic smart pointer for use with COM interfaces.
+// ----------------------------------------------------------------------------
+
+template <class T>
+class wxCOMPtr
+{
+public:
+    typedef T element_type;
+
+    wxCOMPtr()
+        : m_ptr(NULL)
+    {
+    }
+
+    wxEXPLICIT wxCOMPtr(T* ptr)
+        : m_ptr(ptr)
+    {
+        if ( m_ptr )
+            m_ptr->AddRef();
+    }
+
+    wxCOMPtr(const wxCOMPtr& ptr)
+        : m_ptr(ptr.get())
+    {
+        if ( m_ptr )
+            m_ptr->AddRef();
+    }
+
+    ~wxCOMPtr()
+    {
+        if ( m_ptr )
+            m_ptr->Release();
+    }
+
+    void reset(T* ptr = NULL)
+    {
+        if ( m_ptr != ptr)
+        {
+            if ( ptr )
+                ptr->AddRef();
+            if ( m_ptr )
+                m_ptr->Release();
+            m_ptr = ptr;
+        }
+    }
+
+    wxCOMPtr& operator=(const wxCOMPtr& ptr)
+    {
+        reset(ptr.get());
+        return *this;
+    }
+
+    wxCOMPtr& operator=(T* ptr)
+    {
+        reset(ptr);
+        return *this;
+    }
+
+    operator T*() const
+    {
+        return m_ptr;
+    }
+
+    T& operator*() const
+    {
+        return *m_ptr;
+    }
+
+    T* operator->() const
+    {
+        return m_ptr;
+    }
+
+    // It would be better to forbid direct access completely but we do need
+    // for QueryInterface() and similar functions, so provide it but it can
+    // only be used to initialize the pointer, not to modify an existing one.
+    T** operator&()
+    {
+        wxASSERT_MSG(!m_ptr,
+                     wxS("Can't get direct access to initialized pointer"));
+
+        return &m_ptr;
+    }
+
+    T* get() const
+    {
+        return m_ptr;
+    }
+
+    bool operator<(T* ptr) const
+    {
+        return get() < ptr;
+    }
+
+private:
+    T* m_ptr;
+};
+
+// Define a helper for the macro below: we just need a function taking a
+// pointer and not returning anything to avoid warnings about unused return
+// value of the cast in the macro itself.
+namespace wxPrivate { inline void PPV_ARGS_CHECK(void*) { } }
+
+// Takes the interface name and a pointer to a pointer of the interface type
+// and expands into the IID of this interface and the same pointer but after a
+// type-safety check.
+//
+// This is similar to the standard IID_PPV_ARGS macro but takes the pointer
+// type instead of relying on the non-standard Microsoft __uuidof().
+#define wxIID_PPV_ARGS(IType, pType) \
+    IID_##IType, \
+    (wxPrivate::PPV_ARGS_CHECK(static_cast<IType*>(*pType)), \
+     reinterpret_cast<void**>(pType))
+
+#endif // _WX_MSW_PRIVATE_COMPTR_H_
+
diff --git a/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h b/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h
index 4c8324b87c..9794cfae89 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/datecontrols.h
@@ -3,7 +3,6 @@
 // Purpose:     implementation helpers for wxDatePickerCtrl and wxCalendarCtrl
 // Author:      Vadim Zeitlin
 // Created:     2008-04-04
-// RCS-ID:      $Id: datecontrols.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/dc.h b/Externals/wxWidgets3/include/wx/msw/private/dc.h
index c3efeb2537..303cd19df6 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/dc.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/dc.h
@@ -3,7 +3,6 @@
 // Purpose:     private wxMSW helpers for working with HDCs
 // Author:      Vadim Zeitlin
 // Created:     2009-06-16 (extracted from src/msw/dc.cpp)
-// RCS-ID:      $Id: dc.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h b/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h
index f5ef3bbd38..86f91dc3d0 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     File system watcher impl classes
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher.h 67806 2011-05-28 19:35:13Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h b/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h
index 7f592e2e2e..3b52b60983 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/hiddenwin.h
@@ -3,7 +3,6 @@
 // Purpose:     Helper for creating a hidden window used by wxMSW internally.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-16
-// RCS-ID:      $Id: hiddenwin.h 69170 2011-09-21 15:07:32Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/keyboard.h b/Externals/wxWidgets3/include/wx/msw/private/keyboard.h
index 5817e09911..002303e967 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/keyboard.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/keyboard.h
@@ -3,7 +3,6 @@
 // Purpose:     Helper keyboard-related functions.
 // Author:      Vadim Zeitlin
 // Created:     2010-09-09
-// RCS-ID:      $Id: keyboard.h 65590 2010-09-22 13:31:41Z VZ $
 // Copyright:   (c) 2010 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/metrics.h b/Externals/wxWidgets3/include/wx/msw/private/metrics.h
index bab56ec9eb..0e1b41deb5 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/metrics.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/metrics.h
@@ -3,7 +3,6 @@
 // Purpose:     various helper functions to retrieve system metrics
 // Author:      Vadim Zeitlin
 // Created:     2008-09-05
-// RCS-ID:      $Id: metrics.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h b/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h
index 9598f7fc11..20ccc4fff0 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/msgdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     helper functions used with native message dialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-12
-// RCS-ID:      $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/private/pipestream.h b/Externals/wxWidgets3/include/wx/msw/private/pipestream.h
new file mode 100644
index 0000000000..ba6d032bea
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/private/pipestream.h
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/private/pipestream.h
+// Purpose:     MSW wxPipeInputStream and wxPipeOutputStream declarations
+// Author:      Vadim Zeitlin
+// Created:     2013-06-08 (extracted from src/msw/utilsexc.cpp)
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_PRIVATE_PIPESTREAM_H_
+#define _WX_MSW_PRIVATE_PIPESTREAM_H_
+
+class wxPipeInputStream : public wxInputStream
+{
+public:
+    wxEXPLICIT wxPipeInputStream(HANDLE hInput);
+    virtual ~wxPipeInputStream();
+
+    // returns true if the pipe is still opened
+    bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
+
+    // returns true if there is any data to be read from the pipe
+    virtual bool CanRead() const;
+
+protected:
+    virtual size_t OnSysRead(void *buffer, size_t len);
+
+protected:
+    HANDLE m_hInput;
+
+    wxDECLARE_NO_COPY_CLASS(wxPipeInputStream);
+};
+
+class wxPipeOutputStream: public wxOutputStream
+{
+public:
+    wxEXPLICIT wxPipeOutputStream(HANDLE hOutput);
+    virtual ~wxPipeOutputStream() { Close(); }
+    bool Close();
+
+protected:
+    size_t OnSysWrite(const void *buffer, size_t len);
+
+protected:
+    HANDLE m_hOutput;
+
+    wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream);
+};
+
+#endif // _WX_MSW_PRIVATE_PIPESTREAM_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h b/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h
index 92fa1b99fe..e0f550d329 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/sockmsw.h
@@ -6,7 +6,6 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 1999-2000, Guillermo Rodriguez Garcia
 //             (C) 2008 Vadim Zeitlin
-// RCS_ID:     $Id: sockmsw.h 67254 2011-03-20 00:14:35Z DS $
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h b/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h
new file mode 100644
index 0000000000..ee14751a5b
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/private/textmeasure.h
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/private/textmeasure.h
+// Purpose:     wxMSW-specific declaration of wxTextMeasure class
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_PRIVATE_TEXTMEASURE_H_
+#define _WX_MSW_PRIVATE_TEXTMEASURE_H_
+
+#include "wx/msw/wrapwin.h"
+
+// ----------------------------------------------------------------------------
+// wxTextMeasure for MSW.
+// ----------------------------------------------------------------------------
+
+class wxTextMeasure : public wxTextMeasureBase
+{
+public:
+    wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
+        : wxTextMeasureBase(dc, font)
+    {
+        Init();
+    }
+
+    wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
+        : wxTextMeasureBase(win, font)
+    {
+        Init();
+    }
+
+protected:
+    void Init();
+
+    virtual void BeginMeasuring();
+    virtual void EndMeasuring();
+
+    virtual void DoGetTextExtent(const wxString& string,
+                               wxCoord *width,
+                               wxCoord *height,
+                               wxCoord *descent = NULL,
+                               wxCoord *externalLeading = NULL);
+
+    virtual bool DoGetPartialTextExtents(const wxString& text,
+                                         wxArrayInt& widths,
+                                         double scaleX);
+
+
+
+    // We use either the HDC of the provided wxDC or an HDC created for our
+    // window.
+    HDC m_hdc;
+
+    // If we change the font in BeginMeasuring(), we restore it to the old one
+    // in EndMeasuring().
+    HFONT m_hfontOld;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextMeasure);
+};
+
+#endif // _WX_MSW_PRIVATE_TEXTMEASURE_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/private/timer.h b/Externals/wxWidgets3/include/wx/msw/private/timer.h
index c45ba1df7e..71ce2ceec7 100644
--- a/Externals/wxWidgets3/include/wx/msw/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/msw/private/timer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTimer class
 // Author:      Julian Smart
 // Created:     01/02/97
-// RCS-ID:      $Id: timer.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/progdlg.h b/Externals/wxWidgets3/include/wx/msw/progdlg.h
index 096c89a94d..c63a0b66f8 100644
--- a/Externals/wxWidgets3/include/wx/msw/progdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/progdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxProgressDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-22
-// RCS-ID:      $Id: progdlg.h 69041 2011-09-10 03:26:37Z RD $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/radiobox.h b/Externals/wxWidgets3/include/wx/msw/radiobox.h
index 4caefafb8f..53620db9b3 100644
--- a/Externals/wxWidgets3/include/wx/msw/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/msw/radiobox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: radiobox.h 70498 2012-02-02 14:26:06Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -97,6 +96,7 @@ public:
     // override some base class methods
     virtual bool Show(bool show = true);
     virtual bool Enable(bool enable = true);
+    virtual bool CanBeFocused() const;
     virtual void SetFocus();
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;
@@ -113,10 +113,6 @@ public:
 
     virtual bool Reparent(wxWindowBase *newParent);
 
-    // we inherit a version always returning false from wxStaticBox, override
-    // it to behave normally
-    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
-
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
diff --git a/Externals/wxWidgets3/include/wx/msw/radiobut.h b/Externals/wxWidgets3/include/wx/msw/radiobut.h
index f7387694e4..4e9af38f70 100644
--- a/Externals/wxWidgets3/include/wx/msw/radiobut.h
+++ b/Externals/wxWidgets3/include/wx/msw/radiobut.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: radiobut.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/rcdefs.h b/Externals/wxWidgets3/include/wx/msw/rcdefs.h
index 7d963d966a..8b9ac716f9 100644
--- a/Externals/wxWidgets3/include/wx/msw/rcdefs.h
+++ b/Externals/wxWidgets3/include/wx/msw/rcdefs.h
@@ -2,7 +2,6 @@
 // Name:        wx/msw/rcdefs.h
 // Purpose:     Fallback for the generated rcdefs.h under the lib directory
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: rcdefs.h 36133 2005-11-08 22:49:46Z MW $
 // Copyright:   (c) 2005 Mike Wetherell
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,33 @@
 #ifndef _WX_RCDEFS_H
 #define _WX_RCDEFS_H
 
-#define WX_CPU_X86
+#ifdef __GNUC__
+    // We must be using windres which uses gcc as its preprocessor. We do need
+    // to generate the manifest then as gcc doesn't do it automatically and we
+    // can define the architecture macro on our own as all the usual symbols
+    // are available (unlike with Microsoft RC.EXE which doesn't predefine
+    // anything useful at all).
+    #ifndef wxUSE_RC_MANIFEST
+        #define wxUSE_RC_MANIFEST 1
+    #endif
+
+    #if defined __i386__
+        #ifndef WX_CPU_X86
+            #define WX_CPU_X86
+        #endif
+    #elif defined __x86_64__
+        #ifndef WX_CPU_AMD64
+            #define WX_CPU_AMD64
+        #endif
+    #elif defined __ia64__
+        #ifndef WX_CPU_IA64
+            #define WX_CPU_IA64
+        #endif
+    #endif
+#endif
+
+// Don't do anything here for the other compilers, in particular don't define
+// WX_CPU_X86 here as we used to do. If people define wxUSE_RC_MANIFEST, they
+// must also define the architecture constant correctly.
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/msw/regconf.h b/Externals/wxWidgets3/include/wx/msw/regconf.h
index 1f20255aa2..ec290ec88c 100644
--- a/Externals/wxWidgets3/include/wx/msw/regconf.h
+++ b/Externals/wxWidgets3/include/wx/msw/regconf.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.04.98
-// RCS-ID:      $Id: regconf.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/region.h b/Externals/wxWidgets3/include/wx/msw/region.h
index 4c34c2c4a9..aba0d536dc 100644
--- a/Externals/wxWidgets3/include/wx/msw/region.h
+++ b/Externals/wxWidgets3/include/wx/msw/region.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: region.h 57915 2009-01-08 16:43:56Z FM $
 // Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/registry.h b/Externals/wxWidgets3/include/wx/msw/registry.h
index 5f7c8cc7d8..20343a540b 100644
--- a/Externals/wxWidgets3/include/wx/msw/registry.h
+++ b/Externals/wxWidgets3/include/wx/msw/registry.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.1998
-// RCS-ID:      $Id: registry.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h b/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h
index fb51a75499..20c8eb72da 100644
--- a/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/richmsgdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxRichMessageDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-04
-// RCS-ID:      $Id: richmsgdlg.h 65349 2010-08-18 22:48:41Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/scrolbar.h b/Externals/wxWidgets3/include/wx/msw/scrolbar.h
index d33150bb16..1b7c86295d 100644
--- a/Externals/wxWidgets3/include/wx/msw/scrolbar.h
+++ b/Externals/wxWidgets3/include/wx/msw/scrolbar.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: scrolbar.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/seh.h b/Externals/wxWidgets3/include/wx/msw/seh.h
index cf203778e1..a331570d75 100644
--- a/Externals/wxWidgets3/include/wx/msw/seh.h
+++ b/Externals/wxWidgets3/include/wx/msw/seh.h
@@ -3,7 +3,6 @@
 // Purpose:     declarations for SEH (structured exceptions handling) support
 // Author:      Vadim Zeitlin
 // Created:     2006-04-26
-// RCS-ID:      $Id: seh.h 60934 2009-06-06 23:27:37Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,11 +54,11 @@
     // as division by 0 or access violation) to C++ pseudo-exceptions
     extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);
 
-    // up to VC 9 this warning ("calling _set_se_translator() requires /EHa")
+    // up to VC 11 this warning ("calling _set_se_translator() requires /EHa")
     // is harmless and it's easier to suppress it than use different makefiles
-    // for VC5 and 6 (which don't support /EHa at all) and VC7 (which does
+    // for VC5 and 6 (which don't support /EHa at all) and VC7+ (which does
     // accept it but it seems to change nothing for it anyhow)
-    #if __VISUALC__ < 1600
+    #if __VISUALC__ < 1800
         #pragma warning(disable: 4535)
     #endif
 
diff --git a/Externals/wxWidgets3/include/wx/msw/setup0.h b/Externals/wxWidgets3/include/wx/msw/setup0.h
index 7b0bf0b25f..f0b2e646cb 100644
--- a/Externals/wxWidgets3/include/wx/msw/setup0.h
+++ b/Externals/wxWidgets3/include/wx/msw/setup0.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: setup0.h 69463 2011-10-18 21:57:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -151,7 +150,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin / CodeWarrior
+// ignored for MinGW/Cygwin.
 //
 // Default is 0
 //
@@ -267,6 +266,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
@@ -1087,6 +1097,16 @@
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_PREFERENCES_EDITOR 1
+
 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //
diff --git a/Externals/wxWidgets3/include/wx/msw/setup_inc.h b/Externals/wxWidgets3/include/wx/msw/setup_inc.h
index 176796629d..6905a7a8e6 100644
--- a/Externals/wxWidgets3/include/wx/msw/setup_inc.h
+++ b/Externals/wxWidgets3/include/wx/msw/setup_inc.h
@@ -3,7 +3,6 @@
 // Purpose:     MSW-specific setup.h options
 // Author:      Vadim Zeitlin
 // Created:     2007-07-21 (extracted from wx/msw/setup0.h)
-// RCS-ID:      $Id: setup_inc.h 69224 2011-09-29 13:43:15Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/slider.h b/Externals/wxWidgets3/include/wx/msw/slider.h
index 99267d7ca3..a16c5952e0 100644
--- a/Externals/wxWidgets3/include/wx/msw/slider.h
+++ b/Externals/wxWidgets3/include/wx/msw/slider.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: slider.h 68230 2011-07-11 22:49:33Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/sound.h b/Externals/wxWidgets3/include/wx/msw/sound.h
index f8b1134229..9e7cc49698 100644
--- a/Externals/wxWidgets3/include/wx/msw/sound.h
+++ b/Externals/wxWidgets3/include/wx/msw/sound.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/spinbutt.h b/Externals/wxWidgets3/include/wx/msw/spinbutt.h
index a459911a0d..d50912fbf8 100644
--- a/Externals/wxWidgets3/include/wx/msw/spinbutt.h
+++ b/Externals/wxWidgets3/include/wx/msw/spinbutt.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: spinbutt.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/spinctrl.h b/Externals/wxWidgets3/include/wx/msw/spinctrl.h
index c1c0f7975d..9250292de0 100644
--- a/Externals/wxWidgets3/include/wx/msw/spinctrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/spinctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id: spinctrl.h 70799 2012-03-04 00:29:48Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -62,6 +61,11 @@ public:
     // another wxTextCtrl-like method
     void SetSelection(long from, long to);
 
+    // wxSpinCtrlBase methods
+    virtual int GetBase() const;
+    virtual bool SetBase(int base);
+
+
     // implementation only from now on
     // -------------------------------
 
@@ -111,6 +115,7 @@ protected:
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetClientSize(int *x, int *y) const;
 #if wxUSE_TOOLTIPS
@@ -148,6 +153,12 @@ private:
     // Common part of all ctors.
     void Init();
 
+    // Adjust the text control style depending on whether we need to enter only
+    // digits or may need to enter something else (e.g. "-" sign, "x"
+    // hexadecimal prefix, ...) in it.
+    void UpdateBuddyStyle();
+
+
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
diff --git a/Externals/wxWidgets3/include/wx/msw/stackwalk.h b/Externals/wxWidgets3/include/wx/msw/stackwalk.h
index 21a28fbf69..6ff467205e 100644
--- a/Externals/wxWidgets3/include/wx/msw/stackwalk.h
+++ b/Externals/wxWidgets3/include/wx/msw/stackwalk.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08
-// RCS-ID:      $Id: stackwalk.h 58093 2009-01-14 14:38:00Z FM $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/statbmp.h b/Externals/wxWidgets3/include/wx/msw/statbmp.h
index c9cbcf21fc..165ddb5af1 100644
--- a/Externals/wxWidgets3/include/wx/msw/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/msw/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: statbmp.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,7 +57,7 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;
 
     // ctor/dtor helpers
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
@@ -76,6 +75,7 @@ protected:
     void DoPaintManually(wxPaintEvent& event);
 #endif // !__WXWINCE__
 
+    void WXHandleSize(wxSizeEvent& event);
 
     // we can have either an icon or a bitmap
     bool m_isIcon;
@@ -86,6 +86,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
diff --git a/Externals/wxWidgets3/include/wx/msw/statbox.h b/Externals/wxWidgets3/include/wx/msw/statbox.h
index 578bfd7a69..7721ccacb1 100644
--- a/Externals/wxWidgets3/include/wx/msw/statbox.h
+++ b/Externals/wxWidgets3/include/wx/msw/statbox.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: statbox.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/statline.h b/Externals/wxWidgets3/include/wx/msw/statline.h
index 002f8dc8ce..1d2662b3bb 100644
--- a/Externals/wxWidgets3/include/wx/msw/statline.h
+++ b/Externals/wxWidgets3/include/wx/msw/statline.h
@@ -3,7 +3,6 @@
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/stattext.h b/Externals/wxWidgets3/include/wx/msw/stattext.h
index 7fbc8fd83d..9bbcca7141 100644
--- a/Externals/wxWidgets3/include/wx/msw/stattext.h
+++ b/Externals/wxWidgets3/include/wx/msw/stattext.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: stattext.h 61169 2009-06-22 20:36:13Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/statusbar.h b/Externals/wxWidgets3/include/wx/msw/statusbar.h
index c69be90c93..b1d352a7cc 100644
--- a/Externals/wxWidgets3/include/wx/msw/statusbar.h
+++ b/Externals/wxWidgets3/include/wx/msw/statusbar.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.04.98
-// RCS-ID:      $Id: statusbar.h 70310 2012-01-10 17:01:09Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/stdpaths.h b/Externals/wxWidgets3/include/wx/msw/stdpaths.h
index 3ca578d71b..80ad985044 100644
--- a/Externals/wxWidgets3/include/wx/msw/stdpaths.h
+++ b/Externals/wxWidgets3/include/wx/msw/stdpaths.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: stdpaths.h 61662 2009-08-14 00:05:56Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,10 +18,6 @@
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
-    // ctor calls IgnoreAppBuildSubDirs() and also sets up the object to use
-    // both vendor and application name by default
-    wxStandardPaths();
-
     // implement base class pure virtuals
     virtual wxString GetExecutablePath() const;
     virtual wxString GetConfigDir() const;
@@ -67,6 +62,13 @@ public:
     static wxString MSWGetShellDir(int csidl);
 
 protected:
+    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
+    // objects of this class directly.
+    //
+    // It calls IgnoreAppBuildSubDirs() and also sets up the object to use
+    // both vendor and application name by default.
+    wxStandardPaths();
+
     // get the path corresponding to the given standard CSIDL_XXX constant
     static wxString DoGetDirectory(int csidl);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/subwin.h b/Externals/wxWidgets3/include/wx/msw/subwin.h
index cf94679403..9e48b9e35f 100644
--- a/Externals/wxWidgets3/include/wx/msw/subwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/subwin.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-11
-// RCS-ID:      $Id: subwin.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/taskbar.h b/Externals/wxWidgets3/include/wx/msw/taskbar.h
index 103f8dd82a..c9a4a11ca5 100644
--- a/Externals/wxWidgets3/include/wx/msw/taskbar.h
+++ b/Externals/wxWidgets3/include/wx/msw/taskbar.h
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by: Vaclav Slavik
 // Created:     24/3/98
-// RCS-ID:      $Id: taskbar.h 50586 2007-12-08 20:51:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,7 @@ class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
 class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:
-    wxTaskBarIcon();
+    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
 
     // Accessors
diff --git a/Externals/wxWidgets3/include/wx/msw/textctrl.h b/Externals/wxWidgets3/include/wx/msw/textctrl.h
index cbcf8b772e..14265e7983 100644
--- a/Externals/wxWidgets3/include/wx/msw/textctrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/textctrl.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: textctrl.h 68450 2011-07-29 15:11:54Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -236,6 +235,7 @@ protected:
     bool SendUpdateEvent();
 
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
 #if wxUSE_RICHEDIT
     // Apply the character-related parts of wxTextAttr to the given selection
diff --git a/Externals/wxWidgets3/include/wx/msw/textentry.h b/Externals/wxWidgets3/include/wx/msw/textentry.h
index 3ba6dcb2ea..80b9e23966 100644
--- a/Externals/wxWidgets3/include/wx/msw/textentry.h
+++ b/Externals/wxWidgets3/include/wx/msw/textentry.h
@@ -3,7 +3,6 @@
 // Purpose:     wxMSW-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-26
-// RCS-ID:      $Id: textentry.h 68918 2011-08-27 14:11:13Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -75,7 +74,9 @@ protected:
     // wxUSE_OLE as OleInitialize() is not called then
 #if wxUSE_OLE
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
+#if wxUSE_DYNLIB_CLASS
     virtual bool DoAutoCompleteFileNames(int flags);
+#endif // wxUSE_DYNLIB_CLASS
     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
 #endif // wxUSE_OLE
 
diff --git a/Externals/wxWidgets3/include/wx/msw/tglbtn.h b/Externals/wxWidgets3/include/wx/msw/tglbtn.h
index 7711f70bb6..091978b865 100644
--- a/Externals/wxWidgets3/include/wx/msw/tglbtn.h
+++ b/Externals/wxWidgets3/include/wx/msw/tglbtn.h
@@ -5,7 +5,6 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/timectrl.h b/Externals/wxWidgets3/include/wx/msw/timectrl.h
index 8fbb70196e..c5bc83aec6 100644
--- a/Externals/wxWidgets3/include/wx/msw/timectrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/timectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTimePickerCtrl for Windows.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22
-// RCS-ID:      $Id: timectrl.h 69224 2011-09-29 13:43:15Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,7 +50,9 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
+#if wxUSE_INTL
     virtual wxLocaleInfo MSWGetFormat() const;
+#endif // wxUSE_INTL
     virtual bool MSWAllowsNone() const { return false; }
     virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/tls.h b/Externals/wxWidgets3/include/wx/msw/tls.h
index b42ee7694e..9d46cadf3e 100644
--- a/Externals/wxWidgets3/include/wx/msw/tls.h
+++ b/Externals/wxWidgets3/include/wx/msw/tls.h
@@ -3,7 +3,6 @@
 // Purpose:     Win32 implementation of wxTlsValue<>
 // Author:      Vadim Zeitlin
 // Created:     2008-08-08
-// RCS-ID:      $Id: tls.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/toolbar.h b/Externals/wxWidgets3/include/wx/msw/toolbar.h
index 1fe458f2aa..0c6b7e9c9a 100644
--- a/Externals/wxWidgets3/include/wx/msw/toolbar.h
+++ b/Externals/wxWidgets3/include/wx/msw/toolbar.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +26,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr)
     {
         Init();
@@ -39,7 +38,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr);
 
     virtual ~wxToolBar();
@@ -67,6 +66,7 @@ public:
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
 
     void SetFocus() {}
 
diff --git a/Externals/wxWidgets3/include/wx/msw/tooltip.h b/Externals/wxWidgets3/include/wx/msw/tooltip.h
index 0a42cb5429..39ffe0d6da 100644
--- a/Externals/wxWidgets3/include/wx/msw/tooltip.h
+++ b/Externals/wxWidgets3/include/wx/msw/tooltip.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id: tooltip.h 66053 2010-11-07 13:12:16Z VZ $
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,7 +59,7 @@ public:
     static void RelayEvent(WXMSG *msg);
 
     // add a window to the tooltip control
-    void Add(WXHWND hwnd);
+    void AddOtherWindow(WXHWND hwnd);
 
     // remove any tooltip from the window
     static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc);
@@ -72,7 +71,7 @@ public:
 
 private:
     // Adds a window other than our main m_window to this tooltip.
-    void DoAddOtherWindow(WXHWND hWnd);
+    void DoAddHWND(WXHWND hWnd);
 
     // Perform the specified operation for the given window only.
     void DoSetTip(WXHWND hWnd);
diff --git a/Externals/wxWidgets3/include/wx/msw/toplevel.h b/Externals/wxWidgets3/include/wx/msw/toplevel.h
index 55afcbdb17..fd1de18d80 100644
--- a/Externals/wxWidgets3/include/wx/msw/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/msw/toplevel.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.01
-// RCS-ID:      $Id: toplevel.h 70881 2012-03-12 11:42:49Z JS $
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -122,6 +121,22 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
+#if wxUSE_MENUS
+    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
+
+    // handle WM_EXITMENULOOP message for Win95 only
+    bool HandleExitMenuLoop(WXWORD isPopup);
+
+    // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE
+    bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu);
+
+    // Command part of HandleMenuPopup() and HandleExitMenuLoop().
+    bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup);
+
+    // Find the menu corresponding to the given handle.
+    virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
+#endif // wxUSE_MENUS
+
 protected:
     // common part of all ctors
     void Init();
@@ -236,6 +251,10 @@ private:
     // MSWGetSystemMenu(). Owned by this window.
     wxMenu *m_menuSystem;
 
+    // The number of currently opened menus: 0 initially, 1 when a top level
+    // menu is opened, 2 when its submenu is opened and so on.
+    int m_menuDepth;
+
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };
diff --git a/Externals/wxWidgets3/include/wx/msw/treectrl.h b/Externals/wxWidgets3/include/wx/msw/treectrl.h
index c20974e8ab..341f31b528 100644
--- a/Externals/wxWidgets3/include/wx/msw/treectrl.h
+++ b/Externals/wxWidgets3/include/wx/msw/treectrl.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10/10/98
 // Created:     01/02/97
-// RCS-ID:      $Id: treectrl.h 64532 2010-06-09 13:55:48Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -212,6 +211,14 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
+    // Implement "update locking" in a custom way for this control.
+    virtual void DoFreeze();
+    virtual void DoThaw();
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
     // SetImageList helper
     void SetAnyImageList(wxImageList *imageList, int which);
 
@@ -297,6 +304,9 @@ private:
     // item visually spans the entire breadth of the window then
     bool MSWIsOnItem(unsigned flags) const;
 
+    // Delete the given item from the native control.
+    bool MSWDeleteItem(const wxTreeItemId& item);
+
 
     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;
@@ -332,6 +342,9 @@ private:
     // whether we need to deselect other items on mouse up
     bool m_mouseUpDeselect;
 
+    // The size to restore the control to when it is thawed, see DoThaw().
+    wxSize m_thawnSize;
+
     friend class wxTreeItemIndirectData;
     friend class wxTreeSortHelper;
 
diff --git a/Externals/wxWidgets3/include/wx/msw/uxtheme.h b/Externals/wxWidgets3/include/wx/msw/uxtheme.h
index 75d9262a18..5c4eae981d 100644
--- a/Externals/wxWidgets3/include/wx/msw/uxtheme.h
+++ b/Externals/wxWidgets3/include/wx/msw/uxtheme.h
@@ -4,7 +4,6 @@
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
-// RCS-ID:      $Id: uxtheme.h 65955 2010-10-30 23:50:22Z VZ $
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/webview_ie.h b/Externals/wxWidgets3/include/wx/msw/webview_ie.h
index 62b9a49a01..bc19ee85ae 100644
--- a/Externals/wxWidgets3/include/wx/msw/webview_ie.h
+++ b/Externals/wxWidgets3/include/wx/msw/webview_ie.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/webviewie.h
+// Name:        include/wx/msw/webview_ie.h
 // Purpose:     wxMSW IE wxWebView backend
 // Author:      Marianne Gagnon
-// Id:          $Id: webview_ie.h 70499 2012-02-02 20:32:08Z SJL $
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,234 +18,22 @@
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"
 #include "wx/msw/ole/oleutils.h"
+#include "wx/msw/private/comptr.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
+#include "wx/msw/webview_missing.h"
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
-/* Classes and definitions from urlmon.h vary in their
- * completeness between compilers and versions of compilers.
- * We implement our own versions here which should work
- * for all compilers. The definitions are taken from the
- * mingw-w64 headers which are public domain.
- */
-
-#ifndef REFRESH_NORMAL
-#define REFRESH_NORMAL 0
-#endif
-
-#ifndef REFRESH_COMPLETELY
-#define REFRESH_COMPLETELY 3
-#endif
-
-typedef enum __wxMIDL_IBindStatusCallback_0006
-{
-    wxBSCF_FIRSTDATANOTIFICATION = 0x1,
-    wxBSCF_INTERMEDIATEDATANOTIFICATION = 0x2,
-    wxBSCF_LASTDATANOTIFICATION = 0x4,
-    wxBSCF_DATAFULLYAVAILABLE = 0x8,
-    wxBSCF_AVAILABLEDATASIZEUNKNOWN = 0x10
-}   wxBSCF;
-
-EXTERN_C const IID CLSID_FileProtocol;
-
-typedef struct _tagwxBINDINFO
-{
-    ULONG cbSize;
-    LPWSTR szExtraInfo;
-    STGMEDIUM stgmedData;
-    DWORD grfBindInfoF;
-    DWORD dwBindVerb;
-    LPWSTR szCustomVerb;
-    DWORD cbstgmedData;
-    DWORD dwOptions;
-    DWORD dwOptionsFlags;
-    DWORD dwCodePage;
-    SECURITY_ATTRIBUTES securityAttributes;
-    IID iid;
-    IUnknown *pUnk;
-    DWORD dwReserved;
-}   wxBINDINFO;
-
-typedef struct _tagwxPROTOCOLDATA
-{
-    DWORD grfFlags;
-    DWORD dwState;
-    LPVOID pData;
-    ULONG cbData;
-}   wxPROTOCOLDATA;
-
-class wxIInternetBindInfo : public IUnknown
-{
-public:
-    virtual HRESULT wxSTDCALL GetBindInfo(DWORD *grfBINDF,wxBINDINFO *pbindinfo) = 0;
-    virtual HRESULT wxSTDCALL GetBindString(ULONG ulStringType,LPOLESTR *ppwzStr,
-                                         ULONG cEl,ULONG *pcElFetched) = 0;
-};
-
-class wxIInternetProtocolSink : public IUnknown
-{
-public:
-    virtual HRESULT wxSTDCALL Switch(wxPROTOCOLDATA *pProtocolData) = 0;
-    virtual HRESULT wxSTDCALL ReportProgress(ULONG ulStatusCode,
-                                          LPCWSTR szStatusText) = 0;
-    virtual HRESULT wxSTDCALL ReportData(DWORD grfBSCF,ULONG ulProgress,
-                                      ULONG ulProgressMax) = 0;
-    virtual HRESULT wxSTDCALL ReportResult(HRESULT hrResult,DWORD dwError,
-                                        LPCWSTR szResult) = 0;
-};
-
-class wxIInternetProtocolRoot : public IUnknown
-{
-public:
-    virtual HRESULT wxSTDCALL Start(LPCWSTR szUrl,wxIInternetProtocolSink *pOIProtSink,
-                                 wxIInternetBindInfo *pOIBindInfo,DWORD grfPI,
-                                 HANDLE_PTR dwReserved) = 0;
-    virtual HRESULT wxSTDCALL Continue(wxPROTOCOLDATA *pProtocolData) = 0;
-    virtual HRESULT wxSTDCALL Abort(HRESULT hrReason,DWORD dwOptions) = 0;
-    virtual HRESULT wxSTDCALL Terminate(DWORD dwOptions) = 0;
-    virtual HRESULT wxSTDCALL Suspend(void) = 0;
-    virtual HRESULT wxSTDCALL Resume(void) = 0;
-};
-
-
-class wxIInternetProtocol : public wxIInternetProtocolRoot
-{
-public:
-    virtual HRESULT wxSTDCALL Read(void *pv,ULONG cb,ULONG *pcbRead) = 0;
-    virtual HRESULT wxSTDCALL Seek(LARGE_INTEGER dlibMove,DWORD dwOrigin,
-                                ULARGE_INTEGER *plibNewPosition) = 0;
-    virtual HRESULT wxSTDCALL LockRequest(DWORD dwOptions) = 0;
-    virtual HRESULT wxSTDCALL UnlockRequest(void) = 0;
-};
-
-
-class wxIInternetSession : public IUnknown
-{
-  public:
-    virtual HRESULT wxSTDCALL RegisterNameSpace(IClassFactory *pCF,REFCLSID rclsid,
-                                             LPCWSTR pwzProtocol,
-                                             ULONG cPatterns,
-                                             const LPCWSTR *ppwzPatterns,
-                                             DWORD dwReserved) = 0;
-    virtual HRESULT wxSTDCALL UnregisterNameSpace(IClassFactory *pCF,
-                                               LPCWSTR pszProtocol) = 0;
-    virtual HRESULT wxSTDCALL RegisterMimeFilter(IClassFactory *pCF,
-                                              REFCLSID rclsid,
-                                              LPCWSTR pwzType) = 0;
-    virtual HRESULT wxSTDCALL UnregisterMimeFilter(IClassFactory *pCF,
-                                                LPCWSTR pwzType) = 0;
-    virtual HRESULT wxSTDCALL CreateBinding(LPBC pBC,LPCWSTR szUrl,
-                                         IUnknown *pUnkOuter,IUnknown **ppUnk,
-                                         wxIInternetProtocol **ppOInetProt,
-                                         DWORD dwOption) = 0;
-    virtual HRESULT wxSTDCALL SetSessionOption(DWORD dwOption,LPVOID pBuffer,
-                                            DWORD dwBufferLength,
-                                            DWORD dwReserved) = 0;
-    virtual HRESULT wxSTDCALL GetSessionOption(DWORD dwOption,LPVOID pBuffer,
-                                            DWORD *pdwBufferLength,
-                                            DWORD dwReserved) = 0;
-};
-
-/* END OF URLMON.H implementation */
-
-/* Same goes for the mshtmhst.h, these are also taken
- * from mingw-w64 headers.
- */
-
-typedef enum _tagwxDOCHOSTUIFLAG
-{
-    DOCHOSTUIFLAG_DIALOG = 0x1,
-    DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x2,
-    DOCHOSTUIFLAG_NO3DBORDER = 0x4,
-    DOCHOSTUIFLAG_SCROLL_NO = 0x8,
-    DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x10,
-    DOCHOSTUIFLAG_OPENNEWWIN = 0x20,
-    DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x40,
-    DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x80,
-    DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x100,
-    DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x200,
-    DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x400,
-    DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x800,
-    DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x1000,
-    DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x2000,
-    DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x4000,
-    DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x10000,
-    DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x20000,
-    DOCHOSTUIFLAG_THEME = 0x40000,
-    DOCHOSTUIFLAG_NOTHEME = 0x80000,
-    DOCHOSTUIFLAG_NOPICS = 0x100000,
-    DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x200000,
-    DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x400000,
-    DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x800000,
-    DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x1000000
-} DOCHOSTUIFLAG;
-
-typedef struct _tagwxDOCHOSTUIINFO
-{
-    ULONG cbSize;
-    DWORD dwFlags;
-    DWORD dwDoubleClick;
-    OLECHAR *pchHostCss;
-    OLECHAR *pchHostNS;
-} DOCHOSTUIINFO;
-
-class wxIDocHostUIHandler : public IUnknown
-{
-public:
-    virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
-                                              IUnknown *pcmdtReserved,
-                                              IDispatch *pdispReserved) = 0;
-
-    virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0;
-
-    virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, 
-                                     IOleInPlaceActiveObject *pActiveObject,
-                                     IOleCommandTarget *pCommandTarget,
-                                     IOleInPlaceFrame *pFrame,
-                                     IOleInPlaceUIWindow *pDoc) = 0;
-
-    virtual HRESULT wxSTDCALL HideUI(void) = 0;
-
-    virtual HRESULT wxSTDCALL UpdateUI(void) = 0;
-    
-    virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0;
-
-    virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0;
-
-    virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) = 0;
-
-    virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder,
-                                           IOleInPlaceUIWindow *pUIWindow,
-                                           BOOL fRameWindow) = 0;
-
-    virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, 
-                                                   const GUID *pguidCmdGroup,
-                                                   DWORD nCmdID) = 0;
-
-    virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, 
-                                               DWORD dw) = 0;
-
-    virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
-                                            IDropTarget **ppDropTarget) = 0;
-
-    virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) = 0;
-
-    virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate,
-                                           OLECHAR *pchURLIn,
-                                           OLECHAR **ppchURLOut) = 0;
-
-    virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO,
-                                               IDataObject **ppDORet) = 0;
-};
-
-/* END OF MSHTMHST.H implementation */
-
 struct IHTMLDocument2;
+struct IHTMLElement;
+struct IMarkupPointer;
 class wxFSFile;
 class ClassFactory;
 class wxIEContainer;
 class DocHostUIHandler;
+class wxFindPointers;
+class wxIInternetProtocol;
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView
 {
@@ -287,7 +74,7 @@ public:
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);
     virtual void Stop();
-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
 
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
@@ -302,8 +89,6 @@ public:
 
     virtual void Print();
 
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);
-
     virtual wxWebViewZoom GetZoom() const;
     virtual void SetZoom(wxWebViewZoom zoom);
 
@@ -321,6 +106,9 @@ public:
     virtual void Undo();
     virtual void Redo();
 
+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT);
+
     //Editing functions
     virtual void SetEditable(bool enable = true);
     virtual bool IsEditable() const;
@@ -338,6 +126,8 @@ public:
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
 
+    virtual void* GetNativeBackend() const { return m_webBrowser; }
+
     // ---- IE-specific methods
 
     // FIXME: I seem to be able to access remote webpages even in offline mode...
@@ -355,12 +145,15 @@ public:
 
     DECLARE_EVENT_TABLE();
 
+protected:
+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
+
 private:
     wxIEContainer* m_container;
     wxAutomationObject m_ie;
     IWebBrowser2* m_webBrowser;
     DWORD m_dwCookie;
-    DocHostUIHandler* m_uiHandler;
+    wxCOMPtr<DocHostUIHandler> m_uiHandler;
 
     //We store the current zoom type;
     wxWebViewZoomType m_zoomType;
@@ -380,16 +173,41 @@ private:
     bool m_historyLoadingFromList;
     bool m_historyEnabled;
 
-    //Generic helper functions for IHtmlDocument commands
+    //We store find flag, results and position.
+    wxVector<wxFindPointers> m_findPointers;
+    int m_findFlags;
+    wxString m_findText;
+    int m_findPosition;
+
+    //Generic helper functions
     bool CanExecCommand(wxString command) const;
     void ExecCommand(wxString command);
-    IHTMLDocument2* GetDocument() const;
+    wxCOMPtr<IHTMLDocument2> GetDocument() const;
+    bool IsElementVisible(wxCOMPtr<IHTMLElement> elm);
+    //Find helper functions.
+    void FindInternal(const wxString& text, int flags, int internal_flag);
+    long FindNext(int direction = 1);
+    void FindClear();
     //Toggles control features see INTERNETFEATURELIST for values.
     bool EnableControlFeature(long flag, bool enable = true);
 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);
 };
 
+class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory
+{
+public:
+    virtual wxWebView* Create() { return new wxWebViewIE; }
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr)
+    { return new wxWebViewIE(parent, id, url, pos, size, style, name); }
+};
+
 class VirtualProtocol : public wxIInternetProtocol
 {
 protected:
@@ -402,7 +220,7 @@ protected:
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);
-    ~VirtualProtocol() {}
+    virtual ~VirtualProtocol() {}
 
     //IUnknown
     DECLARE_IUNKNOWN_METHODS;
@@ -436,7 +254,11 @@ public:
 class ClassFactory : public IClassFactory
 {
 public:
-    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) {}
+    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) 
+        { AddRef(); }
+    virtual ~ClassFactory() {}
+
+    wxString GetName() { return m_handler->GetName(); }
 
     //IClassFactory
     HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
@@ -463,12 +285,13 @@ private:
 class DocHostUIHandler : public wxIDocHostUIHandler
 {
 public:
-    DocHostUIHandler() {};
-    ~DocHostUIHandler() {};
+    DocHostUIHandler(wxWebView* browser) { m_browser = browser; }
+    virtual ~DocHostUIHandler() {}
+
     virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
                                               IUnknown *pcmdtReserved,
                                               IDispatch *pdispReserved);
-    
+
     virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo);
 
     virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
@@ -495,7 +318,7 @@ public:
                                                    const GUID *pguidCmdGroup,
                                                    DWORD nCmdID);
 
-    virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, 
+    virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
                                                DWORD dw);
 
     virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
@@ -511,6 +334,21 @@ public:
                                                IDataObject **ppDORet);
     //IUnknown
     DECLARE_IUNKNOWN_METHODS;
+
+private:
+    wxWebView* m_browser;
+};
+
+class wxFindPointers
+{
+public:
+    wxFindPointers(wxIMarkupPointer *ptrBegin, wxIMarkupPointer *ptrEnd)
+    {
+        begin = ptrBegin;
+        end = ptrEnd;
+    }
+    //The two markup pointers.
+    wxIMarkupPointer *begin, *end;
 };
 
 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__)
diff --git a/Externals/wxWidgets3/include/wx/msw/webview_missing.h b/Externals/wxWidgets3/include/wx/msw/webview_missing.h
new file mode 100644
index 0000000000..fc2b8bc045
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/msw/webview_missing.h
@@ -0,0 +1,947 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/msw/webview_missing.h
+// Purpose:     Defintions / classes commonly missing used by wxWebViewIE
+// Author:      Steven Lamerton
+// Copyright:   (c) 2012 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Classes and definitions used by wxWebViewIE vary in their
+ * completeness between compilers and versions of compilers.
+ * We implement our own versions here which should work
+ * for all compilers. The definitions are taken from the
+ * mingw-w64 headers which are public domain.
+*/
+
+/* urlmon.h */
+
+struct IHTMLElement;
+struct IHTMLDocument2;
+
+#ifndef REFRESH_NORMAL
+#define REFRESH_NORMAL 0
+#endif
+
+#ifndef REFRESH_COMPLETELY
+#define REFRESH_COMPLETELY 3
+#endif
+
+typedef enum __wxMIDL_IBindStatusCallback_0006
+{
+    wxBSCF_FIRSTDATANOTIFICATION = 0x1,
+    wxBSCF_INTERMEDIATEDATANOTIFICATION = 0x2,
+    wxBSCF_LASTDATANOTIFICATION = 0x4,
+    wxBSCF_DATAFULLYAVAILABLE = 0x8,
+    wxBSCF_AVAILABLEDATASIZEUNKNOWN = 0x10
+}   wxBSCF;
+
+EXTERN_C const IID CLSID_FileProtocol;
+
+typedef struct _tagwxBINDINFO
+{
+    ULONG cbSize;
+    LPWSTR szExtraInfo;
+    STGMEDIUM stgmedData;
+    DWORD grfBindInfoF;
+    DWORD dwBindVerb;
+    LPWSTR szCustomVerb;
+    DWORD cbstgmedData;
+    DWORD dwOptions;
+    DWORD dwOptionsFlags;
+    DWORD dwCodePage;
+    SECURITY_ATTRIBUTES securityAttributes;
+    IID iid;
+    IUnknown *pUnk;
+    DWORD dwReserved;
+}   wxBINDINFO;
+
+typedef struct _tagwxPROTOCOLDATA
+{
+    DWORD grfFlags;
+    DWORD dwState;
+    LPVOID pData;
+    ULONG cbData;
+}   wxPROTOCOLDATA;
+
+class wxIInternetBindInfo : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL GetBindInfo(DWORD *grfBINDF, wxBINDINFO *pbindinfo) = 0;
+    virtual HRESULT wxSTDCALL GetBindString(ULONG ulStringType, LPOLESTR *ppwzStr,
+                                            ULONG cEl, ULONG *pcElFetched) = 0;
+};
+
+class wxIInternetProtocolSink : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL Switch(wxPROTOCOLDATA *pProtocolData) = 0;
+    virtual HRESULT wxSTDCALL ReportProgress(ULONG ulStatusCode,
+            LPCWSTR szStatusText) = 0;
+    virtual HRESULT wxSTDCALL ReportData(DWORD grfBSCF, ULONG ulProgress,
+                                         ULONG ulProgressMax) = 0;
+    virtual HRESULT wxSTDCALL ReportResult(HRESULT hrResult, DWORD dwError,
+                                           LPCWSTR szResult) = 0;
+};
+
+class wxIInternetProtocolRoot : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
+                                    wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
+                                    HANDLE_PTR dwReserved) = 0;
+    virtual HRESULT wxSTDCALL Continue(wxPROTOCOLDATA *pProtocolData) = 0;
+    virtual HRESULT wxSTDCALL Abort(HRESULT hrReason, DWORD dwOptions) = 0;
+    virtual HRESULT wxSTDCALL Terminate(DWORD dwOptions) = 0;
+    virtual HRESULT wxSTDCALL Suspend(void) = 0;
+    virtual HRESULT wxSTDCALL Resume(void) = 0;
+};
+
+
+class wxIInternetProtocol : public wxIInternetProtocolRoot
+{
+public:
+    virtual HRESULT wxSTDCALL Read(void *pv, ULONG cb, ULONG *pcbRead) = 0;
+    virtual HRESULT wxSTDCALL Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin,
+                                   ULARGE_INTEGER *plibNewPosition) = 0;
+    virtual HRESULT wxSTDCALL LockRequest(DWORD dwOptions) = 0;
+    virtual HRESULT wxSTDCALL UnlockRequest(void) = 0;
+};
+
+
+class wxIInternetSession : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL RegisterNameSpace(IClassFactory *pCF, REFCLSID rclsid,
+            LPCWSTR pwzProtocol,
+            ULONG cPatterns,
+            const LPCWSTR *ppwzPatterns,
+            DWORD dwReserved) = 0;
+    virtual HRESULT wxSTDCALL UnregisterNameSpace(IClassFactory *pCF,
+            LPCWSTR pszProtocol) = 0;
+    virtual HRESULT wxSTDCALL RegisterMimeFilter(IClassFactory *pCF,
+            REFCLSID rclsid,
+            LPCWSTR pwzType) = 0;
+    virtual HRESULT wxSTDCALL UnregisterMimeFilter(IClassFactory *pCF,
+            LPCWSTR pwzType) = 0;
+    virtual HRESULT wxSTDCALL CreateBinding(LPBC pBC, LPCWSTR szUrl,
+                                            IUnknown *pUnkOuter, IUnknown **ppUnk,
+                                            wxIInternetProtocol **ppOInetProt,
+                                            DWORD dwOption) = 0;
+    virtual HRESULT wxSTDCALL SetSessionOption(DWORD dwOption, LPVOID pBuffer,
+            DWORD dwBufferLength,
+            DWORD dwReserved) = 0;
+    virtual HRESULT wxSTDCALL GetSessionOption(DWORD dwOption, LPVOID pBuffer,
+            DWORD *pdwBufferLength,
+            DWORD dwReserved) = 0;
+};
+
+/* end of urlmon.h */
+
+/* mshtmhst.h */
+
+typedef enum _tagwxDOCHOSTUIFLAG
+{
+    DOCHOSTUIFLAG_DIALOG = 0x1,
+    DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x2,
+    DOCHOSTUIFLAG_NO3DBORDER = 0x4,
+    DOCHOSTUIFLAG_SCROLL_NO = 0x8,
+    DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x10,
+    DOCHOSTUIFLAG_OPENNEWWIN = 0x20,
+    DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x40,
+    DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x80,
+    DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x100,
+    DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x200,
+    DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x400,
+    DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x800,
+    DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x1000,
+    DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x2000,
+    DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x4000,
+    DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x10000,
+    DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x20000,
+    DOCHOSTUIFLAG_THEME = 0x40000,
+    DOCHOSTUIFLAG_NOTHEME = 0x80000,
+    DOCHOSTUIFLAG_NOPICS = 0x100000,
+    DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x200000,
+    DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x400000,
+    DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x800000,
+    DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x1000000
+} DOCHOSTUIFLAG;
+
+typedef struct _tagwxDOCHOSTUIINFO
+{
+    ULONG cbSize;
+    DWORD dwFlags;
+    DWORD dwDoubleClick;
+    OLECHAR *pchHostCss;
+    OLECHAR *pchHostNS;
+} DOCHOSTUIINFO;
+
+class wxIDocHostUIHandler : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
+            IUnknown *pcmdtReserved,
+            IDispatch *pdispReserved) = 0;
+
+    virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0;
+
+    virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
+                                     IOleInPlaceActiveObject *pActiveObject,
+                                     IOleCommandTarget *pCommandTarget,
+                                     IOleInPlaceFrame *pFrame,
+                                     IOleInPlaceUIWindow *pDoc) = 0;
+
+    virtual HRESULT wxSTDCALL HideUI(void) = 0;
+
+    virtual HRESULT wxSTDCALL UpdateUI(void) = 0;
+
+    virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0;
+
+    virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0;
+
+    virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) = 0;
+
+    virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder,
+                                           IOleInPlaceUIWindow *pUIWindow,
+                                           BOOL fRameWindow) = 0;
+
+    virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
+            const GUID *pguidCmdGroup,
+            DWORD nCmdID) = 0;
+
+    virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
+            DWORD dw) = 0;
+
+    virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
+                                            IDropTarget **ppDropTarget) = 0;
+
+    virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) = 0;
+
+    virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate,
+                                           OLECHAR *pchURLIn,
+                                           OLECHAR **ppchURLOut) = 0;
+
+    virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO,
+            IDataObject **ppDORet) = 0;
+};
+
+/* end of mshtmhst.h */
+
+/* mshtml.h */
+
+typedef enum _tagwxPOINTER_GRAVITY
+{
+    wxPOINTER_GRAVITY_Left = 0,
+    wxPOINTER_GRAVITY_Right = 1,
+    wxPOINTER_GRAVITY_Max = 2147483647
+} wxPOINTER_GRAVITY;
+
+typedef enum _tagwxELEMENT_ADJACENCY
+{
+    wxELEM_ADJ_BeforeBegin = 0,
+    wxELEM_ADJ_AfterBegin = 1,
+    wxELEM_ADJ_BeforeEnd = 2,
+    wxELEM_ADJ_AfterEnd = 3,
+    wxELEMENT_ADJACENCY_Max = 2147483647
+} wxELEMENT_ADJACENCY;
+
+typedef enum _tagwxMARKUP_CONTEXT_TYPE
+{
+    wxCONTEXT_TYPE_None = 0,
+    wxCONTEXT_TYPE_Text = 1,
+    wxCONTEXT_TYPE_EnterScope = 2,
+    wxCONTEXT_TYPE_ExitScope = 3,
+    wxCONTEXT_TYPE_NoScope = 4,
+    wxMARKUP_CONTEXT_TYPE_Max = 2147483647
+} wxMARKUP_CONTEXT_TYPE;
+
+typedef enum _tagwxFINDTEXT_FLAGS
+{
+    wxFINDTEXT_BACKWARDS = 0x1,
+    wxFINDTEXT_WHOLEWORD = 0x2,
+    wxFINDTEXT_MATCHCASE = 0x4,
+    wxFINDTEXT_RAW = 0x20000,
+    wxFINDTEXT_MATCHDIAC = 0x20000000,
+    wxFINDTEXT_MATCHKASHIDA = 0x40000000,
+    wxFINDTEXT_MATCHALEFHAMZA = 0x80000000,
+    wxFINDTEXT_FLAGS_Max = 2147483647
+} wxFINDTEXT_FLAGS;
+
+typedef enum _tagwxMOVEUNIT_ACTION
+{
+    wxMOVEUNIT_PREVCHAR = 0,
+    wxMOVEUNIT_NEXTCHAR = 1,
+    wxMOVEUNIT_PREVCLUSTERBEGIN = 2,
+    wxMOVEUNIT_NEXTCLUSTERBEGIN = 3,
+    wxMOVEUNIT_PREVCLUSTEREND = 4,
+    wxMOVEUNIT_NEXTCLUSTEREND = 5,
+    wxMOVEUNIT_PREVWORDBEGIN = 6,
+    wxMOVEUNIT_NEXTWORDBEGIN = 7,
+    wxMOVEUNIT_PREVWORDEND = 8,
+    wxMOVEUNIT_NEXTWORDEND = 9,
+    wxMOVEUNIT_PREVPROOFWORD = 10,
+    wxMOVEUNIT_NEXTPROOFWORD = 11,
+    wxMOVEUNIT_NEXTURLBEGIN = 12,
+    wxMOVEUNIT_PREVURLBEGIN = 13,
+    wxMOVEUNIT_NEXTURLEND = 14,
+    wxMOVEUNIT_PREVURLEND = 15,
+    wxMOVEUNIT_PREVSENTENCE = 16,
+    wxMOVEUNIT_NEXTSENTENCE = 17,
+    wxMOVEUNIT_PREVBLOCK = 18,
+    wxMOVEUNIT_NEXTBLOCK = 19,
+    wxMOVEUNIT_ACTION_Max = 2147483647
+} wxMOVEUNIT_ACTION;
+
+typedef enum _tagwxELEMENT_TAG_ID
+{
+    wxTAGID_NULL = 0, wxTAGID_UNKNOWN = 1, wxTAGID_A = 2, wxTAGID_ACRONYM = 3,
+    wxTAGID_ADDRESS = 4, wxTAGID_APPLET = 5, wxTAGID_AREA = 6, wxTAGID_B = 7,
+    wxTAGID_BASE = 8, wxTAGID_BASEFONT = 9, wxTAGID_BDO = 10, 
+    wxTAGID_BGSOUND = 11, wxTAGID_BIG = 12, wxTAGID_BLINK = 13, 
+    wxTAGID_BLOCKQUOTE = 14, wxTAGID_BODY = 15, wxTAGID_BR = 16,
+    wxTAGID_BUTTON = 17, wxTAGID_CAPTION = 18, wxTAGID_CENTER = 19,
+    wxTAGID_CITE = 20, wxTAGID_CODE = 21, wxTAGID_COL = 22,
+    wxTAGID_COLGROUP = 23, wxTAGID_COMMENT = 24, wxTAGID_COMMENT_RAW = 25,
+    wxTAGID_DD = 26, wxTAGID_DEL = 27, wxTAGID_DFN = 28, wxTAGID_DIR = 29,
+    wxTAGID_DIV = 30, wxTAGID_DL = 31, wxTAGID_DT = 32, wxTAGID_EM = 33,
+    wxTAGID_EMBED = 34, wxTAGID_FIELDSET = 35, wxTAGID_FONT = 36,
+    wxTAGID_FORM = 37, wxTAGID_FRAME = 38, wxTAGID_FRAMESET = 39,
+    wxTAGID_GENERIC = 40, wxTAGID_H1 = 41, wxTAGID_H2 = 42, wxTAGID_H3 = 43,
+    wxTAGID_H4 = 44, wxTAGID_H5 = 45, wxTAGID_H6 = 46, wxTAGID_HEAD = 47,
+    wxTAGID_HR = 48, wxTAGID_HTML = 49, wxTAGID_I = 50, wxTAGID_IFRAME = 51,
+    wxTAGID_IMG = 52, wxTAGID_INPUT = 53, wxTAGID_INS = 54, wxTAGID_KBD = 55,
+    wxTAGID_LABEL = 56, wxTAGID_LEGEND = 57, wxTAGID_LI = 58, wxTAGID_LINK = 59,
+    wxTAGID_LISTING = 60, wxTAGID_MAP = 61, wxTAGID_MARQUEE = 62,
+    wxTAGID_MENU = 63, wxTAGID_META = 64, wxTAGID_NEXTID = 65,
+    wxTAGID_NOBR = 66, wxTAGID_NOEMBED = 67, wxTAGID_NOFRAMES = 68,
+    wxTAGID_NOSCRIPT = 69, wxTAGID_OBJECT = 70, wxTAGID_OL = 71,
+    wxTAGID_OPTION = 72, wxTAGID_P = 73, wxTAGID_PARAM = 74,
+    wxTAGID_PLAINTEXT = 75, wxTAGID_PRE = 76, wxTAGID_Q = 77, wxTAGID_RP = 78,
+    wxTAGID_RT = 79, wxTAGID_RUBY = 80, wxTAGID_S = 81, wxTAGID_SAMP = 82,
+    wxTAGID_SCRIPT = 83, wxTAGID_SELECT = 84, wxTAGID_SMALL = 85,
+    wxTAGID_SPAN = 86, wxTAGID_STRIKE = 87, wxTAGID_STRONG = 88,
+    wxTAGID_STYLE = 89, wxTAGID_SUB = 90, wxTAGID_SUP = 91, wxTAGID_TABLE = 92,
+    wxTAGID_TBODY = 93, wxTAGID_TC = 94, wxTAGID_TD = 95, wxTAGID_TEXTAREA = 96,
+    wxTAGID_TFOOT = 97, wxTAGID_TH = 98, wxTAGID_THEAD = 99,
+    wxTAGID_TITLE = 100, wxTAGID_TR = 101, wxTAGID_TT = 102, wxTAGID_U = 103,
+    wxTAGID_UL = 104, wxTAGID_VAR = 105, wxTAGID_WBR = 106, wxTAGID_XMP = 107,
+    wxTAGID_ROOT = 108, wxTAGID_OPTGROUP = 109, wxTAGID_COUNT = 110,
+    wxTAGID_LAST_PREDEFINED = 10000, wxELEMENT_TAG_ID_Max = 2147483647
+} wxELEMENT_TAG_ID;
+
+struct wxIHTMLStyle : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL put_fontFamily(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_fontFamily(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_fontStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_fontStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_fontVariant(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_fontVariant(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_fontWeight(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_fontWeight(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_fontSize(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_fontSize(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_font(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_font(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_color(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_color(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_background(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_background(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundColor(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundImage(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundImage(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundRepeat(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundRepeat(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundAttachment(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundAttachment(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundPosition(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundPosition(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundPositionX(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundPositionX(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_backgroundPositionY(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundPositionY(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_wordSpacing(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_wordSpacing(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_letterSpacing(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_letterSpacing(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecoration(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecoration(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecorationNone(VARIANT_BOOL v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecorationNone(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecorationUnderline(VARIANT_BOOL v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecorationUnderline(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecorationOverline(VARIANT_BOOL v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecorationOverline(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecorationLineThrough(VARIANT_BOOL v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecorationLineThrough(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL put_textDecorationBlink(VARIANT_BOOL v) = 0;
+    virtual HRESULT wxSTDCALL get_textDecorationBlink(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL put_verticalAlign(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_verticalAlign(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_textTransform(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_textTransform(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_textAlign(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_textAlign(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_textIndent(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_textIndent(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_lineHeight(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_lineHeight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_marginTop(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_marginTop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_marginRight(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_marginRight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_marginBottom(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_marginBottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_marginLeft(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_marginLeft(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_margin(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_margin(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_paddingTop(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_paddingTop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_paddingRight(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_paddingRight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_paddingBottom(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_paddingBottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_paddingLeft(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_paddingLeft(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_padding(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_padding(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_border(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_border(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderTop(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderTop(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderRight(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderRight(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderBottom(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottom(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderLeft(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeft(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderColor(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderColor(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderTopColor(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderRightColor(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderBottomColor(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderLeftColor(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderWidth(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderWidth(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderTopWidth(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderRightWidth(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderBottomWidth(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderLeftWidth(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderTopStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderRightStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderBottomStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_borderLeftStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_width(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_width(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_height(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_height(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_styleFloat(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_styleFloat(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_clear(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_clear(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_display(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_display(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_visibility(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_visibility(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_listStyleType(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_listStyleType(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_listStylePosition(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_listStylePosition(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_listStyleImage(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_listStyleImage(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_listStyle(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_listStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_whiteSpace(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_whiteSpace(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_top(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_top(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_left(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_left(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_position(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_zIndex(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_zIndex(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_overflow(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_overflow(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_pageBreakBefore(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_pageBreakBefore(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_pageBreakAfter(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_pageBreakAfter(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_cssText(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_cssText(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_pixelTop(long v) = 0;
+    virtual HRESULT wxSTDCALL get_pixelTop(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_pixelLeft(long v) = 0;
+    virtual HRESULT wxSTDCALL get_pixelLeft(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_pixelWidth(long v) = 0;
+    virtual HRESULT wxSTDCALL get_pixelWidth(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_pixelHeight(long v) = 0;
+    virtual HRESULT wxSTDCALL get_pixelHeight(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_posTop(float v) = 0;
+    virtual HRESULT wxSTDCALL get_posTop(float *p) = 0;
+    virtual HRESULT wxSTDCALL put_posLeft(float v) = 0;
+    virtual HRESULT wxSTDCALL get_posLeft(float *p) = 0;
+    virtual HRESULT wxSTDCALL put_posWidth(float v) = 0;
+    virtual HRESULT wxSTDCALL get_posWidth(float *p) = 0;
+    virtual HRESULT wxSTDCALL put_posHeight(float v) = 0;
+    virtual HRESULT wxSTDCALL get_posHeight(float *p) = 0;
+    virtual HRESULT wxSTDCALL put_cursor(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_cursor(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_clip(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_clip(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_filter(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_filter(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL setAttribute(BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags = 1) = 0;
+    virtual HRESULT wxSTDCALL getAttribute(BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) = 0;
+    virtual HRESULT wxSTDCALL removeAttribute(BSTR strAttributeName, LONG lFlags, VARIANT_BOOL *pfSuccess) = 0;
+    virtual HRESULT wxSTDCALL toString(BSTR *String) = 0;
+};
+
+struct wxIHTMLCurrentStyle : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL get_position(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_styleFloat(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_color(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_fontFamily(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_fontStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_fontVariant(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_fontWeight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_fontSize(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundImage(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundPositionX(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundPositionY(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundRepeat(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomColor(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderTopWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderRightWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderBottomWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderLeftWidth(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_left(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_top(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_width(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_height(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_paddingLeft(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_paddingTop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_paddingRight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_paddingBottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_textAlign(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textDecoration(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_display(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_visibility(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_zIndex(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_letterSpacing(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_lineHeight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_textIndent(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_verticalAlign(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_backgroundAttachment(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_marginTop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_marginRight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_marginBottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_marginLeft(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_clear(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_listStyleType(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_listStylePosition(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_listStyleImage(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_clipTop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_clipRight(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_clipBottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_clipLeft(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_overflow(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_pageBreakBefore(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_pageBreakAfter(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_cursor(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_tableLayout(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderCollapse(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_direction(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_behavior(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL getAttribute(BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) = 0;
+    virtual HRESULT wxSTDCALL get_unicodeBidi(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_right(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_bottom(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_imeMode(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_rubyAlign(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_rubyPosition(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_rubyOverhang(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textAutospace(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_lineBreak(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_wordBreak(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textJustify(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textJustifyTrim(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textKashida(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_blockDirection(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_layoutGridChar(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_layoutGridLine(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_layoutGridMode(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_layoutGridType(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderStyle(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderColor(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_borderWidth(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_padding(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_margin(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_accelerator(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_overflowX(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_overflowY(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL get_textTransform(BSTR *p) = 0;
+};
+
+
+struct wxIHTMLRect : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL put_left(long v) = 0;
+    virtual HRESULT wxSTDCALL get_left(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_top(long v) = 0;
+    virtual HRESULT wxSTDCALL get_top(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_right(long v) = 0;
+    virtual HRESULT wxSTDCALL get_right(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_bottom(long v) = 0;
+    virtual HRESULT wxSTDCALL get_bottom(long *p) = 0;
+};
+
+struct wxIHTMLRectCollection : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL get_length(long *p) = 0;
+    virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0;
+    virtual HRESULT wxSTDCALL item(VARIANT *pvarIndex, VARIANT *pvarResult) = 0;
+};
+
+struct wxIHTMLFiltersCollection : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL get_length(long *p) = 0;
+    virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0;
+    virtual HRESULT wxSTDCALL item(VARIANT *pvarIndex, VARIANT *pvarResult) = 0;
+};
+
+struct wxIHTMLElementCollection : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL toString(BSTR *String) = 0;
+    virtual HRESULT wxSTDCALL put_length(long v) = 0;
+    virtual HRESULT wxSTDCALL get_length(long *p) = 0;
+    virtual HRESULT wxSTDCALL get__newEnum(IUnknown **p) = 0;
+    virtual HRESULT wxSTDCALL item(VARIANT name, VARIANT index, IDispatch **pdisp) = 0;
+    virtual HRESULT wxSTDCALL tags(VARIANT tagName, IDispatch **pdisp) = 0;
+};
+
+struct wxIHTMLElement2 : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL get_scopeName(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL setCapture(VARIANT_BOOL containerCapture = -1) = 0;
+    virtual HRESULT wxSTDCALL releaseCapture(void) = 0;
+    virtual HRESULT wxSTDCALL put_onlosecapture(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onlosecapture(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL componentFromPoint(long x, long y, BSTR *component) = 0;
+    virtual HRESULT wxSTDCALL doScroll(VARIANT component) = 0;
+    virtual HRESULT wxSTDCALL put_onscroll(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onscroll(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondrag(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondrag(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondragend(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondragend(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondragenter(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondragenter(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondragover(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondragover(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondragleave(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondragleave(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_ondrop(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_ondrop(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onbeforecut(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onbeforecut(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_oncut(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_oncut(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onbeforecopy(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onbeforecopy(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_oncopy(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_oncopy(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onbeforepaste(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onbeforepaste(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onpaste(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onpaste(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_currentStyle(wxIHTMLCurrentStyle **p) = 0;
+    virtual HRESULT wxSTDCALL put_onpropertychange(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onpropertychange(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL getClientRects(wxIHTMLRectCollection **pRectCol) = 0;
+    virtual HRESULT wxSTDCALL getBoundingClientRect(wxIHTMLRect **pRect) = 0;
+    virtual HRESULT wxSTDCALL setExpression(BSTR propname, BSTR expression, BSTR language = L"") = 0;
+    virtual HRESULT wxSTDCALL getExpression(BSTR propname, VARIANT *expression) = 0;
+    virtual HRESULT wxSTDCALL removeExpression(BSTR propname, VARIANT_BOOL *pfSuccess) = 0;
+    virtual HRESULT wxSTDCALL put_tabIndex(short v) = 0;
+    virtual HRESULT wxSTDCALL get_tabIndex(short *p) = 0;
+    virtual HRESULT wxSTDCALL focus(void) = 0;
+    virtual HRESULT wxSTDCALL put_accessKey(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_accessKey(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_onblur(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onblur(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onfocus(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onfocus(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onresize(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onresize(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL blur(void) = 0;
+    virtual HRESULT wxSTDCALL addFilter(IUnknown *pUnk) = 0;
+    virtual HRESULT wxSTDCALL removeFilter(IUnknown *pUnk) = 0;
+    virtual HRESULT wxSTDCALL get_clientHeight(long *p) = 0;
+    virtual HRESULT wxSTDCALL get_clientWidth(long *p) = 0;
+    virtual HRESULT wxSTDCALL get_clientTop(long *p) = 0;
+    virtual HRESULT wxSTDCALL get_clientLeft(long *p) = 0;
+    virtual HRESULT wxSTDCALL attachEvent(BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL detachEvent(BSTR event, IDispatch *pDisp) = 0;
+    virtual HRESULT wxSTDCALL get_readyState(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onreadystatechange(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onreadystatechange(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onrowsdelete(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onrowsdelete(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_onrowsinserted(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onrowsinserted(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_oncellchange(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_oncellchange(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL put_dir(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_dir(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL createControlRange(IDispatch **range) = 0;
+    virtual HRESULT wxSTDCALL get_scrollHeight(long *p) = 0;
+    virtual HRESULT wxSTDCALL get_scrollWidth(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_scrollTop(long v) = 0;
+    virtual HRESULT wxSTDCALL get_scrollTop(long *p) = 0;
+    virtual HRESULT wxSTDCALL put_scrollLeft(long v) = 0;
+    virtual HRESULT wxSTDCALL get_scrollLeft(long *p) = 0;
+    virtual HRESULT wxSTDCALL clearAttributes(void) = 0;
+    virtual HRESULT wxSTDCALL mergeAttributes(IHTMLElement *mergeThis) = 0;
+    virtual HRESULT wxSTDCALL put_oncontextmenu(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_oncontextmenu(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL insertAdjacentElement(BSTR where, IHTMLElement *insertedElement, IHTMLElement **inserted) = 0;
+    virtual HRESULT wxSTDCALL applyElement(IHTMLElement *apply, BSTR where, IHTMLElement **applied) = 0;
+    virtual HRESULT wxSTDCALL getAdjacentText(BSTR where, BSTR *text) = 0;
+    virtual HRESULT wxSTDCALL replaceAdjacentText(BSTR where, BSTR newText, BSTR *oldText) = 0;
+    virtual HRESULT wxSTDCALL get_canHaveChildren(VARIANT_BOOL *p) = 0;
+    virtual HRESULT wxSTDCALL addBehavior(BSTR bstrUrl, VARIANT *pvarFactory, long *pCookie) = 0;
+    virtual HRESULT wxSTDCALL removeBehavior(long cookie, VARIANT_BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL get_runtimeStyle(wxIHTMLStyle **p) = 0;
+    virtual HRESULT wxSTDCALL get_behaviorUrns(IDispatch **p) = 0;
+    virtual HRESULT wxSTDCALL put_tagUrn(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_tagUrn(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_onbeforeeditfocus(VARIANT v) = 0;
+    virtual HRESULT wxSTDCALL get_onbeforeeditfocus(VARIANT *p) = 0;
+    virtual HRESULT wxSTDCALL get_readyStateValue(long *p) = 0;
+    virtual HRESULT wxSTDCALL getElementsByTagName(BSTR v,
+            wxIHTMLElementCollection **pelColl) = 0;
+};
+
+struct wxIHTMLTxtRange : public IDispatch
+{
+public:
+    virtual HRESULT wxSTDCALL get_htmlText(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL put_text(BSTR v) = 0;
+    virtual HRESULT wxSTDCALL get_text(BSTR *p) = 0;
+    virtual HRESULT wxSTDCALL parentElement(IHTMLElement **parent) = 0;
+    virtual HRESULT wxSTDCALL duplicate(wxIHTMLTxtRange **Duplicate) = 0;
+    virtual HRESULT wxSTDCALL inRange(wxIHTMLTxtRange *Range, VARIANT_BOOL *InRange) = 0;
+    virtual HRESULT wxSTDCALL isEqual(wxIHTMLTxtRange *Range, VARIANT_BOOL *IsEqual) = 0;
+    virtual HRESULT wxSTDCALL scrollIntoView(VARIANT_BOOL fStart = -1) = 0;
+    virtual HRESULT wxSTDCALL collapse(VARIANT_BOOL Start = -1) = 0;
+    virtual HRESULT wxSTDCALL expand(BSTR Unit, VARIANT_BOOL *Success) = 0;
+    virtual HRESULT wxSTDCALL move(BSTR Unit, long Count, long *ActualCount) = 0;
+    virtual HRESULT wxSTDCALL moveStart(BSTR Unit, long Count, long *ActualCount) = 0;
+    virtual HRESULT wxSTDCALL moveEnd(BSTR Unit, long Count, long *ActualCount) = 0;
+    virtual HRESULT wxSTDCALL select(void) = 0;
+    virtual HRESULT wxSTDCALL pasteHTML(BSTR html) = 0;
+    virtual HRESULT wxSTDCALL moveToElementText(IHTMLElement *element) = 0;
+    virtual HRESULT wxSTDCALL setEndPoint(BSTR how, wxIHTMLTxtRange *SourceRange) = 0;
+    virtual HRESULT wxSTDCALL compareEndPoints(BSTR how, wxIHTMLTxtRange *SourceRange, long *ret) = 0;
+    virtual HRESULT wxSTDCALL findText(BSTR String, long count, long Flags, VARIANT_BOOL *Success) = 0;
+    virtual HRESULT wxSTDCALL moveToPoint(long x, long y) = 0;
+    virtual HRESULT wxSTDCALL getBookmark(BSTR *Boolmark) = 0;
+    virtual HRESULT wxSTDCALL moveToBookmark(BSTR Bookmark, VARIANT_BOOL *Success) = 0;
+    virtual HRESULT wxSTDCALL queryCommandSupported(BSTR cmdID, VARIANT_BOOL *pfRet) = 0;
+    virtual HRESULT wxSTDCALL queryCommandEnabled(BSTR cmdID, VARIANT_BOOL *pfRet) = 0;
+    virtual HRESULT wxSTDCALL queryCommandState(BSTR cmdID, VARIANT_BOOL *pfRet) = 0;
+    virtual HRESULT wxSTDCALL queryCommandIndeterm(BSTR cmdID, VARIANT_BOOL *pfRet) = 0;
+    virtual HRESULT wxSTDCALL queryCommandText(BSTR cmdID, BSTR *pcmdText) = 0;
+    virtual HRESULT wxSTDCALL queryCommandValue(BSTR cmdID, VARIANT *pcmdValue) = 0;
+    virtual HRESULT wxSTDCALL execCommand(BSTR cmdID, VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) = 0;
+    virtual HRESULT wxSTDCALL execCommandShowHelp(BSTR cmdID, VARIANT_BOOL *pfRet) = 0;
+};
+
+struct wxIMarkupContainer : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL OwningDoc(IHTMLDocument2 **ppDoc) = 0;
+};
+
+struct wxIMarkupPointer : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL OwningDoc(IHTMLDocument2 **ppDoc) = 0;
+    virtual HRESULT wxSTDCALL Gravity(wxPOINTER_GRAVITY *pGravity) = 0;
+    virtual HRESULT wxSTDCALL SetGravity(wxPOINTER_GRAVITY Gravity) = 0;
+    virtual HRESULT wxSTDCALL Cling(BOOL *pfCling) = 0;
+    virtual HRESULT wxSTDCALL SetCling(BOOL fCLing) = 0;
+    virtual HRESULT wxSTDCALL Unposition(void) = 0;
+    virtual HRESULT wxSTDCALL IsPositioned(BOOL *pfPositioned) = 0;
+    virtual HRESULT wxSTDCALL GetContainer(wxIMarkupContainer **ppContainer) = 0;
+    virtual HRESULT wxSTDCALL MoveAdjacentToElement(IHTMLElement *pElement, wxELEMENT_ADJACENCY eAdj) = 0;
+    virtual HRESULT wxSTDCALL MoveToPointer(wxIMarkupPointer *pPointer) = 0;
+    virtual HRESULT wxSTDCALL MoveToContainer(wxIMarkupContainer *pContainer, BOOL fAtStart) = 0;
+    virtual HRESULT wxSTDCALL Left(BOOL fMove, wxMARKUP_CONTEXT_TYPE *pContext, IHTMLElement **ppElement, long *pcch, OLECHAR *pchText) = 0;
+    virtual HRESULT wxSTDCALL Right(BOOL fMove, wxMARKUP_CONTEXT_TYPE *pContext, IHTMLElement **ppElement, long *pcch, OLECHAR *pchText) = 0;
+    virtual HRESULT wxSTDCALL CurrentScope(IHTMLElement **ppElemCurrent) = 0;
+    virtual HRESULT wxSTDCALL IsLeftOf(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL IsLeftOfOrEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL IsRightOf(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL IsRightOfOrEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfResult) = 0;
+    virtual HRESULT wxSTDCALL IsEqualTo(wxIMarkupPointer *pPointerThat, BOOL *pfAreEqual) = 0;
+    virtual HRESULT wxSTDCALL MoveUnit(wxMOVEUNIT_ACTION muAction) = 0;
+    virtual HRESULT wxSTDCALL FindText(OLECHAR *pchFindText, DWORD dwFlags, wxIMarkupPointer *pIEndMatch, wxIMarkupPointer *pIEndSearch) = 0;
+};
+
+struct wxIMarkupServices : public IUnknown
+{
+public:
+    virtual HRESULT wxSTDCALL CreateMarkupPointer(wxIMarkupPointer **ppPointer) = 0;
+    virtual HRESULT wxSTDCALL CreateMarkupContainer(wxIMarkupContainer **ppMarkupContainer) = 0;
+    virtual HRESULT wxSTDCALL CreateElement(wxELEMENT_TAG_ID tagID, OLECHAR *pchAttributes, IHTMLElement **ppElement) = 0;
+    virtual HRESULT wxSTDCALL CloneElement(IHTMLElement *pElemCloneThis, IHTMLElement **ppElementTheClone) = 0;
+    virtual HRESULT wxSTDCALL InsertElement(IHTMLElement *pElementInsert, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0;
+    virtual HRESULT wxSTDCALL RemoveElement(IHTMLElement *pElementRemove) = 0;
+    virtual HRESULT wxSTDCALL Remove(wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0;
+    virtual HRESULT wxSTDCALL Copy(wxIMarkupPointer *pPointerSourceStart, wxIMarkupPointer *pPointerSourceFinish, wxIMarkupPointer *pPointerTarget) = 0;
+    virtual HRESULT wxSTDCALL Move(wxIMarkupPointer *pPointerSourceStart, wxIMarkupPointer *pPointerSourceFinish, wxIMarkupPointer *pPointerTarget) = 0;
+    virtual HRESULT wxSTDCALL InsertText(OLECHAR *pchText, long cch, wxIMarkupPointer *pPointerTarget) = 0;
+    virtual HRESULT wxSTDCALL ParseString(OLECHAR *pchHTML, DWORD dwFlags, wxIMarkupContainer **ppContainerResult, wxIMarkupPointer *ppPointerStart, wxIMarkupPointer *ppPointerFinish) = 0;
+    virtual HRESULT wxSTDCALL ParseGlobal(HGLOBAL hglobalHTML, DWORD dwFlags, wxIMarkupContainer **ppContainerResult, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0;
+    virtual HRESULT wxSTDCALL IsScopedElement(IHTMLElement *pElement, BOOL *pfScoped) = 0;
+    virtual HRESULT wxSTDCALL GetElementTagId(IHTMLElement *pElement, wxELEMENT_TAG_ID *ptagId) = 0;
+    virtual HRESULT wxSTDCALL GetTagIDForName(BSTR bstrName, wxELEMENT_TAG_ID *ptagId) = 0;
+    virtual HRESULT wxSTDCALL GetNameForTagID(wxELEMENT_TAG_ID tagId, BSTR *pbstrName) = 0;
+    virtual HRESULT wxSTDCALL MovePointersToRange(wxIHTMLTxtRange *pIRange, wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish) = 0;
+    virtual HRESULT wxSTDCALL MoveRangeToPointers(wxIMarkupPointer *pPointerStart, wxIMarkupPointer *pPointerFinish, wxIHTMLTxtRange *pIRange) = 0;
+    virtual HRESULT wxSTDCALL BeginUndoUnit(OLECHAR *pchTitle) = 0;
+    virtual HRESULT wxSTDCALL EndUndoUnit(void) = 0;
+};
+
+/* end of mshtml.h */
+
+/* WinInet.h */
+
+#ifndef HTTP_STATUS_BAD_REQUEST
+#define HTTP_STATUS_BAD_REQUEST 400
+#endif
+
+#ifndef HTTP_STATUS_DENIED
+#define HTTP_STATUS_DENIED 401
+#endif
+
+#ifndef HTTP_STATUS_PAYMENT_REQ
+#define HTTP_STATUS_PAYMENT_REQ 402
+#endif
+
+#ifndef HTTP_STATUS_FORBIDDEN
+#define HTTP_STATUS_FORBIDDEN 403
+#endif
+
+#ifndef HTTP_STATUS_NOT_FOUND
+#define HTTP_STATUS_NOT_FOUND 404
+#endif
+
+#ifndef HTTP_STATUS_BAD_METHOD
+#define HTTP_STATUS_BAD_METHOD 405
+#endif
+
+#ifndef HTTP_STATUS_NONE_ACCEPTABLE
+#define HTTP_STATUS_NONE_ACCEPTABLE 406
+#endif
+
+#ifndef HTTP_STATUS_PROXY_AUTH_REQ
+#define HTTP_STATUS_PROXY_AUTH_REQ 407
+#endif
+
+#ifndef HTTP_STATUS_REQUEST_TIMEOUT
+#define HTTP_STATUS_REQUEST_TIMEOUT 408
+#endif
+
+#ifndef HTTP_STATUS_CONFLICT
+#define HTTP_STATUS_CONFLICT 409
+#endif
+
+#ifndef HTTP_STATUS_GONE
+#define HTTP_STATUS_GONE 410
+#endif
+
+#ifndef HTTP_STATUS_LENGTH_REQUIRED
+#define HTTP_STATUS_LENGTH_REQUIRED 411
+#endif
+
+#ifndef HTTP_STATUS_PRECOND_FAILED
+#define HTTP_STATUS_PRECOND_FAILED 412
+#endif
+
+#ifndef HTTP_STATUS_REQUEST_TOO_LARGE
+#define HTTP_STATUS_REQUEST_TOO_LARGE 413
+#endif
+
+#ifndef HTTP_STATUS_URI_TOO_LONG
+#define HTTP_STATUS_URI_TOO_LONG 414
+#endif
+
+#ifndef HTTP_STATUS_UNSUPPORTED_MEDIA
+#define HTTP_STATUS_UNSUPPORTED_MEDIA 415
+#endif
+
+#ifndef HTTP_STATUS_RETRY_WITH
+#define HTTP_STATUS_RETRY_WITH 449
+#endif
+
+#ifndef HTTP_STATUS_SERVER_ERROR
+#define HTTP_STATUS_SERVER_ERROR 500
+#endif
+
+#ifndef HTTP_STATUS_NOT_SUPPORTED
+#define HTTP_STATUS_NOT_SUPPORTED 501
+#endif
+
+#ifndef HTTP_STATUS_BAD_GATEWAY
+#define HTTP_STATUS_BAD_GATEWAY 502
+#endif
+
+#ifndef HTTP_STATUS_SERVICE_UNAVAIL
+#define HTTP_STATUS_SERVICE_UNAVAIL 503
+#endif
+
+#ifndef HTTP_STATUS_GATEWAY_TIMEOUT
+#define HTTP_STATUS_GATEWAY_TIMEOUT 504
+#endif
+
+#ifndef HTTP_STATUS_VERSION_NOT_SUP
+#define HTTP_STATUS_VERSION_NOT_SUP 505
+#endif
+
+/* end of WinInet.h */
+
diff --git a/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h b/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h
index acfec70014..6edfbb3932 100644
--- a/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h
+++ b/Externals/wxWidgets3/include/wx/msw/webviewhistoryitem_ie.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/msw/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for MSW
 // Author:      Steven Lamerton
-// Id:          $Id: webviewhistoryitem_ie.h 69074 2011-09-12 18:35:39Z SJL $
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
-    wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) :
                      m_url(url), m_title(title) {}
     wxString GetUrl() { return m_url; }
     wxString GetTitle() { return m_title; }
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/checklst.h b/Externals/wxWidgets3/include/wx/msw/wince/checklst.h
index ef44415177..61121298bc 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/checklst.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/checklst.h
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     30.10.2005
-// RCS-ID:      $Id: checklst.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/chkconf.h b/Externals/wxWidgets3/include/wx/msw/wince/chkconf.h
index 872c8d8ccb..00785067ee 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/chkconf.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-03-07
-// RCS-ID:      $Id: chkconf.h 60495 2009-05-03 07:43:00Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/choicece.h b/Externals/wxWidgets3/include/wx/msw/wince/choicece.h
index 255027d57c..e280be7fdc 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/choicece.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/choicece.h
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004
-// RCS-ID:      $Id: choicece.h 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/helpwce.h b/Externals/wxWidgets3/include/wx/msw/wince/helpwce.h
index 669d408fb0..20cd4e405c 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/helpwce.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/helpwce.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
-// RCS-ID:      $Id: helpwce.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/libraries.h b/Externals/wxWidgets3/include/wx/msw/wince/libraries.h
index 0d3c9a6226..d05e604ca2 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/libraries.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/libraries.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-04-11
-// RCS-ID:      $Id: libraries.h 52163 2008-02-28 00:22:02Z VZ $
 // Copyright:   (c) 2004 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/missing.h b/Externals/wxWidgets3/include/wx/msw/wince/missing.h
index 5f45e0a4d1..73f48bea1e 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/missing.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/missing.h
@@ -4,7 +4,6 @@
 // Author:      Marco Cavallini
 // Modified by:
 // Created:     16/11/2002
-// RCS-ID:      $Id: missing.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) KOAN SAS ( www.koansoftware.com )
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/resources.h b/Externals/wxWidgets3/include/wx/msw/wince/resources.h
index 3ccb65f567..f080518950 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/resources.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/resources.h
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     01.05.2004
-// RCS-ID:      $Id: resources.h 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/setup.h b/Externals/wxWidgets3/include/wx/msw/wince/setup.h
index a22f9ec48f..9da5f70df9 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/setup.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/setup.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: setup.h 69463 2011-10-18 21:57:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -151,7 +150,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin / CodeWarrior
+// ignored for MinGW/Cygwin.
 //
 // Default is 0
 //
@@ -267,6 +266,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
@@ -1087,6 +1097,16 @@
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_PREFERENCES_EDITOR 1
+
 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/smartphone.rc b/Externals/wxWidgets3/include/wx/msw/wince/smartphone.rc
index d1d7a53fb1..89ac65f450 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/smartphone.rc
+++ b/Externals/wxWidgets3/include/wx/msw/wince/smartphone.rc
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     01.05.2004
-// RCS-ID:      $Id: smartphone.rc 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/tbarwce.h b/Externals/wxWidgets3/include/wx/msw/wince/tbarwce.h
index 41d44623b6..12cfd7e8fe 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/tbarwce.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/tbarwce.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
-// RCS-ID:      $Id: tbarwce.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +28,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr)
     {
         Create(parent, id, pos, size, style, name);
@@ -39,7 +38,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr);
 
     // override/implement base class virtuals
@@ -88,7 +87,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL)
     {
@@ -101,7 +100,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,
                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/wince/textctrlce.h b/Externals/wxWidgets3/include/wx/msw/wince/textctrlce.h
index 0f4ecbca5b..3c51633b0a 100644
--- a/Externals/wxWidgets3/include/wx/msw/wince/textctrlce.h
+++ b/Externals/wxWidgets3/include/wx/msw/wince/textctrlce.h
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     30.08.2004
-// RCS-ID:      $Id: textctrlce.h 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/window.h b/Externals/wxWidgets3/include/wx/msw/window.h
index afb6df7a60..bd793e143b 100644
--- a/Externals/wxWidgets3/include/wx/msw/window.h
+++ b/Externals/wxWidgets3/include/wx/msw/window.h
@@ -5,7 +5,6 @@
 // Modified by: Vadim Zeitlin on 13.05.99: complete refont of message handling,
 //              elimination of Default(), ...
 // Created:     01/02/97
-// RCS-ID:      $Id: window.h 69348 2011-10-09 22:01:57Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,6 +66,9 @@ public:
     virtual void Raise();
     virtual void Lower();
 
+    virtual bool BeginRepositioningChildren();
+    virtual void EndRepositioningChildren();
+
     virtual bool Show(bool show = true);
     virtual bool ShowWithEffect(wxShowEffect effect,
                                 unsigned timeout = 0)
@@ -204,7 +206,7 @@ public:
     // to understand why does it work, look at SubclassWin() code and comments
     bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
 
-    wxWindow *FindItem(long id) const;
+    wxWindow *FindItem(long id, WXHWND hWnd = NULL) const;
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control
@@ -345,12 +347,13 @@ public:
 
     bool HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags);
     bool HandleMouseMove(int x, int y, WXUINT flags);
-    bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandleMouseWheel(wxMouseWheelAxis axis,
+                          WXWPARAM wParam, WXLPARAM lParam);
 
     bool HandleChar(WXWPARAM wParam, WXLPARAM lParam);
     bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
     bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
-#if wxUSE_ACCEL
+#if wxUSE_HOTKEY
     bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 #ifdef __WIN32__
@@ -409,6 +412,17 @@ public:
     // weird wxToolBar case and MSWGetBgBrushForChild() itself is used by
     // MSWGetBgBrush() to actually find the right brush to use.
 
+    // Adjust the origin for the brush returned by MSWGetBgBrushForChild().
+    //
+    // This needs to be overridden for scrolled windows to ensure that the
+    // scrolling of their associated DC is taken into account.
+    //
+    // Both parameters must be non-NULL.
+    virtual void MSWAdjustBrushOrg(int* WXUNUSED(xOrg),
+                                   int* WXUNUSED(yOrg)) const
+    {
+    }
+
     // The brush returned from here must remain valid at least until the next
     // event loop iteration. Returning 0, as is done by default, indicates
     // there is no custom background brush.
@@ -649,6 +663,15 @@ protected:
 
     bool MSWEnableHWND(WXHWND hWnd, bool enable);
 
+    // Return the pointer to this window or one of its sub-controls if this ID
+    // and HWND combination belongs to one of them.
+    //
+    // This is used by FindItem() and is overridden in wxControl, see there.
+    virtual wxWindow* MSWFindItem(long WXUNUSED(id), WXHWND WXUNUSED(hWnd)) const
+    {
+        return NULL;
+    }
+
 private:
     // common part of all ctors
     void Init();
diff --git a/Externals/wxWidgets3/include/wx/msw/winundef.h b/Externals/wxWidgets3/include/wx/msw/winundef.h
index 4f1f74791a..af44c49aea 100644
--- a/Externals/wxWidgets3/include/wx/msw/winundef.h
+++ b/Externals/wxWidgets3/include/wx/msw/winundef.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.05.99
-// RCS-ID:      $Id: winundef.h 63658 2010-03-09 11:08:52Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -248,26 +247,20 @@
 #endif
 
 
-/*
-  When this file is included, sometimes the wxCHECK_W32API_VERSION macro
-  is undefined. With for example CodeWarrior this gives problems with
-  the following code:
-  #if 0 && wxCHECK_W32API_VERSION( 0, 5 )
-  Because CodeWarrior does macro expansion before test evaluation.
-  We define wxCHECK_W32API_VERSION here if it's undefined.
-*/
-#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION)
-    #define wxCHECK_W32API_VERSION(maj, min) (0)
-#endif
-
 // StartDoc
 
 #ifdef StartDoc
    #undef StartDoc
-   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )
-      #define DOCINFOW DOCINFO
-      #define DOCINFOA DOCINFO
+
+   // Work around a bug in very old MinGW headers that didn't define DOCINFOW
+   // and DOCINFOA but only DOCINFO in both ANSI and Unicode.
+   #if defined( __GNUG__ )
+      #if !wxCHECK_W32API_VERSION( 0, 5 )
+        #define DOCINFOW DOCINFO
+        #define DOCINFOA DOCINFO
+      #endif
    #endif
+
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
diff --git a/Externals/wxWidgets3/include/wx/msw/wrapcctl.h b/Externals/wxWidgets3/include/wx/msw/wrapcctl.h
index 3164ec3856..036e191139 100644
--- a/Externals/wxWidgets3/include/wx/msw/wrapcctl.h
+++ b/Externals/wxWidgets3/include/wx/msw/wrapcctl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.08.2003
-// RCS-ID:      $Id: wrapcctl.h 57093 2008-12-03 21:53:10Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h b/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h
index 733e1b5f99..fe663119ec 100644
--- a/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h
+++ b/Externals/wxWidgets3/include/wx/msw/wrapcdlg.h
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     22.03.2005
-// RCS-ID:      $Id: wrapcdlg.h 43151 2006-11-07 09:08:33Z JS $
 // Copyright:   (c) 2005 Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wrapgdip.h b/Externals/wxWidgets3/include/wx/msw/wrapgdip.h
index 0dcf913e09..04d4009a67 100644
--- a/Externals/wxWidgets3/include/wx/msw/wrapgdip.h
+++ b/Externals/wxWidgets3/include/wx/msw/wrapgdip.h
@@ -3,7 +3,6 @@
 // Purpose:     wrapper around <gdiplus.h> header
 // Author:      Vadim Zeitlin
 // Created:     2007-03-15
-// RCS-ID:      $Id: wrapgdip.h 44815 2007-03-15 03:41:52Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wrapshl.h b/Externals/wxWidgets3/include/wx/msw/wrapshl.h
index 872f78255c..8826a039ba 100644
--- a/Externals/wxWidgets3/include/wx/msw/wrapshl.h
+++ b/Externals/wxWidgets3/include/wx/msw/wrapshl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: wrapshl.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/msw/wrapwin.h b/Externals/wxWidgets3/include/wx/msw/wrapwin.h
index 8ddd5fe79e..266179847e 100644
--- a/Externals/wxWidgets3/include/wx/msw/wrapwin.h
+++ b/Externals/wxWidgets3/include/wx/msw/wrapwin.h
@@ -3,7 +3,6 @@
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 // Author:      Vaclav Slavik
 // Created:     2003/07/22
-// RCS-ID:      $Id: wrapwin.h 69784 2011-11-17 16:43:34Z VZ $
 // Copyright:   (c) 2003 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,7 +71,7 @@
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
-// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatibility
 // in the WINAPI SDK (they are an integral type that is the size of a
 // pointer) on MSVC 7 and later. However, they are not available in older
 // Platform SDKs, and since they are typedefs and not #defines we simply
diff --git a/Externals/wxWidgets3/include/wx/msw/wx.rc b/Externals/wxWidgets3/include/wx/msw/wx.rc
index 5caede958e..702861a287 100644
--- a/Externals/wxWidgets3/include/wx/msw/wx.rc
+++ b/Externals/wxWidgets3/include/wx/msw/wx.rc
@@ -6,15 +6,10 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: wx.rc 46316 2007-06-04 09:01:37Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__MWERKS__)
-#include <winresrc.h>
-#else
 #include <windows.h>
-#endif
 
 #if defined(_WIN32_WCE)
     #include "wx/msw/wince/wince.rc"
@@ -54,7 +49,6 @@ WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
 WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
 WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
-WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
 WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
 
@@ -94,14 +88,15 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// Manifest file for Windows XP
+// Include manifest file for common controls library v6 required to use themes.
+//
+// Predefining wxUSE_NO_MANIFEST as 1 always disables the use of the manifest.
+// Otherwise we include it only if wxUSE_RC_MANIFEST is defined as 1.
 //
 
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 
-// Visual Studio 2005 generates the manifest automatically and so we
-// shouldn't include it in the resources manually: 
-#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+#if defined(wxUSE_RC_MANIFEST) && wxUSE_RC_MANIFEST
 
 // see "about isolated applications" topic in MSDN
 #ifdef ISOLATION_AWARE_ENABLED
@@ -116,8 +111,16 @@ wxMANIFEST_ID 24 "wx/msw/amd64.manifest"
 wxMANIFEST_ID 24 "wx/msw/ia64.manifest"
 #elif defined(WX_CPU_X86)
 wxMANIFEST_ID 24 "wx/msw/wx.manifest"
+#else
+// Notice that if the manifest is included, WX_CPU_XXX constant corresponding
+// to the architecture we're compiling for must be defined. This can be done
+// either manually in your make/project file or by configuring the resource
+// compiler paths to search in $(WXWIN)/lib/$(COMPILER_PREFIX)_lib/mswu[d]
+// directory for its include files, as wx/msw/rcdefs.h file in this directory
+// is generated during wxWidgets build and contains the correct definition.
+#error "One of WX_CPU_XXX constants must be defined. See comment above."
 #endif
 
-#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+#endif // wxUSE_RC_MANIFEST
 
 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
diff --git a/Externals/wxWidgets3/include/wx/nativewin.h b/Externals/wxWidgets3/include/wx/nativewin.h
index 20f637fb55..e0328e9583 100644
--- a/Externals/wxWidgets3/include/wx/nativewin.h
+++ b/Externals/wxWidgets3/include/wx/nativewin.h
@@ -3,7 +3,6 @@
 // Purpose:     classes allowing to wrap a native window handle
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05
-// RCS-ID:      $Id: nativewin.h 62783 2009-12-05 17:31:07Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,9 +38,12 @@
     typedef HWND wxNativeContainerWindowId;
     typedef HWND wxNativeContainerWindowHandle;
 #elif defined(__WXGTK__)
-    #include <gdk/gdk.h>
-
-    typedef GdkNativeWindow wxNativeContainerWindowId;
+    // GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32
+    #ifdef __UNIX__
+        typedef unsigned long wxNativeContainerWindowId;
+    #else
+        typedef void *wxNativeContainerWindowId;
+    #endif
     typedef GdkWindow *wxNativeContainerWindowHandle;
 #else
     // no support for using native windows under this platform yet
diff --git a/Externals/wxWidgets3/include/wx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/nonownedwnd.h
index 03888e4140..7d8709933d 100644
--- a/Externals/wxWidgets3/include/wx/nonownedwnd.h
+++ b/Externals/wxWidgets3/include/wx/nonownedwnd.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24
-// RCS-ID:      $Id: nonownedwnd.h 70813 2012-03-05 13:00:57Z VZ $
 // Copyright:   (c) 2006 TT-Solutions
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/notebook.h b/Externals/wxWidgets3/include/wx/notebook.h
index 98bb521f37..1535229aa0 100644
--- a/Externals/wxWidgets3/include/wx/notebook.h
+++ b/Externals/wxWidgets3/include/wx/notebook.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.02.01
-// RCS-ID:      $Id: notebook.h 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1996-2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -132,7 +131,7 @@ public:
     virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; }
 
 
-    // send wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING/ED events
+    // send wxEVT_NOTEBOOK_PAGE_CHANGING/ED events
 
     // returns false if the change to nPage is vetoed by the program
     bool SendPageChangingEvent(int nPage);
@@ -169,14 +168,14 @@ protected:
 typedef wxBookCtrlEventFunction wxNotebookEventFunction;
 #define wxNotebookEventHandler(func) wxBookCtrlEventHandler(func)
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_NOTEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_NOTEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
 
 // ----------------------------------------------------------------------------
 // wxNotebook class itself
@@ -200,6 +199,10 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
     #include  "wx/os2/notebook.h"
 #endif
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED    wxEVT_NOTEBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING   wxEVT_NOTEBOOK_PAGE_CHANGING
+
 #endif // wxUSE_NOTEBOOK
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/notifmsg.h b/Externals/wxWidgets3/include/wx/notifmsg.h
index fd91fe2e3b..fe49c8763c 100644
--- a/Externals/wxWidgets3/include/wx/notifmsg.h
+++ b/Externals/wxWidgets3/include/wx/notifmsg.h
@@ -3,7 +3,6 @@
 // Purpose:     class allowing to show notification messages to the user
 // Author:      Vadim Zeitlin
 // Created:     2007-11-19
-// RCS-ID:      $Id: notifmsg.h 62071 2009-09-24 12:36:34Z JS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -127,13 +126,14 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
 };
 
-#if defined(__WXGTK__) && (wxUSE_LIBHILDON || wxUSE_LIBHILDON2)
-    #include "wx/gtk/hildon/notifmsg.h"
 /*
-    TODO: provide support for
-        - libnotify (Gnome)
-        - Growl (http://growl.info/, OS X)
+    TODO: Implement under OS X using notification centre (10.8+) or
+          Growl (http://growl.info/) for the previous versions.
  */
+#if defined(__WXGTK__) && wxUSE_LIBNOTIFY
+    #include "wx/gtk/notifmsg.h"
+#elif defined(__WXGTK__) && (wxUSE_LIBHILDON || wxUSE_LIBHILDON2)
+    #include "wx/gtk/hildon/notifmsg.h"
 #elif defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS
     #include "wx/msw/notifmsg.h"
 #else
diff --git a/Externals/wxWidgets3/include/wx/numdlg.h b/Externals/wxWidgets3/include/wx/numdlg.h
index a3a1505fc2..c1c39742ec 100644
--- a/Externals/wxWidgets3/include/wx/numdlg.h
+++ b/Externals/wxWidgets3/include/wx/numdlg.h
@@ -4,7 +4,6 @@
 // Author:      John Labenski
 // Modified by:
 // Created:     07.02.04 (extracted from wx/textdlg.h)
-// RCS-ID:      $Id: numdlg.h 37157 2006-01-26 15:33:27Z ABX $
 // Copyright:   (c) John Labenski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/object.h b/Externals/wxWidgets3/include/wx/object.h
index 6e01ab8caa..04c6512254 100644
--- a/Externals/wxWidgets3/include/wx/object.h
+++ b/Externals/wxWidgets3/include/wx/object.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id: object.h 66650 2011-01-08 08:03:42Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
@@ -195,9 +194,8 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
     #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
 #endif
 
-// Only VC++ 6 and CodeWarrior get overloaded delete that matches new
-#if (defined(__VISUALC__) && (__VISUALC__ >= 1200)) || \
-        (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
+// Only VC++ 6 gets overloaded delete that matches new
+#if (defined(__VISUALC__) && (__VISUALC__ >= 1200))
     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
@@ -213,12 +211,6 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
     #if !defined(__VISUALC__)
         #define _WX_WANT_ARRAY_DELETE_VOID
     #endif
-
-    // Only CodeWarrior 6 or higher
-    #if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
-        #define _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
-    #endif
-
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 
 #endif // wxUSE_MEMORY_TRACING
diff --git a/Externals/wxWidgets3/include/wx/odcombo.h b/Externals/wxWidgets3/include/wx/odcombo.h
index 6e2d9efb86..af0f1160d8 100644
--- a/Externals/wxWidgets3/include/wx/odcombo.h
+++ b/Externals/wxWidgets3/include/wx/odcombo.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: odcombo.h 68460 2011-07-30 11:30:08Z VZ $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -355,6 +354,10 @@ protected:
     // Callback for item width, or -1 for default/undetermined
     virtual wxCoord OnMeasureItemWidth( size_t item ) const;
 
+    // override base implementation so we can return the size for the
+    // largest item
+    virtual wxSize DoGetBestSize() const;
+
     // Callback for background drawing. Flags are same as with
     // OnDrawItem.
     virtual void OnDrawBackground( wxDC& dc, const wxRect& rect, int item, int flags ) const;
diff --git a/Externals/wxWidgets3/include/wx/osx/accel.h b/Externals/wxWidgets3/include/wx/osx/accel.h
index 1a61174518..a6690acf5f 100644
--- a/Externals/wxWidgets3/include/wx/osx/accel.h
+++ b/Externals/wxWidgets3/include/wx/osx/accel.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: accel.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/anybutton.h b/Externals/wxWidgets3/include/wx/osx/anybutton.h
index 9e11031ae8..ffa28dfb6c 100644
--- a/Externals/wxWidgets3/include/wx/osx/anybutton.h
+++ b/Externals/wxWidgets3/include/wx/osx/anybutton.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton class
 // Author:      Stefan Csomor
 // Created:     1998-01-01 (extracted from button.h)
-// RCS-ID:      $Id: anybutton.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/app.h b/Externals/wxWidgets3/include/wx/osx/app.h
index 3814c79462..0eba951444 100644
--- a/Externals/wxWidgets3/include/wx/osx/app.h
+++ b/Externals/wxWidgets3/include/wx/osx/app.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: app.h 68617 2011-08-09 22:17:12Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -83,14 +82,21 @@ public:
     // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
     void                  MacAddToAutorelease( void* cfrefobj );
     void                  MacReleaseAutoreleasePool();
+    
 public:
     static wxWindow*      s_captureWindow ;
     static long           s_lastModifiers ;
 
     int                   m_nCmdShow;
 
-private:
     // mac specifics
+protected:
+#if wxOSX_USE_COCOA
+    // override for support of custom app controllers
+    virtual WX_NSObject   OSXCreateAppController();
+#endif
+    
+private:
     virtual bool        DoInitGui();
     virtual void        DoCleanUp();
 
@@ -109,10 +115,10 @@ public:
     // For embedded use. By default does nothing.
     virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
 
-    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
-    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
-    bool    MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
-    void    MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
+    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ;
+    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ;
+    bool    MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ;
+    void    MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ;
 #if wxOSX_USE_CARBON
     // we only have applescript on these
     virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
@@ -123,19 +129,48 @@ public:
     virtual short         MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
 #endif
     // in response of an openFiles message with Cocoa and an
-    // open-document apple event with Carbon
+    // open-document apple event
     virtual void         MacOpenFiles(const wxArrayString &fileNames) ;
     // called by MacOpenFiles for each file.
     virtual void         MacOpenFile(const wxString &fileName) ;
     // in response of a get-url apple event
     virtual void         MacOpenURL(const wxString &url) ;
     // in response of a print-document apple event
+    virtual void         MacPrintFiles(const wxArrayString &fileNames) ;
+    // called by MacPrintFiles for each file
     virtual void         MacPrintFile(const wxString &fileName) ;
     // in response of a open-application apple event
     virtual void         MacNewFile() ;
     // in response of a reopen-application apple event
     virtual void         MacReopenApp() ;
 
+    // override this to return false from a non-bundled console app in order to stay in background ...
+    virtual bool         OSXIsGUIApplication() { return true; }
+
+#if wxOSX_USE_COCOA_OR_IPHONE
+    // immediately before the native event loop launches
+    virtual void         OSXOnWillFinishLaunching();
+    // immediately when the native event loop starts, no events have been served yet
+    virtual void         OSXOnDidFinishLaunching();
+    // OS asks to terminate app, return no to stay running
+    virtual bool         OSXOnShouldTerminate();
+    // before application terminates
+    virtual void         OSXOnWillTerminate();
+
+private:
+    bool                m_onInitResult;
+    bool                m_inited;
+    wxArrayString       m_openFiles;
+    wxArrayString       m_printFiles;
+    wxString            m_getURL;
+    
+public:
+    bool                OSXInitWasCalled() { return m_inited; }
+    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+    void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+    void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+#endif
+    
     // Hide the application windows the same as the system hide command would do it.
     void MacHideApp();
 
diff --git a/Externals/wxWidgets3/include/wx/osx/bitmap.h b/Externals/wxWidgets3/include/wx/osx/bitmap.h
index 0f2d861083..8f51d7678f 100644
--- a/Externals/wxWidgets3/include/wx/osx/bitmap.h
+++ b/Externals/wxWidgets3/include/wx/osx/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: bitmap.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -57,6 +56,8 @@ public:
     bool Create(const wxBitmap& bitmap);
     bool Create(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
 
+    wxBitmap GetBitmap() const;
+
     // Implementation below
 
     void Init() ;
@@ -102,14 +103,19 @@ public:
     wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
     
     // creates an bitmap from the native image format
-    wxBitmap(CGImageRef image);
+    wxBitmap(CGImageRef image, double scale = 1.0);
+    wxBitmap(WX_NSImage image);
+    wxBitmap(CGContextRef bitmapcontext);
 
+    // Create a bitmap compatible with the given DC
+    wxBitmap(int width, int height, const wxDC& dc);
+    
     // If depth is omitted, will create a bitmap compatible with the display
     wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
     wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
 
     // Convert from wxImage:
-    wxBitmap(const wxImage& image, int depth = -1);
+    wxBitmap(const wxImage& image, int depth = -1, double scale = 1.0);
 
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
@@ -126,7 +132,15 @@ public:
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
 
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    bool Create( CGImageRef image );
+    bool Create( CGImageRef image, double scale = 1.0 );
+    bool Create( WX_NSImage image );
+    bool Create( CGContextRef bitmapcontext);
+    
+    // Create a bitmap compatible with the given DC, inheriting its magnification factor
+    bool Create(int width, int height, const wxDC& dc);
+
+    // Create a bitmap with a scale factor, width and height are multiplied with that factor
+    bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
     
     // virtual bool Create( WXHICON icon) ;
     virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
@@ -190,6 +204,7 @@ public:
     void *BeginRawAccess() ;
     void EndRawAccess() ;
 
+    double GetScaleFactor() const;
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
diff --git a/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h b/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h
index a84403be6b..4a045fe0b6 100644
--- a/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h
+++ b/Externals/wxWidgets3/include/wx/osx/bmpbuttn.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: bmpbuttn.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/brush.h b/Externals/wxWidgets3/include/wx/osx/brush.h
index df68d1c9c8..dc04a09b3d 100644
--- a/Externals/wxWidgets3/include/wx/osx/brush.h
+++ b/Externals/wxWidgets3/include/wx/osx/brush.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: brush.h 54874 2008-07-31 09:59:04Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/button.h b/Externals/wxWidgets3/include/wx/osx/button.h
index a9a7abbd99..8e8752288c 100644
--- a/Externals/wxWidgets3/include/wx/osx/button.h
+++ b/Externals/wxWidgets3/include/wx/osx/button.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button.h 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -49,6 +48,10 @@ public:
 
     virtual bool        OSXHandleClicked( double timestampsec );
 
+#if wxOSX_USE_COCOA
+    void OSXUpdateAfterLabelChange(const wxString& label);
+#endif
+
 protected:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/chkconf.h b/Externals/wxWidgets3/include/wx/osx/carbon/chkconf.h
index 3322f0dcb9..9c6bc30508 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Julian Smart
  * Modified by:
  * Created:     01/02/97
- * RCS-ID:      $Id: chkconf.h 61926 2009-09-14 13:07:23Z SC $
  * Copyright:   (c) Julian Smart
  * Licence:     wxWindows licence
  */
@@ -31,22 +30,7 @@
  * text rendering system
  */
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-
-    #define wxOSX_USE_CORE_TEXT 1
-    // MLTE-TextControl uses ATSU
-    #define wxOSX_USE_ATSU_TEXT 1
-
-#else // platform < 10.5
-
-    #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        #define wxOSX_USE_CORE_TEXT 1
-    #else
-        #define wxOSX_USE_CORE_TEXT 0
-    #endif
-    #define wxOSX_USE_ATSU_TEXT 1
-
-#endif
+#define wxOSX_USE_ATSU_TEXT 1
 
 /*
  * Audio System
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h b/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h
index e4dfeb2940..75185b092c 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/dataview.h
@@ -2,7 +2,6 @@
 // Name:        wx/osx/carbon/dataview.h
 // Purpose:     wxDataViewCtrl native implementation header for carbon
 // Author:
-// Id:          $Id: dataview.h 57374 2009-01-27
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -156,9 +155,7 @@ public:
 
   OSStatus EnableCellSizeModification(bool enableHeight=true, bool enableWidth=true); // enables or disables the column width and row height modification (default: false)
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
   OSStatus GetAttributes        (OptionBits* attributes);
-#endif
   OSStatus GetColumnWidth       (DataBrowserPropertyID column, UInt16 *width ) const; // returns the column width in pixels
   OSStatus GetDefaultColumnWidth(UInt16 *width ) const; // returns the default column width in pixels
   OSStatus GetDefaultRowHeight  (UInt16 * height ) const;
@@ -167,9 +164,7 @@ public:
   OSStatus GetRowHeight         (DataBrowserItemID item , UInt16 *height) const;
   OSStatus GetScrollPosition    (UInt32* top, UInt32 *left) const;
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
   OSStatus SetAttributes (OptionBits attributes);
-#endif
   OSStatus SetColumnWidth(DataBrowserPropertyID column, UInt16 width); // sets the column width in pixels
   OSStatus SetDefaultColumnWidth( UInt16 width );
   OSStatus SetDefaultRowHeight( UInt16 height );
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/drawer.h b/Externals/wxWidgets3/include/wx/osx/carbon/drawer.h
index b56e82076b..6edb3921d4 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/drawer.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/drawer.h
@@ -7,7 +7,6 @@
 // Author:      Jason Bagley
 // Modified by:
 // Created:     2004-30-01
-// RCS-ID:      $Id: drawer.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Jason Bagley; Art & Logic, Inc.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,8 +22,6 @@
 // near future
 //
 
-#if ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-
 class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
 {
     DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
@@ -65,7 +62,4 @@ public:
     wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
 };
 
-#endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-
-#endif
-    // _WX_DRAWERWINDOW_H_
+#endif // _WX_DRAWERWINDOW_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h b/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h
index c327fff427..f18c7c9494 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloop.h 68302 2011-07-19 17:56:57Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -25,9 +24,8 @@ public:
 protected:
     virtual int DoDispatchTimeout(unsigned long timeout);
 
-    virtual void DoRun();
-
-    virtual void DoStop();
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
 
     virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 };
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/mimetype.h b/Externals/wxWidgets3/include/wx/osx/carbon/mimetype.h
index 61ab948825..837275285a 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/mimetype.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/mimetype.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     04/16/2005
-// RCS-ID:      $Id: mimetype.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2005 Ryan Norton (<wxprojects@comcast.net>)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private.h b/Externals/wxWidgets3/include/wx/osx/carbon/private.h
index fb26d2687d..64fa447e14 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/private.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/private.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: private.h 67233 2011-03-18 15:45:51Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,11 +13,6 @@
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-typedef UInt32 URefCon;
-typedef SInt32 SRefCon;
-#endif
-
 #if wxUSE_GUI
 
 #include "wx/osx/uma.h"
@@ -30,10 +24,6 @@ typedef SInt32 SRefCon;
 
 // app.h
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);
-#endif
-
 #endif // wxUSE_GUI
 
 // filefn.h
@@ -270,12 +260,6 @@ ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
 // additional optional event defines
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-enum {
-    kEventControlFocusPartChanged = 164
-};
-#endif
-
 class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
 {
 public :
@@ -332,7 +316,6 @@ public :
     wxBitmap            GetBitmap() const;
     void                SetBitmap( const wxBitmap& bitmap );
     void                SetBitmapPosition( wxDirection dir );
-    void                SetupTabs( const wxNotebook &notebook );
 
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/mactext.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/mactext.h
index b298c33506..d665abaa0d 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/private/mactext.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/private/mactext.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: mactext.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h
index f684a407f4..f5ebe1d83e 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h
index 90d1875537..b00fd619ef 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/private/print.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: print.h 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/private/timer.h b/Externals/wxWidgets3/include/wx/osx/carbon/private/timer.h
index 7f34e6da7f..0d68d7a204 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/private/timer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTimer class
 // Author:      Stefan Csomor
 // Created:     1998-01-01
-// RCS-ID:      $Id: timer.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/region.h b/Externals/wxWidgets3/include/wx/osx/carbon/region.h
index e15ca339d8..f9c3fe3dd3 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/region.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/region.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: region.h 69459 2011-10-18 21:56:40Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,6 +54,7 @@ protected:
 
     virtual bool DoOffset(wxCoord x, wxCoord y);
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
+    virtual bool DoUnionWithRect(const wxRect& rect);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegion)
@@ -86,7 +86,7 @@ public:
     long GetWidth() const { return GetW(); }
     long GetH() const;
     long GetHeight() const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); }
 
 private:
     void SetRects(long numRects, wxRect *rects);
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
index 4ec79b1054..0f9ffb1763 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbmp.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/uma.h b/Externals/wxWidgets3/include/wx/osx/carbon/uma.h
index cfb3f2f0cb..57b77f798c 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/uma.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/uma.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: uma.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/checkbox.h b/Externals/wxWidgets3/include/wx/osx/checkbox.h
index fc8e4fa977..3ba0accc90 100644
--- a/Externals/wxWidgets3/include/wx/osx/checkbox.h
+++ b/Externals/wxWidgets3/include/wx/osx/checkbox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: checkbox.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/checklst.h b/Externals/wxWidgets3/include/wx/osx/checklst.h
index 35aed903f3..c23d36f562 100644
--- a/Externals/wxWidgets3/include/wx/osx/checklst.h
+++ b/Externals/wxWidgets3/include/wx/osx/checklst.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: checklst.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/chkconf.h b/Externals/wxWidgets3/include/wx/osx/chkconf.h
index 211411c961..c960923cc8 100644
--- a/Externals/wxWidgets3/include/wx/osx/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/osx/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     2005-04-05 (extracted from wx/chkconf.h)
- * RCS-ID:      $Id: chkconf.h 67497 2011-04-15 19:18:34Z DS $
  * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -14,27 +13,6 @@
 #ifndef _WX_OSX_CHKCONF_H_
 #define _WX_OSX_CHKCONF_H_
 
-
-#if wxUSE_STACKWALKER
-    /* not supported under Mac */
-#   undef wxUSE_STACKWALKER
-#   define wxUSE_STACKWALKER 0
-#endif /* wxUSE_STACKWALKER */
-
-/*
- * disable the settings which don't work for some compilers
- */
-
-#if defined(__MWERKS__)
-    #undef wxUSE_DEBUG_NEW_ALWAYS
-    #define wxUSE_DEBUG_NEW_ALWAYS      0
-
-    /* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */
-    #ifndef wxTYPE_SA_HANDLER
-        #define wxTYPE_SA_HANDLER int
-    #endif
-#endif
-
 /*
  * check graphics context option, must be on for every os x platform
  * we only use core graphics now on all builds, try to catch attempts
diff --git a/Externals/wxWidgets3/include/wx/osx/choice.h b/Externals/wxWidgets3/include/wx/osx/choice.h
index 358c81f85e..0e108f4552 100644
--- a/Externals/wxWidgets3/include/wx/osx/choice.h
+++ b/Externals/wxWidgets3/include/wx/osx/choice.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice.h 66993 2011-02-22 13:25:38Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -93,6 +92,10 @@ protected:
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;
     wxMenu*    m_popUpMenu ;
+
+private:
+    // This should be called when the number of items in the control changes.
+    void DoAfterItemCountChange();
 };
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/osx/clipbrd.h b/Externals/wxWidgets3/include/wx/osx/clipbrd.h
index 5101b6700d..cba7a41e22 100644
--- a/Externals/wxWidgets3/include/wx/osx/clipbrd.h
+++ b/Externals/wxWidgets3/include/wx/osx/clipbrd.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: clipbrd.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h b/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h
index 3e1443eb11..03fd501925 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Stefan Csomor
  * Modified by:
  * Created:     2008-07-30
- * RCS-ID:      $Id: chkconf.h 67232 2011-03-18 15:10:15Z DS $
  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */
@@ -12,6 +11,17 @@
 #ifndef _WX_OSX_COCOA_CHKCONF_H_
 #define _WX_OSX_COCOA_CHKCONF_H_
 
+/* Many wchar functions (and also strnlen(), for some reason) are only
+   available since 10.7 so don't use them if we want to build the applications
+   that would run under 10.6 and earlier. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
+#define HAVE_STRNLEN 1
+#define HAVE_WCSDUP 1
+#define HAVE_WCSNLEN 1
+#define HAVE_WCSCASECMP 1
+#define HAVE_WCSNCASECMP 1
+#endif
+
 /*
  * native (1) or emulated (0) toolbar
  */
@@ -20,37 +30,25 @@
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 
+/*
+ * leave is isFlipped and don't override
+ */
+#ifndef wxOSX_USE_NATIVE_FLIPPED 
+    #define wxOSX_USE_NATIVE_FLIPPED 1
+#endif
+
 /*
  * text rendering system
  */
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-
-    #define wxOSX_USE_CORE_TEXT 1
-    #define wxOSX_USE_ATSU_TEXT 0
-
-#else // platform < 10.5
-
-    #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        #define wxOSX_USE_CORE_TEXT 1
-    #else
-        #define wxOSX_USE_CORE_TEXT 0
-    #endif
-    #define wxOSX_USE_ATSU_TEXT 1
-
-#endif
+#define wxOSX_USE_ATSU_TEXT 0
 
 /*
  * Audio System
  */
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-    #define wxOSX_USE_QUICKTIME 0
-    #define wxOSX_USE_AUDIOTOOLBOX 1
-#else // platform < 10.5
-    #define wxOSX_USE_QUICKTIME 1
-    #define wxOSX_USE_AUDIOTOOLBOX 0
-#endif
+#define wxOSX_USE_QUICKTIME 0
+#define wxOSX_USE_AUDIOTOOLBOX 1
 
 /*
  * turning off capabilities that don't work under cocoa yet
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h b/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h
index 0859b2dbae..2d33fff661 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/dataview.h
@@ -2,7 +2,6 @@
 // Name:        wx/osx/cocoa/dataview.h
 // Purpose:     wxDataViewCtrl native implementation header for carbon
 // Author:
-// Id:          $Id: dataview.h 57374 2009-01-27
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h b/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h
index 4dae4c2184..ab15dd94af 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/evtloop.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxGUIEventLoop for wxOSX/Cocoa
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
-// RCS-ID:      $Id: evtloop.h 68301 2011-07-19 16:17:44Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,12 +22,14 @@ public:
 
     virtual void WakeUp();
 
+    void OSXUseLowLevelWakeup(bool useIt)
+        { m_osxLowLevelWakeUp = useIt ; }
+    
 protected:
     virtual int DoDispatchTimeout(unsigned long timeout);
 
-    virtual void DoRun();
-
-    virtual void DoStop();
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
 
     virtual CFRunLoopRef CFGetCurrentRunLoop() const;
     
@@ -39,6 +40,8 @@ protected:
     WXWindow m_dummyWindow;
     
     int m_modalNestedLevel;
+    
+    bool m_osxLowLevelWakeUp;
 };
 
 #endif // _WX_OSX_COCOA_EVTLOOP_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private.h
index 0e4a19ac8c..e92df39539 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/private.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: private.h 70863 2012-03-10 13:13:51Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,12 +19,6 @@
     #import <Cocoa/Cocoa.h>
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-// available in 10.4 but not in the headers
-enum {
-    kEventMouseScroll             = 11
-};
-#endif
 //
 // shared between Cocoa and Carbon
 //
@@ -39,9 +32,12 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
-WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image );
-CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
+WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image, double scale = 1.0 );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scale = NULL );
+CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromNSImage( WX_NSImage nsimage);
+
 wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
+WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow();
 
 class WXDLLIMPEXP_FWD_CORE wxDialog;
 
@@ -88,6 +84,8 @@ public :
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
 
+    virtual void        SetDrawingEnabled(bool enabled);
+
     virtual bool        CanFocus() const;
     // return true if successful
     virtual bool        SetFocus();
@@ -104,6 +102,8 @@ public :
     void                CaptureMouse();
     void                ReleaseMouse();
 
+    void                SetDropTarget(wxDropTarget* target);
+    
     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );
     wxBitmap            GetBitmap() const;
@@ -133,11 +133,17 @@ public :
 
     virtual void        SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
     virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
+    void                SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent);
+    virtual bool        SetupCursor(NSEvent* event);
 
 
+#if !wxOSX_USE_NATIVE_FLIPPED
     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }
+#endif
 
+    virtual double      GetContentScaleFactor() const;
+    
     // cocoa thunk connected calls
 
     virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
@@ -148,11 +154,14 @@ public :
     virtual void                cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd);
     virtual void                keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
     virtual void                insertText(NSString* text, WXWidget slf, void* _cmd);
+    virtual void                doCommandBySelector(void* sel, WXWidget slf, void* _cmd);
     virtual bool                performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd);
     virtual bool                acceptsFirstResponder(WXWidget slf, void* _cmd);
     virtual bool                becomeFirstResponder(WXWidget slf, void* _cmd);
     virtual bool                resignFirstResponder(WXWidget slf, void* _cmd);
+#if !wxOSX_USE_NATIVE_FLIPPED
     virtual bool                isFlipped(WXWidget slf, void* _cmd);
+#endif
     virtual void                drawRect(void* rect, WXWidget slf, void* _cmd);
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
@@ -165,7 +174,9 @@ public :
 protected:
     WXWidget m_osxView;
     NSEvent* m_lastKeyDownEvent;
+#if !wxOSX_USE_NATIVE_FLIPPED
     bool m_isFlipped;
+#endif
     // if it the control has an editor, that editor will already send some
     // events, don't resend them
     bool m_hasEditor;
@@ -245,6 +256,8 @@ public :
     
     CGWindowLevel   GetWindowLevel() const { return m_macWindowLevel; }
     void            RestoreWindowLevel();
+    
+    static WX_NSResponder GetNextFirstResponder() ;
 protected :
     CGWindowLevel   m_macWindowLevel;
     WXWindow        m_macWindow;
@@ -252,7 +265,30 @@ protected :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };
 
+DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton );
+
+class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
+{
+public:
+    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
+    virtual void SetBitmap(const wxBitmap& bitmap);
+#if wxUSE_MARKUP
+    virtual void SetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP
+    
+    void SetPressedBitmap( const wxBitmap& bitmap );
+    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
+    void SetAcceleratorFromLabel(const wxString& label);
+
+    NSButton *GetNSButton() const;
+};
+
 #ifdef __OBJC__
+    typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event);
+    typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
+    typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
+    typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);
+
 
     WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen();
     WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
@@ -263,6 +299,8 @@ protected :
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
         bool adjustForOrigin = true );
 
+    WXDLLIMPEXP_CORE NSView* wxOSXGetViewFromResponder( NSResponder* responder );
+
     // used for many wxControls
 
     @interface wxNSButton : NSButton
@@ -310,6 +348,18 @@ protected :
 
     @end
 
+    @interface wxNSComboBox : NSComboBox
+    {
+        wxNSTextFieldEditor* fieldEditor;
+    }
+
+    - (wxNSTextFieldEditor*) fieldEditor;
+    - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
+
+    @end
+
+
+
     @interface wxNSMenu : NSMenu
     {
        wxMenuImpl* impl;
@@ -414,6 +464,8 @@ const short kwxCursorLast = kwxCursorWatch;
 
 extern ClassicCursor gMacCursors[];
 
+extern NSLayoutManager* gNSLayoutManager;
+
 #endif
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h
index 09624ab3f9..e7d9d40b6d 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/date.h
@@ -3,7 +3,6 @@
 // Purpose:     NSDate-related helpers
 // Author:      Vadim Zeitlin
 // Created:     2011-12-19
-// RCS-ID:      $Id: date.h 70070 2011-12-20 21:27:09Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h
index 542ae6b608..1d23d8e3b4 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/markuptoattr.h
@@ -3,7 +3,6 @@
 // Purpose:     Class to convert markup to Cocoa attributed strings.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-22
-// RCS-ID:      $Id: markuptoattr.h 67069 2011-02-27 12:48:46Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h
index 2af5b14842..5a49e8104e 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/overlay.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.h 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h b/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h
index 841bf5bd08..767f31cddb 100644
--- a/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h
+++ b/Externals/wxWidgets3/include/wx/osx/cocoa/private/textimpl.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: textimpl.h 70354 2012-01-15 15:53:56Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,6 +44,10 @@ public :
     virtual bool SetHint(const wxString& hint);
 
     virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
+    virtual bool becomeFirstResponder(WXWidget slf, void *_cmd);
+    virtual bool resignFirstResponder(WXWidget slf, void *_cmd);
+
+    virtual void SetInternalSelection( long from , long to );
 
 protected :
     NSTextField* m_textField;
@@ -111,6 +114,10 @@ public :
     virtual void Popup();
     virtual void Dismiss();
 
+    virtual void SetEditable(bool editable);
+
+    virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd);
+
 private:
     NSComboBox* m_comboBox;
 };
diff --git a/Externals/wxWidgets3/include/wx/osx/colordlg.h b/Externals/wxWidgets3/include/wx/osx/colordlg.h
index ea18736896..832b46cf0d 100644
--- a/Externals/wxWidgets3/include/wx/osx/colordlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/colordlg.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: colordlg.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/combobox.h b/Externals/wxWidgets3/include/wx/osx/combobox.h
index ba55d4f160..d7d16f503f 100644
--- a/Externals/wxWidgets3/include/wx/osx/combobox.h
+++ b/Externals/wxWidgets3/include/wx/osx/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobox.h 69956 2011-12-08 14:47:37Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -104,10 +103,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
 
     virtual unsigned int GetCount() const;
 
+    virtual void SetValue(const wxString& value);
 // these methods are provided by wxTextEntry for the native impl.
 #if wxOSX_USE_CARBON
     // Text field functions
-    virtual void SetValue(const wxString& value);
     virtual wxString GetValue() const;
     virtual void WriteText(const wxString& text);
 
diff --git a/Externals/wxWidgets3/include/wx/osx/config_xcode.h b/Externals/wxWidgets3/include/wx/osx/config_xcode.h
index 5c92ac2032..510eb9f0b4 100644
--- a/Externals/wxWidgets3/include/wx/osx/config_xcode.h
+++ b/Externals/wxWidgets3/include/wx/osx/config_xcode.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     29.04.04
-// RCS-ID:      $Id: config_xcode.h 70021 2011-12-16 22:12:49Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,11 +45,7 @@
 #define WX_GMTOFF_IN_TM 1
 #define HAVE_PW_GECOS 1
 #define HAVE_DLOPEN 1
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-/* #undef HAVE_CXA_DEMANGLE */
-#else
 #define HAVE_CXA_DEMANGLE 1
-#endif
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_FSYNC 1
 #define HAVE_ROUND 1
@@ -109,15 +104,10 @@
 #define HAVE_WCHAR_H 1
 /* better to use the built-in CF conversions, also avoid iconv versioning problems */
 /* #undef HAVE_ICONV */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-#define ICONV_CONST const
-#else
 #define ICONV_CONST
-#endif
 #define HAVE_LANGINFO_H 1
 #define HAVE_WCSRTOMBS 1
 #define HAVE_FPUTWS 1
-#define HAVE_STRCASECMP_IN_STRING_H 1
 #define HAVE_WPRINTF 1
 #define HAVE_VSWPRINTF 1
 #define HAVE_VSWSCANF 1
@@ -133,9 +123,9 @@
 #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
 #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
 #define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 2.9.4"
+#define PACKAGE_STRING "wxWidgets 3.1.0"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.9.4"
+#define PACKAGE_VERSION "3.1.0"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1
diff --git a/Externals/wxWidgets3/include/wx/osx/control.h b/Externals/wxWidgets3/include/wx/osx/control.h
index e68dca2fe9..f0d7c4606b 100644
--- a/Externals/wxWidgets3/include/wx/osx/control.h
+++ b/Externals/wxWidgets3/include/wx/osx/control.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: control.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h b/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
index 4f710f223a..6c604cd069 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2007/05/10
-// RCS-ID:      $Id: cfdataref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Stefan Csomor
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfref.h b/Externals/wxWidgets3/include/wx/osx/core/cfref.h
index 8a9ea13c51..c4a6b3c17a 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/cfref.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/cfref.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by: Stefan Csomor
 // Created:     2007/05/10
-// RCS-ID:      $Id: cfref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 David Elliott <dfe@cox.net>, Stefan Csomor
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfstring.h b/Externals/wxWidgets3/include/wx/osx/core/cfstring.h
index 01275cf73c..cbe092463b 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/cfstring.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/cfstring.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2004-10-29 (from code in wx/mac/carbon/private.h)
-// RCS-ID:      $Id: cfstring.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 // Usage:       Darwin (base library)
@@ -71,8 +70,10 @@ public:
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
 
     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+    static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 #if wxOSX_USE_COCOA_OR_IPHONE
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+    static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 #endif
 
 #if wxOSX_USE_COCOA_OR_IPHONE
diff --git a/Externals/wxWidgets3/include/wx/osx/core/colour.h b/Externals/wxWidgets3/include/wx/osx/core/colour.h
index 2765a4c20b..004b627f61 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/colour.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/colour.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: colour.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/dataview.h b/Externals/wxWidgets3/include/wx/osx/core/dataview.h
index f02d328eea..61d05bf309 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/dataview.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/dataview.h
@@ -3,7 +3,6 @@
 // Name:        wx/osx/core/dataview.h
 // Purpose:     wxDataViewCtrl native implementation header for OSX
 // Author:
-// Id:          $Id: dataview.h 57374 2009-01-27
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/evtloop.h b/Externals/wxWidgets3/include/wx/osx/core/evtloop.h
new file mode 100644
index 0000000000..d2ff91d4c2
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/osx/core/evtloop.h
@@ -0,0 +1,114 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/evtloop.h
+// Purpose:     CoreFoundation-based event loop
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2006-01-12
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_CORE_EVTLOOP_H_
+#define _WX_OSX_CORE_EVTLOOP_H_
+
+DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop );
+DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver );
+
+class WXDLLIMPEXP_FWD_BASE wxCFEventLoopPauseIdleEvents;
+
+class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase
+{
+    friend class wxCFEventLoopPauseIdleEvents;
+public:
+    wxCFEventLoop();
+    virtual ~wxCFEventLoop();
+
+    // sets the "should exit" flag and wakes up the loop so that it terminates
+    // soon
+    virtual void ScheduleExit(int rc = 0);
+
+    // return true if any events are available
+    virtual bool Pending() const;
+
+    // dispatch a single event, return false if we should exit from the loop
+    virtual bool Dispatch();
+
+    // same as Dispatch() but doesn't wait for longer than the specified (in
+    // ms) timeout, return true if an event was processed, false if we should
+    // exit the loop or -1 if timeout expired
+    virtual int DispatchTimeout(unsigned long timeout);
+
+    // implement this to wake up the loop: usually done by posting a dummy event
+    // to it (can be called from non main thread)
+    virtual void WakeUp();
+
+    virtual bool YieldFor(long eventsToProcess);
+
+    bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
+    
+#if wxUSE_UIACTIONSIMULATOR
+    // notifies Yield and Dispatch to wait for at least one event before
+    // returning, this is necessary, because the synthesized events need to be
+    // converted by the OS before being available on the native event queue
+    void SetShouldWaitForEvent(bool should) { m_shouldWaitForEvent = should; }
+#endif
+protected:
+    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
+    // terminating when Exit() is called
+    virtual int DoRun();
+
+    void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
+    void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
+
+    // set to false to avoid idling at unexpected moments - eg when having native message boxes
+    void SetProcessIdleEvents(bool process) { m_processIdleEvents = process; }
+
+    static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
+    static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
+
+    // get the currently executing CFRunLoop
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
+
+    virtual int DoDispatchTimeout(unsigned long timeout);
+
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
+
+    // the loop exit code
+    int m_exitcode;
+
+    // cfrunloop
+    CFRunLoopRef m_runLoop;
+
+    // common modes runloop observer
+    CFRunLoopObserverRef m_commonModeRunLoopObserver;
+
+    // default mode runloop observer
+    CFRunLoopObserverRef m_defaultModeRunLoopObserver;
+
+    // set to false to avoid idling at unexpected moments - eg when having native message boxes
+    bool m_processIdleEvents;
+
+#if wxUSE_UIACTIONSIMULATOR
+    bool m_shouldWaitForEvent;
+#endif
+private:
+    // process all already pending events and dispatch a new one (blocking
+    // until it appears in the event queue if necessary)
+    //
+    // returns the return value of DoDispatchTimeout()
+    int DoProcessEvents();
+
+    wxDECLARE_NO_COPY_CLASS(wxCFEventLoop);
+};
+
+class WXDLLIMPEXP_BASE wxCFEventLoopPauseIdleEvents : public wxObject
+{
+public:
+    wxCFEventLoopPauseIdleEvents();
+    virtual ~wxCFEventLoopPauseIdleEvents();
+private:
+    bool m_formerState;
+};
+
+#endif // _WX_OSX_EVTLOOP_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/core/hid.h b/Externals/wxWidgets3/include/wx/osx/core/hid.h
index 2738f5a31b..20c1a7ba41 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/hid.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/hid.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     11/11/2003
-// RCS-ID:      $Id: hid.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +33,6 @@
 
 //Darn apple - doesn't properly wrap their headers in extern "C"!
 //http://www.macosx.com/forums/archive/index.php/t-68069.html
-//Needed for codewarrior link error with mach_port_deallocate()
 extern "C" {
 #include <mach/mach_port.h>
 }
diff --git a/Externals/wxWidgets3/include/wx/osx/core/joystick.h b/Externals/wxWidgets3/include/wx/osx/core/joystick.h
index 4af96dae10..36941b5b0b 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/joystick.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/joystick.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2/13/2005
-// RCS-ID:      $Id: joystick.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h b/Externals/wxWidgets3/include/wx/osx/core/mimetype.h
index a6e5b1ead9..7f92a990ff 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/mimetype.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/mimetype.h
@@ -4,7 +4,6 @@
 // Author:      Neil Perkins
 // Modified by:
 // Created:     2010-05-15
-// RCS-ID:      $Id: mimetype.h 68563 2011-08-05 19:02:26Z VZ $
 // Copyright:   (C) 2010 Neil Perkins
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/objcid.h b/Externals/wxWidgets3/include/wx/osx/core/objcid.h
new file mode 100644
index 0000000000..35238bb891
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/osx/core/objcid.h
@@ -0,0 +1,23 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/objcid.h
+// Purpose:     Define wxObjCID working in both C++ and Objective-C.
+// Author:      Vadim Zeitlin
+// Created:     2012-05-20
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_CORE_OBJCID_H_
+#define _WX_OSX_CORE_OBJCID_H_
+
+// ----------------------------------------------------------------------------
+// wxObjCID: Equivalent of Objective-C "id" that works in C++ code.
+// ----------------------------------------------------------------------------
+
+#ifdef __OBJC__
+    #define wxObjCID id
+#else
+    typedef struct objc_object* wxObjCID;
+#endif
+
+#endif // _WX_OSX_CORE_OBJCID_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/core/private.h b/Externals/wxWidgets3/include/wx/osx/core/private.h
index 4b69c9bb90..18c3cc7b89 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/private.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/private.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: private.h 70354 2012-01-15 15:53:56Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,23 @@
     #define wxOSX_10_6_AND_LATER(x)
 #endif
 
+// platform specific Clang analyzer support
+#ifndef NS_RETURNS_RETAINED
+#   if WX_HAS_CLANG_FEATURE(attribute_ns_returns_retained)
+#       define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
+#   else
+#       define NS_RETURNS_RETAINED
+#   endif
+#endif
+
+#ifndef CF_RETURNS_RETAINED
+#   if WX_HAS_CLANG_FEATURE(attribute_cf_returns_retained)
+#       define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
+#   else
+#       define CF_RETURNS_RETAINED
+#   endif
+#endif
+
 #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
 
 // Carbon functions are currently still used in wxOSX/Cocoa too (including
@@ -105,7 +121,9 @@ WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRe
 WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data );
 WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
 
-CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void);
+WXDLLIMPEXP_CORE CGColorSpaceRef wxMacGetGenericRGBColorSpace(void);
+
+WXDLLIMPEXP_CORE double wxOSXGetMainScreenContentScaleFactor();
 
 class wxWindowMac;
 // to
@@ -242,7 +260,7 @@ public :
     virtual void        GetPosition( int &x, int &y ) const = 0;
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
-    virtual float       GetContentScaleFactor() const 
+    virtual double      GetContentScaleFactor() const
     {
         return 1.0;
     }
@@ -265,6 +283,8 @@ public :
 
     virtual bool        NeedsFrame() const;
     virtual void        SetNeedsFrame( bool needs );
+    
+    virtual void        SetDrawingEnabled(bool enabled);
 
     virtual bool        CanFocus() const = 0;
     // return true if successful
@@ -284,13 +304,16 @@ public :
     virtual void        SetCursor( const wxCursor & cursor ) = 0;
     virtual void        CaptureMouse() = 0;
     virtual void        ReleaseMouse() = 0;
+    
+    virtual void        SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {}
 
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;
     virtual wxBitmap    GetBitmap() const = 0;
     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void        SetBitmapPosition( wxDirection dir ) = 0;
-    virtual void        SetupTabs( const wxNotebook &notebook ) =0;
+    virtual void        SetupTabs( const wxNotebook& WXUNUSED(notebook) ) {}
+    virtual int         TabHitTest( const wxPoint & WXUNUSED(pt), long *flags ) {*flags=1; return -1;};
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;
     virtual void        Enable( bool enable ) = 0;
@@ -319,9 +342,16 @@ public :
 
     // static methods for associating native controls and their implementations
 
+    // finds the impl associated with this native control
     static wxWidgetImpl*
                         FindFromWXWidget(WXWidget control);
 
+    // finds the impl associated with this native control, if the native control itself is not known
+    // also checks whether its parent is eg a registered scrollview, ie whether the control is a native subpart
+    // of a known control
+    static wxWidgetImpl*
+                        FindBestFromWXWidget(WXWidget control);
+    
     static void         RemoveAssociations( wxWidgetImpl* impl);
 
     static void         Associate( WXWidget control, wxWidgetImpl *impl );
@@ -844,7 +874,7 @@ public :
     virtual void ScreenToWindow( int *x, int *y ) = 0;
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
-
+    
     virtual bool IsActive() = 0;
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h
index 499ff1b94a..18778d7da5 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/private/datetimectrl.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Vadim Zeitlin
 // Created:     2011-12-19
-// RCS-ID:      $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h b/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h
index 18eea2a0da..d22c73f72f 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/private/strconv_cf.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott, Ryan Norton
 // Modified by:
 // Created:     2007-07-06
-// RCS-ID:      $Id: strconv_cf.h 67215 2011-03-16 10:55:30Z SC $
 // Copyright:   (c) 2004 Ryan Norton
 //              (c) 2007 David Elliott
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/osx/core/private/timer.h b/Externals/wxWidgets3/include/wx/osx/core/private/timer.h
index ac5d34f4ac..2f191797d9 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/private/timer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTimer class based on core foundation
 // Author:      Stefan Csomor
 // Created:     2008-07-16
-// RCS-ID:      $Id: timer.h 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/core/stdpaths.h b/Externals/wxWidgets3/include/wx/osx/core/stdpaths.h
index 67b7bffa4b..8ebe071e9c 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/stdpaths.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/stdpaths.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004-10-27
-// RCS-ID:      $Id: stdpaths.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,7 +34,6 @@ typedef __CFBundle * wxCFBundleRef;
 class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsCFBase
 {
 public:
-    wxStandardPathsCF();
     virtual ~wxStandardPathsCF();
 
     // wxMac specific: allow user to specify a different bundle
@@ -57,6 +55,10 @@ public:
     virtual wxString GetDocumentsDir() const;
 
 protected:
+    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
+    // objects of this class directly.
+    wxStandardPathsCF();
+
     // this function can be called with any of CFBundleCopyXXXURL function
     // pointer as parameter
     wxString GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const;
diff --git a/Externals/wxWidgets3/include/wx/osx/cursor.h b/Externals/wxWidgets3/include/wx/osx/cursor.h
index 024130c863..0dcf5be22d 100644
--- a/Externals/wxWidgets3/include/wx/osx/cursor.h
+++ b/Externals/wxWidgets3/include/wx/osx/cursor.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: cursor.h 62771 2009-12-03 17:20:15Z PC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dataform.h b/Externals/wxWidgets3/include/wx/osx/dataform.h
index 91cfcbc939..a9c7ba9e3c 100644
--- a/Externals/wxWidgets3/include/wx/osx/dataform.h
+++ b/Externals/wxWidgets3/include/wx/osx/dataform.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor (lifted from dnd.h)
 // Modified by:
 // Created:     10/21/99
-// RCS-ID:      $Id: dataform.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dataobj.h b/Externals/wxWidgets3/include/wx/osx/dataobj.h
index c21b53b1b2..45a73f289f 100644
--- a/Externals/wxWidgets3/include/wx/osx/dataobj.h
+++ b/Externals/wxWidgets3/include/wx/osx/dataobj.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor (adapted from Robert Roebling's gtk port)
 // Modified by:
 // Created:     10/21/99
-// RCS-ID:      $Id: dataobj.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -25,12 +24,16 @@ public:
 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
-    void AddToPasteboard( void * pasteboardRef , int itemID );
+    void AddToPasteboard( void * pasteboardRef , wxIntPtr itemID );
     // returns true if the passed in format is present in the pasteboard
     static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
     // returns true if any of the accepted formats of this dataobj is in the pasteboard
     bool HasDataInPasteboard( void * pasteboardRef );
     bool GetFromPasteboard( void * pasteboardRef );
+    
+#if wxOSX_USE_COCOA
+    virtual void AddSupportedTypes( void* cfarray);
+#endif
 };
 
 #endif // _WX_MAC_DATAOBJ_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/dataobj2.h b/Externals/wxWidgets3/include/wx/osx/dataobj2.h
index da97266641..dec7fe50bf 100644
--- a/Externals/wxWidgets3/include/wx/osx/dataobj2.h
+++ b/Externals/wxWidgets3/include/wx/osx/dataobj2.h
@@ -4,7 +4,6 @@
 // Author:      David Webster (adapted from Robert Roebling's gtk port
 // Modified by:
 // Created:     10/21/99
-// RCS-ID:      $Id: dataobj2.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dataview.h b/Externals/wxWidgets3/include/wx/osx/dataview.h
index f54188e3df..cffb3bf35f 100644
--- a/Externals/wxWidgets3/include/wx/osx/dataview.h
+++ b/Externals/wxWidgets3/include/wx/osx/dataview.h
@@ -2,7 +2,6 @@
 // Name:        wx/osx/dataview.h
 // Purpose:     wxDataViewCtrl native implementation header for OSX
 // Author:
-// Id:          $Id: dataview.h 70496 2012-02-02 14:19:30Z VZ $
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -300,6 +299,8 @@ private:
 
   wxDataViewColumnPtrArrayType m_ColumnPtrs; // all column pointers are stored in an array
 
+  wxDataViewModelNotifier* m_ModelNotifier; // stores the model notifier for the control (does not own the notifier)
+
  // wxWidget internal stuff:
   DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
   DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
diff --git a/Externals/wxWidgets3/include/wx/osx/datectrl.h b/Externals/wxWidgets3/include/wx/osx/datectrl.h
index 026361aa2f..555ba68e99 100644
--- a/Externals/wxWidgets3/include/wx/osx/datectrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/datectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxOSX-specific wxDatePickerCtrl class.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: datectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/datetimectrl.h b/Externals/wxWidgets3/include/wx/osx/datetimectrl.h
index 2184229b12..9993970125 100644
--- a/Externals/wxWidgets3/include/wx/osx/datetimectrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/datetimectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxOSX-specific wxDateTimePickerCtrl class.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: datetimectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dc.h b/Externals/wxWidgets3/include/wx/osx/dc.h
index fca6654137..84bb59c077 100644
--- a/Externals/wxWidgets3/include/wx/osx/dc.h
+++ b/Externals/wxWidgets3/include/wx/osx/dc.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dc.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dcclient.h b/Externals/wxWidgets3/include/wx/osx/dcclient.h
index 6c078c8414..fca62cf35b 100644
--- a/Externals/wxWidgets3/include/wx/osx/dcclient.h
+++ b/Externals/wxWidgets3/include/wx/osx/dcclient.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dcclient.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dcmemory.h b/Externals/wxWidgets3/include/wx/osx/dcmemory.h
index ac671151d4..bace3c5a95 100644
--- a/Externals/wxWidgets3/include/wx/osx/dcmemory.h
+++ b/Externals/wxWidgets3/include/wx/osx/dcmemory.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dcmemory.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dcprint.h b/Externals/wxWidgets3/include/wx/osx/dcprint.h
index fadd05979c..ec9f785167 100644
--- a/Externals/wxWidgets3/include/wx/osx/dcprint.h
+++ b/Externals/wxWidgets3/include/wx/osx/dcprint.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dcprint.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dcscreen.h b/Externals/wxWidgets3/include/wx/osx/dcscreen.h
index be12a5d597..374f0efcd8 100644
--- a/Externals/wxWidgets3/include/wx/osx/dcscreen.h
+++ b/Externals/wxWidgets3/include/wx/osx/dcscreen.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dcscreen.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dialog.h b/Externals/wxWidgets3/include/wx/osx/dialog.h
index 6fbb1bba6d..3b0b724fb8 100644
--- a/Externals/wxWidgets3/include/wx/osx/dialog.h
+++ b/Externals/wxWidgets3/include/wx/osx/dialog.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dialog.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dirdlg.h b/Externals/wxWidgets3/include/wx/osx/dirdlg.h
index 1ea6fd2739..f355f604e8 100644
--- a/Externals/wxWidgets3/include/wx/osx/dirdlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/dirdlg.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dirdlg.h 67896 2011-06-09 00:28:28Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,10 +11,29 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
+#if wxOSX_USE_COCOA
+    DECLARE_WXCOCOA_OBJC_CLASS(NSOpenPanel);
+#endif
+
 class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
 public:
+    wxDirDialog() { Init(); }
+
     wxDirDialog(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxT(""),
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr)
+    {
+        Init();
+
+        Create(parent,message,defaultPath,style,pos,size,name);
+    }
+
+    void Create(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxT(""),
                 long style = wxDD_DEFAULT_STYLE,
@@ -34,14 +52,19 @@ public:
     virtual void ModalFinishedCallback(void* panel, int returnCode);
 #endif
 
-protected:
-
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
-
+private:
 #if wxOSX_USE_COCOA
+    // Create and initialize NSOpenPanel that we use in both ShowModal() and
+    // ShowWindowModal().
+    WX_NSOpenPanel OSXCreatePanel() const;
+
     WX_NSObject m_sheetDelegate;
 #endif
+
+    // Common part of all ctors.
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
 };
 
-#endif
-    // _WX_DIRDLG_H_
+#endif // _WX_DIRDLG_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/dnd.h b/Externals/wxWidgets3/include/wx/osx/dnd.h
index 9899d8981f..7cd8ed2242 100644
--- a/Externals/wxWidgets3/include/wx/osx/dnd.h
+++ b/Externals/wxWidgets3/include/wx/osx/dnd.h
@@ -2,7 +2,6 @@
 // Name:        wx/osx/dnd.h
 // Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
 // Author:      Stefan Csomor
-// RCS-ID:      $Id: dnd.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dvrenderer.h b/Externals/wxWidgets3/include/wx/osx/dvrenderer.h
index 86704ce5e7..d7ded78464 100644
--- a/Externals/wxWidgets3/include/wx/osx/dvrenderer.h
+++ b/Externals/wxWidgets3/include/wx/osx/dvrenderer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewRenderer for OS X wxDataViewCtrl implementations
 // Author:      Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/osx/dataview.h)
-// RCS-ID:      $Id: dvrenderer.h 66403 2010-12-19 15:02:56Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/dvrenderers.h b/Externals/wxWidgets3/include/wx/osx/dvrenderers.h
index caa99b5710..d046b1a851 100644
--- a/Externals/wxWidgets3/include/wx/osx/dvrenderers.h
+++ b/Externals/wxWidgets3/include/wx/osx/dvrenderers.h
@@ -3,7 +3,6 @@
 // Purpose:     All OS X wxDataViewCtrl renderer classes
 // Author:      Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/osx/dataview.h)
-// RCS-ID:      $Id: dvrenderers.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,6 +102,12 @@ public:
     wxString GetChoice(size_t index) const { return m_choices[index]; }
     const wxArrayString& GetChoices() const { return m_choices; }
 
+#if wxOSX_USE_COCOA
+    virtual void OSXOnCellChanged(NSObject *value,
+                                  const wxDataViewItem& item,
+                                  unsigned col);
+#endif // Cocoa
+
 private:
     wxArrayString m_choices;
 
diff --git a/Externals/wxWidgets3/include/wx/osx/evtloop.h b/Externals/wxWidgets3/include/wx/osx/evtloop.h
index 26c75a7ac5..98772dd97f 100644
--- a/Externals/wxWidgets3/include/wx/osx/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/osx/evtloop.h
@@ -6,7 +6,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloop.h 67724 2011-05-11 06:46:07Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,87 +13,6 @@
 #ifndef _WX_OSX_EVTLOOP_H_
 #define _WX_OSX_EVTLOOP_H_
 
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop );
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver );
-
-class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase
-{
-public:
-    wxCFEventLoop();
-    virtual ~wxCFEventLoop();
-
-    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
-    // terminating when Exit() is called
-    virtual int Run();
-
-    // sets the "should exit" flag and wakes up the loop so that it terminates
-    // soon
-    virtual void Exit(int rc = 0);
-
-    // return true if any events are available
-    virtual bool Pending() const;
-
-    // dispatch a single event, return false if we should exit from the loop
-    virtual bool Dispatch();
-
-    // same as Dispatch() but doesn't wait for longer than the specified (in
-    // ms) timeout, return true if an event was processed, false if we should
-    // exit the loop or -1 if timeout expired
-    virtual int DispatchTimeout(unsigned long timeout);
-
-    // implement this to wake up the loop: usually done by posting a dummy event
-    // to it (can be called from non main thread)
-    virtual void WakeUp();
-
-    virtual bool YieldFor(long eventsToProcess);
-
-#if wxUSE_EVENTLOOP_SOURCE
-    virtual wxEventLoopSource *
-      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
-#endif // wxUSE_EVENTLOOP_SOURCE
-
-
-protected:
-    void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
-    void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
-
-    static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
-    static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
-
-    // get the currently executing CFRunLoop
-    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
-
-    virtual int DoDispatchTimeout(unsigned long timeout);
-
-    virtual void DoRun();
-
-    virtual void DoStop();
-
-    // should we exit the loop?
-    bool m_shouldExit;
-
-    // the loop exit code
-    int m_exitcode;
-
-    // cfrunloop
-    CFRunLoopRef m_runLoop;
-
-    // common modes runloop observer
-    CFRunLoopObserverRef m_commonModeRunLoopObserver;
-
-    // default mode runloop observer
-    CFRunLoopObserverRef m_defaultModeRunLoopObserver;
-
-private:
-    // process all already pending events and dispatch a new one (blocking
-    // until it appears in the event queue if necessary)
-    //
-    // returns the return value of DoDispatchTimeout()
-    int DoProcessEvents();
-};
-
-#if wxUSE_GUI
-
 #ifdef __WXOSX_COCOA__
     #include "wx/osx/cocoa/evtloop.h"
 #else
@@ -109,17 +27,20 @@ class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
 public:
     wxModalEventLoop(wxWindow *modalWindow);
     wxModalEventLoop(WXWindow modalNativeWindow);
+    
+#ifdef __WXOSX_COCOA__
+    // skip wxGUIEventLoop to avoid missing Enter/Exit notifications
+    virtual int Run() { return wxCFEventLoop::Run(); }
 
+    virtual bool ProcessIdle();
+#endif
 protected:
-    virtual void DoRun();
-
-    virtual void DoStop();
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
 
     // (in case) the modal window for this event loop
     wxNonOwnedWindow* m_modalWindow;
     WXWindow m_modalNativeWindow;
 };
 
-#endif // wxUSE_GUI
-
 #endif // _WX_OSX_EVTLOOP_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h b/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h
index 3f599fc05e..291ce0f1e4 100644
--- a/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h
+++ b/Externals/wxWidgets3/include/wx/osx/evtloopsrc.h
@@ -3,7 +3,6 @@
 // Purpose:     wxCFEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21
-// RCS-ID:      $Id: evtloopsrc.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,28 +10,32 @@
 #ifndef _WX_OSX_EVTLOOPSRC_H_
 #define _WX_OSX_EVTLOOPSRC_H_
 
-typedef struct __CFFileDescriptor *CFFileDescriptorRef;
+typedef struct __CFSocket* CFSocketRef;
 
 // ----------------------------------------------------------------------------
 // wxCFEventLoopSource: CoreFoundation-based wxEventLoopSource for OS X
 // ----------------------------------------------------------------------------
 
-class wxCFEventLoopSource : public wxEventLoopSource
+class WXDLLIMPEXP_BASE wxCFEventLoopSource : public wxEventLoopSource
 {
 public:
+    // Create a new source in uninitialized state, call InitSocketRef() later
+    // to associate it with the socket it is going to use.
     wxCFEventLoopSource(wxEventLoopSourceHandler *handler, int flags)
         : wxEventLoopSource(handler, flags)
     {
-        m_cffd = NULL;
+        m_cfSocket = NULL;
     }
 
-    // we take ownership of this CFFileDescriptorRef
-    void SetFileDescriptor(CFFileDescriptorRef cffd);
+    // Finish initialization of the event loop source by providing the
+    // associated socket. This object takes ownership of it and will release it.
+    void InitSourceSocket(CFSocketRef cfSocket);
 
+    // Destructor deletes the associated socket.
     virtual ~wxCFEventLoopSource();
 
 private:
-    CFFileDescriptorRef m_cffd;
+    CFSocketRef m_cfSocket;
 
     wxDECLARE_NO_COPY_CLASS(wxCFEventLoopSource);
 };
diff --git a/Externals/wxWidgets3/include/wx/osx/filedlg.h b/Externals/wxWidgets3/include/wx/osx/filedlg.h
index 6dbc0cb50c..10342fa8a8 100644
--- a/Externals/wxWidgets3/include/wx/osx/filedlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/filedlg.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: filedlg.h 67896 2011-06-09 00:28:28Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,23 @@ protected:
     wxArrayString m_paths;
 
 public:
+    wxFileDialog() { Init(); }
     wxFileDialog(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr)
+    {
+        Init();
+
+        Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name);
+    }
+
+    void Create(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
@@ -87,6 +102,10 @@ protected:
     WX_NSObject m_delegate;
     WX_NSObject m_sheetDelegate;
 #endif
+
+private:
+    // Common part of all ctors.
+    void Init();
 };
 
 #endif // _WX_FILEDLG_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/font.h b/Externals/wxWidgets3/include/wx/osx/font.h
index e1fe572e58..2c31c2daa7 100644
--- a/Externals/wxWidgets3/include/wx/osx/font.h
+++ b/Externals/wxWidgets3/include/wx/osx/font.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: font.h 70445 2012-01-23 11:28:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,20 @@ public:
     // ctors and such
     wxFont() { }
 
+    wxFont(const wxFontInfo& info)
+    {
+        Create(info.GetPointSize(),
+               info.GetFamily(),
+               info.GetStyle(),
+               info.GetWeight(),
+               info.IsUnderlined(),
+               info.GetFaceName(),
+               info.GetEncoding());
+
+        if ( info.IsUsingSizeInPixels() )
+            SetPixelSize(info.GetPixelSize());
+    }
+
     wxFont( wxOSXSystemFont systemFont );
 
 #if wxOSX_USE_COCOA
@@ -79,19 +92,6 @@ public:
         SetPixelSize(pixelSize);
     }
 
-    wxFont(int pointSize,
-           wxFontFamily family,
-           int flags = wxFONTFLAG_DEFAULT,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(pointSize, family,
-               GetStyleFromFlags(flags),
-               GetWeightFromFlags(flags),
-               GetUnderlinedFromFlags(flags),
-               face, encoding);
-    }
-
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
@@ -121,6 +121,8 @@ public:
     virtual wxFontEncoding GetEncoding() const;
     virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
+    virtual bool IsFixedWidth() const;
+
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(wxFontFamily family);
     virtual void SetStyle(wxFontStyle style);
@@ -150,9 +152,7 @@ public:
     CGFontRef OSXGetCGFont() const;
 #endif
 
-#if wxOSX_USE_CORE_TEXT
     CTFontRef OSXGetCTFont() const;
-#endif
 
 #if wxOSX_USE_ATSU_TEXT
     // Returns an ATSUStyle not ATSUStyle*
diff --git a/Externals/wxWidgets3/include/wx/osx/fontdlg.h b/Externals/wxWidgets3/include/wx/osx/fontdlg.h
index 966a8fa937..e271578cdf 100644
--- a/Externals/wxWidgets3/include/wx/osx/fontdlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/fontdlg.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-09-25
-// RCS-ID:      $Id: fontdlg.h 70497 2012-02-02 14:19:34Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -124,25 +123,25 @@ public:
     /// Respond to colour change
     void OnColourChanged(wxCommandEvent& event);
 
-    /// wxEVT_COMMAND_LISTBOX_SELECTED event handler for wxID_FONTDIALOG_FACENAME
+    /// wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME
     void OnFontdialogFacenameSelected( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+    /// wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE
     void OnFontdialogFontsizeUpdated( wxSpinEvent& event );
 
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+    /// wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE
     void OnFontdialogFontsizeTextUpdated( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_BOLD
+    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD
     void OnFontdialogBoldClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_ITALIC
+    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC
     void OnFontdialogItalicClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_UNDERLINED
+    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED
     void OnFontdialogUnderlinedClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+    /// wxEVT_BUTTON event handler for wxID_OK
     void OnOkClick( wxCommandEvent& event );
 
     /// Should we show tooltips?
diff --git a/Externals/wxWidgets3/include/wx/osx/frame.h b/Externals/wxWidgets3/include/wx/osx/frame.h
index ca6ffb51da..5902dc0c9c 100644
--- a/Externals/wxWidgets3/include/wx/osx/frame.h
+++ b/Externals/wxWidgets3/include/wx/osx/frame.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: frame.h 70765 2012-03-01 15:04:42Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/gauge.h b/Externals/wxWidgets3/include/wx/osx/gauge.h
index 3e64fbb1c3..692c3b587a 100644
--- a/Externals/wxWidgets3/include/wx/osx/gauge.h
+++ b/Externals/wxWidgets3/include/wx/osx/gauge.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gauge.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/glcanvas.h b/Externals/wxWidgets3/include/wx/osx/glcanvas.h
index 80973fea3a..1789a900f0 100644
--- a/Externals/wxWidgets3/include/wx/osx/glcanvas.h
+++ b/Externals/wxWidgets3/include/wx/osx/glcanvas.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/helpxxxx.h b/Externals/wxWidgets3/include/wx/osx/helpxxxx.h
index 1995c7d5f3..9a9fe4c67f 100644
--- a/Externals/wxWidgets3/include/wx/osx/helpxxxx.h
+++ b/Externals/wxWidgets3/include/wx/osx/helpxxxx.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: helpxxxx.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/icon.h b/Externals/wxWidgets3/include/wx/osx/icon.h
index 9053ffd1b5..bc6b721db6 100644
--- a/Externals/wxWidgets3/include/wx/osx/icon.h
+++ b/Externals/wxWidgets3/include/wx/osx/icon.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: icon.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h b/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h
index c402458f67..cd86c72f45 100644
--- a/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h
@@ -4,7 +4,6 @@
  * Author:      Stefan Csomor
  * Modified by:
  * Created:     2008-07-30
- * RCS-ID:      $Id: chkconf.h 69818 2011-11-25 14:37:03Z SC $
  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */
@@ -20,7 +19,6 @@
  * under a certain platform
  */
 
-#define wxOSX_USE_CORE_TEXT 0
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 
@@ -363,6 +361,11 @@
 #define wxUSE_RICHTOOLTIP 0
 #endif
 
+#if wxUSE_WEBVIEW
+#undef wxUSE_WEBVIEW
+#define wxUSE_WEBVIEW 0
+#endif
+
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */
 
diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/private.h b/Externals/wxWidgets3/include/wx/osx/iphone/private.h
index 03ead77125..e21dd388b0 100644
--- a/Externals/wxWidgets3/include/wx/osx/iphone/private.h
+++ b/Externals/wxWidgets3/include/wx/osx/iphone/private.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: private.h 67233 2011-03-18 15:45:51Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,11 @@
     #import <UIKit/UIKit.h>
 #endif
 
+#include <CoreText/CTFont.h>
+#include <CoreText/CTStringAttributes.h>
+#include <CoreText/CTLine.h>
+
+
 #if wxUSE_GUI
 
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
@@ -56,7 +60,7 @@ public :
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        SetControlSize( wxWindowVariant variant );
-    virtual float       GetContentScaleFactor() const ;
+    virtual double      GetContentScaleFactor() const ;
     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
diff --git a/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h b/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h
index df1662ea02..7c9e5fd109 100644
--- a/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h
+++ b/Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: textimpl.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/joystick.h b/Externals/wxWidgets3/include/wx/osx/joystick.h
index d9d2f06481..e5f834390a 100644
--- a/Externals/wxWidgets3/include/wx/osx/joystick.h
+++ b/Externals/wxWidgets3/include/wx/osx/joystick.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: joystick.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/listbox.h b/Externals/wxWidgets3/include/wx/osx/listbox.h
index 700ca7b815..60f4199e74 100644
--- a/Externals/wxWidgets3/include/wx/osx/listbox.h
+++ b/Externals/wxWidgets3/include/wx/osx/listbox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox.h 65940 2010-10-28 10:27:32Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/listctrl.h b/Externals/wxWidgets3/include/wx/osx/listctrl.h
index b0412f25f7..9f2fdfe984 100644
--- a/Externals/wxWidgets3/include/wx/osx/listctrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/listctrl.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listctrl.h 70290 2012-01-08 00:55:22Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -291,9 +290,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 
-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-
 /* Why should we need this function? Leave for now.
  * We might need it because item data may have changed,
  * but the display needs refreshing (in string callback mode)
diff --git a/Externals/wxWidgets3/include/wx/osx/mdi.h b/Externals/wxWidgets3/include/wx/osx/mdi.h
index 91d7b444a5..7a859d198d 100644
--- a/Externals/wxWidgets3/include/wx/osx/mdi.h
+++ b/Externals/wxWidgets3/include/wx/osx/mdi.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     1998-01-01
-// RCS-ID:      $Id: mdi.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/osx/menu.h b/Externals/wxWidgets3/include/wx/osx/menu.h
index 6429ca657d..9eded8593b 100644
--- a/Externals/wxWidgets3/include/wx/osx/menu.h
+++ b/Externals/wxWidgets3/include/wx/osx/menu.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,8 +32,6 @@ public:
 
     virtual ~wxMenu();
 
-    virtual void Attach(wxMenuBarBase *menubar) ;
-
     virtual void Break();
 
     virtual void SetTitle(const wxString& title);
@@ -77,17 +74,14 @@ private:
     // common part of all ctors
     void Init();
 
-    // common part of Append/Insert (behaves as Append is pos == (size_t)-1)
+    // common part of Do{Append,Insert}(): behaves as Append if pos == -1
     bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1);
 
-    // terminate the current radio group, if any
-    void EndRadioGroup();
-
     // Common part of HandleMenu{Opened,Closed}().
     void DoHandleMenuOpenedOrClosed(wxEventType evtType);
 
 
-    // if TRUE, insert a breal before appending the next item
+    // if TRUE, insert a break before appending the next item
     bool m_doBreak;
 
     // in this menu rearranging of menu items (esp hiding) is allowed
@@ -96,9 +90,6 @@ private:
     // don't trigger native events
     bool m_noEventsMode;
 
-    // the position of the first item in the current radio group or -1
-    int m_startRadioGroup;
-
     wxMenuImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
@@ -155,6 +146,10 @@ public:
     // call this function to update it (m_menuBarFrame should be !NULL)
     void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);
 
+#if wxABI_VERSION >= 30001
+    wxMenu *OSXGetAppleMenu() const { return m_appleMenu; }
+#endif
+
     static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; }
     static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; }
 
diff --git a/Externals/wxWidgets3/include/wx/osx/menuitem.h b/Externals/wxWidgets3/include/wx/osx/menuitem.h
index a72f1831ca..69dc7e7bcb 100644
--- a/Externals/wxWidgets3/include/wx/osx/menuitem.h
+++ b/Externals/wxWidgets3/include/wx/osx/menuitem.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id: menuitem.h 66904 2011-02-16 16:37:24Z SC $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,16 +45,32 @@ public:
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
+
+    // Implementation only from now on.
+
     // update the os specific representation
     void UpdateItemBitmap() ;
     void UpdateItemText() ;
     void UpdateItemStatus() ;
 
     // mark item as belonging to the given radio group
-    void SetAsRadioGroupStart();
+    void SetAsRadioGroupStart(bool start = true);
     void SetRadioGroupStart(int start);
     void SetRadioGroupEnd(int end);
 
+    // return true if this is the starting item of a radio group
+    bool IsRadioGroupStart() const;
+
+    // get the start of the radio group this item belongs to: should not be
+    // called for the starting radio group item itself because it doesn't have
+    // this information
+    int GetRadioGroupStart() const;
+
+    // get the end of the radio group this item belongs to: should be only
+    // called for the starting radio group item, i.e. if IsRadioGroupStart() is
+    // true
+    int GetRadioGroupEnd() const;
+
     wxMenuItemImpl* GetPeer() { return m_peer; }
 private:
     void UncheckRadio() ;
diff --git a/Externals/wxWidgets3/include/wx/osx/metafile.h b/Externals/wxWidgets3/include/wx/osx/metafile.h
index 2a7e13e252..973a5736a4 100644
--- a/Externals/wxWidgets3/include/wx/osx/metafile.h
+++ b/Externals/wxWidgets3/include/wx/osx/metafile.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: metafile.h 70710 2012-02-27 15:37:24Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/minifram.h b/Externals/wxWidgets3/include/wx/osx/minifram.h
index 8b7b67e3de..00fe6e474a 100644
--- a/Externals/wxWidgets3/include/wx/osx/minifram.h
+++ b/Externals/wxWidgets3/include/wx/osx/minifram.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: minifram.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/msgdlg.h b/Externals/wxWidgets3/include/wx/osx/msgdlg.h
index 173cab4994..871d32f940 100644
--- a/Externals/wxWidgets3/include/wx/osx/msgdlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/msgdlg.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: msgdlg.h 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h b/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h
index b6b014f30b..edc3f04e62 100644
--- a/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h
+++ b/Externals/wxWidgets3/include/wx/osx/nonownedwnd.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-03-24
-// RCS-ID:      $Id: nonownedwnd.h 70488 2012-01-31 17:39:39Z SC $
 // Copyright:   (c) 2008 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -65,7 +64,7 @@ public:
     virtual void UnsubclassWin();
 
     virtual wxPoint GetClientAreaOrigin() const;
-
+    
     // implement base class pure virtuals
 
     virtual bool SetTransparent(wxByte alpha);
@@ -105,7 +104,7 @@ public:
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     // override the base class method to return an NSWindow instead of NSView
-    virtual void *OSXGetViewOrWindow() const { return GetWXWindow(); }
+    virtual void *OSXGetViewOrWindow() const;
 #endif // Cocoa
 
     // osx specific event handling common for all osx-ports
diff --git a/Externals/wxWidgets3/include/wx/osx/notebook.h b/Externals/wxWidgets3/include/wx/osx/notebook.h
index 62a1accc33..7e0ac72291 100644
--- a/Externals/wxWidgets3/include/wx/osx/notebook.h
+++ b/Externals/wxWidgets3/include/wx/osx/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      Stefan Csomor
 // Modified by:
-// RCS-ID:      $Id: notebook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/palette.h b/Externals/wxWidgets3/include/wx/osx/palette.h
index 3f10196a17..86e014f80f 100644
--- a/Externals/wxWidgets3/include/wx/osx/palette.h
+++ b/Externals/wxWidgets3/include/wx/osx/palette.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: palette.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/pen.h b/Externals/wxWidgets3/include/wx/osx/pen.h
index cf8091f5f8..391344850c 100644
--- a/Externals/wxWidgets3/include/wx/osx/pen.h
+++ b/Externals/wxWidgets3/include/wx/osx/pen.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: pen.h 58739 2009-02-07 23:23:18Z KO $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/pnghand.h b/Externals/wxWidgets3/include/wx/osx/pnghand.h
index 135725528b..c040521337 100644
--- a/Externals/wxWidgets3/include/wx/osx/pnghand.h
+++ b/Externals/wxWidgets3/include/wx/osx/pnghand.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: pnghand.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/popupwin.h b/Externals/wxWidgets3/include/wx/osx/popupwin.h
index 3027d5f26c..ac42cd64dd 100644
--- a/Externals/wxWidgets3/include/wx/osx/popupwin.h
+++ b/Externals/wxWidgets3/include/wx/osx/popupwin.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
-// RCS-ID:      $Id: popupwin.h 70848 2012-03-09 05:50:58Z PC $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,8 +26,6 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show(bool show = true);
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
diff --git a/Externals/wxWidgets3/include/wx/osx/printdlg.h b/Externals/wxWidgets3/include/wx/osx/printdlg.h
index ab87b870e0..d2601eccbe 100644
--- a/Externals/wxWidgets3/include/wx/osx/printdlg.h
+++ b/Externals/wxWidgets3/include/wx/osx/printdlg.h
@@ -6,7 +6,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: printdlg.h 70636 2012-02-20 21:55:55Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/printmac.h b/Externals/wxWidgets3/include/wx/osx/printmac.h
index 6017955bfe..fb68fd8d5f 100644
--- a/Externals/wxWidgets3/include/wx/osx/printmac.h
+++ b/Externals/wxWidgets3/include/wx/osx/printmac.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: printmac.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/private/glgrab.h b/Externals/wxWidgets3/include/wx/osx/private/glgrab.h
index 3ec2df8f4e..a3ceabe689 100644
--- a/Externals/wxWidgets3/include/wx/osx/private/glgrab.h
+++ b/Externals/wxWidgets3/include/wx/osx/private/glgrab.h
@@ -4,7 +4,7 @@
     extern "C" {
 #endif
 
-    CGImageRef grabViaOpenGL(CGDirectDisplayID display,
+    CF_RETURNS_RETAINED CGImageRef grabViaOpenGL(CGDirectDisplayID display,
                              CGRect srcRect);
 
 #if defined __cplusplus
diff --git a/Externals/wxWidgets3/include/wx/osx/radiobox.h b/Externals/wxWidgets3/include/wx/osx/radiobox.h
index 5ca8856e20..f591a7df9b 100644
--- a/Externals/wxWidgets3/include/wx/osx/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/osx/radiobox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: radiobox.h 69544 2011-10-26 05:39:18Z RD $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/radiobut.h b/Externals/wxWidgets3/include/wx/osx/radiobut.h
index ded6f4b832..649a544c3c 100644
--- a/Externals/wxWidgets3/include/wx/osx/radiobut.h
+++ b/Externals/wxWidgets3/include/wx/osx/radiobut.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: radiobut.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/scrolbar.h b/Externals/wxWidgets3/include/wx/osx/scrolbar.h
index 79698bee52..2115ca5479 100644
--- a/Externals/wxWidgets3/include/wx/osx/scrolbar.h
+++ b/Externals/wxWidgets3/include/wx/osx/scrolbar.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: scrolbar.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/setup0.h b/Externals/wxWidgets3/include/wx/osx/setup0.h
index 46bad79d19..cbcd58af13 100644
--- a/Externals/wxWidgets3/include/wx/osx/setup0.h
+++ b/Externals/wxWidgets3/include/wx/osx/setup0.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Stefan Csomor
 // Created:     1998-01-01
-// RCS-ID:      $Id: setup0.h 70395 2012-01-19 08:55:41Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -152,7 +151,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin / CodeWarrior
+// ignored for MinGW/Cygwin.
 //
 // Default is 0
 //
@@ -268,6 +267,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
@@ -1088,6 +1098,20 @@
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#ifdef __WXOSX_IPHONE__
+#define wxUSE_PREFERENCES_EDITOR 0
+#else
+#define wxUSE_PREFERENCES_EDITOR 1
+#endif
+
 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //
@@ -1501,19 +1525,6 @@
 // Mac-specific settings
 // ----------------------------------------------------------------------------
 
-// override some settings for Metrowerks
-//
-// VZ: isn't this file only used when building with Metrowerks anyhow?
-// CS: no, it is also used by the Xcode projects
-#ifdef __MWERKS__
-    #undef wxUSE_DEBUG_CONTEXT
-    #define wxUSE_DEBUG_CONTEXT 1
-
-    #undef wxUSE_STD_IOSTREAM
-    // CS: I have to set this to 0 now, as shared builds are having problems
-    #define wxUSE_STD_IOSTREAM  0
-#endif
-
 #undef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 1
 
diff --git a/Externals/wxWidgets3/include/wx/osx/slider.h b/Externals/wxWidgets3/include/wx/osx/slider.h
index 2984b3948a..bd99512dca 100644
--- a/Externals/wxWidgets3/include/wx/osx/slider.h
+++ b/Externals/wxWidgets3/include/wx/osx/slider.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/sound.h b/Externals/wxWidgets3/include/wx/osx/sound.h
index 45538773d0..f406537927 100644
--- a/Externals/wxWidgets3/include/wx/osx/sound.h
+++ b/Externals/wxWidgets3/include/wx/osx/sound.h
@@ -5,7 +5,6 @@
 // Author:      Ryan Norton, Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Ryan Norton, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/spinbutt.h b/Externals/wxWidgets3/include/wx/osx/spinbutt.h
index a02abcb94d..b294851f96 100644
--- a/Externals/wxWidgets3/include/wx/osx/spinbutt.h
+++ b/Externals/wxWidgets3/include/wx/osx/spinbutt.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: spinbutt.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/srchctrl.h b/Externals/wxWidgets3/include/wx/osx/srchctrl.h
index 3477c25e25..ee926cf5f4 100644
--- a/Externals/wxWidgets3/include/wx/osx/srchctrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/srchctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     mac carbon wxSearchCtrl class
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctrl.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/statbox.h b/Externals/wxWidgets3/include/wx/osx/statbox.h
index cdbdead32e..5b5f049c58 100644
--- a/Externals/wxWidgets3/include/wx/osx/statbox.h
+++ b/Externals/wxWidgets3/include/wx/osx/statbox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbox.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/statline.h b/Externals/wxWidgets3/include/wx/osx/statline.h
index 8b2628fa13..bd94398239 100644
--- a/Externals/wxWidgets3/include/wx/osx/statline.h
+++ b/Externals/wxWidgets3/include/wx/osx/statline.h
@@ -3,7 +3,6 @@
 // Purpose:     a generic wxStaticLine class used for mac before adaptation
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/stattext.h b/Externals/wxWidgets3/include/wx/osx/stattext.h
index 18372b9500..3b4b9b6637 100644
--- a/Externals/wxWidgets3/include/wx/osx/stattext.h
+++ b/Externals/wxWidgets3/include/wx/osx/stattext.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: stattext.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/statusbr.h b/Externals/wxWidgets3/include/wx/osx/statusbr.h
index ea90f0a649..74ae67758c 100644
--- a/Externals/wxWidgets3/include/wx/osx/statusbr.h
+++ b/Externals/wxWidgets3/include/wx/osx/statusbr.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statusbr.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/taskbarosx.h b/Externals/wxWidgets3/include/wx/osx/taskbarosx.h
index dba4a86bb1..7d13df747e 100644
--- a/Externals/wxWidgets3/include/wx/osx/taskbarosx.h
+++ b/Externals/wxWidgets3/include/wx/osx/taskbarosx.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     04/04/2003
-// RCS-ID:      $Id: taskbarosx.h 67084 2011-02-28 10:12:06Z SC $
 // Copyright:   (c) Ryan Norton, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -19,21 +18,7 @@ class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
-        // type of taskbar item to create (currently only DOCK is implemented)
-        enum wxTaskBarIconType
-        {
-            DOCK
-#if wxOSX_USE_COCOA
-        ,   CUSTOM_STATUSITEM
-#endif
-#if wxOSX_USE_COCOA
-        ,   DEFAULT_TYPE = CUSTOM_STATUSITEM
-#else
-        ,   DEFAULT_TYPE = DOCK
-#endif
-        };
-
-    wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
+    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
 
     // returns true if the taskbaricon is in the global menubar
diff --git a/Externals/wxWidgets3/include/wx/osx/textctrl.h b/Externals/wxWidgets3/include/wx/osx/textctrl.h
index 70e0863c35..a52620b5c7 100644
--- a/Externals/wxWidgets3/include/wx/osx/textctrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/textctrl.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: textctrl.h 70355 2012-01-15 15:54:53Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -75,10 +74,6 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
-    // set the grayed out hint text
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
-
     // text control under some platforms supports the text styles: these
     // methods apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
@@ -152,7 +147,6 @@ protected:
 
 private :
     wxMenu  *m_privateContextMenu;
-    wxString m_hintString;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/Externals/wxWidgets3/include/wx/osx/textentry.h b/Externals/wxWidgets3/include/wx/osx/textentry.h
index 7a6a66f58b..12d780778a 100644
--- a/Externals/wxWidgets3/include/wx/osx/textentry.h
+++ b/Externals/wxWidgets3/include/wx/osx/textentry.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Kevin Ollivier
 // Created:     1998-01-01
-// RCS-ID:      $Id: textentry.h 67526 2011-04-17 23:14:15Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -80,6 +79,12 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
+    virtual bool SendMaxLenEvent();
+
+    // set the grayed out hint text
+    virtual bool SetHint(const wxString& hint);
+    virtual wxString GetHint() const;
+
     // Implementation
     // --------------
 
@@ -101,6 +106,8 @@ protected:
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
 
+private:
+    wxString m_hintString;
 };
 
 #endif // _WX_OSX_TEXTENTRY_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/tglbtn.h b/Externals/wxWidgets3/include/wx/osx/tglbtn.h
index e68a2ba60c..eaa48e8b81 100644
--- a/Externals/wxWidgets3/include/wx/osx/tglbtn.h
+++ b/Externals/wxWidgets3/include/wx/osx/tglbtn.h
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.h 67949 2011-06-16 00:43:22Z RD $
 // Copyright:   (c) 2004 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/timectrl.h b/Externals/wxWidgets3/include/wx/osx/timectrl.h
index 2d093acd54..6673fcce38 100644
--- a/Externals/wxWidgets3/include/wx/osx/timectrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/timectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxOSX-specific wxTimePickerCtrl class.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: timectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/toolbar.h b/Externals/wxWidgets3/include/wx/osx/toolbar.h
index f4a21982a6..2cbd0d7c6a 100644
--- a/Externals/wxWidgets3/include/wx/osx/toolbar.h
+++ b/Externals/wxWidgets3/include/wx/osx/toolbar.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: toolbar.h 70854 2012-03-10 00:01:09Z RD $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +28,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 
   inline wxToolBar(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                   long style = wxNO_BORDER|wxTB_HORIZONTAL,
+                   long style = wxTB_HORIZONTAL,
                    const wxString& name = wxToolBarNameStr)
   {
     Init();
@@ -38,7 +37,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
   virtual ~wxToolBar();
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxNO_BORDER|wxTB_HORIZONTAL,
+            long style = wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 
     virtual void SetWindowStyleFlag(long style);
@@ -72,6 +71,10 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 #endif
 
 #if wxOSX_USE_NATIVE_TOOLBAR
+    // make all tools selectable
+    void OSXSetSelectableTools(bool set);
+    void OSXSelectTool(int toolId);
+
     bool MacInstallNativeToolbar(bool usesNative);
     void MacUninstallNativeToolbar();
     bool MacWantsNativeToolbar();
diff --git a/Externals/wxWidgets3/include/wx/osx/tooltip.h b/Externals/wxWidgets3/include/wx/osx/tooltip.h
index a9b8467b45..f05122ba00 100644
--- a/Externals/wxWidgets3/include/wx/osx/tooltip.h
+++ b/Externals/wxWidgets3/include/wx/osx/tooltip.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id: tooltip.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin, Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/osx/toplevel.h b/Externals/wxWidgets3/include/wx/osx/toplevel.h
index afe1f1d80f..73b218fe75 100644
--- a/Externals/wxWidgets3/include/wx/osx/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/osx/toplevel.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     20.09.01
-// RCS-ID:      $Id: toplevel.h 70295 2012-01-08 14:52:47Z VZ $
 // Copyright:   (c) 2001 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -74,6 +73,9 @@ public:
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
+    virtual void SetLabel(const wxString& label) { SetTitle( label ); }
+    virtual wxString GetLabel() const            { return GetTitle(); }
+    
     virtual void OSXSetModified(bool modified);
     virtual bool OSXIsModified() const;
 
diff --git a/Externals/wxWidgets3/include/wx/osx/treectrl.h b/Externals/wxWidgets3/include/wx/osx/treectrl.h
index 090111624f..587325b85a 100644
--- a/Externals/wxWidgets3/include/wx/osx/treectrl.h
+++ b/Externals/wxWidgets3/include/wx/osx/treectrl.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: treectrl.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -236,20 +235,20 @@ protected:
 };
 
 /*
- wxEVT_COMMAND_TREE_BEGIN_DRAG,
- wxEVT_COMMAND_TREE_BEGIN_RDRAG,
- wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT,
- wxEVT_COMMAND_TREE_END_LABEL_EDIT,
- wxEVT_COMMAND_TREE_DELETE_ITEM,
- wxEVT_COMMAND_TREE_GET_INFO,
- wxEVT_COMMAND_TREE_SET_INFO,
- wxEVT_COMMAND_TREE_ITEM_EXPANDED,
- wxEVT_COMMAND_TREE_ITEM_EXPANDING,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
- wxEVT_COMMAND_TREE_SEL_CHANGED,
- wxEVT_COMMAND_TREE_SEL_CHANGING,
- wxEVT_COMMAND_TREE_KEY_DOWN
+ wxEVT_TREE_BEGIN_DRAG,
+ wxEVT_TREE_BEGIN_RDRAG,
+ wxEVT_TREE_BEGIN_LABEL_EDIT,
+ wxEVT_TREE_END_LABEL_EDIT,
+ wxEVT_TREE_DELETE_ITEM,
+ wxEVT_TREE_GET_INFO,
+ wxEVT_TREE_SET_INFO,
+ wxEVT_TREE_ITEM_EXPANDED,
+ wxEVT_TREE_ITEM_EXPANDING,
+ wxEVT_TREE_ITEM_COLLAPSED,
+ wxEVT_TREE_ITEM_COLLAPSING,
+ wxEVT_TREE_SEL_CHANGED,
+ wxEVT_TREE_SEL_CHANGING,
+ wxEVT_TREE_KEY_DOWN
 */
 
 class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent
@@ -272,20 +271,36 @@ public:
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 
-#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_COMMAND_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_GET_INFO(id, fn) { wxEVT_COMMAND_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_GET_INFO(id, fn) { wxEVT_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_SET_INFO(id, fn) { wxEVT_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREE_BEGIN_DRAG         wxEVT_TREE_BEGIN_DRAG
+#define wxEVT_COMMAND_TREE_BEGIN_RDRAG        wxEVT_TREE_BEGIN_RDRAG
+#define wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT   wxEVT_TREE_BEGIN_LABEL_EDIT
+#define wxEVT_COMMAND_TREE_END_LABEL_EDIT     wxEVT_TREE_END_LABEL_EDIT
+#define wxEVT_COMMAND_TREE_DELETE_ITEM        wxEVT_TREE_DELETE_ITEM
+#define wxEVT_COMMAND_TREE_GET_INFO           wxEVT_TREE_GET_INFO
+#define wxEVT_COMMAND_TREE_SET_INFO           wxEVT_TREE_SET_INFO
+#define wxEVT_COMMAND_TREE_ITEM_EXPANDED      wxEVT_TREE_ITEM_EXPANDED
+#define wxEVT_COMMAND_TREE_ITEM_EXPANDING     wxEVT_TREE_ITEM_EXPANDING
+#define wxEVT_COMMAND_TREE_ITEM_COLLAPSED     wxEVT_TREE_ITEM_COLLAPSED
+#define wxEVT_COMMAND_TREE_ITEM_COLLAPSING    wxEVT_TREE_ITEM_COLLAPSING
+#define wxEVT_COMMAND_TREE_SEL_CHANGED        wxEVT_TREE_SEL_CHANGED
+#define wxEVT_COMMAND_TREE_SEL_CHANGING       wxEVT_TREE_SEL_CHANGING
+#define wxEVT_COMMAND_TREE_KEY_DOWN           wxEVT_TREE_KEY_DOWN
 
 #endif
     // _WX_TREECTRL_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/webview_webkit.h b/Externals/wxWidgets3/include/wx/osx/webview_webkit.h
index d0a93e653e..803f8b0b29 100644
--- a/Externals/wxWidgets3/include/wx/osx/webview_webkit.h
+++ b/Externals/wxWidgets3/include/wx/osx/webview_webkit.h
@@ -5,7 +5,6 @@
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:
 // Created:     2004-4-16
-// RCS-ID:      $Id: webview_webkit.h 69074 2011-09-12 18:35:39Z SJL $
 // Copyright:   (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,8 @@
 #include "wx/control.h"
 #include "wx/webview.h"
 
+#include "wx/osx/core/objcid.h"
+
 // ----------------------------------------------------------------------------
 // Web Kit Control
 // ----------------------------------------------------------------------------
@@ -52,15 +53,11 @@ public:
     virtual bool CanGoForward() const;
     virtual void GoBack();
     virtual void GoForward();
-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
     virtual void Stop();
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
 
-    //We do not want to hide the other overloads
-    using wxWebView::SetPage;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);
-
     virtual void Print();
 
     virtual void LoadURL(const wxString& url);
@@ -74,20 +71,28 @@ public:
     virtual bool CanSetZoomType(wxWebViewZoomType type) const;
 
     virtual bool IsBusy() const { return m_busy; }
-    
+
     //History functions
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
     virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
-    
+
     //Undo / redo functionality
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual void Undo();
     virtual void Redo();
 
+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) 
+    { 
+        wxUnusedVar(text);
+        wxUnusedVar(flags);
+        return wxNOT_FOUND; 
+    }
+
     //Clipboard functions
     virtual bool CanCut() const { return true; }
     virtual bool CanCopy() const { return true; }
@@ -95,11 +100,11 @@ public:
     virtual void Cut();
     virtual void Copy();
     virtual void Paste();
-    
+
     //Editing functions
     virtual void SetEditable(bool enable = true);
     virtual bool IsEditable() const;
-    
+
     //Selection
     virtual void DeleteSelection();
     virtual bool HasSelection() const;
@@ -107,12 +112,14 @@ public:
     virtual wxString GetSelectedText() const;
     virtual wxString GetSelectedSource() const;
     virtual void ClearSelection();
-    
+
     void RunScript(const wxString& javascript);
-    
+
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
 
+    virtual void* GetNativeBackend() const { return m_webView; }
+
     // ---- methods not from the parent (common) interface
     bool  CanGetPageSource() const;
 
@@ -141,6 +148,8 @@ public:
     bool m_busy;
 
 protected:
+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
+
     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();
 
@@ -149,7 +158,7 @@ private:
     wxWindowID m_windowID;
     wxString m_pageTitle;
 
-    struct objc_object *m_webView;
+    wxObjCID m_webView;
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
@@ -158,6 +167,20 @@ private:
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT 
+class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
+{
+public:
+    virtual wxWebView* Create() { return new wxWebViewWebKit; }
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr)
+    { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
+};
+
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
 
 #endif // _WX_WEBKIT_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h b/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h
index 05976803f5..f1c2d5f655 100644
--- a/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h
+++ b/Externals/wxWidgets3/include/wx/osx/webviewhistoryitem_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/osx/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for OSX
 // Author:      Steven Lamerton
-// Id:          $Id: webviewhistoryitem_webkit.h 69074 2011-09-12 18:35:39Z SJL $
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,6 +14,8 @@
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
                                           ||  defined(__WXOSX_CARBON__))
 
+#include "wx/osx/core/objcid.h"
+
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
@@ -27,9 +28,9 @@ public:
 
 private:
     wxString m_url, m_title;
-    struct objc_object *m_histItem;
+    wxObjCID m_histItem;
 };
 
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT 
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
 
 #endif // _WX_OSX_WEBVIEWHISTORYITEM_H_
diff --git a/Externals/wxWidgets3/include/wx/osx/window.h b/Externals/wxWidgets3/include/wx/osx/window.h
index 1ac3916a8c..623493aa1e 100644
--- a/Externals/wxWidgets3/include/wx/osx/window.h
+++ b/Externals/wxWidgets3/include/wx/osx/window.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: window.h 70765 2012-03-01 15:04:42Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,6 +54,8 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr );
 
+    virtual void SendSizeEvent(int flags = 0);
+    
     // implement base class pure virtuals
     virtual void SetLabel( const wxString& label );
     virtual wxString GetLabel() const;
@@ -95,7 +96,7 @@ public:
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
-
+    
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );
@@ -259,7 +260,10 @@ public:
     // optimization to avoid creating a user pane in wxWindow::Create if we already know
     // we will replace it with our own peer
     void                DontCreatePeer();
-    
+
+    // return true unless DontCreatePeer() had been called
+    bool                ShouldCreatePeer() const;
+
     // sets the native implementation wrapper, can replace an existing peer, use peer = NULL to 
     // release existing peer
     void                SetPeer(wxOSXWidgetImpl* peer);
@@ -273,7 +277,7 @@ public:
     //
     // this is useful for a few Cocoa function which can work with either views
     // or windows indiscriminately, e.g. for setting NSViewAnimationTargetKey
-    virtual void *OSXGetViewOrWindow() const { return GetHandle(); }
+    virtual void *OSXGetViewOrWindow() const;
 #endif // Cocoa
 
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
@@ -283,10 +287,11 @@ public:
 
     virtual bool        OSXHandleClicked( double timestampsec );
     virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
+    virtual void        OSXSimulateFocusEvents();
 
     bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
     
-    float               GetContentScaleFactor() const ;
+    double              GetContentScaleFactor() const ;
     
     // internal response to size events
     virtual void MacOnInternalSize() {}
diff --git a/Externals/wxWidgets3/include/wx/overlay.h b/Externals/wxWidgets3/include/wx/overlay.h
index 7f29b4fc71..adde26db86 100644
--- a/Externals/wxWidgets3/include/wx/overlay.h
+++ b/Externals/wxWidgets3/include/wx/overlay.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ownerdrw.h b/Externals/wxWidgets3/include/wx/ownerdrw.h
index 37a525844e..b25f5cc71a 100644
--- a/Externals/wxWidgets3/include/wx/ownerdrw.h
+++ b/Externals/wxWidgets3/include/wx/ownerdrw.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Malich
 // Created:     11.11.97
-// RCS-ID:      $Id: ownerdrw.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/palette.h b/Externals/wxWidgets3/include/wx/palette.h
index 4c29f23b98..85bf7dd689 100644
--- a/Externals/wxWidgets3/include/wx/palette.h
+++ b/Externals/wxWidgets3/include/wx/palette.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: palette.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/panel.h b/Externals/wxWidgets3/include/wx/panel.h
index 18c7aacd47..11fc2c6416 100644
--- a/Externals/wxWidgets3/include/wx/panel.h
+++ b/Externals/wxWidgets3/include/wx/panel.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: panel.h 69378 2011-10-11 17:07:43Z VZ $
 // Copyright:   (c) Julian Smart
 //              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows Licence
diff --git a/Externals/wxWidgets3/include/wx/paper.h b/Externals/wxWidgets3/include/wx/paper.h
index 89dfe20d3c..d50d549804 100644
--- a/Externals/wxWidgets3/include/wx/paper.h
+++ b/Externals/wxWidgets3/include/wx/paper.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: paper.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/pen.h b/Externals/wxWidgets3/include/wx/pen.h
index 75147dcf37..e55b046eff 100644
--- a/Externals/wxWidgets3/include/wx/pen.h
+++ b/Externals/wxWidgets3/include/wx/pen.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: pen.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,15 +31,14 @@ enum wxPenStyle
     wxPENSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
     wxPENSTYLE_STIPPLE = wxSTIPPLE,
 
-    wxPENSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH,
-    wxPENSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH,
-    wxPENSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH,
-    wxPENSTYLE_CROSS_HATCH = wxCROSS_HATCH,
-    wxPENSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH,
-    wxPENSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH,
-
-    wxPENSTYLE_FIRST_HATCH = wxFIRST_HATCH,
-    wxPENSTYLE_LAST_HATCH = wxLAST_HATCH
+    wxPENSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
+    wxPENSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
+    wxPENSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
+    wxPENSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
+    wxPENSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
+    wxPENSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
+    wxPENSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
+    wxPENSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
 };
 
 enum wxPenJoin
diff --git a/Externals/wxWidgets3/include/wx/persist.h b/Externals/wxWidgets3/include/wx/persist.h
index 2ac6a4423e..45ed61eb9e 100644
--- a/Externals/wxWidgets3/include/wx/persist.h
+++ b/Externals/wxWidgets3/include/wx/persist.h
@@ -3,7 +3,6 @@
 // Purpose:     common classes for persistence support
 // Author:      Vadim Zeitlin
 // Created:     2009-01-18
-// RCS-ID:      $Id: persist.h 69583 2011-10-30 10:08:18Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/persist/bookctrl.h b/Externals/wxWidgets3/include/wx/persist/bookctrl.h
index e01b19eaec..38eee262e9 100644
--- a/Externals/wxWidgets3/include/wx/persist/bookctrl.h
+++ b/Externals/wxWidgets3/include/wx/persist/bookctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     persistence support for wxBookCtrl
 // Author:      Vadim Zeitlin
 // Created:     2009-01-19
-// RCS-ID:      $Id: bookctrl.h 58529 2009-01-30 21:38:29Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/persist/splitter.h b/Externals/wxWidgets3/include/wx/persist/splitter.h
index 5f8fe34158..d8369c3783 100644
--- a/Externals/wxWidgets3/include/wx/persist/splitter.h
+++ b/Externals/wxWidgets3/include/wx/persist/splitter.h
@@ -3,7 +3,6 @@
 // Purpose:     Persistence support for wxSplitterWindow.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-31
-// RCS-ID:      $Id: splitter.h 69582 2011-10-30 10:08:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/persist/toplevel.h b/Externals/wxWidgets3/include/wx/persist/toplevel.h
index 34b4890625..7d79f23460 100644
--- a/Externals/wxWidgets3/include/wx/persist/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/persist/toplevel.h
@@ -3,7 +3,6 @@
 // Purpose:     persistence support for wxTLW
 // Author:      Vadim Zeitlin
 // Created:     2009-01-19
-// RCS-ID:      $Id: toplevel.h 58529 2009-01-30 21:38:29Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/persist/treebook.h b/Externals/wxWidgets3/include/wx/persist/treebook.h
index 0156fb8b94..1c0ba94631 100644
--- a/Externals/wxWidgets3/include/wx/persist/treebook.h
+++ b/Externals/wxWidgets3/include/wx/persist/treebook.h
@@ -3,7 +3,6 @@
 // Purpose:     persistence support for wxBookCtrl
 // Author:      Vadim Zeitlin
 // Created:     2009-01-19
-// RCS-ID:      $Id: treebook.h 58529 2009-01-30 21:38:29Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/persist/window.h b/Externals/wxWidgets3/include/wx/persist/window.h
index 08d0e54c9a..279e11d26d 100644
--- a/Externals/wxWidgets3/include/wx/persist/window.h
+++ b/Externals/wxWidgets3/include/wx/persist/window.h
@@ -3,7 +3,6 @@
 // Purpose:     wxPersistentWindow declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-01-23
-// RCS-ID:      $Id: window.h 59262 2009-03-02 12:10:40Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/pickerbase.h b/Externals/wxWidgets3/include/wx/pickerbase.h
index ff5c86f0de..3c761da876 100644
--- a/Externals/wxWidgets3/include/wx/pickerbase.h
+++ b/Externals/wxWidgets3/include/wx/pickerbase.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id: pickerbase.h 68921 2011-08-27 14:11:25Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -106,6 +105,11 @@ public:     // public API
     wxControl *GetPickerCtrl()
         { return m_picker; }
 
+    void SetTextCtrl(wxTextCtrl* text)
+        { m_text = text; }
+    void SetPickerCtrl(wxControl* picker)
+        { m_picker = picker; }
+
     // methods that derived class must/may override
     virtual void UpdatePickerFromTextCtrl() = 0;
     virtual void UpdateTextCtrlFromPicker() = 0;
diff --git a/Externals/wxWidgets3/include/wx/platform.h b/Externals/wxWidgets3/include/wx/platform.h
index 74ad218a3a..97c669f7a4 100644
--- a/Externals/wxWidgets3/include/wx/platform.h
+++ b/Externals/wxWidgets3/include/wx/platform.h
@@ -4,7 +4,6 @@
 * Author:      Vadim Zeitlin
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
-* RCS-ID:      $Id: platform.h 70757 2012-02-29 22:40:24Z VZ $
 * Copyright:   (c) 1997-2001 Vadim Zeitlin
 * Licence:     wxWindows licence
 */
@@ -14,16 +13,6 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
-
-
-/*
-    Codewarrior doesn't define any Windows symbols until some headers
-    are included
-*/
-#ifdef __MWERKS__
-#   include <stddef.h>
-#endif
-
 #ifdef __WXMAC_XCODE__
 #    include <unistd.h>
 #    include <TargetConditionals.h>
@@ -37,6 +26,12 @@
 #    ifndef MAC_OS_X_VERSION_10_6
 #       define MAC_OS_X_VERSION_10_6 1060
 #    endif
+#    ifndef MAC_OS_X_VERSION_10_7
+#       define MAC_OS_X_VERSION_10_7 1070
+#    endif
+#    ifndef MAC_OS_X_VERSION_10_8
+#       define MAC_OS_X_VERSION_10_8 1080
+#    endif
 #    include "wx/osx/config_xcode.h"
 #    ifndef __WXOSX__
 #        define __WXOSX__ 1
@@ -47,14 +42,20 @@
 #endif
 
 /*
-   first define Windows symbols if they're not defined on the command line: we
-   can autodetect everything we need if _WIN32 is defined
+    We use __WINDOWS__ as our main identification symbol for Microsoft Windows
+    but it's actually not predefined directly by any commonly used compilers
+    (only Watcom defines it itself and it's not supported any longer), so we
+    define it ourselves if any of the following macros is defined:
+
+    - MSVC _WIN32 (notice that this is also defined under Win64)
+    - Borland __WIN32__
+    - Our __WXMSW__ which selects Windows as platform automatically
  */
-#if defined(__CYGWIN__) && defined(__WINDOWS__)
-#    ifndef __WXMSW__
-#        define __WXMSW__
-#    endif
-#endif
+#if defined(_WIN32) || defined(__WIN32__) || defined(__WXMSW__)
+#    ifndef __WINDOWS__
+#        define __WINDOWS__
+#    endif /* !__WINDOWS__ */
+#endif /* Any standard symbol indicating Windows */
 
 #if defined(_WIN64)
 #    ifndef _WIN32
@@ -71,14 +72,12 @@
 #   endif /* !__WIN64__ */
 #endif /* _WIN64 */
 
-#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
-    && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
-#    ifndef __WXMSW__
-#        define __WXMSW__
-#    endif
-#endif /* Win32 */
+#if defined(__WINDOWS__)
+    /* Select wxMSW under Windows if no other port is specified. */
+#   if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+#       define __WXMSW__
+#   endif
 
-#if defined(__WXMSW__)
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
@@ -94,7 +93,30 @@
 #   ifndef __WIN32__
 #        define __WIN32__
 #   endif
-#endif /* __WXMSW__ */
+#endif /* __WINDOWS__ */
+
+/*
+    Don't use widget toolkit specific code in non-GUI code in the library
+    itself to ensure that the same base library is used for both MSW and GTK
+    ports. But keep __WXMSW__ defined for (console) applications using
+    wxWidgets for compatibility.
+ */
+#if defined(WXBUILDING) && defined(wxUSE_GUI) && !wxUSE_GUI
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+#   ifdef __WXGTK__
+#       undef __WXGTK__
+#   endif
+#endif
+
+#if defined(__WXGTK__) && defined(__WINDOWS__)
+
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+
+#endif /* __WXGTK__ && __WINDOWS__ */
 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
@@ -154,24 +176,18 @@
 #   include "wx/android/config_android.h"
 #endif
 
+#include "wx/compiler.h"
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
 
    Note that it must be included before defining hardware symbols below as they
-   could be already defined by configure
+   could be already defined by configure but it must be included after defining
+   the compiler macros above as msvc/wx/setup.h relies on them under Windows.
  */
 #include "wx/setup.h"
 
-#ifdef __GCCXML__
-    /*
-        we're using gccxml to create an XML representation of the entire
-        wxWidgets interface; use a special setup_gccxml.h file to fix some
-        of the stuff #defined by the real setup.h
-    */
-    #include "wx/setup_gccxml.h"
-#endif
-
 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */
@@ -236,11 +252,6 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
-#if defined( __MWERKS__ ) && !defined(__INTEL__)
-/* otherwise MSL headers bring in WIN32 dependant APIs */
-#undef UNICODE
-#endif
-
 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo
@@ -279,25 +290,6 @@
 #   define wxCOMPILER_BROKEN_CONCAT_OPER
 #endif /* __BORLANDC__ */
 
-/*
-   Define Watcom-specific macros.
-*/
-#ifndef __WATCOMC__
-#   define wxWATCOM_VERSION(major,minor) 0
-#   define wxCHECK_WATCOM_VERSION(major,minor) 0
-#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
-#   define WX_WATCOM_ONLY_CODE( x )
-#else
-#   if __WATCOMC__ < 1200
-#       error "Only Open Watcom is supported in this release"
-#   endif
-
-#   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
-#   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
-#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
-#   define WX_WATCOM_ONLY_CODE( x )  x
-#endif
-
 /*
    OS: first of all, test for MS-DOS platform. We must do this before testing
        for Unix, because DJGPP compiler defines __unix__ under MS-DOS
@@ -347,12 +339,6 @@
 #       endif
 #    endif  /* SGI */
 
-#    if defined(__SUNPRO_CC)
-#       ifndef __SUNCC__
-#           define __SUNCC__ __SUNPRO_CC
-#       endif /* Sun CC */
-#    endif /* Sun CC */
-
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR
 #    endif
@@ -397,17 +383,6 @@
 #        endif
 #    endif
 
-/*
-   OS: Classic Mac OS
- */
-#elif defined(applec) || \
-      defined(THINK_C) || \
-      (defined(__MWERKS__) && !defined(__INTEL__))
-      /* MacOS */
-#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-#        define wxSIZE_T_IS_ULONG
-#    endif
-
 /*
    OS: OS/2
  */
@@ -432,61 +407,22 @@
 #    define wxSIZE_T_IS_UINT
 
 /*
-   OS: Otherwise it must be Windows
+   OS: Windows
  */
-#else   /* Windows */
-#    ifndef __WINDOWS__
-#        define __WINDOWS__
-#    endif  /* Windows */
+#elif defined(__WINDOWS__)
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
 #        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
 #    endif
 
-    /*
-       define another standard symbol for Microsoft Visual C++: the standard
-       one (_MSC_VER) is also defined by Metrowerks compiler
-     */
-#    if defined(_MSC_VER) && !defined(__MWERKS__)
-#        define __VISUALC__ _MSC_VER
-
-    /*
-       define special symbols for different VC version instead of writing tests
-       for magic numbers such as 1200, 1300 &c repeatedly
-     */
-#   if __VISUALC__ < 1100
-#       error "This Visual C++ version is too old and not supported any longer."
-#   elif __VISUALC__ < 1200
-#       define __VISUALC5__
-#   elif __VISUALC__ < 1300
-#       define __VISUALC6__
-#   elif __VISUALC__ < 1400
-#       define __VISUALC7__
-#   elif __VISUALC__ < 1500
-#       define __VISUALC8__
-#   elif __VISUALC__ < 1600
-#       define __VISUALC9__
-#   elif __VISUALC__ < 1700
-#       define __VISUALC10__
-#   elif __VISUALC__ < 1800
-#       define __VISUALC11__
-#   else
-#       pragma message("Please update wx/platform.h to recognize this VC++ version")
-#   endif
-
-#    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
-#        define __BORLANDC__
-#    elif defined(__WATCOMC__)
-#    elif defined(__SC__)
-#        define __SYMANTECC__
-#    endif  /* compiler */
-
     /* size_t is the same as unsigned int for all Windows compilers we know, */
     /* so define it if it hadn't been done by configure yet */
 #    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
 #        define wxSIZE_T_IS_UINT
 #    endif
+#else
+#   error "Unknown platform."
 #endif  /* OS */
 
 /*
@@ -501,18 +437,6 @@
 #    define __X__
 #endif
 
-#ifdef __SC__
-#    ifdef __DMC__
-#         define __DIGITALMARS__
-#    else
-#         define __SYMANTEC__
-#    endif
-#endif
-
-#ifdef __INTEL_COMPILER
-#   define __INTELC__
-#endif
-
 /*
    We get "Large Files (ILP32) not supported in strict ANSI mode." #error
    from HP-UX standard headers when compiling with g++ without this:
@@ -528,69 +452,23 @@
 #   include "wx/msw/libraries.h"
 #endif
 
-/*
-   This macro can be used to test the gcc version and can be used like this:
-
-#    if wxCHECK_GCC_VERSION(3, 1)
-        ... we have gcc 3.1 or later ...
-#    else
-        ... no gcc at all or gcc < 3.1 ...
-#    endif
-*/
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-    #define wxCHECK_GCC_VERSION( major, minor ) \
-        ( ( __GNUC__ > (major) ) \
-            || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) )
-#else
-    #define wxCHECK_GCC_VERSION( major, minor ) 0
-#endif
-
 #if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
 #define wxNEEDS_CHARPP
 #endif
 
-/*
-   This macro can be used to test the Visual C++ version.
-*/
-#ifndef __VISUALC__
-#   define wxVISUALC_VERSION(major) 0
-#   define wxCHECK_VISUALC_VERSION(major) 0
-#else
-#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
-#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
-#endif
-
-/*
-   This macro can be used to check that the version of mingw32 compiler is
-   at least maj.min
- */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
       wxCHECK_WATCOM_VERSION(1,0) ) && \
     !defined(__DOS__) && \
     !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
-    !defined(__WXGTK__) && \
     !defined(__WXX11__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
 #    define wxCHECK_W32API_VERSION(maj, min) (0)
-#    undef wxCHECK_MINGW32_VERSION
-#    define wxCHECK_MINGW32_VERSION(maj, min) (0)
 #endif
 
-/**
-    This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
- */
-#ifdef __SUNCC__
-    /*
-       __SUNCC__ is 0xVRP where V is major version, R release and P patch level
-     */
-    #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
-#else
-    #define wxCHECK_SUNCC_VERSION(maj, min) (0)
-#endif
 
 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-
@@ -644,8 +522,7 @@
     checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
     for it.
  */
-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
-        || (defined(__DARWIN__) && !wxUSE_GUI)
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
 #   ifndef __WXOSX__
 #       define __WXOSX__ 1
 #   endif
@@ -684,6 +561,12 @@
 #        ifndef MAC_OS_X_VERSION_10_6
 #           define MAC_OS_X_VERSION_10_6 1060
 #        endif
+#        ifndef MAC_OS_X_VERSION_10_7
+#           define MAC_OS_X_VERSION_10_7 1070
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_8
+#           define MAC_OS_X_VERSION_10_8 1080
+#        endif
 #    else
 #        error "only mach-o configurations are supported"
 #    endif
@@ -770,7 +653,7 @@
 
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
- * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
+ * Presently, only Windows, OS X and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
 #    if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
diff --git a/Externals/wxWidgets3/include/wx/platinfo.h b/Externals/wxWidgets3/include/wx/platinfo.h
index 8adabba16b..f82080e587 100644
--- a/Externals/wxWidgets3/include/wx/platinfo.h
+++ b/Externals/wxWidgets3/include/wx/platinfo.h
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     07.07.2006 (based on wxToolkitInfo)
-// RCS-ID:      $Id: platinfo.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/popupwin.h b/Externals/wxWidgets3/include/wx/popupwin.h
index e6ed10c4e3..6b61517f39 100644
--- a/Externals/wxWidgets3/include/wx/popupwin.h
+++ b/Externals/wxWidgets3/include/wx/popupwin.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
-// RCS-ID:      $Id: popupwin.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -130,7 +129,7 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
     // Check if the mouse needs to be captured or released: we must release
     // when it's inside our window if we want the embedded controls to work.
     void OnIdle(wxIdleEvent& event);
diff --git a/Externals/wxWidgets3/include/wx/position.h b/Externals/wxWidgets3/include/wx/position.h
index 20776de396..bd324e2343 100644
--- a/Externals/wxWidgets3/include/wx/position.h
+++ b/Externals/wxWidgets3/include/wx/position.h
@@ -3,7 +3,6 @@
 // Purpose:     Common structure and methods for positional information.
 // Author:      Vadim Zeitlin, Robin Dunn, Brad Anderson, Bryan Petty
 // Created:     2007-03-13
-// RCS-ID:      $Id: position.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2007 The wxWidgets Team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/power.h b/Externals/wxWidgets3/include/wx/power.h
index ea3a11c9fc..17e81b6efb 100644
--- a/Externals/wxWidgets3/include/wx/power.h
+++ b/Externals/wxWidgets3/include/wx/power.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// RCS-ID:      $Id: power.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/preferences.h b/Externals/wxWidgets3/include/wx/preferences.h
new file mode 100644
index 0000000000..7eee648289
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/preferences.h
@@ -0,0 +1,145 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/preferences.h
+// Purpose:     Declaration of wxPreferencesEditor class.
+// Author:      Vaclav Slavik
+// Created:     2013-02-19
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PREFERENCES_H_
+#define _WX_PREFERENCES_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_PREFERENCES_EDITOR
+
+#include "wx/bitmap.h"
+#include "wx/vector.h"
+
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+class wxPreferencesEditorImpl;
+
+#if defined(__WXOSX_COCOA__)
+    // GetLargeIcon() is used
+    #define wxHAS_PREF_EDITOR_ICONS
+    // Changes should be applied immediately
+    #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
+    // The dialog is shown non-modally.
+    #define wxHAS_PREF_EDITOR_MODELESS
+#elif defined(__WXGTK__)
+    // Changes should be applied immediately
+    #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
+    // The dialog is shown non-modally.
+    #define wxHAS_PREF_EDITOR_MODELESS
+#endif
+
+// ----------------------------------------------------------------------------
+// wxPreferencesEditor: Native preferences editing
+// ----------------------------------------------------------------------------
+
+// One page of a preferences window
+class WXDLLIMPEXP_CORE wxPreferencesPage
+{
+public:
+    wxPreferencesPage() {}
+    virtual ~wxPreferencesPage() {}
+
+    // Name of the page, used e.g. for tabs
+    virtual wxString GetName() const = 0;
+
+    // Return 32x32 icon used for the page. Currently only used on OS X, where
+    // implementation is required; unused on other platforms. Because of this,
+    // the method is only pure virtual on platforms that use it.
+#ifdef wxHAS_PREF_EDITOR_ICONS
+    virtual wxBitmap GetLargeIcon() const = 0;
+#else
+    virtual wxBitmap GetLargeIcon() const { return wxBitmap(); }
+#endif
+
+    // Create a window (usually a wxPanel) for this page. The caller takes
+    // ownership of the returned window.
+    virtual wxWindow *CreateWindow(wxWindow *parent) = 0;
+
+    wxDECLARE_NO_COPY_CLASS(wxPreferencesPage);
+};
+
+
+// Helper for implementing some common pages (General, Advanced)
+class WXDLLIMPEXP_CORE wxStockPreferencesPage : public wxPreferencesPage
+{
+public:
+    enum Kind
+    {
+        Kind_General,
+        Kind_Advanced
+    };
+
+    wxStockPreferencesPage(Kind kind) : m_kind(kind) {}
+    Kind GetKind() const { return m_kind; }
+
+    virtual wxString GetName() const;
+#ifdef __WXOSX_COCOA__
+    virtual wxBitmap GetLargeIcon() const;
+#endif
+
+private:
+    Kind m_kind;
+};
+
+
+// Notice that this class does not inherit from wxWindow.
+class WXDLLIMPEXP_CORE wxPreferencesEditor
+{
+public:
+    // Ctor creates an empty editor, use AddPage() to add controls to it.
+    wxPreferencesEditor(const wxString& title = wxString());
+
+    // Dtor destroys the dialog if still shown.
+    virtual ~wxPreferencesEditor();
+
+    // Add a new page to the editor. The editor takes ownership of the page
+    // and won't delete it until it is destroyed itself.
+    void AddPage(wxPreferencesPage *page);
+
+    // Show the preferences dialog or bring it to the top if it's already
+    // shown. Notice that this method may or may not block depending on the
+    // platform, i.e. depending on whether the dialog is modal or not.
+    virtual void Show(wxWindow* parent);
+
+    // Hide the currently shown dialog, if any. This is typically used to
+    // dismiss the dialog if the object whose preferences it is editing was
+    // closed.
+    void Dismiss();
+
+    // Whether changes to values in the pages should be applied immediately
+    // (OS X, GTK+) or only when the user clicks OK/Apply (Windows)
+    static bool ShouldApplyChangesImmediately()
+    {
+#ifdef wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
+        return true;
+#else
+        return false;
+#endif
+    }
+
+    // Whether the dialog is shown modally, i.e. Show() blocks, or not.
+    static bool ShownModally()
+    {
+#ifdef wxHAS_PREF_EDITOR_MODELESS
+        return false;
+#else
+        return true;
+#endif
+    }
+
+private:
+    wxPreferencesEditorImpl* m_impl;
+
+    wxDECLARE_NO_COPY_CLASS(wxPreferencesEditor);
+};
+
+#endif // wxUSE_PREFERENCES_EDITOR
+
+#endif // _WX_PREFERENCES_H_
diff --git a/Externals/wxWidgets3/include/wx/print.h b/Externals/wxWidgets3/include/wx/print.h
index 9d11bb741a..56ebcf6597 100644
--- a/Externals/wxWidgets3/include/wx/print.h
+++ b/Externals/wxWidgets3/include/wx/print.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: print.h 54125 2008-06-11 19:17:41Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/printdlg.h b/Externals/wxWidgets3/include/wx/printdlg.h
index 826fbca204..d7e7e4e267 100644
--- a/Externals/wxWidgets3/include/wx/printdlg.h
+++ b/Externals/wxWidgets3/include/wx/printdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: printdlg.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h b/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h
new file mode 100644
index 0000000000..54ce5b0fce
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/eventloopsourcesmanager.h
@@ -0,0 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/eventloopsourcesmanager.h
+// Purpose:     declares wxEventLoopSourcesManagerBase class
+// Author:      Rob Bresalier
+// Created:     2013-06-19
+// Copyright:   (c) 2013 Rob Bresalier
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_
+#define _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_
+
+// For pulling in the value of wxUSE_EVENTLOOP_SOURCE
+#include "wx/evtloop.h"
+
+class WXDLLIMPEXP_BASE wxEventLoopSourcesManagerBase
+{
+public:
+#if wxUSE_EVENTLOOP_SOURCE
+    virtual wxEventLoopSource*
+    AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) = 0;
+#endif
+};
+
+#endif // _WX_PRIVATE_EVENTLOOPSOURCESMANAGER_H_
diff --git a/Externals/wxWidgets3/include/wx/private/fd.h b/Externals/wxWidgets3/include/wx/private/fd.h
index 57a4c1b9b8..3f4a604c37 100644
--- a/Externals/wxWidgets3/include/wx/private/fd.h
+++ b/Externals/wxWidgets3/include/wx/private/fd.h
@@ -3,7 +3,6 @@
 // Purpose:     private stuff for working with file descriptors
 // Author:      Vadim Zeitlin
 // Created:     2008-11-23 (moved from wx/unix/private.h)
-// RCS-ID:      $Id: fd.h 62790 2009-12-06 02:29:42Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h b/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h
index aef0dc88e0..0b85505cc0 100644
--- a/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h
+++ b/Externals/wxWidgets3/include/wx/private/fdiodispatcher.h
@@ -4,7 +4,6 @@
 // Authors:     Lukasz Michalski
 // Created:     December 2006
 // Copyright:   (c) Lukasz Michalski
-// RCS-ID:      $Id: fdiodispatcher.h 61686 2009-08-17 23:02:29Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h b/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h
new file mode 100644
index 0000000000..f457a09e5c
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/fdioeventloopsourcehandler.h
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/fdioeventloopsourcehandler.h
+// Purpose:     declares wxFDIOEventLoopSourceHandler class
+// Author:      Rob Bresalier, Vadim Zeitlin
+// Created:     2013-06-13 (extracted from src/unix/evtloopunix.cpp)
+// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+//              (c) 2013 Rob Bresalier
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H
+#define _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H
+
+#include "wx/evtloopsrc.h"
+
+// This class is a temporary bridge between event loop sources and
+// FDIODispatcher. It is going to be removed soon, when all subject interfaces
+// are modified
+class wxFDIOEventLoopSourceHandler : public wxFDIOHandler
+{
+public:
+    wxEXPLICIT wxFDIOEventLoopSourceHandler(wxEventLoopSourceHandler* handler)
+        : m_handler(handler)
+    {
+    }
+
+    // Just forward to the real handler.
+    virtual void OnReadWaiting() { m_handler->OnReadWaiting(); }
+    virtual void OnWriteWaiting() { m_handler->OnWriteWaiting(); }
+    virtual void OnExceptionWaiting() { m_handler->OnExceptionWaiting(); }
+
+protected:
+    wxEventLoopSourceHandler* const m_handler;
+
+    wxDECLARE_NO_COPY_CLASS(wxFDIOEventLoopSourceHandler);
+};
+
+#endif // _WX_PRIVATE_FDIO_EVENT_LOOP_SOURCE_HANDLER_H
diff --git a/Externals/wxWidgets3/include/wx/private/fdiohandler.h b/Externals/wxWidgets3/include/wx/private/fdiohandler.h
index e7fa5efbd2..94e36490cd 100644
--- a/Externals/wxWidgets3/include/wx/private/fdiohandler.h
+++ b/Externals/wxWidgets3/include/wx/private/fdiohandler.h
@@ -3,7 +3,6 @@
 // Purpose:     declares wxFDIOHandler class
 // Author:      Vadim Zeitlin
 // Created:     2009-08-17
-// RCS-ID:      $Id: fdiohandler.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/fdiomanager.h b/Externals/wxWidgets3/include/wx/private/fdiomanager.h
index 46b6996280..0721886f35 100644
--- a/Externals/wxWidgets3/include/wx/private/fdiomanager.h
+++ b/Externals/wxWidgets3/include/wx/private/fdiomanager.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxFDIOManager
 // Author:      Vadim Zeitlin
 // Created:     2009-08-17
-// RCS-ID:      $Id: fdiomanager.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/fileback.h b/Externals/wxWidgets3/include/wx/private/fileback.h
index a65b3419c9..aaf5ab4afb 100644
--- a/Externals/wxWidgets3/include/wx/private/fileback.h
+++ b/Externals/wxWidgets3/include/wx/private/fileback.h
@@ -2,7 +2,6 @@
 // Name:        wx/private/fileback.h
 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: fileback.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/filename.h b/Externals/wxWidgets3/include/wx/private/filename.h
index d2ac7c2c55..a4ed481020 100644
--- a/Externals/wxWidgets3/include/wx/private/filename.h
+++ b/Externals/wxWidgets3/include/wx/private/filename.h
@@ -4,7 +4,6 @@
 // Author:      Mike Wetherell
 // Modified by:
 // Created:     2006-10-22
-// RCS-ID:      $Id: filename.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/flagscheck.h b/Externals/wxWidgets3/include/wx/private/flagscheck.h
index 742eb02e87..3e3d9fbaae 100644
--- a/Externals/wxWidgets3/include/wx/private/flagscheck.h
+++ b/Externals/wxWidgets3/include/wx/private/flagscheck.h
@@ -3,7 +3,6 @@
 // Purpose:     helpers for checking that (bit)flags don't overlap
 // Author:      Vaclav Slavik
 // Created:     2008-02-21
-// RCS-ID:      $Id: flagscheck.h 59016 2009-02-19 05:34:25Z PC $
 // Copyright:   (c) 2008 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/fontmgr.h b/Externals/wxWidgets3/include/wx/private/fontmgr.h
index e29ac1eece..c00270a6b1 100644
--- a/Externals/wxWidgets3/include/wx/private/fontmgr.h
+++ b/Externals/wxWidgets3/include/wx/private/fontmgr.h
@@ -3,7 +3,6 @@
 // Purpose:     font management for ports that don't have their own
 // Author:      Vaclav Slavik
 // Created:     2006-11-18
-// RCS-ID:      $Id: fontmgr.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 //              (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/private/fswatcher.h b/Externals/wxWidgets3/include/wx/private/fswatcher.h
index 8f6f72ed47..cfffba4a89 100644
--- a/Externals/wxWidgets3/include/wx/private/fswatcher.h
+++ b/Externals/wxWidgets3/include/wx/private/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     File system watcher impl classes
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -49,8 +48,13 @@ public:
 
     virtual bool Add(const wxFSWatchInfo& winfo)
     {
-        wxCHECK_MSG( m_watches.find(winfo.GetPath()) == m_watches.end(), false,
-                     "Path '%s' is already watched");
+        if ( m_watches.find(winfo.GetPath()) != m_watches.end() )
+        {
+            wxLogTrace(wxTRACE_FSWATCHER,
+                       "Path '%s' is already watched", winfo.GetPath());
+            // This can happen if a dir is watched, then a parent tree added
+            return true;
+        }
 
         // construct watch entry
         wxSharedPtr<wxFSWatchEntry> watch(new wxFSWatchEntry(winfo));
@@ -66,8 +70,13 @@ public:
     virtual bool Remove(const wxFSWatchInfo& winfo)
     {
         wxFSWatchEntries::iterator it = m_watches.find(winfo.GetPath());
-        wxCHECK_MSG( it != m_watches.end(), false, "Path '%s' is not watched");
-
+        if ( it == m_watches.end() )
+        {
+            wxLogTrace(wxTRACE_FSWATCHER,
+                       "Path '%s' is not watched", winfo.GetPath());
+            // This can happen if a dir is watched, then a parent tree added
+            return true;
+        }
         wxSharedPtr<wxFSWatchEntry> watch = it->second;
         m_watches.erase(it);
         return DoRemove(watch);
@@ -79,6 +88,12 @@ public:
         return true;
     }
 
+    // Check whether any filespec matches the file's ext (if present)
+    bool MatchesFilespec(const wxFileName& fn, const wxString& filespec) const
+    {
+        return filespec.empty() || wxMatchWild(filespec, fn.GetFullName());
+    }
+
 protected:
     virtual bool DoAdd(wxSharedPtr<wxFSWatchEntry> watch) = 0;
 
diff --git a/Externals/wxWidgets3/include/wx/private/graphics.h b/Externals/wxWidgets3/include/wx/private/graphics.h
index 5d87cacc8f..a5f303dd47 100644
--- a/Externals/wxWidgets3/include/wx/private/graphics.h
+++ b/Externals/wxWidgets3/include/wx/private/graphics.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id: graphics.h 67232 2011-03-18 15:10:15Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -28,6 +27,18 @@ class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData
     wxGraphicsRenderer* m_renderer;
 } ;
 
+class WXDLLIMPEXP_CORE wxGraphicsBitmapData : public wxGraphicsObjectRefData
+{
+public :
+    wxGraphicsBitmapData( wxGraphicsRenderer* renderer) :
+       wxGraphicsObjectRefData(renderer) {}
+
+       virtual ~wxGraphicsBitmapData() {}
+
+       // returns the native representation
+       virtual void * GetNativeBitmap() const = 0;
+} ;
+
 class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
 {
 public :
diff --git a/Externals/wxWidgets3/include/wx/private/markupparser.h b/Externals/wxWidgets3/include/wx/private/markupparser.h
index 46da973b80..855d92ad05 100644
--- a/Externals/wxWidgets3/include/wx/private/markupparser.h
+++ b/Externals/wxWidgets3/include/wx/private/markupparser.h
@@ -3,7 +3,6 @@
 // Purpose:     Classes for parsing simple markup.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16
-// RCS-ID:      $Id: markupparser.h 67076 2011-02-27 18:36:52Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/markupparserattr.h b/Externals/wxWidgets3/include/wx/private/markupparserattr.h
index 1cce2f8cce..d433879daf 100644
--- a/Externals/wxWidgets3/include/wx/private/markupparserattr.h
+++ b/Externals/wxWidgets3/include/wx/private/markupparserattr.h
@@ -3,7 +3,6 @@
 // Purpose:     Classes mapping markup attributes to wxFont/wxColour.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-18
-// RCS-ID:      $Id: markupparserattr.h 70447 2012-01-23 11:28:32Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/overlay.h b/Externals/wxWidgets3/include/wx/private/overlay.h
index 6b85653a87..1149701f7c 100644
--- a/Externals/wxWidgets3/include/wx/private/overlay.h
+++ b/Externals/wxWidgets3/include/wx/private/overlay.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.h 54125 2008-06-11 19:17:41Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/pipestream.h b/Externals/wxWidgets3/include/wx/private/pipestream.h
new file mode 100644
index 0000000000..f14d9aba79
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/pipestream.h
@@ -0,0 +1,29 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/pipestream.h
+// Purpose:     Declares wxPipeInputStream and wxPipeOutputStream.
+// Author:      Vadim Zeitlin
+// Modified by: Rob Bresalier
+// Created:     2013-04-27
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
+//              (c) 2013 Rob Bresalier
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_PIPESTREAM_H_
+#define _WX_PRIVATE_PIPESTREAM_H_
+
+#include "wx/platform.h"
+
+// wxPipeInputStream is a platform-dependent input stream class (i.e. deriving,
+// possible indirectly, from wxInputStream) for reading from a pipe, i.e. a
+// pipe FD under Unix or a pipe HANDLE under MSW. It provides a single extra
+// IsOpened() method.
+//
+// wxPipeOutputStream is similar but has no additional methods at all.
+#ifdef __UNIX__
+    #include "wx/unix/private/pipestream.h"
+#elif defined(__WINDOWS__) && !defined(__WXWINCE__)
+    #include "wx/msw/private/pipestream.h"
+#endif
+
+#endif // _WX_PRIVATE_PIPESTREAM_H_
diff --git a/Externals/wxWidgets3/include/wx/private/preferences.h b/Externals/wxWidgets3/include/wx/private/preferences.h
new file mode 100644
index 0000000000..8b926450b9
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/preferences.h
@@ -0,0 +1,40 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/preferences.h
+// Purpose:     wxPreferencesEditorImpl declaration.
+// Author:      Vaclav Slavik
+// Created:     2013-02-19
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_PREFERENCES_H_
+#define _WX_PRIVATE_PREFERENCES_H_
+
+#include "wx/preferences.h"
+
+#if wxUSE_TOOLBAR && defined(__WXOSX_COCOA__) && wxOSX_USE_NATIVE_TOOLBAR
+    #define wxHAS_PREF_EDITOR_NATIVE
+#endif
+
+// ----------------------------------------------------------------------------
+// wxPreferencesEditorImpl: defines wxPreferencesEditor implementation.
+// ----------------------------------------------------------------------------
+
+class wxPreferencesEditorImpl
+{
+public:
+    // This is implemented in a platform-specific way.
+    static wxPreferencesEditorImpl* Create(const wxString& title);
+
+    // These methods simply mirror the public wxPreferencesEditor ones.
+    virtual void AddPage(wxPreferencesPage* page) = 0;
+    virtual void Show(wxWindow* parent) = 0;
+    virtual void Dismiss() = 0;
+
+    virtual ~wxPreferencesEditorImpl() {}
+
+protected:
+    wxPreferencesEditorImpl() {}
+};
+
+#endif // _WX_PRIVATE_PREFERENCES_H_
diff --git a/Externals/wxWidgets3/include/wx/private/richtooltip.h b/Externals/wxWidgets3/include/wx/private/richtooltip.h
index 1334778e56..89ce193fa4 100644
--- a/Externals/wxWidgets3/include/wx/private/richtooltip.h
+++ b/Externals/wxWidgets3/include/wx/private/richtooltip.h
@@ -3,7 +3,6 @@
 // Purpose:     wxRichToolTipImpl declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18
-// RCS-ID:      $Id: richtooltip.h 69463 2011-10-18 21:57:02Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,11 +28,12 @@ public:
                                      const wxColour& colEnd) = 0;
     virtual void SetCustomIcon(const wxIcon& icon) = 0;
     virtual void SetStandardIcon(int icon) = 0;
-    virtual void SetTimeout(unsigned milliseconds) = 0;
+    virtual void SetTimeout(unsigned milliseconds,
+                            unsigned millisecondsShowdelay = 0) = 0;
     virtual void SetTipKind(wxTipKind tipKind) = 0;
     virtual void SetTitleFont(const wxFont& font) = 0;
 
-    virtual void ShowFor(wxWindow* win) = 0;
+    virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) = 0;
 
     virtual ~wxRichToolTipImpl() { }
 
diff --git a/Externals/wxWidgets3/include/wx/private/sckaddr.h b/Externals/wxWidgets3/include/wx/private/sckaddr.h
index cebd608d0e..ba2063ed9e 100644
--- a/Externals/wxWidgets3/include/wx/private/sckaddr.h
+++ b/Externals/wxWidgets3/include/wx/private/sckaddr.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSockAddressImpl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
-// RCS-ID:      $Id: sckaddr.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/selectdispatcher.h b/Externals/wxWidgets3/include/wx/private/selectdispatcher.h
index 1e573277ef..644377739f 100644
--- a/Externals/wxWidgets3/include/wx/private/selectdispatcher.h
+++ b/Externals/wxWidgets3/include/wx/private/selectdispatcher.h
@@ -4,7 +4,6 @@
 // Authors:     Lukasz Michalski and Vadim Zeitlin
 // Created:     December 2006
 // Copyright:   (c) Lukasz Michalski
-// RCS-ID:      $Id: selectdispatcher.h 63716 2010-03-20 12:45:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/private/socket.h b/Externals/wxWidgets3/include/wx/private/socket.h
index 1664066d65..973b764f7d 100644
--- a/Externals/wxWidgets3/include/wx/private/socket.h
+++ b/Externals/wxWidgets3/include/wx/private/socket.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSocketImpl and related declarations
 // Authors:     Guilhem Lavaux, Vadim Zeitlin
 // Created:     April 1997
-// RCS-ID:      $Id: socket.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1997 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -51,7 +50,7 @@
    having been defined in sys/types.h" when winsock.h is included later and
    doesn't seem to be necessary anyhow. It's not needed under Mac neither.
  */
-#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__)
+#if !defined(__WXMAC__) && !defined(__WXMSW__) && !defined(__WXWINCE__)
 #include <sys/types.h>
 #endif
 
@@ -79,10 +78,6 @@
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't
-#ifndef __WINDOWS__
-    #define SOCKET int
-#endif
-
 #ifndef INVALID_SOCKET
     #define INVALID_SOCKET (-1)
 #endif
@@ -293,7 +288,7 @@ public:
     // TODO: make these fields protected and provide accessors for those of
     //       them that wxSocketBase really needs
 //protected:
-    SOCKET m_fd;
+    wxSOCKET_T m_fd;
 
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
diff --git a/Externals/wxWidgets3/include/wx/private/streamtempinput.h b/Externals/wxWidgets3/include/wx/private/streamtempinput.h
new file mode 100644
index 0000000000..df937cf574
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/streamtempinput.h
@@ -0,0 +1,134 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/streamtempinput.h
+// Purpose:     defines wxStreamTempInputBuffer which is used by Unix and MSW
+//              implementations of wxExecute; this file is only used by the
+//              library and never by the user code
+// Author:      Vadim Zeitlin
+// Modified by: Rob Bresalier
+// Created:     2013-05-04
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_STREAMTEMPINPUT_H
+#define _WX_PRIVATE_STREAMTEMPINPUT_H
+
+#include "wx/private/pipestream.h"
+
+// ----------------------------------------------------------------------------
+// wxStreamTempInputBuffer
+// ----------------------------------------------------------------------------
+
+/*
+   wxStreamTempInputBuffer is a hack which we need to solve the problem of
+   executing a child process synchronously with IO redirecting: when we do
+   this, the child writes to a pipe we open to it but when the pipe buffer
+   (which has finite capacity, e.g. commonly just 4Kb) becomes full we have to
+   read data from it because the child blocks in its write() until then and if
+   it blocks we are never going to return from wxExecute() so we dead lock.
+
+   So here is the fix: we now read the output as soon as it appears into a temp
+   buffer (wxStreamTempInputBuffer object) and later just stuff it back into
+   the stream when the process terminates. See supporting code in wxExecute()
+   itself as well.
+
+   Note that this is horribly inefficient for large amounts of output (count
+   the number of times we copy the data around) and so a better API is badly
+   needed! However it's not easy to devise a way to do this keeping backwards
+   compatibility with the existing wxExecute(wxEXEC_SYNC)...
+*/
+class wxStreamTempInputBuffer
+{
+public:
+    wxStreamTempInputBuffer()
+    {
+        m_stream = NULL;
+        m_buffer = NULL;
+        m_size = 0;
+    }
+
+    // call to associate a stream with this buffer, otherwise nothing happens
+    // at all
+    void Init(wxPipeInputStream *stream)
+    {
+        wxASSERT_MSG( !m_stream, wxS("Can only initialize once") );
+
+        m_stream = stream;
+    }
+
+    // check for input on our stream and cache it in our buffer if any
+    //
+    // return true if anything was done
+    bool Update()
+    {
+        if ( !m_stream || !m_stream->CanRead() )
+            return false;
+
+        // realloc in blocks of 4Kb: this is the default (and minimal) buffer
+        // size of the Unix pipes so it should be the optimal step
+        //
+        // NB: don't use "static int" in this inline function, some compilers
+        //     (e.g. IBM xlC) don't like it
+        enum { incSize = 4096 };
+
+        void *buf = realloc(m_buffer, m_size + incSize);
+        if ( !buf )
+            return false;
+
+        m_buffer = buf;
+        m_stream->Read((char *)m_buffer + m_size, incSize);
+        m_size += m_stream->LastRead();
+
+        return true;
+    }
+
+    // check if can continue reading from the stream, this is used to disable
+    // the callback once we can't read anything more
+    bool Eof() const
+    {
+        // If we have no stream, always return true as we can't read any more.
+        return !m_stream || m_stream->Eof();
+    }
+
+    // read everything remaining until the EOF, this should only be called once
+    // the child process terminates and we know that no more data is coming
+    bool ReadAll()
+    {
+        while ( !Eof() )
+        {
+            if ( !Update() )
+                return false;
+        }
+
+        return true;
+    }
+
+    // dtor puts the data buffered during this object lifetime into the
+    // associated stream
+    ~wxStreamTempInputBuffer()
+    {
+        if ( m_buffer )
+        {
+            m_stream->Ungetch(m_buffer, m_size);
+            free(m_buffer);
+        }
+    }
+
+    const void *GetBuffer() const { return m_buffer; }
+
+    size_t GetSize() const { return m_size; }
+
+private:
+    // the stream we're buffering, if NULL we don't do anything at all
+    wxPipeInputStream *m_stream;
+
+    // the buffer of size m_size (NULL if m_size == 0)
+    void *m_buffer;
+
+    // the size of the buffer
+    size_t m_size;
+
+    wxDECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer);
+};
+
+#endif // _WX_PRIVATE_STREAMTEMPINPUT_H
diff --git a/Externals/wxWidgets3/include/wx/private/textmeasure.h b/Externals/wxWidgets3/include/wx/private/textmeasure.h
new file mode 100644
index 0000000000..a4db67cb50
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/private/textmeasure.h
@@ -0,0 +1,174 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/textmeasure.h
+// Purpose:     declaration of wxTextMeasure class
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_TEXTMEASURE_H_
+#define _WX_PRIVATE_TEXTMEASURE_H_
+
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+// ----------------------------------------------------------------------------
+// wxTextMeasure: class used to measure text extent.
+// ----------------------------------------------------------------------------
+
+class wxTextMeasureBase
+{
+public:
+    // The first ctor argument must be non-NULL, i.e. each object of this class
+    // is associated with either a valid wxDC or a valid wxWindow. The font can
+    // be NULL to use the current DC/window font or can be specified explicitly.
+    wxTextMeasureBase(const wxDC *dc, const wxFont *theFont);
+    wxTextMeasureBase(const wxWindow *win, const wxFont *theFont);
+
+    // Even though this class is not supposed to be used polymorphically, give
+    // it a virtual dtor to avoid compiler warnings.
+    virtual ~wxTextMeasureBase() { }
+
+
+    // Return the extent of a single line string.
+    void GetTextExtent(const wxString& string,
+                       wxCoord *width,
+                       wxCoord *height,
+                       wxCoord *descent = NULL,
+                       wxCoord *externalLeading = NULL);
+
+    // The same for a multiline (with '\n') string.
+    void GetMultiLineTextExtent(const wxString& text,
+                                wxCoord *width,
+                                wxCoord *height,
+                                wxCoord *heightOneLine = NULL);
+
+    // Find the dimensions of the largest string.
+    wxSize GetLargestStringExtent(size_t n, const wxString* strings);
+    wxSize GetLargestStringExtent(const wxArrayString& strings)
+    {
+        return GetLargestStringExtent(strings.size(), &strings[0]);
+    }
+
+    // Fill the array with the widths for each "0..N" substrings for N from 1
+    // to text.length().
+    //
+    // The scaleX argument is the horizontal scale used by wxDC and is only
+    // used in the generic implementation.
+    bool GetPartialTextExtents(const wxString& text,
+                               wxArrayInt& widths,
+                               double scaleX);
+
+
+    // These functions are called by our public methods before and after each
+    // call to DoGetTextExtent(). Derived classes may override them to prepare
+    // for -- possibly several -- subsequent calls to DoGetTextExtent().
+    //
+    // As these calls must be always paired, they're never called directly but
+    // only by our friend MeasuringGuard class.
+    //
+    // NB: They're public only to allow VC6 to compile this code, there doesn't
+    //     seem to be any way to give MeasuringGuard access to them (FIXME-VC6)
+    virtual void BeginMeasuring() { }
+    virtual void EndMeasuring() { }
+
+    // This is another method which is only used by MeasuringGuard.
+    bool IsUsingDCImpl() const { return m_useDCImpl; }
+
+protected:
+    // RAII wrapper for the two methods above.
+    class MeasuringGuard
+    {
+    public:
+        MeasuringGuard(wxTextMeasureBase& tm) : m_tm(tm)
+        {
+            // BeginMeasuring() should only be called if we have a native DC,
+            // so don't call it if we delegate to a DC of unknown type.
+            if ( !m_tm.IsUsingDCImpl() )
+                m_tm.BeginMeasuring();
+        }
+
+        ~MeasuringGuard()
+        {
+            if ( !m_tm.IsUsingDCImpl() )
+                m_tm.EndMeasuring();
+        }
+
+    private:
+        wxTextMeasureBase& m_tm;
+    };
+
+
+    // The main function of this class, to be implemented in platform-specific
+    // way used by all our public methods.
+    //
+    // The width and height pointers here are never NULL and the input string
+    // is not empty.
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *width,
+                                 wxCoord *height,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL) = 0;
+
+    // The real implementation of GetPartialTextExtents().
+    //
+    // On input, widths array contains text.length() zero elements and the text
+    // is guaranteed to be non-empty.
+    virtual bool DoGetPartialTextExtents(const wxString& text,
+                                         wxArrayInt& widths,
+                                         double scaleX) = 0;
+
+    // Call either DoGetTextExtent() or wxDC::GetTextExtent() depending on the
+    // value of m_useDCImpl.
+    //
+    // This must be always used instead of calling DoGetTextExtent() directly!
+    void CallGetTextExtent(const wxString& string,
+                           wxCoord *width,
+                           wxCoord *height,
+                           wxCoord *descent = NULL,
+                           wxCoord *externalLeading = NULL);
+
+    // Return a valid font: if one was given to us in the ctor, use this one,
+    // otherwise use the current font of the associated wxDC or wxWindow.
+    wxFont GetFont() const;
+
+
+    // Exactly one of m_dc and m_win is non-NULL for any given object of this
+    // class.
+    const wxDC* const m_dc;
+    const wxWindow* const m_win;
+
+    // If this is true, simply forward to wxDC::GetTextExtent() from our
+    // CallGetTextExtent() instead of calling our own DoGetTextExtent().
+    //
+    // We need this because our DoGetTextExtent() typically only works with
+    // native DCs, i.e. those having an HDC under Windows or using Pango under
+    // GTK+. However wxTextMeasure object can be constructed for any wxDC, not
+    // necessarily a native one and in this case we must call back into the DC
+    // implementation of text measuring itself.
+    bool m_useDCImpl;
+
+    // This one can be NULL or not.
+    const wxFont* const m_font;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextMeasureBase);
+};
+
+// Include the platform dependent class declaration, if any.
+#if defined(__WXGTK20__)
+    #include "wx/gtk/private/textmeasure.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/private/textmeasure.h"
+#else // no platform-specific implementation of wxTextMeasure yet
+    #include "wx/generic/private/textmeasure.h"
+
+    #define wxUSE_GENERIC_TEXTMEASURE 1
+#endif
+
+#ifndef wxUSE_GENERIC_TEXTMEASURE
+    #define wxUSE_GENERIC_TEXTMEASURE 0
+#endif
+
+#endif // _WX_PRIVATE_TEXTMEASURE_H_
diff --git a/Externals/wxWidgets3/include/wx/private/threadinfo.h b/Externals/wxWidgets3/include/wx/private/threadinfo.h
index 5a3b433871..27a71674b0 100644
--- a/Externals/wxWidgets3/include/wx/private/threadinfo.h
+++ b/Externals/wxWidgets3/include/wx/private/threadinfo.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxThreadSpecificInfo: thread-specific information
 // Author:      Vadim Zeitlin
 // Created:     2009-07-13
-// RCS-ID:      $Id: threadinfo.h 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,25 +10,30 @@
 #ifndef _WX_PRIVATE_THREADINFO_H_
 #define _WX_PRIVATE_THREADINFO_H_
 
-#if wxUSE_THREADS
-
-#include "wx/tls.h"
+#include "wx/defs.h"
 
 class WXDLLIMPEXP_FWD_BASE wxLog;
 
+#if wxUSE_INTL
+#include "wx/hashset.h"
+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual,
+                    wxLocaleUntranslatedStrings);
+#endif
+
+
 // ----------------------------------------------------------------------------
 // wxThreadSpecificInfo: contains all thread-specific information used by wx
 // ----------------------------------------------------------------------------
 
-// currently the only thread-specific information we use is the active wxLog
-// target but more could be added in the future (e.g. current wxLocale would be
-// a likely candidate) and we will group all of them in this struct to avoid
-// consuming more TLS slots than necessary as there is only a limited number of
-// them
-
-// NB: this must be a POD to be stored in TLS
-struct wxThreadSpecificInfo
+// Group all thread-specific information we use (e.g. the active wxLog target)
+// a in this class to avoid consuming more TLS slots than necessary as there is
+// only a limited number of them.
+class wxThreadSpecificInfo
 {
+public:
+    // Return this thread's instance.
+    static wxThreadSpecificInfo& Get();
+
     // the thread-specific logger or NULL if the thread is using the global one
     // (this is not used for the main thread which always uses the global
     // logger)
@@ -42,13 +46,24 @@ struct wxThreadSpecificInfo
     //     because the default, for 0-initialized struct, should be to enable
     //     logging
     bool loggingDisabled;
+
+#if wxUSE_INTL
+    // Storage for wxTranslations::GetUntranslatedString()
+    wxLocaleUntranslatedStrings untranslatedStrings;
+#endif
+
+#if wxUSE_THREADS
+    // Cleans up storage for the current thread. Should be called when a thread
+    // is being destroyed. If it's not called, the only bad thing that happens
+    // is that the memory is deallocated later, on process termination.
+    static void ThreadCleanUp();
+#endif
+
+private:
+    wxThreadSpecificInfo() : logger(NULL), loggingDisabled(false) {}
 };
 
-// currently this is defined in src/common/log.cpp
-extern wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
-#define wxThreadInfo wxTLS_VALUE(wxThreadInfoVar)
-
-#endif // wxUSE_THREADS
+#define wxThreadInfo wxThreadSpecificInfo::Get()
 
 #endif // _WX_PRIVATE_THREADINFO_H_
 
diff --git a/Externals/wxWidgets3/include/wx/private/timer.h b/Externals/wxWidgets3/include/wx/private/timer.h
index d345d3fcb3..5f4ce0d511 100644
--- a/Externals/wxWidgets3/include/wx/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/private/timer.h
@@ -3,7 +3,6 @@
 // Purpose:     Base class for wxTimer implementations
 // Author:      Lukasz Michalski <lmichalski@sf.net>
 // Created:     31.10.2006
-// RCS-ID:      $Id: timer.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2006-2007 wxWidgets dev team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/window.h b/Externals/wxWidgets3/include/wx/private/window.h
index ab4c5533f1..1192fb97b2 100644
--- a/Externals/wxWidgets3/include/wx/private/window.h
+++ b/Externals/wxWidgets3/include/wx/private/window.h
@@ -3,7 +3,6 @@
 // Purpose:     misc wxWindow helpers
 // Author:      Vaclav Slavik
 // Created:     2010-01-21
-// RCS-ID:      $Id: window.h 63251 2010-01-24 11:51:09Z VS $
 // Copyright:   (c) 2010 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/private/wxprintf.h b/Externals/wxWidgets3/include/wx/private/wxprintf.h
index 0bb0098cb5..00013c193a 100644
--- a/Externals/wxWidgets3/include/wx/private/wxprintf.h
+++ b/Externals/wxWidgets3/include/wx/private/wxprintf.h
@@ -4,7 +4,6 @@
 // Author:      Ove Kaven
 // Modified by: Ron Lee, Francesco Montorsi
 // Created:     09/04/99
-// RCS-ID:      $Id: wxprintf.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) wxWidgets copyright
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,11 +21,6 @@
 
 #include <string.h>
 
-#if defined(__MWERKS__) && __MSL__ >= 0x6000
-namespace std {}
-using namespace std ;
-#endif
-
 // prefer snprintf over sprintf
 #if defined(__VISUALC__) || \
         (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
diff --git a/Externals/wxWidgets3/include/wx/prntbase.h b/Externals/wxWidgets3/include/wx/prntbase.h
index 8b71a0658f..a6f22fa098 100644
--- a/Externals/wxWidgets3/include/wx/prntbase.h
+++ b/Externals/wxWidgets3/include/wx/prntbase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: prntbase.h 68026 2011-06-22 22:58:07Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,6 +39,8 @@ class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
 class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 class WXDLLIMPEXP_FWD_CORE wxPrintPreview;
+class WXDLLIMPEXP_FWD_CORE wxPrintAbortDialog;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class wxPrintPageMaxCtrl;
 class wxPrintPageTextCtrl;
 
@@ -188,7 +189,7 @@ public:
     wxPrinterBase(wxPrintDialogData *data = NULL);
     virtual ~wxPrinterBase();
 
-    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual wxPrintDialogData& GetPrintDialogData() const;
@@ -228,7 +229,7 @@ public:
     wxPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxPrinter();
 
-    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual bool Setup(wxWindow *parent);
@@ -259,7 +260,7 @@ private:
 class WXDLLIMPEXP_CORE wxPrintout: public wxObject
 {
 public:
-    wxPrintout(const wxString& title = _("Printout"));
+    wxPrintout(const wxString& title = wxGetTranslation("Printout"));
     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);
@@ -391,7 +392,7 @@ class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,
-                   const wxString& title = _("Print Preview"),
+                   const wxString& title = wxGetTranslation("Print Preview"),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
@@ -733,18 +734,20 @@ class WXDLLIMPEXP_CORE wxPrintAbortDialog: public wxDialog
 {
 public:
     wxPrintAbortDialog(wxWindow *parent,
-                       const wxString& title,
+                       const wxString& documentTitle,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
-                       long style = 0,
-                       const wxString& name = wxT("dialog"))
-        : wxDialog(parent, wxID_ANY, title, pos, size, style, name)
-        {
-        }
+                       long style = wxDEFAULT_DIALOG_STYLE,
+                       const wxString& name = wxT("dialog"));
+
+    void SetProgress(int currentPage, int totalPages,
+                     int currentCopy, int totalCopies);
 
     void OnCancel(wxCommandEvent& event);
 
 private:
+    wxStaticText *m_progress;
+
     DECLARE_EVENT_TABLE()
     wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);
 };
diff --git a/Externals/wxWidgets3/include/wx/process.h b/Externals/wxWidgets3/include/wx/process.h
index 39b5b637f1..4c0018e6a6 100644
--- a/Externals/wxWidgets3/include/wx/process.h
+++ b/Externals/wxWidgets3/include/wx/process.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Created:     24/06/98
-// RCS-ID:      $Id: process.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -104,6 +103,15 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
+    // priority
+        // Sets the priority to the given value: see wxPRIORITY_XXX constants.
+        //
+        // NB: the priority can only be set before the process is created
+    void SetPriority(unsigned priority);
+
+        // Get the current priority.
+    unsigned GetPriority() const { return m_priority; }
+
     // implementation only - don't use!
     // --------------------------------
 
@@ -116,6 +124,8 @@ protected:
     int m_id;
     long m_pid;
 
+    unsigned m_priority;
+
 #if wxUSE_STREAMS
     // these streams are connected to stdout, stderr and stdin of the child
     // process respectively (yes, m_inputStream corresponds to stdout -- very
diff --git a/Externals/wxWidgets3/include/wx/progdlg.h b/Externals/wxWidgets3/include/wx/progdlg.h
index e6d4132765..e17d37ea3e 100644
--- a/Externals/wxWidgets3/include/wx/progdlg.h
+++ b/Externals/wxWidgets3/include/wx/progdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: progdlg.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/propdlg.h b/Externals/wxWidgets3/include/wx/propdlg.h
index 4bad68bb32..1f91c6fbc3 100644
--- a/Externals/wxWidgets3/include/wx/propdlg.h
+++ b/Externals/wxWidgets3/include/wx/propdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: propdlg.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/protocol/file.h b/Externals/wxWidgets3/include/wx/protocol/file.h
index c77a1f7dc8..fd44ce593a 100644
--- a/Externals/wxWidgets3/include/wx/protocol/file.h
+++ b/Externals/wxWidgets3/include/wx/protocol/file.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     1997
-// RCS-ID:      $Id: file.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/protocol/ftp.h b/Externals/wxWidgets3/include/wx/protocol/ftp.h
index bae8c78fdc..a87a638066 100644
--- a/Externals/wxWidgets3/include/wx/protocol/ftp.h
+++ b/Externals/wxWidgets3/include/wx/protocol/ftp.h
@@ -5,7 +5,6 @@
 // Modified by: Mark Johnson, wxWindows@mj10777.de
 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
-// RCS-ID:      $Id: ftp.h 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/protocol/http.h b/Externals/wxWidgets3/include/wx/protocol/http.h
index d3fff96500..cfa2e6f944 100644
--- a/Externals/wxWidgets3/include/wx/protocol/http.h
+++ b/Externals/wxWidgets3/include/wx/protocol/http.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
-// RCS-ID:      $Id: http.h 70408 2012-01-20 12:22:25Z VZ $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,6 +35,7 @@ public:
     wxString GetHeader(const wxString& header) const;
     int GetResponse() const { return m_http_response; }
 
+    void SetMethod(const wxString& method) { m_method = method; }
     void SetHeader(const wxString& header, const wxString& h_data);
     bool SetPostText(const wxString& contentType,
                      const wxString& data,
@@ -51,19 +51,12 @@ public:
     wxDEPRECATED(void SetPostBuffer(const wxString& post_buf));
 
 protected:
-    enum wxHTTP_Req
-    {
-        wxHTTP_GET,
-        wxHTTP_POST,
-        wxHTTP_HEAD
-    };
-
     typedef wxStringToStringHashMap::iterator wxHeaderIterator;
     typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
     typedef wxStringToStringHashMap::iterator wxCookieIterator;
     typedef wxStringToStringHashMap::const_iterator wxCookieConstIterator;
 
-    bool BuildRequest(const wxString& path, wxHTTP_Req req);
+    bool BuildRequest(const wxString& path, const wxString& method);
     void SendHeaders();
     bool ParseHeaders();
 
@@ -81,6 +74,7 @@ protected:
 
     // internal variables:
 
+    wxString m_method;
     wxStringToStringHashMap m_cookies;
 
     wxStringToStringHashMap m_headers;
diff --git a/Externals/wxWidgets3/include/wx/protocol/log.h b/Externals/wxWidgets3/include/wx/protocol/log.h
index 700c94029d..df373b928f 100644
--- a/Externals/wxWidgets3/include/wx/protocol/log.h
+++ b/Externals/wxWidgets3/include/wx/protocol/log.h
@@ -3,7 +3,6 @@
 // Purpose:     wxProtocolLog class for logging network exchanges
 // Author:      Troelsk, Vadim Zeitlin
 // Created:     2009-03-06
-// RCS-ID:      $Id: log.h 59404 2009-03-07 13:58:39Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/protocol/protocol.h b/Externals/wxWidgets3/include/wx/protocol/protocol.h
index 6664f9e875..e6a32ef55c 100644
--- a/Externals/wxWidgets3/include/wx/protocol/protocol.h
+++ b/Externals/wxWidgets3/include/wx/protocol/protocol.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     10/07/1997
-// RCS-ID:      $Id: protocol.h 64532 2010-06-09 13:55:48Z FM $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ptr_scpd.h b/Externals/wxWidgets3/include/wx/ptr_scpd.h
index cdc325ee56..76d8e42146 100644
--- a/Externals/wxWidgets3/include/wx/ptr_scpd.h
+++ b/Externals/wxWidgets3/include/wx/ptr_scpd.h
@@ -3,7 +3,6 @@
 // Purpose:     compatibility wrapper for wxScoped{Ptr,Array}
 // Author:      Vadim Zeitlin
 // Created:     2009-02-03
-// RCS-ID:      $Id: ptr_scpd.h 58643 2009-02-04 08:06:42Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ptr_shrd.h b/Externals/wxWidgets3/include/wx/ptr_shrd.h
index 90cd0fa968..635cfe36e0 100644
--- a/Externals/wxWidgets3/include/wx/ptr_shrd.h
+++ b/Externals/wxWidgets3/include/wx/ptr_shrd.h
@@ -3,7 +3,6 @@
 // Purpose:     compatibility wrapper for wx/sharedptr.h
 // Author:      Vadim Zeitlin
 // Created:     2009-02-03
-// RCS-ID:      $Id: ptr_shrd.h 58643 2009-02-04 08:06:42Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/quantize.h b/Externals/wxWidgets3/include/wx/quantize.h
index dcc62d65f4..d323a3504c 100644
--- a/Externals/wxWidgets3/include/wx/quantize.h
+++ b/Externals/wxWidgets3/include/wx/quantize.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     22/6/2000
-// RCS-ID:      $Id: quantize.h 52834 2008-03-26 15:06:00Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/radiobox.h b/Externals/wxWidgets3/include/wx/radiobox.h
index 7b7960c215..acfa9e8f8a 100644
--- a/Externals/wxWidgets3/include/wx/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/radiobox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id: radiobox.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/radiobut.h b/Externals/wxWidgets3/include/wx/radiobut.h
index d69ec49579..427787341e 100644
--- a/Externals/wxWidgets3/include/wx/radiobut.h
+++ b/Externals/wxWidgets3/include/wx/radiobut.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.09.00
-// RCS-ID:      $Id: radiobut.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/range.h b/Externals/wxWidgets3/include/wx/range.h
index 47e835cb8a..d59646e12a 100644
--- a/Externals/wxWidgets3/include/wx/range.h
+++ b/Externals/wxWidgets3/include/wx/range.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2011-01-07
-// RCS-ID:      $Id: range.h 66625 2011-01-07 17:42:39Z SC $
 // Copyright:   (c) 2011 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/rawbmp.h b/Externals/wxWidgets3/include/wx/rawbmp.h
index 2fca1857d4..adcf81f398 100644
--- a/Externals/wxWidgets3/include/wx/rawbmp.h
+++ b/Externals/wxWidgets3/include/wx/rawbmp.h
@@ -4,7 +4,6 @@
 // Author:      Eric Kidd, Vadim Zeitlin
 // Modified by:
 // Created:     10.03.03
-// RCS-ID:      $Id: rawbmp.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/rearrangectrl.h b/Externals/wxWidgets3/include/wx/rearrangectrl.h
index 0e74187b14..b54b04fa11 100644
--- a/Externals/wxWidgets3/include/wx/rearrangectrl.h
+++ b/Externals/wxWidgets3/include/wx/rearrangectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     various controls for rearranging the items interactively
 // Author:      Vadim Zeitlin
 // Created:     2008-12-15
-// RCS-ID:      $Id: rearrangectrl.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/recguard.h b/Externals/wxWidgets3/include/wx/recguard.h
index 88af6fb72f..d7775b995b 100644
--- a/Externals/wxWidgets3/include/wx/recguard.h
+++ b/Externals/wxWidgets3/include/wx/recguard.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.08.2003
-// RCS-ID:      $Id: recguard.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/regex.h b/Externals/wxWidgets3/include/wx/regex.h
index 6150130874..0b1836e344 100644
--- a/Externals/wxWidgets3/include/wx/regex.h
+++ b/Externals/wxWidgets3/include/wx/regex.h
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by: VZ at 13.07.01 (integrated to wxWin)
 // Created:     05.02.2000
-// RCS-ID:      $Id: regex.h 57777 2009-01-02 17:29:32Z PC $
 // Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/region.h b/Externals/wxWidgets3/include/wx/region.h
index c032903f3d..64a8e05532 100644
--- a/Externals/wxWidgets3/include/wx/region.h
+++ b/Externals/wxWidgets3/include/wx/region.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: region.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/renderer.h b/Externals/wxWidgets3/include/wx/renderer.h
index 9722ddecf9..97152e32e3 100644
--- a/Externals/wxWidgets3/include/wx/renderer.h
+++ b/Externals/wxWidgets3/include/wx/renderer.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderer.h 65947 2010-10-30 15:57:32Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/richmsgdlg.h b/Externals/wxWidgets3/include/wx/richmsgdlg.h
index 6d1ac376fd..1fbc96428f 100644
--- a/Externals/wxWidgets3/include/wx/richmsgdlg.h
+++ b/Externals/wxWidgets3/include/wx/richmsgdlg.h
@@ -3,7 +3,6 @@
 // Purpose:     wxRichMessageDialogBase
 // Author:      Rickard Westerlund
 // Created:     2010-07-03
-// RCS-ID:      $Id: richmsgdlg.h 70165 2011-12-29 14:42:13Z SN $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,8 +26,8 @@ public:
                              const wxString& caption,
                              long style )
         : wxGenericMessageDialog( parent, message, caption, style ),
-          m_detailsExpanderCollapsedLabel( _("&See details") ),
-          m_detailsExpanderExpandedLabel( _("&Hide details") ),
+          m_detailsExpanderCollapsedLabel( wxGetTranslation("&See details") ),
+          m_detailsExpanderExpandedLabel( wxGetTranslation("&Hide details") ),
           m_checkBoxValue( false )
         { }
 
diff --git a/Externals/wxWidgets3/include/wx/richtooltip.h b/Externals/wxWidgets3/include/wx/richtooltip.h
index 0005edb8b1..1187e67ed1 100644
--- a/Externals/wxWidgets3/include/wx/richtooltip.h
+++ b/Externals/wxWidgets3/include/wx/richtooltip.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxRichToolTip class.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-07
-// RCS-ID:      $Id: richtooltip.h 69480 2011-10-19 21:53:10Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -76,7 +75,8 @@ public:
     // elapses but this method can be used to change this or also disable
     // hiding the tooltip automatically entirely by passing 0 in this parameter
     // (but doing this can result in native version not being used).
-    void SetTimeout(unsigned milliseconds);
+    // Optionally specify a show delay.
+    void SetTimeout(unsigned milliseconds, unsigned millisecondsShowdelay = 0);
 
     // Choose the tip kind, possibly none. By default the tip is positioned
     // automatically, as if wxTipKind_Auto was used.
@@ -86,8 +86,8 @@ public:
     // or colour appropriate for the current platform.
     void SetTitleFont(const wxFont& font);
 
-    // Show the tooltip for the given window.
-    void ShowFor(wxWindow* win);
+    // Show the tooltip for the given window and optionally a specified area.
+    void ShowFor(wxWindow* win, const wxRect* rect = NULL);
 
     // Non-virtual dtor as this class is not supposed to be derived from.
     ~wxRichToolTip();
diff --git a/Externals/wxWidgets3/include/wx/rtti.h b/Externals/wxWidgets3/include/wx/rtti.h
index 43e3939c41..51017baa2f 100644
--- a/Externals/wxWidgets3/include/wx/rtti.h
+++ b/Externals/wxWidgets3/include/wx/rtti.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id: rtti.h 67879 2011-06-07 13:06:17Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/sashwin.h b/Externals/wxWidgets3/include/wx/sashwin.h
index c99a94b4ab..21967a5c7e 100644
--- a/Externals/wxWidgets3/include/wx/sashwin.h
+++ b/Externals/wxWidgets3/include/wx/sashwin.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: sashwin.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/sckaddr.h b/Externals/wxWidgets3/include/wx/sckaddr.h
index 2c10fac890..4ceefdf35c 100644
--- a/Externals/wxWidgets3/include/wx/sckaddr.h
+++ b/Externals/wxWidgets3/include/wx/sckaddr.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to switch to wxSockAddressImpl implementation
 // Created:     26/04/1997
-// RCS-ID:      $Id: sckaddr.h 59099 2009-02-22 23:38:52Z VZ $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 //              (c) 2008, 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/sckipc.h b/Externals/wxWidgets3/include/wx/sckipc.h
index cffa67c674..3801da8cf9 100644
--- a/Externals/wxWidgets3/include/wx/sckipc.h
+++ b/Externals/wxWidgets3/include/wx/sckipc.h
@@ -6,7 +6,6 @@
 //              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000
 //                                  (callbacks deprecated)    Mar 2000
 // Created:     1993
-// RCS-ID:      $Id: sckipc.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
diff --git a/Externals/wxWidgets3/include/wx/sckstrm.h b/Externals/wxWidgets3/include/wx/sckstrm.h
index 09e6ebb0be..31f32706e9 100644
--- a/Externals/wxWidgets3/include/wx/sckstrm.h
+++ b/Externals/wxWidgets3/include/wx/sckstrm.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97
-// RCS-ID:      $Id: sckstrm.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/scopedarray.h b/Externals/wxWidgets3/include/wx/scopedarray.h
index 11cc04130a..e6246a235e 100644
--- a/Externals/wxWidgets3/include/wx/scopedarray.h
+++ b/Externals/wxWidgets3/include/wx/scopedarray.h
@@ -3,7 +3,6 @@
 // Purpose:     scoped smart pointer class
 // Author:      Vadim Zeitlin
 // Created:     2009-02-03
-// RCS-ID:      $Id: scopedarray.h 70109 2011-12-24 15:43:14Z VZ $
 // Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
 //              (c) 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/scopedptr.h b/Externals/wxWidgets3/include/wx/scopedptr.h
index 84285ae40c..5cc0c0770d 100644
--- a/Externals/wxWidgets3/include/wx/scopedptr.h
+++ b/Externals/wxWidgets3/include/wx/scopedptr.h
@@ -3,7 +3,6 @@
 // Purpose:     scoped smart pointer class
 // Author:      Jesse Lovelace <jllovela@eos.ncsu.edu>
 // Created:     06/01/02
-// RCS-ID:      $Id: scopedptr.h 64222 2010-05-06 05:43:01Z VS $
 // Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
 //              (c) 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/scopeguard.h b/Externals/wxWidgets3/include/wx/scopeguard.h
index c0c354536a..83bc1b5180 100644
--- a/Externals/wxWidgets3/include/wx/scopeguard.h
+++ b/Externals/wxWidgets3/include/wx/scopeguard.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.07.2003
-// RCS-ID:      $Id: scopeguard.h 67592 2011-04-24 13:14:47Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/scrolbar.h b/Externals/wxWidgets3/include/wx/scrolbar.h
index 648f09fe0e..21f2d75a8a 100644
--- a/Externals/wxWidgets3/include/wx/scrolbar.h
+++ b/Externals/wxWidgets3/include/wx/scrolbar.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: scrolbar.h 67254 2011-03-20 00:14:35Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/scrolwin.h b/Externals/wxWidgets3/include/wx/scrolwin.h
index 8989d3738f..370969929e 100644
--- a/Externals/wxWidgets3/include/wx/scrolwin.h
+++ b/Externals/wxWidgets3/include/wx/scrolwin.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     30.08.00
-// RCS-ID:      $Id: scrolwin.h 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,10 @@ enum wxScrollbarVisibility
 //
 // So we have
 //
+//                          wxAnyScrollHelperBase
+//                                   |
+//                                   |
+//                                  \|/
 //                           wxScrollHelperBase
 //                                   |
 //                                   |
@@ -56,7 +59,51 @@ enum wxScrollbarVisibility
 //
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScrollHelperBase
+// This class allows reusing some of wxScrollHelperBase functionality in
+// wxVarScrollHelperBase in wx/vscroll.h without duplicating its code.
+class WXDLLIMPEXP_CORE wxAnyScrollHelperBase
+{
+public:
+    wxEXPLICIT wxAnyScrollHelperBase(wxWindow* win);
+    virtual ~wxAnyScrollHelperBase() {}
+
+    // Disable use of keyboard keys for scrolling. By default cursor movement
+    // keys (including Home, End, Page Up and Down) are used to scroll the
+    // window appropriately. If the derived class uses these keys for something
+    // else, e.g. changing the currently selected item, this function can be
+    // used to disable this behaviour as it's not only not necessary then but
+    // can actually be actively harmful if another object forwards a keyboard
+    // event corresponding to one of the above keys to us using
+    // ProcessWindowEvent() because the event will always be processed which
+    // can be undesirable.
+    void DisableKeyboardScrolling() { m_kbdScrollingEnabled = false; }
+
+    // Override this function to draw the graphic (or just process EVT_PAINT)
+    virtual void OnDraw(wxDC& WXUNUSED(dc)) { }
+
+    // change the DC origin according to the scroll position.
+    virtual void DoPrepareDC(wxDC& dc) = 0;
+
+    // Simple accessor for the window that is really being scrolled.
+    wxWindow *GetTargetWindow() const { return m_targetWindow; }
+
+
+    // The methods called from the window event handlers.
+    void HandleOnChar(wxKeyEvent& event);
+    void HandleOnPaint(wxPaintEvent& event);
+
+protected:
+    // the window that receives the scroll events and the window to actually
+    // scroll, respectively
+    wxWindow *m_win,
+             *m_targetWindow;
+
+    // whether cursor keys should scroll the window
+    bool m_kbdScrollingEnabled;
+};
+
+// This is the class containing the guts of (uniform) scrolling logic.
+class WXDLLIMPEXP_CORE wxScrollHelperBase : public wxAnyScrollHelperBase
 {
 public:
     // ctor must be given the associated window
@@ -101,24 +148,20 @@ public:
         DoShowScrollbars(horz, vert);
     }
 
+    // Test whether the specified scrollbar is shown.
+    virtual bool IsScrollbarShown(int orient) const = 0;
+
     // Enable/disable Windows scrolling in either direction. If true, wxWidgets
     // scrolls the canvas and only a bit of the canvas is invalidated; no
     // Clear() is necessary. If false, the whole canvas is invalidated and a
     // Clear() is necessary. Disable for when the scroll increment is used to
     // actually scroll a non-constant distance
+    //
+    // Notice that calling this method with a false argument doesn't disable
+    // scrolling the window in this direction, it just changes the mechanism by
+    // which it is implemented to not use wxWindow::ScrollWindow().
     virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
 
-    // Disable use of keyboard keys for scrolling. By default cursor movement
-    // keys (including Home, End, Page Up and Down) are used to scroll the
-    // window appropriately. If the derived class uses these keys for something
-    // else, e.g. changing the currently selected item, this function can be
-    // used to disable this behaviour as it's not only not necessary then but
-    // can actually be actively harmful if another object forwards a keyboard
-    // event corresponding to one of the above keys to us using
-    // ProcessWindowEvent() because the event will always be processed which
-    // can be undesirable.
-    void DisableKeyboardScrolling() { m_kbdScrollingEnabled = false; }
-
     // Get the view start
     void GetViewStart(int *x, int *y) const { DoGetViewStart(x, y); }
 
@@ -167,15 +210,10 @@ public:
     // child of it in order to scroll only a portion the area between the
     // scrollbars (spreadsheet: only cell area will move).
     void SetTargetWindow(wxWindow *target);
-    wxWindow *GetTargetWindow() const;
 
     void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
     wxRect GetTargetRect() const { return m_rectToScroll; }
 
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    virtual void OnDraw(wxDC& WXUNUSED(dc)) { }
-
-    // change the DC origin according to the scroll position.
     virtual void DoPrepareDC(wxDC& dc);
 
     // are we generating the autoscroll events?
@@ -195,8 +233,6 @@ public:
     // the methods to be called from the window event handlers
     void HandleOnScroll(wxScrollWinEvent& event);
     void HandleOnSize(wxSizeEvent& event);
-    void HandleOnPaint(wxPaintEvent& event);
-    void HandleOnChar(wxKeyEvent& event);
     void HandleOnMouseEnter(wxMouseEvent& event);
     void HandleOnMouseLeave(wxMouseEvent& event);
 #if wxUSE_MOUSEWHEEL
@@ -252,10 +288,6 @@ protected:
     // delete the event handler we installed
     void DeleteEvtHandler();
 
-    // calls wxScrollHelperEvtHandler::ResetDrawnFlag(), see explanation
-    // in wxScrollHelperEvtHandler::ProcessEvent()
-    void ResetDrawnFlag();
-
     // this function should be overridden to return the size available for
     // m_targetWindow inside m_win of the given size
     //
@@ -276,13 +308,14 @@ protected:
     double                m_scaleX;
     double                m_scaleY;
 
-    wxWindow             *m_win,
-                         *m_targetWindow;
-
     wxRect                m_rectToScroll;
 
     wxTimer              *m_timerAutoScroll;
 
+    // The number of pixels to scroll in horizontal and vertical directions
+    // respectively.
+    //
+    // If 0, means that the scrolling in the given direction is disabled.
     int                   m_xScrollPixelsPerLine;
     int                   m_yScrollPixelsPerLine;
     int                   m_xScrollPosition;
@@ -295,8 +328,6 @@ protected:
     bool                  m_xScrollingEnabled;
     bool                  m_yScrollingEnabled;
 
-    bool                  m_kbdScrollingEnabled;
-
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL
@@ -312,6 +343,8 @@ protected:
 public:                                                                       \
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }                     \
     virtual bool Layout() { return ScrollLayout(); }                          \
+    virtual bool CanScroll(int orient) const                                  \
+        { return IsScrollbarShown(orient); }                                  \
     virtual void DoSetVirtualSize(int x, int y)                               \
         { ScrollDoSetVirtualSize(x, y); }                                     \
     virtual wxSize GetBestVirtualSize() const                                 \
@@ -376,24 +409,38 @@ public:
         this->MacSetClipChildren(true);
 #endif
 
-        this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
-
         // by default, we're scrollable in both directions (but if one of the
         // styles is specified explicitly, we shouldn't add the other one
         // automatically)
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
+#ifdef __WXOSX__
+        bool retval = T::Create(parent, winid, pos, size, style, name);
+        if ( retval && (style & wxALWAYS_SHOW_SB) )
+            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
+        return retval;
+#else
+        if ( style & wxALWAYS_SHOW_SB )
+            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
+
         return T::Create(parent, winid, pos, size, style, name);
+#endif
     }
 
+#ifdef __WXMSW__
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
-#ifdef __WXMSW__
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
     {
         return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam));
     }
+
+    // Take into account the scroll origin.
+    virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const
+    {
+        CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg);
+    }
 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()
@@ -405,16 +452,6 @@ protected:
     }
 
 private:
-    // this is needed for wxEVT_PAINT processing hack described in
-    // wxScrollHelperEvtHandler::ProcessEvent()
-    void OnPaint(wxPaintEvent& event)
-    {
-        // the user code didn't really draw the window if we got here, so set
-        // this flag to try to call OnDraw() later
-        ResetDrawnFlag();
-        event.Skip();
-    }
-
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #ifndef __VISUALC6__
diff --git a/Externals/wxWidgets3/include/wx/selstore.h b/Externals/wxWidgets3/include/wx/selstore.h
index 0c6aaa1a21..62ff2298ce 100644
--- a/Externals/wxWidgets3/include/wx/selstore.h
+++ b/Externals/wxWidgets3/include/wx/selstore.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
-// RCS-ID:      $Id: selstore.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ public:
 
 private:
     // (re)init
-    void Init() { m_defaultState = false; }
+    void Init() { m_count = 0; m_defaultState = false; }
 
     // the total number of items we handle
     unsigned m_count;
diff --git a/Externals/wxWidgets3/include/wx/settings.h b/Externals/wxWidgets3/include/wx/settings.h
index 7f4fd837f1..f90ae071ba 100644
--- a/Externals/wxWidgets3/include/wx/settings.h
+++ b/Externals/wxWidgets3/include/wx/settings.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: settings.h 67018 2011-02-25 09:38:35Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/setup_inc.h b/Externals/wxWidgets3/include/wx/setup_inc.h
index 32b19dfbb8..7e1ec6f4b6 100644
--- a/Externals/wxWidgets3/include/wx/setup_inc.h
+++ b/Externals/wxWidgets3/include/wx/setup_inc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:
-// RCS-ID:      $Id: setup_inc.h 69463 2011-10-18 21:57:02Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -147,7 +146,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin / CodeWarrior
+// ignored for MinGW/Cygwin.
 //
 // Default is 0
 //
@@ -263,6 +262,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
@@ -1083,6 +1093,16 @@
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_PREFERENCES_EDITOR 1
+
 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //
diff --git a/Externals/wxWidgets3/include/wx/setup_redirect.h b/Externals/wxWidgets3/include/wx/setup_redirect.h
index 87a9c3d85a..7648c198ba 100644
--- a/Externals/wxWidgets3/include/wx/setup_redirect.h
+++ b/Externals/wxWidgets3/include/wx/setup_redirect.h
@@ -6,7 +6,6 @@
  * whereby a setup.h is created under the lib directory.
  *
  * Copyright:   (c) Vadim Zeitlin
- * RCS-ID:      $Id: setup_redirect.h 33948 2005-05-04 18:57:50Z JS $
  * Licence:     wxWindows Licence
  */
 
diff --git a/Externals/wxWidgets3/include/wx/sharedptr.h b/Externals/wxWidgets3/include/wx/sharedptr.h
index 3c354f8f88..a9b6442c09 100644
--- a/Externals/wxWidgets3/include/wx/sharedptr.h
+++ b/Externals/wxWidgets3/include/wx/sharedptr.h
@@ -3,7 +3,6 @@
 // Purpose:     Shared pointer based on the counted_ptr<> template, which
 //              is in the public domain
 // Author:      Robert Roebling, Yonat Sharon
-// RCS-ID:      $Id: sharedptr.h 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,6 +30,14 @@ public:
             m_ref = new reftype(ptr);
     }
 
+    template<typename Deleter>
+    wxEXPLICIT wxSharedPtr(T* ptr, Deleter d)
+        : m_ref(NULL)
+    {
+        if (ptr)
+            m_ref = new reftype_with_deleter<Deleter>(ptr, d);
+    }
+
     ~wxSharedPtr()                           { Release(); }
     wxSharedPtr(const wxSharedPtr& tocopy)   { Acquire(tocopy.m_ref); }
 
@@ -92,6 +99,14 @@ public:
             m_ref = new reftype(ptr);
     }
 
+    template<typename Deleter>
+    void reset(T* ptr, Deleter d)
+    {
+        Release();
+        if (ptr)
+            m_ref = new reftype_with_deleter<Deleter>(ptr, d);
+    }
+
     bool unique()   const    { return (m_ref ? m_ref->m_count == 1 : true); }
     long use_count() const   { return (m_ref ? (long)m_ref->m_count : 0); }
 
@@ -99,10 +114,24 @@ private:
 
     struct reftype
     {
-        reftype( T* ptr = NULL, unsigned count = 1 ) : m_ptr(ptr), m_count(count) {}
+        reftype(T* ptr) : m_ptr(ptr), m_count(1) {}
+        virtual ~reftype() {}
+        virtual void delete_ptr() { delete m_ptr; }
+
         T*          m_ptr;
         wxAtomicInt m_count;
-    }* m_ref;
+    };
+
+    template<typename Deleter>
+    struct reftype_with_deleter : public reftype
+    {
+        reftype_with_deleter(T* ptr, Deleter d) : reftype(ptr), m_deleter(d) {}
+        virtual void delete_ptr() { m_deleter(this->m_ptr); }
+
+        Deleter m_deleter;
+    };
+
+    reftype* m_ref;
 
     void Acquire(reftype* ref)
     {
@@ -115,10 +144,9 @@ private:
     {
         if (m_ref)
         {
-            wxAtomicDec( m_ref->m_count );
-            if (m_ref->m_count == 0)
+            if (!wxAtomicDec( m_ref->m_count ))
             {
-                delete m_ref->m_ptr;
+                m_ref->delete_ptr();
                 delete m_ref;
             }
             m_ref = NULL;
diff --git a/Externals/wxWidgets3/include/wx/simplebook.h b/Externals/wxWidgets3/include/wx/simplebook.h
new file mode 100644
index 0000000000..d54ebc45b6
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/simplebook.h
@@ -0,0 +1,212 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/simplebook.h
+// Purpose:     wxBookCtrlBase-derived class without any controller.
+// Author:      Vadim Zeitlin
+// Created:     2012-08-21
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SIMPLEBOOK_H_
+#define _WX_SIMPLEBOOK_H_
+
+#include "wx/bookctrl.h"
+
+#if wxUSE_BOOKCTRL
+
+#include "wx/vector.h"
+
+// ----------------------------------------------------------------------------
+// wxSimplebook: a book control without any user-actionable controller.
+// ----------------------------------------------------------------------------
+
+// NB: This class doesn't use DLL export declaration as it's fully inline.
+
+class wxSimplebook : public wxBookCtrlBase
+{
+public:
+    wxSimplebook()
+    {
+        Init();
+    }
+
+    wxSimplebook(wxWindow *parent,
+                 wxWindowID winid = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxEmptyString)
+        : wxBookCtrlBase(parent, winid, pos, size, style | wxBK_TOP, name)
+    {
+        Init();
+    }
+
+
+    // Methods specific to this class.
+
+    // A method allowing to add a new page without any label (which is unused
+    // by this control) and show it immediately.
+    bool ShowNewPage(wxWindow* page)
+    {
+        return AddPage(page, wxString(), true /* select it */);
+    }
+
+
+    // Set effect to use for showing/hiding pages.
+    void SetEffects(wxShowEffect showEffect, wxShowEffect hideEffect)
+    {
+        m_showEffect = showEffect;
+        m_hideEffect = hideEffect;
+    }
+
+    // Or the same effect for both of them.
+    void SetEffect(wxShowEffect effect)
+    {
+        SetEffects(effect, effect);
+    }
+
+    // And the same for time outs.
+    void SetEffectsTimeouts(unsigned showTimeout, unsigned hideTimeout)
+    {
+        m_showTimeout = showTimeout;
+        m_hideTimeout = hideTimeout;
+    }
+
+    void SetEffectTimeout(unsigned timeout)
+    {
+        SetEffectsTimeouts(timeout, timeout);
+    }
+
+
+    // Implement base class pure virtual methods.
+
+    // Page management
+    virtual bool InsertPage(size_t n,
+                            wxWindow *page,
+                            const wxString& text,
+                            bool bSelect = false,
+                            int imageId = NO_IMAGE)
+    {
+        if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
+            return false;
+
+        m_pageTexts.insert(m_pageTexts.begin() + n, text);
+
+        if ( !DoSetSelectionAfterInsertion(n, bSelect) )
+            page->Hide();
+
+        return true;
+    }
+
+    virtual int SetSelection(size_t n)
+    {
+        return DoSetSelection(n, SetSelection_SendEvent);
+    }
+
+    virtual int ChangeSelection(size_t n)
+    {
+        return DoSetSelection(n);
+    }
+
+    // Neither labels nor images are supported but we still store the labels
+    // just in case the user code attaches some importance to them.
+    virtual bool SetPageText(size_t n, const wxString& strText)
+    {
+        wxCHECK_MSG( n < GetPageCount(), false, wxS("Invalid page") );
+
+        m_pageTexts[n] = strText;
+
+        return true;
+    }
+
+    virtual wxString GetPageText(size_t n) const
+    {
+        wxCHECK_MSG( n < GetPageCount(), wxString(), wxS("Invalid page") );
+
+        return m_pageTexts[n];
+    }
+
+    virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
+    {
+        return false;
+    }
+
+    virtual int GetPageImage(size_t WXUNUSED(n)) const
+    {
+        return NO_IMAGE;
+    }
+
+protected:
+    virtual void UpdateSelectedPage(size_t newsel)
+    {
+        m_selection = newsel;
+    }
+
+    virtual wxBookCtrlEvent* CreatePageChangingEvent() const
+    {
+        return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING,
+                                   GetId());
+    }
+
+    virtual void MakeChangedEvent(wxBookCtrlEvent& event)
+    {
+        event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED);
+    }
+
+    virtual wxWindow *DoRemovePage(size_t page)
+    {
+        wxWindow* const win = wxBookCtrlBase::DoRemovePage(page);
+        if ( win )
+        {
+            m_pageTexts.erase(m_pageTexts.begin() + page);
+
+            DoSetSelectionAfterRemoval(page);
+        }
+
+        return win;
+    }
+
+    virtual void DoSize()
+    {
+        wxWindow* const page = GetCurrentPage();
+        if ( page )
+            page->SetSize(GetPageRect());
+    }
+
+    virtual void DoShowPage(wxWindow* page, bool show)
+    {
+        if ( show )
+            page->ShowWithEffect(m_showEffect, m_showTimeout);
+        else
+            page->HideWithEffect(m_hideEffect, m_hideTimeout);
+    }
+
+private:
+    void Init()
+    {
+        // We don't need any border as we don't have anything to separate the
+        // page contents from.
+        SetInternalBorder(0);
+
+        // No effects by default.
+        m_showEffect =
+        m_hideEffect = wxSHOW_EFFECT_NONE;
+
+        m_showTimeout =
+        m_hideTimeout = 0;
+    }
+
+    wxVector<wxString> m_pageTexts;
+
+    wxShowEffect m_showEffect,
+                 m_hideEffect;
+
+    unsigned m_showTimeout,
+             m_hideTimeout;
+
+    wxDECLARE_NO_COPY_CLASS(wxSimplebook);
+};
+
+#endif // wxUSE_BOOKCTRL
+
+#endif // _WX_SIMPLEBOOK_H_
diff --git a/Externals/wxWidgets3/include/wx/sizer.h b/Externals/wxWidgets3/include/wx/sizer.h
index 249f2d8389..7d20b548c8 100644
--- a/Externals/wxWidgets3/include/wx/sizer.h
+++ b/Externals/wxWidgets3/include/wx/sizer.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Created:
-// RCS-ID:      $Id: sizer.h 69970 2011-12-10 04:34:06Z RD $
 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -125,6 +124,10 @@ public:
 
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
+        wxCHECK_MSG( !(direction & ~wxALL), *this,
+                     wxS("direction must be a combination of wxDirection ")
+                     wxS("enum values.") );
+
         m_flags &= ~wxALL;
         m_flags |= direction;
 
@@ -311,6 +314,10 @@ public:
         { return m_minSize; }
     wxSize GetMinSizeWithBorder() const;
 
+    wxSize GetMaxSize() const
+        { return IsWindow() ? m_window->GetMaxSize() : wxDefaultSize; }
+    wxSize GetMaxSizeWithBorder() const;
+
     void SetMinSize(const wxSize& size)
     {
         if ( IsWindow() )
@@ -436,6 +443,10 @@ protected:
     void DoSetSizer(wxSizer *sizer);
     void DoSetSpacer(const wxSize& size);
 
+    // Add the border specified for this item to the given size
+    // if it's != wxDefaultSize, just return wxDefaultSize otherwise.
+    wxSize AddBorderToSize(const wxSize& size) const;
+
     // discriminated union: depending on m_kind one of the fields is valid
     enum
     {
@@ -601,7 +612,7 @@ public:
     virtual void DeleteWindows();
 
     // Inform sizer about the first direction that has been decided (by parent item)
-    // Returns true if it made use of the informtion (and recalculated min size)
+    // Returns true if it made use of the information (and recalculated min size)
     virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
         { return false; }
 
@@ -703,6 +714,10 @@ public:
 
     void Show(bool show) { ShowItems(show); }
 
+    // This is the ShowItems() counterpart and returns true if any of the sizer
+    // items are shown.
+    virtual bool AreAnyItemsShown() const;
+
 protected:
     wxSize              m_size;
     wxSize              m_minSize;
@@ -798,7 +813,7 @@ protected:
             "Can't calculate number of cols if number of rows is not specified"
         );
 
-        return (m_children.GetCount() + m_rows - 1) / m_rows;
+        return int(m_children.GetCount() + m_rows - 1) / m_rows;
     }
 
     int CalcRows() const
@@ -809,7 +824,7 @@ protected:
             "Can't calculate number of cols if number of rows is not specified"
         );
 
-        return (m_children.GetCount() + m_cols - 1) / m_cols;
+        return int(m_children.GetCount() + m_cols - 1) / m_cols;
     }
 
 private:
@@ -1021,6 +1036,7 @@ public:
 
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
+    virtual bool AreAnyItemsShown() const;
 
     virtual bool Detach( wxWindow *window );
     virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); }
diff --git a/Externals/wxWidgets3/include/wx/slider.h b/Externals/wxWidgets3/include/wx/slider.h
index e6d9f5e6ea..e3ab597b0c 100644
--- a/Externals/wxWidgets3/include/wx/slider.h
+++ b/Externals/wxWidgets3/include/wx/slider.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.02.01
-// RCS-ID:      $Id: slider.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1996-2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/snglinst.h b/Externals/wxWidgets3/include/wx/snglinst.h
index 930209d4e5..61213a86cf 100644
--- a/Externals/wxWidgets3/include/wx/snglinst.h
+++ b/Externals/wxWidgets3/include/wx/snglinst.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.01
-// RCS-ID:      $Id: snglinst.h 61945 2009-09-16 12:38:00Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/socket.h b/Externals/wxWidgets3/include/wx/socket.h
index 4b69eb2440..35ff266216 100644
--- a/Externals/wxWidgets3/include/wx/socket.h
+++ b/Externals/wxWidgets3/include/wx/socket.h
@@ -4,7 +4,6 @@
 // Authors:     Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Modified by:
 // Created:     April 1997
-// RCS-ID:      $Id: socket.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,16 @@ class wxSocketImpl;
 // Types and constants
 // ------------------------------------------------------------------------
 
+// Define the type of native sockets.
+#if defined(__WINDOWS__)
+    // Although socket descriptors are still 32 bit values, even under Win64,
+    // the socket type is 64 bit there.
+    typedef wxUIntPtr wxSOCKET_T;
+#else
+    typedef int wxSOCKET_T;
+#endif
+
+
 // Types of different socket notifications or events.
 //
 // NB: the values here should be consecutive and start with 0 as they are
@@ -71,13 +80,17 @@ enum wxSocketError
 // socket options/flags bit masks
 enum
 {
-    wxSOCKET_NONE = 0,
-    wxSOCKET_NOWAIT = 1,
-    wxSOCKET_WAITALL = 2,
-    wxSOCKET_BLOCK = 4,
-    wxSOCKET_REUSEADDR = 8,
-    wxSOCKET_BROADCAST = 16,
-    wxSOCKET_NOBIND = 32
+    wxSOCKET_NONE           = 0x0000,
+    wxSOCKET_NOWAIT_READ    = 0x0001,
+    wxSOCKET_NOWAIT_WRITE   = 0x0002,
+    wxSOCKET_NOWAIT         = wxSOCKET_NOWAIT_READ | wxSOCKET_NOWAIT_WRITE,
+    wxSOCKET_WAITALL_READ   = 0x0004,
+    wxSOCKET_WAITALL_WRITE  = 0x0008,
+    wxSOCKET_WAITALL        = wxSOCKET_WAITALL_READ | wxSOCKET_WAITALL_WRITE,
+    wxSOCKET_BLOCK          = 0x0010,
+    wxSOCKET_REUSEADDR      = 0x0020,
+    wxSOCKET_BROADCAST      = 0x0040,
+    wxSOCKET_NOBIND         = 0x0080
 };
 
 typedef int wxSocketFlags;
@@ -123,6 +136,8 @@ public:
     bool IsData() { return WaitForRead(0, 0); }
     bool IsDisconnected() const { return !IsConnected(); }
     wxUint32 LastCount() const { return m_lcount; }
+    wxUint32 LastReadCount() const { return m_lcount_read; }
+    wxUint32 LastWriteCount() const { return m_lcount_write; }
     wxSocketError LastError() const;
     void SaveState();
     void RestoreState();
@@ -171,6 +186,8 @@ public:
     bool GetOption(int level, int optname, void *optval, int *optlen);
     bool SetOption(int level, int optname, const void *optval, int optlen);
     wxUint32 GetLastIOSize() const { return m_lcount; }
+    wxUint32 GetLastIOReadSize() const { return m_lcount_read; }
+    wxUint32 GetLastIOWriteSize() const { return m_lcount_write; }
 
     // event handling
     void *GetClientData() const { return m_clientData; }
@@ -179,6 +196,9 @@ public:
     void SetNotify(wxSocketEventFlags flags);
     void Notify(bool notify);
 
+    // Get the underlying socket descriptor.
+    wxSOCKET_T GetSocket() const;
+
     // initialize/shutdown the sockets (done automatically so there is no need
     // to call these functions usually)
     //
@@ -254,6 +274,8 @@ private:
     bool          m_writing;          // busy writing?
     bool          m_closed;           // was the other end closed?
     wxUint32      m_lcount;           // last IO transaction size
+    wxUint32      m_lcount_read;      // last IO transaction size of Read() direction.
+    wxUint32      m_lcount_write;     // last IO transaction size of Write() direction.
     unsigned long m_timeout;          // IO timeout value in seconds
                                       // (TODO: remove, wxSocketImpl has it too)
     wxList        m_states;           // stack of states (TODO: remove!)
diff --git a/Externals/wxWidgets3/include/wx/sound.h b/Externals/wxWidgets3/include/wx/sound.h
index 863b1d3298..b81a11cb46 100644
--- a/Externals/wxWidgets3/include/wx/sound.h
+++ b/Externals/wxWidgets3/include/wx/sound.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/02/01
-// RCS-ID:      $Id: sound.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2004, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/spinbutt.h b/Externals/wxWidgets3/include/wx/spinbutt.h
index ad0b12c8a2..cb11e29833 100644
--- a/Externals/wxWidgets3/include/wx/spinbutt.h
+++ b/Externals/wxWidgets3/include/wx/spinbutt.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
-// RCS-ID:      $Id: spinbutt.h 66625 2011-01-07 17:42:39Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/spinctrl.h b/Externals/wxWidgets3/include/wx/spinctrl.h
index 19fce4df50..7a7b3a4bd9 100644
--- a/Externals/wxWidgets3/include/wx/spinctrl.h
+++ b/Externals/wxWidgets3/include/wx/spinctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id: spinctrl.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,8 +20,8 @@
 // Events
 class WXDLLIMPEXP_FWD_CORE wxSpinDoubleEvent;
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRL, wxSpinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent);
 
 // ----------------------------------------------------------------------------
 // A spin ctrl is a text control with a spin button which is usually used to
@@ -51,6 +50,10 @@ public:
     virtual void SetSnapToTicks(bool snap_to_ticks) = 0;
     // void SetDigits(unsigned digits)              - wxSpinCtrlDouble only
 
+    // The base for numbers display, e.g. 10 or 16.
+    virtual int GetBase() const = 0;
+    virtual bool SetBase(int base) = 0;
+
     // Select text in the textctrl
     virtual void SetSelection(long from, long to) = 0;
 
@@ -100,10 +103,10 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 // macros for handling spinctrl events
 
 #define EVT_SPINCTRL(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SPINCTRL, id, wxSpinEventHandler(fn))
 
 #define EVT_SPINCTRLDOUBLE(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, id, wxSpinDoubleEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SPINCTRLDOUBLE, id, wxSpinDoubleEventHandler(fn))
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class implementation
@@ -113,9 +116,7 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 // wxSpinCtrlDouble implementations or neither, define the appropriate symbols
 // and include the generic version if necessary to provide the missing class(es)
 
-#if defined(__WXUNIVERSAL__) || \
-    defined(__WXMOTIF__) || \
-    defined(__WXCOCOA__)
+#if defined(__WXUNIVERSAL__)
     // nothing, use generic controls
 #elif defined(__WXMSW__)
     #define wxHAS_NATIVE_SPINCTRL
@@ -130,15 +131,25 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 #elif defined(__WXGTK__)
     #define wxHAS_NATIVE_SPINCTRL
     #include "wx/gtk1/spinctrl.h"
-#elif defined(__WXMAC__)
-    #define wxHAS_NATIVE_SPINCTRL
-    #include "wx/osx/spinctrl.h"
 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
     #include "wx/generic/spinctlg.h"
 #endif
 
+namespace wxPrivate
+{
+
+// This is an internal helper function currently used by all ports: return the
+// string containing hexadecimal representation of the given number.
+extern wxString wxSpinCtrlFormatAsHex(long val, long maxVal);
+
+} // namespace wxPrivate
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_SPINCTRL_UPDATED         wxEVT_SPINCTRL
+#define wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED   wxEVT_SPINCTRLDOUBLE
+
 #endif // wxUSE_SPINCTRL
 
 #endif // _WX_SPINCTRL_H_
diff --git a/Externals/wxWidgets3/include/wx/splash.h b/Externals/wxWidgets3/include/wx/splash.h
index acd87fc136..e4fb0c21ee 100644
--- a/Externals/wxWidgets3/include/wx/splash.h
+++ b/Externals/wxWidgets3/include/wx/splash.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: splash.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/splitter.h b/Externals/wxWidgets3/include/wx/splitter.h
index 27b1fa41a3..f36d2923df 100644
--- a/Externals/wxWidgets3/include/wx/splitter.h
+++ b/Externals/wxWidgets3/include/wx/splitter.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: splitter.h 58718 2009-02-07 18:59:25Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,10 +36,10 @@
 
 class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent );
 
 #include "wx/generic/splitter.h"
 
diff --git a/Externals/wxWidgets3/include/wx/srchctrl.h b/Externals/wxWidgets3/include/wx/srchctrl.h
index bae24ec5d1..3ca462258c 100644
--- a/Externals/wxWidgets3/include/wx/srchctrl.h
+++ b/Externals/wxWidgets3/include/wx/srchctrl.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSearchCtrlBase class
 // Author:      Vince Harron
 // Created:     2006-02-18
-// RCS-ID:      $Id: srchctrl.h 68911 2011-08-27 12:13:23Z VZ $
 // Copyright:   (c) Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,8 +41,8 @@
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[];
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
 
 // ----------------------------------------------------------------------------
 // a search ctrl is a text control with a search button and a cancel button
@@ -89,10 +88,14 @@ private:
 // ----------------------------------------------------------------------------
 
 #define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
 
 #define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN   wxEVT_SEARCHCTRL_CANCEL_BTN
+#define wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN   wxEVT_SEARCHCTRL_SEARCH_BTN
 
 #endif // wxUSE_SEARCHCTRL
 
diff --git a/Externals/wxWidgets3/include/wx/sstream.h b/Externals/wxWidgets3/include/wx/sstream.h
index 405af50f4e..b0b2290fbc 100644
--- a/Externals/wxWidgets3/include/wx/sstream.h
+++ b/Externals/wxWidgets3/include/wx/sstream.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-09-19
-// RCS-ID:      $Id: sstream.h 67968 2011-06-16 16:22:15Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/stackwalk.h b/Externals/wxWidgets3/include/wx/stackwalk.h
index 22cf370868..1133d6ef7c 100644
--- a/Externals/wxWidgets3/include/wx/stackwalk.h
+++ b/Externals/wxWidgets3/include/wx/stackwalk.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-07
-// RCS-ID:      $Id: stackwalk.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/statbmp.h b/Externals/wxWidgets3/include/wx/statbmp.h
index d42ea8d804..e86f45b59c 100644
--- a/Externals/wxWidgets3/include/wx/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/statbox.h b/Externals/wxWidgets3/include/wx/statbox.h
index c49a70ef31..d01f257969 100644
--- a/Externals/wxWidgets3/include/wx/statbox.h
+++ b/Externals/wxWidgets3/include/wx/statbox.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: statbox.h 67280 2011-03-22 14:17:38Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,6 +16,7 @@
 #if wxUSE_STATBOX
 
 #include "wx/control.h"
+#include "wx/containr.h"
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
 
@@ -24,13 +24,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>
 {
 public:
-    wxStaticBoxBase() { }
+    wxStaticBoxBase();
 
     // overridden base class virtuals
-    virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
     // implementation only: this is used by wxStaticBoxSizer to account for the
diff --git a/Externals/wxWidgets3/include/wx/statline.h b/Externals/wxWidgets3/include/wx/statline.h
index 148b96af48..4f9e0f1561 100644
--- a/Externals/wxWidgets3/include/wx/statline.h
+++ b/Externals/wxWidgets3/include/wx/statline.h
@@ -3,7 +3,6 @@
 // Purpose:     wxStaticLine class interface
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/stattext.h b/Externals/wxWidgets3/include/wx/stattext.h
index a3165cc877..fa29077526 100644
--- a/Externals/wxWidgets3/include/wx/stattext.h
+++ b/Externals/wxWidgets3/include/wx/stattext.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: stattext.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/statusbr.h b/Externals/wxWidgets3/include/wx/statusbr.h
index f76eb72864..17e033ffc3 100644
--- a/Externals/wxWidgets3/include/wx/statusbr.h
+++ b/Externals/wxWidgets3/include/wx/statusbr.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.02.00
-// RCS-ID:      $Id: statusbr.h 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,6 +44,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
 #define wxSB_NORMAL    0x0000
 #define wxSB_FLAT      0x0001
 #define wxSB_RAISED    0x0002
+#define wxSB_SUNKEN    0x0003
 
 // ----------------------------------------------------------------------------
 // wxStatusBarPane: an helper for wxStatusBar
@@ -53,7 +53,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
 class WXDLLIMPEXP_CORE wxStatusBarPane
 {
 public:
-    wxStatusBarPane(int style = wxSB_NORMAL, size_t width = 0)
+    wxStatusBarPane(int style = wxSB_NORMAL, int width = 0)
         : m_nStyle(style), m_nWidth(width)
         { m_bEllipsized = false; }
 
@@ -119,7 +119,7 @@ public:
     // set the number of fields and call SetStatusWidths(widths) if widths are
     // given
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
-    int GetFieldsCount() const { return m_panes.GetCount(); }
+    int GetFieldsCount() const { return (int)m_panes.GetCount(); }
 
     // field text
     // ----------
@@ -150,10 +150,7 @@ public:
     // field styles
     // ------------
 
-    // Set the field style. Use either wxSB_NORMAL (default) for a standard 3D
-    // border around a field, wxSB_FLAT for no border around a field, so that it
-    // appears flat or wxSB_POPOUT to make the field appear raised.
-    // Setting field styles only works on wxMSW
+    // Set the field border style to one of wxSB_XXX values.
     virtual void SetStatusStyles(int n, const int styles[]);
 
     int GetStatusStyle(int n) const
diff --git a/Externals/wxWidgets3/include/wx/stdpaths.h b/Externals/wxWidgets3/include/wx/stdpaths.h
index 5288ae626a..9d92044457 100644
--- a/Externals/wxWidgets3/include/wx/stdpaths.h
+++ b/Externals/wxWidgets3/include/wx/stdpaths.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-17
-// RCS-ID:      $Id: stdpaths.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -142,9 +141,6 @@ public:
     virtual wxString GetTempDir() const;
 
 
-    // ctor for the base class
-    wxStandardPathsBase();
-
     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 
@@ -158,6 +154,10 @@ public:
 
 
 protected:
+    // Ctor is protected as this is a base class which should never be created
+    // directly.
+    wxStandardPathsBase();
+
     // append the path component, with a leading path separator if a
     // path separator or dot (.) is not already at the end of dir
     static wxString AppendPathComponent(const wxString& dir, const wxString& component);
@@ -210,6 +210,12 @@ public:
     virtual wxString GetPluginsDir() const { return m_prefix; }
     virtual wxString GetDocumentsDir() const { return m_prefix; }
 
+protected:
+    // Ctor is protected because wxStandardPaths::Get() should always be used
+    // to access the global wxStandardPaths object of the correct type instead
+    // of creating one of a possibly wrong type yourself.
+    wxStandardPaths() { }
+
 private:
     wxString m_prefix;
 };
diff --git a/Externals/wxWidgets3/include/wx/stdstream.h b/Externals/wxWidgets3/include/wx/stdstream.h
index 4e3ab6dc65..73ac0ac260 100644
--- a/Externals/wxWidgets3/include/wx/stdstream.h
+++ b/Externals/wxWidgets3/include/wx/stdstream.h
@@ -4,7 +4,6 @@
 //              wxInputStream and wxOutputStream
 // Author:      Jonathan Liu <net147@gmail.com>
 // Created:     2009-05-02
-// RCS-ID:      $Id: stdstream.h 70515 2012-02-05 14:18:37Z VZ $
 // Copyright:   (c) 2009 Jonathan Liu
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/stockitem.h b/Externals/wxWidgets3/include/wx/stockitem.h
index e174d05dc3..72d3e714d8 100644
--- a/Externals/wxWidgets3/include/wx/stockitem.h
+++ b/Externals/wxWidgets3/include/wx/stockitem.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15
-// RCS-ID:      $Id: stockitem.h 63383 2010-02-04 01:33:32Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -73,7 +72,7 @@ WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id,
 
 #ifdef __WXGTK20__
 
-// Translates stock ID to GTK+'s stock item string indentifier:
+// Translates stock ID to GTK+'s stock item string identifier:
 WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id);
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/stopwatch.h b/Externals/wxWidgets3/include/wx/stopwatch.h
index da5069e975..248f757520 100644
--- a/Externals/wxWidgets3/include/wx/stopwatch.h
+++ b/Externals/wxWidgets3/include/wx/stopwatch.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch),
 //              Vadim Zeitlin (time functions, current wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
-// RCS-ID:      $Id: stopwatch.h 69838 2011-11-27 19:50:27Z VZ $
 // Copyright:   (c) 1998-2003 Julian Smart, Sylvain Bougnoux
 //              (c) 2011 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/strconv.h b/Externals/wxWidgets3/include/wx/strconv.h
index 26b5314ca5..3dc3752186 100644
--- a/Externals/wxWidgets3/include/wx/strconv.h
+++ b/Externals/wxWidgets3/include/wx/strconv.h
@@ -4,7 +4,6 @@
 // Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: strconv.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1998 Ove Kaaven, Robert Roebling
 //              (c) 1998-2006 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/stream.h b/Externals/wxWidgets3/include/wx/stream.h
index 7103c8d970..0c380d6aaf 100644
--- a/Externals/wxWidgets3/include/wx/stream.h
+++ b/Externals/wxWidgets3/include/wx/stream.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id: stream.h 68331 2011-07-22 16:16:00Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -128,6 +127,11 @@ public:
     // it means that EOF has been reached.
     virtual wxInputStream& Read(void *buffer, size_t size);
 
+    // Read exactly the given number of bytes, unlike Read(), which may read
+    // less than the requested amount of data without returning an error, this
+    // method either reads all the data or returns false.
+    bool ReadAll(void *buffer, size_t size);
+
     // copy the entire contents of this stream into streamOut, stopping only
     // when EOF is reached or an error occurs
     wxInputStream& Read(wxOutputStream& streamOut);
@@ -233,6 +237,12 @@ public:
 
     void PutC(char c);
     virtual wxOutputStream& Write(const void *buffer, size_t size);
+
+    // This is ReadAll() equivalent for Write(): it either writes exactly the
+    // given number of bytes or returns false, unlike Write() which can write
+    // less data than requested but still return without error.
+    bool WriteAll(const void *buffer, size_t size);
+
     wxOutputStream& Write(wxInputStream& stream_in);
 
     virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
@@ -270,16 +280,17 @@ class WXDLLIMPEXP_BASE wxCountingOutputStream : public wxOutputStream
 public:
     wxCountingOutputStream();
 
-    wxFileOffset GetLength() const;
+    virtual wxFileOffset GetLength() const;
     bool Ok() const { return IsOk(); }
-    bool IsOk() const { return true; }
+    virtual bool IsOk() const { return true; }
 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t size);
     virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
     virtual wxFileOffset OnSysTell() const;
 
-    size_t m_currentPos;
+    size_t m_currentPos,
+           m_lastPos;
 
     DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
     wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
@@ -640,6 +651,54 @@ protected:
     inline wxStreamBuffer *wxBufferedOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
 #endif // WXWIN_COMPATIBILITY_2_6
 
+// ---------------------------------------------------------------------------
+// wxWrapperInputStream: forwards all IO to another stream.
+// ---------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxWrapperInputStream : public wxFilterInputStream
+{
+public:
+    // Constructor fully initializing the stream. The overload taking pointer
+    // takes ownership of the parent stream, the one taking reference does not.
+    //
+    // Notice that this class also has a default ctor but it's protected as the
+    // derived class is supposed to take care of calling InitParentStream() if
+    // it's used.
+    wxWrapperInputStream(wxInputStream& stream);
+    wxWrapperInputStream(wxInputStream* stream);
+
+    // Override the base class methods to forward to the wrapped stream.
+    virtual wxFileOffset GetLength() const;
+    virtual bool IsSeekable() const;
+
+protected:
+    virtual size_t OnSysRead(void *buffer, size_t size);
+    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    virtual wxFileOffset OnSysTell() const;
+
+    // Ensure that our own last error is the same as that of the real stream.
+    //
+    // This method is const because the error must be updated even from const
+    // methods (in other words, it really should have been mutable in the first
+    // place).
+    void SynchronizeLastError() const
+    {
+        const_cast<wxWrapperInputStream*>(this)->
+            Reset(m_parent_i_stream->GetLastError());
+    }
+
+    // Default constructor, use InitParentStream() later.
+    wxWrapperInputStream();
+
+    // Set up the wrapped stream for an object initialized using the default
+    // constructor. The ownership logic is the same as above.
+    void InitParentStream(wxInputStream& stream);
+    void InitParentStream(wxInputStream* stream);
+
+    wxDECLARE_NO_COPY_CLASS(wxWrapperInputStream);
+};
+
+
 #endif // wxUSE_STREAMS
 
 #endif // _WX_WXSTREAM_H__
diff --git a/Externals/wxWidgets3/include/wx/string.h b/Externals/wxWidgets3/include/wx/string.h
index 930e822d25..ef1a8d9aa8 100644
--- a/Externals/wxWidgets3/include/wx/string.h
+++ b/Externals/wxWidgets3/include/wx/string.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: string.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -43,10 +42,6 @@
 #  include <stdlib.h>
 #endif
 
-#ifdef HAVE_STRCASECMP_IN_STRINGS_H
-    #include <strings.h>    // for strcasecmp()
-#endif // HAVE_STRCASECMP_IN_STRINGS_H
-
 #include "wx/wxcrtbase.h"   // for wxChar, wxStrlen() etc.
 #include "wx/strvararg.h"
 #include "wx/buffer.h"      // for wxCharBuffer
@@ -134,69 +129,18 @@ namespace wxPrivate
 // backwards compatibility only.
 
 // checks whether the passed in pointer is NULL and if the string is empty
-wxDEPRECATED( inline bool IsEmpty(const char *p) );
+wxDEPRECATED_MSG("use wxIsEmpty() instead")
 inline bool IsEmpty(const char *p) { return (!p || !*p); }
 
 // safe version of strlen() (returns 0 if passed NULL pointer)
-wxDEPRECATED( inline size_t Strlen(const char *psz) );
+wxDEPRECATED_MSG("use wxStrlen() instead")
 inline size_t Strlen(const char *psz)
   { return psz ? strlen(psz) : 0; }
 
 // portable strcasecmp/_stricmp
-wxDEPRECATED( inline int Stricmp(const char *psz1, const char *psz2) );
+wxDEPRECATED_MSG("use wxStricmp() instead")
 inline int Stricmp(const char *psz1, const char *psz2)
-{
-#if defined(__VISUALC__) && defined(__WXWINCE__)
-  register char c1, c2;
-  do {
-    c1 = tolower(*psz1++);
-    c2 = tolower(*psz2++);
-  } while ( c1 && (c1 == c2) );
-
-  return c1 - c2;
-#elif defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) )
-  return _stricmp(psz1, psz2);
-#elif defined(__SC__)
-  return _stricmp(psz1, psz2);
-#elif defined(__BORLANDC__)
-  return stricmp(psz1, psz2);
-#elif defined(__WATCOMC__)
-  return stricmp(psz1, psz2);
-#elif defined(__DJGPP__)
-  return stricmp(psz1, psz2);
-#elif defined(__EMX__)
-  return stricmp(psz1, psz2);
-#elif defined(__WXPM__)
-  return stricmp(psz1, psz2);
-#elif defined(HAVE_STRCASECMP_IN_STRING_H) || \
-      defined(HAVE_STRCASECMP_IN_STRINGS_H) || \
-      defined(__GNUWIN32__)
-  return strcasecmp(psz1, psz2);
-#elif defined(__MWERKS__) && !defined(__INTEL__)
-  register char c1, c2;
-  do {
-    c1 = tolower(*psz1++);
-    c2 = tolower(*psz2++);
-  } while ( c1 && (c1 == c2) );
-
-  return c1 - c2;
-#else
-  // almost all compilers/libraries provide this function (unfortunately under
-  // different names), that's why we don't implement our own which will surely
-  // be more efficient than this code (uncomment to use):
-  /*
-    register char c1, c2;
-    do {
-      c1 = tolower(*psz1++);
-      c2 = tolower(*psz2++);
-    } while ( c1 && (c1 == c2) );
-
-    return c1 - c2;
-  */
-
-  #error  "Please define string case-insensitive compare for your OS/compiler"
-#endif  // OS/compiler
-}
+    { return wxCRT_StricmpA(psz1, psz2); }
 
 #endif // WXWIN_COMPATIBILITY_2_8
 
@@ -897,7 +841,7 @@ public:
       public:                                                               \
           WX_DEFINE_ITERATOR_CATEGORY(WX_STR_ITERATOR_TAG)                  \
           typedef wxUniChar value_type;                                     \
-          typedef int difference_type;                                      \
+          typedef ptrdiff_t difference_type;                                \
           typedef reference_type reference;                                 \
           typedef pointer_type pointer;                                     \
                                                                             \
@@ -1150,6 +1094,25 @@ public:
   #undef WX_STR_ITERATOR_TAG
   #undef WX_STR_ITERATOR_IMPL
 
+  // This method is mostly used by wxWidgets itself and return the offset of
+  // the given iterator in bytes relative to the start of the buffer
+  // representing the current string contents in the current locale encoding.
+  //
+  // It is inefficient as it involves converting part of the string to this
+  // encoding (and also unsafe as it simply returns 0 if the conversion fails)
+  // and so should be avoided if possible, wx itself only uses it to implement
+  // backwards-compatible API.
+  ptrdiff_t IterOffsetInMBStr(const const_iterator& i) const
+  {
+      const wxString str(begin(), i);
+
+      // This is logically equivalent to strlen(str.mb_str()) but avoids
+      // actually converting the string to multibyte and just computes the
+      // length that it would have after conversion.
+      size_t ofs = wxConvLibc.FromWChar(NULL, 0, str.wc_str(), str.length());
+      return ofs == wxCONV_FAILED ? 0 : static_cast<ptrdiff_t>(ofs);
+  }
+
   friend class iterator;
   friend class const_iterator;
 
@@ -2613,9 +2576,21 @@ public:
       return *this;
   }
 
+    // This is a non-standard-compliant overload taking the first "len"
+    // characters of the source string.
   wxString& assign(const wxString& str, size_t len)
   {
+#if wxUSE_STRING_POS_CACHE
+      // It is legal to pass len > str.length() to wxStringImpl::assign() but
+      // by restricting it here we save some work for that function so it's not
+      // really less efficient and, at the same time, ensure that we don't
+      // cache invalid length.
+      const size_t lenSrc = str.length();
+      if ( len > lenSrc )
+          len = lenSrc;
+
       wxSTRING_SET_CACHED_LENGTH(len);
+#endif // wxUSE_STRING_POS_CACHE
 
       m_impl.assign(str.m_impl, 0, str.LenToImpl(len));
 
@@ -2657,7 +2632,7 @@ public:
 
   wxString& assign(const char *sz, size_t n)
   {
-      wxSTRING_SET_CACHED_LENGTH(n);
+      wxSTRING_INVALIDATE_CACHE();
 
       SubstrBufFromMB str(ImplStr(sz, n));
       m_impl.assign(str.data, str.len);
@@ -3473,7 +3448,7 @@ private:
 
   void DoUngetWriteBuf(size_t nLen)
   {
-      wxSTRING_SET_CACHED_LENGTH(nLen);
+      wxSTRING_INVALIDATE_CACHE();
 
       m_impl.DoUngetWriteBuf(nLen);
   }
diff --git a/Externals/wxWidgets3/include/wx/stringimpl.h b/Externals/wxWidgets3/include/wx/stringimpl.h
index fd611454ca..50d4af9c64 100644
--- a/Externals/wxWidgets3/include/wx/stringimpl.h
+++ b/Externals/wxWidgets3/include/wx/stringimpl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: stringimpl.h 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/stringops.h b/Externals/wxWidgets3/include/wx/stringops.h
index cb37ac4f99..21c6121787 100644
--- a/Externals/wxWidgets3/include/wx/stringops.h
+++ b/Externals/wxWidgets3/include/wx/stringops.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2007-04-16
-// RCS-ID:      $Id: stringops.h 59795 2009-03-23 23:11:55Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,8 +79,6 @@ struct WXDLLIMPEXP_BASE wxStringOperationsUtf8
     template<typename Iterator>
     static void DecIter(Iterator& i)
     {
-        wxASSERT( IsValidUtf8LeadByte(*i) );
-
         // Non-lead bytes are all in the 0x80..0xBF range (i.e. 10xxxxxx in
         // binary), so we just have to go back until we hit a byte that is
         // either < 0x80 (i.e. 0xxxxxxx in binary) or 0xC0..0xFF (11xxxxxx in
diff --git a/Externals/wxWidgets3/include/wx/strvararg.h b/Externals/wxWidgets3/include/wx/strvararg.h
index 78f44579db..6562ee3150 100644
--- a/Externals/wxWidgets3/include/wx/strvararg.h
+++ b/Externals/wxWidgets3/include/wx/strvararg.h
@@ -3,7 +3,6 @@
 // Purpose:     macros for implementing type-safe vararg passing of strings
 // Author:      Vaclav Slavik
 // Created:     2007-02-19
-// RCS-ID:      $Id: strvararg.h 67760 2011-05-17 22:12:39Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -309,14 +308,13 @@ struct wxFormatStringArgumentFinder<wxWCharBuffer>
     // the correct type (one of wxFormatString::Arg_XXX or-combination in
     // 'expected_mask').
     #define wxASSERT_ARG_TYPE(fmt, index, expected_mask)                    \
-        do                                                                  \
-        {                                                                   \
+        wxSTATEMENT_MACRO_BEGIN                                             \
             if ( !fmt )                                                     \
                 break;                                                      \
             const int argtype = fmt->GetArgumentType(index);                \
             wxASSERT_MSG( (argtype & (expected_mask)) == argtype,           \
                           "format specifier doesn't match argument type" ); \
-        } while ( wxFalse )
+        wxSTATEMENT_MACRO_END
 #else
     // Just define it to suppress "unused parameter" warnings for the
     // parameters which we don't use otherwise
@@ -750,7 +748,7 @@ struct wxArgNormalizer<const wxUniChar&> : public wxArgNormalizer<wchar_t>
 {
     wxArgNormalizer(const wxUniChar& s,
                     const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizer<wchar_t>(s.GetValue(), fmt, index) {}
+        : wxArgNormalizer<wchar_t>(wx_truncate_cast(wchar_t, s.GetValue()), fmt, index) {}
 };
 
 // for wchar_t, default handler does the right thing
diff --git a/Externals/wxWidgets3/include/wx/sysopt.h b/Externals/wxWidgets3/include/wx/sysopt.h
index 15de001e44..63474c0660 100644
--- a/Externals/wxWidgets3/include/wx/sysopt.h
+++ b/Externals/wxWidgets3/include/wx/sysopt.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
-// RCS-ID:      $Id: sysopt.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/tarstrm.h b/Externals/wxWidgets3/include/wx/tarstrm.h
index 71fbb7006e..906d4383ec 100644
--- a/Externals/wxWidgets3/include/wx/tarstrm.h
+++ b/Externals/wxWidgets3/include/wx/tarstrm.h
@@ -2,7 +2,6 @@
 // Name:        wx/tarstrm.h
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: tarstrm.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/taskbar.h b/Externals/wxWidgets3/include/wx/taskbar.h
index 0e7de72668..4a81088b01 100644
--- a/Externals/wxWidgets3/include/wx/taskbar.h
+++ b/Externals/wxWidgets3/include/wx/taskbar.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: taskbar.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,6 +19,21 @@
 
 class WXDLLIMPEXP_FWD_ADV wxTaskBarIconEvent;
 
+// ----------------------------------------------------------------------------
+
+// type of taskbar item to create.  Only applicable in wxOSX_COCOA
+enum wxTaskBarIconType
+{
+    wxTBI_DOCK,
+    wxTBI_CUSTOM_STATUSITEM,
+#if defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA
+    wxTBI_DEFAULT_TYPE = wxTBI_CUSTOM_STATUSITEM
+#else
+    wxTBI_DEFAULT_TYPE = wxTBI_DOCK
+#endif
+};
+
+
 // ----------------------------------------------------------------------------
 // wxTaskBarIconBase: define wxTaskBarIcon interface
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/include/wx/tbarbase.h b/Externals/wxWidgets3/include/wx/tbarbase.h
index fb4e7fde74..c9ff7f430c 100644
--- a/Externals/wxWidgets3/include/wx/tbarbase.h
+++ b/Externals/wxWidgets3/include/wx/tbarbase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: tbarbase.h 70854 2012-03-10 00:01:09Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -609,6 +608,9 @@ public:
 #endif
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // to implement in derived classes
     // -------------------------------
 
diff --git a/Externals/wxWidgets3/include/wx/testing.h b/Externals/wxWidgets3/include/wx/testing.h
new file mode 100644
index 0000000000..57d9d0990c
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/testing.h
@@ -0,0 +1,351 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/testing.h
+// Purpose:     helpers for GUI testing
+// Author:      Vaclav Slavik
+// Created:     2012-08-28
+// Copyright:   (c) 2012 Vaclav Slavik
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TESTING_H_
+#define _WX_TESTING_H_
+
+#include "wx/debug.h"
+#include "wx/string.h"
+#include "wx/modalhook.h"
+
+class WXDLLIMPEXP_FWD_CORE wxMessageDialogBase;
+class WXDLLIMPEXP_FWD_CORE wxFileDialogBase;
+
+// ----------------------------------------------------------------------------
+// testing API
+// ----------------------------------------------------------------------------
+
+// Don't include this code when building the library itself
+#ifndef WXBUILDING
+
+#include "wx/beforestd.h"
+#include <algorithm>
+#include <iterator>
+#include <queue>
+#include "wx/afterstd.h"
+#include "wx/cpp.h"
+#include "wx/dialog.h"
+#include "wx/msgdlg.h"
+#include "wx/filedlg.h"
+
+class wxTestingModalHook;
+
+// Non-template base class for wxExpectModal<T> (via wxExpectModalBase).
+// Only used internally.
+class wxModalExpectation
+{
+public:
+    wxModalExpectation() : m_isOptional(false) {}
+    virtual ~wxModalExpectation() {}
+
+    bool IsOptional() const { return m_isOptional; }
+
+    virtual int Invoke(wxDialog *dlg) const = 0;
+
+    virtual wxString GetDescription() const = 0;
+
+protected:
+    // Is this dialog optional, i.e. not required to be shown?
+    bool m_isOptional;
+};
+
+
+// This must be specialized for each type. The specialization MUST be derived
+// from wxExpectModalBase<T>.
+template<class T> class wxExpectModal {};
+
+
+/**
+    Base class for wxExpectModal<T> specializations.
+
+    Every such specialization must be derived from wxExpectModalBase; there's
+    no other use for this class than to serve as wxExpectModal<T>'s base class.
+
+    T must be a class derived from wxDialog.
+ */
+template<class T>
+class wxExpectModalBase : public wxModalExpectation
+{
+public:
+    typedef T DialogType;
+    typedef wxExpectModal<DialogType> ExpectationType;
+
+    /**
+        Returns a copy of the expectation where the expected dialog is marked
+        as optional.
+
+        Optional dialogs aren't required to appear, it's not an error if they
+        don't.
+     */
+    ExpectationType Optional() const
+    {
+        ExpectationType e(*static_cast<const ExpectationType*>(this));
+        e.m_isOptional = true;
+        return e;
+    }
+
+protected:
+    virtual int Invoke(wxDialog *dlg) const
+    {
+        DialogType *t = dynamic_cast<DialogType*>(dlg);
+        if ( t )
+            return OnInvoked(t);
+        else
+            return wxID_NONE; // not handled
+    }
+
+    /// Returns description of the expected dialog (by default, its class).
+    virtual wxString GetDescription() const
+    {
+        return wxCLASSINFO(T)->GetClassName();
+    }
+
+    /**
+        This method is called when ShowModal() was invoked on a dialog of type T.
+
+        @return Return value is used as ShowModal()'s return value.
+     */
+    virtual int OnInvoked(DialogType *dlg) const = 0;
+};
+
+
+// wxExpectModal<T> specializations for common dialogs:
+
+template<>
+class wxExpectModal<wxMessageDialog> : public wxExpectModalBase<wxMessageDialog>
+{
+public:
+    wxExpectModal(int id)
+    {
+        switch ( id )
+        {
+            case wxYES:
+                m_id = wxID_YES;
+                break;
+            case wxNO:
+                m_id = wxID_NO;
+                break;
+            case wxCANCEL:
+                m_id = wxID_CANCEL;
+                break;
+            case wxOK:
+                m_id = wxID_OK;
+                break;
+            case wxHELP:
+                m_id = wxID_HELP;
+                break;
+            default:
+                m_id = id;
+                break;
+        }
+    }
+
+protected:
+    virtual int OnInvoked(wxMessageDialog *WXUNUSED(dlg)) const
+    {
+        return m_id;
+    }
+
+    int m_id;
+};
+
+#if wxUSE_FILEDLG
+
+template<>
+class wxExpectModal<wxFileDialog> : public wxExpectModalBase<wxFileDialog>
+{
+public:
+    wxExpectModal(const wxString& path, int id = wxID_OK)
+        : m_path(path), m_id(id)
+    {
+    }
+
+protected:
+    virtual int OnInvoked(wxFileDialog *dlg) const
+    {
+        dlg->SetPath(m_path);
+        return m_id;
+    }
+
+    wxString m_path;
+    int m_id;
+};
+
+#endif
+
+// Implementation of wxModalDialogHook for use in testing, with
+// wxExpectModal<T> and the wxTEST_DIALOG() macro. It is not intended for
+// direct use, use the macro instead.
+class wxTestingModalHook : public wxModalDialogHook
+{
+public:
+    wxTestingModalHook()
+    {
+        Register();
+    }
+
+    // Called to verify that all expectations were met. This cannot be done in
+    // the destructor, because ReportFailure() may throw (either because it's
+    // overriden or because wx's assertions handling is, globally). And
+    // throwing from the destructor would introduce all sort of problems,
+    // including messing up the order of errors in some cases.
+    void CheckUnmetExpectations()
+    {
+        while ( !m_expectations.empty() )
+        {
+            const wxModalExpectation *expect = m_expectations.front();
+            m_expectations.pop();
+            if ( expect->IsOptional() )
+                continue;
+
+            ReportFailure
+            (
+                wxString::Format
+                (
+                    "Expected %s dialog was not shown.",
+                    expect->GetDescription()
+                )
+            );
+            break;
+        }
+    }
+
+    void AddExpectation(const wxModalExpectation& e)
+    {
+        m_expectations.push(&e);
+    }
+
+protected:
+    virtual int Enter(wxDialog *dlg)
+    {
+        while ( !m_expectations.empty() )
+        {
+            const wxModalExpectation *expect = m_expectations.front();
+            m_expectations.pop();
+
+            int ret = expect->Invoke(dlg);
+            if ( ret != wxID_NONE )
+                return ret; // dialog shown as expected
+
+            // not showing an optional dialog is OK, but showing an unexpected
+            // one definitely isn't:
+            if ( !expect->IsOptional() )
+            {
+                ReportFailure
+                (
+                    wxString::Format
+                    (
+                        "A %s dialog was shown unexpectedly, expected %s.",
+                        dlg->GetClassInfo()->GetClassName(),
+                        expect->GetDescription()
+                    )
+                );
+                return wxID_NONE;
+            }
+            // else: try the next expectation in the chain
+        }
+
+        ReportFailure
+        (
+            wxString::Format
+            (
+                "A dialog (%s) was shown unexpectedly.",
+                dlg->GetClassInfo()->GetClassName()
+            )
+        );
+        return wxID_NONE;
+    }
+
+protected:
+    virtual void ReportFailure(const wxString& msg)
+    {
+        wxFAIL_MSG( msg );
+    }
+
+private:
+    std::queue<const wxModalExpectation*> m_expectations;
+
+    wxDECLARE_NO_COPY_CLASS(wxTestingModalHook);
+};
+
+
+// Redefining this value makes it possible to customize the hook class,
+// including e.g. its error reporting.
+#define wxTEST_DIALOG_HOOK_CLASS wxTestingModalHook
+
+#define WX_TEST_IMPL_ADD_EXPECTATION(pos, expect)                              \
+    const wxModalExpectation& wx_exp##pos = expect;                            \
+    wx_hook.AddExpectation(wx_exp##pos);
+
+/**
+    Runs given code with all modal dialogs redirected to wxExpectModal<T>
+    hooks, instead of being shown to the user.
+
+    The first argument is any valid expression, typically a function call. The
+    remaining arguments are wxExpectModal<T> instances defining the dialogs
+    that are expected to be shown, in order of appearance.
+
+    Some typical examples:
+
+    @code
+    wxTEST_DIALOG
+    (
+        rc = dlg.ShowModal(),
+        wxExpectModal<wxFileDialog>(wxGetCwd() + "/test.txt")
+    );
+    @endcode
+
+    Sometimes, the code may show more than one dialog:
+
+    @code
+    wxTEST_DIALOG
+    (
+        RunSomeFunction(),
+        wxExpectModal<wxMessageDialog>(wxNO),
+        wxExpectModal<MyConfirmationDialog>(wxYES),
+        wxExpectModal<wxFileDialog>(wxGetCwd() + "/test.txt")
+    );
+    @endcode
+
+    Notice that wxExpectModal<T> has some convenience methods for further
+    tweaking the expectations. For example, it's possible to mark an expected
+    dialog as @em optional for situations when a dialog may be shown, but isn't
+    required to, by calling the Optional() method:
+
+    @code
+    wxTEST_DIALOG
+    (
+        RunSomeFunction(),
+        wxExpectModal<wxMessageDialog>(wxNO),
+        wxExpectModal<wxFileDialog>(wxGetCwd() + "/test.txt").Optional()
+    );
+    @endcode
+
+    @note By default, errors are reported with wxFAIL_MSG(). You may customize this by
+          implementing a class derived from wxTestingModalHook, overriding its
+          ReportFailure() method and redefining the wxTEST_DIALOG_HOOK_CLASS
+          macro to be the name of this class.
+
+    @note Custom dialogs are supported too. All you have to do is to specialize
+          wxExpectModal<> for your dialog type and implement its OnInvoked()
+          method.
+ */
+#ifdef HAVE_VARIADIC_MACROS
+#define wxTEST_DIALOG(codeToRun, ...)                                          \
+    {                                                                          \
+        wxTEST_DIALOG_HOOK_CLASS wx_hook;                                      \
+        wxCALL_FOR_EACH(WX_TEST_IMPL_ADD_EXPECTATION, __VA_ARGS__)             \
+        codeToRun;                                                             \
+        wx_hook.CheckUnmetExpectations();                                      \
+    }
+#endif /* HAVE_VARIADIC_MACROS */
+
+#endif // !WXBUILDING
+
+#endif // _WX_TESTING_H_
diff --git a/Externals/wxWidgets3/include/wx/textbuf.h b/Externals/wxWidgets3/include/wx/textbuf.h
index 0db6a65279..a2511b427d 100644
--- a/Externals/wxWidgets3/include/wx/textbuf.h
+++ b/Externals/wxWidgets3/include/wx/textbuf.h
@@ -20,7 +20,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
-// the line termination type (kept wxTextFileType name for compability)
+// the line termination type (kept wxTextFileType name for compatibility)
 enum wxTextFileType
 {
     wxTextFileType_None,  // incomplete (the last line of the file only)
diff --git a/Externals/wxWidgets3/include/wx/textcompleter.h b/Externals/wxWidgets3/include/wx/textcompleter.h
index fa422d309d..bc4135f8bf 100644
--- a/Externals/wxWidgets3/include/wx/textcompleter.h
+++ b/Externals/wxWidgets3/include/wx/textcompleter.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxTextCompleter class.
 // Author:      Vadim Zeitlin
 // Created:     2011-04-13
-// RCS-ID:      $Id: textcompleter.h 67525 2011-04-17 23:14:11Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/textctrl.h b/Externals/wxWidgets3/include/wx/textctrl.h
index eb7a03c96e..ce922bb631 100644
--- a/Externals/wxWidgets3/include/wx/textctrl.h
+++ b/Externals/wxWidgets3/include/wx/textctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.99
-// RCS-ID:      $Id: textctrl.h 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,7 +27,6 @@
 // some compilers don't have standard compliant rdbuf() (and MSVC has it only
 // in its new iostream library, not in the old one used with iostream.h)
 #if defined(__WATCOMC__) || \
-    defined(__MWERKS__) || \
     ((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH)
     #define wxHAS_TEXT_WINDOW_STREAM 0
 #elif wxUSE_STD_IOSTREAM
@@ -167,13 +165,16 @@ enum wxTextAttrFlags
     wxTEXT_ATTR_BACKGROUND_COLOUR    = 0x00000002,
 
     wxTEXT_ATTR_FONT_FACE            = 0x00000004,
-    wxTEXT_ATTR_FONT_SIZE            = 0x00000008,
+    wxTEXT_ATTR_FONT_POINT_SIZE      = 0x00000008,
+    wxTEXT_ATTR_FONT_PIXEL_SIZE      = 0x10000000,
     wxTEXT_ATTR_FONT_WEIGHT          = 0x00000010,
     wxTEXT_ATTR_FONT_ITALIC          = 0x00000020,
     wxTEXT_ATTR_FONT_UNDERLINE       = 0x00000040,
     wxTEXT_ATTR_FONT_STRIKETHROUGH   = 0x08000000,
     wxTEXT_ATTR_FONT_ENCODING        = 0x02000000,
     wxTEXT_ATTR_FONT_FAMILY          = 0x04000000,
+    wxTEXT_ATTR_FONT_SIZE = \
+        ( wxTEXT_ATTR_FONT_POINT_SIZE | wxTEXT_ATTR_FONT_PIXEL_SIZE ),
     wxTEXT_ATTR_FONT = \
         ( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \
             wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_STRIKETHROUGH | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ),
@@ -204,6 +205,9 @@ enum wxTextAttrFlags
     wxTEXT_ATTR_EFFECTS              = 0x00800000,
     wxTEXT_ATTR_OUTLINE_LEVEL        = 0x01000000,
 
+    wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x20000000,
+    wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER =  0x40000000,
+
     /*!
     * Character and paragraph combined styles
     */
@@ -215,7 +219,8 @@ enum wxTextAttrFlags
     wxTEXT_ATTR_PARAGRAPH = \
         (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\
             wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\
-            wxTEXT_ATTR_BULLET|wxTEXT_ATTR_PARAGRAPH_STYLE_NAME|wxTEXT_ATTR_LIST_STYLE_NAME|wxTEXT_ATTR_OUTLINE_LEVEL|wxTEXT_ATTR_PAGE_BREAK),
+            wxTEXT_ATTR_BULLET|wxTEXT_ATTR_PARAGRAPH_STYLE_NAME|wxTEXT_ATTR_LIST_STYLE_NAME|wxTEXT_ATTR_OUTLINE_LEVEL|\
+            wxTEXT_ATTR_PAGE_BREAK|wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE|wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER),
 
     wxTEXT_ATTR_ALL = (wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH)
 };
@@ -241,7 +246,9 @@ enum wxTextAttrBulletStyle
 
     wxTEXT_ATTR_BULLET_STYLE_ALIGN_LEFT      = 0x00000000,
     wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT     = 0x00001000,
-    wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE    = 0x00002000
+    wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE    = 0x00002000,
+
+    wxTEXT_ATTR_BULLET_STYLE_CONTINUATION    = 0x00004000
 };
 
 /*!
@@ -259,7 +266,9 @@ enum wxTextAttrEffects
     wxTEXT_ATTR_EFFECT_OUTLINE               = 0x00000040,
     wxTEXT_ATTR_EFFECT_ENGRAVE               = 0x00000080,
     wxTEXT_ATTR_EFFECT_SUPERSCRIPT           = 0x00000100,
-    wxTEXT_ATTR_EFFECT_SUBSCRIPT             = 0x00000200
+    wxTEXT_ATTR_EFFECT_SUBSCRIPT             = 0x00000200,
+    wxTEXT_ATTR_EFFECT_RTL                   = 0x00000400,
+    wxTEXT_ATTR_EFFECT_SUPPRESS_HYPHENATION  = 0x00001000
 };
 
 /*!
@@ -299,8 +308,11 @@ public:
     // Equality test
     bool operator== (const wxTextAttr& attr) const;
 
-    // Partial equality test
-    bool EqPartial(const wxTextAttr& attr) const;
+    // Partial equality test.  If @a weakTest is @true, attributes of this object do not
+    // have to be present if those attributes of @a attr are present. If @a weakTest is
+    // @false, the function will fail if an attribute is present in @a attr but not
+    // in this object.
+    bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const;
 
     // Get attributes from font.
     bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
@@ -313,7 +325,9 @@ public:
     void SetLeftIndent(int indent, int subIndent = 0) { m_leftIndent = indent; m_leftSubIndent = subIndent; m_flags |= wxTEXT_ATTR_LEFT_INDENT; }
     void SetRightIndent(int indent) { m_rightIndent = indent; m_flags |= wxTEXT_ATTR_RIGHT_INDENT; }
 
-    void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags |= wxTEXT_ATTR_FONT_SIZE; }
+    void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
+    void SetFontPointSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
+    void SetFontPixelSize(int pixelSize) { m_fontSize = pixelSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_PIXEL_SIZE; }
     void SetFontStyle(wxFontStyle fontStyle) { m_fontStyle = fontStyle; m_flags |= wxTEXT_ATTR_FONT_ITALIC; }
     void SetFontWeight(wxFontWeight fontWeight) { m_fontWeight = fontWeight; m_flags |= wxTEXT_ATTR_FONT_WEIGHT; }
     void SetFontFaceName(const wxString& faceName) { m_fontFaceName = faceName; m_flags |= wxTEXT_ATTR_FONT_FACE; }
@@ -323,7 +337,7 @@ public:
     void SetFontFamily(wxFontFamily family) { m_fontFamily = family; m_flags |= wxTEXT_ATTR_FONT_FAMILY; }
 
     // Set font
-    void SetFont(const wxFont& font, int flags = wxTEXT_ATTR_FONT) { GetFontAttributes(font, flags); }
+    void SetFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE)) { GetFontAttributes(font, flags); }
 
     void SetFlags(long flags) { m_flags = flags; }
 
@@ -390,6 +404,8 @@ public:
     bool HasRightIndent() const { return HasFlag(wxTEXT_ATTR_RIGHT_INDENT); }
     bool HasFontWeight() const { return HasFlag(wxTEXT_ATTR_FONT_WEIGHT); }
     bool HasFontSize() const { return HasFlag(wxTEXT_ATTR_FONT_SIZE); }
+    bool HasFontPointSize() const { return HasFlag(wxTEXT_ATTR_FONT_POINT_SIZE); }
+    bool HasFontPixelSize() const { return HasFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE); }
     bool HasFontItalic() const { return HasFlag(wxTEXT_ATTR_FONT_ITALIC); }
     bool HasFontUnderlined() const { return HasFlag(wxTEXT_ATTR_FONT_UNDERLINE); }
     bool HasFontStrikethrough() const { return HasFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH); }
@@ -432,7 +448,7 @@ public:
     // is non-NULL, then it will be used to mask out those attributes that are the same in style
     // and compareWith, for situations where we don't want to explicitly set inherited attributes.
     bool Apply(const wxTextAttr& style, const wxTextAttr* compareWith = NULL);
-    
+
     // merges the attributes of the base and the overlay objects and returns
     // the result; the parameter attributes take precedence
     //
@@ -725,6 +741,9 @@ public:
        wxTextEntry::SetValue(value);
     }
 
+    // wxTextEntry overrides
+    virtual bool SetHint(const wxString& hint);
+
     // wxWindow overrides
     virtual wxVisualAttributes GetDefaultAttributes() const
     {
@@ -743,9 +762,6 @@ protected:
     int overflow(int i);
 #endif // wxHAS_TEXT_WINDOW_STREAM
 
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-    virtual bool DoSaveFile(const wxString& file, int fileType);
-
     // Another wxTextAreaBase override.
     virtual bool IsValidPosition(long pos) const
     {
@@ -791,17 +807,17 @@ protected:
 
 class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent;
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_ENTER, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_URL, wxTextUrlEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_MAXLEN, wxCommandEvent);
 
 class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent
 {
 public:
     wxTextUrlEvent(int winid, const wxMouseEvent& evtMouse,
                    long start, long end)
-        : wxCommandEvent(wxEVT_COMMAND_TEXT_URL, winid),
+        : wxCommandEvent(wxEVT_TEXT_URL, winid),
           m_evtMouse(evtMouse), m_start(start), m_end(end)
         { }
     wxTextUrlEvent(const wxTextUrlEvent& event)
@@ -810,7 +826,7 @@ public:
           m_start(event.m_start),
           m_end(event.m_end) { }
 
-    // get the mouse event which happend over the URL
+    // get the mouse event which happened over the URL
     const wxMouseEvent& GetMouseEvent() const { return m_evtMouse; }
 
     // get the start of the URL
@@ -844,12 +860,12 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
     wxEVENT_HANDLER_CAST(wxTextUrlEventFunction, func)
 
 #define wx__DECLARE_TEXTEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextEventHandler(fn))
 
 #define wx__DECLARE_TEXTURLEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextUrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TEXT_ ## evt, id, wxTextUrlEventHandler(fn))
 
-#define EVT_TEXT(id, fn) wx__DECLARE_TEXTEVT(UPDATED, id, fn)
+#define EVT_TEXT(id, fn) wx__DECLARE_EVT1(wxEVT_TEXT, id, wxTextEventHandler(fn))
 #define EVT_TEXT_ENTER(id, fn) wx__DECLARE_TEXTEVT(ENTER, id, fn)
 #define EVT_TEXT_URL(id, fn) wx__DECLARE_TEXTURLEVT(URL, id, fn)
 #define EVT_TEXT_MAXLEN(id, fn) wx__DECLARE_TEXTEVT(MAXLEN, id, fn)
@@ -898,6 +914,12 @@ private:
 
 #endif // wxHAS_TEXT_WINDOW_STREAM
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TEXT_UPDATED   wxEVT_TEXT
+#define wxEVT_COMMAND_TEXT_ENTER     wxEVT_TEXT_ENTER
+#define wxEVT_COMMAND_TEXT_URL       wxEVT_TEXT_URL
+#define wxEVT_COMMAND_TEXT_MAXLEN    wxEVT_TEXT_MAXLEN
+
 #endif // wxUSE_TEXTCTRL
 
 #endif
diff --git a/Externals/wxWidgets3/include/wx/textdlg.h b/Externals/wxWidgets3/include/wx/textdlg.h
index e4bc1178a9..509b700ba6 100644
--- a/Externals/wxWidgets3/include/wx/textdlg.h
+++ b/Externals/wxWidgets3/include/wx/textdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: textdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/textentry.h b/Externals/wxWidgets3/include/wx/textentry.h
index aeeffa652b..2707afa203 100644
--- a/Externals/wxWidgets3/include/wx/textentry.h
+++ b/Externals/wxWidgets3/include/wx/textentry.h
@@ -3,7 +3,6 @@
 // Purpose:     declares wxTextEntry interface defining a simple text entry
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24
-// RCS-ID:      $Id: textentry.h 68918 2011-08-27 14:11:13Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -98,6 +97,8 @@ public:
 
     virtual void SetSelection(long from, long to) = 0;
     virtual void SelectAll() { SetSelection(-1, -1); }
+    virtual void SelectNone()
+        { const long pos = GetInsertionPoint(); SetSelection(pos, pos); }
     virtual void GetSelection(long *from, long *to) const = 0;
     bool HasSelection() const;
     virtual wxString GetStringSelection() const;
@@ -171,20 +172,20 @@ public:
     // implementation only
     // -------------------
 
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for GetEditableWindow(),
+    // generate the wxEVT_TEXT event for GetEditableWindow(),
     // like SetValue() does and return true if the event was processed
     //
     // NB: this is public for wxRichTextCtrl use only right now, do not call it
     static bool SendTextUpdatedEvent(wxWindow *win);
 
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window
+    // generate the wxEVT_TEXT event for this window
     bool SendTextUpdatedEvent()
     {
         return SendTextUpdatedEvent(GetEditableWindow());
     }
 
 
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the
+    // generate the wxEVT_TEXT event for this window if the
     // events are not currently disabled
     void SendTextUpdatedEventIfAllowed()
     {
diff --git a/Externals/wxWidgets3/include/wx/textfile.h b/Externals/wxWidgets3/include/wx/textfile.h
index 394aa5bf87..e6aa3ba663 100644
--- a/Externals/wxWidgets3/include/wx/textfile.h
+++ b/Externals/wxWidgets3/include/wx/textfile.h
@@ -6,7 +6,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id: textfile.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/textwrapper.h b/Externals/wxWidgets3/include/wx/textwrapper.h
index f776b9939e..a708cebd75 100644
--- a/Externals/wxWidgets3/include/wx/textwrapper.h
+++ b/Externals/wxWidgets3/include/wx/textwrapper.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxTextWrapper class
 // Author:      Vadim Zeitlin
 // Created:     2009-05-31 (extracted from dlgcmn.cpp via wx/private/stattext.h)
-// RCS-ID:      $Id: textwrapper.h 70433 2012-01-22 00:58:05Z VZ $
 // Copyright:   (c) 1999, 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/tglbtn.h b/Externals/wxWidgets3/include/wx/tglbtn.h
index 72966cc759..8cb2a2e891 100644
--- a/Externals/wxWidgets3/include/wx/tglbtn.h
+++ b/Externals/wxWidgets3/include/wx/tglbtn.h
@@ -5,7 +5,6 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +21,7 @@
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
@@ -72,7 +71,7 @@ protected:
 
 
 #define EVT_TOGGLEBUTTON(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TOGGLEBUTTON, id, wxCommandEventHandler(fn))
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/tglbtn.h"
@@ -93,6 +92,9 @@ protected:
     #include "wx/os2/tglbtn.h"
 #endif
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED   wxEVT_TOGGLEBUTTON
+
 #endif // wxUSE_TOGGLEBTN
 
 #endif // _WX_TOGGLEBUTTON_H_BASE_
diff --git a/Externals/wxWidgets3/include/wx/thread.h b/Externals/wxWidgets3/include/wx/thread.h
index 59ccfc952a..6806d82fea 100644
--- a/Externals/wxWidgets3/include/wx/thread.h
+++ b/Externals/wxWidgets3/include/wx/thread.h
@@ -5,7 +5,6 @@
 // Modified by: Vadim Zeitlin (modifications partly inspired by omnithreads
 //              package from Olivetti & Oracle Research Laboratory)
 // Created:     04/13/98
-// RCS-ID:      $Id: thread.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -86,12 +85,12 @@ enum wxThreadWait
 #endif
 };
 
-// defines the interval of priority
+// Obsolete synonyms for wxPRIORITY_XXX for backwards compatibility-only
 enum
 {
-    WXTHREAD_MIN_PRIORITY      = 0u,
-    WXTHREAD_DEFAULT_PRIORITY  = 50u,
-    WXTHREAD_MAX_PRIORITY      = 100u
+    WXTHREAD_MIN_PRIORITY      = wxPRIORITY_MIN,
+    WXTHREAD_DEFAULT_PRIORITY  = wxPRIORITY_DEFAULT,
+    WXTHREAD_MAX_PRIORITY      = wxPRIORITY_MAX
 };
 
 // There are 2 types of mutexes: normal mutexes and recursive ones. The attempt
@@ -266,10 +265,6 @@ private:
     //
     // if CRITICAL_SECTION size changes in Windows, you'll get an assert from
     // thread.cpp and will need to increase the buffer size
-    //
-    // finally, we need this typedef instead of declaring m_buffer directly
-    // because otherwise the assert mentioned above wouldn't compile with some
-    // compilers (notably CodeWarrior 8)
 #ifdef __WIN64__
     typedef char wxCritSectBuffer[40];
 #else // __WIN32__
@@ -349,10 +344,23 @@ public:
     // the lock on the associated mutex object, before returning.
     wxCondError Wait();
 
+    // std::condition_variable-like variant that evaluates the associated condition
+    template<typename Functor>
+    wxCondError Wait(const Functor& predicate)
+    {
+        while ( !predicate() )
+        {
+            wxCondError e = Wait();
+            if ( e != wxCOND_NO_ERROR )
+                return e;
+        }
+        return wxCOND_NO_ERROR;
+    }
+
     // exactly as Wait() except that it may also return if the specified
     // timeout elapses even if the condition hasn't been signalled: in this
-    // case, the return value is false, otherwise (i.e. in case of a normal
-    // return) it is true
+    // case, the return value is wxCOND_TIMEOUT, otherwise (i.e. in case of a
+    // normal return) it is wxCOND_NO_ERROR.
     //
     // the timeout parameter specifies an interval that needs to be waited for
     // in milliseconds
@@ -562,7 +570,8 @@ public:
     wxThreadError Resume();
 
     // priority
-        // Sets the priority to "prio": see WXTHREAD_XXX_PRIORITY constants
+        // Sets the priority to "prio" which must be in 0..100 range (see
+        // also wxPRIORITY_XXX constants).
         //
         // NB: the priority can only be set before the thread is created
     void SetPriority(unsigned int prio);
@@ -605,6 +614,8 @@ protected:
     // of this thread.
     virtual void *Entry() = 0;
 
+    // use this to call the Entry() virtual method
+    void *CallEntry();
 
     // Callbacks which may be overridden by the derived class to perform some
     // specific actions when the thread is deleted or killed. By default they
@@ -844,7 +855,7 @@ public:
 
 #if wxUSE_THREADS
 
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__DARWIN__)
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread
@@ -856,7 +867,7 @@ public:
     // wakes up the main thread if it's sleeping inside ::GetMessage()
     extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();
 
-#ifndef __WXOSX__
+#ifndef __DARWIN__
     // return true if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread();
diff --git a/Externals/wxWidgets3/include/wx/thrimpl.cpp b/Externals/wxWidgets3/include/wx/thrimpl.cpp
index 39a75a770b..000b24d589 100644
--- a/Externals/wxWidgets3/include/wx/thrimpl.cpp
+++ b/Externals/wxWidgets3/include/wx/thrimpl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.06.02 (extracted from src/*/thread.cpp files)
-// RCS-ID:      $Id: thrimpl.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Vadim Zeitlin (2002)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -343,8 +342,16 @@ wxSemaError wxSemaphore::Post()
 // ----------------------------------------------------------------------------
 
 #include "wx/utils.h"
+#include "wx/private/threadinfo.h"
+#include "wx/scopeguard.h"
 
 void wxThread::Sleep(unsigned long milliseconds)
 {
     wxMilliSleep(milliseconds);
 }
+
+void *wxThread::CallEntry()
+{
+    wxON_BLOCK_EXIT0(wxThreadSpecificInfo::ThreadCleanUp);
+    return Entry();
+}
diff --git a/Externals/wxWidgets3/include/wx/time.h b/Externals/wxWidgets3/include/wx/time.h
index 4dc6bf8d19..644422392f 100644
--- a/Externals/wxWidgets3/include/wx/time.h
+++ b/Externals/wxWidgets3/include/wx/time.h
@@ -3,7 +3,6 @@
 // Purpose:     Miscellaneous time-related functions.
 // Author:      Vadim Zeitlin
 // Created:     2011-11-26
-// RCS-ID:      $Id: time.h 69846 2011-11-27 20:28:43Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/timectrl.h b/Externals/wxWidgets3/include/wx/timectrl.h
index 832cc67708..928d9aedf3 100644
--- a/Externals/wxWidgets3/include/wx/timectrl.h
+++ b/Externals/wxWidgets3/include/wx/timectrl.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of wxTimePickerCtrl class.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22
-// RCS-ID:      $Id: timectrl.h 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,9 +49,42 @@ public:
     /*
         We also inherit Set/GetValue() methods from the base class which define
         our public API. Notice that the date portion of the date passed as
-        input is ignored and for the result date it's always today, but only
-        the time part of wxDateTime objects is really significant here.
+        input or received as output is or should be ignored, only the time part
+        of wxDateTime objects is really significant here. Use Set/GetTime()
+        below for possibly simpler interface.
      */
+
+    // Set the given time.
+    bool SetTime(int hour, int min, int sec)
+    {
+        // Notice that we should use a date on which DST doesn't change to
+        // avoid any problems with time discontinuity so use a fixed date (on
+        // which nobody changes DST) instead of e.g. today.
+        wxDateTime dt(1, wxDateTime::Jan, 2012, hour, min, sec);
+        if ( !dt.IsValid() )
+        {
+            // No need to assert here, wxDateTime already does it for us.
+            return false;
+        }
+
+        SetValue(dt);
+
+        return true;
+    }
+
+    // Get the current time components. All pointers must be non-NULL.
+    bool GetTime(int* hour, int* min, int* sec) const
+    {
+        wxCHECK_MSG( hour && min && sec, false,
+                     wxS("Time component pointers must be non-NULL") );
+
+        const wxDateTime::Tm tm = GetValue().GetTm();
+        *hour = tm.hour;
+        *min = tm.min;
+        *sec = tm.sec;
+
+        return true;
+    }
 };
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
diff --git a/Externals/wxWidgets3/include/wx/timer.h b/Externals/wxWidgets3/include/wx/timer.h
index 5400c76b23..8ee5684e00 100644
--- a/Externals/wxWidgets3/include/wx/timer.h
+++ b/Externals/wxWidgets3/include/wx/timer.h
@@ -5,7 +5,6 @@
 // Modified by: Vadim Zeitlin (wxTimerBase)
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
-// RCS-ID:      $Id: timer.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,6 +80,10 @@ public:
     // timer if it is already running
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
 
+    // start the timer for one iteration only, this is just a simple wrapper
+    // for Start()
+    bool StartOnce(int milliseconds = -1) { return Start(milliseconds, true); }
+
     // stop the timer, does nothing if the timer is not running
     virtual void Stop();
 
diff --git a/Externals/wxWidgets3/include/wx/tipdlg.h b/Externals/wxWidgets3/include/wx/tipdlg.h
index b5d0361249..e0093855fb 100644
--- a/Externals/wxWidgets3/include/wx/tipdlg.h
+++ b/Externals/wxWidgets3/include/wx/tipdlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.06.99
-// RCS-ID:      $Id: tipdlg.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/tipwin.h b/Externals/wxWidgets3/include/wx/tipwin.h
index 94ec56305f..a2ca0f13e2 100644
--- a/Externals/wxWidgets3/include/wx/tipwin.h
+++ b/Externals/wxWidgets3/include/wx/tipwin.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id: tipwin.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/tls.h b/Externals/wxWidgets3/include/wx/tls.h
index 0dfa87d2c5..6a4ee03786 100644
--- a/Externals/wxWidgets3/include/wx/tls.h
+++ b/Externals/wxWidgets3/include/wx/tls.h
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of thread local storage
 // Author:      Vadim Zeitlin
 // Created:     2008-08-08
-// RCS-ID:      $Id: tls.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,10 +21,13 @@
 #if !wxUSE_THREADS
     #define wxHAS_COMPILER_TLS
     #define wxTHREAD_SPECIFIC_DECL
+// otherwise try to find the compiler-specific way to handle TLS unless
+// explicitly disabled by setting wxUSE_COMPILER_TLS to 0 (it is 1 by default).
+#elif wxUSE_COMPILER_TLS
 // __thread keyword is not supported correctly by MinGW, at least in some
 // configurations, see http://sourceforge.net/support/tracker.php?aid=2837047
 // and when in doubt we prefer to not use it at all.
-#elif defined(HAVE___THREAD_KEYWORD) && !defined(__MINGW32__)
+#if defined(HAVE___THREAD_KEYWORD) && !defined(__MINGW32__)
     #define wxHAS_COMPILER_TLS
     #define wxTHREAD_SPECIFIC_DECL __thread
 // MSVC has its own version which might be supported by some other Windows
@@ -33,7 +35,8 @@
 #elif wxCHECK_VISUALC_VERSION(7)
     #define wxHAS_COMPILER_TLS
     #define wxTHREAD_SPECIFIC_DECL __declspec(thread)
-#endif
+#endif // compilers
+#endif // wxUSE_COMPILER_TLS
 
 // ----------------------------------------------------------------------------
 // define wxTLS_TYPE()
diff --git a/Externals/wxWidgets3/include/wx/tokenzr.h b/Externals/wxWidgets3/include/wx/tokenzr.h
index 9243bc3cb8..2eb6519709 100644
--- a/Externals/wxWidgets3/include/wx/tokenzr.h
+++ b/Externals/wxWidgets3/include/wx/tokenzr.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: (or rather rewritten by) Vadim Zeitlin
 // Created:     04/22/98
-// RCS-ID:      $Id: tokenzr.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/toolbar.h b/Externals/wxWidgets3/include/wx/toolbar.h
index 5e6298320e..49a446e777 100644
--- a/Externals/wxWidgets3/include/wx/toolbar.h
+++ b/Externals/wxWidgets3/include/wx/toolbar.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id: toolbar.h 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,7 +59,9 @@ enum
     wxTB_BOTTOM       = 0x2000,
 
     // lay out toolbar at the right edge of the window
-    wxTB_RIGHT        = 0x4000
+    wxTB_RIGHT        = 0x4000,
+
+    wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT
 };
 
 #if wxUSE_TOOLBAR
diff --git a/Externals/wxWidgets3/include/wx/toolbook.h b/Externals/wxWidgets3/include/wx/toolbook.h
index 2efd27434e..45730cd9c4 100644
--- a/Externals/wxWidgets3/include/wx/toolbook.h
+++ b/Externals/wxWidgets3/include/wx/toolbook.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2006-01-29
-// RCS-ID:      $Id: toolbook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) 2006 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,12 +16,13 @@
 #if wxUSE_TOOLBOOK
 
 #include "wx/bookctrl.h"
+#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxToolBarBase;
 class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
 
 // Use wxButtonToolBar
@@ -40,7 +40,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING
 // wxToolbook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxToolbook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxToolbook : public wxNavigationEnabled<wxBookCtrlBase>
 {
 public:
     wxToolbook()
@@ -128,16 +128,20 @@ private:
 // ----------------------------------------------------------------------------
 
 // wxToolbookEvent is obsolete and defined for compatibility only
-typedef wxBookCtrlEvent wxToolbookEvent;
+#define wxToolbookEvent wxBookCtrlEvent
 typedef wxBookCtrlEventFunction wxToolbookEventFunction;
 #define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func)
 
 
 #define EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TOOLBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TOOLBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED    wxEVT_TOOLBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING   wxEVT_TOOLBOOK_PAGE_CHANGING
 
 #endif // wxUSE_TOOLBOOK
 
diff --git a/Externals/wxWidgets3/include/wx/tooltip.h b/Externals/wxWidgets3/include/wx/tooltip.h
index b8a1da9c86..0948e65eff 100644
--- a/Externals/wxWidgets3/include/wx/tooltip.h
+++ b/Externals/wxWidgets3/include/wx/tooltip.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: tooltip.h 67254 2011-03-20 00:14:35Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/toplevel.h b/Externals/wxWidgets3/include/wx/toplevel.h
index bf1049350c..b36b30e6cf 100644
--- a/Externals/wxWidgets3/include/wx/toplevel.h
+++ b/Externals/wxWidgets3/include/wx/toplevel.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     06.08.01
-// RCS-ID:      $Id: toplevel.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //                       Vaclav Slavik <vaclav@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -20,7 +19,6 @@
 
 #include "wx/nonownedwnd.h"
 #include "wx/iconbndl.h"
-#include "wx/containr.h"
 #include "wx/weakref.h"
 
 // the default names for various classes
@@ -157,8 +155,7 @@ enum
 // wxTopLevelWindow: a top level (as opposed to child) window
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTopLevelWindowBase :
-    public wxNavigationEnabled<wxNonOwnedWindow>
+class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow
 {
 public:
     // construction
@@ -224,7 +221,9 @@ public:
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // Is this the active frame (highlighted in the taskbar)?
-    virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; }
+    //
+    // A TLW is active only if it contains the currently focused window.
+    virtual bool IsActive() { return IsDescendant(FindFocus()); }
 
     // this function may be overridden to return false to allow closing the
     // application even when this top level window is still open
@@ -270,7 +269,6 @@ public:
     wxWindow *SetTmpDefaultItem(wxWindow *win)
         { wxWindow *old = GetDefaultItem(); m_winTmpDefault = win; return old; }
 
-
     // implementation only from now on
     // -------------------------------
 
@@ -303,6 +301,13 @@ public:
 
     virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { }
 
+#if wxUSE_MENUS || wxUSE_TOOLBAR
+    // show help text for the currently selected menu or toolbar item
+    // (typically in the status bar) or hide it and restore the status bar text
+    // originally shown before the menu was opened if show == false
+    virtual void DoGiveHelp(const wxString& WXUNUSED(text), bool WXUNUSED(show))  {}
+#endif
+
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
diff --git a/Externals/wxWidgets3/include/wx/tracker.h b/Externals/wxWidgets3/include/wx/tracker.h
index 94afcab73f..d8f272822c 100644
--- a/Externals/wxWidgets3/include/wx/tracker.h
+++ b/Externals/wxWidgets3/include/wx/tracker.h
@@ -3,7 +3,6 @@
 // Purpose:     Support class for object lifetime tracking (wxWeakRef<T>)
 // Author:      Arne Steinarson
 // Created:     28 Dec 07
-// RCS-ID:      $Id: tracker.h 51448 2008-01-29 17:41:10Z RD $
 // Copyright:   (c) 2007 Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/translation.h b/Externals/wxWidgets3/include/wx/translation.h
index 1320e75953..187caf366b 100644
--- a/Externals/wxWidgets3/include/wx/translation.h
+++ b/Externals/wxWidgets3/include/wx/translation.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Vaclav Slavik,
 //              Michael N. Filippov <michael@idisys.iae.nsk.su>
 // Created:     2010-04-23
-// RCS-ID:      $Id: translation.h 64597 2010-06-16 14:09:32Z VS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2010 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
@@ -132,6 +131,11 @@ public:
     // get languages available for this app
     wxArrayString GetAvailableTranslations(const wxString& domain) const;
 
+    // find best translation language for given domain
+    wxString GetBestTranslation(const wxString& domain, wxLanguage msgIdLanguage);
+    wxString GetBestTranslation(const wxString& domain,
+                                const wxString& msgIdLanguage = "en");
+
     // add standard wxWidgets catalog ("wxstd")
     bool AddStdCatalog();
 
@@ -149,12 +153,11 @@ public:
     bool IsLoaded(const wxString& domain) const;
 
     // access to translations
-    const wxString& GetString(const wxString& origString,
-                              const wxString& domain = wxEmptyString) const;
-    const wxString& GetString(const wxString& origString,
-                              const wxString& origString2,
-                              unsigned n,
-                              const wxString& domain = wxEmptyString) const;
+    const wxString *GetTranslatedString(const wxString& origString,
+                                        const wxString& domain = wxEmptyString) const;
+    const wxString *GetTranslatedString(const wxString& origString,
+                                        unsigned n,
+                                        const wxString& domain = wxEmptyString) const;
 
     wxString GetHeaderValue(const wxString& header,
                             const wxString& domain = wxEmptyString) const;
@@ -166,11 +169,7 @@ public:
 
 private:
     // perform loading of the catalog via m_loader
-    bool LoadCatalog(const wxString& domain, const wxString& lang);
-
-    // find best translation for given domain
-    wxString ChooseLanguageForDomain(const wxString& domain,
-                                     const wxString& msgIdLang);
+    bool LoadCatalog(const wxString& domain, const wxString& lang, const wxString& msgIdLang);
 
     // find catalog by name in a linked list, return NULL if !found
     wxMsgCatalog *FindCatalog(const wxString& domain) const;
@@ -242,11 +241,13 @@ protected:
 
 // get the translation of the string in the current locale
 inline const wxString& wxGetTranslation(const wxString& str,
-                                        const wxString& domain = wxEmptyString)
+                                        const wxString& domain = wxString())
 {
     wxTranslations *trans = wxTranslations::Get();
-    if ( trans )
-        return trans->GetString(str, domain);
+    const wxString *transStr = trans ? trans->GetTranslatedString(str, domain)
+                                     : NULL;
+    if ( transStr )
+        return *transStr;
     else
         // NB: this function returns reference to a string, so we have to keep
         //     a copy of it somewhere
@@ -256,11 +257,13 @@ inline const wxString& wxGetTranslation(const wxString& str,
 inline const wxString& wxGetTranslation(const wxString& str1,
                                         const wxString& str2,
                                         unsigned n,
-                                        const wxString& domain = wxEmptyString)
+                                        const wxString& domain = wxString())
 {
     wxTranslations *trans = wxTranslations::Get();
-    if ( trans )
-        return trans->GetString(str1, str2, n, domain);
+    const wxString *transStr = trans ? trans->GetTranslatedString(str1, n, domain)
+                                     : NULL;
+    if ( transStr )
+        return *transStr;
     else
         // NB: this function returns reference to a string, so we have to keep
         //     a copy of it somewhere
diff --git a/Externals/wxWidgets3/include/wx/treebase.h b/Externals/wxWidgets3/include/wx/treebase.h
index dc03d28f88..4efbf05074 100644
--- a/Externals/wxWidgets3/include/wx/treebase.h
+++ b/Externals/wxWidgets3/include/wx/treebase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: treebase.h 68812 2011-08-21 14:08:56Z VZ $
 // Copyright:   (c) 1997,1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -257,21 +256,21 @@ public:
 
     // accessors
         // get the item on which the operation was performed or the newly
-        // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events
+        // selected item for wxEVT_TREE_SEL_CHANGED/ING events
     wxTreeItemId GetItem() const { return m_item; }
     void SetItem(const wxTreeItemId& item) { m_item = item; }
 
-        // for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
+        // for wxEVT_TREE_SEL_CHANGED/ING events, get the previously
         // selected item
     wxTreeItemId GetOldItem() const { return m_itemOld; }
     void SetOldItem(const wxTreeItemId& item) { m_itemOld = item; }
 
         // the point where the mouse was when the drag operation started (for
-        // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position
+        // wxEVT_TREE_BEGIN_(R)DRAG events only) or click position
     wxPoint GetPoint() const { return m_pointDrag; }
     void SetPoint(const wxPoint& pt) { m_pointDrag = pt; }
 
-        // keyboard data (for wxEVT_COMMAND_TREE_KEY_DOWN only)
+        // keyboard data (for wxEVT_TREE_KEY_DOWN only)
     const wxKeyEvent& GetKeyEvent() const { return m_evtKey; }
     int GetKeyCode() const { return m_evtKey.GetKeyCode(); }
     void SetKeyEvent(const wxKeyEvent& evt) { m_evtKey = evt; }
@@ -309,33 +308,33 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 // tree control events and macros for handling them
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_RDRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_GET_INFO, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SET_INFO, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_COLLAPSING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_KEY_DOWN, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_END_DRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_DRAG, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_RDRAG, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_END_LABEL_EDIT, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_DELETE_ITEM, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_GET_INFO, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SET_INFO, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_EXPANDED, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_EXPANDING, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_COLLAPSED, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_COLLAPSING, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SEL_CHANGED, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_SEL_CHANGING, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_KEY_DOWN, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_ACTIVATED, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_END_DRAG, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREE_ITEM_MENU, wxTreeEvent );
 
 #define wxTreeEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxTreeEventFunction, func)
 
 #define wx__DECLARE_TREEEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREE_ ## evt, id, wxTreeEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREE_ ## evt, id, wxTreeEventHandler(fn))
 
 // GetItem() returns the item being dragged, GetPoint() the mouse coords
 //
@@ -396,6 +395,29 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_MENU, wxTree
 // GetItem() is the item for which the tooltip is being requested
 #define EVT_TREE_ITEM_GETTOOLTIP(id, fn) wx__DECLARE_TREEEVT(ITEM_GETTOOLTIP, id, fn)
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREE_BEGIN_DRAG          wxEVT_TREE_BEGIN_DRAG
+#define wxEVT_COMMAND_TREE_BEGIN_RDRAG         wxEVT_TREE_BEGIN_RDRAG
+#define wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT    wxEVT_TREE_BEGIN_LABEL_EDIT
+#define wxEVT_COMMAND_TREE_END_LABEL_EDIT      wxEVT_TREE_END_LABEL_EDIT
+#define wxEVT_COMMAND_TREE_DELETE_ITEM         wxEVT_TREE_DELETE_ITEM
+#define wxEVT_COMMAND_TREE_GET_INFO            wxEVT_TREE_GET_INFO
+#define wxEVT_COMMAND_TREE_SET_INFO            wxEVT_TREE_SET_INFO
+#define wxEVT_COMMAND_TREE_ITEM_EXPANDED       wxEVT_TREE_ITEM_EXPANDED
+#define wxEVT_COMMAND_TREE_ITEM_EXPANDING      wxEVT_TREE_ITEM_EXPANDING
+#define wxEVT_COMMAND_TREE_ITEM_COLLAPSED      wxEVT_TREE_ITEM_COLLAPSED
+#define wxEVT_COMMAND_TREE_ITEM_COLLAPSING     wxEVT_TREE_ITEM_COLLAPSING
+#define wxEVT_COMMAND_TREE_SEL_CHANGED         wxEVT_TREE_SEL_CHANGED
+#define wxEVT_COMMAND_TREE_SEL_CHANGING        wxEVT_TREE_SEL_CHANGING
+#define wxEVT_COMMAND_TREE_KEY_DOWN            wxEVT_TREE_KEY_DOWN
+#define wxEVT_COMMAND_TREE_ITEM_ACTIVATED      wxEVT_TREE_ITEM_ACTIVATED
+#define wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK    wxEVT_TREE_ITEM_RIGHT_CLICK
+#define wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK   wxEVT_TREE_ITEM_MIDDLE_CLICK
+#define wxEVT_COMMAND_TREE_END_DRAG            wxEVT_TREE_END_DRAG
+#define wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK   wxEVT_TREE_STATE_IMAGE_CLICK
+#define wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP     wxEVT_TREE_ITEM_GETTOOLTIP
+#define wxEVT_COMMAND_TREE_ITEM_MENU           wxEVT_TREE_ITEM_MENU
+
 #endif // wxUSE_TREECTRL
 
 #endif // _WX_TREEBASE_H_
diff --git a/Externals/wxWidgets3/include/wx/treebook.h b/Externals/wxWidgets3/include/wx/treebook.h
index 86bdf0b0da..bd59338952 100644
--- a/Externals/wxWidgets3/include/wx/treebook.h
+++ b/Externals/wxWidgets3/include/wx/treebook.h
@@ -4,7 +4,6 @@
 // Author:      Evgeniy Tarassov, Vadim Zeitlin
 // Modified by:
 // Created:     2005-09-15
-// RCS-ID:      $Id: treebook.h 68810 2011-08-21 14:08:49Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,6 +16,7 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/bookctrl.h"
+#include "wx/containr.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
 
 typedef wxWindow wxTreebookPage;
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 // wxTreebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxTreebook : public wxNavigationEnabled<wxBookCtrlBase>
 {
 public:
     // Constructors and such
@@ -229,27 +229,33 @@ private:
 // ----------------------------------------------------------------------------
 
 // wxTreebookEvent is obsolete and defined for compatibility only
-typedef wxBookCtrlEvent wxTreebookEvent;
+#define wxTreebookEvent wxBookCtrlEvent
 typedef wxBookCtrlEventFunction wxTreebookEventFunction;
 #define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func)
 
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent );
 
 #define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn))
 
 #define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED     wxEVT_TREEBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING    wxEVT_TREEBOOK_PAGE_CHANGING
+#define wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED   wxEVT_TREEBOOK_NODE_COLLAPSED
+#define wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED    wxEVT_TREEBOOK_NODE_EXPANDED
 
 
 #endif // wxUSE_TREEBOOK
diff --git a/Externals/wxWidgets3/include/wx/treectrl.h b/Externals/wxWidgets3/include/wx/treectrl.h
index feefbd7638..89493c3bbb 100644
--- a/Externals/wxWidgets3/include/wx/treectrl.h
+++ b/Externals/wxWidgets3/include/wx/treectrl.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Karsten Ballueder
-// RCS-ID:      $Id: treectrl.h 70345 2012-01-15 01:05:28Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -289,10 +288,10 @@ public:
         // delete this item and associated data if any
     virtual void Delete(const wxTreeItemId& item) = 0;
         // delete all children (but don't delete the item itself)
-        // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
+        // NB: this won't send wxEVT_TREE_ITEM_DELETED events
     virtual void DeleteChildren(const wxTreeItemId& item) = 0;
         // delete all items from the tree
-        // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
+        // NB: this won't send wxEVT_TREE_ITEM_DELETED events
     virtual void DeleteAllItems() = 0;
 
         // expand this item
@@ -349,6 +348,10 @@ public:
     virtual void EndEditLabel(const wxTreeItemId& item,
                               bool discardChanges = false) = 0;
 
+        // Enable or disable beep when incremental match doesn't find any item.
+        // Only implemented in the generic version currently.
+    virtual void EnableBellOnNoMatch(bool WXUNUSED(on) = true) { }
+
     // sorting
     // -------
 
diff --git a/Externals/wxWidgets3/include/wx/treelist.h b/Externals/wxWidgets3/include/wx/treelist.h
index bb4f3b0f11..d06e35e869 100644
--- a/Externals/wxWidgets3/include/wx/treelist.h
+++ b/Externals/wxWidgets3/include/wx/treelist.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTreeListCtrl class declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-17
-// RCS-ID:      $Id: treelist.h 69619 2011-10-31 19:41:06Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,6 +46,7 @@ enum
     wxTL_CHECKBOX       = 0x0002,       // Show checkboxes in the first column.
     wxTL_3STATE         = 0x0004,       // Allow 3rd state in checkboxes.
     wxTL_USER_3STATE    = 0x0008,       // Allow user to set 3rd state.
+    wxTL_NO_HEADER      = 0x0010,       // Column titles not visible.
 
     wxTL_DEFAULT_STYLE  = wxTL_SINGLE,
     wxTL_STYLE_MASK     = wxTL_SINGLE |
@@ -453,7 +453,7 @@ private:
 // wxTreeListEvent: event generated by wxTreeListCtrl.
 // ----------------------------------------------------------------------------
 
-class wxTreeListEvent : public wxNotifyEvent
+class WXDLLIMPEXP_ADV wxTreeListEvent : public wxNotifyEvent
 {
 public:
     // Default ctor is provided for wxRTTI needs only but should never be used.
@@ -514,7 +514,7 @@ private:
 
     friend class wxTreeListCtrl;
 
-    wxDECLARE_DYNAMIC_CLASS(wxTreeListEvent);
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTreeListEvent);
 };
 
 // Event types and event table macros.
@@ -525,11 +525,11 @@ typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&);
     wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func)
 
 #define wxEVT_TREELIST_GENERIC(name, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREELIST_##name, id, wxTreeListEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREELIST_##name, id, wxTreeListEventHandler(fn))
 
 #define wxDECLARE_TREELIST_EVENT(name) \
     wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \
-                              wxEVT_COMMAND_TREELIST_##name, \
+                              wxEVT_TREELIST_##name, \
                               wxTreeListEvent)
 
 wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED);
@@ -562,6 +562,15 @@ wxDECLARE_TREELIST_EVENT(COLUMN_SORTED);
 
 #undef wxDECLARE_TREELIST_EVENT
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREELIST_SELECTION_CHANGED   wxEVT_TREELIST_SELECTION_CHANGED
+#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDING      wxEVT_TREELIST_ITEM_EXPANDING
+#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDED       wxEVT_TREELIST_ITEM_EXPANDED
+#define wxEVT_COMMAND_TREELIST_ITEM_CHECKED        wxEVT_TREELIST_ITEM_CHECKED
+#define wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED      wxEVT_TREELIST_ITEM_ACTIVATED
+#define wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU   wxEVT_TREELIST_ITEM_CONTEXT_MENU
+#define wxEVT_COMMAND_TREELIST_COLUMN_SORTED       wxEVT_TREELIST_COLUMN_SORTED
+
 #endif // wxUSE_TREELISTCTRL
 
 #endif // _WX_TREELIST_H_
diff --git a/Externals/wxWidgets3/include/wx/txtstrm.h b/Externals/wxWidgets3/include/wx/txtstrm.h
index c7376c818e..90e6bbb22a 100644
--- a/Externals/wxWidgets3/include/wx/txtstrm.h
+++ b/Externals/wxWidgets3/include/wx/txtstrm.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/1998
-// RCS-ID:      $Id: txtstrm.h 67286 2011-03-22 17:15:45Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/typeinfo.h b/Externals/wxWidgets3/include/wx/typeinfo.h
index 3eac14c2dc..a783af5d56 100644
--- a/Externals/wxWidgets3/include/wx/typeinfo.h
+++ b/Externals/wxWidgets3/include/wx/typeinfo.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTypeId implementation
 // Author:      Jaakko Salli
 // Created:     2009-11-19
-// RCS-ID:      $Id: typeinfo.h 66734 2011-01-23 10:13:49Z JMS $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/types.h b/Externals/wxWidgets3/include/wx/types.h
index 5be184cfe6..2e58582168 100644
--- a/Externals/wxWidgets3/include/wx/types.h
+++ b/Externals/wxWidgets3/include/wx/types.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: types.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/uiaction.h b/Externals/wxWidgets3/include/wx/uiaction.h
index af2b162c49..fb96523544 100644
--- a/Externals/wxWidgets3/include/wx/uiaction.h
+++ b/Externals/wxWidgets3/include/wx/uiaction.h
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
-// RCS-ID:      $Id: uiaction.h 69762 2011-11-15 15:56:55Z VZ $
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
@@ -45,7 +44,9 @@ public:
     bool MouseDblClick(int button = wxMOUSE_BTN_LEFT);
     bool MouseDragDrop(long x1, long y1, long x2, long y2,
                        int button = wxMOUSE_BTN_LEFT);
-
+    bool MouseDragDrop(const wxPoint& p1, const wxPoint& p2,
+                       int button = wxMOUSE_BTN_LEFT)
+    { return MouseDragDrop(p1.x, p1.y, p2.x, p2.y, button); }
 
     // Keyboard simulation
     // -------------------
diff --git a/Externals/wxWidgets3/include/wx/unichar.h b/Externals/wxWidgets3/include/wx/unichar.h
index 730152f938..e9726943ab 100644
--- a/Externals/wxWidgets3/include/wx/unichar.h
+++ b/Externals/wxWidgets3/include/wx/unichar.h
@@ -3,7 +3,6 @@
 // Purpose:     wxUniChar and wxUniCharRef classes
 // Author:      Vaclav Slavik
 // Created:     2007-03-19
-// RCS-ID:      $Id: unichar.h 62738 2009-11-28 14:37:03Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,17 +34,10 @@ public:
     wxUniChar(char c) { m_value = From8bit(c); }
     wxUniChar(unsigned char c) { m_value = From8bit((char)c); }
 
-    // Create the character from a wchar_t character value.
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniChar(wchar_t c) { m_value = c; }
-#endif
-
-    wxUniChar(int c) { m_value = c; }
-    wxUniChar(unsigned int c) { m_value = c; }
-    wxUniChar(long int c) { m_value = c; }
-    wxUniChar(unsigned long int c) { m_value = c; }
-    wxUniChar(short int c) { m_value = c; }
-    wxUniChar(unsigned short int c) { m_value = c; }
+#define wxUNICHAR_DEFINE_CTOR(type) \
+    wxUniChar(type c) { m_value = (value_type)c; }
+    wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_CTOR)
+#undef wxUNICHAR_DEFINE_CTOR
 
     wxUniChar(const wxUniCharRef& c);
 
@@ -94,15 +86,11 @@ public:
     // functions
     operator char() const { return To8bit(m_value); }
     operator unsigned char() const { return (unsigned char)To8bit(m_value); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    operator wchar_t() const { return (wchar_t)m_value; }
-#endif
-    operator int() const { return (int)m_value; }
-    operator unsigned int() const { return (unsigned int)m_value; }
-    operator long int() const { return (long int)m_value; }
-    operator unsigned long int() const { return (unsigned long)m_value; }
-    operator short int() const { return (short int)m_value; }
-    operator unsigned short int() const { return (unsigned short int)m_value; }
+
+#define wxUNICHAR_DEFINE_OPERATOR_PAREN(type) \
+    operator type() const { return (type)m_value; }
+    wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_OPERATOR_PAREN)
+#undef wxUNICHAR_DEFINE_OPERATOR_PAREN
 
     // We need this operator for the "*p" part of expressions like "for (
     // const_iterator p = begin() + nStart; *p; ++p )". In this case,
@@ -121,34 +109,27 @@ public:
     wxUniChar& operator=(const wxUniCharRef& c);
     wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; }
     wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; }
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
-#endif
-    wxUniChar& operator=(int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned int c) { m_value = c; return *this; }
-    wxUniChar& operator=(long int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned long int c) { m_value = c; return *this; }
-    wxUniChar& operator=(short int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned short int c) { m_value = c; return *this; }
+
+#define wxUNICHAR_DEFINE_OPERATOR_EQUAL(type) \
+    wxUniChar& operator=(type c) { m_value = (value_type)c; return *this; }
+    wxDO_FOR_INT_TYPES(wxUNICHAR_DEFINE_OPERATOR_EQUAL)
+#undef wxUNICHAR_DEFINE_OPERATOR_EQUAL
 
     // Comparison operators:
+#define wxDEFINE_UNICHAR_CMP_WITH_INT(T, op) \
+    bool operator op(T c) const { return m_value op (value_type)c; }
 
     // define the given comparison operator for all the types
 #define wxDEFINE_UNICHAR_OPERATOR(op)                                         \
     bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\
     bool operator op(char c) const { return m_value op From8bit(c); }         \
     bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \
-    wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return m_value op (value_type)c; } )    \
-    bool operator op(int c) const { return m_value op (value_type)c; }        \
-    bool operator op(unsigned int c) const { return m_value op (value_type)c; }        \
-    bool operator op(short int c) const { return m_value op (value_type)c; }  \
-    bool operator op(unsigned short int c) const { return m_value op (value_type)c; }  \
-    bool operator op(long int c) const { return m_value op (value_type)c; }   \
-    bool operator op(unsigned long int c) const { return m_value op (value_type)c; }
+    wxDO_FOR_INT_TYPES_1(wxDEFINE_UNICHAR_CMP_WITH_INT, op)
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
 
 #undef wxDEFINE_UNICHAR_OPERATOR
+#undef wxDEFINE_UNCHAR_CMP_WITH_INT
 
     // this is needed for expressions like 'Z'-c
     int operator-(const wxUniChar& c) const { return m_value - c.m_value; }
@@ -180,7 +161,7 @@ private:
 
         return ToHi8bit(c);
 #else
-        return c;
+        return wx_truncate_cast(char, c);
 #endif
     }
 
@@ -243,53 +224,35 @@ public:
     wxUniCharRef& operator=(const wxUniCharRef& c)
         { if (&c != this) *this = c.UniChar(); return *this; }
 
-    wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
-#endif
-    wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(short int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned short int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned long int c) { return *this = wxUniChar(c); }
+#define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \
+    wxUniCharRef& operator=(type c) { return *this = wxUniChar(c); }
+    wxDO_FOR_CHAR_INT_TYPES(wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL)
+#undef wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL
 
     // Conversions to the same types as wxUniChar is convertible too:
-    operator char() const { return UniChar(); }
-    operator unsigned char() const { return UniChar(); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    operator wchar_t() const { return UniChar(); }
-#endif
-    operator int() const { return UniChar(); }
-    operator unsigned int() const { return UniChar(); }
-    operator short int() const { return UniChar(); }
-    operator unsigned short int() const { return UniChar(); }
-    operator long int() const { return UniChar(); }
-    operator unsigned long int() const { return UniChar(); }
+#define wxUNICHAR_REF_DEFINE_OPERATOR_PAREN(type) \
+    operator type() const { return UniChar(); }
+    wxDO_FOR_CHAR_INT_TYPES(wxUNICHAR_REF_DEFINE_OPERATOR_PAREN)
+#undef wxUNICHAR_REF_DEFINE_OPERATOR_PAREN
 
     // see wxUniChar::operator bool etc. for explanation
     operator bool() const { return (bool)UniChar(); }
     bool operator!() const { return !UniChar(); }
     bool operator&&(bool v) const { return UniChar() && v; }
 
+#define wxDEFINE_UNICHARREF_CMP_WITH_INT(T, op) \
+    bool operator op(T c) const { return UniChar() op c; }
+
     // Comparison operators:
 #define wxDEFINE_UNICHARREF_OPERATOR(op)                                      \
     bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\
     bool operator op(const wxUniChar& c) const { return UniChar() op c; }     \
-    bool operator op(char c) const { return UniChar() op c; }                 \
-    bool operator op(unsigned char c) const { return UniChar() op c; }        \
-    wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return UniChar() op c; } ) \
-    bool operator op(int c) const { return UniChar() op c; }                  \
-    bool operator op(unsigned int c) const { return UniChar() op c; }         \
-    bool operator op(short int c) const { return UniChar() op c; }             \
-    bool operator op(unsigned short int c) const { return UniChar() op c; }    \
-    bool operator op(long int c) const { return UniChar() op c; }             \
-    bool operator op(unsigned long int c) const { return UniChar() op c; }
+    wxDO_FOR_CHAR_INT_TYPES_1(wxDEFINE_UNICHARREF_CMP_WITH_INT, op)
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
 
 #undef wxDEFINE_UNICHARREF_OPERATOR
+#undef wxDEFINE_UNICHARREF_CMP_WITH_INT
 
     // for expressions like c-'A':
     int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); }
@@ -329,17 +292,13 @@ inline wxUniChar& wxUniChar::operator=(const wxUniCharRef& c)
 // Comparison operators for the case when wxUniChar(Ref) is the second operand
 // implemented in terms of member comparison functions
 
-#define wxCMP_REVERSE(c1, c2, op) c2 op c1
+wxDEFINE_COMPARISONS_BY_REV(char, const wxUniChar&)
+wxDEFINE_COMPARISONS_BY_REV(char, const wxUniCharRef&)
 
-wxDEFINE_COMPARISONS(char, const wxUniChar&, wxCMP_REVERSE)
-wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE)
+wxDEFINE_COMPARISONS_BY_REV(wchar_t, const wxUniChar&)
+wxDEFINE_COMPARISONS_BY_REV(wchar_t, const wxUniCharRef&)
 
-wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
-wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
-
-wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE)
-
-#undef wxCMP_REVERSE
+wxDEFINE_COMPARISONS_BY_REV(const wxUniChar&, const wxUniCharRef&)
 
 // for expressions like c-'A':
 inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); }
diff --git a/Externals/wxWidgets3/include/wx/unix/app.h b/Externals/wxWidgets3/include/wx/unix/app.h
index bcca5afb95..f14df9ec3f 100644
--- a/Externals/wxWidgets3/include/wx/unix/app.h
+++ b/Externals/wxWidgets3/include/wx/unix/app.h
@@ -3,7 +3,6 @@
 // Purpose:     wxAppConsole implementation for Unix
 // Author:      Lukasz Michalski
 // Created:     28/01/2005
-// RCS-ID:      $Id: app.h 56994 2008-11-28 12:47:07Z VZ $
 // Copyright:   (c) Lukasz Michalski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,10 +10,17 @@
 //Ensure that sigset_t is being defined
 #include <signal.h>
 
+class wxFDIODispatcher;
+class wxFDIOHandler;
+class wxWakeUpPipe;
+
 // wxApp subclass implementing event processing for console applications
 class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBase
 {
 public:
+    wxAppConsole();
+    virtual ~wxAppConsole();
+
     // override base class initialization
     virtual bool Initialize(int& argc, wxChar** argv);
 
@@ -38,6 +44,14 @@ public:
     // handlers for them
     void CheckSignal();
 
+    // Register the signal wake up pipe with the given dispatcher.
+    //
+    // This is used by wxExecute(wxEXEC_NOEVENTS) implementation only.
+    //
+    // The pointer to the handler used for processing events on this descriptor
+    // is returned so that it can be deleted when we no longer needed it.
+    wxFDIOHandler* RegisterSignalWakeUpPipe(wxFDIODispatcher& dispatcher);
+
 private:
     // signal handler set up by SetSignalHandler() for all signals we handle,
     // it just adds the signal to m_signalsCaught -- the real processing is
@@ -52,4 +66,8 @@ private:
     // the signal handlers
     WX_DECLARE_HASH_MAP(int, SignalHandler, wxIntegerHash, wxIntegerEqual, SignalHandlerHash);
     SignalHandlerHash m_signalHandlerHash;
+
+    // pipe used for wake up signal handling: if a signal arrives while we're
+    // blocking for input, writing to this pipe triggers a call to our CheckSignal()
+    wxWakeUpPipe *m_signalWakeUpPipe;
 };
diff --git a/Externals/wxWidgets3/include/wx/unix/apptbase.h b/Externals/wxWidgets3/include/wx/unix/apptbase.h
index a6e6021dbc..6ce6f152c3 100644
--- a/Externals/wxWidgets3/include/wx/unix/apptbase.h
+++ b/Externals/wxWidgets3/include/wx/unix/apptbase.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.06.2003
-// RCS-ID:      $Id: apptbase.h 61688 2009-08-17 23:02:46Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,9 +11,12 @@
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 
-struct wxEndProcessData;
-struct wxExecuteData;
+#include "wx/evtloop.h"
+#include "wx/evtloopsrc.h"
+
+class wxExecuteData;
 class wxFDIOManager;
+class wxEventLoopSourcesManagerBase;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code
@@ -26,23 +28,13 @@ public:
     // wxExecute() support methods
     // ---------------------------
 
-    // wait for the process termination, return whatever wxExecute() must
-    // return
+    // Wait for the process termination and return its exit code or -1 on error.
     //
-    // base class implementation handles all cases except wxEXEC_SYNC without
-    // wxEXEC_NOEVENTS one which is implemented at the GUI level
+    // Notice that this is only used when execData.flags contains wxEXEC_SYNC
+    // and does not contain wxEXEC_NOEVENTS, i.e. when we need to really wait
+    // until the child process exit and dispatch the events while doing it.
     virtual int WaitForChild(wxExecuteData& execData);
 
-    // integrate the monitoring of the given fd with the port-specific event
-    // loop: when this fd, which corresponds to a dummy pipe opened between the
-    // parent and child processes, is closed by the child, the parent is
-    // notified about this via a call to wxHandleProcessTermination() function
-    //
-    // the default implementation uses wxFDIODispatcher and so is suitable for
-    // the console applications or ports which don't have any specific event
-    // loop
-    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
-
 #if wxUSE_SOCKETS
     // return a pointer to the object which should be used to integrate
     // monitoring of the file descriptors to the event loop (currently this is
@@ -56,11 +48,19 @@ public:
     virtual wxFDIOManager *GetFDIOManager();
 #endif // wxUSE_SOCKETS
 
+#if wxUSE_CONSOLE_EVENTLOOP
+    // Return a non-NULL pointer to the object responsible for managing the
+    // event loop sources in this kind of application.
+    virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
 protected:
-    // a helper for the implementation of WaitForChild() in wxGUIAppTraits:
-    // checks the streams used for redirected IO in execData and returns true
-    // if there is any activity in them
-    bool CheckForRedirectedIO(wxExecuteData& execData);
+    // Wait for the process termination by running the given event loop until
+    // this happens.
+    //
+    // This is used by the public WaitForChild() after creating the event loop
+    // of the appropriate kind.
+    int RunLoopUntilChildExit(wxExecuteData& execData, wxEventLoopBase& loop);
 };
 
 #endif // _WX_UNIX_APPTBASE_H_
diff --git a/Externals/wxWidgets3/include/wx/unix/apptrait.h b/Externals/wxWidgets3/include/wx/unix/apptrait.h
index 533b771f6a..3fbe4d82da 100644
--- a/Externals/wxWidgets3/include/wx/unix/apptrait.h
+++ b/Externals/wxWidgets3/include/wx/unix/apptrait.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.06.2003
-// RCS-ID:      $Id: apptrait.h 61688 2009-08-17 23:02:46Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,9 +50,6 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
-#ifdef wxHAS_GUI_PROCESS_CALLBACKS
-    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
-#endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -67,10 +63,6 @@ public:
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
-#if defined(__WXGTK__) && wxUSE_INTL
-    virtual void SetLocale();
-#endif // __WXGTK__
-
 #ifdef __WXGTK20__
     virtual wxString GetDesktopEnvironment() const;
     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
@@ -92,6 +84,8 @@ public:
 #endif
 
 #endif // wxUSE_SOCKETS
+
+    virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
 };
 
 #endif // wxUSE_GUI
diff --git a/Externals/wxWidgets3/include/wx/unix/chkconf.h b/Externals/wxWidgets3/include/wx/unix/chkconf.h
index c6b9133701..b8a1904133 100644
--- a/Externals/wxWidgets3/include/wx/unix/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/unix/chkconf.h
@@ -3,7 +3,6 @@
  * Purpose:     Unix-specific config settings consistency checks
  * Author:      Vadim Zeitlin
  * Created:     2007-07-14
- * RCS-ID:      $Id: chkconf.h 63306 2010-01-29 13:07:26Z VZ $
  * Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
diff --git a/Externals/wxWidgets3/include/wx/unix/evtloop.h b/Externals/wxWidgets3/include/wx/unix/evtloop.h
index 68921913d0..2b91c72375 100644
--- a/Externals/wxWidgets3/include/wx/unix/evtloop.h
+++ b/Externals/wxWidgets3/include/wx/unix/evtloop.h
@@ -3,7 +3,6 @@
 // Purpose:     declares wxEventLoop class
 // Author:      Lukasz Michalski (lm@zork.pl)
 // Created:     2007-05-07
-// RCS-ID:      $Id: evtloop.h 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) 2007 Lukasz Michalski
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,13 +16,9 @@
 // wxConsoleEventLoop
 // ----------------------------------------------------------------------------
 
+class wxEventLoopSource;
 class wxFDIODispatcher;
-class wxUnixEventLoopSource;
-
-namespace wxPrivate
-{
-    class PipeIOHandler;
-}
+class wxWakeUpPipeMT;
 
 class WXDLLIMPEXP_BASE wxConsoleEventLoop
 #ifdef __WXOSX__
@@ -45,18 +40,16 @@ public:
     virtual bool IsOk() const { return m_dispatcher != NULL; }
     virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
 
-#if wxUSE_EVENTLOOP_SOURCE
-    virtual wxEventLoopSource *
-      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
-#endif // wxUSE_EVENTLOOP_SOURCE
-
 protected:
     virtual void OnNextIteration();
 
 private:
     // pipe used for wake up messages: when a child thread wants to wake up
     // the event loop in the main thread it writes to this pipe
-    wxPrivate::PipeIOHandler *m_wakeupPipe;
+    wxWakeUpPipeMT *m_wakeupPipe;
+
+    // the event loop source used to monitor this pipe
+    wxEventLoopSource* m_wakeupSource;
 
     // either wxSelectDispatcher or wxEpollDispatcher
     wxFDIODispatcher *m_dispatcher;
diff --git a/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h b/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h
index 47b58a7ffc..4c2cfec167 100644
--- a/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h
+++ b/Externals/wxWidgets3/include/wx/unix/evtloopsrc.h
@@ -3,7 +3,6 @@
 // Purpose:     wxUnixEventLoopSource class
 // Author:      Vadim Zeitlin
 // Created:     2009-10-21
-// RCS-ID:      $Id: evtloopsrc.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/execute.h b/Externals/wxWidgets3/include/wx/unix/execute.h
index c27ec3ba76..9756c00a7d 100644
--- a/Externals/wxWidgets3/include/wx/unix/execute.h
+++ b/Externals/wxWidgets3/include/wx/unix/execute.h
@@ -2,65 +2,56 @@
 // Name:        wx/unix/execute.h
 // Purpose:     private details of wxExecute() implementation
 // Author:      Vadim Zeitlin
-// Id:          $Id: execute.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin
+//              (c) 2013 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_EXECUTE_H
 #define _WX_UNIX_EXECUTE_H
 
-#include "wx/unix/pipe.h"
+#include "wx/app.h"
+#include "wx/hashmap.h"
+#include "wx/process.h"
 
-class WXDLLIMPEXP_FWD_BASE wxProcess;
-class wxStreamTempInputBuffer;
+#if wxUSE_STREAMS
+    #include "wx/unix/pipe.h"
+    #include "wx/private/streamtempinput.h"
+#endif
 
-struct wxEndProcessData
-{
-    wxEndProcessData()
-    {
-        pid =
-        tag =
-        exitcode = -1;
-        process = NULL;
-        async = false;
-    }
-
-    int pid;                // pid of the process
-    int tag;                // port dependent value
-    wxProcess *process;     // if !NULL: notified on process termination
-    int exitcode;           // the exit code
-    bool async;             // if true, delete us on process termination
-};
-
-// struct in which information is passed from wxExecute() to wxAppTraits
-// methods
-struct wxExecuteData
+class wxEventLoopBase;
+
+// Information associated with a running child process.
+class wxExecuteData
 {
+public:
     wxExecuteData()
     {
         flags =
         pid = 0;
+        exitcode = -1;
 
         process = NULL;
 
-#if wxUSE_STREAMS
-        bufOut =
-        bufErr = NULL;
+        syncEventLoop = NULL;
 
+#if wxUSE_STREAMS
         fdOut =
         fdErr = wxPipe::INVALID_FD;
 #endif // wxUSE_STREAMS
     }
 
-    // get the FD corresponding to the read end of the process end detection
-    // pipe and close the write one
-    int GetEndProcReadFD()
-    {
-        const int fd = pipeEndProcDetect.Detach(wxPipe::Read);
-        pipeEndProcDetect.Close();
-        return fd;
-    }
+    // This must be called in the parent process as soon as fork() returns to
+    // update us with the effective child PID. It also ensures that we handle
+    // SIGCHLD to be able to detect when this PID exits, so wxTheApp must be
+    // available.
+    void OnStart(int pid);
+
+    // Called when the child process exits.
+    void OnExit(int exitcode);
+
+    // Return true if we should (or already did) redirect the child IO.
+    bool IsRedirected() const { return process && process->IsRedirected(); }
 
 
     // wxExecute() flags
@@ -69,26 +60,43 @@ struct wxExecuteData
     // the pid of the child process
     int pid;
 
+    // The exit code of the process, set once the child terminates.
+    int exitcode;
+
     // the associated process object or NULL
     wxProcess *process;
 
-    // pipe used for end process detection
-    wxPipe pipeEndProcDetect;
+    // Local event loop used to wait for the child process termination in
+    // synchronous execution case. We can't create it ourselves as its exact
+    // type depends on the application kind (console/GUI), so we rely on
+    // wxAppTraits setting up this pointer to point to the appropriate object.
+    wxEventLoopBase *syncEventLoop;
 
 #if wxUSE_STREAMS
     // the input buffer bufOut is connected to stdout, this is why it is
     // called bufOut and not bufIn
-    wxStreamTempInputBuffer *bufOut,
-                            *bufErr;
+    wxStreamTempInputBuffer bufOut,
+                            bufErr;
 
     // the corresponding FDs, -1 if not redirected
     int fdOut,
         fdErr;
 #endif // wxUSE_STREAMS
+
+
+private:
+    // SIGCHLD signal handler that checks whether any of the currently running
+    // children have exited.
+    static void OnSomeChildExited(int sig);
+
+    // All currently running child processes indexed by their PID.
+    //
+    // Notice that the container doesn't own its elements.
+    WX_DECLARE_HASH_MAP(int, wxExecuteData*, wxIntegerHash, wxIntegerEqual,
+                        ChildProcessesData);
+    static ChildProcessesData ms_childProcesses;
+
+    wxDECLARE_NO_COPY_CLASS(wxExecuteData);
 };
 
-// this function is called when the process terminates from port specific
-// callback function and is common to all ports (src/unix/utilsunx.cpp)
-extern WXDLLIMPEXP_BASE void wxHandleProcessTermination(wxEndProcessData *proc_data);
-
 #endif // _WX_UNIX_EXECUTE_H
diff --git a/Externals/wxWidgets3/include/wx/unix/fontutil.h b/Externals/wxWidgets3/include/wx/unix/fontutil.h
index 503502f50e..64cb3a3ccd 100644
--- a/Externals/wxWidgets3/include/wx/unix/fontutil.h
+++ b/Externals/wxWidgets3/include/wx/unix/fontutil.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id: fontutil.h 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h b/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h
index 49a6381b99..1881966053 100644
--- a/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h
+++ b/Externals/wxWidgets3/include/wx/unix/fswatcher_inotify.h
@@ -3,7 +3,6 @@
 // Purpose:     wxInotifyFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_inotify.h 62474 2009-10-22 11:35:43Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,8 @@ public:
 
     virtual ~wxInotifyFileSystemWatcher();
 
+    void OnDirDeleted(const wxString& path);
+
 protected:
     bool Init();
 };
diff --git a/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h b/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h
index 303922db94..a324eb7efd 100644
--- a/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h
+++ b/Externals/wxWidgets3/include/wx/unix/fswatcher_kqueue.h
@@ -3,7 +3,6 @@
 // Purpose:     wxKqueueFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_kqueue.h 62474 2009-10-22 11:35:43Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/glx11.h b/Externals/wxWidgets3/include/wx/unix/glx11.h
index 66e945fa3c..34ed4dd46d 100644
--- a/Externals/wxWidgets3/include/wx/unix/glx11.h
+++ b/Externals/wxWidgets3/include/wx/unix/glx11.h
@@ -3,7 +3,6 @@
 // Purpose:     class common for all X11-based wxGLCanvas implementations
 // Author:      Vadim Zeitlin
 // Created:     2007-04-15
-// RCS-ID:      $Id: glx11.h 54022 2008-06-08 00:12:12Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/joystick.h b/Externals/wxWidgets3/include/wx/unix/joystick.h
index 498e36a4c5..ef7a5db223 100644
--- a/Externals/wxWidgets3/include/wx/unix/joystick.h
+++ b/Externals/wxWidgets3/include/wx/unix/joystick.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: joystick.h 50443 2007-12-03 02:55:14Z PC $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/mimetype.h b/Externals/wxWidgets3/include/wx/unix/mimetype.h
index 18876579a7..df76534aa5 100644
--- a/Externals/wxWidgets3/include/wx/unix/mimetype.h
+++ b/Externals/wxWidgets3/include/wx/unix/mimetype.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id: mimetype.h 62356 2009-10-09 17:39:19Z PC $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/pipe.h b/Externals/wxWidgets3/include/wx/unix/pipe.h
index ae698a8f05..1bde4228a7 100644
--- a/Externals/wxWidgets3/include/wx/unix/pipe.h
+++ b/Externals/wxWidgets3/include/wx/unix/pipe.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
-// RCS-ID:      $Id: pipe.h 66152 2010-11-14 14:04:37Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,7 @@
 #define _WX_UNIX_PIPE_H_
 
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "wx/log.h"
 #include "wx/intl.h"
@@ -44,7 +44,7 @@ public:
     {
         if ( pipe(m_fds) == -1 )
         {
-            wxLogSysError(_("Pipe creation failed"));
+            wxLogSysError(wxGetTranslation("Pipe creation failed"));
 
             return false;
         }
@@ -98,41 +98,5 @@ private:
     int m_fds[2];
 };
 
-#if wxUSE_STREAMS && wxUSE_FILE
-
-#include "wx/wfstream.h"
-
-// ----------------------------------------------------------------------------
-// wxPipeInputStream: stream for reading from a pipe
-// ----------------------------------------------------------------------------
-
-class wxPipeInputStream : public wxFileInputStream
-{
-public:
-    wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
-
-    // return TRUE if the pipe is still opened
-    bool IsOpened() const { return !Eof(); }
-
-    // return TRUE if we have anything to read, don't block
-    virtual bool CanRead() const;
-};
-
-// ----------------------------------------------------------------------------
-// wxPipeOutputStream: stream for writing to a pipe
-// ----------------------------------------------------------------------------
-
-class wxPipeOutputStream : public wxFileOutputStream
-{
-public:
-    wxPipeOutputStream(int fd) : wxFileOutputStream(fd) { }
-
-    // Override the base class version to ignore "pipe full" errors: this is
-    // not an error for this class.
-    size_t OnSysWrite(const void *buffer, size_t size);
-};
-
-#endif // wxUSE_STREAMS && wxUSE_FILE
-
 #endif // _WX_UNIX_PIPE_H_
 
diff --git a/Externals/wxWidgets3/include/wx/unix/private.h b/Externals/wxWidgets3/include/wx/unix/private.h
index de839f01f9..fafc5435db 100644
--- a/Externals/wxWidgets3/include/wx/unix/private.h
+++ b/Externals/wxWidgets3/include/wx/unix/private.h
@@ -3,7 +3,6 @@
 // Purpose:     miscellaneous private things for Unix wx ports
 // Author:      Vadim Zeitlin
 // Created:     2005-09-25
-// RCS-ID:      $Id: private.h 56927 2008-11-23 01:52:20Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h b/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h
index 79d0334559..c73411f221 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/epolldispatcher.h
@@ -4,7 +4,6 @@
 // Authors:     Lukasz Michalski
 // Created:     April 2007
 // Copyright:   (c) Lukasz Michalski
-// RCS-ID:      $Id: epolldispatcher.h 67254 2011-03-20 00:14:35Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h b/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h
new file mode 100644
index 0000000000..2a7c2d7aa3
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/unix/private/executeiohandler.h
@@ -0,0 +1,136 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/unix/private/executeiohandler.h
+// Purpose:     IO handler class for the FD used by wxExecute() under Unix
+// Author:      Rob Bresalier, Vadim Zeitlin
+// Created:     2013-01-06
+// Copyright:   (c) 2013 Rob Bresalier, Vadim Zeitlin
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
+#define _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
+
+#include "wx/private/streamtempinput.h"
+
+// This class handles IO events on the pipe FD connected to the child process
+// stdout/stderr and is used by wxExecute().
+//
+// Currently it can derive from either wxEventLoopSourceHandler or
+// wxFDIOHandler depending on the kind of dispatcher/event loop it is used
+// with. In the future, when we get rid of wxFDIOHandler entirely, it will
+// derive from wxEventLoopSourceHandler only.
+template <class T>
+class wxExecuteIOHandlerBase : public T
+{
+public:
+    wxExecuteIOHandlerBase(int fd, wxStreamTempInputBuffer& buf)
+        : m_fd(fd),
+          m_buf(buf)
+    {
+        m_callbackDisabled = false;
+    }
+
+    // Called when the associated descriptor is available for reading.
+    virtual void OnReadWaiting()
+    {
+        // Sync process, process all data coming at us from the pipe so that
+        // the pipe does not get full and cause a deadlock situation.
+        m_buf.Update();
+
+        if ( m_buf.Eof() )
+            DisableCallback();
+    }
+
+    // These methods are never called as we only monitor the associated FD for
+    // reading, but we still must implement them as they're pure virtual in the
+    // base class.
+    virtual void OnWriteWaiting() { }
+    virtual void OnExceptionWaiting() { }
+
+    // Disable any future calls to our OnReadWaiting(), can be called when
+    // we're sure that no more input is forthcoming.
+    void DisableCallback()
+    {
+        if ( !m_callbackDisabled )
+        {
+            m_callbackDisabled = true;
+
+            DoDisable();
+        }
+    }
+
+protected:
+    const int m_fd;
+
+private:
+    virtual void DoDisable() = 0;
+
+    wxStreamTempInputBuffer& m_buf;
+
+    // If true, DisableCallback() had been already called.
+    bool m_callbackDisabled;
+
+    wxDECLARE_NO_COPY_CLASS(wxExecuteIOHandlerBase);
+};
+
+// This is the version used with wxFDIODispatcher, which must be passed to the
+// ctor in order to register this handler with it.
+class wxExecuteFDIOHandler : public wxExecuteIOHandlerBase<wxFDIOHandler>
+{
+public:
+    wxExecuteFDIOHandler(wxFDIODispatcher& dispatcher,
+                         int fd,
+                         wxStreamTempInputBuffer& buf)
+        : wxExecuteIOHandlerBase<wxFDIOHandler>(fd, buf),
+          m_dispatcher(dispatcher)
+    {
+        dispatcher.RegisterFD(fd, this, wxFDIO_INPUT);
+    }
+
+    virtual ~wxExecuteFDIOHandler()
+    {
+        DisableCallback();
+    }
+
+private:
+    virtual void DoDisable()
+    {
+        m_dispatcher.UnregisterFD(m_fd);
+    }
+
+    wxFDIODispatcher& m_dispatcher;
+
+    wxDECLARE_NO_COPY_CLASS(wxExecuteFDIOHandler);
+};
+
+// And this is the version used with an event loop. As AddSourceForFD() is
+// static, we don't require passing the event loop to the ctor but an event
+// loop must be running to handle our events.
+class wxExecuteEventLoopSourceHandler
+    : public wxExecuteIOHandlerBase<wxEventLoopSourceHandler>
+{
+public:
+    wxExecuteEventLoopSourceHandler(int fd, wxStreamTempInputBuffer& buf)
+        : wxExecuteIOHandlerBase<wxEventLoopSourceHandler>(fd, buf)
+    {
+        m_source = wxEventLoop::AddSourceForFD(fd, this, wxEVENT_SOURCE_INPUT);
+    }
+
+    virtual ~wxExecuteEventLoopSourceHandler()
+    {
+        DisableCallback();
+    }
+
+private:
+    virtual void DoDisable()
+    {
+        delete m_source;
+        m_source = NULL;
+    }
+
+    wxEventLoopSource* m_source;
+
+    wxDECLARE_NO_COPY_CLASS(wxExecuteEventLoopSourceHandler);
+};
+
+#endif // _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
diff --git a/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h b/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h
index b4681b9ef1..2807821e19 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/fdiounix.h
@@ -3,7 +3,6 @@
 // Purpose:     wxFDIOManagerUnix class used by console Unix applications
 // Author:      Vadim Zeitlin
 // Created:     2009-08-17
-// RCS-ID:      $Id: fdiounix.h 64140 2010-04-25 21:33:16Z FM $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h
index b850153e69..249450eb50 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_inotify.h
@@ -3,7 +3,6 @@
 // Purpose:     File system watcher impl classes
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_inotify.h 62475 2009-10-22 11:36:35Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h
index 744277491c..de3d489a38 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/fswatcher_kqueue.h
@@ -3,7 +3,6 @@
 // Purpose:     File system watcher impl classes
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_kqueue.h 62475 2009-10-22 11:36:35Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/private/pipestream.h b/Externals/wxWidgets3/include/wx/unix/private/pipestream.h
new file mode 100644
index 0000000000..313a271741
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/unix/private/pipestream.h
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/unix/private/pipestream.h
+// Purpose:     Unix wxPipeInputStream and wxPipeOutputStream declarations
+// Author:      Vadim Zeitlin
+// Created:     2013-06-08 (extracted from wx/unix/pipe.h)
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIX_PRIVATE_PIPESTREAM_H_
+#define _WX_UNIX_PRIVATE_PIPESTREAM_H_
+
+#include "wx/wfstream.h"
+
+class wxPipeInputStream : public wxFileInputStream
+{
+public:
+    wxEXPLICIT wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
+
+    // return true if the pipe is still opened
+    bool IsOpened() const { return !Eof(); }
+
+    // return true if we have anything to read, don't block
+    virtual bool CanRead() const;
+};
+
+class wxPipeOutputStream : public wxFileOutputStream
+{
+public:
+    wxPipeOutputStream(int fd) : wxFileOutputStream(fd) { }
+
+    // Override the base class version to ignore "pipe full" errors: this is
+    // not an error for this class.
+    size_t OnSysWrite(const void *buffer, size_t size);
+};
+
+#endif // _WX_UNIX_PRIVATE_PIPESTREAM_H_
diff --git a/Externals/wxWidgets3/include/wx/unix/private/sockunix.h b/Externals/wxWidgets3/include/wx/unix/private/sockunix.h
index d17e06a9c2..642ef43bfa 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/sockunix.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/sockunix.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSocketImpl implementation for Unix systems
 // Authors:     Guilhem Lavaux, Vadim Zeitlin
 // Created:     April 1997
-// RCS-ID:      $Id: sockunix.h 65581 2010-09-21 11:56:53Z VZ $
 // Copyright:   (c) 1997 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/unix/private/timer.h b/Externals/wxWidgets3/include/wx/unix/private/timer.h
index 764f3a9954..6275b53d91 100644
--- a/Externals/wxWidgets3/include/wx/unix/private/timer.h
+++ b/Externals/wxWidgets3/include/wx/unix/private/timer.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTimer for wxBase (unix)
 // Author:      Lukasz Michalski
 // Created:     15/01/2005
-// RCS-ID:      $Id: timer.h 69839 2011-11-27 19:50:33Z VZ $
 // Copyright:   (c) Lukasz Michalski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h b/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h
new file mode 100644
index 0000000000..a601478a9f
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/unix/private/wakeuppipe.h
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/unix/private/wakeuppipe.h
+// Purpose:     Helper class allowing to wake up the main thread.
+// Author:      Vadim Zeitlin
+// Created:     2013-06-09 (extracted from src/unix/evtloopunix.cpp)
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
+#define _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
+
+#include "wx/unix/pipe.h"
+#include "wx/evtloopsrc.h"
+
+// ----------------------------------------------------------------------------
+// wxWakeUpPipe: allows to wake up the event loop by writing to it
+// ----------------------------------------------------------------------------
+
+// This class is not MT-safe, see wxWakeUpPipeMT below for a wake up pipe
+// usable from other threads.
+
+class wxWakeUpPipe : public wxEventLoopSourceHandler
+{
+public:
+    // Create and initialize the pipe.
+    //
+    // It's the callers responsibility to add the read end of this pipe,
+    // returned by GetReadFd(), to the code blocking on input.
+    wxWakeUpPipe();
+
+    // Wake up the blocking operation involving this pipe.
+    //
+    // It simply writes to the write end of the pipe.
+    //
+    // As indicated by its name, this method does no locking and so can be
+    // called only from the main thread.
+    void WakeUpNoLock();
+
+    // Same as WakeUp() but without locking.
+
+    // Return the read end of the pipe.
+    int GetReadFd() { return m_pipe[wxPipe::Read]; }
+
+
+    // Implement wxEventLoopSourceHandler pure virtual methods
+    virtual void OnReadWaiting();
+    virtual void OnWriteWaiting() { }
+    virtual void OnExceptionWaiting() { }
+
+private:
+    wxPipe m_pipe;
+
+    // This flag is set to true after writing to the pipe and reset to false
+    // after reading from it in the main thread. Having it allows us to avoid
+    // overflowing the pipe with too many writes if the main thread can't keep
+    // up with reading from it.
+    bool m_pipeIsEmpty;
+};
+
+// ----------------------------------------------------------------------------
+// wxWakeUpPipeMT: thread-safe version of wxWakeUpPipe
+// ----------------------------------------------------------------------------
+
+// This class can be used from multiple threads, i.e. its WakeUp() can be
+// called concurrently.
+#if wxUSE_THREADS
+
+class wxWakeUpPipeMT : public wxWakeUpPipe
+{
+public:
+    wxWakeUpPipeMT() { }
+
+    // Thread-safe wrapper around WakeUpNoLock(): can be called from another
+    // thread to wake up the main one.
+    void WakeUp()
+    {
+        wxCriticalSectionLocker lock(m_pipeLock);
+
+        WakeUpNoLock();
+    }
+
+    virtual void OnReadWaiting()
+    {
+        wxCriticalSectionLocker lock(m_pipeLock);
+
+        wxWakeUpPipe::OnReadWaiting();
+    }
+
+private:
+    // Protects access to m_pipeIsEmpty.
+    wxCriticalSection m_pipeLock;
+};
+
+#else // !wxUSE_THREADS
+
+typedef wxWakeUpPipe wxWakeUpPipeMT;
+
+#endif // wxUSE_THREADS/!wxUSE_THREADS
+
+#endif // _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
diff --git a/Externals/wxWidgets3/include/wx/unix/sound.h b/Externals/wxWidgets3/include/wx/unix/sound.h
index d2f2220b5b..76efeae3dc 100644
--- a/Externals/wxWidgets3/include/wx/unix/sound.h
+++ b/Externals/wxWidgets3/include/wx/unix/sound.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98
-// RCS-ID:      $Id: sound.h 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Julian Smart, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/stackwalk.h b/Externals/wxWidgets3/include/wx/unix/stackwalk.h
index 666bd377f7..e99741934a 100644
--- a/Externals/wxWidgets3/include/wx/unix/stackwalk.h
+++ b/Externals/wxWidgets3/include/wx/unix/stackwalk.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-19
-// RCS-ID:      $Id: stackwalk.h 58093 2009-01-14 14:38:00Z FM $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/stdpaths.h b/Externals/wxWidgets3/include/wx/unix/stdpaths.h
index 338866248d..2f111992a3 100644
--- a/Externals/wxWidgets3/include/wx/unix/stdpaths.h
+++ b/Externals/wxWidgets3/include/wx/unix/stdpaths.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: stdpaths.h 53094 2008-04-08 13:52:39Z JS $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,6 +50,11 @@ public:
     virtual wxString GetDocumentsDir() const;
 #endif
 
+protected:
+    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
+    // objects of this class directly.
+    wxStandardPaths() { }
+
 private:
     wxString m_prefix;
 };
diff --git a/Externals/wxWidgets3/include/wx/unix/taskbarx11.h b/Externals/wxWidgets3/include/wx/unix/taskbarx11.h
index df30f94183..02a9200941 100644
--- a/Externals/wxWidgets3/include/wx/unix/taskbarx11.h
+++ b/Externals/wxWidgets3/include/wx/unix/taskbarx11.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     04/04/2003
-// RCS-ID:      $Id: taskbarx11.h 62789 2009-12-05 19:57:58Z PC $
 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/tls.h b/Externals/wxWidgets3/include/wx/unix/tls.h
index 8dcd51bceb..ce61e6fff7 100644
--- a/Externals/wxWidgets3/include/wx/unix/tls.h
+++ b/Externals/wxWidgets3/include/wx/unix/tls.h
@@ -3,7 +3,6 @@
 // Purpose:     Pthreads implementation of wxTlsValue<>
 // Author:      Vadim Zeitlin
 // Created:     2008-08-08
-// RCS-ID:      $Id: tls.h 63653 2010-03-08 12:21:58Z VS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/unix/utilsx11.h b/Externals/wxWidgets3/include/wx/unix/utilsx11.h
index 32f83827e9..29898372fa 100644
--- a/Externals/wxWidgets3/include/wx/unix/utilsx11.h
+++ b/Externals/wxWidgets3/include/wx/unix/utilsx11.h
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon, Vaclav Slavik, Vadim Zeitlin
 // Modified by:
 // Created:     25.03.02
-// RCS-ID:      $Id: utilsx11.h 65397 2010-08-24 11:23:22Z JJ $
 // Copyright:   (c) wxWidgets team
 //              (c) 2010 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/uri.h b/Externals/wxWidgets3/include/wx/uri.h
index 27b941437a..758bd72e27 100644
--- a/Externals/wxWidgets3/include/wx/uri.h
+++ b/Externals/wxWidgets3/include/wx/uri.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 //              Vadim Zeitlin (UTF-8 URI support, many other changes)
 // Created:     07/01/2004
-// RCS-ID:      $Id: uri.h 54727 2008-07-20 12:57:47Z VZ $
 // Copyright:   (c) 2004 Ryan Norton
 //                  2008 Vadim Zeitlin
 // Licence:     wxWindows Licence
diff --git a/Externals/wxWidgets3/include/wx/url.h b/Externals/wxWidgets3/include/wx/url.h
index 65bd493383..572cae8b11 100644
--- a/Externals/wxWidgets3/include/wx/url.h
+++ b/Externals/wxWidgets3/include/wx/url.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Ryan Norton
 // Created:     20/07/1997
-// RCS-ID:      $Id: url.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/ustring.h b/Externals/wxWidgets3/include/wx/ustring.h
index d888d77d49..7c58fddd8a 100644
--- a/Externals/wxWidgets3/include/wx/ustring.h
+++ b/Externals/wxWidgets3/include/wx/ustring.h
@@ -3,7 +3,6 @@
 // Purpose:     32-bit string (UCS-4)
 // Author:      Robert Roebling
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: ustring.h 66654 2011-01-08 17:33:51Z PC $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/include/wx/utils.h b/Externals/wxWidgets3/include/wx/utils.h
index bccc7411a8..92701eae15 100644
--- a/Externals/wxWidgets3/include/wx/utils.h
+++ b/Externals/wxWidgets3/include/wx/utils.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: utils.h 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -54,7 +53,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 class WXDLLIMPEXP_FWD_BASE wxProcess;
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxWindowList;
+class wxWindowList;
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 // ----------------------------------------------------------------------------
@@ -130,12 +129,7 @@ wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2)
 // ----------------------------------------------------------------------------
 
 // Sound the bell
-#if !defined __EMX__ && \
-    (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__)
 WXDLLIMPEXP_CORE void wxBell();
-#else
-WXDLLIMPEXP_BASE void wxBell();
-#endif
 
 #if wxUSE_MSGDLG
 // Show wxWidgets information
@@ -278,13 +272,13 @@ inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); }
 // ----------------------------------------------------------------------------
 
 // Ensure subsequent IDs don't clash with this one
-WXDLLIMPEXP_BASE void wxRegisterId(long id);
+WXDLLIMPEXP_BASE void wxRegisterId(int id);
 
 // Return the current ID
-WXDLLIMPEXP_BASE long wxGetCurrentId();
+WXDLLIMPEXP_BASE int wxGetCurrentId();
 
 // Generate a unique ID
-WXDLLIMPEXP_BASE long wxNewId();
+WXDLLIMPEXP_BASE int wxNewId();
 
 // ----------------------------------------------------------------------------
 // Various conversions
@@ -823,6 +817,10 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
     // Return the pointer to the resource data. This pointer is read-only, use
     // the overload below if you need to modify the data.
     //
+    // Notice that the resource type can be either a real string or an integer
+    // produced by MAKEINTRESOURCE(). In particular, any standard resource type,
+    // i.e any RT_XXX constant, could be passed here.
+    //
     // Returns true on success, false on failure. Doesn't log an error message
     // if the resource is not found (because this could be expected) but does
     // log one if any other error occurs.
@@ -830,7 +828,7 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
     wxLoadUserResource(const void **outData,
                        size_t *outLen,
                        const wxString& resourceName,
-                       const wxString& resourceType = wxUserResourceStr,
+                       const wxChar* resourceType = wxUserResourceStr,
                        WXHINSTANCE module = 0);
 
     // This function allocates a new buffer and makes a copy of the resource
@@ -840,7 +838,7 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
     // Returns NULL on failure.
     WXDLLIMPEXP_BASE char*
     wxLoadUserResource(const wxString& resourceName,
-                       const wxString& resourceType = wxUserResourceStr,
+                       const wxChar* resourceType = wxUserResourceStr,
                        int* pLen = NULL,
                        WXHINSTANCE module = 0);
 #endif // __WINDOWS__
diff --git a/Externals/wxWidgets3/include/wx/valgen.h b/Externals/wxWidgets3/include/wx/valgen.h
index 9e6f0c3479..c24142e791 100644
--- a/Externals/wxWidgets3/include/wx/valgen.h
+++ b/Externals/wxWidgets3/include/wx/valgen.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Created:     Jan 22 1999
-// RCS-ID:      $Id: valgen.h 68217 2011-07-09 23:37:28Z VZ $
 // Copyright:   (c) 1999 Julian Smart (assigned from Kevin)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/validate.h b/Externals/wxWidgets3/include/wx/validate.h
index d94f89c09e..0adf3bf477 100644
--- a/Externals/wxWidgets3/include/wx/validate.h
+++ b/Externals/wxWidgets3/include/wx/validate.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: validate.h 66966 2011-02-19 12:32:59Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,11 @@ class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler
 {
 public:
     wxValidator();
+    wxValidator(const wxValidator& other)
+        : wxEvtHandler()
+        , m_validatorWindow(other.m_validatorWindow)
+    {
+    }
     virtual ~wxValidator();
 
     // Make a clone of this validator (or return NULL) - currently necessary
@@ -87,7 +91,7 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
-    wxDECLARE_NO_COPY_CLASS(wxValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxValidator);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
diff --git a/Externals/wxWidgets3/include/wx/valtext.h b/Externals/wxWidgets3/include/wx/valtext.h
index a012ef62ad..93f5dd614e 100644
--- a/Externals/wxWidgets3/include/wx/valtext.h
+++ b/Externals/wxWidgets3/include/wx/valtext.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     29/01/98
-// RCS-ID:      $Id: valtext.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/variant.h b/Externals/wxWidgets3/include/wx/variant.h
index 6f82698856..39adc729b9 100644
--- a/Externals/wxWidgets3/include/wx/variant.h
+++ b/Externals/wxWidgets3/include/wx/variant.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
-// RCS-ID:      $Id: variant.h 66608 2011-01-06 11:06:12Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -570,7 +569,11 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
                   var.GetWxObjectPtr() : NULL));
 
 // Replacement for using wxDynamicCast on a wxVariantData object
-#define wxDynamicCastVariantData(data, classname) dynamic_cast<classname*>(data)
+#ifndef wxNO_RTTI
+    #define wxDynamicCastVariantData(data, classname) dynamic_cast<classname*>(data)
+#endif
+
+#define wxStaticCastVariantData(data, classname) static_cast<classname*>(data)
 
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
diff --git a/Externals/wxWidgets3/include/wx/variantbase.h b/Externals/wxWidgets3/include/wx/variantbase.h
index 3f06c96e0e..732671bdd5 100644
--- a/Externals/wxWidgets3/include/wx/variantbase.h
+++ b/Externals/wxWidgets3/include/wx/variantbase.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     10/09/98
-// RCS-ID:      $Id: variantbase.h 66584 2011-01-05 06:56:36Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/vector.h b/Externals/wxWidgets3/include/wx/vector.h
index e95d4103ef..e81cafb082 100644
--- a/Externals/wxWidgets3/include/wx/vector.h
+++ b/Externals/wxWidgets3/include/wx/vector.h
@@ -28,7 +28,6 @@ inline void wxVectorSort(wxVector<T>& v)
 
 #else // !wxUSE_STD_CONTAINERS
 
-#include "wx/utils.h"
 #include "wx/scopeguard.h"
 #include "wx/meta/movable.h"
 #include "wx/meta/if.h"
@@ -37,6 +36,15 @@ inline void wxVectorSort(wxVector<T>& v)
 #include <new> // for placement new
 #include "wx/afterstd.h"
 
+// wxQsort is declared in wx/utils.h, but can't include that file here,
+// it indirectly includes this file. Just lovely...
+typedef int (*wxSortCallback)(const void* pItem1,
+                              const void* pItem2,
+                              const void* user_data);
+WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
+                              size_t size, wxSortCallback cmp,
+                              const void* user_data);
+
 namespace wxPrivate
 {
 
@@ -131,9 +139,11 @@ public:
     typedef size_t difference_type;
     typedef T value_type;
     typedef value_type* pointer;
+    typedef const value_type* const_pointer;
     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
+    typedef const value_type& const_reference;
 
     class reverse_iterator
     {
@@ -175,6 +185,51 @@ public:
 
     private:
         value_type *m_ptr;
+
+        friend class const_reverse_iterator;
+    };
+
+    class const_reverse_iterator
+    {
+    public:
+        const_reverse_iterator() : m_ptr(NULL) { }
+        wxEXPLICIT const_reverse_iterator(const_iterator it) : m_ptr(it) { }
+        const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
+        const_reverse_iterator(const const_reverse_iterator& it) : m_ptr(it.m_ptr) { }
+
+        const_reference operator*() const { return *m_ptr; }
+        const_pointer operator->() const { return m_ptr; }
+
+        const_iterator base() const { return m_ptr; }
+
+        const_reverse_iterator& operator++()
+            { --m_ptr; return *this; }
+        const_reverse_iterator operator++(int)
+            { const_reverse_iterator tmp = *this; --m_ptr; return tmp; }
+        const_reverse_iterator& operator--()
+            { ++m_ptr; return *this; }
+        const_reverse_iterator operator--(int)
+            { const_reverse_iterator tmp = *this; ++m_ptr; return tmp; }
+
+        const_reverse_iterator operator+(difference_type n) const
+            { return const_reverse_iterator(m_ptr - n); }
+        const_reverse_iterator& operator+=(difference_type n)
+            { m_ptr -= n; return *this; }
+        const_reverse_iterator operator-(difference_type n) const
+            { return const_reverse_iterator(m_ptr + n); }
+        const_reverse_iterator& operator-=(difference_type n)
+            { m_ptr += n; return *this; }
+
+        const_reference operator[](difference_type n) const
+            { return *(*this + n); }
+
+        bool operator ==(const const_reverse_iterator& it) const
+            { return m_ptr == it.m_ptr; }
+        bool operator !=(const const_reverse_iterator& it) const
+            { return m_ptr != it.m_ptr; }
+
+    protected:
+        const value_type *m_ptr;
     };
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
@@ -200,11 +255,39 @@ public:
         Copy(c);
     }
 
+    template <class InputIterator>
+    wxVector(InputIterator first, InputIterator last)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        assign(first, last);
+    }
+
     ~wxVector()
     {
         clear();
     }
 
+    void assign(size_type p_size, const value_type& v)
+    {
+        clear();
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+
+    template <class InputIterator>
+    void assign(InputIterator first, InputIterator last)
+    {
+        clear();
+
+        // Notice that it would be nice to call reserve() here but we can't do
+        // it for arbitrary input iterators, we should have a dispatch on
+        // iterator type and call it if possible.
+
+        for ( InputIterator it = first; it != last; ++it )
+            push_back(*it);
+    }
+
     void swap(wxVector& v)
     {
         wxSwap(m_size, v.m_size);
@@ -234,15 +317,17 @@ public:
         // increase the size twice, unless we're already too big or unless
         // more is requested
         //
-        // NB: casts to size_type are needed to suppress mingw32 warnings about
-        //     mixing enums and ints in the same expression
+        // NB: casts to size_type are needed to suppress warnings about
+        //     mixing enumeral and non-enumeral type in conditional expression
         const size_type increment = m_size > 0
-                                     ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE)
+                                     ? m_size < ALLOC_MAX_SIZE
+                                        ? m_size
+                                        : (size_type)ALLOC_MAX_SIZE
                                      : (size_type)ALLOC_INITIAL_SIZE;
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
 
-        m_values = Ops::Realloc(m_values, n * sizeof(value_type), m_size);
+        m_values = Ops::Realloc(m_values, n, m_size);
         m_capacity = n;
     }
 
@@ -335,6 +420,9 @@ public:
     reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
     reverse_iterator rend() { return reverse_iterator(begin() - 1); }
 
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end() - 1); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin() - 1); }
+
     iterator insert(iterator it, const value_type& v = value_type())
     {
         // NB: this must be done before reserve(), because reserve()
diff --git a/Externals/wxWidgets3/include/wx/version.h b/Externals/wxWidgets3/include/wx/version.h
index fb634a97fb..16578dc283 100644
--- a/Externals/wxWidgets3/include/wx/version.h
+++ b/Externals/wxWidgets3/include/wx/version.h
@@ -4,7 +4,6 @@
  *  Author:      Julian Smart
  *  Modified by: Ryan Norton (Converted to C)
  *  Created:     29/01/98
- *  RCS-ID:      $Id: version.h 70021 2011-12-16 22:12:49Z VZ $
  *  Copyright:   (c) 1998 Julian Smart
  *  Licence:     wxWindows licence
  */
@@ -26,11 +25,11 @@
  */
 
 /*  NB: this file is parsed by automatic tools so don't change its format! */
-#define wxMAJOR_VERSION      2
-#define wxMINOR_VERSION      9
-#define wxRELEASE_NUMBER     4
+#define wxMAJOR_VERSION      3
+#define wxMINOR_VERSION      1
+#define wxRELEASE_NUMBER     0
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   wxT("wxWidgets 2.9.4")
+#define wxVERSION_STRING   wxT("wxWidgets 3.1.0")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/Externals/wxWidgets3/include/wx/versioninfo.h b/Externals/wxWidgets3/include/wx/versioninfo.h
index 8e7723f08d..79469111a6 100644
--- a/Externals/wxWidgets3/include/wx/versioninfo.h
+++ b/Externals/wxWidgets3/include/wx/versioninfo.h
@@ -3,7 +3,6 @@
 // Purpose:     declaration of wxVersionInfo class
 // Author:      Troels K
 // Created:     2010-11-22
-// RCS-ID:      $Id: versioninfo.h 66474 2010-12-27 20:47:12Z RD $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/vidmode.h b/Externals/wxWidgets3/include/wx/vidmode.h
index 9c462dd0b5..550bb3b4bc 100644
--- a/Externals/wxWidgets3/include/wx/vidmode.h
+++ b/Externals/wxWidgets3/include/wx/vidmode.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.09.2003 (extracted from wx/display.h)
-// RCS-ID:      $Id: vidmode.h 53124 2008-04-11 09:52:04Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/vlbox.h b/Externals/wxWidgets3/include/wx/vlbox.h
index 62f0299b23..1981110509 100644
--- a/Externals/wxWidgets3/include/wx/vlbox.h
+++ b/Externals/wxWidgets3/include/wx/vlbox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id: vlbox.h 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -247,7 +246,7 @@ protected:
     // common part of all ctors
     void Init();
 
-    // send the wxEVT_COMMAND_LISTBOX_SELECTED event
+    // send the wxEVT_LISTBOX event
     void SendSelectedEvent();
     virtual void InitEvent(wxCommandEvent& event, int n);
 
diff --git a/Externals/wxWidgets3/include/wx/volume.h b/Externals/wxWidgets3/include/wx/volume.h
index 441e3e996f..fd6a8370e0 100644
--- a/Externals/wxWidgets3/include/wx/volume.h
+++ b/Externals/wxWidgets3/include/wx/volume.h
@@ -4,7 +4,6 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
-// RCS-ID:      $Id: volume.h 56910 2008-11-22 15:54:33Z FM $
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/vscroll.h b/Externals/wxWidgets3/include/wx/vscroll.h
index 6bf9623c36..2312d78f0b 100644
--- a/Externals/wxWidgets3/include/wx/vscroll.h
+++ b/Externals/wxWidgets3/include/wx/vscroll.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, Bryan Petty
 // Created:     30.05.03
-// RCS-ID:      $Id: vscroll.h 70085 2011-12-22 01:26:11Z RD $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +13,7 @@
 
 #include "wx/panel.h"
 #include "wx/position.h"
+#include "wx/scrolwin.h"
 
 class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler;
 
@@ -24,6 +24,11 @@ class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler;
 // scrolwin.h) for the purpose of reducing code duplication     |
 // through the use of mix-in classes.                           |
 //                                                              |
+//                   wxAnyScrollHelperBase                      |
+//                            |                                 |
+//                            |                                 |
+//                            |                                 |
+//                            V                                 |
 //                  wxVarScrollHelperBase                       |
 //                   /                 \                        |
 //                  /                   \                       |
@@ -59,7 +64,7 @@ class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler;
 // required virtual functions that need to be implemented for any orientation
 // specific work.
 
-class WXDLLIMPEXP_CORE wxVarScrollHelperBase
+class WXDLLIMPEXP_CORE wxVarScrollHelperBase : public wxAnyScrollHelperBase
 {
 public:
     // constructors and such
@@ -115,10 +120,6 @@ public:
     // child of it in order to scroll only a portion the area between the
     // scrollbars (spreadsheet: only cell area will move).
     virtual void SetTargetWindow(wxWindow *target);
-    virtual wxWindow *GetTargetWindow() const { return m_targetWindow; }
-
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    //virtual void OnDraw(wxDC& WXUNUSED(dc)) { }
 
     // change the DC origin according to the scroll position. To properly
     // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER()
@@ -257,12 +258,6 @@ protected:
     void IncOrient(wxCoord& x, wxCoord& y, wxCoord inc);
 
 private:
-
-    // the window that receives the scroll events and the window to actually
-    // scroll, respectively
-    wxWindow    *m_win,
-                *m_targetWindow;
-
     // the total number of (logical) units
     size_t m_unitMax;
 
diff --git a/Externals/wxWidgets3/include/wx/weakref.h b/Externals/wxWidgets3/include/wx/weakref.h
index 496d90cb29..b692f037e8 100644
--- a/Externals/wxWidgets3/include/wx/weakref.h
+++ b/Externals/wxWidgets3/include/wx/weakref.h
@@ -3,7 +3,6 @@
 // Purpose:     wxWeakRef - Generic weak references for wxWidgets
 // Author:      Arne Steinarson
 // Created:     27 Dec 07
-// RCS-ID:      $Id: weakref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -227,14 +226,14 @@ public:
     template <class TDerived>
     wxWeakRef(TDerived* pobj)
     {
-        Assign(pobj);
+        this->Assign(pobj);
     }
 
     // We need this copy ctor, since otherwise a default compiler (binary) copy
     // happens (if embedded as an object member).
     wxWeakRef(const wxWeakRef<T>& wr)
     {
-        Assign(wr.get());
+        this->Assign(wr.get());
     }
 
     wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
diff --git a/Externals/wxWidgets3/include/wx/webview.h b/Externals/wxWidgets3/include/wx/webview.h
index 993d99cfa5..25a235da9d 100644
--- a/Externals/wxWidgets3/include/wx/webview.h
+++ b/Externals/wxWidgets3/include/wx/webview.h
@@ -2,13 +2,12 @@
 // Name:        webview.h
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
-// Id:          $Id: webview.h 70038 2011-12-17 23:52:40Z VZ $
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WEB_VIEW_H_
-#define _WX_WEB_VIEW_H_
+#ifndef _WX_WEBVIEW_H_
+#define _WX_WEBVIEW_H_
 
 #include "wx/defs.h"
 
@@ -32,47 +31,51 @@
 
 class wxFSFile;
 class wxFileSystem;
+class wxWebView;
 
 enum wxWebViewZoom
 {
-    wxWEB_VIEW_ZOOM_TINY,
-    wxWEB_VIEW_ZOOM_SMALL,
-    wxWEB_VIEW_ZOOM_MEDIUM,
-    wxWEB_VIEW_ZOOM_LARGE,
-    wxWEB_VIEW_ZOOM_LARGEST
+    wxWEBVIEW_ZOOM_TINY,
+    wxWEBVIEW_ZOOM_SMALL,
+    wxWEBVIEW_ZOOM_MEDIUM,
+    wxWEBVIEW_ZOOM_LARGE,
+    wxWEBVIEW_ZOOM_LARGEST
 };
 
 enum wxWebViewZoomType
 {
     //Scales entire page, including images
-    wxWEB_VIEW_ZOOM_TYPE_LAYOUT,
-    wxWEB_VIEW_ZOOM_TYPE_TEXT
+    wxWEBVIEW_ZOOM_TYPE_LAYOUT,
+    wxWEBVIEW_ZOOM_TYPE_TEXT
 };
 
 enum wxWebViewNavigationError
 {
-    wxWEB_NAV_ERR_CONNECTION,
-    wxWEB_NAV_ERR_CERTIFICATE,
-    wxWEB_NAV_ERR_AUTH,
-    wxWEB_NAV_ERR_SECURITY,
-    wxWEB_NAV_ERR_NOT_FOUND,
-    wxWEB_NAV_ERR_REQUEST,
-    wxWEB_NAV_ERR_USER_CANCELLED,
-    wxWEB_NAV_ERR_OTHER
+    wxWEBVIEW_NAV_ERR_CONNECTION,
+    wxWEBVIEW_NAV_ERR_CERTIFICATE,
+    wxWEBVIEW_NAV_ERR_AUTH,
+    wxWEBVIEW_NAV_ERR_SECURITY,
+    wxWEBVIEW_NAV_ERR_NOT_FOUND,
+    wxWEBVIEW_NAV_ERR_REQUEST,
+    wxWEBVIEW_NAV_ERR_USER_CANCELLED,
+    wxWEBVIEW_NAV_ERR_OTHER
 };
 
 enum wxWebViewReloadFlags
 {
     //Default, may access cache
-    wxWEB_VIEW_RELOAD_DEFAULT,
-    wxWEB_VIEW_RELOAD_NO_CACHE 
+    wxWEBVIEW_RELOAD_DEFAULT,
+    wxWEBVIEW_RELOAD_NO_CACHE
 };
 
-enum wxWebViewBackend
+enum wxWebViewFindFlags
 {
-    wxWEB_VIEW_BACKEND_DEFAULT,
-    wxWEB_VIEW_BACKEND_WEBKIT,
-    wxWEB_VIEW_BACKEND_IE
+    wxWEBVIEW_FIND_WRAP =             0x0001,
+    wxWEBVIEW_FIND_ENTIRE_WORD =      0x0002,
+    wxWEBVIEW_FIND_MATCH_CASE =       0x0004,
+    wxWEBVIEW_FIND_HIGHLIGHT_RESULT = 0x0008,
+    wxWEBVIEW_FIND_BACKWARDS =        0x0010,
+    wxWEBVIEW_FIND_DEFAULT =          0
 };
 
 //Base class for custom scheme handlers
@@ -89,10 +92,33 @@ private:
 
 extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[];
 extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[];
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[];
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[];
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[];
+
+class WXDLLIMPEXP_WEBVIEW wxWebViewFactory : public wxObject
+{
+public:
+    virtual wxWebView* Create() = 0;
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr) = 0;
+};
+
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewFactory>, wxStringWebViewFactoryMap);
 
 class WXDLLIMPEXP_WEBVIEW wxWebView : public wxControl
 {
 public:
+    wxWebView()
+    {
+        m_showMenu = true;
+    }
+
     virtual ~wxWebView() {}
 
     virtual bool Create(wxWindow* parent,
@@ -103,36 +129,49 @@ public:
            long style = 0,
            const wxString& name = wxWebViewNameStr) = 0;
 
-    static wxWebView* New(wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT);
+    // Factory methods allowing the use of custom factories registered with
+    // RegisterFactory
+    static wxWebView* New(const wxString& backend = wxWebViewBackendDefault);
     static wxWebView* New(wxWindow* parent,
-           wxWindowID id,
-           const wxString& url = wxWebViewDefaultURLStr,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT,
-           long style = 0,
-           const wxString& name = wxWebViewNameStr);
+                          wxWindowID id,
+                          const wxString& url = wxWebViewDefaultURLStr,
+                          const wxPoint& pos = wxDefaultPosition,
+                          const wxSize& size = wxDefaultSize,
+                          const wxString& backend = wxWebViewBackendDefault,
+                          long style = 0,
+                          const wxString& name = wxWebViewNameStr);
 
-    //General methods
+    static void RegisterFactory(const wxString& backend, 
+                                wxSharedPtr<wxWebViewFactory> factory);
+
+    // General methods
+    virtual void EnableContextMenu(bool enable = true)
+    {
+        m_showMenu = enable;
+    }
     virtual wxString GetCurrentTitle() const = 0;
     virtual wxString GetCurrentURL() const = 0;
     // TODO: handle choosing a frame when calling GetPageSource()?
     virtual wxString GetPageSource() const = 0;
     virtual wxString GetPageText() const = 0;
     virtual bool IsBusy() const = 0;
+    virtual bool IsContextMenuEnabled() const { return m_showMenu; }
     virtual bool IsEditable() const = 0;
     virtual void LoadURL(const wxString& url) = 0;
     virtual void Print() = 0;
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) = 0;
-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) = 0;
     virtual void RunScript(const wxString& javascript) = 0;
     virtual void SetEditable(bool enable = true) = 0;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl) = 0;
-    virtual void SetPage(wxInputStream& html, wxString baseUrl)
+    void SetPage(const wxString& html, const wxString& baseUrl)
+    {
+        DoSetPage(html, baseUrl);
+    }
+    void SetPage(wxInputStream& html, wxString baseUrl)
     {
         wxStringOutputStream stream;
         stream.Write(html);
-        SetPage(stream.GetString(), baseUrl);
+        DoSetPage(stream.GetString(), baseUrl);
     }
     virtual void Stop() = 0;
 
@@ -176,6 +215,21 @@ public:
     virtual void Undo() = 0;
     virtual void Redo() = 0;
 
+    //Get the pointer to the underlying native engine.
+    virtual void* GetNativeBackend() const = 0;
+    //Find function
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) = 0;
+
+protected:
+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl) = 0;
+
+private:
+    static void InitFactoryMap();
+    static wxStringWebViewFactoryMap::iterator FindFactory(const wxString &backend);
+
+    bool m_showMenu;
+    static wxStringWebViewFactoryMap m_factoryMap;
+
     wxDECLARE_ABSTRACT_CLASS(wxWebView);
 };
 
@@ -200,12 +254,12 @@ private:
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent);
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NAVIGATING, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_LOADED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_ERROR, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_NEWWINDOW, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_WEBVIEW_TITLE_CHANGED, wxWebViewEvent );
 
 typedef void (wxEvtHandler::*wxWebViewEventFunction)
              (wxWebViewEvent&);
@@ -213,30 +267,38 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
 #define wxWebViewEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxWebViewEventFunction, func)
 
-#define EVT_WEB_VIEW_NAVIGATING(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id, \
+#define EVT_WEBVIEW_NAVIGATING(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_NAVIGATING, id, \
                      wxWebViewEventHandler(fn))
 
-#define EVT_WEB_VIEW_NAVIGATED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id, \
+#define EVT_WEBVIEW_NAVIGATED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_NAVIGATED, id, \
                      wxWebViewEventHandler(fn))
 
-#define EVT_WEB_VIEW_LOADED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, \
+#define EVT_WEBVIEW_LOADED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_LOADED, id, \
                      wxWebViewEventHandler(fn))
 
-#define EVT_WEB_VIEW_ERROR(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \
+#define EVT_WEBVIEW_ERROR(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_ERROR, id, \
                      wxWebViewEventHandler(fn))
 
-#define EVT_WEB_VIEW_NEWWINDOW(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, id, \
+#define EVT_WEBVIEW_NEWWINDOW(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_NEWWINDOW, id, \
                      wxWebViewEventHandler(fn))
 
-#define EVT_WEB_VIEW_TITLE_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
+#define EVT_WEBVIEW_TITLE_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_WEBVIEW_TITLE_CHANGED, id, \
                      wxWebViewEventHandler(fn))
 
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_WEBVIEW_NAVIGATING      wxEVT_WEBVIEW_NAVIGATING
+#define wxEVT_COMMAND_WEBVIEW_NAVIGATED       wxEVT_WEBVIEW_NAVIGATED
+#define wxEVT_COMMAND_WEBVIEW_LOADED          wxEVT_WEBVIEW_LOADED
+#define wxEVT_COMMAND_WEBVIEW_ERROR           wxEVT_WEBVIEW_ERROR
+#define wxEVT_COMMAND_WEBVIEW_NEWWINDOW       wxEVT_WEBVIEW_NEWWINDOW
+#define wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED   wxEVT_WEBVIEW_TITLE_CHANGED
+
 #endif // wxUSE_WEBVIEW
 
-#endif // _WX_WEB_VIEW_H_
+#endif // _WX_WEBVIEW_H_
diff --git a/Externals/wxWidgets3/include/wx/webviewarchivehandler.h b/Externals/wxWidgets3/include/wx/webviewarchivehandler.h
index 4cd91dc4af..8b2eb19908 100644
--- a/Externals/wxWidgets3/include/wx/webviewarchivehandler.h
+++ b/Externals/wxWidgets3/include/wx/webviewarchivehandler.h
@@ -2,13 +2,12 @@
 // Name:        webviewarchivehandler.h
 // Purpose:     Custom webview handler to allow archive browsing
 // Author:      Steven Lamerton
-// Id:          $Id: webviewarchivehandler.h 69316 2011-10-05 21:21:51Z SJL $
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WEB_VIEW_FILE_HANDLER_H_
-#define _WX_WEB_VIEW_FILE_HANDLER_H_
+#ifndef _WX_WEBVIEW_FILE_HANDLER_H_
+#define _WX_WEBVIEW_FILE_HANDLER_H_
 
 #include "wx/setup.h"
 
@@ -20,7 +19,7 @@ class wxFileSystem;
 #include "wx/webview.h"
 
 //Loads from uris such as scheme:///C:/example/example.html or archives such as
-//scheme:///C:/example/example.zip;protocol=zip/example.html 
+//scheme:///C:/example/example.zip;protocol=zip/example.html
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
 {
@@ -34,4 +33,4 @@ private:
 
 #endif // wxUSE_WEBVIEW
 
-#endif // _WX_WEB_VIEW_FILE_HANDLER_H_
+#endif // _WX_WEBVIEW_FILE_HANDLER_H_
diff --git a/Externals/wxWidgets3/include/wx/webviewfshandler.h b/Externals/wxWidgets3/include/wx/webviewfshandler.h
new file mode 100644
index 0000000000..ebdbbcb906
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/webviewfshandler.h
@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        webviewfshandler.h
+// Purpose:     Custom webview handler for virtual file system
+// Author:      Nick Matthews
+// Copyright:   (c) 2012 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// Based on webviewarchivehandler.h file by Steven Lamerton
+
+#ifndef _WX_WEBVIEW_FS_HANDLER_H_
+#define _WX_WEBVIEW_FS_HANDLER_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW
+
+class wxFSFile;
+class wxFileSystem;
+
+#include "wx/webview.h"
+
+//Loads from uris such as scheme:example.html
+
+class WXDLLIMPEXP_WEBVIEW wxWebViewFSHandler : public wxWebViewHandler
+{
+public:
+    wxWebViewFSHandler(const wxString& scheme);
+    virtual ~wxWebViewFSHandler();
+    virtual wxFSFile* GetFile(const wxString &uri);
+private:
+    wxFileSystem* m_fileSystem;
+};
+
+#endif // wxUSE_WEBVIEW
+
+#endif // _WX_WEBVIEW_FS_HANDLER_H_
diff --git a/Externals/wxWidgets3/include/wx/wfstream.h b/Externals/wxWidgets3/include/wx/wfstream.h
index 753e8349d7..613b4c273b 100644
--- a/Externals/wxWidgets3/include/wx/wfstream.h
+++ b/Externals/wxWidgets3/include/wx/wfstream.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id: wfstream.h 62995 2009-12-27 19:39:55Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,6 +41,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFile* GetFile() const { return m_file; }
+
 protected:
     wxFileInputStream();
 
@@ -72,6 +73,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFile* GetFile() const { return m_file; }
+
 protected:
     wxFileOutputStream();
 
@@ -169,6 +172,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFFile* GetFile() const { return m_file; }
+
 protected:
     wxFFileInputStream();
 
@@ -199,6 +204,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFFile* GetFile() const { return m_file; }
+
 protected:
     wxFFileOutputStream();
 
diff --git a/Externals/wxWidgets3/include/wx/window.h b/Externals/wxWidgets3/include/wx/window.h
index 3ec3b57692..fc37b81944 100644
--- a/Externals/wxWidgets3/include/wx/window.h
+++ b/Externals/wxWidgets3/include/wx/window.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id: window.h 70838 2012-03-07 23:50:21Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -379,6 +378,13 @@ public:
             *h = s.y;
     }
 
+        // Determine the best size in the other direction if one of them is
+        // fixed. This is used with windows that can wrap their contents and
+        // returns input-independent best size for the others.
+    int GetBestHeight(int width) const;
+    int GetBestWidth(int height) const;
+
+
     void SetScrollHelper( wxScrollHelper *sh )   { m_scrollHelper = sh; }
     wxScrollHelper *GetScrollHelper()            { return m_scrollHelper; }
 
@@ -393,13 +399,18 @@ public:
         // minimum size, giving priority to the min size components, and
         // returns the results.
     virtual wxSize GetEffectiveMinSize() const;
-    wxDEPRECATED( wxSize GetBestFittingSize() const );  // replaced by GetEffectiveMinSize
-    wxDEPRECATED( wxSize GetAdjustedMinSize() const );  // replaced by GetEffectiveMinSize
+
+    wxDEPRECATED_MSG("use GetEffectiveMinSize() instead")
+    wxSize GetBestFittingSize() const;
+    wxDEPRECATED_MSG("use GetEffectiveMinSize() instead")
+    wxSize GetAdjustedMinSize() const;
 
         // A 'Smart' SetSize that will fill in default size values with 'best'
         // size.  Sets the minsize to what was passed in.
     void SetInitialSize(const wxSize& size=wxDefaultSize);
-    wxDEPRECATED( void SetBestFittingSize(const wxSize& size=wxDefaultSize) );  // replaced by SetInitialSize
+
+    wxDEPRECATED_MSG("use SetInitialSize() instead")
+    void SetBestFittingSize(const wxSize& size=wxDefaultSize);
 
 
         // the generic centre function - centers the window on parent by`
@@ -514,6 +525,11 @@ public:
         return wxSize( wxMax( client.x, best.x ), wxMax( client.y, best.y ) );
     }
 
+    // returns the magnification of the content of this window
+    // eg 2.0 for a window on a retina screen
+    virtual double GetContentScaleFactor() const
+    { return 1.0; }
+    
     // return the size of the left/right and top/bottom borders in x and y
     // components of the result respectively
     virtual wxSize GetWindowBorderSize() const;
@@ -548,6 +564,43 @@ public:
     // this is the same as SendSizeEventToParent() but using PostSizeEvent()
     void PostSizeEventToParent() { SendSizeEventToParent(wxSEND_EVENT_POST); }
 
+    // These functions should be used before repositioning the children of
+    // this window to reduce flicker or, in MSW case, even avoid display
+    // corruption in some situations (so they're more than just optimization).
+    //
+    // EndRepositioningChildren() should be called if and only if
+    // BeginRepositioningChildren() returns true. To ensure that this is always
+    // done automatically, use ChildrenRepositioningGuard class below.
+    virtual bool BeginRepositioningChildren() { return false; }
+    virtual void EndRepositioningChildren() { }
+
+    // A simple helper which ensures that EndRepositioningChildren() is called
+    // from its dtor if and only if calling BeginRepositioningChildren() from
+    // the ctor returned true.
+    class ChildrenRepositioningGuard
+    {
+    public:
+        // Notice that window can be NULL here, for convenience. In this case
+        // this class simply doesn't do anything.
+        wxEXPLICIT ChildrenRepositioningGuard(wxWindowBase* win)
+            : m_win(win),
+              m_callEnd(win && win->BeginRepositioningChildren())
+        {
+        }
+
+        ~ChildrenRepositioningGuard()
+        {
+            if ( m_callEnd )
+                m_win->EndRepositioningChildren();
+        }
+
+    private:
+        wxWindowBase* const m_win;
+        const bool m_callEnd;
+
+        wxDECLARE_NO_COPY_CLASS(ChildrenRepositioningGuard);
+    };
+
 
     // window state
     // ------------
@@ -675,8 +728,13 @@ public:
     virtual bool AcceptsFocusFromKeyboard() const { return AcceptsFocus(); }
 
 
-        // this is mostly a helper for the various functions using it below
-    bool CanBeFocused() const { return IsShown() && IsEnabled(); }
+        // Can this window be focused right now, in its current state? This
+        // shouldn't be called at all if AcceptsFocus() returns false.
+        //
+        // It is a convenient helper for the various functions using it below
+        // but also a hook allowing to override the default logic for some rare
+        // cases (currently just wxRadioBox in wxMSW) when it's inappropriate.
+    virtual bool CanBeFocused() const { return IsShown() && IsEnabled(); }
 
         // can this window itself have focus?
     bool IsFocusable() const { return AcceptsFocus() && CanBeFocused(); }
@@ -740,8 +798,12 @@ public:
         // is this window a top level one?
     virtual bool IsTopLevel() const;
 
+        // is this window a child or grand child of this one (inside the same
+        // TLW)?
+    bool IsDescendant(wxWindowBase* win) const;
+
         // it doesn't really change parent, use Reparent() instead
-    void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
+    void SetParent( wxWindowBase *parent );
         // change the real parent of this window, return true if the parent
         // was changed, false otherwise (error or newParent == oldParent)
     virtual bool Reparent( wxWindowBase *newParent );
@@ -1164,11 +1226,7 @@ public:
     // ----------
 
         // can the window have the scrollbar in this orientation?
-    bool CanScroll(int orient) const
-    {
-        return (m_windowStyle &
-                (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
-    }
+    virtual bool CanScroll(int orient) const;
 
         // does the window have the scrollbar in this orientation?
     bool HasScrollbar(int orient) const;
@@ -1500,11 +1558,6 @@ protected:
     // widgets state are necessary
     virtual void DoEnable(bool WXUNUSED(enable)) { }
 
-    // called when the on-screen widget state changes and provides an
-    // an opportunity for the widget to update its visual state (colours,
-    // fonts, anything else) as necessary
-    virtual void OnEnabled(bool WXUNUSED(enabled)) { }
-
 
     // the window id - a number which uniquely identifies a window among
     // its siblings unless it is wxID_ANY
@@ -1633,8 +1686,10 @@ protected:
     // recalculated each time the value is needed.
     wxSize m_bestSizeCache;
 
-    wxDEPRECATED( void SetBestSize(const wxSize& size) );  // use SetInitialSize
-    wxDEPRECATED( virtual void SetInitialBestSize(const wxSize& size) );  // use SetInitialSize
+    wxDEPRECATED_MSG("use SetInitialSize() instead.")
+    void SetBestSize(const wxSize& size);
+    wxDEPRECATED_MSG("use SetInitialSize() instead.")
+    virtual void SetInitialBestSize(const wxSize& size);
 
 
 
@@ -1683,6 +1738,14 @@ protected:
     // (GetBorderSize() will be used to add them)
     virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; }
 
+    // These two methods can be overridden to implement intelligent
+    // width-for-height and/or height-for-width best size determination for the
+    // window. By default the fixed best size is used.
+    virtual int DoGetBestClientHeight(int WXUNUSED(width)) const
+        { return wxDefaultCoord; }
+    virtual int DoGetBestClientWidth(int WXUNUSED(height)) const
+        { return wxDefaultCoord; }
+
     // this is the virtual function to be overridden in any derived class which
     // wants to change how SetSize() or Move() works - it is called by all
     // versions of these functions in the base class
@@ -1749,7 +1812,7 @@ protected:
     static void NotifyCaptureLost();
 
 private:
-    // recursively call our own and our children OnEnabled() when the
+    // recursively call our own and our children DoEnable() when the
     // enabled/disabled status changed because a parent window had been
     // enabled/disabled
     void NotifyWindowOnEnableChange(bool enabled);
@@ -1770,15 +1833,6 @@ private:
     // base for dialog unit conversion, i.e. average character size
     wxSize GetDlgUnitBase() const;
 
-    // the stack of windows which have captured the mouse
-    static struct WXDLLIMPEXP_FWD_CORE wxWindowNext *ms_winCaptureNext;
-
-    // the window that currently has mouse capture
-    static wxWindow *ms_winCaptureCurrent;
-
-    // indicates if execution is inside CaptureMouse/ReleaseMouse
-    static bool ms_winCaptureChanging;
-
 
     // number of Freeze() calls minus the number of Thaw() calls: we're frozen
     // (i.e. not being updated) if it is positive
@@ -1913,8 +1967,7 @@ extern WXDLLIMPEXP_CORE wxWindow *wxGetActiveWindow();
 WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win);
 
 #if WXWIN_COMPATIBILITY_2_6
-    // deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
-    wxDEPRECATED( wxWindowID NewControlId() );
+    wxDEPRECATED_MSG("use wxWindow::NewControlId() instead")
     inline wxWindowID NewControlId() { return wxWindowBase::NewControlId(); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
diff --git a/Externals/wxWidgets3/include/wx/windowid.h b/Externals/wxWidgets3/include/wx/windowid.h
index bca21fb42f..0c174b5f0c 100644
--- a/Externals/wxWidgets3/include/wx/windowid.h
+++ b/Externals/wxWidgets3/include/wx/windowid.h
@@ -3,7 +3,6 @@
 // Purpose:     wxWindowID class - a class for managing window ids
 // Author:      Brian Vanderburg II
 // Created:     2007-09-21
-// RCS-ID:      $Id: windowid.h 51123 2008-01-09 04:08:33Z PC $
 // Copyright:   (c) 2007 Brian Vanderburg II
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -43,7 +42,7 @@ public:
 
     wxWindowIDRef(long id)
     {
-        Init(id);
+        Init(wxWindowID(id));
     }
 
     wxWindowIDRef(const wxWindowIDRef& id)
@@ -66,7 +65,7 @@ public:
 
     wxWindowIDRef& operator=(long id)
     {
-        Assign(id);
+        Assign(wxWindowID(id));
         return *this;
     }
 
diff --git a/Externals/wxWidgets3/include/wx/windowptr.h b/Externals/wxWidgets3/include/wx/windowptr.h
new file mode 100644
index 0000000000..bebcf6ad8f
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/windowptr.h
@@ -0,0 +1,63 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/windowptr.h
+// Purpose:     smart pointer for holding wxWindow instances
+// Author:      Vaclav Slavik
+// Created:     2013-09-01
+// Copyright:   (c) 2013 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WINDOWPTR_H_
+#define _WX_WINDOWPTR_H_
+
+#include "wx/sharedptr.h"
+
+// ----------------------------------------------------------------------------
+// wxWindowPtr: A smart pointer with correct wxWindow destruction.
+// ----------------------------------------------------------------------------
+
+namespace wxPrivate
+{
+
+struct wxWindowDeleter
+{
+    void operator()(wxWindow *win)
+    {
+        win->Destroy();
+    }
+};
+
+} // namespace wxPrivate
+
+template<typename T>
+class wxWindowPtr : public wxSharedPtr<T>
+{
+public:
+    typedef T element_type;
+
+    wxEXPLICIT wxWindowPtr(element_type* win)
+        : wxSharedPtr<T>(win, wxPrivate::wxWindowDeleter())
+    {
+    }
+
+    wxWindowPtr() {}
+    wxWindowPtr(const wxWindowPtr& tocopy) : wxSharedPtr<T>(tocopy) {}
+
+    wxWindowPtr& operator=(const wxWindowPtr& tocopy)
+    {
+        wxSharedPtr<T>::operator=(tocopy);
+        return *this;
+    }
+
+    wxWindowPtr& operator=(element_type* win)
+    {
+        return operator=(wxWindowPtr(win));
+    }
+
+    void reset(T* ptr = NULL)
+    {
+        wxSharedPtr<T>::reset(ptr, wxPrivate::wxWindowDeleter());
+    }
+};
+
+#endif // _WX_WINDOWPTR_H_
diff --git a/Externals/wxWidgets3/include/wx/withimages.h b/Externals/wxWidgets3/include/wx/withimages.h
index f8ce1c85e4..89120d3eb7 100644
--- a/Externals/wxWidgets3/include/wx/withimages.h
+++ b/Externals/wxWidgets3/include/wx/withimages.h
@@ -3,7 +3,6 @@
 // Purpose:     Declaration of a simple wxWithImages class.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-17
-// RCS-ID:      $Id: withimages.h 68813 2011-08-21 14:52:16Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wizard.h b/Externals/wxWidgets3/include/wx/wizard.h
index bd23ce582a..82dc438ac4 100644
--- a/Externals/wxWidgets3/include/wx/wizard.h
+++ b/Externals/wxWidgets3/include/wx/wizard.h
@@ -9,7 +9,6 @@
 //              Added wxWIZARD_HELP event
 //              Robert Vazan (sizers)
 // Created:     15.08.99
-// RCS-ID:      $Id: wizard.h 70630 2012-02-20 11:38:52Z JS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -114,7 +113,7 @@ private:
 // wxWizardPageSimple just returns the pointers given to the ctor and is useful
 // to create a simple wizard where the order of pages never changes.
 //
-// OTOH, it is also possible to dynamicly decide which page to return (i.e.
+// OTOH, it is also possible to dynamically decide which page to return (i.e.
 // depending on the user's choices) as the wizard sample shows - in order to do
 // this, you must derive from wxWizardPage directly.
 // ----------------------------------------------------------------------------
@@ -147,7 +146,15 @@ public:
     void SetPrev(wxWizardPage *prev) { m_prev = prev; }
     void SetNext(wxWizardPage *next) { m_next = next; }
 
-    // a convenience function to make the pages follow each other
+    // Convenience functions to make the pages follow each other without having
+    // to call their SetPrev() or SetNext() explicitly.
+    wxWizardPageSimple& Chain(wxWizardPageSimple* next)
+    {
+        SetNext(next);
+        next->SetPrev(this);
+        return *next;
+    }
+
     static void Chain(wxWizardPageSimple *first, wxWizardPageSimple *second)
     {
         wxCHECK_RET( first && second,
diff --git a/Externals/wxWidgets3/include/wx/wrapsizer.h b/Externals/wxWidgets3/include/wx/wrapsizer.h
index 728acc1d63..a4d6145002 100644
--- a/Externals/wxWidgets3/include/wx/wrapsizer.h
+++ b/Externals/wxWidgets3/include/wx/wrapsizer.h
@@ -3,7 +3,6 @@
 // Purpose:     provide wrapping sizer for layout (wxWrapSizer)
 // Author:      Arne Steinarson
 // Created:     2008-05-08
-// RCS-ID:      $Id: wrapsizer.h 53541 2008-05-10 17:48:44Z PC $
 // Copyright:   (c) Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wupdlock.h b/Externals/wxWidgets3/include/wx/wupdlock.h
index eb7614be06..eb799a82e9 100644
--- a/Externals/wxWidgets3/include/wx/wupdlock.h
+++ b/Externals/wxWidgets3/include/wx/wupdlock.h
@@ -3,7 +3,6 @@
 // Purpose:     wxWindowUpdateLocker prevents window redrawing
 // Author:      Vadim Zeitlin
 // Created:     2006-03-06
-// RCS-ID:      $Id: wupdlock.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wx.h b/Externals/wxWidgets3/include/wx/wx.h
index 0055778b01..9f6a42cb13 100644
--- a/Externals/wxWidgets3/include/wx/wx.h
+++ b/Externals/wxWidgets3/include/wx/wx.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: wx.h 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wxchar.h b/Externals/wxWidgets3/include/wx/wxchar.h
index 052b237fcb..597bbe1599 100644
--- a/Externals/wxWidgets3/include/wx/wxchar.h
+++ b/Externals/wxWidgets3/include/wx/wxchar.h
@@ -4,7 +4,6 @@
 // Author:      Joel Farley, Ove Kåven
 // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
 // Created:     1998/06/12
-// RCS-ID:      $Id: wxchar.h 61961 2009-09-18 16:16:12Z VZ $
 // Copyright:   (c) 1998-2006 wxWidgets dev team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wxcrt.h b/Externals/wxWidgets3/include/wx/wxcrt.h
index e464e36c80..dd579364fa 100644
--- a/Externals/wxWidgets3/include/wx/wxcrt.h
+++ b/Externals/wxWidgets3/include/wx/wxcrt.h
@@ -5,7 +5,6 @@
 // Author:      Joel Farley, Ove Kaaven
 // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik
 // Created:     1998/06/12
-// RCS-ID:      $Id: wxcrt.h 68594 2011-08-08 08:33:19Z VZ $
 // Copyright:   (c) 1998-2006 wxWidgets dev team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wxcrtbase.h b/Externals/wxWidgets3/include/wx/wxcrtbase.h
index 4d3d9ebb22..1c3522ec66 100644
--- a/Externals/wxWidgets3/include/wx/wxcrtbase.h
+++ b/Externals/wxWidgets3/include/wx/wxcrtbase.h
@@ -5,7 +5,6 @@
  * Author:      Joel Farley, Ove Kaaven
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
- * RCS-ID:      $Id: wxcrtbase.h 70345 2012-01-15 01:05:28Z VZ $
  * Copyright:   (c) 1998-2006 wxWidgets dev team
  * Licence:     wxWindows licence
  */
@@ -63,7 +62,7 @@
    define it ourselves for them
  */
 #ifndef isascii
-    #if defined(__MWERKS__) || defined(__WX_STRICT_ANSI_GCC__)
+    #if defined(__WX_STRICT_ANSI_GCC__)
         #define wxNEED_ISASCII
     #elif defined(_WIN32_WCE)
         #if _WIN32_WCE <= 211
@@ -84,9 +83,7 @@
 
 /* string.h functions */
 #ifndef strdup
-    #if defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)
-        #define wxNEED_STRDUP
-    #elif defined(__WXWINCE__)
+    #if defined(__WXWINCE__)
         #if _WIN32_WCE <= 211
             #define wxNEED_STRDUP
         #endif
@@ -105,21 +102,6 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 #endif /* _WIN32_WCE */
 
 
-#if defined(__MWERKS__)
-    /* Metrowerks only has wide char support for OS X >= 10.3 */
-    #if !defined(__DARWIN__) || \
-         (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
-        #define wxHAVE_MWERKS_UNICODE
-    #endif
-
-    #ifdef wxHAVE_MWERKS_UNICODE
-        #define HAVE_WPRINTF   1
-        #define HAVE_WCSRTOMBS 1
-        #define HAVE_VSWPRINTF 1
-    #endif
-#endif /* __MWERKS__ */
-
-
 /* -------------------------------------------------------------------------
                             UTF-8 locale handling
    ------------------------------------------------------------------------- */
@@ -181,17 +163,15 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
     #define wxCRT_StrxfrmW   wcsxfrm
 #endif /* __WXWINCE__ */
 
-/* Almost all compiler have strdup(), but not quite all: CodeWarrior under
-   Mac and VC++ for Windows CE don't provide it. Another special case is gcc in
-   strict ANSI mode: normally it doesn't provide strdup() but MinGW does
-   provide it under MSVC-compatible name so test for it before checking
-   __WX_STRICT_ANSI_GCC__. */
-#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \
-    defined(__MINGW32__)
+/* Almost all compilers have strdup(), but VC++ and MinGW call it _strdup().
+   And it's not available in MinGW strict ANSI mode nor under Windows CE. */
+#if (defined(__VISUALC__) && __VISUALC__ >= 1400)
     #define wxCRT_StrdupA _strdup
-#elif !((defined(__MWERKS__) && defined(__WXMAC__)) || \
-        defined(__WXWINCE__) || \
-        defined(__WX_STRICT_ANSI_GCC__))
+#elif defined(__MINGW32__)
+    #ifndef __WX_STRICT_ANSI_GCC__
+        #define wxCRT_StrdupA _strdup
+    #endif
+#elif !defined(__WXWINCE__)
     #define wxCRT_StrdupA strdup
 #endif
 
@@ -268,8 +248,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
         defined(__EMX__) || defined(__DJGPP__)
     #define wxCRT_StricmpA stricmp
     #define wxCRT_StrnicmpA strnicmp
-#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
-        (defined(__MWERKS__) && defined(__INTEL__))
+#elif defined(__SYMANTEC__) || (defined(__VISUALC__) && !defined(__WXWINCE__))
     #define wxCRT_StricmpA _stricmp
     #define wxCRT_StrnicmpA _strnicmp
 #elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__WX_STRICT_ANSI_GCC__))
@@ -574,14 +553,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
 #define wxCRT_AtoiA                 atoi
 #define wxCRT_AtolA                 atol
 
-#if defined(__MWERKS__)
-    #if defined(__MSL__)
-        #define wxCRT_AtofW         watof
-        #define wxCRT_AtoiW         watoi
-        #define wxCRT_AtolW         watol
-    /* else: use ANSI versions */
-    #endif
-#elif defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
+#if defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
     #define  wxCRT_AtoiW           _wtoi
     #define  wxCRT_AtolW           _wtol
     /* _wtof doesn't exist */
@@ -593,39 +565,6 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
     /* wcstoi doesn't exist */
 #endif
 
-/*
-    There are 2 unrelated problems with these functions under Mac:
-        a) Metrowerks MSL CRT implements them strictly in C99 sense and
-           doesn't support (very common) extension of allowing to call
-           mbstowcs(NULL, ...) which makes it pretty useless as you can't
-           know the size of the needed buffer
-        b) OS X <= 10.2 declares and even defined these functions but
-           doesn't really implement them -- they always return an error
-
-    So use our own replacements in both cases.
- */
-#if defined(__MWERKS__) && defined(__MSL__)
-    #define wxNEED_WX_MBSTOWCS
-#endif
-
-#ifdef __DARWIN__
-    #if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-        #define wxNEED_WX_MBSTOWCS
-    #endif
-#endif
-
-#ifdef wxNEED_WX_MBSTOWCS
-    /* even though they are defined and "implemented", they are bad and just
-       stubs so we need our own - we need these even in ANSI builds!! */
-    WXDLLIMPEXP_BASE size_t wxMbstowcs(wchar_t *, const char *, size_t);
-    WXDLLIMPEXP_BASE size_t wxWcstombs(char *, const wchar_t *, size_t);
-#else
-    #define wxMbstowcs mbstowcs
-    #define wxWcstombs wcstombs
-#endif
-
-
-
 /* -------------------------------------------------------------------------
                                 time.h
    ------------------------------------------------------------------------- */
diff --git a/Externals/wxWidgets3/include/wx/wxcrtvararg.h b/Externals/wxWidgets3/include/wx/wxcrtvararg.h
index fbc8efdc75..08d6981e26 100644
--- a/Externals/wxWidgets3/include/wx/wxcrtvararg.h
+++ b/Externals/wxWidgets3/include/wx/wxcrtvararg.h
@@ -5,7 +5,6 @@
 // Author:      Joel Farley, Ove Kåven
 // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
 // Created:     2007-02-19
-// RCS-ID:      $Id: wxcrtvararg.h 61961 2009-09-18 16:16:12Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -150,12 +149,8 @@
             #define wxCRT_VsnprintfW    _vsnwprintf
         #endif
 
-        /*
-           All versions of CodeWarrior supported by wxWidgets apparently
-           have both snprintf() and vsnprintf()
-         */
         #if defined(HAVE_VSNPRINTF) \
-            || defined(__MWERKS__) || defined(__WATCOMC__)
+            || defined(__WATCOMC__)
             #ifdef HAVE_BROKEN_VSNPRINTF_DECL
                 #define wxCRT_VsnprintfA    wx_fixed_vsnprintf
             #else
@@ -243,7 +238,17 @@
 #define wxCRT_ScanfA     scanf
 #define wxCRT_SscanfA    sscanf
 #define wxCRT_FscanfA    fscanf
-#define wxCRT_VsscanfA   vsscanf
+
+/* vsscanf() may have a wrong declaration with non-const first parameter, fix
+ * this by wrapping it if necessary. */
+#if defined __cplusplus && defined HAVE_BROKEN_VSSCANF_DECL
+    inline int wxCRT_VsscanfA(const char *str, const char *format, va_list ap)
+    {
+        return vsscanf(const_cast<char *>(str), format, ap);
+    }
+#else
+    #define wxCRT_VsscanfA   vsscanf
+#endif
 
 #if defined(wxNEED_WPRINTF)
     int wxCRT_ScanfW(const wchar_t *format, ...);
diff --git a/Externals/wxWidgets3/include/wx/wxhtml.h b/Externals/wxWidgets3/include/wx/wxhtml.h
index 795bb83212..9759dac060 100644
--- a/Externals/wxWidgets3/include/wx/wxhtml.h
+++ b/Externals/wxWidgets3/include/wx/wxhtml.h
@@ -2,7 +2,6 @@
 // Name:        wx/wxhtml.h
 // Purpose:     wxHTML library for wxWidgets
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: wxhtml.h 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/wxprec.h b/Externals/wxWidgets3/include/wx/wxprec.h
index d1e3fe8a30..2b50dff4b3 100644
--- a/Externals/wxWidgets3/include/wx/wxprec.h
+++ b/Externals/wxWidgets3/include/wx/wxprec.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: wxprec.h 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,6 @@
 #if defined(__VISUALC__)   || \
     defined(__DMC__)       || \
     defined(__VISAGECPP__) || \
-    defined(__MWERKS__)    || \
     defined(__WATCOMC__)   || \
     defined(__BORLANDC__)
 
@@ -41,11 +39,13 @@
 #include "wx/chartype.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/wrapwin.h"
+    #include "wx/msw/private.h"
+#endif
+#if defined(__WXMSW__)
     #include "wx/msw/wrapcctl.h"
     #include "wx/msw/wrapcdlg.h"
-    #include "wx/msw/private.h"
     #include "wx/msw/missing.h"
 #endif
 
diff --git a/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h b/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h
new file mode 100644
index 0000000000..d13100e7dc
--- /dev/null
+++ b/Externals/wxWidgets3/include/wx/x11/private/wrapxkb.h
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/x11/private/wrapxkb.h
+// Purpose:     Private header wrapping X11/XKBlib.h inclusion.
+// Author:      Vadim Zeitlin
+// Created:     2012-05-07
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _X11_PRIVATE_WRAPXKB_H_
+#define _X11_PRIVATE_WRAPXKB_H_
+
+#ifdef HAVE_X11_XKBLIB_H
+    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
+     * field named "explicit" - which is, of course, an error for a C++
+     * compiler. To be on the safe side, just redefine it everywhere. */
+    #define explicit __wx_explicit
+
+    #include <X11/XKBlib.h>
+
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H
+
+#endif // _X11_PRIVATE_WRAPXKB_H_
diff --git a/Externals/wxWidgets3/include/wx/xlocale.h b/Externals/wxWidgets3/include/wx/xlocale.h
index e8d02331a1..6a01ad311a 100644
--- a/Externals/wxWidgets3/include/wx/xlocale.h
+++ b/Externals/wxWidgets3/include/wx/xlocale.h
@@ -3,7 +3,6 @@
 // Purpose:     Header to provide some xlocale wrappers
 // Author:      Brian Vanderburg II, Vadim Zeitlin
 // Created:     2008-01-07
-// RCS-ID:      $Id: xlocale.h 64109 2010-04-22 14:16:12Z VZ $
 // Copyright:   (c) 2008 Brian Vanderburg II
 //                  2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/xpmdecod.h b/Externals/wxWidgets3/include/wx/xpmdecod.h
index be97599289..68edc924e7 100644
--- a/Externals/wxWidgets3/include/wx/xpmdecod.h
+++ b/Externals/wxWidgets3/include/wx/xpmdecod.h
@@ -2,7 +2,6 @@
 // Name:        wx/xpmdecod.h
 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
-// CVS-ID:      $Id: xpmdecod.h 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/xpmhand.h b/Externals/wxWidgets3/include/wx/xpmhand.h
index 4207f7da80..0952748d80 100644
--- a/Externals/wxWidgets3/include/wx/xpmhand.h
+++ b/Externals/wxWidgets3/include/wx/xpmhand.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id: xpmhand.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/xti.h b/Externals/wxWidgets3/include/wx/xti.h
index abd8ae0934..75f594f494 100644
--- a/Externals/wxWidgets3/include/wx/xti.h
+++ b/Externals/wxWidgets3/include/wx/xti.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xti.h 70396 2012-01-19 09:00:29Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/xti2.h b/Externals/wxWidgets3/include/wx/xti2.h
index 70d3c154d8..16e5f212f1 100644
--- a/Externals/wxWidgets3/include/wx/xti2.h
+++ b/Externals/wxWidgets3/include/wx/xti2.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xti2.h 66651 2011-01-08 10:22:30Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 /////////////////////////////////////////////////////////////////////////////
@@ -124,7 +123,7 @@ wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data )        \
     _DEFAULT_CONSTRUCTOR(name)                                                  \
     _DEFAULT_CONVERTERS(name)                                                   \
     void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn )                 \
-{ (*fn)( &wxANY_AS(data, name) ); }                        \
+    { name o = wxANY_AS(data, name); (*fn)( &o ); }                        \
     \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL };  \
     wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                \
diff --git a/Externals/wxWidgets3/include/wx/xtictor.h b/Externals/wxWidgets3/include/wx/xtictor.h
index bb380703a7..6969463f38 100644
--- a/Externals/wxWidgets3/include/wx/xtictor.h
+++ b/Externals/wxWidgets3/include/wx/xtictor.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xtictor.h 66626 2011-01-07 17:43:12Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/include/wx/xtihandler.h b/Externals/wxWidgets3/include/wx/xtihandler.h
index aafa2ad1ca..c63ddb3a36 100644
--- a/Externals/wxWidgets3/include/wx/xtihandler.h
+++ b/Externals/wxWidgets3/include/wx/xtihandler.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xtihandler.h 66651 2011-01-08 10:22:30Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
@@ -94,7 +93,7 @@ private:
 #define wxHANDLER(name,eventClassType)                                               \
     static wxHandlerInfo _handlerInfo##name( first, class_t::GetClassInfoStatic(),   \
                     wxT(#name), (wxObjectEventFunction) (wxEventFunction) &name,     \
-                    CLASSINFO( eventClassType ) );
+                    wxCLASSINFO( eventClassType ) );
 
 #define wxBEGIN_HANDLERS_TABLE(theClass)          \
     wxHandlerInfo *theClass::GetHandlersStatic()  \
diff --git a/Externals/wxWidgets3/include/wx/xtiprop.h b/Externals/wxWidgets3/include/wx/xtiprop.h
index 75539f51e4..18626f2982 100644
--- a/Externals/wxWidgets3/include/wx/xtiprop.h
+++ b/Externals/wxWidgets3/include/wx/xtiprop.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xtiprop.h 70398 2012-01-19 09:50:46Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
@@ -177,7 +176,7 @@ public:
         if ( m_setter ) 
             m_setter->Set( object, value ); 
         else 
-            wxLogError( _("SetProperty called w/o valid setter") ); 
+            wxLogError( wxGetTranslation("SetProperty called w/o valid setter") ); 
     }
 
     // Getting a simple property (non-collection)
@@ -186,7 +185,7 @@ public:
         if ( m_getter ) 
             m_getter->Get( object, result ); 
         else 
-            wxLogError( _("GetProperty called w/o valid getter") ); 
+            wxLogError( wxGetTranslation("GetProperty called w/o valid getter") ); 
     }
 
     // Adding an element to a collection property
@@ -195,7 +194,7 @@ public:
         if ( m_adder ) 
             m_adder->Add( object, value ); 
         else 
-            wxLogError( _("AddToPropertyCollection called w/o valid adder") ); 
+            wxLogError( wxGetTranslation("AddToPropertyCollection called w/o valid adder") ); 
     }
 
     // Getting a collection property
@@ -204,7 +203,7 @@ public:
         if ( m_collectionGetter ) 
             m_collectionGetter->Get( obj, result); 
         else 
-            wxLogError( _("GetPropertyCollection called w/o valid collection getter") ); 
+            wxLogError( wxGetTranslation("GetPropertyCollection called w/o valid collection getter") ); 
     }
 
     virtual bool HasSetter() const { return m_setter != NULL; }
@@ -257,14 +256,14 @@ public:
     virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), 
                                          const wxAny &WXUNUSED(value)) const
     { 
-        wxLogError( _("AddToPropertyCollection called on a generic accessor") ); 
+        wxLogError( wxGetTranslation("AddToPropertyCollection called on a generic accessor") ); 
     }
 
     // Getting a collection property
     virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), 
                                         wxAnyList &WXUNUSED(result)) const
     { 
-        wxLogError ( _("GetPropertyCollection called on a generic accessor") ); 
+        wxLogError ( wxGetTranslation("GetPropertyCollection called on a generic accessor") ); 
     }
 
 private:
@@ -536,13 +535,13 @@ class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap : public wxStringToAnyHashMapBas
         &_accessor##pname, flags, help, group  );
 
 #define wxEVENT_PROPERTY( name, eventType, eventClass )                               \
-    static wxEventSourceTypeInfo _typeInfo##name( eventType, CLASSINFO( eventClass ) );  \
+    static wxEventSourceTypeInfo _typeInfo##name( eventType, wxCLASSINFO( eventClass ) );  \
     static wxPropertyInfo _propertyInfo##name( first,class_t::GetClassInfoStatic(),   \
         wxT(#name), &_typeInfo##name, NULL, wxAny() );
 
 #define wxEVENT_RANGE_PROPERTY( name, eventType, lastEventType, eventClass )          \
     static wxEventSourceTypeInfo _typeInfo##name( eventType, lastEventType,              \
-                                               CLASSINFO( eventClass ) );             \
+                                               wxCLASSINFO( eventClass ) );             \
     static wxPropertyInfo _propertyInfo##name( first, class_t::GetClassInfoStatic(),  \
         wxT(#name), &_typeInfo##name, NULL, wxAny() );
 
diff --git a/Externals/wxWidgets3/include/wx/xtistrm.h b/Externals/wxWidgets3/include/wx/xtistrm.h
index e304803494..0621ead1ea 100644
--- a/Externals/wxWidgets3/include/wx/xtistrm.h
+++ b/Externals/wxWidgets3/include/wx/xtistrm.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: xtistrm.h 70396 2012-01-19 09:00:29Z SC $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/xtitypes.h b/Externals/wxWidgets3/include/wx/xtitypes.h
index 6724bf4c35..afd5c07b45 100644
--- a/Externals/wxWidgets3/include/wx/xtitypes.h
+++ b/Externals/wxWidgets3/include/wx/xtitypes.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Francesco Montorsi
 // Created:     27/07/03
-// RCS-ID:      $Id: xtitypes.h 70384 2012-01-18 14:05:39Z SC $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
@@ -236,7 +235,7 @@ void wxFlagsToString( wxString &s, const e& data )
 #define wxBEGIN_FLAGS( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 
-#define wxFLAGS_MEMBER( v ) { wxT(#v), v },
+#define wxFLAGS_MEMBER( v ) { wxT(#v), static_cast<int>(v) },
 
 #define wxEND_FLAGS( e )                                                \
         { NULL, 0 } };                                                 \
diff --git a/Externals/wxWidgets3/include/wx/xtixml.h b/Externals/wxWidgets3/include/wx/xtixml.h
index 5eaf03fa51..100e0653e1 100644
--- a/Externals/wxWidgets3/include/wx/xtixml.h
+++ b/Externals/wxWidgets3/include/wx/xtixml.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: xtixml.h 70397 2012-01-19 09:45:49Z SC $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/zipstrm.h b/Externals/wxWidgets3/include/wx/zipstrm.h
index 0d71075225..9cd7631944 100644
--- a/Externals/wxWidgets3/include/wx/zipstrm.h
+++ b/Externals/wxWidgets3/include/wx/zipstrm.h
@@ -2,7 +2,6 @@
 // Name:        wx/zipstrm.h
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: zipstrm.h 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/include/wx/zstream.h b/Externals/wxWidgets3/include/wx/zstream.h
index 421116e45b..193bb79d4e 100644
--- a/Externals/wxWidgets3/include/wx/zstream.h
+++ b/Externals/wxWidgets3/include/wx/zstream.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Created:     11/07/98
-// RCS-ID:      $Id: zstream.h 66259 2010-11-25 00:53:44Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/aui/auibar.cpp b/Externals/wxWidgets3/src/aui/auibar.cpp
index b6654e2fb4..2bfcbe1b6a 100644
--- a/Externals/wxWidgets3/src/aui/auibar.cpp
+++ b/Externals/wxWidgets3/src/aui/auibar.cpp
@@ -1,3 +1,4 @@
+// XXX comex: scale support
 ///////////////////////////////////////////////////////////////////////////////
 
 // Name:        src/aui/auibar.cpp
@@ -5,7 +6,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: auibar.cpp 70748 2012-02-29 13:58:52Z VZ $
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -44,11 +44,11 @@
 WX_DEFINE_OBJARRAY(wxAuiToolBarItemArray)
 
 
-wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDEFINE_EVENT( wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
 
 
 IMPLEMENT_CLASS(wxAuiToolBar, wxControl)
@@ -101,7 +101,7 @@ public:
 
     bool ProcessEvent(wxEvent& evt)
     {
-        if (evt.GetEventType() == wxEVT_COMMAND_MENU_SELECTED)
+        if (evt.GetEventType() == wxEVT_MENU)
         {
             m_lastId = evt.GetId();
             return true;
@@ -214,6 +214,19 @@ void wxAuiDefaultToolBarArt::DrawBackground(
     dc.GradientFillLinear(rect, startColour, endColour, wxSOUTH);
 }
 
+void wxAuiDefaultToolBarArt::DrawPlainBackground(wxDC& dc,
+                                                   wxWindow* WXUNUSED(wnd),
+                                                   const wxRect& _rect)
+{
+    wxRect rect = _rect;
+    rect.height++;
+
+    dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+
+    dc.DrawRectangle(rect.GetX() - 1, rect.GetY() - 1,
+                     rect.GetWidth() + 2, rect.GetHeight() + 1);
+}
+
 void wxAuiDefaultToolBarArt::DrawLabel(
                                     wxDC& dc,
                                     wxWindow* WXUNUSED(wnd),
@@ -267,11 +280,11 @@ void wxAuiDefaultToolBarArt::DrawButton(
     {
         bmpX = rect.x +
                 (rect.width/2) -
-                (item.GetBitmap().GetWidth()/2);
+                (item.GetBitmap().GetScaledWidth()/2);
 
         bmpY = rect.y +
                 ((rect.height-textHeight)/2) -
-                (item.GetBitmap().GetHeight()/2);
+                (item.GetBitmap().GetScaledHeight()/2);
 
         textX = rect.x + (rect.width/2) - (textWidth/2) + 1;
         textY = rect.y + rect.height - textHeight - 1;
@@ -282,9 +295,9 @@ void wxAuiDefaultToolBarArt::DrawButton(
 
         bmpY = rect.y +
                 (rect.height/2) -
-                (item.GetBitmap().GetHeight()/2);
+                (item.GetBitmap().GetScaledHeight()/2);
 
-        textX = bmpX + 3 + item.GetBitmap().GetWidth();
+        textX = bmpX + 3 + item.GetBitmap().GetScaledWidth();
         textY = rect.y +
                  (rect.height/2) -
                  (textHeight/2);
@@ -313,7 +326,7 @@ void wxAuiDefaultToolBarArt::DrawButton(
         }
         else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED)
         {
-            // it's important to put this code in an else statment after the
+            // it's important to put this code in an else statement after the
             // hover, otherwise hovers won't draw properly for checked items
             dc.SetPen(wxPen(m_highlightColour));
             dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(170)));
@@ -378,20 +391,20 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
 
     dropBmpX = dropDownRect.x +
                 (dropDownRect.width/2) -
-                (m_buttonDropDownBmp.GetWidth()/2);
+                (m_buttonDropDownBmp.GetScaledWidth()/2);
     dropBmpY = dropDownRect.y +
                 (dropDownRect.height/2) -
-                (m_buttonDropDownBmp.GetHeight()/2);
+                (m_buttonDropDownBmp.GetScaledHeight()/2);
 
 
     if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM)
     {
         bmpX = buttonRect.x +
                 (buttonRect.width/2) -
-                (item.GetBitmap().GetWidth()/2);
+                (item.GetBitmap().GetScaledWidth()/2);
         bmpY = buttonRect.y +
                 ((buttonRect.height-textHeight)/2) -
-                (item.GetBitmap().GetHeight()/2);
+                (item.GetBitmap().GetScaledHeight()/2);
 
         textX = rect.x + (rect.width/2) - (textWidth/2) + 1;
         textY = rect.y + rect.height - textHeight - 1;
@@ -402,9 +415,9 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton(
 
         bmpY = rect.y +
                 (rect.height/2) -
-                (item.GetBitmap().GetHeight()/2);
+                (item.GetBitmap().GetScaledHeight()/2);
 
-        textX = bmpX + 3 + item.GetBitmap().GetWidth();
+        textX = bmpX + 3 + item.GetBitmap().GetScaledWidth();
         textY = rect.y +
                  (rect.height/2) -
                  (textHeight/2);
@@ -541,8 +554,8 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize(
     if (!item.GetBitmap().IsOk() && !(m_flags & wxAUI_TB_TEXT))
         return wxSize(16,16);
 
-    int width = item.GetBitmap().GetWidth();
-    int height = item.GetBitmap().GetHeight();
+    int width = item.GetBitmap().GetScaledWidth();
+    int height = item.GetBitmap().GetScaledHeight();
 
     if (m_flags & wxAUI_TB_TEXT)
     {
@@ -682,8 +695,8 @@ void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc,
         }
     }
 
-    int x = rect.x+1+(rect.width-m_overflowBmp.GetWidth())/2;
-    int y = rect.y+1+(rect.height-m_overflowBmp.GetHeight())/2;
+    int x = rect.x+1+(rect.width-m_overflowBmp.GetScaledWidth())/2;
+    int y = rect.y+1+(rect.height-m_overflowBmp.GetScaledHeight())/2;
     dc.DrawBitmap(m_overflowBmp, x, y, true);
 }
 
@@ -798,23 +811,13 @@ BEGIN_EVENT_TABLE(wxAuiToolBar, wxControl)
     EVT_SET_CURSOR(wxAuiToolBar::OnSetCursor)
 END_EVENT_TABLE()
 
-
-wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
-                           wxWindowID id,
-                           const wxPoint& position,
-                           const wxSize& size,
-                           long style)
-                            : wxControl(parent,
-                                        id,
-                                        position,
-                                        size,
-                                        style | wxBORDER_NONE)
+void wxAuiToolBar::Init()
 {
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
     m_buttonWidth = -1;
     m_buttonHeight = -1;
     m_sizerElementCount = 0;
-    m_actionPos = wxPoint(-1,-1);
+    m_actionPos = wxDefaultPosition;
     m_actionItem = NULL;
     m_tipItem = NULL;
     m_art = new wxAuiDefaultToolBarArt;
@@ -824,15 +827,34 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
     m_gripperSizerItem = NULL;
     m_overflowSizerItem = NULL;
     m_dragging = false;
+    m_gripperVisible = false;
+    m_overflowVisible = false;
+    m_overflowState = 0;
+    m_orientation = wxHORIZONTAL;
+}
+
+bool wxAuiToolBar::Create(wxWindow* parent,
+                           wxWindowID id,
+                           const wxPoint& pos,
+                           const wxSize& size,
+                           long style)
+{
+    style = style|wxBORDER_NONE;
+
+    if (!wxControl::Create(parent, id, pos, size, style))
+        return false;
+
+    m_windowStyle = style;
+
+    m_gripperVisible  = (style & wxAUI_TB_GRIPPER) ? true : false;
+    m_overflowVisible = (style & wxAUI_TB_OVERFLOW) ? true : false;
+
     m_orientation = GetOrientation(style);
     if (m_orientation == wxBOTH)
     {
         m_orientation = wxHORIZONTAL;
     }
-    m_style = style | wxBORDER_NONE;
-    m_gripperVisible = (m_style & wxAUI_TB_GRIPPER) ? true : false;
-    m_overflowVisible = (m_style & wxAUI_TB_OVERFLOW) ? true : false;
-    m_overflowState = 0;
+
     SetMargins(5, 5, 2, 2);
     SetFont(*wxNORMAL_FONT);
     SetArtFlags();
@@ -840,8 +862,9 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
     if (style & wxAUI_TB_HORZ_LAYOUT)
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-}
 
+    return true;
+}
 
 wxAuiToolBar::~wxAuiToolBar()
 {
@@ -857,20 +880,20 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
 
     wxControl::SetWindowStyleFlag(style);
 
-    m_style = style;
+    m_windowStyle = style;
 
     if (m_art)
     {
         SetArtFlags();
     }
 
-    if (m_style & wxAUI_TB_GRIPPER)
+    if (m_windowStyle & wxAUI_TB_GRIPPER)
         m_gripperVisible = true;
     else
         m_gripperVisible = false;
 
 
-    if (m_style & wxAUI_TB_OVERFLOW)
+    if (m_windowStyle & wxAUI_TB_OVERFLOW)
         m_overflowVisible = true;
     else
         m_overflowVisible = false;
@@ -881,11 +904,6 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
         SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);
 }
 
-long wxAuiToolBar::GetWindowStyleFlag() const
-{
-    return m_style;
-}
-
 void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art)
 {
     delete m_art;
@@ -1256,16 +1274,16 @@ void wxAuiToolBar::SetToolDropDown(int tool_id, bool dropdown)
     if (!item)
         return;
 
-    item->m_dropDown = dropdown;
+    item->SetHasDropDown(dropdown);
 }
 
 bool wxAuiToolBar::GetToolDropDown(int tool_id) const
 {
     wxAuiToolBarItem* item = FindTool(tool_id);
     if (!item)
-        return 0;
+        return false;
 
-    return item->m_dropDown;
+    return item->HasDropDown();
 }
 
 void wxAuiToolBar::SetToolSticky(int tool_id, bool sticky)
@@ -1368,9 +1386,9 @@ void wxAuiToolBar::SetGripperVisible(bool visible)
 {
     m_gripperVisible = visible;
     if (visible)
-        m_style |= wxAUI_TB_GRIPPER;
+        m_windowStyle |= wxAUI_TB_GRIPPER;
     else
-        m_style &= ~wxAUI_TB_GRIPPER;
+        m_windowStyle &= ~wxAUI_TB_GRIPPER;
     Realize();
     Refresh(false);
 }
@@ -1385,9 +1403,9 @@ void wxAuiToolBar::SetOverflowVisible(bool visible)
 {
     m_overflowVisible = visible;
     if (visible)
-        m_style |= wxAUI_TB_OVERFLOW;
+        m_windowStyle |= wxAUI_TB_OVERFLOW;
     else
-        m_style &= ~wxAUI_TB_OVERFLOW;
+        m_windowStyle &= ~wxAUI_TB_OVERFLOW;
     Refresh(false);
 }
 
@@ -1406,6 +1424,9 @@ bool wxAuiToolBar::SetFont(const wxFont& font)
 
 void wxAuiToolBar::SetHoverItem(wxAuiToolBarItem* pitem)
 {
+    if (pitem && (pitem->m_state & wxAUI_BUTTON_STATE_DISABLED))
+        pitem = NULL;
+
     wxAuiToolBarItem* former_hover = NULL;
 
     size_t i, count;
@@ -1671,7 +1692,7 @@ wxSize wxAuiToolBar::GetHintSize(int dock_direction) const
 
 bool wxAuiToolBar::IsPaneValid(const wxAuiPaneInfo& pane) const
 {
-    return IsPaneValid(m_style, pane);
+    return IsPaneValid(m_windowStyle, pane);
 }
 
 bool wxAuiToolBar::IsPaneValid(long style, const wxAuiPaneInfo& pane)
@@ -1705,7 +1726,7 @@ bool wxAuiToolBar::IsPaneValid(long style) const
 
 void wxAuiToolBar::SetArtFlags() const
 {
-    unsigned int artflags = m_style & ~wxAUI_ORIENTATION_MASK;
+    unsigned int artflags = m_windowStyle & ~wxAUI_ORIENTATION_MASK;
     if (m_orientation == wxVERTICAL)
     {
         artflags |= wxAUI_TB_VERTICAL;
@@ -1940,7 +1961,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
                 vert_sizer->AddStretchSpacer(1);
                 ctrl_m_sizerItem = vert_sizer->Add(item.m_window, 0, wxEXPAND);
                 vert_sizer->AddStretchSpacer(1);
-                if ( (m_style & wxAUI_TB_TEXT) &&
+                if ( (m_windowStyle & wxAUI_TB_TEXT) &&
                      m_toolTextOrientation == wxAUI_TBTOOL_TEXT_BOTTOM &&
                      !item.GetLabel().empty() )
                 {
@@ -1990,7 +2011,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
     // add drop down area
     m_overflowSizerItem = NULL;
 
-    if (m_style & wxAUI_TB_OVERFLOW)
+    if (m_windowStyle & wxAUI_TB_OVERFLOW)
     {
         int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE);
         if (overflow_size > 0 && m_overflowVisible)
@@ -2057,7 +2078,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
     m_minWidth = size.x;
     m_minHeight = size.y;
 
-    if ((m_style & wxAUI_TB_NO_AUTORESIZE) == 0)
+    if ((m_windowStyle & wxAUI_TB_NO_AUTORESIZE) == 0)
     {
         wxSize curSize = GetClientSize();
         wxSize new_size = GetMinSize();
@@ -2277,7 +2298,7 @@ void wxAuiToolBar::OnIdle(wxIdleEvent& evt)
         // pane state member is public, so it might have been changed
         // without going through wxPaneInfo::SetFlag() check
         bool ok = pane.IsOk();
-        wxCHECK2_MSG(!ok || IsPaneValid(m_style, pane), ok = false,
+        wxCHECK2_MSG(!ok || IsPaneValid(m_windowStyle, pane), ok = false,
                     "window settings and pane settings are incompatible");
         if (ok)
         {
@@ -2299,7 +2320,7 @@ void wxAuiToolBar::OnIdle(wxIdleEvent& evt)
                 }
             }
             else if (pane.IsResizable() &&
-                    GetOrientation(m_style) == wxBOTH)
+                    GetOrientation(m_windowStyle) == wxBOTH)
             {
                 // changing orientation in OnSize causes havoc
                 int x, y;
@@ -2359,8 +2380,10 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
 
     bool horizontal = m_orientation == wxHORIZONTAL;
 
-
-    m_art->DrawBackground(dc, this, cli_rect);
+    if (m_windowStyle & wxAUI_TB_PLAIN_BACKGROUND)
+        m_art->DrawPlainBackground(dc, this, cli_rect);
+    else
+        m_art->DrawBackground(dc, this, cli_rect);
 
     int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE);
     int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE);
@@ -2403,41 +2426,36 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
             break;
         }
 
-        if (item.m_kind == wxITEM_SEPARATOR)
+        switch ( item.m_kind )
         {
-            // draw a separator
-            m_art->DrawSeparator(dc, this, item_rect);
-        }
-        else if (item.m_kind == wxITEM_LABEL)
-        {
-            // draw a text label only
-            m_art->DrawLabel(dc, this, item, item_rect);
-        }
-        else if (item.m_kind == wxITEM_NORMAL)
-        {
-            // draw a regular button or dropdown button
-            if (!item.m_dropDown)
+            case wxITEM_NORMAL:
+                // draw a regular or dropdown button
+                if (!item.m_dropDown)
+                    m_art->DrawButton(dc, this, item, item_rect);
+                else
+                    m_art->DrawDropDownButton(dc, this, item, item_rect);
+                break;
+
+            case wxITEM_CHECK:
+            case wxITEM_RADIO:
+                // draw a toggle button
                 m_art->DrawButton(dc, this, item, item_rect);
-            else
-                m_art->DrawDropDownButton(dc, this, item, item_rect);
-        }
-        else if (item.m_kind == wxITEM_CHECK)
-        {
-            // draw either a regular or dropdown toggle button
-            if (!item.m_dropDown)
-                m_art->DrawButton(dc, this, item, item_rect);
-            else
-                m_art->DrawDropDownButton(dc, this, item, item_rect);
-        }
-        else if (item.m_kind == wxITEM_RADIO)
-        {
-            // draw a toggle button
-            m_art->DrawButton(dc, this, item, item_rect);
-        }
-        else if (item.m_kind == wxITEM_CONTROL)
-        {
-            // draw the control's label
-            m_art->DrawControlLabel(dc, this, item, item_rect);
+                break;
+
+            case wxITEM_SEPARATOR:
+                // draw a separator
+                m_art->DrawSeparator(dc, this, item_rect);
+                break;
+
+            case wxITEM_LABEL:
+                // draw a text label only
+                m_art->DrawLabel(dc, this, item, item_rect);
+                break;
+
+            case wxITEM_CONTROL:
+                // draw the control's label
+                m_art->DrawControlLabel(dc, this, item, item_rect);
+                break;
         }
 
         // fire a signal to see if the item wants to be custom-rendered
@@ -2488,7 +2506,7 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
             m_overflowVisible &&
             overflow_rect.Contains(evt.m_x, evt.m_y))
         {
-            wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, -1);
+            wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, -1);
             e.SetEventObject(this);
             e.SetToolId(-1);
             e.SetClickPoint(wxPoint(evt.GetX(), evt.GetY()));
@@ -2527,9 +2545,9 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
                 Refresh(false);
                 if (res != -1)
                 {
-                    wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, res);
-                    e.SetEventObject(this);
-                    GetParent()->GetEventHandler()->ProcessEvent(e);
+                    wxCommandEvent event(wxEVT_MENU, res);
+                    event.SetEventObject(this);
+                    GetParent()->GetEventHandler()->ProcessEvent(event);
                 }
             }
 
@@ -2553,7 +2571,7 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
         UnsetToolTip();
 
         // fire the tool dropdown event
-        wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, m_actionItem->m_toolId);
+        wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, m_actionItem->m_toolId);
         e.SetEventObject(this);
         e.SetToolId(m_actionItem->m_toolId);
 
@@ -2580,6 +2598,11 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
         if(!GetEventHandler()->ProcessEvent(e) || e.GetSkipped())
             CaptureMouse();
 
+        // Ensure hovered item is really ok, as mouse may have moved during
+        //  event processing
+        wxPoint cursor_pos_after_evt = ScreenToClient(wxGetMousePosition());
+        SetHoverItem(FindToolByPosition(cursor_pos_after_evt.x, cursor_pos_after_evt.y));
+
         DoIdleUpdate();
     }
 }
@@ -2591,11 +2614,9 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
 
     SetPressedItem(NULL);
 
-    wxAuiToolBarItem* hitItem = FindToolByPosition(evt.GetX(), evt.GetY());
-    if (hitItem && !(hitItem->m_state & wxAUI_BUTTON_STATE_DISABLED))
-    {
-        SetHoverItem(hitItem);
-    }
+    wxAuiToolBarItem* hitItem;
+    hitItem = FindToolByPosition(evt.GetX(), evt.GetY());
+    SetHoverItem(hitItem);
 
     if (m_dragging)
     {
@@ -2613,7 +2634,7 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
         {
             UnsetToolTip();
 
-            wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_actionItem->m_toolId);
+            wxCommandEvent e(wxEVT_MENU, m_actionItem->m_toolId);
             e.SetEventObject(this);
 
             if (hitItem->m_kind == wxITEM_CHECK || hitItem->m_kind == wxITEM_RADIO)
@@ -2636,6 +2657,12 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt)
             ReleaseMouse();
 
             GetEventHandler()->ProcessEvent(e);
+
+            // Ensure hovered item is really ok, as mouse may have moved during
+            // event processing
+            wxPoint cursor_pos_after_evt = ScreenToClient(wxGetMousePosition());
+            SetHoverItem(FindToolByPosition(cursor_pos_after_evt.x, cursor_pos_after_evt.y));
+
             DoIdleUpdate();
         }
         else
@@ -2686,7 +2713,7 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt)
 
     if (m_actionItem && hitItem == m_actionItem)
     {
-        wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, m_actionItem->m_toolId);
+        wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_RIGHT_CLICK, m_actionItem->m_toolId);
         e.SetEventObject(this);
         e.SetToolId(m_actionItem->m_toolId);
         e.SetClickPoint(m_actionPos);
@@ -2696,7 +2723,7 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt)
     else
     {
         // right-clicked on the invalid area of the toolbar
-        wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1);
+        wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_RIGHT_CLICK, -1);
         e.SetEventObject(this);
         e.SetToolId(-1);
         e.SetClickPoint(m_actionPos);
@@ -2757,7 +2784,7 @@ void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt)
     {
         if (hitItem->m_kind == wxITEM_NORMAL)
         {
-            wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, m_actionItem->m_toolId);
+            wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_MIDDLE_CLICK, m_actionItem->m_toolId);
             e.SetEventObject(this);
             e.SetToolId(m_actionItem->m_toolId);
             e.SetClickPoint(m_actionPos);
@@ -2781,7 +2808,7 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
     {
         // TODO: sending this event only makes sense if there is an 'END_DRAG'
         // event sent sometime in the future (see OnLeftUp())
-        wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, GetId());
+        wxAuiToolBarEvent e(wxEVT_AUITOOLBAR_BEGIN_DRAG, GetId());
         e.SetEventObject(this);
         e.SetToolId(m_actionItem->m_toolId);
         m_dragging = GetEventHandler()->ProcessEvent(e) && !e.GetSkipped();
@@ -2808,10 +2835,7 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
     }
     else
     {
-        if (hitItem && (hitItem->m_state & wxAUI_BUTTON_STATE_DISABLED))
-            SetHoverItem(NULL);
-        else
-            SetHoverItem(hitItem);
+        SetHoverItem(hitItem);
 
         // tooltips handling
         wxAuiToolBarItem* packingHitItem;
diff --git a/Externals/wxWidgets3/src/aui/auibook.cpp b/Externals/wxWidgets3/src/aui/auibook.cpp
index f299944023..2d1787ee0a 100644
--- a/Externals/wxWidgets3/src/aui/auibook.cpp
+++ b/Externals/wxWidgets3/src/aui/auibook.cpp
@@ -2,7 +2,7 @@
 // Name:        src/aui/auibook.cpp
 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
-// Modified by:
+// Modified by: Jens Lody
 // Created:     2006-06-28
 // Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
@@ -24,14 +24,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
-    #include "wx/image.h"
-    #include "wx/menu.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
 #endif
 
 #include "wx/aui/tabmdi.h"
-#include "wx/dcbuffer.h"
-
-#include "wx/renderer.h"
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
@@ -41,1256 +38,28 @@
 WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
 WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray)
 
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
+wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
 
 IMPLEMENT_CLASS(wxAuiNotebook, wxControl)
 IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent)
 
 
-
-
-
-// these functions live in dockart.cpp -- they'll eventually
-// be moved to a new utility cpp file
-
-wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
-                             const wxColour& color);
-
-wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size);
-
-static void DrawButtons(wxDC& dc,
-                        const wxRect& _rect,
-                        const wxBitmap& bmp,
-                        const wxColour& bkcolour,
-                        int button_state)
-{
-    wxRect rect = _rect;
-
-    if (button_state == wxAUI_BUTTON_STATE_PRESSED)
-    {
-        rect.x++;
-        rect.y++;
-    }
-
-    if (button_state == wxAUI_BUTTON_STATE_HOVER ||
-        button_state == wxAUI_BUTTON_STATE_PRESSED)
-    {
-        dc.SetBrush(wxBrush(bkcolour.ChangeLightness(120)));
-        dc.SetPen(wxPen(bkcolour.ChangeLightness(75)));
-
-        // draw the background behind the button
-        dc.DrawRectangle(rect.x, rect.y, 15, 15);
-    }
-
-    // draw the button itself
-    dc.DrawBitmap(bmp, rect.x, rect.y, true);
-}
-
-static void IndentPressedBitmap(wxRect* rect, int button_state)
-{
-    if (button_state == wxAUI_BUTTON_STATE_PRESSED)
-    {
-        rect->x++;
-        rect->y++;
-    }
-}
-
-
-
-// -- GUI helper classes and functions --
-
-class wxAuiCommandCapture : public wxEvtHandler
-{
-public:
-
-    wxAuiCommandCapture() { m_lastId = 0; }
-    int GetCommandId() const { return m_lastId; }
-
-    bool ProcessEvent(wxEvent& evt)
-    {
-        if (evt.GetEventType() == wxEVT_COMMAND_MENU_SELECTED)
-        {
-            m_lastId = evt.GetId();
-            return true;
-        }
-
-        if (GetNextHandler())
-            return GetNextHandler()->ProcessEvent(evt);
-
-        return false;
-    }
-
-private:
-    int m_lastId;
-};
-
-
-// -- bitmaps --
-
-#if defined( __WXMAC__ )
- static const unsigned char close_bits[]={
-     0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
-     0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
-     0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
-#elif defined( __WXGTK__)
- static const unsigned char close_bits[]={
-     0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
-     0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
-     0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#else
- static const unsigned char close_bits[]={
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9,
-     0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-#endif
-
-static const unsigned char left_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe,
-   0x1f, 0xfe, 0x0f, 0xfe, 0x1f, 0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-static const unsigned char right_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x9f, 0xff, 0x1f, 0xff,
-   0x1f, 0xfe, 0x1f, 0xfc, 0x1f, 0xfe, 0x1f, 0xff, 0x9f, 0xff, 0xdf, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-static const unsigned char list_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0x0f, 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-
-
-
-
-
-// -- wxAuiDefaultTabArt class implementation --
-
-wxAuiDefaultTabArt::wxAuiDefaultTabArt()
-{
-    m_normalFont = *wxNORMAL_FONT;
-    m_selectedFont = *wxNORMAL_FONT;
-    m_selectedFont.SetWeight(wxBOLD);
-    m_measuringFont = m_selectedFont;
-
-    m_fixedTabWidth = 100;
-    m_tabCtrlHeight = 0;
-
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
-#else
-    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-#endif
-
-    // the baseColour is too pale to use as our base colour,
-    // so darken it a bit --
-    if ((255-baseColour.Red()) +
-        (255-baseColour.Green()) +
-        (255-baseColour.Blue()) < 60)
-    {
-        baseColour = baseColour.ChangeLightness(92);
-    }
-
-    m_activeColour = baseColour;
-    m_baseColour = baseColour;
-    wxColor borderColour = baseColour.ChangeLightness(75);
-
-    m_borderPen = wxPen(borderColour);
-    m_baseColourPen = wxPen(m_baseColour);
-    m_baseColourBrush = wxBrush(m_baseColour);
-
-    m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
-    m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
-    m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
-    m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
-    m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
-
-    m_flags = 0;
-}
-
-wxAuiDefaultTabArt::~wxAuiDefaultTabArt()
-{
-}
-
-wxAuiTabArt* wxAuiDefaultTabArt::Clone()
-{
-    return new wxAuiDefaultTabArt(*this);
-}
-
-void wxAuiDefaultTabArt::SetFlags(unsigned int flags)
-{
-    m_flags = flags;
-}
-
-void wxAuiDefaultTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
-                                       size_t tab_count)
-{
-    m_fixedTabWidth = 100;
-
-    int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
-
-    if (m_flags & wxAUI_NB_CLOSE_BUTTON)
-        tot_width -= m_activeCloseBmp.GetWidth();
-    if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
-        tot_width -= m_activeWindowListBmp.GetWidth();
-
-    if (tab_count > 0)
-    {
-        m_fixedTabWidth = tot_width/(int)tab_count;
-    }
-
-
-    if (m_fixedTabWidth < 100)
-        m_fixedTabWidth = 100;
-
-    if (m_fixedTabWidth > tot_width/2)
-        m_fixedTabWidth = tot_width/2;
-
-    if (m_fixedTabWidth > 220)
-        m_fixedTabWidth = 220;
-
-    m_tabCtrlHeight = tab_ctrl_size.y;
-}
-
-
-void wxAuiDefaultTabArt::DrawBackground(wxDC& dc,
-                                        wxWindow* WXUNUSED(wnd),
-                                        const wxRect& rect)
-{
-    // draw background
-
-    wxColor top_color       = m_baseColour.ChangeLightness(90);
-    wxColor bottom_color   = m_baseColour.ChangeLightness(170);
-    wxRect r;
-
-   if (m_flags &wxAUI_NB_BOTTOM)
-       r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
-   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
-   else //for wxAUI_NB_TOP
-       r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
-
-    dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
-
-
-   // draw base lines
-
-   dc.SetPen(m_borderPen);
-   int y = rect.GetHeight();
-   int w = rect.GetWidth();
-
-   if (m_flags &wxAUI_NB_BOTTOM)
-   {
-       dc.SetBrush(wxBrush(bottom_color));
-       dc.DrawRectangle(-1, 0, w+2, 4);
-   }
-   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
-   else //for wxAUI_NB_TOP
-   {
-       dc.SetBrush(m_baseColourBrush);
-       dc.DrawRectangle(-1, y-4, w+2, 4);
-   }
-}
-
-
-// DrawTab() draws an individual tab.
-//
-// dc       - output dc
-// in_rect  - rectangle the tab should be confined to
-// caption  - tab's caption
-// active   - whether or not the tab is active
-// out_rect - actual output rectangle
-// x_extent - the advance x; where the next tab should start
-
-void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
-                                 wxWindow* wnd,
-                                 const wxAuiNotebookPage& page,
-                                 const wxRect& in_rect,
-                                 int close_button_state,
-                                 wxRect* out_tab_rect,
-                                 wxRect* out_button_rect,
-                                 int* x_extent)
-{
-    wxCoord normal_textx, normal_texty;
-    wxCoord selected_textx, selected_texty;
-    wxCoord texty;
-
-    // if the caption is empty, measure some temporary text
-    wxString caption = page.caption;
-    if (caption.empty())
-        caption = wxT("Xj");
-
-    dc.SetFont(m_selectedFont);
-    dc.GetTextExtent(caption, &selected_textx, &selected_texty);
-
-    dc.SetFont(m_normalFont);
-    dc.GetTextExtent(caption, &normal_textx, &normal_texty);
-
-    // figure out the size of the tab
-    wxSize tab_size = GetTabSize(dc,
-                                 wnd,
-                                 page.caption,
-                                 page.bitmap,
-                                 page.active,
-                                 close_button_state,
-                                 x_extent);
-
-    wxCoord tab_height = m_tabCtrlHeight - 3;
-    wxCoord tab_width = tab_size.x;
-    wxCoord tab_x = in_rect.x;
-    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
-
-
-    caption = page.caption;
-
-
-    // select pen, brush and font for the tab to be drawn
-
-    if (page.active)
-    {
-        dc.SetFont(m_selectedFont);
-        texty = selected_texty;
-    }
-    else
-    {
-        dc.SetFont(m_normalFont);
-        texty = normal_texty;
-    }
-
-
-    // create points that will make the tab outline
-
-    int clip_width = tab_width;
-    if (tab_x + clip_width > in_rect.x + in_rect.width)
-        clip_width = (in_rect.x + in_rect.width) - tab_x;
-
-/*
-    wxPoint clip_points[6];
-    clip_points[0] = wxPoint(tab_x,              tab_y+tab_height-3);
-    clip_points[1] = wxPoint(tab_x,              tab_y+2);
-    clip_points[2] = wxPoint(tab_x+2,            tab_y);
-    clip_points[3] = wxPoint(tab_x+clip_width-1, tab_y);
-    clip_points[4] = wxPoint(tab_x+clip_width+1, tab_y+2);
-    clip_points[5] = wxPoint(tab_x+clip_width+1, tab_y+tab_height-3);
-
-    // FIXME: these ports don't provide wxRegion ctor from array of points
-#if !defined(__WXDFB__) && !defined(__WXCOCOA__)
-    // set the clipping region for the tab --
-    wxRegion clipping_region(WXSIZEOF(clip_points), clip_points);
-    dc.SetClippingRegion(clipping_region);
-#endif // !wxDFB && !wxCocoa
-*/
-    // since the above code above doesn't play well with WXDFB or WXCOCOA,
-    // we'll just use a rectangle for the clipping region for now --
-    dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
-
-
-    wxPoint border_points[6];
-    if (m_flags &wxAUI_NB_BOTTOM)
-    {
-        border_points[0] = wxPoint(tab_x,             tab_y);
-        border_points[1] = wxPoint(tab_x,             tab_y+tab_height-6);
-        border_points[2] = wxPoint(tab_x+2,           tab_y+tab_height-4);
-        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y+tab_height-4);
-        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+tab_height-6);
-        border_points[5] = wxPoint(tab_x+tab_width,   tab_y);
-    }
-    else //if (m_flags & wxAUI_NB_TOP) {}
-    {
-        border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
-        border_points[1] = wxPoint(tab_x,             tab_y+2);
-        border_points[2] = wxPoint(tab_x+2,           tab_y);
-        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y);
-        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+2);
-        border_points[5] = wxPoint(tab_x+tab_width,   tab_y+tab_height-4);
-    }
-    // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-    // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
-
-    int drawn_tab_yoff = border_points[1].y;
-    int drawn_tab_height = border_points[0].y - border_points[1].y;
-
-
-    if (page.active)
-    {
-        // draw active tab
-
-        // draw base background color
-        wxRect r(tab_x, tab_y, tab_width, tab_height);
-        dc.SetPen(wxPen(m_activeColour));
-        dc.SetBrush(wxBrush(m_activeColour));
-        dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
-
-        // this white helps fill out the gradient at the top of the tab
-        dc.SetPen(*wxWHITE_PEN);
-        dc.SetBrush(*wxWHITE_BRUSH);
-        dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
-
-        // these two points help the rounded corners appear more antialiased
-        dc.SetPen(wxPen(m_activeColour));
-        dc.DrawPoint(r.x+2, r.y+1);
-        dc.DrawPoint(r.x+r.width-2, r.y+1);
-
-        // set rectangle down a bit for gradient drawing
-        r.SetHeight(r.GetHeight()/2);
-        r.x += 2;
-        r.width -= 3;
-        r.y += r.height;
-        r.y -= 2;
-
-        // draw gradient background
-        wxColor top_color = *wxWHITE;
-        wxColor bottom_color = m_activeColour;
-        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
-    }
-    else
-    {
-        // draw inactive tab
-
-        wxRect r(tab_x, tab_y+1, tab_width, tab_height-3);
-
-        // start the gradent up a bit and leave the inside border inset
-        // by a pixel for a 3D look.  Only the top half of the inactive
-        // tab will have a slight gradient
-        r.x += 3;
-        r.y++;
-        r.width -= 4;
-        r.height /= 2;
-        r.height--;
-
-        // -- draw top gradient fill for glossy look
-        wxColor top_color = m_baseColour;
-        wxColor bottom_color = top_color.ChangeLightness(160);
-        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
-
-        r.y += r.height;
-        r.y--;
-
-        // -- draw bottom fill for glossy look
-        top_color = m_baseColour;
-        bottom_color = m_baseColour;
-        dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
-    }
-
-    // draw tab outline
-    dc.SetPen(m_borderPen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawPolygon(WXSIZEOF(border_points), border_points);
-
-    // there are two horizontal grey lines at the bottom of the tab control,
-    // this gets rid of the top one of those lines in the tab control
-    if (page.active)
-    {
-        if (m_flags &wxAUI_NB_BOTTOM)
-            dc.SetPen(wxPen(m_baseColour.ChangeLightness(170)));
-        // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-        // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
-        else //for wxAUI_NB_TOP
-            dc.SetPen(m_baseColourPen);
-        dc.DrawLine(border_points[0].x+1,
-                    border_points[0].y,
-                    border_points[5].x,
-                    border_points[5].y);
-    }
-
-
-    int text_offset = tab_x + 8;
-    int close_button_width = 0;
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-    {
-        close_button_width = m_activeCloseBmp.GetWidth();
-    }
-
-    int bitmap_offset = 0;
-    if (page.bitmap.IsOk())
-    {
-        bitmap_offset = tab_x + 8;
-
-        // draw bitmap
-        dc.DrawBitmap(page.bitmap,
-                      bitmap_offset,
-                      drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
-                      true);
-
-        text_offset = bitmap_offset + page.bitmap.GetWidth();
-        text_offset += 3; // bitmap padding
-
-    }
-    else
-    {
-        text_offset = tab_x + 8;
-    }
-
-
-    wxString draw_text = wxAuiChopText(dc,
-                          caption,
-                          tab_width - (text_offset-tab_x) - close_button_width);
-
-    // draw tab text
-    dc.DrawText(draw_text,
-                text_offset,
-                drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
-
-    // draw focus rectangle
-    if (page.active && (wnd->FindFocus() == wnd))
-    {
-        wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1),
-            selected_textx, selected_texty);
-
-        wxRect focusRect;
-        wxRect focusRectBitmap;
-
-        if (page.bitmap.IsOk())
-            focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
-                                            page.bitmap.GetWidth(), page.bitmap.GetHeight());
-
-        if (page.bitmap.IsOk() && draw_text.IsEmpty())
-            focusRect = focusRectBitmap;
-        else if (!page.bitmap.IsOk() && !draw_text.IsEmpty())
-            focusRect = focusRectText;
-        else if (page.bitmap.IsOk() && !draw_text.IsEmpty())
-            focusRect = focusRectText.Union(focusRectBitmap);
-
-        focusRect.Inflate(2, 2);
-
-        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
-    }
-
-    // draw close button if necessary
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-    {
-        wxBitmap bmp = m_disabledCloseBmp;
-
-        if (close_button_state == wxAUI_BUTTON_STATE_HOVER ||
-            close_button_state == wxAUI_BUTTON_STATE_PRESSED)
-        {
-            bmp = m_activeCloseBmp;
-        }
-
-        int offsetY = tab_y-1;
-        if (m_flags & wxAUI_NB_BOTTOM)
-            offsetY = 1;
-
-        wxRect rect(tab_x + tab_width - close_button_width - 1,
-                    offsetY + (tab_height/2) - (bmp.GetHeight()/2),
-                    close_button_width,
-                    tab_height);
-
-        IndentPressedBitmap(&rect, close_button_state);
-        dc.DrawBitmap(bmp, rect.x, rect.y, true);
-
-        *out_button_rect = rect;
-    }
-
-    *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
-
-    dc.DestroyClippingRegion();
-}
-
-int wxAuiDefaultTabArt::GetIndentSize()
-{
-    return 5;
-}
-
-wxSize wxAuiDefaultTabArt::GetTabSize(wxDC& dc,
-                                      wxWindow* WXUNUSED(wnd),
-                                      const wxString& caption,
-                                      const wxBitmap& bitmap,
-                                      bool WXUNUSED(active),
-                                      int close_button_state,
-                                      int* x_extent)
-{
-    wxCoord measured_textx, measured_texty, tmp;
-
-    dc.SetFont(m_measuringFont);
-    dc.GetTextExtent(caption, &measured_textx, &measured_texty);
-
-    dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty);
-
-    // add padding around the text
-    wxCoord tab_width = measured_textx;
-    wxCoord tab_height = measured_texty;
-
-    // if the close button is showing, add space for it
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-        tab_width += m_activeCloseBmp.GetWidth() + 3;
-
-    // if there's a bitmap, add space for it
-    if (bitmap.IsOk())
-    {
-        tab_width += bitmap.GetWidth();
-        tab_width += 3; // right side bitmap padding
-        tab_height = wxMax(tab_height, bitmap.GetHeight());
-    }
-
-    // add padding
-    tab_width += 16;
-    tab_height += 10;
-
-    if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
-    {
-        tab_width = m_fixedTabWidth;
-    }
-
-    *x_extent = tab_width;
-
-    return wxSize(tab_width, tab_height);
-}
-
-
-void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
-                                    wxWindow* WXUNUSED(wnd),
-                                    const wxRect& in_rect,
-                                    int bitmap_id,
-                                    int button_state,
-                                    int orientation,
-                                    wxRect* out_rect)
-{
-    wxBitmap bmp;
-    wxRect rect;
-
-    switch (bitmap_id)
-    {
-        case wxAUI_BUTTON_CLOSE:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledCloseBmp;
-            else
-                bmp = m_activeCloseBmp;
-            break;
-        case wxAUI_BUTTON_LEFT:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledLeftBmp;
-            else
-                bmp = m_activeLeftBmp;
-            break;
-        case wxAUI_BUTTON_RIGHT:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledRightBmp;
-            else
-                bmp = m_activeRightBmp;
-            break;
-        case wxAUI_BUTTON_WINDOWLIST:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledWindowListBmp;
-            else
-                bmp = m_activeWindowListBmp;
-            break;
-    }
-
-
-    if (!bmp.IsOk())
-        return;
-
-    rect = in_rect;
-
-    if (orientation == wxLEFT)
-    {
-        rect.SetX(in_rect.x);
-        rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2));
-        rect.SetWidth(bmp.GetWidth());
-        rect.SetHeight(bmp.GetHeight());
-    }
-    else
-    {
-        rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
-                      ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
-                      bmp.GetWidth(), bmp.GetHeight());
-    }
-
-    IndentPressedBitmap(&rect, button_state);
-    dc.DrawBitmap(bmp, rect.x, rect.y, true);
-
-    *out_rect = rect;
-}
-
-int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
-                                     const wxAuiNotebookPageArray& pages,
-                                     int /*active_idx*/)
-{
-    wxMenu menuPopup;
-
-    size_t i, count = pages.GetCount();
-    for (i = 0; i < count; ++i)
-    {
-        const wxAuiNotebookPage& page = pages.Item(i);
-        wxString caption = page.caption;
-
-        // if there is no caption, make it a space.  This will prevent
-        // an assert in the menu code.
-        if (caption.IsEmpty())
-            caption = wxT(" ");
-
-        wxMenuItem* item = new wxMenuItem(NULL, 1000+i, caption);
-        if (page.bitmap.IsOk())
-            item->SetBitmap(page.bitmap);
-        menuPopup.Append(item);
-    }
-
-    // find out where to put the popup menu of window items
-    wxPoint pt = ::wxGetMousePosition();
-    pt = wnd->ScreenToClient(pt);
-
-    // find out the screen coordinate at the bottom of the tab ctrl
-    wxRect cli_rect = wnd->GetClientRect();
-    pt.y = cli_rect.y + cli_rect.height;
-
-    wxAuiCommandCapture* cc = new wxAuiCommandCapture;
-    wnd->PushEventHandler(cc);
-    wnd->PopupMenu(&menuPopup, pt);
-    int command = cc->GetCommandId();
-    wnd->PopEventHandler(true);
-
-    if (command >= 1000)
-        return command-1000;
-
-    return -1;
-}
-
-int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
-                                           const wxAuiNotebookPageArray& pages,
-                                           const wxSize& requiredBmp_size)
-{
-    wxClientDC dc(wnd);
-    dc.SetFont(m_measuringFont);
-
-    // sometimes a standard bitmap size needs to be enforced, especially
-    // if some tabs have bitmaps and others don't.  This is important because
-    // it prevents the tab control from resizing when tabs are added.
-    wxBitmap measureBmp;
-    if (requiredBmp_size.IsFullySpecified())
-    {
-        measureBmp.Create(requiredBmp_size.x,
-                           requiredBmp_size.y);
-    }
-
-
-    int max_y = 0;
-    size_t i, page_count = pages.GetCount();
-    for (i = 0; i < page_count; ++i)
-    {
-        wxAuiNotebookPage& page = pages.Item(i);
-
-        wxBitmap bmp;
-        if (measureBmp.IsOk())
-            bmp = measureBmp;
-        else
-            bmp = page.bitmap;
-
-        // we don't use the caption text because we don't
-        // want tab heights to be different in the case
-        // of a very short piece of text on one tab and a very
-        // tall piece of text on another tab
-        int x_ext = 0;
-        wxSize s = GetTabSize(dc,
-                              wnd,
-                              wxT("ABCDEFGHIj"),
-                              bmp,
-                              true,
-                              wxAUI_BUTTON_STATE_HIDDEN,
-                              &x_ext);
-
-        max_y = wxMax(max_y, s.y);
-    }
-
-    return max_y+2;
-}
-
-void wxAuiDefaultTabArt::SetNormalFont(const wxFont& font)
-{
-    m_normalFont = font;
-}
-
-void wxAuiDefaultTabArt::SetSelectedFont(const wxFont& font)
-{
-    m_selectedFont = font;
-}
-
-void wxAuiDefaultTabArt::SetMeasuringFont(const wxFont& font)
-{
-    m_measuringFont = font;
-}
-
-void wxAuiDefaultTabArt::SetColour(const wxColour& colour)
-{
-    m_baseColour = colour;
-    m_borderPen = wxPen(m_baseColour.ChangeLightness(75));
-    m_baseColourPen = wxPen(m_baseColour);
-    m_baseColourBrush = wxBrush(m_baseColour);
-}
-
-void wxAuiDefaultTabArt::SetActiveColour(const wxColour& colour)
-{
-    m_activeColour = colour;
-}
-
-// -- wxAuiSimpleTabArt class implementation --
-
-wxAuiSimpleTabArt::wxAuiSimpleTabArt()
-{
-    m_normalFont = *wxNORMAL_FONT;
-    m_selectedFont = *wxNORMAL_FONT;
-    m_selectedFont.SetWeight(wxBOLD);
-    m_measuringFont = m_selectedFont;
-
-    m_flags = 0;
-    m_fixedTabWidth = 100;
-
-    wxColour baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
-    wxColour backgroundColour = baseColour;
-    wxColour normaltabColour = baseColour;
-    wxColour selectedtabColour = *wxWHITE;
-
-    m_bkBrush = wxBrush(backgroundColour);
-    m_normalBkBrush = wxBrush(normaltabColour);
-    m_normalBkPen = wxPen(normaltabColour);
-    m_selectedBkBrush = wxBrush(selectedtabColour);
-    m_selectedBkPen = wxPen(selectedtabColour);
-
-    m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
-    m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
-    m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
-    m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
-
-    m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
-    m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
-
-}
-
-wxAuiSimpleTabArt::~wxAuiSimpleTabArt()
-{
-}
-
-wxAuiTabArt* wxAuiSimpleTabArt::Clone()
-{
-    return new wxAuiSimpleTabArt(*this);
-}
-
-void wxAuiSimpleTabArt::SetFlags(unsigned int flags)
-{
-    m_flags = flags;
-}
-
-void wxAuiSimpleTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
-                                      size_t tab_count)
-{
-    m_fixedTabWidth = 100;
-
-    int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
-
-    if (m_flags & wxAUI_NB_CLOSE_BUTTON)
-        tot_width -= m_activeCloseBmp.GetWidth();
-    if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
-        tot_width -= m_activeWindowListBmp.GetWidth();
-
-    if (tab_count > 0)
-    {
-        m_fixedTabWidth = tot_width/(int)tab_count;
-    }
-
-
-    if (m_fixedTabWidth < 100)
-        m_fixedTabWidth = 100;
-
-    if (m_fixedTabWidth > tot_width/2)
-        m_fixedTabWidth = tot_width/2;
-
-    if (m_fixedTabWidth > 220)
-        m_fixedTabWidth = 220;
-}
-
-void wxAuiSimpleTabArt::SetColour(const wxColour& colour)
-{
-    m_bkBrush = wxBrush(colour);
-    m_normalBkBrush = wxBrush(colour);
-    m_normalBkPen = wxPen(colour);
-}
-
-void wxAuiSimpleTabArt::SetActiveColour(const wxColour& colour)
-{
-    m_selectedBkBrush = wxBrush(colour);
-    m_selectedBkPen = wxPen(colour);
-}
-
-void wxAuiSimpleTabArt::DrawBackground(wxDC& dc,
-                                       wxWindow* WXUNUSED(wnd),
-                                       const wxRect& rect)
-{
-    // draw background
-    dc.SetBrush(m_bkBrush);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2);
-
-    // draw base line
-    dc.SetPen(*wxGREY_PEN);
-    dc.DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1);
-}
-
-
-// DrawTab() draws an individual tab.
-//
-// dc       - output dc
-// in_rect  - rectangle the tab should be confined to
-// caption  - tab's caption
-// active   - whether or not the tab is active
-// out_rect - actual output rectangle
-// x_extent - the advance x; where the next tab should start
-
-void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
-                                wxWindow* wnd,
-                                const wxAuiNotebookPage& page,
-                                const wxRect& in_rect,
-                                int close_button_state,
-                                wxRect* out_tab_rect,
-                                wxRect* out_button_rect,
-                                int* x_extent)
-{
-    wxCoord normal_textx, normal_texty;
-    wxCoord selected_textx, selected_texty;
-    wxCoord textx, texty;
-
-    // if the caption is empty, measure some temporary text
-    wxString caption = page.caption;
-    if (caption.empty())
-        caption = wxT("Xj");
-
-    dc.SetFont(m_selectedFont);
-    dc.GetTextExtent(caption, &selected_textx, &selected_texty);
-
-    dc.SetFont(m_normalFont);
-    dc.GetTextExtent(caption, &normal_textx, &normal_texty);
-
-    // figure out the size of the tab
-    wxSize tab_size = GetTabSize(dc,
-                                 wnd,
-                                 page.caption,
-                                 page.bitmap,
-                                 page.active,
-                                 close_button_state,
-                                 x_extent);
-
-    wxCoord tab_height = tab_size.y;
-    wxCoord tab_width = tab_size.x;
-    wxCoord tab_x = in_rect.x;
-    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
-
-    caption = page.caption;
-
-    // select pen, brush and font for the tab to be drawn
-
-    if (page.active)
-    {
-        dc.SetPen(m_selectedBkPen);
-        dc.SetBrush(m_selectedBkBrush);
-        dc.SetFont(m_selectedFont);
-        textx = selected_textx;
-        texty = selected_texty;
-    }
-    else
-    {
-        dc.SetPen(m_normalBkPen);
-        dc.SetBrush(m_normalBkBrush);
-        dc.SetFont(m_normalFont);
-        textx = normal_textx;
-        texty = normal_texty;
-    }
-
-
-    // -- draw line --
-
-    wxPoint points[7];
-    points[0].x = tab_x;
-    points[0].y = tab_y + tab_height - 1;
-    points[1].x = tab_x + tab_height - 3;
-    points[1].y = tab_y + 2;
-    points[2].x = tab_x + tab_height + 3;
-    points[2].y = tab_y;
-    points[3].x = tab_x + tab_width - 2;
-    points[3].y = tab_y;
-    points[4].x = tab_x + tab_width;
-    points[4].y = tab_y + 2;
-    points[5].x = tab_x + tab_width;
-    points[5].y = tab_y + tab_height - 1;
-    points[6] = points[0];
-
-    dc.SetClippingRegion(in_rect);
-
-    dc.DrawPolygon(WXSIZEOF(points) - 1, points);
-
-    dc.SetPen(*wxGREY_PEN);
-
-    //dc.DrawLines(active ? WXSIZEOF(points) - 1 : WXSIZEOF(points), points);
-    dc.DrawLines(WXSIZEOF(points), points);
-
-
-    int text_offset;
-
-    int close_button_width = 0;
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-    {
-        close_button_width = m_activeCloseBmp.GetWidth();
-        text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
-    }
-    else
-    {
-        text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
-    }
-
-    // set minimum text offset
-    if (text_offset < tab_x + tab_height)
-        text_offset = tab_x + tab_height;
-
-    // chop text if necessary
-    wxString draw_text = wxAuiChopText(dc,
-                          caption,
-                          tab_width - (text_offset-tab_x) - close_button_width);
-
-    // draw tab text
-    dc.DrawText(draw_text,
-                 text_offset,
-                 (tab_y + tab_height)/2 - (texty/2) + 1);
-
-
-    // draw focus rectangle
-    if (page.active && (wnd->FindFocus() == wnd))
-    {
-        wxRect focusRect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1),
-            selected_textx, selected_texty);
-
-        focusRect.Inflate(2, 2);
-
-        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
-    }
-
-    // draw close button if necessary
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-    {
-        wxBitmap bmp;
-        if (page.active)
-            bmp = m_activeCloseBmp;
-        else
-            bmp = m_disabledCloseBmp;
-
-        wxRect rect(tab_x + tab_width - close_button_width - 1,
-                    tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1,
-                    close_button_width,
-                    tab_height - 1);
-        DrawButtons(dc, rect, bmp, *wxWHITE, close_button_state);
-
-        *out_button_rect = rect;
-    }
-
-
-    *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
-
-    dc.DestroyClippingRegion();
-}
-
-int wxAuiSimpleTabArt::GetIndentSize()
-{
-    return 0;
-}
-
-wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc,
-                                     wxWindow* WXUNUSED(wnd),
-                                     const wxString& caption,
-                                     const wxBitmap& WXUNUSED(bitmap),
-                                     bool WXUNUSED(active),
-                                     int close_button_state,
-                                     int* x_extent)
-{
-    wxCoord measured_textx, measured_texty;
-
-    dc.SetFont(m_measuringFont);
-    dc.GetTextExtent(caption, &measured_textx, &measured_texty);
-
-    wxCoord tab_height = measured_texty + 4;
-    wxCoord tab_width = measured_textx + tab_height + 5;
-
-    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-        tab_width += m_activeCloseBmp.GetWidth();
-
-    if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
-    {
-        tab_width = m_fixedTabWidth;
-    }
-
-    *x_extent = tab_width - (tab_height/2) - 1;
-
-    return wxSize(tab_width, tab_height);
-}
-
-
-void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
-                                   wxWindow* WXUNUSED(wnd),
-                                   const wxRect& in_rect,
-                                   int bitmap_id,
-                                   int button_state,
-                                   int orientation,
-                                   wxRect* out_rect)
-{
-    wxBitmap bmp;
-    wxRect rect;
-
-    switch (bitmap_id)
-    {
-        case wxAUI_BUTTON_CLOSE:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledCloseBmp;
-            else
-                bmp = m_activeCloseBmp;
-            break;
-        case wxAUI_BUTTON_LEFT:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledLeftBmp;
-            else
-                bmp = m_activeLeftBmp;
-            break;
-        case wxAUI_BUTTON_RIGHT:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledRightBmp;
-            else
-                bmp = m_activeRightBmp;
-            break;
-        case wxAUI_BUTTON_WINDOWLIST:
-            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
-                bmp = m_disabledWindowListBmp;
-            else
-                bmp = m_activeWindowListBmp;
-            break;
-    }
-
-    if (!bmp.IsOk())
-        return;
-
-    rect = in_rect;
-
-    if (orientation == wxLEFT)
-    {
-        rect.SetX(in_rect.x);
-        rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2));
-        rect.SetWidth(bmp.GetWidth());
-        rect.SetHeight(bmp.GetHeight());
-    }
-    else
-    {
-        rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
-                      ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
-                      bmp.GetWidth(), bmp.GetHeight());
-    }
-
-
-    DrawButtons(dc, rect, bmp, *wxWHITE, button_state);
-
-    *out_rect = rect;
-}
-
-int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
-                                    const wxAuiNotebookPageArray& pages,
-                                    int active_idx)
-{
-    wxMenu menuPopup;
-
-    size_t i, count = pages.GetCount();
-    for (i = 0; i < count; ++i)
-    {
-        const wxAuiNotebookPage& page = pages.Item(i);
-        menuPopup.AppendCheckItem(1000+i, page.caption);
-    }
-
-    if (active_idx != -1)
-    {
-        menuPopup.Check(1000+active_idx, true);
-    }
-
-    // find out where to put the popup menu of window
-    // items.  Subtract 100 for now to center the menu
-    // a bit, until a better mechanism can be implemented
-    wxPoint pt = ::wxGetMousePosition();
-    pt = wnd->ScreenToClient(pt);
-    if (pt.x < 100)
-        pt.x = 0;
-    else
-        pt.x -= 100;
-
-    // find out the screen coordinate at the bottom of the tab ctrl
-    wxRect cli_rect = wnd->GetClientRect();
-    pt.y = cli_rect.y + cli_rect.height;
-
-    wxAuiCommandCapture* cc = new wxAuiCommandCapture;
-    wnd->PushEventHandler(cc);
-    wnd->PopupMenu(&menuPopup, pt);
-    int command = cc->GetCommandId();
-    wnd->PopEventHandler(true);
-
-    if (command >= 1000)
-        return command-1000;
-
-    return -1;
-}
-
-int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd,
-                                          const wxAuiNotebookPageArray& WXUNUSED(pages),
-                                          const wxSize& WXUNUSED(requiredBmp_size))
-{
-    wxClientDC dc(wnd);
-    dc.SetFont(m_measuringFont);
-    int x_ext = 0;
-    wxSize s = GetTabSize(dc,
-                          wnd,
-                          wxT("ABCDEFGHIj"),
-                          wxNullBitmap,
-                          true,
-                          wxAUI_BUTTON_STATE_HIDDEN,
-                          &x_ext);
-    return s.y+3;
-}
-
-void wxAuiSimpleTabArt::SetNormalFont(const wxFont& font)
-{
-    m_normalFont = font;
-}
-
-void wxAuiSimpleTabArt::SetSelectedFont(const wxFont& font)
-{
-    m_selectedFont = font;
-}
-
-void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font)
-{
-    m_measuringFont = font;
-}
-
-
-
-
 // -- wxAuiTabContainer class implementation --
 
 
@@ -1654,7 +423,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
     size_t button_count = m_buttons.GetCount();
 
     // create off-screen bitmap
-    bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
+    bmp.Create(m_rect.GetWidth(), m_rect.GetHeight(),*raw_dc);
     dc.SelectObject(bmp);
 
     if (!dc.IsOk())
@@ -1758,10 +527,8 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
     int left_buttons_width = 0;
     int right_buttons_width = 0;
 
-    int offset = 0;
-
     // draw the buttons on the right side
-    offset = m_rect.x + m_rect.width;
+    int offset = m_rect.x + m_rect.width;
     for (i = 0; i < button_count; ++i)
     {
         wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
@@ -1974,10 +741,8 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin
     int left_buttons_width = 0;
     int right_buttons_width = 0;
 
-    int offset = 0;
-
     // calculate size of the buttons on the right side
-    offset = m_rect.x + m_rect.width;
+    int offset = m_rect.x + m_rect.width;
     for (i = 0; i < button_count; ++i)
     {
         wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1);
@@ -2156,7 +921,7 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y,
 static void ShowWnd(wxWindow* wnd, bool show)
 {
 #if wxUSE_MDI
-    if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
+    if (wxDynamicCast(wnd, wxAuiMDIChildFrame))
     {
         wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
         cf->DoShow(show);
@@ -2281,10 +1046,10 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt)
         // wxAuiNotebooks always want to receive this event
         // even if the tab is already active, because they may
         // have multiple tab controls
-        if (new_selection != GetActivePage() ||
-            GetParent()->IsKindOf(CLASSINFO(wxAuiNotebook)))
+        if ((new_selection != GetActivePage() ||
+            wxDynamicCast(GetParent(), wxAuiNotebook)) && !m_hoverButton)
         {
-            wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+            wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
             e.SetSelection(new_selection);
             e.SetOldSelection(GetActivePage());
             e.SetEventObject(this);
@@ -2311,7 +1076,7 @@ void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
     {
         m_isDragging = false;
 
-        wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, m_windowId);
+        wxAuiNotebookEvent evt(wxEVT_AUINOTEBOOK_CANCEL_DRAG, m_windowId);
         evt.SetSelection(GetIdxFromWindow(m_clickTab));
         evt.SetOldSelection(evt.GetSelection());
         evt.SetEventObject(this);
@@ -2328,11 +1093,11 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
     {
         m_isDragging = false;
 
-        wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId);
-        evt.SetSelection(GetIdxFromWindow(m_clickTab));
-        evt.SetOldSelection(evt.GetSelection());
-        evt.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(evt);
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_END_DRAG, m_windowId);
+        e.SetSelection(GetIdxFromWindow(m_clickTab));
+        e.SetOldSelection(e.GetSelection());
+        e.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(e);
 
         return;
     }
@@ -2356,11 +1121,11 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
 
         if (!(m_pressedButton->curState & wxAUI_BUTTON_STATE_DISABLED))
         {
-            wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
-            evt.SetSelection(GetIdxFromWindow(m_clickTab));
-            evt.SetInt(m_pressedButton->id);
-            evt.SetEventObject(this);
-            GetEventHandler()->ProcessEvent(evt);
+            wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BUTTON, m_windowId);
+            e.SetSelection(GetIdxFromWindow(m_clickTab));
+            e.SetInt(m_pressedButton->id);
+            e.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(e);
         }
 
         m_pressedButton = NULL;
@@ -2377,7 +1142,7 @@ void wxAuiTabCtrl::OnMiddleUp(wxMouseEvent& evt)
     if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
         return;
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
     e.SetEventObject(this);
     e.SetSelection(GetIdxFromWindow(wnd));
     GetEventHandler()->ProcessEvent(e);
@@ -2389,7 +1154,7 @@ void wxAuiTabCtrl::OnMiddleDown(wxMouseEvent& evt)
     if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
         return;
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
     e.SetEventObject(this);
     e.SetSelection(GetIdxFromWindow(wnd));
     GetEventHandler()->ProcessEvent(e);
@@ -2401,7 +1166,7 @@ void wxAuiTabCtrl::OnRightUp(wxMouseEvent& evt)
     if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
         return;
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
     e.SetEventObject(this);
     e.SetSelection(GetIdxFromWindow(wnd));
     GetEventHandler()->ProcessEvent(e);
@@ -2413,7 +1178,7 @@ void wxAuiTabCtrl::OnRightDown(wxMouseEvent& evt)
     if (!TabHitTest(evt.m_x, evt.m_y, &wnd))
         return;
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
     e.SetEventObject(this);
     e.SetSelection(GetIdxFromWindow(wnd));
     GetEventHandler()->ProcessEvent(e);
@@ -2425,7 +1190,7 @@ void wxAuiTabCtrl::OnLeftDClick(wxMouseEvent& evt)
     wxAuiTabContainerButton* button;
     if (!TabHitTest(evt.m_x, evt.m_y, &wnd) && !ButtonHitTest(evt.m_x, evt.m_y, &button))
     {
-        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId);
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BG_DCLICK, m_windowId);
         e.SetEventObject(this);
         GetEventHandler()->ProcessEvent(e);
     }
@@ -2468,17 +1233,31 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
         }
     }
 
+#if wxUSE_TOOLTIPS
+    wxWindow* wnd = NULL;
+    if (evt.Moving() && TabHitTest(evt.m_x, evt.m_y, &wnd))
+    {
+        wxString tooltip(m_pages[GetIdxFromWindow(wnd)].tooltip);
+
+        // If the text changes, set it else, keep old, to avoid
+        // 'moving tooltip' effect
+        if (GetToolTipText() != tooltip)
+            SetToolTip(tooltip);
+    }
+    else
+        UnsetToolTip();
+#endif // wxUSE_TOOLTIPS
 
     if (!evt.LeftIsDown() || m_clickPt == wxDefaultPosition)
         return;
 
     if (m_isDragging)
     {
-        wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, m_windowId);
-        evt.SetSelection(GetIdxFromWindow(m_clickTab));
-        evt.SetOldSelection(evt.GetSelection());
-        evt.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(evt);
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_DRAG_MOTION, m_windowId);
+        e.SetSelection(GetIdxFromWindow(m_clickTab));
+        e.SetOldSelection(e.GetSelection());
+        e.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(e);
         return;
     }
 
@@ -2489,11 +1268,11 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
     if (abs(pos.x - m_clickPt.x) > drag_x_threshold ||
         abs(pos.y - m_clickPt.y) > drag_y_threshold)
     {
-        wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, m_windowId);
-        evt.SetSelection(GetIdxFromWindow(m_clickTab));
-        evt.SetOldSelection(evt.GetSelection());
-        evt.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(evt);
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BEGIN_DRAG, m_windowId);
+        e.SetSelection(GetIdxFromWindow(m_clickTab));
+        e.SetOldSelection(e.GetSelection());
+        e.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(e);
 
         m_isDragging = true;
     }
@@ -2538,7 +1317,7 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
 
         if (idx != -1)
         {
-            wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+            wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
             e.SetSelection(idx);
             e.SetOldSelection(GetActivePage());
             e.SetEventObject(this);
@@ -2674,7 +1453,7 @@ void wxAuiTabCtrl::OnChar(wxKeyEvent& event)
 
     if (newPage != -1)
     {
-        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
         e.SetSelection(newPage);
         e.SetOldSelection(newPage);
         e.SetEventObject(this);
@@ -2763,7 +1542,10 @@ public:
 
         for (i = 0; i < page_count; ++i)
         {
-            int height = m_rect.height - m_tabCtrlHeight;
+            wxAuiNotebookPage& page = pages.Item(i);
+            int border_space = m_tabs->GetArtProvider()->GetAdditionalBorderSpace(page.window);
+
+            int height = m_rect.height - m_tabCtrlHeight - border_space;
             if ( height < 0 )
             {
                 // avoid passing negative height to wxWindow::SetSize(), this
@@ -2771,21 +1553,25 @@ public:
                 height = 0;
             }
 
-            wxAuiNotebookPage& page = pages.Item(i);
             if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM)
             {
-                page.window->SetSize(m_rect.x, m_rect.y, m_rect.width, height);
+                page.window->SetSize(m_rect.x + border_space,
+                                     m_rect.y + border_space,
+                                     m_rect.width - 2 * border_space,
+                                     height);
             }
             else //TODO: if (GetFlags() & wxAUI_NB_TOP)
             {
-                page.window->SetSize(m_rect.x, m_rect.y + m_tabCtrlHeight,
-                                     m_rect.width, height);
+                page.window->SetSize(m_rect.x + border_space,
+                                     m_rect.y + m_tabCtrlHeight,
+                                     m_rect.width - 2 * border_space,
+                                     height);
             }
             // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
             // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}
 
 #if wxUSE_MDI
-            if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
+            if (wxDynamicCast(page.window, wxAuiMDIChildFrame))
             {
                 wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
                 wnd->ApplyMDIChildFrameRect();
@@ -2828,37 +1614,37 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
     EVT_SIZE(wxAuiNotebook::OnSize)
     EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
+                      wxEVT_AUINOTEBOOK_PAGE_CHANGING,
                       wxAuiNotebook::OnTabClicked)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
+                      wxEVT_AUINOTEBOOK_BEGIN_DRAG,
                       wxAuiNotebook::OnTabBeginDrag)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
+                      wxEVT_AUINOTEBOOK_END_DRAG,
                       wxAuiNotebook::OnTabEndDrag)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG,
+                      wxEVT_AUINOTEBOOK_CANCEL_DRAG,
                       wxAuiNotebook::OnTabCancelDrag)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
+                      wxEVT_AUINOTEBOOK_DRAG_MOTION,
                       wxAuiNotebook::OnTabDragMotion)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
+                      wxEVT_AUINOTEBOOK_BUTTON,
                       wxAuiNotebook::OnTabButton)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN,
+                      wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN,
                       wxAuiNotebook::OnTabMiddleDown)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP,
+                      wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP,
                       wxAuiNotebook::OnTabMiddleUp)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN,
+                      wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN,
                       wxAuiNotebook::OnTabRightDown)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP,
+                      wxEVT_AUINOTEBOOK_TAB_RIGHT_UP,
                       wxAuiNotebook::OnTabRightUp)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
-                      wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK,
+                      wxEVT_AUINOTEBOOK_BG_DCLICK,
                       wxAuiNotebook::OnTabBgDClick)
     EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook)
 END_EVENT_TABLE()
@@ -3204,7 +1990,7 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
 
 #if wxUSE_MDI
     // actually destroy the window now
-    if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
+    if (wxDynamicCast(wnd, wxAuiMDIChildFrame))
     {
         // delete the child frame with pending delete, as is
         // customary with frame windows
@@ -3357,6 +2143,37 @@ wxString wxAuiNotebook::GetPageText(size_t page_idx) const
     return page_info.caption;
 }
 
+bool wxAuiNotebook::SetPageToolTip(size_t page_idx, const wxString& text)
+{
+    if (page_idx >= m_tabs.GetPageCount())
+        return false;
+
+    // update our own tab catalog
+    wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+    page_info.tooltip = text;
+
+    wxAuiTabCtrl* ctrl;
+    int ctrl_idx;
+    if (!FindTab(page_info.window, &ctrl, &ctrl_idx))
+        return false;
+
+    wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx);
+    info.tooltip = text;
+
+    // NB: we don't update the tooltip if it is already being displayed, it
+    //     typically never happens, no need to code that
+    return true;
+}
+
+wxString wxAuiNotebook::GetPageToolTip(size_t page_idx) const
+{
+    if (page_idx >= m_tabs.GetPageCount())
+        return wxString();
+
+    const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+    return page_info.tooltip;
+}
+
 bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap)
 {
     if (page_idx >= m_tabs.GetPageCount())
@@ -3665,10 +2482,21 @@ void wxAuiNotebook::OnTabClicked(wxAuiNotebookEvent& evt)
     SetSelectionToWindow(wnd);
 }
 
-void wxAuiNotebook::OnTabBgDClick(wxAuiNotebookEvent& WXUNUSED(evt))
+void wxAuiNotebook::OnTabBgDClick(wxAuiNotebookEvent& evt)
 {
+    // select the tab ctrl which received the db click
+    int selection;
+    wxWindow* wnd;
+    wxAuiTabCtrl* ctrl = (wxAuiTabCtrl*)evt.GetEventObject();
+    if (   (ctrl != NULL)
+        && ((selection = ctrl->GetActivePage()) != wxNOT_FOUND)
+        && ((wnd = ctrl->GetWindowFromIdx(selection)) != NULL))
+    {
+        SetSelectionToWindow(wnd);
+    }
+
     // notify owner that the tabbar background has been double-clicked
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_BG_DCLICK, m_windowId);
     e.SetEventObject(this);
     GetEventHandler()->ProcessEvent(e);
 }
@@ -3724,6 +2552,7 @@ void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt)
 
             wxWindow* src_tab = dest_tabs->GetWindowFromIdx(src_idx);
             dest_tabs->MovePage(src_tab, dest_idx);
+            m_tabs.MovePage(m_tabs.GetPage(src_idx).window, dest_idx);
             dest_tabs->SetActivePage((size_t)dest_idx);
             dest_tabs->DoShowHide();
             dest_tabs->Refresh();
@@ -3746,11 +2575,11 @@ void wxAuiNotebook::OnTabDragMotion(wxAuiNotebookEvent& evt)
             return;
 
         // make sure we are not over the hint window
-        if (!tab_ctrl->IsKindOf(CLASSINFO(wxFrame)))
+        if (!wxDynamicCast(tab_ctrl, wxFrame))
         {
             while (tab_ctrl)
             {
-                if (tab_ctrl->IsKindOf(CLASSINFO(wxAuiTabCtrl)))
+                if (wxDynamicCast(tab_ctrl, wxAuiTabCtrl))
                     break;
                 tab_ctrl = tab_ctrl->GetParent();
             }
@@ -3832,7 +2661,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
 
         while (tab_ctrl)
         {
-            if (tab_ctrl->IsKindOf(CLASSINFO(wxAuiTabCtrl)))
+            if (wxDynamicCast(tab_ctrl, wxAuiTabCtrl))
                 break;
             tab_ctrl = tab_ctrl->GetParent();
         }
@@ -3845,7 +2674,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
             {
                 // find out from the destination control
                 // if it's ok to drop this tab here
-                wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, m_windowId);
+                wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_ALLOW_DND, m_windowId);
                 e.SetSelection(evt.GetSelection());
                 e.SetOldSelection(evt.GetSelection());
                 e.SetEventObject(this);
@@ -3908,7 +2737,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
                 if (insert_idx == -1)
                     insert_idx = dest_tabs->GetPageCount();
                 dest_tabs->InsertPage(page_info.window, page_info, insert_idx);
-                nb->m_tabs.AddPage(page_info.window, page_info);
+                nb->m_tabs.InsertPage(page_info.window, page_info, insert_idx);
 
                 nb->DoSizing();
                 dest_tabs->DoShowHide();
@@ -3918,7 +2747,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
                 nb->SetSelectionToPage(page_info);
 
                 // notify owner that the tab has been dragged
-                wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId);
+                wxAuiNotebookEvent e2(wxEVT_AUINOTEBOOK_DRAG_DONE, m_windowId);
                 e2.SetSelection(evt.GetSelection());
                 e2.SetOldSelection(evt.GetSelection());
                 e2.SetEventObject(this);
@@ -4027,7 +2856,7 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt)
     }
 
     // notify owner that the tab has been dragged
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_DRAG_DONE, m_windowId);
     e.SetSelection(evt.GetSelection());
     e.SetOldSelection(evt.GetSelection());
     e.SetEventObject(this);
@@ -4164,9 +2993,21 @@ void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt)
     }
 
 
-    // change the tab selection to the child
-    // which was focused
-    int idx = m_tabs.GetIdxFromWindow(evt.GetWindow());
+    // find the page containing the focused child
+    wxWindow* win = evt.GetWindow();
+    while ( win )
+    {
+        // pages have the notebook as the parent, so stop when we reach one
+        // (and also stop in the impossible case of no parent at all)
+        wxWindow* const parent = win->GetParent();
+        if ( !parent || parent == this )
+            break;
+
+        win = parent;
+    }
+
+    // change the tab selection to this page
+    int idx = m_tabs.GetIdxFromWindow(win);
     if (idx != -1 && idx != m_curPage)
     {
         SetSelection(idx);
@@ -4270,7 +3111,7 @@ void wxAuiNotebook::OnTabButton(wxAuiNotebookEvent& evt)
             wxWindow* close_wnd = tabs->GetWindowFromIdx(selection);
 
             // ask owner if it's ok to close the tab
-            wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, m_windowId);
+            wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CLOSE, m_windowId);
             e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd));
             const int idx = m_tabs.GetIdxFromWindow(close_wnd);
             e.SetSelection(idx);
@@ -4282,7 +3123,7 @@ void wxAuiNotebook::OnTabButton(wxAuiNotebookEvent& evt)
 
 
 #if wxUSE_MDI
-            if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
+            if (wxDynamicCast(close_wnd, wxAuiMDIChildFrame))
             {
                 close_wnd->Close();
             }
@@ -4296,7 +3137,7 @@ void wxAuiNotebook::OnTabButton(wxAuiNotebookEvent& evt)
             }
 
             // notify owner that the tab has been closed
-            wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, m_windowId);
+            wxAuiNotebookEvent e2(wxEVT_AUINOTEBOOK_PAGE_CLOSED, m_windowId);
             e2.SetSelection(idx);
             e2.SetEventObject(this);
             GetEventHandler()->ProcessEvent(e2);
@@ -4311,7 +3152,7 @@ void wxAuiNotebook::OnTabMiddleDown(wxAuiNotebookEvent& evt)
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId);
     e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
     e.SetEventObject(this);
     GetEventHandler()->ProcessEvent(e);
@@ -4327,7 +3168,7 @@ void wxAuiNotebook::OnTabMiddleUp(wxAuiNotebookEvent& evt)
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId);
     e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
     e.SetEventObject(this);
     if (GetEventHandler()->ProcessEvent(e))
@@ -4350,7 +3191,7 @@ void wxAuiNotebook::OnTabRightDown(wxAuiNotebookEvent& evt)
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId);
     e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
     e.SetEventObject(this);
     GetEventHandler()->ProcessEvent(e);
@@ -4362,7 +3203,7 @@ void wxAuiNotebook::OnTabRightUp(wxAuiNotebookEvent& evt)
     wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject();
     wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection());
 
-    wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
+    wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId);
     e.SetSelection(m_tabs.GetIdxFromWindow(wnd));
     e.SetEventObject(this);
     GetEventHandler()->ProcessEvent(e);
@@ -4420,34 +3261,6 @@ int wxAuiNotebook::GetHeightForPageHeight(int pageHeight)
     return tabCtrlHeight + pageHeight + decorHeight;
 }
 
-// Advances the selection, generation page selection events
-void wxAuiNotebook::AdvanceSelection(bool forward)
-{
-    if (GetPageCount() <= 1)
-        return;
-
-    int currentSelection = GetSelection();
-
-    if (forward)
-    {
-        if (currentSelection == (int) (GetPageCount() - 1))
-            return;
-        else if (currentSelection == -1)
-            currentSelection = 0;
-        else
-            currentSelection ++;
-    }
-    else
-    {
-        if (currentSelection <= 0)
-            return;
-        else
-            currentSelection --;
-    }
-
-    SetSelection(currentSelection);
-}
-
 // Shows the window menu
 bool wxAuiNotebook::ShowWindowMenu()
 {
@@ -4457,7 +3270,7 @@ bool wxAuiNotebook::ShowWindowMenu()
 
     if (idx != -1)
     {
-        wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, tabCtrl->GetId());
+        wxAuiNotebookEvent e(wxEVT_AUINOTEBOOK_PAGE_CHANGING, tabCtrl->GetId());
         e.SetSelection(idx);
         e.SetOldSelection(tabCtrl->GetActivePage());
         e.SetEventObject(tabCtrl);
@@ -4469,11 +3282,11 @@ bool wxAuiNotebook::ShowWindowMenu()
         return false;
 }
 
-void wxAuiNotebook::Thaw()
+void wxAuiNotebook::DoThaw()
 {
     DoSizing();
 
-    wxControl::Thaw();
+    wxBookCtrlBase::DoThaw();
 }
 
 void wxAuiNotebook::SetPageSize (const wxSize& WXUNUSED(size))
@@ -4498,13 +3311,6 @@ bool wxAuiNotebook::SetPageImage(size_t n, int imageId)
     return SetPageBitmap(n, GetImageList()->GetBitmap(imageId));
 }
 
-wxWindow* wxAuiNotebook::GetCurrentPage () const
-{
-    const int sel = GetSelection();
-
-    return sel == wxNOT_FOUND ? NULL : GetPage(sel);
-}
-
 int wxAuiNotebook::ChangeSelection(size_t n)
 {
     return DoModifySelection(n, false);
@@ -4570,7 +3376,7 @@ int wxAuiNotebook::DoModifySelection(size_t n, bool events)
 
     bool vetoed = false;
 
-    wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+    wxAuiNotebookEvent evt(wxEVT_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
 
     if(events)
     {
@@ -4589,7 +3395,7 @@ int wxAuiNotebook::DoModifySelection(size_t n, bool events)
         // program allows the page change
         if(events)
         {
-            evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED);
+            evt.SetEventType(wxEVT_AUINOTEBOOK_PAGE_CHANGED);
             (void)GetEventHandler()->ProcessEvent(evt);
         }
 
diff --git a/Externals/wxWidgets3/src/aui/descrip.mms b/Externals/wxWidgets3/src/aui/descrip.mms
old mode 100755
new mode 100644
index d2b4d86895..9eb2dff9e7
--- a/Externals/wxWidgets3/src/aui/descrip.mms
+++ b/Externals/wxWidgets3/src/aui/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 14 December 2010                                                    *
+# Date : 2 April 2011                                                        *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -44,10 +44,10 @@ CC_DEFINE =
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = dockart.obj,floatpane.obj,framemanager.obj,auibook.obj,tabmdi.obj,\
-	auibar.obj
+	auibar.obj,tabart.obj
 
 SOURCES = dockart.cpp floatpane.cpp framemanager.cpp auibook.cpp tabmdi.cpp \
-	auibar.cpp
+	auibar.cpp tabart.cpp
   
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -75,3 +75,4 @@ framemanager.obj : framemanager.cpp
 auibook.obj :  auibook.cpp
 tabmdi.obj : tabmdi.cpp
 auibar.obj : auibar.cpp
+tabart.obj : tabart.cpp
diff --git a/Externals/wxWidgets3/src/aui/dockart.cpp b/Externals/wxWidgets3/src/aui/dockart.cpp
index 74dac023ce..df5c65febe 100644
--- a/Externals/wxWidgets3/src/aui/dockart.cpp
+++ b/Externals/wxWidgets3/src/aui/dockart.cpp
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: dockart.cpp 69590 2011-10-30 14:20:03Z VZ $
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,6 +26,8 @@
 
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
+#include "wx/aui/auibook.h"
+#include "wx/aui/tabart.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
@@ -43,11 +44,14 @@
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/renderer.h"
-#if GTK_CHECK_VERSION(2,0,0)
+#ifdef __WXGTK20__
    #include "wx/gtk/private/gtk2-compat.h"
 #else
    #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
 #endif
+#ifdef __WXGTK3__
+    #include "wx/graphics.h"
+#endif
 #endif
 
 
@@ -420,11 +424,17 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation,
     gtk_paint_handle
     (
         gtk_widget_get_style(window->m_wxwindow),
+#ifdef __WXGTK3__
+        static_cast<cairo_t*>(dc.GetGraphicsContext()->GetNativeContext()),
+#else
         window->GTKGetDrawingWindow(),
+#endif
         // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
         GTK_STATE_NORMAL,
         GTK_SHADOW_NONE,
+#ifndef __WXGTK3__
         NULL /* no clipping */,
+#endif
         window->m_wxwindow,
         "paned",
         rect.x,
@@ -457,7 +467,7 @@ void wxAuiDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *WXUNUSED(window), i
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 }
 
-void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& _rect,
+void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow* window, const wxRect& _rect,
                                   wxAuiPaneInfo& pane)
 {
     dc.SetPen(m_borderPen);
@@ -483,10 +493,21 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const
     }
     else
     {
-        for (i = 0; i < border_width; ++i)
+        // notebooks draw the border themselves, so they can use native rendering (e.g. tabartgtk)
+        wxAuiTabArt* art = 0;
+        wxAuiNotebook* nb = wxDynamicCast(window, wxAuiNotebook);
+        if (nb)
+            art = nb->GetArtProvider();
+
+        if (art)
+            art->DrawBorder(dc, window, rect);
+        else
         {
-            dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-            rect.Deflate(1);
+            for (i = 0; i < border_width; ++i)
+            {
+                dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+                rect.Deflate(1);
+            }
         }
     }
 }
diff --git a/Externals/wxWidgets3/src/aui/floatpane.cpp b/Externals/wxWidgets3/src/aui/floatpane.cpp
index a4ce130fd8..837c0a0aa5 100644
--- a/Externals/wxWidgets3/src/aui/floatpane.cpp
+++ b/Externals/wxWidgets3/src/aui/floatpane.cpp
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: floatpane.cpp 69590 2011-10-30 14:20:03Z VZ $
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -216,6 +215,9 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
         return;
     }
 
+    // as on OSX moving windows are not getting all move events, only sporadically, this difference
+    // is almost always big on OSX, so avoid this early exit opportunity
+#ifndef __WXOSX__
     // skip if moving too fast to avoid massive redraws and
     // jumping hint windows
     if ((abs(winRect.x - m_lastRect.x) > 3) ||
@@ -235,6 +237,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
 
         return;
     }
+#endif
 
     // prevent frame redocking during resize
     if (m_lastRect.GetSize() != winRect.GetSize())
@@ -281,7 +284,10 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
     if (m_last3Rect.IsEmpty())
         return;
 
-    OnMoving(event.GetRect(), dir);
+    if ( event.GetEventType() == wxEVT_MOVING )
+        OnMoving(event.GetRect(), dir);
+    else
+        OnMoving(wxRect(event.GetPosition(),GetSize()), dir);
 }
 
 void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)
@@ -337,7 +343,7 @@ void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event)
 }
 
 // utility function which determines the state of the mouse button
-// (independant of having a wxMouseEvent handy) - utimately a better
+// (independent of having a wxMouseEvent handy) - utimately a better
 // mechanism for this should be found (possibly by adding the
 // functionality to wxWidgets itself)
 bool wxAuiFloatingFrame::isMouseDown()
diff --git a/Externals/wxWidgets3/src/aui/framemanager.cpp b/Externals/wxWidgets3/src/aui/framemanager.cpp
index 1fee9e8ffa..20e654791a 100644
--- a/Externals/wxWidgets3/src/aui/framemanager.cpp
+++ b/Externals/wxWidgets3/src/aui/framemanager.cpp
@@ -4,7 +4,6 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: framemanager.cpp 70807 2012-03-04 20:31:34Z VZ $
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -822,7 +821,7 @@ void wxAuiManager::UpdateHintWindowConfig()
     wxWindow* w = m_frame;
     while (w)
     {
-        if (w->IsKindOf(CLASSINFO(wxFrame)))
+        if (wxDynamicCast(w, wxFrame))
         {
             wxFrame* f = static_cast<wxFrame*>(w);
             can_do_transparent = f->CanSetTransparent();
@@ -913,7 +912,7 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd)
     // we need to add the MDI client window as the default
     // center pane
 
-    if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
+    if (wxDynamicCast(m_frame, wxMDIParentFrame))
     {
         wxMDIParentFrame* mdi_frame = (wxMDIParentFrame*)m_frame;
         wxWindow* client_window = mdi_frame->GetClientWindow();
@@ -924,7 +923,7 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd)
                 wxAuiPaneInfo().Name(wxT("mdiclient")).
                 CenterPane().PaneBorder(false));
     }
-    else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame)))
+    else if (wxDynamicCast(m_frame, wxAuiMDIParentFrame))
     {
         wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame;
         wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow();
@@ -1097,7 +1096,7 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& paneInfo)
 
     if (pinfo.HasGripper())
     {
-        if (pinfo.window->IsKindOf(CLASSINFO(wxAuiToolBar)))
+        if (wxDynamicCast(pinfo.window, wxAuiToolBar))
         {
             // prevent duplicate gripper -- both wxAuiManager and wxAuiToolBar
             // have a gripper control.  The toolbar's built-in gripper
@@ -1117,7 +1116,7 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& paneInfo)
         pinfo.best_size = pinfo.window->GetClientSize();
 
 #if wxUSE_TOOLBAR
-        if (pinfo.window->IsKindOf(CLASSINFO(wxToolBar)))
+        if (wxDynamicCast(pinfo.window, wxToolBar))
         {
             // GetClientSize() doesn't get the best size for
             // a toolbar under some newer versions of wxWidgets,
@@ -3236,16 +3235,16 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
         // determine the mouse offset and the pane size, both in the
         // direction of the dock itself, and perpendicular to the dock
 
-        int offset, size;
+        int mouseOffset, size;
 
         if (part->orientation == wxVERTICAL)
         {
-            offset = pt.y - part->rect.y;
+            mouseOffset = pt.y - part->rect.y;
             size = part->rect.GetHeight();
         }
         else
         {
-            offset = pt.x - part->rect.x;
+            mouseOffset = pt.x - part->rect.x;
             size = part->rect.GetWidth();
         }
 
@@ -3253,7 +3252,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
         // if we are in the top/left part of the pane,
         // insert the pane before the pane being hovered over
-        if (offset <= size/2)
+        if (mouseOffset <= size/2)
         {
             drop_position = part->pane->dock_pos;
             DoInsertPane(panes,
@@ -3265,7 +3264,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
         // if we are in the bottom/right part of the pane,
         // insert the pane before the pane being hovered over
-        if (offset > size/2)
+        if (mouseOffset > size/2)
         {
             drop_position = part->pane->dock_pos+1;
             DoInsertPane(panes,
@@ -3313,7 +3312,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
         m_hintFadeAmt = m_hintFadeMax;
 
         if ((m_flags & wxAUI_MGR_HINT_FADE)
-            && !((m_hintWnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) &&
+            && !((wxDynamicCast(m_hintWnd, wxPseudoTransparentFrame)) &&
                  (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE))
             )
             m_hintFadeAmt = 0;
@@ -3367,15 +3366,15 @@ void wxAuiManager::ShowHint(const wxRect& rect)
                     pane.frame &&
                         pane.frame->IsShown())
             {
-                wxRect rect = pane.frame->GetRect();
+                wxRect r = pane.frame->GetRect();
 #ifdef __WXGTK__
                 // wxGTK returns the client size, not the whole frame size
-                rect.width += 15;
-                rect.height += 35;
-                rect.Inflate(5);
+                r.width += 15;
+                r.height += 35;
+                r.Inflate(5);
 #endif
 
-                clip.Subtract(rect);
+                clip.Subtract(r);
             }
         }
 
@@ -3959,7 +3958,7 @@ void wxAuiManager::OnSize(wxSizeEvent& event)
         Repaint();
 
 #if wxUSE_MDI
-        if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
+        if (wxDynamicCast(m_frame, wxMDIParentFrame))
         {
             // for MDI parent frames, this event must not
             // be "skipped".  In other words, the parent frame
@@ -3983,7 +3982,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
     }
 
     // if we are managing a child frame, get the 'real' manager
-    if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+    if (wxDynamicCast(window, wxAuiFloatingFrame))
     {
         wxAuiFloatingFrame* float_frame = static_cast<wxAuiFloatingFrame*>(window);
         evt.SetManager(float_frame->GetOwnerManager());
@@ -4126,7 +4125,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
             if (part->pane &&
                 part->pane->window &&
                 managed_wnd &&
-                managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+                wxDynamicCast(managed_wnd, wxAuiFloatingFrame))
             {
                 wxAuiFloatingFrame* floating_frame = (wxAuiFloatingFrame*)managed_wnd;
                 wxAuiManager* owner_mgr = floating_frame->GetOwnerManager();
@@ -4211,7 +4210,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
 #if wxUSE_STATUSBAR
         // if there's a status control, the available
         // height decreases accordingly
-        if (m_frame && m_frame->IsKindOf(CLASSINFO(wxFrame)))
+        if (wxDynamicCast(m_frame, wxFrame))
         {
             wxFrame* frame = static_cast<wxFrame*>(m_frame);
             wxStatusBar* status = frame->GetStatusBar();
@@ -4640,7 +4639,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
             // We can't move the child window so we need to get the frame that
             // we want to be really moving. This is probably not the best place
             // to do this but at least it fixes the bug (#13177) for now.
-            if (!m_actionWindow->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+            if (!wxDynamicCast(m_actionWindow, wxAuiFloatingFrame))
             {
                 wxAuiPaneInfo& pane = GetPane(m_actionWindow);
                 m_actionWindow = pane.frame;
@@ -4658,8 +4657,8 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
 
         pane.SetFlag(wxAuiPaneInfo::actionPane, true);
 
-        wxPoint pt = event.GetPosition();
-        DoDrop(m_docks, m_panes, pane, pt, m_actionOffset);
+        wxPoint point = event.GetPosition();
+        DoDrop(m_docks, m_panes, pane, point, m_actionOffset);
 
         // if DoDrop() decided to float the pane, set up
         // the floating pane's initial position
@@ -4793,7 +4792,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
     }
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized())
     {
-        // fire pane close event
+        // fire pane maximize event
         wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE);
         e.SetManager(this);
         e.SetPane(evt.pane);
@@ -4807,7 +4806,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
     }
     else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized())
     {
-        // fire pane close event
+        // fire pane restore event
         wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE);
         e.SetManager(this);
         e.SetPane(evt.pane);
@@ -4819,11 +4818,29 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
             Update();
         }
     }
-    else if (evt.button == wxAUI_BUTTON_PIN)
+    else if (evt.button == wxAUI_BUTTON_PIN &&
+                (m_flags & wxAUI_MGR_ALLOW_FLOATING) && pane.IsFloatable())
     {
-        if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
-            pane.IsFloatable())
-                pane.Float();
+        if (pane.IsMaximized())
+        {
+            // If the pane is maximized, the original state must be restored
+            // before trying to float the pane, otherwise the other panels
+            // wouldn't appear correctly when it becomes floating.
+            wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE);
+            e.SetManager(this);
+            e.SetPane(evt.pane);
+            ProcessMgrEvent(e);
+
+            if (e.GetVeto())
+            {
+                // If it can't be restored, it can't be floated neither.
+                return;
+            }
+
+            RestorePane(pane);
+        }
+
+        pane.Float();
         Update();
     }
 }
diff --git a/Externals/wxWidgets3/src/aui/tabart.cpp b/Externals/wxWidgets3/src/aui/tabart.cpp
new file mode 100644
index 0000000000..f736f0b6e5
--- /dev/null
+++ b/Externals/wxWidgets3/src/aui/tabart.cpp
@@ -0,0 +1,1319 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/aui/tabart.cpp
+// Purpose:     wxaui: wx advanced user interface - notebook-art
+// Author:      Benjamin I. Williams
+// Modified by: Jens Lody (moved from auibook.cpp in extra file)
+// Created:     2012-03-21
+// Copyright:   (C) Copyright 2006, Kirix Corporation, All Rights Reserved
+// Licence:     wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_AUI
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/menu.h"
+#endif
+
+#include "wx/renderer.h"
+#include "wx/aui/auibook.h"
+#include "wx/aui/framemanager.h"
+#include "wx/aui/dockart.h"
+
+#ifdef __WXMAC__
+#include "wx/osx/private.h"
+#endif
+
+
+// -- GUI helper classes and functions --
+
+class wxAuiCommandCapture : public wxEvtHandler
+{
+public:
+
+    wxAuiCommandCapture() { m_lastId = 0; }
+    int GetCommandId() const { return m_lastId; }
+
+    bool ProcessEvent(wxEvent& evt)
+    {
+        if (evt.GetEventType() == wxEVT_MENU)
+        {
+            m_lastId = evt.GetId();
+            return true;
+        }
+
+        if (GetNextHandler())
+            return GetNextHandler()->ProcessEvent(evt);
+
+        return false;
+    }
+
+private:
+    int m_lastId;
+};
+
+
+// these functions live in dockart.cpp -- they'll eventually
+// be moved to a new utility cpp file
+
+wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
+                             const wxColour& color);
+
+wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size);
+
+static void DrawButtons(wxDC& dc,
+                        const wxRect& _rect,
+                        const wxBitmap& bmp,
+                        const wxColour& bkcolour,
+                        int button_state)
+{
+    wxRect rect = _rect;
+
+    if (button_state == wxAUI_BUTTON_STATE_PRESSED)
+    {
+        rect.x++;
+        rect.y++;
+    }
+
+    if (button_state == wxAUI_BUTTON_STATE_HOVER ||
+        button_state == wxAUI_BUTTON_STATE_PRESSED)
+    {
+        dc.SetBrush(wxBrush(bkcolour.ChangeLightness(120)));
+        dc.SetPen(wxPen(bkcolour.ChangeLightness(75)));
+
+        // draw the background behind the button
+        dc.DrawRectangle(rect.x, rect.y, 15, 15);
+    }
+
+    // draw the button itself
+    dc.DrawBitmap(bmp, rect.x, rect.y, true);
+}
+
+static void IndentPressedBitmap(wxRect* rect, int button_state)
+{
+    if (button_state == wxAUI_BUTTON_STATE_PRESSED)
+    {
+        rect->x++;
+        rect->y++;
+    }
+}
+
+// -- bitmaps --
+
+#if defined( __WXMAC__ )
+ static const unsigned char close_bits[]={
+     0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
+     0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
+     0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#elif defined( __WXGTK__)
+ static const unsigned char close_bits[]={
+     0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+     0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+     0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+#else
+ static const unsigned char close_bits[]={
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9,
+     0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+#endif
+
+static const unsigned char left_bits[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe,
+   0x1f, 0xfe, 0x0f, 0xfe, 0x1f, 0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+static const unsigned char right_bits[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x9f, 0xff, 0x1f, 0xff,
+   0x1f, 0xfe, 0x1f, 0xfc, 0x1f, 0xfe, 0x1f, 0xff, 0x9f, 0xff, 0xdf, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+static const unsigned char list_bits[] = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x0f, 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+
+
+
+
+
+// -- wxAuiGenericTabArt class implementation --
+
+wxAuiGenericTabArt::wxAuiGenericTabArt()
+{
+    m_normalFont = *wxNORMAL_FONT;
+    m_selectedFont = *wxNORMAL_FONT;
+    m_selectedFont.SetWeight(wxBOLD);
+    m_measuringFont = m_selectedFont;
+
+    m_fixedTabWidth = 100;
+    m_tabCtrlHeight = 0;
+
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
+    wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+#else
+    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+#endif
+
+    // the baseColour is too pale to use as our base colour,
+    // so darken it a bit --
+    if ((255-baseColour.Red()) +
+        (255-baseColour.Green()) +
+        (255-baseColour.Blue()) < 60)
+    {
+        baseColour = baseColour.ChangeLightness(92);
+    }
+
+    m_activeColour = baseColour;
+    m_baseColour = baseColour;
+    wxColor borderColour = baseColour.ChangeLightness(75);
+
+    m_borderPen = wxPen(borderColour);
+    m_baseColourPen = wxPen(m_baseColour);
+    m_baseColourBrush = wxBrush(m_baseColour);
+
+    m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
+    m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
+    m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
+    m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
+    m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
+
+    m_flags = 0;
+}
+
+wxAuiGenericTabArt::~wxAuiGenericTabArt()
+{
+}
+
+wxAuiTabArt* wxAuiGenericTabArt::Clone()
+{
+    return new wxAuiGenericTabArt(*this);
+}
+
+void wxAuiGenericTabArt::SetFlags(unsigned int flags)
+{
+    m_flags = flags;
+}
+
+void wxAuiGenericTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
+                                       size_t tab_count)
+{
+    m_fixedTabWidth = 100;
+
+    int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
+
+    if (m_flags & wxAUI_NB_CLOSE_BUTTON)
+        tot_width -= m_activeCloseBmp.GetWidth();
+    if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
+        tot_width -= m_activeWindowListBmp.GetWidth();
+
+    if (tab_count > 0)
+    {
+        m_fixedTabWidth = tot_width/(int)tab_count;
+    }
+
+
+    if (m_fixedTabWidth < 100)
+        m_fixedTabWidth = 100;
+
+    if (m_fixedTabWidth > tot_width/2)
+        m_fixedTabWidth = tot_width/2;
+
+    if (m_fixedTabWidth > 220)
+        m_fixedTabWidth = 220;
+
+    m_tabCtrlHeight = tab_ctrl_size.y;
+}
+
+
+void wxAuiGenericTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect)
+{
+    int i, border_width = GetBorderWidth(wnd);
+
+    wxRect theRect(rect);
+    for (i = 0; i < border_width; ++i)
+    {
+        dc.DrawRectangle(theRect.x, theRect.y, theRect.width, theRect.height);
+        theRect.Deflate(1);
+    }
+}
+
+void wxAuiGenericTabArt::DrawBackground(wxDC& dc,
+                                        wxWindow* WXUNUSED(wnd),
+                                        const wxRect& rect)
+{
+    // draw background
+
+    wxColor top_color       = m_baseColour.ChangeLightness(90);
+    wxColor bottom_color   = m_baseColour.ChangeLightness(170);
+    wxRect r;
+
+   if (m_flags &wxAUI_NB_BOTTOM)
+       r = wxRect(rect.x, rect.y, rect.width+2, rect.height);
+   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+   else //for wxAUI_NB_TOP
+       r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3);
+
+    dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
+
+
+   // draw base lines
+
+   dc.SetPen(m_borderPen);
+   int y = rect.GetHeight();
+   int w = rect.GetWidth();
+
+   if (m_flags &wxAUI_NB_BOTTOM)
+   {
+       dc.SetBrush(wxBrush(bottom_color));
+       dc.DrawRectangle(-1, 0, w+2, 4);
+   }
+   // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+   // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+   else //for wxAUI_NB_TOP
+   {
+       dc.SetBrush(m_baseColourBrush);
+       dc.DrawRectangle(-1, y-4, w+2, 4);
+   }
+}
+
+
+// DrawTab() draws an individual tab.
+//
+// dc       - output dc
+// in_rect  - rectangle the tab should be confined to
+// caption  - tab's caption
+// active   - whether or not the tab is active
+// out_rect - actual output rectangle
+// x_extent - the advance x; where the next tab should start
+
+void wxAuiGenericTabArt::DrawTab(wxDC& dc,
+                                 wxWindow* wnd,
+                                 const wxAuiNotebookPage& page,
+                                 const wxRect& in_rect,
+                                 int close_button_state,
+                                 wxRect* out_tab_rect,
+                                 wxRect* out_button_rect,
+                                 int* x_extent)
+{
+    wxCoord normal_textx, normal_texty;
+    wxCoord selected_textx, selected_texty;
+    wxCoord texty;
+
+    // if the caption is empty, measure some temporary text
+    wxString caption = page.caption;
+    if (caption.empty())
+        caption = wxT("Xj");
+
+    dc.SetFont(m_selectedFont);
+    dc.GetTextExtent(caption, &selected_textx, &selected_texty);
+
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(caption, &normal_textx, &normal_texty);
+
+    // figure out the size of the tab
+    wxSize tab_size = GetTabSize(dc,
+                                 wnd,
+                                 page.caption,
+                                 page.bitmap,
+                                 page.active,
+                                 close_button_state,
+                                 x_extent);
+
+    wxCoord tab_height = m_tabCtrlHeight - 3;
+    wxCoord tab_width = tab_size.x;
+    wxCoord tab_x = in_rect.x;
+    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+
+
+    caption = page.caption;
+
+
+    // select pen, brush and font for the tab to be drawn
+
+    if (page.active)
+    {
+        dc.SetFont(m_selectedFont);
+        texty = selected_texty;
+    }
+    else
+    {
+        dc.SetFont(m_normalFont);
+        texty = normal_texty;
+    }
+
+
+    // create points that will make the tab outline
+
+    int clip_width = tab_width;
+    if (tab_x + clip_width > in_rect.x + in_rect.width)
+        clip_width = (in_rect.x + in_rect.width) - tab_x;
+
+/*
+    wxPoint clip_points[6];
+    clip_points[0] = wxPoint(tab_x,              tab_y+tab_height-3);
+    clip_points[1] = wxPoint(tab_x,              tab_y+2);
+    clip_points[2] = wxPoint(tab_x+2,            tab_y);
+    clip_points[3] = wxPoint(tab_x+clip_width-1, tab_y);
+    clip_points[4] = wxPoint(tab_x+clip_width+1, tab_y+2);
+    clip_points[5] = wxPoint(tab_x+clip_width+1, tab_y+tab_height-3);
+
+    // FIXME: these ports don't provide wxRegion ctor from array of points
+#if !defined(__WXDFB__) && !defined(__WXCOCOA__)
+    // set the clipping region for the tab --
+    wxRegion clipping_region(WXSIZEOF(clip_points), clip_points);
+    dc.SetClippingRegion(clipping_region);
+#endif // !wxDFB && !wxCocoa
+*/
+    // since the above code above doesn't play well with WXDFB or WXCOCOA,
+    // we'll just use a rectangle for the clipping region for now --
+    dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
+
+
+    wxPoint border_points[6];
+    if (m_flags &wxAUI_NB_BOTTOM)
+    {
+        border_points[0] = wxPoint(tab_x,             tab_y);
+        border_points[1] = wxPoint(tab_x,             tab_y+tab_height-6);
+        border_points[2] = wxPoint(tab_x+2,           tab_y+tab_height-4);
+        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y+tab_height-4);
+        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+tab_height-6);
+        border_points[5] = wxPoint(tab_x+tab_width,   tab_y);
+    }
+    else //if (m_flags & wxAUI_NB_TOP) {}
+    {
+        border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
+        border_points[1] = wxPoint(tab_x,             tab_y+2);
+        border_points[2] = wxPoint(tab_x+2,           tab_y);
+        border_points[3] = wxPoint(tab_x+tab_width-2, tab_y);
+        border_points[4] = wxPoint(tab_x+tab_width,   tab_y+2);
+        border_points[5] = wxPoint(tab_x+tab_width,   tab_y+tab_height-4);
+    }
+    // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+    // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+
+    int drawn_tab_yoff = border_points[1].y;
+    int drawn_tab_height = border_points[0].y - border_points[1].y;
+
+
+    if (page.active)
+    {
+        // draw active tab
+
+        // draw base background color
+        wxRect r(tab_x, tab_y, tab_width, tab_height);
+        dc.SetPen(wxPen(m_activeColour));
+        dc.SetBrush(wxBrush(m_activeColour));
+        dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
+
+        // this white helps fill out the gradient at the top of the tab
+        dc.SetPen(*wxWHITE_PEN);
+        dc.SetBrush(*wxWHITE_BRUSH);
+        dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
+
+        // these two points help the rounded corners appear more antialiased
+        dc.SetPen(wxPen(m_activeColour));
+        dc.DrawPoint(r.x+2, r.y+1);
+        dc.DrawPoint(r.x+r.width-2, r.y+1);
+
+        // set rectangle down a bit for gradient drawing
+        r.SetHeight(r.GetHeight()/2);
+        r.x += 2;
+        r.width -= 3;
+        r.y += r.height;
+        r.y -= 2;
+
+        // draw gradient background
+        wxColor top_color = *wxWHITE;
+        wxColor bottom_color = m_activeColour;
+        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+    }
+    else
+    {
+        // draw inactive tab
+
+        wxRect r(tab_x, tab_y+1, tab_width, tab_height-3);
+
+        // start the gradent up a bit and leave the inside border inset
+        // by a pixel for a 3D look.  Only the top half of the inactive
+        // tab will have a slight gradient
+        r.x += 3;
+        r.y++;
+        r.width -= 4;
+        r.height /= 2;
+        r.height--;
+
+        // -- draw top gradient fill for glossy look
+        wxColor top_color = m_baseColour;
+        wxColor bottom_color = top_color.ChangeLightness(160);
+        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+
+        r.y += r.height;
+        r.y--;
+
+        // -- draw bottom fill for glossy look
+        top_color = m_baseColour;
+        bottom_color = m_baseColour;
+        dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
+    }
+
+    // draw tab outline
+    dc.SetPen(m_borderPen);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawPolygon(WXSIZEOF(border_points), border_points);
+
+    // there are two horizontal grey lines at the bottom of the tab control,
+    // this gets rid of the top one of those lines in the tab control
+    if (page.active)
+    {
+        if (m_flags &wxAUI_NB_BOTTOM)
+            dc.SetPen(wxPen(m_baseColour.ChangeLightness(170)));
+        // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+        // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+        else //for wxAUI_NB_TOP
+            dc.SetPen(m_baseColourPen);
+        dc.DrawLine(border_points[0].x+1,
+                    border_points[0].y,
+                    border_points[5].x,
+                    border_points[5].y);
+    }
+
+
+    int text_offset = tab_x + 8;
+    int close_button_width = 0;
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        close_button_width = m_activeCloseBmp.GetWidth();
+    }
+
+    int bitmap_offset = 0;
+    if (page.bitmap.IsOk())
+    {
+        bitmap_offset = tab_x + 8;
+
+        // draw bitmap
+        dc.DrawBitmap(page.bitmap,
+                      bitmap_offset,
+                      drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
+                      true);
+
+        text_offset = bitmap_offset + page.bitmap.GetWidth();
+        text_offset += 3; // bitmap padding
+
+    }
+    else
+    {
+        text_offset = tab_x + 8;
+    }
+
+
+    wxString draw_text = wxAuiChopText(dc,
+                          caption,
+                          tab_width - (text_offset-tab_x) - close_button_width);
+
+    // draw tab text
+    dc.DrawText(draw_text,
+                text_offset,
+                drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
+
+    // draw focus rectangle
+    if (page.active && (wnd->FindFocus() == wnd))
+    {
+        wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1),
+            selected_textx, selected_texty);
+
+        wxRect focusRect;
+        wxRect focusRectBitmap;
+
+        if (page.bitmap.IsOk())
+            focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
+                                            page.bitmap.GetWidth(), page.bitmap.GetHeight());
+
+        if (page.bitmap.IsOk() && draw_text.IsEmpty())
+            focusRect = focusRectBitmap;
+        else if (!page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText;
+        else if (page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText.Union(focusRectBitmap);
+
+        focusRect.Inflate(2, 2);
+
+        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
+    }
+
+    // draw close button if necessary
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        wxBitmap bmp = m_disabledCloseBmp;
+
+        if (close_button_state == wxAUI_BUTTON_STATE_HOVER ||
+            close_button_state == wxAUI_BUTTON_STATE_PRESSED)
+        {
+            bmp = m_activeCloseBmp;
+        }
+
+        int offsetY = tab_y-1;
+        if (m_flags & wxAUI_NB_BOTTOM)
+            offsetY = 1;
+
+        wxRect rect(tab_x + tab_width - close_button_width - 1,
+                    offsetY + (tab_height/2) - (bmp.GetHeight()/2),
+                    close_button_width,
+                    tab_height);
+
+        IndentPressedBitmap(&rect, close_button_state);
+        dc.DrawBitmap(bmp, rect.x, rect.y, true);
+
+        *out_button_rect = rect;
+    }
+
+    *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
+
+    dc.DestroyClippingRegion();
+}
+
+int wxAuiGenericTabArt::GetIndentSize()
+{
+    return 5;
+}
+
+int wxAuiGenericTabArt::GetBorderWidth(wxWindow* wnd)
+{
+    wxAuiManager* mgr = wxAuiManager::GetManager(wnd);
+    if (mgr)
+    {
+       wxAuiDockArt*  art = mgr->GetArtProvider();
+        if (art)
+            return art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+    }
+    return 1;
+}
+
+int wxAuiGenericTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd))
+{
+    return 0;
+}
+
+wxSize wxAuiGenericTabArt::GetTabSize(wxDC& dc,
+                                      wxWindow* WXUNUSED(wnd),
+                                      const wxString& caption,
+                                      const wxBitmap& bitmap,
+                                      bool WXUNUSED(active),
+                                      int close_button_state,
+                                      int* x_extent)
+{
+    wxCoord measured_textx, measured_texty, tmp;
+
+    dc.SetFont(m_measuringFont);
+    dc.GetTextExtent(caption, &measured_textx, &measured_texty);
+
+    dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty);
+
+    // add padding around the text
+    wxCoord tab_width = measured_textx;
+    wxCoord tab_height = measured_texty;
+
+    // if the close button is showing, add space for it
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+        tab_width += m_activeCloseBmp.GetWidth() + 3;
+
+    // if there's a bitmap, add space for it
+    if (bitmap.IsOk())
+    {
+        tab_width += bitmap.GetWidth();
+        tab_width += 3; // right side bitmap padding
+        tab_height = wxMax(tab_height, bitmap.GetHeight());
+    }
+
+    // add padding
+    tab_width += 16;
+    tab_height += 10;
+
+    if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
+    {
+        tab_width = m_fixedTabWidth;
+    }
+
+    *x_extent = tab_width;
+
+    return wxSize(tab_width, tab_height);
+}
+
+
+void wxAuiGenericTabArt::DrawButton(wxDC& dc,
+                                    wxWindow* WXUNUSED(wnd),
+                                    const wxRect& in_rect,
+                                    int bitmap_id,
+                                    int button_state,
+                                    int orientation,
+                                    wxRect* out_rect)
+{
+    wxBitmap bmp;
+    wxRect rect;
+
+    switch (bitmap_id)
+    {
+        case wxAUI_BUTTON_CLOSE:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledCloseBmp;
+            else
+                bmp = m_activeCloseBmp;
+            break;
+        case wxAUI_BUTTON_LEFT:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledLeftBmp;
+            else
+                bmp = m_activeLeftBmp;
+            break;
+        case wxAUI_BUTTON_RIGHT:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledRightBmp;
+            else
+                bmp = m_activeRightBmp;
+            break;
+        case wxAUI_BUTTON_WINDOWLIST:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledWindowListBmp;
+            else
+                bmp = m_activeWindowListBmp;
+            break;
+    }
+
+
+    if (!bmp.IsOk())
+        return;
+
+    rect = in_rect;
+
+    if (orientation == wxLEFT)
+    {
+        rect.SetX(in_rect.x);
+        rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2));
+        rect.SetWidth(bmp.GetWidth());
+        rect.SetHeight(bmp.GetHeight());
+    }
+    else
+    {
+        rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
+                      ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
+                      bmp.GetWidth(), bmp.GetHeight());
+    }
+
+    IndentPressedBitmap(&rect, button_state);
+    dc.DrawBitmap(bmp, rect.x, rect.y, true);
+
+    *out_rect = rect;
+}
+
+int wxAuiGenericTabArt::ShowDropDown(wxWindow* wnd,
+                                     const wxAuiNotebookPageArray& pages,
+                                     int /*active_idx*/)
+{
+    wxMenu menuPopup;
+
+    size_t i, count = pages.GetCount();
+    for (i = 0; i < count; ++i)
+    {
+        const wxAuiNotebookPage& page = pages.Item(i);
+        wxString caption = page.caption;
+
+        // if there is no caption, make it a space.  This will prevent
+        // an assert in the menu code.
+        if (caption.IsEmpty())
+            caption = wxT(" ");
+
+        wxMenuItem* item = new wxMenuItem(NULL, 1000+i, caption);
+        if (page.bitmap.IsOk())
+            item->SetBitmap(page.bitmap);
+        menuPopup.Append(item);
+    }
+
+    // find out where to put the popup menu of window items
+    wxPoint pt = ::wxGetMousePosition();
+    pt = wnd->ScreenToClient(pt);
+
+    // find out the screen coordinate at the bottom of the tab ctrl
+    wxRect cli_rect = wnd->GetClientRect();
+    pt.y = cli_rect.y + cli_rect.height;
+
+    wxAuiCommandCapture* cc = new wxAuiCommandCapture;
+    wnd->PushEventHandler(cc);
+    wnd->PopupMenu(&menuPopup, pt);
+    int command = cc->GetCommandId();
+    wnd->PopEventHandler(true);
+
+    if (command >= 1000)
+        return command-1000;
+
+    return -1;
+}
+
+int wxAuiGenericTabArt::GetBestTabCtrlSize(wxWindow* wnd,
+                                           const wxAuiNotebookPageArray& pages,
+                                           const wxSize& requiredBmp_size)
+{
+    wxClientDC dc(wnd);
+    dc.SetFont(m_measuringFont);
+
+    // sometimes a standard bitmap size needs to be enforced, especially
+    // if some tabs have bitmaps and others don't.  This is important because
+    // it prevents the tab control from resizing when tabs are added.
+    wxBitmap measureBmp;
+    if (requiredBmp_size.IsFullySpecified())
+    {
+        measureBmp.Create(requiredBmp_size.x,
+                           requiredBmp_size.y);
+    }
+
+
+    int max_y = 0;
+    size_t i, page_count = pages.GetCount();
+    for (i = 0; i < page_count; ++i)
+    {
+        wxAuiNotebookPage& page = pages.Item(i);
+
+        wxBitmap bmp;
+        if (measureBmp.IsOk())
+            bmp = measureBmp;
+        else
+            bmp = page.bitmap;
+
+        // we don't use the caption text because we don't
+        // want tab heights to be different in the case
+        // of a very short piece of text on one tab and a very
+        // tall piece of text on another tab
+        int x_ext = 0;
+        wxSize s = GetTabSize(dc,
+                              wnd,
+                              wxT("ABCDEFGHIj"),
+                              bmp,
+                              true,
+                              wxAUI_BUTTON_STATE_HIDDEN,
+                              &x_ext);
+
+        max_y = wxMax(max_y, s.y);
+    }
+
+    return max_y+2;
+}
+
+void wxAuiGenericTabArt::SetNormalFont(const wxFont& font)
+{
+    m_normalFont = font;
+}
+
+void wxAuiGenericTabArt::SetSelectedFont(const wxFont& font)
+{
+    m_selectedFont = font;
+}
+
+void wxAuiGenericTabArt::SetMeasuringFont(const wxFont& font)
+{
+    m_measuringFont = font;
+}
+
+void wxAuiGenericTabArt::SetColour(const wxColour& colour)
+{
+    m_baseColour = colour;
+    m_borderPen = wxPen(m_baseColour.ChangeLightness(75));
+    m_baseColourPen = wxPen(m_baseColour);
+    m_baseColourBrush = wxBrush(m_baseColour);
+}
+
+void wxAuiGenericTabArt::SetActiveColour(const wxColour& colour)
+{
+    m_activeColour = colour;
+}
+
+// -- wxAuiSimpleTabArt class implementation --
+
+wxAuiSimpleTabArt::wxAuiSimpleTabArt()
+{
+    m_normalFont = *wxNORMAL_FONT;
+    m_selectedFont = *wxNORMAL_FONT;
+    m_selectedFont.SetWeight(wxBOLD);
+    m_measuringFont = m_selectedFont;
+
+    m_flags = 0;
+    m_fixedTabWidth = 100;
+
+    wxColour baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+
+    wxColour backgroundColour = baseColour;
+    wxColour normaltabColour = baseColour;
+    wxColour selectedtabColour = *wxWHITE;
+
+    m_bkBrush = wxBrush(backgroundColour);
+    m_normalBkBrush = wxBrush(normaltabColour);
+    m_normalBkPen = wxPen(normaltabColour);
+    m_selectedBkBrush = wxBrush(selectedtabColour);
+    m_selectedBkPen = wxPen(selectedtabColour);
+
+    m_activeCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
+    m_disabledCloseBmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
+    m_disabledLeftBmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
+    m_disabledRightBmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+
+    m_activeWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
+    m_disabledWindowListBmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
+
+}
+
+wxAuiSimpleTabArt::~wxAuiSimpleTabArt()
+{
+}
+
+wxAuiTabArt* wxAuiSimpleTabArt::Clone()
+{
+    return new wxAuiSimpleTabArt(*this);
+}
+
+void wxAuiSimpleTabArt::SetFlags(unsigned int flags)
+{
+    m_flags = flags;
+}
+
+void wxAuiSimpleTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
+                                      size_t tab_count)
+{
+    m_fixedTabWidth = 100;
+
+    int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
+
+    if (m_flags & wxAUI_NB_CLOSE_BUTTON)
+        tot_width -= m_activeCloseBmp.GetWidth();
+    if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
+        tot_width -= m_activeWindowListBmp.GetWidth();
+
+    if (tab_count > 0)
+    {
+        m_fixedTabWidth = tot_width/(int)tab_count;
+    }
+
+
+    if (m_fixedTabWidth < 100)
+        m_fixedTabWidth = 100;
+
+    if (m_fixedTabWidth > tot_width/2)
+        m_fixedTabWidth = tot_width/2;
+
+    if (m_fixedTabWidth > 220)
+        m_fixedTabWidth = 220;
+}
+
+void wxAuiSimpleTabArt::SetColour(const wxColour& colour)
+{
+    m_bkBrush = wxBrush(colour);
+    m_normalBkBrush = wxBrush(colour);
+    m_normalBkPen = wxPen(colour);
+}
+
+void wxAuiSimpleTabArt::SetActiveColour(const wxColour& colour)
+{
+    m_selectedBkBrush = wxBrush(colour);
+    m_selectedBkPen = wxPen(colour);
+}
+
+void wxAuiSimpleTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect)
+{
+    int i, border_width = GetBorderWidth(wnd);
+
+    wxRect theRect(rect);
+    for (i = 0; i < border_width; ++i)
+    {
+        dc.DrawRectangle(theRect.x, theRect.y, theRect.width, theRect.height);
+        theRect.Deflate(1);
+    }
+}
+
+void wxAuiSimpleTabArt::DrawBackground(wxDC& dc,
+                                       wxWindow* WXUNUSED(wnd),
+                                       const wxRect& rect)
+{
+    // draw background
+    dc.SetBrush(m_bkBrush);
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2);
+
+    // draw base line
+    dc.SetPen(*wxGREY_PEN);
+    dc.DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1);
+}
+
+
+// DrawTab() draws an individual tab.
+//
+// dc       - output dc
+// in_rect  - rectangle the tab should be confined to
+// caption  - tab's caption
+// active   - whether or not the tab is active
+// out_rect - actual output rectangle
+// x_extent - the advance x; where the next tab should start
+
+void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
+                                wxWindow* wnd,
+                                const wxAuiNotebookPage& page,
+                                const wxRect& in_rect,
+                                int close_button_state,
+                                wxRect* out_tab_rect,
+                                wxRect* out_button_rect,
+                                int* x_extent)
+{
+    wxCoord normal_textx, normal_texty;
+    wxCoord selected_textx, selected_texty;
+    wxCoord textx, texty;
+
+    // if the caption is empty, measure some temporary text
+    wxString caption = page.caption;
+    if (caption.empty())
+        caption = wxT("Xj");
+
+    dc.SetFont(m_selectedFont);
+    dc.GetTextExtent(caption, &selected_textx, &selected_texty);
+
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(caption, &normal_textx, &normal_texty);
+
+    // figure out the size of the tab
+    wxSize tab_size = GetTabSize(dc,
+                                 wnd,
+                                 page.caption,
+                                 page.bitmap,
+                                 page.active,
+                                 close_button_state,
+                                 x_extent);
+
+    wxCoord tab_height = tab_size.y;
+    wxCoord tab_width = tab_size.x;
+    wxCoord tab_x = in_rect.x;
+    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+
+    caption = page.caption;
+
+    // select pen, brush and font for the tab to be drawn
+
+    if (page.active)
+    {
+        dc.SetPen(m_selectedBkPen);
+        dc.SetBrush(m_selectedBkBrush);
+        dc.SetFont(m_selectedFont);
+        textx = selected_textx;
+        texty = selected_texty;
+    }
+    else
+    {
+        dc.SetPen(m_normalBkPen);
+        dc.SetBrush(m_normalBkBrush);
+        dc.SetFont(m_normalFont);
+        textx = normal_textx;
+        texty = normal_texty;
+    }
+
+
+    // -- draw line --
+
+    wxPoint points[7];
+    points[0].x = tab_x;
+    points[0].y = tab_y + tab_height - 1;
+    points[1].x = tab_x + tab_height - 3;
+    points[1].y = tab_y + 2;
+    points[2].x = tab_x + tab_height + 3;
+    points[2].y = tab_y;
+    points[3].x = tab_x + tab_width - 2;
+    points[3].y = tab_y;
+    points[4].x = tab_x + tab_width;
+    points[4].y = tab_y + 2;
+    points[5].x = tab_x + tab_width;
+    points[5].y = tab_y + tab_height - 1;
+    points[6] = points[0];
+
+    dc.SetClippingRegion(in_rect);
+
+    dc.DrawPolygon(WXSIZEOF(points) - 1, points);
+
+    dc.SetPen(*wxGREY_PEN);
+
+    //dc.DrawLines(active ? WXSIZEOF(points) - 1 : WXSIZEOF(points), points);
+    dc.DrawLines(WXSIZEOF(points), points);
+
+
+    int text_offset;
+
+    int close_button_width = 0;
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        close_button_width = m_activeCloseBmp.GetWidth();
+        text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
+    }
+    else
+    {
+        text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
+    }
+
+    // set minimum text offset
+    if (text_offset < tab_x + tab_height)
+        text_offset = tab_x + tab_height;
+
+    // chop text if necessary
+    wxString draw_text = wxAuiChopText(dc,
+                          caption,
+                          tab_width - (text_offset-tab_x) - close_button_width);
+
+    // draw tab text
+    dc.DrawText(draw_text,
+                 text_offset,
+                 (tab_y + tab_height)/2 - (texty/2) + 1);
+
+
+    // draw focus rectangle
+    if (page.active && (wnd->FindFocus() == wnd))
+    {
+        wxRect focusRect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1),
+            selected_textx, selected_texty);
+
+        focusRect.Inflate(2, 2);
+
+        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
+    }
+
+    // draw close button if necessary
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        wxBitmap bmp;
+        if (page.active)
+            bmp = m_activeCloseBmp;
+        else
+            bmp = m_disabledCloseBmp;
+
+        wxRect rect(tab_x + tab_width - close_button_width - 1,
+                    tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1,
+                    close_button_width,
+                    tab_height - 1);
+        DrawButtons(dc, rect, bmp, *wxWHITE, close_button_state);
+
+        *out_button_rect = rect;
+    }
+
+
+    *out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
+
+    dc.DestroyClippingRegion();
+}
+
+int wxAuiSimpleTabArt::GetIndentSize()
+{
+    return 0;
+}
+
+int wxAuiSimpleTabArt::GetBorderWidth(wxWindow* wnd)
+{
+    wxAuiManager* mgr = wxAuiManager::GetManager(wnd);
+    if (mgr)
+    {
+       wxAuiDockArt*  art = mgr->GetArtProvider();
+        if (art)
+            return art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+    }
+    return 1;
+}
+
+int wxAuiSimpleTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd))
+{
+    return 0;
+}
+
+wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc,
+                                     wxWindow* WXUNUSED(wnd),
+                                     const wxString& caption,
+                                     const wxBitmap& WXUNUSED(bitmap),
+                                     bool WXUNUSED(active),
+                                     int close_button_state,
+                                     int* x_extent)
+{
+    wxCoord measured_textx, measured_texty;
+
+    dc.SetFont(m_measuringFont);
+    dc.GetTextExtent(caption, &measured_textx, &measured_texty);
+
+    wxCoord tab_height = measured_texty + 4;
+    wxCoord tab_width = measured_textx + tab_height + 5;
+
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+        tab_width += m_activeCloseBmp.GetWidth();
+
+    if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
+    {
+        tab_width = m_fixedTabWidth;
+    }
+
+    *x_extent = tab_width - (tab_height/2) - 1;
+
+    return wxSize(tab_width, tab_height);
+}
+
+
+void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
+                                   wxWindow* WXUNUSED(wnd),
+                                   const wxRect& in_rect,
+                                   int bitmap_id,
+                                   int button_state,
+                                   int orientation,
+                                   wxRect* out_rect)
+{
+    wxBitmap bmp;
+    wxRect rect;
+
+    switch (bitmap_id)
+    {
+        case wxAUI_BUTTON_CLOSE:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledCloseBmp;
+            else
+                bmp = m_activeCloseBmp;
+            break;
+        case wxAUI_BUTTON_LEFT:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledLeftBmp;
+            else
+                bmp = m_activeLeftBmp;
+            break;
+        case wxAUI_BUTTON_RIGHT:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledRightBmp;
+            else
+                bmp = m_activeRightBmp;
+            break;
+        case wxAUI_BUTTON_WINDOWLIST:
+            if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+                bmp = m_disabledWindowListBmp;
+            else
+                bmp = m_activeWindowListBmp;
+            break;
+    }
+
+    if (!bmp.IsOk())
+        return;
+
+    rect = in_rect;
+
+    if (orientation == wxLEFT)
+    {
+        rect.SetX(in_rect.x);
+        rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2));
+        rect.SetWidth(bmp.GetWidth());
+        rect.SetHeight(bmp.GetHeight());
+    }
+    else
+    {
+        rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
+                      ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
+                      bmp.GetWidth(), bmp.GetHeight());
+    }
+
+
+    DrawButtons(dc, rect, bmp, *wxWHITE, button_state);
+
+    *out_rect = rect;
+}
+
+int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
+                                    const wxAuiNotebookPageArray& pages,
+                                    int active_idx)
+{
+    wxMenu menuPopup;
+
+    size_t i, count = pages.GetCount();
+    for (i = 0; i < count; ++i)
+    {
+        const wxAuiNotebookPage& page = pages.Item(i);
+        menuPopup.AppendCheckItem(1000+i, page.caption);
+    }
+
+    if (active_idx != -1)
+    {
+        menuPopup.Check(1000+active_idx, true);
+    }
+
+    // find out where to put the popup menu of window
+    // items.  Subtract 100 for now to center the menu
+    // a bit, until a better mechanism can be implemented
+    wxPoint pt = ::wxGetMousePosition();
+    pt = wnd->ScreenToClient(pt);
+    if (pt.x < 100)
+        pt.x = 0;
+    else
+        pt.x -= 100;
+
+    // find out the screen coordinate at the bottom of the tab ctrl
+    wxRect cli_rect = wnd->GetClientRect();
+    pt.y = cli_rect.y + cli_rect.height;
+
+    wxAuiCommandCapture* cc = new wxAuiCommandCapture;
+    wnd->PushEventHandler(cc);
+    wnd->PopupMenu(&menuPopup, pt);
+    int command = cc->GetCommandId();
+    wnd->PopEventHandler(true);
+
+    if (command >= 1000)
+        return command-1000;
+
+    return -1;
+}
+
+int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd,
+                                          const wxAuiNotebookPageArray& WXUNUSED(pages),
+                                          const wxSize& WXUNUSED(requiredBmp_size))
+{
+    wxClientDC dc(wnd);
+    dc.SetFont(m_measuringFont);
+    int x_ext = 0;
+    wxSize s = GetTabSize(dc,
+                          wnd,
+                          wxT("ABCDEFGHIj"),
+                          wxNullBitmap,
+                          true,
+                          wxAUI_BUTTON_STATE_HIDDEN,
+                          &x_ext);
+    return s.y+3;
+}
+
+void wxAuiSimpleTabArt::SetNormalFont(const wxFont& font)
+{
+    m_normalFont = font;
+}
+
+void wxAuiSimpleTabArt::SetSelectedFont(const wxFont& font)
+{
+    m_selectedFont = font;
+}
+
+void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font)
+{
+    m_measuringFont = font;
+}
+
+#endif // wxUSE_AUI
diff --git a/Externals/wxWidgets3/src/aui/tabartgtk.cpp b/Externals/wxWidgets3/src/aui/tabartgtk.cpp
new file mode 100644
index 0000000000..1c86fbe9d0
--- /dev/null
+++ b/Externals/wxWidgets3/src/aui/tabartgtk.cpp
@@ -0,0 +1,512 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/aui/tabartgtk.cpp
+// Purpose:     implementation of the wxAuiGTKTabArt
+// Author:      Jens Lody and Teodor Petrov
+// Modified by:
+// Created:     2012-03-23
+// Copyright:   (c) 2012 Jens Lody <jens@codeblocks.org>
+//                  and Teodor Petrov
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_AUI
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/image.h"
+#endif
+
+#include "wx/gtk/dc.h"
+#include "wx/gtk/private.h"
+
+#include <gtk/gtk.h>
+
+#include "wx/aui/auibook.h"
+#include "wx/aui/tabartgtk.h"
+#include "wx/renderer.h"
+
+namespace
+{
+
+static int s_CloseIconSize = 16; // default size
+
+}
+
+wxAuiGtkTabArt::wxAuiGtkTabArt()
+
+{
+}
+
+wxAuiTabArt* wxAuiGtkTabArt::Clone()
+{
+    wxAuiGtkTabArt* clone = new wxAuiGtkTabArt();
+
+    clone->SetNormalFont(m_normalFont);
+    clone->SetSelectedFont(m_normalFont);
+    clone->SetMeasuringFont(m_normalFont);
+
+    return clone;
+}
+
+void wxAuiGtkTabArt::DrawBackground(wxDC& dc, wxWindow* WXUNUSED(wnd), const wxRect& rect)
+{
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    GdkWindow* window = impldc->GetGDKWindow();
+
+    gtk_style_apply_default_background(gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget()),
+                                       window,
+                                       true,
+                                       GTK_STATE_NORMAL,
+                                       NULL,
+                                       rect.x, rect.y, rect.width, rect.height);
+}
+
+void wxAuiGtkTabArt::DrawBorder(wxDC& WXUNUSED(dc), wxWindow* wnd, const wxRect& rect)
+{
+    int generic_border_width = wxAuiGenericTabArt::GetBorderWidth(wnd);
+
+    if (!wnd) return;
+    if (!wnd->m_wxwindow) return;
+    if (!gtk_widget_is_drawable(wnd->m_wxwindow)) return;
+
+    GtkStyle *style_notebook = gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget());
+
+    gtk_paint_box(style_notebook, wnd->GTKGetDrawingWindow(), GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                  NULL, wnd->m_wxwindow,
+                  const_cast<char*>("notebook"),
+                  rect.x + generic_border_width + 1, rect.y + generic_border_width + 1,
+                  rect.width - (generic_border_width + 1), rect.height - (generic_border_width + 1));
+}
+
+void ButtonStateAndShadow(int button_state, GtkStateType &state, GtkShadowType &shadow)
+{
+
+    if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+    {
+        state = GTK_STATE_INSENSITIVE;
+        shadow = GTK_SHADOW_ETCHED_IN;
+    }
+    else if (button_state & wxAUI_BUTTON_STATE_HOVER)
+    {
+        state = GTK_STATE_PRELIGHT;
+        shadow = GTK_SHADOW_OUT;
+    }
+    else if (button_state & wxAUI_BUTTON_STATE_PRESSED)
+    {
+        state = GTK_STATE_ACTIVE;
+        shadow = GTK_SHADOW_IN;
+    }
+    else
+    {
+        state = GTK_STATE_NORMAL;
+        shadow = GTK_SHADOW_OUT;
+    }
+}
+
+wxRect DrawCloseButton(wxDC& dc,
+                       GtkWidget *widget,
+                       int button_state,
+                       wxRect const &in_rect,
+                       int orientation,
+                       GdkRectangle* clipRect)
+{
+    GtkStyle *style_button = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget());
+    int xthickness = style_button->xthickness;
+    int ythickness = style_button->ythickness;
+
+    wxBitmap bmp(gtk_widget_render_icon(widget, GTK_STOCK_CLOSE, GTK_ICON_SIZE_SMALL_TOOLBAR, "tab"));
+
+    if(bmp.GetWidth() != s_CloseIconSize || bmp.GetHeight() != s_CloseIconSize)
+    {
+        wxImage img = bmp.ConvertToImage();
+        img.Rescale(s_CloseIconSize, s_CloseIconSize);
+        bmp = img;
+    }
+
+    int button_size = s_CloseIconSize + 2 * xthickness;
+
+    wxRect out_rect;
+
+    if (orientation == wxLEFT)
+        out_rect.x = in_rect.x - ythickness;
+    else
+        out_rect.x = in_rect.x + in_rect.width - button_size - ythickness;
+
+    out_rect.y = in_rect.y + (in_rect.height - button_size) / 2;
+    out_rect.width = button_size;
+    out_rect.height = button_size;
+
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    GdkWindow* window = impldc->GetGDKWindow();
+
+    if (button_state == wxAUI_BUTTON_STATE_HOVER)
+    {
+        gtk_paint_box(style_button, window,
+                      GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, clipRect, widget, "button",
+                     out_rect.x, out_rect.y, out_rect.width, out_rect.height);
+    }
+    else if (button_state == wxAUI_BUTTON_STATE_PRESSED)
+    {
+        gtk_paint_box(style_button, window,
+                      GTK_STATE_ACTIVE, GTK_SHADOW_IN, clipRect, widget, "button",
+                      out_rect.x, out_rect.y, out_rect.width, out_rect.height);
+    }
+
+
+    dc.DrawBitmap(bmp, out_rect.x + xthickness, out_rect.y + ythickness, true);
+
+    return out_rect;
+}
+
+void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page,
+                             const wxRect& in_rect, int close_button_state, wxRect* out_tab_rect,
+                             wxRect* out_button_rect, int* x_extent)
+{
+    GtkWidget *widget = wnd->GetHandle();
+    GtkStyle *style_notebook = gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget());
+
+    wxRect const &window_rect = wnd->GetRect();
+
+    int focus_width = 0;
+
+    gtk_widget_style_get(wxGTKPrivate::GetNotebookWidget(),
+                         "focus-line-width", &focus_width,
+                         NULL);
+
+    int tab_pos;
+    if (m_flags &wxAUI_NB_BOTTOM)
+        tab_pos = wxAUI_NB_BOTTOM;
+    else //if (m_flags & wxAUI_NB_TOP) {}
+        tab_pos = wxAUI_NB_TOP;
+
+    // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+    // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+
+    // figure out the size of the tab
+    wxSize tab_size = GetTabSize(dc, wnd, page.caption, page.bitmap,
+                                    page.active, close_button_state, x_extent);
+
+    wxRect tab_rect = in_rect;
+    tab_rect.width = tab_size.x;
+    tab_rect.height = tab_size.y;
+    tab_rect.y += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+
+    if (page.active)
+        tab_rect.height += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+
+    int gap_rect_height = 10 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+    int gap_rect_x = 1, gap_start = 0, gap_width = 0;
+    int gap_rect_y = tab_rect.y - gap_rect_height;
+    int gap_rect_width = window_rect.width;
+
+    switch (tab_pos)
+    {
+        case wxAUI_NB_TOP:
+            tab_rect.y -= 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+            if (!page.active)
+                tab_rect.y += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+            gap_rect_y = tab_rect.y + tab_rect.height - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2;
+            // fall through
+        case wxAUI_NB_BOTTOM:
+            gap_start = tab_rect.x - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder / 2;
+            gap_width = tab_rect.width;
+            break;
+        // TODO: case wxAUI_NB_LEFT: break;
+        // TODO: case wxAUI_NB_RIGHT: break;
+    }
+    tab_rect.y += GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2;
+    gap_rect_y += GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder / 2;
+
+    int padding = focus_width + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+
+    int clip_width = tab_rect.width;
+    if (tab_rect.x + tab_rect.width > in_rect.x + in_rect.width)
+        clip_width = (in_rect.x + in_rect.width) - tab_rect.x;
+
+    dc.SetClippingRegion(tab_rect.x, tab_rect.y - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder, clip_width, tab_rect.height + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder);
+
+    GdkRectangle area;
+    area.x = tab_rect.x - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder;
+    area.y = tab_rect.y - 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+    area.width = clip_width + GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder;
+    area.height = tab_rect.height + 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
+
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    GdkWindow* window = impldc->GetGDKWindow();
+
+    // Before drawing the active tab itself, draw a box without border, because some themes
+    // have transparent gaps and a line would be visible at the bottom of the tab
+    if (page.active)
+        gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+                      NULL, widget,
+                      const_cast<char*>("notebook"),
+                      gap_rect_x, gap_rect_y,
+                      gap_rect_width, gap_rect_height);
+
+    if (tab_pos == wxAUI_NB_BOTTOM)
+    {
+        if (page.active)
+        {
+            gtk_paint_box_gap(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                              NULL, widget,
+                              const_cast<char*>("notebook"),
+                              gap_rect_x, gap_rect_y,
+                              gap_rect_width, gap_rect_height,
+                              GTK_POS_BOTTOM, gap_start , gap_width);
+        }
+        gtk_paint_extension(style_notebook, window,
+                           page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT,
+                           &area, widget,
+                           const_cast<char*>("tab"),
+                           tab_rect.x, tab_rect.y,
+                           tab_rect.width, tab_rect.height,
+                           GTK_POS_TOP);
+    }
+    else
+    {
+        if (page.active)
+        {
+            gtk_paint_box_gap(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                              NULL, widget,
+                              const_cast<char*>("notebook"),
+                              gap_rect_x, gap_rect_y,
+                              gap_rect_width, gap_rect_height,
+                              GTK_POS_TOP, gap_start , gap_width);
+        }
+        gtk_paint_extension(style_notebook, window,
+                           page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT,
+                           &area, widget,
+                           const_cast<char*>("tab"),
+                           tab_rect.x, tab_rect.y,
+                           tab_rect.width, tab_rect.height,
+                           GTK_POS_BOTTOM);
+    }
+
+    // After drawing the inactive tab itself, draw a box with the same dimensions as the gap-box,
+    // otherwise we don't get a gap-box, if the active tab is invisible
+    if (!page.active)
+        gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                      NULL, widget,
+                      const_cast<char*>("notebook"),
+                      gap_rect_x, gap_rect_y,
+                      gap_rect_width, gap_rect_height);
+
+    wxCoord textX = tab_rect.x + padding + style_notebook->xthickness;
+
+    int bitmap_offset = 0;
+    if (page.bitmap.IsOk())
+    {
+        bitmap_offset = textX;
+
+        // draw bitmap
+        int bitmapY = tab_rect.y +(tab_rect.height - page.bitmap.GetHeight()) / 2;
+        if(!page.active)
+        {
+            if (tab_pos == wxAUI_NB_TOP)
+                bitmapY += style_notebook->ythickness / 2;
+            else
+                bitmapY -= style_notebook->ythickness / 2;
+        }
+        dc.DrawBitmap(page.bitmap,
+                      bitmap_offset,
+                      bitmapY,
+                      true);
+
+        textX += page.bitmap.GetWidth() + padding;
+    }
+
+    wxCoord textW, textH, textY;
+
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(page.caption, &textW, &textH);
+    textY = tab_rect.y + (tab_rect.height - textH) / 2;
+    if(!page.active)
+    {
+        if (tab_pos == wxAUI_NB_TOP)
+            textY += style_notebook->ythickness / 2;
+        else
+            textY -= style_notebook->ythickness / 2;
+    }
+
+    // draw tab text
+    GdkColor text_colour = page.active ? style_notebook->fg[GTK_STATE_NORMAL] : style_notebook->fg[GTK_STATE_ACTIVE];
+    dc.SetTextForeground(wxColor(text_colour));
+    GdkRectangle focus_area;
+
+    int padding_focus = padding - focus_width;
+    focus_area.x = tab_rect.x + padding_focus;
+    focus_area.y = textY - focus_width;
+    focus_area.width = tab_rect.width - 2 * padding_focus;
+    focus_area.height = textH + 2 * focus_width;
+
+    if(page.active && (wnd->FindFocus() == wnd) && focus_area.x <= (area.x + area.width))
+    {
+        // clipping seems not to work here, so we we have to recalc the focus-area manually
+        if((focus_area.x + focus_area.width) > (area.x + area.width))
+            focus_area.width = area.x + area.width - focus_area.x + focus_width - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder;
+        gtk_paint_focus (style_notebook, window,
+                         GTK_STATE_ACTIVE, NULL, widget, "tab",
+                         focus_area.x, focus_area.y, focus_area.width, focus_area.height);
+    }
+
+    dc.DrawText(page.caption, textX, textY);
+
+    // draw close-button on tab (if enabled)
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        wxRect rect(tab_rect.x, tab_rect.y, tab_rect.width - style_notebook->xthickness, tab_rect.height);
+        if(!page.active)
+        {
+            if (tab_pos == wxAUI_NB_TOP)
+                rect.y += style_notebook->ythickness / 2;
+            else
+                rect.y -= style_notebook->ythickness / 2;
+        }
+        *out_button_rect = DrawCloseButton(dc, widget, close_button_state, rect, wxRIGHT, &area);
+    }
+
+    if ( clip_width < tab_rect.width )
+        tab_rect.width = clip_width;
+    *out_tab_rect = tab_rect;
+
+    dc.DestroyClippingRegion();
+}
+
+wxRect DrawSimpleArrow(wxDC& dc,
+                       GtkWidget *widget,
+                       int button_state,
+                       wxRect const &in_rect,
+                       int orientation,
+                       GtkArrowType arrow_type)
+{
+    int scroll_arrow_hlength, scroll_arrow_vlength;
+    gtk_widget_style_get(widget,
+                         "scroll-arrow-hlength", &scroll_arrow_hlength,
+                         "scroll-arrow-vlength", &scroll_arrow_vlength,
+                         NULL);
+
+    GtkStateType state;
+    GtkShadowType shadow;
+    ButtonStateAndShadow(button_state, state, shadow);
+
+    wxRect out_rect;
+
+    if (orientation == wxLEFT)
+        out_rect.x = in_rect.x;
+    else
+        out_rect.x = in_rect.x + in_rect.width - scroll_arrow_hlength;
+    out_rect.y = (in_rect.y + in_rect.height - 3 * gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget())->ythickness - scroll_arrow_vlength) / 2;
+    out_rect.width = scroll_arrow_hlength;
+    out_rect.height = scroll_arrow_vlength;
+
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    GdkWindow* window = impldc->GetGDKWindow();
+    gtk_paint_arrow (gtk_widget_get_style(wxGTKPrivate::GetButtonWidget()), window, state, shadow, NULL, widget, "notebook",
+                     arrow_type, TRUE, out_rect.x, out_rect.y, out_rect.width, out_rect.height);
+
+    return out_rect;
+}
+
+void wxAuiGtkTabArt::DrawButton(wxDC& dc, wxWindow* wnd,
+                            const wxRect& in_rect,
+                            int bitmap_id,
+                            int button_state,
+                            int orientation,
+                            wxRect* out_rect)
+{
+    GtkWidget *widget = wnd->GetHandle();
+    wxRect rect = in_rect;
+    if (m_flags &wxAUI_NB_BOTTOM)
+        rect.y += 2 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness;
+
+    switch (bitmap_id)
+    {
+        case wxAUI_BUTTON_CLOSE:
+            rect.y -= 2 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness;
+            rect = DrawCloseButton(dc, widget, button_state, rect, orientation, NULL);
+            break;
+
+        case wxAUI_BUTTON_LEFT:
+            rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_LEFT);
+            break;
+
+        case wxAUI_BUTTON_RIGHT:
+            rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_RIGHT);
+            break;
+
+        case wxAUI_BUTTON_WINDOWLIST:
+            {
+                rect.height -= 4 * gtk_widget_get_style(wxGTKPrivate::GetButtonWidget())->ythickness;
+                rect.width = rect.height;
+                rect.x = in_rect.x + in_rect.width - rect.width;
+
+                if (button_state == wxAUI_BUTTON_STATE_HOVER)
+                    wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_CURRENT);
+                else if (button_state == wxAUI_BUTTON_STATE_PRESSED)
+                    wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_PRESSED);
+                else
+                    wxRendererNative::Get().DrawDropArrow(wnd, dc, rect);
+            }
+            break;
+    }
+
+    *out_rect = rect;
+}
+
+
+int wxAuiGtkTabArt::GetBestTabCtrlSize(wxWindow* wnd,
+                                   const wxAuiNotebookPageArray& pages,
+                                   const wxSize& required_bmp_size)
+{
+    SetMeasuringFont(m_normalFont);
+    SetSelectedFont(m_normalFont);
+    int tab_height = 3 * gtk_widget_get_style(wxGTKPrivate::GetNotebookWidget())->ythickness + wxAuiGenericTabArt::GetBestTabCtrlSize(wnd, pages, required_bmp_size);
+    return tab_height;
+}
+
+int wxAuiGtkTabArt::GetBorderWidth(wxWindow* wnd)
+{
+    return wxAuiGenericTabArt::GetBorderWidth(wnd) + wxMax(GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder,
+                                                           GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder);
+}
+
+int wxAuiGtkTabArt::GetAdditionalBorderSpace(wxWindow* wnd)
+{
+    return 2 * GetBorderWidth(wnd);
+}
+
+wxSize wxAuiGtkTabArt::GetTabSize(wxDC& dc,
+                              wxWindow* wnd,
+                              const wxString& caption,
+                              const wxBitmap& bitmap,
+                              bool active,
+                              int close_button_state,
+                              int* x_extent)
+{
+    wxSize s = wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent);
+
+    int overlap = 0;
+    gtk_widget_style_get (wnd->GetHandle(),
+        "focus-line-width", &overlap,
+        NULL);
+    *x_extent -= overlap;
+    return s;
+}
+#endif  // wxUSE_AUI
diff --git a/Externals/wxWidgets3/src/aui/tabmdi.cpp b/Externals/wxWidgets3/src/aui/tabmdi.cpp
index 413bfaf780..70c1a734e8 100644
--- a/Externals/wxWidgets3/src/aui/tabmdi.cpp
+++ b/Externals/wxWidgets3/src/aui/tabmdi.cpp
@@ -4,7 +4,6 @@
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Created:     29/07/2002
-// RCS-ID:      $Id: tabmdi.cpp 70909 2012-03-15 13:49:54Z VZ $
 // Copyright:   (c) Hans Van Leemputten
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,6 +37,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/stockitem.h"
+#include "wx/aui/dockart.h"
 
 enum MDI_MENU_ID
 {
@@ -79,6 +79,8 @@ wxAuiMDIParentFrame::wxAuiMDIParentFrame(wxWindow *parent,
 
 wxAuiMDIParentFrame::~wxAuiMDIParentFrame()
 {
+    // Avoid having GetActiveChild() called after m_pClientWindow is destroyed
+    SendDestroyEvent();
     // Make sure the client window is destructed before the menu bars are!
     wxDELETE(m_pClientWindow);
 
@@ -211,7 +213,8 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
 
     // let the active child (if any) process the event first.
     bool res = false;
-    if (m_pActiveChild &&
+    wxAuiMDIChildFrame* pActiveChild = GetActiveChild();
+    if (pActiveChild &&
         event.IsCommandEvent() &&
         event.GetEventObject() != m_pClientWindow &&
            !(event.GetEventType() == wxEVT_ACTIVATE ||
@@ -222,7 +225,7 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
              event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS )
        )
     {
-        res = m_pActiveChild->GetEventHandler()->ProcessEvent(event);
+        res = pActiveChild->GetEventHandler()->ProcessEvent(event);
     }
 
     if (!res)
@@ -240,12 +243,19 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
 
 wxAuiMDIChildFrame *wxAuiMDIParentFrame::GetActiveChild() const
 {
-    return m_pActiveChild;
+    // We can be called before the client window is created, so check for its
+    // existence.
+    wxAuiMDIClientWindow* const client = GetClientWindow();
+    return client ? client->GetActiveChild() : NULL;
 }
 
 void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
 {
-    m_pActiveChild = pChildFrame;
+    wxAuiMDIClientWindow* const client = GetClientWindow();
+    if (client && client->GetActiveChild() != pChildFrame)
+    {
+        client->SetActiveChild(pChildFrame);
+    }
 }
 
 wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const
@@ -286,7 +296,6 @@ void wxAuiMDIParentFrame::Init()
 {
     m_pLastEvt = NULL;
     m_pClientWindow = NULL;
-    m_pActiveChild = NULL;
 #if wxUSE_MENUS
     m_pWindowMenu = NULL;
     m_pMyMenuBar = NULL;
@@ -326,18 +335,24 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
     switch (event.GetId())
     {
         case wxWINDOWCLOSE:
-            if (m_pActiveChild)
-                m_pActiveChild->Close();
+        {
+            wxAuiMDIChildFrame* pActiveChild = GetActiveChild();
+            if (pActiveChild)
+                pActiveChild->Close();
             break;
+        }
         case wxWINDOWCLOSEALL:
-            while (m_pActiveChild)
+        {
+            wxAuiMDIChildFrame* pActiveChild;
+            while ((pActiveChild = GetActiveChild()) != NULL)
             {
-                if (!m_pActiveChild->Close())
+                if (!pActiveChild->Close())
                 {
                     return; // failure
                 }
             }
             break;
+        }
         case wxWINDOWNEXT:
             ActivateNext();
             break;
@@ -496,12 +511,21 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     SetMDIParentFrame(parent);
 
-    // this is the currently active child
-    parent->SetActiveChild(this);
-
     m_title = title;
 
     pClientWindow->AddPage(this, title, m_activateOnCreate);
+
+    // Check that the parent notion of the active child coincides with our one.
+    // This is less obvious that it seems because we must honour
+    // m_activateOnCreate flag but only if it's not the first child because
+    // this one becomes active unconditionally.
+    wxASSERT_MSG
+    (
+        (m_activateOnCreate || pClientWindow->GetPageCount() == 1)
+            == (parent->GetActiveChild() == this),
+        wxS("Logic error: child [not] activated when it should [not] have been.")
+    );
+
     pClientWindow->Refresh();
 
     return true;
@@ -522,7 +546,6 @@ bool wxAuiMDIChildFrame::Destroy()
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
 
-        pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }
 
@@ -697,6 +720,14 @@ void wxAuiMDIChildFrame::Init()
 
 bool wxAuiMDIChildFrame::Show(bool show)
 {
+    // wxAuiMDIChildFrame uses m_activateOnCreate only to decide whether to
+    // activate the frame when it is created.  After Create() is called,
+    // m_activateOnCreate will never be read again.  Therefore, calling this
+    // function after Create() is pointless and you probably want to call
+    // Activate() instead.
+    wxCHECK_MSG( !GetHandle(), false,
+                 wxS("Show() has no effect after Create(). Do you mean Activate()?") );
+
     m_activateOnCreate = show;
 
     // do nothing
@@ -786,6 +817,15 @@ int wxAuiMDIClientWindow::SetSelection(size_t nPage)
     return wxAuiNotebook::SetSelection(nPage);
 }
 
+wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
+{
+    const int sel = GetSelection();
+    if ( sel == wxNOT_FOUND )
+        return NULL;
+
+    return wxStaticCast(GetPage(sel), wxAuiMDIChildFrame);
+}
+
 void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
 {
     // don't do anything if the page doesn't actually change
diff --git a/Externals/wxWidgets3/src/common/accelcmn.cpp b/Externals/wxWidgets3/src/common/accelcmn.cpp
index 960c6ac7c3..003ecbc514 100644
--- a/Externals/wxWidgets3/src/common/accelcmn.cpp
+++ b/Externals/wxWidgets3/src/common/accelcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of platform-independent wxAcceleratorEntry parts
 // Author:      Vadim Zeitlin
 // Created:     2007-05-05
-// RCS-ID:      $Id: accelcmn.cpp 69853 2011-11-28 10:24:13Z SC $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -302,30 +301,43 @@ bool wxAcceleratorEntry::FromString(const wxString& str)
     return ParseAccel(str, &m_flags, &m_keyCode);
 }
 
-wxString wxAcceleratorEntry::ToString() const
+namespace
+{
+
+wxString PossiblyLocalize(const wxString& str, bool localize)
+{
+    return localize ? wxGetTranslation(str) : str;
+}
+
+}
+
+wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const
 {
     wxString text;
 
     int flags = GetFlags();
     if ( flags & wxACCEL_ALT )
-        text += _("Alt+");
+        text += PossiblyLocalize(wxTRANSLATE("Alt+"), localized);
     if ( flags & wxACCEL_CTRL )
-        text += _("Ctrl+");
+        text += PossiblyLocalize(wxTRANSLATE("Ctrl+"), localized);
     if ( flags & wxACCEL_SHIFT )
-        text += _("Shift+");
+        text += PossiblyLocalize(wxTRANSLATE("Shift+"), localized);
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
     if ( flags & wxACCEL_RAW_CTRL )
-        text += _("RawCtrl+");
+        text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized);
 #endif
     
     const int code = GetKeyCode();
 
     if ( code >= WXK_F1 && code <= WXK_F12 )
-        text << _("F") << code - WXK_F1 + 1;
+        text << PossiblyLocalize(wxTRANSLATE("F"), localized)
+             << code - WXK_F1 + 1;
     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
-        text << _("KP_") << code - WXK_NUMPAD0;
+        text << PossiblyLocalize(wxTRANSLATE("KP_"), localized)
+             << code - WXK_NUMPAD0;
     else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 )
-        text << _("SPECIAL") << code - WXK_SPECIAL1 + 1;
+        text << PossiblyLocalize(wxTRANSLATE("SPECIAL"), localized)
+             << code - WXK_SPECIAL1 + 1;
     else // check the named keys
     {
         size_t n;
@@ -334,7 +346,7 @@ wxString wxAcceleratorEntry::ToString() const
             const wxKeyName& kn = wxKeyNames[n];
             if ( code == kn.code )
             {
-                text << wxGetTranslation(kn.name);
+                text << PossiblyLocalize(kn.name, localized);
                 break;
             }
         }
diff --git a/Externals/wxWidgets3/src/common/accesscmn.cpp b/Externals/wxWidgets3/src/common/accesscmn.cpp
index 385a33936a..660f1090df 100644
--- a/Externals/wxWidgets3/src/common/accesscmn.cpp
+++ b/Externals/wxWidgets3/src/common/accesscmn.cpp
@@ -3,7 +3,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
-// RCS-ID:      $Id: accesscmn.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/affinematrix2d.cpp b/Externals/wxWidgets3/src/common/affinematrix2d.cpp
index 0b1b9207dc..5013b31f15 100644
--- a/Externals/wxWidgets3/src/common/affinematrix2d.cpp
+++ b/Externals/wxWidgets3/src/common/affinematrix2d.cpp
@@ -127,19 +127,19 @@ void wxAffineMatrix2D::Scale(wxDouble xScale, wxDouble yScale)
     m_22 *= yScale;
 }
 
-// add the rotation to this matrix (counter clockwise, radians)
-// | cos   -sin   0 |   | m_11  m_12   0 |
-// | sin    cos   0 | x | m_21  m_22   0 |
+// add the rotation to this matrix (clockwise, radians)
+// | cos    sin   0 |   | m_11  m_12   0 |
+// | -sin   cos   0 | x | m_21  m_22   0 |
 // |  0      0    1 |   | m_tx  m_ty   1 |
-void wxAffineMatrix2D::Rotate(wxDouble ccRadians)
+void wxAffineMatrix2D::Rotate(wxDouble cRadians)
 {
-    wxDouble c = cos(ccRadians);
-    wxDouble s = sin(ccRadians);
+    wxDouble c = cos(cRadians);
+    wxDouble s = sin(cRadians);
 
-    wxDouble e11 = c*m_11 - s*m_21;
-    wxDouble e12 = c*m_12 - s*m_22;
-    m_21 = s*m_11 + c*m_21;
-    m_22 = s*m_12 + c*m_22;
+    wxDouble e11 = c*m_11 + s*m_21;
+    wxDouble e12 = c*m_12 + s*m_22;
+    m_21 = c*m_21 - s*m_11;
+    m_22 = c*m_22 - s*m_12;
     m_11 = e11;
     m_12 = e12;
 }
@@ -159,7 +159,7 @@ wxAffineMatrix2D::DoTransformPoint(const wxPoint2DDouble& src) const
         return src;
 
     return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21 + m_tx,
-                           src.m_y * m_12 + src.m_y * m_22 + m_ty);
+                           src.m_x * m_12 + src.m_y * m_22 + m_ty);
 }
 
 // applies the matrix except for translations
@@ -173,7 +173,7 @@ wxAffineMatrix2D::DoTransformDistance(const wxPoint2DDouble& src) const
         return src;
 
     return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21,
-                           src.m_y * m_12 + src.m_y * m_22);
+                           src.m_x * m_12 + src.m_y * m_22);
 }
 
 bool wxAffineMatrix2D::IsIdentity() const
diff --git a/Externals/wxWidgets3/src/common/anidecod.cpp b/Externals/wxWidgets3/src/common/anidecod.cpp
index 841d4d7483..d62c00b455 100644
--- a/Externals/wxWidgets3/src/common/anidecod.cpp
+++ b/Externals/wxWidgets3/src/common/anidecod.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/anidecod.cpp
 // Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
 // Author:      Francesco Montorsi
-// RCS-ID:      $Id: anidecod.cpp 67708 2011-05-05 23:52:07Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/animatecmn.cpp b/Externals/wxWidgets3/src/common/animatecmn.cpp
index 29e9915de3..c8fb083300 100644
--- a/Externals/wxWidgets3/src/common/animatecmn.cpp
+++ b/Externals/wxWidgets3/src/common/animatecmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     24/09/2006
-// Id:          $Id: animatecmn.cpp 60864 2009-06-01 20:54:03Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/any.cpp b/Externals/wxWidgets3/src/common/any.cpp
index f391a5f98a..f866c59448 100644
--- a/Externals/wxWidgets3/src/common/any.cpp
+++ b/Externals/wxWidgets3/src/common/any.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     07/05/2009
-// RCS-ID:      $Id: any.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -374,7 +373,7 @@ bool wxAnyConvertString(const wxString& value,
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
     {
         double value2;
-        if ( !value.ToDouble(&value2) )
+        if ( !value.ToCDouble(&value2) )
             return false;
         wxAnyValueTypeImplDouble::SetValue(value2, dst);
     }
@@ -453,7 +452,7 @@ bool wxAnyValueTypeImplDouble::ConvertValue(const wxAnyValueBuffer& src,
     }
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
     {
-        wxString s = wxString::Format(wxS("%.14g"), value);
+        wxString s = wxString::FromCDouble(value, 14);
         wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
     }
     else
@@ -484,7 +483,9 @@ WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxDateTime>)
 
 class wxAnyNullValue
 {
-private:
+protected:
+    // this field is unused, but can't be private to avoid Clang's
+    // "Private field 'm_dummy' is not used" warning
     void*   m_dummy;
 };
 
diff --git a/Externals/wxWidgets3/src/common/appbase.cpp b/Externals/wxWidgets3/src/common/appbase.cpp
index 8cdf4e26fe..68113d9956 100644
--- a/Externals/wxWidgets3/src/common/appbase.cpp
+++ b/Externals/wxWidgets3/src/common/appbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
-// RCS-ID:      $Id: appbase.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,10 +46,15 @@
 #include "wx/tokenzr.h"
 #include "wx/thread.h"
 
-#if wxUSE_EXCEPTIONS && wxUSE_STL
-    #include <exception>
-    #include <typeinfo>
-#endif
+#if wxUSE_STL
+    #if wxUSE_EXCEPTIONS
+        #include <exception>
+        #include <typeinfo>
+    #endif
+    #if wxUSE_INTL
+        #include <locale>
+    #endif
+#endif // wxUSE_STL
 
 #if !defined(__WINDOWS__) || defined(__WXMICROWIN__)
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
@@ -169,9 +173,9 @@ wxAppConsoleBase::~wxAppConsoleBase()
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 {
-#if wxUSE_INTL
-    GetTraits()->SetLocale();
-#endif // wxUSE_INTL
+#if defined(__WINDOWS__) && !defined(__WXWINCE__)
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
+#endif
 
     return true;
 }
@@ -255,6 +259,10 @@ int wxAppConsoleBase::OnRun()
     return MainLoop();
 }
 
+void wxAppConsoleBase::OnLaunched()
+{    
+}
+
 int wxAppConsoleBase::OnExit()
 {
 #if wxUSE_CONFIG
@@ -303,6 +311,15 @@ wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
     return app ? app->GetTraits() : NULL;
 }
 
+/* static */
+wxAppTraits& wxAppConsoleBase::GetValidTraits()
+{
+    static wxConsoleAppTraits s_traitsConsole;
+    wxAppTraits* const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+
+    return traits ? *traits : s_traitsConsole;
+}
+
 // ----------------------------------------------------------------------------
 // wxEventLoop redirection
 // ----------------------------------------------------------------------------
@@ -311,6 +328,9 @@ int wxAppConsoleBase::MainLoop()
 {
     wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
 
+    if (wxTheApp)
+        wxTheApp->OnLaunched();
+    
     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 
@@ -779,6 +799,18 @@ void wxAppConsoleBase::OnAssert(const wxChar *file,
     OnAssertFailure(file, line, NULL, cond, msg);
 }
 
+// ----------------------------------------------------------------------------
+// Miscellaneous other methods
+// ----------------------------------------------------------------------------
+
+void wxAppConsoleBase::SetCLocale()
+{
+    // We want to use the user locale by default in GUI applications in order
+    // to show the numbers, dates &c in the familiar format -- and also accept
+    // this format on input (especially important for decimal comma/dot).
+    wxSetlocale(LC_ALL, "");
+}
+
 // ============================================================================
 // other classes implementations
 // ============================================================================
@@ -831,14 +863,6 @@ bool wxConsoleAppTraitsBase::HasStderr()
 // wxAppTraits
 // ----------------------------------------------------------------------------
 
-#if wxUSE_INTL
-void wxAppTraitsBase::SetLocale()
-{
-    wxSetlocale(LC_ALL, "");
-    wxUpdateLocaleIsUtf8();
-}
-#endif
-
 #if wxUSE_THREADS
 void wxMutexGuiEnterImpl();
 void wxMutexGuiLeaveImpl();
@@ -953,7 +977,7 @@ wxString wxAppTraitsBase::GetAssertStackTrace()
     static const int maxLines = 20;
 
     StackDump dump;
-    dump.Walk(2, maxLines); // don't show OnAssert() call itself
+    dump.Walk(8, maxLines); // 8 is chosen to hide all OnAssert() calls
     stackTrace = dump.GetStackTrace();
 
     const int count = stackTrace.Freq(wxT('\n'));
@@ -1014,6 +1038,8 @@ void wxAbort()
 #if wxDEBUG_LEVEL
 
 // break into the debugger
+#ifndef wxTrap
+
 void wxTrap()
 {
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
@@ -1027,6 +1053,8 @@ void wxTrap()
 #endif // Win/Unix
 }
 
+#endif // wxTrap already defined as a macro
+
 // default assert handler
 static void
 wxDefaultAssertHandler(const wxString& file,
@@ -1176,6 +1204,8 @@ static void LINKAGEMODE SetTraceMasks()
 
 #if wxDEBUG_LEVEL
 
+bool wxTrapInAssert = false;
+
 static
 bool DoShowAssertDialog(const wxString& msg)
 {
@@ -1190,11 +1220,18 @@ bool DoShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( ::MessageBox(NULL, msgDlg.wx_str(), wxT("wxWidgets Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg.t_str(), wxT("wxWidgets Debug Alert"),
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
-            wxTrap();
+            // If we called wxTrap() directly from here, the programmer would
+            // see this function and a few more calls between his own code and
+            // it in the stack trace which would be perfectly useless and often
+            // confusing. So instead just set the flag here and let the macros
+            // defined in wx/debug.h call wxTrap() themselves, this ensures
+            // that the debugger will show the line in the user code containing
+            // the failing assert.
+            wxTrapInAssert = true;
             break;
 
         case IDCANCEL:
diff --git a/Externals/wxWidgets3/src/common/appcmn.cpp b/Externals/wxWidgets3/src/common/appcmn.cpp
index 6c7129139a..821f695bac 100644
--- a/Externals/wxWidgets3/src/common/appcmn.cpp
+++ b/Externals/wxWidgets3/src/common/appcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99
-// RCS-ID:      $Id: appcmn.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -84,6 +83,27 @@ wxAppBase::wxAppBase()
 
 bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
 {
+#ifdef __WXOSX__
+    // Mac OS X passes a process serial number command line argument when
+    // the application is launched from the Finder. This argument must be
+    // removed from the command line arguments before being handled by the
+    // application (otherwise applications would need to handle it)
+    //
+    // Notice that this has to be done for all ports that can be used under OS
+    // X (e.g. wxGTK) and not just wxOSX itself, hence this code is here and
+    // not in a port-specific file.
+    if ( argcOrig > 1 )
+    {
+        static const wxChar *ARG_PSN = wxT("-psn_");
+        if ( wxStrncmp(argvOrig[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
+        {
+            // remove this argument
+            --argcOrig;
+            memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*));
+        }
+    }
+#endif // __WXOSX__
+
     if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
         return false;
 
diff --git a/Externals/wxWidgets3/src/common/arcall.cpp b/Externals/wxWidgets3/src/common/arcall.cpp
index bedf19becd..49776dcce5 100644
--- a/Externals/wxWidgets3/src/common/arcall.cpp
+++ b/Externals/wxWidgets3/src/common/arcall.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/arcall.cpp
 // Purpose:     wxArchive link all archive streams
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: arcall.cpp 42508 2006-10-27 09:53:38Z MW $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/arcfind.cpp b/Externals/wxWidgets3/src/common/arcfind.cpp
index dc9a0d179a..6f90d5cc50 100644
--- a/Externals/wxWidgets3/src/common/arcfind.cpp
+++ b/Externals/wxWidgets3/src/common/arcfind.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/arcfind.cpp
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: arcfind.cpp 46391 2007-06-10 17:42:41Z VS $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/archive.cpp b/Externals/wxWidgets3/src/common/archive.cpp
index 1c2dfdb44c..360f22936c 100644
--- a/Externals/wxWidgets3/src/common/archive.cpp
+++ b/Externals/wxWidgets3/src/common/archive.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/archive.cpp
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: archive.cpp 42508 2006-10-27 09:53:38Z MW $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/arrstr.cpp b/Externals/wxWidgets3/src/common/arrstr.cpp
index c186bb0da2..f66fcdd4ee 100644
--- a/Externals/wxWidgets3/src/common/arrstr.cpp
+++ b/Externals/wxWidgets3/src/common/arrstr.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: arrstr.cpp 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/artprov.cpp b/Externals/wxWidgets3/src/common/artprov.cpp
index 5377d3e560..f2551614d4 100644
--- a/Externals/wxWidgets3/src/common/artprov.cpp
+++ b/Externals/wxWidgets3/src/common/artprov.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     18/03/2002
-// RCS-ID:      $Id: artprov.cpp 70154 2011-12-28 13:51:29Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/artstd.cpp b/Externals/wxWidgets3/src/common/artstd.cpp
index fe65503986..471146647b 100644
--- a/Externals/wxWidgets3/src/common/artstd.cpp
+++ b/Externals/wxWidgets3/src/common/artstd.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     18/03/2002
-// RCS-ID:      $Id: artstd.cpp 70893 2012-03-13 17:23:58Z JS $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/arttango.cpp b/Externals/wxWidgets3/src/common/arttango.cpp
index ae01e9e85a..156ae8fc06 100644
--- a/Externals/wxWidgets3/src/common/arttango.cpp
+++ b/Externals/wxWidgets3/src/common/arttango.cpp
@@ -3,7 +3,6 @@
 // Purpose:     art provider using embedded PNG versions of Tango icons
 // Author:      Vadim Zeitlin
 // Created:     2010-12-27
-// RCS-ID:      $Id: arttango.cpp 70154 2011-12-28 13:51:29Z VZ $
 // Copyright:   (c) 2010 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/base64.cpp b/Externals/wxWidgets3/src/common/base64.cpp
index fc0cb57755..5ee3a7a3c7 100644
--- a/Externals/wxWidgets3/src/common/base64.cpp
+++ b/Externals/wxWidgets3/src/common/base64.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of BASE64 encoding/decoding functions
 // Author:      Charles Reimers, Vadim Zeitlin
 // Created:     2007-06-18
-// RCS-ID:      $Id: base64.cpp 61753 2009-08-23 22:25:12Z VZ $
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/src/common/bmpbase.cpp b/Externals/wxWidgets3/src/common/bmpbase.cpp
index 403470fe29..763b9597f9 100644
--- a/Externals/wxWidgets3/src/common/bmpbase.cpp
+++ b/Externals/wxWidgets3/src/common/bmpbase.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11
-// RCS-ID:      $Id: bmpbase.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2001, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,6 +22,12 @@
     #include "wx/image.h"
 #endif // WX_PRECOMP
 
+#if wxUSE_IMAGE && wxUSE_LIBPNG && wxUSE_STREAMS
+    #define wxHAS_PNG_LOAD
+
+    #include "wx/mstream.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------
@@ -37,6 +42,31 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)
 //WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
 #endif
 
+// ----------------------------------------------------------------------------
+// wxBitmapHelpers
+// ----------------------------------------------------------------------------
+
+// wxOSX has a native version and doesn't use this one.
+
+#ifndef __WXOSX__
+
+/* static */
+wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
+{
+    wxBitmap bitmap;
+
+#ifdef wxHAS_PNG_LOAD
+    wxMemoryInputStream is(data, size);
+    wxImage image(is, wxBITMAP_TYPE_PNG);
+    if ( image.IsOk() )
+        bitmap = wxBitmap(image);
+#endif // wxHAS_PNG_LOAD
+
+    return bitmap;
+}
+
+#endif // !__WXOSX__
+
 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/bmpbtncmn.cpp b/Externals/wxWidgets3/src/common/bmpbtncmn.cpp
index 8c2e3e0d1b..8760c70c09 100644
--- a/Externals/wxWidgets3/src/common/bmpbtncmn.cpp
+++ b/Externals/wxWidgets3/src/common/bmpbtncmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: bmpbtncmn.cpp 66584 2011-01-05 06:56:36Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,9 @@
     #include "wx/image.h"
 #endif
 
+#include "wx/artprov.h"
+#include "wx/renderer.h"
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
@@ -90,4 +92,67 @@ bitmap "focus" ,
 bitmap "disabled" ,
 */
 
+namespace
+{
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+
+wxBitmap
+GetCloseButtonBitmap(wxWindow *win,
+                     const wxSize& size,
+                     const wxColour& colBg,
+                     int flags = 0)
+{
+    wxBitmap bmp(size);
+    wxMemoryDC dc(bmp);
+    dc.SetBackground(colBg);
+    dc.Clear();
+    wxRendererNative::Get().
+        DrawTitleBarBitmap(win, dc, size, wxTITLEBAR_BUTTON_CLOSE, flags);
+    return bmp;
+}
+
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
+
+} // anonymous namespace
+
+/* static */
+wxBitmapButton*
+wxBitmapButtonBase::NewCloseButton(wxWindow* parent, wxWindowID winid)
+{
+    wxCHECK_MSG( parent, NULL, wxS("Must have a valid parent") );
+
+    const wxColour colBg = parent->GetBackgroundColour();
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+    const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON);
+    wxBitmap bmp = GetCloseButtonBitmap(parent, sizeBmp, colBg);
+#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
+    wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON);
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
+
+    wxBitmapButton* const button = new wxBitmapButton
+                                       (
+                                        parent,
+                                        winid,
+                                        bmp,
+                                        wxDefaultPosition,
+                                        wxDefaultSize,
+                                        wxBORDER_NONE
+                                       );
+
+#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
+    button->SetBitmapPressed(
+        GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_PRESSED));
+
+    button->SetBitmapCurrent(
+        GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_CURRENT));
+#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
+
+    // The button should blend with its parent background.
+    button->SetBackgroundColour(colBg);
+
+    return button;
+}
+
 #endif // wxUSE_BMPBUTTON
diff --git a/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp b/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp
index 2606b8c57d..1fa3c83ffa 100644
--- a/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp
+++ b/Externals/wxWidgets3/src/common/bmpcboxcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-04-09
-// RCS-ID:      $Id: bmpcboxcmn.cpp 66728 2011-01-22 14:38:36Z DS $
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/bookctrl.cpp b/Externals/wxWidgets3/src/common/bookctrl.cpp
index c722822df5..4b321322b4 100644
--- a/Externals/wxWidgets3/src/common/bookctrl.cpp
+++ b/Externals/wxWidgets3/src/common/bookctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id: bookctrl.cpp 70153 2011-12-28 13:51:25Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -105,27 +104,21 @@ void wxBookCtrlBase::DoInvalidateBestSize()
 
 wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const
 {
-    // We need to add the size of the controller and the border between if it's
-    // shown. Notice that we don't use GetControllerSize() here as it returns
-    // the actual size while we want the best size here.
+    // Add the size of the controller and the border between if it's shown.
     if ( !m_bookctrl || !m_bookctrl->IsShown() )
         return sizePage;
 
-    const wxSize sizeController = m_bookctrl->GetBestSize();
+    // Notice that the controller size is its current size while we really want
+    // to have its best size. So we only take into account its size in the
+    // direction in which we should add it but not in the other one, where the
+    // controller size is determined by the size of wxBookCtrl itself.
+    const wxSize sizeController = GetControllerSize();
 
     wxSize size = sizePage;
     if ( IsVertical() )
-    {
-        if ( sizeController.x > sizePage.x )
-            size.x = sizeController.x;
         size.y += sizeController.y + GetInternalBorder();
-    }
     else // left/right aligned
-    {
         size.x += sizeController.x + GetInternalBorder();
-        if ( sizeController.y > sizePage.y )
-            size.y = sizeController.y;
-    }
 
     return size;
 }
@@ -139,26 +132,22 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
 {
     wxSize bestSize;
 
-    // iterate over all pages, get the largest width and height
-    const size_t nCount = m_pages.size();
-    for ( size_t nPage = 0; nPage < nCount; nPage++ )
+    if (m_fitToCurrentPage && GetCurrentPage())
     {
-        const wxWindow * const pPage = m_pages[nPage];
-        if( pPage )
+        bestSize = GetCurrentPage()->GetBestSize();
+    }
+    else
+    {
+        // iterate over all pages, get the largest width and height
+        const size_t nCount = m_pages.size();
+        for ( size_t nPage = 0; nPage < nCount; nPage++ )
         {
-            wxSize childBestSize(pPage->GetBestSize());
-
-            if ( childBestSize.x > bestSize.x )
-                bestSize.x = childBestSize.x;
-
-            if ( childBestSize.y > bestSize.y )
-                bestSize.y = childBestSize.y;
+            const wxWindow * const pPage = m_pages[nPage];
+            if ( pPage )
+                bestSize.IncTo(pPage->GetBestSize());
         }
     }
 
-    if (m_fitToCurrentPage && GetCurrentPage())
-        bestSize = GetCurrentPage()->GetBestSize();
-
     // convert display area to window area, adding the size necessary for the
     // tabs
     wxSize best = CalcSizeFromPage(bestSize);
@@ -288,19 +277,19 @@ wxSize wxBookCtrlBase::GetControllerSize() const
     if ( !m_bookctrl || !m_bookctrl->IsShown() )
         return wxSize(0, 0);
 
-    const wxSize sizeClient = GetClientSize(),
-                 sizeCtrl = m_bookctrl->GetBestSize();
+    const wxSize sizeClient = GetClientSize();
 
     wxSize size;
 
+    // Ask for the best width/height considering the other direction.
     if ( IsVertical() )
     {
         size.x = sizeClient.x;
-        size.y = sizeCtrl.y;
+        size.y = m_bookctrl->GetBestHeight(sizeClient.x);
     }
     else // left/right aligned
     {
-        size.x = sizeCtrl.x;
+        size.x = m_bookctrl->GetBestWidth(sizeClient.y);
         size.y = sizeClient.y;
     }
 
@@ -441,6 +430,18 @@ int wxBookCtrlBase::GetNextPage(bool forward) const
     return nPage;
 }
 
+int wxBookCtrlBase::FindPage(const wxWindow* page) const
+{
+    const size_t nCount = m_pages.size();
+    for ( size_t nPage = 0; nPage < nCount; nPage++ )
+    {
+        if ( m_pages[nPage] == page )
+            return (int)nPage;
+    }
+
+    return wxNOT_FOUND;
+}
+
 bool wxBookCtrlBase::DoSetSelectionAfterInsertion(size_t n, bool bSelect)
 {
     if ( bSelect )
@@ -454,6 +455,26 @@ bool wxBookCtrlBase::DoSetSelectionAfterInsertion(size_t n, bool bSelect)
     return true;
 }
 
+void wxBookCtrlBase::DoSetSelectionAfterRemoval(size_t n)
+{
+    if ( m_selection >= (int)n )
+    {
+        // ensure that the selection is valid
+        int sel;
+        if ( GetPageCount() == 0 )
+            sel = wxNOT_FOUND;
+        else
+            sel = m_selection ? m_selection - 1 : 0;
+
+        // if deleting current page we shouldn't try to hide it
+        m_selection = m_selection == (int)n ? wxNOT_FOUND
+                                            : m_selection - 1;
+
+        if ( sel != wxNOT_FOUND && sel != m_selection )
+            SetSelection(sel);
+    }
+}
+
 int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
 {
     wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
@@ -478,11 +499,11 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
         if ( !(flags & SetSelection_SendEvent) || allowed)
         {
             if ( oldSel != wxNOT_FOUND )
-                m_pages[oldSel]->Hide();
+                DoShowPage(m_pages[oldSel], false);
 
             wxWindow *page = m_pages[n];
             page->SetSize(GetPageRect());
-            page->Show();
+            DoShowPage(page, true);
 
             // change selection now to ignore the selection change event
             UpdateSelectedPage(n);
diff --git a/Externals/wxWidgets3/src/common/btncmn.cpp b/Externals/wxWidgets3/src/common/btncmn.cpp
index e59d7118ac..cbbfd0f14e 100644
--- a/Externals/wxWidgets3/src/common/btncmn.cpp
+++ b/Externals/wxWidgets3/src/common/btncmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxButtonBase
 // Author:      Vadim Zeitlin
 // Created:     2007-04-08
-// RCS-ID:      $Id: btncmn.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -75,7 +74,7 @@ wxEND_FLAGS( wxButtonStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxButton)
-wxEVENT_PROPERTY( Click, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent )
+wxEVENT_PROPERTY( Click, wxEVT_BUTTON, wxCommandEvent )
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("The font associated with the button label"), wxT("group"))
diff --git a/Externals/wxWidgets3/src/common/cairo.cpp b/Externals/wxWidgets3/src/common/cairo.cpp
index 7425bf2afa..a10ca6499f 100644
--- a/Externals/wxWidgets3/src/common/cairo.cpp
+++ b/Externals/wxWidgets3/src/common/cairo.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Cairo library
 // Author:      Anthony Betaudeau
 // Created:     2007-08-25
-// RCS-ID:      $Id: cairo.cpp 69486 2011-10-20 04:58:00Z RD $
 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,14 +15,18 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CAIRO
+
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
-#include "wx/cairo.h"
+#include <cairo.h>
 #include "wx/dynlib.h"
 
-#if wxUSE_CAIRO
+#ifdef __WXMSW__
+#include "wx/msw/wrapwin.h"
+#endif
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
@@ -375,18 +378,13 @@ bool wxCairo::IsOk()
 // implementation of the functions themselves
 // ============================================================================
 
-extern "C"
-{
-
 bool wxCairoInit()
 {
     return wxCairo::Initialize();
 }
 
-void wxCairoCleanUp()
+extern "C"
 {
-    wxCairo::CleanUp();
-}
 
 #define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
     rettype name params                                                               \
diff --git a/Externals/wxWidgets3/src/common/calctrlcmn.cpp b/Externals/wxWidgets3/src/common/calctrlcmn.cpp
index 93ac0dbc9f..2b869127b2 100644
--- a/Externals/wxWidgets3/src/common/calctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/calctrlcmn.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/calctrlcmn.cpp
 // Author:      Marcin Wojdyr
 // Created:     2008-03-26
-// RCS-ID:      $Id: calctrlcmn.cpp 69224 2011-09-29 13:43:15Z VZ $
 // Copyright:   (C) Marcin Wojdyr
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/checkboxcmn.cpp b/Externals/wxWidgets3/src/common/checkboxcmn.cpp
index f3f245cf96..b31d85338d 100644
--- a/Externals/wxWidgets3/src/common/checkboxcmn.cpp
+++ b/Externals/wxWidgets3/src/common/checkboxcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: checkboxcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,7 +67,7 @@ wxEND_FLAGS( wxCheckBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl, "wx/checkbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
-    wxEVENT_PROPERTY( Click, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent )
+    wxEVENT_PROPERTY( Click, wxEVT_CHECKBOX, wxCommandEvent )
 
     wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
                 0 /*flags*/, wxT("Helpstring"), wxT("group"))
diff --git a/Externals/wxWidgets3/src/common/checklstcmn.cpp b/Externals/wxWidgets3/src/common/checklstcmn.cpp
index 6f9ace5d60..be56ca3e17 100644
--- a/Externals/wxWidgets3/src/common/checklstcmn.cpp
+++ b/Externals/wxWidgets3/src/common/checklstcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id: checklstcmn.cpp 66584 2011-01-05 06:56:36Z PC $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -87,7 +86,7 @@ wxEND_FLAGS( wxCheckListBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox, "wx/checklst.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
-    wxEVENT_PROPERTY( Toggle, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent )
+    wxEVENT_PROPERTY( Toggle, wxEVT_CHECKLISTBOX, wxCommandEvent )
     wxPROPERTY_FLAGS( WindowStyle, wxCheckListBoxStyle, long, SetWindowStyleFlag, \
                       GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, wxLB_OWNERDRAW /*flags*/, \
                       wxT("Helpstring"), wxT("group")) // style
@@ -99,4 +98,22 @@ wxCONSTRUCTOR_4( wxCheckListBox, wxWindow*, Parent, wxWindowID, Id, \
                  wxPoint, Position, wxSize, Size )
 
 
+// ============================================================================
+// implementation
+// ============================================================================
+
+unsigned int wxCheckListBoxBase::GetCheckedItems(wxArrayInt& checkedItems) const
+{
+    unsigned int const numberOfItems = GetCount();
+
+    checkedItems.clear();
+    for ( unsigned int i = 0; i < numberOfItems; ++i )
+    {
+        if ( IsChecked(i) )
+            checkedItems.push_back(i);
+    }
+
+    return checkedItems.size();
+}
+
 #endif
diff --git a/Externals/wxWidgets3/src/common/choiccmn.cpp b/Externals/wxWidgets3/src/common/choiccmn.cpp
index 075823d0ea..6ac940b424 100644
--- a/Externals/wxWidgets3/src/common/choiccmn.cpp
+++ b/Externals/wxWidgets3/src/common/choiccmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id: choiccmn.cpp 66574 2011-01-04 14:13:29Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,8 @@
 
 #include "wx/choice.h"
 
+#include "wx/private/textmeasure.h"
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -68,7 +69,7 @@ wxEND_FLAGS( wxChoiceStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxChoice)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent )
+wxEVENT_PROPERTY( Select, wxEVT_CHOICE, wxCommandEvent )
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group"))
@@ -103,6 +104,21 @@ wxChoiceBase::~wxChoiceBase()
     // this destructor is required for Darwin
 }
 
+wxSize wxChoiceBase::DoGetBestSize() const
+{
+    // a reasonable width for an empty choice list
+    wxSize best(80, -1);
+
+    const unsigned int nItems = GetCount();
+    if ( nItems > 0 )
+    {
+        wxTextMeasure txm(this);
+        best.x = txm.GetLargestStringExtent(GetStrings()).x;
+    }
+
+    return best;
+}
+
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/clipcmn.cpp b/Externals/wxWidgets3/src/common/clipcmn.cpp
index 4ee1d89a8c..b108944252 100644
--- a/Externals/wxWidgets3/src/common/clipcmn.cpp
+++ b/Externals/wxWidgets3/src/common/clipcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99
-// RCS-ID:      $Id: clipcmn.cpp 61485 2009-07-20 23:54:08Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/clntdata.cpp b/Externals/wxWidgets3/src/common/clntdata.cpp
index b702cff3b8..1cb5595785 100644
--- a/Externals/wxWidgets3/src/common/clntdata.cpp
+++ b/Externals/wxWidgets3/src/common/clntdata.cpp
@@ -4,7 +4,6 @@
 // Author:      Robin Dunn
 // Modified by:
 // Created:     9-Oct-2001
-// RCS-ID:      $Id: clntdata.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/clrpickercmn.cpp b/Externals/wxWidgets3/src/common/clrpickercmn.cpp
index 1dc183a0af..8320178596 100644
--- a/Externals/wxWidgets3/src/common/clrpickercmn.cpp
+++ b/Externals/wxWidgets3/src/common/clrpickercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: clrpickercmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,7 +38,7 @@ const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
 // implementation
 // ============================================================================
 
-wxDEFINE_EVENT(wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent);
+wxDEFINE_EVENT(wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent);
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
 
@@ -68,7 +67,7 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     // complete sizer creation
     wxPickerBase::PostCreation();
 
-    m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
+    m_picker->Connect(wxEVT_COLOURPICKER_CHANGED,
             wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
             NULL, this);
 
@@ -96,13 +95,6 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
 {
     wxASSERT(m_text);
 
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
     // wxString -> wxColour conversion
     wxColour col(m_text->GetValue());
     if ( !col.IsOk() )
@@ -123,11 +115,9 @@ void wxColourPickerCtrl::UpdateTextCtrlFromPicker()
     if (!m_text)
         return;     // no textctrl to update
 
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(M_PICKER->GetColour().GetAsString());
+    // Take care to use ChangeValue() here and not SetValue() to avoid
+    // infinite recursion.
+    m_text->ChangeValue(M_PICKER->GetColour().GetAsString());
 }
 
 
diff --git a/Externals/wxWidgets3/src/common/cmdline.cpp b/Externals/wxWidgets3/src/common/cmdline.cpp
index e270ade86f..e8892831ac 100644
--- a/Externals/wxWidgets3/src/common/cmdline.cpp
+++ b/Externals/wxWidgets3/src/common/cmdline.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.01.00
-// RCS-ID:      $Id: cmdline.cpp 68316 2011-07-21 13:49:55Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -682,7 +681,15 @@ int wxCmdLineParser::Parse(bool showUsage)
 
             continue;
         }
-
+#ifdef __WXOSX__
+        if ( arg == wxT("-ApplePersistenceIgnoreState") )
+        {
+            maybeOption = false;
+            
+            continue;
+        }
+#endif
+        
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&
                 // FIXME-UTF8: use wc_str() after removing ANSI build
@@ -969,8 +976,8 @@ int wxCmdLineParser::Parse(bool showUsage)
                         case wxCMD_LINE_VAL_DATE:
                             {
                                 wxDateTime dt;
-                                wxString::const_iterator end;
-                                if ( !dt.ParseDate(value, &end) || end != value.end() )
+                                wxString::const_iterator endDate;
+                                if ( !dt.ParseDate(value, &endDate) || endDate != value.end() )
                                 {
                                     errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
                                                                  name.c_str(), value.c_str())
@@ -1377,6 +1384,23 @@ static wxString GetLongOptionName(wxString::const_iterator p,
    Windows conventions for the command line handling, not Unix ones. For
    instance, backslash is not special except when it precedes double quote when
    it does quote it.
+
+   TODO: Rewrite this to follow the even more complicated rule used by Windows
+         CommandLineToArgv():
+
+    * A string of backslashes not followed by a quotation mark has no special
+      meaning.
+    * An even number of backslashes followed by a quotation mark is treated as
+      pairs of protected backslashes, followed by a word terminator.
+    * An odd number of backslashes followed by a quotation mark is treated as
+      pairs of protected backslashes, followed by a protected quotation mark.
+
+    See http://blogs.msdn.com/b/oldnewthing/archive/2010/09/17/10063629.aspx
+
+    It could also be useful to provide a converse function which is also
+    non-trivial, see
+
+    http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx
  */
 
 /* static */
diff --git a/Externals/wxWidgets3/src/common/cmdproc.cpp b/Externals/wxWidgets3/src/common/cmdproc.cpp
index 75ef4d3166..55107a9d91 100644
--- a/Externals/wxWidgets3/src/common/cmdproc.cpp
+++ b/Externals/wxWidgets3/src/common/cmdproc.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart (extracted from docview.h by VZ)
 // Modified by:
 // Created:     05.11.00
-// RCS-ID:      $Id: cmdproc.cpp 70460 2012-01-25 00:05:12Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -330,16 +329,11 @@ void wxCommandProcessor::ClearCommands()
 
 bool wxCommandProcessor::IsDirty() const
 {
-    if ( m_commands.empty() )
-    {
-        // If we have never been modified, we can't be dirty.
-        return false;
-    }
-
     if ( !m_lastSavedCommand )
     {
-        // If we have been modified but have never been saved, we're dirty.
-        return true;
+        // We have never been saved, so we are dirty if and only if we have any
+        // commands at all.
+        return !!m_currentCommand;
     }
 
     if ( !m_currentCommand )
diff --git a/Externals/wxWidgets3/src/common/cmndata.cpp b/Externals/wxWidgets3/src/common/cmndata.cpp
index 95de654375..18b2ef927f 100644
--- a/Externals/wxWidgets3/src/common/cmndata.cpp
+++ b/Externals/wxWidgets3/src/common/cmndata.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: cmndata.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/colourcmn.cpp b/Externals/wxWidgets3/src/common/colourcmn.cpp
index d596deec62..12b5f2007c 100644
--- a/Externals/wxWidgets3/src/common/colourcmn.cpp
+++ b/Externals/wxWidgets3/src/common/colourcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     20/4/2006
-// RCS-ID:      $Id: colourcmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -273,6 +272,16 @@ void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned cha
     *b = AlphaBlend(*b, brightness, 0.4);
 }
 
+wxColour& wxColourBase::MakeDisabled(unsigned char brightness)
+{
+    unsigned char r = Red(),
+                  g = Green(),
+                  b = Blue();
+    MakeDisabled(&r, &g, &b, brightness);
+    Set(r, g, b, Alpha());
+    return static_cast<wxColour&>(*this);
+}
+
 // AlphaBlend is used by ChangeLightness and MakeDisabled
 
 // static
diff --git a/Externals/wxWidgets3/src/common/colourdata.cpp b/Externals/wxWidgets3/src/common/colourdata.cpp
index 49996df461..3569c50514 100644
--- a/Externals/wxWidgets3/src/common/colourdata.cpp
+++ b/Externals/wxWidgets3/src/common/colourdata.cpp
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/colourdata.cpp
 // Author:      Julian Smart
-// RCS-ID:      $Id: colourdata.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -105,4 +104,64 @@ bool wxColourData::FromString(const wxString& str)
     }
     return success;
 }
+
+#if wxUSE_COLOURDLG
+
+#include "wx/colordlg.h"
+
+wxColour wxGetColourFromUser(wxWindow *parent,
+                             const wxColour& colInit,
+                             const wxString& caption,
+                             wxColourData *ptrData)
+{
+    // contains serialized representation of wxColourData used the last time
+    // the dialog was shown: we want to reuse it the next time in order to show
+    // the same custom colours to the user (and we can't just have static
+    // wxColourData itself because it's a GUI object and so should be destroyed
+    // before GUI shutdown and doing it during static cleanup is too late)
+    static wxString s_strColourData;
+
+    wxColourData data;
+    if ( !ptrData )
+    {
+        ptrData = &data;
+        if ( !s_strColourData.empty() )
+        {
+            if ( !data.FromString(s_strColourData) )
+            {
+                wxFAIL_MSG( "bug in wxColourData::FromString()?" );
+            }
+
+#ifdef __WXMSW__
+            // we don't get back the "choose full" flag value from the native
+            // dialog and so we can't preserve it between runs, so we decide to
+            // always use it as it seems better than not using it (user can
+            // just ignore the extra controls in the dialog but having to click
+            // a button each time to show them would be very annoying
+            data.SetChooseFull(true);
+#endif // __WXMSW__
+        }
+    }
+
+    if ( colInit.IsOk() )
+    {
+        ptrData->SetColour(colInit);
+    }
+
+    wxColour colRet;
+    wxColourDialog dialog(parent, ptrData);
+    if (!caption.empty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        *ptrData = dialog.GetColourData();
+        colRet = ptrData->GetColour();
+        s_strColourData = ptrData->ToString();
+    }
+    //else: leave colRet invalid
+
+    return colRet;
+}
+
+#endif // wxUSE_COLOURDLG
 #endif // wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL
diff --git a/Externals/wxWidgets3/src/common/combocmn.cpp b/Externals/wxWidgets3/src/common/combocmn.cpp
index de33d29646..82d1657960 100644
--- a/Externals/wxWidgets3/src/common/combocmn.cpp
+++ b/Externals/wxWidgets3/src/common/combocmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combocmn.cpp 69005 2011-09-05 20:08:04Z RD $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,26 +22,15 @@
     #pragma hdrstop
 #endif
 
+#include "wx/combo.h"
+
+#ifdef __WXMSW__
+#include "wx/msw/private.h"
+#endif
+
 #if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
-#endif
-
-#if wxUSE_COMBOCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/timer.h"
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/tooltip.h"
-
-#include "wx/combo.h"
-
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -87,8 +75,8 @@ wxEND_FLAGS( wxComboBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( Select, wxEVT_COMBOBOX, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )
 
 // TODO DELEGATES
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
@@ -110,6 +98,21 @@ wxEMPTY_HANDLERS_TABLE(wxComboBox)
 wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
                 wxString, Value, wxPoint, Position, wxSize, Size )
 
+#endif // wxUSE_COMBOBOX
+
+#if wxUSE_COMBOCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/timer.h"
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/tooltip.h"
+
 // constants
 // ----------------------------------------------------------------------------
 
@@ -389,7 +392,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
     wxWindow* popup = m_combo->GetPopupControl()->GetControl();
     wxWindow* winpopup = m_combo->GetPopupWindow();
 
-    if (
+    if ( !winFocused || (
          winFocused != m_focusStart &&
          winFocused != popup &&
          winFocused->GetParent() != popup &&
@@ -398,6 +401,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
          winFocused != m_combo &&
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )
+       )
     {
         m_combo->HidePopup(true);
     }
@@ -489,9 +493,8 @@ bool wxComboPopupWindow::Show( bool show )
 
     m_inShow++;
 
-    wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
-
-    wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+    wxPopupTransientWindow* const
+        ptw = static_cast<wxPopupTransientWindow*>(this);
 
     if ( show != ptw->IsShown() )
     {
@@ -518,7 +521,7 @@ bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
 void wxComboPopupWindow::OnDismiss()
 {
     wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxComboCtrlBase),
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     combo->OnPopupDismiss(true);
@@ -766,7 +769,7 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
         if ( m_combo->GetTextCtrl() )
             m_combo->GetTextCtrl()->SelectAll();
         else
-            m_combo->SetSelection(-1,-1);
+            m_combo->SelectAll();
     }
 
     // Send focus indication to parent.
@@ -1096,10 +1099,10 @@ wxComboCtrlBase::CreateTextCtrl(int style)
 
         // Connecting the events is currently the most reliable way
         wxWindowID id = m_text->GetId();
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_UPDATED,
+        m_text->Connect(id, wxEVT_TEXT,
                         wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
                         NULL, this);
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_ENTER,
+        m_text->Connect(id, wxEVT_TEXT_ENTER,
                         wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
                         NULL, this);
 
@@ -1360,22 +1363,52 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
 
 wxSize wxComboCtrlBase::DoGetBestSize() const
 {
-    wxSize sizeText(150,0);
+    int width = m_text ? m_text->GetBestSize().x : 80;
 
-    if ( m_text )
-        sizeText = m_text->GetBestSize();
+    return GetSizeFromTextSize(width);
+}
 
-    // TODO: Better method to calculate close-to-native control height.
+wxSize wxComboCtrlBase::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    // Calculate close-to-native control height
 
     int fhei;
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    fhei = EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight());
+#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+    // Control creation is not entirely cheap, so cache the heights to
+    // avoid repeatedly creating dummy controls:
+    static wxString s_last_font;
+    static int s_last_fhei = -1;
+    wxString fontdesc;
+    if ( m_font.IsOk() )
+        fontdesc = m_font.GetNativeFontInfoDesc();
+    if ( s_last_fhei != -1 && fontdesc == s_last_font )
+    {
+        fhei = s_last_fhei;
+    }
+    else
+    {
+        wxComboBox* cb = new wxComboBox;
+        cb->Hide();
+        cb->Create(const_cast<wxComboCtrlBase*>(this), wxID_ANY);
+        if ( m_font.IsOk() )
+            cb->SetFont(m_font);
+        s_last_font = fontdesc;
+        s_last_fhei = fhei = cb->GetBestSize().y;
+        cb->Destroy();
+    }
+#else
     if ( m_font.IsOk() )
         fhei = (m_font.GetPointSize()*2) + 5;
     else if ( wxNORMAL_FONT->IsOk() )
         fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
     else
-        fhei = sizeText.y + 4;
+        fhei = 22;
+#endif // only for wxComboBox on MSW or GTK
 
-    // Need to force height to accomodate bitmap?
+    // Need to force height to accommodate bitmap?
     int btnSizeY = m_btnSize.y;
     if ( m_bmpNormal.IsOk() && fhei < btnSizeY )
         fhei = btnSizeY;
@@ -1393,11 +1426,6 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
         fhei += 4;
 */
 
-    // Final adjustments
-#ifdef __WXGTK__
-    fhei += 1;
-#endif
-
 #ifdef __WXMAC__
     // these are the numbers from the HIG:
     switch ( m_windowVariant )
@@ -1416,11 +1444,19 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
 #endif
 
     fhei += 2 * FOCUS_RING;
-    int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
 
-    wxSize ret(width, fhei);
-    CacheBestSize(ret);
-    return ret;
+    // Calculate width
+    int fwid = xlen + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
+
+    // Add the margins we have previously set
+    wxPoint marg( GetMargins() );
+    fwid += wxMax(0, marg.x);
+    fhei += wxMax(0, marg.y);
+
+    if ( ylen > 0 )
+        fhei += ylen - GetCharHeight();
+
+    return wxSize(fwid, fhei);
 }
 
 void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
@@ -1771,7 +1807,7 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
         return;
     }
 
-    if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+    if ( event.GetEventType() == wxEVT_TEXT )
     {
         if ( m_ignoreEvtText > 0 )
         {
@@ -2034,19 +2070,23 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
 
 void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
-// On Mac, this leads to infinite recursion and eventually a crash 
-#ifndef __WXMAC__
+    // On Mac, setting focus here leads to infinite recursion and eventually
+    // a crash due to the SetFocus call producing another event.
+    // Handle Mac in OnIdleEvent using m_resetFocus.
+    
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
-        wxWindow* tc = GetTextCtrl();
-        if ( tc && tc != DoFindFocus() )
+        if ( GetTextCtrl() && !GetTextCtrl()->HasFocus() )
         {
-            tc->SetFocus();
+#ifdef __WXMAC__
+            m_resetFocus = true;
+#else
+            GetTextCtrl()->SetFocus();
+#endif
         }
     }
-
+    
     Refresh();
-#endif
 }
 
 void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
@@ -2054,9 +2094,8 @@ void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
     if ( m_resetFocus )
     {
         m_resetFocus = false;
-        wxWindow* tc = GetTextCtrl();
-        if ( tc )
-            tc->SetFocus();
+        if ( GetTextCtrl() )
+            GetTextCtrl()->SetFocus();
     }
 }
 
@@ -2214,7 +2253,7 @@ void wxComboCtrlBase::OnButtonClick()
 
 void wxComboCtrlBase::Popup()
 {
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+    wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId());
     event.SetEventObject(this);
     HandleWindowEvent(event);
 
@@ -2500,7 +2539,7 @@ void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
 
     if ( generateEvent )
     {
-        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+        wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId());
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
diff --git a/Externals/wxWidgets3/src/common/config.cpp b/Externals/wxWidgets3/src/common/config.cpp
index e6916ff8d9..852dd13f17 100644
--- a/Externals/wxWidgets3/src/common/config.cpp
+++ b/Externals/wxWidgets3/src/common/config.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98
-// RCS-ID:      $Id: config.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1997 Karsten Ballueder  Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/containr.cpp b/Externals/wxWidgets3/src/common/containr.cpp
index 2b3e7d414e..50bbd6aefa 100644
--- a/Externals/wxWidgets3/src/common/containr.cpp
+++ b/Externals/wxWidgets3/src/common/containr.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.01
-// RCS-ID:      $Id: containr.cpp 68502 2011-08-03 00:45:42Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,14 +46,25 @@
 // wxControlContainerBase
 // ----------------------------------------------------------------------------
 
-void wxControlContainerBase::SetCanFocus(bool acceptsFocus)
+void wxControlContainerBase::UpdateParentCanFocus()
 {
-    if ( acceptsFocus == m_acceptsFocus )
-        return;
+    // In the ports where it does something non trivial, the parent window
+    // should only be focusable if it doesn't have any focusable children
+    // (e.g. native focus handling in wxGTK totally breaks down otherwise).
+    m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren);
+}
 
-    m_acceptsFocus = acceptsFocus;
+bool wxControlContainerBase::UpdateCanFocusChildren()
+{
+    const bool acceptsFocusChildren = HasAnyFocusableChildren();
+    if ( acceptsFocusChildren != m_acceptsFocusChildren )
+    {
+        m_acceptsFocusChildren = acceptsFocusChildren;
 
-    m_winParent->SetCanFocus(m_acceptsFocus);
+        UpdateParentCanFocus();
+    }
+
+    return m_acceptsFocusChildren;
 }
 
 bool wxControlContainerBase::HasAnyFocusableChildren() const
@@ -70,6 +80,30 @@ bool wxControlContainerBase::HasAnyFocusableChildren() const
         if ( !m_winParent->IsClientAreaChild(child) )
             continue;
 
+        // Here we check whether the child can accept the focus at all, as we
+        // want to try focusing it later even if it can't accept it right now.
+        if ( child->AcceptsFocusRecursively() )
+            return true;
+    }
+
+    return false;
+}
+
+bool wxControlContainerBase::HasAnyChildrenAcceptingFocus() const
+{
+    const wxWindowList& children = m_winParent->GetChildren();
+    for ( wxWindowList::const_iterator i = children.begin(),
+                                     end = children.end();
+          i != end;
+          ++i )
+    {
+        const wxWindow * const child = *i;
+
+        if ( !m_winParent->IsClientAreaChild(child) )
+            continue;
+
+        // Here we check if the child accepts focus right now as we need to
+        // know if we can give the focus to it or not.
         if ( child->CanAcceptFocus() )
             return true;
     }
@@ -118,6 +152,11 @@ bool wxControlContainerBase::DoSetFocus()
     return ret;
 }
 
+bool wxControlContainerBase::AcceptsFocus() const
+{
+    return m_acceptsFocusSelf && m_winParent->CanBeFocused();
+}
+
 bool wxControlContainerBase::SetFocusToChild()
 {
     return wxSetFocusToChild(m_winParent, &m_winLastFocused);
@@ -174,19 +213,6 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
             wxLogTrace(TRACE_FOCUS, wxT("No more last focus"));
         }
     }
-
-    // propagate the last focus upwards so that our parent can set focus back
-    // to us if it loses it now and regains later; do *not* do this if we are
-    // a toplevel window (e.g. wxDialog) that has another frame as its parent
-    if ( !m_winParent->IsTopLevel() )
-    {
-        wxWindow *parent = m_winParent->GetParent();
-        if ( parent )
-        {
-            wxChildFocusEvent eventFocus(m_winParent);
-            parent->GetEventHandler()->ProcessEvent(eventFocus);
-        }
-    }
 }
 
 // --------------------------------------------------------------------
@@ -194,7 +220,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
 // within the same group. Used by wxSetFocusToChild on wxMSW
 // --------------------------------------------------------------------
 
-#if defined(__WXMSW__) && wxUSE_RADIOBTN
+#if wxUSE_RADIOBTN 
 
 wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
 {
@@ -653,17 +679,27 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         // It might happen that the window got reparented
         if ( (*childLastFocused)->GetParent() == win )
         {
-            // And it also could have become hidden in the meanwhile, in this
-            // case focus its parent instead.
-            while ( !(*childLastFocused)->IsShown() )
+            // And it also could have become hidden in the meanwhile
+            // We want to focus on the deepest widget visible
+            wxWindow *deepestVisibleWindow = NULL;
+
+            while ( *childLastFocused )
             {
+                if ( (*childLastFocused)->IsShown() )
+                {
+                    if ( !deepestVisibleWindow )
+                        deepestVisibleWindow = *childLastFocused;
+                }
+                else
+                    deepestVisibleWindow = NULL;
+
                 *childLastFocused = (*childLastFocused)->GetParent();
-                if ( !*childLastFocused )
-                    break;
             }
 
-            if ( *childLastFocused )
+            if ( deepestVisibleWindow )
             {
+                *childLastFocused = deepestVisibleWindow;
+
                 wxLogTrace(TRACE_FOCUS,
                            wxT("SetFocusToChild() => last child (0x%p)."),
                            (*childLastFocused)->GetHandle());
diff --git a/Externals/wxWidgets3/src/common/convauto.cpp b/Externals/wxWidgets3/src/common/convauto.cpp
index 83c1ec3d0f..6a5fba4ecb 100644
--- a/Externals/wxWidgets3/src/common/convauto.cpp
+++ b/Externals/wxWidgets3/src/common/convauto.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxConvAuto
 // Author:      Vadim Zeitlin
 // Created:     2006-04-04
-// RCS-ID:      $Id: convauto.cpp 69675 2011-11-05 11:23:41Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/cshelp.cpp b/Externals/wxWidgets3/src/common/cshelp.cpp
index d05bb9265d..26484e26a2 100644
--- a/Externals/wxWidgets3/src/common/cshelp.cpp
+++ b/Externals/wxWidgets3/src/common/cshelp.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     08/09/2000
-// RCS-ID:      $Id: cshelp.cpp 68859 2011-08-23 04:55:46Z DS $
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/ctrlcmn.cpp b/Externals/wxWidgets3/src/common/ctrlcmn.cpp
index 3fc3cd64a3..dbfbc9f700 100644
--- a/Externals/wxWidgets3/src/common/ctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/ctrlcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id: ctrlcmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -149,6 +148,12 @@ void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 #endif // wxUSE_RADIOBTN
 }
 
+wxSize wxControlBase::DoGetSizeFromTextSize(int WXUNUSED(xlen),
+                                            int WXUNUSED(ylen)) const
+{
+    return wxSize(-1, -1);
+}
+
 /* static */
 wxString wxControlBase::GetLabelText(const wxString& label)
 {
@@ -534,15 +539,10 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
             // add this (ellipsized) row to the rest of the label
             ret << curLine;
             if ( pc == label.end() )
-            {
-                // NOTE: this is the return which always exits the function
-                return ret;
-            }
-            else
-            {
-                ret << *pc;
-                curLine.clear();
-            }
+                break;
+
+            ret << *pc;
+            curLine.clear();
         }
         // we need to remove mnemonics from the label for correct calculations
         else if ( *pc == wxS('&') && (flags & wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS) )
@@ -565,14 +565,9 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
         }
     }
 
-    // this return would generate a
-    //  warning C4702: unreachable code
-    // with MSVC since the function always exits from inside the loop
-    //return ret;
+    return ret;
 }
 
-
-
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
@@ -589,7 +584,7 @@ wxSize wxStaticBitmapBase::DoGetBestSize() const
     wxSize best;
     wxBitmap bmp = GetBitmap();
     if ( bmp.IsOk() )
-        best = wxSize(bmp.GetWidth(), bmp.GetHeight());
+        best = bmp.GetScaledSize();
     else
         // this is completely arbitrary
         best = wxSize(16, 16);
diff --git a/Externals/wxWidgets3/src/common/ctrlsub.cpp b/Externals/wxWidgets3/src/common/ctrlsub.cpp
index d1524dde1a..7bf15a9295 100644
--- a/Externals/wxWidgets3/src/common/ctrlsub.cpp
+++ b/Externals/wxWidgets3/src/common/ctrlsub.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id: ctrlsub.cpp 66664 2011-01-10 12:00:54Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -292,4 +291,19 @@ wxControlWithItemsBase::InitCommandEventWithItems(wxCommandEvent& event, int n)
     }
 }
 
+void wxControlWithItemsBase::SendSelectionChangedEvent(wxEventType eventType)
+{
+    const int n = GetSelection();
+    if ( n == wxNOT_FOUND )
+        return;
+
+    wxCommandEvent event(eventType, m_windowId);
+    event.SetInt(n);
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    InitCommandEventWithItems(event, n);
+
+    HandleWindowEvent(event);
+}
+
 #endif // wxUSE_CONTROLS
diff --git a/Externals/wxWidgets3/src/common/datavcmn.cpp b/Externals/wxWidgets3/src/common/datavcmn.cpp
index 2eb5731566..fd7412117a 100644
--- a/Externals/wxWidgets3/src/common/datavcmn.cpp
+++ b/Externals/wxWidgets3/src/common/datavcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewCtrl base classes and common parts
 // Author:      Robert Roebling
 // Created:     2006/02/20
-// RCS-ID:      $Id: datavcmn.cpp 70377 2012-01-17 14:05:17Z VS $
 // Copyright:   (c) 2006, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -308,15 +307,6 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
 int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                               unsigned int column, bool ascending ) const
 {
-    // sort branches before leaves
-    bool item1_is_container = IsContainer(item1);
-    bool item2_is_container = IsContainer(item2);
-
-    if (item1_is_container && !item2_is_container)
-        return 1;
-    if (item2_is_container && !item1_is_container)
-        return -1;
-
     wxVariant value1,value2;
     GetValue( value1, item1, column );
     GetValue( value2, item2, column );
@@ -340,28 +330,49 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
     {
         long l1 = value1.GetLong();
         long l2 = value2.GetLong();
-        long res = l1-l2;
-        if (res)
-            return res;
+        if (l1 < l2)
+            return -1;
+        else if (l1 > l2)
+            return 1;
     }
     else if (value1.GetType() == wxT("double"))
     {
         double d1 = value1.GetDouble();
         double d2 = value2.GetDouble();
         if (d1 < d2)
-            return 1;
-        if (d1 > d2)
             return -1;
+        else if (d1 > d2)
+            return 1;
     }
     else if (value1.GetType() == wxT("datetime"))
     {
         wxDateTime dt1 = value1.GetDateTime();
         wxDateTime dt2 = value2.GetDateTime();
         if (dt1.IsEarlierThan(dt2))
-            return 1;
-        if (dt2.IsEarlierThan(dt1))
             return -1;
+        if (dt2.IsEarlierThan(dt1))
+            return 1;
     }
+    else if (value1.GetType() == wxT("bool"))
+    {
+        bool b1 = value1.GetBool();
+        bool b2 = value2.GetBool();
+
+        if (b1 != b2)
+            return b1 ? 1 : -1;
+    }
+    else if (value1.GetType() == wxT("wxDataViewIconText"))
+    {
+        wxDataViewIconText iconText1, iconText2;
+
+        iconText1 << value1;
+        iconText2 << value2;
+
+        int res = iconText1.GetText().Cmp(iconText2.GetText());
+        if (res != 0)
+          return res;
+    }
+
 
     // items must be different
     wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
@@ -500,33 +511,6 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
     return wxDataViewItem( m_hash[row] );
 }
 
-bool wxDataViewIndexListModel::HasDefaultCompare() const
-{
-    return !m_ordered;
-}
-
-int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
-                                      const wxDataViewItem& item2,
-                                      unsigned int WXUNUSED(column),
-                                      bool ascending) const
-{
-    if (m_ordered)
-    {
-        unsigned int pos1 = wxPtrToUInt(item1.GetID());  // -1 not needed here
-        unsigned int pos2 = wxPtrToUInt(item2.GetID());  // -1 not needed here
-
-        if (ascending)
-            return pos1 - pos2;
-        else
-            return pos2 - pos1;
-    }
-
-    if (ascending)
-        return GetRow(item1) - GetRow(item2);
-
-    return GetRow(item2) - GetRow(item1);
-}
-
 unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
 {
     if (item.IsOk())
@@ -686,7 +670,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
     wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner();
 
     // Before doing anything we send an event asking if editing of this item is really wanted.
-    wxDataViewEvent start_event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv_ctrl->GetId() );
+    wxDataViewEvent start_event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv_ctrl->GetId() );
     start_event.SetDataViewColumn( GetOwner() );
     start_event.SetModel( dv_ctrl->GetModel() );
     start_event.SetItem( item );
@@ -719,7 +703,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 #endif
 
     // Now we should send Editing Started event
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv_ctrl->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, dv_ctrl->GetId() );
     event.SetDataViewColumn( GetOwner() );
     event.SetModel( dv_ctrl->GetModel() );
     event.SetItem( item );
@@ -742,6 +726,9 @@ void wxDataViewRendererBase::DestroyEditControl()
 
     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);
+
+    // Ensure that DestroyEditControl() is not called again for this control.
+    m_editorCtrl.Release();
 }
 
 void wxDataViewRendererBase::CancelEditing()
@@ -770,7 +757,7 @@ bool wxDataViewRendererBase::FinishEditing()
     unsigned int col = GetOwner()->GetModelColumn();
 
     // Now we should send Editing Done event
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() );
     event.SetDataViewColumn( GetOwner() );
     event.SetModel( dv_ctrl->GetModel() );
     event.SetItem( m_item );
@@ -805,6 +792,20 @@ void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,
 }
 
 
+int wxDataViewRendererBase::GetEffectiveAlignment() const
+{
+    int alignment = GetAlignment();
+
+    if ( alignment == wxDVR_DEFAULT_ALIGNMENT )
+    {
+        // if we don't have an explicit alignment ourselves, use that of the
+        // column in horizontal direction and default vertical alignment
+        alignment = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
+    }
+
+    return alignment;
+}
+
 // ----------------------------------------------------------------------------
 // wxDataViewCustomRendererBase
 // ----------------------------------------------------------------------------
@@ -841,40 +842,38 @@ wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state)
 
     // adjust the rectangle ourselves to account for the alignment
     wxRect rectItem = rectCell;
-    const int align = GetAlignment();
-    if ( align != wxDVR_DEFAULT_ALIGNMENT )
+    const int align = GetEffectiveAlignment();
+
+    const wxSize size = GetSize();
+
+    // take alignment into account only if there is enough space, otherwise
+    // show as much contents as possible
+    //
+    // notice that many existing renderers (e.g. wxDataViewSpinRenderer)
+    // return hard-coded size which can be more than they need and if we
+    // trusted their GetSize() we'd draw the text out of cell bounds
+    // entirely
+
+    if ( size.x >= 0 && size.x < rectCell.width )
     {
-        const wxSize size = GetSize();
+        if ( align & wxALIGN_CENTER_HORIZONTAL )
+            rectItem.x += (rectCell.width - size.x)/2;
+        else if ( align & wxALIGN_RIGHT )
+            rectItem.x += rectCell.width - size.x;
+        // else: wxALIGN_LEFT is the default
 
-        // take alignment into account only if there is enough space, otherwise
-        // show as much contents as possible
-        //
-        // notice that many existing renderers (e.g. wxDataViewSpinRenderer)
-        // return hard-coded size which can be more than they need and if we
-        // trusted their GetSize() we'd draw the text out of cell bounds
-        // entirely
+        rectItem.width = size.x;
+    }
 
-        if ( size.x >= 0 && size.x < rectCell.width )
-        {
-            if ( align & wxALIGN_CENTER_HORIZONTAL )
-                rectItem.x += (rectCell.width - size.x)/2;
-            else if ( align & wxALIGN_RIGHT )
-                rectItem.x += rectCell.width - size.x;
-            // else: wxALIGN_LEFT is the default
+    if ( size.y >= 0 && size.y < rectCell.height )
+    {
+        if ( align & wxALIGN_CENTER_VERTICAL )
+            rectItem.y += (rectCell.height - size.y)/2;
+        else if ( align & wxALIGN_BOTTOM )
+            rectItem.y += rectCell.height - size.y;
+        // else: wxALIGN_TOP is the default
 
-            rectItem.width = size.x;
-        }
-
-        if ( size.y >= 0 && size.y < rectCell.height )
-        {
-            if ( align & wxALIGN_CENTER_VERTICAL )
-                rectItem.y += (rectCell.height - size.y)/2;
-            else if ( align & wxALIGN_BOTTOM )
-                rectItem.y += rectCell.height - size.y;
-            // else: wxALIGN_TOP is the default
-
-            rectItem.height = size.y;
-        }
+        rectItem.height = size.y;
     }
 
 
@@ -943,16 +942,8 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
     }
 
     // get the alignment to use
-    int align = GetAlignment();
-    if ( align == wxDVR_DEFAULT_ALIGNMENT )
-    {
-        // if we don't have an explicit alignment ourselves, use that of the
-        // column in horizontal direction and default vertical alignment
-        align = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
-    }
-
     dc->DrawLabel(ellipsizedText.empty() ? text : ellipsizedText,
-                  rectText, align);
+                  rectText, GetEffectiveAlignment());
 }
 
 //-----------------------------------------------------------------------------
@@ -1429,30 +1420,30 @@ void wxDataViewCtrlBase::StartEditor(const wxDataViewItem& item, unsigned int co
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_CACHE_HINT, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_CACHE_HINT, wxDataViewEvent );
 
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent );
 
 
 
@@ -1738,12 +1729,17 @@ unsigned int wxDataViewListStore::GetColumnCount() const
     return m_cols.GetCount();
 }
 
+unsigned int wxDataViewListStore::GetItemCount() const
+{
+    return m_data.size();
+}
+
 wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const
 {
     return m_cols[pos];
 }
 
-void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxClientData *data )
+void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data )
 {
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
@@ -1752,7 +1748,7 @@ void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxClien
     RowAppended();
 }
 
-void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxClientData *data )
+void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data )
 {
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
@@ -1762,7 +1758,7 @@ void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxClie
 }
 
 void wxDataViewListStore::InsertItem(  unsigned int row, const wxVector<wxVariant> &values,
-                                       wxClientData *data )
+                                       wxUIntPtr data )
 {
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
@@ -1794,6 +1790,27 @@ void wxDataViewListStore::DeleteAllItems()
     Reset( 0 );
 }
 
+void wxDataViewListStore::ClearColumns()
+{
+    m_cols.clear();
+}
+
+void wxDataViewListStore::SetItemData( const wxDataViewItem& item, wxUIntPtr data )
+{
+    wxDataViewListStoreLine* line = m_data[GetRow(item)];
+    if (!line) return;
+
+    line->SetData( data );
+}
+
+wxUIntPtr wxDataViewListStore::GetItemData( const wxDataViewItem& item ) const
+{
+    wxDataViewListStoreLine* line = m_data[GetRow(item)];
+    if (!line) return 0;
+
+    return line->GetData();
+}
+
 void wxDataViewListStore::GetValueByRow( wxVariant &value, unsigned int row, unsigned int col ) const
 {
     wxDataViewListStoreLine *line = m_data[row];
@@ -1881,6 +1898,12 @@ bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *col )
     return AppendColumn( col, "string" );
 }
 
+bool wxDataViewListCtrl::ClearColumns()
+{
+    GetStore()->ClearColumns();
+    return wxDataViewCtrl::ClearColumns();
+}
+
 wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label,
           wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
@@ -2196,10 +2219,7 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item )
     wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item );
     if (!parent_node) return;
 
-    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
-    if (!node) return;
-
-    parent_node->GetChildren().DeleteObject( node );
+    parent_node->GetChildren().DeleteObject( FindNode(item) );
 }
 
 void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
diff --git a/Externals/wxWidgets3/src/common/datetime.cpp b/Externals/wxWidgets3/src/common/datetime.cpp
index e131abdbc8..669d0a3269 100644
--- a/Externals/wxWidgets3/src/common/datetime.cpp
+++ b/Externals/wxWidgets3/src/common/datetime.cpp
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.05.99
-// RCS-ID:      $Id: datetime.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              parts of code taken from sndcal library by Scott E. Lee:
 //
@@ -1130,10 +1129,37 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
 
         return *this;
     }
-    else
+
+    // mktime() only adjusts tm_wday, tm_yday and tm_isdst fields normally, if
+    // it changed anything else, it must have performed the DST adjustment. But
+    // the trouble with this is that different implementations do it
+    // differently, e.g. GNU libc moves the time forward if the specified time
+    // is invalid in the local time zone, while MSVC CRT moves it backwards
+    // which is especially pernicious as it can change the date if the DST
+    // starts at midnight, as it does in some time zones (see #15419), and this
+    // is completely unexpected for the code working with dates only.
+    //
+    // So standardize on moving the time forwards to have consistent behaviour
+    // under all platforms and to avoid the problem above.
+    if ( tm2.tm_hour != tm.tm_hour )
     {
-        return Set(timet);
+        tm2 = tm;
+        tm2.tm_hour++;
+        if ( tm2.tm_hour == 24 )
+        {
+            // This shouldn't normally happen as the DST never starts at 23:00
+            // but if it does, we have a problem as we need to adjust the day
+            // as well. However we stop here, i.e. we don't adjust the month
+            // (or the year) because mktime() is supposed to take care of this
+            // for us.
+            tm2.tm_hour = 0;
+            tm2.tm_mday++;
+        }
+
+        timet = mktime(&tm2);
     }
+
+    return Set(timet);
 }
 
 wxDateTime& wxDateTime::Set(wxDateTime_t hour,
@@ -1602,6 +1628,56 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
     return *this;
 }
 
+wxDateSpan wxDateTime::DiffAsDateSpan(const wxDateTime& dt) const
+{
+    wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime"));
+
+    // If dt is larger than this, calculations below needs to be inverted.
+    int inv = 1;
+    if ( dt > *this )
+        inv = -1;
+
+    int y = GetYear() - dt.GetYear();
+    int m = GetMonth() - dt.GetMonth();
+    int d = GetDay() - dt.GetDay();
+
+    // If month diff is negative, dt is the year before, so decrease year
+    // and set month diff to its inverse, e.g. January - December should be 1,
+    // not -11.
+    if ( m * inv < 0 || (m == 0 && d * inv < 0))
+    {
+        m += inv * MONTHS_IN_YEAR;
+        y -= inv;
+    }
+
+    // Same logic for days as for months above.
+    if ( d * inv < 0 )
+    {
+        // Use number of days in month from the month which end date we're
+        // crossing. That is month before this for positive diff, and this
+        // month for negative diff.
+        // If we're on january and using previous month, we get december
+        // previous year, but don't care, december has same amount of days
+        // every year.
+        wxDateTime::Month monthfordays = GetMonth();
+        if (inv > 0 && monthfordays == wxDateTime::Jan)
+            monthfordays = wxDateTime::Dec;
+        else if (inv > 0)
+            monthfordays = static_cast<wxDateTime::Month>(monthfordays - 1);
+
+        d += inv * wxDateTime::GetNumberOfDays(monthfordays, GetYear());
+        m -= inv;
+    }
+
+    int w =  d / DAYS_PER_WEEK;
+
+    // Remove weeks from d, since wxDateSpan only keep days as the ones
+    // not in complete weeks
+    d -= w * DAYS_PER_WEEK;
+
+    return wxDateSpan(y, m, w, d);
+}
+
 // ----------------------------------------------------------------------------
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
@@ -1871,7 +1947,6 @@ wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
     {
         // adjust the weekdays to non-US style.
         wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
-        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
 
         // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
         //
@@ -1887,22 +1962,24 @@ wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
         //
 
         // if Jan 1 is Thursday or less, it is in the first week of this year
-        if ( wdYearStart < 4 )
-        {
-            // count the number of entire weeks between Jan 1 and this date
-            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+        int dayCountFix = wdYearStart < 4 ? 6 : -1;
 
-            // be careful to check for overflow in the next year
-            if ( week == 53 && tm.mday - wdTarget > 28 )
-                    week = 1;
-        }
-        else // Jan 1 is in the last week of the previous year
+        // count the number of week
+        week = (nDayInYear + wdYearStart + dayCountFix) / DAYS_PER_WEEK;
+
+        // check if we happen to be at the last week of previous year:
+        if ( week == 0 )
         {
-            // check if we happen to be at the last week of previous year:
-            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
-                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
-            else
-                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+            week = wxDateTime(31, Dec, GetYear() - 1).GetWeekOfYear();
+        }
+        else if ( week == 53 )
+        {
+            int wdYearEnd = (wdYearStart + 364 + IsLeapYear(GetYear()))
+                                % DAYS_PER_WEEK;
+
+            // Week 53 only if last day of year is Thursday or later.
+            if ( wdYearEnd < 3 )
+                week = 1;
         }
     }
 
diff --git a/Externals/wxWidgets3/src/common/datetimefmt.cpp b/Externals/wxWidgets3/src/common/datetimefmt.cpp
index a96f09e2ce..4855025050 100644
--- a/Externals/wxWidgets3/src/common/datetimefmt.cpp
+++ b/Externals/wxWidgets3/src/common/datetimefmt.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.05.99
-// RCS-ID:      $Id: datetimefmt.cpp 70847 2012-03-09 01:09:25Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              parts of code taken from sndcal library by Scott E. Lee:
 //
@@ -291,8 +290,14 @@ ParseFormatAt(wxString::const_iterator& p,
     const wxString str(p, end);
     wxString::const_iterator endParse;
     wxDateTime dt;
-    if ( dt.ParseFormat(str, fmt, &endParse) ||
-            (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, &endParse)) )
+
+    // Use a default date outside of the DST period to avoid problems with
+    // parsing the time differently depending on the today's date (which is used
+    // as the fall back date if none is explicitly specified).
+    static const wxDateTime dtDef(1, wxDateTime::Jan, 2012);
+
+    if ( dt.ParseFormat(str, fmt, dtDef, &endParse) ||
+            (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, dtDef, &endParse)) )
     {
         p += endParse - str.begin();
     }
@@ -508,7 +513,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
                         // (indirectly) set the year correctly
                         while ( (nLostWeekDays % 7) != 0 )
                         {
-                            nLostWeekDays += year++ % 4 ? 1 : 2;
+                            nLostWeekDays += (year++ % 4) ? 1 : 2;
                         }
 
                         // finally move the year below 2000 so that the 2-digit
@@ -649,6 +654,18 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
                 case wxT('z'):       // time zone as [-+]HHMM
                     {
                         int ofs = tz.GetOffset();
+
+                        // The time zone offset does not include the DST, but
+                        // we do need to take it into account when showing the
+                        // time in the local time zone to the user.
+                        if ( ofs == -wxGetTimeZone() && IsDST() == 1 )
+                        {
+                            // FIXME: As elsewhere in wxDateTime, we assume
+                            // that the DST is always 1 hour, but this is not
+                            // true in general.
+                            ofs += 3600;
+                        }
+
                         if ( ofs < 0 )
                         {
                             res += '-';
@@ -929,6 +946,26 @@ wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
     return true;
 }
 
+const char* wxDateTime::ParseRfc822Date(const char* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseRfc822Date(dateStr, &end) )
+        return NULL;
+
+    return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseRfc822Date(const wchar_t* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseRfc822Date(dateStr, &end) )
+        return NULL;
+
+    return date + (end - dateStr.begin());
+}
+
 bool
 wxDateTime::ParseFormat(const wxString& date,
                         const wxString& format,
@@ -1563,6 +1600,32 @@ wxDateTime::ParseFormat(const wxString& date,
     return true;
 }
 
+const char*
+wxDateTime::ParseFormat(const char* date,
+                        const wxString& format,
+                        const wxDateTime& dateDef)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseFormat(dateStr, format, dateDef, &end) )
+        return NULL;
+
+    return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t*
+wxDateTime::ParseFormat(const wchar_t* date,
+                        const wxString& format,
+                        const wxDateTime& dateDef)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseFormat(dateStr, format, dateDef, &end) )
+        return NULL;
+
+    return date + (end - dateStr.begin());
+}
+
 bool
 wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
 {
@@ -1616,6 +1679,26 @@ wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
     return true;
 }
 
+const char* wxDateTime::ParseDateTime(const char* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseDateTime(dateStr, &end) )
+        return NULL;
+
+    return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseDateTime(const wchar_t* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseDateTime(dateStr, &end) )
+        return NULL;
+
+    return date + (end - dateStr.begin());
+}
+
 bool
 wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
 {
@@ -1653,12 +1736,12 @@ wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
         if ( len > lenRest )
             continue;
 
-        const wxString::const_iterator pEnd = p + len;
-        if ( wxString(p, pEnd).CmpNoCase(dateStr) == 0 )
+        const wxString::const_iterator pEndStr = p + len;
+        if ( wxString(p, pEndStr).CmpNoCase(dateStr) == 0 )
         {
             // nothing can follow this, so stop here
 
-            p = pEnd;
+            p = pEndStr;
 
             int dayDiffFromToday = literalDates[n].dayDiffFromToday;
             *this = Today();
@@ -1667,7 +1750,7 @@ wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
                 *this += wxDateSpan::Days(dayDiffFromToday);
             }
 
-            *end = pEnd;
+            *end = pEndStr;
 
             return true;
         }
@@ -1973,6 +2056,26 @@ wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
     return true;
 }
 
+const char* wxDateTime::ParseDate(const char* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseDate(dateStr, &end) )
+        return NULL;
+
+    return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseDate(const wchar_t* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseDate(dateStr, &end) )
+        return NULL;
+
+    return date + (end - dateStr.begin());
+}
+
 bool
 wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
 {
@@ -2013,6 +2116,8 @@ wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
         "%H:%M:%S",     // could be the same or 24 hour one so try it too
         "%I:%M %p",     // 12hour with AM/PM but without seconds
         "%H:%M",        // and a possibly 24 hour version without seconds
+        "%I %p",        // just hour with AM/AM
+        "%H",           // just hour in 24 hour version
         "%X",           // possibly something from above or maybe something
                         // completely different -- try it last
 
@@ -2028,6 +2133,26 @@ wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
     return false;
 }
 
+const char* wxDateTime::ParseTime(const char* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseTime(dateStr, &end) )
+        return NULL;
+
+    return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseTime(const wchar_t* date)
+{
+    wxString::const_iterator end;
+    wxString dateStr(date);
+    if ( !ParseTime(dateStr, &end) )
+        return NULL;
+
+    return date + (end - dateStr.begin());
+}
+
 // ----------------------------------------------------------------------------
 // Workdays and holidays support
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/datstrm.cpp b/Externals/wxWidgets3/src/common/datstrm.cpp
index 9b271ce7ee..904e692e51 100644
--- a/Externals/wxWidgets3/src/common/datstrm.cpp
+++ b/Externals/wxWidgets3/src/common/datstrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Mickael Gilabert
 // Created:     28/06/98
-// RCS-ID:      $Id: datstrm.cpp 61764 2009-08-26 20:44:01Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,34 +23,69 @@
     #include "wx/math.h"
 #endif //WX_PRECOMP
 
-// ---------------------------------------------------------------------------
-// wxDataInputStream
-// ---------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
-  : m_input(&s), m_be_order(false), m_conv(conv.Clone())
-#else
-wxDataInputStream::wxDataInputStream(wxInputStream& s)
-  : m_input(&s), m_be_order(false)
-#endif
+namespace
 {
+
+// helper unions used to swap bytes of floats and doubles
+union Float32Data
+{
+    wxFloat32 f;
+    wxUint32 i;
+};
+
+union Float64Data
+{
+    wxFloat64 f;
+    wxUint32 i[2];
+};
+
+} // anonymous namespace
+
+// ----------------------------------------------------------------------------
+// wxDataStreamBase
+// ----------------------------------------------------------------------------
+
+wxDataStreamBase::wxDataStreamBase(const wxMBConv& conv)
+#if wxUSE_UNICODE
+    : m_conv(conv.Clone())
+#endif // wxUSE_UNICODE
+{
+    // It is unused in non-Unicode build, so suppress a warning there.
+    wxUnusedVar(conv);
+
+    m_be_order = false;
+
+    // For compatibility with the existing data files, we use extended
+    // precision if it is available, i.e. if wxUSE_APPLE_IEEE is on.
+#if wxUSE_APPLE_IEEE
+    m_useExtendedPrecision = true;
+#endif // wxUSE_APPLE_IEEE
 }
 
-wxDataInputStream::~wxDataInputStream()
+#if wxUSE_UNICODE
+void wxDataStreamBase::SetConv( const wxMBConv &conv )
+{
+    delete m_conv;
+    m_conv = conv.Clone();
+}
+#endif
+
+wxDataStreamBase::~wxDataStreamBase()
 {
 #if wxUSE_UNICODE
     delete m_conv;
 #endif // wxUSE_UNICODE
 }
 
-#if wxUSE_UNICODE
-void wxDataInputStream::SetConv( const wxMBConv &conv )
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
+
+wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
+  : wxDataStreamBase(conv),
+    m_input(&s)
 {
-    delete m_conv;
-    m_conv = conv.Clone();
 }
-#endif
 
 #if wxHAS_INT64
 wxUint64 wxDataInputStream::Read64()
@@ -97,13 +131,48 @@ wxUint8 wxDataInputStream::Read8()
 double wxDataInputStream::ReadDouble()
 {
 #if wxUSE_APPLE_IEEE
-  char buf[10];
+    if ( m_useExtendedPrecision )
+    {
+        char buf[10];
 
-  m_input->Read(buf, 10);
-  return wxConvertFromIeeeExtended((const wxInt8 *)buf);
-#else
-  return 0.0;
-#endif
+        m_input->Read(buf, 10);
+        return wxConvertFromIeeeExtended((const wxInt8 *)buf);
+    }
+    else
+#endif // wxUSE_APPLE_IEEE
+    {
+        Float64Data floatData;
+
+        if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) )
+        {
+            floatData.i[0] = Read32();
+            floatData.i[1] = Read32();
+        }
+        else
+        {
+            floatData.i[1] = Read32();
+            floatData.i[0] = Read32();
+        }
+
+        return static_cast<double>(floatData.f);
+    }
+}
+
+float wxDataInputStream::ReadFloat()
+{
+#if wxUSE_APPLE_IEEE
+    if ( m_useExtendedPrecision )
+    {
+        return (float)ReadDouble();
+    }
+    else
+#endif // wxUSE_APPLE_IEEE
+    {
+        Float32Data floatData;
+
+        floatData.i = Read32();
+        return static_cast<float>(floatData.f);
+    }
 }
 
 wxString wxDataInputStream::ReadString()
@@ -114,11 +183,10 @@ wxString wxDataInputStream::ReadString()
     if ( len > 0 )
     {
 #if wxUSE_UNICODE
-        wxCharBuffer tmp(len + 1);
+        wxCharBuffer tmp(len);
         if ( tmp )
         {
             m_input->Read(tmp.data(), len);
-            tmp.data()[len] = '\0';
             ret = m_conv->cMB2WX(tmp.data());
         }
 #else
@@ -378,6 +446,14 @@ void wxDataInputStream::ReadDouble(double *buffer, size_t size)
   }
 }
 
+void wxDataInputStream::ReadFloat(float *buffer, size_t size)
+{
+  for (wxUint32 i=0; i<size; i++)
+  {
+    *(buffer++) = ReadFloat();
+  }
+}
+
 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
 {
   s = ReadString();
@@ -448,15 +524,15 @@ wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i)
 }
 #endif // wxLongLong_t
 
-wxDataInputStream& wxDataInputStream::operator>>(double& i)
+wxDataInputStream& wxDataInputStream::operator>>(double& d)
 {
-  i = ReadDouble();
+  d = ReadDouble();
   return *this;
 }
 
 wxDataInputStream& wxDataInputStream::operator>>(float& f)
 {
-  f = (float)ReadDouble();
+  f = ReadFloat();
   return *this;
 }
 
@@ -464,31 +540,12 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f)
 // wxDataOutputStream
 // ---------------------------------------------------------------------------
 
-#if wxUSE_UNICODE
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv)
-  : m_output(&s), m_be_order(false), m_conv(conv.Clone())
-#else
-wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
-  : m_output(&s), m_be_order(false)
-#endif
+  : wxDataStreamBase(conv),
+    m_output(&s)
 {
 }
 
-wxDataOutputStream::~wxDataOutputStream()
-{
-#if wxUSE_UNICODE
-    delete m_conv;
-#endif // wxUSE_UNICODE
-}
-
-#if wxUSE_UNICODE
-void wxDataOutputStream::SetConv( const wxMBConv &conv )
-{
-    delete m_conv;
-    m_conv = conv.Clone();
-}
-#endif
-
 #if wxHAS_INT64
 void wxDataOutputStream::Write64(wxUint64 i)
 {
@@ -544,22 +601,49 @@ void wxDataOutputStream::WriteString(const wxString& string)
 
 void wxDataOutputStream::WriteDouble(double d)
 {
-  char buf[10];
-
 #if wxUSE_APPLE_IEEE
-  wxConvertToIeeeExtended(d, (wxInt8 *)buf);
-#else
-  wxUnusedVar(d);
-#if !defined(__VMS__) && !defined(__GNUG__)
-#ifdef _MSC_VER
-# pragma message("wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!")
-#else
-# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
-#endif
-#endif
-   buf[0] = '\0';
-#endif
-  m_output->Write(buf, 10);
+    if ( m_useExtendedPrecision )
+    {
+        char buf[10];
+
+        wxConvertToIeeeExtended(d, (wxInt8 *)buf);
+        m_output->Write(buf, 10);
+    }
+    else
+#endif // wxUSE_APPLE_IEEE
+    {
+        Float64Data floatData;
+
+        floatData.f = (wxFloat64)d;
+
+        if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) )
+        {
+            Write32(floatData.i[0]);
+            Write32(floatData.i[1]);
+        }
+        else
+        {
+            Write32(floatData.i[1]);
+            Write32(floatData.i[0]);
+        }
+    }
+}
+
+void wxDataOutputStream::WriteFloat(float f)
+{
+#if wxUSE_APPLE_IEEE
+    if ( m_useExtendedPrecision )
+    {
+        WriteDouble((double)f);
+    }
+    else
+#endif // wxUSE_APPLE_IEEE
+    {
+        Float32Data floatData;
+
+        floatData.f = (wxFloat32)f;
+        Write32(floatData.i);
+    }
 }
 
 #if wxHAS_INT64
@@ -673,6 +757,14 @@ void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
   }
 }
 
+void wxDataOutputStream::WriteFloat(const float *buffer, size_t size)
+{
+  for (wxUint32 i=0; i<size; i++)
+  {
+    WriteFloat(*(buffer++));
+  }
+}
+
 wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);
@@ -743,15 +835,15 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxLongLong &i)
 }
 #endif // wxLongLong_t
 
-wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+wxDataOutputStream& wxDataOutputStream::operator<<(double d)
 {
-  WriteDouble(f);
+  WriteDouble(d);
   return *this;
 }
 
 wxDataOutputStream& wxDataOutputStream::operator<<(float f)
 {
-  WriteDouble((double)f);
+  WriteFloat(f);
   return *this;
 }
 
diff --git a/Externals/wxWidgets3/src/common/dcbase.cpp b/Externals/wxWidgets3/src/common/dcbase.cpp
index 5394c8af17..0823b27e22 100644
--- a/Externals/wxWidgets3/src/common/dcbase.cpp
+++ b/Externals/wxWidgets3/src/common/dcbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05/25/99
-// RCS-ID:      $Id: dcbase.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,13 +37,17 @@
     #include "wx/window.h"
 #endif
 
+#include "wx/private/textmeasure.h"
+
 #ifdef __WXMSW__
     #include "wx/msw/dcclient.h"
     #include "wx/msw/dcmemory.h"
     #include "wx/msw/dcscreen.h"
 #endif
 
-#ifdef __WXGTK20__
+#ifdef __WXGTK3__
+    #include "wx/gtk/dc.h"
+#elif defined __WXGTK20__
     #include "wx/gtk/dcclient.h"
     #include "wx/gtk/dcmemory.h"
     #include "wx/gtk/dcscreen.h"
@@ -334,6 +337,7 @@ wxDCImpl::wxDCImpl( wxDC *owner )
         , m_userScaleX(1.0), m_userScaleY(1.0)
         , m_scaleX(1.0), m_scaleY(1.0)
         , m_signX(1), m_signY(1)
+        , m_contentScaleFactor(1)
         , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
         , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0)
         , m_logicalFunction(wxCOPY)
@@ -365,6 +369,30 @@ wxDCImpl::~wxDCImpl()
 {
 }
 
+// ----------------------------------------------------------------------------
+// clipping
+// ----------------------------------------------------------------------------
+
+void wxDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+{
+    if ( m_clipping )
+    {
+        m_clipX1 = wxMax( m_clipX1, x );
+        m_clipY1 = wxMax( m_clipY1, y );
+        m_clipX2 = wxMin( m_clipX2, (x + w) );
+        m_clipY2 = wxMin( m_clipY2, (y + h) );
+    }
+    else
+    {
+        m_clipping = true;
+
+        m_clipX1 = x;
+        m_clipY1 = y;
+        m_clipX2 = x + w;
+        m_clipY2 = y + h;
+    }
+}
+
 // ----------------------------------------------------------------------------
 // coordinate conversions and transforms
 // ----------------------------------------------------------------------------
@@ -485,78 +513,10 @@ void wxDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     ComputeScaleAndOrigin();
 }
 
-
-// Each element of the widths array will be the width of the string up to and
-// including the corresponding character in text.  This is the generic
-// implementation, the port-specific classes should do this with native APIs
-// if available and if faster.  Note: pango_layout_index_to_pos is much slower
-// than calling GetTextExtent!!
-
-#define FWC_SIZE 256
-
-class FontWidthCache
-{
-public:
-    FontWidthCache() : m_scaleX(1), m_widths(NULL) { }
-    ~FontWidthCache() { delete []m_widths; }
-
-    void Reset()
-    {
-        if (!m_widths)
-            m_widths = new int[FWC_SIZE];
-
-        memset(m_widths, 0, sizeof(int)*FWC_SIZE);
-    }
-
-    wxFont m_font;
-    double m_scaleX;
-    int *m_widths;
-};
-
-static FontWidthCache s_fontWidthCache;
-
 bool wxDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 {
-    int totalWidth = 0;
-
-    const size_t len = text.length();
-    widths.Empty();
-    widths.Add(0, len);
-
-    // reset the cache if font or horizontal scale have changed
-    if ( !s_fontWidthCache.m_widths ||
-         !wxIsSameDouble(s_fontWidthCache.m_scaleX, m_scaleX) ||
-         (s_fontWidthCache.m_font != GetFont()) )
-    {
-        s_fontWidthCache.Reset();
-        s_fontWidthCache.m_font = GetFont();
-        s_fontWidthCache.m_scaleX = m_scaleX;
-    }
-
-    // Calculate the position of each character based on the widths of
-    // the previous characters
-    int w, h;
-    for ( size_t i = 0; i < len; i++ )
-    {
-        const wxChar c = text[i];
-        unsigned int c_int = (unsigned int)c;
-
-        if ((c_int < FWC_SIZE) && (s_fontWidthCache.m_widths[c_int] != 0))
-        {
-            w = s_fontWidthCache.m_widths[c_int];
-        }
-        else
-        {
-            DoGetTextExtent(c, &w, &h);
-            if (c_int < FWC_SIZE)
-                s_fontWidthCache.m_widths[c_int] = w;
-        }
-
-        totalWidth += w;
-        widths[i] = totalWidth;
-    }
-
-    return true;
+    wxTextMeasure tm(GetOwner(), &m_font);
+    return tm.GetPartialTextExtents(text, widths, m_scaleX);
 }
 
 void wxDCImpl::GetMultiLineTextExtent(const wxString& text,
@@ -565,64 +525,8 @@ void wxDCImpl::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *h,
                                       const wxFont *font) const
 {
-    wxCoord widthTextMax = 0, widthLine,
-            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-
-    wxString curLine;
-    for ( wxString::const_iterator pc = text.begin(); ; ++pc )
-    {
-        if ( pc == text.end() || *pc == wxT('\n') )
-        {
-            if ( curLine.empty() )
-            {
-                // we can't use GetTextExtent - it will return 0 for both width
-                // and height and an empty line should count in height
-                // calculation
-
-                // assume that this line has the same height as the previous
-                // one
-                if ( !heightLineDefault )
-                    heightLineDefault = heightLine;
-
-                if ( !heightLineDefault )
-                {
-                    // but we don't know it yet - choose something reasonable
-                    DoGetTextExtent(wxT("W"), NULL, &heightLineDefault,
-                                  NULL, NULL, font);
-                }
-
-                heightTextTotal += heightLineDefault;
-            }
-            else
-            {
-                DoGetTextExtent(curLine, &widthLine, &heightLine,
-                              NULL, NULL, font);
-                if ( widthLine > widthTextMax )
-                    widthTextMax = widthLine;
-                heightTextTotal += heightLine;
-            }
-
-            if ( pc == text.end() )
-            {
-               break;
-            }
-            else // '\n'
-            {
-               curLine.clear();
-            }
-        }
-        else
-        {
-            curLine += *pc;
-        }
-    }
-
-    if ( x )
-        *x = widthTextMax;
-    if ( y )
-        *y = heightTextTotal;
-    if ( h )
-        *h = heightLine;
+    wxTextMeasure tm(GetOwner(), font && font->IsOk() ? font : &m_font);
+    tm.GetMultiLineTextExtent(text, x, y, h);
 }
 
 void wxDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
@@ -718,8 +622,8 @@ void wxDCImpl::DrawPolygon(const wxPointList *list,
 
 void
 wxDCImpl::DoDrawPolyPolygon(int n,
-                            int count[],
-                            wxPoint points[],
+                            const int count[],
+                            const wxPoint points[],
                             wxCoord xoffset, wxCoord yoffset,
                             wxPolygonFillMode fillStyle)
 {
@@ -769,11 +673,11 @@ void wxDCImpl::DrawSpline(wxCoord x1, wxCoord y1,
     DrawSpline(WXSIZEOF(points), points);
 }
 
-void wxDCImpl::DrawSpline(int n, wxPoint points[])
+void wxDCImpl::DrawSpline(int n, const wxPoint points[])
 {
     wxPointList list;
     for ( int i = 0; i < n; i++ )
-        list.Append(&points[i]);
+        list.Append(const_cast<wxPoint*>(&points[i]));
 
     DrawSpline(&list);
 }
@@ -895,7 +799,7 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
-    wxPoint *p;
+    const wxPoint *p;
     double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
     double           x1, y1, x2, y2;
 
@@ -904,7 +808,7 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
         // empty list
         return;
 
-    p = (wxPoint *)node->GetData();
+    p = node->GetData();
 
     x1 = p->x;
     y1 = p->y;
@@ -1292,7 +1196,7 @@ void wxDC::DrawLabel(const wxString& text,
         {
             if ( pc - text.begin() == indexAccel )
             {
-                // remeber to draw underscore here
+                // remember to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);
                 curLine += *pc;
                 GetTextExtent(curLine, &endUnderscore, NULL);
diff --git a/Externals/wxWidgets3/src/common/dcbufcmn.cpp b/Externals/wxWidgets3/src/common/dcbufcmn.cpp
index 8b230ad299..3bc2e275ed 100644
--- a/Externals/wxWidgets3/src/common/dcbufcmn.cpp
+++ b/Externals/wxWidgets3/src/common/dcbufcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Ron Lee, Jaakko Salli
 // Modified by:
 // Created:     Sep-20-2006
-// RCS-ID:      $Id: dcbufcmn.cpp 67659 2011-05-01 15:47:46Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -114,7 +113,10 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 
         m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
         m_style |= wxBUFFER_USES_SHARED_BUFFER;
+        m_area.Set(w,h);
     }
+    else
+        m_area = m_buffer->GetSize();
 
     SelectObject(*m_buffer);
 
@@ -138,21 +140,25 @@ void wxBufferedDC::UnMask()
     if ( m_style & wxBUFFER_CLIENT_AREA )
         GetDeviceOrigin(&x, &y);
 
-    // avoid blitting too much: if we were created for a bigger bitmap (and
-    // reused for a smaller one later) we should only blit the real bitmap area
-    // and not the full allocated back buffer
-    int widthDC,
-        heightDC;
+    // It's possible that the buffer may be bigger than the area that needs to
+    // be drawn (the client size of the window is smaller than the bitmap, or
+    // a shared bitmap has been reused for a smaller area, etc.) so avoid
+    // blitting too much if possible, but only use the real DC size if the
+    // wxBUFFER_VIRTUAL_AREA style is not set.
+    int width = m_area.GetWidth(),
+        height = m_area.GetHeight();
 
-    m_dc->GetSize(&widthDC, &heightDC);
+    if (!(m_style & wxBUFFER_VIRTUAL_AREA))
+    {
+        int widthDC,
+            heightDC;
+        m_dc->GetSize(&widthDC, &heightDC);
+        width = wxMin(width, widthDC);
+        height = wxMin(height, heightDC);
+    }
 
-    int widthBuf = m_buffer->GetWidth(),
-        heightBuf = m_buffer->GetHeight();
-
-    m_dc->Blit(0, 0,
-               wxMin(widthDC, widthBuf), wxMin(heightDC, heightBuf),
-               this,
-               -x, -y);
+    const wxPoint origin = GetLogicalOrigin();
+    m_dc->Blit(-origin.x, -origin.y, width, height, this, -x, -y);
     m_dc = NULL;
 
     if ( m_style & wxBUFFER_USES_SHARED_BUFFER )
diff --git a/Externals/wxWidgets3/src/common/dcgraph.cpp b/Externals/wxWidgets3/src/common/dcgraph.cpp
index 633c482240..a44ac2cb91 100644
--- a/Externals/wxWidgets3/src/common/dcgraph.cpp
+++ b/Externals/wxWidgets3/src/common/dcgraph.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
-// RCS-ID:      $Id: dcgraph.cpp 70844 2012-03-08 17:06:06Z PC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,24 +17,12 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
-#include "wx/graphics.h"
 #include "wx/dcgraph.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
-    #include "wx/bitmap.h"
+    #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
-    #include "wx/region.h"
-#endif
-
-#include "wx/dcclient.h"
-
-#ifdef __WXOSX_OR_COCOA__
-#ifdef __WXOSX_IPHONE__
-    #include <CoreGraphics/CoreGraphics.h>
-#else
-    #include <ApplicationServices/ApplicationServices.h>
-#endif
 #endif
 
 //-----------------------------------------------------------------------------
@@ -155,7 +142,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl)
 wxGCDCImpl::wxGCDCImpl( wxDC *owner ) :
    wxDCImpl( owner )
 {
-    Init();
+    Init(wxGraphicsContext::Create());
 }
 
 void wxGCDCImpl::SetGraphicsContext( wxGraphicsContext* ctx )
@@ -177,26 +164,21 @@ void wxGCDCImpl::SetGraphicsContext( wxGraphicsContext* ctx )
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ) :
    wxDCImpl( owner )
 {
-    Init();
-    SetGraphicsContext( wxGraphicsContext::Create(dc) );
+    Init(wxGraphicsContext::Create(dc));
     m_window = dc.GetWindow();
 }
 
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
    wxDCImpl( owner )
 {
-    Init();
-    wxGraphicsContext* context;
-    context = wxGraphicsContext::Create(dc);
-    SetGraphicsContext( context );
+    Init(wxGraphicsContext::Create(dc));
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
 wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
    wxDCImpl( owner )
 {
-    Init();
-    SetGraphicsContext( wxGraphicsContext::Create(dc) );
+    Init(wxGraphicsContext::Create(dc));
 }
 #endif
 
@@ -204,12 +186,18 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
 wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc)
    : wxDCImpl(owner)
 {
-    Init();
-    SetGraphicsContext(wxGraphicsContext::Create(dc));
+    Init(wxGraphicsContext::Create(dc));
 }
 #endif
 
-void wxGCDCImpl::Init()
+wxGCDCImpl::wxGCDCImpl(wxDC* owner, int)
+   : wxDCImpl(owner)
+{
+    // derived class will set a context
+    Init(NULL);
+}
+
+void wxGCDCImpl::Init(wxGraphicsContext* ctx)
 {
     m_ok = false;
     m_colour = true;
@@ -220,11 +208,13 @@ void wxGCDCImpl::Init()
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
 
-    m_graphicContext = wxGraphicsContext::Create();
+    m_graphicContext = NULL;
+    if (ctx)
+        SetGraphicsContext(ctx);
+
     m_logicalFunctionSupported = true;
 }
 
-
 wxGCDCImpl::~wxGCDCImpl()
 {
     delete m_graphicContext;
@@ -236,8 +226,8 @@ void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y,
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
     wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
 
-    int w = bmp.GetWidth();
-    int h = bmp.GetHeight();
+    int w = bmp.GetScaledWidth();
+    int h = bmp.GetScaledHeight();
     if ( bmp.GetDepth() == 1 )
     {
         m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
@@ -298,22 +288,8 @@ void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
 
     m_graphicContext->Clip( x, y, w, h );
-    if ( m_clipping )
-    {
-        m_clipX1 = wxMax( m_clipX1, x );
-        m_clipY1 = wxMax( m_clipY1, y );
-        m_clipX2 = wxMin( m_clipX2, (x + w) );
-        m_clipY2 = wxMin( m_clipY2, (y + h) );
-    }
-    else
-    {
-        m_clipping = true;
 
-        m_clipX1 = x;
-        m_clipY1 = y;
-        m_clipX2 = x + w;
-        m_clipY2 = y + h;
-    }
+    wxDCImpl::DoSetClippingRegion(x, y, w, h);
 }
 
 void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion &region )
@@ -385,7 +361,7 @@ void wxGCDCImpl::SetTextForeground( const wxColour &col )
     // don't set m_textForegroundColour to an invalid colour as we'd crash
     // later then (we use m_textForegroundColour.GetColor() without checking
     // in a few places)
-    if ( col.IsOk() && col != m_textForegroundColour )
+    if ( col.IsOk() )
     {
         m_textForegroundColour = col;
         m_graphicContext->SetFont( m_font, m_textForegroundColour );
@@ -399,35 +375,6 @@ void wxGCDCImpl::SetTextBackground( const wxColour &col )
     m_textBackgroundColour = col;
 }
 
-void wxGCDCImpl::SetMapMode( wxMappingMode mode )
-{
-    switch (mode)
-    {
-    case wxMM_TWIPS:
-        SetLogicalScale( twips2mm * m_mm_to_pix_x, twips2mm * m_mm_to_pix_y );
-        break;
-
-    case wxMM_POINTS:
-        SetLogicalScale( pt2mm * m_mm_to_pix_x, pt2mm * m_mm_to_pix_y );
-        break;
-
-    case wxMM_METRIC:
-        SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-        break;
-
-    case wxMM_LOMETRIC:
-        SetLogicalScale( m_mm_to_pix_x / 10.0, m_mm_to_pix_y / 10.0 );
-        break;
-
-    case wxMM_TEXT:
-    default:
-        SetLogicalScale( 1.0, 1.0 );
-        break;
-    }
-
-    ComputeScaleAndOrigin();
-}
-
 wxSize wxGCDCImpl::GetPPI() const
 {
     return wxSize(72, 72);
@@ -448,7 +395,7 @@ void wxGCDCImpl::ComputeScaleAndOrigin()
 
         // the logical origin sets the origin to have new coordinates
         m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX,
-                                   m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);
+                                   m_deviceOriginY - m_logicalOriginY * m_signY * m_scaleY);
 
         m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );
 
@@ -457,6 +404,16 @@ void wxGCDCImpl::ComputeScaleAndOrigin()
     }
 }
 
+void* wxGCDCImpl::GetHandle() const
+{
+    void* cgctx = NULL;
+    wxGraphicsContext* gc = GetGraphicsContext();
+    if (gc) {
+        cgctx = gc->GetNativeContext();
+    }
+    return cgctx;
+}
+
 void wxGCDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
 {
 
@@ -472,18 +429,12 @@ void wxGCDCImpl::SetFont( const wxFont &font )
     m_font = font;
     if ( m_graphicContext )
     {
-        wxFont f = font;
-        if ( f.IsOk() )
-            f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
-        m_graphicContext->SetFont( f, m_textForegroundColour );
+        m_graphicContext->SetFont(font, m_textForegroundColour);
     }
 }
 
 void wxGCDCImpl::SetPen( const wxPen &pen )
 {
-    if ( m_pen == pen )
-        return;
-
     m_pen = pen;
     if ( m_graphicContext )
     {
@@ -493,9 +444,6 @@ void wxGCDCImpl::SetPen( const wxPen &pen )
 
 void wxGCDCImpl::SetBrush( const wxBrush &brush )
 {
-    if (m_brush == brush)
-        return;
-
     m_brush = brush;
     if ( m_graphicContext )
     {
@@ -505,9 +453,6 @@ void wxGCDCImpl::SetBrush( const wxBrush &brush )
 
 void wxGCDCImpl::SetBackground( const wxBrush &brush )
 {
-    if (m_backgroundBrush == brush)
-        return;
-
     m_backgroundBrush = brush;
     if (!m_backgroundBrush.IsOk())
         return;
@@ -515,9 +460,6 @@ void wxGCDCImpl::SetBackground( const wxBrush &brush )
 
 void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
 {
-    if (m_logicalFunction == function)
-        return;
-
     m_logicalFunction = function;
 
     wxCompositionMode mode = TranslateRasterOp( function );
@@ -665,7 +607,7 @@ void wxGCDCImpl::DoDrawPoint( wxCoord x, wxCoord y )
     DoDrawLine( x , y , x + 1 , y + 1 );
 }
 
-void wxGCDCImpl::DoDrawLines(int n, wxPoint points[],
+void wxGCDCImpl::DoDrawLines(int n, const wxPoint points[],
                          wxCoord xoffset, wxCoord yoffset)
 {
     wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
@@ -699,7 +641,7 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
         // empty list
         return;
 
-    wxPoint *p = node->GetData();
+    const wxPoint *p = node->GetData();
 
     wxCoord x1 = p->x;
     wxCoord y1 = p->y;
@@ -743,7 +685,7 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
 }
 #endif // wxUSE_SPLINES
 
-void wxGCDCImpl::DoDrawPolygon( int n, wxPoint points[],
+void wxGCDCImpl::DoDrawPolygon( int n, const wxPoint points[],
                                 wxCoord xoffset, wxCoord yoffset,
                                 wxPolygonFillMode fillStyle )
 {
@@ -772,8 +714,8 @@ void wxGCDCImpl::DoDrawPolygon( int n, wxPoint points[],
 }
 
 void wxGCDCImpl::DoDrawPolyPolygon(int n,
-                               int count[],
-                               wxPoint points[],
+                               const int count[],
+                               const wxPoint points[],
                                wxCoord xoffset,
                                wxCoord yoffset,
                                wxPolygonFillMode fillStyle)
@@ -1089,7 +1031,10 @@ void wxGCDCImpl::Clear(void)
     m_graphicContext->SetPen( p );
     wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
     m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE);
-    DoDrawRectangle( 0, 0, 32000 , 32000 );
+    // maximum positive coordinate Cairo can handle is 2^23 - 1
+    DoDrawRectangle(
+        DeviceToLogicalX(0), DeviceToLogicalY(0),
+        DeviceToLogicalXRel(0x007fffff), DeviceToLogicalYRel(0x007fffff));
     m_graphicContext->SetCompositionMode(formerMode);
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
@@ -1147,6 +1092,7 @@ void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,
     m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
     m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
     m_graphicContext->SetPen(m_pen);
+    m_graphicContext->SetBrush(m_brush);
 }
 
 void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
@@ -1175,6 +1121,7 @@ void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
 
     m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
     m_graphicContext->SetPen(m_pen);
+    m_graphicContext->SetBrush(m_brush);
 }
 
 void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y,
diff --git a/Externals/wxWidgets3/src/common/dcsvg.cpp b/Externals/wxWidgets3/src/common/dcsvg.cpp
index 5f4514e9bb..5c55a0b935 100644
--- a/Externals/wxWidgets3/src/common/dcsvg.cpp
+++ b/Externals/wxWidgets3/src/common/dcsvg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     SVG sample
 // Author:      Chris Elliott
 // Modified by:
-// RCS-ID:      $Id: dcsvg.cpp 67883 2011-06-07 22:27:35Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -28,6 +27,8 @@
 #include "wx/wfstream.h"
 #include "wx/filename.h"
 
+#include "wx/private/markupparser.h"
+
 // ----------------------------------------------------------
 // Global utilities
 // ----------------------------------------------------------
@@ -130,6 +131,9 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, dou
 
     m_OK = true;
 
+    m_clipUniqueId = 0;
+    m_clipNestingLevel = 0;
+
     m_mm_to_pix_x = dpi/25.4;
     m_mm_to_pix_y = dpi/25.4;
 
@@ -153,21 +157,21 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, dou
         m_filename = filename;
         m_sub_images = 0;
         wxString s;
-        s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") + wxString(wxT("\n"));
+        s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>\n");
         write(s);
-        s = wxT("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\" ") + wxString(wxT("\n"));
+        s = wxT("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n");
         write(s);
-        s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\"> ") + wxString(wxT("\n"));
+        s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n");
         write(s);
-        s = wxT("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ") + wxString(wxT("\n"));
+        s = wxT("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n");
         write(s);
-        s.Printf( wxT("    width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d \"> \n"), NumStr(float(Width)/dpi*2.54), NumStr(float(Height)/dpi*2.54), Width, Height );
+        s.Printf( wxT("    width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d \">\n"), NumStr(float(Width)/dpi*2.54), NumStr(float(Height)/dpi*2.54), Width, Height );
         write(s);
-        s = wxT("<title>SVG Picture created as ") + wxFileName(filename).GetFullName() + wxT(" </title>") + wxT("\n");
+        s = wxT("<title>SVG Picture created as ") + wxFileName(filename).GetFullName() + wxT(" </title>\n");
         write(s);
-        s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ wxT("\n");
+        s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>\n");
         write(s);
-        s =  wxT("<g style=\"fill:black; stroke:black; stroke-width:1\">") + wxString(wxT("\n"));
+        s =  wxT("<g style=\"fill:black; stroke:black; stroke-width:1\">\n");
         write(s);
     }
 }
@@ -195,7 +199,7 @@ wxSize wxSVGFileDCImpl::GetPPI() const
 
 void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
     wxString s;
     s.Printf ( wxT("<path d=\"M%d %d L%d %d\" /> \n"), x1,y1,x2,y2 );
     if (m_OK)
@@ -206,7 +210,7 @@ void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2
     CalcBoundingBox(x2, y2);
 }
 
-void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )
+void wxSVGFileDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset , wxCoord yoffset )
 {
     for ( int i = 1; i < n; i++ )
     {
@@ -218,8 +222,8 @@ void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxC
 void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1)
 {
     wxString s;
-    if (m_graphics_changed) NewGraphics();
-    s = wxT("<g style = \"stroke-linecap:round;\" > ") + wxString(wxT("\n"));
+    NewGraphicsIfNeeded();
+    s = wxT("<g style = \"stroke-linecap:round;\" > \n");
     write(s);
     DoDrawLine ( x1,y1,x1,y1 );
     s = wxT("</g>");
@@ -239,7 +243,7 @@ void wxSVGFileDCImpl::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1)
 void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle)
 {
     //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
     wxString s, sTmp;
 
     // calculate bounding box
@@ -253,23 +257,26 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
     CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
 
     // wxT("bottom left") and wxT("bottom right")
-    x += (wxCoord)(h*sin(rad));
-    y += (wxCoord)(h*cos(rad));
-    CalcBoundingBox(x, y);
     CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
+    CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad)));
 
     if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
     {
         // draw background first
         // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background
 
-        sTmp.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" "), x,y+desc-h, w, h );
+        sTmp.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" "), x, y, w, h );
         s = sTmp + wxT("style=\"") + wxBrushString(m_textBackgroundColour);
         s += wxT("stroke-width:1; ") + wxPenString(m_textBackgroundColour);
         sTmp.Printf ( wxT("\" transform=\"rotate( %s %d %d )  \" />"), NumStr(-angle), x,y );
         s += sTmp + wxT("\n");
         write(s);
     }
+
+    // convert x,y to SVG text x,y (the coordinates of the text baseline)
+    x = (wxCoord)(x + (h-desc)*sin(rad));
+    y = (wxCoord)(y + (h-desc)*cos(rad));
+
     //now do the text itself
     s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
 
@@ -288,7 +295,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
     //text will be solid, unless alpha value isn't opaque in the foreground colour
     s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour);
     sTmp.Printf ( wxT("stroke-width:0;\"  transform=\"rotate( %s %d %d )  \" >"),  NumStr(-angle), x,y );
-    s += sTmp + sText + wxT("</text> ") + wxT("\n");
+    s += sTmp + wxMarkupParser::Quote(sText) + wxT("</text> ") + wxT("\n");
     if (m_OK)
     {
         write(s);
@@ -303,7 +310,7 @@ void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoo
 void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
 
 {
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
     wxString s;
 
     s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%s\" "),
@@ -316,11 +323,11 @@ void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width
     CalcBoundingBox(x + width, y + height);
 }
 
-void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[],
+void wxSVGFileDCImpl::DoDrawPolygon(int n, const wxPoint points[],
                                     wxCoord xoffset, wxCoord yoffset,
                                     wxPolygonFillMode fillStyle)
 {
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
     wxString s, sTmp;
     s = wxT("<polygon style=\"");
     if ( fillStyle == wxODDEVEN_RULE )
@@ -343,7 +350,7 @@ void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[],
 void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 {
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
 
     int rh = height /2;
     int rw = width  /2;
@@ -369,7 +376,7 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
 
     Might be better described as Pie drawing */
 
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
     wxString s;
 
     // we need the radius of the circle which has two estimates
@@ -428,7 +435,7 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,
 
     //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW
 
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
 
     wxString s;
     //radius
@@ -467,6 +474,59 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,
     }
 }
 
+void wxSVGFileDCImpl::DoSetClippingRegion( int x,  int y, int width, int height )
+{
+    wxString svg;
+
+    // End current graphics group to ensure proper xml nesting (e.g. so that
+    // graphics can be subsequently changed inside the clipping region)
+    svg << "</g>\n"
+           "<defs>\n"
+           "<clipPath id=\"clip" << m_clipNestingLevel << "\">\n"
+           "<rect id=\"cliprect" << m_clipNestingLevel << "\" "
+                "x=\"" << x << "\" "
+                "y=\"" << y << "\" "
+                "width=\"" << width << "\" "
+                "height=\"" << height << "\" "
+                "style=\"stroke: gray; fill: none;\"/>\n"
+           "</clipPath>\n"
+           "</defs>\n"
+           "<g style=\"clip-path: url(#clip" << m_clipNestingLevel << ");\">\n";
+
+    write(svg);
+
+    // Re-apply current graphics to ensure proper xml nesting
+    DoStartNewGraphics();
+
+    m_clipUniqueId++;
+    m_clipNestingLevel++;
+}
+
+void wxSVGFileDCImpl::DestroyClippingRegion()
+{
+    wxString svg;
+
+    // End current graphics element to ensure proper xml nesting (e.g. graphics
+    // might have been changed inside the clipping region)
+    svg << "</g>\n";
+
+    // Close clipping group elements
+    for ( size_t i = 0; i < m_clipUniqueId; i++ )
+    {
+        svg << "</g>";
+    }
+    svg << "\n";
+
+    write(svg);
+
+    // Re-apply current graphics (e.g. brush may have been changed inside one
+    // of the clipped regions - that change will have been lost after xml
+    // elements for the clipped region have been closed).
+    DoStartNewGraphics();
+
+    m_clipUniqueId = 0;
+}
+
 void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const
 
 {
@@ -512,7 +572,6 @@ void wxSVGFileDCImpl::SetBackgroundMode( int mode )
 
 
 void wxSVGFileDCImpl::SetBrush(const wxBrush& brush)
-
 {
     m_brush = brush;
 
@@ -529,11 +588,23 @@ void wxSVGFileDCImpl::SetPen(const wxPen& pen)
     m_graphics_changed = true;
 }
 
-void wxSVGFileDCImpl::NewGraphics()
+void wxSVGFileDCImpl::NewGraphicsIfNeeded()
 {
-    wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
+    if ( !m_graphics_changed )
+        return;
 
-    sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour(), m_brush.GetStyle() )
+    m_graphics_changed = false;
+
+    write(wxS("</g>\n"));
+
+    DoStartNewGraphics();
+}
+
+void wxSVGFileDCImpl::DoStartNewGraphics()
+{
+    wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast;
+
+    sBrush = wxS("<g style=\"") + wxBrushString ( m_brush.GetColour(), m_brush.GetStyle() )
             + wxPenString(m_pen.GetColour(), m_pen.GetStyle());
 
     switch ( m_pen.GetCap() )
@@ -565,9 +636,8 @@ void wxSVGFileDCImpl::NewGraphics()
     sLast.Printf( wxT("stroke-width:%d\" \n   transform=\"translate(%s %s) scale(%s %s)\">"),
                 m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY)  );
 
-    s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n") + sWarn;
+    s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n");
     write(s);
-    m_graphics_changed = false;
 }
 
 
@@ -614,7 +684,7 @@ void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord
 
 void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool  WXUNUSED(bTransparent) /*=0*/ )
 {
-    if (m_graphics_changed) NewGraphics();
+    NewGraphicsIfNeeded();
 
     wxString sTmp, s, sPNG;
     if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL )
diff --git a/Externals/wxWidgets3/src/common/debugrpt.cpp b/Externals/wxWidgets3/src/common/debugrpt.cpp
index 230033a476..7f3c5fba07 100644
--- a/Externals/wxWidgets3/src/common/debugrpt.cpp
+++ b/Externals/wxWidgets3/src/common/debugrpt.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-17
-// RCS-ID:      $Id: debugrpt.cpp 65101 2010-07-25 11:26:04Z FM $
 // Copyright:   (c) 2005 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,8 +32,12 @@
 #if wxUSE_DEBUGREPORT && wxUSE_XML
 
 #include "wx/debugrpt.h"
+#if wxUSE_FFILE
+    #include "wx/ffile.h"
+#elif wxUSE_FILE
+    #include "wx/file.h"
+#endif
 
-#include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/dir.h"
 #include "wx/dynlib.h"
@@ -188,16 +191,14 @@ wxDebugReport::wxDebugReport()
     // directory, so do our best to create a unique name ourselves
     //
     // of course, this doesn't protect us against malicious users...
-    wxFileName fn;
-    fn.AssignTempFileName(appname);
 #if wxUSE_DATETIME
     m_dir.Printf(wxT("%s%c%s_dbgrpt-%lu-%s"),
-                 fn.GetPath().c_str(), wxFILE_SEP_PATH, appname.c_str(),
+                 wxFileName::GetTempDir(), wxFILE_SEP_PATH, appname,
                  wxGetProcessId(),
-                 wxDateTime::Now().Format(wxT("%Y%m%dT%H%M%S")).c_str());
+                 wxDateTime::Now().Format(wxT("%Y%m%dT%H%M%S")));
 #else
     m_dir.Printf(wxT("%s%c%s_dbgrpt-%lu"),
-                 fn.GetPath().c_str(), wxFILE_SEP_PATH, appname.c_str(),
+                 wxFileName::GetTempDir(), wxFILE_SEP_PATH, appname,
                  wxGetProcessId());
 #endif
 
@@ -290,17 +291,25 @@ wxDebugReport::AddText(const wxString& filename,
                        const wxString& text,
                        const wxString& description)
 {
+#if wxUSE_FFILE || wxUSE_FILE
     wxASSERT_MSG( !wxFileName(filename).IsAbsolute(),
                   wxT("filename should be relative to debug report directory") );
 
-    wxFileName fn(GetDirectory(), filename);
-    wxFFile file(fn.GetFullPath(), wxT("w"));
-    if ( !file.IsOpened() || !file.Write(text) )
+    const wxString fullPath = wxFileName(GetDirectory(), filename).GetFullPath();
+#if wxUSE_FFILE
+    wxFFile file(fullPath, wxT("w"));
+#elif wxUSE_FILE
+    wxFile file(fullPath, wxFile::write);
+#endif
+    if ( !file.IsOpened() || !file.Write(text, wxConvAuto()) )
         return false;
 
     AddFile(filename, description);
 
     return true;
+#else // !wxUSE_FFILE && !wxUSE_FILE
+    return false;
+#endif
 }
 
 void wxDebugReport::RemoveFile(const wxString& name)
@@ -616,6 +625,8 @@ void wxDebugReportCompress::SetCompressedFileBaseName(const wxString& name)
 
 bool wxDebugReportCompress::DoProcess()
 {
+#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
+#if HAS_FILE_STREAMS
     const size_t count = GetFilesCount();
     if ( !count )
         return false;
@@ -632,7 +643,14 @@ bool wxDebugReportCompress::DoProcess()
     fn.SetExt("zip");
 
     // create the streams
-    wxFFileOutputStream os(fn.GetFullPath(), wxT("wb"));
+    const wxString ofullPath = fn.GetFullPath();
+#if wxUSE_FFILE
+    wxFFileOutputStream os(ofullPath, wxT("wb"));
+#elif wxUSE_FILE
+    wxFileOutputStream os(ofullPath);
+#endif
+    if ( !os.IsOk() )
+        return false;
     wxZipOutputStream zos(os, 9);
 
     // add all files to the ZIP one
@@ -647,8 +665,12 @@ bool wxDebugReportCompress::DoProcess()
         if ( !zos.PutNextEntry(ze) )
             return false;
 
-        const wxFileName filename(GetDirectory(), name);
-        wxFFileInputStream is(filename.GetFullPath());
+        const wxString ifullPath = wxFileName(GetDirectory(), name).GetFullPath();
+#if wxUSE_FFILE
+        wxFFileInputStream is(ifullPath);
+#elif wxUSE_FILE
+        wxFileInputStream is(ifullPath);
+#endif
         if ( !is.IsOk() || !zos.Write(is).IsOk() )
             return false;
     }
@@ -656,9 +678,12 @@ bool wxDebugReportCompress::DoProcess()
     if ( !zos.Close() )
         return false;
 
-    m_zipfile = fn.GetFullPath();
+    m_zipfile = ofullPath;
 
     return true;
+#else
+    return false;
+#endif // HAS_FILE_STREAMS
 }
 
 // ----------------------------------------------------------------------------
@@ -687,7 +712,7 @@ bool wxDebugReportUpload::DoProcess()
     wxArrayString output, errors;
     int rc = wxExecute(wxString::Format
                        (
-                            wxT("%s -F %s=@\"%s\" %s"),
+                            wxT("%s -F \"%s=@%s\" %s"),
                             m_curlCmd.c_str(),
                             m_inputField.c_str(),
                             GetCompressedFileName().c_str(),
diff --git a/Externals/wxWidgets3/src/common/descrip.mms b/Externals/wxWidgets3/src/common/descrip.mms
index 8273a164af..18ffe12cb3 100644
--- a/Externals/wxWidgets3/src/common/descrip.mms
+++ b/Externals/wxWidgets3/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 6 December 2011                                                     *
+# Date : 19 September 2013                                                   *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -224,7 +224,8 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
 		statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
 		spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
 		valnum.obj,numformatter.obj,markupparser.obj,\
-		affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj
+		affinematrix2d.obj,richtooltipcmn.obj,persist.obj,time.obj,\
+		textmeasurecmn.obj,modalhook.obj,threadinfo.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -428,7 +429,8 @@ SOURCES = \
 		bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\
 		gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\
 		colourdata.cpp,fontdata.cpp affinematrix2d.cpp\
-		richtooltipcmn.cpp persist.cpp time.cpp
+		richtooltipcmn.cpp persist.cpp time.cpp textmeasurecmn.cpp \
+		modalhook.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -588,6 +590,7 @@ platinfo.obj : platinfo.cpp
 popupcmn.obj : popupcmn.cpp
 prntbase.obj : prntbase.cpp
 process.obj : process.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/warn=disable=(UNSCOMZER) process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
 radiocmn.obj : radiocmn.cpp
@@ -713,3 +716,6 @@ affinematrix2d.obj : affinematrix2d.cpp
 richtooltipcmn.obj : richtooltipcmn.cpp
 persist.obj : persist.cpp
 time.obj : time.cpp
+textmeasurecmn.obj : textmeasurecmn.cpp
+modalhook.obj : modalhook.cpp
+threadinfo.obj : threadinfo.cpp
diff --git a/Externals/wxWidgets3/src/common/dircmn.cpp b/Externals/wxWidgets3/src/common/dircmn.cpp
index 96e44ab144..11856868f8 100644
--- a/Externals/wxWidgets3/src/common/dircmn.cpp
+++ b/Externals/wxWidgets3/src/common/dircmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.05.01
-// RCS-ID:      $Id: dircmn.cpp 66089 2010-11-10 13:52:10Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,6 +71,28 @@ bool wxDir::HasSubDirs(const wxString& spec) const
 
 #endif // !Unix
 
+// ----------------------------------------------------------------------------
+// wxDir::GetNameWithSep()
+// ----------------------------------------------------------------------------
+
+wxString wxDir::GetNameWithSep() const
+{
+    // Note that for historical reasons (i.e. because GetName() was there
+    // first) we implement this one in terms of GetName() even though it might
+    // actually make more sense to reverse this logic.
+
+    wxString name = GetName();
+    if ( !name.empty() )
+    {
+        // Notice that even though GetName() isn't supposed to return the
+        // separator, it can still be present for the root directory name.
+        if ( name.Last() != wxFILE_SEP_PATH )
+            name += wxFILE_SEP_PATH;
+    }
+
+    return name;
+}
+
 // ----------------------------------------------------------------------------
 // wxDir::Traverse()
 // ----------------------------------------------------------------------------
@@ -87,14 +108,15 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
     size_t nFiles = 0;
 
     // the name of this dir with path delimiter at the end
-    wxString prefix = GetName();
-    prefix += wxFILE_SEP_PATH;
+    const wxString prefix = GetNameWithSep();
 
     // first, recurse into subdirs
     if ( flags & wxDIR_DIRS )
     {
         wxString dirname;
-        for ( bool cont = GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) );
+        for ( bool cont = GetFirst(&dirname, wxEmptyString,
+                                   (flags & ~(wxDIR_FILES | wxDIR_DOTDOT))
+                                   | wxDIR_DIRS);
               cont;
               cont = cont && GetNext(&dirname) )
         {
diff --git a/Externals/wxWidgets3/src/common/dirctrlcmn.cpp b/Externals/wxWidgets3/src/common/dirctrlcmn.cpp
index 87e627b025..617875f1f7 100644
--- a/Externals/wxWidgets3/src/common/dirctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/dirctrlcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Harm van der Heijden, Robert Roebling, Julian Smart
 // Modified by:
 // Created:     12/12/98
-// RCS-ID:      $Id: dirctrlcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/dlgcmn.cpp b/Externals/wxWidgets3/src/common/dlgcmn.cpp
index 1fb9b03f7d..3f73371484 100644
--- a/Externals/wxWidgets3/src/common/dlgcmn.cpp
+++ b/Externals/wxWidgets3/src/common/dlgcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.06.99
-// RCS-ID:      $Id: dlgcmn.cpp 69458 2011-10-18 21:56:36Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,6 +42,7 @@
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/textwrapper.h"
+#include "wx/modalhook.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
@@ -125,7 +125,7 @@ END_EVENT_TABLE()
 wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
 bool wxDialogBase::sm_layoutAdaptation = false;
 
-void wxDialogBase::Init()
+wxDialogBase::wxDialogBase()
 {
     m_returnCode = 0;
     m_affirmativeId = wxID_OK;
@@ -422,7 +422,7 @@ bool wxDialogBase::EmulateButtonClickIfPresent(int id)
     if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
         return false;
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
+    wxCommandEvent event(wxEVT_BUTTON, id);
     event.SetEventObject(btn);
     btn->GetEventHandler()->ProcessEvent(event);
 
@@ -461,14 +461,16 @@ bool wxDialogBase::SendCloseButtonClickEvent()
 
 bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
 {
-    // for most platforms, Esc key is used to close the dialogs
-    return event.GetKeyCode() == WXK_ESCAPE &&
-                event.GetModifiers() == wxMOD_NONE;
+    // For most platforms, Esc key is used to close the dialogs.
+    //
+    // Notice that we intentionally don't check for modifiers here, Shift-Esc,
+    // Alt-Esc and so on still close the dialog, typically.
+    return event.GetKeyCode() == WXK_ESCAPE;
 }
 
 void wxDialogBase::OnCharHook(wxKeyEvent& event)
 {
-    if ( event.GetKeyCode() == WXK_ESCAPE )
+    if ( IsEscapeKey(event) )
     {
         if ( SendCloseButtonClickEvent() )
         {
@@ -515,7 +517,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
 
 void wxDialogBase::ShowWindowModal ()
 {
-    ShowModal();
+    int retval = ShowModal();
+    // wxWindowModalDialogEvent relies on GetReturnCode() returning correct
+    // code. Rather than doing it manually in all ShowModal() overrides for
+    // native dialogs (and getting accidentally broken again), set it here.
+    // The worst that can happen is that it will be set twice to the same
+    // value.
+    SetReturnCode(retval);
     SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
 }
 
diff --git a/Externals/wxWidgets3/src/common/dndcmn.cpp b/Externals/wxWidgets3/src/common/dndcmn.cpp
index 5b9cb42593..5bd9e13454 100644
--- a/Externals/wxWidgets3/src/common/dndcmn.cpp
+++ b/Externals/wxWidgets3/src/common/dndcmn.cpp
@@ -3,7 +3,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     19.10.99
-// RCS-ID:      $Id: dndcmn.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/dobjcmn.cpp b/Externals/wxWidgets3/src/common/dobjcmn.cpp
index 14f40b8ff1..5e4d43dcc0 100644
--- a/Externals/wxWidgets3/src/common/dobjcmn.cpp
+++ b/Externals/wxWidgets3/src/common/dobjcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
 // Created:     19.10.99
-// RCS-ID:      $Id: dobjcmn.cpp 70908 2012-03-15 13:49:49Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,6 +23,8 @@
     #include "wx/app.h"
 #endif
 
+#include "wx/textbuf.h"
+
 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------
@@ -299,13 +300,14 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
+    const wxString& text = GetText();
     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {
-        return m_text.utf8_length();
+        return text.utf8_length();
     }
     else // wxDF_TEXT
     {
-        const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str()));
+        const wxCharBuffer buf(wxConvLocal.cWC2MB(text.wc_str()));
         return buf ? strlen(buf) : 0;
     }
 }
@@ -315,13 +317,14 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     if ( !buf )
         return false;
 
+    const wxString& text = GetText();
     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {
-        memcpy(buf, m_text.utf8_str(), m_text.utf8_length());
+        memcpy(buf, text.utf8_str(), text.utf8_length());
     }
     else // wxDF_TEXT
     {
-        const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str()));
+        const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(text.wc_str()));
         if ( !bufLocal )
             return false;
 
@@ -346,11 +349,11 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
         // is not in UTF-8 so do an extra check for tranquility, it shouldn't
         // matter much if we lose a bit of performance when pasting from
         // clipboard
-        m_text = wxString::FromUTF8(buf, len);
+        SetText(wxString::FromUTF8(buf, len));
     }
     else // wxDF_TEXT, convert from current (non-UTF8) locale
     {
-        m_text = wxConvLocal.cMB2WC(buf, len, NULL);
+        SetText(wxConvLocal.cMB2WC(buf, len, NULL));
     }
 
     return true;
@@ -404,29 +407,153 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
 
 #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
 
+// NB: This branch, using native wxChar for the clipboard, is only used under
+//     Windows currently. It's just a coincidence, but Windows is also the only
+//     platform where we need to convert the text to the native EOL format, so
+//     wxTextBuffer::Translate() is only used here and not in the code above.
+
 size_t wxTextDataObject::GetDataSize() const
 {
-    return GetTextLength() * sizeof(wxChar);
+    return (wxTextBuffer::Translate(GetText()).length() + 1)*sizeof(wxChar);
 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
+    const wxString textNative = wxTextBuffer::Translate(GetText());
+
     // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow
     //       retrieval of strings with embedded NULLs
-    wxTmemcpy( (wxChar*)buf, GetText().c_str(), GetTextLength() );
+    wxTmemcpy(static_cast<wxChar*>(buf),
+              textNative.t_str(),
+              textNative.length() + 1);
 
     return true;
 }
 
 bool wxTextDataObject::SetData(size_t len, const void *buf)
 {
-    SetText( wxString((const wxChar*)buf, len/sizeof(wxChar)) );
+    const wxString
+        text = wxString(static_cast<const wxChar*>(buf), len/sizeof(wxChar));
+    SetText(wxTextBuffer::Translate(text, wxTextFileType_Unix));
 
     return true;
 }
 
 #endif // different wxTextDataObject implementations
 
+// ----------------------------------------------------------------------------
+// wxHTMLDataObject
+// ----------------------------------------------------------------------------
+
+size_t wxHTMLDataObject::GetDataSize() const
+{
+    // Ensure that the temporary string returned by GetHTML() is kept alive for
+    // as long as we need it here.
+    const wxString& htmlStr = GetHTML();
+    const wxScopedCharBuffer buffer(htmlStr.utf8_str());
+
+    size_t size = buffer.length();
+
+#ifdef __WXMSW__
+    // On Windows we need to add some stuff to the string to satisfy
+    // its clipboard format requirements.
+    size += 400;
+#endif
+
+    return size;
+}
+
+bool wxHTMLDataObject::GetDataHere(void *buf) const
+{
+    if ( !buf )
+        return false;
+
+    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
+    const wxString& htmlStr = GetHTML();
+    const wxScopedCharBuffer html(htmlStr.utf8_str());
+    if ( !html )
+        return false;
+
+    char* const buffer = static_cast<char*>(buf);
+
+#ifdef __WXMSW__
+    // add the extra info that the MSW clipboard format requires.
+
+        // Create a template string for the HTML header...
+    strcpy(buffer,
+        "Version:0.9\r\n"
+        "StartHTML:00000000\r\n"
+        "EndHTML:00000000\r\n"
+        "StartFragment:00000000\r\n"
+        "EndFragment:00000000\r\n"
+        "<html><body>\r\n"
+        "<!--StartFragment -->\r\n");
+
+    // Append the HTML...
+    strcat(buffer, html);
+    strcat(buffer, "\r\n");
+    // Finish up the HTML format...
+    strcat(buffer,
+        "<!--EndFragment-->\r\n"
+        "</body>\r\n"
+        "</html>");
+
+    // Now go back, calculate all the lengths, and write out the
+    // necessary header information. Note, wsprintf() truncates the
+    // string when you overwrite it so you follow up with code to replace
+    // the 0 appended at the end with a '\r'...
+    char *ptr = strstr(buffer, "StartHTML");
+    sprintf(ptr+10, "%08u", (unsigned)(strstr(buffer, "<html>") - buffer));
+    *(ptr+10+8) = '\r';
+
+    ptr = strstr(buffer, "EndHTML");
+    sprintf(ptr+8, "%08u", (unsigned)strlen(buffer));
+    *(ptr+8+8) = '\r';
+
+    ptr = strstr(buffer, "StartFragment");
+    sprintf(ptr+14, "%08u", (unsigned)(strstr(buffer, "<!--StartFrag") - buffer));
+    *(ptr+14+8) = '\r';
+
+    ptr = strstr(buffer, "EndFragment");
+    sprintf(ptr+12, "%08u", (unsigned)(strstr(buffer, "<!--EndFrag") - buffer));
+    *(ptr+12+8) = '\r';
+#else
+    strcpy(buffer, html);
+#endif // __WXMSW__
+
+    return true;
+}
+
+bool wxHTMLDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+    if ( buf == NULL )
+        return false;
+
+    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
+    wxString html = wxString::FromUTF8(static_cast<const char*>(buf));
+
+#ifdef __WXMSW__
+    // To be consistent with other platforms, we only add the Fragment part
+    // of the Windows HTML clipboard format to the data object.
+    int fragmentStart = html.rfind("StartFragment");
+    int fragmentEnd = html.rfind("EndFragment");
+
+    if (fragmentStart != wxNOT_FOUND && fragmentEnd != wxNOT_FOUND)
+    {
+        int startCommentEnd = html.find("-->", fragmentStart) + 3;
+        int endCommentStart = html.rfind("<!--", fragmentEnd);
+
+        if (startCommentEnd != wxNOT_FOUND && endCommentStart != wxNOT_FOUND)
+            html = html.Mid(startCommentEnd, endCommentStart - startCommentEnd);
+    }
+#endif // __WXMSW__
+
+    SetHTML( html );
+
+    return true;
+}
+
+
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/docmdi.cpp b/Externals/wxWidgets3/src/common/docmdi.cpp
index 8a688566cd..ffdf7e6247 100644
--- a/Externals/wxWidgets3/src/common/docmdi.cpp
+++ b/Externals/wxWidgets3/src/common/docmdi.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Frame classes for MDI document/view applications
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
-// RCS-ID:      $Id: docmdi.cpp 64295 2010-05-12 14:34:18Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2010 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/docview.cpp b/Externals/wxWidgets3/src/common/docview.cpp
index 94f6d8650a..b646d9efe2 100644
--- a/Externals/wxWidgets3/src/common/docview.cpp
+++ b/Externals/wxWidgets3/src/common/docview.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     01/02/97
-// RCS-ID:      $Id: docview.cpp 70790 2012-03-04 00:29:03Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,6 +59,7 @@
 #include "wx/vector.h"
 #include "wx/scopedarray.h"
 #include "wx/scopedptr.h"
+#include "wx/scopeguard.h"
 #include "wx/except.h"
 
 #if wxUSE_STD_IOSTREAM
@@ -75,8 +75,6 @@
     #include "wx/wfstream.h"
 #endif
 
-typedef wxVector<wxDocTemplate *> wxDocTemplates;
-
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
@@ -859,17 +857,25 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 bool
 wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
 {
-    doc->SetFilename(path);
-    doc->SetDocumentTemplate(this);
-    GetDocumentManager()->AddDocument(doc);
-    doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
+    // Normally, if wxDocument::OnCreate() fails, it happens because the view
+    // initialization fails and then the document is destroyed due to the
+    // destruction of its last view. But take into account the (currently
+    // unrealized, AFAICS) possibility of other failures as well and ensure
+    // that the document is always destroyed if it can't be initialized.
+    wxTRY
+    {
+        doc->SetFilename(path);
+        doc->SetDocumentTemplate(this);
+        GetDocumentManager()->AddDocument(doc);
+        doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
-    if (doc->OnCreate(path, flags))
-        return true;
-
-    if (GetDocumentManager()->GetDocuments().Member(doc))
-        doc->DeleteAllViews();
-    return false;
+        return doc->OnCreate(path, flags);
+    }
+    wxCATCH_ALL(
+        if ( GetDocumentManager()->GetDocuments().Member(doc) )
+            doc->DeleteAllViews();
+        throw;
+    )
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
@@ -1184,7 +1190,7 @@ void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename)
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
-    wxView *view = GetActiveView();
+    wxView *view = GetAnyUsableView();
     if (!view)
         return;
 
@@ -1218,7 +1224,7 @@ wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
-    wxView *view = GetActiveView();
+    wxView *view = GetAnyUsableView();
     if (!view)
         return;
 
@@ -1347,7 +1353,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
     cmdproc->SetMenuStrings();
 }
 
-wxView *wxDocManager::GetActiveView() const
+wxView *wxDocManager::GetAnyUsableView() const
 {
     wxView *view = GetCurrentView();
 
@@ -1373,7 +1379,7 @@ wxView *wxDocManager::GetActiveView() const
 
 bool wxDocManager::TryBefore(wxEvent& event)
 {
-    wxView * const view = GetActiveView();
+    wxView * const view = GetAnyUsableView();
     return view && view->ProcessEventLocally(event);
 }
 
@@ -1381,11 +1387,11 @@ namespace
 {
 
 // helper function: return only the visible templates
-wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
+wxDocTemplateVector GetVisibleTemplates(const wxList& allTemplates)
 {
     // select only the visible templates
     const size_t totalNumTemplates = allTemplates.GetCount();
-    wxDocTemplates templates;
+    wxDocTemplateVector templates;
     if ( totalNumTemplates )
     {
         templates.reserve(totalNumTemplates);
@@ -1406,9 +1412,9 @@ wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
 
 } // anonymous namespace
 
-void wxDocManager::ActivateDocument(wxDocument *doc)
+void wxDocument::Activate()
 {
-    wxView * const view = doc->GetFirstView();
+    wxView * const view = GetFirstView();
     if ( !view )
         return;
 
@@ -1417,12 +1423,25 @@ void wxDocManager::ActivateDocument(wxDocument *doc)
         win->Raise();
 }
 
+wxDocument* wxDocManager::FindDocumentByPath(const wxString& path) const
+{
+    const wxFileName fileName(path);
+    for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
+    {
+        wxDocument * const doc = wxStaticCast(*i, wxDocument);
+
+        if ( fileName == wxFileName(doc->GetFilename()) )
+            return doc;
+    }
+    return NULL;
+}
+
 wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
     // this ought to be const but SelectDocumentType/Path() are not
     // const-correct and can't be changed as, being virtual, this risks
     // breaking user code overriding them
-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    wxDocTemplateVector templates(GetVisibleTemplates(m_templates));
     const size_t numTemplates = templates.size();
     if ( !numTemplates )
     {
@@ -1463,21 +1482,15 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     // check whether the document with this path is already opened
     if ( !path.empty() )
     {
-        const wxFileName fn(path);
-        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
+        wxDocument * const doc = FindDocumentByPath(path);
+        if (doc)
         {
-            wxDocument * const doc = (wxDocument*)*i;
-
-            if ( fn == doc->GetFilename() )
-            {
-                // file already open, just activate it and return
-                ActivateDocument(doc);
-                return doc;
-            }
+            // file already open, just activate it and return
+            doc->Activate();
+            return doc;
         }
     }
 
-
     // no, we need to create a new document
 
 
@@ -1498,7 +1511,6 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
         return NULL;
 
     docNew->SetDocumentName(temp->GetDocumentName());
-    docNew->SetDocumentTemplate(temp);
 
     wxTRY
     {
@@ -1522,14 +1534,14 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     // at least under Mac (where views are top level windows) it seems to be
     // necessary to manually activate the new document to bring it to the
     // forefront -- and it shouldn't hurt doing this under the other platforms
-    ActivateDocument(docNew);
+    docNew->Activate();
 
     return docNew;
 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {
-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    wxDocTemplateVector templates(GetVisibleTemplates(m_templates));
     const size_t numTemplates = templates.size();
 
     if ( numTemplates == 0 )
@@ -1562,7 +1574,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
-    wxView * const view = GetActiveView();
+    wxView * const view = GetAnyUsableView();
     return view ? view->GetDocument() : NULL;
 }
 
@@ -2006,6 +2018,31 @@ void wxDocManager::ActivateView(wxView *view, bool activate)
 // wxDocChildFrameAnyBase
 // ----------------------------------------------------------------------------
 
+bool wxDocChildFrameAnyBase::TryProcessEvent(wxEvent& event)
+{
+    if ( !m_childView )
+    {
+        // We must be being destroyed, don't forward events anywhere as
+        // m_childDocument could be invalid by now.
+        return false;
+    }
+
+    // Store a (non-owning) pointer to the last processed event here to be able
+    // to recognize this event again if it bubbles up to the parent frame, see
+    // the code in wxDocParentFrameAnyBase::TryProcessEvent().
+    m_lastEvent = &event;
+
+    // Forward the event to the document manager which will, in turn, forward
+    // it to its active view which must be our m_childView.
+    //
+    // Notice that we do things in this roundabout way to guarantee the correct
+    // event handlers call order: first the document, then the view and then the
+    // document manager itself. And if we forwarded the event directly to the
+    // view, then the document manager would do it once again when we forwarded
+    // it to it.
+    return m_childDocument->GetDocumentManager()->ProcessEventLocally(event);
+}
+
 bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
     if ( m_childView )
@@ -2038,6 +2075,29 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 // wxDocParentFrameAnyBase
 // ----------------------------------------------------------------------------
 
+bool wxDocParentFrameAnyBase::TryProcessEvent(wxEvent& event)
+{
+    if ( !m_docManager )
+        return false;
+
+    // If we have an active view, its associated child frame may have
+    // already forwarded the event to wxDocManager, check for this:
+    if ( wxView* const view = m_docManager->GetAnyUsableView() )
+    {
+        wxDocChildFrameAnyBase* const childFrame = view->GetDocChildFrame();
+        if ( childFrame && childFrame->HasAlreadyProcessed(event) )
+            return false;
+    }
+
+    // But forward the event to wxDocManager ourselves if there are no views at
+    // all or if this event hadn't been sent to the child frame previously.
+    return m_docManager->ProcessEventLocally(event);
+}
+
+// ----------------------------------------------------------------------------
+// Printing support
+// ----------------------------------------------------------------------------
+
 #if wxUSE_PRINTING_ARCHITECTURE
 
 namespace
diff --git a/Externals/wxWidgets3/src/common/dpycmn.cpp b/Externals/wxWidgets3/src/common/dpycmn.cpp
index 9d8ad62d0d..1556d5784c 100644
--- a/Externals/wxWidgets3/src/common/dpycmn.cpp
+++ b/Externals/wxWidgets3/src/common/dpycmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.03.03
-// RCS-ID:      $Id: dpycmn.cpp 65231 2010-08-10 18:57:42Z VZ $
 // Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/dseldlg.cpp b/Externals/wxWidgets3/src/common/dseldlg.cpp
index f11e6c426c..10c2243942 100644
--- a/Externals/wxWidgets3/src/common/dseldlg.cpp
+++ b/Externals/wxWidgets3/src/common/dseldlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Paul Thiessen
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id: dseldlg.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/dynarray.cpp b/Externals/wxWidgets3/src/common/dynarray.cpp
index 7859e12ee2..be01a4b840 100644
--- a/Externals/wxWidgets3/src/common/dynarray.cpp
+++ b/Externals/wxWidgets3/src/common/dynarray.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.97
-// RCS-ID:      $Id: dynarray.cpp 68470 2011-07-31 12:19:51Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -158,13 +157,13 @@ void name::Grow(size_t nIncrement)                                          \
   if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) {      \
     if( m_nSize == 0 ) {                                                    \
       /* was empty, determine initial size */                               \
-      size_t size = WX_ARRAY_DEFAULT_INITIAL_SIZE;                          \
-      if (size < nIncrement) size = nIncrement;                             \
+      size_t sz = WX_ARRAY_DEFAULT_INITIAL_SIZE;                            \
+      if (sz < nIncrement) sz = nIncrement;                                 \
       /* allocate some memory */                                            \
-      m_pItems = new T[size];                                               \
+      m_pItems = new T[sz];                                                 \
       /* only grow if allocation succeeded */                               \
       if ( m_pItems ) {                                                     \
-          m_nSize = size;                                                   \
+          m_nSize = sz;                                                     \
       }                                                                     \
     }                                                                       \
     else                                                                    \
diff --git a/Externals/wxWidgets3/src/common/dynlib.cpp b/Externals/wxWidgets3/src/common/dynlib.cpp
index 61fda2dcd5..9683402770 100644
--- a/Externals/wxWidgets3/src/common/dynlib.cpp
+++ b/Externals/wxWidgets3/src/common/dynlib.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/98
-// RCS-ID:      $Id: dynlib.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Guilhem Lavaux
 //                  2000-2005 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -54,10 +53,6 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 // wxDynamicLibrary
 // ---------------------------------------------------------------------------
 
-#if defined(__WXPM__) || defined(__EMX__)
-    const wxString wxDynamicLibrary::ms_dllext(wxT(".dll"));
-#endif
-
 // for MSW/Unix it is defined in platform-specific file
 #if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__)
 
@@ -83,7 +78,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
         wxFileName::SplitPath(libname, NULL, NULL, &ext);
         if ( ext.empty() )
         {
-            libname += GetDllExt();
+            libname += GetDllExt(wxDL_MODULE);
         }
     }
 
@@ -166,6 +161,29 @@ void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const
 // informational methods
 // ----------------------------------------------------------------------------
 
+/*static*/
+wxString wxDynamicLibrary::GetDllExt(wxDynamicLibraryCategory cat)
+{
+    wxUnusedVar(cat);
+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
+    return ".dll";
+#elif defined(__HPUX__)
+    return ".sl";
+#elif defined(__DARWIN__)
+    switch ( cat )
+    {
+        case wxDL_LIBRARY:
+            return ".dylib";
+        case wxDL_MODULE:
+            return ".bundle";
+    }
+    wxFAIL_MSG("unreachable");
+    return wxString(); // silence gcc warning
+#else
+    return ".so";
+#endif
+}
+
 /*static*/
 wxString
 wxDynamicLibrary::CanonicalizeName(const wxString& name,
@@ -177,24 +195,18 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 #if defined(__UNIX__) && !defined(__EMX__)
     switch ( cat )
     {
-        default:
-            wxFAIL_MSG( wxT("unknown wxDynamicLibraryCategory value") );
-            // fall through
-
-        case wxDL_MODULE:
-            // don't do anything for modules, their names are arbitrary
-            break;
-
         case wxDL_LIBRARY:
-            // library names should start with "lib" under Unix
-            nameCanonic = wxT("lib");
+            // Library names should start with "lib" under Unix.
+            nameCanonic = "lib";
+            break;
+        case wxDL_MODULE:
+            // Module names are arbitrary and should have no prefix added.
             break;
     }
-#else // !__UNIX__
-    wxUnusedVar(cat);
-#endif // __UNIX__/!__UNIX__
+#endif
+
+    nameCanonic << name << GetDllExt(cat);
 
-    nameCanonic << name << GetDllExt();
     return nameCanonic;
 }
 
diff --git a/Externals/wxWidgets3/src/common/dynload.cpp b/Externals/wxWidgets3/src/common/dynload.cpp
index a2398ae425..0b184d0e5b 100644
--- a/Externals/wxWidgets3/src/common/dynload.cpp
+++ b/Externals/wxWidgets3/src/common/dynload.cpp
@@ -5,7 +5,6 @@
 //               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
 // Modified by:
 // Created:      03/12/01
-// RCS-ID:       $Id: dynload.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,9 +75,33 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
         : m_linkcount(1)
         , m_objcount(0)
 {
-    m_before = wxClassInfo::GetFirst();
+    const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();
     Load( libname, flags );
-    m_after = wxClassInfo::GetFirst();
+
+    // It is simple to know what is the first object in the linked list of
+    // wxClassInfo that we registered (it's also the last one chronologically),
+    // it's just the new head of the wxClassInfo list:
+    m_ourFirst = wxClassInfo::GetFirst();
+
+    // But to find the first wxClassInfo created by this library we need to
+    // iterate until we get to the previous head as we don't have the links in
+    // the backwards direction:
+    if ( m_ourFirst != oldFirst )
+    {
+        for ( const wxClassInfo* info = m_ourFirst; ; info = info->GetNext() )
+        {
+            if ( info->GetNext() == oldFirst )
+            {
+                m_ourLast = info;
+                break;
+            }
+        }
+    }
+    else // We didn't register any classes at all.
+    {
+        m_ourFirst =
+        m_ourLast = NULL;
+    }
 
     if( m_handle != 0 )
     {
@@ -130,7 +153,10 @@ bool wxPluginLibrary::UnrefLib()
 
 void wxPluginLibrary::UpdateClasses()
 {
-    for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( !m_ourFirst )
+        return;
+
+    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
     {
         if( info->GetClassName() )
         {
@@ -138,6 +164,9 @@ void wxPluginLibrary::UpdateClasses()
             // we can quickly find the entry they correspond to.
             (*ms_classes)[info->GetClassName()] = this;
         }
+
+        if ( info == m_ourLast )
+            break;
     }
 }
 
@@ -147,9 +176,15 @@ void wxPluginLibrary::RestoreClasses()
     if (!ms_classes)
         return;
 
-    for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( !m_ourFirst )
+        return;
+
+    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
     {
         ms_classes->erase(ms_classes->find(info->GetClassName()));
+
+        if ( info == m_ourLast )
+            break;
     }
 }
 
@@ -166,16 +201,22 @@ void wxPluginLibrary::RegisterModules()
     wxASSERT_MSG( m_linkcount == 1,
                   wxT("RegisterModules should only be called for the first load") );
 
-    for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
+    if ( m_ourFirst )
     {
-        if( info->IsKindOf(CLASSINFO(wxModule)) )
+        for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
         {
-            wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
+            if( info->IsKindOf(wxCLASSINFO(wxModule)) )
+            {
+                wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
 
-            wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
+                wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
 
-            m_wxmodules.push_back(m);
-            wxModule::RegisterModule(m);
+                m_wxmodules.push_back(m);
+                wxModule::RegisterModule(m);
+            }
+
+            if ( info == m_ourLast )
+                break;
         }
     }
 
@@ -242,7 +283,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
     wxString realname(libname);
 
     if( !(flags & wxDL_VERBATIM) )
-        realname += wxDynamicLibrary::GetDllExt();
+        realname += wxDynamicLibrary::GetDllExt(wxDL_MODULE);
 
     wxPluginLibrary *entry;
 
@@ -301,7 +342,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
 
     if ( !entry )
     {
-        realname += wxDynamicLibrary::GetDllExt();
+        realname += wxDynamicLibrary::GetDllExt(wxDL_MODULE);
 
         entry = FindByName(realname);
     }
diff --git a/Externals/wxWidgets3/src/common/effects.cpp b/Externals/wxWidgets3/src/common/effects.cpp
index 0aea9fb807..55a40be7ec 100644
--- a/Externals/wxWidgets3/src/common/effects.cpp
+++ b/Externals/wxWidgets3/src/common/effects.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     25/4/2000
-// RCS-ID:      $Id: effects.cpp 54372 2008-06-26 11:16:40Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/event.cpp b/Externals/wxWidgets3/src/common/event.cpp
index 34c3c16dde..914995e2fa 100644
--- a/Externals/wxWidgets3/src/common/event.cpp
+++ b/Externals/wxWidgets3/src/common/event.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: event.cpp 69893 2011-12-02 00:50:25Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -156,33 +155,34 @@ const wxEventType wxEVT_NULL = wxNewEventType();
 
 wxDEFINE_EVENT( wxEVT_IDLE, wxIdleEvent );
 
-// Thread event
+// Thread and asynchronous call events
 wxDEFINE_EVENT( wxEVT_THREAD, wxThreadEvent );
+wxDEFINE_EVENT( wxEVT_ASYNC_METHOD_CALL, wxAsyncMethodCallEvent );
 
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
-wxDEFINE_EVENT( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent);
+wxDEFINE_EVENT( wxEVT_BUTTON, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_CHECKBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_CHOICE, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_LISTBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_LISTBOX_DCLICK, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_CHECKLISTBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_MENU, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SLIDER, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_RADIOBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_RADIOBUTTON, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SCROLLBAR, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_VLBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_COMBOBOX, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOOL_RCLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOOL_ENTER, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SPINCTRL, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SPINCTRLDOUBLE, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOOL_DROPDOWN, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_COMBOBOX_DROPDOWN, wxCommandEvent);
+wxDEFINE_EVENT( wxEVT_COMBOBOX_CLOSEUP, wxCommandEvent);
 
 // Mouse event types
 wxDEFINE_EVENT( wxEVT_LEFT_DOWN, wxMouseEvent );
@@ -298,9 +298,9 @@ wxDEFINE_EVENT( wxEVT_INIT_DIALOG, wxInitDialogEvent );
 wxDEFINE_EVENT( wxEVT_UPDATE_UI, wxUpdateUIEvent );
 
 // Clipboard events
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_COPY, wxClipboardTextEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_CUT, wxClipboardTextEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_PASTE, wxClipboardTextEvent );
 
 // Generic command events
 // Note: a click is a higher-level event than button down/up
@@ -368,7 +368,9 @@ wxEvent::wxEvent(int theId, wxEventType commandType)
     m_handlerToProcessOnlyIn = NULL;
     m_isCommandEvent = false;
     m_propagationLevel = wxEVENT_PROPAGATE_NONE;
+    m_propagatedFrom = NULL;
     m_wasProcessed = false;
+    m_willBeProcessedAgain = false;
 }
 
 wxEvent::wxEvent(const wxEvent& src)
@@ -380,9 +382,11 @@ wxEvent::wxEvent(const wxEvent& src)
     , m_callbackUserData(src.m_callbackUserData)
     , m_handlerToProcessOnlyIn(NULL)
     , m_propagationLevel(src.m_propagationLevel)
+    , m_propagatedFrom(NULL)
     , m_skipped(src.m_skipped)
     , m_isCommandEvent(src.m_isCommandEvent)
     , m_wasProcessed(false)
+    , m_willBeProcessedAgain(false)
 {
 }
 
@@ -397,11 +401,16 @@ wxEvent& wxEvent::operator=(const wxEvent& src)
     m_callbackUserData = src.m_callbackUserData;
     m_handlerToProcessOnlyIn = NULL;
     m_propagationLevel = src.m_propagationLevel;
+    m_propagatedFrom = NULL;
     m_skipped = src.m_skipped;
     m_isCommandEvent = src.m_isCommandEvent;
 
     // don't change m_wasProcessed
 
+    // While the original again could be passed to another handler, this one
+    // isn't going to be processed anywhere else by default.
+    m_willBeProcessedAgain = false;
+
     return *this;
 }
 
@@ -426,7 +435,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
 
 wxString wxCommandEvent::GetString() const
 {
-    if (m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject)
+    if (m_eventType != wxEVT_TEXT || !m_eventObject)
     {
         return m_cmdString;
     }
@@ -554,10 +563,11 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
 
     m_clickCount = -1;
 
+    m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
     m_wheelRotation = 0;
     m_wheelDelta = 0;
     m_linesPerAction = 0;
-    m_wheelAxis = 0;
+    m_columnsPerAction = 0;
 }
 
 void wxMouseEvent::Assign(const wxMouseEvent& event)
@@ -580,6 +590,7 @@ void wxMouseEvent::Assign(const wxMouseEvent& event)
     m_wheelRotation = event.m_wheelRotation;
     m_wheelDelta = event.m_wheelDelta;
     m_linesPerAction = event.m_linesPerAction;
+    m_columnsPerAction = event.m_columnsPerAction;
     m_wheelAxis = event.m_wheelAxis;
 }
 
@@ -736,6 +747,10 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_uniChar = WXK_NONE;
 #endif
 
+    m_x =
+    m_y = wxDefaultCoord;
+    m_hasPosition = false;
+
     InitPropagation();
 }
 
@@ -759,6 +774,42 @@ wxKeyEvent::wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt)
     InitPropagation();
 }
 
+void wxKeyEvent::InitPositionIfNecessary() const
+{
+    if ( m_hasPosition )
+        return;
+
+    // We're const because we're called from const Get[XY]() methods but we
+    // need to update the "cached" values.
+    wxKeyEvent& self = const_cast<wxKeyEvent&>(*this);
+    self.m_hasPosition = true;
+
+    // The only position we can possibly associate with the keyboard event on
+    // the platforms where it doesn't carry it already is the mouse position.
+    wxGetMousePosition(&self.m_x, &self.m_y);
+
+    // If this event is associated with a window, the position should be in its
+    // client coordinates, but otherwise leave it in screen coordinates as what
+    // else can we use?
+    wxWindow* const win = wxDynamicCast(GetEventObject(), wxWindow);
+    if ( win )
+        win->ScreenToClient(&self.m_x, &self.m_y);
+}
+
+wxCoord wxKeyEvent::GetX() const
+{
+    InitPositionIfNecessary();
+
+    return m_x;
+}
+
+wxCoord wxKeyEvent::GetY() const
+{
+    InitPositionIfNecessary();
+
+    return m_y;
+}
+
 bool wxKeyEvent::IsKeyInCategory(int category) const
 {
     switch ( GetKeyCode() )
@@ -1162,6 +1213,8 @@ wxEventFilter* wxEvtHandler::ms_filterList = NULL;
             // Skip the assert below.
             return;
         }
+
+        prev = f;
     }
 
     wxFAIL_MSG( "Filter not found" );
@@ -1385,6 +1438,12 @@ bool wxEvtHandler::TryAfter(wxEvent& event)
     if ( GetNextHandler() )
         return GetNextHandler()->TryAfter(event);
 
+    // If this event is going to be processed in another handler next, don't
+    // pass it to wxTheApp now, it will be done from TryAfter() of this other
+    // handler.
+    if ( event.WillBeProcessedAgain() )
+        return false;
+
 #if WXWIN_COMPATIBILITY_2_8
     // as above, call the old virtual function for compatibility
     return TryParent(event);
@@ -1522,6 +1581,17 @@ bool wxEvtHandler::TryHereOnly(wxEvent& event)
     if ( GetEventHashTable().HandleEvent(event, this) )
         return true;
 
+#ifdef wxHAS_CALL_AFTER
+    // There is an implicit entry for async method calls processing in every
+    // event handler:
+    if ( event.GetEventType() == wxEVT_ASYNC_METHOD_CALL &&
+            event.GetEventObject() == this )
+    {
+        static_cast<wxAsyncMethodCallEvent&>(event).Execute();
+        return true;
+    }
+#endif // wxHAS_CALL_AFTER
+
     // We don't have a handler for this event.
     return false;
 }
@@ -1621,15 +1691,6 @@ wxEvtHandler::DoUnbind(int id,
     if (!m_dynamicEvents)
         return false;
 
-    // Remove connection from tracker node (wxEventConnectionRef)
-    wxEvtHandler *eventSink = func.GetEvtHandler();
-    if ( eventSink && eventSink != this )
-    {
-        wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
-        if ( evtConnRef )
-            evtConnRef->DecRef();
-    }
-
     wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
     while (node)
     {
@@ -1641,6 +1702,15 @@ wxEvtHandler::DoUnbind(int id,
             entry->m_fn->IsMatching(func) &&
             ((entry->m_callbackUserData == userData) || !userData))
         {
+            // Remove connection from tracker node (wxEventConnectionRef)
+            wxEvtHandler *eventSink = entry->m_fn->GetEvtHandler();
+            if ( eventSink && eventSink != this )
+            {
+                wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
+                if ( evtConnRef )
+                    evtConnRef->DecRef();
+            }
+
             delete entry->m_callbackUserData;
             m_dynamicEvents->Erase( node );
             delete entry;
diff --git a/Externals/wxWidgets3/src/common/evtloopcmn.cpp b/Externals/wxWidgets3/src/common/evtloopcmn.cpp
index a8abd2b297..f7b5138cc2 100644
--- a/Externals/wxWidgets3/src/common/evtloopcmn.cpp
+++ b/Externals/wxWidgets3/src/common/evtloopcmn.cpp
@@ -2,10 +2,9 @@
 // Name:        src/common/evtloopcmn.cpp
 // Purpose:     common wxEventLoop-related stuff
 // Author:      Vadim Zeitlin
-// Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloopcmn.cpp 70796 2012-03-04 00:29:31Z VZ $
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006, 2013 Vadim Zeitlin <vadim@wxwindows.org>
+//              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -22,6 +21,10 @@
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
+#include "wx/scopeguard.h"
+#include "wx/apptrait.h"
+#include "wx/private/eventloopsourcesmanager.h"
+
 // ----------------------------------------------------------------------------
 // wxEventLoopBase
 // ----------------------------------------------------------------------------
@@ -30,6 +33,9 @@ wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;
 
 wxEventLoopBase::wxEventLoopBase()
 {
+    m_isInsideRun = false;
+    m_shouldExit = false;
+
     m_isInsideYield = false;
     m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
 }
@@ -50,6 +56,35 @@ void wxEventLoopBase::SetActive(wxEventLoopBase* loop)
         wxTheApp->OnEventLoopEnter(loop);
 }
 
+int wxEventLoopBase::Run()
+{
+    // event loops are not recursive, you need to create another loop!
+    wxCHECK_MSG( !IsInsideRun(), -1, wxT("can't reenter a message loop") );
+
+    // ProcessIdle() and ProcessEvents() below may throw so the code here should
+    // be exception-safe, hence we must use local objects for all actions we
+    // should undo
+    wxEventLoopActivator activate(this);
+
+    // We might be called again, after a previous call to ScheduleExit(), so
+    // reset this flag.
+    m_shouldExit = false;
+
+    // Set this variable to true for the duration of this method.
+    m_isInsideRun = true;
+    wxON_BLOCK_EXIT_SET(m_isInsideRun, false);
+
+    // Finally really run the loop.
+    return DoRun();
+}
+
+void wxEventLoopBase::Exit(int rc)
+{
+    wxCHECK_RET( IsRunning(), wxS("Use ScheduleExit() on not running loop") );
+
+    ScheduleExit(rc);
+}
+
 void wxEventLoopBase::OnExit()
 {
     if (wxTheApp)
@@ -81,6 +116,27 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded)
     return YieldFor(wxEVT_CATEGORY_ALL);
 }
 
+#if wxUSE_EVENTLOOP_SOURCE
+
+wxEventLoopSource*
+wxEventLoopBase::AddSourceForFD(int fd,
+                                wxEventLoopSourceHandler *handler,
+                                int flags)
+{
+#if wxUSE_CONSOLE_EVENTLOOP
+    // Delegate to the event loop sources manager defined by it.
+    wxEventLoopSourcesManagerBase* const
+        manager = wxApp::GetValidTraits().GetEventLoopSourcesManager();
+    wxCHECK_MSG( manager, NULL, wxS("Must have wxEventLoopSourcesManager") );
+
+    return manager->AddSourceForFD(fd, handler, flags);
+#else // !wxUSE_CONSOLE_EVENTLOOP
+    return NULL;
+#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP
+}
+
+#endif // wxUSE_EVENTLOOP_SOURCE
+
 // wxEventLoopManual is unused in the other ports
 #if defined(__WINDOWS__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE)
 
@@ -91,7 +147,6 @@ bool wxEventLoopBase::Yield(bool onlyIfNeeded)
 wxEventLoopManual::wxEventLoopManual()
 {
     m_exitcode = 0;
-    m_shouldExit = false;
 }
 
 bool wxEventLoopManual::ProcessEvents()
@@ -104,21 +159,21 @@ bool wxEventLoopManual::ProcessEvents()
     // and this input is only removed from it when pending event handlers are
     // executed)
     if ( wxTheApp )
+    {
         wxTheApp->ProcessPendingEvents();
 
+        // One of the pending event handlers could have decided to exit the
+        // loop so check for the flag before trying to dispatch more events
+        // (which could block indefinitely if no more are coming).
+        if ( m_shouldExit )
+            return false;
+    }
+
     return Dispatch();
 }
 
-int wxEventLoopManual::Run()
+int wxEventLoopManual::DoRun()
 {
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );
-
-    // ProcessIdle() and ProcessEvents() below may throw so the code here should
-    // be exception-safe, hence we must use local objects for all actions we
-    // should undo
-    wxEventLoopActivator activate(this);
-
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside ProcessEvents() but we must call it from Exit() in normal
     // situations because it is supposed to be called synchronously,
@@ -139,19 +194,11 @@ int wxEventLoopManual::Run()
 
                 // generate and process idle events for as long as we don't
                 // have anything else to do
-                while ( !Pending() && ProcessIdle() && !m_shouldExit )
+                while ( !m_shouldExit && !Pending() && ProcessIdle() )
                     ;
 
-                // if the "should exit" flag is set, the loop should terminate
-                // but not before processing any remaining messages so while
-                // Pending() returns true, do process them
                 if ( m_shouldExit )
-                {
-                    while ( Pending() )
-                        ProcessEvents();
-
                     break;
-                }
 
                 // a message came or no more idle processing to do, dispatch
                 // all the pending events and call Dispatch() to wait for the
@@ -163,6 +210,33 @@ int wxEventLoopManual::Run()
                 }
             }
 
+            // Process the remaining queued messages, both at the level of the
+            // underlying toolkit level (Pending/Dispatch()) and wx level
+            // (Has/ProcessPendingEvents()).
+            //
+            // We do run the risk of never exiting this loop if pending event
+            // handlers endlessly generate new events but they shouldn't do
+            // this in a well-behaved program and we shouldn't just discard the
+            // events we already have, they might be important.
+            for ( ;; )
+            {
+                bool hasMoreEvents = false;
+                if ( wxTheApp && wxTheApp->HasPendingEvents() )
+                {
+                    wxTheApp->ProcessPendingEvents();
+                    hasMoreEvents = true;
+                }
+
+                if ( Pending() )
+                {
+                    Dispatch();
+                    hasMoreEvents = true;
+                }
+
+                if ( !hasMoreEvents )
+                    break;
+            }
+
 #if wxUSE_EXCEPTIONS
             // exit the outer loop as well
             break;
@@ -193,9 +267,9 @@ int wxEventLoopManual::Run()
     return m_exitcode;
 }
 
-void wxEventLoopManual::Exit(int rc)
+void wxEventLoopManual::ScheduleExit(int rc)
 {
-    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );
+    wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not running") );
 
     m_exitcode = rc;
     m_shouldExit = true;
diff --git a/Externals/wxWidgets3/src/common/extended.c b/Externals/wxWidgets3/src/common/extended.c
index a89b6eca33..0f0a328ee2 100644
--- a/Externals/wxWidgets3/src/common/extended.c
+++ b/Externals/wxWidgets3/src/common/extended.c
@@ -4,7 +4,6 @@
 ** Maintainer:  Ryan Norton
 ** Modified by:
 ** Created:     11/24/04
-** RCS-ID:      $Id: extended.c 67254 2011-03-20 00:14:35Z DS $
 *****************************************************************************/
 
 
diff --git a/Externals/wxWidgets3/src/common/fddlgcmn.cpp b/Externals/wxWidgets3/src/common/fddlgcmn.cpp
index 2f54581e26..fb97796a0b 100644
--- a/Externals/wxWidgets3/src/common/fddlgcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fddlgcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.08.01
-// RCS-ID:      $Id: fddlgcmn.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,11 +36,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_NEXT, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_REPLACE, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_REPLACE_ALL, wxFindDialogEvent );
+wxDEFINE_EVENT( wxEVT_FIND_CLOSE, wxFindDialogEvent );
 
 // ============================================================================
 // implementations
@@ -71,18 +70,18 @@ void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
     m_FindReplaceData->m_Flags = event.GetFlags();
     m_FindReplaceData->m_FindWhat = event.GetFindString();
     if ( HasFlag(wxFR_REPLACEDIALOG) &&
-         (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE ||
-          event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) )
+         (event.GetEventType() == wxEVT_FIND_REPLACE ||
+          event.GetEventType() == wxEVT_FIND_REPLACE_ALL) )
     {
         m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
     }
 
-    // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed
-    if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT )
+    // translate wxEVT_FIND_NEXT to wxEVT_FIND if needed
+    if ( event.GetEventType() == wxEVT_FIND_NEXT )
     {
         if ( m_FindReplaceData->m_FindWhat != m_lastSearch )
         {
-            event.SetEventType(wxEVT_COMMAND_FIND);
+            event.SetEventType(wxEVT_FIND);
 
             m_lastSearch = m_FindReplaceData->m_FindWhat;
         }
diff --git a/Externals/wxWidgets3/src/common/fdiodispatcher.cpp b/Externals/wxWidgets3/src/common/fdiodispatcher.cpp
index b23232f14d..60938757ed 100644
--- a/Externals/wxWidgets3/src/common/fdiodispatcher.cpp
+++ b/Externals/wxWidgets3/src/common/fdiodispatcher.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of common wxFDIODispatcher methods
 // Author:      Vadim Zeitlin
 // Created:     2007-05-13
-// RCS-ID:      $Id: fdiodispatcher.cpp 56354 2008-10-16 12:07:35Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/ffile.cpp b/Externals/wxWidgets3/src/common/ffile.cpp
index 397448025c..0f479565d2 100644
--- a/Externals/wxWidgets3/src/common/ffile.cpp
+++ b/Externals/wxWidgets3/src/common/ffile.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
-// RCS-ID:      $Id: ffile.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +47,7 @@
 
 wxFFile::wxFFile(const wxString& filename, const wxString& mode)
 {
-    Detach();
+    m_fp = NULL;
 
     (void)Open(filename, mode);
 }
@@ -57,16 +56,16 @@ bool wxFFile::Open(const wxString& filename, const wxString& mode)
 {
     wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
 
-    m_fp = wxFopen(filename, mode);
+    FILE* const fp = wxFopen(filename, mode);
 
-    if ( !m_fp )
+    if ( !fp )
     {
         wxLogSysError(_("can't open file '%s'"), filename);
 
         return false;
     }
 
-    m_name = filename;
+    Attach(fp, filename);
 
     return true;
 }
@@ -82,7 +81,7 @@ bool wxFFile::Close()
             return false;
         }
 
-        Detach();
+        m_fp = NULL;
     }
 
     return true;
@@ -102,12 +101,12 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
 
     clearerr(m_fp);
 
-    wxCharBuffer buf(length + 1);
+    wxCharBuffer buf(length);
 
     // note that real length may be less than file length for text files with DOS EOLs
     // ('\r's get dropped by CRT when reading which means that we have
     // realLen = fileLen - numOfLinesInTheFile)
-    length = fread(buf.data(), sizeof(char), length, m_fp);
+    length = fread(buf.data(), 1, length, m_fp);
 
     if ( Error() )
     {
@@ -117,7 +116,9 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
     }
 
     buf.data()[length] = 0;
-    *str = wxString(buf, conv);
+
+    wxString strTmp(buf, conv);
+    str->swap(strTmp);
 
     return true;
 }
diff --git a/Externals/wxWidgets3/src/common/file.cpp b/Externals/wxWidgets3/src/common/file.cpp
index 77e14d443f..b2a5aca736 100644
--- a/Externals/wxWidgets3/src/common/file.cpp
+++ b/Externals/wxWidgets3/src/common/file.cpp
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: file.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -204,17 +203,17 @@ bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
-    int fd = wxOpen( fileName,
+    int fildes = wxOpen( fileName,
                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL),
                      accessMode );
-    if ( CheckForError(fd) )
+    if ( CheckForError(fildes) )
     {
         wxLogSysError(_("can't create file '%s'"), fileName);
         return false;
     }
 
-    Attach(fd);
+    Attach(fildes);
     return true;
 }
 
@@ -258,15 +257,15 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
     accessMode &= wxS_IRUSR | wxS_IWUSR;
 #endif // __WINDOWS__
 
-    int fd = wxOpen( fileName, flags, accessMode);
+    int fildes = wxOpen( fileName, flags, accessMode);
 
-    if ( CheckForError(fd) )
+    if ( CheckForError(fildes) )
     {
         wxLogSysError(_("can't open file '%s'"), fileName);
         return false;
     }
 
-    Attach(fd);
+    Attach(fildes);
     return true;
 }
 
@@ -291,6 +290,38 @@ bool wxFile::Close()
 // read/write
 // ----------------------------------------------------------------------------
 
+bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
+{
+    wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") );
+
+    ssize_t length = Length();
+    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
+
+    wxCharBuffer buf(length);
+    char* p = buf.data();
+    for ( ;; )
+    {
+        static const ssize_t READSIZE = 4096;
+
+        ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
+        if ( nread == wxInvalidOffset )
+            return false;
+
+        p += nread;
+        if ( length <= nread )
+            break;
+
+        length -= nread;
+    }
+
+    *p = 0;
+
+    wxString strTmp(buf, conv);
+    str->swap(strTmp);
+
+    return true;
+}
+
 // read
 ssize_t wxFile::Read(void *pBuf, size_t nCount)
 {
@@ -460,7 +491,7 @@ bool wxFile::Eof() const
 
     wxFileOffset iRc;
 
-#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ )
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__)
     // @@ this doesn't work, of course, on unseekable file descriptors
     wxFileOffset ofsCur = Tell(),
     ofsMax = Length();
@@ -479,10 +510,6 @@ bool wxFile::Eof() const
     {
         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
     }
-    else if ( iRc != 1 )
-    {
-        wxFAIL_MSG(wxT("invalid eof() return value."));
-    }
 
     return true;
 }
diff --git a/Externals/wxWidgets3/src/common/fileback.cpp b/Externals/wxWidgets3/src/common/fileback.cpp
index 4709a37981..c9c6c49476 100644
--- a/Externals/wxWidgets3/src/common/fileback.cpp
+++ b/Externals/wxWidgets3/src/common/fileback.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/fileback.cpp
 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: fileback.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/fileconf.cpp b/Externals/wxWidgets3/src/common/fileconf.cpp
index 3604443340..e626c3c0cc 100644
--- a/Externals/wxWidgets3/src/common/fileconf.cpp
+++ b/Externals/wxWidgets3/src/common/fileconf.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
-// RCS-ID:      $Id: fileconf.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1997 Karsten Ballueder  &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
@@ -1818,6 +1817,11 @@ bool wxFileConfigGroup::DeleteEntry(const wxString& name)
       // pNewLast can be NULL here -- it's ok and can happen if we have no
       // entries left
       m_pLastEntry = pNewLast;
+
+      // For the root group only, we could be removing the first group line
+      // here, so update m_pLine to avoid keeping a dangling pointer.
+      if ( pLine == m_pLine )
+          SetLine(NULL);
     }
 
     m_pConfig->LineListRemove(pLine);
diff --git a/Externals/wxWidgets3/src/common/filectrlcmn.cpp b/Externals/wxWidgets3/src/common/filectrlcmn.cpp
index aa682cd665..f4c8fd27aa 100644
--- a/Externals/wxWidgets3/src/common/filectrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/filectrlcmn.cpp
@@ -4,7 +4,6 @@
 //              platform-specific wxFileCtrl's
 // Author:      Diaa M. Sami
 // Created:     2007-07-07
-// RCS-ID:      $Id: filectrlcmn.cpp 64429 2010-05-29 10:35:47Z VZ $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/filefn.cpp b/Externals/wxWidgets3/src/common/filefn.cpp
index e0663b3085..4b87feb7db 100644
--- a/Externals/wxWidgets3/src/common/filefn.cpp
+++ b/Externals/wxWidgets3/src/common/filefn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: filefn.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -61,6 +60,7 @@
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"
     #include "wx/msw/mslu.h"
 
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
@@ -76,7 +76,7 @@
 
     // io.h is needed for _get_osfhandle()
     // Already included by filefn.h for many Windows compilers
-    #if defined __MWERKS__ || defined __CYGWIN__
+    #if defined __CYGWIN__
         #include <io.h>
     #endif
 #endif // __WINDOWS__
@@ -742,11 +742,13 @@ wxPathOnly (wxChar *path)
     {
         static wxChar buf[_MAXPATHLEN];
 
-        // Local copy
-        wxStrcpy (buf, path);
-
         int l = wxStrlen(path);
         int i = l - 1;
+        if ( i >= _MAXPATHLEN )
+            return NULL;
+
+        // Local copy
+        wxStrcpy (buf, path);
 
         // Search backward for a backward or forward slash
         while (i > -1)
@@ -788,12 +790,15 @@ wxString wxPathOnly (const wxString& path)
     {
         wxChar buf[_MAXPATHLEN];
 
-        // Local copy
-        wxStrcpy(buf, path);
-
         int l = path.length();
         int i = l - 1;
 
+        if ( i >= _MAXPATHLEN )
+            return wxString();
+
+        // Local copy
+        wxStrcpy(buf, path);
+
         // Search backward for a backward or forward slash
         while (i > -1)
         {
@@ -842,6 +847,9 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
 {
     CFURLRef fullURLRef;
     fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+    if ( fullURLRef == NULL)
+        return wxEmptyString;
+    
     if ( additionalPathComponent )
     {
         CFURLRef parentURLRef = fullURLRef ;
@@ -849,12 +857,10 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
             additionalPathComponent,false);
         CFRelease( parentURLRef ) ;
     }
-    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle ));
     CFRelease( fullURLRef ) ;
-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
-    CFRelease( cfString );
-    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
-    return wxCFStringRef(cfMutableString).AsString();
+
+    return wxCFStringRef::AsStringWithNormalizationFormC(cfString);
 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
@@ -879,13 +885,10 @@ OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 
 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
 {
-    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+    wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault,
                                                       uniname->unicode,
-                                                      uniname->length );
-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
-    CFRelease( cfname );
-    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
-    return wxCFStringRef(cfMutableString).AsString() ;
+                                                      uniname->length ) );
+    return wxCFStringRef::AsStringWithNormalizationFormC(cfname);
 }
 
 #ifndef __LP64__
@@ -1191,8 +1194,7 @@ bool wxRemoveFile(const wxString& file)
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
  || defined(__DMC__) \
- || defined(__GNUWIN32__) \
- || (defined(__MWERKS__) && defined(__MSL__))
+ || defined(__GNUWIN32__)
     int res = wxRemove(file);
 #elif defined(__WXMAC__)
     int res = unlink(file.fn_str());
@@ -1358,9 +1360,7 @@ wxString wxFindNextFile()
     wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );
 
     wxString result;
-    gs_dir->GetNext(&result);
-
-    if ( result.empty() )
+    if ( !gs_dir->GetNext(&result) || result.empty() )
     {
         wxDELETE(gs_dir);
         return result;
@@ -1389,7 +1389,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         buf = new wxChar[sz + 1];
     }
 
-    bool ok wxDUMMY_INITIALIZE(false);
+    bool ok = false;
 
     // for the compilers which have Unicode version of _getcwd(), call it
     // directly, for the others call the ANSI version and do the translation
@@ -1538,7 +1538,7 @@ bool wxSetWorkingDirectory(const wxString& d)
     // No equivalent in WinCE
     wxUnusedVar(d);
 #else
-    success = (SetCurrentDirectory(d.fn_str()) != 0);
+    success = (SetCurrentDirectory(d.t_str()) != 0);
 #endif
 #else
     // Must change drive, too.
@@ -1577,8 +1577,12 @@ wxString wxGetOSDirectory()
 #ifdef __WXWINCE__
     return wxString(wxT("\\Windows"));
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    wxChar buf[256];
-    GetWindowsDirectory(buf, 256);
+    wxChar buf[MAX_PATH];
+    if ( !GetWindowsDirectory(buf, MAX_PATH) )
+    {
+        wxLogLastError(wxS("GetWindowsDirectory"));
+    }
+
     return wxString(buf);
 #elif defined(__WXMAC__) && wxOSX_USE_CARBON
     return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false);
@@ -1766,7 +1770,7 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow
-    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    const DWORD dwAttr = ::GetFileAttributes(path.t_str());
     if ( dwAttr == INVALID_FILE_ATTRIBUTES )
     {
         // file probably doesn't exist at all
diff --git a/Externals/wxWidgets3/src/common/filehistorycmn.cpp b/Externals/wxWidgets3/src/common/filehistorycmn.cpp
index 0ce3bd6a58..c27ed12c0f 100644
--- a/Externals/wxWidgets3/src/common/filehistorycmn.cpp
+++ b/Externals/wxWidgets3/src/common/filehistorycmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxFileHistory class
 // Author:      Julian Smart, Vaclav Slavik, Vadim Zeitlin
 // Created:     2010-05-03
-// RCS-ID:      $Id: filehistorycmn.cpp 70503 2012-02-03 17:27:13Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/filename.cpp b/Externals/wxWidgets3/src/common/filename.cpp
index 0614b8047c..6acde7603c 100644
--- a/Externals/wxWidgets3/src/common/filename.cpp
+++ b/Externals/wxWidgets3/src/common/filename.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.2000
-// RCS-ID:      $Id: filename.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2000 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +32,7 @@
                 http://msdn.microsoft.com/en-us/library/aa365248(VS.85).aspx.
 
 
-   wxPATH_MAC:  Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
+   wxPATH_MAC:  Mac OS 8/9 only, not used any longer, absolute file
                 names have the form
                     volume:dir1:...:dirN:filename
                 and the relative file names are either
@@ -93,13 +92,16 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/dynlib.h"
 #include "wx/dir.h"
+#include "wx/longlong.h"
 
 #if defined(__WIN32__) && defined(__MINGW32__)
     #include "wx/msw/gccpriv.h"
 #endif
 
 #ifdef __WINDOWS__
-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"
+    #include <shlobj.h>         // for CLSID_ShellLink
+    #include "wx/msw/missing.h"
 #endif
 
 #if defined(__WXMAC__)
@@ -118,19 +120,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef __MWERKS__
-#ifdef __MACH__
-#include <sys/types.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#else
-#include <stat.h>
-#include <unistd.h>
-#include <unix.h>
-#endif
-#endif
-
 #ifdef __WATCOMC__
 #include <io.h>
 #include <sys/utime.h>
@@ -242,49 +231,30 @@ private:
 
 #if wxUSE_DATETIME && defined(__WIN32__) && !defined(__WXMICROWIN__)
 
-// convert between wxDateTime and FILETIME which is a 64-bit value representing
-// the number of 100-nanosecond intervals since January 1, 1601.
+// Convert between wxDateTime and FILETIME which is a 64-bit value representing
+// the number of 100-nanosecond intervals since January 1, 1601 UTC.
+//
+// This is the offset between FILETIME epoch and the Unix/wxDateTime Epoch.
+static wxInt64 EPOCH_OFFSET_IN_MSEC = wxLL(11644473600000);
 
 static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
 {
-    FILETIME ftcopy = ft;
-    FILETIME ftLocal;
-    if ( !::FileTimeToLocalFileTime(&ftcopy, &ftLocal) )
-    {
-        wxLogLastError(wxT("FileTimeToLocalFileTime"));
-    }
+    wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime);
+    t /= 10000; // Convert hundreds of nanoseconds to milliseconds.
+    t -= EPOCH_OFFSET_IN_MSEC;
 
-    SYSTEMTIME st;
-    if ( !::FileTimeToSystemTime(&ftLocal, &st) )
-    {
-        wxLogLastError(wxT("FileTimeToSystemTime"));
-    }
-
-    dt->Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
-            st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+    *dt = wxDateTime(t);
 }
 
 static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
 {
-    SYSTEMTIME st;
-    st.wDay = dt.GetDay();
-    st.wMonth = (WORD)(dt.GetMonth() + 1);
-    st.wYear = (WORD)dt.GetYear();
-    st.wHour = dt.GetHour();
-    st.wMinute = dt.GetMinute();
-    st.wSecond = dt.GetSecond();
-    st.wMilliseconds = dt.GetMillisecond();
+    // Undo the conversions above.
+    wxLongLong t(dt.GetValue());
+    t += EPOCH_OFFSET_IN_MSEC;
+    t *= 10000;
 
-    FILETIME ftLocal;
-    if ( !::SystemTimeToFileTime(&st, &ftLocal) )
-    {
-        wxLogLastError(wxT("SystemTimeToFileTime"));
-    }
-
-    if ( !::LocalFileTimeToFileTime(&ftLocal, ft) )
-    {
-        wxLogLastError(wxT("LocalFileTimeToFileTime"));
-    }
+    ft->dwHighDateTime = t.GetHi();
+    ft->dwLowDateTime = t.GetLo();
 }
 
 #endif // wxUSE_DATETIME && __WIN32__
@@ -345,6 +315,62 @@ static bool IsUNCPath(const wxString& path, wxPathFormat format)
                             !IsDOSPathSep(path[2u]);
 }
 
+// Under Unix-ish systems (basically everything except Windows but we can't
+// just test for non-__WIN32__ because Cygwin defines it, yet we want to use
+// lstat() under it, so test for all the rest explicitly) we may work either
+// with the file itself or its target if it's a symbolic link and we should
+// dereference it, as determined by wxFileName::ShouldFollowLink() and the
+// absence of the wxFILE_EXISTS_NO_FOLLOW flag. StatAny() can be used to stat
+// the appropriate file with an extra twist that it also works when there is no
+// wxFileName object at all, as is the case in static methods.
+
+#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
+    #define wxHAVE_LSTAT
+#endif
+
+#ifdef wxHAVE_LSTAT
+
+// Private implementation, don't call directly, use one of the overloads below.
+bool DoStatAny(wxStructStat& st, wxString path, bool dereference)
+{
+    // We need to remove any trailing slashes from the path because they could
+    // interfere with the symlink following decision: even if we use lstat(),
+    // it would still follow the symlink if we pass it a path with a slash at
+    // the end because the symlink resolution would happen while following the
+    // path and not for the last path element itself.
+
+    while ( wxEndsWithPathSeparator(path) )
+    {
+        const size_t posLast = path.length() - 1;
+        if ( !posLast )
+        {
+            // Don't turn "/" into empty string.
+            break;
+        }
+
+        path.erase(posLast);
+    }
+
+    int ret = dereference ? wxStat(path, &st) : wxLstat(path, &st);
+    return ret == 0;
+}
+
+// Overloads to use for a case when we don't have wxFileName object and when we
+// do have one.
+inline
+bool StatAny(wxStructStat& st, const wxString& path, int flags)
+{
+    return DoStatAny(st, path, !(flags & wxFILE_EXISTS_NO_FOLLOW));
+}
+
+inline
+bool StatAny(wxStructStat& st, const wxFileName& fn)
+{
+    return DoStatAny(st, fn.GetFullPath(), fn.ShouldFollowLink());
+}
+
+#endif // wxHAVE_LSTAT
+
 // ----------------------------------------------------------------------------
 // private constants
 // ----------------------------------------------------------------------------
@@ -370,6 +396,7 @@ void wxFileName::Assign( const wxFileName &filepath )
     m_ext = filepath.GetExt();
     m_relative = filepath.m_relative;
     m_hasExt = filepath.m_hasExt;
+    m_dontFollowLinks = filepath.m_dontFollowLinks;
 }
 
 void wxFileName::Assign(const wxString& volume,
@@ -568,17 +595,19 @@ void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
 
 void wxFileName::Clear()
 {
-    m_dirs.Clear();
-
-    m_volume =
-    m_name =
-    m_ext = wxEmptyString;
+    m_dirs.clear();
+    m_volume.clear();
+    m_name.clear();
+    m_ext.clear();
 
     // we don't have any absolute path for now
     m_relative = true;
 
     // nor any extension
     m_hasExt = false;
+
+    // follow symlinks by default
+    m_dontFollowLinks = false;
 }
 
 /* static */
@@ -602,16 +631,6 @@ wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format)
 namespace
 {
 
-// Flags for wxFileSystemObjectExists() asking it to check for:
-enum
-{
-    wxFileSystemObject_File  = 1,   // file existence
-    wxFileSystemObject_Dir   = 2,   // directory existence
-    wxFileSystemObject_Other = 4,   // existence of something else, e.g.
-                                    // device, socket, FIFO under Unix
-    wxFileSystemObject_Any   = 7    // existence of anything at all
-};
-
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
 
 void RemoveTrailingSeparatorsFromPath(wxString& strPath)
@@ -636,12 +655,14 @@ void RemoveTrailingSeparatorsFromPath(wxString& strPath)
 
 #endif // __WINDOWS__ || __OS2__
 
-bool wxFileSystemObjectExists(const wxString& path, int flags)
+bool
+wxFileSystemObjectExists(const wxString& path, int flags)
 {
+
     // Should the existence of file/directory with this name be accepted, i.e.
     // result in the true return value from this function?
-    const bool acceptFile = (flags & wxFileSystemObject_File) != 0;
-    const bool acceptDir  = (flags & wxFileSystemObject_Dir) != 0;
+    const bool acceptFile = (flags & wxFILE_EXISTS_REGULAR) != 0;
+    const bool acceptDir  = (flags & wxFILE_EXISTS_DIR)  != 0;
 
     wxString strPath(path);
 
@@ -655,7 +676,7 @@ bool wxFileSystemObjectExists(const wxString& path, int flags)
 
     // we must use GetFileAttributes() instead of the ANSI C functions because
     // it can cope with network (UNC) paths unlike them
-    DWORD ret = ::GetFileAttributes(path.t_str());
+    DWORD ret = ::GetFileAttributes(strPath.t_str());
 
     if ( ret == INVALID_FILE_ATTRIBUTES )
         return false;
@@ -689,22 +710,35 @@ bool wxFileSystemObjectExists(const wxString& path, int flags)
     // We consider that the path must exist if we get a sharing violation for
     // it but we don't know what is it in this case.
     if ( rc == ERROR_SHARING_VIOLATION )
-        return flags & wxFileSystemObject_Other;
+        return flags & wxFILE_EXISTS_ANY;
 
     // Any other error (usually ERROR_PATH_NOT_FOUND), means there is nothing
     // there.
     return false;
 #else // Non-MSW, non-OS/2
     wxStructStat st;
-    if ( wxStat(strPath, &st) != 0 )
+    if ( !StatAny(st, strPath, flags) )
         return false;
 
     if ( S_ISREG(st.st_mode) )
         return acceptFile;
     if ( S_ISDIR(st.st_mode) )
         return acceptDir;
+    if ( S_ISLNK(st.st_mode) )
+    {
+        // Take care to not test for "!= 0" here as this would erroneously
+        // return true if only wxFILE_EXISTS_NO_FOLLOW, which is part of
+        // wxFILE_EXISTS_SYMLINK, is set too.
+        return (flags & wxFILE_EXISTS_SYMLINK) == wxFILE_EXISTS_SYMLINK;
+    }
+    if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) )
+        return (flags & wxFILE_EXISTS_DEVICE) != 0;
+    if ( S_ISFIFO(st.st_mode) )
+        return (flags & wxFILE_EXISTS_FIFO) != 0;
+    if ( S_ISSOCK(st.st_mode) )
+        return (flags & wxFILE_EXISTS_SOCKET) != 0;
 
-    return flags & wxFileSystemObject_Other;
+    return flags & wxFILE_EXISTS_ANY;
 #endif // Platforms
 }
 
@@ -712,30 +746,50 @@ bool wxFileSystemObjectExists(const wxString& path, int flags)
 
 bool wxFileName::FileExists() const
 {
-    return wxFileName::FileExists( GetFullPath() );
+    int flags = wxFILE_EXISTS_REGULAR;
+    if ( !ShouldFollowLink() )
+        flags |= wxFILE_EXISTS_NO_FOLLOW;
+
+    return wxFileSystemObjectExists(GetFullPath(), flags);
 }
 
 /* static */
 bool wxFileName::FileExists( const wxString &filePath )
 {
-    return wxFileSystemObjectExists(filePath, wxFileSystemObject_File);
+    return wxFileSystemObjectExists(filePath, wxFILE_EXISTS_REGULAR);
 }
 
 bool wxFileName::DirExists() const
 {
-    return wxFileName::DirExists( GetPath() );
+    int flags = wxFILE_EXISTS_DIR;
+    if ( !ShouldFollowLink() )
+        flags |= wxFILE_EXISTS_NO_FOLLOW;
+
+    return Exists(GetPath(), flags);
 }
 
 /* static */
 bool wxFileName::DirExists( const wxString &dirPath )
 {
-    return wxFileSystemObjectExists(dirPath, wxFileSystemObject_Dir);
+    return wxFileSystemObjectExists(dirPath, wxFILE_EXISTS_DIR);
+}
+
+bool wxFileName::Exists(int flags) const
+{
+    // Notice that wxFILE_EXISTS_NO_FOLLOW may be specified in the flags even
+    // if our DontFollowLink() hadn't been called and we do honour it then. But
+    // if the user took the care of calling DontFollowLink(), it is always
+    // taken into account.
+    if ( !ShouldFollowLink() )
+        flags |= wxFILE_EXISTS_NO_FOLLOW;
+
+    return wxFileSystemObjectExists(GetFullPath(), flags);
 }
 
 /* static */
-bool wxFileName::Exists(const wxString& path)
+bool wxFileName::Exists(const wxString& path, int flags)
 {
-    return wxFileSystemObjectExists(path, wxFileSystemObject_Any);
+    return wxFileSystemObjectExists(path, flags);
 }
 
 // ----------------------------------------------------------------------------
@@ -825,7 +879,7 @@ static int wxOpenWithDeleteOnClose(const wxString& filename)
     DWORD attributes = FILE_ATTRIBUTE_TEMPORARY |
                        FILE_FLAG_DELETE_ON_CLOSE;
 
-    HANDLE h = ::CreateFile(filename.fn_str(), access, 0, NULL,
+    HANDLE h = ::CreateFile(filename.t_str(), access, 0, NULL,
                             disposition, attributes, NULL);
 
     return wxOpenOSFHandle(h, wxO_BINARY);
@@ -1001,7 +1055,7 @@ static wxString wxCreateTempImpl(
     }
 #else // !HAVE_MKTEMP (includes __DOS__)
     // generate the unique file name ourselves
-    #if !defined(__DOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) )
+    #if !defined(__DOS__)
     path << (unsigned int)getpid();
     #endif
 
@@ -1331,11 +1385,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
         SHFILEOPSTRUCT fileop;
         wxZeroMemory(fileop);
         fileop.wFunc = FO_DELETE;
-    #if defined(__CYGWIN__) && defined(wxUSE_UNICODE)
-        fileop.pFrom = path.wc_str();
-    #else
-        fileop.pFrom = path.fn_str();
-    #endif
+        fileop.pFrom = path.t_str();
         fileop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION;
     #ifndef __WXWINCE__
         // FOF_NOERRORUI is not defined in WinCE
@@ -1358,6 +1408,20 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
     if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE
 #endif // !__WINDOWS__
     {
+#ifndef __WINDOWS__
+        if ( flags & wxPATH_RMDIR_RECURSIVE )
+        {
+            // When deleting the tree recursively, we are supposed to delete
+            // this directory itself even when it is a symlink -- but without
+            // following it. Do it here as wxRmdir() would simply follow if
+            // called for a symlink.
+            if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK) )
+            {
+                return wxRemoveFile(dir);
+            }
+        }
+#endif // !__WINDOWS__
+
         wxString path(dir);
         if ( path.Last() != wxFILE_SEP_PATH )
             path += wxFILE_SEP_PATH;
@@ -1369,8 +1433,11 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
 
         wxString filename;
 
-        // first delete all subdirectories
-        bool cont = d.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
+        // First delete all subdirectories: notice that we don't follow
+        // symbolic links, potentially leading outside this directory, to avoid
+        // unpleasant surprises.
+        bool cont = d.GetFirst(&filename, wxString(),
+                               wxDIR_DIRS | wxDIR_HIDDEN | wxDIR_NO_FOLLOW);
         while ( cont )
         {
             wxFileName::Rmdir(path + filename, flags);
@@ -1380,8 +1447,11 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
 #ifndef __WINDOWS__
         if ( flags & wxPATH_RMDIR_RECURSIVE )
         {
-            // delete all files too
-            cont = d.GetFirst(&filename, "", wxDIR_FILES | wxDIR_HIDDEN);
+            // Delete all files too and, for the same reasons as above, don't
+            // follow symlinks which could refer to the files outside of this
+            // directory and just delete the symlinks themselves.
+            cont = d.GetFirst(&filename, wxString(),
+                              wxDIR_FILES | wxDIR_HIDDEN | wxDIR_NO_FOLLOW);
             while ( cont )
             {
                 ::wxRemoveFile(path + filename);
@@ -1620,13 +1690,6 @@ bool wxFileName::ReplaceHomeDir(wxPathFormat format)
 // quotation marks."
 
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
-// The following lines are necessary under WinCE
-// #include "wx/msw/private.h"
-// #include <ole2.h>
-#include <shlobj.h>
-#if defined(__WXWINCE__)
-#include <shlguid.h>
-#endif
 
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
                                    wxString& targetFilename,
@@ -1794,16 +1857,15 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
     if ( fn1.GetFullPath() == fn2.GetFullPath() )
         return true;
 
-#if defined(__UNIX__)
+#ifdef wxHAVE_LSTAT
     wxStructStat st1, st2;
-    if ( wxStat(fn1.GetFullPath(), &st1) == 0 &&
-            wxStat(fn2.GetFullPath(), &st2) == 0 )
+    if ( StatAny(st1, fn1) && StatAny(st2, fn2) )
     {
         if ( st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev )
             return true;
     }
     //else: It's not an error if one or both files don't exist.
-#endif // defined __UNIX__
+#endif // wxHAVE_LSTAT
 
     return false;
 }
@@ -1811,7 +1873,7 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
 /* static */
 bool wxFileName::IsCaseSensitive( wxPathFormat format )
 {
-    // only Unix filenames are truely case-sensitive
+    // only Unix filenames are truly case-sensitive
     return GetFormat(format) == wxPATH_UNIX;
 }
 
@@ -1836,7 +1898,7 @@ wxString wxFileName::GetForbiddenChars(wxPathFormat format)
         case wxPATH_MAC:
             // On a Mac even names with * and ? are allowed (Tested with OS
             // 9.2.1 and OS X 10.2.5)
-            strForbiddenChars = wxEmptyString;
+            strForbiddenChars.clear();
             break;
 
         case wxPATH_DOS:
@@ -1958,10 +2020,12 @@ wxFileName::IsMSWUniqueVolumeNamePath(const wxString& path, wxPathFormat format)
     return true;
 }
 
-void wxFileName::AppendDir( const wxString& dir )
+bool wxFileName::AppendDir( const wxString& dir )
 {
-    if ( IsValidDirComponent(dir) )
-        m_dirs.Add( dir );
+    if (!IsValidDirComponent(dir))
+        return false;
+    m_dirs.Add(dir);
+    return true;
 }
 
 void wxFileName::PrependDir( const wxString& dir )
@@ -1969,10 +2033,12 @@ void wxFileName::PrependDir( const wxString& dir )
     InsertDir(0, dir);
 }
 
-void wxFileName::InsertDir(size_t before, const wxString& dir)
+bool wxFileName::InsertDir(size_t before, const wxString& dir)
 {
-    if ( IsValidDirComponent(dir) )
-        m_dirs.Insert(dir, before);
+    if (!IsValidDirComponent(dir))
+        return false;
+    m_dirs.Insert(dir, before);
+    return true;
 }
 
 void wxFileName::RemoveDir(size_t pos)
@@ -2214,7 +2280,7 @@ wxString wxFileName::GetLongPath() const
                   GetVolumeSeparator(wxPATH_DOS) +
                   GetPathSeparator(wxPATH_DOS);
     else
-        pathOut = wxEmptyString;
+        pathOut.clear();
 
     wxArrayString dirs = GetDirs();
     dirs.Add(GetFullName());
@@ -2512,6 +2578,37 @@ wxString wxFileName::StripExtension(const wxString& fullpath)
     return fn.GetFullPath();
 }
 
+// ----------------------------------------------------------------------------
+// file permissions functions
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SetPermissions(int permissions)
+{
+    // Don't do anything for a symlink but first make sure it is one.
+    if ( m_dontFollowLinks &&
+            Exists(wxFILE_EXISTS_SYMLINK|wxFILE_EXISTS_NO_FOLLOW) )
+    {
+        // Looks like changing permissions for a symlinc is only supported
+        // on BSD where lchmod is present and correctly implemented.
+        // http://lists.gnu.org/archive/html/bug-coreutils/2009-09/msg00268.html
+        return false;
+    }
+
+#ifdef __WINDOWS__
+    int accMode = 0;
+
+    if ( permissions & (wxS_IRUSR|wxS_IRGRP|wxS_IROTH) )
+        accMode = _S_IREAD;
+
+    if ( permissions & (wxS_IWUSR|wxS_IWGRP|wxS_IWOTH) )
+        accMode |= _S_IWRITE;
+
+    permissions = accMode;
+#endif // __WINDOWS__
+
+    return wxChmod(GetFullPath(), permissions) == 0;
+}
+
 // ----------------------------------------------------------------------------
 // time functions
 // ----------------------------------------------------------------------------
@@ -2661,10 +2758,10 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
 
         return true;
     }
-#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
+#elif defined(wxHAVE_LSTAT)
     // no need to test for IsDir() here
     wxStructStat stBuf;
-    if ( wxStat( GetFullPath(), &stBuf) == 0 )
+    if ( StatAny(stBuf, *this) )
     {
         // Android defines st_*time fields as unsigned long, but time_t as long,
         // hence the static_casts.
diff --git a/Externals/wxWidgets3/src/common/filepickercmn.cpp b/Externals/wxWidgets3/src/common/filepickercmn.cpp
index 6044dffa6d..a58b4adfec 100644
--- a/Externals/wxWidgets3/src/common/filepickercmn.cpp
+++ b/Externals/wxWidgets3/src/common/filepickercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: filepickercmn.cpp 68920 2011-08-27 14:11:20Z VZ $
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -44,8 +43,8 @@ const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
 const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse");
 const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");
 
-wxDEFINE_EVENT( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
+wxDEFINE_EVENT( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDEFINE_EVENT( wxEVT_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 
 // ----------------------------------------------------------------------------
@@ -63,8 +62,6 @@ bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
                                          const wxValidator& validator,
                                          const wxString &name )
 {
-    wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
-
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
                                    style, validator, name))
         return false;
@@ -115,19 +112,17 @@ void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
 {
     wxASSERT(m_text);
 
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
     // remove the eventually present path-separator from the end of the textctrl
     // string otherwise we would generate a wxFileDirPickerEvent when changing
     // from e.g. /home/user to /home/user/ and we want to avoid it !
     wxString newpath(GetTextCtrlValue());
-    if (!CheckPath(newpath))
-        return;       // invalid user input
+
+    // Notice that we use to check here whether the current path is valid, i.e.
+    // if the corresponding file or directory exists for the controls with
+    // wxFLP_FILE_MUST_EXIST or wxDIRP_DIR_MUST_EXIST flag, however we don't do
+    // this any more as we still must notify the program about any changes in
+    // the control, otherwise its view of it would be different from what is
+    // actually shown on the screen, resulting in very confusing UI.
 
     if (m_pickerIface->GetPath() != newpath)
     {
@@ -150,11 +145,10 @@ void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
     if (!m_text)
         return;     // no textctrl to update
 
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(m_pickerIface->GetPath());
+    // Take care to use ChangeValue() here and not SetValue() to avoid
+    // generating an event that would trigger UpdateTextCtrlFromPicker()
+    // resulting in infinite recursion.
+    m_text->ChangeValue(m_pickerIface->GetPath());
 }
 
 
@@ -207,15 +201,6 @@ bool wxFilePickerCtrl::Create(wxWindow *parent,
     return true;
 }
 
-bool wxFilePickerCtrl::CheckPath(const wxString& path) const
-{
-    // if wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we
-    // must accept any path
-    return HasFlag(wxFLP_SAVE) ||
-            !HasFlag(wxFLP_FILE_MUST_EXIST) ||
-                wxFileName::FileExists(path);
-}
-
 wxString wxFilePickerCtrl::GetTextCtrlValue() const
 {
     // filter it through wxFileName to remove any spurious path separator
@@ -254,12 +239,6 @@ bool wxDirPickerCtrl::Create(wxWindow *parent,
     return true;
 }
 
-bool wxDirPickerCtrl::CheckPath(const wxString& path) const
-{
-    // if wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path
-    return !HasFlag(wxDIRP_DIR_MUST_EXIST) || wxFileName::DirExists(path);
-}
-
 wxString wxDirPickerCtrl::GetTextCtrlValue() const
 {
     // filter it through wxFileName to remove any spurious path separator
diff --git a/Externals/wxWidgets3/src/common/filesys.cpp b/Externals/wxWidgets3/src/common/filesys.cpp
index 82e1ada6c4..06edca28a2 100644
--- a/Externals/wxWidgets3/src/common/filesys.cpp
+++ b/Externals/wxWidgets3/src/common/filesys.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// CVS-ID:      $Id: filesys.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -262,7 +261,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     }
 
     return new wxFSFile(is,
-                        right,
+                        location,
                         wxEmptyString,
                         GetAnchor(location)
 #if wxUSE_DATETIME
@@ -756,5 +755,29 @@ class wxFileSystemModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
+//// wxFSInputStream
+
+wxFSInputStream::wxFSInputStream(const wxString& filename, int flags)
+{
+    wxFileSystem fs;
+    m_file = fs.OpenFile(filename, flags | wxFS_READ);
+
+    if ( m_file )
+    {
+        wxInputStream* const stream = m_file->GetStream();
+        if ( stream )
+        {
+            // Notice that we pass the stream by reference: it shouldn't be
+            // deleted by us as it's owned by m_file already.
+            InitParentStream(*stream);
+        }
+    }
+}
+
+wxFSInputStream::~wxFSInputStream()
+{
+    delete m_file;
+}
+
 #endif
   // wxUSE_FILESYSTEM
diff --git a/Externals/wxWidgets3/src/common/filtall.cpp b/Externals/wxWidgets3/src/common/filtall.cpp
index 952730f82b..bfdf31324b 100644
--- a/Externals/wxWidgets3/src/common/filtall.cpp
+++ b/Externals/wxWidgets3/src/common/filtall.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/filtall.cpp
 // Purpose:     Link all filter streams
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: filtall.cpp 42412 2006-10-25 20:41:12Z MW $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/filtfind.cpp b/Externals/wxWidgets3/src/common/filtfind.cpp
index 0873ad712d..9e25441fa2 100644
--- a/Externals/wxWidgets3/src/common/filtfind.cpp
+++ b/Externals/wxWidgets3/src/common/filtfind.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/filtfind.cpp
 // Purpose:     Streams for filter formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: filtfind.cpp 46391 2007-06-10 17:42:41Z VS $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/fldlgcmn.cpp b/Externals/wxWidgets3/src/common/fldlgcmn.cpp
index 0e8780d782..0b02b78409 100644
--- a/Externals/wxWidgets3/src/common/fldlgcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fldlgcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      John Labenski
 // Modified by:
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)
-// RCS-ID:      $Id: fldlgcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,6 +67,24 @@ bool wxFileDialogBase::Create(wxWindow *parent,
     m_wildCard = wildCard;
 
     m_parent = parent;
+
+#ifdef __WXOSX__
+    /*
+    [DS]
+    Remove the (for OS X unnecessary) wxFD_FILE_MUST_EXIST flag. Using it
+    causes problems when having an extra panel (either a custom one or
+    by showing the filetype filters through calling
+    wxSystemOptions::SetOption(wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES, 1) ).
+    Presumably the style flag conflicts with other style flags and an
+    assert in wxRegion::DoOffset is triggered later on.
+    Another solution was to override GetWindowStyleFlag() to not include
+    wxFD_FILE_MUST_EXIST in its return value, but as other wxFileDialog
+    style flags (that are actually used) dont't seem to cause problems
+    this seemed an easier solution.
+    */
+    style &= ~wxFD_FILE_MUST_EXIST;
+#endif
+
     m_windowStyle = style;
     m_filterIndex = 0;
 
diff --git a/Externals/wxWidgets3/src/common/fmapbase.cpp b/Externals/wxWidgets3/src/common/fmapbase.cpp
index 56ce5f73a6..698996c1b1 100644
--- a/Externals/wxWidgets3/src/common/fmapbase.cpp
+++ b/Externals/wxWidgets3/src/common/fmapbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
-// RCS-ID:      $Id: fmapbase.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -88,6 +87,8 @@ static const wxFontEncoding gs_encodings[] =
     wxFONTENCODING_CP1255,
     wxFONTENCODING_CP1256,
     wxFONTENCODING_CP1257,
+    wxFONTENCODING_CP1258,
+    wxFONTENCODING_CP1361,
     wxFONTENCODING_CP437,
     wxFONTENCODING_UTF7,
     wxFONTENCODING_UTF8,
@@ -175,6 +176,8 @@ static const char* const gs_encodingDescs[] =
     wxTRANSLATE( "Windows Hebrew (CP 1255)" ),
     wxTRANSLATE( "Windows Arabic (CP 1256)" ),
     wxTRANSLATE( "Windows Baltic (CP 1257)" ),
+    wxTRANSLATE( "Windows Vietnamese (CP 1258)" ),
+    wxTRANSLATE( "Windows Johab (CP 1361)" ),
     wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),
     wxTRANSLATE( "Unicode 7 bit (UTF-7)" ),
     wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),
@@ -266,7 +269,7 @@ static const wxChar* const gs_encodingNames[][9] =
 
     { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL },
     { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
-    { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), NULL },
+    { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), wxT( "gbk" ),wxT( "GBK" ), NULL },
     { wxT( "WINDOWS-949" ), wxT( "CP949" ), wxT( "MS949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
     { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), wxT( "BIG5" ), wxT( "BIG-5" ), wxT( "BIG-FIVE" ), NULL },
     { wxT( "WINDOWS-1250" ),wxT( "CP1250" ),wxT( "MS1250" ),wxT( "IBM-1250" ),NULL },
@@ -277,6 +280,8 @@ static const wxChar* const gs_encodingNames[][9] =
     { wxT( "WINDOWS-1255" ),wxT( "CP1255" ),wxT( "MS1255" ),wxT( "IBM-1255" ),NULL },
     { wxT( "WINDOWS-1256" ),wxT( "CP1256" ),wxT( "MS1256" ),wxT( "IBM-1256" ),NULL },
     { wxT( "WINDOWS-1257" ),wxT( "CP1257" ),wxT( "MS1257" ),wxT( "IBM-1257" ),NULL },
+    { wxT( "WINDOWS-1258" ),wxT( "CP1258" ),wxT( "MS1258" ),wxT( "IBM-1258" ),NULL },
+    { wxT( "WINDOWS-1361" ),wxT( "CP1361" ),wxT( "MS1361" ),wxT( "IBM-1361" ), wxT( "JOHAB" ), NULL },
     { wxT( "WINDOWS-437" ), wxT( "CP437" ), wxT( "MS437" ), wxT( "IBM-437" ), NULL },
 
     { wxT( "UTF-7" ), wxT("UTF7"), NULL },
@@ -750,6 +755,14 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
                         case 950:
                             encoding = wxFONTENCODING_CP950;
                             break;
+
+                        case 1258:
+                            encoding = wxFONTENCODING_CP1258;
+                            break;
+
+                        case 1361:
+                            encoding = wxFONTENCODING_CP1361;
+                            break;
                     }
                 }
             }
diff --git a/Externals/wxWidgets3/src/common/fontcmn.cpp b/Externals/wxWidgets3/src/common/fontcmn.cpp
index 0d27ca12f0..715e2c05f6 100644
--- a/Externals/wxWidgets3/src/common/fontcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99
-// RCS-ID:      $Id: fontcmn.cpp 70564 2012-02-10 23:34:45Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -842,7 +841,7 @@ wxString wxNativeFontInfo::ToUserString() const
             // that the different words which compose this facename are
             // not different adjectives or other data but rather all parts
             // of the facename
-            desc << wxT(" '") << face << _("'");
+            desc << wxT(" '") << face << wxT("'");
         }
         else
             desc << wxT(' ') << face;
diff --git a/Externals/wxWidgets3/src/common/fontdata.cpp b/Externals/wxWidgets3/src/common/fontdata.cpp
index 8fc9cbbaa0..deef52ce2a 100644
--- a/Externals/wxWidgets3/src/common/fontdata.cpp
+++ b/Externals/wxWidgets3/src/common/fontdata.cpp
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/fontdata.cpp
 // Author:      Julian Smart
-// RCS-ID:      $Id: fontdata.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,3 +66,29 @@ wxFontData& wxFontData::operator=(const wxFontData& data)
     return *this;
 }
 #endif // wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
+
+#if wxUSE_FONTDLG
+
+#include "wx/fontdlg.h"
+
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
+{
+    wxFontData data;
+    if ( fontInit.IsOk() )
+    {
+        data.SetInitialFont(fontInit);
+    }
+
+    wxFont fontRet;
+    wxFontDialog dialog(parent, data);
+    if (!caption.empty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        fontRet = dialog.GetFontData().GetChosenFont();
+    }
+    //else: leave it invalid
+
+    return fontRet;
+}
+#endif // wxUSE_FONTDLG
diff --git a/Externals/wxWidgets3/src/common/fontenumcmn.cpp b/Externals/wxWidgets3/src/common/fontenumcmn.cpp
index 23fd492db6..1185a864ab 100644
--- a/Externals/wxWidgets3/src/common/fontenumcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontenumcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     7/5/2006
-// RCS-ID:      $Id: fontenumcmn.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/fontmap.cpp b/Externals/wxWidgets3/src/common/fontmap.cpp
index 595b6b3eec..ffac05c213 100644
--- a/Externals/wxWidgets3/src/common/fontmap.cpp
+++ b/Externals/wxWidgets3/src/common/fontmap.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.11.99
-// RCS-ID:      $Id: fontmap.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -99,6 +98,8 @@ wxENUM_MEMBER( wxFONTENCODING_CP1254 )
 wxENUM_MEMBER( wxFONTENCODING_CP1255 )
 wxENUM_MEMBER( wxFONTENCODING_CP1256 )
 wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+wxENUM_MEMBER( wxFONTENCODING_CP1258 )
+wxENUM_MEMBER( wxFONTENCODING_CP1361 )
 wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
 wxENUM_MEMBER( wxFONTENCODING_UTF7 )
 wxENUM_MEMBER( wxFONTENCODING_UTF8 )
@@ -518,10 +519,4 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
     return wxTestFontEncoding(info);
 }
 
-#if wxUSE_FONTDLG
-wxFontDialogBase::~wxFontDialogBase()
-{
-}
-#endif
-
 #endif // wxUSE_FONTMAP
diff --git a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp b/Externals/wxWidgets3/src/common/fontmgrcmn.cpp
index 527352373c..9dd64f859a 100644
--- a/Externals/wxWidgets3/src/common/fontmgrcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontmgrcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     font management for ports that don't have their own
 // Author:      Vaclav Slavik
 // Created:     2006-11-18
-// RCS-ID:      $Id: fontmgrcmn.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 //              (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/fontpickercmn.cpp b/Externals/wxWidgets3/src/common/fontpickercmn.cpp
index 5d2c33c8a9..83e6a36e17 100644
--- a/Externals/wxWidgets3/src/common/fontpickercmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontpickercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: fontpickercmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -42,7 +41,7 @@
 const char wxFontPickerCtrlNameStr[] = "fontpicker";
 const char wxFontPickerWidgetNameStr[] = "fontpickerwidget";
 
-wxDEFINE_EVENT(wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent);
+wxDEFINE_EVENT(wxEVT_FONTPICKER_CHANGED, wxFontPickerEvent);
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
 
@@ -71,7 +70,7 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     // complete sizer creation
     wxPickerBase::PostCreation();
 
-    m_picker->Connect(wxEVT_COMMAND_FONTPICKER_CHANGED,
+    m_picker->Connect(wxEVT_FONTPICKER_CHANGED,
             wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
             NULL, this);
 
@@ -125,13 +124,6 @@ void wxFontPickerCtrl::UpdatePickerFromTextCtrl()
 {
     wxASSERT(m_text);
 
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
     // NB: we don't use the wxFont::wxFont(const wxString &) constructor
     //     since that constructor expects the native font description
     //     string returned by wxFont::GetNativeFontInfoDesc() and not
@@ -155,11 +147,9 @@ void wxFontPickerCtrl::UpdateTextCtrlFromPicker()
     if (!m_text)
         return;     // no textctrl to update
 
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(Font2String(M_PICKER->GetSelectedFont()));
+    // Take care to use ChangeValue() here and not SetValue() to avoid
+    // infinite recursion.
+    m_text->ChangeValue(Font2String(M_PICKER->GetSelectedFont()));
 }
 
 
diff --git a/Externals/wxWidgets3/src/common/fontutilcmn.cpp b/Externals/wxWidgets3/src/common/fontutilcmn.cpp
index 823dd53402..f13e717862 100644
--- a/Externals/wxWidgets3/src/common/fontutilcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontutilcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-20
-// RCS-ID:      $Id: fontutilcmn.cpp 44288 2007-01-22 14:05:07Z VS $
 // Copyright:   (c) Vadim Zeitlin, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/framecmn.cpp b/Externals/wxWidgets3/src/common/framecmn.cpp
index aab30e9c81..bf310d7f9d 100644
--- a/Externals/wxWidgets3/src/common/framecmn.cpp
+++ b/Externals/wxWidgets3/src/common/framecmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
-// Id:          $Id: framecmn.cpp 69101 2011-09-16 13:23:14Z VZ $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
@@ -40,16 +40,34 @@ extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
 // event table
 // ----------------------------------------------------------------------------
 
-#if wxUSE_MENUS && wxUSE_STATUSBAR
+#if wxUSE_MENUS
 
+#if wxUSE_STATUSBAR
 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()
+#endif // wxUSE_STATUSBAR
 
-#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+/* static */
+bool wxFrameBase::ShouldUpdateMenuFromIdle()
+{
+    // Usually this is determined at compile time and is determined by whether
+    // the platform supports wxEVT_MENU_OPEN, however in wxGTK we need to also
+    // check if we're using the global menu bar as we don't get EVT_MENU_OPEN
+    // for it and need to fall back to idle time updating even if normally
+    // wxUSE_IDLEMENUUPDATES is set to 0 for wxGTK.
+#ifdef __WXGTK20__
+    if ( wxApp::GTKIsUsingGlobalMenu() )
+        return true;
+#endif // !__WXGTK__
+
+    return wxUSE_IDLEMENUUPDATES != 0;
+}
+
+#endif // wxUSE_MENUS
 
 // ============================================================================
 // implementation
@@ -112,15 +130,17 @@ wxEND_FLAGS( wxFrameStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxFrame)
-wxEVENT_PROPERTY( Menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
+wxEVENT_PROPERTY( Menu, wxEVT_MENU, wxCommandEvent)
 
 wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
            wxT("Helpstring"), wxT("group"))
 wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \
                  GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
                  wxT("Helpstring"), wxT("group")) // style
+#if wxUSE_MENUS
 wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group"))
+#endif
 wxEND_PROPERTIES_TABLE()
 
 wxEMPTY_HANDLERS_TABLE(wxFrame)
@@ -242,11 +262,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 
 bool wxFrameBase::ProcessCommand(int id)
 {
-    wxMenuBar *bar = GetMenuBar();
-    if ( !bar )
-        return false;
-
-    wxMenuItem *item = bar->FindItem(id);
+    wxMenuItem* const item = FindItemInMenuBar(id);
     if ( !item )
         return false;
 
@@ -255,8 +271,7 @@ bool wxFrameBase::ProcessCommand(int id)
 
 bool wxFrameBase::ProcessCommand(wxMenuItem *item)
 {
-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, item->GetId());
-    commandEvent.SetEventObject(this);
+    wxCHECK_MSG( item, false, wxS("Menu item can't be NULL") );
 
     if (!item->IsEnabled())
         return true;
@@ -264,19 +279,23 @@ bool wxFrameBase::ProcessCommand(wxMenuItem *item)
     if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
         return true;
 
+    int checked;
     if (item->IsCheckable())
     {
         item->Toggle();
 
         // use the new value
-        commandEvent.SetInt(item->IsChecked());
+        checked = item->IsChecked();
     }
     else // Uncheckable item.
     {
-        commandEvent.SetInt(-1);
+        checked = -1;
     }
 
-    return HandleWindowEvent(commandEvent);
+    wxMenu* const menu = item->GetMenu();
+    wxCHECK_MSG( menu, false, wxS("Menu item should be attached to a menu") );
+
+    return menu->SendEvent(item->GetId(), checked);
 }
 
 #endif // wxUSE_MENUS
@@ -299,9 +318,7 @@ void wxFrameBase::UpdateWindowUI(long flags)
         // If coming from an idle event, we only want to update the menus if
         // we're in the wxUSE_IDLEMENUUPDATES configuration, otherwise they
         // will be update when the menu is opened later
-#if !wxUSE_IDLEMENUUPDATES
-        if ( !(flags & wxUPDATE_UI_FROMIDLE) )
-#endif // wxUSE_IDLEMENUUPDATES
+        if ( !(flags & wxUPDATE_UI_FROMIDLE) || ShouldUpdateMenuFromIdle() )
             DoMenuUpdates();
     }
 #endif // wxUSE_MENUS
@@ -322,12 +339,11 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 
 void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
 {
-#if wxUSE_IDLEMENUUPDATES
-    wxUnusedVar(event);
-#else // !wxUSE_IDLEMENUUPDATES
-    // as we didn't update the menus from idle time, do it now
-    DoMenuUpdates(event.GetMenu());
-#endif // wxUSE_IDLEMENUUPDATES/!wxUSE_IDLEMENUUPDATES
+    if ( !ShouldUpdateMenuFromIdle() )
+    {
+        // as we didn't update the menus from idle time, do it now
+        DoMenuUpdates(event.GetMenu());
+    }
 }
 
 void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
@@ -342,8 +358,8 @@ void wxFrameBase::OnInternalIdle()
 {
     wxTopLevelWindow::OnInternalIdle();
 
-#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
-    if (wxUpdateUIEvent::CanUpdate(this))
+#if wxUSE_MENUS
+    if ( ShouldUpdateMenuFromIdle() && wxUpdateUIEvent::CanUpdate(this) )
         DoMenuUpdates();
 #endif
 }
@@ -545,7 +561,7 @@ wxToolBar* wxFrameBase::CreateToolBar(long style,
         //      a) this allows us to have different defaults for different
         //         platforms (even if we don't have them right now)
         //      b) we don't need to include wx/toolbar.h in the header then
-        style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
+        style = wxTB_DEFAULT_STYLE;
     }
 
     SetToolBar(OnCreateToolBar(style, id, name));
diff --git a/Externals/wxWidgets3/src/common/fs_arc.cpp b/Externals/wxWidgets3/src/common/fs_arc.cpp
index ffaf14a46d..ef1df75f2b 100644
--- a/Externals/wxWidgets3/src/common/fs_arc.cpp
+++ b/Externals/wxWidgets3/src/common/fs_arc.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxArchive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
-// CVS-ID:      $Id: fs_arc.cpp 67254 2011-03-20 00:14:35Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -405,7 +404,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
     }
 
 #if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
-    if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
+    if (wxDynamicCast(factory, wxZipClassFactory))
         ((wxZipInputStream*)s)->m_allowSeeking = true;
 #endif // WXWIN_COMPATIBILITY_2_6
 
diff --git a/Externals/wxWidgets3/src/common/fs_filter.cpp b/Externals/wxWidgets3/src/common/fs_filter.cpp
index 818be8204c..5dccb89298 100644
--- a/Externals/wxWidgets3/src/common/fs_filter.cpp
+++ b/Externals/wxWidgets3/src/common/fs_filter.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxFilter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id: fs_filter.cpp 58634 2009-02-03 12:01:46Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/src/common/fs_inet.cpp b/Externals/wxWidgets3/src/common/fs_inet.cpp
index 53fbc7cbb1..6a9a479301 100644
--- a/Externals/wxWidgets3/src/common/fs_inet.cpp
+++ b/Externals/wxWidgets3/src/common/fs_inet.cpp
@@ -3,7 +3,6 @@
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id: fs_inet.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/src/common/fs_mem.cpp b/Externals/wxWidgets3/src/common/fs_mem.cpp
index b2d18134e3..281cdbbc88 100644
--- a/Externals/wxWidgets3/src/common/fs_mem.cpp
+++ b/Externals/wxWidgets3/src/common/fs_mem.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/fs_mem.cpp
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: fs_mem.cpp 70392 2012-01-18 19:42:58Z VZ $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/fswatchercmn.cpp b/Externals/wxWidgets3/src/common/fswatchercmn.cpp
index eadf694d4d..66fb869e9c 100644
--- a/Externals/wxWidgets3/src/common/fswatchercmn.cpp
+++ b/Externals/wxWidgets3/src/common/fswatchercmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxMswFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatchercmn.cpp 67693 2011-05-03 23:31:39Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,6 +39,16 @@ static wxString GetFSWEventChangeTypeName(int type)
         return "MODIFY";
     case wxFSW_EVENT_ACCESS:
         return "ACCESS";
+    case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
+        return "ATTRIBUTE";
+#ifdef wxHAS_INOTIFY
+    case wxFSW_EVENT_UNMOUNT: // Currently this is wxGTK-only
+        return "UNMOUNT";
+#endif
+    case wxFSW_EVENT_WARNING:
+        return "WARNING";
+    case wxFSW_EVENT_ERROR:
+        return "ERROR";
     }
 
     // should never be reached!
@@ -52,8 +61,15 @@ static wxString GetFSWEventChangeTypeName(int type)
 // wxFileSystemWatcherEvent implementation
 // ============================================================================
 
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystemWatcherEvent, wxEvent);
+
 wxString wxFileSystemWatcherEvent::ToString() const
 {
+    if (IsError())
+    {
+        return wxString::Format("FSW_EVT type=%d (%s) message='%s'", m_changeType,
+            GetFSWEventChangeTypeName(m_changeType), GetErrorDescription());
+    }
     return wxString::Format("FSW_EVT type=%d (%s) path='%s'", m_changeType,
             GetFSWEventChangeTypeName(m_changeType), GetPath().GetFullPath());
 }
@@ -90,34 +106,49 @@ bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events)
     }
     else
     {
-        wxLogError(_("Can't monitor non-existent path \"%s\" for changes."),
+        // Don't overreact to being passed a non-existent item. It may have
+        // only just been deleted, in which case doing nothing is correct
+        wxLogTrace(wxTRACE_FSWATCHER,
+                   "Can't monitor non-existent path \"%s\" for changes.",
                    path.GetFullPath());
         return false;
     }
 
-    return DoAdd(path, events, type);
+    return AddAny(path, events, type);
 }
 
 bool
-wxFileSystemWatcherBase::DoAdd(const wxFileName& path,
-                               int events,
-                               wxFSWPathType type)
+wxFileSystemWatcherBase::AddAny(const wxFileName& path,
+                                int events,
+                                wxFSWPathType type,
+                                const wxString& filespec)
 {
     wxString canonical = GetCanonicalPath(path);
     if (canonical.IsEmpty())
         return false;
 
-    wxCHECK_MSG(m_watches.find(canonical) == m_watches.end(), false,
-                wxString::Format("Path '%s' is already watched", canonical));
-
     // adding a path in a platform specific way
-    wxFSWatchInfo watch(canonical, events, type);
+    wxFSWatchInfo watch(canonical, events, type, filespec);
     if ( !m_service->Add(watch) )
         return false;
 
-    // on success, add path to our 'watch-list'
-    wxFSWatchInfoMap::value_type val(canonical, watch);
-    return m_watches.insert(val).second;
+    // on success, either add path to our 'watch-list'
+    // or, if already watched, inc the refcount. This may happen if
+    // a dir is Add()ed, then later AddTree() is called on a parent dir
+    wxFSWatchInfoMap::iterator it = m_watches.find(canonical);
+    if ( it == m_watches.end() )
+    {
+        wxFSWatchInfoMap::value_type val(canonical, watch);
+        m_watches.insert(val);
+    }
+    else
+    {
+        wxFSWatchInfo& watch = it->second;
+        int count = watch.IncRef();
+        wxLogTrace(wxTRACE_FSWATCHER,
+                   "'%s' is now watched %d times", canonical, count);
+    }
+    return true;
 }
 
 bool wxFileSystemWatcherBase::Remove(const wxFileName& path)
@@ -131,16 +162,21 @@ bool wxFileSystemWatcherBase::Remove(const wxFileName& path)
     wxCHECK_MSG(it != m_watches.end(), false,
                 wxString::Format("Path '%s' is not watched", canonical));
 
-    // remove from watch-list
-    wxFSWatchInfo watch = it->second;
-    m_watches.erase(it);
+    // Decrement the watch's refcount and remove from watch-list if 0
+    bool ret = true;
+    wxFSWatchInfo& watch = it->second;
+    if ( !watch.DecRef() )
+    {
+        // remove in a platform specific way
+        ret = m_service->Remove(watch);
 
-    // remove in a platform specific way
-    return m_service->Remove(watch);
+        m_watches.erase(it);
+    }
+    return ret;
 }
 
 bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
-                                      const wxString& filter)
+                                      const wxString& filespec)
 {
     if (!path.DirExists())
         return false;
@@ -150,38 +186,48 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
     class AddTraverser : public wxDirTraverser
     {
     public:
-        AddTraverser(wxFileSystemWatcherBase* watcher, int events) :
-            m_watcher(watcher), m_events(events)
+        AddTraverser(wxFileSystemWatcherBase* watcher, int events,
+                     const wxString& filespec) :
+            m_watcher(watcher), m_events(events), m_filespec(filespec)
         {
         }
 
-        // CHECK we choose which files to delegate to Add(), maybe we should pass
-        // all of them to Add() and let it choose? this is useful when adding a
-        // file to a dir that is already watched, then not only should we know
-        // about that, but Add() should also behave well then
         virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
         {
+            // There is no need to watch individual files as we watch the
+            // parent directory which will notify us about any changes in them.
             return wxDIR_CONTINUE;
         }
 
         virtual wxDirTraverseResult OnDir(const wxString& dirname)
         {
-            wxLogTrace(wxTRACE_FSWATCHER, "--- AddTree adding '%s' ---",
-                                                                    dirname);
-            // we add as much as possible and ignore errors
-            m_watcher->Add(wxFileName(dirname), m_events);
+            if ( m_watcher->AddAny(wxFileName::DirName(dirname),
+                                   m_events, wxFSWPath_Tree, m_filespec) )
+            {
+                wxLogTrace(wxTRACE_FSWATCHER,
+                   "--- AddTree adding directory '%s' ---", dirname);
+            }
             return wxDIR_CONTINUE;
         }
 
     private:
         wxFileSystemWatcherBase* m_watcher;
         int m_events;
-        wxString m_filter;
+        wxString m_filespec;
     };
 
     wxDir dir(path.GetFullPath());
-    AddTraverser traverser(this, events);
-    dir.Traverse(traverser, filter);
+    // Prevent asserts or infinite loops in trees containing symlinks
+    int flags = wxDIR_DIRS;
+    if ( !path.ShouldFollowLink() )
+    {
+        flags |= wxDIR_NO_FOLLOW;
+    }
+    AddTraverser traverser(this, events, filespec);
+    dir.Traverse(traverser, filespec, flags);
+
+    // Add the path itself explicitly as Traverse() doesn't return it.
+    AddAny(path.GetPathWithSep(), events, wxFSWPath_Tree, filespec);
 
     return true;
 }
@@ -196,30 +242,63 @@ bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path)
     class RemoveTraverser : public wxDirTraverser
     {
     public:
-        RemoveTraverser(wxFileSystemWatcherBase* watcher) :
-            m_watcher(watcher)
+        RemoveTraverser(wxFileSystemWatcherBase* watcher,
+                        const wxString& filespec) :
+            m_watcher(watcher), m_filespec(filespec)
         {
         }
 
-        virtual wxDirTraverseResult OnFile(const wxString& filename)
+        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
         {
-            m_watcher->Remove(wxFileName(filename));
+            // We never watch the individual files when watching the tree, so
+            // nothing to do here.
             return wxDIR_CONTINUE;
         }
 
         virtual wxDirTraverseResult OnDir(const wxString& dirname)
         {
-            m_watcher->RemoveTree(wxFileName(dirname));
+            m_watcher->Remove(wxFileName::DirName(dirname));
             return wxDIR_CONTINUE;
         }
 
     private:
         wxFileSystemWatcherBase* m_watcher;
+        wxString m_filespec;
     };
 
+    // If AddTree() used a filespec, we must use the same one
+    wxString canonical = GetCanonicalPath(path);
+    wxFSWatchInfoMap::iterator it = m_watches.find(canonical);
+    wxCHECK_MSG( it != m_watches.end(), false,
+                 wxString::Format("Path '%s' is not watched", canonical) );
+    wxFSWatchInfo watch = it->second;
+    const wxString filespec = watch.GetFilespec();
+
+#if defined(__WINDOWS__)
+    // When there's no filespec, the wxMSW AddTree() would have set a watch
+    // on only the passed 'path'. We must therefore remove only this
+    if (filespec.empty())
+    {
+        return Remove(path);
+    }
+    // Otherwise fall through to the generic implementation
+#endif // __WINDOWS__
+
     wxDir dir(path.GetFullPath());
-    RemoveTraverser traverser(this);
-    dir.Traverse(traverser);
+    // AddTree() might have used the wxDIR_NO_FOLLOW to prevent asserts or
+    // infinite loops in trees containing symlinks. We need to do the same
+    // or we'll try to remove unwatched items. Let's hope the caller used
+    // the same ShouldFollowLink() setting as in AddTree()...
+    int flags = wxDIR_DIRS;
+    if ( !path.ShouldFollowLink() )
+    {
+        flags |= wxDIR_NO_FOLLOW;
+    }
+    RemoveTraverser traverser(this, filespec);
+    dir.Traverse(traverser, filespec, flags);
+
+    // As in AddTree() above, handle the path itself explicitly.
+    Remove(path);
 
     return true;
 }
diff --git a/Externals/wxWidgets3/src/common/ftp.cpp b/Externals/wxWidgets3/src/common/ftp.cpp
index db7537a94a..c205cd7592 100644
--- a/Externals/wxWidgets3/src/common/ftp.cpp
+++ b/Externals/wxWidgets3/src/common/ftp.cpp
@@ -9,7 +9,6 @@
 //              robust Abort(), support for arbitrary FTP commands, ...)
 //              Randall Fox (support for active mode)
 // Created:     07/07/1997
-// RCS-ID:      $Id: ftp.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 //              (c) 1998-2004 wxWidgets team
 // Licence:     wxWindows licence
@@ -48,9 +47,7 @@
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 
-#ifndef __MWERKS__
-    #include <memory.h>
-#endif
+#include <memory.h>
 
 // ----------------------------------------------------------------------------
 // constants
@@ -686,7 +683,7 @@ public:
 
         // when checking the result, the stream will
         // almost always show an error, even if the file was
-        // properly transfered, thus, let's just grab the result
+        // properly transferred, thus, let's just grab the result
 
         // we are looking for "226 transfer completed"
         char code = m_ftp->GetResult();
@@ -902,7 +899,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
 
     int filesize = -1;
 
-    // Check for existance of file via wxFTP::FileExists(...)
+    // Check for existence of file via wxFTP::FileExists(...)
     if ( FileExists(fileName) )
     {
         wxString command;
@@ -939,7 +936,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
         }
 
         // Set transfermode back to the original. Only the "SIZE"-command
-        // is dependant on transfermode
+        // is dependent on transfermode
         if ( oldTransfermode != NONE )
         {
             SetTransferMode(oldTransfermode);
diff --git a/Externals/wxWidgets3/src/common/gaugecmn.cpp b/Externals/wxWidgets3/src/common/gaugecmn.cpp
index 128551f1e4..9997495013 100644
--- a/Externals/wxWidgets3/src/common/gaugecmn.cpp
+++ b/Externals/wxWidgets3/src/common/gaugecmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id: gaugecmn.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/gbsizer.cpp b/Externals/wxWidgets3/src/common/gbsizer.cpp
index 218ce143d7..88a6394175 100644
--- a/Externals/wxWidgets3/src/common/gbsizer.cpp
+++ b/Externals/wxWidgets3/src/common/gbsizer.cpp
@@ -6,7 +6,6 @@
 //
 // Author:      Robin Dunn
 // Created:     03-Nov-2003
-// RCS-ID:      $Id: gbsizer.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -312,27 +311,24 @@ bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos)
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
 {
-    wxGBSpan badspan(-1,-1);
     wxGBSizerItem* item = FindItem(window);
-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") );
     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
 {
-    wxGBSpan badspan(-1,-1);
     wxGBSizerItem* item = FindItem(sizer);
-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( item, wxGBSpan::Invalid(), wxT("Failed to find item.") );
     return item->GetSpan();
 }
 
 
 wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
 {
-    wxGBSpan badspan(-1,-1);
     wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-    wxCHECK_MSG( node, badspan, wxT("Failed to find item.") );
+    wxCHECK_MSG( node, wxGBSpan::Invalid(), wxT("Failed to find item.") );
     wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
     return item->GetSpan();
 }
@@ -471,7 +467,7 @@ wxSize wxGridBagSizer::CalcMin()
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 
-            // fill heights and widths upto this item if needed
+            // fill heights and widths up to this item if needed
             while ( (int)m_rowHeights.GetCount() <= endrow )
                 m_rowHeights.Add(m_emptyCellSize.GetHeight());
             while ( (int)m_colWidths.GetCount() <= endcol )
@@ -509,7 +505,11 @@ wxSize wxGridBagSizer::CalcMin()
 
 void wxGridBagSizer::RecalcSizes()
 {
-    if (m_children.GetCount() == 0)
+    // We can't lay out our elements if we don't have at least a single row and
+    // a single column. Notice that this may happen even if we have some
+    // children but all of them are hidden, so checking for m_children being
+    // non-empty is not enough, see #15475.
+    if ( m_rowHeights.empty() || m_colWidths.empty() )
         return;
 
     wxPoint pt( GetPosition() );
diff --git a/Externals/wxWidgets3/src/common/gdicmn.cpp b/Externals/wxWidgets3/src/common/gdicmn.cpp
index 2854a7e6ee..4938977b10 100644
--- a/Externals/wxWidgets3/src/common/gdicmn.cpp
+++ b/Externals/wxWidgets3/src/common/gdicmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gdicmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -334,7 +333,7 @@ void wxColourDatabase::Initialize()
         {wxT("LIGHT GREY"), 192, 192, 192},
         {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
         {wxT("LIME GREEN"), 50, 204, 50},
-        {wxT("LIGHT MAGENTA"), 255, 0, 255},
+        {wxT("LIGHT MAGENTA"), 255, 119, 255},
         {wxT("MAGENTA"), 255, 0, 255},
         {wxT("MAROON"), 142, 35, 107},
         {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
@@ -819,6 +818,17 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
                                      const wxString& facename,
                                      wxFontEncoding encoding)
 {
+    // In all ports but wxOSX, the effective family of a font created using
+    // wxFONTFAMILY_DEFAULT is wxFONTFAMILY_SWISS so this is what we need to
+    // use for comparison.
+    //
+    // In wxOSX the original wxFONTFAMILY_DEFAULT seems to be kept and it uses
+    // a different font than wxFONTFAMILY_SWISS anyhow so we just preserve it.
+#ifndef __WXOSX__
+    if ( family == wxFONTFAMILY_DEFAULT )
+        family = wxFONTFAMILY_SWISS;
+#endif // !__WXOSX__
+
     wxFont *font;
     wxList::compatibility_iterator node;
     for (node = list.GetFirst(); node; node = node->GetNext())
@@ -830,18 +840,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
              font->GetWeight () == weight &&
              font->GetUnderlined () == underline )
         {
-            wxFontFamily fontFamily = (wxFontFamily)font->GetFamily();
-
-#if defined(__WXGTK__)
-            // under GTK the default family is wxSWISS, so looking for a font
-            // with wxDEFAULT family should return a wxSWISS one instead of
-            // creating a new one
-            bool same = (fontFamily == family) ||
-                        (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT);
-#else // !GTK
-            // VZ: but why elsewhere do we require an exact match? mystery...
-            bool same = fontFamily == family;
-#endif // GTK/!GTK
+            bool same = font->GetFamily() == family;
 
             // empty facename matches anything at all: this is bad because
             // depending on which fonts are already created, we might get back
diff --git a/Externals/wxWidgets3/src/common/geometry.cpp b/Externals/wxWidgets3/src/common/geometry.cpp
index ca97ce0771..3f1cd03a89 100644
--- a/Externals/wxWidgets3/src/common/geometry.cpp
+++ b/Externals/wxWidgets3/src/common/geometry.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99
-// RCS-ID:      $Id: geometry.cpp 58022 2009-01-11 12:00:51Z FM $
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -361,4 +360,51 @@ void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
 }
 #endif // wxUSE_STREAMS
 
+
+// wxTransform2D
+
+void wxTransform2D::Transform( wxRect2DInt* r ) const
+{
+    wxPoint2DInt a = r->GetLeftTop(), b = r->GetRightBottom();
+    Transform( &a );
+    Transform( &b );
+    *r = wxRect2DInt( a, b );
+}
+
+wxPoint2DInt wxTransform2D::Transform( const wxPoint2DInt &pt ) const
+{
+    wxPoint2DInt res = pt;
+    Transform( &res );
+    return res;
+}
+
+wxRect2DInt wxTransform2D::Transform( const wxRect2DInt &r ) const
+{
+    wxRect2DInt res = r;
+    Transform( &res );
+    return res;
+}
+
+void wxTransform2D::InverseTransform( wxRect2DInt* r ) const
+{
+    wxPoint2DInt a = r->GetLeftTop(), b = r->GetRightBottom();
+    InverseTransform( &a );
+    InverseTransform( &b );
+    *r = wxRect2DInt( a , b );
+}
+
+wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const
+{
+    wxPoint2DInt res = pt;
+    InverseTransform( &res );
+    return res;
+}
+
+wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const
+{
+    wxRect2DInt res = r;
+    InverseTransform( &res );
+    return res;
+}
+
 #endif // wxUSE_GEOMETRY
diff --git a/Externals/wxWidgets3/src/common/gifdecod.cpp b/Externals/wxWidgets3/src/common/gifdecod.cpp
index c0a7b713da..b478b31622 100644
--- a/Externals/wxWidgets3/src/common/gifdecod.cpp
+++ b/Externals/wxWidgets3/src/common/gifdecod.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.04
-// RCS-ID:      $Id: gifdecod.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -354,7 +353,7 @@ wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits)
     ab_clr = (1 << bits);
     ab_fin = (1 << bits) + 1;
 
-    // these will change through the decompression proccess
+    // these will change through the decompression process
     ab_bits  = bits + 1;
     ab_free  = (1 << bits) + 2;
     ab_max   = (1 << ab_bits) - 1;
diff --git a/Externals/wxWidgets3/src/common/glcmn.cpp b/Externals/wxWidgets3/src/common/glcmn.cpp
index 35b022bd74..acaa9e2983 100644
--- a/Externals/wxWidgets3/src/common/glcmn.cpp
+++ b/Externals/wxWidgets3/src/common/glcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGLCanvasBase implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-04-09
-// RCS-ID:      $Id: glcmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,7 @@
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#define GL_GLEXT_PROTOTYPES
 
 #ifdef __BORLANDC__
     #pragma hdrstop
diff --git a/Externals/wxWidgets3/src/common/graphcmn.cpp b/Externals/wxWidgets3/src/common/graphcmn.cpp
index c4331e464c..e917406a88 100644
--- a/Externals/wxWidgets3/src/common/graphcmn.cpp
+++ b/Externals/wxWidgets3/src/common/graphcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
-// RCS-ID:      $Id: graphcmn.cpp 69360 2011-10-09 22:07:29Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -524,6 +523,11 @@ void wxGraphicsGradientStops::Add(const wxGraphicsGradientStop& stop)
     }
 }
 
+void * wxGraphicsBitmap::GetNativeBitmap() const
+{
+    return GetBitmapData()->GetNativeBitmap();
+}
+
 //-----------------------------------------------------------------------------
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/gridcmn.cpp b/Externals/wxWidgets3/src/common/gridcmn.cpp
index 44267f0446..0b88fd8ca2 100644
--- a/Externals/wxWidgets3/src/common/gridcmn.cpp
+++ b/Externals/wxWidgets3/src/common/gridcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: gridcmn.cpp 66584 2011-01-05 06:56:36Z PC $
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/hash.cpp b/Externals/wxWidgets3/src/common/hash.cpp
index 4903949060..74389735c9 100644
--- a/Externals/wxWidgets3/src/common/hash.cpp
+++ b/Externals/wxWidgets3/src/common/hash.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
-// RCS-ID:      $Id: hash.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/hashmap.cpp b/Externals/wxWidgets3/src/common/hashmap.cpp
index dd46b80e5a..a9c10e34f2 100644
--- a/Externals/wxWidgets3/src/common/hashmap.cpp
+++ b/Externals/wxWidgets3/src/common/hashmap.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     29/01/2002
-// RCS-ID:      $Id: hashmap.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/headercolcmn.cpp b/Externals/wxWidgets3/src/common/headercolcmn.cpp
index afead8dd1f..efc958498e 100644
--- a/Externals/wxWidgets3/src/common/headercolcmn.cpp
+++ b/Externals/wxWidgets3/src/common/headercolcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxHeaderColumn implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-12-02
-// RCS-ID:      $Id: headercolcmn.cpp 58009 2009-01-11 00:57:08Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp b/Externals/wxWidgets3/src/common/headerctrlcmn.cpp
index 74c195eb57..2dfbcc6bc7 100644
--- a/Externals/wxWidgets3/src/common/headerctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/headerctrlcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxHeaderCtrlBase
 // Author:      Vadim Zeitlin
 // Created:     2008-12-02
-// RCS-ID:      $Id: headerctrlcmn.cpp 70338 2012-01-14 16:51:57Z VS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -495,23 +494,23 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_RESIZE, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent);
 
 #endif // wxUSE_HEADERCTRL
diff --git a/Externals/wxWidgets3/src/common/helpbase.cpp b/Externals/wxWidgets3/src/common/helpbase.cpp
index 83ede72d74..91b0e674d6 100644
--- a/Externals/wxWidgets3/src/common/helpbase.cpp
+++ b/Externals/wxWidgets3/src/common/helpbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: helpbase.cpp 38787 2006-04-18 07:24:35Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/http.cpp b/Externals/wxWidgets3/src/common/http.cpp
index 6a2ef68647..0ecde88c77 100644
--- a/Externals/wxWidgets3/src/common/http.cpp
+++ b/Externals/wxWidgets3/src/common/http.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
-// RCS-ID:      $Id: http.cpp 70485 2012-01-31 13:09:11Z VZ $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -341,37 +340,23 @@ bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
     return true;
 }
 
-bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
+bool wxHTTP::BuildRequest(const wxString& path, const wxString& method)
 {
-    const wxChar *request;
-
-    switch (req)
+    // Use the data in the post buffer, if any.
+    if ( !m_postBuffer.IsEmpty() )
     {
-        case wxHTTP_GET:
-            request = wxT("GET");
-            break;
+        wxString len;
+        len << m_postBuffer.GetDataLen();
 
-        case wxHTTP_POST:
-            request = wxT("POST");
-            // Content length must be correct, so always set, possibly
-            // overriding the value set explicitly by a previous call to
-            // SetHeader("Content-Length").
-            if ( !m_postBuffer.IsEmpty() )
-            {
-                wxString len;
-                len << m_postBuffer.GetDataLen();
+        // Content length must be correct, so always set, possibly
+        // overriding the value set explicitly by a previous call to
+        // SetHeader("Content-Length").
+        SetHeader(wxS("Content-Length"), len);
 
-                SetHeader(wxS("Content-Length"), len);
-            }
-
-            // However if the user had explicitly set the content type, don't
-            // override it with the content type passed to SetPostText().
-            if ( !m_contentType.empty() && GetContentType().empty() )
-                SetHeader(wxS("Content-Type"), m_contentType);
-            break;
-
-        default:
-            return false;
+        // However if the user had explicitly set the content type, don't
+        // override it with the content type passed to SetPostText().
+        if ( !m_contentType.empty() && GetContentType().empty() )
+            SetHeader(wxS("Content-Type"), m_contentType);
     }
 
     m_http_response = 0;
@@ -388,20 +373,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     SaveState();
 
     // we may use non blocking sockets only if we can dispatch events from them
-    SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
-                                                             : wxSOCKET_BLOCK );
+    int flags = wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
+                                                               : wxSOCKET_BLOCK;
+    // and we must use wxSOCKET_WAITALL to ensure that all data is sent
+    flags |= wxSOCKET_WAITALL;
+    SetFlags(flags);
     Notify(false);
 
     wxString buf;
-    buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+    buf.Printf(wxT("%s %s HTTP/1.0\r\n"), method, path);
     const wxWX2MBbuf pathbuf = buf.mb_str();
     Write(pathbuf, strlen(pathbuf));
     SendHeaders();
     Write("\r\n", 2);
 
-    if ( req == wxHTTP_POST ) {
-        if ( !m_postBuffer.IsEmpty() )
-            Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());
+    if ( !m_postBuffer.IsEmpty() ) {
+        Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());
 
         m_postBuffer.Clear();
     }
@@ -474,7 +461,13 @@ public:
     size_t m_httpsize;
     unsigned long m_read_bytes;
 
-    wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
+    wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http)
+    {
+        m_http = http;
+        m_httpsize = 0;
+        m_read_bytes = 0;
+    }
+
     size_t GetSize() const { return m_httpsize; }
     virtual ~wxHTTPStream(void) { m_http->Abort(); }
 
@@ -529,7 +522,13 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
         return NULL;
 #endif
 
-    if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))
+    // Use the user-specified method if any or determine the method to use
+    // automatically depending on whether we have anything to post or not.
+    wxString method = m_method;
+    if (method.empty())
+        method = m_postBuffer.IsEmpty() ? wxS("GET"): wxS("POST");
+
+    if (!BuildRequest(path, method))
         return NULL;
 
     inp_stream = new wxHTTPStream(this);
diff --git a/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp b/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp
index 7519a9f7ac..8cac751b03 100644
--- a/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp
+++ b/Externals/wxWidgets3/src/common/hyperlnkcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Created:     04/02/2005
-// RCS-ID:      $Id: hyperlnkcmn.cpp 66644 2011-01-07 22:37:43Z SC $
 // Copyright:   (c) 2005 David Norris
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -80,7 +79,7 @@ wxEND_FLAGS( wxHyperlinkStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI( wxHyperlinkCtrl, wxControl, "wx/hyperlink.h")
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
-wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );
+wxDEFINE_EVENT( wxEVT_HYPERLINK, wxHyperlinkEvent );
 
 wxBEGIN_PROPERTIES_TABLE(wxHyperlinkCtrl)
 wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \
diff --git a/Externals/wxWidgets3/src/common/iconbndl.cpp b/Externals/wxWidgets3/src/common/iconbndl.cpp
index d79aaf5479..f6e0ea5ea5 100644
--- a/Externals/wxWidgets3/src/common/iconbndl.cpp
+++ b/Externals/wxWidgets3/src/common/iconbndl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxIconBundle
 // Author:      Mattia Barbon, Vadim Zeitlin
 // Created:     23.03.2002
-// RCS-ID:      $Id: iconbndl.cpp 70455 2012-01-24 22:17:47Z VZ $
 // Copyright:   (c) Mattia barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagall.cpp b/Externals/wxWidgets3/src/common/imagall.cpp
index 90e66ac95f..7916f1f404 100644
--- a/Externals/wxWidgets3/src/common/imagall.cpp
+++ b/Externals/wxWidgets3/src/common/imagall.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagall.cpp
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
-// RCS-ID:      $Id: imagall.cpp 42644 2006-10-29 18:58:25Z VZ $
 // Copyright:   (c) Sylvain Bougnoux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagbmp.cpp b/Externals/wxWidgets3/src/common/imagbmp.cpp
index eb232c216b..c3fcfb275e 100644
--- a/Externals/wxWidgets3/src/common/imagbmp.cpp
+++ b/Externals/wxWidgets3/src/common/imagbmp.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagbmp.cpp
 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
-// RCS-ID:      $Id: imagbmp.cpp 68766 2011-08-17 21:01:09Z DS $
 // Copyright:   (c) Robert Roebling, Chris Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -229,10 +228,10 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         if (// VS: looks ugly but compilers tend to do ugly things with structs,
             //     like aligning hdr.filesize's ofset to dword :(
             // VZ: we should add padding then...
-            !stream.Write(&hdr.magic, 2) ||
-            !stream.Write(&hdr.filesize, 4) ||
-            !stream.Write(&hdr.reserved, 4) ||
-            !stream.Write(&hdr.data_offset, 4)
+            !stream.WriteAll(&hdr.magic, 2) ||
+            !stream.WriteAll(&hdr.filesize, 4) ||
+            !stream.WriteAll(&hdr.reserved, 4) ||
+            !stream.WriteAll(&hdr.data_offset, 4)
            )
         {
             if (verbose)
@@ -245,17 +244,17 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     if ( !IsMask )
     {
         if (
-            !stream.Write(&hdr.bih_size, 4) ||
-            !stream.Write(&hdr.width, 4) ||
-            !stream.Write(&hdr.height, 4) ||
-            !stream.Write(&hdr.planes, 2) ||
-            !stream.Write(&hdr.bpp, 2) ||
-            !stream.Write(&hdr.compression, 4) ||
-            !stream.Write(&hdr.size_of_bmp, 4) ||
-            !stream.Write(&hdr.h_res, 4) ||
-            !stream.Write(&hdr.v_res, 4) ||
-            !stream.Write(&hdr.num_clrs, 4) ||
-            !stream.Write(&hdr.num_signif_clrs, 4)
+            !stream.WriteAll(&hdr.bih_size, 4) ||
+            !stream.WriteAll(&hdr.width, 4) ||
+            !stream.WriteAll(&hdr.height, 4) ||
+            !stream.WriteAll(&hdr.planes, 2) ||
+            !stream.WriteAll(&hdr.bpp, 2) ||
+            !stream.WriteAll(&hdr.compression, 4) ||
+            !stream.WriteAll(&hdr.size_of_bmp, 4) ||
+            !stream.WriteAll(&hdr.h_res, 4) ||
+            !stream.WriteAll(&hdr.v_res, 4) ||
+            !stream.WriteAll(&hdr.num_clrs, 4) ||
+            !stream.WriteAll(&hdr.num_signif_clrs, 4)
            )
         {
             if (verbose)
@@ -332,7 +331,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     {
         if ( !IsMask )
         {
-            if ( !stream.Write(rgbquad, palette_size*4) )
+            if ( !stream.WriteAll(rgbquad, palette_size*4) )
             {
                 if (verbose)
                 {
@@ -467,7 +466,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             }
         }
 
-        if ( !stream.Write(buffer, row_width) )
+        if ( !stream.WriteAll(buffer, row_width) )
         {
             if (verbose)
             {
@@ -586,7 +585,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         {
             if (hasPalette)
             {
-                stream.Read(bbuf, 4);
+                if ( !stream.ReadAll(bbuf, 4) )
+                    return false;
+
                 cmap[j].b = bbuf[0];
                 cmap[j].g = bbuf[1];
                 cmap[j].r = bbuf[2];
@@ -618,7 +619,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         if ( comp == BI_BITFIELDS )
         {
             int bit;
-            stream.Read(dbuf, 4 * 3);
+            if ( !stream.ReadAll(dbuf, 4 * 3) )
+                return false;
+
             rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
             gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
             bmask = wxINT32_SWAP_ON_BE(dbuf[2]);
@@ -680,9 +683,10 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
         //       load even non-seekable streams (see wxInputStream::SeekI docs)!
         const wxFileOffset pos = stream.TellI();
-        if (pos != wxInvalidOffset && bmpOffset > pos)
-            if (stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset)
-                return false;
+        if ( pos == wxInvalidOffset ||
+             (bmpOffset > pos &&
+              stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset) )
+            return false;
         //else: icon, just carry on
     }
 
@@ -721,6 +725,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             {
                 linepos++;
                 aByte = stream.GetC();
+                if ( !stream.IsOk() )
+                    return false;
+
                 if ( bpp == 1 )
                 {
                     for (int bit = 0; bit < 8 && column < width; bit++)
@@ -739,6 +746,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                         wxUint8 first;
                         first = aByte;
                         aByte = stream.GetC();
+                        if ( !stream.IsOk() )
+                            return false;
+
                         if ( first == 0 )
                         {
                             if ( aByte == 0 )
@@ -757,9 +767,13 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                             {
                                 // delta marker, move in image
                                 aByte = stream.GetC();
+                                if ( !stream.IsOk() )
+                                    return false;
                                 column += aByte;
                                 linepos = column * bpp / 4;
                                 aByte = stream.GetC();
+                                if ( !stream.IsOk() )
+                                    return false;
                                 row += aByte; // upside down
                             }
                             else
@@ -773,6 +787,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                                     {
                                         ++readBytes ;
                                         aByte = stream.GetC();
+                                        if ( !stream.IsOk() )
+                                            return false;
                                         nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
                                         nibble[1] = (wxUint8)( aByte & 0x0F ) ;
                                     }
@@ -784,7 +800,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                                         linepos++;
                                 }
                                 if ( readBytes & 0x01 )
+                                {
                                     aByte = stream.GetC();
+                                    if ( !stream.IsOk() )
+                                        return false;
+                                }
                             }
                         }
                         else
@@ -825,6 +845,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                         unsigned char first;
                         first = aByte;
                         aByte = stream.GetC();
+                        if ( !stream.IsOk() )
+                            return false;
+
                         if ( first == 0 )
                         {
                             if ( aByte == 0 )
@@ -843,9 +866,13 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                             {
                                 // delta marker, move in image
                                 aByte = stream.GetC();
+                                if ( !stream.IsOk() )
+                                    return false;
                                 column += aByte;
                                 linepos = column * bpp / 8;
                                 aByte = stream.GetC();
+                                if ( !stream.IsOk() )
+                                    return false;
                                 row -= aByte;
                             }
                             else
@@ -855,13 +882,19 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                                 {
                                     linepos++;
                                     aByte = stream.GetC();
+                                    if ( !stream.IsOk() )
+                                        return false;
                                     ptr[poffset    ] = cmap[aByte].r;
                                     ptr[poffset + 1] = cmap[aByte].g;
                                     ptr[poffset + 2] = cmap[aByte].b;
                                     column++;
                                 }
                                 if ( absolute & 0x01 )
+                                {
                                     aByte = stream.GetC();
+                                    if ( !stream.IsOk() )
+                                        return false;
+                                }
                             }
                         }
                         else
@@ -888,7 +921,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             }
             else if ( bpp == 24 )
             {
-                stream.Read(bbuf, 3);
+                if ( !stream.ReadAll(bbuf, 3) )
+                    return false;
                 linepos += 3;
                 ptr[poffset    ] = (unsigned char)bbuf[2];
                 ptr[poffset + 1] = (unsigned char)bbuf[1];
@@ -898,7 +932,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             else if ( bpp == 16 )
             {
                 unsigned char temp;
-                stream.Read(&aWord, 2);
+                if ( !stream.ReadAll(&aWord, 2) )
+                    return false;
                 aWord = wxUINT16_SWAP_ON_BE(aWord);
                 linepos += 2;
                 /* Use the masks and calculated amount of shift
@@ -916,7 +951,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             else
             {
                 unsigned char temp;
-                stream.Read(&aDword, 4);
+                if ( !stream.ReadAll(&aDword, 4) )
+                    return false;
+
                 aDword = wxINT32_SWAP_ON_BE(aDword);
                 linepos += 4;
                 temp = (unsigned char)((aDword & rmask) >> rshift);
@@ -938,9 +975,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         }
         while ( (linepos < linesize) && (comp != 1) && (comp != 2) )
         {
-            stream.Read(&aByte, 1);
-            linepos += 1;
-            if ( !stream )
+            ++linepos;
+            if ( !stream.ReadAll(&aByte, 1) )
                 break;
         }
     }
@@ -968,19 +1004,23 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     if ( IsBmp )
     {
         // read the header off the .BMP format file
-        stream.Read(bbuf, 2);
-        stream.Read(dbuf, 16);
+        if ( !stream.ReadAll(bbuf, 2) ||
+             !stream.ReadAll(dbuf, 16) )
+            return false;
     }
     else
     {
-        stream.Read(dbuf, 4);
+        if ( !stream.ReadAll(dbuf, 4) )
+            return false;
     }
     #if 0 // unused
         wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]);
     #endif
     wxFileOffset offset = wxINT32_SWAP_ON_BE(dbuf[2]);
 
-    stream.Read(dbuf, 4 * 2);
+    if ( !stream.ReadAll(dbuf, 4 * 2) )
+        return false;
+
     int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
     int height = wxINT32_SWAP_ON_BE((int)dbuf[1]);
     if ( !IsBmp)height = height  / 2; // for icons divide by 2
@@ -1002,12 +1042,16 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
         return false;
     }
 
-    stream.Read(&aWord, 2);
+    if ( !stream.ReadAll(&aWord, 2) )
+        return false;
+
     /*
             TODO
             int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
         */
-    stream.Read(&aWord, 2);
+    if ( !stream.ReadAll(&aWord, 2) )
+        return false;
+
     int bpp = wxUINT16_SWAP_ON_BE((int)aWord);
     if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
     {
@@ -1018,7 +1062,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
         return false;
     }
 
-    stream.Read(dbuf, 4 * 4);
+    if ( !stream.ReadAll(dbuf, 4 * 4) )
+        return false;
+
     int comp = wxINT32_SWAP_ON_BE((int)dbuf[0]);
     if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
          comp != BI_BITFIELDS )
@@ -1030,7 +1076,8 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
         return false;
     }
 
-    stream.Read(dbuf, 4 * 2);
+    if ( !stream.ReadAll(dbuf, 4 * 2) )
+        return false;
 
     int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );
     if (ncolors == 0)
@@ -1095,7 +1142,7 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 {
     unsigned char hdr[2];
 
-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
+    if ( !stream.ReadAll(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
         return false;
 
     // do we have the BMP file signature?
@@ -1177,10 +1224,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
     IconDir.idReserved = 0;
     IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type);
     IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images);
-    stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
-    stream.Write(&IconDir.idType, sizeof(IconDir.idType));
-    stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));
-    if ( !stream.IsOk() )
+    if ( !stream.WriteAll(&IconDir.idReserved, sizeof(IconDir.idReserved)) ||
+         !stream.WriteAll(&IconDir.idType, sizeof(IconDir.idType)) ||
+         !stream.WriteAll(&IconDir.idCount, sizeof(IconDir.idCount)) )
     {
         if ( verbose )
         {
@@ -1303,15 +1349,14 @@ bool wxICOHandler::SaveFile(wxImage *image,
         offset += Size;
 
         // write to stream:
-        stream.Write(&icondirentry.bWidth, sizeof(icondirentry.bWidth));
-        stream.Write(&icondirentry.bHeight, sizeof(icondirentry.bHeight));
-        stream.Write(&icondirentry.bColorCount, sizeof(icondirentry.bColorCount));
-        stream.Write(&icondirentry.bReserved, sizeof(icondirentry.bReserved));
-        stream.Write(&icondirentry.wPlanes, sizeof(icondirentry.wPlanes));
-        stream.Write(&icondirentry.wBitCount, sizeof(icondirentry.wBitCount));
-        stream.Write(&icondirentry.dwBytesInRes, sizeof(icondirentry.dwBytesInRes));
-        stream.Write(&icondirentry.dwImageOffset, sizeof(icondirentry.dwImageOffset));
-        if ( !stream.IsOk() )
+        if ( !stream.WriteAll(&icondirentry.bWidth, sizeof(icondirentry.bWidth)) ||
+             !stream.WriteAll(&icondirentry.bHeight, sizeof(icondirentry.bHeight)) ||
+             !stream.WriteAll(&icondirentry.bColorCount, sizeof(icondirentry.bColorCount)) ||
+             !stream.WriteAll(&icondirentry.bReserved, sizeof(icondirentry.bReserved)) ||
+             !stream.WriteAll(&icondirentry.wPlanes, sizeof(icondirentry.wPlanes)) ||
+             !stream.WriteAll(&icondirentry.wBitCount, sizeof(icondirentry.wBitCount)) ||
+             !stream.WriteAll(&icondirentry.dwBytesInRes, sizeof(icondirentry.dwBytesInRes)) ||
+             !stream.WriteAll(&icondirentry.dwImageOffset, sizeof(icondirentry.dwImageOffset)) )
         {
             if ( verbose )
             {
@@ -1367,7 +1412,9 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 
     ICONDIR IconDir;
 
-    stream.Read(&IconDir, sizeof(IconDir));
+    if ( !stream.ReadAll(&IconDir, sizeof(IconDir)) )
+        return false;
+
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
 
     // nType is 1 for Icons, 2 for Cursors:
@@ -1385,7 +1432,10 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 
     for (unsigned int i = 0; i < nIcons; i++ )
     {
-        alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
+        if ( !stream.ReadAll(pCurrentEntry, sizeof(ICONDIRENTRY)) )
+            return false;
+
+        alreadySeeked += stream.LastRead();
 
         // bHeight and bColorCount are wxUint8
         if ( pCurrentEntry->bWidth >= wMax )
@@ -1453,7 +1503,7 @@ int wxICOHandler::DoGetImageCount(wxInputStream& stream)
 
     ICONDIR IconDir;
 
-    if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
+    if ( !stream.ReadAll(&IconDir, sizeof(IconDir)) )
         return 0;
 
     return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);
@@ -1527,7 +1577,7 @@ static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType)
     }
 
     ICONDIR iconDir;
-    if ( !stream->Read(&iconDir, sizeof(iconDir)) )
+    if ( !stream->ReadAll(&iconDir, sizeof(iconDir)) )
     {
         return false;
     }
diff --git a/Externals/wxWidgets3/src/common/image.cpp b/Externals/wxWidgets3/src/common/image.cpp
index 637c93dcdb..40b0ab0325 100644
--- a/Externals/wxWidgets3/src/common/image.cpp
+++ b/Externals/wxWidgets3/src/common/image.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/image.cpp
 // Purpose:     wxImage
 // Author:      Robert Roebling
-// RCS-ID:      $Id: image.cpp 70656 2012-02-20 21:57:17Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -443,13 +442,6 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
     if ( old_width == width && old_height == height )
         return *this;
 
-    if (quality == wxIMAGE_QUALITY_HIGH)
-    {
-        quality = (width < old_width && height < old_height)
-            ? wxIMAGE_QUALITY_BOX_AVERAGE
-            : wxIMAGE_QUALITY_BICUBIC;
-    }
-
     // Resample the image using the method as specified.
     switch ( quality )
     {
@@ -474,6 +466,12 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
         case wxIMAGE_QUALITY_BOX_AVERAGE:
             image = ResampleBox(width, height);
             break;
+
+        case wxIMAGE_QUALITY_HIGH:
+            image = width < old_width && height < old_height
+                        ? ResampleBox(width, height)
+                        : ResampleBicubic(width, height);
+            break;
     }
 
     // If the original image has a mask, apply the mask to the new image
@@ -552,6 +550,42 @@ wxImage wxImage::ResampleNearest(int width, int height) const
     return image;
 }
 
+namespace
+{
+
+struct BoxPrecalc
+{
+    int boxStart;
+    int boxEnd;
+};
+
+inline int BoxBetween(int value, int low, int high)
+{
+    return wxMax(wxMin(value, high), low);
+}
+
+void ResampleBoxPrecalc(wxVector<BoxPrecalc>& boxes, int oldDim)
+{
+    const int newDim = boxes.size();
+    const double scale_factor_1 = double(oldDim) / newDim;
+    const int scale_factor_2 = (int)(scale_factor_1 / 2);
+
+    for ( int dst = 0; dst < newDim; ++dst )
+    {
+        // Source pixel in the Y direction
+        const int src_p = int(dst * scale_factor_1);
+
+        BoxPrecalc& precalc = boxes[dst];
+        precalc.boxStart = BoxBetween(int(src_p - scale_factor_1/2.0 + 1),
+                                      0, oldDim - 1);
+        precalc.boxEnd = BoxBetween(wxMax(precalc.boxStart + 1,
+                                          int(src_p + scale_factor_2)),
+                                    0, oldDim - 1);
+    }
+}
+
+} // anonymous namespace
+
 wxImage wxImage::ResampleBox(int width, int height) const
 {
     // This function implements a simple pre-blur/box averaging method for
@@ -561,11 +595,12 @@ wxImage wxImage::ResampleBox(int width, int height) const
 
     wxImage ret_image(width, height, false);
 
-    const double scale_factor_x = double(M_IMGDATA->m_width) / width;
-    const double scale_factor_y = double(M_IMGDATA->m_height) / height;
+    wxVector<BoxPrecalc> vPrecalcs(height);
+    wxVector<BoxPrecalc> hPrecalcs(width);
+
+    ResampleBoxPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBoxPrecalc(hPrecalcs, M_IMGDATA->m_width);
 
-    const int scale_factor_x_2 = (int)(scale_factor_x / 2);
-    const int scale_factor_y_2 = (int)(scale_factor_y / 2);
 
     const unsigned char* src_data = M_IMGDATA->m_data;
     const unsigned char* src_alpha = M_IMGDATA->m_alpha;
@@ -584,33 +619,21 @@ wxImage wxImage::ResampleBox(int width, int height) const
     for ( int y = 0; y < height; y++ )         // Destination image - Y direction
     {
         // Source pixel in the Y direction
-        int src_y = (int)(y * scale_factor_y);
+        const BoxPrecalc& vPrecalc = vPrecalcs[y];
 
         for ( int x = 0; x < width; x++ )      // Destination image - X direction
         {
             // Source pixel in the X direction
-            int src_x = (int)(x * scale_factor_x);
+            const BoxPrecalc& hPrecalc = hPrecalcs[x];
 
             // Box of pixels to average
             averaged_pixels = 0;
             sum_r = sum_g = sum_b = sum_a = 0.0;
 
-            for ( int j = int(src_y - scale_factor_y/2.0 + 1), k = j;
-                  j <= int(src_y + scale_factor_y_2) || j < k + 2;
-                  j++ )
+            for ( int j = vPrecalc.boxStart; j <= vPrecalc.boxEnd; ++j )
             {
-                // We don't care to average pixels that don't exist (edges)
-                if ( j < 0 || j > M_IMGDATA->m_height - 1 )
-                    continue;
-
-                for ( int i = int(src_x - scale_factor_x/2.0 + 1), e = i;
-                      i <= src_x + scale_factor_x_2 || i < e + 2;
-                      i++ )
+                for ( int i = hPrecalc.boxStart; i <= hPrecalc.boxEnd; ++i )
                 {
-                    // Don't average edge pixels
-                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )
-                        continue;
-
                     // Calculate the actual index in our source pixels
                     src_pixel_index = j * M_IMGDATA->m_width + i;
 
@@ -637,6 +660,49 @@ wxImage wxImage::ResampleBox(int width, int height) const
     return ret_image;
 }
 
+namespace
+{
+
+struct BilinearPrecalc
+{
+    int offset1;
+    int offset2;
+    double dd;
+    double dd1;
+};
+
+void ResampleBilinearPrecalc(wxVector<BilinearPrecalc>& precalcs, int oldDim)
+{
+    const int newDim = precalcs.size();
+    const double scale_factor = double(oldDim) / newDim;
+    const int srcpixmax = oldDim - 1;
+
+    for ( int dsty = 0; dsty < newDim; dsty++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        double srcpix = double(dsty) * scale_factor;
+        double srcpix1 = int(srcpix);
+        double srcpix2 = srcpix1 == srcpixmax ? srcpix1 : srcpix1 + 1.0;
+
+        BilinearPrecalc& precalc = precalcs[dsty];
+
+        precalc.dd = srcpix - (int)srcpix;
+        precalc.dd1 = 1.0 - precalc.dd;
+        precalc.offset1 = srcpix1 < 0.0
+                            ? 0
+                            : srcpix1 > srcpixmax
+                                ? srcpixmax
+                                : (int)srcpix1;
+        precalc.offset2 = srcpix2 < 0.0
+                            ? 0
+                            : srcpix2 > srcpixmax
+                                ? srcpixmax
+                                : (int)srcpix2;
+    }
+}
+
+} // anonymous namespace
+
 wxImage wxImage::ResampleBilinear(int width, int height) const
 {
     // This function implements a Bilinear algorithm for resampling.
@@ -651,14 +717,11 @@ wxImage wxImage::ResampleBilinear(int width, int height) const
         ret_image.SetAlpha();
         dst_alpha = ret_image.GetAlpha();
     }
-    double HFactor = double(M_IMGDATA->m_height) / height;
-    double WFactor = double(M_IMGDATA->m_width) / width;
 
-    int srcpixymax = M_IMGDATA->m_height - 1;
-    int srcpixxmax = M_IMGDATA->m_width - 1;
-
-    double srcpixy, srcpixy1, srcpixy2, dy, dy1;
-    double srcpixx, srcpixx1, srcpixx2, dx, dx1;
+    wxVector<BilinearPrecalc> vPrecalcs(height);
+    wxVector<BilinearPrecalc> hPrecalcs(width);
+    ResampleBilinearPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBilinearPrecalc(hPrecalcs, M_IMGDATA->m_width);
 
     // initialize alpha values to avoid g++ warnings about possibly
     // uninitialized variables
@@ -668,26 +731,22 @@ wxImage wxImage::ResampleBilinear(int width, int height) const
     for ( int dsty = 0; dsty < height; dsty++ )
     {
         // We need to calculate the source pixel to interpolate from - Y-axis
-        srcpixy = double(dsty) * HFactor;
-        srcpixy1 = int(srcpixy);
-        srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0;
-        dy = srcpixy - (int)srcpixy;
-        dy1 = 1.0 - dy;
+        const BilinearPrecalc& vPrecalc = vPrecalcs[dsty];
+        const int y_offset1 = vPrecalc.offset1;
+        const int y_offset2 = vPrecalc.offset2;
+        const double dy = vPrecalc.dd;
+        const double dy1 = vPrecalc.dd1;
 
 
         for ( int dstx = 0; dstx < width; dstx++ )
         {
             // X-axis of pixel to interpolate from
-            srcpixx = double(dstx) * WFactor;
-            srcpixx1 = int(srcpixx);
-            srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0;
-            dx = srcpixx - (int)srcpixx;
-            dx1 = 1.0 - dx;
+            const BilinearPrecalc& hPrecalc = hPrecalcs[dstx];
 
-            int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1;
-            int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2;
-            int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1;
-            int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2;
+            const int x_offset1 = hPrecalc.offset1;
+            const int x_offset2 = hPrecalc.offset2;
+            const double dx = hPrecalc.dd;
+            const double dx1 = hPrecalc.dd1;
 
             int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
             int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
@@ -738,6 +797,42 @@ static inline double spline_weight(double value)
             4 * spline_cube(value - 1)) / 6;
 }
 
+
+namespace
+{
+
+struct BicubicPrecalc
+{
+    double weight[4];
+    int offset[4];
+};
+
+void ResampleBicubicPrecalc(wxVector<BicubicPrecalc> &aWeight, int oldDim)
+{
+    const int newDim = aWeight.size();
+    for ( int dstd = 0; dstd < newDim; dstd++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        const double srcpixd = static_cast<double>(dstd * oldDim) / newDim;
+        const double dd = srcpixd - static_cast<int>(srcpixd);
+
+        BicubicPrecalc &precalc = aWeight[dstd];
+
+        for ( int k = -1; k <= 2; k++ )
+        {
+            precalc.offset[k + 1] = srcpixd + k < 0.0
+                ? 0
+                : srcpixd + k >= oldDim
+                    ? oldDim - 1
+                    : static_cast<int>(srcpixd + k);
+
+            precalc.weight[k + 1] = spline_weight(k - dd);
+        }
+    }
+}
+
+} // anonymous namespace
+
 // This is the bicubic resampling algorithm
 wxImage wxImage::ResampleBicubic(int width, int height) const
 {
@@ -782,17 +877,22 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
         dst_alpha = ret_image.GetAlpha();
     }
 
+    // Precalculate weights
+    wxVector<BicubicPrecalc> vPrecalcs(height);
+    wxVector<BicubicPrecalc> hPrecalcs(width);
+
+    ResampleBicubicPrecalc(vPrecalcs, M_IMGDATA->m_height);
+    ResampleBicubicPrecalc(hPrecalcs, M_IMGDATA->m_width);
+
     for ( int dsty = 0; dsty < height; dsty++ )
     {
         // We need to calculate the source pixel to interpolate from - Y-axis
-        double srcpixy = double(dsty * M_IMGDATA->m_height) / height;
-        double dy = srcpixy - (int)srcpixy;
+        const BicubicPrecalc& vPrecalc = vPrecalcs[dsty];
 
         for ( int dstx = 0; dstx < width; dstx++ )
         {
             // X-axis of pixel to interpolate from
-            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
-            double dx = srcpixx - (int)srcpixx;
+            const BicubicPrecalc& hPrecalc = hPrecalcs[dstx];
 
             // Sums for each color channel
             double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
@@ -801,21 +901,13 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
             for ( int k = -1; k <= 2; k++ )
             {
                 // Y offset
-                int y_offset = srcpixy + k < 0.0
-                                ? 0
-                                : srcpixy + k >= M_IMGDATA->m_height
-                                       ? M_IMGDATA->m_height - 1
-                                       : (int)(srcpixy + k);
+                const int y_offset = vPrecalc.offset[k + 1];
 
                 // Loop across the X axis
                 for ( int i = -1; i <= 2; i++ )
                 {
                     // X offset
-                    int x_offset = srcpixx + i < 0.0
-                                    ? 0
-                                    : srcpixx + i >= M_IMGDATA->m_width
-                                            ? M_IMGDATA->m_width - 1
-                                            : (int)(srcpixx + i);
+                    const int x_offset = hPrecalc.offset[i + 1];
 
                     // Calculate the exact position where the source data
                     // should be pulled from based on the x_offset and y_offset
@@ -824,8 +916,8 @@ wxImage wxImage::ResampleBicubic(int width, int height) const
                     // Calculate the weight for the specified pixel according
                     // to the bicubic b-spline kernel we're using for
                     // interpolation
-                    double
-                        pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
+                    const double
+                        pixel_weight = vPrecalc.weight[k + 1] * hPrecalc.weight[i + 1];
 
                     // Create a sum of all velues for each color channel
                     // adjusted for the pixel's calculated weight
@@ -1533,35 +1625,39 @@ wxImage wxImage::ConvertToGreyscale(void) const
 
 wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
 {
-    wxImage image(MakeEmptyClone());
-
-    wxCHECK( image.IsOk(), image );
-
-    const unsigned char *src = M_IMGDATA->m_data;
-    unsigned char *dest = image.GetData();
+    wxImage image;
+    wxCHECK_MSG(IsOk(), image, "invalid image");
 
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+    size_t size = size_t(w) * h;
+    image.Create(w, h, false);
+    const unsigned char* alpha = M_IMGDATA->m_alpha;
+    if (alpha)
+    {
+        image.SetAlpha();
+        memcpy(image.GetAlpha(), alpha, size);
+    }
+    const unsigned char mask_r = M_IMGDATA->m_maskRed;
+    const unsigned char mask_g = M_IMGDATA->m_maskGreen;
+    const unsigned char mask_b = M_IMGDATA->m_maskBlue;
     const bool hasMask = M_IMGDATA->m_hasMask;
-    const unsigned char maskRed = M_IMGDATA->m_maskRed;
-    const unsigned char maskGreen = M_IMGDATA->m_maskGreen;
-    const unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+    if (hasMask)
+        image.SetMaskColour(mask_r, mask_g, mask_b);
 
-    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
-    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
+    const unsigned char* src = M_IMGDATA->m_data;
+    unsigned char* dst = image.GetData();
+    while (size--)
     {
-        memcpy(dest, src, 3);
-        // only modify non-masked pixels
-        if ( !hasMask || src[0] != maskRed || src[1] != maskGreen || src[2] != maskBlue )
-        {
-            wxColour::MakeGrey(dest + 0, dest + 1, dest + 2, weight_r, weight_g, weight_b);
-        }
+        unsigned char r = *src++;
+        unsigned char g = *src++;
+        unsigned char b = *src++;
+        if (!hasMask || r != mask_r || g != mask_g || b != mask_b)
+            wxColour::MakeGrey(&r, &g, &b, weight_r, weight_g, weight_b);
+        *dst++ = r;
+        *dst++ = g;
+        *dst++ = b;
     }
-
-    // copy the alpha channel, if any
-    if ( image.HasAlpha() )
-    {
-        memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() );
-    }
-
     return image;
 }
 
@@ -1602,30 +1698,38 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char
 
 wxImage wxImage::ConvertToDisabled(unsigned char brightness) const
 {
-    wxImage image = *this;
+    wxImage image;
+    wxCHECK_MSG(IsOk(), image, "invalid image");
 
-    unsigned char mr = image.GetMaskRed();
-    unsigned char mg = image.GetMaskGreen();
-    unsigned char mb = image.GetMaskBlue();
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-    bool has_mask = image.HasMask();
-
-    for (int y = height-1; y >= 0; --y)
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+    size_t size = size_t(w) * h;
+    image.Create(w, h, false);
+    const unsigned char* alpha = M_IMGDATA->m_alpha;
+    if (alpha)
     {
-        for (int x = width-1; x >= 0; --x)
-        {
-            unsigned char* data = image.GetData() + (y*(width*3))+(x*3);
-            unsigned char* r = data;
-            unsigned char* g = data+1;
-            unsigned char* b = data+2;
+        image.SetAlpha();
+        memcpy(image.GetAlpha(), alpha, size);
+    }
+    const unsigned char mask_r = M_IMGDATA->m_maskRed;
+    const unsigned char mask_g = M_IMGDATA->m_maskGreen;
+    const unsigned char mask_b = M_IMGDATA->m_maskBlue;
+    const bool hasMask = M_IMGDATA->m_hasMask;
+    if (hasMask)
+        image.SetMaskColour(mask_r, mask_g, mask_b);
 
-            if (has_mask && (*r == mr) && (*g == mg) && (*b == mb))
-                continue;
-
-            wxColour::MakeDisabled(r, g, b, brightness);
-        }
+    const unsigned char* src = M_IMGDATA->m_data;
+    unsigned char* dst = image.GetData();
+    while (size--)
+    {
+        unsigned char r = *src++;
+        unsigned char g = *src++;
+        unsigned char b = *src++;
+        if (!hasMask || r != mask_r || g != mask_g || b != mask_b)
+            wxColour::MakeDisabled(&r, &g, &b, brightness);
+        *dst++ = r;
+        *dst++ = g;
+        *dst++ = b;
     }
     return image;
 }
@@ -2235,10 +2339,105 @@ bool wxImage::HasOption(const wxString& name) const
 // image I/O
 // ----------------------------------------------------------------------------
 
-bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
-                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type),
+// Under Windows we can load wxImage not only from files but also from
+// resources.
+#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE
+    #define HAS_LOAD_FROM_RESOURCE
+#endif
+
+#ifdef HAS_LOAD_FROM_RESOURCE
+
+#include "wx/msw/dib.h"
+#include "wx/msw/private.h"
+
+static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)
+{
+    AutoHBITMAP
+        hBitmap,
+        hMask;
+
+    if ( type == wxBITMAP_TYPE_BMP_RESOURCE )
+    {
+        hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) );
+
+        if ( !hBitmap )
+        {
+            wxLogError(_("Failed to load bitmap \"%s\" from resources."), name);
+        }
+    }
+    else if ( type == wxBITMAP_TYPE_ICO_RESOURCE )
+    {
+        const HICON hIcon = ::LoadIcon(wxGetInstance(), name.t_str());
+
+        if ( !hIcon )
+        {
+            wxLogError(_("Failed to load icon \"%s\" from resources."), name);
+        }
+        else
+        {
+            ICONINFO info;
+            if ( !::GetIconInfo(hIcon, &info) )
+            {
+                wxLogLastError(wxT("GetIconInfo"));
+                return wxImage();
+            }
+
+            hBitmap.Init(info.hbmColor);
+            hMask.Init(info.hbmMask);
+        }
+    }
+    else if ( type == wxBITMAP_TYPE_CUR_RESOURCE )
+    {
+        wxLogDebug(wxS("Loading cursors from resources is not implemented."));
+    }
+    else
+    {
+        wxFAIL_MSG(wxS("Invalid bitmap resource type."));
+    }
+
+    if ( !hBitmap )
+        return wxImage();
+
+    wxImage image = wxDIB(hBitmap).ConvertToImage();
+    if ( hMask )
+    {
+        const wxImage mask = wxDIB(hMask).ConvertToImage();
+        image.SetMaskFromImage(mask, 255, 255, 255);
+    }
+    else
+    {
+        // Light gray colour is a default mask
+        image.SetMaskColour(0xc0, 0xc0, 0xc0);
+    }
+
+    // We could have already loaded alpha from the resources, but if not,
+    // initialize it now using the mask.
+    if ( !image.HasAlpha() )
+        image.InitAlpha();
+
+    return image;
+}
+
+#endif // HAS_LOAD_FROM_RESOURCE
+
+bool wxImage::LoadFile( const wxString& filename,
+                        wxBitmapType type,
                         int WXUNUSED_UNLESS_STREAMS(index) )
 {
+#ifdef HAS_LOAD_FROM_RESOURCE
+    if (   type == wxBITMAP_TYPE_BMP_RESOURCE
+        || type == wxBITMAP_TYPE_ICO_RESOURCE
+        || type == wxBITMAP_TYPE_CUR_RESOURCE)
+    {
+        const wxImage image = ::LoadImageFromResource(filename, type);
+        if ( image.IsOk() )
+        {
+            *this = image;
+            return true;
+        }
+    }
+#endif // HAS_LOAD_FROM_RESOURCE
+
 #if HAS_FILE_STREAMS
     wxImageFileInputStream stream(filename);
     if ( stream.IsOk() )
@@ -2785,10 +2984,6 @@ wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
             case BLUE:
                 hue = 4.0 + (red - green) / deltaRGB;
                 break;
-
-            default:
-                wxFAIL_MSG(wxT("hue not specified"));
-                break;
         }
 
         hue /= 6.0;
diff --git a/Externals/wxWidgets3/src/common/imagfill.cpp b/Externals/wxWidgets3/src/common/imagfill.cpp
index c93229d14f..825d60715f 100644
--- a/Externals/wxWidgets3/src/common/imagfill.cpp
+++ b/Externals/wxWidgets3/src/common/imagfill.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagfill.cpp
 // Purpose:     FloodFill for wxImage
 // Author:      Julian Smart
-// RCS-ID:      $Id: imagfill.cpp 70868 2012-03-10 16:58:05Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imaggif.cpp b/Externals/wxWidgets3/src/common/imaggif.cpp
index 536aecf743..9c0f8bea3a 100644
--- a/Externals/wxWidgets3/src/common/imaggif.cpp
+++ b/Externals/wxWidgets3/src/common/imaggif.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imaggif.cpp
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
-// RCS-ID:      $Id: imaggif.cpp 67802 2011-05-27 12:25:25Z DS $
 // Copyright:   (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagiff.cpp b/Externals/wxWidgets3/src/common/imagiff.cpp
index 2ac1595a93..196fe89938 100644
--- a/Externals/wxWidgets3/src/common/imagiff.cpp
+++ b/Externals/wxWidgets3/src/common/imagiff.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagiff.cpp
 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann, Thomas Meyer
-// RCS-ID:      $Id: imagiff.cpp 69562 2011-10-27 21:10:38Z VZ $
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagjpeg.cpp b/Externals/wxWidgets3/src/common/imagjpeg.cpp
index 3c52b8e6f7..3fe43f7821 100644
--- a/Externals/wxWidgets3/src/common/imagjpeg.cpp
+++ b/Externals/wxWidgets3/src/common/imagjpeg.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagjpeg.cpp
 // Purpose:     wxImage JPEG handler
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: imagjpeg.cpp 69759 2011-11-14 13:35:48Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagpcx.cpp b/Externals/wxWidgets3/src/common/imagpcx.cpp
index fcd4a1e6a4..2d4d18c1b2 100644
--- a/Externals/wxWidgets3/src/common/imagpcx.cpp
+++ b/Externals/wxWidgets3/src/common/imagpcx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     1.1
-// CVS-ID:      $Id: imagpcx.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagpng.cpp b/Externals/wxWidgets3/src/common/imagpng.cpp
index 64bc0aa402..5a27ca92f7 100644
--- a/Externals/wxWidgets3/src/common/imagpng.cpp
+++ b/Externals/wxWidgets3/src/common/imagpng.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagpng.cpp
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagpng.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -160,7 +159,7 @@ static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep
 }
 
 static void
-PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
+PNGLINKAGEMODE wx_PNG_warning(png_structp png_ptr, png_const_charp message)
 {
     wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
     if ( !info || info->verbose )
@@ -172,9 +171,9 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 // from pngerror.c
 // so that the libpng doesn't send anything on stderr
 static void
-PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
+PNGLINKAGEMODE wx_PNG_error(png_structp png_ptr, png_const_charp message)
 {
-    wx_png_warning(NULL, message);
+    wx_PNG_warning(NULL, message);
 
     // we're not using libpng built-in jump buffer (see comment before
     // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng
@@ -521,8 +520,8 @@ wxPNGHandler::LoadFile(wxImage *image,
                           (
                             PNG_LIBPNG_VER_STRING,
                             NULL,
-                            wx_png_error,
-                            wx_png_warning
+                            wx_PNG_error,
+                            wx_PNG_warning
                           );
     if (!png_ptr)
         goto error;
@@ -567,7 +566,7 @@ wxPNGHandler::LoadFile(wxImage *image,
 
     for (i = 0; i < height; i++)
     {
-        if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
+        if ((lines[i] = (unsigned char *)malloc( (size_t)(width * 4))) == NULL)
             goto error;
     }
 
@@ -737,8 +736,8 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                           (
                             PNG_LIBPNG_VER_STRING,
                             NULL,
-                            wx_png_error,
-                            wx_png_warning
+                            wx_PNG_error,
+                            wx_PNG_warning
                           );
     if (!png_ptr)
     {
diff --git a/Externals/wxWidgets3/src/common/imagpnm.cpp b/Externals/wxWidgets3/src/common/imagpnm.cpp
index c102017af0..d853912087 100644
--- a/Externals/wxWidgets3/src/common/imagpnm.cpp
+++ b/Externals/wxWidgets3/src/common/imagpnm.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagpnm.cpp
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
-// RCS-ID:      $Id: imagpnm.cpp 61363 2009-07-09 20:26:34Z VZ $
 // Copyright:   (c) Sylvain Bougnoux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/imagtga.cpp b/Externals/wxWidgets3/src/common/imagtga.cpp
index 2b0f27a2cd..ec0362192e 100644
--- a/Externals/wxWidgets3/src/common/imagtga.cpp
+++ b/Externals/wxWidgets3/src/common/imagtga.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagtga.cpp
 // Purpose:     wxImage TGA handler
 // Author:      Seth Jackson
-// CVS-ID:      $Id: imagtga.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2005 Seth Jackson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -292,9 +291,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
 
         case 1:
         {
-            unsigned char r;
-            unsigned char g;
-            unsigned char b;
+            unsigned char r = 0;
+            unsigned char g = 0;
+            unsigned char b = 0;
 
             // No compression read the data directly to imageData.
 
@@ -486,9 +485,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
 
         case 9:
         {
-            unsigned char r;
-            unsigned char g;
-            unsigned char b;
+            unsigned char r = 0;
+            unsigned char g = 0;
+            unsigned char b = 0;
 
             // Decode the RLE data.
 
diff --git a/Externals/wxWidgets3/src/common/imagtiff.cpp b/Externals/wxWidgets3/src/common/imagtiff.cpp
index bae7261404..628c645084 100644
--- a/Externals/wxWidgets3/src/common/imagtiff.cpp
+++ b/Externals/wxWidgets3/src/common/imagtiff.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagtiff.cpp
 // Purpose:     wxImage TIFF handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagtiff.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -552,7 +551,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 
     /*
     Set the image resolution if it's available. Resolution tag is not
-    dependant on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
+    dependent on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
     */
     float resX, resY;
 
diff --git a/Externals/wxWidgets3/src/common/imagxpm.cpp b/Externals/wxWidgets3/src/common/imagxpm.cpp
index 917b0aa157..d8b5bb2c69 100644
--- a/Externals/wxWidgets3/src/common/imagxpm.cpp
+++ b/Externals/wxWidgets3/src/common/imagxpm.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagxpm.cpp
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
-// RCS-ID:      $Id: imagxpm.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -103,6 +102,45 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     return true;
 }
 
+namespace
+{
+
+// Make the given string a valid C identifier.
+//
+// All invalid characters are simply replaced by underscores and underscore is
+// also prepended in the beginning if the initial character is not alphabetic.
+void
+MakeValidCIdent(wxString* str)
+{
+    const wxChar chUnderscore = wxT('_');
+
+    for ( wxString::iterator it = str->begin(); it != str->end(); ++it )
+    {
+        const wxChar ch = *it;
+        if ( wxIsdigit(ch) )
+        {
+            if ( it == str->begin() )
+            {
+                // Identifiers can't start with a digit.
+                str->insert(0, chUnderscore); // prepend underscore
+                it = str->begin(); // restart as string changed
+                continue;
+            }
+        }
+        else if ( !wxIsalpha(ch) && ch != chUnderscore )
+        {
+            // Not a valid character in C identifiers.
+            *it = chUnderscore;
+        }
+    }
+
+    // Double underscores are not allowed in normal C identifiers and are
+    // useless anyhow.
+    str->Replace(wxT("__"), wxT("_"));
+}
+
+} // anonymous namespace
+
 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {
@@ -124,8 +162,8 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
-        wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                              NULL, &sName, NULL);
+        sName = wxFileName(image->GetOption(wxIMAGE_OPTION_FILENAME)).GetName();
+        MakeValidCIdent(&sName);
         sName << wxT("_xpm");
     }
 
diff --git a/Externals/wxWidgets3/src/common/init.cpp b/Externals/wxWidgets3/src/common/init.cpp
index fa8e2bef32..e00daeb701 100644
--- a/Externals/wxWidgets3/src/common/init.cpp
+++ b/Externals/wxWidgets3/src/common/init.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.10.99
-// RCS-ID:      $Id: init.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,6 +54,10 @@
     #endif // wxCrtSetDbgFlag
 #endif // __WINDOWS__
 
+#if wxUSE_UNICODE && defined(__WXOSX__)
+    #include <locale.h>
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -218,6 +221,18 @@ static void FreeConvertedArgs()
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {
+#if wxUSE_UNICODE && defined(__WXOSX__)
+    // In OS X and iOS, wchar_t CRT functions convert to char* and fail under
+    // some locales. The safest fix is to set LC_CTYPE to UTF-8 to ensure that
+    // they can handle any input.
+    //
+    // Note that this must be done for any app, Cocoa or console, whether or
+    // not it uses wxLocale.
+    //
+    // See http://stackoverflow.com/questions/11713745/why-does-the-printf-family-of-functions-care-about-locale
+    setlocale(LC_CTYPE, "UTF-8");
+#endif // wxUSE_UNICODE && defined(__WXOSX__)
+
 #if wxUSE_LOG
     // Reset logging in case we were cleaned up and are being reinitialized.
     wxLog::DoCreateOnDemand();
@@ -394,6 +409,11 @@ static void DoCommonPostCleanup()
     delete wxMessageOutput::Set(NULL);
 
 #if wxUSE_LOG
+    // call this first as it has a side effect: in addition to flushing all
+    // logs for this thread, it also flushes everything logged from other
+    // threads
+    wxLog::FlushActive();
+
     // and now delete the last logger as well
     //
     // we still don't disable log target auto-vivification even if any log
@@ -452,6 +472,9 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
+#if 0 // defined(__WXOSX__) && wxOSX_USE_COCOA_OR_IPHONE
+        // everything done in OnRun using native callbacks
+#else
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
@@ -467,7 +490,7 @@ int wxEntryReal(int& argc, wxChar **argv)
         } callOnExit;
 
         WX_SUPPRESS_UNUSED_WARN(callOnExit);
-
+#endif
         // app execution
         return wxTheApp->OnRun();
     }
diff --git a/Externals/wxWidgets3/src/common/intl.cpp b/Externals/wxWidgets3/src/common/intl.cpp
index 2f1874f363..f8b011a917 100644
--- a/Externals/wxWidgets3/src/common/intl.cpp
+++ b/Externals/wxWidgets3/src/common/intl.cpp
@@ -5,7 +5,6 @@
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Created:     29/01/98
-// RCS-ID:      $Id: intl.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -206,7 +205,11 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 
 void wxLocale::DoCommonInit()
 {
-    m_pszOldLocale = NULL;
+    // Store the current locale in order to be able to restore it in the dtor.
+    m_pszOldLocale = wxSetlocale(LC_ALL, NULL);
+    if ( m_pszOldLocale )
+        m_pszOldLocale = wxStrdup(m_pszOldLocale);
+
 
     m_pOldLocale = wxSetLocale(this);
 
@@ -285,13 +288,7 @@ bool wxLocale::DoInit(const wxString& name,
                     wxS("no locale to set in wxLocale::Init()") );
     }
 
-    const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
-    if ( oldLocale )
-        m_pszOldLocale = wxStrdup(oldLocale);
-    else
-        m_pszOldLocale = NULL;
-
-    if ( m_pszOldLocale == NULL )
+    if ( !wxSetlocale(LC_ALL, szLocale) )
     {
         wxLogError(_("locale '%s' cannot be set."), szLocale);
     }
@@ -570,6 +567,20 @@ bool wxLocale::Init(int language, int flags)
 #endif // !WX_NO_LOCALE_SUPPORT
 }
 
+namespace
+{
+
+#ifndef __WXOSX__
+// Small helper function: get the value of the given environment variable and
+// return true only if the variable was found and has non-empty value.
+inline bool wxGetNonEmptyEnvVar(const wxString& name, wxString* value)
+{
+    return wxGetEnv(name, value) && !value->empty();
+}
+#endif
+
+} // anonymous namespace
+
 /*static*/ int wxLocale::GetSystemLanguage()
 {
     CreateLanguagesDB();
@@ -581,7 +592,7 @@ bool wxLocale::Init(int language, int flags)
 #if defined(__UNIX__)
     // first get the string identifying the language from the environment
     wxString langFull;
-#ifdef __WXMAC__
+#ifdef __WXOSX__
     wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
 
     // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg
@@ -592,9 +603,9 @@ bool wxLocale::Init(int language, int flags)
     str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));
     langFull += str.AsString();
 #else
-    if (!wxGetEnv(wxS("LC_ALL"), &langFull) &&
-        !wxGetEnv(wxS("LC_MESSAGES"), &langFull) &&
-        !wxGetEnv(wxS("LANG"), &langFull))
+    if (!wxGetNonEmptyEnvVar(wxS("LC_ALL"), &langFull) &&
+        !wxGetNonEmptyEnvVar(wxS("LC_MESSAGES"), &langFull) &&
+        !wxGetNonEmptyEnvVar(wxS("LANG"), &langFull))
     {
         // no language specified, treat it as English
         return wxLANGUAGE_ENGLISH_US;
@@ -781,8 +792,9 @@ wxString wxLocale::GetSystemEncodingName()
     UINT codepage = ::GetACP();
     encname.Printf(wxS("windows-%u"), codepage);
 #elif defined(__WXMAC__)
-    // default is just empty string, this resolves to the default system
-    // encoding later
+    encname = wxCFStringRef::AsString(
+                CFStringGetNameOfEncoding(CFStringGetSystemEncoding())
+              );
 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
@@ -1421,15 +1433,54 @@ LCTYPE GetLCTYPEFormatFromLocalInfo(wxLocaleInfo index)
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 {
-    wxUint32 lcid = LOCALE_USER_DEFAULT;
-    if ( wxGetLocale() )
+    const wxLanguageInfo * const
+        info = wxGetLocale() ? GetLanguageInfo(wxGetLocale()->GetLanguage())
+                             : NULL;
+    if ( !info )
     {
-        const wxLanguageInfo * const
-            info = GetLanguageInfo(wxGetLocale()->GetLanguage());
-        if ( info )
-            lcid = info->GetLCID();
+        // wxSetLocale() hadn't been called yet of failed, hence CRT must be
+        // using "C" locale -- but check it to detect bugs that would happen if
+        // this were not the case.
+        wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0,
+                      wxS("You probably called setlocale() directly instead ")
+                      wxS("of using wxLocale and now there is a ")
+                      wxS("mismatch between C/C++ and Windows locale.\n")
+                      wxS("Things are going to break, please only change ")
+                      wxS("locale by creating wxLocale objects to avoid this!") );
+
+
+        // Return the hard coded values for C locale. This is really the right
+        // thing to do as there is no LCID we can use in the code below in this
+        // case, even LOCALE_INVARIANT is not quite the same as C locale (the
+        // only difference is that it uses %Y instead of %y in the date format
+        // but this difference is significant enough).
+        switch ( index )
+        {
+            case wxLOCALE_THOUSANDS_SEP:
+                return wxString();
+
+            case wxLOCALE_DECIMAL_POINT:
+                return ".";
+
+            case wxLOCALE_SHORT_DATE_FMT:
+                return "%m/%d/%y";
+
+            case wxLOCALE_LONG_DATE_FMT:
+                return "%A, %B %d, %Y";
+
+            case wxLOCALE_TIME_FMT:
+                return "%H:%M:%S";
+
+            case wxLOCALE_DATE_TIME_FMT:
+                return "%m/%d/%y %H:%M:%S";
+
+            default:
+                wxFAIL_MSG( "unknown wxLocaleInfo" );
+        }
     }
 
+    const wxUint32 lcid = info->GetLCID();
+
     wxString str;
 
     wxChar buf[256];
diff --git a/Externals/wxWidgets3/src/common/ipcbase.cpp b/Externals/wxWidgets3/src/common/ipcbase.cpp
index f490df437e..13c3f2e55c 100644
--- a/Externals/wxWidgets3/src/common/ipcbase.cpp
+++ b/Externals/wxWidgets3/src/common/ipcbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: ipcbase.cpp 66630 2011-01-07 17:49:18Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/languageinfo.cpp b/Externals/wxWidgets3/src/common/languageinfo.cpp
index a04c16e078..87685c5eb5 100644
--- a/Externals/wxWidgets3/src/common/languageinfo.cpp
+++ b/Externals/wxWidgets3/src/common/languageinfo.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxLocale::InitLanguagesDB()
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Created:     2010-04-23
-// RCS-ID:      $Id: languageinfo.cpp 67426 2011-04-10 15:35:56Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/layout.cpp b/Externals/wxWidgets3/src/common/layout.cpp
index 8363e2975d..9d23b46116 100644
--- a/Externals/wxWidgets3/src/common/layout.cpp
+++ b/Externals/wxWidgets3/src/common/layout.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: layout.cpp 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/lboxcmn.cpp b/Externals/wxWidgets3/src/common/lboxcmn.cpp
index d6227db60b..2afe3f1b7b 100644
--- a/Externals/wxWidgets3/src/common/lboxcmn.cpp
+++ b/Externals/wxWidgets3/src/common/lboxcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id: lboxcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,8 +89,8 @@ wxEND_FLAGS( wxListBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxListBox)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( DoubleClick, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent )
+wxEVENT_PROPERTY( Select, wxEVT_LISTBOX, wxCommandEvent )
+wxEVENT_PROPERTY( DoubleClick, wxEVT_LISTBOX_DCLICK, wxCommandEvent )
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
            wxT("Helpstring"), wxT("group"))
@@ -167,6 +166,14 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
 
 void wxListBoxBase::UpdateOldSelections()
 {
+    // When the control becomes empty, any previously remembered selections are
+    // invalid anyhow, so just forget them.
+    if ( IsEmpty() )
+    {
+        m_oldSelections.clear();
+        return;
+    }
+
     // We need to remember the selection even in single-selection case on
     // Windows, so that we don't send an event when the user clicks on an
     // already selected item.
@@ -295,7 +302,7 @@ bool wxListBoxBase::CalcAndSendEvent()
 
     m_oldSelections = selections;
 
-    return SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, selected);
+    return SendEvent(wxEVT_LISTBOX, item, selected);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/list.cpp b/Externals/wxWidgets3/src/common/list.cpp
index 6ad2926ac9..6eadb1533a 100644
--- a/Externals/wxWidgets3/src/common/list.cpp
+++ b/Externals/wxWidgets3/src/common/list.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     04/01/98
-// RCS-ID:      $Id: list.cpp 67769 2011-05-20 14:29:07Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ////////////////////////////////////////////////////////////////////////////////
@@ -762,6 +761,6 @@ void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
 {
 }
 
-wxStringListBase::BaseListType wxStringListBase::EmptyList;
+_WX_LIST_HELPER_wxStringListBase::BaseListType _WX_LIST_HELPER_wxStringListBase::EmptyList;
 
 #endif // !wxUSE_STD_CONTAINERS
diff --git a/Externals/wxWidgets3/src/common/listctrlcmn.cpp b/Externals/wxWidgets3/src/common/listctrlcmn.cpp
index dd7fc610b0..e6101be4c3 100644
--- a/Externals/wxWidgets3/src/common/listctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/listctrlcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Common defines for wxListCtrl and wxListCtrl-based classes.
 // Author:      Kevin Ollivier
 // Created:     09/15/06
-// RCS-ID:      $Id: listctrlcmn.cpp 70284 2012-01-07 15:09:51Z VZ $
 // Copyright:   (c) Kevin Ollivier
 // Licence:     wxWindows licence
 ////////////////////////////////////////////////////////////////////////////////
@@ -34,26 +33,26 @@
 const char wxListCtrlNameStr[] = "listCtrl";
 
 // ListCtrl events
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_RDRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_DELETE_ITEM, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_KEY_DOWN, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_INSERT_ITEM, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_DRAGGING, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_END_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_FOCUSED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_CACHE_HINT, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_BEGIN_DRAG, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_BEGIN_RDRAG, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_BEGIN_LABEL_EDIT, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_END_LABEL_EDIT, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_DELETE_ITEM, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_DELETE_ALL_ITEMS, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_SELECTED, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_DESELECTED, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_KEY_DOWN, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_INSERT_ITEM, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_COL_CLICK, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_COL_RIGHT_CLICK, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_COL_BEGIN_DRAG, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_COL_DRAGGING, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_COL_END_DRAG, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_RIGHT_CLICK, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_ACTIVATED, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_ITEM_FOCUSED, wxListEvent );
+wxDEFINE_EVENT( wxEVT_LIST_CACHE_HINT, wxListEvent );
 
 // -----------------------------------------------------------------------------
 // XTI
@@ -111,7 +110,7 @@ wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h")
 #endif
 
 wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
 
 wxPROPERTY_FLAGS( WindowStyle, wxListCtrlStyle, long, SetWindowStyleFlag, \
                  GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
@@ -138,7 +137,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
 long
 wxListCtrlBase::AppendColumn(const wxString& heading,
-                             int format,
+                             wxListColumnFormat format,
                              int width)
 {
     return InsertColumn(GetColumnCount(), heading, format, width);
@@ -185,6 +184,9 @@ wxSize wxListCtrlBase::DoGetBestClientSize() const
     if ( !InReportView() )
         return wxControl::DoGetBestClientSize();
 
+    int totalWidth;
+    wxClientDC dc(const_cast<wxListCtrlBase*>(this));
+
     // In report mode, we use only the column headers, not items, to determine
     // the best width. The reason for this is that it's easier (we can't just
     // iterate over all items, especially not in a virtual control, so we'd
@@ -196,19 +198,55 @@ wxSize wxListCtrlBase::DoGetBestClientSize() const
     // headers are just truncated if there is not enough place for them.
     const int columns = GetColumnCount();
     if ( HasFlag(wxLC_NO_HEADER) || !columns )
-        return wxControl::DoGetBestClientSize();
-
-    wxClientDC dc(const_cast<wxListCtrlBase*>(this));
-
-    // Total width of all headers determines the best control width.
-    int totalWidth = 0;
-    for ( int col = 0; col < columns; col++ )
     {
-        totalWidth += GetColumnWidth(col);
+        // Use some arbitrary width.
+        totalWidth = 50*dc.GetCharWidth();
+    }
+    else // We do have columns, use them to determine the best width.
+    {
+        totalWidth = 0;
+        for ( int col = 0; col < columns; col++ )
+        {
+            totalWidth += GetColumnWidth(col);
+        }
     }
 
     // Use some arbitrary height, there is no good way to determine it.
     return wxSize(totalWidth, 10*dc.GetCharHeight());
 }
 
+void wxListCtrlBase::SetAlternateRowColour(const wxColour& colour)
+{
+    wxASSERT(HasFlag(wxLC_VIRTUAL));
+    m_alternateRowColour.SetBackgroundColour(colour);
+}
+
+void wxListCtrlBase::EnableAlternateRowColours(bool enable)
+{
+    if ( enable )
+    {
+        // This code is copied from wxDataViewMainWindow::OnPaint()
+
+        // Determine the alternate rows colour automatically from the
+        // background colour.
+        const wxColour bgColour = GetBackgroundColour();
+
+        // Depending on the background, alternate row color
+        // will be 3% more dark or 50% brighter.
+        int alpha = bgColour.GetRGB() > 0x808080 ? 97 : 150;
+        SetAlternateRowColour(bgColour.ChangeLightness(alpha));
+    }
+    else // Disable striping by setting invalid alternative colour.
+    {
+        SetAlternateRowColour(wxColour());
+    }
+}
+
+wxListItemAttr *wxListCtrlBase::OnGetItemAttr(long item) const
+{
+    return (m_alternateRowColour.GetBackgroundColour().IsOk() && (item % 2))
+        ? wxConstCast(&m_alternateRowColour, wxListItemAttr)
+        : NULL; // no attributes by default
+}
+
 #endif // wxUSE_LISTCTRL
diff --git a/Externals/wxWidgets3/src/common/log.cpp b/Externals/wxWidgets3/src/common/log.cpp
index 33a86d1763..3180f46743 100644
--- a/Externals/wxWidgets3/src/common/log.cpp
+++ b/Externals/wxWidgets3/src/common/log.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: log.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -88,8 +87,6 @@ const char *wxLOG_COMPONENT = "";
 
 #if wxUSE_THREADS
 
-wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
-
 namespace
 {
 
@@ -856,8 +853,10 @@ wxLogStderr::wxLogStderr(FILE *fp)
 
 void wxLogStderr::DoLogText(const wxString& msg)
 {
-    wxFputs(msg + '\n', m_fp);
-    fflush(m_fp);
+    // First send it to stderr, even if we don't have it (e.g. in a Windows GUI
+    // application under) it's not a problem to try to use it and it's easier
+    // than determining whether we do have it or not.
+    wxMessageOutputStderr(m_fp).Output(msg);
 
     // under GUI systems such as Windows or Mac, programs usually don't have
     // stderr at all, so show the messages also somewhere else, typically in
@@ -902,7 +901,14 @@ wxLogChain::wxLogChain(wxLog *logger)
     m_bPassMessages = true;
 
     m_logNew = logger;
-    m_logOld = wxLog::SetActiveTarget(this);
+
+    // Notice that we use GetActiveTarget() here instead of directly calling
+    // SetActiveTarget() to trigger wxLog auto-creation: if we're created as
+    // the first logger, we should still chain with the standard, implicit and
+    // possibly still not created standard logger instead of disabling normal
+    // logging entirely.
+    m_logOld = wxLog::GetActiveTarget();
+    wxLog::SetActiveTarget(this);
 }
 
 wxLogChain::~wxLogChain()
diff --git a/Externals/wxWidgets3/src/common/longlong.cpp b/Externals/wxWidgets3/src/common/longlong.cpp
index b34d53373c..e57392b788 100644
--- a/Externals/wxWidgets3/src/common/longlong.cpp
+++ b/Externals/wxWidgets3/src/common/longlong.cpp
@@ -6,7 +6,6 @@
 //              not documented and is for private use only.
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id: longlong.cpp 67643 2011-04-28 16:16:16Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/markupparser.cpp b/Externals/wxWidgets3/src/common/markupparser.cpp
index 1c42fb5c01..5dbbf840cf 100644
--- a/Externals/wxWidgets3/src/common/markupparser.cpp
+++ b/Externals/wxWidgets3/src/common/markupparser.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16
-// RCS-ID:      $Id: markupparser.cpp 67072 2011-02-27 13:17:41Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -172,7 +171,6 @@ wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs)
             else // Must be a CSS-like size specification
             {
                 int cssSize = 1;
-                wxString rest;
                 if ( value.StartsWith("xx-", &rest) )
                     cssSize = 3;
                 else if ( value.StartsWith("x-", &rest) )
@@ -280,10 +278,15 @@ bool wxMarkupParser::Parse(const wxString& text)
                         current.clear();
                     }
 
+                    // This variable is used only in the debugging messages
+                    // and doesn't need to be defined if they're not compiled
+                    // at all (it actually would result in unused variable
+                    // messages in this case).
+#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS)
                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();
-
+#endif
                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {
diff --git a/Externals/wxWidgets3/src/common/matrix.cpp b/Externals/wxWidgets3/src/common/matrix.cpp
index 4903aca392..1175af8342 100644
--- a/Externals/wxWidgets3/src/common/matrix.cpp
+++ b/Externals/wxWidgets3/src/common/matrix.cpp
@@ -4,7 +4,6 @@
 // Author:      Chris Breeze, Julian Smart
 // Modified by: Klaas Holwerda
 // Created:     01/02/97
-// RCS-ID:      $Id: matrix.cpp 39745 2006-06-15 17:58:49Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/mediactrlcmn.cpp b/Externals/wxWidgets3/src/common/mediactrlcmn.cpp
index 8d1659f57b..d8f0b2c747 100644
--- a/Externals/wxWidgets3/src/common/mediactrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/mediactrlcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrlcmn.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -248,8 +247,8 @@ const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it)
           *it != end; ++(*it) )
     {
         const wxClassInfo* classInfo = **it;
-        if ( classInfo->IsKindOf(CLASSINFO(wxMediaBackend)) &&
-             classInfo != CLASSINFO(wxMediaBackend) )
+        if ( classInfo->IsKindOf(wxCLASSINFO(wxMediaBackend))  &&
+             classInfo != wxCLASSINFO(wxMediaBackend) )
         {
             ++(*it);
             return classInfo;
@@ -544,10 +543,10 @@ void wxMediaBackendCommonBase::QueueStopEvent()
 //
 #include "wx/html/forcelnk.h"
 
-#ifdef __WXMSW__ // MSW has huge backends so we do it seperately
+#ifdef __WXMSW__ // MSW has huge backends so we do it separately
 FORCE_LINK(wxmediabackend_am)
 FORCE_LINK(wxmediabackend_wmp10)
-#elif !defined(__WXOSX_COCOA__)
+#else
 FORCE_LINK(basewxmediabackends)
 #endif
 
diff --git a/Externals/wxWidgets3/src/common/memory.cpp b/Externals/wxWidgets3/src/common/memory.cpp
index 7eed146a4d..6dc5d026d2 100644
--- a/Externals/wxWidgets3/src/common/memory.cpp
+++ b/Externals/wxWidgets3/src/common/memory.cpp
@@ -4,7 +4,6 @@
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: memory.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,8 +37,7 @@
 
 #include "wx/ioswrap.h"
 
-#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
-     && !defined( __MWERKS__ )
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )
 #include <memory.h>
 #endif
 
diff --git a/Externals/wxWidgets3/src/common/menucmn.cpp b/Externals/wxWidgets3/src/common/menucmn.cpp
index 78d78e0b08..bce29b6c54 100644
--- a/Externals/wxWidgets3/src/common/menucmn.cpp
+++ b/Externals/wxWidgets3/src/common/menucmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.10.99
-// RCS-ID:      $Id: menucmn.cpp 70479 2012-01-30 16:05:03Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -69,7 +68,7 @@ template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,
 #endif
 
 wxBEGIN_PROPERTIES_TABLE(wxMenu)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
+wxEVENT_PROPERTY( Select, wxEVT_MENU, wxCommandEvent)
 
 wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
@@ -424,21 +423,25 @@ wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
 {
     wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Remove") );
 
-    return DoRemove(item);
-}
-
-wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
-{
     wxMenuItemList::compatibility_iterator node = m_items.Find(item);
 
     // if we get here, the item is valid or one of Remove() functions is broken
-    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
+    wxCHECK_MSG( node, NULL, wxT("removing item not in the menu?") );
+
+    // call DoRemove() before removing the item from the list of items as the
+    // existing code in port-specific implementation may rely on the item still
+    // being there (this is the case for at least wxMSW)
+    wxMenuItem* const item2 = DoRemove(item);
 
     // we detach the item, but we do delete the list node (i.e. don't call
     // DetachNode() here!)
     m_items.Erase(node);
 
-    // item isn't attached to anything any more
+    return item2;
+}
+
+wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
+{
     item->SetMenu(NULL);
     wxMenu *submenu = item->GetSubMenu();
     if ( submenu )
@@ -460,7 +463,7 @@ bool wxMenuBase::Delete(wxMenuItem *item)
 
 bool wxMenuBase::DoDelete(wxMenuItem *item)
 {
-    wxMenuItem *item2 = DoRemove(item);
+    wxMenuItem *item2 = Remove(item);
     wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
 
     // don't delete the submenu
@@ -480,7 +483,7 @@ bool wxMenuBase::Destroy(wxMenuItem *item)
 
 bool wxMenuBase::DoDestroy(wxMenuItem *item)
 {
-    wxMenuItem *item2 = DoRemove(item);
+    wxMenuItem *item2 = Remove(item);
     wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
 
     delete item2;
@@ -614,7 +617,7 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
         {
             wxWindowID itemid = item->GetId();
             wxUpdateUIEvent event(itemid);
-            event.SetEventObject( source );
+            event.SetEventObject( this );
 
             if ( source->ProcessEvent(event) )
             {
@@ -639,26 +642,39 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
 
 bool wxMenuBase::SendEvent(int itemid, int checked)
 {
-    wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, itemid);
+    wxCommandEvent event(wxEVT_MENU, itemid);
     event.SetEventObject(this);
     event.SetInt(checked);
 
-    bool processed = false;
+    wxWindow* const win = GetWindow();
+    wxMenuBar* const mb = GetMenuBar();
 
     // Try the menu's event handler first
     wxEvtHandler *handler = GetEventHandler();
     if ( handler )
-        processed = handler->SafelyProcessEvent(event);
-
-    // Try the window the menu was popped up from or its menu bar belongs to
-    if ( !processed )
     {
-        wxWindow * const win = GetWindow();
-        if ( win )
-            processed = win->HandleWindowEvent(event);
+        // Indicate to the event processing code that we're going to pass this
+        // event to another handler if it's not processed here to prevent it
+        // from passing the event to wxTheApp: this will be done below if we do
+        // have the associated window.
+        if ( win || mb )
+            event.SetWillBeProcessedAgain();
+
+        if ( handler->SafelyProcessEvent(event) )
+            return true;
     }
 
-    return processed;
+    // If this menu is part of the menu bar, process the event there: this will
+    // also propagate it upwards to the window containing the menu bar.
+    if ( mb )
+        return mb->HandleWindowEvent(event);
+
+    // Try the window the menu was popped up from.
+    if ( win )
+        return win->HandleWindowEvent(event);
+
+    // Not processed.
+    return false;
 }
 
 // ----------------------------------------------------------------------------
@@ -912,6 +928,7 @@ void wxMenuBarBase::Attach(wxFrame *frame)
 {
     wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
 
+    SetParent(frame);
     m_menuBarFrame = frame;
 }
 
@@ -920,6 +937,7 @@ void wxMenuBarBase::Detach()
     wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") );
 
     m_menuBarFrame = NULL;
+    SetParent(NULL);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/mimecmn.cpp b/Externals/wxWidgets3/src/common/mimecmn.cpp
index e8b7652175..ceb86221e3 100644
--- a/Externals/wxWidgets3/src/common/mimecmn.cpp
+++ b/Externals/wxWidgets3/src/common/mimecmn.cpp
@@ -5,7 +5,6 @@
 // Modified by:
 //  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
 // Created:     23.09.98
-// RCS-ID:      $Id: mimecmn.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +47,7 @@
 // implementation classes:
 #if defined(__WINDOWS__)
     #include "wx/msw/mimetype.h"
-#elif ( defined(__WXMAC__) )
+#elif ( defined(__DARWIN__) )
     #include "wx/osx/mimetype.h"
 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
diff --git a/Externals/wxWidgets3/src/common/modalhook.cpp b/Externals/wxWidgets3/src/common/modalhook.cpp
new file mode 100644
index 0000000000..20250381ea
--- /dev/null
+++ b/Externals/wxWidgets3/src/common/modalhook.cpp
@@ -0,0 +1,119 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/modalhook.cpp
+// Purpose:     wxModalDialogHook implementation
+// Author:      Vadim Zeitlin
+// Created:     2013-05-19
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/modalhook.h"
+
+#ifndef WX_PRECOMP
+#endif // WX_PRECOMP
+
+wxModalDialogHook::Hooks wxModalDialogHook::ms_hooks;
+
+// ============================================================================
+// wxModalDialogHook implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Hooks management
+// ----------------------------------------------------------------------------
+
+void wxModalDialogHook::Register()
+{
+#if wxDEBUG_LEVEL
+    for ( Hooks::const_iterator it = ms_hooks.begin();
+          it != ms_hooks.end();
+          ++it)
+    {
+        if ( *it == this )
+        {
+            wxFAIL_MSG( wxS("Registering already registered hook?") );
+            return;
+        }
+    }
+#endif // wxDEBUG_LEVEL
+
+    ms_hooks.insert(ms_hooks.begin(), this);
+}
+
+void wxModalDialogHook::Unregister()
+{
+    if ( !DoUnregister() )
+    {
+        wxFAIL_MSG( wxS("Unregistering not registered hook?") );
+    }
+}
+
+bool wxModalDialogHook::DoUnregister()
+{
+    for ( Hooks::iterator it = ms_hooks.begin();
+          it != ms_hooks.end();
+          ++it )
+    {
+        if ( *it == this )
+        {
+            ms_hooks.erase(it);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// Invoking hooks methods
+// ----------------------------------------------------------------------------
+
+/* static */
+int wxModalDialogHook::CallEnter(wxDialog* dialog)
+{
+    // Make a copy of the hooks list to avoid problems if it's modified while
+    // we're iterating over it: this is unlikely to happen in our case, but
+    // quite possible in CallExit() as the hooks may remove themselves after
+    // the call to their Exit(), so do it here for symmetry as well.
+    const Hooks hooks = ms_hooks;
+
+    for ( Hooks::const_iterator it = hooks.begin(); it != hooks.end(); ++it )
+    {
+        const int rc = (*it)->Enter(dialog);
+        if ( rc != wxID_NONE )
+        {
+            // Skip calling all the rest of the hooks if one of them preempts
+            // showing the dialog completely.
+            return rc;
+        }
+    }
+
+    return wxID_NONE;
+}
+
+/* static */
+void wxModalDialogHook::CallExit(wxDialog* dialog)
+{
+    // See comment in CallEnter() for the reasons for making a copy here.
+    const Hooks hooks = ms_hooks;
+
+    for ( Hooks::const_iterator it = hooks.begin(); it != hooks.end(); ++it )
+    {
+        (*it)->Exit(dialog);
+    }
+}
diff --git a/Externals/wxWidgets3/src/common/module.cpp b/Externals/wxWidgets3/src/common/module.cpp
index 57ea3c3f39..b8438d4602 100644
--- a/Externals/wxWidgets3/src/common/module.cpp
+++ b/Externals/wxWidgets3/src/common/module.cpp
@@ -4,7 +4,6 @@
 // Author:      Wolfram Gloger/adapted by Guilhem Lavaux
 // Modified by:
 // Created:     04/11/98
-// RCS-ID:      $Id: module.cpp 66630 2011-01-07 17:49:18Z SC $
 // Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -56,7 +55,7 @@ void wxModule::RegisterModules()
     {
         const wxClassInfo* classInfo = *it;
 
-        if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
+        if ( classInfo->IsKindOf(wxCLASSINFO(wxModule)) &&
              (classInfo != (& (wxModule::ms_classInfo))) )
         {
             wxLogTrace(TRACE_MODULE, wxT("Registering module %s"),
diff --git a/Externals/wxWidgets3/src/common/mousemanager.cpp b/Externals/wxWidgets3/src/common/mousemanager.cpp
index f83fa8b9f7..b000c1b468 100644
--- a/Externals/wxWidgets3/src/common/mousemanager.cpp
+++ b/Externals/wxWidgets3/src/common/mousemanager.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxMouseEventsManager class
 // Author:      Vadim Zeitlin
 // Created:     2009-04-21
-// RCS-ID:      $Id: mousemanager.cpp 60845 2009-05-31 19:20:20Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/msgout.cpp b/Externals/wxWidgets3/src/common/msgout.cpp
index 1b2a30e624..bf98eb4898 100644
--- a/Externals/wxWidgets3/src/common/msgout.cpp
+++ b/Externals/wxWidgets3/src/common/msgout.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
-// RCS-ID:      $Id: msgout.cpp 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) the wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -126,6 +125,8 @@ void wxMessageOutputBest::Output(const wxString& str)
 
     ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK);
 #else // !__WINDOWS__
+    wxUnusedVar(m_flags);
+
     // TODO: use the native message box for the other ports too
     wxMessageOutputStderr::Output(str);
 #endif // __WINDOWS__/!__WINDOWS__
diff --git a/Externals/wxWidgets3/src/common/mstream.cpp b/Externals/wxWidgets3/src/common/mstream.cpp
index c4a56c911f..5e5c6495ce 100644
--- a/Externals/wxWidgets3/src/common/mstream.cpp
+++ b/Externals/wxWidgets3/src/common/mstream.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: VZ (23.11.00): general code review
 // Created:     04/01/98
-// RCS-ID:      $Id: mstream.cpp 65861 2010-10-22 14:17:30Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/nbkbase.cpp b/Externals/wxWidgets3/src/common/nbkbase.cpp
index bbad0aa2ce..3ee7af5f60 100644
--- a/Externals/wxWidgets3/src/common/nbkbase.cpp
+++ b/Externals/wxWidgets3/src/common/nbkbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     02.07.01
-// RCS-ID:      $Id: nbkbase.cpp 70814 2012-03-05 18:00:34Z JS $
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,8 +36,8 @@
 
 extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook";
 
-wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -140,8 +139,8 @@ const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h")
 wxBEGIN_PROPERTIES_TABLE(wxNotebook)
-wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
-wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
+wxEVENT_PROPERTY( PageChanging, wxEVT_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
+wxEVENT_PROPERTY( PageChanged, wxEVT_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
 
 wxPROPERTY_COLLECTION( PageInfos, wxNotebookPageInfoList, wxNotebookPageInfo*, \
                       AddPageInfo, GetPageInfos, 0 /*flags*/, wxT("Helpstring"), \
@@ -186,7 +185,7 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const
 
 bool wxNotebookBase::SendPageChangingEvent(int nPage)
 {
-    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId());
+    wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGING, GetId());
     event.SetSelection(nPage);
     event.SetOldSelection(GetSelection());
     event.SetEventObject(this);
@@ -195,7 +194,7 @@ bool wxNotebookBase::SendPageChangingEvent(int nPage)
 
 void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew)
 {
-    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId());
+    wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGED, GetId());
     event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew);
     event.SetOldSelection(nPageOld);
     event.SetEventObject(this);
diff --git a/Externals/wxWidgets3/src/common/numformatter.cpp b/Externals/wxWidgets3/src/common/numformatter.cpp
index eb4583b520..12de60e842 100644
--- a/Externals/wxWidgets3/src/common/numformatter.cpp
+++ b/Externals/wxWidgets3/src/common/numformatter.cpp
@@ -210,8 +210,7 @@ wxString wxNumberFormatter::ToString(wxLongLong_t val, int style)
 
 wxString wxNumberFormatter::ToString(double val, int precision, int style)
 {
-    const wxString fmt = wxString::Format("%%.%df", precision);
-    wxString s = wxString::Format(fmt, val);
+    wxString s = wxString::FromDouble(val,precision);
 
     if ( style & Style_WithThousandsSep )
         AddThousandsSeparators(s);
@@ -235,6 +234,10 @@ void wxNumberFormatter::AddThousandsSeparators(wxString& s)
         pos = s.length();
     }
 
+    // End grouping at the beginning of the digits -- there could be at a sign
+    // before their start.
+    const size_t start = s.find_first_of("0123456789");
+
     // We currently group digits by 3 independently of the locale. This is not
     // the right thing to do and we should use lconv::grouping (under POSIX)
     // and GetLocaleInfo(LOCALE_SGROUPING) (under MSW) to get information about
@@ -242,7 +245,7 @@ void wxNumberFormatter::AddThousandsSeparators(wxString& s)
     // wxLocale level first and then used here in the future (TODO).
     const size_t GROUP_LEN = 3;
 
-    while ( pos > GROUP_LEN )
+    while ( pos > start + GROUP_LEN )
     {
         pos -= GROUP_LEN;
         s.insert(pos, thousandsSep);
diff --git a/Externals/wxWidgets3/src/common/object.cpp b/Externals/wxWidgets3/src/common/object.cpp
index 6a74649398..b113797473 100644
--- a/Externals/wxWidgets3/src/common/object.cpp
+++ b/Externals/wxWidgets3/src/common/object.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Ron Lee
 // Created:     04/01/98
-// RCS-ID:      $Id: object.cpp 66630 2011-01-07 17:49:18Z SC $
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/odcombocmn.cpp b/Externals/wxWidgets3/src/common/odcombocmn.cpp
index ab64f5a868..096c9c51ba 100644
--- a/Externals/wxWidgets3/src/common/odcombocmn.cpp
+++ b/Externals/wxWidgets3/src/common/odcombocmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: odcombocmn.cpp 66584 2011-01-05 06:56:36Z PC $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/overlaycmn.cpp b/Externals/wxWidgets3/src/common/overlaycmn.cpp
index 4704a3114f..74b20c8d22 100644
--- a/Externals/wxWidgets3/src/common/overlaycmn.cpp
+++ b/Externals/wxWidgets3/src/common/overlaycmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlaycmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp b/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp
index 24f8959814..967a5a285b 100644
--- a/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp
+++ b/Externals/wxWidgets3/src/common/ownerdrwcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Marcin Malich
 // Modified by:
 // Created:     2009-09-22
-// RCS-ID:      $Id: ownerdrwcmn.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/panelcmn.cpp b/Externals/wxWidgets3/src/common/panelcmn.cpp
index e91b8c0f66..c12e1950a3 100644
--- a/Externals/wxWidgets3/src/common/panelcmn.cpp
+++ b/Externals/wxWidgets3/src/common/panelcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: panelcmn.cpp 68366 2011-07-24 22:19:33Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/paper.cpp b/Externals/wxWidgets3/src/common/paper.cpp
index 000ec48e6a..12df669e35 100644
--- a/Externals/wxWidgets3/src/common/paper.cpp
+++ b/Externals/wxWidgets3/src/common/paper.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: paper.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/persist.cpp b/Externals/wxWidgets3/src/common/persist.cpp
index 84652a9e56..f1e951957f 100644
--- a/Externals/wxWidgets3/src/common/persist.cpp
+++ b/Externals/wxWidgets3/src/common/persist.cpp
@@ -3,7 +3,6 @@
 // Purpose:     common persistence support classes
 // Author:      Vadim Zeitlin
 // Created:     2009-01-20
-// RCS-ID:      $Id: persist.cpp 69583 2011-10-30 10:08:18Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/pickerbase.cpp b/Externals/wxWidgets3/src/common/pickerbase.cpp
index 5da75191e7..b68d7b1c90 100644
--- a/Externals/wxWidgets3/src/common/pickerbase.cpp
+++ b/Externals/wxWidgets3/src/common/pickerbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: pickerbase.cpp 68921 2011-08-27 14:11:25Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -82,7 +81,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
             return false;
         }
 
-        // set the maximum lenght allowed for this textctrl.
+        // set the maximum length allowed for this textctrl.
         // This is very important since any change to it will trigger an update in
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
@@ -92,7 +91,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
-        m_text->Connect(m_text->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
+        m_text->Connect(m_text->GetId(), wxEVT_TEXT,
                 wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
                 NULL, this);
         m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,
diff --git a/Externals/wxWidgets3/src/common/platinfo.cpp b/Externals/wxWidgets3/src/common/platinfo.cpp
index 30ec0581ef..ee943915c6 100644
--- a/Externals/wxWidgets3/src/common/platinfo.cpp
+++ b/Externals/wxWidgets3/src/common/platinfo.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     07.07.2006 (based on wxToolkitInfo)
-// RCS-ID:      $Id: platinfo.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/popupcmn.cpp b/Externals/wxWidgets3/src/common/popupcmn.cpp
index 81dce737d4..49ef9c8857 100644
--- a/Externals/wxWidgets3/src/common/popupcmn.cpp
+++ b/Externals/wxWidgets3/src/common/popupcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
-// RCS-ID:      $Id: popupcmn.cpp 69966 2011-12-09 15:20:55Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -116,7 +115,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
+#if defined(__WXMSW__) || (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
 END_EVENT_TABLE()
@@ -266,8 +265,16 @@ void wxPopupTransientWindow::PopHandlers()
 
 void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 {
+    // If we have a single child, we suppose that it must cover the entire
+    // popup window and hence we give the mouse capture to it instead of
+    // keeping it for ourselves.
+    //
+    // Notice that this works best for combobox-like popups which have a single
+    // control inside them and not so well for popups containing a single
+    // wxPanel with multiple children inside it but OTOH it does no harm in
+    // this case neither and we can't reliably distinguish between them.
     const wxWindowList& children = GetChildren();
-    if ( children.GetCount() )
+    if ( children.GetCount() == 1 )
     {
         m_child = children.GetFirst()->GetData();
     }
@@ -298,7 +305,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
         m_focus->SetFocus();
     }
 
-#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON)
+#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
     // MSW doesn't allow to set focus to the popup window, but we need to
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
@@ -323,7 +330,14 @@ bool wxPopupTransientWindow::Show( bool show )
 #ifdef __WXGTK__
     if (!show)
     {
+#ifdef __WXGTK3__
+        GdkDisplay* display = gtk_widget_get_display(m_widget);
+        GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+        GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+        gdk_device_ungrab(device, unsigned(GDK_CURRENT_TIME));
+#else
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
+#endif
 
         gtk_grab_remove( m_widget );
     }
@@ -350,15 +364,25 @@ bool wxPopupTransientWindow::Show( bool show )
     {
         gtk_grab_add( m_widget );
 
-        gdk_pointer_grab( gtk_widget_get_window(m_widget), true,
-                          (GdkEventMask)
-                            (GDK_BUTTON_PRESS_MASK |
-                             GDK_BUTTON_RELEASE_MASK |
-                             GDK_POINTER_MOTION_HINT_MASK |
-                             GDK_POINTER_MOTION_MASK),
+        const GdkEventMask mask = GdkEventMask(
+            GDK_BUTTON_PRESS_MASK |
+            GDK_BUTTON_RELEASE_MASK |
+            GDK_POINTER_MOTION_HINT_MASK |
+            GDK_POINTER_MOTION_MASK);
+        GdkWindow* window = gtk_widget_get_window(m_widget);
+#ifdef __WXGTK3__
+        GdkDisplay* display = gdk_window_get_display(window);
+        GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+        GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+        gdk_device_grab(device, window,
+            GDK_OWNERSHIP_NONE, false, mask, NULL, unsigned(GDK_CURRENT_TIME));
+#else
+        gdk_pointer_grab( window, true,
+                          mask,
                           NULL,
                           NULL,
                           (guint32)GDK_CURRENT_TIME );
+#endif
     }
 #endif
 
@@ -426,28 +450,38 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
 
     if (IsShown() && m_child)
     {
-        wxPoint pos = ScreenToClient(wxGetMousePosition());
-        wxRect rect(GetSize());
+        // Store the last mouse position to minimize the number of calls to
+        // wxFindWindowAtPoint() which are quite expensive.
+        static wxPoint s_posLast;
+        const wxPoint pos = wxGetMousePosition();
+        if ( pos != s_posLast )
+        {
+            s_posLast = pos;
 
-        if ( rect.Contains(pos) )
-        {
-            if ( m_child->HasCapture() )
+            wxWindow* const winUnderMouse = wxFindWindowAtPoint(pos);
+
+            // We release the mouse capture while the mouse is inside the popup
+            // itself to allow using it normally with the controls inside it.
+            if ( wxGetTopLevelParent(winUnderMouse) == this )
             {
-                m_child->ReleaseMouse();
+                if ( m_child->HasCapture() )
+                {
+                    m_child->ReleaseMouse();
+                }
             }
-        }
-        else
-        {
-            if ( !m_child->HasCapture() )
+            else // And we reacquire it as soon as the mouse goes outside.
             {
-                m_child->CaptureMouse();
+                if ( !m_child->HasCapture() )
+                {
+                    m_child->CaptureMouse();
+                }
             }
         }
     }
diff --git a/Externals/wxWidgets3/src/common/powercmn.cpp b/Externals/wxWidgets3/src/common/powercmn.cpp
index c8af67061f..40a31aadd7 100644
--- a/Externals/wxWidgets3/src/common/powercmn.cpp
+++ b/Externals/wxWidgets3/src/common/powercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// RCS-ID:      $Id: powercmn.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/preferencescmn.cpp b/Externals/wxWidgets3/src/common/preferencescmn.cpp
new file mode 100644
index 0000000000..9649494332
--- /dev/null
+++ b/Externals/wxWidgets3/src/common/preferencescmn.cpp
@@ -0,0 +1,72 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/preferencescmn.cpp
+// Purpose:     wxPreferencesEditor implementation common to all platforms.
+// Author:      Vaclav Slavik
+// Created:     2013-02-19
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_PREFERENCES_EDITOR
+
+#include "wx/private/preferences.h"
+#include "wx/intl.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxString wxStockPreferencesPage::GetName() const
+{
+    switch ( m_kind )
+    {
+        case Kind_General:
+            return _("General");
+        case Kind_Advanced:
+            return _("Advanced");
+    }
+    return wxString(); // silence compiler warning
+}
+
+wxPreferencesEditor::wxPreferencesEditor(const wxString& title)
+    : m_impl(wxPreferencesEditorImpl::Create(title))
+{
+}
+
+wxPreferencesEditor::~wxPreferencesEditor()
+{
+    delete m_impl;
+}
+
+void wxPreferencesEditor::AddPage(wxPreferencesPage* page)
+{
+    wxCHECK_RET( page, "can't set NULL page" );
+    m_impl->AddPage(page);
+}
+
+void wxPreferencesEditor::Show(wxWindow* parent)
+{
+    m_impl->Show(parent);
+}
+
+void wxPreferencesEditor::Dismiss()
+{
+    m_impl->Dismiss();
+}
+
+#endif // wxUSE_PREFERENCES_EDITOR
diff --git a/Externals/wxWidgets3/src/common/prntbase.cpp b/Externals/wxWidgets3/src/common/prntbase.cpp
index 2dd209faf5..ed0d4712f0 100644
--- a/Externals/wxWidgets3/src/common/prntbase.cpp
+++ b/Externals/wxWidgets3/src/common/prntbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: prntbase.cpp 68026 2011-06-22 22:58:07Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -321,21 +320,9 @@ wxPrinterBase::~wxPrinterBase()
 {
 }
 
-wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
+wxPrintAbortDialog *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
 {
-    wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing ") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
-
-    wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
-    button_sizer->Add( new wxStaticText(dialog, wxID_ANY, _("Please wait while printing\n") + printout->GetTitle() ), 0, wxALL, 10 );
-    button_sizer->Add( new wxButton( dialog, wxID_CANCEL, wxT("Cancel") ), 0, wxALL | wxALIGN_CENTER, 10 );
-
-    dialog->SetAutoLayout( true );
-    dialog->SetSizer( button_sizer );
-
-    button_sizer->Fit(dialog);
-    button_sizer->SetSizeHints (dialog) ;
-
-    return dialog;
+    return new wxPrintAbortDialog(parent, printout->GetTitle());
 }
 
 void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message)
@@ -364,7 +351,7 @@ wxPrinter::~wxPrinter()
     delete m_pimpl;
 }
 
-wxWindow *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
+wxPrintAbortDialog *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
 {
     return m_pimpl->CreateAbortWindow( parent, printout );
 }
@@ -522,11 +509,49 @@ BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
 END_EVENT_TABLE()
 
+wxPrintAbortDialog::wxPrintAbortDialog(wxWindow *parent,
+                                       const wxString& documentTitle,
+                                       const wxPoint& pos,
+                                       const wxSize& size,
+                                       long style,
+                                       const wxString& name)
+    : wxDialog(parent, wxID_ANY, _("Printing"), pos, size, style, name)
+{
+    wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
+    mainSizer->Add(new wxStaticText(this, wxID_ANY, _("Please wait while printing...")),
+                   wxSizerFlags().Expand().DoubleBorder());
+
+    wxFlexGridSizer *gridSizer = new wxFlexGridSizer(2, wxSize(20, 0));
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Document:")));
+    gridSizer->AddGrowableCol(1);
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, documentTitle));
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Progress:")));
+    m_progress = new wxStaticText(this, wxID_ANY, _("Preparing"));
+    m_progress->SetMinSize(wxSize(250, -1));
+    gridSizer->Add(m_progress);
+    mainSizer->Add(gridSizer, wxSizerFlags().Expand().DoubleBorder(wxLEFT | wxRIGHT));
+
+    mainSizer->Add(CreateStdDialogButtonSizer(wxCANCEL),
+                   wxSizerFlags().Expand().DoubleBorder());
+
+    SetSizerAndFit(mainSizer);
+}
+
+void wxPrintAbortDialog::SetProgress(int currentPage, int totalPages,
+                                     int currentCopy, int totalCopies)
+{
+  wxString text;
+  text.Printf(_("Printing page %d of %d"), currentPage, totalPages);
+  if ( totalCopies > 1 )
+      text += wxString::Format(_(" (copy %d of %d)"), currentCopy, totalCopies);
+  m_progress->SetLabel(text);
+}
+
 void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
+    wxCHECK_RET( wxPrinterBase::sm_abortWindow != NULL, "OnCancel called twice" );
+
     wxPrinterBase::sm_abortIt = true;
-    wxPrinterBase::sm_abortWindow->Show(false);
-    wxPrinterBase::sm_abortWindow->Close(true);
     wxPrinterBase::sm_abortWindow->Destroy();
     wxPrinterBase::sm_abortWindow = NULL;
 }
@@ -1086,7 +1111,7 @@ public:
 
         Connect(wxEVT_KILL_FOCUS,
                 wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus));
-        Connect(wxEVT_COMMAND_TEXT_ENTER,
+        Connect(wxEVT_TEXT_ENTER,
                 wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter));
     }
 
@@ -1705,6 +1730,13 @@ void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind)
             break;
     }
 
+    if ( m_modalityKind != wxPreviewFrame_NonModal )
+    {
+        // Behave like modal dialogs, don't show in taskbar. This implies
+        // removing the minimize box, because minimizing windows without
+        // taskbar entry is confusing.
+        SetWindowStyle((GetWindowStyle() & ~wxMINIMIZE_BOX) | wxFRAME_NO_TASKBAR);
+    }
 
     Layout();
 
diff --git a/Externals/wxWidgets3/src/common/process.cpp b/Externals/wxWidgets3/src/common/process.cpp
index 53b717f475..6dd44d891b 100644
--- a/Externals/wxWidgets3/src/common/process.cpp
+++ b/Externals/wxWidgets3/src/common/process.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Created:     24/06/98
-// RCS-ID:      $Id: process.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,6 +49,7 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 
     m_id         = id;
     m_pid        = 0;
+    m_priority   = wxPRIORITY_DEFAULT;
     m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
@@ -176,3 +176,10 @@ bool wxProcess::Exists(int pid)
     }
 }
 
+void wxProcess::SetPriority(unsigned priority)
+{
+    wxCHECK_RET( priority <= wxPRIORITY_MAX,
+                 wxS("Invalid process priority value.") );
+
+    m_priority = priority;
+}
diff --git a/Externals/wxWidgets3/src/common/protocol.cpp b/Externals/wxWidgets3/src/common/protocol.cpp
index 15bef775b9..74662adb8a 100644
--- a/Externals/wxWidgets3/src/common/protocol.cpp
+++ b/Externals/wxWidgets3/src/common/protocol.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     07/07/1997
-// RCS-ID:      $Id: protocol.cpp 61774 2009-08-28 10:44:25Z VZ $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,6 +71,19 @@ wxProtocol::wxProtocol()
     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 
+void wxProtocol::SetDefaultTimeout(wxUint32 Value)
+{
+    m_uiDefaultTimeout = Value;
+#if wxUSE_SOCKETS
+    wxSocketBase::SetTimeout(Value); // sets it for this socket
+#endif
+}
+
+wxProtocol::~wxProtocol()
+{
+    delete m_log;
+}
+
 #if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {
@@ -92,19 +104,6 @@ bool wxProtocol::Reconnect()
     return true;
 }
 
-void wxProtocol::SetDefaultTimeout(wxUint32 Value)
-{
-    m_uiDefaultTimeout = Value;
-#if wxUSE_SOCKETS
-    wxSocketBase::SetTimeout(Value); // sets it for this socket
-#endif
-}
-
-wxProtocol::~wxProtocol()
-{
-    delete m_log;
-}
-
 // ----------------------------------------------------------------------------
 // Read a line from socket
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/quantize.cpp b/Externals/wxWidgets3/src/common/quantize.cpp
index db58c9e677..618f4e26b6 100644
--- a/Externals/wxWidgets3/src/common/quantize.cpp
+++ b/Externals/wxWidgets3/src/common/quantize.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     22/6/2000
-// RCS-ID:      $Id: quantize.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
 // Licence:     wxWindows licence + JPEG library licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/radiobtncmn.cpp b/Externals/wxWidgets3/src/common/radiobtncmn.cpp
index f9c50befd2..5fe82fe1c7 100644
--- a/Externals/wxWidgets3/src/common/radiobtncmn.cpp
+++ b/Externals/wxWidgets3/src/common/radiobtncmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: radiobtncmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -75,7 +74,7 @@ wxEND_FLAGS( wxRadioButtonStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl, "wx/radiobut.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
-    wxEVENT_PROPERTY( Click, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent )
+    wxEVENT_PROPERTY( Click, wxEVT_RADIOBUTTON, wxCommandEvent )
     wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
                 wxT("Helpstring"), wxT("group"))
     wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
diff --git a/Externals/wxWidgets3/src/common/radiocmn.cpp b/Externals/wxWidgets3/src/common/radiocmn.cpp
index ff9c7bac95..5d69bf5952 100644
--- a/Externals/wxWidgets3/src/common/radiocmn.cpp
+++ b/Externals/wxWidgets3/src/common/radiocmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.06.01
-// RCS-ID:      $Id: radiocmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,7 +89,7 @@ wxEND_FLAGS( wxRadioBoxStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
-wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
+wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent )
 wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
 wxEND_PROPERTIES_TABLE()
 
diff --git a/Externals/wxWidgets3/src/common/rearrangectrl.cpp b/Externals/wxWidgets3/src/common/rearrangectrl.cpp
index dd828ebda2..a6865f9036 100644
--- a/Externals/wxWidgets3/src/common/rearrangectrl.cpp
+++ b/Externals/wxWidgets3/src/common/rearrangectrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of classes in wx/rearrangectrl.h
 // Author:      Vadim Zeitlin
 // Created:     2008-12-15
-// RCS-ID:      $Id: rearrangectrl.cpp 65844 2010-10-18 23:43:09Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/regex.cpp b/Externals/wxWidgets3/src/common/regex.cpp
index e6bcc2c8ab..a93ca08bf5 100644
--- a/Externals/wxWidgets3/src/common/regex.cpp
+++ b/Externals/wxWidgets3/src/common/regex.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder and Vadim Zeitlin
 // Modified by:
 // Created:     13.07.01
-// RCS-ID:      $Id: regex.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
 //                  2001 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/rendcmn.cpp b/Externals/wxWidgets3/src/common/rendcmn.cpp
index 9632a2f1e7..455d2d5ac8 100644
--- a/Externals/wxWidgets3/src/common/rendcmn.cpp
+++ b/Externals/wxWidgets3/src/common/rendcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.07.03
-// RCS-ID:      $Id: rendcmn.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/rgncmn.cpp b/Externals/wxWidgets3/src/common/rgncmn.cpp
index e13c27161b..9c756c35da 100644
--- a/Externals/wxWidgets3/src/common/rgncmn.cpp
+++ b/Externals/wxWidgets3/src/common/rgncmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Robin Dunn
 // Modified by:
 // Created:     27-Mar-2003
-// RCS-ID:      $Id: rgncmn.cpp 65854 2010-10-20 23:11:04Z VZ $
 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +32,7 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// region comparision
+// region comparison
 // ----------------------------------------------------------------------------
 
 bool wxRegionBase::IsEqual(const wxRegion& region) const
diff --git a/Externals/wxWidgets3/src/common/richtooltipcmn.cpp b/Externals/wxWidgets3/src/common/richtooltipcmn.cpp
index 2d98ca758b..6788488ff9 100644
--- a/Externals/wxWidgets3/src/common/richtooltipcmn.cpp
+++ b/Externals/wxWidgets3/src/common/richtooltipcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxRichToolTip implementation common to all platforms.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18
-// RCS-ID:      $Id: richtooltipcmn.cpp 69463 2011-10-18 21:57:02Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -57,9 +56,10 @@ void wxRichToolTip::SetIcon(const wxIcon& icon)
     m_impl->SetCustomIcon(icon);
 }
 
-void wxRichToolTip::SetTimeout(unsigned milliseconds)
+void wxRichToolTip::SetTimeout(unsigned milliseconds,
+                               unsigned millisecondsDelay)
 {
-    m_impl->SetTimeout(milliseconds);
+    m_impl->SetTimeout(milliseconds, millisecondsDelay);
 }
 
 void wxRichToolTip::SetTipKind(wxTipKind tipKind)
@@ -67,11 +67,16 @@ void wxRichToolTip::SetTipKind(wxTipKind tipKind)
     m_impl->SetTipKind(tipKind);
 }
 
-void wxRichToolTip::ShowFor(wxWindow* win)
+void wxRichToolTip::SetTitleFont(const wxFont& font)
+{
+    m_impl->SetTitleFont(font);
+}
+
+void wxRichToolTip::ShowFor(wxWindow* win, const wxRect* rect)
 {
     wxCHECK_RET( win, wxS("Must have a valid window") );
 
-    m_impl->ShowFor(win);
+    m_impl->ShowFor(win, rect);
 }
 
 wxRichToolTip::~wxRichToolTip()
diff --git a/Externals/wxWidgets3/src/common/sckaddr.cpp b/Externals/wxWidgets3/src/common/sckaddr.cpp
index 0992e09859..da66df3cdf 100644
--- a/Externals/wxWidgets3/src/common/sckaddr.cpp
+++ b/Externals/wxWidgets3/src/common/sckaddr.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Created:     26/04/97
 // Modified by: Vadim Zeitlin to use wxSockAddressImpl on 2008-12-28
-// RCS-ID:      $Id: sckaddr.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -37,9 +36,7 @@
     #include <stdlib.h>
     #include <ctype.h>
 
-    #if !defined(__MWERKS__)
-        #include <memory.h>
-    #endif
+    #include <memory.h>
 #endif // !WX_PRECOMP
 
 #include "wx/socket.h"
@@ -49,7 +46,7 @@
 
 #include <errno.h>
 
-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)
     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__
@@ -94,19 +91,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
     #define wxHAS_MT_SAFE_GETBY_FUNCS
 
     #if wxUSE_IPV6
-        // this header does dynamic dispatching of getaddrinfo/freeaddrinfo()
-        // by implementing them in its own code if the system versions are not
-        // available (as is the case for anything < XP)
-        //
-        // NB: if this is not available for the other compilers (so far tested
-        //      with MSVC only) we should just use wxDynamicLibrary "manually"
         #ifdef __VISUALC__
-            // disable a warning occurring in Microsoft own version of this file
+            // this header does dynamic dispatching of getaddrinfo/freeaddrinfo()
+            // by implementing them in its own code if the system versions are
+            // not available (as is the case for anything < XP)
+            #pragma warning(push)
             #pragma warning(disable:4706)
-        #endif
-        #include <wspiapi.h>
-        #ifdef __VISUALC__
-            #pragma warning(default:4706)
+            #include <wspiapi.h>
+            #pragma warning(pop)
+        #else
+            // TODO: Use wxDynamicLibrary to bind to these functions
+            //       dynamically on older Windows systems, currently a program
+            //       built with wxUSE_IPV6==1 won't even start there, even if
+            //       it doesn't actually use the socket stuff.
+            #include <ws2tcpip.h>
         #endif
     #endif
 #endif // __WINDOWS__
diff --git a/Externals/wxWidgets3/src/common/sckfile.cpp b/Externals/wxWidgets3/src/common/sckfile.cpp
index b4104065b8..4b7b6cee1c 100644
--- a/Externals/wxWidgets3/src/common/sckfile.cpp
+++ b/Externals/wxWidgets3/src/common/sckfile.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/97
-// RCS-ID:      $Id: sckfile.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/sckipc.cpp b/Externals/wxWidgets3/src/common/sckipc.cpp
index c141d11b74..ea1de8eb8e 100644
--- a/Externals/wxWidgets3/src/common/sckipc.cpp
+++ b/Externals/wxWidgets3/src/common/sckipc.cpp
@@ -8,7 +8,6 @@
 //              Vadim Zeitlin (added support for Unix sockets) Apr 2002
 //                            (use buffering, many fixes/cleanup) Oct 2008
 // Created:     1993
-// RCS-ID:      $Id: sckipc.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
@@ -399,7 +398,7 @@ wxConnectionBase *wxTCPClient::MakeConnection(const wxString& host,
 
             if (connection)
             {
-                if (connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+                if (wxDynamicCast(connection, wxTCPConnection))
                 {
                     connection->m_topic = topic;
                     connection->m_sock  = client;
@@ -898,7 +897,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 
             if (new_connection)
             {
-                if (new_connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+                if (wxDynamicCast(new_connection, wxTCPConnection))
                 {
                     // Acknowledge success
                     out.Write8(IPC_CONNECT);
diff --git a/Externals/wxWidgets3/src/common/sckstrm.cpp b/Externals/wxWidgets3/src/common/sckstrm.cpp
index a03d324937..8f64727d78 100644
--- a/Externals/wxWidgets3/src/common/sckstrm.cpp
+++ b/Externals/wxWidgets3/src/common/sckstrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97
-// RCS-ID:      $Id: sckstrm.cpp 54590 2008-07-12 02:28:12Z VZ $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/scrolbarcmn.cpp b/Externals/wxWidgets3/src/common/scrolbarcmn.cpp
index c039da6a3a..65db8fb2de 100644
--- a/Externals/wxWidgets3/src/common/scrolbarcmn.cpp
+++ b/Externals/wxWidgets3/src/common/scrolbarcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: scrolbarcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/selectdispatcher.cpp b/Externals/wxWidgets3/src/common/selectdispatcher.cpp
index 99d65df027..db763eca32 100644
--- a/Externals/wxWidgets3/src/common/selectdispatcher.cpp
+++ b/Externals/wxWidgets3/src/common/selectdispatcher.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements dispatcher for select() call
 // Author:      Lukasz Michalski and Vadim Zeitlin
 // Created:     December 2006
-// RCS-ID:      $Id: selectdispatcher.cpp 66076 2010-11-09 23:53:33Z VZ $
 // Copyright:   (c) 2006 Lukasz Michalski
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/settcmn.cpp b/Externals/wxWidgets3/src/common/settcmn.cpp
index dea0dd63e4..c9c011d5f7 100644
--- a/Externals/wxWidgets3/src/common/settcmn.cpp
+++ b/Externals/wxWidgets3/src/common/settcmn.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/settcmn.cpp
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
-// RCS-ID:      $Id: settcmn.cpp 44625 2007-03-07 11:35:04Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/sizer.cpp b/Externals/wxWidgets3/src/common/sizer.cpp
index 06403167dd..31bed2c619 100644
--- a/Externals/wxWidgets3/src/common/sizer.cpp
+++ b/Externals/wxWidgets3/src/common/sizer.cpp
@@ -5,7 +5,6 @@
 //              Dirk Holtwick, Ron Lee
 // Modified by: Ron Lee
 // Created:
-// RCS-ID:      $Id: sizer.cpp 69172 2011-09-21 15:07:37Z VZ $
 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -207,6 +206,33 @@ void wxSizerItem::DoSetSpacer(const wxSize& size)
     SetRatio(size);
 }
 
+wxSize wxSizerItem::AddBorderToSize(const wxSize& size) const
+{
+    wxSize result = size;
+
+    // Notice that we shouldn't modify the unspecified component(s) of the
+    // size, it's perfectly valid to have either min or max size specified in
+    // one direction only and it shouldn't be applied in the other one then.
+
+    if ( result.x != wxDefaultCoord )
+    {
+        if (m_flag & wxWEST)
+            result.x += m_border;
+        if (m_flag & wxEAST)
+            result.x += m_border;
+    }
+
+    if ( result.y != wxDefaultCoord )
+    {
+        if (m_flag & wxNORTH)
+            result.y += m_border;
+        if (m_flag & wxSOUTH)
+            result.y += m_border;
+    }
+
+    return result;
+}
+
 wxSizerItem::wxSizerItem(int width,
                          int height,
                          int proportion,
@@ -397,20 +423,13 @@ wxSize wxSizerItem::CalcMin()
 
 wxSize wxSizerItem::GetMinSizeWithBorder() const
 {
-    wxSize ret = m_minSize;
-
-    if (m_flag & wxWEST)
-        ret.x += m_border;
-    if (m_flag & wxEAST)
-        ret.x += m_border;
-    if (m_flag & wxNORTH)
-        ret.y += m_border;
-    if (m_flag & wxSOUTH)
-        ret.y += m_border;
-
-    return ret;
+    return AddBorderToSize(m_minSize);
 }
 
+wxSize wxSizerItem::GetMaxSizeWithBorder() const
+{
+    return AddBorderToSize(GetMaxSize());
+}
 
 void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
 {
@@ -486,7 +505,7 @@ void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
             // have changed alignment or some other property which would
             // not change the size of the window. In such a case, no
             // wxSizeEvent would normally be generated and thus the
-            // control wouldn't get layed out correctly here.
+            // control wouldn't get laid out correctly here.
 #if 1
             m_window->SetSize(pos.x, pos.y, size.x, size.y,
                               wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT );
@@ -582,20 +601,10 @@ bool wxSizerItem::IsShown() const
             return m_window->IsShown();
 
         case Item_Sizer:
-        {
             // arbitrarily decide that if at least one of our elements is
             // shown, so are we (this arbitrariness is the reason for
             // deprecating this function)
-            for ( wxSizerItemList::compatibility_iterator
-                    node = m_sizer->GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext() )
-            {
-                if ( node->GetData()->IsShown() )
-                    return true;
-            }
-            return false;
-        }
+            return m_sizer->AreAnyItemsShown();
 
         case Item_Spacer:
             return m_spacer->IsShown();
@@ -966,6 +975,8 @@ void wxSizer::Layout()
     CalcMin();
 
     // Applies the layout and repositions/resizes the items
+    wxWindow::ChildrenRepositioningGuard repositionGuard(m_containingWindow);
+
     RecalcSizes();
 }
 
@@ -1270,6 +1281,19 @@ void wxSizer::ShowItems( bool show )
     }
 }
 
+bool wxSizer::AreAnyItemsShown() const
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        if ( node->GetData()->IsShown() )
+            return true;
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
 bool wxSizer::IsShown( wxWindow *window ) const
 {
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
@@ -2082,9 +2106,8 @@ void wxBoxSizer::RecalcSizes()
         minMajorSize += GetSizeInMajorDir(item->GetMinSizeWithBorder());
     }
 
-    // update our min size and delta which may have changed
+    // update our min size have changed
     SizeInMajorDir(m_minSize) = minMajorSize;
-    delta = totalMajorSize - minMajorSize;
 
 
     // space and sum of proportions for the remaining items, both may change
@@ -2220,6 +2243,66 @@ void wxBoxSizer::RecalcSizes()
             nonFixedSpaceChanged = true;
         }
 
+        // Similar to the previous loop, but dealing with items whose max size
+        // is less than what we would allocate to them taking their proportion
+        // into account.
+        nonFixedSpaceChanged = false;
+        for ( i = m_children.begin(), n = 0; ; ++i, ++n )
+        {
+            if ( nonFixedSpaceChanged )
+            {
+                i = m_children.begin();
+                n = 0;
+                nonFixedSpaceChanged = false;
+            }
+
+            // check for the end of the loop only after the check above as
+            // otherwise we wouldn't do another pass if the last child resulted
+            // in non fixed space reduction
+            if ( i == m_children.end() )
+                break;
+
+            wxSizerItem * const item = *i;
+
+            if ( !item->IsShown() )
+                continue;
+
+            // don't check the item which we had already dealt with during a
+            // previous pass (this is more than an optimization, the code
+            // wouldn't work correctly if we kept adjusting for the same item
+            // over and over again)
+            if ( majorSizes[n] != wxDefaultCoord )
+                continue;
+
+            wxCoord maxMajor = GetSizeInMajorDir(item->GetMaxSizeWithBorder());
+
+            // must be nonzero, fixed-size items were dealt with in previous loop
+            const int propItem = item->GetProportion();
+
+            // is the desired size of this item small enough?
+            if ( maxMajor < 0 ||
+                    (remaining*propItem)/totalProportion <= maxMajor )
+            {
+                // yes, it is, we'll determine the real size of this
+                // item later, for now just leave it as wxDefaultCoord
+                continue;
+            }
+
+            // the proportion of this item won't count, it has
+            // effectively become fixed
+            totalProportion -= propItem;
+
+            // we can already allocate space for this item
+            majorSizes[n] = maxMajor;
+
+            // change the amount of the space remaining to the other items,
+            // as this can result in not being able to satisfy their
+            // proportions any more we will need to redo another loop
+            // iteration
+            remaining -= maxMajor;
+
+            nonFixedSpaceChanged = true;
+        }
 
         // Last by one pass: distribute the remaining space among the non-fixed
         // items whose size weren't fixed yet according to their proportions.
@@ -2271,8 +2354,15 @@ void wxBoxSizer::RecalcSizes()
             // its minimal size which is bad but better than not showing parts
             // of the window at all
             minorSize = totalMinorSize;
+
+            // do not allow the size in the minor direction to grow beyond the max
+            // size of the item in the minor direction
+            const wxCoord maxMinorSize = GetSizeInMinorDir(item->GetMaxSizeWithBorder());
+            if ( maxMinorSize >= 0 && minorSize > maxMinorSize )
+                minorSize = maxMinorSize;
         }
-        else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) )
+
+        if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) )
         {
             PosInMinorDir(posChild) += totalMinorSize - minorSize;
         }
@@ -2404,9 +2494,10 @@ void wxStaticBoxSizer::RecalcSizes()
         m_position.x = m_position.y = 0;
 #elif defined(__WXOSX__) && wxOSX_USE_COCOA
         // the distance from the 'inner' content view to the embedded controls
+        // this is independent of the title, therefore top_border is not relevant
         m_position.x = m_position.y = 10;
 #else
-        // if the wxStaticBox has childrens, then these windows must be placed
+        // if the wxStaticBox has children, then these windows must be placed
         // by the wxBoxSizer::RecalcSizes() call below using coordinates relative
         // to the top-left corner of the staticbox (but unlike wxGTK, we need
         // to keep in count the static borders here!):
@@ -2454,6 +2545,16 @@ void wxStaticBoxSizer::ShowItems( bool show )
     wxBoxSizer::ShowItems( show );
 }
 
+bool wxStaticBoxSizer::AreAnyItemsShown() const
+{
+    // We don't need to check the status of our child items: if the box is
+    // shown, this sizer should be considered shown even if all its elements
+    // are hidden (or, more prosaically, there are no elements at all). And,
+    // conversely, if the box is hidden then all our items, which are its
+    // children, are hidden too.
+    return m_staticBox->IsShown();
+}
+
 bool wxStaticBoxSizer::Detach( wxWindow *window )
 {
     // avoid deleting m_staticBox in our dtor if it's being detached from the
diff --git a/Externals/wxWidgets3/src/common/slidercmn.cpp b/Externals/wxWidgets3/src/common/slidercmn.cpp
index 1fc38736b4..8da1506d72 100644
--- a/Externals/wxWidgets3/src/common/slidercmn.cpp
+++ b/Externals/wxWidgets3/src/common/slidercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: slidercmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart 1998
 //                  Vadim Zeitlin 2004
 // Licence:     wxWindows licence
@@ -81,7 +80,7 @@ wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl, "wx/slider.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxScrollEvent )
-    wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent )
+    wxEVENT_PROPERTY( Updated, wxEVT_SLIDER, wxCommandEvent )
 
     wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
                 wxT("Helpstring"), wxT("group"))
diff --git a/Externals/wxWidgets3/src/common/socket.cpp b/Externals/wxWidgets3/src/common/socket.cpp
index b3e07700b6..bcb331fcc3 100644
--- a/Externals/wxWidgets3/src/common/socket.cpp
+++ b/Externals/wxWidgets3/src/common/socket.cpp
@@ -6,7 +6,6 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 1999-2000, Guillermo Rodriguez Garcia
 //             (C) 2008 Vadim Zeitlin
-// RCS_ID:     $Id: socket.cpp 70808 2012-03-04 20:31:42Z VZ $
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -172,7 +171,9 @@ public:
           m_oldflags(socket->GetFlags())
 
     {
-        wxASSERT_MSG( flag == wxSOCKET_WAITALL || flag == wxSOCKET_NOWAIT,
+        // We can be passed only wxSOCKET_WAITALL{_READ,_WRITE} or
+        // wxSOCKET_NOWAIT{_READ,_WRITE} normally.
+        wxASSERT_MSG( !(flag & wxSOCKET_WAITALL) || !(flag & wxSOCKET_NOWAIT),
                       "not a wait flag" );
 
         // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL
@@ -524,7 +525,7 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
 {
     wxSockAddressStorage from;
     WX_SOCKLEN_T fromlen = sizeof(from);
-    const SOCKET fd = accept(m_fd, &from.addr, &fromlen);
+    const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen);
 
     // accepting is similar to reading in the sense that it resets "ready for
     // read" flag on the socket
@@ -817,6 +818,8 @@ void wxSocketBase::Init()
     m_writing      =
     m_closed       = false;
     m_lcount       = 0;
+    m_lcount_read  = 0;
+    m_lcount_write = 0;
     m_timeout      = 600;
     m_beingDeleted = false;
 
@@ -887,8 +890,12 @@ bool wxSocketBase::Destroy()
     Notify(false);
 
     // Schedule this object for deletion instead of destroying it right now if
-    // possible as we may have other events pending for it
-    if ( wxTheApp )
+    // it can have other events pending for it and we have a way to do it.
+    //
+    // Notice that sockets used in other threads won't have any events for them
+    // and we shouldn't use delayed destruction mechanism for them as it's not
+    // MT-safe.
+    if ( wxIsMainThread() && wxTheApp )
     {
         wxTheApp->ScheduleForDestruction(this);
     }
@@ -943,7 +950,8 @@ wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
 {
     wxSocketReadGuard read(this);
 
-    m_lcount = DoRead(buffer, nbytes);
+    m_lcount_read = DoRead(buffer, nbytes);
+    m_lcount = m_lcount_read;
 
     return *this;
 }
@@ -979,7 +987,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {
                 // if we don't want to wait, just return immediately
-                if ( m_flags & wxSOCKET_NOWAIT )
+                if ( m_flags & wxSOCKET_NOWAIT_READ )
                 {
                     // this shouldn't be counted as an error in this case
                     SetError(wxSOCKET_NOERROR);
@@ -1015,7 +1023,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
             // we're not going to read anything else and so if we haven't read
             // anything (or not everything in wxSOCKET_WAITALL case) already,
             // signal an error
-            if ( (m_flags & wxSOCKET_WAITALL) || !total )
+            if ( (m_flags & wxSOCKET_WAITALL_READ) || !total )
                 SetError(wxSOCKET_IOERR);
             break;
         }
@@ -1024,7 +1032,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
 
         // if we are happy to read something and not the entire nbytes bytes,
         // then we're done
-        if ( !(m_flags & wxSOCKET_WAITALL) )
+        if ( !(m_flags & wxSOCKET_WAITALL_READ) )
             break;
 
         nbytes -= ret;
@@ -1044,7 +1052,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
 
     wxSocketReadGuard read(this);
 
-    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL);
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_READ);
 
     bool ok = false;
     if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )
@@ -1071,7 +1079,8 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
                 len2 = 0;
 
             // Don't attempt to read if the msg was zero bytes long.
-            m_lcount = len ? DoRead(buffer, len) : 0;
+            m_lcount_read = len ? DoRead(buffer, len) : 0;
+            m_lcount = m_lcount_read;
 
             if ( len2 )
             {
@@ -1127,7 +1136,8 @@ wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
 {
     wxSocketWriteGuard write(this);
 
-    m_lcount = DoWrite(buffer, nbytes);
+    m_lcount_write = DoWrite(buffer, nbytes);
+    m_lcount = m_lcount_write;
 
     return *this;
 }
@@ -1147,7 +1157,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
     {
         if ( m_impl->m_stream && !m_connected )
         {
-            if ( (m_flags & wxSOCKET_WAITALL) || !total )
+            if ( (m_flags & wxSOCKET_WAITALL_WRITE) || !total )
                 SetError(wxSOCKET_IOERR);
             break;
         }
@@ -1157,7 +1167,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
         {
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {
-                if ( m_flags & wxSOCKET_NOWAIT )
+                if ( m_flags & wxSOCKET_NOWAIT_WRITE )
                     break;
 
                 if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) )
@@ -1177,7 +1187,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
 
         total += ret;
 
-        if ( !(m_flags & wxSOCKET_WAITALL) )
+        if ( !(m_flags & wxSOCKET_WAITALL_WRITE) )
             break;
 
         nbytes -= ret;
@@ -1197,7 +1207,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
 
     wxSocketWriteGuard write(this);
 
-    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL);
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_WRITE);
 
     msg.sig[0] = (unsigned char) 0xad;
     msg.sig[1] = (unsigned char) 0xde;
@@ -1212,8 +1222,9 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
     bool ok = false;
     if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg) )
     {
-        m_lcount = DoWrite(buffer, nbytes);
-        if ( m_lcount == nbytes )
+        m_lcount_write = DoWrite(buffer, nbytes);
+        m_lcount = m_lcount_write;
+        if ( m_lcount_write == nbytes )
         {
             msg.sig[0] = (unsigned char) 0xed;
             msg.sig[1] = (unsigned char) 0xfe;
@@ -1346,7 +1357,25 @@ wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags,
 
     wxSocketEventFlags detected = 0;
     if ( preadfds && wxFD_ISSET(m_fd, preadfds) )
-        detected |= wxSOCKET_INPUT_FLAG;
+    {
+        // check for the case of a server socket waiting for connection
+        if ( m_server && (flags & wxSOCKET_CONNECTION_FLAG) )
+        {
+            int error;
+            SOCKOPTLEN_T len = sizeof(error);
+            m_establishing = false;
+            getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+
+            if ( error )
+                detected = wxSOCKET_LOST_FLAG;
+            else
+                detected |= wxSOCKET_CONNECTION_FLAG;
+        }
+        else // not called to get non-blocking accept() status
+        {
+            detected |= wxSOCKET_INPUT_FLAG;
+        }
+    }
 
     if ( pwritefds && wxFD_ISSET(m_fd, pwritefds) )
     {
@@ -1814,7 +1843,11 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr,
         return;
     }
 
-    wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %d"), m_impl->m_fd );
+    // Notice that we need a cast as wxSOCKET_T is 64 bit under Win64 and that
+    // the cast is safe because a wxSOCKET_T is a handle and so limited to 32
+    // (or, actually, even 24) bit values anyhow.
+    wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %u"),
+                static_cast<unsigned>(m_impl->m_fd) );
 }
 
 // --------------------------------------------------------------------------
@@ -1878,6 +1911,14 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
     return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG) == 1;
 }
 
+wxSOCKET_T wxSocketBase::GetSocket() const
+{
+    wxASSERT_MSG( m_impl, wxS("Socket not initialised") );
+
+    return m_impl->m_fd;
+}
+
+
 bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
 {
     wxASSERT_MSG( m_impl, wxT("Socket not initialised") );
diff --git a/Externals/wxWidgets3/src/common/socketiohandler.cpp b/Externals/wxWidgets3/src/common/socketiohandler.cpp
index 59513b322c..92f9e7f5fc 100644
--- a/Externals/wxWidgets3/src/common/socketiohandler.cpp
+++ b/Externals/wxWidgets3/src/common/socketiohandler.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxFDIOHandler for wxSocket
 // Author:      Angel Vidal, Lukasz Michalski
 // Created:     08.24.06
-// RCS-ID:      $Id: socketiohandler.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2006 Angel vidal
 //              (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/spinbtncmn.cpp b/Externals/wxWidgets3/src/common/spinbtncmn.cpp
index a8b26b89a1..9f2de77485 100644
--- a/Externals/wxWidgets3/src/common/spinbtncmn.cpp
+++ b/Externals/wxWidgets3/src/common/spinbtncmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: spinbtncmn.cpp 66631 2011-01-07 17:50:25Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/spinctrlcmn.cpp b/Externals/wxWidgets3/src/common/spinctrlcmn.cpp
index 3d8bd50814..4a0596b663 100644
--- a/Externals/wxWidgets3/src/common/spinctrlcmn.cpp
+++ b/Externals/wxWidgets3/src/common/spinctrlcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     define wxSpinCtrl event types
 // Author:      Peter Most
 // Created:     01.11.08
-// RCS-ID:      $Id: spinctrlcmn.cpp 66630 2011-01-07 17:49:18Z SC $
 // Copyright:   (c) 2008-2009 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,8 +27,8 @@
 
 #if wxUSE_SPINCTRL
 
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
+wxDEFINE_EVENT(wxEVT_SPINCTRL, wxSpinEvent);
+wxDEFINE_EVENT(wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent);
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -75,9 +74,9 @@ wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h")
 wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
 wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
 
-wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( Updated, wxEVT_SPINCTRL, wxCommandEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )
 
 wxPROPERTY( ValueString, wxString, SetValue, GetValue, \
            wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) ;
@@ -103,4 +102,17 @@ wxCONSTRUCTOR_6( wxSpinCtrl, wxWindow*, Parent, wxWindowID, Id, \
                 wxSize, Size, long, WindowStyle )
 
 
+wxString wxPrivate::wxSpinCtrlFormatAsHex(long val, long maxVal)
+{
+    // We format the value like this is for compatibility with (native
+    // behaviour of) wxMSW
+    wxString text;
+    if ( maxVal < 0x10000 )
+        text.Printf(wxS("0x%04lx"), val);
+    else
+        text.Printf(wxS("0x%08lx"), val);
+
+    return text;
+}
+
 #endif // wxUSE_SPINCTRL
diff --git a/Externals/wxWidgets3/src/common/srchcmn.cpp b/Externals/wxWidgets3/src/common/srchcmn.cpp
index 2ebf70c242..1e524b5394 100644
--- a/Externals/wxWidgets3/src/common/srchcmn.cpp
+++ b/Externals/wxWidgets3/src/common/srchcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Robin Dunn
 // Modified by:
 // Created:     19-Dec-2006
-// RCS-ID:      $Id: srchcmn.cpp 58039 2009-01-12 14:26:13Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,8 +34,8 @@
 
 const char wxSearchCtrlNameStr[] = "searchCtrl";
 
-wxDEFINE_EVENT(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
 
 
 #endif // wxUSE_SEARCHCTRL
diff --git a/Externals/wxWidgets3/src/common/sstream.cpp b/Externals/wxWidgets3/src/common/sstream.cpp
index f7e1f9a647..009e2c04b6 100644
--- a/Externals/wxWidgets3/src/common/sstream.cpp
+++ b/Externals/wxWidgets3/src/common/sstream.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Ryan Norton (UTF8 UNICODE)
 // Created:     2004-09-19
-// RCS-ID:      $Id: sstream.cpp 67968 2011-06-16 16:22:15Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/statbar.cpp b/Externals/wxWidgets3/src/common/statbar.cpp
index f5b3d07b98..4746f7bd94 100644
--- a/Externals/wxWidgets3/src/common/statbar.cpp
+++ b/Externals/wxWidgets3/src/common/statbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Francesco Montorsi
 // Created:     14.10.01
-// RCS-ID:      $Id: statbar.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/statbmpcmn.cpp b/Externals/wxWidgets3/src/common/statbmpcmn.cpp
index ed2a6b053c..5768c6c515 100644
--- a/Externals/wxWidgets3/src/common/statbmpcmn.cpp
+++ b/Externals/wxWidgets3/src/common/statbmpcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: statbmpcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/statboxcmn.cpp b/Externals/wxWidgets3/src/common/statboxcmn.cpp
index 2ba584692e..5f0f05cbeb 100644
--- a/Externals/wxWidgets3/src/common/statboxcmn.cpp
+++ b/Externals/wxWidgets3/src/common/statboxcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: statboxcmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,13 @@
 
 extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
 
+wxStaticBoxBase::wxStaticBoxBase()
+{
+#ifndef __WXGTK__
+    m_container.DisableSelfFocus();
+#endif
+}
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/statlinecmn.cpp b/Externals/wxWidgets3/src/common/statlinecmn.cpp
index 9efc2c7cd2..ce311dfccf 100644
--- a/Externals/wxWidgets3/src/common/statlinecmn.cpp
+++ b/Externals/wxWidgets3/src/common/statlinecmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxStaticLine common code
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statlinecmn.cpp 66592 2011-01-05 18:27:58Z PC $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/stattextcmn.cpp b/Externals/wxWidgets3/src/common/stattextcmn.cpp
index 8ffe481b05..ba7d7f602a 100644
--- a/Externals/wxWidgets3/src/common/stattextcmn.cpp
+++ b/Externals/wxWidgets3/src/common/stattextcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     common (to all ports) wxStaticText functions
 // Author:      Vadim Zeitlin, Francesco Montorsi
 // Created:     2007-01-07 (extracted from dlgcmn.cpp)
-// RCS-ID:      $Id: stattextcmn.cpp 67055 2011-02-27 12:47:26Z VZ $
 // Copyright:   (c) 1999-2006 Vadim Zeitlin
 //              (c) 2007 Francesco Montorsi
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/stdpbase.cpp b/Externals/wxWidgets3/src/common/stdpbase.cpp
index 3a123d356a..41e27e7724 100644
--- a/Externals/wxWidgets3/src/common/stdpbase.cpp
+++ b/Externals/wxWidgets3/src/common/stdpbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: stdpbase.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,7 +35,21 @@
 // module globals
 // ----------------------------------------------------------------------------
 
-static wxStandardPaths gs_stdPaths;
+namespace
+{
+
+// Derive a class just to be able to create it: wxStandardPaths ctor is
+// protected to prevent its misuse, but it also means we can't create an object
+// of this class directly.
+class wxStandardPathsDefault : public wxStandardPaths
+{
+public:
+    wxStandardPathsDefault() { }
+};
+
+static wxStandardPathsDefault gs_stdPaths;
+
+} // anonymous namespace
 
 // ============================================================================
 // implementation
diff --git a/Externals/wxWidgets3/src/common/stdstream.cpp b/Externals/wxWidgets3/src/common/stdstream.cpp
index ad0e88b3f5..f7a0cecf9e 100644
--- a/Externals/wxWidgets3/src/common/stdstream.cpp
+++ b/Externals/wxWidgets3/src/common/stdstream.cpp
@@ -4,7 +4,6 @@
 //              wrappers for wxInputStream and wxOutputStream
 // Author:      Jonathan Liu <net147@gmail.com>
 // Created:     2009-05-02
-// RCS-ID:      $Id: stdstream.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2009 Jonathan Liu
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/stockitem.cpp b/Externals/wxWidgets3/src/common/stockitem.cpp
index 0c9ea2c496..fad05d7b8e 100644
--- a/Externals/wxWidgets3/src/common/stockitem.cpp
+++ b/Externals/wxWidgets3/src/common/stockitem.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15
-// RCS-ID:      $Id: stockitem.cpp 70412 2012-01-20 16:51:09Z DS $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -180,7 +179,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_OPEN,                _("&Open..."),            _("Open..."));
         STOCKITEM(wxID_PASTE,               _("&Paste"),              _("Paste"));
         STOCKITEM(wxID_PREFERENCES,         _("&Preferences"),        _("Preferences"));
-        STOCKITEM(wxID_PREVIEW,             _("&Preview..."),         _("Preview..."));
+        STOCKITEM(wxID_PREVIEW,             _("Print previe&w..."),   _("Print preview..."));
         STOCKITEM(wxID_PRINT,               _("&Print..."),           _("Print..."));
         STOCKITEM(wxID_PROPERTIES,          _("&Properties"),         _("Properties"));
         STOCKITEM(wxID_REDO,                _("&Redo"),               _("Redo"));
diff --git a/Externals/wxWidgets3/src/common/stopwatch.cpp b/Externals/wxWidgets3/src/common/stopwatch.cpp
index dc66848854..21c522f5d9 100644
--- a/Externals/wxWidgets3/src/common/stopwatch.cpp
+++ b/Externals/wxWidgets3/src/common/stopwatch.cpp
@@ -8,7 +8,6 @@
 //    Guillermo Rodriguez <guille@iies.es> rewrote from scratch (Dic/99)
 // Modified by:
 // Created:     20.06.2003 (extracted from common/timercmn.cpp)
-// RCS-ID:      $Id: stopwatch.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998-2003 wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/strconv.cpp b/Externals/wxWidgets3/src/common/strconv.cpp
index eea3e7c71f..a433128011 100644
--- a/Externals/wxWidgets3/src/common/strconv.cpp
+++ b/Externals/wxWidgets3/src/common/strconv.cpp
@@ -5,7 +5,6 @@
 //              Ryan Norton, Fredrik Roubert (UTF7)
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: strconv.cpp 70462 2012-01-25 00:10:44Z VZ $
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
 //              (c) 2000-2003 Vadim Zeitlin
 //              (c) 2004 Ryan Norton, Fredrik Roubert
@@ -460,7 +459,6 @@ wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
         // because we want the buffer to always be NUL-terminated, even if the
         // input isn't (as otherwise the caller has no way to know its length)
         wxWCharBuffer wbuf(dstLen);
-        wbuf.data()[dstLen] = L'\0';
         if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
         {
             if ( outLen )
diff --git a/Externals/wxWidgets3/src/common/stream.cpp b/Externals/wxWidgets3/src/common/stream.cpp
index 3b8ed12382..fd50f8beac 100644
--- a/Externals/wxWidgets3/src/common/stream.cpp
+++ b/Externals/wxWidgets3/src/common/stream.cpp
@@ -5,7 +5,6 @@
 // Modified by: VZ (23.11.00) to fix realloc()ing new[]ed memory,
 //                            general code review
 // Created:     11/07/98
-// RCS-ID:      $Id: stream.cpp 61958 2009-09-18 14:03:55Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,6 +35,7 @@
 #include <ctype.h>
 #include "wx/datstrm.h"
 #include "wx/textfile.h"
+#include "wx/scopeguard.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -912,6 +912,47 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
     return *this;
 }
 
+bool wxInputStream::ReadAll(void *buffer_, size_t size)
+{
+    char* buffer = static_cast<char*>(buffer_);
+
+    size_t totalCount = 0;
+
+    for ( ;; )
+    {
+        const size_t lastCount = Read(buffer, size).LastRead();
+
+        // There is no point in continuing looping if we can't read anything at
+        // all.
+        if ( !lastCount )
+            break;
+
+        totalCount += lastCount;
+
+        // ... Or if an error occurred on the stream.
+        if ( !IsOk() )
+            break;
+
+        // Return successfully if we read exactly the requested number of
+        // bytes (normally the ">" case should never occur and so we could use
+        // "==" test, but be safe and avoid overflowing size even in case of
+        // bugs in LastRead()).
+        if ( lastCount >= size )
+        {
+            size = 0;
+            break;
+        }
+
+        // Advance the buffer before trying to read the rest of data.
+        size -= lastCount;
+        buffer += lastCount;
+    }
+
+    m_lastcount = totalCount;
+
+    return size == 0;
+}
+
 wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 {
     // RR: This code is duplicated in wxBufferedInputStream. This is
@@ -954,7 +995,7 @@ wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 
         wxASSERT(bytes_read == (size_t)pos);
 
-        // we should now have seeked to the right position...
+        // we should now have sought to the right position...
         return TellI();
     }
 
@@ -1029,6 +1070,38 @@ wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
     return *this;
 }
 
+bool wxOutputStream::WriteAll(const void *buffer_, size_t size)
+{
+    // This exactly mirrors ReadAll(), see there for more comments.
+    const char* buffer = static_cast<const char*>(buffer_);
+
+    size_t totalCount = 0;
+
+    for ( ;; )
+    {
+        const size_t lastCount = Write(buffer, size).LastWrite();
+        if ( !lastCount )
+            break;
+
+        totalCount += lastCount;
+
+        if ( !IsOk() )
+            break;
+
+        if ( lastCount >= size )
+        {
+            size = 0;
+            break;
+        }
+
+        size -= lastCount;
+        buffer += lastCount;
+    }
+
+    m_lastcount = totalCount;
+    return size == 0;
+}
+
 wxFileOffset wxOutputStream::TellO() const
 {
     return OnSysTell();
@@ -1052,22 +1125,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream)
 
 wxCountingOutputStream::wxCountingOutputStream ()
 {
-     m_currentPos = 0;
+    m_currentPos =
+    m_lastPos = 0;
 }
 
 wxFileOffset wxCountingOutputStream::GetLength() const
 {
-    return m_lastcount;
+    return m_lastPos;
 }
 
 size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
                                           size_t size)
 {
     m_currentPos += size;
-    if (m_currentPos > m_lastcount)
-        m_lastcount = m_currentPos;
+    if ( m_currentPos > m_lastPos )
+        m_lastPos = m_currentPos;
 
-    return m_currentPos;
+    return size;
 }
 
 wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
@@ -1081,12 +1155,12 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
             break;
 
         case wxFromEnd:
-            new_pos = m_lastcount + new_pos;
-            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastcount + pos), wxInvalidOffset, wxT("huge position not supported") );
+            new_pos += m_lastPos;
+            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastPos + pos), wxInvalidOffset, wxT("huge position not supported") );
             break;
 
         case wxFromCurrent:
-            new_pos = m_currentPos + new_pos;
+            new_pos += m_currentPos;
             wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
             break;
 
@@ -1097,8 +1171,8 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
 
     m_currentPos = new_pos;
 
-    if (m_currentPos > m_lastcount)
-        m_lastcount = m_currentPos;
+    if ( m_currentPos > m_lastPos )
+        m_lastPos = m_currentPos;
 
     return m_currentPos;
 }
@@ -1446,6 +1520,93 @@ void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
     m_o_streambuf = buffer;
 }
 
+// ---------------------------------------------------------------------------
+// wxWrapperInputStream implementation
+// ---------------------------------------------------------------------------
+
+wxWrapperInputStream::wxWrapperInputStream()
+{
+    m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+wxWrapperInputStream::wxWrapperInputStream(wxInputStream& stream)
+    : wxFilterInputStream(stream)
+{
+    SynchronizeLastError();
+}
+
+wxWrapperInputStream::wxWrapperInputStream(wxInputStream *stream)
+    : wxFilterInputStream(stream)
+{
+    if ( m_parent_i_stream )
+        SynchronizeLastError();
+    else
+        m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+void wxWrapperInputStream::InitParentStream(wxInputStream& stream)
+{
+    wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" );
+
+    m_parent_i_stream = &stream;
+
+    SynchronizeLastError();
+}
+
+void wxWrapperInputStream::InitParentStream(wxInputStream* stream)
+{
+    wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" );
+
+    m_parent_i_stream = stream;
+
+    if ( m_parent_i_stream )
+    {
+        m_owns = true;
+
+        SynchronizeLastError();
+    }
+}
+
+wxFileOffset wxWrapperInputStream::GetLength() const
+{
+    wxCHECK_MSG(m_parent_i_stream, wxInvalidOffset, "Stream not valid");
+
+    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
+    return m_parent_i_stream->GetLength();
+}
+
+bool wxWrapperInputStream::IsSeekable() const
+{
+    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
+    return m_parent_i_stream->IsSeekable();
+}
+
+size_t wxWrapperInputStream::OnSysRead(void *buffer, size_t size)
+{
+    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
+
+    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
+
+    m_parent_i_stream->Read(buffer, size);
+    return m_parent_i_stream->LastRead();
+}
+
+wxFileOffset wxWrapperInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    wxCHECK_MSG(IsSeekable(), false, "Stream not seekable");
+
+    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
+    return m_parent_i_stream->SeekI (pos, mode);
+}
+
+wxFileOffset wxWrapperInputStream::OnSysTell() const
+{
+    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
+
+    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
+    return m_parent_i_stream->TellI();
+}
+
 // ----------------------------------------------------------------------------
 // Some IOManip function
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/string.cpp b/Externals/wxWidgets3/src/common/string.cpp
index 7b95949c01..a2f18a8b49 100644
--- a/Externals/wxWidgets3/src/common/string.cpp
+++ b/Externals/wxWidgets3/src/common/string.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: string.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2004 Ryan Norton <wxprojects@comcast.net>
 // Licence:     wxWindows licence
@@ -1169,12 +1168,6 @@ int wxString::CmpNoCase(const wxString& s) const
 
 #if wxUSE_UNICODE
 
-#ifdef __MWERKS__
-#ifndef __SCHAR_MAX__
-#define __SCHAR_MAX__ 127
-#endif
-#endif
-
 wxString wxString::FromAscii(const char *ascii, size_t len)
 {
     if (!ascii || len == 0)
@@ -1442,7 +1435,7 @@ size_t wxString::Replace(const wxString& strOld,
     }
     else if ( !bReplaceAll)
     {
-        size_t pos = m_impl.find(strOld, 0);
+        size_t pos = m_impl.find(strOld.m_impl, 0);
         if ( pos != npos )
         {
             m_impl.replace(pos, strOld.m_impl.length(), strNew.m_impl);
diff --git a/Externals/wxWidgets3/src/common/stringimpl.cpp b/Externals/wxWidgets3/src/common/stringimpl.cpp
index 830ace8284..3dad9eb3c0 100644
--- a/Externals/wxWidgets3/src/common/stringimpl.cpp
+++ b/Externals/wxWidgets3/src/common/stringimpl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: stringimpl.cpp 70150 2011-12-28 13:51:13Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2004 Ryan Norton <wxprojects@comcast.net>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/stringops.cpp b/Externals/wxWidgets3/src/common/stringops.cpp
index 233bf83caf..1592706872 100644
--- a/Externals/wxWidgets3/src/common/stringops.cpp
+++ b/Externals/wxWidgets3/src/common/stringops.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2007-04-16
-// RCS-ID:      $Id: stringops.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -254,7 +253,6 @@ wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i)
 {
     wxASSERT( IsValidUtf8LeadByte(*i) );
 
-    wxUniChar::value_type code = 0;
     size_t len = GetUtf8CharLength(*i);
     wxASSERT_MSG( len <= 4, wxT("invalid UTF-8 sequence length") );
 
@@ -282,7 +280,7 @@ wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i)
     wxASSERT_MSG( ((unsigned char)*i & s_leadMarkerMask[len-1]) ==
                   s_leadMarkerVal[len-1],
                   wxT("invalid UTF-8 lead byte") );
-    code = (unsigned char)*i & s_leadValueMask[len-1];
+    wxUniChar::value_type code = (unsigned char)*i & s_leadValueMask[len-1];
 
     // all remaining bytes, if any, are handled in the same way regardless of
     // sequence's length:
diff --git a/Externals/wxWidgets3/src/common/strvararg.cpp b/Externals/wxWidgets3/src/common/strvararg.cpp
index 694a370d77..9112bbf8f9 100644
--- a/Externals/wxWidgets3/src/common/strvararg.cpp
+++ b/Externals/wxWidgets3/src/common/strvararg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     macros for implementing type-safe vararg passing of strings
 // Author:      Vaclav Slavik
 // Created:     2007-02-19
-// RCS-ID:      $Id: strvararg.cpp 70523 2012-02-06 13:28:34Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -435,6 +434,8 @@ class wxPrintfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
 };
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
+#endif // __WINDOWS__/!__WINDOWS__
+
 #if wxUSE_UNICODE_UTF8
 class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase<char>
 {
@@ -458,8 +459,6 @@ class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase<char>
 };
 #endif // wxUSE_UNICODE_UTF8
 
-#endif // __WINDOWS__/!__WINDOWS__
-
 #if !wxUSE_UNICODE // FIXME-UTF8: remove
 class wxPrintfFormatConverterANSI : public wxFormatConverterBase<char>
 {
diff --git a/Externals/wxWidgets3/src/common/sysopt.cpp b/Externals/wxWidgets3/src/common/sysopt.cpp
index e16ff8256a..ede2e7a547 100644
--- a/Externals/wxWidgets3/src/common/sysopt.cpp
+++ b/Externals/wxWidgets3/src/common/sysopt.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
-// RCS-ID:      $Id: sysopt.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/tarstrm.cpp b/Externals/wxWidgets3/src/common/tarstrm.cpp
index af3766d5c2..87074cc278 100644
--- a/Externals/wxWidgets3/src/common/tarstrm.cpp
+++ b/Externals/wxWidgets3/src/common/tarstrm.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/tarstrm.cpp
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: tarstrm.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/taskbarcmn.cpp b/Externals/wxWidgets3/src/common/taskbarcmn.cpp
index 514478f6d3..54133a57df 100644
--- a/Externals/wxWidgets3/src/common/taskbarcmn.cpp
+++ b/Externals/wxWidgets3/src/common/taskbarcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/04/2003
-// RCS-ID:      $Id: taskbarcmn.cpp 62789 2009-12-05 19:57:58Z PC $
 // Copyright:   (c) Julian Smart, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/tbarbase.cpp b/Externals/wxWidgets3/src/common/tbarbase.cpp
index 0baf8c4d79..e36d96eccf 100644
--- a/Externals/wxWidgets3/src/common/tbarbase.cpp
+++ b/Externals/wxWidgets3/src/common/tbarbase.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)
 // Created:     04/01/98
-// RCS-ID:      $Id: tbarbase.cpp 70179 2011-12-29 22:05:31Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -631,7 +630,7 @@ bool wxToolBarBase::IsVertical() const
 // Only allow toggle if returns true
 bool wxToolBarBase::OnLeftClick(int toolid, bool toggleDown)
 {
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, toolid);
+    wxCommandEvent event(wxEVT_TOOL, toolid);
     event.SetEventObject(this);
 
     // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown
@@ -651,7 +650,7 @@ void wxToolBarBase::OnRightClick(int toolid,
                                  long WXUNUSED(x),
                                  long WXUNUSED(y))
 {
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolid);
+    wxCommandEvent event(wxEVT_TOOL_RCLICKED, toolid);
     event.SetEventObject(this);
     event.SetInt(toolid);
 
@@ -665,7 +664,7 @@ void wxToolBarBase::OnRightClick(int toolid,
 // the tool toolid.
 void wxToolBarBase::OnMouseEnter(int toolid)
 {
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, GetId());
+    wxCommandEvent event(wxEVT_TOOL_ENTER, GetId());
     event.SetEventObject(this);
     event.SetInt(toolid);
 
diff --git a/Externals/wxWidgets3/src/common/textbuf.cpp b/Externals/wxWidgets3/src/common/textbuf.cpp
index 28d1e7477c..406043e58e 100644
--- a/Externals/wxWidgets3/src/common/textbuf.cpp
+++ b/Externals/wxWidgets3/src/common/textbuf.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxTextBuffer class
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
-// RCS-ID:      $Id: textbuf.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1998-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,17 +34,12 @@
 // ----------------------------------------------------------------------------
 
 // default type is the native one
-// the native type under Mac OS X is:
-//   - Unix when compiling with the Apple Developer Tools (__UNIX__)
-//   - Mac when compiling with CodeWarrior (__WXMAC__)
 
 const wxTextFileType wxTextBuffer::typeDefault =
 #if defined(__WINDOWS__) || defined(__DOS__)
   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;
-#elif defined(__WXMAC__)
-  wxTextFileType_Mac;
 #elif defined(__OS2__)
   wxTextFileType_Os2;
 #else
diff --git a/Externals/wxWidgets3/src/common/textcmn.cpp b/Externals/wxWidgets3/src/common/textcmn.cpp
index 68dfc96258..4cba1dec5b 100644
--- a/Externals/wxWidgets3/src/common/textcmn.cpp
+++ b/Externals/wxWidgets3/src/common/textcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     13.07.99
-// RCS-ID:      $Id: textcmn.cpp 70448 2012-01-23 12:33:03Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,8 +102,8 @@ wxEND_FLAGS( wxTextCtrlStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )
 
 wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
@@ -125,10 +124,10 @@ wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_ENTER, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_URL, wxTextUrlEvent );
+wxDEFINE_EVENT( wxEVT_TEXT_MAXLEN, wxCommandEvent );
 
 IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
 
@@ -228,156 +227,178 @@ bool wxTextAttr::operator== (const wxTextAttr& attr) const
 {
     return  GetFlags() == attr.GetFlags() &&
 
-            GetTextColour() == attr.GetTextColour() &&
-            GetBackgroundColour() == attr.GetBackgroundColour() &&
+            (!HasTextColour() || (GetTextColour() == attr.GetTextColour())) &&
+            (!HasBackgroundColour() || (GetBackgroundColour() == attr.GetBackgroundColour())) &&
 
-            GetAlignment() == attr.GetAlignment() &&
-            GetLeftIndent() == attr.GetLeftIndent() &&
-            GetLeftSubIndent() == attr.GetLeftSubIndent() &&
-            GetRightIndent() == attr.GetRightIndent() &&
-            TabsEq(GetTabs(), attr.GetTabs()) &&
+            (!HasAlignment() || (GetAlignment() == attr.GetAlignment())) &&
+            (!HasLeftIndent() || (GetLeftIndent() == attr.GetLeftIndent() &&
+                                  GetLeftSubIndent() == attr.GetLeftSubIndent())) &&
+            (!HasRightIndent() || (GetRightIndent() == attr.GetRightIndent())) &&
+            (!HasTabs() || (TabsEq(GetTabs(), attr.GetTabs()))) &&
 
-            GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
-            GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
-            GetLineSpacing() == attr.GetLineSpacing() &&
-            GetCharacterStyleName() == attr.GetCharacterStyleName() &&
-            GetParagraphStyleName() == attr.GetParagraphStyleName() &&
-            GetListStyleName() == attr.GetListStyleName() &&
+            (!HasParagraphSpacingAfter() || (GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter())) &&
+            (!HasParagraphSpacingBefore() || (GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore())) &&
+            (!HasLineSpacing() || (GetLineSpacing() == attr.GetLineSpacing())) &&
+            (!HasCharacterStyleName() || (GetCharacterStyleName() == attr.GetCharacterStyleName())) &&
+            (!HasParagraphStyleName() || (GetParagraphStyleName() == attr.GetParagraphStyleName())) &&
+            (!HasListStyleName() || (GetListStyleName() == attr.GetListStyleName())) &&
 
-            GetBulletStyle() == attr.GetBulletStyle() &&
-            GetBulletText() == attr.GetBulletText() &&
-            GetBulletNumber() == attr.GetBulletNumber() &&
-            GetBulletFont() == attr.GetBulletFont() &&
-            GetBulletName() == attr.GetBulletName() &&
+            (!HasBulletStyle() || (GetBulletStyle() == attr.GetBulletStyle())) &&
+            (!HasBulletText() || (GetBulletText() == attr.GetBulletText())) &&
+            (!HasBulletNumber() || (GetBulletNumber() == attr.GetBulletNumber())) &&
+            (GetBulletFont() == attr.GetBulletFont()) &&
+            (!HasBulletName() || (GetBulletName() == attr.GetBulletName())) &&
 
-            GetTextEffects() == attr.GetTextEffects() &&
-            GetTextEffectFlags() == attr.GetTextEffectFlags() &&
+            (!HasTextEffects() || (GetTextEffects() == attr.GetTextEffects() &&
+                                   GetTextEffectFlags() == attr.GetTextEffectFlags())) &&
 
-            GetOutlineLevel() == attr.GetOutlineLevel() &&
+            (!HasOutlineLevel() || (GetOutlineLevel() == attr.GetOutlineLevel())) &&
 
-            GetFontSize() == attr.GetFontSize() &&
-            GetFontStyle() == attr.GetFontStyle() &&
-            GetFontWeight() == attr.GetFontWeight() &&
-            GetFontUnderlined() == attr.GetFontUnderlined() &&
-            GetFontFaceName() == attr.GetFontFaceName() &&
-            GetFontEncoding() == attr.GetFontEncoding() &&
-            GetFontFamily() == attr.GetFontFamily() &&
+            (!HasFontSize() || (GetFontSize() == attr.GetFontSize())) &&
+            (!HasFontItalic() || (GetFontStyle() == attr.GetFontStyle())) &&
+            (!HasFontWeight() || (GetFontWeight() == attr.GetFontWeight())) &&
+            (!HasFontUnderlined() || (GetFontUnderlined() == attr.GetFontUnderlined())) &&
+            (!HasFontStrikethrough() || (GetFontStrikethrough() == attr.GetFontStrikethrough())) &&
+            (!HasFontFaceName() || (GetFontFaceName() == attr.GetFontFaceName())) &&
+            (!HasFontEncoding() || (GetFontEncoding() == attr.GetFontEncoding())) &&
+            (!HasFontFamily() || (GetFontFamily() == attr.GetFontFamily())) &&
 
-            GetURL() == attr.GetURL();
+            (!HasURL() || (GetURL() == attr.GetURL()));
 }
 
 // Partial equality test. Only returns false if an attribute doesn't match.
-bool wxTextAttr::EqPartial(const wxTextAttr& attr) const
+bool wxTextAttr::EqPartial(const wxTextAttr& attr, bool weakTest) const
 {
     int flags = attr.GetFlags();
-    
-    if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
+
+    if (!weakTest &&
+        ((!HasTextColour() && attr.HasTextColour()) ||
+         (!HasBackgroundColour() && attr.HasBackgroundColour()) ||
+         (!HasFontFaceName() && attr.HasFontFaceName()) ||
+         (!HasFontSize() && attr.HasFontSize()) ||
+         (!HasFontWeight() && attr.HasFontWeight()) ||
+         (!HasFontItalic() && attr.HasFontItalic()) ||
+         (!HasFontUnderlined() && attr.HasFontUnderlined()) ||
+         (!HasFontStrikethrough() && attr.HasFontStrikethrough()) ||
+         (!HasFontEncoding() && attr.HasFontEncoding()) ||
+         (!HasFontFamily() && attr.HasFontFamily()) ||
+         (!HasURL() && attr.HasURL()) ||
+         (!HasAlignment() && attr.HasAlignment()) ||
+         (!HasLeftIndent() && attr.HasLeftIndent()) ||
+         (!HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter()) ||
+         (!HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore()) ||
+         (!HasLineSpacing() && attr.HasLineSpacing()) ||
+         (!HasCharacterStyleName() && attr.HasCharacterStyleName()) ||
+         (!HasParagraphStyleName() && attr.HasParagraphStyleName()) ||
+         (!HasListStyleName() && attr.HasListStyleName()) ||
+         (!HasBulletStyle() && attr.HasBulletStyle()) ||
+         (!HasBulletNumber() && attr.HasBulletNumber()) ||
+         (!HasBulletText() && attr.HasBulletText()) ||
+         (!HasBulletName() && attr.HasBulletName()) ||
+         (!HasTabs() && attr.HasTabs()) ||
+         (!HasTextEffects() && attr.HasTextEffects()) ||
+         (!HasOutlineLevel() && attr.HasOutlineLevel())))
+    {
+        return false;
+    }
+
+    if (HasTextColour() && attr.HasTextColour() && GetTextColour() != attr.GetTextColour())
         return false;
 
-    if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && GetBackgroundColour() != attr.GetBackgroundColour())
+    if (HasBackgroundColour() && attr.HasBackgroundColour() && GetBackgroundColour() != attr.GetBackgroundColour())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_FACE) &&
-        GetFontFaceName() != attr.GetFontFaceName())
+    if (HasFontFaceName() && attr.HasFontFaceName() && GetFontFaceName() != attr.GetFontFaceName())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_SIZE) &&
-        GetFontSize() != attr.GetFontSize())
+    // This checks whether the two objects have the same font size dimension (px versus pt)
+    if (HasFontSize() && attr.HasFontSize() && (flags & wxTEXT_ATTR_FONT) != (GetFlags() & wxTEXT_ATTR_FONT))
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_WEIGHT) &&
-        GetFontWeight() != attr.GetFontWeight())
+    if (HasFontPointSize() && attr.HasFontPointSize() && GetFontSize() != attr.GetFontSize())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_ITALIC) &&
-        GetFontStyle() != attr.GetFontStyle())
+    if (HasFontPixelSize() && attr.HasFontPixelSize() && GetFontSize() != attr.GetFontSize())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) &&
-        GetFontUnderlined() != attr.GetFontUnderlined())
+    if (HasFontWeight() && attr.HasFontWeight() && GetFontWeight() != attr.GetFontWeight())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_ENCODING) &&
-        GetFontEncoding() != attr.GetFontEncoding())
+    if (HasFontItalic() && attr.HasFontItalic() && GetFontStyle() != attr.GetFontStyle())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_FAMILY) &&
-        GetFontFamily() != attr.GetFontFamily())
+    if (HasFontUnderlined() && attr.HasFontUnderlined() && GetFontUnderlined() != attr.GetFontUnderlined())
         return false;
 
-    if ((flags & wxTEXT_ATTR_URL) && GetURL() != attr.GetURL())
+    if (HasFontStrikethrough() && attr.HasFontStrikethrough() && GetFontStrikethrough() != attr.GetFontStrikethrough())
         return false;
 
-    if ((flags & wxTEXT_ATTR_ALIGNMENT) && GetAlignment() != attr.GetAlignment())
+    if (HasFontEncoding() && attr.HasFontEncoding() && GetFontEncoding() != attr.GetFontEncoding())
         return false;
 
-    if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
+    if (HasFontFamily() && attr.HasFontFamily() && GetFontFamily() != attr.GetFontFamily())
+        return false;
+
+    if (HasURL() && attr.HasURL() && GetURL() != attr.GetURL())
+        return false;
+
+    if (HasAlignment() && attr.HasAlignment() && GetAlignment() != attr.GetAlignment())
+        return false;
+
+    if (HasLeftIndent() && attr.HasLeftIndent() &&
         ((GetLeftIndent() != attr.GetLeftIndent()) || (GetLeftSubIndent() != attr.GetLeftSubIndent())))
         return false;
 
-    if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
-        (GetRightIndent() != attr.GetRightIndent()))
+    if (HasRightIndent() && attr.HasRightIndent() && (GetRightIndent() != attr.GetRightIndent()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
+    if (HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter() &&
         (GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
+    if (HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore() &&
         (GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
-        (GetLineSpacing() != attr.GetLineSpacing()))
+    if (HasLineSpacing() && attr.HasLineSpacing() && (GetLineSpacing() != attr.GetLineSpacing()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
-        (GetCharacterStyleName() != attr.GetCharacterStyleName()))
+    if (HasCharacterStyleName() && attr.HasCharacterStyleName() && (GetCharacterStyleName() != attr.GetCharacterStyleName()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
-        (GetParagraphStyleName() != attr.GetParagraphStyleName()))
+    if (HasParagraphStyleName() && attr.HasParagraphStyleName() && (GetParagraphStyleName() != attr.GetParagraphStyleName()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
-        (GetListStyleName() != attr.GetListStyleName()))
+    if (HasListStyleName() && attr.HasListStyleName() && (GetListStyleName() != attr.GetListStyleName()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
-        (GetBulletStyle() != attr.GetBulletStyle()))
+    if (HasBulletStyle() && attr.HasBulletStyle() && (GetBulletStyle() != attr.GetBulletStyle()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
-        (GetBulletNumber() != attr.GetBulletNumber()))
+    if (HasBulletNumber() && attr.HasBulletNumber() && (GetBulletNumber() != attr.GetBulletNumber()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+    if (HasBulletText() && attr.HasBulletText() &&
         (GetBulletText() != attr.GetBulletText()) &&
         (GetBulletFont() != attr.GetBulletFont()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
-        (GetBulletName() != attr.GetBulletName()))
+    if (HasBulletName() && attr.HasBulletName() && (GetBulletName() != attr.GetBulletName()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_TABS) &&
-        !TabsEq(GetTabs(), attr.GetTabs()))
+    if (HasTabs() && attr.HasTabs() && !TabsEq(GetTabs(), attr.GetTabs()))
         return false;
 
-    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
-        (HasPageBreak() != attr.HasPageBreak()))
+    if ((HasPageBreak() != attr.HasPageBreak()))
          return false;
 
-    if (flags & wxTEXT_ATTR_EFFECTS)
+    if (HasTextEffects() && attr.HasTextEffects())
     {
-        if (HasTextEffects() != attr.HasTextEffects())
-            return false;
-        if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), attr.GetTextEffectFlags()))
+        if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), GetTextEffectFlags()))
             return false;
     }
 
-    if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
-        (GetOutlineLevel() != attr.GetOutlineLevel()))
+    if (HasOutlineLevel() && attr.HasOutlineLevel() && (GetOutlineLevel() != attr.GetOutlineLevel()))
          return false;
 
     return true;
@@ -393,11 +414,11 @@ wxFont wxTextAttr::GetFont() const
     if (HasFontSize())
         fontSize = GetFontSize();
 
-    int fontStyle = wxNORMAL;
+    wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
     if (HasFontItalic())
         fontStyle = GetFontStyle();
 
-    int fontWeight = wxNORMAL;
+    wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
     if (HasFontWeight())
         fontWeight = GetFontWeight();
 
@@ -406,7 +427,7 @@ wxFont wxTextAttr::GetFont() const
         underlined = GetFontUnderlined();
 
     bool strikethrough = false;
-    if ( HasFontStrikethrough() )
+    if (HasFontStrikethrough())
         strikethrough = GetFontStrikethrough();
 
     wxString fontFaceName;
@@ -421,10 +442,20 @@ wxFont wxTextAttr::GetFont() const
     if (HasFontFamily())
         fontFamily = GetFontFamily();
 
-    wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
-    if ( strikethrough )
-        font.SetStrikethrough( true );
-    return font;
+    if (HasFontPixelSize())
+    {
+        wxFont font(wxSize(0, fontSize), fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
+        if (strikethrough)
+            font.SetStrikethrough(true);
+        return font;
+    }
+    else
+    {
+        wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
+        if (strikethrough)
+            font.SetStrikethrough(true);
+        return font;
+    }
 }
 
 // Get attributes from font.
@@ -433,8 +464,30 @@ bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags)
     if (!font.IsOk())
         return false;
 
-    if (flags & wxTEXT_ATTR_FONT_SIZE)
+    // If we pass both pixel and point size attributes, this is an indication
+    // to choose the most appropriate units.
+    if ((flags & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT)
+    {
+        if (font.IsUsingSizeInPixels())
+        {
+            m_fontSize = font.GetPixelSize().y;
+            flags &= ~wxTEXT_ATTR_FONT_POINT_SIZE;
+        }
+        else
+        {
+            m_fontSize = font.GetPointSize();
+            flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
+        }
+    }
+    else if (flags & wxTEXT_ATTR_FONT_POINT_SIZE)
+    {
         m_fontSize = font.GetPointSize();
+        flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
+    }
+    else if (flags & wxTEXT_ATTR_FONT_PIXEL_SIZE)
+    {
+        m_fontSize = font.GetPixelSize().y;
+    }
 
     if (flags & wxTEXT_ATTR_FONT_ITALIC)
         m_fontStyle = font.GetStyle();
@@ -493,10 +546,15 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith)
             destStyle.SetFontWeight(style.GetFontWeight());
     }
 
-    if (style.HasFontSize())
+    if (style.HasFontPointSize())
     {
-        if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
-            destStyle.SetFontSize(style.GetFontSize());
+        if (!(compareWith && compareWith->HasFontPointSize() && compareWith->GetFontSize() == style.GetFontSize()))
+            destStyle.SetFontPointSize(style.GetFontSize());
+    }
+    else if (style.HasFontPixelSize())
+    {
+        if (!(compareWith && compareWith->HasFontPixelSize() && compareWith->GetFontSize() == style.GetFontSize()))
+            destStyle.SetFontPixelSize(style.GetFontSize());
     }
 
     if (style.HasFontItalic())
@@ -760,6 +818,19 @@ bool wxTextAttr::RemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style)
     int flags = style.GetFlags();
     int destFlags = destStyle.GetFlags();
 
+    // We must treat text effects specially, since we must remove only some.
+    if (style.HasTextEffects() && (style.GetTextEffectFlags() != 0))
+    {
+        int newTextEffectFlags = destStyle.GetTextEffectFlags() & ~style.GetTextEffectFlags();
+        int newTextEffects = destStyle.GetTextEffects() & ~style.GetTextEffectFlags();
+        destStyle.SetTextEffects(newTextEffects);
+        destStyle.SetTextEffectFlags(newTextEffectFlags);
+
+        // Don't remove wxTEXT_ATTR_EFFECTS unless the resulting flags are zero
+        if (newTextEffectFlags != 0)
+            flags &= ~wxTEXT_ATTR_EFFECTS;
+    }
+
     destStyle.SetFlags(destFlags & ~flags);
 
     return true;
@@ -851,23 +922,18 @@ bool wxTextAreaBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType)
         {
             SetValue(text);
 
+            DiscardEdits();
+            m_filename = filename;
+
             return true;
         }
     }
+#else
+    (void)filename;   // avoid compiler warning about unreferenced parameter
 #endif // wxUSE_FFILE
 
-    return false;
-}
-
-bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int fileType)
-{
-    if ( wxTextAreaBase::DoLoadFile(filename, fileType) )
-    {
-        DiscardEdits();
-        m_filename = filename;
-        return true;
-    }
     wxLogError(_("File couldn't be loaded."));
+
     return false;
 }
 
@@ -875,10 +941,21 @@ bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType)
 {
 #if wxUSE_FFILE
     wxFFile file(filename, wxT("w"));
-    return file.IsOpened() && file.Write(GetValue(), *wxConvCurrent);
+    if ( file.IsOpened() && file.Write(GetValue()) )
+    {
+        // if it worked, save for future calls
+        m_filename = filename;
+
+        // it's not modified any longer
+        DiscardEdits();
+
+        return true;
+    }
 #else
-    return false;
+    (void)filename;   // avoid compiler warning about unreferenced parameter
 #endif // wxUSE_FFILE
+
+    return false;
 }
 
 bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
@@ -895,21 +972,6 @@ bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
     return DoSaveFile(filenameToUse, fileType);
 }
 
-bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int fileType)
-{
-    if ( wxTextAreaBase::DoSaveFile(filename, fileType) )
-    {
-        // if it worked, save for future calls
-        m_filename = filename;
-
-        // it's not modified any longer
-        DiscardEdits();
-
-        return true;
-    }
-    return false;
-}
-
 // ----------------------------------------------------------------------------
 // stream-like insertion operator
 // ----------------------------------------------------------------------------
@@ -962,14 +1024,14 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 #ifndef __WIN32__
     wxChar ch = 0;
     int keycode = event.GetKeyCode();
-    
+
     long from, to;
     GetSelection(&from,&to);
     long insert = GetInsertionPoint();
     long last = GetLastPosition();
-    
-    // catch arrow left and right 
-    
+
+    // catch arrow left and right
+
     switch ( keycode )
     {
         case WXK_LEFT:
@@ -1094,6 +1156,18 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
     return handled;
 }
 
+// ----------------------------------------------------------------------------
+// Other miscellaneous stuff
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::SetHint(const wxString& hint)
+{
+    wxCHECK_MSG( IsSingleLine(), false,
+                 wxS("Hints can only be set for single line text controls") );
+
+    return wxTextEntry::SetHint(hint);
+}
+
 // do the window-specific processing after processing the update event
 void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
@@ -1156,6 +1230,6 @@ wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 // controls (wxComboBox and wxSpinCtrl)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent );
 
 #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
diff --git a/Externals/wxWidgets3/src/common/textentrycmn.cpp b/Externals/wxWidgets3/src/common/textentrycmn.cpp
index a344f8319d..b1480e322e 100644
--- a/Externals/wxWidgets3/src/common/textentrycmn.cpp
+++ b/Externals/wxWidgets3/src/common/textentrycmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTextEntryBase implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-26
-// RCS-ID:      $Id: textentrycmn.cpp 67515 2011-04-16 17:27:34Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +49,7 @@ public:
                                 wxTextEntryHintData::OnSetFocus, this);
         wxBIND_OR_CONNECT_HACK(win, wxEVT_KILL_FOCUS, wxFocusEventHandler,
                                 wxTextEntryHintData::OnKillFocus, this);
-        wxBIND_OR_CONNECT_HACK(win, wxEVT_COMMAND_TEXT_UPDATED,
+        wxBIND_OR_CONNECT_HACK(win, wxEVT_TEXT,
                                 wxCommandEventHandler,
                                 wxTextEntryHintData::OnTextChanged, this);
     }
@@ -224,12 +223,22 @@ void wxTextEntryBase::AppendText(const wxString& text)
 
 void wxTextEntryBase::DoSetValue(const wxString& value, int flags)
 {
-    EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
+    if ( value != DoGetValue() )
+    {
+        EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
 
-    SelectAll();
-    WriteText(value);
+        SelectAll();
+        WriteText(value);
 
-    SetInsertionPoint(0);
+        SetInsertionPoint(0);
+    }
+    else // Same value, no need to do anything.
+    {
+        // Except that we still need to generate the event for consistency with
+        // the normal case when the text does change.
+        if ( flags & SetValue_SendEvent )
+            SendTextUpdatedEvent(GetEditableWindow());
+    }
 }
 
 void wxTextEntryBase::Replace(long from, long to, const wxString& value)
@@ -357,7 +366,7 @@ bool wxTextEntryBase::SendTextUpdatedEvent(wxWindow *win)
 {
     wxCHECK_MSG( win, false, "can't send an event without a window" );
 
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, win->GetId());
+    wxCommandEvent event(wxEVT_TEXT, win->GetId());
 
     // do not do this as it could be very inefficient if the text control
     // contains a lot of text and we're not using ref-counted wxString
diff --git a/Externals/wxWidgets3/src/common/textfile.cpp b/Externals/wxWidgets3/src/common/textfile.cpp
index ca3191f2e4..ddf88c9e46 100644
--- a/Externals/wxWidgets3/src/common/textfile.cpp
+++ b/Externals/wxWidgets3/src/common/textfile.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id: textfile.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -209,8 +208,8 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
 
     // now break the buffer in lines
 
-    // last processed character, we need to know if it was a CR or not
-    wxChar chLast = '\0';
+    // was the last processed character a CR?
+    bool lastWasCR = false;
 
     // the beginning of the current line, changes inside the loop
     wxString::const_iterator lineStart = str.begin();
@@ -222,7 +221,7 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
         {
             case '\n':
                 // could be a DOS or Unix EOL
-                if ( chLast == '\r' )
+                if ( lastWasCR )
                 {
                     if ( p - 1 >= lineStart )
                     {
@@ -240,10 +239,11 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
                 }
 
                 lineStart = p + 1;
+                lastWasCR = false;
                 break;
 
             case '\r':
-                if ( chLast == '\r' )
+                if ( lastWasCR )
                 {
                     // Mac empty line
                     AddLine(wxEmptyString, wxTextFileType_Mac);
@@ -251,10 +251,12 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
                 }
                 //else: we don't know what this is yet -- could be a Mac EOL or
                 //      start of DOS EOL so wait for next char
+
+                lastWasCR = true;
                 break;
 
             default:
-                if ( chLast == '\r' )
+                if ( lastWasCR )
                 {
                     // Mac line termination
                     if ( p - 1 >= lineStart )
@@ -268,16 +270,31 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
                     }
                     lineStart = p;
                 }
+                lastWasCR = false;
         }
-
-        chLast = ch;
     }
 
     // anything in the last line?
     if ( lineStart != end )
     {
-        // add unterminated last line
-        AddLine(wxString(lineStart, end), wxTextFileType_None);
+        // add the last line, notice that it may have been terminated with CR
+        // as we don't end the line immediately when we see a CR, as it could
+        // be followed by a LF.
+        wxString lastLine(lineStart, end);
+        wxTextFileType lastType;
+        if ( lastWasCR )
+        {
+            // last line had Mac EOL, exclude it from the string
+            lastLine.RemoveLast();
+            lastType = wxTextFileType_Mac;
+        }
+        else
+        {
+            // last line wasn't terminated at all
+            lastType = wxTextFileType_None;
+        }
+
+        AddLine(lastLine, lastType);
     }
 
     return true;
diff --git a/Externals/wxWidgets3/src/common/textmeasurecmn.cpp b/Externals/wxWidgets3/src/common/textmeasurecmn.cpp
new file mode 100644
index 0000000000..8d828d4b71
--- /dev/null
+++ b/Externals/wxWidgets3/src/common/textmeasurecmn.cpp
@@ -0,0 +1,280 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/textmeasurecmn.cpp
+// Purpose:     wxTextMeasureBase implementation
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/window.h"
+#endif //WX_PRECOMP
+
+#include "wx/private/textmeasure.h"
+
+// ============================================================================
+// wxTextMeasureBase implementation
+// ============================================================================
+
+wxTextMeasureBase::wxTextMeasureBase(const wxDC *dc, const wxFont *theFont)
+    : m_dc(dc),
+      m_win(NULL),
+      m_font(theFont)
+{
+    wxASSERT_MSG( dc, wxS("wxTextMeasure needs a valid wxDC") );
+
+    // By default, use wxDC version, we'll explicitly reset this to false in
+    // the derived classes if the DC is of native variety.
+    m_useDCImpl = true;
+}
+
+wxTextMeasureBase::wxTextMeasureBase(const wxWindow *win, const wxFont *theFont)
+    : m_dc(NULL),
+      m_win(win),
+      m_font(theFont)
+{
+    wxASSERT_MSG( win, wxS("wxTextMeasure needs a valid wxWindow") );
+
+    // We don't have any wxDC so we can't forward to it.
+    m_useDCImpl = false;
+}
+
+wxFont wxTextMeasureBase::GetFont() const
+{
+    return m_font ? *m_font
+                  : m_win ? m_win->GetFont()
+                          : m_dc->GetFont();
+}
+
+void wxTextMeasureBase::CallGetTextExtent(const wxString& string,
+                                          wxCoord *width,
+                                          wxCoord *height,
+                                          wxCoord *descent,
+                                          wxCoord *externalLeading)
+{
+    if ( m_useDCImpl )
+        m_dc->GetTextExtent(string, width, height, descent, externalLeading);
+    else
+        DoGetTextExtent(string, width, height, descent, externalLeading);
+}
+
+void wxTextMeasureBase::GetTextExtent(const wxString& string,
+                                      wxCoord *width,
+                                      wxCoord *height,
+                                      wxCoord *descent,
+                                      wxCoord *externalLeading)
+{
+    // To make the code simpler, make sure that the width and height pointers
+    // are always valid, even if they point to dummy variables.
+    int unusedWidth, unusedHeight;
+    if ( !width )
+        width = &unusedWidth;
+    if ( !height )
+        height = &unusedHeight;
+
+    // Avoid even setting up the DC for measuring if we don't actually need to
+    // measure anything.
+    if ( string.empty() && !descent && !externalLeading )
+    {
+        *width =
+        *height = 0;
+
+        return;
+    }
+
+    MeasuringGuard guard(*this);
+
+    CallGetTextExtent(string, width, height, descent, externalLeading);
+}
+
+void wxTextMeasureBase::GetMultiLineTextExtent(const wxString& text,
+                                               wxCoord *width,
+                                               wxCoord *height,
+                                               wxCoord *heightOneLine)
+{
+    MeasuringGuard guard(*this);
+
+    wxCoord widthTextMax = 0, widthLine,
+            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+
+    wxString curLine;
+    for ( wxString::const_iterator pc = text.begin(); ; ++pc )
+    {
+        if ( pc == text.end() || *pc == wxS('\n') )
+        {
+            if ( curLine.empty() )
+            {
+                // we can't use GetTextExtent - it will return 0 for both width
+                // and height and an empty line should count in height
+                // calculation
+
+                // assume that this line has the same height as the previous
+                // one
+                if ( !heightLineDefault )
+                    heightLineDefault = heightLine;
+
+                if ( !heightLineDefault )
+                {
+                    // but we don't know it yet - choose something reasonable
+                    int dummy;
+                    CallGetTextExtent(wxS("W"), &dummy, &heightLineDefault);
+                }
+
+                heightTextTotal += heightLineDefault;
+            }
+            else
+            {
+                CallGetTextExtent(curLine, &widthLine, &heightLine);
+                if ( widthLine > widthTextMax )
+                    widthTextMax = widthLine;
+                heightTextTotal += heightLine;
+            }
+
+            if ( pc == text.end() )
+            {
+               break;
+            }
+            else // '\n'
+            {
+               curLine.clear();
+            }
+        }
+        else
+        {
+            curLine += *pc;
+        }
+    }
+
+    if ( width )
+        *width = widthTextMax;
+    if ( height )
+        *height = heightTextTotal;
+    if ( heightOneLine )
+        *heightOneLine = heightLine;
+}
+
+wxSize wxTextMeasureBase::GetLargestStringExtent(size_t n,
+                                                 const wxString* strings)
+{
+    MeasuringGuard guard(*this);
+
+    wxCoord w, h, widthMax = 0, heightMax = 0;
+    for ( size_t i = 0; i < n; ++i )
+    {
+        CallGetTextExtent(strings[i], &w, &h);
+
+        if ( w > widthMax )
+            widthMax = w;
+        if ( h > heightMax )
+            heightMax = h;
+    }
+
+    return wxSize(widthMax, heightMax);
+}
+
+bool wxTextMeasureBase::GetPartialTextExtents(const wxString& text,
+                                              wxArrayInt& widths,
+                                              double scaleX)
+{
+    widths.Empty();
+    if ( text.empty() )
+        return true;
+
+    MeasuringGuard guard(*this);
+
+    widths.Add(0, text.length());
+
+    return DoGetPartialTextExtents(text, widths, scaleX);
+}
+
+// ----------------------------------------------------------------------------
+// Generic and inefficient DoGetPartialTextExtents() implementation.
+// ----------------------------------------------------------------------------
+
+// Each element of the widths array will be the width of the string up to and
+// including the corresponding character in text.  This is the generic
+// implementation, the port-specific classes should do this with native APIs
+// if available and if faster.  Note: pango_layout_index_to_pos is much slower
+// than calling GetTextExtent!!
+
+#define FWC_SIZE 256
+
+class FontWidthCache
+{
+public:
+    FontWidthCache() : m_scaleX(1), m_widths(NULL) { }
+    ~FontWidthCache() { delete []m_widths; }
+
+    void Reset()
+    {
+        if ( !m_widths )
+            m_widths = new int[FWC_SIZE];
+
+        memset(m_widths, 0, sizeof(int)*FWC_SIZE);
+    }
+
+    wxFont m_font;
+    double m_scaleX;
+    int *m_widths;
+};
+
+static FontWidthCache s_fontWidthCache;
+
+bool wxTextMeasureBase::DoGetPartialTextExtents(const wxString& text,
+                                                wxArrayInt& widths,
+                                                double scaleX)
+{
+    int totalWidth = 0;
+
+    // reset the cache if font or horizontal scale have changed
+    if ( !s_fontWidthCache.m_widths ||
+         !wxIsSameDouble(s_fontWidthCache.m_scaleX, scaleX) ||
+         (s_fontWidthCache.m_font != *m_font) )
+    {
+        s_fontWidthCache.Reset();
+        s_fontWidthCache.m_font = *m_font;
+        s_fontWidthCache.m_scaleX = scaleX;
+    }
+
+    // Calculate the position of each character based on the widths of
+    // the previous characters. This is inexact for not fixed fonts.
+    int n = 0;
+    for ( wxString::const_iterator it = text.begin();
+          it != text.end();
+          ++it )
+    {
+        const wxChar c = *it;
+        unsigned int c_int = (unsigned int)c;
+
+        int w;
+        if ((c_int < FWC_SIZE) && (s_fontWidthCache.m_widths[c_int] != 0))
+        {
+            w = s_fontWidthCache.m_widths[c_int];
+        }
+        else
+        {
+            DoGetTextExtent(c, &w, NULL);
+            if (c_int < FWC_SIZE)
+                s_fontWidthCache.m_widths[c_int] = w;
+        }
+
+        totalWidth += w;
+        widths[n++] = totalWidth;
+    }
+
+    return true;
+}
+
diff --git a/Externals/wxWidgets3/src/common/threadinfo.cpp b/Externals/wxWidgets3/src/common/threadinfo.cpp
new file mode 100644
index 0000000000..be07847b70
--- /dev/null
+++ b/Externals/wxWidgets3/src/common/threadinfo.cpp
@@ -0,0 +1,96 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/threadinfo.cpp
+// Purpose:     declaration of wxThreadSpecificInfo: thread-specific information
+// Author:      Vaclav Slavik
+// Created:     2013-09-14
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#include "wx/private/threadinfo.h"
+
+#if wxUSE_THREADS
+
+#include "wx/tls.h"
+#include "wx/thread.h"
+#include "wx/sharedptr.h"
+#include "wx/vector.h"
+
+namespace
+{
+
+// All thread info objects are stored in a global list so that they are
+// freed when global objects are destroyed and no memory leaks are reported.
+
+// Notice that we must be using accessor functions instead of simple global
+// variables here as this code could be executed during global initialization
+// time, i.e. before any globals in this module were initialzied.
+inline wxCriticalSection& GetAllThreadInfosCS()
+{
+    static wxCriticalSection s_csAllThreadInfos;
+
+    return s_csAllThreadInfos;
+}
+
+typedef wxVector< wxSharedPtr<wxThreadSpecificInfo> > wxAllThreadInfos;
+inline wxAllThreadInfos& GetAllThreadInfos()
+{
+    static wxAllThreadInfos s_allThreadInfos;
+
+    return s_allThreadInfos;
+}
+
+// Pointer to the current thread's instance
+wxTLS_TYPE(wxThreadSpecificInfo*) g_thisThreadInfo;
+
+} // anonymous namespace
+
+
+wxThreadSpecificInfo& wxThreadSpecificInfo::Get()
+{
+    if ( !wxTLS_VALUE(g_thisThreadInfo) )
+    {
+        wxTLS_VALUE(g_thisThreadInfo) = new wxThreadSpecificInfo;
+        wxCriticalSectionLocker lock(GetAllThreadInfosCS());
+        GetAllThreadInfos().push_back(
+                wxSharedPtr<wxThreadSpecificInfo>(wxTLS_VALUE(g_thisThreadInfo)));
+    }
+    return *wxTLS_VALUE(g_thisThreadInfo);
+}
+
+void wxThreadSpecificInfo::ThreadCleanUp()
+{
+    if ( !wxTLS_VALUE(g_thisThreadInfo) )
+        return; // nothing to do, not used by this thread at all
+
+    // find this thread's instance in GetAllThreadInfos() and destroy it
+    wxCriticalSectionLocker lock(GetAllThreadInfosCS());
+    for ( wxAllThreadInfos::iterator i = GetAllThreadInfos().begin();
+          i != GetAllThreadInfos().end();
+          ++i )
+    {
+        if ( i->get() == wxTLS_VALUE(g_thisThreadInfo) )
+        {
+            GetAllThreadInfos().erase(i);
+            wxTLS_VALUE(g_thisThreadInfo) = NULL;
+            break;
+        }
+    }
+}
+
+#else // !wxUSE_THREADS
+
+wxThreadSpecificInfo& wxThreadSpecificInfo::Get()
+{
+    static wxThreadSpecificInfo s_instance;
+    return s_instance;
+}
+
+#endif // wxUSE_THREADS/wxUSE_THREADS
diff --git a/Externals/wxWidgets3/src/common/time.cpp b/Externals/wxWidgets3/src/common/time.cpp
index 0be9306a0b..011b601490 100644
--- a/Externals/wxWidgets3/src/common/time.cpp
+++ b/Externals/wxWidgets3/src/common/time.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of time-related functions.
 // Author:      Vadim Zeitlin
 // Created:     2011-11-26
-// RCS-ID:      $Id: time.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,11 +47,6 @@
 #  endif
 #endif
 
-#if defined(__MWERKS__) && defined(__WINDOWS__)
-#   undef HAVE_FTIME
-#   undef HAVE_GETTIMEOFDAY
-#endif
-
 #ifndef __WXWINCE__
 #include <time.h>
 #else
@@ -72,10 +66,6 @@
     #include <sys/timeb.h>
 #endif
 
-#if defined(__MWERKS__) && wxUSE_UNICODE
-    #include <wtime.h>
-#endif
-
 #if defined(__DJGPP__) || defined(__WINE__)
     #include <sys/timeb.h>
     #include <values.h>
@@ -223,10 +213,6 @@ int wxGetTimeZone()
         return WX_TIMEZONE;
     #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         return _timezone;
-    #elif defined(__MWERKS__)
-        // This is just plain wrong but apparently MetroWerks runtime didn't have
-        // any way to get the time zone.
-        return 28800;
     #else // unknown platform -- assume it has timezone
         return timezone;
     #endif // different time zone variables
@@ -305,8 +291,6 @@ wxLongLong wxGetUTCTimeUSec()
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetUTCTimeMillis()
 {
-    wxLongLong val = MILLISECONDS_PER_SECOND;
-
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 #if defined(__WINDOWS__)
@@ -319,7 +303,10 @@ wxLongLong wxGetUTCTimeMillis()
     t /= 10000;
     t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
     return t;
-#elif defined(HAVE_GETTIMEOFDAY)
+#else // !__WINDOWS__
+    wxLongLong val = MILLISECONDS_PER_SECOND;
+
+#if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp) != -1 )
     {
@@ -355,6 +342,8 @@ wxLongLong wxGetUTCTimeMillis()
     val *= wxGetUTCTime();
     return val;
 #endif // time functions
+
+#endif // __WINDOWS__/!__WINDOWS__
 }
 
 wxLongLong wxGetLocalTimeMillis()
diff --git a/Externals/wxWidgets3/src/common/timercmn.cpp b/Externals/wxWidgets3/src/common/timercmn.cpp
index 78ca3ca47a..f117f9aaf0 100644
--- a/Externals/wxWidgets3/src/common/timercmn.cpp
+++ b/Externals/wxWidgets3/src/common/timercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
 // Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
 // Created:     04/01/98
-// RCS-ID:      $Id: timercmn.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/timerimpl.cpp b/Externals/wxWidgets3/src/common/timerimpl.cpp
index e5567c3f0e..d4d800d472 100644
--- a/Externals/wxWidgets3/src/common/timerimpl.cpp
+++ b/Externals/wxWidgets3/src/common/timerimpl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
 // Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
 // Created:     04/01/98
-// RCS-ID:      $Id: timerimpl.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/common/tokenzr.cpp b/Externals/wxWidgets3/src/common/tokenzr.cpp
index 52fa806e25..9d7926919b 100644
--- a/Externals/wxWidgets3/src/common/tokenzr.cpp
+++ b/Externals/wxWidgets3/src/common/tokenzr.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin (almost full rewrite)
 // Created:     04/22/98
-// RCS-ID:      $Id: tokenzr.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/toplvcmn.cpp b/Externals/wxWidgets3/src/common/toplvcmn.cpp
index 5b4dcb3837..03504cc0fe 100644
--- a/Externals/wxWidgets3/src/common/toplvcmn.cpp
+++ b/Externals/wxWidgets3/src/common/toplvcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     common (for all platforms) wxTopLevelWindow functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
-// Id:          $Id: toplvcmn.cpp 68366 2011-07-24 22:19:33Z VZ $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,7 +76,7 @@ wxTopLevelWindowBase::~wxTopLevelWindowBase()
           )
     {
         wxWindow * const win = wxDynamicCast(*i, wxWindow);
-        if ( win && win->GetParent() == this )
+        if ( win && wxGetTopLevelParent(win->GetParent()) == this )
         {
             wxPendingDelete.erase(i);
 
@@ -361,6 +360,14 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
 // whole client area
 void wxTopLevelWindowBase::DoLayout()
 {
+    // We are called during the window destruction several times, e.g. as
+    // wxFrame tries to adjust to its tool/status bars disappearing. But
+    // actually doing the layout is pretty useless in this case as the window
+    // will disappear anyhow -- so just don't bother.
+    if ( IsBeingDeleted() )
+        return;
+
+
     // if we're using constraints or sizers - do use them
     if ( GetAutoLayout() )
     {
diff --git a/Externals/wxWidgets3/src/common/translation.cpp b/Externals/wxWidgets3/src/common/translation.cpp
index db59ccd0f2..455fb315d0 100644
--- a/Externals/wxWidgets3/src/common/translation.cpp
+++ b/Externals/wxWidgets3/src/common/translation.cpp
@@ -5,7 +5,6 @@
 //              Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Created:     2010-04-23
-// RCS-ID:      $Id: translation.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,10 +47,18 @@
 #include "wx/tokenzr.h"
 #include "wx/fontmap.h"
 #include "wx/stdpaths.h"
-#include "wx/hashset.h"
+#include "wx/private/threadinfo.h"
 
 #ifdef __WINDOWS__
+    #include "wx/dynlib.h"
+    #include "wx/scopedarray.h"
     #include "wx/msw/wrapwin.h"
+    #include "wx/msw/missing.h"
+#endif
+#ifdef __WXOSX__
+    #include "wx/osx/core/cfstring.h"
+    #include <CoreFoundation/CFBundle.h>
+    #include <CoreFoundation/CFLocale.h>
 #endif
 
 // ----------------------------------------------------------------------------
@@ -84,6 +91,155 @@ namespace
 wxStringToStringHashMap gs_msgIdCharset;
 #endif
 
+// ----------------------------------------------------------------------------
+// Platform specific helpers
+// ----------------------------------------------------------------------------
+
+void LogTraceArray(const char *prefix, const wxArrayString& arr)
+{
+    wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ','));
+}
+
+void LogTraceLargeArray(const wxString& prefix, const wxArrayString& arr)
+{
+    wxLogTrace(TRACE_I18N, "%s:", prefix);
+    for ( wxArrayString::const_iterator i = arr.begin(); i != arr.end(); ++i )
+        wxLogTrace(TRACE_I18N, "    %s", *i);
+}
+
+// Use locale-based detection as a fallback
+wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available))
+{
+    const wxString lang = wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage());
+    wxLogTrace(TRACE_I18N, " - obtained best language from locale: %s", lang);
+    return lang;
+}
+
+#ifdef __WINDOWS__
+
+wxString GetPreferredUILanguage(const wxArrayString& available)
+{
+    typedef BOOL (WINAPI *GetUserPreferredUILanguages_t)(DWORD, PULONG, PWSTR, PULONG);
+    static GetUserPreferredUILanguages_t s_pfnGetUserPreferredUILanguages = NULL;
+    static bool s_initDone = false;
+    if ( !s_initDone )
+    {
+        wxLoadedDLL dllKernel32("kernel32.dll");
+        wxDL_INIT_FUNC(s_pfn, GetUserPreferredUILanguages, dllKernel32);
+        s_initDone = true;
+    }
+
+    if ( s_pfnGetUserPreferredUILanguages )
+    {
+        ULONG numLangs;
+        ULONG bufferSize = 0;
+        if ( (*s_pfnGetUserPreferredUILanguages)(MUI_LANGUAGE_NAME,
+                                                 &numLangs,
+                                                 NULL,
+                                                 &bufferSize) )
+        {
+            wxScopedArray<WCHAR> langs(new WCHAR[bufferSize]);
+            if ( (*s_pfnGetUserPreferredUILanguages)(MUI_LANGUAGE_NAME,
+                                                     &numLangs,
+                                                     langs.get(),
+                                                     &bufferSize) )
+            {
+                wxArrayString preferred;
+
+                WCHAR *buf = langs.get();
+                for ( unsigned i = 0; i < numLangs; i++ )
+                {
+                    const wxString lang(buf);
+                    preferred.push_back(lang);
+                    buf += lang.length() + 1;
+                }
+                LogTraceArray(" - system preferred languages", preferred);
+
+                for ( wxArrayString::const_iterator j = preferred.begin();
+                      j != preferred.end();
+                      ++j )
+                {
+                    wxString lang(*j);
+                    lang.Replace("-", "_");
+                    if ( available.Index(lang, /*bCase=*/false) != wxNOT_FOUND )
+                        return lang;
+                    size_t pos = lang.find('_');
+                    if ( pos != wxString::npos )
+                    {
+                        lang = lang.substr(0, pos);
+                        if ( available.Index(lang, /*bCase=*/false) != wxNOT_FOUND )
+                            return lang;
+                    }
+                }
+            }
+        }
+    }
+
+    return GetPreferredUILanguageFallback(available);
+}
+
+#elif defined(__WXOSX__)
+
+void LogTraceArray(const char *prefix, CFArrayRef arr)
+{
+    wxString s;
+    const unsigned count = CFArrayGetCount(arr);
+    if ( count )
+    {
+        s += wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(arr, 0));
+        for ( unsigned i = 1 ; i < count; i++ )
+            s += "," + wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(arr, i));
+    }
+    wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s);
+}
+
+wxString GetPreferredUILanguage(const wxArrayString& available)
+{
+    wxStringToStringHashMap availableNormalized;
+    wxCFRef<CFMutableArrayRef> availableArr(
+        CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+
+    for ( wxArrayString::const_iterator i = available.begin();
+          i != available.end();
+          ++i )
+    {
+        wxString lang(*i);
+        wxCFStringRef code_wx(*i);
+        wxCFStringRef code_norm(
+            CFLocaleCreateCanonicalLanguageIdentifierFromString(kCFAllocatorDefault, code_wx));
+        CFArrayAppendValue(availableArr, code_norm);
+        availableNormalized[code_norm.AsString()] = *i;
+    }
+    LogTraceArray(" - normalized available list", availableArr);
+
+    wxCFRef<CFArrayRef> prefArr(
+        CFBundleCopyLocalizationsForPreferences(availableArr, NULL));
+    LogTraceArray(" - system preferred languages", prefArr);
+
+    unsigned prefArrLength = CFArrayGetCount(prefArr);
+    if ( prefArrLength > 0 )
+    {
+        // Lookup the name in 'available' by index -- we need to get the
+        // original value corresponding to the normalized one chosen.
+        wxString lang(wxCFStringRef::AsString((CFStringRef)CFArrayGetValueAtIndex(prefArr, 0)));
+        wxStringToStringHashMap::const_iterator i = availableNormalized.find(lang);
+        if ( i == availableNormalized.end() )
+            return lang;
+        else
+            return i->second;
+    }
+
+    return GetPreferredUILanguageFallback(available);
+}
+
+#else
+
+// On Unix, there's just one language=locale setting, so we should always
+// use that.
+#define GetPreferredUILanguage GetPreferredUILanguageFallback
+
+#endif
+
 } // anonymous namespace
 
 // ----------------------------------------------------------------------------
@@ -139,7 +295,7 @@ public:
         T_LEFT_BRACKET, T_RIGHT_BRACKET
     };
     Type type() const { return m_type; }
-    void setType(Type type) { m_type = type; }
+    void setType(Type t) { m_type = t; }
     // for T_NUMBER only
     typedef int Number;
     Number number() const { return m_number; }
@@ -316,7 +472,7 @@ private:
 class wxPluralFormsNode
 {
 public:
-    wxPluralFormsNode(const wxPluralFormsToken& token) : m_token(token) {}
+    wxPluralFormsNode(const wxPluralFormsToken& t) : m_token(t) {}
     const wxPluralFormsToken& token() const { return m_token; }
     const wxPluralFormsNode* node(unsigned i) const
         { return m_nodes[i].get(); }
@@ -885,7 +1041,7 @@ private:
 };
 
 // ----------------------------------------------------------------------------
-// wxMsgCatalogFile clas
+// wxMsgCatalogFile class
 // ----------------------------------------------------------------------------
 
 wxMsgCatalogFile::wxMsgCatalogFile()
@@ -1336,7 +1492,7 @@ bool wxTranslations::AddCatalog(const wxString& domain,
                                 wxLanguage msgIdLanguage)
 {
     const wxString msgIdLang = wxLocale::GetLanguageCanonicalName(msgIdLanguage);
-    const wxString domain_lang = ChooseLanguageForDomain(domain, msgIdLang);
+    const wxString domain_lang = GetBestTranslation(domain, msgIdLang);
 
     if ( domain_lang.empty() )
     {
@@ -1350,19 +1506,12 @@ bool wxTranslations::AddCatalog(const wxString& domain,
                 wxS("adding '%s' translation for domain '%s' (msgid language '%s')"),
                 domain_lang, domain, msgIdLang);
 
-    // It is OK to not load catalog if the msgid language and m_language match,
-    // in which case we can directly display the texts embedded in program's
-    // source code:
-    if ( msgIdLang == domain_lang )
-        return true;
-
-    return LoadCatalog(domain, domain_lang);
+    return LoadCatalog(domain, domain_lang, msgIdLang);
 }
 
 
-bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang)
+bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang, const wxString& msgIdLang)
 {
-    m_loader->GetAvailableTranslations(domain);
     wxCHECK_MSG( m_loader, false, "loader can't be NULL" );
 
     wxMsgCatalog *cat = NULL;
@@ -1398,6 +1547,15 @@ bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang)
             cat = m_loader->LoadCatalog(domain, baselang);
     }
 
+    if ( !cat )
+    {
+        // It is OK to not load catalog if the msgid language and m_language match,
+        // in which case we can directly display the texts embedded in program's
+        // source code:
+        if ( msgIdLang == lang )
+            return true;
+    }
+
     if ( cat )
     {
         // add it to the head of the list so that in GetString it will
@@ -1423,53 +1581,58 @@ bool wxTranslations::IsLoaded(const wxString& domain) const
     return FindCatalog(domain) != NULL;
 }
 
+wxString wxTranslations::GetBestTranslation(const wxString& domain,
+                                            wxLanguage msgIdLanguage)
+{
+    const wxString lang = wxLocale::GetLanguageCanonicalName(msgIdLanguage);
+    return GetBestTranslation(domain, lang);
+}
 
-wxString wxTranslations::ChooseLanguageForDomain(const wxString& WXUNUSED(domain),
-                                                 const wxString& WXUNUSED(msgIdLang))
+wxString wxTranslations::GetBestTranslation(const wxString& domain,
+                                            const wxString& msgIdLanguage)
 {
     // explicitly set language should always be respected
     if ( !m_lang.empty() )
         return m_lang;
 
-    // TODO: if the default language is used, pick the best (by comparing
-    //       available languages with user's preferences), instead of blindly
-    //       trusting availability of system language translation
-    return wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage());
+    wxArrayString available(GetAvailableTranslations(domain));
+    // it's OK to have duplicates, so just add msgid language
+    available.push_back(msgIdLanguage);
+    available.push_back(msgIdLanguage.BeforeFirst('_'));
+
+    wxLogTrace(TRACE_I18N, "choosing best language for domain '%s'", domain);
+    LogTraceArray(" - available translations", available);
+    const wxString lang = GetPreferredUILanguage(available);
+    wxLogTrace(TRACE_I18N, " => using language '%s'", lang);
+    return lang;
 }
 
 
-namespace
-{
-WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual,
-                    wxLocaleUntranslatedStrings);
-}
-
 /* static */
 const wxString& wxTranslations::GetUntranslatedString(const wxString& str)
 {
-    static wxLocaleUntranslatedStrings s_strings;
+    wxLocaleUntranslatedStrings& strings = wxThreadInfo.untranslatedStrings;
 
-    wxLocaleUntranslatedStrings::iterator i = s_strings.find(str);
-    if ( i == s_strings.end() )
-        return *s_strings.insert(str).first;
+    wxLocaleUntranslatedStrings::iterator i = strings.find(str);
+    if ( i == strings.end() )
+        return *strings.insert(str).first;
 
     return *i;
 }
 
 
-const wxString& wxTranslations::GetString(const wxString& origString,
-                                          const wxString& domain) const
+const wxString *wxTranslations::GetTranslatedString(const wxString& origString,
+                                                    const wxString& domain) const
 {
-    return GetString(origString, origString, UINT_MAX, domain);
+    return GetTranslatedString(origString, UINT_MAX, domain);
 }
 
-const wxString& wxTranslations::GetString(const wxString& origString,
-                                          const wxString& origString2,
-                                          unsigned n,
-                                          const wxString& domain) const
+const wxString *wxTranslations::GetTranslatedString(const wxString& origString,
+                                                    unsigned n,
+                                                    const wxString& domain) const
 {
     if ( origString.empty() )
-        return GetUntranslatedString(origString);
+        return NULL;
 
     const wxString *trans = NULL;
     wxMsgCatalog *pMsgCat;
@@ -1504,14 +1667,9 @@ const wxString& wxTranslations::GetString(const wxString& origString,
             (!domain.empty() ? wxString::Format("domain '%s' ", domain) : wxString()),
             m_lang
         );
-
-        if (n == UINT_MAX)
-            return GetUntranslatedString(origString);
-        else
-            return GetUntranslatedString(n == 1 ? origString : origString2);
     }
 
-    return *trans;
+    return trans;
 }
 
 
@@ -1593,7 +1751,7 @@ wxArrayString gs_searchPrefixes;
 wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
 {
     // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in
-    // prefix/lang and finally in just prefix.
+    // prefix/lang.
     //
     // Note that we use LC_MESSAGES on all platforms and not just Unix, because
     // it doesn't cost much to look into one more directory and doing it this
@@ -1603,13 +1761,19 @@ wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
     //    breaking apps after they are recompiled against the latest wx
     // b) it makes it possible to package app's support files in the same
     //    way on all target platforms
-    const wxString pathPrefix = wxFileName(prefix, lang).GetFullPath();
+    const wxString prefixAndLang = wxFileName(prefix, lang).GetFullPath();
 
     wxString searchPath;
-    searchPath.reserve(4*pathPrefix.length());
-    searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
-            << prefix << wxFILE_SEP_PATH << wxPATH_SEP
-            << pathPrefix;
+    searchPath.reserve(4*prefixAndLang.length());
+
+    searchPath
+#ifdef __WXOSX__
+               << prefixAndLang << ".lproj/LC_MESSAGES" << wxPATH_SEP
+               << prefixAndLang << ".lproj" << wxPATH_SEP
+#endif
+               << prefixAndLang << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
+               << prefixAndLang << wxPATH_SEP
+               ;
 
     return searchPath;
 }
@@ -1622,7 +1786,7 @@ bool HasMsgCatalogInDir(const wxString& dir, const wxString& domain)
 
 // get prefixes to locale directories; if lang is empty, don't point to
 // OSX's .lproj bundles
-wxArrayString GetSearchPrefixes(const wxString& lang = wxString())
+wxArrayString GetSearchPrefixes()
 {
     wxArrayString paths;
 
@@ -1632,15 +1796,7 @@ wxArrayString GetSearchPrefixes(const wxString& lang = wxString())
 #if wxUSE_STDPATHS
     // then look in the standard location
     wxString stdp;
-    if ( lang.empty() )
-    {
-        stdp = wxStandardPaths::Get().GetResourcesDir();
-    }
-    else
-    {
-        stdp = wxStandardPaths::Get().
-            GetLocalizedResourcesDir(lang, wxStandardPaths::ResourceCat_Messages);
-    }
+    stdp = wxStandardPaths::Get().GetResourcesDir();
     if ( paths.Index(stdp) == wxNOT_FOUND )
         paths.Add(stdp);
 #endif // wxUSE_STDPATHS
@@ -1676,7 +1832,7 @@ wxString GetFullSearchPath(const wxString& lang)
     wxString searchPath;
     searchPath.reserve(500);
 
-    const wxArrayString prefixes = GetSearchPrefixes(lang);
+    const wxArrayString prefixes = GetSearchPrefixes();
 
     for ( wxArrayString::const_iterator i = prefixes.begin();
           i != prefixes.end();
@@ -1710,8 +1866,11 @@ wxMsgCatalog *wxFileTranslationsLoader::LoadCatalog(const wxString& domain,
 {
     wxString searchPath = GetFullSearchPath(lang);
 
-    wxLogTrace(TRACE_I18N, wxS("Looking for \"%s.mo\" in search path \"%s\""),
-                domain, searchPath);
+    LogTraceLargeArray
+    (
+        wxString::Format("looking for \"%s.mo\" in search path", domain),
+        wxSplit(searchPath, wxPATH_SEP[0])
+    );
 
     wxFileName fn(domain);
     fn.SetExt(wxS("mo"));
@@ -1733,9 +1892,11 @@ wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString&
     wxArrayString langs;
     const wxArrayString prefixes = GetSearchPrefixes();
 
-    wxLogTrace(TRACE_I18N,
-               "looking for available translations of \"%s\" in search path \"%s\"",
-               domain, wxJoin(prefixes, wxPATH_SEP[0]));
+    LogTraceLargeArray
+    (
+        wxString::Format("looking for available translations of \"%s\" in search path", domain),
+        prefixes
+    );
 
     for ( wxArrayString::const_iterator i = prefixes.begin();
           i != prefixes.end();
@@ -1762,7 +1923,8 @@ wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString&
 #endif // __WXOSX__
 
                 wxLogTrace(TRACE_I18N,
-                           "found %s translation of \"%s\"", lang, domain);
+                           "found %s translation of \"%s\" in %s",
+                           lang, domain, langdir);
                 langs.push_back(lang);
             }
         }
@@ -1788,7 +1950,7 @@ wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain,
 
     if ( !wxLoadUserResource(&mo_data, &mo_size,
                              resname,
-                             GetResourceType(),
+                             GetResourceType().t_str(),
                              GetModule()) )
         return NULL;
 
diff --git a/Externals/wxWidgets3/src/common/treebase.cpp b/Externals/wxWidgets3/src/common/treebase.cpp
index 5bb5455d4b..7283ea3981 100644
--- a/Externals/wxWidgets3/src/common/treebase.cpp
+++ b/Externals/wxWidgets3/src/common/treebase.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Created:     01/02/97
 // Modified:
-// Id:          $Id: treebase.cpp 70795 2012-03-04 00:29:21Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart et al
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,27 +34,27 @@ extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
 // events
 // ----------------------------------------------------------------------------
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_RDRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_GET_INFO, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SET_INFO, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_KEY_DOWN, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_BEGIN_DRAG, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_BEGIN_RDRAG, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_END_LABEL_EDIT, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_DELETE_ITEM, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_GET_INFO, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_SET_INFO, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_EXPANDED, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_EXPANDING, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_COLLAPSED, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_COLLAPSING, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_SEL_CHANGED, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_SEL_CHANGING, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_KEY_DOWN, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_ACTIVATED, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_END_DRAG, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_TREE_ITEM_MENU, wxTreeEvent );
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -111,9 +110,9 @@ wxEND_FLAGS( wxTreeCtrlStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_RANGE_PROPERTY( TreeEvent, wxEVT_COMMAND_TREE_BEGIN_DRAG, \
-                       wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
+wxEVENT_RANGE_PROPERTY( TreeEvent, wxEVT_TREE_BEGIN_DRAG, \
+                       wxEVT_TREE_STATE_IMAGE_CLICK, wxTreeEvent )
 
 wxPROPERTY_FLAGS( WindowStyle, wxTreeCtrlStyle, long, SetWindowStyleFlag, \
                  GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
diff --git a/Externals/wxWidgets3/src/common/txtstrm.cpp b/Externals/wxWidgets3/src/common/txtstrm.cpp
index 11da612bb9..9e3fa8a793 100644
--- a/Externals/wxWidgets3/src/common/txtstrm.cpp
+++ b/Externals/wxWidgets3/src/common/txtstrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
-// RCS-ID:      $Id: txtstrm.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/uiactioncmn.cpp b/Externals/wxWidgets3/src/common/uiactioncmn.cpp
index 96097c9e27..32a8d2f2d4 100644
--- a/Externals/wxWidgets3/src/common/uiactioncmn.cpp
+++ b/Externals/wxWidgets3/src/common/uiactioncmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
-// RCS-ID:      $Id: uiactioncmn.cpp 69960 2011-12-08 15:55:40Z VZ $
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
@@ -25,6 +24,8 @@ bool wxUIActionSimulator::MouseClick(int button)
     return true;
 }
 
+#ifndef __WXOSX__
+
 bool wxUIActionSimulator::MouseDblClick(int button)
 {
     MouseDown(button);
@@ -35,18 +36,19 @@ bool wxUIActionSimulator::MouseDblClick(int button)
     return true;
 }
 
-bool
-wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
+bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
                                    int button)
 {
     MouseMove(x1, y1);
     MouseDown(button);
     MouseMove(x2, y2);
     MouseUp(button);
-
+    
     return true;
 }
 
+#endif
+
 bool
 wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
 {
diff --git a/Externals/wxWidgets3/src/common/unichar.cpp b/Externals/wxWidgets3/src/common/unichar.cpp
index e9ebba6408..de95fcd001 100644
--- a/Externals/wxWidgets3/src/common/unichar.cpp
+++ b/Externals/wxWidgets3/src/common/unichar.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxUniChar and wxUniCharRef classes
 // Author:      Vaclav Slavik
 // Created:     2007-03-19
-// RCS-ID:      $Id: unichar.cpp 62738 2009-11-28 14:37:03Z VZ $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/unictabl.inc b/Externals/wxWidgets3/src/common/unictabl.inc
index a26c7eed07..2993424abc 100644
--- a/Externals/wxWidgets3/src/common/unictabl.inc
+++ b/Externals/wxWidgets3/src/common/unictabl.inc
@@ -3,7 +3,6 @@
 /*
  *  This file is #included by encconv.cpp
  *
- *  CVS-ID: $Id: unictabl.inc 65062 2010-07-23 23:33:16Z VZ $
  *
  *  *** ***  CAUTION! *** ***
  *  Do not modify this file by hand! It is generated by shell
diff --git a/Externals/wxWidgets3/src/common/uri.cpp b/Externals/wxWidgets3/src/common/uri.cpp
index 59fd4fed49..d6279eed2b 100644
--- a/Externals/wxWidgets3/src/common/uri.cpp
+++ b/Externals/wxWidgets3/src/common/uri.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton,
 //              Vadim Zeitlin (UTF-8 URI support, many other changes)
 // Created:     10/26/04
-// RCS-ID:      $Id: uri.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Ryan Norton,
 //                  2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -817,7 +816,7 @@ bool wxURI::ParseH16(const char*& uri)
 //
 // Parses a certain version of an IP address and moves the input string past
 // it.  Returns true if the input  string contains the proper version of an ip
-// address.  It is the caller's responsability to move the input string back
+// address.  It is the caller's responsibility to move the input string back
 // to its original position on failure.
 // ---------------------------------------------------------------------------
 
diff --git a/Externals/wxWidgets3/src/common/url.cpp b/Externals/wxWidgets3/src/common/url.cpp
index 57f86b4220..8d6eb49aa2 100644
--- a/Externals/wxWidgets3/src/common/url.cpp
+++ b/Externals/wxWidgets3/src/common/url.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/1997
-// RCS-ID:      $Id: url.cpp 66728 2011-01-22 14:38:36Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/ustring.cpp b/Externals/wxWidgets3/src/common/ustring.cpp
index 7a4a152aae..ab70ce5ae2 100644
--- a/Externals/wxWidgets3/src/common/ustring.cpp
+++ b/Externals/wxWidgets3/src/common/ustring.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxUString class
 // Author:      Robert Roebling
 // Created:     2008-07-25
-// RCS-ID:      $Id: ustring.cpp 59887 2009-03-27 15:33:55Z VS $
 // Copyright:   (c) 2008 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/utilscmn.cpp b/Externals/wxWidgets3/src/common/utilscmn.cpp
index 6fdb219826..0d30b0249b 100644
--- a/Externals/wxWidgets3/src/common/utilscmn.cpp
+++ b/Externals/wxWidgets3/src/common/utilscmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: utilscmn.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -70,8 +69,6 @@
 #endif
 
 #if wxUSE_GUI
-    #include "wx/colordlg.h"
-    #include "wx/fontdlg.h"
     #include "wx/notebook.h"
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
@@ -86,7 +83,7 @@
     #include "wx/osx/private.h"
 #endif
 
-#if !defined(__MWERKS__) && !defined(__WXWINCE__)
+#if !defined(__WXWINCE__)
     #include <sys/types.h>
     #include <sys/stat.h>
 #endif
@@ -551,12 +548,17 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
     wxCHECK_MSG( map, false, wxS("output pointer can't be NULL") );
 
 #if defined(__VISUALC__)
+    // This variable only exists to force the CRT to fill the wide char array,
+    // it might only have it in narrow char version until now as we use main()
+    // (and not _wmain()) as our entry point.
+    static wxChar* s_dummyEnvVar = _tgetenv(wxT("TEMP"));
+
     wxChar **env = _tenviron;
 #elif defined(__VMS)
    // Now this routine wil give false for OpenVMS
    // TODO : should we do something with logicals?
     char **env=NULL;
-#elif defined(__WXOSX__)
+#elif defined(__DARWIN__)
 #if wxOSX_USE_COCOA_OR_CARBON
     // Under Mac shared libraries don't have access to the global environ
     // variable so use this Mac-specific function instead as advised by
@@ -615,18 +617,27 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
 // wxExecute
 // ----------------------------------------------------------------------------
 
-// wxDoExecuteWithCapture() helper: reads an entire stream into one array
+// wxDoExecuteWithCapture() helper: reads an entire stream into one array if
+// the stream is non-NULL (it doesn't do anything if it's NULL).
 //
 // returns true if ok, false if error
 #if wxUSE_STREAMS
 static bool ReadAll(wxInputStream *is, wxArrayString& output)
 {
-    wxCHECK_MSG( is, false, wxT("NULL stream in wxExecute()?") );
+    if ( !is )
+        return true;
 
     // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
     is->Reset();
 
-    wxTextInputStream tis(*is);
+    // Notice that wxTextInputStream doesn't work correctly with wxConvAuto
+    // currently, see #14720, so use the current locale conversion explicitly
+    // under assumption that any external program should be using it too.
+    wxTextInputStream tis(*is, " \t"
+#if wxUSE_UNICODE
+                                    , wxConvLibc
+#endif
+                                                );
 
     for ( ;; )
     {
@@ -668,17 +679,16 @@ static long wxDoExecuteWithCapture(const wxString& command,
     long rc = wxExecute(command, wxEXEC_SYNC | flags, process, env);
 
 #if wxUSE_STREAMS
-    if ( rc != -1 )
+    // Notice that while -1 indicates an error exit code for us, a program
+    // exiting with this code could still have written something to its stdout
+    // and, especially, stderr, so we still need to read from them.
+    if ( !ReadAll(process->GetInputStream(), output) )
+        rc = -1;
+
+    if ( error )
     {
-        if ( !ReadAll(process->GetInputStream(), output) )
+        if ( !ReadAll(process->GetErrorStream(), *error) )
             rc = -1;
-
-        if ( error )
-        {
-            if ( !ReadAll(process->GetErrorStream(), *error) )
-                rc = -1;
-        }
-
     }
 #else
     wxUnusedVar(output);
@@ -710,9 +720,9 @@ long wxExecute(const wxString& command,
 // ----------------------------------------------------------------------------
 
 // Id generation
-static long wxCurrentId = 100;
+static int wxCurrentId = 100;
 
-long wxNewId()
+int wxNewId()
 {
     // skip the part of IDs space that contains hard-coded values:
     if (wxCurrentId == wxID_LOWEST)
@@ -721,11 +731,11 @@ long wxNewId()
     return wxCurrentId++;
 }
 
-long
+int
 wxGetCurrentId(void) { return wxCurrentId; }
 
 void
-wxRegisterId (long id)
+wxRegisterId (int id)
 {
   if (id >= wxCurrentId)
     wxCurrentId = id + 1;
@@ -1184,22 +1194,23 @@ wxString wxStripMenuCodes(const wxString& in, int flags)
     size_t len = in.length();
     out.reserve(len);
 
-    for ( size_t n = 0; n < len; n++ )
+    for ( wxString::const_iterator it = in.begin(); it != in.end(); ++it )
     {
-        wxChar ch = in[n];
+        wxChar ch = *it;
         if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') )
         {
             // skip it, it is used to introduce the accel char (or to quote
             // itself in which case it should still be skipped): note that it
             // can't be the last character of the string
-            if ( ++n == len )
+            if ( ++it == in.end() )
             {
                 wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str());
+                break;
             }
             else
             {
                 // use the next char instead
-                ch = in[n];
+                ch = *it;
             }
         }
         else if ( (flags & wxStrip_Accel) && ch == wxT('\t') )
@@ -1275,7 +1286,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
     // Hack for wxNotebook case: at least in wxGTK, all pages
     // claim to be shown, so we must only deal with the selected one.
 #if wxUSE_NOTEBOOK
-    if (win->IsKindOf(CLASSINFO(wxNotebook)))
+    if (wxDynamicCast(win, wxNotebook))
     {
       wxNotebook* nb = (wxNotebook*) win;
       int sel = nb->GetSelection();
@@ -1411,7 +1422,7 @@ wxVersionInfo wxGetLibraryVersionInfo()
                          wxMINOR_VERSION,
                          wxRELEASE_NUMBER,
                          msg,
-                         wxS("Copyright (c) 1995-2011 wxWidgets team"));
+                         wxS("Copyright (c) 1995-2013 wxWidgets team"));
 }
 
 void wxInfoMessageBox(wxWindow* parent)
@@ -1478,89 +1489,6 @@ wxString wxGetPasswordFromUser(const wxString& message,
 
 #endif // wxUSE_TEXTDLG
 
-#if wxUSE_COLOURDLG
-
-wxColour wxGetColourFromUser(wxWindow *parent,
-                             const wxColour& colInit,
-                             const wxString& caption,
-                             wxColourData *ptrData)
-{
-    // contains serialized representation of wxColourData used the last time
-    // the dialog was shown: we want to reuse it the next time in order to show
-    // the same custom colours to the user (and we can't just have static
-    // wxColourData itself because it's a GUI object and so should be destroyed
-    // before GUI shutdown and doing it during static cleanup is too late)
-    static wxString s_strColourData;
-
-    wxColourData data;
-    if ( !ptrData )
-    {
-        ptrData = &data;
-        if ( !s_strColourData.empty() )
-        {
-            if ( !data.FromString(s_strColourData) )
-            {
-                wxFAIL_MSG( "bug in wxColourData::FromString()?" );
-            }
-
-#ifdef __WXMSW__
-            // we don't get back the "choose full" flag value from the native
-            // dialog and so we can't preserve it between runs, so we decide to
-            // always use it as it seems better than not using it (user can
-            // just ignore the extra controls in the dialog but having to click
-            // a button each time to show them would be very annoying
-            data.SetChooseFull(true);
-#endif // __WXMSW__
-        }
-    }
-
-    if ( colInit.IsOk() )
-    {
-        ptrData->SetColour(colInit);
-    }
-
-    wxColour colRet;
-    wxColourDialog dialog(parent, ptrData);
-    if (!caption.empty())
-        dialog.SetTitle(caption);
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        *ptrData = dialog.GetColourData();
-        colRet = ptrData->GetColour();
-        s_strColourData = ptrData->ToString();
-    }
-    //else: leave colRet invalid
-
-    return colRet;
-}
-
-#endif // wxUSE_COLOURDLG
-
-#if wxUSE_FONTDLG
-
-wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
-{
-    wxFontData data;
-    if ( fontInit.IsOk() )
-    {
-        data.SetInitialFont(fontInit);
-    }
-
-    wxFont fontRet;
-    wxFontDialog dialog(parent, data);
-    if (!caption.empty())
-        dialog.SetTitle(caption);
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        fontRet = dialog.GetFontData().GetChosenFont();
-    }
-    //else: leave it invalid
-
-    return fontRet;
-}
-
-#endif // wxUSE_FONTDLG
-
 // ----------------------------------------------------------------------------
 // wxSafeYield and supporting functions
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/common/valgen.cpp b/Externals/wxWidgets3/src/common/valgen.cpp
index 7bbdc13088..19c26df510 100644
--- a/Externals/wxWidgets3/src/common/valgen.cpp
+++ b/Externals/wxWidgets3/src/common/valgen.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
-// RCS-ID:      $Id: valgen.cpp 68225 2011-07-11 14:51:32Z VZ $
 // Copyright:   (c) 1999 Kevin Smith
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -84,6 +83,8 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val)
     m_pDateTime = val;
 }
 
+#endif // wxUSE_DATETIME
+
 wxGenericValidator::wxGenericValidator(wxFileName *val)
 {
     Initialize();
@@ -102,8 +103,6 @@ wxGenericValidator::wxGenericValidator(double *val)
     m_pDouble = val;
 }
 
-#endif // wxUSE_DATETIME
-
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
     : wxValidator()
 {
@@ -136,7 +135,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // bool controls
 #if wxUSE_CHECKBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckBox))
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
@@ -147,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)
@@ -159,7 +158,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
 #if wxUSE_TOGGLEBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
     {
         wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)
@@ -169,7 +168,7 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
         if (m_pBool)
@@ -183,7 +182,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // int controls
 #if wxUSE_GAUGE
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    if (wxDynamicCast(m_validatorWindow, wxGauge))
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)
@@ -194,7 +193,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioBox))
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)
@@ -205,7 +204,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SCROLLBAR
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)
@@ -216,7 +215,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
@@ -227,7 +226,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SPINBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)
@@ -238,7 +237,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SLIDER
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    if (wxDynamicCast(m_validatorWindow, wxSlider))
     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
@@ -251,7 +250,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // date time controls
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)
@@ -264,7 +263,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // string controls
 #if wxUSE_BUTTON
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxButton))
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)
@@ -275,7 +274,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_COMBOBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))
     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)
@@ -298,7 +297,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_CHOICE
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    if (wxDynamicCast(m_validatorWindow, wxChoice))
     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)
@@ -317,7 +316,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_STATTEXT
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
@@ -328,7 +327,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_TEXTCTRL
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
@@ -364,7 +363,7 @@ bool wxGenericValidator::TransferToWindow(void)
     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))
     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)
@@ -387,7 +386,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_LISTBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxListBox))
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)
@@ -422,7 +421,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // BOOL CONTROLS **************************************
 #if wxUSE_CHECKBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckBox))
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
@@ -433,7 +432,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)
@@ -444,7 +443,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_TOGGLEBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
     {
         wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)
@@ -454,7 +453,7 @@ bool wxGenericValidator::TransferFromWindow(void)
         }
     } else
 #if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
     {
         wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow;
         if (m_pBool)
@@ -468,7 +467,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    if (wxDynamicCast(m_validatorWindow, wxGauge))
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)
@@ -479,7 +478,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioBox))
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)
@@ -490,7 +489,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SCROLLBAR
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)
@@ -501,7 +500,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
@@ -512,7 +511,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SPINBTN
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)
@@ -523,7 +522,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SLIDER
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    if (wxDynamicCast(m_validatorWindow, wxSlider))
     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
@@ -536,7 +535,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // DATE TIME CONTROLS ************************************
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)
@@ -549,7 +548,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // STRING CONTROLS ************************************
 #if wxUSE_BUTTON
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxButton))
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)
@@ -560,7 +559,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_COMBOBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))
     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)
@@ -579,7 +578,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_CHOICE
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    if (wxDynamicCast(m_validatorWindow, wxChoice))
     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)
@@ -595,7 +594,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_STATTEXT
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
@@ -606,7 +605,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_TEXTCTRL
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
@@ -640,7 +639,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     // ARRAY CONTROLS *************************************
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))
     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)
@@ -664,7 +663,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_LISTBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxListBox))
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)
diff --git a/Externals/wxWidgets3/src/common/validate.cpp b/Externals/wxWidgets3/src/common/validate.cpp
index d21d174cdf..306cac028d 100644
--- a/Externals/wxWidgets3/src/common/validate.cpp
+++ b/Externals/wxWidgets3/src/common/validate.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: validate.cpp 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/valtext.cpp b/Externals/wxWidgets3/src/common/valtext.cpp
index e7110fd6e4..e0621d050a 100644
--- a/Externals/wxWidgets3/src/common/valtext.cpp
+++ b/Externals/wxWidgets3/src/common/valtext.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     04/01/98
-// RCS-ID:      $Id: valtext.cpp 66385 2010-12-16 17:21:49Z JMS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -114,21 +113,21 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
 wxTextEntry *wxTextValidator::GetTextEntry()
 {
 #if wxUSE_TEXTCTRL
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
     {
         return (wxTextCtrl*)m_validatorWindow;
     }
 #endif
 
 #if wxUSE_COMBOBOX
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))
     {
         return (wxComboBox*)m_validatorWindow;
     }
 #endif
 
 #if wxUSE_COMBOCTRL
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboCtrl)))
+    if (wxDynamicCast(m_validatorWindow, wxComboCtrl))
     {
         return (wxComboCtrl*)m_validatorWindow;
     }
diff --git a/Externals/wxWidgets3/src/common/variant.cpp b/Externals/wxWidgets3/src/common/variant.cpp
index 27d28d9dde..5fc1931bba 100644
--- a/Externals/wxWidgets3/src/common/variant.cpp
+++ b/Externals/wxWidgets3/src/common/variant.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
-// RCS-ID:      $Id: variant.cpp 66608 2011-01-06 11:06:12Z SC $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,11 +36,6 @@
     #endif
 #endif
 
-#if defined(__MWERKS__) && __MSL__ >= 0x6000
-namespace std {}
-using namespace std ;
-#endif
-
 #if wxUSE_STREAMS
     #include "wx/txtstrm.h"
 #endif
diff --git a/Externals/wxWidgets3/src/common/webview.cpp b/Externals/wxWidgets3/src/common/webview.cpp
index 79524c245b..afaf3ffd09 100644
--- a/Externals/wxWidgets3/src/common/webview.cpp
+++ b/Externals/wxWidgets3/src/common/webview.cpp
@@ -2,7 +2,6 @@
 // Name:        webview.cpp
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
-// Id:          $Id: webview.cpp 69981 2011-12-11 05:36:52Z PC $
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,88 +31,81 @@ WX_CHECK_BUILD_OPTIONS("wxWEBVIEW")
 
 extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[] = "wxWebViewIE";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[] = "wxWebViewWebKit";
+
+#ifdef __WXMSW__
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewIE";
+#else
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewWebKit";
+#endif
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_NAVIGATING, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_LOADED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_ERROR, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_NEWWINDOW, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_TITLE_CHANGED, wxWebViewEvent );
+
+wxStringWebViewFactoryMap wxWebView::m_factoryMap;
 
 // static
-wxWebView* wxWebView::New(wxWebViewBackend backend)
+wxWebView* wxWebView::New(const wxString& backend)
 {
-    switch (backend)
-    {
-        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-           (defined(__WXGTK__) || defined(__WXOSX__))
-        case wxWEB_VIEW_BACKEND_WEBKIT:
-            return new wxWebViewWebKit();
-        #endif
+    wxStringWebViewFactoryMap::iterator iter = FindFactory(backend);
 
-        #if wxUSE_WEBVIEW_IE
-        case wxWEB_VIEW_BACKEND_IE:
-            return new wxWebViewIE();
-        #endif
-
-        case wxWEB_VIEW_BACKEND_DEFAULT:
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-               (defined(__WXGTK__) || defined(__WXOSX__))
-            return new wxWebViewWebKit();
-            #endif
-
-            #if wxUSE_WEBVIEW_IE
-            return new wxWebViewIE();
-            #endif
-
-        // fall-through intended
-        default:
-            return NULL;
-    }
+    if(iter == m_factoryMap.end())
+        return NULL;
+    else
+        return (*iter).second->Create();
 }
 
 // static
-wxWebView* wxWebView::New(wxWindow* parent,
-       wxWindowID id,
-       const wxString& url,
-       const wxPoint& pos,
-       const wxSize& size,
-       wxWebViewBackend backend,
-       long style,
-       const wxString& name)
+wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url,
+                          const wxPoint& pos, const wxSize& size, 
+                          const wxString& backend, long style, 
+                          const wxString& name)
 {
-    switch (backend)
-    {
-        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-           (defined(__WXGTK__) || defined(__WXOSX__))
-        case wxWEB_VIEW_BACKEND_WEBKIT:
-            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
-        #endif
+    wxStringWebViewFactoryMap::iterator iter = FindFactory(backend);
 
-        #if wxUSE_WEBVIEW_IE
-        case wxWEB_VIEW_BACKEND_IE:
-            return new wxWebViewIE(parent, id, url, pos, size, style, name);
-        #endif
+    if(iter == m_factoryMap.end())
+        return NULL;
+    else
+        return (*iter).second->Create(parent, id, url, pos, size, style, name);
 
-        case wxWEB_VIEW_BACKEND_DEFAULT:
+}
 
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-               (defined(__WXGTK__) || defined(__WXOSX__))
-            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
-            #endif
+// static
+void wxWebView::RegisterFactory(const wxString& backend, 
+                                wxSharedPtr<wxWebViewFactory> factory)
+{
+    m_factoryMap[backend] = factory;
+}
 
-            #if wxUSE_WEBVIEW_IE
-            return new wxWebViewIE(parent, id, url, pos, size, style, name);
-            #endif
+// static 
+wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backend)
+{
+    // Initialise the map, it checks internally for existing factories
+    InitFactoryMap();
 
-        // fall-through intended
-        default:
-            return NULL;
-    }
+    return m_factoryMap.find(backend);
+}
+ 
+// static
+void wxWebView::InitFactoryMap()
+{
+#ifdef __WXMSW__
+    if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end())
+        RegisterFactory(wxWebViewBackendIE, wxSharedPtr<wxWebViewFactory>
+                                                   (new wxWebViewFactoryIE));
+#else
+    if(m_factoryMap.find(wxWebViewBackendWebKit) == m_factoryMap.end())
+        RegisterFactory(wxWebViewBackendWebKit, wxSharedPtr<wxWebViewFactory>
+                                                       (new wxWebViewFactoryWebKit));
+#endif
 }
 
 #endif // wxUSE_WEBVIEW
diff --git a/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp b/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp
index 1752458ad6..cb8f608a29 100644
--- a/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp
+++ b/Externals/wxWidgets3/src/common/webviewarchivehandler.cpp
@@ -2,7 +2,6 @@
 // Name:        webviewfilehandler.cpp
 // Purpose:     Custom webview handler to allow archive browsing
 // Author:      Steven Lamerton
-// Id:          $Id: webviewarchivehandler.cpp 69317 2011-10-06 10:01:17Z SJL $
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/webviewfshandler.cpp b/Externals/wxWidgets3/src/common/webviewfshandler.cpp
new file mode 100644
index 0000000000..3b62dcfe42
--- /dev/null
+++ b/Externals/wxWidgets3/src/common/webviewfshandler.cpp
@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        webviewfshandler.cpp
+// Purpose:     Custom webview handler for virtual file system
+// Author:      Nick Matthews
+// Copyright:   (c) 2012 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_WEBVIEW
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#include "wx/webviewfshandler.h"
+#include "wx/filesys.h"
+
+wxWebViewFSHandler::wxWebViewFSHandler(const wxString& scheme) :
+                         wxWebViewHandler(scheme)
+{
+    m_fileSystem = new wxFileSystem();
+}
+
+wxWebViewFSHandler::~wxWebViewFSHandler()
+{
+    wxDELETE(m_fileSystem);
+}
+
+wxFSFile* wxWebViewFSHandler::GetFile(const wxString &uri)
+{
+    return m_fileSystem->OpenFile(uri);
+}
+
+#endif // wxUSE_WEBVIEW
diff --git a/Externals/wxWidgets3/src/common/wfstream.cpp b/Externals/wxWidgets3/src/common/wfstream.cpp
index c3e8b197ce..362b1861d6 100644
--- a/Externals/wxWidgets3/src/common/wfstream.cpp
+++ b/Externals/wxWidgets3/src/common/wfstream.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id: wfstream.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/wincmn.cpp b/Externals/wxWidgets3/src/common/wincmn.cpp
index 0abcc2778d..ad4887093b 100644
--- a/Externals/wxWidgets3/src/common/wincmn.cpp
+++ b/Externals/wxWidgets3/src/common/wincmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     13/07/98
-// RCS-ID:      $Id: wincmn.cpp 70838 2012-03-07 23:50:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -73,6 +72,7 @@
 #endif
 
 #include "wx/platinfo.h"
+#include "wx/recguard.h"
 #include "wx/private/window.h"
 
 #ifdef __WINDOWS__
@@ -89,6 +89,14 @@ wxMenu *wxCurrentPopupMenu = NULL;
 
 extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
 
+namespace wxMouseCapture
+{
+
+// Check if the given window is in the capture stack.
+bool IsInCaptureStack(wxWindowBase* win);
+
+} // wxMouseCapture
+
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
@@ -448,7 +456,9 @@ bool wxWindowBase::ToggleWindowStyle(int flag)
 // common clean up
 wxWindowBase::~wxWindowBase()
 {
-    wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") );
+    wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this),
+                    "Destroying window before releasing mouse capture: this "
+                    "will result in a crash later." );
 
     // FIXME if these 2 cases result from programming errors in the user code
     //       we should probably assert here instead of silently fixing them
@@ -620,20 +630,13 @@ void wxWindowBase::DoCentre(int dir)
 // fits the window around the children
 void wxWindowBase::Fit()
 {
-    if ( !GetChildren().empty() )
-    {
-        SetSize(GetBestSize());
-    }
-    //else: do nothing if we have no children
+    SetSize(GetBestSize());
 }
 
 // fits virtual size (ie. scrolled area etc.) around children
 void wxWindowBase::FitInside()
 {
-    if ( GetChildren().GetCount() > 0 )
-    {
-        SetVirtualSize( GetBestVirtualSize() );
-    }
+    SetVirtualSize( GetBestVirtualSize() );
 }
 
 // On Mac, scrollbars are explicitly children.
@@ -649,7 +652,7 @@ static bool wxHasRealChildren(const wxWindowBase* win)
         wxWindow *win = node->GetData();
         if ( !win->IsTopLevel() && win->IsShown()
 #if wxUSE_SCROLLBAR
-            && !win->IsKindOf(CLASSINFO(wxScrollBar))
+            && !wxDynamicCast(win, wxScrollBar)
 #endif
             )
             realChildCount ++;
@@ -906,26 +909,53 @@ wxSize wxWindowBase::GetBestSize() const
     // it to be used
     wxSize size = DoGetBestClientSize();
     if ( size != wxDefaultSize )
-    {
         size += DoGetBorderSize();
+    else
+        size = DoGetBestSize();
 
-        CacheBestSize(size);
-        return size;
-    }
+    // Ensure that the best size is at least as large as min size.
+    size.IncTo(GetMinSize());
 
-    return DoGetBestSize();
+    // And not larger than max size.
+    size.DecToIfSpecified(GetMaxSize());
+
+    // Finally cache result and return.
+    CacheBestSize(size);
+    return size;
+}
+
+int wxWindowBase::GetBestHeight(int width) const
+{
+    const int height = DoGetBestClientHeight(width);
+
+    return height == wxDefaultCoord
+            ? GetBestSize().y
+            : height + DoGetBorderSize().y;
+}
+
+int wxWindowBase::GetBestWidth(int height) const
+{
+    const int width = DoGetBestClientWidth(height);
+
+    return width == wxDefaultCoord
+            ? GetBestSize().x
+            : width + DoGetBorderSize().x;
 }
 
 void wxWindowBase::SetMinSize(const wxSize& minSize)
 {
     m_minWidth = minSize.x;
     m_minHeight = minSize.y;
+
+    InvalidateBestSize();
 }
 
 void wxWindowBase::SetMaxSize(const wxSize& maxSize)
 {
     m_maxWidth = maxSize.x;
     m_maxHeight = maxSize.y;
+
+    InvalidateBestSize();
 }
 
 void wxWindowBase::SetInitialSize(const wxSize& size)
@@ -1083,6 +1113,12 @@ void wxWindowBase::SendSizeEventToParent(int flags)
         parent->SendSizeEvent(flags);
 }
 
+bool wxWindowBase::CanScroll(int orient) const
+{
+    return (m_windowStyle &
+            (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
+}
+
 bool wxWindowBase::HasScrollbar(int orient) const
 {
     // if scrolling in the given direction is disabled, we can't have the
@@ -1129,8 +1165,6 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
     DoEnable(enabled);
 #endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
 
-    OnEnabled(enabled);
-
     // Disabling a top level window is typically done when showing a modal
     // dialog and we don't need to disable its children in this case, they will
     // be logically disabled anyhow (i.e. their IsEnabled() will return false)
@@ -1146,9 +1180,7 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
     // they would still show as enabled even though they wouldn't actually
     // accept any input (at least under MSW where children don't accept input
     // if any of the windows in their parent chain is enabled).
-    //
-    // Notice that we must do this even for wxHAS_NATIVE_ENABLED_MANAGEMENT
-    // platforms as we still need to call the children OnEnabled() recursively.
+#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
     for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )
@@ -1157,6 +1189,7 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
         if ( !child->IsTopLevel() && child->IsThisEnabled() )
             child->NotifyWindowOnEnableChange(enabled);
     }
+#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
 }
 
 bool wxWindowBase::Enable(bool enable)
@@ -1242,9 +1275,27 @@ void wxWindowBase::Thaw()
 }
 
 // ----------------------------------------------------------------------------
-// reparenting the window
+// Dealing with parents and children.
 // ----------------------------------------------------------------------------
 
+bool wxWindowBase::IsDescendant(wxWindowBase* win) const
+{
+    // Iterate until we find this window in the parent chain or exhaust it.
+    while ( win )
+    {
+        if ( win == this )
+            return true;
+
+        // Stop iterating on reaching the top level window boundary.
+        if ( win->IsTopLevel() )
+            break;
+
+        win = win->GetParent();
+    }
+
+    return false;
+}
+
 void wxWindowBase::AddChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
@@ -1279,6 +1330,20 @@ void wxWindowBase::RemoveChild(wxWindowBase *child)
     child->SetParent(NULL);
 }
 
+void wxWindowBase::SetParent(wxWindowBase *parent)
+{
+    // This assert catches typos which may result in using "this" instead of
+    // "parent" when creating the window. This doesn't happen often but when it
+    // does the results are unpleasant because the program typically just
+    // crashes when due to a stack overflow or something similar and this
+    // assert doesn't cost much (OTOH doing a more general check that the
+    // parent is not one of our children would be more expensive and probably
+    // not worth it).
+    wxASSERT_MSG( parent != this, wxS("Can't use window as its own parent") );
+
+    m_parent = (wxWindow *)parent;
+}
+
 bool wxWindowBase::Reparent(wxWindowBase *newParent)
 {
     wxWindow *oldParent = GetParent();
@@ -1402,7 +1467,11 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
         "the first handler of the wxWindow stack should have non-NULL next handler" );
 
     firstHandler->SetNextHandler(NULL);
-    secondHandler->SetPreviousHandler(NULL);
+
+    // It is harmless but useless to unset the previous handler of the window
+    // itself as it's always NULL anyhow, so don't do this.
+    if ( secondHandler != this )
+        secondHandler->SetPreviousHandler(NULL);
 
     // now firstHandler is completely unlinked; set secondHandler as the new window event handler
     SetEventHandler(secondHandler);
@@ -1771,6 +1840,12 @@ wxWindow *wxWindowBase::FindWindow(long id) const
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
+
+        // As usual, don't recurse into child dialogs, finding a button in a
+        // child dialog when looking in this window would be unexpected.
+        if ( child->IsTopLevel() )
+            continue;
+
         res = child->FindWindow( id );
     }
 
@@ -1787,6 +1862,11 @@ wxWindow *wxWindowBase::FindWindow(const wxString& name) const
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
+
+        // As in FindWindow() overload above, never recurse into child dialogs.
+        if ( child->IsTopLevel() )
+            continue;
+
         res = child->FindWindow(name);
     }
 
@@ -1935,95 +2015,168 @@ void wxWindowBase::MakeModal(bool modal)
 }
 #endif // WXWIN_COMPATIBILITY_2_8
 
+#if wxUSE_VALIDATORS
+
+namespace
+{
+
+// This class encapsulates possibly recursive iteration on window children done
+// by Validate() and TransferData{To,From}Window() and allows to avoid code
+// duplication in all three functions.
+class ValidationTraverserBase
+{
+public:
+    wxEXPLICIT ValidationTraverserBase(wxWindowBase* win)
+        : m_win(static_cast<wxWindow*>(win))
+    {
+    }
+
+    // Traverse all the direct children calling OnDo() on them and also all
+    // grandchildren if wxWS_EX_VALIDATE_RECURSIVELY is used, calling
+    // OnRecurse() for them.
+    bool DoForAllChildren()
+    {
+        const bool recurse = m_win->HasExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+
+        wxWindowList& children = m_win->GetChildren();
+        for ( wxWindowList::iterator i = children.begin();
+              i != children.end();
+              ++i )
+        {
+            wxWindow* const child = static_cast<wxWindow*>(*i);
+            wxValidator* const validator = child->GetValidator();
+            if ( validator && !OnDo(validator) )
+            {
+                return false;
+            }
+
+            // Notice that validation should never recurse into top level
+            // children, e.g. some other dialog which might happen to be
+            // currently shown.
+            if ( recurse && !child->IsTopLevel() && !OnRecurse(child) )
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    // Give it a virtual dtor just to suppress gcc warnings about a class with
+    // virtual methods but non-virtual dtor -- even if this is completely safe
+    // here as we never use the objects of this class polymorphically.
+    virtual ~ValidationTraverserBase() { }
+
+protected:
+    // Called for each child, validator is guaranteed to be non-NULL.
+    virtual bool OnDo(wxValidator* validator) = 0;
+
+    // Called for each child if we need to recurse into its children.
+    virtual bool OnRecurse(wxWindow* child) = 0;
+
+
+    // The window whose children we're traversing.
+    wxWindow* const m_win;
+
+    wxDECLARE_NO_COPY_CLASS(ValidationTraverserBase);
+};
+
+} // anonymous namespace
+
+#endif // wxUSE_VALIDATORS
+
 bool wxWindowBase::Validate()
 {
 #if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    class ValidateTraverser : public ValidationTraverserBase
     {
-        wxWindowBase *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->Validate((wxWindow *)this) )
+    public:
+        wxEXPLICIT ValidateTraverser(wxWindowBase* win)
+            : ValidationTraverserBase(win)
         {
-            return false;
         }
 
-        if ( recurse && !child->Validate() )
+        virtual bool OnDo(wxValidator* validator)
         {
-            return false;
+            return validator->Validate(m_win);
         }
-    }
-#endif // wxUSE_VALIDATORS
 
+        virtual bool OnRecurse(wxWindow* child)
+        {
+            return child->Validate();
+        }
+    };
+
+    return ValidateTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
     return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 }
 
 bool wxWindowBase::TransferDataToWindow()
 {
 #if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    class DataToWindowTraverser : public ValidationTraverserBase
     {
-        wxWindowBase *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->TransferToWindow() )
+    public:
+        wxEXPLICIT DataToWindowTraverser(wxWindowBase* win)
+            : ValidationTraverserBase(win)
         {
-            wxLogWarning(_("Could not transfer data to window"));
+        }
+
+        virtual bool OnDo(wxValidator* validator)
+        {
+            if ( !validator->TransferToWindow() )
+            {
+                wxLogWarning(_("Could not transfer data to window"));
 #if wxUSE_LOG
-            wxLog::FlushActive();
+                wxLog::FlushActive();
 #endif // wxUSE_LOG
 
-            return false;
-        }
-
-        if ( recurse )
-        {
-            if ( !child->TransferDataToWindow() )
-            {
-                // warning already given
                 return false;
             }
-        }
-    }
-#endif // wxUSE_VALIDATORS
 
+            return true;
+        }
+
+        virtual bool OnRecurse(wxWindow* child)
+        {
+            return child->TransferDataToWindow();
+        }
+    };
+
+    return DataToWindowTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
     return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 }
 
 bool wxWindowBase::TransferDataFromWindow()
 {
 #if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    class DataFromWindowTraverser : public ValidationTraverserBase
     {
-        wxWindow *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->TransferFromWindow() )
+    public:
+        DataFromWindowTraverser(wxWindowBase* win)
+            : ValidationTraverserBase(win)
         {
-            // nop warning here because the application is supposed to give
-            // one itself - we don't know here what might have gone wrongly
-
-            return false;
         }
 
-        if ( recurse )
+        virtual bool OnDo(wxValidator* validator)
         {
-            if ( !child->TransferDataFromWindow() )
-            {
-                // warning already given
-                return false;
-            }
+            return validator->TransferFromWindow();
         }
-    }
-#endif // wxUSE_VALIDATORS
 
+        virtual bool OnRecurse(wxWindow* child)
+        {
+            return child->TransferDataFromWindow();
+        }
+    };
+
+    return DataFromWindowTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
     return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 }
 
 void wxWindowBase::InitDialog()
@@ -2207,7 +2360,7 @@ void wxWindowBase::UnsetConstraints(wxLayoutConstraints *c)
 {
     if ( c )
     {
-        if ( c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
+        if ( c->left.GetOtherWindow() && (c->left.GetOtherWindow() != this) )
             c->left.GetOtherWindow()->RemoveConstraintReference(this);
         if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
             c->top.GetOtherWindow()->RemoveConstraintReference(this);
@@ -2484,6 +2637,8 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr && constr->AreSatisfied() )
     {
+        ChildrenRepositioningGuard repositionGuard(this);
+
         int x = constr->left.GetValue();
         int y = constr->top.GetValue();
         int w = constr->width.GetValue();
@@ -2707,6 +2862,8 @@ wxSize wxWindowBase::GetDlgUnitBase() const
 {
     const wxWindowBase * const parent = wxGetTopLevelParent((wxWindow*)this);
 
+    wxCHECK_MSG( parent, wxDefaultSize, wxS("Must have TLW parent") );
+
     if ( !parent->m_font.IsOk() )
     {
         // Default GUI font is used. This is the most common case, so
@@ -2830,7 +2987,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
 {
     gs_popupMenuSelection = wxID_NONE;
 
-    Connect(wxEVT_COMMAND_MENU_SELECTED,
+    Connect(wxEVT_MENU,
             wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
             NULL,
             this);
@@ -2853,7 +3010,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
                wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
                NULL,
                this);
-    Disconnect(wxEVT_COMMAND_MENU_SELECTED,
+    Disconnect(wxEVT_MENU,
                wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
                NULL,
                this);
@@ -3073,72 +3230,106 @@ wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const
 // mouse capture
 // ----------------------------------------------------------------------------
 
-struct WXDLLEXPORT wxWindowNext
+// Private data used for mouse capture tracking.
+namespace wxMouseCapture
 {
-    wxWindow *win;
-    wxWindowNext *next;
-} *wxWindowBase::ms_winCaptureNext = NULL;
-wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
-bool wxWindowBase::ms_winCaptureChanging = false;
+
+// Stack of the windows which previously had the capture, the top most element
+// is the window that has the mouse capture now.
+//
+// NB: We use wxVector and not wxStack to be able to examine all of the stack
+//     elements for debug checks, but only the stack operations should be
+//     performed with this vector.
+wxVector<wxWindow*> stack;
+
+// Flag preventing reentrancy in {Capture,Release}Mouse().
+wxRecursionGuardFlag changing;
+
+bool IsInCaptureStack(wxWindowBase* win)
+{
+    for ( wxVector<wxWindow*>::const_iterator it = stack.begin();
+          it != stack.end();
+          ++it )
+    {
+        if ( *it == win )
+            return true;
+    }
+
+    return false;
+}
+
+} // wxMouseCapture
 
 void wxWindowBase::CaptureMouse()
 {
     wxLogTrace(wxT("mousecapture"), wxT("CaptureMouse(%p)"), static_cast<void*>(this));
 
-    wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive CaptureMouse call?") );
+    wxRecursionGuard guard(wxMouseCapture::changing);
+    wxASSERT_MSG( !guard.IsInside(), wxT("recursive CaptureMouse call?") );
 
-    ms_winCaptureChanging = true;
+    wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this),
+                    "Recapturing the mouse in the same window?" );
 
     wxWindow *winOld = GetCapture();
     if ( winOld )
-    {
         ((wxWindowBase*) winOld)->DoReleaseMouse();
 
-        // save it on stack
-        wxWindowNext *item = new wxWindowNext;
-        item->win = winOld;
-        item->next = ms_winCaptureNext;
-        ms_winCaptureNext = item;
-    }
-    //else: no mouse capture to save
-
     DoCaptureMouse();
-    ms_winCaptureCurrent = (wxWindow*)this;
 
-    ms_winCaptureChanging = false;
+    wxMouseCapture::stack.push_back(static_cast<wxWindow*>(this));
 }
 
 void wxWindowBase::ReleaseMouse()
 {
     wxLogTrace(wxT("mousecapture"), wxT("ReleaseMouse(%p)"), static_cast<void*>(this));
 
-    wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive ReleaseMouse call?") );
+    wxRecursionGuard guard(wxMouseCapture::changing);
+    wxASSERT_MSG( !guard.IsInside(), wxT("recursive ReleaseMouse call?") );
 
-    wxASSERT_MSG( GetCapture() == this,
-                  "attempt to release mouse, but this window hasn't captured it" );
-    wxASSERT_MSG( ms_winCaptureCurrent == this,
-                  "attempt to release mouse, but this window hasn't captured it" );
-
-    ms_winCaptureChanging = true;
+#if wxDEBUG_LEVEL
+    wxWindow* const winCapture = GetCapture();
+    if ( !winCapture )
+    {
+        wxFAIL_MSG
+        (
+          wxString::Format
+          (
+            "Releasing mouse in %p(%s) but it is not captured",
+            this, GetClassInfo()->GetClassName()
+          )
+        );
+    }
+    else if ( winCapture != this )
+    {
+        wxFAIL_MSG
+        (
+          wxString::Format
+          (
+            "Releasing mouse in %p(%s) but it is captured by %p(%s)",
+            this, GetClassInfo()->GetClassName(),
+            winCapture, winCapture->GetClassInfo()->GetClassName()
+          )
+        );
+    }
+#endif // wxDEBUG_LEVEL
 
     DoReleaseMouse();
-    ms_winCaptureCurrent = NULL;
 
-    if ( ms_winCaptureNext )
+    wxCHECK_RET( !wxMouseCapture::stack.empty(),
+                    "Releasing mouse capture but capture stack empty?" );
+    wxCHECK_RET( wxMouseCapture::stack.back() == this,
+                    "Window releasing mouse capture not top of capture stack?" );
+
+    wxMouseCapture::stack.pop_back();
+
+    // Restore the capture to the previous window, if any.
+    if ( !wxMouseCapture::stack.empty() )
     {
-        ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
-        ms_winCaptureCurrent = ms_winCaptureNext->win;
-
-        wxWindowNext *item = ms_winCaptureNext;
-        ms_winCaptureNext = item->next;
-        delete item;
+        ((wxWindowBase*)wxMouseCapture::stack.back())->DoCaptureMouse();
     }
-    //else: stack is empty, no previous capture
-
-    ms_winCaptureChanging = false;
 
     wxLogTrace(wxT("mousecapture"),
-        (const wxChar *) wxT("After ReleaseMouse() mouse is captured by %p"),
+        wxT("After ReleaseMouse() mouse is captured by %p"),
         static_cast<void*>(GetCapture()));
 }
 
@@ -3161,26 +3352,17 @@ void wxWindowBase::NotifyCaptureLost()
 {
     // don't do anything if capture lost was expected, i.e. resulted from
     // a wx call to ReleaseMouse or CaptureMouse:
-    if ( ms_winCaptureChanging )
+    wxRecursionGuard guard(wxMouseCapture::changing);
+    if ( guard.IsInside() )
         return;
 
     // if the capture was lost unexpectedly, notify every window that has
     // capture (on stack or current) about it and clear the stack:
-
-    if ( ms_winCaptureCurrent )
+    while ( !wxMouseCapture::stack.empty() )
     {
-        DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
-        ms_winCaptureCurrent = NULL;
-    }
+        DoNotifyWindowAboutCaptureLost(wxMouseCapture::stack.back());
 
-    while ( ms_winCaptureNext )
-    {
-        wxWindowNext *item = ms_winCaptureNext;
-        ms_winCaptureNext = item->next;
-
-        DoNotifyWindowAboutCaptureLost(item->win);
-
-        delete item;
+        wxMouseCapture::stack.pop_back();
     }
 }
 
@@ -3240,7 +3422,7 @@ bool wxWindowBase::TryAfter(wxEvent& event)
             wxWindow *parent = GetParent();
             if ( parent && !parent->IsBeingDeleted() )
             {
-                wxPropagateOnce propagateOnce(event);
+                wxPropagateOnce propagateOnce(event, this);
 
                 return parent->GetEventHandler()->ProcessEvent(event);
             }
@@ -3470,7 +3652,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
     if (win)
     {
         rect = win->GetRect();
-        if (win->GetParent() && !win->IsKindOf(CLASSINFO(wxTopLevelWindow)))
+        if (win->GetParent() && !wxDynamicCast(win, wxTopLevelWindow))
             rect.SetPosition(win->GetParent()->ClientToScreen(rect.GetPosition()));
         return wxACC_OK;
     }
@@ -3589,7 +3771,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
     // accessible classes, one for each kind of wxWidgets
     // control or window.
 #if wxUSE_BUTTON
-    if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
+    if (wxDynamicCast(GetWindow(), wxButton))
         title = ((wxButton*) GetWindow())->GetLabel();
     else
 #endif
@@ -3748,14 +3930,14 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
 
-    if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+    if (wxDynamicCast(GetWindow(), wxControl))
         return wxACC_NOT_IMPLEMENTED;
 #if wxUSE_STATUSBAR
-    if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+    if (wxDynamicCast(GetWindow(), wxStatusBar))
         return wxACC_NOT_IMPLEMENTED;
 #endif
 #if wxUSE_TOOLBAR
-    if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+    if (wxDynamicCast(GetWindow(), wxToolBar))
         return wxACC_NOT_IMPLEMENTED;
 #endif
 
@@ -3780,15 +3962,15 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
 
-    if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+    if (wxDynamicCast(GetWindow(), wxControl))
         return wxACC_NOT_IMPLEMENTED;
 
 #if wxUSE_STATUSBAR
-    if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+    if (wxDynamicCast(GetWindow(), wxStatusBar))
         return wxACC_NOT_IMPLEMENTED;
 #endif
 #if wxUSE_TOOLBAR
-    if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+    if (wxDynamicCast(GetWindow(), wxToolBar))
         return wxACC_NOT_IMPLEMENTED;
 #endif
 
diff --git a/Externals/wxWidgets3/src/common/windowid.cpp b/Externals/wxWidgets3/src/common/windowid.cpp
index e4105c0eaf..d0ee64ff54 100644
--- a/Externals/wxWidgets3/src/common/windowid.cpp
+++ b/Externals/wxWidgets3/src/common/windowid.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxWindowID class - a class for managing window ids
 // Author:      Brian Vanderburg II
 // Created:     2007-09-21
-// RCS-ID:      $Id: windowid.cpp 69682 2011-11-05 11:24:04Z VZ $
 // Copyright:   (c) 2007 Brian Vanderburg II
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/wrapsizer.cpp b/Externals/wxWidgets3/src/common/wrapsizer.cpp
index 39d6a0f0f3..e1b112bed5 100644
--- a/Externals/wxWidgets3/src/common/wrapsizer.cpp
+++ b/Externals/wxWidgets3/src/common/wrapsizer.cpp
@@ -3,7 +3,6 @@
 // Purpose:     provides wxWrapSizer class for layout
 // Author:      Arne Steinarson
 // Created:     2008-05-08
-// RCS-ID:      $Id: wrapsizer.cpp 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -177,15 +176,6 @@ wxSize wxWrapSizer::CalcMin()
     //     layout, trying to maintain the possibility to re-arrange lines by
     //     sizing
 
-    wxSize szBoundary;    // Keep track of boundary so we don't overflow
-    if ( m_availSize > 0 )
-    {
-        if ( m_dirInform == m_orient )
-            szBoundary = SizeFromMajorMinor(m_availSize, m_availableOtherDir);
-        else
-            szBoundary = SizeFromMajorMinor(m_availableOtherDir, m_availSize);
-    }
-
     if ( !m_lastUsed )
     {
         // Case 1 above: InformFirstDirection() has just been called
@@ -195,21 +185,22 @@ wxSize wxWrapSizer::CalcMin()
         // a wrap sizer, depending on whether the first reported size component
         // is the opposite as our own orientation (the simpler case) or the same
         // one (more complicated).
-        wxSize szMinPrev = m_minSize;
         if ( m_dirInform == m_orient )
             CalcMinFromMajor(m_availSize);
         else
             CalcMinFromMinor(m_availSize);
-
-        // If overflowing given boundary, go back to previous min size
-        if ( m_minSize.x > szBoundary.x || m_minSize.y>szBoundary.y )
-            m_minSize = szMinPrev;
     }
     else // Case 2 above: not immediately after InformFirstDirection()
     {
         if ( m_availSize > 0 )
         {
-            CalcMinFittingSize(szBoundary);
+            wxSize szAvail;    // Keep track of boundary so we don't overflow
+            if ( m_dirInform == m_orient )
+                szAvail = SizeFromMajorMinor(m_availSize, m_availableOtherDir);
+            else
+                szAvail = SizeFromMajorMinor(m_availableOtherDir, m_availSize);
+
+            CalcMinFittingSize(szAvail);
         }
         else // Initial calculation, before we have size available to us
         {
diff --git a/Externals/wxWidgets3/src/common/wxcrt.cpp b/Externals/wxWidgets3/src/common/wxcrt.cpp
index 3bf1855968..819700c2bf 100644
--- a/Externals/wxWidgets3/src/common/wxcrt.cpp
+++ b/Externals/wxWidgets3/src/common/wxcrt.cpp
@@ -4,7 +4,6 @@
 // Author:      Ove Kaven
 // Modified by: Ron Lee, Francesco Montorsi
 // Created:     09/04/99
-// RCS-ID:      $Id: wxcrt.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) wxWidgets copyright
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,11 +66,6 @@
     #define wxSET_ERRNO(value) errno = value
 #endif
 
-#if defined(__MWERKS__) && __MSL__ >= 0x6000
-namespace std {}
-using namespace std ;
-#endif
-
 #if defined(__DARWIN__)
     #include "wx/osx/core/cfref.h"
     #include <CoreFoundation/CFLocale.h>
@@ -95,20 +89,20 @@ WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 #ifdef HAVE_WCSRTOMBS
     return mbsrtowcs(buf, &psz, n, &mbstate);
 #else
-    return wxMbstowcs(buf, psz, n);
+    return mbstowcs(buf, psz, n);
 #endif
   }
 
-  // note that we rely on common (and required by Unix98 but unfortunately not
+  // Note that we rely on common (and required by Unix98 but unfortunately not
   // C99) extension which allows to call mbs(r)towcs() with NULL output pointer
   // to just get the size of the needed buffer -- this is needed as otherwise
-  // we have no idea about how much space we need and if the CRT doesn't
-  // support it (the only currently known example being Metrowerks, see
-  // wx/crt.h) we don't use its mbstowcs() at all
+  // we have no idea about how much space we need. Currently all supported
+  // compilers do provide it and if they don't, HAVE_WCSRTOMBS shouldn't be
+  // defined at all.
 #ifdef HAVE_WCSRTOMBS
   return mbsrtowcs(NULL, &psz, 0, &mbstate);
 #else
-  return wxMbstowcs(NULL, psz, 0);
+  return mbstowcs(NULL, psz, 0);
 #endif
 }
 
@@ -128,14 +122,14 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 #ifdef HAVE_WCSRTOMBS
     return wcsrtombs(buf, &pwz, n, &mbstate);
 #else
-    return wxWcstombs(buf, pwz, n);
+    return wcstombs(buf, pwz, n);
 #endif
   }
 
 #ifdef HAVE_WCSRTOMBS
   return wcsrtombs(NULL, &pwz, 0, &mbstate);
 #else
-  return wxWcstombs(NULL, pwz, 0);
+  return wcstombs(NULL, pwz, 0);
 #endif
 }
 
@@ -589,11 +583,11 @@ int ConvertStringToBuf(const wxString& s, char *out, size_t outsize)
     const size_t len = buf.length();
     if ( outsize > len )
     {
-        memcpy(out, buf, (len+1) * sizeof(char));
+        memcpy(out, buf, len+1);
     }
     else // not enough space
     {
-        memcpy(out, buf, (outsize-1) * sizeof(char));
+        memcpy(out, buf, outsize-1);
         out[outsize-1] = '\0';
     }
 
@@ -743,54 +737,6 @@ int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argpt
 // ctype.h stuff (currently unused)
 // ----------------------------------------------------------------------------
 
-#ifdef wxNEED_WX_MBSTOWCS
-
-WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
-{
-    if (!out)
-    {
-        size_t outsize = 0;
-        while(*in++)
-            outsize++;
-        return outsize;
-    }
-
-    const char* origin = in;
-
-    while (outlen-- && *in)
-    {
-        *out++ = (wchar_t) *in++;
-    }
-
-    *out = '\0';
-
-    return in - origin;
-}
-
-WXDLLIMPEXP_BASE size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
-{
-    if (!out)
-    {
-        size_t outsize = 0;
-        while(*in++)
-            outsize++;
-        return outsize;
-    }
-
-    const wchar_t* origin = in;
-
-    while (outlen-- && *in)
-    {
-        *out++ = (char) *in++;
-    }
-
-    *out = '\0';
-
-    return in - origin;
-}
-
-#endif // wxNEED_WX_MBSTOWCS
-
 #ifndef wxCRT_StrdupA
 WXDLLIMPEXP_BASE char *wxCRT_StrdupA(const char *s)
 {
@@ -839,7 +785,8 @@ wxChar32* wxStrdup(const wxChar32* s)
 {
   size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32);
   wxChar32 *ret = (wxChar32*) malloc(size);
-  memcpy(ret, s, size);
+  if ( ret )
+      memcpy(ret, s, size);
   return ret;
 }
 #endif
@@ -980,23 +927,35 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
         }
     }
 
-    // Starts with 0x?
+    // Starts with octal or hexadecimal prefix?
     if ( i != end && *i == wxT('0') )
     {
         ++i;
         if ( i != end )
         {
-            if ( *i == wxT('x') && (base == 16 || base == 0) )
+            if ( (*i == wxT('x')) || (*i == wxT('X')) )
             {
-                base = 16;
-                ++i;
+                // Hexadecimal prefix: use base 16 if auto-detecting.
+                if ( base == 0 )
+                    base = 16;
+
+                // If we do use base 16, just skip "x" as well.
+                if ( base == 16 )
+                {
+                    ++i;
+                }
+                else // Not using base 16
+                {
+                    // Then it's an error.
+                    if ( endptr )
+                        *endptr = (T*) nptr;
+                    wxSET_ERRNO(EINVAL);
+                    return sum;
+                }
             }
-            else
+            else if ( base == 0 )
             {
-                if ( endptr )
-                    *endptr = (T*) nptr;
-                wxSET_ERRNO(EINVAL);
-                return sum;
+                base = 8;
             }
         }
         else
diff --git a/Externals/wxWidgets3/src/common/wxprintf.cpp b/Externals/wxWidgets3/src/common/wxprintf.cpp
index f3f92cf656..69cb20cbae 100644
--- a/Externals/wxWidgets3/src/common/wxprintf.cpp
+++ b/Externals/wxWidgets3/src/common/wxprintf.cpp
@@ -4,7 +4,6 @@
 // Author:      Ove Kaven
 // Modified by: Ron Lee, Francesco Montorsi
 // Created:     09/04/99
-// RCS-ID:      $Id: wxprintf.cpp 60120 2009-04-12 23:37:28Z VZ $
 // Copyright:   (c) wxWidgets copyright
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/xlocale.cpp b/Externals/wxWidgets3/src/common/xlocale.cpp
index cbca33cf31..26ac4df2a3 100644
--- a/Externals/wxWidgets3/src/common/xlocale.cpp
+++ b/Externals/wxWidgets3/src/common/xlocale.cpp
@@ -3,7 +3,6 @@
 // Purpose:     xlocale wrappers/impl to provide some xlocale wrappers
 // Author:      Brian Vanderburg II, Vadim Zeitlin
 // Created:     2008-01-07
-// RCS-ID:      $Id: xlocale.cpp 67406 2011-04-06 14:37:32Z VZ $
 // Copyright:   (c) 2008 Brian Vanderburg II
 //                  2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -77,9 +76,10 @@ wxXLocale& wxXLocale::GetCLocale()
 {
     if ( !gs_cLocale )
     {
-        // NOTE: bcc551 has trouble doing static_cast with incomplete
-        //       type definition. reinterpret_cast used as workaround
-        gs_cLocale = new wxXLocale( reinterpret_cast<wxXLocaleCTag *>(NULL) );
+        // Notice that we need a separate variable because clang 3.1 refuses to
+        // cast nullptr (which is how NULL is defined in it) to anything.
+        static wxXLocaleCTag* const tag = NULL;
+        gs_cLocale = new wxXLocale(tag);
     }
 
     return *gs_cLocale;
diff --git a/Externals/wxWidgets3/src/common/xpmdecod.cpp b/Externals/wxWidgets3/src/common/xpmdecod.cpp
index e86421240a..f76418958c 100644
--- a/Externals/wxWidgets3/src/common/xpmdecod.cpp
+++ b/Externals/wxWidgets3/src/common/xpmdecod.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/xpmdecod.cpp
 // Purpose:     wxXPMDecoder
 // Author:      John Cristy, Vaclav Slavik
-// RCS-ID:      $Id: xpmdecod.cpp 62764 2009-12-02 17:28:45Z PC $
 // Copyright:   (c) John Cristy, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/xti.cpp b/Externals/wxWidgets3/src/common/xti.cpp
index f69652644c..e7dc6d1ee0 100644
--- a/Externals/wxWidgets3/src/common/xti.cpp
+++ b/Externals/wxWidgets3/src/common/xti.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: xti.cpp 70306 2012-01-09 18:48:39Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
@@ -393,7 +392,7 @@ void wxTypeInfo::Unregister()
         ms_typeTable->erase(m_name);
 }
 
-// removing header dependancy on string tokenizer
+// removing header dependency on string tokenizer
 
 void wxSetStringToArray( const wxString &s, wxArrayString &array )
 {
diff --git a/Externals/wxWidgets3/src/common/xtistrm.cpp b/Externals/wxWidgets3/src/common/xtistrm.cpp
index 16881d3b7d..d96db65eb3 100644
--- a/Externals/wxWidgets3/src/common/xtistrm.cpp
+++ b/Externals/wxWidgets3/src/common/xtistrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: xtistrm.cpp 70306 2012-01-09 18:48:39Z VZ $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -478,7 +477,7 @@ struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
             return NULL;
         if ( m_objects.find(objectID) == m_objects.end() )
         {
-            wxLogError( _("Passing an unkown object to GetObject") );
+            wxLogError( _("Passing an unknown object to GetObject") );
             return NULL;
         }
 
diff --git a/Externals/wxWidgets3/src/common/xtixml.cpp b/Externals/wxWidgets3/src/common/xtixml.cpp
index 892d282e74..4a37afe6b6 100644
--- a/Externals/wxWidgets3/src/common/xtixml.cpp
+++ b/Externals/wxWidgets3/src/common/xtixml.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id: xtixml.cpp 68949 2011-08-29 12:33:40Z VZ $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/zipstrm.cpp b/Externals/wxWidgets3/src/common/zipstrm.cpp
index 2e36c4ac1f..07b526d15f 100644
--- a/Externals/wxWidgets3/src/common/zipstrm.cpp
+++ b/Externals/wxWidgets3/src/common/zipstrm.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/zipstrm.cpp
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: zipstrm.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/common/zstream.cpp b/Externals/wxWidgets3/src/common/zstream.cpp
index e478441bfa..e10e3d774e 100644
--- a/Externals/wxWidgets3/src/common/zstream.cpp
+++ b/Externals/wxWidgets3/src/common/zstream.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Created:     11/07/98
-// RCS-ID:      $Id: zstream.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -47,10 +46,18 @@ enum {
 
 wxVersionInfo wxGetZlibVersionInfo()
 {
-    return wxVersionInfo("zlib",
-                         ZLIB_VERNUM >> 12,
-                         (ZLIB_VERNUM >> 8) & 0x0F,
-                         (ZLIB_VERNUM & 0xFF) / 0x10);
+    int major,
+        minor,
+        build;
+
+    if ( sscanf(zlibVersion(), "%d.%d.%d", &major, &minor, &build) != 3 )
+    {
+        major =
+        minor =
+        build = 0;
+    }
+
+    return wxVersionInfo("zlib", major, minor, build);
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/cwcopysetup.bat b/Externals/wxWidgets3/src/cwcopysetup.bat
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/Externals/wxWidgets3/src/cwdcopysetup.bat b/Externals/wxWidgets3/src/cwdcopysetup.bat
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp b/Externals/wxWidgets3/src/generic/aboutdlgg.cpp
index b5e507bfd0..9cb175334d 100644
--- a/Externals/wxWidgets3/src/generic/aboutdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/aboutdlgg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements wxGenericAboutBox() function
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// RCS-ID:      $Id: aboutdlgg.cpp 70671 2012-02-22 17:35:21Z JS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -223,7 +222,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren
 #if !wxUSE_MODAL_ABOUT_DIALOG
     Connect(wxEVT_CLOSE_WINDOW,
             wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow));
-    Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(wxID_OK, wxEVT_BUTTON,
             wxCommandEventHandler(wxGenericAboutDialog::OnOK));
 #endif // !wxUSE_MODAL_ABOUT_DIALOG
 
@@ -278,16 +277,24 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
 
 void wxGenericAboutDialog::OnCloseWindow(wxCloseEvent& event)
 {
-    Destroy();
+    // safeguards in case the window is still shown using ShowModal
+    if ( !IsModal() )
+        Destroy();
 
     event.Skip();
 }
 
-void wxGenericAboutDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+void wxGenericAboutDialog::OnOK(wxCommandEvent& event)
 {
-    // By default a modeless dialog would be just hidden, destroy this one
-    // instead.
-    Destroy();
+    // safeguards in case the window is still shown using ShowModal
+    if ( !IsModal() )
+    {
+        // By default a modeless dialog would be just hidden, destroy this one
+        // instead.
+        Destroy();
+    }
+    else
+        event.Skip();
 }
 
 #endif // !wxUSE_MODAL_ABOUT_DIALOG
@@ -309,7 +316,8 @@ void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 
 // currently wxAboutBox is implemented natively only under these platforms, for
 // the others we provide a generic fallback here
-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK26__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && \
+        (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 {
diff --git a/Externals/wxWidgets3/src/generic/accel.cpp b/Externals/wxWidgets3/src/generic/accel.cpp
index 832c357870..e540ec9c03 100644
--- a/Externals/wxWidgets3/src/generic/accel.cpp
+++ b/Externals/wxWidgets3/src/generic/accel.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxAcceleratorTable class
 // Author:      Robert Roebling
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove
-// Id:          $Id: accel.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/animateg.cpp b/Externals/wxWidgets3/src/generic/animateg.cpp
index af4d2416b8..f267c21cdb 100644
--- a/Externals/wxWidgets3/src/generic/animateg.cpp
+++ b/Externals/wxWidgets3/src/generic/animateg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by: Francesco Montorsi
 // Created:     13/8/99
-// RCS-ID:      $Id: animateg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/bannerwindow.cpp b/Externals/wxWidgets3/src/generic/bannerwindow.cpp
index 450b0a90a2..f5452cd886 100644
--- a/Externals/wxWidgets3/src/generic/bannerwindow.cpp
+++ b/Externals/wxWidgets3/src/generic/bannerwindow.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBannerWindow class implementation
 // Author:      Vadim Zeitlin
 // Created:     2011-08-16
-// RCS-ID:      $Id: bannerwindow.cpp 69859 2011-11-28 18:58:52Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/bmpcboxg.cpp b/Externals/wxWidgets3/src/generic/bmpcboxg.cpp
index d83049a1b7..9a948eed8c 100644
--- a/Externals/wxWidgets3/src/generic/bmpcboxg.cpp
+++ b/Externals/wxWidgets3/src/generic/bmpcboxg.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Aug-31-2006
-// RCS-ID:      $Id: bmpcboxg.cpp 66387 2010-12-16 18:08:16Z JMS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/busyinfo.cpp b/Externals/wxWidgets3/src/generic/busyinfo.cpp
index 27dd988897..003853d86a 100644
--- a/Externals/wxWidgets3/src/generic/busyinfo.cpp
+++ b/Externals/wxWidgets3/src/generic/busyinfo.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Information window when app is busy
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id: busyinfo.cpp 59401 2009-03-07 12:11:17Z RR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Externals/wxWidgets3/src/generic/buttonbar.cpp b/Externals/wxWidgets3/src/generic/buttonbar.cpp
index 65b7279583..a2529b0091 100644
--- a/Externals/wxWidgets3/src/generic/buttonbar.cpp
+++ b/Externals/wxWidgets3/src/generic/buttonbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech
 // Modified by:
 // Created:     2006-04-13
-// Id:          $Id: buttonbar.cpp 70450 2012-01-23 14:42:53Z VZ $
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
 //              SciTech Software, Inc.
 // Licence:     wxWindows licence
@@ -550,7 +549,7 @@ void wxButtonToolBar::OnLeftUp(wxMouseEvent& event)
         wxButtonToolBarTool* tool = (wxButtonToolBarTool*) FindToolForPosition(event.GetX(), event.GetY());
         if (tool && tool->GetButton() && (event.GetY() > (tool->m_y + tool->GetButton()->GetSize().y)))
         {
-            wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, tool->GetId());
+            wxCommandEvent event(wxEVT_BUTTON, tool->GetId());
             event.SetEventObject(tool->GetButton());
             if (!GetEventHandler()->ProcessEvent(event))
                 event.Skip();
diff --git a/Externals/wxWidgets3/src/generic/calctrlg.cpp b/Externals/wxWidgets3/src/generic/calctrlg.cpp
index 1317c799a8..40a549fbf4 100644
--- a/Externals/wxWidgets3/src/generic/calctrlg.cpp
+++ b/Externals/wxWidgets3/src/generic/calctrlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.12.99
-// RCS-ID:      $Id: calctrlg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -274,7 +273,7 @@ void wxGenericCalendarCtrl::CreateMonthComboBox()
                           wxDefaultCoord,
                           wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 
-    m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED,
+    m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMBOBOX,
                           wxCommandEventHandler(wxGenericCalendarCtrl::OnMonthChange),
                           NULL, this);
 }
@@ -288,11 +287,11 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl()
                                 wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                                 -4300, 10000, GetDate().GetYear());
 
-    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
+    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_TEXT,
                         wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange),
                         NULL, this);
 
-    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_SPINCTRL_UPDATED,
+    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_SPINCTRL,
                         wxSpinEventHandler(wxGenericCalendarCtrl::OnYearChange),
                         NULL, this);
 }
diff --git a/Externals/wxWidgets3/src/generic/caret.cpp b/Externals/wxWidgets3/src/generic/caret.cpp
index ac8fe6a7d4..0f5aa7ac51 100644
--- a/Externals/wxWidgets3/src/generic/caret.cpp
+++ b/Externals/wxWidgets3/src/generic/caret.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin (original code by Robert Roebling)
 // Modified by:
 // Created:     25.05.99
-// RCS-ID:      $Id: caret.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -78,6 +77,19 @@ int wxCaretBase::GetBlinkTime()
 void wxCaretBase::SetBlinkTime(int milliseconds)
 {
     gs_blinkTime = milliseconds;
+
+#ifdef _WXGTK__
+    GtkSettings *settings = gtk_settings_get_default();
+    if (millseconds == 0)
+    {
+        gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_false, NULL);
+    }
+    else
+    {
+        gtk_settings_set_long_property(settings, "gtk-cursor-blink", gtk_true, NULL);
+        gtk_settings_set_long_property(settings, "gtk-cursor-time", milliseconds, NULL);
+    }
+#endif
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/generic/choicbkg.cpp b/Externals/wxWidgets3/src/generic/choicbkg.cpp
index 702355053a..e397cc0003 100644
--- a/Externals/wxWidgets3/src/generic/choicbkg.cpp
+++ b/Externals/wxWidgets3/src/generic/choicbkg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp
 // Created:     15.09.04
-// RCS-ID:      $Id: choicbkg.cpp 65967 2010-10-31 13:33:34Z VZ $
 // Copyright:   (c) Vadim Zeitlin, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,8 +48,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
     EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
@@ -162,12 +161,12 @@ void wxChoicebook::SetImageList(wxImageList *imageList)
 
 wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+    return new wxBookCtrlEvent(wxEVT_CHOICEBOOK_PAGE_CHANGING, m_windowId);
 }
 
 void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)
 {
-    event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
+    event.SetEventType(wxEVT_CHOICEBOOK_PAGE_CHANGED);
 }
 
 // ----------------------------------------------------------------------------
@@ -209,22 +208,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
     {
         GetChoiceCtrl()->Delete(page);
 
-        if ( m_selection >= (int)page )
-        {
-            // ensure that the selection is valid
-            int sel;
-            if ( GetPageCount() == 0 )
-                sel = wxNOT_FOUND;
-            else
-                sel = m_selection ? m_selection - 1 : 0;
-
-            // if deleting current page we shouldn't try to hide it
-            m_selection = m_selection == (int)page ? wxNOT_FOUND
-                                                   : m_selection - 1;
-
-            if ( sel != wxNOT_FOUND && sel != m_selection )
-                SetSelection(sel);
-        }
+        DoSetSelectionAfterRemoval(page);
     }
 
     return win;
diff --git a/Externals/wxWidgets3/src/generic/choicdgg.cpp b/Externals/wxWidgets3/src/generic/choicdgg.cpp
index 0efc15262c..6acb6833f9 100644
--- a/Externals/wxWidgets3/src/generic/choicdgg.cpp
+++ b/Externals/wxWidgets3/src/generic/choicdgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     04/01/98
-// RCS-ID:      $Id: choicdgg.cpp 70514 2012-02-05 14:18:33Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/clrpickerg.cpp b/Externals/wxWidgets3/src/generic/clrpickerg.cpp
index a37b213f73..b76115f04a 100644
--- a/Externals/wxWidgets3/src/generic/clrpickerg.cpp
+++ b/Externals/wxWidgets3/src/generic/clrpickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: clrpickerg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -58,7 +57,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_BUTTON,
             wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
             NULL, this);
 
diff --git a/Externals/wxWidgets3/src/generic/collpaneg.cpp b/Externals/wxWidgets3/src/generic/collpaneg.cpp
index 26b7525dfd..1dc4e47e6e 100644
--- a/Externals/wxWidgets3/src/generic/collpaneg.cpp
+++ b/Externals/wxWidgets3/src/generic/collpaneg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
-// Id:          $Id: collpaneg.cpp 68366 2011-07-24 22:19:33Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +49,7 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
-wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
@@ -190,6 +189,8 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     if ( IsCollapsed() == collapse )
         return;
 
+    InvalidateBestSize();
+
     // update our state
     m_pPane->Show(!collapse);
 
diff --git a/Externals/wxWidgets3/src/generic/colour.cpp b/Externals/wxWidgets3/src/generic/colour.cpp
index 8aa60c85c9..f16c134514 100644
--- a/Externals/wxWidgets3/src/generic/colour.cpp
+++ b/Externals/wxWidgets3/src/generic/colour.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colour.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/colrdlgg.cpp b/Externals/wxWidgets3/src/generic/colrdlgg.cpp
index 4ca1da61b1..60bdf6a787 100644
--- a/Externals/wxWidgets3/src/generic/colrdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/colrdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: colrdlgg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -200,14 +199,8 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
       event.Skip();
 }
 
-void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
+void wxGenericColourDialog::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-#if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__) && !defined(__WXOSX__)
-    wxDialog::OnPaint(event);
-#else
-    wxUnusedVar(event);
-#endif
-
     wxPaintDC dc(this);
 
     PaintBasicColours(dc);
diff --git a/Externals/wxWidgets3/src/generic/combog.cpp b/Externals/wxWidgets3/src/generic/combog.cpp
index 3fbbdae486..9d14f00991 100644
--- a/Externals/wxWidgets3/src/generic/combog.cpp
+++ b/Externals/wxWidgets3/src/generic/combog.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combog.cpp 70773 2012-03-02 12:43:39Z JS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -259,7 +258,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         wxPen pen1( wxColour(133,133,133),
                     customBorder,
                     wxSOLID );
-#else        
+#else
         wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
                     customBorder,
                     wxPENSTYLE_SOLID);
diff --git a/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp b/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp
index 2088bf730e..8a8d001c2e 100644
--- a/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp
+++ b/Externals/wxWidgets3/src/generic/commandlinkbuttong.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericCommandLinkButton
 // Author:      Rickard Westerlund
 // Created:     2010-06-23
-// RCS-ID:      $Id: commandlinkbuttong.cpp 66647 2011-01-08 06:39:51Z SC $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/datavgen.cpp b/Externals/wxWidgets3/src/generic/datavgen.cpp
index b88b1c952b..996640097f 100644
--- a/Externals/wxWidgets3/src/generic/datavgen.cpp
+++ b/Externals/wxWidgets3/src/generic/datavgen.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxDataViewCtrl generic implementation
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang
-// Id:          $Id: datavgen.cpp 70717 2012-02-27 18:54:02Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -80,7 +79,22 @@ static const int EXPANDER_OFFSET = 1;
 // For the generic implementation, both the leaf nodes and the nodes are sorted for
 // fast search when needed
 static wxDataViewModel* g_model;
-static int g_column = -2;
+
+// The column is either the index of the column to be used for sorting or one
+// of the special values in this enum:
+enum
+{
+    // Sort when we're thawed later.
+    SortColumn_OnThaw = -3,
+
+    // Don't sort at all.
+    SortColumn_None = -2,
+
+    // Sort using the model default sort order.
+    SortColumn_Default = -1
+};
+
+static int g_column = SortColumn_None;
 static bool g_asending = true;
 
 // ----------------------------------------------------------------------------
@@ -105,6 +119,34 @@ wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview)
     return expander;
 }
 
+wxTextCtrl *CreateEditorTextCtrl(wxWindow *parent, const wxRect& labelRect, const wxString& value)
+{
+    wxTextCtrl* ctrl = new wxTextCtrl(parent, wxID_ANY, value,
+                                      wxPoint(labelRect.x,labelRect.y),
+                                      wxSize(labelRect.width,labelRect.height),
+                                      wxTE_PROCESS_ENTER);
+
+    // Adjust size of wxTextCtrl editor to fit text, even if it means being
+    // wider than the corresponding column (this is how Explorer behaves).
+    const int fitting = ctrl->GetSizeFromTextSize(ctrl->GetTextExtent(ctrl->GetValue())).x;
+    const int current = ctrl->GetSize().x;
+    const int maxwidth = ctrl->GetParent()->GetSize().x - ctrl->GetPosition().x;
+
+    // Adjust size so that it fits all content. Don't change anything if the
+    // allocated space is already larger than needed and don't extend wxDVC's
+    // boundaries.
+    int width = wxMin(wxMax(current, fitting), maxwidth);
+
+    if ( width != current )
+        ctrl->SetSize(wxSize(width, -1));
+
+    // select the text in the control an place the cursor at the end
+    ctrl->SetInsertionPointEnd();
+    ctrl->SelectAll();
+
+    return ctrl;
+}
+
 } // anonymous namespace
 
 //-----------------------------------------------------------------------------
@@ -146,6 +188,16 @@ void wxDataViewColumn::UpdateDisplay()
     }
 }
 
+void wxDataViewColumn::UnsetAsSortKey()
+{
+    m_sort = false;
+
+    if ( m_owner )
+        m_owner->SetSortingColumnIndex(wxNOT_FOUND);
+
+    UpdateDisplay();
+}
+
 void wxDataViewColumn::SetSortOrder(bool ascending)
 {
     if ( !m_owner )
@@ -205,6 +257,8 @@ protected:
     }
 
 private:
+    void FinishEditing();
+
     bool SendEvent(wxEventType type, unsigned int n)
     {
         wxDataViewCtrl * const owner = GetOwner();
@@ -222,9 +276,11 @@ private:
 
     void OnClick(wxHeaderCtrlEvent& event)
     {
+        FinishEditing();
+
         const unsigned idx = event.GetColumn();
 
-        if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
+        if ( SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
             return;
 
         // default handling for the column click is to sort by this column or
@@ -254,18 +310,20 @@ private:
 
         owner->OnColumnChange(idx);
 
-        SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx);
+        SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, idx);
     }
 
     void OnRClick(wxHeaderCtrlEvent& event)
     {
-        if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
+        if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
                         event.GetColumn()) )
             event.Skip();
     }
 
     void OnResize(wxHeaderCtrlEvent& event)
     {
+        FinishEditing();
+
         wxDataViewCtrl * const owner = GetOwner();
 
         const unsigned col = event.GetColumn();
@@ -275,6 +333,8 @@ private:
 
     void OnEndReorder(wxHeaderCtrlEvent& event)
     {
+        FinishEditing();
+
         wxDataViewCtrl * const owner = GetOwner();
         owner->ColumnMoved(owner->GetColumn(event.GetColumn()),
                         event.GetNewOrder());
@@ -347,7 +407,7 @@ public:
     static wxDataViewTreeNode* CreateRootNode()
     {
         wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());
-        n->SetHasChildren(true);
+        n->m_branchData = new BranchNodeData;
         n->m_branchData->open = true;
         return n;
     }
@@ -416,6 +476,11 @@ public:
 
     void ToggleOpen()
     {
+        // We do not allow the (invisible) root node to be collapsed because
+        // there is no way to expand it again.
+        if ( !m_parent )
+            return;
+
         wxCHECK_RET( m_branchData != NULL, "can't open leaf node" );
 
         int sum = 0;
@@ -446,6 +511,11 @@ public:
 
     void SetHasChildren(bool has)
     {
+        // The invisible root item always has children, so ignore any attempts
+        // to change this.
+        if ( !m_parent )
+            return;
+
         if ( !has )
         {
             wxDELETE(m_branchData);
@@ -571,20 +641,50 @@ public:
         UpdateDisplay();
     }
 
+    // Override the base class method to resort if needed, i.e. if
+    // SortPrepare() was called -- and ignored -- while we were frozen.
+    virtual void DoThaw()
+    {
+        if ( g_column == SortColumn_OnThaw )
+        {
+            Resort();
+            g_column = SortColumn_None;
+        }
+
+        wxWindow::DoThaw();
+    }
+
     void SortPrepare()
     {
         g_model = GetModel();
+
         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
         if( !col )
         {
             if (g_model->HasDefaultCompare())
-                g_column = -1;
+            {
+                // See below for the explanation of IsFrozen() test.
+                if ( IsFrozen() )
+                    g_column = SortColumn_OnThaw;
+                else
+                    g_column = SortColumn_Default;
+            }
             else
-                g_column = -2;
+                g_column = SortColumn_None;
 
             g_asending = true;
             return;
         }
+
+        // Avoid sorting while the window is frozen, this allows to quickly add
+        // many items without resorting after each addition and only resort
+        // them all at once when the window is finally thawed, see above.
+        if ( IsFrozen() )
+        {
+            g_column = SortColumn_OnThaw;
+            return;
+        }
+
         g_column = col->GetModelColumn();
         g_asending = col->IsSortOrderAscending();
     }
@@ -602,7 +702,7 @@ public:
     void OnPaint( wxPaintEvent &event );
     void OnCharHook( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );
-    void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event);
+    void OnVerticalNavigation(int delta, const wxKeyEvent& event);
     void OnLeftKey();
     void OnRightKey();
     void OnMouse( wxMouseEvent &event );
@@ -668,6 +768,7 @@ public:
 
     void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
     int GetRowHeight() const { return m_lineHeight; }
+    int GetDefaultRowHeight() const;
 
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
@@ -701,9 +802,13 @@ public:
 
     void OnColumnsCountChanged();
 
+    // Adjust last column to window size
+    void UpdateColumnSizes();
+
     // Called by wxDataViewCtrl and our own OnRenameTimer() to start edit the
     // specified item in the given column.
     void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col);
+    void FinishEditing();
 
 private:
     int RecalculateCount() const;
@@ -893,16 +998,7 @@ bool wxDataViewTextRenderer::HasEditorCtrl() const
 wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
         wxRect labelRect, const wxVariant &value )
 {
-    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
-                                       wxPoint(labelRect.x,labelRect.y),
-                                       wxSize(labelRect.width,labelRect.height),
-                                       wxTE_PROCESS_ENTER );
-
-    // select the text in the control an place the cursor at the end
-    ctrl->SetInsertionPointEnd();
-    ctrl->SelectAll();
-
-    return ctrl;
+    return CreateEditorTextCtrl(parent, labelRect, value);
 }
 
 bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value )
@@ -956,7 +1052,7 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
     if (m_bitmap.IsOk())
-        dc->DrawBitmap( m_bitmap, cell.x, cell.y );
+        dc->DrawBitmap( m_bitmap, cell.x, cell.y, true /* use mask */ );
     else if (m_icon.IsOk())
         dc->DrawIcon( m_icon, cell.x, cell.y );
 
@@ -1007,11 +1103,13 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
         GetEnabled() == false)
         flags |= wxCONTROL_DISABLED;
 
-    // check boxes we draw must always have the same, standard size (if it's
-    // bigger than the cell size the checkbox will be truncated because the
-    // caller had set the clipping rectangle to prevent us from drawing outside
-    // the cell)
-    cell.SetSize(GetSize());
+    // Ensure that the check boxes always have at least the minimal required
+    // size, otherwise DrawCheckBox() doesn't really work well. If this size is
+    // greater than the cell size, the checkbox will be truncated but this is a
+    // lesser evil.
+    wxSize size = cell.GetSize();
+    size.IncTo(GetSize());
+    cell.SetSize(size);
 
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
@@ -1022,7 +1120,7 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     return true;
 }
 
-bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell),
+bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect),
                                               wxDataViewModel *model,
                                               const wxDataViewItem& item,
                                               unsigned int col,
@@ -1030,7 +1128,8 @@ bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell),
 {
     if ( mouseEvent )
     {
-        // only react to clicks directly on the checkbox, not elsewhere in the same cell:
+        // Only react to clicks directly on the checkbox, not elsewhere in the
+        // same cell.
         if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) )
             return false;
     }
@@ -1099,7 +1198,11 @@ wxDataViewProgressRenderer::Render(wxRect rect, wxDC *dc, int WXUNUSED(state))
 
 wxSize wxDataViewProgressRenderer::GetSize() const
 {
-    return wxSize(40,12);
+    // Return -1 width because a progress bar fits any width; unlike most
+    // renderers, it doesn't have a "good" width for the content. This makes it
+    // grow to the whole column, which is pretty much always the desired
+    // behaviour. Keep the height fixed so that the progress bar isn't too fat.
+    return wxSize(-1, 12);
 }
 
 // ---------------------------------------------------------
@@ -1171,23 +1274,24 @@ wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect
         labelRect.width -= w;
     }
 
-    wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text,
-                                       wxPoint(labelRect.x,labelRect.y),
-                                       wxSize(labelRect.width,labelRect.height),
-                                       wxTE_PROCESS_ENTER );
-
-    // select the text in the control an place the cursor at the end
-    ctrl->SetInsertionPointEnd();
-    ctrl->SelectAll();
-
-    return ctrl;
+    return CreateEditorTextCtrl(parent, labelRect, text);
 }
 
 bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value )
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 
-    wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon());
+    // The icon can't be edited so get its old value and reuse it.
+    wxVariant valueOld;
+    wxDataViewColumn* const col = GetOwner();
+    GetView()->GetModel()->GetValue(valueOld, m_item, col->GetModelColumn());
+
+    wxDataViewIconText iconText;
+    iconText << valueOld;
+
+    // But replace the text with the value entered by user.
+    iconText.SetText(text->GetValue());
+
     value << iconText;
     return true;
 }
@@ -1375,16 +1479,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_currentCol = NULL;
     m_currentColSetByKeyboard = false;
     m_useCellFocus = false;
-    m_currentRow = 0;
-
-#ifdef __WXMSW__
-    // We would like to use the same line height that Explorer uses. This is
-    // different from standard ListView control since Vista.
-    if ( wxGetWinVersion() >= wxWinVersion_Vista )
-        m_lineHeight = wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height
-    else
-#endif // __WXMSW__
-        m_lineHeight = wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height
+    m_currentRow = (unsigned)-1;
+    m_lineHeight = GetDefaultRowHeight();
 
 #if wxUSE_DRAG_AND_DROP
     m_dragCount = 0;
@@ -1427,6 +1523,20 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
 }
 
 
+int wxDataViewMainWindow::GetDefaultRowHeight() const
+{
+#ifdef __WXMSW__
+    // We would like to use the same line height that Explorer uses. This is
+    // different from standard ListView control since Vista.
+    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+        return wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height
+    else
+#endif // __WXMSW__
+        return wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height
+}
+
+
+
 #if wxUSE_DRAG_AND_DROP
 bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format )
 {
@@ -1475,11 +1585,12 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x,
 
     wxDataViewModel *model = GetModel();
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
+    event.SetDropEffect( def );
     if (!m_owner->HandleWindowEvent( event ))
     {
         RemoveDropHint();
@@ -1518,7 +1629,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
 
     wxDataViewModel *model = GetModel();
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
@@ -1549,13 +1660,14 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo
 
     wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject();
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( model );
     event.SetDataFormat( format );
     event.SetDataSize( obj->GetSize() );
     event.SetDataBuffer( obj->GetData() );
+    event.SetDropEffect( def );
     if (!m_owner->HandleWindowEvent( event ))
         return wxDragNone;
 
@@ -1681,11 +1793,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxDataViewModel *model = GetModel();
     wxAutoBufferedPaintDC dc( this );
 
-#ifdef __WXMSW__
     dc.SetBrush(GetOwner()->GetBackgroundColour());
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle(GetClientSize());
-#endif
 
     if ( IsEmpty() )
     {
@@ -1709,7 +1819,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // Send the event to wxDataViewCtrl itself.
     wxWindow * const parent = GetParent();
-    wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
+    wxDataViewEvent cache_event(wxEVT_DATAVIEW_CACHE_HINT, parent->GetId());
     cache_event.SetEventObject(parent);
     cache_event.SetCache(item_start, item_last - 1);
     parent->ProcessWindowEvent(cache_event);
@@ -2110,6 +2220,20 @@ wxDataViewMainWindow::StartEditing(const wxDataViewItem& item,
     }
 }
 
+void wxDataViewMainWindow::FinishEditing()
+{
+    if ( m_editorCtrl )
+    {
+        m_editorRenderer->FinishEditing();
+    }
+}
+
+void wxDataViewHeaderWindow::FinishEditing()
+{
+    wxDataViewMainWindow *win = static_cast<wxDataViewMainWindow*>(GetOwner()->GetMainWindow());
+    win->FinishEditing();
+}
+
 //-----------------------------------------------------------------------------
 // Helper class for do operation on the tree node
 //-----------------------------------------------------------------------------
@@ -2325,7 +2449,17 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         // If this was the last child to be removed, it's possible the parent
         // node became a leaf. Let's ask the model about it.
         if ( parentNode->GetChildNodes().empty() )
-            parentNode->SetHasChildren(GetModel()->IsContainer(parent));
+        {
+            bool isContainer = GetModel()->IsContainer(parent);
+            parentNode->SetHasChildren(isContainer);
+            if ( isContainer )
+            {
+                // If it's still a container, make sure we show "+" icon for it
+                // and not "-" one as there is nothing to collapse any more.
+                if ( parentNode->IsOpen() )
+                    parentNode->ToggleOpen();
+            }
+        }
 
         // Update selection by removing 'item' and its entire children tree from the selection.
         if ( !m_selection.empty() )
@@ -2366,7 +2500,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     }
 
     // Change the current row to the last row if the current exceed the max row number
-    if( m_currentRow > GetRowCount() )
+    if ( m_currentRow >= GetRowCount() )
         ChangeCurrentRow(m_count - 1);
 
     GetOwner()->InvalidateColBestWidths();
@@ -2384,7 +2518,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 
     // Send event
     wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     le.SetModel(GetModel());
     le.SetItem(item);
@@ -2395,18 +2529,8 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 
 bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )
 {
-    int view_column = -1;
-    unsigned int n_col = m_owner->GetColumnCount();
-    for (unsigned i = 0; i < n_col; i++)
-    {
-        wxDataViewColumn *column = m_owner->GetColumn( i );
-        if (column->GetModelColumn() == model_column)
-        {
-            view_column = (int) i;
-            break;
-        }
-    }
-    if (view_column == -1)
+    int view_column = m_owner->GetModelColumnIndex(model_column);
+    if ( view_column == wxNOT_FOUND )
         return false;
 
     // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
@@ -2425,7 +2549,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     // Send event
     wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
     le.SetEventObject(parent);
     le.SetModel(GetModel());
     le.SetItem(item);
@@ -2440,9 +2564,17 @@ bool wxDataViewMainWindow::Cleared()
 {
     DestroyTree();
     m_selection.Clear();
+    m_currentRow = (unsigned)-1;
 
-    SortPrepare();
-    BuildTree( GetModel() );
+    if (GetModel())
+    {
+        SortPrepare();
+        BuildTree( GetModel() );
+    }
+    else
+    {
+        m_count = 0;
+    }
 
     GetOwner()->InvalidateColBestWidths();
     UpdateDisplay();
@@ -2462,6 +2594,7 @@ void wxDataViewMainWindow::OnInternalIdle()
 
     if (m_dirty)
     {
+        UpdateColumnSizes();
         RecalculateDisplay();
         m_dirty = false;
     }
@@ -2696,7 +2829,7 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
 void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
 {
     wxWindow *parent = GetParent();
-    wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
+    wxDataViewEvent le(wxEVT_DATAVIEW_SELECTION_CHANGED, parent->GetId());
 
     le.SetEventObject(parent);
     le.SetModel(GetModel());
@@ -2963,6 +3096,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
 {
     wxASSERT( !IsVirtualList() );
 
+    if ( row == (unsigned)-1 )
+        return NULL;
+
     RowToTreeNodeJob job( row , -2, m_root );
     Walker( m_root , job );
     return job.GetResult();
@@ -3042,44 +3178,44 @@ void wxDataViewMainWindow::Expand( unsigned int row )
     if (!node->HasChildren())
         return;
 
-            if (!node->IsOpen())
-            {
-                if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
-                {
-                    // Vetoed by the event handler.
-                    return;
-                }
+    if (!node->IsOpen())
+    {
+        if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDING, node->GetItem()) )
+        {
+            // Vetoed by the event handler.
+            return;
+        }
 
-                node->ToggleOpen();
+        node->ToggleOpen();
 
-                // build the children of current node
-                if( node->GetChildNodes().empty() )
-                {
-                    SortPrepare();
-                    ::BuildTreeHelper(GetModel(), node->GetItem(), node);
-                }
+        // build the children of current node
+        if( node->GetChildNodes().empty() )
+        {
+            SortPrepare();
+            ::BuildTreeHelper(GetModel(), node->GetItem(), node);
+        }
 
-                // By expanding the node all row indices that are currently in the selection list
-                // and are greater than our node have become invalid. So we have to correct that now.
-                const unsigned rowAdjustment = node->GetSubTreeCount();
-                for(unsigned i=0; i<m_selection.size(); ++i)
-                {
-                    const unsigned testRow = m_selection[i];
-                    // all rows above us are not affected, so skip them
-                    if(testRow <= row)
-                        continue;
+        // By expanding the node all row indices that are currently in the selection list
+        // and are greater than our node have become invalid. So we have to correct that now.
+        const unsigned rowAdjustment = node->GetSubTreeCount();
+        for(unsigned i=0; i<m_selection.size(); ++i)
+        {
+            const unsigned testRow = m_selection[i];
+            // all rows above us are not affected, so skip them
+            if(testRow <= row)
+                continue;
 
-                    m_selection[i] += rowAdjustment;
-                }
+            m_selection[i] += rowAdjustment;
+        }
 
-                if(m_currentRow > row)
-                    ChangeCurrentRow(m_currentRow + rowAdjustment);
+        if(m_currentRow > row)
+            ChangeCurrentRow(m_currentRow + rowAdjustment);
 
-                m_count = -1;
-                UpdateDisplay();
-                // Send the expanded event
-                SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
-            }
+        m_count = -1;
+        UpdateDisplay();
+        // Send the expanded event
+        SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+    }
 }
 
 void wxDataViewMainWindow::Collapse(unsigned int row)
@@ -3096,7 +3232,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row)
 
         if (node->IsOpen())
         {
-            if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) )
+            if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) )
             {
                 // Vetoed by the event handler.
                 return;
@@ -3152,7 +3288,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row)
 
             m_count = -1;
             UpdateDisplay();
-            SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
+            SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
         }
 }
 
@@ -3579,13 +3715,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             }
             else
             {
-                // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to
+                // Enter activates the item, i.e. sends wxEVT_DATAVIEW_ITEM_ACTIVATED to
                 // it. Only if that event is not handled do we activate column renderer (which
                 // is normally done by Space) or even inline editing.
 
                 const wxDataViewItem item = GetItemByRow(m_currentRow);
 
-                wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
+                wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED,
                                    parent->GetId());
                 le.SetItem(item);
                 le.SetEventObject(parent);
@@ -3665,13 +3801,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_UP:
-            if ( m_currentRow > 0 )
-                OnVerticalNavigation( m_currentRow - 1, event );
+            OnVerticalNavigation( -1, event );
             break;
 
         case WXK_DOWN:
-            if ( m_currentRow + 1 < GetRowCount() )
-                OnVerticalNavigation( m_currentRow + 1, event );
+            OnVerticalNavigation( +1, event );
             break;
         // Add the process for tree expanding/collapsing
         case WXK_LEFT:
@@ -3683,37 +3817,19 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_END:
-        {
-            if (!IsEmpty())
-                OnVerticalNavigation( GetRowCount() - 1, event );
+            OnVerticalNavigation( +(int)GetRowCount(), event );
             break;
-        }
+
         case WXK_HOME:
-            if (!IsEmpty())
-                OnVerticalNavigation( 0, event );
+            OnVerticalNavigation( -(int)GetRowCount(), event );
             break;
 
         case WXK_PAGEUP:
-            {
-                int steps = pageSize - 1;
-                int index = m_currentRow - steps;
-                if (index < 0)
-                    index = 0;
-
-                OnVerticalNavigation( index, event );
-            }
+            OnVerticalNavigation( -(pageSize - 1), event );
             break;
 
         case WXK_PAGEDOWN:
-            {
-                int steps = pageSize - 1;
-                unsigned int index = m_currentRow + steps;
-                unsigned int count = GetRowCount();
-                if ( index >= count )
-                    index = count - 1;
-
-                OnVerticalNavigation( index, event );
-            }
+            OnVerticalNavigation( +(pageSize - 1), event );
             break;
 
         default:
@@ -3721,16 +3837,24 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
     }
 }
 
-void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event)
+void wxDataViewMainWindow::OnVerticalNavigation(int delta, const wxKeyEvent& event)
 {
-    wxCHECK_RET( newCurrent < GetRowCount(),
-                wxT("invalid item index in OnVerticalNavigation()") );
-
     // if there is no selection, we cannot move it anywhere
-    if (!HasCurrentRow())
+    if (!HasCurrentRow() || IsEmpty())
         return;
 
+    int newRow = (int)m_currentRow + delta;
+
+    // let's keep the new row inside the allowed range
+    if ( newRow < 0 )
+        newRow = 0;
+
+    const int rowCount = (int)GetRowCount();
+    if ( newRow >= rowCount )
+        newRow = rowCount - 1;
+
     unsigned int oldCurrent = m_currentRow;
+    unsigned int newCurrent = (unsigned int)newRow;
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow
@@ -3782,6 +3906,8 @@ void wxDataViewMainWindow::OnLeftKey()
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+        if ( !node )
+            return;
 
         if ( TryAdvanceCurrentColumn(node, /*forward=*/false) )
             return;
@@ -3824,6 +3950,8 @@ void wxDataViewMainWindow::OnRightKey()
     else
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+        if ( !node )
+            return;
 
         if ( node->HasChildren() )
         {
@@ -3908,9 +4036,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
-    // set the focus to ourself if any of the mouse buttons are pressed
-    if(event.ButtonDown() && !HasFocus())
-        SetFocus();
+    if(event.ButtonDown())
+    {
+        // Not skipping button down events would prevent the system from
+        // setting focus to this window as most (all?) of them do by default,
+        // so skip it to enable default handling.
+        event.Skip();
+    }
 
     int x = event.GetX();
     int y = event.GetY();
@@ -3945,7 +4077,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
     if (event.RightUp())
     {
         wxWindow *parent = GetParent();
-        wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
+        wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
         le.SetEventObject(parent);
         le.SetModel(model);
 
@@ -3954,30 +4086,82 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             le.SetItem( item );
             le.SetColumn( col->GetModelColumn() );
             le.SetDataViewColumn( col );
-
-            wxVariant value;
-            model->GetValue( value, item, col->GetModelColumn() );
-            le.SetValue(value);
         }
 
         parent->ProcessWindowEvent(le);
         return;
     }
 
-    if (!col)
+#if wxUSE_DRAG_AND_DROP
+    if (event.Dragging() || ((m_dragCount > 0) && event.Leaving()))
     {
+        if (m_dragCount == 0)
+        {
+            // we have to report the raw, physical coords as we want to be
+            // able to call HitTest(event.m_pointDrag) from the user code to
+            // get the item being dragged
+            m_dragStart = event.GetPosition();
+        }
+
+        m_dragCount++;
+        if ((m_dragCount < 3) && (event.Leaving()))
+            m_dragCount = 3;
+        else if (m_dragCount != 3)
+            return;
+
+        if (event.LeftIsDown())
+        {
+            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y,
+                                             &m_dragStart.x, &m_dragStart.y );
+            unsigned int drag_item_row = GetLineAt( m_dragStart.y );
+            wxDataViewItem itemDragged = GetItemByRow( drag_item_row );
+
+            // Notify cell about drag
+            wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
+            event.SetEventObject( m_owner );
+            event.SetItem( itemDragged );
+            event.SetModel( model );
+            if (!m_owner->HandleWindowEvent( event ))
+                return;
+
+            if (!event.IsAllowed())
+                return;
+
+            wxDataObject *obj = event.GetDataObject();
+            if (!obj)
+                return;
+
+            wxDataViewDropSource drag( this, drag_item_row );
+            drag.SetData( *obj );
+            /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags());
+            delete obj;
+        }
+        return;
+    }
+    else
+    {
+        m_dragCount = 0;
+    }
+#endif // wxUSE_DRAG_AND_DROP
+
+    // Check if we clicked outside the item area.
+    if ((current >= GetRowCount()) || !col)
+    {
+        // Follow Windows convention here: clicking either left or right (but
+        // not middle) button clears the existing selection.
+        if (m_owner && (event.LeftDown() || event.RightDown()))
+        {
+            if (!GetSelections().empty())
+            {
+                m_owner->UnselectAll();
+                SendSelectionChangedEvent(wxDataViewItem());
+            }
+        }
         event.Skip();
         return;
     }
 
     wxDataViewRenderer *cell = col->GetRenderer();
-    if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
-    {
-        // Unselect all if below the last row ?
-        event.Skip();
-        return;
-    }
-
     wxDataViewColumn* const
         expander = GetExpanderColumnOrFirstOne(GetOwner());
 
@@ -4033,57 +4217,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         }
     }
 
-#if wxUSE_DRAG_AND_DROP
-    if (event.Dragging())
-    {
-        if (m_dragCount == 0)
-        {
-            // we have to report the raw, physical coords as we want to be
-            // able to call HitTest(event.m_pointDrag) from the user code to
-            // get the item being dragged
-            m_dragStart = event.GetPosition();
-        }
-
-        m_dragCount++;
-
-        if (m_dragCount != 3)
-            return;
-
-        if (event.LeftIsDown())
-        {
-            m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y,
-                                             &m_dragStart.x, &m_dragStart.y );
-            unsigned int drag_item_row = GetLineAt( m_dragStart.y );
-            wxDataViewItem itemDragged = GetItemByRow( drag_item_row );
-
-            // Notify cell about drag
-            wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
-            event.SetEventObject( m_owner );
-            event.SetItem( itemDragged );
-            event.SetModel( model );
-            if (!m_owner->HandleWindowEvent( event ))
-                return;
-
-            if (!event.IsAllowed())
-                return;
-
-            wxDataObject *obj = event.GetDataObject();
-            if (!obj)
-                return;
-
-            wxDataViewDropSource drag( this, drag_item_row );
-            drag.SetData( *obj );
-            /* wxDragResult res = */ drag.DoDragDrop();
-            delete obj;
-        }
-        return;
-    }
-    else
-    {
-        m_dragCount = 0;
-    }
-#endif // wxUSE_DRAG_AND_DROP
-
     bool simulateClick = false;
 
     if (event.ButtonDClick())
@@ -4107,7 +4240,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         else if ( current == m_lineLastClicked )
         {
             wxWindow *parent = GetParent();
-            wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
+            wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
             le.SetItem( item );
             le.SetColumn( col->GetModelColumn() );
             le.SetDataViewColumn( col );
@@ -4255,8 +4388,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         m_currentCol = col;
         m_currentColSetByKeyboard = false;
 
+        // This flag is used to decide whether we should start editing the item
+        // label. We do it if the user clicks twice (but not double clicks,
+        // i.e. simulateClick is false) on the same item but not if the click
+        // was used for something else already, e.g. selecting the item (so it
+        // must have been already selected) or giving the focus to the control
+        // (so it must have had focus already).
         m_lastOnSame = !simulateClick && ((col == oldCurrentCol) &&
-                        (current == oldCurrentRow)) && oldWasSelected;
+                        (current == oldCurrentRow)) && oldWasSelected &&
+                        HasFocus();
 
         // Call ActivateCell() after everything else as under GTK+
         if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) )
@@ -4270,33 +4410,36 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                               GetLineHeight( current ) );
 
             // Report position relative to the cell's custom area, i.e.
-            // no the entire space as given by the control but the one
+            // not the entire space as given by the control but the one
             // used by the renderer after calculation of alignment etc.
+            //
+            // Notice that this results in negative coordinates when clicking
+            // in the upper left corner of a centre-aligned cell which doesn't
+            // fill its column entirely so this is somewhat surprising, but we
+            // do it like this for compatibility with the native GTK+ version,
+            // see #12270.
 
             // adjust the rectangle ourselves to account for the alignment
+            const int align = cell->GetEffectiveAlignment();
+
             wxRect rectItem = cell_rect;
-            const int align = cell->GetAlignment();
-            if ( align != wxDVR_DEFAULT_ALIGNMENT )
+            const wxSize size = cell->GetSize();
+            if ( size.x >= 0 && size.x < cell_rect.width )
             {
-                const wxSize size = cell->GetSize();
+                if ( align & wxALIGN_CENTER_HORIZONTAL )
+                    rectItem.x += (cell_rect.width - size.x)/2;
+                else if ( align & wxALIGN_RIGHT )
+                    rectItem.x += cell_rect.width - size.x;
+                // else: wxALIGN_LEFT is the default
+            }
 
-                if ( size.x >= 0 && size.x < cell_rect.width )
-                {
-                    if ( align & wxALIGN_CENTER_HORIZONTAL )
-                        rectItem.x += (cell_rect.width - size.x)/2;
-                    else if ( align & wxALIGN_RIGHT )
-                        rectItem.x += cell_rect.width - size.x;
-                    // else: wxALIGN_LEFT is the default
-                }
-
-                if ( size.y >= 0 && size.y < cell_rect.height )
-                {
-                    if ( align & wxALIGN_CENTER_VERTICAL )
-                        rectItem.y += (cell_rect.height - size.y)/2;
-                    else if ( align & wxALIGN_BOTTOM )
-                        rectItem.y += cell_rect.height - size.y;
-                    // else: wxALIGN_TOP is the default
-                }
+            if ( size.y >= 0 && size.y < cell_rect.height )
+            {
+                if ( align & wxALIGN_CENTER_VERTICAL )
+                    rectItem.y += (cell_rect.height - size.y)/2;
+                else if ( align & wxALIGN_BOTTOM )
+                    rectItem.y += cell_rect.height - size.y;
+                // else: wxALIGN_TOP is the default
             }
 
             wxMouseEvent event2(event);
@@ -4350,11 +4493,44 @@ void wxDataViewMainWindow::OnColumnsCountChanged()
             editableCount++;
     }
 
-    m_useCellFocus = (editableCount > 1);
+    m_useCellFocus = (editableCount > 0);
 
     UpdateDisplay();
 }
 
+void wxDataViewMainWindow::UpdateColumnSizes()
+{
+    int colsCount = GetOwner()->GetColumnCount();
+    if ( !colsCount )
+        return;
+
+    wxDataViewCtrl *owner = GetOwner();
+
+    int fullWinWidth = GetSize().x;
+
+    wxDataViewColumn *lastCol = owner->GetColumn(colsCount - 1);
+    int colswidth = GetEndOfLastCol();
+    int lastColX = colswidth - lastCol->GetWidth();
+    if ( lastColX < fullWinWidth )
+    {
+        int desiredWidth = wxMax(fullWinWidth - lastColX, lastCol->GetMinWidth());
+        lastCol->SetWidth(desiredWidth);
+
+        // All columns fit on screen, so we don't need horizontal scrolling.
+        // To prevent flickering scrollbar when resizing the window to be
+        // narrower, force-set the virtual width to 0 here. It will eventually
+        // be corrected at idle time.
+        SetVirtualSize(0, m_virtualSize.y);
+
+        RefreshRect(wxRect(lastColX, 0, fullWinWidth - lastColX, GetSize().y));
+    }
+    else
+    {
+        // else: don't bother, the columns won't fit anyway
+        SetVirtualSize(colswidth, m_virtualSize.y);
+    }
+}
+
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 //-----------------------------------------------------------------------------
@@ -4384,6 +4560,7 @@ void wxDataViewCtrl::Init()
     m_sortingColumnIdx = wxNOT_FOUND;
 
     m_headerArea = NULL;
+    m_clientArea = NULL;
 
     m_colsDirty = false;
 }
@@ -4469,6 +4646,9 @@ wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
 
 void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
+    if ( m_clientArea && GetColumnCount() )
+        m_clientArea->UpdateColumnSizes();
+
     // We need to override OnSize so that our scrolled
     // window a) does call Layout() to use sizers for
     // positioning the controls but b) does not query
@@ -4497,18 +4677,53 @@ void wxDataViewCtrl::SetFocus()
         m_clientArea->SetFocus();
 }
 
+bool wxDataViewCtrl::SetFont(const wxFont & font)
+{
+    if (!wxControl::SetFont(font))
+        return false;
+
+    if (m_headerArea)
+        m_headerArea->SetFont(font);
+
+    if (m_clientArea)
+    {
+        m_clientArea->SetFont(font);
+        m_clientArea->SetRowHeight(m_clientArea->GetDefaultRowHeight());
+    }
+
+    if (m_headerArea || m_clientArea)
+    {
+        InvalidateColBestWidths();
+        Layout();
+    }
+
+    return true;
+}
+
+
+
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
-    m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
-
-    model->AddNotifier( m_notifier );
+    if (model)
+    {
+        m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
+        model->AddNotifier( m_notifier );
+    }
+    else if (m_notifier)
+    {
+        m_notifier->Cleared();
+        m_notifier = NULL;
+    }
 
     m_clientArea->DestroyTree();
 
-    m_clientArea->BuildTree(model);
+    if (model)
+    {
+        m_clientArea->BuildTree(model);
+    }
 
     m_clientArea->UpdateDisplay();
 
@@ -4535,7 +4750,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Append( col );
-    m_colsBestWidths.push_back(0);
+    m_colsBestWidths.push_back(CachedColWidthInfo());
     OnColumnsCountChanged();
     return true;
 }
@@ -4546,7 +4761,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( col );
-    m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin(), CachedColWidthInfo());
     OnColumnsCountChanged();
     return true;
 }
@@ -4557,7 +4772,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
         return false;
 
     m_cols.Insert( pos, col );
-    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
+    m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, CachedColWidthInfo());
     OnColumnsCountChanged();
     return true;
 }
@@ -4580,6 +4795,14 @@ void wxDataViewCtrl::OnColumnsCountChanged()
 
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
+    wxDataViewColumn* column = GetExpanderColumn();
+    if ( column )
+    {
+        int index = GetColumnIndex(column);
+        if ( index != wxNOT_FOUND )
+            InvalidateColBestWidth(index);
+    }
+
     m_clientArea->UpdateDisplay();
 }
 
@@ -4630,10 +4853,22 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
     return wxNOT_FOUND;
 }
 
+int wxDataViewCtrl::GetModelColumnIndex( unsigned int model_column ) const
+{
+    const int count = GetColumnCount();
+    for ( int index = 0; index < count; index++ )
+    {
+        wxDataViewColumn* column = GetColumn(index);
+        if ( column->GetModelColumn() == model_column )
+            return index;
+    }
+    return wxNOT_FOUND;
+}
+
 unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
 {
-    if ( m_colsBestWidths[idx] != 0 )
-        return m_colsBestWidths[idx];
+    if ( m_colsBestWidths[idx].width != 0 )
+        return m_colsBestWidths[idx].width;
 
     const int count = m_clientArea->GetRowCount();
     wxDataViewColumn *column = GetColumn(idx);
@@ -4647,21 +4882,23 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
                            wxDataViewMainWindow *clientArea,
                            wxDataViewRenderer *renderer,
                            const wxDataViewModel *model,
-                           unsigned column,
+                           unsigned int model_column,
                            int expanderSize)
             : m_width(0),
               m_dvc(dvc),
               m_clientArea(clientArea),
               m_renderer(renderer),
               m_model(model),
-              m_column(column),
+              m_model_column(model_column),
               m_expanderSize(expanderSize)
 
         {
+            int index = dvc->GetModelColumnIndex( model_column );
+            wxDataViewColumn* column = index == wxNOT_FOUND ? NULL : dvc->GetColumn(index);
             m_isExpanderCol =
                 !clientArea->IsList() &&
                 (column == 0 ||
-                 GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == dvc->GetColumnAt(column));
+                 GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == column );
         }
 
         void UpdateWithWidth(int width)
@@ -4685,7 +4922,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
                 item = m_clientArea->GetItemByRow(row);
             }
 
-            m_renderer->PrepareForItem(m_model, item, m_column);
+            m_renderer->PrepareForItem(m_model, item, m_model_column);
             m_width = wxMax(m_width, m_renderer->GetSize().x + indent);
         }
 
@@ -4697,7 +4934,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
         wxDataViewMainWindow *m_clientArea;
         wxDataViewRenderer *m_renderer;
         const wxDataViewModel *m_model;
-        unsigned m_column;
+        unsigned m_model_column;
         bool m_isExpanderCol;
         int m_expanderSize;
     };
@@ -4706,6 +4943,8 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
                                   GetModel(), column->GetModelColumn(),
                                   m_clientArea->GetRowHeight());
 
+    calculator.UpdateWithWidth(column->GetMinWidth());
+
     if ( m_headerArea )
         calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column));
 
@@ -4781,7 +5020,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
     if ( max_width > 0 )
         max_width += 2 * PADDING_RIGHTLEFT;
 
-    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+    const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx].width = max_width;
     return max_width;
 }
 
@@ -4826,12 +5065,14 @@ bool wxDataViewCtrl::ClearColumns()
 
 void wxDataViewCtrl::InvalidateColBestWidth(int idx)
 {
-    m_colsBestWidths[idx] = 0;
+    m_colsBestWidths[idx].width = 0;
+    m_colsBestWidths[idx].dirty = true;
     m_colsDirty = true;
 }
 
 void wxDataViewCtrl::InvalidateColBestWidths()
 {
+    // mark all columns as dirty:
     m_colsBestWidths.clear();
     m_colsBestWidths.resize(m_cols.size());
     m_colsDirty = true;
@@ -4839,14 +5080,27 @@ void wxDataViewCtrl::InvalidateColBestWidths()
 
 void wxDataViewCtrl::UpdateColWidths()
 {
+    m_colsDirty = false;
+
     if ( !m_headerArea )
         return;
 
     const unsigned len = m_colsBestWidths.size();
     for ( unsigned i = 0; i < len; i++ )
     {
-        if ( m_colsBestWidths[i] == 0 )
+        // Note that we have to have an explicit 'dirty' flag here instead of
+        // checking if the width==0, as is done in GetBestColumnWidth().
+        //
+        // Testing width==0 wouldn't work correctly if some code called
+        // GetWidth() after col. width invalidation but before
+        // wxDataViewCtrl::UpdateColWidths() was called at idle time. This
+        // would result in the header's column width getting out of sync with
+        // the control itself.
+        if ( m_colsBestWidths[i].dirty )
+        {
             m_headerArea->UpdateColumn(i);
+            m_colsBestWidths[i].dirty = false;
+        }
     }
 }
 
@@ -4855,10 +5109,7 @@ void wxDataViewCtrl::OnInternalIdle()
     wxDataViewCtrlBase::OnInternalIdle();
 
     if ( m_colsDirty )
-    {
-        m_colsDirty = false;
         UpdateColWidths();
-    }
 }
 
 int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
@@ -5068,14 +5319,20 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
+    {
         m_clientArea->Expand(row);
+        InvalidateColBestWidths();
+    }
 }
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
     int row = m_clientArea->GetRowByItem( item );
     if (row != -1)
+    {
         m_clientArea->Collapse(row);
+        InvalidateColBestWidths();
+    }
 }
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
diff --git a/Externals/wxWidgets3/src/generic/datectlg.cpp b/Externals/wxWidgets3/src/generic/datectlg.cpp
index a1b3e0a13d..6ea3d01c4a 100644
--- a/Externals/wxWidgets3/src/generic/datectlg.cpp
+++ b/Externals/wxWidgets3/src/generic/datectlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Andreas Pflug
 // Modified by:
 // Created:     2005-01-19
-// RCS-ID:      $Id: datectlg.cpp 68910 2011-08-27 12:13:18Z VZ $
 // Copyright:   (c) 2005 Andreas Pflug <pgadmin@pse-consulting.de>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -130,7 +129,7 @@ public:
 
         if ( !s.empty() )
         {
-            pDt->ParseFormat(s.c_str(), m_format);
+            pDt->ParseFormat(s, m_format);
             if ( !pDt->IsValid() )
                 return false;
         }
@@ -379,7 +378,19 @@ bool wxDatePickerCtrlGeneric::Destroy()
 
 wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
 {
-    return m_combo->GetBestSize();
+    // A better solution would be to use a custom text control that would have
+    // the best size determined by the current date format and let m_combo take
+    // care of the best size computation, but this isn't easily possible with
+    // wxComboCtrl currently, so we compute our own best size here instead even
+    // if this means adding some extra margins to account for text control
+    // borders, space between it and the button and so on.
+    wxSize size = m_combo->GetButtonSize();
+
+    wxTextCtrl* const text = m_combo->GetTextCtrl();
+    size.x += text->GetTextExtent(text->GetValue()).x;
+    size.x += 2*text->GetCharWidth(); // This is the margin mentioned above.
+
+    return size;
 }
 
 wxWindowList wxDatePickerCtrlGeneric::GetCompositeWindowParts() const
diff --git a/Externals/wxWidgets3/src/generic/dbgrptg.cpp b/Externals/wxWidgets3/src/generic/dbgrptg.cpp
index 6cc1f4bc35..99416162ce 100644
--- a/Externals/wxWidgets3/src/generic/dbgrptg.cpp
+++ b/Externals/wxWidgets3/src/generic/dbgrptg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Andrej Putrin
 // Modified by:
 // Created:     2005-01-21
-// RCS-ID:      $Id: dbgrptg.cpp 69828 2011-11-27 19:49:43Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,7 +38,11 @@
 #endif // WX_PRECOMP
 
 #include "wx/filename.h"
-#include "wx/ffile.h"
+#ifdef wxUSE_FFILE
+    #include "wx/ffile.h"
+#else
+    #include "wx/file.h"
+#endif
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"
@@ -432,7 +435,12 @@ void wxDebugReportDialog::OnView(wxCommandEvent& )
     wxFileName fn(m_dbgrpt.GetDirectory(), m_files[sel]);
     wxString str;
 
-    wxFFile file(fn.GetFullPath());
+    const wxString& fullPath = fn.GetFullPath();
+#if wxUSE_FFILE
+    wxFFile file(fullPath);
+#elif wxUSE_FILE
+    wxFile file(fullPath);
+#endif
     if ( file.IsOpened() && file.ReadAll(&str) )
     {
         wxDumpPreviewDlg dlg(this, m_files[sel], str);
diff --git a/Externals/wxWidgets3/src/generic/dcpsg.cpp b/Externals/wxWidgets3/src/generic/dcpsg.cpp
index 09980ebf5f..b5c493b0f4 100644
--- a/Externals/wxWidgets3/src/generic/dcpsg.cpp
+++ b/Externals/wxWidgets3/src/generic/dcpsg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: dcpsg.cpp 69243 2011-09-30 15:26:36Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -597,7 +596,7 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
-void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDCImpl::DoDrawPolygon (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -667,7 +666,7 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset
     }
 }
 
-void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -743,7 +742,7 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
     }
 }
 
-void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxPostScriptDCImpl::DoDrawLines (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -1136,8 +1135,12 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
     if (!pen.IsOk()) return;
 
     int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID;
+    wxPenCap oldCap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID;
+    wxPenJoin oldJoin = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID;
 
     m_pen = pen;
+    wxPenCap cap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID;
+    wxPenJoin join = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID;
 
     double width;
 
@@ -1201,6 +1204,35 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
         PsPrint( " setdash\n" );
     }
 
+    if ( cap != wxCAP_INVALID && cap != oldCap )
+    {
+        switch ( cap )
+        {
+            case wxCAP_ROUND:      buffer = "1"; break;
+            case wxCAP_PROJECTING: buffer = "2"; break;
+            case wxCAP_BUTT:       buffer = "0"; break;
+
+            // This case is just to fix compiler warning, this is impossible
+            // due to the test above.
+            case wxCAP_INVALID: break;
+        }
+        buffer << " setlinecap\n";
+        PsPrint( buffer );
+    }
+
+    if ( join != wxJOIN_INVALID && join != oldJoin )
+    {
+        switch ( join )
+        {
+            case wxJOIN_BEVEL: buffer = "2"; break;
+            case wxJOIN_ROUND: buffer = "1"; break;
+            case wxJOIN_MITER: buffer = "0"; break;
+            case wxJOIN_INVALID: break;
+        }
+        buffer << " setlinejoin\n";
+        PsPrint( buffer );
+    }
+
     // Line colour
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();
@@ -1627,7 +1659,7 @@ void wxPostScriptDCImpl::ComputeScaleAndOrigin()
 
     wxDCImpl::ComputeScaleAndOrigin();
 
-    // If scale has changed call SetPen to recalulate the line width
+    // If scale has changed call SetPen to recalculate the line width
     // and SetFont to recalculate font size
     if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
     {
@@ -2307,8 +2339,20 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
 
     long sum=0;
     float height=fontSize; /* by default */
-    unsigned char *p;
-    for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
+    unsigned char *p=(unsigned char *)wxMBSTRINGCAST strbuf;
+    if(!p)
+    {
+        // String couldn't be converted which used to SEGV as reported here:
+        // http://bugs.debian.org/702378
+        // http://trac.wxwidgets.org/ticket/15300
+        // Upstream suggests "just return if the conversion failed".
+        if (x) (*x) = 0;
+        if (y) (*y) = 0;
+        if (descent) (*descent) = 0;
+        if (externalLeading) (*externalLeading) = 0;
+        return;
+    }
+    for(; *p; p++)
     {
         if(lastWidths[*p]== INT_MIN)
         {
diff --git a/Externals/wxWidgets3/src/generic/descrip.mms b/Externals/wxWidgets3/src/generic/descrip.mms
index 558e6636dd..0c61de6fd8 100644
--- a/Externals/wxWidgets3/src/generic/descrip.mms
+++ b/Externals/wxWidgets3/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 3 January 2012                                                      *
+# Date : 21 January 2013                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -95,7 +95,7 @@ OBJECTS = \
 		editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
 		richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
 		markuptext.obj,bannerwindow.obj,timectrlg.obj,richtooltipg.obj\
-		,statbmpg.obj
+		,statbmpg.obj,splash.obj
 
 SOURCES = \
 		aboutdlgg.cpp,\
@@ -167,23 +167,24 @@ SOURCES = \
 		,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
 		datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
 		commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \
-		bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp
+		bannerwindow.cpp timectrlg.cpp richtooltipg.cpp statbmpg.cpp \
+		textmeasure.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
 	combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
-	mdig.obj,infobar.obj
+	mdig.obj,infobar.obj,textmeasure.obj
 .else
 .ifdef __WXX11__
 OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
-	listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\
+	listbkg.obj,mdig.obj,spinctlg.obj,timer.obj,\
 	combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
-	colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj
+	colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj
 .else
 .ifdef __WXGTK__
 OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
 	combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
-	colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj
+	colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,infobar.obj,textmeasure.obj
 .else
 OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,\
 	combog.obj,icon.obj
@@ -308,3 +309,5 @@ bannerwindow.obj : bannerwindow.cpp
 timectrlg.obj : timectrlg.cpp
 richtooltipg.obj : richtooltipg.cpp
 statbmpg.obj : statbmpg.cpp
+textmeasure.obj : textmeasure.cpp
+editlbox.obj : editlbox.cpp
diff --git a/Externals/wxWidgets3/src/generic/dirctrlg.cpp b/Externals/wxWidgets3/src/generic/dirctrlg.cpp
index 358e0cea3c..bbbc4ef43f 100644
--- a/Externals/wxWidgets3/src/generic/dirctrlg.cpp
+++ b/Externals/wxWidgets3/src/generic/dirctrlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Harm van der Heijden, Robert Roebling, Julian Smart
 // Modified by:
 // Created:     12/12/98
-// RCS-ID:      $Id: dirctrlg.cpp 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -102,6 +101,13 @@ extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
 
 bool wxIsDriveAvailable(const wxString& dirName);
 
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+wxDEFINE_EVENT( wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent );
+wxDEFINE_EVENT( wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent );
+
 // ----------------------------------------------------------------------------
 // wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
 // ----------------------------------------------------------------------------
@@ -441,6 +447,8 @@ BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_COLLAPSED     (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
   EVT_TREE_BEGIN_LABEL_EDIT   (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem)
   EVT_TREE_END_LABEL_EDIT     (wxID_TREECTRL, wxGenericDirCtrl::OnEndEditItem)
+  EVT_TREE_SEL_CHANGED        (wxID_TREECTRL, wxGenericDirCtrl::OnTreeSelChange)
+  EVT_TREE_ITEM_ACTIVATED     (wxID_TREECTRL, wxGenericDirCtrl::OnItemActivated)
   EVT_SIZE                    (wxGenericDirCtrl::OnSize)
 END_EVENT_TABLE()
 
@@ -511,7 +519,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
                                 wxPoint(0,0), GetClientSize(), treeStyle);
 
-    if (!filter.empty())
+    if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
         m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
 
     m_defaultPath = dir;
@@ -666,7 +674,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     }
 
     wxTreeItemId treeid = event.GetItem();
-    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid );
+    wxDirItemData *data = GetItemData( treeid );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );
@@ -694,6 +702,46 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     }
 }
 
+void wxGenericDirCtrl::OnTreeSelChange(wxTreeEvent &event)
+{
+    wxTreeEvent changedEvent(wxEVT_DIRCTRL_SELECTIONCHANGED, GetId());
+
+    changedEvent.SetEventObject(this);
+    changedEvent.SetItem(event.GetItem());
+    changedEvent.SetClientObject(m_treeCtrl->GetItemData(event.GetItem()));
+
+    if (GetEventHandler()->SafelyProcessEvent(changedEvent) && !changedEvent.IsAllowed())
+        event.Veto();
+    else
+        event.Skip();
+}
+
+void wxGenericDirCtrl::OnItemActivated(wxTreeEvent &event)
+{
+    wxTreeItemId treeid = event.GetItem();
+    const wxDirItemData *data = GetItemData(treeid);
+
+    if (data->m_isDir)
+    {
+        // is dir
+        event.Skip();
+    }
+    else
+    {
+        // is file
+        wxTreeEvent changedEvent(wxEVT_DIRCTRL_FILEACTIVATED, GetId());
+
+        changedEvent.SetEventObject(this);
+        changedEvent.SetItem(treeid);
+        changedEvent.SetClientObject(m_treeCtrl->GetItemData(treeid));
+
+        if (GetEventHandler()->SafelyProcessEvent(changedEvent) && !changedEvent.IsAllowed())
+            event.Veto();
+        else
+            event.Skip();
+    }
+}
+
 void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 {
     wxTreeItemId parentId = event.GetItem();
@@ -716,7 +764,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
 {
     wxTreeItemId child;
 
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
+    wxDirItemData *data = GetItemData(parentId);
     if (!data->m_isExpanded)
         return;
 
@@ -731,7 +779,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
 
 void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
 {
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
+    wxDirItemData *data = GetItemData(parentId);
 
     if (data->m_isExpanded)
         return;
@@ -752,7 +800,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
 
 #if (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__DOS__) || defined(__OS2__)
     // Check if this is a root directory and if so,
-    // whether the drive is avaiable.
+    // whether the drive is available.
     if (!wxIsDriveAvailable(dirName))
     {
         data->m_isExpanded = false;
@@ -922,7 +970,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
+        wxDirItemData* data = GetItemData(childId);
 
         if (data && !data->m_path.empty())
         {
@@ -973,7 +1021,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
     if (!lastId.IsOk())
         return false;
 
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId);
+    wxDirItemData *data = GetItemData(lastId);
     if (data->m_isDir)
     {
         m_treeCtrl->Expand(lastId);
@@ -986,7 +1034,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
         bool selectedChild = false;
         while (childId.IsOk())
         {
-            data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
+            data = GetItemData(childId);
 
             if (data && data->m_path != wxEmptyString && !data->m_isDir)
             {
@@ -1038,6 +1086,18 @@ bool wxGenericDirCtrl::CollapsePath(const wxString& path)
     return true;
 }
 
+wxDirItemData* wxGenericDirCtrl::GetItemData(wxTreeItemId itemId)
+{
+    return static_cast<wxDirItemData*>(m_treeCtrl->GetItemData(itemId));
+}
+
+wxString wxGenericDirCtrl::GetPath(wxTreeItemId itemId) const
+{
+    const wxDirItemData*
+        data = static_cast<wxDirItemData*>(m_treeCtrl->GetItemData(itemId));
+
+    return data->m_path;
+}
 
 wxString wxGenericDirCtrl::GetPath() const
 {
@@ -1050,8 +1110,7 @@ wxString wxGenericDirCtrl::GetPath() const
         {
             // return first string only
             wxTreeItemId treeid = items[0];
-            wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-            return data->m_path;
+            return GetPath(treeid);
         }
 
         return wxEmptyString;
@@ -1060,8 +1119,7 @@ wxString wxGenericDirCtrl::GetPath() const
     wxTreeItemId treeid = m_treeCtrl->GetSelection();
     if (treeid)
     {
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-        return data->m_path;
+        return GetPath(treeid);
     }
     else
         return wxEmptyString;
@@ -1076,8 +1134,7 @@ void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const
     for ( unsigned n = 0; n < items.size(); n++ )
     {
         wxTreeItemId treeid = items[n];
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-        paths.Add(data->m_path);
+        paths.push_back(GetPath(treeid));
     }
 }
 
@@ -1217,7 +1274,7 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
 {
     m_filter = filter;
 
-    if (!filter.empty() && !m_filterListCtrl)
+    if (!filter.empty() && !m_filterListCtrl && HasFlag(wxDIRCTRL_SHOW_FILTERS))
         m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
     else if (filter.empty() && m_filterListCtrl)
     {
diff --git a/Externals/wxWidgets3/src/generic/dirdlgg.cpp b/Externals/wxWidgets3/src/generic/dirdlgg.cpp
index 8d25c0f04c..80ddf5ca5e 100644
--- a/Externals/wxWidgets3/src/generic/dirdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/dirdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Harm van der Heijden, Robert Roebling & Julian Smart
 // Modified by:
 // Created:     12/12/98
-// RCS-ID:      $Id: dirdlgg.cpp 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) Harm van der Heijden, Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/dragimgg.cpp b/Externals/wxWidgets3/src/generic/dragimgg.cpp
index 421926207c..15561e5e54 100644
--- a/Externals/wxWidgets3/src/generic/dragimgg.cpp
+++ b/Externals/wxWidgets3/src/generic/dragimgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000
-// RCS-ID:      $Id: dragimgg.cpp 70749 2012-02-29 13:58:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -324,7 +323,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
 
     wxSize sz = fullScreenRect->GetSize();
 
-    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
+    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
diff --git a/Externals/wxWidgets3/src/generic/editlbox.cpp b/Externals/wxWidgets3/src/generic/editlbox.cpp
index 2003be1a3a..a236e62f59 100644
--- a/Externals/wxWidgets3/src/generic/editlbox.cpp
+++ b/Externals/wxWidgets3/src/generic/editlbox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/generic/editlbox.cpp
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: editlbox.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -350,9 +349,9 @@ void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
         // possible:
         m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
 
-        // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
+        // Simulate a wxEVT_LIST_ITEM_SELECTED event for the new item,
         // so that the buttons are enabled/disabled properly
-        wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
+        wxListEvent selectionEvent(wxEVT_LIST_ITEM_SELECTED, m_listCtrl->GetId());
         selectionEvent.m_itemIndex = event.GetIndex();
         m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
     }
@@ -370,26 +369,32 @@ void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event))
     m_listCtrl->EditLabel(m_selection);
 }
 
+void wxEditableListBox::SwapItems(long i1, long i2)
+{
+    // swap the text
+    wxString t1 = m_listCtrl->GetItemText(i1);
+    wxString t2 = m_listCtrl->GetItemText(i2);
+    m_listCtrl->SetItemText(i1, t2);
+    m_listCtrl->SetItemText(i2, t1);
+
+    // swap the item data
+    wxUIntPtr d1 = m_listCtrl->GetItemData(i1);
+    wxUIntPtr d2 = m_listCtrl->GetItemData(i2);
+    m_listCtrl->SetItemPtrData(i1, d2);
+    m_listCtrl->SetItemPtrData(i2, d1);
+}
+
+
 void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))
 {
-    wxString t1, t2;
-
-    t1 = m_listCtrl->GetItemText(m_selection - 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection - 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
+    SwapItems(m_selection - 1, m_selection);
     m_listCtrl->SetItemState(m_selection - 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
 void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
 {
-    wxString t1, t2;
-
-    t1 = m_listCtrl->GetItemText(m_selection + 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection + 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
+    SwapItems(m_selection + 1, m_selection);
     m_listCtrl->SetItemState(m_selection + 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
diff --git a/Externals/wxWidgets3/src/generic/fdrepdlg.cpp b/Externals/wxWidgets3/src/generic/fdrepdlg.cpp
index 755edcd20c..af1ebb03ef 100644
--- a/Externals/wxWidgets3/src/generic/fdrepdlg.cpp
+++ b/Externals/wxWidgets3/src/generic/fdrepdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     05/25/01
-// RCS-ID:      $Id: fdrepdlg.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -259,22 +258,22 @@ void wxGenericFindReplaceDialog::SendEvent(const wxEventType& evtType)
 
 void wxGenericFindReplaceDialog::OnFind(wxCommandEvent& WXUNUSED(event))
 {
-    SendEvent(wxEVT_COMMAND_FIND_NEXT);
+    SendEvent(wxEVT_FIND_NEXT);
 }
 
 void wxGenericFindReplaceDialog::OnReplace(wxCommandEvent& WXUNUSED(event))
 {
-    SendEvent(wxEVT_COMMAND_FIND_REPLACE);
+    SendEvent(wxEVT_FIND_REPLACE);
 }
 
 void wxGenericFindReplaceDialog::OnReplaceAll(wxCommandEvent& WXUNUSED(event))
 {
-    SendEvent(wxEVT_COMMAND_FIND_REPLACE_ALL);
+    SendEvent(wxEVT_FIND_REPLACE_ALL);
 }
 
 void wxGenericFindReplaceDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-    SendEvent(wxEVT_COMMAND_FIND_CLOSE);
+    SendEvent(wxEVT_FIND_CLOSE);
 
     Show(false);
 }
@@ -287,7 +286,7 @@ void wxGenericFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent &event)
 
 void wxGenericFindReplaceDialog::OnCloseWindow(wxCloseEvent &)
 {
-    SendEvent(wxEVT_COMMAND_FIND_CLOSE);
+    SendEvent(wxEVT_FIND_CLOSE);
 }
 
 #endif // wxUSE_FINDREPLDLG
diff --git a/Externals/wxWidgets3/src/generic/filectrlg.cpp b/Externals/wxWidgets3/src/generic/filectrlg.cpp
index 67f713baf8..1dfba4421c 100644
--- a/Externals/wxWidgets3/src/generic/filectrlg.cpp
+++ b/Externals/wxWidgets3/src/generic/filectrlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericFileCtrl Implementation
 // Author:      Diaa M. Sami
 // Created:     2007-07-07
-// RCS-ID:      $Id: filectrlg.cpp 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -223,32 +222,39 @@ void wxFileData::ReadData()
     wxStructStat buff;
 
 #if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
-    lstat( m_filePath.fn_str(), &buff );
-    m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
+    const bool hasStat = lstat( m_filePath.fn_str(), &buff ) == 0;
+    if ( hasStat )
+        m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
 #else // no lstat()
-    wxStat( m_filePath, &buff );
+    const bool hasStat = wxStat( m_filePath, &buff ) == 0;
 #endif
 
-    m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
-    m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
+    if ( hasStat )
+    {
+        m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
+        m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
 
-    m_size = buff.st_size;
+        m_size = buff.st_size;
 
-    m_dateTime = buff.st_mtime;
+        m_dateTime = buff.st_mtime;
+    }
 #endif
     // __WXWINCE__
 
 #if defined(__UNIX__)
-    m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
-                         buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));
+    if ( hasStat )
+    {
+        m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
+                             buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
+                             buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
+                             buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));
+    }
 #elif defined(__WIN32__)
     DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
     if (attribs != (DWORD)-1)
@@ -883,9 +889,9 @@ wxFileListCtrl::~wxFileListCtrl()
 // wxGenericFileCtrl implementation
 ///////////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
 
-BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxPanel )
+BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
     EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
     EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
     EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
@@ -916,7 +922,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ),
                   wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) );
 
-    wxPanel::Create( parent, id, pos, size, wxTAB_TRAVERSAL, name );
+    wxNavigationEnabled<wxControl>::Create( parent, id,
+                                            pos, size,
+                                            wxTAB_TRAVERSAL,
+                                            wxDefaultValidator,
+                                            name );
 
     m_dir = defaultDirectory;
 
diff --git a/Externals/wxWidgets3/src/generic/filedlgg.cpp b/Externals/wxWidgets3/src/generic/filedlgg.cpp
index 390abba9a7..9ec0842c64 100644
--- a/Externals/wxWidgets3/src/generic/filedlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/filedlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/12/98
-// RCS-ID:      $Id: filedlgg.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -49,6 +48,7 @@
 #include "wx/filectrl.h"
 #include "wx/generic/filedlgg.h"
 #include "wx/debug.h"
+#include "wx/modalhook.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -308,6 +308,8 @@ wxBitmapButton* wxGenericFileDialog::AddBitmapButton( wxWindowID winId,
 
 int wxGenericFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     if (CreateExtraControl())
     {
         wxSizer *sizer = GetSizer();
diff --git a/Externals/wxWidgets3/src/generic/filepickerg.cpp b/Externals/wxWidgets3/src/generic/filepickerg.cpp
index 98c7935a7a..225da729d2 100644
--- a/Externals/wxWidgets3/src/generic/filepickerg.cpp
+++ b/Externals/wxWidgets3/src/generic/filepickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: filepickerg.cpp 70732 2012-02-28 02:05:01Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ bool wxGenericFileDirButton::Create(wxWindow *parent,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_BUTTON,
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
@@ -113,46 +112,28 @@ void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
 }
 
 // ----------------------------------------------------------------------------
-// wxGenericFileutton
+// wxGenericFileButton
 // ----------------------------------------------------------------------------
 
-void
-wxGenericFileButton::DoSetInitialDirectory(wxFileDialog* dialog,
-                                           const wxString& dir)
-{
-    if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
-            wxString::npos )
-    {
-        dialog->SetDirectory(dir);
-    }
-}
-
 wxDialog *wxGenericFileButton::CreateDialog()
 {
-    wxFileDialog* const dialog = new wxFileDialog
-                                     (
-                                        GetDialogParent(),
-                                        m_message,
-                                        wxEmptyString,
-                                        wxEmptyString,
-                                        m_wildcard,
-                                        GetDialogStyle()
-                                     );
+    // Determine the initial directory for the dialog: it comes either from the
+    // default path, if it has it, or from the separately specified initial
+    // directory that can be set even if the path is e.g. empty.
+    wxFileName fn(m_path);
+    wxString initialDir = fn.GetPath();
+    if ( initialDir.empty() )
+        initialDir = m_initialDir;
 
-    // If there is no default file or if it doesn't have any path, use the
-    // explicitly set initial directory.
-    //
-    // Notice that it is important to call this before SetPath() below as if we
-    // do have m_initialDir and no directory in m_path, we need to interpret
-    // the path as being relative with respect to m_initialDir.
-    if ( !m_initialDir.empty() )
-        DoSetInitialDirectory(dialog, m_initialDir);
-
-    // This sets both the default file name and the default directory of the
-    // dialog if m_path contains directory part.
-    dialog->SetPath(m_path);
-
-    return dialog;
+    return new wxFileDialog
+               (
+                    GetDialogParent(),
+                    m_message,
+                    initialDir,
+                    fn.GetFullName(),
+                    m_wildcard,
+                    GetDialogStyle()
+               );
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/generic/fontdlgg.cpp b/Externals/wxWidgets3/src/generic/fontdlgg.cpp
index 391f5d57b9..58a7835c96 100644
--- a/Externals/wxWidgets3/src/generic/fontdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/fontdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: fontdlgg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/fontpickerg.cpp b/Externals/wxWidgets3/src/generic/fontpickerg.cpp
index 3d3b13ed6a..62599b7892 100644
--- a/Externals/wxWidgets3/src/generic/fontpickerg.cpp
+++ b/Externals/wxWidgets3/src/generic/fontpickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: fontpickerg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -59,7 +58,7 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_BUTTON,
             wxCommandEventHandler(wxGenericFontButton::OnButtonClick),
             NULL, this);
 
diff --git a/Externals/wxWidgets3/src/generic/fswatcherg.cpp b/Externals/wxWidgets3/src/generic/fswatcherg.cpp
index 3ec7911c34..a188a3095f 100644
--- a/Externals/wxWidgets3/src/generic/fswatcherg.cpp
+++ b/Externals/wxWidgets3/src/generic/fswatcherg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxPollingFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcherg.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/graphicc.cpp b/Externals/wxWidgets3/src/generic/graphicc.cpp
index 68588879ae..c89d338f51 100644
--- a/Externals/wxWidgets3/src/generic/graphicc.cpp
+++ b/Externals/wxWidgets3/src/generic/graphicc.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-03
-// RCS-ID:      $Id: graphicc.cpp 70477 2012-01-29 08:35:45Z PC $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +24,9 @@
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
-#include "wx/cairo.h"
+#include <cairo.h>
+
+bool wxCairoInit();
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
@@ -33,9 +34,7 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/dcprint.h"
-    #ifdef __WXGTK__
-        #include "wx/window.h"
-    #endif
+    #include "wx/window.h"
 #endif
 
 #include "wx/private/graphics.h"
@@ -73,16 +72,18 @@ using namespace std;
 #include <cairo.h>
 #ifdef __WXMSW__
 #include <cairo-win32.h>
+// Notice that the order is important: cairo-win32.h includes windows.h which
+// pollutes the global name space with macros so include our own header which
+// #undefines them after it.
+#include "wx/msw/private.h"
 #endif
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"
+#ifndef __WXGTK3__
 #include "wx/gtk/dc.h"
 #endif
-
-#ifdef __WXMSW__
-#include <cairo-win32.h>
 #endif
 
 #ifdef __WXMAC__
@@ -216,7 +217,44 @@ private:
     cairo_matrix_t m_matrix ;
 } ;
 
-class WXDLLIMPEXP_CORE wxCairoPenData : public wxGraphicsObjectRefData
+// Common base class for pens and brushes.
+class wxCairoPenBrushBaseData : public wxGraphicsObjectRefData
+{
+public:
+    wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer,
+                            const wxColour& col,
+                            bool isTransparent);
+    virtual ~wxCairoPenBrushBaseData();
+
+    virtual void Apply( wxGraphicsContext* context );
+
+protected:
+    // Call this to use the given bitmap as stipple. Bitmap must be non-null
+    // and valid.
+    void InitStipple(wxBitmap* bmp);
+
+    // Call this to use the given hatch style. Hatch style must be valid.
+    void InitHatch(wxHatchStyle hatchStyle);
+
+
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+
+    cairo_pattern_t* m_pattern;
+    class wxCairoBitmapData* m_bmpdata;
+
+private:
+    // Called once to allocate m_pattern if needed.
+    void InitHatchPattern(cairo_t* ctext);
+
+    wxHatchStyle m_hatchStyle;
+
+    wxDECLARE_NO_COPY_CLASS(wxCairoPenBrushBaseData);
+};
+
+class WXDLLIMPEXP_CORE wxCairoPenData : public wxCairoPenBrushBaseData
 {
 public:
     wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
@@ -230,11 +268,6 @@ public:
 private :
     double m_width;
 
-    double m_red;
-    double m_green;
-    double m_blue;
-    double m_alpha;
-
     cairo_line_cap_t m_cap;
     cairo_line_join_t m_join;
 
@@ -242,19 +275,14 @@ private :
     const double *m_lengths;
     double *m_userLengths;
 
-    wxPen m_pen;
-
     wxDECLARE_NO_COPY_CLASS(wxCairoPenData);
 };
 
-class WXDLLIMPEXP_CORE wxCairoBrushData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxCairoBrushData : public wxCairoPenBrushBaseData
 {
 public:
     wxCairoBrushData( wxGraphicsRenderer* renderer );
     wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
-    ~wxCairoBrushData ();
-
-    virtual void Apply( wxGraphicsContext* context );
 
     void CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
                                    wxDouble x2, wxDouble y2,
@@ -268,14 +296,6 @@ protected:
 
     // common part of Create{Linear,Radial}GradientBrush()
     void AddGradientStops(const wxGraphicsGradientStops& stops);
-
-private :
-    double m_red;
-    double m_green;
-    double m_blue;
-    double m_alpha;
-
-    cairo_pattern_t* m_brushPattern;
 };
 
 class wxCairoFontData : public wxGraphicsObjectRefData
@@ -325,7 +345,7 @@ private :
     cairo_font_weight_t m_weight;
 };
 
-class wxCairoBitmapData : public wxGraphicsObjectRefData
+class wxCairoBitmapData : public wxGraphicsBitmapData
 {
 public:
     wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp );
@@ -337,6 +357,7 @@ public:
 
     virtual cairo_surface_t* GetCairoSurface() { return m_surface; }
     virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; }
+    virtual void* GetNativeBitmap() const { return m_surface; }
     virtual wxSize GetSize() { return wxSize(m_width, m_height); }
 
 #if wxUSE_IMAGE
@@ -368,7 +389,7 @@ public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );
     wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc );
 #ifdef __WXGTK__
-    wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
+    wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window );
 #endif
 #ifdef __WXMSW__
     wxCairoContext( wxGraphicsRenderer* renderer, HDC context );
@@ -399,6 +420,7 @@ public:
     virtual void Clip( const wxRegion &region );
 #ifdef __WXMSW__
     cairo_surface_t* m_mswSurface;
+    WindowHDC m_mswWindowHDC;
 #endif
 
     // clips drawings to the rect
@@ -487,6 +509,139 @@ private:
 };
 #endif // wxUSE_IMAGE
 
+// ----------------------------------------------------------------------------
+// wxCairoPenBrushBaseData implementation
+//-----------------------------------------------------------------------------
+
+wxCairoPenBrushBaseData::wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer,
+                                                 const wxColour& col,
+                                                 bool isTransparent)
+    : wxGraphicsObjectRefData(renderer)
+{
+    m_hatchStyle = wxHATCHSTYLE_INVALID;
+    m_pattern = NULL;
+    m_bmpdata = NULL;
+
+    if ( isTransparent )
+    {
+        m_red =
+        m_green =
+        m_blue =
+        m_alpha = 0;
+    }
+    else // non-transparent
+    {
+        m_red = col.Red()/255.0;
+        m_green = col.Green()/255.0;
+        m_blue = col.Blue()/255.0;
+        m_alpha = col.Alpha()/255.0;
+    }
+}
+
+wxCairoPenBrushBaseData::~wxCairoPenBrushBaseData()
+{
+    if (m_bmpdata)
+    {
+        // Deleting the bitmap data also deletes the pattern referenced by
+        // m_pattern, so set it to NULL to avoid deleting it twice.
+        delete m_bmpdata;
+        m_pattern = NULL;
+    }
+    if (m_pattern)
+        cairo_pattern_destroy(m_pattern);
+}
+
+void wxCairoPenBrushBaseData::InitHatchPattern(cairo_t* ctext)
+{
+    cairo_surface_t* const
+        surface = cairo_surface_create_similar(
+                    cairo_get_target(ctext), CAIRO_CONTENT_COLOR_ALPHA, 10, 10
+                );
+
+    cairo_t* const cr = cairo_create(surface);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+    cairo_set_line_width(cr, 1);
+    cairo_set_line_join(cr,CAIRO_LINE_JOIN_MITER);
+
+    switch ( m_hatchStyle )
+    {
+        case wxHATCHSTYLE_CROSS:
+            cairo_move_to(cr, 5, 0);
+            cairo_line_to(cr, 5, 10);
+            cairo_move_to(cr, 0, 5);
+            cairo_line_to(cr, 10, 5);
+            break;
+
+        case wxHATCHSTYLE_BDIAGONAL:
+            cairo_move_to(cr, 0, 10);
+            cairo_line_to(cr, 10, 0);
+            break;
+
+        case wxHATCHSTYLE_FDIAGONAL:
+            cairo_move_to(cr, 0, 0);
+            cairo_line_to(cr, 10, 10);
+            break;
+
+        case wxHATCHSTYLE_CROSSDIAG:
+            cairo_move_to(cr, 0, 0);
+            cairo_line_to(cr, 10, 10);
+            cairo_move_to(cr, 10, 0);
+            cairo_line_to(cr, 0, 10);
+            break;
+
+        case wxHATCHSTYLE_HORIZONTAL:
+            cairo_move_to(cr, 0, 5);
+            cairo_line_to(cr, 10, 5);
+            break;
+
+        case wxHATCHSTYLE_VERTICAL:
+            cairo_move_to(cr, 5, 0);
+            cairo_line_to(cr, 5, 10);
+            break;
+
+        default:
+            wxFAIL_MSG(wxS("Invalid hatch pattern style."));
+    }
+
+    cairo_set_source_rgba(cr, m_red, m_green, m_blue, m_alpha);
+    cairo_stroke(cr);
+
+    cairo_destroy(cr);
+
+    m_pattern = cairo_pattern_create_for_surface(surface);
+    cairo_surface_destroy(surface);
+    cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT);
+}
+
+void wxCairoPenBrushBaseData::InitStipple(wxBitmap* bmp)
+{
+    wxCHECK_RET( bmp && bmp->IsOk(), wxS("Invalid stippled bitmap") );
+
+    m_bmpdata = new wxCairoBitmapData(GetRenderer(), *bmp);
+    m_pattern = m_bmpdata->GetCairoPattern();
+    cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT);
+}
+
+void wxCairoPenBrushBaseData::InitHatch(wxHatchStyle hatchStyle)
+{
+    // We can't create m_pattern right now as we don't have the Cairo context
+    // needed for it, so just remember that we need to do it.
+    m_hatchStyle = hatchStyle;
+}
+
+void wxCairoPenBrushBaseData::Apply( wxGraphicsContext* context )
+{
+    cairo_t* const ctext = (cairo_t*) context->GetNativeContext();
+
+    if ( m_hatchStyle != wxHATCHSTYLE_INVALID && !m_pattern )
+        InitHatchPattern(ctext);
+
+    if ( m_pattern )
+        cairo_set_source(ctext, m_pattern);
+    else
+        cairo_set_source_rgba(ctext, m_red, m_green, m_blue, m_alpha);
+}
+
 //-----------------------------------------------------------------------------
 // wxCairoPenData implementation
 //-----------------------------------------------------------------------------
@@ -505,20 +660,14 @@ void wxCairoPenData::Init()
 }
 
 wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
-: wxGraphicsObjectRefData(renderer)
+    : wxCairoPenBrushBaseData(renderer, pen.GetColour(), pen.IsTransparent())
 {
     Init();
-    m_pen = pen;
-    m_width = m_pen.GetWidth();
+    m_width = pen.GetWidth();
     if (m_width <= 0.0)
         m_width = 0.1;
 
-    m_red = m_pen.GetColour().Red()/255.0;
-    m_green = m_pen.GetColour().Green()/255.0;
-    m_blue = m_pen.GetColour().Blue()/255.0;
-    m_alpha = m_pen.GetColour().Alpha()/255.0;
-
-    switch ( m_pen.GetCap() )
+    switch ( pen.GetCap() )
     {
     case wxCAP_ROUND :
         m_cap = CAIRO_LINE_CAP_ROUND;
@@ -537,7 +686,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         break;
     }
 
-    switch ( m_pen.GetJoin() )
+    switch ( pen.GetJoin() )
     {
     case wxJOIN_BEVEL :
         m_join = CAIRO_LINE_JOIN_BEVEL;
@@ -574,7 +723,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         9.0 , 6.0 , 3.0 , 3.0
     };
 
-    switch ( m_pen.GetStyle() )
+    switch ( pen.GetStyle() )
     {
     case wxPENSTYLE_SOLID :
         break;
@@ -604,7 +753,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
     case wxPENSTYLE_USER_DASH :
         {
             wxDash *wxdashes ;
-            m_count = m_pen.GetDashes( &wxdashes ) ;
+            m_count = pen.GetDashes( &wxdashes ) ;
             if ((wxdashes != NULL) && (m_count > 0))
             {
                 m_userLengths = new double[m_count] ;
@@ -621,54 +770,18 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
             m_lengths = m_userLengths ;
         }
         break;
-    case wxPENSTYLE_STIPPLE :
-        {
-            /*
-            wxBitmap* bmp = pen.GetStipple();
-            if ( bmp && bmp->IsOk() )
-            {
-            wxDELETE( m_penImage );
-            wxDELETE( m_penBrush );
-            m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
-            m_penBrush = new TextureBrush(m_penImage);
-            m_pen->SetBrush( m_penBrush );
-            }
-            */
-        }
-        break;
-    default :
-        if ( m_pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH
-            && m_pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
-        {
-            /*
-            wxDELETE( m_penBrush );
-            HatchStyle style = HatchStyleHorizontal;
-            switch( pen.GetStyle() )
-            {
-            case wxPENSTYLE_BDIAGONAL_HATCH :
-            style = HatchStyleBackwardDiagonal;
-            break ;
-            case wxPENSTYLE_CROSSDIAG_HATCH :
-            style = HatchStyleDiagonalCross;
-            break ;
-            case wxPENSTYLE_FDIAGONAL_HATCH :
-            style = HatchStyleForwardDiagonal;
-            break ;
-            case wxPENSTYLE_CROSS_HATCH :
-            style = HatchStyleCross;
-            break ;
-            case wxPENSTYLE_HORIZONTAL_HATCH :
-            style = HatchStyleHorizontal;
-            break ;
-            case wxPENSTYLE_VERTICAL_HATCH :
-            style = HatchStyleVertical;
-            break ;
 
-            }
-            m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
-            pen.GetColour().Green() , pen.GetColour().Blue() ), Color.Transparent );
-            m_pen->SetBrush( m_penBrush )
-            */
+    case wxPENSTYLE_STIPPLE :
+    case wxPENSTYLE_STIPPLE_MASK :
+    case wxPENSTYLE_STIPPLE_MASK_OPAQUE :
+        InitStipple(pen.GetStipple());
+        break;
+
+    default :
+        if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH
+            && pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
+        {
+            InitHatch(static_cast<wxHatchStyle>(pen.GetStyle()));
         }
         break;
     }
@@ -676,9 +789,10 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 
 void wxCairoPenData::Apply( wxGraphicsContext* context )
 {
+    wxCairoPenBrushBaseData::Apply(context);
+
     cairo_t * ctext = (cairo_t*) context->GetNativeContext();
     cairo_set_line_width(ctext,m_width);
-    cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
     cairo_set_line_cap(ctext,m_cap);
     cairo_set_line_join(ctext,m_join);
     cairo_set_dash(ctext,(double*)m_lengths,m_count,0.0);
@@ -689,83 +803,29 @@ void wxCairoPenData::Apply( wxGraphicsContext* context )
 //-----------------------------------------------------------------------------
 
 wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer )
-  : wxGraphicsObjectRefData( renderer )
+    : wxCairoPenBrushBaseData(renderer, wxColour(), true /* transparent */)
 {
     Init();
 }
 
-wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush )
-  : wxGraphicsObjectRefData(renderer)
+wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer,
+                                    const wxBrush &brush )
+    : wxCairoPenBrushBaseData(renderer, brush.GetColour(), brush.IsTransparent())
 {
     Init();
 
-    m_red = brush.GetColour().Red()/255.0;
-    m_green = brush.GetColour().Green()/255.0;
-    m_blue = brush.GetColour().Blue()/255.0;
-    m_alpha = brush.GetColour().Alpha()/255.0;
-    /*
-    if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID)
+    switch ( brush.GetStyle() )
     {
-    m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
-    brush.GetColour().Green() , brush.GetColour().Blue() ) );
-    }
-    else if ( brush.IsHatch() )
-    {
-    HatchStyle style = HatchStyleHorizontal;
-    switch( brush.GetStyle() )
-    {
-    case wxBRUSHSTYLE_BDIAGONAL_HATCH :
-    style = HatchStyleBackwardDiagonal;
-    break ;
-    case wxBRUSHSTYLE_CROSSDIAG_HATCH :
-    style = HatchStyleDiagonalCross;
-    break ;
-    case wxBRUSHSTYLE_FDIAGONAL_HATCH :
-    style = HatchStyleForwardDiagonal;
-    break ;
-    case wxBRUSHSTYLE_CROSS_HATCH :
-    style = HatchStyleCross;
-    break ;
-    case wxBRUSHSTYLE_HORIZONTAL_HATCH :
-    style = HatchStyleHorizontal;
-    break ;
-    case wxBRUSHSTYLE_VERTICAL_HATCH :
-    style = HatchStyleVertical;
-    break ;
+        case wxBRUSHSTYLE_STIPPLE:
+        case wxBRUSHSTYLE_STIPPLE_MASK:
+        case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
+            InitStipple(brush.GetStipple());
+            break;
 
-    }
-    m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
-    brush.GetColour().Green() , brush.GetColour().Blue() ), Color.Transparent );
-    }
-    else
-    {
-    wxBitmap* bmp = brush.GetStipple();
-    if ( bmp && bmp->IsOk() )
-    {
-    wxDELETE( m_brushImage );
-    m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
-    m_brush = new TextureBrush(m_brushImage);
-    }
-    }
-    */
-}
-
-wxCairoBrushData::~wxCairoBrushData ()
-{
-    if (m_brushPattern)
-        cairo_pattern_destroy(m_brushPattern);
-}
-
-void wxCairoBrushData::Apply( wxGraphicsContext* context )
-{
-    cairo_t * ctext = (cairo_t*) context->GetNativeContext();
-    if ( m_brushPattern )
-    {
-        cairo_set_source(ctext,m_brushPattern);
-    }
-    else
-    {
-        cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
+        default:
+            if ( brush.IsHatch() )
+                InitHatch(static_cast<wxHatchStyle>(brush.GetStyle()));
+            break;
     }
 }
 
@@ -781,7 +841,7 @@ void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops)
 
         cairo_pattern_add_color_stop_rgba
         (
-            m_brushPattern,
+            m_pattern,
             stop.GetPosition(),
             col.Red()/255.0,
             col.Green()/255.0,
@@ -790,7 +850,7 @@ void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops)
         );
     }
 
-    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS,
+    wxASSERT_MSG(cairo_pattern_status(m_pattern) == CAIRO_STATUS_SUCCESS,
                  wxT("Couldn't create cairo pattern"));
 }
 
@@ -799,7 +859,7 @@ wxCairoBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
                                             wxDouble x2, wxDouble y2,
                                             const wxGraphicsGradientStops& stops)
 {
-    m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
+    m_pattern = cairo_pattern_create_linear(x1,y1,x2,y2);
 
     AddGradientStops(stops);
 }
@@ -810,14 +870,15 @@ wxCairoBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
                                             wxDouble radius,
                                             const wxGraphicsGradientStops& stops)
 {
-    m_brushPattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
+    m_pattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
 
     AddGradientStops(stops);
 }
 
 void wxCairoBrushData::Init()
 {
-    m_brushPattern = NULL;
+    m_pattern = NULL;
+    m_bmpdata = NULL;
 }
 
 //-----------------------------------------------------------------------------
@@ -1249,13 +1310,13 @@ void wxCairoBitmapData::InitSurface(cairo_format_t format, int stride)
 }
 
 wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) :
-    wxGraphicsObjectRefData( renderer )
+    wxGraphicsBitmapData( renderer )
 {
     m_surface = bitmap;
     m_pattern = cairo_pattern_create_for_surface(m_surface);
 }
 
-wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsObjectRefData( renderer )
+wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer )
 {
     wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap"));
 
@@ -1264,7 +1325,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
     // image has alpha (or a mask represented as alpha) then we'll use a
     // different format and iterator than if it doesn't...
     cairo_format_t bufferFormat = bmp.GetDepth() == 32
-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXGTK3__)
                                             || bmp.GetMask()
 #endif
                                         ? CAIRO_FORMAT_ARGB32
@@ -1337,12 +1398,12 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
             p.OffsetY(pixData, 1);
         }
     }
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXGTK3__)
     // if there is a mask, set the alpha bytes in the target buffer to 
     // fully transparent or fully opaque
     if (bmpSource.GetMask())
     {
-        wxBitmap bmpMask = bmpSource.GetMaskBitmap();
+        wxBitmap bmpMask = bmpSource.GetMask()->GetBitmap();
         bufferFormat = CAIRO_FORMAT_ARGB32;
         data = (wxUint32*)m_buffer;
         wxNativePixelData
@@ -1395,7 +1456,7 @@ inline unsigned char Unpremultiply(unsigned char alpha, unsigned char data)
 
 wxCairoBitmapData::wxCairoBitmapData(wxGraphicsRenderer* renderer,
                                      const wxImage& image)
-    : wxGraphicsObjectRefData(renderer)
+    : wxGraphicsBitmapData(renderer)
 {
     const cairo_format_t bufferFormat = image.HasAlpha()
                                             ? CAIRO_FORMAT_ARGB32
@@ -1593,7 +1654,9 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
 
 #ifdef __WXGTK20__
     const wxDCImpl *impl = dc.GetImpl();
-    Init( (cairo_t*) impl->GetCairoContext() );
+    cairo_t* cr = static_cast<cairo_t*>(impl->GetCairoContext());
+    if (cr)
+        Init(cairo_reference(cr));
 #endif
     wxSize sz = dc.GetSize();
     m_width = sz.x;
@@ -1636,7 +1699,11 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
     Init( cairo_create(m_mswSurface) );
 #endif
 
-#ifdef __WXGTK20__
+#ifdef __WXGTK3__
+    cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
+    if (cr)
+        Init(cairo_reference(cr));
+#elif defined __WXGTK20__
     wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
     Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
 
@@ -1676,11 +1743,42 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
     m_enableOffset = true;
 
 #ifdef __WXMSW__
-    m_mswSurface = cairo_win32_surface_create((HDC)dc.GetHDC());
+
+    HDC hdc = (HDC)dc.GetHDC();
+
+    HBITMAP bitmap = (HBITMAP)GetCurrentObject(hdc, OBJ_BITMAP);
+
+    BITMAP info;
+    bool hasBitmap = false;
+
+    // cairo_win32_surface_create creates a 24-bit bitmap,
+    // so if we have alpha, we need to create a 32-bit surface instead.
+    if (!GetObject(bitmap, sizeof(info), &info) || info.bmBitsPixel < 32)
+        m_mswSurface = cairo_win32_surface_create(hdc);
+    else {
+        hasBitmap = true;
+        m_mswSurface = cairo_image_surface_create_for_data((unsigned char*)info.bmBits,
+                                               CAIRO_FORMAT_ARGB32,
+                                               info.bmWidth,
+                                               info.bmHeight,
+                                               info.bmWidthBytes);
+    }
+
     Init( cairo_create(m_mswSurface) );
+    // If we've created a image surface, we need to flip the Y axis so that 
+    // all drawing will appear right side up.
+    if (hasBitmap) {
+        cairo_matrix_t matrix;
+        cairo_matrix_init(&matrix, 1.0, 0.0, 0.0, -1.0, 0.0, height);
+        cairo_set_matrix(m_context, &matrix);
+    }
 #endif
     
-#ifdef __WXGTK20__
+#ifdef __WXGTK3__
+    cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
+    if (cr)
+        Init(cairo_reference(cr));
+#elif defined __WXGTK20__
     wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
     Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
 
@@ -1710,15 +1808,20 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
 }
 
 #ifdef __WXGTK20__
-wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window )
 : wxGraphicsContext(renderer)
 {
-    Init( gdk_cairo_create( drawable ) );
+    Init( gdk_cairo_create( window ) );
 
+#ifdef __WXGTK3__
+    m_width = gdk_window_get_width(window);
+    m_height = gdk_window_get_height(window);
+#else
     int width, height;
-    gdk_drawable_get_size( drawable, &width, &height );
+    gdk_drawable_get_size(window, &width, &height);
     m_width = width;
     m_height = height;
+#endif
 }
 #endif
 
@@ -1743,7 +1846,10 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context )
 }
 
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
-: wxGraphicsContext(renderer)
+    : wxGraphicsContext(renderer)
+#ifdef __WXMSW__
+    , m_mswWindowHDC(GetHwndOf(window))
+#endif
 {
     m_enableOffset = true;    
 #ifdef __WXGTK__
@@ -1767,7 +1873,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
 #endif
 
 #ifdef __WXMSW__
-    m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle());
+    m_mswSurface = cairo_win32_surface_create((HDC)m_mswWindowHDC);
     Init(cairo_create(m_mswSurface));
 #endif
 
@@ -2082,14 +2188,33 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
 void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
 {
     widths.Empty();
-    widths.Add(0, text.length());
-
     wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetPartialTextExtents - no valid font set") );
-
-    if (text.empty())
-        return;
-
+#ifdef __WXGTK__
+    const wxCharBuffer data = text.utf8_str();
+    int w = 0;
+    if (data.length())
+    {
+        PangoLayout* layout = pango_cairo_create_layout(m_context);
+        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
+        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
+        pango_layout_set_text(layout, data, data.length());
+        PangoLayoutIter* iter = pango_layout_get_iter(layout);
+        PangoRectangle rect;
+        do {
+            pango_layout_iter_get_cluster_extents(iter, NULL, &rect);
+            w += rect.width;
+            widths.Add(PANGO_PIXELS(w));
+        } while (pango_layout_iter_next_cluster(iter));
+        pango_layout_iter_free(iter);
+        g_object_unref(layout);
+    }
+    size_t i = widths.GetCount();
+    const size_t len = text.length();
+    while (i++ < len)
+        widths.Add(PANGO_PIXELS(w));
+#else
     // TODO
+#endif
 }
 
 void * wxCairoContext::GetNativeContext()
@@ -2272,13 +2397,6 @@ public :
     // create a subimage from a native image representation
     virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  );
 
-protected :
-    bool EnsureIsLoaded();
-    void Load();
-    void Unload();
-    friend class wxCairoModule;
-private :
-    int m_loaded;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;
 
@@ -2289,34 +2407,14 @@ private :
 IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
 
 static wxCairoRenderer gs_cairoGraphicsRenderer;
-// temporary hack to allow creating a cairo context on any platform
-extern wxGraphicsRenderer* gCairoRenderer;
-wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer;
 
-bool wxCairoRenderer::EnsureIsLoaded()
-{
-#ifndef __WXGTK__
-    Load();
-    return wxCairoInit();
+#ifdef __WXGTK__
+    #define ENSURE_LOADED_OR_RETURN(returnOnFail)
 #else
-    return true;
+    #define ENSURE_LOADED_OR_RETURN(returnOnFail)  \
+        if (!wxCairoInit())                        \
+            return returnOnFail
 #endif
-}
-
-void wxCairoRenderer::Load()
-{
-    wxCairoInit();
-}
-
-void wxCairoRenderer::Unload()
-{
-    wxCairoCleanUp();
-}
-
-// call EnsureIsLoaded() and return returnOnFail value if it fails
-#define ENSURE_LOADED_OR_RETURN(returnOnFail)  \
-    if ( !EnsureIsLoaded() )                   \
-        return (returnOnFail)
 
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc)
 {
@@ -2340,7 +2438,6 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
 #if wxUSE_ENH_METAFILE
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxEnhMetaFileDC& WXUNUSED(dc) )
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
     return NULL;
 }
 #endif
@@ -2359,9 +2456,8 @@ wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * cont
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * window )
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
 #ifdef __WXGTK__
-    return new wxCairoContext(this,(GdkDrawable*)window);
+    return new wxCairoContext(this, static_cast<GdkWindow*>(window));
 #else
     wxUnusedVar(window);
     return NULL;
@@ -2371,18 +2467,19 @@ wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * windo
 #if wxUSE_IMAGE
 wxGraphicsContext * wxCairoRenderer::CreateContextFromImage(wxImage& image)
 {
+    ENSURE_LOADED_OR_RETURN(NULL);
     return new wxCairoImageContext(this, image);
 }
 #endif // wxUSE_IMAGE
 
 wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext()
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
 #ifdef __WXGTK__
     return CreateContextFromNativeWindow(gdk_get_default_root_window());
-#endif
+#else
     return NULL;
     // TODO
+#endif
 }
 
 wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
@@ -2395,8 +2492,8 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
 
 wxGraphicsPath wxCairoRenderer::CreatePath()
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath);
     wxGraphicsPath path;
+    ENSURE_LOADED_OR_RETURN(path);
     path.SetRefData( new wxCairoPathData(this) );
     return path;
 }
@@ -2408,8 +2505,8 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble
                                                 wxDouble tx, wxDouble ty)
 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsMatrix);
     wxGraphicsMatrix m;
+    ENSURE_LOADED_OR_RETURN(m);
     wxCairoMatrixData* data = new wxCairoMatrixData( this );
     data->Set( a,b,c,d,tx,ty ) ;
     m.SetRefData(data);
@@ -2418,28 +2515,24 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble
 
 wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen);
-    if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
-        return wxNullGraphicsPen;
-    else
+    wxGraphicsPen p;
+    ENSURE_LOADED_OR_RETURN(p);
+    if (pen.IsOk() && pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
     {
-        wxGraphicsPen p;
         p.SetRefData(new wxCairoPenData( this, pen ));
-        return p;
     }
+    return p;
 }
 
 wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
-    if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
-        return wxNullGraphicsBrush;
-    else
+    wxGraphicsBrush p;
+    ENSURE_LOADED_OR_RETURN(p);
+    if (brush.IsOk() && brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
     {
-        wxGraphicsBrush p;
         p.SetRefData(new wxCairoBrushData( this, brush ));
-        return p;
     }
+    return p;
 }
 
 wxGraphicsBrush
@@ -2447,8 +2540,8 @@ wxCairoRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
                                            wxDouble x2, wxDouble y2,
                                            const wxGraphicsGradientStops& stops)
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
+    ENSURE_LOADED_OR_RETURN(p);
     wxCairoBrushData* d = new wxCairoBrushData( this );
     d->CreateLinearGradientBrush(x1, y1, x2, y2, stops);
     p.SetRefData(d);
@@ -2460,8 +2553,8 @@ wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
                                            wxDouble xc, wxDouble yc, wxDouble r,
                                            const wxGraphicsGradientStops& stops)
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
+    ENSURE_LOADED_OR_RETURN(p);
     wxCairoBrushData* d = new wxCairoBrushData( this );
     d->CreateRadialGradientBrush(xo, yo, xc, yc, r, stops);
     p.SetRefData(d);
@@ -2470,15 +2563,13 @@ wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
 
 wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
+    wxGraphicsFont p;
+    ENSURE_LOADED_OR_RETURN(p);
     if ( font.IsOk() )
     {
-        wxGraphicsFont p;
         p.SetRefData(new wxCairoFontData( this , font, col ));
-        return p;
     }
-    else
-        return wxNullGraphicsFont;
+    return p;
 }
 
 wxGraphicsFont
@@ -2487,24 +2578,21 @@ wxCairoRenderer::CreateFont(double sizeInPixels,
                             int flags,
                             const wxColour& col)
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
-
     wxGraphicsFont font;
+    ENSURE_LOADED_OR_RETURN(font);
     font.SetRefData(new wxCairoFontData(this, sizeInPixels, facename, flags, col));
     return font;
 }
 
 wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
+    wxGraphicsBitmap p;
+    ENSURE_LOADED_OR_RETURN(p);
     if ( bmp.IsOk() )
     {
-        wxGraphicsBitmap p;
         p.SetRefData(new wxCairoBitmapData( this , bmp ));
-        return p;
     }
-    else
-        return wxNullGraphicsBitmap;
+    return p;
 }
 
 #if wxUSE_IMAGE
@@ -2525,12 +2613,15 @@ wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromImage(const wxImage& image)
 
 wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
 {
-    ENSURE_LOADED_OR_RETURN(wxNullImage);
+    wxImage image;
+    ENSURE_LOADED_OR_RETURN(image);
 
     const wxCairoBitmapData* const
         data = static_cast<wxCairoBitmapData*>(bmp.GetGraphicsData());
+    if (data)
+        image = data->ConvertToImage();
 
-    return data ? data->ConvertToImage() : wxNullImage;
+    return image;
 }
 
 #endif // wxUSE_IMAGE
@@ -2538,15 +2629,13 @@ wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
 
 wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
+    wxGraphicsBitmap p;
+    ENSURE_LOADED_OR_RETURN(p);
     if ( bitmap != NULL )
     {
-        wxGraphicsBitmap p;
         p.SetRefData(new wxCairoBitmapData( this , (cairo_surface_t*) bitmap ));
-        return p;
     }
-    else
-        return wxNullGraphicsBitmap;
+    return p;
 }
 
 wxGraphicsBitmap
@@ -2556,9 +2645,9 @@ wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap),
                                  wxDouble WXUNUSED(w),
                                  wxDouble WXUNUSED(h))
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
+    wxGraphicsBitmap p;
     wxFAIL_MSG("wxCairoRenderer::CreateSubBitmap is not implemented.");
-    return wxNullGraphicsBitmap;
+    return p;
 }
 
 wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
diff --git a/Externals/wxWidgets3/src/generic/grid.cpp b/Externals/wxWidgets3/src/generic/grid.cpp
index 0fb00db063..31f9297c63 100644
--- a/Externals/wxWidgets3/src/generic/grid.cpp
+++ b/Externals/wxWidgets3/src/generic/grid.cpp
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grid.cpp 70826 2012-03-06 13:18:22Z SC $
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,7 +71,7 @@ const char wxGridNameStr[] = "grid";
 // Required for wxIs... functions
 #include <ctype.h>
 
-WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, ::wxIntegerHash, ::wxIntegerEqual,
+WX_DECLARE_HASH_SET_WITH_DECL_PTR(int, wxIntegerHash, wxIntegerEqual,
                                   wxGridFixedIndicesSet, class WXDLLIMPEXP_ADV);
 
 
@@ -146,6 +145,7 @@ wxDEFINE_EVENT( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_LABEL_RIGHT_DCLICK, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_ROW_SIZE, wxGridSizeEvent );
 wxDEFINE_EVENT( wxEVT_GRID_COL_SIZE, wxGridSizeEvent );
+wxDEFINE_EVENT( wxEVT_GRID_COL_AUTO_SIZE, wxGridSizeEvent );
 wxDEFINE_EVENT( wxEVT_GRID_COL_MOVE, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_COL_SORT, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_RANGE_SELECT, wxGridRangeSelectEvent );
@@ -155,6 +155,7 @@ wxDEFINE_EVENT( wxEVT_GRID_SELECT_CELL, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_EDITOR_SHOWN, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_EDITOR_HIDDEN, wxGridEvent );
 wxDEFINE_EVENT( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEvent );
+wxDEFINE_EVENT( wxEVT_GRID_TABBING, wxGridEvent );
 
 // ----------------------------------------------------------------------------
 // private helpers
@@ -1535,7 +1536,8 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         // the label of the first column had been set it would have only one
         // element and not numCols, so account for it
         int numRemaining = m_colLabels.size() - colID;
-        m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) );
+        if (numRemaining > 0)
+            m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) );
     }
 
     if ( numCols >= curNumCols )
@@ -1775,6 +1777,300 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     m_owner->DrawHighlight( dc, dirtyCells );
 }
 
+void wxGrid::Render( wxDC& dc,
+                     const wxPoint& position,
+                     const wxSize& size,
+                     const wxGridCellCoords& topLeft,
+                     const wxGridCellCoords& bottomRight,
+                     int style )
+{
+    wxCHECK_RET( bottomRight.GetCol() < GetNumberCols(),
+                 "Invalid right column" );
+    wxCHECK_RET( bottomRight.GetRow() < GetNumberRows(),
+                 "Invalid bottom row" );
+
+    // store user settings and reset later
+
+    // remove grid selection, don't paint selection colour
+    // unless we have wxGRID_DRAW_SELECTION
+    // block selections are the only ones catered for here
+    wxGridCellCoordsArray selectedCells;
+    bool hasSelection = IsSelection();
+    if ( hasSelection && !( style & wxGRID_DRAW_SELECTION ) )
+    {
+        selectedCells = GetSelectionBlockTopLeft();
+        // non block selections may not have a bottom right
+        if ( GetSelectionBlockBottomRight().size() )
+            selectedCells.Add( GetSelectionBlockBottomRight()[ 0 ] );
+
+        ClearSelection();
+    }
+
+    // store user device origin
+    wxCoord userOriginX, userOriginY;
+    dc.GetDeviceOrigin( &userOriginX, &userOriginY );
+
+    // store user scale
+    double scaleUserX, scaleUserY;
+    dc.GetUserScale( &scaleUserX, &scaleUserY );
+
+    // set defaults if necessary
+    wxGridCellCoords leftTop( topLeft ), rightBottom( bottomRight );
+    if ( leftTop.GetCol() < 0 )
+        leftTop.SetCol(0);
+    if ( leftTop.GetRow() < 0 )
+        leftTop.SetRow(0);
+    if ( rightBottom.GetCol() < 0 )
+        rightBottom.SetCol(GetNumberCols() - 1);
+    if ( rightBottom.GetRow() < 0 )
+        rightBottom.SetRow(GetNumberRows() - 1);
+
+    // get grid offset, size and cell parameters
+    wxPoint pointOffSet;
+    wxSize sizeGrid;
+    wxGridCellCoordsArray renderCells;
+    wxArrayInt arrayCols;
+    wxArrayInt arrayRows;
+
+    GetRenderSizes( leftTop, rightBottom,
+                    pointOffSet, sizeGrid,
+                    renderCells,
+                    arrayCols, arrayRows );
+
+    // add headers/labels to dimensions
+    if ( style & wxGRID_DRAW_ROWS_HEADER )
+        sizeGrid.x += GetRowLabelSize();
+    if ( style & wxGRID_DRAW_COLS_HEADER )
+        sizeGrid.y += GetColLabelSize();
+
+    // get render start position in logical units
+    wxPoint positionRender = GetRenderPosition( dc, position );
+
+    wxCoord originX = dc.LogicalToDeviceX( positionRender.x );
+    wxCoord originY = dc.LogicalToDeviceY( positionRender.y );
+
+    dc.SetDeviceOrigin( originX, originY );
+
+    SetRenderScale( dc, positionRender, size, sizeGrid );
+
+    // draw row headers at specified origin
+    if ( GetRowLabelSize() > 0 && ( style & wxGRID_DRAW_ROWS_HEADER ) )
+    {
+        if ( style & wxGRID_DRAW_COLS_HEADER )
+        {
+            DrawCornerLabel( dc ); // do only if both col and row labels drawn
+            originY += dc.LogicalToDeviceYRel( GetColLabelSize() );
+        }
+
+        originY -= dc.LogicalToDeviceYRel( pointOffSet.y );
+        dc.SetDeviceOrigin( originX, originY );
+
+        DrawRowLabels( dc, arrayRows );
+
+        // reset for columns
+        if ( style & wxGRID_DRAW_COLS_HEADER )
+            originY -= dc.LogicalToDeviceYRel( GetColLabelSize() );
+
+        originY += dc.LogicalToDeviceYRel( pointOffSet.y );
+        // X offset so we don't overwrite row labels
+        originX += dc.LogicalToDeviceXRel( GetRowLabelSize() );
+    }
+
+    // subtract col offset where startcol > 0
+    originX -= dc.LogicalToDeviceXRel( pointOffSet.x );
+    // no y offset for col labels, they are at the Y origin
+
+    // draw column labels
+    if ( style & wxGRID_DRAW_COLS_HEADER )
+    {
+        dc.SetDeviceOrigin( originX, originY );
+        DrawColLabels( dc, arrayCols );
+        // don't overwrite the labels, increment originY
+        originY += dc.LogicalToDeviceYRel( GetColLabelSize() );
+    }
+
+    // set device origin to draw grid cells and lines
+    originY -= dc.LogicalToDeviceYRel( pointOffSet.y );
+    dc.SetDeviceOrigin( originX, originY );
+
+    // draw cell area background
+    dc.SetBrush( GetDefaultCellBackgroundColour() );
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    // subtract headers from grid area dimensions
+    wxSize sizeCells( sizeGrid );
+    if ( style & wxGRID_DRAW_ROWS_HEADER )
+        sizeCells.x -= GetRowLabelSize();
+    if ( style & wxGRID_DRAW_COLS_HEADER )
+        sizeCells.y -= GetColLabelSize();
+
+    dc.DrawRectangle( pointOffSet, sizeCells );
+
+    // draw cells
+    DrawGridCellArea( dc, renderCells );
+
+    // draw grid lines
+    if ( style & wxGRID_DRAW_CELL_LINES )
+    {
+        wxRegion regionClip( pointOffSet.x, pointOffSet.y,
+                             sizeCells.x, sizeCells.y );
+
+        DrawRangeGridLines(dc, regionClip, renderCells[0], renderCells.Last());
+    }
+
+    // draw render rectangle bounding lines
+    DoRenderBox( dc, style,
+                 pointOffSet, sizeCells,
+                 leftTop, rightBottom );
+
+    // restore user setings
+    dc.SetDeviceOrigin( userOriginX, userOriginY );
+    dc.SetUserScale( scaleUserX, scaleUserY );
+
+    if ( selectedCells.size() && !( style & wxGRID_DRAW_SELECTION ) )
+    {
+        SelectBlock( selectedCells[ 0 ].GetRow(),
+                     selectedCells[ 0 ].GetCol(),
+                     selectedCells[ selectedCells.size() -1 ].GetRow(),
+                     selectedCells[ selectedCells.size() -1 ].GetCol() );
+    }
+}
+
+void
+wxGrid::SetRenderScale(wxDC& dc,
+                       const wxPoint& pos, const wxSize& size,
+                       const wxSize& sizeGrid )
+{
+    double scaleX, scaleY;
+    wxSize sizeTemp;
+
+    if ( size.GetWidth() != wxDefaultSize.GetWidth() ) // size.x was specified
+        sizeTemp.SetWidth( size.GetWidth() );
+    else
+        sizeTemp.SetWidth( dc.DeviceToLogicalXRel( dc.GetSize().GetWidth() )
+                           - pos.x );
+
+    if ( size.GetHeight() != wxDefaultSize.GetHeight() ) // size.y was specified
+        sizeTemp.SetHeight( size.GetHeight() );
+    else
+        sizeTemp.SetHeight( dc.DeviceToLogicalYRel( dc.GetSize().GetHeight() )
+                            - pos.y );
+
+    scaleX = (double)( (double) sizeTemp.GetWidth() / (double) sizeGrid.GetWidth() );
+    scaleY = (double)( (double) sizeTemp.GetHeight() / (double) sizeGrid.GetHeight() );
+
+    dc.SetUserScale( wxMin( scaleX, scaleY), wxMin( scaleX, scaleY ) );
+}
+
+// get grid rendered size, origin offset and fill cell arrays
+void wxGrid::GetRenderSizes( const wxGridCellCoords& topLeft,
+                             const wxGridCellCoords& bottomRight,
+                             wxPoint& pointOffSet, wxSize& sizeGrid,
+                             wxGridCellCoordsArray& renderCells,
+                             wxArrayInt& arrayCols, wxArrayInt& arrayRows )
+{
+    pointOffSet.x = 0;
+    pointOffSet.y = 0;
+    sizeGrid.SetWidth( 0 );
+    sizeGrid.SetHeight( 0 );
+
+    int col, row;
+
+    wxGridSizesInfo sizeinfo = GetColSizes();
+    for ( col = 0; col <= bottomRight.GetCol(); col++ )
+    {
+        if ( col < topLeft.GetCol() )
+        {
+            pointOffSet.x += sizeinfo.GetSize( col );
+        }
+        else
+        {
+            for ( row = topLeft.GetRow(); row <= bottomRight.GetRow(); row++ )
+            {
+                renderCells.Add( wxGridCellCoords( row, col ));
+                arrayRows.Add( row ); // column labels rendered in DrawColLabels
+            }
+            arrayCols.Add( col ); // row labels rendered in DrawRowLabels
+            sizeGrid.x += sizeinfo.GetSize( col );
+        }
+    }
+
+    sizeinfo = GetRowSizes();
+    for ( row = 0; row <= bottomRight.GetRow(); row++ )
+    {
+        if ( row < topLeft.GetRow() )
+            pointOffSet.y += sizeinfo.GetSize( row );
+        else
+            sizeGrid.y += sizeinfo.GetSize( row );
+    }
+}
+
+// get render start position
+// if position not specified use dc draw extents MaxX and MaxY
+wxPoint wxGrid::GetRenderPosition( wxDC& dc, const wxPoint& position )
+{
+    wxPoint positionRender( position );
+
+    if ( !positionRender.IsFullySpecified() )
+    {
+        if ( positionRender.x == wxDefaultPosition.x )
+            positionRender.x = dc.MaxX();
+
+        if ( positionRender.y == wxDefaultPosition.y )
+            positionRender.y = dc.MaxY();
+    }
+
+    return positionRender;
+}
+
+// draw render rectangle bounding lines
+// useful where there is multi cell row or col clipping and no cell border
+void wxGrid::DoRenderBox( wxDC& dc, const int& style,
+                          const wxPoint& pointOffSet,
+                          const wxSize& sizeCells,
+                          const wxGridCellCoords& topLeft,
+                          const wxGridCellCoords& bottomRight )
+{
+    if ( !( style & wxGRID_DRAW_BOX_RECT ) )
+        return;
+
+    int bottom = pointOffSet.y + sizeCells.GetY(),
+        right = pointOffSet.x + sizeCells.GetX() - 1;
+
+    // horiz top line if we are not drawing column header/labels
+    if ( !( style & wxGRID_DRAW_COLS_HEADER ) )
+    {
+        int left = pointOffSet.x;
+        left += ( style & wxGRID_DRAW_COLS_HEADER )
+                     ? - GetRowLabelSize() : 0;
+        dc.SetPen( GetRowGridLinePen( topLeft.GetRow() ) );
+        dc.DrawLine( left,
+                     pointOffSet.y,
+                     right,
+                     pointOffSet.y );
+    }
+
+    // horiz bottom line
+    dc.SetPen( GetRowGridLinePen( bottomRight.GetRow() ) );
+    dc.DrawLine( pointOffSet.x, bottom - 1, right, bottom - 1 );
+
+    // left vertical line if we are not drawing row header/labels
+    if ( !( style & wxGRID_DRAW_ROWS_HEADER ) )
+    {
+        int top = pointOffSet.y;
+        top += ( style & wxGRID_DRAW_COLS_HEADER )
+                     ? - GetColLabelSize() : 0;
+        dc.SetPen( GetColGridLinePen( topLeft.GetCol() ) );
+        dc.DrawLine( pointOffSet.x -1,
+                     top,
+                     pointOffSet.x - 1,
+                     bottom - 1 );
+    }
+
+    // right vertical line
+    dc.SetPen( GetColGridLinePen( bottomRight.GetCol() ) );
+    dc.DrawLine( right, pointOffSet.y, right, bottom - 1 );
+}
+
 void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
 {
     wxWindow::ScrollWindow( dx, dy, rect );
@@ -1862,6 +2158,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_KEY_UP( wxGrid::OnKeyUp )
     EVT_CHAR ( wxGrid::OnChar )
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
+    EVT_COMMAND(wxID_ANY, wxEVT_GRID_HIDE_EDITOR, wxGrid::OnHideEditor )
 END_EVENT_TABLE()
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,
@@ -2118,6 +2415,8 @@ wxGrid::SetTable(wxGridTableBase *table,
         m_created = true;
     }
 
+    InvalidateBestSize();
+
     return m_created;
 }
 
@@ -2219,6 +2518,8 @@ void wxGrid::Init()
     // now anyhow, so just set the parameters directly
     m_xScrollPixelsPerLine = GRID_SCROLL_LINE_X;
     m_yScrollPixelsPerLine = GRID_SCROLL_LINE_Y;
+
+    m_tabBehaviour = Tab_Stop;
 }
 
 // ----------------------------------------------------------------------------
@@ -2269,13 +2570,19 @@ void wxGrid::InitColWidths()
 
 int wxGrid::GetColWidth(int col) const
 {
-    return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col];
+    if ( m_colWidths.IsEmpty() )
+        return m_defaultColWidth;
+
+    // a negative width indicates a hidden column
+    return m_colWidths[col] > 0 ? m_colWidths[col] : 0;
 }
 
 int wxGrid::GetColLeft(int col) const
 {
-    return m_colRights.IsEmpty() ? GetColPos( col ) * m_defaultColWidth
-                                 : m_colRights[col] - m_colWidths[col];
+    if ( m_colRights.IsEmpty() )
+        return GetColPos( col ) * m_defaultColWidth;
+
+    return m_colRights[col] - GetColWidth(col);
 }
 
 int wxGrid::GetColRight(int col) const
@@ -2286,13 +2593,20 @@ int wxGrid::GetColRight(int col) const
 
 int wxGrid::GetRowHeight(int row) const
 {
-    return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row];
+    // no custom heights / hidden rows
+    if ( m_rowHeights.IsEmpty() )
+        return m_defaultRowHeight;
+
+    // a negative height indicates a hidden row
+    return m_rowHeights[row] > 0 ? m_rowHeights[row] : 0;
 }
 
 int wxGrid::GetRowTop(int row) const
 {
-    return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight
-                                  : m_rowBottoms[row] - m_rowHeights[row];
+    if ( m_rowBottoms.IsEmpty() )
+        return row * m_defaultRowHeight;
+
+    return m_rowBottoms[row] - GetRowHeight(row);
 }
 
 int wxGrid::GetRowBottom(int row) const
@@ -2569,7 +2883,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             if ( !m_colAt.IsEmpty() )
             {
                 //Shift the column IDs
-                int i;
                 for ( i = 0; i < m_numCols - numCols; i++ )
                 {
                     if ( m_colAt[i] >= (int)pos )
@@ -2631,15 +2944,12 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt();
             int oldNumCols = m_numCols;
             m_numCols += numCols;
-            if ( m_useNativeHeader )
-                GetGridColHeader()->SetColumnCount(m_numCols);
 
             if ( !m_colAt.IsEmpty() )
             {
                 m_colAt.Add( 0, numCols );
 
                 //Set the new columns' positions
-                int i;
                 for ( i = oldNumCols; i < m_numCols; i++ )
                 {
                     m_colAt[i] = i;
@@ -2665,6 +2975,12 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
                 }
             }
 
+            // Notice that this must be called after updating m_colWidths above
+            // as the native grid control will check whether the new columns
+            // are shown which results in accessing m_colWidths array.
+            if ( m_useNativeHeader )
+                GetGridColHeader()->SetColumnCount(m_numCols);
+
             if ( m_currentCellCoords == wxGridNoCellCoords )
             {
                 // if we have just inserted cols into an empty grid the current
@@ -2759,6 +3075,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
         break;
     }
 
+    InvalidateBestSize();
+
     if (result && !GetBatchCount() )
         m_gridWin->Refresh();
 
@@ -2872,16 +3190,20 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
 
 wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
 {
-    wxRegionIterator iter( reg );
     wxRect r;
 
     wxGridCellCoordsArray  cellsExposed;
 
     int left, top, right, bottom;
-    while ( iter )
+    for ( wxRegionIterator iter(reg); iter; ++iter )
     {
         r = iter.GetRect();
 
+        // Skip 0-height cells, they're invisible anyhow, don't waste time
+        // getting their rectangles and so on.
+        if ( !r.GetHeight() )
+            continue;
+
         // TODO: remove this when we can...
         // There is a bug in wxMotif that gives garbage update
         // rectangles if you jump-scroll a long way by clicking the
@@ -2929,8 +3251,6 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
             for ( size_t n = 0; n < count; n++ )
                 cellsExposed.Add(wxGridCellCoords(row, cols[n]));
         }
-
-        ++iter;
     }
 
     return cellsExposed;
@@ -2946,10 +3266,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
     if ( event.Dragging() )
     {
         if (!m_isDragging)
-        {
             m_isDragging = true;
-            m_rowLabelWin->CaptureMouse();
-        }
 
         if ( event.LeftIsDown() )
         {
@@ -2999,11 +3316,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
         return;
 
     if (m_isDragging)
-    {
-        if (m_rowLabelWin->HasCapture())
-            m_rowLabelWin->ReleaseMouse();
         m_isDragging = false;
-    }
 
     // ------------ Entering or leaving the window
     //
@@ -3221,9 +3534,8 @@ void wxGrid::DoUpdateResizeColWidth(int w)
 
 void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
 {
-    int x, y;
-    wxPoint pos( event.GetPosition() );
-    CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+    int x;
+    CalcUnscrolledPosition( event.GetPosition().x, 0, &x, NULL );
 
     int col = XToCol(x);
     if ( event.Dragging() )
@@ -3231,7 +3543,6 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         if (!m_isDragging)
         {
             m_isDragging = true;
-            GetColLabelWindow()->CaptureMouse();
 
             if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
                 DoStartMoveCol(col);
@@ -3322,11 +3633,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         return;
 
     if (m_isDragging)
-    {
-        if (GetColLabelWindow()->HasCapture())
-            GetColLabelWindow()->ReleaseMouse();
         m_isDragging = false;
-    }
 
     // ------------ Entering or leaving the window
     //
@@ -3339,14 +3646,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
     //
     else if ( event.LeftDown() )
     {
-        int col = XToEdgeOfCol(x);
-        if ( col != wxNOT_FOUND && CanDragColSize(col) )
+        int colEdge = XToEdgeOfCol(x);
+        if ( colEdge != wxNOT_FOUND && CanDragColSize(colEdge) )
         {
             ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow());
         }
         else // not a request to start resizing
         {
-            col = XToCol(x);
             if ( col >= 0 &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
@@ -3407,7 +3713,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             // adjust column width depending on label text
             //
             // TODO: generate RESIZING event, see #10754
-            AutoSizeColLabelSize( colEdge );
+            if ( !SendGridSizeEvent(wxEVT_GRID_COL_AUTO_SIZE, -1, colEdge, event) )
+                AutoSizeColLabelSize( colEdge );
 
             SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, colEdge, event);
 
@@ -4105,14 +4412,14 @@ bool wxGrid::DoEndDragResizeLine(const wxGridOperations& oper)
             oper.SelectSize(rect) = oper.Select(size);
 
             int subtractLines = 0;
-            const int lineStart = doper.PosToLine(this, posLineStart);
-            if ( lineStart >= 0 )
+            int line = doper.PosToLine(this, posLineStart);
+            if ( line >= 0 )
             {
                 // ensure that if we have a multi-cell block we redraw all of
                 // it by increasing the refresh area to cover it entirely if a
                 // part of it is affected
                 const int lineEnd = doper.PosToLine(this, posLineEnd, true);
-                for ( int line = lineStart; line < lineEnd; line++ )
+                for ( ; line < lineEnd; line++ )
                 {
                     int cellLines = oper.Select(
                         GetCellSize(oper.MakeCoords(m_dragRowOrCol, line)));
@@ -4329,7 +4636,7 @@ wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t),
 // event generation helpers
 // ----------------------------------------------------------------------------
 
-void
+bool
 wxGrid::SendGridSizeEvent(wxEventType type,
                       int row, int col,
                       const wxMouseEvent& mouseEv)
@@ -4344,7 +4651,7 @@ wxGrid::SendGridSizeEvent(wxEventType type,
            mouseEv.GetY() + GetColLabelSize(),
            mouseEv);
 
-   GetEventHandler()->ProcessEvent(gridEvt);
+   return GetEventHandler()->ProcessEvent(gridEvt);
 }
 
 // Generate a grid event based on a mouse event and return:
@@ -4627,30 +4934,18 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_TAB:
-                if (event.ShiftDown())
                 {
-                    if ( GetGridCursorCol() > 0 )
+                    // send an event to the grid's parents for custom handling
+                    wxGridEvent gridEvt(GetId(), wxEVT_GRID_TABBING, this,
+                                        GetGridCursorRow(), GetGridCursorCol(),
+                                        -1, -1, false, event);
+                    if ( ProcessWindowEvent(gridEvt) )
                     {
-                        MoveCursorLeft( false );
-                    }
-                    else
-                    {
-                        // at left of grid
-                        DisableCellEditControl();
-                    }
-                }
-                else
-                {
-                    if ( GetGridCursorCol() < GetNumberCols() - 1 )
-                    {
-                        MoveCursorRight( false );
-                    }
-                    else
-                    {
-                        // at right of grid
-                        DisableCellEditControl();
+                        // the event has been handled so no need for more processing
+                        break;
                     }
                 }
+                DoGridProcessTab( event );
                 break;
 
             case WXK_HOME:
@@ -4782,6 +5077,69 @@ void wxGrid::OnEraseBackground(wxEraseEvent&)
 {
 }
 
+void wxGrid::DoGridProcessTab(wxKeyboardState& kbdState)
+{
+    const bool isForwardTab = !kbdState.ShiftDown();
+
+    // TAB processing only changes when we are at the borders of the grid, so
+    // let's first handle the common behaviour when we are not at the border.
+    if ( isForwardTab )
+    {
+        if ( GetGridCursorCol() < GetNumberCols() - 1 )
+        {
+            MoveCursorRight( false );
+            return;
+        }
+    }
+    else // going back
+    {
+        if ( GetGridCursorCol() )
+        {
+            MoveCursorLeft( false );
+            return;
+        }
+    }
+
+
+    // We only get here if the cursor is at the border of the grid, apply the
+    // configured behaviour.
+    switch ( m_tabBehaviour )
+    {
+        case Tab_Stop:
+            // Nothing special to do, we remain at the current cell.
+            break;
+
+        case Tab_Wrap:
+            // Go to the beginning of the next or the end of the previous row.
+            if ( isForwardTab )
+            {
+                if ( GetGridCursorRow() < GetNumberRows() - 1 )
+                {
+                    GoToCell( GetGridCursorRow() + 1, 0 );
+                    return;
+                }
+            }
+            else
+            {
+                if ( GetGridCursorRow() > 0 )
+                {
+                    GoToCell( GetGridCursorRow() - 1, GetNumberCols() - 1 );
+                    return;
+                }
+            }
+            break;
+
+        case Tab_Leave:
+            if ( Navigate( isForwardTab ? wxNavigationKeyEvent::IsForward
+                                        : wxNavigationKeyEvent::IsBackward ) )
+                return;
+            break;
+    }
+
+    // If we remain in this cell, stop editing it if we were doing so.
+    DisableCellEditControl();
+}
+
 bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 {
     if ( SendEvent(wxEVT_GRID_SELECT_CELL, coords) == -1 )
@@ -5198,7 +5556,7 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
         // implicitly, causing this out-of order render.
 #if !defined(__WXMAC__)
         wxGridCellEditor *editor = attr->GetEditor(this, row, col);
-        editor->PaintBackground(rect, attr);
+        editor->PaintBackground(dc, rect, *attr);
         editor->DecRef();
 #endif
     }
@@ -5345,6 +5703,67 @@ void wxGrid::DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells)
     }
 }
 
+// Used by wxGrid::Render() to draw the grid lines only for the cells in the
+// specified range.
+void
+wxGrid::DrawRangeGridLines(wxDC& dc,
+                           const wxRegion& reg,
+                           const wxGridCellCoords& topLeft,
+                           const wxGridCellCoords& bottomRight)
+{
+    if ( !m_gridLinesEnabled )
+         return;
+
+    int top, left, width, height;
+    reg.GetBox( left, top, width, height );
+
+    // create a clipping region
+    wxRegion clippedcells( dc.LogicalToDeviceX( left ),
+                           dc.LogicalToDeviceY( top ),
+                           dc.LogicalToDeviceXRel( width ),
+                           dc.LogicalToDeviceYRel( height ) );
+
+    // subtract multi cell span area from clipping region for lines
+    wxRect rect;
+    for ( int row = topLeft.GetRow(); row <= bottomRight.GetRow(); row++ )
+    {
+        for ( int col = topLeft.GetCol(); col <= bottomRight.GetCol(); col++ )
+        {
+            int cell_rows, cell_cols;
+            GetCellSize( row, col, &cell_rows, &cell_cols );
+            if ( cell_rows > 1 || cell_cols > 1 ) // multi cell
+            {
+                rect = CellToRect( row, col );
+                // cater for scaling
+                // device origin already set in ::Render() for x, y
+                rect.x = dc.LogicalToDeviceX( rect.x );
+                rect.y = dc.LogicalToDeviceY( rect.y );
+                rect.width = dc.LogicalToDeviceXRel( rect.width );
+                rect.height = dc.LogicalToDeviceYRel( rect.height ) - 1;
+                clippedcells.Subtract( rect );
+            }
+            else if ( cell_rows < 0 || cell_cols < 0 ) // part of multicell
+            {
+                rect = CellToRect( row + cell_rows, col + cell_cols );
+                rect.x = dc.LogicalToDeviceX( rect.x );
+                rect.y = dc.LogicalToDeviceY( rect.y );
+                rect.width = dc.LogicalToDeviceXRel( rect.width );
+                rect.height = dc.LogicalToDeviceYRel( rect.height ) - 1;
+                clippedcells.Subtract( rect );
+            }
+        }
+    }
+
+    dc.SetDeviceClippingRegion( clippedcells );
+
+    DoDrawGridLines(dc,
+                    top, left, top + height, left + width,
+                    topLeft.GetRow(), topLeft.GetCol(),
+                    bottomRight.GetRow(), bottomRight.GetCol());
+
+    dc.DestroyClippingRegion();
+}
+
 // This is used to redraw all grid lines e.g. when the grid line colour
 // has been changed
 //
@@ -5416,9 +5835,22 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
 
     dc.SetDeviceClippingRegion( clippedcells );
 
+    DoDrawGridLines(dc,
+                    top, left, bottom, right,
+                    topRow, leftCol, m_numRows, m_numCols);
 
+    dc.DestroyClippingRegion();
+}
+
+void
+wxGrid::DoDrawGridLines(wxDC& dc,
+                        int top, int left,
+                        int bottom, int right,
+                        int topRow, int leftCol,
+                        int bottomRow, int rightCol)
+{
     // horizontal grid lines
-    for ( int i = internalYToRow(top); i < m_numRows; i++ )
+    for ( int i = topRow; i < bottomRow; i++ )
     {
         int bot = GetRowBottom(i) - 1;
 
@@ -5433,7 +5865,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     }
 
     // vertical grid lines
-    for ( int colPos = leftCol; colPos < m_numCols; colPos++ )
+    for ( int colPos = leftCol; colPos < rightCol; colPos++ )
     {
         int i = GetColAt( colPos );
 
@@ -5452,8 +5884,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
             dc.DrawLine( colRight, top, colRight, bottom );
         }
     }
-
-    dc.DestroyClippingRegion();
 }
 
 void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
@@ -6115,6 +6545,11 @@ void wxGrid::SaveEditControlValue()
     }
 }
 
+void wxGrid::OnHideEditor(wxCommandEvent& WXUNUSED(event))
+{
+    DisableCellEditControl();
+}
+
 //
 // ------ Grid location functions
 //  Note that all of these functions work with the logical coordinates of
@@ -6133,8 +6568,8 @@ wxGridCellCoords wxGrid::XYToCell(int x, int y) const
 
 // compute row or column from some (unscrolled) coordinate value, using either
 // m_defaultRowHeight/m_defaultColWidth or binary search on array of
-// m_rowBottoms/m_colRights to do it quickly (linear search shouldn't be used
-// for large grids)
+// m_rowBottoms/m_colRights to do it quickly in O(log n) time.
+// NOTE: This may not work correctly for reordered columns.
 int wxGrid::PosToLinePos(int coord,
                          bool clipToMinMax,
                          const wxGridOperations& oper) const
@@ -6162,26 +6597,11 @@ int wxGrid::PosToLinePos(int coord,
     }
 
 
-    // adjust maxPos before starting the binary search
-    if ( maxPos >= numLines )
-    {
-        maxPos = numLines  - 1;
-    }
-    else
-    {
-        if ( coord >= lineEnds[oper.GetLineAt(this, maxPos)])
-        {
-            minPos = maxPos;
-            const int minDist = oper.GetMinimalAcceptableLineSize(this);
-            if ( minDist )
-                maxPos = coord / minDist;
-            else
-                maxPos = numLines - 1;
-        }
-
-        if ( maxPos >= numLines )
-            maxPos = numLines  - 1;
-    }
+    // binary search is quite efficient and we can't really make any assumptions
+    // on where to start here since row and columns could be of size 0 if they are
+    // hidden. While this could be made more efficient, some profiling will be
+    // necessary to determine if it really is a performance bottleneck
+    maxPos = numLines  - 1;
 
     // check if the position is beyond the last column
     const int lineAtMaxPos = oper.GetLineAt(this, maxPos);
@@ -6242,7 +6662,7 @@ int wxGrid::XToPos(int x) const
     return PosToLinePos(x, true /* clip */, wxGridColumnOperations());
 }
 
-// return the row number such that the y coord is near the edge of, or -1 if
+// return the row/col number such that the pos is near the edge of, or -1 if
 // not near an edge.
 //
 // notice that position can only possibly be near an edge if the row/column is
@@ -6251,7 +6671,8 @@ int wxGrid::XToPos(int x) const
 // _never_ be considered to be near the edge).
 int wxGrid::PosToEdgeOfLine(int pos, const wxGridOperations& oper) const
 {
-    const int line = oper.PosToLine(this, pos, true);
+    // Get the bottom or rightmost line that could match.
+    int line = oper.PosToLine(this, pos, true);
 
     if ( oper.GetLineSize(this, line) > WXGRID_LABEL_EDGE_ZONE )
     {
@@ -6263,7 +6684,16 @@ int wxGrid::PosToEdgeOfLine(int pos, const wxGridOperations& oper) const
                     pos - oper.GetLineStartPos(this,
                                                line) < WXGRID_LABEL_EDGE_ZONE )
         {
-            return oper.GetLineBefore(this, line);
+            // We need to find the previous visible line, so skip all the
+            // hidden (of size 0) ones.
+            do
+            {
+                line = oper.GetLineBefore(this, line);
+            }
+            while ( line >= 0 && oper.GetLineSize(this, line) == 0 );
+
+            // It can possibly be -1 here.
+            return line;
         }
     }
 
@@ -6700,6 +7130,7 @@ void wxGrid::SetRowLabelSize( int width )
         }
 
         m_rowLabelWidth = width;
+        InvalidateBestSize();
         CalcWindowSizes();
         wxScrolledWindow::Refresh( true );
     }
@@ -6729,6 +7160,7 @@ void wxGrid::SetColLabelSize( int height )
         }
 
         m_colLabelHeight = height;
+        InvalidateBestSize();
         CalcWindowSizes();
         wxScrolledWindow::Refresh( true );
     }
@@ -7663,12 +8095,73 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
     }
 }
 
+namespace
+{
+
+// This is a common part of SetRowSize() and SetColSize() which takes care of
+// updating the height/width of a row/column depending on its current value and
+// the new one.
+//
+// Returns the difference between the new and the old size.
+int UpdateRowOrColSize(int& sizeCurrent, int sizeNew)
+{
+    // On input here sizeCurrent can be negative if it's currently hidden (the
+    // real size is its absolute value then). And sizeNew can be 0 to indicate
+    // that the row/column should be hidden or -1 to indicate that it should be
+    // shown again.
+
+    if ( sizeNew < 0 )
+    {
+        // We're showing back a previously hidden row/column.
+        wxASSERT_MSG( sizeNew == -1, wxS("New size must be positive or -1.") );
+
+        // If it's already visible, simply do nothing.
+        if ( sizeCurrent >= 0 )
+            return 0;
+
+        // Otherwise show it by restoring its old size.
+        sizeCurrent = -sizeCurrent;
+
+        // This is positive which is correct.
+        return sizeCurrent;
+    }
+    else if ( sizeNew == 0 )
+    {
+        // We're hiding a row/column.
+
+        // If it's already hidden, simply do nothing.
+        if ( sizeCurrent <= 0 )
+            return 0;
+
+        // Otherwise hide it and also remember the shown size to be able to
+        // restore it later.
+        sizeCurrent = -sizeCurrent;
+
+        // This is negative which is correct.
+        return sizeCurrent;
+    }
+    else // We're just changing the row/column size.
+    {
+        // Here it could have been hidden or not previously.
+        const int sizeOld = sizeCurrent < 0 ? 0 : sizeCurrent;
+
+        sizeCurrent = sizeNew;
+
+        return sizeCurrent - sizeOld;
+    }
+}
+
+} // anonymous namespace
+
 void wxGrid::SetRowSize( int row, int height )
 {
-    wxCHECK_RET( row >= 0 && row < m_numRows, wxT("invalid row index") );
+    // See comment in SetColSize
+    if ( height > 0 && height < GetRowMinimalAcceptableHeight())
+        return;
 
-    // if < 0 then calculate new height from label
-    if ( height < 0 )
+    // The value of -1 is special and means to fit the height to the row label.
+    // As with the columns, ignore attempts to auto-size the hidden rows.
+    if ( height == -1 && GetRowHeight(row) != 0 )
     {
         long w, h;
         wxArrayString lines;
@@ -7680,9 +8173,12 @@ void wxGrid::SetRowSize( int row, int height )
         height = wxMax(h, GetRowMinimalAcceptableHeight());
     }
 
-    // See comment in SetColSize
-    if ( height < GetRowMinimalAcceptableHeight())
-        return;
+    DoSetRowSize(row, height);
+}
+
+void wxGrid::DoSetRowSize( int row, int height )
+{
+    wxCHECK_RET( row >= 0 && row < m_numRows, wxT("invalid row index") );
 
     if ( m_rowHeights.IsEmpty() )
     {
@@ -7690,17 +8186,22 @@ void wxGrid::SetRowSize( int row, int height )
         InitRowHeights();
     }
 
-    int h = wxMax( 0, height );
-    int diff = h - m_rowHeights[row];
+    const int diff = UpdateRowOrColSize(m_rowHeights[row], height);
+    if ( !diff )
+        return;
 
-    m_rowHeights[row] = h;
     for ( int i = row; i < m_numRows; i++ )
     {
         m_rowBottoms[i] += diff;
     }
 
+    InvalidateBestSize();
+
     if ( !GetBatchCount() )
+    {
         CalcDimensions();
+        Refresh();
+    }
 }
 
 void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
@@ -7723,10 +8224,21 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
 
 void wxGrid::SetColSize( int col, int width )
 {
-    wxCHECK_RET( col >= 0 && col < m_numCols, wxT("invalid column index") );
+    // we intentionally don't test whether the width is less than
+    // GetColMinimalWidth() here but we do compare it with
+    // GetColMinimalAcceptableWidth() as otherwise things currently break (see
+    // #651) -- and we also always allow the width of 0 as it has the special
+    // sense of hiding the column
+    if ( width > 0 && width < GetColMinimalAcceptableWidth() )
+        return;
 
-    // if < 0 then calculate new width from label
-    if ( width < 0 )
+    // The value of -1 is special and means to fit the width to the column label.
+    //
+    // Notice that we currently don't support auto-sizing hidden columns (we
+    // could, but it's not clear whether this is really needed and it would
+    // make the code more complex), and for them passing -1 simply means to
+    // show the column back using its old size.
+    if ( width == -1 && GetColWidth(col) != 0 )
     {
         long w, h;
         wxArrayString lines;
@@ -7742,13 +8254,12 @@ void wxGrid::SetColSize( int col, int width )
         width = wxMax(width, GetColMinimalAcceptableWidth());
     }
 
-    // we intentionally don't test whether the width is less than
-    // GetColMinimalWidth() here but we do compare it with
-    // GetColMinimalAcceptableWidth() as otherwise things currently break (see
-    // #651) -- and we also always allow the width of 0 as it has the special
-    // sense of hiding the column
-    if ( width > 0 && width < GetColMinimalAcceptableWidth() )
-        return;
+    DoSetColSize(col, width);
+}
+
+void wxGrid::DoSetColSize( int col, int width )
+{
+    wxCHECK_RET( col >= 0 && col < m_numCols, wxT("invalid column index") );
 
     if ( m_colWidths.IsEmpty() )
     {
@@ -7756,8 +8267,10 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
-    const int diff = width - m_colWidths[col];
-    m_colWidths[col] = width;
+    const int diff = UpdateRowOrColSize(m_colWidths[col], width);
+    if ( !diff )
+        return;
+
     if ( m_useNativeHeader )
         GetGridColHeader()->UpdateColumn(col);
     //else: will be refreshed when the header is redrawn
@@ -7767,6 +8280,8 @@ void wxGrid::SetColSize( int col, int width )
         m_colRights[GetColAt(colPos)] += diff;
     }
 
+    InvalidateBestSize();
+
     if ( !GetBatchCount() )
     {
         CalcDimensions();
@@ -7843,6 +8358,19 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
 {
     const bool column = direction == wxGRID_COLUMN;
 
+    // We don't support auto-sizing hidden rows or columns, this doesn't seem
+    // to make much sense.
+    if ( column )
+    {
+        if ( GetColWidth(colOrRow) == 0 )
+            return;
+    }
+    else
+    {
+        if ( GetRowHeight(colOrRow) == 0 )
+            return;
+    }
+
     wxClientDC dc(m_gridWin);
 
     // cancel editing of cell
@@ -7869,9 +8397,21 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
     for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ )
     {
         if ( column )
+        {
+            if ( !IsRowShown(rowOrCol) )
+                continue;
+
             row = rowOrCol;
+            col = colOrRow;
+        }
         else
+        {
+            if ( !IsColShown(rowOrCol) )
+                continue;
+
+            row = colOrRow;
             col = rowOrCol;
+        }
 
         // we need to account for the cells spanning multiple columns/rows:
         // while they may need a lot of space, they don't need all of it in
@@ -7889,6 +8429,7 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
             GetCellSize(row, col, &numRows, &numCols);
         }
 
+        // get cell ( main cell if CellSpan_Inside ) renderer best size
         wxGridCellAttr *attr = GetCellAttr(row, col);
         wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
         if ( renderer )
@@ -7923,12 +8464,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
 
     if ( column )
     {
-        dc.GetMultiLineTextExtent( GetColLabelValue(col), &w, &h );
+        dc.GetMultiLineTextExtent( GetColLabelValue(colOrRow), &w, &h );
         if ( GetColLabelTextOrientation() == wxVERTICAL )
             w = h;
     }
     else
-        dc.GetMultiLineTextExtent( GetRowLabelValue(row), &w, &h );
+        dc.GetMultiLineTextExtent( GetRowLabelValue(colOrRow), &w, &h );
 
     extent = column ? w : h;
     if ( extent > extentMax )
@@ -7955,20 +8496,20 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
         // comment in SetColSize() for explanation of why this isn't done
         // in SetColSize().
         if ( !setAsMin )
-            extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+            extentMax = wxMax(extentMax, GetColMinimalWidth(colOrRow));
 
-        SetColSize( col, extentMax );
+        SetColSize( colOrRow, extentMax );
         if ( !GetBatchCount() )
         {
             if ( m_useNativeHeader )
             {
-                GetGridColHeader()->UpdateColumn(col);
+                GetGridColHeader()->UpdateColumn(colOrRow);
             }
             else
             {
                 int cw, ch, dummy;
                 m_gridWin->GetClientSize( &cw, &ch );
-                wxRect rect ( CellToRect( 0, col ) );
+                wxRect rect ( CellToRect( 0, colOrRow ) );
                 rect.y = 0;
                 CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
                 rect.width = cw - rect.x;
@@ -7983,14 +8524,14 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
         // comment in SetColSize() for explanation of why this isn't done
         // in SetRowSize().
         if ( !setAsMin )
-            extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+            extentMax = wxMax(extentMax, GetRowMinimalHeight(colOrRow));
 
-        SetRowSize(row, extentMax);
+        SetRowSize(colOrRow, extentMax);
         if ( !GetBatchCount() )
         {
             int cw, ch, dummy;
             m_gridWin->GetClientSize( &cw, &ch );
-            wxRect rect( CellToRect( row, 0 ) );
+            wxRect rect( CellToRect( colOrRow, 0 ) );
             rect.x = 0;
             CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
             rect.width = m_rowLabelWidth;
@@ -8002,9 +8543,9 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
     if ( setAsMin )
     {
         if ( column )
-            SetColMinimalWidth(col, extentMax);
+            SetColMinimalWidth(colOrRow, extentMax);
         else
-            SetRowMinimalHeight(row, extentMax);
+            SetRowMinimalHeight(colOrRow, extentMax);
     }
 }
 
@@ -8127,6 +8668,7 @@ void wxGrid::AutoSizeRowLabelSize( int row )
 
     // autosize row height depending on label text
     SetRowSize(row, -1);
+
     ForceRefresh();
 }
 
@@ -8142,6 +8684,7 @@ void wxGrid::AutoSizeColLabelSize( int col )
 
     // autosize column width depending on label text
     SetColSize(col, -1);
+
     ForceRefresh();
 }
 
@@ -8154,11 +8697,6 @@ wxSize wxGrid::DoGetBestSize() const
     wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth,
                 self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight);
 
-    // NOTE: This size should be cached, but first we need to add calls to
-    // InvalidateBestSize everywhere that could change the results of this
-    // calculation.
-    // CacheBestSize(size);
-
     return wxSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight)
             + GetWindowBorderSize();
 }
@@ -8557,7 +9095,16 @@ int wxGridSizesInfo::GetSize(unsigned pos) const
 {
     wxUnsignedToIntHashMap::const_iterator it = m_customSizes.find(pos);
 
-    return it == m_customSizes.end() ? m_sizeDefault : it->second;
+    // if it's not found return the default
+    if ( it == m_customSizes.end() )
+      return m_sizeDefault;
+
+    // otherwise return 0 if it's hidden, currently there is no way to get
+    // its size before it had been hidden
+    if ( it->second < 0 )
+      return 0;
+
+    return it->second;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/generic/gridctrl.cpp b/Externals/wxWidgets3/src/generic/gridctrl.cpp
index 2a9378afef..25c3359d3b 100644
--- a/Externals/wxWidgets3/src/generic/gridctrl.cpp
+++ b/Externals/wxWidgets3/src/generic/gridctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Paul Gammans, Roger Gammans
 // Modified by:
 // Created:     11/04/2001
-// RCS-ID:      $Id: gridctrl.cpp 69856 2011-11-28 13:23:33Z VZ $
 // Copyright:   (c) The Computer Surgery (paul@compsurg.co.uk)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -295,89 +294,164 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
                                                const wxRect& rect,
                                                int row, int col)
 {
-    wxString  data = grid.GetCellValue(row, col);
-
-    wxArrayString lines;
     dc.SetFont(attr.GetFont());
+    const wxCoord maxWidth = rect.GetWidth();
 
-    //Taken from wxGrid again!
-    wxCoord x = 0, y = 0, curr_x = 0;
-    wxCoord max_x = rect.GetWidth();
+    // Transform logical lines into physical ones, wrapping the longer ones.
+    const wxArrayString
+        logicalLines = wxSplit(grid.GetCellValue(row, col), '\n', '\0');
 
-    dc.SetFont(attr.GetFont());
-    wxStringTokenizer tk(data , wxT(" \n\t\r"));
-    wxString thisline = wxEmptyString;
+    // Trying to do anything if the column is hidden anyhow doesn't make sense
+    // and we run into problems in BreakLine() in this case.
+    if ( maxWidth <= 0 )
+        return logicalLines;
 
-    while ( tk.HasMoreTokens() )
+    wxArrayString physicalLines;
+    for ( wxArrayString::const_iterator it = logicalLines.begin();
+          it != logicalLines.end();
+          ++it )
     {
-        wxString tok = tk.GetNextToken();
-        //FIXME: this causes us to print an extra unnecessary
-        //       space at the end of the line. But it
-        //       is invisible , simplifies the size calculation
-        //       and ensures tokens are separated in the display
-        tok += wxT(" ");
+        const wxString& line = *it;
 
-        dc.GetTextExtent(tok, &x, &y);
-        if ( curr_x + x > max_x)
+        if ( dc.GetTextExtent(line).x > maxWidth )
         {
-            if ( curr_x == 0 )
-            {
-                // this means that a single token is wider than the maximal
-                // width -- still use it as is as we need to show at least the
-                // part of it which fits
-                lines.Add(tok);
-            }
-            else
-            {
-                lines.Add(thisline);
-                thisline = tok;
-                curr_x = x;
-            }
+            // Line does not fit, break it up.
+            BreakLine(dc, line, maxWidth, physicalLines);
+        }
+        else // The entire line fits as is
+        {
+            physicalLines.push_back(line);
+        }
+    }
+
+    return physicalLines;
+}
+
+void
+wxGridCellAutoWrapStringRenderer::BreakLine(wxDC& dc,
+                                            const wxString& logicalLine,
+                                            wxCoord maxWidth,
+                                            wxArrayString& lines)
+{
+    wxCoord lineWidth = 0;
+    wxString line;
+
+    // For each word
+    wxStringTokenizer wordTokenizer(logicalLine, wxS(" \t"), wxTOKEN_RET_DELIMS);
+    while ( wordTokenizer.HasMoreTokens() )
+    {
+        const wxString word = wordTokenizer.GetNextToken();
+        const wxCoord wordWidth = dc.GetTextExtent(word).x;
+        if ( lineWidth + wordWidth < maxWidth )
+        {
+            // Word fits, just add it to this line.
+            line += word;
+            lineWidth += wordWidth;
         }
         else
         {
-            thisline+= tok;
-            curr_x += x;
+            // Word does not fit, check whether the word is itself wider that
+            // available width
+            if ( wordWidth < maxWidth )
+            {
+                // Word can fit in a new line, put it at the beginning
+                // of the new line.
+                lines.push_back(line);
+                line = word;
+                lineWidth = wordWidth;
+            }
+            else // Word cannot fit in available width at all.
+            {
+                if ( !line.empty() )
+                {
+                    lines.push_back(line);
+                    line.clear();
+                    lineWidth = 0;
+                }
+
+                // Break it up in several lines.
+                lineWidth = BreakWord(dc, word, maxWidth, lines, line);
+            }
         }
     }
-    //Add last line
-    lines.Add( wxString(thisline) );
 
-    return lines;
+    if ( !line.empty() )
+        lines.push_back(line);
 }
 
 
+wxCoord
+wxGridCellAutoWrapStringRenderer::BreakWord(wxDC& dc,
+                                            const wxString& word,
+                                            wxCoord maxWidth,
+                                            wxArrayString& lines,
+                                            wxString& line)
+{
+    wxArrayInt widths;
+    dc.GetPartialTextExtents(word, widths);
+
+    // TODO: Use binary search to find the first element > maxWidth.
+    const unsigned count = widths.size();
+    unsigned n;
+    for ( n = 0; n < count; n++ )
+    {
+        if ( widths[n] > maxWidth )
+            break;
+    }
+
+    if ( n == 0 )
+    {
+        // This is a degenerate case: the first character of the word is
+        // already wider than the available space, so we just can't show it
+        // completely and have to put the first character in this line.
+        n = 1;
+    }
+
+    lines.push_back(word.substr(0, n));
+
+    // Check if the remainder of the string fits in one line.
+    //
+    // Unfortunately we can't use the existing partial text extents as the
+    // extent of the remainder may be different when it's rendered in a
+    // separate line instead of as part of the same one, so we have to
+    // recompute it.
+    const wxString rest = word.substr(n);
+    const wxCoord restWidth = dc.GetTextExtent(rest).x;
+    if ( restWidth <= maxWidth )
+    {
+        line = rest;
+        return restWidth;
+    }
+
+    // Break the rest of the word into lines.
+    //
+    // TODO: Perhaps avoid recursion? The code is simpler like this but using a
+    // loop in this function would probably be more efficient.
+    return BreakWord(dc, rest, maxWidth, lines, line);
+}
+
 wxSize
 wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
                                               wxGridCellAttr& attr,
                                               wxDC& dc,
                                               int row, int col)
 {
-    wxCoord x,y, height , width = grid.GetColSize(col) -20;
-    // for width, subtract 20 because ColSize includes a magin of 10 pixels
-    // that we do not want here and because we always start with an increment
-    // by 10 in the loop below.
-    int count = 250; //Limit iterations..
+    const int lineHeight = dc.GetCharHeight();
 
-    wxRect rect(0,0,width,10);
-
-    // M is a nice large character 'y' gives descender!.
-    dc.GetTextExtent(wxT("My"), &x, &y);
-
-    do
-    {
-        width+=10;
-        rect.SetWidth(width);
-        height = y * (wx_truncate_cast(wxCoord, GetTextLines(grid,dc,attr,rect,row,col).GetCount()));
-        count--;
     // Search for a shape no taller than the golden ratio.
-    } while (count && (width  < (height*1.68)) );
+    wxSize size;
+    for ( size.x = 10; ; size.x += 10 )
+    {
+        const size_t
+            numLines = GetTextLines(grid, dc, attr, size, row, col).size();
+        size.y = numLines * lineHeight;
+        if ( size.x >= size.y*1.68 )
+            break;
+    }
 
-
-    return wxSize(width,height);
+    return size;
 }
 
-
 // ----------------------------------------------------------------------------
 // wxGridCellStringRenderer
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/generic/grideditors.cpp b/Externals/wxWidgets3/src/generic/grideditors.cpp
index c92f876811..aef0f36453 100644
--- a/Externals/wxWidgets3/src/generic/grideditors.cpp
+++ b/Externals/wxWidgets3/src/generic/grideditors.cpp
@@ -4,7 +4,6 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grideditors.cpp 70693 2012-02-25 23:49:55Z VZ $
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -56,6 +55,10 @@
     #define WXUNUSED_GTK(identifier)    identifier
 #endif
 
+#ifdef __WXOSX__
+#include "wx/osx/private.h"
+#endif
+
 // Required for wxIs... functions
 #include <ctype.h>
 
@@ -63,27 +66,32 @@
 // implementation
 // ============================================================================
 
+wxDEFINE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent );
+
 // ----------------------------------------------------------------------------
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------
 
 void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
 {
+    // We must let the native control have this event so in any case don't mark
+    // it as handled, otherwise various weird problems can happen (see #11681).
+    event.Skip();
+
     // Don't disable the cell if we're just starting to edit it
-    if ( m_inSetFocus )
-    {
-        event.Skip();
+    if (m_inSetFocus)
         return;
-    }
 
-    // accept changes
-    m_grid->DisableCellEditControl();
+    // Tell the grid to dismiss the control but don't do it immediately as it
+    // could result in the editor being destroyed right now and a crash in the
+    // code searching for the next event handler, so post an event asking the
+    // grid to do it slightly later instead.
 
-    // notice that we must not skip the event here because the call above may
-    // delete the control which received the kill focus event in the first
-    // place and if we pretend not having processed the event, the search for a
-    // handler for it will continue using the now deleted object resulting in a
-    // crash
+    // FIXME-VC6: Once we drop support for VC6, we should use a simpler
+    //            m_grid->CallAfter(&wxGrid::DisableCellEditControl) and get
+    //            rid of wxEVT_GRID_HIDE_EDITOR entirely.
+    m_grid->GetEventHandler()->
+        AddPendingEvent(wxCommandEvent(wxEVT_GRID_HIDE_EDITOR));
 }
 
 void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
@@ -242,21 +250,14 @@ void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
         m_control->PushEventHandler(evtHandler);
 }
 
-void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
-                                       wxGridCellAttr *attr)
+void wxGridCellEditor::PaintBackground(wxDC& dc,
+                                       const wxRect& rectCell,
+                                       const wxGridCellAttr& attr)
 {
     // erase the background because we might not fill the cell
-    wxClientDC dc(m_control->GetParent());
-    wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow);
-    if (gridWindow)
-        gridWindow->GetOwner()->PrepareDC(dc);
-
     dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(wxBrush(attr->GetBackgroundColour()));
+    dc.SetBrush(wxBrush(attr.GetBackgroundColour()));
     dc.DrawRectangle(rectCell);
-
-    // redraw the control we just painted over
-    m_control->Refresh();
 }
 
 void wxGridCellEditor::Destroy()
@@ -380,9 +381,9 @@ void wxGridCellEditor::StartingClick()
 // wxGridCellTextEditor
 // ----------------------------------------------------------------------------
 
-wxGridCellTextEditor::wxGridCellTextEditor()
+wxGridCellTextEditor::wxGridCellTextEditor(size_t maxChars)
 {
-    m_maxChars = 0;
+    m_maxChars = maxChars;
 }
 
 void wxGridCellTextEditor::Create(wxWindow* parent,
@@ -397,26 +398,35 @@ void wxGridCellTextEditor::DoCreate(wxWindow* parent,
                                     wxEvtHandler* evtHandler,
                                     long style)
 {
-    // Use of wxTE_RICH2 is a strange hack to work around the bug #11681: a
-    // plain text control seems to lose its caret somehow when we hide it and
-    // show it again for a different cell.
-    style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER | wxTE_RICH2;
+    style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER;
 
-    m_control = new wxTextCtrl(parent, id, wxEmptyString,
-                               wxDefaultPosition, wxDefaultSize,
-                               style);
+    wxTextCtrl* const text = new wxTextCtrl(parent, id, wxEmptyString,
+                                            wxDefaultPosition, wxDefaultSize,
+                                            style);
+    text->SetMargins(0, 0);
+    m_control = text;
 
+#ifdef __WXOSX__
+    wxWidgetImpl* impl = m_control->GetPeer();
+    impl->SetNeedsFocusRect(false);
+#endif
     // set max length allowed in the textctrl, if the parameter was set
     if ( m_maxChars != 0 )
     {
         Text()->SetMaxLength(m_maxChars);
     }
+    // validate text in textctrl, if validator is set
+    if ( m_validator )
+    {
+        Text()->SetValidator(*m_validator);
+    }
 
     wxGridCellEditor::Create(parent, id, evtHandler);
 }
 
-void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell),
-                                           wxGridCellAttr * WXUNUSED(attr))
+void wxGridCellTextEditor::PaintBackground(wxDC& WXUNUSED(dc),
+                                           const wxRect& WXUNUSED(rectCell),
+                                           const wxGridCellAttr& WXUNUSED(attr))
 {
     // as we fill the entire client area,
     // don't do anything here to minimize flicker
@@ -451,6 +461,12 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig)
 
     rect.width -= 2;
     rect.height -= 2;
+#elif defined(__WXOSX__)
+    rect.x += 1;
+    rect.y += 1;
+    
+    rect.width -= 1;
+    rect.height -= 1;
 #else
     int extra_x = ( rect.x > 2 ) ? 2 : 1;
     int extra_y = ( rect.y > 2 ) ? 2 : 1;
@@ -482,7 +498,7 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
 {
     Text()->SetValue(startValue);
     Text()->SetInsertionPointEnd();
-    Text()->SetSelection(-1, -1);
+    Text()->SelectAll();
     Text()->SetFocus();
 }
 
@@ -622,6 +638,21 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
     }
 }
 
+void wxGridCellTextEditor::SetValidator(const wxValidator& validator)
+{
+    m_validator.reset(static_cast<wxValidator*>(validator.Clone()));
+}
+
+wxGridCellEditor *wxGridCellTextEditor::Clone() const
+{
+    wxGridCellTextEditor* editor = new wxGridCellTextEditor(m_maxChars);
+    if ( m_validator )
+    {
+        editor->SetValidator(*m_validator);
+    }
+    return editor;
+}
+
 // return the value in the text control
 wxString wxGridCellTextEditor::GetValue() const
 {
@@ -1437,8 +1468,9 @@ void wxGridCellChoiceEditor::SetSize(const wxRect& rect)
     wxGridCellEditor::SetSize(rectTallEnough);
 }
 
-void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
-                                             wxGridCellAttr * attr)
+void wxGridCellChoiceEditor::PaintBackground(wxDC& dc,
+                                             const wxRect& rectCell,
+                                             const wxGridCellAttr& attr)
 {
     // as we fill the entire client area, don't do anything here to minimize
     // flicker
@@ -1446,7 +1478,7 @@ void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
     // TODO: It doesn't actually fill the client area since the height of a
     // combo always defaults to the standard.  Until someone has time to
     // figure out the right rectangle to paint, just do it the normal way.
-    wxGridCellEditor::PaintBackground(rectCell, attr);
+    wxGridCellEditor::PaintBackground(dc, rectCell, attr);
 }
 
 void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
@@ -1582,6 +1614,14 @@ void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid)
     wxASSERT_MSG(m_control,
                  wxT("The wxGridCellEnumEditor must be Created first!"));
 
+    wxGridCellEditorEvtHandler* evtHandler = NULL;
+    if (m_control)
+        evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler);
+
+    // Don't immediately end if we get a kill focus event within BeginEdit
+    if (evtHandler)
+        evtHandler->SetInSetFocus(true);
+
     wxGridTableBase *table = grid->GetTable();
 
     if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
@@ -1604,6 +1644,22 @@ void wxGridCellEnumEditor::BeginEdit(int row, int col, wxGrid* grid)
     Combo()->SetSelection(m_index);
     Combo()->SetFocus();
 
+#ifdef __WXOSX_COCOA__
+    // This is a work around for the combobox being simply dismissed when a
+    // choice is made in it under OS X. The bug is almost certainly due to a
+    // problem in focus events generation logic but it's not obvious to fix and
+    // for now this at least allows to use wxGrid.
+    Combo()->Popup();
+#endif
+
+    if (evtHandler)
+    {
+        // When dropping down the menu, a kill focus event
+        // happens after this point, so we can't reset the flag yet.
+#if !defined(__WXGTK20__)
+        evtHandler->SetInSetFocus(false);
+#endif
+    }
 }
 
 bool wxGridCellEnumEditor::EndEdit(int WXUNUSED(row),
diff --git a/Externals/wxWidgets3/src/generic/gridsel.cpp b/Externals/wxWidgets3/src/generic/gridsel.cpp
index 0d84cd8e49..e79f7f2031 100644
--- a/Externals/wxWidgets3/src/generic/gridsel.cpp
+++ b/Externals/wxWidgets3/src/generic/gridsel.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Neis
 // Modified by:
 // Created:     20/02/1999
-// RCS-ID:      $Id: gridsel.cpp 70177 2011-12-29 22:05:23Z VZ $
 // Copyright:   (c) Stefan Neis (Stefan.Neis@t-online.de)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/headerctrlg.cpp b/Externals/wxWidgets3/src/generic/headerctrlg.cpp
index a4735d7f07..6dcccfdce8 100644
--- a/Externals/wxWidgets3/src/generic/headerctrlg.cpp
+++ b/Externals/wxWidgets3/src/generic/headerctrlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic wxHeaderCtrl implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-12-03
-// RCS-ID:      $Id: headerctrlg.cpp 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -278,7 +277,7 @@ void wxHeaderCtrl::CancelDragging()
 
     unsigned int& col = IsResizing() ? m_colBeingResized : m_colBeingReordered;
 
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, GetId());
+    wxHeaderCtrlEvent event(wxEVT_HEADER_DRAGGING_CANCELLED, GetId());
     event.SetEventObject(this);
     event.SetColumn(col);
 
@@ -303,8 +302,8 @@ int wxHeaderCtrl::ConstrainByMinWidth(unsigned int col, int& xPhysical)
 
 void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
 {
-    wxHeaderCtrlEvent event(IsResizing() ? wxEVT_COMMAND_HEADER_RESIZING
-                                         : wxEVT_COMMAND_HEADER_BEGIN_RESIZE,
+    wxHeaderCtrlEvent event(IsResizing() ? wxEVT_HEADER_RESIZING
+                                         : wxEVT_HEADER_BEGIN_RESIZE,
                             GetId());
     event.SetEventObject(this);
     event.SetColumn(col);
@@ -341,7 +340,7 @@ void wxHeaderCtrl::EndResizing(int xPhysical)
 
     ReleaseMouse();
 
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_RESIZE, GetId());
+    wxHeaderCtrlEvent event(wxEVT_HEADER_END_RESIZE, GetId());
     event.SetEventObject(this);
     event.SetColumn(m_colBeingResized);
     event.SetWidth(ConstrainByMinWidth(m_colBeingResized, xPhysical));
@@ -382,7 +381,7 @@ void wxHeaderCtrl::UpdateReorderingMarker(int xPhysical)
 
 void wxHeaderCtrl::StartReordering(unsigned int col, int xPhysical)
 {
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_BEGIN_REORDER, GetId());
+    wxHeaderCtrlEvent event(wxEVT_HEADER_BEGIN_REORDER, GetId());
     event.SetEventObject(this);
     event.SetColumn(col);
 
@@ -421,7 +420,7 @@ bool wxHeaderCtrl::EndReordering(int xPhysical)
 
     if ( colNew != colOld )
     {
-        wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_REORDER, GetId());
+        wxHeaderCtrlEvent event(wxEVT_HEADER_END_REORDER, GetId());
         event.SetEventObject(this);
         event.SetColumn(colOld);
 
@@ -680,23 +679,23 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
                 // treat left double clicks on separator specially
                 if ( onSeparator && dblclk )
                 {
-                    evtType = wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
+                    evtType = wxEVT_HEADER_SEPARATOR_DCLICK;
                 }
                 else // not double click on separator
                 {
-                    evtType = click ? wxEVT_COMMAND_HEADER_CLICK
-                                    : wxEVT_COMMAND_HEADER_DCLICK;
+                    evtType = click ? wxEVT_HEADER_CLICK
+                                    : wxEVT_HEADER_DCLICK;
                 }
                 break;
 
             case wxMOUSE_BTN_RIGHT:
-                evtType = click ? wxEVT_COMMAND_HEADER_RIGHT_CLICK
-                                : wxEVT_COMMAND_HEADER_RIGHT_DCLICK;
+                evtType = click ? wxEVT_HEADER_RIGHT_CLICK
+                                : wxEVT_HEADER_RIGHT_DCLICK;
                 break;
 
             case wxMOUSE_BTN_MIDDLE:
-                evtType = click ? wxEVT_COMMAND_HEADER_MIDDLE_CLICK
-                                : wxEVT_COMMAND_HEADER_MIDDLE_DCLICK;
+                evtType = click ? wxEVT_HEADER_MIDDLE_CLICK
+                                : wxEVT_HEADER_MIDDLE_DCLICK;
                 break;
 
             default:
diff --git a/Externals/wxWidgets3/src/generic/helpext.cpp b/Externals/wxWidgets3/src/generic/helpext.cpp
index 07753841bb..af4644ad85 100644
--- a/Externals/wxWidgets3/src/generic/helpext.cpp
+++ b/Externals/wxWidgets3/src/generic/helpext.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: helpext.cpp 67214 2011-03-16 07:22:56Z SC $
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/htmllbox.cpp b/Externals/wxWidgets3/src/generic/htmllbox.cpp
index 1779404086..178f8c44ef 100644
--- a/Externals/wxWidgets3/src/generic/htmllbox.cpp
+++ b/Externals/wxWidgets3/src/generic/htmllbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id: htmllbox.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp b/Externals/wxWidgets3/src/generic/hyperlinkg.cpp
index 5a302817e5..eb8485955d 100644
--- a/Externals/wxWidgets3/src/generic/hyperlinkg.cpp
+++ b/Externals/wxWidgets3/src/generic/hyperlinkg.cpp
@@ -4,7 +4,6 @@
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Created:     04/02/2005
-// RCS-ID:      $Id: hyperlinkg.cpp 67948 2011-06-15 21:56:23Z VZ $
 // Copyright:   (c) 2005 David Norris
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -120,7 +119,7 @@ void wxGenericHyperlinkCtrl::ConnectMenuHandlers()
 {
     // Connect the event handlers for the context menu.
     Connect( wxEVT_RIGHT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnRightUp) );
-    Connect( wxHYPERLINK_POPUP_COPY_ID, wxEVT_COMMAND_MENU_SELECTED,
+    Connect( wxHYPERLINK_POPUP_COPY_ID, wxEVT_MENU,
              wxCommandEventHandler(wxGenericHyperlinkCtrl::OnPopUpCopy) );
 }
 
diff --git a/Externals/wxWidgets3/src/generic/icon.cpp b/Externals/wxWidgets3/src/generic/icon.cpp
index e804408c23..ffe0335ad0 100644
--- a/Externals/wxWidgets3/src/generic/icon.cpp
+++ b/Externals/wxWidgets3/src/generic/icon.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id: icon.cpp 51211 2008-01-14 18:16:37Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/imaglist.cpp b/Externals/wxWidgets3/src/generic/imaglist.cpp
index 79c28ae14e..ba98cc4003 100644
--- a/Externals/wxWidgets3/src/generic/imaglist.cpp
+++ b/Externals/wxWidgets3/src/generic/imaglist.cpp
@@ -2,7 +2,6 @@
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: imaglist.cpp 70345 2012-01-15 01:05:28Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,7 +67,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
 
     const int index = int(m_images.GetCount());
 
-    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+    if (bitmap.IsKindOf(wxCLASSINFO(wxIcon)))
     {
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
     }
@@ -155,7 +154,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
-    wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ?
+    wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ?
                              #if defined(__VISAGECPP__)
                                //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
                                //so construct it from a bitmap object until I can figure this nonsense out. (DW)
@@ -188,7 +187,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
 
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
-    wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ?
+    wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ?
                              #if defined(__VISAGECPP__)
                                //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
                                //so construct it from a bitmap object until I can figure this nonsense out. (DW)
@@ -263,7 +262,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 
-    if (bm->IsKindOf(CLASSINFO(wxIcon)))
+    if (bm->IsKindOf(wxCLASSINFO(wxIcon)))
         dc.DrawIcon( * ((wxIcon*) bm), x, y);
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
diff --git a/Externals/wxWidgets3/src/generic/infobar.cpp b/Externals/wxWidgets3/src/generic/infobar.cpp
index 23d9abf527..3ae926223a 100644
--- a/Externals/wxWidgets3/src/generic/infobar.cpp
+++ b/Externals/wxWidgets3/src/generic/infobar.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic wxInfoBar implementation
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
-// RCS-ID:      $Id: infobar.cpp 63613 2010-03-03 07:17:18Z RD $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -38,41 +37,12 @@
 #endif // WX_PRECOMP
 
 #include "wx/artprov.h"
-#include "wx/renderer.h"
 #include "wx/scopeguard.h"
 
 BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
     EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)
 END_EVENT_TABLE()
 
-// ----------------------------------------------------------------------------
-// local helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-
-wxBitmap
-GetCloseButtonBitmap(wxWindow *win,
-                     const wxSize& size,
-                     const wxColour& colBg,
-                     int flags = 0)
-{
-    wxBitmap bmp(size);
-    wxMemoryDC dc(bmp);
-    dc.SetBackground(colBg);
-    dc.Clear();
-    wxRendererNative::Get().
-        DrawTitleBarBitmap(win, dc, size, wxTITLEBAR_BUTTON_CLOSE, flags);
-    return bmp;
-}
-
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
-} // anonymous namespace
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -99,9 +69,7 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
         return false;
 
     // use special, easy to notice, colours
-    const wxColour colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
-    SetBackgroundColour(colBg);
-    SetOwnForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
 
     // create the controls: icon, text and the button to dismiss the
     // message.
@@ -110,32 +78,9 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
     m_icon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
 
     m_text = new wxStaticText(this, wxID_ANY, "");
+    m_text->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
 
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON);
-    wxBitmap bmp = GetCloseButtonBitmap(this, sizeBmp, colBg);
-#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
-    wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON);
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-    m_button = new wxBitmapButton
-                   (
-                    this,
-                    wxID_ANY,
-                    bmp,
-                    wxDefaultPosition,
-                    wxDefaultSize,
-                    wxBORDER_NONE
-                   );
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    m_button->SetBitmapPressed(
-        GetCloseButtonBitmap(this, sizeBmp, colBg, wxCONTROL_PRESSED));
-
-    m_button->SetBitmapCurrent(
-        GetCloseButtonBitmap(this, sizeBmp, colBg, wxCONTROL_CURRENT));
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
-    m_button->SetBackgroundColour(colBg);
+    m_button = wxBitmapButton::NewCloseButton(this, wxID_ANY);
     m_button->SetToolTip(_("Hide this notification message."));
 
     // center the text inside the sizer with an icon to the left of it and a
@@ -165,6 +110,17 @@ bool wxInfoBarGeneric::SetFont(const wxFont& font)
     return true;
 }
 
+bool wxInfoBarGeneric::SetForegroundColour(const wxColor& colour)
+{
+    if ( !wxInfoBarBase::SetForegroundColour(colour) )
+        return false;
+
+    if ( m_text )
+        m_text->SetForegroundColour(colour);
+
+    return true;
+}
+
 wxInfoBarGeneric::BarPlacement wxInfoBarGeneric::GetBarPlacement() const
 {
     wxSizer * const sizer = GetContainingSizer();
diff --git a/Externals/wxWidgets3/src/generic/laywin.cpp b/Externals/wxWidgets3/src/generic/laywin.cpp
index e9d6fe7db1..5cb58f3f6a 100644
--- a/Externals/wxWidgets3/src/generic/laywin.cpp
+++ b/Externals/wxWidgets3/src/generic/laywin.cpp
@@ -7,7 +7,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: laywin.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -238,7 +237,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
 
     int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0;
 #if wxUSE_SASH
-    if (parent->IsKindOf(CLASSINFO(wxSashWindow)))
+    if (wxDynamicCast(parent, wxSashWindow))
     {
         wxSashWindow* sashWindow = (wxSashWindow*) parent;
 
diff --git a/Externals/wxWidgets3/src/generic/listbkg.cpp b/Externals/wxWidgets3/src/generic/listbkg.cpp
index c43149f5f9..c9584d1ff3 100644
--- a/Externals/wxWidgets3/src/generic/listbkg.cpp
+++ b/Externals/wxWidgets3/src/generic/listbkg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id: listbkg.cpp 65967 2010-10-31 13:33:34Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,26 +35,6 @@
 #include "wx/statline.h"
 #include "wx/imaglist.h"
 
-#include "wx/sysopt.h"
-
-namespace
-{
-
-// FIXME: This function exists because native OS X wxListCtrl seems to have
-// problems with report view, either imperfect display or reported hanging, so
-// disable it for now (but it should be fixed, and this function removed).
-bool CanUseReportView()
-{
-#if defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-    if (wxSystemOptions::GetOptionInt(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL) == 0)
-        return false;
-    else
-#endif
-        return true;
-}
-
-} // anonymous namespace
-
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 // ----------------------------------------------------------------------------
@@ -69,8 +48,8 @@ bool CanUseReportView()
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
@@ -117,13 +96,11 @@ wxListbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxLC_SINGLE_SEL |
-                    (CanUseReportView() ? GetListCtrlReportViewFlags()
-                                        : GetListCtrlIconViewFlags())
+                    GetListCtrlFlags()
                  );
 
-    if ( CanUseReportView() )
-        GetListView()->InsertColumn(0, wxT("Pages"));
+    if ( GetListView()->InReportView() )
+        GetListView()->InsertColumn(0, wxS("Pages"));
 
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
@@ -142,14 +119,40 @@ wxListbook::Create(wxWindow *parent,
 // wxListCtrl flags
 // ----------------------------------------------------------------------------
 
-long wxListbook::GetListCtrlIconViewFlags() const
+long wxListbook::GetListCtrlFlags() const
 {
-    return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
-}
+    // We'd like to always use wxLC_ICON mode but it doesn't work with the
+    // native wxListCtrl under MSW unless we do have icons for all the items,
+    // so we can't use it if we have no image list. In this case we'd like to
+    // use wxLC_LIST mode because it works correctly for both horizontally and
+    // vertically laid out controls, but MSW native wxListCtrl insists on
+    // creating multiple columns if there are too many items and there doesn't
+    // seem anything to do about it, so we have to use wxLC_REPORT mode in this
+    // case there.
 
-long wxListbook::GetListCtrlReportViewFlags() const
-{
-    return wxLC_REPORT | wxLC_NO_HEADER;
+    long flags = IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP;
+    if ( GetImageList() )
+    {
+        flags |= wxLC_ICON;
+    }
+    else // No images.
+    {
+#ifdef __WXMSW__
+        if ( !IsVertical() )
+        {
+            // Notice that we intentionally overwrite the alignment flags here
+            // by not using "|=", alignment isn't used for report view.
+            flags = wxLC_REPORT | wxLC_NO_HEADER;
+        }
+        else
+#endif // __WXMSW__
+        {
+            flags |= wxLC_LIST;
+        }
+    }
+
+    // Use single selection in any case.
+    return flags | wxLC_SINGLE_SEL;
 }
 
 // ----------------------------------------------------------------------------
@@ -259,40 +262,31 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
-    if ( CanUseReportView() )
-    {
-        wxListView * const list = GetListView();
-
-        // If imageList presence has changed, we update the list control view
-        if ( (imageList != NULL) != (GetImageList() != NULL) )
-        {
-            // Preserve the selection which is lost when changing the mode
-            const int oldSel = GetSelection();
-
-            // Update the style to use icon view for images, report view otherwise
-            long style = wxLC_SINGLE_SEL;
-            if ( imageList )
-            {
-                style |= GetListCtrlIconViewFlags();
-            }
-            else // no image list
-            {
-                style |= GetListCtrlReportViewFlags();
-            }
-
-            list->SetWindowStyleFlag(style);
-            if ( !imageList )
-                list->InsertColumn(0, wxT("Pages"));
-
-            // Restore selection
-            if ( oldSel != wxNOT_FOUND )
-                SetSelection(oldSel);
-        }
-
-        list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
-    }
+    const long flagsOld = GetListCtrlFlags();
 
     wxBookCtrlBase::SetImageList(imageList);
+
+    const long flagsNew = GetListCtrlFlags();
+
+    wxListView * const list = GetListView();
+
+    // We may need to change the list control mode if the image list presence
+    // has changed.
+    if ( flagsNew != flagsOld )
+    {
+        // Preserve the selection which is lost when changing the mode
+        const int oldSel = GetSelection();
+
+        list->SetWindowStyleFlag(flagsNew);
+        if ( list->InReportView() )
+            list->InsertColumn(0, wxS("Pages"));
+
+        // Restore selection
+        if ( oldSel != wxNOT_FOUND )
+            SetSelection(oldSel);
+    }
+
+    list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
 }
 
 // ----------------------------------------------------------------------------
@@ -308,12 +302,12 @@ void wxListbook::UpdateSelectedPage(size_t newsel)
 
 wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+    return new wxBookCtrlEvent(wxEVT_LISTBOOK_PAGE_CHANGING, m_windowId);
 }
 
 void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)
 {
-    event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
+    event.SetEventType(wxEVT_LISTBOOK_PAGE_CHANGED);
 }
 
 
@@ -353,28 +347,13 @@ wxListbook::InsertPage(size_t n,
 
 wxWindow *wxListbook::DoRemovePage(size_t page)
 {
-    const size_t page_count = GetPageCount();
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetListView()->DeleteItem(page);
 
-        if (m_selection >= (int)page)
-        {
-            // force new sel valid if possible
-            int sel = m_selection - 1;
-            if (page_count == 1)
-                sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == wxNOT_FOUND))
-                sel = 0;
-
-            // force sel invalid if deleting current page - don't try to hide it
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
-
-            if ((sel != wxNOT_FOUND) && (sel != m_selection))
-                SetSelection(sel);
-        }
+        DoSetSelectionAfterRemoval(page);
 
         GetListView()->Arrange();
         UpdateSize();
diff --git a/Externals/wxWidgets3/src/generic/listctrl.cpp b/Externals/wxWidgets3/src/generic/listctrl.cpp
index 4f7fe3c9ec..bbe22e4eef 100644
--- a/Externals/wxWidgets3/src/generic/listctrl.cpp
+++ b/Externals/wxWidgets3/src/generic/listctrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)
-// Id:          $Id: listctrl.cpp 70368 2012-01-16 13:37:18Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -934,7 +933,6 @@ void wxListLineData::ReverseHighlight( void )
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
 END_EVENT_TABLE()
 
 void wxListHeaderWindow::Init()
@@ -953,15 +951,17 @@ wxListHeaderWindow::wxListHeaderWindow()
     m_resizeCursor = NULL;
 }
 
-wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
-                                        wxWindowID id,
-                                        wxListMainWindow *owner,
-                                        const wxPoint& pos,
-                                        const wxSize& size,
-                                        long style,
-                                        const wxString &name )
-                  : wxWindow( win, id, pos, size, style, name )
+bool wxListHeaderWindow::Create( wxWindow *win,
+                                 wxWindowID id,
+                                 wxListMainWindow *owner,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style,
+                                 const wxString &name )
 {
+    if ( !wxWindow::Create(win, id, pos, size, style, name) )
+        return false;
+
     Init();
 
     m_owner = owner;
@@ -979,6 +979,8 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
     if (!m_hasFont)
         SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));
 #endif
+
+    return true;
 }
 
 wxListHeaderWindow::~wxListHeaderWindow()
@@ -1215,7 +1217,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 
     if (m_isDragging)
     {
-        SendListEvent(wxEVT_COMMAND_LIST_COL_DRAGGING, event.GetPosition());
+        SendListEvent(wxEVT_LIST_COL_DRAGGING, event.GetPosition());
 
         // we don't draw the line beyond our window, but we allow dragging it
         // there
@@ -1234,7 +1236,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_isDragging = false;
             m_dirty = true;
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
-            SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());
+            SendListEvent(wxEVT_LIST_COL_END_DRAG, event.GetPosition());
         }
         else
         {
@@ -1287,7 +1289,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         {
             if (hit_border && event.LeftDown())
             {
-                if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+                if ( SendListEvent(wxEVT_LIST_COL_BEGIN_DRAG,
                                    event.GetPosition()) )
                 {
                     m_isDragging = true;
@@ -1316,8 +1318,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 SendListEvent( event.LeftDown()
-                                    ? wxEVT_COMMAND_LIST_COL_CLICK
-                                    : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+                                    ? wxEVT_LIST_COL_CLICK
+                                    : wxEVT_LIST_COL_RIGHT_CLICK,
                                 event.GetPosition());
             }
         }
@@ -1341,12 +1343,6 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
-void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
-{
-    m_owner->SetFocus();
-    m_owner->Update();
-}
-
 bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
 {
     wxWindow *parent = GetParent();
@@ -1378,6 +1374,15 @@ void wxListRenameTimer::Notify()
     m_owner->OnRenameTimer();
 }
 
+//-----------------------------------------------------------------------------
+// wxListFindTimer (internal)
+//-----------------------------------------------------------------------------
+
+void wxListFindTimer::Notify()
+{
+    m_owner->OnFindTimer();
+}
+
 //-----------------------------------------------------------------------------
 // wxListTextCtrlWrapper (internal)
 //-----------------------------------------------------------------------------
@@ -1570,6 +1575,8 @@ void wxListMainWindow::Init()
 
     m_lastOnSame = false;
     m_renameTimer = new wxListRenameTimer( this );
+    m_findTimer = NULL;
+    m_findBell = 0;  // default is to not ring bell at all
     m_textctrlWrapper = NULL;
 
     m_current =
@@ -1589,10 +1596,9 @@ wxListMainWindow::wxListMainWindow()
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                     wxWindowID id,
                                     const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    const wxString &name )
-                : wxWindow( parent, id, pos, size, style, name )
+                                    const wxSize& size )
+                : wxWindow( parent, id, pos, size,
+                            wxWANTS_CHARS | wxBORDER_NONE )
 {
     Init();
 
@@ -1633,6 +1639,7 @@ wxListMainWindow::~wxListMainWindow()
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;
     delete m_renameTimer;
+    delete m_findTimer;
 }
 
 void wxListMainWindow::SetReportView(bool inReportView)
@@ -1884,8 +1891,8 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
     if ( changed )
     {
-        SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
-                                    : wxEVT_COMMAND_LIST_ITEM_DESELECTED );
+        SendNotify( line, highlight ? wxEVT_LIST_ITEM_SELECTED
+                                    : wxEVT_LIST_ITEM_DESELECTED );
     }
 
     return changed;
@@ -2039,7 +2046,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         // tell the caller cache to cache the data
         if ( IsVirtual() )
         {
-            wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT,
+            wxListEvent evCache(wxEVT_LIST_CACHE_HINT,
                                 GetParent()->GetId());
             evCache.SetEventObject( GetParent() );
             evCache.m_oldItemIndex = visibleFrom;
@@ -2191,7 +2198,7 @@ void wxListMainWindow::SendNotify( size_t line,
         {
             GetLine(line)->GetItem( 0, le.m_item );
         }
-        //else: this happens for wxEVT_COMMAND_LIST_ITEM_FOCUSED event
+        //else: this happens for wxEVT_LIST_ITEM_FOCUSED event
     }
     //else: there may be no more such item
 
@@ -2207,7 +2214,7 @@ void wxListMainWindow::ChangeCurrent(size_t current)
     if ( m_renameTimer->IsRunning() )
         m_renameTimer->Stop();
 
-    SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);
+    SendNotify(current, wxEVT_LIST_ITEM_FOCUSED);
 }
 
 wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass)
@@ -2215,12 +2222,12 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass
     wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL,
                  wxT("wrong index in wxGenericListCtrl::EditLabel()") );
 
-    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+    wxASSERT_MSG( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)),
                  wxT("EditLabel() needs a text control") );
 
     size_t itemEdit = (size_t)item;
 
-    wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
+    wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_item.m_itemId =
     le.m_itemIndex = item;
@@ -2234,19 +2241,10 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass
         return NULL;
     }
 
-    // We have to call this here because the label in question might just have
-    // been added and no screen update taken place.
     if ( m_dirty )
     {
-        // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead
-        //       so that no pending events may change the item count (see below)
-        //       IMPORTANT: needs to be tested!
-        wxSafeYield();
-
-        // Pending events dispatched by wxSafeYield might have changed the item
-        // count
-        if ( (size_t)item >= GetItemCount() )
-            return NULL;
+        // Ensure the display is updated before we start editing.
+        Update();
     }
 
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
@@ -2263,7 +2261,7 @@ void wxListMainWindow::OnRenameTimer()
 
 bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
 {
-    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_item.m_itemId =
     le.m_itemIndex = itemEdit;
@@ -2281,7 +2279,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
 void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 {
     // let owner know that the edit was cancelled
-    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
 
     le.SetEditCanceled(true);
 
@@ -2296,6 +2294,18 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
     GetEventHandler()->ProcessEvent( le );
 }
 
+void wxListMainWindow::OnFindTimer()
+{
+    m_findPrefix.clear();
+    if ( m_findBell )
+        m_findBell = 1;
+}
+
+void wxListMainWindow::EnableBellOnNoMatch( bool on )
+{
+    m_findBell = on;
+}
+
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
 #ifdef __WXMAC__
@@ -2308,10 +2318,16 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 #endif // __WXMAC__
 
     if ( event.LeftDown() )
-        SetFocus();
+    {
+        // Ensure we skip the event to let the system set focus to this window.
+        event.Skip();
+    }
 
-    event.SetEventObject( GetParent() );
-    if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+    // Pretend that the event happened in wxListCtrl itself.
+    wxMouseEvent me(event);
+    me.SetEventObject( GetParent() );
+    me.SetId(GetParent()->GetId());
+    if ( GetParent()->GetEventHandler()->ProcessEvent( me ))
         return;
 
     if (event.GetEventType() == wxEVT_MOUSEWHEEL)
@@ -2325,7 +2341,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     {
         if (event.RightDown())
         {
-            SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+            SendNotify( (size_t)-1, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
 
             wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
                                       GetParent()->GetId(),
@@ -2381,7 +2397,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_dragCount = 0;
 
     // The only mouse event that can be generated without any valid item is
-    // wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK as it can be useful to have a global
+    // wxEVT_LIST_ITEM_RIGHT_CLICK as it can be useful to have a global
     // popup menu for the list control itself which should be shown even when
     // the user clicks outside of any item.
     if ( !hitResult )
@@ -2389,7 +2405,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         // outside of any item
         if (event.RightDown())
         {
-            SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+            SendNotify( (size_t) -1, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
 
             wxContextMenuEvent evtCtx(
                 wxEVT_CONTEXT_MENU,
@@ -2420,8 +2436,8 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         if (m_dragCount != 3)
             return;
 
-        int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG
-                                          : wxEVT_COMMAND_LIST_BEGIN_DRAG;
+        int command = event.RightIsDown() ? wxEVT_LIST_BEGIN_RDRAG
+                                          : wxEVT_LIST_BEGIN_DRAG;
 
         SendNotify( m_lineLastClicked, command, m_dragStart );
 
@@ -2438,7 +2454,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
         if ( current == m_lineLastClicked )
         {
-            SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+            SendNotify( current, wxEVT_LIST_ITEM_ACTIVATED );
 
             return;
         }
@@ -2472,9 +2488,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                     m_renameTimer->Start(dclick > 0 ? dclick : 250, true);
                 }
             }
+
+            m_lastOnSame = false;
         }
 
-        m_lastOnSame = false;
         m_lineSelectSingleOnUp = (size_t)-1;
     }
     else
@@ -2499,14 +2516,14 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             ReverseHighlight(m_current);
         }
 
-        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+        SendNotify( current, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
 
         // Allow generation of context menu event
         event.Skip();
     }
     else if (event.MiddleDown())
     {
-        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
+        SendNotify( current, wxEVT_LIST_ITEM_MIDDLE_CLICK );
     }
     else if ( event.LeftDown() || forceClick )
     {
@@ -2566,8 +2583,16 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         if (m_current != oldCurrent)
             RefreshLine( oldCurrent );
 
-        // forceClick is only set if the previous click was on another item
-        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;
+        // Set the flag telling us whether the next click on this item should
+        // start editing its label. This should happen if we clicked on the
+        // current item and it was already selected, i.e. if this click was not
+        // done to select it.
+        //
+        // It should not happen if this was a double click (forceClick is true)
+        // nor if we hadn't had the focus before as then this click was used to
+        // give focus to the control.
+        m_lastOnSame = (m_current == oldCurrent) && oldWasSelected &&
+                            !forceClick && HasFocus();
     }
 }
 
@@ -2713,11 +2738,12 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     // propagate the key event upwards
     wxKeyEvent ke(event);
     ke.SetEventObject( parent );
+    ke.SetId(GetParent()->GetId());
     if (parent->GetEventHandler()->ProcessEvent( ke ))
         return;
 
     // send a list event
-    wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, parent->GetId() );
+    wxListEvent le( wxEVT_LIST_KEY_DOWN, parent->GetId() );
     le.m_item.m_itemId =
     le.m_itemIndex = m_current;
     if (HasCurrent())
@@ -2736,6 +2762,8 @@ void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
 
     // propagate the key event upwards
     wxKeyEvent ke(event);
+    ke.SetEventObject( parent );
+    ke.SetId(GetParent()->GetId());
     if (parent->GetEventHandler()->ProcessEvent( ke ))
         return;
 
@@ -2765,6 +2793,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     // propagate the char event upwards
     wxKeyEvent ke(event);
     ke.SetEventObject( parent );
+    ke.SetId(GetParent()->GetId());
     if (parent->GetEventHandler()->ProcessEvent( ke ))
         return;
 
@@ -2790,7 +2819,8 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             event.m_keyCode = WXK_RIGHT;
     }
 
-    switch ( event.GetKeyCode() )
+    int keyCode = event.GetKeyCode();
+    switch ( keyCode )
     {
         case WXK_UP:
             if ( m_current > 0 )
@@ -2873,7 +2903,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 }
                 else // normal space press
                 {
-                    SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+                    SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED );
                 }
             }
             else // multiple selection
@@ -2884,11 +2914,83 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_RETURN:
         case WXK_EXECUTE:
-            SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+            SendNotify( m_current, wxEVT_LIST_ITEM_ACTIVATED );
             break;
 
         default:
-            event.Skip();
+            if ( !event.HasModifiers() &&
+                 ((keyCode >= '0' && keyCode <= '9') ||
+                  (keyCode >= 'a' && keyCode <= 'z') ||
+                  (keyCode >= 'A' && keyCode <= 'Z') ||
+                  (keyCode == '_') ||
+                  (keyCode == '+') ||
+                  (keyCode == '*') ||
+                  (keyCode == '-')))
+            {
+                // find the next item starting with the given prefix
+                wxChar ch = (wxChar)keyCode;
+                size_t item;
+
+                // if the same character is typed multiple times then go to the
+                // next entry starting with that character instead of searching
+                // for an item starting with multiple copies of this character,
+                // this is more useful and is how it works under Windows.
+                if ( m_findPrefix.length() == 1 && m_findPrefix[0] == ch )
+                {
+                    item = PrefixFindItem(m_current, ch);
+                }
+                else
+                {
+                    const wxString newPrefix(m_findPrefix + ch);
+                    item = PrefixFindItem(m_current, newPrefix);
+                    if ( item != (size_t)-1 )
+                        m_findPrefix = newPrefix;
+                }
+
+                // also start the timer to reset the current prefix if the user
+                // doesn't press any more alnum keys soon -- we wouldn't want
+                // to use this prefix for a new item search
+                if ( !m_findTimer )
+                {
+                    m_findTimer = new wxListFindTimer( this );
+                }
+
+                // Notice that we should start the timer even if we didn't find
+                // anything to make sure we reset the search state later.
+                m_findTimer->Start(wxListFindTimer::DELAY, wxTIMER_ONE_SHOT);
+
+                // restart timer even when there's no match so bell get's reset
+                if ( item != (size_t)-1 )
+                {
+                    // Select the found item and go to it.
+                    HighlightAll(false);
+                    SetItemState(item,
+                                 wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED,
+                                 wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED);
+
+                    // Reset the bell flag if it had been temporarily disabled
+                    // before.
+                    if ( m_findBell )
+                        m_findBell = 1;
+                }
+                else // No such item
+                {
+                    // Signal it with a bell if enabled.
+                    if ( m_findBell == 1 )
+                    {
+                        ::wxBell();
+
+                        // Disable it for the next unsuccessful match, we only
+                        // beep once, this is usually enough and continuing to
+                        // do it would be annoying.
+                        m_findBell = -1;
+                    }
+                }
+            }
+            else
+            {
+                event.Skip();
+            }
     }
 }
 
@@ -3394,6 +3496,12 @@ size_t wxListMainWindow::GetItemCount() const
 
 void wxListMainWindow::SetItemCount(long count)
 {
+    // Update the current item if it's not valid any longer (notice that this
+    // invalidates it completely if the control is becoming empty, which is the
+    // right thing to do).
+    if ( HasCurrent() && m_current >= (size_t)count )
+        ChangeCurrent(count - 1);
+
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 
@@ -3839,7 +3947,7 @@ void wxListMainWindow::DeleteItem( long lindex )
         ResetVisibleLinesRange();
     }
 
-    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition );
+    SendNotify( index, wxEVT_LIST_DELETE_ITEM, wxDefaultPosition );
 
     if ( IsVirtual() )
     {
@@ -3917,7 +4025,7 @@ void wxListMainWindow::DoDeleteAllItems()
     // for all of them: this is compatible with wxMSW and documented in
     // DeleteAllItems() description
 
-    wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
+    wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 
@@ -4128,13 +4236,15 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     if ( HasCurrent() && m_current >= id )
         m_current++;
 
-    SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
+    SendNotify(id, wxEVT_LIST_INSERT_ITEM);
 
     RefreshLines(id, GetItemCount() - 1);
 }
 
-void wxListMainWindow::InsertColumn( long col, const wxListItem &item )
+long wxListMainWindow::InsertColumn( long col, const wxListItem &item )
 {
+    long idx = -1;
+
     m_dirty = true;
     if ( InReportView() )
     {
@@ -4151,9 +4261,11 @@ void wxListMainWindow::InsertColumn( long col, const wxListItem &item )
                 node = m_columns.Item( col );
             m_columns.Insert( node, column );
             m_aColWidths.Insert( colWidthInfo, col );
+            idx = col;
         }
         else
         {
+            idx = m_aColWidths.GetCount();
             m_columns.Append( column );
             m_aColWidths.Add( colWidthInfo );
         }
@@ -4175,6 +4287,7 @@ void wxListMainWindow::InsertColumn( long col, const wxListItem &item )
         // invalidate it as it has to be recalculated
         m_headerWidth = 0;
     }
+    return idx;
 }
 
 int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
@@ -4305,6 +4418,61 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
         *to = m_lineTo;
 }
 
+size_t
+wxListMainWindow::PrefixFindItem(size_t idParent,
+                                 const wxString& prefixOrig) const
+{
+    // if no items then just return
+    if ( idParent == (size_t)-1 )
+        return idParent;
+
+    // match is case insensitive as this is more convenient to the user: having
+    // to press Shift-letter to go to the item starting with a capital letter
+    // would be too bothersome
+    wxString prefix = prefixOrig.Lower();
+
+    // determine the starting point: we shouldn't take the current item (this
+    // allows to switch between two items starting with the same letter just by
+    // pressing it) but we shouldn't jump to the next one if the user is
+    // continuing to type as otherwise he might easily skip the item he wanted
+    size_t itemid = idParent;
+    if ( prefix.length() == 1 )
+    {
+        itemid += 1;
+    }
+
+    // look for the item starting with the given prefix after it
+    while ( ( itemid < (size_t)GetItemCount() ) &&
+            !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) )
+    {
+        itemid += 1;
+    }
+
+    // if we haven't found anything...
+    if ( !( itemid < (size_t)GetItemCount() ) )
+    {
+        // ... wrap to the beginning
+        itemid = 0;
+
+        // and try all the items (stop when we get to the one we started from)
+        while ( ( itemid < (size_t)GetItemCount() ) && itemid != idParent &&
+                    !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) )
+        {
+            itemid += 1;
+        }
+        // If we haven't found the item, id will be (size_t)-1, as per
+        // documentation
+        if ( !( itemid < (size_t)GetItemCount() ) ||
+             ( ( itemid == idParent ) &&
+               !GetLine(itemid)->GetText(0).Lower().StartsWith(prefix) ) )
+        {
+            itemid = (size_t)-1;
+        }
+    }
+
+    return itemid;
+}
+
 // -------------------------------------------------------------------------------------
 // wxGenericListCtrl
 // -------------------------------------------------------------------------------------
@@ -4350,7 +4518,13 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded()
 
     if (needs_header)
     {
-        m_headerWin = new wxListHeaderWindow
+        // Notice that we must initialize m_headerWin first, and create the
+        // real window only later, so that the test in the beginning of the
+        // function blocks repeated creation of the header as it could happen
+        // before via wxNavigationEnabled::AddChild() -> ToggleWindowStyle() ->
+        // SetWindowStyleFlag().
+        m_headerWin = new wxListHeaderWindow();
+        m_headerWin->Create
                       (
                         this, wxID_ANY, m_mainWin,
                         wxPoint(0,0),
@@ -4361,7 +4535,7 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded()
                         ),
                         wxTAB_TRAVERSAL
                       );
-
+        
 #if defined( __WXMAC__ )
         static wxFont font( wxOSX_SYSTEM_FONT_SMALL );
         m_headerWin->SetFont( font );
@@ -4396,12 +4570,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
                                   validator, name ) )
         return false;
 
-#ifdef __WXGTK__
-    style &= ~wxBORDER_MASK;
-    style |= wxBORDER_THEME;
-#endif
-
-    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
+    m_mainWin = new wxListMainWindow(this, wxID_ANY, wxPoint(0, 0), size);
 
     SetTargetWindow( m_mainWin );
 
@@ -4458,13 +4627,14 @@ void wxGenericListCtrl::OnScroll(wxScrollWinEvent& event)
     // the window the next time
     m_mainWin->ResetVisibleLinesRange();
 
-    HandleOnScroll( event );
-
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
         m_headerWin->Refresh();
         m_headerWin->Update();
     }
+
+    // Let the window be scrolled as usual by the default handler.
+    event.Skip();
 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )
@@ -4960,14 +5130,14 @@ long wxGenericListCtrl::DoInsertColumn( long col, const wxListItem &item )
 {
     wxCHECK_MSG( InReportView(), -1, wxT("can't add column in non report mode") );
 
-    m_mainWin->InsertColumn( col, item );
+    long idx = m_mainWin->InsertColumn( col, item );
 
     // NOTE: if wxLC_NO_HEADER was given, then we are in report view mode but
     //       still have m_headerWin==NULL
     if (m_headerWin)
         m_headerWin->Refresh();
 
-    return 0;
+    return idx;
 }
 
 bool wxGenericListCtrl::ScrollList( int dx, int dy )
@@ -5027,6 +5197,9 @@ void wxGenericListCtrl::OnInternalIdle()
 
 bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )
 {
+    if ( !wxWindow::SetBackgroundColour( colour ) )
+        return false;
+
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
@@ -5047,9 +5220,6 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
         m_mainWin->m_dirty = true;
     }
 
-    if (m_headerWin)
-        m_headerWin->SetForegroundColour( colour );
-
     return true;
 }
 
@@ -5134,38 +5304,10 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 #endif
 }
 
-void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
-{
-    // It's not clear whether this can be called before m_mainWin is created
-    // but it seems better to be on the safe side and check.
-    if ( m_mainWin )
-        m_mainWin->DoClientToScreen(x, y);
-    else
-        wxListCtrlBase::DoClientToScreen(x, y);
-}
-
-void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
-{
-    // At least in wxGTK/Univ build this method can be called before m_mainWin
-    // is created so avoid crashes in this case.
-    if ( m_mainWin )
-        m_mainWin->DoScreenToClient(x, y);
-    else
-        wxListCtrlBase::DoScreenToClient(x, y);
-}
-
-void wxGenericListCtrl::SetFocus()
-{
-    // The test in window.cpp fails as we are a composite
-    // window, so it checks against "this", but not m_mainWin.
-    if ( DoFindFocus() != this )
-        m_mainWin->SetFocus();
-}
-
 wxSize wxGenericListCtrl::DoGetBestClientSize() const
 {
-    // Something is better than nothing even if this is completely arbitrary.
-    wxSize sizeBest(100, 80);
+    // The base class version can compute the best size in report view only.
+    wxSize sizeBest = wxListCtrlBase::DoGetBestClientSize();
 
     if ( !InReportView() )
     {
@@ -5250,16 +5392,6 @@ int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
    return -1;
 }
 
-wxListItemAttr *
-wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
-    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  wxT("invalid item index in OnGetItemAttr()") );
-
-    // no attributes by default
-    return NULL;
-}
-
 void wxGenericListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
@@ -5277,6 +5409,11 @@ void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
+void wxGenericListCtrl::EnableBellOnNoMatch( bool on )
+{
+    m_mainWin->EnableBellOnNoMatch(on);
+}
+
 // Generic wxListCtrl is more or less a container for two other
 // windows which drawings are done upon. These are namely
 // 'm_headerWin' and 'm_mainWin'.
diff --git a/Externals/wxWidgets3/src/generic/logg.cpp b/Externals/wxWidgets3/src/generic/logg.cpp
index e40376598f..6204463346 100644
--- a/Externals/wxWidgets3/src/generic/logg.cpp
+++ b/Externals/wxWidgets3/src/generic/logg.cpp
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99 (extracted from src/common/log.cpp)
-// RCS-ID:      $Id: logg.cpp 70671 2012-02-22 17:35:21Z JS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -69,10 +68,6 @@
     #include "wx/image.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
-#if defined(__MWERKS__) && wxUSE_UNICODE
-    #include <wtime.h>
-#endif
-
 #include "wx/time.h"
 
 // the suffix we add to the button to show that the dialog can be expanded
@@ -376,7 +371,7 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
                 // find the top window and set it's status text if it has any
                 if ( pFrame == NULL ) {
                     wxWindow *pWin = wxTheApp->GetTopWindow();
-                    if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
+                    if ( wxDynamicCast(pWin, wxFrame) ) {
                         pFrame = (wxFrame *)pWin;
                     }
                 }
@@ -452,6 +447,9 @@ public:
     wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);
     virtual ~wxLogFrame();
 
+    // Don't prevent the application from exiting if just this frame remains.
+    virtual bool ShouldPreventAppExit() const { return false; }
+
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
@@ -530,8 +528,6 @@ wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTi
     // status bar for menu prompts
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR
-
-    m_log->OnFrameCreate(this);
 }
 
 void wxLogFrame::DoClose()
@@ -645,10 +641,6 @@ wxFrame *wxLogWindow::GetFrame() const
     return m_pLogFrame;
 }
 
-void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
-{
-}
-
 bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 {
     // allow to close
@@ -784,7 +776,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     btnSizer->Add(new wxButton(win, wxID_SAVE), flagsBtn);
 #endif // CAN_SAVE_FILES
 
-    paneSz->Add(btnSizer, wxSizerFlags().Right().Border(wxTOP));
+    paneSz->Add(btnSizer, wxSizerFlags().Right().Border(wxTOP|wxBOTTOM));
 #endif // wxUSE_CLIPBOARD || CAN_SAVE_FILES
 
     win->SetSizer(paneSz);
diff --git a/Externals/wxWidgets3/src/generic/markuptext.cpp b/Externals/wxWidgets3/src/generic/markuptext.cpp
index 9b941d382d..03c587c91a 100644
--- a/Externals/wxWidgets3/src/generic/markuptext.cpp
+++ b/Externals/wxWidgets3/src/generic/markuptext.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxMarkupText implementation
 // Author:      Vadim Zeitlin
 // Created:     2011-02-21
-// RCS-ID:      $Id: markuptext.cpp 67075 2011-02-27 18:36:48Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/mask.cpp b/Externals/wxWidgets3/src/generic/mask.cpp
index a7ea34ad2a..504a462855 100644
--- a/Externals/wxWidgets3/src/generic/mask.cpp
+++ b/Externals/wxWidgets3/src/generic/mask.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic wxMask implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28
-// RCS-ID:      $Id: mask.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/mdig.cpp b/Externals/wxWidgets3/src/generic/mdig.cpp
index 2c09f0c62d..c4a9a21f7b 100644
--- a/Externals/wxWidgets3/src/generic/mdig.cpp
+++ b/Externals/wxWidgets3/src/generic/mdig.cpp
@@ -4,7 +4,6 @@
 // Author:      Hans Van Leemputten
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     29/07/2002
-// RCS-ID:      $Id: mdig.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) 2002 Hans Van Leemputten
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -359,7 +358,7 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
         // the menu events should be given to the child as we show its menu bar
         // as our own
         const wxEventType eventType = event.GetEventType();
-        if ( eventType == wxEVT_COMMAND_MENU_SELECTED ||
+        if ( eventType == wxEVT_MENU ||
              eventType == wxEVT_UPDATE_UI )
         {
             // set the flag indicating that this event was forwarded to the
@@ -537,7 +536,7 @@ wxGenericMDIClientWindow::CreateGenericClient(wxWindow *parent)
     m_notebook = new wxNotebook(this, wxID_ANY);
     m_notebook->Connect
                 (
-                    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+                    wxEVT_NOTEBOOK_PAGE_CHANGED,
                     wxNotebookEventHandler(
                         wxGenericMDIClientWindow::OnPageChanged),
                     NULL,
diff --git a/Externals/wxWidgets3/src/generic/msgdlgg.cpp b/Externals/wxWidgets3/src/generic/msgdlgg.cpp
index fe1e70f82a..5fbded43cc 100644
--- a/Externals/wxWidgets3/src/generic/msgdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/msgdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: msgdlgg.cpp 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,7 @@
 #include "wx/msgdlg.h"
 #include "wx/artprov.h"
 #include "wx/textwrapper.h"
+#include "wx/modalhook.h"
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
@@ -165,8 +165,6 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
 {
     wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
 
-    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
@@ -181,7 +179,7 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
                                     wxID_ANY,
                                     wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
                                    );
-        if (is_pda)
+        if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA )
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else
             icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20));
@@ -268,6 +266,8 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 
 int wxGenericMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     if ( !m_created )
     {
         m_created = true;
diff --git a/Externals/wxWidgets3/src/generic/notebook.cpp b/Externals/wxWidgets3/src/generic/notebook.cpp
index a6b0fb71be..8caf0cda1e 100644
--- a/Externals/wxWidgets3/src/generic/notebook.cpp
+++ b/Externals/wxWidgets3/src/generic/notebook.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id: notebook.cpp 66643 2011-01-07 22:31:26Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -709,7 +708,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   if (!m_notebook)
     return;
 
-  wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
+  wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
 
   // Translate from wxTabView's ids (which aren't position-dependent)
   // to wxNotebook's (which are).
@@ -732,7 +731,7 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
 
   if (m_notebook)
   {
-    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId());
+    wxBookCtrlEvent event(wxEVT_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId());
 
     // Translate from wxTabView's ids (which aren't position-dependent)
     // to wxNotebook's (which are).
diff --git a/Externals/wxWidgets3/src/generic/notifmsgg.cpp b/Externals/wxWidgets3/src/generic/notifmsgg.cpp
index cea66601d0..c941cfa39b 100644
--- a/Externals/wxWidgets3/src/generic/notifmsgg.cpp
+++ b/Externals/wxWidgets3/src/generic/notifmsgg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxGenericNotificationMessage
 // Author:      Vadim Zeitlin
 // Created:     2007-11-24
-// RCS-ID:      $Id: notifmsgg.cpp 62071 2009-09-24 12:36:34Z JS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/numdlgg.cpp b/Externals/wxWidgets3/src/generic/numdlgg.cpp
index 73067b7552..8b742e7edd 100644
--- a/Externals/wxWidgets3/src/generic/numdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/numdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
-// RCS-ID:      $Id: numdlgg.cpp 64019 2010-04-18 00:05:37Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/odcombo.cpp b/Externals/wxWidgets3/src/generic/odcombo.cpp
index 91d1c3ffa3..d48bf5a085 100644
--- a/Externals/wxWidgets3/src/generic/odcombo.cpp
+++ b/Externals/wxWidgets3/src/generic/odcombo.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: odcombo.cpp 70625 2012-02-19 14:49:37Z SN $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -163,7 +162,7 @@ wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     wxCoord h = combo->OnMeasureItem(n);
@@ -176,7 +175,7 @@ wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t n) const
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     return combo->OnMeasureItemWidth(n);
@@ -189,7 +188,7 @@ void wxVListBoxComboPopup::OnDrawBg( wxDC& dc,
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     if ( IsCurrent((size_t)item) && !(flags & wxODCB_PAINTING_CONTROL) )
@@ -208,7 +207,7 @@ void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, i
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     combo->OnDrawItem(dc,rect,item,flags);
@@ -237,7 +236,7 @@ void wxVListBoxComboPopup::DismissWithEvent()
 
 void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 {
-    wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
+    wxCommandEvent evt(wxEVT_COMBOBOX,m_combo->GetId());
 
     evt.SetEventObject(m_combo);
 
@@ -277,12 +276,14 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
             keychar = 0;
     }
 
-    if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || keycode == WXK_RIGHT )
+    const bool readOnly = (comboStyle & wxCB_READONLY) != 0;
+
+    if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || ( keycode == WXK_RIGHT && readOnly ) )
     {
         value++;
         StopPartialCompletion();
     }
-    else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || keycode == WXK_LEFT )
+    else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || ( keycode == WXK_LEFT && readOnly ) )
     {
         value--;
         StopPartialCompletion();
@@ -297,17 +298,17 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
         value-=10;
         StopPartialCompletion();
     }
-    else if ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME )
+    else if ( ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME ) && readOnly )
     {
         value=0;
         StopPartialCompletion();
     }
-    else if ( keycode == WXK_END || keycode == WXK_NUMPAD_END )
+    else if ( ( keycode == WXK_END || keycode == WXK_NUMPAD_END ) && readOnly )
     {
         value=itemCount-1;
         StopPartialCompletion();
     }
-    else if ( keychar && (comboStyle & wxCB_READONLY) )
+    else if ( keychar && readOnly )
     {
         // Try partial completion
 
@@ -723,6 +724,8 @@ void wxVListBoxComboPopup::CalcWidths()
         // wxWindow::GetTextExtent (assuming same dc is used
         // for all calls, as we do here).
         wxClientDC dc(m_combo);
+        if ( !m_useFont.IsOk() )
+            m_useFont = m_combo->GetFont();
         dc.SetFont(m_useFont);
 
         for ( i=0; i<n; i++ )
@@ -1169,6 +1172,18 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
     return -1;
 }
 
+wxSize wxOwnerDrawnComboBox::DoGetBestSize() const
+{
+    if ( GetCount() == 0 )
+        return wxComboCtrlBase::DoGetBestSize();
+
+    wxOwnerDrawnComboBox* odc = const_cast<wxOwnerDrawnComboBox*>(this);
+    // TODO: this class may also have GetHightestItemHeight() and
+    // GetHightestItem() methods, and so set the whole (edit part + arrow)
+    // control's height according with this max height, not only max width.
+    return GetSizeFromTextSize(odc->GetWidestItemWidth());
+}
+
 void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc,
                                             const wxRect& rect,
                                             int WXUNUSED(item),
diff --git a/Externals/wxWidgets3/src/generic/paletteg.cpp b/Externals/wxWidgets3/src/generic/paletteg.cpp
index c4e8f6b9d6..746f3cedc3 100644
--- a/Externals/wxWidgets3/src/generic/paletteg.cpp
+++ b/Externals/wxWidgets3/src/generic/paletteg.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// RCS-ID:      $Id: paletteg.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/preferencesg.cpp b/Externals/wxWidgets3/src/generic/preferencesg.cpp
new file mode 100644
index 0000000000..97236af305
--- /dev/null
+++ b/Externals/wxWidgets3/src/generic/preferencesg.cpp
@@ -0,0 +1,260 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/preferencesg.cpp
+// Purpose:     Implementation of wxPreferencesEditor.
+// Author:      Vaclav Slavik
+// Created:     2013-02-19
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_PREFERENCES_EDITOR
+
+#include "wx/private/preferences.h"
+
+#ifndef wxHAS_PREF_EDITOR_NATIVE
+
+#include "wx/app.h"
+#include "wx/dialog.h"
+#include "wx/notebook.h"
+#include "wx/sizer.h"
+#include "wx/sharedptr.h"
+#include "wx/scopedptr.h"
+#include "wx/scopeguard.h"
+#include "wx/vector.h"
+
+namespace
+{
+
+class wxGenericPrefsDialog : public wxDialog
+{
+public:
+    wxGenericPrefsDialog(wxWindow *parent, const wxString& title)
+        : wxDialog(parent, wxID_ANY, title,
+                   wxDefaultPosition, wxDefaultSize,
+                   wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX))
+    {
+        SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+
+        wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+        m_notebook = new wxNotebook(this, wxID_ANY);
+        sizer->Add(m_notebook, wxSizerFlags(1).Expand().DoubleBorder());
+
+#ifdef __WXGTK__
+        SetEscapeId(wxID_CLOSE);
+        sizer->Add(CreateButtonSizer(wxCLOSE), wxSizerFlags().Expand().DoubleBorder(wxBOTTOM));
+#else
+        sizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
+                   wxSizerFlags().Expand().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM));
+#endif
+        SetSizer(sizer);
+    }
+
+    void AddPage(wxPreferencesPage *page)
+    {
+        wxWindow *win = page->CreateWindow(m_notebook);
+        m_notebook->AddPage(win, page->GetName());
+    }
+
+    int GetSelectedPage() const
+    {
+        return m_notebook->GetSelection();
+    }
+
+    void SelectPage(int page)
+    {
+        m_notebook->ChangeSelection(page);
+    }
+
+private:
+    wxNotebook *m_notebook;
+};
+
+
+class wxGenericPreferencesEditorImplBase : public wxPreferencesEditorImpl
+{
+public:
+    void SetTitle(const wxString& title)
+    {
+        m_title = title;
+    }
+
+    virtual void AddPage(wxPreferencesPage* page)
+    {
+        m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page));
+    }
+
+protected:
+    wxGenericPrefsDialog *CreateDialog(wxWindow *parent)
+    {
+        if ( m_title.empty() )
+        {
+            // Use the default title, which should include the application name
+            // under both MSW and GTK (and OSX uses its own native
+            // implementation anyhow).
+            m_title.Printf(_("%s Preferences"), wxTheApp->GetAppDisplayName());
+        }
+
+        wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent, m_title);
+
+        // TODO: Don't create all pages immediately like this, do it on demand
+        //       when a page is selected in the notebook (as is done on OS X).
+        //
+        //       Currently, creating all pages is necessary so that the notebook
+        //       can determine its best size. We'll need to extend
+        //       wxPreferencesPage with a GetBestSize() virtual method to make
+        //       it possible to defer the creation.
+        for ( Pages::const_iterator i = m_pages.begin();
+              i != m_pages.end();
+              ++i )
+        {
+            dlg->AddPage(i->get());
+        }
+
+        dlg->Fit();
+
+        return dlg;
+    }
+
+    typedef wxVector< wxSharedPtr<wxPreferencesPage> > Pages;
+    Pages m_pages;
+
+private:
+    wxString m_title;
+};
+
+
+#ifdef wxHAS_PREF_EDITOR_MODELESS
+
+class wxModelessPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
+{
+public:
+    virtual ~wxModelessPreferencesEditorImpl()
+    {
+        // m_win may already be destroyed if this destructor is called from
+        // wxApp's destructor. In that case, all windows -- including this
+        // one -- would already be destroyed by now.
+        if ( m_win )
+            m_win->Destroy();
+    }
+
+    virtual void Show(wxWindow* parent)
+    {
+        if ( !m_win )
+        {
+            wxWindow *win = CreateDialog(parent);
+            win->Show();
+            m_win = win;
+        }
+        else
+        {
+            // Ideally, we'd reparent the dialog under 'parent', but it's
+            // probably not worth the hassle. We know the old parent is still
+            // valid, because otherwise Dismiss() would have been called and
+            // m_win cleared.
+            m_win->Raise();
+        }
+    }
+
+    virtual void Dismiss()
+    {
+        if ( m_win )
+        {
+            m_win->Close(/*force=*/true);
+            m_win = NULL;
+        }
+    }
+
+private:
+    wxWeakRef<wxWindow> m_win;
+};
+
+inline
+wxGenericPreferencesEditorImplBase* NewGenericImpl()
+{
+    return new wxModelessPreferencesEditorImpl;
+}
+
+#else // !wxHAS_PREF_EDITOR_MODELESS
+
+class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
+{
+public:
+    wxModalPreferencesEditorImpl()
+    {
+        m_dlg = NULL;
+        m_currentPage = -1;
+    }
+
+    virtual void Show(wxWindow* parent)
+    {
+        wxScopedPtr<wxGenericPrefsDialog> dlg(CreateDialog(parent));
+
+        // Store it for Dismiss() but ensure that the pointer is reset to NULL
+        // when the dialog is destroyed on leaving this function.
+        m_dlg = dlg.get();
+        wxON_BLOCK_EXIT_NULL(m_dlg);
+
+        // Restore the previously selected page, if any.
+        if ( m_currentPage != -1 )
+            dlg->SelectPage(m_currentPage);
+
+        // Don't remember the last selected page if the dialog was cancelled.
+        if ( dlg->ShowModal() != wxID_CANCEL )
+            m_currentPage = dlg->GetSelectedPage();
+    }
+
+    virtual void Dismiss()
+    {
+        if ( m_dlg )
+        {
+            m_dlg->EndModal(wxID_CANCEL);
+            m_dlg = NULL;
+        }
+    }
+
+private:
+    wxGenericPrefsDialog* m_dlg;
+    int m_currentPage;
+
+    wxDECLARE_NO_COPY_CLASS(wxModalPreferencesEditorImpl);
+};
+
+inline
+wxGenericPreferencesEditorImplBase* NewGenericImpl()
+{
+    return new wxModalPreferencesEditorImpl;
+}
+
+#endif // !wxHAS_PREF_EDITOR_MODELESS
+
+} // anonymous namespace
+
+/*static*/
+wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create(const wxString& title)
+{
+    wxGenericPreferencesEditorImplBase* const impl = NewGenericImpl();
+
+    impl->SetTitle(title);
+
+    return impl;
+}
+
+#endif // !wxHAS_PREF_EDITOR_NATIVE
+
+#endif // wxUSE_PREFERENCES_EDITOR
diff --git a/Externals/wxWidgets3/src/generic/printps.cpp b/Externals/wxWidgets3/src/generic/printps.cpp
index 463ff3e09d..00de8a9666 100644
--- a/Externals/wxWidgets3/src/generic/printps.cpp
+++ b/Externals/wxWidgets3/src/generic/printps.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: printps.cpp 66427 2010-12-22 13:57:03Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/prntdlgg.cpp b/Externals/wxWidgets3/src/generic/prntdlgg.cpp
index 69141398ee..41d3dda771 100644
--- a/Externals/wxWidgets3/src/generic/prntdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/prntdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: prntdlgg.cpp 69828 2011-11-27 19:49:43Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,11 +63,6 @@
 
 #ifndef __WXUNIVERSAL__
 
-#if wxUSE_LIBGNOMEPRINT
-    #include "wx/link.h"
-    wxFORCE_LINK_MODULE(gnome_print)
-#endif
-
 #if wxUSE_GTKPRINT
     #include "wx/link.h"
     wxFORCE_LINK_MODULE(gtk_print)
diff --git a/Externals/wxWidgets3/src/generic/progdlgg.cpp b/Externals/wxWidgets3/src/generic/progdlgg.cpp
index d8f04b6c1a..7b6fd4701b 100644
--- a/Externals/wxWidgets3/src/generic/progdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/progdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     09.05.1999
-// RCS-ID:      $Id: progdlgg.cpp 70512 2012-02-05 14:18:25Z VZ $
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/propdlg.cpp b/Externals/wxWidgets3/src/generic/propdlg.cpp
index cc88b00955..d33530a831 100644
--- a/Externals/wxWidgets3/src/generic/propdlg.cpp
+++ b/Externals/wxWidgets3/src/generic/propdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-03-12
-// RCS-ID:      $Id: propdlg.cpp 64019 2010-04-18 00:05:37Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/regiong.cpp b/Externals/wxWidgets3/src/generic/regiong.cpp
index a7af760553..7580c44432 100644
--- a/Externals/wxWidgets3/src/generic/regiong.cpp
+++ b/Externals/wxWidgets3/src/generic/regiong.cpp
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/12
-// RCS-ID:      $Id: regiong.cpp 70625 2012-02-19 14:49:37Z SN $
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/renderg.cpp b/Externals/wxWidgets3/src/generic/renderg.cpp
index 5a3598e798..93354ab404 100644
--- a/Externals/wxWidgets3/src/generic/renderg.cpp
+++ b/Externals/wxWidgets3/src/generic/renderg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp b/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp
index d7741167b3..397cfd051a 100644
--- a/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/richmsgdlgg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericRichMessageDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-04
-// RCS-ID:      $Id: richmsgdlgg.cpp 66669 2011-01-12 13:39:29Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/richtooltipg.cpp b/Externals/wxWidgets3/src/generic/richtooltipg.cpp
index 68810dae92..2986f9be31 100644
--- a/Externals/wxWidgets3/src/generic/richtooltipg.cpp
+++ b/Externals/wxWidgets3/src/generic/richtooltipg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxRichToolTip.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-07
-// RCS-ID:      $Id: richtooltipg.cpp 69968 2011-12-09 15:58:40Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -232,27 +231,44 @@ public:
         }
     }
 
-    void DoShow()
+    void SetPosition(const wxRect* rect)
     {
-        wxPoint pos = GetTipPoint();
+        wxPoint pos;
+
+        if ( !rect || rect->IsEmpty() )
+            pos = GetTipPoint();
+        else
+            pos = GetParent()->ClientToScreen( wxPoint( rect->x + rect->width / 2, rect->y + rect->height / 2 ) );
 
         // We want our anchor point to coincide with this position so offset
         // the position of the top left corner passed to Move() accordingly.
         pos -= m_anchorPos;
 
         Move(pos, wxSIZE_NO_ADJUSTMENTS);
+    }
 
+    void DoShow()
+    {
         Popup();
     }
 
-    void SetTimeout(unsigned timeout)
+    void SetTimeoutAndShow(unsigned timeout, unsigned delay)
     {
-        if ( !timeout )
+        if ( !timeout && !delay )
+        {
+            DoShow();
             return;
+        }
 
         Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer));
 
-        m_timer.Start(timeout, true /* one shot */);
+        m_timeout = timeout; // set for use in OnTimer if we have a delay
+        m_delayShow = delay != 0;
+
+        if ( !m_delayShow )
+            DoShow();
+
+        m_timer.Start((delay ? delay : timeout), true /* one shot */);
     }
 
 protected:
@@ -544,6 +560,8 @@ private:
 
         SetShape(path);
 #else // !wxUSE_GRAPHICS_CONTEXT
+        wxUnusedVar(tipKind);
+
         int x = contentSize.x/2,
             yApex = 0,
             dy = 0;
@@ -560,10 +578,22 @@ private:
     // Timer event handler hides the tooltip when the timeout expires.
     void OnTimer(wxTimerEvent& WXUNUSED(event))
     {
-        // Doing "Notify" here ensures that our OnDismiss() is called and so we
-        // also Destroy() ourselves. We could use Dismiss() and call Destroy()
-        // explicitly from here as well.
-        DismissAndNotify();
+        if ( !m_delayShow )
+        {
+            // Doing "Notify" here ensures that our OnDismiss() is called and so we
+            // also Destroy() ourselves. We could use Dismiss() and call Destroy()
+            // explicitly from here as well.
+            DismissAndNotify();
+
+            return;
+        }
+
+        m_delayShow = false;
+
+        if ( m_timeout )
+            m_timer.Start(m_timeout, true);
+
+        DoShow();
     }
 
 
@@ -574,6 +604,12 @@ private:
     // The timer counting down the time until we're hidden.
     wxTimer m_timer;
 
+    // We will need to accesss the timeout period when delaying showing tooltip.
+    int m_timeout;
+
+    // If true, delay showing the tooltip.
+    bool m_delayShow;
+
     wxDECLARE_NO_COPY_CLASS(wxRichToolTipPopup);
 };
 
@@ -621,9 +657,11 @@ void wxRichToolTipGenericImpl::SetStandardIcon(int icon)
     }
 }
 
-void wxRichToolTipGenericImpl::SetTimeout(unsigned milliseconds)
+void wxRichToolTipGenericImpl::SetTimeout(unsigned millisecondsTimeout,
+                                          unsigned millisecondsDelay)
 {
-    m_timeout = milliseconds;
+    m_delay = millisecondsDelay;
+    m_timeout = millisecondsTimeout;
 }
 
 void wxRichToolTipGenericImpl::SetTipKind(wxTipKind tipKind)
@@ -636,7 +674,7 @@ void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font)
     m_titleFont = font;
 }
 
-void wxRichToolTipGenericImpl::ShowFor(wxWindow* win)
+void wxRichToolTipGenericImpl::ShowFor(wxWindow* win, const wxRect* rect)
 {
     // Set the focus to the window the tooltip refers to to make it look active.
     win->SetFocus();
@@ -653,9 +691,9 @@ void wxRichToolTipGenericImpl::ShowFor(wxWindow* win)
 
     popup->SetBackgroundColours(m_colStart, m_colEnd);
 
-    popup->DoShow();
-
-    popup->SetTimeout(m_timeout);
+    popup->SetPosition(rect);
+    // show or start the timer to delay showing the popup
+    popup->SetTimeoutAndShow( m_timeout, m_delay );
 }
 
 // Currently only wxMSW provides a native implementation.
diff --git a/Externals/wxWidgets3/src/generic/sashwin.cpp b/Externals/wxWidgets3/src/generic/sashwin.cpp
index d6b801c7ff..a26595a652 100644
--- a/Externals/wxWidgets3/src/generic/sashwin.cpp
+++ b/Externals/wxWidgets3/src/generic/sashwin.cpp
@@ -6,7 +6,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: sashwin.cpp 58718 2009-02-07 18:59:25Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -115,8 +114,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             // the area to draw on.
             wxWindow* parent = this;
 
-            while (parent && !parent->IsKindOf(CLASSINFO(wxDialog)) &&
-                             !parent->IsKindOf(CLASSINFO(wxFrame)))
+            while (parent && !wxDynamicCast(parent, wxDialog) &&
+                             !wxDynamicCast(parent, wxFrame))
               parent = parent->GetParent();
 
             wxScreenDC::StartDrawingOnTop(parent);
diff --git a/Externals/wxWidgets3/src/generic/scrlwing.cpp b/Externals/wxWidgets3/src/generic/scrlwing.cpp
index 9ceda4929a..c14ab53075 100644
--- a/Externals/wxWidgets3/src/generic/scrlwing.cpp
+++ b/Externals/wxWidgets3/src/generic/scrlwing.cpp
@@ -5,7 +5,6 @@
 // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.
 //              Ron Lee on 10.4.02:  virtual size / auto scrollbars et al.
 // Created:     01/02/97
-// RCS-ID:      $Id: scrlwing.cpp 70443 2012-01-23 11:28:12Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -79,13 +78,9 @@ public:
 
     virtual bool ProcessEvent(wxEvent& event);
 
-    void ResetDrawnFlag() { m_hasDrawnWindow = false; }
-
 private:
     wxScrollHelperBase *m_scrollHelper;
 
-    bool m_hasDrawnWindow;
-
     wxDECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler);
 };
 
@@ -147,6 +142,7 @@ void wxAutoScrollTimer::Notify()
         // first scroll the window if we are allowed to do it
         wxScrollWinEvent event1(m_eventType, m_pos, m_orient);
         event1.SetEventObject(m_win);
+        event1.SetId(m_win->GetId());
         if ( m_scrollHelper->SendAutoScrollEvents(event1) &&
                 m_win->GetEventHandler()->ProcessEvent(event1) )
         {
@@ -165,7 +161,16 @@ void wxAutoScrollTimer::Notify()
 
             event2.SetEventObject(m_win);
 
-            // FIXME: we don't fill in the other members - ok?
+            wxMouseState mouseState = wxGetMouseState();
+
+            event2.m_leftDown = mouseState.LeftIsDown();
+            event2.m_middleDown = mouseState.MiddleIsDown();
+            event2.m_rightDown = mouseState.RightIsDown();
+
+            event2.m_shiftDown = mouseState.ShiftDown();
+            event2.m_controlDown = mouseState.ControlDown();
+            event2.m_altDown = mouseState.AltDown();
+            event2.m_metaDown = mouseState.MetaDown();
 
             m_win->GetEventHandler()->ProcessEvent(event2);
         }
@@ -181,28 +186,13 @@ void wxAutoScrollTimer::Notify()
 // wxScrollHelperEvtHandler
 // ----------------------------------------------------------------------------
 
+// Notice that this method is currently duplicated in the method with the same
+// name in wxVarScrollHelperEvtHandler class, until this is fixed, the other
+// copy of the method needs to be modified every time this version is.
 bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 {
     wxEventType evType = event.GetEventType();
 
-    // the explanation of wxEVT_PAINT processing hack: for historic reasons
-    // there are 2 ways to process this event in classes deriving from
-    // wxScrolledWindow. The user code may
-    //
-    //  1. override wxScrolledWindow::OnDraw(dc)
-    //  2. define its own OnPaint() handler
-    //
-    // In addition, in wxUniversal wxWindow defines OnPaint() itself and
-    // always processes the draw event, so we can't just try the window
-    // OnPaint() first and call our HandleOnPaint() if it doesn't process it
-    // (the latter would never be called in wxUniversal).
-    //
-    // So the solution is to have a flag telling us whether the user code drew
-    // anything in the window. We set it to true here but reset it to false in
-    // wxScrolledWindow::OnPaint() handler (which wouldn't be called if the
-    // user code defined OnPaint() in the derived class)
-    m_hasDrawnWindow = true;
-
     // Pass it on to the real handler: notice that we must not call
     // ProcessEvent() on this object itself as it wouldn't pass it to the next
     // handler (i.e. the real window) if we're called from a previous handler
@@ -221,27 +211,32 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
     if ( evType == wxEVT_SIZE )
     {
         m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
-
         return true;
     }
 
-    if ( processed )
-    {
-        // normally, nothing more to do here - except if it was a paint event
-        // which wasn't really processed, then we'll try to call our
-        // OnDraw() below (from HandleOnPaint)
-        if ( m_hasDrawnWindow || event.IsCommandEvent() )
-        {
-            return true;
-        }
-    }
-
-    if ( evType == wxEVT_PAINT )
+    // For wxEVT_PAINT the user code can either handle this event as usual or
+    // override virtual OnDraw(), so if the event hasn't been handled we need
+    // to call this virtual function ourselves.
+    if (
+#ifndef __WXUNIVERSAL__
+          // in wxUniversal "processed" will always be true, because
+          // all windows use the paint event to draw themselves.
+          // In this case we can't use this flag to determine if a custom
+          // paint event handler already drew our window and we just
+          // call OnDraw() anyway.
+          !processed &&
+#endif // !__WXUNIVERSAL__
+            evType == wxEVT_PAINT )
     {
         m_scrollHelper->HandleOnPaint((wxPaintEvent &)event);
         return true;
     }
 
+    // If the user code handled this event, it should prevent the default
+    // handling from taking place, so don't do anything else in this case.
+    if ( processed )
+        return true;
+
     if ( evType == wxEVT_CHILD_FOCUS )
     {
         m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event);
@@ -320,17 +315,30 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 }
 
 // ============================================================================
-// wxScrollHelperBase implementation
+// wxAnyScrollHelperBase and wxScrollHelperBase implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxAnyScrollHelperBase
+// ----------------------------------------------------------------------------
+
+wxAnyScrollHelperBase::wxAnyScrollHelperBase(wxWindow* win)
+{
+    wxASSERT_MSG( win, wxT("associated window can't be NULL in wxScrollHelper") );
+
+    m_win = win;
+    m_targetWindow = NULL;
+
+    m_kbdScrollingEnabled = true;
+}
+
 // ----------------------------------------------------------------------------
 // wxScrollHelperBase construction
 // ----------------------------------------------------------------------------
 
 wxScrollHelperBase::wxScrollHelperBase(wxWindow *win)
+    : wxAnyScrollHelperBase(win)
 {
-    wxASSERT_MSG( win, wxT("associated window can't be NULL in wxScrollHelper") );
-
     m_xScrollPixelsPerLine =
     m_yScrollPixelsPerLine =
     m_xScrollPosition =
@@ -343,23 +351,16 @@ wxScrollHelperBase::wxScrollHelperBase(wxWindow *win)
     m_xScrollingEnabled =
     m_yScrollingEnabled = true;
 
-    m_kbdScrollingEnabled = true;
-
     m_scaleX =
     m_scaleY = 1.0;
 #if wxUSE_MOUSEWHEEL
     m_wheelRotation = 0;
 #endif
 
-    m_win =
-    m_targetWindow = NULL;
-
     m_timerAutoScroll = NULL;
 
     m_handler = NULL;
 
-    m_win = win;
-
     m_win->SetScrollHelper(static_cast<wxScrollHelper *>(this));
 
     // by default, the associated window is also the target window
@@ -461,12 +462,6 @@ void wxScrollHelperBase::DeleteEvtHandler()
     }
 }
 
-void wxScrollHelperBase::ResetDrawnFlag()
-{
-    wxCHECK_RET( m_handler, "invalid use of ResetDrawnFlag - no handler?" );
-    m_handler->ResetDrawnFlag();
-}
-
 void wxScrollHelperBase::DoSetTargetWindow(wxWindow *target)
 {
     m_targetWindow = target;
@@ -497,11 +492,6 @@ void wxScrollHelperBase::SetTargetWindow(wxWindow *target)
     DoSetTargetWindow(target);
 }
 
-wxWindow *wxScrollHelperBase::GetTargetWindow() const
-{
-    return m_targetWindow;
-}
-
 // ----------------------------------------------------------------------------
 // scrolling implementation itself
 // ----------------------------------------------------------------------------
@@ -832,7 +822,7 @@ void wxScrollHelperBase::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 
 // This calls OnDraw, having adjusted the origin according to the current
 // scroll position
-void wxScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
+void wxAnyScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
 {
     // don't use m_targetWindow here, this is always called for ourselves
     wxPaintDC dc(m_win);
@@ -845,7 +835,7 @@ void wxScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
 // compatibility here - if we used OnKeyDown(), the programs which process
 // arrows themselves in their OnChar() would never get the message and like
 // this they always have the priority
-void wxScrollHelperBase::HandleOnChar(wxKeyEvent& event)
+void wxAnyScrollHelperBase::HandleOnChar(wxKeyEvent& event)
 {
     if ( !m_kbdScrollingEnabled )
     {
@@ -858,6 +848,7 @@ void wxScrollHelperBase::HandleOnChar(wxKeyEvent& event)
 
     newEvent.SetPosition(0);
     newEvent.SetEventObject(m_win);
+    newEvent.SetId(m_win->GetId());
 
     // this is the default, it's changed to wxHORIZONTAL below if needed
     newEvent.SetOrientation(wxVERTICAL);
@@ -1032,6 +1023,9 @@ void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
         newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL);
         newEvent.SetEventObject(m_win);
 
+        if ( event.GetWheelAxis() == wxMOUSE_WHEEL_HORIZONTAL )
+            lines = -lines;
+
         if (event.IsPageScroll())
         {
             if (lines > 0)
@@ -1213,6 +1207,14 @@ wxScrollHelper::wxScrollHelper(wxWindow *winToScroll)
     m_yVisibility = wxSHOW_SB_DEFAULT;
 }
 
+bool wxScrollHelper::IsScrollbarShown(int orient) const
+{
+    wxScrollbarVisibility visibility = orient == wxHORIZONTAL ? m_xVisibility
+                                                              : m_yVisibility;
+
+    return visibility != wxSHOW_SB_NEVER;
+}
+
 void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
                                       wxScrollbarVisibility vert)
 {
diff --git a/Externals/wxWidgets3/src/generic/selstore.cpp b/Externals/wxWidgets3/src/generic/selstore.cpp
index 3f6ef22206..6f606c335a 100644
--- a/Externals/wxWidgets3/src/generic/selstore.cpp
+++ b/Externals/wxWidgets3/src/generic/selstore.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
-// RCS-ID:      $Id: selstore.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/spinctlg.cpp b/Externals/wxWidgets3/src/generic/spinctlg.cpp
index f8edc709fb..3da88c9404 100644
--- a/Externals/wxWidgets3/src/generic/spinctlg.cpp
+++ b/Externals/wxWidgets3/src/generic/spinctlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.01.01
-// RCS-ID:      $Id: spinctlg.cpp 70432 2012-01-21 17:03:52Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,8 +63,12 @@ class wxSpinCtrlTextGeneric : public wxTextCtrl
 {
 public:
     wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0)
-        : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
-                     style & wxALIGN_MASK)
+        : wxTextCtrl(spin, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
+                     // This is tricky: we want to honour any alignment flags
+                     // but not wxALIGN_CENTER_VERTICAL because it's the same
+                     // as wxTE_PASSWORD and we definitely don't want to show
+                     // asterisks in spin control.
+                     style & (wxALIGN_MASK | wxTE_PROCESS_ENTER) & ~wxTE_PASSWORD)
     {
         m_spin = spin;
 
@@ -84,8 +87,16 @@ public:
 
     void OnChar( wxKeyEvent &event )
     {
-        if (m_spin)
-            m_spin->ProcessWindowEvent(event);
+        if ( !m_spin->ProcessWindowEvent(event) )
+            event.Skip();
+    }
+
+    void OnTextEvent(wxCommandEvent& event)
+    {
+        wxCommandEvent eventCopy(event);
+        eventCopy.SetEventObject(m_spin);
+        eventCopy.SetId(m_spin->GetId());
+        m_spin->ProcessWindowEvent(eventCopy);
     }
 
     void OnKillFocus(wxFocusEvent& event)
@@ -105,6 +116,15 @@ private:
 BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
 
+    // Forward the text events to wxSpinCtrl itself adjusting them slightly in
+    // the process.
+    EVT_TEXT(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent)
+
+    // And we need to forward this one too as wxSpinCtrl is supposed to
+    // generate it if wxTE_PROCESS_ENTER is used with it (and if it isn't,
+    // we're never going to get EVT_TEXT_ENTER in the first place).
+    EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent)
+
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
 END_EVENT_TABLE()
 
@@ -116,7 +136,7 @@ class wxSpinCtrlButtonGeneric : public wxSpinButton
 {
 public:
     wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style)
-        : wxSpinButton(spin->GetParent(), wxID_ANY, wxDefaultPosition,
+        : wxSpinButton(spin, wxID_ANY, wxDefaultPosition,
                        wxDefaultSize, style | wxSP_VERTICAL)
     {
         m_spin = spin;
@@ -159,7 +179,6 @@ void wxSpinCtrlGenericBase::Init()
     m_max           = 100;
     m_increment     = 1;
     m_snap_to_ticks = false;
-    m_format        = wxS("%g");
 
     m_spin_value    = 0;
 
@@ -193,6 +212,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
 
     m_textCtrl   = new wxSpinCtrlTextGeneric(this, value, style);
     m_spinButton = new wxSpinCtrlButtonGeneric(this, style);
+
 #if wxUSE_TOOLTIPS
     m_textCtrl->SetToolTip(GetToolTipText());
     m_spinButton->SetToolTip(GetToolTipText());
@@ -207,26 +227,16 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
     if ( !value.empty() )
     {
         double d;
-        if ( value.ToDouble(&d) )
+        if ( DoTextToValue(value, &d) )
         {
             m_value = d;
-            m_textCtrl->SetValue(wxString::Format(m_format, m_value));
+            m_textCtrl->ChangeValue(DoValueToText(m_value));
         }
     }
 
     SetInitialSize(size);
     Move(pos);
 
-    // have to disable this window to avoid interfering it with message
-    // processing to the text and the button... but pretend it is enabled to
-    // make IsEnabled() return true
-    wxControl::Enable(false); // don't use non virtual Disable() here!
-    m_isEnabled = true;
-
-    // we don't even need to show this window itself - and not doing it avoids
-    // that it overwrites the text control
-    wxControl::Show(false);
-    m_isShown = true;
     return true;
 }
 
@@ -249,16 +259,40 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase()
     wxDELETE(m_spinButton);
 }
 
+wxWindowList wxSpinCtrlGenericBase::GetCompositeWindowParts() const
+{
+    wxWindowList parts;
+    parts.push_back(m_textCtrl);
+    parts.push_back(m_spinButton);
+    return parts;
+}
+
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
 {
-    wxSize sizeBtn  = m_spinButton->GetBestSize(),
-           sizeText = m_textCtrl->GetBestSize();
+    return DoGetSizeFromTextSize(m_textCtrl->GetBestSize().x, -1);
+}
 
-    return wxSize(sizeBtn.x + sizeText.x + MARGIN, sizeText.y);
+wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize sizeBtn  = m_spinButton->GetBestSize();
+    wxSize totalS( m_textCtrl->GetBestSize() );
+
+    wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y);
+#if defined(__WXMSW__)
+    tsize.IncBy(4*totalS.y/10 + 4, 0);
+#elif defined(__WXGTK__)
+    tsize.IncBy(totalS.y + 10, 0);
+#endif // MSW GTK
+
+    // Check if the user requested a non-standard height.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - GetCharHeight());
+
+    return tsize;
 }
 
 void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
@@ -269,8 +303,8 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
     wxSize sizeBtn = m_spinButton->GetSize();
 
     wxCoord wText = width - sizeBtn.x - MARGIN;
-    m_textCtrl->SetSize(x, y, wText, height);
-    m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
+    m_textCtrl->SetSize(0, 0, wText, height);
+    m_spinButton->SetSize(0 + wText + MARGIN, 0, wxDefaultCoord, height);
 }
 
 // ----------------------------------------------------------------------------
@@ -287,11 +321,7 @@ void wxSpinCtrlGenericBase::SetFocus()
 
 void wxSpinCtrlGenericBase::DoEnable(bool enable)
 {
-    // We never enable this control itself, it must stay disabled to avoid
-    // interfering with the siblings event handling (see e.g. #12045 for the
-    // kind of problems which arise otherwise).
-    if ( !enable )
-        wxSpinCtrlBase::DoEnable(enable);
+     wxSpinCtrlBase::DoEnable(enable);
 }
 
 #endif // __WXMSW__
@@ -350,6 +380,17 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
 }
 #endif // wxUSE_TOOLTIPS
 
+bool wxSpinCtrlGenericBase::SetBackgroundColour(const wxColour& colour)
+{
+    // We need to provide this otherwise the entire composite window
+    // background and therefore the between component spaces
+    // will be changed.
+    if ( m_textCtrl )
+        return m_textCtrl->SetBackgroundColour(colour);
+
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // Handle sub controls events
 // ----------------------------------------------------------------------------
@@ -365,7 +406,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     // Sync the textctrl since the user expects that the button will modify
     // what they see in the textctrl.
-    SyncSpinToText();
+    SyncSpinToText(SendEvent_None);
 
     int spin_value = event.GetPosition();
     double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1;
@@ -386,13 +427,14 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     m_spin_value = spin_value;
 
-    if ( DoSetValue(value) )
+    // Notify about the change in wxTextCtrl too.
+    if ( DoSetValue(value, SendEvent_Text) )
         DoSendEvent();
 }
 
 void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event)
 {
-    SyncSpinToText();
+    SyncSpinToText(SendEvent_Text);
     DoSendEvent();
 
     event.Skip();
@@ -432,9 +474,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 
     value = AdjustToFitInRange(value);
 
-    SyncSpinToText();
+    SyncSpinToText(SendEvent_None);
 
-    if ( DoSetValue(value) )
+    // No need to send event, it was already generated by wxTextCtrl itself.
+    if ( DoSetValue(value, SendEvent_None) )
         DoSendEvent();
 }
 
@@ -442,13 +485,13 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 // Textctrl functions
 // ----------------------------------------------------------------------------
 
-bool wxSpinCtrlGenericBase::SyncSpinToText()
+bool wxSpinCtrlGenericBase::SyncSpinToText(SendEvent sendEvent)
 {
     if ( !m_textCtrl || !m_textCtrl->IsModified() )
         return false;
 
     double textValue;
-    if ( m_textCtrl->GetValue().ToDouble(&textValue) )
+    if ( DoTextToValue(m_textCtrl->GetValue(), &textValue) )
     {
         if (textValue > m_max)
             textValue = m_max;
@@ -464,7 +507,7 @@ bool wxSpinCtrlGenericBase::SyncSpinToText()
     // we must always set the value here, even if it's equal to m_value, as
     // otherwise we could be left with an out of range value when leaving the
     // text control and the current value is already m_max for example
-    return DoSetValue(textValue);
+    return DoSetValue(textValue, sendEvent);
 }
 
 // ----------------------------------------------------------------------------
@@ -476,25 +519,26 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text)
     wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetValue") );
 
     double val;
-    if ( text.ToDouble(&val) && InRange(val) )
+    if ( DoTextToValue(text, &val) && InRange(val) )
     {
-        DoSetValue(val);
+        DoSetValue(val, SendEvent_None);
     }
     else // not a number at all or out of range
     {
-        m_textCtrl->SetValue(text);
-        m_textCtrl->SetSelection(0, -1);
-        m_textCtrl->SetInsertionPointEnd();
+        m_textCtrl->ChangeValue(text);
+        m_textCtrl->SelectAll();
     }
 }
 
-bool wxSpinCtrlGenericBase::DoSetValue(double val)
+bool wxSpinCtrlGenericBase::DoSetValue(double val, SendEvent sendEvent)
 {
     wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") );
 
-    if (!InRange(val))
-        return false;
-
+    if ( val < m_min )
+        val = m_min;
+    if ( val > m_max )
+        val = m_max;
+    
     if ( m_snap_to_ticks && (m_increment != 0) )
     {
         double snap_value = val / m_increment;
@@ -508,14 +552,25 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
         }
     }
 
-    wxString str(wxString::Format(m_format.c_str(), val));
+    wxString str(DoValueToText(val));
 
     if ((val != m_value) || (str != m_textCtrl->GetValue()))
     {
-        m_value = val;
-        str.ToDouble( &m_value );    // wysiwyg for textctrl
-        m_textCtrl->SetValue( str );
-        m_textCtrl->SetInsertionPointEnd();
+        if ( !DoTextToValue(str, &m_value ) )    // wysiwyg for textctrl
+            m_value = val;
+
+        switch ( sendEvent )
+        {
+            case SendEvent_None:
+                m_textCtrl->ChangeValue(str);
+                break;
+
+            case SendEvent_Text:
+                m_textCtrl->SetValue(str);
+                break;
+        }
+
+        m_textCtrl->SelectAll();
         m_textCtrl->DiscardEdits();
         return true;
     }
@@ -536,7 +591,11 @@ double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const
 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;
+    if ( m_value < m_min )
+        DoSetValue(m_min, SendEvent_None);
     m_max = max;
+    if ( m_value > m_max )
+        DoSetValue(m_max, SendEvent_None);
 }
 
 void wxSpinCtrlGenericBase::DoSetIncrement(double inc)
@@ -547,7 +606,7 @@ void wxSpinCtrlGenericBase::DoSetIncrement(double inc)
 void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks)
 {
     m_snap_to_ticks = snap_to_ticks;
-    DoSetValue(m_value);
+    DoSetValue(m_value, SendEvent_None);
 }
 
 void wxSpinCtrlGenericBase::SetSelection(long from, long to)
@@ -563,15 +622,67 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to)
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
+bool wxSpinCtrl::SetBase(int base)
+{
+    // Currently we only support base 10 and 16. We could add support for base
+    // 8 quite easily but wxMSW doesn't support it natively so don't bother.
+    if ( base != 10 && base != 16 )
+        return false;
+
+    if ( base == m_base )
+        return true;
+
+    // Update the current control contents to show in the new base: be careful
+    // to call DoTextToValue() before changing the base...
+    double val;
+    const bool hasValidVal = DoTextToValue(m_textCtrl->GetValue(), &val);
+
+    m_base = base;
+
+    // ... but DoValueToText() after doing it.
+    if ( hasValidVal )
+        m_textCtrl->ChangeValue(DoValueToText(val));
+
+    return true;
+}
+
 void wxSpinCtrl::DoSendEvent()
 {
-    wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
+    wxSpinEvent event( wxEVT_SPINCTRL, GetId());
     event.SetEventObject( this );
     event.SetPosition((int)(m_value + 0.5)); // FIXME should be SetValue
     event.SetString(m_textCtrl->GetValue());
     GetEventHandler()->ProcessEvent( event );
 }
 
+bool wxSpinCtrl::DoTextToValue(const wxString& text, double *val)
+{
+    long lval;
+    if ( !text.ToLong(&lval, GetBase()) )
+        return false;
+
+    *val = static_cast<double>(lval);
+
+    return true;
+}
+
+wxString wxSpinCtrl::DoValueToText(double val)
+{
+    switch ( GetBase() )
+    {
+        case 16:
+            return wxPrivate::wxSpinCtrlFormatAsHex(static_cast<long>(val),
+                                                    GetMax());
+
+        default:
+            wxFAIL_MSG( wxS("Unsupported spin control base") );
+            // Fall through
+
+        case 10:
+            return wxString::Format("%ld", static_cast<long>(val));
+    }
+}
+
 #endif // !wxHAS_NATIVE_SPINCTRL
 
 //-----------------------------------------------------------------------------
@@ -582,13 +693,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase)
 
 void wxSpinCtrlDouble::DoSendEvent()
 {
-    wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, GetId());
+    wxSpinDoubleEvent event( wxEVT_SPINCTRLDOUBLE, GetId());
     event.SetEventObject( this );
     event.SetValue(m_value);
     event.SetString(m_textCtrl->GetValue());
     GetEventHandler()->ProcessEvent( event );
 }
 
+bool wxSpinCtrlDouble::DoTextToValue(const wxString& text, double *val)
+{
+    return text.ToDouble(val);
+}
+
+wxString wxSpinCtrlDouble::DoValueToText(double val)
+{
+    return wxString::Format(m_format, val);
+}
+
 void wxSpinCtrlDouble::SetDigits(unsigned digits)
 {
     wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" );
@@ -600,7 +721,7 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits)
 
     m_format.Printf(wxT("%%0.%ulf"), digits);
 
-    DoSetValue(m_value);
+    DoSetValue(m_value, SendEvent_None);
 }
 
 #endif // wxUSE_SPINBTN
diff --git a/Externals/wxWidgets3/src/generic/splash.cpp b/Externals/wxWidgets3/src/generic/splash.cpp
index 2fad3c6014..10f8b10449 100644
--- a/Externals/wxWidgets3/src/generic/splash.cpp
+++ b/Externals/wxWidgets3/src/generic/splash.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     28/6/2000
-// RCS-ID:      $Id: splash.cpp 69796 2011-11-22 13:18:55Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/splitter.cpp b/Externals/wxWidgets3/src/generic/splitter.cpp
index 10a97054ed..826b92a7d8 100644
--- a/Externals/wxWidgets3/src/generic/splitter.cpp
+++ b/Externals/wxWidgets3/src/generic/splitter.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: splitter.cpp 70840 2012-03-08 13:23:39Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,10 +38,10 @@
 
 #include <stdlib.h>
 
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent );
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 
@@ -293,7 +292,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 m_windowOne = m_windowTwo;
                 m_windowTwo = NULL;
                 OnUnsplit(removedWindow);
-                wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
                 eventUnsplit.m_data.win = removedWindow;
                 (void)DoSendEvent(eventUnsplit);
                 SetSashPositionAndNotify(0);
@@ -304,7 +303,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = NULL;
                 OnUnsplit(removedWindow);
-                wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
                 eventUnsplit.m_data.win = removedWindow;
                 (void)DoSendEvent(eventUnsplit);
                 SetSashPositionAndNotify(0);
@@ -484,16 +483,15 @@ void wxSplitterWindow::SetSashGravity(double gravity)
     m_sashGravity = gravity;
 }
 
-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y)
 {
     if ( m_windowTwo == NULL || m_sashPosition == 0)
         return false; // No sash
 
     int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
-    int hitMin = m_sashPosition - tolerance;
-    int hitMax = m_sashPosition + GetSashSize() + tolerance;
+    int hitMax = m_sashPosition + GetSashSize() - 1;
 
-    return z >=  hitMin && z <= hitMax;
+    return z >= m_sashPosition && z <= hitMax;
 }
 
 void wxSplitterWindow::SetSashInvisible(bool invisible)
@@ -653,7 +651,7 @@ void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
     // must generate a CHANGED event at the end of resizing
     DoSetSashPosition(sashPos);
 
-    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
+    wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGED, this);
     event.m_data.pos = m_sashPosition;
 
     (void)DoSendEvent(event);
@@ -989,7 +987,7 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
     //
     // FIXME: shouldn't we do it before the adjustments above so as to ensure
     //        that the sash position is always reasonable?
-    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, this);
+    wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGING, this);
     event.m_data.pos = newSashPosition;
 
     if ( !DoSendEvent(event) )
@@ -1013,7 +1011,7 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
     wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));
 
     // new code should handle events instead of using the virtual functions
-    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
+    wxSplitterEvent event(wxEVT_SPLITTER_DOUBLECLICKED, this);
     event.m_data.pt.x = x;
     event.m_data.pt.y = y;
     if ( DoSendEvent(event) )
@@ -1023,7 +1021,7 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
             wxWindow* win = m_windowTwo;
             if ( Unsplit(win) )
             {
-                wxSplitterEvent unsplitEvent(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                wxSplitterEvent unsplitEvent(wxEVT_SPLITTER_UNSPLIT, this);
                 unsplitEvent.m_data.win = win;
                 (void)DoSendEvent(unsplitEvent);
             }
@@ -1047,7 +1045,7 @@ void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event)
     // and like this we explicitly say that our cursor should not be used for
     // children windows which overlap us
 
-    if ( SashHitTest(event.GetX(), event.GetY(), 0) )
+    if ( SashHitTest(event.GetX(), event.GetY()) )
     {
         // default processing is ok
         event.Skip();
diff --git a/Externals/wxWidgets3/src/generic/srchctlg.cpp b/Externals/wxWidgets3/src/generic/srchctlg.cpp
index 1965d6e0b7..ccf7ccbcfc 100644
--- a/Externals/wxWidgets3/src/generic/srchctlg.cpp
+++ b/Externals/wxWidgets3/src/generic/srchctlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements wxSearchCtrl as a composite control
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctlg.cpp 69284 2011-10-02 11:28:40Z VZ $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -67,10 +66,15 @@ public:
 
         SetHint(_("Search"));
 
-        // remove the default minsize, the searchctrl will have one instead
-        SetSizeHints(wxDefaultCoord,wxDefaultCoord);
+        // Ensure that our best size is recomputed using our overridden
+        // DoGetBestSize().
+        InvalidateBestSize();
     }
 
+    virtual wxWindow* GetMainWindowOfCompositeControl()
+    {
+        return m_search;
+    }
 
     // provide access to the base class protected methods to wxSearchCtrl which
     // needs to forward to them
@@ -167,7 +171,11 @@ public:
           m_bmp(bmp)
     { }
 
-    void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
+    void SetBitmapLabel(const wxBitmap& label)
+    {
+        m_bmp = label;
+        InvalidateBestSize();
+    }
 
     // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because
     // this would interfere with the usual TAB processing: the user expects
@@ -177,6 +185,11 @@ public:
     // is really no reason for it to be able to get focus from keyboard.
     virtual bool AcceptsFocusFromKeyboard() const { return false; }
 
+    virtual wxWindow* GetMainWindowOfCompositeControl()
+    {
+        return m_search;
+    }
+
 protected:
     wxSize DoGetBestSize() const
     {
@@ -188,7 +201,7 @@ protected:
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 
-        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
+        if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
         {
             // it's convenient to have the string to search for directly in the
             // event instead of having to retrieve it from the control in the
@@ -201,7 +214,7 @@ protected:
         m_search->SetFocus();
 
 #if wxUSE_MENUS
-        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
+        if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
@@ -230,7 +243,7 @@ BEGIN_EVENT_TABLE(wxSearchButton, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
-    EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, wxSearchCtrl::OnSearchButton)
+    EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
     EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
     EVT_SIZE(wxSearchCtrl::OnSize)
 END_EVENT_TABLE()
@@ -315,13 +328,12 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
     m_text = new wxSearchTextCtrl(this, value, style);
 
     m_searchButton = new wxSearchButton(this,
-                                        wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
+                                        wxEVT_SEARCHCTRL_SEARCH_BTN,
                                         m_searchBitmap);
     m_cancelButton = new wxSearchButton(this,
-                                        wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
+                                        wxEVT_SEARCHCTRL_CANCEL_BTN,
                                         m_cancelBitmap);
 
-    SetForegroundColour( m_text->GetForegroundColour() );
     SetBackgroundColour( m_text->GetBackgroundColour() );
 
     RecalcBitmaps();
@@ -1172,8 +1184,9 @@ void wxSearchCtrl::RecalcBitmaps()
     }
 }
 
-void wxSearchCtrl::OnSearchButton( wxCommandEvent& event )
+void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )
 {
+    m_text->Clear();
     event.Skip();
 }
 
diff --git a/Externals/wxWidgets3/src/generic/statbmpg.cpp b/Externals/wxWidgets3/src/generic/statbmpg.cpp
index eaf8314bb0..a21ef57e0b 100644
--- a/Externals/wxWidgets3/src/generic/statbmpg.cpp
+++ b/Externals/wxWidgets3/src/generic/statbmpg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericStaticBitmap
 // Author:      Marcin Wojdyr, Stefan Csomor
 // Created:     2008-06-16
-// RCS-ID:      $Id: statbmpg.cpp 66569 2011-01-04 12:52:12Z SC $
 // Copyright:   wxWidgets developers
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/statline.cpp b/Externals/wxWidgets3/src/generic/statline.cpp
index 796c74b733..a36445889b 100644
--- a/Externals/wxWidgets3/src/generic/statline.cpp
+++ b/Externals/wxWidgets3/src/generic/statline.cpp
@@ -3,7 +3,6 @@
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/stattextg.cpp b/Externals/wxWidgets3/src/generic/stattextg.cpp
index 94fe539375..74843fa21e 100644
--- a/Externals/wxWidgets3/src/generic/stattextg.cpp
+++ b/Externals/wxWidgets3/src/generic/stattextg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGenericStaticText
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26
-// RCS-ID:      $Id: stattextg.cpp 67067 2011-02-27 12:48:38Z VZ $
 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/statusbr.cpp b/Externals/wxWidgets3/src/generic/statusbr.cpp
index df0391e226..6de10c46aa 100644
--- a/Externals/wxWidgets3/src/generic/statusbr.cpp
+++ b/Externals/wxWidgets3/src/generic/statusbr.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     01/02/97
-// RCS-ID:      $Id: statusbr.cpp 70625 2012-02-19 14:49:37Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@
 #ifdef __WXGTK20__
     #include <gtk/gtk.h>
     #include "wx/gtk/private.h"
+    #include "wx/gtk/private/gtk2-compat.h"
 #endif
 
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
@@ -90,8 +90,10 @@ gboolean statusbar_query_tooltip(GtkWidget*   WXUNUSED(widget),
 BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_PAINT(wxStatusBarGeneric::OnPaint)
     EVT_SIZE(wxStatusBarGeneric::OnSize)
+#ifdef __WXGTK20__
     EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown)
     EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown)
+#endif
     EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged)
 END_EVENT_TABLE()
 
@@ -132,7 +134,11 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
 #if defined( __WXGTK20__ )
 #if GTK_CHECK_VERSION(2,12,0)
-    if (HasFlag(wxSTB_SHOW_TIPS) && !gtk_check_version(2,12,0))
+    if (HasFlag(wxSTB_SHOW_TIPS)
+#ifndef __WXGTK3__
+        && gtk_check_version(2,12,0) == NULL
+#endif
+        )
     {
         g_object_set(m_widget, "has-tooltip", TRUE, NULL);
         g_signal_connect(m_widget, "query-tooltip",
@@ -181,9 +187,15 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
     wxStatusBarBase::SetStatusWidths(n, widths_field);
 
     // update cache
-    int width;
-    GetClientSize(&width, &m_lastClientHeight);
-    m_widthsAbs = CalculateAbsWidths(width);
+    DoUpdateFieldWidths();
+}
+
+void wxStatusBarGeneric::DoUpdateFieldWidths()
+{
+    m_lastClientSize = GetClientSize();
+
+    // recompute the cache of the field widths if the status bar width has changed
+    m_widthsAbs = CalculateAbsWidths(m_lastClientSize.x);
 }
 
 bool wxStatusBarGeneric::ShowsSizeGrip() const
@@ -278,10 +290,10 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight)
         return;     // happens when the status bar is shrunk in a very small area!
 
     int style = m_panes[i].GetStyle();
-    if (style != wxSB_FLAT)
+    if (style == wxSB_RAISED || style == wxSB_SUNKEN)
     {
         // Draw border
-        // For wxSB_NORMAL: paint a grey background, plus 3-d border (one black rectangle)
+        // For wxSB_SUNKEN: paint a grey background, plus 3-d border (one black rectangle)
         // Inside this, left and top sides (dark grey). Bottom and right (white).
         // Reverse it for wxSB_RAISED
 
@@ -325,6 +337,16 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
     wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), false,
                  wxT("invalid status bar field index") );
 
+    // We can be called from the user-defined EVT_SIZE handler in which case
+    // the widths haven't been updated yet and we need to do it now. This is
+    // not very efficient as we keep testing the size but there is no other way
+    // to make the code needing the up-to-date fields sizes in its EVT_SIZE to
+    // work.
+    if ( GetClientSize().x != m_lastClientSize.x )
+    {
+        const_cast<wxStatusBarGeneric*>(this)->DoUpdateFieldWidths();
+    }
+
     if (m_widthsAbs.IsEmpty())
         return false;
 
@@ -335,7 +357,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 
     rect.y = m_borderY;
     rect.width = m_widthsAbs[n] - 2*m_borderX;
-    rect.height = m_lastClientHeight - 2*m_borderY;
+    rect.height = m_lastClientSize.y - 2*m_borderY;
 
     return true;
 }
@@ -348,7 +370,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
     // NOTE: we explicitly don't take in count the borders since they are only
     //       useful when rendering the status text, not for hit-test computations
 
-    if (pt.y <= 0 || pt.y >= m_lastClientHeight)
+    if (pt.y <= 0 || pt.y >= m_lastClientSize.y)
         return wxNOT_FOUND;
 
     int x = 0;
@@ -411,6 +433,25 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
     if ( ShowsSizeGrip() )
     {
         const wxRect& rc = GetSizeGripRect();
+#ifdef __WXGTK3__
+        GtkWidget* toplevel = gtk_widget_get_toplevel(m_widget);
+        GdkRectangle rect;
+        if (toplevel && (!gtk_window_get_resize_grip_area(GTK_WINDOW(toplevel), &rect) ||
+            rect.width == 0 || rect.height == 0))
+        {
+            GtkStyleContext* sc = gtk_widget_get_style_context(toplevel);
+            gtk_style_context_save(sc);
+            gtk_style_context_add_class(sc, GTK_STYLE_CLASS_GRIP);
+            GtkJunctionSides sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT;
+            if (GetLayoutDirection() == wxLayout_RightToLeft)
+                sides = GTK_JUNCTION_CORNER_BOTTOMLEFT;
+            gtk_style_context_set_junction_sides(sc, sides);
+            gtk_render_handle(sc,
+                static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext()),
+                rc.x, rc.y, rc.width, rc.height);
+            gtk_style_context_restore(sc);
+        }
+#else
         GdkWindowEdge edge =
             GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST :
                                                            GDK_WINDOW_EDGE_SOUTH_EAST;
@@ -422,6 +463,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
                             "statusbar",
                             edge,
                             rc.x, rc.y, rc.width, rc.height );
+#endif
     }
 #endif // __WXGTK20__
 
@@ -444,19 +486,24 @@ void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
+#ifdef __WXGTK20__
 void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
 {
-#ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
 
-    if ( ShowsSizeGrip()  && (event.GetX() > width-height) )
+    GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget);
+#ifdef __WXGTK3__
+    GdkRectangle rect;
+    if (ancestor && gtk_window_get_resize_grip_area(GTK_WINDOW(ancestor), &rect) &&
+        rect.width && rect.height)
     {
-        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
-
-        if (!GTK_IS_WINDOW (ancestor))
-            return;
+        ancestor = NULL;
+    }
+#endif
 
+    if (ancestor && ShowsSizeGrip() && event.GetX() > width - height)
+    {
         GdkWindow *source = GTKGetDrawingWindow();
 
         int org_x = 0;
@@ -486,24 +533,25 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
     {
         event.Skip( true );
     }
-#else
-    event.Skip( true );
-#endif
 }
 
 void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 {
-#ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
 
-    if ( ShowsSizeGrip() && (event.GetX() > width-height) )
+    GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget);
+#ifdef __WXGTK3__
+    GdkRectangle rect;
+    if (ancestor && gtk_window_get_resize_grip_area(GTK_WINDOW(ancestor), &rect) &&
+        rect.width && rect.height)
     {
-        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
-
-        if (!GTK_IS_WINDOW (ancestor))
-            return;
+        ancestor = NULL;
+    }
+#endif
 
+    if (ancestor && ShowsSizeGrip() && event.GetX() > width - height)
+    {
         GdkWindow *source = GTKGetDrawingWindow();
 
         int org_x = 0;
@@ -520,23 +568,14 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
     {
         event.Skip( true );
     }
-#else
-    event.Skip( true );
-#endif
 }
+#endif // __WXGTK20__
 
-void wxStatusBarGeneric::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxStatusBarGeneric::OnSize(wxSizeEvent& event)
 {
-    // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)
-    int width;
-#ifdef __WXPM__
-    GetSize(&width, &m_lastClientHeight);
-#else
-    GetClientSize(&width, &m_lastClientHeight);
-#endif
+    DoUpdateFieldWidths();
 
-    // recompute the cache of the field widths if the status bar width has changed
-    m_widthsAbs = CalculateAbsWidths(width);
+    event.Skip();
 }
 
 #endif // wxUSE_STATUSBAR
diff --git a/Externals/wxWidgets3/src/generic/tabg.cpp b/Externals/wxWidgets3/src/generic/tabg.cpp
index 8237af2139..7d4dbdf09b 100644
--- a/Externals/wxWidgets3/src/generic/tabg.cpp
+++ b/Externals/wxWidgets3/src/generic/tabg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: tabg.cpp 58227 2009-01-19 13:55:27Z VZ $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1225,9 +1224,9 @@ wxPanelTabView::wxPanelTabView(wxPanel *pan, long style)
   m_panel = pan;
   m_currentWindow = NULL;
 
-  if (m_panel->IsKindOf(CLASSINFO(wxTabbedDialog)))
+  if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedDialog)))
     ((wxTabbedDialog *)m_panel)->SetTabView(this);
-  else if (m_panel->IsKindOf(CLASSINFO(wxTabbedPanel)))
+  else if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedPanel)))
     ((wxTabbedPanel *)m_panel)->SetTabView(this);
 
   SetWindow(m_panel);
diff --git a/Externals/wxWidgets3/src/generic/textdlgg.cpp b/Externals/wxWidgets3/src/generic/textdlgg.cpp
index e9730d9476..f3d697fafc 100644
--- a/Externals/wxWidgets3/src/generic/textdlgg.cpp
+++ b/Externals/wxWidgets3/src/generic/textdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: textdlgg.cpp 64019 2010-04-18 00:05:37Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,17 +64,21 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 
-wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
+bool wxTextEntryDialog::Create(wxWindow *parent,
                                      const wxString& message,
                                      const wxString& caption,
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)
-                 : wxDialog(GetParentForModalDialog(parent, style),
-                            wxID_ANY, caption, pos, wxDefaultSize,
-                            wxDEFAULT_DIALOG_STYLE),
-                   m_value(value)
 {
+    if ( !wxDialog::Create(GetParentForModalDialog(parent, style),
+                           wxID_ANY, caption,
+                           pos, wxDefaultSize,
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) )
+    {
+        return false;
+    }
+
     m_dialogStyle = style;
     m_value = value;
 
@@ -101,11 +104,6 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                     Expand().
                     TripleBorder(wxLEFT | wxRIGHT));
 
-#if wxUSE_VALIDATORS
-    wxTextValidator validator( wxFILTER_NONE, &m_value );
-    m_textctrl->SetValidator( validator );
-#endif // wxUSE_VALIDATORS
-
     // 3) buttons if any
     wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
     if ( buttonSizer )
@@ -122,25 +120,39 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     if ( style & wxCENTRE )
         Centre( wxBOTH );
 
-    m_textctrl->SetSelection(-1, -1);
+    m_textctrl->SelectAll();
     m_textctrl->SetFocus();
 
     wxEndBusyCursor();
+
+    return true;
+}
+
+bool wxTextEntryDialog::TransferDataToWindow()
+{
+    m_textctrl->SetValue(m_value);
+
+    return wxDialog::TransferDataToWindow();
+}
+
+bool wxTextEntryDialog::TransferDataFromWindow()
+{
+    m_value = m_textctrl->GetValue();
+
+    return wxDialog::TransferDataFromWindow();
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
-#if wxUSE_VALIDATORS
-    if( Validate() && TransferDataFromWindow() )
+    if ( Validate() && TransferDataFromWindow() )
     {
         EndModal( wxID_OK );
     }
-#else
-    m_value = m_textctrl->GetValue();
+}
 
-    EndModal(wxID_OK);
-#endif
-  // wxUSE_VALIDATORS
+void wxTextEntryDialog::SetMaxLength(unsigned long len)
+{
+    m_textctrl->SetMaxLength(len);
 }
 
 void wxTextEntryDialog::SetValue(const wxString& val)
@@ -161,8 +173,7 @@ void wxTextEntryDialog::SetTextValidator( long style )
 
 void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
 {
-    wxTextValidator validator( style, &m_value );
-    m_textctrl->SetValidator( validator );
+    SetTextValidator(wxTextValidator(style));
 }
 
 void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
@@ -170,8 +181,7 @@ void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
     m_textctrl->SetValidator( validator );
 }
 
-#endif
-  // wxUSE_VALIDATORS
+#endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog
diff --git a/Externals/wxWidgets3/src/generic/textmeasure.cpp b/Externals/wxWidgets3/src/generic/textmeasure.cpp
new file mode 100644
index 0000000000..55bb735d9c
--- /dev/null
+++ b/Externals/wxWidgets3/src/generic/textmeasure.cpp
@@ -0,0 +1,68 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/textmeasure.cpp
+// Purpose:
+// Author:      Vadim Zeitlin
+// Created:     2012-10-17
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/dc.h"
+#endif //WX_PRECOMP
+
+#include "wx/private/textmeasure.h"
+
+#if wxUSE_GENERIC_TEXTMEASURE
+
+// ============================================================================
+// wxTextMeasure generic implementation
+// ============================================================================
+
+// We assume that the ports not providing platform-specific wxTextMeasure
+// implementation implement the corresponding functions in their wxDC and
+// wxWindow classes, so forward back to them instead of using wxTextMeasure
+// from there, as usual.
+void wxTextMeasure::DoGetTextExtent(const wxString& string,
+                                    wxCoord *width,
+                                    wxCoord *height,
+                                    wxCoord *descent,
+                                    wxCoord *externalLeading)
+{
+    if ( m_dc )
+    {
+        m_dc->GetTextExtent(string, width, height,
+                            descent, externalLeading, m_font);
+    }
+    else if ( m_win )
+    {
+        m_win->GetTextExtent(string, width, height,
+                             descent, externalLeading, m_font);
+    }
+    //else: we already asserted in the ctor, don't do it any more
+}
+
+bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text,
+                                            wxArrayInt& widths,
+                                            double scaleX)
+{
+    return wxTextMeasureBase::DoGetPartialTextExtents(text, widths, scaleX);
+}
+
+#endif // wxUSE_GENERIC_TEXTMEASURE
diff --git a/Externals/wxWidgets3/src/generic/timectrlg.cpp b/Externals/wxWidgets3/src/generic/timectrlg.cpp
index a54b002918..71867c2f35 100644
--- a/Externals/wxWidgets3/src/generic/timectrlg.cpp
+++ b/Externals/wxWidgets3/src/generic/timectrlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Generic implementation of wxTimePickerCtrl.
 // Author:      Paul Breen, Vadim Zeitlin
 // Created:     2011-09-22
-// RCS-ID:      $Id: timectrlg.cpp 69991 2011-12-12 14:01:23Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -131,6 +130,17 @@ public:
     {
         m_time = time.IsValid() ? time : wxDateTime::Now();
 
+        // Ensure that the date part doesn't correspond to a DST change date as
+        // time is discontinuous then resulting in many problems, e.g. it's
+        // impossible to even enter 2:00:00 at the beginning of summer time
+        // date as this time doesn't exist. By using Jan 1, on which nobody
+        // changes DST, we avoid all such problems.
+        wxDateTime::Tm tm = m_time.GetTm();
+        tm.mday =
+        tm.yday = 1;
+        tm.mon = wxDateTime::Jan;
+        m_time.Set(tm);
+
         UpdateTextWithoutEvent();
     }
 
@@ -259,7 +269,7 @@ private:
 
     void OnTextClick(wxMouseEvent& event)
     {
-        Field field wxDUMMY_INITIALIZE(Field_Max);
+        Field field = Field_Max; // Initialize just to suppress warnings.
         long pos;
         switch ( m_text->HitTest(event.GetPosition(), &pos) )
         {
@@ -446,8 +456,8 @@ private:
             // The first digit simply replaces the existing field contents,
             // but the second one should be combined with the previous one,
             // otherwise entering 2-digit numbers would be impossible.
-            int currentValue wxDUMMY_INITIALIZE(0),
-                maxValue wxDUMMY_INITIALIZE(0);
+            int currentValue = 0,
+                maxValue  = 0;
 
             switch ( m_currentField )
             {
@@ -469,6 +479,7 @@ private:
                 case Field_AMPM:
                 case Field_Max:
                     wxFAIL_MSG( "Invalid field" );
+                    return;
             }
 
             // Check if the new value is acceptable. If not, we just handle
diff --git a/Externals/wxWidgets3/src/generic/timer.cpp b/Externals/wxWidgets3/src/generic/timer.cpp
index 2b45a5d092..0f0ccd1601 100644
--- a/Externals/wxWidgets3/src/generic/timer.cpp
+++ b/Externals/wxWidgets3/src/generic/timer.cpp
@@ -2,7 +2,6 @@
 // Name:        src/generic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
-// Id:          $Id: timer.cpp 70353 2012-01-15 14:46:41Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/tipdlg.cpp b/Externals/wxWidgets3/src/generic/tipdlg.cpp
index 919442286a..47d180962e 100644
--- a/Externals/wxWidgets3/src/generic/tipdlg.cpp
+++ b/Externals/wxWidgets3/src/generic/tipdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.06.99
-// RCS-ID:      $Id: tipdlg.cpp 64019 2010-04-18 00:05:37Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/generic/tipwin.cpp b/Externals/wxWidgets3/src/generic/tipwin.cpp
index 6164e216c0..7ab7e77ee0 100644
--- a/Externals/wxWidgets3/src/generic/tipwin.cpp
+++ b/Externals/wxWidgets3/src/generic/tipwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id: tipwin.cpp 70843 2012-03-08 16:45:17Z PC $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -226,7 +225,11 @@ void wxTipWindow::Close()
         if ( m_view->HasCapture() )
             m_view->ReleaseMouse();
     #endif
-    Destroy();
+    // Under OS X we get destroyed because of wxEVT_KILL_FOCUS generated by
+    // Show(false).
+    #ifndef __WXOSX__
+        Destroy();
+    #endif
 #else
     wxFrame::Close();
 #endif
diff --git a/Externals/wxWidgets3/src/generic/toolbkg.cpp b/Externals/wxWidgets3/src/generic/toolbkg.cpp
index cf80bed62d..ef724cbac3 100644
--- a/Externals/wxWidgets3/src/generic/toolbkg.cpp
+++ b/Externals/wxWidgets3/src/generic/toolbkg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2006-01-29
-// RCS-ID:      $Id: toolbkg.cpp 65931 2010-10-27 16:54:36Z VZ $
 // Copyright:   (c) 2006 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -45,8 +44,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)
@@ -202,12 +201,12 @@ void wxToolbook::SetImageList(wxImageList *imageList)
 
 wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);
+    return new wxBookCtrlEvent(wxEVT_TOOLBOOK_PAGE_CHANGING, m_windowId);
 }
 
 void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event)
 {
-    event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED);
+    event.SetEventType(wxEVT_TOOLBOOK_PAGE_CHANGED);
 }
 
 void wxToolbook::UpdateSelectedPage(size_t newsel)
@@ -333,28 +332,13 @@ bool wxToolbook::InsertPage(size_t n,
 
 wxWindow *wxToolbook::DoRemovePage(size_t page)
 {
-    const size_t page_count = GetPageCount();
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetToolBar()->DeleteTool(page + 1);
 
-        if (m_selection >= (int)page)
-        {
-            // force new sel valid if possible
-            int sel = m_selection - 1;
-            if (page_count == 1)
-                sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == wxNOT_FOUND))
-                sel = 0;
-
-            // force sel invalid if deleting current page - don't try to hide it
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
-
-            if ((sel != wxNOT_FOUND) && (sel != m_selection))
-                SetSelection(sel);
-        }
+        DoSetSelectionAfterRemoval(page);
     }
 
     return win;
diff --git a/Externals/wxWidgets3/src/generic/treebkg.cpp b/Externals/wxWidgets3/src/generic/treebkg.cpp
index 3c1e3d41a8..4e1917d1ca 100644
--- a/Externals/wxWidgets3/src/generic/treebkg.cpp
+++ b/Externals/wxWidgets3/src/generic/treebkg.cpp
@@ -4,7 +4,6 @@
 // Author:      Evgeniy Tarassov, Vadim Zeitlin
 // Modified by:
 // Created:     2005-09-15
-// RCS-ID:      $Id: treebkg.cpp 65931 2010-10-27 16:54:36Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,10 +46,10 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxBookCtrlBase)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,  wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,   wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED,  wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGING,  wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGED,   wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_EXPANDED,  wxBookCtrlEvent );
 
 BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
     EVT_TREE_SEL_CHANGED   (wxID_ANY, wxTreebook::OnTreeSelectionChange)
@@ -563,7 +562,7 @@ int wxTreebook::DoSetSelection(size_t pagePos, int flags)
     wxASSERT_MSG( GetPageCount() == DoInternalGetPageCount(),
                   wxT("wxTreebook logic error: m_treeIds and m_pages not in sync!"));
 
-    wxBookCtrlEvent event(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, m_windowId);
+    wxBookCtrlEvent event(wxEVT_TREEBOOK_PAGE_CHANGING, m_windowId);
     const int oldSel = m_selection;
     wxTreeCtrl *tree = GetTreeCtrl();
     bool allowed = false;
@@ -618,7 +617,7 @@ int wxTreebook::DoSetSelection(size_t pagePos, int flags)
         if (flags & SetSelection_SendEvent)
         {
             // notify about the (now completed) page change
-            event.SetEventType(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED);
+            event.SetEventType(wxEVT_TREEBOOK_PAGE_CHANGED);
             (void)GetEventHandler()->ProcessEvent(event);
         }
     }
@@ -702,8 +701,8 @@ void wxTreebook::OnTreeNodeExpandedCollapsed(wxTreeEvent & event)
     wxCHECK_RET( pagePos != wxNOT_FOUND, wxT("Internal problem in wxTreebook!..") );
 
     wxBookCtrlEvent ev(GetTreeCtrl()->IsExpanded(nodeId)
-            ? wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED
-            : wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED,
+            ? wxEVT_TREEBOOK_NODE_EXPANDED
+            : wxEVT_TREEBOOK_NODE_COLLAPSED,
         m_windowId);
 
     ev.SetSelection(pagePos);
diff --git a/Externals/wxWidgets3/src/generic/treectlg.cpp b/Externals/wxWidgets3/src/generic/treectlg.cpp
index b17ec147a5..9a90c457d0 100644
--- a/Externals/wxWidgets3/src/generic/treectlg.cpp
+++ b/Externals/wxWidgets3/src/generic/treectlg.cpp
@@ -1,10 +1,10 @@
+// XXX comex: scale support
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/treectlg.cpp
 // Purpose:     generic tree control implementation
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
-// Id:          $Id: treectlg.cpp 70625 2012-02-19 14:49:37Z SN $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,7 +127,7 @@ public:
 
     wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; }
 
-    virtual void Notify() { m_owner->m_findPrefix.clear(); }
+    virtual void Notify() { m_owner->ResetFindState(); }
 
 private:
     wxGenericTreeCtrl *m_owner;
@@ -423,8 +423,8 @@ BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
 END_EVENT_TABLE()
 
 wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
-                               wxGenericTreeItem *item)
-              : m_itemEdited(item), m_startValue(item->GetText())
+                               wxGenericTreeItem *itm)
+              : m_itemEdited(itm), m_startValue(itm->GetText())
 {
     m_owner = owner;
     m_aboutToFinish = false;
@@ -454,7 +454,7 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
     (void)Create(m_owner, wxID_ANY, m_startValue,
                  rect.GetPosition(), rect.GetSize());
 
-    SetSelection(-1, -1);
+    SelectAll();
 }
 
 void wxTreeTextCtrl::EndEdit(bool discardChanges)
@@ -956,6 +956,7 @@ void wxGenericTreeCtrl::Init()
     m_renameTimer = NULL;
 
     m_findTimer = NULL;
+    m_findBell = 0;  // default is to not ring bell at all
 
     m_dropEffectAboveItem = false;
 
@@ -1045,6 +1046,11 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl()
         delete m_imageListButtons;
 }
 
+void wxGenericTreeCtrl::EnableBellOnNoMatch( bool on )
+{
+    m_findBell = on;
+}
+
 // -----------------------------------------------------------------------------
 // accessors
 // -----------------------------------------------------------------------------
@@ -1557,6 +1563,13 @@ void wxGenericTreeCtrl::ResetTextControl()
     m_textCtrl = NULL;
 }
 
+void wxGenericTreeCtrl::ResetFindState()
+{
+    m_findPrefix.clear();
+    if ( m_findBell )
+        m_findBell = 1;
+}
+
 // find the first item starting with the given prefix after the given item
 wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
                                          const wxString& prefixOrig) const
@@ -1599,8 +1612,12 @@ wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
         {
             itemid = GetNext(itemid);
         }
-        // If we haven't found the item, id.IsOk() will be false, as per
-        // documentation
+        // If we haven't found the item but wrapped back to the one we started
+        // from, id.IsOk() must be false
+        if ( itemid == idParent )
+        {
+            itemid = wxTreeItemId();
+        }
     }
 
     return itemid;
@@ -1705,7 +1722,7 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId,
 
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {
-    wxTreeEvent event(wxEVT_COMMAND_TREE_DELETE_ITEM, this, item);
+    wxTreeEvent event(wxEVT_TREE_DELETE_ITEM, this, item);
     GetEventHandler()->ProcessEvent( event );
 }
 
@@ -1844,7 +1861,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
     if ( item->IsExpanded() )
         return;
 
-    wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, this, item);
+    wxTreeEvent event(wxEVT_TREE_ITEM_EXPANDING, this, item);
 
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
     {
@@ -1864,7 +1881,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
         m_dirty = true;
     }
 
-    event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+    event.SetEventType(wxEVT_TREE_ITEM_EXPANDED);
     GetEventHandler()->ProcessEvent( event );
 }
 
@@ -1878,7 +1895,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
     if ( !item->IsExpanded() )
         return;
 
-    wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, this, item);
+    wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING, this, item);
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
     {
         // cancelled by program
@@ -1901,7 +1918,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
 
     RefreshSubtree(item);
 
-    event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
+    event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED);
     GetEventHandler()->ProcessEvent( event );
 }
 
@@ -1994,7 +2011,7 @@ void wxGenericTreeCtrl::SelectChildren(const wxTreeItemId& parent)
 
     wxGenericTreeItem *
         item = (wxGenericTreeItem*) ((wxTreeItemId)children[0]).m_pItem;
-    wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+    wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item);
     event.m_itemOld = m_current;
 
     if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
@@ -2008,7 +2025,7 @@ void wxGenericTreeCtrl::SelectChildren(const wxTreeItemId& parent)
     }
 
 
-    event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+    event.SetEventType(wxEVT_TREE_SEL_CHANGED);
     GetEventHandler()->ProcessEvent( event );
 }
 
@@ -2118,7 +2135,7 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
             return;
     }
 
-    wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+    wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item);
     event.m_itemOld = m_current;
     // TODO : Here we don't send any selection mode yet !
 
@@ -2171,7 +2188,7 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
     // selection is set
     EnsureVisible( itemId );
 
-    event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+    event.SetEventType(wxEVT_TREE_SEL_CHANGED);
     GetEventHandler()->ProcessEvent( event );
 }
 
@@ -2187,14 +2204,14 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId, bool select)
     }
     else // deselect
     {
-        wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        wxTreeEvent event(wxEVT_TREE_SEL_CHANGING, this, item);
         if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
             return;
 
         item->SetHilight(false);
         RefreshLine(item);
 
-        event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+        event.SetEventType(wxEVT_TREE_SEL_CHANGED);
         GetEventHandler()->ProcessEvent( event );
     }
 }
@@ -2267,12 +2284,17 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item)
 
     // update the control before scrolling it
     if (m_dirty)
-#if defined( __WXMSW__ ) || defined(__WXMAC__)
+    {
+#if defined( __WXMSW__ ) 
         Update();
+#elif defined(__WXMAC__)
+        Update();
+        DoDirtyProcessing();
 #else
         DoDirtyProcessing();
 #endif
-
+    }
+        
     wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem;
 
     int itemY = gitem->GetY();
@@ -2289,6 +2311,12 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item)
     {
         // need to scroll up by enough to show this item fully
         itemY += itemHeight - clientHeight;
+#ifdef __WXOSX__
+        // because itemY below will be divided by PIXELS_PER_UNIT it may
+        // be rounded down, with the result of the item still only being 
+        // partially visible, so make sure we are rounding up
+        itemY += PIXELS_PER_UNIT-1;
+#endif
     }
     else if ( itemY > start_y*PIXELS_PER_UNIT )
     {
@@ -3020,7 +3048,7 @@ void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event )
 void wxGenericTreeCtrl::OnKeyDown( wxKeyEvent &event )
 {
     // send a tree event
-    wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, this);
+    wxTreeEvent te( wxEVT_TREE_KEY_DOWN, this);
     te.m_evtKey = event;
     if ( GetEventHandler()->ProcessEvent( te ) )
         return;
@@ -3114,7 +3142,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                 GetBoundingRect(m_current, ItemRect, true);
 
                 wxTreeEvent
-                    eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);
+                    eventMenu(wxEVT_TREE_ITEM_MENU, this, m_current);
                 // Use the left edge, vertical middle
                 eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
                                                 ItemRect.GetY() +
@@ -3128,7 +3156,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
             if ( !event.HasModifiers() )
             {
                 wxTreeEvent
-                   eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);
+                   eventAct(wxEVT_TREE_ITEM_ACTIVATED, this, m_current);
                 GetEventHandler()->ProcessEvent( eventAct );
             }
 
@@ -3294,21 +3322,28 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
             if ( !event.HasModifiers() &&
                  ((keyCode >= '0' && keyCode <= '9') ||
                   (keyCode >= 'a' && keyCode <= 'z') ||
-                  (keyCode >= 'A' && keyCode <= 'Z' )))
+                  (keyCode >= 'A' && keyCode <= 'Z') ||
+                  (keyCode == '_')))
             {
                 // find the next item starting with the given prefix
                 wxChar ch = (wxChar)keyCode;
+                wxTreeItemId id;
 
-                wxTreeItemId id = FindItem(m_current, m_findPrefix + ch);
-                if ( !id.IsOk() )
+                // if the same character is typed multiple times then go to the
+                // next entry starting with that character instead of searching
+                // for an item starting with multiple copies of this character,
+                // this is more useful and is how it works under Windows.
+                if ( m_findPrefix.length() == 1 && m_findPrefix[0] == ch )
                 {
-                    // no such item
-                    break;
+                    id = FindItem(m_current, ch);
+                }
+                else
+                {
+                    const wxString newPrefix(m_findPrefix + ch);
+                    id = FindItem(m_current, newPrefix);
+                    if ( id.IsOk() )
+                        m_findPrefix = newPrefix;
                 }
-
-                SelectItem(id);
-
-                m_findPrefix += ch;
 
                 // also start the timer to reset the current prefix if the user
                 // doesn't press any more alnum keys soon -- we wouldn't want
@@ -3318,7 +3353,32 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                     m_findTimer = new wxTreeFindTimer(this);
                 }
 
+                // Notice that we should start the timer even if we didn't find
+                // anything to make sure we reset the search state later.
                 m_findTimer->Start(wxTreeFindTimer::DELAY, wxTIMER_ONE_SHOT);
+
+                if ( id.IsOk() )
+                {
+                    SelectItem(id);
+
+                    // Reset the bell flag if it had been temporarily disabled
+                    // before.
+                    if ( m_findBell )
+                        m_findBell = 1;
+                }
+                else // No such item
+                {
+                    // Signal it with a bell if enabled.
+                    if ( m_findBell == 1 )
+                    {
+                        ::wxBell();
+
+                        // Disable it for the next unsuccessful match, we only
+                        // beep once, this is usually enough and continuing to
+                        // do it would be annoying.
+                        m_findBell = -1;
+                    }
+                }
             }
             else
             {
@@ -3412,7 +3472,7 @@ wxTextCtrl *wxGenericTreeCtrl::EditLabel(const wxTreeItemId& item,
 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 
-    wxTreeEvent te(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, this, itemEdit);
+    wxTreeEvent te(wxEVT_TREE_BEGIN_LABEL_EDIT, this, itemEdit);
     if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
     {
         // vetoed by user
@@ -3423,11 +3483,7 @@ wxTextCtrl *wxGenericTreeCtrl::EditLabel(const wxTreeItemId& item,
     // question might just have been added and no screen
     // update taken place.
     if ( m_dirty )
-#if defined( __WXMSW__ ) || defined(__WXMAC__)
-        Update();
-#else
         DoDirtyProcessing();
-#endif
 
     // TODO: use textCtrlClass here to create the control of correct class
     m_textCtrl = new wxTreeTextCtrl(this, itemEdit);
@@ -3456,7 +3512,7 @@ void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
                                        const wxString& value)
 {
-    wxTreeEvent le(wxEVT_COMMAND_TREE_END_LABEL_EDIT, this, item);
+    wxTreeEvent le(wxEVT_TREE_END_LABEL_EDIT, this, item);
     le.m_label = value;
     le.m_editCancelled = false;
 
@@ -3466,7 +3522,7 @@ bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
 void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
 {
     // let owner know that the edit was cancelled
-    wxTreeEvent le(wxEVT_COMMAND_TREE_END_LABEL_EDIT, this, item);
+    wxTreeEvent le(wxEVT_TREE_END_LABEL_EDIT, this, item);
     le.m_label = wxEmptyString;
     le.m_editCancelled = true;
 
@@ -3532,11 +3588,23 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     {
         // Ask the tree control what tooltip (if any) should be shown
         wxTreeEvent
-            hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,  this, hoverItem);
+            hevent(wxEVT_TREE_ITEM_GETTOOLTIP,  this, hoverItem);
 
-        if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() )
+        // setting a tooltip upon leaving a view is getting the tooltip displayed
+        // on the neighbouring view ...
+#ifdef __WXOSX__
+        if ( event.Leaving() )
+            SetToolTip(NULL);
+        else
+#endif
+        if ( GetEventHandler()->ProcessEvent(hevent) )
         {
-            SetToolTip(hevent.m_label);
+            // If the user permitted the tooltip change, update it, otherwise
+            // remove any old tooltip we might have.
+            if ( hevent.IsAllowed() )
+                SetToolTip(hevent.m_label);
+            else
+                SetToolTip(NULL);
         }
     }
 #endif
@@ -3575,8 +3643,8 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         }
 
         wxEventType command = event.RightIsDown()
-                              ? wxEVT_COMMAND_TREE_BEGIN_RDRAG
-                              : wxEVT_COMMAND_TREE_BEGIN_DRAG;
+                              ? wxEVT_TREE_BEGIN_RDRAG
+                              : wxEVT_TREE_BEGIN_DRAG;
 
         wxTreeEvent nevent(command,  this, m_current);
         nevent.SetPoint(CalcScrolledPosition(pt));
@@ -3645,7 +3713,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         }
 
         // generate the drag end event
-        wxTreeEvent eventEndDrag(wxEVT_COMMAND_TREE_END_DRAG,  this, item);
+        wxTreeEvent eventEndDrag(wxEVT_TREE_END_DRAG,  this, item);
 
         eventEndDrag.m_pointDrag = CalcScrolledPosition(pt);
 
@@ -3695,20 +3763,20 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             }
 
             wxTreeEvent
-                nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,  this, item);
+                nevent(wxEVT_TREE_ITEM_RIGHT_CLICK,  this, item);
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
 
             // Consistent with MSW (for now), send the ITEM_MENU *after*
             // the RIGHT_CLICK event. TODO: This behaviour may change.
-            wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU,  this, item);
+            wxTreeEvent nevent2(wxEVT_TREE_ITEM_MENU,  this, item);
             nevent2.m_pointDrag = CalcScrolledPosition(pt);
             GetEventHandler()->ProcessEvent(nevent2);
         }
         else if ( event.MiddleDown() )
         {
             wxTreeEvent
-                nevent(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,  this, item);
+                nevent(wxEVT_TREE_ITEM_MIDDLE_CLICK,  this, item);
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
         }
@@ -3717,7 +3785,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
             {
                 wxTreeEvent
-                    nevent(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, this, item);
+                    nevent(wxEVT_TREE_STATE_IMAGE_CLICK, this, item);
                 GetEventHandler()->ProcessEvent(nevent);
             }
 
@@ -3763,7 +3831,14 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             // ==> LeftDown() || LeftDClick()
             if ( event.LeftDown() )
             {
-                m_lastOnSame = item == m_current;
+                // If we click on an already selected item but do it to return
+                // the focus to the control, it shouldn't start editing the
+                // item label because it's too easy to start editing
+                // accidentally (and also because nobody else does it like
+                // this). So only set this flag, used to decide whether we
+                // should start editing the label later, if we already have
+                // focus.
+                m_lastOnSame = item == m_current && HasFocus();
             }
 
             if ( flags & wxTREE_HITTEST_ONITEMBUTTON )
@@ -3812,7 +3887,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
                 // send activate event first
                 wxTreeEvent
-                    nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,  this, item);
+                    nevent(wxEVT_TREE_ITEM_ACTIVATED,  this, item);
                 nevent.m_pointDrag = CalcScrolledPosition(pt);
                 if ( !GetEventHandler()->ProcessEvent( nevent ) )
                 {
@@ -4004,11 +4079,24 @@ bool wxGenericTreeCtrl::SetForegroundColour(const wxColour& colour)
     return true;
 }
 
-// Process the tooltip event, to speed up event processing.
-// Doesn't actually get a tooltip.
 void wxGenericTreeCtrl::OnGetToolTip( wxTreeEvent &event )
 {
-    event.Veto();
+#if wxUSE_TOOLTIPS
+    wxTreeItemId itemId = event.GetItem();
+    const wxGenericTreeItem* const pItem = (wxGenericTreeItem*)itemId.m_pItem;
+
+    // Check if the item fits into the client area:
+    if ( pItem->GetX() + pItem->GetWidth() > GetClientSize().x )
+    {
+        // If it doesn't, show its full text in the tooltip.
+        event.SetLabel(pItem->GetText());
+    }
+    else
+#endif // wxUSE_TOOLTIPS
+    {
+        // veto processing the event, nixing any tooltip
+        event.Veto();
+    }
 }
 
 
diff --git a/Externals/wxWidgets3/src/generic/treelist.cpp b/Externals/wxWidgets3/src/generic/treelist.cpp
index deedad6351..73fbe6c466 100644
--- a/Externals/wxWidgets3/src/generic/treelist.cpp
+++ b/Externals/wxWidgets3/src/generic/treelist.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Generic wxTreeListCtrl implementation.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-19
-// RCS-ID:      $Id: treelist.cpp 69805 2011-11-23 23:58:54Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -717,8 +716,6 @@ void wxTreeListModel::DeleteItem(Node* item)
 
     Node* const parent = item->GetParent();
 
-    ItemDeleted(ToDVI(parent), ToDVI(item));
-
     Node* previous = parent->GetChild();
     if ( previous == item )
     {
@@ -740,6 +737,8 @@ void wxTreeListModel::DeleteItem(Node* item)
 
         previous->DeleteNext();
     }
+
+    ItemDeleted(ToDVI(parent), ToDVI(item));
 }
 
 void wxTreeListModel::DeleteAllItems()
@@ -1029,10 +1028,14 @@ bool wxTreeListCtrl::Create(wxWindow* parent,
     }
 
     m_view = new wxDataViewCtrl;
+    long styleDataView = HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE
+                                                : wxDV_SINGLE;
+    if ( HasFlag(wxTL_NO_HEADER) )
+        styleDataView |= wxDV_NO_HEADER;
+
     if ( !m_view->Create(this, wxID_ANY,
                          wxPoint(0, 0), GetClientSize(),
-                         HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE
-                                                : wxDV_SINGLE) )
+                         styleDataView) )
     {
         delete m_view;
         m_view = NULL;
@@ -1561,7 +1564,7 @@ void wxTreeListCtrl::SendColumnEvent(wxEventType evt, wxDataViewEvent& eventDV)
 void
 wxTreeListCtrl::OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld)
 {
-    wxTreeListEvent event(wxEVT_COMMAND_TREELIST_ITEM_CHECKED, this, item);
+    wxTreeListEvent event(wxEVT_TREELIST_ITEM_CHECKED, this, item);
     event.SetOldCheckedState(stateOld);
 
     ProcessWindowEvent(event);
@@ -1569,32 +1572,32 @@ wxTreeListCtrl::OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld)
 
 void wxTreeListCtrl::OnSelectionChanged(wxDataViewEvent& event)
 {
-    SendItemEvent(wxEVT_COMMAND_TREELIST_SELECTION_CHANGED, event);
+    SendItemEvent(wxEVT_TREELIST_SELECTION_CHANGED, event);
 }
 
 void wxTreeListCtrl::OnItemExpanding(wxDataViewEvent& event)
 {
-    SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_EXPANDING, event);
+    SendItemEvent(wxEVT_TREELIST_ITEM_EXPANDING, event);
 }
 
 void wxTreeListCtrl::OnItemExpanded(wxDataViewEvent& event)
 {
-    SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_EXPANDED, event);
+    SendItemEvent(wxEVT_TREELIST_ITEM_EXPANDED, event);
 }
 
 void wxTreeListCtrl::OnItemActivated(wxDataViewEvent& event)
 {
-    SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED, event);
+    SendItemEvent(wxEVT_TREELIST_ITEM_ACTIVATED, event);
 }
 
 void wxTreeListCtrl::OnItemContextMenu(wxDataViewEvent& event)
 {
-    SendItemEvent(wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU, event);
+    SendItemEvent(wxEVT_TREELIST_ITEM_CONTEXT_MENU, event);
 }
 
 void wxTreeListCtrl::OnColumnSorted(wxDataViewEvent& event)
 {
-    SendColumnEvent(wxEVT_COMMAND_TREELIST_COLUMN_SORTED, event);
+    SendColumnEvent(wxEVT_TREELIST_COLUMN_SORTED, event);
 }
 
 // ----------------------------------------------------------------------------
@@ -1662,7 +1665,7 @@ wxWindow* wxTreeListCtrl::GetView() const
 wxIMPLEMENT_DYNAMIC_CLASS(wxTreeListEvent, wxNotifyEvent)
 
 #define wxDEFINE_TREELIST_EVENT(name) \
-    wxDEFINE_EVENT(wxEVT_COMMAND_TREELIST_##name, wxTreeListEvent)
+    wxDEFINE_EVENT(wxEVT_TREELIST_##name, wxTreeListEvent)
 
 wxDEFINE_TREELIST_EVENT(SELECTION_CHANGED);
 wxDEFINE_TREELIST_EVENT(ITEM_EXPANDING);
diff --git a/Externals/wxWidgets3/src/generic/vlbox.cpp b/Externals/wxWidgets3/src/generic/vlbox.cpp
index b0adc14cfa..e277070b3d 100644
--- a/Externals/wxWidgets3/src/generic/vlbox.cpp
+++ b/Externals/wxWidgets3/src/generic/vlbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id: vlbox.cpp 69180 2011-09-21 15:08:10Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -275,7 +274,7 @@ void wxVListBox::SendSelectedEvent()
     wxASSERT_MSG( m_current != wxNOT_FOUND,
                     wxT("SendSelectedEvent() shouldn't be called") );
 
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
+    wxCommandEvent event(wxEVT_LISTBOX, GetId());
     InitEvent(event, m_current);
     (void)GetEventHandler()->ProcessEvent(event);
 }
@@ -720,7 +719,7 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
         // this event as a left-click instead
         if ( item == m_current )
         {
-            wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
+            wxCommandEvent event(wxEVT_LISTBOX_DCLICK, GetId());
             InitEvent(event, item);
             (void)GetEventHandler()->ProcessEvent(event);
         }
diff --git a/Externals/wxWidgets3/src/generic/vscroll.cpp b/Externals/wxWidgets3/src/generic/vscroll.cpp
index 53fbaebd66..38e882bbb0 100644
--- a/Externals/wxWidgets3/src/generic/vscroll.cpp
+++ b/Externals/wxWidgets3/src/generic/vscroll.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, David Warkentin
 // Created:     30.05.03
-// RCS-ID:      $Id: vscroll.cpp 69180 2011-09-21 15:08:10Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -62,12 +61,20 @@ private:
 // wxVarScrollHelperEvtHandler implementation
 // ============================================================================
 
+// FIXME: This method totally duplicates a method with the same name in
+//        wxScrollHelperEvtHandler, we really should merge them by reusing the
+//        common parts in wxAnyScrollHelperBase.
 bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 {
     wxEventType evType = event.GetEventType();
 
-    // pass it on to the real handler
-    bool processed = wxEvtHandler::ProcessEvent(event);
+    // Pass it on to the real handler: notice that we must not call
+    // ProcessEvent() on this object itself as it wouldn't pass it to the next
+    // handler (i.e. the real window) if we're called from a previous handler
+    // (as indicated by "process here only" flag being set) and we do want to
+    // execute the handler defined in the window we're associated with right
+    // now, without waiting until TryAfter() is called from wxEvtHandler.
+    bool processed = m_nextHandler->ProcessEvent(event);
 
     // always process the size events ourselves, even if the user code handles
     // them as well, as we need to AdjustScrollbars()
@@ -79,20 +86,32 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
     if ( evType == wxEVT_SIZE )
     {
         m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
-
-        return !event.GetSkipped();
+        return true;
     }
 
-    if ( processed )
+    // For wxEVT_PAINT the user code can either handle this event as usual or
+    // override virtual OnDraw(), so if the event hasn't been handled we need
+    // to call this virtual function ourselves.
+    if (
+#ifndef __WXUNIVERSAL__
+          // in wxUniversal "processed" will always be true, because
+          // all windows use the paint event to draw themselves.
+          // In this case we can't use this flag to determine if a custom
+          // paint event handler already drew our window and we just
+          // call OnDraw() anyway.
+          !processed &&
+#endif // !__WXUNIVERSAL__
+            evType == wxEVT_PAINT )
     {
-        // normally, nothing more to do here - except if we have a command
-        // event
-        if ( event.IsCommandEvent() )
-        {
-            return true;
-        }
+        m_scrollHelper->HandleOnPaint((wxPaintEvent &)event);
+        return true;
     }
 
+    // If the user code handled this event, it should prevent the default
+    // handling from taking place, so don't do anything else in this case.
+    if ( processed )
+        return true;
+
     // reset the skipped flag (which might have been set to true in
     // ProcessEvent() above) to be able to test it below
     bool wasSkipped = event.GetSkipped();
@@ -113,20 +132,46 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         {
             // it makes sense to indicate that we processed the message as we
             // did scroll the window (and also notice that wxAutoScrollTimer
-            // relies on our return value for continuous scrolling)
+            // relies on our return value to stop scrolling when we are at top
+            // or bottom already)
             processed = true;
             wasSkipped = false;
         }
     }
 #if wxUSE_MOUSEWHEEL
+    // Use GTK's own scroll wheel handling in GtkScrolledWindow
+#ifndef __WXGTK20__
     else if ( evType == wxEVT_MOUSEWHEEL )
     {
         m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
+        return true;
     }
+#endif
 #endif // wxUSE_MOUSEWHEEL
+    else if ( evType == wxEVT_CHAR &&
+                (m_scrollHelper->GetOrientation() == wxVERTICAL) )
+    {
+        m_scrollHelper->HandleOnChar((wxKeyEvent &)event);
+        if ( !event.GetSkipped() )
+        {
+            processed = true;
+            wasSkipped = false;
+        }
+    }
 
     event.Skip(wasSkipped);
 
+    // We called ProcessEvent() on the next handler, meaning that we explicitly
+    // worked around the request to process the event in this handler only. As
+    // explained above, this is unfortunately really necessary but the trouble
+    // is that the event will continue to be post-processed by the previous
+    // handler resulting in duplicate calls to event handlers. Call the special
+    // function below to prevent this from happening, base class DoTryChain()
+    // will check for it and behave accordingly.
+    //
+    // And if we're not called from DoTryChain(), this won't do anything anyhow.
+    event.DidntHonourProcessOnlyIn();
+
     return processed;
 }
 
@@ -140,9 +185,8 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 // ----------------------------------------------------------------------------
 
 wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win)
+    : wxAnyScrollHelperBase(win)
 {
-    wxASSERT_MSG( win, wxT("associated window can't be NULL in wxVarScrollHelperBase") );
-
 #if wxUSE_MOUSEWHEEL
     m_sumWheelRotation = 0;
 #endif
@@ -151,17 +195,11 @@ wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win)
     m_sizeTotal = 0;
     m_unitFirst = 0;
 
-    m_win =
-    m_targetWindow = NULL;
-
     m_physicalScrolling = true;
     m_handler = NULL;
 
-    m_win = win;
-
     // by default, the associated window is also the target window
     DoSetTargetWindow(win);
-
 }
 
 wxVarScrollHelperBase::~wxVarScrollHelperBase()
@@ -487,10 +525,10 @@ void wxVarScrollHelperBase::RefreshUnits(size_t from, size_t to)
         to = GetVisibleEnd();
 
     // calculate the rect occupied by these units on screen
-    int orient_size, nonorient_size, orient_pos;
-    orient_size = nonorient_size = orient_pos = 0;
+    int orient_size = 0,
+        orient_pos = 0;
 
-    nonorient_size = GetNonOrientationTargetSize();
+    int nonorient_size = GetNonOrientationTargetSize();
 
     for ( size_t nBefore = GetVisibleBegin();
           nBefore < from;
diff --git a/Externals/wxWidgets3/src/generic/wizard.cpp b/Externals/wxWidgets3/src/generic/wizard.cpp
index 9256a9ef95..25d1a669d0 100644
--- a/Externals/wxWidgets3/src/generic/wizard.cpp
+++ b/Externals/wxWidgets3/src/generic/wizard.cpp
@@ -8,7 +8,6 @@
 //              3) Fixed ShowPage() bug on displaying bitmaps
 //              Robert Vazan (sizers)
 // Created:     15.08.99
-// RCS-ID:      $Id: wizard.cpp 70630 2012-02-20 11:38:52Z JS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
index 7340be7935..fc978bf990 100644
--- a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     native GTK+ wxAboutBox() implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// RCS-ID:      $Id: aboutdlg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,16 +18,17 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_ABOUTDLG && defined(__WXGTK26__)
+#if wxUSE_ABOUTDLG
+
+#include "wx/aboutdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"       // for wxLaunchDefaultBrowser()
 #endif //WX_PRECOMP
 
-#include "wx/aboutdlg.h"
-#include "wx/generic/aboutdlgg.h"
-
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings
@@ -101,126 +101,141 @@ private:
 // GTK+ about dialog is modeless, keep track of it in this variable
 static GtkAboutDialog *gs_aboutDialog = NULL;
 
-extern "C" void
-wxGtkAboutDialogOnClose(GtkAboutDialog *about)
+extern "C" {
+static void wxGtkAboutDialogOnClose(GtkAboutDialog *about)
 {
     gtk_widget_destroy(GTK_WIDGET(about));
     if ( about == gs_aboutDialog )
         gs_aboutDialog = NULL;
 }
+}
 
-extern "C" void
-wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about),
-                       const gchar *link,
-                       gpointer WXUNUSED(data))
+#ifdef __WXGTK3__
+extern "C" {
+static gboolean activate_link(GtkAboutDialog*, const char* link, void* dontIgnore)
+{
+    if (dontIgnore)
+    {
+        wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
+        return true;
+    }
+    return false;
+}
+}
+#else
+extern "C" {
+static void wxGtkAboutDialogOnLink(GtkAboutDialog*, const char* link, void*)
 {
     wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
 }
+}
+#endif
 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
 {
-    if ( !gtk_check_version(2,6,0) )
+    // don't create another dialog if one is already present
+    if ( !gs_aboutDialog )
+        gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
+
+    GtkAboutDialog * const dlg = gs_aboutDialog;
+    gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName()));
+    if ( info.HasVersion() )
+        gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
+    else
+        gtk_about_dialog_set_version(dlg, NULL);
+    if ( info.HasCopyright() )
+        gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay()));
+    else
+        gtk_about_dialog_set_copyright(dlg, NULL);
+    if ( info.HasDescription() )
+        gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
+    else
+        gtk_about_dialog_set_comments(dlg, NULL);
+    if ( info.HasLicence() )
+        gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence()));
+    else
+        gtk_about_dialog_set_license(dlg, NULL);
+
+    wxIcon icon = info.GetIcon();
+    if ( icon.IsOk() )
+        gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf());
+
+    if ( info.HasWebSite() )
     {
-        // don't create another dialog if one is already present
-        if ( !gs_aboutDialog )
-            gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
+#ifdef __WXGTK3__
+        g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), dlg);
+#else
+        // NB: must be called before gtk_about_dialog_set_website() as
+        //     otherwise it has no effect (although GTK+ docs don't mention
+        //     this...)
+        gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL);
+#endif
 
-        GtkAboutDialog * const dlg = gs_aboutDialog;
-        gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName()));
-        if ( info.HasVersion() )
-            gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
-        else
-            gtk_about_dialog_set_version(dlg, NULL);
-        if ( info.HasCopyright() )
-            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay()));
-        else
-            gtk_about_dialog_set_copyright(dlg, NULL);
-        if ( info.HasDescription() )
-            gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
-        else
-            gtk_about_dialog_set_comments(dlg, NULL);
-        if ( info.HasLicence() )
-            gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence()));
-        else
-            gtk_about_dialog_set_license(dlg, NULL);
-
-        wxIcon icon = info.GetIcon();
-        if ( icon.IsOk() )
-            gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf());
-
-        if ( info.HasWebSite() )
-        {
-            // NB: must be called before gtk_about_dialog_set_website() as
-            //     otherwise it has no effect (although GTK+ docs don't mention
-            //     this...)
-            gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL);
-
-            gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL()));
-            gtk_about_dialog_set_website_label
-            (
-                dlg,
-                wxGTK_CONV_SYS(info.GetWebSiteDescription())
-            );
-        }
-        else
-        {
-            gtk_about_dialog_set_website(dlg, NULL);
-            gtk_about_dialog_set_website_label(dlg, NULL);
-            gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
-        }
-
-        if ( info.HasDevelopers() )
-            gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
-        else
-            gtk_about_dialog_set_authors(dlg, GtkArray());
-        if ( info.HasDocWriters() )
-            gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
-        else
-            gtk_about_dialog_set_documenters(dlg, GtkArray());
-        if ( info.HasArtists() )
-            gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
-        else
-            gtk_about_dialog_set_artists(dlg, GtkArray());
-
-        wxString transCredits;
-        if ( info.HasTranslators() )
-        {
-            const wxArrayString& translators = info.GetTranslators();
-            const size_t count = translators.size();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                transCredits << translators[n] << wxT('\n');
-            }
-        }
-        else // no translators explicitly specified
-        {
-            // maybe we have translator credits in the message catalog?
-            wxString translator = _("translator-credits");
-
-            // gtk_about_dialog_set_translator_credits() is smart enough to
-            // detect if "translator-credits" is untranslated and hide the
-            // translators tab in that case, however it will still show the
-            // "credits" button, (at least GTK 2.10.6) even if there are no
-            // credits informations at all, so we still need to do the check
-            // ourselves
-            if ( translator != wxT("translator-credits") ) // untranslated!
-                transCredits = translator;
-        }
-
-        if ( !transCredits.empty() )
-            gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
-        else
-            gtk_about_dialog_set_translator_credits(dlg, NULL);
-
-        g_signal_connect(dlg, "response",
-                            G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
-
-        gtk_window_present(GTK_WINDOW(dlg));
-        return;
+        gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL()));
+        gtk_about_dialog_set_website_label
+        (
+            dlg,
+            wxGTK_CONV_SYS(info.GetWebSiteDescription())
+        );
+    }
+    else
+    {
+        gtk_about_dialog_set_website(dlg, NULL);
+        gtk_about_dialog_set_website_label(dlg, NULL);
+#ifdef __WXGTK3__
+        g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), NULL);
+#else
+        gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
+#endif
     }
 
-    // native about dialog not available, fall back to the generic one
-    wxGenericAboutBox(info);
+    if ( info.HasDevelopers() )
+        gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
+    else
+        gtk_about_dialog_set_authors(dlg, GtkArray());
+    if ( info.HasDocWriters() )
+        gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
+    else
+        gtk_about_dialog_set_documenters(dlg, GtkArray());
+    if ( info.HasArtists() )
+        gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
+    else
+        gtk_about_dialog_set_artists(dlg, GtkArray());
+
+    wxString transCredits;
+    if ( info.HasTranslators() )
+    {
+        const wxArrayString& translators = info.GetTranslators();
+        const size_t count = translators.size();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            transCredits << translators[n] << wxT('\n');
+        }
+    }
+    else // no translators explicitly specified
+    {
+        // maybe we have translator credits in the message catalog?
+        wxString translator = _("translator-credits");
+
+        // gtk_about_dialog_set_translator_credits() is smart enough to
+        // detect if "translator-credits" is untranslated and hide the
+        // translators tab in that case, however it will still show the
+        // "credits" button, (at least GTK 2.10.6) even if there are no
+        // credits informations at all, so we still need to do the check
+        // ourselves
+        if ( translator != wxT("translator-credits") ) // untranslated!
+            transCredits = translator;
+    }
+
+    if ( !transCredits.empty() )
+        gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
+    else
+        gtk_about_dialog_set_translator_credits(dlg, NULL);
+
+    g_signal_connect(dlg, "response",
+                        G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
+
+    gtk_window_present(GTK_WINDOW(dlg));
 }
 
-#endif // wxUSE_ABOUTDLG && GTK+ 2.6+
+#endif // wxUSE_ABOUTDLG
diff --git a/Externals/wxWidgets3/src/gtk/animate.cpp b/Externals/wxWidgets3/src/gtk/animate.cpp
index 833c36d9c4..8ed590bbe9 100644
--- a/Externals/wxWidgets3/src/gtk/animate.cpp
+++ b/Externals/wxWidgets3/src/gtk/animate.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     24/09/2006
-// Id:          $Id: animate.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,6 +22,7 @@
 #endif
 
 #include "wx/wfstream.h"
+#include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 
@@ -84,7 +84,7 @@ wxAnimation& wxAnimation::operator=(const wxAnimation& that)
 bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type))
 {
     UnRef();
-    m_pixbuf = gdk_pixbuf_animation_new_from_file(name.fn_str(), NULL);
+    m_pixbuf = gdk_pixbuf_animation_new_from_file(wxGTK_CONV_FN(name), NULL);
     return IsOk();
 }
 
@@ -362,20 +362,8 @@ void wxAnimationCtrl::DisplayStaticImage()
     if (m_bmpStaticReal.IsOk())
     {
         // show inactive bitmap
-        GdkBitmap *mask = NULL;
-        if (m_bmpStaticReal.GetMask())
-            mask = m_bmpStaticReal.GetMask()->GetBitmap();
-
-        if (m_bmpStaticReal.HasPixbuf())
-        {
-            gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
+        gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
                                       m_bmpStaticReal.GetPixbuf());
-        }
-        else
-        {
-            gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
-                                      m_bmpStaticReal.GetPixmap(), mask);
-        }
     }
     else
     {
diff --git a/Externals/wxWidgets3/src/gtk/anybutton.cpp b/Externals/wxWidgets3/src/gtk/anybutton.cpp
index d58e6246ae..d64948f55e 100644
--- a/Externals/wxWidgets3/src/gtk/anybutton.cpp
+++ b/Externals/wxWidgets3/src/gtk/anybutton.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     1998-05-20 (extracted from button.cpp)
-// Id:          $Id: anybutton.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,7 +18,8 @@
 
 #include "wx/stockitem.h"
 
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
@@ -87,14 +87,14 @@ bool wxAnyButton::Enable( bool enable )
 
 GdkWindow *wxAnyButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    return GTK_BUTTON(m_widget)->event_window;
+    return gtk_button_get_event_window(GTK_BUTTON(m_widget));
 }
 
 // static
 wxVisualAttributes
 wxAnyButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new());
 }
 
 // ----------------------------------------------------------------------------
@@ -177,23 +177,7 @@ void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap)
     }
     else // have both label and bitmap
     {
-#ifdef __WXGTK26__
-        if ( !gtk_check_version(2,6,0) )
-        {
-            image = gtk_button_get_image(GTK_BUTTON(m_widget));
-        }
-        else
-#endif // __WXGTK26__
-        {
-            // buttons with both label and bitmap are only supported with GTK+
-            // 2.6 so far
-            //
-            // it shouldn't be difficult to implement them ourselves for the
-            // previous GTK+ versions by stuffing a container with a label and
-            // an image inside GtkButton but there doesn't seem to be much
-            // point in doing this for ancient GTK+ versions
-            return;
-        }
+        image = gtk_button_get_image(GTK_BUTTON(m_widget));
     }
 
     wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" );
@@ -218,10 +202,9 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
                 // its size) changes
                 InvalidateBestSize();
             }
-#ifdef __WXGTK26__
             // normal image is special: setting it enables images for the button and
             // resetting it to nothing disables all of them
-            else if ( !gtk_check_version(2,6,0) )
+            else
             {
                 GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
                 if ( image && !bitmap.IsOk() )
@@ -241,7 +224,6 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 
                 InvalidateBestSize();
             }
-#endif // GTK+ 2.6+
             break;
 
         case State_Pressed:
diff --git a/Externals/wxWidgets3/src/gtk/app.cpp b/Externals/wxWidgets3/src/gtk/app.cpp
index c7c020b558..2bd616a4ba 100644
--- a/Externals/wxWidgets3/src/gtk/app.cpp
+++ b/Externals/wxWidgets3/src/gtk/app.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/app.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: app.cpp 70701 2012-02-26 17:18:41Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,7 +25,6 @@
     #include <gpe/init.h>
 #endif
 
-#include "wx/gtk/private.h"
 #include "wx/apptrait.h"
 #include "wx/fontmap.h"
 
@@ -38,9 +36,8 @@
     #include <hildon/hildon.h>
 #endif // wxUSE_LIBHILDON2
 
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // link GnomeVFS
@@ -145,29 +142,26 @@ bool wxApp::DoIdle()
 #if wxUSE_THREADS
     wxMutexLocker lock(m_idleMutex);
 #endif
-    // if a new idle source was added during ProcessIdle
-    if (m_idleSourceId != 0)
-    {
-        // remove it
-        g_source_remove(m_idleSourceId);
-        m_idleSourceId = 0;
-    }
 
-    // Pending events can be added asynchronously,
-    // need to keep idle source if any have appeared
-    if (HasPendingEvents())
-        needMore = true;
-
-    // if more idle processing requested
-    if (needMore)
+    bool keepSource = false;
+    // if a new idle source has not been added, either as a result of idle
+    // processing above or by another thread calling WakeUpIdle()
+    if (m_idleSourceId == 0)
     {
-        // keep this source installed
-        m_idleSourceId = id_save;
-        return true;
+        // if more idle processing was requested or pending events have appeared
+        if (needMore || HasPendingEvents())
+        {
+            // keep this source installed
+            m_idleSourceId = id_save;
+            keepSource = true;
+        }
+        else // add hooks and remove this source
+            wx_add_idle_hooks();
     }
-    // add hooks and remove this source
-    wx_add_idle_hooks();
-    return false;
+    // else remove this source, leave new one installed
+    // we must keep an idle source, otherwise a wakeup could be lost
+
+    return keepSource;
 }
 
 //-----------------------------------------------------------------------------
@@ -204,6 +198,10 @@ wxApp::~wxApp()
 
 bool wxApp::SetNativeTheme(const wxString& theme)
 {
+#ifdef __WXGTK3__
+    wxUnusedVar(theme);
+    return false;
+#else
     wxString path;
     path = gtk_rc_get_theme_dir();
     path += "/";
@@ -224,6 +222,7 @@ bool wxApp::SetNativeTheme(const wxString& theme)
     gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);
 
     return true;
+#endif
 }
 
 bool wxApp::OnInitGui()
@@ -231,6 +230,7 @@ bool wxApp::OnInitGui()
     if ( !wxAppBase::OnInitGui() )
         return false;
 
+#ifndef __WXGTK3__
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
     if ( GetXVisualInfo() )
@@ -268,6 +268,7 @@ bool wxApp::OnInitGui()
             }
         }
     }
+#endif
 
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     if ( !GetHildonProgram() )
@@ -297,6 +298,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
 
+#ifdef __UNIX__
     // decide which conversion to use for the file names
 
     // (1) this variable exists for the sole purpose of specifying the encoding
@@ -306,9 +308,9 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     if (encName.CmpNoCase(wxT("@locale")) == 0)
         encName.clear();
     encName.MakeUpper();
-#if wxUSE_INTL
     if (encName.empty())
     {
+#if wxUSE_INTL
         // (2) if a non default locale is set, assume that the user wants his
         //     filenames in this locale too
         encName = wxLocale::GetSystemEncodingName().Upper();
@@ -327,24 +329,17 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
                 encName.clear();
             }
         }
+#endif // wxUSE_INTL
 
         // (3) finally use UTF-8 by default
         if ( encName.empty() )
             encName = wxT("UTF-8");
         wxSetEnv(wxT("G_FILENAME_ENCODING"), encName);
     }
-#else
-    if (encName.empty())
-        encName = wxT("UTF-8");
 
-    // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported
-    // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "")
-    // from gtk_init_check() as it does by default
-    gtk_disable_setlocale();
-
-#endif // wxUSE_INTL
     static wxConvBrokenFileNames fileconv(encName);
     wxConvFileName = &fileconv;
+#endif // __UNIX__
 
 
     bool init_result;
@@ -362,13 +357,17 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
     int argcGTK = argc_;
 
+    // Prevent gtk_init_check() from changing the locale automatically for
+    // consistency with the other ports that don't do it. If necessary,
+    // wxApp::SetCLocale() may be explicitly called.
+    gtk_disable_setlocale();
+
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #else
-    init_result = gtk_init_check( &argcGTK, &argvGTK );
+    init_result = gtk_init_check( &argcGTK, &argvGTK ) != 0;
 #endif
-    wxUpdateLocaleIsUtf8();
 
     if ( argcGTK != argc_ )
     {
@@ -529,6 +528,25 @@ void wxGUIAppTraits::MutexGuiLeave()
 }
 #endif // wxUSE_THREADS
 
+/* static */
+bool wxApp::GTKIsUsingGlobalMenu()
+{
+    static int s_isUsingGlobalMenu = -1;
+    if ( s_isUsingGlobalMenu == -1 )
+    {
+        // Currently we just check for this environment variable because this
+        // is how support for the global menu is implemented under Ubuntu.
+        //
+        // If we ever get false positives, we could also check for
+        // XDG_CURRENT_DESKTOP env var being set to "Unity".
+        wxString proxy;
+        s_isUsingGlobalMenu = wxGetEnv("UBUNTU_MENUPROXY", &proxy) &&
+                                !proxy.empty() && proxy != "0";
+    }
+
+    return s_isUsingGlobalMenu == 1;
+}
+
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
 // Maemo-specific method: get the main program object
 HildonProgram *wxApp::GetHildonProgram()
diff --git a/Externals/wxWidgets3/src/gtk/artgtk.cpp b/Externals/wxWidgets3/src/gtk/artgtk.cpp
index 8ddb480e04..addcca0f1f 100644
--- a/Externals/wxWidgets3/src/gtk/artgtk.cpp
+++ b/Externals/wxWidgets3/src/gtk/artgtk.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-22
-// RCS-ID:      $Id: artgtk.cpp 70154 2011-12-28 13:51:29Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,8 @@
 #endif
 
 #include "wx/artprov.h"
+
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // compatibility with older GTK+ versions:
@@ -203,7 +204,16 @@ GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
     //        with "stock-id" representation (in addition to pixmap and pixbuf
     //        ones) and would convert it to pixbuf when rendered.
 
-    GtkStyle* style = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget());
+    GtkWidget* widget = wxGTKPrivate::GetButtonWidget();
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    GtkIconSet* iconset = gtk_style_context_lookup_icon_set(sc, stockid);
+    GdkPixbuf* pixbuf = NULL;
+    if (iconset)
+        pixbuf = gtk_icon_set_render_icon_pixbuf(iconset, sc, size);
+    return pixbuf;
+#else
+    GtkStyle* style = gtk_widget_get_style(widget);
     GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid);
 
     if (!iconset)
@@ -212,6 +222,7 @@ GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
     return gtk_icon_set_render_icon(iconset, style,
                                     gtk_widget_get_default_direction(),
                                     GTK_STATE_NORMAL, size, NULL, NULL);
+#endif
 }
 
 GdkPixbuf *CreateThemeIcon(const char *iconname, int size)
@@ -259,7 +270,7 @@ wxIconBundle DoCreateIconBundle(const char *stockid,
             continue;
 
         wxIcon icon;
-        icon.SetPixbuf(pixbuf);
+        icon.CopyFromBitmap(wxBitmap(pixbuf));
         bundle.AddIcon(icon);
     }
 
@@ -296,28 +307,31 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
         }
     }
 
-    wxBitmap bmp;
-    if (pixbuf != NULL)
-        bmp.SetPixbuf(pixbuf);
-
-    return bmp;
+    return wxBitmap(pixbuf);
 }
 
 wxIconBundle
 wxGTK2ArtProvider::CreateIconBundle(const wxArtID& id,
                                     const wxArtClient& WXUNUSED(client))
 {
+    wxIconBundle bundle;
     const wxString stockid = wxArtIDToStock(id);
 
     // try to load the bundle as stock icon first
-    GtkStyle* style = gtk_widget_get_style(wxGTKPrivate::GetButtonWidget());
+    GtkWidget* widget = wxGTKPrivate::GetButtonWidget();
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    GtkIconSet* iconset = gtk_style_context_lookup_icon_set(sc, stockid.utf8_str());
+#else
+    GtkStyle* style = gtk_widget_get_style(widget);
     GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid.utf8_str());
+#endif
     if ( iconset )
     {
         GtkIconSize *sizes;
         gint n_sizes;
         gtk_icon_set_get_sizes(iconset, &sizes, &n_sizes);
-        wxIconBundle bundle = DoCreateIconBundle
+        bundle = DoCreateIconBundle
                               (
                                   stockid.utf8_str(),
                                   sizes, sizes + n_sizes,
@@ -328,33 +342,27 @@ wxGTK2ArtProvider::CreateIconBundle(const wxArtID& id,
     }
 
     // otherwise try icon themes
-#ifdef __WXGTK26__
-    if ( !gtk_check_version(2,6,0) )
-    {
-        gint *sizes = gtk_icon_theme_get_icon_sizes
-                      (
-                          gtk_icon_theme_get_default(),
-                          stockid.utf8_str()
-                      );
-        if ( !sizes )
-            return wxNullIconBundle;
-
-        gint *last = sizes;
-        while ( *last )
-            last++;
-
-        wxIconBundle bundle = DoCreateIconBundle
-                              (
-                                  stockid.utf8_str(),
-                                  sizes, last,
-                                  &CreateThemeIcon
-                              );
-        g_free(sizes);
+    gint *sizes = gtk_icon_theme_get_icon_sizes
+                  (
+                      gtk_icon_theme_get_default(),
+                      stockid.utf8_str()
+                  );
+    if ( !sizes )
         return bundle;
-    }
-#endif // __WXGTK26__
 
-    return wxNullIconBundle;
+    gint *last = sizes;
+    while ( *last )
+        last++;
+
+    bundle = DoCreateIconBundle
+                          (
+                              stockid.utf8_str(),
+                              sizes, last,
+                              &CreateThemeIcon
+                          );
+    g_free(sizes);
+
+    return bundle;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp b/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp
index 91cc8a5bf7..a495ce7ace 100644
--- a/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp
+++ b/Externals/wxWidgets3/src/gtk/assertdlg_gtk.cpp
@@ -2,12 +2,14 @@
 // Name:        src/gtk/assertdlg_gtk.cpp
 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi
-// Id:          $Id: assertdlg_gtk.cpp 69697 2011-11-08 11:02:02Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
-#include "wx/platform.h"
+#include "wx/wxprec.h"
+
+#if wxDEBUG_LEVEL
+
 #include <gtk/gtk.h>
 #include "wx/gtk/assertdlg_gtk.h"
 #include "wx/gtk/private/gtk2-compat.h"
@@ -23,18 +25,15 @@
        in gtk_assert_dialog_create_backtrace_list_model() function
  */
 #define STACKFRAME_LEVEL_COLIDX        0
-#define FUNCTION_NAME_COLIDX           1
+#define FUNCTION_PROTOTYPE_COLIDX      1
 #define SOURCE_FILE_COLIDX             2
 #define LINE_NUMBER_COLIDX             3
-#define FUNCTION_ARGS_COLIDX           4
-
-
-
 
 /* ----------------------------------------------------------------------------
    GtkAssertDialog helpers
  ---------------------------------------------------------------------------- */
 
+static
 GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
                                             const gchar *stock)
 {
@@ -44,9 +43,7 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
 
     /* add a stock icon inside it */
     GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
-#if GTK_CHECK_VERSION(2,6,0)
     gtk_button_set_image (GTK_BUTTON (button), image);
-#endif
 
     /* add to the given (container) widget */
     if (box)
@@ -55,6 +52,7 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
     return button;
 }
 
+static
 GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label,
                                          const gchar *stock, gint response_id)
 {
@@ -67,6 +65,9 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe
     return button;
 }
 
+#if wxUSE_STACKWALKER
+
+static
 void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index)
 {
     GtkCellRenderer *renderer;
@@ -80,18 +81,18 @@ void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *nam
     gtk_tree_view_column_set_reorderable (column, TRUE);
 }
 
+static
 GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
 {
     GtkListStore *store;
     GtkWidget *treeview;
 
     /* create list store */
-    store = gtk_list_store_new (5,
+    store = gtk_list_store_new (4,
                                 G_TYPE_UINT,        /* stack frame number */
-                                G_TYPE_STRING,      /* function name      */
+                                G_TYPE_STRING,      /* function prototype */
                                 G_TYPE_STRING,      /* source file name   */
-                                G_TYPE_STRING,      /* line number        */
-                                G_TYPE_STRING);     /* function arguments */
+                                G_TYPE_STRING);     /* line number        */
 
     /* create the tree view */
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store));
@@ -100,14 +101,14 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
 
     /* append columns */
     gtk_assert_dialog_append_text_column(treeview, "#", STACKFRAME_LEVEL_COLIDX);
-    gtk_assert_dialog_append_text_column(treeview, "Function name", FUNCTION_NAME_COLIDX);
-    gtk_assert_dialog_append_text_column(treeview, "Function args", FUNCTION_ARGS_COLIDX);
+    gtk_assert_dialog_append_text_column(treeview, "Function Prototype", FUNCTION_PROTOTYPE_COLIDX);
     gtk_assert_dialog_append_text_column(treeview, "Source file", SOURCE_FILE_COLIDX);
     gtk_assert_dialog_append_text_column(treeview, "Line #", LINE_NUMBER_COLIDX);
 
     return treeview;
 }
 
+static
 void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
 {
     /* set busy cursor */
@@ -120,11 +121,13 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
 
     /* toggle busy cursor */
     gdk_window_set_cursor (parent, NULL);
+#ifdef __WXGTK3__
+    g_object_unref(cur);
+#else
     gdk_cursor_unref (cur);
+#endif
 }
 
-
-
 extern "C" {
 /* ----------------------------------------------------------------------------
    GtkAssertDialog signal handlers
@@ -208,7 +211,11 @@ static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg)
     g_free (backtrace);
     g_string_free (str, TRUE);
 }
+} // extern "C"
 
+#endif // wxUSE_STACKWALKER
+
+extern "C" {
 static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg)
 {
     gint response =
@@ -223,9 +230,9 @@ static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg
    GtkAssertDialogClass implementation
  ---------------------------------------------------------------------------- */
 
-static void     gtk_assert_dialog_init              (GtkAssertDialog        *self);
-static void     gtk_assert_dialog_class_init        (GtkAssertDialogClass *klass);
-
+extern "C" {
+static void gtk_assert_dialog_init(GTypeInstance* instance, void*);
+}
 
 GType gtk_assert_dialog_get_type()
 {
@@ -238,12 +245,12 @@ GType gtk_assert_dialog_get_type()
             sizeof (GtkAssertDialogClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */
-            (GClassInitFunc) gtk_assert_dialog_class_init,
+            NULL,
             NULL,           /* class_finalize */
             NULL,           /* class_data */
             sizeof (GtkAssertDialog),
             16,             /* n_preallocs */
-            (GInstanceInitFunc) gtk_assert_dialog_init,
+            gtk_assert_dialog_init,
             NULL
         };
         assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0);
@@ -252,13 +259,10 @@ GType gtk_assert_dialog_get_type()
     return assert_dialog_type;
 }
 
-static void gtk_assert_dialog_class_init(GtkAssertDialogClass*)
-{
-    /* no special initializations required */
-}
-
-static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
+extern "C" {
+static void gtk_assert_dialog_init(GTypeInstance* instance, void*)
 {
+    GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);
     GtkWidget *continuebtn;
 
     {
@@ -266,13 +270,13 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
 
         /* start the main vbox */
         gtk_widget_push_composite_child ();
-        vbox = gtk_vbox_new (FALSE, 8);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
         gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
         gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5);
 
 
         /* add the icon+message hbox */
-        hbox = gtk_hbox_new (FALSE, 0);
+        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
         gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
         /* icon */
@@ -283,7 +287,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
             GtkWidget *vbox2, *info;
 
             /* message */
-            vbox2 = gtk_vbox_new (FALSE, 0);
+            vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
             gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
             info = gtk_label_new ("An assertion failed!");
             gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8);
@@ -298,18 +302,20 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
             gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8);
         }
 
+#if wxUSE_STACKWALKER
         /* add the expander */
         dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
         gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
-        g_signal_connect (GTK_EXPANDER(dlg->expander), "activate",
+        g_signal_connect (dlg->expander, "activate",
                             G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
+#endif // wxUSE_STACKWALKER
     }
-
+#if wxUSE_STACKWALKER
     {
         GtkWidget *hbox, *vbox, *button, *sw;
 
         /* create expander's vbox */
-        vbox = gtk_vbox_new (FALSE, 0);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (dlg->expander), vbox);
 
         /* add a scrollable window under the expander */
@@ -325,7 +331,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
         gtk_container_add (GTK_CONTAINER (sw), dlg->treeview);
 
         /* create button's hbox */
-        hbox = gtk_hbutton_box_new ();
+        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
         gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
         gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
 
@@ -339,6 +345,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
                                                   GTK_STOCK_COPY);
         g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg);
     }
+#endif // wxUSE_STACKWALKER
 
     /* add the checkbutton */
     dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time");
@@ -363,8 +370,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
     gtk_widget_pop_composite_child ();
     gtk_widget_show_all (GTK_WIDGET(dlg));
 }
-
-
+}
 
 /* ----------------------------------------------------------------------------
    GtkAssertDialog public API
@@ -379,9 +385,11 @@ gchar *gtk_assert_dialog_get_message (GtkAssertDialog *dlg)
     return g_strdup (gtk_label_get_text (GTK_LABEL(dlg->message)));
 }
 
+#if wxUSE_STACKWALKER
+
 gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
 {
-    gchar *function, *arguments, *sourcefile, *linenum;
+    gchar *function, *sourcefile, *linenum;
     guint count;
 
     GtkTreeModel *model;
@@ -399,16 +407,15 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
     do
     {
         /* append this stack frame's info to the string */
-        gtk_tree_model_get (model, &iter,
+        gtk_tree_model_get(model, &iter,
                             STACKFRAME_LEVEL_COLIDX, &count,
-                            FUNCTION_NAME_COLIDX, &function,
-                            FUNCTION_ARGS_COLIDX, &arguments,
+                            FUNCTION_PROTOTYPE_COLIDX, &function,
                             SOURCE_FILE_COLIDX, &sourcefile,
                             LINE_NUMBER_COLIDX, &linenum,
                             -1);
 
-        g_string_append_printf (string, "[%u] %s(%s)",
-                                count, function, arguments);
+        g_string_append_printf(string, "[%u] %s",
+                                count, function);
         if (sourcefile[0] != '\0')
             g_string_append_printf (string, " %s", sourcefile);
         if (linenum[0] != '\0')
@@ -416,7 +423,6 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
         g_string_append (string, "\n");
 
         g_free (function);
-        g_free (arguments);
         g_free (sourcefile);
         g_free (linenum);
 
@@ -426,6 +432,8 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
     return g_string_free (string, FALSE);
 }
 
+#endif // wxUSE_STACKWALKER
+
 void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
 {
     /* prepend and append the <b> tag
@@ -441,6 +449,8 @@ void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
     g_free (escaped_msg);
 }
 
+#if wxUSE_STACKWALKER
+
 void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
                                               GtkAssertDialogStackFrameCallback callback,
                                               void *userdata)
@@ -451,7 +461,6 @@ void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
 
 void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
                                           const gchar *function,
-                                          const gchar *arguments,
                                           const gchar *sourcefile,
                                           guint line_number)
 {
@@ -474,8 +483,7 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
     gtk_list_store_append (GTK_LIST_STORE(model), &iter);
     gtk_list_store_set (GTK_LIST_STORE(model), &iter,
                         STACKFRAME_LEVEL_COLIDX, count+1,     /* start from 1 and not from 0 */
-                        FUNCTION_NAME_COLIDX, function,
-                        FUNCTION_ARGS_COLIDX, arguments,
+                        FUNCTION_PROTOTYPE_COLIDX, function,
                         SOURCE_FILE_COLIDX, sourcefile,
                         LINE_NUMBER_COLIDX, linenum->str,
                         -1);
@@ -483,9 +491,13 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
     g_string_free (linenum, TRUE);
 }
 
+#endif // wxUSE_STACKWALKER
+
 GtkWidget *gtk_assert_dialog_new(void)
 {
     void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL);
 
     return GTK_WIDGET (dialog);
 }
+
+#endif // wxDEBUG_LEVEL
diff --git a/Externals/wxWidgets3/src/gtk/bitmap.cpp b/Externals/wxWidgets3/src/gtk/bitmap.cpp
index aabfa24346..6ab6bcb628 100644
--- a/Externals/wxWidgets3/src/gtk/bitmap.cpp
+++ b/Externals/wxWidgets3/src/gtk/bitmap.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
-// RCS-ID:      $Id: bitmap.cpp 69617 2011-10-31 16:09:47Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,11 +20,13 @@
 #include "wx/rawbmp.h"
 
 #include "wx/gtk/private/object.h"
+#include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 
 extern GtkWidget *wxGetRootWindow();
 
+#ifndef __WXGTK3__
 static void PixmapToPixbuf(GdkPixmap* pixmap, GdkPixbuf* pixbuf, int w, int h)
 {
     gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
@@ -67,6 +68,7 @@ static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h)
     }
     g_object_unref(mask_pixbuf);
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -81,6 +83,21 @@ wxMask::wxMask()
 
 wxMask::wxMask(const wxMask& mask)
 {
+#ifdef __WXGTK3__
+    m_bitmap = NULL;
+    if (mask.m_bitmap)
+    {
+        const int w = cairo_image_surface_get_width(mask.m_bitmap);
+        const int h = cairo_image_surface_get_height(mask.m_bitmap);
+        m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+        const guchar* src = cairo_image_surface_get_data(mask.m_bitmap);
+        guchar* dst = cairo_image_surface_get_data(m_bitmap);
+        const int stride = cairo_image_surface_get_stride(m_bitmap);
+        wxASSERT(stride == cairo_image_surface_get_stride(mask.m_bitmap));
+        memcpy(dst, src, stride * h);
+        cairo_surface_mark_dirty(m_bitmap);
+    }
+#else
     if ( !mask.m_bitmap )
     {
         m_bitmap = NULL;
@@ -94,6 +111,7 @@ wxMask::wxMask(const wxMask& mask)
 
     wxGtkObject<GdkGC> gc(gdk_gc_new(m_bitmap));
     gdk_draw_drawable(m_bitmap, gc, mask.m_bitmap, 0, 0, 0, 0, -1, -1);
+#endif
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
@@ -116,17 +134,36 @@ wxMask::wxMask( const wxBitmap& bitmap )
     InitFromMonoBitmap(bitmap);
 }
 
+#ifdef __WXGTK3__
+wxMask::wxMask(cairo_surface_t* bitmap)
+#else
+wxMask::wxMask(GdkPixmap* bitmap)
+#endif
+{
+    m_bitmap = bitmap;
+}
+
 wxMask::~wxMask()
 {
     if (m_bitmap)
+    {
+#ifdef __WXGTK3__
+        cairo_surface_destroy(m_bitmap);
+#else
         g_object_unref (m_bitmap);
+#endif
+    }
 }
 
 void wxMask::FreeData()
 {
     if (m_bitmap)
     {
+#ifdef __WXGTK3__
+        cairo_surface_destroy(m_bitmap);
+#else
         g_object_unref (m_bitmap);
+#endif
         m_bitmap = NULL;
     }
 }
@@ -136,6 +173,29 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
     const int w = bitmap.GetWidth();
     const int h = bitmap.GetHeight();
 
+#ifdef __WXGTK3__
+    m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+    GdkPixbuf* pixbuf = bitmap.GetPixbufNoMask();
+    const guchar* src = gdk_pixbuf_get_pixels(pixbuf);
+    guchar* dst = cairo_image_surface_get_data(m_bitmap);
+    const int stride_src = gdk_pixbuf_get_rowstride(pixbuf);
+    const int stride_dst = cairo_image_surface_get_stride(m_bitmap);
+    const int src_inc = gdk_pixbuf_get_n_channels(pixbuf);
+    const guchar r = colour.Red();
+    const guchar g = colour.Green();
+    const guchar b = colour.Blue();
+    for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst)
+    {
+        const guchar* s = src;
+        for (int i = 0; i < w; i++, s += src_inc)
+        {
+            dst[i] = 0xff;
+            if (s[0] == r && s[1] == g && s[2] == b)
+                dst[i] = 0;
+        }
+    }
+    cairo_surface_mark_dirty(m_bitmap);
+#else
     // create mask as XBM format bitmap
 
     // one bit per pixel, each row starts on a byte boundary
@@ -187,6 +247,7 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
     }
     m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h);
     delete[] out;
+#endif
     return true;
 }
 
@@ -196,6 +257,9 @@ bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
 
     wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
 
+#ifdef __WXGTK3__
+    InitFromColour(bitmap, *wxBLACK);
+#else
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
 
     if (!m_bitmap) return false;
@@ -203,11 +267,56 @@ bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
     wxGtkObject<GdkGC> gc(gdk_gc_new( m_bitmap ));
     gdk_gc_set_function(gc, GDK_COPY_INVERT);
     gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
+#endif
 
     return true;
 }
 
-GdkPixmap* wxMask::GetBitmap() const
+wxBitmap wxMask::GetBitmap() const
+{
+    wxBitmap bitmap;
+    if (m_bitmap)
+    {
+#ifdef __WXGTK3__
+        cairo_surface_t* mask = m_bitmap;
+        const int w = cairo_image_surface_get_width(mask);
+        const int h = cairo_image_surface_get_height(mask);
+        GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, w, h);
+        const guchar* src = cairo_image_surface_get_data(mask);
+        guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+        const int stride_src = cairo_image_surface_get_stride(mask);
+        const int stride_dst = gdk_pixbuf_get_rowstride(pixbuf);
+        for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst)
+        {
+            guchar* d = dst;
+            for (int i = 0; i < w; i++, d += 3)
+            {
+                d[0] = src[i];
+                d[1] = src[i];
+                d[2] = src[i];
+            }
+        }
+        bitmap = wxBitmap(pixbuf, 1);
+#else
+        GdkPixmap* mask = m_bitmap;
+        int w, h;
+        gdk_drawable_get_size(mask, &w, &h);
+        GdkPixmap* pixmap = gdk_pixmap_new(mask, w, h, -1);
+        GdkGC* gc = gdk_gc_new(pixmap);
+        gdk_gc_set_function(gc, GDK_COPY_INVERT);
+        gdk_draw_drawable(pixmap, gc, mask, 0, 0, 0, 0, w, h);
+        g_object_unref(gc);
+        bitmap = wxBitmap(pixmap);
+#endif
+    }
+    return bitmap;
+}
+
+#ifdef __WXGTK3__
+wxMask::operator cairo_surface_t*() const
+#else
+wxMask::operator GdkPixmap*() const
+#endif
 {
     return m_bitmap;
 }
@@ -224,15 +333,22 @@ public:
 
     virtual bool IsOk() const;
 
+#ifdef __WXGTK3__
+    GdkPixbuf* m_pixbufMask;
+    GdkPixbuf* m_pixbufNoMask;
+    cairo_surface_t* m_surface;
+#else
     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
+#endif
     wxMask         *m_mask;
     int             m_width;
     int             m_height;
     int             m_bpp;
+#ifndef __WXGTK3__
     bool m_alphaRequested;
+#endif
 
-private:
     // We don't provide a copy ctor as copying m_pixmap and m_pixbuf properly
     // is expensive and we don't want to do it implicitly (and possibly
     // accidentally). wxBitmap::CloneGDIRefData() which does need to do it does
@@ -242,23 +358,43 @@ private:
 
 wxBitmapRefData::wxBitmapRefData(int width, int height, int depth)
 {
+#ifdef __WXGTK3__
+    m_pixbufMask = NULL;
+    m_pixbufNoMask = NULL;
+    m_surface = NULL;
+#else
     m_pixmap = NULL;
     m_pixbuf = NULL;
+#endif
     m_mask = NULL;
     m_width = width;
     m_height = height;
     m_bpp = depth;
+#ifdef __WXGTK3__
+    if (m_bpp != 1 && m_bpp != 32)
+        m_bpp = 24;
+#else
     if (m_bpp < 0)
         m_bpp = gdk_drawable_get_depth(wxGetRootWindow()->window);
     m_alphaRequested = depth == 32;
+#endif
 }
 
 wxBitmapRefData::~wxBitmapRefData()
 {
+#ifdef __WXGTK3__
+    if (m_pixbufMask)
+        g_object_unref(m_pixbufMask);
+    if (m_pixbufNoMask)
+        g_object_unref(m_pixbufNoMask);
+    if (m_surface)
+        cairo_surface_destroy(m_surface);
+#else
     if (m_pixmap)
         g_object_unref (m_pixmap);
     if (m_pixbuf)
         g_object_unref (m_pixbuf);
+#endif
     delete m_mask;
 }
 
@@ -285,7 +421,30 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     wxASSERT(depth == 1);
     if (width > 0 && height > 0 && depth == 1)
     {
-        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
+        m_refData = new wxBitmapRefData(width, height, 1);
+#ifdef __WXGTK3__
+        GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height);
+        M_BMPDATA->m_pixbufNoMask = pixbuf;
+        const char* src = bits;
+        guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+        const int stride_src = (width + 7) / 8;
+        const int rowinc_dst = gdk_pixbuf_get_rowstride(pixbuf) - 3 * width;
+        for (int j = 0; j < width; j++, src += stride_src, dst += rowinc_dst)
+        {
+            for (int i = 0; i < height; i++)
+            {
+                guchar c = 0xff;
+                if (src[i >> 3] & (1 << (i & 7)))
+                    c = 0;
+                *dst++ = c;
+                *dst++ = c;
+                *dst++ = c;
+            }
+        }
+#else
+        M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data(
+            wxGetRootWindow()->window, bits, width, height);
+#endif
     }
 }
 
@@ -293,18 +452,68 @@ wxBitmap::wxBitmap(const char* const* bits)
 {
     wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
 
-    GdkBitmap* mask = NULL;
-    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
-    if (!M_BMPDATA)
-        return;
-
-    if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
+#if wxUSE_IMAGE
+    *this = wxBitmap(wxImage(bits));
+#elif defined __WXGTK3__
+    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_xpm_data(const_cast<const char**>(bits));
+    if (pixbuf)
     {
-        M_BMPDATA->m_mask = new wxMask;
-        M_BMPDATA->m_mask->m_bitmap = mask;
+        m_refData = new wxBitmapRefData(
+            gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+            gdk_pixbuf_get_n_channels(pixbuf) * 8);
+        M_BMPDATA->m_pixbufNoMask = pixbuf;
+        wxASSERT(M_BMPDATA->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbufNoMask));
+    }
+#else
+    GdkBitmap* mask = NULL;
+    GdkPixmap* pixmap = gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits));
+    if (pixmap)
+    {
+        int width, height;
+        gdk_drawable_get_size(pixmap, &width, &height);
+        m_refData = new wxBitmapRefData(width, height, -1);
+        M_BMPDATA->m_pixmap = pixmap;
+        if (mask)
+        {
+            M_BMPDATA->m_mask = new wxMask(mask);
+        }
+    }
+#endif
+}
+
+wxBitmap::wxBitmap(GdkPixbuf* pixbuf, int depth)
+{
+    if (pixbuf)
+    {
+        if (depth != 1)
+            depth = gdk_pixbuf_get_n_channels(pixbuf) * 8;
+        wxBitmapRefData* bmpData = new wxBitmapRefData(
+            gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+            depth);
+        m_refData = bmpData;
+#ifdef __WXGTK3__
+        bmpData->m_pixbufNoMask = pixbuf;
+#else
+        bmpData->m_pixbuf = pixbuf;
+#endif
     }
 }
 
+#ifndef __WXGTK3__
+wxBitmap::wxBitmap(GdkPixmap* pixmap)
+{
+    if (pixmap)
+    {
+        int w, h;
+        gdk_drawable_get_size(pixmap, &w, &h);
+        wxBitmapRefData* bmpData =
+            new wxBitmapRefData(w, h, gdk_drawable_get_depth(pixmap));
+        m_refData = bmpData;
+        bmpData->m_pixmap = pixmap;
+    }
+}
+#endif
+
 wxBitmap::~wxBitmap()
 {
 }
@@ -317,22 +526,110 @@ bool wxBitmap::Create( int width, int height, int depth )
     return true;
 }
 
-#if wxUSE_IMAGE
-
-bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+#ifdef __WXGTK3__
+static void CopyImageData(
+    guchar* dst, int dstChannels, int dstStride,
+    const guchar* src, int srcChannels, int srcStride,
+    int w, int h)
 {
-    UnRef();
+    if (dstChannels == srcChannels)
+    {
+        if (dstStride == srcStride)
+            memcpy(dst, src, size_t(dstStride) * h);
+        else
+        {
+            const int stride = dstStride < srcStride ? dstStride : srcStride;
+            for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
+                memcpy(dst, src, stride);
+        }
+    }
+    else
+    {
+        for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
+        {
+            guchar* d = dst;
+            const guchar* s = src;
+            if (dstChannels == 4)
+            {
+                for (int i = 0; i < w; i++, d += 4, s += 3)
+                {
+                    d[0] = s[0];
+                    d[1] = s[1];
+                    d[2] = s[2];
+                    d[3] = 0xff;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < w; i++, d += 3, s += 4)
+                {
+                    d[0] = s[0];
+                    d[1] = s[1];
+                    d[2] = s[2];
+                }
+            }
+        }
+    }
+}
+#endif
 
-    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
+#if wxUSE_IMAGE
+#ifdef __WXGTK3__
+wxBitmap::wxBitmap(const wxImage& image, int depth)
+{
+    wxCHECK_RET(image.IsOk(), "invalid image");
 
-    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
-        return false;
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();
+    const guchar* alpha = image.GetAlpha();
+    if (depth < 0)
+        depth = alpha ? 32 : 24;
+    else if (depth != 1 && depth != 32)
+        depth = 24;
+    wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, depth);
+    m_refData = bmpData;
+    GdkPixbuf* pixbuf_dst = gdk_pixbuf_new(GDK_COLORSPACE_RGB, depth == 32, 8, w, h);
+    bmpData->m_pixbufNoMask = pixbuf_dst;
+    wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+    const guchar* src = image.GetData();
+
+    guchar* dst = gdk_pixbuf_get_pixels(pixbuf_dst);
+    const int dstStride = gdk_pixbuf_get_rowstride(pixbuf_dst);
+    CopyImageData(dst, gdk_pixbuf_get_n_channels(pixbuf_dst), dstStride, src, 3, 3 * w, w, h);
+
+    if (depth == 32 && alpha)
+    {
+        for (int j = 0; j < h; j++, dst += dstStride)
+            for (int i = 0; i < w; i++)
+                dst[i * 4 + 3] = *alpha++;
+    }
+    if (image.HasMask())
+    {
+        const guchar r = image.GetMaskRed();
+        const guchar g = image.GetMaskGreen();
+        const guchar b = image.GetMaskBlue();
+        cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+        const int stride = cairo_image_surface_get_stride(surface);
+        dst = cairo_image_surface_get_data(surface);
+        memset(dst, 0xff, stride * h);
+        for (int j = 0; j < h; j++, dst += stride)
+            for (int i = 0; i < w; i++, src += 3)
+                if (src[0] == r && src[1] == g && src[2] == b)
+                    dst[i] = 0;
+        cairo_surface_mark_dirty(surface);
+        bmpData->m_mask = new wxMask(surface);
+    }
+}
+#else
+wxBitmap::wxBitmap(const wxImage& image, int depth)
+{
+    wxCHECK_RET(image.IsOk(), "invalid image");
 
     if (depth == 32 || (depth == -1 && image.HasAlpha()))
-        return CreateFromImageAsPixbuf(image);
-
-    // otherwise create pixmap, if alpha is present it will be converted to mask
-    return CreateFromImageAsPixmap(image, depth);
+        CreateFromImageAsPixbuf(image);
+    else
+        // otherwise create pixmap, if alpha is present it will be converted to mask
+        CreateFromImageAsPixmap(image, depth);
 }
 
 bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
@@ -410,9 +707,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
                 bit_index = (bit_index + 7) & ~7u;
             }
         }
-        wxMask* mask = new wxMask;
-        mask->m_bitmap = gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h);
-        SetMask(mask);
+        SetMask(new wxMask(gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h)));
         delete[] out;
     }
     return IsOk();
@@ -449,9 +744,72 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 
     return true;
 }
+#endif
 
 wxImage wxBitmap::ConvertToImage() const
 {
+#ifdef __WXGTK3__
+    wxImage image;
+    wxCHECK_MSG(IsOk(), image, "invalid bitmap");
+    wxBitmapRefData* bmpData = M_BMPDATA;
+    const int w = bmpData->m_width;
+    const int h = bmpData->m_height;
+    image.Create(w, h, false);
+    guchar* dst = image.GetData();
+    GdkPixbuf* pixbuf_src = NULL;
+    if (bmpData->m_pixbufNoMask)
+        pixbuf_src = bmpData->m_pixbufNoMask;
+    else if (bmpData->m_surface)
+    {
+        pixbuf_src = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h);
+        bmpData->m_pixbufNoMask = pixbuf_src;
+        wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+    }
+    if (pixbuf_src)
+    {
+        const guchar* src = gdk_pixbuf_get_pixels(pixbuf_src);
+        const int srcStride = gdk_pixbuf_get_rowstride(pixbuf_src);
+        const int srcChannels = gdk_pixbuf_get_n_channels(pixbuf_src);
+        CopyImageData(dst, 3, 3 * w, src, srcChannels, srcStride, w, h);
+
+        if (srcChannels == 4)
+        {
+            image.SetAlpha();
+            guchar* alpha = image.GetAlpha();
+            for (int j = 0; j < h; j++, src += srcStride)
+            {
+                const guchar* s = src;
+                for (int i = 0; i < w; i++, s += 4)
+                    *alpha++ = s[3];
+            }
+        }
+    }
+    cairo_surface_t* maskSurf = NULL;
+    if (bmpData->m_mask)
+        maskSurf = *bmpData->m_mask;
+    if (maskSurf)
+    {
+        const guchar r = 1;
+        const guchar g = 2;
+        const guchar b = 3;
+        image.SetMaskColour(r, g, b);
+        wxASSERT(cairo_image_surface_get_format(maskSurf) == CAIRO_FORMAT_A8);
+        const int stride = cairo_image_surface_get_stride(maskSurf);
+        const guchar* src = cairo_image_surface_get_data(maskSurf);
+        for (int j = 0; j < h; j++, src += stride)
+        {
+            for (int i = 0; i < w; i++, dst += 3)
+                if (src[i] == 0)
+                {
+                    dst[0] = r;
+                    dst[1] = g;
+                    dst[2] = b;
+                }
+                else if (dst[0] == r && dst[1] == g && dst[2] == b)
+                    dst[2]--;
+        }
+    }
+#else
     wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
 
     const int w = GetWidth();
@@ -524,7 +882,7 @@ wxImage wxBitmap::ConvertToImage() const
         const int MASK_BLUE_REPLACEMENT = 2;
 
         image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
-        GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
+        GdkImage* image_mask = gdk_drawable_get_image(*GetMask(), 0, 0, w, h);
 
         for (int y = 0; y < h; y++)
         {
@@ -546,6 +904,7 @@ wxImage wxBitmap::ConvertToImage() const
         }
         g_object_unref(image_mask);
     }
+#endif
 
     return image;
 }
@@ -595,6 +954,26 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     return IsOk();
 }
 
+#ifdef __WXGTK3__
+static cairo_surface_t* GetSubSurface(cairo_surface_t* surface, const wxRect& rect)
+{
+    cairo_surface_flush(surface);
+    const cairo_format_t format = cairo_image_surface_get_format(surface);
+    int x = rect.x;
+    if (format != CAIRO_FORMAT_A8)
+        x *= 4;
+    cairo_surface_t* subSurface = cairo_image_surface_create(format, rect.width, rect.height);
+    const int srcStride = cairo_image_surface_get_stride(surface);
+    const int dstStride = cairo_image_surface_get_stride(subSurface);
+    const guchar* src = cairo_image_surface_get_data(surface) + rect.y * srcStride + x;
+    guchar* dst = cairo_image_surface_get_data(subSurface);
+    for (int j = 0; j < rect.height; j++, src += srcStride, dst += dstStride)
+        memcpy(dst, src, dstStride);
+    cairo_surface_mark_dirty(subSurface);
+    return subSurface;
+}
+#endif
+
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxBitmap ret;
@@ -613,6 +992,25 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     wxBitmapRefData * const newRef = new wxBitmapRefData(w, h, bmpData->m_bpp);
     ret.m_refData = newRef;
 
+#ifdef __WXGTK3__
+    if (bmpData->m_pixbufNoMask)
+    {
+        GdkPixbuf* pixbuf = gdk_pixbuf_new_subpixbuf(bmpData->m_pixbufNoMask, rect.x, rect.y, w, h);
+        newRef->m_pixbufNoMask = gdk_pixbuf_copy(pixbuf);
+        wxASSERT(newRef->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(newRef->m_pixbufNoMask));
+        g_object_unref(pixbuf);
+    }
+    else if (bmpData->m_surface)
+        newRef->m_surface = GetSubSurface(bmpData->m_surface, rect);
+
+    cairo_surface_t* maskSurf = NULL;
+    if (bmpData->m_mask)
+        maskSurf = *bmpData->m_mask;
+    if (maskSurf)
+    {
+        newRef->m_mask = new wxMask(GetSubSurface(maskSurf, rect));
+    }
+#else
     if (bmpData->m_pixbuf)
     {
         GdkPixbuf* pixbuf =
@@ -628,16 +1026,19 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
             newRef->m_pixmap, gc, bmpData->m_pixmap, rect.x, rect.y, 0, 0, w, h);
         g_object_unref(gc);
     }
-    if (bmpData->m_mask && bmpData->m_mask->m_bitmap)
+    GdkPixmap* mask = NULL;
+    if (bmpData->m_mask)
+        mask = *bmpData->m_mask;
+    if (mask)
     {
-        GdkPixmap* sub_mask = gdk_pixmap_new(bmpData->m_mask->m_bitmap, w, h, 1);
-        newRef->m_mask = new wxMask;
-        newRef->m_mask->m_bitmap = sub_mask;
+        GdkPixmap* sub_mask = gdk_pixmap_new(mask, w, h, 1);
+        newRef->m_mask = new wxMask(sub_mask);
         GdkGC* gc = gdk_gc_new(sub_mask);
         gdk_draw_drawable(
-            sub_mask, gc, bmpData->m_mask->m_bitmap, rect.x, rect.y, 0, 0, w, h);
+            sub_mask, gc, mask, rect.x, rect.y, 0, 0, w, h);
         g_object_unref(gc);
     }
+#endif
 
     return ret;
 }
@@ -646,42 +1047,54 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
 
-#if wxUSE_IMAGE
-    wxImage image = ConvertToImage();
-    if (image.IsOk() && image.SaveFile(name, type))
-        return true;
-#endif
     const char* type_name = NULL;
     switch (type)
     {
+        case wxBITMAP_TYPE_ANI:  type_name = "ani";  break;
         case wxBITMAP_TYPE_BMP:  type_name = "bmp";  break;
+        case wxBITMAP_TYPE_GIF:  type_name = "gif";  break;
         case wxBITMAP_TYPE_ICO:  type_name = "ico";  break;
         case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break;
+        case wxBITMAP_TYPE_PCX:  type_name = "pcx";  break;
         case wxBITMAP_TYPE_PNG:  type_name = "png";  break;
+        case wxBITMAP_TYPE_PNM:  type_name = "pnm";  break;
+        case wxBITMAP_TYPE_TGA:  type_name = "tga";  break;
+        case wxBITMAP_TYPE_TIFF: type_name = "tiff"; break;
+        case wxBITMAP_TYPE_XBM:  type_name = "xbm";  break;
+        case wxBITMAP_TYPE_XPM:  type_name = "xpm";  break;
         default: break;
     }
-    return type_name &&
-        gdk_pixbuf_save(GetPixbuf(), name.fn_str(), type_name, NULL, NULL);
+    if (type_name &&
+        gdk_pixbuf_save(GetPixbuf(), wxGTK_CONV_FN(name), type_name, NULL, NULL))
+    {
+        return true;
+    }
+#if wxUSE_IMAGE
+    return ConvertToImage().SaveFile(name, type);
+#else
+    return false;
+#endif
 }
 
 bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 {
+    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(wxGTK_CONV_FN(name), NULL);
+    if (pixbuf)
+    {
+        *this = wxBitmap(pixbuf);
+        return true;
+    }
 #if wxUSE_IMAGE
     wxImage image;
     if (image.LoadFile(name, type) && image.IsOk())
-        *this = wxBitmap(image);
-    else
-#endif
     {
-        wxUnusedVar(type); // The type is detected automatically by GDK.
-
-        UnRef();
-        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(name.fn_str(), NULL);
-        if (pixbuf)
-            SetPixbuf(pixbuf);
+        *this = wxBitmap(image);
+        return true;
     }
-
-    return IsOk();
+#else
+    wxUnusedVar(type);
+#endif
+    return false;
 }
 
 #if wxUSE_PALETTE
@@ -714,6 +1127,7 @@ void wxBitmap::SetDepth( int depth )
     M_BMPDATA->m_bpp = depth;
 }
 
+#ifndef __WXGTK3__
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
     UnRef();
@@ -739,16 +1153,20 @@ GdkPixmap *wxBitmap::GetPixmap() const
 
     if (bmpData->m_pixbuf)
     {
+        GdkPixmap* pixmap = NULL;
         GdkPixmap** mask_pixmap = NULL;
         if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))
         {
             // make new mask from alpha
-            delete bmpData->m_mask;
-            bmpData->m_mask = new wxMask;
-            mask_pixmap = &bmpData->m_mask->m_bitmap;
+            mask_pixmap = &pixmap;
         }
         gdk_pixbuf_render_pixmap_and_mask(
             bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128);
+        if (pixmap)
+        {
+            delete bmpData->m_mask;
+            bmpData->m_mask = new wxMask(pixmap);
+        }
     }
     else
     {
@@ -764,12 +1182,185 @@ bool wxBitmap::HasPixmap() const
 
     return M_BMPDATA->m_pixmap != NULL;
 }
+#endif
+
+#ifdef __WXGTK3__
+GdkPixbuf* wxBitmap::GetPixbufNoMask() const
+{
+    wxCHECK_MSG(IsOk(), NULL, "invalid bitmap");
+
+    wxBitmapRefData* bmpData = M_BMPDATA;
+    GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask;
+    if (pixbuf)
+        return pixbuf;
+
+    const int w = bmpData->m_width;
+    const int h = bmpData->m_height;
+    if (bmpData->m_surface)
+        pixbuf = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h);
+    else
+        pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, bmpData->m_bpp == 32, 8, w, h);
+    bmpData->m_pixbufNoMask = pixbuf;
+    wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+
+    return pixbuf;
+}
+
+// helper to set up a simulated depth 1 surface
+static void SetSourceSurface1(const wxBitmapRefData* bmpData, cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg)
+{
+    GdkPixbuf* pixbuf = gdk_pixbuf_copy(bmpData->m_pixbufNoMask);
+    const int w = bmpData->m_width;
+    const int h = bmpData->m_height;
+    const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+    const int channels = gdk_pixbuf_get_n_channels(pixbuf);
+    guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+    guchar fg_r = 0, fg_g = 0, fg_b = 0;
+    if (fg && fg->IsOk())
+    {
+        fg_r = fg->Red();
+        fg_g = fg->Green();
+        fg_b = fg->Blue();
+    }
+    guchar bg_r = 255, bg_g = 255, bg_b = 255;
+    if (bg && bg->IsOk())
+    {
+        bg_r = bg->Red();
+        bg_g = bg->Green();
+        bg_b = bg->Blue();
+    }
+    for (int j = 0; j < h; j++, dst += stride)
+    {
+        guchar* d = dst;
+        for (int i = 0; i < w; i++, d += channels)
+            if (d[0])
+            {
+                d[0] = bg_r;
+                d[1] = bg_g;
+                d[2] = bg_b;
+            }
+            else
+            {
+                d[0] = fg_r;
+                d[1] = fg_g;
+                d[2] = fg_b;
+            }
+    }
+    gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
+    g_object_unref(pixbuf);
+}
+
+void wxBitmap::SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) const
+{
+    wxBitmapRefData* bmpData = M_BMPDATA;
+    if (bmpData->m_surface)
+    {
+        cairo_set_source_surface(cr, bmpData->m_surface, x, y);
+        return;
+    }
+    wxCHECK_RET(bmpData->m_pixbufNoMask, "no bitmap data");
+    if (bmpData->m_bpp == 1)
+        SetSourceSurface1(bmpData, cr, x, y, fg, bg);
+    else
+    {
+        gdk_cairo_set_source_pixbuf(cr, bmpData->m_pixbufNoMask, x, y);
+        cairo_pattern_get_surface(cairo_get_source(cr), &bmpData->m_surface);
+        cairo_surface_reference(bmpData->m_surface);
+    }
+}
+
+cairo_t* wxBitmap::CairoCreate() const
+{
+    wxCHECK_MSG(IsOk(), NULL, "invalid bitmap");
+
+    wxBitmapRefData* bmpData = M_BMPDATA;
+    cairo_t* cr;
+    if (bmpData->m_surface)
+        cr = cairo_create(bmpData->m_surface);
+    else
+    {
+        GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask;
+        const bool useAlpha = bmpData->m_bpp == 32 || (pixbuf && gdk_pixbuf_get_has_alpha(pixbuf));
+        bmpData->m_surface = cairo_image_surface_create(
+            useAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
+            bmpData->m_width, bmpData->m_height);
+        cr = cairo_create(bmpData->m_surface);
+        if (pixbuf)
+        {
+            gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
+            cairo_paint(cr);
+            cairo_set_source_rgb(cr, 0, 0, 0);
+        }
+    }
+    if (bmpData->m_pixbufNoMask)
+    {
+        g_object_unref(bmpData->m_pixbufNoMask);
+        bmpData->m_pixbufNoMask = NULL;
+    }
+    if (bmpData->m_pixbufMask)
+    {
+        g_object_unref(bmpData->m_pixbufMask);
+        bmpData->m_pixbufMask = NULL;
+    }
+    wxASSERT(cr && cairo_status(cr) == 0);
+    return cr;
+}
+
+void wxBitmap::Draw(cairo_t* cr, int x, int y, bool useMask, const wxColour* fg, const wxColour* bg) const
+{
+    wxCHECK_RET(IsOk(), "invalid bitmap");
+
+    wxBitmapRefData* bmpData = M_BMPDATA;
+    SetSourceSurface(cr, x, y, fg, bg);
+    cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST);
+    cairo_surface_t* mask = NULL;
+    if (useMask && bmpData->m_mask)
+        mask = *bmpData->m_mask;
+    if (mask)
+        cairo_mask_surface(cr, mask, x, y);
+    else
+        cairo_paint(cr);
+}
+#endif
 
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
     wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
 
     wxBitmapRefData* bmpData = M_BMPDATA;
+#ifdef __WXGTK3__
+    if (bmpData->m_pixbufMask)
+        return bmpData->m_pixbufMask;
+
+    if (bmpData->m_pixbufNoMask == NULL)
+        GetPixbufNoMask();
+    cairo_surface_t* mask = NULL;
+    if (bmpData->m_mask)
+        mask = *bmpData->m_mask;
+    if (mask == NULL)
+        return bmpData->m_pixbufNoMask;
+
+    const int w = bmpData->m_width;
+    const int h = bmpData->m_height;
+    bmpData->m_pixbufMask = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
+
+    guchar* dst = gdk_pixbuf_get_pixels(bmpData->m_pixbufMask);
+    const int dstStride = gdk_pixbuf_get_rowstride(bmpData->m_pixbufMask);
+    CopyImageData(dst, 4, dstStride,
+        gdk_pixbuf_get_pixels(bmpData->m_pixbufNoMask),
+        gdk_pixbuf_get_n_channels(bmpData->m_pixbufNoMask),
+        gdk_pixbuf_get_rowstride(bmpData->m_pixbufNoMask),
+        w, h);
+
+    const guchar* src = cairo_image_surface_get_data(mask);
+    const int srcStride = cairo_image_surface_get_stride(mask);
+    for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
+        for (int i = 0; i < w; i++)
+            if (src[i] == 0)
+                dst[i * 4 + 3] = 0;
+
+    return bmpData->m_pixbufMask;
+#else
     if (bmpData->m_pixbuf)
         return bmpData->m_pixbuf;
 
@@ -777,7 +1368,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
     const int h = bmpData->m_height;
     GdkPixmap* mask = NULL;
     if (bmpData->m_mask)
-        mask = bmpData->m_mask->m_bitmap;
+        mask = *bmpData->m_mask;
     const bool useAlpha = bmpData->m_alphaRequested || mask;
     bmpData->m_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, useAlpha, 8, w, h);
     if (bmpData->m_pixmap)
@@ -785,8 +1376,10 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
     if (mask)
         MaskToAlpha(mask, bmpData->m_pixbuf, w, h);
     return bmpData->m_pixbuf;
+#endif
 }
 
+#ifndef __WXGTK3__
 bool wxBitmap::HasPixbuf() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
@@ -794,22 +1387,6 @@ bool wxBitmap::HasPixbuf() const
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
-void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf)
-{
-    UnRef();
-
-    if (!pixbuf)
-        return;
-
-    int depth = -1;
-    if (gdk_pixbuf_get_has_alpha(pixbuf))
-        depth = 32;
-    m_refData = new wxBitmapRefData(
-        gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), depth);
-
-    M_BMPDATA->m_pixbuf = pixbuf;
-}
-
 void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
     if (keep == Pixmap && HasPixbuf())
@@ -823,11 +1400,33 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
         M_BMPDATA->m_pixmap = NULL;
     }
 }
+#endif
 
 #ifdef wxHAS_RAW_BITMAP
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
     void* bits = NULL;
+#ifdef __WXGTK3__
+    GdkPixbuf* pixbuf = GetPixbufNoMask();
+    if ((bpp == 32) == (gdk_pixbuf_get_has_alpha(pixbuf) != 0))
+    {
+        bits = gdk_pixbuf_get_pixels(pixbuf);
+        wxBitmapRefData* bmpData = M_BMPDATA;
+        data.m_width = bmpData->m_width;
+        data.m_height = bmpData->m_height;
+        data.m_stride = gdk_pixbuf_get_rowstride(pixbuf);
+        if (bmpData->m_pixbufMask)
+        {
+            g_object_unref(bmpData->m_pixbufMask);
+            bmpData->m_pixbufMask = NULL;
+        }
+        if (bmpData->m_surface)
+        {
+            cairo_surface_destroy(bmpData->m_surface);
+            bmpData->m_surface = NULL;
+        }
+    }
+#else
     GdkPixbuf *pixbuf = GetPixbuf();
     const bool hasAlpha = HasAlpha();
 
@@ -839,6 +1438,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
         data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
         bits = gdk_pixbuf_get_pixels(pixbuf);
     }
+#endif
     return bits;
 }
 
@@ -850,8 +1450,12 @@ void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 bool wxBitmap::HasAlpha() const
 {
     const wxBitmapRefData* bmpData = M_BMPDATA;
+#ifdef __WXGTK3__
+    return bmpData && bmpData->m_bpp == 32;
+#else
     return bmpData && (bmpData->m_alphaRequested ||
         (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)));
+#endif
 }
 
 wxGDIRefData* wxBitmap::CreateGDIRefData() const
@@ -865,6 +1469,25 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
     wxBitmapRefData * const newRef = new wxBitmapRefData(oldRef->m_width,
                                                          oldRef->m_height,
                                                          oldRef->m_bpp);
+#ifdef __WXGTK3__
+    if (oldRef->m_pixbufNoMask)
+        newRef->m_pixbufNoMask = gdk_pixbuf_copy(oldRef->m_pixbufNoMask);
+    if (oldRef->m_surface)
+    {
+        const int w = oldRef->m_width;
+        const int h = oldRef->m_height;
+        cairo_surface_t* surface = cairo_image_surface_create(
+            cairo_image_surface_get_format(oldRef->m_surface), w, h);
+        newRef->m_surface = surface;
+        cairo_surface_flush(oldRef->m_surface);
+        const guchar* src = cairo_image_surface_get_data(oldRef->m_surface);
+        guchar* dst = cairo_image_surface_get_data(surface);
+        const int stride = cairo_image_surface_get_stride(surface);
+        wxASSERT(stride == cairo_image_surface_get_stride(oldRef->m_surface));
+        memcpy(dst, src, stride * h);
+        cairo_surface_mark_dirty(surface);
+    }
+#else
     if (oldRef->m_pixmap != NULL)
     {
         newRef->m_pixmap = gdk_pixmap_new(
@@ -879,6 +1502,7 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
     {
         newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf);
     }
+#endif
     if (oldRef->m_mask != NULL)
     {
         newRef->m_mask = new wxMask(*oldRef->m_mask);
diff --git a/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp b/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp
index 9219a546d3..cf429bd2fe 100644
--- a/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp
+++ b/Externals/wxWidgets3/src/gtk/bmpbuttn.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/bmpbuttn.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: bmpbuttn.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp b/Externals/wxWidgets3/src/gtk/bmpcbox.cpp
index 3a29159b96..127b50d5e3 100644
--- a/Externals/wxWidgets3/src/gtk/bmpcbox.cpp
+++ b/Externals/wxWidgets3/src/gtk/bmpcbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19
-// RCS-ID:      $Id: bmpcbox.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@
     #include "wx/log.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ============================================================================
@@ -101,9 +101,9 @@ bool wxBitmapComboBox::Create(wxWindow *parent,
     // Select 'value' in entry-less mode
     if ( !GetEntry() )
     {
-        int n = FindString(value);
-        if ( n != wxNOT_FOUND )
-            SetSelection(n);
+        int i = FindString(value);
+        if (i != wxNOT_FOUND)
+            SetSelection(i);
     }
 
     return true;
@@ -121,7 +121,12 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget()
     }
     else
     {
+#ifdef __WXGTK3__
+        m_widget = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store));
+        gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(m_widget), m_stringCellIndex);
+#else
         m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex );
+#endif
         m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
         gtk_editable_set_editable(GTK_EDITABLE(m_entry), true);
     }
@@ -197,7 +202,7 @@ void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
 
         if ( gtk_tree_model_iter_nth_child( model, &iter, NULL, n ) )
         {
-            GValue value0 = { 0, };
+            GValue value0 = G_VALUE_INIT;
             g_value_init( &value0, G_TYPE_OBJECT );
             g_value_set_object( &value0, bitmap.GetPixbuf() );
             gtk_list_store_set_value( GTK_LIST_STORE(model), &iter,
@@ -217,14 +222,14 @@ wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const
 
     if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
     {
-        GValue value = { 0, };
+        GValue value = G_VALUE_INIT;
         gtk_tree_model_get_value( model, &iter,
                                   m_bitmapCellIndex, &value );
         GdkPixbuf* pixbuf = (GdkPixbuf*) g_value_get_object( &value );
         if ( pixbuf )
         {
             g_object_ref( pixbuf );
-            bitmap.SetPixbuf( pixbuf );
+            bitmap = wxBitmap(pixbuf);
         }
         g_value_unset( &value );
     }
@@ -295,7 +300,7 @@ void wxBitmapComboBox::GTKInsertComboBoxTextItem( unsigned int n, const wxString
 
     gtk_list_store_insert( store, &iter, n );
 
-    GValue value = { 0, };
+    GValue value = G_VALUE_INIT;
     g_value_init( &value, G_TYPE_STRING );
     g_value_set_string( &value, wxGTK_CONV( text ) );
     gtk_list_store_set_value( store, &iter, m_stringCellIndex, &value );
diff --git a/Externals/wxWidgets3/src/gtk/brush.cpp b/Externals/wxWidgets3/src/gtk/brush.cpp
index 182b466a03..2c29ba5cba 100644
--- a/Externals/wxWidgets3/src/gtk/brush.cpp
+++ b/Externals/wxWidgets3/src/gtk/brush.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/brush.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: brush.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/button.cpp b/Externals/wxWidgets3/src/gtk/button.cpp
index cb5d90973a..0dbe3a70c0 100644
--- a/Externals/wxWidgets3/src/gtk/button.cpp
+++ b/Externals/wxWidgets3/src/gtk/button.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/button.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: button.cpp 68842 2011-08-22 12:41:00Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,9 @@
 
 #include "wx/stockitem.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/list.h"
 
 // ----------------------------------------------------------------------------
@@ -34,7 +35,7 @@ wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
     if ( button->GTKShouldIgnoreEvent() )
         return;
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    wxCommandEvent event(wxEVT_BUTTON, button->GetId());
     event.SetEventObject(button);
     button->HandleWindowEvent(event);
 }
@@ -169,12 +170,12 @@ wxSize wxButtonBase::GetDefaultSize()
         //     button's size. We have to retrieve both values and combine them.
 
         GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        GtkWidget *box = gtk_hbutton_box_new();
+        GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
         GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
         gtk_container_add(GTK_CONTAINER(box), btn);
         gtk_container_add(GTK_CONTAINER(wnd), box);
         GtkRequisition req;
-        gtk_widget_size_request(btn, &req);
+        gtk_widget_get_preferred_size(btn, NULL, &req);
 
         gint minwidth, minheight;
         gtk_widget_style_get(box,
@@ -269,9 +270,9 @@ GtkLabel *wxButton::GTKGetLabel() const
 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widget, style);
+    GTKApplyStyle(m_widget, style);
     GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
-    gtk_widget_modify_style(child, style);
+    GTKApplyStyle(child, style);
 
     // for buttons with images, the path to the label is (at least in 2.12)
     // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
@@ -283,7 +284,7 @@ void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
             wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box)));
             for (GList* item = list; item; item = item->next)
             {
-                gtk_widget_modify_style(GTK_WIDGET(item->data), style);
+                GTKApplyStyle(GTK_WIDGET(item->data), style);
             }
         }
     }
@@ -295,7 +296,7 @@ wxSize wxButton::DoGetBestSize() const
     // extra border around it, but we don't want to take it into account in
     // our size calculations (otherwise the result is visually ugly), so
     // always return the size of non default button from here
-    const bool isDefault = gtk_widget_has_default(m_widget);
+    const bool isDefault = gtk_widget_has_default(m_widget) != 0;
     if ( isDefault )
     {
         // temporarily unset default flag
@@ -327,7 +328,7 @@ wxSize wxButton::DoGetBestSize() const
 wxVisualAttributes
 wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new());
 }
 
 #endif // wxUSE_BUTTON
diff --git a/Externals/wxWidgets3/src/gtk/calctrl.cpp b/Externals/wxWidgets3/src/gtk/calctrl.cpp
index e53190e2fb..aa325ae0b6 100644
--- a/Externals/wxWidgets3/src/gtk/calctrl.cpp
+++ b/Externals/wxWidgets3/src/gtk/calctrl.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/calctrl.cpp
 // Purpose:     implementation of the wxGtkCalendarCtrl
 // Author:      Marcin Wojdyr
-// RCS-ID:      $Id: calctrl.cpp 70755 2012-02-29 18:13:06Z PC $
 // Copyright:   (c) 2008 Marcin Wojdyr
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/checkbox.cpp b/Externals/wxWidgets3/src/gtk/checkbox.cpp
index 4d8c63e203..af822e1b90 100644
--- a/Externals/wxWidgets3/src/gtk/checkbox.cpp
+++ b/Externals/wxWidgets3/src/gtk/checkbox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/checkbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: checkbox.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,6 +14,7 @@
 #include "wx/checkbox.h"
 
 #include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -29,8 +29,6 @@ extern bool           g_blockEventsOnDrag;
 extern "C" {
 static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
 {
-    if (!cb->m_hasVMT) return;
-
     if (g_blockEventsOnDrag) return;
 
     // Transitions for 3state checkbox must be done manually, GTK's checkbox
@@ -44,8 +42,8 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
         {
             // The 3 states cycle like this when clicked:
             // checked -> undetermined -> unchecked -> checked -> ...
-            bool active = gtk_toggle_button_get_active(toggle);
-            bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
+            bool active = gtk_toggle_button_get_active(toggle) != 0;
+            bool inconsistent = gtk_toggle_button_get_inconsistent(toggle) != 0;
 
             cb->GTKDisableEvents();
 
@@ -79,7 +77,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
         }
     }
 
-    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
+    wxCommandEvent event(wxEVT_CHECKBOX, cb->GetId());
     event.SetInt(cb->Get3StateValue());
     event.SetEventObject(cb);
     cb->HandleWindowEvent(event);
@@ -92,6 +90,13 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
 
 wxCheckBox::wxCheckBox()
 {
+    m_widgetCheckbox = NULL;
+}
+
+wxCheckBox::~wxCheckBox()
+{
+    if (m_widgetCheckbox && m_widgetCheckbox != m_widget)
+        GTKDisconnect(m_widgetCheckbox);
 }
 
 bool wxCheckBox::Create(wxWindow *parent,
@@ -121,7 +126,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         m_widgetLabel = gtk_label_new("");
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
-        m_widget = gtk_hbox_new(FALSE, 0);
+        m_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
         gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
         gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3);
 
@@ -177,7 +182,7 @@ bool wxCheckBox::GetValue() const
 {
     wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") );
 
-    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0;
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
@@ -224,20 +229,20 @@ bool wxCheckBox::Enable( bool enable )
 
 void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widgetCheckbox, style);
-    gtk_widget_modify_style(m_widgetLabel, style);
+    GTKApplyStyle(m_widgetCheckbox, style);
+    GTKApplyStyle(m_widgetLabel, style);
 }
 
 GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    return GTK_BUTTON(m_widgetCheckbox)->event_window;
+    return gtk_button_get_event_window(GTK_BUTTON(m_widgetCheckbox));
 }
 
 // static
 wxVisualAttributes
 wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_check_button_new());
 }
 
 #endif
diff --git a/Externals/wxWidgets3/src/gtk/checklst.cpp b/Externals/wxWidgets3/src/gtk/checklst.cpp
index ea012cb2b0..9c5e7065d1 100644
--- a/Externals/wxWidgets3/src/gtk/checklst.cpp
+++ b/Externals/wxWidgets3/src/gtk/checklst.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Ryan Norton (Native GTK2.0+ checklist)
-// Id:          $Id: checklst.cpp 66557 2011-01-04 09:13:49Z SC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,11 +13,9 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
-#include "wx/gtk/private.h"
-#include "wx/gtk/treeentry_gtk.h"
 
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // "toggled"
@@ -31,7 +28,7 @@ static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
     wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") );
 
     GtkTreePath* path = gtk_tree_path_new_from_string(stringpath);
-    wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
+    wxCommandEvent new_event( wxEVT_CHECKLISTBOX,
                               listbox->GetId() );
     new_event.SetEventObject( listbox );
     new_event.SetInt( gtk_tree_path_get_indices(path)[0] );
@@ -46,7 +43,7 @@ static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
 // wxCheckListBox
 //-----------------------------------------------------------------------------
 
-wxCheckListBox::wxCheckListBox() : wxListBox()
+wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
 {
     m_hasCheckBoxes = true;
 }
@@ -115,13 +112,13 @@ bool wxCheckListBox::IsChecked(unsigned int index) const
     if(!res)
         return false;
 
-    GValue value = {0, };
+    GValue value = G_VALUE_INIT;
     gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore),
                              &iter,
                              0, //column
                              &value);
 
-    return g_value_get_boolean(&value) == TRUE ? true : false;
+    return g_value_get_boolean(&value) != 0;
 }
 
 void wxCheckListBox::Check(unsigned int index, bool check)
diff --git a/Externals/wxWidgets3/src/gtk/choice.cpp b/Externals/wxWidgets3/src/gtk/choice.cpp
index 0c7f552a4a..c30e031087 100644
--- a/Externals/wxWidgets3/src/gtk/choice.cpp
+++ b/Externals/wxWidgets3/src/gtk/choice.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/choice.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: choice.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,8 +16,9 @@
     #include "wx/arrstr.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
@@ -29,7 +29,7 @@ extern "C" {
 static void
 gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
-    choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED);
+    choice->SendSelectionChangedEvent(wxEVT_CHOICE);
 }
 
 }
@@ -76,7 +76,11 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
         m_strings = new wxGtkCollatedArrayString;
     }
 
+#ifdef __WXGTK3__
+    m_widget = gtk_combo_box_text_new();
+#else
     m_widget = gtk_combo_box_new_text();
+#endif
     g_object_ref(m_widget);
 
     Append(n, choices);
@@ -96,28 +100,13 @@ wxChoice::~wxChoice()
     delete m_strings;
 }
 
-void wxChoice::SendSelectionChangedEvent(wxEventType evt_type)
-{
-    if (!m_hasVMT)
-        return;
-
-    if (GetSelection() == -1)
-        return;
-
-    wxCommandEvent event( evt_type, GetId() );
-
-    int n = GetSelection();
-    event.SetInt( n );
-    event.SetString( GetStringSelection() );
-    event.SetEventObject( this );
-    InitCommandEventWithItems( event, n );
-
-    HandleWindowEvent( event );
-}
-
 void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
 {
+#ifdef __WXGTK3__
+    gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(m_widget), n, wxGTK_CONV(text));
+#else
     gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) );
+#endif
 }
 
 int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
@@ -191,8 +180,12 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
     GtkListStore* store = GTK_LIST_STORE(model);
     GtkTreeIter iter;
-    gtk_tree_model_iter_nth_child( model, &iter,
-                                   NULL, (gint) n );
+    if ( !gtk_tree_model_iter_nth_child(model, &iter, NULL, n) )
+    {
+        // This is really not supposed to happen for a valid index.
+        wxFAIL_MSG(wxS("Item unexpectedly not found."));
+        return;
+    }
     gtk_list_store_remove( store, &iter );
 
     m_clientData.RemoveAt( n );
@@ -215,7 +208,7 @@ int wxChoice::FindString( const wxString &item, bool bCase ) const
     int count = 0;
     do
     {
-        GValue value = { 0, };
+        GValue value = G_VALUE_INIT;
         gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
         wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
         g_value_unset( &value );
@@ -246,7 +239,7 @@ void wxChoice::SetString(unsigned int n, const wxString &text)
     GtkTreeIter iter;
     if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
     {
-        GValue value = { 0, };
+        GValue value = G_VALUE_INIT;
         g_value_init( &value, G_TYPE_STRING );
         g_value_set_string( &value, wxGTK_CONV( text ) );
         gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, m_stringCellIndex, &value );
@@ -267,7 +260,7 @@ wxString wxChoice::GetString(unsigned int n) const
     GtkTreeIter iter;
     if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
     {
-        GValue value = { 0, };
+        GValue value = G_VALUE_INIT;
         gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
         wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
         g_value_unset( &value );
@@ -312,13 +305,9 @@ void wxChoice::SetColumns(int n)
 
 int wxChoice::GetColumns() const
 {
-    // gtk_combo_box_get_wrap_width() was added in gtk 2.6
-    gint intval;
-    g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
-    return intval;
+    return gtk_combo_box_get_wrap_width(GTK_COMBO_BOX(m_widget));
 }
 
-
 void wxChoice::GTKDisableEvents()
 {
     g_signal_handlers_block_by_func(m_widget,
@@ -331,56 +320,61 @@ void wxChoice::GTKEnableEvents()
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 
-
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
     return gtk_widget_get_window(m_widget);
 }
 
-// Notice that this method shouldn't be necessary, because GTK calculates
-// properly size of the combobox but for unknown reasons it doesn't work
-// correctly in wx without this.
 wxSize wxChoice::DoGetBestSize() const
 {
-    // strangely, this returns a width of 188 pixels from GTK+ (?)
-    wxSize ret( wxControl::DoGetBestSize() );
+    // Get the height of the control from GTK+ itself, but use our own version
+    // to compute the width large enough to show all our strings as GTK+
+    // doesn't seem to take the control contents into account.
+    return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x);
+}
 
-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    if ( m_widget )
-    {
-        ret.x = GetCount() > 0 ? 0 : 60;  // start with something "sensible"
-        int width;
-        unsigned int count = GetCount();
-        for ( unsigned int n = 0; n < count; n++ )
-        {
-            GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
-            if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text
-                ret.x = width + 40;
-        }
-    }
+wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
 
-    // empty combobox should have some reasonable default size too
-    if ((GetCount() == 0) && (ret.x < 80))
-        ret.x = 80;
+    // a GtkEntry for wxComboBox and a GtkCellView for wxChoice
+    GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget));
 
-    CacheBestSize(ret);
-    return ret;
+    // Set a as small as possible size for the control, so preferred sizes
+    // return "natural" sizes, not taking into account the previous ones (which
+    // seems to be GTK+3 behaviour)
+    gtk_widget_set_size_request(m_widget, 0, 0);
+
+    // We are interested in the difference of sizes between the whole contol
+    // and its child part. I.e. arrow, separators, etc.
+    GtkRequisition req;
+    gtk_widget_get_preferred_size(childPart, NULL, &req);
+    wxSize totalS = GTKGetPreferredSize(m_widget);
+
+    wxSize tsize(xlen + totalS.x - req.width, totalS.y);
+
+    // For a wxChoice, not for wxComboBox, add some margins
+    if ( !GTK_IS_ENTRY(childPart) )
+        tsize.IncBy(5, 0);
+
+    // Perhaps the user wants something different from CharHeight
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - GetCharHeight());
+
+    return tsize;
 }
 
 void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
 }
 
-
 // static
 wxVisualAttributes
 wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new());
 }
 
-
 #endif // wxUSE_CHOICE || wxUSE_COMBOBOX
diff --git a/Externals/wxWidgets3/src/gtk/clipbrd.cpp b/Externals/wxWidgets3/src/gtk/clipbrd.cpp
index f60a8cc836..c1c9c9c99b 100644
--- a/Externals/wxWidgets3/src/gtk/clipbrd.cpp
+++ b/Externals/wxWidgets3/src/gtk/clipbrd.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/clipbrd.cpp
 // Purpose:     wxClipboard implementation for wxGTK
 // Author:      Robert Roebling, Vadim Zeitlin
-// Id:          $Id: clipbrd.cpp 69454 2011-10-18 21:54:53Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 //              (c) 2007 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -328,7 +327,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
     {
         gtk_selection_data_set(
             selection_data,
-            GDK_SELECTION_TYPE_STRING,
+            format.GetFormatId(),
             8*sizeof(gchar),
             (const guchar*)buf.data(),
             size );
@@ -434,6 +433,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
+    m_idSelectionGetHandler = 0;
+
     m_open = false;
 
     m_dataPrimary =
@@ -507,7 +508,7 @@ bool wxClipboard::SetSelectionOwner(bool set)
                 set ? m_clipboardWidget : NULL,
                 GTKGetClipboardAtom(),
                 (guint32)GDK_CURRENT_TIME
-              );
+              ) != 0;
 
     if ( !rc )
     {
@@ -642,9 +643,13 @@ bool wxClipboard::AddData( wxDataObject *data )
         AddSupportedTarget(format);
     }
 
-    g_signal_connect (m_clipboardWidget, "selection_get",
+    if ( !m_idSelectionGetHandler )
+    {
+        m_idSelectionGetHandler = g_signal_connect (
+                      m_clipboardWidget, "selection_get",
                       G_CALLBACK (selection_handler),
                       GUINT_TO_POINTER (gtk_get_current_event_time()) );
+    }
 
     // tell the world we offer clipboard data
     return SetSelectionOwner();
diff --git a/Externals/wxWidgets3/src/gtk/clrpicker.cpp b/Externals/wxWidgets3/src/gtk/clrpicker.cpp
index a70c98c24b..e821a2d16e 100644
--- a/Externals/wxWidgets3/src/gtk/clrpicker.cpp
+++ b/Externals/wxWidgets3/src/gtk/clrpicker.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     15/04/2006
-// Id:          $Id: clrpicker.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,9 +36,14 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 {
     // update the m_colour member of the wxColourButton
     wxASSERT(p);
+#ifdef __WXGTK3__
+    GdkRGBA gdkColor;
+    gtk_color_button_get_rgba(widget, &gdkColor);
+#else
     GdkColor gdkColor;
     gtk_color_button_get_color(widget, &gdkColor);
-    p->SetGdkColor(gdkColor);
+#endif
+    p->GTKSetColour(gdkColor);
 
     // fire the colour-changed event
     wxColourPickerEvent event(p, p->GetId(), p->GetColour());
@@ -67,7 +71,11 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     m_colour = col;
+#ifdef __WXGTK3__
+    m_widget = gtk_color_button_new_with_rgba(m_colour);
+#else
     m_widget = gtk_color_button_new_with_color( m_colour.GetColor() );
+#endif
     g_object_ref(m_widget);
 
     // GtkColourButton signals
@@ -89,7 +97,11 @@ wxColourButton::~wxColourButton()
 
 void wxColourButton::UpdateColour()
 {
+#ifdef __WXGTK3__
+    gtk_color_button_set_rgba(GTK_COLOR_BUTTON(m_widget), m_colour);
+#else
     gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor());
+#endif
 }
 
 #endif // wxUSE_COLOURPICKERCTRL
diff --git a/Externals/wxWidgets3/src/gtk/collpane.cpp b/Externals/wxWidgets3/src/gtk/collpane.cpp
index e943a4c7f0..ac2b928d80 100644
--- a/Externals/wxWidgets3/src/gtk/collpane.cpp
+++ b/Externals/wxWidgets3/src/gtk/collpane.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
-// Id:          $Id: collpane.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,14 +23,16 @@
 #include "wx/sizer.h"
 #include "wx/panel.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // the lines below duplicate the same definitions in collpaneg.cpp, if we have
 // another implementation of this class we should extract them to a common file
 
 const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 
-wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
@@ -220,10 +221,11 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
     GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
-            (m_widget, &req );
+#ifdef __WXGTK3__
+    gtk_widget_get_preferred_size(m_widget, NULL, &req);
+#else
+    GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);
+#endif
 
     // notice that we do not cache our best size here as it changes
     // all times the user expands/hide our pane
diff --git a/Externals/wxWidgets3/src/gtk/colordlg.cpp b/Externals/wxWidgets3/src/gtk/colordlg.cpp
index cb01eca93b..781a2316e1 100644
--- a/Externals/wxWidgets3/src/gtk/colordlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/colordlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04
-// RCS-ID:      $Id: colordlg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,12 +18,16 @@
 #if wxUSE_COLOURDLG
 
 #include "wx/colordlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/dialogcount.h"
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-color-selector.h>
@@ -80,8 +83,12 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     ColourDataToDialog();
 
+    wxOpenModalDialogLocker modalLocker;
+
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_hide(m_widget);
 
@@ -104,10 +111,11 @@ int wxColourDialog::ShowModal()
 
 void wxColourDialog::ColourDataToDialog()
 {
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
     const GdkColor * const
         col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor()
                                       : NULL;
-
+#endif
 #if wxUSE_LIBHILDON
     HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget);
     hildon_color_selector_set_color(sel, const_cast<GdkColor *>(col));
@@ -128,14 +136,21 @@ void wxColourDialog::ColourDataToDialog()
         gtk_color_selection_dialog_get_color_selection(
         GTK_COLOR_SELECTION_DIALOG(m_widget)));
 
-    if ( col )
-        gtk_color_selection_set_current_color(sel, col);
+    const wxColour& color = m_data.GetColour();
+    if (color.IsOk())
+    {
+#ifdef __WXGTK3__
+        gtk_color_selection_set_current_rgba(sel, color);
+#else
+        gtk_color_selection_set_current_color(sel, color.GetColor());
+#endif
+    }
 
     // setup the palette:
 
-    GdkColor colors[16];
+    GdkColor colors[wxColourData::NUM_CUSTOM];
     gint n_colors = 0;
-    for (unsigned i = 0; i < 16; i++)
+    for (unsigned i = 0; i < WXSIZEOF(colors); i++)
     {
         wxColour c = m_data.GetCustomColour(i);
         if (c.IsOk())
@@ -182,8 +197,13 @@ void wxColourDialog::DialogToColourData()
         gtk_color_selection_dialog_get_color_selection(
         GTK_COLOR_SELECTION_DIALOG(m_widget)));
 
+#ifdef __WXGTK3__
+    GdkRGBA clr;
+    gtk_color_selection_get_current_rgba(sel, &clr);
+#else
     GdkColor clr;
     gtk_color_selection_get_current_color(sel, &clr);
+#endif
     m_data.SetColour(clr);
 
     // Extract custom palette:
@@ -196,7 +216,7 @@ void wxColourDialog::DialogToColourData()
     gint n_colors;
     if (gtk_color_selection_palette_from_string(pal, &colors, &n_colors))
     {
-        for (int i = 0; i < wxMin(n_colors, 16); i++)
+        for (int i = 0; i < n_colors && i < wxColourData::NUM_CUSTOM; i++)
         {
             m_data.SetCustomColour(i, wxColour(colors[i]));
         }
diff --git a/Externals/wxWidgets3/src/gtk/colour.cpp b/Externals/wxWidgets3/src/gtk/colour.cpp
index 71be846325..5f99b1897b 100644
--- a/Externals/wxWidgets3/src/gtk/colour.cpp
+++ b/Externals/wxWidgets3/src/gtk/colour.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/colour.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: colour.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,9 +11,8 @@
 
 #include "wx/colour.h"
 
-#include "wx/gtk/private.h"
-
 #include <gdk/gdk.h>
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -23,6 +21,38 @@
 class wxColourRefData : public wxGDIRefData
 {
 public:
+#ifdef __WXGTK3__
+    wxColourRefData(const GdkRGBA& gdkRGBA)
+        : m_gdkRGBA(gdkRGBA)
+    {
+        m_gdkColor.red = guint16(gdkRGBA.red * 65535);
+        m_gdkColor.green = guint16(gdkRGBA.green * 65535);
+        m_gdkColor.blue = guint16(gdkRGBA.blue * 65535);
+        m_alpha = wxByte(gdkRGBA.alpha * 255 + 0.5);
+    }
+    wxColourRefData(const GdkColor& gdkColor)
+        : m_gdkColor(gdkColor)
+    {
+        m_gdkRGBA.red = gdkColor.red / 65535.0;
+        m_gdkRGBA.green = gdkColor.green / 65535.0;
+        m_gdkRGBA.blue = gdkColor.blue / 65535.0;
+        m_gdkRGBA.alpha = 1;
+        m_alpha = 255;
+    }
+    wxColourRefData(guchar red, guchar green, guchar blue, guchar alpha)
+    {
+        m_gdkRGBA.red = red / 255.0;
+        m_gdkRGBA.green = green / 255.0;
+        m_gdkRGBA.blue = blue / 255.0;
+        m_gdkRGBA.alpha = alpha / 255.0;
+        m_gdkColor.red = (guint16(red) << 8) + red;
+        m_gdkColor.green = (guint16(green) << 8) + green;
+        m_gdkColor.blue = (guint16(blue) << 8) + blue;
+        m_alpha = alpha;
+    }
+    GdkRGBA m_gdkRGBA;
+    GdkColor m_gdkColor;
+#else
     wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)
     {
         m_color.red =
@@ -50,11 +80,13 @@ public:
     guint16 m_red;
     guint16 m_green;
     guint16 m_blue;
+#endif
     wxByte m_alpha;
 
     wxDECLARE_NO_COPY_CLASS(wxColourRefData);
 };
 
+#ifndef __WXGTK3__
 void wxColourRefData::FreeColour()
 {
     if (m_colormap)
@@ -80,6 +112,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
         }
     }
 }
+#endif
 
 //-----------------------------------------------------------------------------
 
@@ -88,10 +121,22 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 
+#ifdef __WXGTK3__
+wxColour::wxColour(const GdkRGBA& gdkRGBA)
+{
+    m_refData = new wxColourRefData(gdkRGBA);
+}
+
+wxColour::wxColour(const GdkColor& gdkColor)
+{
+    m_refData = new wxColourRefData(gdkColor);
+}
+#else
 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
 }
+#endif
 
 wxColour::~wxColour()
 {
@@ -107,9 +152,15 @@ bool wxColour::operator == ( const wxColour& col ) const
 
     wxColourRefData* refData = M_COLDATA;
     wxColourRefData* that_refData = static_cast<wxColourRefData*>(col.m_refData);
+#ifdef __WXGTK3__
+    return refData->m_gdkColor.red == that_refData->m_gdkColor.red &&
+           refData->m_gdkColor.green == that_refData->m_gdkColor.green &&
+           refData->m_gdkColor.blue == that_refData->m_gdkColor.blue &&
+#else
     return refData->m_red == that_refData->m_red &&
            refData->m_green == that_refData->m_green &&
            refData->m_blue == that_refData->m_blue &&
+#endif
            refData->m_alpha == that_refData->m_alpha;
 }
 
@@ -118,32 +169,48 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl
 {
     UnRef();
 
+#ifdef __WXGTK3__
+    m_refData = new wxColourRefData(red, green, blue, alpha);
+#else
     m_refData = new wxColourRefData(
         (guint16(red) << SHIFT) + red,
         (guint16(green) << SHIFT) + green,
         (guint16(blue) << SHIFT) + blue,
         alpha);
+#endif
 }
 
 unsigned char wxColour::Red() const
 {
     wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.red >> 8);
+#else
     return wxByte(M_COLDATA->m_red >> SHIFT);
+#endif
 }
 
 unsigned char wxColour::Green() const
 {
     wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.green >> 8);
+#else
     return wxByte(M_COLDATA->m_green >> SHIFT);
+#endif
 }
 
 unsigned char wxColour::Blue() const
 {
     wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.blue >> 8);
+#else
     return wxByte(M_COLDATA->m_blue >> SHIFT);
+#endif
 }
 
 unsigned char wxColour::Alpha() const
@@ -153,6 +220,7 @@ unsigned char wxColour::Alpha() const
     return M_COLDATA->m_alpha;
 }
 
+#ifndef __WXGTK3__
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!IsOk()) return;
@@ -166,22 +234,46 @@ int wxColour::GetPixel() const
 
     return M_COLDATA->m_color.pixel;
 }
+#endif
 
 const GdkColor *wxColour::GetColor() const
 {
     wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );
 
+#ifdef __WXGTK3__
+    return &M_COLDATA->m_gdkColor;
+#else
     return &M_COLDATA->m_color;
+#endif
 }
 
+#ifdef __WXGTK3__
+wxColour::operator const GdkRGBA*() const
+{
+    const GdkRGBA* c = NULL;
+    if (IsOk())
+        c = &M_COLDATA->m_gdkRGBA;
+    return c;
+}
+#endif
+
 bool wxColour::FromString(const wxString& str)
 {
+#ifdef __WXGTK3__
+    GdkRGBA gdkRGBA;
+    if (gdk_rgba_parse(&gdkRGBA, wxGTK_CONV_SYS(str)))
+    {
+        *this = wxColour(gdkRGBA);
+        return true;
+    }
+#else
     GdkColor colGDK;
     if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
     {
         *this = wxColour(colGDK);
         return true;
     }
+#endif
 
     return wxColourBase::FromString(str);
 }
diff --git a/Externals/wxWidgets3/src/gtk/combobox.cpp b/Externals/wxWidgets3/src/gtk/combobox.cpp
index de031ff72d..27ad2e756c 100644
--- a/Externals/wxWidgets3/src/gtk/combobox.cpp
+++ b/Externals/wxWidgets3/src/gtk/combobox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: combobox.cpp 70880 2012-03-11 23:55:19Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,11 +16,13 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/settings.h"
-    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/textctrl.h"    // for wxEVT_TEXT
     #include "wx/arrstr.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
@@ -31,9 +32,7 @@ extern "C" {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (!combo->m_hasVMT) return;
-
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    wxCommandEvent event( wxEVT_TEXT, combo->GetId() );
     event.SetString( combo->GetValue() );
     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
@@ -42,7 +41,7 @@ gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *comb
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    combo->SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED);
+    combo->SendSelectionChangedEvent(wxEVT_COMBOBOX);
 }
 
 static void
@@ -52,12 +51,13 @@ gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
 {
     gboolean isShown;
     g_object_get( combo->m_widget, "popup-shown", &isShown, NULL );
-    wxCommandEvent event( isShown ? wxEVT_COMMAND_COMBOBOX_DROPDOWN
-                                  : wxEVT_COMMAND_COMBOBOX_CLOSEUP,
+    wxCommandEvent event( isShown ? wxEVT_COMBOBOX_DROPDOWN
+                                  : wxEVT_COMBOBOX_CLOSEUP,
                           combo->GetId() );
     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
 }
+
 }
 
 //-----------------------------------------------------------------------------
@@ -84,6 +84,12 @@ BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
 END_EVENT_TABLE()
 
+wxComboBox::~wxComboBox()
+{
+    if (m_entry)
+        GTKDisconnect(m_entry);
+}
+
 void wxComboBox::Init()
 {
     m_entry = NULL;
@@ -165,25 +171,32 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
         g_signal_connect_after (entry, "changed",
                                 G_CALLBACK (gtkcombobox_text_changed_callback), this);
+
+        GTKConnectInsertTextSignal(entry);
+        GTKConnectClipboardSignals(GTK_WIDGET(entry));
     }
 
     g_signal_connect_after (m_widget, "changed",
                         G_CALLBACK (gtkcombobox_changed_callback), this);
 
+#ifndef __WXGTK3__
     if ( !gtk_check_version(2,10,0) )
+#endif
     {
         g_signal_connect (m_widget, "notify::popup-shown",
                           G_CALLBACK (gtkcombobox_popupshown_callback), this);
     }
 
-    SetInitialSize(size); // need this too because this is a wxControlWithItems
-
     return true;
 }
 
 void wxComboBox::GTKCreateComboBoxWidget()
 {
+#ifdef __WXGTK3__
+    m_widget = gtk_combo_box_text_new_with_entry();
+#else
     m_widget = gtk_combo_box_entry_new_text();
+#endif
     g_object_ref(m_widget);
 
     m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
@@ -202,7 +215,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
             if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() )
             {
                 // GTK automatically selects an item if its in the list
-                wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
+                wxCommandEvent eventEnter(wxEVT_TEXT_ENTER, GetId());
                 eventEnter.SetString( GetValue() );
                 eventEnter.SetInt( GetSelection() );
                 eventEnter.SetEventObject( this );
@@ -264,14 +277,23 @@ GtkWidget* wxComboBox::GetConnectWidget()
 
 GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
 {
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else
     return gtk_entry_get_text_window(GetEntry());
+#endif
 }
 
 // static
 wxVisualAttributes
 wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);
+#ifdef __WXGTK3__
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry(), true);
+#else
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new(), true);
+#endif
 }
 
 void wxComboBox::SetValue(const wxString& value)
@@ -292,6 +314,10 @@ void wxComboBox::SetString(unsigned int n, const wxString& text)
         // with wxMSW and also because it makes sense as leaving the old string
         // in the text but not in the list would be confusing to the user.
         SetValue(text);
+
+        // And we need to keep the selection unchanged, modifying the item is
+        // not supposed to deselect it.
+        SetSelection(n);
     }
 }
 
@@ -378,4 +404,21 @@ void wxComboBox::Dismiss()
 {
     gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );
 }
+
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
+
+    GtkEntry* entry = GetEntry();
+    if (entry)
+    {
+        // Add the margins we have previously set, but only the horizontal border
+        // as vertical one has been taken account in the previous call.
+        // Also get other GTK+ margins.
+        tsize.IncBy(GTKGetEntryMargins(entry).x, 0);
+    }
+
+    return tsize;
+}
+
 #endif // wxUSE_COMBOBOX
diff --git a/Externals/wxWidgets3/src/gtk/control.cpp b/Externals/wxWidgets3/src/gtk/control.cpp
index 22bda642ac..c2633772fe 100644
--- a/Externals/wxWidgets3/src/gtk/control.cpp
+++ b/Externals/wxWidgets3/src/gtk/control.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/control.cpp
 // Purpose:     wxControl implementation for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id: control.cpp 70714 2012-02-27 17:49:33Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,10 +19,11 @@
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/gtk/private.h"
 #include "wx/utils.h"
 #include "wx/sysopt.h"
 
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"
 
 // ============================================================================
@@ -57,6 +57,21 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
+#ifdef __WXGTK3__
+bool wxControl::SetFont(const wxFont& font)
+{
+    const bool changed = base_type::SetFont(font);
+    if (changed && !gtk_widget_get_realized(m_widget))
+    {
+        // GTK defers sending "style-updated" until widget is realized, but
+        // GetBestSize() won't compute correct result until the signal is sent,
+        // so we have to do it now
+        g_signal_emit_by_name(m_widget, "style-updated");
+    }
+    return changed;
+}
+#endif
+
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
@@ -70,11 +85,9 @@ wxSize wxControl::DoGetBestSize() const
     }
     else
     {
-        GtkRequisition req;
-        GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);
-        best.Set(req.width, req.height);
+        best = GTKGetPreferredSize(m_widget);
     }
-    CacheBestSize(best);
+
     return best;
 }
 
@@ -82,14 +95,15 @@ void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
 
+#ifndef __WXGTK3__
     // NB: GetBestSize needs to know the style, otherwise it will assume
     //     default font and if the user uses a different font, determined
     //     best size will be different (typically, smaller) than the desired
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
+#endif
 
-    GTKApplyWidgetStyle();
     SetInitialSize(size);
 }
 
@@ -99,22 +113,22 @@ void wxControl::PostCreation(const wxSize& size)
 // ----------------------------------------------------------------------------
 
 // Fix sensitivity due to bug in GTK+ < 2.14
-void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse)
+void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse))
 {
+#ifndef __WXGTK3__
     if (gtk_check_version(2,14,0)
 #if wxUSE_SYSTEM_OPTIONS
         && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)
 #endif
         )
     {
-        wxPoint pt = wxGetMousePosition();
-        wxRect rect(ClientToScreen(wxPoint(0, 0)), GetSize());
-        if (!onlyIfUnderMouse || rect.Contains(pt))
+        if (!onlyIfUnderMouse || GetScreenRect().Contains(wxGetMousePosition()))
         {
             Hide();
             Show();
         }
     }
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -168,8 +182,8 @@ void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 
 void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style)
 {
-    gtk_widget_modify_style(GTK_WIDGET(w), style);
-    gtk_widget_modify_style(gtk_frame_get_label_widget (w), style);
+    GTKApplyStyle(GTK_WIDGET(w), style);
+    GTKApplyStyle(gtk_frame_get_label_widget(w), style);
 }
 
 void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)
@@ -214,39 +228,67 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
-                                             bool useBase,
+                                             bool WXUNUSED_IN_GTK3(useBase),
                                              int state)
 {
-    GtkStyle* style;
     wxVisualAttributes attr;
 
+    GtkWidget* tlw = NULL;
+    if (gtk_widget_get_parent(widget) == NULL)
+    {
+        tlw = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_container_add(GTK_CONTAINER(tlw), widget);
+    }
+
+#ifdef __WXGTK3__
+    GtkStateFlags stateFlag = GTK_STATE_FLAG_NORMAL;
+    if (state)
+    {
+        wxASSERT(state == GTK_STATE_ACTIVE);
+        stateFlag = GTK_STATE_FLAG_ACTIVE;
+    }
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    GdkRGBA c;
+    gtk_style_context_get_color(sc, stateFlag, &c);
+    attr.colFg = wxColour(c);
+    gtk_style_context_get_background_color(sc, stateFlag, &c);
+    attr.colBg = wxColour(c);
+    wxNativeFontInfo info;
+    gtk_style_context_get(
+        sc, stateFlag, GTK_STYLE_PROPERTY_FONT, &info.description, NULL);
+    attr.font = wxFont(info);
+#else
+    GtkStyle* style;
+
     style = gtk_rc_get_style(widget);
     if (!style)
         style = gtk_widget_get_default_style();
 
-    if (!style)
+    if (style)
     {
-        return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL);
-    }
+        // get the style's colours
+        attr.colFg = wxColour(style->fg[state]);
+        if (useBase)
+            attr.colBg = wxColour(style->base[state]);
+        else
+            attr.colBg = wxColour(style->bg[state]);
 
-    // get the style's colours
-    attr.colFg = wxColour(style->fg[state]);
-    if (useBase)
-        attr.colBg = wxColour(style->base[state]);
-    else
-        attr.colBg = wxColour(style->bg[state]);
-
-    // get the style's font
-    if ( !style->font_desc )
-        style = gtk_widget_get_default_style();
-    if ( style && style->font_desc )
-    {
-        wxNativeFontInfo info;
-        info.description = style->font_desc;
-        attr.font = wxFont(info);
-        info.description = NULL;
+        // get the style's font
+        if (!style->font_desc)
+            style = gtk_widget_get_default_style();
+        if (style && style->font_desc)
+        {
+            wxNativeFontInfo info;
+            info.description = style->font_desc;
+            attr.font = wxFont(info);
+            info.description = NULL;
+        }
     }
     else
+        attr = wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL);
+#endif
+
+    if (!attr.font.IsOk())
     {
         GtkSettings *settings = gtk_settings_get_default();
         gchar *font_name = NULL;
@@ -261,57 +303,55 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         g_free (font_name);
     }
 
+    if (tlw)
+        gtk_widget_destroy(tlw);
+
     return attr;
 }
 
-
-//static
-wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t widget_new,
-                                             bool useBase,
-                                             int state)
+// This is not the same as GetBestSize() because that size may have
+// been recalculated and cached by us. We want GTK+ information.
+wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const
 {
-    wxVisualAttributes attr;
-    // NB: we need toplevel window so that GTK+ can find the right style
-    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    GtkWidget* widget = widget_new();
-    gtk_container_add(GTK_CONTAINER(wnd), widget);
-    attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(wnd);
-    return attr;
+    GtkRequisition req;
+#ifdef __WXGTK3__
+    gtk_widget_get_preferred_size(widget, NULL, &req);
+#else
+    GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req);
+#endif
+
+    return wxSize(req.width, req.height);
 }
 
-//static
-wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t widget_new,
-                                             bool useBase,
-                                             int state)
+wxPoint wxControl::GTKGetEntryMargins(GtkEntry* entry) const
 {
-    wxVisualAttributes attr;
-    // NB: we need toplevel window so that GTK+ can find the right style
-    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    GtkWidget* widget = widget_new("");
-    gtk_container_add(GTK_CONTAINER(wnd), widget);
-    attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(wnd);
-    return attr;
+    wxPoint marg(0, 0);
+
+#ifndef __WXGTK3__
+#if GTK_CHECK_VERSION(2,10,0)
+    // The margins we have previously set
+    const GtkBorder* border = gtk_entry_get_inner_border(entry);
+    if ( border )
+    {
+        marg.x = border->left + border->right;
+        marg.y = border->top + border->bottom;
+    }
+#endif // GTK+ 2.10+
+#else // GTK+ 3
+    // Gtk3 does not use inner border, but StyleContext and CSS
+    // TODO: implement it, starting with wxTextEntry::DoSetMargins()
+#endif // GTK+ 2/3
+
+    int x, y;
+    gtk_entry_get_layout_offsets(entry, &x, &y);
+    // inner borders are included. Substract them so we can get other margins
+    x -= marg.x;
+    y -= marg.y;
+    marg.x += 2 * x + 2;
+    marg.y += 2 * y + 2;
+
+    return marg;
 }
 
 
-//static
-wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
-                                             bool useBase,
-                                             int state)
-{
-    wxVisualAttributes attr;
-    // NB: we need toplevel window so that GTK+ can find the right style
-    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    GtkWidget* widget = widget_new(NULL);
-    gtk_container_add(GTK_CONTAINER(wnd), widget);
-    attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(wnd);
-    return attr;
-}
-
 #endif // wxUSE_CONTROLS
diff --git a/Externals/wxWidgets3/src/gtk/cursor.cpp b/Externals/wxWidgets3/src/gtk/cursor.cpp
index 8f4b5f6ea2..aab088f64a 100644
--- a/Externals/wxWidgets3/src/gtk/cursor.cpp
+++ b/Externals/wxWidgets3/src/gtk/cursor.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/cursor.cpp
 // Purpose:     wxCursor implementation
 // Author:      Robert Roebling
-// Id:          $Id: cursor.cpp 68685 2011-08-13 16:17:59Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +13,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
-    #include "wx/app.h"
     #include "wx/image.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
@@ -51,10 +49,16 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::~wxCursorRefData()
 {
-    if (m_cursor) gdk_cursor_unref( m_cursor );
+    if (m_cursor)
+    {
+#ifdef __WXGTK3__
+        g_object_unref(m_cursor);
+#else
+        gdk_cursor_unref(m_cursor);
+#endif
+    }
 }
 
-
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
@@ -66,7 +70,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
 // used in the following two ctors
 extern GtkWidget *wxGetRootWindow();
 
-
 wxCursor::wxCursor()
 {
 }
@@ -99,29 +102,68 @@ wxCursor::wxCursor(const char bits[], int width, int height,
                    int hotSpotX, int hotSpotY,
                    const char maskBits[], const wxColour *fg, const wxColour *bg)
 {
+    m_refData = new wxCursorRefData;
+    if (hotSpotX < 0 || hotSpotX >= width)
+        hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= height)
+        hotSpotY = 0;
+#ifdef __WXGTK3__
+    wxBitmap bitmap(bits, width, height);
+    if (maskBits)
+        bitmap.SetMask(new wxMask(wxBitmap(maskBits, width, height)));
+    GdkPixbuf* pixbuf = bitmap.GetPixbuf();
+    if (fg || bg)
+    {
+        const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+        const int n_channels = gdk_pixbuf_get_n_channels(pixbuf);
+        guchar* data = gdk_pixbuf_get_pixels(pixbuf);
+        for (int j = 0; j < height; j++, data += stride)
+        {
+            guchar* p = data;
+            for (int i = 0; i < width; i++, p += n_channels)
+            {
+                if (p[0])
+                {
+                    if (fg)
+                    {
+                        p[0] = fg->Red();
+                        p[1] = fg->Green();
+                        p[2] = fg->Blue();
+                    }
+                }
+                else
+                {
+                    if (bg)
+                    {
+                        p[0] = bg->Red();
+                        p[1] = bg->Green();
+                        p[2] = bg->Blue();
+                    }
+                }
+            }
+        }
+    }
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(wxGetRootWindow()), pixbuf, hotSpotX, hotSpotY);
+#else
     if (!maskBits)
         maskBits = bits;
     if (!fg)
         fg = wxBLACK;
     if (!bg)
         bg = wxWHITE;
-    if (hotSpotX < 0 || hotSpotX >= width)
-        hotSpotX = 0;
-    if (hotSpotY < 0 || hotSpotY >= height)
-        hotSpotY = 0;
 
     GdkBitmap* data = gdk_bitmap_create_from_data(
         gtk_widget_get_window(wxGetRootWindow()), const_cast<char*>(bits), width, height);
     GdkBitmap* mask = gdk_bitmap_create_from_data(
         gtk_widget_get_window(wxGetRootWindow()), const_cast<char*>(maskBits), width, height);
 
-    m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
                  data, mask, fg->GetColor(), bg->GetColor(),
                  hotSpotX, hotSpotY );
 
     g_object_unref (data);
     g_object_unref (mask);
+#endif
 }
 
 wxCursor::~wxCursor()
@@ -135,6 +177,9 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
+#ifdef __WXGTK3__
+        case wxCURSOR_BLANK:            gdk_cur = GDK_BLANK_CURSOR; break;
+#else
         case wxCURSOR_BLANK:
             {
                 const char bits[] = { 0 };
@@ -149,7 +194,7 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
                 g_object_unref(pixmap);
             }
             return;
-
+#endif
         case wxCURSOR_ARROW:            // fall through to default
         case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;
         case wxCURSOR_RIGHT_ARROW:      gdk_cur = GDK_RIGHT_PTR; break;
@@ -196,152 +241,42 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
 
 #if wxUSE_IMAGE
 
-static void GetHotSpot(const wxImage& image, int& x, int& y)
-{
-    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
-        x = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
-    else
-        x = 0;
-
-    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
-        y = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
-    else
-        y = 0;
-
-    if (x < 0 || x >= image.GetWidth())
-        x = 0;
-    if (y < 0 || y >= image.GetHeight())
-        y = 0;
-}
-
 void wxCursor::InitFromImage( const wxImage & image )
 {
-    int w = image.GetWidth() ;
-    int h = image.GetHeight();
-    bool bHasMask = image.HasMask();
-    int hotSpotX, hotSpotY;
-    GetHotSpot(image, hotSpotX, hotSpotY);
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();
+    const guchar* alpha = image.GetAlpha();
+    const bool hasMask = image.HasMask();
+    int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+    if (hotSpotX < 0 || hotSpotX > w) hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY > h) hotSpotY = 0;
+    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image.GetData(), GDK_COLORSPACE_RGB, false, 8, w, h, w * 3, NULL, NULL);
+    if (alpha || hasMask)
+    {
+        guchar r = 0, g = 0, b = 0;
+        if (hasMask)
+        {
+            r = image.GetMaskRed();
+            g = image.GetMaskGreen();
+            b = image.GetMaskBlue();
+        }
+        GdkPixbuf* pixbuf0 = pixbuf;
+        pixbuf = gdk_pixbuf_add_alpha(pixbuf, hasMask, r, g, b);
+        g_object_unref(pixbuf0);
+        if (alpha)
+        {
+            guchar* d = gdk_pixbuf_get_pixels(pixbuf);
+            const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+            for (int j = 0; j < h; j++, d += stride)
+                for (int i = 0; i < w; i++, alpha++)
+                    if (d[4 * i + 3])
+                        d[4 * i + 3] = *alpha;
+        }
+    }
     m_refData = new wxCursorRefData;
-    wxImage image_copy(image);
-
-    GdkDisplay* display = gdk_drawable_get_display(gtk_widget_get_window(wxGetRootWindow()));
-    if (gdk_display_supports_cursor_color(display))
-    {
-        if (!image.HasAlpha())
-        {
-            // add alpha, so wxBitmap will convert to pixbuf format
-            image_copy.InitAlpha();
-        }
-        wxBitmap bitmap(image_copy);
-        wxASSERT(bitmap.HasPixbuf());
-        M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
-                             (
-                              display,
-                              bitmap.GetPixbuf(),
-                              hotSpotX, hotSpotY
-                             );
-    }
-    else // no colour cursor support
-    {
-        unsigned long keyMaskColor = 0;
-        GdkPixmap *maskRaw;
-        if (bHasMask)
-        {
-            keyMaskColor = wxImageHistogram::MakeKey(
-                image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
-            // get mask before image is modified
-            wxBitmap bitmap(image, 1);
-            maskRaw = bitmap.GetMask()->GetBitmap();
-            g_object_ref(maskRaw);
-        }
-        else
-        {
-            const int size = ((w + 7) / 8) * h;
-            char* bits = new char[size];
-            memset(bits, 0xff, size);
-            maskRaw = gdk_bitmap_create_from_data(
-                gtk_widget_get_window(wxGetRootWindow()), bits, w, h);
-            delete[] bits;
-        }
-
-        // assign the raw pointer to wxGtkObject to ensure it is unref'd later
-        wxGtkObject<GdkPixmap> mask(maskRaw);
-
-        // modify image so wxBitmap can be used to convert to pixmap
-        image_copy.SetMask(false);
-        wxByte* data = image_copy.GetData();
-        for (int j = 0; j < h; j++)
-        {
-            for (int i = 0; i < w; i++, data += 3)
-            {
-                // if average value of the pixel is > mid grey, convert it to
-                // background (0), otherwise to foreground (255, using wxBitmap
-                // convention)
-                data[0] =
-                data[1] =
-                data[2] = int(data[0]) + data[1] + data[2] >= 3 * 128 ? 0 : 255;
-            }
-        }
-        wxBitmap bitmap(image_copy, 1);
-
-        // find the most frequent color(s)
-        wxImageHistogram histogram;
-        image.ComputeHistogram(histogram);
-
-        long colMostFreq = 0;
-        unsigned long nMost = 0;
-        long colNextMostFreq = 0;
-        unsigned long nNext = 0;
-        for ( wxImageHistogram::iterator entry = histogram.begin();
-              entry != histogram.end();
-              ++entry )
-        {
-            unsigned long key = entry->first;
-            if ( !bHasMask || (key != keyMaskColor) )
-            {
-                unsigned long value = entry->second.value;
-                if (value > nMost)
-                {
-                    nNext = nMost;
-                    colNextMostFreq = colMostFreq;
-                    nMost = value;
-                    colMostFreq = key;
-                }
-                else if (value > nNext)
-                {
-                    nNext = value;
-                    colNextMostFreq = key;
-                }
-            }
-        }
-
-        wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
-                                 (unsigned char)(colMostFreq >> 8),
-                                 (unsigned char)(colMostFreq) );
-
-        wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
-                                 (unsigned char)(colNextMostFreq >> 8),
-                                 (unsigned char)(colNextMostFreq) );
-
-        int fg_intensity = fg.Red() + fg.Green() + fg.Blue();
-        int bg_intensity = bg.Red() + bg.Green() + bg.Blue();
-
-        if (bg_intensity > fg_intensity)
-        {
-            //swap fg and bg
-            wxColour tmp = fg;
-            fg = bg;
-            bg = tmp;
-        }
-
-        M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
-                                 (
-                                    bitmap.GetPixmap(),
-                                    mask,
-                                    fg.GetColor(), bg.GetColor(),
-                                    hotSpotX, hotSpotY
-                                 );
-    }
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(wxGetRootWindow()), pixbuf, hotSpotX, hotSpotY);
+    g_object_unref(pixbuf);
 }
 
 #endif // wxUSE_IMAGE
diff --git a/Externals/wxWidgets3/src/gtk/dataobj.cpp b/Externals/wxWidgets3/src/gtk/dataobj.cpp
index 2003320cbc..9a3960797d 100644
--- a/Externals/wxWidgets3/src/gtk/dataobj.cpp
+++ b/Externals/wxWidgets3/src/gtk/dataobj.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
-// Id:          $Id: dataobj.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,7 @@ GdkAtom  g_textAtom        = 0;
 GdkAtom  g_altTextAtom     = 0;
 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_fileAtom        = 0;
+GdkAtom  g_htmlAtom        = 0;
 
 //-------------------------------------------------------------------------
 // wxDataFormat
@@ -95,6 +95,9 @@ void wxDataFormat::SetType( wxDataFormatId type )
     if (m_type == wxDF_FILENAME)
         m_format = g_fileAtom;
     else
+    if (m_type == wxDF_HTML)
+        m_format = g_htmlAtom;
+    else
     {
        wxFAIL_MSG( wxT("invalid dataformat") );
     }
@@ -131,6 +134,9 @@ void wxDataFormat::SetId( NativeFormat format )
     else
     if (m_format == g_fileAtom)
         m_type = wxDF_FILENAME;
+    else
+    if (m_format == g_htmlAtom)
+        m_type = wxDF_HTML;
     else
         m_type = wxDF_PRIVATE;
 }
@@ -164,6 +170,8 @@ void wxDataFormat::PrepareFormats()
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)
         g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );
+    if (!g_htmlAtom)
+        g_htmlAtom = gdk_atom_intern( "text/html", FALSE );
 }
 
 //-------------------------------------------------------------------------
@@ -411,49 +419,101 @@ void wxBitmapDataObject::DoConvertToPng()
 // wxURLDataObject
 // ----------------------------------------------------------------------------
 
-wxURLDataObject::wxURLDataObject(const wxString& url) :
-   wxDataObjectSimple( wxDataFormat( gdk_atom_intern("text/x-moz-url",FALSE) ) )
+class wxTextURIListDataObject : public wxDataObjectSimple
 {
-   m_url = url;
-}
-
-size_t wxURLDataObject::GetDataSize() const
-{
-    if (m_url.empty())
-        return 0;
-
-    return 2*m_url.Len()+2;
-}
-
-bool wxURLDataObject::GetDataHere(void *buf) const
-{
-    if (m_url.empty())
-        return false;
-
-    wxCSConv conv( "UCS2" );
-    conv.FromWChar( (char*) buf, 2*m_url.Len()+2, m_url.wc_str() );
-
-    return true;
-}
-
-    // copy data from buffer to our data
-bool wxURLDataObject::SetData(size_t len, const void *buf)
-{
-    if (len == 0)
+public:
+    wxTextURIListDataObject(const wxString& url)
+        : wxDataObjectSimple(wxDataFormat(g_fileAtom)),
+          m_url(url)
     {
-        m_url = wxEmptyString;
-        return false;
     }
 
-    wxCSConv conv( "UCS2" );
-    wxWCharBuffer res = conv.cMB2WC( (const char*) buf );
-    m_url = res;
-    int pos = m_url.Find( '\n' );
-    if (pos != wxNOT_FOUND)
-        m_url.Remove( pos, m_url.Len() - pos );
+    const wxString& GetURL() const { return m_url; }
+    void SetURL(const wxString& url) { m_url = url; }
 
-    return true;
+
+    virtual size_t GetDataSize() const
+    {
+        // It is not totally clear whether we should include "\r\n" at the end
+        // of the string if there is only one URL or not, but not doing it
+        // doesn't seem to create any problems, so keep things simple.
+        return strlen(m_url.utf8_str()) + 1;
+    }
+
+    virtual bool GetDataHere(void *buf) const
+    {
+        char* const dst = static_cast<char*>(buf);
+
+        strcpy(dst, m_url.utf8_str());
+
+        return true;
+    }
+
+    virtual bool SetData(size_t len, const void *buf)
+    {
+        const char* const src = static_cast<const char*>(buf);
+
+        // The string might be "\r\n"-terminated but this is not necessarily
+        // the case (e.g. when dragging an URL from Firefox, it isn't).
+        if ( len > 1 && src[len - 1] == '\n' )
+        {
+            if ( len > 2 && src[len - 2] == '\r' )
+                len--;
+
+            len--;
+        }
+
+        m_url = wxString::FromUTF8(src, len);
+
+        return true;
+    }
+
+    // Must provide overloads to avoid hiding them (and warnings about it)
+    virtual size_t GetDataSize(const wxDataFormat&) const
+    {
+        return GetDataSize();
+    }
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    {
+        return GetDataHere(buf);
+    }
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    {
+        return SetData(len, buf);
+    }
+
+private:
+    wxString m_url;
+};
+
+wxURLDataObject::wxURLDataObject(const wxString& url) :
+    m_dobjURIList(new wxTextURIListDataObject(url)),
+    m_dobjText(new wxTextDataObject(url))
+{
+    // Use both URL-specific format and a plain text one to ensure that URLs
+    // can be pasted into any application.
+    Add(m_dobjURIList, true /* preferred */);
+    Add(m_dobjText);
 }
 
+void wxURLDataObject::SetURL(const wxString& url)
+{
+    m_dobjURIList->SetURL(url);
+    m_dobjText->SetText(url);
+}
+
+wxString wxURLDataObject::GetURL() const
+{
+    if ( GetReceivedFormat() == g_fileAtom )
+    {
+        // If we received the URL as an URI, use it.
+        return m_dobjURIList->GetURL();
+    }
+    else // Otherwise we either got it as text or didn't get anything yet.
+    {
+        // In either case using the text format should be fine.
+        return m_dobjText->GetText();
+    }
+}
 
 #endif // wxUSE_DATAOBJ
diff --git a/Externals/wxWidgets3/src/gtk/dataview.cpp b/Externals/wxWidgets3/src/gtk/dataview.cpp
index 138856c567..7a181fd4c5 100644
--- a/Externals/wxWidgets3/src/gtk/dataview.cpp
+++ b/Externals/wxWidgets3/src/gtk/dataview.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dataview.cpp
 // Purpose:     wxDataViewCtrl GTK+2 implementation
 // Author:      Robert Roebling
-// Id:          $Id: dataview.cpp 70457 2012-01-25 00:05:03Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,17 +27,27 @@
 #include "wx/popupwin.h"
 #include "wx/listimpl.cpp"
 
-#include "wx/gtk/private.h"
 #include "wx/gtk/dc.h"
+#ifndef __WXGTK3__
 #include "wx/gtk/dcclient.h"
+#endif
 
-#include "wx/gtk/private/gdkconv.h"
-#include "wx/gtk/private/list.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 #include "wx/gtk/private/event.h"
+#include "wx/gtk/private/gdkconv.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/list.h"
 using namespace wxGTKImpl;
 
 class wxGtkDataViewModelNotifier;
 
+#ifdef __WXGTK3__
+    #define wxConstGdkRect const GdkRectangle
+#else
+    #define wxConstGdkRect GdkRectangle
+#endif
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
@@ -137,7 +146,8 @@ public:
 // any given moment. It's just simpler like this and we don't need anything
 // more for now.
 
-extern "C"
+extern "C" {
+static
 gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection),
                                    GtkTreeModel * WXUNUSED(model),
                                    GtkTreePath * WXUNUSED(path),
@@ -146,6 +156,7 @@ gboolean wxdataview_selection_func(GtkTreeSelection * WXUNUSED(selection),
 {
     return data == NULL;
 }
+}
 
 class wxGtkTreeSelectionLock
 {
@@ -185,8 +196,10 @@ private:
         // We can only use gtk_tree_selection_get_select_function() with 2.14+
         // so check for its availability both during compile- and run-time.
 #if GTK_CHECK_VERSION(2, 14, 0)
+#ifndef __WXGTK3__
         if ( gtk_check_version(2, 14, 0) != NULL )
             return;
+#endif
 
         // If this assert is triggered, it means the code elsewhere has called
         // gtk_tree_selection_set_select_function() but currently doing this
@@ -268,7 +281,15 @@ public:
     void SetDataViewSortColumn( wxDataViewColumn *column ) { m_dataview_sort_column = column; }
     wxDataViewColumn *GetDataViewSortColumn()   { return m_dataview_sort_column; }
 
-    bool IsSorted()                             { return (m_sort_column >= 0); }
+    bool IsSorted() const                       { return m_sort_column >= 0; }
+
+    // Should we be sorted either because we have a configured sort column or
+    // because we have a default sort order?
+    bool ShouldBeSorted() const
+    {
+        return IsSorted() || GetDataViewModel()->HasDefaultCompare();
+    }
+
 
     // accessors
     wxDataViewModel* GetDataViewModel() { return m_wx_model; }
@@ -360,7 +381,7 @@ public:
 
             m_children.Add( id );
 
-            if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
+            if (m_internal->ShouldBeSorted())
             {
                 gs_internal = m_internal;
                 m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -369,7 +390,7 @@ public:
 
     void InsertNode( wxGtkTreeModelNode* child, unsigned pos )
         {
-            if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
+            if (m_internal->ShouldBeSorted())
             {
                 AddNode(child);
                 return;
@@ -407,7 +428,7 @@ public:
         {
             m_children.Insert( id, pos );
 
-            if (m_internal->IsSorted() || m_internal->GetDataViewModel()->HasDefaultCompare())
+            if (m_internal->ShouldBeSorted())
             {
                 gs_internal = m_internal;
                 m_children.Sort( &wxGtkTreeModelChildCmp );
@@ -587,6 +608,7 @@ gtk_wx_tree_model_get_type (void)
             sizeof (GtkWxTreeModel),
             0,
             wxgtk_tree_model_init,
+            NULL
         };
 
         static const GInterfaceInfo tree_model_iface_info =
@@ -993,7 +1015,7 @@ wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
     if (gs_lastLeftClickHeader)
     {
         wxDataViewCtrl *dv = tree_model->internal->GetOwner();
-        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, dv->GetId() );
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_SORTED, dv->GetId() );
         event.SetDataViewColumn( gs_lastLeftClickHeader );
         event.SetModel( dv->GetModel() );
         dv->HandleWindowEvent( event );
@@ -1066,8 +1088,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     flags );
 
 
@@ -1093,6 +1115,7 @@ gtk_wx_cell_renderer_text_get_type (void)
             sizeof (GtkWxCellRendererText),
             0,          /* n_preallocs */
             gtk_wx_cell_renderer_text_init,
+            NULL
         };
 
         cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER_TEXT,
@@ -1130,8 +1153,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
                         GdkEvent                *gdk_event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     flags )
 {
     GtkWxCellRendererText *wxgtk_renderer = (GtkWxCellRendererText *) gtk_renderer;
@@ -1142,7 +1165,7 @@ static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
         item(column->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
 
     wxDataViewCtrl *dv = column->GetOwner();
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_START_EDITING, dv->GetId() );
     event.SetDataViewColumn( column );
     event.SetModel( dv->GetModel() );
     event.SetColumn( column->GetModelColumn() );
@@ -1187,34 +1210,40 @@ static void gtk_wx_cell_renderer_class_init(
 static void gtk_wx_cell_renderer_get_size (
                         GtkCellRenderer         *cell,
                         GtkWidget               *widget,
-                        GdkRectangle            *rectangle,
+                        wxConstGdkRect          *rectangle,
                         gint                    *x_offset,
                         gint                    *y_offset,
                         gint                    *width,
                         gint                    *height );
 static void gtk_wx_cell_renderer_render (
                         GtkCellRenderer         *cell,
+#ifdef __WXGTK3__
+                        cairo_t* cr,
+#else
                         GdkWindow               *window,
+#endif
                         GtkWidget               *widget,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
+#ifndef __WXGTK3__
                         GdkRectangle            *expose_area,
+#endif
                         GtkCellRendererState     flags );
 static gboolean gtk_wx_cell_renderer_activate(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     flags );
 static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GtkCellRenderer         *cell,
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *background_area,
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *background_area,
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     flags );
 
 }  // extern "C"
@@ -1237,6 +1266,7 @@ gtk_wx_cell_renderer_get_type (void)
             sizeof (GtkWxCellRenderer),
             0,          /* n_preallocs */
             gtk_wx_cell_renderer_init,
+            NULL
         };
 
         cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
@@ -1275,8 +1305,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GdkEvent                *WXUNUSED(event),
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *WXUNUSED(background_area),
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *WXUNUSED(background_area),
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     WXUNUSED(flags) )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
@@ -1316,7 +1346,7 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
 static void
 gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
                                GtkWidget       *WXUNUSED(widget),
-                               GdkRectangle    *cell_area,
+                               wxConstGdkRect  *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,
                                gint            *width,
@@ -1373,20 +1403,30 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
 
 struct wxDataViewCustomRenderer::GTKRenderParams
 {
+#ifdef __WXGTK3__
+    cairo_t* cr;
+#else
     GdkWindow* window;
     GdkRectangle* expose_area;
+#endif
     GtkWidget* widget;
-    GdkRectangle* background_area;
+    wxConstGdkRect* background_area;
     int flags;
 };
 
 static void
 gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
+#ifdef __WXGTK3__
+                             cairo_t* cr,
+#else
                              GdkWindow            *window,
+#endif
                              GtkWidget            *widget,
-                             GdkRectangle         *background_area,
-                             GdkRectangle         *cell_area,
+                             wxConstGdkRect       *background_area,
+                             wxConstGdkRect       *cell_area,
+#ifndef __WXGTK3__
                              GdkRectangle         *expose_area,
+#endif
                              GtkCellRendererState  flags)
 
 {
@@ -1394,8 +1434,12 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     wxDataViewCustomRenderer *cell = wxrenderer->cell;
 
     wxDataViewCustomRenderer::GTKRenderParams renderParams;
+#ifdef __WXGTK3__
+    renderParams.cr = cr;
+#else
     renderParams.window = window;
     renderParams.expose_area = expose_area;
+#endif
     renderParams.widget = widget;
     renderParams.background_area = background_area;
     renderParams.flags = flags;
@@ -1406,7 +1450,18 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     gtk_cell_renderer_get_padding(renderer, &xpad, &ypad);
     rect = rect.Deflate(xpad, ypad);
 
-    wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
+    wxDC* dc = cell->GetDC();
+#ifdef __WXGTK3__
+    wxGraphicsContext* context = dc->GetGraphicsContext();
+    void* nativeContext = NULL;
+    if (context)
+        nativeContext = context->GetNativeContext();
+    if (cr != nativeContext)
+    {
+        cairo_reference(cr);
+        dc->SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+    }
+#else
     wxWindowDCImpl *impl = (wxWindowDCImpl *) dc->GetImpl();
 
     // Reinitialize wxWindowDC's GDK window if drawing occurs into a different
@@ -1417,6 +1472,7 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
         impl->m_gdkwindow = window;
         impl->SetUpDC();
     }
+#endif
 
     int state = 0;
     if (flags & GTK_CELL_RENDERER_SELECTED)
@@ -1432,6 +1488,9 @@ gtk_wx_cell_renderer_render (GtkCellRenderer      *renderer,
     cell->WXCallRender( rect, dc, state );
 
     cell->GTKSetRenderParams(NULL);
+#ifdef __WXGTK3__
+    dc->SetGraphicsContext(NULL);
+#endif
 }
 
 static gboolean
@@ -1440,8 +1499,8 @@ gtk_wx_cell_renderer_activate(
                         GdkEvent                *event,
                         GtkWidget               *widget,
                         const gchar             *path,
-                        GdkRectangle            *WXUNUSED(background_area),
-                        GdkRectangle            *cell_area,
+                        wxConstGdkRect          *WXUNUSED(background_area),
+                        wxConstGdkRect          *cell_area,
                         GtkCellRendererState     WXUNUSED(flags) )
 {
     GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
@@ -1648,12 +1707,17 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
                     GTK_TREE_MODEL(wxgtk_model), &iter ));
                 GdkRectangle cell_area;
                 gtk_tree_view_get_cell_area( widget, path, gcolumn, &cell_area );
-
+#ifdef __WXGTK3__
+                GtkAdjustment* hadjust = gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(widget));
+#else
                 GtkAdjustment* hadjust = gtk_tree_view_get_hadjustment( widget );
+#endif
                 double d = gtk_adjustment_get_value( hadjust );
                 int xdiff = (int) d;
 
-                int ydiff = gcolumn->button->allocation.height;
+                GtkAllocation a;
+                gtk_widget_get_allocation(GTK_WIDGET(gtk_tree_view_column_get_button(gcolumn)), &a);
+                int ydiff = a.height;
                 // Redraw
                 gtk_widget_queue_draw_area( GTK_WIDGET(widget),
                     cell_area.x - xdiff, ydiff + cell_area.y, cell_area.width, cell_area.height );
@@ -1723,7 +1787,7 @@ wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable),
 {
     wxDataViewColumn *column = wxrenderer->GetOwner();
     wxDataViewCtrl *dv = column->GetOwner();
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv->GetId() );
     event.SetDataViewColumn( column );
     event.SetModel( dv->GetModel() );
     wxDataViewItem item( s_user_data );
@@ -1740,7 +1804,7 @@ wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable
 
     wxDataViewColumn *column = wxrenderer->GetOwner();
     wxDataViewCtrl *dv = column->GetOwner();
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, dv->GetId() );
     event.SetDataViewColumn( column );
     event.SetModel( dv->GetModel() );
     wxDataViewItem item(dv->GTKPathToItem(wxGtkTreePath(path)));
@@ -1751,7 +1815,7 @@ wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable
     {
         s_user_data = item.GetID();
 
-        g_signal_connect (GTK_CELL_EDITABLE (editable), "editing_done",
+        g_signal_connect (editable, "editing_done",
             G_CALLBACK (wxgtk_cell_editable_editing_done),
             (gpointer) wxrenderer );
 
@@ -1782,9 +1846,8 @@ void wxDataViewRenderer::GtkPackIntoColumn(GtkTreeViewColumn *column)
 
 void wxDataViewRenderer::GtkInitHandlers()
 {
-    if (!gtk_check_version(2,6,0))
     {
-        g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started",
+        g_signal_connect (m_renderer, "editing_started",
             G_CALLBACK (wxgtk_renderer_editing_started),
             this);
     }
@@ -1815,7 +1878,7 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
     m_mode = mode;
     
     // This value is most often ignored in GtkTreeView
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
     g_value_set_enum( &gvalue, gtkMode );
     g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
@@ -1876,7 +1939,7 @@ void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer)
     else if (align & wxALIGN_CENTER_HORIZONTAL)
         xalign = 0.5;
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_FLOAT );
     g_value_set_float( &gvalue, xalign );
     g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue );
@@ -1890,7 +1953,7 @@ void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer)
     else if (align & wxALIGN_CENTER_VERTICAL)
         yalign = 0.5;
 
-    GValue gvalue2 = { 0, };
+    GValue gvalue2 = G_VALUE_INIT;
     g_value_init( &gvalue2, G_TYPE_FLOAT );
     g_value_set_float( &gvalue2, yalign );
     g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 );
@@ -1910,37 +1973,26 @@ int wxDataViewRenderer::GetAlignment() const
 
 void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
 {
-#ifdef __WXGTK26__
-    if ( gtk_check_version(2, 6, 0) != NULL )
-        return;
-
     GtkCellRendererText * const rend = GtkGetTextRenderer();
     if ( !rend )
         return;
 
     // we use the same values in wxEllipsizeMode as PangoEllipsizeMode so we
     // can just cast between them
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE );
     g_value_set_enum( &gvalue, static_cast<PangoEllipsizeMode>(mode) );
     g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue );
     g_value_unset( &gvalue );
-#else // GTK < 2.6
-    wxUnusedVar(mode);
-#endif // GTK 2.6/before
 }
 
 wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
 {
-#ifdef __WXGTK26__
-    if ( gtk_check_version(2, 6, 0) != NULL )
-        return wxELLIPSIZE_NONE;
-
     GtkCellRendererText * const rend = GtkGetTextRenderer();
     if ( !rend )
         return wxELLIPSIZE_NONE;
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, PANGO_TYPE_ELLIPSIZE_MODE );
     g_object_get_property( G_OBJECT(rend), "ellipsize", &gvalue );
     wxEllipsizeMode
@@ -1948,9 +2000,6 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
     g_value_unset( &gvalue );
 
     return mode;
-#else // GTK < 2.6
-    return wxELLIPSIZE_NONE;
-#endif // GTK 2.6/before
 }
 
 void
@@ -2006,7 +2055,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
     {
         const GdkColor * const gcol = attr.GetColour().GetColor();
 
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, GDK_TYPE_COLOR );
         g_value_set_boxed( &gvalue, gcol );
         g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
@@ -2016,7 +2065,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
     }
     else
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, FALSE );
         g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
@@ -2025,7 +2074,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
 
     if (attr.GetItalic())
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, PANGO_TYPE_STYLE );
         g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
         g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
@@ -2035,7 +2084,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
     }
     else
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, FALSE );
         g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
@@ -2045,7 +2094,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
 
     if (attr.GetBold())
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
         g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
         g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
@@ -2055,7 +2104,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
     }
     else
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, FALSE );
         g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
@@ -2068,7 +2117,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
         wxColour colour = attr.GetBackgroundColour();
         const GdkColor * const gcol = colour.GetColor();
 
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, GDK_TYPE_COLOR );
         g_value_set_boxed( &gvalue, gcol );
         g_object_set_property( G_OBJECT(renderer), "cell-background_gdk", &gvalue );
@@ -2076,7 +2125,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
     }
     else
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, FALSE );
         g_object_set_property( G_OBJECT(renderer), "cell-background-set", &gvalue );
@@ -2101,7 +2150,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
 
     if (mode & wxDATAVIEW_CELL_EDITABLE)
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, true );
         g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
@@ -2118,7 +2167,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxD
 
 bool wxDataViewTextRenderer::SetTextValue(const wxString& str)
 {
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_STRING );
     g_value_set_string( &gvalue, wxGTK_CONV_FONT( str, GetOwner()->GetOwner()->GetFont() ) );
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
@@ -2129,7 +2178,7 @@ bool wxDataViewTextRenderer::SetTextValue(const wxString& str)
 
 bool wxDataViewTextRenderer::GetTextValue(wxString& str) const
 {
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_STRING );
     g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
     str = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
@@ -2142,8 +2191,10 @@ void wxDataViewTextRenderer::SetAlignment( int align )
 {
     wxDataViewRenderer::SetAlignment(align);
 
+#ifndef __WXGTK3__
     if (gtk_check_version(2,10,0))
         return;
+#endif
 
     // horizontal alignment:
     PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
@@ -2152,7 +2203,7 @@ void wxDataViewTextRenderer::SetAlignment( int align )
     else if (align & wxALIGN_CENTER_HORIZONTAL)
         pangoAlign = PANGO_ALIGN_CENTER;
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
     g_value_set_enum( &gvalue, pangoAlign );
     g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
@@ -2179,7 +2230,7 @@ namespace
 // set "pixbuf" property on the given renderer
 void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf)
 {
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_OBJECT );
     g_value_set_object( &gvalue, pixbuf );
     g_object_set_property( G_OBJECT(renderer), "pixbuf", &gvalue );
@@ -2246,15 +2297,13 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     wxDataViewToggleRenderer *cell = (wxDataViewToggleRenderer*) user_data;
 
     // get old value
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue );
-    g_value_unset( &gvalue );
     // invert it
-    tmp = !tmp;
+    wxVariant value = !g_value_get_boolean( &gvalue );
+    g_value_unset( &gvalue );
 
-    wxVariant value = tmp;
     if (!cell->Validate( value ))
         return;
 
@@ -2283,7 +2332,7 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
     }
     else
     {
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, false );
         g_object_set_property( G_OBJECT(m_renderer), "activatable", &gvalue );
@@ -2298,7 +2347,7 @@ bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
 {
     bool tmp = value;
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, tmp );
     g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
@@ -2309,14 +2358,12 @@ bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
 
 bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
 {
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
-    bool tmp = g_value_get_boolean( &gvalue );
+    value = g_value_get_boolean( &gvalue ) != 0;
     g_value_unset( &gvalue );
 
-    value = tmp;
-
     return true;
 }
 
@@ -2324,6 +2371,7 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
+#ifndef __WXGTK3__
 class wxDataViewCtrlDCImpl: public wxWindowDCImpl
 {
 public:
@@ -2354,7 +2402,7 @@ public:
         wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
         { }
 };
-
+#endif
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
@@ -2406,7 +2454,7 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text,
 
     GtkCellRendererText * const textRenderer = GtkGetTextRenderer();
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_STRING );
     g_value_set_string( &gvalue, wxGTK_CONV_FONT( text, GetOwner()->GetOwner()->GetFont() ) );
     g_object_set_property( G_OBJECT(textRenderer), "text", &gvalue );
@@ -2420,11 +2468,17 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text,
     cell_area.width -= xoffset;
 
     gtk_cell_renderer_render( GTK_CELL_RENDERER(textRenderer),
+#ifdef __WXGTK3__
+        m_renderParams->cr,
+#else
         m_renderParams->window,
+#endif
         m_renderParams->widget,
         m_renderParams->background_area,
         &cell_area,
+#ifndef __WXGTK3__
         m_renderParams->expose_area,
+#endif
         GtkCellRendererState(m_renderParams->flags));
 }
 
@@ -2456,11 +2510,18 @@ wxDC *wxDataViewCustomRenderer::GetDC()
 {
     if (m_dc == NULL)
     {
+#ifdef __WXGTK3__
+        wxASSERT(m_renderParams);
+        cairo_t* cr = m_renderParams->cr;
+        wxASSERT(cr && cairo_status(cr) == 0);
+        m_dc = new wxGTKCairoDC(cr);
+#else
         if (GetOwner() == NULL)
             return NULL;
         if (GetOwner()->GetOwner() == NULL)
             return NULL;
         m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
+#endif
     }
 
     return m_dc;
@@ -2478,32 +2539,23 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
 {
     m_label = label;
     m_value = 0;
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new();
-
-        SetMode(mode);
-        SetAlignment(align);
+    SetMode(mode);
+    SetAlignment(align);
 
 #if !wxUSE_UNICODE
-        // We can't initialize the renderer just yet because we don't have the
-        // pointer to the column that uses this renderer yet and so attempt to
-        // dereference GetOwner() to get the font that is used as a source of
-        // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in
-        // non-Unicode builds would crash. So simply remember to do it later.
-        if ( !m_label.empty() )
-            m_needsToSetLabel = true;
-        else
-#endif // !wxUSE_UNICODE
-            GTKSetLabel();
-    }
+    // We can't initialize the renderer just yet because we don't have the
+    // pointer to the column that uses this renderer yet and so attempt to
+    // dereference GetOwner() to get the font that is used as a source of
+    // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in
+    // non-Unicode builds would crash. So simply remember to do it later.
+    if ( !m_label.empty() )
+        m_needsToSetLabel = true;
     else
-#endif
+#endif // !wxUSE_UNICODE
     {
-        // Use custom cell code
-        wxDataViewCustomRenderer::Init(mode, align);
+        GTKSetLabel();
     }
 }
 
@@ -2513,7 +2565,7 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
 
 void wxDataViewProgressRenderer::GTKSetLabel()
 {
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_STRING );
 
     // Take care to not use GetOwner() here if the label is empty, we can be
@@ -2535,29 +2587,17 @@ void wxDataViewProgressRenderer::GTKSetLabel()
 
 bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
 {
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
 #if !wxUSE_UNICODE
-        if ( m_needsToSetLabel )
-            GTKSetLabel();
+    if ( m_needsToSetLabel )
+        GTKSetLabel();
 #endif // !wxUSE_UNICODE
 
-        gint tmp = (long) value;
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_INT );
-        g_value_set_int( &gvalue, tmp );
-        g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
-        g_value_unset( &gvalue );
-    }
-    else
-#endif
-    {
-        m_value = (long) value;
-
-        if (m_value < 0) m_value = 0;
-        if (m_value > 100) m_value = 100;
-    }
+    gint tmp = (long) value;
+    GValue gvalue = G_VALUE_INIT;
+    g_value_init( &gvalue, G_TYPE_INT );
+    g_value_set_int( &gvalue, tmp );
+    g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
+    g_value_unset( &gvalue );
 
     return true;
 }
@@ -2596,42 +2636,30 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices
                             wxDataViewCellMode mode, int alignment  ) :
     wxDataViewCustomRenderer( "string", mode, alignment, true )
 {
-   m_choices = choices;
-
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    m_choices = choices;
+    m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
+    GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
+    for (size_t n = 0; n < m_choices.GetCount(); n++)
     {
-        m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
-
-        GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
-        for (size_t n = 0; n < m_choices.GetCount(); n++)
-        {
-            gtk_list_store_insert_with_values(
-                store, NULL, n, 0,
-                static_cast<const char *>(m_choices[n].utf8_str()), -1 );
-        }
-
-        g_object_set (m_renderer,
-                "model", store,
-                "text-column", 0,
-                "has-entry", FALSE,
-                NULL);
-
-        bool editable = (mode & wxDATAVIEW_CELL_EDITABLE);
-        g_object_set (m_renderer, "editable", editable, NULL);
-
-        SetAlignment(alignment);
-
-        g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
-
-        GtkInitHandlers();
-    }
-    else
-#endif
-    {
-        // Use custom cell code
-        wxDataViewCustomRenderer::Init(mode, alignment);
+        gtk_list_store_insert_with_values(
+            store, NULL, n, 0,
+            static_cast<const char *>(m_choices[n].utf8_str()), -1 );
     }
+
+    g_object_set (m_renderer,
+            "model", store,
+            "text-column", 0,
+            "has-entry", FALSE,
+            NULL);
+
+    bool editable = (mode & wxDATAVIEW_CELL_EDITABLE) != 0;
+    g_object_set (m_renderer, "editable", editable, NULL);
+
+    SetAlignment(alignment);
+
+    g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
+
+    GtkInitHandlers();
 }
 
 bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
@@ -2647,44 +2675,26 @@ wxSize wxDataViewChoiceRenderer::GetSize() const
 
 bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
 {
-
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_STRING );
-        g_value_set_string(&gvalue,
-                           wxGTK_CONV_FONT(value.GetString(),
-                                           GetOwner()->GetOwner()->GetFont()));
-        g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
-        g_value_unset( &gvalue );
-    }
-    else
-#endif
-        m_data = value.GetString();
+    GValue gvalue = G_VALUE_INIT;
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_value_set_string(&gvalue,
+                       wxGTK_CONV_FONT(value.GetString(),
+                                       GetOwner()->GetOwner()->GetFont()));
+    g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
+    g_value_unset( &gvalue );
 
     return true;
 }
 
 bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
 {
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        GValue gvalue = { 0, };
-        g_value_init( &gvalue, G_TYPE_STRING );
-        g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
-        wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue),
-                                             GetOwner()->GetOwner()->GetFont());
-        g_value_unset( &gvalue );
-        value = temp;
-
-        //wxPrintf( "temp %s\n", temp );
-        // TODO: remove this code
-    }
-    else
-#endif
-        value = m_data;
+    GValue gvalue = G_VALUE_INIT;
+    g_value_init( &gvalue, G_TYPE_STRING );
+    g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
+    wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue),
+                                         GetOwner()->GetOwner()->GetFont());
+    g_value_unset( &gvalue );
+    value = temp;
 
     return true;
 }
@@ -2693,8 +2703,10 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
 {
     wxDataViewCustomRenderer::SetAlignment(align);
 
+#ifndef __WXGTK3__
     if (gtk_check_version(2,10,0))
         return;
+#endif
 
     // horizontal alignment:
     PangoAlignment pangoAlign = PANGO_ALIGN_LEFT;
@@ -2703,7 +2715,7 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
     else if (align & wxALIGN_CENTER_HORIZONTAL)
         pangoAlign = PANGO_ALIGN_CENTER;
 
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, gtk_cell_renderer_mode_get_type() );
     g_value_set_enum( &gvalue, pangoAlign );
     g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
@@ -2784,7 +2796,9 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
     m_value << value;
 
     SetTextValue(m_value.GetText());
-    SetPixbufProp(m_rendererIcon, m_value.GetIcon().GetPixbuf());
+
+    const wxIcon& icon = m_value.GetIcon();
+    SetPixbufProp(m_rendererIcon, icon.IsOk() ? icon.GetPixbuf() : NULL);
 
     return true;
 }
@@ -2832,7 +2846,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
         gs_lastLeftClickHeader = column;
 
         wxDataViewCtrl *dv = column->GetOwner();
-        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         if (dv->HandleWindowEvent( event ))
@@ -2842,7 +2856,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
     if (gdk_event->button == 3)
     {
         wxDataViewCtrl *dv = column->GetOwner();
-        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         if (dv->HandleWindowEvent( event ))
@@ -2883,7 +2897,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
             visible = true;
         }
 
-        GValue gvalue = { 0, };
+        GValue gvalue = G_VALUE_INIT;
         g_value_init( &gvalue, G_TYPE_BOOLEAN );
         g_value_set_boolean( &gvalue, visible );
         g_object_set_property( G_OBJECT(renderer), "visible", &gvalue );
@@ -2909,7 +2923,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
     bool enabled = wx_model->IsEnabled( item, cell->GetOwner()->GetModelColumn() );
 
     // a) this sets the appearance to disabled grey    
-    GValue gvalue = { 0, };
+    GValue gvalue = G_VALUE_INIT;
     g_value_init( &gvalue, G_TYPE_BOOLEAN );
     g_value_set_boolean( &gvalue, enabled );
     g_object_set_property( G_OBJECT(renderer), "sensitive", &gvalue );
@@ -2978,7 +2992,7 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
     SetWidth( width );
 
     // Create container for icon and label
-    GtkWidget *box = gtk_hbox_new( FALSE, 1 );
+    GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
     gtk_widget_show( box );
     // gtk_container_set_border_width((GtkContainer*)box, 2);
     m_image = gtk_image_new();
@@ -3004,9 +3018,10 @@ void wxDataViewColumn::OnInternalIdle()
     if (gtk_widget_get_realized(GetOwner()->m_treeview))
     {
         GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-        if (column->button)
+        GtkWidget* button = gtk_tree_view_column_get_button(column);
+        if (button)
         {
-            g_signal_connect(column->button, "button_press_event",
+            g_signal_connect(button, "button_press_event",
                       G_CALLBACK (gtk_dataview_header_button_press_callback), this);
 
             // otherwise the event will be blocked by GTK+
@@ -3053,20 +3068,7 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
     {
         GtkImage *gtk_image = GTK_IMAGE(m_image);
 
-        GdkBitmap *mask = NULL;
-        if (bitmap.GetMask())
-            mask = bitmap.GetMask()->GetBitmap();
-
-        if (bitmap.HasPixbuf())
-        {
-            gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image),
-                                      bitmap.GetPixbuf());
-        }
-        else
-        {
-            gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
-                                      bitmap.GetPixmap(), mask);
-        }
+        gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image), bitmap.GetPixbuf());
         gtk_widget_show( m_image );
     }
     else
@@ -3133,19 +3135,19 @@ void wxDataViewColumn::SetSortable( bool sortable )
 bool wxDataViewColumn::IsSortable() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return gtk_tree_view_column_get_clickable( column );
+    return gtk_tree_view_column_get_clickable( column ) != 0;
 }
 
 bool wxDataViewColumn::IsSortKey() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return gtk_tree_view_column_get_sort_indicator( column );
+    return gtk_tree_view_column_get_sort_indicator( column ) != 0;
 }
 
 bool wxDataViewColumn::IsResizeable() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
-    return gtk_tree_view_column_get_resizable( column );
+    return gtk_tree_view_column_get_resizable( column ) != 0;
 }
 
 bool wxDataViewColumn::IsHidden() const
@@ -3215,7 +3217,7 @@ void wxDataViewColumn::SetReorderable( bool reorderable )
 
 bool wxDataViewColumn::IsReorderable() const
 {
-    return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) );
+    return gtk_tree_view_column_get_reorderable( GTK_TREE_VIEW_COLUMN(m_column) ) != 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -3369,7 +3371,6 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataVie
     m_owner = owner;
     m_wx_model = wx_model;
 
-    m_gtk_model = NULL;
     m_root = NULL;
     m_sort_order = GTK_SORT_ASCENDING;
     m_sort_column = -1;
@@ -3495,7 +3496,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
     if ( !item )
         return FALSE;
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( m_wx_model );
@@ -3564,7 +3565,7 @@ wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
     if ( !item )
         return FALSE;
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( m_wx_model );
@@ -3589,11 +3590,12 @@ wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
     if ( !item )
         return FALSE;
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetItem( item );
     event.SetModel( m_wx_model );
     event.SetDataFormat(gtk_selection_data_get_target(selection_data));
+    event.SetDataSize(gtk_selection_data_get_length(selection_data));
     if (!m_owner->HandleWindowEvent( event ))
         return FALSE;
 
@@ -3711,7 +3713,7 @@ bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wx
 
 bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetModel( m_owner->GetModel() );
     event.SetItem( item );
@@ -3722,7 +3724,7 @@ bool wxDataViewCtrlInternal::ItemChanged( const wxDataViewItem &item )
 
 bool wxDataViewCtrlInternal::ValueChanged( const wxDataViewItem &item, unsigned int view_column )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner->GetId() );
     event.SetEventObject( m_owner );
     event.SetModel( m_owner->GetModel() );
     event.SetColumn( view_column );
@@ -4260,7 +4262,8 @@ wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wx
     if (!gtk_widget_get_realized(dv->m_widget))
         return;
 
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_SELECTION_CHANGED, dv->GetId() );
+    event.SetEventObject( dv );
     event.SetItem( dv->GetSelection() );
     event.SetModel( dv->GetModel() );
     dv->HandleWindowEvent( event );
@@ -4270,7 +4273,7 @@ static void
 wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path,
                                    GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 
     wxDataViewItem item(dv->GTKPathToItem(path));
     event.SetItem( item );
@@ -4282,7 +4285,7 @@ static gboolean
 wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
                                      GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
@@ -4296,7 +4299,7 @@ static void
 wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
                                   GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
@@ -4308,7 +4311,7 @@ static gboolean
 wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
                                        GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
@@ -4322,7 +4325,7 @@ static void
 wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
                                    GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )
 {
-    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
+    wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 
     wxDataViewItem item( (void*) iter->user_data );;
     event.SetItem( item );
@@ -4356,7 +4359,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
         wxWindow *child = node->GetData();
 
         GtkRequisition req;
-        gtk_widget_size_request( child->m_widget, &req );
+        gtk_widget_get_preferred_size(child->m_widget, NULL, &req);
 
         GtkAllocation alloc;
         alloc.x = child->m_x;
@@ -4379,14 +4382,15 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
                                      GdkEventMotion *gdk_event,
                                      wxDataViewCtrl *dv )
 {
+    int x = gdk_event->x;
+    int y = gdk_event->y;
     if (gdk_event->is_hint)
     {
-        int x = 0;
-        int y = 0;
-        GdkModifierType state;
-        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
-        gdk_event->x = x;
-        gdk_event->y = y;
+#ifdef __WXGTK3__
+        gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
+#else
+        gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
+#endif
     }
 
     wxGtkTreePath path;
@@ -4395,7 +4399,7 @@ gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),
     gint cell_y = 0;
     if (gtk_tree_view_get_path_at_pos(
         GTK_TREE_VIEW(dv->GtkGetTreeView()),
-        (int) gdk_event->x, (int) gdk_event->y,
+        x, y,
         path.ByRef(),
         &column,
         &cell_x,
@@ -4437,7 +4441,17 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
             &cell_y
         );
 
-        wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );
+        // If the right click is on an item that isn't selected, select it, as is
+        // commonly done. Do not do it if the item under mouse is already selected,
+        // because it could be a part of multi-item selection.
+        GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView()));
+        if ( !gtk_tree_selection_path_is_selected(selection, path) )
+        {
+            gtk_tree_selection_unselect_all(selection);
+            gtk_tree_selection_select_path(selection, path);
+        }
+
+        wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, dv->GetId() );
         if (path)
             event.SetItem(dv->GTKPathToItem(path));
         event.SetModel( dv->GetModel() );
@@ -4465,6 +4479,11 @@ wxDataViewCtrl::~wxDataViewCtrl()
             // This won't do anything if we're not editing it
             wxcol->GetRenderer()->CancelEditing();
         }
+
+        GTKDisconnect(m_treeview);
+        GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview));
+        if (selection)
+            GTKDisconnect(selection);
     }
 
     m_cols.Clear();
@@ -4474,6 +4493,7 @@ wxDataViewCtrl::~wxDataViewCtrl()
 
 void wxDataViewCtrl::Init()
 {
+    m_treeview = NULL;
     m_internal = NULL;
 
     m_cols.DeleteContents( true );
@@ -4509,13 +4529,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
     g_signal_connect (m_treeview, "size_allocate",
                      G_CALLBACK (gtk_dataviewctrl_size_callback), this);
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
-        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
-    }
-#endif
+    bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
+    gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
 
     if (style & wxDV_MULTIPLE)
     {
@@ -4526,7 +4541,9 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
     gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(m_treeview), (style & wxDV_NO_HEADER) == 0 );
 
 #ifdef __WXGTK210__
+#ifndef __WXGTK3__
     if (!gtk_check_version(2,10,0))
+#endif
     {
         GtkTreeViewGridLines grid = GTK_TREE_VIEW_GRID_LINES_NONE;
 
@@ -4591,6 +4608,9 @@ void wxDataViewCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
+    if ( !m_internal )
+        return;
+
     m_internal->OnInternalIdle();
 
     unsigned int cols = GetColumnCount();
@@ -4619,26 +4639,24 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel()));
-        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
-    }
-#endif
+    bool fixed = (((GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) == 0) || (model->IsVirtualListModel()));
+    gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );
 
-    m_internal = new wxDataViewCtrlInternal( this, model );
+    if ( model )
+        m_internal = new wxDataViewCtrlInternal( this, model );
 
     return true;
 }
 
 bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
 {
+    wxCHECK_MSG( m_internal, false, "model must be associated before calling EnableDragSource" );
     return m_internal->EnableDragSource( format );
 }
 
 bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
 {
+    wxCHECK_MSG( m_internal, false, "model must be associated before calling EnableDragTarget" );
     return m_internal->EnableDropTarget( format );
 }
 
@@ -4649,14 +4667,11 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
     m_cols.Append( col );
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
     {
-        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
-               GTK_TREE_VIEW_COLUMN_FIXED)
-           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
     }
-#endif
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
@@ -4671,14 +4686,11 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
 
     m_cols.Insert( col );
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
     {
-        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
-               GTK_TREE_VIEW_COLUMN_FIXED)
-           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
     }
-#endif
 
     gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
@@ -4693,14 +4705,11 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
 
     m_cols.Insert( pos, col );
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+           GTK_TREE_VIEW_COLUMN_FIXED)
     {
-        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
-               GTK_TREE_VIEW_COLUMN_FIXED)
-           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+        gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
     }
-#endif
 
     gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), pos );
@@ -4776,6 +4785,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
 
 wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
 {
+    wxCHECK_MSG( m_internal, NULL, "model must be associated before calling GetSortingColumn" );
     return m_internal->GetDataViewSortColumn();
 }
 
@@ -4789,6 +4799,8 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item )
 
 void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling Collapse" );
+
     GtkTreeIter iter;
     iter.user_data = item.GetID();
     wxGtkTreePath path(m_internal->get_path( &iter ));
@@ -4797,10 +4809,12 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
 
 bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
 {
+    wxCHECK_MSG( m_internal, false, "model must be associated before calling IsExpanded" );
+
     GtkTreeIter iter;
     iter.user_data = item.GetID();
     wxGtkTreePath path(m_internal->get_path( &iter ));
-    return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path );
+    return gtk_tree_view_row_expanded( GTK_TREE_VIEW(m_treeview), path ) != 0;
 }
 
 wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
@@ -4808,7 +4822,7 @@ wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
     // The tree doesn't have any current item if it hadn't been created yet but
     // it's arguably not an error to call this function in this case so just
     // return an invalid item without asserting.
-    if ( !m_treeview )
+    if ( !m_treeview || !m_internal )
         return wxDataViewItem();
 
     wxGtkTreePath path;
@@ -4821,6 +4835,7 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
 {
     wxCHECK_RET( m_treeview,
                  "Current item can't be set before creating the control." );
+    wxCHECK_RET( m_internal, "model must be associated before setting current item" );
 
     // We need to make sure the model knows about this item or the path would
     // be invalid and gtk_tree_view_set_cursor() would silently do nothing.
@@ -4856,7 +4871,8 @@ wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
 void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column)
 {
     wxCHECK_RET( m_treeview,
-                 "Current item can't be set before creating the control." );
+                 "item can't be edited before creating the control." );
+    wxCHECK_RET( m_internal, "model must be associated before editing an item" );
     wxCHECK_RET( item.IsOk(), "invalid item" );
     wxCHECK_RET( column, "no column provided" );
 
@@ -4889,6 +4905,8 @@ int wxDataViewCtrl::GetSelectedItemsCount() const
 
 int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 {
+    wxCHECK_MSG( m_internal, 0, "model must be associated before calling GetSelections" );
+
     sel.Clear();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
@@ -4918,6 +4936,8 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
 
 void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling SetSelections" );
+
     GtkDisableSelectionEvents();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
@@ -4949,6 +4969,8 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling Select" );
+
     ExpandAncestors(item);
 
     GtkDisableSelectionEvents();
@@ -4965,6 +4987,8 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
 
 void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling Unselect" );
+
     GtkDisableSelectionEvents();
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
@@ -4979,13 +5003,15 @@ void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
 
 bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
 {
+    wxCHECK_MSG( m_internal, false, "model must be associated before calling IsSelected" );
+
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     GtkTreeIter iter;
     iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
 
-    return gtk_tree_selection_iter_is_selected( selection, &iter );
+    return gtk_tree_selection_iter_is_selected( selection, &iter ) != 0;
 }
 
 void wxDataViewCtrl::SelectAll()
@@ -5013,6 +5039,8 @@ void wxDataViewCtrl::UnselectAll()
 void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
                                    const wxDataViewColumn *WXUNUSED(column))
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling EnsureVisible" );
+
     m_ensureVisibleDefered = item;
     ExpandAncestors(item);
 
@@ -5026,6 +5054,8 @@ void wxDataViewCtrl::HitTest(const wxPoint& point,
                              wxDataViewItem& item,
                              wxDataViewColumn *& column) const
 {
+    wxCHECK_RET( m_internal, "model must be associated before calling HitTest" );
+
     // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column.
     // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column.
     // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html
@@ -5118,13 +5148,13 @@ void wxDataViewCtrl::GtkEnableSelectionEvents()
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new());
 }
 
 void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     wxDataViewCtrlBase::DoApplyWidgetStyle(style);
-    gtk_widget_modify_style(m_treeview, style);
+    GTKApplyStyle(m_treeview, style);
 }
 
 #endif // !wxUSE_GENERICDATAVIEWCTRL
diff --git a/Externals/wxWidgets3/src/gtk/dc.cpp b/Externals/wxWidgets3/src/gtk/dc.cpp
index cc6714d27c..7640bf3c6e 100644
--- a/Externals/wxWidgets3/src/gtk/dc.cpp
+++ b/Externals/wxWidgets3/src/gtk/dc.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dc.cpp
 // Purpose:
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dc.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,350 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __WXGTK3__
+
+#include "wx/window.h"
+#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/dcscreen.h"
+#include "wx/icon.h"
+#include "wx/gtk/dc.h"
+
+#include <gtk/gtk.h>
+
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
+    : base_type(owner)
+{
+    m_width = 0;
+    m_height = 0;
+}
+
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
+    : base_type(owner, 0)
+{
+    m_width = 0;
+    m_height = 0;
+}
+
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
+    : base_type(owner, 0)
+{
+    m_window = window;
+    m_font = window->GetFont();
+    m_textForegroundColour = window->GetForegroundColour();
+    m_textBackgroundColour = window->GetBackgroundColour();
+    m_width = 0;
+    m_height = 0;
+}
+
+void wxGTKCairoDCImpl::DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask)
+{
+    wxCHECK_RET(IsOk(), "invalid DC");
+
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    if (cr)
+    {
+        cairo_save(cr);
+        bitmap.Draw(cr, x, y, useMask, &m_textForegroundColour, &m_textBackgroundColour);
+        cairo_restore(cr);
+    }
+}
+
+void wxGTKCairoDCImpl::DoDrawIcon(const wxIcon& icon, int x, int y)
+{
+    DoDrawBitmap(icon, x, y, true);
+}
+
+#if wxUSE_IMAGE
+bool wxDoFloodFill(wxDC* dc, int x, int y, const wxColour& col, wxFloodFillStyle style);
+
+bool wxGTKCairoDCImpl::DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style)
+{
+    return wxDoFloodFill(GetOwner(), x, y, col, style);
+}
+#endif
+
+wxBitmap wxGTKCairoDCImpl::DoGetAsBitmap(const wxRect* /*subrect*/) const
+{
+    wxFAIL_MSG("DoGetAsBitmap not implemented");
+    return wxBitmap();
+}
+
+bool wxGTKCairoDCImpl::DoGetPixel(int x, int y, wxColour* col) const
+{
+    if (col)
+    {
+        cairo_t* cr = NULL;
+        if (m_graphicContext)
+            cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+        if (cr)
+        {
+            cairo_surface_t* surface = cairo_get_target(cr);
+            x = LogicalToDeviceX(x);
+            y = LogicalToDeviceY(y);
+            GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(surface, x, y, 1, 1);
+            if (pixbuf)
+            {
+                const guchar* src = gdk_pixbuf_get_pixels(pixbuf);
+                col->Set(src[0], src[1], src[2]);
+                g_object_unref(pixbuf);
+                return true;
+            }
+            *col = wxColour();
+        }
+    }
+    return false;
+}
+
+void wxGTKCairoDCImpl::DoGetSize(int* width, int* height) const
+{
+    if (width)
+        *width = m_width;
+    if (height)
+        *height = m_height;
+}
+
+bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask)
+{
+    wxCHECK_MSG(IsOk(), false, "invalid DC");
+    wxCHECK_MSG(source && source->IsOk(), false, "invalid source DC");
+
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    cairo_t* cr_src = NULL;
+    wxGraphicsContext* gc_src = source->GetGraphicsContext();
+    if (gc_src)
+        cr_src = static_cast<cairo_t*>(gc_src->GetNativeContext());
+
+    if (cr == NULL || cr_src == NULL)
+        return false;
+
+    const int xsrc_dev = source->LogicalToDeviceX(xsrc);
+    const int ysrc_dev = source->LogicalToDeviceY(ysrc);
+
+    cairo_surface_t* surface = cairo_get_target(cr_src);
+    cairo_surface_flush(surface);
+    cairo_save(cr);
+    cairo_translate(cr, xdest, ydest);
+    cairo_rectangle(cr, 0, 0, dstWidth, dstHeight);
+    double sx, sy;
+    source->GetUserScale(&sx, &sy);
+    cairo_scale(cr, dstWidth / (sx * srcWidth), dstHeight / (sy * srcHeight));
+    cairo_set_source_surface(cr, surface, -xsrc_dev, -ysrc_dev);
+    const wxRasterOperationMode rop_save = m_logicalFunction;
+    SetLogicalFunction(rop);
+    cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST);
+    cairo_surface_t* maskSurf = NULL;
+    if (useMask)
+    {
+        const wxBitmap& bitmap = source->GetImpl()->GetSelectedBitmap();
+        if (bitmap.IsOk())
+        {
+            wxMask* mask = bitmap.GetMask();
+            if (mask)
+                maskSurf = *mask;
+        }
+    }
+    if (maskSurf)
+    {
+        int xsrcMask_dev = xsrc_dev;
+        int ysrcMask_dev = ysrc_dev;
+        if (xsrcMask != -1)
+            xsrcMask_dev = source->LogicalToDeviceX(xsrcMask);
+        if (ysrcMask != -1)
+            ysrcMask_dev = source->LogicalToDeviceY(ysrcMask);
+        cairo_clip(cr);
+        cairo_mask_surface(cr, maskSurf, -xsrcMask_dev, -ysrcMask_dev);
+    }
+    else
+    {
+        cairo_fill(cr);
+    }
+    cairo_restore(cr);
+    m_logicalFunction = rop_save;
+    return true;
+}
+
+void* wxGTKCairoDCImpl::GetCairoContext() const
+{
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    return cr;
+}
+//-----------------------------------------------------------------------------
+
+wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)
+    : base_type(owner, window)
+{
+    GtkWidget* widget = window->m_wxwindow;
+    if (widget == NULL)
+        widget = window->m_widget;
+    GdkWindow* gdkWindow = NULL;
+    if (widget)
+    {
+        gdkWindow = gtk_widget_get_window(widget);
+        m_ok = true;
+    }
+    if (gdkWindow)
+    {
+        cairo_t* cr = gdk_cairo_create(gdkWindow);
+        SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        int x, y;
+        if (gtk_widget_get_has_window(widget))
+        {
+            m_width = gdk_window_get_width(gdkWindow);
+            m_height = gdk_window_get_height(gdkWindow);
+            x = m_width - a.width;
+            y = m_height - a.height;
+        }
+        else
+        {
+            m_width = a.width;
+            m_height = a.height;
+            x = a.x;
+            y = a.y;
+            cairo_rectangle(cr, a.x, a.y, a.width, a.height);
+            cairo_clip(cr);
+        }
+        if (x || y)
+            SetDeviceLocalOrigin(x, y);
+    }
+    else
+        SetGraphicsContext(wxGraphicsContext::Create());
+}
+//-----------------------------------------------------------------------------
+
+wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
+    : base_type(owner, window)
+{
+    GtkWidget* widget = window->m_wxwindow;
+    if (widget == NULL)
+        widget = window->m_widget;
+    GdkWindow* gdkWindow = NULL;
+    if (widget)
+    {
+        gdkWindow = gtk_widget_get_window(widget);
+        m_ok = true;
+    }
+    if (gdkWindow)
+    {
+        cairo_t* cr = gdk_cairo_create(gdkWindow);
+        SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+        if (gtk_widget_get_has_window(widget))
+        {
+            m_width = gdk_window_get_width(gdkWindow);
+            m_height = gdk_window_get_height(gdkWindow);
+        }
+        else
+        {
+            GtkAllocation a;
+            gtk_widget_get_allocation(widget, &a);
+            m_width = a.width;
+            m_height = a.height;
+            cairo_rectangle(cr, a.x, a.y, a.width, a.height);
+            cairo_clip(cr);
+            SetDeviceLocalOrigin(a.x, a.y);
+        }
+    }
+    else
+        SetGraphicsContext(wxGraphicsContext::Create());
+}
+//-----------------------------------------------------------------------------
+
+wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
+    : base_type(owner, window)
+{
+    cairo_t* cr = window->GTKPaintContext();
+    wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event");
+    GdkWindow* gdkWindow = gtk_widget_get_window(window->m_wxwindow);
+    m_width = gdk_window_get_width(gdkWindow);
+    m_height = gdk_window_get_height(gdkWindow);
+    cairo_reference(cr);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+}
+//-----------------------------------------------------------------------------
+
+wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
+    : base_type(owner, 0)
+{
+    GdkWindow* window = gdk_get_default_root_window();
+    m_width = gdk_window_get_width(window);
+    m_height = gdk_window_get_height(window);
+    cairo_t* cr = gdk_cairo_create(window);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+}
+//-----------------------------------------------------------------------------
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
+    : base_type(owner)
+{
+    m_ok = false;
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
+    : base_type(owner, 0)
+    , m_bitmap(bitmap)
+{
+    Setup();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxDC*)
+    : base_type(owner)
+{
+    m_ok = false;
+}
+
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect* subrect) const
+{
+    return subrect ? m_bitmap.GetSubBitmap(*subrect) : m_bitmap;
+}
+
+void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap)
+{
+    m_bitmap = bitmap;
+    Setup();
+}
+
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_bitmap;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_bitmap;
+}
+
+void wxMemoryDCImpl::Setup()
+{
+    wxGraphicsContext* gc = NULL;
+    m_ok = m_bitmap.IsOk();
+    if (m_ok)
+    {
+        m_width = m_bitmap.GetWidth();
+        m_height = m_bitmap.GetHeight();
+        cairo_t* cr = m_bitmap.CairoCreate();
+        gc = wxGraphicsContext::CreateFromNative(cr);
+    }
+    SetGraphicsContext(gc);
+}
+//-----------------------------------------------------------------------------
+
+wxGTKCairoDC::wxGTKCairoDC(cairo_t* cr)
+    : base_type(new wxGTKCairoDCImpl(this, 0))
+{
+    cairo_reference(cr);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+}
+
+#else
+
 #include "wx/gtk/dc.h"
 
 //-----------------------------------------------------------------------------
@@ -60,3 +403,4 @@ wxSize wxGTKDCImpl::GetPPI() const
     // TODO (should probably be pure virtual)
     return wxSize(0, 0);
 }
+#endif
diff --git a/Externals/wxWidgets3/src/gtk/dcclient.cpp b/Externals/wxWidgets3/src/gtk/dcclient.cpp
index 3d392b9ed0..2c4a716964 100644
--- a/Externals/wxWidgets3/src/gtk/dcclient.cpp
+++ b/Externals/wxWidgets3/src/gtk/dcclient.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dcclient.cpp
 // Purpose:     wxWindowDCImpl implementation
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dcclient.cpp 70824 2012-03-06 04:51:40Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,7 @@
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/object.h"
+#include "wx/private/textmeasure.h"
 
 //-----------------------------------------------------------------------------
 // local defines
@@ -63,8 +63,6 @@ static const double RAD2DEG  = 180.0 / M_PI;
 static inline double dmax(double a, double b) { return a > b ? a : b; }
 static inline double dmin(double a, double b) { return a < b ? a : b; }
 
-static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
-
 static GdkPixmap* GetHatch(int style)
 {
     wxASSERT(style >= wxBRUSHSTYLE_FIRST_HATCH && style <= wxBRUSHSTYLE_LAST_HATCH);
@@ -379,13 +377,18 @@ void wxWindowDCImpl::SetUpDC( bool isMemDC )
             m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_SCREEN );
             m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_SCREEN );
         }
-        else if (m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap)))
+#if GTK_CHECK_VERSION(2,12,0)
+        // gdk_screen_get_rgba_colormap was added in 2.8, but this code is for
+        // compositing which requires 2.12
+        else if (gtk_check_version(2,12,0) == NULL &&
+            m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap)))
         {
             m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR_ALPHA );
             m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR_ALPHA );
             m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR_ALPHA );
             m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR_ALPHA );
         }
+#endif
         else
         {
             m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR );
@@ -691,7 +694,7 @@ void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y )
     CalcBoundingBox (x, y);
 }
 
-void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
+void wxWindowDCImpl::DoDrawLines( int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
@@ -705,29 +708,32 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo
         xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
 
     // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
-    GdkPoint* gpts = reinterpret_cast<GdkPoint*>(points);
+    const GdkPoint* gpts = reinterpret_cast<const GdkPoint*>(points);
+    GdkPoint* gpts_alloc = NULL;
 
     if (doScale)
-        gpts = new GdkPoint[n];
+    {
+        gpts_alloc = new GdkPoint[n];
+        gpts = gpts_alloc;
+    }
 
     for (int i = 0; i < n; i++)
     {
         if (doScale)
         {
-            gpts[i].x = XLOG2DEV(points[i].x + xoffset);
-            gpts[i].y = YLOG2DEV(points[i].y + yoffset);
+            gpts_alloc[i].x = XLOG2DEV(points[i].x + xoffset);
+            gpts_alloc[i].y = YLOG2DEV(points[i].y + yoffset);
         }
         CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
     }
 
     if (m_gdkwindow)
-        gdk_draw_lines( m_gdkwindow, m_penGC, gpts, n);
+        gdk_draw_lines( m_gdkwindow, m_penGC, (GdkPoint*) gpts, n);
 
-    if (doScale)
-        delete[] gpts;
+    delete[] gpts_alloc;
 }
 
-void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
+void wxWindowDCImpl::DoDrawPolygon( int n, const wxPoint points[],
                                     wxCoord xoffset, wxCoord yoffset,
                                     wxPolygonFillMode WXUNUSED(fillStyle) )
 {
@@ -740,18 +746,22 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
         xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
 
     // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
-    GdkPoint* gdkpoints = reinterpret_cast<GdkPoint*>(points);
+    const GdkPoint* gdkpoints = reinterpret_cast<const GdkPoint*>(points);
+    GdkPoint* gdkpoints_alloc = NULL;
 
     if (doScale)
-        gdkpoints = new GdkPoint[n];
+    {
+        gdkpoints_alloc = new GdkPoint[n];
+        gdkpoints = gdkpoints_alloc;
+    }
 
     int i;
     for (i = 0 ; i < n ; i++)
     {
         if (doScale)
         {
-            gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
-            gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
+            gdkpoints_alloc[i].x = XLOG2DEV(points[i].x + xoffset);
+            gdkpoints_alloc[i].y = YLOG2DEV(points[i].y + yoffset);
         }
         CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
     }
@@ -764,7 +774,7 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
             bool originChanged;
             DrawingSetup(gc, originChanged);
 
-            gdk_draw_polygon(m_gdkwindow, gc, true, gdkpoints, n);
+            gdk_draw_polygon(m_gdkwindow, gc, true, (GdkPoint*) gdkpoints, n);
 
             if (originChanged)
                 gdk_gc_set_ts_origin(gc, 0, 0);
@@ -782,13 +792,12 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
                                gdkpoints[(i+1)%n].y);
             }
 */
-            gdk_draw_polygon( m_gdkwindow, m_penGC, FALSE, gdkpoints, n );
+            gdk_draw_polygon( m_gdkwindow, m_penGC, FALSE, (GdkPoint*) gdkpoints, n );
 
         }
     }
 
-    if (doScale)
-        delete[] gdkpoints;
+    delete[] gdkpoints_alloc;
 }
 
 void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
@@ -984,7 +993,7 @@ void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
     DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
 }
 
-// scale a pixbuf, return new pixbuf, unref old one
+// scale a pixbuf
 static GdkPixbuf*
 Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy)
 {
@@ -992,20 +1001,21 @@ Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy)
         GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, dst_w, dst_h);
     gdk_pixbuf_scale(pixbuf, pixbuf_scaled,
         0, 0, dst_w, dst_h, 0, 0, sx, sy, GDK_INTERP_NEAREST);
-    g_object_unref(pixbuf);
     return pixbuf_scaled;
 }
 
-// scale part of a pixmap using pixbuf scaling, return pixbuf
+// scale part of a pixmap using pixbuf scaling
 static GdkPixbuf*
 Scale(GdkPixmap* pixmap, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy)
 {
     GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(
         NULL, pixmap, NULL, x, y, 0, 0, w, h);
-    return Scale(pixbuf, dst_w, dst_h, sx, sy);
+    GdkPixbuf* pixbuf2 = Scale(pixbuf, dst_w, dst_h, sx, sy);
+    g_object_unref(pixbuf);
+    return pixbuf2;
 }
 
-// scale part of a mask pixmap, return new mask, unref old one
+// scale part of a mask pixmap
 static GdkPixmap*
 ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy)
 {
@@ -1029,12 +1039,10 @@ ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, dou
     g_object_unref(pixbuf);
     GdkPixmap* pixmap = gdk_bitmap_create_from_data(mask, data, dst_w, dst_h);
     delete[] data;
-    g_object_unref(mask);
     return pixmap;
 }
 
 // Make a new mask from part of a mask and a clip region.
-// Return new mask, unref old one.
 static GdkPixmap*
 ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int dst_y, int w, int h)
 {
@@ -1049,7 +1057,6 @@ ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int ds
     // draw old mask onto new one, with clip
     gdk_draw_drawable(pixmap, gc, mask, x, y, 0, 0, w, h);
     g_object_unref(gc);
-    g_object_unref(mask);
     return pixmap;
 }
 
@@ -1120,18 +1127,25 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
     {
         wxMask* m = bitmap.GetMask();
         if (m)
-            mask = m->GetBitmap();
+            mask = *m;
     }
+
+    GdkPixmap* mask_new = NULL;
     if (mask)
     {
-        g_object_ref(mask);
         if (isScaled)
+        {
             mask = ScaleMask(mask, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY);
+            mask_new = mask;
+        }
         if (overlap == wxPartRegion)
         {
             // need a new mask that also masks the clipped area,
             // because gc can't have both a mask and a clip region
             mask = ClipMask(mask, clipRegion, 0, 0, xx, yy, ww, hh);
+            if (mask_new)
+                g_object_unref(mask_new);
+            mask_new = mask;
         }
         gdk_gc_set_clip_mask(use_gc, mask);
         gdk_gc_set_clip_origin(use_gc, xx, yy);
@@ -1139,24 +1153,22 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
 
     // determine whether to use pixmap or pixbuf
     GdkPixmap* pixmap = NULL;
+    GdkPixmap* pixmap_new = NULL;
     GdkPixbuf* pixbuf = NULL;
+    GdkPixbuf* pixbuf_new = NULL;
     if (bitmap.HasPixmap())
         pixmap = bitmap.GetPixmap();
     if (pixmap && gdk_drawable_get_depth(pixmap) == 1)
     {
-        // convert mono pixmap to color using text fg/bg colors
-        pixmap = MonoToColor(pixmap, 0, 0, w, h);
+        if (gdk_drawable_get_depth(m_gdkwindow) != 1)
+        {
+            // convert mono pixmap to color using text fg/bg colors
+            pixmap = MonoToColor(pixmap, 0, 0, w, h);
+            pixmap_new = pixmap;
+        }
     }
     else if (hasAlpha || pixmap == NULL)
-    {
-        pixmap = NULL;
         pixbuf = bitmap.GetPixbuf();
-        g_object_ref(pixbuf);
-    }
-    else
-    {
-        g_object_ref(pixmap);
-    }
 
     if (isScaled)
     {
@@ -1164,25 +1176,34 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
             pixbuf = Scale(pixbuf, ww, hh, m_scaleX, m_scaleY);
         else
             pixbuf = Scale(pixmap, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY);
+
+        pixbuf_new = pixbuf;
     }
 
     if (pixbuf)
     {
         gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf,
             0, 0, xx, yy, ww, hh, GDK_RGB_DITHER_NORMAL, 0, 0);
-        g_object_unref(pixbuf);
     }
     else
     {
         gdk_draw_drawable(m_gdkwindow, use_gc, pixmap, 0, 0, xx, yy, ww, hh);
     }
 
-    if (pixmap)
-        g_object_unref(pixmap);
+    if (pixbuf_new)
+        g_object_unref(pixbuf_new);
+    if (pixmap_new)
+        g_object_unref(pixmap_new);
     if (mask)
     {
-        g_object_unref(mask);
         gdk_gc_set_clip_region(use_gc, clipRegion);
+
+        // Notice that we can only release the mask now, we can't do it before
+        // the calls to gdk_draw_xxx() above as they crash with X error with
+        // GTK+ up to 2.20.1 (i.e. it works with 2.20 but is known to not work
+        // with 2.16.1 and below).
+        if (mask_new)
+            g_object_unref(mask_new);
     }
 }
 
@@ -1212,7 +1233,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
         {
             wxMask* m = bitmap.GetMask();
             if (m)
-                mask = m->GetBitmap();
+                mask = *m;
         }
     }
     else
@@ -1292,7 +1313,6 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
 
     if (mask)
     {
-        g_object_ref(mask);
         int srcMask_x = src_x;
         int srcMask_y = src_y;
         if (xsrcMask != -1 || ysrcMask != -1)
@@ -1300,10 +1320,12 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
             srcMask_x = source->LogicalToDeviceX(xsrcMask);
             srcMask_y = source->LogicalToDeviceY(ysrcMask);
         }
+        GdkPixmap* mask_new = NULL;
         if (isScaled)
         {
             mask = ScaleMask(mask, srcMask_x, srcMask_y,
                 src_w, src_h, dst_w, dst_h, scale_x, scale_y);
+            mask_new = mask;
             srcMask_x = 0;
             srcMask_y = 0;
         }
@@ -1313,15 +1335,21 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
             // because gc can't have both a mask and a clip region
             mask = ClipMask(mask, clipRegion,
                 srcMask_x, srcMask_y, dst_x, dst_y, dst_w, dst_h);
+            if (mask_new)
+                g_object_unref(mask_new);
+            mask_new = mask;
             srcMask_x = 0;
             srcMask_y = 0;
         }
         gdk_gc_set_clip_mask(use_gc, mask);
         gdk_gc_set_clip_origin(use_gc, dst_x - srcMask_x, dst_y - srcMask_y);
+        if (mask_new)
+            g_object_unref(mask_new);
     }
 
     GdkPixmap* pixmap = NULL;
-    if (gdk_drawable_get_depth(srcDrawable) == 1)
+    if (gdk_drawable_get_depth(srcDrawable) == 1 &&
+        (gdk_drawable_get_depth(m_gdkwindow) != 1 || isScaled))
     {
         // Convert mono pixmap to color using text fg/bg colors.
         // Scaling/drawing is simpler if this is done first.
@@ -1357,10 +1385,8 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
     if (pixmap)
         g_object_unref(pixmap);
     if (mask)
-    {
-        g_object_unref(mask);
         gdk_gc_set_clip_region(use_gc, clipRegion);
-    }
+
     return true;
 }
 
@@ -1368,133 +1394,57 @@ void wxWindowDCImpl::DoDrawText(const wxString& text,
                                 wxCoord xLogical,
                                 wxCoord yLogical)
 {
-    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
-
-    if (!m_gdkwindow) return;
-
-    if (text.empty()) return;
-
-    wxCoord x = XLOG2DEV(xLogical),
-            y = YLOG2DEV(yLogical);
-
-    wxCHECK_RET( m_context, wxT("no Pango context") );
-    wxCHECK_RET( m_layout, wxT("no Pango layout") );
-    wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
-
-    gdk_pango_context_set_colormap( m_context, m_cmap );  // not needed in gtk+ >= 2.6
-
-    wxCharBuffer data = wxGTK_CONV(text);
-    if ( !data )
-        return;
-
-    pango_layout_set_text(m_layout, data, data.length());
-    const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
-
-    int oldSize = 0;
-    const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001;
-    if (isScaled)
-    {
-        // If there is a user or actually any scale applied to
-        // the device context, scale the font.
-
-        // scale font description
-        oldSize = pango_font_description_get_size(m_fontdesc);
-        pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY));
-
-        // actually apply scaled font
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-
-    int w, h;
-    pango_layout_get_pixel_size(m_layout, &w, &h);
-
-    // Draw layout.
-    int x_rtl = x;
-    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-        x_rtl -= w;
-
-    const GdkColor* bg_col = NULL;
-    if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
-        bg_col = m_textBackgroundColour.GetColor();
-
-    gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x_rtl, y, m_layout, NULL, bg_col);
-
-    if (isScaled)
-    {
-         // reset unscaled size
-         pango_font_description_set_size( m_fontdesc, oldSize );
-
-         // actually apply unscaled font
-         pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-    if (setAttrs)
-    {
-        // undo underline attributes setting:
-        pango_layout_set_attributes(m_layout, NULL);
-    }
-
-    CalcBoundingBox(xLogical + int(w / m_scaleX), yLogical + int(h / m_scaleY));
-    CalcBoundingBox(xLogical, yLogical);
+    DoDrawRotatedText(text, xLogical, yLogical, 0);
 }
 
-// TODO: When GTK2.6 is required, merge DoDrawText and DoDrawRotatedText to
-// avoid code duplication
-void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
+void wxWindowDCImpl::DoDrawRotatedText(const wxString& text, int xLogical, int yLogical, double angle)
 {
     if (!m_gdkwindow || text.empty())
         return;
 
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    pango_layout_set_text(m_layout, wxGTK_CONV(text), -1);
+    const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
+
+    const GdkColor* bg_col = NULL;
+    if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
+        bg_col = m_textBackgroundColour.GetColor();
+
+    PangoMatrix matrix = PANGO_MATRIX_INIT;
+    if (!wxIsSameDouble(m_scaleX, 1) || !wxIsSameDouble(m_scaleY, 1) || !wxIsNullDouble(angle))
     {
-        x = XLOG2DEV(x);
-        y = YLOG2DEV(y);
+        pango_matrix_scale(&matrix, m_scaleX, m_scaleY);
+        pango_matrix_rotate(&matrix, angle);
+        pango_context_set_matrix(m_context, &matrix);
+        pango_layout_context_changed(m_layout);
+    }
 
-        pango_layout_set_text(m_layout, wxGTK_CONV(text), -1);
-        const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
-        int oldSize = 0;
-        const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001;
-        if (isScaled)
-        {
-            //TODO: when Pango >= 1.6 is required, use pango_matrix_scale()
-             // If there is a user or actually any scale applied to
-             // the device context, scale the font.
+    int w, h;
+    pango_layout_get_pixel_size(m_layout, &w, &h);
 
-             // scale font description
-            oldSize = pango_font_description_get_size(m_fontdesc);
-            pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY));
-
-             // actually apply scaled font
-             pango_layout_set_font_description( m_layout, m_fontdesc );
-        }
-
-        int w, h;
-        pango_layout_get_pixel_size(m_layout, &w, &h);
-
-        const GdkColor* bg_col = NULL;
-        if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
-            bg_col = m_textBackgroundColour.GetColor();
-
-        // rotate the text
-        PangoMatrix matrix = PANGO_MATRIX_INIT;
-        pango_matrix_rotate (&matrix, angle);
-        pango_context_set_matrix (m_context, &matrix);
-        pango_layout_context_changed (m_layout);
+    int x = LogicalToDeviceX(xLogical);
+    int y = LogicalToDeviceY(yLogical);
+    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+        x -= LogicalToDeviceXRel(w);
 
+    if (wxIsNullDouble(angle))
+    {
+        CalcBoundingBox(xLogical, yLogical);
+        CalcBoundingBox(xLogical + w, yLogical + h);
+    }
+    else
+    {
         // To be compatible with MSW, the rotation axis must be in the old
         // top-left corner.
         // Calculate the vertices of the rotated rectangle containing the text,
         // relative to the old top-left vertex.
-        // We could use the matrix for this, but it's simpler with trignonometry.
-        double rad = DegToRad(angle);
         // the rectangle vertices are counted clockwise with the first one
         // being at (0, 0)
-        double x2 = w * cos(rad);
-        double y2 = -w * sin(rad);   // y axis points to the bottom, hence minus
-        double x4 = h * sin(rad);
-        double y4 = h * cos(rad);
+        double x2 = w * matrix.xx;
+        double y2 = w * matrix.yx;
+        double x4 = h * matrix.xy;
+        double y4 = h * matrix.yy;
         double x3 = x4 + x2;
         double y3 = y4 + y2;
         // Then we calculate max and min of the rotated rectangle.
@@ -1502,132 +1452,17 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord
                 maxY = (wxCoord)(dmax(dmax(0, y2), dmax(y3, y4)) + 0.5),
                 minX = (wxCoord)(dmin(dmin(0, x2), dmin(x3, x4)) - 0.5),
                 minY = (wxCoord)(dmin(dmin(0, y2), dmin(y3, y4)) - 0.5);
-
-        gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x+minX, y+minY,
-                                    m_layout, NULL, bg_col);
-
-        if (setAttrs)
-            pango_layout_set_attributes(m_layout, NULL);
-
-        // clean up the transformation matrix
-        pango_context_set_matrix(m_context, NULL);
-
-        if (isScaled)
-        {
-             // reset unscaled size
-             pango_font_description_set_size( m_fontdesc, oldSize );
-
-             // actually apply unscaled font
-             pango_layout_set_font_description( m_layout, m_fontdesc );
-        }
-
-        CalcBoundingBox(x+minX, y+minY);
-        CalcBoundingBox(x+maxX, y+maxY);
-    }
-    else
-#endif //__WXGTK26__
-    {
-#if wxUSE_IMAGE
-    if ( wxIsNullDouble(angle) )
-    {
-        DoDrawText(text, x, y);
-        return;
+        x += minX;
+        y += minY;
+        CalcBoundingBox(DeviceToLogicalX(x), DeviceToLogicalY(y));
+        CalcBoundingBox(DeviceToLogicalX(x + maxX - minX), DeviceToLogicalY(y + maxY - minY));
     }
 
-    wxCoord w;
-    wxCoord h;
+    gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x, y, m_layout, NULL, bg_col);
 
-    // TODO: implement later without GdkFont for GTK 2.0
-    DoGetTextExtent(text, &w, &h, NULL,NULL, &m_font);
-
-    // draw the string normally
-    wxBitmap src(w, h);
-    wxMemoryDC dc;
-    dc.SelectObject(src);
-    dc.SetFont(GetFont());
-    dc.SetBackground(*wxBLACK_BRUSH);
-    dc.SetBrush(*wxBLACK_BRUSH);
-    dc.Clear();
-    dc.SetTextForeground( *wxWHITE );
-    dc.DrawText(text, 0, 0);
-    dc.SelectObject(wxNullBitmap);
-
-    // Calculate the size of the rotated bounding box.
-    double rad = DegToRad(angle);
-    double dx = cos(rad),
-           dy = sin(rad);
-
-    // the rectngle vertices are counted clockwise with the first one being at
-    // (0, 0) (or, rather, at (x, y))
-    double x2 = w*dx,
-           y2 = -w*dy;      // y axis points to the bottom, hence minus
-    double x4 = h*dy,
-           y4 = h*dx;
-    double x3 = x4 + x2,
-           y3 = y4 + y2;
-
-    // calc max and min
-    wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5),
-            maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5),
-            minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5),
-            minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
-
-
-    wxImage image = src.ConvertToImage();
-
-    image.ConvertColourToAlpha( m_textForegroundColour.Red(),
-                                m_textForegroundColour.Green(),
-                                m_textForegroundColour.Blue() );
-    image = image.Rotate( rad, wxPoint(0,0) );
-
-    int i_angle = (int) angle;
-    i_angle = i_angle % 360;
-    if (i_angle < 0)
-        i_angle += 360;
-    int xoffset = 0;
-    if ((i_angle >= 90.0) && (i_angle < 270.0))
-        xoffset = image.GetWidth();
-    int yoffset = 0;
-    if ((i_angle >= 0.0) && (i_angle < 180.0))
-        yoffset = image.GetHeight();
-
-    if ((i_angle >= 0) && (i_angle < 90))
-        yoffset -= (int)( cos(rad)*h );
-    if ((i_angle >= 90) && (i_angle < 180))
-        xoffset -= (int)( sin(rad)*h );
-    if ((i_angle >= 180) && (i_angle < 270))
-        yoffset -= (int)( cos(rad)*h );
-    if ((i_angle >= 270) && (i_angle < 360))
-        xoffset -= (int)( sin(rad)*h );
-
-    int i_x = x - xoffset;
-    int i_y = y - yoffset;
-
-    src = image;
-    DoDrawBitmap( src, i_x, i_y, true );
-
-
-    // it would be better to draw with non underlined font and draw the line
-    // manually here (it would be more straight...)
-#if 0
-    if ( m_font.GetUnderlined() )
-    {
-        gdk_draw_line( m_gdkwindow, m_textGC,
-                       XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent),
-                       XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent));
-    }
-#endif // 0
-
-    // update the bounding box
-    CalcBoundingBox(x + minX, y + minY);
-    CalcBoundingBox(x + maxX, y + maxY);
-#else // !wxUSE_IMAGE
-    wxUnusedVar(text);
-    wxUnusedVar(x);
-    wxUnusedVar(y);
-    wxUnusedVar(angle);
-#endif // wxUSE_IMAGE/!wxUSE_IMAGE
-    }
+    pango_context_set_matrix(m_context, NULL);
+    if (setAttrs)
+        pango_layout_set_attributes(m_layout, NULL);
 }
 
 void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
@@ -1635,100 +1470,27 @@ void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
                                  wxCoord *descent, wxCoord *externalLeading,
                                  const wxFont *theFont) const
 {
-    if ( width )
-        *width = 0;
-    if ( height )
-        *height = 0;
-    if ( descent )
-        *descent = 0;
-    if ( externalLeading )
-        *externalLeading = 0;
-
-    if (string.empty())
-        return;
-
-    // ensure that theFont is always non-NULL
+    // ensure we work with a valid font
+    const wxFont *fontToUse;
     if ( !theFont || !theFont->IsOk() )
-        theFont = &m_font;
+        fontToUse = &m_font;
+    else
+        fontToUse = theFont;
 
-    // and use it if it's valid
-    if ( theFont->IsOk() )
-    {
-        pango_layout_set_font_description
-        (
-            m_layout,
-            theFont->GetNativeFontInfo()->description
-        );
-    }
+    wxCHECK_RET( fontToUse->IsOk(), wxT("invalid font") );
 
-    // Set layout's text
-    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, *theFont);
-    if ( !dataUTF8 )
-    {
-        // hardly ideal, but what else can we do if conversion failed?
-        return;
-    }
-
-    pango_layout_set_text(m_layout, dataUTF8, -1);
-
-    int h;
-    pango_layout_get_pixel_size(m_layout, width, &h);
-    if (descent)
-    {
-        PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
-        int baseline = pango_layout_iter_get_baseline(iter);
-        pango_layout_iter_free(iter);
-        *descent = h - PANGO_PIXELS(baseline);
-    }
-    if (height)
-        *height = h;
-
-    // Reset old font description
-    if (theFont->IsOk())
-        pango_layout_set_font_description( m_layout, m_fontdesc );
+    wxTextMeasure txm(GetOwner(), fontToUse);
+    txm.GetTextExtent(string, width, height, descent, externalLeading);
 }
 
 
 bool wxWindowDCImpl::DoGetPartialTextExtents(const wxString& text,
                                          wxArrayInt& widths) const
 {
-    const size_t len = text.length();
-    widths.Empty();
-    widths.Add(0, len);
+    wxCHECK_MSG( m_font.IsOk(), false, wxT("Invalid font") );
 
-    if (text.empty())
-        return true;
-
-    // Set layout's text
-    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, m_font);
-    if ( !dataUTF8 )
-    {
-        // hardly ideal, but what else can we do if conversion failed?
-        wxLogLastError(wxT("DoGetPartialTextExtents"));
-        return false;
-    }
-
-    pango_layout_set_text(m_layout, dataUTF8, -1);
-
-    // Calculate the position of each character based on the widths of
-    // the previous characters
-
-    // Code borrowed from Scintilla's PlatGTK
-    PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
-    PangoRectangle pos;
-    pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
-    size_t i = 0;
-    while (pango_layout_iter_next_cluster(iter))
-    {
-        pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
-        int position = PANGO_PIXELS(pos.x);
-        widths[i++] = position;
-    }
-    while (i < len)
-        widths[i++] = PANGO_PIXELS(pos.x + pos.width);
-    pango_layout_iter_free(iter);
-
-    return true;
+    wxTextMeasure txm(GetOwner(), &m_font);
+    return txm.GetPartialTextExtents(text, widths, m_scaleX);
 }
 
 
@@ -1956,7 +1718,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
     if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
     {
         gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
-        gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
+        gdk_gc_set_stipple( m_textGC, *m_brush.GetStipple()->GetMask() );
     }
 
     if (m_brush.IsHatch())
@@ -2227,7 +1989,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin()
 
     wxDCImpl::ComputeScaleAndOrigin();
 
-    // if scale has changed call SetPen to recalulate the line width
+    // if scale has changed call SetPen to recalculate the line width
     if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
     {
         // this is a bit artificial, but we need to force wxDC to think the pen
@@ -2278,7 +2040,7 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") );
 
-    m_window->GetClientSize( width, height );
+    m_window->GetClientSize(width, height);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/gtk/dcmemory.cpp b/Externals/wxWidgets3/src/gtk/dcmemory.cpp
index 08071cafbd..05009c9e59 100644
--- a/Externals/wxWidgets3/src/gtk/dcmemory.cpp
+++ b/Externals/wxWidgets3/src/gtk/dcmemory.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling
-// RCS-ID:      $Id: dcmemory.cpp 70809 2012-03-04 23:50:35Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -164,3 +163,8 @@ wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
     return m_selected;
 }
 
+void* wxMemoryDCImpl::GetHandle() const
+{
+    const wxBitmap& bmp = GetSelectedBitmap();
+    return bmp.GetPixmap();
+}
diff --git a/Externals/wxWidgets3/src/gtk/dcscreen.cpp b/Externals/wxWidgets3/src/gtk/dcscreen.cpp
index c4b015deb0..3e6dc777f9 100644
--- a/Externals/wxWidgets3/src/gtk/dcscreen.cpp
+++ b/Externals/wxWidgets3/src/gtk/dcscreen.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dcscreen.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: dcscreen.cpp 70809 2012-03-04 23:50:35Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/descrip.mms b/Externals/wxWidgets3/src/gtk/descrip.mms
index 207ed4f17d..f6f7ae09f7 100644
--- a/Externals/wxWidgets3/src/gtk/descrip.mms
+++ b/Externals/wxWidgets3/src/gtk/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 January 2012                                                     *
+# Date : 6 November 2012                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -100,7 +100,7 @@ OBJECTS0= \
 	msgdlg.obj,\
 	treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\
 	mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj,anybutton.obj,\
-	nonownedwnd.obj
+	nonownedwnd.obj,textmeasure.obj
 
 SOURCES =\
 	animate.cpp,\
@@ -167,7 +167,7 @@ SOURCES =\
 	window.cpp,\
 	treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\
 	mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp,anybutton.cpp,\
-	nonownedwnd.cpp
+	nonownedwnd.cpp,textmeasure.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -265,3 +265,4 @@ assertdlg_gtk.obj : assertdlg_gtk.cpp
 infobar.obj : infobar.cpp
 anybutton.obj : anybutton.cpp
 nonownedwnd.obj : nonownedwnd.cpp
+textmeasure.obj : textmeasure.cpp
diff --git a/Externals/wxWidgets3/src/gtk/dialog.cpp b/Externals/wxWidgets3/src/gtk/dialog.cpp
index f4f2755477..98f08d7d6f 100644
--- a/Externals/wxWidgets3/src/gtk/dialog.cpp
+++ b/Externals/wxWidgets3/src/gtk/dialog.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: dialog.cpp 66559 2011-01-04 09:20:10Z SC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,11 +18,11 @@
 #include "wx/evtloop.h"
 
 #include "wx/scopedptr.h"
+#include "wx/modalhook.h"
 
 #include <gtk/gtk.h>
-
-// this is defined in src/gtk/toplevel.cpp
-extern int wxOpenModalDialogsCount;
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/dialogcount.h"
 
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 
@@ -35,9 +34,7 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 void wxDialog::Init()
 {
     m_modalLoop = NULL;
-    m_returnCode = 0;
     m_modalShowing = false;
-    m_themeEnabled = true;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -93,13 +90,48 @@ bool wxDialog::IsModal() const
     return m_modalShowing;
 }
 
-void wxDialog::SetModal( bool WXUNUSED(flag) )
+// Workaround for Ubuntu overlay scrollbar, which adds our GtkWindow to a
+// private window group in a GtkScrollbar realize handler. This breaks the grab
+// done by gtk_window_set_modal(), and allows menus and toolbars in the parent
+// frame to remain active. So, we install an emission hook on the "realize"
+// signal while showing a modal dialog. For any realize on a GtkScrollbar,
+// we check the top level parent to see if it has an explicitly set window
+// group that is not the same as its transient parent. If we find this, we
+// put the top level back in the same window group as its transient parent, and
+// re-add the grab.
+// Ubuntu 12.04 and 12.10 are known to have this problem.
+
+// need 2.10 for gtk_window_get_group()
+#if GTK_CHECK_VERSION(2,10,0)
+extern "C" {
+static gboolean
+realize_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void*)
 {
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
+    void* p = g_value_peek_pointer(param_values);
+    if (GTK_IS_SCROLLBAR(p))
+    {
+        GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(p)));
+        GtkWindow* transient_parent = gtk_window_get_transient_for(toplevel);
+        if (transient_parent && gtk_window_has_group(toplevel))
+        {
+            GtkWindowGroup* group = gtk_window_get_group(toplevel);
+            GtkWindowGroup* group_parent = gtk_window_get_group(transient_parent);
+            if (group != group_parent)
+            {
+                gtk_window_group_add_window(group_parent, toplevel);
+                gtk_grab_add(GTK_WIDGET(toplevel));
+            }
+        }
+    }
+    return true;
 }
+}
+#endif // GTK 2.10
 
 int wxDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );
 
     // release the mouse if it's currently captured as the window having it
@@ -118,11 +150,24 @@ int wxDialog::ShowModal()
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
 
+#if GTK_CHECK_VERSION(2,10,0)
+    unsigned sigId = 0;
+    gulong hookId = 0;
+#ifndef __WXGTK3__
+    // Ubuntu overlay scrollbar uses at least GTK 2.24
+    if (gtk_check_version(2,24,0) == NULL)
+#endif
+    {
+        sigId = g_signal_lookup("realize", GTK_TYPE_WIDGET);
+        hookId = g_signal_add_emission_hook(sigId, 0, realize_hook, NULL, NULL);
+    }
+#endif
+
     Show( true );
 
     m_modalShowing = true;
 
-    wxOpenModalDialogsCount++;
+    wxOpenModalDialogLocker modalLock;
 
     // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
     gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
@@ -133,9 +178,12 @@ int wxDialog::ShowModal()
         m_modalLoop->Run();
     }
 
-    gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
+#if GTK_CHECK_VERSION(2,10,0)
+    if (sigId)
+        g_signal_remove_emission_hook(sigId, hookId);
+#endif
 
-    wxOpenModalDialogsCount--;
+    gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 
     return GetReturnCode();
 }
diff --git a/Externals/wxWidgets3/src/gtk/dirdlg.cpp b/Externals/wxWidgets3/src/gtk/dirdlg.cpp
index 26d793be6d..e42d66da42 100644
--- a/Externals/wxWidgets3/src/gtk/dirdlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/dirdlg.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dirdlg.cpp
 // Purpose:     native implementation of wxDirDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi
-// Id:          $Id: dirdlg.cpp 70898 2012-03-14 12:32:27Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,53 +30,15 @@
 
 #include "wx/gtk/private.h"
 
-#ifdef __UNIX__
-#include <unistd.h> // chdir
-#endif
-
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
 extern "C" {
-static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
-{
-    // change to the directory where the user went if asked
-    if (dialog->HasFlag(wxDD_CHANGE_DIR))
-    {
-        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
-        chdir(filename);
-    }
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
-                                           wxDirDialog *dialog)
-{
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-}
-
-extern "C" {
-static void gtk_dirdialog_response_callback(GtkWidget *w,
+static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w),
                                              gint response,
                                              wxDirDialog *dialog)
 {
     if (response == GTK_RESPONSE_ACCEPT)
-        gtk_dirdialog_ok_callback(w, dialog);
+        dialog->GTKOnAccept();
     else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
-        gtk_dirdialog_cancel_callback(w, dialog);
+        dialog->GTKOnCancel();
 }
 }
 
@@ -87,10 +48,6 @@ static void gtk_dirdialog_response_callback(GtkWidget *w,
 
 IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
 
-BEGIN_EVENT_TABLE(wxDirDialog, wxDirDialogBase)
-    EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)
-END_EVENT_TABLE()
-
 wxDirDialog::wxDirDialog(wxWindow* parent,
                          const wxString& title,
                          const wxString& defaultPath,
@@ -140,7 +97,7 @@ bool wxDirDialog::Create(wxWindow* parent,
     // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
     // the dialog when the user press ESC on the dialog: in that case a second call to
     // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
-    g_signal_connect (G_OBJECT(m_widget),
+    g_signal_connect (m_widget,
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     (gpointer)this);
@@ -156,16 +113,30 @@ bool wxDirDialog::Create(wxWindow* parent,
         G_CALLBACK (gtk_dirdialog_response_callback), this);
 
     if ( !defaultPath.empty() )
-        gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
-                defaultPath.fn_str() );
+        SetPath(defaultPath);
+
     return true;
 }
 
-void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+void wxDirDialog::GTKOnAccept()
 {
+    wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+    m_selectedDirectory = wxString::FromUTF8(str);
+
+    // change to the directory where the user went if asked
+    if (HasFlag(wxDD_CHANGE_DIR))
+    {
+        wxSetWorkingDirectory(m_selectedDirectory);
+    }
+
     EndDialog(wxID_OK);
 }
 
+void wxDirDialog::GTKOnCancel()
+{
+    EndDialog(wxID_CANCEL);
+}
+
 void wxDirDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     if (!m_wxwindow)
@@ -179,14 +150,13 @@ void wxDirDialog::SetPath(const wxString& dir)
     if (wxDirExists(dir))
     {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-                                            dir.fn_str());
+                                            wxGTK_CONV_FN(dir));
     }
 }
 
 wxString wxDirDialog::GetPath() const
 {
-    wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
-    return wxString::FromUTF8(str);
+    return m_selectedDirectory;
 }
 
 #endif // wxUSE_DIRDLG
diff --git a/Externals/wxWidgets3/src/gtk/dnd.cpp b/Externals/wxWidgets3/src/gtk/dnd.cpp
index 40373313b2..ddcf5cd0d1 100644
--- a/Externals/wxWidgets3/src/gtk/dnd.cpp
+++ b/Externals/wxWidgets3/src/gtk/dnd.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dnd.cpp
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
-// Id:          $Id: dnd.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -240,8 +239,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
         result_action = GDK_ACTION_MOVE;
 
     // is result action actually supported
-    bool ret ((result_action != GDK_ACTION_DEFAULT) &&
-              (context->actions & result_action));
+    bool ret = (result_action != GDK_ACTION_DEFAULT) &&
+               (gdk_drag_context_get_actions(context) & result_action);
 
     if (ret)
         gdk_drag_status( context, result_action, time );
@@ -379,7 +378,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
        this is only valid for the duration of this call */
     drop_target->GTKSetDragData( data );
 
-    wxDragResult result = ConvertFromGTK(context->action);
+    wxDragResult result = ConvertFromGTK(gdk_drag_context_get_selected_action(context));
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
@@ -443,11 +442,12 @@ wxDragResult wxDropTarget::GTKFigureOutSuggestedAction()
     // only good if we don't have our own preferences - but also the actions
     // field
     wxDragResult suggested_action = wxDragNone;
+    const GdkDragAction actions = gdk_drag_context_get_actions(m_dragContext);
     if (GetDefaultAction() == wxDragNone)
     {
         // use default action set by wxDropSource::DoDragDrop()
         if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
-            (m_dragContext->actions & GDK_ACTION_MOVE ) )
+            (actions & GDK_ACTION_MOVE))
         {
             // move is requested by the program and allowed by GTK+ - do it, even
             // though suggested_action may be currently wxDragCopy
@@ -455,7 +455,7 @@ wxDragResult wxDropTarget::GTKFigureOutSuggestedAction()
         }
         else // use whatever GTK+ says we should
         {
-            suggested_action = ConvertFromGTK(m_dragContext->suggested_action);
+            suggested_action = ConvertFromGTK(gdk_drag_context_get_suggested_action(m_dragContext));
 
 #if 0
             // RR: I don't understand the code below: if the drag comes from
@@ -472,18 +472,18 @@ wxDragResult wxDropTarget::GTKFigureOutSuggestedAction()
         }
     }
     else if (GetDefaultAction() == wxDragMove &&
-            (m_dragContext->actions & GDK_ACTION_MOVE))
+            (actions & GDK_ACTION_MOVE))
     {
 
         suggested_action = wxDragMove;
     }
     else
     {
-        if (m_dragContext->actions & GDK_ACTION_COPY)
+        if (actions & GDK_ACTION_COPY)
             suggested_action = wxDragCopy;
-        else if (m_dragContext->actions & GDK_ACTION_MOVE)
+        else if (actions & GDK_ACTION_MOVE)
             suggested_action = wxDragMove;
-        else if (m_dragContext->actions & GDK_ACTION_LINK)
+        else if (actions & GDK_ACTION_LINK)
             suggested_action = wxDragLink;
         else
             suggested_action = wxDragNone;
@@ -505,7 +505,7 @@ GdkAtom wxDropTarget::GTKGetMatchingPair(bool quiet)
     if (!m_dragContext)
         return (GdkAtom) 0;
 
-    GList *child = m_dragContext->targets;
+    const GList* child = gdk_drag_context_list_targets(m_dragContext);
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom)(child->data);
@@ -647,7 +647,7 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
         return;
     }
 
-    drop_source->m_retValue = ConvertFromGTK( context->action );
+    drop_source->m_retValue = ConvertFromGTK(gdk_drag_context_get_selected_action(context));
 
     gtk_selection_data_set( selection_data,
                             gtk_selection_data_get_target(selection_data),
@@ -680,7 +680,7 @@ extern "C" {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
-    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
+    source->GiveFeedback(ConvertFromGTK(gdk_drag_context_get_selected_action(source->m_dragContext)));
 
     return 0;
 }
@@ -760,36 +760,56 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     else
         icon = &m_iconNone;
 
+#ifndef __WXGTK3__
     GdkBitmap *mask;
     if ( icon->GetMask() )
-        mask = icon->GetMask()->GetBitmap();
+        mask = *icon->GetMask();
     else
         mask = NULL;
 
     GdkPixmap *pixmap = icon->GetPixmap();
 
-    gint width,height;
-    gdk_drawable_get_size (pixmap, &width, &height);
-
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gtk_widget_push_colormap (colormap);
+#endif
 
     m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
     gtk_widget_set_app_paintable (m_iconWindow, TRUE);
 
+#ifdef __WXGTK3__
+    gtk_widget_set_visual(m_iconWindow, gtk_widget_get_visual(m_widget));
+#else
     gtk_widget_pop_colormap ();
+#endif
 
-    gtk_widget_set_size_request (m_iconWindow, width, height);
+    gtk_widget_set_size_request (m_iconWindow, icon->GetWidth(), icon->GetHeight());
     gtk_widget_realize (m_iconWindow);
 
     g_signal_connect (m_iconWindow, "configure_event",
                       G_CALLBACK (gtk_dnd_window_configure_callback), this);
 
+#ifdef __WXGTK3__
+    cairo_t* cr = gdk_cairo_create(gtk_widget_get_window(m_iconWindow));
+    icon->SetSourceSurface(cr, 0, 0);
+    cairo_pattern_t* pattern = cairo_get_source(cr);
+    gdk_window_set_background_pattern(gtk_widget_get_window(m_iconWindow), pattern);
+    cairo_destroy(cr);
+    cairo_surface_t* mask = NULL;
+    if (icon->GetMask())
+        mask = *icon->GetMask();
+    if (mask)
+    {
+        cairo_region_t* region = gdk_cairo_region_create_from_surface(mask);
+        gtk_widget_shape_combine_region(m_iconWindow, region);
+        cairo_region_destroy(region);
+    }
+#else
     gdk_window_set_back_pixmap(gtk_widget_get_window(m_iconWindow), pixmap, false);
 
     if (mask)
         gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
+#endif
 
     gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
 }
diff --git a/Externals/wxWidgets3/src/gtk/evtloop.cpp b/Externals/wxWidgets3/src/gtk/evtloop.cpp
index 0b310d8607..59d0e31c18 100644
--- a/Externals/wxWidgets3/src/gtk/evtloop.cpp
+++ b/Externals/wxWidgets3/src/gtk/evtloop.cpp
@@ -2,10 +2,9 @@
 // Name:        src/gtk/evtloop.cpp
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
-// Modified by:
 // Created:     10.07.01
-// RCS-ID:      $Id: evtloop.cpp 66090 2010-11-10 13:52:17Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+//              (c) 2013 Rob Bresalier, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -32,6 +31,9 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
+#include "wx/private/eventloopsourcesmanager.h"
+#include "wx/apptrait.h"
+
 #include <gtk/gtk.h>
 #include <glib.h>
 
@@ -50,26 +52,43 @@ wxGUIEventLoop::wxGUIEventLoop()
     m_exitcode = 0;
 }
 
-int wxGUIEventLoop::Run()
+int wxGUIEventLoop::DoRun()
 {
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, "can't reenter a message loop" );
+    guint loopLevel = gtk_main_level();
 
-    wxEventLoopActivator activate(this);
+    // This is placed inside of a loop to take into account nested
+    // event loops.  For example, inside this event loop, we may receive
+    // Exit() for a different event loop (which we are currently inside of)
+    // That Exit() will cause this gtk_main() to exit so we need to re-enter it.
+    while ( !m_shouldExit )
+    {
+        gtk_main();
+    }
 
-    gtk_main();
+    // Force the enclosing event loop to also exit to see if it is done in case
+    // that event loop had Exit() called inside of the just ended loop. If it
+    // is not time yet for that event loop to exit, it will be executed again
+    // due to the while() loop on m_shouldExit().
+    //
+    // This is unnecessary if we are the top level loop, i.e. loop of level 0.
+    if ( loopLevel )
+    {
+        gtk_main_quit();
+    }
 
     OnExit();
 
     return m_exitcode;
 }
 
-void wxGUIEventLoop::Exit(int rc)
+void wxGUIEventLoop::ScheduleExit(int rc)
 {
-    wxCHECK_RET( IsRunning(), "can't call Exit() if not running" );
+    wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not started") );
 
     m_exitcode = rc;
 
+    m_shouldExit = true;
+
     gtk_main_quit();
 }
 
@@ -104,53 +123,72 @@ static gboolean wx_on_channel_event(GIOChannel *channel,
     wxEventLoopSourceHandler * const
         handler = static_cast<wxEventLoopSourceHandler *>(data);
 
-    if (condition & G_IO_IN || condition & G_IO_PRI)
+    if ( (condition & G_IO_IN) || (condition & G_IO_PRI) || (condition & G_IO_HUP) )
         handler->OnReadWaiting();
+
     if (condition & G_IO_OUT)
         handler->OnWriteWaiting();
-    else if (condition & G_IO_ERR || condition & G_IO_NVAL)
+
+    if ( (condition & G_IO_ERR) || (condition & G_IO_NVAL) )
         handler->OnExceptionWaiting();
 
     // we never want to remove source here, so always return true
+    //
+    // The source may have been removed by the handler, so it may be
+    // a good idea to return FALSE when the source has already been
+    // removed.  However, that would involve somehow informing this function
+    // that the source was removed, which is not trivial to implement
+    // and handle all cases.  It has been found through testing
+    // that if the source was removed by the handler, that even if we
+    // return TRUE here, the source/callback will not get called again.
     return TRUE;
 }
 }
 
-wxEventLoopSource *
-wxGUIEventLoop::AddSourceForFD(int fd,
-                               wxEventLoopSourceHandler *handler,
-                               int flags)
+class wxGUIEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
 {
-    wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
+public:
+    virtual wxEventLoopSource*
+    AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags)
+    {
+        wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
 
-    int condition = 0;
-    if (flags & wxEVENT_SOURCE_INPUT)
-        condition |= G_IO_IN | G_IO_PRI;
-    if (flags & wxEVENT_SOURCE_OUTPUT)
-        condition |= G_IO_OUT;
-    if (flags & wxEVENT_SOURCE_EXCEPTION)
-        condition |= G_IO_ERR | G_IO_HUP | G_IO_NVAL;
+        int condition = 0;
+        if ( flags & wxEVENT_SOURCE_INPUT )
+            condition |= G_IO_IN | G_IO_PRI | G_IO_HUP;
+        if ( flags & wxEVENT_SOURCE_OUTPUT )
+            condition |= G_IO_OUT;
+        if ( flags & wxEVENT_SOURCE_EXCEPTION )
+            condition |= G_IO_ERR | G_IO_NVAL;
 
-    GIOChannel* channel = g_io_channel_unix_new(fd);
-    const unsigned sourceId  = g_io_add_watch
-                               (
-                                channel,
-                                (GIOCondition)condition,
-                                &wx_on_channel_event,
-                                handler
-                               );
-    // it was ref'd by g_io_add_watch() so we can unref it here
-    g_io_channel_unref(channel);
+        GIOChannel* channel = g_io_channel_unix_new(fd);
+        const unsigned sourceId  = g_io_add_watch
+                                   (
+                                    channel,
+                                    (GIOCondition)condition,
+                                    &wx_on_channel_event,
+                                    handler
+                                   );
+        // it was ref'd by g_io_add_watch() so we can unref it here
+        g_io_channel_unref(channel);
 
-    if ( !sourceId )
-        return NULL;
+        if ( !sourceId )
+            return NULL;
 
-    wxLogTrace(wxTRACE_EVT_SOURCE,
-               "Adding event loop source for fd=%d with GTK id=%u",
-               fd, sourceId);
+        wxLogTrace(wxTRACE_EVT_SOURCE,
+                   "Adding event loop source for fd=%d with GTK id=%u",
+                   fd, sourceId);
 
 
-    return new wxGTKEventLoopSource(sourceId, handler, flags);
+        return new wxGTKEventLoopSource(sourceId, handler, flags);
+    }
+};
+
+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
+{
+    static wxGUIEventLoopSourcesManager s_eventLoopSourcesManager;
+
+    return &s_eventLoopSourcesManager;
 }
 
 wxGTKEventLoopSource::~wxGTKEventLoopSource()
@@ -229,15 +267,17 @@ static void wxgtk_main_do_event(GdkEvent* event, void* data)
     //       new event types (since new event types are always added in GDK with non
     //       conflicting values for ABI compatibility).
 
-    wxEventCategory cat = wxEVT_CATEGORY_UNKNOWN;
+    // Some events (currently only a single one) may be used for more than one
+    // category, so we need 2 variables. The second one will remain "unknown"
+    // in most cases.
+    wxEventCategory cat = wxEVT_CATEGORY_UNKNOWN,
+                    cat2 = wxEVT_CATEGORY_UNKNOWN;
     switch (event->type)
     {
     case GDK_SELECTION_REQUEST:
     case GDK_SELECTION_NOTIFY:
     case GDK_SELECTION_CLEAR:
-#if GTK_CHECK_VERSION(2,6,0)
     case GDK_OWNER_CHANGE:
-#endif
         cat = wxEVT_CATEGORY_CLIPBOARD;
         break;
 
@@ -252,6 +292,14 @@ static void wxgtk_main_do_event(GdkEvent* event, void* data)
         cat = wxEVT_CATEGORY_USER_INPUT;
         break;
 
+    case GDK_PROPERTY_NOTIFY:
+        // This one is special: it can be used for UI purposes but also for
+        // clipboard operations, so allow it in both cases (we probably could
+        // examine the event itself to distinguish between the two cases but
+        // this would be unnecessarily complicated).
+        cat2 = wxEVT_CATEGORY_CLIPBOARD;
+        // Fall through.
+
     case GDK_PROXIMITY_IN:
     case GDK_PROXIMITY_OUT:
 
@@ -259,7 +307,6 @@ static void wxgtk_main_do_event(GdkEvent* event, void* data)
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
     case GDK_VISIBILITY_NOTIFY:
-    case GDK_PROPERTY_NOTIFY:
 
     case GDK_FOCUS_CHANGE:
     case GDK_CONFIGURE:
@@ -269,7 +316,9 @@ static void wxgtk_main_do_event(GdkEvent* event, void* data)
     case GDK_DESTROY:
 
     case GDK_EXPOSE:
+#ifndef __WXGTK3__
     case GDK_NO_EXPOSE:
+#endif
     case GDK_MAP:
     case GDK_UNMAP:
 
@@ -296,11 +345,19 @@ static void wxgtk_main_do_event(GdkEvent* event, void* data)
     wxGUIEventLoop* evtloop = static_cast<wxGUIEventLoop*>(data);
 
     // is this event allowed now?
-    if (evtloop->IsEventAllowedInsideYield(cat))
-        gtk_main_do_event(event);         // process it now
+    if (evtloop->IsEventAllowedInsideYield(cat) ||
+            (cat2 != wxEVT_CATEGORY_UNKNOWN &&
+                evtloop->IsEventAllowedInsideYield(cat2)))
+    {
+        // process it now
+        gtk_main_do_event(event);
+    }
     else if (event->type != GDK_NOTHING)
+    {
+        // process it later (but make a copy; the caller will free the event
+        // pointer)
         evtloop->StoreGdkEventForLaterProcessing(gdk_event_copy(event));
-            // process it later (but make a copy; the caller will free the event pointer)
+    }
 }
 }
 
@@ -336,6 +393,11 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
         gtk_main_iteration();
     gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
 
+    // Process all pending events too, this is consistent with wxMSW behaviour
+    // and the behaviour of wxGTK itself in the previous versions.
+    if ( wxTheApp )
+        wxTheApp->ProcessPendingEvents();
+
     if (eventsToProcess != wxEVT_CATEGORY_CLIPBOARD)
     {
         // It's necessary to call ProcessIdle() to update the frames sizes which
@@ -344,7 +406,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
         // call ProcessIdle() only once since this is not meant for longish
         // background jobs (controlled by wxIdleEvent::RequestMore() and the
         // return value of Processidle().
-        ProcessIdle();      // ProcessIdle() also calls ProcessPendingEvents()
+        ProcessIdle();
     }
     //else: if we are inside ~wxClipboardSync() and we call ProcessIdle() and
     //      the user app contains an UI update handler which calls wxClipboard::IsSupported,
diff --git a/Externals/wxWidgets3/src/gtk/filectrl.cpp b/Externals/wxWidgets3/src/gtk/filectrl.cpp
index 1c18e3741b..fd28b39918 100644
--- a/Externals/wxWidgets3/src/gtk/filectrl.cpp
+++ b/Externals/wxWidgets3/src/gtk/filectrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGtkFileCtrl Implementation
 // Author:      Diaa M. Sami
 // Created:     2007-08-10
-// RCS-ID:      $Id: filectrl.cpp 64429 2010-05-29 10:35:47Z VZ $
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,17 +13,11 @@
 #pragma hdrstop
 #endif
 
-#include "wx/filectrl.h"
-
 #if wxUSE_FILECTRL && !defined(__WXUNIVERSAL__)
 
-#ifndef WX_PRECOMP
-#    include "wx/sizer.h"
-#    include "wx/debug.h"
-#endif
+#include "wx/filectrl.h"
 
 #include "wx/gtk/private.h"
-#include "wx/filedlg.h"
 #include "wx/filename.h"
 #include "wx/scopeguard.h"
 #include "wx/tokenzr.h"
@@ -47,7 +40,7 @@ wxString wxGtkFileChooser::GetPath() const
     wxGtkString str( gtk_file_chooser_get_filename( m_widget ) );
 
     wxString string;
-    if (str.c_str() != NULL)
+    if (str)
         string = wxString::FromUTF8(str);
     return string;
 }
@@ -88,7 +81,32 @@ bool wxGtkFileChooser::SetPath( const wxString& path )
     if ( path.empty() )
         return true;
 
-    return gtk_file_chooser_set_filename( m_widget, path.utf8_str() );
+    switch ( gtk_file_chooser_get_action( m_widget ) )
+    {
+        case GTK_FILE_CHOOSER_ACTION_SAVE:
+            {
+                wxFileName fn(path);
+
+                const wxString fname = fn.GetFullName();
+                gtk_file_chooser_set_current_name( m_widget, fname.utf8_str() );
+
+                // set the initial file name and/or directory
+                const wxString dir = fn.GetPath();
+                return gtk_file_chooser_set_current_folder( m_widget,
+                                                            dir.utf8_str() ) != 0;
+            }
+
+        case GTK_FILE_CHOOSER_ACTION_OPEN:
+            return gtk_file_chooser_set_filename( m_widget, path.utf8_str() ) != 0;
+
+        case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+        case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:
+            break;
+    }
+
+    wxFAIL_MSG( "Unexpected file chooser type" );
+
+    return false;
 }
 
 bool wxGtkFileChooser::SetDirectory( const wxString& dir )
@@ -285,6 +303,12 @@ extern "C"
 
 IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
 
+wxGtkFileCtrl::~wxGtkFileCtrl()
+{
+    if (m_fcWidget)
+        GTKDisconnect(m_fcWidget);
+}
+
 void wxGtkFileCtrl::Init()
 {
     m_checkNextSelEvent = false;
@@ -362,7 +386,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
     if ( !dir.empty() )
     {
         gtk_file_chooser_set_current_folder( m_fcWidget,
-                                             dir.fn_str() );
+                                             wxGTK_CONV_FN(dir) );
     }
 
     const wxString fname = fn.GetFullName();
@@ -371,7 +395,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_current_name( m_fcWidget,
-                                               fname.fn_str() );
+                                               wxGTK_CONV_FN(fname) );
         }
     }
     else // wxFC_OPEN
@@ -379,7 +403,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename( m_fcWidget,
-                                           fn.GetFullPath().fn_str() );
+                                           wxGTK_CONV_FN(fn.GetFullPath()) );
         }
     }
 
@@ -450,8 +474,7 @@ void wxGtkFileCtrl::GetFilenames( wxArrayString& files ) const
 
 void wxGtkFileCtrl::ShowHidden(bool show)
 {
-    // gtk_file_chooser_set_show_hidden() is new in 2.6
-    g_object_set (G_OBJECT (m_fcWidget), "show-hidden", show, NULL);
+    gtk_file_chooser_set_show_hidden(m_fcWidget, show);
 }
 
 #endif // wxUSE_FILECTRL
diff --git a/Externals/wxWidgets3/src/gtk/filedlg.cpp b/Externals/wxWidgets3/src/gtk/filedlg.cpp
index b28d54bf98..ce41843b03 100644
--- a/Externals/wxWidgets3/src/gtk/filedlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/filedlg.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/filedlg.cpp
 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
-// Id:          $Id: filedlg.cpp 70898 2012-03-14 12:32:27Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,6 +28,7 @@
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
+#include "wx/modalhook.h"
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
@@ -41,6 +41,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
     wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
 
     // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
+#ifndef __WXGTK3__
 #if GTK_CHECK_VERSION(2,7,3)
     if (gtk_check_version(2, 7, 3) != NULL)
 #endif
@@ -62,6 +63,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
             }
         }
     }
+#endif
 
     if (style & wxFD_FILE_MUST_EXIST)
     {
@@ -82,7 +84,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
         chdir(folder);
     }
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
+    wxCommandEvent event(wxEVT_BUTTON, wxID_OK);
     event.SetEventObject(dialog);
     dialog->HandleWindowEvent(event);
 }
@@ -113,6 +115,15 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
         gtk_filedialog_cancel_callback(w, dialog);
 }
 
+static void gtk_filedialog_selchanged_callback(GtkFileChooser *chooser,
+                                               wxFileDialog *dialog)
+{
+    wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser));
+
+    dialog->GTKSelectionChanged(wxString::FromUTF8(filename));
+}
+
+
 static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
                                                    gpointer user_data)
 {
@@ -135,22 +146,12 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 
 } // extern "C"
 
-//-----------------------------------------------------------------------------
-// "size_request" from m_extraControl
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win)
-{
-    // allow dialog to be resized smaller horizontally
-    req->width = win->GetMinWidth();
-}
-}
-
 void wxFileDialog::AddChildGTK(wxWindowGTK* child)
 {
-    g_signal_connect_after(child->m_widget, "size_request",
-        G_CALLBACK(extra_widget_size_request), child);
+    // allow dialog to be resized smaller horizontally
+    gtk_widget_set_size_request(
+        child->m_widget, child->GetMinWidth(), child->m_height);
+
     gtk_file_chooser_set_extra_widget(
         GTK_FILE_CHOOSER(m_widget), child->m_widget);
 }
@@ -256,6 +257,8 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
     g_signal_connect (m_widget, "response",
         G_CALLBACK (gtk_filedialog_response_callback), this);
 
+    g_signal_connect (m_widget, "selection-changed",
+        G_CALLBACK (gtk_filedialog_selchanged_callback), this);
 
     // deal with extensions/filters
     SetWildcard(wildCard);
@@ -264,11 +267,18 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
     if ( !wildCard.empty() && !defaultFileName.empty() &&
             !wxFileName(defaultFileName).HasExt() )
     {
-        // append the default extension to the initial file name: GTK won't do
-        // it for us by default (unlike e.g. MSW)
-        const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
-        if ( defaultExt.find_first_of("?*") == wxString::npos )
-            defaultFileNameWithExt += "." + defaultExt;
+        // append the default extension, if any, to the initial file name: GTK
+        // won't do it for us by default (unlike e.g. MSW)
+        const wxFileName fnWC(m_fc.GetCurrentWildCard());
+        if ( fnWC.HasExt() )
+        {
+            // Notice that we shouldn't append the extension if it's a wildcard
+            // because this is not useful: the user would need to change it to use
+            // some fixed extension anyhow.
+            const wxString& ext = fnWC.GetExt();
+            if ( ext.find_first_of("?*") == wxString::npos )
+                defaultFileNameWithExt << "." << ext;
+        }
     }
 
 
@@ -288,7 +298,7 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
     const wxString dir = fn.GetPath();
     if ( !dir.empty() )
     {
-        gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str());
+        gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir));
     }
 
     const wxString fname = fn.GetFullName();
@@ -296,12 +306,18 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
     {
         if ( !fname.empty() )
         {
-            gtk_file_chooser_set_current_name(file_chooser, fname.fn_str());
+            gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname));
         }
 
 #if GTK_CHECK_VERSION(2,7,3)
-        if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
+        if ((style & wxFD_OVERWRITE_PROMPT)
+#ifndef __WXGTK3__
+            && gtk_check_version(2,7,3) == NULL
+#endif
+            )
+        {
             gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);
+        }
 #endif
     }
     else // wxFD_OPEN
@@ -309,7 +325,7 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename(file_chooser,
-                                          fn.GetFullPath().fn_str());
+                                          wxGTK_CONV_FN(fn.GetFullPath()));
         }
     }
 
@@ -339,11 +355,19 @@ wxFileDialog::~wxFileDialog()
 
 void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 {
+    // Update the current directory from here, accessing it later may not work
+    // due to the strange way GtkFileChooser works.
+    wxGtkString
+        str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget)));
+    m_dir = wxString::FromUTF8(str);
+
     EndDialog(wxID_OK);
 }
 
 int wxFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     CreateExtraControl();
 
     return wxDialog::ShowModal();
@@ -384,6 +408,8 @@ void wxFileDialog::SetMessage(const wxString& message)
 
 void wxFileDialog::SetPath(const wxString& path)
 {
+    wxFileDialogBase::SetPath(path);
+
     // Don't do anything if no path is specified, in particular don't set the
     // path to m_dir below as this would result in opening the dialog in the
     // parent directory of this one instead of m_dir itself.
@@ -400,32 +426,18 @@ void wxFileDialog::SetPath(const wxString& path)
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
-    if (m_fc.SetDirectory( dir ))
-    {
-        // Cache the dir, as gtk_file_chooser_get_current_folder()
-        // doesn't return anything until the dialog has been shown
-        m_dir = dir;
-    }
-}
+    wxFileDialogBase::SetDirectory(dir);
 
-wxString wxFileDialog::GetDirectory() const
-{
-    wxString currentDir( m_fc.GetDirectory() );
-    if (currentDir.empty())
-    {
-        // m_fc.GetDirectory() will return empty until the dialog has been shown
-        // in which case use any previously provided value
-        currentDir = m_dir;
-    }
-    return currentDir;
+    m_fc.SetDirectory(dir);
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
+    wxFileDialogBase::SetFilename(name);
+
     if (HasFdFlag(wxFD_SAVE))
     {
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
-        m_fileName = name;
     }
 
     else
@@ -437,7 +449,6 @@ void wxFileDialog::SetFilename(const wxString& name)
             return;
         }
         SetPath(wxFileName(path, name).GetFullPath());
-        m_fileName = name;
     }
 }
 
@@ -469,4 +480,12 @@ int wxFileDialog::GetFilterIndex() const
     return m_fc.GetFilterIndex();
 }
 
+void wxFileDialog::GTKSelectionChanged(const wxString& filename)
+{
+    m_currentlySelectedFilename = filename;
+
+    if (m_extraControl)
+        m_extraControl->UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
 #endif // wxUSE_FILEDLG
diff --git a/Externals/wxWidgets3/src/gtk/filehistory.cpp b/Externals/wxWidgets3/src/gtk/filehistory.cpp
index a630bef799..7c1075ff81 100644
--- a/Externals/wxWidgets3/src/gtk/filehistory.cpp
+++ b/Externals/wxWidgets3/src/gtk/filehistory.cpp
@@ -3,7 +3,6 @@
 // Purpose:     GTK+ bits for wxFileHistory class
 // Author:      Vaclav Slavik
 // Created:     2010-05-06
-// RCS-ID:      $Id: filehistory.cpp 64240 2010-05-07 06:45:48Z VS $
 // Copyright:   (c) 2010 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include "wx/gtk/private/string.h"
+#include "wx/gtk/private.h"
 
 // ============================================================================
 // implementation
@@ -43,9 +43,11 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
 #ifdef __WXGTK210__
     const wxString fullPath = wxFileName(file).GetFullPath();
+#ifndef __WXGTK3__
     if ( !gtk_check_version(2,10,0) )
+#endif
     {
-        wxGtkString uri(g_filename_to_uri(fullPath.fn_str(), NULL, NULL));
+        wxGtkString uri(g_filename_to_uri(wxGTK_CONV_FN(fullPath), NULL, NULL));
 
         if ( uri )
             gtk_recent_manager_add_item(gtk_recent_manager_get_default(), uri);
diff --git a/Externals/wxWidgets3/src/gtk/filepicker.cpp b/Externals/wxWidgets3/src/gtk/filepicker.cpp
index 276bc63eea..3f99ce13f7 100644
--- a/Externals/wxWidgets3/src/gtk/filepicker.cpp
+++ b/Externals/wxWidgets3/src/gtk/filepicker.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     15/04/2006
-// Id:          $Id: filepicker.cpp 70754 2012-02-29 18:05:03Z PC $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,11 +16,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_FILEPICKERCTRL
 
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ============================================================================
@@ -43,7 +43,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 {
     // we can't use the native button for wxFLP_SAVE pickers as it can only
     // open existing files and there is no way to create a new file using it
-    if ( !(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
+    if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL))
     {
         // VERY IMPORTANT: this code is identical to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !
@@ -85,7 +85,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton
         //       thus we are forced to use wxFileDialog's event
-        m_dialog->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+        m_dialog->Connect(wxEVT_BUTTON,
                 wxCommandEventHandler(wxFileButton::OnDialogOK),
                 NULL, this);
 
@@ -102,6 +102,17 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 
 wxFileButton::~wxFileButton()
 {
+    if ( m_dialog )
+    {
+        // when m_dialog is deleted, it will destroy the widget it is sharing
+        // with GtkFileChooserButton, which results in a bunch of Gtk-CRITICAL
+        // errors from GtkFileChooserButton. To avoid this, call gtk_widget_destroy()
+        // on GtkFileChooserButton first (our base dtor will do it again, but
+        // that does no harm). m_dialog holds a reference to the shared widget,
+        // so it won't go away until m_dialog base dtor unrefs it.
+        gtk_widget_destroy(m_widget);
+        delete m_dialog;
+    }
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)
@@ -114,7 +125,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
         UpdatePathFromDialog(m_dialog);
 
         // ...and fire an event
-        wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
+        wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path);
         HandleWindowEvent(event);
     }
 }
@@ -130,17 +141,22 @@ void wxFileButton::SetPath(const wxString &str)
 void wxFileButton::SetInitialDirectory(const wxString& dir)
 {
     if (m_dialog)
-        DoSetInitialDirectory(static_cast<wxFileDialog*>(m_dialog), dir);
+    {
+        // Only change the directory if the default file name doesn't have any
+        // directory in it, otherwise it takes precedence.
+        if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+                wxString::npos )
+        {
+            static_cast<wxFileDialog*>(m_dialog)->SetDirectory(dir);
+        }
+    }
     else
         wxGenericFileButton::SetInitialDirectory(dir);
 }
 
-#endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
+#endif // wxUSE_FILEPICKERCTRL
 
-
-
-
-#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_DIRPICKERCTRL
 
 #ifdef __UNIX__
 #include <unistd.h> // chdir
@@ -177,7 +193,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
         chdir(filename);
 
     // ...and fire an event
-    wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
+    wxFileDirPickerEvent event(wxEVT_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
     p->HandleWindowEvent(event);
 }
 }
@@ -196,7 +212,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    if ( !(style & wxDIRP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
+    if (!(style & wxDIRP_USE_TEXTCTRL))
     {
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
@@ -252,6 +268,12 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
 
 wxDirButton::~wxDirButton()
 {
+    if (m_dialog)
+    {
+        // see ~wxFileButton() comment
+        gtk_widget_destroy(m_widget);
+        delete m_dialog;
+    }
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)
@@ -290,4 +312,4 @@ void wxDirButton::SetInitialDirectory(const wxString& dir)
         wxGenericDirButton::SetInitialDirectory(dir);
 }
 
-#endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#endif // wxUSE_DIRPICKERCTRL
diff --git a/Externals/wxWidgets3/src/gtk/font.cpp b/Externals/wxWidgets3/src/gtk/font.cpp
index b09793a989..9cd46bac4b 100644
--- a/Externals/wxWidgets3/src/gtk/font.cpp
+++ b/Externals/wxWidgets3/src/gtk/font.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/font.cpp
 // Purpose:     wxFont for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id: font.cpp 70476 2012-01-29 08:14:34Z PC $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -92,9 +91,8 @@ protected:
     void InitFromNative();
 
 private:
-    bool            m_underlined;
-    bool            m_strikethrough;
-    // The native font info: basically a PangoFontDescription
+    // The native font info: basically a PangoFontDescription, plus
+    // 'underlined' and 'strikethrough' attributes not supported by Pango.
     wxNativeFontInfo m_nativeFontInfo;
 
     friend class wxFont;
@@ -118,9 +116,6 @@ void wxFontRefData::Init(int pointSize,
     if (family == wxFONTFAMILY_DEFAULT)
         family = wxFONTFAMILY_SWISS;
 
-    m_underlined = underlined;
-    m_strikethrough = strikethrough;
-
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();
 
@@ -140,6 +135,8 @@ void wxFontRefData::Init(int pointSize,
                     ? wxDEFAULT_FONT_SIZE
                     : pointSize );
     SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+    SetUnderlined( underlined );
+    SetStrikethrough( strikethrough );
 }
 
 void wxFontRefData::InitFromNative()
@@ -151,18 +148,11 @@ void wxFontRefData::InitFromNative()
     int pango_size = pango_font_description_get_size( desc );
     if (pango_size == 0)
         m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
-
-    // Pango description are never underlined
-    m_underlined = false;
-    m_strikethrough = false;
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
              : wxGDIRefData()
 {
-    m_underlined = data.m_underlined;
-    m_strikethrough = data.m_strikethrough;
-
     // Forces a copy of the internal data.  wxNativeFontInfo should probably
     // have a copy ctor and assignment operator to fix this properly but that
     // would break binary compatibility...
@@ -243,17 +233,12 @@ void wxFontRefData::SetWeight(wxFontWeight weight)
 
 void wxFontRefData::SetUnderlined(bool underlined)
 {
-    m_underlined = underlined;
-
-    // the Pango font descriptor does not have an underlined attribute
-    // (and wxNativeFontInfo::SetUnderlined asserts); rather it's
-    // wxWindowDCImpl::DoDrawText that handles underlined fonts, so we
-    // here we just need to save the underlined attribute
+    m_nativeFontInfo.SetUnderlined(underlined);
 }
 
 void wxFontRefData::SetStrikethrough(bool strikethrough)
 {
-    m_strikethrough = strikethrough;
+    m_nativeFontInfo.SetStrikethrough(strikethrough);
 }
 
 bool wxFontRefData::SetFaceName(const wxString& facename)
@@ -287,19 +272,25 @@ wxFont::wxFont(const wxNativeFontInfo& info)
             info.GetUnderlined(),
             info.GetFaceName(),
             info.GetEncoding() );
+
+    if ( info.GetStrikethrough() )
+        SetStrikethrough(true);
 }
 
-wxFont::wxFont(int pointSize,
-               wxFontFamily family,
-               int flags,
-               const wxString& face,
-               wxFontEncoding encoding)
+wxFont::wxFont(const wxFontInfo& info)
 {
-    m_refData = new wxFontRefData(pointSize, family,
-                                  GetStyleFromFlags(flags),
-                                  GetWeightFromFlags(flags),
-                                  GetUnderlinedFromFlags(flags),
-                                  false, face, encoding);
+    m_refData = new wxFontRefData(info.GetPointSize(),
+                                  info.GetFamily(),
+                                  info.GetStyle(),
+                                  info.GetWeight(),
+                                  info.IsUnderlined(),
+                                  info.IsStrikethrough(),
+                                  info.GetFaceName(),
+                                  info.GetEncoding());
+
+    wxSize pixelSize = info.GetPixelSize();
+    if ( pixelSize != wxDefaultSize )
+        SetPixelSize(pixelSize);
 }
 
 bool wxFont::Create( int pointSize,
@@ -378,14 +369,14 @@ bool wxFont::GetUnderlined() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 
-    return M_FONTDATA->m_underlined;
+    return M_FONTDATA->m_nativeFontInfo.GetUnderlined();
 }
 
 bool wxFont::GetStrikethrough() const
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
 
-    return M_FONTDATA->m_strikethrough;
+    return M_FONTDATA->m_nativeFontInfo.GetStrikethrough();
 }
 
 wxFontEncoding wxFont::GetEncoding() const
@@ -496,6 +487,7 @@ bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
     PangoAttrList* attrs = pango_attr_list_new();
     PangoAttribute* a;
 
+#ifndef __WXGTK3__
     if (wx_pango_version_check(1,16,0))
     {
         // a PangoLayout which has leading/trailing spaces with underlined font
@@ -534,6 +526,8 @@ bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
             pango_attr_list_insert(attrs, a);
         }
     }
+#endif // !__WXGTK3__
+
     if (GetUnderlined())
     {
         a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
diff --git a/Externals/wxWidgets3/src/gtk/fontdlg.cpp b/Externals/wxWidgets3/src/gtk/fontdlg.cpp
index 0b58429526..bdf2dd4a2d 100644
--- a/Externals/wxWidgets3/src/gtk/fontdlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/fontdlg.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/fontdlg.cpp
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
-// Id:          $Id: fontdlg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,65 +15,42 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
-    #include "wx/utils.h"
-    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/fontutil.h"
-
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// "delete_event"
+// "response"
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static
-bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+static void response(GtkDialog* dialog, int response_id, wxFontDialog* win)
 {
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    int rc = wxID_CANCEL;
+    if (response_id == GTK_RESPONSE_OK)
+    {
+        rc = wxID_OK;
+#if GTK_CHECK_VERSION(3,2,0)
+        if (gtk_check_version(3,2,0) == NULL)
+        {
+            wxNativeFontInfo info;
+            info.description = gtk_font_chooser_get_font_desc(GTK_FONT_CHOOSER(dialog));
+            win->GetFontData().SetChosenFont(wxFont(info));
+        }
+        else
+#endif
+        {
+            GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog);
+            wxGtkString name(gtk_font_selection_dialog_get_font_name(sel));
+            win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name)));
+        }
+    }
 
-    win->Close();
-
-    return true;
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static
-void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
-{
-    GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
-
-    wxGtkString fontname(gtk_font_selection_dialog_get_font_name(fontdlg));
-    dialog->SetChosenFont( fontname);
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject( dialog );
-    dialog->HandleWindowEvent( event );
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static
-void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
-{
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject( dialog );
-    dialog->HandleWindowEvent( event );
+    if (win->IsModal())
+        win->EndModal(rc);
+    else
+        win->Show(false);
 }
 }
 
@@ -96,24 +72,24 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
         return false;
     }
 
-    wxString m_message( _("Choose font") );
-    m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
+    const wxString message(_("Choose font"));
+    GtkWindow* gtk_parent = NULL;
+    if (parent)
+        gtk_parent = GTK_WINDOW(parent->m_widget);
+
+#if GTK_CHECK_VERSION(3,2,0)
+    if (gtk_check_version(3,2,0) == NULL)
+        m_widget = gtk_font_chooser_dialog_new(wxGTK_CONV(message), gtk_parent);
+    else
+#endif
+    {
+        m_widget = gtk_font_selection_dialog_new(wxGTK_CONV(message));
+        if (gtk_parent)
+            gtk_window_set_transient_for(GTK_WINDOW(m_widget), gtk_parent);
+    }
     g_object_ref(m_widget);
 
-    if (parent)
-        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     GTK_WINDOW(parent->m_widget));
-
-    GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
-
-    g_signal_connect (gtk_font_selection_dialog_get_ok_button(sel), "clicked",
-                      G_CALLBACK (gtk_fontdialog_ok_callback), this);
-
-    g_signal_connect (gtk_font_selection_dialog_get_cancel_button(sel), "clicked",
-                      G_CALLBACK (gtk_fontdialog_cancel_callback), this);
-
-    g_signal_connect (m_widget, "delete_event",
-                      G_CALLBACK (gtk_fontdialog_delete_callback), this);
+    g_signal_connect(m_widget, "response", G_CALLBACK(response), this);
 
     wxFont font = m_fontData.GetInitialFont();
     if( font.IsOk() )
@@ -122,9 +98,16 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
 
         if ( info )
         {
-
-            const wxString& fontname = info->ToString();
-            gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
+#if GTK_CHECK_VERSION(3,2,0)
+            if (gtk_check_version(3,2,0) == NULL)
+                gtk_font_chooser_set_font_desc(GTK_FONT_CHOOSER(m_widget), info->description);
+            else
+#endif
+            {
+                const wxString& fontname = info->ToString();
+                GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(m_widget);
+                gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
+            }
         }
         else
         {
@@ -140,9 +123,4 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
-void wxFontDialog::SetChosenFont(const char *fontname)
-{
-    m_fontData.SetChosenFont(wxFont( wxString::FromUTF8(fontname) ));
-}
-
 #endif // wxUSE_FONTDLG && !__WXGPE__
diff --git a/Externals/wxWidgets3/src/gtk/fontpicker.cpp b/Externals/wxWidgets3/src/gtk/fontpicker.cpp
index 11b34cddea..49e0710cff 100644
--- a/Externals/wxWidgets3/src/gtk/fontpicker.cpp
+++ b/Externals/wxWidgets3/src/gtk/fontpicker.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     15/04/2006
-// Id:          $Id: fontpicker.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/frame.cpp b/Externals/wxWidgets3/src/gtk/frame.cpp
index 40b32c37d2..3f7ab5ab1d 100644
--- a/Externals/wxWidgets3/src/gtk/frame.cpp
+++ b/Externals/wxWidgets3/src/gtk/frame.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/frame.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: frame.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,6 +18,7 @@
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-window.h>
@@ -73,16 +73,19 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
     wxFrameBase::DoGetClientSize(width, height);
 
+    if (m_useCachedClientSize)
+        return;
+
     if (height)
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar
         if (m_frameMenuBar && m_frameMenuBar->IsShown())
         {
-            GtkRequisition req;
-            gtk_widget_size_request(m_frameMenuBar->m_widget, &req);
+            int h;
+            gtk_widget_get_preferred_height(m_frameMenuBar->m_widget, NULL, &h);
 #if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
-            *height -= req.height;
+            *height -= h;
 #endif
         }
 #endif // wxUSE_MENUS_NATIVE
@@ -98,17 +101,23 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
     // tool bar
     if (m_frameToolBar && m_frameToolBar->IsShown())
     {
-        GtkRequisition req;
-        gtk_widget_size_request(m_frameToolBar->m_widget, &req);
         if (m_frameToolBar->IsVertical())
         {
             if (width)
-                *width -= req.width;
+            {
+                int w;
+                gtk_widget_get_preferred_width(m_frameToolBar->m_widget, NULL, &w);
+                *width -= w;
+            }
         }
         else
         {
             if (height)
-                *height -= req.height;
+            {
+                int h;
+                gtk_widget_get_preferred_height(m_frameToolBar->m_widget, NULL, &h);
+                *height -= h;
+            }
         }
     }
 #endif // wxUSE_TOOLBAR
@@ -280,7 +289,8 @@ void wxFrame::DetachMenuBar()
     wxFrameBase::DetachMenuBar();
 
     // make sure next size_allocate causes a wxSizeEvent
-    m_oldClientWidth = 0;
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
@@ -291,25 +301,14 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
     {
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
         hildon_window_set_menu(HILDON_WINDOW(m_widget),
-                               GTK_MENU(m_frameMenuBar->m_menubar));
+                               GTK_MENU(m_frameMenuBar->m_widget));
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
-        m_frameMenuBar->SetParent(this);
 
         // menubar goes into top of vbox (m_mainWidget)
         gtk_box_pack_start(
             GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0);
         gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0);
 
-        // disconnect wxWindowGTK "size_request" handler,
-        // it interferes with sizing of detached GtkHandleBox
-        gulong handler_id = g_signal_handler_find(
-            menuBar->m_widget,
-            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
-            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
-            0, NULL, NULL, menuBar);
-        if (handler_id != 0)
-            g_signal_handler_disconnect(menuBar->m_widget, handler_id);
-
         // reset size request to allow native sizing to work
         gtk_widget_set_size_request(menuBar->m_widget, -1, -1);
 
@@ -317,7 +316,8 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     }
     // make sure next size_allocate causes a wxSizeEvent
-    m_oldClientWidth = 0;
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 #endif // wxUSE_MENUS_NATIVE
 
@@ -333,11 +333,11 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             // Vertical toolbar and m_wxwindow go into an hbox, inside the
             // vbox (m_mainWidget). hbox is created on demand.
             GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow);
-            if (!GTK_IS_HBOX(hbox))
+            if (hbox == m_mainWidget)
             {
-                hbox = gtk_hbox_new(false, 0);
+                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
                 gtk_widget_show(hbox);
-                gtk_container_add(GTK_CONTAINER(m_mainWidget), hbox);
+                gtk_box_pack_start(GTK_BOX(m_mainWidget), hbox, true, true, 0);
                 gtk_widget_reparent(m_wxwindow, hbox);
             }
             gtk_widget_reparent(toolbar->m_widget, hbox);
@@ -364,22 +364,12 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             gtk_box_reorder_child(
                 GTK_BOX(m_mainWidget), toolbar->m_widget, pos);
         }
-
-        // disconnect wxWindowGTK "size_request" handler,
-        // it interferes with sizing of detached GtkHandleBox
-        gulong handler_id = g_signal_handler_find(
-            toolbar->m_widget,
-            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
-            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
-            0, NULL, NULL, toolbar);
-        if (handler_id != 0)
-            g_signal_handler_disconnect(toolbar->m_widget, handler_id);
-
         // reset size request to allow native sizing to work
         gtk_widget_set_size_request(toolbar->m_widget, -1, -1);
     }
     // make sure next size_allocate causes a wxSizeEvent
-    m_oldClientWidth = 0;
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 
 #endif // wxUSE_TOOLBAR
@@ -396,9 +386,18 @@ void wxFrame::SetStatusBar(wxStatusBar *statbar)
         gtk_box_set_child_packing(GTK_BOX(m_mainWidget),
             statbar->m_widget, false, false, 0, GTK_PACK_END);
         // make sure next size_allocate on statusbar causes a size event
-        statbar->m_oldClientWidth = 0;
+        statbar->m_useCachedClientSize = false;
+        statbar->m_clientWidth = 0;
+        int h = -1;
+        if (statbar->m_wxwindow)
+        {
+            // statusbar is not a native widget, need to set height request
+            h = statbar->m_height;
+        }
+        gtk_widget_set_size_request(statbar->m_widget, -1, h);
     }
     // make sure next size_allocate causes a wxSizeEvent
-    m_oldClientWidth = 0;
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 #endif // wxUSE_STATUSBAR
diff --git a/Externals/wxWidgets3/src/gtk/gauge.cpp b/Externals/wxWidgets3/src/gtk/gauge.cpp
index 222619d3af..7c8c1c9cd4 100644
--- a/Externals/wxWidgets3/src/gtk/gauge.cpp
+++ b/Externals/wxWidgets3/src/gtk/gauge.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/gauge.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: gauge.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,8 +41,13 @@ bool wxGauge::Create( wxWindow *parent,
     g_object_ref(m_widget);
     if ( style & wxGA_VERTICAL )
     {
+#ifdef __WXGTK3__
+        gtk_orientable_set_orientation(GTK_ORIENTABLE(m_widget), GTK_ORIENTATION_VERTICAL);
+        gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(m_widget), true);
+#else
         gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
                                           GTK_PROGRESS_BOTTOM_TO_TOP );
+#endif
     }
 
     // when using the gauge in indeterminate mode, we need this:
@@ -123,7 +127,7 @@ wxVisualAttributes wxGauge::GetDefaultAttributes() const
 wxVisualAttributes
 wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new(),
                                              false, GTK_STATE_ACTIVE);
 }
 
diff --git a/Externals/wxWidgets3/src/gtk/glcanvas.cpp b/Externals/wxWidgets3/src/gtk/glcanvas.cpp
index 8e892ad967..d4acb9c8c2 100644
--- a/Externals/wxWidgets3/src/gtk/glcanvas.cpp
+++ b/Externals/wxWidgets3/src/gtk/glcanvas.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
-// RCS-ID:      $Id: glcanvas.cpp 67333 2011-03-29 05:17:00Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,6 +39,7 @@ gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
 // "map" from m_wxwindow
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK3__
 extern "C" {
 static void
 gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
@@ -52,12 +52,28 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
     win->GetUpdateRegion().Clear();
 }
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 extern "C" {
+#ifdef __WXGTK3__
+static gboolean draw(GtkWidget*, cairo_t* cr, wxGLCanvas* win)
+{
+    win->m_exposed = true;
+    if (win->m_cairoPaintContext == NULL)
+    {
+        win->m_cairoPaintContext = cr;
+        cairo_reference(cr);
+    }
+    double x1, y1, x2, y2;
+    cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+    win->GetUpdateRegion().Union(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+    return false;
+}
+#else
 static gboolean
 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
@@ -69,6 +85,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
                                   gdk_event->area.height );
     return false;
 }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -81,9 +98,6 @@ gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
                            GtkAllocation * WXUNUSED(alloc),
                            wxGLCanvas *win)
 {
-    if (!win->m_hasVMT)
-        return;
-
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
     win->HandleWindowEvent( event );
@@ -107,9 +121,13 @@ parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void*
         {
             GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
             visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);
+#ifdef __WXGTK3__
+            gtk_widget_set_visual(win->m_wxwindow, visual);
+#else
             GdkColormap* colormap = gdk_colormap_new(visual, false);
             gtk_widget_set_colormap(win->m_wxwindow, colormap);
             g_object_unref(colormap);
+#endif
         }
         // remove hook
         return false;
@@ -207,6 +225,10 @@ bool wxGLCanvas::Create(wxWindow *parent,
     m_exposed = false;
     m_noExpose = true;
     m_nativeSizeEvent = true;
+#ifdef __WXGTK3__
+    m_cairoPaintContext = NULL;
+    m_backgroundStyle = wxBG_STYLE_PAINT;
+#endif
 
     if ( !InitVisual(attribList) )
         return false;
@@ -224,8 +246,12 @@ bool wxGLCanvas::Create(wxWindow *parent,
 #if WXWIN_COMPATIBILITY_2_8
     g_signal_connect(m_wxwindow, "realize",       G_CALLBACK(gtk_glwindow_realized_callback), this);
 #endif // WXWIN_COMPATIBILITY_2_8
+#ifdef __WXGTK3__
+    g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
+#else
     g_signal_connect(m_wxwindow, "map",           G_CALLBACK(gtk_glwindow_map_callback),      this);
     g_signal_connect(m_wxwindow, "expose_event",  G_CALLBACK(gtk_glwindow_expose_callback),   this);
+#endif
     g_signal_connect(m_widget,   "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback),     this);
 
 #if WXWIN_COMPATIBILITY_2_8
@@ -236,25 +262,38 @@ bool wxGLCanvas::Create(wxWindow *parent,
         gtk_glwindow_realized_callback( m_wxwindow, this );
 #endif // WXWIN_COMPATIBILITY_2_8
 
+#ifndef __WXGTK3__
     if (gtk_widget_get_mapped(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
+#endif
 
     return true;
 }
 
+bool wxGLCanvas::SetBackgroundStyle(wxBackgroundStyle /* style */)
+{
+    return false;
+}
+
 Window wxGLCanvas::GetXWindow() const
 {
     GdkWindow* window = GTKGetDrawingWindow();
-    return window ? GDK_WINDOW_XWINDOW(window) : 0;
+    return window ? GDK_WINDOW_XID(window) : 0;
 }
 
 void wxGLCanvas::OnInternalIdle()
 {
     if (m_exposed)
     {
+#ifdef __WXGTK3__
+        GTKSendPaintEvents(m_cairoPaintContext);
+        cairo_destroy(m_cairoPaintContext);
+        m_cairoPaintContext = NULL;
+#else
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
         HandleWindowEvent( event );
+#endif
 
         m_exposed = false;
         GetUpdateRegion().Clear();
diff --git a/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp b/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp
index 01900ebf31..e69de29bb2 100644
--- a/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp
+++ b/Externals/wxWidgets3/src/gtk/gnome/gprint.cpp
@@ -1,2115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/gtk/gnome/gprint.cpp
-// Author:      Robert Roebling
-// Purpose:     Implement GNOME printing support
-// Created:     09/20/04
-// RCS-ID:      $Id: gprint.cpp 70478 2012-01-29 08:49:01Z PC $
-// Copyright:   Robert Roebling
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LIBGNOMEPRINT
-
-#include "wx/gtk/gnome/gprint.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/dcmemory.h"
-    #include "wx/icon.h"
-    #include "wx/math.h"
-    #include "wx/image.h"
-    #include "wx/module.h"
-    #include "wx/crt.h"
-#endif
-
-#include "wx/fontutil.h"
-#include "wx/gtk/private.h"
-#include "wx/dynlib.h"
-#include "wx/paper.h"
-#include "wx/dcprint.h"
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-pango.h>
-#include <libgnomeprint/gnome-print-config.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
-#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libgnomeprintui/gnome-print-paper-selector.h>
-
-#include "wx/link.h"
-wxFORCE_LINK_THIS_MODULE(gnome_print)
-
-//----------------------------------------------------------------------------
-// wxGnomePrintLibrary
-//----------------------------------------------------------------------------
-
-class wxGnomePrintLibrary
-{
-public:
-    wxGnomePrintLibrary();
-    ~wxGnomePrintLibrary();
-
-    bool IsOk();
-private:
-    bool InitializeMethods();
-
-    wxDynamicLibrary m_libGnomePrint;
-    wxDynamicLibrary m_libGnomePrintUI;
-
-    // only true if we successfully loaded both libraries
-    //
-    // don't rename this field, it's used by wxDL_XXX macros internally
-    bool m_ok;
-
-public:
-    wxDL_METHOD_DEFINE( gint, gnome_print_newpath,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_moveto,
-        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_lineto,
-        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_arcto,
-        (GnomePrintContext *pc, gdouble x, gdouble y, gdouble radius, gdouble angle1, gdouble angle2, gint direction ), (pc, x, y, radius, angle1, angle2, direction), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_curveto,
-        (GnomePrintContext *pc, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble x3, gdouble y3), (pc, x1, y1, x2, y2, x3, y3), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_closepath,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_stroke,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_fill,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_setrgbcolor,
-        (GnomePrintContext *pc, gdouble r, gdouble g, gdouble b), (pc, r, g, b), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_setlinewidth,
-        (GnomePrintContext *pc, gdouble width), (pc, width), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_setdash,
-        (GnomePrintContext *pc, gint n_values, const gdouble *values, gdouble offset), (pc, n_values, values, offset), 0 )
-
-    wxDL_METHOD_DEFINE( gint, gnome_print_rgbimage,
-        (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_rgbaimage,
-        (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 )
-
-    wxDL_METHOD_DEFINE( gint, gnome_print_concat,
-        (GnomePrintContext *pc, const gdouble *matrix), (pc, matrix), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_scale,
-        (GnomePrintContext *pc, gdouble sx, gdouble sy), (pc, sx, sy), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_rotate,
-        (GnomePrintContext *pc, gdouble theta), (pc, theta), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_translate,
-        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
-
-    wxDL_METHOD_DEFINE( gint, gnome_print_gsave,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_grestore,
-        (GnomePrintContext *pc), (pc), 0 )
-
-    wxDL_METHOD_DEFINE( gint, gnome_print_clip,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_eoclip,
-        (GnomePrintContext *pc), (pc), 0 )
-
-    wxDL_METHOD_DEFINE( gint, gnome_print_beginpage,
-        (GnomePrintContext *pc, const guchar* name), (pc, name), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_showpage,
-        (GnomePrintContext *pc), (pc), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_end_doc,
-        (GnomePrintContext *pc), (pc), 0 )
-
-    wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout,
-        (GnomePrintContext *gpc), (gpc), NULL )
-    wxDL_VOIDMETHOD_DEFINE( gnome_print_pango_layout,
-        (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout)  )
-
-    wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new,
-        (GnomePrintConfig *config), (config), NULL )
-    wxDL_METHOD_DEFINE( GnomePrintContext*, gnome_print_job_get_context,
-        (GnomePrintJob *job), (job), NULL )
-    wxDL_METHOD_DEFINE( gint, gnome_print_job_close,
-        (GnomePrintJob *job), (job), 0 )
-    wxDL_METHOD_DEFINE( gint, gnome_print_job_print,
-        (GnomePrintJob *job), (job), 0 )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_job_get_page_size,
-        (GnomePrintJob *job, gdouble *width, gdouble *height), (job, width, height), 0 )
-
-    wxDL_METHOD_DEFINE( GnomePrintUnit*, gnome_print_unit_get_by_abbreviation,
-        (const guchar *abbreviation), (abbreviation), NULL )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_convert_distance,
-        (gdouble *distance, const GnomePrintUnit *from, const GnomePrintUnit *to), (distance, from, to), false )
-
-    wxDL_METHOD_DEFINE( GnomePrintConfig*, gnome_print_config_default,
-        (void), (), NULL )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set,
-        (GnomePrintConfig *config, const guchar *key, const guchar *value), (config, key, value), false )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_double,
-        (GnomePrintConfig *config, const guchar *key, gdouble value), (config, key, value), false )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_int,
-        (GnomePrintConfig *config, const guchar *key, gint value), (config, key, value), false )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_boolean,
-        (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length,
-        (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false )
-
-    wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get,
-        (GnomePrintConfig *config, const guchar *key), (config, key), NULL )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length,
-        (GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false )
-    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_boolean,
-        (GnomePrintConfig *config, const guchar *key, gboolean *val), (config, key, val), false )
-
-    wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new,
-        (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL )
-    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_construct_range_page,
-        (GnomePrintDialog *gpd, gint flags, gint start, gint end,
-        const guchar *currentlabel, const guchar *rangelabel),
-        (gpd, flags, start, end, currentlabel, rangelabel) )
-    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_get_copies,
-        (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate)  )
-    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_set_copies,
-        (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate)  )
-    wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range,
-        (GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE )
-    wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page,
-        (GnomePrintDialog *gpd, gint *start, gint *end), (gpd, start, end), 0 )
-
-    wxDL_METHOD_DEFINE( GtkWidget*, gnome_paper_selector_new_with_flags,
-        (GnomePrintConfig *config, gint flags), (config, flags), NULL )
-
-    wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
-        (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
-
-    wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);
-};
-
-wxGnomePrintLibrary::wxGnomePrintLibrary()
-{
-    wxLogNull log;
-
-    m_libGnomePrint.Load("libgnomeprint-2-2.so.0");
-    m_ok = m_libGnomePrint.IsLoaded();
-    if ( !m_ok )
-        return;
-
-    m_libGnomePrintUI.Load("libgnomeprintui-2-2.so.0");
-    m_ok = m_libGnomePrintUI.IsLoaded();
-    if ( !m_ok )
-    {
-        m_libGnomePrint.Unload();
-        return;
-    }
-
-    m_ok = InitializeMethods();
-}
-
-wxGnomePrintLibrary::~wxGnomePrintLibrary()
-{
-}
-
-bool wxGnomePrintLibrary::IsOk()
-{
-    return m_ok;
-}
-
-bool wxGnomePrintLibrary::InitializeMethods()
-{
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbimage );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_concat );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_gsave );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_clip );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_beginpage );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_create_layout );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_new );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_unit_get_by_abbreviation );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_default );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length );
-
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length );
-    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean );
-
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_new );
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page );
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies );
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies );
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range );
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page );
-
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags );
-
-    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new );
-
-    return true;
-}
-
-static wxGnomePrintLibrary* gs_libGnomePrint = NULL;
-
-//----------------------------------------------------------------------------
-// wxGnomePrintNativeData
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGnomePrintNativeData, wxPrintNativeDataBase)
-
-wxGnomePrintNativeData::wxGnomePrintNativeData()
-{
-    m_config = gs_libGnomePrint->gnome_print_config_default();
-    m_job = gs_libGnomePrint->gnome_print_job_new( m_config );
-}
-
-wxGnomePrintNativeData::~wxGnomePrintNativeData()
-{
-    g_object_unref (m_config);
-}
-
-bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
-{
-    guchar *res = gs_libGnomePrint->gnome_print_config_get( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
-    if (g_ascii_strcasecmp((const gchar *)res,"R90") == 0)
-        data.SetOrientation( wxLANDSCAPE );
-    else
-        data.SetOrientation( wxPORTRAIT );
-    g_free( res );
-
-    res = gs_libGnomePrint->gnome_print_config_get( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_OUTPUT_FILENAME );
-    if (res)
-    {
-        data.SetFilename( wxConvFile.cMB2WX( (const char*) res ) );
-        wxPrintf( "filename %s\n", data.GetFilename() );
-        g_free( res );
-    }
-    else
-    {
-        data.SetFilename( wxEmptyString );
-    }
-
-    gboolean ret;
-    if (gs_libGnomePrint->gnome_print_config_get_boolean( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE, &ret))
-    {
-        data.SetCollate( ret );
-    }
-
-    // gnome_print_v
-
-    return true;
-}
-
-bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
-{
-    if (data.GetOrientation() == wxLANDSCAPE)
-    {
-        gs_libGnomePrint->gnome_print_config_set( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
-            (guchar*)(char*)"R90" );
-    }
-    else
-    {
-        gs_libGnomePrint->gnome_print_config_set( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
-            (guchar*)(char*)"R0" );
-    }
-
-    if (data.GetCollate())
-    {
-        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
-            TRUE );
-    }
-    else
-    {
-        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
-            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
-            FALSE );
-    }
-
-    switch (data.GetPaperId())
-    {
-        case wxPAPER_A3:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"A3" );
-                                break;
-        case wxPAPER_A5:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"A5" );
-                                break;
-        case wxPAPER_B4:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"B4" );
-                                break;
-        case wxPAPER_B5:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"B5" );
-                                break;
-        case wxPAPER_LETTER:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"USLetter" );
-                                break;
-        case wxPAPER_LEGAL:     gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"USLegal" );
-                                break;
-        case wxPAPER_EXECUTIVE: gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"Executive" );
-                                break;
-        case wxPAPER_ENV_C5:    gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"C5" );
-                                break;
-        case wxPAPER_ENV_C6:    gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"C6" );
-                                break;
-        case wxPAPER_NONE:      break;
-
-        default:
-        case wxPAPER_A4:        gs_libGnomePrint->gnome_print_config_set( m_config,
-                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
-                                    (guchar*)(char*)"A4" );
-                                break;
-    }
-
-    return true;
-}
-
-//----------------------------------------------------------------------------
-// wxGnomePrintFactory
-//----------------------------------------------------------------------------
-
-wxPrinterBase* wxGnomePrintFactory::CreatePrinter( wxPrintDialogData *data )
-{
-    return new wxGnomePrinter( data );
-}
-
-wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview,
-                                                    wxPrintout *printout,
-                                                    wxPrintDialogData *data )
-{
-    return new wxGnomePrintPreview( preview, printout, data );
-}
-
-wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview,
-                                                    wxPrintout *printout,
-                                                    wxPrintData *data )
-{
-    return new wxGnomePrintPreview( preview, printout, data );
-}
-
-wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintDialogData *data )
-{
-    return new wxGnomePrintDialog( parent, data );
-}
-
-wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintData *data )
-{
-    return new wxGnomePrintDialog( parent, data );
-}
-
-wxPageSetupDialogBase *wxGnomePrintFactory::CreatePageSetupDialog( wxWindow *parent,
-                                                          wxPageSetupDialogData * data )
-{
-//  The native page setup dialog is broken. It
-//  miscalculates newly entered values for the
-//  margins if you have not chose "points" but
-//  e.g. centimerters.
-//  This has been fixed in GNOME CVS (maybe
-//  fixed in libgnomeprintui 2.8.1)
-
-    return new wxGnomePageSetupDialog( parent, data );
-}
-
-bool wxGnomePrintFactory::HasPrintSetupDialog()
-{
-    return false;
-}
-
-wxDialog *
-wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
-                                            wxPrintData * WXUNUSED(data))
-{
-    return NULL;
-}
-
-
-#if wxUSE_NEW_DC
-
-wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
-{
-    return new wxGnomePrinterDCImpl( owner, data );
-}
-
-#else
-
-wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
-{
-    return new wxGnomePrinterDC(data);
-}
-
-#endif
-
-bool wxGnomePrintFactory::HasOwnPrintToFile()
-{
-    return true;
-}
-
-bool wxGnomePrintFactory::HasPrinterLine()
-{
-    return true;
-}
-
-wxString wxGnomePrintFactory::CreatePrinterLine()
-{
-    // redundant now
-    return wxEmptyString;
-}
-
-bool wxGnomePrintFactory::HasStatusLine()
-{
-    // redundant now
-    return true;
-}
-
-wxString wxGnomePrintFactory::CreateStatusLine()
-{
-    // redundant now
-    return wxEmptyString;
-}
-
-wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
-{
-    return new wxGnomePrintNativeData;
-}
-
-//----------------------------------------------------------------------------
-// wxGnomePrintSetupDialog
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGnomePrintDialog, wxPrintDialogBase)
-
-wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData *data )
-                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
-                               wxPoint(0, 0), wxSize(600, 600),
-                               wxDEFAULT_DIALOG_STYLE |
-                               wxTAB_TRAVERSAL)
-{
-    if (data)
-        m_printDialogData = *data;
-
-    Init();
-}
-
-wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data )
-                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
-                               wxPoint(0, 0), wxSize(600, 600),
-                               wxDEFAULT_DIALOG_STYLE |
-                               wxTAB_TRAVERSAL)
-{
-    if (data)
-        m_printDialogData = *data;
-
-    Init();
-}
-
-void wxGnomePrintDialog::Init()
-{
-    wxPrintData data = m_printDialogData.GetPrintData();
-
-    data.ConvertToNative();
-
-    wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) data.GetNativeData();
-
-    m_widget = gs_libGnomePrint->gnome_print_dialog_new( native->GetPrintJob(),
-                                       (guchar*)"Print",
-                                       GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
-
-    int flag = 0;
-    if (m_printDialogData.GetEnableSelection())
-        flag |= GNOME_PRINT_RANGE_SELECTION;
-    if (m_printDialogData.GetEnablePageNumbers())
-        flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
-
-    gs_libGnomePrint->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
-                                             flag,
-                                             m_printDialogData.GetMinPage(),
-                                             m_printDialogData.GetMaxPage(),
-                                             NULL,
-                                             NULL );
-}
-
-wxGnomePrintDialog::~wxGnomePrintDialog()
-{
-    m_widget = NULL;
-}
-
-int wxGnomePrintDialog::ShowModal()
-{
-    int response = gtk_dialog_run (GTK_DIALOG (m_widget));
-
-    if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)
-    {
-        gtk_widget_destroy(m_widget);
-        m_widget = NULL;
-
-        return wxID_CANCEL;
-    }
-
-    m_printDialogData.GetPrintData().ConvertFromNative();
-
-    gint copies = 1;
-    gboolean collate = false;
-    gs_libGnomePrint->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );
-    m_printDialogData.SetNoCopies( copies );
-    m_printDialogData.SetCollate( collate );
-
-    switch (gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
-    {
-        case GNOME_PRINT_RANGE_SELECTION:
-            m_printDialogData.SetSelection( true );
-            break;
-        case GNOME_PRINT_RANGE_ALL:
-            m_printDialogData.SetAllPages( true );
-            m_printDialogData.SetFromPage( 0 );
-            m_printDialogData.SetToPage( 9999 );
-            break;
-        case GNOME_PRINT_RANGE_RANGE:
-        default:
-            gint start,end;
-            gs_libGnomePrint->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );
-            m_printDialogData.SetFromPage( start );
-            m_printDialogData.SetToPage( end );
-            break;
-    }
-
-    gtk_widget_destroy(m_widget);
-    m_widget = NULL;
-
-    if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW)
-        return wxID_PREVIEW;
-
-    return wxID_OK;
-}
-
-wxDC *wxGnomePrintDialog::GetPrintDC()
-{
-    // Later
-    return NULL;
-}
-
-bool wxGnomePrintDialog::Validate()
-{
-    return true;
-}
-
-bool wxGnomePrintDialog::TransferDataToWindow()
-{
-    return true;
-}
-
-bool wxGnomePrintDialog::TransferDataFromWindow()
-{
-    return true;
-}
-
-//----------------------------------------------------------------------------
-// wxGnomePageSetupDialog
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
-
-wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent),
-                                               wxPageSetupDialogData *data)
-{
-    if (data)
-        m_pageDialogData = *data;
-
-    m_pageDialogData.GetPrintData().ConvertToNative();
-
-    wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
-
-    // This *was* required as the page setup dialog
-    // calculates wrong values otherwise.
-#if 0
-    gs_libGnomePrint->gnome_print_config_set( native->GetPrintConfig(),
-                            (const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT,
-                            (const guchar*) "Pts" );
-#endif
-
-    GnomePrintConfig *config = native->GetPrintConfig();
-
-    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
-
-    double ml = (double) m_pageDialogData.GetMarginTopLeft().x;
-    double mt = (double) m_pageDialogData.GetMarginTopLeft().y;
-    double mr = (double) m_pageDialogData.GetMarginBottomRight().x;
-    double mb = (double) m_pageDialogData.GetMarginBottomRight().y;
-
-    gs_libGnomePrint->gnome_print_config_set_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
-    gs_libGnomePrint->gnome_print_config_set_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
-    gs_libGnomePrint->gnome_print_config_set_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
-    gs_libGnomePrint->gnome_print_config_set_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, mb, mm_unit );
-
-    m_widget = gtk_dialog_new();
-
-    gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
-
-    GtkWidget *main = gs_libGnomePrint->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
-        GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
-    gtk_container_set_border_width (GTK_CONTAINER (main), 8);
-    gtk_widget_show (main);
-
-    gtk_container_add( GTK_CONTAINER (GTK_DIALOG (m_widget)->vbox), main );
-
-    gtk_dialog_set_has_separator (GTK_DIALOG (m_widget), TRUE);
-
-    gtk_dialog_add_buttons (GTK_DIALOG (m_widget),
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK, GTK_RESPONSE_OK,
-                            NULL);
-
-    gtk_dialog_set_default_response (GTK_DIALOG (m_widget),
-                            GTK_RESPONSE_OK);
-}
-
-wxGnomePageSetupDialog::~wxGnomePageSetupDialog()
-{
-}
-
-wxPageSetupDialogData& wxGnomePageSetupDialog::GetPageSetupDialogData()
-{
-    return m_pageDialogData;
-}
-
-int wxGnomePageSetupDialog::ShowModal()
-{
-    wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
-
-    GnomePrintConfig *config = native->GetPrintConfig();
-
-
-    int ret = gtk_dialog_run( GTK_DIALOG(m_widget) );
-
-    if (ret == GTK_RESPONSE_OK)
-    {
-        // Transfer data back to m_pageDialogData
-        m_pageDialogData.GetPrintData().ConvertFromNative();
-
-        // I don't know how querying the last parameter works
-        double ml,mr,mt,mb,pw,ph;
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
-        gs_libGnomePrint->gnome_print_config_get_length (config,
-            (const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL);
-
-        // This code converts correctly from what the user chose
-        // as the unit although I query Pts here
-        const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
-        const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
-        gs_libGnomePrint->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
-        gs_libGnomePrint->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
-        gs_libGnomePrint->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
-        gs_libGnomePrint->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
-        gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
-        gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
-
-        m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
-        m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
-
-        m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) );
-
-        ret = wxID_OK;
-    }
-    else
-    {
-        ret = wxID_CANCEL;
-    }
-
-    gtk_widget_destroy( m_widget );
-    m_widget = NULL;
-
-    return ret;
-}
-
-bool wxGnomePageSetupDialog::Validate()
-{
-    return true;
-}
-
-bool wxGnomePageSetupDialog::TransferDataToWindow()
-{
-    return true;
-}
-
-bool wxGnomePageSetupDialog::TransferDataFromWindow()
-{
-    return true;
-}
-
-//----------------------------------------------------------------------------
-// wxGnomePrinter
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGnomePrinter, wxPrinterBase)
-
-wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
-    wxPrinterBase( data )
-{
-    m_native_preview = false;
-}
-
-wxGnomePrinter::~wxGnomePrinter()
-{
-}
-
-bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
-{
-    if (!printout)
-    {
-        sm_lastError = wxPRINTER_ERROR;
-        return false;
-    }
-
-    wxPrintData printdata = GetPrintDialogData().GetPrintData();
-
-    wxGnomePrintNativeData *native =
-        (wxGnomePrintNativeData*) printdata.GetNativeData();
-
-    GnomePrintJob *job = gs_libGnomePrint->gnome_print_job_new( native->GetPrintConfig() );
-
-    // The GnomePrintJob is temporarily stored in the
-    // native print data as the native print dialog
-    // needs to access it.
-    native->SetPrintJob( job );
-
-
-    if (m_printDialogData.GetMinPage() < 1)
-        m_printDialogData.SetMinPage(1);
-    if (m_printDialogData.GetMaxPage() < 1)
-        m_printDialogData.SetMaxPage(9999);
-
-    wxDC *dc;
-    if (prompt)
-        dc = PrintDialog( parent );
-    else
-#if wxUSE_NEW_DC
-        dc = new wxPrinterDC( printdata );  // TODO: check that this works
-#else
-        dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
-#endif
-
-    if (!dc)
-    {
-        gs_libGnomePrint->gnome_print_job_close( job );
-        g_object_unref (job);
-        if (sm_lastError != wxPRINTER_CANCELLED)
-            sm_lastError = wxPRINTER_ERROR;
-        return false;
-    }
-
-    printout->SetPPIScreen(wxGetDisplayPPI());
-    printout->SetPPIPrinter( dc->GetResolution(),
-                             dc->GetResolution() );
-
-    printout->SetDC(dc);
-
-    int w, h;
-    dc->GetSize(&w, &h);
-    printout->SetPageSizePixels((int)w, (int)h);
-    printout->SetPaperRectPixels(wxRect(0, 0, w, h));
-    int mw, mh;
-    dc->GetSizeMM(&mw, &mh);
-    printout->SetPageSizeMM((int)mw, (int)mh);
-    printout->OnPreparePrinting();
-
-    // Get some parameters from the printout, if defined
-    int fromPage, toPage;
-    int minPage, maxPage;
-    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-    if (maxPage == 0)
-    {
-        gs_libGnomePrint->gnome_print_job_close( job );
-        g_object_unref (job);
-        sm_lastError = wxPRINTER_ERROR;
-        return false;
-    }
-
-    printout->OnBeginPrinting();
-
-    int minPageNum = minPage, maxPageNum = maxPage;
-
-    if ( !m_printDialogData.GetAllPages() )
-    {
-        minPageNum = m_printDialogData.GetFromPage();
-        maxPageNum = m_printDialogData.GetToPage();
-    }
-
-
-    int copyCount;
-    for ( copyCount = 1;
-          copyCount <= m_printDialogData.GetNoCopies();
-          copyCount++ )
-    {
-        if (!printout->OnBeginDocument(minPageNum, maxPageNum))
-        {
-            wxLogError(_("Could not start printing."));
-            sm_lastError = wxPRINTER_ERROR;
-            break;
-        }
-
-        int pn;
-        for ( pn = minPageNum;
-              pn <= maxPageNum && printout->HasPage(pn);
-              pn++ )
-        {
-            dc->StartPage();
-            printout->OnPrintPage(pn);
-            dc->EndPage();
-        }
-
-        printout->OnEndDocument();
-        printout->OnEndPrinting();
-    }
-
-    gs_libGnomePrint->gnome_print_job_close( job );
-    if (m_native_preview)
-    {
-        const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
-        GtkWidget *preview = gs_libGnomePrint->gnome_print_job_preview_new
-                                     (
-                                        job,
-                                        (const guchar *)title.data()
-                                     );
-        gtk_widget_show(preview);
-    }
-    else
-    {
-        gs_libGnomePrint->gnome_print_job_print( job );
-    }
-
-    g_object_unref (job);
-    delete dc;
-
-    return (sm_lastError == wxPRINTER_NO_ERROR);
-}
-
-wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
-{
-    wxGnomePrintDialog dialog( parent, &m_printDialogData );
-    int ret = dialog.ShowModal();
-    if (ret == wxID_CANCEL)
-    {
-        sm_lastError = wxPRINTER_CANCELLED;
-        return NULL;
-    }
-
-    m_native_preview = ret == wxID_PREVIEW;
-
-    m_printDialogData = dialog.GetPrintDialogData();
-#if wxUSE_NEW_DC
-    return new wxPrinterDC( m_printDialogData.GetPrintData() );
-#else
-    return new wxGnomePrinterDC( m_printDialogData.GetPrintData() );
-#endif
-}
-
-bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent))
-{
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// wxGnomePrinterDC
-//-----------------------------------------------------------------------------
-
-// conversion
-static const double RAD2DEG  = 180.0 / M_PI;
-
-// we don't want to use only 72 dpi from GNOME print
-static const int DPI = 600;
-static const double PS2DEV = 600.0 / 72.0;
-static const double DEV2PS = 72.0 / 600.0;
-
-#define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * DEV2PS)
-#define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
-#define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
-#define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
-
-#if wxUSE_NEW_DC
-IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl)
-#else
-IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC)
-#endif
-
-#if wxUSE_NEW_DC
-wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
-   wxDCImpl( owner )
-#else
-wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
-#endif
-{
-    m_printData = data;
-
-    wxGnomePrintNativeData *native =
-        (wxGnomePrintNativeData*) m_printData.GetNativeData();
-
-    m_job = native->GetPrintJob();
-    m_gpc = gs_libGnomePrint->gnome_print_job_get_context (m_job);
-
-    m_layout = gs_libGnomePrint->gnome_print_pango_create_layout( m_gpc );
-    m_fontdesc = pango_font_description_from_string( "Sans 12" );
-    m_context = NULL;
-
-    m_currentRed = 0;
-    m_currentBlue = 0;
-    m_currentGreen = 0;
-
-    // Query page size. This seems to omit the margins
-    double pw,ph;
-    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
-
-    m_pageHeight = ph * PS2DEV;
-}
-
-wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl()
-{
-}
-
-bool wxGnomePrinterDCImpl::IsOk() const
-{
-    return true;
-}
-
-bool
-wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
-                            wxCoord WXUNUSED(y1),
-                            const wxColour& WXUNUSED(col),
-                            wxFloodFillStyle WXUNUSED(style))
-{
-    return false;
-}
-
-bool
-wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),
-                           wxCoord WXUNUSED(y1),
-                           wxColour * WXUNUSED(col)) const
-{
-    return false;
-}
-
-void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-{
-    if ( m_pen.IsTransparent() )
-        return;
-
-    SetPen( m_pen );
-
-    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
-    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
-    gs_libGnomePrint->gnome_print_stroke ( m_gpc);
-
-    CalcBoundingBox( x1, y1 );
-    CalcBoundingBox( x2, y2 );
-}
-
-void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
-{
-}
-
-void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
-{
-    double dx = x1 - xc;
-    double dy = y1 - yc;
-    double radius = sqrt((double)(dx*dx+dy*dy));
-    double alpha1, alpha2;
-    if (x1 == x2 && y1 == y2)
-    {
-        alpha1 = 0.0;
-        alpha2 = 360.0;
-    }
-    else if ( wxIsNullDouble(radius) )
-    {
-        alpha1 =
-        alpha2 = 0.0;
-    }
-    else
-    {
-        alpha1 = (x1 - xc == 0) ?
-            (y1 - yc < 0) ? 90.0 : -90.0 :
-            -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG;
-        alpha2 = (x2 - xc == 0) ?
-            (y2 - yc < 0) ? 90.0 : -90.0 :
-            -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG;
-
-        while (alpha1 <= 0)   alpha1 += 360;
-        while (alpha2 <= 0)   alpha2 += 360; // adjust angles to be between
-        while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree
-        while (alpha2 > 360)  alpha2 -= 360;
-    }
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush( m_brush );
-        gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
-        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
-
-        gs_libGnomePrint->gnome_print_fill( m_gpc );
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen (m_pen);
-        gs_libGnomePrint->gnome_print_newpath( m_gpc );
-        gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
-        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
-        gs_libGnomePrint->gnome_print_closepath( m_gpc );
-
-        gs_libGnomePrint->gnome_print_stroke( m_gpc );
-    }
-
-    CalcBoundingBox (x1, y1);
-    CalcBoundingBox (x2, y2);
-    CalcBoundingBox (xc, yc);
-}
-
-void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
-{
-    x += w/2;
-    y += h/2;
-
-    double xx = XLOG2DEV(x);
-    double yy = YLOG2DEV(y);
-
-    gs_libGnomePrint->gnome_print_gsave( m_gpc );
-
-    gs_libGnomePrint->gnome_print_translate( m_gpc, xx, yy );
-    double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
-    gs_libGnomePrint->gnome_print_scale( m_gpc, 1.0, scale );
-
-    xx = 0.0;
-    yy = 0.0;
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush( m_brush );
-
-        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
-        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
-            XLOG2DEVREL(w)/2, sa, ea, 0 );
-        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
-
-        gs_libGnomePrint->gnome_print_fill( m_gpc );
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen (m_pen);
-
-        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
-            XLOG2DEVREL(w)/2, sa, ea, 0 );
-
-        gs_libGnomePrint->gnome_print_stroke( m_gpc );
-    }
-
-    gs_libGnomePrint->gnome_print_grestore( m_gpc );
-
-    CalcBoundingBox( x, y );
-    CalcBoundingBox( x+w, y+h );
-}
-
-void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
-{
-}
-
-void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
-{
-    if (n <= 0) return;
-
-    if ( m_pen.IsTransparent() )
-        return;
-
-    SetPen (m_pen);
-
-    int i;
-    for ( i =0; i<n ; i++ )
-        CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
-
-    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
-
-    for (i = 1; i < n; i++)
-        gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
-
-    gs_libGnomePrint->gnome_print_stroke ( m_gpc);
-}
-
-void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
-                                   wxCoord xoffset, wxCoord yoffset,
-                                   wxPolygonFillMode WXUNUSED(fillStyle))
-{
-    if (n==0) return;
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush( m_brush );
-
-        int x = points[0].x + xoffset;
-        int y = points[0].y + yoffset;
-        CalcBoundingBox( x, y );
-        gs_libGnomePrint->gnome_print_newpath( m_gpc );
-        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        int i;
-        for (i = 1; i < n; i++)
-        {
-            x = points[i].x + xoffset;
-            y = points[i].y + yoffset;
-            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-            CalcBoundingBox( x, y );
-        }
-        gs_libGnomePrint->gnome_print_closepath( m_gpc );
-        gs_libGnomePrint->gnome_print_fill( m_gpc );
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen (m_pen);
-
-        int x = points[0].x + xoffset;
-        int y = points[0].y + yoffset;
-        gs_libGnomePrint->gnome_print_newpath( m_gpc );
-        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        int i;
-        for (i = 1; i < n; i++)
-        {
-            x = points[i].x + xoffset;
-            y = points[i].y + yoffset;
-            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-            CalcBoundingBox( x, y );
-        }
-        gs_libGnomePrint->gnome_print_closepath( m_gpc );
-        gs_libGnomePrint->gnome_print_stroke( m_gpc );
-    }
-}
-
-void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
-{
-#if wxUSE_NEW_DC
-    wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
-#else
-    wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
-#endif
-}
-
-void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    width--;
-    height--;
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush( m_brush );
-
-        gs_libGnomePrint->gnome_print_newpath( m_gpc );
-        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
-        gs_libGnomePrint->gnome_print_closepath( m_gpc );
-        gs_libGnomePrint->gnome_print_fill( m_gpc );
-
-        CalcBoundingBox( x, y );
-        CalcBoundingBox( x + width, y + height );
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen (m_pen);
-
-        gs_libGnomePrint->gnome_print_newpath( m_gpc );
-        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
-        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
-        gs_libGnomePrint->gnome_print_closepath( m_gpc );
-        gs_libGnomePrint->gnome_print_stroke( m_gpc );
-
-        CalcBoundingBox( x, y );
-        CalcBoundingBox( x + width, y + height );
-    }
-}
-
-void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
-{
-    width--;
-    height--;
-
-    wxCoord rad = wxRound( radius );
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush(m_brush);
-        gs_libGnomePrint->gnome_print_newpath(m_gpc);
-        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + rad),YLOG2DEV(y),
-                                    XLOG2DEV(x),YLOG2DEV(y),
-                                    XLOG2DEV(x),YLOG2DEV(y + rad));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
-                                    XLOG2DEV(x),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + width),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
-                                    XLOG2DEV(x + width),YLOG2DEV(y),
-                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_closepath(m_gpc);
-        gs_libGnomePrint->gnome_print_fill(m_gpc);
-
-        CalcBoundingBox(x,y);
-        CalcBoundingBox(x+width,y+height);
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen(m_pen);
-        gs_libGnomePrint->gnome_print_newpath(m_gpc);
-        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + rad),YLOG2DEV(y),
-                                    XLOG2DEV(x),YLOG2DEV(y),
-                                    XLOG2DEV(x),YLOG2DEV(y + rad));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
-                                    XLOG2DEV(x),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + width),YLOG2DEV(y + height),
-                                    XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
-                                    XLOG2DEV(x + width),YLOG2DEV(y),
-                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
-        gs_libGnomePrint->gnome_print_closepath(m_gpc);
-        gs_libGnomePrint->gnome_print_stroke(m_gpc);
-
-        CalcBoundingBox(x,y);
-        CalcBoundingBox(x+width,y+height);
-    }
-}
-
-void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y,
-                                        wxCoord width, wxCoord height)
-{
-    double r = 4 * (sqrt(2.) - 1) / 3;
-    double  halfW = 0.5 * width,
-            halfH = 0.5 * height,
-            halfWR = r * halfW,
-            halfHR = r * halfH;
-    wxCoord halfWI = (wxCoord) halfW,
-            halfHI = (wxCoord) halfH;
-
-    gs_libGnomePrint->gnome_print_newpath( m_gpc );
-
-    // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
-    gs_libGnomePrint->gnome_print_moveto( m_gpc,
-                XLOG2DEV(x + width),
-                YLOG2DEV(y + halfHI) );
-    gs_libGnomePrint->gnome_print_curveto( m_gpc,
-                XLOG2DEV(x + width),
-                YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
-                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
-                YLOG2DEV(y + height),
-                XLOG2DEV(x + halfWI),
-                YLOG2DEV(y + height) );
-    gs_libGnomePrint->gnome_print_curveto( m_gpc,
-                XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
-                YLOG2DEV(y + height),
-                XLOG2DEV(x),
-                YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
-                XLOG2DEV(x), YLOG2DEV(y+halfHI) );
-    gs_libGnomePrint->gnome_print_curveto( m_gpc,
-                XLOG2DEV(x),
-                YLOG2DEV(y + (wxCoord) rint (halfH - halfHR)),
-                XLOG2DEV(x + (wxCoord) rint (halfW - halfWR)),
-                YLOG2DEV(y),
-                XLOG2DEV(x+halfWI), YLOG2DEV(y) );
-    gs_libGnomePrint->gnome_print_curveto( m_gpc,
-                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
-                YLOG2DEV(y),
-                XLOG2DEV(x + width),
-                YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
-                XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
-
-    gs_libGnomePrint->gnome_print_closepath(m_gpc);
-}
-
-void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    width--;
-    height--;
-
-    if ( m_brush.IsNonTransparent() )
-    {
-        SetBrush( m_brush );
-        makeEllipticalPath( x, y, width, height );
-        gs_libGnomePrint->gnome_print_fill( m_gpc );
-        CalcBoundingBox( x, y );
-        CalcBoundingBox( x + width, y + height );
-    }
-
-    if ( m_pen.IsNonTransparent() )
-    {
-        SetPen (m_pen);
-        makeEllipticalPath( x, y, width, height );
-        gs_libGnomePrint->gnome_print_stroke( m_gpc );
-        CalcBoundingBox( x, y );
-        CalcBoundingBox( x + width, y + height );
-    }
-}
-
-#if wxUSE_SPLINES
-void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points)
-{
-    SetPen (m_pen);
-
-    double c, d, x1, y1, x2, y2, x3, y3;
-    wxPoint *p, *q;
-
-    wxPointList::compatibility_iterator node = points->GetFirst();
-    p = node->GetData();
-    x1 = p->x;
-    y1 = p->y;
-
-    node = node->GetNext();
-    p = node->GetData();
-    c = p->x;
-    d = p->y;
-    x3 =
-         (double)(x1 + c) / 2;
-    y3 =
-         (double)(y1 + d) / 2;
-
-    gs_libGnomePrint->gnome_print_newpath( m_gpc );
-    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
-    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
-
-    CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
-    CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
-
-    node = node->GetNext();
-    while (node)
-    {
-        q = node->GetData();
-
-        x1 = x3;
-        y1 = y3;
-        x2 = c;
-        y2 = d;
-        c = q->x;
-        d = q->y;
-        x3 = (double)(x2 + c) / 2;
-        y3 = (double)(y2 + d) / 2;
-
-        gs_libGnomePrint->gnome_print_curveto(m_gpc,
-            XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
-            XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
-            XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
-
-        CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
-        CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
-
-        node = node->GetNext();
-    }
-
-    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
-
-    gs_libGnomePrint->gnome_print_stroke( m_gpc );
-}
-#endif // wxUSE_SPLINES
-
-bool
-wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
-                      wxCoord width, wxCoord height,
-                      wxDC *source,
-                      wxCoord xsrc, wxCoord ysrc,
-                      wxRasterOperationMode rop,
-                      bool WXUNUSED(useMask),
-                      wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
-{
-    wxCHECK_MSG( source, false, wxT("invalid source dc") );
-
-    // blit into a bitmap
-    wxBitmap bitmap( width, height );
-    wxMemoryDC memDC;
-    memDC.SelectObject(bitmap);
-    memDC.Blit(0, 0, width, height, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */
-    memDC.SelectObject(wxNullBitmap);
-
-    // draw bitmap. scaling and positioning is done there
-    GetOwner()->DrawBitmap( bitmap, xdest, ydest );
-
-    return true;
-}
-
-void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
-{
-    DoDrawBitmap( icon, x, y, true );
-}
-
-void
-wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
-                             wxCoord x, wxCoord y,
-                             bool WXUNUSED(useMask))
-{
-    if (!bitmap.IsOk()) return;
-
-    if (bitmap.HasPixbuf())
-    {
-        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
-        guchar *raw_image = gdk_pixbuf_get_pixels( pixbuf );
-        bool has_alpha = gdk_pixbuf_get_has_alpha( pixbuf );
-        int rowstride = gdk_pixbuf_get_rowstride( pixbuf );
-        int height = gdk_pixbuf_get_height( pixbuf );
-        int width = gdk_pixbuf_get_width( pixbuf );
-
-        gs_libGnomePrint->gnome_print_gsave( m_gpc );
-        double matrix[6];
-        matrix[0] = XLOG2DEVREL(width);
-        matrix[1] = 0;
-        matrix[2] = 0;
-        matrix[3] = YLOG2DEVREL(height);
-        matrix[4] = XLOG2DEV(x);
-        matrix[5] = YLOG2DEV(y+height);
-        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
-        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
-        if (has_alpha)
-            gs_libGnomePrint->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
-        else
-            gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
-        gs_libGnomePrint->gnome_print_grestore( m_gpc );
-    }
-    else
-    {
-        wxImage image = bitmap.ConvertToImage();
-
-        if (!image.IsOk()) return;
-
-        gs_libGnomePrint->gnome_print_gsave( m_gpc );
-        double matrix[6];
-        matrix[0] = XLOG2DEVREL(image.GetWidth());
-        matrix[1] = 0;
-        matrix[2] = 0;
-        matrix[3] = YLOG2DEVREL(image.GetHeight());
-        matrix[4] = XLOG2DEV(x);
-        matrix[5] = YLOG2DEV(y+image.GetHeight());
-        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
-        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
-        gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
-        gs_libGnomePrint->gnome_print_grestore( m_gpc );
-    }
-}
-
-void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
-{
-    DoDrawRotatedText( text, x, y, 0.0 );
-}
-
-void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
-{
-    double xx = XLOG2DEV(x);
-    double yy = YLOG2DEV(y);
-
-    const wxScopedCharBuffer data(text.utf8_str());
-
-    pango_layout_set_text(m_layout, data, data.length());
-    const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
-
-    if (m_textForegroundColour.IsOk())
-    {
-        unsigned char red = m_textForegroundColour.Red();
-        unsigned char blue = m_textForegroundColour.Blue();
-        unsigned char green = m_textForegroundColour.Green();
-
-        if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
-        {
-            double redPS = (double)(red) / 255.0;
-            double bluePS = (double)(blue) / 255.0;
-            double greenPS = (double)(green) / 255.0;
-
-            gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
-
-            m_currentRed = red;
-            m_currentBlue = blue;
-            m_currentGreen = green;
-        }
-    }
-
-#if 0
-        if ( m_backgroundMode == wxSOLID )
-        {
-            gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
-            gdk_draw_rectangle(m_window, m_textGC, TRUE, xx, yy, w, h);
-            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
-        }
-#endif
-
-    // Draw layout.
-    gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy);
-
-    gs_libGnomePrint->gnome_print_gsave( m_gpc );
-
-    gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS );
-
-    if (fabs(angle) > 0.00001)
-        gs_libGnomePrint->gnome_print_rotate( m_gpc, angle );
-
-    gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout );
-
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-
-    gs_libGnomePrint->gnome_print_grestore( m_gpc );
-
-    if (setAttrs)
-    {
-        // undo underline attributes setting:
-        pango_layout_set_attributes(m_layout, NULL);
-    }
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + w, y + h);
-}
-
-void wxGnomePrinterDCImpl::Clear()
-{
-}
-
-void wxGnomePrinterDCImpl::SetFont( const wxFont& font )
-{
-    m_font = font;
-
-    if (m_font.IsOk())
-    {
-        if (m_fontdesc)
-            pango_font_description_free( m_fontdesc );
-
-        m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
-
-        float size = pango_font_description_get_size( m_fontdesc );
-        size = size * GetFontPointSizeAdjustment(72.0);
-        pango_font_description_set_size( m_fontdesc, (gint)size );
-
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-}
-
-void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
-{
-    if (!pen.IsOk()) return;
-
-    m_pen = pen;
-
-    double width;
-
-    if (m_pen.GetWidth() <= 0)
-        width = 0.1;
-    else
-        width = (double) m_pen.GetWidth();
-
-    gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, width * DEV2PS * m_scaleX );
-
-    static const double dotted[] =  {2.0, 5.0};
-    static const double short_dashed[] = {4.0, 4.0};
-    static const double wxCoord_dashed[] = {4.0, 8.0};
-    static const double dotted_dashed[] = {6.0, 6.0, 2.0, 6.0};
-
-    switch (m_pen.GetStyle())
-    {
-        case wxPENSTYLE_DOT:        gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
-        case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
-        case wxPENSTYLE_LONG_DASH:  gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
-        case wxPENSTYLE_DOT_DASH:   gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
-        case wxPENSTYLE_USER_DASH:
-        {
-            // It may be noted that libgnomeprint between at least
-            // versions 2.8.0 and 2.12.1 makes a copy of the dashes
-            // and then leak the memory since it doesn't set the
-            // internal flag "privatedash" to 0.
-            wxDash *wx_dashes;
-            int num = m_pen.GetDashes (&wx_dashes);
-            gdouble *g_dashes = g_new( gdouble, num );
-            int i;
-            for (i = 0; i < num; ++i)
-                g_dashes[i] = (gdouble) wx_dashes[i];
-            gs_libGnomePrint -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
-            g_free( g_dashes );
-        }
-        break;
-        case wxPENSTYLE_SOLID:
-        case wxPENSTYLE_TRANSPARENT:
-        default:              gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
-    }
-
-
-    unsigned char red = m_pen.GetColour().Red();
-    unsigned char blue = m_pen.GetColour().Blue();
-    unsigned char green = m_pen.GetColour().Green();
-
-    if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
-    {
-        double redPS = (double)(red) / 255.0;
-        double bluePS = (double)(blue) / 255.0;
-        double greenPS = (double)(green) / 255.0;
-
-        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
-
-        m_currentRed = red;
-        m_currentBlue = blue;
-        m_currentGreen = green;
-    }
-}
-
-void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
-{
-    if (!brush.IsOk()) return;
-
-    m_brush = brush;
-
-    // Brush colour
-    unsigned char red = m_brush.GetColour().Red();
-    unsigned char blue = m_brush.GetColour().Blue();
-    unsigned char green = m_brush.GetColour().Green();
-
-    if (!m_colour)
-    {
-        // Anything not white is black
-        if (! (red == (unsigned char) 255 &&
-               blue == (unsigned char) 255 &&
-               green == (unsigned char) 255) )
-        {
-            red = (unsigned char) 0;
-            green = (unsigned char) 0;
-            blue = (unsigned char) 0;
-        }
-        // setgray here ?
-    }
-
-    if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
-    {
-        double redPS = (double)(red) / 255.0;
-        double bluePS = (double)(blue) / 255.0;
-        double greenPS = (double)(green) / 255.0;
-
-        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
-
-        m_currentRed = red;
-        m_currentBlue = blue;
-        m_currentGreen = green;
-    }
-}
-
-void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
-{
-}
-
-void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))
-{
-}
-
-void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-#if wxUSE_NEW_DC
-    m_clipping = TRUE;    // TODO move somewhere else
-    m_clipX1 = x;
-    m_clipY1 = y;
-    m_clipX2 = x + width;
-    m_clipY2 = y + height;
-#else
-    wxDC::DoSetClippingRegion( x, y, width, height );
-#endif
-
-    gs_libGnomePrint->gnome_print_gsave( m_gpc );
-
-    gs_libGnomePrint->gnome_print_newpath( m_gpc );
-    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
-    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
-    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
-    gs_libGnomePrint->gnome_print_closepath( m_gpc );
-    gs_libGnomePrint->gnome_print_clip( m_gpc );
-}
-
-void wxGnomePrinterDCImpl::DestroyClippingRegion()
-{
-#if wxUSE_NEW_DC
-    wxDCImpl::DestroyClippingRegion();
-#else
-    wxDC::DestroyClippingRegion();
-#endif
-
-    gs_libGnomePrint->gnome_print_grestore( m_gpc );
-
-#if 0
-    // not needed, we set the values in each
-    // drawing method anyways
-    SetPen( m_pen );
-    SetBrush( m_brush );
-    SetFont( m_font );
-#endif
-}
-
-bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))
-{
-    return true;
-}
-
-void wxGnomePrinterDCImpl::EndDoc()
-{
-    gs_libGnomePrint->gnome_print_end_doc( m_gpc );
-}
-
-void wxGnomePrinterDCImpl::StartPage()
-{
-    gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
-}
-
-void wxGnomePrinterDCImpl::EndPage()
-{
-    gs_libGnomePrint->gnome_print_showpage( m_gpc );
-}
-
-wxCoord wxGnomePrinterDCImpl::GetCharHeight() const
-{
-    pango_layout_set_text( m_layout, "H", 1 );
-
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-
-    return h;
-}
-
-wxCoord wxGnomePrinterDCImpl::GetCharWidth() const
-{
-    pango_layout_set_text( m_layout, "H", 1 );
-
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-
-    return w;
-}
-
-void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
-                     wxCoord *descent,
-                     wxCoord *externalLeading,
-                     const wxFont *theFont ) const
-{
-    if ( width )
-        *width = 0;
-    if ( height )
-        *height = 0;
-    if ( descent )
-        *descent = 0;
-    if ( externalLeading )
-        *externalLeading = 0;
-
-    if (string.empty())
-    {
-        return;
-    }
-
-    // Set layout's text
-
-    const wxScopedCharBuffer dataUTF8(string.utf8_str());
-
-    gint oldSize = 0;
-    if ( theFont )
-    {
-        // scale the font and apply it
-        PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
-        oldSize = pango_font_description_get_size(desc);
-        float size = oldSize * GetFontPointSizeAdjustment(72.0);
-        pango_font_description_set_size(desc, (gint)size);
-
-        pango_layout_set_font_description(m_layout, desc);
-    }
-
-    pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
-
-    int h;
-    pango_layout_get_pixel_size( m_layout, width, &h );
-    if ( height )
-        *height = h;
-
-    if (descent)
-    {
-        PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
-        int baseline = pango_layout_iter_get_baseline(iter);
-        pango_layout_iter_free(iter);
-        *descent = h - PANGO_PIXELS(baseline);
-    }
-
-    if ( theFont )
-    {
-        // restore font and reset font's size back
-        pango_layout_set_font_description(m_layout, m_fontdesc);
-
-        PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
-        pango_font_description_set_size(desc, oldSize);
-    }
-}
-
-void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const
-{
-    wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) m_printData.GetNativeData();
-
-    // Query page size. This seems to omit the margins
-    double pw,ph;
-    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
-
-    if (width)
-        *width = wxRound( pw * PS2DEV );
-
-    if (height)
-        *height = wxRound( ph * PS2DEV );
-}
-
-void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const
-{
-    wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) m_printData.GetNativeData();
-
-    // This code assumes values in Pts.
-
-    double pw,ph;
-    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
-
-    // Convert to mm.
-
-    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
-    const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
-    gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
-    gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
-
-    if (width)
-        *width = (int) (pw + 0.5);
-    if (height)
-        *height = (int) (ph + 0.5);
-}
-
-wxSize wxGnomePrinterDCImpl::GetPPI() const
-{
-    return wxSize(DPI,DPI);
-}
-
-void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)
-{
-    m_printData = data;
-
-    int height;
-    if (m_printData.GetOrientation() == wxPORTRAIT)
-        GetOwner()->GetSize( NULL, &height );
-    else
-        GetOwner()->GetSize( &height, NULL );
-    m_deviceLocalOriginY = height;
-}
-
-// overridden for wxPrinterDC Impl
-
-int wxGnomePrinterDCImpl::GetResolution() const
-{
-    return DPI;
-}
-
-wxRect wxGnomePrinterDCImpl::GetPaperRect() const
-{
-    // GNOME print doesn't support printer margins
-    int w = 0;
-    int h = 0;
-    DoGetSize( &w, &h );
-    return wxRect( 0, 0, w, h );
-}
-
-// ----------------------------------------------------------------------------
-// wxGnomePrintModule
-// ----------------------------------------------------------------------------
-
-bool wxGnomePrintModule::OnInit()
-{
-    gs_libGnomePrint = new wxGnomePrintLibrary;
-    if (gs_libGnomePrint->IsOk())
-        wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
-    return true;
-}
-
-void wxGnomePrintModule::OnExit()
-{
-    wxDELETE(gs_libGnomePrint);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
-
-// ----------------------------------------------------------------------------
-// Print preview
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGnomePrintPreview, wxPrintPreviewBase)
-
-void wxGnomePrintPreview::Init(wxPrintout * WXUNUSED(printout),
-                                    wxPrintout * WXUNUSED(printoutForPrinting))
-{
-    DetermineScaling();
-}
-
-wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
-                                                   wxPrintout *printoutForPrinting,
-                                                   wxPrintDialogData *data)
-                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
-{
-    Init(printout, printoutForPrinting);
-}
-
-wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
-                                                   wxPrintout *printoutForPrinting,
-                                                   wxPrintData *data)
-                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
-{
-    Init(printout, printoutForPrinting);
-}
-
-wxGnomePrintPreview::~wxGnomePrintPreview()
-{
-}
-
-bool wxGnomePrintPreview::Print(bool interactive)
-{
-    if (!m_printPrintout)
-        return false;
-
-    wxPrinter printer(& m_printDialogData);
-    return printer.Print(m_previewFrame, m_printPrintout, interactive);
-}
-
-void wxGnomePrintPreview::DetermineScaling()
-{
-    wxPaperSize paperType = m_printDialogData.GetPrintData().GetPaperId();
-    if (paperType == wxPAPER_NONE)
-        paperType = wxPAPER_NONE;
-
-    wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType);
-    if (!paper)
-        paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4);
-
-    if (paper)
-    {
-        m_previewPrintout->SetPPIScreen(wxGetDisplayPPI());
-
-        int resolution = DPI;
-        m_previewPrintout->SetPPIPrinter( resolution, resolution );
-
-        wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
-
-        // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible.
-
-        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
-        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);
-        wxSize sizeTenthsMM(paper->GetSize());
-        wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
-
-        // If in landscape mode, we need to swap the width and height.
-        if ( m_printDialogData.GetPrintData().GetOrientation() == wxLANDSCAPE )
-        {
-            m_pageWidth = sizeDevUnits.y;
-            m_pageHeight = sizeDevUnits.x;
-            m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x);
-        }
-        else
-        {
-            m_pageWidth = sizeDevUnits.x;
-            m_pageHeight = sizeDevUnits.y;
-            m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y);
-        }
-        m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
-        m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
-
-        // At 100%, the page should look about page-size on the screen.
-        m_previewScaleX = (double)0.8 * 72.0 / (double)resolution;
-        m_previewScaleY = m_previewScaleX;
-    }
-}
-
-#endif
-    // wxUSE_LIBGNOMEPRINT
diff --git a/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp b/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp
index cfff727364..3f86418b10 100644
--- a/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp
+++ b/Externals/wxWidgets3/src/gtk/gnome/gvfs.cpp
@@ -3,7 +3,6 @@
 // Author:      Robert Roebling
 // Purpose:     Implement GNOME VFS support
 // Created:     03/17/06
-// RCS-ID:      $Id: gvfs.cpp 57651 2008-12-30 00:01:54Z VZ $
 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/hildon/notifmsg.cpp b/Externals/wxWidgets3/src/gtk/hildon/notifmsg.cpp
index 1395af650b..50c5c4ece8 100644
--- a/Externals/wxWidgets3/src/gtk/hildon/notifmsg.cpp
+++ b/Externals/wxWidgets3/src/gtk/hildon/notifmsg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Hildon implementation of wxNotificationMessage
 // Author:      Vadim Zeitlin
 // Created:     2007-11-21
-// RCS-ID:      $Id: notifmsg.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/hyperlink.cpp b/Externals/wxWidgets3/src/gtk/hyperlink.cpp
index 2ea8b35ef8..f90589df14 100644
--- a/Externals/wxWidgets3/src/gtk/hyperlink.cpp
+++ b/Externals/wxWidgets3/src/gtk/hyperlink.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Hyperlink control
 // Author:      Francesco Montorsi
 // Created:     14/2/2007
-// RCS-ID:      $Id: hyperlink.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) 2007 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +39,11 @@
 static inline bool UseNative()
 {
     // native gtk_link_button widget is only available in GTK+ 2.10 and later
+#ifdef __WXGTK3__
+    return true;
+#else
     return !gtk_check_version(2, 10, 0);
+#endif
 }
 
 // ============================================================================
@@ -241,7 +244,7 @@ wxColour wxHyperlinkCtrl::GetHoverColour() const
 
 GdkWindow *wxHyperlinkCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    return UseNative() ? GTK_BUTTON(m_widget)->event_window
+    return UseNative() ? gtk_button_get_event_window(GTK_BUTTON(m_widget))
                        : wxGenericHyperlinkCtrl::GTKGetWindow(windows);
 }
 
diff --git a/Externals/wxWidgets3/src/gtk/infobar.cpp b/Externals/wxWidgets3/src/gtk/infobar.cpp
index 746b5db102..fb55f9b3a3 100644
--- a/Externals/wxWidgets3/src/gtk/infobar.cpp
+++ b/Externals/wxWidgets3/src/gtk/infobar.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxInfoBar implementation for GTK
 // Author:      Vadim Zeitlin
 // Created:     2009-09-27
-// RCS-ID:      $Id: infobar.cpp 62686 2009-11-19 01:36:54Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -82,8 +81,12 @@ namespace
 
 inline bool UseNative()
 {
+#ifdef __WXGTK3__
+    return true;
+#else
     // native GtkInfoBar widget is only available in GTK+ 2.18 and later
     return gtk_check_version(2, 18, 0) == 0;
+#endif
 }
 
 } // anonymous namespace
@@ -193,7 +196,7 @@ void wxInfoBar::Dismiss()
 
 void wxInfoBar::GTKResponse(int btnid)
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, btnid);
+    wxCommandEvent event(wxEVT_BUTTON, btnid);
     event.SetEventObject(this);
 
     if ( !HandleWindowEvent(event) )
@@ -275,7 +278,7 @@ void wxInfoBar::DoApplyWidgetStyle(GtkRcStyle *style)
     wxInfoBarGeneric::DoApplyWidgetStyle(style);
 
     if ( UseNative() )
-        gtk_widget_modify_style(m_impl->m_label, style);
+        GTKApplyStyle(m_impl->m_label, style);
 }
 
 #endif // wxUSE_INFOBAR
diff --git a/Externals/wxWidgets3/src/gtk/listbox.cpp b/Externals/wxWidgets3/src/gtk/listbox.cpp
index 5b4f36e76e..ef4042412b 100644
--- a/Externals/wxWidgets3/src/gtk/listbox.cpp
+++ b/Externals/wxWidgets3/src/gtk/listbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified By: Ryan Norton (GtkTreeView implementation)
-// Id:          $Id: listbox.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,18 +24,18 @@
     #include "wx/arrstr.h"
 #endif
 
-#include "wx/gtk/private.h"
-#include "wx/gtk/private/object.h"
-#include "wx/gtk/treeentry_gtk.h"
-
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
 #include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/object.h"
+#include "wx/gtk/private/treeentry_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#ifdef __WXGTK3__
 #include <gdk/gdkkeysyms-compat.h>
 #endif
 
@@ -69,18 +68,16 @@ namespace
 {
 
 // Return the entry for the given listbox item.
-//
-// Return value must be released by caller if non-NULL.
-GtkTreeEntry *
+wxTreeEntry *
 GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox)
 {
-    GtkTreeEntry* entry;
+    wxTreeEntry* entry;
     gtk_tree_model_get(GTK_TREE_MODEL(store),
                        iter,
                        WXLISTBOX_DATACOLUMN_ARG(listbox),
                        &entry,
                        -1);
-
+    g_object_unref(entry);
     return entry;
 }
 
@@ -181,12 +178,12 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
+static void tree_entry_destroy_cb(wxTreeEntry* entry,
                                       wxListBox* listbox)
 {
     if (listbox->HasClientObjectData())
     {
-        gpointer userdata = gtk_tree_entry_get_userdata(entry);
+        void* userdata = wx_tree_entry_get_userdata(entry);
         if (userdata)
             delete (wxClientData *)userdata;
     }
@@ -203,16 +200,16 @@ static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
                                       GtkTreeIter  *b,
                                       wxListBox    *listbox)
 {
-    wxGtkObject<GtkTreeEntry> entry1(GetEntry(listbox->m_liststore, a, listbox));
+    wxTreeEntry* entry1 = GetEntry(listbox->m_liststore, a, listbox);
     wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));
 
-    wxGtkObject<GtkTreeEntry> entry2(GetEntry(listbox->m_liststore, b, listbox));
+    wxTreeEntry* entry2 = GetEntry(listbox->m_liststore, b, listbox);
     wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));
 
     //We compare collate keys here instead of calling g_utf8_collate
-    //as it is rather slow (and even the docs reccommend this)
-    return strcmp(gtk_tree_entry_get_collate_key(entry1),
-                  gtk_tree_entry_get_collate_key(entry2)) >= 0;
+    //as it is rather slow (and even the docs recommend this)
+    return strcmp(wx_tree_entry_get_collate_key(entry1),
+                  wx_tree_entry_get_collate_key(entry2)) >= 0;
 }
 }
 
@@ -227,13 +224,12 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
                                                  GtkTreeIter* iter,
                                                  wxListBox* listbox)
 {
-    wxGtkObject<GtkTreeEntry>
-        entry(GetEntry(listbox->m_liststore, iter, listbox));
+    wxTreeEntry* entry = GetEntry(listbox->m_liststore, iter, listbox);
     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
 
     wxGtkString keycollatekey(g_utf8_collate_key(key, -1));
 
-    return strcmp(keycollatekey, gtk_tree_entry_get_collate_key(entry)) != 0;
+    return strcmp(keycollatekey, wx_tree_entry_get_collate_key(entry)) != 0;
 }
 }
 
@@ -315,10 +311,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 #if wxUSE_CHECKLISTBOX
     if(m_hasCheckBoxes)
         m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
-                                            GTK_TYPE_TREE_ENTRY);
+                                            WX_TYPE_TREE_ENTRY);
     else
 #endif
-        m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY);
+        m_liststore = gtk_list_store_new(1, WX_TYPE_TREE_ENTRY);
 
     gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
 
@@ -404,7 +400,13 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
-    m_hasVMT = false;
+    if (m_treeview)
+    {
+        GTKDisconnect(m_treeview);
+        GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+        if (selection)
+            GTKDisconnect(selection);
+    }
 
     Clear();
 }
@@ -448,38 +450,26 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     InvalidateBestSize();
-
-    GtkTreeIter* pIter = NULL; // append by default
-    GtkTreeIter iter;
-    if ( pos != GetCount() )
-    {
-        wxCHECK_MSG( GTKGetIteratorFor(pos, &iter), wxNOT_FOUND,
-                     wxT("internal wxListBox error in insertion") );
-
-        pIter = &iter;
-    }
-
-    const unsigned int numItems = items.GetCount();
-    for ( unsigned int i = 0; i < numItems; ++i )
-    {
-        wxGtkObject<GtkTreeEntry> entry(gtk_tree_entry_new());
-        gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i]));
-        gtk_tree_entry_set_destroy_func(entry,
-                (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
-                            this);
-
-        GtkTreeIter itercur;
-        gtk_list_store_insert_before(m_liststore, &itercur, pIter);
-
-        GTKSetItem(itercur, entry);
-
-        if (clientData)
-            AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type);
-    }
-
+    int n = DoInsertItemsInLoop(items, pos, clientData, type);
     UpdateOldSelections();
+    return n;
+}
 
-    return pos + numItems - 1;
+int wxListBox::DoInsertOneItem(const wxString& item, unsigned int pos)
+{
+    wxTreeEntry* entry = wx_tree_entry_new();
+    wx_tree_entry_set_label(entry, wxGTK_CONV(item));
+    wx_tree_entry_set_destroy_func(entry, (wxTreeEntryDestroy)tree_entry_destroy_cb, this);
+
+#if wxUSE_CHECKLISTBOX
+    int entryCol = int(m_hasCheckBoxes);
+#else
+    int entryCol = 0;
+#endif
+    gtk_list_store_insert_with_values(m_liststore, NULL, pos, entryCol, entry, -1);
+    g_object_unref(entry);
+
+    return pos;
 }
 
 // ----------------------------------------------------------------------------
@@ -497,6 +487,8 @@ void wxListBox::DoClear()
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
 
     GTKEnableEvents();
+
+    UpdateOldSelections();
 }
 
 void wxListBox::DoDeleteOneItem(unsigned int n)
@@ -550,7 +542,7 @@ int wxListBox::GTKGetIndexFor(GtkTreeIter& iter) const
 }
 
 // get GtkTreeEntry from position (note: you need to g_unref it if valid)
-GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const
+wxTreeEntry* wxListBox::GTKGetEntry(unsigned n) const
 {
     GtkTreeIter iter;
     if ( !GTKGetIteratorFor(n, &iter) )
@@ -559,41 +551,24 @@ GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const
     return GetEntry(m_liststore, &iter, this);
 }
 
-void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
-{
-#if wxUSE_CHECKLISTBOX
-    if ( m_hasCheckBoxes )
-    {
-        gtk_list_store_set(m_liststore, &iter,
-                           0, FALSE, // FALSE == not toggled
-                           1, entry,
-                           -1);
-    }
-    else
-#endif // wxUSE_CHECKLISTBOX
-    {
-        gtk_list_store_set(m_liststore, &iter, 0, entry, -1);
-    }
-}
-
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
 void* wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxTreeEntry* entry = GTKGetEntry(n);
     wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
 
-    return gtk_tree_entry_get_userdata( entry );
+    return wx_tree_entry_get_userdata(entry);
 }
 
 void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
-    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxTreeEntry* entry = GTKGetEntry(n);
     wxCHECK_RET(entry, wxT("could not get entry"));
 
-    gtk_tree_entry_set_userdata( entry, clientData );
+    wx_tree_entry_set_userdata(entry, clientData);
 }
 
 // ----------------------------------------------------------------------------
@@ -602,32 +577,30 @@ void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
 
 void wxListBox::SetString(unsigned int n, const wxString& label)
 {
-    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
-    GtkTreeEntry* entry = GTKGetEntry(n);
-    wxCHECK_RET( entry, wxT("wrong listbox index") );
+    GtkTreeIter iter;
+    wxCHECK_RET(GTKGetIteratorFor(n, &iter), "invalid index");
+    wxTreeEntry* entry = GetEntry(m_liststore, &iter, this);
 
     // update the item itself
-    gtk_tree_entry_set_label(entry, wxGTK_CONV(label));
+    wx_tree_entry_set_label(entry, wxGTK_CONV(label));
 
-    // and update the model which will refresh the tree too
-    GtkTreeIter iter;
-    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("failed to get iterator") );
-
-    // FIXME: this resets the checked status of a wxCheckListBox item
-
-    GTKSetItem(iter, entry);
+    // signal row changed
+    GtkTreeModel* tree_model = GTK_TREE_MODEL(m_liststore);
+    GtkTreePath* path = gtk_tree_model_get_path(tree_model, &iter);
+    gtk_tree_model_row_changed(tree_model, path, &iter);
+    gtk_tree_path_free(path);
 }
 
 wxString wxListBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 
-    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxTreeEntry* entry = GTKGetEntry(n);
     wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
 
-    return wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
+    return wxGTK_CONV_BACK(wx_tree_entry_get_label(entry));
 }
 
 unsigned int wxListBox::GetCount() const
@@ -661,7 +634,7 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 
 void wxListBox::GTKOnActivated(int item)
 {
-    SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, item, IsSelected(item));
+    SendEvent(wxEVT_LISTBOX_DCLICK, item, IsSelected(item));
 }
 
 void wxListBox::GTKOnSelectionChanged()
@@ -674,7 +647,7 @@ void wxListBox::GTKOnSelectionChanged()
     {
         const int item = GetSelection();
         if ( DoChangeSingleSelection(item) )
-            SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, true);
+            SendEvent(wxEVT_LISTBOX, item, true);
     }
 }
 
@@ -727,7 +700,7 @@ bool wxListBox::IsSelected( int n ) const
     GtkTreeIter iter;
     wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") );
 
-    return gtk_tree_selection_iter_is_selected(selection, &iter);
+    return gtk_tree_selection_iter_is_selected(selection, &iter) != 0;
 }
 
 void wxListBox::DoSetSelection( int n, bool select )
@@ -773,7 +746,7 @@ void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
     wxCHECK_RET( IsValid(n), wxT("invalid index"));
 
     //RN: I have no idea why this line is needed...
-    if (gdk_pointer_is_grabbed () && gtk_widget_has_grab(GTK_WIDGET(m_treeview)))
+    if (gtk_widget_has_grab(GTK_WIDGET(m_treeview)))
         return;
 
     GtkTreeIter iter;
@@ -814,7 +787,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
     // need to translate from master window since it is in client coords
     gint binx, biny;
     gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),
-                            &binx, &biny, NULL, NULL, NULL);
+                            &binx, &biny, NULL, NULL);
 
     GtkTreePath* path;
     if ( !gtk_tree_view_get_path_at_pos
@@ -855,6 +828,9 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
+#ifdef __WXGTK3__
+    // don't know if this is even necessary, or how to do it
+#else
     if (m_hasBgCol && m_backgroundColour.IsOk())
     {
         GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
@@ -865,8 +841,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
             gdk_window_clear( window );
         }
     }
+#endif
 
-    gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
+    GTKApplyStyle(GTK_WIDGET(m_treeview), style);
 }
 
 wxSize wxListBox::DoGetBestSize() const
@@ -919,7 +896,7 @@ wxSize wxListBox::DoGetBestSize() const
 wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true);
+    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new(), true);
 }
 
 #endif // wxUSE_LISTBOX
diff --git a/Externals/wxWidgets3/src/gtk/mdi.cpp b/Externals/wxWidgets3/src/gtk/mdi.cpp
index 2f665e0312..3454d4f90b 100644
--- a/Externals/wxWidgets3/src/gtk/mdi.cpp
+++ b/Externals/wxWidgets3/src/gtk/mdi.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/mdi.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: mdi.cpp 69528 2011-10-25 16:56:57Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -191,7 +190,7 @@ void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const
 {
     wxFrame::DoGetClientSize(width, height);
 
-    if (height)
+    if (!m_useCachedClientSize && height)
     {
         wxMDIChildFrame* active_child_frame = GetActiveChild();
         if (active_child_frame)
@@ -200,7 +199,7 @@ void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const
             if (menubar && menubar->IsShown())
             {
                 GtkRequisition req;
-                gtk_widget_size_request(menubar->m_widget, &req);
+                gtk_widget_get_preferred_height(menubar->m_widget, NULL, &req.height);
                 *height -= req.height;
                 if (*height < 0) *height = 0;
             }
@@ -316,14 +315,6 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         m_menuBar->Show(false);
         gtk_box_pack_start(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, false, false, 0);
         gtk_box_reorder_child(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0);
-
-        gulong handler_id = g_signal_handler_find(
-            m_menuBar->m_widget,
-            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
-            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
-            0, NULL, NULL, m_menuBar);
-        if (handler_id != 0)
-            g_signal_handler_disconnect(m_menuBar->m_widget, handler_id);
         gtk_widget_set_size_request(m_menuBar->m_widget, -1, -1);
     }
 }
diff --git a/Externals/wxWidgets3/src/gtk/menu.cpp b/Externals/wxWidgets3/src/gtk/menu.cpp
index 3e4f6425f6..f5194b89f0 100644
--- a/Externals/wxWidgets3/src/gtk/menu.cpp
+++ b/Externals/wxWidgets3/src/gtk/menu.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/menu.cpp
 // Purpose:     implementation of wxMenuBar and wxMenu classes for wxGTK
 // Author:      Robert Roebling
-// Id:          $Id: menu.cpp 70350 2012-01-15 13:41:17Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,6 +16,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/bitmap.h"
     #include "wx/app.h"
@@ -24,9 +24,15 @@
 
 #include "wx/accel.h"
 #include "wx/stockitem.h"
+
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/mnemonics.h"
 
+// Number of currently open modal dialogs, defined in src/gtk/toplevel.cpp.
+extern int wxOpenModalDialogsCount;
+
 // we use normal item but with a special id for the menu title
 static const int wxGTK_TITLE_ID = -3;
 
@@ -40,8 +46,34 @@ extern "C"
 static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*);
 #endif
 
+// Unity hack: under Ubuntu Unity the global menu bar is not affected by a
+// modal dialog being shown, so the user can select a menu item before hiding
+// the dialog and, in particular, a new instance of the same dialog can be
+// shown again, breaking a lot of programs not expecting this.
+//
+// So explicitly ignore any menu events generated while any modal dialogs
+// are opened except for the events generated by a context menu within the
+// modal dialog itself that should have a dialog as their invoking window.
+static bool IsMenuEventAllowed(wxMenu* menu)
+{
+    if ( wxOpenModalDialogsCount )
+    {
+        wxWindow* tlw = wxGetTopLevelParent(menu->GetWindow());
+        if ( !tlw || !wxDynamicCast(tlw, wxDialog) )
+        {
+            // This must be an event from a menu bar of one of the frames.
+            return false;
+        }
+    }
+
+    return true;
+}
+
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
+    if ( !IsMenuEventAllowed(menu) )
+        return;
+
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
@@ -58,6 +90,10 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
+wxMenuBar::~wxMenuBar()
+{
+}
+
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
@@ -87,11 +123,9 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     }
 
     PostCreation();
-
-    GTKApplyWidgetStyle();
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
-    g_object_ref(m_widget);
+    g_object_ref_sink(m_widget);
 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);
@@ -117,6 +151,18 @@ wxMenuBar::wxMenuBar()
 namespace
 {
 
+// This should be called when detaching menus to ensure that they don't keep
+// focus grab, because if they do, they continue getting all GTK+ messages
+// which they can't process any more in their (soon to be) unrealized state.
+void
+EnsureNoGrab(GtkWidget* widget)
+{
+#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+    gtk_widget_hide(widget);
+    gtk_grab_remove(widget);
+#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+}
+
 void
 DetachFromFrame(wxMenu* menu, wxFrame* frame)
 {
@@ -126,7 +172,7 @@ DetachFromFrame(wxMenu* menu, wxFrame* frame)
         // Note that wxGetTopLevelParent() is really needed because this frame
         // can be an MDI child frame which is a fake frame and not a TLW at all
         GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
-        if (g_slist_find(menu->m_accel->acceleratables, tlw))
+        if (g_slist_find(gtk_accel_groups_from_object(G_OBJECT(tlw)), menu->m_accel))
             gtk_window_remove_accel_group(tlw, menu->m_accel);
     }
 
@@ -138,6 +184,8 @@ DetachFromFrame(wxMenu* menu, wxFrame* frame)
             DetachFromFrame(menuitem->GetSubMenu(), frame);
         node = node->GetNext();
     }
+
+    EnsureNoGrab(menu->m_menu);
 }
 
 void
@@ -147,7 +195,7 @@ AttachToFrame(wxMenu* menu, wxFrame* frame)
     if (menu->m_accel)
     {
         GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
-        if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+        if (!g_slist_find(gtk_accel_groups_from_object(G_OBJECT(tlw)), menu->m_accel))
             gtk_window_add_accel_group(tlw, menu->m_accel);
     }
 
@@ -225,6 +273,8 @@ void wxMenuBar::Detach()
         node = node->GetNext();
     }
 
+    EnsureNoGrab(m_widget);
+
     wxMenuBarBase::Detach();
 }
 
@@ -267,16 +317,16 @@ void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos)
     else
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     {
-        const wxString str(wxConvertMnemonicsToGTK(title));
-
         // This doesn't have much effect right now.
-        menu->SetTitle( str );
+        menu->SetTitle( title );
 
+        const wxString str(wxConvertMnemonicsToGTK(title));
         // The "m_owner" is the "menu item"
         menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
     }
+    g_object_ref(menu->m_owner);
 
     gtk_widget_show( menu->m_owner );
 
@@ -318,13 +368,22 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     if ( !menu )
         return NULL;
 
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
+    // remove item from menubar before destroying item to avoid spurious
+    // warnings from Ubuntu libdbusmenu
     gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
+    // remove submenu to avoid destroying it when item is destroyed
+#ifdef __WXGTK3__
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
+#else
+    gtk_menu_item_remove_submenu(GTK_MENU_ITEM(menu->m_owner));
+#endif
 
     gtk_widget_destroy( menu->m_owner );
+    g_object_unref(menu->m_owner);
     menu->m_owner = NULL;
 
-    DetachFromFrame( menu, m_menuBarFrame );
+    if ( m_menuBarFrame )
+        DetachFromFrame( menu, m_menuBarFrame );
 
     return menu;
 }
@@ -422,7 +481,7 @@ bool wxMenuBar::IsEnabledTop(size_t pos) const
     wxCHECK_MSG( node, false, wxS("invalid index in IsEnabledTop") );
     wxMenu* const menu = node->GetData();
     wxCHECK_MSG( menu->m_owner, true, wxS("no menu owner?") );
-    return gtk_widget_get_sensitive( menu->m_owner );
+    return gtk_widget_get_sensitive( menu->m_owner ) != 0;
 }
 
 wxString wxMenuBar::GetMenuLabel( size_t pos ) const
@@ -444,10 +503,9 @@ void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
 
     wxMenu* menu = node->GetData();
 
+    menu->SetTitle( label );
+
     const wxString str(wxConvertMnemonicsToGTK(label));
-
-    menu->SetTitle( str );
-
     if (menu->m_owner)
         gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str));
 }
@@ -462,6 +520,9 @@ static void menuitem_activate(GtkWidget*, wxMenuItem* item)
     if (!item->IsEnabled())
         return;
 
+    if ( !IsMenuEventAllowed(item->GetMenu()) )
+        return;
+
     int id = item->GetId();
     if (id == wxGTK_TITLE_ID)
     {
@@ -489,6 +550,14 @@ static void menuitem_activate(GtkWidget*, wxMenuItem* item)
 
     wxMenu* menu = item->GetMenu();
     menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+
+    // A lot of existing code, including any program that closes its main
+    // window from a menu handler and expects the program to exit -- as our own
+    // minimal sample -- relies on getting an idle event after a menu event.
+    // But when using Ubuntu Unity detached menus, we get called from a DBUS
+    // handler called from g_timeout_dispatch() and Glib doesn't send us any
+    // idle events after it. So ask explicitly for an idle event to get one.
+    wxWakeUpIdle();
 }
 }
 
@@ -563,9 +632,20 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 
 wxMenuItem::~wxMenuItem()
 {
+    if (m_menuItem)
+        g_object_unref(m_menuItem);
    // don't delete menu items, the menus take care of that
 }
 
+void wxMenuItem::SetMenuItem(GtkWidget* menuItem)
+{
+    if (m_menuItem)
+        g_object_unref(m_menuItem);
+    m_menuItem = menuItem;
+    if (menuItem)
+        g_object_ref(menuItem);
+}
+
 void wxMenuItem::SetItemLabel( const wxString& str )
 {
 #if wxUSE_ACCEL
@@ -669,6 +749,13 @@ static void menu_map(GtkWidget*, wxMenu* menu)
 // "hide" from m_menu
 static void menu_hide(GtkWidget*, wxMenu* menu)
 {
+    // When using Ubuntu Unity desktop environment we get "hide" signal even
+    // when the window is not shown yet because Unity hides all the menus to
+    // show them only in the global menu bar. Just ignore this even instead of
+    // crashing in DoCommonMenuCallbackCode().
+    if ( !menu->GetWindow() )
+        return;
+
     wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
     menu->m_popupShown = false;
     DoCommonMenuCallbackCode(menu, event);
@@ -691,8 +778,6 @@ void wxMenu::Init()
 
     m_accel = gtk_accel_group_new();
     m_menu = gtk_menu_new();
-    // NB: keep reference to the menu so that it is not destroyed behind
-    //     our back by GTK+ e.g. when it is removed from menubar:
     g_object_ref_sink(m_menu);
 
     m_owner = NULL;
@@ -724,16 +809,18 @@ wxMenu::~wxMenu()
     // Destroying a menu generates a "hide" signal even if it's not shown
     // currently, so disconnect it to avoid dummy wxEVT_MENU_CLOSE events
     // generation.
-    g_signal_handlers_disconnect_by_func(m_menu, (gpointer)menu_hide, this);
+    g_signal_handlers_disconnect_matched(m_menu,
+        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, this);
 
-    // see wxMenu::Init
-    g_object_unref(m_menu);
-
-    // if the menu is inserted in another menu at this time, there was
-    // one more reference to it:
     if (m_owner)
-       gtk_widget_destroy(m_menu);
+    {
+        gtk_widget_destroy(m_owner);
+        g_object_unref(m_owner);
+    }
+    else
+        gtk_widget_destroy(m_menu);
 
+    g_object_unref(m_menu);
     g_object_unref(m_accel);
 }
 
@@ -754,6 +841,11 @@ wxString wxMenu::GetTitle() const
     return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle());
 }
 
+void wxMenu::SetTitle(const wxString& title)
+{
+    wxMenuBase::SetTitle(wxConvertMnemonicsToGTK(title));
+}
+
 void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
 {
     GtkWidget *menuItem;
@@ -887,20 +979,15 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         return NULL;
 
     GtkWidget * const mitem = item->GetMenuItem();
-    if (!gtk_check_version(2,12,0))
-    {
-        // gtk_menu_item_remove_submenu() is deprecated since 2.12, but
-        // gtk_menu_item_set_submenu() can now be used with NULL submenu now so
-        // just do use it.
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
-    }
-    else // GTK+ < 2.12
-    {
-        // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu
-        // results in critical GTK+ error messages so use the old function
-        // instead.
-        gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));
-    }
+
+    g_signal_handlers_disconnect_matched(mitem,
+        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, item);
+
+#ifdef __WXGTK3__
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+#else
+    gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));
+#endif
 
     gtk_widget_destroy(mitem);
     item->SetMenuItem(NULL);
@@ -1212,12 +1299,6 @@ const char *wxGetStockGtkID(wxWindowID id)
         case wx:                   \
             return gtk;
 
-    #if GTK_CHECK_VERSION(2,6,0)
-        #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
-    #else
-        #define STOCKITEM_26(wx,gtk)
-    #endif
-
     #if GTK_CHECK_VERSION(2,8,0)
         #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)
     #else
@@ -1233,7 +1314,7 @@ const char *wxGetStockGtkID(wxWindowID id)
 
     switch (id)
     {
-        STOCKITEM_26(wxID_ABOUT,         GTK_STOCK_ABOUT)
+        STOCKITEM(wxID_ABOUT,            GTK_STOCK_ABOUT)
         STOCKITEM(wxID_ADD,              GTK_STOCK_ADD)
         STOCKITEM(wxID_APPLY,            GTK_STOCK_APPLY)
         STOCKITEM(wxID_BACKWARD,         GTK_STOCK_GO_BACK)
@@ -1248,10 +1329,10 @@ const char *wxGetStockGtkID(wxWindowID id)
         STOCKITEM(wxID_CUT,              GTK_STOCK_CUT)
         STOCKITEM(wxID_DELETE,           GTK_STOCK_DELETE)
         STOCKITEM(wxID_DOWN,             GTK_STOCK_GO_DOWN)
-        STOCKITEM_26(wxID_EDIT,          GTK_STOCK_EDIT)
+        STOCKITEM(wxID_EDIT,             GTK_STOCK_EDIT)
         STOCKITEM(wxID_EXECUTE,          GTK_STOCK_EXECUTE)
         STOCKITEM(wxID_EXIT,             GTK_STOCK_QUIT)
-        STOCKITEM_26(wxID_FILE,          GTK_STOCK_FILE)
+        STOCKITEM(wxID_FILE,             GTK_STOCK_FILE)
         STOCKITEM(wxID_FIND,             GTK_STOCK_FIND)
         STOCKITEM(wxID_FIRST,            GTK_STOCK_GOTO_FIRST)
         STOCKITEM(wxID_FLOPPY,           GTK_STOCK_FLOPPY)
diff --git a/Externals/wxWidgets3/src/gtk/minifram.cpp b/Externals/wxWidgets3/src/gtk/minifram.cpp
index 92bdfe77ff..24c32acaa6 100644
--- a/Externals/wxWidgets3/src/gtk/minifram.cpp
+++ b/Externals/wxWidgets3/src/gtk/minifram.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/minifram.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: minifram.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,7 +19,11 @@
     #include "wx/image.h"
 #endif
 
+#ifdef __WXGTK3__
+#include "wx/gtk/dc.h"
+#else
 #include "wx/gtk/dcclient.h"
+#endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private/gtk2-compat.h"
@@ -59,9 +62,25 @@ static wxColor LightContrastColour(const wxColour& c)
 }
 
 extern "C" {
-static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)
+#ifdef __WXGTK3__
+static gboolean draw(GtkWidget* widget, cairo_t* cr, wxMiniFrame* win)
+#else
+static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)
+#endif
 {
-    if (!win->m_hasVMT || gdk_event->count > 0 ||
+#ifdef __WXGTK3__
+    if (!gtk_cairo_should_draw_window(cr, gtk_widget_get_window(widget)))
+        return false;
+
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_save(sc);
+    gtk_style_context_add_class(sc, GTK_STYLE_CLASS_BUTTON);
+    gtk_render_frame(sc, cr, 0, 0, win->m_width, win->m_height);
+    gtk_style_context_restore(sc);
+
+    wxGTKCairoDC dc(cr);
+#else
+    if (gdk_event->count > 0 ||
         gdk_event->window != gtk_widget_get_window(widget))
     {
         return false;
@@ -75,13 +94,14 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
                       0, 0,
                       win->m_width, win->m_height);
 
-    int style = win->GetWindowStyle();
-
     wxClientDC dc(win);
 
     wxDCImpl *impl = dc.GetImpl();
     wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl );
     gtk_impl->m_gdkwindow = gtk_widget_get_window(widget); // Hack alert
+#endif
+
+    int style = win->GetWindowStyle();
 
     if (style & wxRESIZE_BORDER)
     {
@@ -121,7 +141,7 @@ extern "C" {
 static gboolean
 gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -168,17 +188,20 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
 
     gdk_window_raise(gtk_widget_get_window(win->m_widget));
 
-    gdk_pointer_grab( gtk_widget_get_window(widget), false,
-                      (GdkEventMask)
-                         (GDK_BUTTON_PRESS_MASK |
-                          GDK_BUTTON_RELEASE_MASK |
-                          GDK_POINTER_MOTION_MASK        |
-                          GDK_POINTER_MOTION_HINT_MASK  |
-                          GDK_BUTTON_MOTION_MASK        |
-                          GDK_BUTTON1_MOTION_MASK),
-                      NULL,
-                      NULL,
-                      (unsigned int) GDK_CURRENT_TIME );
+    const GdkEventMask mask = GdkEventMask(
+        GDK_BUTTON_PRESS_MASK |
+        GDK_BUTTON_RELEASE_MASK |
+        GDK_POINTER_MOTION_MASK |
+        GDK_POINTER_MOTION_HINT_MASK |
+        GDK_BUTTON_MOTION_MASK |
+        GDK_BUTTON1_MOTION_MASK);
+#ifdef __WXGTK3__
+    gdk_device_grab(
+        gdk_event->device, gdk_event->window, GDK_OWNERSHIP_NONE,
+        false, mask, NULL, gdk_event->time);
+#else
+    gdk_pointer_grab(gdk_event->window, false, mask, NULL, NULL, gdk_event->time);
+#endif
 
     win->m_diffX = x;
     win->m_diffY = y;
@@ -199,7 +222,7 @@ extern "C" {
 static gboolean
 gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
@@ -210,7 +233,11 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event,
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
 
-    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+#ifdef __WXGTK3__
+    gdk_device_ungrab(gdk_event->device, gdk_event->time);
+#else
+    gdk_pointer_ungrab(gdk_event->time);
+#endif
     int org_x = 0;
     int org_y = 0;
     gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
@@ -232,9 +259,8 @@ extern "C" {
 static gboolean
 gtk_window_leave_callback(GtkWidget *widget,
                           GdkEventCrossing* gdk_event,
-                          wxMiniFrame *win)
+                          wxMiniFrame*)
 {
-    if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
     if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
@@ -253,30 +279,26 @@ extern "C" {
 static gboolean
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
-    if (!win->m_hasVMT || gdk_event->window != gtk_widget_get_window(widget))
+    if (gdk_event->window != gtk_widget_get_window(widget))
         return false;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
+    int x = int(gdk_event->x);
+    int y = int(gdk_event->y);
+
     if (gdk_event->is_hint)
     {
-       int x = 0;
-       int y = 0;
-       GdkModifierType state;
-       gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
-       gdk_event->x = x;
-       gdk_event->y = y;
-       gdk_event->state = state;
+#ifdef __WXGTK3__
+       gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
+#else
+       gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
+#endif
     }
 
-    int style = win->GetWindowStyle();
-
-    int x = (int)gdk_event->x;
-    int y = (int)gdk_event->y;
-
     if (!win->m_isDragging)
     {
-        if (style & wxRESIZE_BORDER)
+        if (win->GetWindowStyle() & wxRESIZE_BORDER)
         {
             if ((x > win->m_width-14) && (y > win->m_height-14))
                gdk_window_set_cursor(gtk_widget_get_window(widget), gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER));
@@ -315,6 +337,15 @@ static unsigned char close_bits[]={
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
+wxMiniFrame::~wxMiniFrame()
+{
+    if (m_widget)
+    {
+        GtkWidget* eventbox = gtk_bin_get_child(GTK_BIN(m_widget));
+        GTKDisconnect(eventbox);
+    }
+}
+
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
@@ -333,6 +364,14 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     m_diffX = 0;
     m_diffY = 0;
 
+    // don't allow sizing smaller than decorations
+    int minWidth = 2 * m_miniEdge;
+    int minHeight = 2 * m_miniEdge + m_miniTitle;
+    if (m_minWidth < minWidth)
+        m_minWidth = minWidth;
+    if (m_minHeight < minHeight)
+        m_minHeight = minHeight;
+
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
     // Use a GtkEventBox for the title and borders. Using m_widget for this
@@ -353,19 +392,14 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     gtk_container_add(GTK_CONTAINER(m_widget), eventbox);
 
     m_gdkDecor = 0;
+    gtk_window_set_decorated(GTK_WINDOW(m_widget), false);
     m_gdkFunc = 0;
     if (style & wxRESIZE_BORDER)
        m_gdkFunc = GDK_FUNC_RESIZE;
     gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
-    m_decorSize.Set(0, 0);
+    memset(&m_decorSize, 0, sizeof(m_decorSize));
     m_deferShow = false;
 
-    // don't allow sizing smaller than decorations
-    GdkGeometry geom;
-    geom.min_width  = 2 * m_miniEdge;
-    geom.min_height = 2 * m_miniEdge + m_miniTitle;
-    gtk_window_set_geometry_hints(GTK_WINDOW(m_widget), NULL, &geom, GDK_HINT_MIN_SIZE);
-
     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
@@ -380,8 +414,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     }
 
     /* these are called when the borders are drawn */
-    g_signal_connect_after(eventbox, "expose_event",
-                      G_CALLBACK (gtk_window_own_expose_callback), this );
+#ifdef __WXGTK3__
+    g_signal_connect_after(eventbox, "draw", G_CALLBACK(draw), this);
+#else
+    g_signal_connect_after(eventbox, "expose_event", G_CALLBACK(expose_event), this);
+#endif
 
     /* these are required for dragging the mini frame around */
     g_signal_connect (eventbox, "button_press_event",
@@ -398,6 +435,10 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 void wxMiniFrame::DoGetClientSize(int* width, int* height) const
 {
     wxFrame::DoGetClientSize(width, height);
+
+    if (m_useCachedClientSize)
+        return;
+
     if (width)
     {
         *width -= 2 * m_miniEdge;
diff --git a/Externals/wxWidgets3/src/gtk/mnemonics.cpp b/Externals/wxWidgets3/src/gtk/mnemonics.cpp
index 11862fdd2e..5fc9e66860 100644
--- a/Externals/wxWidgets3/src/gtk/mnemonics.cpp
+++ b/Externals/wxWidgets3/src/gtk/mnemonics.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of GTK mnemonics conversion functions
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// RCS-ID:      $Id: mnemonics.cpp 67050 2011-02-27 12:46:55Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/msgdlg.cpp b/Externals/wxWidgets3/src/gtk/msgdlg.cpp
index b09210711e..8bc0dae840 100644
--- a/Externals/wxWidgets3/src/gtk/msgdlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/msgdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
-// RCS-ID:      $Id: msgdlg.cpp 68537 2011-08-04 22:53:42Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,10 +23,13 @@
     #include "wx/intl.h"
 #endif
 
+#include "wx/modalhook.h"
+
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"
-#include <gtk/gtk.h>
+#include "wx/gtk/private/dialogcount.h"
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-note.h>
@@ -166,15 +168,13 @@ void wxMessageDialog::GTKCreateMsgDialog()
     }
 
     wxString message;
-#if GTK_CHECK_VERSION(2, 6, 0)
     bool needsExtMessage = false;
-    if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() )
+    if (!m_extendedMessage.empty())
     {
         message = m_message;
         needsExtMessage = true;
     }
-    else // extended message not needed or not supported
-#endif // GTK+ 2.6+
+    else // extended message not needed
     {
         message = GetFullMessage();
     }
@@ -186,7 +186,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
                                       "%s",
                                       (const char*)wxGTK_CONV(message));
 
-#if GTK_CHECK_VERSION(2, 6, 0)
     if ( needsExtMessage )
     {
         gtk_message_dialog_format_secondary_text
@@ -196,7 +195,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
             (const char *)wxGTK_CONV(m_extendedMessage)
         );
     }
-#endif // GTK+ 2.6+
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
     g_object_ref(m_widget);
@@ -277,6 +275,8 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     // break the mouse capture as it would interfere with modal dialog (see
     // wxDialog::ShowModal)
     wxWindow * const win = wxWindow::GetCapture();
@@ -295,7 +295,10 @@ int wxMessageDialog::ShowModal()
     if (m_parent)
         gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
 
+    wxOpenModalDialogLocker modalLocker;
+
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+    GTKDisconnect(m_widget);
     gtk_widget_destroy(m_widget);
     g_object_unref(m_widget);
     m_widget = NULL;
diff --git a/Externals/wxWidgets3/src/gtk/nativewin.cpp b/Externals/wxWidgets3/src/gtk/nativewin.cpp
index f14e137ced..c40ed6d0d5 100644
--- a/Externals/wxWidgets3/src/gtk/nativewin.cpp
+++ b/Externals/wxWidgets3/src/gtk/nativewin.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxNativeWindow implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05
-// RCS-ID:      $Id: nativewin.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,7 +31,7 @@
 #include "wx/gtk/private/gtk2-compat.h"
 
 #ifdef GDK_WINDOWING_X11
-    #include <X11/Xlib.h>
+    #include <gdk/gdkx.h>
 #endif
 
 // ============================================================================
@@ -95,7 +94,15 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
 bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
 {
     bool rc;
+#ifdef __WXGTK3__
+#ifdef GDK_WINDOWING_X11
+    GdkWindow * const win = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), anid);
+#else
+    GdkWindow * const win = NULL;
+#endif
+#else
     GdkWindow * const win = gdk_window_foreign_new(anid);
+#endif
     if ( win )
     {
         rc = Create(win);
@@ -117,6 +124,7 @@ void wxNativeContainerWindow::OnNativeDestroyed()
     // because it's a private GDK function and calling normal
     // gdk_window_destroy() results in X errors while nulling just the window
     // pointer and destroying m_widget results in many GTK errors
+    GTKDisconnect(m_widget);
     m_widget = NULL;
 
     // notice that we intentionally don't use Close() nor Delete() here as our
diff --git a/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp b/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp
index efba8cf874..2bd4cb9938 100644
--- a/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp
+++ b/Externals/wxWidgets3/src/gtk/nonownedwnd.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK implementation of wxNonOwnedWindow.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-12
-// RCS-ID:      $Id: nonownedwnd.cpp 69465 2011-10-18 22:59:16Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,18 +23,17 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/nonownedwnd.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
-    #include "wx/nonownedwnd.h"
     #include "wx/region.h"
 #endif // WX_PRECOMP
 
-#include "wx/gtk/private.h"
-
-#include <gdk/gdk.h>
-
 #include "wx/graphics.h"
 
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
+
 // ----------------------------------------------------------------------------
 // wxNonOwnedWindowShapeImpl: base class for region and path-based classes.
 // ----------------------------------------------------------------------------
@@ -96,7 +94,7 @@ public:
 private:
     virtual bool DoSetShape(GdkWindow* window)
     {
-        gdk_window_shape_combine_mask(window, NULL, 0, 0);
+        gdk_window_shape_combine_region(window, NULL, 0, 0);
 
         return true;
     }
@@ -176,7 +174,11 @@ private:
         dc.SetBackground(*wxBLACK);
         dc.Clear();
 
+#ifdef __WXGTK3__
+        wxGraphicsContext* context = dc.GetGraphicsContext();
+#else
         wxScopedPtr<wxGraphicsContext> context(wxGraphicsContext::Create(dc));
+#endif
         context->SetBrush(*wxWHITE);
         context->FillPath(path);
 
@@ -185,11 +187,16 @@ private:
 
     virtual bool DoSetShape(GdkWindow *window)
     {
-        GdkBitmap* bitmap = m_mask.GetBitmap();
-        if ( !bitmap )
+        if (!m_mask)
             return false;
 
-        gdk_window_shape_combine_mask(window, bitmap, 0, 0);
+#ifdef __WXGTK3__
+        cairo_region_t* region = gdk_cairo_region_create_from_surface(m_mask);
+        gdk_window_shape_combine_region(window, region, 0, 0);
+        cairo_region_destroy(region);
+#else
+        gdk_window_shape_combine_mask(window, m_mask, 0, 0);
+#endif
 
         return true;
     }
@@ -200,7 +207,11 @@ private:
         event.Skip();
 
         wxPaintDC dc(m_win);
+#ifdef __WXGTK3__
+        wxGraphicsContext* context = dc.GetGraphicsContext();
+#else
         wxScopedPtr<wxGraphicsContext> context(wxGraphicsContext::Create(dc));
+#endif
         context->SetPen(wxPen(*wxLIGHT_GREY, 2));
         context->StrokePath(m_path);
     }
diff --git a/Externals/wxWidgets3/src/gtk/notebook.cpp b/Externals/wxWidgets3/src/gtk/notebook.cpp
index a12ca0f1b5..71ebdcf3a9 100644
--- a/Externals/wxWidgets3/src/gtk/notebook.cpp
+++ b/Externals/wxWidgets3/src/gtk/notebook.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/notebook.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: notebook.cpp 70112 2011-12-24 18:19:26Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +24,9 @@
 #include "wx/imaglist.h"
 #include "wx/fontutil.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage
@@ -312,7 +313,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     for ( size_t n = 0; n < pageCount; n++ )
     {
         GtkRequisition req;
-        gtk_widget_size_request(GetNotebookPage(n)->m_box, &req);
+        gtk_widget_get_preferred_size(GetNotebookPage(n)->m_box, NULL, &req);
         sizeTabMax.IncTo(wxSize(req.width, req.height));
     }
 
@@ -427,7 +428,7 @@ bool wxNotebook::InsertPage( size_t position,
     // first page.
     pageData->m_imageIndex = imageId;
 
-    pageData->m_box = gtk_hbox_new(false, 1);
+    pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
     gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2);
 
     pageData->m_image = NULL;
@@ -455,12 +456,16 @@ bool wxNotebook::InsertPage( size_t position,
     gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position);
 
     /* apply current style */
+#ifdef __WXGTK3__
+    GTKApplyStyle(pageData->m_label, NULL);
+#else
     GtkRcStyle *style = GTKCreateWidgetStyle();
     if ( style )
     {
         gtk_widget_modify_style(pageData->m_label, style);
         g_object_unref(style);
     }
+#endif
 
     if (select && GetPageCount() > 1)
     {
@@ -497,7 +502,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
     const size_t count = GetPageCount();
     size_t i = 0;
 
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GSEAL_ENABLE)
+#ifndef __WXGTK3__
     GtkNotebook * notebook = GTK_NOTEBOOK(m_widget);
     if (gtk_notebook_get_scrollable(notebook))
         i = g_list_position( notebook->children, notebook->first_tab );
@@ -580,15 +585,19 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 
 void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widget, style);
+    GTKApplyStyle(m_widget, style);
     for (size_t i = GetPageCount(); i--;)
-        gtk_widget_modify_style(GetNotebookPage(i)->m_label, style);
+        GTKApplyStyle(GetNotebookPage(i)->m_label, style);
 }
 
 GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
     windows.push_back(gtk_widget_get_window(m_widget));
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+#else
     windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
+#endif
 
     return NULL;
 }
@@ -597,7 +606,7 @@ GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const
 wxVisualAttributes
 wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_notebook_new());
 }
 
 #endif
diff --git a/Externals/wxWidgets3/src/gtk/notifmsg.cpp b/Externals/wxWidgets3/src/gtk/notifmsg.cpp
new file mode 100644
index 0000000000..20bc1884ba
--- /dev/null
+++ b/Externals/wxWidgets3/src/gtk/notifmsg.cpp
@@ -0,0 +1,217 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/gtk/notifmsg.cpp
+// Purpose:     wxNotificationMessage for wxGTK using libnotify.
+// Author:      Vadim Zeitlin
+// Created:     2012-07-25
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY
+
+#include "wx/notifmsg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include <libnotify/notify.h>
+
+#include "wx/module.h"
+
+// General note about error handling: as notifications are meant to be
+// non-intrusive, we use wxLogDebug() and not wxLogError() if anything goes
+// wrong here to avoid spamming the user with message boxes. As all methods
+// return boolean indicating success or failure, the caller could show the
+// notification in some other way or notify about the error itself if needed.
+#include "wx/gtk/private/error.h"
+
+// ----------------------------------------------------------------------------
+// A module for cleaning up libnotify on exit.
+// ----------------------------------------------------------------------------
+
+class wxLibnotifyModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        // We're initialized on demand.
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        if ( notify_is_initted() )
+            notify_uninit();
+    }
+
+    // Do initialize the library.
+    static bool Initialize()
+    {
+        if ( !notify_is_initted() )
+        {
+            if ( !notify_init(wxTheApp->GetAppName().utf8_str()) )
+                return false;
+        }
+
+        return true;
+    }
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxLibnotifyModule);
+};
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxLibnotifyModule, wxModule);
+
+// ============================================================================
+// wxNotificationMessage implementation
+// ============================================================================
+
+bool wxNotificationMessage::GTKSetIconName(const wxString& name)
+{
+    m_iconName = name;
+
+    return true;
+}
+
+bool wxNotificationMessage::Show(int timeout)
+{
+    if ( !wxLibnotifyModule::Initialize() )
+        return false;
+
+    // Determine the GTK+ icon to use from flags and also set the urgency
+    // appropriately.
+    const char* icon;
+    NotifyUrgency urgency;
+    switch ( GetFlags() )
+    {
+        case wxICON_INFORMATION:
+            icon = "dialog-information";
+            urgency = NOTIFY_URGENCY_LOW;
+            break;
+
+        case wxICON_WARNING:
+            icon = "dialog-warning";
+            urgency = NOTIFY_URGENCY_NORMAL;
+            break;
+
+        case wxICON_ERROR:
+            icon = "dialog-error";
+            urgency = NOTIFY_URGENCY_CRITICAL;
+            break;
+
+        default:
+            wxFAIL_MSG( "Unknown notification message flags." );
+            return false;
+    }
+
+    // Explicitly specified icon name overrides the implicit one determined by
+    // the flags.
+    wxScopedCharBuffer buf;
+    if ( !m_iconName.empty() )
+    {
+        buf = m_iconName.utf8_str();
+        icon = buf;
+    }
+
+    // Create the notification or update an existing one if we had already been
+    // shown before.
+    if ( !m_notification )
+    {
+        m_notification = notify_notification_new
+                         (
+                            GetTitle().utf8_str(),
+                            GetMessage().utf8_str(),
+                            icon
+#if !wxUSE_LIBNOTIFY_0_7
+                            // There used to be an "associated window"
+                            // parameter in this function but it has
+                            // disappeared by 0.7, so use it for previous
+                            // versions only.
+                            , 0
+#endif // libnotify < 0.7
+                         );
+        if ( !m_notification )
+        {
+            wxLogDebug("Failed to creation notification.");
+
+            return false;
+        }
+    }
+    else
+    {
+        if ( !notify_notification_update
+              (
+                m_notification,
+                GetTitle().utf8_str(),
+                GetMessage().utf8_str(),
+                icon
+              ) )
+        {
+            wxLogDebug(wxS("notify_notification_update() unexpectedly failed."));
+        }
+    }
+
+
+    // Set the notification parameters not specified during creation.
+    notify_notification_set_timeout
+    (
+        m_notification,
+        timeout == Timeout_Auto ? NOTIFY_EXPIRES_DEFAULT
+                                : timeout == Timeout_Never ? NOTIFY_EXPIRES_NEVER
+                                                           : 1000*timeout
+    );
+
+    notify_notification_set_urgency(m_notification, urgency);
+
+
+    // Finally do show the notification.
+    wxGtkError error;
+    if ( !notify_notification_show(m_notification, error.Out()) )
+    {
+        wxLogDebug("Failed to shown notification: %s", error.GetMessage());
+
+        return false;
+    }
+
+    return true;
+}
+
+bool wxNotificationMessage::Close()
+{
+    wxCHECK_MSG( m_notification, false,
+                 wxS("Can't close not shown notification.") );
+
+    wxGtkError error;
+    if ( !notify_notification_close(m_notification, error.Out()) )
+    {
+        wxLogDebug("Failed to hide notification: %s", error.GetMessage());
+
+        return false;
+    }
+
+    return true;
+}
+
+wxNotificationMessage::~wxNotificationMessage()
+{
+    if ( m_notification )
+        g_object_unref(m_notification);
+}
+
+#endif // wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY
diff --git a/Externals/wxWidgets3/src/gtk/pen.cpp b/Externals/wxWidgets3/src/gtk/pen.cpp
index 2748925065..c08c36801c 100644
--- a/Externals/wxWidgets3/src/gtk/pen.cpp
+++ b/Externals/wxWidgets3/src/gtk/pen.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/pen.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: pen.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/popupwin.cpp b/Externals/wxWidgets3/src/gtk/popupwin.cpp
index 26b11badc0..08a85ea1a5 100644
--- a/Externals/wxWidgets3/src/gtk/popupwin.cpp
+++ b/Externals/wxWidgets3/src/gtk/popupwin.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: popupwin.cpp 70739 2012-02-28 17:25:59Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -109,23 +108,31 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     // wxPopupWindow is used for different windows as well
     // gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
 
-    GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget );
-    if (GTK_IS_WINDOW (toplevel))
+    // Popup windows can be created without parent, so handle this correctly.
+    if (parent)
     {
+        GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget );
+        if (GTK_IS_WINDOW (toplevel))
+        {
 #if GTK_CHECK_VERSION(2,10,0)
-        if (!gtk_check_version(2,10,0))
-            gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
+#ifndef __WXGTK3__
+            if (!gtk_check_version(2,10,0))
 #endif
-
-        gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
+            {
+                gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
+            }
+#endif
+            gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
+        }
+        gtk_window_set_screen (GTK_WINDOW (m_widget), gtk_widget_get_screen (GTK_WIDGET (parent->m_widget)));
     }
+
     gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
-    gtk_window_set_screen (GTK_WINDOW (m_widget), gtk_widget_get_screen (GTK_WIDGET (parent->m_widget)));
 
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_dialog_delete_callback), this);
 
-    m_wxwindow = wxPizza::New(m_windowStyle);
+    m_wxwindow = wxPizza::New();
     gtk_widget_show( m_wxwindow );
 
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
diff --git a/Externals/wxWidgets3/src/gtk/print.cpp b/Externals/wxWidgets3/src/gtk/print.cpp
index a1f51a3f1f..a7f75959e2 100644
--- a/Externals/wxWidgets3/src/gtk/print.cpp
+++ b/Externals/wxWidgets3/src/gtk/print.cpp
@@ -3,7 +3,6 @@
 // Author:      Anthony Bretaudeau
 // Purpose:     GTK printing support
 // Created:     2007-08-25
-// RCS-ID:      $Id: print.cpp 70669 2012-02-22 13:41:11Z VZ $
 // Copyright:   (c) 2007 wxWidgets development team
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,8 @@
 #include "wx/fontutil.h"
 #include "wx/dynlib.h"
 #include "wx/paper.h"
+#include "wx/scopeguard.h"
+#include "wx/modalhook.h"
 
 #include <gtk/gtk.h>
 
@@ -50,10 +51,6 @@
 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 
-#if wxUSE_LIBGNOMEPRINT
-#include "wx/gtk/gnome/gprint.h"
-#endif
-
 #include "wx/gtk/private/object.h"
 
 // Useful to convert angles from/to Rad to/from Deg.
@@ -63,8 +60,7 @@ static const double DEG2RAD  = M_PI / 180.0;
 //----------------------------------------------------------------------------
 // wxGtkPrintModule
 // Initialized when starting the app : if it successfully load the gtk-print framework,
-// it uses it. If not, it falls back to gnome print (see /gtk/gnome/gprint.cpp) then
-// to postscript if gnomeprint is not available.
+// it uses it. If not, it falls back to Postscript.
 //----------------------------------------------------------------------------
 
 class wxGtkPrintModule: public wxModule
@@ -72,10 +68,6 @@ class wxGtkPrintModule: public wxModule
 public:
     wxGtkPrintModule()
     {
-#if wxUSE_LIBGNOMEPRINT
-        // This module must be initialized AFTER gnomeprint's one
-        AddDependency(CLASSINFO(wxGnomePrintModule));
-#endif
     }
     bool OnInit();
     void OnExit() {}
@@ -86,8 +78,12 @@ private:
 
 bool wxGtkPrintModule::OnInit()
 {
+#ifndef __WXGTK3__
     if (gtk_check_version(2,10,0) == NULL)
+#endif
+    {
         wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );
+    }
     return true;
 }
 
@@ -230,13 +226,12 @@ IMPLEMENT_CLASS(wxGtkPrintNativeData, wxPrintNativeDataBase)
 wxGtkPrintNativeData::wxGtkPrintNativeData()
 {
     m_config = gtk_print_settings_new();
-    m_job = gtk_print_operation_new();
+    m_job = NULL;
     m_context = NULL;
 }
 
 wxGtkPrintNativeData::~wxGtkPrintNativeData()
 {
-    g_object_unref(m_job);
     g_object_unref(m_config);
 }
 
@@ -619,6 +614,8 @@ wxGtkPrintDialog::~wxGtkPrintDialog()
 // This is called even if we actually don't want the dialog to appear.
 int wxGtkPrintDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     // We need to restore the settings given in the constructor.
     wxPrintData data = m_printDialogData.GetPrintData();
     wxGtkPrintNativeData *native =
@@ -743,6 +740,8 @@ wxGtkPageSetupDialog::~wxGtkPageSetupDialog()
 
 int wxGtkPageSetupDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     // Get the config.
     m_pageDialogData.GetPrintData().ConvertToNative();
     wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
@@ -900,7 +899,10 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData();
 
-    GtkPrintOperation * const printOp = native->GetPrintJob();
+    wxGtkObject<GtkPrintOperation> printOp(gtk_print_operation_new());
+    native->SetPrintJob(printOp);
+    wxON_BLOCK_EXIT_OBJ1(*native, wxGtkPrintNativeData::SetPrintJob,
+                         static_cast<GtkPrintOperation*>(NULL));
 
     wxPrinterToGtkData dataToSend;
     dataToSend.printer = this;
@@ -1172,8 +1174,6 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da
 #if wxCAIRO_SCALE
     m_PS2DEV = 1.0;
     m_DEV2PS = 1.0;
-
-    cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
 #else
     m_PS2DEV = (double)m_resolution / 72.0;
     m_DEV2PS = 72.0 / (double)m_resolution;
@@ -1185,15 +1185,6 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da
 
     m_signX = 1;  // default x-axis left to right.
     m_signY = 1;  // default y-axis bottom up -> top down.
-
-    // By default the origin of the Cairo context is in the upper left
-    // corner of the printable area. We need to translate it so that it
-    // is in the upper left corner of the paper (without margins)
-    GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
-    gdouble ml, mt;
-    ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
-    mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
-    cairo_translate(m_cairo, -ml, -mt);
 }
 
 wxGtkPrinterDCImpl::~wxGtkPrinterDCImpl()
@@ -1209,7 +1200,12 @@ bool wxGtkPrinterDCImpl::IsOk() const
 
 void* wxGtkPrinterDCImpl::GetCairoContext() const
 {
-    return (void*) cairo_reference( m_cairo );
+    return m_cairo;
+}
+
+void* wxGtkPrinterDCImpl::GetHandle() const
+{
+    return GetCairoContext();
 }
 
 bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
@@ -1361,47 +1357,43 @@ void wxGtkPrinterDCImpl::DoCrossHair(wxCoord x, wxCoord y)
 
 void wxGtkPrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
 {
-    double dx = x1 - xc;
-    double dy = y1 - yc;
-    double radius = sqrt((double)(dx*dx+dy*dy));
+    const double dx1 = x1 - xc;
+    const double dy1 = y1 - yc;
+    const double radius = sqrt(dx1*dx1 + dy1*dy1);
+
+    if ( radius == 0.0 )
+        return;
 
     double alpha1, alpha2;
-    if (x1 == x2 && y1 == y2)
+    if ( x1 == x2 && y1 == y2 )
     {
         alpha1 = 0.0;
-        alpha2 = 360.0;
-    }
-    else
-    if (radius == 0.0)
-    {
-        alpha1 = alpha2 = 0.0;
+        alpha2 = 2*M_PI;
+
     }
     else
     {
-        alpha1 = (x1 - xc == 0) ?
-            (y1 - yc < 0) ? 90.0 : -90.0 :
-            atan2(double(y1-yc), double(x1-xc)) * RAD2DEG;
-        alpha2 = (x2 - xc == 0) ?
-            (y2 - yc < 0) ? 90.0 : -90.0 :
-            atan2(double(y2-yc), double(x2-xc)) * RAD2DEG;
-
-        while (alpha1 <= 0)   alpha1 += 360;
-        while (alpha2 <= 0)   alpha2 += 360; // adjust angles to be between.
-        while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree.
-        while (alpha2 > 360)  alpha2 -= 360;
+        alpha1 = atan2(dy1, dx1);
+        alpha2 = atan2(double(y2-yc), double(x2-xc));
     }
 
-    alpha1 *= DEG2RAD;
-    alpha2 *= DEG2RAD;
-
     cairo_new_path(m_cairo);
 
-    cairo_arc_negative ( m_cairo, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2);
-    cairo_line_to(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc));
-    cairo_close_path (m_cairo);
+    // We use the "negative" variant because the arc should go counterclockwise
+    // while in the default coordinate system, with Y axis going down, Cairo
+    // counts angles in the direction from positive X axis direction to
+    // positive Y axis direction, i.e. clockwise.
+    cairo_arc_negative(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc),
+                       XLOG2DEVREL(wxRound(radius)), alpha1, alpha2);
 
-    SetBrush( m_brush );
-    cairo_fill_preserve( m_cairo );
+    if ( m_brush.IsNonTransparent() )
+    {
+        cairo_line_to(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc));
+        cairo_close_path (m_cairo);
+
+        SetBrush( m_brush );
+        cairo_fill_preserve( m_cairo );
+    }
 
     SetPen (m_pen);
     cairo_stroke( m_cairo );
@@ -1451,7 +1443,7 @@ void wxGtkPrinterDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
-void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGtkPrinterDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     if ( m_pen.IsTransparent() )
         return;
@@ -1473,7 +1465,7 @@ void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, w
     cairo_stroke ( m_cairo);
 }
 
-void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+void wxGtkPrinterDCImpl::DoDrawPolygon(int n, const wxPoint points[],
                                        wxCoord xoffset, wxCoord yoffset,
                                        wxPolygonFillMode fillStyle)
 {
@@ -1492,9 +1484,9 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
     int i;
     for (i = 1; i < n; i++)
     {
-        int x = points[i].x + xoffset;
-        int y = points[i].y + yoffset;
-        cairo_line_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
+        int xx = points[i].x + xoffset;
+        int yy = points[i].y + yoffset;
+        cairo_line_to( m_cairo, XLOG2DEV(xx), YLOG2DEV(yy) );
     }
     cairo_close_path(m_cairo);
 
@@ -1509,7 +1501,7 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
     cairo_restore(m_cairo);
 }
 
-void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                                            wxCoord xoffset, wxCoord yoffset,
                                            wxPolygonFillMode fillStyle)
 {
@@ -1705,9 +1697,11 @@ void wxGtkPrinterDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
     y = wxCoord(YLOG2DEV(y));
     int bw = bitmap.GetWidth();
     int bh = bitmap.GetHeight();
+#ifndef __WXGTK3__
     wxBitmap bmpSource = bitmap;  // we need a non-const instance.
     if (!useMask && !bitmap.HasPixbuf() && bitmap.GetMask())
         bmpSource.SetMask(NULL);
+#endif
 
     cairo_save(m_cairo);
 
@@ -1719,12 +1713,16 @@ void wxGtkPrinterDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
     wxDouble scaleY = (wxDouble) YLOG2DEVREL(bh) / (wxDouble) bh;
     cairo_scale(m_cairo, scaleX, scaleY);
 
+#ifdef __WXGTK3__
+    bitmap.Draw(m_cairo, 0, 0, useMask, &m_textForegroundColour, &m_textBackgroundColour);
+#else
     gdk_cairo_set_source_pixbuf(m_cairo, bmpSource.GetPixbuf(), 0, 0);
     cairo_pattern_set_filter(cairo_get_source(m_cairo), CAIRO_FILTER_NEAREST);
     // Use the original size here since the context is scaled already.
     cairo_rectangle(m_cairo, 0, 0, bw, bh);
     // Fill the rectangle using the pattern.
     cairo_fill(m_cairo);
+#endif
 
     CalcBoundingBox(0,0);
     CalcBoundingBox(bw,bh);
@@ -2065,6 +2063,8 @@ void wxGtkPrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width
 {
     cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
     cairo_clip(m_cairo);
+
+    wxDCImpl::DoSetClippingRegion(x, y, width, height);
 }
 
 void wxGtkPrinterDCImpl::DestroyClippingRegion()
@@ -2084,7 +2084,24 @@ void wxGtkPrinterDCImpl::EndDoc()
 
 void wxGtkPrinterDCImpl::StartPage()
 {
-    return;
+    // Notice that we may change the Cairo transformation matrix only here and
+    // not before (e.g. in wxGtkPrinterDCImpl ctor as we used to do) in order
+    // to not affect _gtk_print_context_rotate_according_to_orientation() which
+    // is used in GTK+ itself and wouldn't work correctly if we applied these
+    // transformations before it is called.
+
+    // By default the origin of the Cairo context is in the upper left
+    // corner of the printable area. We need to translate it so that it
+    // is in the upper left corner of the paper (without margins)
+    GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
+    gdouble ml, mt;
+    ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
+    mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+    cairo_translate(m_cairo, -ml, -mt);
+
+#if wxCAIRO_SCALE
+    cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
+#endif
 }
 
 void wxGtkPrinterDCImpl::EndPage()
diff --git a/Externals/wxWidgets3/src/gtk/private.cpp b/Externals/wxWidgets3/src/gtk/private.cpp
index 0fcdf33fc1..4cf519ee87 100644
--- a/Externals/wxWidgets3/src/gtk/private.cpp
+++ b/Externals/wxWidgets3/src/gtk/private.cpp
@@ -4,7 +4,6 @@
 // Author:      Marcin Malich
 // Modified by:
 // Created:     28.06.2008
-// RCS-ID:      $Id: private.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2008 Marcin Malich <me@malcom.pl>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,7 @@
     #include "wx/module.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
@@ -64,6 +64,20 @@ GtkWidget *GetButtonWidget()
     return s_button;
 }
 
+GtkWidget *GetNotebookWidget()
+{
+    static GtkWidget *s_notebook = NULL;
+
+    if ( !s_notebook )
+    {
+        s_notebook = gtk_notebook_new();
+        gtk_container_add(GetContainer(), s_notebook);
+        gtk_widget_realize(s_notebook);
+    }
+
+    return s_notebook;
+}
+
 GtkWidget *GetCheckButtonWidget()
 {
     static GtkWidget *s_button = NULL;
@@ -125,15 +139,28 @@ static void CreateHeaderButtons()
 
         GtkTreeViewColumn *column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+#ifdef __WXGTK3__
+        s_first_button = gtk_tree_view_column_get_button(column);
+#else
         s_first_button = column->button;
+#endif
+        wxASSERT(s_first_button);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+#ifdef __WXGTK3__
+        s_other_button = gtk_tree_view_column_get_button(column);
+#else
         s_other_button = column->button;
+#endif
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+#ifdef __WXGTK3__
+        s_last_button = gtk_tree_view_column_get_button(column);
+#else
         s_last_button = column->button;
+#endif
 }
 
 GtkWidget *GetHeaderButtonWidgetFirst()
@@ -177,13 +204,22 @@ GtkWidget * GetRadioButtonWidget()
     return s_button;
 }
 
-GtkWidget* GetSplitterWidget()
+GtkWidget* GetSplitterWidget(wxOrientation orient)
 {
-    static GtkWidget* widget;
-
+    static GtkWidget* widgets[2];
+    const GtkOrientation gtkOrient =
+        orient == wxHORIZONTAL ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+    GtkWidget*& widget = widgets[gtkOrient];
     if (widget == NULL)
     {
-        widget = gtk_vpaned_new();
+#ifdef __WXGTK3__
+        widget = gtk_paned_new(gtkOrient);
+#else
+        if (orient == wxHORIZONTAL)
+            widget = gtk_hpaned_new();
+        else
+            widget = gtk_vpaned_new();
+#endif
         gtk_container_add(GetContainer(), widget);
         gtk_widget_realize(widget);
     }
@@ -222,7 +258,6 @@ GtkWidget *GetTreeWidget()
     return s_tree;
 }
 
-
 // Module for destroying created widgets
 class WidgetsCleanupModule : public wxModule
 {
diff --git a/Externals/wxWidgets3/src/gtk/radiobox.cpp b/Externals/wxWidgets3/src/gtk/radiobox.cpp
index 267c7c9f4c..1277b5f912 100644
--- a/Externals/wxWidgets3/src/gtk/radiobox.cpp
+++ b/Externals/wxWidgets3/src/gtk/radiobox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/radiobox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: radiobox.cpp 67331 2011-03-29 05:15:54Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,9 @@
     #include "wx/tooltip.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 #include <gdk/gdkkeysyms.h>
 #if GTK_CHECK_VERSION(3,0,0)
@@ -56,12 +57,11 @@ extern bool          g_blockEventsOnDrag;
 extern "C" {
 static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb )
 {
-    if (!rb->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!gtk_toggle_button_get_active(button)) return;
 
-    wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
+    wxCommandEvent event( wxEVT_RADIOBOX, rb->GetId() );
     event.SetInt( rb->GetSelection() );
     event.SetString( rb->GetStringSelection() );
     event.SetEventObject( rb );
@@ -76,7 +76,6 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
 extern "C" {
 static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
 {
-    if (!rb->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 
     if ( ((gdk_event->keyval == GDK_Tab) ||
@@ -88,7 +87,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         // GDK reports GDK_ISO_Left_Tab for SHIFT-TAB
         new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         // CTRL-TAB changes the (parent) window, i.e. switch notebook page
-        new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
+        new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) != 0 );
         new_event.SetCurrentFocus( rb );
         return rb->GetParent()->HandleWindowEvent(new_event);
     }
@@ -317,6 +316,7 @@ wxRadioBox::~wxRadioBox()
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->GetData()->button );
+        GTKDisconnect(button);
         gtk_widget_destroy( button );
         node = node->GetNext();
     }
@@ -475,7 +475,7 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const
 
     // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if
     // the parent radiobox is disabled
-    return gtk_widget_get_sensitive(GTK_WIDGET(button));
+    return gtk_widget_get_sensitive(GTK_WIDGET(button)) != 0;
 }
 
 bool wxRadioBox::Show(unsigned int item, bool show)
@@ -506,7 +506,7 @@ bool wxRadioBox::IsItemShown(unsigned int item) const
 
     GtkButton *button = GTK_BUTTON( node->GetData()->button );
 
-    return gtk_widget_get_visible(GTK_WIDGET(button));
+    return gtk_widget_get_visible(GTK_WIDGET(button)) != 0;
 }
 
 unsigned int wxRadioBox::GetCount() const
@@ -547,8 +547,8 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData()->button );
 
-        gtk_widget_modify_style( widget, style );
-        gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(widget)), style);
+        GTKApplyStyle(widget, style);
+        GTKApplyStyle(gtk_bin_get_child(GTK_BIN(widget)), style);
 
         node = node->GetNext();
     }
@@ -616,14 +616,7 @@ GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const
 wxVisualAttributes
 wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    wxVisualAttributes attr;
-    // NB: we need toplevel window so that GTK+ can find the right style
-    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
-    gtk_container_add(GTK_CONTAINER(wnd), widget);
-    attr = GetDefaultAttributesFromGTKWidget(widget);
-    gtk_widget_destroy(wnd);
-    return attr;
+    return GetDefaultAttributesFromGTKWidget(gtk_radio_button_new_with_label(NULL, ""));
 }
 
 int wxRadioBox::GetItemFromPoint(const wxPoint& point) const
diff --git a/Externals/wxWidgets3/src/gtk/radiobut.cpp b/Externals/wxWidgets3/src/gtk/radiobut.cpp
index 78a6f2e736..9637a8004c 100644
--- a/Externals/wxWidgets3/src/gtk/radiobut.cpp
+++ b/Externals/wxWidgets3/src/gtk/radiobut.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/radiobut.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: radiobut.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +13,9 @@
 
 #include "wx/radiobut.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -30,13 +31,11 @@ extern "C" {
 static
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
-    if (!rb->m_hasVMT) return;
-
     if (g_blockEventsOnDrag) return;
 
     if (!gtk_toggle_button_get_active(button)) return;
 
-    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+    wxCommandEvent event( wxEVT_RADIOBUTTON, rb->GetId());
     event.SetInt( rb->GetValue() );
     event.SetEventObject( rb );
     rb->HandleWindowEvent( event );
@@ -63,6 +62,9 @@ bool wxRadioButton::Create( wxWindow *parent,
         return false;
     }
 
+    // Check if this radio button should be put into an existing group. This
+    // shouldn't be done if it's given a style to explicitly start a new group
+    // or if it's not meant to be a part of a group at all.
     GSList* radioButtonGroup = NULL;
     if (!HasFlag(wxRB_GROUP) && !HasFlag(wxRB_SINGLE))
     {
@@ -71,10 +73,22 @@ bool wxRadioButton::Create( wxWindow *parent,
         for (; node; node = node->GetPrevious())
         {
             wxWindow *child = node->GetData();
-            if (child->HasFlag(wxRB_GROUP) && wxIsKindOf(child, wxRadioButton))
+
+            // We stop at the first previous radio button in any case as it
+            // wouldn't make sense to put this button in a group with another
+            // one if there is a radio button that is not part of the same
+            // group between them.
+            if (wxIsKindOf(child, wxRadioButton))
             {
-                radioButtonGroup = gtk_radio_button_get_group(
-                    GTK_RADIO_BUTTON(child->m_widget));
+                // Any preceding radio button can be used to get its group, not
+                // necessarily one with wxRB_GROUP style, but exclude
+                // wxRB_SINGLE ones as their group should never be shared.
+                if (!child->HasFlag(wxRB_SINGLE))
+                {
+                    radioButtonGroup = gtk_radio_button_get_group(
+                        GTK_RADIO_BUTTON(child->m_widget));
+                }
+
                 break;
             }
         }
@@ -152,28 +166,21 @@ bool wxRadioButton::Enable( bool enable )
 
 void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
 }
 
 GdkWindow *
 wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    return GTK_BUTTON(m_widget)->event_window;
+    return gtk_button_get_event_window(GTK_BUTTON(m_widget));
 }
 
 // static
 wxVisualAttributes
 wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    wxVisualAttributes attr;
-    // NB: we need toplevel window so that GTK+ can find the right style
-    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
-    gtk_container_add(GTK_CONTAINER(wnd), widget);
-    attr = GetDefaultAttributesFromGTKWidget(widget);
-    gtk_widget_destroy(wnd);
-    return attr;
+    return GetDefaultAttributesFromGTKWidget(gtk_radio_button_new_with_label(NULL, ""));
 }
 
 
diff --git a/Externals/wxWidgets3/src/gtk/region.cpp b/Externals/wxWidgets3/src/gtk/region.cpp
index 6832d60d7b..af0d73628e 100644
--- a/Externals/wxWidgets3/src/gtk/region.cpp
+++ b/Externals/wxWidgets3/src/gtk/region.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
-// Id:          $Id: region.cpp 69817 2011-11-25 01:01:26Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,12 +20,7 @@
 
 #include "wx/region.h"
 
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include "wx/gtk/private.h"
-
+#include <gdk/gdk.h>
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region
@@ -43,24 +37,38 @@ public:
     wxRegionRefData(const wxRegionRefData& refData)
         : wxGDIRefData()
     {
+#ifdef __WXGTK3__
+        m_region = cairo_region_copy(refData.m_region);
+#else
         m_region = gdk_region_copy(refData.m_region);
+#endif
     }
 
     virtual ~wxRegionRefData()
     {
         if (m_region)
+        {
+#ifdef __WXGTK3__
+            cairo_region_destroy(m_region);
+#else
             gdk_region_destroy( m_region );
+#endif
+        }
     }
 
+#ifdef __WXGTK3__
+    cairo_region_t* m_region;
+#else
     GdkRegion  *m_region;
+#endif
 };
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
+#define M_REGIONDATA static_cast<wxRegionRefData*>(m_refData)
+#define M_REGIONDATA_OF(r) static_cast<wxRegionRefData*>(r.m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
@@ -69,8 +77,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
 // wxRegion construction
 // ----------------------------------------------------------------------------
 
-#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-
 void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     GdkRectangle rect;
@@ -81,18 +87,74 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 
     m_refData = new wxRegionRefData();
 
+#ifdef __WXGTK3__
+    M_REGIONDATA->m_region = cairo_region_create_rectangle(&rect);
+#else
     M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
+#endif
 }
 
-wxRegion::wxRegion( GdkRegion *region )
+#ifndef __WXGTK3__
+wxRegion::wxRegion(const GdkRegion* region)
 {
     m_refData = new wxRegionRefData();
-    M_REGIONDATA->m_region = gdk_region_copy( region );
+    M_REGIONDATA->m_region = gdk_region_copy(const_cast<GdkRegion*>(region));
 }
+#endif
 
 wxRegion::wxRegion( size_t n, const wxPoint *points,
                     wxPolygonFillMode fillStyle )
 {
+#ifdef __WXGTK3__
+    // Make a cairo path from the points, draw it onto an image surface, use
+    // gdk_cairo_region_create_from_surface() to get a cairo region
+
+    // need at least 3 points to make a useful polygon
+    if (n < 3)
+        return;
+    // get bounding rect
+    int min_x = points[0].x;
+    int max_x = min_x;
+    int min_y = points[0].y;
+    int max_y = min_y;
+    size_t i;
+    for (i = 1; i < n; i++)
+    {
+        const int x = points[i].x;
+        if (min_x > x)
+            min_x = x;
+        else if (max_x < x)
+            max_x = x;
+        const int y = points[i].y;
+        if (min_y > y)
+            min_y = y;
+        else if (max_y < y)
+            max_y = y;
+    }
+    const int w = max_x - min_x + 1;
+    const int h = max_y - min_y + 1;
+    // make surface just big enough to contain polygon (A1 is native format
+    //   for gdk_cairo_region_create_from_surface)
+    cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A1, w, h);
+    memset(cairo_image_surface_get_data(surface), 0, cairo_image_surface_get_stride(surface) * h);
+    cairo_surface_mark_dirty(surface);
+    cairo_surface_set_device_offset(surface, -min_x, -min_y);
+    cairo_t* cr = cairo_create(surface);
+    cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+    if (fillStyle == wxODDEVEN_RULE)
+        cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
+    // make path
+    cairo_move_to(cr, points[0].x, points[0].y);
+    for (i = 1; i < n; i++)
+        cairo_line_to(cr, points[i].x, points[i].y);
+    cairo_close_path(cr);
+    cairo_fill(cr);
+    cairo_destroy(cr);
+    cairo_surface_flush(surface);
+    m_refData = new wxRegionRefData;
+    M_REGIONDATA->m_region = gdk_cairo_region_create_from_surface(surface);
+    cairo_surface_destroy(surface);
+#else
     GdkPoint *gdkpoints = new GdkPoint[n];
     for ( size_t i = 0 ; i < n ; i++ )
     {
@@ -113,6 +175,7 @@ wxRegion::wxRegion( size_t n, const wxPoint *points,
     M_REGIONDATA->m_region = reg;
 
     delete [] gdkpoints;
+#endif
 }
 
 wxRegion::~wxRegion()
@@ -122,12 +185,14 @@ wxRegion::~wxRegion()
 
 wxGDIRefData *wxRegion::CreateGDIRefData() const
 {
-    return new wxRegionRefData;
+    // should never be called
+    wxFAIL;
+    return NULL;
 }
 
 wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return new wxRegionRefData(*(wxRegionRefData *)data);
+    return new wxRegionRefData(*static_cast<const wxRegionRefData*>(data));
 }
 
 // ----------------------------------------------------------------------------
@@ -136,8 +201,13 @@ wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
 
 bool wxRegion::DoIsEqual(const wxRegion& region) const
 {
+#ifdef __WXGTK3__
+    return cairo_region_equal(
+        M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region);
+#else
     return gdk_region_equal(M_REGIONDATA->m_region,
-                            M_REGIONDATA_OF(region)->m_region);
+                            M_REGIONDATA_OF(region)->m_region) != 0;
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -171,7 +241,11 @@ bool wxRegion::DoUnionWithRect(const wxRect& r)
         rect.width = r.width;
         rect.height = r.height;
 
+#ifdef __WXGTK3__
+        cairo_region_union_rectangle(M_REGIONDATA->m_region, &rect);
+#else
         gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
+#endif
     }
 
     return true;
@@ -179,16 +253,20 @@ bool wxRegion::DoUnionWithRect(const wxRect& r)
 
 bool wxRegion::DoUnionWithRegion( const wxRegion& region )
 {
-    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
-
-    if (!m_refData)
+    if (region.m_refData == NULL)
+        { }
+    else if (m_refData == NULL)
     {
         m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region));
     }
     else
     {
         AllocExclusive();
+#ifdef __WXGTK3__
+        cairo_region_union(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region);
+#else
         gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
+#endif
     }
 
     return true;
@@ -196,43 +274,41 @@ bool wxRegion::DoUnionWithRegion( const wxRegion& region )
 
 bool wxRegion::DoIntersect( const wxRegion& region )
 {
-    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
-
-    if (!m_refData)
-    {
-        // intersecting with invalid region doesn't make sense
+    if (region.m_refData == NULL || m_refData == NULL)
         return false;
-    }
 
     AllocExclusive();
 
+#ifdef __WXGTK3__
+    cairo_region_intersect(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region);
+#else
     gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
+#endif
 
     return true;
 }
 
 bool wxRegion::DoSubtract( const wxRegion& region )
 {
-    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
-
-    if (!m_refData)
-    {
-        // subtracting from an invalid region doesn't make sense
+    if (region.m_refData == NULL || m_refData == NULL)
         return false;
-    }
 
     AllocExclusive();
 
+#ifdef __WXGTK3__
+    cairo_region_subtract(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region);
+#else
     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
+#endif
 
     return true;
 }
 
 bool wxRegion::DoXor( const wxRegion& region )
 {
-    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
-
-    if (!m_refData)
+    if (region.m_refData == NULL)
+        { }
+    else if (m_refData == NULL)
     {
         // XOR-ing with an invalid region is the same as XOR-ing with an empty
         // one, i.e. it is simply a copy.
@@ -242,7 +318,11 @@ bool wxRegion::DoXor( const wxRegion& region )
     {
         AllocExclusive();
 
+#ifdef __WXGTK3__
+        cairo_region_xor(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region);
+#else
         gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
+#endif
     }
 
     return true;
@@ -254,7 +334,11 @@ bool wxRegion::DoOffset( wxCoord x, wxCoord y )
 
     AllocExclusive();
 
+#ifdef __WXGTK3__
+    cairo_region_translate(M_REGIONDATA->m_region, x, y);
+#else
     gdk_region_offset( M_REGIONDATA->m_region, x, y );
+#endif
 
     return true;
 }
@@ -268,7 +352,11 @@ bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
     if ( m_refData )
     {
         GdkRectangle rect;
+#ifdef __WXGTK3__
+        cairo_region_get_extents(M_REGIONDATA->m_region, &rect);
+#else
         gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+#endif
         x = rect.x;
         y = rect.y;
         w = rect.width;
@@ -289,21 +377,23 @@ bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
 
 bool wxRegion::IsEmpty() const
 {
-    if (!m_refData)
-        return true;
-
-    return gdk_region_empty( M_REGIONDATA->m_region );
+#ifdef __WXGTK3__
+    return m_refData == NULL || cairo_region_is_empty(M_REGIONDATA->m_region);
+#else
+    return m_refData == NULL || gdk_region_empty(M_REGIONDATA->m_region);
+#endif
 }
 
 wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const
 {
-    if (!m_refData)
+#ifdef __WXGTK3__
+    if (m_refData == NULL || !cairo_region_contains_point(M_REGIONDATA->m_region, x, y))
+#else
+    if (m_refData == NULL || !gdk_region_point_in(M_REGIONDATA->m_region, x, y))
+#endif
         return wxOutRegion;
 
-    if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
-        return wxInRegion;
-    else
-        return wxOutRegion;
+    return wxInRegion;
 }
 
 wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
@@ -316,6 +406,14 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
     rect.y = r.y;
     rect.width = r.width;
     rect.height = r.height;
+#ifdef __WXGTK3__
+    switch (cairo_region_contains_rectangle(M_REGIONDATA->m_region, &rect))
+    {
+        case CAIRO_REGION_OVERLAP_IN:   return wxInRegion;
+        case CAIRO_REGION_OVERLAP_PART: return wxPartRegion;
+        default: break;
+    }
+#else
     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {
@@ -323,10 +421,15 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
         case GDK_OVERLAP_RECTANGLE_OUT:  return wxOutRegion;
         case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion;
     }
+#endif
     return wxOutRegion;
 }
 
+#ifdef __WXGTK3__
+cairo_region_t* wxRegion::GetRegion() const
+#else
 GdkRegion *wxRegion::GetRegion() const
+#endif
 {
     if (!m_refData)
         return NULL;
@@ -366,6 +469,27 @@ void wxRegionIterator::CreateRects( const wxRegion& region )
     wxDELETEA(m_rects);
     m_numRects = 0;
 
+#ifdef __WXGTK3__
+    cairo_region_t* cairoRegion = region.GetRegion();
+    if (cairoRegion == NULL)
+        return;
+    m_numRects = cairo_region_num_rectangles(cairoRegion);
+     
+    if (m_numRects)
+    {
+        m_rects = new wxRect[m_numRects];
+        for (int i = 0; i < m_numRects; i++)
+        {
+            GdkRectangle gr;
+            cairo_region_get_rectangle(cairoRegion, i, &gr);
+            wxRect &wr = m_rects[i];
+            wr.x = gr.x;
+            wr.y = gr.y;
+            wr.width = gr.width;
+            wr.height = gr.height;
+        }
+    }
+#else
     GdkRegion *gdkregion = region.GetRegion();
     if (!gdkregion)
         return;
@@ -387,6 +511,7 @@ void wxRegionIterator::CreateRects( const wxRegion& region )
         }
     }
     g_free( gdkrects );
+#endif
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
diff --git a/Externals/wxWidgets3/src/gtk/renderer.cpp b/Externals/wxWidgets3/src/gtk/renderer.cpp
index f3bb23681a..98969dd3e5 100644
--- a/Externals/wxWidgets3/src/gtk/renderer.cpp
+++ b/Externals/wxWidgets3/src/gtk/renderer.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderer.cpp 69741 2011-11-12 16:50:37Z PC $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -34,10 +33,13 @@
 #endif
 
 #include "wx/dcgraph.h"
+#ifndef __WXGTK3__
 #include "wx/gtk/dc.h"
-#include "wx/gtk/private.h"
+#endif
 
 #include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
@@ -140,24 +142,43 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererGTK;
 }
 
-static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
+#ifdef __WXGTK3__
+#define NULL_RECT
+typedef cairo_t wxGTKDrawable;
+
+static cairo_t* wxGetGTKDrawable(wxWindow*, const wxDC& dc)
+{
+    wxGraphicsContext* gc = dc.GetGraphicsContext();
+    wxCHECK_MSG(gc, NULL, "cannot use wxRendererNative on wxDC of this type");
+    return static_cast<cairo_t*>(gc->GetNativeContext());
+}
+
+static const GtkStateFlags stateTypeToFlags[] = {
+    GTK_STATE_FLAG_NORMAL, GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT,
+    GTK_STATE_FLAG_SELECTED, GTK_STATE_FLAG_INSENSITIVE, GTK_STATE_FLAG_INCONSISTENT,
+    GTK_STATE_FLAG_FOCUSED
+};
+
+#else
+#define NULL_RECT NULL,
+typedef GdkWindow wxGTKDrawable;
+
+static GdkWindow* wxGetGTKDrawable(wxWindow* win, wxDC& dc)
 {
     GdkWindow* gdk_window = NULL;
 
 #if wxUSE_GRAPHICS_CONTEXT
-    if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
+    if ( wxDynamicCast(&dc, wxGCDC) )
         gdk_window = win->GTKGetDrawingWindow();
     else
 #endif
     {
-#if wxUSE_NEW_DC
         wxDCImpl *impl = dc.GetImpl();
         wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
         if (gtk_impl)
             gdk_window = gtk_impl->GetGDKWindow();
-#else
-        gdk_window = dc.GetGDKWindow();
-#endif
+        else
+            wxFAIL_MSG("cannot use wxRendererNative on wxDC of this type");
     }
 
 #if !wxUSE_GRAPHICS_CONTEXT
@@ -166,6 +187,7 @@ static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
 
     return gdk_window;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // list/tree controls drawing
@@ -179,17 +201,12 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxHeaderSortIconType sortArrow,
                                 wxHeaderButtonParams* params)
 {
-
     GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
     if (flags & wxCONTROL_SPECIAL)
         button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
     if (flags & wxCONTROL_DIRTY)
         button = wxGTKPrivate::GetHeaderButtonWidgetLast();
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
-
     int x_diff = 0;
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
@@ -203,6 +220,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
             state = GTK_STATE_PRELIGHT;
     }
 
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        GtkStyleContext* sc = gtk_widget_get_style_context(button);
+        gtk_style_context_save(sc);
+        gtk_style_context_set_state(sc, stateTypeToFlags[state]);
+        gtk_render_background(sc, cr, rect.x - x_diff+4, rect.y+4, rect.width-8, rect.height-8);
+        gtk_render_frame(sc, cr, rect.x - x_diff+4, rect.y+4, rect.width-8, rect.height-8);
+        gtk_style_context_restore(sc);
+    }
+#else
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
     gtk_paint_box
     (
         gtk_widget_get_style(button),
@@ -214,6 +244,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
         "button",
         dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
     );
+#endif
 
     return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
@@ -223,7 +254,11 @@ int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win))
     GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
 
     GtkRequisition req;
+#ifdef __WXGTK3__
+    gtk_widget_get_preferred_height(button, NULL, &req.height);
+#else
     GTK_WIDGET_GET_CLASS(button)->size_request(button, &req);
+#endif
 
     return req.height;
 }
@@ -242,10 +277,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 {
     GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
-
     GtkStateType state;
     if ( flags & wxCONTROL_CURRENT )
         state = GTK_STATE_PRELIGHT;
@@ -256,7 +287,19 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        gtk_widget_set_state_flags(tree, stateTypeToFlags[state], true);
+        GtkStyleContext* sc = gtk_widget_get_style_context(tree);
+        gtk_render_expander(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
+    }
+#else
     // x and y parameters specify the center of the expander
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
+    if (gdk_window == NULL)
+        return;
     gtk_paint_expander
     (
         gtk_widget_get_style(tree),
@@ -270,6 +313,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
         flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
                                    : GTK_EXPANDER_COLLAPSED
     );
+#endif
 }
 
 
@@ -320,15 +364,16 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
         return;
     }
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
-
-    wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget());
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
+    GtkWidget* widget = wxGTKPrivate::GetSplitterWidget(orient);
+    const int full_size = GetGtkSplitterFullSize(widget);
+
     GdkRectangle rect;
 
     if ( isVert )
@@ -350,6 +395,18 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        gtk_widget_set_state_flags(widget, stateTypeToFlags[flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL], true);
+        GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+        gtk_render_handle(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
+    }
+#else
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
+    if (gdk_window == NULL)
+        return;
     gtk_paint_handle
     (
         gtk_widget_get_style(win->m_wxwindow),
@@ -365,6 +422,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
         rect.height,
         isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
     );
+#endif
 }
 
 void
@@ -380,19 +438,12 @@ wxRendererGTK::DrawDropArrow(wxWindow* win,
     // work for wxMemoryDC. So that is why we assume wxDC
     // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
     // are derived from it) and use its m_window.
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
 
     // draw arrow so that there is even space horizontally
     // on both sides
-    int arrowX = rect.width/4 + 1;
-    int arrowWidth = rect.width - (arrowX*2);
-
-    // scale arrow's height accoording to the width
-    int arrowHeight = rect.width/3;
-    int arrowY = (rect.height-arrowHeight)/2 +
-                 ((rect.height-arrowHeight) & 1);
+    const int size = rect.width / 2;
+    const int x = rect.x + (size + 1) / 2;
+    const int y = rect.y + (rect.height - size + 1) / 2;
 
     GtkStateType state;
 
@@ -405,6 +456,18 @@ wxRendererGTK::DrawDropArrow(wxWindow* win,
     else
         state = GTK_STATE_NORMAL;
 
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        gtk_widget_set_state_flags(button, stateTypeToFlags[state], true);
+        GtkStyleContext* sc = gtk_widget_get_style_context(button);
+        gtk_render_arrow(sc, cr, G_PI, x, y, size);
+    }
+#else
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
+    if (gdk_window == NULL)
+        return;
     // draw arrow on button
     gtk_paint_arrow
     (
@@ -417,11 +480,10 @@ wxRendererGTK::DrawDropArrow(wxWindow* win,
         "arrow",
         GTK_ARROW_DOWN,
         FALSE,
-        rect.x + arrowX,
-        rect.y + arrowY,
-        arrowWidth,
-        arrowHeight
+        x, y,
+        size, size
     );
+#endif
 }
 
 void
@@ -455,16 +517,13 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
 {
     GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
-
     gint indicator_size, indicator_spacing;
     gtk_widget_style_get(button,
                          "indicator_size", &indicator_size,
                          "indicator_spacing", &indicator_spacing,
                          NULL);
 
+#ifndef __WXGTK3__
     GtkStateType state;
 
     if ( flags & wxCONTROL_PRESSED )
@@ -484,6 +543,35 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
         shadow_type = GTK_SHADOW_IN;
     else
         shadow_type = GTK_SHADOW_OUT;
+#endif
+
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        int stateFlags = GTK_STATE_FLAG_NORMAL;
+        if (flags & wxCONTROL_CHECKED)
+            stateFlags = GTK_STATE_FLAG_ACTIVE;
+        if (flags & wxCONTROL_DISABLED)
+            stateFlags |= GTK_STATE_FLAG_INSENSITIVE;
+        if (flags & wxCONTROL_UNDETERMINED)
+            stateFlags |= GTK_STATE_FLAG_INCONSISTENT;
+        if (flags & wxCONTROL_CURRENT)
+            stateFlags |= GTK_STATE_FLAG_PRELIGHT;
+        GtkStyleContext* sc = gtk_widget_get_style_context(button);
+        gtk_style_context_save(sc);
+        gtk_style_context_set_state(sc, GtkStateFlags(stateFlags));
+        gtk_style_context_add_class(sc, GTK_STYLE_CLASS_CHECK);
+        gtk_render_check(sc, cr,
+            rect.x + (rect.width - indicator_size) / 2,
+            rect.y + (rect.height - indicator_size) / 2,
+            indicator_size, indicator_size);
+        gtk_style_context_restore(sc);
+    }
+#else
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
+    if (gdk_window == NULL)
+        return;
 
     gtk_paint_check
     (
@@ -498,6 +586,7 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
         dc.LogicalToDeviceY(rect.y) + indicator_spacing,
         indicator_size, indicator_size
     );
+#endif
 }
 
 void
@@ -508,10 +597,6 @@ wxRendererGTK::DrawPushButton(wxWindow* win,
 {
     GtkWidget *button = wxGTKPrivate::GetButtonWidget();
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
-
     // draw button
     GtkStateType state;
 
@@ -524,6 +609,22 @@ wxRendererGTK::DrawPushButton(wxWindow* win,
     else
         state = GTK_STATE_NORMAL;
 
+#ifdef __WXGTK3__
+    cairo_t* cr = wxGetGTKDrawable(win, dc);
+    if (cr)
+    {
+        GtkStyleContext* sc = gtk_widget_get_style_context(button);
+        gtk_style_context_save(sc);
+        gtk_style_context_set_state(sc, stateTypeToFlags[state]);
+        gtk_render_background(sc, cr, rect.x, rect.y, rect.width, rect.height);
+        gtk_render_frame(sc, cr, rect.x, rect.y, rect.width, rect.height);
+        gtk_style_context_restore(sc);
+    }
+#else
+    GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
+    if (gdk_window == NULL)
+        return;
+
     gtk_paint_box
     (
         gtk_widget_get_style(button),
@@ -538,6 +639,7 @@ wxRendererGTK::DrawPushButton(wxWindow* win,
         rect.width,
         rect.height
     );
+#endif
 }
 
 void
@@ -546,9 +648,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
                                      const wxRect& rect,
                                      int flags )
 {
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
     if (flags & wxCONTROL_SELECTED)
     {
@@ -556,19 +658,30 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
         if (win->GetLayoutDirection() == wxLayout_RightToLeft)
             x_diff = rect.width;
 
+        GtkWidget* treeWidget = wxGTKPrivate::GetTreeWidget();
+
+#ifdef __WXGTK3__
+        GtkStyleContext* sc = gtk_widget_get_style_context(treeWidget);
+        gtk_style_context_save(sc);
+        gtk_style_context_set_state(sc, GTK_STATE_FLAG_SELECTED);
+        gtk_style_context_add_class(sc, GTK_STYLE_CLASS_CELL);
+        gtk_render_background(sc, drawable, rect.x - x_diff, rect.y, rect.width, rect.height);
+        gtk_style_context_restore(sc);
+#else
         // the wxCONTROL_FOCUSED state is deduced
         // directly from the m_wxwindow by GTK+
-        gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()),
-                        gdk_window,
+        gtk_paint_flat_box(gtk_widget_get_style(treeWidget),
+                        drawable,
                         GTK_STATE_SELECTED,
                         GTK_SHADOW_NONE,
-                        NULL,
+                        NULL_RECT
                         win->m_wxwindow,
                         "cell_even",
                         dc.LogicalToDeviceX(rect.x) - x_diff,
                         dc.LogicalToDeviceY(rect.y),
                         rect.width,
                         rect.height );
+#endif
     }
 
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
@@ -577,9 +690,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
 
 void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-    wxASSERT_MSG( gdk_window,
-                  wxT("cannot use wxRendererNative on wxDC of this type") );
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
     GtkStateType state;
     if (flags & wxCONTROL_SELECTED)
@@ -587,24 +700,34 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
     else
         state = GTK_STATE_NORMAL;
 
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(win->m_widget);
+    gtk_style_context_save(sc);
+    gtk_style_context_set_state(sc, stateTypeToFlags[state]);
+    gtk_render_focus(sc, drawable, rect.x, rect.y, rect.width, rect.height);
+    gtk_style_context_restore(sc);
+#else
     gtk_paint_focus( gtk_widget_get_style(win->m_widget),
-                     gdk_window,
+                     drawable,
                      state,
-                     NULL,
+                     NULL_RECT
                      win->m_wxwindow,
                      NULL,
                      dc.LogicalToDeviceX(rect.x),
                      dc.LogicalToDeviceY(rect.y),
                      rect.width,
                      rect.height );
+#endif
 }
 
 // Uses the theme to draw the border and fill for something like a wxTextCtrl
 void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
-    GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    GtkWidget* entry = wxGTKPrivate::GetTextEntryWidget();
 
     GtkStateType state = GTK_STATE_NORMAL;
     if ( flags & wxCONTROL_DISABLED )
@@ -612,13 +735,21 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0);
 
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(entry);
+    gtk_style_context_save(sc);
+    gtk_style_context_set_state(sc, stateTypeToFlags[state]);
+    gtk_render_background(sc, drawable, rect.x, rect.y, rect.width, rect.height);
+    gtk_render_frame(sc, drawable, rect.x, rect.y, rect.width, rect.height);
+    gtk_style_context_restore(sc);
+#else
     gtk_paint_shadow
     (
         gtk_widget_get_style(entry),
-        gdk_window,
+        drawable,
         state,
         GTK_SHADOW_OUT,
-        NULL,
+        NULL_RECT
         entry,
         "entry",
         dc.LogicalToDeviceX(rect.x),
@@ -626,14 +757,17 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
         rect.width,
         rect.height
   );
+#endif
 }
 
 // Draw the equivalent of a wxComboBox
 void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
-    GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    GtkWidget* combo = wxGTKPrivate::GetComboBoxWidget();
 
     GtkStateType state = GTK_STATE_NORMAL;
     if ( flags & wxCONTROL_DISABLED )
@@ -641,13 +775,25 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
 
     gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0);
 
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(combo);
+    gtk_style_context_save(sc);
+    gtk_style_context_set_state(sc, stateTypeToFlags[state]);
+    gtk_render_background(sc, drawable, rect.x, rect.y, rect.width, rect.height);
+    gtk_render_frame(sc, drawable, rect.x, rect.y, rect.width, rect.height);
+    gtk_style_context_restore(sc);
+    wxRect r = rect;
+    r.x += r.width - r.height;
+    r.width = r.height;
+    DrawComboBoxDropButton(win, dc, r, flags);
+#else
     gtk_paint_shadow
     (
         gtk_widget_get_style(combo),
-        gdk_window,
+        drawable,
         state,
         GTK_SHADOW_OUT,
-        NULL,
+        NULL_RECT
         combo,
         "combobox",
         dc.LogicalToDeviceX(rect.x),
@@ -666,10 +812,10 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
     gtk_paint_arrow
     (
         gtk_widget_get_style(combo),
-        gdk_window,
+        drawable,
         state,
         GTK_SHADOW_OUT,
-        NULL,
+        NULL_RECT
         combo,
         "arrow",
         GTK_ARROW_DOWN,
@@ -687,10 +833,10 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
     gtk_paint_box
     (
         gtk_widget_get_style(combo),
-        gdk_window,
+        drawable,
         state,
         GTK_SHADOW_ETCHED_OUT,
-        NULL,
+        NULL_RECT
         combo,
         "vseparator",
         dc.LogicalToDeviceX(r.x),
@@ -698,9 +844,9 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
         r.width,
         r.height-2
     );
+#endif
 }
 
-
 void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
                            const wxRect& rect, int flags)
 {
@@ -711,10 +857,28 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
 // Draw a themed radio button
 void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
-    GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
+    wxGTKDrawable* drawable = wxGetGTKDrawable(win, dc);
+    if (drawable == NULL)
+        return;
 
-    GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+    GtkWidget* button = wxGTKPrivate::GetRadioButtonWidget();
 
+#ifdef __WXGTK3__
+    int state = GTK_STATE_FLAG_NORMAL;
+    if (flags & wxCONTROL_CHECKED)
+        state = GTK_STATE_FLAG_ACTIVE;
+    else if (flags & wxCONTROL_UNDETERMINED)
+        state = GTK_STATE_FLAG_INCONSISTENT;
+    if (flags & wxCONTROL_DISABLED)
+        state |= GTK_STATE_FLAG_INSENSITIVE;
+
+    GtkStyleContext* sc = gtk_widget_get_style_context(button);
+    gtk_style_context_save(sc);
+    gtk_style_context_add_class(sc, GTK_STYLE_CLASS_RADIO);
+    gtk_style_context_set_state(sc, GtkStateFlags(state));
+    gtk_render_option(sc, drawable, rect.x, rect.y, rect.width, rect.height); 
+    gtk_style_context_restore(sc);
+#else
     GtkShadowType shadow_type = GTK_SHADOW_OUT;
     if ( flags & wxCONTROL_CHECKED )
         shadow_type = GTK_SHADOW_IN;
@@ -734,14 +898,15 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect,
     gtk_paint_option
     (
         gtk_widget_get_style(button),
-        gdk_window,
+        drawable,
         state,
         shadow_type,
-        NULL,
+        NULL_RECT
         button,
         "radiobutton",
         dc.LogicalToDeviceX(rect.x),
         dc.LogicalToDeviceY(rect.y),
         rect.width, rect.height
     );
+#endif
 }
diff --git a/Externals/wxWidgets3/src/gtk/scrolbar.cpp b/Externals/wxWidgets3/src/gtk/scrolbar.cpp
index 87e5615a33..83418b711c 100644
--- a/Externals/wxWidgets3/src/gtk/scrolbar.cpp
+++ b/Externals/wxWidgets3/src/gtk/scrolbar.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/scrolbar.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: scrolbar.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -138,10 +137,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     }
 
     const bool isVertical = (style & wxSB_VERTICAL) != 0;
-    if (isVertical)
-        m_widget = gtk_vscrollbar_new( NULL );
-    else
-        m_widget = gtk_hscrollbar_new( NULL );
+    m_widget = gtk_scrollbar_new(GtkOrientation(isVertical), NULL);
     g_object_ref(m_widget);
 
     m_scrollBar[0] = (GtkRange*)m_widget;
@@ -235,7 +231,7 @@ void wxScrollBar::SetRange(int range)
 wxVisualAttributes
 wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL));
 }
 
 #endif // wxUSE_SCROLLBAR
diff --git a/Externals/wxWidgets3/src/gtk/scrolwin.cpp b/Externals/wxWidgets3/src/gtk/scrolwin.cpp
index 9a50e5dc12..9b39077a3d 100644
--- a/Externals/wxWidgets3/src/gtk/scrolwin.cpp
+++ b/Externals/wxWidgets3/src/gtk/scrolwin.cpp
@@ -5,7 +5,6 @@
 // Modified by: Ron Lee
 //              Vadim Zeitlin: removed 90% of duplicated common code
 // Created:     01/02/97
-// RCS-ID:      $Id: scrolwin.cpp 68121 2011-07-01 17:44:49Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -182,6 +181,23 @@ GtkPolicyType GtkPolicyFromWX(wxScrollbarVisibility visibility)
 
 } // anonymous namespace
 
+bool wxScrollHelper::IsScrollbarShown(int orient) const
+{
+    GtkScrolledWindow * const scrolled = GTK_SCROLLED_WINDOW(m_win->m_widget);
+    if ( !scrolled )
+    {
+        // By default, all windows are scrollable.
+        return true;
+    }
+
+    GtkPolicyType hpolicy, vpolicy;
+    gtk_scrolled_window_get_policy(scrolled, &hpolicy, &vpolicy);
+
+    GtkPolicyType policy = orient == wxHORIZONTAL ? hpolicy : vpolicy;
+
+    return policy != GTK_POLICY_NEVER;
+}
+
 void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
                                       wxScrollbarVisibility vert)
 {
diff --git a/Externals/wxWidgets3/src/gtk/settings.cpp b/Externals/wxWidgets3/src/gtk/settings.cpp
index 9544fb9bc5..98efe96766 100644
--- a/Externals/wxWidgets3/src/gtk/settings.cpp
+++ b/Externals/wxWidgets3/src/gtk/settings.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)
-// Id:          $Id: settings.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,32 +38,44 @@ static GtkContainer* ContainerWidget()
     {
         s_widget = GTK_CONTAINER(gtk_fixed_new());
         GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+#ifdef __WXGTK3__
+        // need this to initialize style for window
+        gtk_widget_get_style_context(GTK_WIDGET(window));
+#endif
         gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(s_widget));
     }
     return s_widget;
 }
 
 extern "C" {
+#ifdef __WXGTK3__
+static void style_updated(GtkWidget*, void*)
+#else
 static void style_set(GtkWidget*, GtkStyle*, void*)
+#endif
 {
     gs_fontSystem = wxNullFont;
 }
 }
 
-static const GtkStyle* ButtonStyle()
+static GtkWidget* ButtonWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
     {
         s_widget = gtk_button_new();
         gtk_container_add(ContainerWidget(), s_widget);
+#ifdef __WXGTK3__
+        g_signal_connect(s_widget, "style_updated", G_CALLBACK(style_updated), NULL);
+#else
         gtk_widget_ensure_style(s_widget);
         g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
 }
 
-static const GtkStyle* ListStyle()
+static GtkWidget* ListWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
@@ -72,60 +83,213 @@ static const GtkStyle* ListStyle()
         s_widget = gtk_tree_view_new_with_model(
             GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_INT)));
         gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
         gtk_widget_ensure_style(s_widget);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
 }
 
-static const GtkStyle* TextCtrlStyle()
+static GtkWidget* TextCtrlWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
     {
         s_widget = gtk_text_view_new();
         gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
         gtk_widget_ensure_style(s_widget);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
 }
 
-static const GtkStyle* MenuItemStyle()
+static GtkWidget* MenuItemWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
     {
         s_widget = gtk_menu_item_new();
         gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
         gtk_widget_ensure_style(s_widget);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
 }
 
-static const GtkStyle* MenuBarStyle()
+static GtkWidget* MenuBarWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
     {
         s_widget = gtk_menu_bar_new();
         gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
         gtk_widget_ensure_style(s_widget);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
 }
 
-static const GtkStyle* ToolTipStyle()
+static GtkWidget* ToolTipWidget()
 {
     static GtkWidget* s_widget;
     if (s_widget == NULL)
     {
         s_widget = gtk_window_new(GTK_WINDOW_POPUP);
         const char* name = "gtk-tooltip";
+#ifndef __WXGTK3__
         if (gtk_check_version(2, 11, 0))
             name = "gtk-tooltips";
+#endif
         gtk_widget_set_name(s_widget, name);
+#ifndef __WXGTK3__
         gtk_widget_ensure_style(s_widget);
+#endif
     }
-    return gtk_widget_get_style(s_widget);
+    return s_widget;
+}
+
+#ifdef __WXGTK3__
+static void bg(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_background_color(sc, state, &gdkRGBA);
+}
+static void fg(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_color(sc, state, &gdkRGBA);
+}
+static void border(GtkWidget* widget, GtkStateFlags state, GdkRGBA& gdkRGBA)
+{
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    gtk_style_context_get_border_color(sc, state, &gdkRGBA);
+}
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
+{
+    GdkRGBA gdkRGBA = { 0, 0, 0, 1 };
+    switch (index)
+    {
+    case wxSYS_COLOUR_3DLIGHT:
+    case wxSYS_COLOUR_ACTIVEBORDER:
+    case wxSYS_COLOUR_BTNFACE:
+    case wxSYS_COLOUR_DESKTOP:
+    case wxSYS_COLOUR_INACTIVEBORDER:
+    case wxSYS_COLOUR_INACTIVECAPTION:
+    case wxSYS_COLOUR_SCROLLBAR:
+    case wxSYS_COLOUR_WINDOWFRAME:
+        bg(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNHIGHLIGHT:
+    case wxSYS_COLOUR_HIGHLIGHT:
+        bg(ButtonWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNSHADOW:
+        border(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_BTNTEXT:
+    case wxSYS_COLOUR_WINDOWTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_GRAYTEXT:
+    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_INSENSITIVE, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_HIGHLIGHTTEXT:
+        fg(ButtonWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_HOTLIGHT:
+        {
+            static GtkWidget* s_widget;
+            if (s_widget == NULL)
+            {
+                s_widget = gtk_link_button_new("");
+                gtk_container_add(ContainerWidget(), s_widget);
+            }
+            fg(s_widget, GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        }
+        break;
+    case wxSYS_COLOUR_INFOBK:
+        bg(ToolTipWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_INFOTEXT:
+        fg(ToolTipWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOX:
+        bg(ListWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
+        fg(ListWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_LISTBOXTEXT:
+        fg(ListWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENU:
+        bg(MenuItemWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENUBAR:
+        bg(MenuBarWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_ACTIVECAPTION:
+    case wxSYS_COLOUR_MENUHILIGHT:
+        bg(MenuItemWidget(), GTK_STATE_FLAG_SELECTED, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_MENUTEXT:
+        fg(MenuItemWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_APPWORKSPACE:
+    case wxSYS_COLOUR_WINDOW:
+        bg(TextCtrlWidget(), GTK_STATE_FLAG_NORMAL, gdkRGBA);
+        break;
+    case wxSYS_COLOUR_CAPTIONTEXT:
+        {
+            GdkRGBA c = { 1, 1, 1, 1 };
+            gdkRGBA = c;
+        }
+        break;
+    default:
+        wxFAIL_MSG("unknown system colour index");
+        // fallthrough
+    case wxSYS_COLOUR_3DDKSHADOW:
+    case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+    case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+        // black
+        break;
+    }
+    return wxColour(gdkRGBA);
+}
+#else
+static const GtkStyle* ButtonStyle()
+{
+    return gtk_widget_get_style(ButtonWidget());
+}
+
+static const GtkStyle* ListStyle()
+{
+    return gtk_widget_get_style(ListWidget());
+}
+
+static const GtkStyle* TextCtrlStyle()
+{
+    return gtk_widget_get_style(TextCtrlWidget());
+}
+
+static const GtkStyle* MenuItemStyle()
+{
+    return gtk_widget_get_style(MenuItemWidget());
+}
+
+static const GtkStyle* MenuBarStyle()
+{
+    return gtk_widget_get_style(MenuBarWidget());
+}
+
+static const GtkStyle* ToolTipStyle()
+{
+    return gtk_widget_get_style(ToolTipWidget());
 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
@@ -242,6 +406,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
     wxASSERT(color.IsOk());
     return color;
 }
+#endif
 
 wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 {
@@ -261,7 +426,13 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
             if (!gs_fontSystem.IsOk())
             {
                 wxNativeFontInfo info;
+#ifdef __WXGTK3__
+                GtkStyleContext* sc = gtk_widget_get_style_context(ButtonWidget());
+                gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
+                    GTK_STYLE_PROPERTY_FONT, &info.description, NULL);
+#else
                 info.description = ButtonStyle()->font_desc;
+#endif
                 gs_fontSystem = wxFont(info);
 
 #if wxUSE_FONTENUM
@@ -269,10 +440,14 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
                 // it's "Sans Serif" but the real font is called "Sans"):
                 if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) &&
                     gs_fontSystem.GetFaceName() == "Sans Serif")
+                {
                     gs_fontSystem.SetFaceName("Sans");
+                }
 #endif // wxUSE_FONTENUM
 
+#ifndef __WXGTK3__
                 info.description = NULL;
+#endif
             }
             font = gs_fontSystem;
             break;
@@ -290,7 +465,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 // on or for the default screen if window is NULL
 static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
 {
-    return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window))
+    return window ? gtk_settings_get_for_screen(gdk_window_get_screen(window))
                   : gtk_settings_get_default();
 }
 
@@ -299,16 +474,16 @@ static int GetBorderWidth(wxSystemMetric index, wxWindow* win)
     if (win->m_wxwindow)
     {
         wxPizza* pizza = WX_PIZZA(win->m_wxwindow);
-        int x, y;
-        pizza->get_border_widths(x, y);
+        GtkBorder border;
+        pizza->get_border(border);
         switch (index)
         {
             case wxSYS_BORDER_X:
             case wxSYS_EDGE_X:
             case wxSYS_FRAMESIZE_X:
-                return x;
+                return border.left;
             default:
-                return y;
+                return border.top;
         }
     }
     return -1;
@@ -359,7 +534,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:
                 return gdk_display_get_default_cursor_size(
-                            window ? gdk_drawable_get_display(window)
+                            window ? gdk_window_get_display(window)
                                    : gdk_display_get_default());
 
         case wxSYS_DCLICK_X:
@@ -396,13 +571,13 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
         case wxSYS_SCREEN_X:
             if (window)
-                return gdk_screen_get_width(gdk_drawable_get_screen(window));
+                return gdk_screen_get_width(gdk_window_get_screen(window));
             else
                 return gdk_screen_width();
 
         case wxSYS_SCREEN_Y:
             if (window)
-                return gdk_screen_get_height(gdk_drawable_get_screen(window));
+                return gdk_screen_get_height(gdk_window_get_screen(window));
             else
                 return gdk_screen_height();
 
diff --git a/Externals/wxWidgets3/src/gtk/slider.cpp b/Externals/wxWidgets3/src/gtk/slider.cpp
index 694184cf3d..17d8cf087c 100644
--- a/Externals/wxWidgets3/src/gtk/slider.cpp
+++ b/Externals/wxWidgets3/src/gtk/slider.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: slider.cpp 70756 2012-02-29 18:29:31Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,7 +59,7 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     }
 
     // and also generate a command event for compatibility
-    wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
+    wxCommandEvent event( wxEVT_SLIDER, win->GetId() );
     event.SetEventObject( win );
     event.SetInt( value );
     win->HandleWindowEvent( event );
@@ -129,7 +128,7 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     const double oldPos = win->m_pos;
     win->m_pos = value;
 
-    if (!win->m_hasVMT || g_blockEventsOnDrag)
+    if (g_blockEventsOnDrag)
         return;
 
     if (win->GTKEventsDisabled())
@@ -275,10 +274,13 @@ static gchar* gtk_format_value(GtkScale*, double value, void*)
 
 wxSlider::wxSlider()
 {
-    m_pos = 0;
-    m_scrollEventType = GTK_SCROLL_NONE;
-    m_needThumbRelease = false;
-    m_blockScrollEvent = false;
+    m_scale = NULL;
+}
+
+wxSlider::~wxSlider()
+{
+    if (m_scale && m_scale != m_widget)
+        GTKDisconnect(m_scale);
 }
 
 bool wxSlider::Create(wxWindow *parent,
@@ -294,6 +296,8 @@ bool wxSlider::Create(wxWindow *parent,
 {
     m_pos = value;
     m_scrollEventType = GTK_SCROLL_NONE;
+    m_needThumbRelease = false;
+    m_blockScrollEvent = false;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
@@ -302,51 +306,32 @@ bool wxSlider::Create(wxWindow *parent,
         return false;
     }
 
-
-    if (style & wxSL_VERTICAL)
-        m_scale = gtk_vscale_new( NULL );
-    else
-        m_scale = gtk_hscale_new( NULL );
-    g_object_ref(m_scale);
+    const bool isVertical = (style & wxSL_VERTICAL) != 0;
+    m_scale = gtk_scale_new(GtkOrientation(isVertical), NULL);
 
     if (style & wxSL_MIN_MAX_LABELS)
     {
         gtk_widget_show( m_scale );
 
-        if (style & wxSL_VERTICAL)
-            m_widget = gtk_hbox_new(false, 0);
-        else
-            m_widget = gtk_vbox_new(false, 0);
-        g_object_ref(m_widget);
-        gtk_container_add( GTK_CONTAINER(m_widget), m_scale );
+        m_widget = gtk_box_new(GtkOrientation(!isVertical), 0);
+        gtk_box_pack_start(GTK_BOX(m_widget), m_scale, true, true, 0);
 
-        GtkWidget *box;
-        if (style & wxSL_VERTICAL)
-            box = gtk_vbox_new(false,0);
-        else
-            box = gtk_hbox_new(false,0);
-        g_object_ref(box);
+        GtkWidget* box = gtk_box_new(GtkOrientation(isVertical), 0);
         gtk_widget_show(box);
-        gtk_container_add( GTK_CONTAINER(m_widget), box );
+        gtk_box_pack_start(GTK_BOX(m_widget), box, true, true, 0);
 
         m_minLabel = gtk_label_new(NULL);
-        g_object_ref(m_minLabel);
         gtk_widget_show( m_minLabel );
-        gtk_container_add( GTK_CONTAINER(box), m_minLabel );
-        gtk_box_set_child_packing( GTK_BOX(box), m_minLabel, FALSE, FALSE, 0, GTK_PACK_START );
+        gtk_box_pack_start(GTK_BOX(box), m_minLabel, false, false, 0);
 
         // expanding empty space between the min/max labels
         GtkWidget *space = gtk_label_new(NULL);
-        g_object_ref(space);
         gtk_widget_show( space );
-        gtk_container_add( GTK_CONTAINER(box), space );
-        gtk_box_set_child_packing( GTK_BOX(box), space, TRUE, FALSE, 0, GTK_PACK_START );
+        gtk_box_pack_start(GTK_BOX(box), space, true, false, 0);
 
         m_maxLabel = gtk_label_new(NULL);
-        g_object_ref(m_maxLabel);
         gtk_widget_show( m_maxLabel );
-        gtk_container_add( GTK_CONTAINER(box), m_maxLabel );
-        gtk_box_set_child_packing( GTK_BOX(box), m_maxLabel, FALSE, FALSE, 0, GTK_PACK_END );
+        gtk_box_pack_end(GTK_BOX(box), m_maxLabel, false, false, 0);
     }
     else
     {
@@ -354,6 +339,7 @@ bool wxSlider::Create(wxWindow *parent,
         m_maxLabel = NULL;
         m_minLabel = NULL;
     }
+    g_object_ref(m_widget);
 
     const bool showValueLabel = (style & wxSL_VALUE_LABEL) != 0;
     gtk_scale_set_draw_value(GTK_SCALE (m_scale), showValueLabel );
@@ -521,14 +507,19 @@ int wxSlider::GetLineSize() const
 
 GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else
     return GTK_RANGE(m_scale)->event_window;
+#endif
 }
 
 // static
 wxVisualAttributes
 wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_scale_new(GTK_ORIENTATION_VERTICAL, NULL));
 }
 
 #endif // wxUSE_SLIDER
diff --git a/Externals/wxWidgets3/src/gtk/sockgtk.cpp b/Externals/wxWidgets3/src/gtk/sockgtk.cpp
index 5ba3ab13b9..dd786ce35a 100644
--- a/Externals/wxWidgets3/src/gtk/sockgtk.cpp
+++ b/Externals/wxWidgets3/src/gtk/sockgtk.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxGTK-specific socket event handling
 // Author:      Guilhem Lavaux, Vadim Zeitlin
 // Created:     1999
-// RCS-ID:      $Id: sockgtk.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1999, 2007 wxWidgets dev team
 //              (c) 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -12,7 +11,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS && defined(__UNIX__)
 
 #include "wx/apptrait.h"
 #include "wx/private/fdiomanager.h"
@@ -67,4 +66,4 @@ wxFDIOManager *wxGUIAppTraits::GetFDIOManager()
     return &s_manager;
 }
 
-#endif // wxUSE_SOCKETS
+#endif // wxUSE_SOCKETS && __UNIX__
diff --git a/Externals/wxWidgets3/src/gtk/spinbutt.cpp b/Externals/wxWidgets3/src/gtk/spinbutt.cpp
index 3082386a20..fd1ee2cb9d 100644
--- a/Externals/wxWidgets3/src/gtk/spinbutt.cpp
+++ b/Externals/wxWidgets3/src/gtk/spinbutt.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
-// RCS-ID:      $Id: spinbutt.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,10 +14,6 @@
 
 #include "wx/spinbutt.h"
 
-#ifndef WX_PRECOMP
-    #include "wx/utils.h"
-#endif
-
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
@@ -38,7 +33,7 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
     const double value = gtk_spin_button_get_value(spinbutton);
     const int pos = int(value);
     const int oldPos = win->m_pos;
-    if (!win->m_hasVMT || g_blockEventsOnDrag || pos == oldPos)
+    if (g_blockEventsOnDrag || pos == oldPos)
     {
         win->m_pos = pos;
         return;
@@ -72,10 +67,6 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
-    EVT_SIZE(wxSpinButton::OnSize)
-END_EVENT_TABLE()
-
 wxSpinButton::wxSpinButton()
 {
     m_pos = 0;
@@ -88,14 +79,8 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
-    wxSize new_size = size,
-           sizeBest = DoGetBestSize();
-    new_size.x = sizeBest.x;            // override width always
-    if (new_size.y == -1)
-        new_size.y = sizeBest.y;
-
-    if (!PreCreation( parent, pos, new_size ) ||
-        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    if (!PreCreation(parent, pos, size) ||
+        !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name))
     {
         wxFAIL_MSG( wxT("wxSpinButton creation failed") );
         return false;
@@ -106,6 +91,7 @@ bool wxSpinButton::Create(wxWindow *parent,
     m_widget = gtk_spin_button_new_with_range(0, 100, 1);
     g_object_ref(m_widget);
 
+    gtk_entry_set_width_chars(GTK_ENTRY(m_widget), 0);
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
@@ -114,7 +100,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
-    PostCreation(new_size);
+    PostCreation(size);
 
     return true;
 }
@@ -164,14 +150,6 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     GtkEnableEvents();
 }
 
-void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
-
-    m_width = DoGetBestSize().x;
-    gtk_widget_set_size_request( m_widget, m_width, m_height );
-}
-
 bool wxSpinButton::Enable( bool enable )
 {
     if (!base_type::Enable(enable))
@@ -198,12 +176,30 @@ void wxSpinButton::GtkEnableEvents() const
 
 GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else
     return GTK_SPIN_BUTTON(m_widget)->panel;
+#endif
 }
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
-    wxSize best(15, 26); // FIXME
+    wxSize best = base_type::DoGetBestSize();
+#ifdef __WXGTK3__
+    GtkStyleContext* sc = gtk_widget_get_style_context(m_widget);
+    GtkBorder pad = { 0, 0, 0, 0 };
+    gtk_style_context_get_padding(sc, GtkStateFlags(0), &pad);
+    best.x -= pad.left + pad.right;
+#else
+    gtk_widget_ensure_style(m_widget);
+    int w = PANGO_PIXELS(pango_font_description_get_size(m_widget->style->font_desc));
+    w &= ~1;
+    if (w < 6)
+        w = 6;
+    best.x = w + 2 * m_widget->style->xthickness;
+#endif
     CacheBestSize(best);
     return best;
 }
@@ -212,9 +208,7 @@ wxSize wxSpinButton::DoGetBestSize() const
 wxVisualAttributes
 wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    // TODO: overload to accept functions like gtk_spin_button_new?
-    // Until then use a similar type
-    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1));
 }
 
-#endif
+#endif // wxUSE_SPINBTN
diff --git a/Externals/wxWidgets3/src/gtk/spinctrl.cpp b/Externals/wxWidgets3/src/gtk/spinctrl.cpp
index a1f3f0f9dd..b036e0bdb0 100644
--- a/Externals/wxWidgets3/src/gtk/spinctrl.cpp
+++ b/Externals/wxWidgets3/src/gtk/spinctrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by:
-// RCS-ID:      $Id: spinctrl.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,12 +15,14 @@
 #include "wx/spinctrl.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/textctrl.h"    // for wxEVT_TEXT
     #include "wx/utils.h"
     #include "wx/wxcrtvararg.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -37,12 +38,12 @@ extern "C" {
 static void
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win)
 {
-    if (!win->m_hasVMT || g_blockEventsOnDrag)
+    if (g_blockEventsOnDrag)
         return;
 
     if (wxIsKindOf(win, wxSpinCtrl))
     {
-        wxSpinEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
+        wxSpinEvent event(wxEVT_SPINCTRL, win->GetId());
         event.SetEventObject( win );
         event.SetPosition(static_cast<wxSpinCtrl*>(win)->GetValue());
         event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
@@ -50,7 +51,7 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win)
     }
     else // wxIsKindOf(win, wxSpinCtrlDouble)
     {
-        wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, win->GetId());
+        wxSpinDoubleEvent event( wxEVT_SPINCTRLDOUBLE, win->GetId());
         event.SetEventObject( win );
         event.SetValue(static_cast<wxSpinCtrlDouble*>(win)->GetValue());
         event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
@@ -67,10 +68,7 @@ extern "C" {
 static void
 gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {
-    if (!win->m_hasVMT)
-        return;
-
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
+    wxCommandEvent event( wxEVT_TEXT, win->GetId() );
     event.SetEventObject( win );
     event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
     event.SetInt(win->GetValue());
@@ -78,12 +76,34 @@ gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 }
 }
 
+// ----------------------------------------------------------------------------
+// wxSpinCtrlEventDisabler: helper to temporarily disable GTK+ events
+// ----------------------------------------------------------------------------
+
+class wxSpinCtrlEventDisabler
+{
+public:
+    wxEXPLICIT wxSpinCtrlEventDisabler(wxSpinCtrlGTKBase* spin)
+        : m_spin(spin)
+    {
+        m_spin->GtkDisableEvents();
+    }
+
+    ~wxSpinCtrlEventDisabler()
+    {
+        m_spin->GtkEnableEvents();
+    }
+
+private:
+    wxSpinCtrlGTKBase* const m_spin;
+
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrlEventDisabler);
+};
+
 //-----------------------------------------------------------------------------
 // wxSpinCtrlGTKBase
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlGTKBase, wxSpinCtrlBase)
-
 BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase)
     EVT_CHAR(wxSpinCtrlGTKBase::OnChar)
 END_EVENT_TABLE()
@@ -195,7 +215,7 @@ bool wxSpinCtrlGTKBase::GetSnapToTicks() const
 {
     wxCHECK_MSG(m_widget, false, "invalid spin button");
 
-    return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) );
+    return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) ) != 0;
 }
 
 void wxSpinCtrlGTKBase::SetValue( const wxString& value )
@@ -211,18 +231,16 @@ void wxSpinCtrlGTKBase::SetValue( const wxString& value )
     }
 
     // invalid number - set text as is (wxMSW compatible)
-    GtkDisableEvents();
+    wxSpinCtrlEventDisabler disable(this);
     gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) );
-    GtkEnableEvents();
 }
 
 void wxSpinCtrlGTKBase::DoSetValue( double value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    GtkDisableEvents();
+    wxSpinCtrlEventDisabler disable(this);
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
-    GtkEnableEvents();
 }
 
 void wxSpinCtrlGTKBase::SetSnapToTicks(bool snap_to_ticks)
@@ -249,23 +267,21 @@ void wxSpinCtrlGTKBase::DoSetRange(double minVal, double maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    GtkDisableEvents();
+    wxSpinCtrlEventDisabler disable(this);
     gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);
-    GtkEnableEvents();
 }
 
 void wxSpinCtrlGTKBase::DoSetIncrement(double inc)
 {
     wxCHECK_RET( m_widget, "invalid spin button" );
 
-    GtkDisableEvents();
+    wxSpinCtrlEventDisabler disable(this);
 
     // Preserve the old page value when changing just the increment.
     double page = 10*inc;
     gtk_spin_button_get_increments( GTK_SPIN_BUTTON(m_widget), NULL, &page);
 
     gtk_spin_button_set_increments( GTK_SPIN_BUTTON(m_widget), inc, page);
-    GtkEnableEvents();
 }
 
 void wxSpinCtrlGTKBase::GtkDisableEvents() const
@@ -312,7 +328,7 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event )
 
     if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
     {
-        wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
+        wxCommandEvent evt( wxEVT_TEXT_ENTER, m_windowId );
         evt.SetEventObject(this);
         GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget);
         wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) );
@@ -325,35 +341,139 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event )
 
 GdkWindow *wxSpinCtrlGTKBase::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    wxUnusedVar(windows);
+#else
     GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget);
 
     windows.push_back(spinbutton->entry.text_area);
     windows.push_back(spinbutton->panel);
+#endif
 
     return NULL;
 }
 
 wxSize wxSpinCtrlGTKBase::DoGetBestSize() const
 {
-    wxSize ret( wxControl::DoGetBestSize() );
-    wxSize best(95, ret.y); // FIXME: 95?
-    CacheBestSize(best);
-    return best;
+    return DoGetSizeFromTextSize(95); // TODO: 95 is completely arbitrary
+}
+
+wxSize wxSpinCtrlGTKBase::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
+
+    // Set an as small as possible size for the control, so preferred sizes
+    // return "natural" sizes, not taking into account the previous ones (which
+    // seems to be GTK+3 behaviour)
+    gtk_widget_set_size_request(m_widget, 0, 0);
+
+    // Both Gtk+2 and Gtk+3 use current value/range to measure control's width.
+    // So, we can't ask Gtk+ for its width. Instead, we used hardcoded values.
+
+    // Returned height is OK
+    wxSize totalS = GTKGetPreferredSize(m_widget);
+
+#if GTK_CHECK_VERSION(3,4,0)
+    // two buttons in horizontal
+    totalS.x = 46 + 15; // margins included
+#else
+    // two small buttons in vertical
+    totalS.x = GetFont().GetPixelSize().y + 13; // margins included
+#endif
+
+    wxSize tsize(xlen + totalS.x, totalS.y);
+
+    // Check if the user requested a non-standard height.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - GetCharHeight());
+
+    return tsize;
 }
 
 // static
 wxVisualAttributes
 wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    // TODO: overload to accept functions like gtk_spin_button_new?
-    // Until then use a similar type
-    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+    return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1), true);
 }
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
+extern "C"
+{
+
+static gboolean
+wx_gtk_spin_input(GtkSpinButton* spin, gdouble* val, wxSpinCtrl* win)
+{
+    // We might use g_ascii_strtoll() here but it's 2.12+ only, so use our own
+    // wxString function even if this requires an extra conversion.
+    const wxString
+        text(wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(spin))));
+
+    long lval;
+    if ( !text.ToLong(&lval, win->GetBase()) )
+        return FALSE;
+
+    *val = lval;
+
+    return TRUE;
+}
+
+static gint
+wx_gtk_spin_output(GtkSpinButton* spin, wxSpinCtrl* win)
+{
+    const gint val = gtk_spin_button_get_value_as_int(spin);
+
+    gtk_entry_set_text
+    (
+        GTK_ENTRY(spin),
+        wxPrivate::wxSpinCtrlFormatAsHex(val, win->GetMax()).utf8_str()
+    );
+
+    return TRUE;
+}
+
+} // extern "C"
+
+bool wxSpinCtrl::SetBase(int base)
+{
+    // Currently we only support base 10 and 16. We could add support for base
+    // 8 quite easily but wxMSW doesn't support it natively so don't bother
+    // with doing something wxGTK-specific here.
+    if ( base != 10 && base != 16 )
+        return false;
+
+    if ( base == m_base )
+        return true;
+
+    m_base = base;
+
+    // We need to be able to enter letters for any base greater than 10.
+    gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(m_widget), m_base <= 10 );
+
+    if ( m_base != 10 )
+    {
+        g_signal_connect( m_widget, "input",
+                              G_CALLBACK(wx_gtk_spin_input), this);
+        g_signal_connect( m_widget, "output",
+                              G_CALLBACK(wx_gtk_spin_output), this);
+    }
+    else
+    {
+        g_signal_handlers_disconnect_by_func(m_widget,
+                                             (gpointer)wx_gtk_spin_input,
+                                             this);
+        g_signal_handlers_disconnect_by_func(m_widget,
+                                             (gpointer)wx_gtk_spin_output,
+                                             this);
+    }
+
+    return true;
+}
+
 //-----------------------------------------------------------------------------
 // wxSpinCtrlDouble
 //-----------------------------------------------------------------------------
@@ -371,6 +491,7 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits)
 {
     wxCHECK_RET( m_widget, "invalid spin button" );
 
+    wxSpinCtrlEventDisabler disable(this);
     gtk_spin_button_set_digits( GTK_SPIN_BUTTON(m_widget), digits);
 }
 
diff --git a/Externals/wxWidgets3/src/gtk/statbmp.cpp b/Externals/wxWidgets3/src/gtk/statbmp.cpp
index 6ef20ec877..bfe5c1ef38 100644
--- a/Externals/wxWidgets3/src/gtk/statbmp.cpp
+++ b/Externals/wxWidgets3/src/gtk/statbmp.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/statbmp.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statbmp.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -75,8 +74,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 wxVisualAttributes
 wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    // TODO: overload to allow using gtk_pixmap_new?
-    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_image_new());
 }
 
 #endif // wxUSE_STATBMP
diff --git a/Externals/wxWidgets3/src/gtk/statbox.cpp b/Externals/wxWidgets3/src/gtk/statbox.cpp
index da884716f9..6d0a9b0db1 100644
--- a/Externals/wxWidgets3/src/gtk/statbox.cpp
+++ b/Externals/wxWidgets3/src/gtk/statbox.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statbox.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,10 +12,10 @@
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"
-#include "wx/gtk/private/win_gtk.h"     // for wxPizza
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/win_gtk.h"
 
 // constants taken from GTK sources
 #define LABEL_PAD 1
@@ -26,6 +25,7 @@
 // "size_allocate" from m_widget
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK3__
 extern "C" {
 static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
 {
@@ -45,6 +45,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
     }
 }
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // wxStaticBox
@@ -99,11 +100,15 @@ bool wxStaticBox::Create( wxWindow *parent,
 
     gtk_frame_set_label_align(GTK_FRAME(m_widget), xalign, 0.5);
 
+#ifndef __WXGTK3__
     if (gtk_check_version(2, 12, 0))
     {
         // we connect this signal to perform label-clipping as GTK >= 2.12 does
         g_signal_connect(m_widget, "size_allocate", G_CALLBACK(size_allocate), NULL);
     }
+#endif
+
+    m_container.DisableSelfFocus();
 
     return true;
 }
@@ -119,7 +124,7 @@ void wxStaticBox::AddChild( wxWindowBase *child )
         gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
     }
 
-    wxWindow::AddChild( child );
+    wxStaticBoxBase::AddChild(child);
 }
 
 void wxStaticBox::SetLabel( const wxString& label )
@@ -148,16 +153,13 @@ void wxStaticBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new(""));
 }
 
-
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
-    const int BORDER = 5; // FIXME: hardcoded value
-
-    *borderTop = GetLabel().empty() ? 2*BORDER : GetCharHeight();
-    *borderOther = BORDER;
+    *borderTop = GetCharHeight();
+    *borderOther = GetCharWidth()/2;
 }
 
 #endif // wxUSE_STATBOX
diff --git a/Externals/wxWidgets3/src/gtk/statline.cpp b/Externals/wxWidgets3/src/gtk/statline.cpp
index 593bfad2ff..a9b52ab88e 100644
--- a/Externals/wxWidgets3/src/gtk/statline.cpp
+++ b/Externals/wxWidgets3/src/gtk/statline.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/statline.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: statline.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,8 +13,8 @@
 
 #if wxUSE_STATLINE
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticLine
@@ -43,9 +42,11 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
         return FALSE;
     }
 
-    if ( IsVertical() )
+    const bool isVertical = IsVertical();
+    m_widget = gtk_separator_new(GtkOrientation(isVertical));
+    g_object_ref(m_widget);
+    if (isVertical)
     {
-        m_widget = gtk_vseparator_new();
         if (size.x == -1)
         {
             wxSize new_size( size );
@@ -55,7 +56,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
     }
     else
     {
-        m_widget = gtk_hseparator_new();
         if (size.y == -1)
         {
             wxSize new_size( size );
@@ -63,7 +63,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
             SetSize( new_size );
         }
     }
-    g_object_ref(m_widget);
 
     m_parent->DoAddChild( this );
 
@@ -76,7 +75,7 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
 wxVisualAttributes
 wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_separator_new(GTK_ORIENTATION_VERTICAL));
 }
 
 #endif
diff --git a/Externals/wxWidgets3/src/gtk/stattext.cpp b/Externals/wxWidgets3/src/gtk/stattext.cpp
index ff4bd25251..959c649f9a 100644
--- a/Externals/wxWidgets3/src/gtk/stattext.cpp
+++ b/Externals/wxWidgets3/src/gtk/stattext.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/stattext.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: stattext.cpp 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,8 @@
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
+
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
@@ -70,21 +71,16 @@ bool wxStaticText::Create(wxWindow *parent,
 
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        // set ellipsize mode
-        PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE;
-        if ( style & wxST_ELLIPSIZE_START )
-            ellipsizeMode = PANGO_ELLIPSIZE_START;
-        else if ( style & wxST_ELLIPSIZE_MIDDLE )
-            ellipsizeMode = PANGO_ELLIPSIZE_MIDDLE;
-        else if ( style & wxST_ELLIPSIZE_END )
-            ellipsizeMode = PANGO_ELLIPSIZE_END;
+    // set ellipsize mode
+    PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE;
+    if ( style & wxST_ELLIPSIZE_START )
+        ellipsizeMode = PANGO_ELLIPSIZE_START;
+    else if ( style & wxST_ELLIPSIZE_MIDDLE )
+        ellipsizeMode = PANGO_ELLIPSIZE_MIDDLE;
+    else if ( style & wxST_ELLIPSIZE_END )
+        ellipsizeMode = PANGO_ELLIPSIZE_END;
 
-        gtk_label_set_ellipsize( GTK_LABEL(m_widget), ellipsizeMode );
-    }
-#endif // __WXGTK26__
+    gtk_label_set_ellipsize( GTK_LABEL(m_widget), ellipsizeMode );
 
     // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
@@ -107,18 +103,7 @@ void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
 
     InvalidateBestSize();
 
-    if (gtk_check_version(2,6,0) && IsEllipsized())
-    {
-        // GTK+ < 2.6 does not support ellipsization so we need to do it
-        // manually and as our ellipsization code doesn't deal with markup, we
-        // have no choice but to ignore it in this case and always use plain
-        // text.
-        GTKSetLabelForLabel(GTK_LABEL(m_widget), GetEllipsizedLabel());
-    }
-    else // Ellipsization not needed or supported by GTK+.
-    {
-        (this->*setter)(GTK_LABEL(m_widget), label);
-    }
+    (this->*setter)(GTK_LABEL(m_widget), label);
 
     // adjust the label size to the new label unless disabled
     if ( !HasFlag(wxST_NO_AUTORESIZE) &&
@@ -205,20 +190,6 @@ bool wxStaticText::SetFont( const wxFont &font )
     return ret;
 }
 
-void wxStaticText::DoSetSize(int x, int y,
-                             int width, int height,
-                             int sizeFlags )
-{
-    wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags);
-
-    if (gtk_check_version(2,6,0))
-    {
-        // GTK+ < 2.6 does not support ellipsization - we need to run our
-        // generic code (actually it will be run only if IsEllipsized() == true)
-        UpdateLabel();
-    }
-}
-
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
@@ -228,11 +199,19 @@ wxSize wxStaticText::DoGetBestSize() const
     // gtk_label_set_line_wrap() from here is a bad idea as it queues another
     // size request by calling gtk_widget_queue_resize() and we end up in
     // infinite loop sometimes (notably when the control is in a toolbar)
+    // With GTK3 however, there is no simple alternative, and the sizing loop
+    // no longer seems to occur.
+#ifdef __WXGTK3__
+    gtk_label_set_line_wrap(GTK_LABEL(m_widget), false);
+#else
     GTK_LABEL(m_widget)->wrap = FALSE;
-
+#endif
     wxSize size = wxStaticTextBase::DoGetBestSize();
-
+#ifdef __WXGTK3__
+    gtk_label_set_line_wrap(GTK_LABEL(m_widget), true);
+#else
     GTK_LABEL(m_widget)->wrap = TRUE; // restore old value
+#endif
 
     // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly
     size.x++;
@@ -268,7 +247,7 @@ void wxStaticText::DoSetLabel(const wxString& str)
 wxVisualAttributes
 wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new(""));
 }
 
 #endif // wxUSE_STATTEXT
diff --git a/Externals/wxWidgets3/src/gtk/taskbar.cpp b/Externals/wxWidgets3/src/gtk/taskbar.cpp
index d92e0d0cae..599ef25377 100644
--- a/Externals/wxWidgets3/src/gtk/taskbar.cpp
+++ b/Externals/wxWidgets3/src/gtk/taskbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by: Paul Cornett
 // Created:     2004/05/29
-// RCS-ID:      $Id: taskbar.cpp 70701 2012-02-26 17:18:41Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -22,8 +21,13 @@
     #include "wx/icon.h"
 #endif
 
-#include "eggtrayicon.h"
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+    #include <gdk/gdkx.h>
+#endif
+#ifndef __WXGTK3__
+    #include "eggtrayicon.h"
+#endif
 
 #if !GTK_CHECK_VERSION(2,10,0)
     typedef struct _GtkStatusIcon GtkStatusIcon;
@@ -41,20 +45,23 @@ public:
     wxTaskBarIcon* m_taskBarIcon;
     // used when GTK+ >= 2.10
     GtkStatusIcon* m_statusIcon;
-    // used when GTK+ < 2.10
-    GtkWidget* m_eggTrayIcon;
     // for PopupMenu
     wxWindow* m_win;
-    // for tooltip when GTK+ < 2.10
-    GtkTooltips* m_tooltips;
     wxBitmap m_bitmap;
     wxString m_tipText;
+#ifndef __WXGTK3__
+    // used when GTK+ < 2.10
+    GtkWidget* m_eggTrayIcon;
+    // for tooltip when GTK+ < 2.10
+    GtkTooltips* m_tooltips;
     // width and height of available space, only used when GTK+ < 2.10
     int m_size;
+#endif
 };
 //-----------------------------------------------------------------------------
 
 extern "C" {
+#ifndef __WXGTK3__
 static void
 icon_size_allocate(GtkWidget*, GtkAllocation* alloc, wxTaskBarIcon::Private* priv)
 {
@@ -69,6 +76,7 @@ icon_destroy(GtkWidget*, wxTaskBarIcon::Private* priv)
     priv->m_eggTrayIcon = NULL;
     priv->SetIcon();
 }
+#endif
 
 static void
 icon_activate(void*, wxTaskBarIcon* taskBarIcon)
@@ -91,6 +99,7 @@ icon_popup_menu(GtkWidget*, wxTaskBarIcon* taskBarIcon)
     return true;
 }
 
+#ifndef __WXGTK3__
 static gboolean
 icon_button_press_event(GtkWidget*, GdkEventButton* event, wxTaskBarIcon* taskBarIcon)
 {
@@ -103,6 +112,7 @@ icon_button_press_event(GtkWidget*, GdkEventButton* event, wxTaskBarIcon* taskBa
     }
     return false;
 }
+#endif
 
 #if GTK_CHECK_VERSION(2,10,0)
 static void
@@ -135,37 +145,43 @@ wxTaskBarIcon::Private::Private(wxTaskBarIcon* taskBarIcon)
 {
     m_taskBarIcon = taskBarIcon;
     m_statusIcon = NULL;
-    m_eggTrayIcon = NULL;
     m_win = NULL;
+#ifndef __WXGTK3__
+    m_eggTrayIcon = NULL;
     m_tooltips = NULL;
     m_size = 0;
+#endif
 }
 
 wxTaskBarIcon::Private::~Private()
 {
     if (m_statusIcon)
         g_object_unref(m_statusIcon);
+#ifndef __WXGTK3__
     else if (m_eggTrayIcon)
     {
         g_signal_handlers_disconnect_by_func(m_eggTrayIcon, (void*)icon_destroy, this);
         gtk_widget_destroy(m_eggTrayIcon);
     }
+#endif
     if (m_win)
     {
         m_win->PopEventHandler();
         m_win->Destroy();
     }
+#ifndef __WXGTK3__
     if (m_tooltips)
     {
         gtk_object_destroy(GTK_OBJECT(m_tooltips));
         g_object_unref(m_tooltips);
     }
+#endif
 }
 
 void wxTaskBarIcon::Private::SetIcon()
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    if (gtk_check_version(2,10,0) == NULL)
+    if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,10,0) == NULL)
     {
         if (m_statusIcon)
             gtk_status_icon_set_from_pixbuf(m_statusIcon, m_bitmap.GetPixbuf());
@@ -181,6 +197,7 @@ void wxTaskBarIcon::Private::SetIcon()
     else
 #endif
     {
+#ifndef __WXGTK3__
         m_size = 0;
         if (m_eggTrayIcon)
         {
@@ -203,11 +220,12 @@ void wxTaskBarIcon::Private::SetIcon()
             gtk_container_add(GTK_CONTAINER(m_eggTrayIcon), image);
             gtk_widget_show_all(m_eggTrayIcon);
         }
+#endif
     }
 #if wxUSE_TOOLTIPS
     const char *tip_text = NULL;
     if (!m_tipText.empty())
-        tip_text = m_tipText.c_str();
+        tip_text = m_tipText.utf8_str();
 
 #if GTK_CHECK_VERSION(2,10,0)
     if (m_statusIcon)
@@ -218,7 +236,7 @@ void wxTaskBarIcon::Private::SetIcon()
         else
 #endif
         {
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+#ifndef __WXGTK3__
             gtk_status_icon_set_tooltip(m_statusIcon, tip_text);
 #endif
         }
@@ -226,7 +244,7 @@ void wxTaskBarIcon::Private::SetIcon()
     else
 #endif // GTK_CHECK_VERSION(2,10,0)
     {
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+#ifndef __WXGTK3__
         if (tip_text && m_tooltips == NULL)
         {
             m_tooltips = gtk_tooltips_new();
@@ -240,6 +258,7 @@ void wxTaskBarIcon::Private::SetIcon()
 #endif // wxUSE_TOOLTIPS
 }
 
+#ifndef __WXGTK3__
 void wxTaskBarIcon::Private::size_allocate(int width, int height)
 {
     int size = height;
@@ -262,11 +281,12 @@ void wxTaskBarIcon::Private::size_allocate(int width, int height)
         g_object_unref(pixbuf);
     }
 }
+#endif
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
-wxTaskBarIcon::wxTaskBarIcon()
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
 {
     m_priv = new Private(this);
 }
@@ -293,7 +313,11 @@ bool wxTaskBarIcon::RemoveIcon()
 
 bool wxTaskBarIcon::IsIconInstalled() const
 {
+#ifdef __WXGTK3__
+    return m_priv->m_statusIcon != NULL;
+#else
     return m_priv->m_statusIcon || m_priv->m_eggTrayIcon;
+#endif
 }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu* menu)
diff --git a/Externals/wxWidgets3/src/gtk/textctrl.cpp b/Externals/wxWidgets3/src/gtk/textctrl.cpp
index 2a9dc26663..bce644abf4 100644
--- a/Externals/wxWidgets3/src/gtk/textctrl.cpp
+++ b/Externals/wxWidgets3/src/gtk/textctrl.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: textctrl.cpp 70674 2012-02-23 13:56:14Z VZ $
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +29,9 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // helpers
@@ -167,25 +168,29 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
         GtkJustification align;
         switch (attr.GetAlignment())
         {
-            default:
-                align = GTK_JUSTIFY_LEFT;
-                break;
             case wxTEXT_ALIGNMENT_RIGHT:
                 align = GTK_JUSTIFY_RIGHT;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+#ifdef __WXGTK3__
+                align = GTK_JUSTIFY_FILL;
+                break;
+#elif GTK_CHECK_VERSION(2,11,0)
 // gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
 // (but if new enough pango isn't available it's a mere gtk warning)
-#if GTK_CHECK_VERSION(2,11,0)
-            case wxTEXT_ALIGNMENT_JUSTIFIED:
                 if (!gtk_check_version(2,11,0))
+                {
                     align = GTK_JUSTIFY_FILL;
-                else
-                    align = GTK_JUSTIFY_LEFT;
-                break;
+                    break;
+                }
+                // fallthrough
 #endif
+            default:
+                align = GTK_JUSTIFY_LEFT;
+                break;
         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
@@ -455,6 +460,25 @@ au_check_range(GtkTextIter *s,
 //-----------------------------------------------------------------------------
 
 extern "C" {
+
+// Normal version used for detecting IME input and generating appropriate
+// events for it.
+void
+wx_insert_text_callback(GtkTextBuffer* buffer,
+                        GtkTextIter* WXUNUSED(end),
+                        gchar *text,
+                        gint WXUNUSED(len),
+                        wxTextCtrl *win)
+{
+    if ( win->GTKOnInsertText(text) )
+    {
+        // If we already handled the new text insertion, don't do it again.
+        g_signal_stop_emission_by_name (buffer, "insert_text");
+    }
+}
+
+
+// And an "after" version used for detecting URLs in the text.
 static void
 au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer),
                         GtkTextIter *end,
@@ -540,8 +564,6 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
     if ( win->IgnoreTextUpdate() )
         return;
 
-    if (!win->m_hasVMT) return;
-
     if ( win->MarkDirtyOnChange() )
         win->MarkDirty();
 
@@ -549,48 +571,6 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 }
 }
 
-//-----------------------------------------------------------------------------
-//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
-//-----------------------------------------------------------------------------
-
-// common part of the event handlers below
-static void
-handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
-                                wxEventType eventType, const gchar * signal_name)
-{
-    wxClipboardTextEvent event( eventType, win->GetId() );
-    event.SetEventObject( win );
-    if ( win->HandleWindowEvent( event ) )
-    {
-        // don't let the default processing to take place if we did something
-        // ourselves in the event handler
-        g_signal_stop_emission_by_name (widget, signal_name);
-    }
-}
-
-extern "C" {
-static void
-gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
-{
-    handle_text_clipboard_callback(
-        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
-}
-
-static void
-gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
-{
-    handle_text_clipboard_callback(
-        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
-}
-
-static void
-gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
-{
-    handle_text_clipboard_callback(
-        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
-}
-}
-
 //-----------------------------------------------------------------------------
 //  "mark_set"
 //-----------------------------------------------------------------------------
@@ -643,12 +623,23 @@ void wxTextCtrl::Init()
     SetUpdateFont(false);
 
     m_text = NULL;
+    m_buffer = NULL;
     m_showPositionOnThaw = NULL;
     m_anonymousMarkList = NULL;
 }
 
 wxTextCtrl::~wxTextCtrl()
 {
+    if (m_text)
+        GTKDisconnect(m_text);
+    if (m_buffer)
+        GTKDisconnect(m_buffer);
+
+    // this is also done by wxWindowGTK dtor, but has to be done here so our
+    // DoThaw() override is called
+    while (IsFrozen())
+        Thaw();
+
     if (m_anonymousMarkList)
         g_slist_free(m_anonymousMarkList);
 }
@@ -787,7 +778,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
             GtkTextIter start, end;
 
             // We create our wxUrl tag here for slight efficiency gain - we
-            // don't have to check for the tag existance in callbacks,
+            // don't have to check for the tag existence in callbacks,
             // hereby it's guaranteed to exist.
             gtk_text_buffer_create_tag(m_buffer, "wxUrl",
                                        "foreground", "blue",
@@ -814,21 +805,23 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_text_buffer_get_end_iter(m_buffer, &end);
             au_check_range(&start, &end);
         }
+
+        // Also connect a normal (not "after") signal handler for checking for
+        // the IME-generated input.
+        g_signal_connect(m_buffer, "insert_text",
+                         G_CALLBACK(wx_insert_text_callback), this);
     }
     else // single line
     {
         // do the right thing with Enter presses depending on whether we have
         // wxTE_PROCESS_ENTER or not
         GTKSetActivatesDefault();
+
+        GTKConnectInsertTextSignal(GTK_ENTRY(m_text));
     }
 
 
-    g_signal_connect (m_text, "copy-clipboard",
-                      G_CALLBACK (gtk_copy_clipboard_callback), this);
-    g_signal_connect (m_text, "cut-clipboard",
-                      G_CALLBACK (gtk_cut_clipboard_callback), this);
-    g_signal_connect (m_text, "paste-clipboard",
-                      G_CALLBACK (gtk_paste_clipboard_callback), this);
+    GTKConnectClipboardSignals(m_text);
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
@@ -847,6 +840,30 @@ GtkEntry *wxTextCtrl::GetEntry() const
     return GTK_ENTRY(m_text);
 }
 
+int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const
+{
+#if GTK_CHECK_VERSION(2, 22, 0)
+    if ( gtk_check_version(2, 12, 0) == 0 )
+    {
+        if ( IsSingleLine() )
+        {
+            return wxTextEntry::GTKIMFilterKeypress(event);
+        }
+        else
+        {
+            return gtk_text_view_im_context_filter_keypress(
+                        GTK_TEXT_VIEW(m_text),
+                        event
+                    );
+        }
+    }
+#else // GTK+ < 2.22
+    wxUnusedVar(event);
+#endif // GTK+ 2.22+
+
+    return FALSE;
+}
+
 // ----------------------------------------------------------------------------
 // flags handling
 // ----------------------------------------------------------------------------
@@ -1103,11 +1120,7 @@ void wxTextCtrl::WriteText( const wxString &text )
 #endif
 
     // First remove the selection if there is one
-    // TODO:  Is there an easier GTK specific way to do this?
-    long from, to;
-    GetSelection(&from, &to);
-    if (from != to)
-        Remove(from, to);
+    gtk_text_buffer_delete_selection(m_buffer, false, true);
 
     // Insert the text
     wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
@@ -1323,26 +1336,6 @@ bool wxTextCtrl::Enable( bool enable )
     return true;
 }
 
-// wxGTK-specific: called recursively by Enable,
-// to give widgets an opportunity to correct their colours after they
-// have been changed by Enable
-void wxTextCtrl::OnEnabled(bool WXUNUSED(enable))
-{
-    // If we have a custom background colour, we use this colour in both
-    // disabled and enabled mode, or we end up with a different colour under the
-    // text.
-    wxColour oldColour = GetBackgroundColour();
-    if (oldColour.IsOk())
-    {
-        // Need to set twice or it'll optimize the useful stuff out
-        if (oldColour == * wxWHITE)
-            SetBackgroundColour(*wxBLACK);
-        else
-            SetBackgroundColour(*wxWHITE);
-        SetBackgroundColour(oldColour);
-    }
-}
-
 void wxTextCtrl::MarkDirty()
 {
     m_modified = true;
@@ -1599,7 +1592,7 @@ bool wxTextCtrl::IsEditable() const
 
     if ( IsMultiLine() )
     {
-        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0;
     }
     else
     {
@@ -1620,7 +1613,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
     {
         if ( HasFlag(wxTE_PROCESS_ENTER) )
         {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+            wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
             event.SetEventObject(this);
             event.SetString(GetValue());
             if ( HandleWindowEvent(event) )
@@ -1645,7 +1638,12 @@ GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
     }
     else
     {
+#ifdef __WXGTK3__
+        // no access to internal GdkWindows
+        return NULL;
+#else
         return gtk_entry_get_text_window(GTK_ENTRY(m_text));
+#endif
     }
 }
 
@@ -1792,7 +1790,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_text, style);
+    GTKApplyStyle(m_text, style);
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
@@ -1847,13 +1845,71 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
-    // FIXME should be different for multi-line controls...
-    wxSize ret( wxControl::DoGetBestSize() );
-    wxSize best(80, ret.y);
-    CacheBestSize(best);
-    return best;
+    return DoGetSizeFromTextSize(80);
 }
 
+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
+
+    wxSize tsize(xlen, 0);
+    int cHeight = GetCharHeight();
+
+    if ( IsSingleLine() )
+    {
+        if ( HasFlag(wxBORDER_NONE) )
+        {
+            tsize.y = cHeight;
+#ifdef __WXGTK3__
+            tsize.IncBy(9, 0);
+#else
+            tsize.IncBy(4, 0);
+#endif // GTK3
+        }
+        else
+        {
+            // default height
+            tsize.y = GTKGetPreferredSize(m_widget).y;
+            // Add the margins we have previously set, but only the horizontal border
+            // as vertical one has been taken account at GTKGetPreferredSize().
+            // Also get other GTK+ margins.
+            tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0);
+        }
+    }
+
+    //multiline
+    else
+    {
+        // add space for vertical scrollbar
+        if ( m_scrollBar[1] && !(m_windowStyle & wxTE_NO_VSCROLL) )
+            tsize.IncBy(GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[1])).x + 3, 0);
+
+        // height
+        tsize.y = cHeight;
+        if ( ylen <= 0 )
+        {
+            tsize.y = 1 + cHeight * wxMax(wxMin(GetNumberOfLines(), 10), 2);
+            // add space for horizontal scrollbar
+            if ( m_scrollBar[0] && (m_windowStyle & wxHSCROLL) )
+                tsize.IncBy(0, GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[0])).y + 3);
+        }
+
+        if ( !HasFlag(wxBORDER_NONE) )
+        {
+            // hardcode borders, margins, etc
+            tsize.IncBy(5, 4);
+        }
+    }
+
+    // Perhaps the user wants something different from CharHeight, or ylen
+    // is used as the height of a multiline text.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - cHeight);
+
+    return tsize;
+}
+
+
 // ----------------------------------------------------------------------------
 // freeze/thaw
 // ----------------------------------------------------------------------------
@@ -1862,12 +1918,10 @@ void wxTextCtrl::DoFreeze()
 {
     wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
 
-    wxWindow::DoFreeze();
+    GTKFreezeWidget(m_text);
 
     if ( HasFlag(wxTE_MULTILINE) )
     {
-        GTKFreezeWidget(m_text);
-
         // removing buffer dramatically speeds up insertion:
         g_object_ref(m_buffer);
         GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
@@ -1908,12 +1962,9 @@ void wxTextCtrl::DoThaw()
                 GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
             m_showPositionOnThaw = NULL;
         }
-
-        // and thaw the window
-        GTKThawWidget(m_text);
     }
 
-    wxWindow::DoThaw();
+    GTKThawWidget(m_text);
 }
 
 // ----------------------------------------------------------------------------
@@ -1953,7 +2004,7 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
         gtk_text_iter_forward_to_tag_toggle(&end, tag);
 
     // Native context menu is probably not desired on an URL.
-    // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value
+    // Consider making this dependent on ProcessEvent(wxTextUrlEvent) return value
     if(event.GetEventType() == wxEVT_RIGHT_DOWN)
         event.Skip(false);
 
@@ -1983,7 +2034,7 @@ bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new(), true);
 }
 
 #endif // wxUSE_TEXTCTRL
diff --git a/Externals/wxWidgets3/src/gtk/textentry.cpp b/Externals/wxWidgets3/src/gtk/textentry.cpp
index 234232a05c..03a6867379 100644
--- a/Externals/wxWidgets3/src/gtk/textentry.cpp
+++ b/Externals/wxWidgets3/src/gtk/textentry.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTextEntry implementation for wxGTK
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24
-// RCS-ID:      $Id: textentry.cpp 67509 2011-04-16 17:27:04Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,51 +25,112 @@
 #if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP
+    #include "wx/textentry.h"
     #include "wx/window.h"
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
-#include "wx/textentry.h"
-
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ============================================================================
 // signal handlers implementation
 // ============================================================================
 
-extern "C"
-{
-
 // "insert_text" handler for GtkEntry
-static void
+extern "C"
+void
 wx_gtk_insert_text_callback(GtkEditable *editable,
-                            const gchar * WXUNUSED(new_text),
+                            const gchar * new_text,
                             gint WXUNUSED(new_text_length),
                             gint * WXUNUSED(position),
                             wxTextEntry *text)
 {
-    // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 
-    const int text_length = gtk_entry_get_text_length(entry);
 #if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE)
     const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry));
 #else
     const int text_max_length = entry->text_max_length;
 #endif
-    wxCHECK_RET(text_max_length, "shouldn't be called");
 
-    // check that we don't overflow the max length limit
-    //
-    // FIXME: this doesn't work when we paste a string which is going to be
-    //        truncated
-    if (text_length == text_max_length)
+    bool handled = false;
+
+    // check that we don't overflow the max length limit if we have it
+    if ( text_max_length )
     {
-        // we don't need to run the base class version at all
-        g_signal_stop_emission_by_name (editable, "insert_text");
+        const int text_length = gtk_entry_get_text_length(entry);
 
-        text->SendMaxLenEvent();
+        // We can't use new_text_length as it is in bytes while we want to count
+        // characters (in first approximation, anyhow...).
+        if ( text_length + g_utf8_strlen(new_text, -1) > text_max_length )
+        {
+            // Prevent the new text from being inserted.
+            handled = true;
+
+            // Currently we don't insert anything at all, but it would be better to
+            // insert as many characters as would fit into the text control and
+            // only discard the rest.
+
+            // Notify the user code about overflow.
+            text->SendMaxLenEvent();
+        }
     }
+
+    if ( !handled && text->GTKEntryOnInsertText(new_text) )
+    {
+        // If we already handled the new text insertion, don't do it again.
+        handled = true;
+    }
+
+    if ( handled )
+        g_signal_stop_emission_by_name (editable, "insert_text");
+}
+
+//-----------------------------------------------------------------------------
+//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
+//-----------------------------------------------------------------------------
+
+// common part of the event handlers below
+static void
+DoHandleClipboardCallback( GtkWidget *widget,
+                           wxWindow *win,
+                           wxEventType eventType,
+                           const gchar* signal_name)
+{
+    wxClipboardTextEvent event( eventType, win->GetId() );
+    event.SetEventObject( win );
+    if ( win->HandleWindowEvent( event ) )
+    {
+        // don't let the default processing to take place if we did something
+        // ourselves in the event handler
+        g_signal_stop_emission_by_name (widget, signal_name);
+    }
+}
+
+extern "C"
+{
+
+static void
+wx_gtk_copy_clipboard_callback( GtkWidget *widget, wxWindow *win )
+{
+    DoHandleClipboardCallback(
+        widget, win, wxEVT_TEXT_COPY, "copy-clipboard" );
+}
+
+static void
+wx_gtk_cut_clipboard_callback( GtkWidget *widget, wxWindow *win )
+{
+    DoHandleClipboardCallback(
+        widget, win, wxEVT_TEXT_CUT, "cut-clipboard" );
+}
+
+static void
+wx_gtk_paste_clipboard_callback( GtkWidget *widget, wxWindow *win )
+{
+    DoHandleClipboardCallback(
+        widget, win, wxEVT_TEXT_PASTE, "paste-clipboard" );
 }
 
 } // extern "C"
@@ -109,6 +169,26 @@ void wxTextEntry::WriteText(const wxString& value)
     gtk_editable_set_position(edit, len);
 }
 
+void wxTextEntry::DoSetValue(const wxString& value, int flags)
+{
+    if (value != DoGetValue())
+    {
+        // use Remove() rather than SelectAll() to avoid unnecessary clipboard
+        // operations, and prevent triggering an apparent bug in GTK which
+        // causes the the subsequent WriteText() to append rather than overwrite
+        {
+            EventsSuppressor noevents(this);
+            Remove(0, -1);
+        }
+        EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
+        WriteText(value);
+    }
+    else if (flags & SetValue_SendEvent)
+        SendTextUpdatedEvent(GetEditableWindow());
+
+    SetInsertionPoint(0);
+}
+
 wxString wxTextEntry::DoGetValue() const
 {
     const wxGtkString value(gtk_editable_get_chars(GetEditable(), 0, -1));
@@ -126,6 +206,19 @@ void wxTextEntry::Remove(long from, long to)
 // clipboard operations
 // ----------------------------------------------------------------------------
 
+void wxTextEntry::GTKConnectClipboardSignals(GtkWidget* entry)
+{
+    g_signal_connect(entry, "copy-clipboard",
+                     G_CALLBACK (wx_gtk_copy_clipboard_callback),
+                     GetEditableWindow());
+    g_signal_connect(entry, "cut-clipboard",
+                     G_CALLBACK (wx_gtk_cut_clipboard_callback),
+                     GetEditableWindow());
+    g_signal_connect(entry, "paste-clipboard",
+                     G_CALLBACK (wx_gtk_paste_clipboard_callback),
+                     GetEditableWindow());
+}
+
 void wxTextEntry::Copy()
 {
     gtk_editable_copy_clipboard(GetEditable());
@@ -183,9 +276,12 @@ long wxTextEntry::GetLastPosition() const
 {
     // this can't be implemented for arbitrary GtkEditable so only do it for
     // GtkEntries
-    GtkEntry * const entry = GTK_ENTRY(GetEditable());
+    long pos = -1;
+    GtkEntry* entry = (GtkEntry*)GetEditable();
+    if (GTK_IS_ENTRY(entry))
+        pos = gtk_entry_get_text_length(entry);
 
-    return entry ? gtk_entry_get_text_length(entry) : -1;
+    return pos;
 }
 
 // ----------------------------------------------------------------------------
@@ -204,6 +300,18 @@ void wxTextEntry::SetSelection(long from, long to)
     // insertion point is set to the start of the selection and not its end as
     // GTK+ does by default
     gtk_editable_select_region(GetEditable(), to, from);
+
+#ifndef __WXGTK3__
+    // avoid reported problem with RHEL 5 GTK+ 2.10 where selection is reset by
+    // a clipboard callback, see #13277
+    if (gtk_check_version(2,12,0))
+    {
+        GtkEntry* entry = GTK_ENTRY(GetEditable());
+        if (to < 0)
+            to = entry->text_length;
+        entry->selection_bound = to;
+    }
+#endif
 }
 
 void wxTextEntry::GetSelection(long *from, long *to) const
@@ -239,8 +347,8 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 
 bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 {
-    GtkEntry * const entry = GTK_ENTRY(GetEditable());
-    wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");
+    GtkEntry* const entry = (GtkEntry*)GetEditable();
+    wxCHECK_MSG(GTK_IS_ENTRY(entry), false, "auto completion doesn't work with this control");
 
     GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING);
     GtkTreeIter iter;
@@ -269,7 +377,7 @@ bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 
 bool wxTextEntry::IsEditable() const
 {
-    return gtk_editable_get_editable(GetEditable());
+    return gtk_editable_get_editable(GetEditable()) != 0;
 }
 
 void wxTextEntry::SetEditable(bool editable)
@@ -283,55 +391,53 @@ void wxTextEntry::SetEditable(bool editable)
 
 void wxTextEntry::SetMaxLength(unsigned long len)
 {
-    GtkEntry * const entry = GTK_ENTRY(GetEditable());
-    if ( !entry )
+    GtkEntry* const entry = (GtkEntry*)GetEditable();
+    if (!GTK_IS_ENTRY(entry))
         return;
 
     gtk_entry_set_max_length(entry, len);
-
-    // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if we had
-    // tried to enter more text than allowed by max text length and the text
-    // wasn't really changed
-    //
-    // to detect this and generate TEXT_MAXLEN event instead of TEXT_CHANGED
-    // one in this case we also catch "insert_text" signal
-    //
-    // when max len is set to 0 we disconnect our handler as it means that we
-    // shouldn't check anything any more
-    if ( len )
-    {
-        g_signal_connect
-        (
-            entry,
-            "insert_text",
-            G_CALLBACK(wx_gtk_insert_text_callback),
-            this
-        );
-    }
-    else // no max length
-    {
-        g_signal_handlers_disconnect_by_func
-        (
-            entry,
-            (gpointer)wx_gtk_insert_text_callback,
-            this
-        );
-    }
 }
 
 void wxTextEntry::SendMaxLenEvent()
 {
     // remember that the next changed signal is to be ignored to avoid
-    // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
+    // generating a dummy wxEVT_TEXT event
     //IgnoreNextTextUpdate();
 
     wxWindow * const win = GetEditableWindow();
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
+    wxCommandEvent event(wxEVT_TEXT_MAXLEN, win->GetId());
     event.SetEventObject(win);
     event.SetString(GetValue());
     win->HandleWindowEvent(event);
 }
 
+// ----------------------------------------------------------------------------
+// IM handling
+// ----------------------------------------------------------------------------
+
+int wxTextEntry::GTKIMFilterKeypress(GdkEventKey* event) const
+{
+#if GTK_CHECK_VERSION(2, 22, 0)
+    if ( gtk_check_version(2, 12, 0) == 0 )
+        return gtk_entry_im_context_filter_keypress(GetEntry(), event);
+#else // GTK+ < 2.22
+    wxUnusedVar(event);
+#endif // GTK+ 2.22+
+
+    return FALSE;
+}
+
+void wxTextEntry::GTKConnectInsertTextSignal(GtkEntry* entry)
+{
+    g_signal_connect(entry, "insert_text",
+                     G_CALLBACK(wx_gtk_insert_text_callback), this);
+}
+
+bool wxTextEntry::GTKEntryOnInsertText(const char* text)
+{
+    return GetEditableWindow()->GTKOnInsertText(text);
+}
+
 // ----------------------------------------------------------------------------
 // margins support
 // ----------------------------------------------------------------------------
@@ -408,4 +514,31 @@ wxPoint wxTextEntry::DoGetMargins() const
 #endif
 }
 
+#ifdef __WXGTK3__
+bool wxTextEntry::SetHint(const wxString& hint)
+{
+#if GTK_CHECK_VERSION(3,2,0)
+    GtkEntry *entry = GetEntry();
+    if ( entry )
+    {
+        gtk_entry_set_placeholder_text(entry, wxGTK_CONV(hint));
+        return true;
+    }
+    else
+#endif
+        return wxTextEntryBase::SetHint(hint);
+}
+
+wxString wxTextEntry::GetHint() const
+{
+#if GTK_CHECK_VERSION(3,2,0)
+    GtkEntry *entry = GetEntry();
+    if ( entry )
+        return wxGTK_CONV_BACK(gtk_entry_get_placeholder_text(entry));
+    else
+#endif
+        return wxTextEntryBase::GetHint();
+}
+#endif // __WXGTK3__
+
 #endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX
diff --git a/Externals/wxWidgets3/src/gtk/textmeasure.cpp b/Externals/wxWidgets3/src/gtk/textmeasure.cpp
new file mode 100644
index 0000000000..407a62f36b
--- /dev/null
+++ b/Externals/wxWidgets3/src/gtk/textmeasure.cpp
@@ -0,0 +1,204 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/gtk/textmeasure.cpp
+// Purpose:     wxTextMeasure implementation for wxGTK
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+
+#include "wx/private/textmeasure.h"
+
+#include "wx/fontutil.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/dc.h"
+
+#ifndef __WXGTK3__
+    #include "wx/gtk/dcclient.h"
+#endif
+
+// ============================================================================
+// wxTextMeasure implementation
+// ============================================================================
+
+void wxTextMeasure::Init()
+{
+    m_context = NULL;
+    m_layout = NULL;
+
+#ifndef __WXGTK3__
+    m_wdc = NULL;
+
+    if ( m_dc )
+    {
+        wxClassInfo* const ci = m_dc->GetImpl()->GetClassInfo();
+
+        // Currently the code here only works with wxWindowDCImpl and only in
+        // wxGTK2 as wxGTK3 uses Cairo and not Pango for all its DCs.
+        if ( ci->IsKindOf(wxCLASSINFO(wxWindowDCImpl)))
+        {
+            m_useDCImpl = false;
+        }
+    }
+#endif // GTK+ < 3
+}
+
+// Get Gtk needed elements, if we have not them yet.
+void wxTextMeasure::BeginMeasuring()
+{
+    if ( m_dc )
+    {
+#ifndef __WXGTK3__
+        m_wdc = wxDynamicCast(m_dc->GetImpl(), wxWindowDCImpl);
+        if ( m_wdc )
+        {
+            m_context = m_wdc->m_context;
+            m_layout = m_wdc->m_layout;
+        }
+#endif // GTK+ < 3
+    }
+    else if ( m_win )
+    {
+        m_context = gtk_widget_get_pango_context( m_win->GetHandle() );
+        if ( m_context )
+            m_layout = pango_layout_new(m_context);
+    }
+
+    // set the font to use
+    if ( m_layout )
+    {
+        pango_layout_set_font_description(m_layout,
+                                          GetFont().GetNativeFontInfo()->description);
+    }
+}
+
+void wxTextMeasure::EndMeasuring()
+{
+    if ( !m_layout )
+        return;
+
+#ifndef __WXGTK3__
+    if ( m_wdc )
+    {
+        // Reset dc own font description
+        pango_layout_set_font_description( m_wdc->m_layout, m_wdc->m_fontdesc );
+    }
+    else
+#endif // GTK+ < 3
+    {
+        g_object_unref (m_layout);
+    }
+}
+
+// Notice we don't check here the font. It is supposed to be OK before the call.
+void wxTextMeasure::DoGetTextExtent(const wxString& string,
+                                    wxCoord *width,
+                                    wxCoord *height,
+                                    wxCoord *descent,
+                                    wxCoord *externalLeading)
+{
+    if ( !m_context )
+    {
+        if ( width )
+            *width = 0;
+
+        if ( height )
+            *height = 0;
+        return;
+    }
+
+    // Set layout's text
+    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, GetFont());
+    if ( !dataUTF8 && !string.empty() )
+    {
+        // hardly ideal, but what else can we do if conversion failed?
+        wxLogLastError(wxT("GetTextExtent"));
+        return;
+    }
+    pango_layout_set_text(m_layout, dataUTF8, -1);
+
+    if ( m_dc )
+    {
+        // in device units
+        pango_layout_get_pixel_size(m_layout, width, height);
+    }
+    else // win
+    {
+        // the logical rect bounds the ink rect
+        PangoRectangle rect;
+        pango_layout_get_extents(m_layout, NULL, &rect);
+        *width = PANGO_PIXELS(rect.width);
+        *height = PANGO_PIXELS(rect.height);
+    }
+
+    if (descent)
+    {
+        PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
+        int baseline = pango_layout_iter_get_baseline(iter);
+        pango_layout_iter_free(iter);
+        *descent = *height - PANGO_PIXELS(baseline);
+    }
+
+    if (externalLeading)
+    {
+        // No support for MSW-like "external leading" in Pango.
+        *externalLeading = 0;
+    }
+}
+
+bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text,
+                                            wxArrayInt& widths,
+                                            double scaleX)
+{
+    if ( !m_layout )
+        return wxTextMeasureBase::DoGetPartialTextExtents(text, widths, scaleX);
+
+    // Set layout's text
+    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, GetFont());
+    if ( !dataUTF8 )
+    {
+        // hardly ideal, but what else can we do if conversion failed?
+        wxLogLastError(wxT("GetPartialTextExtents"));
+        return false;
+    }
+
+    pango_layout_set_text(m_layout, dataUTF8, -1);
+
+    // Calculate the position of each character based on the widths of
+    // the previous characters
+
+    // Code borrowed from Scintilla's PlatGTK
+    PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
+    PangoRectangle pos;
+    pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+    size_t i = 0;
+    while (pango_layout_iter_next_cluster(iter))
+    {
+        pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+        int position = PANGO_PIXELS(pos.x);
+        widths[i++] = position;
+    }
+
+    const size_t len = text.length();
+    while (i < len)
+        widths[i++] = PANGO_PIXELS(pos.x + pos.width);
+    pango_layout_iter_free(iter);
+
+    return true;
+}
diff --git a/Externals/wxWidgets3/src/gtk/tglbtn.cpp b/Externals/wxWidgets3/src/gtk/tglbtn.cpp
index 7590fd23cb..ec811f0b0f 100644
--- a/Externals/wxWidgets3/src/gtk/tglbtn.cpp
+++ b/Externals/wxWidgets3/src/gtk/tglbtn.cpp
@@ -5,7 +5,6 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.cpp 69830 2011-11-27 19:49:54Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,7 @@
     #include "wx/button.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 extern bool      g_blockEventsOnDrag;
@@ -28,18 +28,18 @@ extern bool      g_blockEventsOnDrag;
 extern "C" {
 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
 {
-    if (!cb->m_hasVMT || g_blockEventsOnDrag)
+    if (g_blockEventsOnDrag)
         return;
 
     // Generate a wx event.
-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
+    wxCommandEvent event(wxEVT_TOGGLEBUTTON, cb->GetId());
     event.SetInt(cb->GetValue());
     event.SetEventObject(cb);
     cb->HandleWindowEvent(event);
 }
 }
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ------------------------------------------------------------------------
 // wxBitmapToggleButton
@@ -212,8 +212,8 @@ GtkLabel *wxToggleButton::GTKGetLabel() const
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
 }
 
 // Get the "best" size for this control.
@@ -234,7 +234,7 @@ wxSize wxToggleButton::DoGetBestSize() const
 wxVisualAttributes
 wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new());
 }
 
 #endif // wxUSE_TOGGLEBTN
diff --git a/Externals/wxWidgets3/src/gtk/timer.cpp b/Externals/wxWidgets3/src/gtk/timer.cpp
index f84bae452b..5e819097eb 100644
--- a/Externals/wxWidgets3/src/gtk/timer.cpp
+++ b/Externals/wxWidgets3/src/gtk/timer.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Robert Roebling
-// Id:          $Id: timer.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/toolbar.cpp b/Externals/wxWidgets3/src/gtk/toolbar.cpp
index 464f45dd8a..f19f11d5b2 100644
--- a/Externals/wxWidgets3/src/gtk/toolbar.cpp
+++ b/Externals/wxWidgets3/src/gtk/toolbar.cpp
@@ -3,7 +3,6 @@
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
-// RCS-ID:      $Id: toolbar.cpp 70510 2012-02-05 01:20:03Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +14,9 @@
 
 #include "wx/toolbar.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // globals
@@ -168,27 +169,17 @@ enter_notify_event(GtkWidget*, GdkEventCrossing* event, wxToolBarTool* tool)
 }
 }
 
-//-----------------------------------------------------------------------------
-// "size_request" from m_toolbar
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void
-size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win)
-{
-    const wxSize margins = win->GetMargins();
-    req->width  += margins.x;
-    req->height += 2 * margins.y;
-}
-}
-
 //-----------------------------------------------------------------------------
 // "expose_event" from GtkImage inside m_item
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean
+#ifdef __WXGTK3__
+image_draw(GtkWidget* widget, cairo_t* cr, wxToolBarTool* tool)
+#else
 image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)
+#endif
 {
     const wxBitmap& bitmap = tool->GetDisabledBitmap();
     if (tool->IsEnabled() || !bitmap.IsOk())
@@ -199,12 +190,16 @@ image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)
     gtk_widget_get_allocation(widget, &alloc);
     GtkRequisition req;
     gtk_widget_get_requisition(widget, &req);
+    const int x = alloc.x + (alloc.width - req.width) / 2;
+    const int y = alloc.y + (alloc.height - req.height) / 2;
+#ifdef __WXGTK3__
+    bitmap.Draw(cr, x, y);
+#else
     gdk_draw_pixbuf(
         gtk_widget_get_window(widget), gtk_widget_get_style(widget)->black_gc, bitmap.GetPixbuf(),
-        0, 0,
-        alloc.x + (alloc.width - req.width) / 2,
-        alloc.y + (alloc.height - req.height) / 2,
+        0, 0, x, y,
         -1, -1, GDK_RGB_DITHER_NORMAL, 0, 0);
+#endif
     return true;
 }
 }
@@ -275,18 +270,15 @@ void wxToolBarTool::SetImage()
 void wxToolBarTool::CreateDropDown()
 {
     gtk_tool_item_set_homogeneous(m_item, false);
-    GtkWidget* box;
-    GtkWidget* arrow;
+    GtkOrientation orient = GTK_ORIENTATION_HORIZONTAL;
+    GtkArrowType arrowType = GTK_ARROW_DOWN;
     if (GetToolBar()->HasFlag(wxTB_LEFT | wxTB_RIGHT))
     {
-        box = gtk_vbox_new(false, 0);
-        arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-    }
-    else
-    {
-        box = gtk_hbox_new(false, 0);
-        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+        orient = GTK_ORIENTATION_VERTICAL;
+        arrowType = GTK_ARROW_RIGHT;
     }
+    GtkWidget* box = gtk_box_new(orient, 0);
+    GtkWidget* arrow = gtk_arrow_new(arrowType, GTK_SHADOW_NONE);
     GtkWidget* tool_button = gtk_bin_get_child(GTK_BIN(m_item));
     gtk_widget_reparent(tool_button, box);
     GtkWidget* arrow_button = gtk_toggle_button_new();
@@ -305,7 +297,7 @@ void wxToolBarTool::CreateDropDown()
 void wxToolBarTool::ShowDropdown(GtkToggleButton* button)
 {
     wxToolBarBase* toolbar = GetToolBar();
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_TOOL_DROPDOWN, GetId());
     if (!toolbar->HandleWindowEvent(event))
     {
         wxMenu* menu = GetDropdownMenu();
@@ -355,11 +347,13 @@ void wxToolBar::Init()
 
 wxToolBar::~wxToolBar()
 {
+#ifndef __WXGTK3__
     if (m_tooltips) // always NULL if GTK >= 2.12
     {
         gtk_object_destroy(GTK_OBJECT(m_tooltips));
         g_object_unref(m_tooltips);
     }
+#endif
 }
 
 bool wxToolBar::Create( wxWindow *parent,
@@ -380,7 +374,7 @@ bool wxToolBar::Create( wxWindow *parent,
     FixupStyle();
 
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+#ifndef __WXGTK3__
     if (gtk_check_version(2, 12, 0))
     {
         m_tooltips = gtk_tooltips_new();
@@ -415,9 +409,6 @@ bool wxToolBar::Create( wxWindow *parent,
 
     PostCreation(size);
 
-    g_signal_connect_after(m_toolbar, "size_request",
-        G_CALLBACK(size_request), this);
-
     return true;
 }
 
@@ -442,7 +433,7 @@ void wxToolBar::GtkSetStyle()
             style = GTK_TOOLBAR_BOTH_HORIZ;
     }
 
-#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED)
+#ifdef __WXGTK3__
     gtk_orientable_set_orientation(GTK_ORIENTABLE(m_toolbar), orient);
 #else
     gtk_toolbar_set_orientation(m_toolbar, orient);
@@ -530,8 +521,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                     GTK_TOOL_BUTTON(tool->m_item), image);
                 tool->SetImage();
                 gtk_widget_show(image);
+#ifdef __WXGTK3__
+                g_signal_connect(image, "draw",
+                    G_CALLBACK(image_draw), tool);
+#else
                 g_signal_connect(image, "expose_event",
                     G_CALLBACK(image_expose_event), tool);
+#endif
             }
             if (!tool->GetLabel().empty())
             {
@@ -551,7 +547,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 else
 #endif
                 {
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+#ifndef __WXGTK3__
                     gtk_tool_item_set_tooltip(tool->m_item,
                         m_tooltips, wxGTK_CONV(tool->GetShortHelp()), "");
 #endif
@@ -597,12 +593,6 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 gtk_toolbar_insert(m_toolbar, tool->m_item, int(pos));
                 g_object_unref(tool->m_item);
             }
-            // Inserted items "slide" into place using an animated effect that
-            // causes multiple size events on the item. Must set size request
-            // to keep item size from getting permanently set too small by the
-            // first of these size events.
-            const wxSize size = control->GetSize();
-            gtk_widget_set_size_request(control->m_widget, size.x, size.y);
             break;
     }
     gtk_widget_show(GTK_WIDGET(tool->m_item));
@@ -625,7 +615,7 @@ bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase)
         GtkWidget* widget = tool->GetControl()->m_widget;
         gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(widget)), widget);
     }
-    gtk_object_destroy(GTK_OBJECT(tool->m_item));
+    gtk_widget_destroy(GTK_WIDGET(tool->m_item));
     tool->m_item = NULL;
 
     InvalidateBestSize();
@@ -731,7 +721,7 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
             else
 #endif
             {
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+#ifndef __WXGTK3__
                 gtk_tool_item_set_tooltip(tool->m_item,
                     m_tooltips, wxGTK_CONV(helpString), "");
 #endif
@@ -769,7 +759,7 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new());
 }
 
 #endif // wxUSE_TOOLBAR_NATIVE
diff --git a/Externals/wxWidgets3/src/gtk/tooltip.cpp b/Externals/wxWidgets3/src/gtk/tooltip.cpp
index 214d0e0784..338b9a150c 100644
--- a/Externals/wxWidgets3/src/gtk/tooltip.cpp
+++ b/Externals/wxWidgets3/src/gtk/tooltip.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/tooltip.cpp
 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
-// Id:          $Id: tooltip.cpp 67326 2011-03-28 06:27:49Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/gtk/toplevel.cpp b/Externals/wxWidgets3/src/gtk/toplevel.cpp
index cd796e4bed..19af5b8cf9 100644
--- a/Externals/wxWidgets3/src/gtk/toplevel.cpp
+++ b/Externals/wxWidgets3/src/gtk/toplevel.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/toplevel.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: toplevel.cpp 70733 2012-02-28 04:40:15Z PC $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,26 +30,23 @@
     #include "wx/app.h"
 #endif
 
-#include "wx/gtk/private.h"
 #include "wx/evtloop.h"
 #include "wx/sysopt.h"
 
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
+    #include <gdk/gdkx.h>
+    #include <X11/Xatom.h>  // XA_CARDINAL
+    #include "wx/unix/utilsx11.h"
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+    #include <gdk/gdkwayland.h>
 #endif
 
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/win_gtk.h"
 
-#ifdef GDK_WINDOWING_X11
-
-#include "wx/unix/utilsx11.h"
-
-// XA_CARDINAL
-#include <X11/Xatom.h>
-
-#endif // GDK_WINDOWING_X11
-
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-program.h>
     #include <hildon-widgets/hildon-window.h>
@@ -78,15 +74,20 @@ static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;
 // send any activate events at all
 static int g_sendActivateEvent = -1;
 
+#ifdef GDK_WINDOWING_X11
 // Whether _NET_REQUEST_FRAME_EXTENTS support is working
-//   0 == not tested yet, 1 == working, 2 == broken
-static int gs_requestFrameExtentsStatus;
+static enum {
+    RFE_STATUS_UNKNOWN, RFE_STATUS_WORKING, RFE_STATUS_BROKEN
+} gs_requestFrameExtentsStatus;
+
+static bool gs_decorCacheValid;
+#endif
 
 //-----------------------------------------------------------------------------
 // RequestUserAttention related functions
 //-----------------------------------------------------------------------------
 
-#ifndef __WXGTK30__
+#ifndef __WXGTK3__
 static void wxgtk_window_set_urgency_hint (GtkWindow *win,
                                            gboolean setting)
 {
@@ -191,7 +192,7 @@ gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
                                       GdkEventFocus *WXUNUSED(gdk_event),
                                       wxTopLevelWindowGTK * WXUNUSED(win))
 {
-    // if the focus goes out of our app alltogether, OnIdle() will send
+    // if the focus goes out of our app altogether, OnIdle() will send
     // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
     // g_sendActivateEvent to -1
     g_sendActivateEvent = 0;
@@ -214,6 +215,37 @@ gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
 }
 }
 
+// ----------------------------------------------------------------------------
+// "key_press_event"
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
+{
+    GtkWindow* const window = GTK_WINDOW(widget);
+
+    // By default GTK+ checks for the menu accelerators in this (top level)
+    // window first and then propagates the event to the currently focused
+    // child from where it bubbles up the window parent chain. In wxWidgets,
+    // however, we want the child window to have the event first but still
+    // handle it as an accelerator if it's not processed there, so we need to
+    // customize this by reversing the order of the steps done in the standard
+    // GTK+ gtk_window_key_press_event() handler.
+
+    if ( gtk_window_propagate_key_event(window, event) )
+        return TRUE;
+
+    if ( gtk_window_activate_key(window, event) )
+        return TRUE;
+
+    if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
+        return TRUE;
+
+    return FALSE;
+}
+}
+
 //-----------------------------------------------------------------------------
 // "size_allocate" from m_wxwindow
 //-----------------------------------------------------------------------------
@@ -222,16 +254,18 @@ extern "C" {
 static void
 size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
 {
-    if (win->m_oldClientWidth  != alloc->width ||
-        win->m_oldClientHeight != alloc->height)
+    win->m_useCachedClientSize = true;
+    if (win->m_clientWidth  != alloc->width ||
+        win->m_clientHeight != alloc->height)
     {
-        win->m_oldClientWidth  = alloc->width;
-        win->m_oldClientHeight = alloc->height;
+        win->m_clientWidth  = alloc->width;
+        win->m_clientHeight = alloc->height;
 
         GtkAllocation a;
         gtk_widget_get_allocation(win->m_widget, &a);
         wxSize size(a.width, a.height);
-        size += win->m_decorSize;
+        size.x += win->m_decorSize.left + win->m_decorSize.right;
+        size.y += win->m_decorSize.top + win->m_decorSize.bottom;
         win->m_width  = size.x;
         win->m_height = size.y;
 
@@ -246,22 +280,6 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
 }
 }
 
-// ----------------------------------------------------------------------------
-// "size_request"
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static
-void wxgtk_tlw_size_request_callback(GtkWidget * WXUNUSED(widget),
-                                     GtkRequisition *requisition,
-                                     wxTopLevelWindowGTK *win)
-{
-    // we must return the size of the window without WM decorations, otherwise
-    // GTK+ gets confused, so don't call just GetSize() here
-    win->GTKDoGetSize(&requisition->width, &requisition->height);
-}
-}
-
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
@@ -287,26 +305,41 @@ gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
 
 extern "C" {
 static gboolean
-gtk_frame_configure_callback( GtkWidget* widget,
-                              GdkEventConfigure *WXUNUSED(event),
+gtk_frame_configure_callback( GtkWidget*,
+                              GdkEventConfigure* gdk_event,
                               wxTopLevelWindowGTK *win )
 {
-    if (!win->m_hasVMT || !win->IsShown())
-        return FALSE;
-
-    wxPoint point;
-    gtk_window_get_position((GtkWindow*)widget, &point.x, &point.y);
-
-    win->m_x = point.x;
-    win->m_y = point.y;
-    wxMoveEvent mevent(point, win->GetId());
-    mevent.SetEventObject( win );
-    win->HandleWindowEvent( mevent );
-
-    return FALSE;
+    win->GTKConfigureEvent(gdk_event->x, gdk_event->y);
+    return false;
 }
 }
 
+void wxTopLevelWindowGTK::GTKConfigureEvent(int x, int y)
+{
+    wxPoint point;
+#ifdef GDK_WINDOWING_X11
+    if (gs_decorCacheValid)
+    {
+        const DecorSize& decorSize = GetCachedDecorSize();
+        point.x = x - decorSize.left;
+        point.y = y - decorSize.top;
+    }
+    else
+#endif
+    {
+        gtk_window_get_position(GTK_WINDOW(m_widget), &point.x, &point.y);
+    }
+
+    if (m_x != point.x || m_y != point.y)
+    {
+        m_x = point.x;
+        m_y = point.y;
+        wxMoveEvent event(point, GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }
+}
+
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
@@ -323,17 +356,19 @@ void wxTopLevelWindowGTK::GTKHandleRealized()
     gdk_window_set_functions(gtk_widget_get_window(m_widget),
                                (GdkWMFunction)m_gdkFunc);
 
-    // GTK's shrinking/growing policy
-    if ( !(m_gdkFunc & GDK_FUNC_RESIZE) )
-        gtk_window_set_resizable(GTK_WINDOW(m_widget), FALSE);
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
-    else
-        gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
-#endif
-
     const wxIconBundle& icons = GetIcons();
     if (icons.GetIconCount())
         SetIcons(icons);
+
+#ifdef __WXGTK3__
+    if (gtk_window_get_has_resize_grip(GTK_WINDOW(m_widget)))
+    {
+        // Grip window can end up obscured, probably due to deferred show.
+        // Reset grip to ensure it is visible.
+        gtk_window_set_has_resize_grip(GTK_WINDOW(m_widget), false);
+        gtk_window_set_has_resize_grip(GTK_WINDOW(m_widget), true);
+    }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -355,7 +390,8 @@ gtk_frame_map_callback( GtkWidget*,
         // tlw that was "rolled up" with some WMs.
         // Queue a resize rather than sending size event directly to allow
         // children to be made visible first.
-        win->m_oldClientWidth = 0;
+        win->m_useCachedClientSize = false;
+        win->m_clientWidth = 0;
         gtk_widget_queue_resize(win->m_wxwindow);
     }
     // it is possible for m_isShown to be false here, see bug #9909
@@ -366,13 +402,8 @@ gtk_frame_map_callback( GtkWidget*,
         win->GetEventHandler()->ProcessEvent(eventShow);
     }
 
-#if GTK_CHECK_VERSION(2,6,0)
-    if (!gtk_check_version(2,6,0))
-    {
-        // restore focus-on-map setting in case ShowWithoutActivating() was called
-        gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
-    }
-#endif // GTK+ 2.6+
+    // restore focus-on-map setting in case ShowWithoutActivating() was called
+    gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
 
     return false;
 }
@@ -394,11 +425,14 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
     // if maximized bit changed and it is now set
     if (event->changed_mask & event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
     {
-        wxMaximizeEvent event(win->GetId());
-        event.SetEventObject(win);
-        win->HandleWindowEvent(event);
+        wxMaximizeEvent evt(win->GetId());
+        evt.SetEventObject(win);
+        win->HandleWindowEvent(evt);
     }
 
+    if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
+        win->m_fsIsShowing = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+
     return false;
 }
 }
@@ -409,15 +443,15 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
 {
 #ifdef GDK_WINDOWING_X11
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
-    Atom xproperty = gdk_x11_atom_to_xatom_for_display(
-                        gdk_drawable_get_display(window), property);
+    GdkDisplay* display = gdk_window_get_display(window);
+    Atom xproperty = gdk_x11_atom_to_xatom_for_display(display, property);
     Atom type;
     int format;
     gulong nitems, bytes_after;
     guchar* data;
     Status status = XGetWindowProperty(
-        gdk_x11_drawable_get_xdisplay(window),
-        gdk_x11_drawable_get_xid(window),
+        GDK_DISPLAY_XDISPLAY(display),
+        GDK_WINDOW_XID(window),
         xproperty,
         0, 4, false, XA_CARDINAL,
         &type, &format, &nitems, &bytes_after, &data);
@@ -438,6 +472,7 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
 #endif
 }
 
+#ifdef GDK_WINDOWING_X11
 //-----------------------------------------------------------------------------
 // "property_notify_event" from m_widget
 //-----------------------------------------------------------------------------
@@ -453,15 +488,14 @@ static gboolean property_notify_event(
         if (win->m_netFrameExtentsTimerId)
         {
             // WM support for _NET_REQUEST_FRAME_EXTENTS is working
-            gs_requestFrameExtentsStatus = 1;
+            gs_requestFrameExtentsStatus = RFE_STATUS_WORKING;
             g_source_remove(win->m_netFrameExtentsTimerId);
             win->m_netFrameExtentsTimerId = 0;
         }
 
-        wxSize decorSize = win->m_decorSize;
-        int left, right, top, bottom;
-        if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
-            decorSize.Set(left + right, top + bottom);
+        wxTopLevelWindowGTK::DecorSize decorSize = win->m_decorSize;
+        gs_decorCacheValid = wxGetFrameExtents(event->window,
+            &decorSize.left, &decorSize.right, &decorSize.top, &decorSize.bottom);
 
         win->GTKUpdateDecorSize(decorSize);
     }
@@ -473,19 +507,19 @@ extern "C" {
 static gboolean request_frame_extents_timeout(void* data)
 {
     // WM support for _NET_REQUEST_FRAME_EXTENTS is broken
-    gs_requestFrameExtentsStatus = 2;
+    gs_requestFrameExtentsStatus = RFE_STATUS_BROKEN;
     gdk_threads_enter();
     wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data);
     win->m_netFrameExtentsTimerId = 0;
-    wxSize decorSize = win->m_decorSize;
-    int left, right, top, bottom;
-    if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom))
-        decorSize.Set(left + right, top + bottom);
+    wxTopLevelWindowGTK::DecorSize decorSize = win->m_decorSize;
+    wxGetFrameExtents(gtk_widget_get_window(win->m_widget),
+        &decorSize.left, &decorSize.right, &decorSize.top, &decorSize.bottom);
     win->GTKUpdateDecorSize(decorSize);
     gdk_threads_leave();
     return false;
 }
 }
+#endif // GDK_WINDOWING_X11
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowGTK creation
@@ -504,6 +538,8 @@ void wxTopLevelWindowGTK::Init()
     m_deferShowAllowed = true;
     m_updateDecorSize = true;
     m_netFrameExtentsTimerId = 0;
+    m_incWidth = m_incHeight = 0;
+    memset(&m_decorSize, 0, sizeof(m_decorSize));
 
     m_urgency_hint = -2;
 }
@@ -516,11 +552,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
                                   long style,
                                   const wxString &name )
 {
-    // always create a frame of some reasonable, even if arbitrary, size (at
-    // least for MSW compatibility)
-    wxSize size = sizeOrig;
-    size.x = WidthDefault(size.x);
-    size.y = HeightDefault(size.y);
+    wxSize size(sizeOrig);
+    if (!size.IsFullySpecified())
+        size.SetDefaults(GetDefaultSize());
 
     wxTopLevelWindows.Append( this );
 
@@ -609,7 +643,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
                       G_CALLBACK (gtk_frame_delete_callback), this);
 
     // m_mainWidget is a GtkVBox, holding the bars and client area (m_wxwindow)
-    m_mainWidget = gtk_vbox_new(false, 0);
+    m_mainWidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_show( m_mainWidget );
     gtk_widget_set_can_focus(m_mainWidget, false);
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
@@ -617,7 +651,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     // m_wxwindow is the client area
     m_wxwindow = wxPizza::New();
     gtk_widget_show( m_wxwindow );
-    gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
+    gtk_box_pack_start(GTK_BOX(m_mainWidget), m_wxwindow, true, true, 0);
 
     // we donm't allow the frame to get the focus as otherwise
     // the frame will grab it at arbitrary focus changes
@@ -628,12 +662,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     g_signal_connect(m_wxwindow, "size_allocate",
         G_CALLBACK(size_allocate), this);
 
-    g_signal_connect (m_widget, "size_request",
-                      G_CALLBACK (wxgtk_tlw_size_request_callback), this);
     PostCreation();
 
-#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
-    if ((m_x != -1) || (m_y != -1))
+#ifndef __WXGTK3__
+    if (pos != wxDefaultPosition)
         gtk_widget_set_uposition( m_widget, m_x, m_y );
 #endif
 
@@ -656,9 +688,21 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     g_signal_connect_after (m_widget, "focus_out_event",
                       G_CALLBACK (gtk_frame_focus_out_callback), this);
 
-    gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
-    g_signal_connect(m_widget, "property_notify_event",
-        G_CALLBACK(property_notify_event), this);
+    // We need to customize the default GTK+ logic for key processing to make
+    // it conforming to wxWidgets event processing order.
+    g_signal_connect (m_widget, "key_press_event",
+                      G_CALLBACK (wxgtk_tlw_key_press_event), NULL);
+
+#ifdef GDK_WINDOWING_X11
+#ifdef __WXGTK3__
+    if (GDK_IS_X11_SCREEN(gtk_window_get_screen(GTK_WINDOW(m_widget))))
+#endif
+    {
+        gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
+        g_signal_connect(m_widget, "property_notify_event",
+            G_CALLBACK(property_notify_event), this);
+    }
+#endif // GDK_WINDOWING_X11
 
     // translate wx decorations styles into Motif WM hints (they are recognized
     // by other WMs as well)
@@ -679,6 +723,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     if ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
     {
         m_gdkDecor = 0;
+        gtk_window_set_decorated(GTK_WINDOW(m_widget), false);
     }
     else // have border
     {
@@ -686,6 +731,14 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
         if ( style & wxCAPTION )
             m_gdkDecor |= GDK_DECOR_TITLE;
+#if defined(GDK_WINDOWING_WAYLAND) && GTK_CHECK_VERSION(3,10,0)
+        else if (
+            GDK_IS_WAYLAND_DISPLAY(gtk_widget_get_display(m_widget)) &&
+            gtk_check_version(3,10,0) == NULL)
+        {
+            gtk_window_set_titlebar(GTK_WINDOW(m_widget), gtk_header_bar_new());
+        }
+#endif
 
         if ( style & wxSYSTEM_MENU )
             m_gdkDecor |= GDK_DECOR_MENU;
@@ -706,7 +759,22 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     m_decorSize = GetCachedDecorSize();
     int w, h;
     GTKDoGetSize(&w, &h);
-    gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);
+
+    if (style & wxRESIZE_BORDER)
+    {
+        gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);
+#ifndef __WXGTK3__
+        gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
+#endif
+    }
+    else
+    {
+        gtk_window_set_resizable(GTK_WINDOW(m_widget), false);
+        // gtk_window_set_default_size() does not work for un-resizable windows,
+        // unless you set the size hints, but that causes Ubuntu's WM to make
+        // the window resizable even though GDK_FUNC_RESIZE is not set.
+        gtk_widget_set_size_request(m_widget, w, h);
+    }
 
     return true;
 }
@@ -771,9 +839,9 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
     m_fsIsShowing = show;
 
 #ifdef GDK_WINDOWING_X11
-    wxX11FullScreenMethod method =
-        wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
-                                 (WXWindow)GDK_ROOT_WINDOW());
+    Display* xdpy = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(m_widget));
+    Window xroot = GDK_WINDOW_XID(gtk_widget_get_root_window(m_widget));
+    wxX11FullScreenMethod method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot);
 
     // NB: gtk_window_fullscreen() uses freedesktop.org's WMspec extensions
     //     to switch to fullscreen, which is not always available. We must
@@ -791,14 +859,16 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
     else
     {
         GdkWindow* window = gtk_widget_get_window(m_widget);
+        Window xid = GDK_WINDOW_XID(window);
 
         if (show)
         {
             GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
             GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
 
-            int screen_width,screen_height;
-            wxDisplaySize( &screen_width, &screen_height );
+            GdkScreen* screen = gtk_widget_get_screen(m_widget);
+            const int screen_width = gdk_screen_get_width(screen);
+            const int screen_height = gdk_screen_get_height(screen);
 
             gint client_x, client_y, root_x, root_y;
             gint width, height;
@@ -810,14 +880,14 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
             gdk_window_set_functions(window, (GdkWMFunction)0);
 
             gdk_window_get_origin(window, &root_x, &root_y);
-            gdk_window_get_geometry(window, &client_x, &client_y, &width, &height, NULL);
+            gdk_window_get_geometry(window, &client_x, &client_y, &width, &height);
 
             gdk_window_move_resize(
                 window, -client_x, -client_y, screen_width + 1, screen_height + 1);
 
-            wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
-                                    (WXWindow)GDK_ROOT_WINDOW(),
-                                    (WXWindow)GDK_WINDOW_XWINDOW(window),
+            wxSetFullScreenStateX11(xdpy,
+                                    (WXWindow)xroot,
+                                    (WXWindow)xid,
                                     show, &m_fsSaveFrame, method);
         }
         else // hide
@@ -827,9 +897,9 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
             gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
             gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
 
-            wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
-                                    (WXWindow)GDK_ROOT_WINDOW(),
-                                    (WXWindow)GDK_WINDOW_XWINDOW(window),
+            wxSetFullScreenStateX11(xdpy,
+                                    (WXWindow)xroot,
+                                    (WXWindow)xid,
                                     show, &m_fsSaveFrame, method);
 
             SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
@@ -867,28 +937,23 @@ bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
+#ifdef GDK_WINDOWING_X11
     bool deferShow = show && !m_isShown && m_deferShow;
     if (deferShow)
     {
-        deferShow = gs_requestFrameExtentsStatus != 2 &&
-            m_deferShowAllowed && !gtk_widget_get_realized(m_widget);
-        if (deferShow)
-        {
-            deferShow = g_signal_handler_find(m_widget,
+        deferShow = m_deferShowAllowed &&
+            gs_requestFrameExtentsStatus != RFE_STATUS_BROKEN &&
+            !gtk_widget_get_realized(m_widget) &&
+            g_signal_handler_find(m_widget,
                 GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
                 g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
-                0, NULL, NULL, this) != 0;
-        }
-        GdkScreen* screen = NULL;
+                0, NULL, NULL, this);
         if (deferShow)
         {
-#ifdef GDK_WINDOWING_X11
-            screen = gtk_widget_get_screen(m_widget);
+            GdkScreen* screen = gtk_widget_get_screen(m_widget);
             GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
             deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
-#else
-            deferShow = false;
-#endif
+
             // If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
             // to m_decorSize, it breaks saving/restoring window size with
             // GetSize()/SetSize() because it makes window bigger between each
@@ -926,24 +991,22 @@ bool wxTopLevelWindowGTK::Show( bool show )
             gtk_widget_set_allocation(m_widget, &alloc);
         }
 
-#ifdef GDK_WINDOWING_X11
         // send _NET_REQUEST_FRAME_EXTENTS
         XClientMessageEvent xevent;
         memset(&xevent, 0, sizeof(xevent));
         xevent.type = ClientMessage;
         GdkWindow* window = gtk_widget_get_window(m_widget);
-        xevent.window = gdk_x11_drawable_get_xid(window);
+        xevent.window = GDK_WINDOW_XID(window);
         xevent.message_type = gdk_x11_atom_to_xatom_for_display(
-            gdk_drawable_get_display(window),
+            gdk_window_get_display(window),
             gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false));
         xevent.format = 32;
-        Display* display = gdk_x11_drawable_get_xdisplay(window);
+        Display* display = GDK_DISPLAY_XDISPLAY(gdk_window_get_display(window));
         XSendEvent(display, DefaultRootWindow(display), false,
             SubstructureNotifyMask | SubstructureRedirectMask,
             (XEvent*)&xevent);
-#endif // GDK_WINDOWING_X11
 
-        if (gs_requestFrameExtentsStatus == 0)
+        if (gs_requestFrameExtentsStatus == RFE_STATUS_UNKNOWN)
         {
             // if WM does not respond to request within 1 second,
             // we assume support for _NET_REQUEST_FRAME_EXTENTS is not working
@@ -955,6 +1018,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
         m_isShown = true;
         return true;
     }
+#endif // GDK_WINDOWING_X11
 
     if (show && !gtk_widget_get_realized(m_widget))
     {
@@ -983,11 +1047,7 @@ void wxTopLevelWindowGTK::ShowWithoutActivating()
 {
     if (!m_isShown)
     {
-#if GTK_CHECK_VERSION(2,6,0)
-        if (!gtk_check_version(2,6,0))
-            gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
-#endif // GTK+ 2.6+
-
+        gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
         Show(true);
     }
 }
@@ -1009,7 +1069,8 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
 void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
 {
     wxSize size(m_width, m_height);
-    size -= m_decorSize;
+    size.x -= m_decorSize.left + m_decorSize.right;
+    size.y -= m_decorSize.top + m_decorSize.bottom;
     if (size.x < 0) size.x = 0;
     if (size.y < 0) size.y = 0;
 #if wxUSE_LIBHILDON2
@@ -1037,8 +1098,6 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 
-    m_deferShowAllowed = true;
-
     // deal with the position first
     int old_x = m_x;
     int old_y = m_y;
@@ -1060,6 +1119,9 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
     if ( m_x != old_x || m_y != old_y )
     {
         gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
+        wxMoveEvent event(wxPoint(m_x, m_y), GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
     }
 
     const wxSize oldSize(m_width, m_height);
@@ -1068,13 +1130,20 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
     if (height >= 0)
         m_height = height;
     ConstrainSize();
+    if (m_width < 1) m_width = 1;
+    if (m_height < 1) m_height = 1;
     if (m_width != oldSize.x || m_height != oldSize.y)
     {
+        m_deferShowAllowed = true;
+        m_useCachedClientSize = false;
+
         int w, h;
         GTKDoGetSize(&w, &h);
         gtk_window_resize(GTK_WINDOW(m_widget), w, h);
+        if (!gtk_window_get_resizable(GTK_WINDOW(m_widget)))
+            gtk_widget_set_size_request(GTK_WIDGET(m_widget), w, h);
 
-        GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+        DoGetClientSize(&m_clientWidth, &m_clientHeight);
         wxSizeEvent event(GetSize(), GetId());
         event.SetEventObject(this);
         HandleWindowEvent(event);
@@ -1104,6 +1173,8 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
         if ( height )
             *height = 0;
     }
+    else if (m_useCachedClientSize)
+        base_type::DoGetClientSize(width, height);
     else
     {
         GTKDoGetSize(width, height);
@@ -1115,30 +1186,36 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
                                           int incW, int incH )
 {
     base_type::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+    m_incWidth = incW;
+    m_incHeight = incH;
 
     const wxSize minSize = GetMinSize();
     const wxSize maxSize = GetMaxSize();
     GdkGeometry hints;
-    int hints_mask = 0;
-    if (minSize.x > 0 || minSize.y > 0)
+    // always set both min and max hints, otherwise GTK will
+    // make assumptions we don't want about the unset values
+    int hints_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
+    hints.min_width = 1;
+    hints.min_height = 1;
+    hints.max_width = INT_MAX;
+    hints.max_height = INT_MAX;
+    const int decorSize_x = m_decorSize.left + m_decorSize.right;
+    const int decorSize_y = m_decorSize.top + m_decorSize.bottom;
+    if (minSize.x > decorSize_x)
+        hints.min_width = minSize.x - decorSize_x;
+    if (minSize.y > decorSize_y)
+        hints.min_height = minSize.y - decorSize_y;
+    if (maxSize.x > 0)
     {
-        hints_mask |= GDK_HINT_MIN_SIZE;
-        hints.min_width = minSize.x - m_decorSize.x;
-        if (hints.min_width < 0)
-            hints.min_width = 0;
-        hints.min_height = minSize.y - m_decorSize.y;
-        if (hints.min_height < 0)
-            hints.min_height = 0;
+        hints.max_width = maxSize.x - decorSize_x;
+        if (hints.max_width < hints.min_width)
+            hints.max_width = hints.min_width;
     }
-    if (maxSize.x > 0 || maxSize.y > 0)
+    if (maxSize.y > 0)
     {
-        hints_mask |= GDK_HINT_MAX_SIZE;
-        hints.max_width = maxSize.x - m_decorSize.x;
-        if (hints.max_width < 0)
-            hints.max_width = INT_MAX;
-        hints.max_height = maxSize.y - m_decorSize.y;
-        if (hints.max_height < 0)
-            hints.max_height = INT_MAX;
+        hints.max_height = maxSize.y - decorSize_y;
+        if (hints.max_height < hints.min_height)
+            hints.max_height = hints.min_height;
     }
     if (incW > 0 || incH > 0)
     {
@@ -1150,25 +1227,36 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
         (GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
 }
 
-void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
+#ifdef GDK_WINDOWING_X11
+void wxTopLevelWindowGTK::GTKUpdateDecorSize(const DecorSize& decorSize)
 {
     if (!IsMaximized() && !IsFullScreen())
         GetCachedDecorSize() = decorSize;
-    if (m_updateDecorSize && m_decorSize != decorSize)
+    if (m_updateDecorSize && memcmp(&m_decorSize, &decorSize, sizeof(DecorSize)))
     {
-        const wxSize diff = decorSize - m_decorSize;
+        m_useCachedClientSize = false;
+        const wxSize diff(
+            decorSize.left - m_decorSize.left + decorSize.right - m_decorSize.right,
+            decorSize.top - m_decorSize.top + decorSize.bottom - m_decorSize.bottom);
         m_decorSize = decorSize;
         bool resized = false;
+        if (m_minWidth > 0 || m_minHeight > 0 || m_maxWidth > 0 || m_maxHeight > 0)
+        {
+            // update size hints, they depend on m_decorSize
+            DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, m_incWidth, m_incHeight);
+        }
         if (m_deferShow)
         {
             // keep overall size unchanged by shrinking m_widget
             int w, h;
             GTKDoGetSize(&w, &h);
             // but not if size would be less than minimum, it won't take effect
-            const wxSize minSize = GetMinSize();
-            if (w >= minSize.x && h >= minSize.y)
+            if (w >= m_minWidth - (decorSize.left + decorSize.right) &&
+                h >= m_minHeight - (decorSize.top + decorSize.bottom))
             {
                 gtk_window_resize(GTK_WINDOW(m_widget), w, h);
+                if (!gtk_window_get_resizable(GTK_WINDOW(m_widget)))
+                    gtk_widget_set_size_request(GTK_WIDGET(m_widget), w, h);
                 resized = true;
             }
         }
@@ -1177,9 +1265,9 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
             // adjust overall size to match change in frame extents
             m_width  += diff.x;
             m_height += diff.y;
-            if (m_width  < 0) m_width  = 0;
-            if (m_height < 0) m_height = 0;
-            m_oldClientWidth = 0;
+            if (m_width  < 1) m_width  = 1;
+            if (m_height < 1) m_height = 1;
+            m_clientWidth = 0;
             gtk_widget_queue_resize(m_wxwindow);
         }
     }
@@ -1187,7 +1275,7 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
     {
         // gtk_widget_show() was deferred, do it now
         m_deferShow = false;
-        GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+        DoGetClientSize(&m_clientWidth, &m_clientHeight);
         wxSizeEvent sizeEvent(GetSize(), GetId());
         sizeEvent.SetEventObject(this);
         HandleWindowEvent(sizeEvent);
@@ -1199,10 +1287,11 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
         HandleWindowEvent(showEvent);
     }
 }
+#endif // GDK_WINDOWING_X11
 
-wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
+wxTopLevelWindowGTK::DecorSize& wxTopLevelWindowGTK::GetCachedDecorSize()
 {
-    static wxSize size[8];
+    static DecorSize size[8];
 
     int index = 0;
     // title bar
@@ -1401,28 +1490,6 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
     }
 }
 
-#ifdef GDK_WINDOWING_X11
-/* Get the X Window between child and the root window.
-   This should usually be the WM managed XID */
-static Window wxGetTopmostWindowX11(Display *dpy, Window child)
-{
-    Window root, parent;
-    Window* children;
-    unsigned int nchildren;
-
-    XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
-    XFree(children);
-
-    while (parent != root) {
-        child = parent;
-        XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
-        XFree(children);
-    }
-
-    return child;
-}
-#endif // GDK_WINDOWING_X11
-
 bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
 {
     GdkWindow* window = NULL;
@@ -1433,11 +1500,7 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
 
 #ifdef GDK_WINDOWING_X11
     Display* dpy = GDK_WINDOW_XDISPLAY(window);
-    // We need to get the X Window that has the root window as the immediate parent
-    // and m_widget->window as a child. This should be the X Window that the WM manages and
-    // from which the opacity property is checked from.
-    Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID(window));
-
+    Window win = GDK_WINDOW_XID(window);
 
     // Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
     if (alpha == 0xff)
@@ -1465,16 +1528,20 @@ bool wxTopLevelWindowGTK::CanSetTransparent()
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;
     }
 
+#ifdef __WXGTK3__
+    return gtk_widget_is_composited(m_widget) != 0;
+#else
 #if GTK_CHECK_VERSION(2,10,0)
     if (!gtk_check_version(2,10,0))
     {
-        return (gtk_widget_is_composited (m_widget));
+        return gtk_widget_is_composited(m_widget) != 0;
     }
     else
 #endif // In case of lower versions than gtk+-2.10.0 we could look for _NET_WM_CM_Sn ourselves
     {
         return false;
     }
+#endif // !__WXGTK3__
 
 #if 0 // Don't be optimistic here for the sake of wxAUI
     int opcode, event, error;
diff --git a/Externals/wxWidgets3/src/gtk/treeentry_gtk.c b/Externals/wxWidgets3/src/gtk/treeentry_gtk.c
index 63d8c234ac..96b5747e86 100644
--- a/Externals/wxWidgets3/src/gtk/treeentry_gtk.c
+++ b/Externals/wxWidgets3/src/gtk/treeentry_gtk.c
@@ -2,7 +2,6 @@
 // Name:        src/gtk/treeentry_gtk.c
 // Purpose:     GtkTreeEntry implementation
 // Author:      Ryan Norton
-// Id:          $Id: treeentry_gtk.c 67433 2011-04-11 09:36:56Z JJ $
 // Copyright:   (c) 2006 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
@@ -14,7 +13,7 @@ typedef pid_t GPid;
 #define GSEAL(x) x
 #endif
 
-#include "wx/gtk/treeentry_gtk.h"
+#include "wx/gtk/private/treeentry_gtk.h"
 
 /*
         GtkTreeEntry
@@ -32,22 +31,22 @@ typedef pid_t GPid;
 */
 
 /* forwards */
-static void gtk_tree_entry_class_init(GtkTreeEntryClass* klass);
-static void gtk_tree_entry_init (GTypeInstance* instance, gpointer g_class);
-static void gtk_tree_entry_string_transform_func(const GValue *src_value,
+static void wx_tree_entry_class_init(void* g_class, void* class_data);
+static void wx_tree_entry_string_transform_func(const GValue *src_value,
                                                  GValue *dest_value);
-static void gtk_tree_entry_dispose(GObject* obj);
+static void wx_tree_entry_dispose(GObject* obj);
 
+static GObjectClass* parent_class;
 
 /* public */
-GtkTreeEntry*
-gtk_tree_entry_new()
+wxTreeEntry*
+wx_tree_entry_new()
 {
-    return GTK_TREE_ENTRY(g_object_new(GTK_TYPE_TREE_ENTRY, NULL));
+    return WX_TREE_ENTRY(g_object_new(WX_TYPE_TREE_ENTRY, NULL));
 }
 
 GType
-gtk_tree_entry_get_type ()
+wx_tree_entry_get_type()
 {
     static GType tree_entry_type = 0;
 
@@ -55,48 +54,53 @@ gtk_tree_entry_get_type ()
     {
         const GTypeInfo tree_entry_info =
         {
-            sizeof (GtkTreeEntryClass),
+            sizeof(GObjectClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */
-            (GClassInitFunc) gtk_tree_entry_class_init,  /* class_init */
+            wx_tree_entry_class_init,
             NULL,           /* class_finalize */
             NULL,           /* class_data */
-            sizeof (GtkTreeEntry),
+            sizeof(wxTreeEntry),
             16,             /* n_preallocs */
-            (GInstanceInitFunc) gtk_tree_entry_init, /*instance_init*/
+            NULL,           /* instance_init */
             NULL            /* value_table */
         };
-        tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeEntry",
+        tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "wxTreeEntry",
                                                   &tree_entry_info,
                                                   (GTypeFlags)0);
         g_value_register_transform_func(tree_entry_type, G_TYPE_STRING,
-                                        gtk_tree_entry_string_transform_func);
+                                        wx_tree_entry_string_transform_func);
     }
 
     return tree_entry_type;
 }
 
-gchar*     gtk_tree_entry_get_collate_key (GtkTreeEntry* entry)
+char* wx_tree_entry_get_collate_key(wxTreeEntry* entry)
 {
+    if (entry->collate_key == NULL)
+    {
+        char* temp = g_utf8_casefold(entry->label, -1);
+        entry->collate_key = g_utf8_collate_key(temp, -1);
+        g_free(temp);
+    }
     return entry->collate_key;
 }
 
-gchar*     gtk_tree_entry_get_label     (GtkTreeEntry* entry)
+char* wx_tree_entry_get_label(wxTreeEntry* entry)
 {
-    g_assert(GTK_IS_TREE_ENTRY(entry));
+    g_assert(WX_IS_TREE_ENTRY(entry));
     return entry->label;
 }
 
-gpointer   gtk_tree_entry_get_userdata  (GtkTreeEntry* entry)
+void* wx_tree_entry_get_userdata(wxTreeEntry* entry)
 {
-    g_assert(GTK_IS_TREE_ENTRY(entry));
+    g_assert(WX_IS_TREE_ENTRY(entry));
     return entry->userdata;
 }
 
-void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label)
+void wx_tree_entry_set_label(wxTreeEntry* entry, const char* label)
 {
-    g_assert(GTK_IS_TREE_ENTRY(entry));
-    gchar *temp;
+    g_assert(WX_IS_TREE_ENTRY(entry));
 
     /* free previous if it exists */
     if(entry->label)
@@ -106,67 +110,53 @@ void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label
     }
 
     entry->label = g_strdup(label);
-    temp = g_utf8_casefold(label, -1); /* -1 == null terminated */
-    entry->collate_key = g_utf8_collate_key(temp, -1); /* -1 == null terminated */
-    g_free( temp );
+    entry->collate_key = NULL;
 }
 
-void   gtk_tree_entry_set_userdata      (GtkTreeEntry* entry, gpointer userdata)
+void wx_tree_entry_set_userdata(wxTreeEntry* entry, void* userdata)
 {
-    g_assert(GTK_IS_TREE_ENTRY(entry));
+    g_assert(WX_IS_TREE_ENTRY(entry));
     entry->userdata = userdata;
 }
 
-void   gtk_tree_entry_set_destroy_func  (GtkTreeEntry* entry,
-                                         GtkTreeEntryDestroy destroy_func,
+void wx_tree_entry_set_destroy_func(wxTreeEntry* entry,
+                                         wxTreeEntryDestroy destroy_func,
                                          gpointer destroy_func_data)
 {
-    g_assert(GTK_IS_TREE_ENTRY(entry));
+    g_assert(WX_IS_TREE_ENTRY(entry));
     entry->destroy_func = destroy_func;
     entry->destroy_func_data = destroy_func_data;
 }
 
 /* private */
-static void gtk_tree_entry_class_init(GtkTreeEntryClass* klass)
+static void wx_tree_entry_class_init(void* g_class, void* class_data)
 {
-    GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
-    gobject_class->dispose = gtk_tree_entry_dispose;
+    GObjectClass* gobject_class = G_OBJECT_CLASS(g_class);
+    gobject_class->dispose = wx_tree_entry_dispose;
+    parent_class = G_OBJECT_CLASS(g_type_class_peek_parent(g_class));
 }
 
-static void gtk_tree_entry_init (GTypeInstance* instance, gpointer g_class)
-{
-    GtkTreeEntry* entry = (GtkTreeEntry*) instance;
-
-    /* clear */
-    entry->label = NULL;
-    entry->collate_key = NULL;
-    entry->userdata = NULL;
-    entry->destroy_func_data = NULL;
-    entry->destroy_func = NULL;
-}
-
-static void gtk_tree_entry_string_transform_func(const GValue *src_value,
+static void wx_tree_entry_string_transform_func(const GValue *src_value,
                                                  GValue *dest_value)
 {
-    GtkTreeEntry *entry;
+    wxTreeEntry* entry;
+    void* src_ptr = g_value_peek_pointer(src_value);
 
     /* Make sure src is a treeentry and dest can hold a string */
-    g_assert(GTK_IS_TREE_ENTRY(src_value->data[0].v_pointer));
+    g_assert(WX_IS_TREE_ENTRY(src_ptr));
     g_assert(G_VALUE_HOLDS(dest_value, G_TYPE_STRING));
 
-    /* TODO: Use strdup here or just pass it? */
-    entry = GTK_TREE_ENTRY(src_value->data[0].v_pointer);
-
+    entry = WX_TREE_ENTRY(src_ptr);
     g_value_set_string(dest_value, entry->label);
 }
 
-static void gtk_tree_entry_dispose(GObject* obj)
+static void wx_tree_entry_dispose(GObject* obj)
 {
-    GtkTreeEntry *entry;
+    wxTreeEntry* entry;
 
-    g_assert(GTK_IS_TREE_ENTRY(obj));
+    g_assert(WX_IS_TREE_ENTRY(obj));
 
-    entry = GTK_TREE_ENTRY(obj);
+    entry = WX_TREE_ENTRY(obj);
 
     /* free label if it exists */
     if(entry->label)
@@ -187,4 +177,6 @@ static void gtk_tree_entry_dispose(GObject* obj)
 
     /* clear userdata */
     entry->userdata = NULL;
+
+    parent_class->dispose(obj);
 }
diff --git a/Externals/wxWidgets3/src/gtk/utilsgtk.cpp b/Externals/wxWidgets3/src/gtk/utilsgtk.cpp
index bf5e770bb6..34a16108a3 100644
--- a/Externals/wxWidgets3/src/gtk/utilsgtk.cpp
+++ b/Externals/wxWidgets3/src/gtk/utilsgtk.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/utilsgtk.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: utilsgtk.cpp 70704 2012-02-27 00:40:16Z VZ $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,6 @@
 #include "wx/apptrait.h"
 #include "wx/process.h"
 #include "wx/sysopt.h"
-#include "wx/unix/execute.h"
 
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"
@@ -55,6 +53,8 @@
     #include "wx/unix/utilsx11.h"
 #endif
 
+#include "wx/gtk/private/gtk2-compat.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -64,23 +64,22 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
-#ifndef __EMX__
-// on OS/2, we use the wxBell from wxBase library
 
 void wxBell()
 {
     gdk_beep();
 }
-#endif
 
 // ----------------------------------------------------------------------------
-// display characterstics
+// display characteristics
 // ----------------------------------------------------------------------------
 
+#ifdef GDK_WINDOWING_X11
 void *wxGetDisplay()
 {
-    return GDK_DISPLAY();
+    return GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(wxGetRootWindow()));
 }
+#endif
 
 void wxDisplaySize( int *width, int *height )
 {
@@ -94,11 +93,6 @@ void wxDisplaySizeMM( int *width, int *height )
     if (height) *height = gdk_screen_height_mm();
 }
 
-void wxGetMousePosition( int* x, int* y )
-{
-    gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL);
-}
-
 bool wxColourDisplay()
 {
     return true;
@@ -106,7 +100,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
-    return gtk_widget_get_visual(wxGetRootWindow())->depth;
+    return gdk_visual_get_depth(gtk_widget_get_visual(wxGetRootWindow()));
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
@@ -167,7 +161,9 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
     //       added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
     //       for GTK lib) required pango 1.4...
 
-#ifdef PANGO_VERSION_MAJOR
+#ifdef __WXGTK3__
+    return pango_version_check(major, minor, micro);
+#elif defined(PANGO_VERSION_MAJOR)
     if (!gtk_check_version (2,11,0))
     {
         // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check
@@ -186,38 +182,6 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
 #endif
 }
 
-
-// ----------------------------------------------------------------------------
-// subprocess routines
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
-{
-    wxEndProcessData * const
-        proc_data = static_cast<wxEndProcessData *>(data);
-
-    // child exited, end waiting
-    close(g_io_channel_unix_get_fd(source));
-
-    wxHandleProcessTermination(proc_data);
-
-    // don't call us again!
-    return false;
-}
-}
-
-int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    GIOChannel* channel = g_io_channel_unix_new(fd);
-    GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR);
-    unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data);
-    g_io_channel_unref(channel);
-    return int(id);
-}
-
-
-
 // ----------------------------------------------------------------------------
 // wxPlatformInfo-related
 // ----------------------------------------------------------------------------
@@ -284,13 +248,7 @@ wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
 }
 
 
-#if wxUSE_INTL
-void wxGUIAppTraits::SetLocale()
-{
-    gtk_set_locale();
-    wxUpdateLocaleIsUtf8();
-}
-#endif
+#ifdef __UNIX__
 
 #if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 
@@ -304,27 +262,15 @@ protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
         wxString fncname = frame.GetName();
-        wxString fncargs = fncname;
-
-        size_t n = fncname.find(wxT('('));
-        if (n != wxString::npos)
-        {
-            // remove arguments from function name
-            fncname.erase(n);
-
-            // remove function name and brackets from arguments
-            fncargs = fncargs.substr(n+1, fncargs.length()-n-2);
-        }
-        else
-            fncargs = wxEmptyString;
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())
+        {
             gtk_assert_dialog_append_stack_frame(m_dlg,
-                                                fncname.mb_str(),
-                                                fncargs.mb_str(),
-                                                frame.GetFileName().mb_str(),
+                                                fncname.utf8_str(),
+                                                frame.GetFileName().utf8_str(),
                                                 frame.GetLine());
+        }
     }
 
 private:
@@ -335,7 +281,7 @@ static void get_stackframe_callback(void* p)
 {
     StackDump* dump = static_cast<StackDump*>(p);
     // skip over frames up to including wxOnAssert()
-    dump->ProcessFrames(3);
+    dump->ProcessFrames(6);
 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
@@ -394,6 +340,10 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
     return wxAppTraitsBase::ShowAssertDialog(msg);
 }
 
+#endif // __UNIX__
+
+#if defined(__UNIX__) || defined(__OS2__)
+
 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
     wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
@@ -412,7 +362,9 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const
     return de;
 }
 
-#ifdef __WXGTK26__
+#endif // __UNIX__ || __OS2__
+
+#ifdef __UNIX__
 
 // see the hack below in wxCmdLineParser::GetUsageString().
 // TODO: replace this hack with a g_option_group_get_entries()
@@ -440,6 +392,7 @@ struct _GOptionGroup
   GOptionErrorFunc error_func;
 };
 
+static
 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;
@@ -459,55 +412,44 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     return wxT("  ") + ret;
 }
 
-#endif // __WXGTK26__
-
 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const
 {
     wxString usage;
 
-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    // check whether GLib version is lower than 2.39
+    // because, as we use the undocumented _GOptionGroup struct, we don't want
+    // to run this code with future versions which might change it (2.38 is the
+    // latest one at the time of this writing)
+    if (glib_check_version(2,39,0))
     {
-        // since GTK>=2.6, we can use the glib_check_version() symbol...
+        usage << _("The following standard GTK+ options are also supported:\n");
 
-        // check whether GLib version is greater than 2.6 but also lower than 2.31
-        // because, as we use the undocumented _GOptionGroup struct, we don't want
-        // to run this code with future versions which might change it (2.30 is the
-        // latest one at the time of this writing)
-        if (glib_check_version(2,6,0) == NULL && glib_check_version(2,31,0))
+        // passing true here means that the function can open the default
+        // display while parsing (not really used here anyhow)
+        GOptionGroup *gtkOpts = gtk_get_option_group(true);
+
+        // WARNING: here we access the internals of GOptionGroup:
+        GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+        unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+        wxArrayString namesOptions, descOptions;
+
+        for ( size_t n = 0; n < n_entries; n++ )
         {
-            usage << _("The following standard GTK+ options are also supported:\n");
+            if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
+                continue;       // skip
 
-            // passing true here means that the function can open the default
-            // display while parsing (not really used here anyhow)
-            GOptionGroup *gtkOpts = gtk_get_option_group(true);
+            names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
 
-            // WARNING: here we access the internals of GOptionGroup:
-            GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
-            unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
-            wxArrayString namesOptions, descOptions;
-
-            for ( size_t n = 0; n < n_entries; n++ )
-            {
-                if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
-                    continue;       // skip
-
-                names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
-
-                const gchar * const entryDesc = entries[n].description;
-                desc.push_back(wxString(entryDesc));
-            }
-
-            g_option_group_free (gtkOpts);
+            const gchar * const entryDesc = entries[n].description;
+            desc.push_back(wxString(entryDesc));
         }
+
+        g_option_group_free (gtkOpts);
     }
-#else
-    wxUnusedVar(names);
-    wxUnusedVar(desc);
-#endif // __WXGTK26__
 
     return usage;
 }
 
+#endif // __UNIX__
diff --git a/Externals/wxWidgets3/src/gtk/webview_webkit.cpp b/Externals/wxWidgets3/src/gtk/webview_webkit.cpp
index d4b9528193..d1f19f9065 100644
--- a/Externals/wxWidgets3/src/gtk/webview_webkit.cpp
+++ b/Externals/wxWidgets3/src/gtk/webview_webkit.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/webview_webkit.cpp
 // Purpose:     GTK WebKit backend for web view component
 // Author:      Marianne Gagnon, Robert Roebling
-// Id:          $Id: webview_webkit.cpp 70768 2012-03-01 16:44:31Z PC $
 // Copyright:   (c) 2010 Marianne Gagnon, 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,7 @@
 #include "wx/gtk/private.h"
 #include "wx/filesys.h"
 #include "wx/base64.h"
+#include "wx/log.h"
 #include <webkit/webkit.h>
 
 // ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@ extern "C"
 {
 
 static void
-wxgtk_webview_webkit_load_status(GtkWidget* widget, 
+wxgtk_webview_webkit_load_status(GtkWidget* widget,
                                  GParamSpec*,
                                  wxWebViewWebKit *webKitCtrl)
 {
@@ -46,7 +46,8 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
         //We have to check if we are actually storing history
         //If the item isn't added we add it ourselves, it isn't added otherwise
         //with a custom scheme.
-        if(WEBKIT_IS_WEB_HISTORY_ITEM(item) && webkit_web_history_item_get_uri(item) != url)
+        if(!item || (WEBKIT_IS_WEB_HISTORY_ITEM(item) && 
+                     webkit_web_history_item_get_uri(item) != url))
         {
             WebKitWebHistoryItem*
                 newitem = webkit_web_history_item_new_with_data
@@ -58,7 +59,7 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
         }
 
         webKitCtrl->m_busy = false;
-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,
                              webKitCtrl->GetId(),
                              url, target);
 
@@ -68,7 +69,7 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
     else if (status ==  WEBKIT_LOAD_COMMITTED)
     {
         webKitCtrl->m_busy = true;
-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
                              webKitCtrl->GetId(),
                              url, target);
 
@@ -85,10 +86,30 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
                                 WebKitWebPolicyDecision *policy_decision,
                                 wxWebViewWebKit *webKitCtrl)
 {
+    const gchar* uri = webkit_network_request_get_uri(request);
+    wxString target = webkit_web_frame_get_name (frame);
+    
+    //If m_creating is true then we are the result of a new window
+    //and so we need to send the event and veto the load
+    if(webKitCtrl->m_creating)
+    {
+        webKitCtrl->m_creating = false;
+        wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
+                             webKitCtrl->GetId(),
+                             wxString(uri, wxConvUTF8),
+                             target);
+
+        if(webKitCtrl && webKitCtrl->GetEventHandler())
+            webKitCtrl->GetEventHandler()->ProcessEvent(event);
+        
+        webkit_web_policy_decision_ignore(policy_decision);
+        return TRUE;
+    }
+
     if(webKitCtrl->m_guard)
     {
         webKitCtrl->m_guard = false;
-        //We set this to make sure that we don't try to load the page again from 
+        //We set this to make sure that we don't try to load the page again from
         //the resource request callback
         webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
         webkit_web_policy_decision_use(policy_decision);
@@ -97,10 +118,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
 
     webKitCtrl->m_busy = true;
 
-    const gchar* uri = webkit_network_request_get_uri(request);
-
-    wxString target = webkit_web_frame_get_name (frame);
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
                          webKitCtrl->GetId(),
                          wxString( uri, wxConvUTF8 ),
                          target);
@@ -128,7 +146,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
                 handler = (*it);
             }
         }
-        //If we found a handler we can then use it to load the file directly 
+        //If we found a handler we can then use it to load the file directly
         //ourselves
         if(handler)
         {
@@ -154,7 +172,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
                            wxWebViewWebKit* webKitWindow)
 {
     webKitWindow->m_busy = false;
-    wxWebViewNavigationError type = wxWEB_NAV_ERR_OTHER;
+    wxWebViewNavigationError type = wxWEBVIEW_NAV_ERR_OTHER;
 
     GError* error = (GError*)web_error;
     wxString description(error->message, wxConvUTF8);
@@ -164,12 +182,12 @@ wxgtk_webview_webkit_error(WebKitWebView*,
         switch (error->code)
         {
             case SOUP_STATUS_CANCELLED:
-                type = wxWEB_NAV_ERR_USER_CANCELLED;
+                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                 break;
 
             case SOUP_STATUS_CANT_RESOLVE:
             case SOUP_STATUS_NOT_FOUND:
-                type = wxWEB_NAV_ERR_NOT_FOUND;
+                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
                 break;
 
             case SOUP_STATUS_CANT_RESOLVE_PROXY:
@@ -177,54 +195,54 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             case SOUP_STATUS_CANT_CONNECT_PROXY:
             case SOUP_STATUS_SSL_FAILED:
             case SOUP_STATUS_IO_ERROR:
-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;
                 break;
 
             case SOUP_STATUS_MALFORMED:
             //case SOUP_STATUS_TOO_MANY_REDIRECTS:
-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             //case SOUP_STATUS_NO_CONTENT:
             //case SOUP_STATUS_RESET_CONTENT:
 
             case SOUP_STATUS_BAD_REQUEST:
-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             case SOUP_STATUS_UNAUTHORIZED:
             case SOUP_STATUS_FORBIDDEN:
-                type = wxWEB_NAV_ERR_AUTH;
+                type = wxWEBVIEW_NAV_ERR_AUTH;
                 break;
 
             case SOUP_STATUS_METHOD_NOT_ALLOWED:
             case SOUP_STATUS_NOT_ACCEPTABLE:
-                type = wxWEB_NAV_ERR_SECURITY;
+                type = wxWEBVIEW_NAV_ERR_SECURITY;
                 break;
 
             case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED:
-                type = wxWEB_NAV_ERR_AUTH;
+                type = wxWEBVIEW_NAV_ERR_AUTH;
                 break;
 
             case SOUP_STATUS_REQUEST_TIMEOUT:
-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;
                 break;
 
             //case SOUP_STATUS_PAYMENT_REQUIRED:
             case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE:
             case SOUP_STATUS_REQUEST_URI_TOO_LONG:
             case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE:
-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             case SOUP_STATUS_BAD_GATEWAY:
             case SOUP_STATUS_SERVICE_UNAVAILABLE:
             case SOUP_STATUS_GATEWAY_TIMEOUT:
-                type = wxWEB_NAV_ERR_CONNECTION;
+                type = wxWEBVIEW_NAV_ERR_CONNECTION;
                 break;
 
             case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED:
-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
             //case SOUP_STATUS_INSUFFICIENT_STORAGE:
             //case SOUP_STATUS_NOT_EXTENDED:
@@ -239,15 +257,15 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             //WEBKIT_NETWORK_ERROR_TRANSPORT:
 
             case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
-                type = wxWEB_NAV_ERR_REQUEST;
+                type = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             case WEBKIT_NETWORK_ERROR_CANCELLED:
-                type = wxWEB_NAV_ERR_USER_CANCELLED;
+                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                 break;
 
             case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
-                type = wxWEB_NAV_ERR_NOT_FOUND;
+                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
                 break;
         }
     }
@@ -261,7 +279,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
             //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL:
             //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
             case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
-                type = wxWEB_NAV_ERR_SECURITY;
+                type = wxWEBVIEW_NAV_ERR_SECURITY;
                 break;
         }
     }
@@ -273,7 +291,7 @@ wxgtk_webview_webkit_error(WebKitWebView*,
     }
     */
 
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+    wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
                          webKitWindow->GetId(),
                          uri, "");
     event.SetString(description);
@@ -298,7 +316,7 @@ wxgtk_webview_webkit_new_window(WebKitWebView*,
     const gchar* uri = webkit_network_request_get_uri(request);
 
     wxString target = webkit_web_frame_get_name (frame);
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                                        webKitCtrl->GetId(),
                                        wxString( uri, wxConvUTF8 ),
                                        target);
@@ -317,7 +335,7 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
                                    gchar *title,
                                    wxWebViewWebKit *webKitCtrl)
 {
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+    wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
                          webKitCtrl->GetId(),
                          webKitCtrl->GetCurrentURL(),
                          "");
@@ -337,10 +355,10 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
                                   wxWebViewWebKit *webKitCtrl)
 {
     wxString uri = webkit_network_request_get_uri(request);
-    
+
     wxSharedPtr<wxWebViewHandler> handler;
     wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
-    
+
     //We are not vetoed so see if we match one of the additional handlers
     for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
         it != hanlders.end(); ++it)
@@ -350,7 +368,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
             handler = (*it);
         }
     }
-    //If we found a handler we can then use it to load the file directly 
+    //If we found a handler we can then use it to load the file directly
     //ourselves
     if(handler)
     {
@@ -373,10 +391,38 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
             //Then we can redirect the call
             webkit_network_request_set_uri(request, path.utf8_str());
         }
-        
+
     }
 }
 
+#if WEBKIT_CHECK_VERSION(1, 10, 0)
+
+static gboolean
+wxgtk_webview_webkit_context_menu(WebKitWebView *,
+                                  GtkWidget *,
+                                  WebKitHitTestResult *,
+                                  gboolean,
+                                  wxWebViewWebKit *webKitCtrl)
+{
+    if(webKitCtrl->IsContextMenuEnabled())
+        return FALSE;
+    else
+        return TRUE;
+}
+
+#endif
+
+static WebKitWebView*
+wxgtk_webview_webkit_create_webview(WebKitWebView *web_view,
+                                    WebKitWebFrame*,
+                                    wxWebViewWebKit *webKitCtrl)
+{
+    //As we do not know the uri being loaded at this point allow the load to
+    //continue and catch it in navigation-policy-decision-requested
+    webKitCtrl->m_creating = true;
+    return web_view;
+}
+
 } // extern "C"
 
 //-----------------------------------------------------------------------------
@@ -385,6 +431,11 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
 
+wxWebViewWebKit::wxWebViewWebKit()
+{
+    m_web_view = NULL;
+}
+
 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxString &url,
@@ -395,6 +446,12 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 {
     m_busy = false;
     m_guard = false;
+    m_creating = false;
+    FindClear();
+
+    // We currently unconditionally impose scrolling in both directions as it's
+    // necessary to show arbitrary pages.
+    style |= wxHSCROLL | wxVSCROLL;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
@@ -403,18 +460,14 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
         return false;
     }
 
-    m_widget = gtk_scrolled_window_new(NULL, NULL);
-    g_object_ref(m_widget);
     m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
-
-    /* Place the WebKitWebView in the GtkScrolledWindow */
-    gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_web_view));
-    gtk_widget_show(GTK_WIDGET(m_web_view));
+    GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view));
+    g_object_ref(m_widget);
 
     g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
                            G_CALLBACK(wxgtk_webview_webkit_navigation),
                            this);
-    g_signal_connect_after(m_web_view, "load-error", 
+    g_signal_connect_after(m_web_view, "load-error",
                            G_CALLBACK(wxgtk_webview_webkit_error),
                            this);
 
@@ -426,6 +479,14 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
     g_signal_connect_after(m_web_view, "resource-request-starting",
                            G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
+      
+#if WEBKIT_CHECK_VERSION(1, 10, 0)    
+     g_signal_connect_after(m_web_view, "context-menu",
+                           G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
+#endif
+     
+     g_signal_connect_after(m_web_view, "create-web-view",
+                           G_CALLBACK(wxgtk_webview_webkit_create_webview), this);
 
     m_parent->DoAddChild( this );
 
@@ -447,12 +508,18 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     return true;
 }
 
+wxWebViewWebKit::~wxWebViewWebKit()
+{
+    if (m_web_view)
+        GTKDisconnect(m_web_view);
+}
+
 bool wxWebViewWebKit::Enable( bool enable )
 {
     if (!wxControl::Enable(enable))
         return false;
 
-    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);
 
     //if (enable)
     //    GTKFixSensitivity();
@@ -494,7 +561,7 @@ void wxWebViewWebKit::Stop()
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
 {
-    if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+    if (flags & wxWEBVIEW_RELOAD_NO_CACHE)
     {
         webkit_web_view_reload_bypass_cache(m_web_view);
     }
@@ -555,10 +622,10 @@ void wxWebViewWebKit::EnableHistory(bool enable)
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
 {
-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);
-    GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, 
+    GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history,
                                                                         m_historyLimit);
     //We need to iterate in reverse to get the order we desire
     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
@@ -576,10 +643,10 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory
 
 wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
 {
-    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(m_web_view);
-    GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, 
+    GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history,
                                                                            m_historyLimit);
     for(guint i = 0; i < g_list_length(list); i++)
     {
@@ -599,7 +666,7 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
     WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
     if(gtkitem)
     {
-        webkit_web_view_go_to_back_forward_item(m_web_view, 
+        webkit_web_view_go_to_back_forward_item(m_web_view,
                                                 WEBKIT_WEB_HISTORY_ITEM(gtkitem));
     }
 }
@@ -687,28 +754,28 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.65)
     {
-        return wxWEB_VIEW_ZOOM_TINY;
+        return wxWEBVIEW_ZOOM_TINY;
     }
     else if (zoom > 0.65 && zoom <= 0.90)
     {
-        return wxWEB_VIEW_ZOOM_SMALL;
+        return wxWEBVIEW_ZOOM_SMALL;
     }
     else if (zoom > 0.90 && zoom <= 1.15)
     {
-        return wxWEB_VIEW_ZOOM_MEDIUM;
+        return wxWEBVIEW_ZOOM_MEDIUM;
     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {
-        return wxWEB_VIEW_ZOOM_LARGE;
+        return wxWEBVIEW_ZOOM_LARGE;
     }
     else if (zoom > 1.45)
     {
-        return wxWEB_VIEW_ZOOM_LARGEST;
+        return wxWEBVIEW_ZOOM_LARGEST;
     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);
-    return wxWEB_VIEW_ZOOM_MEDIUM;
+    return wxWEBVIEW_ZOOM_MEDIUM;
 }
 
 
@@ -717,23 +784,23 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)
     {
-        case wxWEB_VIEW_ZOOM_TINY:
+        case wxWEBVIEW_ZOOM_TINY:
             SetWebkitZoom(0.6f);
             break;
 
-        case wxWEB_VIEW_ZOOM_SMALL:
+        case wxWEBVIEW_ZOOM_SMALL:
             SetWebkitZoom(0.8f);
             break;
 
-        case wxWEB_VIEW_ZOOM_MEDIUM:
+        case wxWEBVIEW_ZOOM_MEDIUM:
             SetWebkitZoom(1.0f);
             break;
 
-        case wxWEB_VIEW_ZOOM_LARGE:
+        case wxWEBVIEW_ZOOM_LARGE:
             SetWebkitZoom(1.3);
             break;
 
-        case wxWEB_VIEW_ZOOM_LARGEST:
+        case wxWEBVIEW_ZOOM_LARGEST:
             SetWebkitZoom(1.6);
             break;
 
@@ -745,7 +812,7 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
 void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)
 {
     webkit_web_view_set_full_content_zoom(m_web_view,
-                                          (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ?
+                                          (type == wxWEBVIEW_ZOOM_TYPE_LAYOUT ?
                                           TRUE : FALSE));
 }
 
@@ -753,8 +820,8 @@ wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
 {
     gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view);
 
-    if (fczoom) return wxWEB_VIEW_ZOOM_TYPE_LAYOUT;
-    else        return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    if (fczoom) return wxWEBVIEW_ZOOM_TYPE_LAYOUT;
+    else        return wxWEBVIEW_ZOOM_TYPE_TEXT;
 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
@@ -763,7 +830,7 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
     return true;
 }
 
-void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri)
+void wxWebViewWebKit::DoSetPage(const wxString& html, const wxString& baseUri)
 {
     webkit_web_view_load_string (m_web_view,
                                  html.mb_str(wxConvUTF8),
@@ -839,7 +906,7 @@ void wxWebViewWebKit::SelectAll()
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {
-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;
@@ -847,15 +914,15 @@ wxString wxWebViewWebKit::GetSelectedText() const
     doc = webkit_web_view_get_dom_document(m_web_view);
     win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
     sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
-    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), 
+    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
                                                   0, NULL);
-    return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), 
+    return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)),
                     wxConvUTF8);
 }
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {
-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
     WebKitDOMRange* range;
@@ -866,7 +933,7 @@ wxString wxWebViewWebKit::GetSelectedSource() const
     doc = webkit_web_view_get_dom_document(m_web_view);
     win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
     sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
-    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), 
+    range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
                                                   0, NULL);
     div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL);
 
@@ -874,13 +941,13 @@ wxString wxWebViewWebKit::GetSelectedSource() const
     webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL);
     html = (WebKitDOMHTMLElement*)div;
 
-    return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)), 
+    return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)),
                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::ClearSelection()
 {
-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;
     WebKitDOMDOMWindow* win;
     WebKitDOMDOMSelection* sel;
 
@@ -893,18 +960,18 @@ void wxWebViewWebKit::ClearSelection()
 
 wxString wxWebViewWebKit::GetPageText() const
 {
-    WebKitDOMDocument* doc; 
+    WebKitDOMDocument* doc;
     WebKitDOMHTMLElement* body;
 
     doc = webkit_web_view_get_dom_document(m_web_view);
     body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
-    return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)), 
+    return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)),
                     wxConvUTF8);
 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)
 {
-    webkit_web_view_execute_script(m_web_view, 
+    webkit_web_view_execute_script(m_web_view,
                                    javascript.mb_str(wxConvUTF8));
 }
 
@@ -913,11 +980,94 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
     m_handlerList.push_back(handler);
 }
 
+void wxWebViewWebKit::EnableContextMenu(bool enable)
+{
+#if !WEBKIT_CHECK_VERSION(1, 10, 0) //If we are using an older version
+    g_object_set(webkit_web_view_get_settings(m_web_view), 
+                 "enable-default-context-menu", enable, NULL);
+#endif
+    wxWebView::EnableContextMenu(enable);
+}
+
+long wxWebViewWebKit::Find(const wxString& text, int flags)
+{
+    bool newSearch = false;
+    if(text != m_findText || 
+       (flags & wxWEBVIEW_FIND_MATCH_CASE) != (m_findFlags & wxWEBVIEW_FIND_MATCH_CASE))
+    {
+        newSearch = true;
+        //If it is a new search we need to clear existing highlights
+        webkit_web_view_unmark_text_matches(m_web_view);
+        webkit_web_view_set_highlight_text_matches(m_web_view, false);
+    }
+
+    m_findFlags = flags;
+    m_findText = text;
+
+    //If the search string is empty then we clear any selection and highlight
+    if(text == "")
+    {
+        webkit_web_view_unmark_text_matches(m_web_view);
+        webkit_web_view_set_highlight_text_matches(m_web_view, false);
+        ClearSelection();
+        return wxNOT_FOUND;
+    }
+
+    bool wrap = false, matchCase = false, forward = true;
+    if(flags & wxWEBVIEW_FIND_WRAP)
+        wrap = true;
+    if(flags & wxWEBVIEW_FIND_MATCH_CASE)
+        matchCase = true;
+    if(flags & wxWEBVIEW_FIND_BACKWARDS)
+        forward = false;
+
+    if(newSearch)
+    {
+        //Initially we mark the matches to know how many we have
+        m_findCount = webkit_web_view_mark_text_matches(m_web_view, wxGTK_CONV(text), matchCase, 0);
+        //In this case we return early to match IE behaviour
+        m_findPosition = -1;
+        return m_findCount;
+    }
+    else
+    {
+        if(forward)
+            m_findPosition++;
+        else
+            m_findPosition--;
+        if(m_findPosition < 0)
+            m_findPosition += m_findCount;
+        if(m_findPosition > m_findCount)
+            m_findPosition -= m_findCount;
+    }
+
+    //Highlight them if needed
+    bool highlight = flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT ? true : false;
+    webkit_web_view_set_highlight_text_matches(m_web_view, highlight);     
+
+    if(!webkit_web_view_search_text(m_web_view, wxGTK_CONV(text), matchCase, forward, wrap))
+    {
+        m_findPosition = -1;
+        ClearSelection();
+        return wxNOT_FOUND;
+    }
+    wxLogMessage(wxString::Format("Returning %d", m_findPosition));
+    return newSearch ? m_findCount : m_findPosition;
+}
+
+void wxWebViewWebKit::FindClear()
+{
+    m_findCount = 0;
+    m_findFlags = 0;
+    m_findText = "";
+    m_findPosition = -1;
+}
+
 // static
 wxVisualAttributes
 wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-     return GetDefaultAttributesFromGTKWidget(webkit_web_view_new);
+     return GetDefaultAttributesFromGTKWidget(webkit_web_view_new());
 }
 
 
diff --git a/Externals/wxWidgets3/src/gtk/win_gtk.cpp b/Externals/wxWidgets3/src/gtk/win_gtk.cpp
index 84e6aaf41e..538305505d 100644
--- a/Externals/wxWidgets3/src/gtk/win_gtk.cpp
+++ b/Externals/wxWidgets3/src/gtk/win_gtk.cpp
@@ -2,15 +2,20 @@
 // Name:        src/gtk/win_gtk.cpp
 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Paul Cornett
-// Id:          $Id: win_gtk.cpp 70482 2012-01-31 07:30:11Z PC $
 // Copyright:   (c) 2007 Paul Cornett
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
-#include "wx/gtk/private.h"
+
+#include <gtk/gtk.h>
 #include "wx/gtk/private/win_gtk.h"
 
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget
 is needed to adapt GTK+ to wxWidgets needs in 3 areas: scrolling, window
@@ -27,30 +32,48 @@ drawn on wxPizza's parent GdkWindow.
 For RTL, child widget positions are mirrored in size_allocate.
 */
 
+struct wxPizzaChild
+{
+    GtkWidget* widget;
+    int x, y, width, height;
+};
+
 static GtkWidgetClass* parent_class;
 
+#ifdef __WXGTK3__
+enum {
+    PROP_0,
+    PROP_HADJUSTMENT,
+    PROP_VADJUSTMENT,
+    PROP_HSCROLL_POLICY,
+    PROP_VSCROLL_POLICY
+};
+#endif
+
 extern "C" {
 
 struct wxPizzaClass
 {
     GtkFixedClass parent;
+#ifndef __WXGTK3__
     void (*set_scroll_adjustments)(GtkWidget*, GtkAdjustment*, GtkAdjustment*);
+#endif
 };
 
-static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
+static void pizza_size_allocate(GtkWidget* widget, GtkAllocation* alloc)
 {
     wxPizza* pizza = WX_PIZZA(widget);
-    int border_x, border_y;
-    pizza->get_border_widths(border_x, border_y);
-    int w = alloc->width - 2 * border_x;
+    GtkBorder border;
+    pizza->get_border(border);
+    int w = alloc->width - border.left - border.right;
     if (w < 0) w = 0;
 
     if (gtk_widget_get_realized(widget))
     {
-        int h = alloc->height - 2 * border_y;
+        int h = alloc->height - border.top - border.bottom;
         if (h < 0) h = 0;
-        const int x = alloc->x + border_x;
-        const int y = alloc->y + border_y;
+        const int x = alloc->x + border.left;
+        const int y = alloc->y + border.top;
 
         GdkWindow* window = gtk_widget_get_window(widget);
         int old_x, old_y;
@@ -61,23 +84,25 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
         {
             gdk_window_move_resize(window, x, y, w, h);
 
-            if (border_x + border_y)
+            if (border.left + border.right + border.top + border.bottom)
             {
                 // old and new border areas need to be invalidated,
                 // otherwise they will not be erased/redrawn properly
+                GtkAllocation old_alloc;
+                gtk_widget_get_allocation(widget, &old_alloc);
                 GdkWindow* parent = gtk_widget_get_parent_window(widget);
-                gdk_window_invalidate_rect(parent, &widget->allocation, false);
+                gdk_window_invalidate_rect(parent, &old_alloc, false);
                 gdk_window_invalidate_rect(parent, alloc, false);
             }
         }
     }
 
-    widget->allocation = *alloc;
+    gtk_widget_set_allocation(widget, alloc);
 
     // adjust child positions
-    for (const GList* list = pizza->m_fixed.children; list; list = list->next)
+    for (const GList* p = pizza->m_children; p; p = p->next)
     {
-        const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
+        const wxPizzaChild* child = static_cast<wxPizzaChild*>(p->data);
         if (gtk_widget_get_visible(child->widget))
         {
             GtkAllocation child_alloc;
@@ -86,10 +111,8 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
             // which has already been adjusted
             child_alloc.x = child->x - pizza->m_scroll_x;
             child_alloc.y = child->y - pizza->m_scroll_y;
-            GtkRequisition req;
-            gtk_widget_get_child_requisition(child->widget, &req);
-            child_alloc.width  = req.width;
-            child_alloc.height = req.height;
+            child_alloc.width  = child->width;
+            child_alloc.height = child->height;
             if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
                 child_alloc.x = w - child_alloc.x - child_alloc.width;
             gtk_widget_size_allocate(child->widget, &child_alloc);
@@ -97,51 +120,106 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
     }
 }
 
-static void realize(GtkWidget* widget)
+static void pizza_realize(GtkWidget* widget)
 {
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_border_style)
+    if (pizza->m_windowStyle & wxPizza::BORDER_STYLES)
     {
-        int border_x, border_y;
-        pizza->get_border_widths(border_x, border_y);
-        int x = widget->allocation.x + border_x;
-        int y = widget->allocation.y + border_y;
-        int w = widget->allocation.width  - 2 * border_x;
-        int h = widget->allocation.height - 2 * border_y;
+        GtkBorder border;
+        pizza->get_border(border);
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        int x = a.x + border.left;
+        int y = a.y + border.top;
+        int w = a.width - border.left - border.right;
+        int h = a.height - border.top - border.bottom;
         if (w < 0) w = 0;
         if (h < 0) h = 0;
-        gdk_window_move_resize(widget->window, x, y, w, h);
+        gdk_window_move_resize(gtk_widget_get_window(widget), x, y, w, h);
     }
 }
 
-static void show(GtkWidget* widget)
+static void pizza_show(GtkWidget* widget)
 {
-    if (widget->parent && WX_PIZZA(widget)->m_border_style)
+    GtkWidget* parent = gtk_widget_get_parent(widget);
+    if (parent && (WX_PIZZA(widget)->m_windowStyle & wxPizza::BORDER_STYLES))
     {
         // invalidate whole allocation so borders will be drawn properly
-        const GtkAllocation& a = widget->allocation;
-        gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height);
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        gtk_widget_queue_draw_area(parent, a.x, a.y, a.width, a.height);
     }
 
     parent_class->show(widget);
 }
 
-static void hide(GtkWidget* widget)
+static void pizza_hide(GtkWidget* widget)
 {
-    if (widget->parent && WX_PIZZA(widget)->m_border_style)
+    GtkWidget* parent = gtk_widget_get_parent(widget);
+    if (parent && (WX_PIZZA(widget)->m_windowStyle & wxPizza::BORDER_STYLES))
     {
         // invalidate whole allocation so borders will be erased properly
-        const GtkAllocation& a = widget->allocation;
-        gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height);
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        gtk_widget_queue_draw_area(parent, a.x, a.y, a.width, a.height);
     }
 
     parent_class->hide(widget);
 }
 
+static void pizza_add(GtkContainer* container, GtkWidget* widget)
+{
+    WX_PIZZA(container)->put(widget, 0, 0, 1, 1);
+}
+
+static void pizza_remove(GtkContainer* container, GtkWidget* widget)
+{
+    GTK_CONTAINER_CLASS(parent_class)->remove(container, widget);
+
+    wxPizza* pizza = WX_PIZZA(container);
+    for (GList* p = pizza->m_children; p; p = p->next)
+    {
+        wxPizzaChild* child = static_cast<wxPizzaChild*>(p->data);
+        if (child->widget == widget)
+        {
+            pizza->m_children = g_list_delete_link(pizza->m_children, p);
+            delete child;
+            break;
+        }
+    }
+}
+
+#ifdef __WXGTK3__
+static void pizza_get_preferred_width(GtkWidget* widget, int* minimum, int* natural)
+{
+    *minimum = 0;
+    gtk_widget_get_size_request(widget, natural, NULL);
+    if (*natural < 0)
+        *natural = 0;
+}
+
+static void pizza_get_preferred_height(GtkWidget* widget, int* minimum, int* natural)
+{
+    *minimum = 0;
+    gtk_widget_get_size_request(widget, NULL, natural);
+    if (*natural < 0)
+        *natural = 0;
+}
+
+// Needed to implement GtkScrollable interface, but we don't care about the
+// properties. wxWindowGTK handles the adjustments and scroll policy.
+static void pizza_get_property(GObject*, guint, GValue*, GParamSpec*)
+{
+}
+
+static void pizza_set_property(GObject*, guint, const GValue*, GParamSpec*)
+{
+}
+#else
 // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
-static void set_scroll_adjustments(GtkWidget*, GtkAdjustment*, GtkAdjustment*)
+static void pizza_set_scroll_adjustments(GtkWidget*, GtkAdjustment*, GtkAdjustment*)
 {
 }
 
@@ -183,18 +261,33 @@ g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
             g_marshal_value_peek_object (param_values + 2),
             data2);
 }
+#endif
 
 static void class_init(void* g_class, void*)
 {
     GtkWidgetClass* widget_class = (GtkWidgetClass*)g_class;
-    widget_class->size_allocate = size_allocate;
-    widget_class->realize = realize;
-    widget_class->show = show;
-    widget_class->hide = hide;
-    wxPizzaClass* klass = (wxPizzaClass*)g_class;
+    widget_class->size_allocate = pizza_size_allocate;
+    widget_class->realize = pizza_realize;
+    widget_class->show = pizza_show;
+    widget_class->hide = pizza_hide;
+    GtkContainerClass* container_class = (GtkContainerClass*)g_class;
+    container_class->add = pizza_add;
+    container_class->remove = pizza_remove;
 
+#ifdef __WXGTK3__
+    widget_class->get_preferred_width = pizza_get_preferred_width;
+    widget_class->get_preferred_height = pizza_get_preferred_height;
+    GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
+    gobject_class->set_property = pizza_set_property;
+    gobject_class->get_property = pizza_get_property;
+    g_object_class_override_property(gobject_class, PROP_HADJUSTMENT, "hadjustment");
+    g_object_class_override_property(gobject_class, PROP_VADJUSTMENT, "vadjustment");
+    g_object_class_override_property(gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+    g_object_class_override_property(gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+#else
+    wxPizzaClass* klass = static_cast<wxPizzaClass*>(g_class);
     // needed to make widget appear scrollable to GTK+
-    klass->set_scroll_adjustments = set_scroll_adjustments;
+    klass->set_scroll_adjustments = pizza_set_scroll_adjustments;
     widget_class->set_scroll_adjustments_signal =
         g_signal_new(
             "set_scroll_adjustments",
@@ -204,7 +297,7 @@ static void class_init(void* g_class, void*)
             NULL, NULL,
             g_cclosure_user_marshal_VOID__OBJECT_OBJECT,
             G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
+#endif
     parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(g_class));
 }
 
@@ -212,7 +305,7 @@ static void class_init(void* g_class, void*)
 
 GType wxPizza::type()
 {
-    static GtkType type;
+    static GType type;
     if (type == 0)
     {
         const GTypeInfo info = {
@@ -225,6 +318,10 @@ GType wxPizza::type()
         };
         type = g_type_register_static(
             GTK_TYPE_FIXED, "wxPizza", &info, GTypeFlags(0));
+#ifdef __WXGTK3__
+        const GInterfaceInfo interface_info = { NULL, NULL, NULL };
+        g_type_add_interface_static(type, GTK_TYPE_SCROLLABLE, &interface_info);
+#endif
     }
     return type;
 }
@@ -233,12 +330,11 @@ GtkWidget* wxPizza::New(long windowStyle)
 {
     GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
     wxPizza* pizza = WX_PIZZA(widget);
+    pizza->m_children = NULL;
     pizza->m_scroll_x = 0;
     pizza->m_scroll_y = 0;
-    pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;
-    // mask off border styles not useable with wxPizza
-    pizza->m_border_style = int(windowStyle & BORDER_STYLES);
-#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED)
+    pizza->m_windowStyle = windowStyle;
+#ifdef __WXGTK3__
     gtk_widget_set_has_window(widget, true);
 #else
     gtk_fixed_set_has_window(GTK_FIXED(widget), true);
@@ -262,26 +358,42 @@ GtkWidget* wxPizza::New(long windowStyle)
     return widget;
 }
 
-// gtk_fixed_move does not check for a change before issuing a queue_resize,
-// we need to avoid that to prevent endless sizing loops, so check first
-void wxPizza::move(GtkWidget* widget, int x, int y)
+void wxPizza::move(GtkWidget* widget, int x, int y, int width, int height)
 {
-    GtkFixed* fixed = &m_fixed;
-    for (const GList* list = fixed->children; list; list = list->next)
+    for (const GList* p = m_children; p; p = p->next)
     {
-        const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
+        wxPizzaChild* child = static_cast<wxPizzaChild*>(p->data);
         if (child->widget == widget)
         {
-            if (child->x != x || child->y != y)
-                gtk_fixed_move(fixed, widget, x, y);
+            child->x = x;
+            child->y = y;
+            child->width = width;
+            child->height = height;
+            // normally a queue-resize would be needed here, but we know
+            // wxWindowGTK::DoMoveWindow() will take care of it
             break;
         }
     }
 }
 
-void wxPizza::put(GtkWidget* widget, int x, int y)
+void wxPizza::put(GtkWidget* widget, int x, int y, int width, int height)
 {
-    gtk_fixed_put(&m_fixed, widget, x, y);
+    // Re-parenting a TLW under a child window is possible at wx level but
+    // using a TLW as child at GTK+ level results in problems, so don't do it.
+#if GTK_CHECK_VERSION(2,19,3)
+    if (!gtk_widget_is_toplevel(GTK_WIDGET(widget)))
+#else
+    if (!GTK_WIDGET_TOPLEVEL(GTK_WIDGET(widget)))
+#endif
+        gtk_fixed_put(GTK_FIXED(this), widget, 0, 0);
+
+    wxPizzaChild* child = new wxPizzaChild;
+    child->widget = widget;
+    child->x = x;
+    child->y = y;
+    child->width = width;
+    child->height = height;
+    m_children = g_list_append(m_children, child);
 }
 
 struct AdjustData {
@@ -294,10 +406,13 @@ extern "C" {
 static void scroll_adjust(GtkWidget* widget, void* data)
 {
     const AdjustData* p = static_cast<AdjustData*>(data);
-    widget->allocation.x += p->dx;
-    widget->allocation.y += p->dy;
+    GtkAllocation a;
+    gtk_widget_get_allocation(widget, &a);
+    a.x += p->dx;
+    a.y += p->dy;
+    gtk_widget_set_allocation(widget, &a);
 
-    if (widget->window == p->window)
+    if (gtk_widget_get_window(widget) == p->window)
     {
         // GtkFrame requires a queue_resize, otherwise parts of
         // the frame newly exposed by the scroll are not drawn.
@@ -316,44 +431,46 @@ void wxPizza::scroll(int dx, int dy)
         dx = -dx;
     m_scroll_x -= dx;
     m_scroll_y -= dy;
-    if (widget->window)
+    GdkWindow* window = gtk_widget_get_window(widget);
+    if (window)
     {
-        gdk_window_scroll(widget->window, dx, dy);
+        gdk_window_scroll(window, dx, dy);
         // Adjust child allocations. Doing a queue_resize on the children is not
         // enough, sometimes they redraw in the wrong place during fast scrolling.
-        AdjustData data = { widget->window, dx, dy };
+        AdjustData data = { window, dx, dy };
         gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);
     }
 }
 
-void wxPizza::get_border_widths(int& x, int& y)
+void wxPizza::get_border(GtkBorder& border)
 {
-    x = y = 0;
-    if (m_border_style == 0)
-        return;
-
 #ifndef __WXUNIVERSAL__
-    if (m_border_style & wxBORDER_SIMPLE)
-        x = y = 1;
-    else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */)
+    if (m_windowStyle & wxBORDER_SIMPLE)
+        border.left = border.right = border.top = border.bottom = 1;
+    else if (m_windowStyle & (wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME))
     {
-        GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
+#ifdef __WXGTK3__
+        GtkStyleContext* sc;
+        if (m_windowStyle & (wxHSCROLL | wxVSCROLL))
+            sc = gtk_widget_get_style_context(wxGTKPrivate::GetTreeWidget());
+        else
+            sc = gtk_widget_get_style_context(wxGTKPrivate::GetEntryWidget());
 
-        if (style_widget->style)
-        {
-            x = style_widget->style->xthickness;
-            y = style_widget->style->ythickness;
-        }
+        gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);
+#else // !__WXGTK3__
+        GtkStyle* style;
+        if (m_windowStyle & (wxHSCROLL | wxVSCROLL))
+            style = gtk_widget_get_style(wxGTKPrivate::GetTreeWidget());
+        else
+            style = gtk_widget_get_style(wxGTKPrivate::GetEntryWidget());
+
+        border.left = border.right = style->xthickness;
+        border.top = border.bottom = style->ythickness;
+#endif // !__WXGTK3__
     }
     else
+#endif // !__WXUNIVERSAL__
     {
-        GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
-
-        if (style_widget->style)
-        {
-            x = style_widget->style->xthickness;
-            y = style_widget->style->ythickness;
-        }
+        border.left = border.right = border.top = border.bottom = 0;
     }
-#endif
 }
diff --git a/Externals/wxWidgets3/src/gtk/window.cpp b/Externals/wxWidgets3/src/gtk/window.cpp
index 3ac730cad6..a16743410f 100644
--- a/Externals/wxWidgets3/src/gtk/window.cpp
+++ b/Externals/wxWidgets3/src/gtk/window.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/window.cpp
 // Purpose:     wxWindowGTK implementation
 // Author:      Robert Roebling
-// Id:          $Id: window.cpp 70734 2012-02-28 05:29:35Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,24 +30,30 @@
 #include "wx/tooltip.h"
 #include "wx/caret.h"
 #include "wx/fontutil.h"
-#include "wx/scopeguard.h"
 #include "wx/sysopt.h"
+#ifdef __WXGTK3__
+    #include "wx/gtk/dc.h"
+#endif
 
 #include <ctype.h>
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/win_gtk.h"
+#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/event.h"
+#include "wx/gtk/private/win_gtk.h"
+#include "wx/private/textmeasure.h"
 using namespace wxGTKImpl;
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#include "wx/x11/private/wrapxkb.h"
 #else
 typedef guint KeySym;
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#ifdef __WXGTK3__
 #include <gdk/gdkkeysyms-compat.h>
 #endif
 
@@ -221,58 +226,59 @@ int          g_lastButtonNumber = 0;
 // the trace mask used for the focus debugging messages
 #define TRACE_FOCUS wxT("focus")
 
-//-----------------------------------------------------------------------------
-// "size_request" of m_widget
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void
-wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
-                                   GtkRequisition *requisition,
-                                   wxWindow * win)
+// A handy function to run from under gdb to show information about the given
+// GtkWidget. Right now it only shows its type, we could enhance it to show
+// more information later but this is already pretty useful.
+const char* wxDumpGtkWidget(GtkWidget* w)
 {
-    int w, h;
-    win->GetSize( &w, &h );
-    if (w < 2)
-        w = 2;
-    if (h < 2)
-        h = 2;
+    static wxString s;
+    s.Printf("GtkWidget %p, type \"%s\"", w, G_OBJECT_TYPE_NAME(w));
 
-    requisition->height = h;
-    requisition->width = w;
-}
+    return s.c_str();
 }
 
 //-----------------------------------------------------------------------------
-// "expose_event" of m_wxwindow
+// "expose_event"/"draw" from m_wxwindow
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gboolean
-gtk_window_expose_callback( GtkWidget*,
-                            GdkEventExpose *gdk_event,
-                            wxWindow *win )
+#ifdef __WXGTK3__
+static gboolean draw(GtkWidget*, cairo_t* cr, wxWindow* win)
+{
+    if (gtk_cairo_should_draw_window(cr, win->GTKGetDrawingWindow()))
+        win->GTKSendPaintEvents(cr);
+
+    return false;
+}
+#else // !__WXGTK3__
+static gboolean expose_event(GtkWidget*, GdkEventExpose* gdk_event, wxWindow* win)
 {
     if (gdk_event->window == win->GTKGetDrawingWindow())
-    {
-        win->GetUpdateRegion() = wxRegion( gdk_event->region );
-        win->GtkSendPaintEvents();
-    }
-    // Let parent window draw window-less widgets
-    return FALSE;
+        win->GTKSendPaintEvents(gdk_event->region);
+
+    return false;
 }
+#endif // !__WXGTK3__
 }
 
 #ifndef __WXUNIVERSAL__
 //-----------------------------------------------------------------------------
-// "expose_event" from m_wxwindow->parent, for drawing border
+// "expose_event"/"draw" from m_wxwindow->parent, for drawing border
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean
-expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
+#ifdef __WXGTK3__
+draw_border(GtkWidget*, cairo_t* cr, wxWindow* win)
+#else
+draw_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
+#endif
 {
+#ifdef __WXGTK3__
+    if (!gtk_cairo_should_draw_window(cr, gtk_widget_get_parent_window(win->m_wxwindow)))
+#else
     if (gdk_event->window != gtk_widget_get_parent_window(win->m_wxwindow))
+#endif
         return false;
 
     if (!win->IsShown())
@@ -290,30 +296,55 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
 
     if (win->HasFlag(wxBORDER_SIMPLE))
     {
+#ifdef __WXGTK3__
+        GtkStyleContext* sc = gtk_widget_get_style_context(win->m_wxwindow);
+        GdkRGBA c;
+        gtk_style_context_get_border_color(sc, GTK_STATE_FLAG_NORMAL, &c);
+        gdk_cairo_set_source_rgba(cr, &c);
+        cairo_set_line_width(cr, 1);
+        cairo_rectangle(cr, x + 0.5, y + 0.5, w - 1, h - 1);
+        cairo_stroke(cr);
+#else
         gdk_draw_rectangle(gdk_event->window,
             gtk_widget_get_style(widget)->black_gc, false, x, y, w - 1, h - 1);
+#endif
     }
-    else
+    else if (win->HasFlag(wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME))
     {
+#ifdef __WXGTK3__
+        //TODO: wxBORDER_RAISED/wxBORDER_SUNKEN
+        GtkStyleContext* sc;
+        if (win->HasFlag(wxHSCROLL | wxVSCROLL))
+            sc = gtk_widget_get_style_context(wxGTKPrivate::GetTreeWidget());
+        else
+            sc = gtk_widget_get_style_context(wxGTKPrivate::GetEntryWidget());
+
+        gtk_render_frame(sc, cr, x, y, w, h);
+#else // !__WXGTK3__
         GtkShadowType shadow = GTK_SHADOW_IN;
         if (win->HasFlag(wxBORDER_RAISED))
             shadow = GTK_SHADOW_OUT;
 
-        // Style detail to use
+        GtkStyle* style;
         const char* detail;
-        if (win->m_widget == win->m_wxwindow)
-            // for non-scrollable wxWindows
-            detail = "entry";
-        else
-            // for scrollable ones
+        if (win->HasFlag(wxHSCROLL | wxVSCROLL))
+        {
+            style = gtk_widget_get_style(wxGTKPrivate::GetTreeWidget());
             detail = "viewport";
+        }
+        else
+        {
+            style = gtk_widget_get_style(wxGTKPrivate::GetEntryWidget());
+            detail = "entry";
+        }
 
         // clip rect is required to avoid painting background
         // over upper left (w,h) of parent window
         GdkRectangle clipRect = { x, y, w, h };
         gtk_paint_shadow(
-           gtk_widget_get_style(win->m_wxwindow), gdk_event->window, GTK_STATE_NORMAL,
-           shadow, &clipRect, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h);
+           style, gdk_event->window, GTK_STATE_NORMAL,
+           shadow, &clipRect, widget, detail, x, y, w, h);
+#endif // !__WXGTK3__
     }
     return false;
 }
@@ -330,13 +361,16 @@ parent_set(GtkWidget* widget, GtkWidget* old_parent, wxWindow* win)
     if (old_parent)
     {
         g_signal_handlers_disconnect_by_func(
-            old_parent, (void*)expose_event_border, win);
+            old_parent, (void*)draw_border, win);
     }
     GtkWidget* parent = gtk_widget_get_parent(widget);
     if (parent)
     {
-        g_signal_connect_after(parent, "expose_event",
-            G_CALLBACK(expose_event_border), win);
+#ifdef __WXGTK3__
+        g_signal_connect_after(parent, "draw", G_CALLBACK(draw_border), win);
+#else
+        g_signal_connect_after(parent, "expose_event", G_CALLBACK(draw_border), win);
+#endif
     }
 }
 }
@@ -643,6 +677,16 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
     event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0;
 
+    // At least with current Linux systems, MOD5 corresponds to AltGr key and
+    // we represent it, for consistency with Windows, which really allows to
+    // use Ctrl+Alt as a replacement for AltGr if this key is not present, as a
+    // combination of these two modifiers.
+    if ( gdk_event->state & GDK_MOD5_MASK )
+    {
+        event.m_controlDown =
+        event.m_altDown = true;
+    }
+
     // Normally we take the state of modifiers directly from the low level GDK
     // event but unfortunately GDK uses a different convention from MSW for the
     // key events corresponding to the modifier keys themselves: in it, when
@@ -688,8 +732,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
     event.m_rawCode = (wxUint32) gdk_event->keyval;
     event.m_rawFlags = gdk_event->hardware_keycode;
 
-    wxGetMousePosition(&event.m_x, &event.m_y);
-    win->ScreenToClient(&event.m_x, &event.m_y);
     event.SetEventObject( win );
 }
 
@@ -712,10 +754,10 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
 
     KeySym keysym = gdk_event->keyval;
 
-    wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %ld"),
+    wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %lu"),
                event.GetEventType() == wxEVT_KEY_UP ? wxT("release")
                                                     : wxT("press"),
-               keysym);
+               static_cast<unsigned long>(keysym));
 
     long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */);
 
@@ -746,7 +788,11 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
 
             wxLogTrace(TRACE_KEYS, wxT("\t-> keycode %d"), keycode);
 
+#ifdef HAVE_X11_XKBLIB_H
+            KeySym keysymNormalized = XkbKeycodeToKeysym(dpy, keycode, 0, 0);
+#else
             KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0);
+#endif
 
             // use the normalized, i.e. lower register, keysym if we've
             // got one
@@ -795,7 +841,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
     event.m_keyCode = key_code;
 
 #if wxUSE_UNICODE
-    event.m_uniChar = gdk_keyval_to_unicode(key_code ? key_code : keysym);
+    event.m_uniChar = gdk_keyval_to_unicode(key_code);
     if ( !event.m_uniChar && event.m_keyCode <= WXK_DELETE )
     {
         // Set Unicode key code to the ASCII equivalent for compatibility. E.g.
@@ -812,22 +858,6 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
 }
 
 
-struct wxGtkIMData
-{
-    GtkIMContext *context;
-    GdkEventKey  *lastKeyEvent;
-
-    wxGtkIMData()
-    {
-        context = gtk_im_multicontext_new();
-        lastKeyEvent = NULL;
-    }
-    ~wxGtkIMData()
-    {
-        g_object_unref (context);
-    }
-};
-
 namespace
 {
 
@@ -887,17 +917,28 @@ void AdjustCharEventKeyCodes(wxKeyEvent& event)
 
 } // anonymous namespace
 
+// If a widget does not handle a key or mouse event, GTK+ sends it up the
+// parent chain until it is handled. These events are not supposed to propagate
+// in wxWidgets, so this code avoids handling them in any parent wxWindow,
+// while still allowing the event to propagate so things like native keyboard
+// navigation will work.
+#define wxPROCESS_EVENT_ONCE(EventType, event) \
+    static EventType eventPrev; \
+    if (memcmp(&eventPrev, event, sizeof(EventType)) == 0) \
+        return false; \
+    eventPrev = *event
+
 extern "C" {
 static gboolean
 gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
                                GdkEventKey *gdk_event,
                                wxWindow *win )
 {
-    if (!win->m_hasVMT)
-        return FALSE;
     if (g_blockEventsOnDrag)
         return FALSE;
 
+    wxPROCESS_EVENT_ONCE(GdkEventKey, gdk_event);
+
     wxKeyEvent event( wxEVT_KEY_DOWN );
     bool ret = false;
     bool return_after_IM = false;
@@ -911,45 +952,15 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
             return TRUE;
         }
 
-        // Emit KEY_DOWN event
-        ret = win->HandleWindowEvent( event );
-    }
-    else
-    {
-        // Return after IM processing as we cannot do
-        // anything with it anyhow.
-        return_after_IM = true;
-    }
-
-    if (!ret && win->m_imData)
-    {
-        win->m_imData->lastKeyEvent = gdk_event;
-
-        // We should let GTK+ IM filter key event first. According to GTK+ 2.0 API
-        // docs, if IM filter returns true, no further processing should be done.
-        // we should send the key_down event anyway.
-        bool intercepted_by_IM = gtk_im_context_filter_keypress(win->m_imData->context, gdk_event);
-        win->m_imData->lastKeyEvent = NULL;
-        if (intercepted_by_IM)
-        {
-            wxLogTrace(TRACE_KEYS, wxT("Key event intercepted by IM"));
-            return TRUE;
-        }
-    }
-
-    if (return_after_IM)
-        return FALSE;
-
+        // Next check for accelerators.
 #if wxUSE_ACCEL
-    if (!ret)
-    {
         wxWindowGTK *ancestor = win;
         while (ancestor)
         {
             int command = ancestor->GetAcceleratorTable()->GetCommand( event );
             if (command != -1)
             {
-                wxCommandEvent menu_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                wxCommandEvent menu_event( wxEVT_MENU, command );
                 ret = ancestor->HandleWindowEvent( menu_event );
 
                 if ( !ret )
@@ -957,7 +968,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
                     // if the accelerator wasn't handled as menu event, try
                     // it as button click (for compatibility with other
                     // platforms):
-                    wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command );
+                    wxCommandEvent button_event( wxEVT_BUTTON, command );
                     ret = ancestor->HandleWindowEvent( button_event );
                 }
 
@@ -967,17 +978,50 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
                 break;
             ancestor = ancestor->GetParent();
         }
-    }
 #endif // wxUSE_ACCEL
 
+        // If not an accelerator, then emit KEY_DOWN event
+        if ( !ret )
+            ret = win->HandleWindowEvent( event );
+    }
+    else
+    {
+        // Return after IM processing as we cannot do
+        // anything with it anyhow.
+        return_after_IM = true;
+    }
+
+    if ( !ret )
+    {
+        // Indicate that IM handling is in process by setting this pointer
+        // (which will remain valid for all the code called during IM key
+        // handling).
+        win->m_imKeyEvent = gdk_event;
+
+        // We should let GTK+ IM filter key event first. According to GTK+ 2.0 API
+        // docs, if IM filter returns true, no further processing should be done.
+        // we should send the key_down event anyway.
+        const int intercepted_by_IM = win->GTKIMFilterKeypress(gdk_event);
+
+        win->m_imKeyEvent = NULL;
+
+        if ( intercepted_by_IM )
+        {
+            wxLogTrace(TRACE_KEYS, wxT("Key event intercepted by IM"));
+            return TRUE;
+        }
+    }
+
+    if (return_after_IM)
+        return FALSE;
+
     // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
     // will only be sent if it is not in an accelerator table.
     if (!ret)
     {
-        long key_code;
         KeySym keysym = gdk_event->keyval;
         // Find key code for EVT_CHAR and EVT_CHAR_HOOK events
-        key_code = wxTranslateKeySymToWXKey(keysym, true /* isChar */);
+        long key_code = wxTranslateKeySymToWXKey(keysym, true /* isChar */);
         if ( !key_code )
         {
             if ( wxIsAsciiKeysym(keysym) )
@@ -999,6 +1043,9 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
             wxLogTrace(TRACE_KEYS, wxT("Char event: %ld"), key_code);
 
             eventChar.m_keyCode = key_code;
+#if wxUSE_UNICODE
+            eventChar.m_uniChar = gdk_keyval_to_unicode(key_code);
+#endif // wxUSE_UNICODE
 
             AdjustCharEventKeyCodes(eventChar);
 
@@ -1010,30 +1057,43 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
 }
 }
 
+int wxWindowGTK::GTKIMFilterKeypress(GdkEventKey* event) const
+{
+    return m_imContext ? gtk_im_context_filter_keypress(m_imContext, event)
+                       : FALSE;
+}
+
 extern "C" {
 static void
 gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
                         const gchar  *str,
                         wxWindow     *window)
+{
+    // Ignore the return value here, it doesn't matter for the "commit" signal.
+    window->GTKDoInsertTextFromIM(str);
+}
+}
+
+bool wxWindowGTK::GTKDoInsertTextFromIM(const char* str)
 {
     wxKeyEvent event( wxEVT_CHAR );
 
     // take modifiers, cursor position, timestamp etc. from the last
     // key_press_event that was fed into Input Method:
-    if (window->m_imData->lastKeyEvent)
+    if ( m_imKeyEvent )
     {
-        wxFillOtherKeyEventFields(event,
-                                  window, window->m_imData->lastKeyEvent);
+        wxFillOtherKeyEventFields(event, this, m_imKeyEvent);
     }
     else
     {
-        event.SetEventObject( window );
+        event.SetEventObject(this);
     }
 
     const wxString data(wxGTK_CONV_BACK_SYS(str));
     if( data.empty() )
-        return;
+        return false;
 
+    bool processed = false;
     for( wxString::const_iterator pstr = data.begin(); pstr != data.end(); ++pstr )
     {
 #if wxUSE_UNICODE
@@ -1047,9 +1107,22 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
 
         AdjustCharEventKeyCodes(event);
 
-        window->HandleWindowEvent(event);
+        if ( HandleWindowEvent(event) )
+            processed = true;
     }
+
+    return processed;
 }
+
+bool wxWindowGTK::GTKOnInsertText(const char* text)
+{
+    if ( !m_imKeyEvent )
+    {
+        // We're not inside IM key handling at all.
+        return false;
+    }
+
+    return GTKDoInsertTextFromIM(text);
 }
 
 
@@ -1063,12 +1136,11 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget),
                                  GdkEventKey *gdk_event,
                                  wxWindowGTK *win )
 {
-    if (!win->m_hasVMT)
-        return FALSE;
-
     if (g_blockEventsOnDrag)
         return FALSE;
 
+    wxPROCESS_EVENT_ONCE(GdkEventKey, gdk_event);
+
     wxKeyEvent event( wxEVT_KEY_UP );
     if ( !wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
     {
@@ -1080,21 +1152,6 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget),
 }
 }
 
-//-----------------------------------------------------------------------------
-// key and mouse events, after, from m_widget
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static gboolean key_and_mouse_event_after(GtkWidget* widget, GdkEventKey*, wxWindow*)
-{
-    // If a widget does not handle a key or mouse event, GTK+ sends it up the
-    // parent chain until it is handled. These events are not supposed to
-    // propagate in wxWidgets, so prevent it unless widget is in a native
-    // container.
-    return WX_IS_PIZZA(gtk_widget_get_parent(widget));
-}
-}
-
 // ============================================================================
 // the mouse events
 // ============================================================================
@@ -1166,7 +1223,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y)
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while (node)
     {
-        wxWindowGTK *child = node->GetData();
+        wxWindow* child = static_cast<wxWindow*>(node->GetData());
 
         node = node->GetNext();
         if (!child->IsShown())
@@ -1228,13 +1285,11 @@ bool wxWindowGTK::GTKProcessEvent(wxEvent& event) const
 
 bool wxWindowGTK::GTKShouldIgnoreEvent() const
 {
-    return !m_hasVMT || g_blockEventsOnDrag;
+    return g_blockEventsOnDrag;
 }
 
 int wxWindowGTK::GTKCallbackCommonPrologue(GdkEventAny *event) const
 {
-    if (!m_hasVMT)
-        return FALSE;
     if (g_blockEventsOnDrag)
         return TRUE;
     if (g_blockEventsOnScroll)
@@ -1275,148 +1330,89 @@ extern "C"
 //-----------------------------------------------------------------------------
 
 static gboolean
-gtk_window_button_press_callback( GtkWidget *widget,
+gtk_window_button_press_callback( GtkWidget* WXUNUSED_IN_GTK3(widget),
                                   GdkEventButton *gdk_event,
                                   wxWindowGTK *win )
 {
+    wxPROCESS_EVENT_ONCE(GdkEventButton, gdk_event);
+
     wxCOMMON_CALLBACK_PROLOGUE(gdk_event, win);
 
     g_lastButtonNumber = gdk_event->button;
 
-    // GDK sends surplus button down events
-    // before a double click event. We
-    // need to filter these out.
-    if ((gdk_event->type == GDK_BUTTON_PRESS) && (win->m_wxwindow))
+    wxEventType event_type;
+    wxEventType down;
+    wxEventType dclick;
+    switch (gdk_event->button)
     {
-        GdkEvent *peek_event = gdk_event_peek();
-        if (peek_event)
-        {
-            if ((peek_event->type == GDK_2BUTTON_PRESS) ||
-                (peek_event->type == GDK_3BUTTON_PRESS))
+        case 1:
+            down = wxEVT_LEFT_DOWN;
+            dclick = wxEVT_LEFT_DCLICK;
+            break;
+        case 2:
+            down = wxEVT_MIDDLE_DOWN;
+            dclick = wxEVT_MIDDLE_DCLICK;
+            break;
+        case 3:
+            down = wxEVT_RIGHT_DOWN;
+            dclick = wxEVT_RIGHT_DCLICK;
+            break;
+        case 8:
+            down = wxEVT_AUX1_DOWN;
+            dclick = wxEVT_AUX1_DCLICK;
+            break;
+        case 9:
+            down = wxEVT_AUX2_DOWN;
+            dclick = wxEVT_AUX2_DCLICK;
+            break;
+        default:
+            return false;
+    }
+    switch (gdk_event->type)
+    {
+        case GDK_BUTTON_PRESS:
+            event_type = down;
+            // GDK sends surplus button down events
+            // before a double click event. We
+            // need to filter these out.
+            if (win->m_wxwindow)
             {
-                gdk_event_free( peek_event );
-                return TRUE;
+                GdkEvent* peek_event = gdk_event_peek();
+                if (peek_event)
+                {
+                    const GdkEventType peek_event_type = peek_event->type;
+                    gdk_event_free(peek_event);
+                    if (peek_event_type == GDK_2BUTTON_PRESS ||
+                        peek_event_type == GDK_3BUTTON_PRESS)
+                    {
+                        return true;
+                    }
+                }
             }
-            else
+            break;
+        case GDK_2BUTTON_PRESS:
+            event_type = dclick;
+#ifndef __WXGTK3__
+            if (gdk_event->button >= 1 && gdk_event->button <= 3)
             {
-                gdk_event_free( peek_event );
+                // Reset GDK internal timestamp variables in order to disable GDK
+                // triple click events. GDK will then next time believe no button has
+                // been clicked just before, and send a normal button click event.
+                GdkDisplay* display = gtk_widget_get_display(widget);
+                display->button_click_time[1] = 0;
+                display->button_click_time[0] = 0;
             }
-        }
-    }
-
-    wxEventType event_type = wxEVT_NULL;
-
-    if ( gdk_event->type == GDK_2BUTTON_PRESS &&
-            gdk_event->button >= 1 && gdk_event->button <= 3 )
-    {
-        // Reset GDK internal timestamp variables in order to disable GDK
-        // triple click events. GDK will then next time believe no button has
-        // been clicked just before, and send a normal button click event.
-        GdkDisplay* display = gtk_widget_get_display (widget);
-        display->button_click_time[1] = 0;
-        display->button_click_time[0] = 0;
-    }
-
-    if (gdk_event->button == 1)
-    {
-        // note that GDK generates triple click events which are not supported
-        // by wxWidgets but still have to be passed to the app as otherwise
-        // clicks would simply go missing
-        switch (gdk_event->type)
-        {
-            // we shouldn't get triple clicks at all for GTK2 because we
-            // suppress them artificially using the code above but we still
-            // should map them to something for GTK1 and not just ignore them
-            // as this would lose clicks
-            case GDK_3BUTTON_PRESS:     // we could also map this to DCLICK...
-            case GDK_BUTTON_PRESS:
-                event_type = wxEVT_LEFT_DOWN;
-                break;
-
-            case GDK_2BUTTON_PRESS:
-                event_type = wxEVT_LEFT_DCLICK;
-                break;
-
-            default:
-                // just to silence gcc warnings
-                ;
-        }
-    }
-    else if (gdk_event->button == 2)
-    {
-        switch (gdk_event->type)
-        {
-            case GDK_3BUTTON_PRESS:
-            case GDK_BUTTON_PRESS:
-                event_type = wxEVT_MIDDLE_DOWN;
-                break;
-
-            case GDK_2BUTTON_PRESS:
-                event_type = wxEVT_MIDDLE_DCLICK;
-                break;
-
-            default:
-                ;
-        }
-    }
-    else if (gdk_event->button == 3)
-    {
-        switch (gdk_event->type)
-        {
-            case GDK_3BUTTON_PRESS:
-            case GDK_BUTTON_PRESS:
-                event_type = wxEVT_RIGHT_DOWN;
-                break;
-
-            case GDK_2BUTTON_PRESS:
-                event_type = wxEVT_RIGHT_DCLICK;
-                break;
-
-            default:
-                ;
-        }
-    }
-
-    else if (gdk_event->button == 8)
-    {
-        switch (gdk_event->type)
-        {
-            case GDK_3BUTTON_PRESS:
-            case GDK_BUTTON_PRESS:
-                event_type = wxEVT_AUX1_DOWN;
-                break;
-
-            case GDK_2BUTTON_PRESS:
-                event_type = wxEVT_AUX1_DCLICK;
-                break;
-
-            default:
-                ;
-        }
-    }
-
-    else if (gdk_event->button == 9)
-    {
-        switch (gdk_event->type)
-        {
-            case GDK_3BUTTON_PRESS:
-            case GDK_BUTTON_PRESS:
-                event_type = wxEVT_AUX2_DOWN;
-                break;
-
-            case GDK_2BUTTON_PRESS:
-                event_type = wxEVT_AUX2_DCLICK;
-                break;
-
-            default:
-                ;
-        }
-    }
-
-    if ( event_type == wxEVT_NULL )
-    {
-        // unknown mouse button or click type
-        return FALSE;
+#endif // !__WXGTK3__
+            break;
+        // we shouldn't get triple clicks at all for GTK2 because we
+        // suppress them artificially using the code above but we still
+        // should map them to something for GTK3 and not just ignore them
+        // as this would lose clicks
+        case GDK_3BUTTON_PRESS:
+            event_type = down;
+            break;
+        default:
+            return false;
     }
 
     g_lastMouseEvent = (GdkEvent*) gdk_event;
@@ -1476,6 +1472,8 @@ gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget),
                                     GdkEventButton *gdk_event,
                                     wxWindowGTK *win )
 {
+    wxPROCESS_EVENT_ONCE(GdkEventButton, gdk_event);
+
     wxCOMMON_CALLBACK_PROLOGUE(gdk_event, win);
 
     g_lastButtonNumber = 0;
@@ -1539,14 +1537,19 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
                                    GdkEventMotion *gdk_event,
                                    wxWindowGTK *win )
 {
+    wxPROCESS_EVENT_ONCE(GdkEventMotion, gdk_event);
+
     wxCOMMON_CALLBACK_PROLOGUE(gdk_event, win);
 
     if (gdk_event->is_hint)
     {
         int x = 0;
         int y = 0;
-        GdkModifierType state;
-        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+#ifdef __WXGTK3__
+        gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
+#else
+        gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
+#endif
         gdk_event->x = x;
         gdk_event->y = y;
     }
@@ -1559,7 +1562,12 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
     if ( g_captureWindow )
     {
         // synthesise a mouse enter or leave event if needed
-        GdkWindow *winUnderMouse = gdk_window_at_pointer(NULL, NULL);
+        GdkWindow* winUnderMouse =
+#ifdef __WXGTK3__
+            gdk_device_get_window_at_position(gdk_event->device, NULL, NULL);
+#else
+            gdk_window_at_pointer(NULL, NULL);
+#endif
         // This seems to be necessary and actually been added to
         // GDK itself in version 2.0.X
         gdk_flush();
@@ -1606,70 +1614,124 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
 // "scroll_event" (mouse wheel event)
 //-----------------------------------------------------------------------------
 
-static gboolean
-window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
+static void AdjustRangeValue(GtkRange* range, double step)
 {
-    if (gdk_event->direction != GDK_SCROLL_LEFT &&
-        gdk_event->direction != GDK_SCROLL_RIGHT)
-    {
-        return false;
-    }
-
-    GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz];
-
     if (range && gtk_widget_get_visible(GTK_WIDGET(range)))
     {
         GtkAdjustment* adj = gtk_range_get_adjustment(range);
-        double delta = gtk_adjustment_get_step_increment(adj) * 3;
-        if (gdk_event->direction == GDK_SCROLL_LEFT)
-            delta = -delta;
-
-        gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta);
-
-        return TRUE;
+        double value = gtk_adjustment_get_value(adj);
+        value += step * gtk_adjustment_get_step_increment(adj);
+        gtk_range_set_value(range, value);
     }
-
-    return FALSE;
 }
 
 static gboolean
-window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
+scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win)
 {
-    if (gdk_event->direction != GDK_SCROLL_UP &&
-        gdk_event->direction != GDK_SCROLL_DOWN)
-    {
-        return false;
-    }
-
     wxMouseEvent event(wxEVT_MOUSEWHEEL);
     InitMouseEvent(win, event, gdk_event);
 
-    // FIXME: Get these values from GTK or GDK
-    event.m_linesPerAction = 3;
     event.m_wheelDelta = 120;
-    if (gdk_event->direction == GDK_SCROLL_UP)
-        event.m_wheelRotation = 120;
-    else
-        event.m_wheelRotation = -120;
+    event.m_linesPerAction = 3;
+    event.m_columnsPerAction = 3;
 
-    if (win->GTKProcessEvent(event))
-      return TRUE;
-
-    GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
-
-    if (range && gtk_widget_get_visible(GTK_WIDGET(range)))
+    GtkRange* range_h = win->m_scrollBar[wxWindow::ScrollDir_Horz];
+    GtkRange* range_v = win->m_scrollBar[wxWindow::ScrollDir_Vert];
+    const bool is_range_h = (void*)widget == range_h;
+    const bool is_range_v = (void*)widget == range_v;
+    GdkScrollDirection direction = gdk_event->direction;
+    switch (direction)
     {
-        GtkAdjustment* adj = gtk_range_get_adjustment(range);
-        double delta = gtk_adjustment_get_step_increment(adj) * 3;
-        if (gdk_event->direction == GDK_SCROLL_UP)
-            delta = -delta;
-
-        gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta);
-
-        return TRUE;
+        case GDK_SCROLL_UP:
+            if (is_range_h)
+                direction = GDK_SCROLL_LEFT;
+            break;
+        case GDK_SCROLL_DOWN:
+            if (is_range_h)
+                direction = GDK_SCROLL_RIGHT;
+            break;
+        case GDK_SCROLL_LEFT:
+            if (is_range_v)
+                direction = GDK_SCROLL_UP;
+            break;
+        case GDK_SCROLL_RIGHT:
+            if (is_range_v)
+                direction = GDK_SCROLL_DOWN;
+            break;
+        default:
+            break;
+#if GTK_CHECK_VERSION(3,4,0)
+        case GDK_SCROLL_SMOOTH:
+            double delta_x = gdk_event->delta_x;
+            double delta_y = gdk_event->delta_y;
+            if (delta_x == 0)
+            {
+                if (is_range_h)
+                {
+                    delta_x = delta_y;
+                    delta_y = 0;
+                }
+            }
+            else if (delta_y == 0)
+            {
+                if (is_range_v)
+                {
+                    delta_y = delta_x;
+                    delta_x = 0;
+                }
+            }
+            if (delta_x)
+            {
+                event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
+                event.m_wheelRotation = int(event.m_wheelDelta * delta_x);
+                if (!win->GTKProcessEvent(event))
+                    AdjustRangeValue(range_h, event.m_columnsPerAction * delta_x);
+            }
+            if (delta_y)
+            {
+                event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
+                event.m_wheelRotation = int(event.m_wheelDelta * -delta_y);
+                if (!win->GTKProcessEvent(event))
+                    AdjustRangeValue(range_v, event.m_linesPerAction * delta_y);
+            }
+            return true;
+#endif // GTK_CHECK_VERSION(3,4,0)
+    }
+    GtkRange *range;
+    double step;
+    switch (direction)
+    {
+        case GDK_SCROLL_UP:
+        case GDK_SCROLL_DOWN:
+            range = range_v;
+            event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
+            step = event.m_linesPerAction;
+            break;
+        case GDK_SCROLL_LEFT:
+        case GDK_SCROLL_RIGHT:
+            range = range_h;
+            event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
+            step = event.m_columnsPerAction;
+            break;
+        default:
+            return false;
     }
 
-    return FALSE;
+    event.m_wheelRotation = event.m_wheelDelta;
+    if (direction == GDK_SCROLL_DOWN || direction == GDK_SCROLL_LEFT)
+        event.m_wheelRotation = -event.m_wheelRotation;
+
+    if (!win->GTKProcessEvent(event))
+    {
+        if (!range)
+            return false;
+
+        if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_LEFT)
+            step = -step;
+        AdjustRangeValue(range, step);
+    }
+
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -1734,7 +1796,7 @@ wx_window_focus_callback(GtkWidget *widget,
 //-----------------------------------------------------------------------------
 
 static gboolean
-gtk_window_enter_callback( GtkWidget *widget,
+gtk_window_enter_callback( GtkWidget*,
                            GdkEventCrossing *gdk_event,
                            wxWindowGTK *win )
 {
@@ -1743,17 +1805,8 @@ gtk_window_enter_callback( GtkWidget *widget,
     // Event was emitted after a grab
     if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE;
 
-    int x = 0;
-    int y = 0;
-    GdkModifierType state = (GdkModifierType)0;
-
-    gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state);
-
     wxMouseEvent event( wxEVT_ENTER_WINDOW );
     InitMouseEvent(win, event, gdk_event);
-    wxPoint pt = win->GetClientAreaOrigin();
-    event.m_x = x + pt.x;
-    event.m_y = y + pt.y;
 
     if ( !g_captureWindow )
     {
@@ -1772,7 +1825,7 @@ gtk_window_enter_callback( GtkWidget *widget,
 //-----------------------------------------------------------------------------
 
 static gboolean
-gtk_window_leave_callback( GtkWidget *widget,
+gtk_window_leave_callback( GtkWidget*,
                            GdkEventCrossing *gdk_event,
                            wxWindowGTK *win )
 {
@@ -1782,13 +1835,6 @@ gtk_window_leave_callback( GtkWidget *widget,
     if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE;
 
     wxMouseEvent event( wxEVT_LEAVE_WINDOW );
-
-    int x = 0;
-    int y = 0;
-    GdkModifierType state = (GdkModifierType)0;
-
-    gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state);
-
     InitMouseEvent(win, event, gdk_event);
 
     return win->GTKProcessEvent(event);
@@ -1884,16 +1930,6 @@ gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindowGTK* win)
     win->GTKHandleRealized();
 }
 
-//-----------------------------------------------------------------------------
-// "unrealize" from m_wxwindow
-//-----------------------------------------------------------------------------
-
-static void unrealize(GtkWidget*, wxWindowGTK* win)
-{
-    if (win->m_imData)
-        gtk_im_context_set_client_window(win->m_imData->context, NULL);
-}
-
 //-----------------------------------------------------------------------------
 // "size_allocate" from m_wxwindow or m_widget
 //-----------------------------------------------------------------------------
@@ -1905,21 +1941,28 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win)
     int h = alloc->height;
     if (win->m_wxwindow)
     {
-        int border_x, border_y;
-        WX_PIZZA(win->m_wxwindow)->get_border_widths(border_x, border_y);
-        w -= 2 * border_x;
-        h -= 2 * border_y;
+        GtkBorder border;
+        WX_PIZZA(win->m_wxwindow)->get_border(border);
+        w -= border.left + border.right;
+        h -= border.top + border.bottom;
         if (w < 0) w = 0;
         if (h < 0) h = 0;
     }
-    if (win->m_oldClientWidth != w || win->m_oldClientHeight != h)
+    GtkAllocation a;
+    gtk_widget_get_allocation(win->m_widget, &a);
+    // update position for widgets in native containers, such as wxToolBar
+    if (!WX_IS_PIZZA(gtk_widget_get_parent(win->m_widget)))
     {
-        win->m_oldClientWidth  = w;
-        win->m_oldClientHeight = h;
+        win->m_x = a.x;
+        win->m_y = a.y;
+    }
+    win->m_useCachedClientSize = true;
+    if (win->m_clientWidth != w || win->m_clientHeight != h)
+    {
+        win->m_clientWidth  = w;
+        win->m_clientHeight = h;
         // this callback can be connected to m_wxwindow,
         // so always get size from m_widget->allocation
-        GtkAllocation a;
-        gtk_widget_get_allocation(win->m_widget, &a);
         win->m_width  = a.width;
         win->m_height = a.height;
         if (!win->m_nativeSizeEvent)
@@ -1953,41 +1996,44 @@ gtk_window_grab_broken( GtkWidget*,
 #endif
 
 //-----------------------------------------------------------------------------
-// "style_set"
+// "style_set"/"style_updated"
 //-----------------------------------------------------------------------------
 
-static
-void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget),
-                               GtkStyle *previous_style,
-                               wxWindow* win )
+#ifdef __WXGTK3__
+static void style_updated(GtkWidget*, wxWindow* win)
+#else
+static void style_updated(GtkWidget*, GtkStyle*, wxWindow* win)
+#endif
 {
-    if (win && previous_style)
-    {
-        if (win->IsTopLevel())
-        {
-            wxSysColourChangedEvent event;
-            event.SetEventObject(win);
-            win->GTKProcessEvent(event);
-        }
-        else
-        {
-            // Border width could change, which will change client size.
-            // Make sure size event occurs for this
-            win->m_oldClientWidth = 0;
-        }
-    }
+    wxSysColourChangedEvent event;
+    event.SetEventObject(win);
+    win->GTKProcessEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+// "unrealize"
+//-----------------------------------------------------------------------------
+
+static void unrealize(GtkWidget*, wxWindow* win)
+{
+    win->GTKHandleUnrealize();
 }
 
 } // extern "C"
 
 void wxWindowGTK::GTKHandleRealized()
 {
-    if (m_imData)
+    if (IsFrozen())
+        DoFreeze();
+
+    GdkWindow* const window = GTKGetDrawingWindow();
+
+    if (m_imContext)
     {
         gtk_im_context_set_client_window
         (
-            m_imData->context,
-            m_wxwindow ? GTKGetDrawingWindow()
+            m_imContext,
+            window ? window
                        : gtk_widget_get_window(m_widget)
         );
     }
@@ -1998,7 +2044,6 @@ void wxWindowGTK::GTKHandleRealized()
 #if wxGTK_HAS_COMPOSITING_SUPPORT
         if (IsTransparentBackgroundSupported())
         {
-            GdkWindow* const window = GTKGetDrawingWindow();
             if (window)
                 gdk_window_set_composited(window, true);
         }
@@ -2010,22 +2055,55 @@ void wxWindowGTK::GTKHandleRealized()
         }
     }
 
-
-    // We cannot set colours and fonts before the widget
-    // been realized, so we do this directly after realization
-    // or otherwise in idle time
-
-    if (m_needsStyleChange)
+#ifndef __WXGTK3__
+    if (window && (
+        m_backgroundStyle == wxBG_STYLE_PAINT ||
+        m_backgroundStyle == wxBG_STYLE_TRANSPARENT))
     {
-        SetBackgroundStyle(GetBackgroundStyle());
-        m_needsStyleChange = false;
+        gdk_window_set_back_pixmap(window, NULL, false);
     }
+#endif
 
     wxWindowCreateEvent event(static_cast<wxWindow*>(this));
     event.SetEventObject( this );
     GTKProcessEvent( event );
 
     GTKUpdateCursor(true, false);
+
+    if (m_wxwindow && IsTopLevel())
+    {
+        // attaching to style changed signal after realization avoids initial
+        // changes we don't care about
+        const gchar *detailed_signal =
+#ifdef __WXGTK3__
+            "style_updated";
+#else
+            "style_set";
+#endif
+        g_signal_connect(m_wxwindow,
+            detailed_signal,
+            G_CALLBACK(style_updated), this);
+    }
+}
+
+void wxWindowGTK::GTKHandleUnrealize()
+{
+    // unrealizing a frozen window seems to have some lingering effect
+    // preventing updates to the affected area
+    if (IsFrozen())
+        DoThaw();
+
+    if (m_wxwindow)
+    {
+        if (m_imContext)
+            gtk_im_context_set_client_window(m_imContext, NULL);
+
+        if (IsTopLevel())
+        {
+            g_signal_handlers_disconnect_by_func(
+                m_wxwindow, (void*)style_updated, this);
+        }
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -2035,6 +2113,15 @@ void wxWindowGTK::GTKHandleRealized()
 
 wxWindow *wxWindowBase::DoFindFocus()
 {
+#if wxUSE_MENUS
+    // For compatibility with wxMSW, pretend that showing a popup menu doesn't
+    // change the focus and that it remains on the window showing it, even
+    // though the real focus does change in GTK.
+    extern wxMenu *wxCurrentPopupMenu;
+    if ( wxCurrentPopupMenu )
+        return wxCurrentPopupMenu->GetInvokingWindow();
+#endif // wxUSE_MENUS
+
     wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus;
     // the cast is necessary when we compile in wxUniversal mode
     return static_cast<wxWindow*>(focus);
@@ -2050,9 +2137,8 @@ void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
     child->m_x += pizza->m_scroll_x;
     child->m_y += pizza->m_scroll_y;
 
-    gtk_widget_set_size_request(
-        child->m_widget, child->m_width, child->m_height);
-    pizza->put(child->m_widget, child->m_x, child->m_y);
+    pizza->put(child->m_widget,
+        child->m_x, child->m_y, child->m_width, child->m_height);
 }
 
 //-----------------------------------------------------------------------------
@@ -2065,6 +2151,29 @@ wxWindow *wxGetActiveWindow()
 }
 
 
+// Under Unix this is implemented using X11 functions in utilsx11.cpp but we
+// need to have this function under Windows too, so provide at least a stub.
+#ifndef GDK_WINDOWING_X11
+bool wxGetKeyState(wxKeyCode WXUNUSED(key))
+{
+    wxFAIL_MSG(wxS("Not implemented under Windows"));
+    return false;
+}
+#endif // __WINDOWS__
+
+static GdkDisplay* GetDisplay()
+{
+    wxWindow* tlw = NULL;
+    if (!wxTopLevelWindows.empty())
+        tlw = wxTopLevelWindows.front();
+    GdkDisplay* display;
+    if (tlw && tlw->m_widget)
+        display = gtk_widget_get_display(tlw->m_widget);
+    else
+        display = gdk_display_get_default();
+    return display;
+}
+
 wxMouseState wxGetMouseState()
 {
     wxMouseState ms;
@@ -2073,7 +2182,17 @@ wxMouseState wxGetMouseState()
     gint y;
     GdkModifierType mask;
 
-    gdk_window_get_pointer(NULL, &x, &y, &mask);
+    GdkDisplay* display = GetDisplay();
+#ifdef __WXGTK3__
+    GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+    GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+    GdkScreen* screen;
+    gdk_device_get_position(device, &screen, &x, &y);
+    GdkWindow* window = gdk_screen_get_root_window(screen);
+    gdk_device_get_state(device, window, NULL, &mask);
+#else
+    gdk_display_get_pointer(display, NULL, &x, &y, &mask);
+#endif
 
     ms.SetX(x);
     ms.SetY(y);
@@ -2115,12 +2234,14 @@ void wxWindowGTK::Init()
     m_width = 0;
     m_height = 0;
 
-    m_hasVMT = false;
-
     m_showOnIdle = false;
 
     m_noExpose = false;
     m_nativeSizeEvent = false;
+#ifdef __WXGTK3__
+    m_paintContext = NULL;
+    m_styleProvider = NULL;
+#endif
 
     m_isScrolling = false;
     m_mouseButtonDown = false;
@@ -2132,16 +2253,17 @@ void wxWindowGTK::Init()
         m_scrollPos[dir] = 0;
     }
 
-    m_oldClientWidth =
-    m_oldClientHeight = 0;
+    m_clientWidth =
+    m_clientHeight = 0;
+    m_useCachedClientSize = false;
 
     m_clipPaintRegion = false;
 
-    m_needsStyleChange = false;
-
     m_cursor = *wxSTANDARD_CURSOR;
 
-    m_imData = NULL;
+    m_imContext = NULL;
+    m_imKeyEvent = NULL;
+
     m_dirtyTabOrder = false;
 }
 
@@ -2162,6 +2284,77 @@ wxWindowGTK::wxWindowGTK( wxWindow *parent,
     Create( parent, id, pos, size, style, name );
 }
 
+void wxWindowGTK::GTKCreateScrolledWindowWith(GtkWidget* view)
+{
+    wxASSERT_MSG( HasFlag(wxHSCROLL) || HasFlag(wxVSCROLL),
+                  wxS("Must not be called if scrolling is not needed.") );
+
+    m_widget = gtk_scrolled_window_new( NULL, NULL );
+
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
+
+    // There is a conflict with default bindings at GTK+
+    // level between scrolled windows and notebooks both of which want to use
+    // Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal
+    // direction and notebooks for changing pages -- we decide that if we don't
+    // have wxHSCROLL style we can safely sacrifice horizontal scrolling if it
+    // means we can get working keyboard navigation in notebooks
+    if ( !HasFlag(wxHSCROLL) )
+    {
+        GtkBindingSet *
+            bindings = gtk_binding_set_by_class(G_OBJECT_GET_CLASS(m_widget));
+        if ( bindings )
+        {
+            gtk_binding_entry_remove(bindings, GDK_Page_Up, GDK_CONTROL_MASK);
+            gtk_binding_entry_remove(bindings, GDK_Page_Down, GDK_CONTROL_MASK);
+        }
+    }
+
+    // If wx[HV]SCROLL is not given, the corresponding scrollbar is not shown
+    // at all. Otherwise it may be shown only on demand (default) or always, if
+    // the wxALWAYS_SHOW_SB is specified.
+    GtkPolicyType horzPolicy = HasFlag(wxHSCROLL)
+                                ? HasFlag(wxALWAYS_SHOW_SB)
+                                    ? GTK_POLICY_ALWAYS
+                                    : GTK_POLICY_AUTOMATIC
+                                : GTK_POLICY_NEVER;
+    GtkPolicyType vertPolicy = HasFlag(wxVSCROLL)
+                                ? HasFlag(wxALWAYS_SHOW_SB)
+                                    ? GTK_POLICY_ALWAYS
+                                    : GTK_POLICY_AUTOMATIC
+                                : GTK_POLICY_NEVER;
+    gtk_scrolled_window_set_policy( scrolledWindow, horzPolicy, vertPolicy );
+
+    m_scrollBar[ScrollDir_Horz] = GTK_RANGE(gtk_scrolled_window_get_hscrollbar(scrolledWindow));
+    m_scrollBar[ScrollDir_Vert] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(scrolledWindow));
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+        gtk_range_set_inverted( m_scrollBar[ScrollDir_Horz], TRUE );
+
+    gtk_container_add( GTK_CONTAINER(m_widget), view );
+
+    // connect various scroll-related events
+    for ( int dir = 0; dir < ScrollDir_Max; dir++ )
+    {
+        // these handlers block mouse events to any window during scrolling
+        // such as motion events and prevent GTK and wxWidgets from fighting
+        // over where the slider should be
+        g_signal_connect(m_scrollBar[dir], "button_press_event",
+                     G_CALLBACK(gtk_scrollbar_button_press_event), this);
+        g_signal_connect(m_scrollBar[dir], "button_release_event",
+                     G_CALLBACK(gtk_scrollbar_button_release_event), this);
+
+        gulong handler_id = g_signal_connect(m_scrollBar[dir], "event_after",
+                            G_CALLBACK(gtk_scrollbar_event_after), this);
+        g_signal_handler_block(m_scrollBar[dir], handler_id);
+
+        // these handlers get notified when scrollbar slider moves
+        g_signal_connect_after(m_scrollBar[dir], "value_changed",
+                     G_CALLBACK(gtk_scrollbar_value_changed), this);
+    }
+
+    gtk_widget_show( view );
+}
+
 bool wxWindowGTK::Create( wxWindow *parent,
                           wxWindowID id,
                           const wxPoint &pos,
@@ -2200,66 +2393,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
     if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL))
         m_widget = m_wxwindow;
     else
-    {
-        m_widget = gtk_scrolled_window_new( NULL, NULL );
-
-        GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
-
-        // There is a conflict with default bindings at GTK+
-        // level between scrolled windows and notebooks both of which want to use
-        // Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal
-        // direction and notebooks for changing pages -- we decide that if we don't
-        // have wxHSCROLL style we can safely sacrifice horizontal scrolling if it
-        // means we can get working keyboard navigation in notebooks
-        if ( !HasFlag(wxHSCROLL) )
-        {
-            GtkBindingSet *
-                bindings = gtk_binding_set_by_class(G_OBJECT_GET_CLASS(m_widget));
-            if ( bindings )
-            {
-                gtk_binding_entry_remove(bindings, GDK_Page_Up, GDK_CONTROL_MASK);
-                gtk_binding_entry_remove(bindings, GDK_Page_Down, GDK_CONTROL_MASK);
-            }
-        }
-
-        if (HasFlag(wxALWAYS_SHOW_SB))
-        {
-            gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS );
-        }
-        else
-        {
-            gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
-        }
-
-        m_scrollBar[ScrollDir_Horz] = GTK_RANGE(gtk_scrolled_window_get_hscrollbar(scrolledWindow));
-        m_scrollBar[ScrollDir_Vert] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(scrolledWindow));
-        if (GetLayoutDirection() == wxLayout_RightToLeft)
-            gtk_range_set_inverted( m_scrollBar[ScrollDir_Horz], TRUE );
-
-        gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-
-        // connect various scroll-related events
-        for ( int dir = 0; dir < ScrollDir_Max; dir++ )
-        {
-            // these handlers block mouse events to any window during scrolling
-            // such as motion events and prevent GTK and wxWidgets from fighting
-            // over where the slider should be
-            g_signal_connect(m_scrollBar[dir], "button_press_event",
-                         G_CALLBACK(gtk_scrollbar_button_press_event), this);
-            g_signal_connect(m_scrollBar[dir], "button_release_event",
-                         G_CALLBACK(gtk_scrollbar_button_release_event), this);
-
-            gulong handler_id = g_signal_connect(m_scrollBar[dir], "event_after",
-                                G_CALLBACK(gtk_scrollbar_event_after), this);
-            g_signal_handler_block(m_scrollBar[dir], handler_id);
-
-            // these handlers get notified when scrollbar slider moves
-            g_signal_connect_after(m_scrollBar[dir], "value_changed",
-                         G_CALLBACK(gtk_scrollbar_value_changed), this);
-        }
-
-        gtk_widget_show( m_wxwindow );
-    }
+        GTKCreateScrolledWindowWith(m_wxwindow);
     g_object_ref(m_widget);
 
     if (m_parent)
@@ -2274,6 +2408,12 @@ bool wxWindowGTK::Create( wxWindow *parent,
     return true;
 }
 
+void wxWindowGTK::GTKDisconnect(void* instance)
+{
+    g_signal_handlers_disconnect_matched(instance,
+        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, this);
+}
+
 wxWindowGTK::~wxWindowGTK()
 {
     SendDestroyEvent();
@@ -2286,35 +2426,46 @@ wxWindowGTK::~wxWindowGTK()
     if ( gs_deferredFocusOut == this )
         gs_deferredFocusOut = NULL;
 
-    m_hasVMT = false;
+    // Unlike the above cases, which can happen in normal circumstances, a
+    // window shouldn't be destroyed while it still has capture, so even though
+    // we still reset the global pointer to avoid leaving it dangling and
+    // crashing afterwards, also complain about it.
+    if ( g_captureWindow == this )
+    {
+        wxFAIL_MSG( wxS("Destroying window with mouse capture") );
+        g_captureWindow = NULL;
+    }
+
+    if (m_wxwindow)
+    {
+        GTKDisconnect(m_wxwindow);
+        GtkWidget* parent = gtk_widget_get_parent(m_wxwindow);
+        if (parent)
+            GTKDisconnect(parent);
+    }
+    if (m_widget && m_widget != m_wxwindow)
+        GTKDisconnect(m_widget);
 
     // destroy children before destroying this window itself
     DestroyChildren();
 
-    // unhook focus handlers to prevent stray events being
-    // propagated to this (soon to be) dead object
-    if (m_focusWidget != NULL)
-    {
-        g_signal_handlers_disconnect_by_func (m_focusWidget,
-                                              (gpointer) gtk_window_focus_in_callback,
-                                              this);
-        g_signal_handlers_disconnect_by_func (m_focusWidget,
-                                              (gpointer) gtk_window_focus_out_callback,
-                                              this);
-    }
-
-    if (m_widget)
-        Show( false );
-
     // delete before the widgets to avoid a crash on solaris
-    delete m_imData;
-    m_imData = NULL;
+    if ( m_imContext )
+    {
+        g_object_unref(m_imContext);
+        m_imContext = NULL;
+    }
 
     // avoid problem with GTK+ 2.18 where a frozen window causes the whole
     // TLW to be frozen, and if the window is then destroyed, nothing ever
     // gets painted again
-    if (IsFrozen())
-        DoThaw();
+    while (IsFrozen())
+        Thaw();
+
+#ifdef __WXGTK3__
+    if (m_styleProvider)
+        g_object_unref(m_styleProvider);
+#endif
 
     if (m_widget)
     {
@@ -2361,11 +2512,14 @@ void wxWindowGTK::PostCreation()
             IsTransparentBackgroundSupported() )
     {
         GdkScreen *screen = gtk_widget_get_screen (m_widget);
-
+#ifdef __WXGTK3__
+        gtk_widget_set_visual(m_widget, gdk_screen_get_rgba_visual(screen));
+#else
         GdkColormap *rgba_colormap = gdk_screen_get_rgba_colormap (screen);
 
         if (rgba_colormap)
             gtk_widget_set_colormap(m_widget, rgba_colormap);
+#endif
     }
 #endif // wxGTK_HAS_COMPOSITING_SUPPORT
 
@@ -2374,23 +2528,24 @@ void wxWindowGTK::PostCreation()
         if (!m_noExpose)
         {
             // these get reported to wxWidgets -> wxPaintEvent
-
-            g_signal_connect (m_wxwindow, "expose_event",
-                              G_CALLBACK (gtk_window_expose_callback), this);
+#ifdef __WXGTK3__
+            g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
+#else
+            g_signal_connect(m_wxwindow, "expose_event", G_CALLBACK(expose_event), this);
+#endif
 
             if (GetLayoutDirection() == wxLayout_LeftToRight)
                 gtk_widget_set_redraw_on_allocate(m_wxwindow, HasFlag(wxFULL_REPAINT_ON_RESIZE));
         }
 
         // Create input method handler
-        m_imData = new wxGtkIMData;
+        m_imContext = gtk_im_multicontext_new();
 
         // Cannot handle drawing preedited text yet
-        gtk_im_context_set_use_preedit( m_imData->context, FALSE );
+        gtk_im_context_set_use_preedit( m_imContext, FALSE );
 
-        g_signal_connect (m_imData->context, "commit",
+        g_signal_connect (m_imContext, "commit",
                           G_CALLBACK (gtk_wxwindow_commit_cb), this);
-        g_signal_connect(m_wxwindow, "unrealize", G_CALLBACK(unrealize), this);
     }
 
     // focus handling
@@ -2430,30 +2585,19 @@ void wxWindowGTK::PostCreation()
 
     ConnectWidget( connect_widget );
 
-    // connect handler to prevent events from propagating up parent chain
-    g_signal_connect_after(m_widget,
-        "key_press_event", G_CALLBACK(key_and_mouse_event_after), this);
-    g_signal_connect_after(m_widget,
-        "key_release_event", G_CALLBACK(key_and_mouse_event_after), this);
-    g_signal_connect_after(m_widget,
-        "button_press_event", G_CALLBACK(key_and_mouse_event_after), this);
-    g_signal_connect_after(m_widget,
-        "button_release_event", G_CALLBACK(key_and_mouse_event_after), this);
-    g_signal_connect_after(m_widget,
-        "motion_notify_event", G_CALLBACK(key_and_mouse_event_after), this);
-
     // We cannot set colours, fonts and cursors before the widget has been
     // realized, so we do this directly after realization -- unless the widget
     // was in fact realized already.
     if ( gtk_widget_get_realized(connect_widget) )
     {
-        gtk_window_realized_callback(connect_widget, this);
+        GTKHandleRealized();
     }
     else
     {
         g_signal_connect (connect_widget, "realize",
                           G_CALLBACK (gtk_window_realized_callback), this);
     }
+    g_signal_connect(connect_widget, "unrealize", G_CALLBACK(unrealize), this);
 
     if (!IsTopLevel())
     {
@@ -2462,7 +2606,9 @@ void wxWindowGTK::PostCreation()
     }
 
 #if GTK_CHECK_VERSION(2, 8, 0)
+#ifndef __WXGTK3__
     if ( gtk_check_version(2,8,0) == NULL )
+#endif
     {
         // Make sure we can notify the app when mouse capture is lost
         if ( m_wxwindow )
@@ -2479,21 +2625,14 @@ void wxWindowGTK::PostCreation()
     }
 #endif // GTK+ >= 2.8
 
-    if ( GTKShouldConnectSizeRequest() )
-    {
-        // This is needed if we want to add our windows into native
-        // GTK controls, such as the toolbar. With this callback, the
-        // toolbar gets to know the correct size (the one set by the
-        // programmer). Sadly, it misbehaves for wxComboBox.
-        g_signal_connect (m_widget, "size_request",
-                          G_CALLBACK (wxgtk_window_size_request_callback),
-                          this);
-    }
+    if (!WX_IS_PIZZA(gtk_widget_get_parent(m_widget)) && !GTK_IS_WINDOW(m_widget))
+        gtk_widget_set_size_request(m_widget, m_width, m_height);
+
+    // apply any font or color changes made before creation
+    GTKApplyWidgetStyle();
 
     InheritAttributes();
 
-    m_hasVMT = true;
-
     SetLayoutDirection(wxLayout_Default);
 
     // unless the window was created initially hidden (i.e. Hide() had been
@@ -2521,14 +2660,13 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
 
-    g_signal_connect (widget, "scroll_event",
-                      G_CALLBACK (window_scroll_event), this);
-    if (m_scrollBar[ScrollDir_Horz])
-        g_signal_connect (m_scrollBar[ScrollDir_Horz], "scroll_event",
-                      G_CALLBACK (window_scroll_event_hscrollbar), this);
-    if (m_scrollBar[ScrollDir_Vert])
-        g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
-                      G_CALLBACK (window_scroll_event), this);
+    g_signal_connect(widget, "scroll_event", G_CALLBACK(scroll_event), this);
+    GtkRange* range = m_scrollBar[ScrollDir_Horz];
+    if (range)
+        g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this);
+    range = m_scrollBar[ScrollDir_Vert];
+    if (range)
+        g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this);
 
     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
@@ -2536,27 +2674,48 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
                       G_CALLBACK (gtk_window_enter_callback), this);
     g_signal_connect (widget, "leave_notify_event",
                       G_CALLBACK (gtk_window_leave_callback), this);
-
-    if (m_wxwindow && (IsTopLevel() || HasFlag(wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME)))
-        g_signal_connect (m_wxwindow, "style_set",
-                              G_CALLBACK (gtk_window_style_set_callback), this);
 }
 
-bool wxWindowGTK::Destroy()
-{
-    m_hasVMT = false;
+static GSList* gs_queueResizeList;
 
-    return wxWindowBase::Destroy();
+extern "C" {
+static gboolean queue_resize(void*)
+{
+    gdk_threads_enter();
+    for (GSList* p = gs_queueResizeList; p; p = p->next)
+    {
+        if (p->data)
+        {
+            gtk_widget_queue_resize(GTK_WIDGET(p->data));
+            g_object_remove_weak_pointer(G_OBJECT(p->data), &p->data);
+        }
+    }
+    g_slist_free(gs_queueResizeList);
+    gs_queueResizeList = NULL;
+    gdk_threads_leave();
+    return false;
+}
 }
 
 void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
 {
     gtk_widget_set_size_request(m_widget, width, height);
+    GtkWidget* parent = gtk_widget_get_parent(m_widget);
+    if (WX_IS_PIZZA(parent))
+        WX_PIZZA(parent)->move(m_widget, x, y, width, height);
 
-    // inform the parent to perform the move
-    wxASSERT_MSG(m_parent && m_parent->m_wxwindow,
-                 "the parent window has no client area?");
-    WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
+    // With GTK3, gtk_widget_queue_resize() is ignored while a size-allocate
+    // is in progress. This situation is common in wxWidgets, since
+    // size-allocate can generate wxSizeEvent and size event handlers often
+    // call SetSize(), directly or indirectly. Work around this by deferring
+    // the queue-resize until after size-allocate processing is finished.
+    if (g_slist_find(gs_queueResizeList, m_widget) == NULL)
+    {
+        if (gs_queueResizeList == NULL)
+            g_idle_add_full(GTK_PRIORITY_RESIZE, queue_resize, NULL, NULL);
+        gs_queueResizeList = g_slist_prepend(gs_queueResizeList, m_widget);
+        g_object_add_weak_pointer(G_OBJECT(m_widget), &gs_queueResizeList->data);
+    }
 }
 
 void wxWindowGTK::ConstrainSize()
@@ -2578,19 +2737,24 @@ void wxWindowGTK::ConstrainSize()
 
 void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
-    wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
+    wxCHECK_RET(m_widget, "invalid window");
 
-    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0 && (x == -1 || y == -1))
+    int scrollX = 0, scrollY = 0;
+    GtkWidget* parent = gtk_widget_get_parent(m_widget);
+    if (WX_IS_PIZZA(parent))
     {
-        int currentX, currentY;
-        GetPosition(&currentX, &currentY);
-        if (x == -1)
-            x = currentX;
-        if (y == -1)
-            y = currentY;
+        wxPizza* pizza = WX_PIZZA(parent);
+        scrollX = pizza->m_scroll_x;
+        scrollY = pizza->m_scroll_y;
     }
-    AdjustForParentClientOrigin(x, y, sizeFlags);
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        x += scrollX;
+    else
+        x = m_x;
+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        y += scrollY;
+    else
+        y = m_y;
 
     // calculate the best size if we should auto size the window
     if ( ((sizeFlags & wxSIZE_AUTO_WIDTH) && width == -1) ||
@@ -2603,22 +2767,22 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
             height = sizeBest.y;
     }
 
-    const wxSize oldSize(m_width, m_height);
-    if (width != -1)
-        m_width = width;
-    if (height != -1)
-        m_height = height;
+    if (width == -1)
+        width = m_width;
+    if (height == -1)
+        height = m_height;
 
-    if (m_parent->m_wxwindow)
+    const bool sizeChange = m_width != width || m_height != height;
+
+    if (sizeChange)
+        m_useCachedClientSize = false;
+
+    if (sizeChange || m_x != x || m_y != y)
     {
-        wxPizza* pizza = WX_PIZZA(m_parent->m_wxwindow);
-        m_x = x + pizza->m_scroll_x;
-        m_y = y + pizza->m_scroll_y;
-
-        int left_border = 0;
-        int right_border = 0;
-        int top_border = 0;
-        int bottom_border = 0;
+        m_x = x;
+        m_y = y;
+        m_width = width;
+        m_height = height;
 
         /* the default button has a border around it */
         if (gtk_widget_get_can_default(m_widget))
@@ -2627,36 +2791,23 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
             gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
             if (default_border)
             {
-                left_border += default_border->left;
-                right_border += default_border->right;
-                top_border += default_border->top;
-                bottom_border += default_border->bottom;
+                x -= default_border->left;
+                y -= default_border->top;
+                width += default_border->left + default_border->right;
+                height += default_border->top + default_border->bottom;
                 gtk_border_free( default_border );
             }
         }
 
-        DoMoveWindow( m_x - left_border,
-                      m_y - top_border,
-                      m_width+left_border+right_border,
-                      m_height+top_border+bottom_border );
+        DoMoveWindow(x, y, width, height);
     }
 
-    if (m_width != oldSize.x || m_height != oldSize.y)
+    if ((sizeChange && !m_nativeSizeEvent) || (sizeFlags & wxSIZE_FORCE_EVENT))
     {
         // update these variables to keep size_allocate handler
         // from sending another size event for this change
-        GetClientSize( &m_oldClientWidth, &m_oldClientHeight );
+        DoGetClientSize(&m_clientWidth, &m_clientHeight);
 
-        gtk_widget_queue_resize(m_widget);
-        if (!m_nativeSizeEvent)
-        {
-            wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-            event.SetEventObject( this );
-            HandleWindowEvent( event );
-        }
-    } else
-    if (sizeFlags & wxSIZE_FORCE_EVENT)
-    {
         wxSizeEvent event( wxSize(m_width,m_height), GetId() );
         event.SetEventObject( this );
         HandleWindowEvent( event );
@@ -2720,6 +2871,13 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
 
+    if (m_useCachedClientSize)
+    {
+        if (width)  *width  = m_clientWidth;
+        if (height) *height = m_clientHeight;
+        return;
+    }
+
     int w = m_width;
     int h = m_height;
 
@@ -2733,6 +2891,16 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
                                            &policy[ScrollDir_Horz],
                                            &policy[ScrollDir_Vert]);
 
+            // get scrollbar spacing the same way the GTK-private function
+            // _gtk_scrolled_window_get_scrollbar_spacing() does it
+            int scrollbar_spacing =
+                GTK_SCROLLED_WINDOW_GET_CLASS(m_widget)->scrollbar_spacing;
+            if (scrollbar_spacing < 0)
+            {
+                gtk_widget_style_get(
+                    m_widget, "scrollbar-spacing", &scrollbar_spacing, NULL);
+            }
+
             for ( int i = 0; i < ScrollDir_Max; i++ )
             {
                 // don't account for the scrollbars we don't have
@@ -2758,15 +2926,32 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
                             continue;
                 }
 
-                GtkScrolledWindowClass *scroll_class =
-                    GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
-
                 GtkRequisition req;
+#ifdef __WXGTK3__
+                GtkWidget* widget = GTK_WIDGET(range);
+                if (i == ScrollDir_Horz)
+                {
+                    if (height)
+                    {
+                        gtk_widget_get_preferred_height(widget, NULL, &req.height);
+                        h -= req.height + scrollbar_spacing;
+                    }
+                }
+                else
+                {
+                    if (width)
+                    {
+                        gtk_widget_get_preferred_width(widget, NULL, &req.width);
+                        w -= req.width + scrollbar_spacing;
+                    }
+                }
+#else // !__WXGTK3__
                 gtk_widget_size_request(GTK_WIDGET(range), &req);
                 if (i == ScrollDir_Horz)
-                    h -= req.height + scroll_class->scrollbar_spacing;
+                    h -= req.height + scrollbar_spacing;
                 else
-                    w -= req.width + scroll_class->scrollbar_spacing;
+                    w -= req.width + scrollbar_spacing;
+#endif // !__WXGTK3__
             }
         }
 
@@ -2789,10 +2974,9 @@ wxSize wxWindowGTK::DoGetBorderSize() const
     if ( !m_wxwindow )
         return wxWindowBase::DoGetBorderSize();
 
-    int x, y;
-    WX_PIZZA(m_wxwindow)->get_border_widths(x, y);
-
-    return 2*wxSize(x, y);
+    GtkBorder border;
+    WX_PIZZA(m_wxwindow)->get_border(border);
+    return wxSize(border.left + border.right, border.top + border.bottom);
 }
 
 void wxWindowGTK::DoGetPosition( int *x, int *y ) const
@@ -2995,52 +3179,18 @@ void wxWindowGTK::DoGetTextExtent( const wxString& string,
                                    int *externalLeading,
                                    const wxFont *theFont ) const
 {
-    wxFont fontToUse = theFont ? *theFont : GetFont();
+    // ensure we work with a valid font
+    wxFont fontToUse;
+    if ( !theFont || !theFont->IsOk() )
+        fontToUse = GetFont();
+    else
+        fontToUse = *theFont;
 
     wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") );
 
-    if (string.empty())
-    {
-        if (x) (*x) = 0;
-        if (y) (*y) = 0;
-        return;
-    }
-
-    PangoContext *context = NULL;
-    if (m_widget)
-        context = gtk_widget_get_pango_context( m_widget );
-
-    if (!context)
-    {
-        if (x) (*x) = 0;
-        if (y) (*y) = 0;
-        return;
-    }
-
-    PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
-    PangoLayout *layout = pango_layout_new(context);
-    pango_layout_set_font_description(layout, desc);
-    {
-        const wxCharBuffer data = wxGTK_CONV( string );
-        if ( data )
-            pango_layout_set_text(layout, data, strlen(data));
-    }
-
-    PangoRectangle rect;
-    pango_layout_get_extents(layout, NULL, &rect);
-
-    if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
-    if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);
-    if (descent)
-    {
-        PangoLayoutIter *iter = pango_layout_get_iter(layout);
-        int baseline = pango_layout_iter_get_baseline(iter);
-        pango_layout_iter_free(iter);
-        *descent = *y - PANGO_PIXELS(baseline);
-    }
-    if (externalLeading) (*externalLeading) = 0;  // ??
-
-    g_object_unref (layout);
+    const wxWindow* win = static_cast<const wxWindow*>(this);
+    wxTextMeasure txm(win, &fontToUse);
+    txm.GetTextExtent(string, x, y, descent, externalLeading);
 }
 
 void wxWindowGTK::GTKDisableFocusOutEvent()
@@ -3091,8 +3241,8 @@ bool wxWindowGTK::GTKHandleFocusIn()
                "handling focus_in event for %s(%p, %s)",
                GetClassInfo()->GetClassName(), this, GetLabel());
 
-    if (m_imData)
-        gtk_im_context_focus_in(m_imData->context);
+    if (m_imContext)
+        gtk_im_context_focus_in(m_imContext);
 
     gs_currentFocus = this;
     gs_pendingFocus = NULL;
@@ -3154,8 +3304,8 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring()
                "handling focus_out event for %s(%p, %s)",
                GetClassInfo()->GetClassName(), this, GetLabel());
 
-    if (m_imData)
-        gtk_im_context_focus_out(m_imData->context);
+    if (m_imContext)
+        gtk_im_context_focus_out(m_imContext);
 
     if ( gs_currentFocus != this )
     {
@@ -3247,6 +3397,8 @@ void wxWindowGTK::SetFocus()
 
 void wxWindowGTK::SetCanFocus(bool canFocus)
 {
+    wxCHECK_RET(m_widget, "invalid window");
+
     gtk_widget_set_can_focus(m_widget, canFocus);
 
     if ( m_wxwindow && (m_widget != m_wxwindow) )
@@ -3402,7 +3554,7 @@ bool wxWindowGTK::DoNavigateIn(int flags)
         gboolean rc;
         g_signal_emit_by_name(parent->m_widget, "focus", dir, &rc);
 
-        return rc == TRUE;
+        return rc != 0;
     }
 }
 
@@ -3562,7 +3714,7 @@ void wxWindowGTK::WarpPointer( int x, int y )
     ClientToScreen(&x, &y);
     GdkDisplay* display = gtk_widget_get_display(m_widget);
     GdkScreen* screen = gtk_widget_get_screen(m_widget);
-#ifdef __WXGTK30__
+#ifdef __WXGTK3__
     GdkDeviceManager* manager = gdk_display_get_device_manager(display);
     gdk_device_warp(gdk_device_manager_get_client_pointer(manager), screen, x, y);
 #else
@@ -3681,16 +3833,23 @@ bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const
         return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
 }
 
-void wxWindowGTK::GtkSendPaintEvents()
+#ifdef __WXGTK3__
+void wxWindowGTK::GTKSendPaintEvents(cairo_t* cr)
+#else
+void wxWindowGTK::GTKSendPaintEvents(const GdkRegion* region)
+#endif
 {
-    if (!m_wxwindow)
-    {
-        m_updateRegion.Clear();
-        return;
-    }
+#ifdef __WXGTK3__
+    m_paintContext = cr;
+    double x1, y1, x2, y2;
+    cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+    m_updateRegion = wxRegion(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+#else // !__WXGTK3__
+    m_updateRegion = wxRegion(region);
 #if wxGTK_HAS_COMPOSITING_SUPPORT
     cairo_t* cr = NULL;
 #endif
+#endif // !__WXGTK3__
     // Clip to paint region in wxClientDC
     m_clipPaintRegion = true;
 
@@ -3701,8 +3860,7 @@ void wxWindowGTK::GtkSendPaintEvents()
         // Transform m_updateRegion under RTL
         m_updateRegion.Clear();
 
-        gint width;
-        gdk_drawable_get_size(gtk_widget_get_window(m_wxwindow), &width, NULL);
+        const int width = gdk_window_get_width(GTKGetDrawingWindow());
 
         wxRegionIterator upd( m_nativeUpdateRegion );
         while (upd)
@@ -3731,20 +3889,26 @@ void wxWindowGTK::GtkSendPaintEvents()
                 // explicitly paint.
                 // NB: it works also for top level windows (but this is the
                 // windows manager which then does the compositing job)
+#ifndef __WXGTK3__
                 cr = gdk_cairo_create(m_wxwindow->window);
                 gdk_cairo_region(cr, m_nativeUpdateRegion.GetRegion());
                 cairo_clip(cr);
-
+#endif
                 cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
                 cairo_paint(cr);
                 cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+#ifndef __WXGTK3__
                 cairo_surface_flush(cairo_get_target(cr));
+#endif
             }
 #endif // wxGTK_HAS_COMPOSITING_SUPPORT
             break;
 
         case wxBG_STYLE_ERASE:
             {
+#ifdef __WXGTK3__
+                wxGTKCairoDC dc(cr);
+#else
                 wxWindowDC dc( (wxWindow*)this );
                 dc.SetDeviceClippingRegion( m_updateRegion );
 
@@ -3757,7 +3921,7 @@ void wxWindowGTK::GtkSendPaintEvents()
                     dc.SetBackground(GetBackgroundColour());
                     dc.Clear();
                 }
-
+#endif // !__WXGTK3__
                 wxEraseEvent erase_event( GetId(), &dc );
                 erase_event.SetEventObject( this );
 
@@ -3772,34 +3936,28 @@ void wxWindowGTK::GtkSendPaintEvents()
         case wxBG_STYLE_SYSTEM:
             if ( GetThemeEnabled() )
             {
+                GdkWindow* gdkWindow = GTKGetDrawingWindow();
+                const int w = gdk_window_get_width(gdkWindow);
+                const int h = gdk_window_get_height(gdkWindow);
+#ifdef __WXGTK3__
+                GtkStyleContext* sc = gtk_widget_get_style_context(m_wxwindow);
+                gtk_render_background(sc, cr, 0, 0, w, h);
+#else
                 // find ancestor from which to steal background
                 wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
                 if (!parent)
                     parent = (wxWindow*)this;
-
-                if (gtk_widget_get_mapped(parent->m_widget))
-                {
-                    wxRegionIterator upd( m_nativeUpdateRegion );
-                    while (upd)
-                    {
-                        GdkRectangle rect;
-                        rect.x = upd.GetX();
-                        rect.y = upd.GetY();
-                        rect.width = upd.GetWidth();
-                        rect.height = upd.GetHeight();
-
-                        gtk_paint_flat_box(gtk_widget_get_style(parent->m_widget),
-                                    GTKGetDrawingWindow(),
+                GdkRectangle rect;
+                m_nativeUpdateRegion.GetBox(rect.x, rect.y, rect.width, rect.height);
+                gtk_paint_flat_box(gtk_widget_get_style(parent->m_widget),
+                                    gdkWindow,
                                     gtk_widget_get_state(m_wxwindow),
                                     GTK_SHADOW_NONE,
                                     &rect,
                                     parent->m_widget,
                                     (char *)"base",
-                                    0, 0, -1, -1 );
-
-                        ++upd;
-                    }
-                }
+                                    0, 0, w, h);
+#endif // !__WXGTK3__
             }
             break;
 
@@ -3829,13 +3987,14 @@ void wxWindowGTK::GtkSendPaintEvents()
             wxWindow *compositeChild = node->GetData();
             if (compositeChild->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT)
             {
+#ifndef __WXGTK3__
                 if (cr == NULL)
                 {
                     cr = gdk_cairo_create(m_wxwindow->window);
                     gdk_cairo_region(cr, m_nativeUpdateRegion.GetRegion());
                     cairo_clip(cr);
                 }
-
+#endif // !__WXGTK3__
                 GtkWidget *child = compositeChild->m_wxwindow;
                 GtkAllocation alloc;
                 gtk_widget_get_allocation(child, &alloc);
@@ -3847,13 +4006,17 @@ void wxWindowGTK::GtkSendPaintEvents()
                 cairo_paint(cr);
             }
         }
+#ifndef __WXGTK3__
         if (cr)
             cairo_destroy(cr);
+#endif
     }
 #endif // wxGTK_HAS_COMPOSITING_SUPPORT
 
     m_clipPaintRegion = false;
-
+#ifdef __WXGTK3__
+    m_paintContext = NULL;
+#endif
     m_updateRegion.Clear();
     m_nativeUpdateRegion.Clear();
 }
@@ -3868,7 +4031,7 @@ void wxWindowGTK::SetDoubleBuffered( bool on )
 
 bool wxWindowGTK::IsDoubleBuffered() const
 {
-    return gtk_widget_get_double_buffered( m_wxwindow );
+    return gtk_widget_get_double_buffered( m_wxwindow ) != 0;
 }
 
 void wxWindowGTK::ClearBackground()
@@ -3898,42 +4061,46 @@ void wxWindowGTK::GTKApplyToolTip(const char* tip)
 
 bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
 {
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
     if (!wxWindowBase::SetBackgroundColour(colour))
         return false;
 
-    if (colour.IsOk())
+    if (m_widget)
     {
-        // We need the pixel value e.g. for background clearing.
-        m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
-    }
+#ifndef __WXGTK3__
+        if (colour.IsOk())
+        {
+            // We need the pixel value e.g. for background clearing.
+            m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
+        }
+#endif
 
-    // apply style change (forceStyle=true so that new style is applied
-    // even if the bg colour changed from valid to wxNullColour)
-    GTKApplyWidgetStyle(true);
+        // apply style change (forceStyle=true so that new style is applied
+        // even if the bg colour changed from valid to wxNullColour)
+        GTKApplyWidgetStyle(true);
+    }
 
     return true;
 }
 
 bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
 {
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
     if (!wxWindowBase::SetForegroundColour(colour))
-    {
         return false;
-    }
 
-    if (colour.IsOk())
+    if (m_widget)
     {
-        // We need the pixel value e.g. for background clearing.
-        m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
-    }
+#ifndef __WXGTK3__
+        if (colour.IsOk())
+        {
+            // We need the pixel value e.g. for background clearing.
+            m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
+        }
+#endif
 
-    // apply style change (forceStyle=true so that new style is applied
-    // even if the bg colour changed from valid to wxNullColour):
-    GTKApplyWidgetStyle(true);
+        // apply style change (forceStyle=true so that new style is applied
+        // even if the bg colour changed from valid to wxNullColour):
+        GTKApplyWidgetStyle(true);
+    }
 
     return true;
 }
@@ -3943,16 +4110,9 @@ PangoContext *wxWindowGTK::GTKGetPangoDefaultContext()
     return gtk_widget_get_pango_context( m_widget );
 }
 
-GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle)
+#ifndef __WXGTK3__
+GtkRcStyle* wxWindowGTK::GTKCreateWidgetStyle()
 {
-    // do we need to apply any changes at all?
-    if ( !forceStyle &&
-         !m_font.IsOk() &&
-         !m_foregroundColour.IsOk() && !m_backgroundColour.IsOk() )
-    {
-        return NULL;
-    }
-
     GtkRcStyle *style = gtk_rc_style_new();
 
     if ( m_font.IsOk() )
@@ -4011,14 +4171,36 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle)
 
     return style;
 }
+#endif // !__WXGTK3__
 
 void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
 {
-    GtkRcStyle *style = GTKCreateWidgetStyle(forceStyle);
-    if ( style )
+    if (forceStyle || m_font.IsOk() ||
+        m_foregroundColour.IsOk() || m_backgroundColour.IsOk())
     {
+#ifdef __WXGTK3__
+        if (m_backgroundColour.IsOk())
+        {
+            // create a GtkStyleProvider to override "background-image"
+            if (m_styleProvider == NULL)
+                m_styleProvider = GTK_STYLE_PROVIDER(gtk_css_provider_new());
+            const char css[] =
+                "*{background-image:-gtk-gradient(linear,0 0,0 1,"
+                "from(rgba(%u,%u,%u,%g)),to(rgba(%u,%u,%u,%g)))}";
+            char buf[sizeof(css) + 20];
+            const unsigned r = m_backgroundColour.Red();
+            const unsigned g = m_backgroundColour.Green();
+            const unsigned b = m_backgroundColour.Blue();
+            const double a = m_backgroundColour.Alpha() / 255.0;
+            g_snprintf(buf, sizeof(buf), css, r, g, b, a, r, g, b, a);
+            gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(m_styleProvider), buf, -1, NULL);
+        }
+        DoApplyWidgetStyle(NULL);
+#else
+        GtkRcStyle* style = GTKCreateWidgetStyle();
         DoApplyWidgetStyle(style);
         g_object_unref(style);
+#endif
     }
 
     // Style change may affect GTK+'s size calculation:
@@ -4027,30 +4209,58 @@ void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
 
 void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    if ( m_wxwindow )
-    {
-        // block the signal temporarily to avoid sending
-        // wxSysColourChangedEvents when we change the colours ourselves
-        bool unblock = false;
-        if ( IsTopLevel() )
-        {
-            unblock = true;
-            g_signal_handlers_block_by_func(
-                m_wxwindow, (void *)gtk_window_style_set_callback, this);
-        }
+    GtkWidget* widget = m_wxwindow ? m_wxwindow : m_widget;
 
-        gtk_widget_modify_style(m_wxwindow, style);
-
-        if ( unblock )
-        {
-            g_signal_handlers_unblock_by_func(
-                m_wxwindow, (void *)gtk_window_style_set_callback, this);
-        }
-    }
-    else
+    // block the signal temporarily to avoid sending
+    // wxSysColourChangedEvents when we change the colours ourselves
+    bool unblock = false;
+    if (m_wxwindow && IsTopLevel())
     {
-        gtk_widget_modify_style(m_widget, style);
+        unblock = true;
+        g_signal_handlers_block_by_func(
+            m_wxwindow, (void*)style_updated, this);
     }
+
+    GTKApplyStyle(widget, style);
+
+    if (unblock)
+    {
+        g_signal_handlers_unblock_by_func(
+            m_wxwindow, (void*)style_updated, this);
+    }
+}
+
+void wxWindowGTK::GTKApplyStyle(GtkWidget* widget, GtkRcStyle* WXUNUSED_IN_GTK3(style))
+{
+#ifdef __WXGTK3__
+    const PangoFontDescription* pfd = NULL;
+    if (m_font.IsOk())
+        pfd = pango_font_description_copy(m_font.GetNativeFontInfo()->description);
+    gtk_widget_override_font(widget, pfd);
+    gtk_widget_override_color(widget, GTK_STATE_FLAG_NORMAL, m_foregroundColour);
+    gtk_widget_override_background_color(widget, GTK_STATE_FLAG_NORMAL, m_backgroundColour);
+
+    // setting background color has no effect with some themes when the widget style
+    // has a "background-image" property, so we need to override that as well
+
+    GtkStyleContext* context = gtk_widget_get_style_context(widget);
+    if (m_styleProvider)
+        gtk_style_context_remove_provider(context, m_styleProvider);
+    cairo_pattern_t* pattern = NULL;
+    if (m_backgroundColour.IsOk())
+    {
+        gtk_style_context_get(context,
+            GTK_STATE_FLAG_NORMAL, "background-image", &pattern, NULL);
+    }
+    if (pattern)
+    {
+        cairo_pattern_destroy(pattern);
+        gtk_style_context_add_provider(context,
+            m_styleProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+#else
+    gtk_widget_modify_style(widget, style);
+#endif
 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
@@ -4058,42 +4268,14 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
     if (!wxWindowBase::SetBackgroundStyle(style))
         return false;
 
+#ifndef __WXGTK3__
     GdkWindow *window;
-    if ( m_wxwindow )
+    if ((style == wxBG_STYLE_PAINT || style == wxBG_STYLE_TRANSPARENT) &&
+        (window = GTKGetDrawingWindow()))
     {
-        window = GTKGetDrawingWindow();
-    }
-    else
-    {
-        GtkWidget * const w = GetConnectWidget();
-        window = w ? gtk_widget_get_window(w) : NULL;
-    }
-
-    bool wantNoBackPixmap = style == wxBG_STYLE_PAINT || style == wxBG_STYLE_TRANSPARENT;
-
-    if ( wantNoBackPixmap )
-    {
-        if (window)
-        {
-            // Make sure GDK/X11 doesn't refresh the window
-            // automatically.
-            gdk_window_set_back_pixmap( window, NULL, FALSE );
-            m_needsStyleChange = false;
-        }
-        else // window not realized yet
-        {
-            // Do when window is realized
-            m_needsStyleChange = true;
-        }
-
-        // Don't apply widget style, or we get a grey background
-    }
-    else
-    {
-        // apply style change (forceStyle=true so that new style is applied
-        // even if the bg colour changed from valid to wxNullColour):
-        GTKApplyWidgetStyle(true);
+        gdk_window_set_back_pixmap(window, NULL, false);
     }
+#endif // !__WXGTK3__
 
     return true;
 }
@@ -4101,6 +4283,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
 bool wxWindowGTK::IsTransparentBackgroundSupported(wxString* reason) const
 {
 #if wxGTK_HAS_COMPOSITING_SUPPORT
+#ifndef __WXGTK3__
     if (gtk_check_version(wxGTK_VERSION_REQUIRED_FOR_COMPOSITING) != NULL)
     {
         if (reason)
@@ -4112,6 +4295,7 @@ bool wxWindowGTK::IsTransparentBackgroundSupported(wxString* reason) const
 
         return false;
     }
+#endif // !__WXGTK3__
 
     // NB: We don't check here if the particular kind of widget supports
     // transparency, we check only if it would be possible for a generic window
@@ -4136,9 +4320,9 @@ bool wxWindowGTK::IsTransparentBackgroundSupported(wxString* reason) const
         *reason = _("This program was compiled with a too old version of GTK+, "
                     "please rebuild with GTK+ 2.12 or newer.");
     }
-#endif // wxGTK_HAS_COMPOSITING_SUPPORT/!wxGTK_HAS_COMPOSITING_SUPPORT
 
     return false;
+#endif // wxGTK_HAS_COMPOSITING_SUPPORT/!wxGTK_HAS_COMPOSITING_SUPPORT
 }
 
 // ----------------------------------------------------------------------------
@@ -4156,7 +4340,11 @@ void wxPopupMenuPositionCallback( GtkMenu *menu,
 {
     // ensure that the menu appears entirely on screen
     GtkRequisition req;
+#ifdef __WXGTK3__
+    gtk_widget_get_preferred_size(GTK_WIDGET(menu), &req, NULL);
+#else
     gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
+#endif
 
     wxSize sizeScreen = wxGetDisplaySize();
     wxPoint *pos = (wxPoint*)user_data;
@@ -4173,14 +4361,6 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
 
-    // For compatibility with other ports, pretend that the window showing the
-    // menu has focus while the menu is shown. This is needed because the popup
-    // menu actually steals the focus from the window it's associated it in
-    // wxGTK unlike, say, wxMSW.
-    wxWindowGTK* const oldPendingFocus = gs_pendingFocus;
-    gs_pendingFocus = this;
-    wxON_BLOCK_EXIT_SET( gs_pendingFocus, oldPendingFocus );
-
     menu->UpdateUI();
 
     wxPoint pos;
@@ -4210,6 +4390,13 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
                   gtk_get_current_event_time()
                 );
 
+    // it is possible for gtk_menu_popup() to fail
+    if (!gtk_widget_get_visible(GTK_WIDGET(menu->m_menu)))
+    {
+        menu->m_popupShown = false;
+        return false;
+    }
+
     while (menu->m_popupShown)
     {
         gtk_main_iteration();
@@ -4262,14 +4449,15 @@ GdkWindow *wxWindowGTK::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 
 bool wxWindowGTK::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
     if (!wxWindowBase::SetFont(font))
         return false;
 
-    // apply style change (forceStyle=true so that new style is applied
-    // even if the font changed from valid to wxNullFont):
-    GTKApplyWidgetStyle(true);
+    if (m_widget)
+    {
+        // apply style change (forceStyle=true so that new style is applied
+        // even if the font changed from valid to wxNullFont):
+        GTKApplyWidgetStyle(true);
+    }
 
     return true;
 }
@@ -4290,15 +4478,25 @@ void wxWindowGTK::DoCaptureMouse()
     if (!cursor->IsOk())
         cursor = wxSTANDARD_CURSOR;
 
+    const GdkEventMask mask = GdkEventMask(
+        GDK_BUTTON_PRESS_MASK |
+        GDK_BUTTON_RELEASE_MASK |
+        GDK_POINTER_MOTION_HINT_MASK |
+        GDK_POINTER_MOTION_MASK);
+#ifdef __WXGTK3__
+    GdkDisplay* display = gdk_window_get_display(window);
+    GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+    GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+    gdk_device_grab(
+        device, window, GDK_OWNERSHIP_NONE, false, mask,
+        cursor->GetCursor(), unsigned(GDK_CURRENT_TIME));
+#else
     gdk_pointer_grab( window, FALSE,
-                      (GdkEventMask)
-                         (GDK_BUTTON_PRESS_MASK |
-                          GDK_BUTTON_RELEASE_MASK |
-                          GDK_POINTER_MOTION_HINT_MASK |
-                          GDK_POINTER_MOTION_MASK),
+                      mask,
                       NULL,
                       cursor->GetCursor(),
                       (guint32)GDK_CURRENT_TIME );
+#endif
     g_captureWindow = this;
     g_captureWindowHasMouse = true;
 }
@@ -4320,7 +4518,14 @@ void wxWindowGTK::DoReleaseMouse()
     if (!window)
         return;
 
+#ifdef __WXGTK3__
+    GdkDisplay* display = gdk_window_get_display(window);
+    GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+    GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+    gdk_device_ungrab(device, unsigned(GDK_CURRENT_TIME));
+#else
     gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+#endif
 }
 
 void wxWindowGTK::GTKReleaseMouseAndNotify()
@@ -4421,7 +4626,9 @@ int wxWindowGTK::GetScrollRange( int orient ) const
 //   difference due to possible inexactness in floating point arithmetic
 static inline bool IsScrollIncrement(double increment, double x)
 {
-    wxASSERT(increment > 0);
+    wxASSERT(increment >= 0);
+    if ( increment == 0. )
+        return false;
     const double tolerance = 1.0 / 1024;
     return fabs(increment - fabs(x)) < tolerance;
 }
@@ -4439,7 +4646,7 @@ wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range)
     // update current position
     m_scrollPos[barIndex] = value;
     // If event should be ignored, or integral position has not changed
-    if (!m_hasVMT || g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos))
+    if (g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos))
     {
         return wxEVT_NULL;
     }
@@ -4543,20 +4750,23 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 }
 
 // Get the current mouse position.
+void wxGetMousePosition(int* x, int* y)
+{
+    GdkDisplay* display = GetDisplay();
+#ifdef __WXGTK3__
+    GdkDeviceManager* manager = gdk_display_get_device_manager(display);
+    GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
+    gdk_device_get_position(device, NULL, x, y);
+#else
+    gdk_display_get_pointer(display, NULL, x, y, NULL);
+#endif
+}
+
 wxPoint wxGetMousePosition()
 {
-    wxWindow* tlw = NULL;
-    if (!wxTopLevelWindows.empty())
-        tlw = wxTopLevelWindows.front();
-    GdkDisplay* display;
-    if (tlw && tlw->m_widget)
-        display = gtk_widget_get_display(tlw->m_widget);
-    else
-        display = gdk_display_get_default();
-
-    int x, y;
-    gdk_display_get_pointer(display, NULL, &x, &y, NULL);
-    return wxPoint(x, y);
+    wxPoint pt;
+    wxGetMousePosition(&pt.x, &pt.y);
+    return pt;
 }
 
 GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const
@@ -4571,91 +4781,38 @@ GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
-extern "C"
+void wxWindowGTK::GTKFreezeWidget(GtkWidget* widget)
 {
-
-// this is called if we attempted to freeze unrealized widget when it finally
-// is realized (and so can be frozen):
-static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win)
-{
-    wxASSERT( w && gtk_widget_get_has_window(w) );
-    wxASSERT( gtk_widget_get_realized(w) );
-
-    g_signal_handlers_disconnect_by_func
-    (
-        w,
-        (void*)wx_frozen_widget_realize,
-        win
-    );
-
-    GdkWindow* window;
-    if (w == win->m_wxwindow)
-        window = win->GTKGetDrawingWindow();
-    else
-        window = gtk_widget_get_window(w);
-    gdk_window_freeze_updates(window);
+    if (widget && gtk_widget_get_has_window(widget))
+    {
+        GdkWindow* window = gtk_widget_get_window(widget);
+        if (window)
+            gdk_window_freeze_updates(window);
+    }
 }
 
-} // extern "C"
-
-void wxWindowGTK::GTKFreezeWidget(GtkWidget *w)
+void wxWindowGTK::GTKThawWidget(GtkWidget* widget)
 {
-    if ( !w || !gtk_widget_get_has_window(w) )
-        return; // window-less widget, cannot be frozen
-
-    GdkWindow* window = gtk_widget_get_window(w);
-    if (window == NULL)
+    if (widget && gtk_widget_get_has_window(widget))
     {
-        // we can't thaw unrealized widgets because they don't have GdkWindow,
-        // so set it up to be done immediately after realization:
-        g_signal_connect_after
-        (
-            w,
-            "realize",
-            G_CALLBACK(wx_frozen_widget_realize),
-            this
-        );
-        return;
+        GdkWindow* window = gtk_widget_get_window(widget);
+        if (window)
+            gdk_window_thaw_updates(window);
     }
-
-    if (w == m_wxwindow)
-        window = GTKGetDrawingWindow();
-    gdk_window_freeze_updates(window);
-}
-
-void wxWindowGTK::GTKThawWidget(GtkWidget *w)
-{
-    if ( !w || !gtk_widget_get_has_window(w) )
-        return; // window-less widget, cannot be frozen
-
-    GdkWindow* window = gtk_widget_get_window(w);
-    if (window == NULL)
-    {
-        // the widget wasn't realized yet, no need to thaw
-        g_signal_handlers_disconnect_by_func
-        (
-            w,
-            (void*)wx_frozen_widget_realize,
-            this
-        );
-        return;
-    }
-
-    if (w == m_wxwindow)
-        window = GTKGetDrawingWindow();
-    gdk_window_thaw_updates(window);
 }
 
 void wxWindowGTK::DoFreeze()
 {
-    GTKFreezeWidget(m_widget);
-    if ( m_wxwindow && m_widget != m_wxwindow )
-        GTKFreezeWidget(m_wxwindow);
+    GtkWidget* widget = m_wxwindow;
+    if (widget == NULL)
+        widget = m_widget;
+    GTKFreezeWidget(widget);
 }
 
 void wxWindowGTK::DoThaw()
 {
-    GTKThawWidget(m_widget);
-    if ( m_wxwindow && m_widget != m_wxwindow )
-        GTKThawWidget(m_wxwindow);
+    GtkWidget* widget = m_wxwindow;
+    if (widget == NULL)
+        widget = m_widget;
+    GTKThawWidget(widget);
 }
diff --git a/Externals/wxWidgets3/src/msw/aboutdlg.cpp b/Externals/wxWidgets3/src/msw/aboutdlg.cpp
index c9822a4132..5b100b81ae 100644
--- a/Externals/wxWidgets3/src/msw/aboutdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/aboutdlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxAboutBox() for wxMSW
 // Author:      Vadim Zeitlin
 // Created:     2006-10-07
-// RCS-ID:      $Id: aboutdlg.cpp 64755 2010-06-26 11:44:05Z FM $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/accel.cpp b/Externals/wxWidgets3/src/msw/accel.cpp
index 53d542abf3..fbe5d7494f 100644
--- a/Externals/wxWidgets3/src/msw/accel.cpp
+++ b/Externals/wxWidgets3/src/msw/accel.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: accel.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -89,7 +88,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
-    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.wx_str());
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.t_str());
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = hAccel != 0;
 }
diff --git a/Externals/wxWidgets3/src/msw/anybutton.cpp b/Externals/wxWidgets3/src/msw/anybutton.cpp
index b9206fdbbd..b99e2f66e4 100644
--- a/Externals/wxWidgets3/src/msw/anybutton.cpp
+++ b/Externals/wxWidgets3/src/msw/anybutton.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton
 // Author:      Julian Smart
 // Created:     1998-01-04 (extracted from button.cpp)
-// RCS-ID:      $Id: anybutton.cpp 70815 2012-03-05 18:26:20Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -150,8 +149,9 @@ public:
     wxODButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
     {
         SetBitmap(bitmap, wxAnyButton::State_Normal);
+#if wxUSE_IMAGE
         SetBitmap(bitmap.ConvertToDisabled(), wxAnyButton::State_Disabled);
-
+#endif
         m_dir = wxLEFT;
 
         // we use margins when we have both bitmap and text, but when we have
@@ -216,16 +216,34 @@ public:
     // the image list
     wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
         : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */,
-                wxAnyButton::State_Max),
+                wxAnyButton::State_Max + 1 /* see "pulse" comment below */),
           m_hwndBtn(GetHwndOf(btn))
     {
         // initialize all bitmaps except for the disabled one to normal state
         for ( int n = 0; n < wxAnyButton::State_Max; n++ )
         {
+#if wxUSE_IMAGE
             m_iml.Add(n == wxAnyButton::State_Disabled ? bitmap.ConvertToDisabled()
                                                     : bitmap);
+#else
+            m_iml.Add(bitmap);
+#endif
         }
 
+        // In addition to the states supported by wxWidgets such as normal,
+        // hot, pressed, disabled and focused, we need to add bitmap for
+        // another state when running under Windows 7 -- the so called "stylus
+        // hot" state corresponding to PBS_STYLUSHOT constant. While it's
+        // documented in MSDN as being only used with tablets, it is a lie as
+        // a focused button actually alternates between the image list elements
+        // with PBS_DEFAULTED and PBS_STYLUSHOT indices and, in particular,
+        // just disappears during half of the time if the latter is not set so
+        // we absolutely must set it.
+        //
+        // This also explains why we need to allocate an extra slot in the
+        // image list ctor above, the slot State_Max is used for this one.
+        m_iml.Add(bitmap);
+
         m_data.himl = GetHimagelistOf(&m_iml);
 
         // no margins by default
@@ -249,6 +267,11 @@ public:
     {
         m_iml.Replace(which, bitmap);
 
+        // As we want the focused button to always show its bitmap, we need to
+        // update the "stylus hot" one to match it to avoid any pulsing.
+        if ( which == wxAnyButton::State_Focused )
+            m_iml.Replace(wxAnyButton::State_Max, bitmap);
+
         UpdateImageInfo();
     }
 
@@ -395,7 +418,7 @@ wxSize wxMSWButton::GetFittingSize(wxWindow *win,
     {
         // We still need some margin or the text would be overwritten, just
         // make it as small as possible.
-        sizeBtn.x += (3*win->GetCharWidth())/2;
+        sizeBtn.x += (3*win->GetCharWidth());
     }
     else
     {
@@ -424,27 +447,31 @@ wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size
 {
     wxSize sizeBtn(size);
 
-    // All buttons have at least the standard height and, unless the user
-    // explicitly wants them to be as small as possible and used wxBU_EXACTFIT
-    // style to indicate this, of at least the standard width too.
-    //
-    // Notice that we really want to make all buttons equally high, otherwise
-    // they look ugly and the existing code using wxBU_EXACTFIT only uses it to
-    // control width and not height.
-
     // The 50x14 button size is documented in the "Recommended sizing and
     // spacing" section of MSDN layout article.
     //
     // Note that we intentionally don't use GetDefaultSize() here, because
     // it's inexact -- dialog units depend on this dialog's font.
     const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14));
-    if ( !btn->HasFlag(wxBU_EXACTFIT) )
+
+    // All buttons should have at least the standard size, unless the user
+    // explicitly wants them to be as small as possible and used wxBU_EXACTFIT
+    // style to indicate this.
+    const bool incToStdSize = !btn->HasFlag(wxBU_EXACTFIT);
+    if ( incToStdSize )
     {
         if ( sizeBtn.x < sizeDef.x )
             sizeBtn.x = sizeDef.x;
     }
-    if ( sizeBtn.y < sizeDef.y )
-        sizeBtn.y = sizeDef.y;
+
+    // Notice that we really want to make all buttons with text label equally
+    // high, otherwise they look ugly and the existing code using wxBU_EXACTFIT
+    // only uses it to control width and not height.
+    if ( incToStdSize || !btn->GetLabel().empty() )
+    {
+        if ( sizeBtn.y < sizeDef.y )
+            sizeBtn.y = sizeDef.y;
+    }
 
     btn->CacheBestSize(sizeBtn);
 
@@ -813,7 +840,7 @@ void DrawButtonText(HDC hdc,
         // first we need to compute its bounding rect
         RECT rc;
         ::CopyRect(&rc, pRect);
-        ::DrawText(hdc, text.wx_str(), text.length(), &rc,
+        ::DrawText(hdc, text.t_str(), text.length(), &rc,
                    DT_CENTER | DT_CALCRECT);
 
         // now center this rect inside the entire button area
@@ -824,7 +851,7 @@ void DrawButtonText(HDC hdc,
         rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2;
         rc.bottom = rc.top+h;
 
-        ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags);
+        ::DrawText(hdc, text.t_str(), text.length(), &rc, flags);
     }
     else // single line label
     {
@@ -851,7 +878,7 @@ void DrawButtonText(HDC hdc,
 
         // notice that we must have DT_SINGLELINE for vertical alignment flags
         // to work
-        ::DrawText(hdc, text.wx_str(), text.length(), pRect,
+        ::DrawText(hdc, text.t_str(), text.length(), pRect,
                    flags | DT_SINGLELINE );
     }
 }
diff --git a/Externals/wxWidgets3/src/msw/app.cpp b/Externals/wxWidgets3/src/msw/app.cpp
index fb9c474994..9d9b1ce161 100644
--- a/Externals/wxWidgets3/src/msw/app.cpp
+++ b/Externals/wxWidgets3/src/msw/app.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: app.cpp 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -172,12 +171,12 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
        focus/activation entirely when the child process terminates which would
        happen if we simply disabled everything using wxWindowDisabler. Indeed,
        remember that Windows will never activate a disabled window and when the
-       last childs window is closed and Windows looks for a window to activate
+       last child's window is closed and Windows looks for a window to activate
        all our windows are still disabled. There is no way to enable them in
-       time because we don't know when the childs windows are going to be
-       closed, so the solution we use here is to keep one special tiny frame
+       time because we don't know when the child's windows are going to be
+       closed, so the solution we use here is to keep one special tiny dialog
        enabled all the time. Then when the child terminates it will get
-       activated and when we close it below -- after reenabling all the other
+       activated and when we close it below -- after re-enabling all the other
        windows! -- the previously active window becomes activated again and
        everything is ok.
      */
@@ -186,16 +185,16 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
     // first disable all existing windows
     wxWindowDisabler *wd = new wxWindowDisabler;
 
-    // then create an "invisible" frame: it has minimal size, is positioned
-    // (hopefully) outside the screen and doesn't appear on the taskbar
-    wxWindow *winActive = new wxFrame
+    // then create an "invisible" dialog: it has minimal size, is positioned
+    // (hopefully) outside the screen and doesn't appear in the Alt-TAB list
+    // (unlike the frames, which is why we use a dialog here)
+    wxWindow *winActive = new wxDialog
                     (
                         wxTheApp->GetTopWindow(),
                         wxID_ANY,
                         wxEmptyString,
                         wxPoint(32600, 32600),
-                        wxSize(1, 1),
-                        wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
+                        wxSize(1, 1)
                     );
     winActive->Show();
 
@@ -210,9 +209,9 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 
     delete data->wd;
 
-    // finally delete the dummy frame and, as wd has been already destroyed and
-    // the other windows reenabled, the activation is going to return to the
-    // window which had had it before
+    // finally delete the dummy dialog and, as wd has been already destroyed
+    // and the other windows reenabled, the activation is going to return to
+    // the window which had had it before
     data->winActive->Destroy();
 
     // also delete the temporary data object itself
@@ -557,7 +556,7 @@ bool wxConsoleStderr::Write(const wxString& text)
         return false;
     }
 
-    if ( !::WriteConsole(m_hStderr, text.wx_str(), text.length(), &ret, NULL) )
+    if ( !::WriteConsole(m_hStderr, text.t_str(), text.length(), &ret, NULL) )
     {
         wxLogLastError(wxT("WriteConsole"));
         return false;
@@ -647,12 +646,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     SHInitExtraControls();
 #endif
 
-#ifndef __WXWINCE__
-    // Don't show a message box if a function such as SHGetFileInfo
-    // fails to find a device.
-    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
-#endif
-
     wxOleInitialize();
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
@@ -692,7 +685,7 @@ const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
 
 
     ClassRegInfo regClass(name);
-    wndclass.lpszClassName = regClass.regname.wx_str();
+    wndclass.lpszClassName = regClass.regname.t_str();
     if ( !::RegisterClass(&wndclass) )
     {
         wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
@@ -701,7 +694,7 @@ const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
     }
 
     wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW);
-    wndclass.lpszClassName = regClass.regnameNR.wx_str();
+    wndclass.lpszClassName = regClass.regnameNR.t_str();
     if ( !::RegisterClass(&wndclass) )
     {
         wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
@@ -716,7 +709,7 @@ const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
     // function returns (it could be invalidated later if new elements are
     // added to the vector and it's reallocated but this shouldn't matter as
     // this pointer should be used right now, not stored)
-    return gs_regClassesInfo.back().regname.wx_str();
+    return gs_regClassesInfo.back().regname.t_str();
 }
 
 bool wxApp::IsRegisteredClassName(const wxString& name)
diff --git a/Externals/wxWidgets3/src/msw/artmsw.cpp b/Externals/wxWidgets3/src/msw/artmsw.cpp
index b12355da80..04885e3d6b 100644
--- a/Externals/wxWidgets3/src/msw/artmsw.cpp
+++ b/Externals/wxWidgets3/src/msw/artmsw.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2008-10-15
-// RCS-ID:      $Id: artmsw.cpp 70154 2011-12-28 13:51:29Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,8 +21,116 @@
 
 #include "wx/artprov.h"
 #include "wx/image.h"
+#include "wx/dynlib.h"
+#include "wx/volume.h"
+#include "wx/msw/private.h"
 #include "wx/msw/wrapwin.h"
 
+#ifdef SHGSI_ICON
+    #define wxHAS_SHGetStockIconInfo
+#endif
+
+namespace
+{
+
+#ifdef wxHAS_SHGetStockIconInfo
+
+SHSTOCKICONID MSWGetStockIconIdForArtProviderId(const wxArtID& art_id)
+{
+    // try to find an equivalent MSW stock icon id for wxArtID
+    if ( art_id == wxART_ERROR)             return SIID_ERROR;
+    else if ( art_id == wxART_QUESTION )    return SIID_HELP;
+    else if ( art_id == wxART_WARNING )     return SIID_WARNING;
+    else if ( art_id == wxART_INFORMATION ) return SIID_INFO;
+    else if ( art_id == wxART_HELP )        return SIID_HELP;
+    else if ( art_id == wxART_FOLDER )      return SIID_FOLDER;
+    else if ( art_id == wxART_FOLDER_OPEN ) return SIID_FOLDEROPEN;
+    else if ( art_id == wxART_DELETE )      return SIID_DELETE;
+    else if ( art_id == wxART_FIND )        return SIID_FIND;
+    else if ( art_id == wxART_HARDDISK )    return SIID_DRIVEFIXED;
+    else if ( art_id == wxART_FLOPPY )      return SIID_DRIVE35;
+    else if ( art_id == wxART_CDROM )       return SIID_DRIVECD;
+    else if ( art_id == wxART_REMOVABLE )   return SIID_DRIVEREMOVE;
+
+    return SIID_INVALID;
+};
+
+
+// try to load SHGetStockIconInfo dynamically, so this code runs
+// even on pre-Vista Windows versions
+HRESULT
+MSW_SHGetStockIconInfo(SHSTOCKICONID siid,
+                       UINT uFlags,
+                       SHSTOCKICONINFO *psii)
+{
+    typedef HRESULT (WINAPI *PSHGETSTOCKICONINFO)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *);
+    static PSHGETSTOCKICONINFO pSHGetStockIconInfo = (PSHGETSTOCKICONINFO)-1;
+
+    if ( pSHGetStockIconInfo == (PSHGETSTOCKICONINFO)-1 )
+    {
+        wxDynamicLibrary shell32(wxT("shell32.dll"));
+
+        pSHGetStockIconInfo = (PSHGETSTOCKICONINFO)shell32.RawGetSymbol( wxT("SHGetStockIconInfo") );
+    }
+
+    if ( !pSHGetStockIconInfo )
+        return E_FAIL;
+
+    return pSHGetStockIconInfo(siid, uFlags, psii);
+}
+
+#endif // #ifdef wxHAS_SHGetStockIconInfo
+
+wxBitmap
+MSWGetBitmapForPath(const wxString& path, const wxSize& size, DWORD uFlags = 0)
+{
+    SHFILEINFO fi;
+    wxZeroMemory(fi);
+
+    uFlags |= SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
+    if ( size != wxDefaultSize )
+    {
+        if ( size.x <= 16 )
+            uFlags |= SHGFI_SMALLICON;
+        else if ( size.x >= 64 )
+            uFlags |= SHGFI_LARGEICON;
+    }
+
+    if ( !SHGetFileInfo(path.t_str(), FILE_ATTRIBUTE_DIRECTORY,
+                        &fi, sizeof(SHFILEINFO), uFlags) )
+        return wxNullBitmap;
+
+    wxIcon icon;
+    icon.CreateFromHICON((WXHICON)fi.hIcon);
+
+    wxBitmap bitmap(icon);
+    ::DestroyIcon(fi.hIcon);
+
+    return bitmap;
+}
+
+#if wxUSE_FSVOLUME
+
+wxBitmap
+GetDriveBitmapForVolumeType(const wxFSVolumeKind& volKind, const wxSize& size)
+{
+    // get all volumes and try to find one with a matching type
+    wxArrayString volumes = wxFSVolume::GetVolumes();
+    for ( size_t i = 0; i < volumes.Count(); i++ )
+    {
+        wxFSVolume vol( volumes[i] );
+        if ( vol.GetKind() == volKind )
+        {
+            return MSWGetBitmapForPath(volumes[i], size);
+        }
+    }
+
+    return wxNullBitmap;
+}
+
+#endif // wxUSE_FSVOLUME
+
+} // anonymous namespace
 
 // ----------------------------------------------------------------------------
 // wxWindowsArtProvider
@@ -64,25 +171,86 @@ static wxBitmap CreateFromStdIcon(const char *iconName,
 
 wxBitmap wxWindowsArtProvider::CreateBitmap(const wxArtID& id,
                                             const wxArtClient& client,
-                                            const wxSize& WXUNUSED(size))
+                                            const wxSize& size)
 {
-    // handle message box icons specially (wxIcon ctor treat these names
-    // as special cases via wxICOResourceHandler::LoadIcon):
-    const char *name = NULL;
-    if ( id == wxART_ERROR )
-        name = "wxICON_ERROR";
-    else if ( id == wxART_INFORMATION )
-        name = "wxICON_INFORMATION";
-    else if ( id == wxART_WARNING )
-        name = "wxICON_WARNING";
-    else if ( id == wxART_QUESTION )
-        name = "wxICON_QUESTION";
+    wxBitmap bitmap;
 
-    if ( name )
-        return CreateFromStdIcon(name, client);
+#ifdef wxHAS_SHGetStockIconInfo
+    // first try to use SHGetStockIconInfo, available only on Vista and higher
+    SHSTOCKICONID stockIconId = MSWGetStockIconIdForArtProviderId( id );
+    if ( stockIconId != SIID_INVALID )
+    {
+        WinStruct<SHSTOCKICONINFO> sii;
+
+        UINT uFlags = SHGSI_ICON;
+        if ( size != wxDefaultSize )
+        {
+            if ( size.x <= 16 )
+                uFlags |= SHGSI_SMALLICON;
+            else if ( size.x >= 64 )
+                uFlags |= SHGSI_LARGEICON;
+        }
+
+        HRESULT res = MSW_SHGetStockIconInfo(stockIconId, uFlags, &sii);
+        if ( res == S_OK )
+        {
+            wxIcon icon;
+            icon.CreateFromHICON( (WXHICON)sii.hIcon );
+
+            wxBitmap bitmap( icon );
+            ::DestroyIcon(sii.hIcon);
+
+            if ( bitmap.IsOk() )
+                return bitmap;
+        }
+    }
+#endif // wxHAS_SHGetStockIconInfo
+
+
+#if wxUSE_FSVOLUME
+    // now try SHGetFileInfo
+    wxFSVolumeKind volKind = wxFS_VOL_OTHER;
+    if ( id == wxART_HARDDISK )
+        volKind = wxFS_VOL_DISK;
+    else if ( id == wxART_FLOPPY )
+        volKind = wxFS_VOL_FLOPPY;
+    else if ( id == wxART_CDROM )
+        volKind = wxFS_VOL_CDROM;
+
+    if ( volKind != wxFS_VOL_OTHER )
+    {
+        bitmap = GetDriveBitmapForVolumeType(volKind, size);
+        if ( bitmap.IsOk() )
+            return bitmap;
+    }
+#endif // wxUSE_FSVOLUME
+
+    // notice that the directory used here doesn't need to exist
+    if ( id == wxART_FOLDER )
+        bitmap = MSWGetBitmapForPath("C:\\wxdummydir\\", size );
+    else if ( id == wxART_FOLDER_OPEN )
+        bitmap = MSWGetBitmapForPath("C:\\wxdummydir\\", size, SHGFI_OPENICON );
+
+    if ( !bitmap.IsOk() )
+    {
+        // handle message box icons specially (wxIcon ctor treat these names
+        // as special cases via wxICOResourceHandler::LoadIcon):
+        const char *name = NULL;
+        if ( id == wxART_ERROR )
+            name = "wxICON_ERROR";
+        else if ( id == wxART_INFORMATION )
+            name = "wxICON_INFORMATION";
+        else if ( id == wxART_WARNING )
+            name = "wxICON_WARNING";
+        else if ( id == wxART_QUESTION )
+            name = "wxICON_QUESTION";
+
+        if ( name )
+            return CreateFromStdIcon(name, client);
+    }
 
     // for anything else, fall back to generic provider:
-    return wxNullBitmap;
+    return bitmap;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/basemsw.cpp b/Externals/wxWidgets3/src/msw/basemsw.cpp
index 4de6b51c89..3204e02154 100644
--- a/Externals/wxWidgets3/src/msw/basemsw.cpp
+++ b/Externals/wxWidgets3/src/msw/basemsw.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id: basemsw.cpp 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/bitmap.cpp b/Externals/wxWidgets3/src/msw/bitmap.cpp
index 624cabfff6..61ad4d25f8 100644
--- a/Externals/wxWidgets3/src/msw/bitmap.cpp
+++ b/Externals/wxWidgets3/src/msw/bitmap.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: bitmap.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,7 @@
     #include "wx/image.h"
 #endif
 
+#include "wx/scopedptr.h"
 #include "wx/msw/private.h"
 #include "wx/msw/dc.h"
 
@@ -62,12 +62,14 @@
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
 {
 public:
-    wxBitmapRefData();
+    wxBitmapRefData() { Init(); }
     wxBitmapRefData(const wxBitmapRefData& data);
     virtual ~wxBitmapRefData() { Free(); }
 
     virtual void Free();
 
+    void CopyFromDIB(const wxDIB& dib);
+
     // set the mask object to use as the mask, we take ownership of it
     void SetMask(wxMask *mask)
     {
@@ -114,6 +116,8 @@ public:
     bool m_isDIB;
 
 private:
+    void Init();
+
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 
@@ -183,7 +187,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 // wxBitmapRefData
 // ----------------------------------------------------------------------------
 
-wxBitmapRefData::wxBitmapRefData()
+void wxBitmapRefData::Init()
 {
 #if wxDEBUG_LEVEL
     m_selectedInto = NULL;
@@ -202,23 +206,25 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
                : wxGDIImageRefData(data)
 {
-#if wxDEBUG_LEVEL
-    m_selectedInto = NULL;
-#endif
+    Init();
 
     // (deep) copy the mask if present
-    m_bitmapMask = NULL;
     if (data.m_bitmapMask)
         m_bitmapMask = new wxMask(*data.m_bitmapMask);
 
-    // FIXME: we don't copy m_hBitmap currently but we should, see wxBitmap::
-    //        CloneGDIRefData()
-
-    wxASSERT_MSG( !data.m_isDIB,
+    wxASSERT_MSG( !data.m_dib,
                     wxT("can't copy bitmap locked for raw access!") );
-    m_isDIB = false;
 
     m_hasAlpha = data.m_hasAlpha;
+
+#if wxUSE_WXDIB
+    // copy the other bitmap
+    if ( data.m_hBitmap )
+    {
+        wxDIB dib((HBITMAP)(data.m_hBitmap));
+        CopyFromDIB(dib);
+    }
+#endif // wxUSE_WXDIB
 }
 
 void wxBitmapRefData::Free()
@@ -241,6 +247,35 @@ void wxBitmapRefData::Free()
     wxDELETE(m_bitmapMask);
 }
 
+void wxBitmapRefData::CopyFromDIB(const wxDIB& dib)
+{
+    wxCHECK_RET( !IsOk(), "bitmap already initialized" );
+    wxCHECK_RET( dib.IsOk(), wxT("invalid DIB in CopyFromDIB") );
+
+#ifdef SOMETIMES_USE_DIB
+    HBITMAP hbitmap = dib.CreateDDB();
+    if ( !hbitmap )
+        return;
+    m_isDIB = false;
+#else // ALWAYS_USE_DIB
+    HBITMAP hbitmap = const_cast<wxDIB &>(dib).Detach();
+    m_isDIB = true;
+#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB
+
+    m_width = dib.GetWidth();
+    m_height = dib.GetHeight();
+    m_depth = dib.GetDepth();
+
+    m_hBitmap = (WXHBITMAP)hbitmap;
+
+#if wxUSE_PALETTE
+    wxPalette *palette = dib.CreatePalette();
+    if ( palette )
+        m_bitmapPalette = *palette;
+    delete palette;
+#endif // wxUSE_PALETTE
+}
+
 // ----------------------------------------------------------------------------
 // wxBitmap creation
 // ----------------------------------------------------------------------------
@@ -250,46 +285,9 @@ wxGDIImageRefData *wxBitmap::CreateData() const
     return new wxBitmapRefData;
 }
 
-wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    const wxBitmapRefData *
-        data = static_cast<const wxBitmapRefData *>(dataOrig);
-    if ( !data )
-        return NULL;
-
-    // FIXME: this method is backwards, it should just create a new
-    //        wxBitmapRefData using its copy ctor but instead it modifies this
-    //        bitmap itself and then returns its m_refData -- which works, of
-    //        course (except in !wxUSE_WXDIB), but is completely illogical
-    wxBitmap *self = const_cast<wxBitmap *>(this);
-
-    wxBitmapRefData *selfdata;
-#if wxUSE_WXDIB
-    // copy the other bitmap
-    if ( data->m_hBitmap )
-    {
-        wxDIB dib((HBITMAP)(data->m_hBitmap));
-        self->CopyFromDIB(dib);
-
-        selfdata = static_cast<wxBitmapRefData *>(m_refData);
-        selfdata->m_hasAlpha = data->m_hasAlpha;
-    }
-    else
-#endif // wxUSE_WXDIB
-    {
-        // copy the bitmap data
-        selfdata = new wxBitmapRefData(*data);
-        self->m_refData = selfdata;
-    }
-
-    // copy also the mask
-    wxMask * const maskSrc = data->GetMask();
-    if ( maskSrc )
-    {
-        selfdata->SetMask(new wxMask(*maskSrc));
-    }
-
-    return selfdata;
+    return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
 }
 
 bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
@@ -342,8 +340,9 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
                     wxDIB dib(iconInfo.hbmColor);
                     if (dib.IsOk())
                     {
-                        const unsigned char* pixels = dib.GetData();
-                        for (int idx = 0; idx < w*h*4; idx+=4)
+                        unsigned char* const pixels = dib.GetData();
+                        int idx;
+                        for ( idx = 0; idx < w*h*4; idx += 4 )
                         {
                             if (pixels[idx+3] != 0)
                             {
@@ -353,6 +352,25 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
                                 break;
                             }
                         }
+
+                        if ( refData->m_hasAlpha )
+                        {
+                            // If we do have alpha, ensure we use premultiplied
+                            // data for our pixels as this is what the bitmaps
+                            // created in other ways do and this is necessary
+                            // for e.g. AlphaBlend() to work with this bitmap.
+                            for ( idx = 0; idx < w*h*4; idx += 4 )
+                            {
+                                const unsigned char a = pixels[idx+3];
+
+                                pixels[idx]   = ((pixels[idx]  *a) + 127)/255;
+                                pixels[idx+1] = ((pixels[idx+1]*a) + 127)/255;
+                                pixels[idx+2] = ((pixels[idx+2]*a) + 127)/255;
+                            }
+
+                            ::DeleteObject(refData->m_hBitmap);
+                            refData->m_hBitmap = dib.Detach();
+                        }
                     }
                 }
             }
@@ -407,37 +425,13 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp)
 
 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {
-    wxCHECK_MSG( dib.IsOk(), false, wxT("invalid DIB in CopyFromDIB") );
-
-#ifdef SOMETIMES_USE_DIB
-    HBITMAP hbitmap = dib.CreateDDB();
-    if ( !hbitmap )
+    wxScopedPtr<wxBitmapRefData> newData(new wxBitmapRefData);
+    newData->CopyFromDIB(dib);
+    if ( !newData->IsOk() )
         return false;
-#else // ALWAYS_USE_DIB
-    HBITMAP hbitmap = const_cast<wxDIB &>(dib).Detach();
-#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB
 
     UnRef();
-
-    wxBitmapRefData *refData = new wxBitmapRefData;
-    m_refData = refData;
-
-    refData->m_width = dib.GetWidth();
-    refData->m_height = dib.GetHeight();
-    refData->m_depth = dib.GetDepth();
-
-    refData->m_hBitmap = (WXHBITMAP)hbitmap;
-
-#if wxUSE_PALETTE
-    wxPalette *palette = dib.CreatePalette();
-    if ( palette )
-    {
-        refData->m_bitmapPalette = *palette;
-    }
-
-    delete palette;
-#endif // wxUSE_PALETTE
-
+    m_refData = newData.release();
     return true;
 }
 
@@ -1178,15 +1172,6 @@ wxMask *wxBitmap::GetMask() const
     return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
 }
 
-wxBitmap wxBitmap::GetMaskBitmap() const
-{
-    wxBitmap bmp;
-    wxMask *mask = GetMask();
-    if ( mask )
-        bmp.SetHBITMAP(mask->GetMaskBitmap());
-    return bmp;
-}
-
 wxDC *wxBitmap::GetSelectedInto() const
 {
 #if wxDEBUG_LEVEL
@@ -1554,6 +1539,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
+wxBitmap wxMask::GetBitmap() const
+{
+    wxBitmap bmp;
+    bmp.SetHBITMAP(m_maskBitmap);
+    return bmp;
+}
+
 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/bmpbuttn.cpp b/Externals/wxWidgets3/src/msw/bmpbuttn.cpp
index 76a63576c7..42eddf7fd4 100644
--- a/Externals/wxWidgets3/src/msw/bmpbuttn.cpp
+++ b/Externals/wxWidgets3/src/msw/bmpbuttn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: bmpbuttn.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/bmpcbox.cpp b/Externals/wxWidgets3/src/msw/bmpcbox.cpp
index ef7deffc98..f6d5950a02 100644
--- a/Externals/wxWidgets3/src/msw/bmpcbox.cpp
+++ b/Externals/wxWidgets3/src/msw/bmpcbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-04-06
-// RCS-ID:      $Id: bmpcbox.cpp 70039 2011-12-17 23:52:43Z VZ $
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,6 +30,7 @@
 #endif
 
 #include "wx/settings.h"
+#include "wx/vector.h"
 
 #include "wx/msw/dcclient.h"
 #include "wx/msw/private.h"
@@ -132,7 +132,31 @@ void wxBitmapComboBox::RecreateControl()
     wxPoint pos = GetPosition();
     wxSize size = GetSize();
     size.y = GetBestSize().y;
-    wxArrayString strings = GetStrings();
+    const wxArrayString strings = GetStrings();
+    const unsigned numItems = strings.size();
+    unsigned i;
+
+    // Save the client data pointers before clearing the control, if any.
+    const wxClientDataType clientDataType = GetClientDataType();
+    wxVector<wxClientData*> objectClientData;
+    wxVector<void*> voidClientData;
+    switch ( clientDataType )
+    {
+        case wxClientData_None:
+            break;
+
+        case wxClientData_Object:
+            objectClientData.reserve(numItems);
+            for ( i = 0; i < numItems; ++i )
+                objectClientData.push_back(GetClientObject(i));
+            break;
+
+        case wxClientData_Void:
+            voidClientData.reserve(numItems);
+            for ( i = 0; i < numItems; ++i )
+                voidClientData.push_back(GetClientData(i));
+            break;
+    }
 
     wxComboBox::DoClear();
 
@@ -144,9 +168,14 @@ void wxBitmapComboBox::RecreateControl()
         return;
 
     // initialize the controls contents
-    for ( unsigned int i = 0; i < strings.size(); i++ )
+    for ( i = 0; i < numItems; i++ )
     {
         wxComboBox::Append(strings[i]);
+
+        if ( !objectClientData.empty() )
+            SetClientObject(i, objectClientData[i]);
+        else if ( !voidClientData.empty() )
+            SetClientData(i, voidClientData[i]);
     }
 
     // and make sure it has the same attributes as before
diff --git a/Externals/wxWidgets3/src/msw/brush.cpp b/Externals/wxWidgets3/src/msw/brush.cpp
index a4300be424..f2c63c32b8 100644
--- a/Externals/wxWidgets3/src/msw/brush.cpp
+++ b/Externals/wxWidgets3/src/msw/brush.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: brush.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/button.cpp b/Externals/wxWidgets3/src/msw/button.cpp
index cdf3a823d8..33beb43256 100644
--- a/Externals/wxWidgets3/src/msw/button.cpp
+++ b/Externals/wxWidgets3/src/msw/button.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: button.cpp 69984 2011-12-11 17:03:56Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -192,16 +191,25 @@ wxSize wxButtonBase::GetDefaultSize()
 // ----------------------------------------------------------------------------
 
 /*
-   The comment below and all this code is probably due to not using WM_NEXTDLGCTL
-   message when changing focus (but just SetFocus() which is not enough), see
-   http://blogs.msdn.com/oldnewthing/archive/2004/08/02/205624.aspx for the
-   full explanation.
+   In normal Windows programs there is no need to handle default button
+   manually because this is taken care by the system provided you use
+   WM_NEXTDLGCTL and not just SetFocus() to switch focus betweeh the controls
+   (see http://blogs.msdn.com/oldnewthing/archive/2004/08/02/205624.aspx for
+   the full explanation why just calling SetFocus() is not enough).
 
-   TODO: Do use WM_NEXTDLGCTL and get rid of all this code.
+   However this only works if the window is a dialog, i.e. uses DefDlgProc(),
+   but not with plain windows using DefWindowProc() and we do want to have
+   default buttons inside frames as well, so we're forced to reimplement all
+   this logic ourselves. It would be great to avoid having to do this but using
+   DefDlgProc() for all the windows would almost certainly result in more
+   problems, we'd need to carefully filter messages and pass some of them to
+   DefWindowProc() and some of them to DefDlgProc() which looks dangerous (what
+   if the handling of some message changes in some Windows version?), so doing
+   this ourselves is probably a lesser evil.
 
+   Read the rest to learn everything you ever wanted to know about the default
+   buttons but were afraid to ask.
 
-   "Everything you ever wanted to know about the default buttons" or "Why do we
-   have to do all this?"
 
    In MSW the default button should be activated when the user presses Enter
    and the current control doesn't process Enter itself somehow. This is
@@ -223,14 +231,6 @@ wxSize wxButtonBase::GetDefaultSize()
    to it. When the button loses focus, it unsets the temporary default and so
    the default item will be the permanent default -- that is the default button
    if any had been set or none otherwise, which is just what we want.
-
-   NB: all this is quite complicated by now and the worst is that normally
-       it shouldn't be necessary at all as for the normal Windows programs
-       DefWindowProc() and IsDialogMessage() take care of all this
-       automatically -- however in wxWidgets programs this doesn't work for
-       nested hierarchies (i.e. a notebook inside a notebook) for unknown
-       reason and so we have to reproduce all this code ourselves. It would be
-       very nice if we could avoid doing it.
  */
 
 // set this button as the (permanently) default one in its panel
@@ -277,7 +277,7 @@ static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
 // set this button as being currently default
 void wxButton::SetTmpDefault()
 {
-    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent());
+    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
     if ( !tlw )
         return;
 
@@ -291,7 +291,7 @@ void wxButton::SetTmpDefault()
 // unset this button as currently default, it may still stay permanent default
 void wxButton::UnsetTmpDefault()
 {
-    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent());
+    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
     if ( !tlw )
         return;
 
@@ -359,7 +359,7 @@ wxButton::SetDefaultStyle(wxButton *btn, bool on)
 
 bool wxButton::SendClickEvent()
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_BUTTON, GetId());
     event.SetEventObject(this);
 
     return ProcessCommand(event);
diff --git a/Externals/wxWidgets3/src/msw/calctrl.cpp b/Externals/wxWidgets3/src/msw/calctrl.cpp
index badc7e8821..ac0d8bbd76 100644
--- a/Externals/wxWidgets3/src/msw/calctrl.cpp
+++ b/Externals/wxWidgets3/src/msw/calctrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxCalendarCtrl implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-04-04
-// RCS-ID:      $Id: calctrl.cpp 70568 2012-02-11 16:26:47Z VZ $
 // Copyright:   (C) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -109,7 +108,7 @@ wxCalendarCtrl::Create(wxWindow *parent,
     }
 
     const wxChar * const clsname = s_clsMonthCal.IsRegistered()
-        ? s_clsMonthCal.GetName().wx_str()
+        ? s_clsMonthCal.GetName().t_str()
         : MONTHCAL_CLASS;
 
     if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
@@ -474,7 +473,9 @@ bool wxCalendarCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 wxDateTime startDate;
                 startDate.SetFromMSWSysDate(ds->stStart);
 
-                wxDateTime currentDate = m_date;
+                // Ensure we have a valid date to work with.
+                wxDateTime currentDate = m_date.IsValid() ? m_date : startDate;
+
                 // Set to the start of month for comparison with startDate to
                 // work correctly.
                 currentDate.SetDay(1);
diff --git a/Externals/wxWidgets3/src/msw/caret.cpp b/Externals/wxWidgets3/src/msw/caret.cpp
index 4608db0121..677cf5c339 100644
--- a/Externals/wxWidgets3/src/msw/caret.cpp
+++ b/Externals/wxWidgets3/src/msw/caret.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id: caret.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/checkbox.cpp b/Externals/wxWidgets3/src/msw/checkbox.cpp
index 371dde59fa..b5601e72d8 100644
--- a/Externals/wxWidgets3/src/msw/checkbox.cpp
+++ b/Externals/wxWidgets3/src/msw/checkbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: checkbox.cpp 70015 2011-12-16 11:03:15Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -104,7 +103,18 @@ bool wxCheckBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
-    long msStyle = WS_TABSTOP;
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+
+    msStyle |= wxMSWButton::GetMultilineStyle(label);
+
+    return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle);
+}
+
+WXDWORD wxCheckBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // buttons never have an external border, they draw their own one
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     if ( style & wxCHK_3STATE )
         msStyle |= BS_3STATE;
@@ -116,16 +126,14 @@ bool wxCheckBox::Create(wxWindow *parent,
         msStyle |= BS_LEFTTEXT | BS_RIGHT;
     }
 
-    msStyle |= wxMSWButton::GetMultilineStyle(label);
-
-    return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
+    return msStyle;
 }
 
 // ----------------------------------------------------------------------------
 // wxCheckBox geometry
 // ----------------------------------------------------------------------------
 
-wxSize wxCheckBox::DoGetBestSize() const
+wxSize wxCheckBox::DoGetBestClientSize() const
 {
     static int s_checkSize = 0;
 
@@ -252,7 +260,7 @@ bool wxCheckBox::MSWCommand(WXUINT cmd, WXWORD WXUNUSED(id))
 
 
     // generate the event
-    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_CHECKBOX, m_windowId);
 
     event.SetInt(state);
     event.SetEventObject(this);
@@ -273,7 +281,7 @@ bool wxCheckBox::SetForegroundColour(const wxColour& colour)
     // the only way to change the checkbox foreground colour under Windows XP
     // is to owner draw it
     if ( wxUxThemeEngine::GetIfActive() )
-        MakeOwnerDrawn(colour.IsOk());
+        MSWMakeOwnerDrawn(colour.IsOk());
 
     return true;
 }
@@ -284,7 +292,7 @@ bool wxCheckBox::IsOwnerDrawn() const
         (::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_OWNERDRAW) == BS_OWNERDRAW;
 }
 
-void wxCheckBox::MakeOwnerDrawn(bool ownerDrawn)
+void wxCheckBox::MSWMakeOwnerDrawn(bool ownerDrawn)
 {
     long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
 
@@ -369,32 +377,35 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     RECT& rect = dis->rcItem;
     RECT rectCheck,
          rectLabel;
-    rectCheck.top =
-    rectLabel.top = rect.top;
-    rectCheck.bottom =
-    rectLabel.bottom = rect.bottom;
-    const int checkSize = GetBestSize().y;
+    rectLabel.top = rect.top + (rect.bottom - rect.top - GetBestSize().y) / 2;
+    rectLabel.bottom = rectLabel.top + GetBestSize().y;
     const int MARGIN = 3;
+    const int CXMENUCHECK = ::GetSystemMetrics(SM_CXMENUCHECK);
+    // the space between the checkbox and the label is included in the
+    // check-mark bitmap
+    const int checkSize = wxMin(CXMENUCHECK - MARGIN, GetSize().y);
+    rectCheck.top = rect.top + (rect.bottom - rect.top - checkSize) / 2;
+    rectCheck.bottom = rectCheck.top + checkSize;
 
     const bool isRightAligned = HasFlag(wxALIGN_RIGHT);
     if ( isRightAligned )
     {
-        rectCheck.right = rect.right;
-        rectCheck.left = rectCheck.right - checkSize;
-
-        rectLabel.right = rectCheck.left - MARGIN;
+        rectLabel.right = rect.right - CXMENUCHECK;
         rectLabel.left = rect.left;
+
+        rectCheck.left = rectLabel.right + ( CXMENUCHECK + MARGIN - checkSize ) / 2;
+        rectCheck.right = rectCheck.left + checkSize;
     }
     else // normal, left-aligned checkbox
     {
-        rectCheck.left = rect.left;
+        rectCheck.left = rect.left + ( CXMENUCHECK - MARGIN - checkSize ) / 2;
         rectCheck.right = rectCheck.left + checkSize;
 
-        rectLabel.left = rectCheck.right + MARGIN;
+        rectLabel.left = rect.left + CXMENUCHECK;
         rectLabel.right = rect.right;
     }
 
-    // show we draw a focus rect?
+    // shall we draw a focus rect?
     const bool isFocused = m_isPressed || FindFocus() == this;
 
 
@@ -447,11 +458,21 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // around it
     if ( isFocused )
     {
-        if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel,
+        RECT oldLabelRect = rectLabel; // needed if right aligned
+
+        if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel,
                          fmt | DT_CALCRECT) )
         {
             wxLogLastError(wxT("DrawText(DT_CALCRECT)"));
         }
+
+        if ( isRightAligned )
+        {
+            // move the label rect to the right
+            const int labelWidth = rectLabel.right - rectLabel.left;
+            rectLabel.right = oldLabelRect.right;
+            rectLabel.left = rectLabel.right - labelWidth;
+        }
     }
 
     if ( !IsEnabled() )
@@ -459,7 +480,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         ::SetTextColor(hdc, ::GetSysColor(COLOR_GRAYTEXT));
     }
 
-    if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel, fmt) )
+    if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel, fmt) )
     {
         wxLogLastError(wxT("DrawText()"));
     }
diff --git a/Externals/wxWidgets3/src/msw/checklst.cpp b/Externals/wxWidgets3/src/msw/checklst.cpp
index 58982c47d8..36484a73a9 100644
--- a/Externals/wxWidgets3/src/msw/checklst.cpp
+++ b/Externals/wxWidgets3/src/msw/checklst.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id: checklst.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -61,7 +60,7 @@ namespace
     // space around check mark bitmap in pixels
     static const int CHECKMARK_EXTRA_SPACE = 1;
 
-    // space betwen check bitmap and text label
+    // space between check bitmap and text label
     static const int CHECKMARK_LABEL_SPACE = 2;
 
 } // anonymous namespace
diff --git a/Externals/wxWidgets3/src/msw/choice.cpp b/Externals/wxWidgets3/src/msw/choice.cpp
index ce5c5510dc..6699e1e95b 100644
--- a/Externals/wxWidgets3/src/msw/choice.cpp
+++ b/Externals/wxWidgets3/src/msw/choice.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     04/01/98
-// RCS-ID:      $Id: choice.cpp 70870 2012-03-11 05:31:06Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,6 +35,8 @@
     #include "wx/settings.h"
 #endif
 
+#include "wx/dynlib.h"
+
 #include "wx/msw/private.h"
 
 // ============================================================================
@@ -198,6 +199,28 @@ wxChoice::~wxChoice()
     Clear();
 }
 
+bool wxChoice::MSWGetComboBoxInfo(tagCOMBOBOXINFO* info) const
+{
+    // TODO-Win9x: Get rid of this once we officially drop support for Win9x
+    //             and just call the function directly.
+#if wxUSE_DYNLIB_CLASS
+    typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, tagCOMBOBOXINFO*);
+    static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
+    static bool s_triedToLoad = false;
+    if ( !s_triedToLoad )
+    {
+        s_triedToLoad = true;
+        wxLoadedDLL dllUser32("user32.dll");
+        wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32);
+    }
+
+    if ( s_pfnGetComboBoxInfo )
+        return (*s_pfnGetComboBoxInfo)(GetHwnd(), info) != 0;
+#endif // wxUSE_DYNLIB_CLASS
+
+    return false;
+}
+
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
@@ -333,7 +356,7 @@ int wxChoice::FindString(const wxString& s, bool bCase) const
    else
    {
        int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
-                                  (WPARAM)-1, (LPARAM)s.wx_str());
+                                  (WPARAM)-1, wxMSW_CONV_LPARAM(s));
 
        return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
@@ -360,7 +383,7 @@ void wxChoice::SetString(unsigned int n, const wxString& s)
     const bool wasSelected = static_cast<int>(n) == GetSelection();
 
     ::SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
-    ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LPARAM)s.wx_str() );
+    ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, wxMSW_CONV_LPARAM(s) );
 
     // restore the client data
     if ( oldData )
@@ -413,7 +436,16 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 
 void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
+    // Before using GetLastError() below, ensure that we don't have a stale
+    // error code from a previous API call as CB_GETITEMDATA doesn't reset it
+    // in case of success, it only sets it if an error occurs.
+    SetLastError(ERROR_SUCCESS);
+
     LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
+
+    // Notice that we must call GetLastError() to distinguish between a real
+    // error and successfully retrieving a previously stored client data value
+    // of CB_ERR (-1).
     if ( rc == CB_ERR && GetLastError() != ERROR_SUCCESS )
     {
         wxLogLastError(wxT("CB_GETITEMDATA"));
@@ -587,35 +619,8 @@ void wxChoice::DoSetSize(int x, int y,
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    // find the widest string
-    int wChoice = 0;
-    int hChoice;
-    const unsigned int nItems = GetCount();
-    for ( unsigned int i = 0; i < nItems; i++ )
-    {
-        int wLine;
-        GetTextExtent(GetString(i), &wLine, NULL);
-        if ( wLine > wChoice )
-            wChoice = wLine;
-    }
-
-    // give it some reasonable default value if there are no strings in the
-    // list
-    if ( wChoice == 0 )
-        wChoice = 100;
-
-    // the combobox should be slightly larger than the widest string
-    wChoice += 5*GetCharWidth();
-    if( HasFlag( wxCB_SIMPLE ) )
-    {
-        hChoice = SetHeightSimpleComboBox( nItems );
-    }
-    else
-        hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight());
-
-    wxSize best(wChoice, hChoice);
-    CacheBestSize(best);
-    return best;
+    // The base version returns the size of the largest string
+    return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x);
 }
 
 int wxChoice::SetHeightSimpleComboBox(int nItems) const
@@ -626,6 +631,75 @@ int wxChoice::SetHeightSimpleComboBox(int nItems) const
     return EDIT_HEIGHT_FROM_CHAR_HEIGHT( cy ) * wxMin( wxMax( nItems, 3 ), 6 ) + hItem - 1;
 }
 
+wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    int cHeight = GetCharHeight();
+
+    // We are interested in the difference of sizes between the whole control
+    // and its child part. I.e. arrow, separators, etc.
+    wxSize tsize(xlen, 0);
+
+    // FIXME-VC6: Only VC6 needs this guard, see WINVER definition in
+    //            include/wx/msw/wrapwin.h
+#if defined(WINVER) && WINVER >= 0x0500
+    WinStruct<COMBOBOXINFO> info;
+    if ( MSWGetComboBoxInfo(&info) )
+    {
+        tsize.x += info.rcItem.left + info.rcButton.right - info.rcItem.right
+                    + info.rcItem.left + 3; // right and extra margins
+    }
+    else // Just use some rough approximation.
+#endif // WINVER >= 0x0500
+    {
+        tsize.x += 4*cHeight;
+    }
+
+    // set height on our own
+    if( HasFlag( wxCB_SIMPLE ) )
+        tsize.y = SetHeightSimpleComboBox(GetCount());
+    else
+        tsize.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cHeight);
+
+    // Perhaps the user wants something different from CharHeight
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - cHeight);
+
+    return tsize;
+}
+
+// ----------------------------------------------------------------------------
+// Popup operations
+// ----------------------------------------------------------------------------
+
+void wxChoice::MSWDoPopupOrDismiss(bool show)
+{
+    wxASSERT_MSG( !HasFlag(wxCB_SIMPLE),
+                  wxT("can't popup/dismiss the list for simple combo box") );
+
+    // we *must* set focus to the combobox before showing or hiding the drop
+    // down as without this we get WM_LBUTTONDOWN messages with invalid HWND
+    // when hiding it (whether programmatically or manually) resulting in a
+    // crash when we pass them to IsDialogMessage()
+    //
+    // this can be seen in the combo page of the widgets sample under Windows 7
+    SetFocus();
+
+    ::SendMessage(GetHwnd(), CB_SHOWDROPDOWN, show, 0);
+}
+
+bool wxChoice::Show(bool show)
+{
+    if ( !wxChoiceBase::Show(show) )
+        return false;
+
+    // When hiding the combobox, we also need to hide its popup part as it
+    // doesn't happen automatically.
+    if ( !show && ::SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0) )
+        MSWDoPopupOrDismiss(false);
+
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // MSW message handlers
 // ----------------------------------------------------------------------------
@@ -674,9 +748,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     /*
         The native control provides a great variety in the events it sends in
         the different selection scenarios (undoubtedly for greater amusement of
-        the programmers using it). For the reference, here are the cases when
-        the final selection is accepted (things are quite interesting when it
-        is cancelled too):
+        the programmers using it). Here are the different cases:
 
         A. Selecting with just the arrows without opening the dropdown:
             1. CBN_SELENDOK
@@ -698,6 +770,12 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         Admire the different order of messages in all of those cases, it must
         surely have taken a lot of effort to Microsoft developers to achieve
         such originality.
+
+        Additionally, notice that CBN_SELENDCANCEL doesn't seem to actually
+        cancel anything, if we get CBN_SELCHANGE before it, as it happens in
+        the case (B), the selection is still accepted. This doesn't make much
+        sense and directly contradicts MSDN documentation but is how the native
+        comboboxes behave and so we do the same thing.
      */
     switch ( param )
     {
@@ -710,44 +788,40 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             break;
 
         case CBN_CLOSEUP:
-            // if the selection was accepted by the user, it should have been
-            // reset to wxID_NONE by CBN_SELENDOK, otherwise the selection was
-            // cancelled and we must restore the old one
-            if ( m_lastAcceptedSelection != wxID_NONE )
+            if ( m_pendingSelection != wxID_NONE )
             {
-                SetSelection(m_lastAcceptedSelection);
-                m_lastAcceptedSelection = wxID_NONE;
+                // This can only happen in the case (B), so set the item
+                // selected in the drop down as our real selection.
+                SendSelectionChangedEvent(wxEVT_CHOICE);
+                m_pendingSelection = wxID_NONE;
             }
             break;
 
         case CBN_SELENDOK:
-            // reset it to prevent CBN_CLOSEUP from undoing the selection (it's
-            // ok to reset it now as GetCurrentSelection() will now return the
-            // same thing anyhow)
-            m_lastAcceptedSelection = wxID_NONE;
+            // Reset the variables to prevent CBN_CLOSEUP from doing anything,
+            // it's not needed if we do get CBN_SELENDOK.
+            m_lastAcceptedSelection =
+            m_pendingSelection = wxID_NONE;
 
-            {
-                const int n = GetSelection();
-
-                wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
-                event.SetInt(n);
-                event.SetEventObject(this);
-
-                if ( n > -1 )
-                {
-                    event.SetString(GetStringSelection());
-                    InitCommandEventWithItems(event, n);
-                }
-
-                ProcessCommand(event);
-            }
+            SendSelectionChangedEvent(wxEVT_CHOICE);
             break;
 
-        // don't handle CBN_SELENDCANCEL: just leave m_lastAcceptedSelection
-        // valid and the selection will be undone in CBN_CLOSEUP above
+        case CBN_SELCHANGE:
+            // If we get this event after CBN_SELENDOK, i.e. cases (A) or (C)
+            // above, we don't have anything to do. But in the case (B) we need
+            // to remember that the selection should really change once the
+            // drop down is closed.
+            if ( m_lastAcceptedSelection != wxID_NONE )
+                m_pendingSelection = GetCurrentSelection();
+            break;
 
-        // don't handle CBN_SELCHANGE neither, we don't want to generate events
-        // while the dropdown is opened -- but do add it if we ever need this
+        case CBN_SELENDCANCEL:
+            // Do not reset m_pendingSelection here -- it would make sense but,
+            // as described above, native controls keep the selection even when
+            // closing the drop down by pressing Escape or TAB, so conform to
+            // their behaviour.
+            m_lastAcceptedSelection = wxID_NONE;
+            break;
 
         default:
             return false;
diff --git a/Externals/wxWidgets3/src/msw/clipbrd.cpp b/Externals/wxWidgets3/src/msw/clipbrd.cpp
index d994fed669..a1726e3a6f 100644
--- a/Externals/wxWidgets3/src/msw/clipbrd.cpp
+++ b/Externals/wxWidgets3/src/msw/clipbrd.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: clipbrd.cpp 70440 2012-01-23 11:28:01Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -79,6 +78,7 @@
 // ---------------------------------------------------------------------------
 
 static bool gs_wxClipboardIsOpen = false;
+static int gs_htmlcfid = 0;
 
 bool wxOpenClipboard()
 {
@@ -139,7 +139,9 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-   wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
+    wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
+    if (cf == wxDF_HTML)
+        cf = gs_htmlcfid;
 
     if ( ::IsClipboardFormatAvailable(cf) )
     {
@@ -304,10 +306,6 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 char *buf = new char [400 + strlen(html)];
                 if(!buf) return false;
 
-                // Get clipboard id for HTML format...
-                static int cfid = 0;
-                if(!cfid) cfid = RegisterClipboardFormat(wxT("HTML Format"));
-
                 // Create a template string for the HTML header...
                 strcpy(buf,
                     "Version:0.9\r\n"
@@ -358,7 +356,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);
 
-                handle = ::SetClipboardData(cfid, hText);
+                handle = ::SetClipboardData(gs_htmlcfid, hText);
 
                 // Free memory...
                 GlobalFree(hText);
@@ -598,6 +596,10 @@ bool wxClipboard::Flush()
 
 bool wxClipboard::Open()
 {
+    // Get clipboard id for HTML format...
+    if(!gs_htmlcfid)
+        gs_htmlcfid = RegisterClipboardFormat(wxT("HTML Format"));
+
     // OLE opens clipboard for us
     m_isOpened = true;
 #if wxUSE_OLE_CLIPBOARD
@@ -814,6 +816,8 @@ bool wxClipboard::GetData( wxDataObject& data )
         // convert to NativeFormat Id
         cf = formats[n].GetFormatId();
 
+        if (cf == wxDF_HTML)
+            cf = gs_htmlcfid;
         // if the format is not available, try the next one
         // this test includes implicit / sythetic formats
         if ( !::IsClipboardFormatAvailable(cf) )
diff --git a/Externals/wxWidgets3/src/msw/colordlg.cpp b/Externals/wxWidgets3/src/msw/colordlg.cpp
index db8097f21d..fca709586b 100644
--- a/Externals/wxWidgets3/src/msw/colordlg.cpp
+++ b/Externals/wxWidgets3/src/msw/colordlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colordlg.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +26,7 @@
 #if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #include "wx/colordlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
@@ -79,7 +79,7 @@ wxColourDialogHookProc(HWND hwnd,
 
         const wxString title = dialog->GetTitle();
         if ( !title.empty() )
-            ::SetWindowText(hwnd, title.wx_str());
+            ::SetWindowText(hwnd, title.t_str());
 
         dialog->MSWOnInitDone((WXHWND)hwnd);
     }
@@ -114,6 +114,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     // initialize the struct used by Windows
     CHOOSECOLOR chooseColorStruct;
     memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
diff --git a/Externals/wxWidgets3/src/msw/colour.cpp b/Externals/wxWidgets3/src/msw/colour.cpp
index 4a549d6a74..5b88ba84a3 100644
--- a/Externals/wxWidgets3/src/msw/colour.cpp
+++ b/Externals/wxWidgets3/src/msw/colour.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: colour.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/combo.cpp b/Externals/wxWidgets3/src/msw/combo.cpp
index 168f8243c4..3f9b3accbe 100644
--- a/Externals/wxWidgets3/src/msw/combo.cpp
+++ b/Externals/wxWidgets3/src/msw/combo.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.cpp 70870 2012-03-11 05:31:06Z JS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -426,7 +425,14 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
-    wxColour bgCol = GetBackgroundColour();
+
+    // FIXME: Either SetBackgroundColour or GetBackgroundColour
+    //        doesn't work under Vista, so here's a temporary
+    //        workaround.
+    //        In the theme-less rendering code below, this fixes incorrect
+    //        background on read-only comboboxes (they are gray, but should be
+    //        white).
+    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 
 #if wxUSE_UXTHEME
     const bool isEnabled = IsThisEnabled();
@@ -502,11 +508,6 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
         if ( useVistaComboBox )
         {
-            // FIXME: Either SetBackgroundColour or GetBackgroundColour
-            //        doesn't work under Vista, so here's a temporary
-            //        workaround.
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-
             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {
diff --git a/Externals/wxWidgets3/src/msw/combobox.cpp b/Externals/wxWidgets3/src/msw/combobox.cpp
index 6dbeadeb9f..692c546654 100644
--- a/Externals/wxWidgets3/src/msw/combobox.cpp
+++ b/Externals/wxWidgets3/src/msw/combobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: combobox.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,14 +31,13 @@
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/settings.h"
     #include "wx/log.h"
-    // for wxEVT_COMMAND_TEXT_ENTER
+    // for wxEVT_TEXT_ENTER
     #include "wx/textctrl.h"
     #include "wx/app.h"
     #include "wx/brush.h"
 #endif
 
 #include "wx/clipbrd.h"
-#include "wx/dynlib.h"
 #include "wx/wupdlock.h"
 #include "wx/msw/private.h"
 
@@ -93,6 +91,36 @@ static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;
 // implementation
 // ============================================================================
 
+namespace
+{
+
+// Check if the given message should be forwarded from the edit control which
+// is part of the combobox to wxComboBox itself. All messages generating the
+// events that the code using wxComboBox could be interested in must be
+// forwarded.
+bool ShouldForwardFromEditToCombo(UINT message)
+{
+    switch ( message )
+    {
+        case WM_KEYUP:
+        case WM_KEYDOWN:
+        case WM_CHAR:
+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:
+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            return true;
+    }
+
+    return false;
+}
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // wnd proc for subclassed edit control
 // ----------------------------------------------------------------------------
@@ -105,49 +133,34 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
     HWND hwndCombo = ::GetParent(hWnd);
     wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo);
 
-    switch ( message )
+    if ( ShouldForwardFromEditToCombo(message) )
     {
-        // forward some messages to the combobox to generate the appropriate
-        // wxEvents from them
-        case WM_KEYUP:
-        case WM_KEYDOWN:
-        case WM_CHAR:
-        case WM_SYSCHAR:
-        case WM_SYSKEYDOWN:
-        case WM_SYSKEYUP:
-        case WM_SETFOCUS:
-        case WM_KILLFOCUS:
+        wxComboBox *combo = wxDynamicCast(win, wxComboBox);
+        if ( !combo )
+        {
+            // we can get WM_KILLFOCUS while our parent is already half
+            // destroyed and hence doesn't look like a combobx any
+            // longer, check for it to avoid bogus assert failures
+            if ( !win->IsBeingDeleted() )
             {
-                wxComboBox *combo = wxDynamicCast(win, wxComboBox);
-                if ( !combo )
-                {
-                    // we can get WM_KILLFOCUS while our parent is already half
-                    // destroyed and hence doesn't look like a combobx any
-                    // longer, check for it to avoid bogus assert failures
-                    if ( !win->IsBeingDeleted() )
-                    {
-                        wxFAIL_MSG( wxT("should have combo as parent") );
-                    }
-                }
-                else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
-                {
-                    // handled by parent
-                    return 0;
-                }
+                wxFAIL_MSG( wxT("should have combo as parent") );
             }
-            break;
+        }
+        else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+        {
+            // handled by parent
+            return 0;
+        }
+    }
+    else if ( message == WM_GETDLGCODE )
+    {
+        wxCHECK_MSG( win, 0, wxT("should have a parent") );
 
-        case WM_GETDLGCODE:
-            {
-                wxCHECK_MSG( win, 0, wxT("should have a parent") );
-
-                if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
-                {
-                    // need to return a custom dlg code or we'll never get it
-                    return DLGC_WANTMESSAGE;
-                }
-            }
-            break;
+        if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
+        {
+            // need to return a custom dlg code or we'll never get it
+            return DLGC_WANTMESSAGE;
+        }
     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
@@ -215,49 +228,55 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
         case WM_CHAR:
             // for compatibility with wxTextCtrl, generate a special message
             // when Enter is pressed
-            if ( wParam == VK_RETURN )
+            switch ( wParam )
             {
-                if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
-                    return false;
+                case VK_RETURN:
+                    {
+                        if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
+                            return false;
 
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                        wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
 
-                const int sel = GetSelection();
-                event.SetInt(sel);
-                event.SetString(GetValue());
-                InitCommandEventWithItems(event, sel);
+                        const int sel = GetSelection();
+                        event.SetInt(sel);
+                        event.SetString(GetValue());
+                        InitCommandEventWithItems(event, sel);
 
-                if ( ProcessCommand(event) )
-                {
-                    // don't let the event through to the native control
-                    // because it doesn't need it and may generate an annoying
-                    // beep if it gets it
-                    return true;
-                }
+                        if ( ProcessCommand(event) )
+                        {
+                            // don't let the event through to the native control
+                            // because it doesn't need it and may generate an annoying
+                            // beep if it gets it
+                            return true;
+                        }
+                    }
+                    break;
+
+                case VK_TAB:
+                    // If we have wxTE_PROCESS_ENTER style, we get all char
+                    // events, including those for TAB which are usually used
+                    // for keyboard navigation, but we should not process them
+                    // unless we also have wxTE_PROCESS_TAB style.
+                    if ( !HasFlag(wxTE_PROCESS_TAB) )
+                    {
+                        int flags = 0;
+                        if ( !wxIsShiftDown() )
+                            flags |= wxNavigationKeyEvent::IsForward;
+                        if ( wxIsCtrlDown() )
+                            flags |= wxNavigationKeyEvent::WinChange;
+                        if ( Navigate(flags) )
+                            return true;
+                    }
+                    break;
             }
-            // fall through
+    }
 
-        case WM_SYSCHAR:
-            return HandleChar(wParam, lParam);
-
-        case WM_SYSKEYDOWN:
-        case WM_KEYDOWN:
-            return HandleKeyDown(wParam, lParam);
-
-        case WM_SYSKEYUP:
-        case WM_KEYUP:
-            return HandleKeyUp(wParam, lParam);
-
-        case WM_SETFOCUS:
-            return HandleSetFocus((WXHWND)wParam);
-
-        case WM_KILLFOCUS:
-            return HandleKillFocus((WXHWND)wParam);
-
-        case WM_CUT:
-        case WM_COPY:
-        case WM_PASTE:
-            return HandleClipboardEvent(msg);
+    if ( ShouldForwardFromEditToCombo(msg) )
+    {
+        // For all the messages forward from the edit control the
+        // result is not used.
+        WXLRESULT result;
+        return MSWHandleMessage(&result, msg, wParam, lParam);
     }
 
     return false;
@@ -273,26 +292,27 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
         case CBN_DROPDOWN:
             // remember the last selection, just as wxChoice does
             m_lastAcceptedSelection = GetCurrentSelection();
-            if ( m_lastAcceptedSelection == -1 )
             {
-                // but unlike with wxChoice we may have no selection but still
-                // have some text and we should avoid erasing it if the drop
-                // down is cancelled (see #8474)
-                m_lastAcceptedSelection = wxID_NONE;
-            }
-            {
-                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+                wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId());
                 event.SetEventObject(this);
                 ProcessCommand(event);
             }
             break;
+
         case CBN_CLOSEUP:
+            // Do the same thing as in wxChoice but using different event type.
+            if ( m_pendingSelection != wxID_NONE )
             {
-                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+                SendSelectionChangedEvent(wxEVT_COMBOBOX);
+                m_pendingSelection = wxID_NONE;
+            }
+            {
+                wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId());
                 event.SetEventObject(this);
                 ProcessCommand(event);
             }
             break;
+
         case CBN_SELENDOK:
 #ifndef __SMARTPHONE__
             // we need to reset this to prevent the selection from being undone
@@ -308,25 +328,18 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
             // this string is going to become the new combobox value soon but
             // we need it to be done right now, otherwise the event handler
             // could get a wrong value when it calls our GetValue()
-            ::SetWindowText(GetHwnd(), value.wx_str());
+            ::SetWindowText(GetHwnd(), value.t_str());
 
-            {
-                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
-                event.SetInt(sel);
-                event.SetString(value);
-                InitCommandEventWithItems(event, sel);
+            SendSelectionChangedEvent(wxEVT_COMBOBOX);
 
-                ProcessCommand(event);
-            }
-
-            // fall through: for compability with wxGTK, also send the text
+            // fall through: for compatibility with wxGTK, also send the text
             // update event when the selection changes (this also seems more
             // logical as the text does change)
 
         case CBN_EDITCHANGE:
             if ( m_allowTextEvents )
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+                wxCommandEvent event(wxEVT_TEXT, GetId());
 
                 // if sel != -1, value was already initialized above
                 if ( sel == -1 )
@@ -376,26 +389,13 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
 
 WXHWND wxComboBox::GetEditHWNDIfAvailable() const
 {
-#if wxUSE_DYNLIB_CLASS
+    // FIXME-VC6: Only VC6 needs this guard, see WINVER definition in
+    //            include/wx/msw/wrapwin.h
 #if defined(WINVER) && WINVER >= 0x0500
-    typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*);
-    static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
-    static bool s_triedToLoad = false;
-    if ( !s_triedToLoad )
-    {
-        s_triedToLoad = true;
-        wxLoadedDLL dllUser32("user32.dll");
-        wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32);
-    }
-
-    if ( s_pfnGetComboBoxInfo )
-    {
-        WinStruct<COMBOBOXINFO> info;
-        (*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
+    WinStruct<COMBOBOXINFO> info;
+    if ( MSWGetComboBoxInfo(&info) )
         return info.hwndItem;
-    }
 #endif // WINVER >= 0x0500
-#endif // wxUSE_DYNLIB_CLASS
 
     if (HasFlag(wxCB_SIMPLE))
     {
@@ -548,6 +548,11 @@ void wxComboBox::Clear()
         wxTextEntry::Clear();
 }
 
+bool wxComboBox::ContainsHWND(WXHWND hWnd) const
+{
+    return hWnd == GetEditHWNDIfAvailable();
+}
+
 void wxComboBox::GetSelection(long *from, long *to) const
 {
     if ( !HasFlag(wxCB_READONLY) )
@@ -642,22 +647,6 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(IsEditable() && !wxTextEntry::IsEmpty());
 }
 
-void wxComboBox::MSWDoPopupOrDismiss(bool show)
-{
-    wxASSERT_MSG( !HasFlag(wxCB_SIMPLE),
-                  wxT("can't popup/dismiss the list for simple combo box") );
-
-    // we *must* set focus to the combobox before showing or hiding the drop
-    // down as without this we get WM_LBUTTONDOWN messages with invalid HWND
-    // when hiding it (whether programmatically or manually) resulting in a
-    // crash when we pass them to IsDialogMessage()
-    //
-    // this can be seen in the combo page of the widgets sample under Windows 7
-    SetFocus();
-
-    ::SendMessage(GetHwnd(), CB_SHOWDROPDOWN, show, 0);
-}
-
 #if wxUSE_TOOLTIPS
 
 void wxComboBox::DoSetToolTip(wxToolTip *tip)
@@ -665,7 +654,7 @@ void wxComboBox::DoSetToolTip(wxToolTip *tip)
     wxChoice::DoSetToolTip(tip);
 
     if ( tip && !HasFlag(wxCB_READONLY) )
-        tip->Add(GetEditHWND());
+        tip->AddOtherWindow(GetEditHWND());
 }
 
 #endif // wxUSE_TOOLTIPS
@@ -688,4 +677,38 @@ bool wxComboBox::SetHint(const wxString& hintOrig)
 
 #endif // wxUSE_UXTHEME
 
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
+
+    if ( !HasFlag(wxCB_READONLY) )
+    {
+        // Add the margins we have previously set
+        wxPoint marg( GetMargins() );
+        marg.x = wxMax(0, marg.x);
+        marg.y = wxMax(0, marg.y);
+        tsize.IncBy( marg );
+    }
+
+    return tsize;
+}
+
+wxWindow *wxComboBox::MSWFindItem(long id, WXHWND hWnd) const
+{
+    // The base class version considers that any window with the same ID as
+    // this one must be this window itself, but this is not the case for the
+    // comboboxes where the native control seems to always use the ID of 1000
+    // for the popup listbox that it creates -- and this ID may be the same as
+    // our own one. So we must explicitly check the HWND value too here and
+    // avoid eating the events from the listbox as otherwise it is rendered
+    // inoperative, see #15647.
+    if ( id == GetId() && hWnd && hWnd != GetHWND() )
+    {
+        // Must be the case described above.
+        return NULL;
+    }
+
+    return wxChoice::MSWFindItem(id, hWnd);
+}
+
 #endif // wxUSE_COMBOBOX
diff --git a/Externals/wxWidgets3/src/msw/commandlinkbutton.cpp b/Externals/wxWidgets3/src/msw/commandlinkbutton.cpp
index 6a822c01c1..653b48be8a 100644
--- a/Externals/wxWidgets3/src/msw/commandlinkbutton.cpp
+++ b/Externals/wxWidgets3/src/msw/commandlinkbutton.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxCommandLinkButton
 // Author:      Rickard Westerlund
 // Created:     2010-06-14
-// RCS-ID:      $Id: commandlinkbutton.cpp 65327 2010-08-17 14:48:50Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -92,7 +91,7 @@ wxCommandLinkButton::SetMainLabelAndNote(const wxString& mainLabel,
     if ( HasNativeCommandLinkButton() )
     {
         wxButton::SetLabel(mainLabel);
-        ::SendMessage(m_hWnd, BCM_SETNOTE, 0, (LPARAM) note.wx_str());
+        ::SendMessage(m_hWnd, BCM_SETNOTE, 0, wxMSW_CONV_LPARAM(note));
 
         // Preserve the user-specified label for GetLabel()
         m_labelOrig = mainLabel;
diff --git a/Externals/wxWidgets3/src/msw/control.cpp b/Externals/wxWidgets3/src/msw/control.cpp
index 582a5ba7e2..4bb6ae8423 100644
--- a/Externals/wxWidgets3/src/msw/control.cpp
+++ b/Externals/wxWidgets3/src/msw/control.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: control.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -132,7 +131,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create
-                        label.wx_str(),     // the window name
+                        label.t_str(),      // the window name
                         style,              // the window style
                         x, y, w, h,         // the window position and size
                         GetHwndOf(GetParent()),         // parent
@@ -163,7 +162,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // Notice that 0xffff is not a valid Unicode character so the problem
     // doesn't arise in Unicode build.
     if ( !label.empty() && label[0] == -1 )
-        ::SetWindowText(GetHwnd(), label.wx_str());
+        ::SetWindowText(GetHwnd(), label.t_str());
 #endif // !wxUSE_UNICODE
 
     // saving the label in m_labelOrig to return it verbatim
@@ -367,7 +366,23 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
     WXHBRUSH hbr = 0;
     if ( !colBg.IsOk() )
     {
-        if ( wxWindow *win = wxFindWinFromHandle(hWnd) )
+        wxWindow *win = wxFindWinFromHandle( hWnd );
+        if ( !win )
+        {
+            // If this HWND doesn't correspond to a wxWindow, it still might be
+            // one of its children for which we need to set the background
+            // brush, e.g. this is the case for the EDIT control that is part
+            // of wxComboBox. Check for this by asking the parent if it has it:
+            HWND parent = ::GetParent(hWnd);
+            if ( parent )
+            {
+                wxWindow *winParent = wxFindWinFromHandle( parent );
+                if( winParent && winParent->ContainsHWND( hWnd ) )
+                    win = winParent;
+             }
+        }
+
+        if ( win )
             hbr = win->MSWGetBgBrush(pDC);
 
         // if the control doesn't have any bg colour, foreground colour will be
@@ -427,6 +442,15 @@ WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
                              GetHWND());
 }
 
+wxWindow* wxControl::MSWFindItem(long id, WXHWND hWnd) const
+{
+    // is it us or one of our "internal" children?
+    if ( id == GetId() || (GetSubcontrols().Index(id) != wxNOT_FOUND) )
+        return const_cast<wxControl *>(this);
+
+    return wxControlBase::MSWFindItem(id, hWnd);
+}
+
 // ----------------------------------------------------------------------------
 // wxControlWithItems
 // ----------------------------------------------------------------------------
@@ -453,7 +477,7 @@ int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
                                               unsigned wm)
 {
     LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
-                            (LPARAM)item.wx_str());
+                            wxMSW_CONV_LPARAM(item));
     if ( n == CB_ERR || n == CB_ERRSPACE )
     {
         wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
diff --git a/Externals/wxWidgets3/src/msw/crashrpt.cpp b/Externals/wxWidgets3/src/msw/crashrpt.cpp
index 354b99532c..8f97402bc6 100644
--- a/Externals/wxWidgets3/src/msw/crashrpt.cpp
+++ b/Externals/wxWidgets3/src/msw/crashrpt.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.03
-// RCS-ID:      $Id: crashrpt.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -227,7 +226,9 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     }
     else // dbghelp.dll couldn't be loaded
     {
-        Output(wxT("%s"), wxDbgHelpDLL::GetErrorMessage().c_str());
+        Output(wxT("%s"), static_cast<const wxChar*>(
+                    wxDbgHelpDLL::GetErrorMessage().c_str()
+              ));
     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);
@@ -247,7 +248,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 /* static */
 void wxCrashReport::SetFileName(const wxString& filename)
 {
-    wxStrlcpy(gs_reportFilename, filename.wx_str(), WXSIZEOF(gs_reportFilename));
+    wxStrlcpy(gs_reportFilename, filename.t_str(), WXSIZEOF(gs_reportFilename));
 }
 
 /* static */
diff --git a/Externals/wxWidgets3/src/msw/cursor.cpp b/Externals/wxWidgets3/src/msw/cursor.cpp
index c5892323ed..de73d96368 100644
--- a/Externals/wxWidgets3/src/msw/cursor.cpp
+++ b/Externals/wxWidgets3/src/msw/cursor.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: cursor.cpp 70802 2012-03-04 00:29:58Z VZ $
 // Copyright:   (c) 1997-2003 Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -240,6 +239,7 @@ wxCursor::wxCursor(const wxString& filename,
             break;
 
 #ifndef __WXWINCE__
+        case wxBITMAP_TYPE_ANI:
         case wxBITMAP_TYPE_CUR:
             hcursor = ::LoadCursorFromFile(filename.t_str());
             break;
@@ -275,6 +275,45 @@ wxCursor::wxCursor(const wxString& filename,
     }
 }
 
+namespace
+{
+
+void ReverseBitmap(HBITMAP bitmap, int width, int height)
+{
+    MemoryHDC hdc;
+    SelectInHDC selBitmap(hdc, bitmap);
+    ::StretchBlt(hdc, width - 1, 0, -width, height,
+                 hdc, 0, 0, width, height, SRCCOPY);
+}
+
+HCURSOR CreateReverseCursor(HCURSOR cursor)
+{
+    ICONINFO info;
+    if ( !::GetIconInfo(cursor, &info) )
+        return NULL;
+
+    HCURSOR cursorRev = NULL;
+
+    BITMAP bmp;
+    if ( ::GetObject(info.hbmMask, sizeof(bmp), &bmp) )
+    {
+        ReverseBitmap(info.hbmMask, bmp.bmWidth, bmp.bmHeight);
+        if ( info.hbmColor )
+            ReverseBitmap(info.hbmColor, bmp.bmWidth, bmp.bmHeight);
+        info.xHotspot = (DWORD)bmp.bmWidth - 1 - info.xHotspot;
+
+        cursorRev = ::CreateIconIndirect(&info);
+    }
+
+    ::DeleteObject(info.hbmMask);
+    if ( info.hbmColor )
+        ::DeleteObject(info.hbmColor);
+
+    return cursorRev;
+}
+
+} // anonymous namespace
+
 // Cursors by stock number
 void wxCursor::InitFromStock(wxStockCursor idCursor)
 {
@@ -339,6 +378,16 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
         deleteLater = true;
     }
 
+    if ( !hcursor && idCursor == wxCURSOR_RIGHT_ARROW)
+    {
+        hcursor = ::LoadCursor(NULL, IDC_ARROW);
+        if ( hcursor )
+        {
+            hcursor = CreateReverseCursor(hcursor);
+            deleteLater = true;
+        }
+    }
+
     if ( !hcursor )
     {
         if ( !stdCursor.isStd )
diff --git a/Externals/wxWidgets3/src/msw/data.cpp b/Externals/wxWidgets3/src/msw/data.cpp
index abe31bb7ed..2854806e31 100644
--- a/Externals/wxWidgets3/src/msw/data.cpp
+++ b/Externals/wxWidgets3/src/msw/data.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: data.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/datecontrols.cpp b/Externals/wxWidgets3/src/msw/datecontrols.cpp
index aab366fe2f..501ff039fb 100644
--- a/Externals/wxWidgets3/src/msw/datecontrols.cpp
+++ b/Externals/wxWidgets3/src/msw/datecontrols.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of date controls helper functions
 // Author:      Vadim Zeitlin
 // Created:     2008-04-04
-// RCS-ID:      $Id: datecontrols.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/datectrl.cpp b/Externals/wxWidgets3/src/msw/datectrl.cpp
index 16e6c99ea8..987edd1fd8 100644
--- a/Externals/wxWidgets3/src/msw/datectrl.cpp
+++ b/Externals/wxWidgets3/src/msw/datectrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
-// RCS-ID:      $Id: datectrl.cpp 69222 2011-09-29 13:43:02Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -92,11 +91,15 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 // TODO: handle WM_WININICHANGE
 
+#if wxUSE_INTL
+
 wxLocaleInfo wxDatePickerCtrl::MSWGetFormat() const
 {
     return wxLOCALE_SHORT_DATE_FMT;
 }
 
+#endif // wxUSE_INTL
+
 // ----------------------------------------------------------------------------
 // wxDatePickerCtrl operations
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/datetimectrl.cpp b/Externals/wxWidgets3/src/msw/datetimectrl.cpp
index 85a23236de..408feab3eb 100644
--- a/Externals/wxWidgets3/src/msw/datetimectrl.cpp
+++ b/Externals/wxWidgets3/src/msw/datetimectrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxDateTimePickerCtrl for MSW.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22 (extracted from src/msw/datectrl.cpp)
-// RCS-ID:      $Id: datetimectrl.cpp 69293 2011-10-02 17:39:21Z VZ $
 // Copyright:   (c) 2005-2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -111,8 +110,12 @@ wxSize wxDateTimePickerCtrl::DoGetBestSize() const
 {
     wxClientDC dc(const_cast<wxDateTimePickerCtrl *>(this));
 
-    // Use the same native format as this as the underlying native control.
+    // Use the same native format as the underlying native control.
+#if wxUSE_INTL
     wxString s = wxDateTime::Now().Format(wxLocale::GetInfo(MSWGetFormat()));
+#else // !wxUSE_INTL
+    wxString s("XXX-YYY-ZZZZ");
+#endif // wxUSE_INTL/!wxUSE_INTL
 
     // the best size for the control is bigger than just the string
     // representation of the current value because the control must accommodate
diff --git a/Externals/wxWidgets3/src/msw/dc.cpp b/Externals/wxWidgets3/src/msw/dc.cpp
index 5dc9d88a13..97a4da07fc 100644
--- a/Externals/wxWidgets3/src/msw/dc.cpp
+++ b/Externals/wxWidgets3/src/msw/dc.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dc.cpp 69727 2011-11-10 10:46:34Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -51,6 +50,7 @@
 #include <string.h>
 
 #include "wx/msw/private/dc.h"
+#include "wx/private/textmeasure.h"
 
 using namespace wxMSWImpl;
 
@@ -148,6 +148,22 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
 
 #endif // wxHAS_RAW_BITMAP
 
+namespace wxMSWImpl
+{
+
+// Wrappers for the dynamically loaded {Set,Get}Layout() functions. They work
+// in exactly the same way as the standard functions and return GDI_ERROR if
+// they're not actually available.
+DWORD GetLayout(HDC hdc);
+DWORD SetLayout(HDC hdc, DWORD dwLayout);
+
+// Create a compatible HDC and copy the layout of the source DC to it. This is
+// necessary in order to draw bitmaps (which are usually blitted from a
+// temporary compatible memory DC to the real target DC) using the same layout.
+HDC CreateCompatibleDCWithLayout(HDC hdc);
+
+} // namespace wxMSWImpl
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -880,7 +896,7 @@ void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
 }
 
 void wxMSWDCImpl::DoDrawPolygon(int n,
-                         wxPoint points[],
+                         const wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,
                          wxPolygonFillMode WXUNUSED_IN_WINCE(fillStyle))
@@ -928,8 +944,8 @@ void wxMSWDCImpl::DoDrawPolygon(int n,
 
 void
 wxMSWDCImpl::DoDrawPolyPolygon(int n,
-                        int count[],
-                        wxPoint points[],
+                        const int count[],
+                        const wxPoint points[],
                         wxCoord xoffset,
                         wxCoord yoffset,
                         wxPolygonFillMode fillStyle)
@@ -981,7 +997,7 @@ wxMSWDCImpl::DoDrawPolyPolygon(int n,
   // __WXWINCE__
 }
 
-void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxMSWDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1325,7 +1341,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 #endif // wxUSE_SYSTEM_OPTIONS
         {
             HDC cdc = GetHdc();
-            HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+            HDC hdcMem = wxMSWImpl::CreateCompatibleDCWithLayout(cdc);
             HGDIOBJ hOldBitmap = ::SelectObject(hdcMem, GetHbitmapOf(bmp));
 #if wxUSE_PALETTE
             wxPalette *pal = bmp.GetPalette();
@@ -1357,17 +1373,16 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
             // level
             wxMemoryDC memDC;
 
+            memDC.SetLayoutDirection(GetLayoutDirection());
             memDC.SelectObjectAsSource(bmp);
 
             GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
-
-            memDC.SelectObject(wxNullBitmap);
         }
     }
     else // no mask, just use BitBlt()
     {
         HDC cdc = GetHdc();
-        HDC memdc = ::CreateCompatibleDC( cdc );
+        HDC memdc = wxMSWImpl::CreateCompatibleDCWithLayout( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
 
         wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
@@ -1857,109 +1872,17 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     }
 #endif // __WXMICROWIN__
 
-    HFONT hfontOld;
-    if ( font )
-    {
-        wxASSERT_MSG( font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );
+    wxASSERT_MSG( !font || font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );
 
-        hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
-    }
-    else // don't change the font
-    {
-        hfontOld = 0;
-    }
-
-    SIZE sizeRect;
-    const size_t len = string.length();
-    if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
-    {
-        wxLogLastError(wxT("GetTextExtentPoint32()"));
-    }
-
-#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
-    // the result computed by GetTextExtentPoint32() may be too small as it
-    // accounts for under/overhang of the first/last character while we want
-    // just the bounding rect for this string so adjust the width as needed
-    // (using API not available in 2002 SDKs of WinCE)
-    if ( len > 0 )
-    {
-        ABC width;
-        const wxChar chFirst = *string.begin();
-        if ( ::GetCharABCWidths(GetHdc(), chFirst, chFirst, &width) )
-        {
-            if ( width.abcA < 0 )
-                sizeRect.cx -= width.abcA;
-
-            if ( len > 1 )
-            {
-                const wxChar chLast = *string.rbegin();
-                ::GetCharABCWidths(GetHdc(), chLast, chLast, &width);
-            }
-            //else: we already have the width of the last character
-
-            if ( width.abcC < 0 )
-                sizeRect.cx -= width.abcC;
-        }
-        //else: GetCharABCWidths() failed, not a TrueType font?
-    }
-#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
-
-    if (x)
-        *x = sizeRect.cx;
-    if (y)
-        *y = sizeRect.cy;
-
-    if ( descent || externalLeading )
-    {
-        DoGetFontMetrics(NULL, NULL, descent, NULL, externalLeading, NULL);
-    }
-
-    if ( hfontOld )
-    {
-        ::SelectObject(GetHdc(), hfontOld);
-    }
+    wxTextMeasure txm(GetOwner(), font);
+    txm.GetTextExtent(string, x, y, descent, externalLeading);
 }
 
 
-// Each element of the array will be the width of the string up to and
-// including the coresoponding character in text.
-
 bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 {
-    static int maxLenText = -1;
-    static int maxWidth = -1;
-    int fit = 0;
-    SIZE sz = {0,0};
-    int stlen = text.length();
-
-    if (maxLenText == -1)
-    {
-        // Win9x and WinNT+ have different limits
-        int version = wxGetOsVersion();
-        maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
-        maxWidth =   version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
-    }
-
-    widths.Empty();
-    widths.Add(0, stlen);  // fill the array with zeros
-    if (stlen == 0)
-        return true;
-
-    if (!::GetTextExtentExPoint(GetHdc(),
-                                text.c_str(),           // string to check
-                                wxMin(stlen, maxLenText),
-                                maxWidth,
-                                &fit,                   // [out] count of chars
-                                                        // that will fit
-                                &widths[0],             // array to fill
-                                &sz))
-    {
-        // API failed
-        wxLogLastError(wxT("GetTextExtentExPoint"));
-        return false;
-    }
-
-    return true;
+    wxTextMeasure txm(GetOwner(), NULL); // don't change the font
+    return txm.GetPartialTextExtents(text, widths, 1.0);
 }
 
 namespace
@@ -2358,8 +2281,8 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
-            dc_mask = ::CreateCompatibleDC(hdcSrc);
-            dc_buffer = ::CreateCompatibleDC(GetHdc());
+            dc_mask = wxMSWImpl::CreateCompatibleDCWithLayout(hdcSrc);
+            dc_buffer = wxMSWImpl::CreateCompatibleDCWithLayout(GetHdc());
             buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
             HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
@@ -2442,6 +2365,17 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             {
                 SET_STRETCH_BLT_MODE(GetHdc());
 
+                // Unlike all the other functions used here (i.e. AlphaBlt(),
+                // MaskBlt(), BitBlt() and StretchBlt()), StretchDIBits() does
+                // not take into account the source DC logical coordinates
+                // automatically as it doesn't even work with the source HDC.
+                // So do this manually to ensure that the coordinates are
+                // interpreted in the same way here as in all the other cases.
+                xsrc = source->LogicalToDeviceX(xsrc);
+                ysrc = source->LogicalToDeviceY(ysrc);
+                srcWidth = source->LogicalToDeviceXRel(srcWidth);
+                srcHeight = source->LogicalToDeviceYRel(srcHeight);
+
                 // Figure out what co-ordinate system we're supposed to specify
                 // ysrc in.
                 const LONG hDIB = ds.dsBmih.biHeight;
@@ -2661,7 +2595,7 @@ wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
 
         node = node->GetNext();
     }
-    WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
+    WXHDC hDC = (WXHDC) wxMSWImpl::CreateCompatibleDCWithLayout((HDC) dc);
     if ( !hDC)
     {
         wxLogLastError(wxT("CreateCompatibleDC"));
@@ -2893,20 +2827,47 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
 
 #if wxUSE_DYNLIB_CLASS
 
-static DWORD wxGetDCLayout(HDC hdc)
+namespace wxMSWImpl
+{
+
+DWORD GetLayout(HDC hdc)
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t
         wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
 
-    return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
+    return s_pfnGetLayout ? s_pfnGetLayout(hdc) : GDI_ERROR;
 }
 
+DWORD SetLayout(HDC hdc, DWORD dwLayout)
+{
+    typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
+    static SetLayout_t
+        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
+
+    return s_pfnSetLayout ? s_pfnSetLayout(hdc, dwLayout) : GDI_ERROR;
+}
+
+HDC CreateCompatibleDCWithLayout(HDC hdc)
+{
+    HDC hdcNew = ::CreateCompatibleDC(hdc);
+    if ( hdcNew )
+    {
+        DWORD dwLayout = wxMSWImpl::GetLayout(hdc);
+        if ( dwLayout != GDI_ERROR )
+            wxMSWImpl::SetLayout(hdcNew, dwLayout);
+    }
+
+    return hdcNew;
+}
+
+} // namespace wxMSWImpl
+
 wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
 {
-    DWORD layout = wxGetDCLayout(GetHdc());
+    DWORD layout = wxMSWImpl::GetLayout(GetHdc());
 
-    if ( layout == (DWORD)-1 )
+    if ( layout == GDI_ERROR )
         return wxLayout_Default;
 
     return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
@@ -2914,12 +2875,6 @@ wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
 
 void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
 {
-    typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
-    static SetLayout_t
-        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
-    if ( !s_pfnSetLayout )
-        return;
-
     if ( dir == wxLayout_Default )
     {
         dir = wxTheApp->GetLayoutDirection();
@@ -2927,17 +2882,41 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
             return;
     }
 
-    DWORD layout = wxGetDCLayout(GetHdc());
+    DWORD layout = wxMSWImpl::GetLayout(GetHdc());
+    if ( layout == GDI_ERROR )
+        return;
+
     if ( dir == wxLayout_RightToLeft )
         layout |= LAYOUT_RTL;
     else
         layout &= ~LAYOUT_RTL;
 
-    s_pfnSetLayout(GetHdc(), layout);
+    wxMSWImpl::SetLayout(GetHdc(), layout);
 }
 
 #else // !wxUSE_DYNLIB_CLASS
 
+// Provide stubs to avoid ifdefs in the code using these functions.
+namespace wxMSWImpl
+{
+
+DWORD GetLayout(HDC WXUNUSED(hdc))
+{
+    return GDI_ERROR;
+}
+
+DWORD SetLayout(HDC WXUNUSED(hdc), DWORD WXUNUSED(dwLayout))
+{
+    return GDI_ERROR;
+}
+
+HDC CreateCompatibleDCWithLayout(HDC hdc)
+{
+    return ::CreateCompatibleDC(hdc);
+}
+
+} // namespace wxMSWImpl
+
 // we can't provide RTL support without dynamic loading, so stub it out
 wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
 {
diff --git a/Externals/wxWidgets3/src/msw/dcclient.cpp b/Externals/wxWidgets3/src/msw/dcclient.cpp
index bdfaba5968..f8486aa92a 100644
--- a/Externals/wxWidgets3/src/msw/dcclient.cpp
+++ b/Externals/wxWidgets3/src/msw/dcclient.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcclient.cpp 68337 2011-07-22 16:53:56Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,6 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/hashmap.h"
     #include "wx/log.h"
     #include "wx/window.h"
 #endif
@@ -36,37 +36,110 @@
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
-// array/list types
+// local data structures
 // ----------------------------------------------------------------------------
 
-struct WXDLLEXPORT wxPaintDCInfo
+// This is a base class for two concrete subclasses below and contains HDC
+// cached for the duration of the WM_PAINT processing together with some
+// bookkeeping information.
+class wxPaintDCInfo
 {
-    wxPaintDCInfo(wxWindow *win, wxPaintDCImpl *dc)
+public:
+    wxPaintDCInfo(HDC hdc)
+        : m_hdc(hdc)
     {
-        hwnd = win->GetHWND();
-        hdc = dc->GetHDC();
-        count = 1;
     }
 
-    WXHWND    hwnd;       // window for this DC
-    WXHDC     hdc;        // the DC handle
-    size_t    count;      // usage count
+    // The derived class must perform some cleanup.
+    virtual ~wxPaintDCInfo() = 0;
+
+    WXHDC GetHDC() const { return (WXHDC)m_hdc; }
+
+protected:
+    const HDC m_hdc;
+
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCInfo);
 };
 
-#include "wx/arrimpl.cpp"
+namespace
+{
 
-WX_DEFINE_OBJARRAY(wxArrayDCInfo)
+// This subclass contains information for the HDCs we create ourselves, i.e.
+// those for which we call BeginPaint() -- and hence need to call EndPaint().
+class wxPaintDCInfoOur : public wxPaintDCInfo
+{
+public:
+    wxPaintDCInfoOur(wxWindow* win)
+        : wxPaintDCInfo(::BeginPaint(GetHwndOf(win), GetPaintStructPtr(m_ps))),
+          m_hwnd(GetHwndOf(win))
+    {
+    }
 
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
+    virtual ~wxPaintDCInfoOur()
+    {
+        ::EndPaint(m_hwnd, &m_ps);
+    }
+
+private:
+    // This helper is only needed in order to call it from the ctor initializer
+    // list.
+    static PAINTSTRUCT* GetPaintStructPtr(PAINTSTRUCT& ps)
+    {
+        wxZeroMemory(ps);
+        return &ps;
+    }
+
+    const HWND m_hwnd;
+    PAINTSTRUCT m_ps;
+
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCInfoOur);
+};
+
+// This subclass contains information for the HDCs we receive from outside, as
+// WPARAM of WM_PAINT itself.
+class wxPaintDCInfoExternal : public wxPaintDCInfo
+{
+public:
+    wxPaintDCInfoExternal(HDC hdc)
+        : wxPaintDCInfo(hdc),
+          m_state(::SaveDC(hdc))
+    {
+    }
+
+    virtual ~wxPaintDCInfoExternal()
+    {
+        ::RestoreDC(m_hdc, m_state);
+    }
+
+private:
+    const int m_state;
+
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCInfoExternal);
+};
+
+// The global map containing HDC to use for the given window. The entries in
+// this map only exist during WM_PAINT processing and are destroyed when it is
+// over.
+//
+// It is needed because in some circumstances it can happen that more than one
+// wxPaintDC is created for the same window during its WM_PAINT handling (and
+// as this can happen implicitly, e.g. by calling a function in some library,
+// this can be quite difficult to find) but we need to reuse the same HDC for
+// all of them because we can't call BeginPaint() more than once. So we cache
+// the first HDC created for the window in this map and then reuse it later if
+// needed. And, of course, remove it from the map when the painting is done.
+WX_DECLARE_HASH_MAP(wxWindow *, wxPaintDCInfo *,
+                    wxPointerHash, wxPointerEqual,
+                    PaintDCInfos);
+
+PaintDCInfos gs_PaintDCInfos;
+
+} // anonymous namespace
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
-static PAINTSTRUCT g_paintStruct;
-
 #ifdef wxHAS_PAINT_DEBUG
     // a global variable which we check to verify that wxPaintDC are only
     // created in response to WM_PAINT message - doing this from elsewhere is a
@@ -186,26 +259,8 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 // wxPaintDCImpl
 // ----------------------------------------------------------------------------
 
-// VZ: initial implementation (by JACS) only remembered the last wxPaintDC
-//     created and tried to reuse it - this was supposed to take care of a
-//     situation when a derived class OnPaint() calls base class OnPaint()
-//     because in this case ::BeginPaint() shouldn't be called second time.
-//
-//     I'm not sure how useful this is, however we must remember the HWND
-//     associated with the last HDC as well - otherwise we may (and will!) try
-//     to reuse the HDC for another HWND which is a nice recipe for disaster.
-//
-//     So we store a list of windows for which we already have the DC and not
-//     just one single hDC. This seems to work, but I'm really not sure about
-//     the usefullness of the whole idea - IMHO it's much better to not call
-//     base class OnPaint() at all, or, if we really want to allow it, add a
-//     "wxPaintDC *" parameter to wxPaintEvent which should be used if it's
-//     !NULL instead of creating a new DC.
-
 IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
 
-wxArrayDCInfo wxPaintDCImpl::ms_cache;
-
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) :
    wxClientDCImpl( owner )
 {
@@ -234,17 +289,13 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     m_window = window;
 
     // do we have a DC for this window in the cache?
-    wxPaintDCInfo *info = FindInCache();
-    if ( info )
+    m_hDC = FindDCInCache(m_window);
+    if ( !m_hDC )
     {
-        m_hDC = info->hdc;
-        info->count++;
-    }
-    else // not in cache, create a new one
-    {
-        m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_window), &g_paintStruct);
-        if (m_hDC)
-            ms_cache.Add(new wxPaintDCInfo(m_window, this));
+        // not in cache, create a new one
+        wxPaintDCInfoOur* const info = new wxPaintDCInfoOur(m_window);
+        gs_PaintDCInfos[m_window] = info;
+        m_hDC = info->GetHDC();
     }
 
     // Note: at this point m_hDC can be NULL under MicroWindows, when dragging.
@@ -264,77 +315,51 @@ wxPaintDCImpl::~wxPaintDCImpl()
     if ( m_hDC )
     {
         SelectOldObjects(m_hDC);
-
-        size_t index;
-        wxPaintDCInfo *info = FindInCache(&index);
-
-        wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
-
-        if ( --info->count == 0 )
-        {
-            ::EndPaint(GetHwndOf(m_window), &g_paintStruct);
-
-            ms_cache.RemoveAt(index);
-
-            // Reduce the number of bogus reports of non-freed memory
-            // at app exit
-            if (ms_cache.IsEmpty())
-                ms_cache.Clear();
-        }
-        //else: cached DC entry is still in use
-
-        // prevent the base class dtor from ReleaseDC()ing it again
         m_hDC = 0;
     }
 }
 
-wxPaintDCInfo *wxPaintDCImpl::FindInCache(size_t *index) const
-{
-    wxPaintDCInfo *info = NULL;
-    size_t nCache = ms_cache.GetCount();
-    for ( size_t n = 0; n < nCache; n++ )
-    {
-        wxPaintDCInfo *info1 = &ms_cache[n];
-        if ( info1->hwnd == m_window->GetHWND() )
-        {
-            info = info1;
-            if ( index )
-                *index = n;
-            break;
-        }
-    }
 
-    return info;
+/* static */
+wxPaintDCInfo *wxPaintDCImpl::FindInCache(wxWindow *win)
+{
+    PaintDCInfos::const_iterator it = gs_PaintDCInfos.find( win );
+
+    return it != gs_PaintDCInfos.end() ? it->second : NULL;
 }
 
-// find the entry for this DC in the cache (keyed by the window)
+/* static */
 WXHDC wxPaintDCImpl::FindDCInCache(wxWindow* win)
 {
-    size_t nCache = ms_cache.GetCount();
-    for ( size_t n = 0; n < nCache; n++ )
+    wxPaintDCInfo* const info = FindInCache(win);
+
+    return info ? info->GetHDC() : 0;
+}
+
+/* static */
+void wxPaintDCImpl::EndPaint(wxWindow *win)
+{
+    wxPaintDCInfo *info = FindInCache(win);
+    if ( info )
     {
-        wxPaintDCInfo *info = &ms_cache[n];
-        if ( info->hwnd == win->GetHWND() )
-        {
-            return info->hdc;
-        }
+        gs_PaintDCInfos.erase(win);
+        delete info;
     }
-    return 0;
+}
+
+wxPaintDCInfo::~wxPaintDCInfo()
+{
 }
 
 /*
  * wxPaintDCEx
  */
 
-// TODO: don't duplicate wxPaintDCImpl code here!!
-
 class wxPaintDCExImpl: public wxPaintDCImpl
 {
 public:
     wxPaintDCExImpl( wxDC *owner, wxWindow *window, WXHDC dc );
     ~wxPaintDCExImpl();
-
-    int m_saveState;
 };
 
 
@@ -348,47 +373,14 @@ wxPaintDCEx::wxPaintDCEx(wxWindow *window, WXHDC dc)
 wxPaintDCExImpl::wxPaintDCExImpl(wxDC *owner, wxWindow *window, WXHDC dc)
                : wxPaintDCImpl( owner )
 {
-        wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
+    wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
 
-        m_saveState = 0;
-
-        m_window = window;
-
-        wxPaintDCInfo *info = FindInCache();
-        if ( info )
-        {
-           m_hDC = info->hdc;
-           info->count++;
-        }
-        else // not in cache, create a new one
-        {
-                m_hDC = dc;
-                ms_cache.Add(new wxPaintDCInfo(m_window, this));
-                m_saveState = SaveDC((HDC) dc);
-        }
+    m_window = window;
+    m_hDC = dc;
 }
 
 wxPaintDCExImpl::~wxPaintDCExImpl()
 {
-        size_t index;
-        wxPaintDCInfo *info = FindInCache(&index);
-
-        wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
-
-        if ( --info->count == 0 )
-        {
-                RestoreDC((HDC) m_hDC, m_saveState);
-                ms_cache.RemoveAt(index);
-
-                // Reduce the number of bogus reports of non-freed memory
-                // at app exit
-                if (ms_cache.IsEmpty())
-                        ms_cache.Clear();
-        }
-        //else: cached DC entry is still in use
-
-        // prevent the base class dtor from ReleaseDC()ing it again
-        m_hDC = 0;
+    // prevent the base class dtor from ReleaseDC()ing it again
+    m_hDC = 0;
 }
-
-
diff --git a/Externals/wxWidgets3/src/msw/dcmemory.cpp b/Externals/wxWidgets3/src/msw/dcmemory.cpp
index 6d3829ec1f..018c5fa8c5 100644
--- a/Externals/wxWidgets3/src/msw/dcmemory.cpp
+++ b/Externals/wxWidgets3/src/msw/dcmemory.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcmemory.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/dcprint.cpp b/Externals/wxWidgets3/src/msw/dcprint.cpp
index f9129535bd..d5c6dbc830 100644
--- a/Externals/wxWidgets3/src/msw/dcprint.cpp
+++ b/Externals/wxWidgets3/src/msw/dcprint.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcprint.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -118,8 +117,8 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
     {
         if ( !driver_name.empty() && !device_name.empty() && !file.empty() )
         {
-            m_hDC = (WXHDC) CreateDC(driver_name.wx_str(),
-                                     device_name.wx_str(),
+            m_hDC = (WXHDC) CreateDC(driver_name.t_str(),
+                                     device_name.t_str(),
                                      file.fn_str(),
                                      NULL);
         }
@@ -186,14 +185,14 @@ bool wxPrinterDCImpl::StartDoc(const wxString& message)
 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);
-    docinfo.lpszDocName = message.wx_str();
+    docinfo.lpszDocName = message.t_str();
 
     wxString filename(m_printData.GetFilename());
 
     if (filename.empty())
         docinfo.lpszOutput = NULL;
     else
-        docinfo.lpszOutput = filename.wx_str();
+        docinfo.lpszOutput = filename.t_str();
 
     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;
@@ -335,7 +334,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     HDC hDC = ::CreateDC
                 (
                     NULL,               // no driver name as we use device name
-                    deviceName.wx_str(),
+                    deviceName.t_str(),
                     NULL,               // unused
                     static_cast<DEVMODE *>(lockDevMode.Get())
                 );
diff --git a/Externals/wxWidgets3/src/msw/dcscreen.cpp b/Externals/wxWidgets3/src/msw/dcscreen.cpp
index a29dfce435..755a59263f 100644
--- a/Externals/wxWidgets3/src/msw/dcscreen.cpp
+++ b/Externals/wxWidgets3/src/msw/dcscreen.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcscreen.cpp 50348 2007-11-30 13:48:22Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/dde.cpp b/Externals/wxWidgets3/src/msw/dde.cpp
index 6c914f9d21..f11a849208 100644
--- a/Externals/wxWidgets3/src/msw/dde.cpp
+++ b/Externals/wxWidgets3/src/msw/dde.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dde.cpp 69943 2011-12-07 14:35:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -580,7 +579,7 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
     if ( conv )
     {
         const char * const text = (const char *)data;
-        const size_t len = size/sizeof(char);
+        const size_t len = size;
 
         realSize = conv->ToWChar(NULL, 0, text, len);
         if ( realSize == wxCONV_FAILED )
@@ -627,7 +626,7 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
         if ( realSize == wxCONV_FAILED )
             return false;
 
-        realData = (LPBYTE)buffer.GetWriteBuf(realSize*sizeof(char));
+        realData = (LPBYTE)buffer.GetWriteBuf(realSize);
         if ( !realData )
             return false;
 
@@ -1068,7 +1067,7 @@ static HSZ DDEAtomFromString(const wxString& s)
 {
     wxASSERT_MSG( DDEIdInst, wxT("DDE not initialized") );
 
-    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*)s.wx_str(), DDE_CP);
+    HSZ hsz = DdeCreateStringHandle(DDEIdInst, wxMSW_CONV_LPTSTR(s), DDE_CP);
     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));
diff --git a/Externals/wxWidgets3/src/msw/debughlp.cpp b/Externals/wxWidgets3/src/msw/debughlp.cpp
index 3852e8002e..161a532933 100644
--- a/Externals/wxWidgets3/src/msw/debughlp.cpp
+++ b/Externals/wxWidgets3/src/msw/debughlp.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08 (extracted from crashrpt.cpp)
-// RCS-ID:      $Id: debughlp.cpp 69845 2011-11-27 19:52:13Z VZ $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -146,7 +145,7 @@ const wxString& wxDbgHelpDLL::GetErrorMessage()
 void wxDbgHelpDLL::LogError(const wxChar *func)
 {
     ::OutputDebugString(wxString::Format(wxT("dbghelp: %s() failed: %s\r\n"),
-                        func, wxSysErrorMsg(::GetLastError())).wx_str());
+                        func, wxSysErrorMsg(::GetLastError())).t_str());
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/dialog.cpp b/Externals/wxWidgets3/src/msw/dialog.cpp
index 308fd10f1b..d199ae278b 100644
--- a/Externals/wxWidgets3/src/msw/dialog.cpp
+++ b/Externals/wxWidgets3/src/msw/dialog.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dialog.cpp 70511 2012-02-05 14:18:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,7 @@
 #endif
 
 #include "wx/dialog.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
@@ -197,6 +197,8 @@ bool wxDialog::Show(bool show)
 // show dialog modally
 int wxDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );
 
     Show();
@@ -333,7 +335,7 @@ bool wxDialog::DoOK()
     if ( EmulateButtonClickIfPresent(idOk) )
         return true;
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    wxCommandEvent event(wxEVT_BUTTON, GetAffirmativeId());
     event.SetEventObject(this);
 
     return HandleWindowEvent(event);
@@ -459,7 +461,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
     }
 
     if ( !processed )
-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+        rc = wxDialogBase::MSWWindowProc(message, wParam, lParam);
 
     return rc;
 }
diff --git a/Externals/wxWidgets3/src/msw/dialup.cpp b/Externals/wxWidgets3/src/msw/dialup.cpp
index 44476c39fc..11dd018294 100644
--- a/Externals/wxWidgets3/src/msw/dialup.cpp
+++ b/Externals/wxWidgets3/src/msw/dialup.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
-// RCS-ID:      $Id: dialup.cpp 70751 2012-02-29 13:59:01Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1284,7 +1283,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
     }
 
     // we don't need it any more now and if this thread ran, it is our
-    // responsability to free the data
+    // responsibility to free the data
     delete data;
 
     return 0;
diff --git a/Externals/wxWidgets3/src/msw/dib.cpp b/Externals/wxWidgets3/src/msw/dib.cpp
index 8620385aed..5b0bd487d6 100644
--- a/Externals/wxWidgets3/src/msw/dib.cpp
+++ b/Externals/wxWidgets3/src/msw/dib.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// RCS-ID:      $Id: dib.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -45,9 +44,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if !defined(__MWERKS__)
-    #include <memory.h>
-#endif
+#include <memory.h>
 
 #include "wx/msw/dib.h"
 
@@ -577,7 +574,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3
-#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+#if !defined(__WXMSW__) || defined(_WIN32_WCE) && _WIN32_WCE < 400
     return NULL;
 #else
     wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );
diff --git a/Externals/wxWidgets3/src/msw/dir.cpp b/Externals/wxWidgets3/src/msw/dir.cpp
index 264b307761..0867811c70 100644
--- a/Externals/wxWidgets3/src/msw/dir.cpp
+++ b/Externals/wxWidgets3/src/msw/dir.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id: dir.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,22 +63,76 @@ inline void FreeFindData(FIND_DATA fd)
     }
 }
 
-inline FIND_DATA FindFirst(const wxString& spec,
-                           FIND_STRUCT *finddata)
-{
-    return ::FindFirstFile(spec.t_str(), finddata);
-}
-
-inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
-{
-    return ::FindNextFile(fd, finddata) != 0;
-}
-
-const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+const wxChar *GetNameFromFindData(const FIND_STRUCT *finddata)
 {
     return finddata->cFileName;
 }
 
+// Helper function checking that the contents of the given FIND_STRUCT really
+// match our filter. We need to do it ourselves as native Windows functions
+// apply the filter to both the long and the short names of the file, so
+// something like "*.bar" matches "foo.bar.baz" too and not only "foo.bar", so
+// we have to double check that we have a real match.
+inline bool
+CheckFoundMatch(const FIND_STRUCT* finddata, const wxString& filter)
+{
+    // If there is no filter, the found file must be the one we really are
+    // looking for.
+    if ( filter.empty() )
+        return true;
+
+    // Otherwise do check the match validity. Notice that we must do it
+    // case-insensitively because the case of the file names is not supposed to
+    // matter under Windows.
+    wxString fn(GetNameFromFindData(finddata));
+
+    // However if the filter contains only special characters (which is a
+    // common case), we can skip the case conversion.
+    if ( filter.find_first_not_of(wxS("*?.")) == wxString::npos )
+        return fn.Matches(filter);
+
+    return fn.MakeUpper().Matches(filter.Upper());
+}
+
+inline bool
+FindNext(FIND_DATA fd, const wxString& filter, FIND_STRUCT *finddata)
+{
+    for ( ;; )
+    {
+        if ( !::FindNextFile(fd, finddata) )
+            return false;
+
+        // If we did find something, check that it really matches.
+        if ( CheckFoundMatch(finddata, filter) )
+            return true;
+    }
+}
+
+inline FIND_DATA
+FindFirst(const wxString& spec,
+          const wxString& filter,
+          FIND_STRUCT *finddata)
+{
+    FIND_DATA fd = ::FindFirstFile(spec.t_str(), finddata);
+
+    // As in FindNext() above, we need to check that the file name we found
+    // really matches our filter and look for the next match if it doesn't.
+    if ( IsFindDataOk(fd) && !CheckFoundMatch(finddata, filter) )
+    {
+        if ( !FindNext(fd, filter, finddata) )
+        {
+            // As we return the invalid handle from here to indicate that we
+            // didn't find anything, close the one we initially received
+            // ourselves.
+            FreeFindData(fd);
+
+            return INVALID_HANDLE_VALUE;
+        }
+    }
+
+    return fd;
+}
+
 inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
 {
     return finddata->dwFileAttributes;
@@ -196,7 +249,7 @@ bool wxDirData::Read(wxString *filename)
         else
             filespec += m_filespec;
 
-        m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
+        m_finddata = FindFirst(filespec, m_filespec, PTR_TO_FINDDATA);
 
         first = true;
     }
@@ -228,7 +281,7 @@ bool wxDirData::Read(wxString *filename)
         }
         else
         {
-            if ( !FindNext(m_finddata, PTR_TO_FINDDATA) )
+            if ( !FindNext(m_finddata, m_filespec, PTR_TO_FINDDATA) )
             {
 #ifdef __WIN32__
                 DWORD err = ::GetLastError();
@@ -343,9 +396,13 @@ wxString wxDir::GetName() const
     return name;
 }
 
-wxDir::~wxDir()
+void wxDir::Close()
 {
-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -396,7 +453,7 @@ wxGetDirectoryTimes(const wxString& dirname,
 #endif
 
     FIND_STRUCT fs;
-    FIND_DATA fd = FindFirst(dirname, &fs);
+    FIND_DATA fd = FindFirst(dirname, wxEmptyString, &fs);
     if ( !IsFindDataOk(fd) )
     {
         return false;
diff --git a/Externals/wxWidgets3/src/msw/dirdlg.cpp b/Externals/wxWidgets3/src/msw/dirdlg.cpp
index 77cb6c9b8c..cec2c85b7a 100644
--- a/Externals/wxWidgets3/src/msw/dirdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/dirdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dirdlg.cpp 66961 2011-02-19 00:30:32Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@
     (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500)))
 
 #include "wx/dirdlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -40,6 +40,109 @@
 
 #include "wx/msw/private.h"
 #include "wx/msw/wrapshl.h"
+#include "wx/msw/private/comptr.h"
+#include "wx/dynlib.h"
+
+#include <initguid.h>
+
+// We can only use IFileDialog under desktop Windows and we need
+// wxDynamicLibrary for it.
+#if wxUSE_DYNLIB_CLASS && !defined(__WXWINCE__)
+    #define wxUSE_IFILEDIALOG 1
+#else
+    #define wxUSE_IFILEDIALOG 0
+#endif
+
+#if wxUSE_IFILEDIALOG
+// IFileDialog related declarations missing from some compilers headers.
+
+// IShellItem
+#ifndef __IShellItem_INTERFACE_DEFINED__
+
+#ifndef SIGDN_FILESYSPATH
+    #define SIGDN_FILESYSPATH 0x80058000
+#endif
+
+struct IShellItem : public IUnknown
+{
+    virtual HRESULT wxSTDCALL BindToHandler(IBindCtx*, REFGUID, REFIID, void**) = 0;
+    virtual HRESULT wxSTDCALL GetParent(IShellItem**) = 0;
+    virtual HRESULT wxSTDCALL GetDisplayName(DWORD, LPWSTR*) = 0;
+    virtual HRESULT wxSTDCALL GetAttributes(ULONG, ULONG*) = 0;
+    virtual HRESULT wxSTDCALL Compare(IShellItem*, DWORD, int*) = 0;
+};
+
+#endif // #ifndef __IShellItem_INTERFACE_DEFINED__
+
+// Define this GUID in any case, even when __IShellItem_INTERFACE_DEFINED__ is
+// defined in the headers we might still not have it in the actual uuid.lib,
+// this happens with at least VC7 used with its original (i.e. not updated) SDK
+// and there is no harm in defining the GUID unconditionally.
+DEFINE_GUID(IID_IShellItem,
+    0x43826D1E, 0xE718, 0x42EE, 0xBC, 0x55, 0xA1, 0xE2, 0x61, 0xC3, 0x7B, 0xFE);
+
+struct IShellItemFilter;
+struct IFileDialogEvents;
+
+// IModalWindow
+#ifndef __IModalWindow_INTERFACE_DEFINED__
+
+struct IModalWindow : public IUnknown
+{
+    virtual HRESULT wxSTDCALL Show(HWND) = 0;
+};
+
+#endif // #ifndef __IModalWindow_INTERFACE_DEFINED__
+
+// IFileDialog
+#ifndef __IFileDialog_INTERFACE_DEFINED__
+
+#ifndef FOS_PICKFOLDERS
+    #define FOS_PICKFOLDERS 0x20
+#endif
+
+#ifndef FOS_FORCEFILESYSTEM
+    #define FOS_FORCEFILESYSTEM 0x40
+#endif
+
+struct _COMDLG_FILTERSPEC;
+
+struct IFileDialog : public IModalWindow
+{
+    virtual HRESULT wxSTDCALL SetFileTypes(UINT, const _COMDLG_FILTERSPEC*) = 0;
+    virtual HRESULT wxSTDCALL SetFileTypeIndex(UINT) = 0;
+    virtual HRESULT wxSTDCALL GetFileTypeIndex(UINT*) = 0;
+    virtual HRESULT wxSTDCALL Advise(IFileDialogEvents*, DWORD*) = 0;
+    virtual HRESULT wxSTDCALL Unadvise(DWORD) = 0;
+    virtual HRESULT wxSTDCALL SetOptions(DWORD) = 0;
+    virtual HRESULT wxSTDCALL GetOptions(DWORD*) = 0;
+    virtual HRESULT wxSTDCALL SetDefaultFolder(IShellItem*) = 0;
+    virtual HRESULT wxSTDCALL SetFolder(IShellItem*) = 0;
+    virtual HRESULT wxSTDCALL GetFolder(IShellItem**) = 0;
+    virtual HRESULT wxSTDCALL GetCurrentSelection(IShellItem**) = 0;
+    virtual HRESULT wxSTDCALL SetFileName(LPCWSTR) = 0;
+    virtual HRESULT wxSTDCALL GetFileName(LPWSTR*) = 0;
+    virtual HRESULT wxSTDCALL SetTitle(LPCWSTR) = 0;
+    virtual HRESULT wxSTDCALL SetOkButtonLabel(LPCWSTR) = 0;
+    virtual HRESULT wxSTDCALL SetFileNameLabel(LPCWSTR) = 0;
+    virtual HRESULT wxSTDCALL GetResult(IShellItem**) = 0;
+    virtual HRESULT wxSTDCALL AddPlace(IShellItem*, DWORD) = 0;
+    virtual HRESULT wxSTDCALL SetDefaultExtension(LPCWSTR) = 0;
+    virtual HRESULT wxSTDCALL Close(HRESULT) = 0;
+    virtual HRESULT wxSTDCALL SetClientGuid(REFGUID) = 0;
+    virtual HRESULT wxSTDCALL ClearClientData() = 0;
+    virtual HRESULT wxSTDCALL SetFilter(IShellItemFilter*) = 0;
+};
+
+DEFINE_GUID(CLSID_FileOpenDialog,
+    0xDC1C5A9C, 0xE88A, 0x4dde, 0xA5, 0xA1, 0x60, 0xF8, 0x2A, 0x20, 0xAE, 0xF7);
+
+DEFINE_GUID(IID_IFileDialog,
+    0x42F85136, 0xDB7E, 0x439C, 0x85, 0xF1, 0xE4, 0x07, 0x5D, 0x13, 0x5F, 0xC8);
+
+#endif // #ifndef __IFileDialog_INTERFACE_DEFINED__
+
+#endif // wxUSE_IFILEDIALOG
 
 // ----------------------------------------------------------------------------
 // constants
@@ -117,10 +220,40 @@ void wxDirDialog::SetPath(const wxString& path)
 
 int wxDirDialog::ShowModal()
 {
-    wxWindow *parent = GetParent();
+    WX_HOOK_MODAL_DIALOG();
 
+    wxWindow* const parent = GetParent();
+    WXHWND hWndParent = parent ? GetHwndOf(parent) : NULL;
+
+    // Use IFileDialog under new enough Windows, it's more user-friendly.
+    int rc;
+#if wxUSE_IFILEDIALOG
+    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+    {
+        rc = ShowIFileDialog(hWndParent);
+    }
+    else
+    {
+        rc = wxID_NONE;
+    }
+
+    if ( rc == wxID_NONE )
+#endif // wxUSE_IFILEDIALOG
+    {
+        rc = ShowSHBrowseForFolder(hWndParent);
+    }
+
+    // change current working directory if asked so
+    if ( rc == wxID_OK && HasFlag(wxDD_CHANGE_DIR) )
+        wxSetWorkingDirectory(m_path);
+
+    return rc;
+}
+
+int wxDirDialog::ShowSHBrowseForFolder(WXHWND owner)
+{
     BROWSEINFO bi;
-    bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
+    bi.hwndOwner      = owner;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     // Please don't change this without checking it compiles
@@ -132,7 +265,7 @@ int wxDirDialog::ShowModal()
 #endif
     bi.ulFlags        = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT;
     bi.lpfn           = BrowseCallbackProc;
-    bi.lParam         = (LPARAM)m_path.wx_str(); // param for the callback
+    bi.lParam         = wxMSW_CONV_LPARAM(m_path); // param for the callback
 
     static const int verComCtl32 = wxApp::GetComCtl32Version();
 
@@ -181,13 +314,140 @@ int wxDirDialog::ShowModal()
 
     m_path = pidl.GetPath();
 
-    // change current working directory if asked so
-    if (HasFlag(wxDD_CHANGE_DIR))
-        wxSetWorkingDirectory(m_path);
-
     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 
+// Function for obtaining folder name on Vista and newer.
+//
+// Returns wxID_OK on success, wxID_CANCEL if cancelled by user or wxID_NONE if
+// an error occurred and we should fall back onto the old dialog.
+#if wxUSE_IFILEDIALOG
+
+int wxDirDialog::ShowIFileDialog(WXHWND owner)
+{
+    HRESULT hr;
+    wxCOMPtr<IFileDialog> fileDialog;
+
+    hr = ::CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER,
+                            wxIID_PPV_ARGS(IFileDialog, &fileDialog));
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("CoCreateInstance(CLSID_FileOpenDialog)"), hr);
+        return wxID_NONE;
+    }
+
+    // allow user to select only a file system folder
+    hr = fileDialog->SetOptions(FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("IFileDialog::SetOptions"), hr);
+        return wxID_NONE;
+    }
+
+    hr = fileDialog->SetTitle(m_message.wc_str());
+    if ( FAILED(hr) )
+    {
+        // This error is not serious, let's just log it and continue even
+        // without the title set.
+        wxLogApiError(wxS("IFileDialog::SetTitle"), hr);
+    }
+
+    // set the initial path
+    if ( !m_path.empty() )
+    {
+        // We need to link SHCreateItemFromParsingName() dynamically as it's
+        // not available on pre-Vista systems.
+        typedef HRESULT
+        (WINAPI *SHCreateItemFromParsingName_t)(PCWSTR,
+                                                IBindCtx*,
+                                                REFIID,
+                                                void**);
+
+        SHCreateItemFromParsingName_t pfnSHCreateItemFromParsingName = NULL;
+        wxDynamicLibrary dllShell32;
+        if ( dllShell32.Load(wxS("shell32.dll"), wxDL_VERBATIM | wxDL_QUIET) )
+        {
+            wxDL_INIT_FUNC(pfn, SHCreateItemFromParsingName, dllShell32);
+        }
+
+        if ( !pfnSHCreateItemFromParsingName )
+        {
+            wxLogLastError(wxS("SHCreateItemFromParsingName() not found"));
+            return wxID_NONE;
+        }
+
+        wxCOMPtr<IShellItem> folder;
+        hr = pfnSHCreateItemFromParsingName(m_path.wc_str(),
+                                              NULL,
+                                              wxIID_PPV_ARGS(IShellItem,
+                                                             &folder));
+        if ( FAILED(hr) )
+        {
+            wxLogApiError(wxS("SHCreateItemFromParsingName"), hr);
+            return wxID_NONE;
+        }
+
+        hr = fileDialog->SetFolder(folder);
+        if ( FAILED(hr) )
+        {
+            wxLogApiError(wxS("IFileDialog::SetFolder"), hr);
+            return wxID_NONE;
+        }
+    }
+
+
+    wxString path;
+
+    hr = fileDialog->Show(owner);
+    if ( SUCCEEDED(hr) )
+    {
+        wxCOMPtr<IShellItem> folder;
+
+        hr = fileDialog->GetResult(&folder);
+        if ( SUCCEEDED(hr) )
+        {
+            LPOLESTR pathOLE = NULL;
+
+            hr = folder->GetDisplayName(SIGDN_FILESYSPATH, &pathOLE);
+            if ( SUCCEEDED(hr) )
+            {
+                path = pathOLE;
+                CoTaskMemFree(pathOLE);
+            }
+            else
+            {
+                wxLogApiError(wxS("IShellItem::GetDisplayName"), hr);
+            }
+        }
+        else
+        {
+            wxLogApiError(wxS("IFileDialog::GetResult"), hr);
+        }
+    }
+    else if ( hr == HRESULT_FROM_WIN32(ERROR_CANCELLED) )
+    {
+        return wxID_CANCEL; // the user cancelled the dialog
+    }
+    else
+    {
+        wxLogApiError(wxS("IFileDialog::Show"), hr);
+    }
+
+    if ( path.empty() )
+    {
+        // the user didn't cancel the dialog and yet the path is empty
+        // it means there was an error, already logged by wxLogApiError()
+        // now report the error to the user and return
+        wxLogSysError(_("Couldn't obtain folder name"), hr);
+        return wxID_CANCEL;
+    }
+
+    m_path = path;
+    return wxID_OK;
+}
+
+#endif // wxUSE_IFILEDIALOG
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -232,7 +492,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
                     }
 
                     SendMessage(hwnd, BFFM_SETSTATUSTEXT,
-                                0, (LPARAM)strDir.wx_str());
+                                0, wxMSW_CONV_LPARAM(strDir));
                 }
             }
             break;
diff --git a/Externals/wxWidgets3/src/msw/display.cpp b/Externals/wxWidgets3/src/msw/display.cpp
index 99098e6a53..ddaec4504b 100644
--- a/Externals/wxWidgets3/src/msw/display.cpp
+++ b/Externals/wxWidgets3/src/msw/display.cpp
@@ -4,7 +4,6 @@
 // Author:      Royce Mitchell III, Vadim Zeitlin
 // Modified by: Ryan Norton (IsPrimary override)
 // Created:     06/21/02
-// RCS-ID:      $Id: display.cpp 69171 2011-09-21 15:07:35Z VZ $
 // Copyright:   (c) wxWidgets team
 // Copyright:   (c) 2002-2006 wxWidgets team
 // Licence:     wxWindows licence
@@ -35,7 +34,7 @@
     #include "wx/frame.h"
 #endif
 
-#include "wx/dynload.h"
+#include "wx/dynlib.h"
 #include "wx/sysopt.h"
 
 #include "wx/display_impl.h"
@@ -431,7 +430,7 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
     // do change the mode
     switch ( pfnChangeDisplaySettingsEx
              (
-                GetName().wx_str(), // display name
+                GetName().t_str(),  // display name
                 pDevMode,           // dev mode or NULL to reset
                 NULL,               // reserved
                 flags,
@@ -608,8 +607,34 @@ int wxDisplayFactoryMSW::GetFromPoint(const wxPoint& pt)
 
 int wxDisplayFactoryMSW::GetFromWindow(const wxWindow *window)
 {
+#ifdef __WXMSW__
     return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
                                                         MONITOR_DEFAULTTONULL));
+#else
+    const wxSize halfsize = window->GetSize() / 2;
+    wxPoint pt = window->GetScreenPosition();
+    pt.x += halfsize.x;
+    pt.y += halfsize.y;
+    return GetFromPoint(pt);
+#endif
 }
 
 #endif // wxUSE_DISPLAY
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+#if defined(__WXMICROWIN__)
+    *x = 0; *y = 0;
+    wxDisplaySize(width, height);
+#else
+    // Determine the desktop dimensions minus the taskbar and any other
+    // special decorations...
+    RECT r;
+
+    SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
+    if (x)      *x = r.left;
+    if (y)      *y = r.top;
+    if (width)  *width = r.right - r.left;
+    if (height) *height = r.bottom - r.top;
+#endif
+}
diff --git a/Externals/wxWidgets3/src/msw/dlmsw.cpp b/Externals/wxWidgets3/src/msw/dlmsw.cpp
index 1863822393..a83e47788e 100644
--- a/Externals/wxWidgets3/src/msw/dlmsw.cpp
+++ b/Externals/wxWidgets3/src/msw/dlmsw.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-10 (partly extracted from common/dynlib.cpp)
-// RCS-ID:      $Id: dlmsw.cpp 68962 2011-08-30 15:20:05Z DS $
 // Copyright:   (c) 1998-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,8 +28,6 @@
 #include "wx/msw/debughlp.h"
 #include "wx/filename.h"
 
-const wxString wxDynamicLibrary::ms_dllext(wxT(".dll"));
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -185,13 +182,16 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PCSTR name,
     wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
 
     // fill in simple properties
-    details->m_name = wxString::FromAscii(name);
+    details->m_name = name;
     details->m_address = wxUIntToPtr(base);
     details->m_length = size;
 
     // to get the version, we first need the full path
-    const HMODULE
-        hmod = wxDynamicLibrary::MSWGetModuleHandle(name, details->m_address);
+    const HMODULE hmod = wxDynamicLibrary::MSWGetModuleHandle
+                         (
+                            details->m_name,
+                            details->m_address
+                         );
     if ( hmod )
     {
         wxString fullname = wxGetFullModuleName(hmod);
@@ -236,51 +236,7 @@ wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
     if (flags & wxDL_GET_LOADED)
         return ::GetModuleHandle(libname.t_str());
 
-    // Explicitly look in the same path as where the main wx HINSTANCE module
-    // is located (usually the executable or the DLL that uses wx).  Normally
-    // this is automatically part of the default search path but in some cases
-    // it may not be, such as when the wxPython extension modules need to load
-    // a DLL, but the intperpreter executable is located elsewhere.  Doing
-    // this allows us to always be able to dynamically load a DLL that is
-    // located at the same place as the wx modules.
-    wxString modpath, path;
-    ::GetModuleFileName(wxGetInstance(),
-                        wxStringBuffer(modpath, MAX_PATH+1),
-                        MAX_PATH);
-    
-    wxFileName::SplitPath(modpath, &path, NULL, NULL);
-
-    typedef BOOL (WINAPI *SetDllDirectory_t)(LPCTSTR lpPathName);
-
-    static SetDllDirectory_t s_pfnSetDllDirectory = (SetDllDirectory_t) -1;
-
-    if ( s_pfnSetDllDirectory == (SetDllDirectory_t) -1 )
-    {
-        /*
-        Should wxLoadedDLL ever not be used here (or rather, the
-        wxDL_GET_LOADED flag isn't used), infinite recursion will take
-        place (unless s_pfnSetDllDirectory is set to NULL here right
-        before loading the DLL).
-        */
-        wxLoadedDLL dllKernel("kernel32.dll");
-
-        wxDL_INIT_FUNC_AW(s_pfn, SetDllDirectory, dllKernel);
-    }
-
-    if (s_pfnSetDllDirectory)
-    {
-        s_pfnSetDllDirectory(path.t_str());
-    }
-
-    wxDllType handle = ::LoadLibrary(libname.t_str());
-
-    // reset the search path
-    if (s_pfnSetDllDirectory)
-    {
-        s_pfnSetDllDirectory(NULL);
-    }
-
-    return handle;
+    return ::LoadLibrary(libname.t_str());
 }
 
 /* static */
@@ -294,7 +250,7 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 {
     return (void *)::GetProcAddress(handle,
 #ifdef __WXWINCE__
-                                            name.c_str()
+                                            name.t_str()
 #else
                                             name.ToAscii()
 #endif // __WXWINCE__
@@ -342,7 +298,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
 }
 
 /* static */
-WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
+WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const wxString& name, void *addr)
 {
     // we want to use GetModuleHandleEx() instead of usual GetModuleHandle()
     // because the former works correctly for comctl32.dll while the latter
@@ -350,7 +306,7 @@ WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
     // GetModuleHandleEx() is only available under XP and later, coincidence?)
 
     // check if we can use GetModuleHandleEx
-    typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCSTR, HMODULE *);
+    typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCTSTR, HMODULE *);
 
     static const GetModuleHandleEx_t INVALID_FUNC_PTR = (GetModuleHandleEx_t)-1;
 
@@ -359,7 +315,7 @@ WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
     {
         wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM);
         s_pfnGetModuleHandleEx =
-            (GetModuleHandleEx_t)dll.RawGetSymbol(wxT("GetModuleHandleExA"));
+            (GetModuleHandleEx_t)dll.GetSymbolAorW(wxT("GetModuleHandleEx"));
 
         // dll object can be destroyed, kernel32.dll won't be unloaded anyhow
     }
@@ -370,17 +326,11 @@ WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
         // flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
         //           GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
         HMODULE hmod;
-        if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod )
+        if ( s_pfnGetModuleHandleEx(6, (LPCTSTR)addr, &hmod) && hmod )
             return hmod;
     }
 
-    // Windows CE only has Unicode API, so even we have an ANSI string here, we
-    // still need to use GetModuleHandleW() there
-#ifdef __WXWINCE__
-    return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data());
-#else
-    return ::GetModuleHandleA((char *)name);
-#endif
+    return ::GetModuleHandle(name.t_str());
 }
 
 #endif // wxUSE_DYNLIB_CLASS
diff --git a/Externals/wxWidgets3/src/msw/dragimag.cpp b/Externals/wxWidgets3/src/msw/dragimag.cpp
index 0589d975f4..a5f6899b47 100644
--- a/Externals/wxWidgets3/src/msw/dragimag.cpp
+++ b/Externals/wxWidgets3/src/msw/dragimag.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
-// RCS-ID:      $Id: dragimag.cpp 70584 2012-02-15 00:35:25Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -413,7 +412,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow*
 
     wxSize sz = fullScreenRect->GetSize();
 
-    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
+    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
diff --git a/Externals/wxWidgets3/src/msw/enhmeta.cpp b/Externals/wxWidgets3/src/msw/enhmeta.cpp
index 57373a41de..f7c0f7abb0 100644
--- a/Externals/wxWidgets3/src/msw/enhmeta.cpp
+++ b/Externals/wxWidgets3/src/msw/enhmeta.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id: enhmeta.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -59,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)
 
 // we must pass NULL if the string is empty to metafile functions
 static inline const wxChar *GetMetaFileName(const wxString& fn)
-    { return !fn ? (const wxChar *)NULL : (const wxChar*)fn.wx_str(); }
+    { return !fn ? NULL : wxMSW_CONV_LPCTSTR(fn); }
 
 // ============================================================================
 // implementation
@@ -291,7 +290,7 @@ void wxEnhMetaFileDCImpl::Create(HDC hdcRef,
     }
 
     m_hDC = (WXHDC)::CreateEnhMetaFile(hdcRef, GetMetaFileName(filename),
-                                       pRect, description.wx_str());
+                                       pRect, description.t_str());
     if ( !m_hDC )
     {
         wxLogLastError(wxT("CreateEnhMetaFile"));
diff --git a/Externals/wxWidgets3/src/msw/evtloop.cpp b/Externals/wxWidgets3/src/msw/evtloop.cpp
index 04f49f0752..7c861c3fae 100644
--- a/Externals/wxWidgets3/src/msw/evtloop.cpp
+++ b/Externals/wxWidgets3/src/msw/evtloop.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/evtloop.cpp
-// Purpose:     implements wxEventLoop for MSW
+// Purpose:     implements wxEventLoop for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
-// RCS-ID:      $Id: evtloop.cpp 70690 2012-02-25 23:49:45Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,9 +26,7 @@
 #include "wx/evtloop.h"
 
 #ifndef WX_PRECOMP
-    #if wxUSE_GUI
-        #include "wx/window.h"
-    #endif
+    #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
@@ -39,115 +36,15 @@
 #include "wx/msw/private.h"
 #include "wx/scopeguard.h"
 
-#if wxUSE_GUI
-    #include "wx/tooltip.h"
-    #if wxUSE_THREADS
-        // define the list of MSG strutures
-        WX_DECLARE_LIST(MSG, wxMsgList);
+#include "wx/tooltip.h"
+#if wxUSE_THREADS
+    // define the list of MSG strutures
+    WX_DECLARE_LIST(MSG, wxMsgList);
 
-        #include "wx/listimpl.cpp"
+    #include "wx/listimpl.cpp"
 
-        WX_DEFINE_LIST(wxMsgList)
-    #endif // wxUSE_THREADS
-#endif //wxUSE_GUI
-
-#if wxUSE_BASE
-
-// ============================================================================
-// wxMSWEventLoopBase implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxMSWEventLoopBase::wxMSWEventLoopBase()
-{
-    m_shouldExit = false;
-    m_exitcode = 0;
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoop message processing dispatching
-// ----------------------------------------------------------------------------
-
-bool wxMSWEventLoopBase::Pending() const
-{
-    MSG msg;
-    return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
-}
-
-bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
-{
-    const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
-
-    if ( rc == 0 )
-    {
-        // got WM_QUIT
-        return false;
-    }
-
-    if ( rc == -1 )
-    {
-        // should never happen, but let's test for it nevertheless
-        wxLogLastError(wxT("GetMessage"));
-
-        // still break from the loop
-        return false;
-    }
-
-    return true;
-}
-
-int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
-{
-    // MsgWaitForMultipleObjects() won't notice any input which was already
-    // examined (e.g. using PeekMessage()) but not yet removed from the queue
-    // so we need to remove any immediately messages manually
-    //
-    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
-    //     it is not available in very old Windows versions
-    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-    {
-        // we use this function just in order to not block longer than the
-        // given timeout, so we don't pass any handles to it at all
-        DWORD rc = ::MsgWaitForMultipleObjects
-                     (
-                        0, NULL,
-                        FALSE,
-                        timeout,
-                        QS_ALLINPUT
-                     );
-
-        switch ( rc )
-        {
-            default:
-                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
-                           "value %lu", rc);
-                // fall through
-
-            case WAIT_TIMEOUT:
-                return -1;
-
-            case WAIT_OBJECT_0:
-                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-                {
-                    // somehow it may happen that MsgWaitForMultipleObjects()
-                    // returns true but there are no messages -- just treat it
-                    // the same as timeout then
-                    return -1;
-                }
-                break;
-        }
-    }
-
-    return msg->message != WM_QUIT;
-}
-
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
+    WX_DEFINE_LIST(wxMsgList)
+#endif // wxUSE_THREADS
 
 // ============================================================================
 // GUI wxEventLoop implementation
@@ -553,52 +450,3 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
 
     return true;
 }
-
-
-#else // !wxUSE_GUI
-
-
-// ============================================================================
-// wxConsoleEventLoop implementation
-// ============================================================================
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-void wxConsoleEventLoop::WakeUp()
-{
-#if wxUSE_THREADS
-    wxWakeUpMainThread();
-#endif
-}
-
-void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
-{
-    ::DispatchMessage(msg);
-}
-
-bool wxConsoleEventLoop::Dispatch()
-{
-    MSG msg;
-    if ( !GetNextMessage(&msg) )
-        return false;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
-{
-    MSG msg;
-    int rc = GetNextMessageTimeout(&msg, timeout);
-    if ( rc != 1 )
-        return rc;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif //wxUSE_GUI
diff --git a/Externals/wxWidgets3/src/msw/evtloopconsole.cpp b/Externals/wxWidgets3/src/msw/evtloopconsole.cpp
new file mode 100644
index 0000000000..5421b86c43
--- /dev/null
+++ b/Externals/wxWidgets3/src/msw/evtloopconsole.cpp
@@ -0,0 +1,165 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/evtloopconsole.cpp
+// Purpose:     wxConsoleEventLoop class for Windows
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     01.06.01
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/msw/wrapwin.h"
+#endif //WX_PRECOMP
+
+#include "wx/evtloop.h"
+
+// ============================================================================
+// wxMSWEventLoopBase implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxMSWEventLoopBase::wxMSWEventLoopBase()
+{
+    m_shouldExit = false;
+    m_exitcode = 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxEventLoop message processing dispatching
+// ----------------------------------------------------------------------------
+
+bool wxMSWEventLoopBase::Pending() const
+{
+    MSG msg;
+    return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
+}
+
+bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
+{
+    const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
+
+    if ( rc == 0 )
+    {
+        // got WM_QUIT
+        return false;
+    }
+
+    if ( rc == -1 )
+    {
+        // should never happen, but let's test for it nevertheless
+        wxLogLastError(wxT("GetMessage"));
+
+        // still break from the loop
+        return false;
+    }
+
+    return true;
+}
+
+int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
+{
+    // MsgWaitForMultipleObjects() won't notice any input which was already
+    // examined (e.g. using PeekMessage()) but not yet removed from the queue
+    // so we need to remove any immediately messages manually
+    //
+    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
+    //     it is not available in very old Windows versions
+    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
+    {
+        // we use this function just in order to not block longer than the
+        // given timeout, so we don't pass any handles to it at all
+        DWORD rc = ::MsgWaitForMultipleObjects
+                     (
+                        0, NULL,
+                        FALSE,
+                        timeout,
+                        QS_ALLINPUT
+                     );
+
+        switch ( rc )
+        {
+            default:
+                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
+                           "value %lu", rc);
+                // fall through
+
+            case WAIT_TIMEOUT:
+                return -1;
+
+            case WAIT_OBJECT_0:
+                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
+                {
+                    // somehow it may happen that MsgWaitForMultipleObjects()
+                    // returns true but there are no messages -- just treat it
+                    // the same as timeout then
+                    return -1;
+                }
+                break;
+        }
+    }
+
+    return msg->message != WM_QUIT;
+}
+
+// ============================================================================
+// wxConsoleEventLoop implementation
+// ============================================================================
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+void wxConsoleEventLoop::WakeUp()
+{
+#if wxUSE_THREADS
+    wxWakeUpMainThread();
+#endif
+}
+
+void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
+{
+    ::DispatchMessage(msg);
+}
+
+bool wxConsoleEventLoop::Dispatch()
+{
+    MSG msg;
+    if ( !GetNextMessage(&msg) )
+        return false;
+
+    ProcessMessage(&msg);
+
+    return !m_shouldExit;
+}
+
+int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
+{
+    MSG msg;
+    int rc = GetNextMessageTimeout(&msg, timeout);
+    if ( rc != 1 )
+        return rc;
+
+    ProcessMessage(&msg);
+
+    return !m_shouldExit;
+}
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
diff --git a/Externals/wxWidgets3/src/msw/fdrepdlg.cpp b/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
index bd445fe614..924e7b3528 100644
--- a/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id: fdrepdlg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -240,21 +239,21 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
         // 2 cases
         dialog->GetImpl()->SetClosedByUser();
 
-        evtType = wxEVT_COMMAND_FIND_CLOSE;
+        evtType = wxEVT_FIND_CLOSE;
     }
     else if ( pFR->Flags & FR_FINDNEXT )
     {
-        evtType = wxEVT_COMMAND_FIND_NEXT;
+        evtType = wxEVT_FIND_NEXT;
     }
     else if ( pFR->Flags & FR_REPLACE )
     {
-        evtType = wxEVT_COMMAND_FIND_REPLACE;
+        evtType = wxEVT_FIND_REPLACE;
 
         replace = true;
     }
     else if ( pFR->Flags & FR_REPLACEALL )
     {
-        evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
+        evtType = wxEVT_FIND_REPLACE_ALL;
 
         replace = true;
     }
@@ -310,7 +309,7 @@ wxFindReplaceDialogHookProc(HWND hwnd,
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
-        ::SetWindowText(hwnd, dialog->GetTitle().wx_str());
+        ::SetWindowText(hwnd, dialog->GetTitle().t_str());
 
         // don't return FALSE from here or the dialog won't be shown
         return TRUE;
diff --git a/Externals/wxWidgets3/src/msw/filedlg.cpp b/Externals/wxWidgets3/src/msw/filedlg.cpp
index d7831b30bf..7327c7bdd7 100644
--- a/Externals/wxWidgets3/src/msw/filedlg.cpp
+++ b/Externals/wxWidgets3/src/msw/filedlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: filedlg.cpp 69908 2011-12-02 10:15:16Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -47,6 +46,7 @@
 #include "wx/filename.h"
 #include "wx/scopeguard.h"
 #include "wx/tokenzr.h"
+#include "wx/modalhook.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -172,13 +172,23 @@ wxFileDialogHookFunction(HWND      hDlg,
 
         case WM_NOTIFY:
             {
-                OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
-                if ( pNotifyCode->hdr.code == CDN_INITDONE )
+                OFNOTIFY* const
+                    pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
+                wxFileDialog* const
+                    dialog = reinterpret_cast<wxFileDialog *>(
+                                    pNotifyCode->lpOFN->lCustData
+                                );
+
+                switch ( pNotifyCode->hdr.code )
                 {
-                    reinterpret_cast<wxFileDialog *>(
-                                        pNotifyCode->lpOFN->lCustData)
-                        ->MSWOnInitDone((WXHWND)hDlg);
-                 }
+                    case CDN_INITDONE:
+                        dialog->MSWOnInitDone((WXHWND)hDlg);
+                        break;
+
+                    case CDN_SELCHANGE:
+                        dialog->MSWOnSelChange((WXHWND)hDlg);
+                        break;
+                }
             }
             break;
 
@@ -322,10 +332,29 @@ void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
         SetPosition(gs_rectDialog.GetPosition());
     }
 
+    // Call selection change handler so that update handler will be
+    // called once with no selection.
+    MSWOnSelChange(hDlg);
+
     // we shouldn't destroy this HWND
     SetHWND(NULL);
 }
 
+void wxFileDialog::MSWOnSelChange(WXHWND hDlg)
+{
+    TCHAR buf[MAX_PATH];
+    LRESULT len = SendMessage(::GetParent(hDlg), CDM_GETFILEPATH,
+                              MAX_PATH, reinterpret_cast<LPARAM>(buf));
+
+    if ( len > 0 )
+        m_currentlySelectedFilename = buf;
+    else
+        m_currentlySelectedFilename.clear();
+
+    if ( m_extraControl )
+        m_extraControl->UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
 // helper used below in ShowCommFileDialog(): style is used to determine
 // whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or
 // "Open file" one; returns true on success or false on failure in which case
@@ -449,6 +478,8 @@ void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
 
 int wxFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();
     if (!hWnd && wxTheApp->GetTopWindow())
@@ -507,7 +538,7 @@ int wxFileDialog::ShowModal()
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;
-    of.lpstrTitle        = m_message.wx_str();
+    of.lpstrTitle        = m_message.t_str();
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 
@@ -609,7 +640,7 @@ int wxFileDialog::ShowModal()
         }
     }
 
-    of.lpstrFilter  = (LPTSTR)filterBuffer.wx_str();
+    of.lpstrFilter  = filterBuffer.t_str();
     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
@@ -626,7 +657,7 @@ int wxFileDialog::ShowModal()
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!
     if (HasFdFlag(wxFD_SAVE))
     {
-        const wxChar* extension = filterBuffer.wx_str();
+        const wxChar* extension = filterBuffer.t_str();
         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension
@@ -708,7 +739,7 @@ int wxFileDialog::ShowModal()
              (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
         {
             // User has typed a filename without an extension:
-            const wxChar* extension = filterBuffer.wx_str();
+            const wxChar* extension = filterBuffer.t_str();
             int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
             for( int i = 0; i < maxFilter; i++ )           // get extension
diff --git a/Externals/wxWidgets3/src/msw/font.cpp b/Externals/wxWidgets3/src/msw/font.cpp
index 2c52d12a32..bbf7d849a6 100644
--- a/Externals/wxWidgets3/src/msw/font.cpp
+++ b/Externals/wxWidgets3/src/msw/font.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: font.cpp 70446 2012-01-23 11:28:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -804,18 +803,18 @@ wxFont::wxFont(const wxString& fontdesc)
         (void)Create(info);
 }
 
-wxFont::wxFont(int pointSize,
-               wxFontFamily family,
-               int flags,
-               const wxString& face,
-               wxFontEncoding encoding)
+wxFont::wxFont(const wxFontInfo& info)
 {
-    m_refData = new wxFontRefData(pointSize, wxDefaultSize, false,
-                                  family,
-                                  GetStyleFromFlags(flags),
-                                  GetWeightFromFlags(flags),
-                                  GetUnderlinedFromFlags(flags),
-                                  false, face, encoding);
+    m_refData = new wxFontRefData(info.GetPointSize(),
+                                  info.GetPixelSize(),
+                                  info.IsUsingSizeInPixels(),
+                                  info.GetFamily(),
+                                  info.GetStyle(),
+                                  info.GetWeight(),
+                                  info.IsUnderlined(),
+                                  info.IsStrikethrough(),
+                                  info.GetFaceName(),
+                                  info.GetEncoding());
 }
 
 bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
@@ -841,7 +840,7 @@ bool wxFont::DoCreate(int pointSize,
 
     // wxDEFAULT is a valid value for the font size too so we must treat it
     // specially here (otherwise the size would be 70 == wxDEFAULT value)
-    if ( pointSize == wxDEFAULT )
+    if ( pointSize == wxDEFAULT || pointSize == -1 )
     {
         pointSize = wxNORMAL_FONT->GetPointSize();
     }
diff --git a/Externals/wxWidgets3/src/msw/fontdlg.cpp b/Externals/wxWidgets3/src/msw/fontdlg.cpp
index 8fa40ea519..13c1dc1f69 100644
--- a/Externals/wxWidgets3/src/msw/fontdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/fontdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: fontdlg.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +26,7 @@
 #if wxUSE_FONTDLG
 
 #include "wx/fontdlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
@@ -55,6 +55,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     // It should be OK to always use GDI simulations
     DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ;
 
diff --git a/Externals/wxWidgets3/src/msw/fontenum.cpp b/Externals/wxWidgets3/src/msw/fontenum.cpp
index 2189ba1192..9b505cb4f1 100644
--- a/Externals/wxWidgets3/src/msw/fontenum.cpp
+++ b/Externals/wxWidgets3/src/msw/fontenum.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to add support for font encodings
 // Created:     04/01/98
-// RCS-ID:      $Id: fontenum.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -160,7 +159,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 
 #ifdef __WXWINCE__
     ::EnumFontFamilies(hDC,
-                       m_facename.empty() ? NULL : m_facename.wx_str(),
+                       m_facename.empty() ? NULL : wxMSW_CONV_LPCTSTR(m_facename),
                        (wxFONTENUMPROC)wxFontEnumeratorProc,
                        (LPARAM)this) ;
 #else // __WIN32__
@@ -187,9 +186,18 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         {
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
+#if wxUSE_FONTMAP
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
             return m_fontEnum->OnFontEncoding(lf->lfFaceName,
                                               wxFontMapper::GetEncodingName(enc));
+#else // !wxUSE_FONTMAP
+            // Just use some unique and, hopefully, understandable, name.
+            return m_fontEnum->OnFontEncoding
+                               (
+                                lf->lfFaceName,
+                                wxString::Format(wxS("Code page %d"), cs)
+                               );
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
         }
         else
         {
diff --git a/Externals/wxWidgets3/src/msw/fontutil.cpp b/Externals/wxWidgets3/src/msw/fontutil.cpp
index 034b28dd9d..010ce5dc84 100644
--- a/Externals/wxWidgets3/src/msw/fontutil.cpp
+++ b/Externals/wxWidgets3/src/msw/fontutil.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id: fontutil.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -251,6 +250,14 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             fontEncoding = wxFONTENCODING_CP950;
             break;
 
+        case VIETNAMESE_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1258;
+            break;
+
+        case JOHAB_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1361;
+            break;
+
 #endif // Win32
 
         case OEM_CHARSET:
diff --git a/Externals/wxWidgets3/src/msw/frame.cpp b/Externals/wxWidgets3/src/msw/frame.cpp
index 880731fb4e..8c1b178657 100644
--- a/Externals/wxWidgets3/src/msw/frame.cpp
+++ b/Externals/wxWidgets3/src/msw/frame.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: frame.cpp 70511 2012-02-05 14:18:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -57,12 +56,6 @@
     #include "wx/univ/colschem.h"
 #endif // __WXUNIVERSAL__
 
-// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
-//            could be removed once support for it is dropped.
-#ifndef WM_UNINITMENUPOPUP
-    #define WM_UNINITMENUPOPUP 0x0125
-#endif
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -429,11 +422,22 @@ void wxFrame::InternalSetMenuBar()
 
 #endif // wxUSE_MENUS_NATIVE
 
+#if wxUSE_MENUS
+wxMenu* wxFrame::MSWFindMenuFromHMENU(WXHMENU hMenu)
+{
+    return GetMenuBar() ? GetMenuBar()->MSWGetMenu(hMenu) : NULL;
+}
+#endif // wxUSE_MENUS
+
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
-    Refresh();
+    // Don't override the colour explicitly set by the user, if any.
+    if ( !UseBgCol() )
+    {
+        SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+        Refresh();
+    }
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
@@ -820,72 +824,6 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     return wxFrameBase::HandleCommand(id, cmd, control);;
 }
 
-#if wxUSE_MENUS
-
-bool
-wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU WXUNUSED(hMenu))
-{
-    // sign extend to int from unsigned short we get from Windows
-    int item = (signed short)nItem;
-
-    // WM_MENUSELECT is generated for both normal items and menus, including
-    // the top level menus of the menu bar, which can't be represented using
-    // any valid identifier in wxMenuEvent so use an otherwise unused value for
-    // them
-    if ( flags & (MF_POPUP | MF_SEPARATOR) )
-        item = wxID_NONE;
-
-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
-    event.SetEventObject(this);
-
-    if ( HandleWindowEvent(event) )
-        return true;
-
-    // by default, i.e. if the event wasn't handled above, clear the status bar
-    // text when an item which can't have any associated help string in wx API
-    // is selected
-    if ( item == wxID_NONE )
-        DoGiveHelp(wxEmptyString, true);
-
-    return false;
-}
-
-bool
-wxFrame::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
-{
-    wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);
-    event.SetEventObject(this);
-
-    return HandleWindowEvent(event);
-}
-
-bool wxFrame::HandleExitMenuLoop(WXWORD isPopup)
-{
-    return DoSendMenuOpenCloseEvent(wxEVT_MENU_CLOSE,
-                                    isPopup ? wxCurrentPopupMenu : NULL,
-                                    isPopup != 0);
-}
-
-bool wxFrame::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
-{
-    bool isPopup = false;
-    wxMenu* menu = NULL;
-    if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetHMenu() == hMenu )
-    {
-        menu = wxCurrentPopupMenu;
-        isPopup = true;
-    }
-    else if ( GetMenuBar() )
-    {
-        menu = GetMenuBar()->MSWGetMenu(hMenu);
-    }
-
-
-    return DoSendMenuOpenCloseEvent(evtType, menu, isPopup);
-}
-
-#endif // wxUSE_MENUS
-
 // ---------------------------------------------------------------------------
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
@@ -926,36 +864,6 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
             break;
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-#if wxUSE_MENUS
-        case WM_INITMENUPOPUP:
-            processed = HandleMenuPopup(wxEVT_MENU_OPEN, (WXHMENU)wParam);
-            break;
-
-        case WM_MENUSELECT:
-            {
-                WXWORD item, flags;
-                WXHMENU hmenu;
-                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
-
-                processed = HandleMenuSelect(item, flags, hmenu);
-            }
-            break;
-
-        case WM_EXITMENULOOP:
-            // Under Windows 98 and 2000 and later we're going to get
-            // WM_UNINITMENUPOPUP which will be used to generate this event
-            // with more information (notably the menu that was closed) so we
-            // only need this one under old Windows systems where the newer
-            // event is never sent.
-            if ( wxGetWinVersion() < wxWinVersion_98 )
-                processed = HandleExitMenuLoop(wParam);
-            break;
-
-        case WM_UNINITMENUPOPUP:
-            processed = HandleMenuPopup(wxEVT_MENU_CLOSE, (WXHMENU)wParam);
-            break;
-#endif // wxUSE_MENUS
-
         case WM_QUERYDRAGICON:
             {
                 const wxIcon& icon = GetIcon();
diff --git a/Externals/wxWidgets3/src/msw/fswatcher.cpp b/Externals/wxWidgets3/src/msw/fswatcher.cpp
index 9e7fa45f67..d179f67155 100644
--- a/Externals/wxWidgets3/src/msw/fswatcher.cpp
+++ b/Externals/wxWidgets3/src/msw/fswatcher.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxMSWFileSystemWatcher
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher.cpp 67693 2011-05-03 23:31:39Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -136,7 +135,7 @@ void wxFSWatcherImplMSW::SendEvent(wxFileSystemWatcherEvent& evt)
 
 bool wxFSWatcherImplMSW::DoSetUpWatch(wxFSWatchEntryMSW& watch)
 {
-    BOOL bWatchSubtree wxDUMMY_INITIALIZE(FALSE);
+    BOOL bWatchSubtree = FALSE;
 
     switch ( watch.GetType() )
     {
@@ -232,6 +231,29 @@ bool wxIOCPThread::ReadEvents()
     if (!count && !watch && !overlapped)
         return false;
 
+    // if the thread got woken up but we got an empty packet it means that
+    // there was an overflow, too many events and not all could fit in
+    // the watch buffer.  In this case, ReadDirectoryChangesW dumps the
+    // buffer.
+    if (!count && watch)
+    {
+         wxLogTrace(wxTRACE_FSWATCHER, "[iocp] Event queue overflowed: path=\"%s\"",
+                    watch->GetPath());
+
+        if (watch->GetFlags() & wxFSW_EVENT_WARNING)
+        {
+            wxFileSystemWatcherEvent
+                overflowEvent(wxFSW_EVENT_WARNING, wxFSW_WARNING_OVERFLOW);
+            overflowEvent.SetPath(watch->GetPath());
+            SendEvent(overflowEvent);
+        }
+
+        // overflow is not a fatal error, we still want to get future events
+        // reissue the watch
+        (void) m_service->SetUpWatch(*watch);
+        return true;
+    }
+
     // in case of spurious wakeup
     if (!count || !watch)
         return true;
@@ -284,9 +306,10 @@ void wxIOCPThread::ProcessNativeEvents(wxVector<wxEventProcessingData>& events)
         int flags = Native2WatcherFlags(nativeFlags);
         if (flags & wxFSW_EVENT_WARNING || flags & wxFSW_EVENT_ERROR)
         {
-            // TODO think about this...do we ever have any errors to report?
-            wxString errMsg = "Error occurred";
-            wxFileSystemWatcherEvent event(flags, errMsg);
+            wxFileSystemWatcherEvent
+                event(flags,
+                      flags & wxFSW_EVENT_ERROR ? wxFSW_WARNING_NONE
+                                                : wxFSW_WARNING_GENERAL);
             SendEvent(event);
         }
         // filter out ignored events and those not asked for.
@@ -316,8 +339,12 @@ void wxIOCPThread::ProcessNativeEvents(wxVector<wxEventProcessingData>& events)
             // CHECK I heard that returned path can be either in short on long
             // form...need to account for that!
             wxFileName path = GetEventPath(*watch, e);
-            wxFileSystemWatcherEvent event(flags, path, path);
-            SendEvent(event);
+            // For files, check that it matches any filespec
+            if ( m_service->MatchesFilespec(path, watch->GetFilespec()) )
+            {
+                wxFileSystemWatcherEvent event(flags, path, path);
+                SendEvent(event);
+            }
         }
     }
 }
@@ -431,7 +458,7 @@ wxMSWFileSystemWatcher::AddTree(const wxFileName& path,
         return false;
     }
 
-    return DoAdd(path, events, wxFSWPath_Tree);
+    return AddAny(path, events, wxFSWPath_Tree);
 }
 
 #endif // wxUSE_FSWATCHER
diff --git a/Externals/wxWidgets3/src/msw/gauge.cpp b/Externals/wxWidgets3/src/msw/gauge.cpp
index 65a1e69d3d..26ab8e9eb4 100644
--- a/Externals/wxWidgets3/src/msw/gauge.cpp
+++ b/Externals/wxWidgets3/src/msw/gauge.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gauge.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/gdiimage.cpp b/Externals/wxWidgets3/src/msw/gdiimage.cpp
index c82029a638..439cc916a7 100644
--- a/Externals/wxWidgets3/src/msw/gdiimage.cpp
+++ b/Externals/wxWidgets3/src/msw/gdiimage.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id: gdiimage.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,18 @@
 #include "wx/msw/dib.h"
 #endif
 
+// By default, use PNG resource handler if we can, i.e. have support for
+// loading PNG images in the library. This symbol could be predefined as 0 to
+// avoid doing this if anybody ever needs to do it for some reason.
+#if !defined(wxUSE_PNG_RESOURCE_HANDLER) && wxUSE_LIBPNG && wxUSE_IMAGE
+    #define wxUSE_PNG_RESOURCE_HANDLER 1
+#endif
+
+#if wxUSE_PNG_RESOURCE_HANDLER
+    #include "wx/image.h"
+    #include "wx/utils.h"       // For wxLoadUserResource()
+#endif
+
 #ifdef __WXWINCE__
 #include <winreg.h>
 #include <shellapi.h>
@@ -173,6 +184,27 @@ private:
     DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
 };
 
+#if wxUSE_PNG_RESOURCE_HANDLER
+
+class WXDLLEXPORT wxPNGResourceHandler : public wxBitmapHandler
+{
+public:
+    wxPNGResourceHandler() : wxBitmapHandler(wxS("Windows PNG resource"),
+                                             wxString(),
+                                             wxBITMAP_TYPE_PNG_RESOURCE)
+    {
+    }
+
+    virtual bool LoadFile(wxBitmap *bitmap,
+                          const wxString& name, wxBitmapType flags,
+                          int desiredWidth, int desiredHeight);
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler);
+};
+
+#endif // wxUSE_PNG_RESOURCE_HANDLER
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -181,6 +213,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
+#if wxUSE_PNG_RESOURCE_HANDLER
+IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler)
+#endif // wxUSE_PNG_RESOURCE_HANDLER
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -306,8 +341,11 @@ void wxGDIImage::InitStandardHandlers()
 #ifndef __WXMICROWIN__
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
-    AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
+    AddHandler(new wxICOResourceHandler);
+#if wxUSE_PNG_RESOURCE_HANDLER
+    AddHandler(new wxPNGResourceHandler);
+#endif // wxUSE_PNG_RESOURCE_HANDLER
 #endif
 }
 
@@ -323,7 +361,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.
-    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str()));
+    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.t_str()));
 
     if ( !bitmap->IsOk() )
     {
@@ -393,9 +431,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
 {
     icon->UnRef();
 
-    // actual size
-    wxSize size;
-
     HICON hicon = NULL;
 
     // Parse the filename: it may be of the form "filename;n" in order to
@@ -438,7 +473,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file
-        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, &hicon, NULL, 1) )
+        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, &hicon, NULL, 1) )
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
@@ -451,7 +486,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file
-        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, NULL, &hicon, 1) )
+        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, NULL, &hicon, 1) )
         {
             wxLogTrace(wxT("iconload"),
                        wxT("No small icons found in the file '%s'."),
@@ -464,7 +499,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( !hicon )
     {
         // take any size icon from the file by index
-        hicon = ::ExtractIcon(wxGetInstance(), nameReal.wx_str(), iconIndex);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal.t_str(), iconIndex);
     }
 #endif
 
@@ -476,25 +511,23 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
         return false;
     }
 
-    size = wxGetHiconSize(hicon);
+    if ( !icon->CreateFromHICON(hicon) )
+        return false;
 
-    if ( (desiredWidth != -1 && desiredWidth != size.x) ||
-         (desiredHeight != -1 && desiredHeight != size.y) )
+    if ( (desiredWidth != -1 && desiredWidth != icon->GetWidth()) ||
+         (desiredHeight != -1 && desiredHeight != icon->GetHeight()) )
     {
         wxLogTrace(wxT("iconload"),
                    wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
-                   size.x, size.y,
+                   icon->GetWidth(), icon->GetHeight(),
                    desiredWidth, desiredHeight);
 
-        ::DestroyIcon(hicon);
+        icon->UnRef();
 
         return false;
     }
 
-    icon->SetHICON((WXHICON)hicon);
-    icon->SetSize(size.x, size.y);
-
-    return icon->IsOk();
+    return true;
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
@@ -518,13 +551,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {
-        hicon = (HICON)::LoadImage(wxGetInstance(), name.wx_str(), IMAGE_ICON,
+        hicon = (HICON)::LoadImage(wxGetInstance(), name.t_str(), IMAGE_ICON,
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {
-        hicon = ::LoadIcon(wxGetInstance(), name.wx_str());
+        hicon = ::LoadIcon(wxGetInstance(), name.t_str());
     }
 
     // next check if it's not a standard icon
@@ -554,14 +587,58 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     }
 #endif
 
-    wxSize size = wxGetHiconSize(hicon);
-    icon->SetSize(size.x, size.y);
-
-    icon->SetHICON((WXHICON)hicon);
-
-    return icon->IsOk();
+    return icon->CreateFromHICON((WXHICON)hicon);
 }
 
+#if wxUSE_PNG_RESOURCE_HANDLER
+
+// ----------------------------------------------------------------------------
+// PNG handler
+// ----------------------------------------------------------------------------
+
+bool wxPNGResourceHandler::LoadFile(wxBitmap *bitmap,
+                                    const wxString& name,
+                                    wxBitmapType WXUNUSED(flags),
+                                    int WXUNUSED(desiredWidth),
+                                    int WXUNUSED(desiredHeight))
+{
+    const void* pngData = NULL;
+    size_t pngSize = 0;
+
+    // Currently we hardcode RCDATA resource type as this is what is usually
+    // used for the embedded images. We could allow specifying the type as part
+    // of the name in the future (e.g. "type:name" or something like this) if
+    // really needed.
+    if ( !wxLoadUserResource(&pngData, &pngSize,
+                             name,
+                             RT_RCDATA,
+                             wxGetInstance()) )
+    {
+        // Notice that this message is not translated because only the
+        // programmer (and not the end user) can make any use of it.
+        wxLogError(wxS("Bitmap in PNG format \"%s\" not found, check ")
+                   wxS("that the resource file contains \"RCDATA\" ")
+                   wxS("resource with this name."),
+                   name);
+
+        return false;
+    }
+
+    *bitmap = wxBitmap::NewFromPNGData(pngData, pngSize);
+    if ( !bitmap->IsOk() )
+    {
+        wxLogError(wxS("Couldn't load resource bitmap \"%s\" as a PNG. "),
+                   wxS("Have you registered PNG image handler?"),
+                   name);
+
+        return false;
+    }
+
+    return true;
+}
+
+#endif // wxUSE_PNG_RESOURCE_HANDLER
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/gdiobj.cpp b/Externals/wxWidgets3/src/msw/gdiobj.cpp
index e9a46bfa18..cc4db3fa3c 100644
--- a/Externals/wxWidgets3/src/msw/gdiobj.cpp
+++ b/Externals/wxWidgets3/src/msw/gdiobj.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gdiobj.cpp 56644 2008-11-02 02:39:52Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/gdiplus.cpp b/Externals/wxWidgets3/src/msw/gdiplus.cpp
index 6043064eb4..97751b41bd 100644
--- a/Externals/wxWidgets3/src/msw/gdiplus.cpp
+++ b/Externals/wxWidgets3/src/msw/gdiplus.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements wrappers for GDI+ flat API
 // Author:      Vadim Zeitlin
 // Created:     2007-03-14
-// RCS-ID:      $Id: gdiplus.cpp 67973 2011-06-17 21:53:32Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/glcanvas.cpp b/Externals/wxWidgets3/src/msw/glcanvas.cpp
index e5386ee841..7beb05c47c 100644
--- a/Externals/wxWidgets3/src/msw/glcanvas.cpp
+++ b/Externals/wxWidgets3/src/msw/glcanvas.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: glcanvas.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/graphics.cpp b/Externals/wxWidgets3/src/msw/graphics.cpp
index 589be6d529..b8bc80a2e8 100644
--- a/Externals/wxWidgets3/src/msw/graphics.cpp
+++ b/Externals/wxWidgets3/src/msw/graphics.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-09-30
-// RCS-ID:      $Id: graphics.cpp 69911 2011-12-02 12:04:46Z VZ $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -78,6 +77,31 @@ inline Color wxColourToColor(const wxColour& col)
     return Color(col.Alpha(), col.Red(), col.Green(), col.Blue());
 }
 
+// Do not use this pointer directly, it's only used by
+// GetDrawTextStringFormat() and the cleanup code in wxGDIPlusRendererModule.
+StringFormat* gs_drawTextStringFormat = NULL;
+
+// Get the string format used for the text drawing and measuring functions:
+// notice that it must be the same one for all of them, otherwise the drawn
+// text might be of different size than what measuring it returned.
+inline StringFormat* GetDrawTextStringFormat()
+{
+    if ( !gs_drawTextStringFormat )
+    {
+        gs_drawTextStringFormat = new StringFormat(StringFormat::GenericTypographic());
+
+        // This doesn't make any difference for DrawText() actually but we want
+        // this behaviour when measuring text.
+        gs_drawTextStringFormat->SetFormatFlags
+        (
+            gs_drawTextStringFormat->GetFormatFlags()
+                | StringFormatFlagsMeasureTrailingSpaces
+        );
+    }
+
+    return gs_drawTextStringFormat;
+}
+
 } // anonymous namespace
 
 //-----------------------------------------------------------------------------
@@ -272,7 +296,7 @@ private:
     GraphicsPath* m_brushPath;
 };
 
-class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsBitmapData
 {
 public:
     wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap );
@@ -280,6 +304,7 @@ public:
     ~wxGDIPlusBitmapData ();
 
     virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
+    virtual void* GetNativeBitmap() const { return m_bitmap; }
 
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
@@ -347,6 +372,13 @@ public:
     // stroke lines connecting each of the points
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
 
+    // We don't have any specific implementation for this one in wxMSW but
+    // override it just to avoid warnings about hiding the base class virtual.
+    virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
+    {
+        wxGraphicsContext::StrokeLines(n, beginPoints, endPoints);
+    }
+
     // draws a polygon
     virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
 
@@ -396,10 +428,7 @@ protected:
     void Init(Graphics* graphics, int width, int height);
 
 private:
-    virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y)
-        { DoDrawFilledText(str, x, y, wxNullGraphicsBrush); }
-    virtual void DoDrawFilledText(const wxString& str, wxDouble x, wxDouble y,
-                                  const wxGraphicsBrush& backgroundBrush);
+    virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y);
 
     Graphics* m_context;
     wxStack<GraphicsState> m_stateStack;
@@ -946,13 +975,13 @@ wxGDIPlusFontData::~wxGDIPlusFontData()
 //-----------------------------------------------------------------------------
 
 wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) :
-    wxGraphicsObjectRefData( renderer ), m_bitmap( bitmap )
+    wxGraphicsBitmapData( renderer ), m_bitmap( bitmap )
 {
     m_helper = NULL;
 }
 
 wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer,
-                        const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer )
+                        const wxBitmap &bmp) : wxGraphicsBitmapData( renderer )
 {
     m_bitmap = NULL;
     m_helper = NULL;
@@ -1390,6 +1419,7 @@ void wxGDIPlusContext::Init(Graphics* graphics, int width, int height)
     m_context->SetTextRenderingHint(TextRenderingHintSystemDefault);
     m_context->SetPixelOffsetMode(PixelOffsetModeHalf);
     m_context->SetSmoothingMode(SmoothingModeHighQuality);
+    m_context->SetInterpolationMode(InterpolationModeHighQuality);
     m_state1 = m_context->Save();
     m_state2 = m_context->Save();
 }
@@ -1535,10 +1565,44 @@ bool wxGDIPlusContext::SetAntialiasMode(wxAntialiasMode antialias)
     return true;
 }
 
-bool wxGDIPlusContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation))
+bool wxGDIPlusContext::SetInterpolationQuality(wxInterpolationQuality interpolation)
 {
-    // placeholder
-    return false;
+    if (m_interpolation == interpolation)
+        return true;
+
+    InterpolationMode interpolationMode = InterpolationModeDefault;
+    switch (interpolation)
+    {
+        case wxINTERPOLATION_DEFAULT:
+            interpolationMode = InterpolationModeDefault;
+            break;
+
+        case wxINTERPOLATION_NONE:
+            interpolationMode = InterpolationModeNearestNeighbor;
+            break;
+
+        case wxINTERPOLATION_FAST:
+            interpolationMode = InterpolationModeLowQuality;
+            break;
+
+        case wxINTERPOLATION_GOOD:
+            interpolationMode = InterpolationModeHighQuality;
+            break;
+
+        case wxINTERPOLATION_BEST:
+            interpolationMode = InterpolationModeHighQualityBicubic;
+            break;
+
+        default:
+            return false;
+    }
+
+    if ( m_context->SetInterpolationMode(interpolationMode) != Gdiplus::Ok )
+        return false;
+
+    m_interpolation = interpolation;
+
+    return true;
 }
 
 bool wxGDIPlusContext::SetCompositionMode(wxCompositionMode op)
@@ -1698,9 +1762,8 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
     DeleteObject(iconInfo.hbmMask);
 }
 
-void wxGDIPlusContext::DoDrawFilledText(const wxString& str,
-                                        wxDouble x, wxDouble y,
-                                        const wxGraphicsBrush& brush)
+void wxGDIPlusContext::DoDrawText(const wxString& str,
+                                        wxDouble x, wxDouble y )
 {
    if (m_composition == wxCOMPOSITION_DEST)
         return;
@@ -1713,18 +1776,15 @@ void wxGDIPlusContext::DoDrawFilledText(const wxString& str,
 
     wxGDIPlusFontData * const
         fontData = (wxGDIPlusFontData *)m_font.GetRefData();
-    wxGDIPlusBrushData * const
-        brushData = (wxGDIPlusBrushData *)brush.GetRefData();
-
+ 
     m_context->DrawString
                (
                     str.wc_str(*wxConvUI),  // string to draw, always Unicode
                     -1,                     // length: string is NUL-terminated
                     fontData->GetGDIPlusFont(),
                     PointF(x, y),
-                    StringFormat::GenericTypographic(),
-                    brushData ? brushData->GetGDIPlusBrush()
-                              : fontData->GetGDIPlusBrush()
+                    GetDrawTextStringFormat(),
+                    fontData->GetGDIPlusBrush()
                );
 }
 
@@ -1741,12 +1801,14 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
 
     REAL factorY = m_fontScaleRatio;
 
-    REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *
-        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
-    REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *
-        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
-    REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *
-        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+    // Notice that we must use the real font style or the results would be
+    // incorrect for italic/bold fonts.
+    const INT style = f->GetStyle();
+    const REAL size = f->GetSize();
+    const REAL emHeight = ffamily.GetEmHeight(style);
+    REAL rDescent = ffamily.GetCellDescent(style) * size / emHeight;
+    REAL rAscent = ffamily.GetCellAscent(style) * size / emHeight;
+    REAL rHeight = ffamily.GetLineSpacing(style) * size / emHeight;
 
     if ( height )
         *height = rHeight * factorY;
@@ -1763,11 +1825,9 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
     else
     {
         RectF layoutRect(0,0, 100000.0f, 100000.0f);
-        StringFormat strFormat( StringFormat::GenericTypographic() );
-        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
 
         RectF bounds ;
-        m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ;
+        m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, GetDrawTextStringFormat(), &bounds ) ;
         if ( width )
             *width = bounds.Width;
         if ( height )
@@ -1791,7 +1851,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
 
     RectF layoutRect(0,0, 100000.0f, 100000.0f);
-    StringFormat strFormat( StringFormat::GenericTypographic() );
+    StringFormat strFormat( GetDrawTextStringFormat() );
 
     size_t startPosition = 0;
     size_t remainder = len;
@@ -1809,7 +1869,6 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
             ranges[i].Length = startPosition+i+1 ;
         }
         strFormat.SetMeasurableCharacterRanges(span,ranges);
-        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
         m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,span,regions) ;
 
         RectF bbox ;
@@ -2223,8 +2282,19 @@ wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bit
 class wxGDIPlusRendererModule : public wxModule
 {
 public:
+    wxGDIPlusRendererModule()
+    {
+        // We must be uninitialized before GDI+ DLL itself is unloaded.
+        AddDependency("wxGdiPlusModule");
+    }
+
     virtual bool OnInit() { return true; }
-    virtual void OnExit() { gs_GDIPlusRenderer.Unload(); }
+    virtual void OnExit()
+    {
+        wxDELETE(gs_drawTextStringFormat);
+
+        gs_GDIPlusRenderer.Unload();
+    }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule)
diff --git a/Externals/wxWidgets3/src/msw/headerctrl.cpp b/Externals/wxWidgets3/src/msw/headerctrl.cpp
index 4233a31b90..1fdebf74d8 100644
--- a/Externals/wxWidgets3/src/msw/headerctrl.cpp
+++ b/Externals/wxWidgets3/src/msw/headerctrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxHeaderCtrl for wxMSW
 // Author:      Vadim Zeitlin
 // Created:     2008-12-01
-// RCS-ID:      $Id: headerctrl.cpp 67384 2011-04-03 20:31:32Z DS $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,6 +63,7 @@ void wxHeaderCtrl::Init()
     m_numColumns = 0;
     m_imageList = NULL;
     m_scrollOffset = 0;
+    m_colBeingDragged = -1;
 }
 
 bool wxHeaderCtrl::Create(wxWindow *parent,
@@ -268,7 +268,7 @@ void wxHeaderCtrl::DoInsertItem(const wxHeaderColumn& col, unsigned int idx)
     // notice that we need to store the string we use the pointer to until we
     // pass it to the control
     hdi.mask |= HDI_TEXT;
-    wxWxCharBuffer buf = col.GetTitle().wx_str();
+    wxWxCharBuffer buf = col.GetTitle().t_str();
     hdi.pszText = buf.data();
     hdi.cchTextMax = wxStrlen(buf);
 
@@ -474,18 +474,18 @@ wxEventType wxHeaderCtrl::GetClickEventType(bool dblclk, int button)
     switch ( button )
     {
         case 0:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_DCLICK
-                             : wxEVT_COMMAND_HEADER_CLICK;
+            evtType = dblclk ? wxEVT_HEADER_DCLICK
+                             : wxEVT_HEADER_CLICK;
             break;
 
         case 1:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_RIGHT_DCLICK
-                             : wxEVT_COMMAND_HEADER_RIGHT_CLICK;
+            evtType = dblclk ? wxEVT_HEADER_RIGHT_DCLICK
+                             : wxEVT_HEADER_RIGHT_CLICK;
             break;
 
         case 2:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_MIDDLE_DCLICK
-                             : wxEVT_COMMAND_HEADER_MIDDLE_CLICK;
+            evtType = dblclk ? wxEVT_HEADER_MIDDLE_DCLICK
+                             : wxEVT_HEADER_MIDDLE_CLICK;
             break;
 
         default:
@@ -525,6 +525,9 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case HDN_ITEMCLICK:
         case HDN_ITEMDBLCLICK:
             evtType = GetClickEventType(code == HDN_ITEMDBLCLICK, nmhdr->iButton);
+
+            // We're not dragging any more.
+            m_colBeingDragged = -1;
             break;
 
             // although we should get the notifications about the right clicks
@@ -550,7 +553,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             break;
 
         case HDN_DIVIDERDBLCLICK:
-            evtType = wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
+            evtType = wxEVT_HEADER_SEPARATOR_DCLICK;
             break;
 
 
@@ -569,7 +572,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 break;
             }
 
-            evtType = wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
+            evtType = wxEVT_HEADER_BEGIN_RESIZE;
             // fall through
 
         case HDN_ENDTRACKA:
@@ -578,7 +581,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
             if ( evtType == wxEVT_NULL )
             {
-                evtType = wxEVT_COMMAND_HEADER_END_RESIZE;
+                evtType = wxEVT_HEADER_END_RESIZE;
 
                 // don't generate events with invalid width
                 const int minWidth = GetColumn(idx).GetMinWidth();
@@ -587,6 +590,11 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
             break;
 
+            // The control is not supposed to send HDN_TRACK when using
+            // HDS_FULLDRAG (which we do use) but apparently some versions of
+            // comctl32.dll still do it, see #13506, so catch both messages
+            // just in case we are dealing with one of these buggy versions.
+        case HDN_TRACK:
         case HDN_ITEMCHANGING:
             if ( nmhdr->pitem && (nmhdr->pitem->mask & HDI_WIDTH) )
             {
@@ -603,7 +611,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     // generate the resizing event from here as we don't seem
                     // to be getting HDN_TRACK events at all, at least with
                     // comctl32.dll v6
-                    evtType = wxEVT_COMMAND_HEADER_RESIZING;
+                    evtType = wxEVT_HEADER_RESIZING;
                 }
             }
             break;
@@ -617,14 +625,24 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             if ( nmhdr->iItem == -1 )
                 break;
 
+            // If we are dragging a column that is not draggable and the mouse
+            // is moved over a different column then we get the column number from
+            // the column under the mouse. This results in an unexpected behaviour
+            // if this column is draggable. To prevent this remember the column we
+            // are dragging for the complete drag and drop cycle.
+            if ( m_colBeingDragged == -1 )
+            {
+                m_colBeingDragged = idx;
+            }
+
             // column must have the appropriate flag to be draggable
-            if ( !GetColumn(idx).IsReorderable() )
+            if ( !GetColumn(m_colBeingDragged).IsReorderable() )
             {
                 veto = true;
                 break;
             }
 
-            evtType = wxEVT_COMMAND_HEADER_BEGIN_REORDER;
+            evtType = wxEVT_HEADER_BEGIN_REORDER;
             break;
 
         case HDN_ENDDRAG:
@@ -638,11 +656,17 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
             order = MSWFromNativeOrder(order);
 
-            evtType = wxEVT_COMMAND_HEADER_END_REORDER;
+            evtType = wxEVT_HEADER_END_REORDER;
+
+            // We (successfully) ended dragging the column.
+            m_colBeingDragged = -1;
             break;
 
         case NM_RELEASEDCAPTURE:
-            evtType = wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED;
+            evtType = wxEVT_HEADER_DRAGGING_CANCELLED;
+
+            // Dragging the column was cancelled.
+            m_colBeingDragged = -1;
             break;
     }
 
@@ -667,7 +691,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             // special post-processing for HDN_ENDDRAG: we need to update the
             // internal column indices array if this is allowed to go ahead as
             // the native control is going to reorder its columns now
-            if ( evtType == wxEVT_COMMAND_HEADER_END_REORDER )
+            if ( evtType == wxEVT_HEADER_END_REORDER )
                 MoveColumnInOrderArray(m_colIndices, idx, order);
 
             if ( processed )
diff --git a/Externals/wxWidgets3/src/msw/helpbest.cpp b/Externals/wxWidgets3/src/msw/helpbest.cpp
index 127b3935a7..f9f811c6b9 100644
--- a/Externals/wxWidgets3/src/msw/helpbest.cpp
+++ b/Externals/wxWidgets3/src/msw/helpbest.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     02/04/2001
-// RCS-ID:      $Id: helpbest.cpp 57870 2009-01-07 01:04:01Z FM $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/helpchm.cpp b/Externals/wxWidgets3/src/msw/helpchm.cpp
index 070a99f146..8fa798a2a5 100644
--- a/Externals/wxWidgets3/src/msw/helpchm.cpp
+++ b/Externals/wxWidgets3/src/msw/helpchm.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin at 2008-03-01: refactoring, simplification
 // Created:     16/04/2000
-// RCS-ID:      $Id: helpchm.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,7 +126,7 @@ bool wxCHMHelpController::DisplaySection(const wxString& section)
     if ( section.Find(wxT(".htm")) != wxNOT_FOUND )
     {
         // interpret as a file name
-        return CallHtmlHelp(HH_DISPLAY_TOPIC, section.wx_str());
+        return CallHtmlHelp(HH_DISPLAY_TOPIC, wxMSW_CONV_LPCTSTR(section));
     }
 
     return KeywordSearch(section);
@@ -184,7 +183,7 @@ bool wxCHMHelpController::ShowContextHelpPopup(const wxString& text,
                                                const wxPoint& pos,
                                                wxWindow *window)
 {
-    return DoDisplayTextPopup(text.wx_str(), pos, 0, window);
+    return DoDisplayTextPopup(text.t_str(), pos, 0, window);
 }
 
 bool wxCHMHelpController::DisplayBlock(long block)
@@ -201,7 +200,7 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
     HH_AKLINK link;
     link.cbStruct =     sizeof(HH_AKLINK);
     link.fReserved =    FALSE;
-    link.pszKeywords =  k.wx_str();
+    link.pszKeywords =  k.t_str();
     link.pszUrl =       NULL;
     link.pszMsgText =   NULL;
     link.pszMsgTitle =  NULL;
diff --git a/Externals/wxWidgets3/src/msw/helpwin.cpp b/Externals/wxWidgets3/src/msw/helpwin.cpp
index c07708ff6d..766749edf4 100644
--- a/Externals/wxWidgets3/src/msw/helpwin.cpp
+++ b/Externals/wxWidgets3/src/msw/helpwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: helpwin.cpp 57876 2009-01-07 08:51:47Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +62,7 @@ bool wxWinHelpController::DisplayContents(void)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.wx_str(), HELP_FINDER, 0L) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_FINDER, 0L) != 0);
 }
 
 bool wxWinHelpController::DisplaySection(int section)
@@ -73,7 +72,7 @@ bool wxWinHelpController::DisplaySection(int section)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.wx_str(), HELP_CONTEXT, (DWORD)section) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXT, (DWORD)section) != 0);
 }
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
@@ -82,7 +81,7 @@ bool wxWinHelpController::DisplayContextPopup(int contextId)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.wx_str(), HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
 }
 
 bool wxWinHelpController::DisplayBlock(long block)
@@ -98,8 +97,8 @@ bool wxWinHelpController::KeywordSearch(const wxString& k,
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return WinHelp(GetSuitableHWND(this), str.wx_str(), HELP_PARTIALKEY,
-                   (ULONG_PTR)k.wx_str()) != 0;
+    return WinHelp(GetSuitableHWND(this), str.t_str(), HELP_PARTIALKEY,
+                   (ULONG_PTR)wxMSW_CONV_LPCTSTR(k)) != 0;
 }
 
 // Can't close the help window explicitly in WinHelp
diff --git a/Externals/wxWidgets3/src/msw/hyperlink.cpp b/Externals/wxWidgets3/src/msw/hyperlink.cpp
index 12f1e0978a..f39d94ae17 100644
--- a/Externals/wxWidgets3/src/msw/hyperlink.cpp
+++ b/Externals/wxWidgets3/src/msw/hyperlink.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Hyperlink control
 // Author:      Rickard Westerlund
 // Created:     2010-08-03
-// RCS-ID:      $Id: hyperlink.cpp 67053 2011-02-27 12:47:11Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/icon.cpp b/Externals/wxWidgets3/src/msw/icon.cpp
index b7678293c8..77e72efad4 100644
--- a/Externals/wxWidgets3/src/msw/icon.cpp
+++ b/Externals/wxWidgets3/src/msw/icon.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
-// RCS-ID:      $Id: icon.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -156,3 +155,14 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
+
+bool wxIcon::CreateFromHICON(WXHICON icon)
+{
+    SetHICON(icon);
+    if ( !IsOk() )
+        return false;
+
+    SetSize(wxGetHiconSize(icon));
+
+    return true;
+}
diff --git a/Externals/wxWidgets3/src/msw/imaglist.cpp b/Externals/wxWidgets3/src/msw/imaglist.cpp
index 67533f87af..928a9f6b74 100644
--- a/Externals/wxWidgets3/src/msw/imaglist.cpp
+++ b/Externals/wxWidgets3/src/msw/imaglist.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: imaglist.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/iniconf.cpp b/Externals/wxWidgets3/src/msw/iniconf.cpp
index e058c047a2..27d11305ec 100644
--- a/Externals/wxWidgets3/src/msw/iniconf.cpp
+++ b/Externals/wxWidgets3/src/msw/iniconf.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.07.98
-// RCS-ID:      $Id: iniconf.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -257,13 +256,13 @@ bool wxIniConfig::IsEmpty() const
 {
     wxChar szBuf[1024];
 
-    GetPrivateProfileString(m_strGroup.wx_str(), NULL, wxT(""),
+    GetPrivateProfileString(m_strGroup.t_str(), NULL, wxT(""),
                             szBuf, WXSIZEOF(szBuf),
-                            m_strLocalFilename.wx_str());
+                            m_strLocalFilename.t_str());
     if ( !wxIsEmpty(szBuf) )
         return false;
 
-    GetProfileString(m_strGroup.wx_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));
+    GetProfileString(m_strGroup.t_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));
     if ( !wxIsEmpty(szBuf) )
         return false;
 
@@ -284,13 +283,13 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
-  GetPrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(), wxT(""),
+  GetPrivateProfileString(m_strGroup.t_str(), strKey.t_str(), wxT(""),
                           szBuf, WXSIZEOF(szBuf),
-                          m_strLocalFilename.wx_str());
+                          m_strLocalFilename.t_str());
   if ( wxIsEmpty(szBuf) ) {
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
-    GetProfileString(m_strGroup.wx_str(), strKey.wx_str(),
+    GetProfileString(m_strGroup.t_str(), strKey.t_str(),
                      wxT(""), szBuf, WXSIZEOF(szBuf));
   }
 
@@ -311,8 +310,8 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
 
   static const int nMagic  = 17; // 17 is some "rare" number
   static const int nMagic2 = 28; // arbitrary number != nMagic
-  long lVal = GetPrivateProfileInt(m_strGroup.wx_str(), strKey.wx_str(),
-                                   nMagic, m_strLocalFilename.wx_str());
+  long lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
+                                   nMagic, m_strLocalFilename.t_str());
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;
@@ -320,8 +319,8 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   }
 
   // is it really nMagic?
-  lVal = GetPrivateProfileInt(m_strGroup.wx_str(), strKey.wx_str(),
-                              nMagic2, m_strLocalFilename.wx_str());
+  lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
+                              nMagic2, m_strLocalFilename.t_str());
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
@@ -345,9 +344,9 @@ bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  bool bOk = WritePrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(),
-                                       szValue.wx_str(),
-                                       m_strLocalFilename.wx_str()) != 0;
+  bool bOk = WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
+                                       szValue.t_str(),
+                                       m_strLocalFilename.t_str()) != 0;
 
   if ( !bOk )
   {
@@ -382,7 +381,7 @@ bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 {
   // this is just the way it works
   return WritePrivateProfileString(NULL, NULL, NULL,
-                                   m_strLocalFilename.wx_str()) != 0;
+                                   m_strLocalFilename.t_str()) != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -395,16 +394,16 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  if (WritePrivateProfileString(m_strGroup.wx_str(), strKey.wx_str(),
-                                NULL, m_strLocalFilename.wx_str()) == 0)
+  if (WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
+                                NULL, m_strLocalFilename.t_str()) == 0)
     return false;
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
     return true;
 
   // delete the current group too
-  bool bOk = WritePrivateProfileString(m_strGroup.wx_str(), NULL,
-                                       NULL, m_strLocalFilename.wx_str()) != 0;
+  bool bOk = WritePrivateProfileString(m_strGroup.t_str(), NULL,
+                                       NULL, m_strLocalFilename.t_str()) != 0;
 
   if ( !bOk )
   {
@@ -420,8 +419,8 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 
   // passing NULL as section name to WritePrivateProfileString deletes the
   // whole section according to the docs
-  bool bOk = WritePrivateProfileString(path.Name().wx_str(), NULL,
-                                       NULL, m_strLocalFilename.wx_str()) != 0;
+  bool bOk = WritePrivateProfileString(path.Name().t_str(), NULL,
+                                       NULL, m_strLocalFilename.t_str()) != 0;
 
   if ( !bOk )
   {
@@ -438,7 +437,7 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 bool wxIniConfig::DeleteAll()
 {
   // first delete our group in win.ini
-  WriteProfileString(GetVendorName().wx_str(), NULL, NULL);
+  WriteProfileString(GetVendorName().t_str(), NULL, NULL);
 
   // then delete our own ini file
   wxChar szBuf[MAX_PATH];
diff --git a/Externals/wxWidgets3/src/msw/joystick.cpp b/Externals/wxWidgets3/src/msw/joystick.cpp
index adbfad9f88..0ea52f7192 100644
--- a/Externals/wxWidgets3/src/msw/joystick.cpp
+++ b/Externals/wxWidgets3/src/msw/joystick.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: joystick.cpp 70808 2012-03-04 20:31:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/listbox.cpp b/Externals/wxWidgets3/src/msw/listbox.cpp
index 2d9db1cb89..4a452a16bf 100644
--- a/Externals/wxWidgets3/src/msw/listbox.cpp
+++ b/Externals/wxWidgets3/src/msw/listbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)
 // Created:
-// RCS-ID:      $Id: listbox.cpp 70415 2012-01-20 22:11:44Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -84,7 +83,6 @@ void wxListBox::Init()
 {
     m_noItems = 0;
     m_updateHorizontalExtent = false;
-    m_selectedByKeyboard = false;
 }
 
 bool wxListBox::Create(wxWindow *parent,
@@ -251,7 +249,7 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
     if (bCase)
        return wxItemContainerImmutable::FindString( s, bCase );
 
-    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());
+    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.t_str());
     if (pos == LB_ERR)
         return wxNOT_FOUND;
     else
@@ -306,6 +304,10 @@ bool wxListBox::IsSelected(int N) const
 
 void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
+    // This is done here for the same reasons as in wxChoice method with the
+    // same name.
+    SetLastError(ERROR_SUCCESS);
+
     LPARAM rc = SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
     if ( rc == LB_ERR && GetLastError() != ERROR_SUCCESS )
     {
@@ -473,7 +475,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
     if ( n == (m_noItems - 1) )
         newN = -1;
 
-    ListBox_InsertString(GetHwnd(), newN, s.wx_str());
+    ListBox_InsertString(GetHwnd(), newN, s.t_str());
 
     // restore the client data
     if ( oldData )
@@ -582,29 +584,24 @@ wxSize wxListBox::DoGetBestClientSize() const
 bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     wxEventType evtType;
-    int n = wxNOT_FOUND;
     if ( param == LBN_SELCHANGE )
     {
         if ( HasMultipleSelection() )
             return CalcAndSendEvent();
 
-        evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
-
-        if ( m_selectedByKeyboard )
-        {
-            // We shouldn't use the mouse position to find the item as mouse
-            // can be anywhere, ask the listbox itself. Notice that this can't
-            // be used when the item is selected using the mouse however as
-            // LB_GETCARETINDEX will always return a valid item, even if the
-            // mouse is clicked below all the items, which is why we find the
-            // item ourselves below in this case.
-            n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
-        }
-        //else: n will be determined below from the mouse position
+        evtType = wxEVT_LISTBOX;
     }
     else if ( param == LBN_DBLCLK )
     {
-        evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+        // Clicking under the last item in the listbox generates double click
+        // event for the currently selected item which is rather surprising.
+        // Avoid the surprise by checking that we do have an item under mouse.
+        const DWORD pos = ::GetMessagePos();
+        const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+        if ( HitTest(ScreenToClient(pt)) == wxNOT_FOUND )
+            return false;
+
+        evtType = wxEVT_LISTBOX_DCLICK;
     }
     else
     {
@@ -612,14 +609,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         return false;
     }
 
-    // Find the item position if it was a mouse-generated selection event or a
-    // double click event (which is always generated using the mouse)
-    if ( n == wxNOT_FOUND )
-    {
-        const DWORD pos = ::GetMessagePos();
-        const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
-        n = HitTest(ScreenToClient(wxPoint(pt)));
-    }
+    const int n = ListBox_GetCurSel(GetHwnd());
 
     // We get events even when mouse is clicked outside of any valid item from
     // Windows, just ignore them.
@@ -636,20 +626,6 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     return SendEvent(evtType, n, true /* selection */);
 }
 
-WXLRESULT
-wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    // Remember whether there was a keyboard or mouse event before
-    // LBN_SELCHANGE: this allows us to correctly determine the item affected
-    // by it in MSWCommand() above in any case.
-    if ( WM_KEYFIRST <= nMsg && nMsg <= WM_KEYLAST )
-        m_selectedByKeyboard = true;
-    else if ( WM_MOUSEFIRST <= nMsg && nMsg <= WM_MOUSELAST )
-        m_selectedByKeyboard = false;
-
-    return wxListBoxBase::MSWWindowProc(nMsg, wParam, lParam);
-}
-
 // ----------------------------------------------------------------------------
 // owner-drawn list boxes support
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/listctrl.cpp b/Externals/wxWidgets3/src/msw/listctrl.cpp
index 1e67523994..0772db7a25 100644
--- a/Externals/wxWidgets3/src/msw/listctrl.cpp
+++ b/Externals/wxWidgets3/src/msw/listctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Created:     04/01/98
-// RCS-ID:      $Id: listctrl.cpp 70284 2012-01-07 15:09:51Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -700,7 +699,7 @@ wxTextCtrl* wxListCtrl::GetEditControl() const
     // first check corresponds to the case when the label editing was started
     // by user and hence m_textCtrl wasn't created by EditLabel() at all, while
     // the second case corresponds to us being called from inside EditLabel()
-    // (e.g. from a user wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT handler): in this
+    // (e.g. from a user wxEVT_LIST_BEGIN_LABEL_EDIT handler): in this
     // case EditLabel() did create the control but it didn't have an HWND to
     // initialize it with yet
     if ( !m_textCtrl || !m_textCtrl->GetHWND() )
@@ -952,7 +951,7 @@ bool wxListCtrl::SetItemColumnImage(long item, long column, int image)
     wxListItem info;
 
     info.m_mask = wxLIST_MASK_IMAGE;
-    info.m_image = image;
+    info.m_image = image == -1 ? I_IMAGENONE : image;
     info.m_itemId = item;
     info.m_col = column;
 
@@ -1333,6 +1332,32 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
         m_ownsImageListState = true;
 }
 
+// ----------------------------------------------------------------------------
+// Geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxListCtrl::MSWGetBestViewRect(int x, int y) const
+{
+    // The cast is necessary to suppress a MinGW warning due to a missing cast
+    // to WPARAM in the definition of ListView_ApproximateViewRect() in its
+    // own headers (this was the case up to at least MinGW 4.8).
+    const DWORD rc = ListView_ApproximateViewRect(GetHwnd(), x, y, (WPARAM)-1);
+
+    wxSize size(LOWORD(rc), HIWORD(rc));
+
+    // We have to add space for the scrollbars ourselves, they're not taken
+    // into account by ListView_ApproximateViewRect(), at least not with
+    // commctrl32.dll v6.
+    const DWORD mswStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+    if ( mswStyle & WS_HSCROLL )
+        size.y += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    if ( mswStyle & WS_VSCROLL )
+        size.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+    return size;
+}
+
 // ----------------------------------------------------------------------------
 // Operations
 // ----------------------------------------------------------------------------
@@ -1452,14 +1477,14 @@ void wxListCtrl::InitEditControl(WXHWND hWnd)
 
 wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
-    wxCHECK_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)), NULL,
+    wxCHECK_MSG( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)), NULL,
                   "control used for label editing must be a wxTextCtrl" );
 
     // ListView_EditLabel requires that the list has focus.
     SetFocus();
 
     // create m_textCtrl here before calling ListView_EditLabel() because it
-    // generates wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT event from inside it and
+    // generates wxEVT_LIST_BEGIN_LABEL_EDIT event from inside it and
     // the user handler for it can call GetEditControl() resulting in an on
     // demand creation of a stock wxTextCtrl instead of the control of a
     // (possibly) custom wxClassInfo
@@ -1519,7 +1544,7 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
     findInfo.flags = LVFI_STRING;
     if ( partial )
         findInfo.flags |= LVFI_PARTIAL;
-    findInfo.psz = str.wx_str();
+    findInfo.psz = str.t_str();
 
     // ListView_FindItem() excludes the first item from search and to look
     // through all the items you need to start from -1 which is unnatural and
@@ -1656,6 +1681,12 @@ long wxListCtrl::InsertItem(const wxListItem& info)
 {
     wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual controls") );
 
+    // In 2.8 it was possible to succeed inserting an item without initializing
+    // its ID as it defaulted to 0. This was however never supported and in 2.9
+    // the ID is -1 by default and inserting it simply fails, but it might be
+    // not obvious why does it happen, so check it proactively.
+    wxASSERT_MSG( info.m_itemId != -1, wxS("Item ID must be set.") );
+
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
     item.mask &= ~LVIF_PARAM;
@@ -1720,11 +1751,9 @@ long wxListCtrl::InsertItem(long index, int imageIndex)
 long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
 {
     wxListItem info;
-    info.m_image = imageIndex;
+    info.m_image = imageIndex == -1 ? I_IMAGENONE : imageIndex;
     info.m_text = label;
-    info.m_mask = wxLIST_MASK_TEXT;
-    if (imageIndex > -1)
-        info.m_mask |= wxLIST_MASK_IMAGE;
+    info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
     info.m_itemId = index;
     return InsertItem(info);
 }
@@ -1853,7 +1882,7 @@ bool wxListCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
         // conjunction with modifiers
         if ( msg->wParam == VK_RETURN && !wxIsAnyModifierDown() )
         {
-            // we need VK_RETURN to generate wxEVT_COMMAND_LIST_ITEM_ACTIVATED
+            // we need VK_RETURN to generate wxEVT_LIST_ITEM_ACTIVATED
             return false;
         }
     }
@@ -1865,7 +1894,7 @@ bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
     const int id = (signed short)id_;
     if (cmd == EN_UPDATE)
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        wxCommandEvent event(wxEVT_TEXT, id);
         event.SetEventObject( this );
         ProcessCommand(event);
         return true;
@@ -1974,7 +2003,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             // need to use HDN_ITEMCHANGING instead of it
             case HDN_BEGINTRACKA:
             case HDN_BEGINTRACKW:
-                eventType = wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
+                eventType = wxEVT_LIST_COL_BEGIN_DRAG;
                 // fall through
 
             case HDN_ITEMCHANGING:
@@ -1999,14 +2028,14 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         break;
                     }
 
-                    eventType = wxEVT_COMMAND_LIST_COL_DRAGGING;
+                    eventType = wxEVT_LIST_COL_DRAGGING;
                 }
                 // fall through
 
             case HDN_ENDTRACKA:
             case HDN_ENDTRACKW:
                 if ( eventType == wxEVT_NULL )
-                    eventType = wxEVT_COMMAND_LIST_COL_END_DRAG;
+                    eventType = wxEVT_LIST_COL_END_DRAG;
 
                 event.m_item.m_width = nmHDR->pitem->cxy;
                 event.m_col = nmHDR->iItem;
@@ -2019,7 +2048,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 {
                     POINT ptClick;
 
-                    eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
+                    eventType = wxEVT_LIST_COL_RIGHT_CLICK;
                     event.m_col = wxMSWGetColumnClicked(nmhdr, &ptClick);
                     event.m_pointDrag.x = ptClick.x;
                     event.m_pointDrag.y = ptClick.y;
@@ -2069,13 +2098,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         switch ( nmhdr->code )
         {
             case LVN_BEGINRDRAG:
-                eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+                eventType = wxEVT_LIST_BEGIN_RDRAG;
                 // fall through
 
             case LVN_BEGINDRAG:
                 if ( eventType == wxEVT_NULL )
                 {
-                    eventType = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+                    eventType = wxEVT_LIST_BEGIN_DRAG;
                 }
 
                 event.m_itemIndex = iItem;
@@ -2099,7 +2128,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         item.Init(((LV_DISPINFOW *)lParam)->item);
                     }
 
-                    eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
+                    eventType = wxEVT_LIST_BEGIN_LABEL_EDIT;
                     wxConvertFromMSWListItem(GetHwnd(), event.m_item, item);
                     event.m_itemIndex = event.m_item.m_itemId;
                 }
@@ -2129,20 +2158,20 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         event.SetEditCanceled(true);
                     }
 
-                    eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
+                    eventType = wxEVT_LIST_END_LABEL_EDIT;
                     wxConvertFromMSWListItem(NULL, event.m_item, item);
                     event.m_itemIndex = event.m_item.m_itemId;
                 }
                 break;
 
             case LVN_COLUMNCLICK:
-                eventType = wxEVT_COMMAND_LIST_COL_CLICK;
+                eventType = wxEVT_LIST_COL_CLICK;
                 event.m_itemIndex = -1;
                 event.m_col = nmLV->iSubItem;
                 break;
 
             case LVN_DELETEALLITEMS:
-                eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+                eventType = wxEVT_LIST_DELETE_ALL_ITEMS;
                 event.m_itemIndex = -1;
                 break;
 
@@ -2154,13 +2183,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     return false;
                 }
 
-                eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
+                eventType = wxEVT_LIST_DELETE_ITEM;
                 event.m_itemIndex = iItem;
 
                 break;
 
             case LVN_INSERTITEM:
-                eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
+                eventType = wxEVT_LIST_INSERT_ITEM;
                 event.m_itemIndex = iItem;
                 break;
 
@@ -2186,7 +2215,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     // has the focus changed?
                     if ( !(stOld & LVIS_FOCUSED) && (stNew & LVIS_FOCUSED) )
                     {
-                        eventType = wxEVT_COMMAND_LIST_ITEM_FOCUSED;
+                        eventType = wxEVT_LIST_ITEM_FOCUSED;
                         event.m_itemIndex = iItem;
                     }
 
@@ -2208,8 +2237,8 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         }
 
                         eventType = stNew & LVIS_SELECTED
-                                        ? wxEVT_COMMAND_LIST_ITEM_SELECTED
-                                        : wxEVT_COMMAND_LIST_ITEM_DESELECTED;
+                                        ? wxEVT_LIST_ITEM_SELECTED
+                                        : wxEVT_LIST_ITEM_DESELECTED;
                     }
                 }
 
@@ -2238,11 +2267,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                          (wVKey == VK_RETURN || wVKey == VK_SPACE) &&
                          !wxIsAnyModifierDown() )
                     {
-                        eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                        eventType = wxEVT_LIST_ITEM_ACTIVATED;
                     }
                     else
                     {
-                        eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
+                        eventType = wxEVT_LIST_KEY_DOWN;
 
                         event.m_code = wxMSWKeyboard::VKToWX(wVKey);
 
@@ -2275,7 +2304,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     return true;
                 }
 
-                // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event
+                // else translate it into wxEVT_LIST_ITEM_ACTIVATED event
                 // if it happened on an item (and not on empty place)
                 if ( iItem == -1 )
                 {
@@ -2283,7 +2312,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     return false;
                 }
 
-                eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                eventType = wxEVT_LIST_ITEM_ACTIVATED;
                 event.m_itemIndex = iItem;
                 event.m_item.m_text = GetItemText(iItem);
                 event.m_item.m_data = GetItemData(iItem);
@@ -2300,7 +2329,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     return true;
                 }
 
-                // else translate it into wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK event
+                // else translate it into wxEVT_LIST_ITEM_RIGHT_CLICK event
                 LV_HITTESTINFO lvhti;
                 wxZeroMemory(lvhti);
 
@@ -2320,7 +2349,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 {
                     if ( lvhti.flags & LVHT_ONITEM )
                     {
-                        eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
+                        eventType = wxEVT_LIST_ITEM_RIGHT_CLICK;
                         event.m_itemIndex = lvhti.iItem;
                         event.m_pointDrag.x = lvhti.pt.x;
                         event.m_pointDrag.y = lvhti.pt.y;
@@ -2339,7 +2368,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 {
                     const NM_CACHEHINT *cacheHint = (NM_CACHEHINT *)lParam;
 
-                    eventType = wxEVT_COMMAND_LIST_CACHE_HINT;
+                    eventType = wxEVT_LIST_CACHE_HINT;
 
                     // we get some really stupid cache hints like ones for
                     // items in range 0..0 for an empty control or, after
@@ -2632,10 +2661,21 @@ bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
     SelectInHDC selFont(hdc, hfont);
 
     // get the rectangle to paint
-    int subitem = colCount ? col + 1 : col;
     RECT rc;
-    wxGetListCtrlSubItemRect(hwndList, item, subitem, LVIR_BOUNDS, rc);
-    rc.left += 6;
+    wxGetListCtrlSubItemRect(hwndList, item, col, LVIR_BOUNDS, rc);
+    if ( !col && colCount > 1 )
+    {
+        // ListView_GetSubItemRect() returns the entire item rect for 0th
+        // subitem while we really need just the part for this column
+        RECT rc2;
+        wxGetListCtrlSubItemRect(hwndList, item, 1, LVIR_BOUNDS, rc2);
+        rc.right = rc2.left;
+        rc.left += 4;
+    }
+    else // not first subitem
+    {
+        rc.left += 6;
+    }
 
     // get the image and text to draw
     wxChar text[512];
@@ -3010,7 +3050,7 @@ wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             // because this message is propagated upwards the child-parent
             // chain, we get it for the right clicks on the header window but
             // this is confusing in wx as right clicking there already
-            // generates a separate wxEVT_COMMAND_LIST_COL_RIGHT_CLICK event
+            // generates a separate wxEVT_LIST_COL_RIGHT_CLICK event
             // so just ignore them
             if ( (HWND)wParam == ListView_GetHeader(GetHwnd()) )
                 return 0;
@@ -3049,15 +3089,6 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
     return -1;
 }
 
-wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
-    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  wxT("invalid item index in OnGetItemAttr()") );
-
-    // no attributes by default
-    return NULL;
-}
-
 wxListItemAttr *wxListCtrl::DoGetItemColumnAttr(long item, long column) const
 {
     if ( IsVirtual() )
@@ -3250,7 +3281,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
         else
         {
             // pszText is not const, hence the cast
-            lvItem.pszText = (wxChar *)info.m_text.wx_str();
+            lvItem.pszText = wxMSW_CONV_LPTSTR(info.m_text);
             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.length();
             else
@@ -3271,7 +3302,7 @@ static void wxConvertToMSWListCol(HWND hwndList,
     if ( item.m_mask & wxLIST_MASK_TEXT )
     {
         lvCol.mask |= LVCF_TEXT;
-        lvCol.pszText = (wxChar *)item.m_text.wx_str(); // cast is safe
+        lvCol.pszText = wxMSW_CONV_LPTSTR(item.m_text);
     }
 
     if ( item.m_mask & wxLIST_MASK_FORMAT )
diff --git a/Externals/wxWidgets3/src/msw/main.cpp b/Externals/wxWidgets3/src/msw/main.cpp
index 437ad3b5b9..65b4fc1750 100644
--- a/Externals/wxWidgets3/src/msw/main.cpp
+++ b/Externals/wxWidgets3/src/msw/main.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: main.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -202,7 +201,7 @@ int wxEntry(int& argc, wxChar **argv)
 
 #endif // wxUSE_BASE
 
-#if wxUSE_GUI && defined(__WXMSW__)
+#if wxUSE_GUI
 
 namespace
 {
@@ -316,7 +315,7 @@ struct wxMSWCommandLineArguments
         argv = new wxChar *[argc + 1];
         for ( int i = 0; i < argc; i++ )
         {
-            argv[i] = wxStrdup(args[i].wx_str());
+            argv[i] = wxStrdup(args[i].t_str());
         }
 
         // argv[] must be NULL-terminated
@@ -358,7 +357,9 @@ wxMSWEntryCommon(HINSTANCE hInstance, int nCmdShow)
 
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
+#ifdef __WXMSW__
     wxApp::m_nCmdShow = nCmdShow;
+#endif
 
     // parse the command line: we can't use pCmdLine in Unicode build so it is
     // simpler to never use it at all (this also results in a more correct
@@ -414,7 +415,7 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     return wxEntry(wxArgs.argc, wxArgs.argv);
 }
 
-#endif // wxUSE_GUI && __WXMSW__
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // global HINSTANCE
diff --git a/Externals/wxWidgets3/src/msw/mdi.cpp b/Externals/wxWidgets3/src/msw/mdi.cpp
index d4d82e65a9..5a1aae5373 100644
--- a/Externals/wxWidgets3/src/msw/mdi.cpp
+++ b/Externals/wxWidgets3/src/msw/mdi.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin on 2008-11-04 to use the base classes
 // Created:     04/01/98
-// RCS-ID:      $Id: mdi.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2008-2009 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -62,9 +61,17 @@ namespace
 // constants
 // ---------------------------------------------------------------------------
 
-// This range gives a maximum of 500 MDI children. Should be enough :-)
+// First ID for the MDI child menu item in the "Window" menu.
 const int wxFIRST_MDI_CHILD = 4100;
-const int wxLAST_MDI_CHILD = 4600;
+
+// There can be no more than 9 children in the "Window" menu as beginning with
+// the tenth one they're not shown and "More windows..." menu item is used
+// instead.
+const int wxLAST_MDI_CHILD = wxFIRST_MDI_CHILD + 8;
+
+// The ID of the "More windows..." menu item is the next one after the last
+// child.
+const int wxID_MDI_MORE_WINDOWS = wxLAST_MDI_CHILD + 1;
 
 // The MDI "Window" menu label
 const char *WINDOW_MENU_LABEL = gettext_noop("&Window");
@@ -190,7 +197,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   msflags &= ~WS_HSCROLL;
 
   if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(wxT("wxMDIFrame")),
-                            title.wx_str(),
+                            title.t_str(),
                             pos, size,
                             msflags,
                             exflags) )
@@ -317,13 +324,23 @@ void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child))
 void wxMDIParentFrame::AddWindowMenu()
 {
     if ( m_windowMenu )
+    {
+        // For correct handling of the events from this menu we also must
+        // attach it to the menu bar.
+        m_windowMenu->Attach(GetMenuBar());
+
         MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
+    }
 }
 
 void wxMDIParentFrame::RemoveWindowMenu()
 {
     if ( m_windowMenu )
+    {
         MDIRemoveWindowMenu(GetClientWindow(), m_hMenu);
+
+        m_windowMenu->Detach();
+    }
 }
 
 void wxMDIParentFrame::UpdateWindowMenu(bool enable)
@@ -357,15 +374,19 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
 {
     if ( menu != m_windowMenu )
     {
-        // notice that Remove/AddWindowMenu() are safe to call even when
-        // m_windowMenu is NULL
-        RemoveWindowMenu();
+        // We may not be showing the window menu currently if we don't have any
+        // children, and in this case we shouldn't remove/add it back right now.
+        const bool hasWindowMenu = GetActiveChild() != NULL;
+
+        if ( hasWindowMenu )
+            RemoveWindowMenu();
 
         delete m_windowMenu;
 
         m_windowMenu = menu;
 
-        AddWindowMenu();
+        if ( hasWindowMenu )
+            AddWindowMenu();
     }
 
 #if wxUSE_ACCEL
@@ -410,11 +431,14 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
 
 wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
 {
-    wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
-    if ( !item && GetActiveChild() )
-    {
-        item = GetActiveChild()->FindItemInMenuBar(menuId);
-    }
+    // We must look in the child menu first: if it has an item with the same ID
+    // as in our own menu bar, the child item should be used to determine
+    // whether it's currently enabled.
+    wxMenuItem *item = GetActiveChild()
+                            ? GetActiveChild()->FindItemInMenuBar(menuId)
+                            : NULL;
+    if ( !item )
+        item = wxFrame::FindItemInMenuBar(menuId);
 
     if ( !item && m_windowMenu )
         item = m_windowMenu->FindItem(menuId);
@@ -552,8 +576,9 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 WXHWND hwnd;
                 UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
 
-                if ( cmd == 0 /* menu */ &&
-                        id >= SC_SIZE /* first system menu command */ )
+                if ( id == wxID_MDI_MORE_WINDOWS ||
+                     (cmd == 0 /* menu */ &&
+                        id >= SC_SIZE /* first system menu command */) )
                 {
                     MSWDefWindowProc(message, wParam, lParam);
                     processed = true;
@@ -618,9 +643,7 @@ void wxMDIParentFrame::OnMDIChild(wxCommandEvent& event)
             int childId = wxGetWindowId(child->GetHWND());
             if ( childId == event.GetId() )
             {
-                ::SendMessage( GetWinHwnd(GetClientWindow()),
-                        WM_MDIACTIVATE,
-                        (WPARAM)child->GetHWND(), 0);
+                wxStaticCast(child, wxMDIChildFrame)->Activate();
                 return;
             }
         }
@@ -678,20 +701,6 @@ void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event)
 
 #endif // wxUSE_MENUS
 
-bool wxMDIParentFrame::TryBefore(wxEvent& event)
-{
-    // menu (and toolbar) events should be sent to the active child frame
-    // first, if any
-    if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
-    {
-        wxMDIChildFrame * const child = GetActiveChild();
-        if ( child && child->ProcessWindowEventLocally(event) )
-            return true;
-    }
-
-    return wxMDIParentFrameBase::TryBefore(event);
-}
-
 WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
                                         WXWPARAM wParam,
                                         WXLPARAM lParam)
@@ -785,8 +794,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   if ( !(style & wxFULL_REPAINT_ON_RESIZE) )
       className += wxApp::GetNoRedrawClassSuffix();
 
-  mcs.szClass = className.wx_str();
-  mcs.szTitle = title.wx_str();
+  mcs.szClass = className.t_str();
+  mcs.szTitle = title.t_str();
   mcs.hOwner = wxGetInstance();
   if (x != wxDefaultCoord)
       mcs.x = x;
@@ -1027,6 +1036,11 @@ void wxMDIChildFrame::Activate()
     wxMDIParentFrame * const parent = GetMDIParent();
     if ( parent && parent->GetClientWindow() )
     {
+        // Activating an iconized MDI frame doesn't do anything, so restore it
+        // first to really present it to the user.
+        if ( IsIconized() )
+            Restore();
+
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
                       (WPARAM) GetHwnd(), 0);
     }
@@ -1364,7 +1378,7 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
             while (node)
             {
                 wxWindow *child = node->GetData();
-                if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
+                if (wxDynamicCast(child, wxMDIChildFrame))
                 {
                    ::RedrawWindow(GetHwndOf(child),
                                   NULL,
@@ -1463,7 +1477,7 @@ void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU menuWin)
                 inserted = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
                              (UINT_PTR)menuWin,
-                             wxString(wxGetTranslation(WINDOW_MENU_LABEL)).wx_str());
+                             wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
                 break;
             }
         }
@@ -1472,7 +1486,7 @@ void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU menuWin)
         {
             ::AppendMenu(hmenu, MF_POPUP,
                          (UINT_PTR)menuWin,
-                         wxString(wxGetTranslation(WINDOW_MENU_LABEL)).wx_str());
+                         wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
         }
     }
 
diff --git a/Externals/wxWidgets3/src/msw/mediactrl_am.cpp b/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
index 45f823555e..39f07e8ab7 100644
--- a/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
+++ b/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     01/29/05
-// RCS-ID:      $Id: mediactrl_am.cpp 68152 2011-07-04 16:43:37Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1540,14 +1539,14 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
     {
         return wxString::Format(wxT("DirectShow error \"%s\" \n")
                                      wxT("(numeric %X)\n")
-                                     wxT("occured"),
+                                     wxT("occurred"),
                                      szError, (int)hrdsv);
     }
     else
     {
         return wxString::Format(wxT("Unknown error \n")
                                      wxT("(numeric %X)\n")
-                                     wxT("occured"),
+                                     wxT("occurred"),
                                      (int)hrdsv);
     }
 }
diff --git a/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp b/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
index aca1e3cc3a..9ba2a63902 100644
--- a/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
+++ b/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
@@ -5,7 +5,6 @@
 // Modified by: Robin Dunn (moved QT code from mediactrl.cpp)
 //
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl_qt.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/mediactrl_wmp10.cpp b/Externals/wxWidgets3/src/msw/mediactrl_wmp10.cpp
index 6fef89a4fc..0ce46ff704 100644
--- a/Externals/wxWidgets3/src/msw/mediactrl_wmp10.cpp
+++ b/Externals/wxWidgets3/src/msw/mediactrl_wmp10.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl_wmp10.cpp 67182 2011-03-14 10:27:01Z JS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +27,7 @@
 // is about to be played - and if the user didn't change the state of the
 // media (m_bWasStateChanged), when set it back to the stop state.
 //
-// The ActiveX control itself is particularily stubborn, calling
+// The ActiveX control itself is particularly stubborn, calling
 // IOleInPlaceSite::OnPosRectChange every file change trying to set itself
 // to something different then what we told it to before.
 //
@@ -861,7 +860,7 @@ bool wxWMP10MediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     IWMPPlayer2* pWMPPlayer2; // Only 2 has windowless video and stretchtofit
     if(m_pWMPPlayer->QueryInterface(IID_IWMPPlayer2, (void**)&pWMPPlayer2) == 0)
     {
-        // We don't check errors here as these arn't particularily important
+        // We don't check errors here as these arn't particularly important
         // and may not be implemented (i.e. stretchToFit on CE)
         pWMPPlayer2->put_windowlessVideo(VARIANT_TRUE);
         pWMPPlayer2->put_stretchToFit(VARIANT_TRUE);
@@ -1472,7 +1471,7 @@ wxFORCE_LINK_THIS_MODULE(wxmediabackend_wmp10)
 // you playing a file through WMP.
 //
 // Here are those hacks. They do indeed "work" as expected - just call
-// SendMessage with one of those myterious values layed out in
+// SendMessage with one of those myterious values laid out in
 // Peter Foot's Friday, May 21, 2004 Blog Post on the issue.
 // (He says they are in a registery section entitled "Pendant Bus")
 //
diff --git a/Externals/wxWidgets3/src/msw/menu.cpp b/Externals/wxWidgets3/src/msw/menu.cpp
index 6e51ddef49..2b65c0142b 100644
--- a/Externals/wxWidgets3/src/msw/menu.cpp
+++ b/Externals/wxWidgets3/src/msw/menu.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     04/01/98
-// RCS-ID:      $Id: menu.cpp 70441 2012-01-23 11:28:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -543,6 +542,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
     // check if we have something more than a simple text item
 #if wxUSE_OWNER_DRAWN
+    bool makeItemOwnerDrawn = false;
     if ( pItem->IsOwnerDrawn() )
     {
 #ifndef __DMC__
@@ -558,7 +558,13 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                                      pItem->GetBackgroundColour().IsOk() ||
                                      pItem->GetFont().IsOk();
 
-            if ( !mustUseOwnerDrawn )
+            // Windows XP or earlier don't display menu bitmaps bigger than
+            // standard size correctly (they're truncated), so we must use
+            // owner-drawn items to show them correctly there. OTOH Win7
+            // doesn't seem to have any problems with even very large bitmaps
+            // so don't use owner-drawn items unnecessarily there (Vista wasn't
+            // actually tested but I assume it works as 7 rather than as XP).
+            if ( !mustUseOwnerDrawn && winver < wxWinVersion_Vista )
             {
                 const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
                                 bmpChecked   = pItem->GetBitmap(true);
@@ -592,7 +598,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                 }
 
                 mii.cch = itemText.length();
-                mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
+                mii.dwTypeData = wxMSW_CONV_LPTSTR(itemText);
 
                 if ( flags & MF_POPUP )
                 {
@@ -696,6 +702,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                 // set menu as ownerdrawn
                 m_ownerDrawn = true;
 
+                // also ensure that the new item itself is made owner drawn
+                makeItemOwnerDrawn = true;
+
                 ResetMaxAccelWidth();
             }
             // only update our margin for equals alignment to other item
@@ -715,7 +724,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         itemText = wxMenuItem::GetLabelText(itemText);
 #endif
 
-        pData = (wxChar*)itemText.wx_str();
+        pData = itemText.t_str();
     }
 
     // item might have already been inserted by InsertMenuItem() above
@@ -727,6 +736,14 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
             return false;
         }
+
+#if wxUSE_OWNER_DRAWN
+        if ( makeItemOwnerDrawn )
+        {
+            SetOwnerDrawnMenuItem(GetHmenu(), pos,
+                                  reinterpret_cast<ULONG_PTR>(pItem), TRUE);
+        }
+#endif
     }
 
 
@@ -776,9 +793,6 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         node = node->GetNext();
     }
 
-    // DoRemove() (unlike Remove) can only be called for an existing item!
-    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
-
 #if wxUSE_ACCEL
     // remove the corresponding accel from the accel table
     int n = FindAccel(item->GetId());
@@ -885,7 +899,7 @@ void wxMenu::SetTitle(const wxString& label)
         if ( !label.empty() )
         {
             if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
-                               (UINT_PTR)idMenuTitle, m_title.wx_str()) ||
+                               (UINT_PTR)idMenuTitle, m_title.t_str()) ||
                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {
                 wxLogLastError(wxT("InsertMenu"));
@@ -911,7 +925,7 @@ void wxMenu::SetTitle(const wxString& label)
             info.fMask = MIIM_TYPE;
             info.fType = MFT_STRING;
             info.cch = m_title.length();
-            info.dwTypeData = const_cast<wxChar *>(m_title.wx_str());
+            info.dwTypeData = wxMSW_CONV_LPTSTR(m_title);
             if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
             {
                 wxLogLastError(wxT("SetMenuItemInfo"));
@@ -919,7 +933,7 @@ void wxMenu::SetTitle(const wxString& label)
 #else
             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,
-                             (UINT_PTR)idMenuTitle, m_title.wx_str()) )
+                             (UINT_PTR)idMenuTitle, m_title.t_str()) )
             {
                 wxLogLastError(wxT("ModifyMenu"));
             }
@@ -1127,7 +1141,7 @@ WXHMENU wxMenuBar::Create()
         HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu();
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(GetMenuLabel(i));
-        tbButton.iString = (int) label.wx_str();
+        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
 
         tbButton.idCommand = NewControlId();
         if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
@@ -1156,7 +1170,7 @@ WXHMENU wxMenuBar::Create()
         {
             if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
                                (UINT_PTR)(*it)->GetHMenu(),
-                               (*it)->GetTitle().wx_str()) )
+                               (*it)->GetTitle().t_str()) )
             {
                 wxLogLastError(wxT("AppendMenu"));
             }
@@ -1265,7 +1279,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
     info.fMask = MIIM_TYPE;
     info.fType = MFT_STRING;
     info.cch = label.length();
-    info.dwTypeData = const_cast<wxChar *>(label.wx_str());
+    info.dwTypeData = wxMSW_CONV_LPTSTR(label);
     if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
@@ -1273,7 +1287,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
 
 #else
     if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
-                      id, label.wx_str()) == (int)0xFFFFFFFF )
+                      id, label.t_str()) == (int)0xFFFFFFFF )
     {
         wxLogLastError(wxT("ModifyMenu"));
     }
@@ -1318,7 +1332,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
         if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )
+                           (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
         {
             wxLogLastError(wxT("InsertMenu"));
         }
@@ -1350,10 +1364,6 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         (GetHmenu() != 0);
 #endif
 
-    int mswpos = (!isAttached || (pos == m_menus.GetCount()))
-        ?   -1 // append the menu
-        :   MSWPositionForWxMenu(GetMenu(pos),pos);
-
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 
@@ -1373,7 +1383,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
-        tbButton.iString = (int) label.wx_str();
+        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
@@ -1381,11 +1391,35 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
             wxLogLastError(wxT("TB_INSERTBUTTON"));
             return false;
         }
-        wxUnusedVar(mswpos);
 #else
-        if ( !::InsertMenu(GetHmenu(), mswpos,
+        // We have a problem with the index if there is an extra "Window" menu
+        // in this menu bar, which is added by wxMDIParentFrame to it directly
+        // using Windows API (so that it remains invisible to the user code),
+        // but which does affect the indices of the items we insert after it.
+        // So we check if any of the menus before the insertion position is a
+        // foreign one and adjust the insertion index accordingly.
+        int mswExtra = 0;
+
+        // Skip all this if the total number of menus matches (notice that the
+        // internal menu count has already been incremented by wxMenuBarBase::
+        // Insert() call above, hence -1).
+        int mswCount = ::GetMenuItemCount(GetHmenu());
+        if ( mswCount != -1 &&
+                static_cast<unsigned>(mswCount) != GetMenuCount() - 1 )
+        {
+            wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+            for ( size_t n = 0; n < pos; n++ )
+            {
+                if ( ::GetSubMenu(GetHmenu(), n) != GetHmenuOf(node->GetData()) )
+                    mswExtra++;
+                else
+                    node = node->GetNext();
+            }
+        }
+
+        if ( !::InsertMenu(GetHmenu(), pos + mswExtra,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT_PTR)GetHmenuOf(menu), title.wx_str()) )
+                           (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
         {
             wxLogLastError(wxT("InsertMenu"));
         }
@@ -1434,7 +1468,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
-        tbButton.iString = (int) label.wx_str();
+        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
@@ -1444,7 +1478,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         }
 #else
         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
-                           (UINT_PTR)submenu, title.wx_str()) )
+                           (UINT_PTR)submenu, title.t_str()) )
         {
             wxLogLastError(wxT("AppendMenu"));
         }
@@ -1534,6 +1568,10 @@ void wxMenuBar::RebuildAccelTable()
 
         delete [] accelEntries;
     }
+    else // No (more) accelerators.
+    {
+        SetAcceleratorTable(wxAcceleratorTable());
+    }
 }
 
 #endif // wxUSE_ACCEL
diff --git a/Externals/wxWidgets3/src/msw/menuitem.cpp b/Externals/wxWidgets3/src/msw/menuitem.cpp
index 272772e037..de808b31e0 100644
--- a/Externals/wxWidgets3/src/msw/menuitem.cpp
+++ b/Externals/wxWidgets3/src/msw/menuitem.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id: menuitem.cpp 67720 2011-05-10 08:50:38Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -681,15 +680,6 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
     if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )
         return;
 
-#if wxUSE_OWNER_DRAWN
-    if ( IsOwnerDrawn() )
-    {
-        // we don't need to do anything for owner drawn items, they will redraw
-        // themselves using the new text the next time they're displayed
-        return;
-    }
-#endif // owner drawn
-
     // update the text of the native menu item
     WinStruct<MENUITEMINFO> info;
 
@@ -712,11 +702,26 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
         return;
     }
 
-    if ( isLaterThanWin95 )
-        info.fMask |= MIIM_STRING;
-    //else: MIIM_TYPE already specified
-    info.dwTypeData = (LPTSTR)m_text.wx_str();
-    info.cch = m_text.length();
+#if wxUSE_OWNER_DRAWN
+    // Don't set the text for the owner drawn items, they don't use it and even
+    // though setting it doesn't seem to actually do any harm under Windows 7,
+    // avoid doing this relatively nonsensical operation just in case it does
+    // break something on other, past or future, Windows versions.
+    //
+    // Notice that we do need to call SetMenuItemInfo() even for the ownerdrawn
+    // items however as otherwise their size wouldn't be recalculated as
+    // WM_MEASUREITEM wouldn't be sent and this could result in display
+    // problems if the length of the menu item changed significantly.
+    if ( !IsOwnerDrawn() )
+#endif // wxUSE_OWNER_DRAWN
+    {
+        if ( isLaterThanWin95 )
+            info.fMask |= MIIM_STRING;
+        //else: MIIM_TYPE already specified
+        info.dwTypeData = wxMSW_CONV_LPTSTR(m_text);
+        info.cch = m_text.length();
+    }
+
     if ( !::SetMenuItemInfo(hMenu, id, FALSE, &info) )
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
@@ -975,7 +980,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
         int x = rcText.left;
         int y = rcText.top + (rcText.bottom - rcText.top - textSize.cy) / 2;
 
-        ::DrawState(hdc, NULL, NULL, (LPARAM)text.wx_str(),
+        ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(text),
                     text.length(), x, y, 0, 0, flags);
 
         // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
@@ -1005,7 +1010,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
             int y = rcText.top + (rcText.bottom - rcText.top - accelSize.cy) / 2;
 
-            ::DrawState(hdc, NULL, NULL, (LPARAM)accel.wx_str(),
+            ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(accel),
                         accel.length(), x, y, 0, 0, flags);
         }
     }
@@ -1072,9 +1077,6 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
             int nBmpWidth  = bmp.GetWidth(),
                 nBmpHeight = bmp.GetHeight();
 
-            // there should be enough space!
-            wxASSERT( nBmpWidth <= imgWidth && nBmpHeight <= (rcImg.bottom - rcImg.top) );
-
             int x = rcImg.left + (imgWidth - nBmpWidth) / 2;
             int y = rcImg.top  + (rcImg.bottom - rcImg.top - nBmpHeight) / 2;
             dc.Blit(x, y, nBmpWidth, nBmpHeight, &dcMem, 0, 0, wxCOPY, true);
diff --git a/Externals/wxWidgets3/src/msw/metafile.cpp b/Externals/wxWidgets3/src/msw/metafile.cpp
index 78ecb5f44f..15a2caf97c 100644
--- a/Externals/wxWidgets3/src/msw/metafile.cpp
+++ b/Externals/wxWidgets3/src/msw/metafile.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     04/01/98
-// RCS-ID:      $Id: metafile.cpp 66728 2011-01-22 14:38:36Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -205,7 +204,7 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
     m_maxY = -10000;
     if ( !file.empty() && wxFileExists(file) )
         wxRemoveFile(file);
-    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.wx_str());
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : wxMSW_CONV_LPCTSTR(file));
 
     m_ok = true;
 
@@ -400,7 +399,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     FILE *fHandle = wxFopen(tempFileBuf.fn_str(), wxT("wb"));
     if (!fHandle)
         return false;
-    fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
+    fwrite((void *)&header, 1, sizeof(mfPLACEABLEHEADER), fHandle);
 
     // Calculate origin and extent
     int originX = x1;
@@ -410,14 +409,14 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
 
     // Read metafile header and write
     METAHEADER metaHeader;
-    fread((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fd);
+    fread((void *)&metaHeader, 1, sizeof(metaHeader), fd);
 
     if (useOriginAndExtent)
         metaHeader.mtSize += 15;
     else
         metaHeader.mtSize += 5;
 
-    fwrite((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fHandle);
+    fwrite((void *)&metaHeader, 1, sizeof(metaHeader), fHandle);
 
     // Write SetMapMode, SetWindowOrigin and SetWindowExt records
     char modeBuffer[8];
@@ -442,12 +441,12 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     extentRecord->rdParm[0] = extentY;
     extentRecord->rdParm[1] = extentX;
 
-    fwrite((void *)modeBuffer, sizeof(char), 8, fHandle);
+    fwrite((void *)modeBuffer, 1, 8, fHandle);
 
     if (useOriginAndExtent)
     {
-        fwrite((void *)originBuffer, sizeof(char), 10, fHandle);
-        fwrite((void *)extentBuffer, sizeof(char), 10, fHandle);
+        fwrite((void *)originBuffer, 1, 10, fHandle);
+        fwrite((void *)extentBuffer, 1, 10, fHandle);
     }
 
     int ch = -2;
diff --git a/Externals/wxWidgets3/src/msw/microwin.c b/Externals/wxWidgets3/src/msw/microwin.c
index 4e1ae3be53..3748c84531 100644
--- a/Externals/wxWidgets3/src/msw/microwin.c
+++ b/Externals/wxWidgets3/src/msw/microwin.c
@@ -4,7 +4,6 @@
 // Purpose:     Extra implementation for MicroWindows
 // Author:      Julian Smart
 // Created:     2001-05-31
-// RCS-ID:      $Id: microwin.c 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/mimetype.cpp b/Externals/wxWidgets3/src/msw/mimetype.cpp
index ece93ed7c3..9bd56ad436 100644
--- a/Externals/wxWidgets3/src/msw/mimetype.cpp
+++ b/Externals/wxWidgets3/src/msw/mimetype.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id: mimetype.cpp 70796 2012-03-04 00:29:31Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
@@ -227,17 +226,36 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
     wxLogNull nolog;
     wxString strKey;
 
+    // Since Windows Vista the association used by Explorer is different from
+    // the association information stored in the traditional part of the
+    // registry. Unfortunately the new schema doesn't seem to be documented
+    // anywhere so using it involves a bit of guesswork:
+    //
+    // The information is stored under Explorer-specific key whose path is
+    // below. The interesting part is UserChoice subkey which is the only one
+    // we use so far but there is also OpenWithProgids subkey which can exist
+    // even if UserChoice doesn't. However in practice there doesn't seem to be
+    // any cases when OpenWithProgids values for the given extension are
+    // different from those found directly under HKCR\.ext, so for now we don't
+    // bother to use this, apparently the programs registering their file type
+    // associations do it in both places. We do use UserChoice because when the
+    // association is manually changed by the user it's only recorded there and
+    // so must override whatever value was created under HKCR by the setup
+    // program.
+
     {
-        wxRegKey explorerKey(wxRegKey::HKCU, wxT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\") + m_ext);
-        if (explorerKey.Exists())
+        wxRegKey explorerKey
+                 (
+                    wxRegKey::HKCU,
+                    wxT("Software\\Microsoft\\Windows\\CurrentVersion\\")
+                    wxT("Explorer\\FileExts\\") +
+                    m_ext +
+                    wxT("\\UserChoice")
+                 );
+        if ( explorerKey.Open(wxRegKey::Read) &&
+                explorerKey.QueryValue(wxT("Progid"), strKey) )
         {
-            if (explorerKey.Open(wxRegKey::Read))
-            {
-                if (explorerKey.QueryValue(wxT("Progid"), strKey))
-                {
-                    strKey = wxFileTypeImplGetCurVer(strKey);
-                }
-            }
+            strKey = wxFileTypeImplGetCurVer(strKey);
         }
     }
 
@@ -273,23 +291,28 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
             if ( keyDDE.Open(wxRegKey::Read) ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
-                ddeCommand.Replace(wxT("%1"), wxT("%s"));
 
-                wxRegKey keyServer(wxRegKey::HKCR, strKey + wxT("\\Application"));
-                keyServer.QueryValue(wxEmptyString, ddeServer);
-                wxRegKey keyTopic(wxRegKey::HKCR, strKey + wxT("\\Topic"));
-                keyTopic.QueryValue(wxEmptyString, ddeTopic);
+                // in some cases "DDEExec" subkey exists but has no value, we
+                // shouldn't use DDE in this case
+                if ( !ddeCommand.empty() ) {
+                    ddeCommand.Replace(wxT("%1"), wxT("%s"));
 
-                if (ddeTopic.empty())
-                    ddeTopic = wxT("System");
+                    wxRegKey keyServer(wxRegKey::HKCR, strKey + wxT("\\Application"));
+                    keyServer.QueryValue(wxEmptyString, ddeServer);
+                    wxRegKey keyTopic(wxRegKey::HKCR, strKey + wxT("\\Topic"));
+                    keyTopic.QueryValue(wxEmptyString, ddeTopic);
 
-                // HACK: we use a special feature of wxExecute which exists
-                //       just because we need it here: it will establish DDE
-                //       conversation with the program it just launched
-                command.Prepend(wxT("WX_DDE#"));
-                command << wxT('#') << ddeServer
-                        << wxT('#') << ddeTopic
-                        << wxT('#') << ddeCommand;
+                    if (ddeTopic.empty())
+                        ddeTopic = wxT("System");
+
+                    // HACK: we use a special feature of wxExecute which exists
+                    //       just because we need it here: it will establish DDE
+                    //       conversation with the program it just launched
+                    command.Prepend(wxT("WX_DDE#"));
+                    command << wxT('#') << ddeServer
+                            << wxT('#') << ddeTopic
+                            << wxT('#') << ddeCommand;
+                }
             }
             else
 #endif // wxUSE_IPC
@@ -636,22 +659,23 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
            extWithDot = wxT('.');
         extWithDot += ext;
 
-        wxRegKey key(wxRegKey::HKCR, extWithDot);
-        if ( !key.Exists() ) key.Create();
-        key.SetValue(wxEmptyString, filetype);
+        wxRegKey key2(wxRegKey::HKCR, extWithDot);
+        if ( !key2.Exists() )
+            key2.Create();
+        key2.SetValue(wxEmptyString, filetype);
 
         // now set any mimetypes we may have, but ignore it if none
-        const wxString& mimetype = ftInfo.GetMimeType();
-        if ( !mimetype.empty() )
+        const wxString& mimetype2 = ftInfo.GetMimeType();
+        if ( !mimetype2.empty() )
         {
             // set the MIME type
-            ok = key.SetValue(wxT("Content Type"), mimetype);
+            ok = key2.SetValue(wxT("Content Type"), mimetype2);
 
             if ( ok )
             {
                 // create the MIME key
                 wxString strKey = MIME_DATABASE_KEY;
-                strKey << mimetype;
+                strKey << mimetype2;
                 wxRegKey keyMIME(wxRegKey::HKCR, strKey);
                 ok = keyMIME.Create();
 
diff --git a/Externals/wxWidgets3/src/msw/minifram.cpp b/Externals/wxWidgets3/src/msw/minifram.cpp
index 01ce056ca7..482ae71d86 100644
--- a/Externals/wxWidgets3/src/msw/minifram.cpp
+++ b/Externals/wxWidgets3/src/msw/minifram.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: minifram.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/msgdlg.cpp b/Externals/wxWidgets3/src/msw/msgdlg.cpp
index 5a23652370..02da8a94d8 100644
--- a/Externals/wxWidgets3/src/msw/msgdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/msgdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: msgdlg.cpp 70409 2012-01-20 12:30:08Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,9 +41,10 @@
 #include "wx/msw/private/button.h"
 #include "wx/msw/private/metrics.h"
 #include "wx/msw/private/msgdlg.h"
+#include "wx/modalhook.h"
+#include "wx/fontutil.h"
 
 #if wxUSE_MSGBOX_HOOK
-    #include "wx/fontutil.h"
     #include "wx/textbuf.h"
     #include "wx/display.h"
 #endif
@@ -271,7 +271,7 @@ void wxMessageDialog::ReplaceStaticWithEdit()
     HWND hwndEdit = ::CreateWindow
                       (
                         wxT("EDIT"),
-                        wxTextBuffer::Translate(text).wx_str(),
+                        wxTextBuffer::Translate(text).t_str(),
                         WS_CHILD | WS_VSCROLL | WS_VISIBLE |
                         ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL,
                         rc.left, rc.top,
@@ -373,7 +373,7 @@ void wxMessageDialog::AdjustButtonLabels()
         if ( widthNeeded > wBtnNew )
             wBtnNew = widthNeeded;
 
-        ::SetWindowText(hwndBtn, label.wx_str());
+        ::SetWindowText(hwndBtn, label.t_str());
     }
 
     if ( wBtnNew <= wBtnOld )
@@ -584,13 +584,15 @@ int wxMessageDialog::ShowMessageBox()
 #endif // wxUSE_MSGBOX_HOOK
 
     // do show the dialog
-    int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);
+    int msAns = MessageBox(hWnd, message.t_str(), m_caption.t_str(), msStyle);
 
     return MSWTranslateReturnCode(msAns);
 }
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
 #ifdef wxHAS_MSW_TASKDIALOG
     if ( HasNativeTaskDialog() )
     {
@@ -626,6 +628,18 @@ int wxMessageDialog::ShowModal()
     return ShowMessageBox();
 }
 
+long wxMessageDialog::GetEffectiveIcon() const
+{
+    // only use the auth needed icon if available, otherwise fallback to the default logic
+    if ( (m_dialogStyle & wxICON_AUTH_NEEDED) &&
+        wxMSWMessageDialog::HasNativeTaskDialog() )
+    {
+        return wxICON_AUTH_NEEDED;
+    }
+
+    return wxMessageDialogBase::GetEffectiveIcon();
+}
+
 void wxMessageDialog::DoCentre(int dir)
 {
 #ifdef wxHAS_MSW_TASKDIALOG
@@ -696,7 +710,7 @@ void wxMSWTaskDialogConfig::MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc)
                   TDF_POSITION_RELATIVE_TO_WINDOW |
                   TDF_SIZE_TO_CONTENT;
     tdc.hInstance = wxGetInstance();
-    tdc.pszWindowTitle = caption.wx_str();
+    tdc.pszWindowTitle = caption.t_str();
 
     // use the top level window as parent if none specified
     tdc.hwndParent = parent ? GetHwndOf(parent) : NULL;
@@ -713,12 +727,12 @@ void wxMSWTaskDialogConfig::MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc)
     // message in our ctor, see comment there.
     if ( !extendedMessage.empty() )
     {
-        tdc.pszMainInstruction = message.wx_str();
-        tdc.pszContent = extendedMessage.wx_str();
+        tdc.pszMainInstruction = message.t_str();
+        tdc.pszContent = extendedMessage.t_str();
     }
     else
     {
-        tdc.pszContent = message.wx_str();
+        tdc.pszContent = message.t_str();
     }
 
     // set an icon to be used, if possible
@@ -735,6 +749,10 @@ void wxMSWTaskDialogConfig::MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc)
         case wxICON_INFORMATION:
             tdc.pszMainIcon = TD_INFORMATION_ICON;
             break;
+
+        case wxICON_AUTH_NEEDED:
+            tdc.pszMainIcon = TD_SHIELD_ICON;
+            break;
     }
 
     // custom label button array that can hold all buttons in use
@@ -802,7 +820,7 @@ void wxMSWTaskDialogConfig::AddTaskDialogButton(TASKDIALOGCONFIG &tdc,
         TASKDIALOG_BUTTON &tdBtn = buttons[tdc.cButtons];
 
         tdBtn.nButtonID = btnCustomId;
-        tdBtn.pszButtonText = customLabel.wx_str();
+        tdBtn.pszButtonText = customLabel.t_str();
         tdc.cButtons++;
 
         // We should never have more than 4 buttons currently as this is the
diff --git a/Externals/wxWidgets3/src/msw/mslu.cpp b/Externals/wxWidgets3/src/msw/mslu.cpp
index b585785a8b..eb6cf1bd6e 100644
--- a/Externals/wxWidgets3/src/msw/mslu.cpp
+++ b/Externals/wxWidgets3/src/msw/mslu.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2002/02/17
-// RCS-ID:      $Id: mslu.cpp 60355 2009-04-25 15:53:45Z VZ $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -200,6 +199,14 @@ WXDLLIMPEXP_BASE int wxMSLU__waccess(const wchar_t *name, int mode)
         return wxCRT_AccessW(name, mode);
 }
 
+WXDLLIMPEXP_BASE int wxMSLU__wchmod(const wchar_t *name, int mode)
+{
+    if ( wxUsingUnicowsDll() )
+        return wxCRT_ChmodA(wxConvFile.cWX2MB(name), mode);
+    else
+        return wxCRT_ChmodW(name, mode);
+}
+
 WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wchar_t *name)
 {
     if ( wxUsingUnicowsDll() )
diff --git a/Externals/wxWidgets3/src/msw/nativdlg.cpp b/Externals/wxWidgets3/src/msw/nativdlg.cpp
index c0f712cf58..d71c3b13e4 100644
--- a/Externals/wxWidgets3/src/msw/nativdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/nativdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: nativdlg.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/nativewin.cpp b/Externals/wxWidgets3/src/msw/nativewin.cpp
index b33ea9cf7e..13b8a77efa 100644
--- a/Externals/wxWidgets3/src/msw/nativewin.cpp
+++ b/Externals/wxWidgets3/src/msw/nativewin.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxNativeWindow implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05
-// RCS-ID:      $Id: nativewin.cpp 62783 2009-12-05 17:31:07Z VZ $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/nonownedwnd.cpp b/Externals/wxWidgets3/src/msw/nonownedwnd.cpp
index 334be35711..fca7bfe879 100644
--- a/Externals/wxWidgets3/src/msw/nonownedwnd.cpp
+++ b/Externals/wxWidgets3/src/msw/nonownedwnd.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxNonOwnedWindow implementation for MSW.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-09 (extracted from src/msw/toplevel.cpp)
-// RCS-ID:      $Id: nonownedwnd.cpp 69699 2011-11-08 11:02:07Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/notebook.cpp b/Externals/wxWidgets3/src/msw/notebook.cpp
index 3fa5804e4f..7b7848b100 100644
--- a/Externals/wxWidgets3/src/msw/notebook.cpp
+++ b/Externals/wxWidgets3/src/msw/notebook.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.06.98
-// RCS-ID:      $Id: notebook.cpp 69793 2011-11-22 13:18:45Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -254,6 +253,13 @@ bool wxNotebook::Create(wxWindow *parent,
     if ( !MSWCreateControl(className, wxEmptyString, pos, size) )
         return false;
 
+    // Inherit parent attributes and, unlike the default, also inherit the
+    // parent background colour in order to blend in with its background if
+    // it's set to a non-default value.
+    InheritAttributes();
+    if ( parent->InheritsBackgroundColour() && !UseBgCol() )
+        SetBackgroundColour(parent->GetBackgroundColour());
+
 #if wxUSE_UXTHEME
     if ( HasFlag(wxNB_NOPAGETHEME) ||
             wxSystemOptions::IsFalse(wxT("msw.notebook.themed-background")) )
@@ -375,18 +381,23 @@ void wxNotebook::UpdateSelection(int selNew)
     {
         wxNotebookPage *pPage = m_pages[selNew];
         pPage->Show(true);
+
+        // In addition to showing the page, we also want to give focus to it to
+        // make it possible to work with it from keyboard easily. However there
+        // are two exceptions: first, don't touch the focus at all if the
+        // notebook itself is not currently shown.
+        if ( ::IsWindowVisible(GetHwnd()) )
+        {
+            // And second, don't give focus away if the tab control itself has
+            // it, as this is how the native property sheets behave: if you
+            // explicitly click on the tab label giving it focus, it will
+            // remain after switching to another page. But if the focus was
+            // inside the notebook page, it switches to the new page.
+            if ( !HasFocus() )
+                pPage->SetFocus();
+        }
     }
 
-    // Changing the page should give the focus to it but, as per bug report
-    // http://sf.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863,
-    // we should not set the focus to it directly since it erroneously
-    // selects radio buttons and breaks keyboard handling for a notebook's
-    // scroll buttons. So give focus to the notebook and not the page.
-
-    // but don't do this is the notebook is hidden
-    if ( ::IsWindowVisible(GetHwnd()) )
-        SetFocus();
-
     m_selection = selNew;
 }
 
@@ -412,7 +423,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
-    tcItem.pszText = (wxChar *)strText.wx_str();
+    tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
 
     if ( !HasFlag(wxNB_MULTILINE) )
         return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;
@@ -686,7 +697,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( !strText.empty() )
     {
         tcItem.mask |= TCIF_TEXT;
-        tcItem.pszText = const_cast<wxChar *>(strText.wx_str());
+        tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
     }
 
     // hide the page: unless it is selected, it shouldn't be shown (and if it
@@ -731,6 +742,14 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( m_pages.GetCount() == 1 || HasFlag(wxNB_MULTILINE) )
     {
         AdjustPageSize(pPage);
+
+        // Additionally, force the layout of the notebook itself by posting a
+        // size event to it. If we don't do it, notebooks with pages on the
+        // left or the right side may fail to account for the fact that they
+        // are now big enough to fit all all of their pages on one row and
+        // still reserve space for the second row of tabs, see #1792.
+        const wxSize s = GetSize();
+        ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(s.x, s.y));
     }
 
     // now deal with the selection
@@ -822,25 +841,74 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event))
     const wxLayoutDirection dir = dc.GetLayoutDirection();
     memdc.SetLayoutDirection(dir);
 
-    // if there is no special brush just use the solid background colour
-#if wxUSE_UXTHEME
-    HBRUSH hbr = (HBRUSH)m_hbrBackground;
-#else
-    HBRUSH hbr = 0;
-#endif
-    wxBrush brush;
-    if ( !hbr )
+    const HDC hdc = GetHdcOf(memdc);
+
+    // The drawing logic of the native tab control is absolutely impenetrable
+    // but observation shows that in the current Windows versions (XP and 7),
+    // the tab control always erases its entire background in its window proc
+    // when the tabs are top-aligned but does not do it when the tabs are in
+    // any other position.
+    //
+    // This means that we can't rely on our background colour being used for
+    // the blank area in the tab row because this doesn't work in the default
+    // top-aligned case, hence the hack with ExtFloodFill() below. But it also
+    // means that we still do need to erase the DC to account for the other
+    // cases.
+    //
+    // Moreover, just in case some very old or very new (or even future,
+    // although it seems unlikely that this is ever going to change by now)
+    // version of Windows didn't do it like this, do both things in all cases
+    // instead of optimizing away the one of them which doesn't do anything for
+    // the effectively used tab orientation -- better safe than fast.
+
+    // Notice that we use our own background here, not the background used for
+    // the pages, because the tab row background must blend with the parent and
+    // so the background colour inherited from it (if any) must be used.
+    AutoHBRUSH hbr(wxColourToRGB(GetBackgroundColour()));
+
+    ::FillRect(hdc, &rc, hbr);
+
+    MSWDefWindowProc(WM_PAINT, (WPARAM)hdc, 0);
+
+    // At least for the top-aligned tabs, our background colour was overwritten
+    // and so we now replace the default background with our colour. This is
+    // horribly inefficient, of course, but seems to be the only way to do it.
+    if ( UseBgCol() )
     {
-        brush = wxBrush(GetBackgroundColour());
-        hbr = GetHbrushOf(brush);
+        SelectInHDC selectBrush(hdc, hbr);
+
+        // Find the point which must contain the default background colour:
+        // this is a hack, of course, but using this point "close" to the
+        // corner seems to work fine in practice.
+        int x = 0,
+            y = 0;
+
+        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+        {
+            case wxBK_TOP:
+                x = rc.right - 2;
+                y = 2;
+                break;
+
+            case wxBK_BOTTOM:
+                x = rc.right - 2;
+                y = rc.bottom - 2;
+                break;
+
+            case wxBK_LEFT:
+                x = 2;
+                y = rc.bottom - 2;
+                break;
+
+            case wxBK_RIGHT:
+                x = 2;
+                y = rc.bottom - 2;
+                break;
+        }
+
+        ::ExtFloodFill(hdc, x, y, ::GetSysColor(COLOR_BTNFACE), FLOODFILLSURFACE);
     }
 
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) memdc.GetImpl();
-
-    ::FillRect(GetHdcOf(*impl), &rc, hbr);
-
-    MSWDefWindowProc(WM_PAINT, (WPARAM)(impl->GetHDC()), 0);
-
     // For some reason in RTL mode, source offset has to be -1, otherwise the
     // right border (physical) remains unpainted.
     const wxCoord ofs = dir == wxLayout_RightToLeft ? -1 : 0;
@@ -1312,11 +1380,11 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
   NMHDR* hdr = (NMHDR *)lParam;
   switch ( hdr->code ) {
     case TCN_SELCHANGE:
-      event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+      event.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGED);
       break;
 
     case TCN_SELCHANGING:
-      event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
+      event.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGING);
       break;
 
     default:
diff --git a/Externals/wxWidgets3/src/msw/notifmsg.cpp b/Externals/wxWidgets3/src/msw/notifmsg.cpp
index 21049e231b..aeef3a3974 100644
--- a/Externals/wxWidgets3/src/msw/notifmsg.cpp
+++ b/Externals/wxWidgets3/src/msw/notifmsg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNotificationMessage for Windows
 // Author:      Vadim Zeitlin
 // Created:     2007-12-01
-// RCS-ID:      $Id: notifmsg.cpp 69379 2011-10-11 17:08:02Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -92,9 +91,10 @@ private:
 class wxBalloonNotifMsgImpl : public wxNotifMsgImpl
 {
 public:
-    // ctor sets up m_icon (using the icon of the top level parent of the given
-    // window) which can be used to show an attached balloon later by the
-    // derived classes
+    // Ctor creates the associated taskbar icon (using the icon of the top
+    // level parent of the given window) unless UseTaskBarIcon() had been
+    // previously called  which can be used to show an attached balloon later
+    // by the derived classes.
     wxBalloonNotifMsgImpl(wxWindow *win) { SetUpIcon(win); }
 
     // implementation of wxNotificationMessage method with the same name
@@ -105,20 +105,53 @@ public:
                         int timeout,
                         int flags);
 
+
+    // Returns true if we're using our own icon or false if we're hitching a
+    // ride on the application icon provided to us via UseTaskBarIcon().
+    static bool IsUsingOwnIcon()
+    {
+        return ms_refCountIcon != -1;
+    }
+
+    // Indicates that the taskbar icon we're using has been hidden and can be
+    // deleted.
+    //
+    // This is only called by wxNotificationIconEvtHandler and should only be
+    // called when using our own icon (as opposed to the one passed to us via
+    // UseTaskBarIcon()).
+    static void ReleaseIcon()
+    {
+        wxASSERT_MSG( ms_refCountIcon != -1,
+                      wxS("Must not be called when not using own icon") );
+
+        if ( !--ms_refCountIcon )
+        {
+            delete ms_icon;
+            ms_icon = NULL;
+        }
+    }
+
 protected:
-    // sets up m_icon (doesn't do anything with the old value, caller beware)
+    // Creates a new icon if necessary, see the comment below.
     void SetUpIcon(wxWindow *win);
 
 
-    static wxTaskBarIcon *ms_iconToUse;
-
-    // the icon we attach our notification to, either ms_iconToUse or a
-    // temporary one which we will destroy when done
-    wxTaskBarIcon *m_icon;
-
-    // should be only used if m_icon != NULL and indicates whether we should
-    // delete it
-    bool m_ownsIcon;
+    // We need an icon to show the notification in a balloon attached to it.
+    // It may happen that the main application already shows an icon in the
+    // taskbar notification area in which case it should call our
+    // UseTaskBarIcon() and we just use this icon without ever allocating nor
+    // deleting it and ms_refCountIcon is -1 and never changes. Otherwise, we
+    // create the icon when we need it the first time but reuse it if we need
+    // to show subsequent notifications while this icon is still alive. This is
+    // needed in order to avoid 2 or 3 or even more identical icons if a couple
+    // of notifications are shown in a row (which happens quite easily in
+    // practice because Windows helpfully buffers all the notifications that
+    // were generated while the user was away -- i.e. the screensaver was
+    // active -- and then shows them all at once when the user comes back). In
+    // this case, ms_refCountIcon is used as a normal reference counter, i.e.
+    // the icon is only destroyed when it reaches 0.
+    static wxTaskBarIcon *ms_icon;
+    static int ms_refCountIcon;
 };
 
 // implementation for automatically hidden notifications
@@ -212,7 +245,7 @@ wxNotificationIconEvtHandler::wxNotificationIconEvtHandler(wxTaskBarIcon *icon)
 
 void wxNotificationIconEvtHandler::OnIconHidden()
 {
-    delete m_icon;
+    wxBalloonNotifMsgImpl::ReleaseIcon();
 
     delete this;
 }
@@ -234,29 +267,36 @@ void wxNotificationIconEvtHandler::OnClick(wxTaskBarIconEvent& WXUNUSED(event))
 // wxBalloonNotifMsgImpl
 // ----------------------------------------------------------------------------
 
-wxTaskBarIcon *wxBalloonNotifMsgImpl::ms_iconToUse = NULL;
+wxTaskBarIcon *wxBalloonNotifMsgImpl::ms_icon = NULL;
+int wxBalloonNotifMsgImpl::ms_refCountIcon = 0;
 
 /* static */
 wxTaskBarIcon *wxBalloonNotifMsgImpl::UseTaskBarIcon(wxTaskBarIcon *icon)
 {
-    wxTaskBarIcon * const iconOld = ms_iconToUse;
-    ms_iconToUse = icon;
+    wxTaskBarIcon * const iconOld = ms_icon;
+    ms_icon = icon;
+
+    // Don't use reference counting for the provided icon, we don't own it.
+    ms_refCountIcon = icon ? -1 : 0;
+
     return iconOld;
 }
 
 void wxBalloonNotifMsgImpl::SetUpIcon(wxWindow *win)
 {
-    if ( ms_iconToUse )
+    if ( ms_icon )
     {
-        // use an existing icon
-        m_ownsIcon = false;
-        m_icon = ms_iconToUse;
+        // Increment the reference count if we manage the icon on our own.
+        if ( ms_refCountIcon != -1 )
+            ms_refCountIcon++;
     }
-    else // no user-specified icon to attach to
+    else // Create a new icon.
     {
-        // create our own one
-        m_ownsIcon = true;
-        m_icon = new wxTaskBarIcon;
+        wxASSERT_MSG( ms_refCountIcon == 0,
+                      wxS("Shouldn't reference not existent icon") );
+
+        ms_icon = new wxTaskBarIcon;
+        ms_refCountIcon = 1;
 
         // use the icon of the associated (or main, if none) frame
         wxIcon icon;
@@ -278,7 +318,7 @@ void wxBalloonNotifMsgImpl::SetUpIcon(wxWindow *win)
             icon = wxIcon(wxT("wxICON_AAA"));
         }
 
-        m_icon->SetIcon(icon);
+        ms_icon->SetIcon(icon);
     }
 }
 
@@ -288,9 +328,26 @@ wxBalloonNotifMsgImpl::DoShow(const wxString& title,
                               int timeout,
                               int flags)
 {
+    if ( !ms_icon->IsIconInstalled() )
+    {
+        // If we failed to install the icon (which does happen sometimes,
+        // although only in unusual circumstances, e.g. it happens regularly,
+        // albeit not constantly, if we're used soon after resume from suspend
+        // under Windows 7), we should not call ShowBalloon() because it would
+        // just assert and return and we must delete the icon ourselves because
+        // otherwise its associated wxTaskBarIconWindow would remain alive
+        // forever because we're not going to receive a notification about icon
+        // disappearance from the system if we failed to install it in the
+        // first place.
+        delete ms_icon;
+        ms_icon = NULL;
+
+        return false;
+    }
+
     timeout *= 1000; // Windows expresses timeout in milliseconds
 
-    return m_icon->ShowBalloon(title, message, timeout, flags);
+    return ms_icon->ShowBalloon(title, message, timeout, flags);
 }
 
 // ----------------------------------------------------------------------------
@@ -305,7 +362,7 @@ wxManualNotifMsgImpl::wxManualNotifMsgImpl(wxWindow *win)
 
 wxManualNotifMsgImpl::~wxManualNotifMsgImpl()
 {
-    if ( m_icon )
+    if ( ms_icon )
         DoClose();
 }
 
@@ -320,7 +377,7 @@ wxManualNotifMsgImpl::DoShow(const wxString& title,
 
     // base class creates the icon for us initially but we could have destroyed
     // it in DoClose(), recreate it if this was the case
-    if ( !m_icon )
+    if ( !ms_icon )
         SetUpIcon(m_win);
 
     // use maximal (in current Windows versions) timeout (but it will still
@@ -330,19 +387,17 @@ wxManualNotifMsgImpl::DoShow(const wxString& title,
 
 bool wxManualNotifMsgImpl::DoClose()
 {
-    if ( m_ownsIcon )
+    if ( IsUsingOwnIcon() )
     {
         // we don't need the icon any more
-        delete m_icon;
+        ReleaseIcon();
     }
     else // using an existing icon
     {
         // just hide the balloon
-        m_icon->ShowBalloon("", "");
+        ms_icon->ShowBalloon("", "");
     }
 
-    m_icon = NULL;
-
     return true;
 }
 
@@ -353,11 +408,11 @@ bool wxManualNotifMsgImpl::DoClose()
 wxAutoNotifMsgImpl::wxAutoNotifMsgImpl(wxWindow *win)
                   : wxBalloonNotifMsgImpl(win)
 {
-    if ( m_ownsIcon )
+    if ( ms_refCountIcon != -1 )
     {
-        // This object will self-destruct and also delete the icon when the
-        // notification is hidden.
-        new wxNotificationIconEvtHandler(m_icon);
+        // This object will self-destruct and decrease the ref count of the
+        // icon when the notification is hidden.
+        new wxNotificationIconEvtHandler(ms_icon);
     }
 }
 
diff --git a/Externals/wxWidgets3/src/msw/ole/access.cpp b/Externals/wxWidgets3/src/msw/ole/access.cpp
index ec2f52331b..cab33c206c 100644
--- a/Externals/wxWidgets3/src/msw/ole/access.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/access.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
-// RCS-ID:      $Id: access.cpp 62068 2009-09-24 10:15:20Z JS $
 // Copyright:   (c) 2003 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/ole/activex.cpp b/Externals/wxWidgets3/src/msw/ole/activex.cpp
index 5efe7759a3..654fe80c3a 100644
--- a/Externals/wxWidgets3/src/msw/ole/activex.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/activex.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: activex.cpp 70361 2012-01-15 19:05:34Z SJL $
 // Copyright:   (c) 2003 Lindsay Mathieson, (c) 2005 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1110,29 +1109,29 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     m_oleObjectHWND = 0;
 
-    if (m_oleInPlaceObject.IsOk())
-    {
-        hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
-        if (SUCCEEDED(hret))
-            ::SetActiveWindow(m_oleObjectHWND);
-    }
-
 
     if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME))
     {
         RECT posRect;
         wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
 
+        hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
+            m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);
+        CHECK_HR(hret);
+
+        if (m_oleInPlaceObject.IsOk())
+        {
+            hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
+            CHECK_HR(hret);
+            ::SetActiveWindow(m_oleObjectHWND);
+        }
+
         if (posRect.right > 0 && posRect.bottom > 0 &&
             m_oleInPlaceObject.IsOk())
         {
             m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
         }
 
-        hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
-            m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);
-        CHECK_HR(hret);
-
         hret = m_oleObject->DoVerb(OLEIVERB_SHOW, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);
         CHECK_HR(hret);
@@ -1269,7 +1268,7 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
 // wxActiveXContainer::MSWTranslateMessage
 //
 // Called for every message that needs to be translated.
-// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A ect),
+// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A etc),
 // In that case TranslateAccelerator should always be called first.
 //---------------------------------------------------------------------------
 bool wxActiveXContainer::MSWTranslateMessage(WXMSG* pMsg)
diff --git a/Externals/wxWidgets3/src/msw/ole/automtn.cpp b/Externals/wxWidgets3/src/msw/ole/automtn.cpp
index 263c3eec46..1c3bd0a2b9 100644
--- a/Externals/wxWidgets3/src/msw/ole/automtn.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/automtn.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/6/98
-// RCS-ID:      $Id: automtn.cpp 66967 2011-02-19 12:33:08Z VZ $
 // Copyright:   (c) 1998, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -56,6 +55,8 @@
 
 #if wxUSE_OLE_AUTOMATION
 
+#include <wx/vector.h>
+
 // Report an OLE error when calling the specified method to the user via wxLog.
 static void
 ShowException(const wxString& member,
@@ -68,6 +69,8 @@ ShowException(const wxString& member,
 wxAutomationObject::wxAutomationObject(WXIDISPATCH* dispatchPtr)
 {
     m_dispatchPtr = dispatchPtr;
+    m_lcid = LOCALE_SYSTEM_DEFAULT;
+    m_convertVariantFlags = wxOleConvertVariant_Default;
 }
 
 wxAutomationObject::~wxAutomationObject()
@@ -79,9 +82,24 @@ wxAutomationObject::~wxAutomationObject()
     }
 }
 
+namespace
+{
+
+// A simple helper that ensures that VARIANT is destroyed on scope exit.
+struct wxOleVariantArg : VARIANTARG
+{
+    wxOleVariantArg()  { VariantInit(this);  }
+    ~wxOleVariantArg() { VariantClear(this); }
+};
+
+} // anonymous namespace
+
+
 #define INVOKEARG(i) (args ? args[i] : *(ptrArgs[i]))
 
 // For Put/Get, no named arguments are allowed.
+// WARNING: if args contain IDispatches, their reference count will be decreased
+// by one after Invoke() returns!
 bool wxAutomationObject::Invoke(const wxString& member, int action,
         wxVariant& retValue, int noArgs, wxVariant args[], const wxVariant* ptrArgs[]) const
 {
@@ -100,23 +118,23 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
         return obj.Invoke(rest, action, retValue, noArgs, args, ptrArgs);
     }
 
-    VARIANTARG vReturn;
-    VariantInit(& vReturn);
-
-    VARIANTARG* vReturnPtr = & vReturn;
+    wxOleVariantArg vReturn;
+    wxOleVariantArg* vReturnPtr = & vReturn;
 
     // Find number of names args
     int namedArgCount = 0;
     int i;
     for (i = 0; i < noArgs; i++)
+    {
         if ( !INVOKEARG(i).GetName().empty() )
         {
             namedArgCount ++;
         }
+    }
 
     int namedArgStringCount = namedArgCount + 1;
-    BSTR* argNames = new BSTR[namedArgStringCount];
-    argNames[0] = wxConvertStringToOle(member);
+    wxVector<wxBasicString> argNames(namedArgStringCount, wxString());
+    argNames[0] = member;
 
     // Note that arguments are specified in reverse order
     // (all totally logical; hey, we're dealing with OLE here.)
@@ -126,13 +144,13 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     {
         if ( !INVOKEARG(i).GetName().empty() )
         {
-            argNames[(namedArgCount-j)] = wxConvertStringToOle(INVOKEARG(i).GetName());
+            argNames[(namedArgCount-j)] = INVOKEARG(i).GetName();
             j ++;
         }
     }
 
     // + 1 for the member name, + 1 again in case we're a 'put'
-    DISPID* dispIds = new DISPID[namedArgCount + 2];
+    wxVector<DISPID> dispIds(namedArgCount + 2);
 
     HRESULT hr;
     DISPPARAMS dispparams;
@@ -140,13 +158,14 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
 
     // Get the IDs for the member and its arguments.  GetIDsOfNames expects the
     // member name as the first name, followed by argument names (if any).
-    hr = ((IDispatch*)m_dispatchPtr)->GetIDsOfNames(IID_NULL, argNames,
-                                1 + namedArgCount, LOCALE_SYSTEM_DEFAULT, dispIds);
+    hr = ((IDispatch*)m_dispatchPtr)->GetIDsOfNames(IID_NULL,
+                                // We rely on the fact that wxBasicString is
+                                // just BSTR with some methods here.
+                                reinterpret_cast<BSTR *>(&argNames[0]),
+                                1 + namedArgCount, m_lcid, &dispIds[0]);
     if (FAILED(hr))
     {
         ShowException(member, hr);
-        delete[] argNames;
-        delete[] dispIds;
         return false;
     }
 
@@ -160,41 +179,25 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     }
 
     // Convert the wxVariants to VARIANTARGs
-    VARIANTARG* oleArgs = new VARIANTARG[noArgs];
+    wxVector<wxOleVariantArg> oleArgs(noArgs);
     for (i = 0; i < noArgs; i++)
     {
         // Again, reverse args
         if (!wxConvertVariantToOle(INVOKEARG((noArgs-1) - i), oleArgs[i]))
-        {
-            delete[] argNames;
-            delete[] dispIds;
-            delete[] oleArgs;
             return false;
-        }
     }
 
-    dispparams.rgdispidNamedArgs = dispIds + 1;
-    dispparams.rgvarg = oleArgs;
+    dispparams.rgdispidNamedArgs = &dispIds[0] + 1;
+    dispparams.rgvarg = oleArgs.empty() ? NULL : &oleArgs[0];
     dispparams.cArgs = noArgs;
     dispparams.cNamedArgs = namedArgCount;
 
     EXCEPINFO excep;
     wxZeroMemory(excep);
 
-    hr = ((IDispatch*)m_dispatchPtr)->Invoke(dispIds[0], IID_NULL, LOCALE_SYSTEM_DEFAULT,
+    hr = ((IDispatch*)m_dispatchPtr)->Invoke(dispIds[0], IID_NULL, m_lcid,
                         (WORD)action, &dispparams, vReturnPtr, &excep, &uiArgErr);
 
-    for (i = 0; i < namedArgStringCount; i++)
-    {
-        SysFreeString(argNames[i]);
-    }
-    delete[] argNames;
-    delete[] dispIds;
-
-    for (i = 0; i < noArgs; i++)
-        VariantClear(& oleArgs[i]) ;
-    delete[] oleArgs;
-
     if (FAILED(hr))
     {
         // display the exception information if appropriate:
@@ -205,8 +208,6 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
         SysFreeString(excep.bstrDescription);
         SysFreeString(excep.bstrHelpFile);
 
-        if (vReturnPtr)
-            VariantClear(vReturnPtr);
         return false;
     }
     else
@@ -214,13 +215,19 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
         if (vReturnPtr)
         {
             // Convert result to wxVariant form
-            wxConvertOleToVariant(vReturn, retValue);
+            if (!wxConvertOleToVariant(vReturn, retValue, m_convertVariantFlags))
+                return false;
             // Mustn't release the dispatch pointer
             if (vReturn.vt == VT_DISPATCH)
             {
                 vReturn.pdispVal = NULL;
             }
-            VariantClear(& vReturn);
+            // Mustn't free the SAFEARRAY if it is contained in the retValue
+            if ((vReturn.vt & VT_ARRAY) &&
+                    retValue.GetType() == wxS("safearray"))
+            {
+                vReturn.parray = NULL;
+            }
         }
     }
     return true;
@@ -467,6 +474,8 @@ bool wxAutomationObject::GetObject(wxAutomationObject& obj, const wxString& prop
     if (dispatch)
     {
         obj.SetDispatchPtr(dispatch);
+        obj.SetLCID(GetLCID());
+        obj.SetConvertVariantFlags(GetConvertVariantFlags());
         return true;
     }
     else
@@ -480,6 +489,8 @@ bool wxAutomationObject::GetObject(wxAutomationObject& obj, const wxString& prop
     if (dispatch)
     {
         obj.SetDispatchPtr(dispatch);
+        obj.SetLCID(GetLCID());
+        obj.SetConvertVariantFlags(GetConvertVariantFlags());
         return true;
     }
     else
@@ -589,6 +600,27 @@ bool wxAutomationObject::CreateInstance(const wxString& progId) const
     return m_dispatchPtr != NULL;
 }
 
+LCID wxAutomationObject::GetLCID() const
+{
+    return m_lcid;
+}
+
+void wxAutomationObject::SetLCID(LCID lcid)
+{
+    m_lcid = lcid;
+}
+
+long wxAutomationObject::GetConvertVariantFlags() const
+{
+    return m_convertVariantFlags;
+}
+
+void wxAutomationObject::SetConvertVariantFlags(long flags)
+{
+    m_convertVariantFlags = flags;
+}
+
+
 static void
 ShowException(const wxString& member,
               HRESULT hr,
diff --git a/Externals/wxWidgets3/src/msw/ole/dataobj.cpp b/Externals/wxWidgets3/src/msw/ole/dataobj.cpp
index 1810e719c1..2055a0a0de 100644
--- a/Externals/wxWidgets3/src/msw/ole/dataobj.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/dataobj.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id: dataobj.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,6 +34,8 @@
 
 #if wxUSE_OLE && defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
 
+#include "wx/scopedarray.h"
+#include "wx/vector.h"
 #include "wx/msw/private.h"         // includes <windows.h>
 
 #ifdef __WXWINCE__
@@ -67,6 +68,103 @@
     #define GetTymedName(tymed) wxEmptyString
 #endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 
+namespace
+{
+
+wxDataFormat HtmlFormatFixup(wxDataFormat format)
+{
+    // Since the HTML format is dynamically registered, the wxDF_HTML
+    // format does not match the native constant in the way other formats do,
+    // so for the format checks below to work, we must change the native
+    // id to the wxDF_HTML constant.
+    //
+    // But skip this for the standard constants which are never going to match
+    // wxDF_HTML anyhow.
+    if ( !format.IsStandard() )
+    {
+        wxChar szBuf[256];
+        if ( ::GetClipboardFormatName(format, szBuf, WXSIZEOF(szBuf)) )
+        {
+            if ( wxStrcmp(szBuf, wxT("HTML Format")) == 0 )
+                format = wxDF_HTML;
+        }
+    }
+
+    return format;
+}
+
+// helper function for wxCopyStgMedium()
+HGLOBAL wxGlobalClone(HGLOBAL hglobIn)
+{
+    HGLOBAL hglobOut = NULL;
+
+    LPVOID pvIn = GlobalLock(hglobIn);
+    if (pvIn)
+    {
+        SIZE_T cb = GlobalSize(hglobIn);
+        hglobOut = GlobalAlloc(GMEM_FIXED, cb);
+        if (hglobOut)
+        {
+            CopyMemory(hglobOut, pvIn, cb);
+        }
+        GlobalUnlock(hglobIn);
+    }
+
+    return hglobOut;
+}
+
+// Copies the given STGMEDIUM structure.
+//
+// This is an local implementation of the function with the same name in
+// urlmon.lib but to use that function would require linking with urlmon.lib
+// and we don't want to require it, so simple reimplement it here.
+HRESULT wxCopyStgMedium(const STGMEDIUM *pmediumIn, STGMEDIUM *pmediumOut)
+{
+    HRESULT hres = S_OK;
+    STGMEDIUM stgmOut = *pmediumIn;
+
+    if (pmediumIn->pUnkForRelease == NULL &&
+        !(pmediumIn->tymed & (TYMED_ISTREAM | TYMED_ISTORAGE)))
+    {
+        // Object needs to be cloned.
+        if (pmediumIn->tymed == TYMED_HGLOBAL)
+        {
+            stgmOut.hGlobal = wxGlobalClone(pmediumIn->hGlobal);
+            if (!stgmOut.hGlobal)
+            {
+                hres = E_OUTOFMEMORY;
+            }
+        }
+        else
+        {
+            hres = DV_E_TYMED; // Don't know how to clone GDI objects.
+        }
+    }
+
+    if ( SUCCEEDED(hres) )
+    {
+        switch ( stgmOut.tymed )
+        {
+            case TYMED_ISTREAM:
+                stgmOut.pstm->AddRef();
+                break;
+
+            case TYMED_ISTORAGE:
+                stgmOut.pstg->AddRef();
+                break;
+        }
+
+        if ( stgmOut.pUnkForRelease )
+            stgmOut.pUnkForRelease->AddRef();
+
+        *pmediumOut = stgmOut;
+    }
+
+    return hres;
+}
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
 // ----------------------------------------------------------------------------
@@ -127,8 +225,122 @@ private:
     bool m_mustDelete;
 
     wxDECLARE_NO_COPY_CLASS(wxIDataObject);
+
+    // The following code is need to be able to store system data the operating
+    // system is using for it own purposes, e.g. drag images.
+
+    class SystemDataEntry
+    {
+    public:
+        // Ctor takes ownership of the pointers.
+        SystemDataEntry(FORMATETC *pformatetc, STGMEDIUM *pmedium)
+            : pformatetc(pformatetc), pmedium(pmedium)
+        {
+        }
+
+        ~SystemDataEntry()
+        {
+            delete pformatetc;
+            delete pmedium;
+        }
+
+        FORMATETC *pformatetc;
+        STGMEDIUM *pmedium;
+    };
+    typedef wxVector<SystemDataEntry*> SystemData;
+
+    // get system data specified by the given format
+    bool GetSystemData(wxDataFormat format, STGMEDIUM*) const;
+
+    // determines if the data object contains system data specified by the given format.
+    bool HasSystemData(wxDataFormat format) const;
+
+    // save system data
+    HRESULT SaveSystemData(FORMATETC*, STGMEDIUM*, BOOL fRelease);
+
+    // container for system data
+    SystemData m_systemData;
 };
 
+bool
+wxIDataObject::GetSystemData(wxDataFormat format, STGMEDIUM *pmedium) const
+{
+    for ( SystemData::const_iterator it = m_systemData.begin();
+          it != m_systemData.end();
+          ++it )
+    {
+        FORMATETC* formatEtc = (*it)->pformatetc;
+        if ( formatEtc->cfFormat == format )
+        {
+            wxCopyStgMedium((*it)->pmedium, pmedium);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool
+wxIDataObject::HasSystemData(wxDataFormat format) const
+{
+    for ( SystemData::const_iterator it = m_systemData.begin();
+          it != m_systemData.end();
+          ++it )
+    {
+        FORMATETC* formatEtc = (*it)->pformatetc;
+        if ( formatEtc->cfFormat == format )
+            return true;
+    }
+
+    return false;
+}
+
+// save system data
+HRESULT
+wxIDataObject::SaveSystemData(FORMATETC *pformatetc,
+                                 STGMEDIUM *pmedium,
+                                 BOOL fRelease)
+{
+    if ( pformatetc == NULL || pmedium == NULL )
+        return E_INVALIDARG;
+
+    // remove entry if already available
+    for ( SystemData::iterator it = m_systemData.begin();
+          it != m_systemData.end();
+          ++it )
+    {
+        if ( pformatetc->tymed & (*it)->pformatetc->tymed &&
+             pformatetc->dwAspect == (*it)->pformatetc->dwAspect &&
+             pformatetc->cfFormat == (*it)->pformatetc->cfFormat )
+        {
+            delete (*it);
+            m_systemData.erase(it);
+            break;
+        }
+    }
+
+    // create new format/medium
+    FORMATETC* pnewformatEtc = new FORMATETC;
+    STGMEDIUM* pnewmedium = new STGMEDIUM;
+
+    wxZeroMemory(*pnewformatEtc);
+    wxZeroMemory(*pnewmedium);
+
+    // copy format
+    *pnewformatEtc = *pformatetc;
+
+    // copy or take ownerschip of medium
+    if ( fRelease )
+        *pnewmedium = *pmedium;
+    else
+        wxCopyStgMedium(pmedium, pnewmedium);
+
+    // save entry
+    m_systemData.push_back(new SystemDataEntry(pnewformatEtc, pnewmedium));
+
+    return S_OK;
+}
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -137,9 +349,29 @@ private:
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
+bool wxDataFormat::operator==(wxDataFormatId format) const
+{
+    return HtmlFormatFixup(*this).m_format == (NativeFormat)format;
+}
+
+bool wxDataFormat::operator!=(wxDataFormatId format) const
+{
+    return !(*this == format);
+}
+
+bool wxDataFormat::operator==(const wxDataFormat& format) const
+{
+    return HtmlFormatFixup(*this).m_format == HtmlFormatFixup(format).m_format;
+}
+
+bool wxDataFormat::operator!=(const wxDataFormat& format) const
+{
+    return !(*this == format);
+}
+
 void wxDataFormat::SetId(const wxString& format)
 {
-    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format.wx_str());
+    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format.t_str());
     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);
@@ -183,7 +415,10 @@ wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
     m_nCount = nCount;
     m_formats = new CLIPFORMAT[nCount];
     for ( ULONG n = 0; n < nCount; n++ ) {
-        m_formats[n] = formats[n].GetFormatId();
+        if (formats[n].GetFormatId() != wxDF_HTML)
+            m_formats[n] = formats[n].GetFormatId();
+        else
+            m_formats[n] = ::RegisterClipboardFormat(wxT("HTML Format"));
     }
 }
 
@@ -271,6 +506,14 @@ wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
 
 wxIDataObject::~wxIDataObject()
 {
+    // delete system data
+    for ( SystemData::iterator it = m_systemData.begin();
+          it != m_systemData.end();
+          ++it )
+    {
+        delete (*it);
+    }
+
     if ( m_mustDelete )
     {
         delete m_pDataObject;
@@ -290,6 +533,14 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
     // for the bitmaps and metafiles we use the handles instead of global memory
     // to pass the data
     wxDataFormat format = (wxDataFormat::NativeFormat)pformatetcIn->cfFormat;
+    format = HtmlFormatFixup(format);
+
+    // is this system data?
+    if ( GetSystemData(format, pmedium) )
+    {
+        // pmedium is already filled with corresponding data, so we're ready.
+        return S_OK;
+    }
 
     switch ( format )
     {
@@ -426,21 +677,30 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
             m_pDataObject->SetData(wxDF_ENHMETAFILE, 0, &pmedium->hEnhMetaFile);
             break;
 
+        case TYMED_ISTREAM:
+            // check if this format is supported
+            if ( !m_pDataObject->IsSupported(pformatetc->cfFormat,
+                                             wxDataObject::Set) )
+            {
+                // As this is not a supported format (content data), assume it
+                // is system data and save it.
+                return SaveSystemData(pformatetc, pmedium, fRelease);
+            }
+            break;
+
         case TYMED_MFPICT:
             // fall through - we pass METAFILEPICT through HGLOBAL
         case TYMED_HGLOBAL:
             {
                 wxDataFormat format = pformatetc->cfFormat;
 
-                // this is quite weird, but for file drag and drop, explorer
-                // calls our SetData() with the formats we do *not* support!
-                //
-                // as we can't fix this bug in explorer (it's a bug because it
-                // should only use formats returned by EnumFormatEtc), do the
-                // check here
+                format = HtmlFormatFixup(format);
+
+                // check if this format is supported
                 if ( !m_pDataObject->IsSupported(format, wxDataObject::Set) ) {
-                    // go away!
-                    return DV_E_FORMATETC;
+                    // As above, assume that unsupported format must be system
+                    // data and just save it.
+                    return SaveSystemData(pformatetc, pmedium, fRelease);
                 }
 
                 // copy data
@@ -459,14 +719,14 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                 size_t size;
                 switch ( format )
                 {
+                    case wxDF_HTML:
                     case CF_TEXT:
                     case CF_OEMTEXT:
                         size = strlen((const char *)pBuf);
                         break;
 #if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:
-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) )
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
                         size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
@@ -568,10 +828,19 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
 
     // and now check the type of data requested
     wxDataFormat format = pformatetc->cfFormat;
+    format = HtmlFormatFixup(format);
+
     if ( m_pDataObject->IsSupportedFormat(format) ) {
         wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::QueryGetData: %s ok"),
                    wxGetFormatName(format));
     }
+    else if ( HasSystemData(format) )
+    {
+        wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::QueryGetData: %s ok (system data)"),
+                   wxGetFormatName(format));
+        // this is system data, so no further checks needed.
+        return S_OK;
+    }
     else {
         wxLogTrace(wxTRACE_OleCalls,
                    wxT("wxIDataObject::QueryGetData: %s unsupported"),
@@ -617,20 +886,31 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir,
     wxDataObject::Direction dir = dwDir == DATADIR_GET ? wxDataObject::Get
                                                        : wxDataObject::Set;
 
-    ULONG nFormatCount = wx_truncate_cast(ULONG, m_pDataObject->GetFormatCount(dir));
-    wxDataFormat format;
-    wxDataFormat *formats;
-    formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
-    m_pDataObject->GetAllFormats(formats, dir);
+    // format count is total of user specified and system formats.
+    const size_t ourFormatCount = m_pDataObject->GetFormatCount(dir);
+    const size_t sysFormatCount = m_systemData.size();
 
-    wxIEnumFORMATETC *pEnum = new wxIEnumFORMATETC(formats, nFormatCount);
+    const ULONG
+        nFormatCount = wx_truncate_cast(ULONG, ourFormatCount + sysFormatCount);
+
+    // fill format array with formats ...
+    wxScopedArray<wxDataFormat> formats(new wxDataFormat[nFormatCount]);
+
+    // ... from content data (supported formats)
+    m_pDataObject->GetAllFormats(formats.get(), dir);
+
+    // ... from system data
+    for ( size_t j = 0; j < sysFormatCount; j++ )
+    {
+        SystemDataEntry* entry = m_systemData[j];
+        wxDataFormat& format = formats[ourFormatCount + j];
+        format = entry->pformatetc->cfFormat;
+    }
+
+    wxIEnumFORMATETC *pEnum = new wxIEnumFORMATETC(formats.get(), nFormatCount);
     pEnum->AddRef();
     *ppenumFormatEtc = pEnum;
 
-    if ( formats != &format ) {
-        delete [] formats;
-    }
-
     return S_OK;
 }
 
@@ -676,7 +956,7 @@ void wxDataObject::SetAutoDelete()
     ((wxIDataObject *)m_pIDataObject)->SetDeleteFlag();
     m_pIDataObject->Release();
 
-    // so that the dtor doesnt' crash
+    // so that the dtor doesn't crash
     m_pIDataObject = NULL;
 }
 
@@ -1052,7 +1332,7 @@ size_t wxFileDataObject::GetDataSize() const
     if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
     {
         // Win9x always uses ANSI file names and MSLU doesn't help with this
-        sizeOfChar = sizeof(char);
+        sizeOfChar = 1;
     }
     else
     {
@@ -1062,7 +1342,7 @@ size_t wxFileDataObject::GetDataSize() const
     static const size_t sizeOfChar = sizeof(wxChar);
 #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU
 
-    // inital size of DROPFILES struct + null byte
+    // initial size of DROPFILES struct + null byte
     size_t sz = sizeof(DROPFILES) + sizeOfChar;
 
     const size_t count = m_filenames.size();
@@ -1071,7 +1351,7 @@ size_t wxFileDataObject::GetDataSize() const
         // add filename length plus null byte
         size_t len;
 #if wxUSE_UNICODE_MSLU
-        if ( sizeOfChar == sizeof(char) )
+        if ( sizeOfChar == 1 )
             len = strlen(m_filenames[i].mb_str(*wxConvFileName));
         else
 #endif // wxUSE_UNICODE_MSLU
@@ -1108,7 +1388,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
     pDrop->fWide = wxUSE_UNICODE;
 #endif
 
-    const size_t sizeOfChar = pDrop->fWide ? sizeof(wchar_t) : sizeof(char);
+    const size_t sizeOfChar = pDrop->fWide ? sizeof(wchar_t) : 1;
 
     // set start of filenames list (null separated)
     BYTE *pbuf = (BYTE *)(pDrop + 1);
@@ -1119,7 +1399,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
         // copy filename to pbuf and add null terminator
         size_t len;
 #if wxUSE_UNICODE_MSLU
-        if ( sizeOfChar == sizeof(char) )
+        if ( sizeOfChar == 1 )
         {
             wxCharBuffer buf(m_filenames[i].mb_str(*wxConvFileName));
             len = strlen(buf);
@@ -1129,7 +1409,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 #endif // wxUSE_UNICODE_MSLU
         {
             len = m_filenames[i].length();
-            memcpy(pbuf, m_filenames[i].wx_str(), len*sizeOfChar);
+            memcpy(pbuf, m_filenames[i].t_str(), len*sizeOfChar);
         }
 
         pbuf += len*sizeOfChar;
diff --git a/Externals/wxWidgets3/src/msw/ole/dropsrc.cpp b/Externals/wxWidgets3/src/msw/ole/dropsrc.cpp
index accdd79f86..698c829c5d 100644
--- a/Externals/wxWidgets3/src/msw/ole/dropsrc.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/dropsrc.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id: dropsrc.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/ole/droptgt.cpp b/Externals/wxWidgets3/src/msw/ole/droptgt.cpp
index 1bd7e4b4d8..182ae4e3d0 100644
--- a/Externals/wxWidgets3/src/msw/ole/droptgt.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/droptgt.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:
-// RCS-ID:      $Id: droptgt.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,6 +49,32 @@
 
 #include "wx/msw/ole/oleutils.h"
 
+#include <initguid.h>
+
+// Some (very) old SDKs don't define IDropTargetHelper, so define our own
+// version of it here.
+struct wxIDropTargetHelper : public IUnknown
+{
+    virtual HRESULT STDMETHODCALLTYPE DragEnter(HWND hwndTarget,
+                                                IDataObject *pDataObject,
+                                                POINT *ppt,
+                                                DWORD dwEffect) = 0;
+    virtual HRESULT STDMETHODCALLTYPE DragLeave() = 0;
+    virtual HRESULT STDMETHODCALLTYPE DragOver(POINT *ppt, DWORD dwEffect) = 0;
+    virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObject,
+                                           POINT *ppt,
+                                           DWORD dwEffect) = 0;
+    virtual HRESULT STDMETHODCALLTYPE Show(BOOL fShow) = 0;
+};
+
+namespace
+{
+    DEFINE_GUID(wxCLSID_DragDropHelper,
+                0x4657278A,0x411B,0x11D2,0x83,0x9A,0x00,0xC0,0x4F,0xD9,0x18,0xD0);
+    DEFINE_GUID(wxIID_IDropTargetHelper,
+                0x4657278B,0x411B,0x11D2,0x83,0x9A,0x00,0xC0,0x4F,0xD9,0x18,0xD0);
+}
+
 // ----------------------------------------------------------------------------
 // IDropTarget interface: forward all interesting things to wxDropTarget
 // (the name is unfortunate, but wx_I_DropTarget is not at all the same thing
@@ -63,6 +88,7 @@ public:
     virtual ~wxIDropTarget();
 
     // accessors for wxDropTarget
+    HWND GetHWND() const { return m_hwnd; }
     void SetHwnd(HWND hwnd) { m_hwnd = hwnd; }
 
     // IDropTarget methods
@@ -192,13 +218,6 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
     }
 #endif // 0
 
-    if ( !m_pTarget->MSWIsAcceptedData(pIDataSource) ) {
-        // we don't accept this kind of data
-        *pdwEffect = DROPEFFECT_NONE;
-
-        return S_OK;
-    }
-
     // for use in OnEnter and OnDrag calls
     m_pTarget->MSWSetDataSource(pIDataSource);
 
@@ -206,22 +225,36 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
     m_pIDataObject = pIDataSource;
     m_pIDataObject->AddRef();
 
-    // we need client coordinates to pass to wxWin functions
-    if ( !ScreenToClient(m_hwnd, (POINT *)&pt) )
+    if ( !m_pTarget->MSWIsAcceptedData(pIDataSource) ) {
+        // we don't accept this kind of data
+        *pdwEffect = DROPEFFECT_NONE;
+    }
+    else
     {
-        wxLogLastError(wxT("ScreenToClient"));
+        // we need client coordinates to pass to wxWin functions
+        if ( !ScreenToClient(m_hwnd, (POINT *)&pt) )
+        {
+            wxLogLastError(wxT("ScreenToClient"));
+        }
+
+        // give some visual feedback
+        *pdwEffect = ConvertDragResultToEffect(
+            m_pTarget->OnEnter(pt.x, pt.y, ConvertDragEffectToResult(
+                GetDropEffect(grfKeyState, m_pTarget->GetDefaultAction(), *pdwEffect))
+                        )
+                     );
     }
 
-    // give some visual feedback
-    *pdwEffect = ConvertDragResultToEffect(
-        m_pTarget->OnEnter(pt.x, pt.y, ConvertDragEffectToResult(
-            GetDropEffect(grfKeyState, m_pTarget->GetDefaultAction(), *pdwEffect))
-                    )
-                 );
+    // update drag image
+    const wxDragResult res = ConvertDragEffectToResult(*pdwEffect);
+    m_pTarget->MSWUpdateDragImageOnEnter(pt.x, pt.y, res);
+    m_pTarget->MSWUpdateDragImageOnDragOver(pt.x, pt.y, res);
 
     return S_OK;
 }
 
+
+
 // Name    : wxIDropTarget::DragOver
 // Purpose : Indicates that the mouse was moved inside the window represented
 //           by this drop target.
@@ -262,6 +295,10 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD   grfKeyState,
         *pdwEffect = DROPEFFECT_NONE;
     }
 
+    // update drag image
+    m_pTarget->MSWUpdateDragImageOnDragOver(pt.x, pt.y,
+                                            ConvertDragEffectToResult(*pdwEffect));
+
     return S_OK;
 }
 
@@ -279,6 +316,9 @@ STDMETHODIMP wxIDropTarget::DragLeave()
   // release the held object
   RELEASE_AND_NULL(m_pIDataObject);
 
+  // update drag image
+  m_pTarget->MSWUpdateDragImageOnLeave();
+
   return S_OK;
 }
 
@@ -333,6 +373,10 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
     // release the held object
     RELEASE_AND_NULL(m_pIDataObject);
 
+    // update drag image
+    m_pTarget->MSWUpdateDragImageOnData(pt.x, pt.y,
+                                        ConvertDragEffectToResult(*pdwEffect));
+
     return S_OK;
 }
 
@@ -345,7 +389,8 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
 // ----------------------------------------------------------------------------
 
 wxDropTarget::wxDropTarget(wxDataObject *dataObj)
-            : wxDropTargetBase(dataObj)
+            : wxDropTargetBase(dataObj),
+              m_dropTargetHelper(NULL)
 {
     // create an IDropTarget implementation which will notify us about d&d
     // operations.
@@ -396,6 +441,8 @@ bool wxDropTarget::Register(WXHWND hwnd)
     // we will need the window handle for coords transformation later
     m_pIDropTarget->SetHwnd((HWND)hwnd);
 
+    MSWInitDragImageSupport();
+
     return true;
 #endif
 }
@@ -417,6 +464,9 @@ void wxDropTarget::Revoke(WXHWND hwnd)
     ::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE);
 #endif
 
+    MSWEndDragImageSupport();
+
+    // remove window reference
     m_pIDropTarget->SetHwnd(0);
 #endif
 }
@@ -437,9 +487,6 @@ bool wxDropTarget::GetData()
 {
     wxDataFormat format = MSWGetSupportedFormat(m_pIDataSource);
     if ( format == wxDF_INVALID ) {
-        // this is strange because IsAcceptedData() succeeded previously!
-        wxFAIL_MSG(wxT("strange - did supported formats list change?"));
-
         return false;
     }
 
@@ -539,6 +586,81 @@ wxDataFormat wxDropTarget::MSWGetSupportedFormat(IDataObject *pIDataSource) cons
     return n < nFormats ? format : wxFormatInvalid;
 }
 
+// ----------------------------------------------------------------------------
+// drag image functions
+// ----------------------------------------------------------------------------
+
+void
+wxDropTarget::MSWEndDragImageSupport()
+{
+    // release drop target helper
+    if ( m_dropTargetHelper != NULL )
+    {
+        m_dropTargetHelper->Release();
+        m_dropTargetHelper = NULL;
+    }
+}
+
+void
+wxDropTarget::MSWInitDragImageSupport()
+{
+    // Use the default drop target helper to show shell drag images
+    CoCreateInstance(wxCLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER,
+                     wxIID_IDropTargetHelper, (LPVOID*)&m_dropTargetHelper);
+}
+
+void
+wxDropTarget::MSWUpdateDragImageOnData(wxCoord x,
+                                       wxCoord y,
+                                       wxDragResult dragResult)
+{
+    // call corresponding event on drop target helper
+    if ( m_dropTargetHelper != NULL )
+    {
+        POINT pt = {x, y};
+        DWORD dwEffect = ConvertDragResultToEffect(dragResult);
+        m_dropTargetHelper->Drop(m_pIDataSource, &pt, dwEffect);
+    }
+}
+
+void
+wxDropTarget::MSWUpdateDragImageOnDragOver(wxCoord x,
+                                           wxCoord y,
+                                           wxDragResult dragResult)
+{
+    // call corresponding event on drop target helper
+    if ( m_dropTargetHelper != NULL )
+    {
+        POINT pt = {x, y};
+        DWORD dwEffect = ConvertDragResultToEffect(dragResult);
+        m_dropTargetHelper->DragOver(&pt, dwEffect);
+    }
+}
+
+void
+wxDropTarget::MSWUpdateDragImageOnEnter(wxCoord x,
+                                        wxCoord y,
+                                        wxDragResult dragResult)
+{
+    // call corresponding event on drop target helper
+    if ( m_dropTargetHelper != NULL )
+    {
+        POINT pt = {x, y};
+        DWORD dwEffect = ConvertDragResultToEffect(dragResult);
+        m_dropTargetHelper->DragEnter(m_pIDropTarget->GetHWND(), m_pIDataSource, &pt, dwEffect);
+    }
+}
+
+void
+wxDropTarget::MSWUpdateDragImageOnLeave()
+{
+    // call corresponding event on drop target helper
+    if ( m_dropTargetHelper != NULL )
+    {
+        m_dropTargetHelper->DragLeave();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/ole/oleutils.cpp b/Externals/wxWidgets3/src/msw/ole/oleutils.cpp
index 75d738c79c..ab4122e0aa 100644
--- a/Externals/wxWidgets3/src/msw/ole/oleutils.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/oleutils.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.02.98
-// RCS-ID:      $Id: oleutils.cpp 70093 2011-12-22 19:08:43Z SJL $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,6 +47,7 @@
 #endif
 
 #include  "wx/msw/ole/oleutils.h"
+#include "wx/msw/ole/safearray.h"
 
 #if defined(__VISUALC__) && (__VISUALC__ > 1000)
     #include  <docobj.h>
@@ -131,6 +131,155 @@ wxBasicString::~wxBasicString()
 
 #if wxUSE_VARIANT
 
+// ----------------------------------------------------------------------------
+// wxVariantDataCurrency
+// ----------------------------------------------------------------------------
+
+
+#if wxUSE_ANY
+
+bool wxVariantDataCurrency::GetAsAny(wxAny* any) const
+{
+    *any = m_value;
+    return true;
+}
+
+wxVariantData* wxVariantDataCurrency::VariantDataFactory(const wxAny& any)
+{
+    return new wxVariantDataCurrency(wxANY_AS(any, CURRENCY));
+}
+
+REGISTER_WXANY_CONVERSION(CURRENCY, wxVariantDataCurrency)
+
+#endif // wxUSE_ANY
+
+bool wxVariantDataCurrency::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxS("currency")),
+                  "wxVariantDataCurrency::Eq: argument mismatch" );
+
+    wxVariantDataCurrency& otherData = (wxVariantDataCurrency&) data;
+
+    return otherData.m_value.int64 == m_value.int64;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataCurrency::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << s;
+    return true;
+}
+#endif
+
+bool wxVariantDataCurrency::Write(wxString& str) const
+{
+    BSTR bStr = NULL;
+    if ( SUCCEEDED(VarBstrFromCy(m_value, LOCALE_USER_DEFAULT, 0, &bStr)) )
+    {
+        str = wxConvertStringFromOle(bStr);
+        SysFreeString(bStr);
+        return true;
+    }
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataErrorCode
+// ----------------------------------------------------------------------------
+
+#if wxUSE_ANY
+
+bool wxVariantDataErrorCode::GetAsAny(wxAny* any) const
+{
+    *any = m_value;
+    return true;
+}
+
+wxVariantData* wxVariantDataErrorCode::VariantDataFactory(const wxAny& any)
+{
+    return new wxVariantDataErrorCode(wxANY_AS(any, SCODE));
+}
+
+REGISTER_WXANY_CONVERSION(SCODE, wxVariantDataErrorCode)
+
+#endif // wxUSE_ANY
+
+bool wxVariantDataErrorCode::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxS("errorcode")),
+                  "wxVariantDataErrorCode::Eq: argument mismatch" );
+
+    wxVariantDataErrorCode& otherData = (wxVariantDataErrorCode&) data;
+
+    return otherData.m_value == m_value;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataErrorCode::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << s;
+    return true;
+}
+#endif
+
+bool wxVariantDataErrorCode::Write(wxString& str) const
+{
+    str << m_value;
+    return true;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxVariantDataSafeArray
+// ----------------------------------------------------------------------------
+
+#if wxUSE_ANY
+
+bool wxVariantDataSafeArray::GetAsAny(wxAny* any) const
+{
+    *any = m_value;
+    return true;
+}
+
+wxVariantData* wxVariantDataSafeArray::VariantDataFactory(const wxAny& any)
+{
+    return new wxVariantDataSafeArray(wxANY_AS(any, SAFEARRAY*));
+}
+
+REGISTER_WXANY_CONVERSION(SAFEARRAY*, wxVariantDataSafeArray)
+
+#endif // wxUSE_ANY
+
+bool wxVariantDataSafeArray::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxS("safearray")),
+                  "wxVariantDataSafeArray::Eq: argument mismatch" );
+
+    wxVariantDataSafeArray& otherData = (wxVariantDataSafeArray&) data;
+
+    return otherData.m_value == m_value;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataSafeArray::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << s;
+    return true;
+}
+#endif
+
+bool wxVariantDataSafeArray::Write(wxString& str) const
+{
+    str.Printf(wxS("SAFEARRAY: %p"), (void*)m_value);
+    return true;
+}
+
 WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 {
     VariantInit(&oleVariant);
@@ -142,12 +291,59 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
 
     wxString type(variant.GetType());
 
+    if (type == wxT("errorcode"))
+    {
+        wxVariantDataErrorCode* const
+            ec = wxStaticCastVariantData(variant.GetData(),
+                                         wxVariantDataErrorCode);
+        oleVariant.vt = VT_ERROR;
+        oleVariant.scode = ec->GetValue();
+    }
+    else if (type == wxT("currency"))
+    {
+        wxVariantDataCurrency* const
+            c = wxStaticCastVariantData(variant.GetData(),
+                                        wxVariantDataCurrency);
+        oleVariant.vt = VT_CY;
+        oleVariant.cyVal = c->GetValue();
+    }
+    else if (type == wxT("safearray"))
+    {
+        wxVariantDataSafeArray* const
+            vsa = wxStaticCastVariantData(variant.GetData(),
+                                          wxVariantDataSafeArray);
+        SAFEARRAY* psa = vsa->GetValue();
+        VARTYPE vt;
 
-    if (type == wxT("long"))
+        wxCHECK(psa, false);
+        HRESULT hr = SafeArrayGetVartype(psa, &vt);
+        if ( FAILED(hr) )
+        {
+            wxLogApiError(wxS("SafeArrayGetVartype()"), hr);
+            SafeArrayDestroy(psa);
+            return false;
+        }
+        oleVariant.vt = vt | VT_ARRAY;
+        oleVariant.parray = psa;
+    }
+    else if (type == wxT("long"))
     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
+    // Original VC6 came with SDK too old to contain VARIANT::llVal declaration
+    // and there doesn't seem to be any way to test for it as Microsoft simply
+    // added it to the later version of oaidl.h without changing anything else.
+    // So assume it's not present for VC6, even though it might be if an
+    // updated SDK is used. In this case the user would need to disable this
+    // check himself.
+#if wxUSE_LONGLONG && !defined(__VISUALC6__)
+    else if (type == wxT("longlong"))
+    {
+        oleVariant.vt = VT_I8;
+        oleVariant.llVal = variant.GetLongLong().GetValue();
+    }
+#endif
     else if (type == wxT("char"))
     {
         oleVariant.vt=VT_I1;            // Signed Char
@@ -186,51 +382,24 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
         oleVariant.vt = VT_DISPATCH;
         oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
     }
-    else if (type == wxT("list") || type == wxT("stringlist"))
+    else if (type == wxT("list"))
     {
-        oleVariant.vt = VT_VARIANT | VT_ARRAY;
-
-        SAFEARRAY *psa;
-        SAFEARRAYBOUND saBound;
-        VARIANTARG *pvargBase;
-        VARIANTARG *pvarg;
-        int i, j;
-
-        int iCount = variant.GetCount();
-
-        saBound.lLbound = 0;
-        saBound.cElements = iCount;
-
-        psa = SafeArrayCreate(VT_VARIANT, 1, &saBound);
-        if (psa == NULL)
+        wxSafeArray<VT_VARIANT> safeArray;
+        if (!safeArray.CreateFromListVariant(variant))
             return false;
 
-        SafeArrayAccessData(psa, (void**)&pvargBase);
+        oleVariant.vt = VT_VARIANT | VT_ARRAY;
+        oleVariant.parray = safeArray.Detach();
+    }
+    else if (type == wxT("arrstring"))
+    {
+        wxSafeArray<VT_BSTR> safeArray;
 
-        pvarg = pvargBase;
-        for (i = 0; i < iCount; i++)
-        {
-            // copy each string in the list of strings
-            wxVariant eachVariant(variant[i]);
-            if (!wxConvertVariantToOle(eachVariant, * pvarg))
-            {
-                // memory failure:  back out and free strings alloc'ed up to
-                // now, and then the array itself.
-                pvarg = pvargBase;
-                for (j = 0; j < i; j++)
-                {
-                    SysFreeString(pvarg->bstrVal);
-                    pvarg++;
-                }
-                SafeArrayDestroy(psa);
-                return false;
-            }
-            pvarg++;
-        }
+        if (!safeArray.CreateFromArrayString(variant.GetArrayString()))
+            return false;
 
-        SafeArrayUnaccessData(psa);
-
-        oleVariant.parray = psa;
+        oleVariant.vt = VT_BSTR | VT_ARRAY;
+        oleVariant.parray = safeArray.Detach();
     }
     else
     {
@@ -245,68 +414,54 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
 #endif
 
 WXDLLEXPORT bool
-wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
+wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant, long flags)
 {
     bool ok = true;
     if ( oleVariant.vt & VT_ARRAY )
     {
-
-        // Compute the total number of elements in all array dimensions
-        int cElements = 1;
-        for ( int cDims = 0; cDims < oleVariant.parray->cDims; cDims++ )
-            cElements *= oleVariant.parray->rgsabound[cDims].cElements;
-
-        // Get a pointer to the data
-        void* pvdata;
-        HRESULT hr = SafeArrayAccessData(oleVariant.parray, &pvdata);
-        if ( FAILED(hr) )
-            return false;
-
-        switch (oleVariant.vt & VT_TYPEMASK)
+        if ( flags & wxOleConvertVariant_ReturnSafeArrays  )
         {
-            case VT_VARIANT:
-                {
-                    variant.ClearList();
-                    VARIANTARG *variant_data=(VARIANTARG*)pvdata;
-                    for ( int i = 0; i < cElements; i++ )
+            variant.SetData(new wxVariantDataSafeArray(oleVariant.parray));
+        }
+        else
+        {
+            switch (oleVariant.vt & VT_TYPEMASK)
+            {
+                case VT_I2:
+                    ok = wxSafeArray<VT_I2>::ConvertToVariant(oleVariant.parray, variant);
+                    break;
+                case VT_I4:
+                    ok = wxSafeArray<VT_I4>::ConvertToVariant(oleVariant.parray, variant);
+                    break;
+                case VT_R4:
+                    ok = wxSafeArray<VT_R4>::ConvertToVariant(oleVariant.parray, variant);
+                    break;
+                case VT_R8:
+                    ok = wxSafeArray<VT_R8>::ConvertToVariant(oleVariant.parray, variant);
+                    break;
+                case VT_VARIANT:
+                    ok = wxSafeArray<VT_VARIANT>::ConvertToVariant(oleVariant.parray, variant);
+                    break;
+                case VT_BSTR:
                     {
-                        VARIANTARG& oleElement = variant_data[i];
-                        wxVariant vElement;
-                        if ( !wxConvertOleToVariant(oleElement, vElement) )
-                        {
+                        wxArrayString strings;
+                        if ( wxSafeArray<VT_BSTR>::ConvertToArrayString(oleVariant.parray, strings) )
+                            variant = strings;
+                        else
                             ok = false;
-                            variant.ClearList();
-                            break;
-                        }
-
-                        variant.Append(vElement);
                     }
-                }
-                break;
-
-            case VT_BSTR:
-                {
-                    wxArrayString strings;
-                    BSTR *string_val=(BSTR*)pvdata;
-                    for ( int i = 0; i < cElements; ++i )
-                    {
-                        wxString str=wxConvertStringFromOle(*string_val);
-                        strings.Add(str);
-                        ++string_val;
-                    }
-                    variant=strings;
-                }
-                break;
-
-            default:
+                    break;
+                default:
+                    ok = false;
+                    break;
+            }
+            if ( !ok )
+            {
                 wxLogDebug(wxT("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
                            oleVariant.vt & VT_TYPEMASK);
                 variant = wxVariant();
-                ok = false;
-                break;
+            }
         }
-
-        SafeArrayUnaccessData(oleVariant.parray);
     }
     else if ( oleVariant.vt & VT_BYREF )
     {
@@ -330,6 +485,14 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
     {
         switch ( oleVariant.vt & VT_TYPEMASK )
         {
+            case VT_ERROR:
+                variant.SetData(new wxVariantDataErrorCode(oleVariant.scode));
+                break;
+
+            case VT_CY:
+                variant.SetData(new wxVariantDataCurrency(oleVariant.cyVal));
+                break;
+
             case VT_BSTR:
                 {
                     wxString str(wxConvertStringFromOle(oleVariant.bstrVal));
@@ -350,6 +513,13 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 #endif // wxUSE_DATETIME
                 break;
 
+                // See the comment before the __VISUALC6__ test above.
+#if wxUSE_LONGLONG && !defined(__VISUALC6__)
+            case VT_I8:
+                variant = wxLongLong(oleVariant.llVal);
+                break;
+#endif // wxUSE_LONGLONG
+
             case VT_I4:
                 variant = (long) oleVariant.lVal;
                 break;
@@ -400,7 +570,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
 #if wxUSE_DATAOBJ
 
-#if wxDEBUG_LEVEL && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
+#if wxDEBUG_LEVEL && (( defined(__VISUALC__) && (__VISUALC__ > 1000) ))
 static wxString GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
@@ -417,7 +587,7 @@ static wxString GetIidName(REFIID riid)
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
-#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__)
+#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) )
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),
diff --git a/Externals/wxWidgets3/src/msw/ole/safearray.cpp b/Externals/wxWidgets3/src/msw/ole/safearray.cpp
new file mode 100644
index 0000000000..db62ad2fd9
--- /dev/null
+++ b/Externals/wxWidgets3/src/msw/ole/safearray.cpp
@@ -0,0 +1,135 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        msw/ole/safearray.cpp
+// Purpose:     Implementation of wxSafeArrayBase class.
+// Author:      PB
+// Created:     2012-09-23
+// Copyright:   (c) 2012 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_OLE && wxUSE_VARIANT
+
+#ifndef WX_PRECOMP
+    #include "wx/variant.h"
+#endif // WX_PRECOMP
+
+#include "wx/msw/ole/safearray.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSafeArrayBase
+// ----------------------------------------------------------------------------
+
+void wxSafeArrayBase::Destroy()
+{
+    if ( m_array )
+    {
+        Unlock();
+        HRESULT hr = SafeArrayDestroy(m_array);
+        if ( FAILED(hr) )
+        {
+            wxLogApiError(wxS("SafeArrayDestroy()"), hr);
+        }
+        m_array = NULL;
+    }
+}
+
+SAFEARRAY* wxSafeArrayBase::Detach()
+{
+    wxCHECK_MSG( m_array, NULL, wxS("Uninitialized safe array") );
+
+    Unlock();
+    SAFEARRAY* array = m_array;
+    m_array = NULL;
+    return array;
+}
+
+size_t wxSafeArrayBase::GetDim() const
+{
+    wxASSERT( m_array );
+
+    return SafeArrayGetDim(m_array);
+}
+
+bool wxSafeArrayBase::GetLBound(size_t dim, long& bound) const
+{
+    wxCHECK_MSG( m_array, false, wxS("Uninitialized safe array") );
+    wxCHECK_MSG( dim > 0, false, wxS("Invalid dimension index") );
+
+    HRESULT hr = SafeArrayGetLBound(m_array, dim, &bound);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("SafeArrayGetLBound()"), hr);
+        return false;
+    }
+    return true;
+}
+
+bool wxSafeArrayBase::GetUBound(size_t dim, long& bound) const
+{
+    wxCHECK_MSG( m_array, false, wxS("Uninitialized safe array") );
+    wxCHECK_MSG( dim > 0, false, wxS("Invalid dimension index") );
+
+    HRESULT hr = SafeArrayGetUBound(m_array, dim, &bound);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("SafeArrayGetUBound()"), hr);
+        return false;
+    }
+    return true;
+}
+
+size_t wxSafeArrayBase::GetCount(size_t dim) const
+{
+    long lBound, uBound;
+
+    if ( GetLBound(dim, lBound) && GetUBound(dim, uBound) )
+        return uBound - lBound + 1;
+    return 0;
+}
+
+bool wxSafeArrayBase::Lock()
+{
+    wxCHECK_MSG( m_array, false, wxS("Uninitialized safe array") );
+
+    HRESULT hr = SafeArrayLock(m_array);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("SafeArrayLock()"), hr);
+        return false;
+    }
+    return true;
+}
+
+bool wxSafeArrayBase::Unlock()
+{
+    wxCHECK_MSG( m_array, false, wxS("Uninitialized safe array") );
+
+    HRESULT hr = SafeArrayUnlock(m_array);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(wxS("SafeArrayUnlock()"), hr);
+        return false;
+    }
+    return true;
+}
+
+#endif  // wxUSE_OLE && wxUSE_VARIANT
diff --git a/Externals/wxWidgets3/src/msw/ole/uuid.cpp b/Externals/wxWidgets3/src/msw/ole/uuid.cpp
index 888d796674..3bafbba898 100644
--- a/Externals/wxWidgets3/src/msw/ole/uuid.cpp
+++ b/Externals/wxWidgets3/src/msw/ole/uuid.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.96
-// RCS-ID:      $Id: uuid.cpp 59725 2009-03-22 12:53:48Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -86,7 +85,7 @@ bool Uuid::operator==(const Uuid& uuid) const
 {
     // IsEqualGUID() returns BOOL and not bool so use an explicit comparison to
     // avoid MSVC warnings about int->bool conversion
-    return IsEqualGUID(m_uuid, uuid.m_uuid) == TRUE;
+    return IsEqualGUID(m_uuid, uuid.m_uuid) != 0;
 }
 
 // dtor
diff --git a/Externals/wxWidgets3/src/msw/ownerdrw.cpp b/Externals/wxWidgets3/src/msw/ownerdrw.cpp
index 2c520cb3b9..de70ac8588 100644
--- a/Externals/wxWidgets3/src/msw/ownerdrw.cpp
+++ b/Externals/wxWidgets3/src/msw/ownerdrw.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Malich
 // Created:     13.11.97
-// RCS-ID:      $Id: ownerdrw.cpp 63274 2010-01-26 12:33:01Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,7 +89,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc,
         int cx = rc.GetWidth() - GetMarginWidth();
         int cy = sizeRect.cy;
 
-        ::DrawState(hdc, NULL, NULL, (LPARAM)text.wx_str(),
+        ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(text),
                     text.length(), x, y, cx, cy, flags);
 
     } // reset to default the font, colors and brush
diff --git a/Externals/wxWidgets3/src/msw/palette.cpp b/Externals/wxWidgets3/src/msw/palette.cpp
index b9b8891e0f..faa896b019 100644
--- a/Externals/wxWidgets3/src/msw/palette.cpp
+++ b/Externals/wxWidgets3/src/msw/palette.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: palette.cpp 70040 2011-12-17 23:52:47Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/panel.cpp b/Externals/wxWidgets3/src/msw/panel.cpp
index 51eb5d394d..fc7cfa5bb1 100644
--- a/Externals/wxWidgets3/src/msw/panel.cpp
+++ b/Externals/wxWidgets3/src/msw/panel.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
-// RCS-ID:      $Id: panel.cpp 69378 2011-10-11 17:07:43Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/pen.cpp b/Externals/wxWidgets3/src/msw/pen.cpp
index 1d0da44ee2..87eb674613 100644
--- a/Externals/wxWidgets3/src/msw/pen.cpp
+++ b/Externals/wxWidgets3/src/msw/pen.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin: refactored wxPen code to wxPenRefData
 // Created:     04/01/98
-// RCS-ID:      $Id: pen.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/penwin.cpp b/Externals/wxWidgets3/src/msw/penwin.cpp
index a04f66054c..399e8c0046 100644
--- a/Externals/wxWidgets3/src/msw/penwin.cpp
+++ b/Externals/wxWidgets3/src/msw/penwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: penwin.cpp 37162 2006-01-26 16:50:23Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/popupwin.cpp b/Externals/wxWidgets3/src/msw/popupwin.cpp
index a1a3afe513..fbcf9961e6 100644
--- a/Externals/wxWidgets3/src/msw/popupwin.cpp
+++ b/Externals/wxWidgets3/src/msw/popupwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.05.02
-// RCS-ID:      $Id: popupwin.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,6 +89,15 @@ WXHWND wxPopupWindow::MSWGetParent() const
 #endif
 }
 
+void wxPopupWindow::SetFocus()
+{
+    // Focusing on a popup window does not work on MSW unless WS_POPUP style is
+    // set (which is never the case currently, see the note in MSWGetParent()).
+    // We do not even want to try to set the focus, as it returns an error from
+    // SetFocus() on recent Windows versions (since Vista) and the resulting
+    // debug message is annoying.
+}
+
 bool wxPopupWindow::Show(bool show)
 {
     if ( !wxWindowMSW::Show(show) )
diff --git a/Externals/wxWidgets3/src/msw/power.cpp b/Externals/wxWidgets3/src/msw/power.cpp
index 3c3bcd2007..fa74db73aa 100644
--- a/Externals/wxWidgets3/src/msw/power.cpp
+++ b/Externals/wxWidgets3/src/msw/power.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// RCS-ID:      $Id: power.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/printdlg.cpp b/Externals/wxWidgets3/src/msw/printdlg.cpp
index 5e1cdbde6f..63826efb51 100644
--- a/Externals/wxWidgets3/src/msw/printdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/printdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: printdlg.cpp 70516 2012-02-05 15:45:03Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,6 +38,7 @@
 #include "wx/msw/printdlg.h"
 #include "wx/msw/dcprint.h"
 #include "wx/paper.h"
+#include "wx/modalhook.h"
 
 #include <stdlib.h>
 
@@ -65,7 +65,7 @@ public:
     BOOL Open( const wxString& printerName, LPPRINTER_DEFAULTS pDefault=(LPPRINTER_DEFAULTS)NULL )
     {
         Close();
-        return OpenPrinter( (LPTSTR)printerName.wx_str(), &m_hPrinter, pDefault );
+        return OpenPrinter( wxMSW_CONV_LPTSTR(printerName), &m_hPrinter, pDefault );
     }
 
     BOOL Close()
@@ -391,11 +391,11 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
     if (m_devMode)
         return;
 
-    LPTSTR szPrinterName = (LPTSTR)printerName.wx_str();
+    LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(printerName);
 
     // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function
     // The purpose of this is to fill the DEVMODE with privdata from printer driver.
-    // If we have a printer name and OpenPrinter sucessfully returns
+    // If we have a printer name and OpenPrinter successfully returns
     // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer.
     if ( !m_devMode && !printerName.IsEmpty() )
     {
@@ -494,7 +494,7 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
 bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 {
     WinPrinter printer;
-    LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
+    LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(data.GetPrinterName());
 
     if (!m_devMode)
         InitializeDevMode(data.GetPrinterName(), &printer);
@@ -524,7 +524,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
             // NB: the cast is needed in the ANSI build, strangely enough
             //     dmDeviceName is BYTE[] and not char[] there
             wxStrlcpy(reinterpret_cast<wxChar *>(devMode->dmDeviceName),
-                      name.wx_str(),
+                      name.t_str(),
                       WXSIZEOF(devMode->dmDeviceName));
         }
 
@@ -738,6 +738,8 @@ wxWindowsPrintDialog::~wxWindowsPrintDialog()
 
 int wxWindowsPrintDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
@@ -957,6 +959,8 @@ wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog()
 
 int wxWindowsPageSetupDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     ConvertToNative( m_pageSetupData );
 
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
diff --git a/Externals/wxWidgets3/src/msw/printwin.cpp b/Externals/wxWidgets3/src/msw/printwin.cpp
index 160ed572f7..6929bbfe39 100644
--- a/Externals/wxWidgets3/src/msw/printwin.cpp
+++ b/Externals/wxWidgets3/src/msw/printwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: printwin.cpp 66813 2011-01-29 13:55:40Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -167,7 +166,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 
-    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
@@ -196,10 +195,15 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         maxPageNum = m_printDialogData.GetToPage();
     }
 
-    int copyCount;
-    for ( copyCount = 1;
-          copyCount <= m_printDialogData.GetNoCopies();
-          copyCount++ )
+    // The dc we get from the PrintDialog will do multiple copies without help
+    // if the device supports it. Loop only if we have created a dc from our
+    // own m_printDialogData or the device does not support multiple copies.
+    // m_printDialogData.GetPrintData().GetNoCopies() is set from device
+    // devMode in printdlg.cpp/wxWindowsPrintDialog::ConvertFromNative()
+    const int maxCopyCount = !prompt ||
+                             !m_printDialogData.GetPrintData().GetNoCopies()
+                             ? m_printDialogData.GetNoCopies() : 1;
+    for ( int copyCount = 1; copyCount <= maxCopyCount; copyCount++ )
     {
         if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
         {
@@ -219,6 +223,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
               pn <= maxPageNum && printout->HasPage(pn);
               pn++ )
         {
+            win->SetProgress(pn - minPageNum + 1,
+                             maxPageNum - minPageNum + 1,
+                             copyCount, maxCopyCount);
+
             if ( sm_abortIt )
             {
                 sm_lastError = wxPRINTER_CANCELLED;
diff --git a/Externals/wxWidgets3/src/msw/progdlg.cpp b/Externals/wxWidgets3/src/msw/progdlg.cpp
index 6022e2470d..3f9adea6e8 100644
--- a/Externals/wxWidgets3/src/msw/progdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/progdlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxProgressDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-22
-// RCS-ID:      $Id: progdlg.cpp 70512 2012-02-05 14:18:25Z VZ $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -170,7 +169,7 @@ BOOL CALLBACK DisplayCloseButton(HWND hwnd, LPARAM lParam)
     {
         sharedData->m_labelCancel = _("Close");
         SendMessage( hwnd, WM_SETTEXT, 0,
-                     (LPARAM) sharedData->m_labelCancel.wx_str() );
+                     wxMSW_CONV_LPARAM(sharedData->m_labelCancel) );
 
         return FALSE;
     }
@@ -212,7 +211,7 @@ void PerformNotificationUpdates(HWND hwnd,
     }
 
     if ( sharedData->m_notifications & wxSPDD_TITLE_CHANGED )
-        ::SetWindowText( hwnd, sharedData->m_title.wx_str() );
+        ::SetWindowText( hwnd, sharedData->m_title.t_str() );
 
     if ( sharedData->m_notifications & wxSPDD_MESSAGE_CHANGED )
     {
@@ -245,12 +244,12 @@ void PerformNotificationUpdates(HWND hwnd,
         ::SendMessage( hwnd,
                        TDM_SET_ELEMENT_TEXT,
                        TDE_MAIN_INSTRUCTION,
-                       (LPARAM) title.wx_str() );
+                       wxMSW_CONV_LPARAM(title) );
 
         ::SendMessage( hwnd,
                        TDM_SET_ELEMENT_TEXT,
                        TDE_CONTENT,
-                       (LPARAM) body.wx_str() );
+                       wxMSW_CONV_LPARAM(body) );
     }
 
     if ( sharedData->m_notifications & wxSPDD_EXPINFO_CHANGED )
@@ -262,7 +261,7 @@ void PerformNotificationUpdates(HWND hwnd,
             ::SendMessage( hwnd,
                            TDM_SET_ELEMENT_TEXT,
                            TDE_EXPANDED_INFORMATION,
-                           (LPARAM) expandedInformation.wx_str() );
+                           wxMSW_CONV_LPARAM(expandedInformation) );
         }
     }
 
@@ -806,7 +805,7 @@ void* wxProgressDialogTaskRunner::Entry()
         if ( !m_sharedData.m_expandedInformation.empty() )
         {
             tdc.pszExpandedInformation =
-                m_sharedData.m_expandedInformation.wx_str();
+                m_sharedData.m_expandedInformation.t_str();
         }
     }
 
diff --git a/Externals/wxWidgets3/src/msw/radiobox.cpp b/Externals/wxWidgets3/src/msw/radiobox.cpp
index 620dd5bd10..053da03797 100644
--- a/Externals/wxWidgets3/src/msw/radiobox.cpp
+++ b/Externals/wxWidgets3/src/msw/radiobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: radiobox.cpp 70498 2012-02-02 14:26:06Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ wxEND_FLAGS( wxRadioBoxStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent )
     wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
 wxEND_PROPERTIES_TABLE()
 
@@ -203,7 +202,7 @@ bool wxRadioBox::Create(wxWindow *parent,
         wxWindowIDRef subid = NewControlId();
 
         HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
-                                      choices[i].wx_str(),
+                                      choices[i].t_str(),
                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
                                       GetHwndOf(parent),
@@ -256,6 +255,12 @@ bool wxRadioBox::Create(wxWindow *parent,
     const wxSize actualSize = GetSize();
     PositionAllButtons(pos.x, pos.y, actualSize.x, actualSize.y);
 
+    // The base wxStaticBox class never accepts focus, but we do because giving
+    // focus to a wxRadioBox actually gives it to one of its buttons, which are
+    // not visible at wx level and hence are not taken into account by the
+    // logic in wxControlContainer code.
+    m_container.EnableSelfFocus();
+
     return true;
 }
 
@@ -377,7 +382,7 @@ void wxRadioBox::Command(wxCommandEvent & event)
 
 void wxRadioBox::SendNotificationEvent()
 {
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+    wxCommandEvent event(wxEVT_RADIOBOX, m_windowId);
     event.SetInt( m_selectedButton );
     event.SetString(GetString(m_selectedButton));
     event.SetEventObject( this );
@@ -438,6 +443,25 @@ void wxRadioBox::SetFocus()
     }
 }
 
+bool wxRadioBox::CanBeFocused() const
+{
+    // If the control itself is hidden or disabled, no need to check anything
+    // else.
+    if ( !wxStaticBox::CanBeFocused() )
+        return false;
+
+    // Otherwise, check if we have any buttons that can be focused.
+    for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
+    {
+        if ( IsItemEnabled(item) && IsItemShown(item) )
+            return true;
+    }
+
+    // We didn't find any items that can accept focus, so neither can we as a
+    // whole accept it.
+    return false;
+}
+
 // Enable a specific button
 bool wxRadioBox::Enable(unsigned int item, bool enable)
 {
@@ -498,7 +522,7 @@ void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
     // we have already checked for the item to be valid in wxRadioBoxBase
     const HWND hwndRbtn = (*m_radioButtons)[item];
     if ( tooltip != NULL )
-        tooltip->Add(hwndRbtn);
+        tooltip->AddOtherWindow(hwndRbtn);
     else // unset the tooltip
         wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
         // the second parameter can be zero since it's ignored by Remove()
diff --git a/Externals/wxWidgets3/src/msw/radiobut.cpp b/Externals/wxWidgets3/src/msw/radiobut.cpp
index f3192349c3..17323a9c1f 100644
--- a/Externals/wxWidgets3/src/msw/radiobut.cpp
+++ b/Externals/wxWidgets3/src/msw/radiobut.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: radiobut.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -61,25 +60,10 @@ bool wxRadioButton::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
-    long msStyle = WS_TABSTOP;
-    if ( HasFlag(wxRB_GROUP) )
-        msStyle |= WS_GROUP;
+    WXDWORD exstyle = 0;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
 
-    // we use BS_RADIOBUTTON and not BS_AUTORADIOBUTTON because the use of the
-    // latter can easily result in the application entering an infinite loop
-    // inside IsDialogMessage()
-    //
-    // we used to use BS_RADIOBUTTON only for wxRB_SINGLE buttons but there
-    // doesn't seem to be any harm to always use it and it prevents some hangs,
-    // see #9786
-    msStyle |= BS_RADIOBUTTON;
-
-    if ( HasFlag(wxCLIP_SIBLINGS) )
-        msStyle |= WS_CLIPSIBLINGS;
-    if ( HasFlag(wxALIGN_RIGHT) )
-        msStyle |= BS_LEFTTEXT | BS_RIGHT;
-
-    if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0) )
+    if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle) )
         return false;
 
     // for compatibility with wxGTK, the first radio button in a group is
@@ -232,7 +216,7 @@ bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         // and not BS_AUTORADIOBUTTON
         SetValue(true);
 
-        wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
+        wxCommandEvent event(wxEVT_RADIOBUTTON, GetId());
         event.SetEventObject( this );
         event.SetInt(true); // always checked
 
@@ -289,12 +273,27 @@ wxSize wxRadioButton::DoGetBestSize() const
 
 WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
-    WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle);
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
-    if ( style & wxRB_GROUP )
-        styleMSW |= WS_GROUP;
+    if ( HasFlag(wxRB_GROUP) )
+        msStyle |= WS_GROUP;
 
-    return styleMSW;
+    // we use BS_RADIOBUTTON and not BS_AUTORADIOBUTTON because the use of the
+    // latter can easily result in the application entering an infinite loop
+    // inside IsDialogMessage()
+    //
+    // we used to use BS_RADIOBUTTON only for wxRB_SINGLE buttons but there
+    // doesn't seem to be any harm to always use it and it prevents some hangs,
+    // see #9786
+    msStyle |= BS_RADIOBUTTON;
+
+    if ( style & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+    if ( style & wxALIGN_RIGHT )
+        msStyle |= BS_LEFTTEXT | BS_RIGHT;
+
+
+    return msStyle;
 }
 
 #endif // wxUSE_RADIOBTN
diff --git a/Externals/wxWidgets3/src/msw/regconf.cpp b/Externals/wxWidgets3/src/msw/regconf.cpp
index 44db08657c..3cfe6583b7 100644
--- a/Externals/wxWidgets3/src/msw/regconf.cpp
+++ b/Externals/wxWidgets3/src/msw/regconf.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.04.98
-// RCS-ID:      $Id: regconf.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -79,7 +78,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
 
   // the convention is to put the programs keys under <vendor>\<appname>
-  // (but it can be overridden by specifying the pathes explicitly in strLocal
+  // (but it can be overridden by specifying the paths explicitly in strLocal
   // and/or strGlobal)
   if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
   {
diff --git a/Externals/wxWidgets3/src/msw/region.cpp b/Externals/wxWidgets3/src/msw/region.cpp
index 8c31c1e426..846fff1e85 100644
--- a/Externals/wxWidgets3/src/msw/region.cpp
+++ b/Externals/wxWidgets3/src/msw/region.cpp
@@ -4,7 +4,6 @@
 // Author:    Vadim Zeitlin
 // Modified by:
 // Created:   Fri Oct 24 10:46:34 MET 1997
-// RCS-ID:    $Id: region.cpp 70017 2011-12-16 19:47:55Z VZ $
 // Copyright: (c) 1997-2002 wxWidgets team
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -165,8 +164,7 @@ void wxRegion::Clear()
 
 bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {
-    const HRGN hrgn = GetHrgn();
-    wxCHECK_MSG( hrgn, false, wxT("invalid wxRegion") );
+    wxCHECK_MSG( GetHrgn(), false, wxT("invalid wxRegion") );
 
     if ( !x && !y )
     {
@@ -176,7 +174,7 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 
     AllocExclusive();
 
-    if ( ::OffsetRgn(hrgn, x, y) == ERROR )
+    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
     {
         wxLogLastError(wxT("OffsetRgn"));
 
diff --git a/Externals/wxWidgets3/src/msw/registry.cpp b/Externals/wxWidgets3/src/msw/registry.cpp
index 8a2edcb6fa..e67bed9375 100644
--- a/Externals/wxWidgets3/src/msw/registry.cpp
+++ b/Externals/wxWidgets3/src/msw/registry.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id: registry.cpp 70750 2012-02-29 13:58:58Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 // TODO:        - parsing of registry key names
@@ -33,10 +32,10 @@
 #include "wx/dynlib.h"
 #include "wx/file.h"
 #include "wx/wfstream.h"
+#include "wx/msw/private.h"
 
 // Windows headers
 #ifdef __WXWINCE__
-#include "wx/msw/private.h"
 #include <winbase.h>
 #include <winreg.h>
 #endif
@@ -1057,7 +1056,7 @@ bool wxRegKey::SetValue(const wxString& szValue, const wxString& strValue)
       m_dwLastError = RegSetValueEx((HKEY) m_hKey,
                                     RegValueStr(szValue),
                                     (DWORD) RESERVED, REG_SZ,
-                                    (RegString)strValue.t_str(),
+                                    (RegString)wxMSW_CONV_LPCTSTR(strValue),
                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return true;
diff --git a/Externals/wxWidgets3/src/msw/renderer.cpp b/Externals/wxWidgets3/src/msw/renderer.cpp
index 7436548592..81d205e81c 100644
--- a/Externals/wxWidgets3/src/msw/renderer.cpp
+++ b/Externals/wxWidgets3/src/msw/renderer.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderer.cpp 68951 2011-08-29 16:06:32Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -134,6 +133,26 @@ public:
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
+
+    void DrawChoice(wxWindow* win,
+                     wxDC& dc,
+                     const wxRect& rect,
+                     int flags = 0);
+
+    void DrawComboBox(wxWindow* win,
+                       wxDC& dc,
+                       const wxRect& rect,
+                       int flags = 0);
+
+    virtual void DrawComboBoxDropButton(wxWindow *win,
+                                         wxDC& dc,
+                                         const wxRect& rect,
+                                         int flags = 0) = 0;
+
+    virtual void DrawTextCtrl(wxWindow* win,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               int flags = 0) = 0;
 };
 
 // ----------------------------------------------------------------------------
@@ -165,16 +184,6 @@ public:
                                 const wxRect& rect,
                                 int flags = 0);
 
-    virtual void DrawChoice(wxWindow* win,
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags = 0);
-
-    virtual void DrawComboBox(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0);
-
     virtual void DrawTextCtrl(wxWindow* win,
                               wxDC& dc,
                               const wxRect& rect,
@@ -279,6 +288,11 @@ public:
             m_rendererNative.DrawPushButton(win, dc, rect, flags);
     }
 
+    virtual void DrawTextCtrl(wxWindow* win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags = 0);
+
     virtual void DrawRadioBitmap(wxWindow *win,
                                  wxDC& dc,
                                  const wxRect& rect,
@@ -364,6 +378,31 @@ void wxRendererMSWBase::DrawItemSelectionRect(wxWindow *win,
         DrawFocusRect( win, dc, rect, flags );
 }
 
+void wxRendererMSWBase::DrawChoice(wxWindow* win,
+                                   wxDC& dc,
+                                   const wxRect& rect,
+                                   int flags)
+{
+    DrawComboBox(win, dc, rect, flags);
+}
+
+void wxRendererMSWBase::DrawComboBox(wxWindow* win,
+                                     wxDC& dc,
+                                     const wxRect& rect,
+                                     int flags)
+{
+    // Draw the main part of the control same as TextCtrl
+    DrawTextCtrl(win, dc, rect, flags);
+
+    // Draw the button inside the border, on the right side
+    wxRect br(rect);
+    br.height -= 2;
+    br.x += br.width - br.height - 1;
+    br.width = br.height;
+    br.y += 1;
+
+    DrawComboBoxDropButton(win, dc, br, flags);
+}
 
 // ============================================================================
 // wxRendererNative and wxRendererMSW implementation
@@ -539,66 +578,24 @@ int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
 }
 
 // Uses the theme to draw the border and fill for something like a wxTextCtrl
-void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+void wxRendererMSW::DrawTextCtrl(wxWindow* WXUNUSED(win),
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int WXUNUSED(flags))
 {
     wxColour fill;
     wxColour bdr;
-    COLORREF cref;
-
-#if wxUSE_UXTHEME
-    wxUxThemeHandle hTheme(win, L"EDIT");
-    if (hTheme)
-    {
-        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
-                                              ETS_NORMAL, TMT_FILLCOLOR, &cref);
-        fill = wxRGBToColour(cref);
-
-        int etsState;
-        if ( flags & wxCONTROL_DISABLED )
-            etsState = ETS_DISABLED;
-        else
-            etsState = ETS_NORMAL;
-
-        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
-                                              etsState, TMT_BORDERCOLOR, &cref);
-        bdr = wxRGBToColour(cref);
-    }
-    else
-#endif
     {
         fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
         bdr = *wxBLACK;
     }
 
-    dc.SetPen( bdr );
-    dc.SetBrush( fill );
+    dc.SetPen(bdr);
+    dc.SetBrush(fill);
     dc.DrawRectangle(rect);
 }
 
 
-// Draw the equivalent of a wxComboBox
-void wxRendererMSW::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
-{
-    // Draw the main part of the control same as TextCtrl
-    DrawTextCtrl(win, dc, rect, flags);
-
-    // Draw the button inside the border, on the right side
-    wxRect br(rect);
-    br.height -= 2;
-    br.x += br.width - br.height - 1;
-    br.width = br.height;
-    br.y += 1;
-
-    DrawComboBoxDropButton(win, dc, br, flags);
-}
-
-
-void wxRendererMSW::DrawChoice(wxWindow* win, wxDC& dc,
-                           const wxRect& rect, int flags)
-{
-    DrawComboBox(win, dc, rect, flags);
-}
-
 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================
@@ -855,6 +852,42 @@ wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
     DoDrawButtonLike(hTheme, part, dc, rect, flags);
 }
 
+// Uses the theme to draw the border and fill for something like a wxTextCtrl
+void wxRendererXP::DrawTextCtrl(wxWindow* win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags)
+{
+    wxUxThemeHandle hTheme(win, L"EDIT");
+    if ( !hTheme )
+    {
+        m_rendererNative.DrawTextCtrl(win,dc,rect,flags);
+        return;
+    }
+
+    wxColour fill;
+    wxColour bdr;
+    COLORREF cref;
+
+    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                          ETS_NORMAL, TMT_FILLCOLOR, &cref);
+    fill = wxRGBToColour(cref);
+
+    int etsState;
+    if ( flags & wxCONTROL_DISABLED )
+        etsState = ETS_DISABLED;
+    else
+        etsState = ETS_NORMAL;
+
+    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                              etsState, TMT_BORDERCOLOR, &cref);
+    bdr = wxRGBToColour(cref);
+
+    dc.SetPen( bdr );
+    dc.SetBrush( fill );
+    dc.DrawRectangle(rect);
+}
+
 // ----------------------------------------------------------------------------
 // splitter drawing
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/msw/richmsgdlg.cpp b/Externals/wxWidgets3/src/msw/richmsgdlg.cpp
index 5082c91eba..11ca12e0a2 100644
--- a/Externals/wxWidgets3/src/msw/richmsgdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/richmsgdlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxRichMessageDialog
 // Author:      Rickard Westerlund
 // Created:     2010-07-04
-// RCS-ID:      $Id: richmsgdlg.cpp 66613 2011-01-07 04:50:53Z PC $
 // Copyright:   (c) 2010 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,7 @@
 #if wxUSE_RICHMSGDLG
 
 #include "wx/richmsgdlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/private.h"
@@ -33,6 +33,8 @@
 
 int wxRichMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
 #ifdef wxHAS_MSW_TASKDIALOG
     using namespace wxMSWMessageDialog;
 
@@ -47,14 +49,14 @@ int wxRichMessageDialog::ShowModal()
         // add a checkbox
         if ( !m_checkBoxText.empty() )
         {
-            tdc.pszVerificationText = m_checkBoxText.wx_str();
+            tdc.pszVerificationText = m_checkBoxText.t_str();
             if ( m_checkBoxValue )
                 tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
         }
 
         // add collapsible footer
         if ( !m_detailedText.empty() )
-            tdc.pszExpandedInformation = m_detailedText.wx_str();
+            tdc.pszExpandedInformation = m_detailedText.t_str();
 
         TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
         if ( !taskDialogIndirect )
diff --git a/Externals/wxWidgets3/src/msw/richtooltip.cpp b/Externals/wxWidgets3/src/msw/richtooltip.cpp
index b0e4f35b73..f445251242 100644
--- a/Externals/wxWidgets3/src/msw/richtooltip.cpp
+++ b/Externals/wxWidgets3/src/msw/richtooltip.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Native MSW implementation of wxRichToolTip.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18
-// RCS-ID:      $Id: richtooltip.cpp 69488 2011-10-20 16:20:19Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,13 +122,15 @@ public:
         }
     }
 
-    virtual void SetTimeout(unsigned milliseconds)
+    virtual void SetTimeout(unsigned millisecondsTimeout,
+                            unsigned millisecondsDelay)
     {
-        // We don't support changing the timeout (maybe TTM_SETDELAYTIME could
-        // be used for this?).
+        // We don't support changing the timeout or the delay
+        // (maybe TTM_SETDELAYTIME could be used for this?).
         m_canUseNative = false;
 
-        wxRichToolTipGenericImpl::SetTimeout(milliseconds);
+        wxRichToolTipGenericImpl::SetTimeout(millisecondsTimeout,
+                                             millisecondsDelay);
     }
 
     virtual void SetTipKind(wxTipKind tipKind)
@@ -149,13 +150,13 @@ public:
         wxRichToolTipGenericImpl::SetTitleFont(font);
     }
 
-    virtual void ShowFor(wxWindow* win)
+    virtual void ShowFor(wxWindow* win, const wxRect* rect)
     {
         // TODO: We could use native tooltip control to show native balloon
         //       tooltips for any window but right now we use the simple
         //       EM_SHOWBALLOONTIP API which can only be used with text
         //       controls.
-        if ( m_canUseNative )
+        if ( m_canUseNative && !rect )
         {
             wxTextCtrl* const text = wxDynamicCast(win, wxTextCtrl);
             if ( text )
@@ -173,7 +174,7 @@ public:
         // Don't set m_canUseNative to false here, we could be able to use the
         // native tooltips if we're called for a different window the next
         // time.
-        wxRichToolTipGenericImpl::ShowFor(win);
+        wxRichToolTipGenericImpl::ShowFor(win, rect);
     }
 
 private:
diff --git a/Externals/wxWidgets3/src/msw/scrolbar.cpp b/Externals/wxWidgets3/src/msw/scrolbar.cpp
index 7306055e8c..eac7ec6e2c 100644
--- a/Externals/wxWidgets3/src/msw/scrolbar.cpp
+++ b/Externals/wxWidgets3/src/msw/scrolbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: scrolbar.cpp 70383 2012-01-18 10:05:27Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/settings.cpp b/Externals/wxWidgets3/src/msw/settings.cpp
index 89b0dc2d0a..e7bdac2156 100644
--- a/Externals/wxWidgets3/src/msw/settings.cpp
+++ b/Externals/wxWidgets3/src/msw/settings.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: settings.cpp 67018 2011-02-25 09:38:35Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/slider.cpp b/Externals/wxWidgets3/src/msw/slider.cpp
index 4d50da31c3..992497c498 100644
--- a/Externals/wxWidgets3/src/msw/slider.cpp
+++ b/Externals/wxWidgets3/src/msw/slider.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: slider.cpp 70314 2012-01-10 17:09:11Z DS $
 // Copyright:   (c) Julian Smart 1998
 //                  Vadim Zeitlin 2004
 // Licence:     wxWindows licence
@@ -310,7 +309,7 @@ bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
     event.SetEventObject( this );
     HandleWindowEvent(event);
 
-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    wxCommandEvent cevent( wxEVT_SLIDER, GetId() );
     cevent.SetInt( newPos );
     cevent.SetEventObject( this );
 
@@ -583,7 +582,7 @@ void wxSlider::SetValue(int value)
 
     if ( m_labels )
     {
-        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str());
+        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).t_str());
     }
 }
 
@@ -603,9 +602,9 @@ void wxSlider::SetRange(int minValue, int maxValue)
     if ( m_labels )
     {
         ::SetWindowText((*m_labels)[SliderLabel_Min],
-                        Format(ValueInvertOrNot(m_rangeMin)).wx_str());
+                        Format(ValueInvertOrNot(m_rangeMin)).t_str());
         ::SetWindowText((*m_labels)[SliderLabel_Max],
-                        Format(ValueInvertOrNot(m_rangeMax)).wx_str());
+                        Format(ValueInvertOrNot(m_rangeMax)).t_str());
     }
 
     // When emulating wxSL_INVERSE style in wxWidgets, we need to update the
diff --git a/Externals/wxWidgets3/src/msw/snglinst.cpp b/Externals/wxWidgets3/src/msw/snglinst.cpp
index 047a4d81d6..9dd07ebeab 100644
--- a/Externals/wxWidgets3/src/msw/snglinst.cpp
+++ b/Externals/wxWidgets3/src/msw/snglinst.cpp
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.01
-// RCS-ID:      $Id: snglinst.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/sockmsw.cpp b/Externals/wxWidgets3/src/msw/sockmsw.cpp
index 711cb490ef..58557e4e6c 100644
--- a/Externals/wxWidgets3/src/msw/sockmsw.cpp
+++ b/Externals/wxWidgets3/src/msw/sockmsw.cpp
@@ -6,7 +6,6 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 1999-2000, Guillermo Rodriguez Garcia
 //             (C) 2008 Vadim Zeitlin
-// RCS_ID:     $Id: sockmsw.cpp 69170 2011-09-21 15:07:32Z VZ $
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -120,7 +119,7 @@ typedef struct thread_data{
 #ifdef __WXWINCE__
 /* This thread handles socket events on WinCE using WSAEventSelect() as
  * WSAAsyncSelect is not supported. When an event occurs for the socket, it is
- * checked what kind of event happend and the correct message gets posted so
+ * checked what kind of event happened and the correct message gets posted so
  * that the hidden window can handle it as it would in other MSW builds.
 */
 DWORD WINAPI SocketThread(LPVOID data)
@@ -192,7 +191,7 @@ wxDynamicLibrary wxSocketMSWManager::gs_wsock32dll;
 
 bool wxSocketMSWManager::OnInit()
 {
-  static LPCTSTR pclassname = NULL;
+  LPCTSTR pclassname = NULL;
   int i;
 
   /* Create internal window for event notifications */
diff --git a/Externals/wxWidgets3/src/msw/sound.cpp b/Externals/wxWidgets3/src/msw/sound.cpp
index 1de177f8ac..260f49f045 100644
--- a/Externals/wxWidgets3/src/msw/sound.cpp
+++ b/Externals/wxWidgets3/src/msw/sound.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 2005-07-29: Vadim Zeitlin: redesign
 // Created:     04/01/98
-// RCS-ID:      $Id: sound.cpp 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/spinbutt.cpp b/Externals/wxWidgets3/src/msw/spinbutt.cpp
index 2639a475b8..b5f99d3853 100644
--- a/Externals/wxWidgets3/src/msw/spinbutt.cpp
+++ b/Externals/wxWidgets3/src/msw/spinbutt.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: spinbutt.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -232,7 +231,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 }
 
 bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                               WXWORD pos, WXHWND control)
+                               WXWORD WXUNUSED(pos), WXHWND control)
 {
     wxCHECK_MSG( control, false, wxT("scrolling what?") );
 
@@ -243,7 +242,9 @@ bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     }
 
     wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
-    event.SetPosition((short)pos);    // cast is important for negative values!
+    // We can't use 16 bit position provided in this message for spin buttons
+    // using 32 bit range.
+    event.SetPosition(GetValue());
     event.SetEventObject(this);
 
     return HandleWindowEvent(event);
diff --git a/Externals/wxWidgets3/src/msw/spinctrl.cpp b/Externals/wxWidgets3/src/msw/spinctrl.cpp
index 0049274d89..4610eef008 100644
--- a/Externals/wxWidgets3/src/msw/spinctrl.cpp
+++ b/Externals/wxWidgets3/src/msw/spinctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id: spinctrl.cpp 70800 2012-03-04 00:29:51Z VZ $
 // Copyright:   (c) 1999-2005 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -179,7 +178,7 @@ bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id))
 {
     if ( (cmd == EN_CHANGE) && (!m_blockEvent ))
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+        wxCommandEvent event(wxEVT_TEXT, GetId());
         event.SetEventObject(this);
         wxString val = wxGetWindowText(m_hwndBuddy);
         event.SetString(val);
@@ -197,7 +196,7 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
     {
         case WXK_RETURN:
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
                 InitCommandEvent(event);
                 wxString val = wxGetWindowText(m_hwndBuddy);
                 event.SetString(val);
@@ -298,6 +297,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     WXDWORD exStyle = 0;
     WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
+    // Scroll text automatically if there is not enough space to show all of
+    // it, this is better than not allowing to enter more digits at all.
+    msStyle |= ES_AUTOHSCROLL;
+
     // propagate text alignment style to text ctrl
     if ( style & wxALIGN_RIGHT )
         msStyle |= ES_RIGHT;
@@ -317,7 +320,9 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     sizeText.x -= sizeBtn.x + MARGIN_BETWEEN;
     if ( sizeText.x <= 0 )
     {
-        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
+        wxLogDebug(wxS("wxSpinCtrl \"%s\": initial width %d is too small, ")
+                   wxS("at least %d pixels needed."),
+                   name, size.x, sizeBtn.x + MARGIN_BETWEEN + 1);
     }
 
     wxPoint posBtn(pos);
@@ -389,22 +394,24 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
+    // If the initial text value is actually a number, it overrides the
+    // "initial" argument specified later.
+    long initialFromText;
+    if ( value.ToLong(&initialFromText) )
+        initial = initialFromText;
+
+    // Set the range in the native control: notice that we must do it before
+    // calling SetValue() to use the correct validity checks for the initial
+    // value.
+    SetRange(min, max);
     SetValue(initial);
 
-    // Set the range in the native control
-    SetRange(min, max);
-
-    // If necessary, set the textual value. Don't do it if it's the same as the
-    // numeric value though.
-    if ( value != wxString::Format("%d", initial) )
-    {
+    // Also set the text part of the control if it was specified independently
+    // but don't generate an event for this, it would be unexpected.
+    m_blockEvent = true;
+    if ( !value.empty() )
         SetValue(value);
-        m_oldValue = (int) wxAtol(value);
-    }
-    else
-    {
-        m_oldValue = initial;
-    }
+    m_blockEvent = false;
 
     return true;
 }
@@ -418,6 +425,27 @@ wxSpinCtrl::~wxSpinCtrl()
     gs_spinForTextCtrl.erase(GetBuddyHwnd());
 }
 
+// ----------------------------------------------------------------------------
+// wxSpinCtrl-specific methods
+// ----------------------------------------------------------------------------
+
+int wxSpinCtrl::GetBase() const
+{
+    return ::SendMessage(GetHwnd(), UDM_GETBASE, 0, 0);
+}
+
+bool wxSpinCtrl::SetBase(int base)
+{
+    if ( !::SendMessage(GetHwnd(), UDM_SETBASE, base, 0) )
+        return false;
+
+    // Whether we need to be able enter "x" or not influences whether we should
+    // use ES_NUMBER for the buddy control.
+    UpdateBuddyStyle();
+
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // wxTextCtrl-like methods
 // ----------------------------------------------------------------------------
@@ -436,16 +464,28 @@ void  wxSpinCtrl::SetValue(int val)
 
     wxSpinButton::SetValue(val);
 
-    // normally setting the value of the spin button is enough as it updates
-    // its buddy control automatically ...
-    if ( wxGetWindowText(m_hwndBuddy).empty() )
+    // Normally setting the value of the spin button is enough as it updates
+    // its buddy control automatically but in a couple of situations it doesn't
+    // do it, for whatever reason, do it explicitly then:
+    const wxString text = wxGetWindowText(m_hwndBuddy);
+
+    // First case is when the text control is empty and the value is 0: the
+    // spin button just leaves it empty in this case, while we want to show 0
+    // in it.
+    if ( text.empty() && !val )
+    {
+        ::SetWindowText(GetBuddyHwnd(), wxT("0"));
+    }
+
+    // Another one is when we're using hexadecimal base but the user input
+    // doesn't start with "0x" -- we prefer to show it to avoid ambiguity
+    // between decimal and hexadecimal.
+    if ( GetBase() == 16 &&
+            (text.length() < 3 || text[0] != '0' ||
+                (text[1] != 'x' && text[1] != 'X')) )
     {
-        // ... but sometimes it doesn't, notably when the value is 0 and the
-        // text control is currently empty, the spin button seems to be happy
-        // to leave it like this, while we really want to always show the
-        // current value in the control, so do it manually
         ::SetWindowText(GetBuddyHwnd(),
-                        wxString::Format(wxT("%d"), val).wx_str());
+                        wxPrivate::wxSpinCtrlFormatAsHex(val, m_max).t_str());
     }
 
     m_oldValue = GetValue();
@@ -455,10 +495,10 @@ void  wxSpinCtrl::SetValue(int val)
 
 int wxSpinCtrl::GetValue() const
 {
-    wxString val = wxGetWindowText(m_hwndBuddy);
+    const wxString val = wxGetWindowText(m_hwndBuddy);
 
     long n;
-    if ( (wxSscanf(val, wxT("%ld"), &n) != 1) )
+    if ( !val.ToLong(&n, GetBase()) )
         n = INT_MIN;
 
     if ( n < m_min )
@@ -487,14 +527,29 @@ void wxSpinCtrl::SetSelection(long from, long to)
 
 void wxSpinCtrl::SetRange(int minVal, int maxVal)
 {
+    // Manually adjust the old value to avoid an event being sent from
+    // NormalizeValue() called from inside the base class SetRange() as we're
+    // not supposed to generate any events from here.
+    if ( m_oldValue < minVal )
+        m_oldValue = minVal;
+    else if ( m_oldValue > maxVal )
+        m_oldValue = maxVal;
+
     wxSpinButton::SetRange(minVal, maxVal);
 
+    UpdateBuddyStyle();
+}
+
+void wxSpinCtrl::UpdateBuddyStyle()
+{
     // this control is used for numeric entry so restrict the input to numeric
     // keys only -- but only if we don't need to be able to enter "-" in it as
-    // otherwise this would become impossible
+    // otherwise this would become impossible and also if we don't use
+    // hexadecimal as entering "x" of the "0x" prefix wouldn't be allowed
+    // neither then
     const DWORD styleOld = ::GetWindowLong(GetBuddyHwnd(), GWL_STYLE);
     DWORD styleNew;
-    if ( minVal < 0 )
+    if ( m_min < 0 || GetBase() != 10 )
         styleNew = styleOld & ~ES_NUMBER;
     else
         styleNew = styleOld | ES_NUMBER;
@@ -604,7 +659,7 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
     wxSpinButton::DoSetToolTip(tip);
 
     if ( tip )
-        tip->Add(m_hwndBuddy);
+        tip->AddOtherWindow(m_hwndBuddy);
 }
 
 #endif // wxUSE_TOOLTIPS
@@ -615,7 +670,7 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
 
 void wxSpinCtrl::SendSpinUpdate(int value)
 {
-    wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
+    wxCommandEvent event(wxEVT_SPINCTRL, GetId());
     event.SetEventObject(this);
     event.SetInt(value);
 
@@ -625,7 +680,7 @@ void wxSpinCtrl::SendSpinUpdate(int value)
 }
 
 bool wxSpinCtrl::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                               WXWORD pos, WXHWND control)
+                             WXWORD WXUNUSED(pos), WXHWND control)
 {
     wxCHECK_MSG( control, false, wxT("scrolling what?") );
 
@@ -635,11 +690,13 @@ bool wxSpinCtrl::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
         return false;
     }
 
-    int new_value = (short) pos;
+    // Notice that we can't use "pos" from WM_VSCROLL as it is 16 bit and we
+    // might be using 32 bit range.
+    int new_value = GetValue();
     if (m_oldValue != new_value)
        SendSpinUpdate( new_value );
 
-    return TRUE;
+    return true;
 }
 
 bool wxSpinCtrl::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
@@ -660,42 +717,54 @@ bool wxSpinCtrl::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *re
 // ----------------------------------------------------------------------------
 
 wxSize wxSpinCtrl::DoGetBestSize() const
+{
+    return DoGetSizeFromTextSize(DEFAULT_ITEM_WIDTH);
+}
+
+wxSize wxSpinCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
 {
     wxSize sizeBtn = wxSpinButton::DoGetBestSize();
-    sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 
     int y;
     wxGetCharSize(GetHWND(), NULL, &y, GetFont());
-    y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
-
     // JACS: we should always use the height calculated
     // from above, because otherwise we'll get a spin control
     // that's too big. So never use the height calculated
     // from wxSpinButton::DoGetBestSize().
 
-    // if ( sizeBtn.y < y )
-    {
-        // make the text tall enough
-        sizeBtn.y = y;
-    }
+    wxSize tsize(xlen + sizeBtn.x + MARGIN_BETWEEN + 3*y/10 + 10,
+                 EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
 
-    return sizeBtn;
+    // Check if the user requested a non-standard height.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - y);
+
+    return tsize;
 }
 
 void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     int widthBtn = wxSpinButton::DoGetBestSize().x;
     int widthText = width - widthBtn - MARGIN_BETWEEN;
-    if ( widthText <= 0 )
+    if ( widthText < 0 )
     {
-        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
+        // This can happen during the initial window layout when it's total
+        // size is too small to accommodate all the controls and usually is not
+        // a problem because the window will be relaid out with enough space
+        // later. Of course, if it isn't and this is our final size, then we
+        // have a real problem but as we don't know if this is going to be the
+        // case or not, just hope for the best -- we used to give a debug
+        // warning here and this was annoying as it could result in dozens of
+        // perfectly harmless warnings.
+        widthText = 0;
     }
 
     // 1) The buddy window
     DoMoveSibling(m_hwndBuddy, x, y, widthText, height);
 
     // 2) The button window
-    x += widthText + MARGIN_BETWEEN;
+    if ( widthText > 0 )
+        x += widthText + MARGIN_BETWEEN;
     wxSpinButton::DoMoveWindow(x, y, widthBtn, height);
 }
 
diff --git a/Externals/wxWidgets3/src/msw/stackwalk.cpp b/Externals/wxWidgets3/src/msw/stackwalk.cpp
index bc556b4704..f9c8ca986e 100644
--- a/Externals/wxWidgets3/src/msw/stackwalk.cpp
+++ b/Externals/wxWidgets3/src/msw/stackwalk.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Artur Bac 2010-10-01 AMD64 Port
 // Created:     2005-01-08
-// RCS-ID:      $Id: stackwalk.cpp 69845 2011-11-27 19:52:13Z VZ $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/statbmp.cpp b/Externals/wxWidgets3/src/msw/statbmp.cpp
index 72471c89a6..496df705a8 100644
--- a/Externals/wxWidgets3/src/msw/statbmp.cpp
+++ b/Externals/wxWidgets3/src/msw/statbmp.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: statbmp.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,9 +41,13 @@
 #include <stdio.h>
 
 // ---------------------------------------------------------------------------
-// macors
+// macros
 // ---------------------------------------------------------------------------
 
+wxBEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
+    EVT_SIZE(wxStaticBitmap::WXHandleSize)
+wxEND_EVENT_TABLE()
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -61,7 +64,7 @@
 
 static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
 {
-    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
+    bool isIcon = bitmap.IsKindOf( wxCLASSINFO(wxIcon) );
 
     if( !isIcon )
     {
@@ -99,10 +102,10 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // we may have either bitmap or icon: if a bitmap with mask is passed, we
     // will transform it to an icon ourselves because otherwise the mask will
     // be ignored by Windows
-    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+    m_isIcon = bitmap.IsKindOf(wxCLASSINFO(wxIcon));
 
     wxGDIImage *image = ConvertImage( bitmap );
-    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
 
     // create the native control
     if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
@@ -189,17 +192,30 @@ void wxStaticBitmap::Free()
     wxDELETE(m_image);
 }
 
-wxSize wxStaticBitmap::DoGetBestSize() const
+wxSize wxStaticBitmap::DoGetBestClientSize() const
 {
+    wxSize size;
     if ( ImageIsOk() )
     {
-        wxSize best(m_image->GetWidth(), m_image->GetHeight());
-        CacheBestSize(best);
-        return best;
+        size = m_image->GetSize();
+    }
+    else // No image yet
+    {
+        // this is completely arbitrary
+        size.x =
+        size.y = 16;
     }
 
-    // this is completely arbitrary
-    return wxSize(16, 16);
+    return size;
+}
+
+void wxStaticBitmap::WXHandleSize(wxSizeEvent& event)
+{
+    // Invalidate everything when our size changes as the image position (it's
+    // drawn centred in the window client area) changes.
+    Refresh();
+
+    event.Skip();
 }
 
 #ifndef __WXWINCE__
@@ -232,14 +248,14 @@ void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );
-    InvalidateBestSize();
 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
     Free();
+    InvalidateBestSize();
 
-    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
     // the image has already been copied
     m_image = image;
 
diff --git a/Externals/wxWidgets3/src/msw/statbox.cpp b/Externals/wxWidgets3/src/msw/statbox.cpp
index 6b15baaef4..678a2594cf 100644
--- a/Externals/wxWidgets3/src/msw/statbox.cpp
+++ b/Externals/wxWidgets3/src/msw/statbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: statbox.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,7 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/image.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/notebook.h"
@@ -81,7 +81,13 @@ bool wxStaticBox::Create(wxWindow *parent,
 
 #ifndef __WXWINCE__
     if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
+    {
         Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));
+
+        // Our OnPaint() completely erases our background, so don't do it in
+        // WM_ERASEBKGND too to avoid flicker.
+        SetBackgroundStyle(wxBG_STYLE_PAINT);
+    }
 #endif // !__WXWINCE__
 
     return true;
@@ -98,11 +104,15 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( exstyle )
     {
 #ifndef __WXWINCE__
+        // We may have children inside this static box, so use this style for
+        // TAB navigation to work if we ever use IsDialogMessage() to implement
+        // it (currently we don't because it's too buggy and implement TAB
+        // navigation ourselves, but this could change in the future).
+        *exstyle |= WS_EX_CONTROLPARENT;
+
         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
-            *exstyle = WS_EX_TRANSPARENT;
-        else
+            *exstyle |= WS_EX_TRANSPARENT;
 #endif
-            *exstyle = 0;
     }
 
     styleWin |= BS_GROUPBOX;
@@ -118,6 +128,9 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxStaticBox::DoGetBestSize() const
 {
+    wxSize best;
+
+    // Calculate the size needed by the label
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
@@ -127,8 +140,19 @@ wxSize wxStaticBox::DoGetBestSize() const
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 
-    wxSize best(wBox, hBox);
-    CacheBestSize(best);
+    // If there is a sizer then the base best size is the sizer's minimum
+    if (GetSizer() != NULL)
+    {
+        wxSize cm(GetSizer()->CalcMin());
+        best = ClientToWindowSize(cm);
+        // adjust for a long label if needed
+        best.x = wxMax(best.x, wBox);
+    }
+    // otherwise the best size falls back to the label size
+    else
+    {
+        best = wxSize(wBox, hBox);
+    }
     return best;
 }
 
@@ -260,8 +284,14 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
     bool foundThis = false;
 
-    // iterate over all child windows (not just wxWindows but all windows)
-    for ( HWND child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD);
+    // Iterate over all sibling windows as in the old wxWidgets API the
+    // controls appearing inside the static box were created as its siblings
+    // and not children. This is now deprecated but should still work.
+    //
+    // Also notice that we must iterate over all windows, not just all
+    // wxWindows, as there may be composite windows etc.
+    HWND child;
+    for ( child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD);
           child;
           child = ::GetWindow(child, GW_HWNDNEXT) )
     {
@@ -313,6 +343,23 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
         }
     }
 
+    // Also iterate over all children of the static box, we need to clip them
+    // out as well.
+    for ( child = ::GetWindow(GetHwnd(), GW_CHILD);
+          child;
+          child = ::GetWindow(child, GW_HWNDNEXT) )
+    {
+        if ( !::IsWindowVisible(child) )
+        {
+            // if the window isn't visible then it doesn't need clipped
+            continue;
+        }
+
+        ::GetWindowRect(child, &rc);
+        AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
+        ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
+    }
+
     return (WXHRGN)hrgn;
 }
 
@@ -349,6 +396,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
 
+#if wxUSE_UXTHEME
     // when using XP themes, neither setting the text colour nor transparent
     // background mode doesn't change anything: the static box def window proc
     // still draws the label in its own colours, so we need to redraw the text
@@ -460,16 +508,17 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
         if ( !rtl )
         {
             RECT rc2 = { x, 0, x + width, y };
-            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+            ::DrawText(hdc, label.t_str(), label.length(), &rc2,
                        drawTextFlags);
         }
         else // RTL
         {
             RECT rc2 = { x, 0, x - width, y };
-            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+            ::DrawText(hdc, label.t_str(), label.length(), &rc2,
                        drawTextFlags | DT_RTLREADING);
         }
     }
+#endif // wxUSE_UXTHEME
 }
 
 void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
diff --git a/Externals/wxWidgets3/src/msw/statline.cpp b/Externals/wxWidgets3/src/msw/statline.cpp
index aaddbf0104..105ecfbcd1 100644
--- a/Externals/wxWidgets3/src/msw/statline.cpp
+++ b/Externals/wxWidgets3/src/msw/statline.cpp
@@ -3,7 +3,6 @@
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/stattext.cpp b/Externals/wxWidgets3/src/msw/stattext.cpp
index eea1f127ae..1eb8b24acd 100644
--- a/Externals/wxWidgets3/src/msw/stattext.cpp
+++ b/Externals/wxWidgets3/src/msw/stattext.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -111,24 +110,20 @@ wxSize wxStaticText::DoGetBestClientSize() const
         widthTextMax += 2;
 #endif // __WXWINCE__
 
-    // It looks like the static control needs "slightly" more vertical space
-    // than the character height and while the text isn't actually truncated if
-    // we use just the minimal height, it is positioned differently than when
-    // the control has enough space and this result in the text in edit and
-    // static controls not being aligned when the controls themselves are. As
-    // this is something you really should be able to count on, increase the
-    // space allocated for the control so that the base lines do align
-    // correctly. Notice that while the above is true at least for the single
-    // line controls, there doesn't seem to do any harm to allocate two extra
-    // pixels in multi-line case neither so do it always for consistency.
+    // This extra pixel is a hack we use to ensure that a wxStaticText
+    // vertically centered around the same position as a wxTextCtrl shows its
+    // text on exactly the same baseline. It is not clear why is this needed
+    // nor even whether this works in all cases, but it does work, at least
+    // with the default fonts, under Windows XP, 7 and 8, so just use it for
+    // now.
     //
-    // I still have no idea why exactly is this needed nor why should we use 2
-    // and not something else. This seems to work in all the configurations
-    // though (small/large fonts, different OS versions, ...) so just hard code
-    // it for now. If we need something better later it might be worth looking
-    // at the height of the text control returned by ::GetComboBoxInfo() as it
-    // seems to be the "minimal acceptable" height.
-    heightTextTotal += 2;
+    // In the future we really ought to provide a way for each of the controls
+    // to provide information about the position of the baseline for the text
+    // it shows and use this information in the sizer code when centering the
+    // controls vertically, otherwise we simply can't ensure that the text is
+    // always on the same line, e.g. even with this hack wxComboBox text is
+    // still not aligned to the same position.
+    heightTextTotal += 1;
 
     return wxSize(widthTextMax, heightTextTotal);
 }
diff --git a/Externals/wxWidgets3/src/msw/statusbar.cpp b/Externals/wxWidgets3/src/msw/statusbar.cpp
index edd3252ee1..0a33fdc2f5 100644
--- a/Externals/wxWidgets3/src/msw/statusbar.cpp
+++ b/Externals/wxWidgets3/src/msw/statusbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.04.98
-// RCS-ID:      $Id: statusbar.cpp 70310 2012-01-10 17:01:09Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -275,6 +274,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
         style = SBT_NOBORDERS;
         break;
 
+    case wxSB_SUNKEN:
     case wxSB_NORMAL:
     default:
         style = 0;
@@ -317,7 +317,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
 
     // Set the status text in the native control passing both field number and style.
     // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
-    if ( !StatusBar_SetText(GetHwnd(), nField | style, text.wx_str()) )
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, text.t_str()) )
     {
         wxLogLastError("StatusBar_SetText");
     }
@@ -553,6 +553,7 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
         case wxSB_FLAT:
             style = SBT_NOBORDERS;
             break;
+        case wxSB_SUNKEN:
         case wxSB_NORMAL:
         default:
             style = 0;
@@ -563,7 +564,7 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
         // the fields' styles.
         // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
         wxString text = GetStatusText(i);
-        if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
+        if (!StatusBar_SetText(GetHwnd(), style | i, text.t_str()))
         {
             wxLogLastError("StatusBar_SetText");
         }
diff --git a/Externals/wxWidgets3/src/msw/stdpaths.cpp b/Externals/wxWidgets3/src/msw/stdpaths.cpp
index cfe09af4f5..f8b05866b2 100644
--- a/Externals/wxWidgets3/src/msw/stdpaths.cpp
+++ b/Externals/wxWidgets3/src/msw/stdpaths.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: stdpaths.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/taskbar.cpp b/Externals/wxWidgets3/src/msw/taskbar.cpp
index d376be24b0..537db33bfd 100644
--- a/Externals/wxWidgets3/src/msw/taskbar.cpp
+++ b/Externals/wxWidgets3/src/msw/taskbar.cpp
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by: Vaclav Slavik
 // Created:     24/3/98
-// RCS-ID:      $Id: taskbar.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -177,7 +176,7 @@ struct NotifyIconData : public NOTIFYICONDATA
 // wxTaskBarIcon
 // ----------------------------------------------------------------------------
 
-wxTaskBarIcon::wxTaskBarIcon()
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
 {
     m_win = NULL;
     m_iconAdded = false;
@@ -226,7 +225,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     notifyData.uFlags |= NIF_TIP;
     if ( !tooltip.empty() )
     {
-        wxStrlcpy(notifyData.szTip, tooltip.wx_str(), WXSIZEOF(notifyData.szTip));
+        wxStrlcpy(notifyData.szTip, tooltip.t_str(), WXSIZEOF(notifyData.szTip));
     }
 
     bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY
@@ -271,8 +270,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;
-    wxStrlcpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
-    wxStrlcpy(notifyData.szInfoTitle, title.wx_str(),
+    wxStrlcpy(notifyData.szInfo, text.t_str(), WXSIZEOF(notifyData.szInfo));
+    wxStrlcpy(notifyData.szInfoTitle, title.t_str(),
                 WXSIZEOF(notifyData.szInfoTitle));
 
     if ( flags & wxICON_INFORMATION )
diff --git a/Externals/wxWidgets3/src/msw/textctrl.cpp b/Externals/wxWidgets3/src/msw/textctrl.cpp
index ca000e2b23..d2e448cc05 100644
--- a/Externals/wxWidgets3/src/msw/textctrl.cpp
+++ b/Externals/wxWidgets3/src/msw/textctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: textctrl.cpp 70870 2012-03-11 05:31:06Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,10 +63,6 @@
 
 #if wxUSE_RICHEDIT
 
-#if wxUSE_INKEDIT
-#include "wx/dynlib.h"
-#endif
-
 // old mingw32 has richedit stuff directly in windows.h and doesn't have
 // richedit.h at all
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
@@ -78,6 +73,11 @@
 
 #include "wx/msw/missing.h"
 
+// FIXME-VC6: This seems to be only missing from VC6 headers.
+#ifndef SPI_GETCARETWIDTH
+    #define SPI_GETCARETWIDTH 0x2006
+#endif
+
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
 
 // dummy value used for m_dropTarget, different from any valid pointer value
@@ -427,7 +427,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
     // implementation detail
     m_updatesCount = -2;
 
-    if ( !MSWCreateControl(windowClass.wx_str(), msStyle, pos, size, valueWin) )
+    if ( !MSWCreateControl(windowClass.t_str(), msStyle, pos, size, valueWin) )
         return false;
 
     m_updatesCount = -1;
@@ -498,7 +498,37 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
     SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
                 SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|
                 SWP_FRAMECHANGED);
-#endif
+
+    if ( IsSingleLine() )
+    {
+        // If we don't set the margins explicitly, their size depends on the
+        // control initial size, see #2438. So explicitly set them to something
+        // consistent. And for this we have 2 candidates: EC_USEFONTINFO (which
+        // sets the left margin to 3 pixels, at least under Windows 7) or 0. We
+        // use the former because it looks like it was meant to be used as the
+        // default (what else would it be there for?) and 0 looks bad in
+        // classic mode, i.e. without themes. Also, the margin can be reset to
+        // 0 easily by calling SetMargins() explicitly but setting it to the
+        // default value is not currently supported.
+        //
+        // Finally, notice that EC_USEFONTINFO is used differently for plain
+        // and rich text controls.
+        WPARAM wParam;
+        LPARAM lParam;
+        if ( IsRich() )
+        {
+            wParam = EC_USEFONTINFO;
+            lParam = 0;
+        }
+        else // plain EDIT, EC_USEFONTINFO is used in lParam with them.
+        {
+            wParam = EC_LEFTMARGIN | EC_RIGHTMARGIN;
+            lParam = MAKELPARAM(EC_USEFONTINFO, EC_USEFONTINFO);
+        }
+
+        ::SendMessage(GetHwnd(), EM_SETMARGINS, wParam, lParam);
+    }
+#endif // !__WXWINCE__
 
     return true;
 }
@@ -992,7 +1022,7 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
 
     EDITSTREAM eds;
     wxZeroMemory(eds);
-    eds.dwCookie = (DWORD)&data;
+    eds.dwCookie = (DWORD_PTR)&data;
     eds.pfnCallback = wxRichEditStreamOut;
 
     ::SendMessage
@@ -1109,7 +1139,7 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags)
 
         ::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT,
                       // EM_REPLACESEL takes 1 to indicate the operation should be redoable
-                      selectionOnly ? 1 : 0, (LPARAM)valueDos.wx_str());
+                      selectionOnly ? 1 : 0, wxMSW_CONV_LPARAM(valueDos));
 
         if ( !ucf.GotUpdate() && (flags & SetValue_SendEvent) )
         {
@@ -1832,7 +1862,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     {
         case WXK_RETURN:
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 if ( HandleWindowEvent(event) )
@@ -2035,7 +2065,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             // the text size limit has been hit -- try to increase it
             if ( !AdjustSpaceLimit() )
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_MAXLEN, m_windowId);
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 ProcessCommand(event);
@@ -2106,18 +2136,42 @@ bool wxTextCtrl::AcceptsFocusFromKeyboard() const
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
+{
+    return DoGetSizeFromTextSize( DEFAULT_ITEM_WIDTH );
+}
+
+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
 {
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
-    int wText = DEFAULT_ITEM_WIDTH;
+    DWORD wText = 1;
+    ::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0);
+    wText += xlen;
 
     int hText = cy;
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-        hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2);
+        // add space for vertical scrollbar
+        if ( !(m_windowStyle & wxTE_NO_VSCROLL) )
+            wText += ::GetSystemMetrics(SM_CXVSCROLL);
+
+        if ( ylen <= 0 )
+        {
+            hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2);
+            // add space for horizontal scrollbar
+            if ( m_windowStyle & wxHSCROLL )
+                hText += ::GetSystemMetrics(SM_CYHSCROLL);
+        }
+    }
+    // for single line control cy (height + external leading) is ok
+    else
+    {
+        // Add the margins we have previously set
+        wxPoint marg( GetMargins() );
+        wText += wxMax(0, marg.x);
+        hText += wxMax(0, marg.y);
     }
-    //else: for single line control everything is ok
 
     // Text controls without border are special and have the same height as
     // static labels (they also have the same appearance when they're disable
@@ -2126,11 +2180,18 @@ wxSize wxTextCtrl::DoGetBestSize() const
     // stand out).
     if ( !HasFlag(wxBORDER_NONE) )
     {
+        wText += 9; // borders and inner margins
+
         // we have to add the adjustments for the control height only once, not
         // once per line, so do it after multiplication above
         hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy;
     }
 
+    // Perhaps the user wants something different from CharHeight, or ylen
+    // is used as the height of a multiline text.
+    if ( ylen > 0 )
+        hText += ylen - GetCharHeight();
+
     return wxSize(wText, hText);
 }
 
diff --git a/Externals/wxWidgets3/src/msw/textentry.cpp b/Externals/wxWidgets3/src/msw/textentry.cpp
index cb2ab58e26..d8a411ebc4 100644
--- a/Externals/wxWidgets3/src/msw/textentry.cpp
+++ b/Externals/wxWidgets3/src/msw/textentry.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTextEntry implementation for wxMSW
 // Author:      Vadim Zeitlin
 // Created:     2007-09-26
-// RCS-ID:      $Id: textentry.cpp 68918 2011-08-27 14:11:13Z VZ $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -34,8 +33,6 @@
 #include "wx/textcompleter.h"
 #include "wx/dynlib.h"
 
-#include <initguid.h>
-
 #include "wx/msw/private.h"
 
 #if wxUSE_UXTHEME
@@ -79,6 +76,11 @@
     #define SHACF_FILESYS_DIRS 0x00000020
 #endif
 
+// This must be the last header included to only affect the DEFINE_GUID()
+// occurrences below but not any GUIDs declared in the standard files included
+// above.
+#include <initguid.h>
+
 namespace
 {
 
@@ -492,7 +494,7 @@ public:
                 // wxEVT_CHAR handler (as we must also let the other handlers
                 // defined at wx level run first).
                 //
-                // Notice that we can't use wxEVT_COMMAND_TEXT_UPDATED here
+                // Notice that we can't use wxEVT_TEXT here
                 // neither as, due to our use of ACO_AUTOAPPEND, we get
                 // EN_CHANGE notifications from the control every time
                 // IAutoComplete auto-appends something to it.
@@ -625,7 +627,7 @@ wxTextEntry::~wxTextEntry()
 
 void wxTextEntry::WriteText(const wxString& text)
 {
-    ::SendMessage(GetEditHwnd(), EM_REPLACESEL, 0, (LPARAM)text.wx_str());
+    ::SendMessage(GetEditHwnd(), EM_REPLACESEL, 0, wxMSW_CONV_LPARAM(text));
 }
 
 wxString wxTextEntry::DoGetValue() const
@@ -744,6 +746,8 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 
 #ifdef HAS_AUTOCOMPLETE
 
+#if wxUSE_DYNLIB_CLASS
+
 bool wxTextEntry::DoAutoCompleteFileNames(int flags)
 {
     typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
@@ -791,6 +795,8 @@ bool wxTextEntry::DoAutoCompleteFileNames(int flags)
     return true;
 }
 
+#endif // wxUSE_DYNLIB_CLASS
+
 wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
 {
     if ( !m_autoCompleteData )
@@ -910,7 +916,7 @@ void wxTextEntry::SetMaxLength(unsigned long len)
 
 bool wxTextEntry::SetHint(const wxString& hint)
 {
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxGetWinVersion() >= wxWinVersion_Vista && wxUxThemeEngine::GetIfActive() )
     {
         // notice that this message always works with Unicode strings
         //
@@ -952,9 +958,12 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 
     if ( margins.x != -1 )
     {
-        // left margin
+        // Set both horizontal margins to the given value, we don't distinguish
+        // between left and right margin at wx API level and it seems to be
+        // better to change both of them than only left one.
         ::SendMessage(GetEditHwnd(), EM_SETMARGINS,
-                      EC_LEFTMARGIN, MAKELONG(margins.x, 0));
+                      EC_LEFTMARGIN | EC_RIGHTMARGIN,
+                      MAKELONG(margins.x, margins.x));
     }
 
     if ( margins.y != -1 )
diff --git a/Externals/wxWidgets3/src/msw/textmeasure.cpp b/Externals/wxWidgets3/src/msw/textmeasure.cpp
new file mode 100644
index 0000000000..d03a5f369a
--- /dev/null
+++ b/Externals/wxWidgets3/src/msw/textmeasure.cpp
@@ -0,0 +1,189 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/textmeasure.cpp
+// Purpose:     wxTextMeasure implementation for wxMSW
+// Author:      Manuel Martin
+// Created:     2012-10-05
+// Copyright:   (c) 1997-2012 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/msw/private.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/font.h"
+#endif //WX_PRECOMP
+
+#include "wx/private/textmeasure.h"
+
+#include "wx/msw/dc.h"
+
+// ============================================================================
+// wxTextMeasure implementation
+// ============================================================================
+
+void wxTextMeasure::Init()
+{
+    m_hdc = NULL;
+    m_hfontOld = NULL;
+
+    if ( m_dc )
+    {
+        wxClassInfo* const ci = m_dc->GetImpl()->GetClassInfo();
+
+        if ( ci->IsKindOf(wxCLASSINFO(wxMSWDCImpl)))
+        {
+            m_useDCImpl = false;
+        }
+    }
+}
+
+void wxTextMeasure::BeginMeasuring()
+{
+    if ( m_dc )
+    {
+        m_hdc = m_dc->GetHDC();
+
+        // Non-native wxDC subclasses should override their DoGetTextExtent()
+        // and other methods.
+        wxASSERT_MSG( m_hdc, wxS("Must not be used with non-native wxDCs") );
+    }
+    else if ( m_win )
+    {
+        m_hdc = ::GetDC(GetHwndOf(m_win));
+    }
+
+    // We need to set the font if it's explicitly specified, of course, but
+    // also if we're associated with a window because the window HDC created
+    // above has the default font selected into it and not the font of the
+    // window.
+    if ( m_font || m_win )
+        m_hfontOld = (HFONT)::SelectObject(m_hdc, GetHfontOf(GetFont()));
+}
+
+void wxTextMeasure::EndMeasuring()
+{
+    if ( m_hfontOld )
+    {
+        ::SelectObject(m_hdc, m_hfontOld);
+        m_hfontOld = NULL;
+    }
+
+    if ( m_win )
+        ::ReleaseDC(GetHwndOf(m_win), m_hdc);
+    //else: our HDC belongs to m_dc, don't touch it
+
+    m_hdc = NULL;
+}
+
+// Notice we don't check here the font. It is supposed to be OK before the call.
+void wxTextMeasure::DoGetTextExtent(const wxString& string,
+                                       wxCoord *width,
+                                       wxCoord *height,
+                                       wxCoord *descent,
+                                       wxCoord *externalLeading)
+{
+    SIZE sizeRect;
+    const size_t len = string.length();
+    if ( !::GetTextExtentPoint32(m_hdc, string.t_str(), len, &sizeRect) )
+    {
+        wxLogLastError(wxT("GetTextExtentPoint32()"));
+    }
+
+#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
+    // the result computed by GetTextExtentPoint32() may be too small as it
+    // accounts for under/overhang of the first/last character while we want
+    // just the bounding rect for this string so adjust the width as needed
+    // (using API not available in 2002 SDKs of WinCE)
+    if ( len > 0 )
+    {
+        ABC widthABC;
+        const wxChar chFirst = *string.begin();
+        if ( ::GetCharABCWidths(m_hdc, chFirst, chFirst, &widthABC) )
+        {
+            if ( widthABC.abcA < 0 )
+                sizeRect.cx -= widthABC.abcA;
+
+            if ( len > 1 )
+            {
+                const wxChar chLast = *string.rbegin();
+                ::GetCharABCWidths(m_hdc, chLast, chLast, &widthABC);
+            }
+            //else: we already have the width of the last character
+
+            if ( widthABC.abcC < 0 )
+                sizeRect.cx -= widthABC.abcC;
+        }
+        //else: GetCharABCWidths() failed, not a TrueType font?
+    }
+#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
+
+    *width = sizeRect.cx;
+    *height = sizeRect.cy;
+
+    if ( descent || externalLeading )
+    {
+        TEXTMETRIC tm;
+        ::GetTextMetrics(m_hdc, &tm);
+        if ( descent )
+            *descent = tm.tmDescent;
+        if ( externalLeading )
+            *externalLeading = tm.tmExternalLeading;
+    }
+}
+
+bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text,
+                                            wxArrayInt& widths,
+                                            double scaleX)
+{
+    if ( !m_hdc )
+        return wxTextMeasureBase::DoGetPartialTextExtents(text, widths, scaleX);
+
+    static int maxLenText = -1;
+    static int maxWidth = -1;
+
+    if (maxLenText == -1)
+    {
+        // Win9x and WinNT+ have different limits
+        int version = wxGetOsVersion();
+        maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
+        maxWidth =   version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
+    }
+
+    int len = text.length();
+    if ( len > maxLenText )
+        len = maxLenText;
+
+    int fit = 0;
+    SIZE sz = {0,0};
+    if ( !::GetTextExtentExPoint(m_hdc,
+                                 text.t_str(), // string to check
+                                 len,
+                                 maxWidth,
+                                 &fit,         // [out] count of chars
+                                               // that will fit
+                                 &widths[0],   // array to fill
+                                 &sz) )
+    {
+        wxLogLastError(wxT("GetTextExtentExPoint"));
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/Externals/wxWidgets3/src/msw/tglbtn.cpp b/Externals/wxWidgets3/src/msw/tglbtn.cpp
index 05612bca6d..f7380a3f66 100644
--- a/Externals/wxWidgets3/src/msw/tglbtn.cpp
+++ b/Externals/wxWidgets3/src/msw/tglbtn.cpp
@@ -6,7 +6,6 @@
 //              and William Gallafent.
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,7 +44,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ============================================================================
 // implementation
@@ -179,7 +178,7 @@ bool wxToggleButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     // auto checkboxes so do it ourselves in any case
     m_state = !m_state;
 
-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_TOGGLEBUTTON, m_windowId);
     event.SetInt(GetValue());
     event.SetEventObject(this);
     ProcessCommand(event);
diff --git a/Externals/wxWidgets3/src/msw/thread.cpp b/Externals/wxWidgets3/src/msw/thread.cpp
index e51286d7d2..88e696ab34 100644
--- a/Externals/wxWidgets3/src/msw/thread.cpp
+++ b/Externals/wxWidgets3/src/msw/thread.cpp
@@ -4,7 +4,6 @@
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: Vadim Zeitlin to make it work :-)
 // Created:     04/22/98
-// RCS-ID:      $Id: thread.cpp 69883 2011-12-01 14:22:15Z VZ $
 // Copyright:   (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
 //                  Vadim Zeitlin (1999-2002)
 // Licence:     wxWindows licence
@@ -64,7 +63,7 @@
 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
     (defined(__GNUG__) && defined(__MSVCRT__)) || \
-    defined(__WATCOMC__) || defined(__MWERKS__)
+    defined(__WATCOMC__)
 
 #ifndef __WXWINCE__
     #undef wxUSE_BEGIN_THREAD
@@ -442,7 +441,7 @@ public:
         m_thread = thread;
         m_hThread = 0;
         m_state = STATE_NEW;
-        m_priority = WXTHREAD_DEFAULT_PRIORITY;
+        m_priority = wxPRIORITY_DEFAULT;
         m_nRef = 1;
     }
 
@@ -572,7 +571,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
             return THREAD_ERROR_EXIT;
         }
 
-        rc = wxPtrToUInt(thread->Entry());
+        rc = wxPtrToUInt(thread->CallEntry());
     }
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
 
@@ -589,9 +588,14 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
     // each thread has its own SEH translator so install our own a.s.a.p.
     DisableAutomaticSETranslator();
 
+    // NB: Notice that we can't use wxCriticalSectionLocker in this function as
+    //     we use SEH and it's incompatible with C++ object dtors.
+
     // first of all, check whether we hadn't been cancelled already and don't
     // start the user code at all then
+    thread->m_critsect.Enter();
     const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
+    thread->m_critsect.Leave();
 
     // run the thread function itself inside a SEH try/except block
     wxSEH_TRY
@@ -609,10 +613,6 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
     const bool isDetached = thread->IsDetached();
     if ( !hasExited )
     {
-        // enter m_critsect before changing the thread state
-        //
-        // NB: can't use wxCriticalSectionLocker here as we use SEH and it's
-        //     incompatible with C++ object dtors
         thread->m_critsect.Enter();
         thread->m_internal->SetState(STATE_EXITED);
         thread->m_critsect.Leave();
@@ -698,7 +698,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
         return false;
     }
 
-    if ( m_priority != WXTHREAD_DEFAULT_PRIORITY )
+    if ( m_priority != wxPRIORITY_DEFAULT )
     {
         SetPriority(m_priority);
     }
@@ -904,7 +904,8 @@ bool wxThreadInternal::Suspend()
     DWORD nSuspendCount = ::SuspendThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Cannot suspend thread %x"), m_hThread);
+        wxLogSysError(_("Cannot suspend thread %lx"),
+                      static_cast<unsigned long>(wxPtrToUInt(m_hThread)));
 
         return false;
     }
@@ -919,7 +920,8 @@ bool wxThreadInternal::Resume()
     DWORD nSuspendCount = ::ResumeThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Cannot resume thread %x"), m_hThread);
+        wxLogSysError(_("Cannot resume thread %lx"),
+                      static_cast<unsigned long>(wxPtrToUInt(m_hThread)));
 
         return false;
     }
@@ -1104,6 +1106,14 @@ wxThreadError wxThread::Run()
 {
     wxCriticalSectionLocker lock(m_critsect);
 
+    // Create the thread if it wasn't created yet with an explicit
+    // Create() call:
+    if ( !m_internal->GetHandle() )
+    {
+        if ( !m_internal->Create(this, 0) )
+            return wxTHREAD_NO_RESOURCE;
+    }
+
     wxCHECK_MSG( m_internal->GetState() == STATE_NEW, wxTHREAD_RUNNING,
              wxT("thread may only be started once after Create()") );
 
@@ -1173,6 +1183,8 @@ wxThreadError wxThread::Kill()
 
 void wxThread::Exit(ExitCode status)
 {
+    wxThreadInternal::DoThreadOnExit(this);
+
     m_internal->Free();
 
     if ( IsDetached() )
diff --git a/Externals/wxWidgets3/src/msw/timectrl.cpp b/Externals/wxWidgets3/src/msw/timectrl.cpp
index 88c5dd60a6..1a39cb4cdf 100644
--- a/Externals/wxWidgets3/src/msw/timectrl.cpp
+++ b/Externals/wxWidgets3/src/msw/timectrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTimePickerCtrl implementation
 // Author:      Vadim Zeitlin
 // Created:     2005-01-09
-// RCS-ID:      $Id: timectrl.cpp 69308 2011-10-04 17:03:28Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -46,11 +45,15 @@ WXDWORD wxTimePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
     return styleMSW;
 }
 
+#if wxUSE_INTL
+
 wxLocaleInfo wxTimePickerCtrl::MSWGetFormat() const
 {
     return wxLOCALE_TIME_FMT;
 }
 
+#endif // wxUSE_INTL
+
 bool wxTimePickerCtrl::MSWOnDateTimeChange(const NMDATETIMECHANGE& dtch)
 {
     m_date.SetFromMSWSysTime(dtch.st);
diff --git a/Externals/wxWidgets3/src/msw/timer.cpp b/Externals/wxWidgets3/src/msw/timer.cpp
index 7196bdccaf..ba7ed1cd9c 100644
--- a/Externals/wxWidgets3/src/msw/timer.cpp
+++ b/Externals/wxWidgets3/src/msw/timer.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
 // Created:     04/01/98
-// RCS-ID:      $Id: timer.cpp 69170 2011-09-21 15:07:32Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/toolbar.cpp b/Externals/wxWidgets3/src/msw/toolbar.cpp
index c22a5fb63c..c292bb77de 100644
--- a/Externals/wxWidgets3/src/msw/toolbar.cpp
+++ b/Externals/wxWidgets3/src/msw/toolbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar.cpp 70798 2012-03-04 00:29:44Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,6 +126,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
+    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -340,7 +340,10 @@ bool wxToolBar::Create(wxWindow *parent,
     // in WM_ERASEBKGND too (by default this won't be done but if the toolbar
     // has a non default background colour, then it would be used in both
     // places resulting in flicker)
-    SetBackgroundStyle(wxBG_STYLE_PAINT);
+    if (wxApp::GetComCtl32Version() >= 600)
+    {
+        SetBackgroundStyle(wxBG_STYLE_PAINT);
+    }
 
     return true;
 }
@@ -981,7 +984,7 @@ bool wxToolBar::Realize()
                 {
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )
-                        button.iString = (INT_PTR)label.wx_str();
+                        button.iString = (INT_PTR) wxMSW_CONV_LPCTSTR(label);
                 }
 
                 button.idCommand = tool->GetId();
@@ -1049,6 +1052,14 @@ bool wxToolBar::Realize()
                         break;
                 }
 
+                // Instead of using fixed widths for all buttons, size them
+                // automatically according to the size of their bitmap and text
+                // label, if present. This particularly matters for toolbars
+                // with the wxTB_HORZ_LAYOUT style: they look hideously ugly
+                // without autosizing when the labels have even slightly
+                // different lengths.
+                button.fsStyle |= TBSTYLE_AUTOSIZE;
+
                 bitmapId++;
                 break;
         }
@@ -1379,7 +1390,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
     {
         LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
 
-        wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
+        wxCommandEvent evt(wxEVT_TOOL_DROPDOWN, tbhdr->iItem);
         if ( HandleWindowEvent(evt) )
         {
             // Event got handled, don't display default popup menu
@@ -1679,6 +1690,15 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
+// This handler is needed to fix problems with painting the background of
+// toolbar icons with comctl32.dll < 6.0.
+void wxToolBar::OnEraseBackground(wxEraseEvent& event)
+{
+#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
+    MSWDoEraseBackground(event.GetDC()->GetHDC());
+#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
+}
+
 bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 {
     // wait until we have some tools
@@ -1928,6 +1948,10 @@ WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
                 return 0;
             break;
 #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
+
+        case WM_PRINTCLIENT:
+            wxFillRect(GetHwnd(), (HDC)wParam, MSWGetToolbarBgBrush());
+            return 1;
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
diff --git a/Externals/wxWidgets3/src/msw/tooltip.cpp b/Externals/wxWidgets3/src/msw/tooltip.cpp
index f6b4ad6c23..56aa27bad9 100644
--- a/Externals/wxWidgets3/src/msw/tooltip.cpp
+++ b/Externals/wxWidgets3/src/msw/tooltip.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id: tooltip.cpp 66169 2010-11-16 22:38:13Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -374,17 +373,17 @@ void wxToolTip::Remove()
     DoForAllWindows(&wxToolTip::DoRemove);
 }
 
-void wxToolTip::Add(WXHWND hWnd)
+void wxToolTip::AddOtherWindow(WXHWND hWnd)
 {
     if ( !m_others )
         m_others = new wxToolTipOtherWindows;
 
     m_others->push_back(hWnd);
 
-    DoAddOtherWindow(hWnd);
+    DoAddHWND(hWnd);
 }
 
-void wxToolTip::DoAddOtherWindow(WXHWND hWnd)
+void wxToolTip::DoAddHWND(WXHWND hWnd)
 {
     HWND hwnd = (HWND)hWnd;
 
@@ -397,7 +396,7 @@ void wxToolTip::DoAddOtherWindow(WXHWND hWnd)
     // NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
     // of any length
     ti.hwnd = hwnd;
-    ti.lpszText = const_cast<wxChar *>(m_text.wx_str());
+    ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
 
     if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
     {
@@ -442,7 +441,7 @@ void wxToolTip::DoAddOtherWindow(WXHWND hWnd)
             const wxString token = tokenizer.GetNextToken();
 
             SIZE sz;
-            if ( !::GetTextExtentPoint32(hdc, token.wx_str(),
+            if ( !::GetTextExtentPoint32(hdc, token.t_str(),
                                          token.length(), &sz) )
             {
                 wxLogLastError(wxT("GetTextExtentPoint32"));
@@ -484,7 +483,7 @@ void wxToolTip::DoAddOtherWindow(WXHWND hWnd)
         // replace the '\n's with spaces because otherwise they appear as
         // unprintable characters in the tooltip string
         m_text.Replace(wxT("\n"), wxT(" "));
-        ti.lpszText = const_cast<wxChar *>(m_text.wx_str());
+        ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
 
         if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
         {
@@ -502,7 +501,7 @@ void wxToolTip::SetWindow(wxWindow *win)
     // add the window itself
     if ( m_window )
     {
-        Add(m_window->GetHWND());
+        DoAddHWND(m_window->GetHWND());
     }
 #if !defined(__WXUNIVERSAL__)
     // and all of its subcontrols (e.g. radio buttons in a radiobox) as well
@@ -526,7 +525,7 @@ void wxToolTip::SetWindow(wxWindow *win)
             // must have it by now!
             wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") );
 
-            Add((WXHWND)hwnd);
+            AddOtherWindow((WXHWND)hwnd);
         }
     }
 #endif // !defined(__WXUNIVERSAL__)
@@ -561,7 +560,7 @@ void wxToolTip::DoSetTip(WXHWND hWnd)
     ti.lpszText = const_cast<wxChar *>(wxT(""));
     (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
 
-    ti.lpszText = const_cast<wxChar *>(m_text.wx_str());
+    ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
     (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
 }
 
diff --git a/Externals/wxWidgets3/src/msw/toplevel.cpp b/Externals/wxWidgets3/src/msw/toplevel.cpp
index c8227c2a62..25ab481401 100644
--- a/Externals/wxWidgets3/src/msw/toplevel.cpp
+++ b/Externals/wxWidgets3/src/msw/toplevel.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.09.01
-// RCS-ID:      $Id: toplevel.cpp 70881 2012-03-12 11:42:49Z JS $
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -63,6 +62,21 @@
     #define ICON_SMALL 0
 #endif
 
+// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
+//            could be removed once support for it is dropped.
+#ifndef WM_UNINITMENUPOPUP
+    #define WM_UNINITMENUPOPUP 0x0125
+#endif
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS || wxUSE_MENUS_NATIVE
+    extern wxMenu *wxCurrentPopupMenu;
+#endif // wxUSE_MENUS || wxUSE_MENUS_NATIVE
+
+
 // ----------------------------------------------------------------------------
 // stubs for missing functions under MicroWindows
 // ----------------------------------------------------------------------------
@@ -144,6 +158,7 @@ void wxTopLevelWindowMSW::Init()
 #endif
 
     m_menuSystem = NULL;
+    m_menuDepth = 0;
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
@@ -414,6 +429,38 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
 #endif // #ifndef __WXUNIVERSAL__
             }
             break;
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if wxUSE_MENUS
+        case WM_INITMENUPOPUP:
+            processed = HandleMenuPopup(wxEVT_MENU_OPEN, (WXHMENU)wParam);
+            break;
+
+        case WM_MENUSELECT:
+            {
+                WXWORD item, flags;
+                WXHMENU hmenu;
+                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
+
+                processed = HandleMenuSelect(item, flags, hmenu);
+            }
+            break;
+
+        case WM_EXITMENULOOP:
+            // Under Windows 98 and 2000 and later we're going to get
+            // WM_UNINITMENUPOPUP which will be used to generate this event
+            // with more information (notably the menu that was closed) so we
+            // only need this one under old Windows systems where the newer
+            // event is never sent.
+            if ( wxGetWinVersion() < wxWinVersion_98 )
+                processed = HandleExitMenuLoop(wParam);
+            break;
+
+        case WM_UNINITMENUPOPUP:
+            processed = HandleMenuPopup(wxEVT_MENU_CLOSE, (WXHMENU)wParam);
+            break;
+#endif // wxUSE_MENUS
+#endif // !__WXMICROWIN__
     }
 
     if ( !processed )
@@ -473,7 +520,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
     if ( !title.empty() )
     {
-        ::SetWindowText(GetHwnd(), title.wx_str());
+        ::SetWindowText(GetHwnd(), title.t_str());
     }
 
     SubclassWin(m_hWnd);
@@ -523,7 +570,7 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
 #endif
 
     return MSWCreate(MSWGetRegisteredClassName(),
-                     title.wx_str(), pos, sz, flags, exflags);
+                     title.t_str(), pos, sz, flags, exflags);
 }
 
 bool wxTopLevelWindowMSW::Create(wxWindow *parent,
@@ -709,9 +756,21 @@ bool wxTopLevelWindowMSW::Show(bool show)
         }
         else if ( m_iconized )
         {
-            // iconize and show
+            // We were iconized while we were hidden, so now we need to show
+            // the window in iconized state.
             nShowCmd = SW_MINIMIZE;
         }
+        else if ( ::IsIconic(GetHwnd()) )
+        {
+            // We were restored while we were hidden, so now we need to show
+            // the window in its normal state.
+            //
+            // As below, don't activate some kinds of windows.
+            if ( HasFlag(wxFRAME_TOOL_WINDOW) || !IsEnabled() )
+                nShowCmd = SW_SHOWNOACTIVATE;
+            else
+                nShowCmd = SW_RESTORE;
+        }
         else // just show
         {
             // we shouldn't use SW_SHOW which also activates the window for
@@ -823,9 +882,9 @@ void wxTopLevelWindowMSW::Iconize(bool iconize)
     }
     else // hidden
     {
-        // iconizing the window shouldn't show it so just remember that we need
-        // to become iconized when shown later
-        m_iconized = true;
+        // iconizing the window shouldn't show it so just update the internal
+        // state (otherwise it's done by DoShowWindow() itself)
+        m_iconized = iconize;
     }
 }
 
@@ -1041,6 +1100,13 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
 
         newStyle &= ~offFlags;
 
+        // Full screen windows should logically be popups as they don't have
+        // decorations (and are definitely not children) and while not using
+        // this style doesn't seem to make any difference for most windows, it
+        // breaks wxGLCanvas in some cases, see #15434, so just always use it.
+        // XXX comex: this causes Dolphin issue 6651.
+        // newStyle |= WS_POPUP;
+
         // change our window style to be compatible with full-screen mode
         ::SetWindowLong(GetHwnd(), GWL_STYLE, newStyle);
 
@@ -1416,6 +1482,117 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
     }
 }
 
+#if wxUSE_MENUS
+
+bool
+wxTopLevelWindowMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+{
+    // Ignore the special messages generated when the menu is closed (this is
+    // the only case when the flags are set to -1), in particular don't clear
+    // the help string in the status bar when this happens as it had just been
+    // restored by the base class code.
+    if ( !hMenu && flags == 0xffff )
+        return false;
+
+    // Unfortunately we also need to ignore another message which is sent after
+    // closing the currently active submenu of the menu bar by pressing Escape:
+    // in this case we get WM_UNINITMENUPOPUP, from which we generate
+    // wxEVT_MENU_CLOSE, and _then_ we get WM_MENUSELECT for the top level menu
+    // from which we overwrite the help string just restored by OnMenuClose()
+    // handler in wxFrameBase. To prevent this from happening we discard these
+    // messages but only in the case it's really the top level menu as we still
+    // need to clear the help string when a submenu is selected in a menu.
+    if ( flags == (MF_POPUP | MF_HILITE) && !m_menuDepth )
+        return false;
+
+    // sign extend to int from unsigned short we get from Windows
+    int item = (signed short)nItem;
+
+    // WM_MENUSELECT is generated for both normal items and menus, including
+    // the top level menus of the menu bar, which can't be represented using
+    // any valid identifier in wxMenuEvent so use an otherwise unused value for
+    // them
+    if ( flags & (MF_POPUP | MF_SEPARATOR) )
+        item = wxID_NONE;
+
+    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
+    event.SetEventObject(this);
+
+    if ( HandleWindowEvent(event) )
+        return true;
+
+    // by default, i.e. if the event wasn't handled above, clear the status bar
+    // text when an item which can't have any associated help string in wx API
+    // is selected
+    if ( item == wxID_NONE )
+        DoGiveHelp(wxEmptyString, true);
+
+    return false;
+}
+
+bool
+wxTopLevelWindowMSW::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
+{
+    // Update the menu depth when dealing with the top level menus.
+    if ( !popup )
+    {
+        if ( evtType == wxEVT_MENU_OPEN )
+        {
+            m_menuDepth++;
+        }
+        else if ( evtType == wxEVT_MENU_CLOSE )
+        {
+            wxASSERT_MSG( m_menuDepth > 0, wxS("No open menus?") );
+
+            m_menuDepth--;
+        }
+        else
+        {
+            wxFAIL_MSG( wxS("Unexpected menu event type") );
+        }
+    }
+
+    wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);
+    event.SetEventObject(menu);
+
+    return HandleWindowEvent(event);
+}
+
+bool wxTopLevelWindowMSW::HandleExitMenuLoop(WXWORD isPopup)
+{
+    return DoSendMenuOpenCloseEvent(wxEVT_MENU_CLOSE,
+                                    isPopup ? wxCurrentPopupMenu : NULL,
+                                    isPopup != 0);
+}
+
+bool wxTopLevelWindowMSW::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
+{
+    bool isPopup = false;
+    wxMenu* menu = NULL;
+    if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetHMenu() == hMenu )
+    {
+        menu = wxCurrentPopupMenu;
+        isPopup = true;
+    }
+    else
+    {
+        menu = MSWFindMenuFromHMENU(hMenu);
+    }
+
+
+    return DoSendMenuOpenCloseEvent(evtType, menu, isPopup);
+}
+
+wxMenu* wxTopLevelWindowMSW::MSWFindMenuFromHMENU(WXHMENU WXUNUSED(hMenu))
+{
+    // We don't have any menus at this level.
+    return NULL;
+}
+
+#endif // wxUSE_MENUS
+
+
+
 // the DialogProc for all wxWidgets dialogs
 LONG APIENTRY _EXPORT
 wxDlgProc(HWND hDlg,
diff --git a/Externals/wxWidgets3/src/msw/treectrl.cpp b/Externals/wxWidgets3/src/msw/treectrl.cpp
index 907e96b489..8f664ffa2f 100644
--- a/Externals/wxWidgets3/src/msw/treectrl.cpp
+++ b/Externals/wxWidgets3/src/msw/treectrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Created:     1997
-// RCS-ID:      $Id: treectrl.cpp 70660 2012-02-21 09:24:52Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -84,13 +83,21 @@ class TreeItemUnlocker
 {
 public:
     // unlock a single item
-    TreeItemUnlocker(HTREEITEM item) { ms_unlockedItem = item; }
+    TreeItemUnlocker(HTREEITEM item)
+    {
+        m_oldUnlockedItem = ms_unlockedItem;
+        ms_unlockedItem = item;
+    }
 
     // unlock all items, don't use unless absolutely necessary
-    TreeItemUnlocker() { ms_unlockedItem = (HTREEITEM)-1; }
+    TreeItemUnlocker()
+    {
+        m_oldUnlockedItem = ms_unlockedItem;
+        ms_unlockedItem = (HTREEITEM)-1;
+    }
 
     // lock everything back
-    ~TreeItemUnlocker() { ms_unlockedItem = NULL; }
+    ~TreeItemUnlocker() { ms_unlockedItem = m_oldUnlockedItem; }
 
 
     // check if the item state is currently locked
@@ -99,6 +106,9 @@ public:
 
 private:
     static HTREEITEM ms_unlockedItem;
+    HTREEITEM m_oldUnlockedItem;
+
+    wxDECLARE_NO_COPY_CLASS(TreeItemUnlocker);
 };
 
 HTREEITEM TreeItemUnlocker::ms_unlockedItem = NULL;
@@ -655,8 +665,8 @@ static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX];
    but logically it's a const table with the following entries:
 =
 {
-    { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
-    { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
+    { wxEVT_TREE_ITEM_COLLAPSED, wxEVT_TREE_ITEM_COLLAPSING },
+    { wxEVT_TREE_ITEM_EXPANDED,  wxEVT_TREE_ITEM_EXPANDING  }
 };
 */
 
@@ -715,10 +725,10 @@ void wxTreeCtrl::Init()
 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only
-    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
-    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
-    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_EXPANDING;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_TREE_ITEM_COLLAPSED;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_TREE_ITEM_COLLAPSING;
+    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_TREE_ITEM_EXPANDED;
+    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_TREE_ITEM_EXPANDING;
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,
@@ -959,7 +969,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
         return;
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
-    tvItem.pszText = (wxChar *)text.wx_str();  // conversion is ok
+    tvItem.pszText = wxMSW_CONV_LPTSTR(text);
     DoSetItem(&tvItem);
 
     // when setting the text of the item being edited, the text control should
@@ -972,7 +982,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
     {
         if ( item == m_idEdited )
         {
-            ::SetWindowText(hwndEdit, text.wx_str());
+            ::SetWindowText(hwndEdit, text.t_str());
         }
     }
 }
@@ -1476,7 +1486,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     if ( !text.empty() )
     {
         mask |= TVIF_TEXT;
-        tvIns.item.pszText = (wxChar *)text.wx_str();  // cast is ok
+        tvIns.item.pszText = wxMSW_CONV_LPTSTR(text);
     }
     else
     {
@@ -1588,6 +1598,18 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);
 }
 
+bool wxTreeCtrl::MSWDeleteItem(const wxTreeItemId& item)
+{
+    TempSetter set(m_changingSelection);
+    if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
+    {
+        wxLogLastError(wxT("TreeView_DeleteItem"));
+        return false;
+    }
+
+    return true;
+}
+
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {
     // unlock tree selections on vista, without this the
@@ -1609,14 +1631,8 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
             }
         }
 
-        {
-            TempSetter set(m_changingSelection);
-            if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
-            {
-                wxLogLastError(wxT("TreeView_DeleteItem"));
-                return;
-            }
-        }
+        if ( !MSWDeleteItem(item) )
+            return;
 
         if ( !selected )
         {
@@ -1631,11 +1647,11 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
 
         if ( next.IsOk() )
         {
-            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
 
             if ( IsTreeEventAllowed(changingEvent) )
             {
-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
                 (void)HandleTreeEvent(changedEvent);
             }
             else
@@ -1647,10 +1663,7 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
     }
     else
     {
-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
-        {
-            wxLogLastError(wxT("TreeView_DeleteItem"));
-        }
+        MSWDeleteItem(item);
     }
 }
 
@@ -1728,7 +1741,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 
     if ( IsExpanded(item) )
     {
-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING,
                           this, wxTreeItemId(item));
 
         if ( !IsTreeEventAllowed(event) )
@@ -1740,7 +1753,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
         if ( IsExpanded(item) )
             return;
 
-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, this, item);
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSED, this, item);
         (void)HandleTreeEvent(event);
     }
     //else: change didn't took place, so do nothing at all
@@ -1781,7 +1794,7 @@ void wxTreeCtrl::Unselect()
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                   this, wxTreeItemId());
         changingEvent.m_itemOld = htFocus;
 
@@ -1789,7 +1802,7 @@ void wxTreeCtrl::Unselect()
         {
             ClearFocusedItem();
 
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                      this, wxTreeItemId());
             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);
@@ -1821,14 +1834,14 @@ void wxTreeCtrl::UnselectAll()
         HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( !htFocus ) return;
 
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
         changingEvent.m_itemOld = htFocus;
 
         if ( IsTreeEventAllowed(changingEvent) )
         {
             DoUnselectAll();
 
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);
         }
@@ -1859,14 +1872,14 @@ void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
 
     HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
 
-    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
+    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
     changingEvent.m_itemOld = htFocus;
 
     if ( IsTreeEventAllowed(changingEvent) )
     {
         DoSelectChildren(parent);
 
-        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
+        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
         changedEvent.m_itemOld = htFocus;
         (void)HandleTreeEvent(changedEvent);
     }
@@ -1891,7 +1904,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, item);
 
         if ( IsTreeEventAllowed(changingEvent) )
         {
@@ -1903,7 +1916,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
                 SetFocusedItem(item);
             }
 
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                      this, item);
             (void)HandleTreeEvent(changedEvent);
         }
@@ -1927,7 +1940,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
         // not so send the events ourselves and ignore those generated by
         // TreeView_SelectItem() if m_changingSelection is set.
         wxTreeEvent
-            changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, itemNew);
+            changingEvent(wxEVT_TREE_SEL_CHANGING, this, itemNew);
         changingEvent.SetOldItem(itemOld);
 
         if ( IsTreeEventAllowed(changingEvent) )
@@ -1942,7 +1955,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
             {
                 ::SetFocus(GetHwnd(), HITEM(item));
 
-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                          this, itemNew);
                 changedEvent.SetOldItem(itemOld);
                 (void)HandleTreeEvent(changedEvent);
@@ -1996,7 +2009,7 @@ void wxTreeCtrl::DeleteTextCtrl()
 wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
                                   wxClassInfo *textControlClass)
 {
-    wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
+    wxASSERT( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)) );
 
     DeleteTextCtrl();
 
@@ -2156,7 +2169,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
     //     combo for your derived wxTreeCtrl if will sort without
     //     OnCompareItems
-    if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
+    if ( GetClassInfo() == wxCLASSINFO(wxTreeCtrl) )
     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);
     }
@@ -2182,7 +2195,7 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
         // conjunction with modifiers
         if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
         {
-            // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+            // we need VK_RETURN to generate wxEVT_TREE_ITEM_ACTIVATED
             return false;
         }
     }
@@ -2196,7 +2209,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
 
     if ( cmd == EN_UPDATE )
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        wxCommandEvent event(wxEVT_TEXT, id);
         event.SetEventObject( this );
         ProcessCommand(event);
     }
@@ -2240,7 +2253,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
             if ( vkey != VK_RETURN && bCtrl )
             {
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                           this, htSel);
                 changingEvent.m_itemOld = htSel;
 
@@ -2248,7 +2261,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 {
                     DoToggleItemSelection(wxTreeItemId(htSel));
 
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                              this, htSel);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
@@ -2261,7 +2274,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
                 if ( count != 1 || HITEM(selections[0]) != htSel )
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                               this, htSel);
                     changingEvent.m_itemOld = htSel;
 
@@ -2270,7 +2283,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoUnselectAll();
                         DoSelectItem(wxTreeItemId(htSel));
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                  this, htSel);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
@@ -2305,7 +2318,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     break;
                 }
 
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                           this, next);
                 changingEvent.m_itemOld = htSel;
 
@@ -2315,7 +2328,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
@@ -2340,7 +2353,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
                     changingEvent.m_itemOld = htSel;
 
                     if ( IsTreeEventAllowed(changingEvent) )
@@ -2348,7 +2361,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                                     SR_UNSELECT_OTHERS);
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                     }
@@ -2369,7 +2382,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
                 if ( next.IsOk() && !IsHiddenRoot(next) )
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                               this, next);
                     changingEvent.m_itemOld = htSel;
 
@@ -2379,7 +2392,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoSelectItem(next);
                         SetFocusedItem(next);
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
@@ -2405,7 +2418,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
             {
                 wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
 
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
                 changingEvent.m_itemOld = htSel;
 
                 if ( IsTreeEventAllowed(changingEvent) )
@@ -2414,7 +2427,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                 }
@@ -2462,7 +2475,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                                      HITEM(m_htSelStart), HITEM(next),
                                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                     {
-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                                   this, next);
                         changingEvent.m_itemOld = htSel;
 
@@ -2473,7 +2486,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                                         SR_UNSELECT_OTHERS);
                             SetFocusedItem(next);
 
-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                      this, next);
                             changedEvent.m_itemOld = htSel;
                             (void)HandleTreeEvent(changedEvent);
@@ -2482,7 +2495,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 }
                 else // no Shift
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                               this, next);
                     changingEvent.m_itemOld = htSel;
 
@@ -2492,7 +2505,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoSelectItem(next);
                         SetFocusedItem(next);
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
@@ -2584,7 +2597,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     next = nextTemp;
                 }
 
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                           this, next);
                 changingEvent.m_itemOld = htSel;
 
@@ -2595,7 +2608,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
@@ -2612,7 +2625,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
 bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
 {
-    wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
+    wxTreeEvent keyEvent(wxEVT_TREE_KEY_DOWN, this);
     keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
 
     bool processed = HandleTreeEvent(keyEvent);
@@ -2624,7 +2637,7 @@ bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
         const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( htSel )
         {
-            wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+            wxTreeEvent activatedEvent(wxEVT_TREE_ITEM_ACTIVATED,
                                        this, htSel);
             (void)HandleTreeEvent(activatedEvent);
         }
@@ -2687,7 +2700,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         // create the event
         if ( item.IsOk() )
         {
-            wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
+            wxTreeEvent event(wxEVT_TREE_ITEM_MENU, this, item);
 
             event.m_pointDrag = pt;
 
@@ -2760,7 +2773,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         break;
                     }
 
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 
@@ -2774,7 +2787,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);
@@ -2809,7 +2822,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
                     if ( willChange )
                     {
-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                                   this, htItem);
                         changingEvent.m_itemOld = htOldItem;
 
@@ -2829,7 +2842,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
                             SetFocusedItem(wxTreeItemId(htItem));
 
-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                      this, htItem);
                             changedEvent.m_itemOld = htOldItem;
                             (void)HandleTreeEvent(changedEvent);
@@ -2860,7 +2873,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // multiple drag and drop to work.
                         if ( !IsItemSelected(GetHwnd(), htItem))
                         {
-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 
@@ -2870,7 +2883,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 
-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);
@@ -2914,10 +2927,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 // click if needed
                 if ( processed )
                 {
-                    int htFlags = 0;
-                    wxTreeItemId item = HitTest(wxPoint(x, y), htFlags);
-
-                    if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
+                    if ( tvht.flags & TVHT_ONITEMSTATEICON )
                     {
                         m_triggerStateImageClick = true;
                     }
@@ -2942,7 +2952,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 // confusing, so override this default behaviour
                 if ( !IsItemSelected(GetHwnd(), htItem) )
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 
@@ -2952,7 +2962,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         DoSelectItem(wxTreeItemId(htItem));
                         SetFocusedItem(wxTreeItemId(htItem));
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);
@@ -3036,7 +3046,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         {
                             m_mouseUpDeselect = false;
 
-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 
@@ -3046,7 +3056,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 
-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);
@@ -3060,7 +3070,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     {
                         if ( tvht.flags & TVHT_ONITEMSTATEICON )
                         {
-                            wxTreeEvent event(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK,
+                            wxTreeEvent event(wxEVT_TREE_STATE_IMAGE_CLICK,
                                               this, htItem);
                             (void)HandleTreeEvent(event);
 
@@ -3085,7 +3095,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     wxDELETE(m_dragImage);
 
                     // generate the drag end event
-                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG,
+                    wxTreeEvent event(wxEVT_TREE_END_DRAG,
                                       this, htItem);
                     event.m_pointDrag = wxPoint(x, y);
                     (void)HandleTreeEvent(event);
@@ -3245,13 +3255,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case TVN_BEGINDRAG:
-            eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+            eventType = wxEVT_TREE_BEGIN_DRAG;
             // fall through
 
         case TVN_BEGINRDRAG:
             {
                 if ( eventType == wxEVT_NULL )
-                    eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+                    eventType = wxEVT_TREE_BEGIN_RDRAG;
                 //else: left drag, already set above
 
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
@@ -3268,7 +3278,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_BEGINLABELEDIT:
             {
-                eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
+                eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 // although the user event handler may still veto it, it is
@@ -3283,7 +3293,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_DELETEITEM:
             {
-                eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
+                eventType = wxEVT_TREE_DELETE_ITEM;
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
                 event.m_item = tv->itemOld.hItem;
@@ -3302,7 +3312,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_ENDLABELEDIT:
             {
-                eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
+                eventType = wxEVT_TREE_END_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = info->item.hItem;
@@ -3326,7 +3336,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifdef TVN_GETINFOTIP
         case TVN_GETINFOTIP:
             {
-                eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+                eventType = wxEVT_TREE_ITEM_GETTOOLTIP;
                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?
@@ -3338,13 +3348,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #endif // !__WXWINCE__
 
         case TVN_GETDISPINFO:
-            eventType = wxEVT_COMMAND_TREE_GET_INFO;
+            eventType = wxEVT_TREE_GET_INFO;
             // fall through
 
         case TVN_SETDISPINFO:
             {
                 if ( eventType == wxEVT_NULL )
-                    eventType = wxEVT_COMMAND_TREE_SET_INFO;
+                    eventType = wxEVT_TREE_SET_INFO;
                 //else: get, already set above
 
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
@@ -3432,7 +3442,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TVN_SELCHANGEDW:
             if ( !m_changingSelection )
             {
-                eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
+                eventType = wxEVT_TREE_SEL_CHANGED;
             }
             // fall through
 
@@ -3441,7 +3451,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             if ( !m_changingSelection )
             {
                 if ( eventType == wxEVT_NULL )
-                    eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
+                    eventType = wxEVT_TREE_SEL_CHANGING;
                 //else: already set above
 
                 if (hdr->code == TVN_SELCHANGINGW ||
@@ -3505,7 +3515,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                             {
                                 wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));
                                 if ( dllComCtl32.IsLoaded() )
+                                {
                                     wxDL_INIT_FUNC(s_pfn, ImageList_Copy, dllComCtl32);
+                                    loaded = true;
+                                }
                             }
 
                             if ( !s_pfnImageList_Copy )
@@ -3637,7 +3650,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
                 {
                     event.m_item = item;
-                    eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
+                    eventType = wxEVT_TREE_STATE_IMAGE_CLICK;
                 }
 
                 break;
@@ -3655,8 +3668,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK
-                                    ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
-                                    : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                                    ? wxEVT_TREE_ITEM_ACTIVATED
+                                    : wxEVT_TREE_ITEM_RIGHT_CLICK;
 
                         event.m_pointDrag.x = tvhti.pt.x;
                         event.m_pointDrag.y = tvhti.pt.y;
@@ -3912,4 +3925,51 @@ void wxTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
     DoSetItem(&tvItem);
 }
 
+// ----------------------------------------------------------------------------
+// Update locking.
+// ----------------------------------------------------------------------------
+
+// Using WM_SETREDRAW with the native control is a bad idea as it's broken in
+// some Windows versions (see http://support.microsoft.com/kb/130611) and
+// doesn't seem to do anything in other ones (e.g. under Windows 7 the tree
+// control keeps updating its scrollbars while the items are added to it,
+// resulting in horrible flicker when adding even a couple of dozen items).
+// So we resize it to the smallest possible size instead of freezing -- this
+// still flickers, but actually not as badly as it would if we didn't do it.
+
+void wxTreeCtrl::DoFreeze()
+{
+    if ( IsShown() )
+    {
+        RECT rc;
+        ::GetWindowRect(GetHwnd(), &rc);
+        m_thawnSize = wxRectFromRECT(rc).GetSize();
+
+        ::SetWindowPos(GetHwnd(), 0, 0, 0, 1, 1,
+                       SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    }
+}
+
+void wxTreeCtrl::DoThaw()
+{
+    if ( IsShown() )
+    {
+        if ( m_thawnSize != wxDefaultSize )
+        {
+            ::SetWindowPos(GetHwnd(), 0, 0, 0, m_thawnSize.x, m_thawnSize.y,
+                           SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+    }
+}
+
+// We also need to override DoSetSize() to ensure that m_thawnSize is reset if
+// the window is resized while being frozen -- in this case, we need to avoid
+// resizing it back to its original, pre-freeze, size when it's thawed.
+void wxTreeCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    m_thawnSize = wxDefaultSize;
+
+    wxTreeCtrlBase::DoSetSize(x, y, width, height, sizeFlags);
+}
+
 #endif // wxUSE_TREECTRL
diff --git a/Externals/wxWidgets3/src/msw/uiaction.cpp b/Externals/wxWidgets3/src/msw/uiaction.cpp
index a26d910954..5308d9c0f1 100644
--- a/Externals/wxWidgets3/src/msw/uiaction.cpp
+++ b/Externals/wxWidgets3/src/msw/uiaction.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
-// RCS-ID:      $Id: uiaction.cpp 70811 2012-03-05 13:00:51Z VZ $
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
@@ -65,8 +64,10 @@ bool wxUIActionSimulator::MouseMove(long x, long y)
     int displayx, displayy;
     wxDisplaySize(&displayx, &displayy);
 
-    int scaledx = ceil((float)x * 65535.0 / (displayx-1));
-    int scaledy = ceil((float)y * 65535.0 / (displayy-1));
+    // Casts are safe because x and y are supposed to be less than the display
+    // size, so there is no danger of overflow.
+    DWORD scaledx = static_cast<DWORD>(ceil(x * 65535.0 / (displayx-1)));
+    DWORD scaledy = static_cast<DWORD>(ceil(y * 65535.0 / (displayy-1)));
     mouse_event(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, scaledx, scaledy, 0, 0);
 
     return true;
diff --git a/Externals/wxWidgets3/src/msw/urlmsw.cpp b/Externals/wxWidgets3/src/msw/urlmsw.cpp
index 5ae208ea76..75febe2704 100644
--- a/Externals/wxWidgets3/src/msw/urlmsw.cpp
+++ b/Externals/wxWidgets3/src/msw/urlmsw.cpp
@@ -4,7 +4,6 @@
 // Author:      Hajo Kirchhoff
 // Modified by:
 // Created:     06/11/2003
-// RCS-ID:      $Id: urlmsw.cpp 58757 2009-02-08 11:45:59Z VZ $
 // Copyright:   (c) 2003 Hajo Kirchhoff
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/utils.cpp b/Externals/wxWidgets3/src/msw/utils.cpp
index ed51402e0b..59adbbe3cc 100644
--- a/Externals/wxWidgets3/src/msw/utils.cpp
+++ b/Externals/wxWidgets3/src/msw/utils.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: utils.cpp 69170 2011-09-21 15:07:32Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,9 +59,7 @@
 #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 
-    #ifndef __MWERKS__
-        #include <dos.h>
-    #endif
+    #include <dos.h>
 #endif  //GNUWIN32
 
 #if defined(__CYGWIN__)
@@ -143,7 +140,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
             !regKey.QueryValue(wxT("Name"), hostName) )
         return false;
 
-    wxStrlcpy(buf, hostName.wx_str(), maxSize);
+    wxStrlcpy(buf, hostName.t_str(), maxSize);
 #else // !__WXWINCE__
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
@@ -638,7 +635,8 @@ bool wxDoSetEnv(const wxString& var, const wxChar *value)
     envstr += '=';
     if ( value )
         envstr += value;
-    _tputenv(envstr.t_str());
+    if ( _tputenv(envstr.t_str()) != 0 )
+        return false;
 #else // other compiler
     if ( !::SetEnvironmentVariable(var.t_str(), value) )
     {
@@ -1078,12 +1076,6 @@ unsigned long wxGetProcessId()
     return ::GetCurrentProcessId();
 }
 
-// Emit a beeeeeep
-void wxBell()
-{
-    ::MessageBeep((UINT)-1);        // default sound
-}
-
 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS
@@ -1111,14 +1103,14 @@ bool
 wxLoadUserResource(const void **outData,
                    size_t *outLen,
                    const wxString& resourceName,
-                   const wxString& resourceType,
+                   const wxChar* resourceType,
                    WXHINSTANCE instance)
 {
     wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" );
 
     HRSRC hResource = ::FindResource(instance,
-                                     resourceName.wx_str(),
-                                     resourceType.wx_str());
+                                     resourceName.t_str(),
+                                     resourceType);
     if ( !hResource )
         return false;
 
@@ -1147,7 +1139,7 @@ wxLoadUserResource(const void **outData,
 
 char *
 wxLoadUserResource(const wxString& resourceName,
-                   const wxString& resourceType,
+                   const wxChar* resourceType,
                    int* pLen,
                    WXHINSTANCE instance)
 {
@@ -1309,6 +1301,18 @@ wxString wxGetOsDescription()
                                         ? _("Windows Server 2008 R2")
                                         : _("Windows 7");
                                 break;
+
+                            case 2:
+                                str = wxIsWindowsServer() == 1
+                                        ? _("Windows Server 2012")
+                                        : _("Windows 8");
+                                break;
+
+                            case 3:
+                                str = wxIsWindowsServer() == 1
+                                        ? _("Windows Server 2012 R2")
+                                        : _("Windows 8.1");
+                                break;
                         }
                         break;
                 }
diff --git a/Externals/wxWidgets3/src/msw/utilsexc.cpp b/Externals/wxWidgets3/src/msw/utilsexc.cpp
index 950a0cab6e..82c7649972 100644
--- a/Externals/wxWidgets3/src/msw/utilsexc.cpp
+++ b/Externals/wxWidgets3/src/msw/utilsexc.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: utilsexc.cpp 70051 2011-12-19 12:54:48Z VZ $
 // Copyright:   (c) 1998-2002 wxWidgets dev team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,13 +47,10 @@
 
 #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
-#ifndef __MWERKS__
     #include <dos.h>
 #endif
-#endif
 
 #if defined(__GNUWIN32__)
-    #include <sys/unistd.h>
     #include <sys/stat.h>
 #endif
 
@@ -84,6 +80,15 @@
 
 #include "wx/msw/private/hiddenwin.h"
 
+// FIXME-VC6: These are not defined in VC6 SDK headers.
+#ifndef BELOW_NORMAL_PRIORITY_CLASS
+    #define BELOW_NORMAL_PRIORITY_CLASS 0x4000
+#endif
+
+#ifndef ABOVE_NORMAL_PRIORITY_CLASS
+    #define ABOVE_NORMAL_PRIORITY_CLASS 0x8000
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -194,50 +199,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxExecuteModule, wxModule)
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
 
-// ----------------------------------------------------------------------------
-// wxPipeStreams
-// ----------------------------------------------------------------------------
-
-class wxPipeInputStream: public wxInputStream
-{
-public:
-    wxPipeInputStream(HANDLE hInput);
-    virtual ~wxPipeInputStream();
-
-    // returns true if the pipe is still opened
-    bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
-
-    // returns true if there is any data to be read from the pipe
-    virtual bool CanRead() const;
-
-protected:
-    size_t OnSysRead(void *buffer, size_t len);
-
-protected:
-    HANDLE m_hInput;
-
-    wxDECLARE_NO_COPY_CLASS(wxPipeInputStream);
-};
-
-class wxPipeOutputStream: public wxOutputStream
-{
-public:
-    wxPipeOutputStream(HANDLE hOutput);
-    virtual ~wxPipeOutputStream() { Close(); }
-    bool Close();
-
-protected:
-    size_t OnSysWrite(const void *buffer, size_t len);
-
-protected:
-    HANDLE m_hOutput;
-
-    wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream);
-};
-
-// define this to let wxexec.cpp know that we know what we're doing
-#define _WX_USED_BY_WXEXECUTE_
-#include "../common/execcmn.cpp"
+#include "wx/private/pipestream.h"
+#include "wx/private/streamtempinput.h"
 
 // ----------------------------------------------------------------------------
 // wxPipe represents a Win32 anonymous pipe
@@ -854,19 +817,39 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         }
     }
 
+    // Translate wxWidgets priority to Windows conventions.
+    if ( handler )
+    {
+        unsigned prio = handler->GetPriority();
+        if ( prio <= 20 )
+            dwFlags |= IDLE_PRIORITY_CLASS;
+        else if ( prio <= 40 )
+            dwFlags |= BELOW_NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 60 )
+            dwFlags |= NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 80 )
+            dwFlags |= ABOVE_NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 99 )
+            dwFlags |= HIGH_PRIORITY_CLASS;
+        else if ( prio <= 100 )
+            dwFlags |= REALTIME_PRIORITY_CLASS;
+        else
+        {
+            wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
+            dwFlags |= NORMAL_PRIORITY_CLASS;
+        }
+    }
+
     bool ok = ::CreateProcess
                 (
                     // WinCE requires appname to be non null
                     // Win32 allows for null
 #ifdef __WXWINCE__
-                 (wxChar *)
-                 moduleName.wx_str(),// application name
-                 (wxChar *)
-                 arguments.wx_str(), // arguments
+                 moduleName.t_str(), // application name
+                 wxMSW_CONV_LPTSTR(arguments), // arguments
 #else
                  NULL,               // application name (use only cmd line)
-                 (wxChar *)
-                 command.wx_str(),   // full command line
+                 wxMSW_CONV_LPTSTR(command), // full command line
 #endif
                  NULL,               // security attributes: defaults for both
                  NULL,               //   the process and its main thread
@@ -874,7 +857,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
                  dwFlags,            // process creation flags
                  envBuffer.data(),   // environment (may be NULL which is fine)
                  useCwd              // initial working directory
-                    ? const_cast<wxChar *>(env->cwd.wx_str())
+                    ? wxMSW_CONV_LPTSTR(env->cwd)
                     : NULL,          //     (or use the same)
                  &si,                // startup info (unused here)
                  &pi                 // process info
@@ -1001,7 +984,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     // just launched process
     if ( !ddeServer.empty() )
     {
-        bool ok;
+        bool ddeOK;
 
         // give the process the time to init itself
         //
@@ -1020,15 +1003,15 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
             case WAIT_TIMEOUT:
                 wxLogDebug(wxT("Timeout too small in WaitForInputIdle"));
 
-                ok = false;
+                ddeOK = false;
                 break;
 
             case 0:
                 // ok, process ready to accept DDE requests
-                ok = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);
+                ddeOK = wxExecuteDDE(ddeServer, ddeTopic, ddeCommand);
         }
 
-        if ( !ok )
+        if ( !ddeOK )
         {
             wxLogDebug(wxT("Failed to send DDE request to the process \"%s\"."),
                        cmd.c_str());
diff --git a/Externals/wxWidgets3/src/msw/utilsgui.cpp b/Externals/wxWidgets3/src/msw/utilsgui.cpp
index a04501fadb..a174c666b5 100644
--- a/Externals/wxWidgets3/src/msw/utilsgui.cpp
+++ b/Externals/wxWidgets3/src/msw/utilsgui.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/utilsgui.cpp
-// Purpose:     Various utility functions only available in GUI
+// Purpose:     Various utility functions only available in wxMSW GUI
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from msw/utils.cpp)
-// RCS-ID:      $Id: utilsgui.cpp 69758 2011-11-14 12:51:53Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,14 +32,17 @@
 #include "wx/dynlib.h"
 
 #include "wx/msw/private.h"     // includes <windows.h>
-#include "wx/msw/registry.h"
-#include <shellapi.h> // needed for SHELLEXECUTEINFO
-
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+// Emit a beeeeeep
+void wxBell()
+{
+    ::MessageBeep((UINT)-1);        // default sound
+}
+
 // ---------------------------------------------------------------------------
 // helper functions for showing a "busy" cursor
 // ---------------------------------------------------------------------------
@@ -191,24 +193,6 @@ void wxDisplaySizeMM(int *width, int *height)
 #endif
 }
 
-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
-{
-#if defined(__WXMICROWIN__)
-    *x = 0; *y = 0;
-    wxDisplaySize(width, height);
-#else
-    // Determine the desktop dimensions minus the taskbar and any other
-    // special decorations...
-    RECT r;
-
-    SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
-    if (x)      *x = r.left;
-    if (y)      *y = r.top;
-    if (width)  *width = r.right - r.left;
-    if (height) *height = r.bottom - r.top;
-#endif
-}
-
 // ---------------------------------------------------------------------------
 // window information functions
 // ---------------------------------------------------------------------------
@@ -363,117 +347,3 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
     return false;
 #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
 }
-
-// ----------------------------------------------------------------------------
-// Launch document with default app
-// ----------------------------------------------------------------------------
-
-bool wxLaunchDefaultApplication(const wxString& document, int flags)
-{
-    wxUnusedVar(flags);
-
-    WinStruct<SHELLEXECUTEINFO> sei;
-    sei.lpFile = document.wx_str();
-#ifdef __WXWINCE__
-    sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
-#else
-    sei.nShow = SW_SHOWDEFAULT;
-#endif
-
-    // avoid Windows message box in case of error for consistency with
-    // wxLaunchDefaultBrowser() even if don't show the error ourselves in this
-    // function
-    sei.fMask = SEE_MASK_FLAG_NO_UI;
-
-    if ( ::ShellExecuteEx(&sei) )
-        return true;
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// Launch default browser
-// ----------------------------------------------------------------------------
-
-bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
-{
-    wxUnusedVar(flags);
-
-#if wxUSE_IPC
-    if ( flags & wxBROWSER_NEW_WINDOW )
-    {
-        // ShellExecuteEx() opens the URL in an existing window by default so
-        // we can't use it if we need a new window
-        wxRegKey key(wxRegKey::HKCR, scheme + wxT("\\shell\\open"));
-        if ( !key.Exists() )
-        {
-            // try the default browser, it must be registered at least for http URLs
-            key.SetName(wxRegKey::HKCR, wxT("http\\shell\\open"));
-        }
-
-        if ( key.Exists() )
-        {
-            wxRegKey keyDDE(key, wxT("DDEExec"));
-            if ( keyDDE.Exists() )
-            {
-                // we only know the syntax of WWW_OpenURL DDE request for IE,
-                // optimistically assume that all other browsers are compatible
-                // with it
-                static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
-                wxString ddeCmd;
-                wxRegKey keyTopic(keyDDE, wxT("topic"));
-                bool ok = keyTopic.Exists() &&
-                            keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;
-                if ( ok )
-                {
-                    ddeCmd = keyDDE.QueryDefaultValue();
-                    ok = !ddeCmd.empty();
-                }
-
-                if ( ok )
-                {
-                    // for WWW_OpenURL, the index of the window to open the URL
-                    // in is -1 (meaning "current") by default, replace it with
-                    // 0 which means "new" (see KB article 160957)
-                    ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
-                                        false /* only first occurrence */) == 1;
-                }
-
-                if ( ok )
-                {
-                    // and also replace the parameters: the topic should
-                    // contain a placeholder for the URL
-                    ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
-                }
-
-                if ( ok )
-                {
-                    // try to send it the DDE request now but ignore the errors
-                    wxLogNull noLog;
-
-                    const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
-                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
-                        return true;
-
-                    // this is not necessarily an error: maybe browser is
-                    // simply not running, but no matter, in any case we're
-                    // going to launch it using ShellExecuteEx() below now and
-                    // we shouldn't try to open a new window if we open a new
-                    // browser anyhow
-                }
-            }
-        }
-    }
-#endif // wxUSE_IPC
-
-    WinStruct<SHELLEXECUTEINFO> sei;
-    sei.lpFile = url.c_str();
-    sei.lpVerb = wxT("open");
-    sei.nShow = SW_SHOWNORMAL;
-    sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
-
-    if ( ::ShellExecuteEx(&sei) )
-        return true;
-
-    return false;
-}
diff --git a/Externals/wxWidgets3/src/msw/utilswin.cpp b/Externals/wxWidgets3/src/msw/utilswin.cpp
new file mode 100644
index 0000000000..18af87b0f9
--- /dev/null
+++ b/Externals/wxWidgets3/src/msw/utilswin.cpp
@@ -0,0 +1,138 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/utilswin.cpp
+// Purpose:     Various utility functions only available in Windows GUI
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     21.06.2003 (extracted from msw/utils.cpp)
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/msw/private.h"     // includes <windows.h>
+#include "wx/msw/registry.h"
+#include <shellapi.h> // needed for SHELLEXECUTEINFO
+
+// ----------------------------------------------------------------------------
+// Launch document with default app
+// ----------------------------------------------------------------------------
+
+bool wxLaunchDefaultApplication(const wxString& document, int flags)
+{
+    wxUnusedVar(flags);
+
+    WinStruct<SHELLEXECUTEINFO> sei;
+    sei.lpFile = document.t_str();
+#ifdef __WXWINCE__
+    sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
+#else
+    sei.nShow = SW_SHOWDEFAULT;
+#endif
+
+    // avoid Windows message box in case of error for consistency with
+    // wxLaunchDefaultBrowser() even if don't show the error ourselves in this
+    // function
+    sei.fMask = SEE_MASK_FLAG_NO_UI;
+
+    if ( ::ShellExecuteEx(&sei) )
+        return true;
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// Launch default browser
+// ----------------------------------------------------------------------------
+
+bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
+{
+    wxUnusedVar(flags);
+
+#if wxUSE_IPC
+    if ( flags & wxBROWSER_NEW_WINDOW )
+    {
+        // ShellExecuteEx() opens the URL in an existing window by default so
+        // we can't use it if we need a new window
+        wxRegKey key(wxRegKey::HKCR, scheme + wxT("\\shell\\open"));
+        if ( !key.Exists() )
+        {
+            // try the default browser, it must be registered at least for http URLs
+            key.SetName(wxRegKey::HKCR, wxT("http\\shell\\open"));
+        }
+
+        if ( key.Exists() )
+        {
+            wxRegKey keyDDE(key, wxT("DDEExec"));
+            if ( keyDDE.Exists() )
+            {
+                // we only know the syntax of WWW_OpenURL DDE request for IE,
+                // optimistically assume that all other browsers are compatible
+                // with it
+                static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
+                wxString ddeCmd;
+                wxRegKey keyTopic(keyDDE, wxT("topic"));
+                bool ok = keyTopic.Exists() &&
+                            keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;
+                if ( ok )
+                {
+                    ddeCmd = keyDDE.QueryDefaultValue();
+                    ok = !ddeCmd.empty();
+                }
+
+                if ( ok )
+                {
+                    // for WWW_OpenURL, the index of the window to open the URL
+                    // in may be -1 (meaning "current") by default, replace it
+                    // with 0 which means "new" (see KB article 160957), but
+                    // don't fail if there is no -1 as at least for recent
+                    // Firefox versions the default value already is 0
+                    ddeCmd.Replace(wxT("-1"), wxT("0"),
+                                   false /* only first occurrence */);
+
+                    // and also replace the parameters: the topic should
+                    // contain a placeholder for the URL and we should fail if
+                    // we didn't find it as this would mean that we have no way
+                    // of passing the URL to the browser
+                    ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
+                }
+
+                if ( ok )
+                {
+                    // try to send it the DDE request now but ignore the errors
+                    wxLogNull noLog;
+
+                    const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
+                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
+                        return true;
+
+                    // this is not necessarily an error: maybe browser is
+                    // simply not running, but no matter, in any case we're
+                    // going to launch it using ShellExecuteEx() below now and
+                    // we shouldn't try to open a new window if we open a new
+                    // browser anyhow
+                }
+            }
+        }
+    }
+#endif // wxUSE_IPC
+
+    WinStruct<SHELLEXECUTEINFO> sei;
+    sei.lpFile = url.c_str();
+    sei.lpVerb = wxT("open");
+    sei.nShow = SW_SHOWNORMAL;
+    sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
+
+    if ( ::ShellExecuteEx(&sei) )
+        return true;
+
+    return false;
+}
diff --git a/Externals/wxWidgets3/src/msw/uxtheme.cpp b/Externals/wxWidgets3/src/msw/uxtheme.cpp
index 9e31ae5adf..ee30955555 100644
--- a/Externals/wxWidgets3/src/msw/uxtheme.cpp
+++ b/Externals/wxWidgets3/src/msw/uxtheme.cpp
@@ -4,7 +4,6 @@
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
-// RCS-ID:      $Id: uxtheme.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/version.rc b/Externals/wxWidgets3/src/msw/version.rc
index 05e60fd721..95d24dd58a 100644
--- a/Externals/wxWidgets3/src/msw/version.rc
+++ b/Externals/wxWidgets3/src/msw/version.rc
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.07.00
-// RCS-ID:      $Id: version.rc 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,6 +36,44 @@
     #define LANG_WITH_CHARSET "04090000"
 #endif
 
+#ifdef WXMAKINGDLL_BASE
+    #define WXLIBDESC "base"
+#elif defined WXMAKINGDLL_NET
+    #define WXLIBDESC "network"
+#elif defined WXMAKINGDLL_CORE
+    #define WXLIBDESC "core"
+#elif defined WXMAKINGDLL_ADV
+    #define WXLIBDESC "advanced"
+#elif defined WXMAKINGDLL_QA
+    #define WXLIBDESC "qa"
+#elif defined WXMAKINGDLL_HTML
+    #define WXLIBDESC "html"
+#elif defined WXMAKINGDLL_GL
+    #define WXLIBDESC "OpenGL"
+#elif defined WXMAKINGDLL_XML
+    #define WXLIBDESC "XML"
+#elif defined WXMAKINGDLL_XRC
+    #define WXLIBDESC "XRC"
+#elif defined WXMAKINGDLL_AUI
+    #define WXLIBDESC "AUI"
+#elif defined WXMAKINGDLL_RIBBON
+    #define WXLIBDESC "ribbon"
+#elif defined WXMAKINGDLL_PROPGRID
+    #define WXLIBDESC "property grid"
+#elif defined WXMAKINGDLL_RICHTEXT
+    #define WXLIBDESC "rich text"
+#elif defined WXMAKINGDLL_MEDIA
+    #define WXLIBDESC "multimedia"
+#elif defined WXMAKINGDLL_STC
+    #define WXLIBDESC "styled text"
+#elif defined WXMAKINGDLL_WEBVIEW
+    #define WXLIBDESC "webview"
+#elif defined WXMAKINGDLL
+    #define WXLIBDESC "monolithic"
+#else
+    #error "What are we building?"
+#endif
+
 1 VERSIONINFO
  FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
@@ -52,16 +89,13 @@ BEGIN
         BEGIN
             VALUE "Comments", "wxWidgets cross-platform GUI framework\0"
             VALUE "CompanyName", "wxWidgets development team\0"
-            VALUE "FileDescription", "wxWidgets for MSW\0"
-            VALUE "FileVersion", "wxWidgets Library " wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright 1993-2010 wxWidgets development team\0"
-            VALUE "LegalTrademarks", "\0"
+            VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0"
+            VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
+            VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0"
+            VALUE "LegalCopyright", "Copyright � 1993-2013 wxWidgets development team\0"
             VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
-            VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Externals/wxWidgets3/src/msw/volume.cpp b/Externals/wxWidgets3/src/msw/volume.cpp
index 02625cc437..2b38bc7310 100644
--- a/Externals/wxWidgets3/src/msw/volume.cpp
+++ b/Externals/wxWidgets3/src/msw/volume.cpp
@@ -4,7 +4,6 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
-// RCS-ID:      $Id: volume.cpp 64202 2010-05-02 12:19:19Z VZ $
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -288,7 +287,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
                         // The filter function will not know mounted from unmounted, and neither do we unless
                         // we are iterating using RESOURCE_CONNECTED, in which case they all are mounted.
                         // Volumes on disconnected servers, however, will correctly show as unmounted.
-                        FilteredAdd(list, filename.wx_str(), flagsSet, flagsUnset&~wxFS_VOL_MOUNTED);
+                        FilteredAdd(list, filename.t_str(), flagsSet, flagsUnset&~wxFS_VOL_MOUNTED);
                         if (scope == RESOURCE_GLOBALNET)
                             s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED;
                     }
@@ -502,16 +501,17 @@ bool wxFSVolumeBase::Create(const wxString& name)
 
     // Display name.
     SHFILEINFO fi;
-    long rc = SHGetFileInfo(m_volName.wx_str(), 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
+    long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
-        return m_isOk;
+        return false;
     }
     m_dispName = fi.szDisplayName;
 
     // all tests passed.
-    return m_isOk = true;
+    m_isOk = true;
+    return true;
 } // Create
 
 //=============================================================================
@@ -584,6 +584,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
                  wxT("wxFSIconType::GetIcon(): invalid icon index") );
 
+#ifdef __WXMSW__
     // Load on demand.
     if (m_icons[type].IsNull())
     {
@@ -612,7 +613,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
         }
 
         SHFILEINFO fi;
-        long rc = SHGetFileInfo(m_volName.wx_str(), 0, &fi, sizeof(fi), flags);
+        long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), flags);
         m_icons[type].SetHICON((WXHICON)fi.hIcon);
         if (!rc || !fi.hIcon)
         {
@@ -621,6 +622,10 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     }
 
     return m_icons[type];
+#else
+    wxFAIL_MSG(wxS("Can't convert HICON to wxIcon in this port."));
+    return wxNullIcon;
+#endif
 } // GetIcon
 
 #endif // wxUSE_GUI
diff --git a/Externals/wxWidgets3/src/msw/webview_ie.cpp b/Externals/wxWidgets3/src/msw/webview_ie.cpp
index 168cf12336..9a3d3ea019 100644
--- a/Externals/wxWidgets3/src/msw/webview_ie.cpp
+++ b/Externals/wxWidgets3/src/msw/webview_ie.cpp
@@ -2,7 +2,6 @@
 // Name:        src/msw/webview_ie.cpp
 // Purpose:     wxMSW wxWebViewIE class implementation for web view component
 // Author:      Marianne Gagnon
-// Id:          $Id: webview_ie.cpp 70499 2012-02-02 20:32:08Z SJL $
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,7 @@
 #include "wx/filesys.h"
 #include "wx/dynlib.h"
 #include <initguid.h>
+#include <wininet.h>
 
 /* These GUID definitions are our own implementation to support interfaces
  * normally in urlmon.h. See include/wx/msw/webview_ie.h
@@ -38,9 +38,25 @@ namespace {
 DEFINE_GUID(wxIID_IInternetProtocolRoot,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(wxIID_IInternetProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(wxIID_IDocHostUIHandler, 0xbd3f23c0, 0xd43e, 0x11cf, 0x89, 0x3b, 0x00, 0xaa, 0x00, 0xbd, 0xce, 0x1a);
+DEFINE_GUID(wxIID_IHTMLElement2,0x3050f434,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+DEFINE_GUID(wxIID_IMarkupServices,0x3050f4a0,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+DEFINE_GUID(wxIID_IMarkupContainer,0x3050f5f9,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+
+enum //Internal find flags
+{
+    wxWEBVIEW_FIND_ADD_POINTERS =      0x0001,
+    wxWEBVIEW_FIND_REMOVE_HIGHLIGHT =  0x0002
+};
 
 }
 
+//Convenience function for error conversion
+#define WX_ERROR_CASE(error, wxerror) \
+        case error: \
+            event.SetString(#error); \
+            event.SetInt(wxerror); \
+            break;
+
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
 
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
@@ -67,7 +83,8 @@ bool wxWebViewIE::Create(wxWindow* parent,
     m_historyLoadingFromList = false;
     m_historyEnabled = true;
     m_historyPosition = -1;
-    m_zoomType = wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    m_zoomType = wxWEBVIEW_ZOOM_TYPE_TEXT;
+    FindClear();
 
     if (::CoCreateInstance(CLSID_WebBrowser, NULL,
                            CLSCTX_INPROC_SERVER, // CLSCTX_INPROC,
@@ -82,8 +99,7 @@ bool wxWebViewIE::Create(wxWindow* parent,
     m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
 
-    m_uiHandler = new DocHostUIHandler;
-    m_uiHandler->AddRef();
+    m_uiHandler = new DocHostUIHandler(this);
 
     m_container = new wxIEContainer(this, IID_IWebBrowser2, m_webBrowser, m_uiHandler);
 
@@ -95,12 +111,29 @@ bool wxWebViewIE::Create(wxWindow* parent,
 
 wxWebViewIE::~wxWebViewIE()
 {
-    for(unsigned int i = 0; i < m_factories.size(); i++)
+    wxDynamicLibrary urlMon(wxT("urlmon.dll"));
+    if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
     {
-        m_factories[i]->Release();
-    }
+        typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD,
+                                                         wxIInternetSession**,
+                                                         DWORD);
+        wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon);
 
-    m_uiHandler->Release();
+        wxIInternetSession* session;
+        HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0);
+        if(FAILED(res))
+        {
+            wxFAIL_MSG("Could not retrive internet session");
+        }
+
+        for(unsigned int i = 0; i < m_factories.size(); i++)
+        {
+            session->UnregisterNameSpace(m_factories[i], 
+                                        (m_factories[i]->GetName()).wc_str());
+            m_factories[i]->Release();
+        }
+    }
+    FindClear();
 }
 
 void wxWebViewIE::LoadURL(const wxString& url)
@@ -108,7 +141,7 @@ void wxWebViewIE::LoadURL(const wxString& url)
     m_ie.CallMethod("Navigate", wxConvertStringToOle(url));
 }
 
-void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
+void wxWebViewIE::DoSetPage(const wxString& html, const wxString& baseUrl)
 {
     BSTR bstr = SysAllocString(OLESTR(""));
     SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
@@ -121,10 +154,13 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
         hr = SafeArrayUnaccessData(psaStrings);
 
-        IHTMLDocument2* document = GetDocument();
+        wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+        if(!document)
+            return;
+
         document->write(psaStrings);
         document->close();
-        document->Release();
 
         SafeArrayDestroy(psaStrings);
 
@@ -140,21 +176,24 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
             hr = SafeArrayUnaccessData(psaStrings);
 
             document = GetDocument();
+
+            if(!document)
+                return;
+
             document->write(psaStrings);
-            document->Release();
 
             // SafeArrayDestroy calls SysFreeString for each BSTR
             SafeArrayDestroy(psaStrings);
 
             //We send the events when we are done to mimic webkit
             //Navigated event
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+            wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
                                  GetId(), baseUrl, "");
             event.SetEventObject(this);
             HandleWindowEvent(event);
 
             //Document complete event
-            event.SetEventType(wxEVT_COMMAND_WEB_VIEW_LOADED);
+            event.SetEventType(wxEVT_WEBVIEW_LOADED);
             event.SetEventObject(this);
             HandleWindowEvent(event);
         }
@@ -171,42 +210,46 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
 wxString wxWebViewIE::GetPageSource() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLElement *bodyTag = NULL;
-    IHTMLElement *htmlTag = NULL;
-    wxString source;
-    HRESULT hr = document->get_body(&bodyTag);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        hr = bodyTag->get_parentElement(&htmlTag);
+        wxCOMPtr<IHTMLElement> bodyTag;
+        wxCOMPtr<IHTMLElement> htmlTag;
+        wxString source;
+        HRESULT hr = document->get_body(&bodyTag);
         if(SUCCEEDED(hr))
         {
-            BSTR bstr;
-            htmlTag->get_outerHTML(&bstr);
-            source = wxString(bstr);
-            htmlTag->Release();
+            hr = bodyTag->get_parentElement(&htmlTag);
+            if(SUCCEEDED(hr))
+            {
+                BSTR bstr;
+                htmlTag->get_outerHTML(&bstr);
+                source = wxString(bstr);
+            }
         }
-        bodyTag->Release();
+        return source;
+    }
+    else
+    {
+        return "";
     }
-
-    document->Release();
-    return source;
 }
 
 wxWebViewZoom wxWebViewIE::GetZoom() const
 {
     switch( m_zoomType )
     {
-        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+        case wxWEBVIEW_ZOOM_TYPE_LAYOUT:
             return GetIEOpticalZoom();
-        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+        case wxWEBVIEW_ZOOM_TYPE_TEXT:
             return GetIETextZoom();
         default:
             wxFAIL;
     }
 
     //Dummy return to stop compiler warnings
-    return wxWEB_VIEW_ZOOM_MEDIUM;
+    return wxWEBVIEW_ZOOM_MEDIUM;
 
 }
 
@@ -214,10 +257,10 @@ void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {
     switch( m_zoomType )
     {
-        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+        case wxWEBVIEW_ZOOM_TYPE_LAYOUT:
             SetIEOpticalZoom(zoom);
             break;
-        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+        case wxWEBVIEW_ZOOM_TYPE_TEXT:
             SetIETextZoom(zoom);
             break;
         default:
@@ -273,19 +316,19 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
     //We make a somewhat arbitray map here, taken from values used by webkit
     switch(level)
     {
-        case wxWEB_VIEW_ZOOM_TINY:
+        case wxWEBVIEW_ZOOM_TINY:
             V_I4(&zoomVariant) = 60;
             break;
-        case wxWEB_VIEW_ZOOM_SMALL:
+        case wxWEBVIEW_ZOOM_SMALL:
             V_I4(&zoomVariant) = 80;
             break;
-        case wxWEB_VIEW_ZOOM_MEDIUM:
+        case wxWEBVIEW_ZOOM_MEDIUM:
             V_I4(&zoomVariant) = 100;
             break;
-        case wxWEB_VIEW_ZOOM_LARGE:
+        case wxWEBVIEW_ZOOM_LARGE:
             V_I4(&zoomVariant) = 130;
             break;
-        case wxWEB_VIEW_ZOOM_LARGEST:
+        case wxWEBVIEW_ZOOM_LARGEST:
             V_I4(&zoomVariant) = 160;
             break;
         default:
@@ -321,23 +364,23 @@ wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
     //We make a somewhat arbitray map here, taken from values used by webkit
     if (zoom <= 65)
     {
-        return wxWEB_VIEW_ZOOM_TINY;
+        return wxWEBVIEW_ZOOM_TINY;
     }
     else if (zoom > 65 && zoom <= 90)
     {
-        return wxWEB_VIEW_ZOOM_SMALL;
+        return wxWEBVIEW_ZOOM_SMALL;
     }
     else if (zoom > 90 && zoom <= 115)
     {
-        return wxWEB_VIEW_ZOOM_MEDIUM;
+        return wxWEBVIEW_ZOOM_MEDIUM;
     }
     else if (zoom > 115 && zoom <= 145)
     {
-        return wxWEB_VIEW_ZOOM_LARGE;
+        return wxWEBVIEW_ZOOM_LARGE;
     }
     else /*if (zoom > 145) */ //Using else removes a compiler warning
     {
-        return wxWEB_VIEW_ZOOM_LARGEST;
+        return wxWEBVIEW_ZOOM_LARGEST;
     }
 }
 
@@ -360,7 +403,7 @@ bool wxWebViewIE::CanSetZoomType(wxWebViewZoomType type) const
     key.QueryValue("Version", value);
 
     long version = wxAtoi(value.Left(1));
-    if(version <= 6 && type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
+    if(version <= 6 && type == wxWEBVIEW_ZOOM_TYPE_LAYOUT)
         return false;
     else
         return true;
@@ -464,10 +507,10 @@ void wxWebViewIE::Reload(wxWebViewReloadFlags flags)
 
     switch(flags)
     {
-        case wxWEB_VIEW_RELOAD_DEFAULT:
+        case wxWEBVIEW_RELOAD_DEFAULT:
             V_I2(&level) = REFRESH_NORMAL;
             break;
-        case wxWEB_VIEW_RELOAD_NO_CACHE:
+        case wxWEBVIEW_RELOAD_NO_CACHE:
             V_I2(&level) = REFRESH_COMPLETELY;
             break;
         default:
@@ -520,12 +563,18 @@ wxString wxWebViewIE::GetCurrentURL() const
 
 wxString wxWebViewIE::GetCurrentTitle() const
 {
-    IHTMLDocument2* document = GetDocument();
-    BSTR title;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->get_nameProp(&title);
-    document->Release();
-    return wxString(title);
+    if(document)
+    {
+        BSTR title;
+        document->get_nameProp(&title);
+        return wxString(title);
+    }
+    else
+    {
+        return "";
+    }
 }
 
 bool wxWebViewIE::CanCut() const
@@ -537,6 +586,7 @@ bool wxWebViewIE::CanCopy() const
 {
     return CanExecCommand("Copy");
 }
+
 bool wxWebViewIE::CanPaste() const
 {
     return CanExecCommand("Paste");
@@ -561,6 +611,7 @@ bool wxWebViewIE::CanUndo() const
 {
     return CanExecCommand("Undo");
 }
+
 bool wxWebViewIE::CanRedo() const
 {
     return CanExecCommand("Redo");
@@ -576,27 +627,88 @@ void wxWebViewIE::Redo()
     ExecCommand("Redo");
 }
 
+long wxWebViewIE::Find(const wxString& text, int flags)
+{
+    //If the text is empty then we clear.
+    if(text.IsEmpty())
+    {
+        ClearSelection();
+        if(m_findFlags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT)
+        {
+            FindInternal(m_findText, (m_findFlags &~ wxWEBVIEW_FIND_HIGHLIGHT_RESULT), wxWEBVIEW_FIND_REMOVE_HIGHLIGHT);
+        }
+        FindClear();
+        return wxNOT_FOUND;
+    }
+    //Have we done this search before?
+    if(m_findText == text)
+    {
+        //Just do a highlight?
+        if((flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT) != (m_findFlags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT))
+        {
+            m_findFlags = flags;
+            if(!m_findPointers.empty())
+            {
+                FindInternal(m_findText, m_findFlags, ((flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT) == 0 ? wxWEBVIEW_FIND_REMOVE_HIGHLIGHT : 0));
+            }
+            return m_findPosition;
+        }
+        else if(((m_findFlags & wxWEBVIEW_FIND_ENTIRE_WORD) == (flags & wxWEBVIEW_FIND_ENTIRE_WORD)) && ((m_findFlags & wxWEBVIEW_FIND_MATCH_CASE) == (flags&wxWEBVIEW_FIND_MATCH_CASE)))
+        {
+            m_findFlags = flags;
+            return FindNext(((flags & wxWEBVIEW_FIND_BACKWARDS) ? -1 : 1));
+        }
+    }
+    //Remove old highlight if any.
+    if(m_findFlags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT)
+    {
+        FindInternal(m_findText, (m_findFlags &~ wxWEBVIEW_FIND_HIGHLIGHT_RESULT), wxWEBVIEW_FIND_REMOVE_HIGHLIGHT);
+    }
+    //Reset find variables.
+    FindClear();
+    ClearSelection();
+    m_findText = text;
+    m_findFlags = flags;
+    //find the text and return wxNOT_FOUND if there are no matches.
+    FindInternal(text, flags, wxWEBVIEW_FIND_ADD_POINTERS);
+    if(m_findPointers.empty())
+        return wxNOT_FOUND;
+
+    // Or their number if there are.
+    return m_findPointers.size();
+}
+
 void wxWebViewIE::SetEditable(bool enable)
 {
-    IHTMLDocument2* document = GetDocument();
-    if( enable )
-        document->put_designMode(SysAllocString(L"On"));
-    else
-        document->put_designMode(SysAllocString(L"Off"));
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->Release();
+    if(document)
+    {
+        if( enable )
+            document->put_designMode(SysAllocString(L"On"));
+        else
+            document->put_designMode(SysAllocString(L"Off"));
+
+    }
 }
 
 bool wxWebViewIE::IsEditable() const
 {
-    IHTMLDocument2* document = GetDocument();
-    BSTR mode;
-    document->get_designMode(&mode);
-    document->Release();
-    if(wxString(mode) == "On")
-        return true;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        BSTR mode;
+        document->get_designMode(&mode);
+        if(wxString(mode) == "On")
+            return true;
+        else
+            return false;
+    }
     else
+    {
         return false;
+    }
 }
 
 void wxWebViewIE::SelectAll()
@@ -606,19 +718,25 @@ void wxWebViewIE::SelectAll()
 
 bool wxWebViewIE::HasSelection() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString sel;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        BSTR type;
-        selection->get_type(&type);
-        sel = wxString(type);
-        selection->Release();
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString sel;
+        HRESULT hr = document->get_selection(&selection);
+        if(SUCCEEDED(hr))
+        {
+            BSTR type;
+            selection->get_type(&type);
+            sel = wxString(type);
+        }
+        return sel != "None";
+    }
+    else
+    {
+        return false;
     }
-    document->Release();
-    return sel != "None";
 }
 
 void wxWebViewIE::DeleteSelection()
@@ -628,109 +746,128 @@ void wxWebViewIE::DeleteSelection()
 
 wxString wxWebViewIE::GetSelectedText() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        IDispatch* disrange;
-        hr = selection->createRange(&disrange);
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
         if(SUCCEEDED(hr))
         {
-            IHTMLTxtRange* range;
-            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            wxCOMPtr<IDispatch> disrange;
+            hr = selection->createRange(&disrange);
             if(SUCCEEDED(hr))
             {
-                BSTR text;
-                range->get_text(&text);
-                selected = wxString(text);
-                range->Release();
+                wxCOMPtr<IHTMLTxtRange> range;
+                hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+                if(SUCCEEDED(hr))
+                {
+                    BSTR text;
+                    range->get_text(&text);
+                    selected = wxString(text);
+                }
             }
-            disrange->Release();
         }
-        selection->Release();
+        return selected;
+    }
+    else
+    {
+        return "";
     }
-    document->Release();
-    return selected;
 }
 
 wxString wxWebViewIE::GetSelectedSource() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        IDispatch* disrange;
-        hr = selection->createRange(&disrange);
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
         if(SUCCEEDED(hr))
         {
-            IHTMLTxtRange* range;
-            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            wxCOMPtr<IDispatch> disrange;
+            hr = selection->createRange(&disrange);
             if(SUCCEEDED(hr))
             {
-                BSTR text;
-                range->get_htmlText(&text);
-                selected = wxString(text);
-                range->Release();
+                wxCOMPtr<IHTMLTxtRange> range;
+                hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+                if(SUCCEEDED(hr))
+                {
+                    BSTR text;
+                    range->get_htmlText(&text);
+                    selected = wxString(text);
+                }
             }
-            disrange->Release();
         }
-        selection->Release();
+        return selected;
+    }
+    else
+    {
+        return "";
     }
-    document->Release();
-    return selected;
 }
 
 void wxWebViewIE::ClearSelection()
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        selection->empty();
-        selection->Release();
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
+        if(SUCCEEDED(hr))
+        {
+            selection->empty();
+        }
     }
-    document->Release();
 }
 
 wxString wxWebViewIE::GetPageText() const
 {
-    IHTMLDocument2* document = GetDocument();
-    wxString text;
-    IHTMLElement* body;
-    HRESULT hr = document->get_body(&body);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        BSTR out;
-        body->get_innerText(&out);
-        text = wxString(out);
-        body->Release();
+        wxString text;
+        wxCOMPtr<IHTMLElement> body;
+        HRESULT hr = document->get_body(&body);
+        if(SUCCEEDED(hr))
+        {
+            BSTR out;
+            body->get_innerText(&out);
+            text = wxString(out);
+        }
+        return text;
+    }
+    else
+    {
+        return "";
     }
-    document->Release();
-    return text;
 }
 
 void wxWebViewIE::RunScript(const wxString& javascript)
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLWindow2* window;
-    wxString language = "javascript";
-    HRESULT hr = document->get_parentWindow(&window);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        VARIANT level;
-        VariantInit(&level);
-        V_VT(&level) = VT_EMPTY;
-        window->execScript(SysAllocString(javascript.wc_str()),
-                           SysAllocString(language.wc_str()),
-                           &level);
+        wxCOMPtr<IHTMLWindow2> window;
+        wxString language = "javascript";
+        HRESULT hr = document->get_parentWindow(&window);
+        if(SUCCEEDED(hr))
+        {
+            VARIANT level;
+            VariantInit(&level);
+            V_VT(&level) = VT_EMPTY;
+            window->execScript(SysAllocString(javascript.wc_str()),
+                               SysAllocString(language.wc_str()),
+                               &level);
+        }
     }
-    document->Release();
 }
 
 void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
@@ -766,39 +903,269 @@ void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 
 bool wxWebViewIE::CanExecCommand(wxString command) const
 {
-    IHTMLDocument2* document = GetDocument();
-    VARIANT_BOOL enabled;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
-    document->Release();
+    if(document)
+    {
+        VARIANT_BOOL enabled;
+
+        document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
+
+        return (enabled == VARIANT_TRUE);
+    }
+    else
+    {
+        return false;
+    }
 
-    return (enabled == VARIANT_TRUE);
 }
 
 void wxWebViewIE::ExecCommand(wxString command)
 {
-    IHTMLDocument2* document = GetDocument();
-    document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
-    document->Release();
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
+    }
 }
 
-IHTMLDocument2* wxWebViewIE::GetDocument() const
+wxCOMPtr<IHTMLDocument2> wxWebViewIE::GetDocument() const
 {
-    wxVariant variant = m_ie.GetProperty("Document");
-    IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
-
-    wxASSERT(document);
-
+    wxCOMPtr<IDispatch> dispatch;
+    wxCOMPtr<IHTMLDocument2> document;
+    HRESULT result = m_webBrowser->get_Document(&dispatch);
+    if(dispatch && SUCCEEDED(result))
+    {
+        //document is set to null automatically if the interface isn't supported
+        dispatch->QueryInterface(IID_IHTMLDocument2, (void**)&document);
+    }
     return document;
 }
 
+bool wxWebViewIE::IsElementVisible(wxCOMPtr<IHTMLElement> elm)
+{
+    wxCOMPtr<IHTMLElement> elm1 = elm;
+    BSTR tmp_bstr;
+    bool is_visible = true;
+    //This method is not perfect but it does discover most of the hidden elements.
+    //so if a better solution is found, then please do improve.
+    while(elm1)
+    {
+        wxCOMPtr<wxIHTMLElement2> elm2;
+        if(SUCCEEDED(elm1->QueryInterface(wxIID_IHTMLElement2, (void**) &elm2)))
+        {
+            wxCOMPtr<wxIHTMLCurrentStyle> style;
+            if(SUCCEEDED(elm2->get_currentStyle(&style)))
+            {
+                //Check if the object has the style display:none.
+                if((style->get_display(&tmp_bstr) != S_OK) || 
+                   (tmp_bstr != NULL && (_wcsicmp(tmp_bstr, L"none") == 0)))
+                {
+                    is_visible = false;
+                }
+                //Check if the object has the style visibility:hidden.
+                if((is_visible && (style->get_visibility(&tmp_bstr) != S_OK)) ||
+                  (tmp_bstr != NULL && _wcsicmp(tmp_bstr, L"hidden") == 0))
+                {
+                    is_visible = false;
+                }
+                style->Release();
+            }
+            elm2->Release();
+        }
+
+        //Lets check the object's parent element.
+        IHTMLElement* parent;
+        if(is_visible && SUCCEEDED(elm1->get_parentElement(&parent)))
+        {
+            elm1 = parent;
+        }
+        else
+        {
+            elm1->Release();
+            break;
+        }
+    }
+    return is_visible;
+}
+
+void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_flag)
+{
+    long find_flag = 0;
+    wxCOMPtr<wxIMarkupServices> pIMS;
+    wxCOMPtr<IHTMLDocument2> document = GetDocument();
+
+    //This function does the acutal work.
+    if(document && SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices, (void **)&pIMS)))
+    {
+        wxCOMPtr<wxIMarkupContainer> pIMC;
+        if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupContainer, (void **)&pIMC)))
+        {
+            wxCOMPtr<wxIMarkupPointer> ptrBegin, ptrEnd;
+            BSTR attr_bstr = SysAllocString(L"style=\"background-color:#ffff00\"");
+            BSTR text_bstr = SysAllocString(text.wc_str());
+            pIMS->CreateMarkupPointer(&ptrBegin);
+            pIMS->CreateMarkupPointer(&ptrEnd);
+
+            ptrBegin->SetGravity(wxPOINTER_GRAVITY_Right);
+            ptrBegin->MoveToContainer(pIMC, TRUE);
+            //Create the find flag from the wx one.
+            if(flags & wxWEBVIEW_FIND_ENTIRE_WORD)
+            {
+                find_flag |= wxFINDTEXT_WHOLEWORD;
+            }
+            if(flags & wxWEBVIEW_FIND_MATCH_CASE)
+            {
+                find_flag |= wxFINDTEXT_MATCHCASE;
+            }
+
+            //A little speed-up to avoid to re-alloc in the positions vector.
+            if(text.Len() < 3 && m_findPointers.capacity() < 500)
+            {
+               m_findPointers.reserve(text.Len() == 1 ? 1000 : 500);
+            }
+
+            while(ptrBegin->FindText(text_bstr, find_flag, ptrEnd, NULL) == S_OK)
+            {
+                wxCOMPtr<IHTMLElement> elm;
+                if(ptrBegin->CurrentScope(&elm) == S_OK)
+                {
+                    if(IsElementVisible(elm))
+                    {
+                        //Highlight the word if the flag was set.
+                        if(flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT)
+                        {
+                            IHTMLElement* pFontEl;
+                            pIMS->CreateElement(wxTAGID_FONT, attr_bstr, &pFontEl);
+                            pIMS->InsertElement(pFontEl, ptrBegin, ptrEnd);
+                        }
+                        if(internal_flag & wxWEBVIEW_FIND_REMOVE_HIGHLIGHT)
+                        {
+                            IHTMLElement* pFontEl;
+                            ptrBegin->CurrentScope(&pFontEl);
+                            pIMS->RemoveElement(pFontEl);
+                            pFontEl->Release();
+                        }
+                        if(internal_flag & wxWEBVIEW_FIND_ADD_POINTERS)
+                        {
+                            wxIMarkupPointer *cptrBegin, *cptrEnd;
+                            pIMS->CreateMarkupPointer(&cptrBegin);
+                            pIMS->CreateMarkupPointer(&cptrEnd);
+                            cptrBegin->MoveToPointer(ptrBegin);
+                            cptrEnd->MoveToPointer(ptrEnd);
+                            m_findPointers.push_back(wxFindPointers(cptrBegin,cptrEnd));
+                        }
+                    }
+                }
+                ptrBegin->MoveToPointer(ptrEnd);
+            }
+            //Clean up.
+            SysFreeString(text_bstr);
+            SysFreeString(attr_bstr);
+        }
+    }
+}
+
+long wxWebViewIE::FindNext(int direction)
+{
+    //Don't bother if we have no pointers set.
+    if(m_findPointers.empty())
+    {
+        return wxNOT_FOUND;
+    }
+    //Manage the find position and do some checks.
+    if(direction > 0)
+    {
+        m_findPosition++;
+    }
+    else
+    {
+        m_findPosition--;
+    }
+
+    if(m_findPosition >= (signed)m_findPointers.size())
+    {
+        if(m_findFlags & wxWEBVIEW_FIND_WRAP)
+        {
+            m_findPosition = 0;
+        }
+        else
+        {
+            m_findPosition--;
+            return wxNOT_FOUND;
+        }
+    }
+    else if(m_findPosition < 0)
+    {
+        if(m_findFlags & wxWEBVIEW_FIND_WRAP)
+        {
+            m_findPosition = m_findPointers.size()-1;
+        }
+        else
+        {
+            m_findPosition++;
+            return wxNOT_FOUND;
+        }
+    }
+
+    wxCOMPtr<IHTMLDocument2> document = GetDocument();
+    wxCOMPtr<IHTMLElement> body_element;
+
+    long ret = -1;
+    //Now try to create a range from the body.
+    if(document && SUCCEEDED(document->get_body(&body_element)))
+    {
+        wxCOMPtr<IHTMLBodyElement> body;
+        if(SUCCEEDED(body_element->QueryInterface(IID_IHTMLBodyElement,(void**)&body)))
+        {
+            wxCOMPtr<wxIHTMLTxtRange> range;
+            if(SUCCEEDED(body->createTextRange((IHTMLTxtRange**)(&range))))
+            {
+                wxCOMPtr<wxIMarkupServices> pIMS;
+                //So far so good, now we try to position our find pointers.
+                if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices,(void **)&pIMS)))
+                {
+                    wxIMarkupPointer *begin = m_findPointers[m_findPosition].begin, *end = m_findPointers[m_findPosition].end;
+                    if(pIMS->MoveRangeToPointers(begin,end,range) == S_OK && range->select() == S_OK)
+                    {
+                        ret = m_findPosition;
+                    }
+                }
+            }
+        }
+    }
+    return ret;
+}
+
+void wxWebViewIE::FindClear()
+{
+    //Reset find variables.
+    m_findText.Empty();
+    m_findFlags = wxWEBVIEW_FIND_DEFAULT;
+    m_findPosition = -1;
+
+    //The m_findPointers contains pointers for the found text.
+    //Since it uses ref counting we call release on the pointers first
+    //before we remove them from the vector. In other words do not just
+    //remove elements from m_findPointers without calling release first
+    //or you will get a memory leak.
+    size_t count = m_findPointers.size();
+    for(size_t i = 0; i < count; i++)
+    {
+        m_findPointers[i].begin->Release();
+        m_findPointers[i].end->Release();
+    }
+    m_findPointers.clear();
+}
+
 bool wxWebViewIE::EnableControlFeature(long flag, bool enable)
 {
 #if wxUSE_DYNLIB_CLASS
 
     wxDynamicLibrary urlMon(wxT("urlmon.dll"));
-    if( urlMon.IsLoaded() && 
-        urlMon.HasSymbol("CoInternetSetFeatureEnabled") && 
+    if( urlMon.IsLoaded() &&
+        urlMon.HasSymbol("CoInternetSetFeatureEnabled") &&
         urlMon.HasSymbol("CoInternetIsFeatureEnabled"))
     {
         typedef HRESULT (WINAPI *CoInternetSetFeatureEnabled_t)(DWORD, DWORD, BOOL);
@@ -843,7 +1210,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             wxString target = evt[3].GetString();
 
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+            wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
                                  GetId(), url, target);
 
             //skip empty javascript events.
@@ -878,7 +1245,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+            wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
                                  GetId(), url, target);
             event.SetEventObject(this);
             HandleWindowEvent(event);
@@ -925,9 +1292,11 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             }
             //Reset as we are done now
             m_historyLoadingFromList = false;
+            //Reset the find values.
+            FindClear();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+            wxWebViewEvent event(wxEVT_WEBVIEW_LOADED, GetId(),
                                  url, target);
             event.SetEventObject(this);
             HandleWindowEvent(event);
@@ -943,7 +1312,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         {
             wxString title = evt[0].GetString();
 
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+            wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
                                  GetId(), GetCurrentURL(), "");
             event.SetString(title);
             event.SetEventObject(this);
@@ -953,125 +1322,66 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
         case DISPID_NAVIGATEERROR:
         {
-            wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER;
-            wxString errorCode = "?";
+            wxWebViewEvent event(wxEVT_WEBVIEW_ERROR, GetId(),
+                                 evt[1].GetString(), evt[2].GetString());
+            event.SetEventObject(this);
+
             switch (evt[3].GetLong())
             {
-            case INET_E_INVALID_URL: // (0x800C0002L or -2146697214)
-                errorCode = "INET_E_INVALID_URL";
-                errorType = wxWEB_NAV_ERR_REQUEST;
-                break;
-            case INET_E_NO_SESSION: // (0x800C0003L or -2146697213)
-                errorCode = "INET_E_NO_SESSION";
-                errorType = wxWEB_NAV_ERR_CONNECTION;
-                break;
-            case INET_E_CANNOT_CONNECT: // (0x800C0004L or -2146697212)
-                errorCode = "INET_E_CANNOT_CONNECT";
-                errorType = wxWEB_NAV_ERR_CONNECTION;
-                break;
-            case INET_E_RESOURCE_NOT_FOUND: // (0x800C0005L or -2146697211)
-                errorCode = "INET_E_RESOURCE_NOT_FOUND";
-                errorType = wxWEB_NAV_ERR_NOT_FOUND;
-                break;
-            case INET_E_OBJECT_NOT_FOUND: // (0x800C0006L or -2146697210)
-                errorCode = "INET_E_OBJECT_NOT_FOUND";
-                errorType = wxWEB_NAV_ERR_NOT_FOUND;
-                break;
-            case INET_E_DATA_NOT_AVAILABLE: // (0x800C0007L or -2146697209)
-                errorCode = "INET_E_DATA_NOT_AVAILABLE";
-                errorType = wxWEB_NAV_ERR_NOT_FOUND;
-                break;
-            case INET_E_DOWNLOAD_FAILURE: // (0x800C0008L or -2146697208)
-                errorCode = "INET_E_DOWNLOAD_FAILURE";
-                errorType = wxWEB_NAV_ERR_CONNECTION;
-                break;
-            case INET_E_AUTHENTICATION_REQUIRED: // (0x800C0009L or -2146697207)
-                errorCode = "INET_E_AUTHENTICATION_REQUIRED";
-                errorType = wxWEB_NAV_ERR_AUTH;
-                break;
-            case INET_E_NO_VALID_MEDIA: // (0x800C000AL or -2146697206)
-                errorCode = "INET_E_NO_VALID_MEDIA";
-                errorType = wxWEB_NAV_ERR_REQUEST;
-                break;
-            case INET_E_CONNECTION_TIMEOUT: // (0x800C000BL or -2146697205)
-                errorCode = "INET_E_CONNECTION_TIMEOUT";
-                errorType = wxWEB_NAV_ERR_CONNECTION;
-                break;
-            case INET_E_INVALID_REQUEST: // (0x800C000CL or -2146697204)
-                errorCode = "INET_E_INVALID_REQUEST";
-                errorType = wxWEB_NAV_ERR_REQUEST;
-                break;
-            case INET_E_UNKNOWN_PROTOCOL: // (0x800C000DL or -2146697203)
-                errorCode = "INET_E_UNKNOWN_PROTOCOL";
-                errorType = wxWEB_NAV_ERR_REQUEST;
-                break;
-            case INET_E_SECURITY_PROBLEM: // (0x800C000EL or -2146697202)
-                errorCode = "INET_E_SECURITY_PROBLEM";
-                errorType = wxWEB_NAV_ERR_SECURITY;
-                break;
-            case INET_E_CANNOT_LOAD_DATA: // (0x800C000FL or -2146697201)
-                errorCode = "INET_E_CANNOT_LOAD_DATA";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_CANNOT_INSTANTIATE_OBJECT:
-                // CoCreateInstance will return an error code if this happens,
-                // we'll handle this above.
-                return;
-                break;
-            case INET_E_REDIRECT_FAILED: // (0x800C0014L or -2146697196)
-                errorCode = "INET_E_REDIRECT_FAILED";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_REDIRECT_TO_DIR: // (0x800C0015L or -2146697195)
-                errorCode = "INET_E_REDIRECT_TO_DIR";
-                errorType = wxWEB_NAV_ERR_REQUEST;
-                break;
-            case INET_E_CANNOT_LOCK_REQUEST: // (0x800C0016L or -2146697194)
-                errorCode = "INET_E_CANNOT_LOCK_REQUEST";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_USE_EXTEND_BINDING: // (0x800C0017L or -2146697193)
-                errorCode = "INET_E_USE_EXTEND_BINDING";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_TERMINATED_BIND: // (0x800C0018L or -2146697192)
-                errorCode = "INET_E_TERMINATED_BIND";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_INVALID_CERTIFICATE: // (0x800C0019L or -2146697191)
-                errorCode = "INET_E_INVALID_CERTIFICATE";
-                errorType = wxWEB_NAV_ERR_CERTIFICATE;
-                break;
-            case INET_E_CODE_DOWNLOAD_DECLINED: // (0x800C0100L or -2146696960)
-                errorCode = "INET_E_CODE_DOWNLOAD_DECLINED";
-                errorType = wxWEB_NAV_ERR_USER_CANCELLED;
-                break;
-            case INET_E_RESULT_DISPATCHED: // (0x800C0200L or -2146696704)
-                // cancel request cancelled...
-                errorCode = "INET_E_RESULT_DISPATCHED";
-                errorType = wxWEB_NAV_ERR_OTHER;
-                break;
-            case INET_E_CANNOT_REPLACE_SFP_FILE: // (0x800C0300L or -2146696448)
-                errorCode = "INET_E_CANNOT_REPLACE_SFP_FILE";
-                errorType = wxWEB_NAV_ERR_SECURITY;
-                break;
-            case INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY:
-                errorCode = "INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY";
-                errorType = wxWEB_NAV_ERR_SECURITY;
-                break;
-            case INET_E_CODE_INSTALL_SUPPRESSED:
-                errorCode = "INET_E_CODE_INSTALL_SUPPRESSED";
-                errorType = wxWEB_NAV_ERR_SECURITY;
-                break;
-            }
+                // 400 Error codes
+                WX_ERROR_CASE(HTTP_STATUS_BAD_REQUEST, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_DENIED, wxWEBVIEW_NAV_ERR_AUTH)
+                WX_ERROR_CASE(HTTP_STATUS_PAYMENT_REQ, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(HTTP_STATUS_FORBIDDEN, wxWEBVIEW_NAV_ERR_AUTH)
+                WX_ERROR_CASE(HTTP_STATUS_NOT_FOUND, wxWEBVIEW_NAV_ERR_NOT_FOUND)
+                WX_ERROR_CASE(HTTP_STATUS_BAD_METHOD, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_NONE_ACCEPTABLE, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(HTTP_STATUS_PROXY_AUTH_REQ, wxWEBVIEW_NAV_ERR_AUTH)
+                WX_ERROR_CASE(HTTP_STATUS_REQUEST_TIMEOUT, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_CONFLICT, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_GONE, wxWEBVIEW_NAV_ERR_NOT_FOUND)
+                WX_ERROR_CASE(HTTP_STATUS_LENGTH_REQUIRED, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_PRECOND_FAILED, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_REQUEST_TOO_LARGE, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_URI_TOO_LONG, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_UNSUPPORTED_MEDIA, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(HTTP_STATUS_RETRY_WITH, wxWEBVIEW_NAV_ERR_OTHER)
 
-            wxString url = evt[1].GetString();
-            wxString target = evt[2].GetString();
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
-                                 url, target);
-            event.SetEventObject(this);
-            event.SetInt(errorType);
-            event.SetString(errorCode);
+                // 500 - Error codes
+                WX_ERROR_CASE(HTTP_STATUS_SERVER_ERROR, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_NOT_SUPPORTED, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_BAD_GATEWAY, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_SERVICE_UNAVAIL, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_GATEWAY_TIMEOUT, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(HTTP_STATUS_VERSION_NOT_SUP, wxWEBVIEW_NAV_ERR_REQUEST)
+
+                // URL Moniker error codes
+                WX_ERROR_CASE(INET_E_INVALID_URL, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(INET_E_NO_SESSION, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(INET_E_CANNOT_CONNECT, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(INET_E_RESOURCE_NOT_FOUND, wxWEBVIEW_NAV_ERR_NOT_FOUND)
+                WX_ERROR_CASE(INET_E_OBJECT_NOT_FOUND, wxWEBVIEW_NAV_ERR_NOT_FOUND)
+                WX_ERROR_CASE(INET_E_DATA_NOT_AVAILABLE, wxWEBVIEW_NAV_ERR_NOT_FOUND)
+                WX_ERROR_CASE(INET_E_DOWNLOAD_FAILURE, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(INET_E_AUTHENTICATION_REQUIRED, wxWEBVIEW_NAV_ERR_AUTH)
+                WX_ERROR_CASE(INET_E_NO_VALID_MEDIA, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(INET_E_CONNECTION_TIMEOUT, wxWEBVIEW_NAV_ERR_CONNECTION)
+                WX_ERROR_CASE(INET_E_INVALID_REQUEST, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(INET_E_UNKNOWN_PROTOCOL, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(INET_E_SECURITY_PROBLEM, wxWEBVIEW_NAV_ERR_SECURITY)
+                WX_ERROR_CASE(INET_E_CANNOT_LOAD_DATA, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_REDIRECT_FAILED, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_REDIRECT_TO_DIR, wxWEBVIEW_NAV_ERR_REQUEST)
+                WX_ERROR_CASE(INET_E_CANNOT_LOCK_REQUEST, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_USE_EXTEND_BINDING, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_TERMINATED_BIND, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_INVALID_CERTIFICATE, wxWEBVIEW_NAV_ERR_CERTIFICATE)
+                WX_ERROR_CASE(INET_E_CODE_DOWNLOAD_DECLINED, wxWEBVIEW_NAV_ERR_USER_CANCELLED)
+                WX_ERROR_CASE(INET_E_RESULT_DISPATCHED, wxWEBVIEW_NAV_ERR_OTHER)
+                WX_ERROR_CASE(INET_E_CANNOT_REPLACE_SFP_FILE, wxWEBVIEW_NAV_ERR_SECURITY)
+                WX_ERROR_CASE(INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY, wxWEBVIEW_NAV_ERR_SECURITY)
+                WX_ERROR_CASE(INET_E_CODE_INSTALL_SUPPRESSED, wxWEBVIEW_NAV_ERR_SECURITY)
+            }
             HandleWindowEvent(event);
             break;
         }
@@ -1079,7 +1389,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         {
             wxString url = evt[4].GetString();
 
-            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+            wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                                  GetId(), url, wxEmptyString);
             event.SetEventObject(this);
             HandleWindowEvent(event);
@@ -1109,7 +1419,7 @@ END_IID_TABLE;
 
 IMPLEMENT_IUNKNOWN_METHODS(VirtualProtocol)
 
-HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
+HRESULT STDMETHODCALLTYPE VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
                                wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
                                HANDLE_PTR dwReserved)
 {
@@ -1136,7 +1446,7 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi
     return S_OK;
 }
 
-HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
+HRESULT STDMETHODCALLTYPE VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
 {
     //If the file is null we return false to indicte it is finished
     if(!m_file)
@@ -1169,7 +1479,7 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
     }
     else
     {
-        //Dummy return to surpress a compiler warning
+        //Dummy return to suppress a compiler warning
         wxFAIL;
         return INET_E_DOWNLOAD_FAILURE;
     }
@@ -1182,7 +1492,7 @@ END_IID_TABLE;
 
 IMPLEMENT_IUNKNOWN_METHODS(ClassFactory)
 
-HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
+HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
                                      void ** ppvObject)
 {
     if (pUnkOuter)
@@ -1201,7 +1511,7 @@ STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
     return S_OK;
 }
 
-wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, 
+wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
                              DocHostUIHandler* uiHandler) :
     wxActiveXContainer(parent,iid,pUnk)
 {
@@ -1212,7 +1522,7 @@ wxIEContainer::~wxIEContainer()
 {
 }
 
-bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface, 
+bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
                                              const char *&desc)
 {
     if (m_uiHandler && IsEqualIID(iid, wxIID_IDocHostUIHandler))
@@ -1224,26 +1534,29 @@ bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
     return false;
 }
 
-HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt, 
-                                          IUnknown *pcmdtReserved, 
+HRESULT wxSTDCALL DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
+                                          IUnknown *pcmdtReserved,
                                           IDispatch *pdispReserved)
 {
     wxUnusedVar(dwID);
     wxUnusedVar(ppt);
     wxUnusedVar(pcmdtReserved);
     wxUnusedVar(pdispReserved);
-    return E_NOTIMPL;
+    if(m_browser->IsContextMenuEnabled()) 
+        return E_NOTIMPL; 
+    else 
+        return S_OK; 
 }
 
-HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
+HRESULT wxSTDCALL DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
 {
-    //don't show 3d border and ebales themes.
+    //don't show 3d border and enable themes.
     pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
     return S_OK;
 }
 
-HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
-                                 IOleInPlaceActiveObject *pActiveObject, 
+HRESULT wxSTDCALL DocHostUIHandler::ShowUI(DWORD dwID,
+                                 IOleInPlaceActiveObject *pActiveObject,
                                  IOleCommandTarget *pCommandTarget,
                                  IOleInPlaceFrame *pFrame,
                                  IOleInPlaceUIWindow *pDoc)
@@ -1256,35 +1569,35 @@ HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
     return S_FALSE;
 }
 
-HRESULT DocHostUIHandler::HideUI(void)
+HRESULT wxSTDCALL DocHostUIHandler::HideUI(void)
 {
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::UpdateUI(void)
+HRESULT wxSTDCALL DocHostUIHandler::UpdateUI(void)
 {
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::EnableModeless(BOOL fEnable)
+HRESULT wxSTDCALL DocHostUIHandler::EnableModeless(BOOL fEnable)
 {
     wxUnusedVar(fEnable);
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::OnDocWindowActivate(BOOL fActivate)
+HRESULT wxSTDCALL DocHostUIHandler::OnDocWindowActivate(BOOL fActivate)
 {
     wxUnusedVar(fActivate);
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
+HRESULT wxSTDCALL DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
 {
     wxUnusedVar(fActivate);
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder, 
+HRESULT wxSTDCALL DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
                                        IOleInPlaceUIWindow *pUIWindow,
                                        BOOL fFrameWindow)
 {
@@ -1294,19 +1607,26 @@ HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg, 
+HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
                                                const GUID *pguidCmdGroup,
                                                DWORD nCmdID)
 {
     if(lpMsg && lpMsg->message == WM_KEYDOWN)
     {
-        //control is down?
-        if((GetKeyState(VK_CONTROL) & 0x8000 ))
+        // check control is down but that it isn't right-alt which is mapped to
+        // alt + ctrl
+        if(GetKeyState(VK_CONTROL) & 0x8000 && 
+         !(GetKeyState(VK_MENU) & 0x8000))
         {
-            //skip CTRL-N, CTRL-F and CTRL-P
-            if(lpMsg->wParam == 'N' || lpMsg->wParam == 'P' || lpMsg->wParam == 'F')
+            //skip the accelerators used by the control
+            switch(lpMsg->wParam)
             {
-                return S_OK;
+                case 'F':
+                case 'L':
+                case 'N':
+                case 'O':
+                case 'P':
+                    return S_OK;
             }
         }
         //skip F5
@@ -1321,14 +1641,14 @@ HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw)
+HRESULT wxSTDCALL DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw)
 {
     wxUnusedVar(pchKey);
     wxUnusedVar(dw);
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
+HRESULT wxSTDCALL DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
                                         IDropTarget **ppDropTarget)
 {
     wxUnusedVar(pDropTarget);
@@ -1336,13 +1656,13 @@ HRESULT DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::GetExternal(IDispatch **ppDispatch)
+HRESULT wxSTDCALL DocHostUIHandler::GetExternal(IDispatch **ppDispatch)
 {
     wxUnusedVar(ppDispatch);
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
+HRESULT wxSTDCALL DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
                                        OLECHAR *pchURLIn,
                                        OLECHAR **ppchURLOut)
 {
@@ -1352,7 +1672,7 @@ HRESULT DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet)
+HRESULT wxSTDCALL DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet)
 {
     wxUnusedVar(pDO);
     wxUnusedVar(ppDORet);
diff --git a/Externals/wxWidgets3/src/msw/wince/checklst.cpp b/Externals/wxWidgets3/src/msw/wince/checklst.cpp
index 744efaeb9a..6b9fd5e409 100644
--- a/Externals/wxWidgets3/src/msw/wince/checklst.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/checklst.cpp
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     30.10.2005
-// RCS-ID:      $Id: checklst.cpp 66557 2011-01-04 09:13:49Z SC $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -343,14 +342,14 @@ bool wxCheckListBox::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     // Check image changed
                     if ((stOld & LVIS_STATEIMAGEMASK) != (stNew & LVIS_STATEIMAGEMASK))
                     {
-                        event.SetEventType(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED);
+                        event.SetEventType(wxEVT_CHECKLISTBOX);
                         event.SetInt(IsChecked(iItem));
                         (void) GetEventHandler()->ProcessEvent(event);
                     }
 
                     if ( (stNew & LVIS_SELECTED) != (stOld & LVIS_SELECTED) )
                     {
-                        eventType = wxEVT_COMMAND_LISTBOX_SELECTED;
+                        eventType = wxEVT_LISTBOX;
 
                         event.SetExtraLong( (stNew & LVIS_SELECTED) != 0 ); // is a selection
                         event.SetInt(iItem);
diff --git a/Externals/wxWidgets3/src/msw/wince/choicece.cpp b/Externals/wxWidgets3/src/msw/wince/choicece.cpp
index 1913302621..04ea4850a2 100644
--- a/Externals/wxWidgets3/src/msw/wince/choicece.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/choicece.cpp
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004
-// RCS-ID:      $Id: choicece.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -246,7 +245,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)GetBuddyHwnd(), 0);
 
     // do it after finishing with m_hwndBuddy creation to avoid generating
-    // initial wxEVT_COMMAND_TEXT_UPDATED message
+    // initial wxEVT_TEXT message
     ms_allChoiceSpins.Add(this);
 
     // initialize the controls contents
@@ -303,7 +302,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     int n = GetSelection();
     if (n > -1)
     {
-        wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
+        wxCommandEvent event(wxEVT_CHOICE, m_windowId);
         event.SetInt(n);
         event.SetEventObject(this);
         event.SetString(GetStringSelection());
diff --git a/Externals/wxWidgets3/src/msw/wince/clean_vcp.py b/Externals/wxWidgets3/src/msw/wince/clean_vcp.py
index 184ab88075..cfce50fb0a 100644
--- a/Externals/wxWidgets3/src/msw/wince/clean_vcp.py
+++ b/Externals/wxWidgets3/src/msw/wince/clean_vcp.py
@@ -1,13 +1,12 @@
 '''
 This script will delete dependences from *.vcp files.
 After using this script, next time when you will try to save project,
-you will have wait untill 'Visual Tools' will rebuild all dependencies
+you will have wait until 'Visual Tools' will rebuild all dependencies
 and this process might take HUGE amount of time
 
 Author : Viktor Voroshylo
-$Id: clean_vcp.py 24713 2003-12-04 08:59:16Z JS $
 '''
-__version__='$Revision: 24713 $'[11:-2]
+__version__='$Revision: 74602 $'[11:-2]
 
 import sys
 
diff --git a/Externals/wxWidgets3/src/msw/wince/crt.cpp b/Externals/wxWidgets3/src/msw/wince/crt.cpp
index 0a9e4b8deb..2a98a6d073 100644
--- a/Externals/wxWidgets3/src/msw/wince/crt.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/crt.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.04
-// RCS-ID:      $Id: crt.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/wince/filedlgwce.cpp b/Externals/wxWidgets3/src/msw/wince/filedlgwce.cpp
index 0243939eba..19a4a19101 100644
--- a/Externals/wxWidgets3/src/msw/wince/filedlgwce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/filedlgwce.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: filedlgwce.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -47,6 +46,7 @@
 #include <string.h>
 
 #include "wx/filename.h"
+#include "wx/modalhook.h"
 
 // ============================================================================
 // implementation
@@ -112,6 +112,8 @@ void wxFileDialog::SetPath(const wxString& path)
 
 int wxFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     wxWindow* parentWindow = GetParent();
     if (!parentWindow)
         parentWindow = wxTheApp->GetTopWindow();
diff --git a/Externals/wxWidgets3/src/msw/wince/filefnwce.cpp b/Externals/wxWidgets3/src/msw/wince/filefnwce.cpp
index ee303728b9..6f9292fa84 100644
--- a/Externals/wxWidgets3/src/msw/wince/filefnwce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/filefnwce.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: filefnwce.cpp 52112 2008-02-26 14:15:35Z JS $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -113,6 +112,12 @@ int wxCRT_Access(const wxChar *name, int WXUNUSED(how))
     return 0;
 }
 
+int wxCRT_Chmod(const wxChar *WXUNUSED(name), int WXUNUSED(how))
+{
+    // TODO
+    return -1;
+}
+
 int wxClose(int fd)
 {
     if (CloseHandle((HANDLE)fd))
diff --git a/Externals/wxWidgets3/src/msw/wince/helpwce.cpp b/Externals/wxWidgets3/src/msw/wince/helpwce.cpp
index 6b467c10a1..2582360788 100644
--- a/Externals/wxWidgets3/src/msw/wince/helpwce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/helpwce.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
-// RCS-ID:      $Id: helpwce.cpp 57873 2009-01-07 01:47:47Z FM $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/wince/menuce.cpp b/Externals/wxWidgets3/src/msw/wince/menuce.cpp
index 02b4825b09..9f8822d9bc 100644
--- a/Externals/wxWidgets3/src/msw/wince/menuce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/menuce.cpp
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     28.05.2004
-// RCS-ID:      $Id: menuce.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -248,7 +247,7 @@ bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND
     if ( id == IDM_LEFT || id == IDM_RIGHT )
     {
         int menuId = id == IDM_LEFT ? m_LeftButton.GetId() : m_RightButton.GetId() ;
-        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, menuId);
+        wxCommandEvent commandEvent(wxEVT_MENU, menuId);
         commandEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(commandEvent);
         return true;
diff --git a/Externals/wxWidgets3/src/msw/wince/net.cpp b/Externals/wxWidgets3/src/msw/wince/net.cpp
index f8b44f9b14..98110369e6 100644
--- a/Externals/wxWidgets3/src/msw/wince/net.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/net.cpp
@@ -4,7 +4,6 @@
 // Author:
 // Modified by:
 // Created:
-// RCS-ID:      $Id: net.cpp 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   Copyright 1998, Ben Goetter.  All rights reserved.
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp b/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
index f397cb2bfd..bb0f99f380 100644
--- a/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
-// RCS-ID:      $Id: tbarwce.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -372,7 +371,7 @@ bool wxToolMenuBar::Realize()
 #endif // 0
 
     bool lastWasRadio = false;
-    wxToolBarToolsList::Node* node;
+    wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolMenuBarTool *tool = (wxToolMenuBarTool*) node->GetData();
@@ -403,7 +402,7 @@ bool wxToolMenuBar::Realize()
                     const wxString& label = tool->GetLabel();
                     if ( !label.empty() )
                     {
-                        button.iString = (int)label.wx_str();
+                        button.iString = (int) wxMSW_CONV_LPCTSTR(label);
                     }
                 }
 
@@ -504,7 +503,7 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
             }
         }
 
-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
+        wxCommandEvent event(wxEVT_MENU);
         event.SetEventObject(this);
         event.SetId(id);
         event.SetInt(checked);
diff --git a/Externals/wxWidgets3/src/msw/wince/textctrlce.cpp b/Externals/wxWidgets3/src/msw/wince/textctrlce.cpp
index 9ce652e7de..d1b487be04 100644
--- a/Externals/wxWidgets3/src/msw/wince/textctrlce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/textctrlce.cpp
@@ -4,7 +4,6 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     30.08.2004
-// RCS-ID:      $Id: textctrlce.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -258,7 +257,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)GetBuddyHwnd(), 0);
 
     // do it after finishing with m_hwndBuddy creation to avoid generating
-    // initial wxEVT_COMMAND_TEXT_UPDATED message
+    // initial wxEVT_TEXT message
     ms_allTextSpins.Add(this);
 
     return true;
@@ -873,7 +872,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         case WXK_RETURN:
             if ( !HasFlag(wxTE_MULTILINE) )
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 if ( GetEventHandler()->ProcessEvent(event) )
@@ -983,7 +982,7 @@ bool wxTextCtrl::SendUpdateEvent()
         return false;
     }
 
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+    wxCommandEvent event(wxEVT_TEXT, GetId());
     InitCommandEvent(event);
     event.SetString(GetValue());
 
@@ -1013,7 +1012,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             // the text size limit has been hit -- try to increase it
             if ( !AdjustSpaceLimit() )
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_MAXLEN, m_windowId);
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 ProcessCommand(event);
diff --git a/Externals/wxWidgets3/src/msw/wince/time.cpp b/Externals/wxWidgets3/src/msw/wince/time.cpp
index d7f1e90a84..ef2ca653f4 100644
--- a/Externals/wxWidgets3/src/msw/wince/time.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/time.cpp
@@ -4,7 +4,6 @@
 // Author:      Marco Cavallini (MCK) - wx@koansoftware.com
 // Modified by: Vadim Zeitlin for VC8 support
 // Created:     31-08-2003
-// RCS-ID:      $Id: time.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Marco Cavallini
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/msw/window.cpp b/Externals/wxWidgets3/src/msw/window.cpp
index 5764b6e964..225e13d531 100644
--- a/Externals/wxWidgets3/src/msw/window.cpp
+++ b/Externals/wxWidgets3/src/msw/window.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation
 // Created:     04/01/98
-// RCS-ID:      $Id: window.cpp 70794 2012-03-04 00:29:17Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,6 +59,7 @@
 #include "wx/hashmap.h"
 #include "wx/evtloop.h"
 #include "wx/power.h"
+#include "wx/scopeguard.h"
 #include "wx/sysopt.h"
 
 #if wxUSE_DRAG_AND_DROP
@@ -81,6 +81,7 @@
 #include "wx/msw/private.h"
 #include "wx/msw/private/keyboard.h"
 #include "wx/msw/dcclient.h"
+#include "wx/private/textmeasure.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -240,6 +241,9 @@ EraseBgHooks gs_eraseBgHooks;
 // needed.
 int gs_modalEntryWindowCount = 0;
 
+// Indicates whether we are currently processing WM_CAPTURECHANGED message.
+bool gs_insideCaptureChanged = false;
+
 } // anonymous namespace
 
 // ---------------------------------------------------------------------------
@@ -361,30 +365,21 @@ END_EVENT_TABLE()
 // ---------------------------------------------------------------------------
 
 // Find an item given the MS Windows id
-wxWindow *wxWindowMSW::FindItem(long id) const
+wxWindow *wxWindowMSW::FindItem(long id, WXHWND hWnd) const
 {
-#if wxUSE_CONTROLS
-    wxControl *item = wxDynamicCastThis(wxControl);
-    if ( item )
-    {
-        // is it us or one of our "internal" children?
-        if ( item->GetId() == id
-#ifndef __WXUNIVERSAL__
-                || (item->GetSubcontrols().Index(id) != wxNOT_FOUND)
-#endif // __WXUNIVERSAL__
-           )
-        {
-            return item;
-        }
-    }
-#endif // wxUSE_CONTROLS
+    // First check for the control itself and its Windows-level children which
+    // are mapped to the same wxWindow at wx level.
+    wxWindow *wnd = MSWFindItem(id, hWnd);
+    if ( wnd )
+        return wnd;
 
+    // Then check wx level children.
     wxWindowList::compatibility_iterator current = GetChildren().GetFirst();
     while (current)
     {
         wxWindow *childWin = current->GetData();
 
-        wxWindow *wnd = childWin->FindItem(id);
+        wnd = childWin->FindItem(id, hWnd);
         if ( wnd )
             return wnd;
 
@@ -409,7 +404,7 @@ wxWindow *wxWindowMSW::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 
         if ( !controlOnly
 #if wxUSE_CONTROLS
-                || parent->IsKindOf(CLASSINFO(wxControl))
+                || wxDynamicCast(parent, wxControl)
 #endif // wxUSE_CONTROLS
            )
         {
@@ -670,7 +665,9 @@ wxWindowMSW::MSWShowWithEffect(bool show,
                                wxShowEffect effect,
                                unsigned timeout)
 {
-    if ( effect == wxSHOW_EFFECT_NONE )
+#if wxUSE_DYNLIB_CLASS
+    if ( effect == wxSHOW_EFFECT_NONE ||
+            (GetParent() && !GetParent()->IsShownOnScreen()) )
         return Show(show);
 
     if ( !wxWindowBase::Show(show) )
@@ -766,6 +763,9 @@ wxWindowMSW::MSWShowWithEffect(bool show,
     }
 
     return true;
+#else    // wxUSE_DYNLIB_CLASS
+    return Show(show);
+#endif
 }
 
 // Raise the window to the top of the Z order
@@ -800,6 +800,13 @@ void wxWindowMSW::DoReleaseMouse()
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 {
+    // When we receive WM_CAPTURECHANGED message, ::GetCapture() still returns
+    // the HWND that is losing the mouse capture. But as we must not release
+    // the capture for it (it's going to happen anyhow), pretend that there is
+    // no capture any more.
+    if ( gs_insideCaptureChanged )
+        return NULL;
+
     HWND hwnd = ::GetCapture();
     return hwnd ? wxFindWinFromHandle(hwnd) : NULL;
 }
@@ -1185,6 +1192,11 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
     if ( !wxCheckWindowWndProc(hWnd, (WXFARPROC)wxWndProc) )
     {
         wxSetWindowProc(hwnd, wxWndProc);
+
+        // If the window didn't use our window proc during its creation, the
+        // code in HandleCreate() hasn't been executed, so do it here.
+        if ( wxHasWindowExStyle(this, WS_EX_CONTROLPARENT) )
+            EnsureParentHasControlParentStyle(GetParent());
     }
     else
     {
@@ -1425,7 +1437,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially
     // don't support overlapping windows and it only makes sense for them and,
     // presumably, gives the system some extra work (to manage more clipping
-    // regions), so avoid it alltogether
+    // regions), so avoid it altogether
 
 
     if ( flags & wxVSCROLL )
@@ -2160,31 +2172,18 @@ void wxWindowMSW::DoGetTextExtent(const wxString& string,
                                   int *externalLeading,
                                   const wxFont *fontToUse) const
 {
-    wxASSERT_MSG( !fontToUse || fontToUse->IsOk(),
-                    wxT("invalid font in GetTextExtent()") );
-
-    HFONT hfontToUse;
-    if ( fontToUse )
-        hfontToUse = GetHfontOf(*fontToUse);
+    // ensure we work with a valid font
+    wxFont font;
+    if ( !fontToUse || !fontToUse->IsOk() )
+        font = GetFont();
     else
-        hfontToUse = GetHfontOf(GetFont());
+        font = *fontToUse;
 
-    WindowHDC hdc(GetHwnd());
-    SelectInHDC selectFont(hdc, hfontToUse);
+    wxCHECK_RET( font.IsOk(), wxT("invalid font in GetTextExtent()") );
 
-    SIZE sizeRect;
-    TEXTMETRIC tm;
-    ::GetTextExtentPoint32(hdc, string.wx_str(), string.length(), &sizeRect);
-    GetTextMetrics(hdc, &tm);
-
-    if ( x )
-        *x = sizeRect.cx;
-    if ( y )
-        *y = sizeRect.cy;
-    if ( descent )
-        *descent = tm.tmDescent;
-    if ( externalLeading )
-        *externalLeading = tm.tmExternalLeading;
+    const wxWindow* win = static_cast<const wxWindow*>(this);
+    wxTextMeasure txm(win, &font);
+    txm.GetTextExtent(string, x, y, descent, externalLeading);
 }
 
 // ---------------------------------------------------------------------------
@@ -2296,7 +2295,14 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
 {
     // wxUniversal implements tab traversal itself
 #ifndef __WXUNIVERSAL__
-    if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) )
+    // Notice that we check for both wxTAB_TRAVERSAL and WS_EX_CONTROLPARENT
+    // being set here. While normally the latter should always be set if the
+    // former is, doing it like this also works if there is ever a bug that
+    // results in wxTAB_TRAVERSAL being set but not WS_EX_CONTROLPARENT as we
+    // must not call IsDialogMessage() then, it would simply hang (see #15458).
+    if ( m_hWnd &&
+            HasFlag(wxTAB_TRAVERSAL) &&
+                (wxGetWindowExStyle(this) & WS_EX_CONTROLPARENT) )
     {
         // intercept dialog navigation keys
         MSG *msg = (MSG *)pMsg;
@@ -2898,9 +2904,13 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
 #if wxUSE_MOUSEWHEEL
         case WM_MOUSEWHEEL:
-            processed = HandleMouseWheel(wParam, lParam);
+            processed = HandleMouseWheel(wxMOUSE_WHEEL_VERTICAL, wParam, lParam);
             break;
-#endif
+
+        case WM_MOUSEHWHEEL:
+            processed = HandleMouseWheel(wxMOUSE_WHEEL_HORIZONTAL, wParam, lParam);
+            break;
+#endif // wxUSE_MOUSEWHEEL
 
         case WM_LBUTTONDOWN:
         case WM_LBUTTONUP:
@@ -3437,26 +3447,31 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 #if !defined(__WXWINCE__)
         case WM_CONTEXTMENU:
             {
+                // Ignore the events that are propagated from a child window by
+                // DefWindowProc(): as wxContextMenuEvent is already propagated
+                // upwards the window hierarchy by us, not doing this would
+                // result in duplicate events being sent.
+                WXHWND hWnd = (WXHWND)wParam;
+                if ( hWnd != m_hWnd )
+                {
+                    wxWindowMSW *win = FindItemByHWND(hWnd);
+                    if ( win && IsDescendant(win) )
+                    {
+                        // We had already generated wxContextMenuEvent when we
+                        // got WM_CONTEXTMENU for that window.
+                        processed = true;
+                        break;
+                    }
+                }
+
                 // we don't convert from screen to client coordinates as
                 // the event may be handled by a parent window
                 wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
 
                 wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
+                evtCtx.SetEventObject(this);
 
-                // we could have got an event from our child, reflect it back
-                // to it if this is the case
-                wxWindowMSW *win = NULL;
-                WXHWND hWnd = (WXHWND)wParam;
-                if ( hWnd != m_hWnd )
-                {
-                    win = FindItemByHWND(hWnd);
-                }
-
-                if ( !win )
-                    win = this;
-
-                evtCtx.SetEventObject(win);
-                processed = win->HandleWindowEvent(evtCtx);
+                processed = HandleWindowEvent(evtCtx);
             }
             break;
 #endif
@@ -3757,8 +3772,8 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         extendedStyle,
-                        className.wx_str(),
-                        title ? title : m_windowName.wx_str(),
+                        className.t_str(),
+                        title ? title : m_windowName.t_str(),
                         style,
                         x, y, w, h,
                         (HWND)MSWGetParent(),
@@ -3878,7 +3893,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
                     (
                         CP_ACP,
                         0,                      // no flags
-                        ttip.wx_str(),
+                        ttip.t_str(),
                         tipLength,
                         buf,
                         WXSIZEOF(buf) - 1
@@ -4028,7 +4043,10 @@ bool wxWindowMSW::HandleActivate(int state,
 {
     wxActivateEvent event(wxEVT_ACTIVATE,
                           (state == WA_ACTIVE) || (state == WA_CLICKACTIVE),
-                          m_windowId);
+                          m_windowId,
+                          state == WA_CLICKACTIVE
+                            ? wxActivateEvent::Reason_Mouse
+                            : wxActivateEvent::Reason_Unknown);
     event.SetEventObject(this);
 
     return HandleWindowEvent(event);
@@ -4544,6 +4562,12 @@ bool wxWindowMSW::HandlePaletteChanged(WXHWND hWndPalChange)
 
 bool wxWindowMSW::HandleCaptureChanged(WXHWND hWndGainedCapture)
 {
+    // Ensure that wxWindow::GetCapture() returns NULL if called from the event
+    // handlers invoked below. This is necessary to avoid wrongly calling
+    // ReleaseMouse() when we're already losing the mouse capture anyhow.
+    gs_insideCaptureChanged = true;
+    wxON_BLOCK_EXIT_SET(gs_insideCaptureChanged, false);
+
     // notify windows on the capture stack about lost capture
     // (see http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863):
     wxWindowBase::NotifyCaptureLost();
@@ -4820,6 +4844,8 @@ bool wxWindowMSW::HandlePaint()
     // be called from inside the event handlers called above)
     m_updateRegion.Clear();
 
+    wxPaintDCImpl::EndPaint((wxWindow *)this);
+
     return processed;
 }
 
@@ -4839,6 +4865,16 @@ void wxWindowMSW::OnPaint(wxPaintEvent& event)
 
 bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
 {
+    if ( IsBeingDeleted() )
+    {
+        // We can get WM_ERASEBKGND after starting the destruction of our top
+        // level parent. Handling it in this case is unnecessary and can be
+        // actually harmful as e.g. wxStaticBox::GetClientSize() doesn't work
+        // without a valid TLW parent (because it uses dialog units internally
+        // which use the dialog font), so just don't do anything then.
+        return false;
+    }
+
     switch ( GetBackgroundStyle() )
     {
         case wxBG_STYLE_ERASE:
@@ -4951,7 +4987,11 @@ wxWindowMSW::MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child)
 
         ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
 
-        if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) )
+        int x = rc.left,
+            y = rc.top;
+        MSWAdjustBrushOrg(&x, &y);
+
+        if ( !::SetBrushOrgEx((HDC)hDC, -x, -y, NULL) )
         {
             wxLogLastError(wxT("SetBrushOrgEx(bg brush)"));
         }
@@ -5091,11 +5131,9 @@ bool wxWindowMSW::HandleExitSizeMove()
     return HandleWindowEvent(event);
 }
 
-bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
+bool wxWindowMSW::BeginRepositioningChildren()
 {
 #if wxUSE_DEFERRED_SIZING
-    // when we resize this window, its children are probably going to be
-    // repositioned as well, prepare to use DeferWindowPos() for them
     int numChildren = 0;
     for ( HWND child = ::GetWindow(GetHwndOf(this), GW_CHILD);
           child;
@@ -5104,23 +5142,60 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
         numChildren ++;
     }
 
-    // Protect against valid m_hDWP being overwritten
-    bool useDefer = false;
+    // Nothing is gained by deferring the repositioning of a single child.
+    if ( numChildren < 2 )
+        return false;
 
-    if ( numChildren > 1 )
+    // Protect against valid m_hDWP being overwritten
+    if ( m_hDWP )
+        return false;
+
+    m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
+    if ( !m_hDWP )
     {
-        if (!m_hDWP)
-        {
-            m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
-            if ( !m_hDWP )
-            {
-                wxLogLastError(wxT("BeginDeferWindowPos"));
-            }
-            if (m_hDWP)
-                useDefer = true;
-        }
+        wxLogLastError(wxT("BeginDeferWindowPos"));
+        return false;
+    }
+
+    // Return true to indicate that EndDeferWindowPos() should be called.
+    return true;
+#endif // wxUSE_DEFERRED_SIZING
+}
+
+void wxWindowMSW::EndRepositioningChildren()
+{
+#if wxUSE_DEFERRED_SIZING
+    wxASSERT_MSG( m_hDWP, wxS("Shouldn't be called") );
+
+    // reset m_hDWP to NULL so that child windows don't try to use our
+    // m_hDWP after we call EndDeferWindowPos() on it (this shouldn't
+    // happen anyhow normally but who knows what weird flow of control we
+    // may have depending on what the users EVT_SIZE handler does...)
+    HDWP hDWP = (HDWP)m_hDWP;
+    m_hDWP = NULL;
+
+    // do put all child controls in place at once
+    if ( !::EndDeferWindowPos(hDWP) )
+    {
+        wxLogLastError(wxT("EndDeferWindowPos"));
+    }
+
+    // Reset our children's pending pos/size values.
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindowMSW * const child = node->GetData();
+        child->MSWEndDeferWindowPos();
     }
 #endif // wxUSE_DEFERRED_SIZING
+}
+
+bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
+{
+    // when we resize this window, its children are probably going to be
+    // repositioned as well, prepare to use DeferWindowPos() for them
+    ChildrenRepositioningGuard repositionGuard(this);
 
     // update this window size
     bool processed = false;
@@ -5153,34 +5228,6 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
             processed = HandleWindowEvent(event);
     }
 
-#if wxUSE_DEFERRED_SIZING
-    // and finally change the positions of all child windows at once
-    if ( useDefer && m_hDWP )
-    {
-        // reset m_hDWP to NULL so that child windows don't try to use our
-        // m_hDWP after we call EndDeferWindowPos() on it (this shouldn't
-        // happen anyhow normally but who knows what weird flow of control we
-        // may have depending on what the users EVT_SIZE handler does...)
-        HDWP hDWP = (HDWP)m_hDWP;
-        m_hDWP = NULL;
-
-        // do put all child controls in place at once
-        if ( !::EndDeferWindowPos(hDWP) )
-        {
-            wxLogLastError(wxT("EndDeferWindowPos"));
-        }
-
-        // Reset our children's pending pos/size values.
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindowMSW * const child = node->GetData();
-            child->MSWEndDeferWindowPos();
-        }
-    }
-#endif // wxUSE_DEFERRED_SIZING
-
     return processed;
 }
 
@@ -5268,7 +5315,7 @@ bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
     // try the id
     if ( !win )
     {
-        win = FindItem(id);
+        win = FindItem(id, control);
     }
 
     if ( win )
@@ -5279,10 +5326,10 @@ bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
     // the messages sent from the in-place edit control used by the treectrl
     // for label editing have id == 0, but they should _not_ be treated as menu
     // messages (they are EN_XXX ones, in fact) so don't translate anything
-    // coming from a control to wxEVT_COMMAND_MENU_SELECTED
+    // coming from a control to wxEVT_MENU
     if ( !control )
     {
-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id);
+        wxCommandEvent event(wxEVT_MENU, id);
         event.SetEventObject(this);
         event.SetInt(id);
 
@@ -5443,7 +5490,7 @@ bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
     };
 
 #ifdef wxHAS_XBUTTON
-    // the same messages are used for both auxillary mouse buttons so we need
+    // the same messages are used for both auxiliary mouse buttons so we need
     // to adjust the index manually
     switch ( msg )
     {
@@ -5551,7 +5598,9 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
 }
 
 
-bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
+bool
+wxWindowMSW::HandleMouseWheel(wxMouseWheelAxis axis,
+                              WXWPARAM wParam, WXLPARAM lParam)
 {
 #if wxUSE_MOUSEWHEEL
     // notice that WM_MOUSEWHEEL position is in screen coords (as it's
@@ -5564,6 +5613,7 @@ bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
     InitMouseEvent(event, pt.x, pt.y, LOWORD(wParam));
     event.m_wheelRotation = (short)HIWORD(wParam);
     event.m_wheelDelta = WHEEL_DELTA;
+    event.m_wheelAxis = axis;
 
     static int s_linesPerRotation = -1;
     if ( s_linesPerRotation == -1 )
@@ -5579,7 +5629,20 @@ bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
         }
     }
 
+    static int s_columnsPerRotation = -1;
+    if ( s_columnsPerRotation == -1 )
+    {
+        if ( !::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0,
+                                     &s_columnsPerRotation, 0))
+        {
+            // this setting is not supported on Windows 2000/XP, so use the value of 1
+            // http://msdn.microsoft.com/en-us/library/ms997498.aspx
+            s_columnsPerRotation = 1;
+        }
+    }
+
     event.m_linesPerAction = s_linesPerRotation;
+    event.m_columnsPerAction = s_columnsPerRotation;
     return HandleWindowEvent(event);
 
 #else // !wxUSE_MOUSEWHEEL
@@ -5661,21 +5724,6 @@ MSWInitAnyKeyEvent(wxKeyEvent& event,
 #ifndef __WXWINCE__
     event.SetTimestamp(::GetMessageTime());
 #endif
-
-    // Event coordinates must be in window client coordinates system which
-    // doesn't make sense if there is no window.
-    //
-    // We could use screen coordinates for such events but this would make the
-    // logic of the event handlers more complicated: you'd need to test for the
-    // event object and interpret the coordinates differently according to
-    // whether it's NULL or not so unless somebody really asks for this let's
-    // just avoid the issue.
-    if ( win )
-    {
-        const wxPoint mousePos = win->ScreenToClient(wxGetMousePosition());
-        event.m_x = mousePos.x;
-        event.m_y = mousePos.y;
-    }
 }
 
 } // anonymous namespace
@@ -5819,7 +5867,7 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                 wxMenuItem *item = (wxMenuItem*)mii.dwItemData;
 
                 const wxString label(item->GetItemLabel());
-                const wxChar *p = wxStrchr(label.wx_str(), wxT('&'));
+                const wxChar *p = wxStrchr(label.t_str(), wxT('&'));
                 while ( p++ )
                 {
                     if ( *p == wxT('&') )
@@ -5859,9 +5907,9 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
 
 bool wxWindowMSW::HandleClipboardEvent(WXUINT nMsg)
 {
-    const wxEventType type = nMsg == WM_CUT       ? wxEVT_COMMAND_TEXT_CUT
-                           : nMsg == WM_COPY      ? wxEVT_COMMAND_TEXT_COPY
-                           : /* nMsg == WM_PASTE */ wxEVT_COMMAND_TEXT_PASTE;
+    const wxEventType type = nMsg == WM_CUT       ? wxEVT_TEXT_CUT
+                           : nMsg == WM_COPY      ? wxEVT_TEXT_COPY
+                           : /* nMsg == WM_PASTE */ wxEVT_TEXT_PASTE;
     wxClipboardTextEvent evt(type, GetId());
 
     evt.SetEventObject(this);
@@ -6309,6 +6357,9 @@ int VKToWX(WXWORD vk, WXLPARAM lParam, wchar_t *uc)
 
         case VK_DELETE:
             wxk = ChooseNormalOrExtended(lParam, WXK_NUMPAD_DELETE, WXK_DELETE);
+
+            if ( uc )
+                *uc = WXK_DELETE;
             break;
 
         case VK_RETURN:
@@ -6603,7 +6654,7 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
     DWORD hiWord = HIWORD(lParam);
     if ( nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0) )
     {
-        wchar_t uc;
+        wchar_t uc = 0;
         int id = wxMSWKeyboard::VKToWX(wParam, lParam, &uc);
 
         // Don't intercept keyboard entry (notably Escape) if a modal window
@@ -7209,9 +7260,21 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     {
         // WindowFromPoint() ignores the disabled children but we're supposed
         // to take them into account, so check if we have a child at this
-        // coordinate.
-        ::ScreenToClient(hWnd, &pt2);
-        hWnd = ::ChildWindowFromPointEx(hWnd, pt2, CWP_SKIPINVISIBLE);
+        // coordinate using ChildWindowFromPointEx().
+        for ( ;; )
+        {
+            pt2.x = pt.x;
+            pt2.y = pt.y;
+            ::ScreenToClient(hWnd, &pt2);
+            HWND child = ::ChildWindowFromPointEx(hWnd, pt2, CWP_SKIPINVISIBLE);
+            if ( child == hWnd || !child )
+                break;
+
+            // ChildWindowFromPointEx() only examines the immediate children
+            // but we want to get the deepest (top in Z-order) one, so continue
+            // iterating for as long as it finds anything.
+            hWnd = child;
+        }
     }
 
     return wxGetWindowFromHWND((WXHWND)hWnd);
@@ -7291,8 +7354,6 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
     return true;
 }
 
-#if wxUSE_ACCEL
-
 bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 {
     int win_modifiers = LOWORD(lParam);
@@ -7307,8 +7368,6 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
     return HandleWindowEvent(event);
 }
 
-#endif // wxUSE_ACCEL
-
 #endif // wxUSE_HOTKEY
 
 // Not tested under WinCE
@@ -7379,7 +7438,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleWakeUpModule, wxModule)
 #if wxUSE_STATBOX
 static void wxAdjustZOrder(wxWindow* parent)
 {
-    if (parent->IsKindOf(CLASSINFO(wxStaticBox)))
+    if (wxDynamicCast(parent, wxStaticBox))
     {
         // Set the z-order correctly
         SetWindowPos((HWND) parent->GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
diff --git a/Externals/wxWidgets3/src/msw/winestub.c b/Externals/wxWidgets3/src/msw/winestub.c
index 8ba7d73921..bb15e5d698 100644
--- a/Externals/wxWidgets3/src/msw/winestub.c
+++ b/Externals/wxWidgets3/src/msw/winestub.c
@@ -3,7 +3,6 @@
  * Purpose:     wxWINE module mapping main() to WinMain()
  * Author:      Robert Roebling
  * Created:     04/01/98
- * RCS-ID:      $Id: winestub.c 67254 2011-03-20 00:14:35Z DS $
  * Copyright:   (c) Robert Roebling
  * Licence:     wxWindows licence
  *****************************************************************************/
diff --git a/Externals/wxWidgets3/src/osx/accel.cpp b/Externals/wxWidgets3/src/osx/accel.cpp
index 5f3a32cc3a..389f6fb5f2 100644
--- a/Externals/wxWidgets3/src/osx/accel.cpp
+++ b/Externals/wxWidgets3/src/osx/accel.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: accel.cpp 70578 2012-02-13 15:22:04Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/anybutton_osx.cpp b/Externals/wxWidgets3/src/osx/anybutton_osx.cpp
index a650f73132..8a417aff56 100644
--- a/Externals/wxWidgets3/src/osx/anybutton_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/anybutton_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton
 // Author:      Stefan Csomor
 // Created:     1998-01-01 (extracted from button_osx.cpp)
-// RCS-ID:      $Id: anybutton_osx.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/artmac.cpp b/Externals/wxWidgets3/src/osx/artmac.cpp
index 8bab889dfc..d72da8b768 100644
--- a/Externals/wxWidgets3/src/osx/artmac.cpp
+++ b/Externals/wxWidgets3/src/osx/artmac.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxArtProvider instance with native Mac stock icons
 // Author:      Alan Shouls
 // Created:     2006-10-30
-// RCS-ID:      $Id: artmac.cpp 70154 2011-12-28 13:51:29Z VZ $
 // Copyright:   (c) wxWindows team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/bmpbuttn_osx.cpp b/Externals/wxWidgets3/src/osx/bmpbuttn_osx.cpp
index e2ec2d2533..fcc4b9ccf2 100644
--- a/Externals/wxWidgets3/src/osx/bmpbuttn_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/bmpbuttn_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: bmpbuttn_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,7 +66,7 @@ wxSize wxBitmapButton::DoGetBestSize() const
 
     if ( GetBitmapLabel().IsOk() )
     {
-        best += GetBitmapLabel().GetSize();
+        best += GetBitmapLabel().GetScaledSize();
     }
 
     return best;
diff --git a/Externals/wxWidgets3/src/osx/brush.cpp b/Externals/wxWidgets3/src/osx/brush.cpp
index 46f1bb0c36..a71c45d0f5 100644
--- a/Externals/wxWidgets3/src/osx/brush.cpp
+++ b/Externals/wxWidgets3/src/osx/brush.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: brush.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/button_osx.cpp b/Externals/wxWidgets3/src/osx/button_osx.cpp
index 8c5d441173..e604d21483 100644
--- a/Externals/wxWidgets3/src/osx/button_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/button_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button_osx.cpp 67936 2011-06-14 22:19:09Z RD $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -51,23 +50,23 @@ bool wxButton::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
-    DontCreatePeer();
-    
-    m_marginX =
-    m_marginY = 0;
-
     // FIXME: this hack is needed because we're called from
     //        wxBitmapButton::Create() with this style and we currently use a
     //        different wxWidgetImpl method (CreateBitmapButton() rather than
     //        CreateButton()) for creating bitmap buttons, but we really ought
     //        to unify the creation of buttons of all kinds and then remove
     //        this check
-    if ( style & wxBU_NOTEXT )
+    if ( style & wxBU_NOTEXT && !ShouldCreatePeer() )
     {
         return wxControl::Create(parent, id, pos, size, style,
                                  validator, name);
     }
 
+    DontCreatePeer();
+
+    m_marginX =
+    m_marginY = 0;
+
     wxString label;
 
     // Ignore the standard label for help buttons if possible, they use "?"
@@ -101,6 +100,9 @@ void wxButton::SetLabel(const wxString& label)
     }
 
     wxAnyButton::SetLabel(label);
+#if wxOSX_USE_COCOA
+    OSXUpdateAfterLabelChange(label);
+#endif
 }
 
 wxWindow *wxButton::SetDefault()
@@ -125,7 +127,7 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);
     event.SetEventObject(this);
     ProcessCommand(event);
     return true;
@@ -170,7 +172,7 @@ bool wxDisclosureTriangle::IsOpen() const
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     // Just emit button event for now
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);
     event.SetEventObject(this);
     ProcessCommand(event);
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/Info.plist.in b/Externals/wxWidgets3/src/osx/carbon/Info.plist.in
index 1f6860d0e7..f53a692e68 100644
--- a/Externals/wxWidgets3/src/osx/carbon/Info.plist.in
+++ b/Externals/wxWidgets3/src/osx/carbon/Info.plist.in
@@ -2,6 +2,8 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
+	<key>NSPrincipalClass</key>
+	<string>wxNSApplication</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleIdentifier</key>
@@ -30,11 +32,11 @@
 	<key>CFBundleShortVersionString</key>
 	<string>VERSION</string>
 	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2008 wxWidgets</string>
+	<string>EXECUTABLE version VERSION, (c) 2002-2012 wxWidgets</string>
 	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2008 wxWidgets</string>
+	<string>VERSION, (c) 2002-2012 wxWidgets</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2008 wxWidgets</string>
+	<string>Copyright 2002-2012 wxWidgets</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>CSResourcesFileMapped</key>
diff --git a/Externals/wxWidgets3/src/osx/carbon/aboutdlg.cpp b/Externals/wxWidgets3/src/osx/carbon/aboutdlg.cpp
index 438cc77a8b..37ad8f4d7d 100644
--- a/Externals/wxWidgets3/src/osx/carbon/aboutdlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/aboutdlg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// RCS-ID:      $Id: aboutdlg.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/anybutton.cpp b/Externals/wxWidgets3/src/osx/carbon/anybutton.cpp
index 59c8fb3893..0788b23c84 100644
--- a/Externals/wxWidgets3/src/osx/carbon/anybutton.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/anybutton.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton
 // Author:      Stefan Csomor
 // Created:     1998-01-01 (extracted from button.cpp)
-// RCS-ID:      $Id: anybutton.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -53,7 +52,17 @@ wxSize wxAnyButton::DoGetBestSize() const
     GetPeer()->GetBestRect( &bestsize ) ;
 
     int wBtn;
-    if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
+    if ( GetBitmapLabel().IsOk() )
+    {
+        sz.x = bestsize.right - bestsize.left ;
+        sz.y = bestsize.bottom - bestsize.top ;
+        sz.x  = sz.x  + MacGetLeftBorderSize() +
+        MacGetRightBorderSize();
+        sz.y = sz.y + MacGetTopBorderSize() +
+        MacGetBottomBorderSize();
+        wBtn = sz.x;
+    }
+    else if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
     {
         Point bounds;
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/app.cpp b/Externals/wxWidgets3/src/osx/carbon/app.cpp
index 748d77ade7..1a3d426aaa 100644
--- a/Externals/wxWidgets3/src/osx/carbon/app.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/app.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: app.cpp 70884 2012-03-12 17:47:18Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -161,9 +160,13 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     wxArrayString fileNames;
     for (i = 1; i <= itemsInList; i++)
     {
-        AEGetNthPtr(
+        err = AEGetNthPtr(
             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);
+        
+        if ( err != noErr)
+            return err;
+        
         fName = wxMacFSRefToPath( &theRef ) ;
 
         fileNames.Add(fName);
@@ -226,16 +229,23 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
 
     wxString fName ;
     FSRef theRef ;
+    
+    wxArrayString fileNames;
 
     for (i = 1; i <= itemsInList; i++)
     {
-        AEGetNthPtr(
+        err = AEGetNthPtr(
             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);
+        
+        if ( err != noErr)
+            return err;
+        
         fName = wxMacFSRefToPath( &theRef ) ;
-
-        MacPrintFile(fName);
+        fileNames.Add( fName );
     }
+    
+    MacPrintFiles(fileNames);
 
     return noErr;
 }
@@ -300,6 +310,16 @@ void wxApp::MacOpenURL(const wxString & WXUNUSED(url) )
 {
 }
 
+void wxApp::MacPrintFiles(const wxArrayString & fileNames )
+{
+    size_t i;
+    const size_t fileCount = fileNames.GetCount();
+    for (i = 0; i < fileCount; i++)
+    {
+        MacPrintFile(fileNames[i]);
+    }
+}
+
 void wxApp::MacPrintFile(const wxString & fileName )
 {
 #if wxUSE_DOC_VIEW_ARCHITECTURE
@@ -382,11 +402,41 @@ void wxApp::MacReopenApp()
 
         if ( firstIconized )
             firstIconized->Iconize( false ) ;
+        
+        // showing hidden windows is not really always a good solution, also non-modal dialogs when closed end up
+        // as hidden tlws, we don't want to reshow those, so let's just reopen the minimized a.k.a. iconized tlws
+        // unless we find a regression ...
+#if 0
         else if ( firstHidden )
             firstHidden->Show( true );
+#endif
     }
 }
 
+#if wxOSX_USE_COCOA_OR_IPHONE
+void wxApp::OSXOnWillFinishLaunching()
+{
+}
+
+void wxApp::OSXOnDidFinishLaunching()
+{
+}
+
+void wxApp::OSXOnWillTerminate()
+{
+    wxCloseEvent event;
+    event.SetCanVeto(false);
+    wxTheApp->OnEndSession(event);
+}
+
+bool wxApp::OSXOnShouldTerminate()
+{
+    wxCloseEvent event;
+    wxTheApp->OnQueryEndSession(event);
+    return !event.GetVeto();
+}
+#endif
+
 //----------------------------------------------------------------------
 // Macintosh CommandID support - converting between native and wx IDs
 //----------------------------------------------------------------------
@@ -781,21 +831,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
 #endif
 
-    // Mac OS X passes a process serial number command line argument when
-    // the application is launched from the Finder. This argument must be
-    // removed from the command line arguments before being handled by the
-    // application (otherwise applications would need to handle it)
-    if ( argc > 1 )
-    {
-        static const wxChar *ARG_PSN = wxT("-psn_");
-        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
-        {
-            // remove this argument
-            --argc;
-            memmove(argv + 1, argv + 2, argc * sizeof(wxChar*));
-        }
-    }
-
     /*
      Cocoa supports -Key value options which set the user defaults key "Key"
      to the value "value"  Some of them are very handy for debugging like
@@ -849,7 +884,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     return true;
 }
 
-#if wxOSX_USE_COCOA_OR_CARBON
+#if wxOSX_USE_CARBON
 bool wxApp::CallOnInit()
 {
     wxMacAutoreleasePool autoreleasepool;
@@ -1062,139 +1097,21 @@ void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) )
 
 #if wxOSX_USE_COCOA_OR_CARBON
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-
-// adding forward compatible defines for keys that are different on different keyboard layouts
-// see Inside Mac Volume V
-
-enum {
-    kVK_ANSI_A = 0x00,
-    kVK_ANSI_S = 0x01,
-    kVK_ANSI_D = 0x02,
-    kVK_ANSI_F = 0x03,
-    kVK_ANSI_H = 0x04,
-    kVK_ANSI_G = 0x05,
-    kVK_ANSI_Z = 0x06,
-    kVK_ANSI_X = 0x07,
-    kVK_ANSI_C = 0x08,
-    kVK_ANSI_V = 0x09,
-    kVK_ANSI_B = 0x0B,
-    kVK_ANSI_Q = 0x0C,
-    kVK_ANSI_W = 0x0D,
-    kVK_ANSI_E = 0x0E,
-    kVK_ANSI_R = 0x0F,
-    kVK_ANSI_Y = 0x10,
-    kVK_ANSI_T = 0x11,
-    kVK_ANSI_1 = 0x12,
-    kVK_ANSI_2 = 0x13,
-    kVK_ANSI_3 = 0x14,
-    kVK_ANSI_4 = 0x15,
-    kVK_ANSI_6 = 0x16,
-    kVK_ANSI_5 = 0x17,
-    kVK_ANSI_Equal = 0x18,
-    kVK_ANSI_9 = 0x19,
-    kVK_ANSI_7 = 0x1A,
-    kVK_ANSI_Minus = 0x1B,
-    kVK_ANSI_8 = 0x1C,
-    kVK_ANSI_0 = 0x1D,
-    kVK_ANSI_RightBracket = 0x1E,
-    kVK_ANSI_O = 0x1F,
-    kVK_ANSI_U = 0x20,
-    kVK_ANSI_LeftBracket = 0x21,
-    kVK_ANSI_I = 0x22,
-    kVK_ANSI_P = 0x23,
-    kVK_ANSI_L = 0x25,
-    kVK_ANSI_J = 0x26,
-    kVK_ANSI_Quote = 0x27,
-    kVK_ANSI_K = 0x28,
-    kVK_ANSI_Semicolon = 0x29,
-    kVK_ANSI_Backslash = 0x2A,
-    kVK_ANSI_Comma = 0x2B,
-    kVK_ANSI_Slash = 0x2C,
-    kVK_ANSI_N = 0x2D,
-    kVK_ANSI_M = 0x2E,
-    kVK_ANSI_Period = 0x2F,
-    kVK_ANSI_Grave = 0x32,
-    kVK_ANSI_KeypadDecimal = 0x41,
-    kVK_ANSI_KeypadMultiply = 0x43,
-    kVK_ANSI_KeypadPlus = 0x45,
-    kVK_ANSI_KeypadClear = 0x47,
-    kVK_ANSI_KeypadDivide = 0x4B,
-    kVK_ANSI_KeypadEnter = 0x4C,
-    kVK_ANSI_KeypadMinus = 0x4E,
-    kVK_ANSI_KeypadEquals = 0x51,
-    kVK_ANSI_Keypad0 = 0x52,
-    kVK_ANSI_Keypad1 = 0x53,
-    kVK_ANSI_Keypad2 = 0x54,
-    kVK_ANSI_Keypad3 = 0x55,
-    kVK_ANSI_Keypad4 = 0x56,
-    kVK_ANSI_Keypad5 = 0x57,
-    kVK_ANSI_Keypad6 = 0x58,
-    kVK_ANSI_Keypad7 = 0x59,
-    kVK_ANSI_Keypad8 = 0x5B,
-    kVK_ANSI_Keypad9 = 0x5C
-};
-
-// defines for keys that are the same on all layouts
-
-enum {
-    kVK_Return = 0x24,
-    kVK_Tab = 0x30,
-    kVK_Space = 0x31,
-    kVK_Delete = 0x33,
-    kVK_Escape = 0x35,
-    kVK_Command = 0x37,
-    kVK_Shift = 0x38,
-    kVK_CapsLock = 0x39,
-    kVK_Option = 0x3A,
-    kVK_Control = 0x3B,
-    kVK_RightShift = 0x3C,
-    kVK_RightOption = 0x3D,
-    kVK_RightControl = 0x3E,
-    kVK_Function = 0x3F,
-    kVK_F17 = 0x40,
-    kVK_VolumeUp = 0x48,
-    kVK_VolumeDown = 0x49,
-    kVK_Mute = 0x4A,
-    kVK_F18 = 0x4F,
-    kVK_F19 = 0x50,
-    kVK_F20 = 0x5A,
-    kVK_F5 = 0x60,
-    kVK_F6 = 0x61,
-    kVK_F7 = 0x62,
-    kVK_F3 = 0x63,
-    kVK_F8 = 0x64,
-    kVK_F9 = 0x65,
-    kVK_F11 = 0x67,
-    kVK_F13 = 0x69,
-    kVK_F16 = 0x6A,
-    kVK_F14 = 0x6B,
-    kVK_F10 = 0x6D,
-    kVK_F12 = 0x6F,
-    kVK_F15 = 0x71,
-    kVK_Help = 0x72,
-    kVK_Home = 0x73,
-    kVK_PageUp = 0x74,
-    kVK_ForwardDelete = 0x75,
-    kVK_F4 = 0x76,
-    kVK_End = 0x77,
-    kVK_F2 = 0x78,
-    kVK_PageDown = 0x79,
-    kVK_F1 = 0x7A,
-    kVK_LeftArrow = 0x7B,
-    kVK_RightArrow = 0x7C,
-    kVK_DownArrow = 0x7D,
-    kVK_UpArrow = 0x7E
-};
-
-#endif    
-
 CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
 {
     CGKeyCode keycode;
     
     switch (code)
     {
+        // Clang warns about switch values not of the same type as (enumerated)
+        // switch controlling expression. This is generally useful but here we
+        // really want to be able to use letters and digits without making them
+        // part of wxKeyCode enum.
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wswitch"
+#endif // __clang__
+
         case 'a': case 'A':   keycode = kVK_ANSI_A; break;
         case 'b': case 'B':   keycode = kVK_ANSI_B; break;
         case 'c': case 'C':   keycode = kVK_ANSI_C; break;
@@ -1232,13 +1149,17 @@ CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
         case '7':             keycode = kVK_ANSI_7; break;
         case '8':             keycode = kVK_ANSI_8; break;
         case '9':             keycode = kVK_ANSI_9; break;
+
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif // __clang__
             
         case WXK_BACK:        keycode = kVK_Delete; break;
         case WXK_TAB:         keycode = kVK_Tab; break;
         case WXK_RETURN:      keycode = kVK_Return; break;
         case WXK_ESCAPE:      keycode = kVK_Escape; break;
         case WXK_SPACE:       keycode = kVK_Space; break;
-        case WXK_DELETE:      keycode = kVK_Delete; break;
+        case WXK_DELETE:      keycode = kVK_ForwardDelete; break;
             
         case WXK_SHIFT:       keycode = kVK_Shift; break;
         case WXK_ALT:         keycode = kVK_Option; break;
@@ -1506,34 +1427,34 @@ wxMouseState wxGetMouseState()
 
 // TODO : once the new key/char handling is tested, move all the code to wxWindow
 
-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )
 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;
 
     return focus->OSXHandleKeyEvent(event);
 }
 
-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )
 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event( wxEVT_KEY_UP ) ;
-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;
 
     return focus->OSXHandleKeyEvent(event) ;
 }
 
-bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )
 {
     if ( !focus )
         return false ;
     wxKeyEvent event(wxEVT_CHAR) ;
-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;
 
     bool handled = false ;
 
@@ -1591,7 +1512,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event(wxEVT_BUTTON, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
 
@@ -1602,7 +1523,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
             {
                 // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
-                wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+                wxCommandEvent new_event(wxEVT_BUTTON,wxID_CANCEL);
                 new_event.SetEventObject( focus );
                 handled = focus->HandleWindowEvent( new_event );
             }
@@ -1614,7 +1535,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
 }
 
 // This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.
-void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
     
@@ -1696,8 +1617,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
 
     event.m_rawCode = keymessage;
     event.m_rawFlags = modifiers;
-    event.m_x = wherex;
-    event.m_y = wherey;
     event.SetTimestamp(when);
     event.SetEventObject(focus);
 #else
@@ -1706,8 +1625,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     wxUnusedVar(keymessage);
     wxUnusedVar(modifiers);
     wxUnusedVar(when);
-    wxUnusedVar(wherex);
-    wxUnusedVar(wherey);
     wxUnusedVar(uniChar);
 #endif
 }
diff --git a/Externals/wxWidgets3/src/osx/carbon/bmpbuttn.cpp b/Externals/wxWidgets3/src/osx/carbon/bmpbuttn.cpp
index d5d6277323..9f0adc85a9 100644
--- a/Externals/wxWidgets3/src/osx/carbon/bmpbuttn.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/bmpbuttn.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: bmpbuttn.cpp 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/button.cpp b/Externals/wxWidgets3/src/osx/carbon/button.cpp
index adc5dce664..6c6844de45 100644
--- a/Externals/wxWidgets3/src/osx/carbon/button.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/button.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button.cpp 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/checkbox.cpp b/Externals/wxWidgets3/src/osx/carbon/checkbox.cpp
index 8f10a16c20..44e9dcd033 100644
--- a/Externals/wxWidgets3/src/osx/carbon/checkbox.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/checkbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: checkbox.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/choice.cpp b/Externals/wxWidgets3/src/osx/carbon/choice.cpp
index deeeb5004f..dc7d1b91fd 100644
--- a/Externals/wxWidgets3/src/osx/carbon/choice.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/choice.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/clipbrd.cpp b/Externals/wxWidgets3/src/osx/carbon/clipbrd.cpp
index 52e0bf80e1..7835430e65 100644
--- a/Externals/wxWidgets3/src/osx/carbon/clipbrd.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/clipbrd.cpp
@@ -5,7 +5,6 @@
 //              Generalized clipboard implementation by Matthew Flatt
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: clipbrd.cpp 69729 2011-11-10 11:49:02Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/colordlg.cpp b/Externals/wxWidgets3/src/osx/carbon/colordlg.cpp
index b716da4493..191286f6b1 100644
--- a/Externals/wxWidgets3/src/osx/carbon/colordlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/colordlg.cpp
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: colordlg.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +13,7 @@
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
+#include "wx/modalhook.h"
 
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
@@ -47,6 +47,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     RGBColor currentColor ;
 
     m_colourData.m_dataColour.GetRGBColor( &currentColor );
diff --git a/Externals/wxWidgets3/src/osx/carbon/colordlgosx.mm b/Externals/wxWidgets3/src/osx/carbon/colordlgosx.mm
index 481c36b840..946471ff37 100644
--- a/Externals/wxWidgets3/src/osx/carbon/colordlgosx.mm
+++ b/Externals/wxWidgets3/src/osx/carbon/colordlgosx.mm
@@ -5,7 +5,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-11-16
-// RCS-ID:      $Id: colordlgosx.mm 67901 2011-06-09 01:07:39Z SC $
 // Copyright:   (c) Ryan Norton
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +21,7 @@
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
+#include "wx/modalhook.h"
 
 // ============================================================================
 // implementation
@@ -105,12 +105,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
 
+    [[NSColorPanel sharedColorPanel] setShowsAlpha:YES];
     if(m_colourData.GetColour().IsOk())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0)
                                         green:(CGFloat) (m_colourData.GetColour().Green() / 255.0)
                                         blue:(CGFloat) (m_colourData.GetColour().Blue() / 255.0)
-                                        alpha:(CGFloat) 1.0]
+                                        alpha:(CGFloat) (m_colourData.GetColour().Alpha() / 255.0)]
         ];
     else
         [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]];
@@ -122,6 +123,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 }
 int wxColourDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens
     //if you don't do this is a bunch of error
@@ -164,8 +167,9 @@ int wxColourDialog::ShowModal()
     m_colourData.GetColour().Set(
                                 (unsigned char) ([theColor redComponent] * 255.0),
                                 (unsigned char) ([theColor greenComponent] * 255.0),
-                                (unsigned char) ([theColor blueComponent] * 255.0)
-                                   );
+                                (unsigned char) ([theColor blueComponent] * 255.0),
+                                (unsigned char) ([theColor alphaComponent] * 255.0)
+                                 );
 
     //Release the pool, we're done :)
     [thePool release];
diff --git a/Externals/wxWidgets3/src/osx/carbon/combobox.cpp b/Externals/wxWidgets3/src/osx/carbon/combobox.cpp
index e33adb930d..301af54dea 100644
--- a/Externals/wxWidgets3/src/osx/carbon/combobox.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/combobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor, Dan "Bud" Keith (composite combobox)
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobox.cpp 68366 2011-07-24 22:19:33Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,7 +57,7 @@ protected:
         {
             wxNavigationKeyEvent NavEvent;
             NavEvent.SetEventObject(this);
-            NavEvent.SetDirection(true);
+            NavEvent.SetDirection(!event.ShiftDown());
             NavEvent.SetWindowChange(false);
 
             // Get the parent of the combo and have it process the navigation?
@@ -75,7 +74,7 @@ protected:
 
         if ( event.GetKeyCode() == WXK_RETURN )
         {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
+            wxCommandEvent event(wxEVT_TEXT_ENTER, m_cb->GetId());
             event.SetString( GetValue() );
             event.SetInt( m_cb->GetSelection() );
             event.SetEventObject( m_cb );
@@ -90,7 +89,7 @@ protected:
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event( wxEVT_BUTTON, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                     }
@@ -181,7 +180,7 @@ protected:
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );
-        wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+        wxCommandEvent event2(wxEVT_COMBOBOX, m_cb->GetId() );
         event2.SetInt(m_cb->GetSelection());
         event2.SetEventObject(m_cb);
         event2.SetString(m_cb->GetStringSelection());
@@ -189,7 +188,7 @@ protected:
 
         // For consistency with MSW and GTK, also send a text updated event
         // After all, the text is updated when a selection is made
-        wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId() );
+        wxCommandEvent TextEvent( wxEVT_TEXT, m_cb->GetId() );
         TextEvent.SetString( m_cb->GetStringSelection() );
         TextEvent.SetEventObject( m_cb );
         m_cb->ProcessCommand( TextEvent );
@@ -648,7 +647,7 @@ bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 /*
     For consistency with other platforms, clicking in the text area does not constitute a selection
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
+    wxCommandEvent event(wxEVT_COMBOBOX, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
diff --git a/Externals/wxWidgets3/src/osx/carbon/combobxc.cpp b/Externals/wxWidgets3/src/osx/carbon/combobxc.cpp
index 46fe47f099..b38c20cc21 100644
--- a/Externals/wxWidgets3/src/osx/carbon/combobxc.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/combobxc.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobxc.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -59,7 +58,7 @@ static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler ,
             {
                 case kEventTextAccepted :
                     {
-                        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, cb->GetId() );
+                        wxCommandEvent event( wxEVT_COMBOBOX, cb->GetId() );
                         event.SetInt( cb->GetSelection() );
                         event.SetString( cb->GetStringSelection() );
                         event.SetEventObject( cb );
@@ -120,7 +119,7 @@ protected:
                 // make Enter generate "selected" event if there is only one item
                 // in the combobox - without it, it's impossible to select it at
                 // all!
-                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                wxCommandEvent event( wxEVT_COMBOBOX, m_cb->GetId() );
                 event.SetInt( 0 );
                 event.SetString( value );
                 event.SetEventObject( m_cb );
@@ -135,7 +134,7 @@ protected:
                     m_cb->SetStringSelection(value);
 
                     // and generate the selected event for it
-                    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                    wxCommandEvent event( wxEVT_COMBOBOX, m_cb->GetId() );
                     event.SetInt( m_cb->GetCount() - 1 );
                     event.SetString( value );
                     event.SetEventObject( m_cb );
@@ -151,7 +150,7 @@ protected:
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event(wxEVT_BUTTON, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                         return;
@@ -189,7 +188,7 @@ protected:
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );
-        wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+        wxCommandEvent event2(wxEVT_COMBOBOX, m_cb->GetId() );
         event2.SetInt(m_cb->GetSelection());
         event2.SetEventObject(m_cb);
         event2.SetString(m_cb->GetStringSelection());
@@ -775,7 +774,7 @@ bool wxComboBox::CanRedo() const
 
 bool wxComboBox::OSXHandleClicked( double timestampsec )
 {
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
+    wxCommandEvent event(wxEVT_COMBOBOX, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
diff --git a/Externals/wxWidgets3/src/osx/carbon/control.cpp b/Externals/wxWidgets3/src/osx/carbon/control.cpp
index 1451572a96..fbf5a31ba7 100644
--- a/Externals/wxWidgets3/src/osx/carbon/control.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/control.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: control.cpp 67230 2011-03-18 14:20:12Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
     char charCode;
 
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode  );
-    GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+    GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
 
     GetPeer()->HandleKey( keyCode, charCode, modifiers );
diff --git a/Externals/wxWidgets3/src/osx/carbon/cursor.cpp b/Externals/wxWidgets3/src/osx/carbon/cursor.cpp
index 7b2351c7b5..34afa0c00c 100644
--- a/Externals/wxWidgets3/src/osx/carbon/cursor.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/cursor.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: cursor.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/dataobj.cpp b/Externals/wxWidgets3/src/osx/carbon/dataobj.cpp
index afdbd937c2..2b625d0e06 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dataobj.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dataobj.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     10/21/99
-// RCS-ID:      $Id: dataobj.cpp 67890 2011-06-08 23:00:36Z SC $
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@
 #include "wx/mstream.h"
 #include "wx/metafile.h"
 #include "wx/tokenzr.h"
+#include "wx/filename.h"
 
 #include "wx/osx/private.h"
 
@@ -33,7 +33,6 @@
     #include <QuickTime/QuickTime.h>
 #endif
 
-
 // ----------------------------------------------------------------------------
 // wxDataFormat
 // ----------------------------------------------------------------------------
@@ -121,22 +120,26 @@ void wxDataFormat::SetType( wxDataFormatId dataType )
     switch (m_type)
     {
     case wxDF_TEXT:
-        m_format = (long) CFStringCreateCopy( NULL, CFSTR("public.plain-text") );
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypePlainText );
         break;
 
     case wxDF_UNICODETEXT:
-        m_format = (long) CFStringCreateCopy( NULL, CFSTR("public.utf16-plain-text") );
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypeUTF16PlainText );
+        break;
+
+    case wxDF_HTML:
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypeHTML );
         break;
 
     case wxDF_BITMAP:
-        m_format = (long) CFStringCreateCopy( NULL, CFSTR("public.tiff") );
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypeTIFF );
         break;
     case wxDF_METAFILE:
-        m_format = (long) CFStringCreateCopy( NULL, CFSTR("com.adobe.pdf") );
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypePDF );
         break;
 
     case wxDF_FILENAME:
-        m_format = (long) CFStringCreateCopy( NULL, CFSTR("public.file-url") );
+        m_format = (long) CFStringCreateCopy( NULL, kUTTypeFileURL );
         break;
 
     default:
@@ -158,27 +161,36 @@ void wxDataFormat::SetId( NativeFormat format )
         m_format = 0;
     }
     m_format = (NativeFormat) CFStringCreateCopy(NULL, (CFStringRef)format);
-    if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") )  )
+    if ( UTTypeConformsTo( (CFStringRef)format, kUTTypeHTML ) )
+    {
+        m_type = wxDF_HTML;
+    }
+    if (  UTTypeConformsTo( (CFStringRef)format, kUTTypeUTF16PlainText ) )
     {
         m_type = wxDF_UNICODETEXT;
     }
-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-external-plain-text") )  )
+    else if (  UTTypeConformsTo( (CFStringRef)format,kUTTypeUTF16ExternalPlainText ) )
     {
         m_type = wxDF_UNICODETEXT;
     }
-    else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) )
+    else if (  UTTypeConformsTo( (CFStringRef)format,kUTTypeUTF8PlainText ) )
+    {
+        m_type = wxDF_UNICODETEXT;
+    }
+    else if ( UTTypeConformsTo( (CFStringRef)format, kUTTypePlainText ) )
     {
         m_type = wxDF_TEXT;
     }
-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") )  )
+    else if (  UTTypeConformsTo( (CFStringRef)format, kUTTypeImage ) )
     {
         m_type = wxDF_BITMAP;
     }
-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("com.adobe.pdf") )  )
+    else if (  UTTypeConformsTo( (CFStringRef)format, kUTTypePDF ) )
     {
         m_type = wxDF_METAFILE;
     }
-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.file-url") )  )
+    else if (  UTTypeConformsTo( (CFStringRef)format, kUTTypeFileURL ) ||
+             UTTypeConformsTo( (CFStringRef)format, kPasteboardTypeFileURLPromise))
     {
         m_type = wxDF_FILENAME;
     }
@@ -247,7 +259,7 @@ bool wxDataObject::IsSupportedFormat( const wxDataFormat& rFormat, Direction vDi
     return found;
 }
 
-void wxDataObject::AddToPasteboard( void * pb, int itemID )
+void wxDataObject::AddToPasteboard( void * pb, wxIntPtr itemID )
 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
    // get formats from wxDataObjects
@@ -263,15 +275,33 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
         // string including trailing zero
 
         size_t datasize = GetDataSize( thisFormat );
+        if ( datasize == wxCONV_FAILED && thisFormat.GetType() == wxDF_TEXT)
+        {
+            // conversion to local text failed, so we must use unicode
+            // if wxDF_UNICODETEXT is already on the 'todo' list, skip this iteration
+            // otherwise force it
+            size_t j = 0;
+            for (j = 0; j < GetFormatCount(); j++)
+            {
+                if ( array[j].GetType() == wxDF_UNICODETEXT )
+                    break;
+            }
+            if ( j < GetFormatCount() )
+                continue;
+            
+            thisFormat.SetType(wxDF_UNICODETEXT);
+            datasize = GetDataSize( thisFormat );
+        }
+            
         size_t sz = datasize + 4;
         void* buf = malloc( sz );
         if ( buf != NULL )
         {
             // empty the buffer because in some case GetDataHere does not fill buf
             memset( buf, 0, sz );
-            if ( GetDataHere( array[ i ], buf ) )
+            if ( GetDataHere( thisFormat, buf ) )
             {
-                int counter = 1 ;
+                wxIntPtr counter = 1 ;
                 if ( thisFormat.GetType() == wxDF_FILENAME )
                 {
                     // the data is D-normalized UTF8 strings of filenames delimited with \n
@@ -363,13 +393,15 @@ bool wxDataObject::IsFormatInPasteboard( void * pb, const wxDataFormat &dataForm
 bool wxDataObject::GetFromPasteboard( void * pb )
 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
-    size_t formatcount = GetFormatCount() + 1;
+
+    size_t formatcount = GetFormatCount(wxDataObject::Set);
     wxDataFormat *array = new wxDataFormat[ formatcount ];
-    array[0] = GetPreferredFormat();
-    GetAllFormats( &array[1] );
+    GetAllFormats(array, wxDataObject::Set);
+    
     ItemCount itemCount = 0;
     wxString filenamesPassed;
     bool transferred = false;
+    bool pastelocationset = false;
 
     // we synchronize here once again, so we don't mind which flags get returned
     PasteboardSynchronize( pasteboard );
@@ -407,22 +439,38 @@ bool wxDataObject::GetFromPasteboard( void * pb )
                     flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                          flavorIndex );
 
-                    // avoid utf8 being treated closer to plain-text than unicode by forcing a conversion
-                    if ( UTTypeConformsTo(flavorType, CFSTR("public.utf8-plain-text") ) )
-                    {
-                        flavorType = CFSTR("public.utf16-plain-text");
-                    }
                     wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );
 
                     if ( dataFormat == flavorFormat )
                     {
+                        if ( UTTypeConformsTo( (CFStringRef)flavorType, kPasteboardTypeFileURLPromise) )
+                        {
+                            if ( !pastelocationset )
+                            {
+                                wxString tempdir = wxFileName::GetTempDir() + wxFILE_SEP_PATH + "wxtemp.XXXXXX";
+                                char* result = mkdtemp((char*)tempdir.fn_str().data());
+                                
+                                if (!result)
+                                    continue;
+                                
+                                wxCFRef<CFURLRef> dest(CFURLCreateFromFileSystemRepresentation(NULL,(const UInt8*)result,strlen(result),true));
+                                PasteboardSetPasteLocation(pasteboard, dest);
+                                pastelocationset = true;
+                           }
+                        }
+                        else if ( flavorFormat.GetType() != wxDF_PRIVATE )
+                        {
+                            // indicate the expected format for the type, benefiting from native conversions eg utf8 -> utf16
+                            flavorType = (CFStringRef) wxDataFormat( flavorFormat.GetType()).GetFormatId();
+                        }
+                        
                         err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData );
                         if ( err == noErr )
                         {
                             flavorDataSize = CFDataGetLength( flavorData );
                             if (dataFormat.GetType() == wxDF_FILENAME )
                             {
-                                // revert the translation and decomposition to arrive at a proper utf8 string again
+                                 // revert the translation and decomposition to arrive at a proper utf8 string again
                                 CFURLRef url = CFURLCreateWithBytes( kCFAllocatorDefault, CFDataGetBytePtr( flavorData ), flavorDataSize, kCFStringEncodingUTF8, NULL );
                                 CFStringRef cfString = CFURLCopyFileSystemPath( url, kCFURLPOSIXPathStyle );
                                 CFRelease( url );
@@ -490,10 +538,9 @@ bool wxDataObject::GetFromPasteboard( void * pb )
 bool wxDataObject::HasDataInPasteboard( void * pb )
 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
-    size_t formatcount = GetFormatCount() + 1;
+    size_t formatcount = GetFormatCount(wxDataObject::Set);
     wxDataFormat *array = new wxDataFormat[ formatcount ];
-    array[0] = GetPreferredFormat();
-    GetAllFormats( &array[1] );
+    GetAllFormats(array, wxDataObject::Set);
     ItemCount itemCount = 0;
     bool hasData = false;
 
@@ -546,6 +593,51 @@ bool wxDataObject::HasDataInPasteboard( void * pb )
     return hasData;
 }
 
+#if wxOSX_USE_COCOA
+
+void wxDataObject::AddSupportedTypes( void* cfarray)
+{
+    size_t nFormats = GetFormatCount(wxDataObject::Set);
+    wxDataFormat *array = new wxDataFormat[nFormats];
+    GetAllFormats(array, wxDataObject::Set);
+    
+    for (size_t i = 0; i < nFormats; i++)
+    {
+        wxDataFormat dataFormat = array[ i ];
+        
+        if ( dataFormat.GetType() == wxDF_UNICODETEXT || dataFormat.GetType() == wxDF_TEXT )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypeUTF16PlainText);
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypePlainText);
+        }
+        else if ( dataFormat.GetType() == wxDF_FILENAME )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypeFileURL);
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kPasteboardTypeFileURLPromise);
+        }
+        else if ( dataFormat.GetType() == wxDF_HTML )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypeHTML);
+        }
+        else if ( dataFormat.GetType() == wxDF_BITMAP )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypeTIFF);
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypePICT);
+        }
+        else if ( dataFormat.GetType() == wxDF_METAFILE )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, kUTTypePDF);
+        }
+        else if ( dataFormat.GetType() == wxDF_PRIVATE )
+        {
+            CFArrayAppendValue((CFMutableArrayRef)cfarray, (CFStringRef) dataFormat.GetFormatId());
+        }
+    }
+    delete[] array;
+}
+
+#endif
+
 // ----------------------------------------------------------------------------
 // wxTextDataObject
 // ----------------------------------------------------------------------------
@@ -554,8 +646,8 @@ bool wxDataObject::HasDataInPasteboard( void * pb )
 void wxTextDataObject::GetAllFormats(wxDataFormat *formats,
                                      wxDataObjectBase::Direction WXUNUSED(dir)) const
 {
-    *formats++ = wxDataFormat( wxDF_TEXT );
-    *formats = wxDataFormat( wxDF_UNICODETEXT );
+    *formats++ = wxDataFormat(wxDF_UNICODETEXT);
+    *formats = wxDataFormat(wxDF_TEXT);
 }
 #endif
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/dataview.cpp b/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
index b629161a5b..66781a9e74 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
@@ -2,7 +2,6 @@
 // Name:        src/osx/carbon/dataview.cpp
 // Purpose:     wxDataViewCtrl native carbon implementation
 // Author:
-// Id:          $Id: dataview.cpp 58317 2009-01-23
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -99,7 +98,7 @@ static pascal OSStatus DataBrowserCtrlEventHandler(EventHandlerCallRef handler,
         unsigned long         columnIndex;
         wxDataViewColumn*     column;
         OSStatus              status;
-        wxDataViewEvent       DataViewEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK,DataViewCtrlPtr->GetId());
+        wxDataViewEvent       DataViewEvent(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK,DataViewCtrlPtr->GetId());
 
         CarbonEvent.GetParameter(kEventParamDirectObject,&controlReference);
        // determine the column that triggered the event (this is the column that is responsible for sorting the data view):
@@ -156,9 +155,7 @@ static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDes
       (columnDescription.propertyDesc.propertyType == kDataBrowserIconAndTextType) ||
       (columnDescription.propertyDesc.propertyType == kDataBrowserTextType))
     columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; // enables generally the possibility to have user input for the mentioned types
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
   columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
-#endif
  // set header's properties:
   columnDescription.headerBtnDesc.version            = kDataBrowserListViewLatestHeaderDesc;
   columnDescription.headerBtnDesc.titleOffset        = 0;
@@ -1259,7 +1256,7 @@ void wxMacDataViewDataBrowserListViewControl::OnSize()
     SetHasScrollBars(true,true);
 }
 
-void wxMacDataViewDataBrowserListViewControl::StartEditor( const wxDataViewItem & item, unsigned int column )
+void wxMacDataViewDataBrowserListViewControl::StartEditor( const wxDataViewItem & WXUNUSED(item), unsigned int WXUNUSED(column) )
 {
     // implement me
 }
@@ -1294,7 +1291,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow
 }
 
 void wxMacDataViewDataBrowserListViewControl::DataBrowserGetContextualMenuProc(MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* WXUNUSED(selection))
- // In this method we do not supply a contextual menu handler at all but only send a wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU.
+ // In this method we do not supply a contextual menu handler at all but only send a wxEVT_DATAVIEW_ITEM_CONTEXT_MENU.
 {
   wxArrayDataBrowserItemID itemIDs;
 
@@ -1307,7 +1304,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserGetContextualMenuProc(M
   *helpType       = kCMHelpItemNoHelp;
   *helpItemString = NULL;
  // create information for a context menu event:
-  wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU,dataViewCtrlPtr->GetId());
+  wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU,dataViewCtrlPtr->GetId());
 
   dataViewEvent.SetEventObject(dataViewCtrlPtr);
   dataViewEvent.SetModel(dataViewCtrlPtr->GetModel());
@@ -1443,7 +1440,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
 
             wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
            // initialize wxWidget event:
-            wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dataViewCtrlPtr->GetId()); // variable definition
+            wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_COLLAPSING,dataViewCtrlPtr->GetId()); // variable definition
 
             dataViewEvent.SetEventObject(dataViewCtrlPtr);
             dataViewEvent.SetItem       (wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1460,7 +1457,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
 
             wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
            // initialize wxWidget event:
-            wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dataViewCtrlPtr->GetId()); // variable definition
+            wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_EXPANDING,dataViewCtrlPtr->GetId()); // variable definition
 
             dataViewEvent.SetEventObject(dataViewCtrlPtr);
             dataViewEvent.SetItem       (wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1500,7 +1497,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
         dataViewCtrlPtr->FinishCustomItemEditing(); // stop editing of a custom item first (if necessary)
         {
          // initialize wxWidget event:
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1512,7 +1509,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
         dataViewCtrlPtr->FinishCustomItemEditing(); // stop editing of a custom item first (if necessary)
         {
          // initialize wxWidget event:
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1527,7 +1524,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
         {
          // initialize wxWidget event:
           DataBrowserPropertyID propertyID;
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_EDITING_STARTED,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1548,7 +1545,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
         {
          // initialize wxWidget event:
           DataBrowserPropertyID propertyID;
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_EDITING_DONE,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1574,7 +1571,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
       case kDataBrowserItemDoubleClicked:
         {
          // initialize wxWidget event:
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_ACTIVATED,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
@@ -1590,7 +1587,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
       case kDataBrowserSelectionSetChanged:
         {
          // initialize wxWidget event:
-          wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dataViewCtrlPtr->GetId()); // variable definition
+          wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_SELECTION_CHANGED,dataViewCtrlPtr->GetId()); // variable definition
 
           dataViewEvent.SetEventObject(dataViewCtrlPtr);
           dataViewEvent.SetModel      (dataViewCtrlPtr->GetModel());
@@ -1634,7 +1631,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
               {
                 columnPtr->SetSortOrder(!(columnPtr->IsSortOrderAscending()));
                // initialize wxWidget event:
-                wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED,dataViewCtrlPtr->GetId()); // variable defintion
+                wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_COLUMN_SORTED,dataViewCtrlPtr->GetId()); // variable definition
 
                 dataViewEvent.SetEventObject(dataViewCtrlPtr);
                 dataViewEvent.SetColumn(columnIndex);
@@ -1834,7 +1831,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR
     ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1!
     dataObjects = GetDnDDataObjects(dragRef,itemRef);
    // create wxWidget's event:
-    wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE,dataViewCtrlPtr->GetId());
+    wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE,dataViewCtrlPtr->GetId());
 
     dataViewEvent.SetEventObject(dataViewCtrlPtr);
 
@@ -1878,7 +1875,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
   wxCHECK_MSG(dataViewItem.IsOk(),false,_("Invalid data view item"));
 
  // send a begin drag event and proceed with dragging unless the event is vetoed:
-  wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG,dataViewCtrlPtr->GetId());
+  wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG,dataViewCtrlPtr->GetId());
 
   dataViewEvent.SetEventObject(dataViewCtrlPtr);
   dataViewEvent.SetItem(dataViewItem);
@@ -2011,7 +2008,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag
     ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1!
     dataObjects = GetDnDDataObjects(dragRef,itemRef);
   // create wxWidget's event:
-    wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_DROP,dataViewCtrlPtr->GetId());
+    wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_DROP,dataViewCtrlPtr->GetId());
 
     dataViewEvent.SetEventObject(dataViewCtrlPtr);
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/dcclient.cpp b/Externals/wxWidgets3/src/osx/carbon/dcclient.cpp
index 4f414d8ab4..e619f25404 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dcclient.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dcclient.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcclient.cpp 67508 2011-04-16 16:59:44Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,9 +57,17 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window )
     if ( cg == NULL )
     {
         SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
+        m_contentScaleFactor = window->GetContentScaleFactor();
+        SetDeviceOrigin(-window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize());
     }
     else
     {
+        // determine content scale
+        CGRect userrect = CGRectMake(0, 0, 10, 10);
+        CGRect devicerect;
+        devicerect = CGContextConvertRectToDeviceSpace(cg, userrect);
+        m_contentScaleFactor = devicerect.size.height / userrect.size.height;
+
         CGContextSaveGState( cg );
         m_release = true ;
         // make sure the context is having its origin at the wx-window coordinates of the
@@ -157,7 +164,11 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) :
     m_window->GetClientSize( &m_width , &m_height);
     if ( !m_window->IsShownOnScreen() )
         m_width = m_height = 0;
-    SetDeviceOrigin( origin.x, origin.y );
+    
+    int x0,y0;
+    DoGetDeviceOrigin(&x0,&y0);
+    SetDeviceOrigin( origin.x + x0, origin.y + y0 );
+    
     DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/dcprint.cpp b/Externals/wxWidgets3/src/osx/carbon/dcprint.cpp
index de95d9c1b2..e7f42f9b95 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dcprint.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dcprint.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcprint.cpp 70884 2012-03-12 17:47:18Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/dcscreen.cpp b/Externals/wxWidgets3/src/osx/carbon/dcscreen.cpp
index 887c7b2959..e738a13e58 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dcscreen.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dcscreen.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dcscreen.cpp 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -89,7 +88,18 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     if ( subrect )
         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;
 
-    CGImageRef image = grabViaOpenGL(kCGNullDirectDisplay, srcRect);
+    CGImageRef image = NULL;
+    
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    if ( UMAGetSystemVersion() >= 0x1060)
+    {
+        image = CGDisplayCreateImage(kCGDirectMainDisplay);
+    }
+    else
+#endif
+    {
+        image = grabViaOpenGL(kCGNullDirectDisplay, srcRect);
+    }
 
     wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/dialog.cpp b/Externals/wxWidgets3/src/osx/carbon/dialog.cpp
index 5c81e82e8a..14f3968e60 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dialog.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dialog.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dialog.cpp 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/dirdlg.cpp b/Externals/wxWidgets3/src/osx/carbon/dirdlg.cpp
index 88f8bd42cf..b6cc8a45ef 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dirdlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dirdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dirdlg.cpp 66615 2011-01-07 05:26:57Z PC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +20,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/filename.h"
+#include "wx/modalhook.h"
 
 #include "wx/osx/private.h"
 
@@ -54,7 +54,11 @@ static pascal void NavEventProc(
     }
 }
 
-wxDirDialog::wxDirDialog(wxWindow *parent,
+void wxDirDialog::Init()
+{
+}
+
+void wxDirDialog::Create(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
                          long style,
@@ -72,6 +76,8 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 
 int wxDirDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     NavDialogRef dialog = NULL;
     NavDialogCreationOptions options;
     NavReplyRecord reply ;
diff --git a/Externals/wxWidgets3/src/osx/carbon/dirmac.cpp b/Externals/wxWidgets3/src/osx/carbon/dirmac.cpp
index 47f76ea527..f565a30688 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dirmac.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dirmac.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id: dirmac.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Stefan Csomor <csomor@advanced.ch>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/dnd.cpp b/Externals/wxWidgets3/src/osx/carbon/dnd.cpp
index b7fb37e6d1..7310caed04 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dnd.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dnd.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dnd.cpp 63431 2010-02-09 01:24:22Z RD $
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/drawer.cpp b/Externals/wxWidgets3/src/osx/carbon/drawer.cpp
index c1200f8c22..16854bf02a 100644
--- a/Externals/wxWidgets3/src/osx/carbon/drawer.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/drawer.cpp
@@ -7,7 +7,6 @@
 // Author:      Jason Bagley
 // Modified by: Ryan Norton (To make it work :), plus bug fixes)
 // Created:     2004-30-01
-// RCS-ID:      $Id: drawer.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Jason Bagley; Art & Logic, Inc.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/evtloop.cpp b/Externals/wxWidgets3/src/osx/carbon/evtloop.cpp
index 8ec5579ca6..4a8238baa0 100644
--- a/Externals/wxWidgets3/src/osx/carbon/evtloop.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/evtloop.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloop.cpp 68302 2011-07-19 17:56:57Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -93,13 +92,21 @@ void wxGUIEventLoop::WakeUp()
                             kEventPriorityHigh );
 }
 
-void wxGUIEventLoop::DoRun()
+void wxGUIEventLoop::OSXDoRun()
 {
     wxMacAutoreleasePool autoreleasepool;
-    RunApplicationEventLoop();
+
+    while (!m_shouldExit)
+    {
+        RunApplicationEventLoop();
+    }
+
+    // Force enclosing event loop to temporarily exit and check
+    // if it should be stopped.
+    QuitApplicationEventLoop();
 }
 
-void wxGUIEventLoop::DoStop()
+void wxGUIEventLoop::OSXDoStop()
 {
     QuitApplicationEventLoop();
 }
@@ -127,7 +134,7 @@ wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
 
 // END move into a evtloop_osx.cpp
 
-void wxModalEventLoop::DoRun()
+void wxModalEventLoop::OSXDoRun()
 {
     wxWindowDisabler disabler(m_modalWindow);
     wxMacAutoreleasePool autoreleasepool;
@@ -163,7 +170,7 @@ void wxModalEventLoop::DoRun()
 
 }
 
-void wxModalEventLoop::DoStop()
+void wxModalEventLoop::OSXDoStop()
 {
     wxMacAutoreleasePool autoreleasepool;
     QuitAppModalLoopForWindow(m_modalNativeWindow);
diff --git a/Externals/wxWidgets3/src/osx/carbon/filedlg.cpp b/Externals/wxWidgets3/src/osx/carbon/filedlg.cpp
index 95078646be..fb953d1986 100644
--- a/Externals/wxWidgets3/src/osx/carbon/filedlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/filedlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: filedlg.cpp 66728 2011-01-22 14:38:36Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@
 #include "wx/filename.h"
 
 #include "wx/osx/private.h"
+#include "wx/modalhook.h"
 
 #ifndef __DARWIN__
     #include <Navigation.h>
@@ -455,12 +455,17 @@ static pascal void NavEventProc(
 }
 
 
-wxFileDialog::wxFileDialog(
+void wxFileDialog::Init()
+{
+}
+
+void wxFileDialog::Create(
     wxWindow *parent, const wxString& message,
     const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
     long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
-    : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 {
+    wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 
@@ -476,6 +481,8 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 
 int wxFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_paths.Empty();
     m_fileNames.Empty();
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/font.cpp b/Externals/wxWidgets3/src/osx/carbon/font.cpp
index ade314dbe3..c3ad61eb15 100644
--- a/Externals/wxWidgets3/src/osx/carbon/font.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/font.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: font.cpp 70452 2012-01-23 21:06:07Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -51,11 +50,9 @@ public:
 
     wxFontRefData(wxOSXSystemFont font, int size);
 
-#if wxOSX_USE_CORE_TEXT
     wxFontRefData( wxUint32 coreTextFontType );
     wxFontRefData( CTFontRef font );
     wxFontRefData( CTFontDescriptorRef fontdescriptor, int size );
-#endif
 
     virtual ~wxFontRefData();
 
@@ -137,6 +134,8 @@ public:
     }
 
     wxFontEncoding GetEncoding() const { return m_info.GetEncoding(); }
+    
+    bool IsFixedWidth() const;
 
     void Free();
 
@@ -145,9 +144,6 @@ public:
 protected:
     // common part of all ctors
     void Init();
-#if wxOSX_USE_CORE_TEXT
-    // void Init( CTFontRef font );
-#endif
 public:
     bool            m_fontValid;
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
@@ -155,9 +151,7 @@ public:
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
 #endif
-#if wxOSX_USE_CORE_TEXT
     wxCFRef<CTFontRef> m_ctFont;
-#endif
 #if wxOSX_USE_ATSU_TEXT
     void CreateATSUFont();
 
@@ -183,9 +177,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     m_macThemeFontID = data.m_macThemeFontID;
 #endif
-#if wxOSX_USE_CORE_TEXT
     m_ctFont = data.m_ctFont;
-#endif
     m_cgFont = data.m_cgFont;
 #if wxOSX_USE_ATSU_TEXT
     if ( data.m_macATSUStyle != NULL )
@@ -235,9 +227,7 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::Free()
 {
-#if wxOSX_USE_CORE_TEXT
     m_ctFont.reset();
-#endif
     m_cgFont.reset();
 #if wxOSX_USE_ATSU_TEXT
 #if wxOSX_USE_CARBON
@@ -271,8 +261,6 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
     wxASSERT( font != wxOSX_SYSTEM_FONT_NONE );
     Init();
 
-#if wxOSX_USE_CORE_TEXT
-    if (  UMAGetSystemVersion() >= 0x1050 )
     {
         CTFontUIFontType uifont = kCTFontSystemFontType;
         switch( font )
@@ -309,7 +297,6 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
         descr.reset( CTFontCopyFontDescriptor( m_ctFont ) );
         m_info.Init(descr);
     }
-#endif
 #if wxOSX_USE_ATSU_TEXT
     {
 #if !wxOSX_USE_CARBON
@@ -464,8 +451,6 @@ void wxFontRefData::MacFindFont()
 
     m_info.EnsureValid();
 
-#if wxOSX_USE_CORE_TEXT
-    if (  UMAGetSystemVersion() >= 0x1050 )
     {
          CTFontSymbolicTraits traits = 0;
 
@@ -528,8 +513,6 @@ void wxFontRefData::MacFindFont()
 
         m_cgFont.reset(CTFontCopyGraphicsFont(m_ctFont, NULL));
     }
-
-#endif
 #if wxOSX_USE_ATSU_TEXT
     CreateATSUFont();
 #endif
@@ -542,6 +525,12 @@ void wxFontRefData::MacFindFont()
     m_fontValid = true;
 }
 
+bool wxFontRefData::IsFixedWidth() const
+{
+    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(m_ctFont);
+    return (traits & kCTFontMonoSpaceTrait) != 0;
+}
+
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -657,7 +646,7 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 
 void wxFont::SetPointSize(int pointSize)
 {
-    if ( M_FONTDATA->GetPointSize() == pointSize )
+    if ( M_FONTDATA != NULL && M_FONTDATA->GetPointSize() == pointSize )
         return;
 
     AllocExclusive();
@@ -730,6 +719,16 @@ wxSize wxFont::GetPixelSize() const
 #endif
 }
 
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
+    
+    // cast away constness otherwise lazy font resolution is not possible
+    const_cast<wxFont *>(this)->RealizeResource();
+
+    return M_FONTDATA->IsFixedWidth();
+}
+
 wxFontFamily wxFont::DoGetFamily() const
 {
     return M_FONTDATA->GetFamily();
@@ -833,8 +832,6 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 }
 #endif
 
-#if wxOSX_USE_CORE_TEXT
-
 CTFontRef wxFont::OSXGetCTFont() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
@@ -845,8 +842,6 @@ CTFontRef wxFont::OSXGetCTFont() const
     return (CTFontRef)(M_FONTDATA->m_ctFont);
 }
 
-#endif
-
 #if wxOSX_USE_COCOA_OR_CARBON
 
 CGFontRef wxFont::OSXGetCGFont() const
@@ -986,7 +981,6 @@ void wxNativeFontInfo::Init()
     m_descriptorValid = false;
 }
 
-#if wxOSX_USE_CORE_TEXT
 void wxNativeFontInfo::Init(CTFontDescriptorRef descr)
 {
     Init();
@@ -1009,7 +1003,6 @@ void wxNativeFontInfo::Init(CTFontDescriptorRef descr)
     wxCFStringRef familyName( (CFStringRef) CTFontDescriptorCopyAttribute(descr, kCTFontFamilyNameAttribute));
     m_faceName = familyName.AsString();
 }
-#endif
 
 void wxNativeFontInfo::EnsureValid()
 {
@@ -1092,7 +1085,16 @@ void wxNativeFontInfo::Init(int size,
                   wxFontEncoding encoding)
 {
     Init();
-    m_pointSize = size;
+
+    // We should use the default font size if the special value wxDEFAULT is
+    // specified and we also handle -1 as a synonym for wxDEFAULT for
+    // compatibility with wxGTK (see #12541).
+    //
+    // Notice that we rely on the fact that wxNORMAL_FONT itself is not
+    // initialized using this ctor, but from native font info.
+    m_pointSize = size == -1 || size == wxDEFAULT
+                    ? wxNORMAL_FONT->GetPointSize()
+                    : size;
     m_family = family;
     m_style = style;
     m_weight = weight;
diff --git a/Externals/wxWidgets3/src/osx/carbon/fontdlg.cpp b/Externals/wxWidgets3/src/osx/carbon/fontdlg.cpp
index b97015df9d..b2a4013620 100644
--- a/Externals/wxWidgets3/src/osx/carbon/fontdlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/fontdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: fontdlg.cpp 70653 2012-02-20 21:57:06Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,6 +41,7 @@
 
 #include "wx/fontdlg.h"
 #include "wx/fontutil.h"
+#include "wx/modalhook.h"
 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
@@ -76,8 +76,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
         case kEventFontSelection :
         {
             bool setup = false ;
-#if wxOSX_USE_CORE_TEXT
-            if (  UMAGetSystemVersion() >= 0x1050 )
+            if ( !setup )
             {
                 CTFontDescriptorRef descr;
                 if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
@@ -90,7 +89,6 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
                     setup = true;
                 }
             }
-#endif
 #if wxOSX_USE_ATSU_TEXT
             ATSUFontID fontId = 0 ;
             if ( !setup && (cEvent.GetParameter<ATSUFontID>(kEventParamATSUFontID, &fontId) == noErr) )
@@ -229,6 +227,8 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 
 int wxFontDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
 #if wxOSX_USE_CARBON
 
     OSStatus err ;
@@ -238,24 +238,10 @@ int wxFontDialog::ShowModal()
         font = m_fontData.m_initialFont ;
     }
 
-    bool setup = false;
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );
-        err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
-        CFRelease( descr );
-        setup = true;
-    }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    if ( !setup )
-    {
-        ATSUStyle style = (ATSUStyle)font.MacGetATSUStyle();
-        err = SetFontInfoForSelection (kFontSelectionATSUIType,1, &style , NULL);
-        setup = true;
-    }
-#endif
+    CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );
+    err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
+    CFRelease( descr );
+
     // just clicking on ENTER will not send us any font setting event, therefore we have to make sure
     // that field is already correct
     m_fontData.m_chosenFont = font ;
@@ -412,7 +398,7 @@ void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
         dialog->Destroy();
         Refresh();
 
-        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+        wxCommandEvent event(wxEVT_BUTTON, GetId());
         HandleWindowEvent(event);
     }
 }
@@ -622,7 +608,7 @@ void wxFontDialog::CreateControls()
 }
 
 /*!
- * wxEVT_COMMAND_SPINCTRL_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+ * wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE
  */
 
 void wxFontDialog::OnFontdialogFontsizeUpdated( wxSpinEvent& WXUNUSED(event) )
@@ -631,7 +617,7 @@ void wxFontDialog::OnFontdialogFontsizeUpdated( wxSpinEvent& WXUNUSED(event) )
 }
 
 /*!
- * wxEVT_COMMAND_TEXT_UPDATED event handler for wxID_FONTDIALOG_FONTSIZE
+ * wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE
  */
 
 void wxFontDialog::OnFontdialogFontsizeTextUpdated( wxCommandEvent& WXUNUSED(event) )
@@ -640,7 +626,7 @@ void wxFontDialog::OnFontdialogFontsizeTextUpdated( wxCommandEvent& WXUNUSED(eve
 }
 
 /*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_BOLD
+ * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD
  */
 
 void wxFontDialog::OnFontdialogBoldClick( wxCommandEvent& WXUNUSED(event) )
@@ -649,7 +635,7 @@ void wxFontDialog::OnFontdialogBoldClick( wxCommandEvent& WXUNUSED(event) )
 }
 
 /*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_ITALIC
+ * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC
  */
 
 void wxFontDialog::OnFontdialogItalicClick( wxCommandEvent& WXUNUSED(event) )
@@ -658,7 +644,7 @@ void wxFontDialog::OnFontdialogItalicClick( wxCommandEvent& WXUNUSED(event) )
 }
 
 /*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for wxID_FONTDIALOG_UNDERLINED
+ * wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED
  */
 
 void wxFontDialog::OnFontdialogUnderlinedClick( wxCommandEvent& WXUNUSED(event) )
@@ -667,7 +653,7 @@ void wxFontDialog::OnFontdialogUnderlinedClick( wxCommandEvent& WXUNUSED(event)
 }
 
 /*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+ * wxEVT_BUTTON event handler for wxID_OK
  */
 
 void wxFontDialog::OnOkClick( wxCommandEvent& event )
@@ -677,7 +663,7 @@ void wxFontDialog::OnOkClick( wxCommandEvent& event )
 
 
 /*!
- * wxEVT_COMMAND_LISTBOX_SELECTED event handler for wxID_FONTDIALOG_FACENAME
+ * wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME
  */
 
 void wxFontDialog::OnFontdialogFacenameSelected( wxCommandEvent& WXUNUSED(event) )
diff --git a/Externals/wxWidgets3/src/osx/carbon/fontdlgosx.mm b/Externals/wxWidgets3/src/osx/carbon/fontdlgosx.mm
index bd679415d0..2129527f3e 100644
--- a/Externals/wxWidgets3/src/osx/carbon/fontdlgosx.mm
+++ b/Externals/wxWidgets3/src/osx/carbon/fontdlgosx.mm
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-10-03
-// RCS-ID:      $Id: fontdlgosx.mm 70497 2012-02-02 14:19:34Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,7 @@
 #endif
 
 #include "wx/fontutil.h"
+#include "wx/modalhook.h"
 
 // ============================================================================
 // implementation
@@ -434,6 +434,8 @@ bool wxFontDialog::Create(wxWindow *parent)
 
 int wxFontDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens
     //if you don't do this is a bunch of error
diff --git a/Externals/wxWidgets3/src/osx/carbon/frame.cpp b/Externals/wxWidgets3/src/osx/carbon/frame.cpp
index d4dcb8c6d1..01c8825444 100644
--- a/Externals/wxWidgets3/src/osx/carbon/frame.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/frame.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: frame.cpp 70765 2012-03-01 15:04:42Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -225,8 +224,10 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
 #if wxOSX_USE_CARBON
     wxFrame* tlf = wxDynamicCast( wxNonOwnedWindow::GetFromWXWindow( (WXWindow) FrontNonFloatingWindow() ) , wxFrame );
+#elif wxOSX_USE_COCOA
+    wxFrame* tlf = wxDynamicCast( wxNonOwnedWindow::GetFromWXWindow( wxOSXGetMainWindow() ) , wxFrame );
 #else
-    wxFrame* tlf = (wxFrame*) wxTheApp->GetTopWindow();
+    wxFrame* tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
 #endif
     bool makeCurrent = false;
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/gauge.cpp b/Externals/wxWidgets3/src/osx/carbon/gauge.cpp
index 3612736b01..33fff27924 100644
--- a/Externals/wxWidgets3/src/osx/carbon/gauge.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/gauge.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gauge.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/gdiobj.cpp b/Externals/wxWidgets3/src/osx/carbon/gdiobj.cpp
index c911aac587..3a8b6b826f 100644
--- a/Externals/wxWidgets3/src/osx/carbon/gdiobj.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/gdiobj.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gdiobj.cpp 63917 2010-04-08 18:47:41Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp b/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
index 862e3eb9dd..7006d5e68f 100644
--- a/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas.cpp 67412 2011-04-07 12:55:36Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -263,24 +262,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 
     const_cast<wxGLCanvas&>(win).SetViewport();
 
-    
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        aglSetWindowRef(m_glContext, win.MacGetTopLevelWindowRef());
-    }
-    else
-#endif
-    {
-        AGLDrawable drawable = (AGLDrawable)GetWindowPort(
-                                                      MAC_WXHWND(win.MacGetTopLevelWindowRef()));
-    
-        if ( !aglSetDrawable(m_glContext, drawable) )
-        {
-            wxLogAGLError("aglSetDrawable");
-            return false;
-        }
-    }
+    aglSetWindowRef(m_glContext, win.MacGetTopLevelWindowRef());
 
     return WXGLSetCurrentContext(m_glContext);
 }
@@ -355,17 +337,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
     m_bufferName = gCurrentBufferName++;
     aglSetInteger (m_dummyContext, AGL_BUFFER_NAME, &m_bufferName);
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        aglSetWindowRef(m_dummyContext, MacGetTopLevelWindowRef());
-    }
-    else
-#endif
-    {
-        AGLDrawable drawable = (AGLDrawable)GetWindowPort(MAC_WXHWND(MacGetTopLevelWindowRef()));
-        aglSetDrawable(m_dummyContext, drawable);
-    }
+    aglSetWindowRef(m_dummyContext, MacGetTopLevelWindowRef());
 
     m_macCanvasIsShown = true;
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/graphics.cpp b/Externals/wxWidgets3/src/osx/carbon/graphics.cpp
index 99dcb85b40..0fb0c50e22 100644
--- a/Externals/wxWidgets3/src/osx/carbon/graphics.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/graphics.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: graphics.cpp 70735 2012-02-28 14:39:32Z SC $
 // copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,8 +66,6 @@ int UMAGetSystemVersion()
 }
 
 
-#define wxOSX_USE_CORE_TEXT 1
-
 #endif
 
 #if wxOSX_USE_COCOA_OR_IPHONE
@@ -79,10 +76,6 @@ extern void wxOSXUnlockFocus( WXWidget view) ;
 #endif
 #endif
 
-#if 1 // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-
-// TODO test whether this private API also works under 10.3
-
 // copying values from NSCompositingModes (see also webkit and cairo sources)
 
 typedef enum CGCompositeOperation {
@@ -107,17 +100,13 @@ extern "C"
    CG_EXTERN void CGContextSetCompositeOperation (CGContextRef context, int operation);
 } ;
 
-#endif
-
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
-#if !defined( __DARWIN__ ) || defined(__MWERKS__)
 #ifndef M_PI
 const double M_PI = 3.14159265358979;
 #endif
-#endif
 
 static const double RAD2DEG = 180.0 / M_PI;
 
@@ -149,28 +138,12 @@ OSStatus wxMacDrawCGImage(
 
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {
-    CGColorRef retval = 0;
-#ifdef __WXMAC__
-    retval = col.CreateCGColor();
-#else
-// TODO add conversion NSColor - CGColorRef (obj-c)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB )
-        retval = CGColorCreateGenericRGB( col.Red() / 255.0 , col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 );
-    else
-#endif
-    {
-        CGFloat components[4] = { col.Red() / 255.0, col.Green() / 255.0, col.Blue()  / 255.0, col.Alpha() / 255.0 } ;
-        retval = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    }
+    CGColorRef retval = col.CreateCGColor();
 
-#endif
     wxASSERT(retval != NULL);
     return retval;
 }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && wxOSX_USE_CORE_TEXT
-
 CTFontRef wxMacCreateCTFont( const wxFont& font )
 {
 #ifdef __WXMAC__
@@ -180,8 +153,6 @@ CTFontRef wxMacCreateCTFont( const wxFont& font )
 #endif
 }
 
-#endif
-
 // CGPattern wrapper class: always allocate on heap, never call destructor
 
 class wxMacCoreGraphicsPattern
@@ -883,9 +854,7 @@ public:
 #if wxOSX_USE_ATSU_TEXT
     virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }
 #endif
-#if wxOSX_USE_CORE_TEXT
     CTFontRef OSXGetCTFont() const { return m_ctFont ; }
-#endif
     wxColour GetColour() const { return m_colour ; }
 
     bool GetUnderlined() const { return m_underlined ; }
@@ -898,9 +867,7 @@ private :
 #if wxOSX_USE_ATSU_TEXT
     ATSUStyle m_macATSUIStyle;
 #endif
-#if wxOSX_USE_CORE_TEXT
     wxCFRef< CTFontRef > m_ctFont;
-#endif
 #if wxOSX_USE_IPHONE
     UIFont*  m_uiFont;
 #endif
@@ -911,9 +878,7 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere
     m_colour = col;
     m_underlined = font.GetUnderlined();
 
-#if wxOSX_USE_CORE_TEXT
     m_ctFont.reset( wxMacCreateCTFont( font ) );
-#endif
 #if wxOSX_USE_IPHONE
     m_uiFont = CreateUIFont(font);
     wxMacCocoaRetain( m_uiFont );
@@ -957,8 +922,6 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere
 
 wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()
 {
-#if wxOSX_USE_CORE_TEXT
-#endif
 #if wxOSX_USE_ATSU_TEXT
     if ( m_macATSUIStyle )
     {
@@ -971,13 +934,14 @@ wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()
 #endif
 }
 
-class wxMacCoreGraphicsBitmapData : public wxGraphicsObjectRefData
+class wxMacCoreGraphicsBitmapData : public wxGraphicsBitmapData
 {
 public:
     wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap, bool monochrome );
     ~wxMacCoreGraphicsBitmapData();
 
     virtual CGImageRef GetBitmap() { return m_bitmap; }
+    virtual void* GetNativeBitmap() const { return m_bitmap; }
     bool IsMonochrome() { return m_monochrome; }
 
 #if wxUSE_IMAGE
@@ -992,7 +956,7 @@ private :
     bool m_monochrome;
 };
 
-wxMacCoreGraphicsBitmapData::wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap, bool monochrome ) : wxGraphicsObjectRefData( renderer ),
+wxMacCoreGraphicsBitmapData::wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap, bool monochrome ) : wxGraphicsBitmapData( renderer ),
     m_bitmap(bitmap), m_monochrome(monochrome)
 {
 }
@@ -1501,7 +1465,7 @@ public:
     // fast convenience methods
     
     
-    virtual void DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 
+    virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 
 
     void SetNativeContext( CGContextRef cg );
 
@@ -1847,8 +1811,8 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
     if (m_composition == wxCOMPOSITION_DEST)
         return true;
 
-#if wxOSX_USE_COCOA_OR_CARBON
-    if ( UMAGetSystemVersion() < 0x1060 )
+    // TODO REMOVE if we don't need it because of bugs in 10.5
+#if 0
     {
         CGCompositeOperation cop = kCGCompositeOperationSourceOver;
         CGBlendMode mode = kCGBlendModeNormal;
@@ -1887,11 +1851,9 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         case wxCOMPOSITION_XOR:
             cop = kCGCompositeOperationXOR;
             break;
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
         case wxCOMPOSITION_ADD:
             mode = kCGBlendModePlusLighter ;
             break;
-#endif
         default:
             return false;
         }
@@ -1901,8 +1863,6 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
             CGContextSetBlendMode(m_cgContext, mode);
     }
 #endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-    else
     {
         CGBlendMode mode = kCGBlendModeNormal;
         switch( op )
@@ -1938,7 +1898,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
            mode = kCGBlendModeDestinationAtop;
             break;
         case wxCOMPOSITION_XOR:
-            mode = kCGBlendModeXOR;
+            mode = kCGBlendModeExclusion; // Not kCGBlendModeXOR!
             break;
 
         case wxCOMPOSITION_ADD:
@@ -1949,7 +1909,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         }
         CGContextSetBlendMode(m_cgContext, mode);
     }
-#endif
+
     CheckInvariants();
     return true;
 }
@@ -2247,7 +2207,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble
         return;
 
 #ifdef __WXMAC__
-    wxMacCoreGraphicsBitmapData* refdata  =static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData());
+    wxMacCoreGraphicsBitmapData* refdata = static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData());
     CGImageRef image = refdata->GetBitmap();
     CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( refdata->IsMonochrome() == 1 )
@@ -2290,11 +2250,11 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
-    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );
     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) );
     CGContextScaleCTM( m_cgContext, 1, -1 );
 #if wxOSX_USE_COCOA_OR_CARBON
+    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );
     PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , icon.GetHICON() );
 #endif
@@ -2329,80 +2289,51 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
-        wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
-        CTFontRef font = fref->OSXGetCTFont();
-        CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
-#if 0
-        // right now there's no way to get continuous underlines, only words, so we emulate it
-        CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
-        wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) );
-         CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName };
-        CFTypeRef values[] = { font, col, underlined };
-#else
-        CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName };
-        CFTypeRef values[] = { font, col };
-#endif
-        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
-                                                        WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
-        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
-        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
-        y += CTFontGetAscent(font);
-
-        CGContextSaveGState(m_cgContext);
-        CGAffineTransform textMatrix = CGContextGetTextMatrix(m_cgContext);
-        
-        CGContextTranslateCTM(m_cgContext, (CGFloat) x, (CGFloat) y);
-        CGContextScaleCTM(m_cgContext, 1, -1);
-        CGContextSetTextMatrix(m_cgContext, CGAffineTransformIdentity);
-        
-        CTLineDraw( line, m_cgContext );
-        
-        if ( fref->GetUnderlined() ) {
-            //AKT: draw horizontal line 1 pixel thick and with 1 pixel gap under baseline
-            CGFloat width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
-
-            CGPoint points[] = { {0.0, -2.0},  {width, -2.0} };
-            
-            CGContextSetStrokeColorWithColor(m_cgContext, col);
-            CGContextSetShouldAntialias(m_cgContext, false);
-            CGContextSetLineWidth(m_cgContext, 1.0);
-            CGContextStrokeLineSegments(m_cgContext, points, 2);
-        }
-        
-        CGContextRestoreGState(m_cgContext);
-        CGContextSetTextMatrix(m_cgContext, textMatrix);
-        CFRelease( col );
-        CheckInvariants();
-        return;
-    }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    {
-        DrawText(str, x, y, 0.0);
-        return;
-    }
-#endif
-#if wxOSX_USE_IPHONE
     wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+    wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
+    CTFontRef font = fref->OSXGetCTFont();
+    CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
+#if 0
+    // right now there's no way to get continuous underlines, only words, so we emulate it
+    CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
+    wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) );
+     CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName };
+    CFTypeRef values[] = { font, col, underlined };
+#else
+    CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName };
+    CFTypeRef values[] = { font, col };
+#endif
+    wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+                                                    WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+    wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
+    wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
+
+    y += CTFontGetAscent(font);
 
     CGContextSaveGState(m_cgContext);
+    CGAffineTransform textMatrix = CGContextGetTextMatrix(m_cgContext);
 
-    CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
-    CGContextSetTextDrawingMode (m_cgContext, kCGTextFill);
-    CGContextSetFillColorWithColor( m_cgContext, col );
+    CGContextTranslateCTM(m_cgContext, (CGFloat) x, (CGFloat) y);
+    CGContextScaleCTM(m_cgContext, 1, -1);
+    CGContextSetTextMatrix(m_cgContext, CGAffineTransformIdentity);
 
-    wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
-    DrawTextInContext( m_cgContext, CGPointMake( x, y ), fref->GetUIFont() , text.AsNSString() );
+    CTLineDraw( line, m_cgContext );
+
+    if ( fref->GetUnderlined() ) {
+        //AKT: draw horizontal line 1 pixel thick and with 1 pixel gap under baseline
+        CGFloat width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
+
+        CGPoint points[] = { {0.0, -2.0},  {width, -2.0} };
+        
+        CGContextSetStrokeColorWithColor(m_cgContext, col);
+        CGContextSetShouldAntialias(m_cgContext, false);
+        CGContextSetLineWidth(m_cgContext, 1.0);
+        CGContextStrokeLineSegments(m_cgContext, points, 2);
+    }
 
     CGContextRestoreGState(m_cgContext);
-    CFRelease( col );
-#endif
-    
+    CGContextSetTextMatrix(m_cgContext, textMatrix);
+    CGColorRelease( col );
     CheckInvariants();
 }
 
@@ -2418,104 +2349,9 @@ void wxMacCoreGraphicsContext::DoDrawRotatedText(const wxString &str,
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        // default implementation takes care of rotation and calls non rotated DrawText afterwards
-        wxGraphicsContext::DoDrawRotatedText( str, x, y, angle );
-        return;
-    }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    {
-        OSStatus status = noErr;
-        ATSUTextLayout atsuLayout;
-        wxMacUniCharBuffer unibuf( str );
-        UniCharCount chars = unibuf.GetChars();
-
-        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
-        status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
-                                                   &chars , &style , &atsuLayout );
-
-        wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );
-
-        status = ::ATSUSetTransientFontMatching( atsuLayout , true );
-        wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
-
-        int iAngle = int( angle * RAD2DEG );
-        if ( abs(iAngle) > 0 )
-        {
-            Fixed atsuAngle = IntToFixed( iAngle );
-            ATSUAttributeTag atsuTags[] =
-            {
-                kATSULineRotationTag ,
-            };
-            ByteCount atsuSizes[WXSIZEOF(atsuTags)] =
-            {
-                sizeof( Fixed ) ,
-            };
-            ATSUAttributeValuePtr    atsuValues[WXSIZEOF(atsuTags)] =
-            {
-                &atsuAngle ,
-            };
-            status = ::ATSUSetLayoutControls(atsuLayout , WXSIZEOF(atsuTags),
-                                             atsuTags, atsuSizes, atsuValues );
-        }
-
-        {
-            ATSUAttributeTag atsuTags[] =
-            {
-                kATSUCGContextTag ,
-            };
-            ByteCount atsuSizes[WXSIZEOF(atsuTags)] =
-            {
-                sizeof( CGContextRef ) ,
-            };
-            ATSUAttributeValuePtr    atsuValues[WXSIZEOF(atsuTags)] =
-            {
-                &m_cgContext ,
-            };
-            status = ::ATSUSetLayoutControls(atsuLayout , WXSIZEOF(atsuTags),
-                                             atsuTags, atsuSizes, atsuValues );
-        }
-
-        ATSUTextMeasurement textBefore, textAfter;
-        ATSUTextMeasurement ascent, descent;
-
-        status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-                                            &textBefore , &textAfter, &ascent , &descent );
-
-        wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-
-        Rect rect;
-        x += (int)(sin(angle) * FixedToFloat(ascent));
-        y += (int)(cos(angle) * FixedToFloat(ascent));
-
-        status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-                                        IntToFixed(x) , IntToFixed(y) , &rect );
-        wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-
-        CGContextSaveGState(m_cgContext);
-        CGContextTranslateCTM(m_cgContext, (CGFloat) x, (CGFloat) y);
-        CGContextScaleCTM(m_cgContext, 1, -1);
-        status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-                                IntToFixed(0) , IntToFixed(0) );
-
-        wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
-
-        CGContextRestoreGState(m_cgContext);
-
-        ::ATSUDisposeTextLayout(atsuLayout);
-        CheckInvariants();
-
-        return;
-    }
-#endif
-#if wxOSX_USE_IPHONE
     // default implementation takes care of rotation and calls non rotated DrawText afterwards
     wxGraphicsContext::DoDrawRotatedText( str, x, y, angle );
-#endif
-    
+
     CheckInvariants();
 }
 
@@ -2533,92 +2369,40 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
     if ( externalLeading )
         *externalLeading = 0;
 
+    // In wxWidgets (MSW-inspired) API it is possible to call GetTextExtent()
+    // with an empty string to get just the descent and the leading of the
+    // font, so support this (mis)use.
+    wxString strToMeasure(str);
     if (str.empty())
-        return;
+        strToMeasure = wxS(" ");
 
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
+    wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+    CTFontRef font = fref->OSXGetCTFont();
+
+    wxCFStringRef text(strToMeasure, wxLocale::GetSystemEncoding() );
+    CFStringRef keys[] = { kCTFontAttributeName  };
+    CFTypeRef values[] = { font };
+    wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+                                                            WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+    wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
+    wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
+
+    CGFloat a, d, l, w;
+    w = CTLineGetTypographicBounds(line, &a, &d, &l);
+
+    if ( !str.empty() )
     {
-        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
-        CTFontRef font = fref->OSXGetCTFont();
-
-        wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
-        CFStringRef keys[] = { kCTFontAttributeName  };
-        CFTypeRef values[] = { font };
-        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
-                                                                WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
-        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
-        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
-        CGFloat a, d, l, w;
-        w = CTLineGetTypographicBounds(line, &a, &d, &l);
-
-        if ( height )
-            *height = a+d+l;
-        if ( descent )
-            *descent = d;
-        if ( externalLeading )
-            *externalLeading = l;
         if ( width )
             *width = w;
-        return;
-    }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    {
-        OSStatus status = noErr;
-
-        ATSUTextLayout atsuLayout;
-        wxMacUniCharBuffer unibuf( str );
-        UniCharCount chars = unibuf.GetChars();
-
-        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
-        status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
-                                                   &chars , &style , &atsuLayout );
-
-        wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
-
-        status = ::ATSUSetTransientFontMatching( atsuLayout , true );
-        wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
-
-        ATSUTextMeasurement textBefore, textAfter;
-        ATSUTextMeasurement textAscent, textDescent;
-
-        status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-                                            &textBefore , &textAfter, &textAscent , &textDescent );
-
         if ( height )
-            *height = FixedToFloat(textAscent + textDescent);
-        if ( descent )
-            *descent = FixedToFloat(textDescent);
-        if ( externalLeading )
-            *externalLeading = 0;
-        if ( width )
-            *width = FixedToFloat(textAfter - textBefore);
-
-        ::ATSUDisposeTextLayout(atsuLayout);
-
-        return;
+            *height = a+d+l;
     }
-#endif
-#if wxOSX_USE_IPHONE
-    wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
 
-    wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
-    CGSize sz = MeasureTextInContext( fref->GetUIFont() , text.AsNSString() );
-
-    if ( height )
-        *height = sz.height;
-        /*
     if ( descent )
-        *descent = FixedToFloat(textDescent);
+        *descent = d;
     if ( externalLeading )
-        *externalLeading = 0;
-        */
-    if ( width )
-        *width = sz.width;
-#endif
-    
+        *externalLeading = l;
+
     CheckInvariants();    
 }
 
@@ -2632,93 +2416,23 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr
     if (text.empty())
         return;
 
-#if wxOSX_USE_CORE_TEXT
+    wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+    CTFontRef font = fref->OSXGetCTFont();
+
+    wxCFStringRef t(text, wxLocale::GetSystemEncoding() );
+    CFStringRef keys[] = { kCTFontAttributeName  };
+    CFTypeRef values[] = { font };
+    wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
+                                                            WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+    wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, attributes) );
+    wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
+
+    int chars = text.length();
+    for ( int pos = 0; pos < (int)chars; pos ++ )
     {
-        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
-        CTFontRef font = fref->OSXGetCTFont();
-
-        wxCFStringRef t(text, wxLocale::GetSystemEncoding() );
-        CFStringRef keys[] = { kCTFontAttributeName  };
-        CFTypeRef values[] = { font };
-        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values,
-                                                                WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
-        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, attributes) );
-        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
-
-        int chars = text.length();
-        for ( int pos = 0; pos < (int)chars; pos ++ )
-        {
-            widths[pos] = CTLineGetOffsetForStringIndex( line, pos+1 , NULL );
-        }
-
-        return;
+        widths[pos] = CTLineGetOffsetForStringIndex( line, pos+1 , NULL );
     }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    {
-        OSStatus status = noErr;
-        ATSUTextLayout atsuLayout;
-        wxMacUniCharBuffer unibuf( text );
-        UniCharCount chars = unibuf.GetChars();
 
-        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
-        status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
-                                          &chars , &style , &atsuLayout );
-
-        wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
-
-        status = ::ATSUSetTransientFontMatching( atsuLayout , true );
-        wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
-
-// new implementation from JS, keep old one just in case
-#if 0
-        for ( int pos = 0; pos < (int)chars; pos ++ )
-        {
-            unsigned long actualNumberOfBounds = 0;
-            ATSTrapezoid glyphBounds;
-
-            // We get a single bound, since the text should only require one. If it requires more, there is an issue
-            OSStatus result;
-            result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
-                                        kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
-            if (result != noErr || actualNumberOfBounds != 1 )
-                return;
-
-            widths[pos] = FixedToFloat( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
-            //unsigned char uch = s[i];
-        }
-#else
-        ATSLayoutRecord *layoutRecords = NULL;
-        ItemCount glyphCount = 0;
-
-        // Get the glyph extents
-        OSStatus err = ::ATSUDirectGetLayoutDataArrayPtrFromTextLayout(atsuLayout,
-                                                                       0,
-                                                                       kATSUDirectDataLayoutRecordATSLayoutRecordCurrent,
-                                                                       (void **)
-                                                                       &layoutRecords,
-                                                                       &glyphCount);
-        wxASSERT(glyphCount == (text.length()+1));
-
-        if ( err == noErr && glyphCount == (text.length()+1))
-        {
-            for ( int pos = 1; pos < (int)glyphCount ; pos ++ )
-            {
-                widths[pos-1] = FixedToFloat( layoutRecords[pos].realPos );
-            }
-        }
-
-        ::ATSUDirectReleaseLayoutDataArrayPtr(NULL,
-                                              kATSUDirectDataLayoutRecordATSLayoutRecordCurrent,
-                                              (void **) &layoutRecords);
-#endif
-        ::ATSUDisposeTextLayout(atsuLayout);
-    }
-#endif
-#if wxOSX_USE_IPHONE
-    // TODO core graphics text implementation here
-#endif
-    
     CheckInvariants();
 }
 
@@ -2728,11 +2442,21 @@ void * wxMacCoreGraphicsContext::GetNativeContext()
 }
 
 
-void wxMacCoreGraphicsContext::DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxMacCoreGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
+    if (!EnsureIsValid())
+        return;
+
     if (m_composition == wxCOMPOSITION_DEST) 
         return; 
 
+    // when using shading, we have to go back to drawing paths 
+    if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
+    {
+        wxGraphicsContext::DrawRectangle( x,y,w,h );
+        return;
+    }
+
     CGRect rect = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( !m_brush.IsNull() )
     {
diff --git a/Externals/wxWidgets3/src/osx/carbon/helpxxxx.cpp b/Externals/wxWidgets3/src/osx/carbon/helpxxxx.cpp
index 78c7508435..9f87e6754d 100644
--- a/Externals/wxWidgets3/src/osx/carbon/helpxxxx.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/helpxxxx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: helpxxxx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/icon.cpp b/Externals/wxWidgets3/src/osx/carbon/icon.cpp
index d23aa7b415..51b3e34f40 100644
--- a/Externals/wxWidgets3/src/osx/carbon/icon.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/icon.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: icon.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -381,7 +380,7 @@ bool wxIcon::LoadIconFromFile(const wxString& filename, int desiredWidth, int de
 
     if( err == noErr )
     {
-        // If everthing is OK, assign m_refData
+        // If everything is OK, assign m_refData
         m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight );
         result = true;
     }
diff --git a/Externals/wxWidgets3/src/osx/carbon/listbox.cpp b/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
index 949f2a9b74..8275ad0a81 100644
--- a/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -213,7 +212,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
             m_isChecked = newVal;
             err = noErr;
 
-            wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
+            wxCommandEvent event( wxEVT_CHECKLISTBOX, checklist->GetId() );
             event.SetInt( owner->GetLineFromItem( this ) );
             event.SetEventObject( checklist );
             checklist->HandleWindowEvent( event );
@@ -362,7 +361,7 @@ void wxMacDataBrowserListControl::ItemNotification(
 
     if ((message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
-        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+        wxCommandEvent event( wxEVT_LISTBOX, list->GetId() );
 
         int sel = list->GetSelection();
         if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
diff --git a/Externals/wxWidgets3/src/osx/carbon/listctrl_mac.cpp b/Externals/wxWidgets3/src/osx/carbon/listctrl_mac.cpp
index a8e6856b58..d87a96ee91 100644
--- a/Externals/wxWidgets3/src/osx/carbon/listctrl_mac.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/listctrl_mac.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Created:     04/01/98
-// RCS-ID:      $Id: listctrl_mac.cpp 70294 2012-01-08 10:54:28Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +62,7 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 
     wxListCtrl *window = (wxListCtrl*) data ;
-    wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() );
+    wxListEvent le( wxEVT_LIST_COL_CLICK, window->GetId() );
     le.SetEventObject( window );
 
     switch ( GetEventKind( event ) )
@@ -558,14 +557,14 @@ void wxListCtrl::OnDblClick(wxMouseEvent& event)
 void wxListCtrl::OnRightDown(wxMouseEvent& event)
 {
     if (m_dbImpl)
-        FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
+        FireMouseEvent(wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
     event.Skip();
 }
 
 void wxListCtrl::OnMiddleDown(wxMouseEvent& event)
 {
     if (m_dbImpl)
-        FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
+        FireMouseEvent(wxEVT_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
     event.Skip();
 }
 
@@ -593,7 +592,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
 
     if (m_dbImpl)
     {
-        wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
+        wxListEvent le( wxEVT_LIST_KEY_DOWN, GetId() );
         le.SetEventObject(this);
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
@@ -685,7 +684,7 @@ bool wxListCtrl::Create(wxWindow *parent,
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
         m_renameTimer = new wxListCtrlRenameTimer( this );
-        
+
         Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
@@ -803,8 +802,7 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
 bool wxListCtrl::SetFont(const wxFont& font)
 {
-    bool rv = true;
-    rv = wxListCtrlBase::SetFont(font);
+    bool rv = wxListCtrlBase::SetFont(font);
     if (m_genericImpl)
         rv = m_genericImpl->SetFont(font);
     return rv;
@@ -1739,7 +1737,7 @@ bool wxListCtrl::DeleteItem(long item)
     if (m_dbImpl)
     {
         m_dbImpl->MacDelete(item);
-        wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
+        wxListEvent event( wxEVT_LIST_DELETE_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = item;
         HandleWindowEvent( event );
@@ -1758,7 +1756,7 @@ bool wxListCtrl::DeleteAllItems()
     if (m_dbImpl)
     {
         m_dbImpl->MacClear();
-        wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
+        wxListEvent event( wxEVT_LIST_DELETE_ALL_ITEMS, GetId() );
         event.SetEventObject( this );
         HandleWindowEvent( event );
     }
@@ -1828,7 +1826,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
         wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
                      wxT("EditLabel() needs a text control") );
 
-        wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
+        wxListEvent le( wxEVT_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
         le.SetEventObject( this );
         le.m_itemIndex = item;
         le.m_col = 0;
@@ -2107,7 +2105,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );
 
-        wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
+        wxListEvent event( wxEVT_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
         HandleWindowEvent( event );
@@ -2255,7 +2253,7 @@ void wxListCtrl::OnRenameTimer()
 
 bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
 {
-    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetId() );
+    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetId() );
     le.SetEventObject( this );
     le.m_itemIndex = itemEdit;
 
@@ -2268,7 +2266,7 @@ bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
 void wxListCtrl::OnRenameCancelled(long itemEdit)
 {
     // let owner know that the edit was cancelled
-    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    wxListEvent le( wxEVT_LIST_END_LABEL_EDIT, GetParent()->GetId() );
 
     le.SetEditCanceled(true);
 
@@ -2308,15 +2306,6 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
     return -1;
 }
 
-wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
-    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  wxT("invalid item index in OnGetItemAttr()") );
-
-    // no attributes by default
-    return NULL;
-}
-
 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
@@ -2487,7 +2476,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     {
         bool trigger = false;
 
-        wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+        wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
         bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
 
         event.SetEventObject( list );
@@ -2498,7 +2487,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
         switch (message)
         {
             case kDataBrowserItemDeselected:
-                event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+                event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
                 if ( !isSingle )
                     trigger = !lb->IsSelectionSuppressed();
                 break;
@@ -2508,20 +2497,20 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
                 break;
 
             case kDataBrowserItemDoubleClicked:
-                event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+                event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
                 trigger = true;
                 break;
 
             case kDataBrowserEditStarted :
                 // TODO : how to veto ?
-                event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+                event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
                 trigger = true ;
                 break ;
 
             case kDataBrowserEditStopped :
                 // TODO probably trigger only upon the value store callback, because
                 // here IIRC we cannot veto
-                event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+                event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
                 trigger = true ;
                 break ;
 
@@ -2670,11 +2659,10 @@ enum
 static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
 {
   float textBottom;
-  float iconH, iconW = 0;
+  float iconW = 0;
   float padding = kItemPadding;
   if (hasIcon)
   {
-    iconH = kIconHeight;
     iconW = kIconWidth;
     padding = padding*2;
   }
@@ -2865,35 +2853,14 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
 
     HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
     HIThemeTextInfo info;
-    bool setup = false;
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        info.version = kHIThemeTextInfoVersionOne;
-        info.fontID = kThemeViewsFont;
-        if (font.IsOk())
-        {
-            info.fontID = kThemeSpecifiedFont;
-            info.font = (CTFontRef) font.OSXGetCTFont();
-            setup = true;
-        }
-    }
-#endif
-#if wxOSX_USE_ATSU_TEXT
-    if ( !setup )
-    {
-        info.version = kHIThemeTextInfoVersionZero;
-        info.fontID = kThemeViewsFont;
 
-        if (font.IsOk())
-        {
-            info.fontID = font.MacGetThemeFontID();
-
-            ::TextSize( (short)(font.GetPointSize()) ) ;
-            ::TextFace( font.MacGetFontStyle() ) ;
-        }
+    info.version = kHIThemeTextInfoVersionOne;
+    info.fontID = kThemeViewsFont;
+    if (font.IsOk())
+    {
+        info.fontID = kThemeSpecifiedFont;
+        info.font = (CTFontRef) font.OSXGetCTFont();
     }
-#endif
 
     wxListItem item;
     list->GetColumn(listColumn, item);
@@ -3069,7 +3036,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     {
         bool trigger = false;
 
-        wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
+        wxListEvent event( wxEVT_LIST_ITEM_SELECTED, list->GetId() );
 
         event.SetEventObject( list );
         if ( !list->IsVirtual() )
@@ -3088,7 +3055,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         switch (message)
         {
             case kDataBrowserItemDeselected:
-                event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+                event.SetEventType(wxEVT_LIST_ITEM_DESELECTED);
                 // as the generic implementation is also triggering this
                 // event for single selection, we do the same (different than listbox)
                 trigger = !IsSelectionSuppressed();
@@ -3100,20 +3067,20 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
                 break;
 
             case kDataBrowserItemDoubleClicked:
-                event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+                event.SetEventType( wxEVT_LIST_ITEM_ACTIVATED );
                 trigger = true;
                 break;
 
             case kDataBrowserEditStarted :
                 // TODO : how to veto ?
-                event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
+                event.SetEventType( wxEVT_LIST_BEGIN_LABEL_EDIT ) ;
                 trigger = true ;
                 break ;
 
             case kDataBrowserEditStopped :
                 // TODO probably trigger only upon the value store callback, because
                 // here IIRC we cannot veto
-                event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ;
+                event.SetEventType( wxEVT_LIST_END_LABEL_EDIT ) ;
                 trigger = true ;
                 break ;
 
diff --git a/Externals/wxWidgets3/src/osx/carbon/main.cpp b/Externals/wxWidgets3/src/osx/carbon/main.cpp
index 1cd6ec24ff..9615657900 100644
--- a/Externals/wxWidgets3/src/osx/carbon/main.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/main.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: main.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/mdi.cpp b/Externals/wxWidgets3/src/osx/carbon/mdi.cpp
index bcd729efc7..9ccc98880a 100644
--- a/Externals/wxWidgets3/src/osx/carbon/mdi.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/mdi.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: mdi.cpp 70790 2012-03-04 00:29:03Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp b/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
index f81ac0c534..c3b00f5198 100644
--- a/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2004-2006 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/menu.cpp b/Externals/wxWidgets3/src/osx/carbon/menu.cpp
index 82c40625a5..06a703dfd4 100644
--- a/Externals/wxWidgets3/src/osx/carbon/menu.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/menu.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menu.cpp 70298 2012-01-08 14:52:59Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/menuitem.cpp b/Externals/wxWidgets3/src/osx/carbon/menuitem.cpp
index 265d6ef73d..b2ea37bbed 100644
--- a/Externals/wxWidgets3/src/osx/carbon/menuitem.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/menuitem.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menuitem.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/metafile.cpp b/Externals/wxWidgets3/src/osx/carbon/metafile.cpp
index 43608c969b..1e03af7f34 100644
--- a/Externals/wxWidgets3/src/osx/carbon/metafile.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/metafile.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: metafile.cpp 70710 2012-02-27 15:37:24Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/mimetmac.cpp b/Externals/wxWidgets3/src/osx/carbon/mimetmac.cpp
index a0351f9f18..aebcb41396 100644
--- a/Externals/wxWidgets3/src/osx/carbon/mimetmac.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/mimetmac.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     04/16/2005
-// RCS-ID:      $Id: mimetmac.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2005 Ryan Norton (<wxprojects@comcast.net>)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -630,7 +629,7 @@ void wxMimeTypesManagerImpl::ClearData()
 
 //
 //  Q) Iterating through the map - why does it use if (err == noErr) instead of just asserting?
-//  A) Some intermediate indexes are bad while subsequent ones may be good.  Its wierd, I know.
+//  A) Some intermediate indexes are bad while subsequent ones may be good.  Its weird, I know.
 //
 
 // extension -> file type
diff --git a/Externals/wxWidgets3/src/osx/carbon/msgdlg.cpp b/Externals/wxWidgets3/src/osx/carbon/msgdlg.cpp
index d8da57eec8..142581d0f8 100644
--- a/Externals/wxWidgets3/src/osx/carbon/msgdlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/msgdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: msgdlg.cpp 65680 2010-09-30 11:44:45Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,6 +18,7 @@
 #endif
 
 #include "wx/thread.h"
+#include "wx/modalhook.h"
 #include "wx/osx/uma.h"
 
 
@@ -36,6 +36,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     int resultbutton = wxID_CANCEL;
 
     const long style = GetMessageDialogStyle();
diff --git a/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp b/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
index 44dd2983a8..f9acf7e4d8 100644
--- a/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNonOwnedWindow
 // Author:      Stefan Csomor
 // Created:     2008-03-24
-// RCS-ID:      $Id: nonownedwnd.cpp 69440 2011-10-16 15:59:31Z SJL $
 // Copyright:   (c) Stefan Csomor 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -306,7 +305,6 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
     UInt32 keyCode ;
     UInt32 modifiers ;
-    Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
 #if wxUSE_UNICODE
@@ -331,10 +329,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     }
 #endif // wxUSE_UNICODE
 
-    GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+    GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
     GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
     GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
-    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
 
     UInt32 message = (keyCode << 8) + charCode;
     switch ( GetEventKind( event ) )
@@ -346,7 +343,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                 wxTheApp->MacSetCurrentEvent( event , handler ) ;
                 if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
-                    focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+                    focus , message , modifiers , when , uniChar[0] ) )
                 {
                     result = noErr ;
                 }
@@ -356,7 +353,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
         case kEventRawKeyUp :
             if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
-                focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+                focus , message , modifiers , when , uniChar[0] ) )
             {
                 result = noErr ;
             }
@@ -367,11 +364,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 wxKeyEvent event(wxEVT_KEY_DOWN);
 
                 event.m_shiftDown = modifiers & shiftKey;
-                event.m_controlDown = modifiers & controlKey;
+                event.m_rawControlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
-                event.m_metaDown = modifiers & cmdKey;
-                event.m_x = point.h;
-                event.m_y = point.v;
+                event.m_controlDown = event.m_metaDown = modifiers & cmdKey;
 
 #if wxUSE_UNICODE
                 event.m_uniChar = uniChar[0] ;
@@ -382,7 +377,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
                 if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & controlKey )
                 {
-                    event.m_keyCode = WXK_CONTROL ;
+                    event.m_keyCode = WXK_RAW_CONTROL  ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->HandleWindowEvent( event ) ;
                 }
@@ -400,7 +395,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 }
                 if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & cmdKey )
                 {
-                    event.m_keyCode = WXK_COMMAND ;
+                    event.m_keyCode = WXK_CONTROL;
                     event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->HandleWindowEvent( event ) ;
                 }
@@ -443,9 +438,9 @@ WXDLLEXPORT void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEve
     wxevent.m_x = screenMouseLocation.h;
     wxevent.m_y = screenMouseLocation.v;
     wxevent.m_shiftDown = modifiers & shiftKey;
-    wxevent.m_controlDown = modifiers & controlKey;
+    wxevent.m_rawControlDown = modifiers & controlKey;
     wxevent.m_altDown = modifiers & optionKey;
-    wxevent.m_metaDown = modifiers & cmdKey;
+    wxevent.m_controlDown = wxevent.m_metaDown = modifiers & cmdKey;
     wxevent.m_clickCount = clickCount;
     wxevent.SetTimestamp( cEvent.GetTicks() ) ;
 
@@ -546,8 +541,9 @@ WXDLLEXPORT void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEve
             wxevent.m_wheelRotation = delta;
             wxevent.m_wheelDelta = 1;
             wxevent.m_linesPerAction = 1;
+            wxevent.m_columnsPerAction = 1;
             if ( axis == kEventMouseWheelAxisX )
-                wxevent.m_wheelAxis = 1;
+                wxevent.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
         }
         break ;
 
@@ -1526,18 +1522,11 @@ void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
     Point idealSize = { 0 , 0 } ;
     if ( maximize )
     {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
         HIRect bounds ;
         HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
             &bounds);
         idealSize.h = bounds.size.width;
         idealSize.v = bounds.size.height;
-#else
-        Rect rect ;
-        GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
-        idealSize.h = rect.right - rect.left ;
-        idealSize.v = rect.bottom - rect.top ;
-#endif
     }
     ZoomWindowIdeal( (WindowRef)GetWXWindow() , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
 }
diff --git a/Externals/wxWidgets3/src/osx/carbon/notebmac.cpp b/Externals/wxWidgets3/src/osx/carbon/notebmac.cpp
index 5e52f3ea54..95e277149f 100644
--- a/Externals/wxWidgets3/src/osx/carbon/notebmac.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/notebmac.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: notebmac.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,123 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
+class wxCarbonTabView : public wxMacControl
+{
+public:
+    wxCarbonTabView( wxWindowMac* peer ) : wxMacControl(peer )
+    {
+    }
+    
+    // Added by Mark Newsam
+    // When a page is added or deleted to the notebook this function updates
+    // information held in the control so that it matches the order
+    // the user would expect.
+    //
+    void SetupTabs( const wxNotebook& notebook)
+    {
+        const size_t countPages = notebook.GetPageCount();
+        SetMaximum( countPages ) ;
+        
+        wxNotebookPage *page;
+        ControlTabInfoRecV1 info;
+        
+        for (size_t ii = 0; ii < countPages; ii++)
+        {
+            page = (wxNotebookPage*) notebook.GetPage(ii);
+            info.version = kControlTabInfoVersionOne;
+            info.iconSuiteID = 0;
+            wxCFStringRef cflabel( page->GetLabel(), page->GetFont().GetEncoding() ) ;
+            info.name = cflabel ;
+            SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
+            
+            if ( notebook.GetImageList() && notebook.GetPageImage(ii) >= 0 )
+            {
+                const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( ii ) ) ;
+                if ( bmap.IsOk() )
+                {
+                    ControlButtonContentInfo info ;
+                    
+                    wxMacCreateBitmapButton( &info, bmap ) ;
+                    
+                    OSStatus err = SetData<ControlButtonContentInfo>( ii + 1, kControlTabImageContentTag, &info );
+                    if ( err != noErr )
+                    {
+                        wxFAIL_MSG("Error when setting icon on tab");
+                    }
+                    
+                    wxMacReleaseBitmapButton( &info ) ;
+                }
+            }
+            SetTabEnabled( ii + 1, true ) ;
+        }
+    }
+    
+    int TabHitTest(const wxPoint & pt, long* flags)
+    {
+        int resultV = wxNOT_FOUND;
+        
+        wxNotebook *notebookpeer = wxDynamicCast( GetWXPeer() , wxNotebook );
+        if ( NULL == notebookpeer )
+            return wxNOT_FOUND;
+        
+        const int countPages = notebookpeer->GetPageCount();
+        
+        // we have to convert from Client to Window relative coordinates
+        wxPoint adjustedPt = pt + GetWXPeer()->GetClientAreaOrigin();
+        // and now to HIView native ones
+        adjustedPt.x -= GetWXPeer()->MacGetLeftBorderSize() ;
+        adjustedPt.y -= GetWXPeer()->MacGetTopBorderSize() ;
+        
+        HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
+        HIViewPartCode outPart = 0 ;
+        OSStatus err = HIViewGetPartHit( GetControlRef(), &hipoint, &outPart );
+        
+        int max = GetMaximum() ;
+        if ( outPart == 0 && max > 0 )
+        {
+            // this is a hack, as unfortunately a hit on an already selected tab returns 0,
+            // so we have to go some extra miles to make sure we select something different
+            // and try again ..
+            int val = GetValue() ;
+            int maxval = max ;
+            if ( max == 1 )
+            {
+                SetMaximum( 2 ) ;
+                maxval = 2 ;
+            }
+            
+            if ( val == 1 )
+                SetValue( maxval ) ;
+            else
+                SetValue( 1 ) ;
+            
+            err = HIViewGetPartHit( GetControlRef(), &hipoint, &outPart );
+            
+            SetValue( val ) ;
+            if ( max == 1 )
+                SetMaximum( 1 ) ;
+        }
+        
+        if ( outPart >= 1 && outPart <= countPages )
+            resultV = outPart - 1 ;
+        
+        if (flags != NULL)
+        {
+            *flags = 0;
+            
+            // we cannot differentiate better
+            if (resultV >= 0)
+                *flags |= wxBK_HITTEST_ONLABEL;
+            else
+                *flags |= wxBK_HITTEST_NOWHERE;
+        }
+        
+        return resultV;
+        
+    }
+    
+};
+
 wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
                                     wxWindowMac* parent,
                                     wxWindowID WXUNUSED(id),
@@ -69,7 +185,8 @@ wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
             break;
     }
 
-    wxMacControl* peer = new wxMacControl( wxpeer );
+    wxMacControl* peer = new wxCarbonTabView( wxpeer );
+    
     OSStatus err = CreateTabsControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
         tabsize, tabstyle, 0, NULL, peer->GetControlRefAddr() );
@@ -78,114 +195,4 @@ wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
     return peer;
 }
 
-
-
-
-
-/*
-int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
-{
-    int resultV = wxNOT_FOUND;
-
-    const int countPages = GetPageCount();
-
-    // we have to convert from Client to Window relative coordinates
-    wxPoint adjustedPt = pt + GetClientAreaOrigin();
-    // and now to HIView native ones
-    adjustedPt.x -= MacGetLeftBorderSize() ;
-    adjustedPt.y -= MacGetTopBorderSize() ;
-
-    HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
-    HIViewPartCode outPart = 0 ;
-    OSStatus err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
-
-    int max = GetPeer()->GetMaximum() ;
-    if ( outPart == 0 && max > 0 )
-    {
-        // this is a hack, as unfortunately a hit on an already selected tab returns 0,
-        // so we have to go some extra miles to make sure we select something different
-        // and try again ..
-        int val = GetPeer()->GetValue() ;
-        int maxval = max ;
-        if ( max == 1 )
-        {
-            GetPeer()->SetMaximum( 2 ) ;
-            maxval = 2 ;
-        }
-
-        if ( val == 1 )
-            GetPeer()->SetValue( maxval ) ;
-        else
-             GetPeer()->SetValue( 1 ) ;
-
-        err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
-
-        GetPeer()->SetValue( val ) ;
-        if ( max == 1 )
-            GetPeer()->SetMaximum( 1 ) ;
-    }
-
-    if ( outPart >= 1 && outPart <= countPages )
-        resultV = outPart - 1 ;
-
-    if (flags != NULL)
-    {
-        *flags = 0;
-
-        // we cannot differentiate better
-        if (resultV >= 0)
-            *flags |= wxBK_HITTEST_ONLABEL;
-        else
-            *flags |= wxBK_HITTEST_NOWHERE;
-    }
-
-    return resultV;
-}
-*/
-
-// Added by Mark Newsam
-// When a page is added or deleted to the notebook this function updates
-// information held in the control so that it matches the order
-// the user would expect.
-//
-
-void wxMacControl::SetupTabs( const wxNotebook& notebook)
-{
-    const size_t countPages = notebook.GetPageCount();
-    SetMaximum( countPages ) ;
-
-    wxNotebookPage *page;
-    ControlTabInfoRecV1 info;
-
-    for (size_t ii = 0; ii < countPages; ii++)
-    {
-        page = (wxNotebookPage*) notebook.GetPage(ii);
-        info.version = kControlTabInfoVersionOne;
-        info.iconSuiteID = 0;
-        wxCFStringRef cflabel( page->GetLabel(), page->GetFont().GetEncoding() ) ;
-        info.name = cflabel ;
-        SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
-
-        if ( notebook.GetImageList() && notebook.GetPageImage(ii) >= 0 )
-        {
-            const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( ii ) ) ;
-            if ( bmap.IsOk() )
-            {
-                ControlButtonContentInfo info ;
-
-                wxMacCreateBitmapButton( &info, bmap ) ;
-
-                OSStatus err = SetData<ControlButtonContentInfo>( ii + 1, kControlTabImageContentTag, &info );
-                if ( err != noErr )
-                {
-                    wxFAIL_MSG("Error when setting icon on tab");
-                }
-
-                wxMacReleaseBitmapButton( &info ) ;
-            }
-        }
-        SetTabEnabled( ii + 1, true ) ;
-    }
-}
-
 #endif
diff --git a/Externals/wxWidgets3/src/osx/carbon/overlay.cpp b/Externals/wxWidgets3/src/osx/carbon/overlay.cpp
index faa2e1b38e..9273fa81dc 100644
--- a/Externals/wxWidgets3/src/osx/carbon/overlay.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/overlay.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.cpp 55419 2008-09-02 16:53:23Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/popupwin.cpp b/Externals/wxWidgets3/src/osx/carbon/popupwin.cpp
index cebdf1d497..d13810f1c0 100644
--- a/Externals/wxWidgets3/src/osx/carbon/popupwin.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/popupwin.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
-// RCS-ID:      $Id: popupwin.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -56,25 +55,4 @@ bool wxPopupWindow::Create(wxWindow *parent, int flags)
 
 }
 
-bool wxPopupWindow::Show(bool show)
-{
-    if ( !wxWindow::Show(show) )
-        return false;
-
-    if ( m_nowpeer && show)
-        m_nowpeer->ShowWithoutActivating();
-    else if ( m_nowpeer )
-        m_nowpeer->Show(false);
-
-    if ( show )
-    {
-        // because apps expect a size event to occur at this moment
-        wxSizeEvent event(GetSize() , m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-
-    return true;
-}
-
 #endif // #if wxUSE_POPUPWIN
diff --git a/Externals/wxWidgets3/src/osx/carbon/printdlg.cpp b/Externals/wxWidgets3/src/osx/carbon/printdlg.cpp
index 374e162402..820f49c6e7 100644
--- a/Externals/wxWidgets3/src/osx/carbon/printdlg.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/printdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: printdlg.cpp 64068 2010-04-20 19:09:38Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,9 +27,12 @@
 #include "wx/osx/private/print.h"
 #include "wx/osx/private.h"
 #include "wx/statline.h"
+#include "wx/modalhook.h"
 
 int wxMacPrintDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_printDialogData.GetPrintData().ConvertToNative();
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
@@ -74,6 +76,8 @@ int wxMacPrintDialog::ShowModal()
 
 int wxMacPageSetupDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_pageSetupData.GetPrintData().ConvertToNative();
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_pageSetupData.GetPrintData().GetNativeData();
     nativeData->TransferFrom( &m_pageSetupData );
diff --git a/Externals/wxWidgets3/src/osx/carbon/radiobut.cpp b/Externals/wxWidgets3/src/osx/carbon/radiobut.cpp
index dfdd660b5e..1182b127a0 100644
--- a/Externals/wxWidgets3/src/osx/carbon/radiobut.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/radiobut.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) adding the cyclic group notion for radiobox
 // Created:     01/01/98
-// RCS-ID:      $Id: radiobut.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/region.cpp b/Externals/wxWidgets3/src/osx/carbon/region.cpp
index d4d23acb7a..8e9ae8cee1 100644
--- a/Externals/wxWidgets3/src/osx/carbon/region.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/region.cpp
@@ -3,7 +3,6 @@
 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997
-// RCS-ID:    $Id: region.cpp 70537 2012-02-08 00:20:38Z RD $
 // Copyright: (c) 1997 Stefan Csomor
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,6 +23,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 
+#define OSX_USE_SCANLINES 1
+
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
 //-----------------------------------------------------------------------------
@@ -91,13 +92,868 @@ wxRegion::wxRegion(const wxRect& rect)
     m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height);
 }
 
+#if OSX_USE_SCANLINES
+
+/*
+ 
+ Copyright 1987, 1998  The Open Group
+ 
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+ 
+ 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 THE OPEN GROUP 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.
+ 
+ Except as contained in this notice, the name of The Open Group shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from The Open Group.
+ 
+ */
+
+/* miscanfill.h */
+
+/*
+ *     scanfill.h
+ *
+ *     Written by Brian Kelleher; Jan 1985
+ *
+ *     This file contains a few macros to help track
+ *     the edge of a filled object.  The object is assumed
+ *     to be filled in scanline order, and thus the
+ *     algorithm used is an extension of Bresenham's line
+ *     drawing algorithm which assumes that y is always the
+ *     major axis.
+ *     Since these pieces of code are the same for any filled shape,
+ *     it is more convenient to gather the library in one
+ *     place, but since these pieces of code are also in
+ *     the inner loops of output primitives, procedure call
+ *     overhead is out of the question.
+ *     See the author for a derivation if needed.
+ */
+
+
+/*
+ *  In scan converting polygons, we want to choose those pixels
+ *  which are inside the polygon.  Thus, we add .5 to the starting
+ *  x coordinate for both left and right edges.  Now we choose the
+ *  first pixel which is inside the pgon for the left edge and the
+ *  first pixel which is outside the pgon for the right edge.
+ *  Draw the left pixel, but not the right.
+ *
+ *  How to add .5 to the starting x coordinate:
+ *      If the edge is moving to the right, then subtract dy from the
+ *  error term from the general form of the algorithm.
+ *      If the edge is moving to the left, then add dy to the error term.
+ *
+ *  The reason for the difference between edges moving to the left
+ *  and edges moving to the right is simple:  If an edge is moving
+ *  to the right, then we want the algorithm to flip immediately.
+ *  If it is moving to the left, then we don't want it to flip until
+ *  we traverse an entire pixel.
+ */
+#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \
+int dx;      /* local storage */ \
+\
+/* \
+*  if the edge is horizontal, then it is ignored \
+*  and assumed not to be processed.  Otherwise, do this stuff. \
+*/ \
+if ((dy) != 0) { \
+xStart = (x1); \
+dx = (x2) - xStart; \
+if (dx < 0) { \
+m = dx / (dy); \
+m1 = m - 1; \
+incr1 = -2 * dx + 2 * (dy) * m1; \
+incr2 = -2 * dx + 2 * (dy) * m; \
+d = 2 * m * (dy) - 2 * dx - 2 * (dy); \
+} else { \
+m = dx / (dy); \
+m1 = m + 1; \
+incr1 = 2 * dx - 2 * (dy) * m1; \
+incr2 = 2 * dx - 2 * (dy) * m; \
+d = -2 * m * (dy) + 2 * dx; \
+} \
+} \
+}
+
+#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \
+if (m1 > 0) { \
+if (d > 0) { \
+minval += m1; \
+d += incr1; \
+} \
+else { \
+minval += m; \
+d += incr2; \
+} \
+} else {\
+if (d >= 0) { \
+minval += m1; \
+d += incr1; \
+} \
+else { \
+minval += m; \
+d += incr2; \
+} \
+} \
+}
+
+
+/*
+ *     This structure contains all of the information needed
+ *     to run the bresenham algorithm.
+ *     The variables may be hardcoded into the declarations
+ *     instead of using this structure to make use of
+ *     register declarations.
+ */
+typedef struct {
+    int minor;         /* minor axis        */
+    int d;           /* decision variable */
+    int m, m1;       /* slope and slope+1 */
+    int incr1, incr2; /* error increments */
+} BRESINFO;
+
+
+#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \
+BRESINITPGON(dmaj, min1, min2, bres.minor, bres.d, \
+bres.m, bres.m1, bres.incr1, bres.incr2)
+
+#define BRESINCRPGONSTRUCT(bres) \
+BRESINCRPGON(bres.d, bres.minor, bres.m, bres.m1, bres.incr1, bres.incr2)
+
+
+/* mipoly.h */
+
+/*
+ *     fill.h
+ *
+ *     Created by Brian Kelleher; Oct 1985
+ *
+ *     Include file for filled polygon routines.
+ *
+ *     These are the data structures needed to scan
+ *     convert regions.  Two different scan conversion
+ *     methods are available -- the even-odd method, and
+ *     the winding number method.
+ *     The even-odd rule states that a point is inside
+ *     the polygon if a ray drawn from that point in any
+ *     direction will pass through an odd number of
+ *     path segments.
+ *     By the winding number rule, a point is decided
+ *     to be inside the polygon if a ray drawn from that
+ *     point in any direction passes through a different
+ *     number of clockwise and counter-clockwise path
+ *     segments.
+ *
+ *     These data structures are adapted somewhat from
+ *     the algorithm in (Foley/Van Dam) for scan converting
+ *     polygons.
+ *     The basic algorithm is to start at the top (smallest y)
+ *     of the polygon, stepping down to the bottom of
+ *     the polygon by incrementing the y coordinate.  We
+ *     keep a list of edges which the current scanline crosses,
+ *     sorted by x.  This list is called the Active Edge Table (AET)
+ *     As we change the y-coordinate, we update each entry in
+ *     in the active edge table to reflect the edges new xcoord.
+ *     This list must be sorted at each scanline in case
+ *     two edges intersect.
+ *     We also keep a data structure known as the Edge Table (ET),
+ *     which keeps track of all the edges which the current
+ *     scanline has not yet reached.  The ET is basically a
+ *     list of ScanLineList structures containing a list of
+ *     edges which are entered at a given scanline.  There is one
+ *     ScanLineList per scanline at which an edge is entered.
+ *     When we enter a new edge, we move it from the ET to the AET.
+ *
+ *     From the AET, we can implement the even-odd rule as in
+ *     (Foley/Van Dam).
+ *     The winding number rule is a little trickier.  We also
+ *     keep the EdgeTableEntries in the AET linked by the
+ *     nextWETE (winding EdgeTableEntry) link.  This allows
+ *     the edges to be linked just as before for updating
+ *     purposes, but only uses the edges linked by the nextWETE
+ *     link as edges representing spans of the polygon to
+ *     drawn (as with the even-odd rule).
+ */
+
+/*
+ * for the winding number rule
+ */
+#define CLOCKWISE          1
+#define COUNTERCLOCKWISE  -1
+
+typedef struct _EdgeTableEntry {
+    int ymax;             /* ycoord at which we exit this edge. */
+    BRESINFO bres;        /* Bresenham info to run the edge     */
+    struct _EdgeTableEntry *next;       /* next in the list     */
+    struct _EdgeTableEntry *back;       /* for insertion sort   */
+    struct _EdgeTableEntry *nextWETE;   /* for winding num rule */
+    int ClockWise;        /* flag for winding number rule       */
+} EdgeTableEntry;
+
+
+typedef struct _ScanLineList{
+    int scanline;              /* the scanline represented */
+    EdgeTableEntry *edgelist;  /* header node              */
+    struct _ScanLineList *next;  /* next in the list       */
+} ScanLineList;
+
+
+typedef struct {
+    int ymax;                 /* ymax for the polygon     */
+    int ymin;                 /* ymin for the polygon     */
+    ScanLineList scanlines;   /* header node              */
+} EdgeTable;
+
+
+/*
+ * Here is a struct to help with storage allocation
+ * so we can allocate a big chunk at a time, and then take
+ * pieces from this heap when we need to.
+ */
+#define SLLSPERBLOCK 25
+
+typedef struct _ScanLineListBlock {
+    ScanLineList SLLs[SLLSPERBLOCK];
+    struct _ScanLineListBlock *next;
+} ScanLineListBlock;
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+
+/*
+ *
+ *     a few macros for the inner loops of the fill code where
+ *     performance considerations don't allow a procedure call.
+ *
+ *     Evaluate the given edge at the given scanline.
+ *     If the edge has expired, then we leave it and fix up
+ *     the active edge table; otherwise, we increment the
+ *     x value to be ready for the next scanline.
+ *     The winding number rule is in effect, so we must notify
+ *     the caller when the edge has been removed so he
+ *     can reorder the Winding Active Edge Table.
+ */
+#define EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET) { \
+if (pAET->ymax == y) {          /* leaving this edge */ \
+pPrevAET->next = pAET->next; \
+pAET = pPrevAET->next; \
+fixWAET = 1; \
+if (pAET) \
+pAET->back = pPrevAET; \
+} \
+else { \
+BRESINCRPGONSTRUCT(pAET->bres); \
+pPrevAET = pAET; \
+pAET = pAET->next; \
+} \
+}
+
+
+/*
+ *     Evaluate the given edge at the given scanline.
+ *     If the edge has expired, then we leave it and fix up
+ *     the active edge table; otherwise, we increment the
+ *     x value to be ready for the next scanline.
+ *     The even-odd rule is in effect.
+ */
+#define EVALUATEEDGEEVENODD(pAET, pPrevAET, y) { \
+if (pAET->ymax == y) {          /* leaving this edge */ \
+pPrevAET->next = pAET->next; \
+pAET = pPrevAET->next; \
+if (pAET) \
+pAET->back = pPrevAET; \
+} \
+else { \
+BRESINCRPGONSTRUCT(pAET->bres); \
+pPrevAET = pAET; \
+pAET = pAET->next; \
+} \
+}
+
+/* mipolyutil.c */
+
+static bool miCreateETandAET(
+                             int /*count*/,
+                             const wxPoint * /*pts*/,
+                             EdgeTable * /*ET*/,
+                             EdgeTableEntry * /*AET*/,
+                             EdgeTableEntry * /*pETEs*/,
+                             ScanLineListBlock * /*pSLLBlock*/
+                             );
+
+static void miloadAET(
+                      EdgeTableEntry * /*AET*/,
+                      EdgeTableEntry * /*ETEs*/
+                      );
+
+static void micomputeWAET(
+                          EdgeTableEntry * /*AET*/
+                          );
+
+static int miInsertionSort(
+                           EdgeTableEntry * /*AET*/
+                           );
+
+static void miFreeStorage(
+                          ScanLineListBlock * /*pSLLBlock*/
+                          );
+
+/*
+ *     fillUtils.c
+ *
+ *     Written by Brian Kelleher;  Oct. 1985
+ *
+ *     This module contains all of the utility functions
+ *     needed to scan convert a polygon.
+ *
+ */
+
+/*
+ *     InsertEdgeInET
+ *
+ *     Insert the given edge into the edge table.
+ *     First we must find the correct bucket in the
+ *     Edge table, then find the right slot in the
+ *     bucket.  Finally, we can insert it.
+ *
+ */
+static bool
+miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,  int scanline,
+                 ScanLineListBlock **SLLBlock, int *iSLLBlock)
+{
+    EdgeTableEntry *start, *prev;
+    ScanLineList *pSLL, *pPrevSLL;
+    ScanLineListBlock *tmpSLLBlock;
+    
+    /*
+     * find the right bucket to put the edge into
+     */
+    pPrevSLL = &ET->scanlines;
+    pSLL = pPrevSLL->next;
+    while (pSLL && (pSLL->scanline < scanline))
+    {
+        pPrevSLL = pSLL;
+        pSLL = pSLL->next;
+    }
+    
+    /*
+     * reassign pSLL (pointer to ScanLineList) if necessary
+     */
+    if ((!pSLL) || (pSLL->scanline > scanline))
+    {
+        if (*iSLLBlock > SLLSPERBLOCK-1)
+        {
+            tmpSLLBlock =
+            (ScanLineListBlock *)malloc(sizeof(ScanLineListBlock));
+            if (!tmpSLLBlock)
+                return FALSE;
+            (*SLLBlock)->next = tmpSLLBlock;
+            tmpSLLBlock->next = (ScanLineListBlock *)NULL;
+            *SLLBlock = tmpSLLBlock;
+            *iSLLBlock = 0;
+        }
+        pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]);
+        
+        pSLL->next = pPrevSLL->next;
+        pSLL->edgelist = (EdgeTableEntry *)NULL;
+        pPrevSLL->next = pSLL;
+    }
+    pSLL->scanline = scanline;
+    
+    /*
+     * now insert the edge in the right bucket
+     */
+    prev = (EdgeTableEntry *)NULL;
+    start = pSLL->edgelist;
+    while (start && (start->bres.minor < ETE->bres.minor))
+    {
+        prev = start;
+        start = start->next;
+    }
+    ETE->next = start;
+    
+    if (prev)
+        prev->next = ETE;
+    else
+        pSLL->edgelist = ETE;
+    return TRUE;
+}
+
+/*
+ *     CreateEdgeTable
+ *
+ *     This routine creates the edge table for
+ *     scan converting polygons.
+ *     The Edge Table (ET) looks like:
+ *
+ *    EdgeTable
+ *     --------
+ *    |  ymax  |        ScanLineLists
+ *    |scanline|-->------------>-------------->...
+ *     --------   |scanline|   |scanline|
+ *                |edgelist|   |edgelist|
+ *                ---------    ---------
+ *                    |             |
+ *                    |             |
+ *                    V             V
+ *              list of ETEs   list of ETEs
+ *
+ *     where ETE is an EdgeTableEntry data structure,
+ *     and there is one ScanLineList per scanline at
+ *     which an edge is initially entered.
+ *
+ */
+
+static bool
+miCreateETandAET(int count, const wxPoint * pts, EdgeTable *ET, EdgeTableEntry *AET,
+                 EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock)
+{
+    const wxPoint* top, *bottom;
+    const wxPoint* PrevPt, *CurrPt;
+    int iSLLBlock = 0;
+    
+    int dy;
+    
+    if (count < 2)  return TRUE;
+    
+    /*
+     *  initialize the Active Edge Table
+     */
+    AET->next = (EdgeTableEntry *)NULL;
+    AET->back = (EdgeTableEntry *)NULL;
+    AET->nextWETE = (EdgeTableEntry *)NULL;
+    AET->bres.minor = INT_MIN;
+    
+    /*
+     *  initialize the Edge Table.
+     */
+    ET->scanlines.next = (ScanLineList *)NULL;
+    ET->ymax = INT_MIN;
+    ET->ymin = INT_MAX;
+    pSLLBlock->next = (ScanLineListBlock *)NULL;
+    
+    PrevPt = &pts[count-1];
+    
+    /*
+     *  for each vertex in the array of points.
+     *  In this loop we are dealing with two vertices at
+     *  a time -- these make up one edge of the polygon.
+     */
+    while (count--)
+    {
+        CurrPt = pts++;
+        
+        /*
+         *  find out which point is above and which is below.
+         */
+        if (PrevPt->y > CurrPt->y)
+        {
+            bottom = PrevPt, top = CurrPt;
+            pETEs->ClockWise = 0;
+        }
+        else
+        {
+            bottom = CurrPt, top = PrevPt;
+            pETEs->ClockWise = 1;
+        }
+        
+        /*
+         * don't add horizontal edges to the Edge table.
+         */
+        if (bottom->y != top->y)
+        {
+            pETEs->ymax = bottom->y-1;  /* -1 so we don't get last scanline */
+            
+            /*
+             *  initialize integer edge algorithm
+             */
+            dy = bottom->y - top->y;
+            BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres);
+            
+            if (!miInsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock))
+            {
+                miFreeStorage(pSLLBlock->next);
+                return FALSE;
+            }
+            
+            ET->ymax = wxMax(ET->ymax, PrevPt->y);
+            ET->ymin = wxMin(ET->ymin, PrevPt->y);
+            pETEs++;
+        }
+        
+        PrevPt = CurrPt;
+    }
+    return TRUE;
+}
+
+/*
+ *     loadAET
+ *
+ *     This routine moves EdgeTableEntries from the
+ *     EdgeTable into the Active Edge Table,
+ *     leaving them sorted by smaller x coordinate.
+ *
+ */
+
+static void
+miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs)
+{
+    EdgeTableEntry *pPrevAET;
+    EdgeTableEntry *tmp;
+    
+    pPrevAET = AET;
+    AET = AET->next;
+    while (ETEs)
+    {
+        while (AET && (AET->bres.minor < ETEs->bres.minor))
+        {
+            pPrevAET = AET;
+            AET = AET->next;
+        }
+        tmp = ETEs->next;
+        ETEs->next = AET;
+        if (AET)
+            AET->back = ETEs;
+        ETEs->back = pPrevAET;
+        pPrevAET->next = ETEs;
+        pPrevAET = ETEs;
+        
+        ETEs = tmp;
+    }
+}
+
+/*
+ *     computeWAET
+ *
+ *     This routine links the AET by the
+ *     nextWETE (winding EdgeTableEntry) link for
+ *     use by the winding number rule.  The final
+ *     Active Edge Table (AET) might look something
+ *     like:
+ *
+ *     AET
+ *     ----------  ---------   ---------
+ *     |ymax    |  |ymax    |  |ymax    |
+ *     | ...    |  |...     |  |...     |
+ *     |next    |->|next    |->|next    |->...
+ *     |nextWETE|  |nextWETE|  |nextWETE|
+ *     ---------   ---------   ^--------
+ *         |                   |       |
+ *         V------------------->       V---> ...
+ *
+ */
+static void
+micomputeWAET(EdgeTableEntry *AET)
+{
+    EdgeTableEntry *pWETE;
+    int inside = 1;
+    int isInside = 0;
+    
+    AET->nextWETE = (EdgeTableEntry *)NULL;
+    pWETE = AET;
+    AET = AET->next;
+    while (AET)
+    {
+        if (AET->ClockWise)
+            isInside++;
+        else
+            isInside--;
+        
+        if ((!inside && !isInside) ||
+            ( inside &&  isInside))
+        {
+            pWETE->nextWETE = AET;
+            pWETE = AET;
+            inside = !inside;
+        }
+        AET = AET->next;
+    }
+    pWETE->nextWETE = (EdgeTableEntry *)NULL;
+}
+
+/*
+ *     InsertionSort
+ *
+ *     Just a simple insertion sort using
+ *     pointers and back pointers to sort the Active
+ *     Edge Table.
+ *
+ */
+
+static int
+miInsertionSort(EdgeTableEntry *AET)
+{
+    EdgeTableEntry *pETEchase;
+    EdgeTableEntry *pETEinsert;
+    EdgeTableEntry *pETEchaseBackTMP;
+    int changed = 0;
+    
+    AET = AET->next;
+    while (AET)
+    {
+        pETEinsert = AET;
+        pETEchase = AET;
+        while (pETEchase->back->bres.minor > AET->bres.minor)
+            pETEchase = pETEchase->back;
+        
+        AET = AET->next;
+        if (pETEchase != pETEinsert)
+        {
+            pETEchaseBackTMP = pETEchase->back;
+            pETEinsert->back->next = AET;
+            if (AET)
+                AET->back = pETEinsert->back;
+            pETEinsert->next = pETEchase;
+            pETEchase->back->next = pETEinsert;
+            pETEchase->back = pETEinsert;
+            pETEinsert->back = pETEchaseBackTMP;
+            changed = 1;
+        }
+    }
+    return(changed);
+}
+
+/*
+ *     Clean up our act.
+ */
+static void
+miFreeStorage(ScanLineListBlock *pSLLBlock)
+{
+    ScanLineListBlock   *tmpSLLBlock;
+    
+    while (pSLLBlock) 
+    {
+        tmpSLLBlock = pSLLBlock->next;
+        free(pSLLBlock);
+        pSLLBlock = tmpSLLBlock;
+    }
+}
+
+/* mipolygen.c */
+
+static bool
+scanFillGeneralPoly( wxRegion* rgn,
+                  int   count,              /* number of points        */
+                  const wxPoint *ptsIn,               /* the points              */
+                  wxPolygonFillMode fillStyle
+                  )
+{
+    EdgeTableEntry *pAET;  /* the Active Edge Table   */
+    int y;                 /* the current scanline    */
+    int nPts = 0;          /* number of pts in buffer */
+    EdgeTableEntry *pWETE; /* Winding Edge Table      */
+    ScanLineList *pSLL;    /* Current ScanLineList    */
+    wxPoint * ptsOut;      /* ptr to output buffers   */
+    int *width;
+    wxPoint FirstPoint[NUMPTSTOBUFFER]; /* the output buffers */
+    int FirstWidth[NUMPTSTOBUFFER];
+    EdgeTableEntry *pPrevAET;       /* previous AET entry      */
+    EdgeTable ET;                   /* Edge Table header node  */
+    EdgeTableEntry AET;             /* Active ET header node   */
+    EdgeTableEntry *pETEs;          /* Edge Table Entries buff */
+    ScanLineListBlock SLLBlock;     /* header for ScanLineList */
+    int fixWAET = 0;
+    
+    if (count < 3)
+        return(TRUE);
+    
+    if(!(pETEs = (EdgeTableEntry *)
+         malloc(sizeof(EdgeTableEntry) * count)))
+        return(FALSE);
+    ptsOut = FirstPoint;
+    width = FirstWidth;
+    if (!miCreateETandAET(count, ptsIn, &ET, &AET, pETEs, &SLLBlock))
+    {
+        free(pETEs);
+        return(FALSE);
+    }
+    pSLL = ET.scanlines.next;
+    
+    if (fillStyle == wxODDEVEN_RULE)
+    {
+        /*
+         *  for each scanline
+         */
+        for (y = ET.ymin; y < ET.ymax; y++)
+        {
+            /*
+             *  Add a new edge to the active edge table when we
+             *  get to the next edge.
+             */
+            if (pSLL && y == pSLL->scanline)
+            {
+                miloadAET(&AET, pSLL->edgelist);
+                pSLL = pSLL->next;
+            }
+            pPrevAET = &AET;
+            pAET = AET.next;
+            
+            /*
+             *  for each active edge
+             */
+            while (pAET)
+            {
+                ptsOut->x = pAET->bres.minor;
+                ptsOut++->y = y;
+                *width++ = pAET->next->bres.minor - pAET->bres.minor;
+                nPts++;
+                
+                /*
+                 *  send out the buffer when its full
+                 */
+                if (nPts == NUMPTSTOBUFFER)
+                {
+                    // (*pgc->ops->FillSpans)(dst, pgc,
+                    //     nPts, FirstPoint, FirstWidth,1);
+                    
+                    for ( int i = 0 ; i < nPts; ++i)
+                    {
+                        wxRect rect;
+                        rect.y = FirstPoint[i].y;
+                        rect.x = FirstPoint[i].x;
+                        rect.height = 1;
+                        rect.width = FirstWidth[i];
+                        rgn->Union(rect);
+                    }
+                    ptsOut = FirstPoint;
+                    width = FirstWidth;
+                    nPts = 0;
+                }
+                EVALUATEEDGEEVENODD(pAET, pPrevAET, y)
+                EVALUATEEDGEEVENODD(pAET, pPrevAET, y);
+            }
+            miInsertionSort(&AET);
+        }
+    }
+    else      /* default to WindingNumber */
+    {
+        /*
+         *  for each scanline
+         */
+        for (y = ET.ymin; y < ET.ymax; y++)
+        {
+            /*
+             *  Add a new edge to the active edge table when we
+             *  get to the next edge.
+             */
+            if (pSLL && y == pSLL->scanline)
+            {
+                miloadAET(&AET, pSLL->edgelist);
+                micomputeWAET(&AET);
+                pSLL = pSLL->next;
+            }
+            pPrevAET = &AET;
+            pAET = AET.next;
+            pWETE = pAET;
+            
+            /*
+             *  for each active edge
+             */
+            while (pAET)
+            {
+                /*
+                 *  if the next edge in the active edge table is
+                 *  also the next edge in the winding active edge
+                 *  table.
+                 */
+                if (pWETE == pAET)
+                {
+                    ptsOut->x = pAET->bres.minor;
+                    ptsOut++->y = y;
+                    *width++ = pAET->nextWETE->bres.minor - pAET->bres.minor;
+                    nPts++;
+                    
+                    /*
+                     *  send out the buffer
+                     */
+                    if (nPts == NUMPTSTOBUFFER)
+                    {
+                        // (*pgc->ops->FillSpans)(dst, pgc,
+                        //     nPts, FirstPoint, FirstWidth,1);
+                        for ( int i = 0 ; i < nPts ; ++i)
+                        {
+                            wxRect rect;
+                            rect.y = FirstPoint[i].y;
+                            rect.x = FirstPoint[i].x;
+                            rect.height = 1;
+                            rect.width = FirstWidth[i];
+                            rgn->Union(rect);
+                        }
+                        ptsOut = FirstPoint;
+                        width  = FirstWidth;
+                        nPts = 0;
+                    }
+                    
+                    pWETE = pWETE->nextWETE;
+                    while (pWETE != pAET)
+                        EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET);
+                    pWETE = pWETE->nextWETE;
+                }
+                EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET);
+            }
+            
+            /*
+             *  reevaluate the Winding active edge table if we
+             *  just had to resort it or if we just exited an edge.
+             */
+            if (miInsertionSort(&AET) || fixWAET)
+            {
+                micomputeWAET(&AET);
+                fixWAET = 0;
+            }
+        }
+    }
+    
+    /*
+     *     Get any spans that we missed by buffering
+     */
+    // (*pgc->ops->FillSpans)(dst, pgc,
+    //     nPts, FirstPoint, FirstWidth,1);
+    for ( int i = 0 ; i < nPts; ++i)
+    {
+        wxRect rect;
+        rect.y = FirstPoint[i].y;
+        rect.x = FirstPoint[i].x;
+        rect.height = 1;
+        rect.width = FirstWidth[i];
+        rgn->Union(rect);
+    }
+
+    free(pETEs);
+    miFreeStorage(SLLBlock.next);
+    return(TRUE);
+}
+
+#endif
+
 wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
 {
     // Set the region to a polygon shape generically using a bitmap with the 
     // polygon drawn on it. 
  
     m_refData = new wxRegionRefData(); 
-     
+    
+#if OSX_USE_SCANLINES
+    scanFillGeneralPoly(this,n,points,fillStyle);
+#else
     wxCoord mx = 0; 
     wxCoord my = 0; 
     wxPoint p; 
@@ -125,7 +981,8 @@ wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
     bmp.SetMask(new wxMask(bmp, *wxBLACK)); 
  
     // Use it to set this region 
-    Union(bmp); 
+    Union(bmp);
+#endif
 }
 
 wxRegion::~wxRegion()
@@ -169,6 +1026,21 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
     return true ;
 }
 
+bool wxRegion::DoUnionWithRect(const wxRect& rect)
+{
+    if ( !m_refData )
+    {
+        m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height);
+        return true;
+    }
+    
+    AllocExclusive();
+    
+    CGRect r = CGRectMake(rect.x , rect.y , rect.width , rect.height);
+    HIShapeUnionWithRect(M_REGION , &r);
+    
+    return true;
+}
 
 //! Union /e region with this.
 bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
@@ -303,7 +1175,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
     if (!m_refData)
         return wxOutRegion;
 
-    CGPoint p = { x, y } ;
+    CGPoint p = CGPointMake( x, y ) ;
     if (HIShapeContainsPoint( M_REGION , &p ) )
         return wxInRegion;
 
@@ -406,40 +1278,6 @@ public :
     long m_current ;
 };
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-
-OSStatus wxMacRegionToRectsCounterCallback(
-    UInt16 message, RgnHandle WXUNUSED(region), const Rect *WXUNUSED(rect), void *data )
-{
-    long *m_numRects = (long*) data ;
-    if ( message == kQDRegionToRectsMsgInit )
-    {
-        (*m_numRects) = 0 ;
-    }
-    else if (message == kQDRegionToRectsMsgParse)
-    {
-        (*m_numRects) += 1 ;
-    }
-
-    return noErr;
-}
-
-OSStatus wxMacRegionToRectsSetterCallback(
-    UInt16 message, RgnHandle WXUNUSED(region), const Rect *rect, void *data )
-{
-    if (message == kQDRegionToRectsMsgParse)
-    {
-        RegionToRectsCallbackData *cb = (RegionToRectsCallbackData*) data ;
-        cb->m_rects[cb->m_current++] = wxRect( rect->left , rect->top , rect->right - rect->left , rect->bottom - rect->top ) ;
-    }
-
-    return noErr;
-}
-
-#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-
 OSStatus wxOSXRegionToRectsCounterCallback(
     int message, HIShapeRef WXUNUSED(region), const CGRect *WXUNUSED(rect), void *data )
 {
@@ -468,8 +1306,6 @@ OSStatus wxOSXRegionToRectsSetterCallback(
     return noErr;
 }
 
-#endif
-
 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_current = 0;
@@ -490,51 +1326,20 @@ void wxRegionIterator::Reset(const wxRegion& region)
         m_rects = new wxRect[m_numRects];
         m_rects[0] = m_region.GetBox();
 #endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        if ( HIShapeEnumerate != NULL )
+        OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
+            (void*)&m_numRects);
+        if (err == noErr)
         {
-            OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
-                (void*)&m_numRects);
-            if (err == noErr)
-            {
-                m_rects = new wxRect[m_numRects];
-                RegionToRectsCallbackData data ;
-                data.m_rects = m_rects ;
-                data.m_current = 0 ;
-                HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
-                    (void*)&data );
-            }
-            else
-            {
-                m_numRects = 0;
-            }
+            m_rects = new wxRect[m_numRects];
+            RegionToRectsCallbackData data ;
+            data.m_rects = m_rects ;
+            data.m_current = 0 ;
+            HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
+                (void*)&data );
         }
         else
-#endif
         {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-            OSStatus err = noErr;
-            RgnHandle rgn = NewRgn();
-            HIShapeGetAsQDRgn(OTHER_M_REGION(region), rgn);
-
-            err = QDRegionToRects (rgn, kQDParseRegionFromTopLeft, wxMacRegionToRectsCounterCallback
-                , (void*)&m_numRects);
-            if (err == noErr)
-            {
-                m_rects = new wxRect[m_numRects];
-                RegionToRectsCallbackData data ;
-                data.m_rects = m_rects ;
-                data.m_current = 0 ;
-                QDRegionToRects( rgn , kQDParseRegionFromTopLeft, wxMacRegionToRectsSetterCallback,
-                    (void*)&data );
-            }
-            else
-            {
-                m_numRects = 0;
-            }
-            DisposeRgn( rgn );
-#endif
+            m_numRects = 0;
         }
     }
 }
diff --git a/Externals/wxWidgets3/src/osx/carbon/renderer.cpp b/Externals/wxWidgets3/src/osx/carbon/renderer.cpp
index 38d3dc298b..4669639e79 100644
--- a/Externals/wxWidgets3/src/osx/carbon/renderer.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/renderer.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderer.cpp 68148 2011-07-04 14:05:14Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +30,7 @@
 #include "wx/renderer.h"
 #include "wx/graphics.h"
 #include "wx/dcgraph.h"
+#include "wx/splitter.h"
 #include "wx/osx/private.h"
 
 #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -123,6 +123,8 @@ public:
                                     int flags = 0);
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+
 private:
     void DrawMacThemeButton(wxWindow *win,
                             wxDC& dc,
@@ -182,7 +184,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
             drawInfo.version = 0;
             drawInfo.kind = kThemeListHeaderButton;
             drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
-            drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
+            drawInfo.value = (flags & wxCONTROL_PRESSED) ? kThemeButtonOn : kThemeButtonOff;
             drawInfo.adornment = kThemeAdornmentNone;
 
             // The down arrow is drawn automatically, change it to an up arrow if needed.
@@ -192,7 +194,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             // If we don't want any arrows we need to draw over the one already there
-            if ( (flags & wxCONTROL_SELECTED) && (sortArrow == wxHDR_SORT_ICON_NONE) )
+            if ( (flags & wxCONTROL_PRESSED) && (sortArrow == wxHDR_SORT_ICON_NONE) )
             {
                 // clip to the header rectangle
                 CGContextSaveGState( cgContext );
@@ -208,12 +210,12 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
     // Reserve room for the arrows before writing the label, and turn off the
     // flags we've already handled
     wxRect newRect(rect);
-    if ( (flags & wxCONTROL_SELECTED) && (sortArrow != wxHDR_SORT_ICON_NONE) )
+    if ( (flags & wxCONTROL_PRESSED) && (sortArrow != wxHDR_SORT_ICON_NONE) )
     {
         newRect.width -= 12;
         sortArrow = wxHDR_SORT_ICON_NONE;
     }
-    flags &= ~wxCONTROL_SELECTED;
+    flags &= ~wxCONTROL_PRESSED;
 
     return DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);
 }
@@ -279,6 +281,37 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
     }
 }
 
+wxSplitterRenderParams
+wxRendererMac::GetSplitterParams(const wxWindow *win)
+{
+    // see below
+    SInt32 sashWidth,
+            border;
+#if wxOSX_USE_COCOA
+    if ( win->HasFlag(wxSP_3DSASH) )
+        GetThemeMetric( kThemeMetricPaneSplitterHeight, &sashWidth ); // Cocoa == Carbon == 7
+    else if ( win->HasFlag(wxSP_NOSASH) ) // actually Cocoa doesn't allow 0
+        sashWidth = 0;
+    else // no 3D effect - Cocoa [NSSplitView dividerThickNess] for NSSplitViewDividerStyleThin
+        sashWidth = 1;
+#else // Carbon
+    if ( win->HasFlag(wxSP_3DSASH) )
+        GetThemeMetric( kThemeMetricPaneSplitterHeight, &sashWidth );
+    else if ( win->HasFlag(wxSP_NOSASH) )
+        sashWidth = 0;
+    else // no 3D effect
+        GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &sashWidth );
+#endif // Cocoa/Carbon
+
+    if ( win->HasFlag(wxSP_3DBORDER) )
+        border = 2;
+    else // no 3D effect
+        border = 0;
+
+    return wxSplitterRenderParams(sashWidth, border, false);
+}
+
+
 void wxRendererMac::DrawSplitterSash( wxWindow *win,
     wxDC& dc,
     const wxSize& size,
@@ -288,7 +321,9 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
 {
     bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL;
     SInt32 height;
-    GetThemeMetric( kThemeMetricSmallPaneSplitterHeight, &height );
+
+    height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
+
     HIRect splitterRect;
     if (orient == wxVERTICAL)
         splitterRect = CGRectMake( position, 0, height, size.y );
@@ -323,11 +358,14 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
             CGContextFillRect(cgContext,splitterRect);
         }
 
-        HIThemeSplitterDrawInfo drawInfo;
-        drawInfo.version = 0;
-        drawInfo.state = kThemeStateActive;
-        drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
-        HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
+        if ( win->HasFlag(wxSP_3DSASH) )
+        {
+            HIThemeSplitterDrawInfo drawInfo;
+            drawInfo.version = 0;
+            drawInfo.state = kThemeStateActive;
+            drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
+            HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
+        }
     }
 }
 
@@ -385,7 +423,7 @@ wxRendererMac::DrawMacThemeButton(wxWindow *win,
         drawInfo.version = 0;
         drawInfo.kind = kind;
         drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
-        drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
+        drawInfo.value = (flags & wxCONTROL_PRESSED) ? kThemeButtonOn : kThemeButtonOff;
         if (flags & wxCONTROL_UNDETERMINED)
             drawInfo.value = kThemeButtonMixed;
         drawInfo.adornment = adornment;
@@ -403,7 +441,7 @@ wxRendererMac::DrawCheckBox(wxWindow *win,
                             int flags)
 {
     if (flags & wxCONTROL_CHECKED)
-        flags |= wxCONTROL_SELECTED;
+        flags |= wxCONTROL_PRESSED;
 
     int kind;
 
@@ -555,7 +593,7 @@ void wxRendererMac::DrawRadioBitmap(wxWindow* win, wxDC& dc,
         kind = kThemeRadioButton;
 
     if (flags & wxCONTROL_CHECKED)
-        flags |= wxCONTROL_SELECTED;
+        flags |= wxCONTROL_PRESSED;
 
     DrawMacThemeButton(win, dc, rect, flags,
                           kind, kThemeAdornmentNone);
diff --git a/Externals/wxWidgets3/src/osx/carbon/scrolbar.cpp b/Externals/wxWidgets3/src/osx/carbon/scrolbar.cpp
index 7e784b4326..006e93a351 100644
--- a/Externals/wxWidgets3/src/osx/carbon/scrolbar.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/scrolbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: scrolbar.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/settings.cpp b/Externals/wxWidgets3/src/osx/carbon/settings.cpp
index 38866268ed..193da854b3 100644
--- a/Externals/wxWidgets3/src/osx/carbon/settings.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/settings.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: settings.cpp 67018 2011-02-25 09:38:35Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/slider.cpp b/Externals/wxWidgets3/src/osx/carbon/slider.cpp
index 38f88781af..e5f6f3f4b5 100644
--- a/Externals/wxWidgets3/src/osx/carbon/slider.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/slider.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider.cpp 67416 2011-04-08 15:09:38Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +47,7 @@ wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
     if ( style & wxSL_AUTOTICKS )
         tickMarks = (maximum - minimum) + 1; // +1 for the 0 value
 
-    // keep the number of tickmarks from becoming unwieldly, therefore below it is ok to cast
+    // keep the number of tickmarks from becoming unwieldy, therefore below it is ok to cast
     // it to a UInt16
     while (tickMarks > 20)
         tickMarks /= 5;
diff --git a/Externals/wxWidgets3/src/osx/carbon/sound.cpp b/Externals/wxWidgets3/src/osx/carbon/sound.cpp
index 63681725bd..7fadb12eaa 100644
--- a/Externals/wxWidgets3/src/osx/carbon/sound.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/sound.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by: Stefan Csomor
 // Created:     1998-01-01
-// RCS-ID:      $Id: sound.cpp 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/spinbutt.cpp b/Externals/wxWidgets3/src/osx/carbon/spinbutt.cpp
index abe9e81628..061956428e 100644
--- a/Externals/wxWidgets3/src/osx/carbon/spinbutt.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/spinbutt.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: spinbutt.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/srchctrl.cpp b/Externals/wxWidgets3/src/osx/carbon/srchctrl.cpp
index 777628d0a5..56056d95a5 100644
--- a/Externals/wxWidgets3/src/osx/carbon/srchctrl.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/srchctrl.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements mac carbon wxSearchCtrl
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctrl.cpp 66826 2011-02-02 07:55:57Z SC $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/statbmp.cpp b/Externals/wxWidgets3/src/osx/carbon/statbmp.cpp
index 2c4f291b48..7a4ed047a5 100644
--- a/Externals/wxWidgets3/src/osx/carbon/statbmp.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/statbmp.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbmp.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/statbox.cpp b/Externals/wxWidgets3/src/osx/carbon/statbox.cpp
index f254906fb8..5e5d9027ac 100644
--- a/Externals/wxWidgets3/src/osx/carbon/statbox.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/statbox.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbox.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/statbrma.cpp b/Externals/wxWidgets3/src/osx/carbon/statbrma.cpp
index 7985a3f977..cc7e463ba1 100644
--- a/Externals/wxWidgets3/src/osx/carbon/statbrma.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/statbrma.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbrma.cpp 61624 2009-08-06 00:01:43Z VZ $
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -114,7 +113,11 @@ void wxStatusBarMac::DoUpdateStatusText(int number)
     rect.height = h ;
 
     Refresh( true, &rect );
+    // we should have to force the update here
+    // TODO Remove if no regressions occur
+#if 0
     Update();
+#endif
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
diff --git a/Externals/wxWidgets3/src/osx/carbon/statline.cpp b/Externals/wxWidgets3/src/osx/carbon/statline.cpp
index 2d75520df6..62a3db302c 100644
--- a/Externals/wxWidgets3/src/osx/carbon/statline.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/statline.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.cpp 66555 2011-01-04 08:31:53Z SC $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/statlmac.cpp b/Externals/wxWidgets3/src/osx/carbon/statlmac.cpp
index 9380d6f9a8..415d236f5a 100644
--- a/Externals/wxWidgets3/src/osx/carbon/statlmac.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/statlmac.cpp
@@ -3,7 +3,6 @@
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statlmac.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/stattext.cpp b/Externals/wxWidgets3/src/osx/carbon/stattext.cpp
index 5536aa1d36..8b0c9714c4 100644
--- a/Externals/wxWidgets3/src/osx/carbon/stattext.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/stattext.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/taskbar.cpp b/Externals/wxWidgets3/src/osx/carbon/taskbar.cpp
index 9eb7e26191..f8a8c4821e 100644
--- a/Externals/wxWidgets3/src/osx/carbon/taskbar.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/taskbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     09/25/2004
-// RCS-ID:      $Id: taskbar.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2004 Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,7 +59,7 @@ public:
         : wxTopLevelWindow(NULL, wxID_ANY, wxEmptyString), m_impl(impl)
     {
         Connect(
-            -1, wxEVT_COMMAND_MENU_SELECTED,
+            -1, wxEVT_MENU,
             wxCommandEventHandler(wxTaskBarIconWindow::OnMenuEvent) );
     }
 
@@ -241,7 +240,7 @@ wxDockEventHandler(EventHandlerCallRef WXUNUSED(inHandlerCallRef),
 // Performs a top-to-bottom copy of the input menu and all of its
 // submenus.
 //
-// This is mostly needed for 2.4 compatability. However wxPython and others
+// This is mostly needed for 2.4 compatibility. However wxPython and others
 // still use this way of setting the taskbarmenu.
 //-----------------------------------------------------------------------------
 wxMenu * wxDeepCopyMenu( wxMenu *menu )
@@ -463,14 +462,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 //
 // Note that we only support DOCK currently as others require cocoa and
 // also some require hacks and other such things. (MenuExtras are
-// actually seperate programs that also require a special undocumented id
+// actually separate programs that also require a special undocumented id
 // hack and other such fun stuff).
 //-----------------------------------------------------------------------------
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED_UNLESS_DEBUG(nType))
 {
     wxASSERT_MSG(
-        nType == DOCK,
-        wxT("Only the DOCK implementation of wxTaskBarIcon on Mac-Carbon is currently supported!") );
+        nType == wxTBI_DOCK,
+        wxT("Only the wxTBI_DOCK implementation of wxTaskBarIcon on Mac-Carbon is currently supported!") );
 
     m_impl = new wxDockTaskBarIcon(this);
 }
diff --git a/Externals/wxWidgets3/src/osx/carbon/textctrl.cpp b/Externals/wxWidgets3/src/osx/carbon/textctrl.cpp
index c3f0ecf999..53a0f908d0 100644
--- a/Externals/wxWidgets3/src/osx/carbon/textctrl.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/textctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
-// RCS-ID:      $Id: textctrl.cpp 66028 2010-11-05 21:38:25Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -370,41 +369,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
                                     long style,
                                     long WXUNUSED(extraStyle))
 {
-    bool forceMLTE = false ;
-
-#if wxUSE_SYSTEM_OPTIONS
-    if (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1))
-    {
-        forceMLTE = true ;
-    }
-#endif
-
-    if ( UMAGetSystemVersion() >= 0x1050 )
-        forceMLTE = false;
-
-    wxMacControl*  peer = NULL;
-
-    if ( !forceMLTE )
-    {
-        if ( style & wxTE_MULTILINE || ( UMAGetSystemVersion() >= 0x1050 ) )
-            peer = new wxMacMLTEHIViewControl( wxpeer , str , pos , size , style ) ;
-    }
-
-    if ( !peer )
-    {
-        if ( !(style & wxTE_MULTILINE) && !forceMLTE )
-        {
-            peer = new wxMacUnicodeTextControl( wxpeer , str , pos , size , style ) ;
-        }
-    }
-
-    // the horizontal single line scrolling bug that made us keep the classic implementation
-    // is fixed in 10.5
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-    if ( !peer )
-        peer = new wxMacMLTEClassicControl( wxpeer , str , pos , size , style ) ;
-#endif
-    return peer;
+    return new wxMacMLTEHIViewControl( wxpeer , str , pos , size , style ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -434,7 +399,7 @@ static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerC
             ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
             if ( controlPart == kControlFocusNoPart )
             {
-                // about to loose focus -> store selection to field
+                // about to lose focus -> store selection to field
                 focus->GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &focus->m_selection );
             }
             result = CallNextEventHandler(handler,event) ;
@@ -1468,674 +1433,6 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const
     return theLength ;
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-
-// ----------------------------------------------------------------------------
-// MLTE control implementation (classic part)
-// ----------------------------------------------------------------------------
-
-// OS X Notes : We still don't have a full replacement for MLTE, so this implementation
-// has to live on. We have different problems coming from outdated implementations on the
-// various OS X versions. Most deal with the scrollbars: they are not correctly embedded
-// while this can be solved on 10.3 by reassigning them the correct place, on 10.2 there is
-// no way out, therefore we are using our own implementation and our own scrollbars ....
-
-TXNScrollInfoUPP gTXNScrollInfoProc = NULL ;
-ControlActionUPP gTXNScrollActionProc = NULL ;
-
-pascal void wxMacMLTEClassicControl::TXNScrollInfoProc(
-    SInt32 iValue, SInt32 iMaximumValue,
-    TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon )
-{
-    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ;
-    SInt32 value =  wxMax( iValue , 0 ) ;
-    SInt32 maximum = wxMax( iMaximumValue , 0 ) ;
-
-    if ( iScrollBarOrientation == kTXNHorizontal )
-    {
-        if ( mlte->m_sbHorizontal )
-        {
-            SetControl32BitValue( mlte->m_sbHorizontal , value ) ;
-            SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ;
-            mlte->m_lastHorizontalValue = value ;
-        }
-    }
-    else if ( iScrollBarOrientation == kTXNVertical )
-    {
-        if ( mlte->m_sbVertical )
-        {
-            SetControl32BitValue( mlte->m_sbVertical , value ) ;
-            SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ;
-            mlte->m_lastVerticalValue = value ;
-        }
-    }
-}
-
-pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode )
-{
-    wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ;
-    if ( mlte == NULL )
-        return ;
-
-    if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal )
-        return ;
-
-    OSStatus err ;
-    bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ;
-
-    SInt32 minimum = 0 ;
-    SInt32 maximum = GetControl32BitMaximum( controlRef ) ;
-    SInt32 value = GetControl32BitValue( controlRef ) ;
-    SInt32 delta = 0;
-
-    switch ( partCode )
-    {
-        case kControlDownButtonPart :
-            delta = 10 ;
-            break ;
-
-        case kControlUpButtonPart :
-            delta = -10 ;
-            break ;
-
-        case kControlPageDownPart :
-            delta = GetControlViewSize( controlRef ) ;
-            break ;
-
-        case kControlPageUpPart :
-            delta = -GetControlViewSize( controlRef ) ;
-            break ;
-
-        case kControlIndicatorPart :
-            delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ;
-            break ;
-
-        default :
-            break ;
-    }
-
-    if ( delta != 0 )
-    {
-        SInt32 newValue = value ;
-
-        if ( partCode != kControlIndicatorPart )
-        {
-            if ( value + delta < minimum )
-                delta = minimum - value ;
-            if ( value + delta > maximum )
-                delta = maximum - value ;
-
-            SetControl32BitValue( controlRef , value + delta ) ;
-            newValue = value + delta ;
-        }
-
-        SInt32 verticalDelta = isHorizontal ? 0 : delta ;
-        SInt32 horizontalDelta = isHorizontal ? delta : 0 ;
-
-        err = TXNScroll(
-            mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
-            &verticalDelta, &horizontalDelta );
-        verify_noerr( err );
-
-        if ( isHorizontal )
-            mlte->m_lastHorizontalValue = newValue ;
-        else
-            mlte->m_lastVerticalValue = newValue ;
-    }
-}
-
-// make correct activations
-void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive)
-{
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
-
-    wxMacWindowClipper clipper( textctrl ) ;
-    TXNActivate( m_txn, m_txnFrameID, setActive );
-
-    ControlRef controlFocus = 0 ;
-    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
-    if ( controlFocus == m_controlRef )
-        TXNFocus( m_txn, setActive );
-}
-
-void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus)
-{
-    TXNFocus( m_txn, setFocus );
-}
-
-// guards against inappropriate redraw (hidden objects drawing onto window)
-
-void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis)
-{
-    ControlRef controlFocus = 0 ;
-    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
-
-    if ( !vis && (controlFocus == m_controlRef ) )
-        SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
-
-    TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
-    TXNControlData iControlData[1] = { { (UInt32)false } };
-
-    verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;
-
-    if ( iControlData[0].uValue != vis )
-    {
-        iControlData[0].uValue = vis ;
-        verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ;
-    }
-
-    // currently, we always clip as partial visibility (overlapped) visibility is also a problem,
-    // if we run into further problems we might set the FrameBounds to an empty rect here
-}
-
-// make sure that the TXNObject is at the right position
-
-void wxMacMLTEClassicControl::MacUpdatePosition()
-{
-    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
-    if ( textctrl == NULL )
-        return ;
-
-    Rect bounds ;
-    GetRectInWindowCoords( &bounds );
-
-    wxRect visRect = textctrl->MacGetClippedClientRect() ;
-    Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
-    int x , y ;
-    x = y = 0 ;
-    textctrl->MacWindowToRootWindow( &x , &y ) ;
-    OffsetRect( &visBounds , x , y ) ;
-
-    if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )
-    {
-        m_txnControlBounds = bounds ;
-        m_txnVisBounds = visBounds ;
-        wxMacWindowClipper cl( textctrl ) ;
-
-        if ( m_sbHorizontal || m_sbVertical )
-        {
-            int w = bounds.right - bounds.left ;
-            int h = bounds.bottom - bounds.top ;
-
-            if ( m_sbHorizontal )
-            {
-                Rect sbBounds ;
-
-                sbBounds.left = -1 ;
-                sbBounds.top = h - 14 ;
-                sbBounds.right = w + 1 ;
-                sbBounds.bottom = h + 1 ;
-
-                SetControlBounds( m_sbHorizontal , &sbBounds ) ;
-                SetControlViewSize( m_sbHorizontal , w ) ;
-            }
-
-            if ( m_sbVertical )
-            {
-                Rect sbBounds ;
-
-                sbBounds.left = w - 14 ;
-                sbBounds.top = -1 ;
-                sbBounds.right = w + 1 ;
-                sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
-
-                SetControlBounds( m_sbVertical , &sbBounds ) ;
-                SetControlViewSize( m_sbVertical , h ) ;
-            }
-        }
-
-        Rect oldviewRect ;
-        TXNLongRect olddestRect ;
-        TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ;
-
-        Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left,
-            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
-            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
-        TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left,
-            m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) ,
-            m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ;
-
-        if ( olddestRect.right >= 10000 )
-            destRect.right = destRect.left + 32000 ;
-
-        if ( olddestRect.bottom >= 0x20000000 )
-            destRect.bottom = destRect.top + 0x40000000 ;
-
-        SectRect( &viewRect , &visBounds , &viewRect ) ;
-        TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ;
-
-#if 0
-        TXNSetFrameBounds(
-            m_txn,
-            m_txnControlBounds.top,
-            m_txnControlBounds.left,
-            m_txnControlBounds.bottom - (m_sbHorizontal ? 14 : 0),
-            m_txnControlBounds.right - (m_sbVertical ? 14 : 0),
-            m_txnFrameID );
-#endif
-
-        // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
-        // movement, therefore we have to force it
-
-        // this problem has been reported in OSX as well, so we use this here once again
-
-        TXNLongRect textRect ;
-        TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ;
-        if ( textRect.left < m_txnControlBounds.left )
-            TXNShowSelection( m_txn , kTXNShowStart ) ;
-    }
-}
-
-void wxMacMLTEClassicControl::Move(int x, int y, int width, int height)
-{
-    wxMacControl::Move(x,y,width,height) ;
-    MacUpdatePosition() ;
-}
-
-void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 WXUNUSED(thePart))
-{
-    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
-    if ( textctrl == NULL )
-        return ;
-
-    if ( textctrl->IsShownOnScreen() )
-    {
-        wxMacWindowClipper clipper( textctrl ) ;
-        TXNDraw( m_txn , NULL ) ;
-    }
-}
-
-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
-{
-    Point where = { y , x } ;
-    ControlPartCode result = kControlNoPart;
-
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
-    if ( (textctrl != NULL) && textctrl->IsShownOnScreen() )
-    {
-        if (PtInRect( where, &m_txnControlBounds ))
-        {
-            result = kControlEditTextPart ;
-        }
-        else
-        {
-            // sometimes we get the coords also in control local coordinates, therefore test again
-            int x = 0 , y = 0 ;
-            textctrl->MacClientToRootWindow( &x , &y ) ;
-            where.h += x ;
-            where.v += y ;
-
-            if (PtInRect( where, &m_txnControlBounds ))
-                result = kControlEditTextPart ;
-        }
-    }
-
-    return result;
-}
-
-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* WXUNUSED(actionProc) )
-{
-    ControlPartCode result = kControlNoPart;
-
-    wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef );
-    if ( (textctrl != NULL) && textctrl->IsShownOnScreen() )
-    {
-        Point startPt = { y , x } ;
-
-        // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
-        int x = 0 , y = 0 ;
-        textctrl->MacClientToRootWindow( &x , &y ) ;
-        startPt.h += x ;
-        startPt.v += y ;
-
-        switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))
-        {
-            case kControlEditTextPart :
-            {
-                wxMacWindowClipper clipper( textctrl ) ;
-                EventRecord rec ;
-
-                ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
-                TXNClick( m_txn, &rec );
-            }
-                break;
-
-            default :
-                break;
-        }
-    }
-
-    return result;
-}
-
-void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
-{
-    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
-    if ( textctrl == NULL )
-        return ;
-
-    if (textctrl->IsShownOnScreen())
-    {
-        if (IsControlActive(m_controlRef))
-        {
-            Point mousep;
-
-            wxMacWindowClipper clipper( textctrl ) ;
-            GetMouse(&mousep);
-
-            TXNIdle(m_txn);
-
-            if (PtInRect(mousep, &m_txnControlBounds))
-            {
-                RgnHandle theRgn = NewRgn();
-                RectRgn(theRgn, &m_txnControlBounds);
-                TXNAdjustCursor(m_txn, theRgn);
-                DisposeRgn(theRgn);
-            }
-        }
-    }
-}
-
-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
-{
-    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
-    if ( textctrl == NULL )
-        return kControlNoPart;
-
-    wxMacWindowClipper clipper( textctrl ) ;
-
-    EventRecord ev ;
-    memset( &ev , 0 , sizeof( ev ) ) ;
-    ev.what = keyDown ;
-    ev.modifiers = modifiers ;
-    ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask);
-    TXNKeyDown( m_txn , &ev );
-
-    return kControlEntireControl;
-}
-
-void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating)
-{
-    MacActivatePaneText( activating );
-}
-
-wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
-{
-    ControlPartCode focusResult = kControlFocusNoPart;
-
-    wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
-    if ( textctrl == NULL )
-        return focusResult;
-
-    wxMacWindowClipper clipper( textctrl ) ;
-
-    ControlRef controlFocus = NULL ;
-    GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
-    bool wasFocused = ( controlFocus == m_controlRef ) ;
-
-    switch (action)
-    {
-        case kControlFocusPrevPart:
-        case kControlFocusNextPart:
-            MacFocusPaneText( !wasFocused );
-            focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart);
-            break;
-
-        case kControlFocusNoPart:
-        default:
-            MacFocusPaneText( false );
-            focusResult = kControlFocusNoPart;
-            break;
-    }
-
-    return focusResult;
-}
-
-void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *WXUNUSED(info) )
-{
-}
-
-wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
-    const wxString& str,
-    const wxPoint& pos,
-    const wxSize& size, long style )
-    : wxMacMLTEControl( wxPeer )
-{
-    m_font = wxPeer->GetFont() ;
-    m_windowStyle = style ;
-    Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
-
-    short featureSet =
-        kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
-        | kControlWantsActivate  | kControlHandlesTracking
-//    | kControlHasSpecialBackground
-        | kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
-
-   OSStatus err = ::CreateUserPaneControl(
-        MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
-        &bounds, featureSet, &m_controlRef );
-    verify_noerr( err );
-    SetControlReference( m_controlRef , (URefCon) wxPeer );
-
-    DoCreate();
-
-    AdjustCreationAttributes( *wxWHITE , true ) ;
-
-    MacSetObjectVisibility( wxPeer->IsShownOnScreen() ) ;
-
-    {
-        wxString st = str ;
-        wxMacConvertNewlines10To13( &st ) ;
-        wxMacWindowClipper clipper( GetWXPeer() ) ;
-        SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
-        TXNSetSelection( m_txn, 0, 0 ) ;
-    }
-}
-
-wxMacMLTEClassicControl::~wxMacMLTEClassicControl()
-{
-    TXNDeleteObject( m_txn );
-    m_txn = NULL ;
-}
-
-void wxMacMLTEClassicControl::VisibilityChanged(bool shown)
-{
-    MacSetObjectVisibility( shown ) ;
-    wxMacControl::VisibilityChanged( shown ) ;
-}
-
-void wxMacMLTEClassicControl::SuperChangedPosition()
-{
-    MacUpdatePosition() ;
-    wxMacControl::SuperChangedPosition() ;
-}
-
-ControlUserPaneDrawUPP gTPDrawProc = NULL;
-ControlUserPaneHitTestUPP gTPHitProc = NULL;
-ControlUserPaneTrackingUPP gTPTrackProc = NULL;
-ControlUserPaneIdleUPP gTPIdleProc = NULL;
-ControlUserPaneKeyDownUPP gTPKeyProc = NULL;
-ControlUserPaneActivateUPP gTPActivateProc = NULL;
-ControlUserPaneFocusUPP gTPFocusProc = NULL;
-
-static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget( (WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        win->MacControlUserPaneDrawProc( part ) ;
-}
-
-static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget( (WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        return win->MacControlUserPaneHitTestProc( where.h , where.v ) ;
-    else
-        return kControlNoPart ;
-}
-
-static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget( (WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;
-    else
-        return kControlNoPart ;
-}
-
-static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget((WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        win->MacControlUserPaneIdleProc() ;
-}
-
-static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget((WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ;
-    else
-        return kControlNoPart ;
-}
-
-static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget( (WXWidget)control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        win->MacControlUserPaneActivateProc( activating ) ;
-}
-
-static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget((WXWidget) control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        return win->MacControlUserPaneFocusProc( action ) ;
-    else
-        return kControlNoPart ;
-}
-
-#if 0
-static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
-{
-    wxTextCtrl *textCtrl =  wxDynamicCast( wxFindWindowFromWXWidget(control) , wxTextCtrl ) ;
-    wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
-    if ( win )
-        win->MacControlUserPaneBackgroundProc(info) ;
-}
-#endif
-
-// TXNRegisterScrollInfoProc
-
-OSStatus wxMacMLTEClassicControl::DoCreate()
-{
-    Rect bounds;
-    OSStatus err = noErr ;
-
-    // set up our globals
-    if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc);
-    if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc);
-    if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc);
-    if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(wxMacControlUserPaneIdleProc);
-    if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(wxMacControlUserPaneKeyDownProc);
-    if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(wxMacControlUserPaneActivateProc);
-    if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(wxMacControlUserPaneFocusProc);
-
-    if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ;
-    if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ;
-
-    // set the initial settings for our private data
-
-    m_txnWindow = GetControlOwner(m_controlRef);
-    m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
-
-    // set up the user pane procedures
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneIdleProcTag, sizeof(gTPIdleProc), &gTPIdleProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
-    SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
-
-    // calculate the rectangles used by the control
-    GetRectInWindowCoords( &bounds );
-
-    m_txnControlBounds = bounds ;
-    m_txnVisBounds = bounds ;
-
-    CGrafPtr origPort ;
-    GDHandle origDev ;
-
-    GetGWorld( &origPort, &origDev ) ;
-    SetPort( m_txnPort );
-
-    // create the new edit field
-    TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
-
-    // the scrollbars are not correctly embedded but are inserted at the root:
-    // this gives us problems as we have erratic redraws even over the structure area
-
-    m_sbHorizontal = 0 ;
-    m_sbVertical = 0 ;
-    m_lastHorizontalValue = 0 ;
-    m_lastVerticalValue = 0 ;
-
-    Rect sb = { 0 , 0 , 0 , 0 } ;
-    if ( frameOptions & kTXNWantVScrollBarMask )
-    {
-        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical );
-        SetControlReference( m_sbVertical, (SInt32)this );
-        SetControlAction( m_sbVertical, gTXNScrollActionProc );
-        ShowControl( m_sbVertical );
-        EmbedControl( m_sbVertical , m_controlRef );
-        frameOptions &= ~kTXNWantVScrollBarMask;
-    }
-
-    if ( frameOptions & kTXNWantHScrollBarMask )
-    {
-        CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal );
-        SetControlReference( m_sbHorizontal, (SInt32)this );
-        SetControlAction( m_sbHorizontal, gTXNScrollActionProc );
-        ShowControl( m_sbHorizontal );
-        EmbedControl( m_sbHorizontal, m_controlRef );
-        frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
-    }
-
-    err = TXNNewObject(
-        NULL, m_txnWindow, &bounds, frameOptions,
-        kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
-        &m_txn, &m_txnFrameID, NULL );
-    verify_noerr( err );
-
-#if 0
-    TXNControlTag iControlTags[] = { kTXNUseCarbonEvents };
-    TXNControlData iControlData[] = { { (UInt32)&cInfo } };
-    int toptag = WXSIZEOF( iControlTags ) ;
-    TXNCarbonEventInfo cInfo ;
-    cInfo.useCarbonEvents = false ;
-    cInfo.filler = 0 ;
-    cInfo.flags = 0 ;
-    cInfo.fDictionary = NULL ;
-
-    verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
-#endif
-
-    TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
-
-    SetGWorld( origPort , origDev ) ;
-
-    return err;
-}
-#endif
-
 // ----------------------------------------------------------------------------
 // MLTE control implementation (OSX part)
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/carbon/tglbtn.cpp b/Externals/wxWidgets3/src/osx/carbon/tglbtn.cpp
index b7fc74bc2f..d4593c0a24 100644
--- a/Externals/wxWidgets3/src/osx/carbon/tglbtn.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/tglbtn.cpp
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/thread.cpp b/Externals/wxWidgets3/src/osx/carbon/thread.cpp
index 790f45cd3d..dcb7bd778a 100644
--- a/Externals/wxWidgets3/src/osx/carbon/thread.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/thread.cpp
@@ -4,7 +4,6 @@
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
 // Modified by: Aj Lavin, Stefan Csomor
 // Created:     04/22/98
-// RCS-ID:      $Id: thread.cpp 69883 2011-12-01 14:22:15Z VZ $
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
 //                  Vadim Zeitlin (1999), Stefan Csomor (2000)
 // Licence:     wxWindows licence
@@ -475,7 +474,7 @@ public:
     {
         m_tid = kInvalidID;
         m_state = STATE_NEW;
-        m_prio = WXTHREAD_DEFAULT_PRIORITY;
+        m_prio = wxPRIORITY_DEFAULT;
         m_notifyQueueId = kInvalidID;
         m_exitcode = 0;
         m_cancelled = false ;
@@ -624,7 +623,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
 
     if ( !dontRunAtAll )
     {
-        pthread->m_exitcode = thread->Entry();
+        pthread->m_exitcode = thread->CallEntry();
 
         {
             wxCriticalSectionLocker lock(thread->m_critsect);
@@ -656,6 +655,9 @@ bool wxThreadInternal::Create( wxThread *thread, unsigned int stackSize )
     wxASSERT_MSG( m_state == STATE_NEW && !m_tid,
                     wxT("Create()ing thread twice?") );
 
+    if ( thread->IsDetached() )
+        Detach();
+
     OSStatus err = noErr;
     m_thread = thread;
 
@@ -664,7 +666,7 @@ bool wxThreadInternal::Create( wxThread *thread, unsigned int stackSize )
         OSStatus err = MPCreateQueue( &m_notifyQueueId );
         if (err != noErr)
         {
-            wxLogSysError( wxT("Cant create the thread event queue") );
+            wxLogSysError( wxT("Can't create the thread event queue") );
 
             return false;
         }
@@ -683,7 +685,7 @@ bool wxThreadInternal::Create( wxThread *thread, unsigned int stackSize )
         return false;
     }
 
-    if ( m_prio != WXTHREAD_DEFAULT_PRIORITY )
+    if ( m_prio != wxPRIORITY_DEFAULT )
         SetPriority( m_prio );
 
     return true;
@@ -868,13 +870,9 @@ wxThreadError wxThread::Create( unsigned int stackSize )
 {
     wxCriticalSectionLocker lock(m_critsect);
 
-    if ( m_isDetached )
-        m_internal->Detach() ;
-
     if ( !m_internal->Create(this, stackSize) )
     {
         m_internal->SetState( STATE_EXITED );
-
         return wxTHREAD_NO_RESOURCE;
     }
 
@@ -885,6 +883,17 @@ wxThreadError wxThread::Run()
 {
     wxCriticalSectionLocker lock(m_critsect);
 
+    // Create the thread if it wasn't created yet with an explicit
+    // Create() call:
+    if ( m_internal->GetId() == kInvalidID )
+    {
+        if ( !m_internal->Create(this, stackSize) )
+        {
+            m_internal->SetState( STATE_EXITED );
+            return wxTHREAD_NO_RESOURCE;
+        }
+    }
+
     wxCHECK_MSG( m_internal->GetId(), wxTHREAD_MISC_ERROR,
                  wxT("must call wxThread::Create() first") );
 
@@ -1110,8 +1119,7 @@ bool wxThread::TestDestroy()
 
 void wxThread::SetPriority(unsigned int prio)
 {
-    wxCHECK_RET( ((int)WXTHREAD_MIN_PRIORITY <= (int)prio) &&
-                 ((int)prio <= (int)WXTHREAD_MAX_PRIORITY),
+    wxCHECK_RET( wxPRIORITY_MIN <= prio && prio <= wxPRIORITY_MAX,
                  wxT("invalid thread priority") );
 
     wxCriticalSectionLocker lock(m_critsect);
diff --git a/Externals/wxWidgets3/src/osx/carbon/timer.cpp b/Externals/wxWidgets3/src/osx/carbon/timer.cpp
index 441a8ea8c7..be218af294 100644
--- a/Externals/wxWidgets3/src/osx/carbon/timer.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/timer.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: timer.cpp 64943 2010-07-13 13:29:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/toolbar.cpp b/Externals/wxWidgets3/src/osx/carbon/toolbar.cpp
index 15eab65220..07121fbd85 100644
--- a/Externals/wxWidgets3/src/osx/carbon/toolbar.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/toolbar.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar.cpp 67230 2011-03-18 14:20:12Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -114,14 +113,6 @@ public:
         if ( m_toolbarItemRef )
         {
             CFIndex count = CFGetRetainCount( m_toolbarItemRef ) ;
-            // different behaviour under Leopard
-            if ( UMAGetSystemVersion() < 0x1050 )
-            {
-                if ( count != 1 )
-                {
-                    wxFAIL_MSG("Reference count of native tool was not 1 in wxToolBarTool destructor");
-                }
-            }
             wxTheApp->MacAddToAutorelease(m_toolbarItemRef);
             CFRelease(m_toolbarItemRef);
             m_toolbarItemRef = NULL;
@@ -932,15 +923,16 @@ wxToolBar::~wxToolBar()
     if ( !m_macToolbar )
         return;
 
-    CFIndex count = CFGetRetainCount( m_macToolbar ) ;
-    // Leopard seems to have one refcount more, so we cannot check reliably at the moment
-    if ( UMAGetSystemVersion() < 0x1050 )
+    // it might already have been uninstalled due to a previous call to Destroy, but in case
+    // wasn't, do so now, otherwise redraw events may occur for deleted objects
+    bool ownToolbarInstalled = false;
+    MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
+    if (ownToolbarInstalled)
     {
-        if ( count != 1 )
-        {
-            wxFAIL_MSG("Reference count of native control was not 1 in wxToolBar destructor");
-        }
+        MacUninstallNativeToolbar();
     }
+
+    CFIndex count = CFGetRetainCount( m_macToolbar ) ;
     CFRelease( (HIToolbarRef)m_macToolbar );
     m_macToolbar = NULL;
 #endif // wxOSX_USE_NATIVE_TOOLBAR
@@ -1111,7 +1103,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             // which we don't want in this case
             wxSize sz = GetParent()->GetSize();
             ShowHideWindowToolbar( tlw, true, false );
-            // Restore the orginal size
+            // Restore the original size
             GetParent()->SetSize( sz );
 
             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
@@ -1608,26 +1600,12 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
         case wxTOOL_STYLE_BUTTON:
             {
                 wxASSERT( tool->GetControlHandle() == NULL );
-                ControlButtonContentInfo info;
-                wxMacCreateBitmapButton( &info, tool->GetNormalBitmap() );
 
-                if ( UMAGetSystemVersion() >= 0x1000)
-                {
-                    // contrary to the docs this control only works with iconrefs
-                    ControlButtonContentInfo info;
-                    wxMacCreateBitmapButton( &info, tool->GetNormalBitmap(), kControlContentIconRef );
-                    CreateIconControl( window, &toolrect, &info, false, &controlHandle );
-                    wxMacReleaseBitmapButton( &info );
-                }
-                else
-                {
-                    SInt16 behaviour = kControlBehaviorOffsetContents;
-                    if ( tool->CanBeToggled() )
-                        behaviour |= kControlBehaviorToggles;
-                    err = CreateBevelButtonControl( window,
-                        &toolrect, CFSTR(""), kControlBevelButtonNormalBevel,
-                        behaviour, &info, 0, 0, 0, &controlHandle );
-                }
+                // contrary to the docs this control only works with iconrefs
+                ControlButtonContentInfo info;
+                wxMacCreateBitmapButton( &info, tool->GetNormalBitmap(), kControlContentIconRef );
+                CreateIconControl( window, &toolrect, &info, false, &controlHandle );
+                wxMacReleaseBitmapButton( &info );
 
 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
diff --git a/Externals/wxWidgets3/src/osx/carbon/tooltip.cpp b/Externals/wxWidgets3/src/osx/carbon/tooltip.cpp
index b86c426815..66f99826e0 100644
--- a/Externals/wxWidgets3/src/osx/carbon/tooltip.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/tooltip.cpp
@@ -2,7 +2,6 @@
 // Name:        src/osx/carbon/tooltip.cpp
 // Purpose:     wxToolTip implementation
 // Author:      Stefan Csomor
-// Id:          $Id: tooltip.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/uma.cpp b/Externals/wxWidgets3/src/osx/carbon/uma.cpp
index 1a51c2ecee..2773665f4a 100644
--- a/Externals/wxWidgets3/src/osx/carbon/uma.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/uma.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: uma.cpp 68721 2011-08-16 12:17:13Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/carbon/utils.cpp b/Externals/wxWidgets3/src/osx/carbon/utils.cpp
index c3d40685f4..9653ee4191 100644
--- a/Externals/wxWidgets3/src/osx/carbon/utils.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/utils.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utils.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,9 +33,7 @@
 
 // #include "MoreFilesX.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    #include <AudioToolbox/AudioServices.h>
-#endif
+#include <AudioToolbox/AudioServices.h>
 
 #include "wx/osx/private.h"
 #if wxUSE_GUI
@@ -45,34 +42,15 @@
 
 #include "wx/evtloop.h"
 
-#if defined(__MWERKS__) && wxUSE_UNICODE
-#if __MWERKS__ < 0x4100
-    #include <wtime.h>
-#endif
-#endif
-
-#if wxUSE_BASE
+#if wxUSE_GUI
 
 // Emit a beeeeeep
 void wxBell()
 {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if ( AudioServicesPlayAlertSound != NULL )
         AudioServicesPlayAlertSound(kUserPreferredAlert);
-    else
-#endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-        AlertSoundPlay();
-#else
-    {
-    }
-#endif
 }
 
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);
@@ -167,7 +145,6 @@ void wxGetMousePosition( int* x, int* y )
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
     HIRect bounds ;
     HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
             &bounds);
@@ -179,18 +156,6 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = bounds.size.width;
     if ( height )
         *height = bounds.size.height;
-#else
-    Rect r;
-    GetAvailableWindowPositioningBounds( GetMainDevice() , &r );
-    if ( x )
-        *x = r.left;
-    if ( y )
-        *y = r.top;
-    if ( width )
-        *width = r.right - r.left;
-    if ( height )
-        *height = r.bottom - r.top;
-#endif
 }
 
 #endif // wxUSE_GUI
diff --git a/Externals/wxWidgets3/src/osx/carbon/utilscocoa.mm b/Externals/wxWidgets3/src/osx/carbon/utilscocoa.mm
index 752d9e78c5..000f6710a4 100644
--- a/Externals/wxWidgets3/src/osx/carbon/utilscocoa.mm
+++ b/Externals/wxWidgets3/src/osx/carbon/utilscocoa.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utilscocoa.mm 70399 2012-01-19 14:04:47Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -193,7 +192,7 @@ WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
 }
 
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
-static const NSAffineTransformStruct kSlantNSTransformStruct = { 1, 0, tan(DegToRad(11)), 1, 0, 0  };
+static const NSAffineTransformStruct kSlantNSTransformStruct = { 1, 0, static_cast<CGFloat>(tan(DegToRad(11))), 1, 0, 0  };
 
 WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
 {
@@ -343,6 +342,19 @@ WX_UIFont wxFont::OSXCreateUIFont(const wxNativeFontInfo* info)
     return uiFont;
 }
 
+#endif
+
+// ----------------------------------------------------------------------------
+// NSWindow Utils
+// ----------------------------------------------------------------------------
+
+#if wxOSX_USE_COCOA
+
+WXWindow wxOSXGetMainWindow()
+{
+    return [NSApp mainWindow];
+}
+
 #endif
 // ----------------------------------------------------------------------------
 // NSImage Utils
@@ -368,6 +380,33 @@ wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, c
 #endif
 }
 
+double wxOSXGetMainScreenContentScaleFactor()
+{
+    double scale;
+  
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
+    if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
+    {
+        scale=[[UIScreen mainScreen] scale];
+    }
+    else
+#endif
+    {
+        scale=1.0;
+    }
+    
+    return scale;
+}
+
+#endif
+
+#if wxOSX_USE_CARBON
+
+double wxOSXGetMainScreenContentScaleFactor()
+{
+    return 1.0;
+}
+
 #endif
 
 #if wxOSX_USE_COCOA
@@ -375,18 +414,17 @@ wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, c
 wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &WXUNUSED(client), const wxSize& WXUNUSED(size))
 {
     wxCFStringRef cfname(name);
-    wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) );
-    return wxBitmap( image );
+    return wxBitmap( [NSImage imageNamed:cfname.AsNSString()] );
 }
 
 //  From "Cocoa Drawing Guide:Working with Images"
-WX_NSImage  wxOSXGetNSImageFromCGImage( CGImageRef image )
+WX_NSImage  wxOSXGetNSImageFromCGImage( CGImageRef image, double scaleFactor )
 {
     NSRect      imageRect    = NSMakeRect(0.0, 0.0, 0.0, 0.0);
 
     // Get the image dimensions.
-    imageRect.size.height = CGImageGetHeight(image);
-    imageRect.size.width = CGImageGetWidth(image);
+    imageRect.size.height = CGImageGetHeight(image)/scaleFactor;
+    imageRect.size.width = CGImageGetWidth(image)/scaleFactor;
 
     // Create a new image to receive the Quartz image data.
     NSImage  *newImage = [[NSImage alloc] initWithSize:imageRect.size];
@@ -409,22 +447,57 @@ WX_NSImage  wxOSXGetNSImageFromCGImage( CGImageRef image )
     return( newImage );
 }
 
-CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage )
+CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromNSImage( WX_NSImage nsimage)
 {
     // based on http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg18065.html
-
-    CGImageRef image = NULL;
+    
+    CGContextRef hbitmap = NULL;
     if (nsimage != nil)
     {
+        double scale = wxOSXGetMainScreenContentScaleFactor();
+        
         NSSize imageSize = [nsimage size];
-        CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst); 
-        NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
+        
+        hbitmap = CGBitmapContextCreate(NULL, imageSize.width*scale, imageSize.height*scale, 8, 0, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst);
+        CGContextScaleCTM( hbitmap, scale, scale );
+    
+        NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:hbitmap flipped:NO];
         [NSGraphicsContext saveGraphicsState];
         [NSGraphicsContext setCurrentContext:nsGraphicsContext];
         [[NSColor whiteColor] setFill];
         NSRectFill(NSMakeRect(0.0, 0.0, imageSize.width, imageSize.height));
         [nsimage drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
         [NSGraphicsContext setCurrentContext:nsGraphicsContext];
+    }
+    return hbitmap;
+}
+
+double wxOSXGetMainScreenContentScaleFactor()
+{
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+    if ( [ [NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] )
+        return [[NSScreen mainScreen] backingScaleFactor];
+    else
+#endif
+        return 1.0;
+}
+
+CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scaleptr )
+{
+    // based on http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg18065.html
+
+    CGImageRef image = NULL;
+    if (nsimage != nil)
+    {        
+        CGContextRef context = wxOSXCreateBitmapContextFromNSImage(nsimage);
+        if ( scaleptr )
+        {
+            // determine content scale
+            CGRect userrect = CGRectMake(0, 0, 10, 10);
+            CGRect devicerect;
+            devicerect = CGContextConvertRectToDeviceSpace(context, userrect);
+            *scaleptr = devicerect.size.height / userrect.size.height;
+        }
         image = CGBitmapContextCreateImage(context);
         CFRelease(context);
     }
diff --git a/Externals/wxWidgets3/src/osx/carbon/window.cpp b/Externals/wxWidgets3/src/osx/carbon/window.cpp
index 3b1e3f79a4..f7085d277f 100644
--- a/Externals/wxWidgets3/src/osx/carbon/window.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/window.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: window.cpp 69440 2011-10-16 15:59:31Z SJL $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -87,6 +86,12 @@ WXWidget wxWidgetImpl::FindFocus()
     return control;
 }
 
+// no compositing to take into account under carbon
+wxWidgetImpl* wxWidgetImpl::FindBestFromWXWidget(WXWidget control)
+{
+    return FindFromWXWidget(control);
+}
+
 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------
@@ -294,11 +299,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
         case kEventControlFocusPartChanged :
             // the event is emulated by wxmac for systems lower than 10.5
             {
-                if ( UMAGetSystemVersion() < 0x1050 )
-                {
-                    // as it is synthesized here, we have to manually avoid propagation
-                    result = noErr;
-                }
                 ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
                 ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );
 
@@ -382,76 +382,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 }
                 else
                     result = CallNextEventHandler(handler, event);
-
-                if ( UMAGetSystemVersion() < 0x1050 )
-                {
-// set back to 0 if problems arise
-#if 1
-                    if ( result == noErr )
-                    {
-                        ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
-                        // synthesize the event focus changed event
-                        EventRef evRef = NULL ;
-
-                        OSStatus err = MacCreateEvent(
-                                             NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
-                                             kEventAttributeUserEvent , &evRef );
-                        verify_noerr( err );
-
-                        wxMacCarbonEvent iEvent( evRef ) ;
-                        iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef );
-                        iEvent.SetParameter<EventTargetRef>( kEventParamPostTarget, typeEventTargetRef, GetControlEventTarget( controlRef ) );
-                        iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart );
-                        iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart );
-
-#if 1
-                        // TODO test this first, avoid double posts etc...
-                        PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
-#else
-                        wxMacWindowControlEventHandler( NULL , evRef , data ) ;
-#endif
-                        ReleaseEvent( evRef ) ;
-                    }
-#else
-                    // old implementation, to be removed if the new one works
-                    if ( controlPart == kControlFocusNoPart )
-                    {
-#if wxUSE_CARET
-                        if ( thisWindow->GetCaret() )
-                            thisWindow->GetCaret()->OnKillFocus();
-#endif
-
-                        wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
-
-                        static bool inKillFocusEvent = false ;
-
-                        if ( !inKillFocusEvent )
-                        {
-                            inKillFocusEvent = true ;
-                            wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
-                            event.SetEventObject(thisWindow);
-                            thisWindow->HandleWindowEvent(event) ;
-                            inKillFocusEvent = false ;
-                        }
-                    }
-                    else
-                    {
-                        // panel wants to track the window which was the last to have focus in it
-                        wxLogTrace(wxT("Focus"), wxT("focus set(%p)"), static_cast<void*>(thisWindow));
-                        wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
-                        thisWindow->HandleWindowEvent(eventFocus);
-
-    #if wxUSE_CARET
-                        if ( thisWindow->GetCaret() )
-                            thisWindow->GetCaret()->OnSetFocus();
-    #endif
-
-                        wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
-                        event.SetEventObject(thisWindow);
-                        thisWindow->HandleWindowEvent(event) ;
-                    }
-#endif
-                }
             }
             break ;
 
@@ -653,8 +583,7 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
     I don't have time to look into that right now.
         -- CL
 */
-                    if ( wxTheApp->MacSendCharEvent(
-                                                    focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
+                    if ( wxTheApp->MacSendCharEvent( focus , message , 0 , when , uniChars[pos] ) )
                     {
                         result = noErr ;
                     }
@@ -666,15 +595,13 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
         case kEventTextInputUnicodeForKeyEvent :
             {
                 UInt32 keyCode, modifiers ;
-                Point point ;
                 EventRef rawEvent ;
                 unsigned char charCode ;
 
                 GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
-                GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+                GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
                 GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
                 GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
-                GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
 
                 UInt32 message = (keyCode << 8) + charCode;
 
@@ -686,8 +613,7 @@ WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef ha
                     WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
-                    if ( wxTheApp->MacSendCharEvent(
-                        focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) )
+                    if ( wxTheApp->MacSendCharEvent( focus , message , modifiers , when , uniChars[pos] ) )
                     {
                         result = noErr ;
                     }
@@ -1135,19 +1061,10 @@ void wxMacControl::SetCursor(const wxCursor& cursor)
         ControlPartCode part ;
         ControlRef control ;
         Point pt ;
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
         HIPoint hiPoint ;
         HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
         pt.h = hiPoint.x;
         pt.v = hiPoint.y;
-#else
-        GetGlobalMouse( &pt );
-        int x = pt.h;
-        int y = pt.v;
-        tlwwx->ScreenToClient(&x, &y);
-        pt.h = x;
-        pt.v = y;
-#endif
         control = FindControlUnderMouse( pt , window , &part ) ;
         if ( control )
             mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
@@ -1261,27 +1178,22 @@ void wxMacControl::SuperChangedPosition()
 void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack )
 {
     m_font = font;
-#if wxOSX_USE_CORE_TEXT
-    if ( UMAGetSystemVersion() >= 0x1050 )
-    {
-        HIViewPartCode part = 0;
-        HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault;
-        if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
-            flush = kHIThemeTextHorizontalFlushCenter;
-        else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
-            flush = kHIThemeTextHorizontalFlushRight;
-        HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.OSXGetCTFont() );
-        HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
+    HIViewPartCode part = 0;
+    HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault;
+    if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+        flush = kHIThemeTextHorizontalFlushCenter;
+    else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+        flush = kHIThemeTextHorizontalFlushRight;
+    HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.OSXGetCTFont() );
+    HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
 
-        if ( foreground != *wxBLACK || ignoreBlack == false )
-        {
-            ControlFontStyleRec fontStyle;
-            foreground.GetRGBColor( &fontStyle.foreColor );
-            fontStyle.flags = kControlUseForeColorMask;
-            ::SetControlFontStyle( m_controlRef , &fontStyle );
-        }
+    if ( foreground != *wxBLACK || ignoreBlack == false )
+    {
+        ControlFontStyleRec fontStyle;
+        foreground.GetRGBColor( &fontStyle.foreColor );
+        fontStyle.flags = kControlUseForeColorMask;
+        ::SetControlFontStyle( m_controlRef , &fontStyle );
     }
-#endif
 #if wxOSX_USE_ATSU_TEXT
     ControlFontStyleRec fontStyle;
     if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
@@ -1408,7 +1320,15 @@ void wxMacControl::Enable( bool enable )
 
 void wxMacControl::SetDrawingEnabled( bool enable )
 {
-    HIViewSetDrawingEnabled( m_controlRef , enable );
+    if ( enable )
+    {
+        HIViewSetDrawingEnabled( m_controlRef , true );
+        HIViewSetNeedsDisplay( m_controlRef, true);
+    }
+    else
+    {
+        HIViewSetDrawingEnabled( m_controlRef , false );
+    }
 }
 
 void wxMacControl::GetRectInWindowCoords( Rect *r )
diff --git a/Externals/wxWidgets3/src/osx/checkbox_osx.cpp b/Externals/wxWidgets3/src/osx/checkbox_osx.cpp
index 6ec54eaaea..6e4d58a680 100644
--- a/Externals/wxWidgets3/src/osx/checkbox_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/checkbox_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: checkbox_osx.cpp 67892 2011-06-08 23:02:25Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -128,7 +127,7 @@ bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
     
     if (sendEvent)
     {
-        wxCommandEvent event( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+        wxCommandEvent event( wxEVT_CHECKBOX, m_windowId );
         event.SetInt( newState );
         event.SetEventObject( this );
         ProcessCommand( event );
diff --git a/Externals/wxWidgets3/src/osx/checklst_osx.cpp b/Externals/wxWidgets3/src/osx/checklst_osx.cpp
index 1dd27e13d3..8b4b28a897 100644
--- a/Externals/wxWidgets3/src/osx/checklst_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/checklst_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: checklst_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -116,7 +115,7 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
     {
         Check( n, value.IsChecked() );
 
-        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
+        wxCommandEvent event( wxEVT_CHECKLISTBOX, GetId() );
         event.SetInt( n );
         event.SetString( GetString( n ) );
         event.SetEventObject( this );
diff --git a/Externals/wxWidgets3/src/osx/choice_osx.cpp b/Externals/wxWidgets3/src/osx/choice_osx.cpp
index 611ccabfbc..fd9a59daa7 100644
--- a/Externals/wxWidgets3/src/osx/choice_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/choice_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice_osx.cpp 67343 2011-03-30 14:16:04Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -100,6 +99,13 @@ bool wxChoice::Create(wxWindow *parent,
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 
+void wxChoice::DoAfterItemCountChange()
+{
+    InvalidateBestSize();
+
+    GetPeer()->SetMaximum( GetCount() );
+}
+
 int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
                             unsigned int pos,
                             void **clientData, wxClientDataType type)
@@ -132,7 +138,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
         AssignNewItemClientData(idx, clientData, i, type);
     }
 
-    GetPeer()->SetMaximum( GetCount() );
+    DoAfterItemCountChange();
 
     return pos - 1;
 }
@@ -148,8 +154,8 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;
-    GetPeer()->SetMaximum( GetCount() ) ;
 
+    DoAfterItemCountChange();
 }
 
 void wxChoice::DoClear()
@@ -162,7 +168,7 @@ void wxChoice::DoClear()
     m_strings.Empty() ;
     m_datas.Empty() ;
 
-    GetPeer()->SetMaximum( 0 ) ;
+    DoAfterItemCountChange();
 }
 
 // ----------------------------------------------------------------------------
@@ -229,60 +235,20 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
 
 bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-
-    // actually n should be made sure by the os to be a valid selection, but ...
-    int n = GetSelection();
-    if ( n > -1 )
-    {
-        event.SetInt( n );
-        event.SetString( GetStringSelection() );
-        event.SetEventObject( this );
-
-        if ( HasClientObjectData() )
-            event.SetClientObject( GetClientObject( n ) );
-        else if ( HasClientUntypedData() )
-            event.SetClientData( GetClientData( n ) );
-
-        ProcessCommand( event );
-    }
+    SendSelectionChangedEvent(wxEVT_CHOICE);
 
     return true ;
 }
 
 wxSize wxChoice::DoGetBestSize() const
 {
-    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
-    wxSize baseSize = wxWindow::DoGetBestSize();
-    int lbHeight = baseSize.y;
-    int wLine;
+    // We use the base window size for the height (which is wrong as it doesn't
+    // take the font into account -- TODO) and add some margins to the width
+    // computed by the base class method to account for the arrow.
+    const int lbHeight = wxWindow::DoGetBestSize().y;
 
-    {
-        wxClientDC dc(const_cast<wxChoice*>(this));
-
-        // Find the widest line
-        for(unsigned int i = 0; i < GetCount(); i++)
-        {
-            wxString str(GetString(i));
-
-            wxCoord width, height ;
-            dc.GetTextExtent( str , &width, &height);
-            wLine = width ;
-
-            lbWidth = wxMax( lbWidth, wLine ) ;
-        }
-
-        // Add room for the popup arrow
-        lbWidth += 2 * lbHeight ;
-
-        wxCoord width, height ;
-        dc.GetTextExtent( wxT("X"), &width, &height);
-        int cx = width ;
-
-        lbWidth += cx ;
-    }
-
-    return wxSize( lbWidth, lbHeight );
+    return wxSize(wxChoiceBase::DoGetBestSize().x + 2*lbHeight + GetCharWidth(),
+                  lbHeight);
 }
 
 #endif // wxUSE_CHOICE
diff --git a/Externals/wxWidgets3/src/osx/cocoa/aboutdlg.mm b/Externals/wxWidgets3/src/osx/cocoa/aboutdlg.mm
index 3182a3f052..45b5456c76 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/aboutdlg.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/aboutdlg.mm
@@ -3,7 +3,6 @@
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// RCS-ID:      $Id: aboutdlg.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,8 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow *parent)
         if ( info.HasVersion() )
         {
             opts.Set(CFSTR("Version"),info.GetVersion());
-            opts.Set(CFSTR("ApplicationVersion"),info.GetLongVersion());
+            if ( info.GetLongVersion() != (_("Version ")+info.GetVersion()))
+                opts.Set(CFSTR("ApplicationVersion"),info.GetLongVersion());
         }
 
         if ( info.HasCopyright() )
diff --git a/Externals/wxWidgets3/src/osx/cocoa/anybutton.mm b/Externals/wxWidgets3/src/osx/cocoa/anybutton.mm
index 866866f350..299dcba2bc 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/anybutton.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/anybutton.mm
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton
 // Author:      Stefan Csomor
 // Created:     1998-01-01 (extracted from button.mm)
-// RCS-ID:      $Id: anybutton.mm 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/button.mm b/Externals/wxWidgets3/src/osx/cocoa/button.mm
index e775a3b7bc..35c2c4d941 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/button.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/button.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button.mm 70402 2012-01-19 15:01:01Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,8 @@
 #endif
 
 #include "wx/button.h"
+#include "wx/toplevel.h"
+#include "wx/tglbtn.h"
 
 #include "wx/osx/private.h"
 
@@ -81,136 +82,216 @@
 - (NSControlSize)controlSize;
 @end
 
-namespace
+wxButtonCocoaImpl::wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
+: wxWidgetCocoaImpl(wxpeer, v)
 {
+    SetNeedsFrame(false);
+}
 
-class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
+void wxButtonCocoaImpl::SetBitmap(const wxBitmap& bitmap)
 {
-public:
-    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
-        : wxWidgetCocoaImpl(wxpeer, v)
+    // switch bezel style for plain pushbuttons
+    if ( bitmap.IsOk() )
     {
-        SetNeedsFrame(false);
+        if ([GetNSButton() bezelStyle] == NSRoundedBezelStyle)
+            [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle];
     }
-
-    virtual void SetBitmap(const wxBitmap& bitmap)
+    else
     {
-        // switch bezel style for plain pushbuttons
-        if ( bitmap.IsOk() )
-        {
-            if ([GetNSButton() bezelStyle] == NSRoundedBezelStyle)
-                [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle];
-        }
-        else
-        {
-            [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
-        }
-        
-        wxWidgetCocoaImpl::SetBitmap(bitmap);
+        [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
     }
+    
+    wxWidgetCocoaImpl::SetBitmap(bitmap);
+}
 
 #if wxUSE_MARKUP
-    virtual void SetLabelMarkup(const wxString& markup)
-    {
-        wxMarkupToAttrString toAttr(GetWXPeer(), markup);
-        NSMutableAttributedString *attrString = toAttr.GetNSAttributedString();
-
-        // Button text is always centered.
-        NSMutableParagraphStyle *
-            paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-        [paragraphStyle setAlignment: NSCenterTextAlignment];
-        [attrString addAttribute:NSParagraphStyleAttributeName
-                    value:paragraphStyle
-                    range:NSMakeRange(0, [attrString length])];
-        [paragraphStyle release];
-
-        [GetNSButton() setAttributedTitle:attrString];
-    }
+void wxButtonCocoaImpl::SetLabelMarkup(const wxString& markup)
+{
+    wxMarkupToAttrString toAttr(GetWXPeer(), markup);
+    NSMutableAttributedString *attrString = toAttr.GetNSAttributedString();
+    
+    // Button text is always centered.
+    NSMutableParagraphStyle *
+    paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    [paragraphStyle setAlignment: NSCenterTextAlignment];
+    [attrString addAttribute:NSParagraphStyleAttributeName
+                       value:paragraphStyle
+                       range:NSMakeRange(0, [attrString length])];
+    [paragraphStyle release];
+    
+    [GetNSButton() setAttributedTitle:attrString];
+}
 #endif // wxUSE_MARKUP
 
-    void SetPressedBitmap( const wxBitmap& bitmap )
+void wxButtonCocoaImpl::SetPressedBitmap( const wxBitmap& bitmap )
+{
+    NSButton* button = GetNSButton();
+    [button setAlternateImage: bitmap.GetNSImage()];
+    if ( GetWXPeer()->IsKindOf(wxCLASSINFO(wxToggleButton)) )
+    {
+        [button setButtonType:NSToggleButton];
+    }
+    else
     {
-        NSButton* button = GetNSButton();
-        [button setAlternateImage: bitmap.GetNSImage()];
         [button setButtonType:NSMomentaryChangeButton];
     }
+}
 
-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
-    {
-        left = top = right = bottom = 0;
-        NSControlSize size = NSRegularControlSize;
-        if ( [m_osxView respondsToSelector:@selector(controlSize)] )
-            size = [m_osxView controlSize];
-        else if ([m_osxView respondsToSelector:@selector(cell)])
-        {
-            id cell = [(id)m_osxView cell];
-            if ([cell respondsToSelector:@selector(controlSize)])
-                size = [cell controlSize];
-        }
-        
-        if ( [GetNSButton() bezelStyle] == NSRoundedBezelStyle )
-        {
-            switch( size )
-            {
-                case NSRegularControlSize:
-                    left = right = 6;
-                    top = 4;
-                    bottom = 8;
-                    break;
-                case NSSmallControlSize:
-                    left = right = 5;
-                    top = 4;
-                    bottom = 7;
-                    break;
-                case NSMiniControlSize:
-                    left = right = 1;
-                    top = 0;
-                    bottom = 2;
-                    break;
-            }
-        }
-    }
-    
-    
-private:
-    NSButton *GetNSButton() const
-    {
-        wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
-
-        return static_cast<NSButton *>(m_osxView);
-    }
-};
-
-} // anonymous namespace
-
-extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
-    
-// set bezel style depending on the wxBORDER_XXX flags specified by the style
-void SetBezelStyleFromBorderFlags(NSButton *v, long style)
+void wxButtonCocoaImpl::GetLayoutInset(int &left , int &top , int &right, int &bottom) const
 {
-    if ( style & wxBORDER_NONE )
+    left = top = right = bottom = 0;
+    NSControlSize size = NSRegularControlSize;
+    if ( [m_osxView respondsToSelector:@selector(controlSize)] )
+        size = [m_osxView controlSize];
+    else if ([m_osxView respondsToSelector:@selector(cell)])
     {
-        [v setBezelStyle:NSShadowlessSquareBezelStyle];
-        [v setBordered:NO];
+        id cell = [(id)m_osxView cell];
+        if ([cell respondsToSelector:@selector(controlSize)])
+            size = [cell controlSize];
     }
-    else // we do have a border
+    
+    if ( [GetNSButton() bezelStyle] == NSRoundedBezelStyle )
     {
-        // see trac #11128 for a thorough discussion
-        if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
-            [v setBezelStyle:NSRegularSquareBezelStyle];
-        else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
-            [v setBezelStyle:NSSmallSquareBezelStyle];
-        else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
-            [v setBezelStyle:NSShadowlessSquareBezelStyle];
-        else
-            [v setBezelStyle:NSRegularSquareBezelStyle];
+        switch( size )
+        {
+            case NSRegularControlSize:
+                left = right = 6;
+                top = 4;
+                bottom = 8;
+                break;
+            case NSSmallControlSize:
+                left = right = 5;
+                top = 4;
+                bottom = 7;
+                break;
+            case NSMiniControlSize:
+                left = right = 1;
+                top = 0;
+                bottom = 2;
+                break;
+        }
     }
 }
 
+void wxButtonCocoaImpl::SetAcceleratorFromLabel(const wxString& label)
+{
+    const int accelPos = wxControl::FindAccelIndex(label);
+    if ( accelPos != wxNOT_FOUND )
+    {
+        wxString accelstring(label[accelPos + 1]); // Skip '&' itself
+        accelstring.MakeLower();
+        wxCFStringRef cfText(accelstring);
+        [GetNSButton() setKeyEquivalent:cfText.AsNSString()];
+        [GetNSButton() setKeyEquivalentModifierMask:NSCommandKeyMask];
+    }
+    else
+    {
+        [GetNSButton() setKeyEquivalent:@""];
+    }
+}
+
+NSButton *wxButtonCocoaImpl::GetNSButton() const
+{
+    wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+    
+    return static_cast<NSButton *>(m_osxView);
+}
+
+// Set bezel style depending on the wxBORDER_XXX flags specified by the style
+// and also accounting for the label (bezels are different for multiline
+// buttons and normal ones) and the ID (special bezel is used for help button).
+//
+// This is extern because it's also used in src/osx/cocoa/tglbtn.mm.
+extern "C"
+void
+SetBezelStyleFromBorderFlags(NSButton *v,
+                             long style,
+                             wxWindowID winid,
+                             const wxString& label = wxString(),
+                             const wxBitmap& bitmap = wxBitmap())
+{
+    // We can't display a custom label inside a button with help bezel style so
+    // we only use it if we are using the default label. wxButton itself checks
+    // if the label is just "Help" in which case it discards it and passes us
+    // an empty string.
+    if ( winid == wxID_HELP && label.empty() )
+    {
+        [v setBezelStyle:NSHelpButtonBezelStyle];
+    }
+    else
+    {
+        // We can't use rounded bezel styles neither for multiline buttons nor
+        // for buttons containing (big) icons as they are only meant to be used
+        // at certain sizes, so the style used depends on whether the label is
+        // single or multi line.
+        const bool
+            isSimpleText = (label.find_first_of("\n\r") == wxString::npos)
+                                && (!bitmap.IsOk() || bitmap.GetHeight() < 20);
+
+        NSBezelStyle bezel;
+        switch ( style & wxBORDER_MASK )
+        {
+            case wxBORDER_NONE:
+                bezel = NSShadowlessSquareBezelStyle;
+                [v setBordered:NO];
+                break;
+
+            case wxBORDER_SIMPLE:
+                bezel = NSShadowlessSquareBezelStyle;
+                break;
+
+            case wxBORDER_SUNKEN:
+                bezel = isSimpleText ? NSTexturedRoundedBezelStyle
+                                     : NSSmallSquareBezelStyle;
+                break;
+
+            default:
+                wxFAIL_MSG( "Unknown border style" );
+                // fall through
+
+            case 0:
+            case wxBORDER_STATIC:
+            case wxBORDER_RAISED:
+            case wxBORDER_THEME:
+                bezel = isSimpleText ? NSRoundedBezelStyle
+                                     : NSRegularSquareBezelStyle;
+                break;
+        }
+
+        [v setBezelStyle:bezel];
+    }
+}
+
+// Set the keyboard accelerator key from the label (e.g. "Click &Me")
+void wxButton::OSXUpdateAfterLabelChange(const wxString& label)
+{
+    wxButtonCocoaImpl *impl = static_cast<wxButtonCocoaImpl*>(GetPeer());
+
+    // Update the bezel style as may be necessary if our new label is multi
+    // line while the old one wasn't (or vice versa).
+    SetBezelStyleFromBorderFlags(impl->GetNSButton(),
+                                 GetWindowStyle(),
+                                 GetId(),
+                                 label);
+
+
+    // Skip setting the accelerator for the default buttons as this would
+    // overwrite the default "Enter" which should be preserved.
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )
+    {
+        if ( tlw->GetDefaultItem() == this )
+            return;
+    }
+
+    impl->SetAcceleratorFromLabel(label);
+}
+
 
 wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
-                                    wxWindowID id,
+                                    wxWindowID winid,
                                     const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
@@ -220,53 +301,12 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
-    // We can't display a custom label inside a button with help bezel style so
-    // we only use it if we are using the default label. wxButton itself checks
-    // if the label is just "Help" in which case it discards it and passes us
-    // an empty string.
-    if ( id == wxID_HELP && label.empty() )
-    {
-        [v setBezelStyle:NSHelpButtonBezelStyle];
-    }
-    else
-    {
-        if ( style & wxBORDER_NONE )
-        {
-            [v setBezelStyle:NSShadowlessSquareBezelStyle];
-            [v setBordered:NO];
-        }
-        else 
-        {
-            // the following styles only exist for certain sizes, so avoid them for
-            // multi-line
-            if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
-            {
-                if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
-                    [v setBezelStyle:NSRoundedBezelStyle];
-                else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
-                    [v setBezelStyle:NSTexturedRoundedBezelStyle];
-                else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
-                    [v setBezelStyle:NSShadowlessSquareBezelStyle];
-                else
-                    [v setBezelStyle:NSRoundedBezelStyle];
-            }
-            else 
-            {
-                if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
-                    [v setBezelStyle:NSRegularSquareBezelStyle];
-                else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
-                    [v setBezelStyle:NSSmallSquareBezelStyle];
-                else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE )
-                    [v setBezelStyle:NSShadowlessSquareBezelStyle];
-                else
-                    [v setBezelStyle:NSRegularSquareBezelStyle];
-            }
+    SetBezelStyleFromBorderFlags(v, style, winid, label);
 
-        }
-    }
-    
     [v setButtonType:NSMomentaryPushInButton];
-    return new wxButtonCocoaImpl( wxpeer, v );
+    wxButtonCocoaImpl* const impl = new wxButtonCocoaImpl( wxpeer, v );
+    impl->SetAcceleratorFromLabel(label);
+    return impl;
 }
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
@@ -274,7 +314,10 @@ void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
     if ( [m_osxView isKindOfClass:[NSButton class]] )
     {
         if ( isDefault )
+        {
             [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
+            [(NSButton*)m_osxView setKeyEquivalentModifierMask: 0];
+        }
         else
             [(NSButton*)m_osxView setKeyEquivalent: @"" ];
     }
@@ -290,7 +333,7 @@ void wxWidgetCocoaImpl::PerformClick()
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
                                                    wxWindowMac* WXUNUSED(parent),
-                                                   wxWindowID WXUNUSED(id),
+                                                   wxWindowID winid,
                                                    const wxBitmap& bitmap,
                                                    const wxPoint& pos,
                                                    const wxSize& size,
@@ -300,7 +343,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), bitmap);
 
     if (bitmap.IsOk())
         [v setImage:bitmap.GetNSImage() ];
@@ -447,7 +490,7 @@ public :
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
-                                    wxWindowID WXUNUSED(winid),
+                                    wxWindowID winid,
                                     const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
@@ -459,7 +502,7 @@ wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
     if ( !label.empty() )
         [v setTitle:wxCFStringRef(label).AsNSString()];
 
-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, label);
 
     return new wxDisclosureTriangleCocoaImpl( wxpeer, v );
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/checkbox.mm b/Externals/wxWidgets3/src/osx/cocoa/checkbox.mm
index bc77962d08..941ea79a5a 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/checkbox.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/checkbox.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-08-20
-// RCS-ID:      $Id: checkbox.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/choice.mm b/Externals/wxWidgets3/src/osx/cocoa/choice.mm
index c9303988ad..0068d5d31d 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/choice.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/choice.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/colour.mm b/Externals/wxWidgets3/src/osx/cocoa/colour.mm
index c0acfd67e4..73df7fbf01 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/colour.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/colour.mm
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier
 // Modified by:
 // Created:     2009-10-31
-// RCS-ID:      $Id: colour.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,5 +41,5 @@ wxColour::wxColour(WX_NSColor col)
 
 WX_NSColor wxColour::OSXGetNSColor() const
 {
-    return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
+    return [NSColor colorWithCalibratedRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/combobox.mm b/Externals/wxWidgets3/src/osx/cocoa/combobox.mm
index 61734d91cc..112b37b43e 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/combobox.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/combobox.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobox.mm 69948 2011-12-07 23:41:06Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +13,7 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
+#include "wx/evtloop.h"
 
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
@@ -35,12 +35,6 @@
 @end
 
 
-@interface wxNSComboBox : NSComboBox
-{
-}
-
-@end
-
 @implementation wxNSComboBox
 
 + (void)initialize
@@ -53,6 +47,33 @@
     }
 }
 
+- (void) dealloc
+{
+    [fieldEditor release];
+    [super dealloc];
+}
+
+// Over-riding NSComboBox onKeyDown method doesn't work for key events.
+// Ensure that we can use our own wxNSTextFieldEditor to catch key events.
+// See windowWillReturnFieldEditor in nonownedwnd.mm.
+// Key events will be caught and handled via wxNSTextFieldEditor onkey...
+// methods in textctrl.mm.
+
+- (void) setFieldEditor:(wxNSTextFieldEditor*) editor
+{
+    if ( editor != fieldEditor )
+    {
+        [editor retain];
+        [fieldEditor release];
+        fieldEditor = editor;
+    }
+}
+
+- (wxNSTextFieldEditor*) fieldEditor
+{
+    return fieldEditor;
+}
+
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
     wxUnusedVar(aNotification);
@@ -61,7 +82,7 @@
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+            wxCommandEvent event(wxEVT_TEXT, wxpeer->GetId());
             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxComboBox*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
@@ -75,15 +96,20 @@
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl && impl->ShouldSendEvents())
     {
-        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+        wxComboBox* wxpeer = static_cast<wxComboBox*>(impl->GetWXPeer());
         if ( wxpeer ) {
-            wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, wxpeer->GetId());
+            const int sel = wxpeer->GetSelection();
+
+            wxCommandEvent event(wxEVT_COMBOBOX, wxpeer->GetId());
             event.SetEventObject( wxpeer );
-            event.SetInt( static_cast<wxComboBox*>(wxpeer)->GetSelection() );
+            event.SetInt( sel );
+            event.SetString( wxpeer->GetString(sel) );
             // For some reason, wxComboBox::GetValue will not return the newly selected item 
             // while we're inside this callback, so use AddPendingEvent to make sure
             // GetValue() returns the right value.
+
             wxpeer->GetEventHandler()->AddPendingEvent( event );
+
         }
     }
 }
@@ -99,6 +125,30 @@ wxNSComboBoxControl::~wxNSComboBoxControl()
 {
 }
 
+void wxNSComboBoxControl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
+{
+    // NSComboBox has its own event loop, which reacts very badly to our synthetic
+    // events used to signal when a wxEvent is posted, so during that time we switch
+    // the wxEventLoop::WakeUp implementation to a lower-level version
+    
+    bool reset = false;
+    wxEventLoop* const loop = (wxEventLoop*) wxEventLoopBase::GetActive();
+
+    if ( loop != NULL && [event type] == NSLeftMouseDown )
+    {
+        reset = true;
+        loop->OSXUseLowLevelWakeup(true);
+    }
+    
+    wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    superimpl(slf, (SEL)_cmd, event);
+ 
+    if ( reset )
+    {
+        loop->OSXUseLowLevelWakeup(false);
+    }
+}
+
 int wxNSComboBoxControl::GetSelectedItem() const
 {
     return [m_comboBox indexOfSelectedItem];
@@ -145,6 +195,7 @@ void wxNSComboBoxControl::Clear()
 {
     SendEvents(false);
     [m_comboBox removeAllItems];
+    [m_comboBox setStringValue:@""];
     SendEvents(true);
 }
 
@@ -177,6 +228,15 @@ void wxNSComboBoxControl::Dismiss()
     [ax accessibilitySetValue: [NSNumber numberWithBool: NO] forAttribute: NSAccessibilityExpandedAttribute];
 }
 
+void wxNSComboBoxControl::SetEditable(bool editable)
+{
+    // TODO: unfortunately this does not work, setEditable just means the same as CB_READONLY
+    // I don't see a way to access the text field directly
+    
+    // Behavior NONE <- SELECTECTABLE
+    [m_comboBox setEditable:editable];
+}
+
 wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, 
                                     wxWindowMac* WXUNUSED(parent), 
                                     wxWindowID WXUNUSED(id), 
@@ -188,6 +248,7 @@ wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer,
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r];
+    [v setNumberOfVisibleItems:13];
     if (style & wxCB_READONLY)
         [v setEditable:NO];
     wxNSComboBoxControl* c = new wxNSComboBoxControl( wxpeer, v );
diff --git a/Externals/wxWidgets3/src/osx/cocoa/dataview.mm b/Externals/wxWidgets3/src/osx/cocoa/dataview.mm
index ad8dfe54ec..e9df8f2063 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/dataview.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/dataview.mm
@@ -4,7 +4,6 @@
 // Author:
 // Modified by:
 // Created:     2009-01-31
-// RCS-ID:      $Id: dataview.mm$
 // Copyright:
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -352,7 +351,7 @@ NSTableColumn* CreateNativeColumn(const wxDataViewColumn *column)
     int resizingMask;
     if (column->IsResizeable())
     {
-        resizingMask = NSTableColumnUserResizingMask;
+        resizingMask = NSTableColumnUserResizingMask | NSTableColumnAutoresizingMask;
         [nativeColumn setMinWidth:column->GetMinWidth()];
         [nativeColumn setMaxWidth:column->GetMaxWidth()];
     }
@@ -368,10 +367,8 @@ NSTableColumn* CreateNativeColumn(const wxDataViewColumn *column)
     }
     [nativeColumn setResizingMask:resizingMask];
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     // setting the visibility:
     [nativeColumn setHidden:static_cast<BOOL>(column->IsHidden())];
-#endif
 
     wxDataViewRendererNativeData * const renderData = renderer->GetNativeData();
 
@@ -542,7 +539,7 @@ outlineView:(NSOutlineView*)outlineView
     wxCHECK_MSG( dvc->GetModel(), false,
                     "Pointer to model not set correctly." );
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_DROP, dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_DROP, dvc->GetId());
     event.SetEventObject(dvc);
     event.SetItem(wxDataViewItemFromItem(item));
     event.SetModel(dvc->GetModel());
@@ -753,7 +750,7 @@ outlineView:(NSOutlineView*)outlineView
 
     // send first the event to wxWidgets that the sorting has changed so that
     // the program can do special actions before the sorting actually starts:
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED,dvc->GetId()); // variable defintion
+    wxDataViewEvent event(wxEVT_DATAVIEW_COLUMN_SORTED,dvc->GetId()); // variable definition
 
     event.SetEventObject(dvc);
     if (noOfDescriptors > 0)
@@ -792,7 +789,7 @@ outlineView:(NSOutlineView*)outlineView
     wxCHECK_MSG(dvc->GetModel(), false, "Pointer to model not set correctly.");
 
     wxDataViewEvent
-        event(wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE,dvc->GetId());
+        event(wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE,dvc->GetId());
 
     event.SetEventObject(dvc);
     event.SetItem(wxDataViewItemFromItem(item));
@@ -897,7 +894,7 @@ outlineView:(NSOutlineView*)outlineView
         // send a begin drag event for all selected items and proceed with
         // dragging unless the event is vetoed:
         wxDataViewEvent
-            event(wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG,dvc->GetId());
+            event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG,dvc->GetId());
 
         event.SetEventObject(dvc);
         event.SetModel(dvc->GetModel());
@@ -926,7 +923,8 @@ outlineView:(NSOutlineView*)outlineView
                     size_t const dataSize       = event.GetDataObject()->GetDataSize(idDataFormat);
                     size_t const dataBufferSize = sizeof(wxDataFormatId)+dataSize;
                     // variable definitions (used in all case statements):
-                    wxMemoryBuffer dataBuffer(dataBufferSize);
+                    // give additional headroom for trailing NULL
+                    wxMemoryBuffer dataBuffer(dataBufferSize+4);
 
                     dataBuffer.AppendData(&idDataFormat,sizeof(wxDataFormatId));
                     switch (idDataFormat)
@@ -958,13 +956,13 @@ outlineView:(NSOutlineView*)outlineView
                             break;
                         default:
                             wxFAIL_MSG("Data object has invalid or unsupported data format");
-                            [dataArray release];
                             return NO;
                     }
                 }
                 delete[] dataFormats;
                 delete itemObject;
                 if (dataStringAvailable)
+                {
                     if (itemStringAvailable)
                     {
                         if (itemCounter > 0)
@@ -973,10 +971,10 @@ outlineView:(NSOutlineView*)outlineView
                     }
                     else
                         dataStringAvailable = false;
+                }
             }
             else
             {
-                [dataArray release];
                 delete itemObject;
                 return NO; // dragging was vetoed or no data available
             }
@@ -1167,6 +1165,23 @@ outlineView:(NSOutlineView*)outlineView
 
 @implementation wxCustomCell
 
+#if 0 // starting implementation for custom cell clicks
+
+- (id)init
+{
+    self = [super init];
+    [self setAction:@selector(clickedAction)];
+    [self setTarget:self];
+    return self;
+}
+
+- (void) clickedAction: (id) sender
+{
+    wxUnusedVar(sender);
+}
+
+#endif
+
 -(NSSize) cellSize
 {
     wxCustomRendererObject * const
@@ -1469,7 +1484,6 @@ outlineView:(NSOutlineView*)outlineView
     [super editWithFrame:textFrame inView:controlView editor:textObj delegate:anObject event:theEvent];
 }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 -(NSUInteger) hitTestForEvent:(NSEvent*)event inRect:(NSRect)cellFrame ofView:(NSView*)controlView
 {
     NSPoint point = [controlView convertPoint:[event locationInWindow] fromView:nil];
@@ -1511,7 +1525,6 @@ outlineView:(NSOutlineView*)outlineView
 
     return [super hitTestForEvent:event inRect:textFrame ofView:controlView];
 }
-#endif
 
 -(NSRect) imageRectForBounds:(NSRect)cellFrame
 {
@@ -1608,7 +1621,7 @@ outlineView:(NSOutlineView*)outlineView
     // sent whether the cell is editable or not
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_ACTIVATED,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1629,7 +1642,7 @@ outlineView:(NSOutlineView*)outlineView
     // menu should be shown or not
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU,dvc->GetId());
 
     wxDataViewItemArray selectedItems;
 
@@ -1650,7 +1663,7 @@ outlineView:(NSOutlineView*)outlineView
 //
 // delegate methods
 //
--(void) outlineView:(NSOutlineView*)outlineView mouseDownInHeaderOfTableColumn:(NSTableColumn*)tableColumn
+-(void) outlineView:(NSOutlineView*)outlineView didClickTableColumn:(NSTableColumn*)tableColumn
 {
     wxDataViewColumn* const
         col([static_cast<wxDVCNSTableColumn*>(tableColumn) getColumnPointer]);
@@ -1658,7 +1671,7 @@ outlineView:(NSOutlineView*)outlineView
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent
-        event(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK,dvc->GetId());
+        event(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK,dvc->GetId());
 
 
     // first, send an event that the user clicked into a column's header:
@@ -1685,7 +1698,7 @@ outlineView:(NSOutlineView*)outlineView
         NSArray*          sortDescriptors;
         NSSortDescriptor* sortDescriptor;
 
-        sortDescriptor = [[NSSortDescriptor alloc] initWithKey:[NSString stringWithFormat:@"%d",[outlineView columnWithIdentifier:[tableColumn identifier]]]
+        sortDescriptor = [[NSSortDescriptor alloc] initWithKey:[NSString stringWithFormat:@"%ld",(long)[outlineView columnWithIdentifier:[tableColumn identifier]]]
             ascending:YES];
         sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
         [tableColumn setSortDescriptorPrototype:sortDescriptor];
@@ -1700,7 +1713,7 @@ outlineView:(NSOutlineView*)outlineView
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_COLLAPSING,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1718,7 +1731,7 @@ outlineView:(NSOutlineView*)outlineView
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_EXPANDING,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1793,7 +1806,7 @@ outlineView:(NSOutlineView*)outlineView
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_COLUMN_REORDERED,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1806,7 +1819,7 @@ outlineView:(NSOutlineView*)outlineView
 {
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_COLLAPSED,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1819,7 +1832,7 @@ outlineView:(NSOutlineView*)outlineView
 {
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_EXPANDED,dvc->GetId());
 
 
     event.SetEventObject(dvc);
@@ -1834,7 +1847,7 @@ outlineView:(NSOutlineView*)outlineView
 
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
-    wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
+    wxDataViewEvent event(wxEVT_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
 
     event.SetEventObject(dvc);
     event.SetModel(dvc->GetModel());
@@ -1869,7 +1882,7 @@ outlineView:(NSOutlineView*)outlineView
 
     // now, send the event:
     wxDataViewEvent
-        event(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED,dvc->GetId());
+        event(wxEVT_DATAVIEW_ITEM_EDITING_STARTED,dvc->GetId());
 
     event.SetEventObject(dvc);
     event.SetItem(
@@ -1889,9 +1902,9 @@ outlineView:(NSOutlineView*)outlineView
     // even if no event indicating a start of an editing session has been sent
     // (see Documentation for NSControl controlTextDidEndEditing:); this is
     // not expected by a user of the wxWidgets library and therefore an
-    // wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event is only sent if a
-    // corresponding wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED has been sent
-    // before; to check if a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED has
+    // wxEVT_DATAVIEW_ITEM_EDITING_DONE event is only sent if a
+    // corresponding wxEVT_DATAVIEW_ITEM_EDITING_STARTED has been sent
+    // before; to check if a wxEVT_DATAVIEW_ITEM_EDITING_STARTED has
     // been sent the last edited column/row are valid:
     if ( currentlyEditedColumn != -1 && currentlyEditedRow != -1 )
     {
@@ -1904,7 +1917,7 @@ outlineView:(NSOutlineView*)outlineView
 
         // send event to wxWidgets:
         wxDataViewEvent
-            event(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE,dvc->GetId());
+            event(wxEVT_DATAVIEW_ITEM_EDITING_DONE,dvc->GetId());
 
         event.SetEventObject(dvc);
         event.SetItem(
@@ -1948,6 +1961,9 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer,
     [scrollview setAutohidesScrollers:YES];
     [scrollview setDocumentView:m_OutlineView];
 
+    // we cannot call InstallHandler(m_OutlineView) here, because we are handling
+    // our action:s ourselves, only associate the view with this impl
+    Associate(m_OutlineView,this);
     // initialize the native control itself too
     InitOutlineView(style);
 }
@@ -1955,7 +1971,7 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer,
 void wxCocoaDataViewControl::InitOutlineView(long style)
 {
     [m_OutlineView setImplementation:this];
-    [m_OutlineView setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle];
+    [m_OutlineView setColumnAutoresizingStyle:NSTableViewLastColumnOnlyAutoresizingStyle];
     [m_OutlineView setIndentationPerLevel:GetDataViewCtrl()->GetIndent()];
     NSUInteger maskGridStyle(NSTableViewGridNone);
     if (style & wxDV_HORIZ_RULES)
@@ -2040,7 +2056,6 @@ bool wxCocoaDataViewControl::InsertColumn(unsigned int pos, wxDataViewColumn* co
 
 void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
 {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
     const int count = GetCount();
     NSTableColumn *column = GetColumn(pos)->GetNativeData()->GetNativeColumnPtr();
 
@@ -2153,7 +2168,6 @@ void wxCocoaDataViewControl::FitColumnWidthToContent(unsigned int pos)
     }
 
     [column setWidth:calculator.GetMaxWidth()];
-#endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 }
 
 //
@@ -2620,12 +2634,11 @@ wxDataViewRenderer::OSXOnCellChanged(NSObject *object,
                                      const wxDataViewItem& item,
                                      unsigned col)
 {
-    // TODO: we probably should get rid of this code entirely and make this
-    //       function pure virtual, but currently we still have some native
-    //       renderers (wxDataViewChoiceRenderer) which don't override it and
-    //       there is also wxDataViewCustomRenderer for which it's not obvious
-    //       how it should be implemented so keep this "auto-deduction" of
-    //       variant type from NSObject for now
+    // TODO: This code should really be removed and this function be made pure
+    //       virtual. We just need to decide what to do with custom renderers
+    //       (i.e. wxDataViewCustomRenderer), currently OS X "in place" editing
+    //       which doesn't really create an editor control is not compatible
+    //       with the in place editing under other platforms.
 
     wxVariant value;
     if ( [object isKindOfClass:[NSString class]] )
@@ -2698,7 +2711,7 @@ void wxDataViewRenderer::OSXApplyAttr(const wxDataViewItemAttr& attr)
             }
 
             const wxColour& c = attr.GetColour();
-            colText = [NSColor colorWithDeviceRed:c.Red() / 255.
+            colText = [NSColor colorWithCalibratedRed:c.Red() / 255.
                 green:c.Green() / 255.
                 blue:c.Blue() / 255.
                 alpha:c.Alpha() / 255.];
@@ -2856,6 +2869,17 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(const wxArrayString& choices,
     [cell release];
 }
 
+void
+wxDataViewChoiceRenderer::OSXOnCellChanged(NSObject *value,
+                                           const wxDataViewItem& item,
+                                           unsigned col)
+{
+    // At least under OS X 10.7 we get the index of the item selected and not
+    // its string.
+    wxDataViewModel *model = GetOwner()->GetOwner()->GetModel();
+    model->ChangeValue(GetChoice(ObjectToLong(value)), item, col);
+}
+
 bool wxDataViewChoiceRenderer::MacRender()
 {
     if (GetValue().GetType() == GetVariantType())
@@ -2995,6 +3019,8 @@ bool wxDataViewIconTextRenderer::MacRender()
         iconText << GetValue();
         if (iconText.GetIcon().IsOk())
             [cell setImage:[[wxBitmap(iconText.GetIcon()).GetNSImage() retain] autorelease]];
+        else
+            [cell setImage:nil];
         [cell setStringValue:[[wxCFStringRef(iconText.GetText()).AsNSString() retain] autorelease]];
         return true;
     }
@@ -3126,6 +3152,7 @@ wxDataViewColumn::wxDataViewColumn(const wxString& title,
     if (renderer && !renderer->IsCustomRenderer() &&
         (renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT))
         renderer->SetAlignment(align);
+    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
 }
 
 wxDataViewColumn::wxDataViewColumn(const wxBitmap& bitmap,
@@ -3210,7 +3237,7 @@ void wxDataViewColumn::SetResizeable(bool resizable)
 {
     wxDataViewColumnBase::SetResizeable(resizable);
     if (resizable)
-        [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnUserResizingMask];
+        [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnUserResizingMask | NSTableColumnAutoresizingMask];
     else
         [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnNoResizing];
 }
@@ -3263,15 +3290,13 @@ void wxDataViewColumn::SetWidth(int width)
     switch ( width )
     {
         case wxCOL_WIDTH_AUTOSIZE:
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
             if ( GetOwner() )
             {
                 wxCocoaDataViewControl *peer = static_cast<wxCocoaDataViewControl*>(GetOwner()->GetPeer());
                 peer->FitColumnWidthToContent(GetOwner()->GetColumnPosition(this));
                 break;
             }
-#endif
-            // fall through if unsupported (OSX < 10.5) or not yet settable
+            // fall through if not yet settable
 
         case wxCOL_WIDTH_DEFAULT:
             width = wxDVC_DEFAULT_WIDTH;
diff --git a/Externals/wxWidgets3/src/osx/cocoa/datetimectrl.mm b/Externals/wxWidgets3/src/osx/cocoa/datetimectrl.mm
index 4e8a44e894..575a8a2b48 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/datetimectrl.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/datetimectrl.mm
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxDateTimePickerCtrl for Cocoa.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// Version:     $Id$
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -78,7 +77,12 @@ public:
 
     virtual void SetDateTime(const wxDateTime& dt)
     {
-        [View() setDateValue: NSDateFromWX(dt)];
+        wxDateTime dtFrom, dtTo;
+        
+        if ( GetDateRange(&dtFrom,&dtTo) == false ||
+            ( (!dtFrom.IsValid() || dtFrom <= dt) &&
+             (!dtTo.IsValid() || dt <= dtTo ) ) )
+            [View() setDateValue: NSDateFromWX(dt)];
     }
 
     virtual wxDateTime GetDateTime() const
@@ -172,7 +176,9 @@ wxDateTimeWidgetImpl::CreateDateTimePicker(wxDateTimePickerCtrl* wxpeer,
     }
 
     wxDateTimeWidgetImpl* c = new wxDateTimeWidgetCocoaImpl(wxpeer, v);
+#if !wxOSX_USE_NATIVE_FLIPPED
     c->SetFlipped(false);
+#endif
     return c;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/dialog.mm b/Externals/wxWidgets3/src/osx/cocoa/dialog.mm
index ad0a972e2f..8b1e48f1b4 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/dialog.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/dialog.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dialog.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/dirdlg.mm b/Externals/wxWidgets3/src/osx/cocoa/dirdlg.mm
index ff8bd78924..ef8886ac69 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/dirdlg.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/dirdlg.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-08-30
-// RCS-ID:      $Id: dirdlg.mm 67897 2011-06-09 00:29:13Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,12 +30,19 @@
 #endif
 
 #include "wx/filename.h"
+#include "wx/evtloop.h"
+#include "wx/modalhook.h"
 
 #include "wx/osx/private.h"
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
-wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
+void wxDirDialog::Init()
+{
+    m_sheetDelegate = nil;
+}
+
+void wxDirDialog::Create(wxWindow *parent, const wxString& message,
         const wxString& defaultPath, long style, const wxPoint& WXUNUSED(pos),
         const wxSize& WXUNUSED(size), const wxString& WXUNUSED(name))
 {
@@ -54,12 +60,8 @@ wxDirDialog::~wxDirDialog()
     [m_sheetDelegate release];
 }
 
-void wxDirDialog::ShowWindowModal()
+WX_NSOpenPanel wxDirDialog::OSXCreatePanel() const
 {
-    wxCFStringRef dir( m_path );
-    
-    m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;
-    
     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
@@ -68,38 +70,40 @@ void wxDirDialog::ShowWindowModal()
     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];
 
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) )
+    if ( !HasFlag(wxDD_DIR_MUST_EXIST) )
         [oPanel setCanCreateDirectories:YES];
-    
+
+    return oPanel;
+}
+
+void wxDirDialog::ShowWindowModal()
+{
     wxNonOwnedWindow* parentWindow = NULL;
-    
+
     if (GetParent())
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
-    
-    wxASSERT_MSG(parentWindow, "Window modal display requires parent.");
-    
-    if (parentWindow)
-    {
-        NSWindow* nativeParent = parentWindow->GetWXWindow();
-        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil
-            modalForWindow: nativeParent modalDelegate: m_sheetDelegate
-            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
-            contextInfo: nil];
-    }
+
+    wxCHECK_RET(parentWindow, "Window modal display requires parent.");
+
+    m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;
+
+    NSOpenPanel *oPanel = OSXCreatePanel();
+
+    NSWindow* nativeParent = parentWindow->GetWXWindow();
+    wxCFStringRef dir( m_path );
+    [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil
+        modalForWindow: nativeParent modalDelegate: m_sheetDelegate
+        didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
+        contextInfo: nil];
 }
 
 int wxDirDialog::ShowModal()
 {
-    NSOpenPanel *oPanel = [NSOpenPanel openPanel];
-    [oPanel setCanChooseDirectories:YES];
-    [oPanel setResolvesAliases:YES];
-    [oPanel setCanChooseFiles:NO];
+    WX_HOOK_MODAL_DIALOG();
 
-    wxCFStringRef cf( m_message );
-    [oPanel setMessage:cf.AsNSString()];
+    wxCFEventLoopPauseIdleEvents pause;
 
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) )
-        [oPanel setCanCreateDirectories:YES];
+    NSOpenPanel *oPanel = OSXCreatePanel();
 
     wxCFStringRef dir( m_path );
 
@@ -120,11 +124,11 @@ void wxDirDialog::ModalFinishedCallback(void* panel, int returnCode)
     if (returnCode == NSOKButton )
     {
         NSOpenPanel* oPanel = (NSOpenPanel*)panel;
-        SetPath( wxCFStringRef::AsString([[oPanel filenames] objectAtIndex:0]));
+        SetPath( wxCFStringRef::AsStringWithNormalizationFormC([[oPanel filenames] objectAtIndex:0]));
         result = wxID_OK;
     }
     SetReturnCode(result);
-    
+
     if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
         SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/dnd.mm b/Externals/wxWidgets3/src/osx/cocoa/dnd.mm
index befc2fdad8..47faae9b16 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/dnd.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/dnd.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dnd.mm 70810 2012-03-05 06:10:19Z SC $
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/evtloop.mm b/Externals/wxWidgets3/src/osx/cocoa/evtloop.mm
index d41450df54..3e43d778dc 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/evtloop.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/evtloop.mm
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloop.mm 70786 2012-03-03 13:09:54Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/log.h"
+#include "wx/scopeguard.h"
 
 #include "wx/osx/private.h"
 
@@ -66,10 +66,8 @@ static NSUInteger CalculateNSEventMaskFromEventCategory(wxEventCategory cat)
             NSMouseEnteredMask |
             NSMouseExitedMask |
             NSScrollWheelMask |
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
             NSTabletPointMask |
             NSTabletProximityMask |
-#endif
             NSOtherMouseDownMask |
             NSOtherMouseUpMask |
             NSOtherMouseDraggedMask |
@@ -77,14 +75,12 @@ static NSUInteger CalculateNSEventMaskFromEventCategory(wxEventCategory cat)
             NSKeyDownMask |
             NSKeyUpMask |
             NSFlagsChangedMask |
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
             NSEventMaskGesture |
             NSEventMaskMagnify |
             NSEventMaskSwipe |
             NSEventMaskRotate |
             NSEventMaskBeginGesture |
             NSEventMaskEndGesture |
-#endif
             0;
     }
     
@@ -109,6 +105,7 @@ wxGUIEventLoop::wxGUIEventLoop()
     m_dummyWindow = nil;
     m_modalNestedLevel = 0;
     m_modalWindow = NULL;
+    m_osxLowLevelWakeUp = false;
 }
 
 wxGUIEventLoop::~wxGUIEventLoop()
@@ -239,28 +236,124 @@ int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
     }
 }
 
-void wxGUIEventLoop::DoRun()
+static int gs_loopNestingLevel = 0;
+
+void wxGUIEventLoop::OSXDoRun()
 {
-    wxMacAutoreleasePool autoreleasepool;
-    [NSApp run];
+    /*
+       In order to properly nest GUI event loops in Cocoa, it is important to
+       have [NSApp run] only as the main/outermost event loop.  There are many
+       problems if [NSApp run] is used as an inner event loop.  The main issue
+       is that a call to [NSApp stop] is needed to exit an [NSApp run] event
+       loop. But the [NSApp stop] has some side effects that we do not want -
+       such as if there was a modal dialog box with a modal event loop running,
+       that event loop would also get exited, and the dialog would be closed.
+       The call to [NSApp stop] would also cause the enclosing event loop to
+       exit as well.
+
+       webkit's webcore library uses CFRunLoopRun() for nested event loops. See
+       the log of the commit log about the change in webkit's webcore module:
+       http://www.mail-archive.com/webkit-changes@lists.webkit.org/msg07397.html
+
+       See here for the latest run loop that is used in webcore:
+       https://github.com/WebKit/webkit/blob/master/Source/WebCore/platform/mac/RunLoopMac.mm
+
+       CFRunLoopRun() was tried for the nested event loop here but it causes a
+       problem in that all user input is disabled - and there is no way to
+       re-enable it.  The caller of this event loop may not want user input
+       disabled (such as synchronous wxExecute with wxEXEC_NODISABLE flag).
+
+       In order to have an inner event loop where user input can be enabled,
+       the old wxCocoa code that used the [NSApp nextEventMatchingMask] was
+       borrowed but changed to use blocking instead of polling. By specifying
+       'distantFuture' in 'untildate', we can have it block until the next
+       event.  Then we can keep looping on each new event until m_shouldExit is
+       raised to exit the event loop.
+    */
+    gs_loopNestingLevel++;
+    wxON_BLOCK_EXIT_SET(gs_loopNestingLevel, gs_loopNestingLevel - 1);
+
+    while ( !m_shouldExit )
+    {
+        // By putting this inside the loop, we can drain it in each
+        // loop iteration.
+        wxMacAutoreleasePool autoreleasepool;
+
+        if ( gs_loopNestingLevel == 1 )
+        {
+            // Use -[NSApplication run] for the main run loop.
+            [NSApp run];
+        }
+        else
+        {
+            // We use this blocking call to [NSApp nextEventMatchingMask:...]
+            // because the other methods (such as CFRunLoopRun() and [runLoop
+            // runMode:beforeDate] were always disabling input to the windows
+            // (even if we wanted it enabled).
+            //
+            // Here are the other run loops which were tried, but always left
+            // user input disabled:
+            //
+            // [runLoop runMode:NSDefaultRunLoopMode beforeDate:date];
+            // CFRunLoopRun();
+            // CFRunLoopRunInMode(kCFRunLoopDefaultMode, 10 , true);
+            //
+            // Using [NSApp nextEventMatchingMask:...] would leave windows
+            // enabled if we wanted them to be, so that is why it is used.
+            NSEvent *event = [NSApp
+                    nextEventMatchingMask:NSAnyEventMask
+                    untilDate:[NSDate distantFuture]
+                    inMode:NSDefaultRunLoopMode
+                    dequeue: YES];
+
+            [NSApp sendEvent: event];
+
+            /**
+              The NSApplication documentation states that:
+
+              "
+              This method is invoked automatically in the main event loop
+              after each event when running in NSDefaultRunLoopMode or
+              NSModalRunLoopMode. This method is not invoked automatically
+              when running in NSEventTrackingRunLoopMode.
+              "
+
+              So to be safe, we also invoke it here in this event loop.
+
+              See: https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/Reference/Reference.html
+            */
+            [NSApp updateWindows];
+        }
+    }
+
+    // Wake up the enclosing loop so that it can check if it also needs
+    // to exit.
+    WakeUp();
 }
 
-void wxGUIEventLoop::DoStop()
+void wxGUIEventLoop::OSXDoStop()
 {
-    // only calling stop: is not enough when called from a runloop-observer,
-    // therefore add a dummy event, to make sure the runloop gets another round
-    [NSApp stop:0];
+    // We should only stop the top level event loop.
+    if ( gs_loopNestingLevel <= 1 )
+    {
+        [NSApp stop:0];
+    }
+
+    // For the top level loop only calling stop: is not enough when called from
+    // a runloop-observer, therefore add a dummy event, to make sure the
+    // runloop gets another round. And for the nested loops we need to wake it
+    // up to notice that it should exit, so do this unconditionally.
     WakeUp();
 }
 
 void wxGUIEventLoop::WakeUp()
 {
     // NSEvent* cevent = [NSApp currentEvent];
-    NSString* mode = [[NSRunLoop mainRunLoop] currentMode];
+    // NSString* mode = [[NSRunLoop mainRunLoop] currentMode];
     
     // when already in a mouse event handler, don't add higher level event
     // if ( cevent != nil && [cevent type] <= NSMouseMoved && )
-    if ( [NSEventTrackingRunLoopMode isEqualToString:mode] )
+    if ( m_osxLowLevelWakeUp /* [NSEventTrackingRunLoopMode isEqualToString:mode] */ )
     {
         // NSLog(@"event for wakeup %@ in mode %@",cevent,mode);
         wxCFEventLoop::WakeUp();        
@@ -304,7 +397,7 @@ wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
 
 // END move into a evtloop_osx.cpp
 
-void wxModalEventLoop::DoRun()
+void wxModalEventLoop::OSXDoRun()
 {
     wxMacAutoreleasePool pool;
 
@@ -323,11 +416,50 @@ void wxModalEventLoop::DoRun()
     [NSApp runModalForWindow:m_modalNativeWindow];
 }
 
-void wxModalEventLoop::DoStop()
+void wxModalEventLoop::OSXDoStop()
 {
     [NSApp abortModal];
 }
 
+// we need our own version of ProcessIdle here in order to
+// avoid deletion of pending objects, because ProcessIdle is running
+// to soon and ends up in destroying the object too early, ie before
+// a stack allocated instance is removed resulting in double deletes
+bool wxModalEventLoop::ProcessIdle()
+{
+    bool needMore = false;
+    if ( wxTheApp )
+    {
+        // synthesize an idle event and check if more of them are needed
+        wxIdleEvent event;
+        event.SetEventObject(wxTheApp);
+        wxTheApp->ProcessEvent(event);
+        
+#if wxUSE_LOG
+        // flush the logged messages if any (do this after processing the events
+        // which could have logged new messages)
+        wxLog::FlushActive();
+#endif
+        needMore = event.MoreRequested();
+        
+        wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+        while (node)
+        {
+            wxWindow* win = node->GetData();
+            
+            // Don't send idle events to the windows that are about to be destroyed
+            // anyhow, this is wasteful and unexpected.
+            if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) )
+                needMore = true;
+            node = node->GetNext();
+        }
+        
+        wxUpdateUIEvent::ResetUpdateTime();
+
+    }
+    return needMore;
+}
+
 void wxGUIEventLoop::BeginModalSession( wxWindow* modalWindow )
 {
     WXWindow nsnow = nil;
@@ -459,4 +591,4 @@ wxWindowDisabler::~wxWindowDisabler()
     }
     
     delete m_winDisabled;
-}
\ No newline at end of file
+}
diff --git a/Externals/wxWidgets3/src/osx/cocoa/filedlg.mm b/Externals/wxWidgets3/src/osx/cocoa/filedlg.mm
index 55a7034131..67f58554c4 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/filedlg.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/filedlg.mm
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-10-02
-// RCS-ID:      $Id: filedlg.mm 67897 2011-06-09 00:29:13Z SC $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,9 +33,13 @@
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
+#include "wx/evtloop.h"
 
 #include "wx/osx/private.h"
 #include "wx/sysopt.h"
+#include "wx/modalhook.h"
+
+#include <mach-o/dyld.h>
 
 // ============================================================================
 // implementation
@@ -49,6 +52,32 @@
 // then the delegate method - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename will have to
 // be implemented
 
+namespace
+{
+
+bool HasAppKit_10_6()
+{
+    // Even if we require 10.6, we might be loaded by an application that
+    // was linked against 10.5.  setAllowedFileTypes will still be ignored
+    // in this case.  From NSSavePanel.h:
+    // NSOpenPanel: On versions less than 10.6, this property is ignored.
+    // For applications that link against 10.6 and higher, this property will
+    // determine which files should be enabled in the open panel.
+    int32_t version = NSVersionOfLinkTimeLibrary("AppKit");
+    if (version == -1)
+    {
+        // If we're loaded by an application that doesn't link against AppKit,
+        // use the runtime version instead.  This check will not work for the
+        // case above.
+        version = NSVersionOfRunTimeLibrary("AppKit");
+    }
+
+    // Notice that this still works correctly even if version is -1.
+    return version >= 0x40e2400 /* version of 10.6 AppKit */;
+}
+
+} // anonymous namespace
+
 @interface wxOpenPanelDelegate : NSObject wxOSX_10_6_AND_LATER(<NSOpenSavePanelDelegate>)
 {
     wxFileDialog* _dialog;
@@ -157,13 +186,20 @@
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
-wxFileDialog::wxFileDialog(
+void wxFileDialog::Init()
+{
+    m_filterIndex = -1;
+    m_delegate = nil;
+    m_sheetDelegate = nil;
+}
+
+void wxFileDialog::Create(
     wxWindow *parent, const wxString& message,
     const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
     long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
-    : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 {
-    m_filterIndex = -1;
+    wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+
     m_sheetDelegate = [[ModalDialogDelegate alloc] init];
     [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this];
 }
@@ -367,7 +403,7 @@ wxWindow* wxFileDialog::CreateFilterPanel(wxWindow *extracontrol)
             if ( m_firstFileTypeFilter >= 0 )
                 m_filterChoice->SetSelection(m_firstFileTypeFilter);
         }
-        m_filterChoice->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxFileDialog::OnFilterSelected), NULL, this);
+        m_filterChoice->Connect(wxEVT_CHOICE, wxCommandEventHandler(wxFileDialog::OnFilterSelected), NULL, this);
     }
         
     if(extracontrol)
@@ -418,6 +454,11 @@ bool wxFileDialog::CheckFile( const wxString& filename )
 void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 {
     NSSavePanel* panel = (NSSavePanel*) nativeWindow;
+    // for sandboxed app we cannot access the outer structures
+    // this leads to problems with extra controls, so as a temporary
+    // workaround for crashes we don't support those yet
+    if ( [panel contentView] == nil )
+        return;
     
     wxNonOwnedWindow::Create( GetParent(), nativeWindow );
     wxWindow* extracontrol = NULL;
@@ -428,7 +469,6 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
     }
 
     NSView* accView = nil;
-    m_delegate = nil;
 
     if ( m_useFileTypeFilter )
     {
@@ -436,7 +476,7 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
         accView = m_filterPanel->GetHandle();
         if( HasFlag(wxFD_OPEN) )
         {
-            if ( UMAGetSystemVersion() < 0x1060 )
+            if ( UMAGetSystemVersion() < 0x1060 || !HasAppKit_10_6() )
             {
                 wxOpenPanelDelegate* del = [[wxOpenPanelDelegate alloc]init];
                 [del setFileDialog:this];
@@ -466,6 +506,10 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
 
 int wxFileDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
+    wxCFEventLoopPauseIdleEvents pause;
+
     wxMacAutoreleasePool autoreleasepool;
     
     wxCFStringRef cf( m_message );
@@ -585,20 +629,22 @@ int wxFileDialog::ShowModal()
         [oPanel setMessage:cf.AsNSString()];
         [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
 
-        if ( UMAGetSystemVersion() < 0x1060 )
-        {
-            returnCode = [oPanel runModalForDirectory:m_dir.IsEmpty() ? nil : dir.AsNSString()
-                                                 file:file.AsNSString() types:(m_delegate == nil ? types : nil)];
-        }
-        else 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+        if ( UMAGetSystemVersion() >= 0x1060 && HasAppKit_10_6() )
         {
             [oPanel setAllowedFileTypes: (m_delegate == nil ? types : nil)];
             if ( !m_dir.IsEmpty() )
                 [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() 
-                                               isDirectory:YES]];
+                                                   isDirectory:YES]];
             returnCode = [oPanel runModal];
         }
-
+        else 
+#endif
+        {
+            returnCode = [oPanel runModalForDirectory:m_dir.IsEmpty() ? nil : dir.AsNSString()
+                                                 file:file.AsNSString() types:(m_delegate == nil ? types : nil)];
+        }
+            
         ModalFinishedCallback(oPanel, returnCode);
     }
 
@@ -615,7 +661,7 @@ void wxFileDialog::ModalFinishedCallback(void* panel, int returnCode)
             NSSavePanel* sPanel = (NSSavePanel*)panel;
             result = wxID_OK;
 
-            m_path = wxCFStringRef::AsString([sPanel filename]);
+            m_path = wxCFStringRef::AsStringWithNormalizationFormC([sPanel filename]);
             m_fileName = wxFileNameFromPath(m_path);
             m_dir = wxPathOnly( m_path );
             if (m_filterChoice)
@@ -634,7 +680,7 @@ void wxFileDialog::ModalFinishedCallback(void* panel, int returnCode)
             NSArray* filenames = [oPanel filenames];
             for ( size_t i = 0 ; i < [filenames count] ; ++ i )
             {
-                wxString fnstr = wxCFStringRef::AsString([filenames objectAtIndex:i]);
+                wxString fnstr = wxCFStringRef::AsStringWithNormalizationFormC([filenames objectAtIndex:i]);
                 m_paths.Add( fnstr );
                 m_fileNames.Add( wxFileNameFromPath(fnstr) );
                 if ( i == 0 )
@@ -657,7 +703,9 @@ void wxFileDialog::ModalFinishedCallback(void* panel, int returnCode)
     if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
         SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
     
-    UnsubclassWin();
+    // workaround for sandboxed app, see above
+    if ( m_isNativeWindowWrapper )
+        UnsubclassWin();
     [(NSSavePanel*) panel setAccessoryView:nil];
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/gauge.mm b/Externals/wxWidgets3/src/osx/cocoa/gauge.mm
index fb3ce4998d..cf82bd434b 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/gauge.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/gauge.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gauge.mm 69931 2011-12-05 00:00:58Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/glcanvas.mm b/Externals/wxWidgets3/src/osx/cocoa/glcanvas.mm
index 18b89f2f66..9f73bfec91 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/glcanvas.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/glcanvas.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas.mm 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,7 +38,9 @@ WXGLContext WXGLCreateContext( WXGLPixelFormat pixelFormat, WXGLContext shareCon
 {
     WXGLContext context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext: shareContext];
     if ( !context )
+    {
         wxFAIL_MSG("NSOpenGLContext creation failed");
+    }
     return context ;
 }
 
@@ -87,6 +88,7 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
         NSOpenGLPFAColorSize,(NSOpenGLPixelFormatAttribute)8,
         NSOpenGLPFAAlphaSize,(NSOpenGLPixelFormatAttribute)0,
         NSOpenGLPFADepthSize,(NSOpenGLPixelFormatAttribute)8,
+        NSOpenGLPFAAccelerated, // use hardware accelerated context
         (NSOpenGLPixelFormatAttribute)nil
     };
 
@@ -99,6 +101,7 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
     {
         unsigned p = 0;
         data[p++] = NSOpenGLPFAMinimumPolicy; // make _SIZE tags behave more like GLX
+        data[p++] = NSOpenGLPFAAccelerated; // use hardware accelerated context
 
         for ( unsigned arg = 0; attribList[arg] !=0 && p < WXSIZEOF(data); )
         {
diff --git a/Externals/wxWidgets3/src/osx/cocoa/listbox.mm b/Externals/wxWidgets3/src/osx/cocoa/listbox.mm
index e214b12abe..95d36c388e 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/listbox.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/listbox.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox.mm 67888 2011-06-08 22:50:28Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -303,8 +302,6 @@ protected:
         wxListBox *list = static_cast<wxListBox*> ( impl->GetWXPeer());
         wxCHECK_RET( list != NULL , wxT("Listbox expected"));
         
-        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
-        
         if ((row < 0) || (row > (int) list->GetCount()))  // OS X can select an item below the last item
             return;
         
@@ -314,6 +311,24 @@ protected:
     
 } 
 
+- (void)setFont:(NSFont *)aFont
+{
+    NSArray *tableColumns = [self tableColumns];
+    unsigned int columnIndex = [tableColumns count];
+    while (columnIndex--)
+        [[(NSTableColumn *)[tableColumns objectAtIndex:columnIndex] dataCell] setFont:aFont];
+
+    [self setRowHeight:[gNSLayoutManager defaultLineHeightForFont:aFont]+2];
+}
+
+- (void) setControlSize:(NSControlSize) size
+{
+    NSArray *tableColumns = [self tableColumns];
+    unsigned int columnIndex = [tableColumns count];
+    while (columnIndex--)
+        [[(NSTableColumn *)[tableColumns objectAtIndex:columnIndex] dataCell] setControlSize:size];
+}
+
 @end
 
 //
@@ -369,6 +384,11 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const
         [col1 setWidth:1000];
     }
     [col1 setResizingMask: NSTableColumnAutoresizingMask];
+    
+    wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
+    if ( list != NULL )
+        [[col1 dataCell] setFont:list->GetFont().OSXGetNSFont()];
+    
     wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
     [col1 setColumn:wxcol];
 
@@ -388,6 +408,39 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , con
     [checkbox setTitle:@""];
     [checkbox setButtonType:NSSwitchButton];
     [col1 setDataCell:checkbox] ;
+    
+    wxListBox *list = static_cast<wxListBox*> ( GetWXPeer());
+    if ( list != NULL )
+    {
+        NSControlSize size = NSRegularControlSize;
+        
+        switch ( list->GetWindowVariant() )
+        {
+            case wxWINDOW_VARIANT_NORMAL :
+                size = NSRegularControlSize;
+                break ;
+                
+            case wxWINDOW_VARIANT_SMALL :
+                size = NSSmallControlSize;
+                break ;
+                
+            case wxWINDOW_VARIANT_MINI :
+                size = NSMiniControlSize;
+                break ;
+                
+            case wxWINDOW_VARIANT_LARGE :
+                size = NSRegularControlSize;
+                break ;
+                
+            default:
+                break ;
+        }
+
+        [[col1 dataCell] setControlSize:size];
+        // although there is no text, it may help to get the correct vertical layout
+        [[col1 dataCell] setFont:list->GetFont().OSXGetNSFont()];        
+    }
+
     [checkbox release];
 
     unsigned formerColCount = [m_tableView numberOfColumns];
@@ -555,8 +608,8 @@ wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
     wxListWidgetCocoaImpl* c = new wxListWidgetCocoaImpl( wxpeer, scrollview, tableview, ds );
 
     // temporary hook for dnd
-    [tableview registerForDraggedTypes:[NSArray arrayWithObjects:
-        NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
+ //   [tableview registerForDraggedTypes:[NSArray arrayWithObjects:
+ //       NSStringPboardType, NSFilenamesPboardType, (NSString*) kPasteboardTypeFileURLPromise, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
 
     [ds setImplementation:c];
     return c;
diff --git a/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm b/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm
index 33381967df..73624098c5 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     02/03/05
-// RCS-ID:      $Id: mediactrl.mm 39285 2006-05-23 11:04:37Z ABX $
 // Copyright:   (c) 2004-2005 Ryan Norton, (c) 2005 David Elliot
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,9 +54,6 @@
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
-#import <AppKit/NSMovie.h>
-#import <AppKit/NSMovieView.h>
-
 class WXDLLIMPEXP_FWD_MEDIA wxQTMediaBackend;
 
 @interface wxQTMovie : QTMovie {
@@ -191,21 +187,22 @@ private:
     }
 }
 
--(void)loadStateChanged:(QTMovie *)movie
+-(void)loadStateChanged:(NSNotification *)notification
 {
+    QTMovie *movie = [notification object];
     long loadState = [[movie attributeForKey:QTMovieLoadStateAttribute] longValue];
-    if (loadState >= QTMovieLoadStatePlayable)
-    {
-        // the movie has loaded enough media data to begin playing
-    }
-    else if (loadState >= QTMovieLoadStateLoaded)
-    {
-        m_backend->FinishLoad();
-    }
-    else if (loadState == -1)
+    if ( loadState == QTMovieLoadStateError )
     {
         // error occurred 
     }
+    else if (loadState >= QTMovieLoadStatePlayable)
+    {
+        // the movie has loaded enough media data to begin playing, but we don't have an event for that yet
+    }
+    else if (loadState >= QTMovieLoadStateComplete) // we might use QTMovieLoadStatePlaythroughOK
+    {
+        m_backend->FinishLoad();
+    }
 }
 
 -(BOOL)isPlaying
@@ -227,8 +224,8 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 wxQTMediaBackend::wxQTMediaBackend() : 
-    m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE),
-    m_movie(nil), m_movieview(nil)
+    m_movie(nil), m_movieview(nil),
+    m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE)
 {
 }
 
@@ -283,13 +280,30 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
 bool wxQTMediaBackend::Load(const wxURI& location)
 {
     wxCFStringRef uri(location.BuildURI());
-
-    [m_movie release];
-    wxQTMovie* movie = [[wxQTMovie alloc] initWithURL: [NSURL URLWithString: uri.AsNSString()] error: nil ];
+    NSURL *url = [NSURL URLWithString: uri.AsNSString()];
     
+    if (! [wxQTMovie canInitWithURL:url])
+        return false;
+    
+    [m_movie release];
+    wxQTMovie* movie = [[wxQTMovie alloc] initWithURL:url error: nil ];
+
     m_movie = movie;
-    [m_movie setBackend:this];
-    [m_movieview setMovie:movie];
+    if (movie != nil)
+    {
+        [m_movie setBackend:this];
+        [m_movieview setMovie:movie];
+
+        // If the media file is able to be loaded quickly then there may not be
+        // any QTMovieLoadStateDidChangeNotification message sent, so we need to
+        // also check the load state here and finish our initialization if it has
+        // been loaded.
+        long loadState = [[m_movie attributeForKey:QTMovieLoadStateAttribute] longValue];
+        if (loadState >= QTMovieLoadStateComplete)
+        {
+            FinishLoad();
+        }        
+    }
     
     return movie != nil;
 }
@@ -298,12 +312,10 @@ void wxQTMediaBackend::FinishLoad()
 {
     DoShowPlayerControls(m_interfaceflags);
     
-    NSRect r =[m_movieview movieBounds];
-    m_bestSize.x = r.size.width;
-    m_bestSize.y = r.size.height;
+    NSSize s = [[m_movie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
+    m_bestSize = wxSize(s.width, s.height);
     
     NotifyMovieLoaded();
-
 }
 
 bool wxQTMediaBackend::Play()
@@ -394,6 +406,7 @@ wxSize wxQTMediaBackend::GetVideoSize() const
 
 void wxQTMediaBackend::Move(int x, int y, int w, int h)
 {
+    // as we have a native player, no need to move the video area 
 }
 
 bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
@@ -413,6 +426,8 @@ void wxQTMediaBackend::DoShowPlayerControls(wxMediaCtrlPlayerControls flags)
     }
     else 
     {
+        [m_movieview setControllerVisible:YES];
+        
         [m_movieview setStepButtonsVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_STEP) ? YES:NO];
         [m_movieview setVolumeButtonVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME) ? YES:NO];
     }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/menu.mm b/Externals/wxWidgets3/src/osx/cocoa/menu.mm
index dc0b61a2ed..d5fdc23761 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/menu.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/menu.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menu.mm 70401 2012-01-19 14:59:35Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,8 +66,8 @@
 - (void)menuNeedsUpdate:(NSMenu*)smenu;
 #else
 - (void)menuWillOpen:(NSMenu *)menu;
-- (void)menuDidClose:(NSMenu *)menu;
 #endif
+- (void)menuDidClose:(NSMenu *)menu;
 - (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item;
 
 @end
@@ -105,6 +104,7 @@
             wxpeer->HandleMenuOpened();
     }
 }
+#endif
 
 - (void)menuDidClose:(NSMenu *)smenu
 {
@@ -117,7 +117,6 @@
             wxpeer->HandleMenuClosed();
     }
 }
-#endif
 
 - (void)menu:(NSMenu *)smenu willHighlightItem:(NSMenuItem *)item
 {
@@ -141,6 +140,9 @@
 
 @interface NSApplication(MissingAppleMenuCall)
 - (void)setAppleMenu:(NSMenu *)menu;
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+- (void)setHelpMenu:(NSMenu* )menu;
+#endif
 @end
 
 class wxMenuCocoaImpl : public wxMenuImpl
@@ -155,7 +157,6 @@ public :
         }
         [menu setDelegate:controller];
         [m_osxMenu setImplementation:this];
-        [menu setAutoenablesItems:NO];
         // gc aware
         if ( m_osxMenu )
             CFRetain(m_osxMenu);
@@ -167,7 +168,7 @@ public :
     virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
-        // make sure a call of SetSubMenu is also reflected (occuring after Create)
+        // make sure a call of SetSubMenu is also reflected (occurring after Create)
         // update the native menu item accordingly
         
         if ( pItem->IsSubMenu() )
@@ -194,8 +195,35 @@ public :
 
     virtual void MakeRoot()
     {
+        wxMenu* peer = GetWXPeer();
+        
         [NSApp setMainMenu:m_osxMenu];
         [NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]];
+
+        wxMenuItem *services = peer->FindItem(wxID_OSX_SERVICES);
+        if ( services )
+            [NSApp setServicesMenu:services->GetSubMenu()->GetHMenu()];
+#if 0
+        // should we reset this just to be sure we don't leave a dangling ref ?
+        else
+            [NSApp setServicesMenu:nil];
+#endif
+        
+        NSMenu* helpMenu = nil;
+        int helpid = peer->FindItem(wxApp::s_macHelpMenuTitleName);
+        if ( helpid == wxNOT_FOUND )
+            helpid = peer->FindItem(_("&Help"));
+        
+        if ( helpid != wxNOT_FOUND )
+        {
+            wxMenuItem* helpMenuItem = peer->FindItem(helpid);
+            
+            if ( helpMenuItem->IsSubMenu() )
+                helpMenu = helpMenuItem->GetSubMenu()->GetHMenu();
+        }
+        if ( [NSApp respondsToSelector:@selector(setHelpMenu:)])
+            [NSApp setHelpMenu:helpMenu];
+        
     }
 
     virtual void Enable( bool WXUNUSED(enable) )
diff --git a/Externals/wxWidgets3/src/osx/cocoa/menuitem.mm b/Externals/wxWidgets3/src/osx/cocoa/menuitem.mm
index fe92deac10..578fcefd8e 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/menuitem.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/menuitem.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menuitem.mm 69205 2011-09-27 07:21:44Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -154,7 +153,6 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
         unichar shortcut = 0;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {
-            modifiers |= NSFunctionKeyMask ;
             shortcut = NSF1FunctionKey + ( key - WXK_F1 );
         }
         else
@@ -162,47 +160,50 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
             switch ( key )
             {
                 case WXK_CLEAR :
-                    modifiers |= NSFunctionKeyMask;
                     shortcut = NSDeleteCharacter ;
                     break ;
 
                 case WXK_PAGEUP :
-                    modifiers |= NSFunctionKeyMask;
                     shortcut = NSPageUpFunctionKey ;
                     break ;
 
                 case WXK_PAGEDOWN :
-                    modifiers |= NSFunctionKeyMask;
                     shortcut = NSPageDownFunctionKey ;
                     break ;
 
+                case WXK_NUMPAD_LEFT :
+                    modifiers |= NSNumericPadKeyMask;
+                    // pass through
                 case WXK_LEFT :
-                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
                     shortcut = NSLeftArrowFunctionKey ;
                     break ;
 
+                case WXK_NUMPAD_UP :
+                    modifiers |= NSNumericPadKeyMask;
+                    // pass through
                 case WXK_UP :
-                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
                     shortcut = NSUpArrowFunctionKey ;
                     break ;
 
+                case WXK_NUMPAD_RIGHT :
+                    modifiers |= NSNumericPadKeyMask;
+                    // pass through
                 case WXK_RIGHT :
-                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
                     shortcut = NSRightArrowFunctionKey ;
                     break ;
 
+                case WXK_NUMPAD_DOWN :
+                    modifiers |= NSNumericPadKeyMask;
+                    // pass through
                 case WXK_DOWN :
-                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
                     shortcut = NSDownArrowFunctionKey ;
                     break ;
 
                 case WXK_HOME :
-                    modifiers |= NSFunctionKeyMask;
                     shortcut = NSHomeFunctionKey ;
                     break ;
 
                 case WXK_END :
-                    modifiers |= NSFunctionKeyMask;
                     shortcut = NSEndFunctionKey ;
                     break ;
 
@@ -311,6 +312,10 @@ bool wxMenuItemCocoaImpl::DoDefault()
         [theNSApplication unhideAllApplications:nil];
         handled=true;
     }
+    else if (menuid == wxApp::s_macExitMenuItemId)
+    {
+        wxTheApp->ExitMainLoop();
+    }
     return handled;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/msgdlg.mm b/Externals/wxWidgets3/src/osx/cocoa/msgdlg.mm
index 4134406e47..fb52f0a7a0 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/msgdlg.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/msgdlg.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: msgdlg.mm 70926 2012-03-17 10:52:34Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,6 +19,8 @@
 
 #include "wx/control.h"
 #include "wx/thread.h"
+#include "wx/evtloop.h"
+#include "wx/modalhook.h"
 #include "wx/osx/private.h"
 
 
@@ -61,6 +62,10 @@ wxMessageDialog::~wxMessageDialog()
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
+    wxCFEventLoopPauseIdleEvents pause;
+    
     int resultbutton = wxID_CANCEL;
 
     const long style = GetMessageDialogStyle();
diff --git a/Externals/wxWidgets3/src/osx/cocoa/nonownedwnd.mm b/Externals/wxWidgets3/src/osx/cocoa/nonownedwnd.mm
index 3e4eb9a7b4..9e79c6a458 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/nonownedwnd.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/nonownedwnd.mm
@@ -4,7 +4,6 @@
 // Author:      DavidStefan Csomor
 // Modified by:
 // Created:     2008-06-20
-// RCS-ID:      $Id: nonownedwnd.mm 70862 2012-03-10 12:37:58Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -111,7 +110,7 @@ bool shouldHandleSelector(SEL selector)
     return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
 }
 
-// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occured, 
+// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occurred,
 // this does not conform to the wx behaviour if the window is not captured, so try to resend
 // or capture all wx mouse event handling at the tlw as we did for carbon
 
@@ -145,6 +144,8 @@ bool shouldHandleSelector(SEL selector)
 // wx native implementation 
 //
 
+static NSResponder* s_nextFirstResponder = NULL;
+
 @interface wxNSWindow : NSWindow
 {
 }
@@ -152,6 +153,7 @@ bool shouldHandleSelector(SEL selector)
 - (void) sendEvent:(NSEvent *)event;
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;
 @end
 
 @implementation wxNSWindow
@@ -206,6 +208,14 @@ bool shouldHandleSelector(SEL selector)
     return YES;
 }
 
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder
+{
+    s_nextFirstResponder = aResponder;
+    BOOL retval = [super makeFirstResponder:aResponder];
+    s_nextFirstResponder = nil;
+    return retval;
+}
+
 @end
 
 @interface wxNSPanel : NSPanel
@@ -215,6 +225,7 @@ bool shouldHandleSelector(SEL selector)
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;
 - (void)sendEvent:(NSEvent *)event;
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;
 @end
 
 @implementation wxNSPanel
@@ -265,6 +276,14 @@ bool shouldHandleSelector(SEL selector)
     }
 }
 
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder
+{
+    s_nextFirstResponder = aResponder;
+    BOOL retval = [super makeFirstResponder:aResponder];
+    s_nextFirstResponder = nil;
+    return retval;
+}
+
 @end
 
 
@@ -450,12 +469,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);
+            // as for wx the deactivation also means losing focus we
+            // must trigger this manually
+            [window makeFirstResponder:nil];
+            
+            // TODO Remove if no problems arise with Popup Windows
+#if 0
             // Needed for popup window since the firstResponder
             // (focus in wx) doesn't change when this
             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);
             wxpeer->HandleWindowEvent(event);
+#endif
         }
     }
 }
@@ -477,6 +503,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         }
         return editor;
     } 
+    else if ([anObject isKindOfClass:[wxNSComboBox class]])
+    {
+        wxNSComboBox * cb = (wxNSComboBox*) anObject;
+        wxNSTextFieldEditor* editor = [cb fieldEditor];
+        if ( editor == nil )
+        {
+            editor = [[wxNSTextFieldEditor alloc] init];
+            [editor setFieldEditor:YES];
+            [cb setFieldEditor:editor];
+            [editor release];
+        }
+        return editor;
+    }    
  
     return nil;
 }
@@ -517,6 +556,12 @@ wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
         [m_macWindow setDelegate:nil];
+     
+        // make sure we remove this first, otherwise the ref count will not lead to the 
+        // native window's destruction
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];
+
         [m_macWindow release];
     }
 }
@@ -542,12 +587,12 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
-    {
         m_macWindow = [wxNSPanel alloc];
-    }
     else
         m_macWindow = [wxNSWindow alloc];
 
+    [m_macWindow setAcceptsMouseMovedEvents:YES];
+
     CGWindowLevel level = kCGNormalWindowLevel;
 
     if ( style & wxFRAME_TOOL_WINDOW )
@@ -613,7 +658,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
     // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
     // to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay
     // above the parent.
-    wxDialog * const parentDialog = wxDynamicCast(parent, wxDialog);
+    wxDialog * const parentDialog = parent == NULL ? NULL : wxDynamicCast(parent->MacGetTopLevelWindow(), wxDialog);
     if (parentDialog && parentDialog->IsModal())
     {
         if (level == kCGFloatingWindowLevel)
@@ -679,14 +724,35 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     if ( show )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 
-        if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
-            [m_macWindow makeKeyAndOrderFront:nil];
-        else 
-            [m_macWindow orderFront:nil]; 
+        if ( wxpeer )
+        {
+            // add to parent window before showing
+            wxDialog * const dialog = wxDynamicCast(wxpeer, wxDialog);
+            if ( wxpeer->GetParent() && dialog && dialog->IsModal())
+            {
+                NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
+                if ( parentView )
+                {
+                    NSWindow* parentNSWindow = [parentView window];
+                    if ( parentNSWindow )
+                        [parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove];
+                }
+            }
+            
+            if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
+                [m_macWindow makeKeyAndOrderFront:nil];
+            else 
+                [m_macWindow orderFront:nil]; 
+        }
         [[m_macWindow contentView] setNeedsDisplay: YES];
     }
     else
+    {
+        // avoid propagation of orderOut to parent 
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];
         [m_macWindow orderOut:nil];
+    }
     return true;
 }
 
@@ -737,7 +803,8 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
 
 void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
 {
-    if (m_macWindow)
+    // don't mess with native wrapped windows, they might throw an exception when their level is changed
+    if (!m_wxPeer->IsNativeWindowWrapper() && m_macWindow)
     {
         CGWindowLevel level = kCGNormalWindowLevel;
         
@@ -993,6 +1060,12 @@ void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
         [m_macWindow setLevel:m_macWindowLevel];
 }
 
+WX_NSResponder wxNonOwnedWindowCocoaImpl::GetNextFirstResponder()
+{
+    return s_nextFirstResponder;
+}
+
+
 //
 //
 //
diff --git a/Externals/wxWidgets3/src/osx/cocoa/notebook.mm b/Externals/wxWidgets3/src/osx/cocoa/notebook.mm
index 11c4c27dc6..d71ca4047c 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/notebook.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/notebook.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: notebook.mm 67887 2011-06-08 22:48:29Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -94,6 +93,84 @@
 
 @end
 
+// ========================================================================
+// WXCTabViewImageItem
+// ========================================================================
+@interface WXCTabViewImageItem : NSTabViewItem
+{
+    NSImage *m_image;
+}
+- (id)init;
+- (void)dealloc;
+- (NSSize)sizeOfLabel:(BOOL)shouldTruncateLabel;
+- (void)drawLabel:(BOOL)shouldTruncateLabel inRect:(NSRect)tabRect;
+- (NSImage*)image;
+- (void)setImage:(NSImage*)image;
+@end // interface WXCTabViewImageItem : NSTabViewItem
+
+
+@implementation WXCTabViewImageItem : NSTabViewItem
+- (id)init
+{
+    m_image = nil;
+    return [super initWithIdentifier:nil];
+}
+- (void)dealloc
+{
+    [m_image release];
+    [super dealloc];
+}
+- (NSSize)sizeOfLabel:(BOOL)shouldTruncateLabel
+{
+    NSSize labelSize = [super sizeOfLabel:shouldTruncateLabel];
+    if(!m_image)
+        return labelSize;
+    NSSize imageSize = [m_image size];
+    // scale image size
+    if(imageSize.height > labelSize.height)
+    {
+        imageSize.width *= labelSize.height/imageSize.height;
+        imageSize.height *= labelSize.height/imageSize.height;
+        [m_image setScalesWhenResized:YES];
+        [m_image setSize: imageSize];
+    }
+    labelSize.width += imageSize.width;
+    return labelSize;
+}
+- (void)drawLabel:(BOOL)shouldTruncateLabel inRect:(NSRect)tabRect
+{
+    if(m_image)
+    {
+        NSSize imageSize = [m_image size];
+        [m_image compositeToPoint:NSMakePoint(tabRect.origin.x,
+                tabRect.origin.y+imageSize.height)
+            operation:NSCompositeSourceOver];
+        tabRect.size.width -= imageSize.width;
+        tabRect.origin.x += imageSize.width;
+    }
+    [super drawLabel:shouldTruncateLabel inRect:tabRect];
+}
+- (NSImage*)image
+{
+    return m_image;
+}
+- (void)setImage:(NSImage*)image
+{
+    [image retain];
+    [m_image release];
+    m_image = image;
+    if(!m_image)
+        return;
+    [[NSPasteboard generalPasteboard]
+        declareTypes:[NSArray arrayWithObject:NSTIFFPboardType]
+        owner:nil];
+    [[NSPasteboard generalPasteboard]
+        setData:[m_image TIFFRepresentation]
+        forType:NSTIFFPboardType];
+}
+@end // implementation WXCTabViewImageItem : NSTabViewItem
+
+
 class wxCocoaTabView : public wxWidgetCocoaImpl
 {
 public:
@@ -143,7 +220,7 @@ public:
         {
             for ( int i = cocoacount ; i < maximum ; ++i )
             {
-                NSTabViewItem* item = [[NSTabViewItem alloc] init];
+                NSTabViewItem* item = [[WXCTabViewImageItem alloc] init];
                 [slf addTabViewItem:item];
                 [item release];
             }
@@ -177,11 +254,33 @@ public:
                 const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( i ) ) ;
                 if ( bmap.IsOk() )
                 {
-                    // TODO how to set an image on a tab
+                    [(WXCTabViewImageItem*) item setImage: bmap.GetNSImage()];
                 }
             }
         }
     }
+
+    int TabHitTest(const wxPoint & pt, long* flags)
+    {
+        int retval = wxNOT_FOUND;
+        
+        NSPoint nspt = wxToNSPoint( m_osxView, pt );
+        
+        wxNSTabView* slf = (wxNSTabView*) m_osxView;
+        
+        NSTabViewItem* hitItem = [slf tabViewItemAtPoint:nspt];
+        
+        if (!hitItem) {
+            if ( flags )
+                *flags = wxBK_HITTEST_NOWHERE;
+        } else {
+            retval = [slf indexOfTabViewItem:hitItem];
+            if ( flags )
+                *flags = wxBK_HITTEST_ONLABEL;
+        }
+        
+        return retval; 
+    }
 };
 
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/overlay.mm b/Externals/wxWidgets3/src/osx/cocoa/overlay.mm
index 1ec5a95b2d..55c6c09dd2 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/overlay.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/overlay.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id: overlay.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/preferences.mm b/Externals/wxWidgets3/src/osx/cocoa/preferences.mm
new file mode 100644
index 0000000000..7b51732bf0
--- /dev/null
+++ b/Externals/wxWidgets3/src/osx/cocoa/preferences.mm
@@ -0,0 +1,261 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/osx/cocoa/preferences.cpp
+// Purpose:     Native OS X implementation of wxPreferencesEditor.
+// Author:      Vaclav Slavik
+// Created:     2013-02-19
+// Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_PREFERENCES_EDITOR
+
+#include "wx/private/preferences.h"
+
+#ifdef wxHAS_PREF_EDITOR_NATIVE
+
+#include "wx/frame.h"
+#include "wx/sharedptr.h"
+#include "wx/toolbar.h"
+#include "wx/vector.h"
+#include "wx/weakref.h"
+#include "wx/windowid.h"
+#include "wx/osx/private.h"
+
+#import <AppKit/NSWindow.h>
+
+
+wxBitmap wxStockPreferencesPage::GetLargeIcon() const
+{
+    switch ( m_kind )
+    {
+        case Kind_General:
+            return wxBitmap([NSImage imageNamed:NSImageNamePreferencesGeneral]);
+        case Kind_Advanced:
+            return wxBitmap([NSImage imageNamed:NSImageNameAdvanced]);
+    }
+    return wxBitmap(); // silence compiler warning
+}
+
+
+class wxCocoaPrefsWindow : public wxFrame
+{
+public:
+    wxCocoaPrefsWindow(const wxString& title)
+        : wxFrame(NULL, wxID_ANY, title,
+                  wxDefaultPosition, wxDefaultSize,
+                  wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX)),
+          m_toolbarRealized(false),
+          m_visiblePage(NULL)
+    {
+        m_toolbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                                  wxTB_FLAT | wxTB_TEXT);
+        m_toolbar->SetToolBitmapSize(wxSize(32,32));
+        m_toolbar->OSXSetSelectableTools(true);
+        SetToolBar(m_toolbar);
+
+        m_toolbar->Bind(wxEVT_TOOL,
+                        &wxCocoaPrefsWindow::OnPageChanged, this);
+        Bind(wxEVT_CLOSE_WINDOW, &wxCocoaPrefsWindow::OnClose, this);
+    }
+
+    void AddPage(wxPreferencesPage *page)
+    {
+        wxASSERT_MSG( !m_toolbarRealized,
+                      "can't add more preferences pages after showing the window" );
+
+        const wxString title = page->GetName();
+        wxBitmap bmp(page->GetLargeIcon());
+        wxASSERT_MSG( bmp.IsOk(), "OS X requires valid bitmap for preference page" );
+
+        int toolId = wxIdManager::ReserveId();
+        wxToolBarToolBase *tool = m_toolbar->AddTool(toolId, title, bmp);
+
+        wxSharedPtr<PageInfo> info(new PageInfo(page));
+        m_pages.push_back(info);
+
+        tool->SetClientData(info.get());
+    }
+
+    virtual bool Show(bool show)
+    {
+        if ( show && !m_toolbarRealized )
+        {
+            m_toolbar->Realize();
+            m_toolbarRealized = true;
+
+            const wxToolBarToolBase *first = m_toolbar->GetToolByPos(0);
+            wxCHECK_MSG( first, false, "no preferences panels" );
+            OnSelectPageForTool(first);
+            m_toolbar->OSXSelectTool(first->GetId());
+        }
+
+        return wxFrame::Show(show);
+    }
+
+    virtual bool ShouldPreventAppExit() const { return false; }
+
+protected:
+    // Native preferences windows resize when the selected panel changes and
+    // the resizing is animated, so we need to override DoMoveWindow.
+    virtual void DoMoveWindow(int x, int y, int width, int height)
+    {
+        NSRect r = wxToNSRect(NULL, wxRect(x, y, width, height));
+        NSWindow *win = (NSWindow*)GetWXWindow();
+        [win setFrame:r display:YES animate:YES];
+    }
+
+
+private:
+    void OnSelectPageForTool(const wxToolBarToolBase *tool)
+    {
+        PageInfo *info = static_cast<PageInfo*>(tool->GetClientData());
+        wxCHECK_RET( info, "toolbar item lacks client data" );
+
+        if ( !info->win )
+        {
+            info->win = info->page->CreateWindow(this);
+            info->win->Hide();
+            info->win->Fit();
+            // fill the page with data using wxEVT_INIT_DIALOG/TransferDataToWindow:
+            info->win->InitDialog();
+        }
+
+        // When the page changes in a native preferences dialog, the sequence
+        // of events is thus:
+
+        // 1. the old page is hidden, only gray background remains
+        if ( m_visiblePage )
+            m_visiblePage->Hide();
+        m_visiblePage = info->win;
+
+        //   2. window is resized to fix the new page, with animation
+        //      (in our case, using overriden DoMoveWindow())
+        SetClientSize(info->win->GetSize());
+
+        //   3. new page is shown and the title updated.
+        info->win->Show();
+        SetTitle(info->page->GetName());
+
+        // TODO: Preferences window may have some pages resizeable and some
+        //       non-resizable on OS X; the whole window is or is not resizable
+        //       depending on which page is selected.
+        //
+        //       We'll need to add wxPreferencesPage::IsResizable() virtual
+        //       method to implement this.
+    }
+
+    void OnPageChanged(wxCommandEvent& event)
+    {
+        wxToolBarToolBase *tool = m_toolbar->FindById(event.GetId());
+        wxCHECK_RET( tool, "invalid tool ID" );
+        OnSelectPageForTool(tool);
+    }
+
+    void OnClose(wxCloseEvent& e)
+    {
+        // Instead of destroying the window, just hide it, it could be
+        // reused again by another invocation of the editor.
+        Hide();
+    }
+
+private:
+    struct PageInfo : public wxObject
+    {
+        PageInfo(wxPreferencesPage *p) : page(p), win(NULL) {}
+
+        wxSharedPtr<wxPreferencesPage> page;
+        wxWindow *win;
+    };
+    // All pages. Use shared pointer to be able to get pointers to PageInfo structs
+    wxVector< wxSharedPtr<PageInfo> > m_pages;
+
+    wxToolBar *m_toolbar;
+    bool       m_toolbarRealized;
+    wxWindow  *m_visiblePage;
+};
+
+
+class wxCocoaPreferencesEditorImpl : public wxPreferencesEditorImpl
+{
+public:
+    wxCocoaPreferencesEditorImpl(const wxString& title)
+        : m_win(NULL), m_title(title)
+    {
+    }
+
+    virtual ~wxCocoaPreferencesEditorImpl()
+    {
+        // m_win may already be destroyed if this destructor is called from
+        // wxApp's destructor. In that case, all windows -- including this
+        // one -- would already be destroyed by now.
+        if ( m_win )
+            m_win->Destroy();
+    }
+
+    virtual void AddPage(wxPreferencesPage* page)
+    {
+        GetWin()->AddPage(page);
+    }
+
+    virtual void Show(wxWindow* WXUNUSED(parent))
+    {
+        // OS X preferences windows don't have parents, they are independent
+        // windows, so we just ignore the 'parent' argument.
+        wxWindow *win = GetWin();
+        win->Show();
+        win->Raise();
+    }
+
+    virtual void Dismiss()
+    {
+        // Don't destroy the window, only hide it, because OS X preferences
+        // window typically remember their state even when closed. Reopening
+        // the window should show it in the exact same state the user left it.
+        GetWin()->Hide();
+    }
+
+private:
+    // Use this function to access m_win, so that the window is only created on
+    // demand when actually needed.
+    wxCocoaPrefsWindow* GetWin()
+    {
+        if ( !m_win )
+        {
+            if ( m_title.empty() )
+                m_title = _("Preferences");
+
+            m_win = new wxCocoaPrefsWindow(m_title);
+        }
+
+        return m_win;
+    }
+
+    wxWeakRef<wxCocoaPrefsWindow> m_win;
+
+    wxString m_title;
+};
+
+/*static*/
+wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create(const wxString& title)
+{
+    return new wxCocoaPreferencesEditorImpl(title);
+}
+
+#endif // wxHAS_PREF_EDITOR_NATIVE
+
+#endif // wxUSE_PREFERENCES_EDITOR
diff --git a/Externals/wxWidgets3/src/osx/cocoa/printdlg.mm b/Externals/wxWidgets3/src/osx/cocoa/printdlg.mm
index e7ccdaca0a..06c7e15950 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/printdlg.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/printdlg.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: printdlg.mm 70707 2012-02-27 15:20:19Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +13,7 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/printdlg.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
@@ -59,12 +59,19 @@ void wxOSXCocoaPrintData::UpdateToPMState()
 
 int wxMacPrintDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_printDialogData.GetPrintData().ConvertToNative();
 
     int result = wxID_CANCEL;
 
     NSPrintPanel* panel = [NSPrintPanel printPanel];
     NSPrintInfo* printInfo = ((wxOSXCocoaPrintData*)m_printDialogData.GetPrintData().GetNativeData())->GetNSPrintInfo();
+
+    NSMutableDictionary* dict = [printInfo printSettings];
+    [dict setValue:[NSNumber numberWithInt:m_printDialogData.GetMinPage()] forKey:@"com_apple_print_PrintSettings_PMFirstPage"];
+    [dict setValue:[NSNumber numberWithInt:m_printDialogData.GetMaxPage()] forKey:@"com_apple_print_PrintSettings_PMLastPage"];
+
     if ( (NSInteger)[panel runModalWithPrintInfo:printInfo] == NSOKButton )
     {
         result = wxID_OK;
@@ -77,6 +84,8 @@ int wxMacPrintDialog::ShowModal()
 
 int wxMacPageSetupDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_pageSetupData.GetPrintData().ConvertToNative();
     ((wxOSXCocoaPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData );
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/radiobut.mm b/Externals/wxWidgets3/src/osx/cocoa/radiobut.mm
index 48ca2dbaa9..05e1a021d2 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/radiobut.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/radiobut.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     ??/??/98
-// RCS-ID:      $Id: radiobut.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) AUTHOR
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,87 @@
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 
+// ugly workaround for the fact that since 10.8 is treating all subviews of a view
+// which share the same action selector as a group and sets their value automatically
+// so we are creating <maxAlternateActions> different selectors and iterate through them
+// as we are assigning their selectors as actions
+
+#include <objc/objc-runtime.h>
+
+const int maxAlternateActions = 100;
+NSString* alternateActionsSelector = @"controlAction%d:";
+
+extern void wxOSX_controlAction(NSView* self, SEL _cmd, id sender);
+
+@interface wxNSRadioButton : NSButton
+{
+    NSTrackingRectTag rectTag;
+}
+
+@end
+
+@implementation wxNSRadioButton
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized)
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+        for ( int i = 1 ; i <= maxAlternateActions ; i++ )
+        {
+            class_addMethod(self, NSSelectorFromString([NSString stringWithFormat: alternateActionsSelector, i]), (IMP) wxOSX_controlAction, "v@:@" );
+        }
+    }
+}
+
+- (void) setState: (NSInteger) v
+{
+    [super setState:v];
+    //    [[self cell] setState:v];
+}
+
+- (int) intValue
+{
+    switch ( [self state] )
+    {
+        case NSOnState:
+            return 1;
+        case NSMixedState:
+            return 2;
+        default:
+            return 0;
+    }
+}
+
+- (void) setIntValue: (int) v
+{
+    switch( v )
+    {
+        case 2:
+            [self setState:NSMixedState];
+            break;
+        case 1:
+            [self setState:NSOnState];
+            break;
+        default :
+            [self setState:NSOffState];
+            break;
+    }
+}
+
+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+
+@end
+
 wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
                                     wxWindowID WXUNUSED(id),
@@ -26,10 +106,16 @@ wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
-    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+    wxNSRadioButton* v = [[wxNSRadioButton alloc] initWithFrame:r];
 
     [v setButtonType:NSRadioButton];
 
+    static int alternateAction = 1;
+ 
+    [v setAction: NSSelectorFromString([NSString stringWithFormat: alternateActionsSelector, alternateAction])];
+    if ( ++alternateAction > maxAlternateActions )
+        alternateAction = 1;
+
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/scrolbar.mm b/Externals/wxWidgets3/src/osx/cocoa/scrolbar.mm
index 2016cc5124..a93ae41f15 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/scrolbar.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/scrolbar.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: scrolbar.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,12 +57,8 @@ public :
     {
         double v = ((double) value)/m_maximum;
         double t = ((double) thumbSize)/(m_maximum+thumbSize);
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-        [(wxNSScroller*) m_osxView setFloatValue:v knobProportion:t];
-#else
         [(wxNSScroller*) m_osxView setDoubleValue:v];
         [(wxNSScroller*) m_osxView setKnobProportion:t];
-#endif
     }
 
     virtual wxInt32 GetValue() const
diff --git a/Externals/wxWidgets3/src/osx/cocoa/slider.mm b/Externals/wxWidgets3/src/osx/cocoa/slider.mm
index 310e0fef0b..2803fbcd32 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/slider.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/slider.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider.mm 67887 2011-06-08 22:48:29Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/spinbutt.mm b/Externals/wxWidgets3/src/osx/cocoa/spinbutt.mm
index 5aadd66e87..67675aba9f 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/spinbutt.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/spinbutt.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: spinbutt.mm 70259 2012-01-04 07:54:00Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/srchctrl.mm b/Externals/wxWidgets3/src/osx/cocoa/srchctrl.mm
index 55d1442e6a..880d590773 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/srchctrl.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/srchctrl.mm
@@ -3,7 +3,6 @@
 // Purpose:     implements mac carbon wxSearchCtrl
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctrl.mm 67905 2011-06-09 01:25:27Z SC $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/statbox.mm b/Externals/wxWidgets3/src/osx/cocoa/statbox.mm
index 307255eb9f..1a346a4d75 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/statbox.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/statbox.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbox.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -73,7 +72,9 @@ wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSBox* v = [[wxNSBox alloc] initWithFrame:r];
     wxStaticBoxCocoaImpl* c = new wxStaticBoxCocoaImpl( wxpeer, v );
+#if !wxOSX_USE_NATIVE_FLIPPED
     c->SetFlipped(false);
+#endif
     return c;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/statline.mm b/Externals/wxWidgets3/src/osx/cocoa/statline.mm
index de356d2338..8590d36740 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/statline.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/statline.mm
@@ -3,7 +3,6 @@
 // Purpose:     wxStaticLine class
 // Author:      Stefan Csomor
 // Created:     28.06.99
-// Version:     $Id: statline.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) 2008 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/stattext.mm b/Externals/wxWidgets3/src/osx/cocoa/stattext.mm
index 77c7ed19af..832b319017 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/stattext.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/stattext.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -102,7 +101,7 @@ private:
         NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
         [paragraphStyle setLineBreakMode:m_lineBreak];
         int style = GetWXPeer()->GetWindowStyleFlag();
-        if (style & wxALIGN_CENTER)
+        if (style & wxALIGN_CENTER_HORIZONTAL)
             [paragraphStyle setAlignment: NSCenterTextAlignment];
         else if (style & wxALIGN_RIGHT)
             [paragraphStyle setAlignment: NSRightTextAlignment];
diff --git a/Externals/wxWidgets3/src/osx/cocoa/taskbar.mm b/Externals/wxWidgets3/src/osx/cocoa/taskbar.mm
index f3cca4a6f9..06342b4e72 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/taskbar.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/taskbar.mm
@@ -4,7 +4,6 @@
 // Author:      David Elliott, Stefan Csomor
 // Modified by:
 // Created:     2004/01/24
-// RCS-ID:      $Id: taskbar.mm 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 2004 David Elliott, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -141,9 +140,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType iconType)
 {
-    if(iconType == DOCK)
+    if(iconType == wxTBI_DOCK)
         m_impl = new wxTaskBarIconDockImpl(this);
-    else if(iconType == CUSTOM_STATUSITEM)
+    else if(iconType == wxTBI_CUSTOM_STATUSITEM)
         m_impl = new wxTaskBarIconCustomStatusItemImpl(this);
     else
     {   m_impl = NULL;
@@ -338,7 +337,7 @@ wxTaskBarIconCustomStatusItemImpl::~wxTaskBarIconCustomStatusItemImpl()
 {
 }
 
-bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip))
+bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
     if(!m_statusItem)
     {
@@ -347,6 +346,7 @@ bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxStri
 
         m_target = [[wxOSXStatusItemTarget alloc] init];
         [m_target setImplementation:this];
+        [m_statusItem setHighlightMode:YES];
         [m_statusItem setTarget:m_target];
         [m_statusItem setAction:@selector(clickedAction:)];
         [m_statusItem sendActionOn:NSLeftMouseDownMask];
@@ -367,6 +367,8 @@ bool wxTaskBarIconCustomStatusItemImpl::SetIcon(const wxIcon& icon, const wxStri
     }
 
     [m_statusItem setImage:m_icon.GetNSImage()];
+    wxCFStringRef cfTooltip(tooltip);
+    [m_statusItem setToolTip:cfTooltip.AsNSString()];
     return true;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/textctrl.mm b/Externals/wxWidgets3/src/osx/cocoa/textctrl.mm
index 280d236b59..bec0c44431 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/textctrl.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/textctrl.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
-// RCS-ID:      $Id: textctrl.mm 70667 2012-02-22 08:24:09Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -90,8 +89,18 @@ public :
         ms_viewCurrentlyEdited = m_viewPreviouslyEdited;
     }
 
-    // Returns the last view we were instantiated for or NULL.
-    static NSView *GetCurrentlyEditedView() { return ms_viewCurrentlyEdited; }
+    // Returns true if this view is the one currently being changed by the
+    // program.
+    static bool IsCurrentlyEditedView(NSView* v)
+    {
+        return v == ms_viewCurrentlyEdited;
+    }
+
+    // Returns true if this editor is the one currently being modified.
+    static bool IsCurrentEditor(wxNSTextFieldEditor* e)
+    {
+        return e == [(NSTextField*)ms_viewCurrentlyEdited currentEditor];
+    }
 
 protected :
     BOOL m_formerEditable ;
@@ -111,6 +120,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 @interface wxMaximumLengthFormatter : NSFormatter
 {
     int maxLength;
+    wxTextEntry* field;
 }
 
 @end
@@ -119,7 +129,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 
 - (id)init 
 {
-    [super init];
+    self = [super init];
     maxLength = 0;
     return self;
 }
@@ -148,12 +158,17 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     int len = [*partialStringPtr length];
     if ( maxLength > 0 && len > maxLength )
     {
-        // TODO wxEVT_COMMAND_TEXT_MAXLEN
+        field->SendMaxLenEvent();
         return NO;
     }
     return YES;
 }
 
+- (void) setTextEntry:(wxTextEntry*) tf
+{
+    field = tf;
+}
+
 @end
 
 @implementation wxNSSecureTextField
@@ -182,7 +197,11 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     {
-        impl->DoNotifyFocusEvent( false, NULL );
+        NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
+        
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+        impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
 
@@ -206,7 +225,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event(wxEVT_BUTTON, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                         handled = YES;
@@ -273,11 +292,16 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 
 - (void) insertText:(id) str
 {
-    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
-    if ( impl == NULL || lastKeyDownEvent==nil || !impl->DoHandleCharEvent(lastKeyDownEvent, str) )
+    // We should never generate char events for the text being inserted
+    // programmatically.
+    if ( !wxMacEditHelper::IsCurrentEditor(self) )
     {
-        [super insertText:str];
+        wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+        if ( impl && lastKeyDownEvent && impl->DoHandleCharEvent(lastKeyDownEvent, str) )
+            return;
     }
+
+    [super insertText:str];
 }
 
 @end
@@ -325,7 +349,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
 {
     wxUnusedVar(aNotification);
 
-    if ( self == wxMacEditHelper::GetCurrentlyEditedView() )
+    if ( wxMacEditHelper::IsCurrentlyEditedView(self) )
     {
         // This notification is generated as the result of calling our own
         // wxTextCtrl method (e.g. WriteText()) and doesn't correspond to any
@@ -336,7 +360,11 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     {
-        impl->DoNotifyFocusEvent( false, NULL );
+        NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
+        
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+        impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
 
@@ -499,7 +527,18 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if ( impl )
     {
-        impl->DoNotifyFocusEvent( false, NULL );
+        wxNSTextFieldControl* timpl = dynamic_cast<wxNSTextFieldControl*>(impl);
+        if ( fieldEditor )
+        {
+            NSRange range = [fieldEditor selectedRange];
+            timpl->SetInternalSelection(range.location, range.location + range.length);
+        }
+
+        NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+        NSView* otherView = wxOSXGetViewFromResponder(responder);
+        
+        wxWidgetImpl* otherWindow = impl->FindBestFromWXWidget(otherView);
+        impl->DoNotifyFocusEvent( false, otherWindow );
     }
 }
 @end
@@ -515,7 +554,8 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w )
 
     [m_scrollView setHasVerticalScroller:YES];
     [m_scrollView setHasHorizontalScroller:NO];
-    [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    // TODO Remove if no regression, this was causing automatic resizes of multi-line textfields when the tlw changed
+    // [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     NSSize contentSize = [m_scrollView contentSize];
 
     wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0,
@@ -688,24 +728,35 @@ void wxNSTextViewControl::SetStyle(long start,
                                 long end,
                                 const wxTextAttr& style)
 {
-    if (m_textView) {
+    if ( !m_textView )
+        return;
+
+    if ( start == -1 && end == -1 )
+    {
+        NSMutableDictionary* const
+            attrs = [NSMutableDictionary dictionaryWithCapacity:3];
+        if ( style.HasFont() )
+            [attrs setValue:style.GetFont().OSXGetNSFont() forKey:NSFontAttributeName];
+        if ( style.HasBackgroundColour() )
+            [attrs setValue:style.GetBackgroundColour().OSXGetNSColor() forKey:NSBackgroundColorAttributeName];
+        if ( style.HasTextColour() )
+            [attrs setValue:style.GetTextColour().OSXGetNSColor() forKey:NSForegroundColorAttributeName];
+
+        [m_textView setTypingAttributes:attrs];
+    }
+    else // Set the attributes just for this range.
+    {
         NSRange range = NSMakeRange(start, end-start);
-        if (start == -1 && end == -1)
-            range = [m_textView selectedRange];
 
         NSTextStorage* storage = [m_textView textStorage];
-        
-        wxFont font = style.GetFont();
-        if (style.HasFont() && font.IsOk())
-            [storage addAttribute:NSFontAttributeName value:font.OSXGetNSFont() range:range];
-        
-        wxColour bgcolor = style.GetBackgroundColour();
-        if (style.HasBackgroundColour() && bgcolor.IsOk())
-            [storage addAttribute:NSBackgroundColorAttributeName value:bgcolor.OSXGetNSColor() range:range];
-        
-        wxColour fgcolor = style.GetTextColour();
-        if (style.HasTextColour() && fgcolor.IsOk())
-            [storage addAttribute:NSForegroundColorAttributeName value:fgcolor.OSXGetNSColor() range:range];
+        if ( style.HasFont() )
+            [storage addAttribute:NSFontAttributeName value:style.GetFont().OSXGetNSFont() range:range];
+
+        if ( style.HasBackgroundColour() )
+            [storage addAttribute:NSBackgroundColorAttributeName value:style.GetBackgroundColour().OSXGetNSColor() range:range];
+
+        if ( style.HasTextColour() )
+            [storage addAttribute:NSForegroundColorAttributeName value:style.GetTextColour().OSXGetNSColor() range:range];
     }
 }
 
@@ -774,6 +825,7 @@ void wxNSTextFieldControl::SetMaxLength(unsigned long len)
 {
     wxMaximumLengthFormatter* formatter = [[[wxMaximumLengthFormatter alloc] init] autorelease];
     [formatter setMaxLength:len];
+    [formatter setTextEntry:GetTextEntry()];
     [m_textField setFormatter:formatter];
 }
 
@@ -852,11 +904,11 @@ void wxNSTextFieldControl::SetSelection( long from , long to )
     {
         [editor setSelectedRange:NSMakeRange(from, to-from)];
     }
-    else
-    {
-        m_selStart = from;
-        m_selEnd = to;
-    }
+
+    // the editor might still be in existence, but we might be already passed our 'focus lost' storage
+    // of the selection, so make sure we copy this
+    m_selStart = from;
+    m_selEnd = to;
 }
 
 void wxNSTextFieldControl::WriteText(const wxString& str)
@@ -867,7 +919,12 @@ void wxNSTextFieldControl::WriteText(const wxString& str)
     if ( editor )
     {
         wxMacEditHelper helper(m_textField);
+        BOOL hasUndo = [editor respondsToSelector:@selector(setAllowsUndo:)];
+        if ( hasUndo )
+            [(NSTextView*)editor setAllowsUndo:NO];
         [editor insertText:wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
+        if ( hasUndo )
+            [(NSTextView*)editor setAllowsUndo:YES];
     }
     else
     {
@@ -888,13 +945,59 @@ void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf),
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+        wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
         event.SetEventObject( wxpeer );
         event.SetString( GetTextEntry()->GetValue() );
         wxpeer->HandleWindowEvent( event );
     }
 }
 
+void wxNSTextFieldControl::SetInternalSelection( long from , long to )
+{
+    m_selStart = from;
+    m_selEnd = to;
+}
+
+// as becoming first responder on a window - triggers a resign on the same control, we have to avoid
+// the resign notification writing back native selection values before we can set our own
+
+static WXWidget s_widgetBecomingFirstResponder = nil;
+
+bool wxNSTextFieldControl::becomeFirstResponder(WXWidget slf, void *_cmd)
+{
+    s_widgetBecomingFirstResponder = slf;
+    bool retval = wxWidgetCocoaImpl::becomeFirstResponder(slf, _cmd);
+    s_widgetBecomingFirstResponder = nil;
+    if ( retval )
+    {
+        NSText* editor = [m_textField currentEditor];
+        if ( editor )
+        {
+            long textLength = [[m_textField stringValue] length];
+            m_selStart = wxMin(textLength,wxMax(m_selStart,0)) ;
+            m_selEnd = wxMax(0,wxMin(textLength,m_selEnd)) ;
+            
+            [editor setSelectedRange:NSMakeRange(m_selStart, m_selEnd-m_selStart)];
+        }
+    }
+    return retval;
+}
+
+bool wxNSTextFieldControl::resignFirstResponder(WXWidget slf, void *_cmd)
+{
+    if ( slf != s_widgetBecomingFirstResponder )
+    {
+        NSText* editor = [m_textField currentEditor];
+        if ( editor )
+        {
+            NSRange range = [editor selectedRange];
+            m_selStart = range.location;
+            m_selEnd = range.location + range.length;
+        }
+    }
+    return wxWidgetCocoaImpl::resignFirstResponder(slf, _cmd);
+}
+
 bool wxNSTextFieldControl::SetHint(const wxString& hint)
 {
     wxCFStringRef hintstring(hint);
@@ -918,11 +1021,12 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxWidgetCocoaImpl* c = NULL;
 
-    if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 )
+    if ( style & wxTE_MULTILINE )
     {
         wxNSTextScrollView* v = nil;
         v = [[wxNSTextScrollView alloc] initWithFrame:r];
         c = new wxNSTextViewControl( wxpeer, v );
+        c->SetNeedsFocusRect( true );
     }
     else
     {
@@ -932,24 +1036,39 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
         else
             v = [[wxNSTextField alloc] initWithFrame:r];
 
-        if ( style & wxNO_BORDER )
+        if ( style & wxTE_RIGHT)
         {
-            // FIXME: How can we remove the native control's border?
-            // setBordered is separate from the text ctrl's border.
+            [v setAlignment:NSRightTextAlignment];
         }
-        
+        else if ( style & wxTE_CENTRE)
+        {
+            [v setAlignment:NSCenterTextAlignment];
+        }
+                
         NSTextFieldCell* cell = [v cell];
         [cell setScrollable:YES];
         // TODO: Remove if we definitely are sure, it's not needed
         // as setting scrolling to yes, should turn off any wrapping
         // [cell setLineBreakMode:NSLineBreakByClipping]; 
 
-        [v setBezeled:NO];
-        [v setBordered:NO];
-
         c = new wxNSTextFieldControl( wxpeer, wxpeer, v );
+        
+        if ( (style & wxNO_BORDER) || (style & wxSIMPLE_BORDER) )
+        {
+            // under 10.7 the textcontrol can draw its own focus
+            // even if no border is shown, on previous systems
+            // we have to emulate this
+            [v setBezeled:NO];
+            [v setBordered:NO];
+            if ( UMAGetSystemVersion() < 0x1070 )
+                c->SetNeedsFocusRect( true );
+        }
+        else
+        {
+            // use native border
+            c->SetNeedsFrame(false);
+        }
     }
-    c->SetNeedsFocusRect( true );
 
     return c;
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/tglbtn.mm b/Externals/wxWidgets3/src/osx/cocoa/tglbtn.mm
index c31590e8fe..3dd6dedd87 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/tglbtn.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/tglbtn.mm
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.mm 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,12 +26,16 @@
 
 // from button.mm
 
-extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
+extern "C" void SetBezelStyleFromBorderFlags(NSButton *v,
+                                             long style,
+                                             wxWindowID winid = wxID_ANY,
+                                             const wxString& label = wxString(),
+                                             const wxBitmap& bitmap = wxBitmap());
 
 wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
-                                    wxWindowID WXUNUSED(id),
-                                    const wxString& WXUNUSED(label),
+                                    wxWindowID winid,
+                                    const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long style,
@@ -41,16 +44,16 @@ wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, label);
 
     [v setButtonType:NSOnOffButton];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
     return c;
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
-                                    wxWindowID WXUNUSED(id),
+                                    wxWindowID winid,
                                     const wxBitmap& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
@@ -60,13 +63,13 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), label);
+    
     if (label.IsOk())
         [v setImage:label.GetNSImage() ];
 
-    SetBezelStyleFromBorderFlags(v, style);
-
     [v setButtonType:NSOnOffButton];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
     return c;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/cocoa/toolbar.mm b/Externals/wxWidgets3/src/osx/cocoa/toolbar.mm
index ba1b60bcac..701f3f45b5 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/toolbar.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/toolbar.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar.mm 70851 2012-03-09 12:49:59Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -255,7 +254,6 @@ public:
 #endif // wxOSX_USE_NATIVE_TOOLBAR
 
 private:
-#if wxOSX_USE_NATIVE_TOOLBAR
     wxFontEncoding GetToolBarFontEncoding() const
     {
         wxFont f;
@@ -263,7 +261,6 @@ private:
             f = GetToolBar()->GetFont();
         return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();
     }
-#endif // wxOSX_USE_NATIVE_TOOLBAR
 
     void Init()
     {
@@ -305,8 +302,11 @@ private:
 
 @interface wxNSToolbarDelegate : NSObject wxOSX_10_6_AND_LATER(<NSToolbarDelegate>)
 {
+    bool m_isSelectable;
 }
 
+- (void)setSelectable:(bool) value;
+
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
 
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
@@ -363,6 +363,17 @@ private:
 
 @implementation wxNSToolbarDelegate
 
+- (id)init
+{
+    m_isSelectable = false;
+    return [super init];
+}
+
+- (void)setSelectable:(bool) value
+{
+    m_isSelectable = true;
+}
+
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
 {
     wxUnusedVar(toolbar);
@@ -377,8 +388,10 @@ private:
 
 - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
 {
-    wxUnusedVar(toolbar);
-    return nil;
+  if ( m_isSelectable )
+      return [[toolbar items] valueForKey:@"itemIdentifier"];
+  else
+      return nil;
 }
 
 - (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag
@@ -674,9 +687,11 @@ wxToolBar::~wxToolBar()
         frame->SetToolBar(NULL);
     }
     
+#if wxOSX_USE_NATIVE_TOOLBAR
     [(NSToolbar*)m_macToolbar setDelegate:nil];
     [(NSToolbar*)m_macToolbar release];
     m_macToolbar = NULL;
+#endif // wxOSX_USE_NATIVE_TOOLBAR
 }
 
 bool wxToolBar::Show( bool show )
@@ -1228,9 +1243,6 @@ bool wxToolBar::Realize()
     SetInitialSize( wxSize(m_minWidth, m_minHeight));
 
     SendSizeEventToParent();
-    wxWindow * const parent = GetParent();
-    if ( parent && !parent->IsBeingDeleted() )
-        parent->MacOnInternalSize();
     
     return true;
 }
@@ -1428,7 +1440,9 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
                 wxNSToolBarButton* v = [[wxNSToolBarButton alloc] initWithFrame:toolrect];
 
-                [v setBezelStyle:NSRegularSquareBezelStyle];
+                [v setBezelStyle:NSSmallSquareBezelStyle];
+                [[v cell] setControlSize:NSSmallControlSize];
+                [v setFont:[NSFont fontWithName:[[v font] fontName] size:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
                 [v setBordered:NO];
                 [v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];
@@ -1447,7 +1461,8 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 #endif // wxOSX_USE_NATIVE_TOOLBAR
                 tool->SetControlHandle( controlHandle );
-                tool->UpdateImages();
+                if ( !(style & wxTB_NOICONS) )
+                    tool->UpdateImages();
                 tool->UpdateLabel();
 
                 if ( style & wxTB_NOICONS )
@@ -1589,45 +1604,41 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         int w, h;
         GetSize( &w, &h );
 
-        bool drawMetalTheme = MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL;
-
-        if ( UMAGetSystemVersion() < 0x1050 )
-        {
-            if ( !drawMetalTheme )
-            {
-                HIThemePlacardDrawInfo info;
-                memset( &info, 0, sizeof(info) );
-                info.version = 0;
-                info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive;
-
-                CGContextRef cgContext = (CGContextRef) MacGetCGContextRef();
-                HIRect rect = CGRectMake( 0, 0, w, h );
-                HIThemeDrawPlacard( &rect, &info, cgContext, kHIThemeOrientationNormal );
-            }
-            else
-            {
-                // leave the background as it is (striped or metal)
-            }
-        }
-        else
-        {
-            wxPaintDC dc(this);
-            
-            wxRect rect(0,0,w,h);
-            
-            dc.GradientFillLinear( rect , wxColour( 0xCC,0xCC,0xCC ), wxColour( 0xA8,0xA8,0xA8 ) , wxSOUTH );
-            dc.SetPen( wxPen( wxColour( 0x51,0x51,0x51 ) ) );
-            if ( HasFlag(wxTB_LEFT) )
-                dc.DrawLine(w-1, 0, w-1, h);
-            else if ( HasFlag(wxTB_RIGHT) )
-                dc.DrawLine(0, 0, 0, h);
-            else if ( HasFlag(wxTB_BOTTOM) )
-                dc.DrawLine(0, 0, w, 0);
-            else if ( HasFlag(wxTB_TOP) )
-                dc.DrawLine(0, h-1, w, h-1);
-        }
+        wxPaintDC dc(this);
+        
+        wxRect rect(0,0,w,h);
+        
+        dc.GradientFillLinear( rect , wxColour( 0xCC,0xCC,0xCC ), wxColour( 0xA8,0xA8,0xA8 ) , wxSOUTH );
+        dc.SetPen( wxPen( wxColour( 0x51,0x51,0x51 ) ) );
+        if ( HasFlag(wxTB_LEFT) )
+            dc.DrawLine(w-1, 0, w-1, h);
+        else if ( HasFlag(wxTB_RIGHT) )
+            dc.DrawLine(0, 0, 0, h);
+        else if ( HasFlag(wxTB_BOTTOM) )
+            dc.DrawLine(0, 0, w, 0);
+        else if ( HasFlag(wxTB_TOP) )
+            dc.DrawLine(0, h-1, w, h-1);
     }
     event.Skip();
 }
 
+#if wxOSX_USE_NATIVE_TOOLBAR
+void wxToolBar::OSXSetSelectableTools(bool set)
+{
+    wxCHECK_RET( m_macToolbar, "toolbar must be non-NULL" );
+    [(wxNSToolbarDelegate*)[(NSToolbar*)m_macToolbar delegate] setSelectable:set];
+}
+
+void wxToolBar::OSXSelectTool(int toolId)
+{
+    wxToolBarToolBase *tool = FindById(toolId);
+    wxCHECK_RET( tool, "invalid tool ID" );
+    wxCHECK_RET( m_macToolbar, "toolbar must be non-NULL" );
+
+    wxString identifier = wxString::Format(wxT("%ld"), (long)tool);
+    wxCFStringRef cfidentifier(identifier, wxFont::GetDefaultEncoding());
+    [(NSToolbar*)m_macToolbar setSelectedItemIdentifier:cfidentifier.AsNSString()];
+}
+#endif // wxOSX_USE_NATIVE_TOOLBAR
+
 #endif // wxUSE_TOOLBAR
diff --git a/Externals/wxWidgets3/src/osx/cocoa/tooltip.mm b/Externals/wxWidgets3/src/osx/cocoa/tooltip.mm
index 5a33db72bd..d36bbeba52 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/tooltip.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/tooltip.mm
@@ -2,7 +2,6 @@
 // Name:        src/osx/cocoa/tooltip.mm
 // Purpose:     wxToolTip implementation
 // Author:      Stefan Csomor
-// Id:          $Id: tooltip.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/cocoa/utils.mm b/Externals/wxWidgets3/src/osx/cocoa/utils.mm
index 5b23abb85d..664ed5159b 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/utils.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/utils.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utils.mm 68958 2011-08-30 09:02:11Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,7 +36,7 @@
 
 #if wxOSX_USE_COCOA
 
-#if wxUSE_BASE
+#if wxUSE_GUI
 
 // Emit a beeeeeep
 void wxBell()
@@ -45,13 +44,10 @@ void wxBell()
     NSBeep();
 }
 
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
 @implementation wxNSAppController
 
-- (void)applicationWillFinishLaunching:(NSNotification *)application {	
+- (void)applicationWillFinishLaunching:(NSNotification *)application
+{
     wxUnusedVar(application);
     
     // we must install our handlers later than setting the app delegate, because otherwise our handlers
@@ -65,6 +61,12 @@ void wxBell()
     [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
                          forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
     
+    wxTheApp->OSXOnWillFinishLaunching();
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    wxTheApp->OSXOnDidFinishLaunching();
 }
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames
@@ -75,18 +77,32 @@ void wxBell()
     const size_t count = [fileNames count];
     for (i = 0; i < count; i++)
     {
-        fileList.Add( wxCFStringRef::AsString([fileNames objectAtIndex:i]) );
+        fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) );
     }
 
-    wxTheApp->MacOpenFiles(fileList);
+    if ( wxTheApp->OSXInitWasCalled() )
+        wxTheApp->MacOpenFiles(fileList);
+    else
+        wxTheApp->OSXStoreOpenFiles(fileList);
 }
 
-- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
+- (NSApplicationPrintReply)application:(NSApplication *)sender printFiles:(NSArray *)fileNames withSettings:(NSDictionary *)printSettings showPrintPanels:(BOOL)showPrintPanels
 {
     wxUnusedVar(sender);
-    wxCFStringRef cf(wxCFRetain(filename));
-    wxTheApp->MacPrintFile(cf.AsString()) ;
-    return YES;
+    wxArrayString fileList;
+    size_t i;
+    const size_t count = [fileNames count];
+    for (i = 0; i < count; i++)
+    {
+        fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) );
+    }
+    
+    if ( wxTheApp->OSXInitWasCalled() )
+        wxTheApp->MacPrintFiles(fileList);
+    else
+        wxTheApp->OSXStorePrintFiles(fileList);
+    
+    return NSPrintingSuccess;
 }
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
@@ -103,14 +119,16 @@ void wxBell()
     wxUnusedVar(replyEvent);
     NSString* url = [[event descriptorAtIndex:1] stringValue];
     wxCFStringRef cf(wxCFRetain(url));
-    wxTheApp->MacOpenURL(cf.AsString()) ;
+    if ( wxTheApp->OSXInitWasCalled() )
+        wxTheApp->MacOpenURL(cf.AsString()) ;
+    else
+        wxTheApp->OSXStoreOpenURL(cf.AsString());
 }
 
 - (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event
            withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 {
     wxUnusedVar(replyEvent);
-    wxTheApp->MacNewFile() ;
 }
 
 /*
@@ -123,9 +141,7 @@ void wxBell()
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     wxUnusedVar(sender);
-    wxCloseEvent event;
-    wxTheApp->OnQueryEndSession(event);
-    if ( event.GetVeto() )
+    if ( !wxTheApp->OSXOnShouldTerminate() )
         return NSTerminateCancel;
     
     return NSTerminateNow;
@@ -133,9 +149,7 @@ void wxBell()
 
 - (void)applicationWillTerminate:(NSNotification *)application {
     wxUnusedVar(application);
-    wxCloseEvent event;
-    event.SetCanVeto(false);
-    wxTheApp->OnEndSession(event);
+    wxTheApp->OSXOnWillTerminate();
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
@@ -241,15 +255,144 @@ void wxBell()
 }
 @end
 
+
+// more on bringing non-bundled apps to the foreground
+// https://devforums.apple.com/thread/203753
+
+#if 0 
+
+// one possible solution is also quoted here
+// from http://stackoverflow.com/questions/7596643/when-calling-transformprocesstype-the-app-menu-doesnt-show-up
+
+@interface wxNSNonBundledAppHelper : NSObject {
+    
+}
+
++ (void)transformToForegroundApplication;
+
+@end
+
+@implementation wxNSNonBundledAppHelper
+
++ (void)transformToForegroundApplication {
+    for (NSRunningApplication * app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.finder"]) {
+        [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+        break;
+    }
+    [self performSelector:@selector(transformStep2) withObject:nil afterDelay:0.1];
+}
+
++ (void)transformStep2
+{
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    (void) TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+    
+    [self performSelector:@selector(transformStep3) withObject:nil afterDelay:0.1];
+}
+
++ (void)transformStep3
+{
+    [[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+}
+
+@end
+
+#endif
+
+// here we subclass NSApplication, for the purpose of being able to override sendEvent.
+@interface wxNSApplication : NSApplication
+{
+    BOOL firstPass;
+}
+
+- (id)init;
+
+- (void)sendEvent:(NSEvent *)anEvent;
+
+@end
+
+@implementation wxNSApplication
+
+- (id)init
+{
+    self = [super init];
+    firstPass = YES;
+    return self;
+}
+
+- (void) transformToForegroundApplication {
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+    
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    if ( UMAGetSystemVersion() >= 0x1090 )
+    {
+        [[NSRunningApplication currentApplication] activateWithOptions:
+         (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
+    }
+    else
+#endif
+    {
+        [self deactivate];
+        [self activateIgnoringOtherApps:YES];
+    }
+}
+
+
+
+/* This is needed because otherwise we don't receive any key-up events for command-key
+ combinations (an AppKit bug, apparently)			*/
+- (void)sendEvent:(NSEvent *)anEvent
+{
+    if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
+        [[self keyWindow] sendEvent:anEvent];
+    else
+        [super sendEvent:anEvent];
+    
+    if ( firstPass )
+    {
+        [NSApp stop:nil];
+        firstPass = NO;
+        return;
+    }
+}
+
+@end
+
+WX_NSObject appcontroller = nil;
+
+NSLayoutManager* gNSLayoutManager = nil;
+
+WX_NSObject wxApp::OSXCreateAppController()
+{
+    return [[wxNSAppController alloc] init];
+}
+
 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;
-    [NSApplication sharedApplication];
 
     if (!sm_isEmbedded)
     {
-        wxNSAppController* controller = [[wxNSAppController alloc] init];
-        [NSApp setDelegate:controller];
+        [wxNSApplication sharedApplication];
+        
+        if ( OSXIsGUIApplication() )
+        {
+            CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ;
+            CFStringRef path = CFURLCopyFileSystemPath ( url , kCFURLPOSIXPathStyle ) ;
+            CFRelease( url ) ;
+            wxString app = wxCFStringRef(path).AsString(wxLocale::GetSystemEncoding());
+            
+            // workaround is only needed for non-bundled apps
+            if ( !app.EndsWith(".app") )
+            {
+                [(wxNSApplication*) [wxNSApplication sharedApplication] transformToForegroundApplication];
+            }
+        }
+
+        appcontroller = OSXCreateAppController();
+        [NSApp setDelegate:appcontroller];
+        [NSColor setIgnoresAlpha:NO];
 
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
         // to the duplication of menus under 10.5 and a warning under 10.6
@@ -257,11 +400,60 @@ bool wxApp::DoInitGui()
         [NSApp finishLaunching];
 #endif
     }
+    gNSLayoutManager = [[NSLayoutManager alloc] init];
+    
     return true;
 }
 
+bool wxApp::CallOnInit()
+{
+    wxMacAutoreleasePool autoreleasepool;
+    m_onInitResult = false;
+    m_inited = false;
+
+    // Feed the upcoming event loop with a dummy event. Without this,
+    // [NSApp run] below wouldn't return, as we expect it to, if the
+    // application was launched without being activated and would block
+    // until the dock icon was clicked - delaying OnInit() call too.
+    NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
+                                    location:NSMakePoint(0.0, 0.0)
+                               modifierFlags:0
+                                   timestamp:0
+                                windowNumber:0
+                                     context:nil
+                                     subtype:0 data1:0 data2:0];
+    [NSApp postEvent:event atStart:FALSE];
+    [NSApp run];
+
+    m_onInitResult = OnInit();
+    m_inited = true;
+    if ( m_onInitResult )
+    {
+        if ( m_openFiles.GetCount() > 0 )
+            MacOpenFiles(m_openFiles);
+        else if ( m_printFiles.GetCount() > 0 )
+            MacPrintFiles(m_printFiles);
+        else if ( m_getURL.Len() > 0 )
+            MacOpenURL(m_getURL);
+        else
+            MacNewFile();
+    }
+    return m_onInitResult;
+}
+
 void wxApp::DoCleanUp()
 {
+    if ( appcontroller != nil )
+    {
+        [NSApp setDelegate:nil];
+        [appcontroller release];
+        appcontroller = nil;
+    }
+    if ( gNSLayoutManager != nil )
+    {
+        [gNSLayoutManager release];
+        gNSLayoutManager = nil;
+    }
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
diff --git a/Externals/wxWidgets3/src/osx/cocoa/window.mm b/Externals/wxWidgets3/src/osx/cocoa/window.mm
index dd8fb68e53..1dc97c5b5e 100644
--- a/Externals/wxWidgets3/src/osx/cocoa/window.mm
+++ b/Externals/wxWidgets3/src/osx/cocoa/window.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
-// RCS-ID:      $Id: window.mm 70863 2012-03-10 13:13:51Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,6 +16,7 @@
     #include "wx/log.h"
     #include "wx/textctrl.h"
     #include "wx/combobox.h"
+    #include "wx/radiobut.h"
 #endif
 
 #ifdef __WXMAC__
@@ -41,7 +41,7 @@
 
 // Get the window with the focus
 
-NSView* GetViewFromResponder( NSResponder* responder )
+NSView* wxOSXGetViewFromResponder( NSResponder* responder )
 {
     NSView* view = nil;
     if ( [responder isKindOfClass:[NSTextView class]] )
@@ -64,16 +64,29 @@ NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
 {
     NSView* focusedView = nil;
     if ( keyWindow != nil )
-        focusedView = GetViewFromResponder([keyWindow firstResponder]);
+        focusedView = wxOSXGetViewFromResponder([keyWindow firstResponder]);
 
     return focusedView;
 }
 
 WXWidget wxWidgetImpl::FindFocus()
 {
-    return GetFocusedViewInWindow( [NSApp keyWindow] );
+    return GetFocusedViewInWindow( [NSApp keyWindow] );;
 }
 
+wxWidgetImpl* wxWidgetImpl::FindBestFromWXWidget(WXWidget control)
+{
+    wxWidgetImpl* impl = FindFromWXWidget(control);
+    
+    // NSScrollViews can have their subviews like NSClipView
+    // therefore check and use the NSScrollView peer in that case
+    if ( impl == NULL && [[control superview] isKindOfClass:[NSScrollView class]])
+        impl = FindFromWXWidget([control superview]);
+    
+    return impl;
+}
+
+
 NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
     int x, y, w, h ;
@@ -96,6 +109,22 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 
 @end // wxNSView
 
+@interface wxNSView(TextInput) <NSTextInputClient>
+
+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange;
+- (void)doCommandBySelector:(SEL)aSelector;
+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
+- (void)unmarkText;
+- (NSRange)selectedRange;
+- (NSRange)markedRange;
+- (BOOL)hasMarkedText;
+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
+- (NSArray*)validAttributesForMarkedText;
+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint;
+
+@end
+
 @interface NSView(PossibleMethods)
 - (void)setTitle:(NSString *)aString;
 - (void)setStringValue:(NSString *)aString;
@@ -293,59 +322,70 @@ long wxOSXTranslateCocoaKey( NSEvent* event, int eventType )
         case 48:
             retval = WXK_TAB;
             break;
-
-        case 75: // /
-            retval = WXK_NUMPAD_DIVIDE;
-            break;
-        case 67: // *
-            retval = WXK_NUMPAD_MULTIPLY;
-            break;
-        case 78: // -
-            retval = WXK_NUMPAD_SUBTRACT;
-            break;
-        case 69: // +
-            retval = WXK_NUMPAD_ADD;
-            break;
-        case 76: // Enter
-            retval = WXK_NUMPAD_ENTER;
-            break;
-        case 65: // .
-            retval = WXK_NUMPAD_DECIMAL;
-            break;
-        case 82: // 0
-            retval = WXK_NUMPAD0;
-            break;
-        case 83: // 1
-            retval = WXK_NUMPAD1;
-            break;
-        case 84: // 2
-            retval = WXK_NUMPAD2;
-            break;
-        case 85: // 3
-            retval = WXK_NUMPAD3;
-            break;
-        case 86: // 4
-            retval = WXK_NUMPAD4;
-            break;
-        case 87: // 5
-            retval = WXK_NUMPAD5;
-            break;
-        case 88: // 6
-            retval = WXK_NUMPAD6;
-            break;
-        case 89: // 7
-            retval = WXK_NUMPAD7;
-            break;
-        case 91: // 8
-            retval = WXK_NUMPAD8;
-            break;
-        case 92: // 9
-            retval = WXK_NUMPAD9;
-            break;
         default:
-            //retval = [event keyCode];
             break;
     }
+    
+    // Check for NUMPAD keys.  For KEY_UP/DOWN events we need to use the
+    // WXK_NUMPAD constants, but for the CHAR event we want to use the
+    // standard ascii values
+    if ( eventType != wxEVT_CHAR )
+    {
+        switch( [event keyCode] )
+        {
+            case 75: // /
+                retval = WXK_NUMPAD_DIVIDE;
+                break;
+            case 67: // *
+                retval = WXK_NUMPAD_MULTIPLY;
+                break;
+            case 78: // -
+                retval = WXK_NUMPAD_SUBTRACT;
+                break;
+            case 69: // +
+                retval = WXK_NUMPAD_ADD;
+                break;
+            case 76: // Enter
+                retval = WXK_NUMPAD_ENTER;
+                break;
+            case 65: // .
+                retval = WXK_NUMPAD_DECIMAL;
+                break;
+            case 82: // 0
+                retval = WXK_NUMPAD0;
+                break;
+            case 83: // 1
+                retval = WXK_NUMPAD1;
+                break;
+            case 84: // 2
+                retval = WXK_NUMPAD2;
+                break;
+            case 85: // 3
+                retval = WXK_NUMPAD3;
+                break;
+            case 86: // 4
+                retval = WXK_NUMPAD4;
+                break;
+            case 87: // 5
+                retval = WXK_NUMPAD5;
+                break;
+            case 88: // 6
+                retval = WXK_NUMPAD6;
+                break;
+            case 89: // 7
+                retval = WXK_NUMPAD7;
+                break;
+            case 91: // 8
+                retval = WXK_NUMPAD8;
+                break;
+            case 92: // 9
+                retval = WXK_NUMPAD9;
+                break;
+            default:
+                //retval = [event keyCode];
+                break;
+        }
+    }
     return retval;
 }
 
@@ -455,13 +495,15 @@ bool g_lastButtonWasFakeRight = false ;
 @interface NSEvent (DeviceDelta)
 - (CGFloat)deviceDeltaX;
 - (CGFloat)deviceDeltaY;
+
+// 10.7+
+- (BOOL)hasPreciseScrollingDeltas;
+- (CGFloat)scrollingDeltaX;
+- (CGFloat)scrollingDeltaY;
 @end
 
-void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
+void wxWidgetCocoaImpl::SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent* nsEvent)
 {
-    int eventType = [nsEvent type];
-    UInt32 modifiers = [nsEvent modifierFlags] ;
-
     NSPoint locationInWindow = [nsEvent locationInWindow];
     
     // adjust coordinates for the window of the target view
@@ -469,20 +511,30 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     {
         if ( [nsEvent window] != nil )
             locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow];
-
+        
         if ( [m_osxView window] != nil )
             locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow];
     }
-
+    
     NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil];
     wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView );
+        
+    x = locationInViewWX.x;
+    y = locationInViewWX.y;
+
+}
+
+void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
+{
+    int eventType = [nsEvent type];
+    UInt32 modifiers = [nsEvent modifierFlags] ;
+    
+    SetupCoordinates(wxevent.m_x, wxevent.m_y, nsEvent);
 
     // these parameters are not given for all events
     UInt32 button = [nsEvent buttonNumber];
     UInt32 clickCount = 0;
 
-    wxevent.m_x = locationInViewWX.x;
-    wxevent.m_y = locationInViewWX.y;
     wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
     wxevent.m_rawControlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
@@ -609,32 +661,52 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
 
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
 
-            // see http://developer.apple.com/qa/qa2005/qa1453.html
-            // for more details on why we have to look for the exact type
-            
-            const EventRef cEvent = (EventRef) [nsEvent eventRef];
-            bool isMouseScrollEvent = false;
-            if ( cEvent )
-                isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
-                
-            if ( isMouseScrollEvent )
+            if ( UMAGetSystemVersion() >= 0x1070 )
             {
-                deltaX = [nsEvent deviceDeltaX];
-                deltaY = [nsEvent deviceDeltaY];
+                if ( [nsEvent hasPreciseScrollingDeltas] )
+                {
+                    deltaX = [nsEvent scrollingDeltaX];
+                    deltaY = [nsEvent scrollingDeltaY];
+                }
+                else
+                {
+                    deltaX = [nsEvent scrollingDeltaX] * 10;
+                    deltaY = [nsEvent scrollingDeltaY] * 10;
+                }
             }
             else
             {
-                deltaX = ([nsEvent deltaX] * 10);
-                deltaY = ([nsEvent deltaY] * 10);
+                const EventRef cEvent = (EventRef) [nsEvent eventRef];
+                // see http://developer.apple.com/qa/qa2005/qa1453.html
+                // for more details on why we have to look for the exact type
+                
+                bool isMouseScrollEvent = false;
+                if ( cEvent )
+                    isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
+                
+                if ( isMouseScrollEvent )
+                {
+                    deltaX = [nsEvent deviceDeltaX];
+                    deltaY = [nsEvent deviceDeltaY];
+                }
+                else
+                {
+                    deltaX = ([nsEvent deltaX] * 10);
+                    deltaY = ([nsEvent deltaY] * 10);
+                }
             }
             
             wxevent.m_wheelDelta = 10;
             wxevent.m_linesPerAction = 1;
+            wxevent.m_columnsPerAction = 1;
                 
             if ( fabs(deltaX) > fabs(deltaY) )
             {
-                wxevent.m_wheelAxis = 1;
-                wxevent.m_wheelRotation = (int)deltaX;
+                // wx conventions for horizontal are inverted from vertical (originating from native msw behavior)
+                // right and up are positive values, left and down are negative values, while on OSX right and down
+                // are negative and left and up are positive.
+                wxevent.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
+                wxevent.m_wheelRotation = -(int)deltaX;
             }
             else
             {
@@ -762,8 +834,91 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     }
     [super removeTrackingRect:tag];
 }
+
+#if wxOSX_USE_NATIVE_FLIPPED
+- (BOOL)isFlipped
+{
+    return YES;
+}
+#endif
+
+- (BOOL) canBecomeKeyView
+{
+    wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if ( viewimpl && viewimpl->IsUserPane() && viewimpl->GetWXPeer() )
+        return viewimpl->GetWXPeer()->AcceptsFocus();
+    return NO;
+}
+
 @end // wxNSView
 
+// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
+// Currently, only insertText:(replacementRange:) is
+// implemented here, and the rest of the methods are stubs.
+// It is hoped that someday IME-related functionality is implemented in
+// wxWidgets and the methods of this protocol are fully working.
+
+@implementation wxNSView(TextInput)
+
+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text);
+
+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
+{
+    wxOSX_insertText(self, @selector(insertText:), aString);
+}
+
+- (void)doCommandBySelector:(SEL)aSelector
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl)
+        impl->doCommandBySelector(aSelector, self, _cmd);
+}
+
+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
+{
+}
+
+- (void)unmarkText
+{
+}
+
+- (NSRange)selectedRange
+{    
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (NSRange)markedRange
+{
+    return NSMakeRange(NSNotFound, 0);
+}
+
+- (BOOL)hasMarkedText
+{
+    return NO;
+}
+
+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
+{
+    return nil;
+}
+
+- (NSArray*)validAttributesForMarkedText
+{
+    return nil;
+}
+
+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
+{
+    return NSMakeRect(0, 0, 0, 0);
+}
+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
+{
+    return NSNotFound;
+}
+
+@end // wxNSView(TextInput)
+
+
 //
 // event handlers
 //
@@ -890,6 +1045,8 @@ BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd)
     return impl->resignFirstResponder(self, _cmd);
 }
 
+#if !wxOSX_USE_NATIVE_FLIPPED
+
 BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -899,6 +1056,8 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)
     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 
+#endif
+
 typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);
 
 void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
@@ -1112,24 +1271,29 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
     return result != wxDragNone;
 }
 
-typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event);
-typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
-typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
-typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);
-
 void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
+    // we are getting moved events for all windows in the hierarchy, not something wx expects
+    // therefore we only handle it for the deepest child in the hierarchy
+    if ( [event type] == NSMouseMoved )
+    {
+        NSView* hitview = [[[slf window] contentView] hitTest:[event locationInWindow]];
+        if ( hitview == NULL || hitview != slf)
+            return;
+    }
+    
     if ( !DoHandleMouseEvent(event) )
     {
         // for plain NSView mouse events would propagate to parents otherwise
-        if (!IsUserPane())
+        // scrollwheel events have to be propagated if not handled in all cases
+        if (!IsUserPane() || [event type] == NSScrollWheel )
         {
             wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
             superimpl(slf, (SEL)_cmd, event);
             
             // super of built-ins keeps the mouse up, as wx expects this event, we have to synthesize it
-            
-            if ( [ event type]  == NSLeftMouseDown )
+            // only trigger if at this moment the mouse is already up
+            if ( [ event type]  == NSLeftMouseDown && !wxGetMouseState().LeftIsDown() )
             {
                 wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
                 SetupMouseEvent(wxevent , event) ;
@@ -1143,20 +1307,45 @@ void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 
 void wxWidgetCocoaImpl::cursorUpdate(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
-    NSCursor *cursor = (NSCursor*)GetWXPeer()->GetCursor().GetHCURSOR();
-    if (cursor == NULL)
+    if ( !SetupCursor(event) )
     {
         wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
-        superimpl(slf, (SEL)_cmd, event);
+            superimpl(slf, (SEL)_cmd, event);
     }
-    else 
+ }
+
+bool wxWidgetCocoaImpl::SetupCursor(WX_NSEvent event)
+{
+    extern wxCursor gGlobalCursor;
+    
+    if ( gGlobalCursor.IsOk() )
     {
-        [cursor set];
+        gGlobalCursor.MacInstall();
+        return true;
+    }
+    else
+    {
+        wxWindow* cursorTarget = GetWXPeer();
+        wxCoord x,y;
+        SetupCoordinates(x, y, event);
+        wxPoint cursorPoint( x , y ) ;
+        
+        while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+        {
+            // at least in GTK cursor events are not propagated either ...
+#if 1
+            cursorTarget = NULL;
+#else
+            cursorTarget = cursorTarget->GetParent() ;
+            if ( cursorTarget )
+                cursorPoint += cursorTarget->GetPosition();
+#endif
+        }
+        
+        return cursorTarget != NULL;
     }
 }
 
-
-
 void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     if ( [event type] == NSKeyDown )
@@ -1179,13 +1368,82 @@ void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 
 void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
 {
-    if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) )
+    bool result = false;
+    if ( IsUserPane() && !m_hasEditor && [text length] > 0)
+    {
+        if ( m_lastKeyDownEvent!=NULL && [text isEqualToString:[m_lastKeyDownEvent characters]])
+        {
+            // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
+            // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
+            {
+                wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+                SetupKeyEvent( wxevent, m_lastKeyDownEvent );
+                result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
+            }
+
+            // ...and wxEVT_CHAR.
+            result = result || DoHandleCharEvent(m_lastKeyDownEvent, text);
+        }
+        else
+        {
+            // If we don't have a corresponding key event (e.g. IME-composed
+            // characters), send wxEVT_CHAR without sending wxEVT_KEY_DOWN.
+            for (NSUInteger i = 0; i < [text length]; ++i)
+            {
+                wxKeyEvent wxevent(wxEVT_CHAR);
+                wxevent.m_shiftDown = wxevent.m_controlDown = wxevent.m_altDown = wxevent.m_metaDown = false;
+                wxevent.m_rawCode = 0;
+                wxevent.m_rawFlags = 0;
+                wxevent.SetTimestamp();
+                unichar aunichar = [text characterAtIndex:i];
+#if wxUSE_UNICODE
+                wxevent.m_uniChar = aunichar;
+#endif
+                wxevent.m_keyCode = aunichar < 0x80 ? aunichar : WXK_NONE;
+                wxWindowMac* peer = GetWXPeer();
+                if ( peer )
+                {
+                    wxevent.SetEventObject(peer);
+                    wxevent.SetId(peer->GetId());
+                }
+                result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
+            }
+        }
+    }
+    if ( !result )
     {
         wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
         superimpl(slf, (SEL)_cmd, text);
     }
 }
 
+void wxWidgetCocoaImpl::doCommandBySelector(void* sel, WXWidget slf, void* _cmd)
+{
+    if ( m_lastKeyDownEvent!=NULL )
+    {
+        // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
+        // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
+        wxKeyEvent wxevent(wxEVT_KEY_DOWN);
+        SetupKeyEvent( wxevent, m_lastKeyDownEvent );
+        bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
+
+        if (!result)
+        {
+            // Generate wxEVT_CHAR if wxEVT_KEY_DOWN is not handled.
+
+            long keycode = wxOSXTranslateCocoaKey( m_lastKeyDownEvent, wxEVT_CHAR );
+
+            wxKeyEvent wxevent2(wxevent) ;
+            wxevent2.SetEventType(wxEVT_CHAR);
+            SetupKeyEvent( wxevent2, m_lastKeyDownEvent );
+            if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START )
+            {
+                wxevent2.m_keyCode = keycode;
+            }
+            GetWXPeer()->OSXHandleKeyEvent(wxevent2);
+        }
+    }
+}
 
 bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
@@ -1202,14 +1460,14 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi
     {
         wxEvtHandler * const handler = m_wxPeer->GetEventHandler();
         
-        wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+        wxCommandEvent command_event( wxEVT_MENU, command );
         command_event.SetEventObject( wxevent.GetEventObject() );
         handled = handler->ProcessEvent( command_event );
         
         if ( !handled )
         {
             // accelerators can also be used with buttons, try them too
-            command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+            command_event.SetEventType(wxEVT_BUTTON);
             handled = handler->ProcessEvent( command_event );
         }
     }
@@ -1253,20 +1511,17 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
-    // get the current focus after running resignFirstResponder
-    // note that this value isn't reliable, it might return the same view that
-    // is resigning
-    NSView* otherView = FindFocus();
-    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
+ 
+    NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
+    NSView* otherView = wxOSXGetViewFromResponder(responder);
 
-    // It doesn't make sense to notify about the loss of focus if we're not
-    // really losing it and the window which has just gained focus is the same
-    // one as this window itself. Of course, this should never happen in the
-    // first place but somehow it does in wxGrid code and without this check we
-    // enter into an infinite recursion, see #12267.
+    wxWidgetImpl* otherWindow = FindBestFromWXWidget(otherView);
+    
+    // It doesn't make sense to notify about the loss of focus if it's the same
+    // control in the end, and just a different subview
     if ( otherWindow == this )
         return r;
-
+    
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event then
     if ( r && !m_hasEditor)
@@ -1276,11 +1531,14 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     return r;
 }
 
-bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
+#if !wxOSX_USE_NATIVE_FLIPPED
+
+bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *WXUNUSED(_cmd))
 {
     return m_isFlipped;
 }
 
+#endif
 
 #define OSX_DEBUG_DRAWING 0
 
@@ -1289,15 +1547,20 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
     // preparing the update region
     
     wxRegion updateRgn;
+
+    // since adding many rects to a region is a costly process, by default use the bounding rect
+#if 0
     const NSRect *rects;
     NSInteger count;
-
     [slf getRectsBeingDrawn:&rects count:&count];
     for ( int i = 0 ; i < count ; ++i )
     {
         updateRgn.Union(wxFromNSRect(slf, rects[i]));
     }
-
+#else
+    updateRgn.Union(wxFromNSRect(slf,*(NSRect*)rect));
+#endif
+    
     wxWindow* wxpeer = GetWXPeer();
 
     if ( wxpeer->MacGetLeftBorderSize() != 0 || wxpeer->MacGetTopBorderSize() != 0 )
@@ -1352,7 +1615,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
     CGContextStrokePath(context);
 #endif
     
-    if ( !m_isFlipped )
+    if ( ![slf isFlipped] )
     {
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
@@ -1374,7 +1637,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
         CGContextSaveGState( context );
     }
     // as we called restore above, we have to flip again if necessary
-    if ( !m_isFlipped )
+    if ( ![slf isFlipped] )
     {
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
@@ -1417,7 +1680,10 @@ void wxWidgetCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_c
 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
+    {
+        wxpeer->OSXSimulateFocusEvents();
         wxpeer->OSXHandleClicked(0);
+    }
 }
 
 void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
@@ -1499,7 +1765,9 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" )
 
+#if !wxOSX_USE_NATIVE_FLIPPED
     wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" )
+#endif
     wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" )
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" )
@@ -1557,7 +1825,9 @@ wxWidgetCocoaImpl::wxWidgetCocoaImpl()
 void wxWidgetCocoaImpl::Init()
 {
     m_osxView = NULL;
+#if !wxOSX_USE_NATIVE_FLIPPED
     m_isFlipped = true;
+#endif
     m_lastKeyDownEvent = NULL;
     m_hasEditor = false;
 }
@@ -1587,6 +1857,17 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
     [m_osxView setHidden:(visible ? NO:YES)];
 }
 
+double wxWidgetCocoaImpl::GetContentScaleFactor() const
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+    NSWindow* tlw = [m_osxView window];
+    if ( [ tlw respondsToSelector:@selector(backingScaleFactor) ] )
+        return [tlw backingScaleFactor];
+    else
+#endif
+        return 1.0;
+}
+
 // ----------------------------------------------------------------------------
 // window animation stuff
 // ----------------------------------------------------------------------------
@@ -1632,7 +1913,6 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
     wxUnusedVar(progress);
 
     m_win->SendSizeEvent();
-    m_win->MacOnInternalSize();
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation
@@ -1809,7 +2089,6 @@ wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win,
         // refresh it once again after the end to ensure that everything is in
         // place
         win->SendSizeEvent();
-        win->MacOnInternalSize();
     }
 
     [anim setDelegate:nil];
@@ -2072,6 +2351,27 @@ bool wxWidgetCocoaImpl::SetFocus()
     return true;
 }
 
+void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target)
+{
+    [m_osxView unregisterDraggedTypes];
+    
+    if ( target == NULL )
+        return;
+    
+    wxDataObject* dobj = target->GetDataObject();
+    
+    if( dobj )
+    {
+        CFMutableArrayRef typesarray = CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks);
+        dobj->AddSupportedTypes(typesarray);
+        NSView* targetView = m_osxView;
+        if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+            targetView = [(NSScrollView*) m_osxView documentView];
+
+        [targetView registerForDraggedTypes:(NSArray*)typesarray];
+        CFRelease(typesarray);
+    }
+}
 
 void wxWidgetCocoaImpl::RemoveFromParent()
 {
@@ -2083,6 +2383,9 @@ void wxWidgetCocoaImpl::Embed( wxWidgetImpl *parent )
     NSView* container = parent->GetWXWidget() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     [container addSubview:m_osxView];
+    
+    if( m_wxPeer->IsFrozen() )
+        [[m_osxView window] disableFlushWindow];
 }
 
 void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
@@ -2330,14 +2633,33 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
         if ([cell respondsToSelector:@selector(setControlSize:)])
             [cell setControlSize:size];
     }
+
+    // we need to propagate this to inner views as well
+    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+    {
+        NSView* targetView = [(NSScrollView*) m_osxView documentView];
+    
+        if ( [targetView respondsToSelector:@selector(setControlSize:)] )
+            [targetView setControlSize:size];
+        else if ([targetView respondsToSelector:@selector(cell)])
+        {
+            id cell = [(id)targetView cell];
+            if ([cell respondsToSelector:@selector(setControlSize:)])
+                [cell setControlSize:size];
+        }
+    }
 }
 
 void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool)
 {
-    if ([m_osxView respondsToSelector:@selector(setFont:)])
-        [m_osxView setFont: font.OSXGetNSFont()];
-    if ([m_osxView respondsToSelector:@selector(setTextColor:)])
-        [m_osxView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
+    NSView* targetView = m_osxView;
+    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+        targetView = [(NSScrollView*) m_osxView documentView];
+
+    if ([targetView respondsToSelector:@selector(setFont:)])
+        [targetView setFont: font.OSXGetNSFont()];
+    if ([targetView respondsToSelector:@selector(setTextColor:)])
+        [targetView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
                                                                  green:(CGFloat) (col.Green() / 255.0)
                                                                   blue:(CGFloat) (col.Blue() / 255.0)
                                                                  alpha:(CGFloat) (col.Alpha() / 255.0)]];
@@ -2363,7 +2685,13 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
     if ([c respondsToSelector:@selector(setAction:)])
     {
         [c setTarget: c];
-        [c setAction: @selector(controlAction:)];
+        if ( dynamic_cast<wxRadioButton*>(GetWXPeer()) )
+        {
+            // everything already set up
+        }
+        else
+            [c setAction: @selector(controlAction:)];
+        
         if ([c respondsToSelector:@selector(setDoubleAction:)])
         {
             [c setDoubleAction: @selector(controlDoubleAction:)];
@@ -2371,17 +2699,25 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
 
     }
     NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited|NSTrackingCursorUpdate|NSTrackingMouseMoved|NSTrackingActiveAlways|NSTrackingInVisibleRect;
-        NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: NSZeroRect options: options owner: m_osxView userInfo: nil];
+    NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: NSZeroRect options: options owner: m_osxView userInfo: nil];
     [m_osxView addTrackingArea: area];
     [area release];
  }
 
 bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 {
-    wxKeyEvent wxevent(wxEVT_CHAR);
-    SetupKeyEvent( wxevent, event, text );
+    bool result = false;
+    
+    for (NSUInteger i = 0; i < [text length]; ++i)
+    {
+        wxKeyEvent wxevent(wxEVT_CHAR);
+        unichar c = [text characterAtIndex:i];
+        SetupKeyEvent( wxevent, event, [NSString stringWithCharacters:&c length:1]);
 
-    return GetWXPeer()->OSXHandleKeyEvent(wxevent);
+        result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
+    }
+    
+    return result;
 }
 
 bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
@@ -2400,47 +2736,34 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
             return true;
     }
 
-    bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
-
-    // this will fire higher level events, like insertText, to help
-    // us handle EVT_CHAR, etc.
-
-    if ( !result )
+    if ( IsUserPane() && [event type] == NSKeyDown)
     {
-        if ( IsUserPane() && [event type] == NSKeyDown)
-        {
-            long keycode = wxOSXTranslateCocoaKey( event, wxEVT_CHAR );
-            
-            if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START )
-            {
-                // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
-                wxKeyEvent wxevent2(wxevent) ;
-                wxevent2.SetEventType(wxEVT_CHAR);
-                wxevent2.m_keyCode = keycode;
-                result = GetWXPeer()->OSXHandleKeyEvent(wxevent2);
-            }
-            else
-            {
-                if ( !wxevent.CmdDown() )
-                {
-                    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-                        [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
-                    else
-                        [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
-                    result = true;
-                }
-            }
-        }
-    }
+        // Don't fire wxEVT_KEY_DOWN here in order to allow IME to intercept
+        // some key events. If the event is not handled by IME, either
+        // insertText: or doCommandBySelector: is called, so we send
+        // wxEVT_KEY_DOWN and wxEVT_CHAR there.
 
-    return result;
+        if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+            [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+        else
+            [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+        return true;
+    }
+    else
+    {
+        return GetWXPeer()->OSXHandleKeyEvent(wxevent);
+    }
 }
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent(wxevent , event) ;
-    return GetWXPeer()->HandleWindowEvent(wxevent);
+    bool result = GetWXPeer()->HandleWindowEvent(wxevent);
+    
+    (void)SetupCursor(event);
+
+    return result;
 }
 
 void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow)
@@ -2468,7 +2791,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth
             event.SetWindow(otherWindow->GetWXPeer());
         thisWindow->HandleWindowEvent(event) ;
     }
-    else // !receivedFocuss
+    else // !receivedFocus
     {
 #if wxUSE_CARET
         if ( thisWindow->GetCaret() )
@@ -2502,19 +2825,37 @@ void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor)
 
 void wxWidgetCocoaImpl::CaptureMouse()
 {
-    [[m_osxView window] disableCursorRects];
+    // TODO remove if we don't get into problems with cursor settings
+    //    [[m_osxView window] disableCursorRects];
 }
 
 void wxWidgetCocoaImpl::ReleaseMouse()
 {
-    [[m_osxView window] enableCursorRects];
+    // TODO remove if we don't get into problems with cursor settings
+    //    [[m_osxView window] enableCursorRects];
 }
 
+#if !wxOSX_USE_NATIVE_FLIPPED
+
 void wxWidgetCocoaImpl::SetFlipped(bool flipped)
 {
     m_isFlipped = flipped;
 }
 
+#endif
+
+void wxWidgetCocoaImpl::SetDrawingEnabled(bool enabled)
+{
+    if ( enabled )
+    {
+        [[m_osxView window] enableFlushWindow];
+        [m_osxView setNeedsDisplay:YES];
+    }
+    else
+    {
+        [[m_osxView window] disableFlushWindow];
+    }
+}
 //
 // Factory methods
 //
@@ -2526,10 +2867,6 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSView* v = [[wxNSView alloc] initWithFrame:r];
 
-    // temporary hook for dnd
-    [v registerForDraggedTypes:[NSArray arrayWithObjects:
-        NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
-
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v, false, true );
     return c;
 }
@@ -2543,11 +2880,13 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     {
         NSView* cv = [tlw contentView];
         c = new wxWidgetCocoaImpl( now, cv, true );
-        // increase ref count, because the impl destructor will decrement it again
-        CFRetain(cv);
-        if ( !now->IsShown() )
-            [cv setHidden:NO];
-        
+        if ( cv != nil )
+        {
+            // increase ref count, because the impl destructor will decrement it again
+            CFRetain(cv);
+            if ( !now->IsShown() )
+                [cv setHidden:NO];
+        }
     }
     else
     {
diff --git a/Externals/wxWidgets3/src/osx/combobox_osx.cpp b/Externals/wxWidgets3/src/osx/combobox_osx.cpp
index abcae432bb..faf325a867 100644
--- a/Externals/wxWidgets3/src/osx/combobox_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/combobox_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: combobox_osx.cpp 69948 2011-12-07 23:41:06Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -131,11 +130,13 @@ unsigned int wxComboBox::GetCount() const
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
+    m_datas.RemoveAt(n);
     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {
+    m_datas.Clear();
     GetComboPeer()->Clear();
 }
 
@@ -187,10 +188,21 @@ wxString wxComboBox::GetStringSelection() const
     return sel == wxNOT_FOUND ? wxString() : GetString(sel);
 }
 
+void wxComboBox::SetValue(const wxString& value)
+{
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection( value ) ;
+    else
+        wxTextEntry::SetValue( value );
+}
+
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
-    Delete(n);
-    Insert(s, n);
+    // Notice that we shouldn't delete and insert the item in this control
+    // itself as this would also affect the client data which we need to
+    // preserve here.
+    GetComboPeer()->RemoveItem(n);
+    GetComboPeer()->InsertItem(n, s);
     SetValue(s); // changing the item in the list won't update the display item
 }
 
@@ -202,7 +214,7 @@ void wxComboBox::EnableTextChangedEvents(bool WXUNUSED(enable))
 
 bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
+    wxCommandEvent event(wxEVT_COMBOBOX, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
diff --git a/Externals/wxWidgets3/src/osx/core/bitmap.cpp b/Externals/wxWidgets3/src/osx/core/bitmap.cpp
index 3b7eaeadd8..8ee6127b11 100644
--- a/Externals/wxWidgets3/src/osx/core/bitmap.cpp
+++ b/Externals/wxWidgets3/src/osx/core/bitmap.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: bitmap.cpp 70737 2012-02-28 16:30:58Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,8 @@
 
 #include "wx/rawbmp.h"
 
+#include "wx/filename.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
@@ -56,8 +57,10 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLIMPEXP_FWD_CORE wxIcon;
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
+    wxBitmapRefData(int width , int height , int depth, double logicalscale);
     wxBitmapRefData(int width , int height , int depth);
-    wxBitmapRefData(CGImageRef image);
+    wxBitmapRefData(CGContextRef context);
+    wxBitmapRefData(CGImageRef image, double scale);
     wxBitmapRefData();
     wxBitmapRefData(const wxBitmapRefData &tocopy);
 
@@ -75,7 +78,7 @@ public:
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
     int GetDepth() const { return m_depth; }
-
+    double GetScaleFactor() const { return m_scaleFactor; }
     void *GetRawAccess() const;
     void *BeginRawAccess();
     void EndRawAccess();
@@ -98,13 +101,10 @@ public:
     // rescaled to 16 x 16
     bool          HasNativeSize();
 
+#ifndef __WXOSX_IPHONE__
     // caller should increase ref count if needed longer
     // than the bitmap exists
     IconRef       GetIconRef();
-
-#ifndef __WXOSX_IPHONE__
-    // returns a Pict from the bitmap content
-    PicHandle     GetPictHandle();
 #endif
 
     CGContextRef  GetBitmapContext() const;
@@ -112,7 +112,9 @@ public:
     int           GetBytesPerRow() const { return m_bytesPerRow; }
     private :
     bool Create(int width , int height , int depth);
-    bool Create( CGImageRef image );
+    bool Create(int width , int height , int depth, double logicalScale);
+    bool Create( CGImageRef image, double scale );
+    bool Create( CGContextRef bitmapcontext);
     void Init();
 
     int           m_width;
@@ -125,11 +127,12 @@ public:
     bool          m_ok;
     mutable CGImageRef    m_cgImageRef;
 
-    IconRef       m_iconRef;
 #ifndef __WXOSX_IPHONE__
-    PicHandle     m_pictHandle;
+    IconRef       m_iconRef;
 #endif
+
     CGContextRef  m_hBitmap;
+    double        m_scaleFactor;
 };
 
 
@@ -189,13 +192,6 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
             info->contentType = kControlContentCGImageRef ;
             info->u.imageRef = (CGImageRef) bmap->CreateCGImage() ;
         }
-        else
-        {
-#ifndef __LP64__
-            info->contentType = kControlContentPictHandle ;
-            info->u.picture = bmap->GetPictHandle() ;
-#endif
-        }
     }
 }
 
@@ -247,18 +243,18 @@ void wxBitmapRefData::Init()
 
 #ifndef __WXOSX_IPHONE__
     m_iconRef = NULL ;
-    m_pictHandle = NULL ;
 #endif
     m_hBitmap = NULL ;
 
     m_rawAccessCount = 0 ;
     m_hasAlpha = false;
+    m_scaleFactor = 1.0;
 }
 
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) : wxGDIRefData()
 {
     Init();
-    Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth);
+    Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth, tocopy.m_scaleFactor);
 
     if (tocopy.m_bitmapMask)
         m_bitmapMask = new wxMask(*tocopy.m_bitmapMask);
@@ -282,14 +278,26 @@ wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
     Create( w , h , d ) ;
 }
 
-wxBitmapRefData::wxBitmapRefData(CGImageRef image)
+wxBitmapRefData::wxBitmapRefData(int w , int h , int d, double logicalscale)
+{
+    Init() ;
+    Create( w , h , d, logicalscale ) ;
+}
+
+wxBitmapRefData::wxBitmapRefData(CGContextRef context)
 {
     Init();
-    Create( image );
+    Create( context );
+}
+
+wxBitmapRefData::wxBitmapRefData(CGImageRef image, double scale)
+{
+    Init();
+    Create( image, scale );
 }    
 // code from Technical Q&A QA1509
 
-bool wxBitmapRefData::Create(CGImageRef image)
+bool wxBitmapRefData::Create(CGImageRef image, double scale)
 {
     if ( image != NULL )
     {
@@ -297,6 +305,7 @@ bool wxBitmapRefData::Create(CGImageRef image)
         m_height = CGImageGetHeight(image);
         m_depth = 32;
         m_hBitmap = NULL;
+        m_scaleFactor = scale;
         
         m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
         size_t size = m_bytesPerRow * m_height ;
@@ -306,7 +315,7 @@ bool wxBitmapRefData::Create(CGImageRef image)
             memset( data , 0 , size ) ;
             m_memBuf.UngetWriteBuf( size ) ;
             CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image);
-            if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipLast || alpha == kCGImageAlphaNoneSkipLast )
+            if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipFirst || alpha == kCGImageAlphaNoneSkipLast )
             {
                 m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
             }
@@ -315,12 +324,12 @@ bool wxBitmapRefData::Create(CGImageRef image)
                 m_hasAlpha = true;
                 m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst );
             }
-            CGRect rect = {{0,0},{m_width,m_height}}; 
+            CGRect rect = CGRectMake(0,0,m_width,m_height);
             CGContextDrawImage(m_hBitmap, rect, image);
             
             wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
             CGContextTranslateCTM( m_hBitmap, 0,  m_height );
-            CGContextScaleCTM( m_hBitmap, 1, -1 );
+            CGContextScaleCTM( m_hBitmap, 1*m_scaleFactor, -1*m_scaleFactor );
         } /* data != NULL */
     }
     m_ok = ( m_hBitmap != NULL ) ;
@@ -329,6 +338,41 @@ bool wxBitmapRefData::Create(CGImageRef image)
     
 }
 
+bool wxBitmapRefData::Create(CGContextRef context)
+{
+    if ( context != NULL && CGBitmapContextGetData(context) )
+    {
+        m_hBitmap = context;
+        m_bytesPerRow = CGBitmapContextGetBytesPerRow(context);
+        m_width = CGBitmapContextGetWidth(context);
+        m_height = CGBitmapContextGetHeight(context);
+        m_depth = CGBitmapContextGetBitsPerPixel(context) ;
+
+        // our own contexts conform to this, always.
+        wxASSERT( m_depth == 32 );
+        
+        // determine content scale
+        CGRect userrect = CGRectMake(0, 0, 10, 10);
+        CGRect devicerect;
+        devicerect = CGContextConvertRectToDeviceSpace(context, userrect);
+        m_scaleFactor = devicerect.size.height / userrect.size.height;
+        
+        CGImageAlphaInfo alpha = CGBitmapContextGetAlphaInfo(context);
+        
+        if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipFirst || alpha == kCGImageAlphaNoneSkipLast )
+        {
+            // no alpha
+        }
+        else
+        {
+            m_hasAlpha = true;
+        }
+    }
+    m_ok = ( m_hBitmap != NULL ) ;
+    
+    return m_ok ;
+}
+
 bool wxBitmapRefData::Create( int w , int h , int d )
 {
     m_width = wxMax(1, w);
@@ -347,13 +391,19 @@ bool wxBitmapRefData::Create( int w , int h , int d )
         m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
         wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
         CGContextTranslateCTM( m_hBitmap, 0,  m_height );
-        CGContextScaleCTM( m_hBitmap, 1, -1 );
+        CGContextScaleCTM( m_hBitmap, 1*m_scaleFactor, -1*m_scaleFactor );
     } /* data != NULL */
     m_ok = ( m_hBitmap != NULL ) ;
 
     return m_ok ;
 }
 
+bool wxBitmapRefData::Create( int w , int h , int d, double logicalScale )
+{
+    m_scaleFactor = logicalScale;
+    return Create(w*logicalScale,h*logicalScale,d);
+}
+
 void wxBitmapRefData::UseAlpha( bool use )
 {
     if ( m_hasAlpha == use )
@@ -365,7 +415,7 @@ void wxBitmapRefData::UseAlpha( bool use )
     m_hBitmap = CGBitmapContextCreate((char*) m_memBuf.GetData(), m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), m_hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst );
     wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
     CGContextTranslateCTM( m_hBitmap, 0,  m_height );
-    CGContextScaleCTM( m_hBitmap, 1, -1 );
+    CGContextScaleCTM( m_hBitmap, 1*m_scaleFactor, -1*m_scaleFactor );
 }
 
 void *wxBitmapRefData::GetRawAccess() const
@@ -379,8 +429,8 @@ void *wxBitmapRefData::BeginRawAccess()
     wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ) ;
     wxASSERT( m_rawAccessCount == 0 ) ;
 #ifndef __WXOSX_IPHONE__
-    wxASSERT_MSG( m_pictHandle == NULL && m_iconRef == NULL ,
-        wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ;
+    wxASSERT_MSG( m_iconRef == NULL ,
+                 wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ;
 #endif
     ++m_rawAccessCount ;
 
@@ -428,8 +478,39 @@ IconRef wxBitmapRefData::GetIconRef()
         OSType dataType = 0 ;
         OSType maskType = 0 ;
 
+        // since we don't have PICT conversion available, use
+        // the next larger standard icon size
+        // TODO: Use NSImage
+        if (sz <= 16)
+            sz = 16;
+        else if ( sz <= 32)
+            sz = 32;
+        else if ( sz <= 48)
+            sz = 48;
+        else if ( sz <= 128)
+            sz = 128;
+        else if ( sz <= 256)
+            sz = 256;
+        else if ( sz <= 512)
+            sz = 512;
+        else if ( sz <= 1024)
+            sz = 1024;
+        
         switch (sz)
         {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+            case 1024:
+                dataType = kIconServices1024PixelDataARGB;
+                break;
+#endif
+            case 512:
+                dataType = kIconServices512PixelDataARGB;
+                break;
+                
+            case 256:
+                dataType = kIconServices256PixelDataARGB;
+                break;
+ 
             case 128:
                 dataType = kIconServices128PixelDataARGB ;
                 break;
@@ -581,11 +662,6 @@ IconRef wxBitmapRefData::GetIconRef()
                 DisposeHandle( maskdata ) ;
             }
         }
-        else
-        {
-            PicHandle pic = GetPictHandle() ;
-            SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
-        }
         // transform into IconRef
 
         // cleaner version existing from 10.3 upwards
@@ -600,10 +676,6 @@ IconRef wxBitmapRefData::GetIconRef()
     return m_iconRef ;
 }
 
-PicHandle wxBitmapRefData::GetPictHandle()
-{
-    return m_pictHandle ;
-}
 #endif
 
 CGImageRef wxBitmapRefData::CreateCGImage() const
@@ -743,13 +815,6 @@ void wxBitmapRefData::Free()
         ReleaseIconRef( m_iconRef ) ;
         m_iconRef = NULL ;
     }
-
-#ifndef __LP64__
-    if ( m_pictHandle )
-    {
-        m_pictHandle = NULL ;
-    }
-#endif
 #endif
     if ( m_hBitmap )
     {
@@ -886,9 +951,9 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     {
         if ( no_bits == 1 )
         {
-            int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
-            if ( the_width % (sizeof(unsigned char) * 8) )
-                linesize += sizeof(unsigned char);
+            int linesize = the_width / 8;
+            if ( the_width % 8 )
+                linesize++;
 
             unsigned char* linestart = (unsigned char*) bits ;
             unsigned char* destptr = (unsigned char*) BeginRawAccess() ;
@@ -935,14 +1000,19 @@ wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, i
     (void) Create(data, type, width, height, depth);
 }
 
+wxBitmap::wxBitmap(int width, int height, const wxDC& dc)
+{
+    (void)Create(width, height, dc);
+}
+
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     LoadFile(filename, type);
 }
 
-wxBitmap::wxBitmap(CGImageRef image)
+wxBitmap::wxBitmap(CGImageRef image, double scale)
 {
-    (void) Create(image);
+    (void) Create(image,scale);
 }
 
 wxGDIRefData* wxBitmap::CreateGDIRefData() const
@@ -1001,10 +1071,34 @@ IconRef wxBitmap::CreateIconRef() const
 
 #if wxOSX_USE_COCOA
 
+wxBitmap::wxBitmap(WX_NSImage image)
+{
+    (void)Create(image);
+}
+
+bool wxBitmap::Create(WX_NSImage image)
+{
+    return Create(wxOSXCreateBitmapContextFromNSImage(image));
+}
+
+wxBitmap::wxBitmap(CGContextRef bitmapcontext)
+{
+    (void)Create(bitmapcontext);
+}
+
+bool wxBitmap::Create(CGContextRef bitmapcontext)
+{
+    UnRef();
+    
+    m_refData = new wxBitmapRefData( bitmapcontext );
+    
+    return M_BITMAPDATA->IsOk() ;
+}
+
 WX_NSImage wxBitmap::GetNSImage() const
 {
     wxCFRef< CGImageRef > cgimage(CreateCGImage());
-    return wxOSXGetNSImageFromCGImage( cgimage );
+    return wxOSXGetNSImageFromCGImage( cgimage, GetScaleFactor() );
 }
 
 #endif
@@ -1026,29 +1120,34 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
                 (rect.y+rect.height <= GetHeight()),
                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
 
-    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxBitmap ret;
+    double scale = GetScaleFactor();
+    ret.CreateScaled( rect.width, rect.height, GetDepth(), scale );
     wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );
 
-    int destwidth = rect.width ;
-    int destheight = rect.height ;
+    int destwidth = rect.width*scale ;
+    int destheight = rect.height*scale ;
 
     {
         unsigned char *sourcedata = (unsigned char*) GetRawAccess() ;
         unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
-        wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
+        wxASSERT((sourcedata != NULL) && (destdata != NULL));
 
-        int sourcelinesize = GetBitmapData()->GetBytesPerRow() ;
-        int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ;
-        unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ;
-        unsigned char *dest = destdata ;
-
-        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+        if ( (sourcedata != NULL) && (destdata != NULL) )
         {
-            memcpy( dest , source , destlinesize ) ;
+            int sourcelinesize = GetBitmapData()->GetBytesPerRow() ;
+            int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ;
+            unsigned char *source = sourcedata + int(rect.x * scale * 4 + rect.y *scale * sourcelinesize) ;
+            unsigned char *dest = destdata ;
+
+            for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+            {
+                memcpy( dest , source , destlinesize ) ;
+            }
         }
+        ret.EndRawAccess() ;
     }
 
-    ret.EndRawAccess() ;
 
     if ( M_BITMAPDATA->m_bitmapMask )
     {
@@ -1063,15 +1162,18 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
         unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;
         wxASSERT( (source != NULL) && (destdata != NULL) ) ;
 
-        source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ;
-        unsigned char *dest = destdata ;
-
-        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+        if ( (source != NULL) && (destdata != NULL) )
         {
-            memcpy( dest , source , destlinesize ) ;
-        }
+            source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ;
+            unsigned char *dest = destdata ;
 
-        maskbuf.UngetWriteBuf( maskbufsize ) ;
+            for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+            {
+                memcpy( dest , source , destlinesize ) ;
+            }
+
+            maskbuf.UngetWriteBuf( maskbufsize ) ;
+        }
         ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ;
     }
     else if ( HasAlpha() )
@@ -1092,12 +1194,29 @@ bool wxBitmap::Create(int w, int h, int d)
     return M_BITMAPDATA->IsOk() ;
 }
 
+bool wxBitmap::Create(int w, int h, const wxDC& dc)
+{
+    double factor = dc.GetContentScaleFactor();
+    return CreateScaled(w,h,wxBITMAP_SCREEN_DEPTH, factor);
+}
 
-bool wxBitmap::Create(CGImageRef image)
+bool wxBitmap::CreateScaled(int w, int h, int d, double logicalScale)
 {
     UnRef();
     
-    m_refData = new wxBitmapRefData( image );
+    if ( d < 0 )
+        d = wxDisplayDepth() ;
+    
+    m_refData = new wxBitmapRefData( w , h , d, logicalScale );
+    
+    return M_BITMAPDATA->IsOk() ;
+}
+
+bool wxBitmap::Create(CGImageRef image, double scale)
+{
+    UnRef();
+    
+    m_refData = new wxBitmapRefData( image, scale );
     
     return M_BITMAPDATA->IsOk() ;
 }
@@ -1117,10 +1236,29 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     else
     {
 #if wxUSE_IMAGE
-        wxImage loadimage(filename, type);
+        double scale = 1.0;
+        wxString fname = filename;
+        
+        if  ( type == wxBITMAP_TYPE_PNG )
+        {
+            if ( wxOSXGetMainScreenContentScaleFactor() > 1.9 )
+            {
+                wxFileName fn(filename);
+                fn.MakeAbsolute();
+                fn.SetName(fn.GetName()+"@2x");
+                
+                if ( fn.Exists() )
+                {
+                    fname = fn.GetFullPath();
+                    scale = 2.0;
+                }
+            }
+        }
+
+        wxImage loadimage(fname, type);
         if (loadimage.IsOk())
         {
-            *this = loadimage;
+            *this = wxBitmap(loadimage,-1,scale);
 
             return true;
         }
@@ -1152,7 +1290,7 @@ bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height
 
 #if wxUSE_IMAGE
 
-wxBitmap::wxBitmap(const wxImage& image, int depth)
+wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
 {
     wxCHECK_RET( image.IsOk(), wxT("invalid image") );
 
@@ -1162,7 +1300,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     wxBitmapRefData* bitmapRefData;
 
-    m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
+    m_refData = bitmapRefData = new wxBitmapRefData( width/scale, height/scale, depth, scale) ;
 
     if ( bitmapRefData->IsOk())
     {
@@ -1372,6 +1510,13 @@ int wxBitmap::GetWidth() const
    return M_BITMAPDATA->GetWidth() ;
 }
 
+double wxBitmap::GetScaleFactor() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
+    
+    return M_BITMAPDATA->GetScaleFactor() ;
+}
+
 int wxBitmap::GetDepth() const
 {
    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
@@ -1607,37 +1752,60 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
     wxASSERT( destdatabase != NULL ) ;
-
-    memset( destdatabase , 0 , size ) ;
-    unsigned char * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ;
-    size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow();
-
-    for ( int y = 0 ; y < m_height ; ++y , srcdatabase+= sourceBytesRow, destdatabase += m_bytesPerRow)
+    if ( destdatabase != NULL)
     {
-        unsigned char *srcdata = srcdatabase ;
-        unsigned char *destdata = destdatabase ;
-        unsigned char r, g, b;
+        memset( destdatabase , 0 , size ) ;
+        unsigned char * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ;
+        size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow();
 
-        for ( int x = 0 ; x < m_width ; ++x )
+        for ( int y = 0 ; y < m_height ; ++y , srcdatabase+= sourceBytesRow, destdatabase += m_bytesPerRow)
         {
-            srcdata++ ;
-            r = *srcdata++ ;
-            g = *srcdata++ ;
-            b = *srcdata++ ;
+            unsigned char *srcdata = srcdatabase ;
+            unsigned char *destdata = destdatabase ;
+            unsigned char r, g, b;
 
-            if ( colour == wxColour( r , g , b ) )
-                *destdata++ = 0xFF ;
-            else
-                *destdata++ = 0x00 ;
+            for ( int x = 0 ; x < m_width ; ++x )
+            {
+                srcdata++ ;
+                r = *srcdata++ ;
+                g = *srcdata++ ;
+                b = *srcdata++ ;
+
+                if ( colour == wxColour( r , g , b ) )
+                    *destdata++ = 0xFF ;
+                else
+                    *destdata++ = 0x00 ;
+            }
         }
     }
-
     m_memBuf.UngetWriteBuf( size ) ;
     RealizeNative() ;
 
     return true;
 }
 
+wxBitmap wxMask::GetBitmap() const
+{
+    wxBitmap bitmap(m_width, m_height, 1);
+    unsigned char* dst = static_cast<unsigned char*>(bitmap.BeginRawAccess());
+    const int dst_stride = bitmap.GetBitmapData()->GetBytesPerRow();
+    const unsigned char* src = static_cast<unsigned char*>(GetRawAccess());
+    for (int j = 0; j < m_height; j++, src += m_bytesPerRow, dst += dst_stride)
+    {
+        unsigned char* d = dst;
+        for (int i = 0; i < m_width; i++)
+        {
+            const unsigned char byte = src[i];
+            *d++ = 0xff;
+            *d++ = byte;
+            *d++ = byte;
+            *d++ = byte;
+        }
+    }
+    bitmap.EndRawAccess();
+    return bitmap;
+}
+
 WXHBITMAP wxMask::GetHBITMAP() const
 {
     return m_maskBitmap ;
@@ -1682,7 +1850,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler)
 
 class WXDLLEXPORT wxJPEGResourceHandler: public wxBundleResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxPNGResourceHandler)
+    DECLARE_DYNAMIC_CLASS(wxJPEGResourceHandler)
     
 public:
     inline wxJPEGResourceHandler()
@@ -1703,9 +1871,23 @@ bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
 {
     wxString ext = GetExtension().Lower();
     wxCFStringRef resname(name);
+    wxCFStringRef resname2x(name+"@2x");
     wxCFStringRef restype(ext);
+    double scale = 1.0;
     
-    wxCFRef<CFURLRef> imageURL(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL));
+    wxCFRef<CFURLRef> imageURL;
+    
+    if ( wxOSXGetMainScreenContentScaleFactor() > 1.9 )
+    {
+        imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname2x, restype, NULL));
+        scale = 2.0;
+    }
+    
+    if ( imageURL.get() == NULL )
+    {
+        imageURL.reset(CFBundleCopyResourceURL(CFBundleGetMainBundle(), resname, restype, NULL));
+        scale = 1.0;
+    }
     
     if ( imageURL.get() != NULL )
     {
@@ -1721,7 +1903,7 @@ bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
                                                        kCGRenderingIntentDefault);
         if ( image != NULL )
         {
-            bitmap->Create(image);
+            bitmap->Create(image,scale);
             CGImageRelease(image);
         }
     }
@@ -1729,6 +1911,18 @@ bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
     return false ;
 }
 
+/* static */
+wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
+{
+    wxCFRef<CGDataProviderRef>
+        provider(CGDataProviderCreateWithData(NULL, data, size, NULL) );
+    wxCFRef<CGImageRef>
+        image(CGImageCreateWithPNGDataProvider(provider, NULL, true,
+                                                kCGRenderingIntentDefault));
+
+    return wxBitmap(image);
+}
+
 void wxBitmap::InitStandardHandlers()
 {
 #if wxOSX_USE_COCOA_OR_CARBON
diff --git a/Externals/wxWidgets3/src/osx/core/cfstring.cpp b/Externals/wxWidgets3/src/osx/core/cfstring.cpp
index c2d08701b0..384bf88e72 100644
--- a/Externals/wxWidgets3/src/osx/core/cfstring.cpp
+++ b/Externals/wxWidgets3/src/osx/core/cfstring.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2004-10-29 (from code in src/osx/carbon/utils.cpp)
-// RCS-ID:      $Id: cfstring.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 // Usage:       Darwin (base library)
@@ -632,6 +631,18 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN
     }
 }
 
+wxString wxCFStringRef::AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding )
+{
+    if ( !ref )
+        return wxEmptyString ;
+
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, ref);
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    wxString str = wxCFStringRef::AsString(ref,encoding);
+    CFRelease(cfMutableString);
+    return str;
+}
+
 wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UNICODE(encoding) )
 {
     if ( !ref )
@@ -687,7 +698,12 @@ wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
 {
     return AsString( (CFStringRef) ref, encoding );
 }
-#endif
+
+wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding )
+{
+    return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding );
+}
+#endif // wxOSX_USE_COCOA_OR_IPHONE
 
 
 //
diff --git a/Externals/wxWidgets3/src/osx/core/colour.cpp b/Externals/wxWidgets3/src/osx/core/colour.cpp
index 75388b74a1..e39d215cdc 100644
--- a/Externals/wxWidgets3/src/osx/core/colour.cpp
+++ b/Externals/wxWidgets3/src/osx/core/colour.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: colour.cpp 70400 2012-01-19 14:06:36Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +69,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_alpha = a ;
 
     CGColorRef col = 0 ;
-#if wxOSX_USE_COCOA_OR_CARBON && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if wxOSX_USE_COCOA_OR_CARBON 
     if ( CGColorCreateGenericRGB != NULL )
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else
@@ -91,17 +90,8 @@ void wxColour::InitRGBColor( const RGBColor& col )
     m_green = col.green >> 8;
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB != NULL )
-        cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
+    cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
-    else
-#endif
-    {
-        CGFloat components[4] = {   (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
-                                    (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
-        cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    }
     wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( cfcol );
 }
diff --git a/Externals/wxWidgets3/src/osx/core/dcmemory.cpp b/Externals/wxWidgets3/src/osx/core/dcmemory.cpp
index 7143745124..a7a47d6213 100644
--- a/Externals/wxWidgets3/src/osx/core/dcmemory.cpp
+++ b/Externals/wxWidgets3/src/osx/core/dcmemory.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: dcmemory.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,8 +75,9 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;
         m_selected.BeginRawAccess() ;
-        m_width = bitmap.GetWidth();
-        m_height = bitmap.GetHeight();
+        m_width = bitmap.GetScaledWidth();
+        m_height = bitmap.GetScaledHeight();
+        m_contentScaleFactor = bitmap.GetScaleFactor();
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
 
@@ -100,9 +100,9 @@ void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
     if (m_selected.IsOk())
     {
         if (width)
-            (*width) = m_selected.GetWidth();
+            (*width) = m_selected.GetScaledWidth();
         if (height)
-            (*height) = m_selected.GetHeight();
+            (*height) = m_selected.GetScaledHeight();
     }
     else
     {
diff --git a/Externals/wxWidgets3/src/osx/core/display.cpp b/Externals/wxWidgets3/src/osx/core/display.cpp
index 06764a2f27..b1961bc92e 100644
--- a/Externals/wxWidgets3/src/osx/core/display.cpp
+++ b/Externals/wxWidgets3/src/osx/core/display.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton & Brian Victor
 // Modified by: Royce Mitchell III, Vadim Zeitlin
 // Created:     06/21/02
-// RCS-ID:      $Id: display.cpp 66843 2011-02-05 16:36:18Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/core/evtloop_cf.cpp b/Externals/wxWidgets3/src/osx/core/evtloop_cf.cpp
index 93f835078a..37b22b5909 100644
--- a/Externals/wxWidgets3/src/osx/core/evtloop_cf.cpp
+++ b/Externals/wxWidgets3/src/osx/core/evtloop_cf.cpp
@@ -3,8 +3,8 @@
 // Purpose:     wxEventLoop implementation common to both Carbon and Cocoa
 // Author:      Vadim Zeitlin
 // Created:     2009-10-18
-// RCS-ID:      $Id: evtloop_cf.cpp 70504 2012-02-03 17:27:17Z VZ $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+//              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -25,8 +25,6 @@
 
 #include "wx/evtloop.h"
 
-#if wxUSE_EVENTLOOP_SOURCE
-
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
@@ -44,123 +42,43 @@
     #include "wx/nonownedwnd.h"
 #endif
 
+#include <CoreFoundation/CFSocket.h>
+
 // ============================================================================
 // wxCFEventLoopSource and wxCFEventLoop implementation
 // ============================================================================
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-namespace
+#if wxUSE_EVENTLOOP_SOURCE
+
+void wxCFEventLoopSource::InitSourceSocket(CFSocketRef cfSocket)
 {
+    wxASSERT_MSG( !m_cfSocket, "shouldn't be called more than once" );
 
-void EnableDescriptorCallBacks(CFFileDescriptorRef cffd, int flags)
-{
-    if ( flags & wxEVENT_SOURCE_INPUT )
-        CFFileDescriptorEnableCallBacks(cffd, kCFFileDescriptorReadCallBack);
-    if ( flags & wxEVENT_SOURCE_OUTPUT )
-        CFFileDescriptorEnableCallBacks(cffd, kCFFileDescriptorWriteCallBack);
-}
-
-void
-wx_cffiledescriptor_callback(CFFileDescriptorRef cffd,
-                             CFOptionFlags flags,
-                             void *ctxData)
-{
-    wxLogTrace(wxTRACE_EVT_SOURCE,
-               "CFFileDescriptor callback, flags=%d", flags);
-
-    wxCFEventLoopSource * const
-        source = static_cast<wxCFEventLoopSource *>(ctxData);
-
-    wxEventLoopSourceHandler * const
-        handler = source->GetHandler();
-    if ( flags & kCFFileDescriptorReadCallBack )
-        handler->OnReadWaiting();
-    if ( flags & kCFFileDescriptorWriteCallBack )
-        handler->OnWriteWaiting();
-
-    // we need to re-enable callbacks to be called again
-    EnableDescriptorCallBacks(cffd, source->GetFlags());
-}
-
-} // anonymous namespace
-
-wxEventLoopSource *
-wxCFEventLoop::AddSourceForFD(int fd,
-                              wxEventLoopSourceHandler *handler,
-                              int flags)
-{
-    wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
-
-    wxScopedPtr<wxCFEventLoopSource>
-        source(new wxCFEventLoopSource(handler, flags));
-
-    CFFileDescriptorContext ctx = { 0, source.get(), NULL, NULL, NULL };
-    wxCFRef<CFFileDescriptorRef>
-        cffd(CFFileDescriptorCreate
-             (
-                  kCFAllocatorDefault,
-                  fd,
-                  true,   // close on invalidate
-                  wx_cffiledescriptor_callback,
-                  &ctx
-             ));
-    if ( !cffd )
-        return NULL;
-
-    wxCFRef<CFRunLoopSourceRef>
-        cfsrc(CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, cffd, 0));
-    if ( !cfsrc )
-        return NULL;
-
-    CFRunLoopRef cfloop = CFGetCurrentRunLoop();
-    CFRunLoopAddSource(cfloop, cfsrc, kCFRunLoopDefaultMode);
-
-    // Enable the callbacks initially.
-    EnableDescriptorCallBacks(cffd, source->GetFlags());
-
-    source->SetFileDescriptor(cffd.release());
-
-    return source.release();
-}
-
-void wxCFEventLoopSource::SetFileDescriptor(CFFileDescriptorRef cffd)
-{
-    wxASSERT_MSG( !m_cffd, "shouldn't be called more than once" );
-
-    m_cffd = cffd;
+    m_cfSocket = cfSocket;
 }
 
 wxCFEventLoopSource::~wxCFEventLoopSource()
 {
-    if ( m_cffd )
-        CFRelease(m_cffd);
+    if ( m_cfSocket )
+    {
+        CFSocketInvalidate(m_cfSocket);
+        CFRelease(m_cfSocket);
+    }
 }
 
-#else // OS X < 10.5
-
-wxEventLoopSource *
-wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd),
-                              wxEventLoopSourceHandler * WXUNUSED(handler),
-                              int WXUNUSED(flags))
-{
-    return NULL;
-}
-
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED
-
 #endif // wxUSE_EVENTLOOP_SOURCE
 
 void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)
 {
     wxCFEventLoop * eventloop = static_cast<wxCFEventLoop *>(info);
-    if ( eventloop )
+    if ( eventloop && eventloop->IsRunning() )
         eventloop->CommonModeObserverCallBack(observer, activity);
 }
 
 void wxCFEventLoop::OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)
 {
     wxCFEventLoop * eventloop = static_cast<wxCFEventLoop *>(info);
-    if ( eventloop )
+    if ( eventloop && eventloop->IsRunning() )
         eventloop->DefaultModeObserverCallBack(observer, activity);
 }
 
@@ -176,13 +94,13 @@ void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(obs
         // and this input is only removed from it when pending event handlers are
         // executed)
 
-        if ( wxTheApp )
+        if ( wxTheApp && ShouldProcessIdleEvents() )
             wxTheApp->ProcessPendingEvents();
     }
 
     if ( activity & kCFRunLoopBeforeWaiting )
     {
-        if ( ProcessIdle() )
+        if ( ShouldProcessIdleEvents() && ProcessIdle() )
         {
             WakeUp();
         }
@@ -214,7 +132,12 @@ wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observe
 wxCFEventLoop::wxCFEventLoop()
 {
     m_shouldExit = false;
+    m_processIdleEvents = true;
 
+#if wxUSE_UIACTIONSIMULATOR
+    m_shouldWaitForEvent = false;
+#endif
+    
     m_runLoop = CFGetCurrentRunLoop();
 
     CFRunLoopObserverContext ctxt;
@@ -223,18 +146,19 @@ wxCFEventLoop::wxCFEventLoop()
     m_commonModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
                                                           (CFRunLoopObserverCallBack) wxCFEventLoop::OSXCommonModeObserverCallBack, &ctxt );
     CFRunLoopAddObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes);
-    CFRelease(m_commonModeRunLoopObserver);
 
     m_defaultModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
                                                            (CFRunLoopObserverCallBack) wxCFEventLoop::OSXDefaultModeObserverCallBack, &ctxt );
     CFRunLoopAddObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
-    CFRelease(m_defaultModeRunLoopObserver);
 }
 
 wxCFEventLoop::~wxCFEventLoop()
 {
     CFRunLoopRemoveObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes);
     CFRunLoopRemoveObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
+
+    CFRelease(m_defaultModeRunLoopObserver);
+    CFRelease(m_commonModeRunLoopObserver);
 }
 
 
@@ -309,7 +233,17 @@ bool wxCFEventLoop::Pending() const
 
 int wxCFEventLoop::DoProcessEvents()
 {
-    return DispatchTimeout( 0 );
+#if wxUSE_UIACTIONSIMULATOR
+    if ( m_shouldWaitForEvent )
+    {
+        int  handled = DispatchTimeout( 1000 );
+        wxASSERT_MSG( handled == 1, "No Event Available");
+        m_shouldWaitForEvent = false;
+        return handled;
+    }
+    else
+#endif
+        return DispatchTimeout( 0 );
 }
 
 bool wxCFEventLoop::Dispatch()
@@ -361,7 +295,7 @@ int wxCFEventLoop::DoDispatchTimeout(unsigned long timeout)
     return 1;
 }
 
-void wxCFEventLoop::DoRun()
+void wxCFEventLoop::OSXDoRun()
 {
     for ( ;; )
     {
@@ -382,23 +316,15 @@ void wxCFEventLoop::DoRun()
     }
 }
 
-void wxCFEventLoop::DoStop()
+void wxCFEventLoop::OSXDoStop()
 {
     CFRunLoopStop(CFGetCurrentRunLoop());
 }
 
 // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
 // terminating when Exit() is called
-int wxCFEventLoop::Run()
+int wxCFEventLoop::DoRun()
 {
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );
-
-    // ProcessIdle() and ProcessEvents() below may throw so the code here should
-    // be exception-safe, hence we must use local objects for all actions we
-    // should undo
-    wxEventLoopActivator activate(this);
-
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside ProcessEvents() but we must call it from Exit() in normal
     // situations because it is supposed to be called synchronously,
@@ -411,7 +337,7 @@ int wxCFEventLoop::Run()
         {
 #endif // wxUSE_EXCEPTIONS
 
-            DoRun();
+            OSXDoRun();
 
 #if wxUSE_EXCEPTIONS
             // exit the outer loop as well
@@ -445,11 +371,30 @@ int wxCFEventLoop::Run()
 
 // sets the "should exit" flag and wakes up the loop so that it terminates
 // soon
-void wxCFEventLoop::Exit(int rc)
+void wxCFEventLoop::ScheduleExit(int rc)
 {
     m_exitcode = rc;
     m_shouldExit = true;
-    DoStop();
+    OSXDoStop();
+}
+
+wxCFEventLoopPauseIdleEvents::wxCFEventLoopPauseIdleEvents()
+{
+    wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
+    if ( cfl )
+    {
+        m_formerState = cfl->ShouldProcessIdleEvents();
+        cfl->SetProcessIdleEvents(false);
+    }
+    else
+        m_formerState = true;
+}
+
+wxCFEventLoopPauseIdleEvents::~wxCFEventLoopPauseIdleEvents()
+{
+    wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
+    if ( cfl )
+        cfl->SetProcessIdleEvents(m_formerState);
 }
 
 // TODO Move to thread_osx.cpp
diff --git a/Externals/wxWidgets3/src/osx/core/fontenum.cpp b/Externals/wxWidgets3/src/osx/core/fontenum.cpp
index fb4ed5640b..74bf8039e9 100644
--- a/Externals/wxWidgets3/src/osx/core/fontenum.cpp
+++ b/Externals/wxWidgets3/src/osx/core/fontenum.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: fontenum.cpp 70712 2012-02-27 15:41:35Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,66 +30,102 @@
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 
+#if wxOSX_USE_IPHONE
+extern CFArrayRef CopyAvailableFontFamilyNames();
+#endif
+
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
-    if ( fixedWidthOnly )
-    {
-        wxFAIL_MSG( "enumerating only fixed width fonts not supported" );
-        return false;
-    }
-
-    wxArrayString fontFamilies ;
-
-#if wxOSX_USE_ATSU_TEXT || wxOSX_USE_CORE_TEXT
-
-    //
-    // From Apple's QA 1471 http://developer.apple.com/qa/qa2006/qa1471.html
-    //
-
-    ATSFontFamilyIterator theFontFamilyIterator = NULL;
-    ATSFontFamilyRef theATSFontFamilyRef = 0;
-    OSStatus status = noErr;
-
-    // Create the iterator
-    status = ATSFontFamilyIteratorCreate(kATSFontContextLocal, nil,nil,
-                                         kATSOptionFlagsUnRestrictedScope,
-                                         &theFontFamilyIterator );
+     wxArrayString fontFamilies ;
 
     wxUint32 macEncoding = wxMacGetSystemEncFromFontEnc(encoding) ;
 
-    while (status == noErr)
     {
-        // Get the next font in the iteration.
-        status = ATSFontFamilyIteratorNext( theFontFamilyIterator, &theATSFontFamilyRef );
-        if(status == noErr)
+        CFArrayRef cfFontFamilies = nil;
+
+#if wxOSX_USE_COCOA_OR_CARBON
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+        if ( UMAGetSystemVersion() >= 0x1060 )
+            cfFontFamilies = CTFontManagerCopyAvailableFontFamilyNames();
+        else
+#endif
         {
-            if ( encoding != wxFONTENCODING_SYSTEM )
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6)
+            //
+            // From Apple's QA 1471 http://developer.apple.com/qa/qa2006/qa1471.html
+            //
+            
+            CFMutableArrayRef atsfontnames = CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks);;
+            
+            ATSFontFamilyIterator theFontFamilyIterator = NULL;
+            ATSFontFamilyRef theATSFontFamilyRef = 0;
+            OSStatus status = noErr;
+            
+            // Create the iterator
+            status = ATSFontFamilyIteratorCreate(kATSFontContextLocal, nil,nil,
+                                                 kATSOptionFlagsUnRestrictedScope,
+                                                 &theFontFamilyIterator );
+            
+            while (status == noErr)
             {
-                TextEncoding fontFamiliyEncoding = ATSFontFamilyGetEncoding(theATSFontFamilyRef) ;
-                if ( fontFamiliyEncoding != macEncoding )
-                    continue ;
+                // Get the next font in the iteration.
+                status = ATSFontFamilyIteratorNext( theFontFamilyIterator, &theATSFontFamilyRef );
+                if(status == noErr)
+                {
+                    CFStringRef theName = NULL;
+                    ATSFontFamilyGetName(theATSFontFamilyRef, kATSOptionFlagsDefault, &theName);
+                    CFArrayAppendValue(atsfontnames, theName);
+                    CFRelease(theName);
+                    
+                }
+                else if (status == kATSIterationScopeModified) // Make sure the font database hasn't changed.
+                {
+                    // reset the iterator
+                    status = ATSFontFamilyIteratorReset (kATSFontContextLocal, nil, nil,
+                                                         kATSOptionFlagsUnRestrictedScope,
+                                                         &theFontFamilyIterator);
+                    CFArrayRemoveAllValues(atsfontnames);
+                }
             }
+            ATSFontFamilyIteratorRelease(&theFontFamilyIterator);
+            cfFontFamilies = atsfontnames;
+#endif
+        }
+#elif wxOSX_USE_IPHONE
+        cfFontFamilies = CopyAvailableFontFamilyNames();
+#endif
+        
+        CFIndex count = CFArrayGetCount(cfFontFamilies);
+        for(CFIndex i = 0; i < count; i++)
+        {
+            CFStringRef fontName = (CFStringRef)CFArrayGetValueAtIndex(cfFontFamilies, i);
 
-            // TODO: determine fixed widths ...
-
-            CFStringRef theName = NULL;
-            ATSFontFamilyGetName(theATSFontFamilyRef, kATSOptionFlagsDefault, &theName);
-            wxCFStringRef cfName(theName) ;
+            if ( encoding != wxFONTENCODING_SYSTEM || fixedWidthOnly)
+            {
+                wxCFRef<CTFontRef> font(CTFontCreateWithName(fontName, 12.0, NULL));
+                if ( encoding != wxFONTENCODING_SYSTEM )
+                {
+                    CFStringEncoding fontFamiliyEncoding = CTFontGetStringEncoding(font);
+                    if ( fontFamiliyEncoding != macEncoding )
+                        continue;
+                }
+                
+                if ( fixedWidthOnly )
+                {
+                    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(font);
+                    if ( (traits & kCTFontMonoSpaceTrait) == 0 )
+                        continue;
+                }
+                
+            }
+            
+            wxCFStringRef cfName(wxCFRetain(fontName)) ;
             fontFamilies.Add(cfName.AsString(wxLocale::GetSystemEncoding()));
         }
-        else if (status == kATSIterationScopeModified) // Make sure the font database hasn't changed.
-        {
-            // reset the iterator
-            status = ATSFontFamilyIteratorReset (kATSFontContextLocal, nil, nil,
-                                                 kATSOptionFlagsUnRestrictedScope,
-                                                 &theFontFamilyIterator);
-            fontFamilies.Clear() ;
-        }
+        
+        CFRelease(cfFontFamilies);
     }
-    ATSFontFamilyIteratorRelease(&theFontFamilyIterator);
-#endif
-
     for ( size_t i = 0 ; i < fontFamilies.Count() ; ++i )
     {
         if ( OnFacename( fontFamilies[i] ) == false )
diff --git a/Externals/wxWidgets3/src/osx/core/glgrab.cpp b/Externals/wxWidgets3/src/osx/core/glgrab.cpp
index 74644b45c7..669f2ba6c4 100644
--- a/Externals/wxWidgets3/src/osx/core/glgrab.cpp
+++ b/Externals/wxWidgets3/src/osx/core/glgrab.cpp
@@ -39,6 +39,7 @@
 #import <OpenGL/OpenGL.h>
 #import <OpenGL/gl.h>
 
+#include "wx/osx/core/private.h"
 #include "wx/osx/private/glgrab.h"
 
 extern CGColorSpaceRef wxMacGetGenericRGBColorSpace();
@@ -114,7 +115,6 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     void * data;
     long bytewidth;
     GLint width, height;
-    long bytes;
 
     CGLContextObj    glContextObj;
     CGLPixelFormatObj pixelFormatObj ;
@@ -156,7 +156,6 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
 
     bytewidth = width * 4; // Assume 4 bytes/pixel for now
     bytewidth = (bytewidth + 3) & ~3; // Align to 4 bytes
-    bytes = bytewidth * height; // width * height
 
     /* Build bitmap context */
     data = malloc(height * bytewidth);
diff --git a/Externals/wxWidgets3/src/osx/core/hid.cpp b/Externals/wxWidgets3/src/osx/core/hid.cpp
index 30df548e65..92c874aa26 100644
--- a/Externals/wxWidgets3/src/osx/core/hid.cpp
+++ b/Externals/wxWidgets3/src/osx/core/hid.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     11/11/2003
-// RCS-ID:      $Id: hid.cpp 70251 2012-01-03 10:34:14Z SC $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,7 +35,7 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/osx/core/cfstring.h"
+#include "wx/osx/private.h"
 
 // ============================================================================
 // implementation
@@ -97,7 +96,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
         CFRelease(pClass);
     }
 
-    //Now get the maching services
+    //Now get the matching services
     io_iterator_t pIterator;
     if( IOServiceGetMatchingServices(m_pPort,
                         pDictionary, &pIterator) != kIOReturnSuccess )
@@ -261,7 +260,7 @@ size_t wxHIDDevice::GetCount (int nClass, int nType)
         CFRelease(pClass);
     }
 
-    //Now get the maching services
+    //Now get the matching services
     io_iterator_t pIterator;
     if( IOServiceGetMatchingServices(pPort,
                                      pDictionary, &pIterator) != kIOReturnSuccess )
@@ -379,7 +378,7 @@ bool wxHIDDevice::IsActive(int nIndex)
 // ----------------------------------------------------------------------------
 bool wxHIDDevice::HasElement(int nIndex)
 {
-    return (void*) m_pCookies[nIndex] != NULL;
+    return m_pCookies[nIndex] != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -673,73 +672,8 @@ bool wxGetKeyState (wxKeyCode key)
     wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
         WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
 
-    if (wxHIDModule::sm_keyboards.GetCount() == 0)
-    {
-        int nKeyboards = wxHIDKeyboard::GetCount();
-
-        for(int i = 1; i <= nKeyboards; ++i)
-        {
-            wxHIDKeyboard* keyboard = new wxHIDKeyboard();
-            if(keyboard->Create(i))
-            {
-                wxHIDModule::sm_keyboards.Add(keyboard);
-            }
-            else
-            {
-                delete keyboard;
-                break;
-            }
-        }
-
-        wxASSERT_MSG(wxHIDModule::sm_keyboards.GetCount() != 0,
-                     wxT("No keyboards found!"));
-    }
-
-    for(size_t i = 0; i < wxHIDModule::sm_keyboards.GetCount(); ++i)
-    {
-        wxHIDKeyboard* keyboard = (wxHIDKeyboard*)
-                                wxHIDModule::sm_keyboards[i];
-
-    switch(key)
-    {
-    case WXK_SHIFT:
-            if( keyboard->IsActive(WXK_SHIFT) ||
-                   keyboard->IsActive(WXK_RSHIFT) )
-            {
-                return true;
-            }
-        break;
-    case WXK_ALT:
-            if( keyboard->IsActive(WXK_ALT) ||
-                   keyboard->IsActive(WXK_RALT) )
-            {
-                return true;
-            }
-        break;
-    case WXK_CONTROL:
-            if( keyboard->IsActive(WXK_CONTROL) ||
-                   keyboard->IsActive(WXK_RCONTROL) )
-            {
-                return true;
-            }
-        break;
-    case WXK_RAW_CONTROL:
-            if( keyboard->IsActive(WXK_RAW_CONTROL) ||
-                   keyboard->IsActive(WXK_RAW_RCONTROL) )
-            {
-                return true;
-            }
-        break;
-    default:
-            if( keyboard->IsActive(key) )
-            {
-                return true;
-            }
-        break;
-    }
-    }
-
-    return false; //not down/error
+    CGKeyCode cgcode = wxCharCodeWXToOSX((wxKeyCode)key);
+    return CGEventSourceKeyState(kCGEventSourceStateCombinedSessionState, cgcode);
 }
 
 #endif //__DARWIN__
diff --git a/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp b/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
index 2eb4feb2e2..4a8273838e 100644
--- a/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
+++ b/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2/13/2005
-// RCS-ID:      $Id: hidjoystick.cpp 70404 2012-01-19 15:06:22Z SC $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -566,7 +565,7 @@ void wxHIDJoystick::BuildCookies(CFArrayRef Array)
 
     //
     // I wasted two hours of my life on this line :(
-    // accidently removed it during some source cleaning...
+    // accidentally removed it during some source cleaning...
     //
     MakeCookies(Array);
 
@@ -782,7 +781,7 @@ void* wxJoystickThread::Entry()
 //
 // This is where the REAL dirty work gets done.
 //
-// 1) Loops through each event the queue has recieved
+// 1) Loops through each event the queue has received
 // 2) First, checks if the thread that is running the loop for
 //    the polling has ended - if so it breaks out
 // 3) Next, it checks if there was an error getting this event from
diff --git a/Externals/wxWidgets3/src/osx/core/mimetype.cpp b/Externals/wxWidgets3/src/osx/core/mimetype.cpp
index 83c7c54b22..7d5de4bba9 100644
--- a/Externals/wxWidgets3/src/osx/core/mimetype.cpp
+++ b/Externals/wxWidgets3/src/osx/core/mimetype.cpp
@@ -4,7 +4,6 @@
 // Author:      Neil Perkins
 // Modified by:
 // Created:     2010-05-15
-// RCS-ID:      $Id: mimetype.cpp 68563 2011-08-05 19:02:26Z VZ $
 // Copyright:   (C) 2010 Neil Perkins
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -244,7 +243,7 @@ wxMimeTypesManagerImpl::~wxMimeTypesManagerImpl()
 // Init / shutdown functions
 //
 // The Launch Services / UTI API provides no helpful way of getting a list
-// of all registered types. Instead the API is focused arround looking up
+// of all registered types. Instead the API is focused around looking up
 // information for a particular file type once you already have some
 // identifying piece of information. In order to get a list of registered
 // types it would first be necessary to get a list of all bundles exporting
diff --git a/Externals/wxWidgets3/src/osx/core/printmac.cpp b/Externals/wxWidgets3/src/osx/core/printmac.cpp
index a0558ee26f..148d1b65af 100644
--- a/Externals/wxWidgets3/src/osx/core/printmac.cpp
+++ b/Externals/wxWidgets3/src/osx/core/printmac.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: printmac.cpp 70884 2012-03-12 17:47:18Z SC $
 // Copyright:   (c) Julian Smart, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/core/sockosx.cpp b/Externals/wxWidgets3/src/osx/core/sockosx.cpp
index 2b9bc131be..9a540058ce 100644
--- a/Externals/wxWidgets3/src/osx/core/sockosx.cpp
+++ b/Externals/wxWidgets3/src/osx/core/sockosx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxSocketImpl implementation for OS X
 // Authors:     Brian Victor, Vadim Zeitlin
 // Created:     February 2002
-// RCS-ID:      $Id: sockosx.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2002 Brian Victor
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/osx/core/sound.cpp b/Externals/wxWidgets3/src/osx/core/sound.cpp
index de50b6e587..cc6185a33e 100644
--- a/Externals/wxWidgets3/src/osx/core/sound.cpp
+++ b/Externals/wxWidgets3/src/osx/core/sound.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Stefan Csomor
 // Created:     2009-01-01
-// RCS-ID:      $Id: sound.cpp 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/core/stdpaths_cf.cpp b/Externals/wxWidgets3/src/osx/core/stdpaths_cf.cpp
index aebb1d752c..86b34e646c 100644
--- a/Externals/wxWidgets3/src/osx/core/stdpaths_cf.cpp
+++ b/Externals/wxWidgets3/src/osx/core/stdpaths_cf.cpp
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004-10-27
-// RCS-ID:      $Id: stdpaths_cf.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 David Elliott <dfe@cox.net>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -83,7 +82,7 @@ static wxString BundleRelativeURLToPath(CFURLRef relativeURL)
     wxCHECK_MSG(absoluteURL, wxEmptyString, wxT("Failed to resolve relative URL to absolute URL"));
     CFStringRef cfStrPath = CFURLCopyFileSystemPath(absoluteURL,kDefaultPathStyle);
     CFRelease(absoluteURL);
-    return wxCFStringRef(cfStrPath).AsString(wxLocale::GetSystemEncoding());
+    return wxCFStringRef::AsStringWithNormalizationFormC(cfStrPath);
 }
 
 wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
diff --git a/Externals/wxWidgets3/src/osx/core/strconv_cf.cpp b/Externals/wxWidgets3/src/osx/core/strconv_cf.cpp
index 0685ba2b45..a385e528b3 100644
--- a/Externals/wxWidgets3/src/osx/core/strconv_cf.cpp
+++ b/Externals/wxWidgets3/src/osx/core/strconv_cf.cpp
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2007-07-06
-// RCS-ID:      $Id: strconv_cf.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/core/timer.cpp b/Externals/wxWidgets3/src/osx/core/timer.cpp
index 98cd9d05ea..b78d63c5e6 100644
--- a/Externals/wxWidgets3/src/osx/core/timer.cpp
+++ b/Externals/wxWidgets3/src/osx/core/timer.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-07-01
-// RCS-ID:      $Id: timer.cpp 65561 2010-09-17 11:17:55Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/core/utilsexc_base.cpp b/Externals/wxWidgets3/src/osx/core/utilsexc_base.cpp
index 3476c5a28d..f510abc37a 100644
--- a/Externals/wxWidgets3/src/osx/core/utilsexc_base.cpp
+++ b/Externals/wxWidgets3/src/osx/core/utilsexc_base.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2005-06-21
-// RCS-ID:      $Id: utilsexc_base.cpp 68506 2011-08-03 15:46:43Z JS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 // Notes:       Source was originally in utilsexc_cf.cpp,1.6 then moved
@@ -54,12 +53,6 @@ extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF;
 wxSocketManager *wxOSXSocketManagerCF = NULL;
 #endif // wxUSE_SOCKETS
 
-extern bool WXDLLEXPORT wxIsDebuggerRunning()
-{
-    // TODO : try to find out ...
-    return false;
-}
-
 #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
 
 // have a fast version for mac code that returns the version as a return value
diff --git a/Externals/wxWidgets3/src/osx/core/utilsexc_cf.cpp b/Externals/wxWidgets3/src/osx/core/utilsexc_cf.cpp
index 394d7fcd2d..2a8c436223 100644
--- a/Externals/wxWidgets3/src/osx/core/utilsexc_cf.cpp
+++ b/Externals/wxWidgets3/src/osx/core/utilsexc_cf.cpp
@@ -4,8 +4,8 @@
 // Author:      David Elliott, Ryan Norton (wxMacExecute)
 // Modified by: Stefan Csomor (added necessary wxT for unicode builds)
 // Created:     2004-11-04
-// RCS-ID:      $Id: utilsexc_cf.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) David Elliott, Ryan Norton
+//              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 // Notes:       This code comes from src/osx/carbon/utilsexc.cpp,1.11
 /////////////////////////////////////////////////////////////////////////////
@@ -15,103 +15,159 @@
     #include "wx/log.h"
     #include "wx/utils.h"
 #endif //ndef WX_PRECOMP
-#include "wx/unix/execute.h"
 #include "wx/stdpaths.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/thread.h"
 #include "wx/process.h"
 
+#include "wx/evtloop.h"
+#include "wx/evtloopsrc.h"
+#include "wx/private/eventloopsourcesmanager.h"
+
 #include <sys/wait.h>
 
 #include <CoreFoundation/CFSocket.h>
 
-/*!
-    Called due to source signal detected by the CFRunLoop.
-    This is nearly identical to the wxGTK equivalent.
- */
-extern "C" void WXCF_EndProcessDetector(CFSocketRef s,
-                                        CFSocketCallBackType WXUNUSED(callbackType),
-                                        CFDataRef WXUNUSED(address),
-                                        void const *WXUNUSED(data),
-                                        void *info)
-{
-    /*
-        Either our pipe was closed or the process ended successfully.  Either way,
-        we're done.  It's not if waitpid is going to magically succeed when
-        we get fired again.  CFSocketInvalidate closes the fd for us and also
-        invalidates the run loop source for us which should cause it to
-        release the CFSocket (thus causing it to be deallocated) and remove
-        itself from the runloop which should release it and cause it to also
-        be deallocated.  Of course, it's possible the RunLoop hangs onto
-        one or both of them by retaining/releasing them within its stack
-        frame.  However, that shouldn't be depended on.  Assume that s is
-        deallocated due to the following call.
-     */
-    CFSocketInvalidate(s);
+#if wxUSE_EVENTLOOP_SOURCE
 
-    // Now tell wx that the process has ended.
-    wxHandleProcessTermination(static_cast<wxEndProcessData *>(info));
+namespace
+{
+
+extern "C"
+void
+wx_socket_callback(CFSocketRef WXUNUSED(s),
+                   CFSocketCallBackType callbackType,
+                   CFDataRef WXUNUSED(address),
+                   void const *WXUNUSED(data),
+                   void *ctxData)
+{
+    wxLogTrace(wxTRACE_EVT_SOURCE,
+               "CFSocket callback, type=%d", static_cast<int>(callbackType));
+
+    wxCFEventLoopSource * const
+        source = static_cast<wxCFEventLoopSource *>(ctxData);
+
+    wxEventLoopSourceHandler * const
+        handler = source->GetHandler();
+
+    switch ( callbackType )
+    {
+        case kCFSocketReadCallBack:
+            handler->OnReadWaiting();
+            break;
+
+        case kCFSocketWriteCallBack:
+            handler->OnWriteWaiting();
+            break;
+
+        default:
+            wxFAIL_MSG( "Unexpected callback type." );
+    }
 }
 
-/*!
-    Implements the GUI-specific AddProcessCallback() for both wxMac and
-    wxCocoa using the CFSocket/CFRunLoop API which is available to both.
-    Takes advantage of the fact that sockets on UNIX are just regular
-    file descriptors and thus even a non-socket file descriptor can
-    apparently be used with CFSocket so long as you only tell CFSocket
-    to do things with it that would be valid for a non-socket fd.
- */
-int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
+} // anonymous namespace
+
+class wxCFEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
 {
-    static int s_last_tag = 0;
-    CFSocketContext context =
-    {   0
-    ,   static_cast<void*>(proc_data)
-    ,   NULL
-    ,   NULL
-    ,   NULL
-    };
-    CFSocketRef cfSocket = CFSocketCreateWithNative(kCFAllocatorDefault,fd,kCFSocketReadCallBack,&WXCF_EndProcessDetector,&context);
-    if(cfSocket == NULL)
+public:
+    wxEventLoopSource *
+    AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags)
     {
-        wxLogError(wxT("Failed to create socket for end process detection"));
-        return 0;
-    }
-    CFRunLoopSourceRef runLoopSource = CFSocketCreateRunLoopSource(kCFAllocatorDefault, cfSocket, /*highest priority:*/0);
-    if(runLoopSource == NULL)
-    {
-        wxLogError(wxT("Failed to create CFRunLoopSource from CFSocket for end process detection"));
-        // closes the fd.. we can't really stop it, nor do we necessarily want to.
-        CFSocketInvalidate(cfSocket);
-        CFRelease(cfSocket);
-        return 0;
-    }
-    // Now that the run loop source has the socket retained and we no longer
-    // need to refer to it within this method, we can release it.
-    CFRelease(cfSocket);
+        wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
 
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopCommonModes);
-    // Now that the run loop has the source retained we can release it.
-    CFRelease(runLoopSource);
+        wxScopedPtr<wxCFEventLoopSource>
+            source(new wxCFEventLoopSource(handler, flags));
 
-    /*
-        Feed wx some bullshit.. we don't use it since CFSocket helpfully passes
-        itself into our callback and that's enough to be able to
-        CFSocketInvalidate it which is all we need to do to get everything we
-        just created to be deallocated.
-     */
-    return ++s_last_tag;
+        CFSocketContext context = { 0, source.get(), NULL, NULL, NULL };
+
+        int callbackTypes = 0;
+        if ( flags & wxEVENT_SOURCE_INPUT )
+            callbackTypes |= kCFSocketReadCallBack;
+        if ( flags & wxEVENT_SOURCE_OUTPUT )
+            callbackTypes |= kCFSocketWriteCallBack;
+
+        wxCFRef<CFSocketRef>
+            cfSocket(CFSocketCreateWithNative
+                     (
+                        kCFAllocatorDefault,
+                        fd,
+                        callbackTypes,
+                        &wx_socket_callback,
+                        &context
+                      ));
+
+        if ( !cfSocket )
+        {
+            wxLogError(wxS("Failed to create event loop source socket."));
+            return NULL;
+        }
+
+        // Adjust the socket options to suit our needs:
+        CFOptionFlags sockopt = CFSocketGetSocketFlags(cfSocket);
+
+        // First, by default, write callback is not called repeatedly when data
+        // can be written to the socket but we need this behaviour so request
+        // it explicitly.
+        if ( flags & wxEVENT_SOURCE_OUTPUT )
+            sockopt |= kCFSocketAutomaticallyReenableWriteCallBack;
+
+        // Second, we use the socket to monitor the FD but it doesn't own it,
+        // so prevent the FD from being closed when the socket is invalidated.
+        sockopt &= ~kCFSocketCloseOnInvalidate;
+
+        CFSocketSetSocketFlags(cfSocket, sockopt);
+
+        wxCFRef<CFRunLoopSourceRef>
+            runLoopSource(CFSocketCreateRunLoopSource
+                          (
+                            kCFAllocatorDefault,
+                            cfSocket,
+                            0 // Lowest index means highest priority
+                          ));
+        if ( !runLoopSource )
+        {
+            wxLogError(wxS("Failed to create low level event loop source."));
+            CFSocketInvalidate(cfSocket);
+            return NULL;
+        }
+
+        // Save the socket so that we can remove it later if asked to.
+        source->InitSourceSocket(cfSocket.release());
+
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopCommonModes);
+
+        return source.release();
+    }
+};
+
+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
+{
+    static wxCFEventLoopSourcesManager s_eventLoopSourcesManager;
+
+    return &s_eventLoopSourcesManager;
 }
 
+#endif // wxUSE_EVENTLOOP_SOURCE
+
 /////////////////////////////////////////////////////////////////////////////
 
 // NOTE: This doesn't really belong here but this was a handy file to
 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
 #if wxUSE_STDPATHS
-static wxStandardPathsCF gs_stdPaths;
 wxStandardPaths& wxGUIAppTraits::GetStandardPaths()
 {
+    // Derive a class just to be able to create it: wxStandardPaths ctor is
+    // protected to prevent its misuse, but it also means we can't create an
+    // object of this class directly.
+    class wxStandardPathsDefault : public wxStandardPathsCF
+    {
+    public:
+        wxStandardPathsDefault() { }
+    };
+
+    static wxStandardPathsDefault gs_stdPaths;
+
     return gs_stdPaths;
 }
 #endif
diff --git a/Externals/wxWidgets3/src/osx/dataview_osx.cpp b/Externals/wxWidgets3/src/osx/dataview_osx.cpp
index 2e6c92c85f..799e752e15 100644
--- a/Externals/wxWidgets3/src/osx/dataview_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/dataview_osx.cpp
@@ -2,7 +2,6 @@
 // Name:        src/osx/dataview_osx.cpp
 // Purpose:     wxDataViewCtrl native mac implementation
 // Author:
-// Id:          $Id: dataview_osx.cpp 70377 2012-01-17 14:05:17Z VS $
 // Copyright:   (c) 2009
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,7 +126,7 @@ bool wxOSXDataViewModelNotifier::ItemChanged(wxDataViewItem const& item)
   if (m_DataViewCtrlPtr->GetDataViewPeer()->Update(GetOwner()->GetParent(item),item))
   {
    // sent the equivalent wxWidget event:
-    wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
+    wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
 
     dataViewEvent.SetEventObject(m_DataViewCtrlPtr);
     dataViewEvent.SetItem(item);
@@ -147,7 +146,7 @@ bool wxOSXDataViewModelNotifier::ItemsChanged(wxDataViewItemArray const& items)
 {
   size_t const noOfItems = items.GetCount();
 
-  wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
+  wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
 
 
   dataViewEvent.SetEventObject(m_DataViewCtrlPtr);
@@ -213,7 +212,7 @@ bool wxOSXDataViewModelNotifier::ValueChanged(wxDataViewItem const& item, unsign
   wxCHECK_MSG(GetOwner() != NULL,false,"Owner not initialized.");
   if (m_DataViewCtrlPtr->GetDataViewPeer()->Update(GetOwner()->GetParent(item),item))
   {
-    wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
+    wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId());
 
     dataViewEvent.SetEventObject(m_DataViewCtrlPtr);
     dataViewEvent.SetColumn(col);
@@ -348,6 +347,11 @@ void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr)
 wxDataViewCtrl::~wxDataViewCtrl()
 {
   ClearColumns();
+
+  // Ensure that the already destructed controls is not notified about changes
+  // in the model any more.
+  if (m_ModelNotifier != NULL)
+    m_ModelNotifier->GetOwner()->RemoveNotifier(m_ModelNotifier);
 }
 
 void wxDataViewCtrl::Init()
@@ -355,6 +359,7 @@ void wxDataViewCtrl::Init()
   m_CustomRendererPtr = NULL;
   m_Deleting          = false;
   m_cgContext         = NULL;
+  m_ModelNotifier     = NULL;
 }
 
 bool wxDataViewCtrl::Create(wxWindow *parent,
@@ -381,10 +386,19 @@ bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model)
 
 
   wxCHECK_MSG(dataViewWidgetPtr != NULL,false,"Pointer to native control must not be NULL.");
+
+  // We could have been associated with another model previously, break the
+  // association in this case.
+  if ( m_ModelNotifier )
+      m_ModelNotifier->GetOwner()->RemoveNotifier(m_ModelNotifier);
+
   if (wxDataViewCtrlBase::AssociateModel(model) && dataViewWidgetPtr->AssociateModel(model))
   {
     if (model != NULL)
-      model->AddNotifier(new wxOSXDataViewModelNotifier(this));
+    {
+      m_ModelNotifier = new wxOSXDataViewModelNotifier(this);
+      model->AddNotifier(m_ModelNotifier);
+    }
     return true;
   }
   else
diff --git a/Externals/wxWidgets3/src/osx/datectrl_osx.cpp b/Externals/wxWidgets3/src/osx/datectrl_osx.cpp
index 9739977155..c10b778068 100644
--- a/Externals/wxWidgets3/src/osx/datectrl_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/datectrl_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxDatePickerCtrl for OS X.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: datectrl_osx.cpp 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/datetimectrl_osx.cpp b/Externals/wxWidgets3/src/osx/datetimectrl_osx.cpp
index 45a65dd8ab..628fb8be5d 100644
--- a/Externals/wxWidgets3/src/osx/datetimectrl_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/datetimectrl_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxDateTimePickerCtrl for OS X.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: datetimectrl_osx.cpp 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,6 +27,7 @@
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
+#include "wx/datectrl.h"
 #include "wx/datetimectrl.h"
 
 #include "wx/osx/core/private/datetimectrl.h"
@@ -43,7 +43,19 @@ wxDateTimeWidgetImpl* wxDateTimePickerCtrl::GetDateTimePeer() const
 
 void wxDateTimePickerCtrl::SetValue(const wxDateTime& dt)
 {
-    GetDateTimePeer()->SetDateTime(dt);
+    if ( dt.IsValid() )
+    {
+        GetDateTimePeer()->SetDateTime(dt);
+    }
+    else // invalid date
+    {
+        wxASSERT_MSG( HasFlag(wxDP_ALLOWNONE),
+                     wxT("this control must have a valid date") );
+
+        // TODO setting to an invalid date is not natively supported
+        // so we must implement a UI for that ourselves
+        GetDateTimePeer()->SetDateTime(dt);
+    }
 }
 
 wxDateTime wxDateTimePickerCtrl::GetValue() const
diff --git a/Externals/wxWidgets3/src/osx/dialog_osx.cpp b/Externals/wxWidgets3/src/osx/dialog_osx.cpp
index 56a106f713..fe870deaed 100644
--- a/Externals/wxWidgets3/src/osx/dialog_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/dialog_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dialog_osx.cpp 68719 2011-08-16 12:00:52Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,7 @@
 
 #include "wx/dialog.h"
 #include "wx/evtloop.h"
+#include "wx/modalhook.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -115,7 +115,12 @@ bool wxDialog::Show(bool show)
 
     if ( !show )
     {
-        switch( m_modality )
+        const int modalityOrig = m_modality;
+
+        // complete the 'hiding' before we send the event
+        m_modality = wxDIALOG_MODALITY_NONE;
+
+        switch ( modalityOrig )
         {
             case wxDIALOG_MODALITY_WINDOW_MODAL:
                 EndWindowModal(); // OS X implementation method for cleanup
@@ -124,7 +129,6 @@ bool wxDialog::Show(bool show)
             default:
                 break;
         }
-        m_modality = wxDIALOG_MODALITY_NONE;
     }
 
     return true;
@@ -133,6 +137,8 @@ bool wxDialog::Show(bool show)
 // Replacement for Show(true) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     m_modality = wxDIALOG_MODALITY_APP_MODAL;
 
     Show();
diff --git a/Externals/wxWidgets3/src/osx/dnd_osx.cpp b/Externals/wxWidgets3/src/osx/dnd_osx.cpp
index 1cafad2d4a..ab6f153b53 100644
--- a/Externals/wxWidgets3/src/osx/dnd_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/dnd_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dnd_osx.cpp 69677 2011-11-05 11:23:48Z VZ $
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/fontutil.cpp b/Externals/wxWidgets3/src/osx/fontutil.cpp
index 600d4acd6c..35d9cdc62b 100644
--- a/Externals/wxWidgets3/src/osx/fontutil.cpp
+++ b/Externals/wxWidgets3/src/osx/fontutil.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id: fontutil.cpp 54962 2008-08-03 17:34:59Z SC $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/gauge_osx.cpp b/Externals/wxWidgets3/src/osx/gauge_osx.cpp
index ed9b22c4c7..40e4c71cd8 100644
--- a/Externals/wxWidgets3/src/osx/gauge_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/gauge_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gauge_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/glcanvas_osx.cpp b/Externals/wxWidgets3/src/osx/glcanvas_osx.cpp
index 5e53aabfc4..3610ccff48 100644
--- a/Externals/wxWidgets3/src/osx/glcanvas_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/glcanvas_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas_osx.cpp 65561 2010-09-17 11:17:55Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/imaglist.cpp b/Externals/wxWidgets3/src/osx/imaglist.cpp
index 89f851940a..300a143bfd 100644
--- a/Externals/wxWidgets3/src/osx/imaglist.cpp
+++ b/Externals/wxWidgets3/src/osx/imaglist.cpp
@@ -2,7 +2,6 @@
 // Name:        src/osx/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// RCS_ID:      $Id: imaglist.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -74,16 +73,16 @@ int wxImageList::Add( const wxIcon &bitmap )
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {
-    wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)
+    wxASSERT_MSG( (bitmap.GetScaledWidth() >= m_width && bitmap.GetScaledHeight() == m_height)
                   || (m_width == 0 && m_height == 0),
                   wxT("invalid bitmap size in wxImageList: this might work ")
                   wxT("on this platform but definitely won't under Windows.") );
 
     // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added
     // bitmap into sub-images of the correct size
-    if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
+    if (m_width > 0 && bitmap.GetScaledWidth() > m_width && bitmap.GetScaledHeight() >= m_height)
     {
-        int numImages = bitmap.GetWidth() / m_width;
+        int numImages = bitmap.GetScaledWidth() / m_width;
         for (int subIndex = 0; subIndex < numImages; subIndex++)
         {
             wxRect rect(m_width * subIndex, 0, m_width, m_height);
@@ -98,8 +97,8 @@ int wxImageList::Add( const wxBitmap &bitmap )
 
     if (m_width == 0 && m_height == 0)
     {
-        m_width = bitmap.GetWidth();
-        m_height = bitmap.GetHeight();
+        m_width = bitmap.GetScaledWidth();
+        m_height = bitmap.GetScaledHeight();
     }
 
     return m_images.GetCount() - 1;
@@ -276,8 +275,8 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
     else
     {
         wxBitmap *bm = static_cast< wxBitmap* >(obj ) ;
-        width = bm->GetWidth();
-        height = bm->GetHeight();
+        width = bm->GetScaledWidth();
+        height = bm->GetScaledHeight();
     }
 
     return true;
diff --git a/Externals/wxWidgets3/src/osx/iphone/anybutton.mm b/Externals/wxWidgets3/src/osx/iphone/anybutton.mm
index ffdf3262e4..f9182c3170 100644
--- a/Externals/wxWidgets3/src/osx/iphone/anybutton.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/anybutton.mm
@@ -3,7 +3,6 @@
 // Purpose:     wxAnyButton
 // Author:      Stefan Csomor
 // Created:     1998-01-01 (extracted from button.mm)
-// RCS-ID:      $Id: anybutton.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/button.mm b/Externals/wxWidgets3/src/osx/iphone/button.mm
index f50d62946c..8ee98a3571 100644
--- a/Externals/wxWidgets3/src/osx/iphone/button.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/button.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button.mm 67931 2011-06-14 13:00:42Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/checkbox.mm b/Externals/wxWidgets3/src/osx/iphone/checkbox.mm
index 9f6acc292a..de9f8c0876 100644
--- a/Externals/wxWidgets3/src/osx/iphone/checkbox.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/checkbox.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-08-20
-// RCS-ID:      $Id: checkbox.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/dialog.mm b/Externals/wxWidgets3/src/osx/iphone/dialog.mm
index 3c29fd61af..88beac34c3 100644
--- a/Externals/wxWidgets3/src/osx/iphone/dialog.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/dialog.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dialog.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/evtloop.mm b/Externals/wxWidgets3/src/osx/iphone/evtloop.mm
index 149ae67683..4e179b6241 100644
--- a/Externals/wxWidgets3/src/osx/iphone/evtloop.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/evtloop.mm
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id: evtloop.mm 69525 2011-10-25 11:51:36Z SC $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,10 +54,8 @@ static int CalculateUIEventMaskFromEventCategory(wxEventCategory cat)
 	NSMouseEnteredMask		= 1 << NSMouseEntered,
 	NSMouseExitedMask		= 1 << NSMouseExited,
         NSScrollWheelMask		= 1 << NSScrollWheel,
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
 	NSTabletPointMask		= 1 << NSTabletPoint,
 	NSTabletProximityMask		= 1 << NSTabletProximity,
-#endif
 	NSOtherMouseDownMask		= 1 << NSOtherMouseDown,
 	NSOtherMouseUpMask		= 1 << NSOtherMouseUp,
 	NSOtherMouseDraggedMask		= 1 << NSOtherMouseDragged,
@@ -83,7 +80,7 @@ wxGUIEventLoop::wxGUIEventLoop()
 {
 }
 
-void wxGUIEventLoop::DoRun()
+void wxGUIEventLoop::OSXDoRun()
 {
     if ( IsMain() )
     {
@@ -93,7 +90,7 @@ void wxGUIEventLoop::DoRun()
     }
     else 
     {
-        wxCFEventLoop::DoRun();
+        wxCFEventLoop::OSXDoRun();
     }
 }
 
@@ -102,9 +99,9 @@ int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
     return wxCFEventLoop::DoDispatchTimeout(timeout);
 }
 
-void wxGUIEventLoop::DoStop()
+void wxGUIEventLoop::OSXDoStop()
 {
-    return wxCFEventLoop::DoStop();
+    return wxCFEventLoop::OSXDoStop();
 }
 
 CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
@@ -136,12 +133,12 @@ wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
 // END move into a evtloop_osx.cpp
 
 
-void wxModalEventLoop::DoRun()
+void wxModalEventLoop::OSXDoRun()
 {
     // presentModalViewController:animated:
 }
 
-void wxModalEventLoop::DoStop()
+void wxModalEventLoop::OSXDoStop()
 {
     // (void)dismissModalViewControllerAnimated:(BOOL)animated
 }
diff --git a/Externals/wxWidgets3/src/osx/iphone/gauge.mm b/Externals/wxWidgets3/src/osx/iphone/gauge.mm
index 347184145f..7ea73e294a 100644
--- a/Externals/wxWidgets3/src/osx/iphone/gauge.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/gauge.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: gauge.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/glcanvas.mm b/Externals/wxWidgets3/src/osx/iphone/glcanvas.mm
index 3c3609a62c..9883f9f0e3 100644
--- a/Externals/wxWidgets3/src/osx/iphone/glcanvas.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/glcanvas.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas.mm 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -142,15 +141,13 @@
 - (void) setContext:(EAGLContext*) ctx {
     context = ctx;
     [EAGLContext setCurrentContext:ctx];
-#if 0
-    CGRect newRect = [self frame];
-    if ( /* (CGRectEqualToRect(newRect, oldRect) == NO && ![self isHidden] && newRect.size.width > 0 && newRect.size.height > 0 ) 
-        || */ viewFramebuffer == 0 )
+
+    if ( viewFramebuffer == 0 )
     {
         [self destroyFramebuffer];
         [self createFramebuffer];        
     }
-#endif
+
     glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
 }
  
diff --git a/Externals/wxWidgets3/src/osx/iphone/msgdlg.mm b/Externals/wxWidgets3/src/osx/iphone/msgdlg.mm
index cf9f31e98e..3431cb5a91 100644
--- a/Externals/wxWidgets3/src/osx/iphone/msgdlg.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/msgdlg.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: msgdlg.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,6 +19,7 @@
 
 #include "wx/thread.h"
 #include "wx/osx/private.h"
+#include "wx/modalhook.h"
 
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
@@ -36,6 +36,8 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 
 int wxMessageDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     int resultbutton = wxID_CANCEL;
 
     const long style = GetMessageDialogStyle();
diff --git a/Externals/wxWidgets3/src/osx/iphone/nonownedwnd.mm b/Externals/wxWidgets3/src/osx/iphone/nonownedwnd.mm
index 6707e674ad..b7082f89c8 100644
--- a/Externals/wxWidgets3/src/osx/iphone/nonownedwnd.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/nonownedwnd.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
-// RCS-ID:      $Id: nonownedwnd.mm 69526 2011-10-25 11:52:02Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -352,7 +351,15 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     
     wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl( now, contentview, true );
     impl->InstallEventHandler();
-    [toplevelwindow addSubview:contentview];
+    
+    if ([toplevelwindow respondsToSelector:@selector(setRootViewController:)])
+    {
+        toplevelwindow.rootViewController = controller;
+    }
+    else
+    {
+        [toplevelwindow addSubview:contentview];
+    }
     return impl;
 }
 
@@ -396,6 +403,21 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     return YES;
 }
 
+// iOS 6 support, right now unconditionally supporting all orientations, TODO use a orientation mask
+
+-(BOOL)shouldAutorotate
+{
+    return YES;
+}
+
+ - (NSUInteger)supportedInterfaceOrientations
+{
+     return UIInterfaceOrientationMaskAll;
+}
+ 
+ 
+
+
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( [self view] );
@@ -454,6 +476,7 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
             footerView = frame->GetToolBar()->GetHandle();
         }
     }
+    return footerView;
 }
 
 @end
diff --git a/Externals/wxWidgets3/src/osx/iphone/scrolbar.mm b/Externals/wxWidgets3/src/osx/iphone/scrolbar.mm
index 5b091a4fce..031feeb088 100644
--- a/Externals/wxWidgets3/src/osx/iphone/scrolbar.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/scrolbar.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: scrolbar.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/slider.mm b/Externals/wxWidgets3/src/osx/iphone/slider.mm
index f91de107ea..eb22a66e6c 100644
--- a/Externals/wxWidgets3/src/osx/iphone/slider.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/slider.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider.mm 67232 2011-03-18 15:10:15Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/stattext.mm b/Externals/wxWidgets3/src/osx/iphone/stattext.mm
index debf6b625e..b0994d0733 100644
--- a/Externals/wxWidgets3/src/osx/iphone/stattext.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/stattext.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/iphone/textctrl.mm b/Externals/wxWidgets3/src/osx/iphone/textctrl.mm
index 3f27e13848..8fa70b90ad 100644
--- a/Externals/wxWidgets3/src/osx/iphone/textctrl.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/textctrl.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
-// RCS-ID:      $Id: textctrl.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -189,7 +188,7 @@ protected :
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
         {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+            wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
@@ -663,7 +662,7 @@ void wxUITextFieldControl::controlAction(WXWidget WXUNUSED(slf),
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+        wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
         event.SetEventObject( wxpeer );
         event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
         wxpeer->HandleWindowEvent( event );
@@ -674,6 +673,7 @@ bool wxUITextFieldControl::SetHint(const wxString& hint)
 {
     wxCFStringRef hintstring(hint);
     [m_textField setPlaceholder:hintstring.AsNSString()];
+    return true;
 }
 
 #endif
diff --git a/Externals/wxWidgets3/src/osx/iphone/toolbar.mm b/Externals/wxWidgets3/src/osx/iphone/toolbar.mm
index 4308b3c9f5..589c3f7028 100644
--- a/Externals/wxWidgets3/src/osx/iphone/toolbar.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/toolbar.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar.mm 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -249,6 +248,7 @@ bool wxToolBar::Create(
 
     SetPeer(new wxWidgetIPhoneImpl( this, toolbar ));    
     MacPostControlCreate(pos, size) ;
+    return true;
 }
 
 wxToolBar::~wxToolBar()
diff --git a/Externals/wxWidgets3/src/osx/iphone/utils.mm b/Externals/wxWidgets3/src/osx/iphone/utils.mm
index d2d0f55ac3..633c7b72ac 100644
--- a/Externals/wxWidgets3/src/osx/iphone/utils.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/utils.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utils.mm 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,13 +38,6 @@
 
 #if 1 // wxUSE_BASE
 
-// Emit a beeeeeep
-void wxBell()
-{
-    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
-    AudioServicesPlayAlertSound(0x00001000 );
-}
-
 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------
@@ -57,13 +49,21 @@ void wxBell()
 
 @implementation wxAppDelegate
 
+- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    wxUnusedVar(application);
+    wxUnusedVar(launchOptions);
+    wxTheApp->OSXOnWillFinishLaunching();
+    return YES;
+}
+
 - (void)applicationDidFinishLaunching:(UIApplication *)application {	
-	wxTheApp->OnInit();
+    wxTheApp->OSXOnDidFinishLaunching();
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application { 
-    wxCloseEvent event;
-    wxTheApp->OnEndSession(event);
+    wxUnusedVar(application);
+    wxTheApp->OSXOnWillTerminate();
 }
 
 - (void)dealloc {
@@ -91,6 +91,13 @@ void wxApp::DoCleanUp()
 
 #if wxUSE_GUI
 
+// Emit a beeeeeep
+void wxBell()
+{
+    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
+    AudioServicesPlayAlertSound(0x00001000 );
+}
+
 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------
@@ -118,6 +125,11 @@ extern UIFont* CreateUIFont( const wxFont& font )
     return [UIFont fontWithName:wxCFStringRef(font.GetFaceName() ).AsNSString() size:font.GetPointSize()];
 }
 
+CFArrayRef CopyAvailableFontFamilyNames()
+{
+    return (CFArrayRef) [[UIFont familyNames] retain];
+}
+
 extern void DrawTextInContext( CGContextRef context, CGPoint where, UIFont *font, NSString* text )
 {
     bool contextChanged = ( UIGraphicsGetCurrentContext() != context );
diff --git a/Externals/wxWidgets3/src/osx/iphone/window.mm b/Externals/wxWidgets3/src/osx/iphone/window.mm
index 2a71b7fc23..b4b8c4ac36 100644
--- a/Externals/wxWidgets3/src/osx/iphone/window.mm
+++ b/Externals/wxWidgets3/src/osx/iphone/window.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
-// RCS-ID:      $Id: window.mm 69754 2011-11-14 07:52:33Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -561,10 +560,22 @@ void wxWidgetIPhoneImpl::GetBestRect( wxRect *r ) const
 
 bool wxWidgetIPhoneImpl::IsEnabled() const
 {
+    UIView* targetView = m_osxView;
+    // TODO add support for documentViews
+
+    if ( [targetView respondsToSelector:@selector(isEnabled) ] )
+        return [targetView isEnabled];
+    
+    return true;
 }
 
 void wxWidgetIPhoneImpl::Enable( bool enable )
 {
+    UIView* targetView = m_osxView;
+    // TODO add support for documentViews
+
+    if ( [targetView respondsToSelector:@selector(setEnabled:) ] )
+        [targetView setEnabled:enable];
 }
 
 void wxWidgetIPhoneImpl::SetMinimum( wxInt32 v )
@@ -577,10 +588,12 @@ void wxWidgetIPhoneImpl::SetMaximum( wxInt32 v )
 
 wxInt32 wxWidgetIPhoneImpl::GetMinimum() const
 {
+    return 0;
 }
 
 wxInt32 wxWidgetIPhoneImpl::GetMaximum() const
 {
+    return 0;
 }
 
 void wxWidgetIPhoneImpl::PulseGauge()
@@ -595,7 +608,7 @@ void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant )
 {
 }
 
-float wxWidgetIPhoneImpl::GetContentScaleFactor() const 
+double wxWidgetIPhoneImpl::GetContentScaleFactor() const 
 {
     if ( [m_osxView respondsToSelector:@selector(contentScaleFactor) ])
         return [m_osxView contentScaleFactor];
@@ -779,7 +792,7 @@ void wxWidgetIPhoneImpl::controlTextDidChange()
     wxTextCtrl* wxpeer = wxDynamicCast((wxWindow*)GetWXPeer(),wxTextCtrl);
     if ( wxpeer ) 
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+        wxCommandEvent event(wxEVT_TEXT, wxpeer->GetId());
         event.SetEventObject( wxpeer );
         event.SetString( wxpeer->GetValue() );
         wxpeer->HandleWindowEvent( event );
diff --git a/Externals/wxWidgets3/src/osx/listbox_osx.cpp b/Externals/wxWidgets3/src/osx/listbox_osx.cpp
index 8d6182dd9b..c48607ea5a 100644
--- a/Externals/wxWidgets3/src/osx/listbox_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/listbox_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox_osx.cpp 70685 2012-02-25 22:29:25Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -133,6 +132,11 @@ void wxListBox::FreeData()
 
 void wxListBox::DoSetFirstItem(int n)
 {
+    // osx actually only has an implementation for ensuring the visibility of a row, it does so  
+    // by scrolling the minimal amount necessary from the current scrolling position.
+    // in order to get the same behaviour I'd have to make sure first that the last line is visible, 
+    // followed by a scrollRowToVisible for the desired line 
+    GetListPeer()->ListScrollTo( GetCount()-1 );
     GetListPeer()->ListScrollTo( n );
 }
 
@@ -388,8 +392,8 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {
-    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :
-        wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
+    wxCommandEvent event( doubleClick ? wxEVT_LISTBOX_DCLICK :
+        wxEVT_LISTBOX, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         event.SetClientObject( GetClientObject(n) );
diff --git a/Externals/wxWidgets3/src/osx/menu_osx.cpp b/Externals/wxWidgets3/src/osx/menu_osx.cpp
index ffd9f3c0e0..97685d31ef 100644
--- a/Externals/wxWidgets3/src/osx/menu_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/menu_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menu_osx.cpp 70480 2012-01-30 16:25:22Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -57,7 +56,6 @@ static const int idMenuTitle = -3;
 void wxMenu::Init()
 {
     m_doBreak = false;
-    m_startRadioGroup = -1;
     m_allowRearrange = true;
     m_noEventsMode = false;
 
@@ -89,13 +87,6 @@ void wxMenu::Break()
     // not available on the mac platform
 }
 
-void wxMenu::Attach(wxMenuBarBase *menubar)
-{
-    wxMenuBase::Attach(menubar);
-
-    EndRadioGroup();
-}
-
 void wxMenu::SetAllowRearrange( bool allow )
 {
     m_allowRearrange = allow;
@@ -108,18 +99,20 @@ void wxMenu::SetNoEventsMode( bool noEvents )
 
 // function appends a new item or submenu to the menu
 // append a new item or submenu to the menu
-bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
+bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos)
 {
-    wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") );
-    GetPeer()->InsertOrAppend( pItem, pos );
+    wxASSERT_MSG( item != NULL, wxT("can't append NULL item to the menu") );
+    GetPeer()->InsertOrAppend( item, pos );
 
-    if ( pItem->IsSeparator() )
+    bool check = false;
+
+    if ( item->IsSeparator() )
     {
         // nothing to do here
     }
     else
     {
-        wxMenu *pSubMenu = pItem->GetSubMenu() ;
+        wxMenu *pSubMenu = item->GetSubMenu() ;
         if ( pSubMenu != NULL )
         {
             wxASSERT_MSG( pSubMenu->GetHMenu() != NULL , wxT("invalid submenu added"));
@@ -127,10 +120,112 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
             pSubMenu->DoRearrange();
         }
+        else if ( item->IsRadio() )
+        {
+            // If a previous or next item is a radio button, add this radio
+            // button to the existing radio group. Otherwise start a new one
+            // for it.
+            wxMenuItemList& items = GetMenuItems();
+
+            size_t const
+                posItem = pos == (size_t)-1 ? items.GetCount() - 1 : pos;
+
+            wxMenuItemList::compatibility_iterator node = items.Item(posItem);
+            wxCHECK_MSG( node, false, wxS("New item must have been inserted") );
+
+            bool foundGroup = false;
+            if ( node->GetPrevious() )
+            {
+                wxMenuItem* const prev = node->GetPrevious()->GetData();
+
+                if ( prev->IsRadio() )
+                {
+                    // This item is in the same group as the preceding one so
+                    // we should use the same starting item, but getting it is
+                    // a bit difficult as we can't query the start radio group
+                    // item for it.
+                    const int groupStart = prev->IsRadioGroupStart()
+                                            ? posItem - 1
+                                            : prev->GetRadioGroupStart();
+                    item->SetRadioGroupStart(groupStart);
+
+                    // We must also account for the new item by incrementing
+                    // the index of the last item in this group.
+                    wxMenuItem* const first = items.Item(groupStart)->GetData();
+                    first->SetRadioGroupEnd(first->GetRadioGroupEnd() + 1);
+
+                    foundGroup = true;
+                }
+            }
+
+            if ( !foundGroup && node->GetNext() )
+            {
+                wxMenuItem* const next = node->GetNext()->GetData();
+
+                if ( next->IsRadio() )
+                {
+                    // This item is the new starting item of this group as the
+                    // previous item is not a radio item.
+                    wxASSERT_MSG( next->IsRadioGroupStart(),
+                                  wxS("Where is the start of this group?") );
+
+                    // The index of the last item of the radio group must be
+                    // incremented to account for the new item.
+                    item->SetAsRadioGroupStart();
+                    item->SetRadioGroupEnd(next->GetRadioGroupEnd() + 1);
+
+                    // And the previous start item is not one any longer.
+                    next->SetAsRadioGroupStart(false);
+
+                    foundGroup = true;
+                }
+            }
+
+            if ( !foundGroup )
+            {
+                // start a new radio group
+                item->SetAsRadioGroupStart();
+                item->SetRadioGroupEnd(posItem);
+
+                // ensure that we have a checked item in the radio group
+                check = true;
+            }
+        }
         else
         {
-            if ( pItem->GetId() == idMenuTitle )
-                pItem->GetMenu()->Enable( idMenuTitle, false );
+            if ( item->GetId() == idMenuTitle )
+                item->GetMenu()->Enable( idMenuTitle, false );
+        }
+    }
+
+    // We also need to update the indices of radio group start and end we store
+    // in any existing radio items after this item.
+    if ( pos < GetMenuItemCount() - 1 ) // takes into account pos == -1 case
+    {
+        for ( wxMenuItemList::compatibility_iterator
+                node = GetMenuItems().Item(pos + 1);
+                node;
+                node = node->GetNext() )
+        {
+            wxMenuItem* const item = node->GetData();
+            if ( item->IsRadio() )
+            {
+                if ( item->IsRadioGroupStart() )
+                {
+                    // If the starting item is after the just inserted one,
+                    // then the end one must be after it too and needs to be
+                    // updated.
+                    item->SetRadioGroupEnd(item->GetRadioGroupEnd() + 1);
+                }
+                else // Not the first radio group item.
+                {
+                    // We need to update the start item index only if it is
+                    // after the just inserted item.
+                    const int groupStart = item->GetRadioGroupStart();
+                    if ( (size_t)groupStart > pos )
+                        item->SetRadioGroupStart(groupStart + 1);
+                }
+            }
         }
     }
 
@@ -138,66 +233,18 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     if ( IsAttached() && GetMenuBar()->IsAttached() )
         GetMenuBar()->Refresh();
 
-    return true ;
-}
+    if ( check )
+        item->Check(true);
 
-void wxMenu::EndRadioGroup()
-{
-    // we're not inside a radio group any longer
-    m_startRadioGroup = -1;
+    return true ;
 }
 
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
-    wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
+    if (wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) )
+        return item;
 
-    bool check = false;
-
-    if ( item->GetKind() == wxITEM_RADIO )
-    {
-        int count = GetMenuItemCount();
-
-        if ( m_startRadioGroup == -1 )
-        {
-            // start a new radio group
-            m_startRadioGroup = count;
-
-            // for now it has just one element
-            item->SetAsRadioGroupStart();
-            item->SetRadioGroupEnd(m_startRadioGroup);
-
-            // ensure that we have a checked item in the radio group
-            check = true;
-        }
-        else // extend the current radio group
-        {
-            // we need to update its end item
-            item->SetRadioGroupStart(m_startRadioGroup);
-            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
-
-            if ( node )
-            {
-                node->GetData()->SetRadioGroupEnd(count);
-            }
-            else
-            {
-                wxFAIL_MSG( wxT("where is the radio group start item?") );
-            }
-        }
-    }
-    else // not a radio item
-    {
-        EndRadioGroup();
-    }
-
-    if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
-        return NULL;
-
-    if ( check )
-        // check the item initially
-        item->Check(true);
-
-    return item;
+    return NULL;
 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
@@ -210,14 +257,33 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
-    if ( m_startRadioGroup != -1 )
+    if ( item->IsRadio() )
     {
         // Check if we're removing the item starting the radio group
-        if ( GetMenuItems().Item(m_startRadioGroup)->GetData() == item )
+        if ( item->IsRadioGroupStart() )
         {
-            // Yes, we do, so reset its index as the next item added shouldn't
-            // count as part of the same radio group anyhow.
-            m_startRadioGroup = -1;
+            // Yes, we do, update the next radio group item, if any, to be the
+            // start one now.
+            const int endGroup = item->GetRadioGroupEnd();
+
+            wxMenuItemList::compatibility_iterator
+                node = GetMenuItems().Item(endGroup);
+            wxASSERT_MSG( node, wxS("Should have valid radio group end") );
+
+            while ( node->GetData() != item )
+            {
+                const wxMenuItemList::compatibility_iterator
+                    prevNode = node->GetPrevious();
+                wxMenuItem* const prevItem = prevNode->GetData();
+                if ( prevItem == item )
+                {
+                    prevItem->SetAsRadioGroupStart();
+                    prevItem->SetRadioGroupEnd(endGroup);
+                    break;
+                }
+
+                node = prevNode;
+            }
         }
     }
 
@@ -428,7 +494,7 @@ bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow )
     {
         if ( senderWindow != NULL )
         {
-            wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , menuid);
+            wxCommandEvent event(wxEVT_MENU , menuid);
             event.SetEventObject(this);
             event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
 
@@ -517,54 +583,72 @@ wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ;
 bool     wxMenuBar::s_macAutoWindowMenu = true ;
 WXHMENU  wxMenuBar::s_macWindowMenuHandle = NULL ;
 
+
+wxMenu* emptyMenuBar = NULL;
+
 const int firstMenuPos = 1; // to account for the 0th application menu on mac
 
-void wxMenuBar::Init()
+static wxMenu *CreateAppleMenu()
 {
-    m_eventHandler = this;
-    m_menuBarFrame = NULL;
-    m_rootMenu = new wxMenu();
-    m_rootMenu->Attach(this);
-
-    m_appleMenu = new wxMenu();
-    m_appleMenu->SetAllowRearrange(false);
+    wxMenu *appleMenu = new wxMenu();
+    appleMenu->SetAllowRearrange(false);
 
     // Create standard items unless the application explicitly disabled this by
     // setting the corresponding ids to wxID_NONE: although this is not
     // recommended, sometimes these items really don't make sense.
     if ( wxApp::s_macAboutMenuItemId != wxID_NONE )
     {
-        wxString aboutLabel(_("About"));
+        wxString aboutLabel;
         if ( wxTheApp )
-            aboutLabel << ' ' << wxTheApp->GetAppDisplayName();
+            aboutLabel.Printf(_("About %s"), wxTheApp->GetAppDisplayName());
         else
-            aboutLabel << "...";
-        m_appleMenu->Append( wxApp::s_macAboutMenuItemId, aboutLabel);
-        m_appleMenu->AppendSeparator();
+            aboutLabel = _("About...");
+        appleMenu->Append( wxApp::s_macAboutMenuItemId, aboutLabel);
+        appleMenu->AppendSeparator();
     }
 
 #if !wxOSX_USE_CARBON
     if ( wxApp::s_macPreferencesMenuItemId != wxID_NONE )
     {
-        m_appleMenu->Append( wxApp::s_macPreferencesMenuItemId,
-                             _("Preferences...") + "\tCtrl+," );
-        m_appleMenu->AppendSeparator();
+        appleMenu->Append( wxApp::s_macPreferencesMenuItemId,
+                           _("Preferences...") + "\tCtrl+," );
+        appleMenu->AppendSeparator();
     }
 
+    appleMenu->Append(wxID_OSX_SERVICES, _("Services"), new wxMenu());
+    appleMenu->AppendSeparator();
+
     // standard menu items, handled in wxMenu::HandleCommandProcess(), see above:
     wxString hideLabel;
     hideLabel = wxString::Format(_("Hide %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
-    m_appleMenu->Append( wxID_OSX_HIDE, hideLabel + "\tCtrl+H" );    
-    m_appleMenu->Append( wxID_OSX_HIDEOTHERS, _("Hide Others")+"\tAlt+Ctrl+H" );    
-    m_appleMenu->Append( wxID_OSX_SHOWALL, _("Show All") );    
-    m_appleMenu->AppendSeparator();
+    appleMenu->Append( wxID_OSX_HIDE, hideLabel + "\tCtrl+H" );
+    appleMenu->Append( wxID_OSX_HIDEOTHERS, _("Hide Others")+"\tAlt+Ctrl+H" );
+    appleMenu->Append( wxID_OSX_SHOWALL, _("Show All") );
+    appleMenu->AppendSeparator();
     
     // Do always add "Quit" item unconditionally however, it can't be disabled.
     wxString quitLabel;
     quitLabel = wxString::Format(_("Quit %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
-    m_appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel + "\tCtrl+Q" );
+    appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel + "\tCtrl+Q" );
 #endif // !wxOSX_USE_CARBON
 
+    return appleMenu;
+}
+
+void wxMenuBar::Init()
+{
+    if ( emptyMenuBar == NULL )
+    {
+        emptyMenuBar = new wxMenu();
+        emptyMenuBar->AppendSubMenu(CreateAppleMenu(), "\x14") ;
+    }
+    
+    m_eventHandler = this;
+    m_menuBarFrame = NULL;
+    m_rootMenu = new wxMenu();
+    m_rootMenu->Attach(this);
+
+    m_appleMenu = CreateAppleMenu();
     m_rootMenu->AppendSubMenu(m_appleMenu, "\x14") ;
 }
 
@@ -598,8 +682,16 @@ wxMenuBar::~wxMenuBar()
 
     if (s_macInstalledMenuBar == this)
     {
+        emptyMenuBar->GetPeer()->MakeRoot();
         s_macInstalledMenuBar = NULL;
     }
+    wxDELETE( m_rootMenu );
+    // apple menu is a submenu, therefore we don't have to delete it
+    m_appleMenu = NULL;
+
+    // deleting the root menu also removes all its wxMenu* submenus, therefore
+    // we must avoid double deleting them in the superclass destructor
+    m_menus.clear();
 }
 
 void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
@@ -616,11 +708,10 @@ void wxMenuBar::MacInstallMenuBar()
     
     // hide items in the apple menu that don't exist in the wx menubar
     
-    int menuid = 0;
     wxMenuItem* appleItem = NULL;
     wxMenuItem* wxItem = NULL;
 
-    menuid = wxApp::s_macAboutMenuItemId;
+    int menuid = wxApp::s_macAboutMenuItemId;
     appleItem = m_appleMenu->FindItem(menuid);
     wxItem = FindItem(menuid);
     if ( appleItem != NULL )
@@ -889,6 +980,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         return false;
 
     m_rootMenu->Insert( pos+firstMenuPos, wxMenuItem::New( m_rootMenu, wxID_ANY, title, "", wxITEM_NORMAL, menu ) );
+    menu->SetTitle(title);
 
     return true;
 }
diff --git a/Externals/wxWidgets3/src/osx/menuitem_osx.cpp b/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
index bf1e4f7931..34a9996173 100644
--- a/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menuitem_osx.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -218,9 +217,9 @@ void wxMenuItem::UpdateItemText()
 // radio group stuff
 // -----------------
 
-void wxMenuItem::SetAsRadioGroupStart()
+void wxMenuItem::SetAsRadioGroupStart(bool start)
 {
-    m_isRadioGroupStart = true;
+    m_isRadioGroupStart = start;
 }
 
 void wxMenuItem::SetRadioGroupStart(int start)
@@ -239,6 +238,27 @@ void wxMenuItem::SetRadioGroupEnd(int end)
     m_radioGroup.end = end;
 }
 
+bool wxMenuItem::IsRadioGroupStart() const
+{
+    return m_isRadioGroupStart;
+}
+
+int wxMenuItem::GetRadioGroupStart() const
+{
+    wxASSERT_MSG( !m_isRadioGroupStart,
+                  wxS("shouldn't be called for the first radio item") );
+
+    return m_radioGroup.start;
+}
+
+int wxMenuItem::GetRadioGroupEnd() const
+{
+    wxASSERT_MSG( m_isRadioGroupStart,
+                  wxS("shouldn't be called for the first radio item") );
+
+    return m_radioGroup.end;
+}
+
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/minifram.cpp b/Externals/wxWidgets3/src/osx/minifram.cpp
index 56b0228822..0b5e463efd 100644
--- a/Externals/wxWidgets3/src/osx/minifram.cpp
+++ b/Externals/wxWidgets3/src/osx/minifram.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: minifram.cpp 54962 2008-08-03 17:34:59Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/nonownedwnd_osx.cpp b/Externals/wxWidgets3/src/osx/nonownedwnd_osx.cpp
index 95a0ba3a14..0e57c7f9f9 100644
--- a/Externals/wxWidgets3/src/osx/nonownedwnd_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/nonownedwnd_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNonOwnedWindow
 // Author:      Stefan Csomor
 // Created:     2008-03-24
-// RCS-ID:      $Id: nonownedwnd_osx.cpp 70765 2012-03-01 15:04:42Z JS $
 // Copyright:   (c) Stefan Csomor 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -249,10 +248,7 @@ bool wxNonOwnedWindow::OSXShowWithEffect(bool show,
     {
         // as apps expect a size event to occur when the window is shown,
         // generate one when it is shown with effect too
-        MacOnInternalSize();
-        wxSizeEvent event(GetSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        SendSizeEvent();
     }
 
     return true;
@@ -310,13 +306,9 @@ void wxNonOwnedWindow::HandleActivated( double timestampsec, bool didActivate )
     HandleWindowEvent(wxevent);
 }
 
-void wxNonOwnedWindow::HandleResized( double timestampsec )
+void wxNonOwnedWindow::HandleResized( double WXUNUSED(timestampsec) )
 {
-    MacOnInternalSize();
-    wxSizeEvent wxevent( GetSize() , GetId());
-    wxevent.SetTimestamp( (int) (timestampsec * 1000) );
-    wxevent.SetEventObject( this );
-    HandleWindowEvent(wxevent);
+    SendSizeEvent();
     // we have to inform some controls that have to reset things
     // relative to the toplevel window (e.g. OpenGL buffers)
     wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
@@ -387,10 +379,7 @@ bool wxNonOwnedWindow::Show(bool show)
     if ( show )
     {
         // because apps expect a size event to occur at this moment
-        MacOnInternalSize();
-        wxSizeEvent event(GetSize() , m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        SendSizeEvent();
     }
 
     return true ;
@@ -507,6 +496,13 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
     return m_nowpeer ? m_nowpeer->GetWXWindow() : NULL;
 }
 
+#if wxOSX_USE_COCOA_OR_IPHONE
+void *wxNonOwnedWindow::OSXGetViewOrWindow() const
+{
+    return GetWXWindow();
+}
+#endif
+
 // ---------------------------------------------------------------------------
 // Shape implementation
 // ---------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/notebook_osx.cpp b/Externals/wxWidgets3/src/osx/notebook_osx.cpp
index 218a984007..59a329d5e7 100644
--- a/Externals/wxWidgets3/src/osx/notebook_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/notebook_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: notebook_osx.cpp 70340 2012-01-14 17:57:08Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -173,11 +172,19 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 
     wxNotebookPage* page = m_pages[nPage] ;
     m_pages.RemoveAt(nPage);
+    m_images.RemoveAt(nPage);
 
     MacSetupTabs();
 
-    if (m_selection >= (int)GetPageCount())
-        m_selection = GetPageCount() - 1;
+    if ( m_selection >= (int)nPage )
+    {
+        if ( GetPageCount() == 0 )
+            m_selection = wxNOT_FOUND;
+        else
+            m_selection = m_selection ? m_selection - 1 : 0;
+
+        GetPeer()->SetValue( m_selection + 1 ) ;
+    }
 
     if (m_selection >= 0)
         m_pages[m_selection]->Show(true);
@@ -190,7 +197,8 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
-    WX_CLEAR_ARRAY(m_pages) ;
+    WX_CLEAR_ARRAY(m_pages);
+    m_images.clear();
     MacSetupTabs();
     m_selection = wxNOT_FOUND ;
     InvalidateBestSize();
@@ -247,64 +255,7 @@ bool wxNotebook::InsertPage(size_t nPage,
 
 int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 {
-    int resultV = wxNOT_FOUND;
-#ifdef __WXOSX_CARBON__
-    const int countPages = GetPageCount();
-
-    // we have to convert from Client to Window relative coordinates
-    wxPoint adjustedPt = pt + GetClientAreaOrigin();
-    // and now to HIView native ones
-    adjustedPt.x -= MacGetLeftBorderSize() ;
-    adjustedPt.y -= MacGetTopBorderSize() ;
-
-    HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
-    HIViewPartCode outPart = 0 ;
-    OSStatus err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
-
-    int max = GetPeer()->GetMaximum() ;
-    if ( outPart == 0 && max > 0 )
-    {
-        // this is a hack, as unfortunately a hit on an already selected tab returns 0,
-        // so we have to go some extra miles to make sure we select something different
-        // and try again ..
-        int val = GetPeer()->GetValue() ;
-        int maxval = max ;
-        if ( max == 1 )
-        {
-            GetPeer()->SetMaximum( 2 ) ;
-            maxval = 2 ;
-        }
-
-        if ( val == 1 )
-            GetPeer()->SetValue( maxval ) ;
-        else
-             GetPeer()->SetValue( 1 ) ;
-
-        err = HIViewGetPartHit( GetPeer()->GetControlRef(), &hipoint, &outPart );
-
-        GetPeer()->SetValue( val ) ;
-        if ( max == 1 )
-            GetPeer()->SetMaximum( 1 ) ;
-    }
-
-    if ( outPart >= 1 && outPart <= countPages )
-        resultV = outPart - 1 ;
-
-    if (flags != NULL)
-    {
-        *flags = 0;
-
-        // we cannot differentiate better
-        if (resultV >= 0)
-            *flags |= wxBK_HITTEST_ONLABEL;
-        else
-            *flags |= wxBK_HITTEST_NOWHERE;
-    }
-#else
-    wxUnusedVar(pt);
-    wxUnusedVar(flags);
-#endif
-    return resultV;
+    return GetPeer()->TabHitTest(pt,flags);
 }
 
 // Added by Mark Newsam
@@ -342,6 +293,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
         pPage->SetSize(rect, wxSIZE_FORCE_EVENT);
     }
 
+#if 0 // deactivate r65078 for the moment
     // If the selected page is hidden at this point, the notebook
     // has become visible for the first time after creation, and
     // we postponed showing the page in ChangePage().
@@ -355,6 +307,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
             pPage->SetFocus();
         }
     }
+#endif
 
     // Processing continues to next OnSize
     event.Skip();
@@ -480,6 +433,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     if ( nSel != wxNOT_FOUND )
     {
         wxNotebookPage *pPage = m_pages[nSel];
+#if 0 // deactivate r65078 for the moment
         if ( IsShownOnScreen() )
         {
             pPage->Show( true );
@@ -494,6 +448,10 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
             // We Show() the selected page in our OnSize handler,
             // unless it already is shown.
         }
+#else
+        pPage->Show( true );
+        pPage->SetFocus();
+#endif
     }
 
     m_selection = nSel;
@@ -508,7 +466,7 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
     if ( newSel != m_selection )
     {
         wxBookCtrlEvent changing(
-            wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
+            wxEVT_NOTEBOOK_PAGE_CHANGING, m_windowId,
             newSel , m_selection );
         changing.SetEventObject( this );
         HandleWindowEvent( changing );
@@ -516,7 +474,7 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
         if ( changing.IsAllowed() )
         {
             wxBookCtrlEvent event(
-                wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
+                wxEVT_NOTEBOOK_PAGE_CHANGED, m_windowId,
                 newSel, m_selection );
             event.SetEventObject( this );
             HandleWindowEvent( event );
diff --git a/Externals/wxWidgets3/src/osx/palette.cpp b/Externals/wxWidgets3/src/osx/palette.cpp
index e232a3241d..ecd9b2da3c 100644
--- a/Externals/wxWidgets3/src/osx/palette.cpp
+++ b/Externals/wxWidgets3/src/osx/palette.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: palette.cpp 67216 2011-03-16 10:56:41Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/pen.cpp b/Externals/wxWidgets3/src/osx/pen.cpp
index d49f596e70..8f95d03efa 100644
--- a/Externals/wxWidgets3/src/osx/pen.cpp
+++ b/Externals/wxWidgets3/src/osx/pen.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: pen.cpp 67681 2011-05-03 16:29:04Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/printdlg_osx.cpp b/Externals/wxWidgets3/src/osx/printdlg_osx.cpp
index ef7945fdbf..c84039c272 100644
--- a/Externals/wxWidgets3/src/osx/printdlg_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/printdlg_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: printdlg_osx.cpp 70636 2012-02-20 21:55:55Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/radiobox_osx.cpp b/Externals/wxWidgets3/src/osx/radiobox_osx.cpp
index 2177d58ee7..2aba6e193b 100644
--- a/Externals/wxWidgets3/src/osx/radiobox_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/radiobox_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
 // Created:     1998-01-01
-// RCS-ID:      $Id: radiobox_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,7 +37,7 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
     if ( outer.IsChecked() )
     {
-        wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
+        wxCommandEvent event( wxEVT_RADIOBOX, m_windowId );
         int i = GetSelection() ;
         event.SetInt(i);
         event.SetString(GetString(i));
@@ -265,7 +264,7 @@ void wxRadioBox::SetString(unsigned int item,const wxString& label)
 }
 
 // Sets a button by passing the desired position. This does not cause
-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
+// wxEVT_RADIOBOX event to get emitted
 //
 void wxRadioBox::SetSelection(int item)
 {
@@ -433,7 +432,13 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
-    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;
+    // Determine the full size in case we need to use it as fallback.
+    wxSize sz;
+    if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
+            (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
+    {
+        sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;
+    }
 
     // change the width / height only when specified
     if ( width == wxDefaultCoord )
@@ -454,6 +459,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     wxControl::DoSetSize( x_offset, y_offset, width, height, wxSIZE_AUTO );
 
+    // But now recompute the full size again because it could have changed.
+    // This notably happens if the previous full size was too small to fully
+    // fit the box margins.
+    sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;
+
     // arrange radio buttons
     int x_start, y_start;
 
diff --git a/Externals/wxWidgets3/src/osx/radiobut_osx.cpp b/Externals/wxWidgets3/src/osx/radiobut_osx.cpp
index 96b5140d59..51a7655b7e 100644
--- a/Externals/wxWidgets3/src/osx/radiobut_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/radiobut_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      AUTHOR
 // Modified by: JS Lair (99/11/15) adding the cyclic group notion for radiobox
 // Created:     ??/??/98
-// RCS-ID:      $Id: radiobut_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) AUTHOR
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,7 +126,7 @@ bool wxRadioButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 
     SetValue( true );
 
-    wxCommandEvent event2( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    wxCommandEvent event2( wxEVT_RADIOBUTTON, m_windowId );
     event2.SetEventObject( this );
     event2.SetInt( true );
     ProcessCommand( event2 );
diff --git a/Externals/wxWidgets3/src/osx/scrolbar_osx.cpp b/Externals/wxWidgets3/src/osx/scrolbar_osx.cpp
index 495b10c2bd..3d6d8f2961 100644
--- a/Externals/wxWidgets3/src/osx/scrolbar_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/scrolbar_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: scrolbar_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/slider_osx.cpp b/Externals/wxWidgets3/src/osx/slider_osx.cpp
index 2482cce0fc..5d658fe181 100644
--- a/Externals/wxWidgets3/src/osx/slider_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/slider_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: slider_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -105,6 +104,7 @@ bool wxSlider::Create(wxWindow *parent,
 
     SetPeer(wxWidgetImpl::CreateSlider( this, parent, id, value, minValue, maxValue, pos, size, style, GetExtraStyle() ));
 
+#if 0
     if (style & wxSL_VERTICAL)
         // Forces SetSize to use the proper width
         SetSizeHints(10, -1, 10, -1);
@@ -115,7 +115,8 @@ bool wxSlider::Create(wxWindow *parent,
     // NB: SetSizeHints is overloaded by wxSlider and will substitute 10 with the
     // proper dimensions, it also means other people cannot bugger the slider with
     // other values
-
+#endif
+    
     if (style & wxSL_LABELS)
     {
         m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
@@ -297,7 +298,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
     event.SetEventObject( this );
     HandleWindowEvent( event );
 
-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
+    wxCommandEvent cevent( wxEVT_SLIDER, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );
     HandleWindowEvent( cevent );
@@ -476,6 +477,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
     // yet another hack since this is a composite control
     // when wxSlider has it's size hardcoded, we're not allowed to
     // change the size. But when the control has labels, we DO need
+    
     // to resize the internal Mac control to accommodate the text labels.
     // We need to trick the wxWidgets resize mechanism so that we can
     // resize the slider part of the control ONLY.
@@ -486,7 +488,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 
     if (GetWindowStyle() & wxSL_LABELS)
     {
-        // make sure we don't allow the entire control to be resized accidently
+        // make sure we don't allow the entire control to be resized accidentally
         if (width == GetSize().x)
             m_minWidth = -1;
     }
diff --git a/Externals/wxWidgets3/src/osx/sound_osx.cpp b/Externals/wxWidgets3/src/osx/sound_osx.cpp
index 19422e1a80..8543b2c06d 100644
--- a/Externals/wxWidgets3/src/osx/sound_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/sound_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2009-09-01
-// RCS-ID:      $Id: sound_osx.cpp 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/spinbutt_osx.cpp b/Externals/wxWidgets3/src/osx/spinbutt_osx.cpp
index c5fde47655..16732ab9a4 100644
--- a/Externals/wxWidgets3/src/osx/spinbutt_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/spinbutt_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: spinbutt_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/srchctrl_osx.cpp b/Externals/wxWidgets3/src/osx/srchctrl_osx.cpp
index 520bb209e5..00d96f1585 100644
--- a/Externals/wxWidgets3/src/osx/srchctrl_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/srchctrl_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements mac carbon wxSearchCtrl
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctrl_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -203,7 +202,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 
 bool wxSearchCtrl::HandleSearchFieldSearchHit()
 {
-    wxCommandEvent event(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCHCTRL_SEARCH_BTN, m_windowId );
     event.SetEventObject(this);
 
     // provide the string to search for directly in the event, this is more
@@ -215,7 +214,7 @@ bool wxSearchCtrl::HandleSearchFieldSearchHit()
 
 bool wxSearchCtrl::HandleSearchFieldCancelHit()
 {
-    wxCommandEvent event(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCHCTRL_CANCEL_BTN, m_windowId );
     event.SetEventObject(this);
     return ProcessCommand(event);
 }
diff --git a/Externals/wxWidgets3/src/osx/statbox_osx.cpp b/Externals/wxWidgets3/src/osx/statbox_osx.cpp
index b1cbd5f47d..bfdcb53bbf 100644
--- a/Externals/wxWidgets3/src/osx/statbox_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/statbox_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbox_osx.cpp 67243 2011-03-19 08:36:23Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,29 +39,18 @@ bool wxStaticBox::Create( wxWindow *parent,
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
-    static int extraTop = -1; // Uninitted
-    static int other = 5;
-
-    if ( extraTop == -1 )
-    {
-        // The minimal border used for the top.
-        // Later on, the staticbox's font height is added to this.
-        extraTop = 0;
-
-        // As indicated by the HIG, Panther needs an extra border of 11
-        // pixels (otherwise overlapping occurs at the top). The "other"
-        // border has to be 11.
-        extraTop = 11;
-#if wxOSX_USE_COCOA
-        other = 17;
-#else
-        other = 11;
-#endif
-    }
+    static int extraTop = 11; 
+    static int other = 11;
 
     *borderTop = extraTop;
     if ( !m_label.empty() )
+    {
+#if wxOSX_USE_COCOA
+        *borderTop += 11;
+#else
         *borderTop += GetCharHeight();
+#endif
+    }
 
     *borderOther = other;
 }
diff --git a/Externals/wxWidgets3/src/osx/statline_osx.cpp b/Externals/wxWidgets3/src/osx/statline_osx.cpp
index af4f20ad3c..81b8a9a885 100644
--- a/Externals/wxWidgets3/src/osx/statline_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/statline_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/stattext_osx.cpp b/Externals/wxWidgets3/src/osx/stattext_osx.cpp
index e1a033ab2e..a9de6772c1 100644
--- a/Externals/wxWidgets3/src/osx/stattext_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/stattext_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -46,6 +45,14 @@ bool wxStaticText::Create( wxWindow *parent,
     MacPostControlCreate( pos, size );
 
     SetLabel(label);
+    if ( HasFlag(wxST_NO_AUTORESIZE) )
+    {
+        // Normally this is done in SetLabel() below but we avoid doing it when
+        // this style is used, so we need to explicitly do it in the ctor in
+        // this case or otherwise the control would retain its initial tiny size.
+        InvalidateBestSize();
+        SetInitialSize(size);
+    }
 
     return true;
 }
diff --git a/Externals/wxWidgets3/src/osx/textctrl_osx.cpp b/Externals/wxWidgets3/src/osx/textctrl_osx.cpp
index cddfdbcdef..08346e5adb 100644
--- a/Externals/wxWidgets3/src/osx/textctrl_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/textctrl_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
-// RCS-ID:      $Id: textctrl_osx.cpp 70355 2012-01-15 15:54:53Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -285,7 +284,7 @@ void wxTextCtrl::Copy()
 {
     if (CanCopy())
     {
-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());
+        wxClipboardTextEvent evt(wxEVT_TEXT_COPY, GetId());
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
@@ -298,7 +297,7 @@ void wxTextCtrl::Cut()
 {
     if (CanCut())
     {
-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_CUT, GetId());
+        wxClipboardTextEvent evt(wxEVT_TEXT_CUT, GetId());
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
@@ -313,7 +312,7 @@ void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_PASTE, GetId());
+        wxClipboardTextEvent evt(wxEVT_TEXT_PASTE, GetId());
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
@@ -401,7 +400,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         case WXK_RETURN:
             if (m_windowStyle & wxTE_PROCESS_ENTER)
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 if ( HandleWindowEvent(event) )
@@ -416,7 +415,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event(wxEVT_BUTTON, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
 
@@ -469,7 +468,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
          key == WXK_DELETE ||
          key == WXK_BACK)
     {
-        wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        wxCommandEvent event1(wxEVT_TEXT, m_windowId);
         event1.SetEventObject( this );
         wxPostEvent( GetEventHandler(), event1 );
     }
@@ -600,21 +599,6 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
         return true ;
 }
 
-bool wxTextCtrl::SetHint(const wxString& hint)
-{
-    m_hintString = hint;
-    
-    if ( GetTextPeer() && GetTextPeer()->SetHint(hint) )
-        return true;
-    
-    return false;
-}
-
-wxString wxTextCtrl::GetHint() const
-{
-    return m_hintString;
-}
-
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/textentry_osx.cpp b/Externals/wxWidgets3/src/osx/textentry_osx.cpp
index 889e6f6e34..8a1466ba83 100644
--- a/Externals/wxWidgets3/src/osx/textentry_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/textentry_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by: Kevin Ollivier
 // Created:     1998-01-01
-// RCS-ID:      $Id: textentry_osx.cpp 70379 2012-01-17 21:54:02Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -224,6 +223,23 @@ bool wxTextEntry::IsEditable() const
     return m_editable ;
 }
 
+bool wxTextEntry::SendMaxLenEvent()
+{
+    wxWindow *win = GetEditableWindow();
+    wxCHECK_MSG( win, false, "can't send an event without a window" );
+    
+    wxCommandEvent event(wxEVT_TEXT_MAXLEN, win->GetId());
+    
+    // do not do this as it could be very inefficient if the text control
+    // contains a lot of text and we're not using ref-counted wxString
+    // implementation -- instead, event.GetString() will query the control for
+    // its current text if needed
+    //event.SetString(win->GetValue());
+    
+    event.SetEventObject(win);
+    return win->HandleWindowEvent(event);
+}
+
 // ----------------------------------------------------------------------------
 // Undo/redo
 // ----------------------------------------------------------------------------
@@ -271,6 +287,18 @@ wxTextWidgetImpl * wxTextEntry::GetTextPeer() const
     return win ? dynamic_cast<wxTextWidgetImpl *>(win->GetPeer()) : NULL;
 }
 
+bool wxTextEntry::SetHint(const wxString& hint)
+{
+    m_hintString = hint;
+    return GetTextPeer() && GetTextPeer()->SetHint(hint);
+}
+
+wxString wxTextEntry::GetHint() const
+{
+    return m_hintString;
+}
+
+
 // ----------------------------------------------------------------------------
 // Auto-completion
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/tglbtn_osx.cpp b/Externals/wxWidgets3/src/osx/tglbtn_osx.cpp
index 4ccee37f7a..f1ba9cd00e 100644
--- a/Externals/wxWidgets3/src/osx/tglbtn_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/tglbtn_osx.cpp
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn_osx.cpp 67949 2011-06-16 00:43:22Z RD $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ============================================================================
 // implementation
@@ -94,7 +93,7 @@ void wxToggleButton::Command(wxCommandEvent & event)
 
 bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_TOGGLEBUTTON, m_windowId);
     event.SetInt(GetValue());
     event.SetEventObject(this);
     ProcessCommand(event);
diff --git a/Externals/wxWidgets3/src/osx/timectrl_osx.cpp b/Externals/wxWidgets3/src/osx/timectrl_osx.cpp
index 87a143d043..2ed85d3c20 100644
--- a/Externals/wxWidgets3/src/osx/timectrl_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/timectrl_osx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Implementation of wxTimePickerCtrl for OS X.
 // Author:      Vadim Zeitlin
 // Created:     2011-12-18
-// RCS-ID:      $Id: timectrl_osx.cpp 70071 2011-12-20 21:27:14Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/toolbar_osx.cpp b/Externals/wxWidgets3/src/osx/toolbar_osx.cpp
index 59f0720a34..502e1f4573 100644
--- a/Externals/wxWidgets3/src/osx/toolbar_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/toolbar_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar_osx.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/osx/toplevel_osx.cpp b/Externals/wxWidgets3/src/osx/toplevel_osx.cpp
index f0ee0b15b7..b0dc820904 100644
--- a/Externals/wxWidgets3/src/osx/toplevel_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/toplevel_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     24.09.01
-// RCS-ID:      $Id: toplevel_osx.cpp 70295 2012-01-08 14:52:47Z VZ $
 // Copyright:   (c) 2001-2004 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -106,7 +105,13 @@ bool wxTopLevelWindowMac::Destroy()
     if (m_nowpeer && m_nowpeer->GetWXWindow())
         ClearKeyboardFocus( (WindowRef)m_nowpeer->GetWXWindow() );
 #endif
-    return wxTopLevelWindowBase::Destroy();
+    // delayed destruction: the tlw will be deleted during the next idle
+    // loop iteration
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+    
+    Hide();
+    return true;
 }
 
 
@@ -181,7 +186,8 @@ void wxTopLevelWindowMac::ShowWithoutActivating()
 
     m_nowpeer->ShowWithoutActivating();
 
-    // TODO: Should we call EVT_SIZE here?
+    // because apps expect a size event to occur at this moment
+    SendSizeEvent();
 }
 
 bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
diff --git a/Externals/wxWidgets3/src/osx/uiaction_osx.cpp b/Externals/wxWidgets3/src/osx/uiaction_osx.cpp
index 05d858f34b..c916923a3f 100644
--- a/Externals/wxWidgets3/src/osx/uiaction_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/uiaction_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
-// RCS-ID:      $Id: uiaction_osx.cpp 70402 2012-01-19 15:01:01Z SC $
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
@@ -26,6 +25,8 @@
 #include "wx/osx/private.h"
 #include "wx/osx/core/cfref.h"
 
+#include "wx/evtloop.h"
+
 namespace
 {
     
@@ -51,7 +52,53 @@ CGEventType CGEventTypeForMouseButton(int button, bool isDown)
             return isDown ? kCGEventOtherMouseDown : kCGEventOtherMouseUp;
     }
 }
+    
+CGEventType CGEventTypeForMouseDrag(int button)
+{
+    switch ( button )
+    {
+        case wxMOUSE_BTN_LEFT:
+            return kCGEventLeftMouseDragged;
+            break;
+            
+        case wxMOUSE_BTN_RIGHT:
+            return kCGEventRightMouseDragged;
+            break;
+            
+            // All the other buttons use the constant OtherMouseDown but we still
+            // want to check for invalid parameters so assert first
+        default:
+            wxFAIL_MSG("Unsupported button passed in.");
+            // fall back to the only known remaining case
+            
+        case wxMOUSE_BTN_MIDDLE:
+            return kCGEventOtherMouseDragged;
+            break;
+    }
 
+}
+
+CGMouseButton CGButtonForMouseButton(int button)
+{
+    switch ( button )
+    {
+        case wxMOUSE_BTN_LEFT:
+            return kCGMouseButtonLeft;
+            
+        case wxMOUSE_BTN_RIGHT:
+            return kCGMouseButtonRight;
+            
+            // All the other buttons use the constant OtherMouseDown but we still
+            // want to check for invalid parameters so assert first
+        default:
+            wxFAIL_MSG("Unsupported button passed in.");
+            // fall back to the only known remaining case
+            
+        case wxMOUSE_BTN_MIDDLE:
+            return kCGMouseButtonCenter;
+    }
+}
+    
 CGPoint GetMousePosition()
 {
     int x, y;
@@ -70,14 +117,17 @@ bool wxUIActionSimulator::MouseDown(int button)
 {
     CGEventType type = CGEventTypeForMouseButton(button, true);
     wxCFRef<CGEventRef> event(
-            CGEventCreateMouseEvent(NULL, type, GetMousePosition(), button));
+            CGEventCreateMouseEvent(NULL, type, GetMousePosition(), CGButtonForMouseButton(button)));
 
     if ( !event )
         return false;
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);
-
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
     return true;
 }
 
@@ -97,6 +147,10 @@ bool wxUIActionSimulator::MouseMove(long x, long y)
     CGEventSetType(event, type);
     CGEventPost(tap, event);
 
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
     return true;
 }
 
@@ -104,14 +158,85 @@ bool wxUIActionSimulator::MouseUp(int button)
 {
     CGEventType type = CGEventTypeForMouseButton(button, false);
     wxCFRef<CGEventRef> event(
-            CGEventCreateMouseEvent(NULL, type, GetMousePosition(), button));
+            CGEventCreateMouseEvent(NULL, type, GetMousePosition(), CGButtonForMouseButton(button)));
 
     if ( !event )
         return false;
 
     CGEventSetType(event, type);
     CGEventPost(tap, event);
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
+    return true;
+}
 
+bool wxUIActionSimulator::MouseDblClick(int button)
+{
+    CGEventType downtype = CGEventTypeForMouseButton(button, true);
+    CGEventType uptype = CGEventTypeForMouseButton(button, false);
+    wxCFRef<CGEventRef> event(
+                              CGEventCreateMouseEvent(NULL, downtype, GetMousePosition(), CGButtonForMouseButton(button)));
+    
+    if ( !event )
+        return false;
+    
+    CGEventSetType(event,downtype);
+    CGEventPost(tap, event);
+    
+    CGEventSetType(event, uptype);
+    CGEventPost(tap, event);
+    
+    CGEventSetIntegerValueField(event, kCGMouseEventClickState, 2);
+    CGEventSetType(event, downtype);
+    CGEventPost(tap, event);
+    
+    CGEventSetType(event, uptype);
+    CGEventPost(tap, event);
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
+    return true;
+}
+
+bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
+                                        int button)
+{
+    CGPoint pos1,pos2;
+    pos1.x = x1;
+    pos1.y = y1;
+    pos2.x = x2;
+    pos2.y = y2;
+
+    CGEventType downtype = CGEventTypeForMouseButton(button, true);
+    CGEventType uptype = CGEventTypeForMouseButton(button, false);
+    CGEventType dragtype = CGEventTypeForMouseDrag(button) ;
+
+    wxCFRef<CGEventRef> event(
+                              CGEventCreateMouseEvent(NULL, kCGEventMouseMoved, pos1, CGButtonForMouseButton(button)));
+    
+    if ( !event )
+        return false;
+    
+    CGEventSetType(event,kCGEventMouseMoved);
+    CGEventPost(tap, event);
+    
+    CGEventSetType(event,downtype);
+    CGEventPost(tap, event);
+    
+    
+    CGEventSetType(event, dragtype);
+    CGEventSetLocation(event,pos2);
+    CGEventPost(tap, event);
+    
+    CGEventSetType(event, uptype);
+    CGEventPost(tap, event);
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+    
     return true;
 }
 
@@ -126,6 +251,10 @@ wxUIActionSimulator::DoKey(int keycode, int WXUNUSED(modifiers), bool isDown)
         return false;
 
     CGEventPost(kCGHIDEventTap, event);
+    wxCFEventLoop* loop = dynamic_cast<wxCFEventLoop*>(wxEventLoop::GetActive());
+    if (loop)
+        loop->SetShouldWaitForEvent(true);
+
     return true;
 }
 
diff --git a/Externals/wxWidgets3/src/osx/utils_osx.cpp b/Externals/wxWidgets3/src/osx/utils_osx.cpp
index df16891635..bfcf65f57c 100644
--- a/Externals/wxWidgets3/src/osx/utils_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/utils_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utils_osx.cpp 69543 2011-10-26 05:38:24Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,21 +34,13 @@
 
 // #include "MoreFilesX.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    #include <AudioToolbox/AudioServices.h>
-#endif
+#include <AudioToolbox/AudioServices.h>
 
 #include "wx/osx/private.h"
 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"
 
-#if defined(__MWERKS__) && wxUSE_UNICODE
-#if __MWERKS__ < 0x4100
-    #include <wtime.h>
-#endif
-#endif
-
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))
@@ -96,6 +87,7 @@ int wxDisplayDepth()
             theDepth = 32; // some reasonable default
 
         CFRelease(encoding);
+        CGDisplayModeRelease(currentMode);
     }
     else
 #endif
@@ -253,9 +245,26 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 
 CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush )
 {
-    CGColorRef color ;
-    HIThemeBrushCreateCGColor( brush, &color );
-    return color;
+    const int maxcachedbrush = 58+5; // negative indices are for metabrushes, cache down to -5)
+    int brushindex = brush+5;
+    if ( brushindex < 0 || brushindex > maxcachedbrush )
+    {
+        CGColorRef color ;
+        HIThemeBrushCreateCGColor( brush, &color );
+        return color;
+    }
+    else
+    {
+        static bool inited = false;
+        static CGColorRef themecolors[maxcachedbrush+1];
+        if ( !inited )
+        {
+            for ( int i = 0 ; i <= maxcachedbrush ; ++i )
+                HIThemeBrushCreateCGColor( i-5, &themecolors[i] );
+            inited = true;
+        }
+        return CGColorRetain(themecolors[brushindex ]);
+    }
 }
 
 //---------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/osx/webview_webkit.mm b/Externals/wxWidgets3/src/osx/webview_webkit.mm
index 20eee17382..ab7586544f 100644
--- a/Externals/wxWidgets3/src/osx/webview_webkit.mm
+++ b/Externals/wxWidgets3/src/osx/webview_webkit.mm
@@ -5,7 +5,6 @@
 // Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Modified by:
 // Created:     2004-4-16
-// RCS-ID:      $Id: webview_webkit.mm 69074 2011-09-12 18:35:39Z SJL $
 // Copyright:   (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -103,7 +102,6 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
     UInt32 keyCode ;
     UInt32 modifiers ;
-    Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
 #if wxUSE_UNICODE
@@ -135,13 +133,11 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 #endif
 
     GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL,
-                      sizeof(char), NULL, &charCode );
+                      1, NULL, &charCode );
     GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &keyCode );
     GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &modifiers );
-    GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, NULL,
-                      sizeof(Point), NULL, &point );
 
     UInt32 message = (keyCode << 8) + charCode;
     switch ( GetEventKind( event ) )
@@ -155,7 +151,7 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
             wxTheApp->MacSetCurrentEvent( event , handler ) ;
             if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
-                focus, message, modifiers, when, point.h, point.v, uniChar[0]))
+                focus, message, modifiers, when, uniChar[0]))
             {
                 result = noErr ;
             }
@@ -165,7 +161,7 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
         case kEventRawKeyUp :
             if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
-                focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+                focus , message , modifiers , when , uniChar[0] ) )
             {
                 result = noErr ;
             }
@@ -179,8 +175,6 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
                 event.m_controlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
                 event.m_metaDown = modifiers & cmdKey;
-                event.m_x = point.h;
-                event.m_y = point.v;
 
 #if wxUSE_UNICODE
                 event.m_uniChar = uniChar[0] ;
@@ -315,6 +309,15 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 @end
 
+@interface WebViewUIDelegate : NSObject
+{
+    wxWebViewWebKit* webKitWindow;
+}
+
+- initWithWxWindow: (wxWebViewWebKit*)inWindow;
+
+@end
+
 //We use a hash to map scheme names to wxWebViewHandler
 WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewHandler>, wxStringToWebHandlerMap);
 
@@ -348,10 +351,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
     m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
-    if ( UMAGetSystemVersion() >= 0x1030 )
-        HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
-#endif
+    HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
     InstallControlEventHandler(peer->GetControlRef(),
                                GetwxWebViewWebKitEventHandlerUPP(),
                                GetEventTypeCount(eventList), eventList, this,
@@ -386,6 +386,11 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
     [m_webView setPolicyDelegate:policyDelegate];
 
+    WebViewUIDelegate* uiDelegate =
+            [[WebViewUIDelegate alloc] initWithWxWindow: this];
+
+    [m_webView setUIDelegate:uiDelegate];
+
     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
 
@@ -397,14 +402,19 @@ wxWebViewWebKit::~wxWebViewWebKit()
 {
     WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
     WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
+    WebViewUIDelegate* uiDelegate = [m_webView UIDelegate];
     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];
+    [m_webView setUIDelegate: nil];
 
     if (loadDelegate)
         [loadDelegate release];
 
     if (policyDelegate)
         [policyDelegate release];
+
+    if (uiDelegate)
+        [uiDelegate release];
 }
 
 // ----------------------------------------------------------------------------
@@ -448,7 +458,7 @@ void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
     if ( !m_webView )
         return;
 
-    if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+    if (flags & wxWEBVIEW_RELOAD_NO_CACHE)
     {
         // TODO: test this indeed bypasses the cache
         [[m_webView preferences] setUsesPageCache:NO];
@@ -482,18 +492,18 @@ wxString wxWebViewWebKit::GetPageSource() const
 {
 
     if (CanGetPageSource())
-	{
+    {
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
-		wxASSERT (dataSource != nil);
+        wxASSERT (dataSource != nil);
 
-		id<WebDocumentRepresentation> representation = [dataSource representation];
-		wxASSERT (representation != nil);
+        id<WebDocumentRepresentation> representation = [dataSource representation];
+        wxASSERT (representation != nil);
 
-		NSString* source = [representation documentSource];
-		if (source == nil)
-		{
-			return wxEmptyString;
-		}
+        NSString* source = [representation documentSource];
+        if (source == nil)
+        {
+            return wxEmptyString;
+        }
 
         return wxStringWithNSString( source );
     }
@@ -557,7 +567,7 @@ void wxWebViewWebKit::Print()
     {
         [op setShowsPrintPanel: showPrompt];
         // in my tests, the progress bar always freezes and it stops the whole
-        // print operation. do not turn this to true unless there is a 
+        // print operation. do not turn this to true unless there is a
         // workaround for the bug.
         [op setShowsProgressPanel: false];
     }
@@ -585,7 +595,7 @@ void wxWebViewWebKit::SetZoomType(wxWebViewZoomType zoomType)
 {
     // there is only one supported zoom type at the moment so this setter
     // does nothing beyond checking sanity
-    wxASSERT(zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT);
+    wxASSERT(zoomType == wxWEBVIEW_ZOOM_TYPE_TEXT);
 }
 
 wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
@@ -593,7 +603,7 @@ wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
     // for now that's the only one that is supported
     // FIXME: does the default zoom type change depending on webkit versions? :S
     //        Then this will be wrong
-    return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    return wxWEBVIEW_ZOOM_TYPE_TEXT;
 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
@@ -603,7 +613,7 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
         // for now that's the only one that is supported
         // TODO: I know recent versions of webkit support layout zoom too,
         //       check if we can support it
-        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+        case wxWEBVIEW_ZOOM_TYPE_TEXT:
             return true;
 
         default:
@@ -631,10 +641,11 @@ void wxWebViewWebKit::SetScrollPos(int pos)
 
 wxString wxWebViewWebKit::GetSelectedText() const
 {
-    NSString* selection = [[m_webView selectedDOMRange] markupString];
-    if (!selection) return wxEmptyString;
+    DOMRange* dr = [m_webView selectedDOMRange];
+    if ( !dr )
+        return wxString();
 
-    return wxStringWithNSString(selection);
+    return wxStringWithNSString([dr toString]);
 }
 
 void wxWebViewWebKit::RunScript(const wxString& javascript)
@@ -648,7 +659,7 @@ void wxWebViewWebKit::RunScript(const wxString& javascript)
 
 void wxWebViewWebKit::OnSize(wxSizeEvent &event)
 {
-#if defined(__WXMAC_) && wxOSX_USE_CARBON
+#if defined(__WXMAC__) && wxOSX_USE_CARBON
     // This is a nasty hack because WebKit seems to lose its position when it is
     // embedded in a control that is not itself the content view for a TLW.
     // I put it in OnSize because these calcs are not perfect, and in fact are
@@ -694,7 +705,7 @@ void wxWebViewWebKit::OnSize(wxSizeEvent &event)
     // we want is the root view, because we need to make the y origin relative
     // to the very top of the window, not its contents, since we later flip
     // the y coordinate for Cocoa.
-    HIViewConvertRect (&rect, m_peer->GetControlRef(),
+    HIViewConvertRect (&rect, GetPeer()->GetControlRef(),
                                 HIViewGetRoot(
                                     (WindowRef) MacGetTopLevelWindowRef()
                                  ));
@@ -768,28 +779,28 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.55)
     {
-        return wxWEB_VIEW_ZOOM_TINY;
+        return wxWEBVIEW_ZOOM_TINY;
     }
     else if (zoom > 0.55 && zoom <= 0.85)
     {
-        return wxWEB_VIEW_ZOOM_SMALL;
+        return wxWEBVIEW_ZOOM_SMALL;
     }
     else if (zoom > 0.85 && zoom <= 1.15)
     {
-        return wxWEB_VIEW_ZOOM_MEDIUM;
+        return wxWEBVIEW_ZOOM_MEDIUM;
     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {
-        return wxWEB_VIEW_ZOOM_LARGE;
+        return wxWEBVIEW_ZOOM_LARGE;
     }
     else if (zoom > 1.45)
     {
-        return wxWEB_VIEW_ZOOM_LARGEST;
+        return wxWEBVIEW_ZOOM_LARGEST;
     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);
-    return wxWEB_VIEW_ZOOM_MEDIUM;
+    return wxWEBVIEW_ZOOM_MEDIUM;
 }
 
 void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
@@ -797,23 +808,23 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)
     {
-        case wxWEB_VIEW_ZOOM_TINY:
+        case wxWEBVIEW_ZOOM_TINY:
             SetWebkitZoom(0.4f);
             break;
 
-        case wxWEB_VIEW_ZOOM_SMALL:
+        case wxWEBVIEW_ZOOM_SMALL:
             SetWebkitZoom(0.7f);
             break;
 
-        case wxWEB_VIEW_ZOOM_MEDIUM:
+        case wxWEBVIEW_ZOOM_MEDIUM:
             SetWebkitZoom(1.0f);
             break;
 
-        case wxWEB_VIEW_ZOOM_LARGE:
+        case wxWEBVIEW_ZOOM_LARGE:
             SetWebkitZoom(1.3);
             break;
 
-        case wxWEB_VIEW_ZOOM_LARGEST:
+        case wxWEBVIEW_ZOOM_LARGEST:
             SetWebkitZoom(1.6);
             break;
 
@@ -823,7 +834,7 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
 
 }
 
-void wxWebViewWebKit::SetPage(const wxString& src, const wxString& baseUrl)
+void wxWebViewWebKit::DoSetPage(const wxString& src, const wxString& baseUrl)
 {
    if ( !m_webView )
         return;
@@ -891,20 +902,18 @@ void wxWebViewWebKit::SelectAll()
 
 wxString wxWebViewWebKit::GetSelectedSource() const
 {
-    wxString script = ("var range = window.getSelection().getRangeAt(0);"
-                       "var element = document.createElement('div');"
-                       "element.appendChild(range.cloneContents());"
-                       "return element.innerHTML;");
-    id result = [[m_webView windowScriptObject]
-                   evaluateWebScript:wxNSStringWithWxString(script)];
-    return wxStringWithNSString([result stringValue]);
+    DOMRange* dr = [m_webView selectedDOMRange];
+    if ( !dr )
+        return wxString();
+
+    return wxStringWithNSString([dr markupString]);
 }
 
 wxString wxWebViewWebKit::GetPageText() const
 {
-    id result = [[m_webView windowScriptObject]
-                 evaluateWebScript:@"document.body.textContent"];
-    return wxStringWithNSString([result stringValue]);
+    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+                                  @"document.body.textContent"];
+    return wxStringWithNSString(result);
 }
 
 void wxWebViewWebKit::EnableHistory(bool enable)
@@ -1018,7 +1027,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);
-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);
@@ -1036,7 +1045,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);
-        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+        wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,
                              webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              target);
@@ -1048,7 +1057,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 
 wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 {
-    *out = wxWEB_NAV_ERR_OTHER;
+    *out = wxWEBVIEW_NAV_ERR_OTHER;
 
     if ([[error domain] isEqualToString:NSURLErrorDomain])
     {
@@ -1057,17 +1066,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
             case NSURLErrorCannotFindHost:
             case NSURLErrorFileDoesNotExist:
             case NSURLErrorRedirectToNonExistentLocation:
-                *out = wxWEB_NAV_ERR_NOT_FOUND;
+                *out = wxWEBVIEW_NAV_ERR_NOT_FOUND;
                 break;
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
             case NSURLErrorDataLengthExceedsMaximum:
-#endif
             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:
-                *out = wxWEB_NAV_ERR_REQUEST;
+                *out = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorTimedOut:
@@ -1078,21 +1085,19 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
             //case NSURLErrorInternationalRoamingOff:
             //case NSURLErrorCallIsActive:
             //case NSURLErrorDataNotAllowed:
-                *out = wxWEB_NAV_ERR_CONNECTION;
+                *out = wxWEBVIEW_NAV_ERR_CONNECTION;
                 break;
 
             case NSURLErrorCancelled:
             case NSURLErrorUserCancelledAuthentication:
-                *out = wxWEB_NAV_ERR_USER_CANCELLED;
+                *out = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                 break;
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5                
             case NSURLErrorCannotDecodeRawData:
             case NSURLErrorCannotDecodeContentData:
             case NSURLErrorCannotParseResponse:
-#endif
             case NSURLErrorBadServerResponse:
-                *out = wxWEB_NAV_ERR_REQUEST;
+                *out = wxWEBVIEW_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
@@ -1100,11 +1105,11 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
             case NSURLErrorClientCertificateRequired:
 #endif
-                *out = wxWEB_NAV_ERR_AUTH;
+                *out = wxWEBVIEW_NAV_ERR_AUTH;
                 break;
 
             case NSURLErrorNoPermissionsToReadFile:
-				*out = wxWEB_NAV_ERR_SECURITY;
+                *out = wxWEBVIEW_NAV_ERR_SECURITY;
                 break;
 
             case NSURLErrorServerCertificateHasBadDate:
@@ -1112,7 +1117,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
             case NSURLErrorServerCertificateHasUnknownRoot:
             case NSURLErrorServerCertificateNotYetValid:
             case NSURLErrorClientCertificateRejected:
-                *out = wxWEB_NAV_ERR_CERTIFICATE;
+                *out = wxWEBVIEW_NAV_ERR_CERTIFICATE;
                 break;
         }
     }
@@ -1136,17 +1141,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
-		wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
-		                     webKitWindow->GetId(),
+        wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
+                             webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);
-		event.SetString(description);
-		event.SetInt(type);
+        event.SetString(description);
+        event.SetInt(type);
 
-		if (webKitWindow && webKitWindow->GetEventHandler())
-		{
-			webKitWindow->GetEventHandler()->ProcessEvent(event);
-		}
+        if (webKitWindow && webKitWindow->GetEventHandler())
+        {
+            webKitWindow->GetEventHandler()->ProcessEvent(event);
+        }
     }
 }
 
@@ -1160,17 +1165,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
         NSString *url = [[[[frame provisionalDataSource] request] URL]
                             absoluteString];
 
-		wxWebViewNavigationError type;
+        wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
-		wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
-		                     webKitWindow->GetId(),
+        wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
+                             webKitWindow->GetId(),
                              wxStringWithNSString( url ),
                              wxEmptyString);
-		event.SetString(description);
-		event.SetInt(type);
+        event.SetString(description);
+        event.SetInt(type);
 
-		if (webKitWindow && webKitWindow->GetEventHandler())
-			webKitWindow->GetEventHandler()->ProcessEvent(event);
+        if (webKitWindow && webKitWindow->GetEventHandler())
+            webKitWindow->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -1178,11 +1183,11 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+    wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
                          webKitWindow->GetId(),
                          webKitWindow->GetCurrentURL(),
                          target);
-                                   
+
     event.SetString(wxStringWithNSString(title));
 
     if (webKitWindow && webKitWindow->GetEventHandler())
@@ -1210,7 +1215,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), target);
 
@@ -1228,7 +1233,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     }
 }
 
-- (void)webView:(WebView *)sender 
+- (void)webView:(WebView *)sender
       decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
                              request:(NSURLRequest *)request
                         newFrameName:(NSString *)frameName
@@ -1237,7 +1242,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];
-    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                          webKitWindow->GetId(),
                          wxStringWithNSString( url ), "");
 
@@ -1263,7 +1268,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
         }
     }
 
-	return NO;
+    return NO;
 }
 
 + (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
@@ -1275,37 +1280,49 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 - (void)startLoading
 {
     NSURLRequest *request = [self request];
-	NSString* path = [[request URL] absoluteString];
+    NSString* path = [[request URL] absoluteString];
+
+    id<NSURLProtocolClient> client = [self client];
 
     wxString wxpath = wxStringWithNSString(path);
     wxString scheme = wxStringWithNSString([[request URL] scheme]);
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
+
+    if (!file)
+    {
+        NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
+                            code:NSURLErrorFileDoesNotExist
+                            userInfo:nil];
+
+        [client URLProtocol:self didFailWithError:error];
+
+        return;
+    }
+
     size_t length = file->GetStream()->GetLength();
 
 
     NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
-			                   MIMEType:wxNSStringWithWxString(file->GetMimeType())
-			                   expectedContentLength:length 
-			                   textEncodingName:nil];
-    
+                               MIMEType:wxNSStringWithWxString(file->GetMimeType())
+                               expectedContentLength:length
+                               textEncodingName:nil];
+
     //Load the data, we malloc it so it is tidied up properly
     void* buffer = malloc(length);
     file->GetStream()->Read(buffer, length);
     NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
-    
-    id<NSURLProtocolClient> client = [self client];
 
     //We do not support caching anything yet
-	[client URLProtocol:self didReceiveResponse:response 
+    [client URLProtocol:self didReceiveResponse:response
             cacheStoragePolicy:NSURLCacheStorageNotAllowed];
 
     //Set the data
-	[client URLProtocol:self didLoadData:data];
+    [client URLProtocol:self didLoadData:data];
 
-	//Notify that we have finished
-	[client URLProtocolDidFinishLoading:self];
+    //Notify that we have finished
+    [client URLProtocolDidFinishLoading:self];
 
-	[response release];
+    [response release];
 }
 
 - (void)stopLoading
@@ -1315,4 +1332,32 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
 @end
 
+
+@implementation WebViewUIDelegate
+
+- initWithWxWindow: (wxWebViewWebKit*)inWindow
+{
+    [super init];
+    webKitWindow = inWindow;    // non retained
+    return self;
+}
+
+- (void)webView:(WebView *)sender printFrameView:(WebFrameView *)frameView
+{
+    wxUnusedVar(sender);
+    wxUnusedVar(frameView);
+
+    webKitWindow->Print();
+}
+
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element
+                                                 defaultMenuItems:(NSArray *) defaultMenuItems
+{
+    if(webKitWindow->IsContextMenuEnabled())
+        return defaultMenuItems;
+    else
+        return nil;
+}
+@end
+
 #endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
diff --git a/Externals/wxWidgets3/src/osx/window_osx.cpp b/Externals/wxWidgets3/src/osx/window_osx.cpp
index 5021bebb0d..0f8f921aae 100644
--- a/Externals/wxWidgets3/src/osx/window_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/window_osx.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: window_osx.cpp 70765 2012-03-01 15:04:42Z JS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,6 +39,7 @@
 #include "wx/tooltip.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
+#include "wx/weakref.h"
 
 #if wxUSE_LISTCTRL
     #include "wx/listctrl.h"
@@ -301,6 +301,11 @@ wxOSXWidgetImpl* wxWindowMac::GetPeer() const
     return m_peer == kOSXNoWidgetImpl ? NULL : m_peer ; 
 }
 
+bool wxWindowMac::ShouldCreatePeer() const
+{
+    return m_peer != kOSXNoWidgetImpl;
+}
+
 void wxWindowMac::DontCreatePeer()
 {
     m_peer = kOSXNoWidgetImpl;
@@ -345,7 +350,11 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
         GetParent()->MacChildAdded() ;
         
         // adjust font, controlsize etc
-        DoSetWindowVariant( m_windowVariant ) ;
+        GetPeer()->SetControlSize( m_windowVariant );
+        InheritAttributes();
+        // in case nothing has been set, use the variant default fonts
+        if ( !m_hasFont )
+            DoSetWindowVariant( m_windowVariant );
         
         GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
         
@@ -378,7 +387,7 @@ bool wxWindowMac::MacIsUserPane() const
 /*
  * Right now we have the following setup :
  * a border that is not part of the native control is always outside the
- * control's border (otherwise we loose all native intelligence, future ways
+ * control's border (otherwise we lose all native intelligence, future ways
  * may be to have a second embedding control responsible for drawing borders
  * and backgrounds eventually)
  * so all this border calculations have to be taken into account when calling
@@ -407,6 +416,9 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
     m_windowVariant = parent->GetWindowVariant() ;
 
+    m_hScrollBarAlwaysShown =
+    m_vScrollBarAlwaysShown = HasFlag(wxALWAYS_SHOW_SB);
+
     if ( m_peer != kOSXNoWidgetImpl )
     {
         SetPeer(wxWidgetImpl::CreateUserPane( this, parent, id, pos, size , style, GetExtraStyle() ));
@@ -484,39 +496,6 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
         return;
 
     GetPeer()->SetControlSize( variant );
-#if wxOSX_USE_CARBON
-    ControlSize size ;
-
-    // we will get that from the settings later
-    // and make this NORMAL later, but first
-    // we have a few calculations that we must fix
-
-    switch ( variant )
-    {
-        case wxWINDOW_VARIANT_NORMAL :
-            size = kControlSizeNormal;
-            break ;
-
-        case wxWINDOW_VARIANT_SMALL :
-            size = kControlSizeSmall;
-            break ;
-
-        case wxWINDOW_VARIANT_MINI :
-            // not always defined in the headers
-            size = 3 ;
-            break ;
-
-        case wxWINDOW_VARIANT_LARGE :
-            size = kControlSizeLarge;
-            break ;
-
-        default:
-            wxFAIL_MSG(wxT("unexpected window variant"));
-            break ;
-    }
-    GetPeer()->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
-#endif
-
 
     switch ( variant )
     {
@@ -630,6 +609,30 @@ void wxWindowMac::SetFocus()
     GetPeer()->SetFocus() ;
 }
 
+void wxWindowMac::OSXSimulateFocusEvents()
+{
+    wxWeakRef<wxWindow> former = FindFocus() ;
+    if ( former != NULL && former != this )
+    {
+        {
+            wxFocusEvent event( wxEVT_KILL_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            event.SetWindow(this);
+            former->HandleWindowEvent(event) ;
+        }
+
+        // 'former' could have been destroyed by a wxEVT_KILL_FOCUS handler,
+        // so we must test it for non-NULL again
+        if ( former )
+        {
+            wxFocusEvent event(wxEVT_SET_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            event.SetWindow(this);
+            former->HandleWindowEvent(event);
+        }
+    }
+}
+
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;
@@ -655,10 +658,8 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
     delete m_dropTarget;
 
     m_dropTarget = pDropTarget;
-    if ( m_dropTarget != NULL )
-    {
-        // TODO:
-    }
+
+    GetPeer()->SetDropTarget(m_dropTarget) ;
 }
 
 #endif
@@ -877,9 +878,22 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
 #endif
     if (x)
-       *x = ww;
+    {
+        // we shouldn't return invalid width
+        if ( ww < 0 )
+            ww = 0;
+        
+        *x = ww;
+    }
+    
     if (y)
-       *y = hh;
+    {
+        // we shouldn't return invalid height
+        if ( hh < 0 )
+            hh = 0;
+        
+        *y = hh;
+    }
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
@@ -1065,11 +1079,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         if ( doResize )
         {
             MacRepositionScrollBars() ;
-            MacOnInternalSize();
-            wxSize size(actualWidth, actualHeight);
-            wxSizeEvent event(size, m_windowId);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
+            SendSizeEvent();
         }
     }
 }
@@ -1123,6 +1133,12 @@ wxSize wxWindowMac::DoGetBestSize() const
     }
 }
 
+void wxWindowMac::SendSizeEvent(int flags)
+{
+    MacOnInternalSize();
+    wxWindowBase::SendSizeEvent(flags);
+}
+
 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
@@ -1149,10 +1165,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
         if (sizeFlags & wxSIZE_FORCE_EVENT)
         {
-            MacOnInternalSize();
-            wxSizeEvent event( wxSize(width,height), GetId() );
-            event.SetEventObject( this );
-            HandleWindowEvent( event );
+            SendSizeEvent();
         }
 
         return;
@@ -1225,7 +1238,7 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
     }
 }
 
-float wxWindowMac::GetContentScaleFactor() const 
+double wxWindowMac::GetContentScaleFactor() const 
 {
     return GetPeer()->GetContentScaleFactor();
 }
@@ -1311,7 +1324,6 @@ void wxWindowMac::MacHiliteChanged()
 
 void wxWindowMac::MacEnabledStateChanged()
 {
-    OnEnabled( GetPeer()->IsEnabled() );
 }
 
 //
@@ -1392,27 +1404,23 @@ void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 
     if ( !IsShownOnScreen() )
         return ;
+    
+    if ( IsFrozen() )
+        return;
 
     GetPeer()->SetNeedsDisplay( rect ) ;
 }
 
 void wxWindowMac::DoFreeze()
 {
-#if wxOSX_USE_CARBON
     if ( GetPeer() && GetPeer()->IsOk() )
         GetPeer()->SetDrawingEnabled( false ) ;
-#endif
 }
 
 void wxWindowMac::DoThaw()
 {
-#if wxOSX_USE_CARBON
     if ( GetPeer() && GetPeer()->IsOk() )
-    {
         GetPeer()->SetDrawingEnabled( true ) ;
-        GetPeer()->InvalidateWithChildren() ;
-    }
-#endif
 }
 
 wxWindow *wxGetActiveWindow()
@@ -1688,10 +1696,7 @@ void wxWindowMac::DoUpdateScrollbarVisibility()
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {
-        MacOnInternalSize();
-        wxSizeEvent event(GetSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        SendSizeEvent();
     }
 #endif
 }
@@ -1825,6 +1830,8 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
     if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
     {
         wxSetCursorEvent event( pt.x , pt.y );
+        event.SetId(GetId());
+        event.SetEventObject(this);
 
         bool processedEvtSetCursor = HandleWindowEvent(event);
         if ( processedEvtSetCursor && event.HasCursor() )
@@ -2200,7 +2207,8 @@ bool wxWindowMac::MacHasScrollBarCorner() const
             const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
             if ( frame )
             {
-                if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+                // starting from 10.7 there are no resize indicators anymore
+                if ( (frame->GetWindowStyleFlag() & wxRESIZE_BORDER) && UMAGetSystemVersion() < 0x1070)
                 {
                     // Parent frame has resize handle
                     wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
@@ -2531,7 +2539,7 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     int x, y, w, h ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
-    Rect bounds = { y, x, y + h, x + w };
+    Rect bounds = { static_cast<short>(y), static_cast<short>(x), static_cast<short>(y + h), static_cast<short>(x + w) };
 
     return bounds ;
 }
@@ -2541,6 +2549,13 @@ bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )
     return false;
 }
 
+#if wxOSX_USE_COCOA_OR_IPHONE
+void *wxWindowMac::OSXGetViewOrWindow() const
+{
+    return GetHandle();
+}
+#endif
+
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
@@ -2630,20 +2645,18 @@ wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
             unsigned char charCode ;
             UInt32 keyCode ;
             UInt32 modifiers ;
-            Point where ;
             UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
-            GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+            GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
             GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
             GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
-            GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &where );
             
             UInt32 keymessage = (keyCode << 8) + charCode;
             
             wxKeyEvent wxevent(wxEVT_HOTKEY);
             wxevent.SetId(hotKeyId.id);
             wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage , 
-                                        modifiers , when , where.h , where.v , 0 ) ;
+                                        modifiers , when , 0 ) ;
             
             s_hotkeys[i].window->HandleWindowEvent(wxevent);
         }
@@ -2713,7 +2726,7 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
 
 bool wxWindowMac::UnregisterHotKey(int hotkeyId)
 {
-    for ( unsigned i = s_hotkeys.size()-1; i>=0; -- i )
+    for ( int i = ((int)s_hotkeys.size())-1; i>=0; -- i )
     {
         if ( s_hotkeys[i].keyId == hotkeyId )
         {
@@ -2752,13 +2765,13 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
             {
                 wxEvtHandler * const handler = ancestor->GetEventHandler();
 
-                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                wxCommandEvent command_event( wxEVT_MENU, command );
                 handled = handler->ProcessEvent( command_event );
 
                 if ( !handled )
                 {
                     // accelerators can also be used with buttons, try them too
-                    command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+                    command_event.SetEventType(wxEVT_BUTTON);
                     handled = handler->ProcessEvent( command_event );
                 }
 
@@ -2787,6 +2800,10 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 // wxWidgetImpl
 //
 
+// we are maintaining a n:1 map from native controls (ControlRef / NSView*) to their wxWidgetImpl
+// n:1 because we might have an embedded view eg within a scrollview, both being part of the same impl
+// the impl is calling Associate with its newly created native control(s), e.g. in InstallHandler
+
 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;
@@ -2886,3 +2903,7 @@ bool wxWidgetImpl::NeedsFrame() const
 {
     return m_needsFrame;
 }
+
+void wxWidgetImpl::SetDrawingEnabled(bool WXUNUSED(enabled))
+{
+}
diff --git a/Externals/wxWidgets3/src/unix/apptraits.cpp b/Externals/wxWidgets3/src/unix/apptraits.cpp
index e4f7098042..d29f9acdbb 100644
--- a/Externals/wxWidgets3/src/unix/apptraits.cpp
+++ b/Externals/wxWidgets3/src/unix/apptraits.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxGUIAppTraits for Unix systems
 // Author:      Vadim Zeitlin
 // Created:     2008-03-22
-// RCS-ID:      $Id: apptraits.cpp 52742 2008-03-23 18:24:27Z PC $
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,6 +29,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/unix/execute.h"
+#include "wx/evtloop.h"
 
 // ============================================================================
 // implementation
@@ -37,47 +37,15 @@
 
 int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
 {
-    const int flags = execData.flags;
-    if ( !(flags & wxEXEC_SYNC) || (flags & wxEXEC_NOEVENTS) )
-    {
-        // async or blocking sync cases are already handled by the base class
-        // just fine, no need to duplicate its code here
-        return wxAppTraits::WaitForChild(execData);
-    }
-
-    // here we're dealing with the case of synchronous execution when we want
-    // to process the GUI events while waiting for the child termination
-
-    wxEndProcessData endProcData;
-    endProcData.pid = execData.pid;
-    endProcData.tag = AddProcessCallback
-                      (
-                         &endProcData,
-                         execData.GetEndProcReadFD()
-                      );
-    endProcData.async = false;
-
-
     // prepare to wait for the child termination: show to the user that we're
     // busy and refuse all input unless explicitly told otherwise
     wxBusyCursor bc;
-    wxWindowDisabler wd(!(flags & wxEXEC_NODISABLE));
+    wxWindowDisabler wd(!(execData.flags & wxEXEC_NODISABLE));
 
-    // endProcData.pid will be set to 0 from wxHandleProcessTermination() when
-    // the process terminates
-    while ( endProcData.pid != 0 )
-    {
-        // don't consume 100% of the CPU while we're sitting in this
-        // loop
-        if ( !CheckForRedirectedIO(execData) )
-            wxMilliSleep(1);
-
-        // give the toolkit a chance to call wxHandleProcessTermination() here
-        // and also repaint the GUI and handle other accumulated events
-        wxYield();
-    }
-
-    return endProcData.exitcode;
+    // Allocate an event loop that will be used to wait for the process
+    // to terminate, will handle stdout, stderr, and any other events and pass
+    // it to the common (to console and GUI) code which will run it.
+    wxGUIEventLoop loop;
+    return RunLoopUntilChildExit(execData, loop);
 }
 
-
diff --git a/Externals/wxWidgets3/src/unix/appunix.cpp b/Externals/wxWidgets3/src/unix/appunix.cpp
index 5c6f8e5e00..62f0c79ec9 100644
--- a/Externals/wxWidgets3/src/unix/appunix.cpp
+++ b/Externals/wxWidgets3/src/unix/appunix.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxAppConsole with wxMainLoop implementation
 // Author:      Lukasz Michalski
 // Created:     28/01/2005
-// RCS-ID:      $Id: appunix.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Lukasz Michalski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,6 +19,10 @@
 #endif
 
 #include "wx/evtloop.h"
+#include "wx/scopedptr.h"
+#include "wx/unix/private/wakeuppipe.h"
+#include "wx/private/fdiodispatcher.h"
+#include "wx/private/fdioeventloopsourcehandler.h"
 
 #include <signal.h>
 #include <unistd.h>
@@ -29,6 +32,58 @@
     #define SA_RESTART 0
 #endif
 
+// ----------------------------------------------------------------------------
+// Helper class calling CheckSignal() on wake up
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+class SignalsWakeUpPipe : public wxWakeUpPipe
+{
+public:
+    // Ctor automatically registers this pipe with the event loop.
+    SignalsWakeUpPipe()
+    {
+        m_source = wxEventLoopBase::AddSourceForFD
+                                    (
+                                        GetReadFd(),
+                                        this,
+                                        wxEVENT_SOURCE_INPUT
+                                    );
+    }
+
+    virtual void OnReadWaiting()
+    {
+        // The base class wxWakeUpPipe::OnReadWaiting() needs to be called in order
+        // to read the data out of the wake up pipe and clear it for next time.
+        wxWakeUpPipe::OnReadWaiting();
+
+        if ( wxTheApp )
+            wxTheApp->CheckSignal();
+    }
+
+    virtual ~SignalsWakeUpPipe()
+    {
+        delete m_source;
+    }
+
+private:
+    wxEventLoopSource* m_source;
+};
+
+} // anonymous namespace
+
+wxAppConsole::wxAppConsole()
+{
+    m_signalWakeUpPipe = NULL;
+}
+
+wxAppConsole::~wxAppConsole()
+{
+    delete m_signalWakeUpPipe;
+}
+
 // use unusual names for arg[cv] to avoid clashes with wxApp members with the
 // same names
 bool wxAppConsole::Initialize(int& argc_, wxChar** argv_)
@@ -41,14 +96,23 @@ bool wxAppConsole::Initialize(int& argc_, wxChar** argv_)
     return true;
 }
 
+// The actual signal handler. It does as little as possible (because very few
+// things are safe to do from inside a signal handler) and just ensures that
+// CheckSignal() will be called later from SignalsWakeUpPipe::OnReadWaiting().
 void wxAppConsole::HandleSignal(int signal)
 {
     wxAppConsole * const app = wxTheApp;
     if ( !app )
         return;
 
+    // Register the signal that is caught.
     sigaddset(&(app->m_signalsCaught), signal);
-    app->WakeUpIdle();
+
+    // Wake up the application for handling the signal.
+    //
+    // Notice that we must have a valid wake up pipe here as we only install
+    // our signal handlers after allocating it.
+    app->m_signalWakeUpPipe->WakeUpNoLock();
 }
 
 void wxAppConsole::CheckSignal()
@@ -66,6 +130,27 @@ void wxAppConsole::CheckSignal()
     }
 }
 
+wxFDIOHandler* wxAppConsole::RegisterSignalWakeUpPipe(wxFDIODispatcher& dispatcher)
+{
+    wxCHECK_MSG( m_signalWakeUpPipe, NULL, "Should be allocated" );
+
+    // we need a bridge to wxFDIODispatcher
+    //
+    // TODO: refactor the code so that only wxEventLoopSourceHandler is used
+    wxScopedPtr<wxFDIOHandler>
+        fdioHandler(new wxFDIOEventLoopSourceHandler(m_signalWakeUpPipe));
+
+    if ( !dispatcher.RegisterFD
+                     (
+                      m_signalWakeUpPipe->GetReadFd(),
+                      fdioHandler.get(),
+                      wxFDIO_INPUT
+                     ) )
+        return NULL;
+
+    return fdioHandler.release();
+}
+
 // the type of the signal handlers we use is "void(*)(int)" while the real
 // signal handlers are extern "C" and so have incompatible type and at least
 // Sun CC warns about it, so use explicit casts to suppress these warnings as
@@ -80,6 +165,13 @@ bool wxAppConsole::SetSignalHandler(int signal, SignalHandler handler)
     const bool install = (SignalHandler_t)handler != SIG_DFL &&
                          (SignalHandler_t)handler != SIG_IGN;
 
+    if ( !m_signalWakeUpPipe )
+    {
+        // Create the pipe that the signal handler will use to cause the event
+        // loop to call wxAppConsole::CheckSignal().
+        m_signalWakeUpPipe = new SignalsWakeUpPipe();
+    }
+
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = (SignalHandler_t)&wxAppConsole::HandleSignal;
diff --git a/Externals/wxWidgets3/src/unix/descrip.mms b/Externals/wxWidgets3/src/unix/descrip.mms
index 21d2bf97bf..5ca84694c0 100644
--- a/Externals/wxWidgets3/src/unix/descrip.mms
+++ b/Externals/wxWidgets3/src/unix/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 7 January 2011                                                      *
+# Date : 20 August 2013                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -62,7 +62,7 @@ OBJECTS = appunix.obj,apptraits.obj,\
 		stdpaths.obj,\
 		taskbarx11.obj,\
 		timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj,\
-		mediactrl.obj
+		mediactrl.obj,wakeuppipe.obj
 
 SOURCES = appunix.cpp,apptraits.cpp,\
 		dialup.cpp,\
@@ -83,7 +83,7 @@ SOURCES = appunix.cpp,apptraits.cpp,\
 		stdpaths.cpp,\
 		taskbarx11.cpp,\
 		timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp,\
-		mediactrl.cpp
+		mediactrl.cpp,wakeuppipe.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -132,3 +132,4 @@ evtloopunix.obj : evtloopunix.cpp
 fdiounix.obj : fdiounix.cpp
 uiactionx11.obj : uiactionx11.cpp
 mediactrl.obj : mediactrl.cpp
+wakeuppipe.obj : wakeuppipe.cpp
diff --git a/Externals/wxWidgets3/src/unix/dialup.cpp b/Externals/wxWidgets3/src/unix/dialup.cpp
index aa3193f0b7..95d37b22ef 100644
--- a/Externals/wxWidgets3/src/unix/dialup.cpp
+++ b/Externals/wxWidgets3/src/unix/dialup.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballüder
 // Modified by:
 // Created:     03.10.99
-// RCS-ID:      $Id: dialup.cpp 69910 2011-12-02 12:04:42Z VZ $
 // Copyright:   (c) Karsten Ballüder
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,7 +35,6 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
-#define __STRICT_ANSI__
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/Externals/wxWidgets3/src/unix/dir.cpp b/Externals/wxWidgets3/src/unix/dir.cpp
index 27d2765f68..f88a594935 100644
--- a/Externals/wxWidgets3/src/unix/dir.cpp
+++ b/Externals/wxWidgets3/src/unix/dir.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id: dir.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,6 +30,7 @@
 
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxMatchWild
+#include "wx/filename.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -149,13 +149,20 @@ bool wxDirData::Read(wxString *filename)
             break;
         }
 
-        // check the type now
-        if ( !(m_flags & wxDIR_FILES) && !wxDir::Exists(path + de_d_name) )
+        // check the type now: notice that we may want to check the type of
+        // the path itself and not whatever it points to in case of a symlink
+        wxFileName fn = wxFileName::DirName(path + de_d_name);
+        if ( m_flags & wxDIR_NO_FOLLOW )
+        {
+            fn.DontFollowLink();
+        }
+
+        if ( !(m_flags & wxDIR_FILES) && !fn.DirExists() )
         {
             // it's a file, but we don't want them
             continue;
         }
-        else if ( !(m_flags & wxDIR_DIRS) && wxDir::Exists(path + de_d_name) )
+        else if ( !(m_flags & wxDIR_DIRS) && fn.DirExists() )
         {
             // it's a dir, and we don't want it
             continue;
@@ -235,19 +242,26 @@ wxString wxDir::GetName() const
     if ( m_data )
     {
         name = M_DIR->GetName();
-        if ( !name.empty() && (name.Last() == wxT('/')) )
+
+        // Notice that we need to check for length > 1 as we shouldn't remove
+        // the last slash from the root directory!
+        if ( name.length() > 1 && (name.Last() == wxT('/')) )
         {
-            // chop off the last (back)slash
-            name.Truncate(name.length() - 1);
+            // chop off the last slash
+            name.RemoveLast();
         }
     }
 
     return name;
 }
 
-wxDir::~wxDir()
+void wxDir::Close()
 {
-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/unix/displayx11.cpp b/Externals/wxWidgets3/src/unix/displayx11.cpp
index b2826775ed..51f1335d19 100644
--- a/Externals/wxWidgets3/src/unix/displayx11.cpp
+++ b/Externals/wxWidgets3/src/unix/displayx11.cpp
@@ -4,7 +4,6 @@
 // Author:      Brian Victor, Vadim Zeitlin
 // Modified by:
 // Created:     12/05/02
-// RCS-ID:      $Id: displayx11.cpp 64388 2010-05-23 16:31:33Z PC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -232,14 +231,14 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
 // Correct res rate from GLFW
 #define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f)
 #define wxCRR(v) wxCRR2(v,v.dotclock)
-#define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc))
-#define wxCVM(v) wxCVM2(v, v.dotclock)
+#define wxCVM2(v, dc, display, nScreen) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth(display, nScreen), wxCRR2(v,dc))
+#define wxCVM(v, display, nScreen) wxCVM2(v, v.dotclock, display, nScreen)
 
 wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
 {
     //Convenience...
-    Display* pDisplay = (Display*) wxGetDisplay(); //default display
-    int nScreen = DefaultScreen(pDisplay); //default screen of (default) display...
+    Display* display = (Display*) wxGetDisplay(); //default display
+    int nScreen = DefaultScreen(display); //default screen of (default) display...
 
     //Some variables..
     XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
@@ -247,16 +246,17 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
 
     wxArrayVideoModes Modes; //modes to return...
 
-    if (XF86VidModeGetAllModeLines(pDisplay, nScreen, &nNumModes, &ppXModes) == TRUE)
+    if (XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
     {
         for (int i = 0; i < nNumModes; ++i)
         {
-            if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode...
-                mode.Matches(wxCVM((*ppXModes[i]))) ) //...?
+            XF86VidModeModeInfo& info = *ppXModes[i];
+            const wxVideoMode vm = wxCVM(info, display, nScreen);
+            if (vm.Matches(mode))
             {
-                Modes.Add(wxCVM((*ppXModes[i])));
+                Modes.Add(vm);
             }
-            wxClearXVM((*ppXModes[i]));
+            wxClearXVM(info);
         //  XFree(ppXModes[i]); //supposed to free?
         }
         XFree(ppXModes);
@@ -271,20 +271,23 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
 
 wxVideoMode wxDisplayImplX11::GetCurrentMode() const
 {
+  Display* display = static_cast<Display*>(wxGetDisplay());
+  int nScreen = DefaultScreen(display);
   XF86VidModeModeLine VM;
   int nDotClock;
-  XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
-                         &nDotClock, &VM);
+  XF86VidModeGetModeLine(display, nScreen, &nDotClock, &VM);
   wxClearXVM(VM);
-  return wxCVM2(VM, nDotClock);
+  return wxCVM2(VM, nDotClock, display, nScreen);
 }
 
 bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
 {
+    Display* display = static_cast<Display*>(wxGetDisplay());
+    int nScreen = DefaultScreen(display);
     XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
     int nNumModes; //Number of modes enumerated....
 
-    if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
+    if(!XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
     {
         wxLogSysError(_("Failed to change video mode"));
         return false;
@@ -293,8 +296,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
     bool bRet = false;
     if (mode == wxDefaultVideoMode)
     {
-        bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
-                     ppXModes[0]) == TRUE;
+        bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[0]) != 0;
 
         for (int i = 0; i < nNumModes; ++i)
         {
@@ -312,8 +314,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
                 wxCRR((*ppXModes[i])) == mode.GetRefresh())
             {
                 //switch!
-                bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
-                         ppXModes[i]) == TRUE;
+                bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[i]) != 0;
             }
             wxClearXVM((*ppXModes[i]));
         //  XFree(ppXModes[i]); //supposed to free?
@@ -325,7 +326,6 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
     return bRet;
 }
 
-
 #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
 
 wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
@@ -340,7 +340,7 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
             wxVideoMode mode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]);
             if ( mode.Matches(modeMatch) )
             {
-                modes.Add(modeMatch);
+                modes.Add(mode);
             }
         }
 
@@ -382,7 +382,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 
 #include "wx/utils.h"
 
-#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 || !defined(GDK_WINDOWING_X11)
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
@@ -424,6 +424,8 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
     Display * const dpy = wxGetX11Display();
     wxCHECK_RET( dpy, wxT("can't be called before initializing the GUI") );
 
+    wxRect rectClient;
+
     const Atom atomWorkArea = XInternAtom(dpy, "_NET_WORKAREA", True);
     if ( atomWorkArea )
     {
@@ -459,29 +461,46 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
                         numItems != 4 )
             {
                 wxLogDebug(wxT("XGetWindowProperty(\"_NET_WORKAREA\") failed"));
-                return;
             }
-
-            if ( x )
-                *x = workareas[0];
-            if ( y )
-                *y = workareas[1];
-            if ( width )
-                *width = workareas[2];
-            if ( height )
-                *height = workareas[3];
-
-            return;
+            else
+            {
+                rectClient = wxRect(workareas[0], workareas[1],
+                                    workareas[2], workareas[3]);
+            }
         }
     }
 
-    // if we get here, _NET_WORKAREA is not supported so return the entire
-    // screen size as fall back
-    if (x)
-        *x = 0;
-    if (y)
-        *y = 0;
-    wxDisplaySize(width, height);
+    // Although _NET_WORKAREA is supposed to return the client size of the
+    // screen, not all implementations are conforming, apparently, see #14419,
+    // so make sure we return a subset of the primary display.
+    wxRect rectFull;
+#if wxUSE_DISPLAY
+    ScreensInfo screens;
+    const ScreenInfo& info = screens[0];
+    rectFull = wxRect(info.x_org, info.y_org, info.width, info.height);
+#else
+    wxDisplaySize(&rectFull.width, &rectFull.height);
+#endif
+
+    if ( !rectClient.width || !rectClient.height )
+    {
+        // _NET_WORKAREA not available or didn't work, fall back to the total
+        // display size.
+        rectClient = rectFull;
+    }
+    else
+    {
+        rectClient = rectClient.Intersect(rectFull);
+    }
+
+    if ( x )
+        *x = rectClient.x;
+    if ( y )
+        *y = rectClient.y;
+    if ( width )
+        *width = rectClient.width;
+    if ( height )
+        *height = rectClient.height;
 }
 
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
diff --git a/Externals/wxWidgets3/src/unix/dlunix.cpp b/Externals/wxWidgets3/src/unix/dlunix.cpp
index cb4e6737ab..74c2277321 100644
--- a/Externals/wxWidgets3/src/unix/dlunix.cpp
+++ b/Externals/wxWidgets3/src/unix/dlunix.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-16 (extracted from common/dynlib.cpp)
-// RCS-ID:      $Id: dlunix.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2000-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,180 +64,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
-// standard shared libraries extensions for different Unix versions
-#if defined(__HPUX__)
-    const wxString wxDynamicLibrary::ms_dllext(".sl");
-#elif defined(__DARWIN__)
-    const wxString wxDynamicLibrary::ms_dllext(".bundle");
-#else
-    const wxString wxDynamicLibrary::ms_dllext(".so");
-#endif
-
-// ============================================================================
-// wxDynamicLibrary implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// dlxxx() emulation for Darwin
-// Only useful if the OS X version could be < 10.3 at runtime
-// ----------------------------------------------------------------------------
-
-#if defined(__DARWIN__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3)
-// ---------------------------------------------------------------------------
-// For Darwin/Mac OS X
-//   supply the sun style dlopen functions in terms of Darwin NS*
-// ---------------------------------------------------------------------------
-
-/* Porting notes:
- *   The dlopen port is a port from dl_next.xs by Anno Siegel.
- *   dl_next.xs is itself a port from dl_dlopen.xs by Paul Marquess.
- *   The method used here is just to supply the sun style dlopen etc.
- *   functions in terms of Darwin NS*.
- */
-
-#include <stdio.h>
-#include <mach-o/dyld.h>
-
-static char dl_last_error[1024];
-
-static const char *wx_darwin_dlerror()
-{
-    return dl_last_error;
-}
-
-static void *wx_darwin_dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
-{
-    NSObjectFileImage ofile;
-    NSModule handle = NULL;
-
-    unsigned dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
-    if ( dyld_result != NSObjectFileImageSuccess )
-    {
-        handle = NULL;
-
-        static const char *const errorStrings[] =
-        {
-            "%d: Object Image Load Failure",
-            "%d: Object Image Load Success",
-            "%d: Not an recognisable object file",
-            "%d: No valid architecture",
-            "%d: Object image has an invalid format",
-            "%d: Invalid access (permissions?)",
-            "%d: Unknown error code from NSCreateObjectFileImageFromFile"
-        };
-
-        const int index = dyld_result < WXSIZEOF(errorStrings)
-                            ? dyld_result
-                            : WXSIZEOF(errorStrings) - 1;
-
-        // this call to sprintf() is safe as strings above are fixed at
-        // compile-time and are shorter than WXSIZEOF(dl_last_error)
-        sprintf(dl_last_error, errorStrings[index], dyld_result);
-    }
-    else
-    {
-        handle = NSLinkModule
-                 (
-                    ofile,
-                    path,
-                    NSLINKMODULE_OPTION_BINDNOW |
-                    NSLINKMODULE_OPTION_RETURN_ON_ERROR
-                 );
-
-        if ( !handle )
-        {
-            NSLinkEditErrors err;
-            int code;
-            const char *filename;
-            const char *errmsg;
-
-            NSLinkEditError(&err, &code, &filename, &errmsg);
-            strncpy(dl_last_error, errmsg, WXSIZEOF(dl_last_error)-1);
-            dl_last_error[WXSIZEOF(dl_last_error)-1] = '\0';
-        }
-    }
-
-
-    return handle;
-}
-
-static int wx_darwin_dlclose(void *handle)
-{
-    NSUnLinkModule((NSModule)handle, NSUNLINKMODULE_OPTION_NONE);
-    return 0;
-}
-
-static void *wx_darwin_dlsym(void *handle, const char *symbol)
-{
-    // as on many other systems, C symbols have prepended underscores under
-    // Darwin but unlike the normal dlopen(), NSLookupSymbolInModule() is not
-    // aware of this
-    wxCharBuffer buf(strlen(symbol) + 1);
-    char *p = buf.data();
-    p[0] = '_';
-    strcpy(p + 1, symbol);
-
-    NSSymbol nsSymbol = NSLookupSymbolInModule((NSModule)handle, p );
-    return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
-}
-
-// Add the weak linking attribute to dlopen's declaration
-extern void * dlopen(const char * __path, int __mode) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER;
-
-// For all of these methods we test dlopen since all of the dl functions we use were added
-// to OS X at the same time.  This also ensures we don't dlopen with the real function then
-// dlclose with the internal implementation.
-
-static inline void *wx_dlopen(const char *__path, int __mode)
-{
-#ifdef HAVE_DLOPEN
-    if(&dlopen != NULL)
-        return dlopen(__path, __mode);
-    else
-#endif
-        return wx_darwin_dlopen(__path, __mode);
-}
-
-static inline int wx_dlclose(void *__handle)
-{
-#ifdef HAVE_DLOPEN
-    if(&dlopen != NULL)
-        return dlclose(__handle);
-    else
-#endif
-        return wx_darwin_dlclose(__handle);
-}
-
-static inline const char *wx_dlerror()
-{
-#ifdef HAVE_DLOPEN
-    if(&dlopen != NULL)
-        return dlerror();
-    else
-#endif
-        return wx_darwin_dlerror();
-}
-
-static inline void *wx_dlsym(void *__handle, const char *__symbol)
-{
-#ifdef HAVE_DLOPEN
-    if(&dlopen != NULL)
-        return dlsym(__handle, __symbol);
-    else
-#endif
-        return wx_darwin_dlsym(__handle, __symbol);
-}
-
-#else // __DARWIN__/!__DARWIN__
-
-// Use preprocessor definitions for non-Darwin or OS X >= 10.3
-#define wx_dlopen(__path,__mode) dlopen(__path,__mode)
-#define wx_dlclose(__handle) dlclose(__handle)
-#define wx_dlerror() dlerror()
-#define wx_dlsym(__handle,__symbol) dlsym(__handle,__symbol)
-
-#endif // defined(__DARWIN__)
-
 // ----------------------------------------------------------------------------
 // loading/unloading DLLs
 // ----------------------------------------------------------------------------
@@ -246,7 +71,7 @@ static inline void *wx_dlsym(void *__handle, const char *__symbol)
 wxDllType wxDynamicLibrary::GetProgramHandle()
 {
 #ifdef USE_POSIX_DL_FUNCS
-   return wx_dlopen(0, RTLD_LAZY);
+   return dlopen(0, RTLD_LAZY);
 #else
    return PROG_HANDLE;
 #endif
@@ -267,7 +92,7 @@ wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
     if ( flags & wxDL_GLOBAL )
         rtldFlags |= RTLD_GLOBAL;
 
-    return wx_dlopen(libname.fn_str(), rtldFlags);
+    return dlopen(libname.fn_str(), rtldFlags);
 #else // !USE_POSIX_DL_FUNCS
     int shlFlags = 0;
 
@@ -292,7 +117,7 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 #endif
 
 #ifdef USE_POSIX_DL_FUNCS
-    wx_dlclose(handle);
+    dlclose(handle);
 #else // !USE_POSIX_DL_FUNCS
     shl_unload(handle);
 #endif // USE_POSIX_DL_FUNCS/!USE_POSIX_DL_FUNCS
@@ -309,7 +134,7 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
     void *symbol;
 
 #ifdef USE_POSIX_DL_FUNCS
-    symbol = wx_dlsym(handle, name.fn_str());
+    symbol = dlsym(handle, name.fn_str());
 #else // !USE_POSIX_DL_FUNCS
     // note that shl_findsym modifies the handle argument to indicate where the
     // symbol was found, but it's ok to modify the local handle copy here
@@ -329,7 +154,7 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 /* static */
 void wxDynamicLibrary::Error()
 {
-    wxString err(wx_dlerror());
+    wxString err(dlerror());
 
     if ( err.empty() )
         err = _("Unknown dynamic library error");
diff --git a/Externals/wxWidgets3/src/unix/epolldispatcher.cpp b/Externals/wxWidgets3/src/unix/epolldispatcher.cpp
index 15aaf8a2df..1efc707d00 100644
--- a/Externals/wxWidgets3/src/unix/epolldispatcher.cpp
+++ b/Externals/wxWidgets3/src/unix/epolldispatcher.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements dispatcher for epoll_wait() call
 // Author:      Lukasz Michalski
 // Created:     April 2007
-// RCS-ID:      $Id: epolldispatcher.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 Lukasz Michalski
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/evtloopunix.cpp b/Externals/wxWidgets3/src/unix/evtloopunix.cpp
index dc76b3c418..daeac691d1 100644
--- a/Externals/wxWidgets3/src/unix/evtloopunix.cpp
+++ b/Externals/wxWidgets3/src/unix/evtloopunix.cpp
@@ -3,8 +3,9 @@
 // Purpose:     wxEventLoop implementation
 // Author:      Lukasz Michalski (lm@zork.pl)
 // Created:     2007-05-07
-// RCS-ID:      $Id: evtloopunix.cpp 65992 2010-11-02 11:57:19Z VZ $
 // Copyright:   (c) 2006 Zork Lukasz Michalski
+//              (c) 2009, 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+//              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -28,124 +29,22 @@
     #include "wx/log.h"
 #endif
 
-#include <errno.h>
 #include "wx/apptrait.h"
 #include "wx/scopedptr.h"
 #include "wx/thread.h"
 #include "wx/module.h"
-#include "wx/unix/pipe.h"
 #include "wx/unix/private/timer.h"
 #include "wx/unix/private/epolldispatcher.h"
+#include "wx/unix/private/wakeuppipe.h"
 #include "wx/private/selectdispatcher.h"
+#include "wx/private/eventloopsourcesmanager.h"
+#include "wx/private/fdioeventloopsourcehandler.h"
+#include "wx/private/eventloopsourcesmanager.h"
 
 #if wxUSE_EVENTLOOP_SOURCE
     #include "wx/evtloopsrc.h"
 #endif // wxUSE_EVENTLOOP_SOURCE
 
-#define TRACE_EVENTS wxT("events")
-
-// ===========================================================================
-// wxEventLoop::PipeIOHandler implementation
-// ===========================================================================
-
-namespace wxPrivate
-{
-
-// pipe used for wake up messages: when a child thread wants to wake up
-// the event loop in the main thread it writes to this pipe
-class PipeIOHandler : public wxFDIOHandler
-{
-public:
-    // default ctor does nothing, call Create() to really initialize the
-    // object
-    PipeIOHandler() { }
-
-    bool Create();
-
-    // this method can be, and normally is, called from another thread
-    void WakeUp();
-
-    int GetReadFd() { return m_pipe[wxPipe::Read]; }
-
-    // implement wxFDIOHandler pure virtual methods
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting() { }
-    virtual void OnExceptionWaiting() { }
-
-private:
-    wxPipe m_pipe;
-};
-
-// ----------------------------------------------------------------------------
-// initialization
-// ----------------------------------------------------------------------------
-
-bool PipeIOHandler::Create()
-{
-    if ( !m_pipe.Create() )
-    {
-        wxLogError(_("Failed to create wake up pipe used by event loop."));
-        return false;
-    }
-
-    if ( !m_pipe.MakeNonBlocking(wxPipe::Read) )
-    {
-        wxLogSysError(_("Failed to switch wake up pipe to non-blocking mode"));
-        return false;
-    }
-
-    wxLogTrace(TRACE_EVENTS, wxT("Wake up pipe (%d, %d) created"),
-               m_pipe[wxPipe::Read], m_pipe[wxPipe::Write]);
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wakeup handling
-// ----------------------------------------------------------------------------
-
-void PipeIOHandler::WakeUp()
-{
-    if ( write(m_pipe[wxPipe::Write], "s", 1) != 1 )
-    {
-        // don't use wxLog here, we can be in another thread and this could
-        // result in dead locks
-        perror("write(wake up pipe)");
-    }
-}
-
-void PipeIOHandler::OnReadWaiting()
-{
-    // got wakeup from child thread: read all data available in pipe just to
-    // make it empty (even though we write one byte at a time from WakeUp(),
-    // it could have been called several times)
-    char buf[4];
-    for ( ;; )
-    {
-        const int size = read(GetReadFd(), buf, WXSIZEOF(buf));
-
-        if ( size == 0 || (size == -1 && (errno == EAGAIN || errno == EINTR)) )
-        {
-            // nothing left in the pipe (EAGAIN is expected for an FD with
-            // O_NONBLOCK)
-            break;
-        }
-
-        if ( size == -1 )
-        {
-            wxLogSysError(_("Failed to read from wake-up pipe"));
-
-            break;
-        }
-    }
-
-    // writing to the wake up pipe will make wxConsoleEventLoop return from
-    // wxFDIODispatcher::Dispatch() it might be currently blocking in, nothing
-    // else needs to be done
-}
-
-} // namespace wxPrivate
-
 // ===========================================================================
 // wxEventLoop implementation
 // ===========================================================================
@@ -156,34 +55,44 @@ void PipeIOHandler::OnReadWaiting()
 
 wxConsoleEventLoop::wxConsoleEventLoop()
 {
-    m_wakeupPipe = new wxPrivate::PipeIOHandler();
-    if ( !m_wakeupPipe->Create() )
-    {
-        wxDELETE(m_wakeupPipe);
-        m_dispatcher = NULL;
-        return;
-    }
+    // Be pessimistic initially and assume that we failed to initialize.
+    m_dispatcher = NULL;
+    m_wakeupPipe = NULL;
+    m_wakeupSource = NULL;
 
+    // Create the pipe.
+    wxScopedPtr<wxWakeUpPipeMT> wakeupPipe(new wxWakeUpPipeMT);
+    const int pipeFD = wakeupPipe->GetReadFd();
+    if ( pipeFD == wxPipe::INVALID_FD )
+        return;
+
+    // And start monitoring it in our event loop.
+    m_wakeupSource = wxEventLoopBase::AddSourceForFD
+                                      (
+                                        pipeFD,
+                                        wakeupPipe.get(),
+                                        wxFDIO_INPUT
+                                      );
+
+    if ( !m_wakeupSource )
+        return;
+
+    // This is a bit ugly but we know that AddSourceForFD() used the currently
+    // active dispatcher to register this source, so use the same one for our
+    // other operations. Of course, currently the dispatcher returned by
+    // wxFDIODispatcher::Get() is always the same one anyhow so it doesn't
+    // really matter, but if we started returning different things later, it
+    // would.
     m_dispatcher = wxFDIODispatcher::Get();
-    if ( !m_dispatcher )
-        return;
 
-    m_dispatcher->RegisterFD
-                  (
-                    m_wakeupPipe->GetReadFd(),
-                    m_wakeupPipe,
-                    wxFDIO_INPUT
-                  );
+    m_wakeupPipe = wakeupPipe.release();
 }
 
 wxConsoleEventLoop::~wxConsoleEventLoop()
 {
     if ( m_wakeupPipe )
     {
-        if ( m_dispatcher )
-        {
-            m_dispatcher->UnregisterFD(m_wakeupPipe->GetReadFd());
-        }
+        delete m_wakeupSource;
 
         delete m_wakeupPipe;
     }
@@ -195,54 +104,37 @@ wxConsoleEventLoop::~wxConsoleEventLoop()
 
 #if wxUSE_EVENTLOOP_SOURCE
 
-// This class is a temporary bridge between event loop sources and
-// FDIODispatcher. It is going to be removed soon, when all subject interfaces
-// are modified
-class wxFDIOEventLoopSourceHandler : public wxFDIOHandler
+class wxConsoleEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
 {
 public:
-    wxFDIOEventLoopSourceHandler(wxEventLoopSourceHandler* handler) :
-        m_impl(handler) { }
-
-    virtual void OnReadWaiting()
+    wxEventLoopSource* AddSourceForFD( int fd,
+                                       wxEventLoopSourceHandler *handler,
+                                       int flags)
     {
-        m_impl->OnReadWaiting();
-    }
-    virtual void OnWriteWaiting()
-    {
-        m_impl->OnWriteWaiting();
-    }
+        wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
 
-    virtual void OnExceptionWaiting()
-    {
-        m_impl->OnExceptionWaiting();
-    }
+        wxLogTrace(wxTRACE_EVT_SOURCE,
+                    "Adding event loop source for fd=%d", fd);
 
-protected:
-    wxEventLoopSourceHandler* m_impl;
+        // we need a bridge to wxFDIODispatcher
+        //
+        // TODO: refactor the code so that only wxEventLoopSourceHandler is used
+        wxScopedPtr<wxFDIOHandler>
+            fdioHandler(new wxFDIOEventLoopSourceHandler(handler));
+
+        if ( !wxFDIODispatcher::Get()->RegisterFD(fd, fdioHandler.get(), flags) )
+            return NULL;
+
+        return new wxUnixEventLoopSource(wxFDIODispatcher::Get(), fdioHandler.release(),
+                                         fd, handler, flags);
+    }
 };
 
-wxEventLoopSource *
-wxConsoleEventLoop::AddSourceForFD(int fd,
-                                   wxEventLoopSourceHandler *handler,
-                                   int flags)
+wxEventLoopSourcesManagerBase* wxAppTraits::GetEventLoopSourcesManager()
 {
-    wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
+    static wxConsoleEventLoopSourcesManager s_eventLoopSourcesManager;
 
-    wxLogTrace(wxTRACE_EVT_SOURCE,
-                "Adding event loop source for fd=%d", fd);
-
-    // we need a bridge to wxFDIODispatcher
-    //
-    // TODO: refactor the code so that only wxEventLoopSourceHandler is used
-    wxScopedPtr<wxFDIOHandler>
-        fdioHandler(new wxFDIOEventLoopSourceHandler(handler));
-
-    if ( !m_dispatcher->RegisterFD(fd, fdioHandler.get(), flags) )
-        return NULL;
-
-    return new wxUnixEventLoopSource(m_dispatcher, fdioHandler.release(),
-                                     fd, handler, flags);
+    return &s_eventLoopSourcesManager;
 }
 
 wxUnixEventLoopSource::~wxUnixEventLoopSource()
diff --git a/Externals/wxWidgets3/src/unix/fdiounix.cpp b/Externals/wxWidgets3/src/unix/fdiounix.cpp
index d149105f49..766316d6fe 100644
--- a/Externals/wxWidgets3/src/unix/fdiounix.cpp
+++ b/Externals/wxWidgets3/src/unix/fdiounix.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxFDIOManager implementation for console Unix applications
 // Author:      Vadim Zeitlin
 // Created:     2009-08-17
-// RCS-ID:      $Id: fdiounix.cpp 62187 2009-09-28 15:35:48Z PC $
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/fontenum.cpp b/Externals/wxWidgets3/src/unix/fontenum.cpp
index 07abe2b9a8..cc7ee1dad4 100644
--- a/Externals/wxWidgets3/src/unix/fontenum.cpp
+++ b/Externals/wxWidgets3/src/unix/fontenum.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.10.99
-// RCS-ID:      $Id: fontenum.cpp 58909 2009-02-15 12:48:31Z FM $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/fontutil.cpp b/Externals/wxWidgets3/src/unix/fontutil.cpp
index 140a07e92b..4eecb5009a 100644
--- a/Externals/wxWidgets3/src/unix/fontutil.cpp
+++ b/Externals/wxWidgets3/src/unix/fontutil.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id: fontutil.cpp 70740 2012-02-28 18:06:22Z PC $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,12 +28,12 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/font.h" // wxFont enums
-    #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/utils.h"       // for wxGetDisplay()
     #include "wx/module.h"
 #endif // PCH
 
+#include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
@@ -64,14 +63,24 @@
 void wxNativeFontInfo::Init()
 {
     description = NULL;
+    m_underlined = false;
+    m_strikethrough = false;
 }
 
 void wxNativeFontInfo::Init(const wxNativeFontInfo& info)
 {
     if (info.description)
+    {
         description = pango_font_description_copy(info.description);
+        m_underlined = info.GetUnderlined();
+        m_strikethrough = info.GetStrikethrough();
+    }
     else
+    {
         description = NULL;
+        m_underlined = false;
+        m_strikethrough = false;
+    }
 }
 
 void wxNativeFontInfo::Free()
@@ -130,12 +139,12 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
 
 bool wxNativeFontInfo::GetUnderlined() const
 {
-    return false;
+    return m_underlined;
 }
 
 bool wxNativeFontInfo::GetStrikethrough() const
 {
-    return false;
+    return m_strikethrough;
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
@@ -262,16 +271,18 @@ void wxNativeFontInfo::SetWeight(wxFontWeight weight)
     }
 }
 
-void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
+void wxNativeFontInfo::SetUnderlined(bool underlined)
 {
-    // wxWindowDCImpl::DoDrawText will take care of rendering font with
-    // the underline attribute!
-    wxFAIL_MSG( "not implemented" );
+    // Pango doesn't have the underlined attribute so we store it separately
+    // (and handle it specially in wxWindowDCImpl::DoDrawText()).
+    m_underlined = underlined;
 }
 
-void wxNativeFontInfo::SetStrikethrough(bool WXUNUSED(strikethrough))
+void wxNativeFontInfo::SetStrikethrough(bool strikethrough)
 {
-    wxFAIL_MSG( "not implemented" );
+    // As with the underlined attribute above, we handle this one separately as
+    // Pango doesn't support it as part of the font description.
+    m_strikethrough = strikethrough;
 }
 
 bool wxNativeFontInfo::SetFaceName(const wxString& facename)
@@ -306,25 +317,34 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
 
         case wxFONTFAMILY_ROMAN:
             // corresponds to the serif font family in the page linked above
+            facename.Add(wxS("Serif"));
+            facename.Add(wxS("DejaVu Serif"));
+            facename.Add(wxS("DejaVu LGC Serif"));
+            facename.Add(wxS("Bitstream Vera Serif"));
+            facename.Add(wxS("Liberation Serif"));
+            facename.Add(wxS("FreeSerif"));
+            facename.Add(wxS("Luxi Serif"));
+            facename.Add(wxS("Times New Roman"));
             facename.Add(wxS("Century Schoolbook L"));
             facename.Add(wxS("URW Bookman L"));
             facename.Add(wxS("URW Palladio L"));
-            facename.Add(wxS("DejaVu Serif"));
-            facename.Add(wxS("FreeSerif"));
-            facename.Add(wxS("Times New Roman"));
             facename.Add(wxS("Times"));
             break;
 
         case wxFONTFAMILY_TELETYPE:
         case wxFONTFAMILY_MODERN:
             // corresponds to the monospace font family in the page linked above
+            facename.Add(wxS("Monospace"));
             facename.Add(wxS("DejaVu Sans Mono"));
-            facename.Add(wxS("Nimbus Mono L"));
+            facename.Add(wxS("DejaVu LGC Sans Mono"));
             facename.Add(wxS("Bitstream Vera Sans Mono"));
-            facename.Add(wxS("Andale Mono"));
-            facename.Add(wxS("Lucida Sans Typewriter"));
+            facename.Add(wxS("Liberation Mono"));
             facename.Add(wxS("FreeMono"));
+            facename.Add(wxS("Luxi Mono"));
             facename.Add(wxS("Courier New"));
+            facename.Add(wxS("Lucida Sans Typewriter"));
+            facename.Add(wxS("Nimbus Mono L"));
+            facename.Add(wxS("Andale Mono"));
             facename.Add(wxS("Courier"));
             break;
 
@@ -332,13 +352,17 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
         case wxFONTFAMILY_DEFAULT:
         default:
             // corresponds to the sans-serif font family in the page linked above
+            facename.Add(wxS("Sans"));
             facename.Add(wxS("DejaVu Sans"));
-            facename.Add(wxS("URW Gothic L"));
-            facename.Add(wxS("Nimbus Sans L"));
+            facename.Add(wxS("DejaVu LGC Sans"));
             facename.Add(wxS("Bitstream Vera Sans"));
-            facename.Add(wxS("Lucida Sans"));
-            facename.Add(wxS("Arial"));
+            facename.Add(wxS("Liberation Sans"));
             facename.Add(wxS("FreeSans"));
+            facename.Add(wxS("Luxi Sans"));
+            facename.Add(wxS("Arial"));
+            facename.Add(wxS("Lucida Sans"));
+            facename.Add(wxS("Nimbus Sans L"));
+            facename.Add(wxS("URW Gothic L"));
             break;
     }
 
@@ -352,6 +376,14 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding WXUNUSED(encoding))
 
 bool wxNativeFontInfo::FromString(const wxString& s)
 {
+    wxString str(s);
+
+    // Pango font description doesn't have 'underlined' or 'strikethrough'
+    // attributes, so we handle them specially by extracting them from the
+    // string before passing it to Pango.
+    m_underlined = str.StartsWith(wxS("underlined "), &str);
+    m_strikethrough = str.StartsWith(wxS("strikethrough "), &str);
+
     if (description)
         pango_font_description_free( description );
 
@@ -362,7 +394,6 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     // we do the check on the size here using same (arbitrary) limits used by
     // pango > 1.13. Note that the segfault could happen also for pointsize
     // smaller than this limit !!
-    wxString str(s);
     const size_t pos = str.find_last_of(wxS(" "));
     double size;
     if ( pos != wxString::npos && wxString(str, pos + 1).ToDouble(&size) )
@@ -394,8 +425,18 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 wxString wxNativeFontInfo::ToString() const
 {
     wxGtkString str(pango_font_description_to_string( description ));
+    wxString desc = wxPANGO_CONV_BACK(str);
 
-    return wxPANGO_CONV_BACK(str);
+    // Augment the string with the attributes not handled by Pango.
+    //
+    // Notice that we must add them in the same order they are extracted in
+    // FromString() above.
+    if (m_strikethrough)
+        desc.insert(0, wxS("strikethrough "));
+    if (m_underlined)
+        desc.insert(0, wxS("underlined "));
+
+    return desc;
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)
@@ -947,9 +988,9 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
     wxString fontspec;
     fontspec.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-%s-%s"),
-                    !info.facename ? wxT("*") : info.facename.c_str(),
-                    info.xregistry.c_str(),
-                    info.xencoding.c_str());
+                    info.facename.empty() ? wxString("*") : info.facename,
+                    info.xregistry,
+                    info.xencoding);
 
     return wxTestFontSpec(fontspec);
 }
diff --git a/Externals/wxWidgets3/src/unix/fswatcher_inotify.cpp b/Externals/wxWidgets3/src/unix/fswatcher_inotify.cpp
index d5c05f177e..694beecedf 100644
--- a/Externals/wxWidgets3/src/unix/fswatcher_inotify.cpp
+++ b/Externals/wxWidgets3/src/unix/fswatcher_inotify.cpp
@@ -3,7 +3,6 @@
 // Purpose:     inotify-based wxFileSystemWatcher implementation
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_inotify.cpp 64656 2010-06-20 18:18:23Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -139,6 +138,9 @@ public:
             wxFAIL_MSG( wxString::Format("Path %s is not watched",
                                           watch->GetPath()) );
         }
+        // Cache the wd in case any events arrive late
+        m_staleDescriptors.Add(watch->GetWatchDescriptor());
+
         watch->SetWatchDescriptor(-1);
         return true;
     }
@@ -217,23 +219,110 @@ protected:
         // will be already removed from our list at that time
         if (inevt.mask & IN_IGNORED)
         {
+            // It is now safe to remove it from the stale descriptors too, we
+            // won't get any more events for it.
+            // However if we're here because a dir that we're still watching
+            // has just been deleted, its wd won't be on this list
+            const int pos = m_staleDescriptors.Index(inevt.wd);
+            if ( pos != wxNOT_FOUND )
+            {
+                m_staleDescriptors.RemoveAt(static_cast<size_t>(pos));
+                wxLogTrace(wxTRACE_FSWATCHER,
+                       "Removed wd %i from the stale-wd cache", inevt.wd);
+            }
             return;
         }
 
         // get watch entry for this event
         wxFSWatchEntryDescriptors::iterator it = m_watchMap.find(inevt.wd);
-        wxCHECK_RET(it != m_watchMap.end(),
-                             "Watch descriptor not present in the watch map!");
 
-        wxFSWatchEntry& watch = *(it->second);
+        // wd will be -1 for IN_Q_OVERFLOW, which would trigger the wxFAIL_MSG
+        if (inevt.wd != -1)
+        {
+            if (it == m_watchMap.end())
+            {
+                // It's not in the map; check if was recently removed from it.
+                if (m_staleDescriptors.Index(inevt.wd) != wxNOT_FOUND)
+                {
+                    wxLogTrace(wxTRACE_FSWATCHER,
+                               "Got an event for stale wd %i", inevt.wd);
+                }
+                else
+                {
+                    // In theory we shouldn't reach here. In practice, some
+                    // events, e.g. IN_MODIFY, arrive just after the IN_IGNORED
+                    // so their wd has already been discarded. Warn about them.
+                    wxFileSystemWatcherEvent
+                        event
+                        (
+                            wxFSW_EVENT_WARNING,
+                            wxFSW_WARNING_GENERAL,
+                            wxString::Format
+                            (
+                             _("Unexpected event for \"%s\": no "
+                               "matching watch descriptor."),
+                             inevt.len ? inevt.name : ""
+                            )
+                        );
+                    SendEvent(event);
+
+                }
+
+                // In any case, don't process this event: it's either for an
+                // already removed entry, or for an unknown one.
+                return;
+            }
+        }
+
         int nativeFlags = inevt.mask;
         int flags = Native2WatcherFlags(nativeFlags);
 
         // check out for error/warning condition
         if (flags & wxFSW_EVENT_WARNING || flags & wxFSW_EVENT_ERROR)
         {
-            wxString errMsg = GetErrorDescription(Watcher2NativeFlags(flags));
-            wxFileSystemWatcherEvent event(flags, errMsg);
+            wxFSWWarningType warningType;
+            if ( flags & wxFSW_EVENT_WARNING )
+            {
+                warningType = nativeFlags & IN_Q_OVERFLOW
+                                ? wxFSW_WARNING_OVERFLOW
+                                : wxFSW_WARNING_GENERAL;
+            }
+            else // It's an error, not a warning.
+            {
+                warningType = wxFSW_WARNING_NONE;
+            }
+
+            wxFileSystemWatcherEvent event(flags, warningType);
+            SendEvent(event);
+            return;
+        }
+
+        if (inevt.wd == -1)
+        {
+            // Although this is not supposed to happen, we seem to be getting
+            // occasional IN_ACCESS/IN_MODIFY events without valid watch value.
+            wxFileSystemWatcherEvent
+                event
+                (
+                    wxFSW_EVENT_WARNING,
+                    wxFSW_WARNING_GENERAL,
+                    wxString::Format
+                    (
+                        _("Invalid inotify event for \"%s\""),
+                        inevt.len ? inevt.name : ""
+                    )
+                );
+            SendEvent(event);
+            return;
+        }
+
+        wxFSWatchEntry& watch = *(it->second);
+
+        // Now IN_UNMOUNT. We must do so here, as it's not in the watch flags
+        if (nativeFlags & IN_UNMOUNT)
+        {
+            wxFileName path = GetEventPath(watch, inevt);
+            wxFileSystemWatcherEvent event(wxFSW_EVENT_UNMOUNT, path, path);
             SendEvent(event);
         }
         // filter out ignored events and those not asked for.
@@ -242,11 +331,92 @@ protected:
         {
             return;
         }
+
+        // Creation
+        // We need do something here only if the original watch was recursive;
+        // we don't watch a child dir itself inside a non-tree watch.
+        // We watch only dirs explicitly, so we don't want file IN_CREATEs.
+        // Distinguish by whether nativeFlags contain IN_ISDIR
+        else if ((nativeFlags & IN_CREATE) &&
+                 (watch.GetType() == wxFSWPath_Tree) && (inevt.mask & IN_ISDIR))
+        {
+            wxFileName fn = GetEventPath(watch, inevt);
+            // Though it's a dir, fn treats it as a file. So:
+            fn.AssignDir(fn.GetFullPath());
+
+            if (m_watcher->AddAny(fn, wxFSW_EVENT_ALL,
+                                   wxFSWPath_Tree, watch.GetFilespec()))
+            {
+                // Tell the owner, in case it's interested
+                // If there's a filespec, assume he's not
+                if (watch.GetFilespec().empty())
+                {
+                    wxFileSystemWatcherEvent event(flags, fn, fn);
+                    SendEvent(event);
+                }
+            }
+        }
+
+        // Deletion
+        // We watch only dirs explicitly, so we don't want file IN_DELETEs.
+        // We obviously can't check using DirExists() as the object has been
+        // deleted; and nativeFlags here doesn't contain IN_ISDIR, even for
+        // a dir. Fortunately IN_DELETE_SELF doesn't happen for files. We need
+        // to do something here only inside a tree watch, or if it's the parent
+        // dir that's deleted. Otherwise let the parent dir cope
+        else if ((nativeFlags & IN_DELETE_SELF) &&
+                    ((watch.GetType() == wxFSWPath_Dir) ||
+                     (watch.GetType() == wxFSWPath_Tree)))
+        {
+            // We must remove the deleted directory from the map, so that
+            // DoRemoveInotify() isn't called on it in the future. Don't assert
+            // if the wd isn't found: repeated IN_DELETE_SELFs can occur
+            wxFileName fn = GetEventPath(watch, inevt);
+            wxString path(fn.GetPathWithSep());
+
+            if (m_watchMap.erase(inevt.wd) == 1)
+            {
+                // Delete from wxFileSystemWatcher
+                wxDynamicCast(m_watcher, wxInotifyFileSystemWatcher)->
+                                            OnDirDeleted(path);
+
+                // Now remove from our local list of watched items
+                wxFSWatchEntries::iterator wit =
+                                        m_watches.find(path);
+                if (wit != m_watches.end())
+                {
+                    m_watches.erase(wit);
+                }
+
+                // Cache the wd in case any events arrive late
+                m_staleDescriptors.Add(inevt.wd);
+            }
+
+            // Tell the owner, in case it's interested
+            // If there's a filespec, assume he's not
+            if (watch.GetFilespec().empty())
+            {
+                wxFileSystemWatcherEvent event(flags, fn, fn);
+                SendEvent(event);
+            }
+        }
+
         // renames
         else if (nativeFlags & IN_MOVE)
         {
-            wxInotifyCookies::iterator it = m_cookies.find(inevt.cookie);
-            if ( it == m_cookies.end() )
+            // IN_MOVE events are produced in the following circumstances:
+            // * A move within a dir (what the user sees as a rename) gives an
+            //   IN_MOVED_FROM and IN_MOVED_TO pair, each with the same path.
+            // * A move within watched dir foo/ e.g. from foo/bar1/ to foo/bar2/
+            //   will also produce such a pair, but with different paths.
+            // * A move to baz/ will give only an IN_MOVED_FROM for foo/bar1;
+            //   if baz/ is inside a different watch, that gets the IN_MOVED_TO.
+
+            // The first event to arrive, usually the IN_MOVED_FROM, is
+            // cached to await a matching IN_MOVED_TO; should none arrive, the
+            // unpaired event will be processed later in ProcessRenames().
+            wxInotifyCookies::iterator it2 = m_cookies.find(inevt.cookie);
+            if ( it2 == m_cookies.end() )
             {
                 int size = sizeof(inevt) + inevt.len;
                 inotify_event* e = (inotify_event*) operator new (size);
@@ -257,22 +427,47 @@ protected:
             }
             else
             {
-                inotify_event& oldinevt = *(it->second);
+                inotify_event& oldinevt = *(it2->second);
 
-                wxFileSystemWatcherEvent event(flags);
-                if ( inevt.mask & IN_MOVED_FROM )
+                // Tell the owner, in case it's interested
+                // If there's a filespec, assume he's not
+                if ( watch.GetFilespec().empty() )
                 {
-                    event.SetPath(GetEventPath(watch, inevt));
-                    event.SetNewPath(GetEventPath(watch, oldinevt));
-                }
-                else
-                {
-                    event.SetPath(GetEventPath(watch, oldinevt));
-                    event.SetNewPath(GetEventPath(watch, inevt));
-                }
-                SendEvent(event);
+                    // The the only way to know the path for the first event,
+                    // normally the IN_MOVED_FROM, is to retrieve the watch
+                    // corresponding to oldinevt. This is needed for a move
+                    // within a watch.
+                    wxFSWatchEntry* oldwatch;
+                    wxFSWatchEntryDescriptors::iterator oldwatch_it =
+                                                m_watchMap.find(oldinevt.wd);
+                    if (oldwatch_it != m_watchMap.end())
+                    {
+                        oldwatch = oldwatch_it->second;
+                    }
+                    else
+                    {
+                        wxLogTrace(wxTRACE_FSWATCHER,
+                            "oldinevt's watch descriptor not in the watch map");
+                        // For want of a better alternative, use 'watch'. That
+                        // will work fine for renames, though not for moves
+                        oldwatch = &watch;
+                    }
 
-                m_cookies.erase(it);
+                    wxFileSystemWatcherEvent event(flags);
+                    if ( inevt.mask & IN_MOVED_FROM )
+                    {
+                        event.SetPath(GetEventPath(watch, inevt));
+                        event.SetNewPath(GetEventPath(*oldwatch, oldinevt));
+                    }
+                    else
+                    {
+                        event.SetPath(GetEventPath(*oldwatch, oldinevt));
+                        event.SetNewPath(GetEventPath(watch, inevt));
+                    }
+                    SendEvent(event);
+                }
+
+                m_cookies.erase(it2);
                 delete &oldinevt;
             }
         }
@@ -280,13 +475,19 @@ protected:
         else
         {
             wxFileName path = GetEventPath(watch, inevt);
-            wxFileSystemWatcherEvent event(flags, path, path);
-            SendEvent(event);
+            // For files, check that it matches any filespec
+            if ( MatchesFilespec(path, watch.GetFilespec()) )
+            {
+                wxFileSystemWatcherEvent event(flags, path, path);
+                SendEvent(event);
+            }
         }
     }
 
     void ProcessRenames()
     {
+        // After all of a batch of events has been processed, this deals with
+        // any still-unpaired IN_MOVED_FROM or IN_MOVED_TO events.
         wxInotifyCookies::iterator it = m_cookies.begin();
         while ( it != m_cookies.end() )
         {
@@ -297,14 +498,26 @@ protected:
 
             // get watch entry for this event
             wxFSWatchEntryDescriptors::iterator wit = m_watchMap.find(inevt.wd);
-            wxCHECK_RET(wit != m_watchMap.end(),
-                             "Watch descriptor not present in the watch map!");
-
-            wxFSWatchEntry& watch = *(wit->second);
-            int flags = Native2WatcherFlags(inevt.mask);
-            wxFileName path = GetEventPath(watch, inevt);
-            wxFileSystemWatcherEvent event(flags, path, path);
-            SendEvent(event);
+            if (wit == m_watchMap.end())
+            {
+                wxLogTrace(wxTRACE_FSWATCHER,
+                            "Watch descriptor not present in the watch map!");
+            }
+            else
+            {
+                // Tell the owner, in case it's interested
+                // If there's a filespec, assume he's not
+                wxFSWatchEntry& watch = *(wit->second);
+                if ( watch.GetFilespec().empty() )
+                {
+                    int flags = Native2WatcherFlags(inevt.mask);
+                    wxFileName path = GetEventPath(watch, inevt);
+                    {
+                        wxFileSystemWatcherEvent event(flags, path, path);
+                        SendEvent(event);
+                    }
+                }
+            }
 
             m_cookies.erase(it);
             delete &inevt;
@@ -344,9 +557,12 @@ protected:
         wxString mask = (inevt.mask & IN_ISDIR) ?
                         wxString::Format("IS_DIR | %u", inevt.mask & ~IN_ISDIR) :
                         wxString::Format("%u", inevt.mask);
+        const char* name = "";
+        if (inevt.len)
+            name = inevt.name;
         return wxString::Format("Event: wd=%d, mask=%s, cookie=%u, len=%u, "
                                 "name=%s", inevt.wd, mask, inevt.cookie,
-                                inevt.len, inevt.name);
+                                inevt.len, name);
     }
 
     static wxFileName GetEventPath(const wxFSWatchEntry& watch,
@@ -354,17 +570,40 @@ protected:
     {
         // only when dir is watched, we have non-empty e.name
         wxFileName path = watch.GetPath();
-        if (path.IsDir())
+        if (path.IsDir() && inevt.len)
         {
             path = wxFileName(path.GetPath(), inevt.name);
         }
         return path;
     }
 
-    static int Watcher2NativeFlags(int WXUNUSED(flags))
+    static int Watcher2NativeFlags(int flags)
     {
-        // TODO: it would be nice to subscribe only to the events we really need
-        return IN_ALL_EVENTS;
+        // Start with the standard case of wanting all events
+        if (flags == wxFSW_EVENT_ALL)
+        {
+            return IN_ALL_EVENTS;
+        }
+
+        static const int flag_mapping[][2] = {
+            { wxFSW_EVENT_ACCESS, IN_ACCESS   },
+            { wxFSW_EVENT_MODIFY, IN_MODIFY   },
+            { wxFSW_EVENT_ATTRIB, IN_ATTRIB   },
+            { wxFSW_EVENT_RENAME, IN_MOVE     },
+            { wxFSW_EVENT_CREATE, IN_CREATE   },
+            { wxFSW_EVENT_DELETE, IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF },
+            { wxFSW_EVENT_UNMOUNT, IN_UNMOUNT }
+            // wxFSW_EVENT_ERROR/WARNING make no sense here
+        };
+
+        int native_flags = 0;
+        for ( unsigned int i=0; i < WXSIZEOF(flag_mapping); ++i)
+        {
+            if (flags & flag_mapping[i][0])
+                native_flags |= flag_mapping[i][1];
+        }
+
+        return native_flags;
     }
 
     static int Native2WatcherFlags(int flags)
@@ -372,7 +611,7 @@ protected:
         static const int flag_mapping[][2] = {
             { IN_ACCESS,        wxFSW_EVENT_ACCESS }, // generated during read!
             { IN_MODIFY,        wxFSW_EVENT_MODIFY },
-            { IN_ATTRIB,        0 },
+            { IN_ATTRIB,        wxFSW_EVENT_ATTRIB },
             { IN_CLOSE_WRITE,   0 },
             { IN_CLOSE_NOWRITE, 0 },
             { IN_OPEN,          0 },
@@ -383,10 +622,10 @@ protected:
             { IN_DELETE_SELF,   wxFSW_EVENT_DELETE },
             { IN_MOVE_SELF,     wxFSW_EVENT_DELETE },
 
-            { IN_UNMOUNT,       wxFSW_EVENT_ERROR  },
+            { IN_UNMOUNT,       wxFSW_EVENT_UNMOUNT},
             { IN_Q_OVERFLOW,    wxFSW_EVENT_WARNING},
 
-            // ignored, because this is genereted mainly by watcher::Remove()
+            // ignored, because this is generated mainly by watcher::Remove()
             { IN_IGNORED,        0 }
         };
 
@@ -402,26 +641,9 @@ protected:
         return -1;
     }
 
-    /**
-     * Returns error description for specified inotify mask
-     */
-    static const wxString GetErrorDescription(int flag)
-    {
-        switch ( flag )
-        {
-        case IN_UNMOUNT:
-            return _("File system containing watched object was unmounted");
-        case IN_Q_OVERFLOW:
-            return _("Event queue overflowed");
-        }
-
-        // never reached
-        wxFAIL_MSG(wxString::Format("Unknown inotify event mask %u", flag));
-        return wxEmptyString;
-    }
-
     wxFSWSourceHandler* m_handler;        // handler for inotify event source
     wxFSWatchEntryDescriptors m_watchMap; // inotify wd=>wxFSWatchEntry* map
+    wxArrayInt m_staleDescriptors;        // stores recently-removed watches
     wxInotifyCookies m_cookies;           // map to track renames
     wxEventLoopSource* m_source;          // our event loop source
 
@@ -486,6 +708,19 @@ bool wxInotifyFileSystemWatcher::Init()
     return m_service->Init();
 }
 
+void wxInotifyFileSystemWatcher::OnDirDeleted(const wxString& path)
+{
+    if (!path.empty())
+    {
+        wxFSWatchInfoMap::iterator it = m_watches.find(path);
+        wxCHECK_RET(it != m_watches.end(),
+                    wxString::Format("Path '%s' is not watched", path));
+
+        // path has been deleted, so we must forget it whatever its refcount
+        m_watches.erase(it);
+    }
+}
+
 #endif // wxHAS_INOTIFY
 
 #endif // wxUSE_FSWATCHER
diff --git a/Externals/wxWidgets3/src/unix/fswatcher_kqueue.cpp b/Externals/wxWidgets3/src/unix/fswatcher_kqueue.cpp
index 0068a095ac..2bc1634dfc 100644
--- a/Externals/wxWidgets3/src/unix/fswatcher_kqueue.cpp
+++ b/Externals/wxWidgets3/src/unix/fswatcher_kqueue.cpp
@@ -3,7 +3,6 @@
 // Purpose:     kqueue-based wxFileSystemWatcher implementation
 // Author:      Bartosz Bekier
 // Created:     2009-05-26
-// RCS-ID:      $Id: fswatcher_kqueue.cpp 67677 2011-05-03 10:40:28Z VZ $
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -149,8 +148,7 @@ public:
         // TODO more error conditions according to man
         // XXX closing file descriptor removes the watch. The logic resides in
         // the watch which is not nice, but effective and simple
-        bool ret = watch->Close();
-        if (ret == -1)
+        if ( !watch->Close() )
         {
             wxLogSysError(_("Unable to remove kqueue watch"));
             return false;
diff --git a/Externals/wxWidgets3/src/unix/glx11.cpp b/Externals/wxWidgets3/src/unix/glx11.cpp
index 7bfb310c93..ec2bd5b098 100644
--- a/Externals/wxWidgets3/src/unix/glx11.cpp
+++ b/Externals/wxWidgets3/src/unix/glx11.cpp
@@ -3,7 +3,6 @@
 // Purpose:     code common to all X11-based wxGLCanvas implementations
 // Author:      Vadim Zeitlin
 // Created:     2007-04-15
-// RCS-ID:      $Id: glx11.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/joystick.cpp b/Externals/wxWidgets3/src/unix/joystick.cpp
index f87698d17e..cf9cc33b3e 100644
--- a/Externals/wxWidgets3/src/unix/joystick.cpp
+++ b/Externals/wxWidgets3/src/unix/joystick.cpp
@@ -4,7 +4,6 @@
 // Author:      Ported to Linux by Guilhem Lavaux
 // Modified by:
 // Created:     05/23/98
-// RCS-ID:      $Id: joystick.cpp 58381 2009-01-25 11:58:39Z FM $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,6 +18,7 @@
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/window.h"
+    #include "wx/log.h"
 #endif //WX_PRECOMP
 
 #include "wx/thread.h"
@@ -136,6 +136,14 @@ void* wxJoystickThread::Entry()
 
             if ((j_evt.type & JS_EVENT_AXIS) && (j_evt.number < wxJS_MAX_AXES))
             {
+                // Ignore invalid axis.
+                if ( j_evt.number >= wxJS_MAX_AXES )
+                {
+                    wxLogDebug(wxS("Invalid axis index %d in joystick message."),
+                               j_evt.number);
+                    continue;
+                }
+
                 if (   (m_axe[j_evt.number] + m_threshold < j_evt.value)
                     || (m_axe[j_evt.number] - m_threshold > j_evt.value) )
             {
diff --git a/Externals/wxWidgets3/src/unix/mediactrl.cpp b/Externals/wxWidgets3/src/unix/mediactrl.cpp
index 5e299ba297..f01b1f15fd 100644
--- a/Externals/wxWidgets3/src/unix/mediactrl.cpp
+++ b/Externals/wxWidgets3/src/unix/mediactrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     02/04/05
-// RCS-ID:      $Id: mediactrl.cpp 70622 2012-02-18 19:43:03Z SN $
 // Copyright:   (c) 2004-2005 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +33,9 @@
     #include "wx/timer.h"           // wxTimer
 #endif
 
+#include "wx/filesys.h"             // FileNameToURL()
 #include "wx/thread.h"              // wxMutex/wxMutexLocker
+#include "wx/vector.h"              // wxVector<wxString>
 
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
@@ -185,6 +186,7 @@ public:
     virtual double GetVolume();
 
     //------------implementation from now on-----------------------------------
+    bool CheckForErrors();
     bool DoLoad(const wxString& locstring);
     wxMediaCtrl* GetControl() { return m_ctrl; } // for C Callbacks
     void HandleStateChange(GstElementState oldstate, GstElementState newstate);
@@ -205,6 +207,23 @@ public:
     wxMutex         m_asynclock;    // See "discussion of internals"
     class wxGStreamerMediaEventHandler* m_eventHandler; // see below
 
+    // Mutex protecting just the variables below which are set from
+    // gst_error_callback() called from a different thread.
+    wxMutex m_mutexErr;
+    struct Error
+    {
+        Error(const gchar* message, const gchar* debug)
+            : m_message(message, wxConvUTF8),
+              m_debug(debug, wxConvUTF8)
+        {
+        }
+
+        wxString m_message,
+                 m_debug;
+    };
+
+    wxVector<Error> m_errors;
+
     friend class wxGStreamerMediaEventHandler;
     friend class wxGStreamerLoadWaitTimer;
     DECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend)
@@ -256,15 +275,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend)
 //-----------------------------------------------------------------------------
 #ifdef __WXGTK__
 extern "C" {
-static gboolean gtk_window_expose_callback(GtkWidget *widget,
-                                           GdkEventExpose *event,
-                                           wxGStreamerMediaBackend *be)
+static gboolean
+#ifdef __WXGTK3__
+draw(GtkWidget* widget, cairo_t* cr, wxGStreamerMediaBackend* be)
+#else
+expose_event(GtkWidget* widget, GdkEventExpose* event, wxGStreamerMediaBackend* be)
+#endif
 {
-    if(event->count > 0)
-        return FALSE;
-
-    GdkWindow* window = gtk_widget_get_window(widget);
-
     // I've seen this recommended somewhere...
     // TODO: Is this needed? Maybe it is just cruft...
     // gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),
@@ -282,9 +299,17 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
     else
     {
         // draw a black background like some other backends do....
-        gdk_draw_rectangle (window, widget->style->black_gc, TRUE, 0, 0,
+#ifdef __WXGTK3__
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        cairo_rectangle(cr, 0, 0, a.width, a.height);
+        cairo_set_source_rgb(cr, 0, 0, 0);
+        cairo_fill(cr);
+#else
+        gdk_draw_rectangle (event->window, widget->style->black_gc, TRUE, 0, 0,
                             widget->allocation.width,
                             widget->allocation.height);
+#endif
     }
 
     return FALSE;
@@ -310,11 +335,15 @@ static gint gtk_window_realize_callback(GtkWidget* widget,
     wxASSERT(window);
 
     gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),
-                                GDK_WINDOW_XWINDOW( window )
+                                GDK_WINDOW_XID(window)
                                 );
     g_signal_connect (be->GetControl()->m_wxwindow,
-                      "expose_event",
-                      G_CALLBACK(gtk_window_expose_callback), be);
+#ifdef __WXGTK3__
+        "draw", G_CALLBACK(draw),
+#else
+        "expose_event", G_CALLBACK(expose_event),
+#endif
+        be);
     return 0;
 }
 }
@@ -371,15 +400,10 @@ static void gst_error_callback(GstElement *WXUNUSED(play),
                                GstElement *WXUNUSED(src),
                                GError     *err,
                                gchar      *debug,
-                               wxGStreamerMediaBackend* WXUNUSED(be))
+                               wxGStreamerMediaBackend* be)
 {
-    wxString sError;
-    sError.Printf(wxT("gst_error_callback\n")
-                  wxT("Error Message:%s\nDebug:%s\n"),
-                  (const wxChar*)wxConvUTF8.cMB2WX(err->message),
-                  (const wxChar*)wxConvUTF8.cMB2WX(debug));
-    wxLogTrace(wxTRACE_GStreamer, sError);
-    wxLogSysError(sError);
+    wxMutexLocker lock(be->m_mutexErr);
+    be->m_errors.push_back(wxGStreamerMediaBackend::Error(err->message, debug));
 }
 }
 
@@ -470,6 +494,15 @@ static gboolean gst_bus_async_callback(GstBus* WXUNUSED(bus),
                                        GstMessage* message,
                                        wxGStreamerMediaBackend* be)
 {
+    if ( GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR )
+    {
+        GError* error;
+        gchar* debug;
+        gst_message_parse_error(message, &error, &debug);
+        gst_error_callback(NULL, NULL, error, debug, be);
+        return FALSE;
+    }
+
     if(((GstElement*)GST_MESSAGE_SRC(message)) != be->m_playbin)
         return TRUE;
     if(be->m_asynclock.TryLock() != wxMUTEX_NO_ERROR)
@@ -490,14 +523,7 @@ static gboolean gst_bus_async_callback(GstBus* WXUNUSED(bus),
             gst_finish_callback(NULL, be);
             break;
         }
-        case GST_MESSAGE_ERROR:
-        {
-            GError* error;
-            gchar* debug;
-            gst_message_parse_error(message, &error, &debug);
-            gst_error_callback(NULL, NULL, error, debug, be);
-            break;
-        }
+
         default:
             break;
     }
@@ -716,16 +742,19 @@ void wxGStreamerMediaBackend::SetupXOverlay()
 #endif
         gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_xoverlay),
 #ifdef __WXGTK__
-                        GDK_WINDOW_XWINDOW( window )
+                        GDK_WINDOW_XID(window)
 #else
                         ctrl->GetHandle()
 #endif
                                   );
 #ifdef __WXGTK__
         g_signal_connect(m_ctrl->m_wxwindow,
-                        // m_ctrl->m_wxwindow/*m_ctrl->m_widget*/,
-                      "expose_event",
-                      G_CALLBACK(gtk_window_expose_callback), this);
+#ifdef __WXGTK3__
+            "draw", G_CALLBACK(draw),
+#else
+            "expose_event", G_CALLBACK(expose_event),
+#endif
+            this);
     } // end if GtkPizza realized
 #endif
 }
@@ -956,6 +985,32 @@ wxGStreamerMediaBackend::~wxGStreamerMediaBackend()
     }
 }
 
+//-----------------------------------------------------------------------------
+// wxGStreamerMediaBackend::CheckForErrors
+//
+// Reports any errors received from gstreamer. Should be called after any
+// failure.
+//-----------------------------------------------------------------------------
+bool wxGStreamerMediaBackend::CheckForErrors()
+{
+    wxMutexLocker lock(m_mutexErr);
+    if ( m_errors.empty() )
+        return false;
+
+    for ( unsigned n = 0; n < m_errors.size(); n++ )
+    {
+        const Error& err = m_errors[n];
+
+        wxLogTrace(wxTRACE_GStreamer,
+                   "gst_error_callback: %s", err.m_debug);
+        wxLogError(_("Media playback error: %s"), err.m_message);
+    }
+
+    m_errors.clear();
+
+    return true;
+}
+
 //-----------------------------------------------------------------------------
 // wxGStreamerMediaBackend::CreateControl
 //
@@ -979,11 +1034,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     char **argvGST = new char*[wxTheApp->argc + 1];
     for ( i = 0; i < wxTheApp->argc; i++ )
     {
-#if wxUSE_UNICODE_WCHAR
-        argvGST[i] = wxStrdupA(wxConvUTF8.cWX2MB(wxTheApp->argv[i]));
-#else
         argvGST[i] = wxStrdupA(wxTheApp->argv[i].utf8_str());
-#endif
     }
 
     argvGST[wxTheApp->argc] = NULL;
@@ -1159,7 +1210,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 //-----------------------------------------------------------------------------
 bool wxGStreamerMediaBackend::Load(const wxString& fileName)
 {
-    return DoLoad(wxString( wxT("file://") ) + fileName);
+    return DoLoad(wxFileSystem::FileNameToURL(fileName));
 }
 
 //-----------------------------------------------------------------------------
@@ -1212,9 +1263,10 @@ bool wxGStreamerMediaBackend::DoLoad(const wxString& locstring)
                                GST_STATE_READY) == GST_STATE_FAILURE ||
         !SyncStateChange(m_playbin, GST_STATE_READY))
     {
-        wxLogSysError(wxT("wxGStreamerMediaBackend::Load - ")
-                      wxT("Could not set initial state to ready"));
-            return false;
+        CheckForErrors();
+
+        wxLogError(_("Failed to prepare playing \"%s\"."), locstring);
+        return false;
     }
 
     // free current media resources
@@ -1234,11 +1286,18 @@ bool wxGStreamerMediaBackend::DoLoad(const wxString& locstring)
                                GST_STATE_PAUSED) == GST_STATE_FAILURE ||
         !SyncStateChange(m_playbin, GST_STATE_PAUSED))
     {
+        CheckForErrors();
         return false; // no real error message needed here as this is
                       // generic failure 99% of the time (i.e. no
                       // source etc.) and has an error message
     }
 
+    // It may happen that both calls above succeed but we actually had some
+    // errors during the pipeline setup and it doesn't play. E.g. this happens
+    // if XVideo extension is unavailable but xvimagesink is still used.
+    if ( CheckForErrors() )
+        return false;
+
 
     NotifyMovieLoaded(); // Notify the user - all we can do for now
     return true;
@@ -1256,7 +1315,11 @@ bool wxGStreamerMediaBackend::Play()
 {
     if (gst_element_set_state (m_playbin,
                                GST_STATE_PLAYING) == GST_STATE_FAILURE)
+    {
+        CheckForErrors();
         return false;
+    }
+
     return true;
 }
 
@@ -1272,7 +1335,10 @@ bool wxGStreamerMediaBackend::Pause()
     m_llPausedPos = wxGStreamerMediaBackend::GetPosition();
     if (gst_element_set_state (m_playbin,
                                GST_STATE_PAUSED) == GST_STATE_FAILURE)
+    {
+        CheckForErrors();
         return false;
+    }
     return true;
 }
 
@@ -1292,6 +1358,7 @@ bool wxGStreamerMediaBackend::Stop()
                                   GST_STATE_PAUSED) == GST_STATE_FAILURE ||
           !SyncStateChange(m_playbin, GST_STATE_PAUSED))
         {
+            CheckForErrors();
             wxLogSysError(wxT("Could not set state to paused for Stop()"));
             return false;
         }
diff --git a/Externals/wxWidgets3/src/unix/mimetype.cpp b/Externals/wxWidgets3/src/unix/mimetype.cpp
index ec2a0b9605..265f86aae0 100644
--- a/Externals/wxWidgets3/src/unix/mimetype.cpp
+++ b/Externals/wxWidgets3/src/unix/mimetype.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id: mimetype.cpp 70622 2012-02-18 19:43:03Z SN $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/net.cpp b/Externals/wxWidgets3/src/unix/net.cpp
index b703530415..3125aadc2c 100644
--- a/Externals/wxWidgets3/src/unix/net.cpp
+++ b/Externals/wxWidgets3/src/unix/net.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballüder
 // Modified by:
 // Created:     03.10.99
-// RCS-ID:      $Id: net.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) Karsten Ballüder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/snglinst.cpp b/Externals/wxWidgets3/src/unix/snglinst.cpp
index f3f7627ec4..f8f1c3b4e0 100644
--- a/Externals/wxWidgets3/src/unix/snglinst.cpp
+++ b/Externals/wxWidgets3/src/unix/snglinst.cpp
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.06.01
-// RCS-ID:      $Id: snglinst.cpp 64940 2010-07-13 13:29:13Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/sockunix.cpp b/Externals/wxWidgets3/src/unix/sockunix.cpp
index 88b8ea06ca..7d47f18e95 100644
--- a/Externals/wxWidgets3/src/unix/sockunix.cpp
+++ b/Externals/wxWidgets3/src/unix/sockunix.cpp
@@ -4,7 +4,6 @@
 // Authors:     Guilhem Lavaux, Guillermo Rodriguez Garcia, David Elliott,
 //              Vadim Zeitlin
 // Created:     April 1997
-// RCS-ID:      $Id: sockunix.cpp 61813 2009-09-03 00:24:21Z VZ $
 // Copyright:   (c) 1997 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
diff --git a/Externals/wxWidgets3/src/unix/sound.cpp b/Externals/wxWidgets3/src/unix/sound.cpp
index 4adc31d6fa..c6ff1bd420 100644
--- a/Externals/wxWidgets3/src/unix/sound.cpp
+++ b/Externals/wxWidgets3/src/unix/sound.cpp
@@ -4,7 +4,6 @@
 // Author:      Marcel Rasche, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98
-// RCS-ID:      $Id: sound.cpp 69178 2011-09-21 15:08:02Z VZ $
 // Copyright:   (c) Julian Smart, Open Source Applications Foundation
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/sound_sdl.cpp b/Externals/wxWidgets3/src/unix/sound_sdl.cpp
index cdafcc4c4c..0fc4ebf3ff 100644
--- a/Externals/wxWidgets3/src/unix/sound_sdl.cpp
+++ b/Externals/wxWidgets3/src/unix/sound_sdl.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/01/31
-// RCS-ID:      $Id: sound_sdl.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) 2004, Open Source Applications Foundation
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -213,7 +212,11 @@ bool wxSoundBackendSDL::OpenAudio()
         {
 #if wxUSE_LOG_DEBUG
             char driver[256];
+#if SDL_MAJOR_VERSION == 1
             SDL_AudioDriverName(driver, 256);
+#elif SDL_MAJOR_VERSION > 1            
+            strncpy(driver, SDL_GetCurrentAudioDriver(), 256);
+#endif
             wxLogTrace(wxT("sound"), wxT("opened audio, driver '%s'"),
                        wxString(driver, wxConvLocal).c_str());
 #endif
diff --git a/Externals/wxWidgets3/src/unix/stackwalk.cpp b/Externals/wxWidgets3/src/unix/stackwalk.cpp
index 3f8141a91a..e8cf6edff3 100644
--- a/Externals/wxWidgets3/src/unix/stackwalk.cpp
+++ b/Externals/wxWidgets3/src/unix/stackwalk.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-18
-// RCS-ID:      $Id: stackwalk.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -130,10 +129,12 @@ void wxStackFrame::OnGetName()
 
         m_module.assign(syminfo, posOpen);
     }
+#ifndef __WXOSX__
     else // not in "module(funcname+offset)" format
     {
         m_module = syminfo;
     }
+#endif // !__WXOSX__
 }
 
 
@@ -180,17 +181,18 @@ void wxStackWalker::ProcessFrames(size_t skip)
     if (!ms_symbols || !m_depth)
         return;
 
-    // we have 3 more "intermediate" frames which the calling code doesn't know
-    // about, account for them
-    skip += 3;
+    // we are another level down from Walk(), so adjust the number of stack
+    // frames to skip accordingly
+    skip += 1;
 
     // call addr2line only once since this call may be very slow
     // (it has to load in memory the entire EXE of this app which may be quite
     //  big, especially if it contains debug info and is compiled statically!)
-    int towalk = InitFrames(frames, m_depth - skip, &ms_addresses[skip], &ms_symbols[skip]);
+    int numFrames = InitFrames(frames, m_depth - skip,
+                               &ms_addresses[skip], &ms_symbols[skip]);
 
     // now do user-defined operations on each frame
-    for ( int n = 0; n < towalk - (int)skip; n++ )
+    for ( int n = 0; n < numFrames; n++ )
         OnStackFrame(frames[n]);
 }
 
@@ -204,6 +206,28 @@ void wxStackWalker::FreeStack()
     m_depth = 0;
 }
 
+namespace
+{
+
+// Helper function to read a line from the file and return it without the
+// trailing newline. Line number is only used for error reporting.
+bool ReadLine(FILE* fp, unsigned long num, wxString* line)
+{
+    if ( !fgets(g_buf, WXSIZEOF(g_buf), fp) )
+    {
+        wxLogDebug(wxS("cannot read address information for stack frame #%lu"),
+                   num);
+        return false;
+    }
+
+    *line = wxString::FromAscii(g_buf);
+    line->RemoveLast();
+
+    return true;
+}
+
+} // anonymous namespace
+
 int wxStackWalker::InitFrames(wxStackFrame *arr, size_t n, void **addresses, char **syminfo)
 {
     // we need to launch addr2line tool to get this information and we need to
@@ -220,9 +244,13 @@ int wxStackWalker::InitFrames(wxStackFrame *arr, size_t n, void **addresses, cha
         }
     }
 
-    // build the (long) command line for executing addr2line in an optimized way
-    // (e.g. use always chars, even in Unicode build: popen() always takes chars)
+    // build the command line for executing addr2line or atos under OS X using
+    // char* directly to avoid the conversions from Unicode
+#ifdef __WXOSX__
+    int len = snprintf(g_buf, BUFSIZE, "atos -p %d", (int)getpid());
+#else
     int len = snprintf(g_buf, BUFSIZE, "addr2line -C -f -e \"%s\"", (const char*) exepath.mb_str());
+#endif
     len = (len <= 0) ? strlen(g_buf) : len;     // in case snprintf() is broken
     for (size_t i=0; i<n; i++)
     {
@@ -236,54 +264,79 @@ int wxStackWalker::InitFrames(wxStackFrame *arr, size_t n, void **addresses, cha
     if ( !fp )
         return 0;
 
-    // parse addr2line output (should be exactly 2 lines for each address)
-    // reusing the g_buf used for building the command line above
+    // parse the output reusing the same buffer to avoid any big memory
+    // allocations which could fail if our program is in a bad state
     wxString name, filename;
     unsigned long line = 0,
                   curr = 0;
     for  ( size_t i = 0; i < n; i++ )
     {
-        // 1st line has function name
-        if ( fgets(g_buf, WXSIZEOF(g_buf), fp) )
-        {
-            name = wxString::FromAscii(g_buf);
-            name.RemoveLast(); // trailing newline
+#ifdef __WXOSX__
+        wxString buffer;
+        if ( !ReadLine(fp, i, &buffer) )
+            return false;
 
-            if ( name == wxT("??") )
-                name.clear();
+        line = 0;
+        filename.clear();
+
+        // We can get back either the string in the following format:
+        //
+        //      func(args) (in module) (file:line)
+        //
+        // or just the same address back if it couldn't be resolved.
+        const size_t posIn = buffer.find("(in ");
+        if ( posIn != wxString::npos )
+        {
+            name.assign(buffer, 0, posIn);
+
+            size_t posAt = buffer.find(") (", posIn + 3);
+            if ( posAt != wxString::npos )
+            {
+                posAt += 3; // Skip ") ("
+
+                // Discard the two last characters which are ")\n"
+                wxString location(buffer, posAt, buffer.length() - posAt - 2);
+
+                wxString linenum;
+                filename = location.BeforeFirst(':', &linenum);
+                if ( !linenum.empty() )
+                    linenum.ToULong(&line);
+            }
+        }
+#else // !__WXOSX__
+        // 1st line has function name
+        if ( !ReadLine(fp, i, &name) )
+            return false;
+
+        name = wxString::FromAscii(g_buf);
+        name.RemoveLast(); // trailing newline
+
+        if ( name == wxT("??") )
+            name.clear();
+
+        // 2nd one -- the file/line info
+        if ( !ReadLine(fp, i, &filename) )
+            return false;
+
+        const size_t posColon = filename.find(wxT(':'));
+        if ( posColon != wxString::npos )
+        {
+            // parse line number (it's ok if it fails, this will just leave
+            // line at its current, invalid, 0 value)
+            wxString(filename, posColon + 1, wxString::npos).ToULong(&line);
+
+            // remove line number from 'filename'
+            filename.erase(posColon);
+            if ( filename == wxT("??") )
+                filename.clear();
         }
         else
         {
-            wxLogDebug(wxT("cannot read addr2line output for stack frame #%lu"),
-                       (unsigned long)i);
-            return false;
-        }
-
-        // 2nd one -- the file/line info
-        if ( fgets(g_buf, WXSIZEOF(g_buf), fp) )
-        {
-            filename = wxString::FromAscii(g_buf);
-            filename.RemoveLast();
-
-            const size_t posColon = filename.find(wxT(':'));
-            if ( posColon != wxString::npos )
-            {
-                // parse line number (it's ok if it fails, this will just leave
-                // line at its current, invalid, 0 value)
-                wxString(filename, posColon + 1, wxString::npos).ToULong(&line);
-
-                // remove line number from 'filename'
-                filename.erase(posColon);
-                if ( filename == wxT("??") )
-                    filename.clear();
-            }
-            else
-            {
-                wxLogDebug(wxT("Unexpected addr2line format: \"%s\" - ")
-                           wxT("the semicolon is missing"),
-                           filename.c_str());
-            }
+            wxLogDebug(wxT("Unexpected addr2line format: \"%s\" - ")
+                       wxT("the semicolon is missing"),
+                       filename.c_str());
         }
+#endif // __WXOSX__/!__WXOSX__
 
         // now we've got enough info to initialize curr-th stack frame
         // (at worst, only addresses[i] and syminfo[i] have been initialized,
diff --git a/Externals/wxWidgets3/src/unix/stdpaths.cpp b/Externals/wxWidgets3/src/unix/stdpaths.cpp
index 6b69c2c84b..4e0c37b18f 100644
--- a/Externals/wxWidgets3/src/unix/stdpaths.cpp
+++ b/Externals/wxWidgets3/src/unix/stdpaths.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id: stdpaths.cpp 67254 2011-03-20 00:14:35Z DS $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -122,7 +121,7 @@ wxString wxStandardPaths::GetExecutablePath() const
     wxString exeStr;
 
     char buf[4096];
-    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
+    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - 1);
     if ( result != -1 )
     {
         buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
diff --git a/Externals/wxWidgets3/src/unix/taskbarx11.cpp b/Externals/wxWidgets3/src/unix/taskbarx11.cpp
index 6ff97ff6e2..146d2ccd9c 100644
--- a/Externals/wxWidgets3/src/unix/taskbarx11.cpp
+++ b/Externals/wxWidgets3/src/unix/taskbarx11.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     04/04/2003
-// RCS-ID:      $Id: taskbarx11.cpp 61508 2009-07-23 20:30:22Z VZ $
 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/threadpsx.cpp b/Externals/wxWidgets3/src/unix/threadpsx.cpp
index 95e235a05f..4efe5d56f1 100644
--- a/Externals/wxWidgets3/src/unix/threadpsx.cpp
+++ b/Externals/wxWidgets3/src/unix/threadpsx.cpp
@@ -4,7 +4,6 @@
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: K. S. Sreeram (2002): POSIXified wxCondition, added wxSemaphore
 // Created:     04/22/98
-// RCS-ID:      $Id: threadpsx.cpp 69881 2011-12-01 14:22:07Z VZ $
 // Copyright:   (c) Wolfram Gloger (1996, 1997)
 //                  Guilhem Lavaux (1998)
 //                  Vadim Zeitlin (1999-2002)
@@ -54,10 +53,17 @@
     #include <thread.h>
 #endif
 
+#ifdef HAVE_ABI_FORCEDUNWIND
+    #include <cxxabi.h>
+#endif
+
+#ifdef HAVE_SETPRIORITY
+    #include <sys/resource.h>   // for setpriority()
+#endif
+
 // we use wxFFile under Linux in GetCPUCount()
 #ifdef __LINUX__
     #include "wx/ffile.h"
-    #include <sys/resource.h>   // for setpriority()
 #endif
 
 #define THR_ID_CAST(id)  (reinterpret_cast<void*>(id))
@@ -703,6 +709,8 @@ public:
     static void *PthreadStart(wxThread *thread);
 
     // thread actions
+         // create the thread
+    wxThreadError Create(wxThread *thread, unsigned int stackSize);
         // start the thread
     wxThreadError Run();
         // unblock the thread allowing it to run
@@ -740,6 +748,8 @@ public:
         // id
     pthread_t GetId() const { return m_threadId; }
     pthread_t *GetIdPtr() { return &m_threadId; }
+        // "created" flag
+    bool WasCreated() const { return m_created; }
         // "cancelled" flag
     void SetCancelFlag() { m_cancelled = true; }
     bool WasCancelled() const { return m_cancelled; }
@@ -770,6 +780,9 @@ private:
     wxThreadState m_state;      // see wxThreadState enum
     int           m_prio;       // in wxWidgets units: from 0 to 100
 
+    // this flag is set when the thread was successfully created
+    bool m_created;
+
     // this flag is set when the thread should terminate
     bool m_cancelled;
 
@@ -851,12 +864,24 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
 
         wxTRY
         {
-            pthread->m_exitcode = thread->Entry();
+            pthread->m_exitcode = thread->CallEntry();
 
             wxLogTrace(TRACE_THREADS,
                        wxT("Thread %p Entry() returned %lu."),
                        THR_ID(pthread), wxPtrToUInt(pthread->m_exitcode));
         }
+#ifdef HAVE_ABI_FORCEDUNWIND
+        // When using common C++ ABI under Linux we must always rethrow this
+        // special exception used to unwind the stack when the thread was
+        // cancelled, otherwise the thread library would simply terminate the
+        // program, see http://udrepper.livejournal.com/21541.html
+        catch ( abi::__forced_unwind& )
+        {
+            wxCriticalSectionLocker lock(thread->m_critsect);
+            pthread->SetState(STATE_EXITED);
+            throw;
+        }
+#endif // HAVE_ABI_FORCEDUNWIND
         wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
 
         {
@@ -937,8 +962,9 @@ void wxThreadInternal::Cleanup(wxThread *thread)
 wxThreadInternal::wxThreadInternal()
 {
     m_state = STATE_NEW;
+    m_created = false;
     m_cancelled = false;
-    m_prio = WXTHREAD_DEFAULT_PRIORITY;
+    m_prio = wxPRIORITY_DEFAULT;
     m_threadId = 0;
     m_exitcode = 0;
 
@@ -954,6 +980,132 @@ wxThreadInternal::~wxThreadInternal()
 {
 }
 
+#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+    #define WXUNUSED_STACKSIZE(identifier)  identifier
+#else
+    #define WXUNUSED_STACKSIZE(identifier)  WXUNUSED(identifier)
+#endif
+
+wxThreadError wxThreadInternal::Create(wxThread *thread,
+                                       unsigned int WXUNUSED_STACKSIZE(stackSize))
+{
+    if ( GetState() != STATE_NEW )
+    {
+        // don't recreate thread
+        return wxTHREAD_RUNNING;
+    }
+
+    // set up the thread attribute: right now, we only set thread priority
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+
+#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+    if (stackSize)
+      pthread_attr_setstacksize(&attr, stackSize);
+#endif
+
+#ifdef HAVE_THREAD_PRIORITY_FUNCTIONS
+    int policy;
+    if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
+    {
+        wxLogError(_("Cannot retrieve thread scheduling policy."));
+    }
+
+#ifdef __VMS__
+   /* the pthread.h contains too many spaces. This is a work-around */
+# undef sched_get_priority_max
+#undef sched_get_priority_min
+#define sched_get_priority_max(_pol_) \
+     (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
+#define sched_get_priority_min(_pol_) \
+     (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
+#endif
+
+    int max_prio = sched_get_priority_max(policy),
+        min_prio = sched_get_priority_min(policy),
+        prio = GetPriority();
+
+    if ( min_prio == -1 || max_prio == -1 )
+    {
+        wxLogError(_("Cannot get priority range for scheduling policy %d."),
+                   policy);
+    }
+    else if ( max_prio == min_prio )
+    {
+        if ( prio != wxPRIORITY_DEFAULT )
+        {
+            // notify the programmer that this doesn't work here
+            wxLogWarning(_("Thread priority setting is ignored."));
+        }
+        //else: we have default priority, so don't complain
+
+        // anyhow, don't do anything because priority is just ignored
+    }
+    else
+    {
+        struct sched_param sp;
+        if ( pthread_attr_getschedparam(&attr, &sp) != 0 )
+        {
+            wxFAIL_MSG(wxT("pthread_attr_getschedparam() failed"));
+        }
+
+        sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100;
+
+        if ( pthread_attr_setschedparam(&attr, &sp) != 0 )
+        {
+            wxFAIL_MSG(wxT("pthread_attr_setschedparam(priority) failed"));
+        }
+    }
+#endif // HAVE_THREAD_PRIORITY_FUNCTIONS
+
+#ifdef HAVE_PTHREAD_ATTR_SETSCOPE
+    // this will make the threads created by this process really concurrent
+    if ( pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) != 0 )
+    {
+        wxFAIL_MSG(wxT("pthread_attr_setscope(PTHREAD_SCOPE_SYSTEM) failed"));
+    }
+#endif // HAVE_PTHREAD_ATTR_SETSCOPE
+
+    // VZ: assume that this one is always available (it's rather fundamental),
+    //     if this function is ever missing we should try to use
+    //     pthread_detach() instead (after thread creation)
+    if ( thread->IsDetached() )
+    {
+        if ( pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0 )
+        {
+            wxFAIL_MSG(wxT("pthread_attr_setdetachstate(DETACHED) failed"));
+        }
+
+        // never try to join detached threads
+        Detach();
+    }
+    //else: threads are created joinable by default, it's ok
+
+    // create the new OS thread object
+    int rc = pthread_create
+             (
+                GetIdPtr(),
+                &attr,
+                wxPthreadStart,
+                (void *)thread
+             );
+
+    if ( pthread_attr_destroy(&attr) != 0 )
+    {
+        wxFAIL_MSG(wxT("pthread_attr_destroy() failed"));
+    }
+
+    if ( rc != 0 )
+    {
+        SetState(STATE_EXITED);
+
+        return wxTHREAD_NO_RESOURCE;
+    }
+
+    m_created = true;
+    return wxTHREAD_NO_ERROR;
+}
+
 wxThreadError wxThreadInternal::Run()
 {
     wxCHECK_MSG( GetState() == STATE_NEW, wxTHREAD_RUNNING,
@@ -1127,18 +1279,23 @@ wxThreadIdType wxThread::GetCurrentId()
 
 bool wxThread::SetConcurrency(size_t level)
 {
-#ifdef HAVE_THR_SETCONCURRENCY
+#ifdef HAVE_PTHREAD_SET_CONCURRENCY
+    int rc = pthread_setconcurrency( level );
+#elif defined(HAVE_THR_SETCONCURRENCY)
     int rc = thr_setconcurrency(level);
-    if ( rc != 0 )
-    {
-        wxLogSysError(rc, wxT("thr_setconcurrency() failed"));
-    }
-
-    return rc == 0;
 #else // !HAVE_THR_SETCONCURRENCY
     // ok only for the default value
-    return level == 0;
+    int rc = level == 0 ? 0 : -1;
 #endif // HAVE_THR_SETCONCURRENCY/!HAVE_THR_SETCONCURRENCY
+
+    if ( rc != 0 )
+    {
+        wxLogSysError(rc, _("Failed to set thread concurrency level to %lu"),
+                      static_cast<unsigned long>(level));
+        return false;
+    }
+
+    return true;
 }
 
 // -----------------------------------------------------------------------------
@@ -1159,136 +1316,25 @@ wxThread::wxThread(wxThreadKind kind)
     m_isDetached = kind == wxTHREAD_DETACHED;
 }
 
-#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
-    #define WXUNUSED_STACKSIZE(identifier)  identifier
-#else
-    #define WXUNUSED_STACKSIZE(identifier)  WXUNUSED(identifier)
-#endif
-
-wxThreadError wxThread::Create(unsigned int WXUNUSED_STACKSIZE(stackSize))
+wxThreadError wxThread::Create(unsigned int stackSize)
 {
-    if ( m_internal->GetState() != STATE_NEW )
-    {
-        // don't recreate thread
-        return wxTHREAD_RUNNING;
-    }
+    wxCriticalSectionLocker lock(m_critsect);
 
-    // set up the thread attribute: right now, we only set thread priority
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-
-#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
-    if (stackSize)
-      pthread_attr_setstacksize(&attr, stackSize);
-#endif
-
-#ifdef HAVE_THREAD_PRIORITY_FUNCTIONS
-    int policy;
-    if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
-    {
-        wxLogError(_("Cannot retrieve thread scheduling policy."));
-    }
-
-#ifdef __VMS__
-   /* the pthread.h contains too many spaces. This is a work-around */
-# undef sched_get_priority_max
-#undef sched_get_priority_min
-#define sched_get_priority_max(_pol_) \
-     (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
-#define sched_get_priority_min(_pol_) \
-     (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
-#endif
-
-    int max_prio = sched_get_priority_max(policy),
-        min_prio = sched_get_priority_min(policy),
-        prio = m_internal->GetPriority();
-
-    if ( min_prio == -1 || max_prio == -1 )
-    {
-        wxLogError(_("Cannot get priority range for scheduling policy %d."),
-                   policy);
-    }
-    else if ( max_prio == min_prio )
-    {
-        if ( prio != WXTHREAD_DEFAULT_PRIORITY )
-        {
-            // notify the programmer that this doesn't work here
-            wxLogWarning(_("Thread priority setting is ignored."));
-        }
-        //else: we have default priority, so don't complain
-
-        // anyhow, don't do anything because priority is just ignored
-    }
-    else
-    {
-        struct sched_param sp;
-        if ( pthread_attr_getschedparam(&attr, &sp) != 0 )
-        {
-            wxFAIL_MSG(wxT("pthread_attr_getschedparam() failed"));
-        }
-
-        sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100;
-
-        if ( pthread_attr_setschedparam(&attr, &sp) != 0 )
-        {
-            wxFAIL_MSG(wxT("pthread_attr_setschedparam(priority) failed"));
-        }
-    }
-#endif // HAVE_THREAD_PRIORITY_FUNCTIONS
-
-#ifdef HAVE_PTHREAD_ATTR_SETSCOPE
-    // this will make the threads created by this process really concurrent
-    if ( pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) != 0 )
-    {
-        wxFAIL_MSG(wxT("pthread_attr_setscope(PTHREAD_SCOPE_SYSTEM) failed"));
-    }
-#endif // HAVE_PTHREAD_ATTR_SETSCOPE
-
-    // VZ: assume that this one is always available (it's rather fundamental),
-    //     if this function is ever missing we should try to use
-    //     pthread_detach() instead (after thread creation)
-    if ( m_isDetached )
-    {
-        if ( pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0 )
-        {
-            wxFAIL_MSG(wxT("pthread_attr_setdetachstate(DETACHED) failed"));
-        }
-
-        // never try to join detached threads
-        m_internal->Detach();
-    }
-    //else: threads are created joinable by default, it's ok
-
-    // create the new OS thread object
-    int rc = pthread_create
-             (
-                m_internal->GetIdPtr(),
-                &attr,
-                wxPthreadStart,
-                (void *)this
-             );
-
-    if ( pthread_attr_destroy(&attr) != 0 )
-    {
-        wxFAIL_MSG(wxT("pthread_attr_destroy() failed"));
-    }
-
-    if ( rc != 0 )
-    {
-        m_internal->SetState(STATE_EXITED);
-
-        return wxTHREAD_NO_RESOURCE;
-    }
-
-    return wxTHREAD_NO_ERROR;
+    return m_internal->Create(this, stackSize);
 }
 
 wxThreadError wxThread::Run()
 {
     wxCriticalSectionLocker lock(m_critsect);
 
-    wxCHECK_MSG( m_internal->GetId(), wxTHREAD_MISC_ERROR,
-                 wxT("must call wxThread::Create() first") );
+    // Create the thread if it wasn't created yet with an explicit
+    // Create() call:
+    if ( !m_internal->WasCreated() )
+    {
+        wxThreadError rv = m_internal->Create(this, 0);
+        if ( rv != wxTHREAD_NO_ERROR )
+            return rv;
+    }
 
     return m_internal->Run();
 }
@@ -1299,8 +1345,7 @@ wxThreadError wxThread::Run()
 
 void wxThread::SetPriority(unsigned int prio)
 {
-    wxCHECK_RET( ((int)WXTHREAD_MIN_PRIORITY <= (int)prio) &&
-                 ((int)prio <= (int)WXTHREAD_MAX_PRIORITY),
+    wxCHECK_RET( wxPRIORITY_MIN <= prio && prio <= wxPRIORITY_MAX,
                  wxT("invalid thread priority") );
 
     wxCriticalSectionLocker lock(m_critsect);
@@ -1326,8 +1371,7 @@ void wxThread::SetPriority(unsigned int prio)
             //
             // FIXME this is not true for 2.6!!
 
-            // map wx priorites WXTHREAD_MIN_PRIORITY..WXTHREAD_MAX_PRIORITY
-            // to Unix priorities 20..-20
+            // map wx priorites 0..100 to Unix priorities 20..-20
             if ( setpriority(PRIO_PROCESS, 0, -(2*(int)prio)/5 + 20) == -1 )
             {
                 wxLogError(_("Failed to set thread priority %d."), prio);
@@ -1832,7 +1876,7 @@ static void DeleteThread(wxThread *This)
     }
 }
 
-#ifndef __WXOSX__
+#ifndef __DARWIN__
 
 void wxMutexGuiEnterImpl()
 {
diff --git a/Externals/wxWidgets3/src/unix/timerunx.cpp b/Externals/wxWidgets3/src/unix/timerunx.cpp
index e20034b32c..1d99805f54 100644
--- a/Externals/wxWidgets3/src/unix/timerunx.cpp
+++ b/Externals/wxWidgets3/src/unix/timerunx.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTimer implementation for non-GUI applications under Unix
 // Author:      Lukasz Michalski
 // Created:     15/01/2005
-// RCS-ID:      $Id: timerunx.cpp 69839 2011-11-27 19:50:33Z VZ $
 // Copyright:   (c) 2007 Lukasz Michalski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Externals/wxWidgets3/src/unix/uiactionx11.cpp b/Externals/wxWidgets3/src/unix/uiactionx11.cpp
index c9e87870fe..a19a3d2284 100644
--- a/Externals/wxWidgets3/src/unix/uiactionx11.cpp
+++ b/Externals/wxWidgets3/src/unix/uiactionx11.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
-// RCS-ID:      $Id: uiactionx11.cpp 69626 2011-11-01 12:04:27Z VZ $
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
@@ -16,6 +15,8 @@
 #if wxUSE_UIACTIONSIMULATOR
 
 #include "wx/uiaction.h"
+#include "wx/event.h"
+#include "wx/evtloop.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -88,6 +89,15 @@ bool wxUIActionSimulator::MouseMove(long x, long y)
     Window root = display.DefaultRoot();
     XWarpPointer(display, None, root, 0, 0, 0, 0, x, y);
 
+    // At least with wxGTK we must always process the pending events before the
+    // mouse position change really takes effect, so just do it from here
+    // instead of forcing the client code using this function to always use
+    // wxYield() which is unnecessary under the other platforms.
+    if ( wxEventLoopBase* const loop = wxEventLoop::GetActive() )
+    {
+        loop->YieldFor(wxEVT_CATEGORY_USER_INPUT);
+    }
+
     return true;
 }
 
diff --git a/Externals/wxWidgets3/src/unix/utilsunx.cpp b/Externals/wxWidgets3/src/unix/utilsunx.cpp
index 8ee71798fb..450966d1fe 100644
--- a/Externals/wxWidgets3/src/unix/utilsunx.cpp
+++ b/Externals/wxWidgets3/src/unix/utilsunx.cpp
@@ -2,8 +2,8 @@
 // Name:        src/unix/utilsunx.cpp
 // Purpose:     generic Unix implementation of many wx functions (for wxBase)
 // Author:      Vadim Zeitlin
-// Id:          $Id: utilsunx.cpp 67411 2011-04-06 17:04:12Z PC $
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
+//              (c) 2013 Rob Bresalier, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -37,6 +37,7 @@
 #include "wx/apptrait.h"
 
 #include "wx/process.h"
+#include "wx/scopedptr.h"
 #include "wx/thread.h"
 
 #include "wx/cmdline.h"
@@ -46,11 +47,12 @@
 #include "wx/private/selectdispatcher.h"
 #include "wx/private/fdiodispatcher.h"
 #include "wx/unix/execute.h"
+#include "wx/unix/pipe.h"
 #include "wx/unix/private.h"
 
-#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
-#include "wx/private/fdiodispatcher.h"
-#endif
+#include "wx/evtloop.h"
+#include "wx/mstream.h"
+#include "wx/private/fdioeventloopsourcehandler.h"
 
 #include <pwd.h>
 #include <sys/wait.h>       // waitpid()
@@ -63,32 +65,12 @@
 
 #if HAS_PIPE_STREAMS
 
-// define this to let wxexec.cpp know that we know what we're doing
-#define _WX_USED_BY_WXEXECUTE_
-#include "../common/execcmn.cpp"
+#include "wx/private/pipestream.h"
+#include "wx/private/streamtempinput.h"
+#include "wx/unix/private/executeiohandler.h"
 
 #endif // HAS_PIPE_STREAMS
 
-#if defined(__MWERKS__) && defined(__MACH__)
-    #ifndef WXWIN_OS_DESCRIPTION
-        #define WXWIN_OS_DESCRIPTION "MacOS X"
-    #endif
-    #ifndef HAVE_NANOSLEEP
-        #define HAVE_NANOSLEEP
-    #endif
-    #ifndef HAVE_UNAME
-        #define HAVE_UNAME
-    #endif
-
-    // our configure test believes we can use sigaction() if the function is
-    // available but Metrowekrs with MSL run-time does have the function but
-    // doesn't have sigaction struct so finally we can't use it...
-    #ifdef __MSL__
-        #undef wxUSE_ON_FATAL_EXCEPTION
-        #define wxUSE_ON_FATAL_EXCEPTION 0
-    #endif
-#endif
-
 // not only the statfs syscall is called differently depending on platform, but
 // one of its incarnations, statvfs(), takes different arguments under
 // different platforms and even different versions of the same system (Solaris
@@ -137,7 +119,6 @@
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>
-#include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 #include <sys/time.h>       // needed for FD_SETSIZE
@@ -152,6 +133,10 @@
     #include <sys/sysinfo.h>   // for SAGET and MINFO structures
 #endif
 
+#ifdef HAVE_SETPRIORITY
+    #include <sys/resource.h>   // for setpriority()
+#endif
+
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
@@ -502,6 +487,83 @@ long wxExecute(wchar_t **wargv, int flags, wxProcess *process,
 
 #endif // wxUSE_UNICODE
 
+namespace
+{
+
+// Helper function of wxExecute(): wait for the process termination without
+// dispatching any events.
+//
+// This is used in wxEXEC_NOEVENTS case.
+int BlockUntilChildExit(wxExecuteData& execData)
+{
+    wxCHECK_MSG( wxTheApp, -1,
+                    wxS("Can't block until child exit without wxTheApp") );
+
+#if wxUSE_SELECT_DISPATCHER
+
+    // Even if we don't want to dispatch events, we still need to handle
+    // child IO notifications and process termination concurrently, i.e.
+    // we can't simply block waiting for the child to terminate as we would
+    // dead lock if it writes more than the pipe buffer size (typically
+    // 4KB) bytes of output -- it would then block waiting for us to read
+    // the data while we'd block waiting for it to terminate.
+    //
+    // So while we don't use the full blown event loop, we still do use a
+    // dispatcher with which we register just the 3 FDs we're interested
+    // in: the child stdout and stderr and the pipe written to by the
+    // signal handler so that we could react to the child process
+    // termination too.
+
+    // Notice that we must create a new dispatcher object here instead of
+    // reusing the global wxFDIODispatcher::Get() because we want to
+    // monitor only the events on the FDs explicitly registered with this
+    // one and not all the other ones that could be registered with the
+    // global dispatcher (think about the case of nested wxExecute() calls).
+    wxSelectDispatcher dispatcher;
+
+    // Do register all the FDs we want to monitor here: first, the one used to
+    // handle the signals asynchronously.
+    wxScopedPtr<wxFDIOHandler>
+        signalHandler(wxTheApp->RegisterSignalWakeUpPipe(dispatcher));
+
+#if wxUSE_STREAMS
+    // And then the two for the child output and error streams if necessary.
+    wxScopedPtr<wxFDIOHandler>
+        stdoutHandler,
+        stderrHandler;
+    if ( execData.IsRedirected() )
+    {
+        stdoutHandler.reset(new wxExecuteFDIOHandler
+                                (
+                                    dispatcher,
+                                    execData.fdOut,
+                                    execData.bufOut
+                                ));
+        stderrHandler.reset(new wxExecuteFDIOHandler
+                                (
+                                    dispatcher,
+                                    execData.fdErr,
+                                    execData.bufErr
+                                ));
+    }
+#endif // wxUSE_STREAMS
+
+    // And dispatch until the PID is reset from wxExecuteData::OnExit().
+    while ( execData.pid )
+    {
+        dispatcher.Dispatch();
+    }
+
+    return execData.exitcode;
+#else // !wxUSE_SELECT_DISPATCHER
+    wxFAIL_MSG( wxS("Can't block until child exit without wxSelectDispatcher") );
+
+    return -1;
+#endif // wxUSE_SELECT_DISPATCHER/!wxUSE_SELECT_DISPATCHER
+}
+
+} // anonymous namespace
+
 // wxExecute: the real worker function
 long wxExecute(char **argv, int flags, wxProcess *process,
         const wxExecuteEnv *env)
@@ -536,21 +598,14 @@ long wxExecute(char **argv, int flags, wxProcess *process,
     }
 #endif // __DARWIN__
 
-
     // this struct contains all information which we use for housekeeping
-    wxExecuteData execData;
+    wxScopedPtr<wxExecuteData> execDataPtr(new wxExecuteData);
+    wxExecuteData& execData = *execDataPtr;
+
     execData.flags = flags;
     execData.process = process;
 
-    // create pipes
-    if ( !execData.pipeEndProcDetect.Create() )
-    {
-        wxLogError( _("Failed to execute '%s'\n"), *argv );
-
-        return ERROR_RETURN_CODE;
-    }
-
-    // pipes for inter process communication
+    // create pipes for inter process communication
     wxPipe pipeIn,      // stdin
            pipeOut,     // stdout
            pipeErr;     // stderr
@@ -565,6 +620,21 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         }
     }
 
+    // priority: we need to map wxWidgets priority which is in the range 0..100
+    // to Unix nice value which is in the range -20..19. As there is an odd
+    // number of elements in our range and an even number in the Unix one, we
+    // have to do it in this rather ugly way to guarantee that:
+    //  1. wxPRIORITY_{MIN,DEFAULT,MAX} map to -20, 0 and 19 respectively.
+    //  2. The mapping is monotonously increasing.
+    //  3. The mapping is onto the target range.
+    int prio = process ? int(process->GetPriority()) : int(wxPRIORITY_DEFAULT);
+    if ( prio <= 50 )
+        prio = (2*prio)/5 - 20;
+    else if ( prio < 55 )
+        prio = 1;
+    else
+        prio = (2*prio)/5 - 21;
+
     // fork the process
     //
     // NB: do *not* use vfork() here, it completely breaks this code for some
@@ -598,6 +668,13 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         }
 #endif // !__VMS
 
+#if defined(HAVE_SETPRIORITY)
+        if ( prio && setpriority(PRIO_PROCESS, 0, prio) != 0 )
+        {
+            wxLogSysError(_("Failed to set process priority"));
+        }
+#endif // HAVE_SETPRIORITY
+
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
         {
@@ -620,13 +697,7 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         // the descriptors do not need to be closed but for now this is better
         // than never closing them at all as wx code never used FD_CLOEXEC.
 
-        // Note that while the reading side of the end process detection pipe
-        // can be safely closed, we should keep the write one opened, it will
-        // be only closed when the process terminates resulting in a read
-        // notification to the parent
-        const int fdEndProc = execData.pipeEndProcDetect.Detach(wxPipe::Write);
-        execData.pipeEndProcDetect.Close();
-
+#ifdef __DARWIN__
         // TODO: Iterating up to FD_SETSIZE is both inefficient (because it may
         //       be quite big) and incorrect (because in principle we could
         //       have more opened descriptions than this number). Unfortunately
@@ -634,16 +705,24 @@ long wxExecute(char **argv, int flags, wxProcess *process,
         //       above a certain threshold but non-portable solutions exist for
         //       most platforms, see [http://stackoverflow.com/questions/899038/
         //          getting-the-highest-allocated-file-descriptor]
+        //
+        // Unfortunately, we cannot do this safely on OS X, because libdispatch
+        // may crash when we do this:
+        //     Exception Type:  EXC_BAD_INSTRUCTION (SIGILL)
+        //     Exception Codes: 0x0000000000000001, 0x0000000000000000
+        //
+        //     Application Specific Information:
+        //     BUG IN CLIENT OF LIBDISPATCH: Do not close random Unix descriptors
         for ( int fd = 0; fd < (int)FD_SETSIZE; ++fd )
         {
             if ( fd != STDIN_FILENO  &&
                  fd != STDOUT_FILENO &&
-                 fd != STDERR_FILENO &&
-                 fd != fdEndProc )
+                 fd != STDERR_FILENO )
             {
                 close(fd);
             }
         }
+#endif // !__DARWIN__
 
 
         // Process additional options if we have any
@@ -702,18 +781,11 @@ long wxExecute(char **argv, int flags, wxProcess *process,
     }
     else // we're in parent
     {
-        // save it for WaitForChild() use
-        execData.pid = pid;
-        if (execData.process)
-            execData.process->SetPid(pid);  // and also in the wxProcess
+        execData.OnStart(pid);
 
         // prepare for IO redirection
 
 #if HAS_PIPE_STREAMS
-        // the input buffer bufOut is connected to stdout, this is why it is
-        // called bufOut and not bufIn
-        wxStreamTempInputBuffer bufOut,
-                                bufErr;
 
         if ( process && process->IsRedirected() )
         {
@@ -744,14 +816,14 @@ long wxExecute(char **argv, int flags, wxProcess *process,
 
             process->SetPipeStreams(outStream, inStream, errStream);
 
-            bufOut.Init(outStream);
-            bufErr.Init(errStream);
+            if ( flags & wxEXEC_SYNC )
+            {
+                execData.bufOut.Init(outStream);
+                execData.bufErr.Init(errStream);
 
-            execData.bufOut = &bufOut;
-            execData.bufErr = &bufErr;
-
-            execData.fdOut = fdOut;
-            execData.fdErr = fdErr;
+                execData.fdOut = fdOut;
+                execData.fdErr = fdErr;
+            }
         }
 #endif // HAS_PIPE_STREAMS
 
@@ -762,14 +834,32 @@ long wxExecute(char **argv, int flags, wxProcess *process,
             pipeErr.Close();
         }
 
-        // we want this function to work even if there is no wxApp so ensure
-        // that we have a valid traits pointer
-        wxConsoleAppTraits traitsConsole;
-        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-        if ( !traits )
-            traits = &traitsConsole;
+        // For the asynchronous case we don't have to do anything else, just
+        // let the process run.
+        if ( !(flags & wxEXEC_SYNC) )
+        {
+            // Ensure that the housekeeping data is kept alive, it will be
+            // destroyed only when the child terminates.
+            execDataPtr.release();
 
-        return traits->WaitForChild(execData);
+            return execData.pid;
+        }
+
+
+        // If we don't need to dispatch any events, things are relatively
+        // simple and we don't need to delegate to wxAppTraits.
+        if ( flags & wxEXEC_NOEVENTS )
+        {
+            return BlockUntilChildExit(execData);
+        }
+
+
+        // If we do need to dispatch events, enter a local event loop waiting
+        // until the child exits. As the exact kind of event loop depends on
+        // the sort of application we're in (console or GUI), we delegate this
+        // to wxAppTraits which virtualizes all the differences between the
+        // console and the GUI programs.
+        return wxApp::GetValidTraits().WaitForChild(execData);
     }
 
 #if !defined(__VMS) && !defined(__INTEL_COMPILER)
@@ -834,15 +924,25 @@ wxString wxGetUserHome( const wxString &user )
 // network and user id routines
 // ----------------------------------------------------------------------------
 
-// private utility function which returns output of the given command, removing
-// the trailing newline
-static wxString wxGetCommandOutput(const wxString &cmd)
+// Private utility function which returns output of the given command, removing
+// the trailing newline.
+//
+// Note that by default use Latin-1 just to ensure that we never fail, but if
+// the encoding is known (e.g. UTF-8 for lsb_release), it should be explicitly
+// used instead.
+static wxString
+wxGetCommandOutput(const wxString &cmd, wxMBConv& conv = wxConvISO8859_1)
 {
-    FILE *f = popen(cmd.ToAscii(), "r");
+    // Suppress stderr from the shell to avoid outputting errors if the command
+    // doesn't exist.
+    FILE *f = popen((cmd + " 2>/dev/null").ToAscii(), "r");
     if ( !f )
     {
-        wxLogSysError(wxT("Executing \"%s\" failed"), cmd.c_str());
-        return wxEmptyString;
+        // Notice that this doesn't happen simply if the command doesn't exist,
+        // but only in case of some really catastrophic failure inside popen()
+        // so we should really notify the user about this as this is not normal.
+        wxLogSysError(wxT("Executing \"%s\" failed"), cmd);
+        return wxString();
     }
 
     wxString s;
@@ -852,7 +952,7 @@ static wxString wxGetCommandOutput(const wxString &cmd)
         if ( !fgets(buf, sizeof(buf), f) )
             break;
 
-        s += wxString::FromAscii(buf);
+        s += wxString(buf, conv);
     }
 
     pclose(f);
@@ -993,26 +1093,41 @@ bool wxIsPlatform64Bit()
 }
 
 #ifdef __LINUX__
+
+static bool
+wxGetValueFromLSBRelease(wxString arg, const wxString& lhs, wxString* rhs)
+{
+    // lsb_release seems to just read a global file which is always in UTF-8
+    // and hence its output is always in UTF-8 as well, regardless of the
+    // locale currently configured by our environment.
+    return wxGetCommandOutput(wxS("lsb_release ") + arg, wxConvUTF8)
+                .StartsWith(lhs, rhs);
+}
+
 wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
 {
-    const wxString id = wxGetCommandOutput(wxT("lsb_release --id"));
-    const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
-    const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
-    const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));
-
     wxLinuxDistributionInfo ret;
 
-    id.StartsWith("Distributor ID:\t", &ret.Id);
-    desc.StartsWith("Description:\t", &ret.Description);
-    rel.StartsWith("Release:\t", &ret.Release);
-    codename.StartsWith("Codename:\t", &ret.CodeName);
+    if ( !wxGetValueFromLSBRelease(wxS("--id"), wxS("Distributor ID:\t"),
+                                   &ret.Id) )
+    {
+        // Don't bother to continue, lsb_release is probably not available.
+        return ret;
+    }
+
+    wxGetValueFromLSBRelease(wxS("--description"), wxS("Description:\t"),
+                             &ret.Description);
+    wxGetValueFromLSBRelease(wxS("--release"), wxS("Release:\t"),
+                             &ret.Release);
+    wxGetValueFromLSBRelease(wxS("--codename"), wxS("Codename:\t"),
+                             &ret.CodeName);
 
     return ret;
 }
-#endif
+#endif // __LINUX__
 
 // these functions are in src/osx/utilsexc_base.cpp for wxMac
-#ifndef __WXMAC__
+#ifndef __DARWIN__
 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
@@ -1048,7 +1163,7 @@ wxString wxGetOsDescription()
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 }
 
-#endif // !__WXMAC__
+#endif // !__DARWIN__
 
 unsigned long wxGetProcessId()
 {
@@ -1327,141 +1442,73 @@ bool wxHandleFatalExceptions(bool doit)
 // wxExecute support
 // ----------------------------------------------------------------------------
 
-int wxAppTraits::AddProcessCallback(wxEndProcessData *data, int fd)
+int wxAppTraits::WaitForChild(wxExecuteData& execData)
 {
-    // define a custom handler processing only the closure of the descriptor
-    struct wxEndProcessFDIOHandler : public wxFDIOHandler
+#if wxUSE_CONSOLE_EVENTLOOP
+    wxConsoleEventLoop loop;
+    return RunLoopUntilChildExit(execData, loop);
+#else // !wxUSE_CONSOLE_EVENTLOOP
+    wxFAIL_MSG( wxS("Can't wait for child process without wxConsoleEventLoop") );
+
+    return -1;
+#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP
+}
+
+// This function is common code for both console and GUI applications and used
+// by wxExecute() to wait for the child exit while dispatching events.
+//
+// Notice that it should not be used for all the other cases, e.g. when we
+// don't need to wait for the child (wxEXEC_ASYNC) or when the events must not
+// dispatched (wxEXEC_NOEVENTS).
+int
+wxAppTraits::RunLoopUntilChildExit(wxExecuteData& execData,
+                                   wxEventLoopBase& loop)
+{
+    // It is possible that wxExecuteData::OnExit() had already been called
+    // and reset the PID to 0, in which case we don't need to do anything
+    // at all.
+    if ( !execData.pid )
+        return execData.exitcode;
+
+#if wxUSE_STREAMS
+    // Monitor the child streams if necessary.
+    wxScopedPtr<wxEventLoopSourceHandler>
+        stdoutHandler,
+        stderrHandler;
+    if ( execData.IsRedirected() )
     {
-        wxEndProcessFDIOHandler(wxEndProcessData *data, int fd)
-            : m_data(data), m_fd(fd)
-        {
-        }
+        stdoutHandler.reset(new wxExecuteEventLoopSourceHandler
+                                (
+                                    execData.fdOut, execData.bufOut
+                                ));
+        stderrHandler.reset(new wxExecuteEventLoopSourceHandler
+                                (
+                                    execData.fdErr, execData.bufErr
+                                ));
+    }
+#endif // wxUSE_STREAMS
 
-        virtual void OnReadWaiting()
-        {
-            wxFDIODispatcher::Get()->UnregisterFD(m_fd);
-            close(m_fd);
+    // Store the event loop in the data associated with the child
+    // process so that it could exit the loop when the child exits.
+    execData.syncEventLoop = &loop;
 
-            wxHandleProcessTermination(m_data);
+    // And run it.
+    loop.Run();
 
-            delete this;
-        }
-
-        virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); }
-        virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); }
-
-        wxEndProcessData * const m_data;
-        const int m_fd;
-    };
-
-    wxFDIODispatcher::Get()->RegisterFD
-                             (
-                                 fd,
-                                 new wxEndProcessFDIOHandler(data, fd),
-                                 wxFDIO_INPUT
-                             );
-    return fd; // unused, but return something unique for the tag
+    // The exit code will have been set when the child termination was detected.
+    return execData.exitcode;
 }
 
-bool wxAppTraits::CheckForRedirectedIO(wxExecuteData& execData)
-{
-#if HAS_PIPE_STREAMS
-    bool hasIO = false;
+// ----------------------------------------------------------------------------
+// wxExecuteData
+// ----------------------------------------------------------------------------
 
-    if ( execData.bufOut && execData.bufOut->Update() )
-        hasIO = true;
-
-    if ( execData.bufErr && execData.bufErr->Update() )
-        hasIO = true;
-
-    return hasIO;
-#else // !HAS_PIPE_STREAMS
-    wxUnusedVar(execData);
-
-    return false;
-#endif // HAS_PIPE_STREAMS/!HAS_PIPE_STREAMS
-}
-
-// helper classes/functions used by WaitForChild()
 namespace
 {
 
-// convenient base class for IO handlers which are registered for read
-// notifications only and which also stores the FD we're reading from
-//
-// the derived classes still have to implement OnReadWaiting()
-class wxReadFDIOHandler : public wxFDIOHandler
-{
-public:
-    wxReadFDIOHandler(wxFDIODispatcher& disp, int fd) : m_fd(fd)
-    {
-        if ( fd )
-            disp.RegisterFD(fd, this, wxFDIO_INPUT);
-    }
-
-    virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); }
-    virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); }
-
-protected:
-    const int m_fd;
-
-    wxDECLARE_NO_COPY_CLASS(wxReadFDIOHandler);
-};
-
-// class for monitoring our end of the process detection pipe, simply sets a
-// flag when input on the pipe (which must be due to EOF) is detected
-class wxEndHandler : public wxReadFDIOHandler
-{
-public:
-    wxEndHandler(wxFDIODispatcher& disp, int fd)
-        : wxReadFDIOHandler(disp, fd)
-    {
-        m_terminated = false;
-    }
-
-    bool Terminated() const { return m_terminated; }
-
-    virtual void OnReadWaiting() { m_terminated = true; }
-
-private:
-    bool m_terminated;
-
-    wxDECLARE_NO_COPY_CLASS(wxEndHandler);
-};
-
-#if HAS_PIPE_STREAMS
-
-// class for monitoring our ends of child stdout/err, should be constructed
-// with the FD and stream from wxExecuteData and will do nothing if they're
-// invalid
-//
-// unlike wxEndHandler this class registers itself with the provided dispatcher
-class wxRedirectedIOHandler : public wxReadFDIOHandler
-{
-public:
-    wxRedirectedIOHandler(wxFDIODispatcher& disp,
-                          int fd,
-                          wxStreamTempInputBuffer *buf)
-        : wxReadFDIOHandler(disp, fd),
-          m_buf(buf)
-    {
-    }
-
-    virtual void OnReadWaiting()
-    {
-        m_buf->Update();
-    }
-
-private:
-    wxStreamTempInputBuffer * const m_buf;
-
-    wxDECLARE_NO_COPY_CLASS(wxRedirectedIOHandler);
-};
-
-#endif // HAS_PIPE_STREAMS
-
-// helper function which calls waitpid() and analyzes the result
-int DoWaitForChild(int pid, int flags = 0)
+// Helper function that checks whether the child with the given PID has exited
+// and fills the provided parameter with its return code if it did.
+bool CheckForChildExit(int pid, int* exitcodeOut)
 {
     wxASSERT_MSG( pid > 0, "invalid PID" );
 
@@ -1470,124 +1517,150 @@ int DoWaitForChild(int pid, int flags = 0)
     // loop while we're getting EINTR
     for ( ;; )
     {
-        rc = waitpid(pid, &status, flags);
+        rc = waitpid(pid, &status, WNOHANG);
 
         if ( rc != -1 || errno != EINTR )
             break;
     }
 
-    if ( rc == 0 )
+    switch ( rc )
     {
-        // This can only happen if the child application closes our dummy pipe
-        // that is used to monitor its lifetime; in that case, our best bet is
-        // to pretend the process did terminate, because otherwise wxExecute()
-        // would hang indefinitely (OnReadWaiting() won't be called again, the
-        // descriptor is closed now).
-        wxLogDebug("Child process (PID %d) still alive but pipe closed so "
-                   "generating a close notification", pid);
-    }
-    else if ( rc == -1 )
-    {
-        wxLogLastError(wxString::Format("waitpid(%d)", pid));
-    }
-    else // child did terminate
-    {
-        wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" );
+        case 0:
+            // No error but the child is still running.
+            return false;
 
-        // notice that the caller expects the exit code to be signed, e.g. -1
-        // instead of 255 so don't assign WEXITSTATUS() to an int
-        signed char exitcode;
-        if ( WIFEXITED(status) )
-            exitcode = WEXITSTATUS(status);
-        else if ( WIFSIGNALED(status) )
-            exitcode = -WTERMSIG(status);
-        else
-        {
-            wxLogError("Child process (PID %d) exited for unknown reason, "
-                       "status = %d", pid, status);
-            exitcode = -1;
-        }
+        case -1:
+            // Checking child status failed. Invalid PID?
+            wxLogLastError(wxString::Format("waitpid(%d)", pid));
+            return false;
 
-        return exitcode;
+        default:
+            // Child did terminate.
+            wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" );
+
+            // notice that the caller expects the exit code to be signed, e.g. -1
+            // instead of 255 so don't assign WEXITSTATUS() to an int
+            signed char exitcode;
+            if ( WIFEXITED(status) )
+                exitcode = WEXITSTATUS(status);
+            else if ( WIFSIGNALED(status) )
+                exitcode = -WTERMSIG(status);
+            else
+            {
+                wxLogError("Child process (PID %d) exited for unknown reason, "
+                           "status = %d", pid, status);
+                exitcode = -1;
+            }
+
+            if ( exitcodeOut )
+                *exitcodeOut = exitcode;
+
+            return true;
     }
-
-    return -1;
 }
 
 } // anonymous namespace
 
-int wxAppTraits::WaitForChild(wxExecuteData& execData)
+wxExecuteData::ChildProcessesData wxExecuteData::ms_childProcesses;
+
+/* static */
+void wxExecuteData::OnSomeChildExited(int WXUNUSED(sig))
 {
-    if ( !(execData.flags & wxEXEC_SYNC) )
-    {
-        // asynchronous execution: just launch the process and return,
-        // endProcData will be destroyed when it terminates (currently we leak
-        // it if the process doesn't terminate before we do and this should be
-        // fixed but it's not a real leak so it's not really very high
-        // priority)
-        wxEndProcessData *endProcData = new wxEndProcessData;
-        endProcData->process = execData.process;
-        endProcData->pid = execData.pid;
-        endProcData->tag = AddProcessCallback
-                           (
-                             endProcData,
-                             execData.GetEndProcReadFD()
-                           );
-        endProcData->async = true;
+    // We know that some child process has terminated, but we don't know which
+    // one, so check all of them (notice that more than one could have exited).
+    //
+    // An alternative approach would be to call waitpid(-1, &status, WNOHANG)
+    // (in a loop to take care of the multiple children exiting case) and
+    // perhaps this would be more efficient. But for now this seems to work.
 
-        return execData.pid;
-    }
-    //else: synchronous execution case
 
-#if HAS_PIPE_STREAMS && wxUSE_SOCKETS
-    wxProcess * const process = execData.process;
-    if ( process && process->IsRedirected() )
+    // Make a copy of the list before iterating over it to avoid problems due
+    // to deleting entries from it in the process.
+    const ChildProcessesData allChildProcesses = ms_childProcesses;
+    for ( ChildProcessesData::const_iterator it = allChildProcesses.begin();
+          it != allChildProcesses.end();
+          ++it )
     {
-        // we can't simply block waiting for the child to terminate as we would
-        // dead lock if it writes more than the pipe buffer size (typically
-        // 4KB) bytes of output -- it would then block waiting for us to read
-        // the data while we'd block waiting for it to terminate
+        const int pid = it->first;
+
+        // Check whether this child exited.
+        int exitcode;
+        if ( !CheckForChildExit(pid, &exitcode) )
+            continue;
+
+        // And handle its termination if it did.
         //
-        // so multiplex here waiting for any input from the child or closure of
-        // the pipe used to indicate its termination
-        wxSelectDispatcher disp;
-
-        wxEndHandler endHandler(disp, execData.GetEndProcReadFD());
-
-        wxRedirectedIOHandler outHandler(disp, execData.fdOut, execData.bufOut),
-                              errHandler(disp, execData.fdErr, execData.bufErr);
-
-        while ( !endHandler.Terminated() )
-        {
-            disp.Dispatch();
-        }
+        // Notice that this will implicitly remove it from ms_childProcesses.
+        it->second->OnExit(exitcode);
     }
-    //else: no IO redirection, just block waiting for the child to exit
-#endif // HAS_PIPE_STREAMS
-
-    return DoWaitForChild(execData.pid);
 }
 
-void wxHandleProcessTermination(wxEndProcessData *data)
+void wxExecuteData::OnStart(int pid_)
 {
-    data->exitcode = DoWaitForChild(data->pid, WNOHANG);
+    wxCHECK_RET( wxTheApp,
+                 wxS("Ensure wxTheApp is set before calling wxExecute()") );
 
-    // notify user about termination if required
-    if ( data->process )
+    // Setup the signal handler for SIGCHLD to be able to detect the child
+    // termination.
+    //
+    // Notice that SetSignalHandler() is idempotent, so it's fine to call
+    // it more than once with the same handler.
+    wxTheApp->SetSignalHandler(SIGCHLD, OnSomeChildExited);
+
+
+    // Remember the child PID to be able to wait for it later.
+    pid = pid_;
+
+    // Also save it in wxProcess where it will be accessible to the user code.
+    if ( process )
+        process->SetPid(pid);
+
+    // Finally, add this object itself to the list of child processes so that
+    // we can check for its termination the next time we get SIGCHLD.
+    ms_childProcesses[pid] = this;
+}
+
+void wxExecuteData::OnExit(int exitcode_)
+{
+    // Remove this process from the hash list of child processes that are
+    // still open as soon as possible to ensure we don't process it again even
+    // if another SIGCHLD happens.
+    if ( !ms_childProcesses.erase(pid) )
     {
-        data->process->OnTerminate(data->pid, data->exitcode);
+        wxFAIL_MSG(wxString::Format(wxS("Data for PID %d not in the list?"), pid));
     }
 
-    if ( data->async )
+
+    exitcode = exitcode_;
+
+#if wxUSE_STREAMS
+    if ( IsRedirected() )
     {
-        // in case of asynchronous execution we don't need this data any more
+        // Read the remaining data in a blocking way: this is fine because the
+        // child has already exited and hence all the data must be already
+        // available in the streams buffers.
+        bufOut.ReadAll();
+        bufErr.ReadAll();
+    }
+#endif // wxUSE_STREAMS
+
+    // Notify user about termination if required
+    if ( !(flags & wxEXEC_SYNC) )
+    {
+        if ( process )
+            process->OnTerminate(pid, exitcode);
+
+        // in case of asynchronous execution we don't need this object any more
         // after the child terminates
-        delete data;
+        delete this;
     }
     else // sync execution
     {
         // let wxExecute() know that the process has terminated
-        data->pid = 0;
+        pid = 0;
+
+        // Stop the event loop for synchronous wxExecute() if we're running one.
+        if ( syncEventLoop )
+            syncEventLoop->ScheduleExit();
     }
 }
-
diff --git a/Externals/wxWidgets3/src/unix/utilsx11.cpp b/Externals/wxWidgets3/src/unix/utilsx11.cpp
index c5fc2e7421..12ff73e6a3 100644
--- a/Externals/wxWidgets3/src/unix/utilsx11.cpp
+++ b/Externals/wxWidgets3/src/unix/utilsx11.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon, Vaclav Slavik, Robert Roebling
 // Modified by:
 // Created:     25.03.02
-// RCS-ID:      $Id: utilsx11.cpp 70741 2012-02-28 18:23:39Z PC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,8 +37,13 @@
 
 #ifdef __WXGTK__
 #include <gdk/gdk.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#endif
+
+// Only X11 backend is supported for wxGTK here
+#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;
@@ -849,6 +853,8 @@ bool wxGetKeyState(wxKeyCode key)
     return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 
+#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
+
 // ----------------------------------------------------------------------------
 // Launch document with default app
 // ----------------------------------------------------------------------------
diff --git a/Externals/wxWidgets3/src/unix/wakeuppipe.cpp b/Externals/wxWidgets3/src/unix/wakeuppipe.cpp
new file mode 100644
index 0000000000..1bd33d6021
--- /dev/null
+++ b/Externals/wxWidgets3/src/unix/wakeuppipe.cpp
@@ -0,0 +1,128 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/unix/wakeuppipe.cpp
+// Purpose:     Implementation of wxWakeUpPipe class.
+// Author:      Vadim Zeitlin
+// Created:     2013-06-09 (extracted from src/unix/evtloopunix.cpp)
+// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif // WX_PRECOMP
+
+#include "wx/unix/private/wakeuppipe.h"
+
+#include <errno.h>
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#define TRACE_EVENTS wxT("events")
+
+// ============================================================================
+// wxWakeUpPipe implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// initialization
+// ----------------------------------------------------------------------------
+
+wxWakeUpPipe::wxWakeUpPipe()
+{
+    m_pipeIsEmpty = true;
+
+    if ( !m_pipe.Create() )
+    {
+        wxLogError(_("Failed to create wake up pipe used by event loop."));
+        return;
+    }
+
+
+    if ( !m_pipe.MakeNonBlocking(wxPipe::Read) )
+    {
+        wxLogSysError(_("Failed to switch wake up pipe to non-blocking mode"));
+        return;
+    }
+
+    wxLogTrace(TRACE_EVENTS, wxT("Wake up pipe (%d, %d) created"),
+               m_pipe[wxPipe::Read], m_pipe[wxPipe::Write]);
+}
+
+// ----------------------------------------------------------------------------
+// wakeup handling
+// ----------------------------------------------------------------------------
+
+void wxWakeUpPipe::WakeUpNoLock()
+{
+    // No need to do anything if the pipe already contains something.
+    if ( !m_pipeIsEmpty )
+      return;
+
+    if ( write(m_pipe[wxPipe::Write], "s", 1) != 1 )
+    {
+        // don't use wxLog here, we can be in another thread and this could
+        // result in dead locks
+        perror("write(wake up pipe)");
+    }
+    else
+    {
+        // We just wrote to it, so it's not empty any more.
+        m_pipeIsEmpty = false;
+    }
+}
+
+void wxWakeUpPipe::OnReadWaiting()
+{
+    // got wakeup from child thread, remove the data that provoked it from the
+    // pipe
+
+    char buf[4];
+    for ( ;; )
+    {
+        const int size = read(GetReadFd(), buf, WXSIZEOF(buf));
+
+        if ( size > 0 )
+        {
+            wxASSERT_MSG( size == 1, "Too many writes to wake-up pipe?" );
+
+            break;
+        }
+
+        if ( size == 0 || (size == -1 && errno == EAGAIN) )
+        {
+            // No data available, not an error (but still surprising,
+            // spurious wakeup?)
+            break;
+        }
+
+        if ( errno == EINTR )
+        {
+            // We were interrupted, try again.
+            continue;
+        }
+
+        wxLogSysError(_("Failed to read from wake-up pipe"));
+
+        return;
+    }
+
+    // The pipe is empty now, so future calls to WakeUp() would need to write
+    // to it again.
+    m_pipeIsEmpty = true;
+}
diff --git a/Externals/wxWidgets3/wx/wxcocoa.h b/Externals/wxWidgets3/wx/wxcocoa.h
index 33a19cda5b..e05ccb3909 100644
--- a/Externals/wxWidgets3/wx/wxcocoa.h
+++ b/Externals/wxWidgets3/wx/wxcocoa.h
@@ -1267,5 +1267,8 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 /* #undef wxHAS_WORKING_GTK_DC_BLIT */
 
+#define wxUSE_COMPILER_TLS 1
+#define wxUSE_PREFERENCES_EDITOR 1
+
 #endif /* __WX_SETUP_H__ */
 
diff --git a/Externals/wxWidgets3/wx/wxgtk.h b/Externals/wxWidgets3/wx/wxgtk.h
index bcbdd9be37..c8c4eba86b 100644
--- a/Externals/wxWidgets3/wx/wxgtk.h
+++ b/Externals/wxWidgets3/wx/wxgtk.h
@@ -1256,5 +1256,8 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 /* #undef wxHAS_WORKING_GTK_DC_BLIT */
 
+#define wxUSE_COMPILER_TLS 1
+#define wxUSE_PREFERENCES_EDITOR 1
+
 #endif /* __WX_SETUP_H__ */
 
diff --git a/Externals/wxWidgets3/wx/wxmsw.h b/Externals/wxWidgets3/wx/wxmsw.h
index 0205c8c66e..93950bf567 100644
--- a/Externals/wxWidgets3/wx/wxmsw.h
+++ b/Externals/wxWidgets3/wx/wxmsw.h
@@ -1634,5 +1634,8 @@
 #define wxUSE_CRASHREPORT 1
 /* --- end MSW options --- */
 
+#define wxUSE_COMPILER_TLS 1
+#define wxUSE_PREFERENCES_EDITOR 1
+
 #endif // _WX_SETUP_H_
 
diff --git a/Externals/xxhash/CMakeLists.txt b/Externals/xxhash/CMakeLists.txt
new file mode 100644
index 0000000000..475d2ca43a
--- /dev/null
+++ b/Externals/xxhash/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(xxhash C)
+
+set(SRCS
+	xxhash.c
+)
+
+add_library(xxhash STATIC ${SRCS})
diff --git a/Externals/xxhash/LICENSE b/Externals/xxhash/LICENSE
new file mode 100644
index 0000000000..7de801ed1b
--- /dev/null
+++ b/Externals/xxhash/LICENSE
@@ -0,0 +1,24 @@
+xxHash Library
+Copyright (c) 2012-2014, Yann Collet
+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.
+
+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 HOLDER 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.
diff --git a/Externals/xxhash/xxhash.c b/Externals/xxhash/xxhash.c
new file mode 100644
index 0000000000..24a64b5f80
--- /dev/null
+++ b/Externals/xxhash/xxhash.c
@@ -0,0 +1,928 @@
+/*
+xxHash - Fast Hash algorithm
+Copyright (C) 2012-2014, Yann Collet.
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+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.
+
+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.
+
+You can contact the author at :
+- xxHash source repository : http://code.google.com/p/xxhash/
+- public discussion board : https://groups.google.com/forum/#!forum/lz4c
+*/
+
+
+//**************************************
+// Tuning parameters
+//**************************************
+// Unaligned memory access is automatically enabled for "common" CPU, such as x86.
+// For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected.
+// If you know your target CPU supports unaligned memory access, you want to force this option manually to improve performance.
+// You can also enable this parameter if you know your input data will always be aligned (boundaries of 4, for U32).
+#if defined(__ARM_FEATURE_UNALIGNED) || defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+#  define XXH_USE_UNALIGNED_ACCESS 1
+#endif
+
+// XXH_ACCEPT_NULL_INPUT_POINTER :
+// If the input pointer is a null pointer, xxHash default behavior is to trigger a memory access error, since it is a bad pointer.
+// When this option is enabled, xxHash output for null input pointers will be the same as a null-length input.
+// This option has a very small performance cost (only measurable on small inputs).
+// By default, this option is disabled. To enable it, uncomment below define :
+// #define XXH_ACCEPT_NULL_INPUT_POINTER 1
+
+// XXH_FORCE_NATIVE_FORMAT :
+// By default, xxHash library provides endian-independant Hash values, based on little-endian convention.
+// Results are therefore identical for little-endian and big-endian CPU.
+// This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
+// Should endian-independance be of no importance for your application, you may set the #define below to 1.
+// It will improve speed for Big-endian CPU.
+// This option has no impact on Little_Endian CPU.
+#define XXH_FORCE_NATIVE_FORMAT 0
+
+//**************************************
+// Compiler Specific Options
+//**************************************
+// Disable some Visual warning messages
+#ifdef _MSC_VER  // Visual Studio
+#  pragma warning(disable : 4127)      // disable: C4127: conditional expression is constant
+#endif
+
+#ifdef _MSC_VER    // Visual Studio
+#  define FORCE_INLINE static __forceinline
+#else
+#  ifdef __GNUC__
+#    define FORCE_INLINE static inline __attribute__((always_inline))
+#  else
+#    define FORCE_INLINE static inline
+#  endif
+#endif
+
+//**************************************
+// Includes & Memory related functions
+//**************************************
+#include "xxhash.h"
+// Modify the local functions below should you wish to use some other memory routines
+// for malloc(), free()
+#include <stdlib.h>
+static void* XXH_malloc(size_t s) { return malloc(s); }
+static void  XXH_free  (void* p)  { free(p); }
+// for memcpy()
+#include <string.h>
+static void* XXH_memcpy(void* dest, const void* src, size_t size)
+{
+    return memcpy(dest,src,size);
+}
+
+
+//**************************************
+// Basic Types
+//**************************************
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   // C99
+# include <stdint.h>
+typedef uint8_t  BYTE;
+typedef uint16_t U16;
+typedef uint32_t U32;
+typedef  int32_t S32;
+typedef uint64_t U64;
+#else
+typedef unsigned char      BYTE;
+typedef unsigned short     U16;
+typedef unsigned int       U32;
+typedef   signed int       S32;
+typedef unsigned long long U64;
+#endif
+
+#if defined(__GNUC__)  && !defined(XXH_USE_UNALIGNED_ACCESS)
+#  define _PACKED __attribute__ ((packed))
+#else
+#  define _PACKED
+#endif
+
+#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  ifdef __IBMC__
+#    pragma pack(1)
+#  else
+#    pragma pack(push, 1)
+#  endif
+#endif
+
+typedef struct _U32_S
+{
+    U32 v;
+} _PACKED U32_S;
+typedef struct _U64_S
+{
+    U64 v;
+} _PACKED U64_S;
+
+#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  pragma pack(pop)
+#endif
+
+#define A32(x) (((U32_S *)(x))->v)
+#define A64(x) (((U64_S *)(x))->v)
+
+
+//***************************************
+// Compiler-specific Functions and Macros
+//***************************************
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+// Note : although _rotl exists for minGW (GCC under windows), performance seems poor
+#if defined(_MSC_VER)
+#  define XXH_rotl32(x,r) _rotl(x,r)
+#  define XXH_rotl64(x,r) _rotl64(x,r)
+#else
+#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
+#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
+#endif
+
+#if defined(_MSC_VER)     // Visual Studio
+#  define XXH_swap32 _byteswap_ulong
+#  define XXH_swap64 _byteswap_uint64
+#elif GCC_VERSION >= 403
+#  define XXH_swap32 __builtin_bswap32
+#  define XXH_swap64 __builtin_bswap64
+#else
+static inline U32 XXH_swap32 (U32 x)
+{
+    return  ((x << 24) & 0xff000000 ) |
+            ((x <<  8) & 0x00ff0000 ) |
+            ((x >>  8) & 0x0000ff00 ) |
+            ((x >> 24) & 0x000000ff );
+}
+static inline U64 XXH_swap64 (U64 x)
+{
+    return  ((x << 56) & 0xff00000000000000ULL) |
+            ((x << 40) & 0x00ff000000000000ULL) |
+            ((x << 24) & 0x0000ff0000000000ULL) |
+            ((x << 8)  & 0x000000ff00000000ULL) |
+            ((x >> 8)  & 0x00000000ff000000ULL) |
+            ((x >> 24) & 0x0000000000ff0000ULL) |
+            ((x >> 40) & 0x000000000000ff00ULL) |
+            ((x >> 56) & 0x00000000000000ffULL);
+}
+#endif
+
+
+//**************************************
+// Constants
+//**************************************
+#define PRIME32_1   2654435761U
+#define PRIME32_2   2246822519U
+#define PRIME32_3   3266489917U
+#define PRIME32_4    668265263U
+#define PRIME32_5    374761393U
+
+#define PRIME64_1 11400714785074694791ULL
+#define PRIME64_2 14029467366897019727ULL
+#define PRIME64_3  1609587929392839161ULL
+#define PRIME64_4  9650029242287828579ULL
+#define PRIME64_5  2870177450012600261ULL
+
+//**************************************
+// Architecture Macros
+//**************************************
+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
+#ifndef XXH_CPU_LITTLE_ENDIAN   // It is possible to define XXH_CPU_LITTLE_ENDIAN externally, for example using a compiler switch
+static const int one = 1;
+#   define XXH_CPU_LITTLE_ENDIAN   (*(char*)(&one))
+#endif
+
+
+//**************************************
+// Macros
+//**************************************
+#define XXH_STATIC_ASSERT(c)   { enum { XXH_static_assert = 1/(!!(c)) }; }    // use only *after* variable declarations
+
+
+//****************************
+// Memory reads
+//****************************
+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
+
+FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? A32(ptr) : XXH_swap32(A32(ptr));
+    else
+        return endian==XXH_littleEndian ? *(U32*)ptr : XXH_swap32(*(U32*)ptr);
+}
+
+FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
+}
+
+FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? A64(ptr) : XXH_swap64(A64(ptr));
+    else
+        return endian==XXH_littleEndian ? *(U64*)ptr : XXH_swap64(*(U64*)ptr);
+}
+
+FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
+}
+
+
+//****************************
+// Simple Hash Functions
+//****************************
+FORCE_INLINE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U32 h32;
+#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (p==NULL)
+    {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)16;
+    }
+#endif
+
+    if (len>=16)
+    {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = seed + PRIME32_1 + PRIME32_2;
+        U32 v2 = seed + PRIME32_2;
+        U32 v3 = seed + 0;
+        U32 v4 = seed - PRIME32_1;
+
+        do
+        {
+            v1 += XXH_get32bits(p) * PRIME32_2;
+            v1 = XXH_rotl32(v1, 13);
+            v1 *= PRIME32_1;
+            p+=4;
+            v2 += XXH_get32bits(p) * PRIME32_2;
+            v2 = XXH_rotl32(v2, 13);
+            v2 *= PRIME32_1;
+            p+=4;
+            v3 += XXH_get32bits(p) * PRIME32_2;
+            v3 = XXH_rotl32(v3, 13);
+            v3 *= PRIME32_1;
+            p+=4;
+            v4 += XXH_get32bits(p) * PRIME32_2;
+            v4 = XXH_rotl32(v4, 13);
+            v4 *= PRIME32_1;
+            p+=4;
+        }
+        while (p<=limit);
+
+        h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
+    }
+    else
+    {
+        h32  = seed + PRIME32_5;
+    }
+
+    h32 += (U32) len;
+
+    while (p+4<=bEnd)
+    {
+        h32 += XXH_get32bits(p) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h32 += (*p) * PRIME32_5;
+        h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+
+unsigned int XXH32 (const void* input, size_t len, unsigned seed)
+{
+#if 0
+    // Simple version, good for code maintenance, but unfortunately slow for small inputs
+    XXH32_state_t state;
+    XXH32_reset(&state, seed);
+    XXH32_update(&state, input, len);
+    return XXH32_digest(&state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+#  if !defined(XXH_USE_UNALIGNED_ACCESS)
+    if ((((size_t)input) & 3) == 0)   // Input is aligned, let's leverage the speed advantage
+    {
+        if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+            return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+        else
+            return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }
+#  endif
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+FORCE_INLINE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U64 h64;
+#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (p==NULL)
+    {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)32;
+    }
+#endif
+
+    if (len>=32)
+    {
+        const BYTE* const limit = bEnd - 32;
+        U64 v1 = seed + PRIME64_1 + PRIME64_2;
+        U64 v2 = seed + PRIME64_2;
+        U64 v3 = seed + 0;
+        U64 v4 = seed - PRIME64_1;
+
+        do
+        {
+            v1 += XXH_get64bits(p) * PRIME64_2;
+            p+=8;
+            v1 = XXH_rotl64(v1, 31);
+            v1 *= PRIME64_1;
+            v2 += XXH_get64bits(p) * PRIME64_2;
+            p+=8;
+            v2 = XXH_rotl64(v2, 31);
+            v2 *= PRIME64_1;
+            v3 += XXH_get64bits(p) * PRIME64_2;
+            p+=8;
+            v3 = XXH_rotl64(v3, 31);
+            v3 *= PRIME64_1;
+            v4 += XXH_get64bits(p) * PRIME64_2;
+            p+=8;
+            v4 = XXH_rotl64(v4, 31);
+            v4 *= PRIME64_1;
+        }
+        while (p<=limit);
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+
+        v1 *= PRIME64_2;
+        v1 = XXH_rotl64(v1, 31);
+        v1 *= PRIME64_1;
+        h64 ^= v1;
+        h64 = h64 * PRIME64_1 + PRIME64_4;
+
+        v2 *= PRIME64_2;
+        v2 = XXH_rotl64(v2, 31);
+        v2 *= PRIME64_1;
+        h64 ^= v2;
+        h64 = h64 * PRIME64_1 + PRIME64_4;
+
+        v3 *= PRIME64_2;
+        v3 = XXH_rotl64(v3, 31);
+        v3 *= PRIME64_1;
+        h64 ^= v3;
+        h64 = h64 * PRIME64_1 + PRIME64_4;
+
+        v4 *= PRIME64_2;
+        v4 = XXH_rotl64(v4, 31);
+        v4 *= PRIME64_1;
+        h64 ^= v4;
+        h64 = h64 * PRIME64_1 + PRIME64_4;
+    }
+    else
+    {
+        h64  = seed + PRIME64_5;
+    }
+
+    h64 += (U64) len;
+
+    while (p+8<=bEnd)
+    {
+        U64 k1 = XXH_get64bits(p);
+        k1 *= PRIME64_2;
+        k1 = XXH_rotl64(k1,31);
+        k1 *= PRIME64_1;
+        h64 ^= k1;
+        h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
+        p+=8;
+    }
+
+    if (p+4<=bEnd)
+    {
+        h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1;
+        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h64 ^= (*p) * PRIME64_5;
+        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
+        p++;
+    }
+
+    h64 ^= h64 >> 33;
+    h64 *= PRIME64_2;
+    h64 ^= h64 >> 29;
+    h64 *= PRIME64_3;
+    h64 ^= h64 >> 32;
+
+    return h64;
+}
+
+
+unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
+{
+#if 0
+    // Simple version, good for code maintenance, but unfortunately slow for small inputs
+    XXH64_state_t state;
+    XXH64_reset(&state, seed);
+    XXH64_update(&state, input, len);
+    return XXH64_digest(&state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+#  if !defined(XXH_USE_UNALIGNED_ACCESS)
+    if ((((size_t)input) & 7)==0)   // Input is aligned, let's leverage the speed advantage
+    {
+        if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+            return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+        else
+            return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }
+#  endif
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+/****************************************************
+ *  Advanced Hash Functions
+****************************************************/
+
+/*** Allocation ***/
+typedef struct
+{
+    U64 total_len;
+    U32 seed;
+    U32 v1;
+    U32 v2;
+    U32 v3;
+    U32 v4;
+    U32 mem32[4];   /* defined as U32 for alignment */
+    U32 memsize;
+} XXH_istate32_t;
+
+typedef struct
+{
+    U64 total_len;
+    U64 seed;
+    U64 v1;
+    U64 v2;
+    U64 v3;
+    U64 v4;
+    U64 mem64[4];   /* defined as U64 for alignment */
+    U32 memsize;
+} XXH_istate64_t;
+
+
+XXH32_state_t* XXH32_createState(void)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH32_state_t) >= sizeof(XXH_istate32_t));   // A compilation error here means XXH32_state_t is not large enough
+    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
+}
+XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+};
+
+XXH64_state_t* XXH64_createState(void)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH64_state_t) >= sizeof(XXH_istate64_t));   // A compilation error here means XXH64_state_t is not large enough
+    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
+}
+XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+};
+
+
+/*** Hash feed ***/
+
+XXH_errorcode XXH32_reset(XXH32_state_t* state_in, U32 seed)
+{
+    XXH_istate32_t* state = (XXH_istate32_t*) state_in;
+    state->seed = seed;
+    state->v1 = seed + PRIME32_1 + PRIME32_2;
+    state->v2 = seed + PRIME32_2;
+    state->v3 = seed + 0;
+    state->v4 = seed - PRIME32_1;
+    state->total_len = 0;
+    state->memsize = 0;
+    return XXH_OK;
+}
+
+XXH_errorcode XXH64_reset(XXH64_state_t* state_in, unsigned long long seed)
+{
+    XXH_istate64_t* state = (XXH_istate64_t*) state_in;
+    state->seed = seed;
+    state->v1 = seed + PRIME64_1 + PRIME64_2;
+    state->v2 = seed + PRIME64_2;
+    state->v3 = seed + 0;
+    state->v4 = seed - PRIME64_1;
+    state->total_len = 0;
+    state->memsize = 0;
+    return XXH_OK;
+}
+
+
+FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state_in, const void* input, size_t len, XXH_endianess endian)
+{
+    XXH_istate32_t* state = (XXH_istate32_t *) state_in;
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (input==NULL) return XXH_ERROR;
+#endif
+
+    state->total_len += len;
+
+    if (state->memsize + len < 16)   // fill in tmp buffer
+    {
+        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
+        state->memsize += (U32)len;
+        return XXH_OK;
+    }
+
+    if (state->memsize)   // some data left from previous update
+    {
+        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
+        {
+            const U32* p32 = state->mem32;
+            state->v1 += XXH_readLE32(p32, endian) * PRIME32_2;
+            state->v1 = XXH_rotl32(state->v1, 13);
+            state->v1 *= PRIME32_1;
+            p32++;
+            state->v2 += XXH_readLE32(p32, endian) * PRIME32_2;
+            state->v2 = XXH_rotl32(state->v2, 13);
+            state->v2 *= PRIME32_1;
+            p32++;
+            state->v3 += XXH_readLE32(p32, endian) * PRIME32_2;
+            state->v3 = XXH_rotl32(state->v3, 13);
+            state->v3 *= PRIME32_1;
+            p32++;
+            state->v4 += XXH_readLE32(p32, endian) * PRIME32_2;
+            state->v4 = XXH_rotl32(state->v4, 13);
+            state->v4 *= PRIME32_1;
+            p32++;
+        }
+        p += 16-state->memsize;
+        state->memsize = 0;
+    }
+
+    if (p <= bEnd-16)
+    {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = state->v1;
+        U32 v2 = state->v2;
+        U32 v3 = state->v3;
+        U32 v4 = state->v4;
+
+        do
+        {
+            v1 += XXH_readLE32(p, endian) * PRIME32_2;
+            v1 = XXH_rotl32(v1, 13);
+            v1 *= PRIME32_1;
+            p+=4;
+            v2 += XXH_readLE32(p, endian) * PRIME32_2;
+            v2 = XXH_rotl32(v2, 13);
+            v2 *= PRIME32_1;
+            p+=4;
+            v3 += XXH_readLE32(p, endian) * PRIME32_2;
+            v3 = XXH_rotl32(v3, 13);
+            v3 *= PRIME32_1;
+            p+=4;
+            v4 += XXH_readLE32(p, endian) * PRIME32_2;
+            v4 = XXH_rotl32(v4, 13);
+            v4 *= PRIME32_1;
+            p+=4;
+        }
+        while (p<=limit);
+
+        state->v1 = v1;
+        state->v2 = v2;
+        state->v3 = v3;
+        state->v4 = v4;
+    }
+
+    if (p < bEnd)
+    {
+        XXH_memcpy(state->mem32, p, bEnd-p);
+        state->memsize = (int)(bEnd-p);
+    }
+
+    return XXH_OK;
+}
+
+XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+
+FORCE_INLINE U32 XXH32_digest_endian (const XXH32_state_t* state_in, XXH_endianess endian)
+{
+    XXH_istate32_t* state = (XXH_istate32_t*) state_in;
+    const BYTE * p = (const BYTE*)state->mem32;
+    BYTE* bEnd = (BYTE*)(state->mem32) + state->memsize;
+    U32 h32;
+
+    if (state->total_len >= 16)
+    {
+        h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18);
+    }
+    else
+    {
+        h32  = state->seed + PRIME32_5;
+    }
+
+    h32 += (U32) state->total_len;
+
+    while (p+4<=bEnd)
+    {
+        h32 += XXH_readLE32(p, endian) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h32 += (*p) * PRIME32_5;
+        h32 = XXH_rotl32(h32, 11) * PRIME32_1;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+
+U32 XXH32_digest (const XXH32_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH32_digest_endian(state_in, XXH_bigEndian);
+}
+
+
+FORCE_INLINE XXH_errorcode XXH64_update_endian (XXH64_state_t* state_in, const void* input, size_t len, XXH_endianess endian)
+{
+    XXH_istate64_t * state = (XXH_istate64_t *) state_in;
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (input==NULL) return XXH_ERROR;
+#endif
+
+    state->total_len += len;
+
+    if (state->memsize + len < 32)   // fill in tmp buffer
+    {
+        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
+        state->memsize += (U32)len;
+        return XXH_OK;
+    }
+
+    if (state->memsize)   // some data left from previous update
+    {
+        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
+        {
+            const U64* p64 = state->mem64;
+            state->v1 += XXH_readLE64(p64, endian) * PRIME64_2;
+            state->v1 = XXH_rotl64(state->v1, 31);
+            state->v1 *= PRIME64_1;
+            p64++;
+            state->v2 += XXH_readLE64(p64, endian) * PRIME64_2;
+            state->v2 = XXH_rotl64(state->v2, 31);
+            state->v2 *= PRIME64_1;
+            p64++;
+            state->v3 += XXH_readLE64(p64, endian) * PRIME64_2;
+            state->v3 = XXH_rotl64(state->v3, 31);
+            state->v3 *= PRIME64_1;
+            p64++;
+            state->v4 += XXH_readLE64(p64, endian) * PRIME64_2;
+            state->v4 = XXH_rotl64(state->v4, 31);
+            state->v4 *= PRIME64_1;
+            p64++;
+        }
+        p += 32-state->memsize;
+        state->memsize = 0;
+    }
+
+    if (p+32 <= bEnd)
+    {
+        const BYTE* const limit = bEnd - 32;
+        U64 v1 = state->v1;
+        U64 v2 = state->v2;
+        U64 v3 = state->v3;
+        U64 v4 = state->v4;
+
+        do
+        {
+            v1 += XXH_readLE64(p, endian) * PRIME64_2;
+            v1 = XXH_rotl64(v1, 31);
+            v1 *= PRIME64_1;
+            p+=8;
+            v2 += XXH_readLE64(p, endian) * PRIME64_2;
+            v2 = XXH_rotl64(v2, 31);
+            v2 *= PRIME64_1;
+            p+=8;
+            v3 += XXH_readLE64(p, endian) * PRIME64_2;
+            v3 = XXH_rotl64(v3, 31);
+            v3 *= PRIME64_1;
+            p+=8;
+            v4 += XXH_readLE64(p, endian) * PRIME64_2;
+            v4 = XXH_rotl64(v4, 31);
+            v4 *= PRIME64_1;
+            p+=8;
+        }
+        while (p<=limit);
+
+        state->v1 = v1;
+        state->v2 = v2;
+        state->v3 = v3;
+        state->v4 = v4;
+    }
+
+    if (p < bEnd)
+    {
+        XXH_memcpy(state->mem64, p, bEnd-p);
+        state->memsize = (int)(bEnd-p);
+    }
+
+    return XXH_OK;
+}
+
+XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+
+FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state_in, XXH_endianess endian)
+{
+    XXH_istate64_t * state = (XXH_istate64_t *) state_in;
+    const BYTE * p = (const BYTE*)state->mem64;
+    BYTE* bEnd = (BYTE*)state->mem64 + state->memsize;
+    U64 h64;
+
+    if (state->total_len >= 32)
+    {
+        U64 v1 = state->v1;
+        U64 v2 = state->v2;
+        U64 v3 = state->v3;
+        U64 v4 = state->v4;
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+
+        v1 *= PRIME64_2;
+        v1 = XXH_rotl64(v1, 31);
+        v1 *= PRIME64_1;
+        h64 ^= v1;
+        h64 = h64*PRIME64_1 + PRIME64_4;
+
+        v2 *= PRIME64_2;
+        v2 = XXH_rotl64(v2, 31);
+        v2 *= PRIME64_1;
+        h64 ^= v2;
+        h64 = h64*PRIME64_1 + PRIME64_4;
+
+        v3 *= PRIME64_2;
+        v3 = XXH_rotl64(v3, 31);
+        v3 *= PRIME64_1;
+        h64 ^= v3;
+        h64 = h64*PRIME64_1 + PRIME64_4;
+
+        v4 *= PRIME64_2;
+        v4 = XXH_rotl64(v4, 31);
+        v4 *= PRIME64_1;
+        h64 ^= v4;
+        h64 = h64*PRIME64_1 + PRIME64_4;
+    }
+    else
+    {
+        h64  = state->seed + PRIME64_5;
+    }
+
+    h64 += (U64) state->total_len;
+
+    while (p+8<=bEnd)
+    {
+        U64 k1 = XXH_readLE64(p, endian);
+        k1 *= PRIME64_2;
+        k1 = XXH_rotl64(k1,31);
+        k1 *= PRIME64_1;
+        h64 ^= k1;
+        h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
+        p+=8;
+    }
+
+    if (p+4<=bEnd)
+    {
+        h64 ^= (U64)(XXH_readLE32(p, endian)) * PRIME64_1;
+        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h64 ^= (*p) * PRIME64_5;
+        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
+        p++;
+    }
+
+    h64 ^= h64 >> 33;
+    h64 *= PRIME64_2;
+    h64 ^= h64 >> 29;
+    h64 *= PRIME64_3;
+    h64 ^= h64 >> 32;
+
+    return h64;
+}
+
+
+unsigned long long XXH64_digest (const XXH64_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH64_digest_endian(state_in, XXH_bigEndian);
+}
+
+
diff --git a/Externals/xxhash/xxhash.h b/Externals/xxhash/xxhash.h
new file mode 100644
index 0000000000..55b45015a4
--- /dev/null
+++ b/Externals/xxhash/xxhash.h
@@ -0,0 +1,156 @@
+/*
+   xxHash - Extremely Fast Hash algorithm
+   Header File
+   Copyright (C) 2012-2014, Yann Collet.
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - xxHash source repository : http://code.google.com/p/xxhash/
+*/
+
+/* Notice extracted from xxHash homepage :
+
+xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
+It also successfully passes all tests from the SMHasher suite.
+
+Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
+
+Name            Speed       Q.Score   Author
+xxHash          5.4 GB/s     10
+CrapWow         3.2 GB/s      2       Andrew
+MumurHash 3a    2.7 GB/s     10       Austin Appleby
+SpookyHash      2.0 GB/s     10       Bob Jenkins
+SBox            1.4 GB/s      9       Bret Mulvey
+Lookup3         1.2 GB/s      9       Bob Jenkins
+SuperFastHash   1.2 GB/s      1       Paul Hsieh
+CityHash64      1.05 GB/s    10       Pike & Alakuijala
+FNV             0.55 GB/s     5       Fowler, Noll, Vo
+CRC32           0.43 GB/s     9
+MD5-32          0.33 GB/s    10       Ronald L. Rivest
+SHA1-32         0.28 GB/s    10
+
+Q.Score is a measure of quality of the hash function.
+It depends on successfully passing SMHasher test set.
+10 is a perfect score.
+*/
+
+#pragma once
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+/*****************************
+   Includes
+*****************************/
+#include <stddef.h>   /* size_t */
+
+
+/*****************************
+   Type
+*****************************/
+typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
+
+
+
+/*****************************
+   Simple Hash Functions
+*****************************/
+
+unsigned int       XXH32 (const void* input, size_t length, unsigned seed);
+unsigned long long XXH64 (const void* input, size_t length, unsigned long long seed);
+
+/*
+XXH32() :
+    Calculate the 32-bits hash of sequence "length" bytes stored at memory address "input".
+    The memory between input & input+length must be valid (allocated and read-accessible).
+    "seed" can be used to alter the result predictably.
+    This function successfully passes all SMHasher tests.
+    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s
+XXH64() :
+    Calculate the 64-bits hash of sequence of length "len" stored at memory address "input".
+*/
+
+
+
+/*****************************
+   Advanced Hash Functions
+*****************************/
+typedef struct { long long ll[ 6]; } XXH32_state_t;
+typedef struct { long long ll[11]; } XXH64_state_t;
+
+/*
+These structures allow static allocation of XXH states.
+States must then be initialized using XXHnn_reset() before first use.
+
+If you prefer dynamic allocation, please refer to functions below.
+*/
+
+XXH32_state_t* XXH32_createState(void);
+XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
+
+XXH64_state_t* XXH64_createState(void);
+XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
+
+/*
+These functions create and release memory for XXH state.
+States must then be initialized using XXHnn_reset() before first use.
+*/
+
+
+XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned seed);
+XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
+unsigned int  XXH32_digest (const XXH32_state_t* statePtr);
+
+XXH_errorcode      XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
+XXH_errorcode      XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
+unsigned long long XXH64_digest (const XXH64_state_t* statePtr);
+
+/*
+These functions calculate the xxHash of an input provided in multiple smaller packets,
+as opposed to an input provided as a single block.
+
+XXH state space must first be allocated, using either static or dynamic method provided above.
+
+Start a new hash by initializing state with a seed, using XXHnn_reset().
+
+Then, feed the hash state by calling XXHnn_update() as many times as necessary.
+Obviously, input must be valid, meaning allocated and read accessible.
+The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
+
+Finally, you can produce a hash anytime, by using XXHnn_digest().
+This function returns the final nn-bits hash.
+You can nonetheless continue feeding the hash state with more input,
+and therefore get some new hashes, by calling again XXHnn_digest().
+
+When you are done, don't forget to free XXH state space, using typically XXHnn_freeState().
+*/
+
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj
new file mode 100644
index 0000000000..f3325aec38
--- /dev/null
+++ b/Externals/xxhash/xxhash.vcxproj
@@ -0,0 +1,53 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{677EA016-1182-440C-9345-DC88D1E98C0C}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="xxhash.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="LICENSE" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="xxhash.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Externals/xxhash/xxhsum.c b/Externals/xxhash/xxhsum.c
new file mode 100644
index 0000000000..e090e51118
--- /dev/null
+++ b/Externals/xxhash/xxhsum.c
@@ -0,0 +1,689 @@
+/*
+bench.c - Demo program to benchmark open-source algorithm
+Copyright (C) Yann Collet 2012-2014
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+You can contact the author at :
+- Blog homepage : http://fastcompression.blogspot.com/
+- Discussion group : https://groups.google.com/forum/?fromgroups#!forum/lz4c
+*/
+
+/**************************************
+ * Compiler Options
+ *************************************/
+/* MS Visual */
+#if defined(_MSC_VER) || defined(_WIN32)
+#  define _CRT_SECURE_NO_WARNINGS   /* removes visual warnings */
+#  define BMK_LEGACY_TIMER 1        /* gettimeofday() not supported by MSVC */
+#endif
+
+/* Under Linux at least, pull in the *64 commands */
+#define _LARGEFILE64_SOURCE
+
+
+/**************************************
+ * Includes
+ *************************************/
+#include <stdlib.h>     // malloc
+#include <stdio.h>      // fprintf, fopen, ftello64, fread, stdin, stdout; when present : _fileno
+#include <string.h>     // strcmp
+#include <sys/types.h>  // stat64
+#include <sys/stat.h>   // stat64
+
+#include "xxhash.h"
+
+
+/**************************************
+ * OS-Specific Includes
+ *************************************/
+// Use ftime() if gettimeofday() is not available on your target
+#if defined(BMK_LEGACY_TIMER)
+#  include <sys/timeb.h>   // timeb, ftime
+#else
+#  include <sys/time.h>    // gettimeofday
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+#  include <fcntl.h>    // _O_BINARY
+#  include <io.h>       // _setmode, _isatty
+#  ifdef __MINGW32__
+   int _fileno(FILE *stream);   // MINGW somehow forgets to include this windows declaration into <stdio.h>
+#  endif
+#  define SET_BINARY_MODE(file) _setmode(_fileno(file), _O_BINARY)
+#  define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream))
+#else
+#  include <unistd.h>   // isatty, STDIN_FILENO
+#  define SET_BINARY_MODE(file)
+#  define IS_CONSOLE(stdStream) isatty(STDIN_FILENO)
+#endif
+
+#if !defined(S_ISREG)
+#  define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
+#endif
+
+
+/**************************************
+ * Basic Types
+ *************************************/
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   // C99
+# include <stdint.h>
+  typedef  uint8_t BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
+#else
+  typedef unsigned char       BYTE;
+  typedef unsigned short      U16;
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+  typedef unsigned long long  U64;
+#endif
+
+
+/**************************************
+ * Constants
+ *************************************/
+#define PROGRAM_NAME exename
+#define PROGRAM_VERSION ""
+#define COMPILED __DATE__
+#define AUTHOR "Yann Collet"
+#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", PROGRAM_NAME, (int)(sizeof(void*)*8), PROGRAM_VERSION, AUTHOR, COMPILED
+
+#define NBLOOPS    3           // Default number of benchmark iterations
+#define TIMELOOP   2500        // Minimum timing per iteration
+#define PRIME 2654435761U
+
+#define KB *(1<<10)
+#define MB *(1<<20)
+#define GB *(1U<<30)
+
+#define MAX_MEM    (2 GB - 64 MB)
+
+static const char stdinName[] = "-";
+
+
+//**************************************
+// Display macros
+//**************************************
+#define DISPLAY(...)         fprintf(stderr, __VA_ARGS__)
+#define DISPLAYRESULT(...)   fprintf(stdout, __VA_ARGS__)
+#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) DISPLAY(__VA_ARGS__);
+static unsigned g_displayLevel = 1;
+
+
+//**************************************
+// Unit variables
+//**************************************
+static int g_nbIterations = NBLOOPS;
+static int g_fn_selection = 1;    // required within main() & usage()
+
+
+//*********************************************************
+// Benchmark Functions
+//*********************************************************
+
+#if defined(BMK_LEGACY_TIMER)
+
+static int BMK_GetMilliStart(void)
+{
+  // Based on Legacy ftime()
+  // Rolls over every ~ 12.1 days (0x100000/24/60/60)
+  // Use GetMilliSpan to correct for rollover
+  struct timeb tb;
+  int nCount;
+  ftime( &tb );
+  nCount = (int) (tb.millitm + (tb.time & 0xfffff) * 1000);
+  return nCount;
+}
+
+#else
+
+static int BMK_GetMilliStart(void)
+{
+  // Based on newer gettimeofday()
+  // Use GetMilliSpan to correct for rollover
+  struct timeval tv;
+  int nCount;
+  gettimeofday(&tv, NULL);
+  nCount = (int) (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
+  return nCount;
+}
+
+#endif
+
+static int BMK_GetMilliSpan( int nTimeStart )
+{
+    int nSpan = BMK_GetMilliStart() - nTimeStart;
+    if ( nSpan < 0 )
+        nSpan += 0x100000 * 1000;
+    return nSpan;
+}
+
+
+static size_t BMK_findMaxMem(U64 requestedMem)
+{
+    size_t step = (64 MB);
+    size_t allocatedMemory;
+    BYTE* testmem=NULL;
+
+    requestedMem += 3*step;
+    requestedMem -= (size_t)requestedMem & (step-1);
+    if (requestedMem > MAX_MEM) requestedMem = MAX_MEM;
+    allocatedMemory = (size_t)requestedMem;
+
+    while (!testmem)
+    {
+        allocatedMemory -= step;
+        testmem = (BYTE*) malloc((size_t)allocatedMemory);
+    }
+    free (testmem);
+
+    return (size_t) (allocatedMemory - step);
+}
+
+
+static U64 BMK_GetFileSize(char* infilename)
+{
+    int r;
+#if defined(_MSC_VER)
+    struct _stat64 statbuf;
+    r = _stat64(infilename, &statbuf);
+#else
+    struct stat statbuf;
+    r = stat(infilename, &statbuf);
+#endif
+    if (r || !S_ISREG(statbuf.st_mode)) return 0;   // No good...
+    return (U64)statbuf.st_size;
+}
+
+
+static int BMK_benchFile(char** fileNamesTable, int nbFiles)
+{
+    int fileIdx=0;
+    U32 hashResult=0;
+
+    U64 totals = 0;
+    double totalc = 0.;
+
+
+    // Loop for each file
+    while (fileIdx<nbFiles)
+    {
+        FILE*  inFile;
+        char*  inFileName;
+        U64    inFileSize;
+        size_t benchedSize;
+        size_t readSize;
+        char*  buffer;
+        char*  alignedBuffer;
+
+        // Check file existence
+        inFileName = fileNamesTable[fileIdx++];
+        inFile = fopen( inFileName, "rb" );
+        if (inFile==NULL)
+        {
+            DISPLAY( "Pb opening %s\n", inFileName);
+            return 11;
+        }
+
+        // Memory allocation & restrictions
+        inFileSize = BMK_GetFileSize(inFileName);
+        benchedSize = (size_t) BMK_findMaxMem(inFileSize);
+        if ((U64)benchedSize > inFileSize) benchedSize = (size_t)inFileSize;
+        if (benchedSize < inFileSize)
+        {
+            DISPLAY("Not enough memory for '%s' full size; testing %i MB only...\n", inFileName, (int)(benchedSize>>20));
+        }
+
+        buffer = (char*)malloc((size_t )benchedSize+16);
+        if(!buffer)
+        {
+            DISPLAY("\nError: not enough memory!\n");
+            fclose(inFile);
+            return 12;
+        }
+        alignedBuffer = (buffer+15) - (((size_t)(buffer+15)) & 0xF);   // align on next 16 bytes boundaries
+
+        // Fill input buffer
+        DISPLAY("\rLoading %s...        \n", inFileName);
+        readSize = fread(alignedBuffer, 1, benchedSize, inFile);
+        fclose(inFile);
+
+        if(readSize != benchedSize)
+        {
+            DISPLAY("\nError: problem reading file '%s' !!    \n", inFileName);
+            free(buffer);
+            return 13;
+        }
+
+
+        // Bench XXH32
+        {
+            int interationNb;
+            double fastestC = 100000000.;
+
+            DISPLAY("\r%79s\r", "");       // Clean display line
+            for (interationNb = 1; interationNb <= g_nbIterations; interationNb++)
+            {
+                int nbHashes = 0;
+                int milliTime;
+
+                DISPLAY("%1i-%-14.14s : %10i ->\r", interationNb, "XXH32", (int)benchedSize);
+
+                // Hash loop
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliStart() == milliTime);
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliSpan(milliTime) < TIMELOOP)
+                {
+                    int i;
+                    for (i=0; i<100; i++)
+                    {
+                        hashResult = XXH32(alignedBuffer, benchedSize, 0);
+                        nbHashes++;
+                    }
+                }
+                milliTime = BMK_GetMilliSpan(milliTime);
+                if ((double)milliTime < fastestC*nbHashes) fastestC = (double)milliTime/nbHashes;
+                DISPLAY("%1i-%-14.14s : %10i -> %7.1f MB/s\r", interationNb, "XXH32", (int)benchedSize, (double)benchedSize / fastestC / 1000.);
+            }
+            DISPLAY("%-16.16s : %10i -> %7.1f MB/s   0x%08X\n", "XXH32", (int)benchedSize, (double)benchedSize / fastestC / 1000., hashResult);
+
+            totals += benchedSize;
+            totalc += fastestC;
+        }
+
+        // Bench Unaligned XXH32
+        {
+            int interationNb;
+            double fastestC = 100000000.;
+
+            DISPLAY("\r%79s\r", "");       // Clean display line
+            for (interationNb = 1; (interationNb <= g_nbIterations) && ((benchedSize>1)); interationNb++)
+            {
+                int nbHashes = 0;
+                int milliTime;
+
+                DISPLAY("%1i-%-14.14s : %10i ->\r", interationNb, "(unaligned)", (int)benchedSize);
+                // Hash loop
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliStart() == milliTime);
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliSpan(milliTime) < TIMELOOP)
+                {
+                    int i;
+                    for (i=0; i<100; i++)
+                    {
+                        hashResult = XXH32(alignedBuffer+1, benchedSize-1, 0);
+                        nbHashes++;
+                    }
+                }
+                milliTime = BMK_GetMilliSpan(milliTime);
+                if ((double)milliTime < fastestC*nbHashes) fastestC = (double)milliTime/nbHashes;
+                DISPLAY("%1i-%-14.14s : %10i -> %7.1f MB/s\r", interationNb, "XXH32 (unaligned)", (int)(benchedSize-1), (double)(benchedSize-1) / fastestC / 1000.);
+            }
+            DISPLAY("%-16.16s : %10i -> %7.1f MB/s \n", "XXH32 (unaligned)", (int)benchedSize-1, (double)(benchedSize-1) / fastestC / 1000.);
+        }
+
+        // Bench XXH64
+        {
+            int interationNb;
+            double fastestC = 100000000.;
+            unsigned long long h64 = 0;
+
+            DISPLAY("\r%79s\r", "");       // Clean display line
+            for (interationNb = 1; interationNb <= g_nbIterations; interationNb++)
+            {
+                int nbHashes = 0;
+                int milliTime;
+
+                DISPLAY("%1i-%-14.14s : %10i ->\r", interationNb, "XXH64", (int)benchedSize);
+
+                // Hash loop
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliStart() == milliTime);
+                milliTime = BMK_GetMilliStart();
+                while(BMK_GetMilliSpan(milliTime) < TIMELOOP)
+                {
+                    int i;
+                    for (i=0; i<100; i++)
+                    {
+                        h64 = XXH64(alignedBuffer, benchedSize, 0);
+                        nbHashes++;
+                    }
+                }
+                milliTime = BMK_GetMilliSpan(milliTime);
+                if ((double)milliTime < fastestC*nbHashes) fastestC = (double)milliTime/nbHashes;
+                DISPLAY("%1i-%-14.14s : %10i -> %7.1f MB/s\r", interationNb, "XXH64", (int)benchedSize, (double)benchedSize / fastestC / 1000.);
+            }
+            DISPLAY("%-16.16s : %10i -> %7.1f MB/s   0x%08X%08X\n", "XXH64", (int)benchedSize, (double)benchedSize / fastestC / 1000., (U32)(h64>>32), (U32)(h64));
+
+            totals += benchedSize;
+            totalc += fastestC;
+        }
+
+        free(buffer);
+    }
+
+    if (nbFiles > 1)
+        printf("%-16.16s :%11llu -> %7.1f MB/s\n", "  TOTAL", (long long unsigned int)totals, (double)totals/totalc/1000.);
+
+    return 0;
+}
+
+
+
+static void BMK_checkResult(U32 r1, U32 r2)
+{
+    static int nbTests = 1;
+
+    if (r1==r2) DISPLAY("\rTest%3i : %08X == %08X   ok   ", nbTests, r1, r2);
+    else
+    {
+        DISPLAY("\rERROR : Test%3i : %08X <> %08X   !!!!!   \n", nbTests, r1, r2);
+        exit(1);
+    }
+    nbTests++;
+}
+
+
+static void BMK_checkResult64(U64 r1, U64 r2)
+{
+    static int nbTests = 1;
+
+    if (r1!=r2)
+    {
+        DISPLAY("\rERROR : Test%3i : 64-bits values non equals   !!!!!   \n", nbTests);
+        DISPLAY("\r %08X%08X != %08X%08X \n", (U32)(r1>>32), (U32)r1, (U32)(r2<<32), (U32)r2);
+        exit(1);
+    }
+    nbTests++;
+}
+
+
+static void BMK_testSequence64(void* sentence, int len, U64 seed, U64 Nresult)
+{
+    U64 Dresult;
+    XXH64_state_t state;
+    int index;
+
+    Dresult = XXH64(sentence, len, seed);
+    BMK_checkResult64(Dresult, Nresult);
+
+    XXH64_reset(&state, seed);
+    XXH64_update(&state, sentence, len);
+    Dresult = XXH64_digest(&state);
+    BMK_checkResult64(Dresult, Nresult);
+
+    XXH64_reset(&state, seed);
+    for (index=0; index<len; index++) XXH64_update(&state, ((char*)sentence)+index, 1);
+    Dresult = XXH64_digest(&state);
+    BMK_checkResult64(Dresult, Nresult);
+}
+
+
+static void BMK_testSequence(void* sentence, int len, U32 seed, U32 Nresult)
+{
+    U32 Dresult;
+    XXH32_state_t state;
+    int index;
+
+    Dresult = XXH32(sentence, len, seed);
+    BMK_checkResult(Dresult, Nresult);
+
+    XXH32_reset(&state, seed);
+    XXH32_update(&state, sentence, len);
+    Dresult = XXH32_digest(&state);
+    BMK_checkResult(Dresult, Nresult);
+
+    XXH32_reset(&state, seed);
+    for (index=0; index<len; index++) XXH32_update(&state, ((char*)sentence)+index, 1);
+    Dresult = XXH32_digest(&state);
+    BMK_checkResult(Dresult, Nresult);
+}
+
+
+#define SANITY_BUFFER_SIZE 101
+static void BMK_sanityCheck(void)
+{
+    BYTE sanityBuffer[SANITY_BUFFER_SIZE];
+    int i;
+    U32 prime = PRIME;
+
+    for (i=0; i<SANITY_BUFFER_SIZE; i++)
+    {
+        sanityBuffer[i] = (BYTE)(prime>>24);
+        prime *= prime;
+    }
+
+    BMK_testSequence(NULL,          0, 0,     0x02CC5D05);
+    BMK_testSequence(NULL,          0, PRIME, 0x36B78AE7);
+    BMK_testSequence(sanityBuffer,  1, 0,     0xB85CBEE5);
+    BMK_testSequence(sanityBuffer,  1, PRIME, 0xD5845D64);
+    BMK_testSequence(sanityBuffer, 14, 0,     0xE5AA0AB4);
+    BMK_testSequence(sanityBuffer, 14, PRIME, 0x4481951D);
+    BMK_testSequence(sanityBuffer, SANITY_BUFFER_SIZE, 0,     0x1F1AA412);
+    BMK_testSequence(sanityBuffer, SANITY_BUFFER_SIZE, PRIME, 0x498EC8E2);
+
+    BMK_testSequence64(NULL        ,  0, 0,     0xEF46DB3751D8E999ULL);
+    BMK_testSequence64(NULL        ,  0, PRIME, 0xAC75FDA2929B17EFULL);
+    BMK_testSequence64(sanityBuffer,  1, 0,     0x4FCE394CC88952D8ULL);
+    BMK_testSequence64(sanityBuffer,  1, PRIME, 0x739840CB819FA723ULL);
+    BMK_testSequence64(sanityBuffer, 14, 0,     0xCFFA8DB881BC3A3DULL);
+    BMK_testSequence64(sanityBuffer, 14, PRIME, 0x5B9611585EFCC9CBULL);
+    BMK_testSequence64(sanityBuffer, SANITY_BUFFER_SIZE, 0,     0x0EAB543384F878ADULL);
+    BMK_testSequence64(sanityBuffer, SANITY_BUFFER_SIZE, PRIME, 0xCAA65939306F1E21ULL);
+
+    DISPLAY("\r%79s\r", "");       // Clean display line
+    DISPLAYLEVEL(2, "Sanity check -- all tests ok\n");
+}
+
+
+static int BMK_hash(const char* fileName, U32 hashNb)
+{
+    FILE*  inFile;
+    size_t const blockSize = 64 KB;
+    size_t readSize;
+    char*  buffer;
+    XXH64_state_t state;
+
+    // Check file existence
+    if (fileName == stdinName)
+    {
+        inFile = stdin;
+        SET_BINARY_MODE(stdin);
+    }
+    else
+        inFile = fopen( fileName, "rb" );
+    if (inFile==NULL)
+    {
+        DISPLAY( "Pb opening %s\n", fileName);
+        return 11;
+    }
+
+    // Memory allocation & restrictions
+    buffer = (char*)malloc(blockSize);
+    if(!buffer)
+    {
+        DISPLAY("\nError: not enough memory!\n");
+        fclose(inFile);
+        return 12;
+    }
+
+    // Init
+    switch(hashNb)
+    {
+    case 0:
+        XXH32_reset((XXH32_state_t*)&state, 0);
+        break;
+    case 1:
+        XXH64_reset(&state, 0);
+        break;
+    default:
+        DISPLAY("Error : bad hash algorithm ID\n");
+        fclose(inFile);
+        free(buffer);
+        return -1;
+    }
+
+
+    // Load file & update hash
+    DISPLAY("\rLoading %s...        \r", fileName);
+    readSize = 1;
+    while (readSize)
+    {
+        readSize = fread(buffer, 1, blockSize, inFile);
+        switch(hashNb)
+        {
+        case 0:
+            XXH32_update((XXH32_state_t*)&state, buffer, readSize);
+            break;
+        case 1:
+            XXH64_update(&state, buffer, readSize);
+            break;
+        default:
+            break;
+        }
+    }
+    fclose(inFile);
+    free(buffer);
+
+    // display Hash
+    switch(hashNb)
+    {
+    case 0:
+        {
+            U32 h32 = XXH32_digest((XXH32_state_t*)&state);
+            DISPLAYRESULT("%08x   %s           \n", h32, fileName);
+            break;
+        }
+    case 1:
+        {
+            U64 h64 = XXH64_digest(&state);
+            DISPLAYRESULT("%08x%08x   %s     \n", (U32)(h64>>32), (U32)(h64), fileName);
+            break;
+        }
+    default:
+            break;
+    }
+
+    return 0;
+}
+
+
+//*********************************************************
+//  Main
+//*********************************************************
+
+static int usage(const char* exename)
+{
+    DISPLAY( WELCOME_MESSAGE );
+    DISPLAY( "Usage :\n");
+    DISPLAY( "      %s [arg] [filename]\n", exename);
+    DISPLAY( "When no filename provided, or - provided : use stdin as input\n");
+    DISPLAY( "Arguments :\n");
+    DISPLAY( " -H# : hash selection : 0=32bits, 1=64bits (default %i)\n", g_fn_selection);
+    DISPLAY( " -b  : benchmark mode \n");
+    DISPLAY( " -i# : number of iterations (benchmark mode; default %i)\n", g_nbIterations);
+    DISPLAY( " -h  : help (this text)\n");
+    return 0;
+}
+
+
+static int badusage(const char* exename)
+{
+    DISPLAY("Wrong parameters\n");
+    usage(exename);
+    return 1;
+}
+
+
+int main(int argc, char** argv)
+{
+    int i, filenamesStart=0;
+    const char* input_filename = (char*)stdinName;
+    const char* exename = argv[0];
+    U32 benchmarkMode = 0;
+
+    // xxh32sum default to 32 bits checksum
+    if (strstr(exename, "xxh32sum")!=NULL) g_fn_selection=0;
+
+    for(i=1; i<argc; i++)
+    {
+        char* argument = argv[i];
+
+        if(!argument) continue;   // Protection if argument empty
+
+        if (*argument!='-')
+        {
+            input_filename=argument;
+            if (filenamesStart==0) filenamesStart=i;
+            continue;
+        }
+
+        // Select command
+        // note : *argument=='-'
+        argument++;
+
+        while (*argument!=0)
+        {
+            switch(*argument)
+            {
+            // Display help on usage
+            case 'h':
+                return usage(exename);
+
+            // select hash algorithm
+            case 'H':
+                g_fn_selection = argument[1] - '0';
+                argument+=2;
+                break;
+
+            // Trigger benchmark mode
+            case 'b':
+                argument++;
+                benchmarkMode=1;
+                break;
+
+            // Modify Nb Iterations (benchmark only)
+            case 'i':
+                g_nbIterations = argument[1] - '0';
+                argument+=2;
+                break;
+
+            default:
+                return badusage(exename);
+            }
+        }
+    }
+
+    // Check if input is defined as console; trigger an error in this case
+    if ((input_filename == stdinName) && IS_CONSOLE(stdin) ) return badusage(exename);
+
+    // Check results are good
+    if (benchmarkMode)
+    {
+        if (filenamesStart==0) return badusage(exename);
+        DISPLAY( WELCOME_MESSAGE );
+        BMK_sanityCheck();
+        return BMK_benchFile(argv+filenamesStart, argc-filenamesStart);
+    }
+
+    if(g_fn_selection < 0 || g_fn_selection > 1) return badusage(exename);
+
+    return BMK_hash(input_filename, g_fn_selection);
+}
diff --git a/Externals/zlib/CMakeLists.txt b/Externals/zlib/CMakeLists.txt
index 0c0247cc51..c95e282e00 100644
--- a/Externals/zlib/CMakeLists.txt
+++ b/Externals/zlib/CMakeLists.txt
@@ -1,36 +1,18 @@
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
 project(zlib C)
 
-set(VERSION "1.2.8")
-
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
-
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-
 include(CheckTypeSize)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCSourceCompiles)
-enable_testing()
 
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(stdint.h    HAVE_STDINT_H)
 check_include_file(stddef.h    HAVE_STDDEF_H)
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
 
-#
 # Check to see if we have large file support
-#
 set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
+
 if(HAVE_SYS_TYPES_H)
     list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
 endif()
@@ -46,52 +28,23 @@ if(HAVE_OFF64_T)
 endif()
 set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
 
-#
 # Check for fseeko
-#
 check_function_exists(fseeko HAVE_FSEEKO)
 if(NOT HAVE_FSEEKO)
     add_definitions(-DNO_FSEEKO)
 endif()
 
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
-
 if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        message(STATUS "Renaming")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
-        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
-        message(STATUS "but CMake generates it automatically in the build directory.")
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
-  endif()
-endif()
-
-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-		${ZLIB_PC} @ONLY)
-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-
 #============================================================================
 # zlib
 #============================================================================
 
 set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zconf.h
     zlib.h
 )
 set(ZLIB_PRIVATE_HDRS
@@ -123,127 +76,4 @@ set(ZLIB_SRCS
     zutil.c
 )
 
-if(NOT MINGW)
-    set(ZLIB_DLL_SRCS
-        win32/zlib1.rc # If present will override custom build rule below.
-    )
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
-if(MINGW)
-    # This gets us DLL resource information when compiling on MinGW.
-    if(NOT CMAKE_RC_COMPILER)
-        set(CMAKE_RC_COMPILER windres.exe)
-    endif()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND ${CMAKE_RC_COMPILER}
-                            -D GCC_WINDRES
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-endif(MINGW)
-
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
-
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
-     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-   endif()
-elseif(BUILD_SHARED_LIBS AND WIN32)
-    # Creates zlib1.dll when building shared library version
-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-endif()
-
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS zlib zlibstatic
-        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()
+add_library(z STATIC ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj
index e4432e2612..748df1963d 100644
--- a/Externals/zlib/zlib.vcxproj
+++ b/Externals/zlib/zlib.vcxproj
@@ -1,138 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{3E1339F5-9311-4122-9442-369702E8FCAD}</ProjectGuid>
-    <RootNamespace>zlib</RootNamespace>
+    <ProjectGuid>{FF213B23-2C26-4214-9F88-85271E557E87}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_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="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-    <Import Project="..\..\Source\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
+  <PropertyGroup />
+  <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="adler32.c" />
@@ -151,6 +54,12 @@
     <ClCompile Include="uncompr.c" />
     <ClCompile Include="zutil.c" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ChangeLog" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="crc32.h" />
     <ClInclude Include="deflate.h" />
@@ -164,9 +73,6 @@
     <ClInclude Include="zlib.h" />
     <ClInclude Include="zutil.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Externals/zlib/zlib.vcxproj.filters b/Externals/zlib/zlib.vcxproj.filters
deleted file mode 100644
index 5e4b0a7921..0000000000
--- a/Externals/zlib/zlib.vcxproj.filters
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="crc32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inffast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inffixed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gzguts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{e2f2d23a-ab40-4d71-ad14-caf68f21801b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{58aaeb81-b6bc-4175-94c7-baa2db0b1827}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Installer/Dolphin.ico b/Installer/Dolphin.ico
index 5e133fcd9b..ead8505da0 100644
Binary files a/Installer/Dolphin.ico and b/Installer/Dolphin.ico differ
diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi
index 3543d149b5..e8c08c5f3d 100644
--- a/Installer/Installer.nsi
+++ b/Installer/Installer.nsi
@@ -3,7 +3,7 @@
 !define BASE_DIR "..\Binary\${DOLPHIN_ARCH}"
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_PUBLISHER "Dolphin Development Team"
+!define PRODUCT_PUBLISHER "Dolphin Team"
 !define PRODUCT_WEB_SITE "https://dolphin-emu.org/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -25,7 +25,7 @@ SetCompressor /SOLID lzma
 !define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
 
 ; License page
-!insertmacro MUI_PAGE_LICENSE "..\License.txt"
+!insertmacro MUI_PAGE_LICENSE "..\license.txt"
 ; Components page
 !insertmacro MUI_PAGE_COMPONENTS
 ; Directory page
diff --git a/Installer/dolphin-emu.desktop b/Installer/dolphin-emu.desktop
new file mode 100644
index 0000000000..bbce3a81b4
--- /dev/null
+++ b/Installer/dolphin-emu.desktop
@@ -0,0 +1,11 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Icon=dolphin-emu
+Exec=dolphin-emu
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+Name=Dolphin Emulator
+GenericName=Wii/GameCube Emulator
+Comment=A Wii/GameCube Emulator
diff --git a/Installer/dolphin-emu.spec b/Installer/dolphin-emu.spec
new file mode 100644
index 0000000000..e666f3bd17
--- /dev/null
+++ b/Installer/dolphin-emu.spec
@@ -0,0 +1,145 @@
+#
+# Spec file for package Dolphin Emulator
+#
+# Copyright © 2014 Markus S. <kamikazow@web.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Name:       dolphin-emu
+Summary:    Dolphin Emulator
+Version:    4.0.2
+Release:    0%{?dist}
+Group:      System/Emulators/Other
+License:    GPL-2.0
+URL:        https://dolphin-emu.org/
+BuildArch:  x86_64 armv7l aarch64
+
+# For this spec file to work, the Dolphin Emulator sources must be located
+# in a directory named dolphin-emu-4.0 (with "4.0" being the version
+# number defined above).
+# If the sources are compressed in another format than .tar.xz, change the
+# file extension accordingly.
+Source0:    %{name}-%{version}.tar.xz
+
+# Package names verified with, CentOS, Fedora and openSUSE.
+# Should the packages in your distro be named differently,
+# see http://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
+#
+# All other distros should work as well as Dolphin bundles
+# its dependencies for static linking.
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  cmake >= 2.8
+BuildRequires:  gcc-c++
+BuildRequires:  gtk2-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(ao)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(zlib)
+
+%if 0%{?fedora}
+BuildRequires:  libusb-devel
+BuildRequires:  lzo-devel
+# Disable miniupnpc in OBS for F20
+BuildRequires:  miniupnpc-devel
+BuildRequires:  openal-soft-devel
+BuildRequires:  polarssl-devel
+BuildRequires:  portaudio-devel
+BuildRequires:  SDL2-devel
+BuildRequires:  SFML-devel
+BuildRequires:  SOIL-devel
+BuildRequires:  soundtouch-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:  libminiupnpc-devel
+BuildRequires:  libSDL2-devel
+BuildRequires:  libSOIL-devel
+BuildRequires:  lzo-devel
+BuildRequires:  openal-devel
+BuildRequires:  portaudio-devel
+BuildRequires:  sfml-devel
+BuildRequires:  soundtouch-devel
+BuildRequires:  update-desktop-files
+%endif
+
+# Use bundled wxGTK 3 except under the following distros:
+%if 0%{?fedora_version} > 20
+BuildRequires:  wxGTK3-devel
+%endif
+
+%description
+Dolphin is an emulator for two Nintendo video game consoles, GameCube and the Wii.
+It allows PC gamers to enjoy games for these two consoles in full HD with several
+enhancements such as compatibility with all PC controllers, turbo speed,
+networked multiplayer, and more.
+Most games run perfectly or with minor bugs.
+
+# ------------------------------------------------------
+
+%package lang
+Summary:        Translations for Dolphin Emulator
+BuildArch:      noarch
+
+%description lang
+Translations into various languages for Dolphin Emulator
+
+%files lang
+%{_datadir}/locale
+
+# ------------------------------------------------------
+
+%package nogui
+Summary:        Dolphin Emulator without a graphical user interface
+
+%description nogui
+Dolphin Emulator without a graphical user interface
+
+%files nogui
+%{_bindir}/%{name}-nogui
+
+# ------------------------------------------------------
+
+%prep
+%setup -q
+
+%build
+export CCFLAGS='%{optflags}'
+cmake . -DCMAKE_INSTALL_PREFIX=/usr
+make %{?_smp_mflags}
+
+%install
+export CCFLAGS='%{optflags}'
+make %{?_smp_mflags} install DESTDIR="%{?buildroot}"
+
+%if 0%{?suse_version}
+# Replace desktop file category 'Game;Emulator;' with 'System;Emulator;'
+# under openSUSE or else build fails.
+%suse_update_desktop_file -c %name Dolphin 'GameCube and Wii emulator' %{name} %{name} 'System;Emulator;'
+%endif
+
+%files
+%defattr(-,root,root,-)
+%doc license.txt Readme.md
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/dolphin-emu.xpm
+%{_datadir}/applications/%{name}.desktop
+
+%clean
+rm -rf %{buildroot}
+
+%changelog
diff --git a/Source/Core/DolphinWX/resources/Dolphin.xpm b/Installer/dolphin-emu.xpm
similarity index 100%
rename from Source/Core/DolphinWX/resources/Dolphin.xpm
rename to Installer/dolphin-emu.xpm
diff --git a/Installer/Licence.txt b/Installer/license.txt
similarity index 100%
rename from Installer/Licence.txt
rename to Installer/license.txt
diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj
index 1e1ac6d7ba..49b39701f7 100644
--- a/Languages/Languages.vcxproj
+++ b/Languages/Languages.vcxproj
@@ -1,113 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <msgfmt Include="po\ar.po" />
+    <msgfmt Include="po\ca.po" />
+    <msgfmt Include="po\cs.po" />
+    <msgfmt Include="po\de.po" />
+    <msgfmt Include="po\el.po" />
+    <msgfmt Include="po\en.po" />
+    <msgfmt Include="po\es.po" />
+    <msgfmt Include="po\fa.po" />
+    <msgfmt Include="po\fr.po" />
+    <msgfmt Include="po\he.po" />
+    <msgfmt Include="po\hu.po" />
+    <msgfmt Include="po\it.po" />
+    <msgfmt Include="po\ja.po" />
+    <msgfmt Include="po\ko.po" />
+    <msgfmt Include="po\nb.po" />
+    <msgfmt Include="po\nl.po" />
+    <msgfmt Include="po\pl.po" />
+    <msgfmt Include="po\pt.po" />
+    <msgfmt Include="po\pt_BR.po" />
+    <msgfmt Include="po\ru.po" />
+    <msgfmt Include="po\sr.po" />
+    <msgfmt Include="po\sv.po" />
+    <msgfmt Include="po\tr.po" />
+    <msgfmt Include="po\zh_CN.po" />
+    <msgfmt Include="po\zh_TW.po" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}</ProjectGuid>
-    <RootNamespace>Languages</RootNamespace>
+    <ProjectGuid>{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="po.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Source\VSProps\Base.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Source\VSProps\Base.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <!--Output directly to binary directory...-->
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Binary\$(Platform)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Binary\$(Platform)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Binary\$(Platform)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Binary\$(Platform)\</OutDir>
+    <OutDir>$(BinaryOutputDir)</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <msgfmt Include="po/ar.po" />
-    <msgfmt Include="po/cs.po" />
-    <msgfmt Include="po/de.po" />
-    <msgfmt Include="po/el.po" />
-    <msgfmt Include="po/en.po" />
-    <msgfmt Include="po/es.po" />
-    <msgfmt Include="po/fr.po" />
-    <msgfmt Include="po/he.po" />
-    <msgfmt Include="po/hu.po" />
-    <msgfmt Include="po/it.po" />
-    <msgfmt Include="po/ja.po" />
-    <msgfmt Include="po/ko.po" />
-    <msgfmt Include="po/nb.po" />
-    <msgfmt Include="po/nl.po" />
-    <msgfmt Include="po/pl.po" />
-    <msgfmt Include="po/pt_BR.po" />
-    <msgfmt Include="po/pt.po" />
-    <msgfmt Include="po/ru.po" />
-    <msgfmt Include="po/sr.po" />
-    <msgfmt Include="po/sv.po" />
-    <msgfmt Include="po/tr.po" />
-    <msgfmt Include="po/zh_CN.po" />
-    <msgfmt Include="po/zh_TW.po" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="po/ar.po" />
-    <None Include="po/cs.po" />
-    <None Include="po/de.po" />
-    <None Include="po/el.po" />
-    <CustomBuild Include="po/en.po">
-      <FileType>Document</FileType>
-    </CustomBuild>
-    <None Include="po/es.po" />
-    <None Include="po/fr.po" />
-    <None Include="po/he.po" />
-    <None Include="po/hu.po" />
-    <None Include="po/it.po" />
-    <None Include="po/ja.po" />
-    <None Include="po/ko.po" />
-    <None Include="po/nb.po" />
-    <None Include="po/nl.po" />
-    <None Include="po/pl.po" />
-    <None Include="po/pt_BR.po" />
-    <None Include="po/pt.po" />
-    <None Include="po/ru.po" />
-    <None Include="po/sr.po" />
-    <None Include="po/sv.po" />
-    <None Include="po/tr.po" />
-    <None Include="po/zh_CN.po" />
-    <None Include="po/zh_TW.po" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="po.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Languages/gettextize b/Languages/gettextize
index d245544eda..dc54fff21b 100755
--- a/Languages/gettextize
+++ b/Languages/gettextize
@@ -13,9 +13,10 @@ sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/"
 sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2003-2013/" Languages/po/dolphin-emu.pot
 sed -i "s/license as the PACKAGE package/license as the dolphin-emu package/" Languages/po/dolphin-emu.pot
 
-POTFILE=./Languages/po/dolphin-emu.pot
-PO_FILES=$(find ./Languages/po -name '*.po')
-for PO in $PO_FILES
-do
-	msgmerge --quiet --update --backup=none -s $PO $POTFILE
-done
+# XXX: Disabled now that we use Transifex (the tool will handle this automatically).
+#POTFILE=./Languages/po/dolphin-emu.pot
+#PO_FILES=$(find ./Languages/po -name '*.po')
+#for PO in $PO_FILES
+#do
+#	msgmerge --quiet --update --backup=none -s $PO $POTFILE
+#done
diff --git a/Languages/po.props b/Languages/po.props
index bbe7c0112c..e7970c02e7 100644
--- a/Languages/po.props
+++ b/Languages/po.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup
     Condition="'$(msgfmtBeforeTargets)' == '' and '$(msgfmtAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
diff --git a/Languages/po/ar.po b/Languages/po/ar.po
index 47d512b89c..54b50d1946 100644
--- a/Languages/po/ar.po
+++ b/Languages/po/ar.po
@@ -1,18 +1,19 @@
-# Translation of dolphin-emu.pot to Arabic
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # mansoor, 2011
 # mansoor <asseryma@hotmail.com>, 2013
-# moceap <moceap@hotmail.com>, 2013
+# Mosaab Alzoubi <moceap@hotmail.com>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 16:15+0000\n"
-"Last-Translator: mansoor <asseryma@hotmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ar/)\n"
 "Language: ar\n"
@@ -22,21 +23,33 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(عرض أشياء كثير جدًا)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " لعبة : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! لا"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -45,57 +58,107 @@ msgstr ""
 "\"%s\" لا وجود لها.\n"
 " إنشاء جديد بطاقة الذاكرة ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sنسخ%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s موجود بالفعل، الكتابة فوقة؟"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s فشل في أن تكون نقيت. ربما كانت الصورة معطوب."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -104,360 +167,339 @@ msgstr ""
 "%s فشل تحميل في بطاقة الذاكرة \n"
 "الملف ليس كبيرا بما يكفي لتكون بطاقة الذاكرة ملف صحيح (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s فشل في فتح"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s ملف 0 بايت"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s مضغوط بالفعل! لا يستطيع أن يضغط أكثر من ذلك."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s اسم الملف طويل جدا الحد الاقصى هو 45 "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sمسح%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sتصدير GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sاستيراد GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& و"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&حول البرنامج  "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&التشغيل من محرك الاقراص"
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&نقاط التوقف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&استعراض الايزو "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&مدير الاسرار"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&إعدادات الصوت"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&مسح ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&حذف تحديد ايزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&محاكاة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&ملف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&الاطار المسبق"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&ملء الشاشة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&مساعدة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&إعدادات الاختصارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&تحميل الحالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&بطاقه الذكره جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&الذاكرة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&فتح"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&خيارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&وقفة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&ابداء اللعبه"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&خصائص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&وضع للقراءة فقط"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&تحديث القائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&تسجل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&إعادة اللعبه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&الصوت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "اغلق اللعبه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&أدوات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&فديو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&القائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&إعدادات تحكم الوي"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&معلومات عن اللعبة"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(معروف)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(ايقاف)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 بت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 بت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "الرؤية ثلاثية الأبعاد"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 بت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<أدخل اسم هنا>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<لم يتم العثور على القرارات>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<لا شيء>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<اضغط على مفتاح>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<النظام>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "نافذة اللعب عبر النت مفتوح بالفعل!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "اللعبة ليست قيد التشغيل حاليا."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "اسرار"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "ترجمة البرنامج بواسطة منصور العسيري"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "تسريع"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "ضبط:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"تحاكي بدقة الصادرات للنسخ.\n"
-"بعض الألعاب تعتمد على هذا بالنسبة للتأثيرات رسومية معينة أو وظائف اللعب.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا التحقق."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "العمل"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -467,197 +509,179 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "كرت الشاشه :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "إضافة رمز ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "أضف باتش"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "إضافة جزء جديد"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "العنوان :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "متقدم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "إعدادات متقدمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "جميع ملفات الجيم كيوب (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "حفظ جميع الحالات (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "جميع ملفات ايزو الوي"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "جميع مضغوط GC/Wii ISO files (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "جميع الملفات (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "تحليل"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "الزاوية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "تصفية متباينة الخواص :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "تنعيم الحواف:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل التطبيق؟"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader غير قادر على تحميل ملف من"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "تطبيق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -667,69 +691,92 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا حدد إيقاف."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "العربية"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "هل أنت متأكد أنك تريد حذف \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
 msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "نسبة العرض :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "يجب أن لا يقل عن جزء واحد لا تزال مفتوحة."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "الصوت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "صوت الخلفية :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "تلقائي"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "تلقائي (Multiple of 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "تلقائي حجم النافذة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "ضبط حجم النافذة تلقائي "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -739,251 +786,249 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP تسجل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "رجوع"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "إعدادات الخلفية"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "الخلفية:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "خلفية الإدخال"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "الى الوراء"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "سيء  بداية الملف "
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "ميزان لوح"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "بنر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "تفاصيل بنر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "بنر:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "شريط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "الأساسية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "إعدادات أساسية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "صوت عميق"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "كتلة الاختباري جدول تخصيص فشل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "كتل"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "أزرق"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "اليسار أزرق"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "اليمين أزرق"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "يلزم التحكم: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "معطلة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "أستعرض"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "لتصفح دليل لإضافة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "لاستعراض الدليل ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "لاستعراض الدليل الإخراج"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "العازلة :"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "أزرار"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "العصا الأيمن "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "العصا الأيمن "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "محرك محاكي المعالج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "شاشة القوائم المؤقته"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "لا يمكن فتح %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"لا يمكن استخدام هذا الملف كبطاقة الذاكرة.\n"
-"%s\n"
-"ليست ذاكرة جيم كيوب ملف بطاقة صالحة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"لا يمكن استخدام هذا الملف كبطاقة الذاكرة.\n"
-"هل تحاول استخدام نفس الملف في كل من فتحات?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "الكاتالونية"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "مركز"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "تغيير"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "تغيير &القرص"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "تغيير القرص"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "تغيير اللعبة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -991,102 +1036,90 @@ msgstr ""
 "تغيير لغة واجهة المستخدم.\n"
 "يتطلب إعادة التشغيل."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Changes sign to zFar Parameter (بعد التصحيح)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Changes sign to zNear Parameter (بعد التصحيح)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "تغيير هذه ليس لها أي أثر في حين أن المحاكي قيد التشغيل!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "شات"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "اسرار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "بحث عن اسرار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "قائمة الاسرار"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "تحقق سلامة التقسيم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "التحقق من سلامة ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "الصينية المبسطة"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "الصينية التقليدية"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "DVD اختيار الدليل أصل  :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Choose a NAND root directory:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "اختيار ايزو الافتراضية :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "اختيار دليل لإضافة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "اختيار ملف لفتح"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "اختيار بطاقة الذاكرة :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "اختيار ملف لاستخدام رافعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله فقط)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "اختيار مجلد لاستخراج"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "دائرة العصا"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "الكلاسيكية"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "أزال"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1094,183 +1127,230 @@ msgstr ""
 "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك "
 "يدويا إيقاف اللعبة."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "إغلاق"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "الإعدادات العامة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "رمز المعلومات"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "رمز: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "الأمر"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "التعليق"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "التعليق:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "اختيار ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "إعدادات"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "إعدادات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "إعدادات التحكم"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "تكوين منصات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "إعدادات"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "تأكيد الكتابة فوق ملف"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "تأكيد على التوقف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "اتصال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "توصيل ميزان لوح"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "ربط كيبورد يو اس بي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr " توصيل ويموت%i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "توصيل ويموت 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "توصيل ويموت 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "توصيل ويموت 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "توصيل ويموت 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "توصيل"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "وحدة التحكم"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "البحث المستمر"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "عصا تحكم"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "GCIتحويل إلى "
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "فشل نسخ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "نسخ إلى بطاقة الذاكرة %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "الأساسية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "لا يمكن إنشاء %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "لا يمكن تهيئة الخلفية %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"لا يمكن قراءة \"%s\".  لا يوجد قرص في محرك الأقراص ، أو أنها ليست GC/Wii "
-"backup.    يرجى ملاحظة أن جيم كيوب الأصلي وأقراص الوي لا يمكن قراءتها من قبل "
-"معظم أجهزة الكمبيوتر محركات الأقراص دي في دي."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "لا يمكن التعرف ملف ايزو %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "لا يمكن حفظ %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1283,11 +1363,19 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "لا يمكن العثور فتح الأوامر للتمديد 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1295,38 +1383,46 @@ msgstr ""
 "لا يمكن التهيئة الأساسية.\n"
 "تحقق التكوين الخاص بك."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "الاحصاء :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "البلد:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "إنشاء رموز اسرار"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "إنشاء منظور جديد"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "المنشئ :"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "حرج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "محصول"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1336,198 +1432,191 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "الإبهات المتداخل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "هاك مخصص العرض"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "إعدادات هاك مخصص العرض"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "تخصيص بعض المعلمات العرض على إملائي."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "التشيكية"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "الاسهم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "الصوت"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "محرك محاكي الصوت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulation (سريع)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (بطيء)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "إعدادات الصوت"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD Root:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "بساط الرقص"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "حجم البيانات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "التاريخ :"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "المنطقة الميتة"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "التصحيح"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "التصحيح"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "عشري"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "اختيار إلغاء ضغط ايزو "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "فك ايزو"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "تقليل حدود الإطار"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "الافتراضي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ايزو الافتراضية :"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "الخط الافتراضي"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "حذف"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "حذف الحفظ"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "حذف الملف الموجود '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "الوصف"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "كشف"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "أداة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "إعدادات الجهاز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "الاتصال الهاتفي"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1535,20 +1624,23 @@ msgstr ""
 "فشل الدليل الاختباري\n"
 " و فشل دليل الاختباري الاحتياطية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "تعطيل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "تعطيل الضباب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1562,251 +1654,213 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "القرص"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "خطأ قراءة القرص"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "العرض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"عرض المدخلات قراءتها من قبل المضاهاة.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "انقسام"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "هل تريد اغلق اللعبة الحالية؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "دولفين"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "موقع دولفين"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "إعدادات دولفين"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "إعدادات تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "دولفين"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "إعدادات تحكم الجيم كيوب"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "إعدادات تحكم الوي"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "دولفين على مدونة قوقل"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملفات "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"تم تعيين دولفين حاليا إخفاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "دولفين غير قادر على إكمال الإجراء المطلوب ."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "تحميل اسرار للعبة"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu وأضاف %lu تم تحميل الاسرار  "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "الطبول"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "وهمي "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Dump Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Dump EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "تفريغ الإطارات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Dump Textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"تفريغ جميع الإطارات المقدمة إلى ملف AVI في ملف User/Dump/Frames/\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"فك اللعبة لتفريغ القوام User/Dump/Textures/<game_id>/\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"تفريغ محتويات الصادرات للنسخ إلى User/Dump/Textures/\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "الهولندية"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "خروج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Copies"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1815,56 +1869,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "أوروبا"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "بداية تحديث الذاكرة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "تحرير"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "تعديل رمز ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "تعديل الاعدادات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "تعديل الباتش"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "تعديل المنظور الحالي"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "تحرير"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "تأثير"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "عازل الإطار المضمن "
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "المحاكي قيد التشغيل بالفعل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1873,7 +1911,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1889,122 +1927,92 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "محاكاة ويموت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "حالة المحاكاه: "
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "تمكين"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"تمكين تأثيرات الرؤية ثلاثية الأبعاد عن طريق استخدام تكنولوجيا الرؤية "
-"الاستريوسكوبية نفيديا ثلاثي الأبعاد إذا كانت مدعومة من قبل بمعالج الجرافيك "
-"الخاص بك.\n"
-"يسبب ربما باخطاء.\n"
-"\n"
-"يتطلب ملء الشاشة للعمل.\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "تمكين منع الدمج"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "تمكين تنظيم حساب الإطار"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "تمكين التخزين المؤقت"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "تمكين الاسرار "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Enable Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Enable Dual Core (لزيادة السرعة)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Enable Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Enable Idle Skipping (لزيادة السرعة)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "MMU تمكين"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "تمكين المسح التقدمي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "تمكين شاشة التوقف"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "تمكين بيانات مكبر صوت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "تمكين شاشة عريضة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "تمكين الإطار السلكي"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"تمكين الترشيح متباين الخواص.\n"
-"يحسن الجودة المرئية من التكسرات التي في زوايا مشاهدة المائلة.\n"
-"قد يسبب مشاكل في عدد قليل من الألعاب.\n"
-"\n"
-"إذا لم تكن متأكدا حدد X1."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = "
-"Compatible)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "تمكين صفحات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2016,7 +2024,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2028,28 +2036,25 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشفق الاميرة. لتعطيل أي لعبة أخرى."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "يمكن توقعات مخصص هاك"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
-msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
+msgid ""
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2061,13 +2066,17 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذه غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2077,57 +2086,68 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "نهاية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "الإنجليزية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "تحسينات"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "أدخل اسم للمنظور جديد :"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "دخول %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "دخول 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "المساواة"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "خطأ"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2136,315 +2156,277 @@ msgstr ""
 "ولكن لم يتم تحميلها. ألعاب قد لا تظهر الخطوط بشكل صحيح، أو تعطل %s خطأ : "
 "محاولة الوصول إلى الخطوط."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "تنفيذ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "خروج"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "تصدير جميع الحفظ الوي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "فشل تصدير"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "فشل تصدير"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "تصدير تسجيل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "تصدير تسجيل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "تصدير حفظ"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "تصدير حفظ الوي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "تصدير جميع الحفظ"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "فشل تصدير"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "تصدير حفظ باسم"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "تمديد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "عزل الاطار الخارجي"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "معلمة إضافية"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "استخراج كافة الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "استخراج Apploader"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "استخراج دليل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "استخراج الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "استخراج التقسيم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "استخراج %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "استخراج كافة الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "استخراج دليل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "استخراج"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "بايت"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "فرنسا"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "الحجم :"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "خطأ الاتصال"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "اللعبه لاتوجد  في قاعده البيانات."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "فشل في الاستخراج إلى %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "فشل في قراءة banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Failed to read block %d of the save data\n"
-"Memcard may be truncated\n"
-"FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "فشل في قراءة البيانات من ملف %d"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "فشل في قراءة معرف فريد من صورة القرص"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "فشل لكتابة bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "الفارسية"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "سريع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr " لا يعمل في كل لعبة MMU إصدار سريع من."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "ملف المعلومات"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "الملف لا يتضمن اسرار."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "تحويل ملف إلى .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2452,7 +2434,7 @@ msgstr ""
 "قد لا يمكن فتح ملف\n"
 "أو لا يكون امتداد صالح"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2461,621 +2443,665 @@ msgstr ""
 "ملف يحتوي على ملحق \"%s\"\n"
 "ملحقات الصالحة (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "لم يتم التعرف على الملف كملف بطاقة ذاكرة"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "ملف غير مضغوط "
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "نوع الملف غير معروف! لن تفتح!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "بحث عن التالي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "البحث السابقة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "أول بلوك"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "الإصلاح اختبارية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "العرض 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "العرض 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "فرض وحدة التحكم على النظام الياباني"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "نتقية الرسوميات بالقوة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"فرض اللعبة انتاج رسومات دقه تباين شاشة عريضة.\n"
-"يسبب اخطاء رسومية بعض الألعاب.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"وضع لاستخدام الخط الياباني في اللعاب .\n"
-"ترك دون ,المحاكي يكون افتراضي على النظام الانجليزي ويتيح هذا الاعداد تلقائيا "
-"عند اللعب اليابانية ."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "إلى الأمام"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "الإطار"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "الإطار"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "الإطار المسبق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Frame Dumps use FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "معلومات الإطار "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "مجموعة الإطار "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "تخطي الإطار "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "حد الإطار:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "إطارات لتسجيل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "تحكم بكاميرا اللعبة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "الفرنسية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "الحنق"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "من"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "شاشه كامله"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "دقة العرض :"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI File(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "تحكم الجيم كيوب"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "معرف اللعبة:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "لعبة تستخدم بالفعل!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "اللعبة ليست على التوالي!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "لم يتم العثور على اللعبة !"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "إعدادات معينه للعبه"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "إعدادات اللعبة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "ملفات حفظ لعبة جيم كيوب(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "جيم كيوب"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "إعدادات تحكم جيم كيوب"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) "
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "إعدادات تحكم جيم كيوب"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "تحميل اسرار"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"GeckoCode فشل تشغيل (CT%i CST%i) (%s)\n"
-"(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "عام"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "الإعدادات العامة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "الألمانية"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "أكبر من"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"زيد بشكل كبير جودة تجعل القوام تم إنشاؤها باستخدام إلى الملمس الآثار.\n"
-"سيتم زيادة الدقة الداخلي بتحسين أثر هذا الإعداد.\n"
-"انخفاض طفيف الأداء وربما يسبب مشاكل.\n"
-"\n"
-"إذا لم تكن متأكدا، اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "اليونانية"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "اليسار أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "اليمين أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "غيتار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "هاك"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "عنوان اختباري فشل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "العبرية"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "ارتفاع"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "مساعدة"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"مرحبا,\n"
-"\n"
-"المحاكي يتطلب وحدة المعالجة المركزية احدث .\n"
-"للأسف وحدة المعالجة المركزية الخاصة بك لا يعتمد عليها، لذلك لن يتم تشغيل "
-"المحاكي.\n"
-"\n"
-"الوداع!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "إخفاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "إخفاء مؤشر الماوس"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"إخفاء مؤشر الماوس اذا كان على أعلى نافذة المحاكاة.\n"
-"\n"
-"إذا لم تكن متأكدا ترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "الصفحة الرئيسية"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "هوست"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "إعدادات الاختصارات"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "الاختصارات"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "الهنغارية"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "ويموت هجين"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL إعدادات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR المؤشر"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR حساسية:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "تفاصيل ايزو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "مجلد الايزو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "إيطاليا"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr " أيقونة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير "
-"ماريو"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "تجاهل تنسيق التغييرات "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignore any changes to the EFB format.\n"
-"Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
-"Improves performance in some games, but might disable some gameplay-related "
-"features or graphical effects.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "حفظ استيراد"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr " استيراد حفظ الوي"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "فشل الاستيراد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "الملف يحتوي على طول المستوردة غير صالحة"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "تتعطل في اللعبة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "معلومات"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "المعلومات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "معلومات"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "إدراج"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "إدراج رمز المشفرة أو فك شفرة هنا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SD Card ادرج   "
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "أدخل اسم هنا"
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "wad تثبيت"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "تثبيت إلى قائمة الوي"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "wad تثبيت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "تحقق من سلامة الخطأ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "التحقق من سلامة الانتهاء"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "انتهاء التدقيق من سلامة لم يتم العثور على أخطاء"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "الواجهة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "واجهة الإعدادات"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3084,100 +3110,106 @@ msgstr ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "حاول تحميل الحالة مرة أخرى"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "الدقة الداخلية :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr " (بطيئة جدا) Interpreter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "تتعطل في المقدمة"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "قيمة غير صالحة!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "غير صالح نوع الحدث %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "ملف غير صالح"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "تسجيل الملف غير صالح"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "غير صالح حالة"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "الإيطالية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "اليابان"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "اليابانية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "كوريا"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3187,270 +3219,292 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا ترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "إبقاء النافذة على أعلى"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "المفتاح"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "الكورية"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "اللغة :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "اليسار"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "العصا الأيسر"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"انقر الأيسر لاكتشاف مفاتيح الاختصار.\n"
-"أدخل لمسح المساحة."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "أقل من"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "الحد من عدد الإطارات في الثانية "
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "تحميل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "تحميل القوام المخصص"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "1 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "2 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "3 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "4 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "5 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "6 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "7 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "8 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "تحميل قائمة نظام الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "تحميل قائمة نظام الوي %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"تحميل القوام المخصص من User/Load/Textures/<game_id>/\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوفرة."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "سجل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "سجل الإعدادات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "تسجيل عدد الاطارات في ملف"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "نوع السجل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"استخدام هذه الميزة عندما تريد قياس أداء المحاكي  User/Logs/fps.txt تسجيل عدد "
-"من الإطارات في الثانية المقدمة إلى.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "مختلفان النواتج"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "تسجيل"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "إنقطع الإتصال الملقم!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU سرعة هاك"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "العصا الأيسر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "معرف المنتج :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "المنتج :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3459,35 +3513,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "عالي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "بطاقة الذاكرة لديه بالفعل باستثناء هذا العنوان"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "بطاقة الذاكرة فتحت بالفعل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "ذاكرة بايت"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "بطاقة الذاكرة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "إدارة بطاقة الذاكرة تنبية قم بعمل نسخة احتياطية قبل الاستخدام"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3504,37 +3562,52 @@ msgstr ""
 "%s\n"
 "هل ترغب في نسخ الملف القديم إلى هذا الموقع الجديد?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم الملف "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "القائمة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "الميكروفون"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "منخفض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "متفرقات"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "إعدادات منوعة"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "معدل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3546,20 +3619,24 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "الخط أحادي المسافة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "موشن بلس"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "محرك"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3577,677 +3654,630 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "تضاعف"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "ملاحظة: حجم التدفق لا يطابق مدة البيانات الفعلية\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "بدء"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "عشري"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "حذف"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "انقسام"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "نهاية"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "دخول"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "متساوية"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "منزل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "أدخل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "اليسار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "ضرب"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "صفحة لأسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "صفحة لأ أعلى"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "اليمين"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "الفاصل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "مساحة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "طرح"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "التبويب"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "فوق"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "الاسم :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "الاسم :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI files(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "بحث جديد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "الصفحة التالية"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "البحث التالي"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "اسمك :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "لا يوجد بلد (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "لم يتم العثور على الايزو "
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "لا يوجد مخرجات صوتية"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "لم يتم العثور على ملف البنر  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "لا يوجد وصف متاح"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "لا الالتحام"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "لا يوجد ملف تحميل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "لا يوجد مدخلات مجلدات فهرسية حرة"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "لا ملف مسجل"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "لا حفظ المجلد نتيجة البحث عن العنوان %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "لا شيء"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "النرويجية"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "لا يساوي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "غير مجموعة"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "غير متصل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "ملاحظات"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "ملاحظات :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "إشعار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "ارقام القفل"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "عدد من رموز :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "ننشوك"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "تسريع ننشوك"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "الهدف"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "نطاق الهدف"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "إيقاف"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "تعويض :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "عرض الرسائل التي تظهر على الشاشة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "تسجيل اون لاين"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "فقط %d كتل متاحة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "فتح"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "فتح المجلد المتضمن"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "افتح مجلد حفظ الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "فتح الملف"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL : لا يمكن إنشاء سياق الجهاز  %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL : لا يمكن فتح الجهاز %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "مفك رسوميات OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "مفك رسوميات OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "خيارات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "البرتقالي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "أخرى"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"العميل قطع أخرى في حين يتم تشغيل اللعبة! تم تعطيل تشغيل نت. كنت يدويا إيقاف "
-"اللعبة."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "الإخراج"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "تشغيل التسجيل"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "تحكم"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "تحكم"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "منصات"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "صفحة لأسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "أعلى الصفحة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "الفقرة"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "معلمات"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "قسم %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "باتش"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "مسارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "وقفة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "توقف في نهاية الفيلم"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "لكل بكسل إضاءة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "مثالية"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "مشهد %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "بدأ اللعبه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "تشغيل التسجيل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "بدأ/ايقاف"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "قابلة للتشغيل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "خيارات التشغيل"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "يرجى تأكيد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "الرجاء إنشاء منظور قبل الحفظ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "البولندية"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "تحكم 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "تحكم 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "تحكم 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "تحكم 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "المنفذ :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "البرتغالية"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "البرتغالية البرازيلية"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "بعد معالجة تأثير:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "إعدادات مسبقة :"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "الصفحة السابقة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "الصفحة السابقة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "القيمة السابقة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "طباعة"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "الملف الشخصي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "خصائص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "إزالة التخزين المؤقت"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "السؤال"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "خروج"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "روسيا"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "قوه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "وضع القراءة فقط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "حقيقي"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "ويموت حقيقي "
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "ويموت حقيقي "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "تسجيل"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "مدخلات السجل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "تسجيل معلومات"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "تسجيل الخيارات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "أحمر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "اليسار أحمر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "اليمين أحمر"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"يقلل من التعرجات الناجمة من كمية التنقيط رسومات ثلاثية الأبعاد.\n"
-"وهذا يجعل الصورة تبدو أقل تقديم ممتلئ الجسم.\n"
-"انخفاض سرعة المحاكاة بشكل كبير ويؤدي في بعض الأحيان الى اخطاء.\n"
-"\n"
-"إذا لم تكن متأكدا حدد لا شيء."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "تحديث"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "تحديث قائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "تحديث القائمة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "إزالة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4257,242 +4287,320 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "تقدم إلى الشاشة الرئيسية"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "إعادة ضبط"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "النتائج"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "الاصدار:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "اليمين"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "العصا الايمن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "هزاز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "الروسية"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "حفظ الحالة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "آمنة"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "حفظ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "GCI حفظ باسم "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "1 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "2 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "3 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "4 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "5 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "6 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "7 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "8 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "حفظ باسم"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "حفظ مضغوط GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "حفظ المنظور الحالي"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "حفظ الضغط GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "EFB Copia a escala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "فحص %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "بحث ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "فحص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "التقاط صوره"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "انتقل تأمين"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "بحث"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "بحث فلتر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "البحث في المجلدات الفرعية"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "البحث عن الكائن الحالي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "البحث عن قيمة هيكس:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "حدد"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "اختر ملف تسجيل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "لتثبيت wad حدد ملف"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"اختر كرت الشاشة لاستخدام.\n"
-"\n"
-"إذا لم تكن متأكدا استخدم أول واحد."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "اختر حفظ ملف للاستيراد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "اختر النوافذ العائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "حدد الملف لتحميل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "حدد حفظ الملف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "حدد حالة التحميل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "حدد حالة الحفظ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4510,253 +4618,291 @@ msgstr ""
 "\n"
 "إذاغير متأكد حدد التلقائي."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "اختيار الملف التحكم الشخصي غير موجود "
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "تحديد الخط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"تحديد دقة العرض المستخدمة في وضع ملء الشاشة.\n"
-"هذا ينبغي أن يكون دائما أكبر من أو يساوي الدقة الداخلية التأثير على أداء لا "
-"يكاد يذكر.\n"
-"\n"
-"إذا لم تكن متأكدا، استخدم دقة سطح المكتب.\n"
-"إذا لم تكن متأكدا من ذلك ، استخدم أعلى دقة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "إرسال"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "موضع الاستشعار:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "الفاصل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "الصربية"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "المنفذ التسلسلي 1 -- وهذا هو المنفذ الذي الأجهزة مثل استخدام محول شبكة"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "تعيين كافتراضي ايزو"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "تعيين كافتراضي بطاقة الذاكرة %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "إعدادات"
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "هزة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "الاسم المختصر :"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "أزرار الكتف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "اظهار &لوحة المراقبة"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "اظهار السجل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "عرض شريط الحالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "أظهر شريط الأدوات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "المظهر الافتراضي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "اظهر محرك الاقراص"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "إظهار نسخة الصادرات للمناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "أظهر عدد الاطارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "فرنسا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "إظهار مدخلات العرض"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "إيطاليا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "اليابان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "كوريا"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "أظهر اللغة :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "عرض سجل الاعدادات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "اوروبا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "عرض الاجهزه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "إظهار المناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "إظهار الإحصاءات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "تايوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "امريكا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Wad اظهار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "الوي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "ظهور رسالة قبل وقف اللعبة."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"إظهار رسالة خطأ عند حدث خطاء محتمل .\n"
-"يمكن تجنب تعطيل هذه الرسائل المزعجة ، ولكنه يمكن تعني أيضا أن دولفين يتعطل "
-"فجأة دون أي تفسير على الإطلاق."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "إظهار اول كتلة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "إظهار عداد التأخر"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "إظهار كتل حفظ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "إظهار حفظ التعليقات"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "إظهار أيقونة الحفظ "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "إظهارعنوان الحفظ "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4767,83 +4913,82 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "غير معروف"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"عرض إحصاءات مختلفة.\n"
-"\n"
-"إذا لم تكن متأكدا ترك هذا غير محددة."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "ويموت جانبي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "الصينية المبسطة"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "الحجم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "تخطي البيوس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Skip EFB Access from CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
-"If you're experiencing any issues, try raising texture cache accuracy or "
-"disable this option.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "فتحة %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "A خانة "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "B خانة "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "لقطة"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4854,234 +4999,282 @@ msgstr ""
 "انها مفيدة فقط لأغراض التصحيح.\n"
 "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "إعدادات الصوت"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "غير صالحة %s خلفية الصوت."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "فشل إنشاء المخزن المؤقت الصوت : %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "مجال"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "الأسبانية"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "مكبر الصوت:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
-"\n"
-"إذا لم تكن متأكدا حدد 528*640 ."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "تسريع معدل نقل القرص"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "مربع العصا"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "وحدة تحكم القياسية"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "بدء &اللعب عبر الشبكة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "بدء التسجيل"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "بدء التسجيل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "الحالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "حفظ الحالة"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "عجلة القيادة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "عصا"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "اغلق اللعبه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "امتداد لنافذة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "داعب الأ وتار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "طرح"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "بنجاح تصدير الملف إلى %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "استيرادها بنجاح حفظ الملفات"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "هز"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "نظام اللغة :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "تايوان"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "الإدخال"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "التبويب"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "تقسيم الجدول"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "الجدول الأيسر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "الجدول الأيمن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "اخذ لقطه من الشاشه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "اختبار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "الرسوميات"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr " بنجاح wad وقد تم تركيب"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "عنوان غير صالح"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "تم إصلاح بنجاح الاختباري"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "الدليل المختار هو بالفعل في قائمة"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5090,7 +5283,7 @@ msgstr ""
 "The file %s already exists.\n"
 "هل ترغب في استبدالها?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5098,240 +5291,278 @@ msgid ""
 msgstr ""
 "الملف %s تعذر فتح للكتابة. يرجى التحقق من إذا فتحت بالفعل من قبل برنامج آخر."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "الملف %s بالفعل مفتوح، لن الملف غير عنوان مكتوب."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "لا وجود له (%s) الملف الذي حددته"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "يمكن أن يكون اسم لا يتم فارغا"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "يمكن أن يكون اسم لا تحتوي على الأحرف '،'"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"أكثر أمانا ضبط هذا، فإن على الأرجح أقل المضاهاة تكون مفقودة أي تحديثات "
-"الملمس من ذاكرة الوصول العشوائي.\n"
-"\n"
-"إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "حفظ تحاول نسخة له حجم ملف غير صالح"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "لا يتم اعتماد اللغة المحددة من قبل النظام. يتراجع إلى النظام الافتراضية."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "الملقم والعميل إصدارات لعب نت تتعارض"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "الملقم ممتلئ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "أجاب الخادم : اللعبة قيد التشغيل حاليا"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "بعث الملقم رسالة خطأ غير معروف"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "قيمة غير صالحة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "ثيم:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr "تجاوز هذه الإعدادات إعدادات دولفين الأساسية ."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل نفسه."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "هذا يمكن أن يسبب بطء في القائمة لوى وبعض الألعاب."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤلف ملف التكوين"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "بداية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "إمالة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "العنوان"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "إلى"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "تبديل جميع أنواع السجل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "اللعب بالشاشة كاملة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "أعلى"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "الصينية التقليدية"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "حاول تحميل نوع ملف غير معروف."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Triggers"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "محاولة قراءة من SYSCONF غير صالحة"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "التركية"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "القرص الدوار"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "نوع"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP منفذ :"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "غير معروف"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "غير معروف_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "امريكا"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5339,192 +5570,175 @@ msgstr ""
 "غير قادر على إنشاء التصحيح من قيم المعينة.\n"
 "الدخول غير معدل."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
-"decrypted code.  Make sure you typed it correctly.\n"
-"هل ترغب في تجاهل هذا الخط ، ومواصلة تحليل?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "غير محدود %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "التراجع عن تحميل الحالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "تلقى رسالة مجهولة مع معرف : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "أعلى"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "التحديث"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "ويموت مستقيم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "(PAL60) استخدم وضع "
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "استخدام شاشة كاملة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "استخدام الهيكس"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"استخدام خيوط متعددة لفك ترميز القوام.\n"
-"قد يؤدي إلى تسريع وخاصة على وحدات المعالجة المركزية مع أكثر من اثنين من "
-"النوى.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"عادة اذا فشل تجميع تظليل، ويتم عرض رسالة الخطأ.\n"
-"ومع ذلك، يمكن للمرء أن تخطي بالنوافذ للسماح اللعبة توقف الخطوط عن طريق فحص "
-"هذا الخيار.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "فائدة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "تحديد أقصى معدل الاطار"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "القيمة"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "القيمة:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "القيمة:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "فديو"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "الظاهري"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "الصوت"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "خطأ في إنشاء wad: فشل التثبيت %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "خطأ في إنشاء wad: فشل التثبيت %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5536,25 +5750,27 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "التنبيه"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr ""
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5565,7 +5781,7 @@ msgstr ""
 "%s\n"
 "هل ترغب في الاستمرار?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5578,7 +5794,7 @@ msgstr ""
 "ولها نفس اسم الملف على بطاقة ذاكرة الخاصة بك\n"
 "تستمر?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5586,7 +5802,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5594,7 +5818,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5613,215 +5837,204 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "الضربة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "شاشة واسعة هاك"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "عرض"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "الوي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "جهاز الوي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Root:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "ملفات حفظ الوي (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: لا يمكن القراءة من الملف"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "ويموت %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "ويموت متصل"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "محرك ويموت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "إعدادات ويموت"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "نوافذ اليسار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "نوافذ القائمة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "نوافذ اليمين"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "كلمة ختامية"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "العمل"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "الكتابة إلى وحدة التحكم"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "كتابة إلى مصحح الأخطاء"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "الكتابة على الملف"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "الكتابة إلى نافذة"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "أصفر"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "لا يمكنك إغلاق أجزاء الصفحات التي فيها."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "عليك اختيار لعبة!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "يجب إدخال اسم!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "يجب إدخال صالح العشري، أو الست عشرية قيمة ثماني."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "يجب إدخال اسم الملف صالح."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "يجب إعادة تشغيل دولفين من أجل التغيير نافذ المفعول."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"Your SYSCONF file is the wrong size.\n"
-"يجب أن يكون 0x%04x (but is 0x%04llx)\n"
-"هل تريد إنشاء واحدة جديدة?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP هاك"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[انتظار]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5833,76 +6046,30 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[مخصص]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[تجريبية]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[تجريبية]\n"
-"يسرع قليلا من المضاهاة عرض قوائم التخزين المؤقت.\n"
-"يسبب ربما على الرغم من اخطاء.\n"
-"\n"
-"إذا لم تكن متأكدا اترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: قراءة شفرة تشغيل من %x. الرجاء التقرير."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returned -1 on application run!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar تصحيح: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear تصحيح: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "أو"
diff --git a/Languages/po/ca.po b/Languages/po/ca.po
index 2357545831..3436941181 100644
--- a/Languages/po/ca.po
+++ b/Languages/po/ca.po
@@ -1,19 +1,22 @@
-# Translation of dolphin-emu.pot to Catalan
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # Jordi Coma, 2011
 # Jordi Coma <jordicoma22@gmail.com>, 2011
+# Katabi Oka, 2015
+# Puniasterus <puniasterus@gmail.com>, 2013-2015
 # Puniasterus <puniasterus@gmail.com>, 2013
 # Puniasterus <puniasterus@gmail.com>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ca/)\n"
 "Language: ca\n"
@@ -22,21 +25,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(IP interna)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(massa per ensenyar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Joc:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -45,43 +60,93 @@ msgstr ""
 "\"%s \" no existeix.\n"
 " Crear una nova targeta de memòria de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "\"%s\" no s'ha pogut esborrar. Probablement, la imatge està danyada."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" ja està comprimit! No es pot comprimir encara més."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopia%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "mostres %d"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "mostres %d (nivell de qualitat %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (Disc %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s ja existeix, vols sobreescriure?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s no s'ha pogut esborrar. Probablement, la imatge està danyada."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -90,7 +155,7 @@ msgstr ""
 "%s ha fallat la càrrega com a targeta de memòria\n"
 "La mida del fitxer no és vàlida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -99,7 +164,7 @@ msgstr ""
 "%s ha fallat la càrrega com a targeta de memòria\n"
 "La mida de la targeta no és vàlida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -109,365 +174,339 @@ msgstr ""
 "El fitxer no és suficientment gran per ser una targeta de memòria vàlida (0x"
 "%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s no s'ha pogut obrir"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s és un arxiu de 0 bytes"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s ja està comprimit! No es pot comprimir encara més."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
+msgid "%s was not a directory, moved to *.original"
 msgstr ""
-"%s és massa llarg per al nom de l'arxiu, el nombre de caràcters màxim és de "
-"45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEsborra%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar com a GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocs lliures; %u entrades de dir. lliures"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& I"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Arrencar des de la unitat de DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "&Configuració de àudio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "&Arrencar des de la còpia de seguretat del DVD..."
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Punts d'interrupció"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Cerca ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Gestor de &Trucs"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr "&Gestor de Trucs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Configuració de &DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "&Configuració del mando"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Eliminar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Eliminar ISOs seleccionades..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Arxiu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Avança imatge"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "Configuració de &gràfics"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Configuració de &tecles d'accés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Càrrega estat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Administrador de targeta de memòria (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memòria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "&Pel·lícula"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Obrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opcions"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Executar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Propietats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "Modalitat de només &lectura"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Actualitzar llista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registres"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reiniciar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&So"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Aturar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Eines"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Visualitzar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Configuració &Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "&Pàgina web"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zLluny"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "(Error: Desconnectat)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zAprop"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(DESCONEGUT)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(Deshabilitat)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
-msgstr ""
+msgstr "+ Afegir"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Natiu (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bits"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16-bits"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Natiu (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Natiu (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Natiu (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bits"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32-bits"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Natiu (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Natiu (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bits"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8-bits"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Insereix el nom aquí>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<No s'han trobat resolucions>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Res>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Prem alguna tecla>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Idioma del sistema>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistema>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Una finestra de NetPlay ja està oberta!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "No s'està executant cap joc actualment."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"No s'ha trobat cap dispositiu bluetooth compatible.\n"
-"Has de connectar manualment els wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "Placa base AM"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Codis AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Sobre Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Acceleració"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Precisió:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emulació precisa de les còpies EFB.\n"
-"Alguns jocs depenen d'això per alguns efectes gràfics o funcionalitat del "
-"joc.\n"
-"\n"
-"Si no n'estàs segur, activa l'EFB a mode textura."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Acció"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -482,7 +521,7 @@ msgstr ""
 "Codi culpable: \n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -490,7 +529,7 @@ msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08x) a codi afegit "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -498,7 +537,7 @@ msgid ""
 msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08X) a emplenar (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -507,7 +546,7 @@ msgstr ""
 "Error d Action Replay: Mida no vàlida (%08x: Adreça = %08x) a escriure i "
 "farciment de RAM (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -516,13 +555,13 @@ msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08x) a l'escriure al "
 "punter (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Error d'Action Replay: Valor no vàlid (%08x) en la copia de memòria (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -532,172 +571,140 @@ msgstr ""
 "(% s)\n"
 "Els Codis Mestres no fan falta. No els utilitzis."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Error d'Action Replay: línia de codi AR no vàlida: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Codi condicional: Mida no vàlida %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Tipus de codi Normal no vàlid %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Codi Normal %i: %08x subtipus invàlid (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Codi Normal 0: Subtipus no vàlid %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "Adaptador detectat"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "Adaptador no detectat"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Afegeix"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Afegeix codi ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Afegeix Pedaç"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Afegeix una nova finestra"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Afegir..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adreça IP/Nom màquina:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Afegeix el valor especificat al paràmetre zLluny.. \n"
-"Dues maneres d'expressar els valors de punt flotant. \n"
-"Exemple: entrant \"200\"o \"0, 0002\" directament, produeix els mateixos "
-"efectes, el valor adquirit serà \"0 0002\". \n"
-"Valors: (0 ->+/- sencer) o (0 ->+/- FP [6 dígits de precisió])  \n"
-"\n"
-"NOTA: Comproveu la Finestra de Log o consola dels valors adquirits."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Afegeix el valor especificat al paràmetre zAprop. \n"
-"Dues maneres d'expressar els valors de punt flotant. \n"
-"Exemple: entrant ''200'' o ''0.0002'' directament, produeix els mateixos "
-"efectes, el valor adquirit serà ''0.0002''.\n"
-"Valors: (0 ->+/- sencer) o (0 ->+/- FP [6 dígits de precisió]) \n"
-"\n"
-"NOTA: Comproveu la finestra de Log o consola dels valors adquirits."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Ajustar la pressió de control analògic per activar els botons."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avançada"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Configuració avançada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Tots els arxius GC/Wii  (elf, dol, gcm, iso, ciso, GCZ, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Totes les imatges GC/Wii (gcm, iso, ciso, gcz)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr "Tots els fitxers GameCube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Tots els Estats Guardats (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Tots els fitxers ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Tots els fitxers ISO comprimits de GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Tots els fitxers (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analitzar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Angle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtrat anisotròpic:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Data Apploader:"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader té una mida dolenta... realment és un apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader no s'ha pogut carregar des de l'arxiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -707,16 +714,12 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Àrab"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Estàs segur que vols suprimir \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -724,54 +727,81 @@ msgstr ""
 "Estàs segur que vols eliminar aquests arxius? \n"
 "No es podran recuperar mai més!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà definitiva!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (experimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64 JIT (experimental)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Relació d'aspecte:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Almenys un panell ha de romandre obert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Àudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Suport d'àudio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Configuració de àudio"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Austràlia"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "Autors"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Múltiple de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (Mida de la finestra)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Ajust automàtic de la mida de la finestra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -781,134 +811,150 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "Registre BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Enrere"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Configuració del motor"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Suport:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Suport d'entrada"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Suport"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Mala capçalera a l'arxiu"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
-msgstr ""
+msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Detalls del Imatge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Imatge:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Bàsic"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Configuració bàsica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baix"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Bateria"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "La comprovació de la «checksum» de la taula de blocs ha fallat"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blocs"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blau"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blau esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blau dret"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Fons"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controls enllaçats: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Rama: %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Trencat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Examinar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Examineu un directori per afegir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Examina un directori ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Examina el directori de sortida"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Botons"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -916,119 +962,103 @@ msgstr ""
 "Ometre la neteja de la memòria cau mitjançant la instrucció DCBZ. En general "
 "deixa aquesta opció desactivada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Palanca C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "Palanca-C"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr "Registre CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Motor d'emulació de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Llistes de memòria cau de pantalla"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "Opcions de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcula l'il·luminació dels gràfics 3D per píxel en contes de per vèrtex.\n"
-"Disminueix la velocitat d'emulació (depenent de la GPU).\n"
-"Això normalment és una millora sense risc, però algunes vegades pot causar "
-"problemes.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "No es pot trobar un WiiMote pel gestor de connexió %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "No es pot trobar un Wiimote pel gestor de connexió %02x"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "No es pot llegir del DVD_Plugin - DVD-Interface: Error Fatal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "No es pot obrir% s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"No es pot usar aquest arxiu com una targeta de memòria. \n"
+"No es pot ulititzar aquest arxiu com una targeta de memòria.\n"
 "%s\n"
-"No és un arxiu de targeta de memòria gamecube vàlid."
+"no és un arxiu de targeta de memòria GameCube vàlid"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"No es pot usar aquest arxiu com una targeta de memòria. \n"
-"Està tractant d'usar el mateix arxiu en les dues ranures?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Bloc Maj."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Català"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centre"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Canviar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "Canviar &Disc"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Canviar &Disc..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Canviar Disc"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Canvi de joc"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr "Canviar el disc a %s"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1036,75 +1066,63 @@ msgstr ""
 "Canviar l'idioma de la interfície d'usuari. \n"
 "Requereix reiniciar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Canvia el signe del paràmetre zLluny (després de correcció)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Canvia el signe del paràmetre zAprop (després de correcció)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Codi de trucs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "Administrador de trucs"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Cerca trucs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Administrador de trucs"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Comprovar la integritat de la partició"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Buscar actualitzacions:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Comprovant integritat..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Xinès (simplificat)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Xinès (tradicional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Tria un directori arrel del DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Tria el directori arrel del NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Triar una ISO per defecte:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Trieu un directori per afegir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Trieu un arxiu per obrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Triar una targeta de memòria:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1112,27 +1130,27 @@ msgstr ""
 "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a "
 "partir de només els directoris)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Selecciona la carpeta on extreure"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Palanca Cercle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clàssic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Esborrar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1140,183 +1158,230 @@ msgstr ""
 "Client desconnectat mentre el joc s'estava executant! NetPlay s'ha "
 "desactivat. Haurà d'aturar manualment el joc."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Tancar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "&Configurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Codi d'Informació"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Codi:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Comanda"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Comentari"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Comentari:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs seleccionades..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Comprimeix ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configuració"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configuració"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configurar Control"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configurar Control"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configuració..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Confirmar contraescriptura del fitxer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Confirmar a l'aturar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Connectar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
-msgstr ""
+msgstr "Connectar la Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Connectar el teclat USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Connectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Connectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Connectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Connectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Connectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Connectar Wiimotes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "Connectat"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Consola"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Escaneig continu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "Configuració del mando"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Mandos"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Convertir a GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "Copiar"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Copia fallada"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Copiar a la targeta de memòria %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Nucli"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "No s'ha pogut crear %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "No s'ha pogut inicialitzar el suport %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"No s'ha pogut llegir \"%s\". No hi ha disc a la unitat, o no hi ha copia GC/"
-"Wii. Els discs originals de Gamecube i Wii no es poden llegir per la majoria "
-"de lectors DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "No es pot reconèixer el fitxer ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "No s'ha pogut desar %s"
+msgid "Could not save %s."
+msgstr "No s'ha pogut desar %s."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1328,12 +1393,28 @@ msgid ""
 "If so, then you may need to re-specify your memory card location in the "
 "options."
 msgstr ""
+"No s'ha pogut escriure al fitxer de la targeta de memòria %s.\n"
+"\n"
+"Estàs executant Dolphin des d'un CD/DVD, o potser l'arxiu de guardat està "
+"protegit contra escriptura?\n"
+"\n"
+"Estàs rebent aquest missatge després de moure el directori de l'emulador?\n"
+"Si és així, llavors és possible que tinguis de tornar a especificar la "
+"ubicació a la targeta de memòria en les opcions."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1341,38 +1422,46 @@ msgstr ""
 "No s'ha pogut inicialitzar el nucli. \n"
 "Verifiqueu la configuració."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Compta:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "Comptar: %lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "País:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Crear Codi AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Crear una nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Creador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Crític"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Retallar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1382,199 +1471,191 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Atenuar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "El directori axtual ha canviat de %s a %s després de wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Projecció personalitzada"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr "Personalitzar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Configuració de la projecció personalitzada"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Txec"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Direcció digital"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Motor d'emulació DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulació DSP HLE (ràpid)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Intèrpret DSP LLE  (lent)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Recompilador DSP LLE "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Configuració DSP "
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Arrel del DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Error fatal: error al llegir el volumen"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Error fatal: error al llegir el volumen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
-msgstr ""
+msgstr "Plataforma de ball"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Mida de dades"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Data:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Arxius Datel MaxDrive/Pro (*. sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zona morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Depuració"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Depuració"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimals"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISO seleccionades..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Descomprimint ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-msgid "Decrease Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
+msgid "Decrease Frame limit"
+msgstr "Reduir límit de Frames"
+
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Per defecte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ISO per defecte:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Font per defecte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Eliminar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Eliminar partida desada"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Eliminar el fitxer existent '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Descripció"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "Descripció:"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Detectat intent de llegir més dades des del DVD que caben dins de la memòria."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Dispositiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Configuració del dispositiu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1582,20 +1663,23 @@ msgstr ""
 "Ha fallat la suma de comprovació\n"
 "i també ha fallat la comprovació de la suma de la copia del directory"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Desactivar destinació Alfa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Deshabilitar boira"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1610,259 +1694,213 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Desactivar l'emulació de les còpies EFB.\n"
-"Això sovint s'utilitza per efectes post-procés o efecte de renderitzat a "
-"textura, per tant marcant aquesta opció augmentarà de manera considerable la "
-"velocitat, però també pot causar problemes.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Desactiva l'emulació d'una característica de maquinari anomenada destinació "
-"Alfa, que s'utilitza en molts jocs per a diversos efectes gràfics. Si no "
-"n'estàs segur, deixa-ho sense marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disc"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Error de lectura de disc"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Pantalla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Mostra les entrades llegides per l'emulador.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Divideix"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Voleu aturar l'emulació actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decodificador Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuració de gràfics de Dolphin %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Lloc &Web Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configuració de Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuració de Wiimote emulat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "FIFO Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Configuració del control GC Dolphin"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin Pel·lícules TAS (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Configuració Wiimote Dolphin"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin a &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin no ha pogut trobar cap ISO GC/Wii. Fes doble clic aquí per buscar-"
-"les..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin està actualment configurat per ocultar tots els jocs. Fea doble clic "
-"aquí per mostrar-los tots..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin no ha pogut completar l'acció sol·licitada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Duplica la velocitat de rellotge de la GPU emulada. Pot accelerar alguns "
-"jocs (ON = Ràpid, OFF = Compatible)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Avall"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Descarregar Codis (base de dades WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Descarregat %lu codis. (Afegits %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambors"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Maniquí"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Bolcat d'àudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Bolcat de destinació EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Bolcat d'imatges"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Bolcat de textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Bolcar totes les imatges renderitzades a un fitxer AVI  a Usuari/Bolcar/"
-"Imatges/\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Bolca les textures descodificades a Usuari/Bolcat/Textures/<game_id>/\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Bolcar el contingut de les còpies EFB a Usuari/Bolcat/Textures/\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holandès"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Sortir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Còpies EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1875,56 +1913,40 @@ msgstr ""
 "Dolphin, probablement serà necessari reiniciar el Windows per veure el nou "
 "controlador."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Actualitzacions recents de memòria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Edita"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Modificar codi ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Modificar configuració"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Modificar el pedaç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Modificar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Modificació..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efecte"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Activar la memòria cau d'imatge («Frame Buffer»)"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "El fil de l'emulador ja s'està executant"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1938,7 +1960,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, activa l'emulació virtual de XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1954,123 +1976,92 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wiimote emulat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Estat d'emulació:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Habilitar"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Activar els efectes 3D estereoscopis utilitzant Nvidia 3D Vision si la GPU "
-"ho suporta.\n"
-"Possiblement causa problemes.\n"
-"\n"
-"Requereix pantalla complerta per funcionar.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Habilitar el registre de logs d'AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Habilitar fusió de Bloc"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Permetre el càlcul del quadre delimitador"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Habilitar memòria cau"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Activar Trucs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Habilitar Doble nucli"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Habilitar Doble nucli (acceleració)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Habilitar salt d'inactiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Habilitar salt d'inactiu (acceleració)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Habilitar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Habilitar exploració &Progressiva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Habilitar el protector de pantalla"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Activar altaveu de dades"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Habilitar pantalla panoràmica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Habilitar filferro (wireframe)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Permet el filtrat anisotròpic.\n"
-"Millora la qualitat visual de les textures que es troben en un angle de "
-"visió obliqua.\n"
-"Pot causar problemes en un petit nombre de jocs.\n"
-"\n"
-"Si no n'estàs segur, selecciona 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = "
-"ràpid, Desactivat = Compatible)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Habilitar pàgines"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2082,7 +2073,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2094,32 +2085,25 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Activa aquesta opció per accelerar The Legend of Zelda: Twilight Princess. "
-"Deshabilitar per a qualsevol altre joc."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Activa la modificació personalitzada de projecció"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Activa la emulació de Dolby Pro Logic II fent servir 5.1 surround. No "
-"disponible a OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
-msgstr "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2131,7 +2115,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2139,7 +2123,11 @@ msgstr ""
 "Activa la memòria de la Unitat de Gestió, necessari per a alguns jocs. "
 "(Activat = compatible, Desactivat = ràpid)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2149,52 +2137,63 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Anglès"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Millores"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Escriviu un nom per la nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte "
 "del sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2203,7 +2202,7 @@ msgstr ""
 "Error: Després de \"%s\", s'ha trobat %d (0x%X) en lloc de la marca de "
 "guardat %d (0x%X). Cancel·lant carrega del guardat..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2212,215 +2211,191 @@ msgstr ""
 "Error: Provant d'accedir a fonts %s però no es carreguen. Els jocs pot ser "
 "que no mostrin les fonts correctament, o un tancar-se."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Eufòria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
-"Controlador d'excepcions - accés per sota d'espai de memòria. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
-msgstr ""
+msgstr "Sortir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
-msgstr ""
+msgstr "Exportar tots els guardats de Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Fallada d'exportació"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportar fitxer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportar gravació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportar gravació..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportar partida desada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar partida desada Wii (Experimental)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportar totes les partides desades"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr ""
+msgstr "Exportació fallada"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Desar exportació com a..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extensió"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Memòria cau d'imatge externa"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Paràmetre addicional"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Paràmetre addicional útil només a ''Metroid: Other M''."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extreure tots els arxius..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extreure Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extreure DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extreure directori..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extreure arxiu..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extreure partició..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraient %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extreure tots els arxius"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Extraient Directori"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extraient..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Byte FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Jugador FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANÇA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Mida FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Error al connectar!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Error al descarregar codis."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Error a l' extreure a %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Error al carregar la rom DSP:\t%s\n"
-"\n"
-"Aquest fitxer és necessari per utilitzar DSP LLE.\n"
-"No s'inclou amb el Dolphin ja que té informació amb drets d'autor.\n"
-"Utilitza DSPSpy per bolcar el fitxer des de la consola.\n"
-"\n"
-"Podríeu utilitzar el motor DSP HLE que no requereix bolcat ROM.\n"
-"(Esculliu-ho des de la pastanya \"Audio\" de la finestra de configuració)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Error al llegir %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "No s'ha pogut llegir Imatge.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Error al llegir la capçalera bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Error al llegir el bloc %d de la informació guardada\n"
-"La targeta de memòria pot estar trencada\n"
-"Posició de l'arxiu:%llx"
+"No s'ha pogut llegir el bloc %d de les dades guardades\n"
+"La targeta de memòria pot estar truncada\n"
+"Posició del fitxer:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2428,7 +2403,7 @@ msgstr ""
 "No s'ha pogut llegir la còpia de taula d'assignació de blocs correctament\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2436,17 +2411,12 @@ msgstr ""
 "No s'ha pogut llegir la taula d'assignació de blocs correctament\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "No s'han pogut llegir les dades des del fitxer %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Error al llegir les dades del fitxer: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2454,7 +2424,7 @@ msgstr ""
 "No s'ha pogut llegir la carpeta de còpia correctament\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2462,11 +2432,7 @@ msgstr ""
 "No es pot llegir el directori correctament \n"
 "(0x2000-0x3fff)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Error al llegir la capçalera"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2474,50 +2440,35 @@ msgstr ""
 "No s'ha pogut llegir la capçalera correctament\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "No s'ha pogut llegir Identificador únic de la imatge de disc"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "No s'ha pogut escriure BT.DINF a SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "No s'ha pogut escriure bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "No s'ha pogut escriure la capçalera per %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Persa"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Ràpid"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
-msgstr ""
+msgstr "Profunditat de càlcul ràpid"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2525,23 +2476,27 @@ msgstr ""
 "Desincronització fatal. Cancel·lant reproducció. (Error a PlayWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Jugador fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "informació del fitxer"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "L'arxiu no conté codis."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Arxiu convertit a. GCI"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2549,7 +2504,7 @@ msgstr ""
 "L'arxiu no s'ha pogut obrir \n"
 "o no té una extensió vàlida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2558,95 +2513,93 @@ msgstr ""
 "L'arxiu té la extensió  \"%s\n"
 "les extensions vàlides són (.raw /.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "L'arxiu no es pot reconèixer com una targeta de memòria"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Arxiu no comprimit"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x "
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Sistema d'arxius"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Tipus de fitxer 'ini' és desconegut! No s'obrirà!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Trobar següent"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Trobar anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Primer Bloc"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Arregla les sumes de comprovació"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Força la consola com NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forçar Filtrat de textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força filtrat de textures bilineal fins i tot si el joc de manera explícita "
-"el desactiva.\n"
-"Millora la qualitat de la textura, però causa defectes en alguns jocs.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força el joc a gràfics per pantalla panoràmica.\n"
-"Tingues en compte que això podria causar problemes gràfics\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Força el mode NTSC-J per utilitzar la font de la ROM Japonesa.\n"
-"Sent desactivat, dolphin posa per defecte NTSC-U i automàticament ho activa "
-"quant es juga amb jocs Japonesos."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2654,557 +2607,581 @@ msgstr ""
 "Format ascii (NTSC \\PAL)? \n"
 "Tria no per sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Endavant"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
+msgstr "Reenviar port (UPnP)"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
+#, c-format
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %d results for '"
-msgstr "Trobats %d resultats per '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avançar imatges"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Bolcat d'imatges utilitzant FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Info del frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Rang d'imatges"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Salta imatge&s"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Limit d'imatges/s:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Imatges a Enregistrar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "França"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Visió lliure"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francès"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Trasts"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "de"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Resolució de pantalla a pantalla completa:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Arxiu de GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "Control GC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID del Joc:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "El joc encara està en marxa!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "El joc no està funcionant!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Joc no trobat!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Configuració de jocs específics"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Configuració de joc"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Fitxers de guardat de GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Configuració control «&Gamecube»"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Configuració control Gamecube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Codis Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"CodiGecko ha fallat al executar (CT%i CST%i) (%s)\n"
-"(Pot ser un codi incorrecte o el tipus de codi encara no està suportat. "
-"Prova fent servir el controlador de codi natiu col·locant el arxiu "
-"codehandler.bin al directori Sys i reiniciant Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "General"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Configuració General"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Alemany"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Alemanya"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "Aconseguir codi AR: l'índex és major que la grandària de la llista de codis "
 "%lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Configuració de gràfics"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Més gran que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Incrementa de forma considerable la qualitat de les textures generades "
-"utilitzant el renderitzat en els efectes de textura.\n"
-"Augmentant la resolució interna millorarà l'efecte d'aquesta configuració.\n"
-"Baixa lleugerament la eficiència i possiblement pot causar problemes (tot i "
-"que rarament).\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grec"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verd"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verd Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verd Dret"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Modificacions"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Comprovació de la checksum de capçalera ha fallat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Alçada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hola,\n"
-"\n"
-"Dolphin requereix Mac OS X 10.7 o superior.\n"
-"Desafortunadament estàs utilitzant una versió antiga d'OS X.\n"
-"La darrera versió de Doplhin compatible amb OS X10.6 és Dolphin 3.5\n"
-"Si us plau actualitza a 10.7 o superior per utilitzar la versió més nova de "
-"Dolphin.\n"
-"\n"
-"Adéu!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hola, \n"
-"\n"
-"Dolphin requereix que la seva CPU suporta extensions SSE2. \n"
-"Lamentablement, la seva CPU no els admet, de manera que Dolphin no "
-"s'executarà. \n"
-"\n"
-"Sayonara! \n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Oculta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Ocultar el cursor del ratolí"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Amagar el cursor del ratolí si està sobre la finestra d'emulació.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Inici"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Amfitrió"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Tecla d'accés de configuració"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Tecles d'accés"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Hongarès"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Híbrid"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Ha Tractat d'obtenir dades d'un bitllet desconegut:%08x/"
 "%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Joc ha intentat de tornar a carregar IOS o un títol que no "
-"està disponible en el seu bolcat de la NAND\n"
-"TitleID %016llx.\n"
-"Probablement Dolphin es penjarà ara."
+"IOCTL_ES_LAUNCH: El joc ha intentat recargar un títol que no està disponible "
+"en el teu volcat NAND\n"
+"TitleID %016<PRIx64>.\n"
+"Dolphin probablement es penjarà."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - destinació dolenta"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Configuració de IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Punter IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Sensibilitat d'IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Detalls d'ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Directoris ISO:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITÀLIA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Icona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Si es selecciona, els registres del quadre delimitador seràn actualitzats. "
-"Es utilitzat pels jocs de Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignora els canvis de format"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignora qualsevol canvi del format d'EFB.\n"
-"Millora el rendiment en molts jocs sense cap efecte negatiu. Però causa "
-"defectes gràfics en un nombre petit de jocs.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignora qualsevol demanda de la CPU de llegir o escriure a el EFB.\n"
-"Millora el rendiment en alguns jocs, però pot desactivar algunes funcions de "
-"joc o causar defectes gràfics.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Desar importació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr ""
+msgstr "Importar guardat de Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr ""
+msgstr "Importació fallada"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"L'arxiu importat té extensió sgc \n"
-"però té una capçalera incorrecte."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "l'Arxiu importat té una longitud no vàlida"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"L'Arxiu importat té extensio sav \n"
-"però la capçalera és incorrecte"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "En Joc"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
-msgid "Increase Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
+msgid "Increase Frame limit"
+msgstr "Augmentar límit de Frames"
+
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informació"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insereix"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Inserta el codi xifrat o desxifrat aquí..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Inserir la targeta SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Introduïu un nom aquí .."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Instal·lar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Instal·lar al Menú de Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
-"encara."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Instal·lant WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Error de comprovació d'integritat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Comprovació d'integritat finalitzat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Comprovació d'integritat finalitzat. No s'han trobat errors."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Comprovació d'integritat per la partició %d ha fallat. El teu bolcat "
-"probablement s'ha corromput o s'ha apedaçat incorrectament."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interfície"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Configuració d'interfície"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Error intern LZO  - la compressió ha fallat"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3213,103 +3190,106 @@ msgstr ""
 "Error intern LZO - descompressió fallada (% d) (%li, %li) \n"
 "Intenteu carregar l'estat de nou"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Error intern LZO - lzo_init () ha fallat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Resolució Interna:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Intèrpret (MOLT lent)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Introducció"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Mida no vàlida (%x) o paraula màgica (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Valor invàlid!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Invàlid bat.map o entrada al directori"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipus d'esdeveniment invàlid %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Arxiu invàlid"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Invalid opening.bnr al GCM: \n"
-"% s\n"
-"És possible que necessiti re-descarregar aquest joc."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Enregistrament de fitxer invàlid"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Paràmetres de búsqueda invàlids (cap objecte seleccionat)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Cerca de cadena invàlida (no s'ha pogut convertir a número)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Cerca de cadena invàlida (només es soporten algunes longituds)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Estat invàlid"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italià"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPÓ"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "Recompilador JIT (recomanat)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Recompilador experimental JITIL"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonès"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "COREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3319,64 +3299,75 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Mantenir la finestra sempre visible"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Clau"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Corea"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Botó L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analògic"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
-msgstr ""
+msgstr "Últim %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latència:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Palanca esquerra"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Clic esquerre per detectar tecles d'accés. \n"
-"Entrar a l'espai per esborrar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3386,7 +3377,7 @@ msgstr ""
 "Clic mig per desactivar. \n"
 "Clic det per més opcions."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3394,202 +3385,211 @@ msgstr ""
 "Clic Esquerra/Dreta per més opcions. \n"
 "Clic Mig per deshabilitar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Menys de"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limitar per FPS "
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Carrega textures personalitzades"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
-msgstr ""
+msgstr "Cargar estat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
-msgstr ""
+msgstr "Cargar últim estat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
-msgstr ""
+msgstr "Cargar últim estat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
-msgstr ""
+msgstr "Cargar últim estat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
-msgstr ""
+msgstr "Cargar últim estat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
-msgstr ""
+msgstr "Cargar últim estat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
-msgstr ""
+msgstr "Cargar últim estat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
-msgstr ""
+msgstr "Cargar últim estat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
-msgstr ""
+msgstr "Cargar últim estat 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Carregar ranura d'estat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr ""
+msgstr "Cargar estat 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Carregar ranura d'estat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Carregar ranura d'estat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Carregar ranura d'estat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Carregar ranura d'estat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Carregar ranura d'estat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Carregar ranura d'estat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Carregar ranura d'estat 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr ""
+msgstr "Cargar estat 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Carregar Estat..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Carregar el menú del sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carregar menú del sistema Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Carregar textures personalitzades de Usuari/Càrrega/Textures/<game id>/\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Carrega els valors  preestablerts dels patrons disponibles."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Registre Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configuració del registre Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Escriure FPS en un fitxer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Tipus de registre Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Registra el nombre d'imatges rendaritzades per segon a User/Logs/fps.txt. "
-"Utilitza aquesta característica per mesurar el rendiment de Dolphin.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Sortides del registrador Log"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Inici de sessió"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Perdut la connexió amb el servidor!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Botó M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"desajust MD5 \n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Modificació de velocitat MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Arxius MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Palanca principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID Fabricant:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Fabricant:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3597,30 +3597,40 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Fa els objectes distants més visibles eliminant la boira, incrementat el el "
+"detall general.\n"
+"Desactivar la boria trencarà alguns jocs que depenen en una emulació "
+"adequada de la boira.\n"
+"\n"
+"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Màxim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "La targeta de memòria ja té una entrada amb aquest títol."
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Targeta de memòria ja oberta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Byte de memòria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Targeta de memòria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3628,7 +3638,7 @@ msgstr ""
 "Targeta de memòria Administrador ADVERTÈNCIA-Fes còpies de seguretat abans "
 "d'utilitzar, hauria d'estar arreglat, però pots perdre dades!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3645,38 +3655,53 @@ msgstr ""
 "%s \n"
 "Voleu copiar el fitxer antic a aquesta nova ubicació? \n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "La mida de la targeta de memòria no correspon a la mida de la capçalera"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menú"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Micròfon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Mínim"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Varis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Varies Configuracions"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3688,20 +3713,24 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Fonts d'espiat simple"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus®"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3720,335 +3749,307 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Múltiple"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "NOTA: El tamany de fluxe no coincideix amb la longitud actual de dades\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Afegir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Començar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Esborrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Avall"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP Fi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Entrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Inici"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Inserir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Esquerra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Baixar pagina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "Dret NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Espai"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Restar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tabulador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Amunt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nom:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nom:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Arxius natius GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nou escaneig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Pàgina següent"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Següent escaneig"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Sobrenom:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "No país (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "No s'han trobat ISOs o WADs"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "No hi ha sortida d'àudio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "No s'ha trobat la imatge pel joc %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "No hi ha descripció disponible"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "No acoblament"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "No hi ha entrades lliures a l'índex de directoris"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Arxiu no enregistrat"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "No s'ha trobat la carpeta de partides desades per el joc %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Cap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Noruega Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "No igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Sense establir"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"No és una partida guardada Wii o hi ha hagut un error de lectura de la mida "
-"de la capçalera del fitxer %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "No està connectat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notes"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notes:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Avís"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Bloq Numèric"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Nombre de codis:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Acceleració del Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objecte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Rang d'objecte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Apagar"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Desplaçament:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Missatges en pantalla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr ""
+msgstr "&Documentació en línia"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Només queden %d blocs disponibles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Obrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Obrir directori &contingut"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Obrir la carpeta de partide&s desades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Obrir fitxer..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: no es pot crear el context pel dispositiu %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: no es poden trobar dispositius de so"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: no es pot obrir el dispositiu %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Descodificador de textura OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Activar descodificador de textura OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
+"Obre la configuració per defecre (mode només lectura) per aquest joc en un "
+"editor de text extern."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opcions"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Taronja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4058,346 +4059,326 @@ msgstr ""
 "Fes clic dret i exporta tots els guardats,\n"
 "i importa les partides a una nova targeta de memòria\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Altres"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Un altre client s'ha desconnectat mentre el joc s'estava executant! NetPlay "
-"s'ha desactivat. Aturar manualment el joc."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Sortida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "&Reproduir gravació..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Control"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Controls"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Retocedir pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Avançar Pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paràgraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Paràmetres"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partició %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Pedaços"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Camins"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pausar al acabar la pel·lícula"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Il·luminació per píxel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfecte"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Reproduir enregistrament"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Reproduir/Pausa"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Jugable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Opcions de reproducció"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Jugadors"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Confirma..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Creeu una perspectiva abans de desar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Més-Menys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polonès"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portuguès"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portuguès (Brasil)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Efectes de post-procés:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Final prematur de la pel·lícula a PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Final prematur de la pel·lícula a PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Final prematur de la pel·lícula a PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Preestablerts:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Pàgina anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Pàgina anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Propietats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Netejar memòria cau"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Pregunta"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Sortir"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Botó R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analògic"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RÚSSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
-msgstr ""
+msgstr "Radi"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Rang"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Només lectura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
-msgstr ""
+msgstr "Balance Board real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Wiimote real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Wiimotes reals"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Enregistrar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
-msgstr ""
+msgstr "Gravar entrada"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Informació d'enregistrament"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Enregistrant Opcions"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermell"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermell Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermell Dret"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Redueix la quantitat d'aliàsing causada per rasterització de gràfics en "
-"3D. \n"
-"Això fa que la imatge es vegi menys pixelada.\n"
-"Disminueix considerablement el rendiment.\n"
-"\n"
-"Si no n'estàs segur, selecciona Cap."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Actualitzar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Actualitzar llista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Actualitza la llista de jocs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Treure"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4407,242 +4388,321 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Renderitzar a la finestra principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultats"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Tornar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisió:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Dreta"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Palanca dreta"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibració"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Rus"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "&Desa l'estat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Segur"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Desar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Anomena i desa GCI..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
-msgstr ""
+msgstr "Guardar el estat més antic"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
-msgstr ""
+msgstr "Guardar estat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Desar ranura estat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
-msgstr ""
+msgstr "Ranura de guardat 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Desar ranura estat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Desar ranura estat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Desar ranura estat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Desar ranura estat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Desar ranura estat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Desar ranura estat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Desar ranura estat 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
-msgstr ""
+msgstr "Ranura de guardat 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Desar Estat..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Desar com..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Desar GCM/ISO comprimit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Desar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Desar GCM/ISO descomprimit"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 "El guardat de la pel·lícula %s és corrupta, la gravació s'està aturant..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Copia EFB escalada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Escanejant %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Cercant ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Cercant..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Capturar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Bloc desplaçament"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Filtre de cerca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Cercar en subcarpetes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Buscar objecte actual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Buscar valor hexadecimal:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "La secció %s no trobada a SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Selecciona el fitxer de gravació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Selecciona un fitxer WAD de Wii per instal·lar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Seleccionar un adaptador de maquinari per utilitzar.\n"
-"En cas de dubte, utilitza el primer."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Selecciona un arxiu per guardar la importació"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Selecciona finestres flotants"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Selecciona el fitxer a carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Selecciona el fitxer de partida guardada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Selecciona l'estat a carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Selecciona l'estat a guardar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4660,262 +4720,293 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, selecciona Automàtic."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "El perfil del controlador seleccionat no existeix"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Font seleccionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Escull la resolució de pantalla utilitzada en el mode de pantalla completa.\n"
-"Això ha de ser sempre més gran o igual a la resolució interna. L'impacte en "
-"el rendiment és negligible.\n"
-"\n"
-"Si no n'estàs segur, utilitza la resolució de l'escriptori.\n"
-"Si encara no n'estàs segurs, utilitza la resolució més alta que et funcioni."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Enviar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Barra de sensors de posició"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbi"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Port Sèrie 1 - Aquest és el port que utilitzen els dispositius com "
-"l'adaptador de xarxa"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Definir la imatge ISO per &defecte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Definir com a targeta de memòria predeterminada %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis "
 "AR %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Ajusta la latència (en ms). Valors més alts poden reduir el soroll. Només "
-"pel motor Open AL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Configuració..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Sacsejar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Nom curt:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Botons LR"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Mostrar &Consola"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Mostrar &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Mostrar Barra d'e&stat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Mostrar Barra d'&eines"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
-msgid "Show Defaults"
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
+msgid "Show Defaults"
+msgstr "Mostrar valors per defecte"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Mostrar unitats"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar regions de copia EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Mostra FPS (imatges/s)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Mostrar entrada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Mostrar Itàlia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Mostrar Japó"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Mostrar Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Mostrar Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Mostrar la &Configuració del registre de log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Mostrar Plataformes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Mostrar Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Mostrar estadístiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar un missatge de confirmació abans d'aturar el joc."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Mostra missatges quan s'hagi produït un error potencialment greu.\n"
-"Deshabilitar això pot evitar els missatges molestos i no crítics, però també "
-"pot significar que Dolphin es pengi de sobte sense cap explicació."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Mostra primer bloc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Mostrar contador de lag"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Mostrar missatges a l'àrea d'emulació. Aquestos missatges inclouen escritura "
-"de targetes de memòria, sobre el motor de vídeo, informació sobre la CPU i "
-"neteja de la cau JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Mostra blocs de partida desada"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mostra desar un comentari"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Mostra icona de desar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Mostra títol desat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4927,84 +5018,82 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Mostrar desconeguda"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Mostrar vàries estadístiques.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Wiimote horitzontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Xinès simplificat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Mida"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Saltar BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Saltar la neteja DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Salta l'accés d'EFB des de la CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Augmenta lleugerament la velocitat del EFB a la RAM, reduint així la "
-"precisió d'emulació.\n"
-"Alguns vegades fins i tot, pot millorar la qualitat visual.\n"
-"Si detecteu problemes, proveu d'augmentar la precisió de la memòria cau de "
-"textura o desactivar aquesta opció.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Ranura %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Ranura A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Ranura B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Captura"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderitzat per programari"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5016,234 +5105,284 @@ msgstr ""
 "Realment vols activar el renderitzat per software? Si no n'estàs segur, "
 "selecciona 'No'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Configuració de so"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Suport de so %s invàlid."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Ha fallat la creació del buffer de so: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Espai"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volum de l'altaveu:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Especifica la resolució utilitzada per el renderitzat. Una resolució alta "
-"millorarà la qualitat visual de forma considerable, però també afectarà el "
-"rendiment i pot causar problemes gràfics en alguns jocs.\n"
-"\"Múltiple de 640x528\" és una mica més lent que \"Mida de finestra\" però "
-"provoca menys problemes. Generalment parlant, quant més baixa és la "
-"resolució interna, millor serà el rendiment que hi haurà.\n"
-"\n"
-"Si no n'estàs segur, selecciona 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Accelerar la tassa de transferència de Disc"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Palanca quadrada"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Control estàndard"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Començar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Iniciar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Iniciar grava&ció"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Iniciar gravació"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Estat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Estats desats"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Palanca"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Aturar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Guarda les còpies del EFB en objectes de textura de la GPU.\n"
-"Això no és precís, però funciona suficientment bé per la majoria de jocs i "
-"millora de forma important la velocitat en comparació de l'EFB a la RAM.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Ajustar a la finestra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Cop"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Extreure"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Arxiu exportat amb èxit a %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Arxius de partides desades importats correctament"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Oscil·lació"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Sincronitzar subprocés de GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
+"Sincronitza els processos de la GPU i CPU per ajudar a prevenir congelacions "
+"aleatòries en em mode doble nucli. (ON = Compatible, OFF= Ràpid)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Idioma del sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Pestanya"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Divisió de pestanya"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Taula esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Taula dreta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Capturar pantalla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Prova"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Memòria cau de textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Superposició del format de textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "El WAD s'ha instal·lat amb èxit"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "L'adreça és invàlida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "La suma de comprovació s'ha fixat amb èxit"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "El directori triat ja és a la llista"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5252,7 +5391,7 @@ msgstr ""
 "El fitxer %s ja existeix. \n"
 "Voleu reemplaçar-lo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5261,46 +5400,33 @@ msgstr ""
 "El fitxer %s no s'ha pogut obrir per escriptura. Comproveu si ja està obert "
 "per un altre programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "El fitxer %s ja estava oberta, la capçalera de l'arxiu no s'escriurà."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "L'arxiu especificat (%s) no existeix"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "El nom no pot estar buit"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "El nom no pot contenir el caràcter ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "El resultat del desxifratge el codi AR no conté cap línia."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Quant més segur ajustis això, hi haurà menys probabilitats que l'emulador no "
-"se salti actualitzacions de textura de la RAM.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho al màxim valor de la dreta."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"El fitxer de partida guardada que està intentant copiar té la mida invàlida"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5308,36 +5434,48 @@ msgstr ""
 "L'idioma seleccionat no és compatible amb el seu sistema. Es tornarà a "
 "l'idioma per defecte del sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "El servidor i les versions de client NetPlay són incompatibles!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "El servidor està ple!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "El servidor ha espòs: el joc està en marxa!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "El servidor ha enviat un missatge d'error desconegut!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "L'arxiu especificat \"%s\" no existeix"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "El valor és invàlid."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema visual:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5345,7 +5483,7 @@ msgstr ""
 "Hi ha d'haver una entrada per 00000001/00000002. El seu bolcat de la NAND "
 "probablement és incompleta."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5353,7 +5491,7 @@ msgstr ""
 "Aquesta configuració sobreescriu la configuració de Dolphin.\n"
 "Indeterminat vol dir que el joc utilitza el valor de Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5361,124 +5499,163 @@ msgstr ""
 "Aquest simulador d'ActionReplay no és compatible amb els codis que "
 "modifiquen ActionReplay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Pot causar alentiment al Menú Wii i alguns jocs."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Aquesta opció permet canviar la càmera en el joc.\n"
-"Manté el botó del ratolí dret premut i mou-lo per girar la càmera mentre "
-"apretes es botó del mitg per moure. \n"
-"Manté SHIFT i prem una de les tecles WASD per moure la càmera una certa "
-"distància (SHIFT+0 per moure-la més ràpid i SHIFT+9 per moure-la més a poc a "
-"poc). Prem SHIFT+R per reiniciar la càmera.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Si no n'estàs segur, deixa-ho desactivat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Això limita la velocitat de joc a un nombre específic de fotogrames per "
-"segon (velocitat completa és 60 per NTSC i 50 per PAL). També pots utilitzar "
-"la regulació d'àudio amb el DSP (pot arreglar els clics d'àudio, però pot "
-"causar soroll constant depenent del joc)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Això divideix els fils d'execució de vídeo i de la CPU, de manera que es pot "
-"executar en nuclis separats. \n"
-"Causa millores importants de velocitat en ordinadors amb més d'un nucli, "
-"però també poden causar interferències/fallades."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Li permetrà editar manualment el fitxer de configuració INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Llindar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Inclinació"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Títol"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Activar tots els tipus de registre de Log"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
-msgstr ""
+msgstr "Activar relació d'aspecte"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
-msgstr ""
+msgstr "Activar copies de EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
+msgstr "Activar boira"
+
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Activar pantalla completa"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
+msgstr "Activar IR"
+
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Dalt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Xinès tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "S'ha intentat de carregar un tipus de fitxer desconegut."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Gatells"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Provant de llegir des d'un SYSCONF invàlid"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5486,41 +5663,24 @@ msgstr ""
 "Intentant de llegir des d'un SYSCONF invàlid \n"
 "identificadors de Wiimote bt no estan disponibles"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turc"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Taula DJ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tipus"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Port UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "Wiimote UDP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "DESCONEGUT"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONEGUT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5528,194 +5688,179 @@ msgstr ""
 "Incapaç de crear un pedaç amb els valors donats.\n"
 "No s'ha modificat l'entrada."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Incapaç d'analitzar la línia %lu del codi AR entrat com un codi encriptat o "
-"desenciptat vàlid. Assegura't d'haver-lo escrit correctament.\n"
-"Vols ignorar aquesta línia i continuar analitzant?"
+"No és possible analitzar la línia %u del codi AR introduït com un codi "
+"xifrat o desxifrat. Assegura't que ho has escrit correctament.\n"
+"T'agradaria passar per alt aquesta línia i continuar l'anàlisi?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "%i Indefinit"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Desfer la càrrega de l'estat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
-msgstr ""
+msgstr "Desfer estat guardat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Trucada inesperada a 0x80? Cancel·lant..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comanda de DVD desconeguda %08x - error crític"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Comanda desconeguda 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipus desconegut d'entrada %i a SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Missatge desconegut rebut amb id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Amunt"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Actualitzar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Utilitzar mode EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Utilitzar pantalla completa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Utilitzar hexadecimal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Utilitzar advertències"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Utilitzar múltiples fils d'execució per descodificar les textures.\n"
-"Pot resultar en una acceleració de l'emulació (especialment en CPUs de més "
-"de dos nuclis).\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Normalment si la compilació dels shaders falla, es mostra un missatge "
-"d'error.\n"
-"Però, es poden saltar els missatges per poder tenir un joc sense "
-"interrupcions marcant aquesta opció.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilitat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "Sincronització Vertical"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hack de velocitat VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbositat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Vídeo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volum"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "instal·lació del WAD ha fallat: Error en crear %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instal·lació del WAD ha fallat: Error en crear tiquet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5727,25 +5872,27 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Advertència"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Advertència - Inicialitzant DOL en mode de consola incorrecte!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5757,7 +5904,7 @@ msgstr ""
 "%s \n"
 "Vols continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5771,7 +5918,7 @@ msgstr ""
 "i que tenen el mateix nom que un arxiu a la targeta de memòria\n"
 "Voleu continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5783,7 +5930,15 @@ msgstr ""
 "altre guardat abans de continuar, o carregar aquest amb el mode de només "
 "lectura desactivat."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5795,7 +5950,7 @@ msgstr ""
 "aquest amb el mode de només lectura desactivat. Si no probablement tindràs "
 "una desincronització."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5828,180 +5983,175 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - Fitxer no obert."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Modificació de pantalla panoràmica"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Ample"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Arrel de la NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: No s'ha pogut llegir des de l'arxiu"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wiimote %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote connectat"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Motor de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Configuració de Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Finestra esquerra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Finestra menú"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Finestra dreta"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Envoltant de paraula"
+msgstr "Ajust de línea"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Treballant..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Escriu memcards (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Escriu a consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Escriu al depurador"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Escriu en un Fitxer"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Escriu a una Finestra"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice ha fallat:%#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 init ha fallat:%#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "La creació de la veu principal XAudio2 ha fallat:%#X"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr "Registre XF"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Groc"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "No pots tancar panells que tenen pàgines."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Heu de triar un joc!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Heu d'introduir un nom!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "Has de triar un joc!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Has d'introduir un nom."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Heu d'introduir un nom de perfil vàlid."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
+"La teva ROM DSP té el has incorrecte.\n"
+"Vols parar ara per solucionar el problema?\n"
+"Si selecciones \"No, l'audio podria quedar distorsionat."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6009,36 +6159,36 @@ msgstr ""
 "El seu arxiu GCM/ISO sembla invàlid (país invàlid). \n"
 "Continuar amb la regió PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"El seu arxiu SYSCONF té grandària incorrecte. \n"
-"Hauria de ser 0x%04x (però és 0x%04llx) \n"
-"Vol generar un de nou?"
+"El teu arxiu SYSCONF té la mida incorrecta.\n"
+"Hauria de ser 0x%04x (però és 0x%04<PRIx64>)\n"
+"En vols generar un de nou?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Modificador ZTP"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Codi Zero 3 no està suportat"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Codi Zero desconegut per Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ Esperant ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6050,78 +6200,30 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Personalitzat]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Intenta augmentar la velocitat de l'emulació descarregant la descodificació "
-"de texutra a la GPU utilitzant OpenCL.\n"
-"Malgrat això, ara mateix se sap que provoca defectes de textura en alguns "
-"jocs. També és més lent que la descodificació de textura normal utilitzant "
-"el CPU en molts casos.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Incrementa la velocitat d'emulació guardant les llistes de pantalla a la "
-"memòria cau.\n"
-"Pot provocar problemes.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desmarcat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "auto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "cap"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute Ha retornat -1 en  l'execució de l'aplicació!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correcció zLluny:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correcció ZAprop"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| O"
diff --git a/Languages/po/cs.po b/Languages/po/cs.po
index b157ca5db4..19a3376cd9 100644
--- a/Languages/po/cs.po
+++ b/Languages/po/cs.po
@@ -1,16 +1,17 @@
-# Translation of dolphin-emu.pot to Czech
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Zbyněk Schwarz <zbynek.schwarz@gmail.com>, 2011-2013
+# Zbyněk Schwarz <zbynek.schwarz@gmail.com>, 2011-2014
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-17 21:42+0000\n"
-"Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/cs/)\n"
 "Language: cs\n"
@@ -19,21 +20,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(příliš mnoho pro zobrazení)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Hra : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,43 +55,93 @@ msgstr ""
 "\"%s\" neexistuje.\n"
 " Vytvořit novou 16MB Paměťovou kartu?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopírovat%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d vzorků"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d vzorků (úroveň kvality %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s už existuje, přepsat?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s nelze vyčistit. Obraz je pravděpodobně poškozen."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -87,7 +150,7 @@ msgstr ""
 "%s nelze načíst jako paměťovou kartu\n"
 "Soubor karty je neplatný (0x%x bajtů)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -96,7 +159,7 @@ msgstr ""
 "%s nelze načíst jako paměťovou kartu\n"
 "Velikost karty je neplatná (0x%x bajtů)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -106,375 +169,339 @@ msgstr ""
 "soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x "
 "bajtů)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s nelze otevřít"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s selhalo: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s má velikost 0 bajtů"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s je už komprimován! Nelze dále komprimovat."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s je jako jméno příliš dlouhé, max znaků je 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sVymazat%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportovat GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportovat GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Volných Bloků; %u Volných Záznamů Adr"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& A"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "O progr&amu..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Zavést z DVD Mechaniky..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Body přerušení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Procházet pro ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Správce &Cheatů"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&DSP Nastavení"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Smazat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Smazat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulace"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Soubor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Postup snímkem"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Celá obrazovka"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Grafická nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Nápověda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Nastavení &klávesových zkratek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Nahrát Stav"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "Správce Pa&měťových karet (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "Pa&měť"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Otevřít..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "V&olby"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Přehrát"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Vlastnosti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Režim pouze pro čtení"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Obnovit Seznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registry"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Resetovat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Zvuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "Za&stavit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "Nás&troje"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Zobrazit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote Nastavení"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(NEZNÁMÝ)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(vypnuto)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ PŘIDAT"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Původní (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Původní (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Původní (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Původní (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Původní (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Původní (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Zde vložte jméno>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Žádné rozlišení nenalezeno>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nic>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Zmáčkněte klávesu>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Systém>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Okno NetPlay je už otevřené!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Hra v současnosti neběží!"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Podporované zařízení bluetooth nebylo nalezeno!\n"
-"Vaše wiimoty musíte připojit ručně."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"POZOR:\n"
-"\n"
-"Netplay bude správně fungovat pouze při použití následujících nastavení:\n"
-" - Dvojité Jádro [VYPNUTO]\n"
-" - Jádro emulátoru DSP musí být stejné na všech počítačích!\n"
-" - DSP na samostatném vlákně [VYPNUTO]\n"
-" - Limit snímků NENÍ nastaven na [Zvuk]\n"
-"\n"
-"Všichni hráči by měli používat stejné nastavení i verzi Dolphin.\n"
-"Všechny paměťové karty musí být mezi hráči stejné nebo zakázané.\n"
-"Podpora Wiimote nebyla ještě zavedena.\n"
-"\n"
-"Hostitel musí mít zvolený port TCP přesměrován/otevřen!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM Základní Deska"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Kódy AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "O Dolphinu"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Zrychlení"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Přesnost:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Přesně emulovat EFB kopie.\n"
-"Některé hry na tomto závisí pro určité grafické efekty nebo herní funkce.\n"
-"\n"
-"Pokud si nejste jisti, zaškrtněte radějí EFB do Textury."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Činnost"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -489,7 +516,7 @@ msgstr ""
 "Viníkem je Kód:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -497,7 +524,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -506,7 +533,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a "
 "Sesunout (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -515,7 +542,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A "
 "Naplnění (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -524,12 +551,12 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do "
 "Ukazatele (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii Paměti (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -538,172 +565,140 @@ msgstr ""
 "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)\n"
 "Hlavní kódy nejsou potřeba, nepoužívejte je."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Chyba Action Replay: neplatný řádek kódu AR: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Podmínkový kód: Neplatná Velikost %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Neplatný Normální Kód Typu %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adaptér:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Přidat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Přidat kód ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Přidat Záplatu"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Přidat nový panel"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Přidat..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adresa :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Přidá zadanou hodnotu do Parametru ZFar.\n"
-"Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n"
-"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná "
-"hodnota bude \"0.0002\".\n"
-"Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n"
-"\n"
-"Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Přidá zadanou hodnotu do Parametru zNear.\n"
-"Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n"
-"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná "
-"hodnota bude \"0.0002\".\n"
-"Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n"
-"\n"
-"Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Upravte tlak analogového ovládání potřebný k aktivaci tlačítek."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Pokročilá Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Všechny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Všechny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Všechny soubory Gamecube GCM )gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Všechny Uložené Stavy (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Všechny soubory Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Všechny komprimované soubory GC/WII ISO (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Všechny soubory (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analyzovat"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Úhel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anizotropní Filtrování:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Vyhlazení okrajů"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Zavaděč aplikace má špatnou velikost... je to vážně zavaděč?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Zavaděč aplikace nemohl načíst soubor"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Zavaděč aplikace:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Použít"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -713,16 +708,12 @@ msgstr ""
 "\n"
 " Pokud si nejste jisti, zvolte (vypnuto)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabština"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Jste si jisti, že chcete smazat \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -730,54 +721,81 @@ msgstr ""
 "Jste si jisti, že chcete tyto soubory smazat?\n"
 "Budou navždy ztraceny!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (experimentální)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Poměr Stran:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Alespoň jeden panel musí být otevřen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Zvuk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Podpůrná vrstva zvuku:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Násobek 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (Velikost Okna)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Automaticky upravovat Velikost Okna"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -787,134 +805,150 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "Registr BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Zpět"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Nastavení podpůrné vrstvy"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Podpůrná vrstva:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Zadní Vstup"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Dozadu"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Špatná hlavička souboru"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Rola-Bola"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Plakát"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Detaily Plakátu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Plakát:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Vibráto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Základní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Základní nastavení"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basy"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Kontrolní součet Alokační Tabulky Bloku selhal"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Bloky"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Modrá"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Modrá vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Modrá vpravo"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Dole"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Spojené ovladače: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Rozbité"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Procházet"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Procházet pro přidání adresáře"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Procházet pro adresář ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Procházet pro výstupní adresář"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Vyrovnávací paměť:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -922,119 +956,100 @@ msgstr ""
 "Potlačit čištění mezipaměti dat vyvolaných instrukcí DCBZ. Tato volba je "
 "standardně vypnutá. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Kruhová páčka"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "Kruhová páčka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Jádro Emulátoru Procesoru"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Ukládat předvyt. obj. do vyr. pam."
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Vypočítat osvětlení 3D grafiky podle pixelu, raději než podle bodu.\n"
-"Sníží rychlost emulace o nějaké procento (záleží na Vašem grafikém "
-"procesoru).\n"
-"Toto je většinou bezpečné vylepšení, ale může někdy způsobit problémy.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Nelze otevřít %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Nelze odhlásit události, když jsou očekávány"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Nelze použít tento soubor jako paměťovou kartu.\n"
-"%s\n"
-"není platný soubor paměťové karty gamecube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Nelze použít tento soubor jako paměťovou kartu.\n"
-"Snažíte se použít stejný soubor v obou slotech?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalánština"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Střed"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Změnit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Vyměnit &Disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Vyměnit Disk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Změnit hru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1042,75 +1057,63 @@ msgstr ""
 "Změní jazyk uživatelského rozhraní.\n"
 "Vyžaduje restart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Změní znaménko na Parametr zFar (po korekci)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Změní znaménko na Parametr zNear (po korekci)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Změna tohoto se neprojeví, pokud emulátor běží!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Cheat Kód"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Hledání Cheatů"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Správce Cheatů"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Zkontrolovat celistvost oddílu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Kontrolování celistvosti..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Čínština (Zjednodušená)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Čínština (Tradiční)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Zvolte kořenový adresář DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Zvolte kořenový adresář NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Zvolte výchozí ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Zvolte adresář k přidání"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Zvolte soubor k otevření"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Zvolte paměťovou kartu:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1118,210 +1121,257 @@ msgstr ""
 "Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro "
 "disky sestavené z adresářů)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Zvolte adresář pro umístění extrakce"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Kruhová páčka"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasické"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Zavřít"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "&Nastavit..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Informace o kódu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kód:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Příkaz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Komentář"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Komentář:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Komprimovat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Komprimovat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Komprimuji ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Nastavení"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Nastavit"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Nastavit Ovládání"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Nastavit Pady"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Nastavit..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Potvrdit Přepsání Souboru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Při zastavení Potvrdit"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Připojit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Připojit Rola-Bola"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Připojit USB Klávesnici"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Připojit Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Připojit Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Připojit Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Připojit Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Připojit Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Připojuji..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konzole"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Průběžné skenování"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Ctrl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Převést na GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopírování selhalo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopírovat na Paměťovou kartu %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Jádro"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Nelze vytvořit %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Nelze spustit podpůrnou vrstvu %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"\"%s\" nelze číst. Buď není v mechanice žádný disk, nebo toto není záloha GC/"
-"Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD "
-"mechanik."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Nelze rozpoznat ISO soubor %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Nelze uložit %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1341,11 +1391,19 @@ msgstr ""
 "Objevila se tato chyba po přesunu adresáře s emulátorem?\n"
 "Pokud ano, pak je třeba znovu zadat umístění vaší paměťové karty v nastavení."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Nelze najít příkaz pro otevření přípony 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1353,38 +1411,46 @@ msgstr ""
 "Nelze spustit jádro.\n"
 "Zkontrolujte Vaše nastavení."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Počet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Země:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Vytvořit AR kód"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Vytvořit novou perspektivu"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Tvůrce:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritické"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Oříznout"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1394,200 +1460,191 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Současný adresář se změnil z %s na %s po wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Vlastní Hack Projekce"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Nastavení Vlastního Hacku Projekce"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Přizpůsobte některé Ortografické parametry Projekce"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Čeština"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Jádro Emulátoru DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulace (rychlé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE převaděč (pomalé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE rekompilátor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Nastavení DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE na samostatném vlákně"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Kořen DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Fatální chyba: nelze číst ze svazku"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze přečíst svazek"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Taneční podložka"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Velikost data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Datum:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Soubory Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Mrtvá Zóna"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Ladění"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Ladění"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Desetinné"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Dekomprimovat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Dekomprimovat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Dekomprimuji ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Snížit limit snímků"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Výchozí"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Výchozí ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Výchozí typ písma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Smazat"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Smazat Uloženou Hru"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Vymazat existující soubor '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Popis"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Zjistit"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Zjištěn pokus o přečtení více dat z DVD, než se vejde do výstupní paměti. "
-"Zásek."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Zařízení"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Nastavení Zařízení"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Kruhová stupnice"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1595,20 +1652,23 @@ msgstr ""
 "Kontrolní součet adresáře\n"
 "i záložní kontrolní součet Adresáře selhal"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Zakázat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Zakázat cílovou průhlednost"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Zakázat Mlhu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1622,291 +1682,213 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Zakázat emulaci EFB kopií.\n"
-"Tyto jsou často používány pro efekty následného zpracování nebo vykreslení "
-"do textur, takže když toto zaškrtnete, dostanete velké zrychlení, ale toto "
-"také skoro vždy způsobuje problémy.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zakáže emulaci hardwarové funkce nazvanou Cílová průhlednost, která je "
-"používána v mnoha hrách pro různé grafické efekty.\n"
-"\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Chyba čtení disku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Obraz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Zobrazit vstupy čtené emulátorem.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Rozdělit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Chcete současnou emulaci zastavit?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dekodér Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Všechna práva vyhrazena (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Větev: %s\n"
-"Revize: %s\n"
-"Sestaveno: %s %s\n"
-"\n"
-"Dolphin je emulátor Gamecube/Wii, který původně\n"
-"vytvořili uživatelé F|RES a ector.\n"
-"Dnes je Dolphin svobodný software s mnoha\n"
-"přispěvateli, příliš mnoho na to, aby zde byli všichni uvedeni.\n"
-"Pokud máte zájem, stačí navštívit stránku projektu na\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Zvláštní poděkování patří uživatelům Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 a Hotquik za jejich\n"
-"zpětné inženýrství a dokumentaci/ukázky.\n"
-"\n"
-"Velice děkujeme Gillesu Mouchardovim jehož emulátor\n"
-"Microlib PPCm náš vývoj nastartoval.\n"
-"\n"
-"Děkujeme Franku Willemu za jeho PowerPC disassembler,\n"
-"který jsme my a or9 pozměnili, aby mohl používat i Gecko.\n"
-"\n"
-"Děkujeme uživatelům hcs/destop za jejich dekodér GC ADPCM.\n"
-"\n"
-"Nejsme nijak spjaty s firmou Nintendo.\n"
-"Gamecube a Wii jsou obchodní značky firmy Nintendo.\n"
-"Emulátor je pouze pro studijní účely\n"
-"a neměl by být používán ke spuštění her,\n"
-"které legálně nevlastníte."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafická Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "&Webová stránka Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin Nastavení"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Nastavení Emulovaného Dolphin Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GCPad Nastavení"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Doplhin Filmy TAS (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote Nastavení"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin na &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin nemohl nalézt žádná GX/Wii ISO. Klikněte zde dvakrát k prohledání "
-"souborů..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát "
-"pro zobrazení všech her..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolhpin nemohl dokončit požadovanou činnost."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Zdvojnásobí taktovací frekvenci emulovaného GPU. Může zrychlit některé hry "
-"(Zapnuto = Rychlé, Vypnuto = Kompatibilní)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Dolů"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Stáhnout kódy (Databáze WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Stáhnuto %lu kódů. (přídáno %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Bubny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Atrapa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Vypsat Zvuk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Vypsat Cíl EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Vypsat Snímky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Vypsat Textury"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Vypsat všechny vykreslené snímky do souboru AVI v User/Dump/Frames/\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Vypíše dekódované textury hry do User/Dump/Textures/<id hry>/\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Vypíše obsah EFP kopií do User/Dump/Textures/\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Nizozemština"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "O&dejít"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Kopie"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1918,56 +1900,40 @@ msgstr ""
 "Pokud jste nedávno vaši instalaci Dolphin aktualizovali, je v tomto bodě "
 "pravděpodobně třeba restartovat, aby Windows uviděl nový ovladač."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EVROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Předčasné Aktualizace Paměti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Upravit"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Upravit kód ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Upravit nastavení"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Upravit místní změny nastavení"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Upravit záplatu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Upravit současnou perspektivu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Upravit"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Vnořená Vyr. Pamět Snímků"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Vlákno Emulace již běží"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1981,7 +1947,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1997,121 +1963,92 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulovaný Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Stav Emulace:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Povolit"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, "
-"pokud je podporována Vaším grafickým procesorem.\n"
-"Může způsobovat problémy.\n"
-"Pro fungování vyžaduje režim celé obrazovky.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Povolit protokolování AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Zapnout Slučování Bloků"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Povolit výpočet ohraničujícího rámečku"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Povolit vyrovnávací paměť"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Povolit Cheaty"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Povolit dvojité jádro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Zapnout dvojité jádro (zrychlení)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Povolit Přeskakování Nečinných Příkazů"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Zapnout MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Povolit Progresivní Skenování"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Povolit Spořič Obrazovky"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Povolit data reproduktorů"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Povolit Širokoúhlou obrazovku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Povolit Drátěný Model"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Povolí anizotropní filtrování.\n"
-"Zlepší obrazovou kvalitu textur, které jsou v zorných úhlech šikmé.\n"
-"Může způsobit problémy v malém počtu her.\n"
-"\n"
-"Pokud si nejste jisti, zvolte 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, "
-"VYPNUTO = Kompatibilní)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Zapnout stránky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2124,7 +2061,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2136,34 +2073,25 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte "
-"pro VŠECHNY ostatní hry."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Povolit Vlastní Hack Projekce"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Není "
-"dostupné v OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze pro "
-"podpůrnou vrstvu OpenAL."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2175,7 +2103,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2183,7 +2111,11 @@ msgstr ""
 "Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = "
 "Kompatibilní, VYPNUTO = Rychlé)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2193,51 +2125,62 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Angličtina"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Vylepšení"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Zadejte jméno nové perspektivy:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Záznam %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Záznam 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Rovná se"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Chyba"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2246,7 +2189,7 @@ msgstr ""
 "Chyba: Po \"%s\", nalezeno %d (0x%X) místo značky uložení %d (0x%X). "
 "Ukončuji načtení uloženého stavu..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2255,219 +2198,191 @@ msgstr ""
 "Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí "
 "zobrazit písma správně, nebo se můžou zhroutit"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforie"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Spustit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Ukončit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exportovat všechny uložené hry Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Export Selhal"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportovat Soubor"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportovat Nahrávku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportovat Nahrávku..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportovat Uloženou hru"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportovat uloženou hru Wii (Experimentální)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportovat všechny Uložené hry"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Export selhal"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exportovat Uloženou hru jako..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Rozšíření"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Vnější vyrovnávací paměť Snímků"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Extra Parametr"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Extra Parametr užitečný pouze v ''Metroid: Other M''"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extrahovat Všechny Soubory..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extrahovat Zavaděč Aplikace..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extrahovat DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extrahovat Adresář..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extrahovat Soubor..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extrahovat Oddíl..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrahuji %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extrahuji Všechny Soubory"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Extrahuji Adresář"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extrahuji..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO Bajt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Přehrávač FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANCIE"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Velikost FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Připojení Selhalo!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Stahování kódů selhalo."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Nelze extrahovat do %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Nelze načíst ROM DSP:\t%s\n"
-"\n"
-"Tento soubor je vyžadován při použití DSP LLE.\n"
-"Není distribuován s Dolphinem, protože obsahuje data chráněná autorským "
-"právem.\n"
-"Použijte DSPSpy k výpisu soubor z Vaší skutečné konzole.\n"
-"\n"
-"Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n"
-"(Zvolte ho z karty \"Zvuk\" z dialogového okna nastavení.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Nelze načíst bthprops.cpl! Připojení opravdových Wiimote nebude fungovat a "
-"Dolphin může být nečekaně ukončen!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Nelze načíst hid.dll! Připojení opravdových Wiimote nebude fungovat a "
-"Dolphin může být nečekaně ukončen!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Nelze přečíst %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Nelze číst z banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Nelze přečíst hlavičku bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Nelze přečíst blok uložených dat %d\n"
-"Data v paměťové kartě můžou být zkrácena\n"
-"Pozice souboru: %llx"
+"Paměťová karta může být zkrácena\n"
+"Pozice souboru: %<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2475,7 +2390,7 @@ msgstr ""
 "Nelze správně číst zálohu alokační tabulky bloku\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2483,17 +2398,12 @@ msgstr ""
 "Nelze správně číst alokační tabulku bloku\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Nelze číst data ze souboru %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Čtení dat ze souboru selhalo: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2501,7 +2411,7 @@ msgstr ""
 "Nelze správně číst zálohu adresáře\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2509,11 +2419,7 @@ msgstr ""
 "Nelze správně číst adresář\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Nelze přečíst hlavičku"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2521,50 +2427,35 @@ msgstr ""
 "Nelze správně číst hlavičku\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Nelze přečíst hlavičku souboru %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Nelze přečíst jedinečné ID z obrazu disku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Selhal zápis BT.DINF do SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Zápis bkhdr selhal"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Nelze zapsat data do souboru: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Zápis hlavičky selhal pro %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Perština"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rychlá"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Rychlý výpočet hloubky"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Rychlá verze MMU. Nefunguje v každé hře."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2572,23 +2463,27 @@ msgstr ""
 "závažná desynchronizace. Přehrávání ukončeno. (Chyba v PlayWiimote: %u != "
 "%u, bajt %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Přehrávač Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Informace o souboru"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Soubor neobsahoval žádné kódy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Soubor převeden na .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2596,7 +2491,7 @@ msgstr ""
 "Soubor nelze otevřít\n"
 "nebo nemá platnou příponu"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2605,94 +2500,93 @@ msgstr ""
 "Soubor má příponu \"%s\"\n"
 "platné přípony jsou (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Soubor nerozpoznán jako paměťová karta"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Soubor není komprimovaný"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Neznámý režim otevření : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Najít další"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Najít předchozí"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "První blok"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Spravit Kontrolní Součty"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Vynutit 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Vynutit 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Donutit konzoli být jako NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Vynutit Filtrování Textur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Vynutí filtrování textur i když ho emulovaná hra výslovně zakázala.\n"
-"Trochu zlepší kvalitu textur, ale v některých hrách způsobuje chyby.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Donutí hru vytvářet obraz v širokoúhlých rozlišeních.\n"
-"V některých hrách způsobuje grafické chyby\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n"
-"Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky "
-"zapne toto nastavení při hraní Japonských her."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2700,550 +2594,577 @@ msgstr ""
 "Formátovat jako ascii (NTSC\\PAL)?\n"
 "Zvolte ne pro sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Dopředu"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Přesměrování portu (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Nalezeno %d výsledků pro '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Nalezeno %x souborů uložené hry"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Snímek"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Snímek"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Postup Snímkem"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Uložení snímků použije FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Informace o snímku"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Rozsah Snímku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Přes&kakování snímků:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Limit Snímků:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Snímky k Nahrání"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Rozhlížení pomocí myši"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francouzština"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Pražce"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Z"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "CelObr"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Rozlišení celé obrazovky:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Soubor GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID Hry:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Hra už běží!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Hra neběží!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Hra nenalezena!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Nastavení Konkrétní Hry"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Nastavení Hry"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Nastavení Gamecube &Pad"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube Pad nastavení"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Kódy Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Nelze spustit GeckoKód (CT%i CST%i) (%s)\n"
-"(buď špatný kód, nebo typ kódu není ještě podporován. Zkuste použít )"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Obecné"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Obecná Nastavení"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Němčina"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Index je větší než velikost seznamu ar kódu %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Grafická nastavení"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Větší než"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do "
-"textury.\n"
-"Zvýšení vnitřního rozlišení zlepší účinnek tohoto nastavení.\n"
-"Trošku sníží výkon a možná způsobí problémy (i když to je nepravděpodobné).\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Řečtina"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zelená"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Zelená vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zelená vpravo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Kytara"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacky"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Kontrolní součet hlavičky selhal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebrejština"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Výška"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Nápověda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Ahoj,\n"
-"\n"
-"Dolphin vyžaduje, OS X 10.7 nebo lepší.\n"
-"Bohužel máte příliš starou verzi OS X.\n"
-"Poslední verze Dolphin podporující OS X 10.6 je Dolphin 3.5\n"
-"Prosím aktualizujte na 10.7 nebo lepší, abyste mohli použít nejnovější verzi "
-"Dolphin.\n"
-"\n"
-"\n"
-"Sajonara!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Ahoj,\n"
-"\n"
-"Dolphin potřebuje, aby Váš procesor podporoval SSE2 rozšíření.\n"
-"Bohužel Váš procesor je nepodporuje, takže Dolphin nebude spuštěn.\n"
-"\n"
-"Sajonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Skrýt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Skrýt kurzor myši"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Skryje kurzor myši, pokud je nad oknem emulace.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Hostovat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Nastavení klávesových zkratek"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Maďarština"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybridní Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst IOS nebo název, který není "
-"dostupný ve vašem NAND výpisu\n"
-"IDNázvu %016llx.\n"
+"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst název, který není dostupný ve "
+"vašem NAND výpisu\n"
+"IDNázvu %016<PRIx64>.\n"
 "Dolphin se teď pravděpodobně zasekne."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - špatný cíl"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Nastavení IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "Infrč."
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Infračer. Ukazovátko"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Citlivost Infračer.:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Detaily ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Adresáře ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITÁLIE"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ikona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Pokud je zaškrtnuto, registry ohraničujícího rámečku budou aktualizovány. "
-"Používáno v hrách Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorovat Změny Formátu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignorovat všechny změny formátu EFB.\n"
-"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. Přesto způsobuje "
-"grafické chyby v malém počtu jiných her.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignorovat všechny požadavky procesoru pro čtení a zápis do EFB.\n"
-"Zvýší výkon v některých hrách, ale může vypnout některé funkce související s "
-"hraním a grafické efekty.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importovat Uloženou hru"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importovat uloženou hru Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Import selhal"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Importovaný soubor má příponu gsc\n"
-"ale nemá správnou hlavičku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Importovaný soubor má neplatnou délku"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"\"Importovaný soubor má příponu sav\n"
-"ale nemá správnou hlavičku\""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Ve Hře"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Zvýšit omezení snímků"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informace"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Vstup"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Vložit"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Zde vložte Zašifrovaný nebo Rozšifrovaný kód..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Vložit SD Kartu"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Zde vložte jméno..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Instalovat WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Instalovat do Wii Menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě "
-"nepodporuje."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Instaluji WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Chyba v kontrole celistvosti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Kontrola celistvosti dokončena"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Kontrola celistvosti dokončena. Nebyly nalezeny žádné chyby."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Kontrola celistvosti oddílu %d selhala. Váš výpis ISO je pravěpodobně "
-"poškozen nebo byl nesprávně opraven."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Nastavení Rozhraní"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Vnitřní chyba LZO - komprimace selhala"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3252,103 +3173,106 @@ msgstr ""
 "Vnitřní chyba LZO - dekomprimace selhala (%d) (%ld, %ld) \n"
 "Zkuste znovu nahrát stav"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Vnitřní chyba LZO - lzo_init() selhalo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Vnitřní Rozlišení:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Převaděč (VELMI pomalé)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Neplatná Velikost(%x) nebo Kouzelné slovo (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Neplatná Hodnota!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Neplatný bat.map nebo záznam adr."
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Neplatná událost typu %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Neplatný soubor"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Neplatný opening.bnr nalezen v gcm:\n"
-"%s\n"
-"Možná budete muset hru znovu vypsat."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Neplatný soubor s nahrávkou"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Neplatné parametry hledání (není vybrán žádný objekt)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Neplatný řetězec hledání (nelze převést na číslo)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Neplatný řetězec hledání (jsou podporovány pouze sudé délky řetězce)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Neplatný stav"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italština"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPONSKO"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT Rekompilátor (doporučeno)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL experimentální rekompilátor"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonština"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3358,64 +3282,75 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Okno vždy navrchu"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Klávesa"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Korejština"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Tlačítko L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "Levý Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Jazyk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Poslední %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Zpoždění:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Levá páčka"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Levé kliknutí pro detekci zkratky.\n"
-"Zadejte mezerník pro vyčištění."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3425,7 +3360,7 @@ msgstr ""
 "Prostřední kliknutí pro vyčištění.\n"
 "Pravé kliknutí pro více možností."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3433,202 +3368,211 @@ msgstr ""
 "Levé/Pravé kliknutí pro více možností.\n"
 "Prostřední pro vymazání."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Menší než"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limitovat podle SzS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Nahrát"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Nahrát Vlastní Textury"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Načíst stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Načíst 1. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Načíst 2. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Načíst 3. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Načíst 4. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Načíst 5. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Načíst 6. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Načíst 7. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Načíst 8. uložený stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Nahrát Slot Stavu 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Načíst stav v pozici 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Nahrát Slot Stavu 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Nahrát Slot Stavu 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Nahrát Slot Stavu 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Nahrát Slot Stavu 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Nahrát Slot Stavu 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Nahrát Slot Stavu 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Nahrát Slot Stavu 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Načíst stav v pozici 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Nahrát Stav..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Nahrát Systémové Menu Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Nahrát Systémové Menu Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Načte vlastní textury z User/Load/Textures/<id hry>/\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Načíst přednastavené hodnoty z dostupných hackových vzorů."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Záznam"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Nastavení Záznamu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Zaznamenat SzS do souboru"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Typy Záznamu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zaznamenat počet snímků vykreslených za sekundu do User/Logs/fps.txt. Tuto "
-"funkci využijte pro měření výkonu Dolphin\n"
-"\n"
-".Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Výstup Zapisovače"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Protokolování"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Připojení k serveru ztraceno!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Tlačítko M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 se neshoduje\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Hack Rychlosti"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Soubory MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Hlavní páčka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID Výrobce:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Výrobce:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3642,29 +3586,33 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Pam. karta už má uložení pro tento název"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Pam. karta již otevřena"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Bajt Paměti"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Paměťová karta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3672,7 +3620,7 @@ msgstr ""
 "Správce Paměťových karet Varování-Před použitím zálohujte, měl by být "
 "spravený, ale mohl by věci poškodit!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3689,37 +3637,52 @@ msgstr ""
 "%s\n"
 "Chtěli byste starý soubor zkopírovat do nového umístění?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Ostatní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Ostatní Nastavení"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modifikátor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3731,20 +3694,24 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Písmo se stejnou roztečí"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3762,315 +3729,289 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Násobit"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "POZNÁMKA: Velikost proudu se neshoduje se\n"
 "skutečnou délkou dat\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NK Přidat"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NK Začít"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NK Des. čárka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NK Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NK Dělení"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NK Dolů"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NK End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NK Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NK Rovná se"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NK Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NK Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NK Vlevo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NK Násobení"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NK Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "Nk Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NK Vpravo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Oddělovač"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NK Mezerník"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NK Mínus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NK Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NK Nahoru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Jméno:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Jméno: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Původní soubory CGI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nové Skenování"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Další Stránka"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Další Skenování"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Přezdívka :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Žádná Země (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Nenalezena žádná ISO nebo WADS"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Žádný zvukový výstup"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nebyl nalezen žádný plakát s názvem  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Žádný popis není dostupný"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Žádné připínání"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Není načten žádný soubor"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Žádné volné záznamy indexu adresáře"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Žádný soubor s nahrávkou"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Nebyl nalezen žádný ukládací adresář pro název %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Žádný"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norský Bokmål"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Nerovná se"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Nenastaven"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "není uložená hra Wii nebo nelze číst z hlavičky souboru o velikosti %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Nepřipojen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Poznámky"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Poznámky:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Upozornění"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Počet Kódů:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunčak"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Zrychlení Nunčaku"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Rozsah Objektu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Vypnuto"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Logická Adresa:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Zobrazovat zprávy na obrazovce"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online &dokumentace"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Pouze bloky %d jsou dostupné"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Otevřít"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Otevřít &adresář umístění"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Otevřít Wii adre&sář uložení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Otevřít soubor..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: nelze vytvořit kontext pro zařízení %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nelze nalézt zvuková zařízení"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: nelze otevřít zařízení %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Dekodér Textury"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Dekodér Textury"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4078,20 +4019,18 @@ msgstr ""
 "Otevře výchozí nastavení (pouze pro čtení) této hry v externím textovém "
 "editoru."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr "Otevře uživatelem zadané změny nastavení v externím textovém editoru."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Volby"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oranžová"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4101,344 +4040,326 @@ msgstr ""
 "Klikněte pravým tlačítkem a exportujte všechna uložení\n"
 "a importujte je do nové paměťové karty\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Jiné"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Výstup"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "S&pustit nahrávku..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pady"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Odstavec"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parametry"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Oddíl %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Oddíl neexistuje: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Záplaty"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Cesty"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pozastavit na konci filmu"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Osvětlení Podle Pixelu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Dokonalá"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Spustit"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Přehrát nahrávku"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Přehrát/Pozastavit"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Hratelné"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Možnosti Přehrávání"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Hráči"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Prosím potvrďte..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Před uložením si prosím vytvořte perspektivu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Mínus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polština"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugalština"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalština (Brazilská)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Efekt Následného Zpracování:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Předčasný konec filmu v PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Předčasný konec filmu v PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Předčasný konec filmu v PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Předvolby:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Před. stránka"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Předchozí Stránka"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Předchozí Hodnota"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Vytisknout"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Zahodit Vyrovnávací Paměť"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Otázka"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Ukončit"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Tlačítko R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "Pravý Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSKO"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Rádius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Rozsah"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Režim pouze pro čtení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Opravdová"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Opravdové Rola-Bola"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Opravdový Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Opravdové Wiimoty"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Nahrávat"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Zaznamenat vstup"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Informace o Nahrávání"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Možnosti Nahrávání"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Červená"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Červená vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Červená vpravo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Zmenší množství vyhlazování způsobené rastrováním 3D obrazu.\n"
-"Tímto vypadá vykreslený obraz méně hranatý.\n"
-"Výrazně snižuje rychlost emulace a někdy způsobuje problémy.\n"
-"\n"
-"Pokud si nejste jisti, vyberte Žádný."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Obnovit Seznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Obnovit seznam her"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Odstranit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4448,243 +4369,320 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Vykreslit do Hlavního okna"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Resetovat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Výsledky"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revize:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Vpravo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Pravá páčka"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibrace"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
-"Spustit DSP LLE na samostatném vlákně (nedoporučeno: může způsobit zaseknutí)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Ruština"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Uložit Sta&v"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Bezpečná"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Uložit"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Uložit GCI jako..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Načíst nejstarší stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Uložit stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Uložit do Slotu Stavu 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Uložit stav do pozice 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Uložit do Slotu Stavu 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Uložit do Slotu Stavu 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Uložit do Slotu Stavu 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Uložit do Slotu Stavu 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Uložit do Slotu Stavu 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Uložit do Slotu Stavu 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Uložit do Slotu Stavu 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Uložit stav do pozice 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Uložit Stav..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Uložit jako"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Uložit komprimované GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Uložit současnou perspektivu"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Uložit dekomprimované GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "EFB Kopie Změněné Velikosti"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Skenuji %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Skenuji pro ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Skenuji..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "SnímkObrz"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Hledat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Hledat Filtr"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Hledat Podadresáře"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Hledat v současném objektu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Hledat hexadecimální hodnotu:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Sekce %s nebyla v SYSCONF nalezena"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Vybrat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Vyberte Soubor s Nahrávkou"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Vyberte soubor Wii WAD k instalování"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Zvolte, který hardwarový adaptér se má použít.\n"
-"\n"
-"Pokud si nejste jisti, použijte ten první."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Vyberte soubor s uloženou pozicí pro import"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Vybrat plovoucí okna"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Vyberte soubor k nahrání"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Vyberte soubor s uloženou hrou"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Vyberte stav k nahrání"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Vyberte stav k uložení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4700,273 +4698,291 @@ msgstr ""
 "Vynutit 4:3: Roztáhne obraz na poměr4:3.\n"
 "Roztáhnout do okna: Roztáhne obraz do velikosti okna."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Vybraný profil ovladače neexistuje"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Vybraný typ písma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Vybere rozlišení obrazovky použité v režimu celé obrazovky.\n"
-"To by mělo být vždycky větší než nebo rovno vnitřnímu rozlišení. Dopad na "
-"výkon je zanedbatelný.\n"
-"\n"
-"Pokud si nejste jisti, použijte Vaše rozlišení obrazovky.\n"
-"Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám "
-"funguje."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Zvolí jaké grafické API bude vnitřně použito.\n"
-"Direct3D 9 je většinou nejrychlejší. OpenGL je ale přesnější. Direct3D 11 je "
-"někde mezi nimi.\n"
-"Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n"
-"\n"
-"Pokud si nejste jisti, použijte Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Zvolí jaké grafické API bude vnitřně použito.\n"
-"Direct3D 9 je většinou nejrychlejší. OpenGL je ale přesnější. Direct3D 11 je "
-"někde mezi nimi.\n"
-"Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n"
-"\n"
-"Pokud si nejste jisti, použijte OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Poslat"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Umístění Senzorové Tyče:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Srbština"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Sériový port 1 - Tito je port, který používají zařízení jako internetový "
-"adaptér"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Nastavit jako &výchozí ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Nastavit jako výchozí paměťovou kartu %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: Index je větší než velikost seznamu ar kódu %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Nastavá zpoždění (v ms). Vyšší hodnoty mohou snížit praskání zvuku. Pouze "
-"pro podpůrnou vrstvu OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Nastavení..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Nelze vytvořit soubor nastavení"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Třes"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Krátké Jméno:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Zadní Tlačítka"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Zobrazit &Konzoli"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Zobrazit Záznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Zobrazit &Stavový řádek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Zobrazit Panel Nás&trojů"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Zobrazit výchozí"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Zobrazit Disky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Zobrazit EFB Regiony Kopie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Zobrazit Snímky za Sekundu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Zobrazit Francii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Zobrazit GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Zobrazit Obrazovku Vstupu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Zobrazit Itálii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Zobrazit JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Zobrazit Koreu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Jazyk Zobrazení:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Zobrazit Nastavení &Záznamu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Zobrazit PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Zobrazit Platformy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Zobrazit Regiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Zobrazit Statistiky"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Zobrazit Tchaj-wan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Zobrazit USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Zobrazit Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Zobrazit Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Zobrazí rámeček s potvrzením před zastavením hry."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Zobrazit rámeček se zprávou, při zjištění potenciálně závažné chyby.\n"
-"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin "
-"může také být náhle ukončen bez jakéhokoliv vysvětlení."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Zobrazit první blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Zobrazit počítadlo zpoždění"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Zobrazit zprávy v oblasti obrazovky emulace.\n"
-"Tyto zprávy zahrnují zápisy do paměťových karet, podpůrné vrstvy videa a "
-"informace o CPU a čištění mezipaměti JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Zobrazit uložené bloky"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Zobrazit komentář uložení"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Zobrazit ikonu uložení"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Zobrazit název uložení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4978,83 +4994,82 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Zobrazit neznámé"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zobrazit různé statistiky.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Šikmý Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Zjednodušená čínština"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Velikost"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Přeskočit BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Přeskočit čištění DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Přeskočit EFB Přístup z Procesoru"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n"
-"Někdy také zvýší kvalitu obrazu.\n"
-"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, "
-"nebo tuto možnost vypnout.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Snímek"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Softwarový Vykreslovač"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5067,154 +5082,173 @@ msgstr ""
 "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, "
 "zvolte 'Ne'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Nastavení Zvuku"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Podpůrná vrstva zvuku %s je neplatná."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Mezerník"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Španělština"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Hlasitost Reproduktoru:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Určuje rozlišení, v kterém bude vykresleno. Vysoké rozlišení velmi zvýší "
-"kvalitu obrazu, ale je také o dost náročnější na výkon a může způsobovat v "
-"některých hrách chyby.\n"
-"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také "
-"nezpůsobuje tolik problémů. Obecně řečeno, čím nižší je vnitřní rozlišení, "
-"tím lepší výkon bude.\n"
-"\n"
-"Pokud si nejste jisti, zvolte 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Zvýšit rychlost přenosu Disku"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Čtvercová páčka"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standardní Ovladač"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Spustit &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Začít na&hrávat"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Začít Nahrávat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Ukládání stavu"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Páčka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Zastavit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Ukládat EFB kopie do objektů textury grafického procesoru.\n"
-"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší "
-"zrychlení než EFB do RAM.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Roztáhnout do Okna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Brnkat"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Odečíst"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Soubor úspěšně exportován do %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Uložení byly úspěšně importovány"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Švédština"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Švihnutí"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synchronizovat vlákno GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5222,81 +5256,110 @@ msgstr ""
 "Synchronizuje vlákna GPU a CPU, aby se zabránilo náhodným zasekáváním v "
 "režimu dvojitého jádra. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Jazyk Systému:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TCHAJ-WAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS Vstup"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Rozdělit okno"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Deska vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Deska vpravo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Vytvořit Snímek Obrazovky"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bonga)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Vyrovnávací Paměť Textur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Překryv Formátu Textury"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD byl úspěšně nainstalován"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Adresa je neplatná"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Kontrolní součet byl úspěšně opraven"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Zvolený adresář je už v seznamu"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5305,7 +5368,7 @@ msgstr ""
 "Soubor %s už existuje.\n"
 "Chcete ho nahradit?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5314,45 +5377,33 @@ msgstr ""
 "Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už "
 "otevřen jiným programem."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Soubor %s je už otevřen, hlavička souboru nebude zapsána."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Zadaný soubor (%s) neexistuje"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Jméno nemůže být prázdné"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Jméno nemůže obsahovat znak ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Výsledný rozšifrovaný kód AR neobsahuje žádné řádky."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou "
-"chybět jakékoliv aktualizace textur z RAM.\n"
-"\n"
-"Pokud si nejste jisti, použijte hodnotu zcela vpravo."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5360,36 +5411,48 @@ msgstr ""
 "Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk "
 "systému."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Verze serveru a Netplay klienta jsou nekompatibilní!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Server je plný!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Server odpověděl: hra v současnosti běží!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Server zaslal neznámou chybovou zprávu!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Zadaný soubor \"%s\" neexistuje"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Hodnota je neplatná"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Vzhled:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5397,7 +5460,7 @@ msgstr ""
 "Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je "
 "pravděpodobně neúplné"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5405,7 +5468,7 @@ msgstr ""
 "Tato nastavení potlačí hlavní nastavení Dolphinu.\n"
 "Neurčený znamená, že hra použije nastavení Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5413,123 +5476,163 @@ msgstr ""
 "Tento simulátor action replay nepodporuje kód, který mění samotný Action "
 "Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Tato funkce Vám umožňuje si pohrát s herní kamerou.\n"
-"Podržte pravé tlačítko myši a pohybujte s ní pro změnu pohledu kamery, "
-"podržením prostředního tlačítka myši dojde k jejímu přesunu. Podržte SHIFT a "
-"zmáčkněte jednu z kláves WASD, abyste kamerou pohnuli v určité vzdálenosti "
-"kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). Stiskněte SHIFT"
-"+R pro reset kamery.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Toto omezí rychlost hry na zadaný počet snímků za sekundu (plná rychlost je "
-"60 pro NTSC a 50 pro PAL). Nebo můžete použít Zvuk pro přiškrcení DSP (v "
-"závislosti na hře může spravit klikání zvuku, ale také může způsobit "
-"neustálý hluk)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Toto rozdělí vlákna Obrazu a Procesoru, takže běží na oddělených jádrech.\n"
-"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také "
-"může způsobovat občasné chyby/pády."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Tohle Vám umožní Ručně Upravovat konfigurační soubory INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Práh"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Naklánění"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Název"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Do"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Zapnout Všechny Typy Záznamů"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Přepínat poměr stran"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Přepínat kopie EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Přepínat mlhu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Přepnout na Celou Obrazovku"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Přepínat IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Nahoře"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Tradiční Čínština"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Pokus o načtení souboru neznámého typu."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Spínače"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Pokus o čtení z neplatného SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5537,41 +5640,24 @@ msgstr ""
 "Pokus o čtení z neplatného SYSCONF\n"
 "ID bt wiimote nejsou dostupné"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turečtina"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Točna"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Typ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP Port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "NEZNÁMÝ"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "NEZNÁMÉ_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5579,202 +5665,178 @@ msgstr ""
 "Ze zadaných hodnot nelze vytvořit záplatu.\n"
 "Záznam není změněn."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zašifrovaný nebo "
+"Nelze analyzovat řádek %u zadaného kódu AR jako platný zašifrovaný nebo "
 "rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n"
 "Chtěli byste tento řádek ignorovat a pokračovat v analýze?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Nedefinován %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Vrátit zpět Nahrání Stavu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Vrátit zpět Uložení Stavu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Neočekávané volání 0x80? Ukončování..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Neznámý příkaz DVD %08x - závažná chyba"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Neznámý příkaz 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Neznámý záznam typu %i v SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Přijata neznámá zpráva s id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Nahoru"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Svislý Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Použít režim EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Použít Celou Obrazovku"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Použít Šestnáctkovou soustavu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Použít Obslužné Rutiny Paniky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Použít méně přesný algoritmus k výpočtu hodnot hloubky.\n"
-"V některých hrách způsobuje problémy, ale může také přinést dobré "
-"zrychlení.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Použít více vláken k dekódování textur.\n"
-"Může vést ke zrychlení (zvláště u procesorů, která mají více než dvě "
-"jádra).\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Používá nebezpečné operace pro zrychlení vysílání vertexů v OpenGL. U "
-"podporovaných grafických procesorů nejsou známy žádné problémy, jinak ale "
-"způsobuje vážné problémy se stabilitou a obrazem.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Normálně pokud kompilace shadera selže, je zobrazena chybová zpráva.\n"
-"Nicméně, zaškrtnutím této možnosti tyto vyskakovací okna přeskočíte, což Vám "
-"umožní nepřerušované hraní.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Pomůcky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Synch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hack rychlosti VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Hodnota"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Hodnota:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Úroveň"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hack vysílání vertexů"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Obraz"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuální"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalace WAD selhala: chyba při vytváření %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instalace WAD selhala: chyba při vytváření lístku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5786,25 +5848,27 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Varování"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Varování - DOL se spouští ve špatném režimu konzole!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Varování - ELF se spouští ve špatném režimu konzole!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Varování - ISO se spouští ve špatném režimu konzole!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5815,7 +5879,7 @@ msgstr ""
 "%s\n"
 "Přejete si pokračovat?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5828,7 +5892,7 @@ msgstr ""
 "a mají stejný název jako soubor na Vaši paměťové kartě\n"
 "Pokračovat?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5840,7 +5904,15 @@ msgstr ""
 "měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze "
 "pro čtení."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5852,7 +5924,7 @@ msgstr ""
 "načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k "
 "desynchronizaci."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5885,180 +5957,167 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - soubor není otevřen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Hack Širokoúhlého obrazu"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Šířka"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Konzole Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii Kořen NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii soubory s uložením (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD Nelze číst ze souboru"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Připojen"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote nastavení"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimoty"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Klávesa Windows Vlevo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Klávesa Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Klávesa Windows Vpravo"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Zalamování textu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Pracuji..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Zapsat paměťové karty (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Zapsat do Konzole"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Zapsat do Ladiče"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Zapsat do Souboru"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Zapsat do Okna"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice selhalo: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 spuštění selhalo: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 vytvoření hlavního hlasu selhalo: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Používáte volný ROM DSP, který vytvořil Tým Dolphin.\n"
-"Všechny hri Wii budou správně pracovat a většina her na GC by také měla "
-"fungovat dobře, ale UKódy GBA/IPL/CARD nebudou fungovat.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Používáte starý volný ROM DSP, který vytvořil Tým Doplhin.\n"
-"Správně pracovat budou pouze hry používající Zelda UCode.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Nemůžete zavřít panely, které mají uvnitř stránky."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Musíte si zvolit hru!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Musíte zadat jméno!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 "Musíte zadat platnou hodnotu v desítkové, šestnáctkové nebo osmičkové "
 "soustavě."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Musíte zadat platné jméno profilu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Pro uplatnění změn musíte Dolphin restartovat."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6068,7 +6127,7 @@ msgstr ""
 "Chtěli byste nyní přestat a problém opravit?\n"
 "Pokud zvolíte \"Ne\", mlže být zvuk poškozený."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6076,36 +6135,36 @@ msgstr ""
 "Váš GCM/ISO soubor se zdá být neplatný (neplatná země).\n"
 "Pokračovat s regionem PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Váš soubor SYSCONF má špatnou velikost.\n"
-"Měl by být 0x%04x (ale je 0x%04llx)\n"
+"Měl by být 0x%04x (ale je 0x%04<PRIx64>)\n"
 "Chcete vytvořit nový?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Kód Zero 3 není podporován"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Nulový kód, který dolphin nezná: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ čekám ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6117,78 +6176,30 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Vlastní]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTÁLNÍ]\n"
-"Usiluje o zrychlení emulace tím, že dekódování textury přenechá grafickému "
-"procesoru použitím struktury OpenCL.\n"
-"Nicméně v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také "
-"je ve většině případů pomalejší, než normální dekódování textur přes "
-"procesor.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTÁLNÍ]\n"
-"Trochu zrychlí emulaci ukládáním předvytvořených objektů do vyrovnávací "
-"paměti\n"
-"Může ale také způsobovat problémy\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "zavaděč aplikace (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Přečten Opcode z %x. Prosím nahlaste."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "neznámá konfigurace %d (očekáváno %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "přijata neznámá zpráva"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute při běhu aplikace vrátil -1!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Korekce z Far:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Korekce zNear:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| NEBO"
diff --git a/Languages/po/de.po b/Languages/po/de.po
index dc68390a65..0a02b7cedf 100644
--- a/Languages/po/de.po
+++ b/Languages/po/de.po
@@ -1,22 +1,28 @@
-# Translation of dolphin-emu.pot to German
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# turbedi <thetoerk@gmail.com>, 2013
-# DasD aus der Spree <Dan_krug@gmx.de>, 2013
+# Berkan <thetoerk@gmail.com>, 2013
+# Danny Krug <Dan_krug@gmx.de>, 2013
 # DefenderX <darkmodx@gmail.com>, 2013
-# Ghabry <gabelk@web.de>, 2013
+# DefenderX <darkmodx@gmail.com>, 2013
+# Gabriel <gabelk@web.de>, 2013
 # JackyCola <jackycola@gmail.com>, LucasX <lucasx790@gmail.com>, 2011
+# M T <michtrz@gmail.com>, 2013-2014
+# no_cluez <neobrainx@gmail.com>, 2013
 # no_cluez <neobrainx@gmail.com>, 2013
 # Shinrai, 2013
+# Shinrai, 2013
+# Tillmann Karras <tilkax@gmail.com>, 2014
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-21 12:39+0000\n"
-"Last-Translator: Ghabry <gabelk@web.de>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/de/)\n"
 "Language: de\n"
@@ -25,21 +31,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (zu viele anzuzeigen)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Spiel: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NICHT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -48,46 +66,95 @@ msgstr ""
 "\"%s\" existiert nicht.\n"
 "Eine neue 16MB Memcard erstellen?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" ist keine gültige GCM/ISO-Datei oder kein GC/Wii-Image."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopieren%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d Samples"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d Samples (Qualität %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 "%s ist bereits vorhanden.\n"
 "Vorhandene Datei überschreiben?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-"%s konnte nicht komprimiert werden. Möglicherweise ist das Image fehlerhaft."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -96,7 +163,7 @@ msgstr ""
 "%s konnte nicht als Speicherkarte geladen werden.\n"
 "Die Dateigröße ist ungültig (0x%x bytes)."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -105,7 +172,7 @@ msgstr ""
 "%s konnte nicht als Speicherkarte geladen werden.\n"
 "Die Speicherkartengröße ist ungültig (0x%x bytes)."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -115,377 +182,339 @@ msgstr ""
 "Die Datei ist nicht groß genug um eine gültige Speicherkartendatei zu sein "
 "(0x%x bytes)."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s konnte nicht geöffnet werden."
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s fehlgeschlagen: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "Die Datei %s ist 0 Byte groß."
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s ist bereits komprimiert und kann nicht weiter komprimiert werden."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "Der Dateiname %s ist zu lang (maximal 45 Zeichen)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sLöschen%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI exportieren%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI importieren%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u freie Blöcke; %u freie Verzeichniseinträge"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& UND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "Über &Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "Von &DVD-Laufwerk starten..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Haltepunkte"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "Nach ISOs &suchen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Cheat-Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&DSP-Einstellungen"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "ISO &löschen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "Ausgewählte ISOs &löschen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Datei"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Einzelbildwiedergabe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Vollbild"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Grafikeinstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Tastenkürzel-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "Spielstand &laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Speicherkarten-Verwaltung (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Arbeitsspeicher"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "Ö&ffnen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Optionen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "Pau&se"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Start"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "S&chreibgeschützer Modus"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "Liste &aktualisieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Register"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "S&ound"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "Sto&pp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "E&xtras"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Ansicht"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote-Einstellungen"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "''"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(UNBEKANNT)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(aus)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ HINZUF."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Nativ (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 Bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Nativ (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Nativ (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Nativ (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 Bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Nativ (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Nativ (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 Bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Namen hier eingeben>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Keine Auflösungen gefunden>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nichts>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Taste drücken>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Systemsprache>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Ein NetPlay-Fenster ist bereits geöffnet!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Derzeit wird kein Spiel ausgeführt."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Es konnte kein unterstütztes Bluetooth-Gerät gefunden werden.\n"
-"Du musst deine Wiimotes manuell verbinden."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ACHTUNG:\n"
-"\n"
-"Netplay funktioniert nur mit den folgenden Einstellungen:\n"
-"- Dual Core aktivieren [AUS]\n"
-" - DSP-Emulationsengine muss auf allen Computern gleich sein!\n"
-" - DSP in eigenem Thread [AUS]\n"
-" - Framebegrenzung NICHT auf [AUDIO] gesetzt\n"
-"\n"
-"Alle Spieler sollten die gleiche Dolphin-Version und Einstellungen "
-"verwenden.\n"
-"Alle Speicherkarten müssen bei allen Spielern identisch oder deaktiviert "
-"sein.\n"
-"Wiimote-Unterstützung wurde für NetPlay noch nicht implementiert.\n"
-"\n"
-"Der Host muss den gewählten TCP-Port geöffnet haben!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR Codes"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Über Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Beschleunigung"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Genauigkeit:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Einige Spiele benötigen eine exakte Emulation von EFB-Kopien, für bestimmte "
-"Grafikeffekte oder Gameplayfunktionen.\n"
-"\n"
-"Im Zweifel, wähle stattdessen EFB to Texture."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Aktion"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -500,7 +529,7 @@ msgstr ""
 "Fehlerhafter Code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -508,7 +537,7 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Add Code "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -517,7 +546,7 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Fill and "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -526,7 +555,7 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Ram Write "
 "And Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -535,12 +564,12 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Fehler: Ungültiger Wert (%08x) in Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -550,173 +579,141 @@ msgstr ""
 "(%s)\n"
 "Master Codes werden nicht benötigt. Benutzen Sie keine Master Codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Fehler: Ungültiger AR-Code in Zeile: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: Ungültige Größe %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Ungültiger Normal Code Typ %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normaler Code %i: ungültiger Subtype %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: Ungültiger Subtype %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Grafikkarte:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "ActionReplay-Code hinzufügen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Patch hinzufügen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Neue Palette hinzufügen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adresse:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Füge den ermittelten Wert in den Parameter zFar ein.\n"
-"Es gibt zwei Möglichkeiten zum Bestimmen der Gleitkommazahl.\n"
-"Beispiel: ''200'' oder ''0.0002'' direkt eingeben, das ergibt den gleichen "
-"Effekt, der ermittelte Wert wird ''0.0002'' sein.\n"
-"Wert: (0->+/-Integer) oder (0->+/-FP[6 Nachkommastellen])\n"
-"\n"
-"NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Füge den ermittelten Wert in den Parameter zNear ein.\n"
-"Es gibt zwei Möglichkeiten zum Bestimmen der Gleitkommazahl.\n"
-"Beispiel: ''200'' oder ''0.0002'' direkt eingeben, das ergibt den gleichen "
-"Effekt, der ermittelte Wert wird ''0.0002'' sein.\n"
-"Wert: (0->+/-Integer) oder (0->+/-FP[6 Nachkommastellen])\n"
-"\n"
-"NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Einstellung des benötigten analogen Drucks um Tasten zu aktivieren."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Alle GC/Wii-Dateien (elf, dol, gcm, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Alle GC/Wii-Imagedateien (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Alle Gamecube GCM-Dateien (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Alle Speicherstände (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii-ISO-Dateien (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Alle Dateien (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analysiere"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Winkel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropische Filterung:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Der Apploader hat eine falsche Größe... ist dies wirklich ein AppLoader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Kann Apploader aus dieser Datei nicht laden."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -726,16 +723,12 @@ msgstr ""
 "\n"
 "Im Zweifel, wähle (aus)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Möchtest du \"%s\" wirklich löschen?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -743,55 +736,82 @@ msgstr ""
 "Sollen diese Dateien wirklich gelöscht werden?\n"
 "Löschen kann nicht rückgängig gemacht werden!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "ARM JIT (Experimentell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Seitenverhältnis:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Mindestens eine Palette muss geöffnet bleiben."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Audio-Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Fehler beim Öffnen des AO-Geräts.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Automatisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Automatisch (Vielfaches von 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Automatisch (Fenstermodus)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Fenstergröße automatisch festlegen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -801,134 +821,150 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP-Register"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Zurück"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Backend-Einstellungen"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Hintergrundeingabe"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Rückwärts"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Ungültiger Datei-Header"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Bannerdetails"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Leiste"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Blockzuteilungs-Tabellen-Prüfsumme fehlerhaft."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blau"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blau links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blau rechts"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Unten"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Steuerung festlegen: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Defekt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Verzeichnis auswählen und hinzufügen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "ISO-Verzeichnis auswählen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Ausgabeverzeichnis auswählen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Tasten"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -936,119 +972,100 @@ msgstr ""
 "Umgeht die Leerung des Datencaches von der DCBZ-Anweisung. Für gewöhnlich "
 "deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C-Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU-Emulations-Engine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Anzeigeliste zwischenspeichern"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Kalkuliert die Lichtberechnung von 3D Grafiken pro Pixel anstatt pro "
-"Vertex.\n"
-"Verlangsamt Emulation um einige Prozent (abhängig von der GPU).\n"
-"Für gewöhnlich ist das eine sichere Verbesserung, kann aber gelegentlich "
-"Probleme verursachen.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Im Zweifel deaktiviert lassen."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "WiiMote konnte nicht bei Verbindungs-Handle %02x gefunden werden"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Kann nicht von DVD_Plugin/DVD-Schnittstelle lesen: Fataler Fehler"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Kann %s nicht öffnen"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Kann während ausstehenden Events keine Events entregistrieren."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Die Datei %s kann nicht als Speicherkarte verwendet werden, weil sie keine "
-"gültige Gamecube-Speicherkarte ist."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Diese Datei kann nicht als Speicherkarte verwendet werden.\n"
-"Versuchst du möglicherweise die selbe Datei in beiden Slots zu verwenden?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Feststelltaste"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalanisch"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Mitte"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Wechseln"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Disc &wechseln..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Disc wechseln"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Spiel wechseln"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1056,103 +1073,90 @@ msgstr ""
 "Sprache der Benutzeroberfläche ändern.\n"
 "Dolphin muss neu gestartet werden, damit die Änderung wirksam wird."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Sign zu zFar Parameter ändern (nach Korrektur)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Sign zu zNear Parameter ändern (nach Korrektur)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Cheatcode"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Cheatsuche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Cheat-Verwaltung"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Prüfe die Unversehrtheit der Partition"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Prüfe Unversehrtheit..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinesisch (Vereinfacht)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinesisch (Traditionell)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Wähle ein DVD-Stammverzeichnis:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Wähle ein NAND-Stammverzeichnis:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Standard ISO auswählen:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Ordner zum Hinzufügen auswählen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Datei zum Öffnen auswählen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Wähle eine Speicherkarte:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Zielordner für Extraktion auswählen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Leeren"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1160,183 +1164,230 @@ msgstr ""
 "Client kann während ein Spiel emuliert wird nicht verbunden werden! NetPlay "
 "ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Schließen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "&Einstellungen..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Code-Info"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Code:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Befehl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Kommentar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Kommentar:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "ISO komprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Ausgewählte ISOs komprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Komprimiere ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Einstellungen"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Einstellungen"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Steuerung konfigurieren"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Pads konfigurieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Einstellungen ...."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Überschreiben Bestätigen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Beim Beenden bestätigen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Verbinden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Balance Bord anschließen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "USB-Tastatur verbunden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Wiimote %i verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Wiimote 1 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Wiimote 2 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Wiimote 3 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4 verbinden"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konsole"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Durchgehendes Suchen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Strg"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Zu GCI konvertieren"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopieren fehlgeschlagen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Auf Memcard %c kopieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Kern"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "%s konnte nicht erstellt werden"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Konnte Backend %s nicht initialisieren."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Konnte \"%s\" nicht lesen. Es befindet sich keine Disc im Laufwerk, oder "
-"dies ist kein GC/Wii Backup. Bitte beachten Sie, dass die ursprünglichen GC/"
-"Wii-Discs von den meisten PC-DVD-Laufwerken nicht gelesen werden können."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Konnte ISO-Datei %s nicht erkennen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Konnte %s nicht speichern"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1359,11 +1410,19 @@ msgstr ""
 "Wenn einer dieser Fälle zutriffst, solltest du den Speicherort der "
 "Speicherkarte in den Optionen ändern."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Konnte den Befehl zum Öffnen der Dateierweiterung 'ini' nicht finden!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1371,38 +1430,46 @@ msgstr ""
 "Konnte Kern nicht initialisieren.\n"
 "Überprüfe deine Konfiguration."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Anzahl:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "AR-Code erstellen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Neue Perspektive erstellen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Autor: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1412,203 +1479,192 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Überblendung"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 "Aktuelles Verzeichnis wurde gemäß wxFileSelector von %s nach %s geändert!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Benutzerdefinierter Projection-Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Benutzerdefinierter Projection-Hack Einstellungen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Einige orthographische Projection-Parameter anpassen."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP-Emulations-Engine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE Emulation (schnell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE Interpreter (langsam)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE Recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "DSP-Einstellungen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSP LLE in eigenem Thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD Laufwerk:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Kritischer Fehler: Datenträger kann nicht gelesen werden"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-"DVDLowUnencryptedRead - Kritischer Fehler: Datenträger kann nicht gelesen "
-"werden."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Tanzmatte"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Datengröße"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Datum:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro Dateien(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Tote Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Komma"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ISO dekomprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Ausgewählte ISOs dekomprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Dekomprimiere ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Framebegrenzung reduzieren"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Standardschriftart"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Entfernen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Spielstand löschen"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Vorhandende Datei '%s' löschen?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Beschreibung"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Erkenne"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Versuch erkannt, mehr Daten von der DVD zu lesen als in den Out Buffer "
-"passen. Abgeklemmt."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Gerät"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Geräteeinstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Skala"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1616,20 +1672,23 @@ msgstr ""
 "Verzeichnis-Prüfsumme und\n"
 "Backup-Verzeichnis-Prüfsumme sind fehlerhaft."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Destination Alpha deaktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Nebel deaktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1643,293 +1702,213 @@ msgstr ""
 "\n"
 "Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Deaktiviert die Emulation von EFB-Kopien.\n"
-"Diese werden oft für Post-Processing- oder Render-to-Texture-Effekte "
-"verwendet. Die Option ist zwar mit einer schnelleren Emulation verbunden "
-"aber verursacht fast immer Probleme.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Deaktiviert die Emulation einer Hardwarefunktion namens Destination Alpha, "
-"welche in vielen Spielen für verschiedene grafische Effekte benutzt wird.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disc"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Disc-Lesefehler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Anzeige"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Zeigt die vom Emulator gelesenen Eingaben an.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Division"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Laufende Emulation stoppen?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II Dekoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin-Team\n"
-"\n"
-"Zweig: %s\n"
-"Revision: %s\n"
-"Kompiliert: %s @ %s\n"
-"\n"
-"Dolphin ist ein GameCube/Wii-Emulator der\n"
-"ursprünglich von F|RES und ector geschrieben wurde.\n"
-"Heute ist Dolphin ein Open Source-Projekt mit vielen\n"
-"Mitwirkenden, zu vielen um sie alle aufzuzählen.\n"
-"Wenn du interessiert bist, besuche die Projektseite\n"
-"unter http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Besonderer Dank geht an Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 und Hotquik für ihr\n"
-"Reverse Engineering und Dokumente / Demos.\n"
-"\n"
-"Großer Dank geht an Gilles Mouchard, dessen\n"
-"Microlib PPC-Emulator unserer Entwicklung einen\n"
-"großen Sprung nach vorne gab.\n"
-"\n"
-"Danke an Frank Wille für seinen PowerPC-Disassembler,\n"
-"welchen or9 und wir um Gekko-Spezifika erweiterten.\n"
-"\n"
-"Danke an hcs/destop für ihren GC ADPCM-Dekodierer.\n"
-"\n"
-"Wir stehen in keiner Verbindung mit Nintendo.\n"
-"GameCube und Wii sind Markenzeichen von Nintendo.\n"
-"Der Emulator ist nur für Bildungszwecke und sollte nicht\n"
-"für Spiele benutzt werden, die du nicht legal besitzt."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafikeinstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin-&Webseite"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Emulierte Wiimote-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin-FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GCPad-Einstellungen"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS-Filme (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote-Einstellungen"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin auf &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin konnte keine GC/Wii-ISOs finden.  Hier doppelklicken um nach ISOs zu "
-"suchen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin versteckt momentan alle Spiele. Hier doppelklicken um alle Spiele "
-"anzuzeigen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin war nicht in der Lage die gewünschte Aktion auszuführen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Verdoppelt die Taktfrequenz der emulierten GPU. Kann einige Spiele "
-"beschleunigen (AN = Geschwindigkeit, AUS = Kompatibilität) "
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Unten"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Codes herunterladen (WiiRD-Datenbank)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Trommeln"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Audio dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "EFB-Target dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Frames dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Texturen dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Schreibt alle während der Emulation gerenderten Bilder in eine AVI-Datei in "
-"User/Dump/Frames.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Schreibt alle während der Emulation decodierten Spiele-Texturen in den "
-"Ordner User/Dump/Textures/<game_id>/.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Schreibt alle während der Emulation erzeugten EFB-Kopien in den Ordner User/"
-"Dump/Textures/.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holländisch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Beenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB-Kopien"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1941,56 +1920,40 @@ msgstr ""
 "mindestens Version %d.%d -- Wenn du Dolphin kürzlich aktualisiert hast, ist "
 "eventuell ein Neustart nötig, damit Windows den neuen Treiber erkennt."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Frühe Speicher-Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "ActionReplay-Code bearbeiten"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Einstellungen bearbeiten"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Lokale Überbrückungen bearbeiten"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Patch bearbeiten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Aktuelle Ansicht ändern"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Frame Buffer eingebunden"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Emu-Thread läuft bereits."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -2005,7 +1968,7 @@ msgstr ""
 "\n"
 "Im Zweifel, aktiviere stattdessen die virtuelle XFB-Emulation."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2022,121 +1985,92 @@ msgstr ""
 "\n"
 "Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulierte Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Emulationsstatus:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Aktiviert 3D-Effekte mittels Stereoskopie unter Verwendung der Nvidia 3D "
-"Vision-Technologie, sofern von deiner GPU unterstützt,.\n"
-"Verursacht möglicherweise Probleme.\n"
-"Funktioniert nur im Vollbildmodus.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "AR-Logging aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Blockvereinigung aktivieren"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Aktiviere Bounding Box Calculation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Aktiviere Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Cheats aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Dual Core aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Dual Core aktivieren (Beschleunigung)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Idle-Skipping aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Idle-Skipping aktivieren (Beschleunigung)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "MMU aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Progressiven Scan aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Bildschirmschoner aktivieren"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Lautsprecherdaten aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Breitbild aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Wireframe aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Anisotropische Filterung aktivieren.\n"
-"Verbessert die Texturenqualität bei schrägen Blickwinkeln.\n"
-"Kann bei einigen wenigen Spielen Fehler verursachen.\n"
-"\n"
-"Im Zweifel, wähle 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. "
-"(AN = Geschwindigkeit, AUS = Kompatibilität)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Blättern verwenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2149,7 +2083,7 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2161,34 +2095,25 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Aktiviere dies, um \"The Legend of Zelda: Twilight Princess\" zu "
-"beschleunigen. Für JEDES andere Spiel deaktivieren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Benutzerdefinierten Projection-Hack aktivieren"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Dolby Pro Logic II-Emulation wird aktiviert, indem 5.1 Surround verwendet "
-"wird. Nicht für OS X verfügbar."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Dolby Pro Logic II-Emulation wird aktiviert, indem 5.1 Surround verwendet "
-"wird. Funktioniert nur mit OpenAL Backend."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2201,7 +2126,7 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2209,7 +2134,11 @@ msgstr ""
 "Aktiviert die Speicher-Verwaltungseinheit, die für einige Spiele gebraucht "
 "wird. (AN = Kompatibilität, AUS = Geschwindigkeit)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2219,52 +2148,63 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Ende"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Englisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Verbesserungen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Namen für die neue Ansicht eingeben:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Eintrag %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Eintrag 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Gleich"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Fehler"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Fehler beim Laden der ausgewählten Sprache. Kehre nun zum Systemstandard "
 "zurück."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2273,7 +2213,7 @@ msgstr ""
 "Fehler: Nach \"%s\" wurde %d (0x%X), anstatt Save Marker %d (0x%X) gefunden. "
 "Spielstand laden wird abgebrochen..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2283,219 +2223,191 @@ msgstr ""
 "geladen. Spiele werden die Schriftart nicht korrekt darstellen oder "
 "abstürzen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Ausnahmeprotokoll - Zugriff unter Speicherplatz. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Ausführen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Beenden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Alle Wii-Spielstände exportieren"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Exportieren fehlgeschlagen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Datei exportieren"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Aufnahme exportieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Aufnahme exportieren..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Spielstand exportieren"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Wii-Spielstand exportieren (Experimentell)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Alle Spielstände exportieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Exportieren fehlgeschlagen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Spielstand exportieren als..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Externer Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Extra Parameter"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Alle Dateien extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Apploader extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOL extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Ordner extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Datei extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Partition extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrahiere %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extrahiere alle Dateien"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Extrahiere Verzeichnis"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extrahieren..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO-Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO-Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANKREICH"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST-Größe:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Verbindungsaufbau fehlgeschlagen!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Download der Codes fehlgeschlagen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Extrahieren nach %s ist fehlgeschlagen!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"DSP-ROM konnte nicht geladen werden:\t %s\n"
-"\n"
-"Diese Datei wird für DSP LLE benötigt.\n"
-"Sie ist nicht in Dolphin enthalten, da sie urheberrechtlich geschützte Daten "
-"beinhaltet.\n"
-"Benutze DSPSpy um die Datei von deiner echten Konsole zu dumpen.\n"
-"\n"
-"Du kannst die DSP HLE-Engine benutzen, welche keine ROM-Dumps benötigt.\n"
-"(Diese kannst du im Audio-Tab in den Einstellungen auswählen.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Bthprops.cpl konnte nicht geladen werden! Echte Wiimotes werden nicht "
-"funktionieren und Dolphin kann unerwartet abstürzen!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Hid.dll konnte nicht geladen werden! Echte Wiimotes werden nicht "
-"funktionieren und Dolphin kann unerwartet abstürzen!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Konnte %s nicht lesen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Fehler beim Lesen von banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Fehler beim Lesen des BK-Headers"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Konnte Block %d der Speicherdaten nicht lesen.\n"
 "Die Speicherkarte ist vermutlich unvollständig.\n"
-"FilePosition: %llx"
+"FilePosition:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2503,7 +2415,7 @@ msgstr ""
 "Konnte das Blockzuteilungtabellen-Backup nicht korrekt lesen\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2511,17 +2423,12 @@ msgstr ""
 "Konnte die Blockzuteilungtabellen nicht korrekt lesen\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Fehler beim Lesen von Daten aus Datei %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Fehler beim Lesen von Daten aus der Datei: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2529,7 +2436,7 @@ msgstr ""
 "Konnte das Backup-Verzeichnis nicht korrekt lesen\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2537,11 +2444,7 @@ msgstr ""
 "Konnte das Verzeichnis nicht korrekt lesen\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Fehler beim Lesen des Headers"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2549,50 +2452,35 @@ msgstr ""
 "Konnte den Header nicht korrekt lesen\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Fehler beim Lesen des Headers für Datei %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Fehler beim Lesen einer eindeutigen ID des Disc-Images."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Fehler beim Schreiben von BT.DINF nach SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Fehler beim Schreiben von bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Fehler beim Schreiben von Daten in Datei: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Fehler beim Schreiben eines Header für %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Schnell"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Schnelle Tiefenberechnung"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Schnelle Version der MMU. Funktioniert nicht mit allen Spielen."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2600,23 +2488,27 @@ msgstr ""
 "Fataler Desync. Wiedergabe wird abgebrochen. (Fehler in PlayWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo-Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Datei-Informationen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Datei enthielt keine Codes."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Datei zu .gci konvertiert."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2624,7 +2516,7 @@ msgstr ""
 "Datei konnte nicht geöffnet werden\n"
 "oder hat keine gültige Erweiterung"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2633,96 +2525,93 @@ msgstr ""
 "Datei besitzt die Erweiterung \"%s\",\n"
 "gültige Erweiterungen sind (.raw/.gcp)."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Diese Datei wird nicht als Speicherkarte erkannt."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Datei nicht komprimiert"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Unbekanter Öffnen-Modus : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Finde nächste"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Finde vorherige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Erster Block"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Prüfsummen korrigieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "16:9 erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "4:3 erzwingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "NTSC-J erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Texturfilterung erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Erzwingt Texturfilterung, auch wenn das emulierte Spiel dies explizit "
-"deaktiviert.\n"
-"Verbessert die Texturenqualität geringfügig aber verursacht Fehler in "
-"einigen Spielen.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n"
-"Dies kann Grafikfehler verursachen.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Erzwingt den NTSC-J-Modus um die japanische ROM-Schriftart zu verwenden.\n"
-"Deaktiviert benutzt Dolphin die Standardeinstellung NTSC-U und aktiviert "
-"diese Option automatisch wenn japanische Spiele gespielt werden."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2730,555 +2619,579 @@ msgstr ""
 "Als ASCII-Zeichensatz formatieren (NTSC/PAL)?\n"
 "Wähle 'Nein' für SJIS (NTSC-J)."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Port öffnen (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "%d Ergebnisse gefunden für '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "%x Spielstände gefunden."
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Bild"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Bild"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Einzelbildwiedergabe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Frame-Dumps verwenden FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Bildinfo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Bildbereich"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Frames ü&berspringen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Framelimit:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Bilder zum Aufzeichnen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Freies Umsehen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Französisch"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Von"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Vollbild"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Vollbildauflösung:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI-Datei(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Spiel-ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Spiel läuft bereits!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Spiel läuft nicht!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Spiel nicht gefunden!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Spielspezifische Einstellungen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Spieleinstellungen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube-Speicherdateien (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "GameCube &Pad-Einstellungen"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube-Speicherkarten (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube Pad-Einstellungen"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko-Codes"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Fehler beim Starten von GeckoCodes (CT%i CST%i) (%s)\n"
-"(Fehlerhafter Code oder der Code-Typ wird noch nicht unterstützt. Versuche "
-"den nativen Code-Handler zu benutzen, indem du die Datei Codehandler.bin in "
-"das Sys-Verzeichnis verschiebst und Dolphin neustartest.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Allgemein"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Deutsch"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Der Index ist größer als AR-Codelisten-Größe %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Grafikeinstellungen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Größer als"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Verbessert die Qualität von Texturen, die durch den Render-to-Texture-Effekt "
-"generiert werden, deutlich.\n"
-"Erhöhe die interne Auflösung um diesen Effekt zu verstärken.\n"
-"Reduziert die Leistung geringfügig und kann Abstürze verursachen (wenn auch "
-"unwahrscheinlich).\n"
-"\n"
-"Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Griechisch"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Grün"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Grün links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Grün rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitarre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Header-Prüfsumme fehlerhaft"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebräisch"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Höhe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Hilfe"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hi,\n"
-"\n"
-"Dolphin benötigt Mac OS X 10.7 oder besser.\n"
-"Leider besitzt du eine alte Version von OS X.\n"
-"Die letzte Dolphin-Version die OS X 10.6 unterstützt ist Dolphin 3.5\n"
-"Bitte upgrade auf 10.7 oder besser um die neueste Dolphin-Version zu "
-"benutzen.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hi,\n"
-"\n"
-"Dolphin benötigt einen CPU der SSE2-Erweiterungen unterstützt.\n"
-"Leider unterstützt Ihr CPU dies nicht, deshalb wird Dolphin nicht "
-"ausgeführt.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Verbergen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Mauszeiger verstecken"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Versteckt den Mauszeiger, wenn er sich über dem Emulationsfenster.\n"
-"\n"
-"Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Pos1"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Tastenkürzelbelegung"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Tastenkürzel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Ungarisch"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybride Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Versucht Daten von einem unbekannten Ticket zu bekommen: "
 "%08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Das Spiel versucht ein IOS oder einen Titel der nicht in "
-"deinem NAND-Dump verfügbar ist neu zu laden.\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Das Spiel versucht einen Titel der nicht in deinem NAND-"
+"Dump verfügbar ist neu zu laden.\n"
+"TitleID %016<PRIx64>.\n"
 "Dolphin wird sich jetzt wahrscheinlich aufhängen."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - Fehlerhaftes Ziel"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL-Einstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR-Zeiger"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR-Empfindlichkeit:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO-Details"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO-Verzeichnisse"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIEN"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Symbol"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Wenn aktiviert werden die Bounding Box-Register aktualisiert. Wird von den "
-"Paper Mario-Spielen verwendet."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Formatänderungen ignorieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignoriere jegliche Änderung am EFB-Format.\n"
-"Verbessert die Leistung in vielen Spielen ohne negative Auswirkungen, in "
-"einigen wenigen erzeugt es allerdings Grafikfehler.\n"
-"\n"
-"Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignoriert jegliche Anfragen der CPU von der EFB zu lesen oder zu schreiben.\n"
-"Verbessert die Leistung in einigen Spielen, kann aber einige spielabhängige "
-"oder grafische Effekte deaktivieren.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Spielstand importieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Wii-Spielstand importieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Importieren fehlgeschlagen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Importierte Datei hat die Erweiterung GSC, aber besitzt keinen korrekten "
-"Header."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Importierte Datei hat eine ungültige Länge"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Importierte Datei hat die Erweiterung SAV,\n"
-"aber besitzt keinen korrekten Header."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Im Spiel"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Framebegrenzung erhöhen"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Information"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Eingabe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Einfügen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SD-Karte einfügen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Name hier eingeben.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "WAD installieren"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Zum Wii-Menü hinzufügen"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesen "
-"noch nicht."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "WAD installieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Fehler bei der Unversehrtheitsprüfung"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Unversehrtheitsprüfung abgeschlossen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Unversehrtheitsprüfung abgeschlossen. Es wurden keine Fehler gefunden."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Unversehrtheitsprüfung für Partition %d fehlgeschlagen. Der Dump ist "
-"möglicherweise fehlerhaft oder wurde fehlerhaft gepatcht."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Benutzeroberfläche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Benutzeroberflächeneinstellungen"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Interner LZO-Fehler - Komprimierung fehlgeschlagen"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3287,103 +3200,106 @@ msgstr ""
 "Interner LZO-Fehler - Dekomprimierung fehlgeschlagen (%d) (%li, %li) \n"
 "Versuche diesen Stand nochmal zu laden."
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Interner LZO-Fehler - lzo_init() fehlgeschlagen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Interne Auflösung:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (SEHR langsam)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Ungültige Größe(%x) oder Magisches Wort (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Ungültiger Wert!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Ungültige bat.map oder Verzeichnis-Eintrag"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Ungültiger Ereignis-Typ %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Ungültige Datei"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Ungültige opening.bnr gefunden in GCM:\n"
-"%s\n"
-"Möglicherweise müssen Sie dieses Spiel neu dumpen."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Ungültige Aufnahmedatei"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Ungültige Suchparameter (kein Objekt ausgewählt)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Ungültiger Suchbegriff (konnte nicht zu Zahl konvertieren)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Ungültiger Suchbegriff (nur gerade Zeichenlängen werden unterstützt)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Ungültiger Stand"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italienisch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT-Recompiler (Empfohlen)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL-Recompiler (Experimentell)"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3393,64 +3309,75 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Fenster immer im Vordergrund"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Taste"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreanisch"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L-Taste"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Sprache:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Letzte %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latenz:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick links"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Zum Erkennen der Tastenkürzel linksklicken.\n"
-"Leertaste zum Löschen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3460,7 +3387,7 @@ msgstr ""
 "Mittlere Maustaste zum Löschen.\n"
 "Rechtsklick für weitere Optionen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3468,203 +3395,211 @@ msgstr ""
 "Links-/Rechtsklick für weitere Optionen.\n"
 "Mittlere Maustaste zum Löschen."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Kleiner als"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "FPS beschränken"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Laden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Lade benutzerdefinierte Texturen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Lade Status"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Lade Status zuletzt 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Lade Status zuletzt 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Lade Status zuletzt 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Lade Status zuletzt 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Lade Status zuletzt 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Lade Status zuletzt 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Lade Status zuletzt 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Lade Status zuletzt 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Stand aus Slot 1 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Lade Status aus Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Stand aus Slot 2 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Stand aus Slot 3 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Stand aus Slot 4 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Stand aus Slot 5 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Stand aus Slot 6 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Stand aus Slot 7 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Stand aus Slot 8 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Lade Status aus Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Stand laden..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wii-Systemmenü laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii-Systemmenü laden %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Benutzerdefinierte Texturen aus User/Load/Textures/<game_id>/ laden.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Voreinstellungswerte aus Hackvorlagen verfügbar"
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Log-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "FPS in Datei loggen"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Log-Typen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Gerenderte Frames pro Sekunde in User/Logs/fps.txt loggen.\n"
-"Verwenden Sie diese Funktion wenn Sie die Leistung von Dolphin messen "
-"wollen.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Logger-Ausgabe"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Die Verbindung zum Server wurde getrennt!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Mittlere Taste"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"Unterschiedliche MD5-Prüfsummen\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Speed Hack"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark-Dateien(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Main Stick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Hersteller-ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Hersteller:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3679,30 +3614,33 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
 msgstr ""
-"Die Speicherkarte enthält bereits einen Speicherstand für diesen Titel."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Speicherkarte ist bereits geöffnet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Speicherbyte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Speicherkarte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3710,7 +3648,7 @@ msgstr ""
 "Speicherkarten-Manager WARNUNG - Erstelle Backups vor der Benutzung. Dies "
 "sollte zwar behoben sein, aber könnte dennoch Fehler verursachen!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3727,39 +3665,54 @@ msgstr ""
 "%s\n"
 "Möchten Sie die alte Datei zum neuen Speicherort kopieren?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "Die Dateigröße der Speicherkarte stimmt nicht mit der Dateigrößenangabe im "
 "Header überein."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Sonstige Einstellungen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modifikator"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3771,20 +3724,24 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Schrift mit gleichmäßigen Zeichenabständen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3803,315 +3760,287 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplizieren"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "HINWEIS: Streamgröße entspricht nicht der tatsächlichen Datenlänge\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "Num Addition"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Start"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "Num Komma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "Num Entf"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "Num Division"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "Num Unten"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "Num Ende"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "Num Eingabe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "Num Gleich"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "Num Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "Num Einfg"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "Num Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "Num Multiplizieren"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "Num Bild-Ab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "Num Bild-Hoch"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "Num Rechts"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "Num Trennzeichen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "Num Leertaste"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "Num Minus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "Num Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "Num Hoch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Name:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Name: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI-Dateien(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Neue Suche"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Nächste Suche"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Nickname:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Kein Land (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Keine ISOs oder WADs gefunden"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Keine Audioausgabe"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Keine Banner-Datei für Titel %s gefunden."
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Keine Beschreibung vorhanden"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Kein Docking"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Keine Datei geladen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Keine freien Verzeichnis-Indexeinträge."
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Keine Aufnahmedatei"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Kein Spielstand-Ordner für Titel %s gefunden."
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Keine"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norwegisch"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Ungleich"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Nicht Festgelegt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Dies ist kein Wii-Spielstand oder das Lesen der Größenangabe im Dateiheader "
-"%x ist gescheitert."
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notizen"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notizen: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Hinweis"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Codeanzahl:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuck-Beschleunigung"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Objektreichweite"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Aus"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Bildschirmnachrichten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online-&Dokumentation"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Nur %d Blöcke verfügbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Öffnen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Beinhaltenden &Ordner öffnen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "&Wii-Spielstand-Ordner öffnen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Datei öffnen..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: Kann Kontext für Gerät %s nicht erstellen"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kann kein Sound-Gerät finden"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kann Gerät %s nicht öffnen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texturen-Dekodierer"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Texturen Dekodierer"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4119,21 +4048,18 @@ msgstr ""
 "Öffnet die Standard-Konfiguration für dieses Spiel (schreibgeschützt) in "
 "einem externen Texteditor."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Öffnet die benutzerdefinierten Überbrückungen in einem externen Texteditor."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Einstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Orange"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4144,347 +4070,326 @@ msgstr ""
 "Rechtsklicke und exportiere alle Spielstände\n"
 "und importiere sie auf eine neue Speicherkarte.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Andere"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Der andere Client wurde während des laufenden Spiels getrennt! NetPlay ist "
-"deaktiviert. Beenden Sie das Spiel manuell."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Ausgabe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Au&fnahme abspielen..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Bild-Ab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Bild-Auf"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parameter"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partition %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Partition existiert nicht: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Pfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pause am Ende des Films"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Lighting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfekt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektive %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Aufnahme abspielen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Start/Pause"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Spielbar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Wiedergabeoptionen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Spieler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Bitte bestätigen..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polnisch"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4:"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugiesisch"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugiesisch (Brasilianisch)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Nachbearbeitungseffekt:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Vorzeitiges Filmende in PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Vorzeitiges Filmende in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Vorzeitiges Filmende in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Voreinstellungen:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Vorh. Seite"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Vorheriger Wert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Druck"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Cache leeren"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Frage"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Beenden"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R-Taste"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSSLAND"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Reichweite"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Schreibgeschützter Modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Echt"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Echtes Balance Board"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Echte Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Echte Wiimotes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Aufnahme"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Eingabe aufzeichnen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Aufnahmeinformationen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Aufnahmeoptionen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rot"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rot links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rot rechts"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Verringert den durch Rasterisierung von 3D Grafiken entstandenen "
-"Treppeneffekt.\n"
-"Lässt das gerenderte Bild feiner aussehen.\n"
-"Verlangsamt die Emulationsgeschwindigkeit deutlich und verursacht "
-"gelegentlich Probleme.\n"
-"\n"
-"Im Zweifel, \"Keine\" auswählen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Spieleliste aktualisieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Entfernen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4494,244 +4399,320 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Im Hauptfenster rendern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Eingabe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revision:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
-"Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen: kann zum "
-"Einfrieren führen)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russisch"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "S&tand speichern"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Sicher"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Speichern"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "GCI speichern unter..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Ältesten Status speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Status speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "In Slot 1 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Speichere Status in Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "In Slot 2 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "In Slot 3 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "In Slot 4 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "In Slot 5 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "In Slot 6 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "In Slot 7 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "In Slot 8 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Speichere Status in Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Spiel speichern..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Komprimierte GCM/ISO speichern"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Aktuelle Perspektive speichern"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Dekomprimierte GCM/ISO speichern"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Spielstandfilm %s ist fehlerhaft, breche die Filmaufnahme ab..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Skalierte EFB-Kopie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Suche %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Suche nach ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Suche..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll-Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Suche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Suchfilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Unterordner durchsuchen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Suche derzeitiges Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Suche nach Hex-Wert:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Abschnitt %s nicht gefunden in SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Aufnahmedatei auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Wähle eine Wii-WAD zum Installieren aus."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Wähle ein Anzeigegerät aus.\n"
-"\n"
-"Im Zweifel, wähle den ersten Eintrag."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Speicherdatei zum Importieren auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Wähle unverankerte Fenster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Datei zum Laden auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Wii-Spielstand auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Status zum Laden auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Status zum Speichern auswählen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4749,274 +4730,292 @@ msgstr ""
 "\n"
 "Im Zweifel, wähle \"Auto\"."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Ausgewähltes Controller-Profil existiert nicht"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Ausgewählte Schriftart"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Wählt die Bildschirmauflösung für Vollbild aus.\n"
-"Sollte immer größer oder gleich zur internen Auflösung sein.\n"
-"Auswirkungen auf die Leistung sind vernachlässigbar.\n"
-"\n"
-"Im Zweifel, wähle deine Desktopauflösung,\n"
-"oder die höchste Auflösung die für dich funktioniert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Bestimmt welche Grafik-API intern verwendet wird.\n"
-"Direct3D 9 ist für gewöhnlich die schnellste. OpenGL ist allerdings genauer. "
-"Direct3D 11 liegt irgendwo dazwischen.\n"
-"Beachte, dass die Direct3D-Backends nur auf Windows verfügbar sind.\n"
-"\n"
-"Im Zweifel, verwende Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Bestimmt welche Grafik-API intern verwendet wird.\n"
-"Direct3D 9 ist für gewöhnlich die schnellste. OpenGL ist allerdings genauer. "
-"Direct3D 11 liegt irgendwo dazwischen.\n"
-"Beachte, dass die Direct3D-Backends nur auf Windows verfügbar sind.\n"
-"\n"
-"Im Zweifel, verwende OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Senden"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Position der Sensorleiste:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Trennzeichen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbisch"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Serieller Port 1 - Dies ist der Port den Geräte wie der Net-Adapter benutzen."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Als &Standard-ISO festlegen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Als Standard-Speicherkarte %c auswählen"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Der Index ist größer als die AR-Code-Listengröße %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Bestimmt die Latenzzeit (in ms): Höhere Werte können Knistergeräusche "
-"reduzieren. Nur OpenAL-Backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Einstellungen..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Einstellungsdatei konnte nicht erstellt werden"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Schütteln"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Kurzer Name:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Schultertasten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "&Konsole anzeigen"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "&Log anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "&Statusleiste anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "&Werkzeugleiste anzeigen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Standard anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Laufwerke anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "EFB-Kopie-Regionen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "FPS anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Frankreich anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "GameCube anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Eingabebildschirm anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Italien anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "JAP anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Korea anzeigen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Anzeigesprache:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Log-Einstellungen anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Plattformen anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Regionen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Statistiken anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Taiwan anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "USA anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Wad anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii anzeigen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Vor dem Beenden der Emulation bestätigen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Zeigt eine Hinweisfenster, wenn ein potentiell schwerwiegender Fehler "
-"auftritt.\n"
-"Deaktivieren kann störende und weniger kritische Nachrichten abschalten, "
-"aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung "
-"abstürzt."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Ersten Block anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Lag-Zähler anzeigen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Nachrichten im Emulationsfenster anzeigen.\n"
-"Diese Nachrichten beinhalten Speichervorgänge auf der Speicherkarte, Video-"
-"Backend- und CPU-Informationen und JIT-Cache-Leerungen."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Spielstandblöcke anzeigen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Spielstandkommentar anzeigen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Spielstandsymbol anzeigen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Spielstandtitel anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5028,84 +5027,82 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Unbekannte anzeigen"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Verschiedene Statistiken anzeigen.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Seitwärts gerichtete Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chinesisch (Vereinfacht)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Größe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "BIOS überspringen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "DCBZ-Leerung überspringen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "EFB-Zugang von CPU überspringen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Beschleunigt EFB zu RAM-Kopien geringfügig auf Kosten der "
-"Emulationsgenauigkeit.\n"
-"Verbessert auch gelegentlich die Bildqualität.\n"
-"Wenn Fehler auftreten, erhöhe die Texturen-Cache-Genauigkeit oder "
-"deaktiviere diese Option.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Software-Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5118,154 +5115,173 @@ msgstr ""
 "Möchtst du wirklich Software Rendering aktivieren? Im Zweifel, wähle \"Nein"
 "\"."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Audio-Einstellungen"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Sound-Backend %s ist ungültig."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Erstellen des Sound-Buffers fehlgeschlagen: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Leertaste"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Lautsprecher-Lautstärke"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Bestimmt die Auflösung in der gerendert wird. Eine hohe Auflösung wird die "
-"Bildqualität deutlich verbessern aber geht auch sehr auf die Leistung und "
-"kann in bestimmten Spielen Fehler verursachen.\n"
-"\"Vielfaches von 640x528\" ist etwas langsamer als \"Fenstergröße\" aber "
-"verursacht weniger Fehler. Im Allgemeinen gilt, je geringer die interne "
-"Auflösung, desto besser die Leistung.\n"
-"\n"
-"Im Zweifel, wähle 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Disc-Übertragungsrate beschleunigen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Quadrat-Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standard-Controller"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "&NetPlay starten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "&Aufnahme starten"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Aufnahme starten"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Status"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Status"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Lenkrad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Stopp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Speichert EFB-Kopien in GPU-Texturobjekten.\n"
-"Dies ist nicht so genau, funktioniert aber gut genug für die meisten Spiele "
-"und hat einen großen Geschwindigkeitsvorteil gegenüber EFB zu RAM.\n"
-"\n"
-"Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "An Fenstergröße anpassen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Klimpern"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Subtrahieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Die Datei wurde erfolgreich nach %s exportiert"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Die gespeicherte Datei wurde erfolgreich importiert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Schwedisch"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Schwingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "GPU-Thread synchronisieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5273,81 +5289,110 @@ msgstr ""
 "Synchronisiert die GPU- und CPU-Threads um willkürliche Aufhänger mit Dual "
 "Core zu vermeiden. (AN = Kompatibilität, AUS = Geschwindigkeit)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Systemsprache:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS-Eingabe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Nebeneinander öffnen"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tisch links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tisch rechts"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Screenshot erstellen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Testen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textur"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Texturen-Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Texturenformat-Überlagerung"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "Die WAD-Datei wurde erfolgreich installiert"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Die Adresse ist ungültig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Die Prüfsumme wurde erfolgreich korrigiert"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5356,7 +5401,7 @@ msgstr ""
 "Die Datei %s existiert bereits.\n"
 "Soll diese Datei ersetzt werden?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5365,48 +5410,35 @@ msgstr ""
 "Konnte die Datei %s nicht zum Schreiben öffnen. Bitte überprüfe ob sie "
 "bereits in einem anderen Programm geöffnet ist."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht "
 "geschrieben."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Die angegebene Datei (%s) existiert nicht"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Der Name darf nicht leer bleiben."
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Der Name darf nicht das Zeichen \",\" enthalten"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Der resultierende entschlüsselte AR-Code enthält keine Zeilen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Je sicherer dies angepasst wird, desto seltener verpasst der Emulator Textur-"
-"Updates vom RAM.\n"
-"\n"
-"Im Zweifel, den Wert ganz rechts wählen."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"Der Spielstand, den du kopieren möchtest, hat eine ungültige Dateigröße."
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5414,37 +5446,49 @@ msgstr ""
 "Die ausgewählte Sprache wird von Ihrem System nicht unterstützt. Kehre nun "
 "zum Systemstandard zurück."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 "Die NetPlay-Version von Server und Client sind  nicht zueinander kompatibel!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Der Server ist voll!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Der Server meldet: Das Spiel läuft derzeit!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Der Server sendete einen unbekannten Fehler!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Die ausgewählte Datei \"%s\" existiert nicht"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Der eingegebene Wert ist ungültig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Design:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5452,7 +5496,7 @@ msgstr ""
 "Es muss ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist "
 "wahrscheinlich unvollständig."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5461,7 +5505,7 @@ msgstr ""
 "Grau hinterlegte Kästchen bedeuten, dass die globalen Einstellungen benutzt "
 "werden."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5469,125 +5513,163 @@ msgstr ""
 "Dieser Action-Replay-Simulator unterstützt keine Codes, die Action Replay "
 "selbst verändern können."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Diese Einstellung erlaubt es dir, die Kamera im Spiel zu bewegen.\n"
-"Halte die rechte Maustaste gedrückt und bewege die Maus um die Kamera zu "
-"schwenken, halte die linke Maustaste gedrückt um sie zu bewegen.\n"
-"Halte SHIFT und drücke eine der WASD-Tasten um die Kamera eine bestimmte "
-"Entfernung zu bewegen (SHIFT+0 um sie schneller zu bewegen und SHIFT+9 um "
-"sie langsamer zu bewegen). Drücke Shift+R um die Kamera zurückzusetzen.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Beschränkt die Spielgeschwindigkeit auf die angegebene Anzahl von Bildern "
-"pro Sekunde (Volle Geschwindigkeit entspricht 60 für NTSC und 50 für PAL). "
-"Alternativ kann DSP benutzt werden um den Ton zu drosseln (kann je nach "
-"Spiel Knistern beheben aber auch durchgehendes Rauschen verursachen)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Teilt die Video- und CPU-Threads, damit diese auf unterschiedlichen Kernen "
-"laufen können.\n"
-"Bewirkt eine wesentliche Verbesserung der Geschwindigkeit auf PCs mit mehr "
-"als einem Kern,\n"
-"kann aber gelegentlich Abstürze/Fehler verursachen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Erlaubt manuelles Editieren der INI-Konfigurationsdatei"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Schwelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Neigung"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Titel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Zu"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Alle Log-Typen umschalten"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Seitenverhältnis umschalten"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "EFB-Kopien umschalten"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Nebel umschalten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Vollbildmodus umschalten"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "IR umschalten"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Oben"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chinesisch (Traditionell)"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Versuchte einen unbekannten Dateityp zu laden."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Schultertasten"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Versuchte eine ungültige SYSCONF zu lesen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5595,41 +5677,24 @@ msgstr ""
 "Versuchte eine ungültige SYSCONF zu lesen\n"
 "Wiimote BT-IDs sind nicht verfügbar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Türkisch"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Turntable"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Typ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP-Port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP-Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "UNBEKANNT"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNBEKANNT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5637,205 +5702,180 @@ msgstr ""
 "Konnte Patch aus eingegebenen Werten nicht erstellen.\n"
 "Eintrag nicht verändert."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Konnte Zeile %lu des eingegebenen AR-Codes nicht als gültigen, "
+"Konnte Zeile %u des eingegebenen AR-Codes nicht als gültigen, "
 "verschlüsselten oder entschlüsselten Code parsen. Prüfe, dass du ihn richtig "
 "eingegeben hast.\n"
 "Möchtest du diese Zeile ignorieren und mit dem Parsen fortfahren?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Undefiniert %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Status Laden rückgängig machen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Speicherstand rückgängig machen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Unerwarteter 0x80 Aufruf? Abbruch..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Unbekannter DVD-Befehl %08x - fataler Fehler"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Unbekannter Befehl 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Unbekannter Eintragstyp %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Unbekannte Meldung mit ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Hoch"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Update"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Aufrechte Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "EuRGB60 Modus (PAL60) verwenden"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Verwende gesamten Bildschirm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Hex verwenden"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Warnmeldungen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Benutzt einen weniger genauen Algorithmus um Tiefenwerte zu berechnen.\n"
-"Verursacht Fehler in einigen Spielen, kann aber einen ordentlichen "
-"Geschwindigkeitsvorteil bringen.\n"
-"\n"
-"Im Zweifel aktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Verwendet mehrere Threads um Texturen zu dekodieren.\n"
-"Kann die Emulation beschleunigen (vor allem auf CPUs mit mehr als zwei "
-"Kernen.)\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Benutzt unsichere Operationen um Vertex-Streaming in OpenGL zu "
-"beschleunigen. Auf unterstützten GPUs sind keine Probleme bekannt, ansonsten "
-"können aber schwerwiegende Stabilitätsprobleme und Grafikfehler auftreten.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Wenn eine Shaderzusammenstellung versagt wird für gewöhnlich eine "
-"Fehlermeldung angezeigt.\n"
-"Diese Meldung kann allerdings mit dieser Option übersprungen werden um "
-"unterbrechungsfreies Spielen zu gewährleisten.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Hilfsmittel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Speed-Hack"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Wert"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Wert:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Wert: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Ausführlichkeit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Vertex-Streaming-Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD-Installation fehlgeschlagen: Konnte %s nicht erstellen"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD-Installation fehlgeschlagen: Fehler bei der Ticket-Erstellung"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5847,25 +5887,27 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Warnungen"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Warnung - Starte DOL im falschen Konsolenmodus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Warnung - Starte ELF im falschen Konsolenmodus!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Warnung - Starte ISO im falschen Konsolenmodus!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5876,7 +5918,7 @@ msgstr ""
 "%s\n"
 "Wollen Sie fortfahren?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5889,7 +5931,7 @@ msgstr ""
 "besitzen.\n"
 "Möchtest du fortfahren?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5901,7 +5943,15 @@ msgstr ""
 "einen anderen Spielstand bevor du fortfährst oder lade diesen Spielstand "
 "nicht im schreibgeschützen Modus."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5913,7 +5963,7 @@ msgstr ""
 "oder lade diesen Spielstand nicht im schreibgeschützen Modus, andernfalls "
 "könnten Desyncs auftreten."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5949,178 +5999,165 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - Konnte Datei nicht öffnen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Breitbild-Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Breite"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii-Konsole"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii-NAND-Root:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii-Speicherdaten (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Konnte die Datei nicht lesen"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote angeschlossen"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote-Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote-Einstellungen"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Kontextmenü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Rechts"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Zeilenumbruch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Arbeite..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Schreibe Speicherkarten (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "In Konsole ausgeben"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "In Debugger ausgeben"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "In Datei ausgeben"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "In Fenster ausgeben"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice fehlgeschlagen: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Initialisierung von XAudio2 gescheitert: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Erstellung von XAudio2 Master Voice fehlgeschlagen: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Gelb"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Du verwendest eine freie DSP-ROM vom Dolphin-Team.\n"
-"Alle Wii- und die meisten GameCube-Spiele werden problemlos funktionieren, "
-"aber die GBA/IPL/CARD-UCodes nicht.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Du verwendest eine veraltete, freie DSP-ROM vom Dolphin-Team.\n"
-"Nur Spiele die den Zelda-UCode verwenden, werden korrekt funktionieren.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Du musst ein Spiel auswählen!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Du musst einen Namen eingeben!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Du musst eine gültige Dezimal-, Hexadezimal- oder Oktalzahl eingeben."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Du musst einen gültigen Profilnamen eingeben!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6130,7 +6167,7 @@ msgstr ""
 "Möchtest du die Emulation beenden um das Problem zu beheben?\n"
 "Wenn du \"Nein\" wählst, könnte die Audiowiedergabe verzerrt klingen."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6138,36 +6175,36 @@ msgstr ""
 "Ihre GCM/ISO-Datei scheint ungültig zu sein (Land ungültig).\n"
 "Mit PAL-Region fortfahren?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Deine SYSCONF-Datei hat die falsche Dateigröße.\n"
-"Erwartet wurde eine Größe von 0x%04x (aber deine ist 0x%04llx).\n"
+"Erwartet wurde eine Größe von 0x%04x (aber deine ist 0x%04<PRIx64>).\n"
 "Soll eine neue Datei generiert werden?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP-Hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3-Code wird nicht unterstützt"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Der Zero-Code ist Dolphin unbekannt: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ warte ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6179,78 +6216,30 @@ msgstr ""
 "\n"
 "Im Zweifel deaktiviert lassen."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Benutzerdefiniert]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTELL]\n"
-"Versucht die Emulationsgeschwindigkeit zu beschleunigen indem es die "
-"Texturendekodierung auf die GPU mit OpenCL-Framework auslagert.\n"
-"Verusacht jedoch momentan Texturenfehler in verschiedenen Spielen. Es ist "
-"ebenfalls in den meisten Fällen langsamer als die reguläre "
-"Texturendekodierung der CPU.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTELL]\n"
-"Beschleunigt die Emulation ein wenig indem Displaylisten in den Cache "
-"geladen werden.\n"
-"Verursacht jedoch möglicherweise Probleme.\n"
-"\n"
-"Im Zweifel deaktiviert lassen."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "Apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "Unbekannte Funktion %d (%d erwartet)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "Unbekannte Meldung erhalten"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute gab beim Anwendungsstart -1 zurück!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar-Korrektur:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear-Korrektur:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| ODER"
diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot
index 27a4ececa1..66cbee9e60 100644
--- a/Languages/po/dolphin-emu.pot
+++ b/Languages/po/dolphin-emu.pot
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,434 +18,479 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
+msgid "%s was not a directory, moved to *.original"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr ""
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -454,786 +500,837 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr ""
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
+msgid "Could not save %s."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1246,265 +1343,277 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1513,231 +1622,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1746,56 +1837,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1804,7 +1879,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1814,108 +1889,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1923,7 +1982,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1931,28 +1990,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1960,1330 +2016,1431 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3292,35 +3449,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3331,37 +3492,52 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3369,20 +3545,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3393,909 +3573,950 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr ""
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4306,244 +4527,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4551,74 +4819,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4626,641 +4902,740 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5268,25 +5643,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr ""
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5294,7 +5671,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5303,7 +5680,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5311,7 +5688,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5319,7 +5704,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5338,212 +5723,204 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5551,64 +5928,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/el.po b/Languages/po/el.po
index 1e08f1b8b6..dd5d0340ea 100644
--- a/Languages/po/el.po
+++ b/Languages/po/el.po
@@ -1,18 +1,20 @@
-# Translation of dolphin-emu.pot to Greek
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
+# firespin <dartworldgr@hotmail.com>, 2014
 # Gpower2 <gpower2@yahoo.com>, 2011
-# link_to_the_past <kostamarino@gmail.com>, 2013
-# Godfath3r <galatsanosp@gmail.com>, 2013
+# link_to_the_past <kostamarino@gmail.com>, 2013-2015
+# Panos <galatsanosp@gmail.com>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-18 14:27+0000\n"
-"Last-Translator: link_to_the_past <kostamarino@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/el/)\n"
 "Language: el\n"
@@ -21,21 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(πολλά αποτελέσματα για να εμφανιστούν)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Παιχνίδι : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,45 +58,96 @@ msgstr ""
 "Το \"%s\" δεν υπάρχει.\n"
 "Δημιουργία καινούριας Memcard 16MB;"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+"Το \"%s\" απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι "
+"φθαρμένο."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "Το \"%s\" είναι ήδη συμπιεσμένο! Δε γίνεται να συμπιεστεί περαιτέρω."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "Το \"%s\" είναι ένα μη έγκυρο αρχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sΑντιγραφή%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d δείγματα"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d δείγματα (επίπεδο ποιότητας %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (Δίσκος %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s υπάρχει ήδη, θέλετε αντικατάσταση;"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι φθαρμένο."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -91,7 +156,7 @@ msgstr ""
 "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n"
 " Το μέγεθος του αρχείου της κάρτας δεν είναι έγκυρο (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -100,7 +165,7 @@ msgstr ""
 "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n"
 " Το μέγεθος της κάρτας δεν είναι έγκυρο (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -110,380 +175,339 @@ msgstr ""
 "το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας "
 "μνήμης (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "αποτυχία ανοίγματος %s"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s απέτυχε: kr=%x"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "Το %s είναι ένα αρχείο με 0 byte"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται να συμπιεστεί περαιτέρω."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
-"Το %s είναι πολύ μεγάλο για όνομα αρχείου, ο μέγιστος αριθμός χαρακτήρων "
-"είναι 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
+#, c-format
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sΔιαγραφή%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sΕξαγωγή GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sΕισαγωγή GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Ελεύθερα μπλοκ; %u Ελεύθερες Θέσεις Φακέλων"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Περί..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Εκκίνηση από τον οδηγό DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "&Ρυθμίσεις Ήχου"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Σημεία Διακοπής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Εύρεση ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr "&Διαχειριστής Cheat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&Ρυθμίσεις DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "&Ρυθμίσεις Χειριστηρίων"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Διαγραφή ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Διαγραφή επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Εξομοίωση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Αρχείο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Προώθηση ανά Καρέ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Πλήρης Οθόνη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Ρυθμίσεις Γραφικών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Βοήθεια"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Ρυθμίσεις Πλήκτρων Συντόμευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Φόρτωση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Διαχειριστής Καρτών Μνήμης (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Μνήμη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "&Ταινία"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Άνοιγμα..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Παύση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Αναπαραγωγή"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Ιδιότητες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Μόνο Για Ανάγνωση (Εγγραφής)"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr "&Μόνο Για Ανάγνωση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Ανανέωση Λίστας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Καταχωρητές"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Επανεκκίνηση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Ήχος"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Διακοπή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Εργαλεία"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Βίντεο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Προβολή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Ρυθμίσεις Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "&Ιστοσελίδα"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "(Σφάλμα: Αποσύνδεση)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr "(Σφάλμα: Το Dolphin είναι πολύ παλιό)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(ΑΓΝΩΣΤΟ)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr "(Σφάλμα: Δεν Αποκρίνεται)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr "(Σφάλμα: Άγνωστο)"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(ανενεργό)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Αρχική (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Αρχική (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Αρχική (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Αρχική (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Αρχική (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Αρχική (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8-bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Εισάγετε όνομα εδώ>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Δε βρέθηκαν αναλύσεις>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Τίποτα>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Πατήστε Πλήκτρο>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Γλώσσα Συστήματος>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Συστήματος>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Ένα παράθυρο NetPlay είναι ήδη ανοιχτό!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Αυτή τη στιγμή δεν εκτελείται κάποιο παιχνίδι."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Δεν εντοπίστηκε υποστηριζόμενη συσκευή bluetooth.\n"
-"Θα πρέπει να συνδέσετε χειροκίνητα τα wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ΠΡΟΣΟΧΗ:\n"
-"\n"
-"Η λειτουργία NetPlay λειτουργεί σωστά μόνο με τις παρακάτω ρυθμίσεις:\n"
-" - Ενεργοποίηση Διπλού Πυρήνα [ΑΝΕΝΕΡΓΟ]\n"
-" - Η Μηχανή Εξομοίωσης DSP πρέπει να είναι η ίδια σε όλους τους "
-"υπολογιστές!\n"
-" - DSP σε Ξεχωριστό Νήμα [ΑΝΕΝΕΡΓΟ]\n"
-" - Ο Περιορισμός των Καρέ να ΜΗΝ έχει οριστεί σε [Ήχο]\n"
-"\n"
-"Όλοι οι παίκτες πρέπει να έχουν την ίδια έκδοση και ρυθμίσεις του Dolphin.\n"
-"Όλες οι κάρτες μνήμης πρέπει να είναι ίδιες ανάμεσα στους παίκτες ή "
-"απενεργοποιημένες.\n"
-"Η υποστήριξη Wiimote δεν έχει ακόμα υλοποιηθεί!\n"
-"\n"
-"Ο host θα πρέπει να έχει την επιλεγμένη TCP port ανοιχτή/προωθημένη!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Κωδικοί AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Σχετικά με το Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Επιτάχυνση"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Ακρίβεια:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Εξομοιώνει με ακρίβεια τα EFB αντίγραφα.\n"
-"Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες "
-"του gameplay.\n"
-"\n"
-"Αν δεν είστε σίγουροι, επιλέξτε EFB Αντίγραφα σε Υφή."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Ενέργεια"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -498,7 +522,7 @@ msgstr ""
 "Προβληματικός Κωδικός:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -506,7 +530,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) στην "
 "Προσθήκη Κωδικού (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -515,7 +539,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Fill "
 "και Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -524,7 +548,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Ram "
 "Write και Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -533,12 +557,12 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Write "
 "To Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Σφάλμα Action Replay: Μη έγκυρη τιμή (%08x) σε Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -548,160 +572,142 @@ msgstr ""
 "έχουν υλοποιηθεί (%s)\n"
 "Δεν χρειάζονται master codes.  Μην χρησιμοποιείτε master codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Σφάλμα Action Replay: μη έγκυρη γραμμή κώδικα AR: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: Μη έγκυρο μέγεθος %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Μη έγκυρος Normal Code Type %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Code %i: Μη έγκυρο subtype %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: Μη έγκυρο Subtype %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Προσαρμογέας:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Προσθήκη Κωδικού ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Προσθήκη Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Προσθήκη νέου pane"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Προσθήκη..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Διεύθυνση :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την "
 "ενεργοποίηση των κουμπιών."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για Προχωρημένους"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Όλα τα αρχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "Όλα τα αρχεία GameCube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Όλα τα αρχεία Gamecube GCM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Όλα τα αρχεία Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Όλα τα αρχεία (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Ανάλυση"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Γωνεία"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Ανισοτροπικό Φιλτράρισμα:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Εξομάλυνση Ορίων:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Ο Apploader έχει λάθος μέγεθος... είναι πράγματι apploader;"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Ο Apploader απέτυχε να φορτωθεί από αρχείο"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -711,16 +717,12 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε (ανενεργό)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Αραβικά"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το \"%s\";"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -728,56 +730,83 @@ msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτά τα αρχεία;\n"
 "Θα εξαφανιστούν για πάντα!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για "
 "πάντα!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (πειραματικός)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64 JIT (πειραματικός)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Αναλογία Οθόνης:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Τουλάχιστον ένα pane πρέπει να μένει ανοιχτό."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Ήχος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Backend Ήχου:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Ρυθμίσεις Ήχου"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Αυστραλία"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "Συγγραφείς"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Αυτόματα"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Αυτόματα (Μέγεθος Παραθύρου)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Αυτόματη Προσαρμογή Μεγέθους Παραθύρου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -788,134 +817,150 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP Καταχωρητές"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Πίσω"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Backend Ρυθμίσεις"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Χειρισμός με Ανεστίαστο Παραθ."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Πίσω"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Μη Έγκυρη Κεφαλίδα Αρχείου"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Σανίδα Ισορροπίας"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Εικονίδιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Λεπτομέρειες Εικονιδίου:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Εικονίδιο:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Βασικές"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Βασικές Ρυθμίσεις"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Μπάσο"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Μπαταρία"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Αποτυχία ελέγχου checksum για τον BAT"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Μπλοκ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Μπλε"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Αριστερό Μπλε"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Δεξί Μπλε"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr "Πλήρης Οθόνη Χωρίς Περιθώρια  "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Βάση"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Δεσμευμένοι Χειρισμοί: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Χαλασμένο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Εύρεση"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Εύρεση φακέλου για προσθήκη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Εύρεση φακέλου ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Εύρεση φακέλου προορισμού"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Κουμπιά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -923,120 +968,100 @@ msgstr ""
 "Προσπελάστε τον καθαρισμό της cache δεδομένων από την εντολή DCBZ. "
 "Προτείνεται συνήθως να αφήνεται αυτή η επιλογή απενεργοποιημένη."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Stick Κάμερας "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "Stick Κάμερας"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Μηχανή Εξομοίωσης CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "Ρυθμίσεις CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Υπολογίζει τον φωτισμό των 3D γραφικών ανά pixel αντί ανά vertex.\n"
-"Μειώνει την ταχύτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n"
-"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μπορεί να προκαλέσει ορισμένες "
-"φορές προβλήματα.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: Κρίσιμο Σφάλμα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Αποτυχία ανοίγματος %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-"Δεν μπορεί να γίνει κατάργηση καταχώρησης συμβάντων όταν ορισμένα εκκρεμούν."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Αδυναμία χρήσης αυτού του αρχείου ως κάρτα μνήμης.\n"
-"%s\n"
-"δεν είναι έγκυρο αρχείο κάρτας μνήμης gamecube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Αδυναμία χρήσης αυτού του αρχείου σαν κάρτα μνήμης.\n"
-"Προσπαθείτε να χρησιμοποιήσετε το ίδιο αρχείο σε δύο slot;"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Καταλανικά"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Κέντρο"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "Αλλαγή &Δίσκου"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Αλλαγή &Δίσκου..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Αλλαγή Δίσκου"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Αλλαγή Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1044,75 +1069,63 @@ msgstr ""
 "Αλλαγή της γλώσσας περιβάλλοντος.\n"
 "Απαιτεί επανεκκίνηση."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Αλλαγή προσήμου της παραμέτρου zFar (μετά την διόρθωση)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Αλλαγή προσήμου της παραμέτρου zNear (μετά την διόρθωση)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Συνομιλία"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Κωδικός Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "Διαχειριστής Cheat"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Αναζήτηση Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Διαχείριση Cheat"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Έλεγχος Ακεραιότητας Κατάτμησης"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Ελέγξτε για ενημερώσεις:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Έλεγχος ακεραιότητας..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Κινέζικα (Απλοποιημένα)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Κινέζικα (Παραδοσιακά)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Επιλέξτε έναν φάκελο ρίζας DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Επιλέξτε έναν φάκελο ρίζας NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Επιλέξτε ένα προεπιλεγμένο ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Επιλέξτε έναν φάκελο για προσθήκη"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Επιλέξτε ένα αρχείο για άνοιγμα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Επιλέξτε μια κάρτα μνήμης:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1120,27 +1133,27 @@ msgstr ""
 "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που "
 "απαρτίζονται μόνο από φακέλους)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Επιλέξτε τον φάκελο προς αποσυμπίεση"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Κυκλικό Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Κλασικό Χειριστήριο"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Καθάρισ."
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1148,184 +1161,230 @@ msgstr ""
 "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει "
 "απενεργοποιηθεί. Θα πρέπει να σταματήσετε χειροκίνητα το παιχνίδι."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Ρυ&θμίσεις..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Πληροφορίες Κωδικού"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Κωδικός: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Εντολή"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Σχόλιο:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Συμπίεση ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Συμπίεση επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Συμπίεση ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Ρυθμίσεις Χειριστηρίου"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Ρυθμίσεις Χειριστηρίων"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Γενικές Ρυθμίσεις..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Επιβεβαίωση Αντικατάστασης Αρχείου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Επιβεβαίωση Διακοπής"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Σύνδεση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Σύνδεση Σανίδας Ισορροπίας"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Σύνδεση Πληκτρολογίου USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Σύνδεση Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Σύνδεση Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Σύνδεση Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Σύνδεση Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Σύνδεση Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Σύνδεση Wiimotes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "Συνδεδεμένο"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Γίνεται Σύνδεση..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Κονσόλα"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Συνεχής Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Χειριστήριο"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "Ρυθμίσεις Χειριστηρίων"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Χειριστήρια"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Μετατροπή σε GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "Αντιγραφή"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Η αντιγραφή απέτυχε"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Αντιγραφή στην κάρτα μνήμης %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Πυρήνας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Αποτυχία δημιουργίας %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Αποτυχία εκκίνησης backend %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Δεν μπόρεσε να γίνει ανάγνωση \"%s\".  Δεν υπάρχει δίσκος στον οδηγό, ή δεν "
-"είναι ένα αντίγραφο εικόνας GC/Wii.\n"
-" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μπορούν να αναγνωστούν "
-"από τους περισσότερους PC DVD οδηγούς."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Αποτυχία αναγνώρισης του αρχείου ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Αποτυχία αποθήκευσης του %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1346,11 +1405,19 @@ msgstr ""
 "Άμα ναι, τότε μπορεί να χρειαστεί να ορίσετε ξανά την θέση της κάρτας μνήμης "
 "στις ρυθμίσεις."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Αδυναμία εύρεσης εντολής ανοίγματος για την επέκταση 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1358,38 +1425,46 @@ msgstr ""
 "Αδυναμία εκκίνησης του πυρήνα.\n"
 "Ελέξγτε τις ρυθμίσεις σας."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Πλήθος:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Δημιουργία Κωδικού AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Δημιουργία νέας οπτικής"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Δημιουργός: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Κρίσιμο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Κόψιμο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1399,201 +1474,191 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Ο τρέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Προσαρμοζόμενο Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Ρυθμίσεις Προσαρμοζόμενου Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Προσαρμόστε ορισμένες παραμέτρους Ορθογραφικής Προβολής."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Τσέχικα"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Ψηφιακό Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "Ήχος (DSP)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Μηχανή Εξομοίωσης DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE εξομοίωση (γρήγορη)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (αργή)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Ρυθμίσεις ήχου (DSP)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE σε Ξεχωριστό Νήμα"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Ρίζα DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Σφάλμα Τερματισμού: αποτυχία ανάγνωσης από τον τομέα"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-"DVDLowUnencryptedRead - Σφάλμα Τερματισμού: αποτυχία ανάγνωσης από τον τομέα"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Χαλάκι Χορού"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Μέγεθος Δεδομένων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Ημερομηνία:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Αρχεία Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Νεκρή Ζώνη"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Δεκαδικός"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Αποσυμπίεση ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Αποσυμπίεση επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Γίνεται αποσυμπίεση ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr "Μείωση Βάθους"
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Μείωση Ορίου Καρέ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "Μείωση IR"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Προεπιλ."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Προεπιλεγμένο ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Προεπιλεγμένη γραμματοσειρά"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Διαγραφή Αποθήκευσης"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Διαγραφή του υπάρχοντος αρχείου '%s';"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr "Βάθος:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "Περιγραφή:"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Ανίχνευση"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Εντοπίστηκε προσπάθεια ανάγνωσης περισσότερων δεδομένων από το DVD από όσα "
-"χωράνε μέσα στο buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Συσκευή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Ρυθμίσεις Συσκευής"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "Η συσκευή δεν βρέθηκε"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1601,20 +1666,23 @@ msgstr ""
 "Το checksum του Καταλόγου απέτυχε\n"
 " καθώς και το checksum του εφεδρικού Καταλόγου απέτυχε"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "Απενεργοποίηση Bounding Box"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Απενεργοποίηση Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Απενεργοποίηση Ομίχλης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1628,294 +1696,213 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Απενεργοποιεί την εξομοίωση των EFB αντιγραφών.\n"
-"Χρησιμοποιούνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν "
-"και επιλέγοντάς το αυξάνονται κατά πολύ οι επιδόσεις, σχεδόν πάντα "
-"προκαλούνται προβλήματα.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Απενεργοποιεί την εξομοίωση ενός χαρακτηριστικού του υλικού που ονομάζεται "
-"destination alpha pass, και το οποίο χρησιμοποιείται από πολλά παιχνίδια για "
-"διάφορα γραφικά εφέ.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Δίσκος"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Σφάλμα Ανάγνωσης Δίσκου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Οθόνη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Προβολή των χειρισμών που διαβάζονται από τον εξομοιωτή.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II αποκωδικοποιητής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Το Dolphin είναι ένας Gamecube/Wii εξομοιωτής, ο οποίος\n"
-"γράφτηκε αρχικά από τον F|RES και τον ector.\n"
-"Σήμερα το Dolphin είναι ένα έργο ανοιχτού κώδικα με πολλούς\n"
-"να συνεισφέρουν, πάρα πολλούς για να αναφερθούν εδώ.\n"
-"Εάν σας ενδιαφέρει, απλά ελέγξτε την σελίδα του έργου στο\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Ιδιαίτερες ευχαριστίες  στον Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 και Hotquik για το\n"
-"reverse engineering και τα docs/demos.\n"
-"\n"
-"Ένα μεγάλο ευχαριστώ στον Gilles Mouchard του οποίου ο\n"
-" Microlib PPC εξομοιωτής έδωσε έναυσμα στην ανάπτυξη.\n"
-"\n"
-"Ευχαριστώ τον Frank Wille για τον PowerPC disassembler,\n"
-"τον οποίο ο or9 και εμείς τροποποιήσαμε για να συμπεριληφθούν \n"
-"λεπτομέρειες για τον Gekko.\n"
-"\n"
-"Ευχαριστούμε τους hcs/destop για τον GC ADPCM decoder.\n"
-"\n"
-"Εμείς δεν συνδεόμαστε με την Nintendo με οποιονδήποτε τρόπο.\n"
-"Gamecube και Wii είναι εμπορικά σήματα της Nintendo.\n"
-"Ο εξομοιωτής είναι για εκπαιδευτικούς σκοπούς μόνο\n"
-"και δεν πρέπει να χρησιμοποιηθεί για να παίξετε παιχνίδια \n"
-"τα οποία δεν κατέχετε νόμιμα."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Ρυθμίσεις Γραφικών Dolphin %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Ιστοσελίδα του &Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Ρυθμίσεις Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Ρυθμίσεις Εξομοιωμένου Dolphin Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Ρυθμίσεις Dolphin GCPad"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr "Πλήκτρα Συντόμευσης Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr "Dolphin NetPlay"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Ταινίες (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Ρυθμίσεις Dolphin Wiimote"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin στο &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση "
-"αρχείων..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ "
-"εδώ για να εμφανιστούν όλα τα παιχνίδια..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Το Dolphin δεν μπόρεσε να ολοκληρώσει την ζητούμενη ενέργεια."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Διπλασιάζει την συχνότητα του ρολογιού της εξομοιωμένης GPU. Μπορεί να "
-"επιταχύνει ορισμένα παιχνίδια (ΕΝΕΡΓΟ = Ταχύτητα, ΑΝΕΝΕΡΓΟ = Συμβατότητα)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Κάτω"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Μεταφόρτωση Κωδικών (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Μεταφορτώθηκαν %lu κωδικοί. (προστέθηκαν %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Τύμπανα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Εξαγωγή Ήχου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Εξαγωγή EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Εξαγωγή Καρέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Εξαγωγή Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Εξαγωγή όλων των απεικονισμένων καρέ σε ένα AVI αρχείο στο User/Dump/"
-"Frames/\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Εξαγωγή των αποκωδικοποιημένων υφών του παιχνιδιού στο User/Dump/Textures/"
-"<id παιχνιδιού>/\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Εξαγάγει τα περιεχόμενα των EFB αντιγραφών σε User/Dump/Textures/\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "Έ&ξοδος"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Αντίγραφα"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1928,56 +1915,40 @@ msgstr ""
 "Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δούνε "
 "τους νέους οδηγούς."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "ΕΥΡΩΠΗ"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Ενημερώσεις Μνήμης Νωρίς"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Επεξεργασία Κωδικού ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Επεξεργασία Ρυθμίσεων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Επεξεργασία Τοπικών Ρυθμίσεων"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Επεξεργασία Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Επεξεργασία τρέχουσας οπτικής"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Εφέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Το νήμα εξομοίωσης εκτελείται ήδη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1992,7 +1963,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε εικονική XFB εξομοίωση."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2008,122 +1979,92 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Εξομοιωμένο Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Κατάσταση Λειτουργίας:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Ενεργοποίηση"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Ενεργοποιεί 3D εφέ μέσω στερεοσκοπίας χρησιμοποιώντας την τεχνολογία 3D "
-"Vision της Nvidia αν υποστηρίζεται από την GPU.\n"
-"Πιθανώς μπορεί να προκαλέσει προβλήματα.\n"
-"Χρειάζεται λειτουργία πλήρης οθόνης για να λειτουργήσει.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Ενεργοποίηση Καταγραφής AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Ενεργοποίηση Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Ενεργοποίηση Bounding Box Υπολογισμών"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Ενεργοποίηση Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Ενεργοποίηση Cheat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Ενεργοποίηση Διπλού Πυρήνα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "Ενεργοποίηση FPRF"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Ενεργοποίηση Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Ενεργοποίηση MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Ενεργοποίηση Προφύλαξης Οθόνης"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Ενεργοποίηση Δεδομένων Ηχείου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Ενεργοποίηση Ευρείας Οθόνης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Ενεργοποίηση Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Ενεργοποιεί το ανισοτροπικό φιλτράρισμα.\n"
-"Βελτιώνει την ποιότητα απεικόνισης των υφών που βρίσκονται σε οξείες οπτικές "
-"γωνίες.\n"
-"Μπορεί να προκαλέσει προβλήματα σε έναν μικρό αριθμό παιχνιδιών.\n"
-"\n"
-"Αν δεν είστε σίγουροι, επιλέξτε 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. "
-"(ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Ενεργοποίηση σελίδων"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2136,7 +2077,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2148,34 +2089,25 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight "
-"Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Ενεργοποιεί το Προσαρμοζόμενο Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. "
-"Δεν διατίθεται για OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. "
-"Μόνο για OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2187,7 +2119,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2195,7 +2127,11 @@ msgstr ""
 "Ενεργοποιεί τη Μονάδα Διαχείρισης Μνήμης, απαραίτητο για μερικά παιχνίδια. "
 "(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2205,52 +2141,63 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Τέλος"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Αγγλικά"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Βελτιώσεις"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Εισάγετε όνομα για τη νέα οπτική:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Εγγραφή %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Εγγραφή 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Ίσο"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή "
 "συστήματος."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr "Σφάλμα αποθήκευσης του αρχείου."
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2259,7 +2206,7 @@ msgstr ""
 "Σφάλμα: Μετά από \"%s\", βρέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d "
 "(0x%X). Ματαίωση φόρτωσης σημείου αποθήκευσης..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2269,221 +2216,191 @@ msgstr ""
 "φορτωμένες. Τα παιχνίδια μπορεί να μη δείχνουν τις γραμματοσειρές σωστά, ή "
 "να κρασάρουν."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr ""
-"Χειριστής εξαιρέσεων - πρόσβαση κάτω από την περιοχή μνήμης. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "Ευρώπη"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Εξαγωγή Όλων Των Αποθηκεύσεων Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Αποτυχία Εξαγωγής"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Εξαγωγή Αρχείου"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Εξαγωγή Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Εξαγωγή Εγγραφής..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Εξαγωγή Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Εξαγωγή Αποθήκευσης Wii (Πειραματικό)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Εξαγωγή όλων των αποθηκεύσεων"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Αποτυχία εξαγωγής"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Εξαγωγή αποθήκευσης ως..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Επέκταση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Εξωτερικό Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Επιπλέον Παράμετρος"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Η Επιπλέον Παράμετρος είναι χρήσιμη μόνο στο ''Metroid: Other M''."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Εξαγωγή όλων των αρχείων..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Εξαγωγή Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Εξαγωγή DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Εξαγωγή Φακέλου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Εξαγωγή Αρχείου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Εξαγωγή Κατάτμησης..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Γίνεται εξαγωγή %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Γίνεται εξαγωγή όλων των αρχείων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Γίνεται εξαγωγή φακέλου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Γίνεται εξαγωγή..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Αναπαραγωγή FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "ΓΑΛΛΙΑ"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Μέγεθος FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "Αποτυχία Σύνδεσης!"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Αποτυχία σύνδεσης!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Αποτυχία μεταφόρτωσης κωδικών."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Αποτυχία εξαγωγής στο %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Αποτυχία φόρτωσης DSP ROM:\t%s\n"
-"\n"
-"Αυτό το αρχείο χρειάζεται για να χρησιμοποιηθεί το DSP LLE.\n"
-"Δεν συμπεριλαμβάνεται με το Dolphin γιατί περιέχει δεδομένα πνευματικής "
-"ιδιοκτησίας.\n"
-"Χρησιμοποιήστε το DSPSpy για να εξάγετε το αρχείο από την κονσόλα σας.\n"
-"\n"
-"Μπορείτε να χρησιμοποιήσετε την  DSP HLE μηχανή η οποία δεν χρειάζεται ROM "
-"dumps.\n"
-"(Επιλέξτε την από την καρτέλα \"Ήχος\" του παραθύρου των γενικών ρυθμίσεων.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Αποτυχία φόρτωσης του bthprops.cpl! Δεν θα δουλέψει η σύνδεση πραγματικών "
-"Wiimotes και το Dolphin μπορεί να τερματιστεί αναπάντεχα!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Αποτυχία φόρτωσης του hid.dll! Δεν θα δουλέψει η σύνδεση πραγματικών "
-"Wiimotes και το Dolphin μπορεί να τερματιστεί αναπάντεχα!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Αποτυχία ανάγνωσης %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Αποτυχία ανάγνωσης banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Αποτυχία ανάγνωσης της κεφαλίδας bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Αποτυχία ανάγνωσης του μπλόκ %d από το αρχείο αποθήκευσης\n"
+"Αποτυχία ανάγνωσης του μπλοκ %d από το αρχείο αποθήκευσης\n"
 "Μπορεί να έχουν περικοπεί τα δεδομένα στην κάρτα μνήμης\n"
-"Θέση αρχείου:%llx"
+"Θέση αρχείου:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2491,7 +2408,7 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας του BAT\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2499,17 +2416,12 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του BAT\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2517,7 +2429,7 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας των φακέλων\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2525,11 +2437,7 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης των φακέλων\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Αποτυχία ανάγνωσης κεφαλίδας"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2537,50 +2445,35 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Αποτυχία ανάγνωσης της κεφαλίδας για το αρχείο %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Αποτυχία ανάγνωσης μοναδικού ID από την εικόνα δίσκου"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Αποτυχία εγγραφής του BT.DINF στο SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Αποτυχία εγγραφής του bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Αποτυχία εγγραφής δεδομένων στο αρχείο: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Αποτυχία εγγραφής της κεφαλίδας για το %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Περσικά"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Γρήγορη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Γρήγορος Υπολογισμός Βάθους"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2588,23 +2481,27 @@ msgstr ""
 "Ανεπανόρθωτος αποσυγχρονισμός. Ακύρωση αναπαραγωγής.  (Σφάλμα σε "
 "PlayWiimote: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Αναπαραγωγή Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Πληροφορίες Αρχείου"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr "Μέγεθος Αρχείου"
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Το αρχείο δεν περιείχε κωδικούς."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Το αρχείο μετατράπηκε σε .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2612,7 +2509,7 @@ msgstr ""
 "Το αρχείο απέτυχε στο άνοιγμα\n"
 "ή δεν έχει έγκυρη επέκταση"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2621,96 +2518,93 @@ msgstr ""
 "Το αρχείο έχει επέκταση \"%s\"\n"
 "έγκυρες επεκτάσεις είναι (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Το αρχείο δεν αναγνωρίζεται σαν κάρτα μνήμης"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Το αρχείο δεν είναι συμπιεσμένο"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Άγνωστη λειτουργία ανοίγματος : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Αρχεία δίσκου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Ο τύπος αρχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Εύρεση επομένου"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Εύρεση προηγούμενου"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Πρώτο Μπλοκ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Επιδιόρθωση Checksum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Επιβολή 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Επιβολή 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Επιβολή της Κονσόλας ως NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Επιβολή Φιλτραρίσματος Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Επιβάλλει φιλτράρισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεργοποιήσει.\n"
-"Βελτιώνει ελαφρώς την ποιότητα των υφών αλλά μπορεί να προκαλέσει προβλήματα "
-"σε ορισμένα παιχνίδια.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Επιβάλλει στο παιχνίδι να εξάγει γραφικά για αναλύσεις ευρείας οθόνης.\n"
-"Μπορεί να προκαλέσει προβλήματα στα γραφικά σε ορισμένα παιχνίδια.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Επιβάλει τη NTSC-J λειτουργία για να χρησιμοποιηθεί η Ιαπωνική ROM "
-"γραμματοσειρά.\n"
-"Άμα αφεθεί αποεπιλεγμένο, το dolphin προεπιλέγει τη NTSC-U και ενεργοποιεί "
-"αυτόματα αυτήν την ρύθμιση όταν παίζονται Ιαπωνικά παιχνίδια."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2718,559 +2612,581 @@ msgstr ""
 "Διαμόρφωση ως ascii (NTSC\\PAL)?\n"
 "Επιλέξτε όχι για sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Μπροστά"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Προώθηση θύρας (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Βρέθηκαν %d αποτελέσματα για '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Βρέθηκαν %x αρχεία αποθήκευσης"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Καρέ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Προώθηση ανά Καρέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "FFV1 Για Τα Εξαγώμενα Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Πληροφορίες Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Εύρος Καρέ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Παράλειψη Κ&αρέ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Περιορισμός Καρέ:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Καρέ Προς Εγγραφή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "Γαλλία"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Ελεύθερη Ματιά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Γαλλικά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Από"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Πλήρης Οθόνη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr "Ανάλυση Πλήρους Οθόνης:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Αρχεία GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "GCI Φάκελος"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "ID Παιχνιδιού"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID Παιχνιδιού:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Το παιχνίδι εκτελείται ήδη!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Το παιχνίδι δεν εκτελείται!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Το παιχνίδι δεν βρέθηκε!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Ρυθμίσεις Συγκεκριμένου Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Ρυθμίσεις Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube αρχεία αποθήκευσης(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Ρυθμίσεις Gamecube &Pad"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Ρυθμίσεις Χειριστηρίου Gamecube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Κωδικοί Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n"
-"(Ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται. "
-"Δοκιμάστε να χρησιμοποιήσετε τον εγγενή διαχειριστή κώδικα τοποθετώντας το "
-"codehandler.bin αρχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Γενικά"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Γερμανικά"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Γερμανία"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: Ο δείκτης είναι μεγαλύτερος από το μέγεθος %lu της λίστας των "
 "κωδικών ar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Γραφικά"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Ρυθμίσεις Γραφικών"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Μεγαλύτερο από"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Βελτιώνει πολύ την ποιότητα των υφών που παράγονται χρησιμοποιώντας render "
-"to texture εφέ.\n"
-"Μία αύξηση της εσωτερικής ανάλυσης θα βελτιώσει το εφέ αυτής της ρύθμισης.\n"
-"Μειώνει ελαφρώς την επίδοση και είναι πιθανό να προκαλέσει προβλήματα (αν "
-"και σπάνια).\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Ελληνικά"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Αριστερό Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Δεξί Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Κιθάρα"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Αποτυχία ελέγχου κεφαλίδας"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Εβραϊκά"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Ύψος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Χαίρετε,\n"
-"\n"
-"το Dolphin απαιτεί OS X 10.7 ή νεώτερο.\n"
-"Δυστυχώς χρησιμοποιείτε μια παλιά έκδοση του OS X.\n"
-"Η τελευταία έκδοση του Dolphin που υποστηρίζει το OS X 10.6 είναι το Dolphin "
-"3.5.\n"
-"Παρακαλώ κάντε αναβάθμιση σε 10.7 ή νεώτερο για να μπορείτε να "
-"χρησιμοποιήσετε την νεώτερη έκδοση του Dolphin.\n"
-"\n"
-"Αντίο!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Χαίρεται,\n"
-"\n"
-"το Dolphin απαιτεί από την CPU να έχει υποστήριξη για SSE2 επεκτάσεις.\n"
-"Δυστυχώς η CPU σας δεν τις υποστηρίζει, επομένως το Dolphin δεν θα τρέξει.\n"
-"\n"
-"Αντίο!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Απόκρυψη Δείκτη Ποντικιού"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Αποκρύπτει τον δείκτη του ποντικιού αν βρίσκεται πάνω από το παράθυρο "
-"εξομοίωσης.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Πλήκτρα Συντόμευσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Ουγγρικά"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Υβριδικό Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Απόπειρα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήριο: "
 "%08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει ένα IOS ή έναν "
-"τίτλο που δεν είναι διαθέσιμος στο NAND dump σας.\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει έναν τίτλο που δεν "
+"είναι διαθέσιμος στο NAND dump σας.\n"
+"TitleID %016<PRIx64>.\n"
 "Το Dolphin πιθανότατα θα κολλήσει τώρα."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - μη έγκυρος προορισμός"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Ρυθμίσεις IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Δείκτης IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Ευαισθησία IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Λεπτομέρειες ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Φάκελοι ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ΙΤΑΛΙΑ"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Εάν επιλεχθεί, οι καταχωρητές bounding box θα ανανεώνονται. Χρησιμοποιούνται "
-"από τα Paper Mario παιχνίδια."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Αγνόηση Αλλαγών Format"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n"
-"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωρίς αρνητικές συνέπειες. "
-"Προκαλεί όμως ελαττώματα στα γραφικά σε ένα μικρό αριθμό παιχνιδιών.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγραφή στο EFB.\n"
-"Βελτιώνει τις επιδόσεις σε ορισμένα παιχνίδια, αλλά μπορεί να "
-"απενεργοποιήσει ορισμένα χαρακτηριστικά που σχετίζονται με το gameplay ή εφέ "
-"γραφικών.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Εισαγωγή Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Εισαγωγή Αποθήκευσης Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Η εισαγωγή απέτυχε"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Το αρχείο εισαγωγής έχει επέκταση gsc\n"
-"αλλά δεν έχει σωστή κεφαλίδα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Το αρχείο εισαγωγής έχει μη έγκυρο μήκος"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Το εισαγώμενο αρχείο έχει sav επέκταση\n"
-"άλλα δεν έχει σωστή κεφαλίδα."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Εντός Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr "Αύξηση Βάθους"
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Αύξηση Ορίου Καρέ"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "Αύξηση IR"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Πληροφορίες"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Είσοδος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Εισάγετε"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Εισαγωγή Κάρτας SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr "Εισάγετε όνομα εδώ..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Εγκατάσταση WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Εγκατάσταση στο Μενού Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει "
-"ακόμα."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Γίνεται εγκατάσταση WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Σφάλμα Ελέγχου Ακεραιότητας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε. Δε βρέθηκαν σφάλματα."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Ο έλεγχος ακεραιότητας για την κατάτμηση %d απέτυχε. Το αρχείο έχει "
-"πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος τρόπο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Ρυθμίσεις Διεπαφής"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία συμπίεσης"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3279,103 +3195,106 @@ msgstr ""
 "Εσωτερικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n"
 "Δοκιμάστε να φορτώσετε ξανά το σημείο αποθήκευσης"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Εσωτερική Ανάλυση:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (ΠΟΛΥ αργός)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Εισαγωγή"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Μη έγκυρο μέγεθος (%x) ή μαγική λέξη (%x)"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Μη έγκυρη τιμή!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr "Μη έγκυρο bat.map ή εγγραφή φακέλου"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Μη έγκυρος τύπος συμβάντος %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Μη έγκυρο αρχείο"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Μη έγκυρο opening.bnr βρέθηκε σε gcm:\n"
-"%s\n"
-" Ίσως χρειαστεί να ξαναεξάγετε την εικόνα αυτού του παιχνιδιού από τον δίσκο."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Μη έγκυρο αρχείο εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Μη έγκυρες παράμετροι αναζήτησης (δεν επιλέχθηκε αντικείμενο)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Μη έγκυρο string αναζήτησης (δεν μπορεί να γίνει μετατροπή σε νούμερο)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Μη έγκυρο string αναζήτησης (μόνο ζυγά μήκη string υποστηρίζονται)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Μη έγκυρο κατάσταση"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr "Μη έγκυρη τιμή."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "ΙΑΠΩΝΙΑ"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "Ιταλία"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT Recompiler (προτείνεται)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL πειραματικός recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "Ιαπωνία"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Ιαπωνικά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "ΚΟΡΕΑ"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "Διατήρηση Παραθύρου στην Κορυφή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3385,64 +3304,75 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Διατήρηση Παραθύρου στην Κορυφή"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "Πληκτρολόγιο"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Πλήκτρο"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr "Πλήκτρα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "Κορέα"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Κορεάτικα"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Αναλογική"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Γλώσσα:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Τελευταίο %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Χρονοκαθυστέρηση: "
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Αριστερά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Αριστερό Stick"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"Αριστερό κλίκ για εντοπισμό των πλήκτρων συντόμευσης.\n"
-"Πατήστε το πλήκτρο διαστήματος για καθαρισμό."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Αριστερό Stick"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3452,7 +3382,7 @@ msgstr ""
 "Μεσαίο κλικ για καθάρισμα.\n"
 "Δεξί κλικ για περισσότερες επιλογές."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3460,203 +3390,211 @@ msgstr ""
 "Αριστερό/Δεξί κλικ για περισσότερες επιλογές.\n"
 "Μεσαίο κλικ για καθάρισμα."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Μικρότερο από"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Περιορισμός με βάση τα Καρέ"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "Άδεια"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Φόρτωσ."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Φόρτωση Τροποποιημένων Υφών"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Φόρτωση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Φόρτωση Τελευταίας Αποθήκευσης 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Φόρτωση Σημείου Αποθήκευσης..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Φόρτωση Μενού Συστήματος Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Φόρτωση Μενού Συστήματος Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Φόρτωση τροποποιημένων υφών από User/Load/Textures/<game_id>/\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Φόρτωση προεπιλεγμένων τιμών από διαθέσιμα πρότυπα hack."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Καταγραφή"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Ρυθμίσεις Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Καταγραφή FPS σε αρχείο"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Τύποι Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Καταγράφει τον αριθμό των καρέ ανά δευτερόλεπτο στο αρχείο User/Logs/fps."
-"txt. Χρησιμοποιήστε αυτό το χαρακτηριστικό όταν θέλετε να μετρήσετε την "
-"ταχύτητα του Dolphin.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Έξοδοι Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Χάθηκε η σύνδεση με τον διακομιστή!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"Ασυμφωνία MD5\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Hack Ταχύτητας"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Αρχεία MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Κύριο Stick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "Δημιουργός"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID Δημιουργού:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Δημιουργός:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3671,29 +3609,35 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Μέγιστη"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Η κάρτα μνήμης έχει ήδη αποθηκευμένα δεδομένα για τον τίτλο"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
+"Μπορεί να προκαλέσει καθυστερήσεις στο Μενού του Wii και σε ορισμένα "
+"παιχνίδια."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr "Η κάρτα μνήμης έχει ήδη αποθηκευμένα δεδομένα για τον τίτλο."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Η κάρτα μνήμης είναι ήδη ανοιχτή"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Memory Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Κάρτα Μνήμης"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3701,7 +3645,7 @@ msgstr ""
 "Διαχειριστής Καρτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγραφα ασφαλείας πριν την "
 "χρήση, αν και διορθωμένος μπορεί να χαλάσει πράγματα!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3718,39 +3662,54 @@ msgstr ""
 "%s\n"
 "Θέλετε να αντιγράψετε το παλιό αρχείο σε αυτή την νέα τοποθεσία;\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "Το μέγεθος του αρχείου της κάρτας μνήμης δεν ταιριάζει με το μέγεθος της "
 "κεφαλίδας."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Μενού"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Μικρόφωνο"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Ελάχιστη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Διάφορες Ρυθμίσεις"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modifier"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3763,20 +3722,24 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Ισοπλατής γραμματοσειρά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Μοτέρ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3793,317 +3756,289 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "ΣΗΜΕΙΩΣΗ: Το μέγεθος της ροής δεν ταιριάζει με το πραγματικό μήκος των "
 "δεδομένων.\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Αρχεία Native GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "Ολλανδία"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Νέα Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Επόμενη Σελίδα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Επόμενη Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Ψευδώνυμο :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Καμία Χώρα (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Δε βρέθηκαν ISO ή WAD"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Καμία έξοδος ήχου"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Δε βρέθηκε αρχείο εικονιδίου για τον τίτλο %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Μη διαθέσιμη περιγραφή"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Απενεργοποίηση του docking"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Δεν φορτώθηκε αρχείο"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Δεν υπάρχουν ελεύθερες εγγραφές φακέλων"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Κανένα εγγεγραμένο αρχείο"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Δε βρέθηκε φάκελος αποθήκευσης για τον τίτλο %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Καμία"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Νορβηγικά Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Όχι ίσο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Μη Ορισμένο"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου "
-"μεγέθους %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Μη Συνδεδεμένο"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Σημειώσεις"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Σημειώσεις: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Αριθμός Κωδικών: "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Επιτάχυνση Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr "Nunchuk προσανατολισμός"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr "Nunchuk stick"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Εύρος Αντικειμένου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Ανενεργός"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online &Εγχειρίδια "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Διαθέσιμα μόνο %d μπλοκ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Άνοιγμα &τοποθεσίας αρχείου"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Άνοιγμα φακέλου αποθήκευσης Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Άνοιγμα αρχείου..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: δεν μπορεί να δημιουργηθεί περιεχόμενο για την συσκευή %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: αδυναμία εύρεσης συσκευών ήχου"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Αποκωδικοποιητής Υφών"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Αποκωδικοποιητής Υφών"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4111,22 +4046,18 @@ msgstr ""
 "Ανοίγει τις προεπιλεγμένες (μόνο για ανάγνωση) ρυθμίσεις για αυτό το "
 "παιχνίδι σε έναν εξωτερικό επεξεργαστή κειμένου."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Ανοίγει τις τοπικές ρυθμίσεις του χρήστη σε έναν εξωτερικό επεξεργαστή "
-"κειμένου."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Ρυθμίσεις"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Πορτοκαλί"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4137,345 +4068,326 @@ msgstr ""
 "Κάντε δεξί κλίκ, εξάγετε όλα τα αρχεία αποθήκευσης\n"
 "και εισάγετέ τα σε μία νέα κάρτα μνήμης.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr "Προσανατολισμός"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Άλλα"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει "
-"απενεργοποιηθεί. Σταματήστε χειροκίνητα το παιχνίδι."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Έξοδος"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Αναπα&ραγωγή Εγγραφής"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Χειριστήριο"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Χειριστήριο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Χειριστήρια"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Παράγραφος"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Παράμετροι"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Κατάτμηση %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Η κατάτμηση δεν υπάρχει: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Φάκελοι"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Παύση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Παύση στο τέλος της ταινίας"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr "Παύση στο Τέλος της Ταινίας"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Φωτισμός ανά Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Τέλειο"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Οπτική %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "Πλατφόρμα"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Αναπαραγωγή Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Αναπαραγωγή/Παύση"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Παίζεται"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Ρυθμίσεις Αναπαραγωγής"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Παίχτες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Παρακαλώ επιβεβαιώστε..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Παρακαλώ δημιουργήστε μια οπτική πριν την αποθήκευση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Πολωνέζικα"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Θύρα 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Θύρα 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Θύρα 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Θύρα 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Θύρα :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Πορτογαλικά"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Πορτογαλικά (Βραζιλιάνικα)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Εφέ:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Προεπιλογές: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Προηγούμενη Σελίδα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Προηγούμενη Σελίδα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Προηγούμενη Τιμή"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Καθαρισμός Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Ερώτηση"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Έξοδος"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Αναλογική"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "ΡΩΣΙΑ"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Ακτίνα"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Εύρος"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Μόνο Για Ανάγνωση (Εγγραφής)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Πραγματικό"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Πραγματική Σανίδα Ισορροπίας"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Πραγματικό Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Πραγματικά Wiimotes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Εγγραφή"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Εγγραφή χειρισμών"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Πληροφορίες Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Ρυθμίσεις Εγγραφής"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Αριστερό Κόκκινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Δεξί Κόκκινο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Μειώνει τις γωνιώσεις που προκαλούνται από την απεικόνιση των 3D γραφικών.\n"
-"Αυτό μπορεί να κάνει την εικόνα να φαίνεται λιγότερο τετραγωνισμένη.\n"
-"Μειώνει δραματικά τις επιδόσεις, και ορισμένες φορές προκαλεί προβλήματα.\n"
-"\n"
-"Αν δεν είστε σίγουροι, επιλέξτε Καμία."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Ανανέωση Λίστας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Ανανέωση λίστας παιχνιδιών"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "Περιοχή"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4485,246 +4397,322 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Επανεκκίνηση"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revision:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Δεξιά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Δεξί Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Δεξί Stick"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Δόνηση"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"Εκτέλεση DSP LLE σε ξεχωριστό νήμα (δεν προτείνεται: μπορεί να προκαλέσει "
-"κολλήματα)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "Ρωσία"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Ρώσικα"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Απ&οθήκευση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Ασφαλής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Αποθήκ."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Αποθήκευση GCI ως..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Αποθήκευση Παλαιότερου Σημείου"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Αποθήκευση Σημείου"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Αποθήκευση Σημείου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Αποθήκευση συμπιεσμένου GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Αποθήκευση τρέχουσας οπτικής"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της "
 "εγγραφής της ταινίας..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Κλιμακούμενα EFB Αντίγραφα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Ανίχνευση %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Αναζήτηση για ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Ανίχνευση..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Στιγμιότυπο"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Φίλτρο Αναζήτησης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Αναζήτηση σε Υποφακέλους"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Αναζήτηση τρέχων Αντικειμένου"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Αναζήτηση δεκαεξαδικής Τιμής:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Επιλογή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "Επιλογή Στηλών"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Επιλέξτε το Αρχείο Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Επιλέξτε έναν προσαρμογέα υλικού για χρήση.\n"
-"\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε τον πρώτο."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Επιλέξτε ένα αρχείο αποθήκευσης για εισαγωγή"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Επιλέξτε αιωρούμενα παράθυρα"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Επιλέξτε το αρχείο για φόρτωση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Επιλέξτε αρχείο αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Επιλέξτε το σημείο φόρτωσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Επιλέξτε το σημείο αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4743,277 +4731,293 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι επιλέξτε Αυτόματα."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Το επιλεγμένο προφίλ χειρισμού δεν υπάρχει"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Επιλεγμένη γραμματοσειρά"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Επιλέγει την ανάλυση της οθόνης που θα χρησιμοποιηθεί σε λειτουργία πλήρους "
-"οθόνης. Αυτή θα πρέπει να είναι πάντα μεγαλύτερη ή ίση με την εσωτερική "
-"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n"
-"\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε την ανάλυση της επιφάνειας εργασίας "
-"σας.\n"
-"Αν πάλι δεν είστε σίγουροι, χρησιμοποιήστε την υψηλότερη λειτουργική ανάλυση."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Επιλέγει το API γραφικών που θα χρησιμοποιηθεί εσωτερικά.\n"
-"Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο "
-"ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n"
-"Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n"
-"\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε το Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Επιλέγει το API γραφικών που θα χρησιμοποιηθεί εσωτερικά.\n"
-"Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο "
-"ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n"
-"Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n"
-"\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε το OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Αποστολή"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Θέση Sensor Bar:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Διαχωριστής"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Σερβικά"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χρησιμοποιούν οι συσκευές όπως ο "
-"προσαρμογέας δικτύου"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Ορισμός ως προεπιλεγμένο &ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Ορισμός ως προεπιλεγμένη Κάρτα Μνήμης %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των "
 "κωδικών ar %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Ορίζει την χρονοκαθυστέρηση (σε ms). Υψηλότερες τιμές μπορεί να μειώσουν τις "
-"διακοπές στον ήχο. Μόνο για OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Ρυθμίσεις..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Αδυναμία δημιουργίας αρχείου ρυθμίσεων"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Κούνημα"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Σύντομο Όνομα:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Κουμπιά Shoulder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Εμφάνιση &Κονσόλας"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Εμφάνιση Παραθύρου Κατα&γραφής "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Εμφάνιση Μπάρας Κατάστασης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Εμφάνιση Γραμμής &Εργαλείων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "Εμφάνιση Αυστραλίας"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Εμφάνιση Προεπιλογών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Εμφάνιση Οδηγών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Εμφάνιση FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Εμφάνιση Γαλλίας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Εμφάνιση GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "Εμφάνιση Γερμανίας"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Εμφάνιση Προβολής Χειρισμών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Εμφάνιση Ιταλίας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Εμφάνιση JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Εμφάνιση Κορέας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Εμφάνιση Γλώσσας:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Εμφάνιση Ρυθμίσεων &Καταγραφέα"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "Εμφάνιση Ολλανδίας"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Εμφάνιση PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Εμφάνιση Πλατφόρμας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Εμφάνιση Περιοχών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "Εμφάνιση Ρωσίας"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "Εμφάνιση Ισπανίας"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Εμφάνιση Στατιστικών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Εμφάνιση Ταϊβάν"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Εμφάνιση USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "Εμφάνιση Αγνώστων"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Εμφάνιση Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Εμφάνιση Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr "Εμφάνιση Κόσμου"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Εμφάνιση επιβεβαίωσης πριν τη διακοπή ενός παιχνιδιού."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Εμφάνιση μηνύματος όταν προκύψει ένα πιθανά σοβαρό σφάλμα.\n"
-"Απενεργοποιώντας αυτήν την επιλογή μπορεί να γλιτώσετε από ενοχλητικά μη "
-"κρίσιμα σφάλματα, αλλά \n"
-"το Dolphin μπορεί να κρασάρει ξαφνικά χωρίς καμία εξήγηση. "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Εμφάνιση πρώτου μπλοκ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Εμφάνιση μετρητή καθυστέρησης "
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Εμφανίζει μηνύματα στην περιοχή της εξομοίωσης στην οθόνη.\n"
-"Στα μηνύματα αυτά περιλαμβάνονται εγγραφές στην κάρτα μνήμης, πληροφορίες "
-"σχετικά με την CPU και του βίντεο backend, καθώς και καθαρισμού της JIT "
-"cache."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Εμφάνιση μπλοκ αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Εμφάνιση αποθηκευμένου σχολίου"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Εμφάνιση αποθηκευμένου εικονιδίου"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Εμφάνιση αποθηκευμένου τίτλου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5025,84 +5029,82 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Εμφάνιση Αγνώστων"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Εμφανίζει διάφορα στατιστικά.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Οριζόντια Θέση Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Κινέζικα Απλοποιημένα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Παράλειψη BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Παράληψη εκκαθάρισης DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Παράλειψη EFB Πρόσβασης από τη CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της "
-"εξομοίωσης.\n"
-"Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n"
-"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache "
-"υφών ή απενεργοποιήστε αυτήν την επιλογή.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Θέση %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Θέση Α"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Θέση Β"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Στιγμιότυπο"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Απεικόνιση Λογισμικού"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5115,155 +5117,173 @@ msgstr ""
 "Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε "
 "σίγουροι, επιλέξτε 'Όχι'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Ρυθμίσεις Ήχου"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Το backend ήχου %s δεν είναι έγκυρο."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Αποτυχία δημιουργίας buffer ήχου: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "Ισπανία"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Ένταση Ηχείου:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Ορίζει την ανάλυση που θα χρησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή "
-"ανάλυση θα βελτιώσει την οπτική ποιότητα αρκετά αλλά επίσης θα έχει βαρύ "
-"αντίκτυπο στις επιδόσεις και μπορεί να προκαλέσει ελαττώματα σε ορισμένα "
-"παιχνίδια.\n"
-"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αργό από το \"Μέγεθος Παραθύρου"
-"\" αλλά αποδίδει λιγότερα προβλήματα. Γενικά, όσο χαμηλότερη είναι η "
-"εσωτερική ανάλυση, θα είναι και καλύτερες οι επιδόσεις.\n"
-"\n"
-"Αν δεν είστε σίγουροι, επιλέξτε 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Επιτάχυνση του Ρυθμού Μεταφοράς από τον Δίσκο"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Τετράγωνο Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Τυπικός Controller"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Εκκίνηση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Εκκίνηση Λειτουργίας &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Εκκίνηση Ε&γγραφής"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Εκκίνηση Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Λειτ."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Σημεία Αποθήκευσης"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Τιμόνι"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Διακοπή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n"
-"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα "
-"παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Προσαρμογή στο Παράθυρο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Subtract"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Επιτυχής εξαγωγή αρχείου στο %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Σουηδικά"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr "Υποστήριξη"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Swing"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Συγχρονισμός του νήματος της GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5272,81 +5292,110 @@ msgstr ""
 "κολλήματα σε λειτουργία Διπλού Πυρήνα . (Ενεργό = Συμβατότητα, Ανενεργό = "
 "Ταχύτητα)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Γλώσσα Συστήματος:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "ΤΑΪΒΑΝ"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS Είσοδος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Αριστερό Table"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Δεξί Table"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Δημιουργία Στιγμιότυπου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Τέστ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Υφή"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Cache Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Επικάλυψη Του Format Υφών"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "Το WAD εγκαταστάθηκε με επιτυχία"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Η διεύθυνση είναι άκυρη"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Το checksum διορθώθηκε με επιτυχία"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Ο επιλεγμένος φάκελος βρίσκεται ήδη στη λίστα"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5355,7 +5404,7 @@ msgstr ""
 "Το αρχείο %s υπάρχει ήδη.\n"
 "Θέλετε να το αντικαταστήσετε;"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5364,47 +5413,34 @@ msgstr ""
 "Αδυναμία ανοίγματος του αρχείου %s για εγγραφή. Παρακαλώ ελέγξτε αν είναι "
 "ήδη ανοιχτό από άλλο πρόγραμμα."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Το αρχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αρχείου δε θα γραφεί."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Το αρχείο που επιλέξατε (%s) δεν υπάρχει"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Το όνομα δεν μπορεί να είναι κενό"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Το όνομα δεν μπορεί να περιέχει τον χαρακτήρα ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 "Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να "
-"χάσει ανανεώσεις των υφών από την RAM.\n"
-"\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεξιότερη τιμή."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5412,36 +5448,48 @@ msgstr ""
 "Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην "
 "προεπιλογή συστήματος."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Οι εκδόσεις NetPlay του διακομιστή και του πελάτη δεν είναι συμβατές!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Ο διακομιστής είναι γεμάτος!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Ο διακομιστής απάντησε: το παιχνίδι τρέχει!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Ο διακομιστής επέστρεψε ένα άγνωστο μήνυμα σφάλματος!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Το επιλεγμένο αρχείο \"%s\" δεν υπάρχει"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Η τιμή είναι άκυρη"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Θέμα:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5449,7 +5497,7 @@ msgstr ""
 "Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι "
 "πιθανότατα ημιτελές."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5458,7 +5506,7 @@ msgstr ""
 "Αν είναι ακαθόριστη η επιλογή το παιχνίδι χρησιμοποιεί τις γενικές ρυθμίσεις "
 "του Dolphin. "
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5466,131 +5514,163 @@ msgstr ""
 "Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το "
 "ίδιο το Action Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά "
-"παιχνίδια."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Αυτό το χαρακτηριστικό σας επιτρέπει να πειράξετε την κάμερα του "
-"παιχνιδιού.\n"
-"Μετακινήστε το ποντίκι κρατώντας πατημένο το δεξί πλήκτρο του ποντικιού για "
-"να μετακινήσετε οριζόντια την κάμερα γύρω από κάθετο άξονα, και κρατώντας το "
-"μεσαίο πλήκτρο για μετακίνησή της. \n"
-"Κρατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτρα για να "
-"μετακινήσετε την κάμερα κατά μία καθορισμένη απόσταση (SHIFT+0 για να "
-"κινηθεί γρηγορότερα και SHIFT+9 για να κινηθεί πιο αργά). Πατήστε SHIFT+R "
-"για να επαναφέρετε την κάμερα στην αρχική της θέση. \n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Περιορίζει την ταχύτητα του παιχνιδιού στο προκαθορισμένο αριθμό των καρέ "
-"ανά δευτερόλεπτο (η πλήρης ταχύτητα είναι 60 για NTSC και 50 για PAL). "
-"Εναλλακτικά, επιλέξτε το \"Ήχος\" για να κάνετε Throttle μέσω DSP (μπορεί να "
-"διορθώσει ορισμένα κλικαρίσματα στον ήχο άλλα και να προκαλέσει συνεχές "
-"θόρυβο ανάλογα με το παιχνίδι)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
-"Χωρίζει τα νήματα του Βίντεο και της CPU, ώστε να τρέχουν σε ξεχωριστούς "
-"πυρήνες.\n"
-"Προκαλεί μεγάλη επιτάχυνση σε PC με περισσότερους από έναν πυρήνες,\n"
-"αλλά μπορεί να προκαλέσει κρασαρίσματα ή άλλα προβλήματα. "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
 msgstr ""
-"Αυτό σας επιτρέπει την χειροκίνητη επεξεργασία του αρχείου ρυθμίσεων INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Κατώφλι"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Πλάγιασμα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Τίτλος"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Εώς"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Εναλλαγή Όλων Τύπων Καταγραφής "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Εναλλαγή Αναλογίας Οθόνης"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Εναλλαγή EFB Αντίγραφα"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Εναλλαγή Ομίχλης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Εναλλαγή Πλήρους Οθόνης"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Εναλλαγή Εσωτερικής Ανάλυσης"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Κορυφή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Κινέζικα Παραδοσιακά "
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπου αρχείο."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Σκανδάλες"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5598,41 +5678,24 @@ msgstr ""
 "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF\n"
 "Τα Wiimote bt ids δεν είναι διαθέσιμα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Τουρκικά"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Πικάπ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Τύπος"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Πόρτα UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "ΑΓΝΩΣΤΟ"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ΑΓΝΩΣΤΟ_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "ΗΠΑ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5640,205 +5703,179 @@ msgstr ""
 "Αδυναμία δημιουργίας patch από τις δοθείσες τιμές.\n"
 "Η entry δεν μεταβλήθηκε."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Δεν μπορεί να γίνει parse της γραμμής %lu από τον εισαγώμενο κωδικό AR ως "
+"Δεν μπορεί να γίνει parse της γραμμής %u από τον εισαγόμενο κωδικό AR ως "
 "ένας έγκυρος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. Σιγουρευτείτε ότι "
 "τον πληκτρολογήσατε σωστά.\n"
 "Θα θέλατε να αγνοήσετε αυτήν την γραμμή και να συνεχίσετε με το parsing;"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Μη ορισμένο %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Αναίρεση Φόρτωσης Σημείου Αποθ. "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Αναίρεση Αποθήκευσης Σημείου Αποθ. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Άγνωστη εντολή DVD %08x - κρίσιμο σφάλμα"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Άγνωστη εντολή 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Άγνωστος τύπος καταχώρησης %i στο SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ελήφθη άγνωστο μήνυμα με id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Πάνω"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Κάθετη Θέση Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Χρήση Πλήρους Οθόνης"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Χρήση Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "Χρήση Λειτουργίας  PAL60 (EuRGB60)"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Χρήση Οθονών Πανικού"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Χρησιμοποιήστε έναν λιγότερο ακριβή αλγόριθμο για τον υπολογισμό των τιμών "
-"βάθους.\n"
-"Προκαλεί προβλήματα σε μερικά παιχνίδια, αλλά μπορεί να δώσει μια αξιοπρεπή "
-"επιτάχυνση.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Χρησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n"
-"Μπορεί να βελτιώσει την ταχύτητα (ειδικά σε CPUs με περισσότερους από δύο "
-"πυρήνες).\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Χρησιμοποιεί μη ασφαλείς πράξεις για να επιταχύνει την ροή των κορυφών στο "
-"OpenGL. Δεν υπάρχουν γνωστά προβλήματα σε GPUs που το υποστηρίζουν, αλλά θα "
-"προκαλέσει σοβαρά προβλήματα σταθερότητας και στα γραφικά διαφορετικά.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Συνήθως άμα αποτύχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μήνυμα "
-"σφάλματος.\n"
-"Παρόλα αυτά μπορείτε να παραλείψετε το αναδυόμενο μύνημα ώστε να έχετε "
-"gameplay χωρίς παρεμβάσεις επιλέγοντας αυτήν την ρύθμιση.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Εργαλεία"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "Κάθετος Συγχρονισμός"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Hack Ταχύτητας"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Τιμή"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Τιμή:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Τιμή: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "Διάφορα Στατιστικά"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Αναλυτικότητα"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hack Ροής Κορυφών"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Βίντεο"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Εικονικό"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Ένταση"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του εισιτηρίου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5851,25 +5888,27 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Προειδοποίηση - εκκίνηση DOL σε λάθος λειτουργία κονσόλας!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λειτουργία κονσόλας!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5881,7 +5920,7 @@ msgstr ""
 "%s\n"
 "Θέλετε να συνεχίσετε;"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5895,7 +5934,7 @@ msgstr ""
 "και έχουν το ίδιο όνομα με αρχεία στη memcard\n"
 "Συνέχεια;"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5907,7 +5946,15 @@ msgstr ""
 "φορτώσετε άλλο σημείο αποθήκευσης πρωτού συνεχίσετε ή να φορτώσετε το τρέχων "
 "με απενεργοποιημένη την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής)."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5920,7 +5967,7 @@ msgstr ""
 "την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής). Ειδάλλως πιθανώς θα εμφανιστεί "
 "ασυγχρονισμός."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5955,182 +6002,166 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - το αρχείο δεν είναι ανοιχτό."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Hack Ευρείας Οθόνης"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Πλάτος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii Κονσόλα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Ρίζα:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Αδυναμία ανάγνωσης από αρχείο"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wiimote %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Συνδεδεμένο Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Μοτέρ Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Ρυθμίσεις Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Αναδίπλωση Λέξεων"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Σε εργασία..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr "Κόσμος"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Εγγραφή Καρτών Μνήμης (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Εγγραφή στην Κονσόλα"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Εγγραφή στον Debugger"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Εγγραφή σε Αρχείο"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Εγγραφή στο Παράθυρο"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "Αποτυχία CreateSourceVoice XAudio2: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Αποτυχία αρχικοποίησης XAudio2: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Αποτυχία δημιουργίας κεντρικής φωνής XAudio2: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Χρησιμοποιείτε ένα ελεύθερο DSP ROM που φτιάχτηκε από την ομάδα του "
-"Dolphin.\n"
-" Όλα τα παιχνίδια του Wii και τα περισσότερα του GC θα δουλέψουν σωστά, αλλά "
-"τα GBA/IPL/CARD UCodes δεν θα δουλέψουν.\n"
-"\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Χρησιμοποιείτε ένα παλιό ελεύθερο DSP ROM που φτιάχτηκε από την ομάδα του "
-"Dolphin.\n"
-"Μόνο τα Zelda ucode παιχνίδια θα δουλέψουν σωστά με αυτό.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Δεν μπορείτε να κλείσετε pane που έχουν σελίδες."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Πρέπει να επιλέξετε ένα παιχνίδι!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Πρέπει να εισάγετε ένα όνομα!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "Πρέπει να επιλέξετε ένα παιχνίδι!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Πρέπει να εισάγετε ένα όνομα."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Πρέπει να εισάγετε μία έγκυρη οκταδική ή δεκαεξαδική τιμή."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Πρέπει να εισάγετε ένα έγκυρο όνομα προφίλ."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 "Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6140,7 +6171,7 @@ msgstr ""
 "Θέλετε να γίνει διακοπή τώρα για να διορθώσετε το πρόβλημα;\n"
 "Εάν επιλέξετε \"Όχι\", ο ήχος μπορεί να είναι χαλασμένος."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6148,36 +6179,36 @@ msgstr ""
 "Το αρχείο GCM/ISO φαίνεται να είναι μη έγκυρο (μη έγκυρη χώρα).\n"
 "Συνέχεια με περιοχή PAL;"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Το αρχείο SYSCONF έχει λάθος μέγεθος.\n"
-"Θα έπρεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n"
+"Θα έπρεπε να είναι 0x%04x (αλλά είναι 0x%04<PRIx64>)\n"
 "Θέλετε να δημιουργηθεί ένα καινούριο;"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Δεν υποστηρίζεται ο Zero 3 code"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Άγνωστος Zero code: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ σε αναμονή ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6189,77 +6220,30 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Προσαρμοζόμενο]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[ΠΕΙΡΑΜΑΤΙΚΟ]\n"
-"Στοχεύει στην επιτάχυνση της εξομοίωσης φορτώνοντας την αποκωδικοποίηση των "
-"υφών στην GPU χρησιμοποιώντας το OpenCL framework.\n"
-"Παρ'όλα αυτά, προς το παρόν είναι γνωστό ότι προκαλεί προβλήματα στις υφές "
-"σε διάφορα παιχνίδια. Επίσης είναι πιο αργή από την τυπική αποκωδικοποίηση "
-"υφών από την CPU στις περισσότερες περιπτώσεις.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[ΠΕΙΡΑΜΑΤΙΚΟ]\n"
-"Επιταχύνει λίγο την εξομοίωση κάνοντας caching τις display lists.\n"
-"Όμως είναι πιθανό να προκαλέσει προβλήματα.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Ανάγνωση Opcode από %x. Παρακαλώ να το αναφέρετε."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "αυτόματα"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "."
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "άγνωστο flavor %d (αναμενόταν %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "ελήφθη άγνωστο μήνυμα"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "Το wxExecute επέστρεψε -1 κατά την εκκίνηση της εφαρμογής!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar Διόρθωση: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear Διόρθωση: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OR"
diff --git a/Languages/po/en.po b/Languages/po/en.po
index e9c2285bc7..0b41229299 100644
--- a/Languages/po/en.po
+++ b/Languages/po/en.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the dolphin-emu package.
 # Glenn Rice <glennricster@gmail.com>, 2011
 #
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
 "PO-Revision-Date: 2011-01-06 14:53+0100\n"
 "Last-Translator: BhaaL <bhaal@0x1337.org>\n"
 "Language-Team: \n"
@@ -16,434 +17,479 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
+msgid "%s was not a directory, moved to *.original"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr ""
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -453,786 +499,837 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr ""
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
+msgid "Could not save %s."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1245,265 +1342,277 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1512,231 +1621,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1745,56 +1836,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1803,7 +1878,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1813,108 +1888,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1922,7 +1981,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1930,28 +1989,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1959,1330 +2015,1431 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3291,35 +3448,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3330,37 +3491,52 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3368,20 +3544,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3392,909 +3572,950 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr ""
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4305,244 +4526,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4550,74 +4818,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4625,641 +4901,740 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5267,25 +5642,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr ""
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5293,7 +5670,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5302,7 +5679,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5310,7 +5687,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5318,7 +5703,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5337,212 +5722,204 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5550,64 +5927,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/es.po b/Languages/po/es.po
index c6d0c97155..f6fb357823 100644
--- a/Languages/po/es.po
+++ b/Languages/po/es.po
@@ -1,21 +1,25 @@
-# Translation of dolphin-emu.pot to Spanish
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # Dario_ff <dariosamo@gmail.com>, 2011
-# Petiso_Carambanal <diegoae@gmail.com>, 2013
-# dfersd01 <dfersd@yahoo.com>, 2013
+# Petiso_Carambanal <diegoae@gmail.com>, 2013-2015
+# Diego Fernando <dfersd@yahoo.com>, 2013
+# Katabi Oka, 2015
+# Puniasterus <puniasterus@gmail.com>, 2013-2015
 # Puniasterus <puniasterus@gmail.com>, 2013
 # Puniasterus <puniasterus@gmail.com>, 2013
 # Sithdown <afdezmnez@gmail.com>, 2013
+# Swyter <Swyterzone@gmail.com>, 2014
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-20 12:03+0000\n"
-"Last-Translator: Petiso_Carambanal <diegoae@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/es/)\n"
 "Language: es\n"
@@ -24,21 +28,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(IP interna)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(demasiados para mostrar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Juego:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -47,52 +63,104 @@ msgstr ""
 "\"%s\" no existe.\n"
 "¿Crear una nueva tarjeta de memoria de 16 MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+"\"%s\" falló al reducir el tamaño del disco cuando se intentaban eliminar "
+"los sectores vacíos. Probablemente la imagen esté corrupta."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "¡\"%s\" ya está comprimido! No puede comprimirse más."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
-msgstr "muestras %d"
+msgstr "%d muestras"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
-msgstr "muestras %d (nivel de calidad %d)"
+msgstr "%d muestras (nivel de calidad %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (Disco %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s ya existe. ¿Sobrescribir?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s falló al ser \"scrubbed\". Probablemente la imagen esté corrupta."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 "%s falló al cargar como una tarjeta de memoria.\n"
-"El tamaño de la tarjeta no es válido (0x%x bytes)"
+"El tamaño de archivo de la tarjeta no es válido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -101,7 +169,7 @@ msgstr ""
 "%s falló al cargar como una tarjeta de memoria.\n"
 "El tamaño de la tarjeta no es válido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -109,381 +177,343 @@ msgid ""
 msgstr ""
 "%s falló al cargar como una tarjeta de memoria.\n"
 "El fichero no es suficientemente grande para ser un fichero de tarjeta de "
-"memoria válido(0x%x bytes)"
+"memoria válido (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Fallo al abrir %s"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s falló: kr=%x"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s es un archivo de 0 bytes"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "¡%s ya está comprimido! No puede comprimirse más."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
-"%s es muy largo para el nombre del archivo, la cantidad máxima de caracteres "
-"es 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
+#, c-format
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEliminar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Bloques libres; %u entradas de dir. libres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& Y"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Acerca de..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Iniciar desde unidad de DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "&Configuración de audio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "&Iniciar desde copia de seguridad en DVD..."
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
-msgstr "&Puntos de partida"
+msgstr "&Puntos de interrupción"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Buscar ISO en..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Administrador de &trucos"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr "&Administrador de trucos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&Configuración DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "&Configuración de mandos"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Borrar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Borrar ISO seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Archivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "Avanzar &frame"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Configuración gráfica"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Configuración de atajos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Cargar estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Administrador de tarjetas de memoria (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "&Película"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opciones"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Jugar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Propiedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Modo de solo lectura"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registros"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reiniciar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Sonido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Detener"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Vista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Configuración de wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "&Página web"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(DESCONOCIDO)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
-msgstr "(off)"
+msgstr "(desactivado)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
-msgstr "1.5x Nativo (960x792)"
+msgstr "Nativo x1.5 (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16-bits"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
-msgstr "1x Nativo (640x528)"
+msgstr "Nativo x1 (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
-msgstr "2.5x Nativo (1600x1320)"
+msgstr "Nativo x2.5 (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
-msgstr "2x Nativo (1280x1056)"
+msgstr "Nativo x2 (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32-bits"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "Visión 3D"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
-msgstr "3x Nativo (1920x1584)"
+msgstr "Nativo x3 (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
-msgstr "4x Nativo (2560x2112)"
+msgstr "Nativo x4 (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8-bits"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Insertar nombre aquí>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<No se encontraron resoluciones>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Pulsa una tecla>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Idioma del sistema>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistema>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "¡Ya hay una ventana de NetPlay abierta!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "¡¡Una ventana de NetPlay ya está abierta!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
-msgstr "Ningún juego está emulándose actualmente."
+msgstr "No hay ningún juego en ejecución."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 "No se ha podido encontrar un dispositivo de Bluetooth soportado.\n"
 "Tendrás que emparejar manualmente tus Wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"AVISO:\n"
-"\n"
-"Netplay solo funcionará con los siguientes ajustes:\n"
-" - Activar Dual Core [OFF]\n"
-" - DSP Emulator Engine debe ser el mismo en todos los ordenadores!\n"
-" - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT configurado a [Audio]\n"
-"\n"
-"Todos los jugadores deben usar la misma versión de Dolphin\n"
-"Todas las tarjetas de memoria deben ser idénticas entre jugadores o estar "
-"desactivadas.\n"
-"¡El soporte de Wiimote no está implementado!\n"
-"\n"
-"¡El host debe elegir la apertura/reenvio de puertos TCP!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "Placa base AM"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Acerca de Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Aceleración"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Exactitud:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Permite emular con precisión las copias EFB.\n"
-"Algunos juegos dependen de esto para algunos efectos gráficos o "
-"funcionalidad del juego.\n"
-"\n"
-"Si no estás seguro, elige EFB a textura."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Acción"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -498,7 +528,7 @@ msgstr ""
 "Código culpable:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -506,7 +536,7 @@ msgstr ""
 "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en "
 "Añadido de código (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -515,7 +545,7 @@ msgstr ""
 "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Fill "
 "and Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -524,7 +554,7 @@ msgstr ""
 "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en "
 "escritura y llenado de RAM (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -533,13 +563,13 @@ msgstr ""
 "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en "
 "Escribir con el puntero (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -549,173 +579,142 @@ msgstr ""
 "implementados (%s)\n"
 "Los códigos maestros no son necesarios. No los uses."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Error de Action Replay: Línea de código AR no válida: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Error de Action Replay: Tipo de Código Normal no válido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Código Normal %i: Subtipo no válido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Código Normal 0: Subtipo no válido %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "Adaptador detectado"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "Adaptador no detectado"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Añadir"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Añadir código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Añadir parche"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Añadir nueva ventana"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Añadir..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Dirección:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Añade el valor especificado al parámetro zFar.\n"
-"Dos maneras de expresar valores de coma flotante.\n"
-"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos "
-"iguales, el valor adquirido será \"0.0002\"\n"
-"Valores: (0->+/-Integer) or (0->+/-FP[6 dígitos de precisión])\n"
-"\n"
-"NOTA: Consulta LogWindow/Consola para ver los valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Añade el valor especificado al parámetro zNear.\n"
-"Dos maneras de expresar valores de coma flotante.\n"
-"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos "
-"iguales, el valor adquirido será \"0.0002\"\n"
-"Valores: (0->+/-Integer) or (0->+/-FP[6 dígitos de precisión])\n"
-"\n"
-"NOTA: Consulta LogWindow/Consola para ver los valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
-"Ajusta la presión requerida del control analógico para activar los botones."
+"Ajusta la presión necesaria para que el control analógico pueda activar "
+"botones."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "Todos los archivos GameCube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Todos los archivos Gamecube GCM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Todos los estados guardados (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Todos los archivos ISO de Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Todos los archivos (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analizar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Ángulo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
-msgstr "Filtro anisotrópico:"
+msgstr "Filtrado anisotrópico:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Antialias:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
-msgid "Apploader is the wrong size...is it really an apploader?"
-msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?"
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Fecha Apploader:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
+msgid "Apploader is the wrong size...is it really an apploader?"
+msgstr "Apploader tiene un tamaño incorrecto... ¿Es realmente un apploader?"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader no puede cargar desde el archivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -725,16 +724,12 @@ msgstr ""
 "\n"
 "Si no estás seguro, selecciona (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Árabe"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "¿Estás seguro de que quieres borrar \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -742,54 +737,81 @@ msgstr ""
 "¿Seguro que quieres borrar estos archivos?\n"
 "¡Desaparecerán para siempre!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (experimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64 JIT (experimental)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Relación de aspecto:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
-msgstr "Al menos una ventana debe permancer abierta."
+msgstr "Al menos una ventana debe permanecer abierta."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Motor de audio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
-msgid "AudioCommon: Error opening AO device.\n"
-msgstr "AudioCommon: Error al abrir dispositivo AO.\n"
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Configuración de audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
+msgid "AudioCommon: Error opening AO device.\n"
+msgstr "AudioCommon: Error al abrir dispositivo de salida de audio (AO).\n"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Australia"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "Autores"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Automático"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (múltiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (tamaño de ventana)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
-msgstr "Autoajuste del tamaño de la ventana"
+msgstr "Autoajustar tamaño de ventana"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -799,256 +821,254 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "Registro BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Atrás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Configuración del motor"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Motor:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
-msgstr "Entrada sin foco"
+msgstr "Entrada en segundo plano"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Atrás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Cabecera de archivo incorrecta"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Imagen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Detalles de la imagen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Imagen:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bajo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Batería"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "La suma de verificación de la tabla de localización de bloques falló"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Bloques"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul derecha"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Inferior"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controles asignados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Rama: %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Roto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Busca un directorio para añadir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Buscar un directorio de ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Busca un directorio de salida"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Búfer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Botones"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
-"Salta la limpieza de la caché de la instrucción DCBZ. Normalmente deja esta "
-"opción deshabilitada."
+"Se salta la limpieza de la caché de la instrucción DCBZ. Normalmente "
+"deberías dejar esta opción deshabilitada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Stick C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr "Registro CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
-msgstr "Emulador de CPU"
+msgstr "Motor de emulación de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Caché de listas de visualización"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "Opciones de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcular la iluminación de los gráficos 3D por píxel en lugar de por "
-"vértice.\n"
-"Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo de "
-"la GPU).\n"
-"Esto generalmente es una mejora segura, pero a veces puede causar "
-"problemas.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Si no estás seguro, déjala sin marcar."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "No se puede encontrar un WiiMote por el gestor de conexión %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "No se puede encontrar un Wiimote por el gestor de conexión %02x"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "No se puede abrir %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "No se puede cancelar el registro de eventos con eventos pendientes"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 "No se puede usar ese archivo como una tarjeta de memoria.\n"
 "%s\n"
-"no es un fichero válido de tarjeta de memoria de Gamecube"
+"no es un fichero válido de tarjeta de memoria de GameCube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"No se puede usar ese archivo como una tarjeta de memoria.\n"
-"¿Estás intentando usar el mismo archivo en ambas ranuras?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Bloq Mayús"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalán"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centro"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Cambiar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Cambiar &disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Cambiar disco"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Cambiar juego"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1056,76 +1076,63 @@ msgstr ""
 "Cambiar el idioma de la interfaz de usuario.\n"
 "Requiere reiniciar el programa."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Cambia el signo del parámetro zFar (después de la corrección)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Cambia el signo del parámetro zNear (después de la corrección)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Código de truco"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Buscar trucos"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Administrador de trucos"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Comprobar integridad de la partición"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Buscar actualizaciones:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Comprobando integridad..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chino (Simplificado)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chino (Tradicional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Escoge un directorio raíz de DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Escoge un directorio raíz para la NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Escoge una ISO por defecto:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Escoge un directorio para añadir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Escoge un archivo para abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Escoge una tarjeta de memoria:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1133,211 +1140,258 @@ msgstr ""
 "Escoge el archivo a usar como apploader: (se aplica a los discos construidos "
 "a partir de directorios solamente)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Escoge la carpeta de destino"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clásico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Limpiar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
-"¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay "
-"ha sido deshabilitado. Debes detener el juego manualmente."
+"El cliente se desconectó mientras el juego estaba ejecutándose. El Juego en "
+"red se ha desactivado. Debes detener el juego manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Cerrar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Información del código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Comentario"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Comentario:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Comprimiendo ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configuración"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configurar control"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configurar mandos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Confirmar sobrescritura de archivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Confirmar al detenerse"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Conectar la Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Conectar teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Consola"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Escaneo continuo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Mandos"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Convertir a GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Fallo al copiar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Copiar a tarjeta de memoria %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Núcleo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "No se pudo crear %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "No se pudo inicializar el motor %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"No se pudo leer \"%s\". No hay disco en la unidad, o no es una copia de "
-"seguridad de GC/Wii. Ten en cuenta que discos de Gamecube o Wii originales "
-"no pueden ser leídos en la mayoría de los lectores DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "No se pudo reconocer el archivo ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "No se pudo guardar %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1358,11 +1412,19 @@ msgstr ""
 "Si es así, entonces es posible que tengas que volver a especificar la "
 "ubicación de la tarjeta de memoria en las opciones."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "No se pudo encontrar el comando para abrir la extensión 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1370,38 +1432,46 @@ msgstr ""
 "No se pudo iniciar el núcleo.\n"
 "Revisa tu configuración."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Cuenta:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "País:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Crear Código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Crear nueva perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Creador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Crítico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Recortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1411,201 +1481,192 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Fundido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 "¡El directorio actual ha cambiado de %s a %s después de wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Hack de proyección personalizado"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Configuración del hack de proyección personalizado"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Personalizar algunos párametros de la proyección ortográfica."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Checo"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Pad direccional"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Motor de emulación DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulación DSP HLE (rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Intérprete DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Recompilador DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Configuración DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLLE en un hilo separado."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Raíz DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Error fatal: fallo al leer del volumen"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Alfombra de baile"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Tamaño de datos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Fecha:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Archivos Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zona muerta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Depurar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Depuración"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISO seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Descomprimir ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
-msgstr "Reducir límite de Frames"
+msgstr "Reducir límite de frames"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
-msgstr "Predeterminado"
+msgstr "Resetear"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ISO por defecto:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Fuente por defecto"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Borrar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Borrar guardado"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "¿Borrar el archivo existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Descripción"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Se detectó un intento de leer más datos del DVD de los que entran en el "
-"búfer. Truncando."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Configuración del dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Marcar"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1613,20 +1674,23 @@ msgstr ""
 "Falló la suma de verificación del directorio\n"
 " y falló la suma de verificación del directorio backup"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Desactivar destino Alfa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Deshabilitar niebla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1641,292 +1705,213 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Desactiva la emulación de copias EFB.\n"
-"Se usan a menudo para el posprocesado o efectos de renderización a textura, "
-"así que activando esta opción se obtiene una gran mejora, pero casi siempre "
-"causará problemas.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Desactiva la emulación de una característica de hardware llamada destino "
-"alfa, que se utiliza en muchos juegos para diversos efectos gráficos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Error de lectura de disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Pantalla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Muestra las entradas que lee el emulador.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "¿Quieres detener la emulación actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decodificador Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revisión: %s\n"
-"Compilado: %s @ %s\n"
-"\n"
-"Dolphin es un emulador de Gamecube/Wii que fue\n"
-"originalmente escrito por  F|RES y ector.\n"
-"Hoy  Dolphin es un proyecto open surce con muchos desarroladores\n"
-"demasiados para ennumerarlos.\n"
-"Si estas interesado consulta la web del proyecto en\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Agradecimientos especiales a Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik por su\n"
-"ingeneria inversa y la documentación/demos.\n"
-"\n"
-"Agradecimientos enormes a Gilles Mouchard \n"
-"cuyo emulador de Microlib PPC permitió a \n"
-"nuestro desarrollo un comienzo rápido.\n"
-"\n"
-"Gracias a  Frank Wille por su desamblandor de PowerPC ,\n"
-"which or9 y  nosotros modificamos para incluir las especificaciones de "
-"Gekko.\n"
-"\n"
-"Gracias a hcs/destop por su decodificador de GC ADPCM.\n"
-"\n"
-"No estamos afiliados con Nintendo de ninguna forma.\n"
-"Gamecube and Wii son marcas registradas de Nintendo.\n"
-"El emulador es para fines educativos\n"
-"y no debe ser usado para jugar a juegos\n"
-"que no se posean legalmente."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuración gráfica %s de Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "&Website de Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configuración de Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuración de Wiimote emulado de Dolphin"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Configuración de GCPad Dolphin"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
-msgid "Dolphin TAS Movies (*.dtm)"
-msgstr "Películas TAS de Dolphin (*.dtm)"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Configuración de Wiimote de Dolphin"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin en &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
-msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
-"Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para "
-"buscar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
+msgid "Dolphin TAS Movies (*.dtm)"
+msgstr "Grabación TAS de Dolphin (*.dtm)"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
+msgid ""
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin está configurado actualmente para esconder todos los juegos. Haz "
-"doble clic aquí para mostrarlos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin no ha podido completar la acción solicitada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Duplica la velocidad de reloj de la GPU emulada. Puede acelerar algunos "
-"juegos (ON = Rápido, OFF = Compatible)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Abajo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Descargar códigos (base de datos de WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Se descargaron %lu códigos. (%lu añadidos)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambores"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Falso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
-msgstr "Depósito de audio"
+msgstr "Volcar audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Volcar objetivo EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Volcar frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Volcar texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Volcar todos los frames renderizados a un fichero AVI en User/Frames/\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Volcar texturas de juego a User/Dump/Textures/<id del juego>/\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Volcar el contenido de las copias EFB a User/Dump/Texturas/\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holandés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Salir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Copias de EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1939,56 +1924,40 @@ msgstr ""
 "de Dolphin, puede que se necesite reiniciar para que Windows reconozca el "
 "nuevo controlador."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Actualización frecuente de memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Editar"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Editar código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Editar configuración"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Editar cambios locales"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Editar parche"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Editar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efecto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Búfer de fotogramas embebido"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "El proceso de emulación ya está ejecutándose"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -2003,7 +1972,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, activa Emulación virtual de XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2019,121 +1988,92 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wiimote emulado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Estado de emulación:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Habilitar"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Activa el 3D esteroscópico usando la tecnología NVIDIA 3D Vision si tu "
-"tarjeta gráfica lo soporta.\n"
-"Probablemente cause problemas.\n"
-"Requiere pantalla completa para funcionar.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Habilitar Registro de AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Habilitar asociación de bloques"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Permitir el cálculo del cuadro delimitador"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Habilitar caché"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Habilitar trucos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Habilitar doble núcleo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Habilitar doble núcleo (mejora)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Habilitar salto de fotogramas inactivos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Habilitar salto de fotogramas inactivos (mejora)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Habilitar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Habilitar escaneado progresivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Habilitar salvapantallas"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
-msgstr "Activar datos de altavoz"
+msgstr "Activar envío de datos al altavoz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Habilitar pantalla panorámica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Habilitar \"alambrado\" (wireframe)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Habilitar filtro anisotrópico.\n"
-"Mejora la calidad de las texturas que tienen un ángulo de visión obliquo.\n"
-"Puede causar problemas en algunos juegos.\n"
-"\n"
-"Si no estás seguro, elige 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = "
-"Rápido, OFF = Compatible)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Habilitar páginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2146,7 +2086,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2158,32 +2098,25 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. "
-"Deshabilitar para CUALQUIER OTRO juego."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Habilta un hack de proyección personalizado"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Activa la emulación de Dolby Pro Logic II usando 5.1 surround. No disponible "
-"en OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
-msgstr "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2195,7 +2128,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2203,7 +2136,11 @@ msgstr ""
 "Habilita la Unidad de Manejo de Memoria, necesario para algunos juegos. (ON "
 "= Compatible, OFF = Rápido)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2213,52 +2150,63 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fin"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Inglés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Mejoras"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Escribe un nombre para la nueva perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Error al cargar el idioma seleccionado. Volviendo al predeterminado del "
 "sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2267,7 +2215,7 @@ msgstr ""
 "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vez de la marca de "
 "guardado %d (0x%X). Cancelando carga del guardado..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2276,218 +2224,191 @@ msgstr ""
 "Error: Se intentó acceder a %s fuentes, pero no han sido cargadas. Los "
 "juegos pueden no mostrar las fuentes correctamente, o tener errores."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "Europa"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Salir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exportar todos los guardados de Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Fallo al exportar"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportar archivo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportar grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportar grabación..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportar guardado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar guardado a uno de Wii (experimental)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportar todos los guardados"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr "Exportación fallada."
+msgstr "Exportación fallada"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exportar guardado como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extensión"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Buffer de frames externo"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Parámetro extra"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parámetro extra que es útil en «Metroid: Other M» exclusivamente."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extraer todos los archivos..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extraer Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extraer DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extraer directorio..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extraer archivo..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extraer partición..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrayendo %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extrayendo todos los archivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Extrayendo directorio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extrayendo..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Byte de FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
-msgstr "Jugador FIFO"
+msgstr "Reproductor FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANCIA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Tamaño del FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "¡Fallo al conectar!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Fallo al descargar los códigos."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Fallo al extraer a %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Fallo al cargar DSP ROM:»%s\n"
-"\n"
-"Este fichero se requiere para usar DSP LLE.\n"
-"No está incluido con Dolphin porque contiene datos con copyright.\n"
-"Usa DSPSpy para extraer el fichero de tu Wii física.\n"
-"\n"
-"Puedes usar el motor DSP HLE, que no requiere extraer la ROM.\n"
-"(Elígelo en la pestaña \"Audio\" de la ventana de configuración.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Fallo al cargar bthprops.dll. La conexión de mandos reales no funcionará y "
-"Dolphin puede fallar inesperadamente."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Fallo al cargar hid.dll. La conexión de mandos reales no funcionará y "
-"Dolphin puede fallar inesperadamente."
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Error al leer %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Fallo al leer banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Fallo al leer la cabecera bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Falló al leer el bloque %d de los datos guardados.\n"
-"La tarjeta de memoria puede estar truncada.\n"
-"Posición del fichero:%llx"
+"Falló al leer el bloque %d de los datos guardados\n"
+"La tarjeta de memoria puede estar truncada\n"
+"Posición del fichero:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2495,7 +2416,7 @@ msgstr ""
 "Falló leer la tabla de asignación de bloques de respaldo correctamente\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2503,17 +2424,12 @@ msgstr ""
 "Falló leer la tabla de asignación de bloques correctamente\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Fallo al leer los datos del archivo %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Fallo al leer los datos del archivo: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2521,7 +2437,7 @@ msgstr ""
 "Falló la lectura del directorio de respaldo\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2529,11 +2445,7 @@ msgstr ""
 "Falló la lectura del directorio\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Fallo al leer la cabecera"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2541,50 +2453,35 @@ msgstr ""
 "Falló leer la cabecera correctamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Fallo al leer la cabecera del fichero %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Fallo al leer la ID única de la imagen de disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Fallo al escribir BT.DINF a SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Fallo al escribir bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Fallo al escribir los datos en el fichero %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Fallo al escribir la cabecera para %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Persa"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Cálculo de profundidad rápido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Versión rápida del MMU. No funciona para todos los juegos."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2592,23 +2489,27 @@ msgstr ""
 "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !"
 "= %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
-msgstr "Jugador Fifo"
+msgstr "Reproductor Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Información del fichero"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "El archivo no contenía códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Archivo convertido a .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2616,7 +2517,7 @@ msgstr ""
 "El archivo no pudo ser abierto\n"
 "o no tiene una extensión válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2625,97 +2526,93 @@ msgstr ""
 "El archivo tiene la extensión \"%s\"\n"
 "Extensiones válidas son (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "El archivo no es reconocido como una tarjeta de memoria"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Archivo sin comprimir"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Modo desconocido de apertura : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Sistema de archivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "¡Tipo de archivo 'ini' desconocido¡ !No se abrirá!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Encontrar siguiente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Encontrar anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Primer bloque"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Reparar sumas de verificación"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forzar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forzar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Forzar consola como NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forzar filtrado de texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Fuerza el filtro bilinear de textura, incluso aunque el juego lo deshabilite "
-"explícitamente.\n"
-"Mejora la calidad de textura (especialmente cuando se usa una resolución "
-"interna alta), pero puede causar errores gráficos en algunos juegos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Obliga al juego a producir gráficos para resoluciones panorámicas "
-"(widescreen).\n"
-"Ten en cuenta que esto puede causar errores gráficos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Fuerza el modo NTSC-J para usar la ROM de la fuente japonesa.\n"
-"Deja sin marcar, Dolphin por defecto usa NTSC-U y activa automáticamente "
-"esta característica cuando se juega a juegos japoneses."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2723,556 +2620,580 @@ msgstr ""
 "¿Dar formato como ASCII (NTSC\\PAL)?\n"
 "Elige no para sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Adelante"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Reenviar puerto (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "%d coincidencias para '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Encontrados %x ficheros de guardado"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avanzar &fotogramas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Volcado de fotogramas usa FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Info del frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Información de la grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Salto de &fotogramas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Límite de fotogramas:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Frames a grabar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "Francia"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Cámara libre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francés"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Cuerdas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Desde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Pant. compl."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Resolución en pantalla completa:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Archivo GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "Pad GC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID del juego:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "¡El juego ya está ejecutándose!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "¡El juego no está ejecutándose!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "¡Juego no encontrado!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Configuración específica del juego"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Configurar Juego"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "&Configuración del mando Gamecube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Configuración del Pad de Gamecube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Códigos Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Código Gecko falló al ejecutar (CT%i CST%i) (%s)\n"
-"(puede ser un código incorrecto o su tipo no es soportado todavía. Prueba "
-"usando el controlador de código nativo colocando el fichero codehandler.bin "
-"en el directorio Sys y reiniciando Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "General"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Ajustes generales"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Alemán"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Alemania"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: El índice es mayor que el tamaño de la lista de códigos AR %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Configuración gráfica"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Mayor que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Mejora bastante la calidad de las texturas generadas usando los efectos de "
-"renderización para la textura.\n"
-"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n"
-"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente "
-"improbable).\n"
-"\n"
-"Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Griego"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde derecha"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Falló la suma de verificación de cabecera"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Ayuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hola,\n"
-"\n"
-"Dolphin requiere Mac OS X 10.7 o superior.\n"
-"Desafortunadamente estás utilizando una versión antigua de OS X.\n"
-"La última version de Doplhin compatible con OS X10.6 es Dolphin 3.5\n"
-"Por favor actualiza a 10.7 o superior para usar la versión más nueva de "
-"Dolphin.\n"
-"\n"
-"¡Adiós!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hola,\n"
-"\n"
-"Dolphin requiere que tu CPU soporte extensiones SSE2.\n"
-"Desafortunadamente, tu CPU no las soporta, así que Dolphin no funcionará.\n"
-"\n"
-"¡Adiós!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Esconder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Esconder cursor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Esconde el cursor del ratón si está en la parte de arriba de la ventana del "
-"emulador.\n"
-"\n"
-"Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Hostear"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Configuración de atajos"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Atajos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Wiimote híbrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Se trató de obtener los datos de un ticket desconocido: "
 "%08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: El juego intentó recargar el IOS o un título que no está "
-"disponible en su volcado de NAND\n"
-"TitleID %016llx.\n"
-"Dolphin probablemente se colgará ahora."
+"IOCTL_ES_LAUNCH: El juego intentó recargar un título que no está disponible "
+"en tu volcado NAND\n"
+"TitleID %016<PRIx64>.\n"
+"Es probable que Dolphin se bloquee en breve."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - destino incorrecto"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Configuración IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Puntero IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Sensibilidad IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Detalles de la ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Directorios de ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Icono"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Si se elige, los registros del cuadro delimitador serán actualizados. Es "
-"usado por los juegos de Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorar cambios de formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignorar cualquier cambio hacia el formato EFB.\n"
-"Mejora el rendimiento en muchos juegos sin ningún efecto negativo. Causa "
-"errores gráficos en un pequeño número de juegos.\n"
-"\n"
-"Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignorar cualquier petición de la CPU de leer o escribir el EFB.\n"
-"Mejora el rendimiento en algunos juegos, pero puede desactivar algunas "
-"características relacionadas con el juego o efectos gráficos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importar Guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importar guardado de Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr "Importación fallada"
+msgstr "Fallo al importar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"El archivo importado tiene una extensión .gsc\n"
-"pero no tiene la cabecera correcta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "El archivo importado tiene una longitud no válida"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"El archivo importado tiene extensión .sav\n"
-"pero no tiene la cabecera correcta"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "En juego"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
-msgid "Increase Frame limit"
-msgstr "Aumentar límite de Frames"
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
+msgid "Increase Frame limit"
+msgstr "Aumentar límite de frames"
+
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Información"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Información"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insertar"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Insertar código encriptado o desencriptado aquí..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Insertar tarjeta SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Insertar un nombre aquí.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Instalar al menú de la Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta "
-"todavía."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Instalando WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Error de comprobación de la integridad"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Comprobación de la integridad finalizada"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Comprobación de la integridad finalizada. No se encontraron errores."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Falló la comprobación de la integridad para la partición %d. Tu volcado está "
-"probablemente corrupto o ha sido parcheado incorrectamente."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interfaz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Configuración de la interfaz"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Error Interno de LZO - Fallo al comprimir"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3281,103 +3202,106 @@ msgstr ""
 "Error Interno de LZO - fallo al descomprimir  (%d) (%li, %li) \n"
 "Tratando de cargar el estado de nuevo"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Error Interno de LZO - lzo_init() falló"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Resolución interna:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Intérprete (MUY lento)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Tamaño no válido(%x) o Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "¡Valor no válido!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "bat.map o entrada de directorio no válido"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Evento de tipo %i no válido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Archivo no válido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"opening.bnr no váldio encontrado en gcm:\n"
-"%s\n"
-"Puede ser que necesites volcar este juego de nuevo."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Archivo de grabación no válido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Parámetros de búsqueda inválidos (ningún objeto seleccionado)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Estado no válido"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPÓN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "Italia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "Recompilador JIT (recomendado)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Recompilador experimental JITIL"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "Recompilador JITIL (más lento, experimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "Japón"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "COREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3387,64 +3311,75 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Mantener la ventana siempre visible"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Clave"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "Corea"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Botón L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Último %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latencia:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick izquierdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"Clic izquierdo para detectar atajos.\n"
-"Introduce espacio para limpiar."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Stick izquierdo"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3454,7 +3389,7 @@ msgstr ""
 "Clic medio para borrar.\n"
 "Clic der. para más opciones."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3462,203 +3397,211 @@ msgstr ""
 "Clic izq./der. para más opciones.\n"
 "Clic medio para borrar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Menor que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Usar FPS para limitar"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "Licencia"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Cargar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Cargar texturas personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Cargar estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Cargar último estado 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Cargar último estado 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Cargar último estado 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Cargar último estado 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Cargar último estado 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Cargar último estado 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Cargar último estado 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Cargar último estado 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "&Cargar estado 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Cargar estado 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "&Cargar estado 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "&Cargar estado 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "&Cargar estado 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "&Cargar estado 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "&Cargar estado 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "&Cargar estado 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "&Cargar estado 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Cargar estado 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Cargar estado..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Cargar Menú de sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Cargar Menú de sistema Wii %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Cargar texturas personalizadas desde User/Load/Textures/<id del juego>/\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Cargar valores ya definidos de los patrones de hack disponibles."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Registrar"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configuración de registro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Escribir FPS en un fichero"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Tipos de registro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Registrar el número de fotogramas renderizados por segundo a User/Logs/fps."
-"txt. Usa esta característica cuando quieras medir el rendimiento de "
-"Dolphin.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Salida de registro"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Registrando"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "¡Se perdió la conexión con el servidor!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Botón M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 no coinciden\n"
-"%016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Hack de velocidad MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Archivos MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Stick principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID del fabricante:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Fabricante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3673,29 +3616,33 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Máx."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "La tarjeta de memoria ya tiene un guardado para este juego"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "La tarjeta de memoria ya está abierta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Byte de memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Tarjeta de memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3703,7 +3650,7 @@ msgstr ""
 "Administrador de tarjetas de memoria. ADVERTENCIA: Haz copias antes de "
 "usarlo; debería estar arreglado, ¡pero puede estropear cosas!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3720,39 +3667,54 @@ msgstr ""
 "%s\n"
 "¿Deseas copiar el viejo archivo a esta nueva dirección?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "El tamaño del fichero de la tarjeta de memoria no corresponde con el tamaño "
 "de la cabecera."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menú"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mic"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Mín."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Varios"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Configuraciones varias"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3764,20 +3726,24 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Fuente monoespaciada"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3795,337 +3761,307 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "NOTA: El tamaño del flujo no coincide con la longitud actual de los datos\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Añadir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Iniciar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Borrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP Fin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Entrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Hogar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insertar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Izquierda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Pág. Abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Pág. Arriba"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Derecha"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Espacio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
-msgstr "NP Sustraer"
+msgstr "NP Restar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Arriba"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nombre:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nombre:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Archivos nativos GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nuevo escaneado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Próximo escaneado"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Apodo:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Ningún país (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Ninguna ISO o WAD ha sido encontrada."
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Sin salida de audio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "No se encontró una imagen para el juego %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Sin descripción"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Sin acoplamiento"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "No se ha cargado ningún fichero"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "No hay entradas de índice de directorio libres"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "No hay grabaciones guardadas"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "No se encontró carpeta de guardado para el juego %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Ninguno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Noruego Bokmal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "No igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "No definido"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"No es un guardado de Wii o fallo de lectura para la cabecera de archivo de "
-"tamaño %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Sin conectar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notas"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Aviso"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Bloq Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Número de códigos:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Aceleración del nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objeto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Rango de objeto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Off"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Mensajes en pantalla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "&Documentación online"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Solo %d bloques disponibles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Abrir directorio &contenedor"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Abrir carpeta de guardado&s de Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Abrir archivo..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: no se puede crear el contexto para el dispositivo %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: no se encuentran dispositivos de sonido"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: no se puede abrir el dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Descodificador de texturas OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Descodificador de texturas OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
-"Abre la configuración por defecto (modo solo lectura) para este juego en un "
+"Abre la configuración por defecto (modo sólo lectura) para este juego en un "
 "editor de texto externo."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr "Abre los cambios locales del usuario en un editor de texto externo"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opciones"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Naranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4136,345 +4072,326 @@ msgstr ""
 "Haz clic derecho y exporta todos los guardados,\n"
 "e impórtalos a una nueva tarjeta de memoria\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Otros"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! "
-"NetPlay ha sido deshabilitado. Debes detener el juego manualmente."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Salida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "&Reproducir grabación"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Pág. abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Pág. arriba"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Párrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parámetros"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partición %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "No existe la partición: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Parches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Directorios"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pausar al acabar la película"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Iluminación por píxel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfecto"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Reproducir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Reproducir grabación"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Reproducir/pausa"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Jugable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Opciones de reproducción"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Jugadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Confirma, por favor..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Por favor, crea una perspectiva antes de guardar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Más-menos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polaco"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Puerto 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Puerto 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Puerto 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Puerto 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Puerto:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugués"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasil)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Efecto de posprocesado:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr "Final prematuro de la película en PlayController. %u + 8 > %u"
+msgstr "Final prematuro de la grabación en PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u"
+msgstr "Final prematuro de la grabación en PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr "Final prematuro de la película en PlayWiimote. %u > %u"
+msgstr "Final prematuro de la grabación en PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Predefinidos:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Página previa"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Propiedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Limpiar caché"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Pregunta"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Salir"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Botón R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radio"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Rango"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Solo lectura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Balance Board real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Wiimote real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Wiimotes reales"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Grabar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Grabar entrada"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Información de la grabación"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opciones de grabación"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rojo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rojo izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rojo derecha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Reduce el efecto sierra causado por la rasterización de gráficos 3D.\n"
-"Esto hace que la imagen se vea menos pixelada.\n"
-"Reduce el rendimiento fuertemente y puede causar problemas.\n"
-"\n"
-"Si no estás seguro, selecciona Ninguno."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Actualizar lista de juegos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Eliminar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4484,246 +4401,320 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Renderizar a ventana principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Volver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisión:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "Revisión: %s"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Derecha"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
-msgstr "Stick Derecho"
+msgstr "Stick derecho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Stick derecho"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibración"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"Ejecuta DSP LLE en un hilo dedicado (no está recomendado: puede causar "
-"congelamientos)"
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "Rusia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Ruso"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Guardar estado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Guardar GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Guardar el estado más antiguo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Guardar estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
-msgstr "Guardar estado 1"
+msgstr "Ranura de guardado 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Ranura de guardado 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
-msgstr "Guardar estado 2"
+msgstr "Ranura de guardado 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
-msgstr "Guardar estado 3"
+msgstr "Ranura de guardado 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
-msgstr "Guardar estado 4"
+msgstr "Ranura de guardado 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
-msgstr "Guardar estado 5"
+msgstr "Ranura de guardado 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
-msgstr "Guardar estado 6"
+msgstr "Ranura de guardado 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
-msgstr "Guardar estado 7"
+msgstr "Ranura de guardado 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
-msgstr "Guardar estado 8"
+msgstr "Ranura de guardado 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Ranura de guardado 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Guardar estado..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Guardar GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Guardar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Guardar GCM/ISO descomprimido"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
-msgstr ""
-"El estado guardado de la película %s está corrupto, deteniendo la "
-"grabación..."
+msgstr "El estado de la grabación %s está corrupto, deteniendo la grabación..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
-msgstr "EFB Copia a escala"
+msgstr "Copia de EFB a escala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
-msgstr "Escaneando %s"
+msgstr "Buscando %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Buscando ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
-msgstr "Escaneando..."
+msgstr "Buscando..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Pantallazo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Bloq. desplazamiento"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Buscar en subcarpetas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Buscar objeto actual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Buscar valor hexadecimal:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "No se ha encontrado la sección %s en SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "Seleccionar columnas"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr "Seleccionar ranura %i"
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Seleccionar archivo de grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Elige un WAD de Wii para instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Elige un adaptador de hardware para su uso.\n"
-"\n"
-"Si no estás seguro, usa el primero."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Selecciona un archivo de guardado para importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Selecciona las ventanas flotantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Selecciona el archivo para cargar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Selecciona el archivo de guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Selecciona el estado para cargar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Selecciona el estado para guardar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4741,277 +4732,293 @@ msgstr ""
 "\n"
 "Si no estás seguro, elige Automático."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "El perfil del controlador escogido no existe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
-msgstr "Fuente seleccionada"
+msgstr "Tipografía seleccionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Selecciona la resolución de la pantalla usada en el modo de pantalla "
-"completa.\n"
-"Debería ser siempre mayor o igual que la resolución interna. La pérdida de "
-"rendimiento es insignificante.\n"
-"\n"
-"Si no estás seguro, elige la resolución que uses en el escritorio.\n"
-"Si sigues inseguro, elige la mayor resolución que te funcione."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Elige la aplicación gráfica para ser usada internamente.\n"
-"Direct3D 9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D 11 "
-"está entre las dos.\n"
-"Los sistemas Direct3D solo están disponibles en Windows.\n"
-"\n"
-"Si no estás seguro, utiliza Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Elige la aplicación gráfica para ser usada internamente.\n"
-"Direct3D 9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D 11 "
-"está entre las dos.\n"
-"Los sistemas Direct3D solo están disponibles en Windows.\n"
-"\n"
-"\n"
-"Si no estás seguro, utiliza OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Enviar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Posición de la barra sensora:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbio"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Puerto serie 1 - Este es el puerto que dispositivos como el adaptador de red "
-"usan."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Definir como ISO por &defecto"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Definir como Memory Card por defecto %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos "
 "AR %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Ajusta la latencia (en ms). Valores más altos pueden reducir el petardeo del "
-"audio. Solo para el motor OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Configuración..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: No se puede crear el archivo de configuración"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Sacudir"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Nombre corto:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Botones laterales"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Mostrar &consola"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Mostrar &registro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Mostrar barra de e&stado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Mostrar barra de herramien&tas"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Mostrar valores por defecto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Mostrar unidades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar regiones de copiado de EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Mostrar Francia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
-msgstr "Mostrar Gamecube"
+msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Mostrar entrada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Mostrar Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Mostrar JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Mostrar Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Mostrar idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Mostrar configuración de &registro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Mostrar plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Mostrar regiones"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Mostar estadísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwán"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Mostrar USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Mostrar WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar una ventana de confirmación antes de detener un juego."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Muestra una alerta cuando un posible error crítico haya ocurrido.\n"
-"Deshabilitando esto puedes evitar ver mensajes molestos que no son fatales, "
-"pero también significa que Dolphin puede cerrarse ante un error sin ninguna "
-"explicación."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Mostrar primer bloque"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Mostrar contador de lag"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Mostrar mensajes en el área de emulación. Estos mensajes incluyen escritura "
-"de tarjetas de memoria, sobre el motor de vídeo, información sobre la CPU y "
-"limpieza de la caché JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Mostrar bloques de guardado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mostrar comentario del guardado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Mostrar icono del guardado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Mostrar título del guardado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5023,84 +5030,82 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Mostrar desconocido"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Muestra varias estadísticas.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
-msgstr "Wiimote de costado"
+msgstr "Wiimote en horizontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Tamaño"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Saltar BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Saltar limpieza DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Saltar el acceso al EFB desde la CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de "
-"emulación.\n"
-"A veces también aumenta la calidad visual.\n"
-"Si experimentas cualquier problema, prueba a aumentar la precisión de la "
-"caché de textura o desactiva esta opción.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Ranura %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Ranura A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Ranura B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Instántanea"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderizado por software"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5112,154 +5117,173 @@ msgstr ""
 "¿Realmente quieres activar renderizado por software? Si no estás seguro, "
 "elige No."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Configuración de sonido"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "El motor de sonido %s no es válido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Falló la creación del búfer de sonido: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Espacio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "España"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Español"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volumen del altavoz:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Especifica la resolución usada para renderizar. Una resolución alta mejorará "
-"mucho la calidad visual, pero reducirá el rendimiento y puede causar errores "
-"gráficos en algunos juegos.\n"
-"\"Múltiplo de 640x528\" es un poco más lento que \"Tamaño de la ventana\", "
-"pero provoca menos errores. Como norma general, a menor resolución interna "
-"obtendrás mejor rendimiento.\n"
-"\n"
-"Si no estás seguro, elige 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Acelerar la transferencia de disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Stick cuadrado"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Control estándar"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Comenzar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
-msgstr "Comenzar &NetPlay"
+msgstr "Comenzar &Juego en red"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Comenzar graba&ción"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Comenzar grabación"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Estados guardados"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Detener"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Almacena copias de EFB en los objetos textura de GPU.\n"
-"Esto no es tan preciso, pero funciona bastante bien para la mayoría de los "
-"juegos y le da un gran aumento de velocidad de sobre EFB a RAM.\n"
-"\n"
-"Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Estirar a la ventana"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
-msgstr "Rasgar"
+msgstr "Rasgueo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
-msgstr "Sustraer"
+msgstr "Restar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Se exportó correctamente al archivo %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Los archivos de guardado se han importado con éxito."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Sueco"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Oscilar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Sincronizar subproceso de GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5267,81 +5291,110 @@ msgstr ""
 "Sincroniza los procesos de la GPU y la CPU para ayudar a prevenir bloqueos "
 "aleatorios en el modo a Doble Núcleo. (ON = Compatible, OFF = Rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Idioma del sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWÁN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Pestaña"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "División de pestaña"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
-msgstr "Tabla izquierda"
+msgstr "Plato izquierdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
-msgstr "Tabla derecha"
+msgstr "Plato derecho"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "Taiwán"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Captura de pantalla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
-msgstr "Prueba"
+msgstr "Probar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Caché de texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Superposición del formato de la textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "El WAD ha sido instalado con éxito"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "La dirección no es válida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "La suma de verificación fue reparada con éxito."
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "El directorio escogido ya se encuentra en la lista"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5350,7 +5403,7 @@ msgstr ""
 "El archivo %s ya existe.\n"
 "¿Deseas remplazarlo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5359,47 +5412,34 @@ msgstr ""
 "El archivo %s no pudo ser abierto para su escritura. Por favor, comprueba si "
 "no está ya abierto por otro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "El archivo especificado (%s) no existe"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "El nombre no puede estar vacío"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "El nombre no puede contener coma (,)"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Cuanto más seguro ajuste esto, menos probable será que el emulador pierda "
-"las actualizaciones de la textura de la memoria RAM.\n"
-"\n"
-"Si no estás seguro, utiliza el valor más a la derecha."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"El guardado que está tratando de copiar tiene un tamaño de archivo no válido"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5407,36 +5447,49 @@ msgstr ""
 "El idioma seleccionado no es soportado por tu sistema. Volviendo al "
 "predeterminado del sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
-msgstr "¡Las versiones de NetPlay del client y el servidor son incompatibles!"
+msgstr ""
+"Las versiones del Juego en red del cliente y el servidor son incompatibles."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "¡El servidor está lleno!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "El servidor respondió: ¡el juego actualmente está funcionando!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "¡El servidor envió un mensaje de error desconocido!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "El archivo especificado \"%s\" no existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "El valor no es válido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5444,7 +5497,7 @@ msgstr ""
 "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de "
 "NAND esté incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5452,7 +5505,7 @@ msgstr ""
 "Estas opciones remplazan a las opciones de núcleo de Dolphin.\n"
 "Sin determinar significa que el juego usa la configuración de Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5460,126 +5513,163 @@ msgstr ""
 "El simulador de Action Replay no soporta códigos que modifiquen al Action "
 "Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Esta característica te permite manejar la cámara del juego. \n"
-"\n"
-"Mantén pulsado el botón derecho del ratón y mueve el ratón para mover la "
-"cámara alrededor. Mantén pulsado SHIFT y pulsa una de las teclas WASD para "
-"mover la cámara por una distancia determinada de pasos (SHIFT + 0 multiplica "
-"(x2) y SHIFT+ 9 divide la misma (x0.5)). Presiona SHIFT + R para reiniciar "
-"la cámara. \n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Esto limita la velocidad de juego a un número específico de fotogramas por "
-"segundo (velocidad completa es 60 para NTSC y 50 para PAL). También puedes "
-"utilizar la regulación de audio con el DSP (puede arreglar los clics de "
-"audio, pero puede causar ruido constante dependiendo del juego)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Esto divide los procesos de vídeo y CPU para que se ejecuten en núcleos "
-"separados.\n"
-"Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero "
-"puede ocasionar errores gráficos o del programa."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Esto te permitirá editar manualmente el archivo de configuración INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Límite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Inclinar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Alternar todos los tipos de registro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Activar relación de aspecto"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Activar copias de EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Activar niebla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Cambiar a pantalla completa"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Activar IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Superior"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Se trató de cargar un archivo de tipo desconocido."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Gatillos"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Intentando leer de un SYSCONF no válido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5587,41 +5677,24 @@ msgstr ""
 "Intentando leer de un SYSCONF no válido\n"
 "bt ids del Wiimote no están disponibles"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turco"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Mesa de DJ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tipo"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Puerto UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "DESCONOCIDO"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONOCIDO_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5629,204 +5702,179 @@ msgstr ""
 "No se pudo crear el parche de los valores dados.\n"
 "Entrada no modificada."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"No es posible analizar la línea %lu del código AR introducido como un código "
+"No es posible analizar la línea %u del código AR introducido como un código "
 "válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n"
 "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Indefinido %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Deshacer cargar estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Deshacer estado guardado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "¿Llamada inesperada a 0x80? Cancelando..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando desconocido de DVD %08x - error fatal"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Comando desconocido 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "¡Entrada desconocida de tipo %i en SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Se recibió un mensaje desconocido de id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Arriba"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Actualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote parado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Usar Modo EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Usar pantalla completa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Usar hexadecimal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Usar advertencias"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Usa un sistema menos preciso para calcular los valores de profundidad.\n"
-"Provoca pequeños errores en unos pocos juegos pero da un notable aumento de "
-"velocidad.\n"
-"\n"
-"Si dudas déjalo sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Usa múltiples hilos para decodificar texturas.\n"
-"Debería obtenerse una mejora de velocidad (especialmente con CPU con más de "
-"dos núcleos).\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Usa operaciones inseguras para acelerar el streaming de vértices en Open GL. "
-"No hay problemas conocidos en GPUs soportadas, pero causa problemas severos "
-"y errores gráficos en las demás.\n"
-"\n"
-"Si dudas, déjalo sin marcar."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Habitualmente, si la compilación de los sombreadores falla se muestra un "
-"error.\n"
-"Sin embargo, pueden omitirse las ventanas emergentes para permitir el juego "
-"libre de la interrupción marcando esta opción.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilidad"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hack de velocidad VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
-msgstr "Verbosidad"
+msgstr "Nivel de detalle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hack del streaming de vértices"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Vídeo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volumen"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "La instalación del WAD falló: error al crear %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "La instalación del WAD falló: error al crear el ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5839,25 +5887,27 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Advertencia"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "¡Advertencia - arrancando un DOL en un modo de consola incorrecto!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "¡Advertencia - arrancando un ELF en un modo de consola incorrecto!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "¡Advertencia - arrancando un ISO en un modo de consola incorrecto!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5869,7 +5919,7 @@ msgstr ""
 "%s\n"
 "¿Quieres continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5883,18 +5933,26 @@ msgstr ""
 "y tienen el mismo nombre que el archivo en tu memcard\n"
 "¿Continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
 "%u > %u) (frame %u > %u). You should load another save before continuing, or "
 "load this state with read-only mode off."
 msgstr ""
-"Advertencia: Has cargado un guardado de después del final de la película "
-"actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otro guardado antes "
-"de continuar, o cargar éste sin el modo de solo lectura."
+"Advertencia: Has cargado un guardado de después del final de la grabación "
+"actual. (Byte %u > %u) (frame %u > %u). Deberías cargar otro guardado antes "
+"de continuar, o cargar éste sin el modo de sólo lectura."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5906,7 +5964,7 @@ msgstr ""
 "con el modo de solo lectura desactivado. De lo contrario probablemente "
 "obtengas una desincronización."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5940,188 +5998,175 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - el archivo no está abierto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
-msgstr "Hack de pantalla ancha (widescreen)"
+msgstr "Hack de pantalla panorámica"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Ancho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Raíz de la NAND de Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Archivos de guardado Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: No se pudo leer el archivo"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote conectado"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
-msgstr "Motor Wiimote"
+msgstr "Vibrador del Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Configuración Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
-msgstr "Windows Izquierda"
+msgstr "Windows izquierda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
-msgstr "Windows Menú"
+msgstr "Windows menú"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
-msgstr "Windows Derecha"
+msgstr "Windows derecha"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Word Wrap"
+msgstr "Ajuste de línea"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
-msgstr "Trabajando..."
+msgstr "Procesando..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Escribir memcards (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Escribir a la consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Escribir en el depurador"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Escribir al archivo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Escribir a la ventana"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice falló: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 init falló: %#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 creación de voz maestra falló: %#X"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr "Registro XF"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Estás utilizando una DSP ROM libre del Equipo Dolphin.\n"
-"Todos los juegos de Wii funcionarán correctamente, y la mayoría de juegos de "
-"GC deberían funcionar bien, pero los UCodes de GBA/IPL/CARD no funcionarán.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Estás utilizando una DSP ROM libre y antigua del Equipo Dolphin.\n"
-"Solo los juegos Ucode de Zelda funcionarán correctamente.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "No puede cerrar ventanas que tengan páginas en ellas."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "¡¡Debes elegir un juego!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "¡Debes escribir un nombre!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "¡Debes elegir un juego!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Debes escribir un nombre."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Debes introducir un valor decimal o hexadecimal válido."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Debes introducir un nombre de perfil válido."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
-"Tus DSP ROMs tienen un hash incorrecto.\n"
+"Tus ROMs de DSP tienen un hash incorrecto.\n"
 "¿Deseas detener ahora para arreglar el problema?\n"
 "Si seleccionas \"No\", el audio se oirá con ruidos."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6129,36 +6174,36 @@ msgstr ""
 "Su archivo GCM/ISO no parece ser válido (país no válido).\n"
 "¿Continuar con la región PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"Su archivo SYSCONF es de tamaño incorrecto.\n"
-"Debería ser 0x%04x (pero es 0x%04llx)\n"
-"¿Quiere crear uno nuevo?"
+"Tu archivo SYSCONF es de tamaño incorrecto.\n"
+"Debería ser 0x%04x (pero es  0x%04<PRIx64>)\n"
+"¿Quieres crear uno nuevo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Zelda TP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Código Zero 3 no soportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Código cero desconocido para Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ esperando ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6170,79 +6215,30 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Personalizado]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Tiene como objetivo aumentar la velocidad de emulación al transferir la "
-"tarea de decodificación de texturas para la GPU utilizando la tecnología "
-"OpenCL.\n"
-"Actualmente se sabe que provoca defectos al nivel de texturas en varios "
-"juegos. Es tambén más lento que la descodificación normal de la textura por "
-"la CPU en la mayoría de los casos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Mejora ligeramente la emulación guardando en caché las listas de la "
-"pantalla.\n"
-"Posiblemente cause problemas.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comunícalo."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "auto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "nada"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "Resultado desconocido %d (esperado %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "Mensaje desconocido recibido"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "¡wxExecute dio un -1 al iniciar la aplicación!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correción zFar:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correción zNear:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OR"
diff --git a/Languages/po/fa.po b/Languages/po/fa.po
index a831a69752..a2b574a192 100644
--- a/Languages/po/fa.po
+++ b/Languages/po/fa.po
@@ -1,16 +1,18 @@
-# Translation of dolphin-emu.pot to Farsi
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Hamed Khakbiz <hamed.khakbiz@gmail.com>, 2011
+# H.Khakbiz <hamed.khakbiz@gmail.com>, 2011
+# H.Khakbiz <hamed.khakbiz@gmail.com>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/fa/)\n"
 "Language: fa\n"
@@ -19,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(برای نمایش دادن بسیار زیاد است)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "بازی :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! نه"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,45 +56,95 @@ msgstr ""
 "\"%s\" وجود ندارد.\n"
 "یک کارت حافظه ۱۶ مگا بایتی جدید ساخته شود؟"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" این یک فایل گیم کیوب/وی فاقد اعتبار است، یا این فایل آیزو گیم کیوب/وی "
 "نیست."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sکپی%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s وجود دارد، بازنویسی شود؟"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s تمیز کارى آیزو با شکست مواجه شد. شاید فایل آیزو خراب است."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -89,7 +153,7 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "حجم فایل کارت نامعتبر است (0x%x بایت)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,7 +162,7 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "حجم کارت حافظه نامعتبر است (0x%x بایت)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -107,361 +171,339 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "فایل به اندازه کافی بزرگ نیست که یک فایل کارت حافظه معتبر باشد (0x%x بایت)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s بازکردن با شکست مواجه شد"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s یک فایل با حجم ۰ بایت است"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s فشرده شده است! توان فشرده سازی بیشتر را ندارد."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s برای اسم فایل بسیار دراز است، حداکثر تعداد کاراکترها ۴۵ است"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sحذف%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sصادر کردن جی سی آی%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sوارد کردن جی سی آی%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& و"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&درباره..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&بوت شدن از درایو دی وی دی..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&نقاط انفصال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&مرور برای فایل های آیزو..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "مدیریت کدهای &تقلب"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "تنظیمات پردازشگر &صدای دلفین"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&حذف آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&حذف آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&برابرسازی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&فایل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&پيشروى فریم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "تنظیمات &گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&کمک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "تنظیم &شرت کاتها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&جیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&بارگذاری وضعیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "مدیر &کارت حافظه (گیم کیوب)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&حافظه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&باز کردن..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&گزینه ها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "مکث"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&شروع بازی"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "خواص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&حالت فقط خواندنی"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&به روز کردن لیست"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "ثبت کردن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "شروع &دوباره"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&صدا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&توقف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&ابزارها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&ویدیو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&دیدگاه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "تنظیمات &ویموت"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&ویکی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "z دور+(-)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "z نزدیک+(-)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(ناشناخته)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(خاموش)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "۰x۴۴"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "۱۶ بیت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "۳۲ بیت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "نمایش سه بعدی"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "۸ بیت"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<اسم را اینجا وارد کنید>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<سایز تصویر پیدا نشد>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<هیچ>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<تکمه فشارى>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<سیستم>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "پنجره نت پلی از قبل باز است!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "بازی در حال حاضر اجرا نشده است."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "بُردِ مادر ای ام"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "کدهای اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "درباره دلفین"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "شتاب"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "دقت:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"دقیقا کپی های ای اف بی را برابرسازی می کند.\n"
-"برخی از بازی ها برای افکت های گرافیکی معین یا کارکرد بازی متکی به کپی های ای "
-"اف بی اند.\n"
-"اگر در این مورد اطمینان ندارید، به جای آن گزینه ای اف بی به بافت اشیاء را "
-"انتخاب کنید."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "اکشن"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -476,14 +518,14 @@ msgstr ""
 "کد خراب:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در اضافه کردن کد (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -491,7 +533,7 @@ msgid ""
 msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر و اسلاید کردن (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -500,7 +542,7 @@ msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر کردن و نوشتن حافظه "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -508,12 +550,12 @@ msgid ""
 msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در نوشتن به اشاره گر (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "خطای اکشن ریپلی: مقدار نامعتبر (%08x) در کپی حافظه (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -522,172 +564,140 @@ msgstr ""
 "خطای اکشن ریپلی: کد مستر و نوشتن به CCXXXXXX تکمیل نشده است (%s)\n"
 "به کدهای مستر نیاز نیست. از کدهای مستر استفاده نکنید."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "خطای اکشن ریپلی: خط کد نامعتبر اکشن ریپلی: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "خطای اکشن ریپلی: کد نامعلوم: سایز نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "خطای اکشن ریپلی: الگوی کد عادی نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "خطای اکشن ریپلی:  کد عادی %i: کد فرعی نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "خطای اکشن ریپلی:  کد عادی ۰: کد فرعی نامعتبر %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "آداپتور:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "اضافه کردن کد اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "اضافه کردن وصله"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "اضافه کردن تکه جدید"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "اضافه کردن..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "آدرس :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"اضافه کنید مقدار مشخص شده را به پارامتر z دور.\n"
-"دو راه ابراز مقادیر ممیز شناور.\n"
-"نمونه: مستقیما وارد کنید \"۲۰۰\" یا \"۰.۰۰۰۲\"، اثر تولید شده یکسان است، "
-"مقدار بدست آمده \"۰.۰۰۰۲\" خواهد بود.\n"
-"مقادیر: (۰-<+/-انتیجر) یا (۰-<+/-FP [۶ شماره دقیق])\n"
-"\n"
-"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"اضافه کنید مقدار مشخص شده را به پارامتر z نزدیک.\n"
-"دو راه ابراز مقادیر ممیز شناور.\n"
-"نمونه: مستقیما وارد کنید \"۲۰۰\" یا \"۰.۰۰۰۲\"، اثر تولید شده یکسان است، "
-"مقدار بدست آمده \"۰.۰۰۰۲\" خواهد بود.\n"
-"مقادیر: (۰-<+/-انتیجر) یا (۰-<+/-FP [۶ شماره دقیق])\n"
-"\n"
-"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "تنظیم فشار کنترل آنالوگ برای فعال کردن دکمه ها لازم است."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "تنظیمات پیشرفته"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "همه فایل های گیم کیوب/وی (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "همه ایمیجهای گیم کیوب/وی (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "همه فایل های گیم کیوب جی سی ام (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "همه وضعیت های ذخیره (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "همه فایل های آیزو وی (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "همه فایل های آیزو فشرده شده گیم کیوب/وی (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "همه فایل ها  (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "تحلیل کردن"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "زاویه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "فیلتر ناهمسانگر:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "آنتی آلیاسینگ:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "سایز بارگذار برنامه اشتباه است...آیا این واقعا بارگذار برنامه است؟"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "بارگذار برنامه ناتوان در بارگذاری از فایل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "بار گذار برنامه:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "اعمال کردن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -697,16 +707,12 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "عربی"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "آیا شما مطمئن هستید که میخواهید \"%s\" را حذف کنید؟"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -714,56 +720,83 @@ msgstr ""
 "آیا شما مطمئن هستید که میخواهید این فایلها را حذف کنید؟\n"
 "این فایل ها برای همیشه از بین خواهند رفت!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "آیا شما مطمئن هستید که میخواهید این فایل را حذف کنید؟  این فایل برای همیشه "
 "از بین خواهند رفت!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "نسبت طول به عرض تصویر:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "حداقل یک قطه می بایست باز بماند."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "صدا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "پشتوانه صدا:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "اتوماتیک"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "اتوماتیک (ضریب ۶۴۰x۵۲۸)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "اتوماتیک (سایز پنجره)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "تنظیم اتوماتیک سایز پنجره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -773,134 +806,150 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "ثبت اشاره گر پایه"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "برگشت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "تنظیمات پشتوانه"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "پشتوانه:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "ورودی پس زمینه"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "به عقب"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "سرخط ناصحیح فایل"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "نشان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "جزئیات نشان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "نشان:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "نوار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "بنیانی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "تنظیمات بنیانی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "بم"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "چک سام جدول تخصیص بلوک با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "بلوک ها"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "آبی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "آبی چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "آبی راست"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "پائین"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "کنترل های محدودیت: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "خراب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "مرور"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "مرور برای پوشه جهت اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "مرور برای پوشه آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "مرور برای پوشه خروجی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "حافظه موقت:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "دکمه ها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -908,118 +957,100 @@ msgstr ""
 "گذشتن از پاکسازی حافظه ميانى دادها توسط دستور DCBZ. معمولا این گزینه را غیر "
 "فعال رها کنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "استیک سی"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "استیک سی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "ثبت سی پی"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "موتور پردازشگر برابرساز"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "لیست های حافظه ميانى تصویر"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"محاسبه نورپردازی هر پیکسل گرافیک سه بعدی به جای هر ورتکس.\n"
-"سرعت برابرسازی را چند درصد کم میکند (بسته به قدرت پردازشگر گرافیک شما).\n"
-"معمولا این یک بهبود بی خطر است، اما گاه امکان بروز مسائلی وجود دارد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "لغو کردن"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "قادر به باز گشایی نیست %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "رویدادهایی را که معوق اند نمی تواند از ثبت درآورد."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"قادر به استفاده از این فایل به عنوان کارت حافظه نیست.\n"
-"%s\n"
-"این یک فایل کارت حافظه معتبر گیم کیوب نیست"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"قادر به استفاده از این فایل به عنوان کارت حافظه نیست.\n"
-"آیا شما سعی دارید از یک فایل برای هر دو شکاف استفاده کنید؟"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "کپس لاک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "کاتالان"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "مرکز"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "تعویض"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "تعویض &دیسک..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "تعویض دیسک"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "تعویض بازی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1027,76 +1058,63 @@ msgstr ""
 "تغییر زبان برنامه.\n"
 "شروع دوباره برنامه لازم است."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "تغییرات علامت به پارامتر z دور (بعد از تصحیح)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "تغییرات علامت به پارامتر z نزدیک (بعد از تصحیح)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"تغییر دادن این مورد در حالی که برابرساز در حال اجراست اثری نخواهد داشت!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "گپ زدن"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "کد تقلب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "جستجوی کد تقلب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "مدیر کدهای تقلب"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "برسی عدم نقص پارتیشن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "برسی عدم نقص..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "چینی (ساده شده)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "چینی (سنتی)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "انتخاب یک پوشه ریشه برای دی وی دی:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "انتخاب یک پوشه ریشه برای نند:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "انتخاب آیزو پیش فرض:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "انتخاب پوشه برای اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "انتخاب فایل برای باز کردن"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "انتخاب کارت حافظه:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1104,27 +1122,27 @@ msgstr ""
 "انتخاب فایل برای استفاده بعنوان بارگذار برنامه: (به دیسک هایی که فقط از پوشه "
 "ها ساخته شده اند اعمال می کند)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "انتخاب پوشه برای استخراج به آن"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "استیک دایره"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "کلاسیک"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1132,183 +1150,230 @@ msgstr ""
 "ارتباط مشتری در حالی که بازی در حال اجراست قطع شد!! نت پلی از کار افتاد. شما "
 "باید بازی را دستی متوقف کنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "بستن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "پی&کربندی..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "مشخصات کد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "کد:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "دستور"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "توضیح"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "توضیح:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "فشرده کردن آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "فشرده کردن آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "در حال فشرده کردن آیزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "پیکربندی"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "کنترل پیکربندی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "پیکربندی گیم پدها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "پیکربندی..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "تائید بازنویسی فایل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "تائید برای توقف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "اتصال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "اتصال کیبورد USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "اتصال ویموت %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "اتصال ویموت ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "اتصال ویموت ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "اتصال ویموت ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "اتصال ویموت ۴"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "میز فرمان"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "کنترل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "تبدیل به جی سی آی"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "کپی با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "کپی به کارت حافظه %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "هسته"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "قادر به ساخت نیست %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "قادر به نصب پشتوانه نیست %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"قادر به خواندن \"%s\" نیست. دیسک در درایو نیست، یا این یک بکاپ گیم کیوب/وی "
-"نیست. لطفا توجه داشته باشید که دیسک های اصلی گیم کیوب/وی توسط اکثر دی وی دی "
-"درایوهای کامپیوتر قابل خواندن نیستند."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "قادر به تشخیص فایل آیزو %s نبود"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "قادر به ذخیره کردن نیست %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1321,11 +1386,19 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "قادر به یافتن دستور باز برای پسوند 'ini' نیست!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1333,38 +1406,46 @@ msgstr ""
 "قادر به اينيت کردن هسته نیست.\n"
 "تنظیمات خود را چک کنید."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "شماردن:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "کشور:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "ساخت کد اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "ساخت پرسپکتیو جدید"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "سازنده:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "بحرانی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "حذف قسمتی از تصوير"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1374,203 +1455,191 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "ضرب دری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "هک کردن دستی تصویر"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "تنظیمات مربوط به هک کردن دستی تصویر"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "چکوسلواکی"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "پد هدایتی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "پردازشگر صدای دلفین"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "موتور برابرساز پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "برابرسازی سطح بالای پردازشگر صدای دلفین (سریع)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "مفسر سطح پائین پردازشگر صدای دلفین (کند)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "تنظیمات پردازشگر صدای دلفین"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "ریشه دی وی دی:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-"خواندن سطح پائین دی وی دی - خطای مهلک: خواندن از روی دیسک با شکست مواجه شد"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-"خواندن سطح پائین کد گشایی شده دی وی دی - خطای مهلک: خواندن از روی دیسک با "
-"شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "اندازه داده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "تاریخ:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "فایل های داتل مکس درایو/حرفه ای (*,sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "منطقه مرده"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "اشکال زدائی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "اشکال زدائی کردن"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "دسیمال"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ناهمفشرده کردن آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "ناهمفشرده کردن آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "در حال ناهمفشرده کردن آیزو"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "پیش فرز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "آیزو پیش فرز:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "دست خط پیش فرز"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "حذف"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "حذف ذخیره"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "فایل موجود '%s' حذف شود؟"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "شرح"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "شناسایی"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"کوشش برای خواند داده بیشتر از دی وی دی نسبت به داده ای که در حافظه میانجی "
-"گنجانده شده یافت شد. مهار کردن."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "دستگاه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "تنظیمات دستگاه"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "شماره گیری"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D ۱۱"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D ۹"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1578,20 +1647,23 @@ msgstr ""
 "چک سام پوشه با شکست مواجه شد\n"
 " و چک سام بکاپ پوشه با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "از کارانداختن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "از کارانداختن مه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1606,255 +1678,213 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"از کارانداختن برابرسازی کپی های ای اف بی.\n"
-"کپی های ای اف بی اغلب برای افکت های اعمال شده به بافت اشیاء یا پس پردازی "
-"استفاده می شوند، بنابراین در حالیکه تیک زدن این تنظیم سرعت بالایی ایجاد می "
-"کند این تنظیم تقریبا همیشه سبب مشکلاتی نیز می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "دیسک"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "خواندن دیسک با مشکل مواجه گردید"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "نمایش"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"نمایش ورودی های خوانده شده توسط برابرساز.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "تقسیم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "آیا می خواهید برابرسازی فعلی را متوقف کنید؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "کدبردار دالبی پرو لاجیک دو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "دلفین"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "دلفین %s پیکربندی گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "&وب سایت دلفین"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "پیکر بندی دلفین"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "پیکربندی ویمیوت برابرسازی شده دلفین"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "دلفین فیفو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "پیکربندی گیم پد گیم کیوب دلفین"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "فیلم های تاس دلفین (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "پیکربندی ویموت دلفین"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "دلفین در &گوگل کد"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"دلفین قادر به پیدا کردن آیزو های گیم کیوب/وی نیست. برای مرور فایل ها دو بار "
-"اینجا کلیک کنید..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"دلفین در حال حاضر ست شده است که همه بازی ها را مخفی کند. برای نمایش بازی ها "
-"دو بار اینجا کلیک کنید..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "دلفین نتوانست عمل خواسته شده را تکمیل کند."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "پائین"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "دانلود کدها (WiiRD بانک اطلاعاتی)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu کد دانلود شد. (%lu عدد اضافه شد)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "طبل ها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "مصنوعی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "نسخه برداری صدا"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "نسخه برداری مقصد ای اف بی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "نسخه برداری فریم ها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "نسخه برداری بافت اشیاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"نسخه برداری از همه فریم های نمایش داده شده در قالب فایل AVI در پوشه User/"
-"Dump/Frames/\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"نسخه برداری بافت اشیاء کدبرداری شده بازی در پوشه User/Dump/Textures/"
-"game_id/\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"نسخه برداری محتوی کپی های ای اف بی در پوشه User/Dump/Textures/\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "هلندی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "خ&روج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "کپی های ای اف بی"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1867,56 +1897,40 @@ msgstr ""
 "اندازی مجدد در این مرحله برای اینکه ویندوز درایور جدید را شناسایی کند لازم "
 "باشد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "اروپا"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "به روز شدن های اولیه حافظه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "ویرایش"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "ویرایش کدهای اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "ویرایش پیکربندی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "ویرایش وصله"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "ویرایش چشم انداز جاری"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "ویرایش..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "افکت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "حافظه میانجی فریم جاساز شده"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "ریسمان شبیه ساز قبلا اجرا شده است"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1930,7 +1944,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، گزینه اکس اف بی مجازی را فعال کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1947,121 +1961,92 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "ویموت برابرسازی شده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "وضعیت برابرساز:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "فراهم کردن"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"فعال کردن برجسته سازی سه بعدی توسط تکنولوژی Nvidia 3D Vision با توجه به این "
-"که پردازشگر گرافیک شما از این امر پشتیبانی کند.\n"
-"امکان بروز خطا وجود دارد.\n"
-"پیش نیاز این امر حالت تمام صفحه میباشد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "فعال کردن واقعه نگاری اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "فعال کردن ادغام بلوک"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "فعال کردن محاسبه حد جعبه"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "فعال کردن حافظه ميانى"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "فعال کردن کدهای تقلب"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "فعال کردن پردازنده با دو هسته یا بیشتر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "فعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "فعال کردن جهش بیکاری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "فعال کردن جهش بیکاری (بالا بردن سرعت)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "فعال کردن واحد مدیریت حافظه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "فعال کردن پويش تصاعدی (Progressive Scan)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "فعال کردن اسکیرین سیور"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "فعال کردن صفحه عریض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "فعال کردن خطوط فریم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"فعال کردن فیلتر ناهمسانگرد.\n"
-"ارتقا کیفیت بافت اشیاء که در زوایای مورب قرار دارند.\n"
-"امکان بروز مشکل در تعداد کمی از بازی ها وجود دارد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"فعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها "
-"لازم است. (ON=سریع، OFF=سازگار)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "فعال کردن صفحات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2073,7 +2058,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2085,34 +2070,25 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"برای بالا بردن سرعت بازی افسانه زلدا: شاهدخت سپیده دم این گزینه را فعال "
-"کنید. غیرفعال برای هر بازی دیگر."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "فعال کردن پروژه هک دستی"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). در "
-"OSX موجود نیست."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). "
-"فقط پشتوانه اپن ای ال (OpenAL)."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2124,7 +2100,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2132,7 +2108,11 @@ msgstr ""
 "فعال کردن واحد مدیریت حافظه، برای بعضی از بازی ها لازم است. (روشن = سازگار، "
 "خاموش = سریع)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2142,51 +2122,62 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "پایان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "انگلیسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "بهسازی"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "یک اسم برای چشم انداز جدید وارد کنید:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "ورودی %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "ورودی 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "همگن"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "خطا"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش فرض سیستم."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2195,7 +2186,7 @@ msgstr ""
 "خطا: بعد از \"%s\"، %d (0x%X) به جای نشان ذخیره %d (0x%X) پیدا شد. خاتمه "
 "بارگذاری وضعیت ذخیره..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2204,215 +2195,188 @@ msgstr ""
 "خطا: تلاش برای دسترسی به فونت های %s اما آنها بارگذاری نشده اند. ممکن است "
 "بازی ها فونت ها را به درستی نمایش ندهند، یا خرابی به بار آورند."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "گریختن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "خوشی"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "دستگذار استثناء - دسترسی فضای پایینی حافظه. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "اجرا کردن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "صادر کردن با شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "صادر کردن فایل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "صادر کردن ضبط"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "صادر کردن ضبط..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "صادر کردن ذخیره"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "صادر کردن فایل ذخیره وی (آزمایشی)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "صادر کردن همه ذخیره ها"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "صادر کردن ذخیره بعنوان..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "پسوند"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "حافظه میانجی خارجی فریم"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "پارامتر اضافی"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "پارامترهای یدکی مفید تنها برای \"Metroid Other M\"."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "استخراج همه فایل ها..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "استخراج بارگذار برنامه..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "استخراج دال..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "استخراج پوشه..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "استخراج فایل..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "استخراج پارتیشن..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "استخراج کردن %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "استخراج کردن همه فایل ها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "استخراج کردن پوشه"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "استخراج کردن..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "بایت فیفو"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "پخش کننده فیفو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "فرانسه"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "اندازه اف اس تی:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "اتصال با شکست مواجه شد!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "دانلود کدها با شکست مواجه شد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "استخراج به %s با شکست مواجه شد!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"بارگذاری حافظه فقط خواندنی پردازشگر صدای دلفین با شکست مواجه شد:\t%s\n"
-"\n"
-"این فایل برای استفاده از برابرساز سطح پائین پردازشگر صدای دلفین لازم است.\n"
-"دلفین به دلیل حق انتشار شامل این فایل نیست.\n"
-"از نرم افزار DSPSpy برای نسخه برداری از کنسول واقعی خود استفاده کنید.\n"
-"\n"
-"شما می توانید از موتور برابر ساز سطح بالای پردازشگر صدای دلفین استفاده کنید "
-"که نیازی به فایل حافظه فقط خواندنی ندارد.\n"
-"(نوع پردازشگر را از تب \"صدا\" در پنجره پیکر بندی انتخاب کنید.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "خواندن %s با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "خواندن banner.bin با شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"خواندن بلوک %d داده ذخیره با شکست مواجه شد\n"
-"امکان ناقص بودن کارت حافظه وجود دارد\n"
-"موقعیت فایل:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2420,7 +2384,7 @@ msgstr ""
 "خواندن صحیح بکاپ جدول تخصیص بلوک با شکست مواجه شد\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2428,17 +2392,12 @@ msgstr ""
 "خواندن صحیح جدول تخصیص بلوک با شکست مواجه شد\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "خواندن داده از فایل با شکست مواجه شد %d"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2446,7 +2405,7 @@ msgstr ""
 "خواندن صحیح بکاپ پوشه با شکست مواجه شد\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2454,11 +2413,7 @@ msgstr ""
 "خواندن صحیح پوشه با شکست مواجه شد\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2466,73 +2421,62 @@ msgstr ""
 "خواندن سرخط با شکست مواجه شد\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "خواندن آی دی یگانه از ایمیج دیسک با شکست مواجه شد"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "نوشتن BT.DINF به SYSCONF با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "نوشتن bkhdr با شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "نوشتن سرخط برای %s با شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "پارسی"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "سریع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "نسخه سریع واحد مدیریت حافظه. برای همه بازی ها عمل نمی کند."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 "همگاه سازی مجدد مهلک. خروج نمایش. (خطا در ویموت پخش: %u !=%u, بایت %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "پخش کننده فیفو"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "مشخصات فایل"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "فایل شامل کدی نیست."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "فایل تبدیل شده است به .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2540,7 +2484,7 @@ msgstr ""
 "فایل قادر به باز شدن نیست\n"
 "یا دارای پسوند معتبر نیست"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2549,95 +2493,93 @@ msgstr ""
 "فایل پسوند \"%s\" دارد\n"
 "پسوند های معتبر عبارتند از (.raw/,gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "فایل به عنوان کارت حافظه شناخته نشده است"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "فایل فشرده نیست"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "ورودی/خروجی فایل: حالت گشودن ناشناس : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "فایل سیستم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "نوع فایل 'ini' ناشناس است! باز نخواهد شد!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "پیدا کردن بعدی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "پیدا کردن قبلی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "بلوک اول"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "درست کردن چک سام ها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "۱۶:۹ اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "۴:۳ اجباری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "کنسول به عنوان NTSC-J اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "فیلتر کردن بافت اشیاء اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"فیلتر کردن بافت اشیاء اجباری حتی اگر بازی برابرسازی شده صریحا آنرا غیرفعال "
-"کرده باشد.\n"
-"بهبود ناچیز کیفیت بافت اشیاء که باعث بروز اشکال در بعضی از بازی ها می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"اجباری کردن خروجی گرافیک بازی برای وضوح صفحه عریض.\n"
-"سبب خرابی های گرافیکی در برخی از بازی ها می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"حالت NTSC-J اجباری برای استفاده فونت رام ژاپنی.\n"
-"این گزینه را رها کنید، حالت پیش فرض دلفین NTSC-U می باشد, دلفین به طور "
-"خودکار این گزینه را برای بازی های ژاپنی فعال می کند."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2645,541 +2587,574 @@ msgstr ""
 "قالب بندی بعنوان اسکی (NTSC\\PAL)?\n"
 "انتخاب پاسخ منفی برای SJIS (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "جلو"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "پیدا کردن نتایج %d برای '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
+#, c-format
+msgid "Found %u save files"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "فریم"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "فریم"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "پيشروى فریم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "نسخه برداری فریم با استفاده از FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "مشخصات فریم"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "محدوده فریم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "پری&دن از روی فریم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "حد فریم:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "فریم ها برای ضبط شدن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "نگاه آزاد"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "فرانسوی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "تحریک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "از"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "وضوح حالت تمام صفحه:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "فایل جی سی آی(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "گیم پد گیم کیوب"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "آی دی بازی:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "بازی قبلا اجرا شده است!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "بازی اجرا نشده است!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "تنظیمات مشخصات بازی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "پیکربندی بازی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "فایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "گیم کیوب"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "تنظیمات &دسته گیم کیوب"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "کارت های حافظه گیم کیوب (*.raw.*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "تنظیمات دسته گیم کیوب"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "کدهای گیکو"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"اجرای کد گیکو با شکست مواجه شد (CT%i CST%i) (%s)\n"
-"(چه یک کد بد چه نوع کد هنوز پشتیبانی نشده است. سعی کنید از دستگذار کد محلی "
-"توسط قرار دادن فایل codehandler.bin در داخل پوشه Sys و شروع مجدد دلفین "
-"استفاده کنید.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "کلی"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "تنظیمات جامع"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "آلمانی"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "گرفتن کد اکشن ریپلی: فهرست بزرگتر از سایز لیست است %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "تنظیمات گرافیک"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "بزرگتر از"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"کیفیت بافت اشیائی را که تولید شده است به شدت افزایش می دهد در حالی که از "
-"رندر برای افکت های بافت اشیا استفاده می کند.\n"
-"بالا بردن وضوح داخلی تاثیر این تنظیم را بهبود خواهد بخشید.\n"
-"کارآئی را اندکی کاهش می دهد و شاید مشکلاتی را سبب شود  (گرچه غیر ممکن است).\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "یونانی"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "سبز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "سبز چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "سبز راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "گیتار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "هک"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "چک کردن سر خط برای یافتن خطا با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "عبری"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "ارتفاع"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "کمک"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"درود،\n"
-"\n"
-"دلفین برای اجرا شدن نیاز دارد که پردازنده شما از پسوند های SSE2 پشتیبانی "
-"کند.\n"
-"متاسفانه پردازنده شما از پسوند های SSE2 پشتیبانی نمی کند, بنابراین دلفین "
-"اجرا نخواهد شد.\n"
-"\n"
-"سایونارا!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "مخفی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "مخفی کردن نشانگر"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"مخفی کردن نشانه گر ماوس اگر بر روی پنجره برابرساز باشد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "خانه"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "میزبان"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "پیکربندی شرت کات"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "شرت کاتها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "مجارستانی"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "ویموت مخلوط"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: آزمایش برای گرفتن داده از یک بلیط ناشناخته: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "تنظیمات آی پی ال"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "فروسرخ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "اشاره گر فروسرخ"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "میزان حساسیت فروسرخ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "جزئیات آیزو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "پوشه های آیزو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ایتالیا"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "تندیس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"اگر انتخاب شود، ثبت حد جعبه به روز خواهد شد. از سوی بازی های پیپر ماریو "
-"استفاده می شود."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "تغییرات قالب بندی نادیده گرفته شود"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"همه تغییرات قالب بندی ای اف بی نادیده گرفته شود.\n"
-"کارآئى را در بسیاری از بازی ها بدون اثری منفی بالا می برد. گرچه سبب نقص های "
-"گرافیکی در تعداد کمی از بازی های دیگر می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"نادیده گرفتن هر درخواستی از پردازنده برای خواندن و یا نوشتن به ای اف بی.\n"
-"کارآئى را در بعضی از بازی ها را بالا می برد، اما سبب از کار افتادن برخی "
-"امکانات بازی و یا نقص های گرافیکی می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "وارد کردن ذخیره"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"پسوند فایل وارد شده جی اس سی است\n"
-"اما دارای سرخط صحیح نمی باشد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "طول فایل وارد شده نامعتبر می باشد"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"پسوند فایل وارد شده اس ای وی می باشد\n"
-"اما دارای سرخط صحیح نمی باشد"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "در بازی"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "مشخصات"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "مشخصات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "ورودی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "درج"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "درج کد رمز شده و یا کشف شده..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "درج کارت اس دی"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "درج اسم..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "نصب واد"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "نصب به فهرست انتخاب وی"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"نصب دستگذار استثناء فراخوانده شد، اما این پلتفورم هنوز از این امکان پشتیبانی "
-"نمی کند."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "در حال نصب واد..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "خطای بررسی درست بودن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "بررسی درست بودن به پایان رسید"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد "
-"خراب یا نادرست وصله خورده است."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "واسط گرافیک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "تنظیمات واسط گرافیک"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "خطای داخلی LZO - فشرده سازی با شکست مواجه شد"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3188,103 +3163,106 @@ msgstr ""
 "خطای داخلی LZO - ناهمفشرده سازی با شکست مواجه شد (%d) (%li, %li) \n"
 "سعی مجدد برای بار گذاری وضعیت"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "وضوح داخلی:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "صفحه نخست"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "مقدار نامعتبر!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "bat.map نامعتبر یا ورودی پوشه"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "نوع واقعه نامعتبر %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "فایل نامعتبر"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"در gcm زیر opening.bnr نامعتبر پیدا شد:\n"
-"%s\n"
-"شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "فایل ضبط نامعتبر"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "پارامتر های جستجوی نامعتبر (هیچ شیئ انتخاب نشده)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عدد نیست)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "رشته جستجوی نامعتبر (فقط رشته های با طول زوج پشتیبانی می شود)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "وضعیت نامعتبر"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "ایتالیایی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "ژاپن"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "کره"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3294,64 +3272,75 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "بر راس نگه داشتن پنجره"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "کلید"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "کره ای"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "ال"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "دکمه ال"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "ال آنالوگ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "زبان:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "زمان بيکارى:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "استیک چپ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"کلیک چپ برای کشف کلیدهای فوری.\n"
-"کلید فاصله برای پاک کردن."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3361,7 +3350,7 @@ msgstr ""
 "کلیک وسط برای پاک کردن.\n"
 "کلیک راست برای گزینه های بیشتر."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3369,202 +3358,211 @@ msgstr ""
 "کلیک چپ/راست برای گزینه های بیشتر.\n"
 "کلیک وسط برای پاک کردن."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "کمتر از"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "محدود کردن توسط تعداد فریم ها بر ثانیه"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "بارگذاری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "بارگذاری بافت اشیاء دلخواه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "بارگذاری وضعیت - شکاف ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "بارگذاری وضعیت - شکاف ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "بارگذاری وضعیت - شکاف ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "بارگذاری وضعیت - شکاف ۴"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "بارگذاری وضعیت - شکاف ۵"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "بارگذاری وضعیت - شکاف ۶"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "بارگذاری وضعیت - شکاف ۷"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "بارگذاری وضعیت - شکاف ۸"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "بارگذاری وضعیت..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "بارگذاری منوی سیستم وی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "بارگذاری منوی سیستم وی %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"بارگذاری بافت اشیاء دستی از User/Load/Textures/game_id/\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای هک موجود است."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "پیکر بندی ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "ثبت فریم بر ثانیه به فایل"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "انواع ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"ثبت تعداد فریم های پردازش شده در هر ثانیه به User/Logs/fps.txt. زمانی از این "
-"ویژگی استفاده کنید که میخواهید کارائى دلفین را بسنجید.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "خروجی های واقعه نگار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "واقعه نگاری"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "ارتباط با سرور قطع شد!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "دکمه ام"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"چک سام MD5 ناهمسان است\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "هک کردن سرعت واحد مدیریت حافظه"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "فایل های گیم شارک مد کتذ (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "استیک اصلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "آی دی سازنده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "سازنده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3573,29 +3571,33 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "حداکثر"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "کارت حافظه فایل ذخیره برای این عنوان را دارد"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "کارت حافظه قبلا باز شده است"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "بایت حافظه"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "کارت حافظه"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3603,7 +3605,7 @@ msgstr ""
 "اخطار: قبل از استفاده از کارت حافظه بک آپ بگیرید، شاید درست شود اما اطلاعات "
 "از بین خواهد رفت!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3620,37 +3622,52 @@ msgstr ""
 "%s\n"
 "آیا مایل هستید فایل قبلی را به مکان جدید کپی کنید؟\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "سایز کارت حافظه با سرخط تطابق ندارد"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "فهرست انتخاب"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "میکروفن"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "حداقل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "متفرقه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "تنظیمات متفرقه"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "پیراینده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3662,20 +3679,24 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "فونت هم عرض"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "موشن پلاس"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "موتور"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3694,678 +3715,630 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "ضریب"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "ناپ"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "توجه: سایز مسیل با طول حقیقی داده برابر نیست\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "اضافه کردن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "شروع ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "دسیمال ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "حذف ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "جداکردن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "پایین ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "پایان ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "وارد شدن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "یکسان ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "خانه ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "درج ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "چپ ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "تکثیر ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "صفحه پایین ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "صفحه بالا ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "راست ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "جدا ساز ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "فاصله ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "کاستن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "تب ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "بالا ان پی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "اسم:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "اسم:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "فایل های جی سی آی محلی(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "پویش جدید"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "صفحه بعد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "پویش بعدی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "اسم مستعار :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "بدون کشور (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "هیچ آیزو یا وادی پیدا نشد"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "فایل نشان برای عنوان %s پیدا نشد"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "تشریحی دردسترس نیست"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "بدون جاخالی کردن"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "هیچ فایلی بارگذاری نشده"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "بدون مقادیر اطلاعاتی فهرست پوشه آزاد"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "بدون فایل ضبط شده"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "پوشه فایل ذخیره برای عنوان %s پیدا نشد"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "هیچ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "بوکمال نروژی"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "برابر نیست"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "ست نشده است"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "متصل نشده است"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "یادداشت ها"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "یادداشت ها:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "توجه"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "قفل کلید نام لاک"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "تعداد کدها:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "ننچاک"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "شتاب دهنده ننچاک"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "شیی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "محدوده شیی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "خاموش"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "افست:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "پیام های روی صفحه نمایش"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "فقط بلوک های %d موجود است"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "گشودن"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "باز کردن پوشه &شامل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "باز کردن پوشه &ذخیره وی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "گشودن فایل..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "اپن ای ال (OpenAL): ناتوان در ساخت زمینه برای دستگاه %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "اپن ای ال (OpenAL): ناتوان در پیدا کردن دستگاهای صدا"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "اپن ای ال (OpenAL): ناتوان در باز کردن دستگاه صدا %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "کدبرداری بافت اشیاء توسط OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "کدبرداری بافت اشیاء توسط OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "گزینه ها"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "نارنجی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "غیره"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"مشتری دیگری در حالی که بازی در حال اجراست قطع شد!! نت پلی غیر فعال است. بازی "
-"را دستی متوقف کنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "خروجی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "ض&بط کردن بازی..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "گیم پد"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "گیم پد"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "گیم پد ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "صفحه پايينی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "صفحه بالایی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "پاراگراف"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "پارامترها"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "پارتیشن %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "وصله ها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "مسیرها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "مکث"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "مکث در پایان فیلم"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "نورپردازی به ازای هر پیکسل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "کامل"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "چشم انداز %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "شروع بازی"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "شروع ضبط"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "شروع بازی/مکث"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "قابل بازی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "گزینه های بازنواخت"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "بازی کنان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "لطفا تایید کنید..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "لطفا قبل از ذخیره کردن یک چشم انداز بسازید"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "مینوس پلاس"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "لهستانی"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "درگاه ۱"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "درگاه ۲"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "درگاه ۳"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "درگاه ۴"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "درگاه :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "پرتقالی"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "پرتقالی (برزیلی)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "افکت ها:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "پایان نابهنگام فیلم در کنترل کننده پخش. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "پایان نابهنگام فیلم در ویموت پخش. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "پایان نابهنگام فیلم در ویموت پخش. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "حالت های از پیش تنظیم شده:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "صفحه قبلی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "صفحه قبلی"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "مقدار قبلی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "چاپ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "پروفایل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "خواص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "پاکسازی حافظه ميانى"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "سوال"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "خارج شدن"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "آر"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "دکمه آر"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "آر آنالوگ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "حافطه رم"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "روسیه"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "محدوده"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "حالت فقط خواندنی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "واقعی"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "ویموت واقعی"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "ویموت های واقعی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "ضبط"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "اطلاعات ضبط"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "گزینه های ضبط"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "قرمز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "قرمز چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "قرمز  راست"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"مقدار بدنمایی تصویر (آلیاسینگ) ایجاد شده از طریق بیت مپ ساختن تصاویر گرافیک "
-"سه بعدی را کاهش می دهد.\n"
-"این امر سبب می شود لبه های تصویر پردازش شده هموارتر به نظر برسد.\n"
-"سرعت برابرسازی را به شدت کاهش میدهد و گاهی اوقات مسائلی را سبب می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، \"هیچ\" را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "به روز کردن"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "به روز کردن لیست"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "به روز کردن لیست بازی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "پاک کردن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4375,242 +4348,320 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "نمایش در پنجره اصلی"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "شروع دوباره"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "نتایج"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "برگشت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "استیک راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "شوک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "روسی"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "ذخ&یره وضعیت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "بی خطر"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "ذخیره جی سی آی بعنوان..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "ذخیره وضعیت - شکاف ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "ذخیره وضعیت - شکاف ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "ذخیره وضعیت - شکاف ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "ذخیره وضعیت - شکاف ۴"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "ذخیره وضعیت - شکاف ۵"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "ذخیره وضعیت - شکاف ۶"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "ذخیره وضعیت - شکاف ۷"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "ذخیره وضعیت - شکاف ۸"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "ذخیره وضعیت..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "ذخیره بعنوان..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "ذخیره جی سی ام/آیزو فشرده شده"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "دخیره چشم انداز فعلی"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "ذخیره جی سی ام/آیزو ناهمفشرده شده"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "ذخیره وضعیت فیلم %s خراب است، ضبط فیلم میایستد..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "کپی ای اف بی تغییر سایز یافته"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "در حال پویش %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "پویش برای فایل های آیزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "در حال پویش..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "عکس فوری"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "اسکرول لاک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "جستجو"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "فیلتر جستجو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "جستجوی پوشه های فرعی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "جستجوی موضوع فعلی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "جستجو برای مقدار هگزا:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "بخش %s در SYSCONF پیدا نشد"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "انتخاب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "انتخاب فایل ضبط شده"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "انتخاب فایل وی واد برای نصب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"یک آداپتور سخت افزاری برای استفاده انتخاب کنید.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، گزینه اول را انتخاب کنید."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "یک فایل ذخیره برای وارد کردن انتخاب کنید"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "انتخاب پنجره های شناور"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "انتخاب فایل برای بارگذاری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "انتخاب فایل ذخیره"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "انتخاب وضعیت برای بارگذاری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "انتخاب وضعیت برای ذخیره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4629,264 +4680,293 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، اتوماتیک را انتخاب کنید."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "پروفایل انتخاب شده وجود ندارد"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "دست خط انتخاب شده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"انتخاب می کند وضوح تصویری را که در حالت تمام صفحه استفاده شده است.\n"
-"این اندازه باید همیشه بزرگ تر یا برابر با وضوح داخلی باشد. تاثیر این بر "
-"کارائى ناچیز است.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، از وضوح میز کارتان استفاده کنید.\n"
-"اگر همچنان اطمینان ندارید، از بالاترین وضوحی که برای شما کار می کند استفاده "
-"کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "فرستادن"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "موقعیت سنسور بار:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "جدا کننده"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "صربستانی"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"درگاه سریال ۱ - این درگاهی است که دستگاه هایی مانند آداپتور شبکه از آن "
-"استفاده می کنند"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "ست کردن بعنوان آیزو &پیش فرض"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "ست کردن بعنوان کارت حافظه پیش فرض %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "ست کردن کد اکشن ریپلی_فعال است: فهرست بزرگتر از سایز لیست کد اکشن ریپلی است "
 "%lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"ست کردن زمان بيکارى (بر حسب میلی ثانیه). مقادیر بالاتر این زمان می تواند "
-"صدای ترق و تروق را کاهش دهد. فقط پشتوانه اپن ای ال (OpenAL)."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "تنظیمات..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "لرزش"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "اسم کوتاه:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "دکمه های شانه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "نمایش &میز فرمان"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "نمایش &ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "نمایش نوار &وضعیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "نمایش نوار &ابزار"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "نمایش درایوها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "نمایش مناطق کپی ای اف بی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "نمایش فریم بر ثانیه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "نمایش فرانسه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "نمایش گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "نمایش ورودی تصویر"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "نمایش ایتالیا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "نمایش ژاپن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "نمایش کره"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "نمایش زبان:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "نمایش &پیکربندی ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "نمایش پال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "نمایش پایگاه ها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "نمایش مناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "نمایش آمار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "نمایش تایوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "نمایش ایالات متحده آمریکا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "نمایش واد"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "نمایش وی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "نمایش پنجره تایید قبل از متوقف کردن بازی."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"نمایش یک پنجره پیام زمانی که خطای جدی رخ داده است.\n"
-"غیر فعال کردن این گزینه شاید از نمایش پیام های غیر ضروری و آزار دهنده پیش "
-"گیری کند، اما همچنین بدان معناست که دلفین بدون هیچ توضیحی بطور ناگهانی خراب "
-"می شود."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "نمایش بلوک اول"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "نمایش شمارنده تاخیر"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"نمایش پیام ها روی مناطق صفحه برابرساز.\n"
-"این پیام ها شامل نوشتن کارت حافظه، پشتوانه ویدیویی و اطلاعات پردازشگر و "
-"پاکسازی حافظه نهانگاه جیت می شود."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "نمایش بلوک های ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "نمایش توضیح ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "نمایش تندیس ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "نمایش عنوان ذخیره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4897,84 +4977,82 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "نمایش ناشناخته"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"نمایش آمار های متفرقه.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "ویموت فرعی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "چینی ساده شده"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "سایز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "جهش از روی بایوس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "از قلم انداختن پاکسازی DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "از قلم انداختن دسترسی ای اف بی از پردازنده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"سرعت کپی های ای اف بی به رم را از طریق فدا کردن دقت برابرسازی اندکی بالا می "
-"برد.\n"
-"همچنین بعضی اوقات کیفیت بصری را بالا می برد.\n"
-"اگر شما با مسئله ای مواجه شدید، بالا بردن دقت حافظه میانی بافت اشیاء را "
-"امتحان کنید یا این گزینه را غیر فعال کنید.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "شکاف %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "شکاف ای"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "شکاف بی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "عکس فوری"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "ارائه دهنده نرم افزاری"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4987,233 +5065,282 @@ msgstr ""
 "آیا شما واقعا قصد فعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان "
 "ندارید، 'نه' را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "تنظیمات صدا"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "پشتوانه صدا %s معتبر نیست."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "ایجاد حافظه میانجی صدا با شکست مواجه شد: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "فضا"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "اسپانیایی"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "حجم صدای اسپیکر:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"مشخص کردن وضوح تصویر که پردازش تصویر در آن انجام می شود. وضوح تصویر بالا "
-"کیفیت تصویر را بسیار زیاد بالا خواهد برد اما برای بازده بسیار سنگین است و "
-"ممکن است باعث اختلالاتی در برخی از بازی ها شود.\n"
-"\"ضریب ۶۴۰x۵۲۸\" کمی کندتر از \"سایز پنجره\" است اما حاصل مسائل کمتری است. "
-"بطور کلی، هر چقدر وضوح داخلی پایین تر باشد، کارائى بهتر خواهد بود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه \"۶۴۰x۵۲۸\" را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "بالا بردن نرخ نقل و انتقال دادهای دیسک"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "استیک مربع"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "کنترولر استاندارد"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "شروع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "شروع &نت پلی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "شروع &ضبط"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "شروع ضبط"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "وضعیت"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "ذخیره های وضعیت"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "چرخ فرمان"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "استیک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "توقف"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"نگهداری کپی های ای اف بی در بافت اشیاء پردازشگر گرافیک.\n"
-"این گزینه دقیق نیست، اما برای اکثر بازی ها به خوبی کار می کند و نسبت به کپی "
-"ای اف بی به رم سرعت را به شدت افزایش می دهد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "کشیدن تصویر به سایز فعلی پنجره"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "مرتعش کردن"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "کاستن"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "صادر کردن فایل به %s با موفقیت انجام شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "فایل های ذخیره با موفقیت وارد شدند"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "نوسان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "زبان سیستم:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "تایوان"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "ورودی تاس"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "تب"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "جدا کردن تب"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "جدول چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "جدول راست"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "گرفتن عکس فوری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "تارو کونگا (بنگوس)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "آزمودن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "بافت اشیاء"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "حافظه ميانى بافت اشیاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "قالب بندی بافت اشیاء"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "واد با موفقیت نصب شد"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "آدرس بی اعتبار است"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "چک سام با موفقیت درست شد"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "پوشه برگزیده قبلا در لیست بوده است"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5222,7 +5349,7 @@ msgstr ""
 "فایل %s قبلا به وجود آمده.\n"
 "آیا مایل هستید این فایل را جایگزین کنید؟"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5231,81 +5358,81 @@ msgstr ""
 "فایل %s نمی تواند برای نوشتن باز شود. لطفا بررسی کنید که این فایل قبلا توسط "
 "برنامه دیگری باز نشده باشد."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "فایل %s قبلا باز بود، سرخط فایل نوشته نخواهد شد."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "فایلی که شما مشخص (%s) کرده اید وجود ندارد"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "اسم نمی تواند خالی باشد"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "اسم نمی تواند شامل کاراکتر '،' باشد"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "نتیجه کد رمزگشایی شده اکشن ریپلی شامل هیچ خطی نیست."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"هر چه قدر شما این گزینه را ایمن تر میزان کنید، برابرساز بافت اشیاء به روز "
-"شده کم تری را از رم از دست خواهد داد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، از چپ ترین مقدار استفاده کنید."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "سایز فایل ذخیره ای که سعی در کپی کردن آن دارید بی اعتبار است"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "زبان انتخاب شده توسط سیستم شما پشتیبانی نمی شود. برگشت به زبان پیش فرض سیستم."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "نسخه سرور و نت پلی مشتری نا سازگار است!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "سرور پر شده است!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "سرور پاسخ داد: بازی در حال اجراست!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "سرور یک پیغام خطای ناشناخته فرستاد!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "فایل مشخص شده \"%s\" وجود ندارد"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "مقدار بی اعتبار است"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "تم:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5313,7 +5440,7 @@ msgstr ""
 "باید بلیطی برای ۰۰۰۰۰۰۰۱/۰۰۰۰۰۰۰۲ وجود داشته باشد. نسخه برداری نند شما "
 "احتمالا ناقص است."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5321,7 +5448,7 @@ msgstr ""
 "این تنظیمات تنظیمات هسته دلفین را خنثی می کند.\n"
 "نامعین یعنی بازی از تنظیمات دلفین استفاده می کند."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5329,120 +5456,163 @@ msgstr ""
 "این شبیه ساز اکشن ریپلی از کدهایی که توسط خود اکشن ریپلی پیراسته شده باشد "
 "پشتیبانی نمی کند."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "این مورد میتواند سبب کند شدن منوی وی و تعدادی از بازی ها شود."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"این امکان به شما اجاز می دهد تا جای دوربین در بازی را تغيير دهید.\n"
-"برای حرکت افقی تصویر در حالی که دکمه سمت راست ماس را نگه داشتده اید آن را "
-"حرکت دهید و برای حرکت دادن دوربین کلید وسط را نگه دارید.\n"
-"کلید شیفت را نگه دارید و با فشار یکی از کلید های ص/ش/س/ی دوربین را پله پله "
-"حرکت دهید (شیفت+۰ برای حرکت سریع تر و شیفت+۹ برای حرکت کندتر) فشار کلید شیفت"
-"+ق برای بازنشاندن دوربین.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"این گزینه ریسمان های ویدیو و پردازنده را جدا می کند، بنابراین این ریسمان ها "
-"می توانند بر روی هسته های جداگانه اجرا شوند.\n"
-"سبب افزایش چشم گیر سرعت روی کامپیوترهایی با بیش از یک هسته می شود، اما "
-"همچنین می تواند خرابی های گاه و بی گاه را سبب شود."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "این مورد به شما اجازه خواهد داد تا فایل پیکربندی INI را ویرایش کنید"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "سرحد"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "لرزیدن"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "عنوان"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "به"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "تبدیل انواع ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "تبدیل حالت تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "بالا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "چینی سنتی"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "آزمایش برای بارگذاری فایل ناشناخته."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "دکمه ها"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "تلاش برای خواندن از روی SYSCONF نامعتبر"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5450,41 +5620,24 @@ msgstr ""
 "تلاش برای خواندن از SYSCONF نامعتبر\n"
 "آی دی های بلوتوث ویموت موجود نیست"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "ترکی"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "ديسک"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "نوع"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "درگاه UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "ویموت UDP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "ناشناخته"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ناشناخته_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "ایالات متحده آمریکا"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5492,192 +5645,175 @@ msgstr ""
 "قادر به ساختن وصله از مقادیر داده شده نیست.\n"
 "ورودی اصلاح نشد."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"ناتوان در تجزیه خط %lu از کد اکشن ریپلی به عنوان کد رمز شده یا رمز گشایی شده "
-"معتبر. وارسی کنید که کد را درست وارد کرده باشید.\n"
-"آیا مایل هستید که این خط را نادیده بگیرید و به تجزیه ادامه دهید؟"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "تعریف نشده %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "خنثی کردن وضعیت بارگذاری"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "فرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوقف می شود..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "دستور دی وی دی ناشناخته %08x - خطای مهلک"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "نوع ورودی ناشناخته %i در SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "پیام ناشناخته با آی دی %d دریافت شد"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "پیام ناشناخته با آی دی:%d از بازیکن:%d بیرون انداختن بازیکن!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "بالا"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "به روز کردن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "ویموت عمودی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "استفاده از حالت پال ۶۰ هرتز (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "استفاده از حالت تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "استفاده از حالت  شانزده شانزدهی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "استفاده از دستگذار پنیک"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"استفاده از ریسمان های چندگانه برای کدبرداری بافت اشیاء.\n"
-"در نتیجه بالا رفتن سرعت ممکن است (مخصوصا بر روی پردازندهایی با بیش از دو "
-"هسته).\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"معمولا اگر کامپایل سایه افکن با شکست مواجه شود، یک پیغام خطا نمایش داده می "
-"شود.\n"
-"اگرچه, این گزینه ممکن است سبب عدم نمایش پنجره های خطا شود تا بازی بدون "
-"مزاحمت را از طریق فعال کردن این گزینه امکان پذیر سازد.\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "کاربردی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "هماهنگ کردن فرکانس عمودی بازی با صفحه نمایش"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "مقدار"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "مقدار:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "مقدار:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "دراز نویسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "ویدیو"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "مجازی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "حجم صدا"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5688,25 +5824,27 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "اخطار"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "اخطار - شروع دال در حالت کنسول اشتباه!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "اخطار - شروع ای ال اف در حالت کنسول اشتباه!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "اخطار - شروع آیزو در حالت کنسول اشتباه!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5717,7 +5855,7 @@ msgstr ""
 "%s\n"
 "آیا مایل به ادامه هستید؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5730,7 +5868,7 @@ msgstr ""
 "و داشتن اسم یکسان مانند یک فایل در کارت حافظه شما\n"
 "ادامه می دهید؟"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5742,7 +5880,15 @@ msgstr ""
 "دیگری را بارگذاری کنید، یا این وضعیت را با حالت فقط خواندنی خاموش بارگذاری "
 "کنید."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5753,7 +5899,7 @@ msgstr ""
 "ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را "
 "با حالت فقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5786,180 +5932,172 @@ msgstr ""
 "شروع=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "نویسنده فایل ویو - فایل باز نیست."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "بد شانسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "هک کردن صفحه عریض"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "عرض"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "وی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "میز فرمان وی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "ریشه وی نند:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "فایل های ذخیره وی (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "وی واد: ناتوان در خواندن از فایل"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "ویموت"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "ویموت %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "ویموت متصل شد"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "موتور ویموت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "تنظیمات ویموت"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "ویموت ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "پنجره ها چپ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "فهرست پنجره ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "پنجره ها راست"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "پیچیدن کلمه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "در حال کار..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "نوشتن در میز فرمان"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "نوشتن به صورت اشکال زدایی"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "نوشتن به فایل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "نوشتن در پنجره"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "صدای اکس ۲ (XAdudio2) - ساخت آوای منبع با شکست مواجه شد: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "صدای اکس ۲ (XAdudio2) - اينيت با شکست مواجه شد: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "صدای اکس ۲ (XAdudio2) - ساخت آوای مستر منبع با شکست مواجه شد: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "ثبت اکس اف"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "زرد"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "شما نمی توانید قطعاتی که حاوی صفحات می باشند را ببندید."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "شما باید یک بازی انتخاب کنید!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "شما باید یک اسم وارد کنید!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "شما باید یک مقدار صحیح برای دسیمال، هگزادسیمال یا اکتال وارد کنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "شما باید یک اسم معتبر برای پروفایل وارد کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "برای اعمال تغییرات شما باید دلفین را از نو اجرا کنید."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5967,36 +6105,33 @@ msgstr ""
 "به نظر می رسد فایل آیزو/جی سی ام شما نامعتبر می باشد (کشور نامعتبر).\n"
 "ادامه با ناحیه پال؟"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"سایز فایل SYSCONF شما اشتباه است.\n"
-"سایز فایل باید 0x%04x باشد (اما سایز این فایل 0x%04llx است)\n"
-"آیا میخواهید یک فایل جدید تولید شود؟"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "هک افسانه زلدا: شاهدخت سپیده دم"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "کد صفر ۳ پشتیبانی نمی شود"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "کد ناشناخته صفر به دلفین: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ منتظر بمانید ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6008,77 +6143,30 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[دستی]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[آزمایشی]\n"
-"با هدف بالا بردن سرعت برابرسازی از طریق بارگذاری کردن کدگشایی بافت اشیاء به "
-"پردازشگر گرافیکی که استفاده می کند از چهارچوب OpenCL .\n"
-"اگر چه، درحال حاضر این شناخته شده است که کاستی های بافت اشیاء را در بازی های "
-"گوناگون سبب می شود. همچنین این در اکثر موارد کندتر از کدگشایی بافت اشیاء "
-"توسط پردازنده عادی است.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[آزمایشی]\n"
-"سرعت برابرسازی را با ذخیره کردن فهرست های نمایش اندکی بالا می برد.\n"
-"گرچه امکان بروز مشکل وجود دارد.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "بارگذار برنامه (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطفا گزارش دهید."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "خطای 1- wxExecute در اجرای برنامه!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "اصلاح z دور:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "اصلاح z نزدیک:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| یا"
diff --git a/Languages/po/fr.po b/Languages/po/fr.po
index d4b0978439..4e5422416d 100644
--- a/Languages/po/fr.po
+++ b/Languages/po/fr.po
@@ -1,23 +1,25 @@
-# Translation of dolphin-emu.pot to French
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# FRtranslator <pascal2j-language@yahoo.com>, 2013
-# FRtranslator <pascal2j-language@yahoo.com>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2013
-# RyDroid <rydroid_trans@yahoo.fr>, 2013
-# toadjaune <arnaud.venturi@gmail.com>, 2013
-# toadjaune <arnaud.venturi@gmail.com>, 2013
+# Pascal <pascal2j-language@yahoo.com>, 2013
+# Pascal <pascal2j-language@yahoo.com>, 2013-2015
+# Pierre Bourdon <delroth@gmail.com>, 2014
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2013
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2013
+# Spanti Nicola <rydroid_trans@yahoo.fr>, 2013
+# Toadjaune <arnaud.venturi@gmail.com>, 2013
+# Toadjaune <arnaud.venturi@gmail.com>, 2013
 # Vinet Sebastien <vinet.sebastien@live.fr>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-12 20:17+0000\n"
-"Last-Translator: FRtranslator <pascal2j-language@yahoo.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/fr/)\n"
 "Language: fr\n"
@@ -26,21 +28,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin est émulateur de GameCube et Wii, gratuit et open-source.\n"
+"\n"
+"Ce logiciel ne doit pas être utilisé pour jouer à des jeux que vous ne "
+"possédez pas légalement.\n"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(IP interne)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (trop nombreux pour être affichés)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Jeu :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -49,44 +68,113 @@ msgstr ""
 "\"%s\" n'existe pas.\n"
 " Voulez-vous créer une nouvelle carte mémoire de 16MB ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "\"%s\" n'a pas pu être compressé. L'image est probablement corrompue."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" est déjà compressé ! Impossible de le compresser davantage."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopie%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d échantillons"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d échantillons (de qualité niveau %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+"%s\n"
+"n'a pas pu être chargé car il a le même nom de fichier interne que la "
+"sauvegarde précédemment chargée\n"
+"%s"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+"%s\n"
+"n'a pas été chargé car c'est un GCI non valide.\n"
+"La taille du fichier (%<PRIx64>) ne correspond pas à la taille enregistrée "
+"dans l'en-tête (%d)"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+"%s\n"
+"n'a pas été chargé car c'est un GCI non valide.\n"
+"Le nombre de blocs devait être de %d"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+"%s\n"
+"n'a pas été chargé parce qu'il n'y a pas assez de blocs libres sur la carte "
+"mémoire virtuelle"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+"%s\n"
+"n'a pas été chargé car il y a moins de 10%% d'espace libre sur la carte "
+"mémoire\n"
+"Nombre total de blocs : %d ; %d blocs libres"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (Disque %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+"IPL %s introuvable dans le dossier %s. Le disque n'est peut-être pas reconnu"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s existe déjà. Voulez-vous le remplacer ?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s n'a pas pu être compressé. L'image est probablement corrompue."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -95,7 +183,7 @@ msgstr ""
 "%s n'a pu être lu en tant que carte mémoire.\n"
 " La taille du fichier de la carte n'est pas valide (0x%x octets)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -104,7 +192,7 @@ msgstr ""
 "%s n'a pu être lu en tant que carte mémoire.\n"
 " La taille de la carte n'est pas valide (0x%x octets)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -114,378 +202,360 @@ msgstr ""
 "Le fichier n'est pas assez grand pour être un fichier de carte mémoire "
 "valide (0x%x octets)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Impossible d'ouvrir %s"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
+"%s n'est pas un dossier, impossible de déplacer vers *.original.\n"
+"Vérifiez vos droits d'écriture ou déplacez le fichier hors de Dolphin"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s a échoué: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr "%s n'était pas un dossier, déplacé vers *.original"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s est un fichier de 0 octet"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s est déjà compressé. Impossible de le compresser d'avantage."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s est un nom de fichier trop long, le maximum est de 45 caractères."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSupprimer%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u blocs libres, %u entrées de rép. libres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&À propos..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Démarrer à partir du lecteur..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "Paramètres &audio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "&Démarrer à partir d'un DVD de sauvegarde..."
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Points d'arrêt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Rechercher des ISOs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr "Gestionnaire de &cheats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Paramètres &DSP (audio)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "Paramètres des &manettes"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Supprimer l'ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Supprimer les ISO sélectionnés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Émulation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Fichier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Avancement d'image"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Plein écran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr "Dépôt &GitHub"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "Paramètres &Graphiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Aide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Paramètres des &Raccouris clavier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Charger l'état"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "Gestionnaire de cartes &mémoires (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Mémoire"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "Fil&m"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Options"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Démarrer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Propriétés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr "Mode &Lecture seule"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "Rafraîchir la &liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registres"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Son"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Outils"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Vidéo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Affichage"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Paramètres de la &Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr "&Regarder"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "Site &web"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr "(Erreur : mauvais hôte)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "(Erreur : déconnecté)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr "(Erreur : Dolphin trop ancien)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(Inconnu)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr "(Error : Socket)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr "(Erreur : pas de réponse)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr "(Erreur : inconnue)"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" et \"Wii\" sont des marques "
+"déposées de Nintendo. Dolphin n'est affiliée d'aucune manière à Nintendo."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(aucun)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1,5x la réso. native (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
-msgstr "Résolution native : 1x (640x528)"
+msgstr "Résolution native (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2,5x la réso. native (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x la réso. native (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x la réso. native (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x la réso. native (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8-bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Insérer un nom ici>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Aucune résolution trouvée>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Rien>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Appuyez sur une touche>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Langue du système>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Système>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "Une fenêtre NetPlay est déjà ouverte !"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Une fenêtre Netplay est déjà ouverte !"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Il n'y a pas de jeu en cours d'émulation."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Aucun périphérique Bluetooth prise en charge n'a été détecté.\n"
-"Vous devez jumeler manuellement vos Wiimotes."
+"Aucun appareil Bluetooth pris en charge n'a été détecté.\n"
+"Vous devez connecter manuellement vos Wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ALERTE :\n"
+"ATTENTION :\n"
 "\n"
-"Netplay marchera seulement avec les paramètres suivants :\n"
-" - Double cœur activé [OFF]\n"
-" - Le moteur d'émulation DSP doit être le même sur tous les ordinateurs !\n"
-" - DSP sur un thread dédié [OFF]\n"
-" - La limite de frame pas fixée en fonction de l'[audio]\n"
+"NetPlay ne fonctionnera qu'avec ces paramètres :\n"
+"- Le moteur audio DSP doit être le même sur tous les ordinateurs !\n"
+"- DSP sur thread dédié [Décoché]\n"
+"- Régler manuellement les extensions pour chaque Wiimote\n"
 "\n"
-"Tous les joueurs devraient utiliser la même version de Dolphin et les mêmes "
-"paramètres.\n"
-"Toutes les cartes mémoires doivent être identiques entre joueurs, ou "
-"désactivées.\n"
-"La prise en charge de la Wiimote n'a pas été implémentée !\n"
+"Tous les joueurs devraient utiliser la même version de Dolphin et mêmes "
+"réglages.\n"
+"Toutes les cartes mémoires doivent être identiques pour tous les joueurs, ou "
+"désactivée.\n"
+"Le fonctionnement de la Wiimote n'est pas bon, ne l'utilisez pas.\n"
 "\n"
-"L'hôte doit avoir le port TCP choisi ouvert/transmis !\n"
+"L'hôte doit avoir choisi les ports TCP ouverts/redirigés si connexion "
+"directe !\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Codes AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "À propos de Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Accéleration"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Précision :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Émule fidèlement les copies d'EFB.\n"
-"Certains jeux requièrent ceci pour certains effets graphiques ou "
-"fonctionnalités dans le jeu.\n"
-"\n"
-"Dans le doute, cochez plutôt EFB vers texture."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Action"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -500,7 +570,7 @@ msgstr ""
 "Code coupable :\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -508,7 +578,7 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le "
 "code Ajout (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -517,7 +587,7 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le "
 "code Remplir et déplacer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -526,7 +596,7 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans "
 "Écriture dans la RAM et Remplir (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -535,13 +605,13 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Écrire "
 "vers Pointeur (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -551,173 +621,141 @@ msgstr ""
 "(%s)\n"
 "Les Master codes ne sont pas requis. Ne les utilisez pas."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Erreur Action Replay : code AR non valide à la ligne %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay : Code Conditionnel : Taille non valide %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay : Type de Code Normal non valide %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay ; Code Normal %i : Sous-type non valide %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay : Code Normal 0 : Sous-type non valide %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "Adaptateur détecté"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "Adaptateur non détecté"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Carte :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Ajouter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Ajouter un code ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Ajouter un patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Ajouter un nouveau panneau"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adresse :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Ajoute la valeur spécifiée au paramètre zFar.\n"
-"Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n"
-"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, "
-"la valeur retenue sera \"0.0002\".\n"
-"Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n"
-"\n"
-"NOTE: Consultez LogWindow/Console pour les valeurs acquises."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Ajoute la valeur spécifiée au paramètre zNear.\n"
-"Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n"
-"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, "
-"la valeur retenue sera \"0.0002\".\n"
-"Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n"
-"\n"
-"NOTE: Consultez LogWindow/Console pour les valeurs acquises."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Ajuste le contrôle analogique de pression requise pour activer les boutons."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avancé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "Tous les fichiers GCM de GameCube (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Tous les fichiers GameCube GCM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Tous les états sauvegardés (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Tous les fichiers ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Tous les fichiers ISO compressés de GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Tous les fichiers (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr "Anaglyphe"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analyser"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Angle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtrage anisotropique :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing :"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Date de l'Apploader :"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "L'apploader ne peut charger depuis ce fichier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Appliquer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -728,16 +766,12 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez (aucun)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabe"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -745,56 +779,86 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n"
 "Ils seront définitivement supprimés !"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé "
 "définitivement !"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+"Êtes-vous en train d'essayer d'utiliser le même fichier dans les 2 slots ?"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "ARM JIT (expérimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "ARM64 JIT (expérimental)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Format d'écran :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Au moins un panneau doit rester ouvert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+"Tente de détecter et de sauter les boucles d'attente.\n"
+"Dans le doute, cochez cette case."
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Moteur audio :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Paramètres audio"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Australie"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "Auteurs"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Multiple de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (taille de la fenêtre)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Ajuster auto. la taille de la fenêtre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -804,136 +868,152 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr "BAT incorrect, Dolphin va quitter"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "Registres BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Retour"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Paramètres de l'interface audio"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Moteur :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Entrée en arrière-plan"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Arrière"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Mauvaise entête de fichier"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Bannière"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Détails de la bannière"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Bannière :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Paramètres de base"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Paramètres de base"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basse"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Batterie"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 "Échec de la vérification de la somme de contrôle de la Table d'Allocation de "
 "Blocs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blocs"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Bleu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Bleu Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Bleu Droite"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr "Plein écran sans bords"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Bas"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Contrôles liés : %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Branche : %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Corrompu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Parcourir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Choisir un dossier à ajouter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Rechercher un dossier contenant des ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Parcourir un dossier de destination"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer :"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Boutons"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr "Ignorer XFB"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -941,121 +1021,113 @@ msgstr ""
 "Ignore le vidage du cache de données par l'instruction DCBZ. Dans le doute, "
 "décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Stick C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "Stick-C"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr "Registre CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Moteur d'émulation du CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache des listes d'affichage"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "Options du CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcule la lumière des graphiques 3D par pixel et non par vertex.\n"
-"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre "
-"GPU).\n"
-"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques "
-"pépins.\n"
+"Met en cache les textures personnalisées dans la RAM système au démarrage.\n"
+"Ceci demande beaucoup plus de RAM mais corrige les possibles saccades.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Calcule l'éclairage des objets 3D par pixel plutôt que par vertex, "
+"améliorant l'apparence des polygones éclairés et rendant les triangles "
+"individuels moins visibles.\n"
+"Provoque rarement des ralentissements ou pépins graphiques.\n"
+"\n"
+"Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "Impossible de trouver la Wiimote par la gestion de connexion %02x"
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Impossible de lire depuis DVD_Plugin - erreur fatale de DVD-Interface"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Annuler"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Impossible d'ouvrir %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-"Impossible de désenregistrer des évènements alors qu'il y en a en attente."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 "Impossible d'utiliser ce fichier comme carte mémoire.\n"
 "%s\n"
 "n'est pas un fichier de carte mémoire GameCube valide."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Impossible d'utiliser ce fichier comme carte mémoire.\n"
-"Essayez-vous d'utiliser le même fichier sur les 2 slots ?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Verr Maj"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalan"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centre"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Changer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "&Changer de disque"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "&Changer de disque..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Changer de disque"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Changer de Jeu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr "Changer le disque par %s"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1063,75 +1135,63 @@ msgstr ""
 "Changer la langue de l'interface.\n"
 "Demande un redémarrage"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Change le signe du paramètre zFar (après correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr "Changer ceci n'aura aucun effet pendant l'émulation."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Change le signe du paramètre zNear (après correction)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Changer ceci n'aura aucun effet durant l'émulation !"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "Gestionnaire de cheats"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Rechercher un cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Gestionnaire de Cheats"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Vérifier l'intégrité de la partition"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Mises à jour disponibles sur "
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Vérification de l'intégrité..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinois (simplifié)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinois (traditionnel)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Choisir un dossier racine pour le DVD :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Choisir un dossier racine pour la NAND :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Choisir un ISO par défaut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Choisir un dossier à ajouter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Choisir un fichier à ouvrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Choisir une carte mémoire :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1139,27 +1199,27 @@ msgstr ""
 "Choisir un fichier comme apploader : (uniquement pour les disques créés à "
 "partir de dossiers)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Choisir le dossier de destination de l'extraction"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Stick circulaire"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classique"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Effacer"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1167,184 +1227,241 @@ msgstr ""
 "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est "
 "désactivé. Vous devez arrêter le jeu manuellement."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Fermer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Co&nfigurer..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Info du code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Code :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Commande"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Commentaire"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Commentaire :"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr "Compilé le %s à %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Compresser l'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Compresser les ISO sélectionnés..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Compression de l'ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr "Calculer"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr "Calcul de la somme de contrôle MD5"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configurer"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configurer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configurer le contrôle"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configurer les manettes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configurer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Confirmer l'écrasement du fichier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Confirmer l'arrêt de l'émulation"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Connecter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Connecter la Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Connecter le clavier USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Connecter la Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Connecter la 1ère Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Connecter la 2è Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Connecter la 3è Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Connecter la 4è Wiimote"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Connecter les Wiimotes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "Connectée"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Console"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Recherche en continu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Contrôle"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "Paramètres des manettes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Manettes"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+"Contrôle la distance de la convergence. C'est la distance à laquelle les "
+"objets apparaissent au devant de l'écran.\n"
+"Une valeur haute appuie l'impression que les objets sortent de l'écran, une "
+"valeur basse est plus confortable."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+"Contrôle la distance qui sépare les deux caméras.\n"
+"Une valeur haute crée une forte impression de profondeur alors qu'une valeur "
+"faible est plus confortable."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr "Convergence minimum : "
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr "Convergence :"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Convertir en GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "Copier"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Échec de la copie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Copier vers la carte mémoire %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Impossible de créer %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Impossible d'initialiser le moteur %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Impossible de lire \"%s\".  Il n'y a pas de disque dans le lecteur, ou ce "
-"n'est pas un backup GC/Wii.  Veuillez noter que les disques originaux de "
-"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur "
-"PC."
+"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce "
+"n'est pas une sauvegarde de GC/Wii. Veuillez noter que les disques originaux "
+"de GameCube et de Wii ne peuvent pas être lus par la plupart de lecteur DVD "
+"de PC."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Impossible de reconnaître le fichier ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Impossible de sauvegarder %s"
+msgid "Could not save %s."
+msgstr "Impossible de sauvegarder %s."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1365,11 +1482,19 @@ msgstr ""
 "Dans ce cas, vous devez à nouveau spécifier l'emplacement du fichier de "
 "sauvegarde dans les options."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr "Impossible de créer le Client"
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr "Impossible de créer le pair."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1377,38 +1502,46 @@ msgstr ""
 "Impossible d'initialiser les composants de base.\n"
 "Vérifiez votre configuration."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr "Impossible de trouver le serveur central %s"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Nombre :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "Nombre : %lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Pays :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Créer un code AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Créer une nouvelle perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Créateur :"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Critique"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Recadrer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1418,200 +1551,191 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Le répertoire en cours a changé de %s vers %s après wxFileSelector !"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Hack de projection personnalisé"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr "Personnalisé"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Paramètres du hack de projection personnalisé"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Personnalise certains paramètres de projection orthographique."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tchèque"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Pad numérique"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Moteur d'émulation du DSP (Audio)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulation du DSP en HLE (rapide)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpréteur du DSP en LLE (lent)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Recompilateur du DSP en LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Paramètres DSP (audio)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSP LLE sur un thread dédié"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Racine du DVD :"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
-msgstr "Dance Mat"
+msgstr "Tapis de danse"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Taille des données"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Date :"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Fichiers Datel MaxDrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zone morte"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Débug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
-msgid "Debugging"
-msgstr "Débugage"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr "Débogage uniquement"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
+msgid "Debugging"
+msgstr "Débogage"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Décimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Décompresser l'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Décompresser les ISO sélectionnés..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Décompression de l'ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr "Baisser la convergence"
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr "Baisser la profondeur"
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Baisser la limite d'image/s"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "Baisser l'IR"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Par défaut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ISO par défaut :"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Police par défaut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Supprimer"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Supprimer la sauvegarde"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Supprimer le fichier '%s' ?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr "Pourcentage de la profondeur :"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr "Profondeur :"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Description"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "Description :"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Détecter"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
-msgstr ""
-"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir "
-"le buffer de sortie."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
+msgstr "Double cœur déterministe :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Appareil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Paramètres de la console virtuelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "Appareil non trouvé"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Appel"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr "Assombrit l'écran après 5 minutes d'inactivité."
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr "Direct"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr "Direct Connect"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1619,20 +1743,23 @@ msgstr ""
 "La vérification de la somme de contrôle du dossier a échoué\n"
 " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Désactiver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "Désactiver Bounding Box"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Désactiver Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Désactiver le brouillard"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1646,291 +1773,239 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Désactive l'émulation de copies d'EFB.\n"
-"Elles sont souvent utilisées pour du post-processing ou des effets de rendu "
-"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais "
-"aussi provoquer des pépins.\n"
+"Désactive l'émulation de Bounding Box.\n"
+"Cela peut beaucoup améliorer les performances du GPU, mais certains jeux ne "
+"fonctionneront plus.\n"
 "\n"
-"Dans le doute, décochez cette case."
+"Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Désactive l'émulation d'une fonctionnalité matérielle nommée Passe alpha de "
-"destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n"
+"Désactive l'émulation d'une fonctionnalité matérielle nommée Destination "
+"alpha, utilisée par beaucoup de jeux pour divers effets graphiques.\n"
+"Cela n'a aucun impact sur la performance en D3D et OpenGL pour bureau, mais "
+"cela nécessite 2 passes sur OpenGL ES, ce qui a un impact mineur mais "
+"sensible.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disque"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Erreur de lecture du disque"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr "Déconnectée"
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr "Déconnecté du serveur traversal"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
-msgstr "Vidéo"
+msgstr "Affichage"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Affiche les entrées lues par l'émulateur.\n"
-"\n"
-"Dans le doute, décochez cette case."
+"Affiche les messages par-dessus la zone d'émulation.\n"
+"Ces messages incluent les écritures de carte mémoire, le moteur de rendu "
+"vidéo et les infos du processeur, et l'effacement du cache JIT."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Diviser"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Voulez-vous arrêter l'émulation en cours ?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Décodeur Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ par l'équipe de Dolphin\n"
-"\n"
-"Branche : %s\n"
-"Révision: %s\n"
-"Compilé le %s @ %s\n"
-"\n"
-"Dolphin est un émulateur de Gamecube et Wii,\n"
-"écrit à l'origine par by F|RES et ector.\n"
-"Aujourd'hui, Dolphin est un projet open source\n"
-"avec beaucoup de contributeurs, trop pour être cités.\n"
-"Si vous êtes intéressés, rendez-vous sur le page du projet à\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Remerciements particuliers à Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 et Hotquik pour leurs démos\n"
-"de rétro-ingénieurie et leurs docs et démos.\n"
-"\n"
-"Grands mercis à Gilles Mouchard dont l'émulateur Microlib PPC\n"
-"a donné un coup de pouce au début du développement.\n"
-"\n"
-"Merci à Frank Wille pour son désassembleur PowerPC,\n"
-"que or9 et nous avons modifié pour inclure les spécificités Gekko.\n"
-"\n"
-"Merci à hcs/destop pour leur décodeur GC ADPCM.\n"
-"\n"
-"Nous ne sommes d'aucune manière affiliés à Nintendo.\n"
-"Gamecube et Wii sont des marques déposées de Nintendo.\n"
-"Cet émulateur est à des fins d'éducation uniquement\n"
-"et ne devrait pas être utilisé pour jouer à des jeux\n"
-"que vous ne possédez pas légalement."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuration des graphismes %s pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Site &web de Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configuration de Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr "Configuration des manettes pour Dolphin"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuration de la Wiimote pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Configuration de la manette GC pour Dolphin"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr "Raccourcis clavier pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr "Dolphin NetPlay"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr "Réglages de Dolphin NetPlay"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Films TAS Dolphin (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Configuration de la Wiimote pour Dolphin"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin dans &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des "
-"fichiers..."
+"Dolphin n'a trouvé aucun ISO de GameCube/Wii ou de WAD. Double-cliquez ici "
+"pour rechercher des fichiers..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour "
-"afficher tous les jeux..."
+"Dolphin est actuellement réglé pour cacher tous les jeux. Double-cliquez ici "
+"pour les afficher tous..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr "Dolphin est trop ancien pour le serveur traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin n'a pas pu exécuter l'action demandée."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Double la fréquence d'horloge du GPU émulé. Peut accélérer certains jeux "
-"(Coché = rapide, Décoché = compatible)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Bas"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Télécharger des codes (sur WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu codes ont été téléchargés. (%lu ajoutés)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr "Plage d'objets dessinés"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr "Pilote non détecté"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Percussions"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Factice"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Enregistrer le son"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Copier l'EFB cible"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
-msgstr "Copier les images"
+msgstr "Enregistrer les images"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr "Copier les objets"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr "Copier les stages TEV"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr "Copier les rapports de textures"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Copier les textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/"
-"Dump/Frames/\n"
+"Copie les textures décodées du jeu vers User/Dump/Textures/"
+"<identifiant_du_jeu>/\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Copier les textures du jeu vers User/Dump/Textures/<id du jeu>/\n"
+"Copie le contenu des copies de l'EFB vers User/Dump/Textures/.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Copie le contenu des copies de l'EFB vers to User/Dump/Textures/\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Copies de l'EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1943,56 +2018,40 @@ msgstr ""
 "distribution de Dolphin, un redémarrage est probablement nécessaire pour que "
 "Windows charge le nouveau pilote."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "Europe"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Premières mises à jour de mémoire"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Éditer"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Éditer le code ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Éditer la configuration"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Modifier les paramètres personnalisés"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Éditer le patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Modifier la perspective actuelle"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effets"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Buffer d'image embarqué"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr "Buffer embarqué d'image (Embedded Frame Buffer - EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Thread d'émulation déjà en cours d'exécution"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -2006,7 +2065,7 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez plutôt Virtuel."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2023,99 +2082,77 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez cette case."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wiimote émulée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "État de l'émulation :"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Activer"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia "
-"3D Vision, si elle est prise en charge par votre GPU.\n"
-"Peut provoquer des pépins.\n"
-"Ne fonctionne qu'en plein écran.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Activer la journalisation AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Activer l'assemblage de blocs"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr "Activer le changement de vitesse du CPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Active le calcul de la boîte liée."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Activer le cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Activer les Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
-msgstr "Activer le Dual Core"
+msgstr "Activer le double cœur"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Activer le double cœur (plus rapide)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "Activer le FPRF"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Activer le saut d'inactivité"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activer le saut d'inactivité (plus rapide)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Activer le MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Activer le balayage progressif"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Activer l'économiseur d'écran"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Activer les données du haut-parleur"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Activer l'écran large (16/9è)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Activer le rendu en fil de fer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
@@ -2123,22 +2160,25 @@ msgstr ""
 "Améliore la qualité visuelle des textures qui ont des angles de vue "
 "obliques.\n"
 "Peut provoquer des soucis pour un petit nombre de jeux.\n"
+"En Direct3D, régler sur plus de 1x aura le même effet qu'activer \"Forcer le "
+"filtrage de texture\".\n"
 "\n"
 "Dans le doute, sélectionnez 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, "
-"ARRÊT = Compatible)"
+"Active les accès rapides de disque. Ceci peut provoquer des plantages et "
+"autres problèmes dans quelques jeux. (Activé = rapide, Désactivé = "
+"compatible)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Activer les appels"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2151,7 +2191,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2163,34 +2203,31 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr ""
-"Activer ceci pour accélérer La légende de Zelda : Twilight Princess. "
-"Désactiver pour TOUS les autres jeux."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Active un hack de projection personnalisé"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
-msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non "
 "disponible sur OS X."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. "
-"Uniquement avec le moteur OpenAL."
+"Uniquement avec le moteur OpenAL ou Pulse."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
+msgid ""
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
+"Active le calcul du résultat du drapeau de la virgule flottante, requis pour "
+"quelques jeux. (Activé = compatible, Désactivé = rapide)"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2203,7 +2240,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2211,7 +2248,11 @@ msgstr ""
 "Activer le Memory Management Unit (unité de gestion de la mémoire), requis "
 "pour certains jeux. (ON = Compatible, OFF = Vitesse)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr "Active l'utilisation de l'Action replay et cheats Gecko."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2221,52 +2262,63 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fin"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr "Enet ne s'est pas initialisé"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Anglais"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Améliorations"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Entrer un nom pour la nouvelle perspective :"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrée %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrée 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Égal"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Erreur"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par "
 "défaut du système."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr "Erreur lors de la sauvegarde du fichier"
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2275,7 +2327,7 @@ msgstr ""
 "Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde "
 "%d (0x%X). Abandon du chargement de la sauvegarde d'état."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2284,220 +2336,200 @@ msgstr ""
 "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les "
 "jeux peuvent ne pas afficher les polices correctement, ou planter."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Echap"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphorie"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr ""
-"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "Europe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+"Erreur d'exception : accès à un espace en-dessous de la mémoire. 0x%08x"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Exécuter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Quitter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exporter toutes les sauvegardes Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Echec de l'exportation"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
-msgstr "Exporter un fichier"
+msgstr "Exporter le fichier"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exporter l'enregistrement..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exporter l'enregistrement..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exporter une sauvegarde"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exporter une sauvegarde Wii (expérimental)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exporter toutes les sauvegardes"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "L'exportation a échoué"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exporter l'enregistrement sous..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extension"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Buffer d'image externe"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr "Buffer externe d'image (External Frame Buffer - XFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Paramètres supplémentaires"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extraire tous les fichiers..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extraire l'Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extraire le DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extraire le dossier..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extraire le fichier..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extraire la partition..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraction de %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extraction de tous les fichiers"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Extraction du dossier"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extraction..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Octet FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Lecteur FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "France"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Taille FST :"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "Connexion impossible !"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Connexion impossible !"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Impossible de télécharger les codes."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Impossible d'extraire vers %s !"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Impossible de lire la ROM du DSP : \t%s\n"
-"\n"
-"Ce fichier est requis pour utliliser le DSP LLE.\n"
-"Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n"
-"Utilisez DSPSpy pour extraire le fichier de votre console.\n"
-"\n"
-"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas "
-"d'extraction de ROM.\n"
-"(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)"
+"Impossible de trouver le nouveau nom de fichier\n"
+"%s\n"
+"sera remplacé"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+"Écoute impossible. Est-ce qu'une autre instance de serveur NetPlay "
+"fonctionne déjà ?"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr "Impossible d'ouvrir le fichier source \"%s\"."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Impossible de charger bthprops.cpl ! Vous ne pourrez pas connecter de "
-"Wiimote et Dolphin peut planter inopinément !"
+"Impossible d'ouvrir le fichier \"%s\" pour écriture.\n"
+"Vérifiez que vous avez les permissions d'écriture dans le dossier de "
+"destination et que le média peut être écrit."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Impossible de charger hid.dll ! Vous ne pourrez pas connecter de Wiimote et "
-"Dolphin peut planter inopinément !"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Impossible de lire %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Impossible de lire banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Impossible de lire l'entête bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Impossible de lire le bloc %d de la sauvegarde\n"
 "La carte mémoire est peut-être tronquée\n"
-"Position du fichier : %llx"
+"Position du fichier : %<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2506,7 +2538,7 @@ msgstr ""
 "blocs\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2514,17 +2546,12 @@ msgstr ""
 "Impossible de lire correctement la table d'allocation des blocs\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Impossible de lire les données du fichier %d"
+msgid "Failed to read data from gci file %s"
+msgstr "Impossible de lire les données du fichier GCI %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Impossible de lire les données du fichier %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2532,7 +2559,7 @@ msgstr ""
 "Impossible de lire correctement la sauvegarde des dossiers\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2540,11 +2567,7 @@ msgstr ""
 "Impossible de lire le dossier correctement\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Impossible de lire l'entête"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2552,50 +2575,37 @@ msgstr ""
 "Impossible de lire l'entête correctement\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Impossible de lire l'entête du fichier %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Impossible de lire l'ID unique depuis l'image du disque"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr "Impossible de mettre à jour le code du pays dans SYSCONF"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Impossible d'écrire BT.DINF vers SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Impossible d'écrire bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Impossible d'écrire dans le fichier: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
+"Impossible d'écrire le fichier de sortie \"%s\".\n"
+"Vérifiez que vous avez d'espace libre sur le lecteur de destination."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Impossible d'écrire l'entête de %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Perse"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rapide"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Calcul rapide de la profondeur"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2603,23 +2613,27 @@ msgstr ""
 "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Lecteur FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Infos du fichier"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr "Taille du fichier"
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Le fichier ne contient pas de code."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Fichier converti en .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2627,7 +2641,7 @@ msgstr ""
 "Le fichier n'a pu être ouvert\n"
 "ou n'a pas d'extension valide"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2636,96 +2650,113 @@ msgstr ""
 "Le fichier a l'extension \"%s\"\n"
 "Les extensions valides sont (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Le fichier n'est pas reconnu comme une carte mémoire"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Fichier non compressé"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO : mode d'ouverture inconnu : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr "L'écriture du fichier a échoué"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Système de fichiers"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Filtre toutes les textures, y compris celles que le jeu a explicitement "
+"indiqué comme non filtrées.\n"
+"Peut améliorer la qualité de certaines textures dans quelques jeux, mais "
+"provoquera des pépins dans les autres.\n"
+"En Direct3D, mettre le Filtrage anisotropique au-delà de 1x aura le même "
+"effet qu'activer cette option.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Trouver le suivant"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Trouver le précédent"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Premier bloc"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
-msgstr "Corriger les sommes de contôle"
+msgstr "Corriger les sommes de contrôle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forcer 16/9è"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forcer 4/3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Forcer la console comme NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forcer le filtrage de texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n"
-"Améliore légèrement la qualité des textures, mais peut provoquer des pépins "
-"dans certains jeux.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, "
-"16/10è).\n"
-"Provoque des pépins graphiques dans certains jeux.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n"
 "Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera "
 "automatiquement cette option lorsque des jeux japonais seront lancés."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Force le jeu à sortir des graphiques pour tous les formats d'écran.\n"
+"Utilisé avec \"Format d'écran\" en \"Forcer en 16/9è\" forcera les jeux en "
+"4/3 à être exécutés en 16/9è.\n"
+"Produit rarement de bons résultats et corrompt partiellement les graphiques "
+"et l'interface des jeux.\n"
+"Inutile (et préjudiciable) si vous utilisez des codes AR/Gecko pour écrans "
+"larges.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2733,413 +2764,458 @@ msgstr ""
 "Formater comme ASCII (NTSC\\PAL)?\n"
 "Choisir Non pour sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Avant"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Faire suivre le port (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Trouvé %d résultats pour '"
+msgid "Found %u results for '"
+msgstr "Trouvé %u résultats pour '"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "%x fichiers de sauvegarde trouvés"
+msgid "Found %u save files"
+msgstr "%u fichiers de sauvegarde trouvés"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Image"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Image "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avancement d'image"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "L'enregistrement d'images utilise FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Info image"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Plage d'images :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Saut d'&image :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Image/s max :"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Images à enregistrer :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "France"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Vue libre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr "Baisser la vitesse de la vue libre"
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr "Augmenter la vitesse de la vue libre"
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr "Vue libre : mouvement vers le bas"
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr "Vue libre : mouvement à gauche"
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr "Vue libre : mouvement à droite"
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr "Vue libre : mouvement vers le haut"
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr "Réinitialiser la vue libre"
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr "Réinitialiser la vitesse de la vue libre"
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr "Vue libre : zoom avant"
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr "Vue libre : zoom arrière"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Français"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Plein écran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr "Résolution en Plein écran :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Fichier GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "Manette GC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "Dossier GCI"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
+"Le fichier GCI de sauvegarde n'a pas été chargé car ce n'est pas la bonne "
+"région de carte mémoire.\n"
+"%s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+"GCMemcardDirectory : ClearBlock a été appelé avec une mauvaise adresse de "
+"bloc"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr "Cartes Game Boy Advance (*.gba)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "ID du jeu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
-msgstr "ID du jeu :"
+msgstr "Identifiant du jeu :"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Le jeu est déjà en cours d'émulation !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Le jeu n'est pas en cours d'émulation !"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Jeu non trouvé !"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+"Leu jeu a écrasé la sauvegarde d'un autre jeu, corruption de données à "
+"prévoir. %x, %x"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Paramètres spécifiques au jeu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Config du Jeu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr "Adaptateur GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr "Configuration de la manette GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr "Manettes GameCube"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr "Cartes mémoire de GameCube (*.raw,*.gcp)"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "GameCube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Paramètres de la &manette GameCube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Carte mémoires de GameCube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Paramètres de la manette GameCube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Codes Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Échec de l'exécution du GeckoCode (CT%i CST%i) (%s)\n"
-"(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez "
-"avec le code natif en plaçant le fichier codehandler.bin dans le répertoire "
-"Sys, puis redémarrez Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Général"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Allemand"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Allemagne"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode : l'index est plus grand que la taille de la liste de codes %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Graphismes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Paramètres graphiques"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Plus grand que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Améliore significativement la qualité des textures générées en utilisant les "
-"effets de rendu vers texture.\n"
-"Le fait d'augmenter la résolution interne améliore l'impact de cette "
-"option.\n"
-"Baisse légèrement les performances et peut provoquer quelques pépins (mais "
-"peu probable).\n"
+"Améliore beaucoup la qualité des textures générées en utilisant les effets "
+"de rendu-vers-texture.\n"
+"Augmenter la résolution interne améliorera l'effet de ce réglage.\n"
+"Donne légèrement plus de travail au GPU et provoque relativement peu de "
+"pépins graphiques.\n"
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grèque"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Vert"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Vert Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Vert Droite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr "Rastérisation matérielle"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Echec de la vérification de la somme de contrôle de l'entête"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hébreu"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Hauteur"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Aide"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Bonjour,\n"
-"\n"
-"Dolphin requiert Mac OS X 10.7 ou plus récent.\n"
-"Malheureusement, vous exécutez une ancienne version d'OS X.\n"
-"La dernière version de Dolphin fonctionnant sur OS X 10.6 est Dolphin 3.5.\n"
-"Veuillez mettre à niveau OS X vers 10.7 ou plus récent pour utiliser les "
-"dernières versions de Dolphin.\n"
-"\n"
-"Sayonara !\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Bonjour,\n"
-"\n"
-"Dolphin requiert que votre processeur prenne en charge les instructions "
-"SSE2.\n"
-"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne "
-"s'exécutera pas.\n"
-"\n"
-"Sayonara !\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Cacher"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Masquer le curseur de la souris"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Masquer le curseur de la souris s'il est au-dessus de la fenêtre "
-"d'émulation.\n"
+"Cache le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n"
 "\n"
-"Dans le doute, cochez cette case."
+"Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+"Des valeurs hautes peuvent faire que les jeux fonctionnant à des vitesses "
+"variables seront plus fluides, à la charge du CPU, et inversement.\n"
+"\n"
+"ATTENTION : Changer cette option de sa valeur par défaut (100%) peut et "
+"déstabilisera certains jeux. Faites-le à vos propres risques. Ne nous "
+"signalez pas de bogues si vous n'utilisez pas la vitesse par défaut."
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Hôte"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Configuration des raccourcis clavier"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr "Code de l'hôte :"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+"La taille du code de l'hôte est trop grande.\n"
+"Veuillez vérifier que le code est correct."
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Raccourcis clavier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Hongrois"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Wiimote hybride"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID :"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket "
 "inconnu : %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger IOS ou un titre qui n'est pas "
-"disponible dans la copie de votre NAND.\n"
-"ID du titre : %016llx.\n"
+"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger un titre qui est absent de la "
+"copie de votre NAND.\n"
+"ID du titre : %016<PRIx64>.\n"
 "Dolphin va probablement se bloquer maintenant."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - mauvaise destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr "IOCTL_ES_LAUNCH: Le fichier DOL n'est pas valide !"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Paramètres IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr "IPL avec un hash inconnu %x"
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Pointeur IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Sensibilité de l'IR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Détails de l'ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Dossiers des ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "Italie"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Icône"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les "
-"jeux Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorer les changements de formats"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
@@ -3149,9 +3225,9 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
@@ -3163,129 +3239,155 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Implémente un mode de plein écran sans bordure de fenêtre recouvrant tout "
+"l'écran au lieu d'utiliser le mode exclusif.\n"
+"Permet d'avoir des transitions plus rapides entre le mode plein écran et le "
+"mode fenêtré, mais augmente légèrement la latence d'entrée, provoquant des "
+"mouvements moins fluides et abaissant légèrement les performances.\n"
+"Le mode exclusif est requis pour que nVidia 3D Vision fonctionne avec le "
+"moteur Direct3D.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importer une sauvegarde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importer la sauvegarde Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Échec de l'importation"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Le fichier importé a l'extension GSC\n"
-"mais n'a pas une entête valide"
+"Le fichier importé a une extension GSC\n"
+"mais n'a pas d'entête valide."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Le fichier importé a une longueur non valide"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr "Le fichier importé n'a pas de longueur valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 "Le fichier importé a l'extension SAV\n"
-"mais n'a pas une entête valide"
+"mais n'a pas d'entête valide"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Dans le jeu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr "Augmenter la convergence"
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr "Augmenter la profondeur"
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Augmenter la limite d'image/s"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "Augmenter l'IR"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Information"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Entrée"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insérer"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Indiquer un code crypté ou décrypté ici..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Insérer une carte SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr "Indiquer un nom ici..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Installer un WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Installer dans le menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas "
-"encore en charge."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Installation du WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Erreur lors de la vérification de l'intégrité"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Vérification de l'intégrité terminée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Echec de la vérification de l'intégrité pour la partition %d. Votre copie "
-"est certainement corrompue ou a été incorrectement patchée."
+"Echec de la vérification de l'intégrité pour de %s. L'image du disque est "
+"certainement corrompue ou a été incorrectement patchée."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Paramètres de l'interface"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Erreur interne LZO - échec de la compression"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3294,105 +3396,108 @@ msgstr ""
 "Erreur interne LZO -  échec de la décompression (%d) (%li, %li) \n"
 "Essayez de charger à nouveau l'état"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erreur interne LZO -  échec de lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr "Nom interne :"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Résolution interne :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpréteur (TRÈS lent)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Taille invalide (%x) ou mot Magique (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr "bat.map ou entrée dir non valide"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Valeur non valide !"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "bar.map ou entrée dir non valide"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Type d'évènement non valide : %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Fichier non valide"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
-msgstr ""
-"Le fichier opening.bnr n'est pas valide dans ce GCM :\n"
-"%s\n"
-"Vous devriez copier à nouveau ce jeu."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
+msgstr "Hôte non valide"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr "Index non valide"
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Fichier d'enregitrement non valide"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Paramètres de recherche non valide (aucun objet sélectionné)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Texte de recherche non valide (impossible à convertir en nombre)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 "Texte de recherche non valide (seules les longueurs de chaînes de caractères "
 "sont prises en charge)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "État non valide"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr "Valeur non valide."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italien"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "Japon"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "Italie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr "Entrée itérative"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "Recompilateur JIT (recommandé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Recompilateur expérimental JITIL"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "Recompilateur JITIL (plus lent, expérimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "Japon"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "Corée"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "Toujours au premier plan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3402,64 +3507,75 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Toujours au premier plan"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "Clavier"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Touche"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr "Touches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr "Sortir le joueur"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "Corée"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Coréen"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Bouton L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L Analog."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Langue :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Dernier %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latence :"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick Gauche"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"Clic gauche pour détecter le raccourci clavier.\n"
-"Touche Espace pour effacer."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Stick Gauche"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3469,7 +3585,7 @@ msgstr ""
 "Clic du milieu pour effacer.\n"
 "Clic droit pour plus d'options."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3477,205 +3593,221 @@ msgstr ""
 "Clic gauche/droit pour plus d'options.\n"
 "Clic sur molette pour effacer."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Plus petit que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Nb de FPS comme limite"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "Licence"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+"Ceci limite la vitesse du jeu au nombre spécifié d'images par seconde (60 i/"
+"s pour le NTSC, 50 i/s pour le PAL)."
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Charger"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Charger textures personnalisées"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Charger l'état"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Charger le dernier état 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Charger le dernier état 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Charger le dernier état 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Charger le dernier état 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Charger le dernier état 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Charger le dernier état 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Charger le dernier état 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Charger le dernier état 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Charger l'état du Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Charger le dernier état 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Charger l'état du Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Charger l'état du Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Charger l'état du Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Charger l'état du Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Charger l'état du Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Charger l'état du Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Charger l'état du Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Charger le dernier état 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Charger un état..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Charger le Menu Système Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Charger le Menu Système Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Charger les textures depuis User/Load/Textures/<id du jeu>/\n"
+"Charge les textures personnalisées depuis User/Load/Textures/<id du jeu>/\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr ""
-"Charger les valeurs de pré-réglage à partir de la palette de hack "
-"disponibles."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr "Charger depuis l'emplacement sélectionné"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr "Charge l'état depuis l'emplacement sélectionné"
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr "Chargé %d bonnes fonctions, ignoré %d mauvaises fonctions."
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr "Localhost"
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Journal"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configuration de la journalisation"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Enregistrer le nombre de FPS"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr "Enregistrer le temps de rendu dans un fichier"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Types de journaux"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/"
-"fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de "
-"Dolphin.\n"
+"Enregistre le temps nécessaire pour chaque rendu d'image dans User/Logs/"
+"render_time.txt. Utilisez cette fonctionnalité lorsque vous voulez mesurer "
+"les performances de Dolphin.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Sorties des journalisations"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Journalisation"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Connexion au serveur perdue !"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Bouton M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
-msgstr ""
-"MD5 non concordant\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
+msgstr "Somme de contrôle MD5 :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Hack de vitesse pour le MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Fichiers MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Stick principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
-msgid "Maker ID:"
-msgstr "ID concepteur :"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "Concepteur"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
+msgid "Maker ID:"
+msgstr "ID du concepteur :"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Concepteur :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3690,29 +3822,33 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr "Ceci peut ralentir le Menu Wii et quelques jeux."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
 msgstr "La carte mémoire contient déjà une sauvegarde pour ce titre"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Carte mémoire déjà chargée"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Octet mémoire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Carte mémoire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3720,7 +3856,7 @@ msgstr ""
 "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant "
 "utilisation, devrait être OK mais corruption possible de données !"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3737,39 +3873,57 @@ msgstr ""
 "%s\n"
 "Voulez-vous copier l'ancien fichier vers ce nouvel endroit ?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr "MemoryCard: ClearBlock a été appelé avec la mauvaise adresse %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+"MemoryCard : la lecture a été appelée avec la mauvaise adresse source %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+"MemoryCard : l'écriture a été appelée avec une mauvaise adresse de "
+"destination, %x"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "La taille du fichier de la carte mémoire ne correspond pas à la taille de "
 "l'entête."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Micro"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Divers"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Paramètres divers"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modif."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3782,20 +3936,24 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr "Ombres monoscopiques"
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Police mono-espacée."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Vibreur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3813,316 +3971,290 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplier"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "Note : La taille du flux est différente de la longueur actuelle des données\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Ajout"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Début"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Décimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Supprimer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Diviser"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Entrée"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Egal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Début"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insérer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Gauche"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiplier"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Haut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Droite"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Séparateur"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Espace"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Soustraire"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tabulation"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Haut"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nom :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nom :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Fichiers natifs GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "Pays-bas"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr "NetPlay est désynchronisé. Il n'y a aucun moyen d'y remédier."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nouvelle recherche"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Recherche suivante"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Pseudo :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Pas de pays (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Aucun ISO ou WAD trouvé"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Pas de sortie audio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Aucune bannière trouvée pour le titre  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Aucune description disponible"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Pas d'attachement"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Aucun fichier chargé"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr "Aucune entrée de dossier d'index libre"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Aucun fichier enregistré"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
+"Pas de fichier undo.dtm trouvé, abandon de l'annulation de chargement d'état "
+"pour empêcher une désynchronisation du film"
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Aucune"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norvégien Bokmål"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Différent"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Non défini"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Ce n'est pas une sauvegarde Wii ou échec de le lecture de la taille de "
-"l'entête du fichier %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Non connectée"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notes"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notes :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Note"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Verr. Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Nombre de codes :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuck"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Accéleration du Nunchuck"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr "Orientation du Nunchuck"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr "Nunchuck"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr "nVidia 3D Vision"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Plage d'objets :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Arrêt"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Afficher les messages informatifs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "&Documentation en ligne"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "%d blocs disponibles seulement"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Ouvrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Ouvrir l'emplacement du fichier"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Ouvrir le dossier de &sauvegarde Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL : impossible de créer le contexte pour le matériel %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL : impossible de trouver des périphériques audio"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL : impossible d'ouvrir le périphérique %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Décodeur de texture OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Décodeur de texture OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4130,22 +4262,18 @@ msgstr ""
 "Ouvre la configuration par défaut pour ce jeu dans un éditeur de texte "
 "externe (lecture seule)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Ouvre la configuration personnalisée pour ce jeu dans un éditeur de texte "
-"externe"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Options"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Orange"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4156,346 +4284,335 @@ msgstr ""
 "Faites un clic droit et exportez toutes les sauvegardes,\n"
 "puis importez les sauvegardes vers une nouvelle carte mémoire\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr "Orientation"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Autres"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Autre client déconnecté pendant que le jeu est en cours d'exécution !! "
-"NetPlay est désactivé. Vous devez arrêter le jeu manuellement."
+"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est "
+"désactivé. Vous devez arrêter le jeu manuellement."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Sortie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Jouer l'enregistrement..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr "Information sur la surcouche"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr "&Jouer l'enregistrement..."
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Manette"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Manette "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Manettes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Défil Bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Défil Haut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraphe"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Paramètres"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partition %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "La partition n'existe pas : %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patchs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Chemins"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Faire une pause à la fin du film"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr "Pause à la fin du Film"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr "Pause lorsque la fenêtre n'est plus sélectionnée"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+"Met l'émulateur en pause lorsque le focus n'est plus sur la fenêtre "
+"d'émulation."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Eclairage par pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Parfait"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspective %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "Plateforme"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Démarrer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Jouer l'enregistrement..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Démarrer/Arrêter"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Jouable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Options de lecture"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Joueurs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Veuillez confirmer..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Merci de créer une perspective avant de sauvegarder"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Moins"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polonais"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr "Port %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugais"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr "Configuration du post-processus des Shaders"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugais (brésilien)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Effet de Post-processing :"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr "Précharger textures personnalisées"
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Pré-réglages :"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Page préc."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Valeur précédente"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Imprimer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Propriétés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Vider le cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr "Met les ROM de BIOS dans User/GC/{région}."
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Question"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Quitter"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Bouton R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R Analog."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "Russie"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Etendue"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Mode Lecture seule"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Réel"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Balance Board physique"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Wiimote physique"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Wiimote physique"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Enregistrer"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Entrée mémoire"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Infos sur l'enregistrement"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Options d'enregistrement"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rouge"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rouge Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rouge Droite"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n"
+"Réduit la quantité d'aliasing causée par des graphiques 3D rastérisés.\n"
 "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n"
-"Impacte négativement les performances de l'émulation et peut provoquer des "
-"pépins.\n"
+"Impacte beaucoup le GPU et peut provoquer des pépins graphiques.\n"
 "\n"
 "Dans le doute, sélectionnez Aucune."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Rafraîchir la liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Rafraîchir la liste des jeux"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "Région"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Retirer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4505,246 +4622,324 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Rendu dans la fenêtre principale"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr "Rendu"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr "Rapport : GCIFolder écrit vers le bloc non alloué %x"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr "Réinitialiser les paramètres traversal"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Résultats"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr "Réessayer"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Entrée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Révision :"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "Révision : %s"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Droite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick Droit"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Stick Droit"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"Éxécuter DSP LLE sur un thread dédié (non recommandé : peut causer des "
-"blocages)"
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "Russie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russe"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Sau&vegarder l'état"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Sûr "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Sauver"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Enregistrer GCI sous..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Sauvegarder l'ancien état"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Sauvegarder l'état"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Sauvegarder l'état vers le Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Sauvegarder l'état au Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Sauvegarder l'état vers le Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Sauvegarder l'état vers le Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Sauvegarder l'état vers le Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Sauvegarder l'état vers le Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Sauvegarder l'état vers le Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Sauvegarder l'état vers le Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Sauvegarder l'état vers le Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Sauvegarder l'état au Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Enregistrer l'état"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Sauver le fichier compressé GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Sauvegarder la perspective actuelle"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Sauvegarder le fichier GCM/ISO décompressé"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr "Sauvegarder l'état dans l'emplacement sélectionné"
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr "Sauvegarder vers l'emplacement sélectionné"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr "Sauvegardé dans /Wii/sd.raw (la taille par défaut est 128 MB)"
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du "
 "film..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Copie à l'échelle de l'EFB"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Analyse de %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Recherche d'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Recherche..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Capt écran"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+"La capture d'écran a échoué : impossible d'ouvrir le fichier \"%s\" (erreur "
+"%d)"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Arrêt défil."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Rechercher"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Fitre de recherche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Chercher dans sous-dossiers"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Rechercher l'objet actuel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Rechercher une valeur Hexadécimale :"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "La section %s n'a pas été trouvée dans SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Sélectionner"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "Afficher les colonnes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr "Sélectionner l'emplacement %i"
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr "Sélectionner l'emplacement 1 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr "Sélectionner l'emplacement 10 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr "Sélectionner l'emplacement 2 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr "Sélectionner l'emplacement 3 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr "Sélectionner l'emplacement 4 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr "Sélectionner l'emplacement 5 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr "Sélectionner l'emplacement 6 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr "Sélectionner l'emplacement 7 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr "Sélectionner l'emplacement 8 pour l'état"
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr "Sélectionner l'emplacement 9 pour l'état"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr "Sélectionner l'emplacement pour l'état"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Sélectionner le fichier d'enregistrement"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Sélectionner un fichier WAD de Wii à installer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Sélectionne la carte graphique à utiliser.\n"
-"\n"
-"Dans le doute, sélectionnez la première."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Sélectionner un fichier de sauvegarde à importer"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Sélectionner les fenêtres flottantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Sélectionner le fichier à charger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Sélectionner le fichier à enregistrer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Sélectionner l'état à charger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Sélectionner l'état à enregistrer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4763,276 +4958,334 @@ msgstr ""
 "\n"
 "Dans le doute, choisissez Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr "Le profil de controleur sélectionné n'existe pas"
+msgstr "Le profil de contrôleur sélectionné n'existe pas"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Police sélectionnée"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"Sélectionne la carte graphique à utiliser.\n"
+"\n"
+"Dans le doute, sélectionnez la première."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n"
 "Elle devrait toujours être supérieure ou égale à la résolution interne. "
 "L'impact sur les performances est négligeable.\n"
 "\n"
-"Dans le doute, utilisez la résolution de votre Bureau.\n"
-"Si vous ne savez toujours pas, sélectionnez la plus haute résolution "
-"affichée."
+"Dans le doute, sélectionnez Auto."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+"Sélectionne le mode de stéréoscopie pour la 3D. La stéréoscopie vous permet "
+"d'avoir une meilleure sensation de profondeur si vous avez le matériel "
+"requis.\n"
+"Côte-à-côte et Dessus-dessous sont utilisés par la plupart des TV 3D.\n"
+"Anaglyphe est utilisé pour les lunettes Rouge-Cyan.\n"
+"Baisse beaucoup la vitesse d'émulation et provoque parfois des pépins.\n"
+"\n"
+"Dans le doute, sélectionnez Désactivé."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Sélectionne quel moteur graphique doit être utilisé en interne.\n"
-"Direct3D 9 est généralement le plus rapide. OpenGL est le plus précis. "
-"Direct3D 11 est entre les deux.\n"
-"Les moteurs Direct3D ne sont disponibles que pour Windows.\n"
-"\n"
-"Dans le doute, sélectionnez Direct3D 11."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
-msgid ""
-"Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
-"\n"
-"If unsure, use OpenGL."
-msgstr ""
-"Sélectionne quel moteur graphique doit être utilisé en interne.\n"
-"Direct3D 9 est généralement le plus rapide. OpenGL est le plus précis. "
-"Direct3D 11 est entre les deux.\n"
-"Les moteurs Direct3D ne sont disponibles que pour Windows.\n"
+"Sélectionne le moteur graphique à utiliser en interne.\n"
+"Le Rendu logiciel est très lent et uniquement utilisé à des fins de "
+"débogage, donc si vous n'avez pas de raison de l'utiliser, vous devriez "
+"sélectionner OpenGL ici.\n"
 "\n"
 "Dans le doute, sélectionnez OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
+msgid ""
+"Selects what graphics API to use internally.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
+"\n"
+"If unsure, select OpenGL."
+msgstr ""
+"Sélectionne le moteur graphique interne à utiliser.\n"
+"Le Rendu logiciel est très lent et uniquement utilisé à des fins de "
+"débogage, donc vous devriez utiliser Direct3D ou OpenGL. Certains jeux ont "
+"un comportement différent selon le moteur choisi ; pour obtenir le meilleur "
+"résultat, testez les deux moteurs et choisissez celui qui convient le "
+"mieux.\n"
+"\n"
+"Dans le doute, sélectionnez OpenGL."
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Envoyer"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Position de la Sensor Bar :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Séparateur"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbe"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
 "Port série 1 - C'est le port que les périphériques tels que l'adaptateur "
-"ethernet utilisent"
+"Ethernet utilisent"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr "Le serveur a rejeté la tentative traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Définir comme l'ISO par &défaut"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Définir comme carte mémoire par défaut : %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive : L'index est plus grand que la taille de la liste des "
 "codes AR %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr "Définit la langue du système de la GameCube"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+"Définit la mode d'affichage de la Wii à 60 Hz (480i) au lieu de 50 Hz (576i) "
+"pour les jeux.\n"
+"Peut ne pas fonctionner pour tous les jeux."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr "Définit la langue du système de la Wii."
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Configure la latence (en ms).  Des valeurs plus élevées peuvent réduire le "
-"craquement audio. Uniquement avec le moteur OpenAL."
+"Définit la latence (en ms). Des valeurs hautes peuvent réduire le craquement "
+"audio. Pour le moteur OpenAL uniquement."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Configurer..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr "SetupWiiMemory : Impossible de créer le fichier setting.txt"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Impossible de créer le fichier de paramètres"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Secouement"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Nom court :"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Boutons latéraux"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Afficher la &Console"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Afficher le &journal"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Afficher la barre d'&état"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Afficher la barre d'&outils"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "Afficher Australie"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Afficher les paramètres par défaut"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Afficher les lecteurs"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Afficher les régions copiées d'EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Afficher les FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr "Affiche le compteur d'images"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Afficher France"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Afficher GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "Afficher Allemagne"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Afficher le graphisme en entrée"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Afficher Italie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Afficher Japon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Afficher Corée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
-msgid "Show Language:"
-msgstr "Afficher la langue :"
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr "Afficher le compteur de lags"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
+msgid "Show Language:"
+msgstr "Afficher en :"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Afficher la config. de journalisation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "Afficher Pays-bas"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Afficher PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Afficher les plateformes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Afficher les régions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "Afficher Russie"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "Afficher Espagne"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Afficher les statistiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Afficher Taïwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Afficher USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "Afficher les inconnus"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Afficher WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Afficher Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr "Afficher Monde"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Demande confirmation avant d'arrêter le jeu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n"
 "Le désactiver évitera les messages embêtants et les messages non-fatals, "
 "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune "
 "explication."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Afficher le premier bloc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Afficher le compteur de lag"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Affiche les messages par-dessus la zone d'émulation.\n"
-"Ces messages incluent les écritures de carte mémoire, la moteur de rendu "
-"vidéo et les infos du processeur, et l'effacement du cache JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Afficher les blocs de sauvegarde"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Afficher le commentaire de sauvegarde"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Afficher l'icône de la sauvegarde"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Afficher le titre de sauvegarde"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5044,48 +5297,60 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Afficher les inconnus"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Affiche diverses statistiques.\n"
+"Affiche diverses statistiques de rendu.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr "Côte-à-côte"
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Wiimote à l'horizontale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Taille"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Ne pas exécuter le BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Ignorer le vidage DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Ignorer l'accès à l'EFB depuis le CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Saute la synchronisation du GPU avec les copies d'EFB. Provoque des défauts "
+"graphiques dans un petit nombre de jeux.\n"
+"\n"
+"Dans le doute, cochez cette case."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
@@ -5093,35 +5358,34 @@ msgid ""
 msgstr ""
 "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision "
 "de l'émulation.\n"
-"Améliore parfois la qualité visuelle.\n"
 "Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache "
 "ou désactivez cette option.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Capture"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Rendu logiciel"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr "Erreur de socket lors de l'envoi vers le serveur traversal"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5134,154 +5398,193 @@ msgstr ""
 "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez "
 "'Non'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
-msgid "Sound Settings"
-msgstr "Paramètres audio"
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+"Quelque chose est parti en vrille.\n"
+"Arrêt de l'enregistrement de la vidéo.\n"
+"Votre film sera probablement corrompu."
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
+msgid "Sound Settings"
+msgstr "Réglages audio"
+
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Le moteur audio %s n'est pas valide"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Echec de la création du buffer audio : %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Espace"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "Espagne"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr "Volume du haut-parleur"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volume du haut-parleur :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 "Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la "
-"qualité visuelle mais impacte beaucoup les performances et peut provoquer "
+"qualité visuelle mais augmente l'utilisation du GPU et peut provoquer "
 "quelques pépins dans certains jeux.\n"
-"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" "
-"mais provoque moins de problèmes. En général, plus la résolution interne est "
-"petite, meilleures seront les performances.\n"
+"\"Multiple de 640x528\" résultera dans une taille légèrement supérieure à la "
+"\"Taille de la fenêtre\" mais il y aura moins de problèmes. En général, plus "
+"la résolution interne est petite, meilleures seront les performances.\n"
 "\n"
 "Dans le doute, sélectionnez 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Accélerer le taux de transfert du disque"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Stick carré"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
+"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils "
+"puissent être exécutés sur des cœurs séparés.\n"
+"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC "
+"modernes, mais peut occasionnellement causer des petits pépins ou des "
+"plantages."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Contrôleur standard"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Démarrer &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Commencer l'enregistrement"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr "&Démarrer l'enregistrement de l'entrée"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Commencer l'enregistrement"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "État"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "États sauvegardés"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr "Mode de stéréoscopie 3D :"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr "Stéréoscopie"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Arrêter"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
-msgstr ""
-"Enregistre les copies d'EFB dans les objets de texture du GPU.\n"
-"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des "
-"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n"
-"\n"
-"Dans le doute, sélectionnez cette case."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
+msgstr "Enregistre les copies de l'EFB vers la texture uniquement"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Étirer à la fenêtre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Gratter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Soustraire"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Fichier exporté avec succès vers %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Fichiers de sauvegarde importés avec succès"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Suédois"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr "Exportation réussie de %u sauvegardes vers %s"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr "Aide"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr "Inverser les yeux"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Echange l'œil gauche et droit. Utile principalement si vous voulez voir les "
+"yeux inversés en côte-à-côte.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Balancement"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synchroniser le thread du GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5289,81 +5592,121 @@ msgstr ""
 "Synchronise les transferts entre le GPU et le CPU pour éviter des blocages "
 "aléatoires en mode Dual Core. (Coché = Compatible, Décoché = Rapide)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr "Erreur de syntaxe"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Langue du système :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "Taïwan"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Entrée TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr "Entrée TAS - Manette %d"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr "Entrée TAS - Wiimote %d"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Séparateur par tabulation"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table Droite"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "Taïwan"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Capture d'écran"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Texture"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Cache de texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Infos de format de texture"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+"Le paramètre \"Sûr\" élimine la probabilité que le GPU rate des mises à jour "
+"de textures depuis la RAM.\n"
+"De moins bonnes précisions provoquent des textes brouillés dans certains "
+"jeux.\n"
+"\n"
+"Dans le doute, utilisez la valeur la plus à droite."
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "Le WAD a été installé avec succès"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "L'adresse n'est pas valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr "La somme de contrôle a été corrigée avec succès"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr "Le dossier sélectionné est déjà dans la liste"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+"Le changement de disque vers \"%s\" ne peut être sauvegardé dans le fichier ."
+"dtm.\n"
+"Le nom de fichier de l'image du disque ne doit pas dépasser 40 caractères."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+"L'image du disque \"%s\" est corrompue.\n"
+"Le hash du bloc %<PRIu64> est %08x au lieu de %08x."
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5372,7 +5715,7 @@ msgstr ""
 "Le fichier %s existe déjà.\n"
 "Voulez-vous le remplacer ?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5381,46 +5724,34 @@ msgstr ""
 "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas "
 "été ouvert par un autre programme."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
-#, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Le fichier que vous avez spécifié (%s) n'existe pas"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
 msgstr "Le nom ne peut être vide"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
 msgstr "Le nom ne peut contenir le caractère ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/Core/Movie.cpp:184
+#, c-format
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr "Le jeu enregistré (%s) n'est pas le même que le jeu sélectionné  (%s)"
+
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Le code AR décrypté ne contient aucune ligne."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
-msgstr ""
-"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de "
-"texture depuis la RAM.\n"
-"\n"
-"Dans le doute, utilisez la position la plus à droite."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 "La sauvegarde que vous essayez de copier a une taille de fichier non valide"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5428,36 +5759,51 @@ msgstr ""
 "La langue sélectionnée n'est pas prise en charge par votre système. Retour à "
 "la langue par défaut du système."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Les versions NetPlay du serveur et du client sont incompatibles !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Le serveur est plein !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Le serveur a répondu que le jeu est déjà en cours d'exécution !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Le serveur a envoyé un message d'erreur inconnu !"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Le fichier spécifié \"%s\" n'existe pas"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "La valeur n'est pas valide"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Thème :"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+"Il y a trop de fichiers GCI dans le dossier\n"
+"%s\n"
+"Seuls les 127 premiers seront disponibles"
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr "Il n'y a rien à annuler !"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5465,15 +5811,15 @@ msgstr ""
 "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est "
 "probablement incomplète."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
-"Ces paramètres écrasent ceux de Dolphin.\n"
-"Indéterminé signifie que les paramètres de Dolphin sont appliqués."
+"Ces paramètres remplacent ceux de Dolphin.\n"
+"'Indéterminé' signifie que les paramètres de Dolphin sont appliqués."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5481,18 +5827,14 @@ msgstr ""
 "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient "
 "l'Action Replay lui-même."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Ceci peut ralentir le Menu Wii et quelques jeux."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -5500,108 +5842,174 @@ msgstr ""
 "Faites un clic droit et déplacez la souris pour changer l'orientation de la "
 "caméra, ou cliquez sur le bouton du milieu pour la déplacer.\n"
 "Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de "
-"la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace "
-"plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la "
+"la caméra (SHIFT+2 déplace la caméra plus vite, SHIFT+1 la déplace plus "
+"lentement). Appuyez sur SHIFT et R pour réinitialiser la position de la "
 "caméra.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Ceci limite la vitesse du jeu au nombre spécifié d'images par seconde (60 i/"
-"s pour le NTSC, 50 i/s pour le PAL). Vous pouvez à la place utiliser Audio "
-"pour gérer via le DSP (peut éliminer les problèmes audio, mais peut "
-"provoquer un bruit constant selon les jeux).²"
+"Ce titre peut être incompatible avec l'émulation audio en HLE. Essayez "
+"d'utiliser le LLE si c'est un homebrew.\n"
+"\n"
+"DSPHLE: ucode inconnu (CRC = %08x) - forçage de AX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils "
-"puissent être exécutés sur des coeurs séparés.\n"
-"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC "
-"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou "
-"des plantages."
+"Ce titre peut être incompatible avec l'émulation audio en HLE. Essayez "
+"d'utiliser le LLE si c'est un homebrew.\n"
+"\n"
+"ucode inconnu (CRC = %08x) - forçage de AXWii."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
-"Ceci vous permettra de modifier manuellement le fichier de configuration INI"
+"Cette valeur est ajoutée à la valeur de la convergence définie dans la "
+"configuration des graphiques."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+"Cette valeur est multipliée par la profondeur définie dans la configuration "
+"des graphiques."
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+"Cette version de Dolphin a été téléchargée depuis un site volant de l'argent "
+"aux développeurs de l'émulateur. Veuillez télécharger Dolphin depuis le site "
+"web officiel :  https://dolphin-emu.org/"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+"Ceci va vous permettre de modifier manuellement le fichier INI de "
+"configuration"
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Seuil"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr "Pas de réponse lors de la connexion au serveur traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Titre"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Activer tous les types de journaux"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Activer le ratio hauteur/largeur"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Activer les copies EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Activer le brouillard"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr "Activer la limitation d'images"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Activer le plein écran"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Activer l'IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr "Activer la pause"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Haut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr "Dessus-dessous"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr "Traversal"
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr "Le serveur traveral n'a pas répondu lors de la connexion à l'hôte"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr "Traversal : "
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr "Essayé de déchiffrer des données depuis un volume non-Wii"
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Echec de chargement d'un type de fichier inconnu."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Déclencheurs"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr "Tentative de création d'un index non valide de carte mémoire."
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Essai de lecture d'un fichier SYSCONF non valide"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5609,41 +6017,24 @@ msgstr ""
 "Essai de lecture à partir d'un SYSCONF non valide\n"
 "Les IDs BT de la Wiimote ne sont pas disponibles"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turque"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Tourne-disque"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Type"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Port UDP :"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "Wiimote UDP :"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "Inconnu"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "Inconnu_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5651,206 +6042,187 @@ msgstr ""
 "Impossible de créer un patch à partir des valeurs données.\n"
 "L'entrée n'a pas été modifiée."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou "
-"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n"
-"Voulez-vous ignorer cette ligne et continuer l'analyse ?"
+"Impossible d'analyser la ligne %u du code AR entré comme un code crypté ou "
+"décrypté valide. Vérifiez que vous l'avez tapé correctement.\n"
+"Souhaitez-vous ignorer cette ligne et continuer l'analyse ?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "%i non défini"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "&Annuler le lancement d'état"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Annuler la sauvegarde de l'état"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Appel 0x80 inattendu. Abandon..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Commande DVD inconnue %08x - erreur fatale"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Commande 0x%08x inconnue"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Type d'entrée %i inconnue dans SYSCONF (%s@%x) !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr "Erreur inconnue %x"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr "Erreur inconnue de carte mémoire"
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Reception d'un message inconnu avec l'ID : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr "Version non officielle détectée"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Haut"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote debout"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Utiliser le mode EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "&Plein écran"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Utiliser Hexa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "Utiliser le mode PAL60 (EuRGB60)"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Utiliser les gestionnaires de panique"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 "Utiliser un algorithme moins précis pour calculer les valeurs de "
 "profondeur.\n"
 "Provoque des soucis dans quelques jeux mais peut donner une bonne "
-"accélération.\n"
+"accélération en fonction du jeu et/ou de votre GPU.\n"
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Utilise plusieurs threads pour décoder les textures.\n"
-"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont "
-"plus de 2 coeurs.\n"
-"\n"
-"Dans le doute, décochez cette case."
+"Utiliser un buffer de simple profondeur pour les deux yeux. Requis pour "
+"quelques jeux."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Utilise des opérations peu sûres pour accélérer le streaming des vertex dans "
-"OpenGL. Il n'y a pas de problèmes connus sur les GPU pris en charge, mais "
-"dans le cas contraire il causera des problèmes sévères de stabilité et "
-"graphiques . \n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"En cas d'échec de compilation de shader, un message est habituellement "
-"affiché.\n"
-"Cependant, certains préfèrent ne pas afficher ce message pour ne pas "
-"interrompre le jeu en cochant cette case.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilitaires"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "Synchro verticale"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hack de vitesse VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valeur"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valeur :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valeur :"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "Diverses statistiques"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Niveau de détail"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hack de flux de vertex"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Vidéo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr "Baisser Volume"
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr "Activer la coupure du son"
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr "Augmenter Volume"
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Échec de l'installation du WAD : erreur lors de la création de %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Échec de l'installation du WAD : erreur lors de la création du ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5862,25 +6234,28 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Attention"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Attention : démarrage du DOL dans un mauvais mode de console !"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+"Attention, le nombre de blocs BAT %d ne correspond pas à l'entête chargée %d"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5892,7 +6267,7 @@ msgstr ""
 "%s\n"
 "Voulez-vous continuer ?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5906,7 +6281,7 @@ msgstr ""
 "et vont avoir le même nom que le fichier sur votre carte mémoire\n"
 "Continuer ?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5918,7 +6293,18 @@ msgstr ""
 "autre sauvegarde avant de continuer, ou charger cette sauvegarde en "
 "désactivant le mode Lecture seule."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+"Attention : Vous avez chargé une sauvegarde dont le film finit avant l'image "
+"actuelle dans la sauvegarde (octet %u < %u) (image %u < %u). Vous devriez "
+"charger une autre sauvegarde avant de continuer."
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5930,7 +6316,7 @@ msgstr ""
 "charger cet état en désactivant le mode Lecture seule. Dans le cas "
 "contraire, il y aura probablement une désynchronisation."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5964,180 +6350,168 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, "
 "DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fichier non ouvert."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Hack écran large (16/9è)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Largeur"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Console Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Racine de la NAND (Wii) :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD : impossible de lire le fichier"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wiimote %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote connectée"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Vibreur de la Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Paramètres de la Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Gauche"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Droit"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Casse"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Travail..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr "Monde"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Écriture carte mémoire (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Écrire dans la console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Écrire dans le débugueur"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Écrire dans le fichier"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Écrire dans la fenêtre"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "Échec de XAudio2 CreateSourceVoice : %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Échec de l'initialisation de XAudio2 : %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr "Registre XF"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Échec de la création de la voix principale dans XAudio2 : %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Jaune"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Vous utilisez une ROM audio \"DSP\" gratuite conçue par l'équipe de "
-"Dolphin.\n"
-"Tous les jeux Wii fonctionneront correctement, et la plupart des jeux "
-"GameCube aussi, mais les UCodes GBA/IPL/CARD ne fonctionneront pas.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Vous utilisez une ancienne ROM audio \"DSP\" conçue par l'équipe de "
-"Dolphin.\n"
-"Seuls les jeux utilisant les UCodes Zelda fonctionneront correctement.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Vous ne pouvez pas fermer des panneaux contenant des appels."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Vous devez choisir un jeu !!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
+"Vous avez redimensionné la fenêtre pendant l'enregistrement des images.\n"
+"Rien ne peut être fait pour gérer ceci proprement.\n"
+"Votre vidéo sera probablement corrompue."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "Vous devez choisir un jeu !"
+
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
 msgstr "Vous devez entrer un nom !"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
-msgstr "Vous devez entrer un profil de nom valide."
+msgstr "Vous devez entrer un nom de profil valide."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6147,7 +6521,7 @@ msgstr ""
 "Voulez-vous arrêter l'émulation maintenant pour corriger le problème ?\n"
 "Si vous choisissez \"Non\", l'audio pourra être déformé."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6155,36 +6529,36 @@ msgstr ""
 "Votre fichier GCM/ISO ne semble pas valide (pays non valide).\n"
 "Voulez-vous continuer en tant que région PAL ?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Votre fichier SYSCONF n'a pas la bonne taille.\n"
-"Il devrait être de 0x%04x (au lieu de 0x%04llx).\n"
+"Il devrait être de 0x%04x (au lieu de 0x%04<PRIx64>).\n"
 "Voulez-vous en générer un nouveau ?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Hack ZTP"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Code Zero 3 non pris en charge"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero code inconnu pour Dolphin : %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr "Code Zero inconnu pour Dolphin : %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ attente ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6196,77 +6570,30 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Personnalisé]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Tente d'accélérer l'émulation en déportant le décodage de texture vers le "
-"GPU en utilisant le framework OpenCL.\n"
-"Cependant, il est actuellement connu pour provoquer des défauts de textures "
-"dans divers jeux. De plus, il est généralement plus lent qu'un classique "
-"décodage par le CPU.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Accélère légèrement l'émulation en mettant en cache les listes d'affichage.\n"
-"Peut provoquer des pépins.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr "Achèvement truqué"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "Aucun"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "flavor inconnu %d (%d attendu)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "Message inconnu reçu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute a retourné -1 sur l'exécution de l'application !"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correction zFar :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correction zNear :"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OU"
diff --git a/Languages/po/he.po b/Languages/po/he.po
index cc191c6f4f..de8de5e075 100644
--- a/Languages/po/he.po
+++ b/Languages/po/he.po
@@ -1,16 +1,18 @@
-# Translation of dolphin-emu.pot to Hebrew
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # nakee <nakeee@gmail.com>, 2011
+# nakee <nakeee@gmail.com>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/he/)\n"
 "Language: he\n"
@@ -19,434 +21,479 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(ארוך מידי)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "משחק:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! לא"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sהעתק%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
+msgid "%s was not a directory, moved to *.original"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sמחק%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&אודות"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "הגדרות קול"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&קובץ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&מסך מלא"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&עזרה"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&שחק"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&קול"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&עצור"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr ""
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -456,786 +503,837 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr ""
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
+msgid "Could not save %s."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1248,265 +1346,277 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "קול"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "הגדרות קול"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1515,231 +1625,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1748,56 +1840,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1806,7 +1882,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1816,108 +1892,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1925,7 +1985,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1933,28 +1993,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1962,1330 +2019,1431 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3294,35 +3452,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3333,37 +3495,52 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3371,20 +3548,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3395,909 +3576,950 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr ""
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4308,244 +4530,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4553,74 +4822,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4628,641 +4905,740 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5270,25 +5646,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr ""
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5296,7 +5674,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5305,7 +5683,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5313,7 +5691,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5321,7 +5707,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5340,212 +5726,204 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5553,64 +5931,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/hu.po b/Languages/po/hu.po
index 3f7b03fc89..09bf055cfc 100644
--- a/Languages/po/hu.po
+++ b/Languages/po/hu.po
@@ -1,17 +1,18 @@
-# Translation of dolphin-emu.pot to Hungarian
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Delirious <delirious@freemail.hu>, 2011
+# Delirious <delirious@freemail.hu>, 2011,2013
 # Delirious <delirious@freemail.hu>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/hu/)\n"
 "Language: hu\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (túl sok kijelző)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Játék:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NEM"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,43 +56,93 @@ msgstr ""
 "Nincs \"%s\".\n"
 " Létrehozol egy új 16 MB-os memóriakártyát?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sMásolás%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s már van, felülírod?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +151,7 @@ msgstr ""
 "%s memóriakártyakénti betöltése sikertelen\n"
 " A kártya fájlmérete nem megfelelő (0x%x bájt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -97,7 +160,7 @@ msgstr ""
 "%s memóriakártyakénti betöltése sikertelen\n"
 " A kártya mérete nem megfelelő (0x%x bájt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -107,363 +170,339 @@ msgstr ""
 "a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x "
 "bájt)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s megnyitása sikertelen"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s egy 0 bájt méretű fájl"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s már tömörítve van! Nem tömöríthető tovább."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s túl hossz fájlnévnek, maximum 45 karakter"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sTörlés%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI exportálás%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI importálás%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& ÉS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Névjegy..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Bootolás DVD meghajtóról..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Töréspontok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&ISO fájlok tallózása..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Csalás kezelő"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&Hang beállítások"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&ISO törlése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&A kiválasztott ISO fájlok törlése..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emuláció"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Fájl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Képkocka léptetés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Teljes nézet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Súgó"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Gyorsbillentyű beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Állás betöltése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Memóriakártya kezelő (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Megnyitás..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Szünet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Indítás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Tulajdonságok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Írásvédett mód"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&A lista frissítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Regiszterek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Alapra állítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Hang"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Leállítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Eszközök"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Kép"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Nézet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote beállítások"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(ISMERETLEN)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(ki)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Név beszúrása ide>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Nem található felbontás>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Semmi>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Nyomj egy gombot>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Rendszer>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Már egy NetPlay ablak nyitva van!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "A játék jelenleg nem fut."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Nem található támogatott bluetooth eszköz.\n"
-"Kézileg kell csatlakoztatni a Wiimote irányítókat."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM alaplap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR kódok"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "A Dolphin névjegye"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Gyorsítás"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Pontosság:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"EFB másolatok pontos emulációja.\n"
-"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a "
-"játszhatóság végett.\n"
-"\n"
-"Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetőséget."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Művelet"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -478,7 +517,7 @@ msgstr ""
 "Felelős kód:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -486,7 +525,7 @@ msgstr ""
 "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód "
 "hozzáadásban (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -495,7 +534,7 @@ msgstr ""
 "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben "
 "és regiszterben (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -504,7 +543,7 @@ msgstr ""
 "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban "
 "és kitöltésben (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -513,12 +552,12 @@ msgstr ""
 "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató "
 "írásában (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -527,175 +566,143 @@ msgstr ""
 "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)\n"
 "Mester kódokra nincs szükség. Ne használj mester kódokat."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay hiba: érvénytelen AR kód a(z) %s. sorban"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Feltételes kód: Érvénytelen méret %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Érvénytelen szabályszerű kód típus %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Szabályszerű kód %i: Érvénytelen alfaj %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Szabályszerű kód 0: Érvénytelen alfaj %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "ActionReplay kód hozzáadása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Patch hozzáadása"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Új mező hozzáadása"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Hozzáadás..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Cím:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Meghatározott értéket ad a zFar paraméterhez.\n"
-"Két módja a lebegőpontos értékek kifejezésének.\n"
-"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos "
-"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n"
-"Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n"
-"\n"
-"MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Meghatározott értéket ad a zNear paraméterhez.\n"
-"Két módja a lebegőpontos értékek kifejezésének.\n"
-"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos "
-"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n"
-"Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n"
-"\n"
-"MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének "
 "beállítása."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Haladó"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Minden GC/Wii képfájl (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Minden Gamecube GCM fájl (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Minden állásmentés (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Minden Wii ISO fájl (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Minden tömörített GC/Wii ISO fájl (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Minden fájl (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Elemzés"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Szög"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anizotrópikus szűrés:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Élsimítás:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "A betöltő program nem képes fájlból betölteni"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Betöltő program:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -705,16 +712,12 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: (ki)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arab"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Biztos törlöd ezt: \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -722,54 +725,81 @@ msgstr ""
 "Biztos törlöd ezeket a fájlokat?\n"
 "Végleg el fognak veszni!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (kísérleti)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Képarány:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Legalább egy mezőnek megnyitva kell maradnia."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Hang"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Hang feldolgozó:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Automatikus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Automatikus (640x528 többszöröse)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Automatikus (ablak méret)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Ablak méret automatikus állítása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -779,134 +809,150 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP regiszter "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Hátra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Feldolgozó beállításai"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Feldolgozó:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Háttér bemenet"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Vissza"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Rossz fájl fejléc"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Játék kép"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Játék kép részletek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Játék kép:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Vevő"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Alap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Alap beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basszus"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table ellenőrző összege nem megfelelő"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blokk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Kék"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Kék balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Kék jobbra"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Gomb"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Összekötött irányítások: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Hibás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Tallózás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Hozzáadandó könyvtár tallózása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Egy ISO könyvtár tallózása..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Kimeneti könyvtár tallózása"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Puffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Gombok"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -914,119 +960,100 @@ msgstr ""
 "Az adatgyorsítótár törlésének kihagyása a DCBZ utasítás által. Ez a "
 "beállítás általában maradjon kikapcsolva."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C kar"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-kar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Processzor emulátor motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Kijelző listák gyorsítótárazása"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem "
-"csúcspont alapon.\n"
-"Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n"
-"Ez többnyire biztonságos finomítás, de időnként hibákat okozhat.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Mégse"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "%s nem nyitható meg"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Nem lehet esemény bejegyzéseket törölni függőben lévő eseményekkel"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"A fájl nem használható memóriakártyaként.\n"
-"%s\n"
-"fájl nem megfelelő GameCube memóriakártya fájl"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"A fájl nem használható memóriakártyaként.\n"
-"Azonos fájlt próbálsz használni mindkét kártya helyén?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalán"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Közép"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Váltás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Lemez &váltás..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Lemez váltás"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Játék váltás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1034,75 +1061,63 @@ msgstr ""
 "A program felület nyelvének változtatásához\n"
 "újraindítás szükséges."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Csevegés"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Csalás kód"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Csalás keresés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Csalás kezelő"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Partíció integritás ellenőrzés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Integritás ellenőrzés..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Kínai (egyszerűsített)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Kínai (hagyományos)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Válassz DVD gyökér könyvtárat:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Válassz NAND gyökér könyvtárat:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Válassz alapértelmezett ISO fájlt:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Válassz hozzáadandó könyvtárat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Válasz megnyitandó fájl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Válassz memóriakártyát:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1110,27 +1125,27 @@ msgstr ""
 "Válassz betöltő programnak használandó fájlt: (csak könyvtárakból "
 "létrehozott lemezekre érvényesíthető)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Válassz mappát a kitömörítéshez"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Körös kar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasszikus"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Törlés"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1138,183 +1153,230 @@ msgstr ""
 "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg "
 "kell leállítanod a játékot."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Bezárás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Be&állítások..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Kód infó"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kód:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Parancs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Megjegyzés:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "ISO tömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Kiválasztott ISO tömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "ISO tömörítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Beállítások"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Beállítások"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Irányítás beállítás"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Irányítók beállítása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Beállítások..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Fájl felülírás jóváhagyása"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Kilépéskor megerősítés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Csatlakozás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "USB billentyűzet csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "%i Wiimote csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Wiimote 1 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Wiimote 2 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Wiimote 3 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Csatlakozás..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konzol"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Folyamatos keresés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Irányítás"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Konvertálás: GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Másolás sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "%c. memóriakártyára másolás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Mag"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "%s nem hozható létre"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "%s hang feldolgozó iniciálása sikertelen."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"\"%s\" nem olvasható.  Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii "
-"biztonsági mentés.  Célszerű tudni, hogy az eredeti Gamecube és Wii "
-"lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "%s ISO fájl nem ismerhető fel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "%s nem menthető el"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1327,11 +1389,19 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1339,38 +1409,46 @@ msgstr ""
 "A mag nem iniciálható.\n"
 "Ellenőrizd a beállításokat."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Számláló:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Ország:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "AR kód létrehozása"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Új perspektíva készítése"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Készítő:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritikus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Levágás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1380,200 +1458,191 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Kereszthalkítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Egyedi megjelenítési hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Egyedi megjelenítési hack beállítások"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Cseh"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Digitális irányok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "Hang"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP emulátor motor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emuláció (gyors)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (lassú)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Hang (DSP) beállítások"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD gyökér könyvtár:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Végzetes hiba: kötetből kiolvasás sikertelen"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Végzetes hiba: kötetből kiolvasás sikertelen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Adatok mérete"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Dátum:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro fájlok(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Holtsáv"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Hibakereső"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Hibakeresés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimális"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ISO kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "A kiválasztott ISO fájlok kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "ISO kitömörítés"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Alap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Alapértelmezett ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Alap betűtípus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Törlés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Mentés törlése"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Törlöd a meglévő '%s' fájlt?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Leírás"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Észlelés"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"A kimeneti puffernél nagyobb adamennyiség kiolvasására történő probálkozás "
-"észlelve a DVD lemezről. Beszabályozás."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Eszköz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Eszköz beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Tárcsa"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1581,20 +1650,23 @@ msgstr ""
 "Könyvtár ellenőrző összeg hibás\n"
 " és a könyvtár biztonsági mentés ellenőrző összeg hibás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Kikapcsolás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Köd kikapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1609,255 +1681,213 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"EFB másolatok emulációjának kikapcsolása.\n"
-"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra "
-"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével "
-"nagymértékű sebesség növekedés érhető el, azonban majdnem mindig hibákat is "
-"okoz.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Lemez"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Lemez olvasási hiba"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Kijelző"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Az emulátor által beolvasott bemenetek megjelenítése.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Megosztás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Le akarod állítani az éppen működő emulációt?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II dekóder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin &weblap"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin beállítások"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin emulált Wiimote beállítások"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GCPad beállítások"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS videók (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote beállítások"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin &Google Code oldal"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem.  Fájlok tallózásához dupla "
-"kattintás ide..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"A Dolphin beállításai végett jelenleg a játékok rejtve vannak.  Dupla "
-"kattintás ide a játékok megjelenítéséhez..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "A Dolphin nem tudta elvégezni a kívánt műveletet."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Le"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Kódok letöltése (WiiRD adatbázis)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Letöltve %lu kód. (hozzáadva %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Dobok"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Utánzat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Hang mentése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "EFB cél letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Képkockák letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Textúrák letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/"
-"Frames/\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"A kikódolt játék textúrák lementése ide: User/Dump/Textures/<game_id>/\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Az EFB másolatok tartalmának mentése ide: User/Dump/Textures/\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holland"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "K&ilépés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB másolatok"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1870,56 +1900,40 @@ msgstr ""
 "valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje "
 "az új illesztőprogramot."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EURÓPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Korai memória frissítés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "ActionReplay kód szerkesztése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Beállítások szerkesztése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Patch szerkesztése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Jelenlegi perspektíva szerkesztése"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Szerkesztés..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effektus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Beágyazott képkocka puffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Az emuláció már fut"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1933,7 +1947,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1949,121 +1963,92 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulált Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Emuláció állapota:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Használat"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision "
-"technológia használatával, ha támogatja a videókártya.\n"
-"Estleg hibákat okozhat.\n"
-"Működéséhez teljes képernyő szükséges.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "AR naplózás bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Blokk csatlakozás használata"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Bounding Box kalkuláció használata"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Gyorsítótár használata"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Csalások használata"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Kétmagos mód használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Kétmagos mód használata (gyorsítás)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Tétlen állapot mellőzése"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Tétlen állapot mellőzése (gyorsítás)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "MMU használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Progresszív pásztázás használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Képernyővédő bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Hangszóró adatok bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Széleskijelző bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Vonalháló bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Bekapcsolja az anizotrópikus szűrést.\n"
-"Fokozza a ferde látószögű textúrák vizuális minőségét.\n"
-"Néhány játék esetén kisebb hibákat okozhat.\n"
-"\n"
-"Ha bizonytalan vagy, válaszd ezt: 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, "
-"KI = kompatibilis)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Oldalak bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2075,7 +2060,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2087,34 +2072,25 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Használatával The Legend of Zelda: Twilight Princess játék sebessége "
-"növekedik. A TÖBBI játéknál legyen kikapcsolva."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Egyedi megjelenítési hack használata"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Nem működik "
-"OSX alatt."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak OpenAl "
-"feldolgozó esetén."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2127,7 +2103,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2135,7 +2111,11 @@ msgstr ""
 "Bekapcsolja a memória kezelő egységet (Memory Management Unit), szükséges "
 "néhány játékhoz. (BE = kompatibilis, KI = gyors)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2145,52 +2125,63 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Vége"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Angol"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Kép javítások"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Írj be egy nevet az új perspektívának:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "%d/%d bejegyzés"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "1/%d bejegyzés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Egyenlő"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Hiba"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett "
 "visszaállítva."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2199,7 +2190,7 @@ msgstr ""
 "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölő helyett %d (0x%X). "
 "Mentés betöltésének leállítása..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2209,214 +2200,188 @@ msgstr ""
 "betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg "
 "megfelelően, vagy kifagynak."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Eufória"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Kivétel kezelő - memória terület alatti hozzáférés. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Exportálás sikertelen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Fájl exportálása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Felvétel exportálása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Felvétel exportálása..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Mentés exportálása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Wii mentés exportálása (kísérleti)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Minden mentés exportálása"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exportálás mentése másként..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Kiegészítő"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Külső képkocka puffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Extra paraméter"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Az extra paraméter csak a ''Metroid: Other M'' játékban hasznos."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Minden fájl kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Betöltő program kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOL kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Könyvtár kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Fájl kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Partíció kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Minden fájl kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Könyvtár kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Kitömörítés..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO bájt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO lejátszó"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANCIAORSZÁG"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST méret:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Csatlakozás sikertelen!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Kódok letöltése sikertelen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Kitömörítés nem sikerült ide: %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"DSP ROM betöltése sikertelen:\t%s\n"
-"\n"
-"Ez a fájl szükséges a DSP LLE használatához.\n"
-"Dolphin nem tartalmazza a fájlt, mivel az jogvédett adatokat tartalmaz.\n"
-"Használd a DSPSpy programot a fájl kinyeréséhez a saját játék konzolodból.\n"
-"\n"
-"Használhatod a DSP HLE motort, amihez nem szükséges ROM mentés.\n"
-"(Kiválaszthatod a \"Hang\" fülnél a beállítások párbeszédablakban.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "%s olvasása sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "A banner.bin beolvasása sikertelen"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"A mentett adatok %d blokkjának visszaolvasása sikertelen\n"
-"A memóriakártya sérülhetett\n"
-"FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2425,7 +2390,7 @@ msgstr ""
 "sikertelen\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2433,17 +2398,12 @@ msgstr ""
 "A blokk kiosztási tábla pontos kiolvasása sikertelen\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "%d fájlból történő adatok kiolvasása nem sikerült"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2451,7 +2411,7 @@ msgstr ""
 "A könyvtár biztonsági mentés pontos visszaolvasása nem sikerült\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2459,11 +2419,7 @@ msgstr ""
 "A könyvtár pontos kiolvasása nem sikerült\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2471,50 +2427,35 @@ msgstr ""
 "A fejléc pontos kiolvasása nem sikerült\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "A lemezképfájl egyedi azonosítójának kiolvasása sikertelen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "A BT.DINF írása a SYSCONF fájlba sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "A bkhdr írása sikertelen"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Fejléc írása sikertelen a(z) %s számára"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Gyors"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "MMU gyors verziója. Nem működik minden játéknál."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2522,23 +2463,27 @@ msgstr ""
 "Végzetes deszinkronizáció. Visszajátszás leállítása. (PlayWiimote hiba: %u !"
 "= %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo lejátszó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Fájl infó"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "A fájl nem tartalmazott kódokat."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Fájl átkonvertálva .gci formátumba"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2546,7 +2491,7 @@ msgstr ""
 "A fájl nem nyitható meg\n"
 "vagy a kiterjesztése nem megfelelő"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2555,95 +2500,93 @@ msgstr ""
 "A fájl \"%s\" kiterjesztésű\n"
 "az érvényes kiterjesztések (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "A fájl nem ismerhető fel memóriakártyaként"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "A fájl nincs tömörítve"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Következő keresése"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Előző keresése"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Első blokk"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Állandó ellenőrzőösszeg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Kényszerített 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Kényszerített 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Konzol kényszerítése NTSC-J típusra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Textúra szűrés kényszerítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan "
-"letiltotta azt.\n"
-"Némileg javítja a textúra minőséget, de képhibákat okozhat néhány játékban.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"A játék kimeneti grafikája kényszerített szélesvásznú felbontású lesz.\n"
-"Grafikai hibákat okozhat néhány játékban.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n"
-"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan "
-"bekapcsolódik ez a beállítás japán játékok használatakor."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2651,542 +2594,575 @@ msgstr ""
 "Formázás ascii kódra (NTSC\\PAL)?\n"
 "Válassz nemet sjis kódhoz (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Előre"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Találat: %d eredmény ehhez: '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
+#, c-format
+msgid "Found %u save files"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Képkocka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Képkocka"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Képkocka léptetés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Képkocka mentések FFV1 használatával"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Képkocka infó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Képkocka rendezés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Képkocka k&ihagyás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Képkocka korlát:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Rögzítendő képkockák"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Szabad nézet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francia"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Ettől:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Teljes méret"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Teljes kijelzős felbontás:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI fájl(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC irányító"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Játék azonosító:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "A játék már fut!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "A játék nem fut!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "A játék nem található!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "A játék sajátos beállításai"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Játék konfig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube állásmentés fájlok (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Gamecube &irányító beállítások"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube memóriakártyák (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube irányító beállítások"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko kódok"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n"
-"(vagy rossz a kód vagy a kód típus még nem támogatott. Próbáld a natív "
-"kódkezelőt használni úgy, hogy kicseréled a codehandler.bin fájlt a Sys "
-"könyvtárban és újraindítod a Dolphin emulátort.) "
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Általános"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Német"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: A jelzőszám nagyobb mint az ar kód lista mérete %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Nagyobb mint"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Nagymértékben javítja azon textúrák minőségét, amelyeket a textúra "
-"effektusokhoz használatos képalkotó hozott létre.\n"
-"A belső felbontás növelése javítja ennek a beállításnak a hatását.\n"
-"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár "
-"valószínűtlen).\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Görög"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zöld"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Green Left"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zöld jobbra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitár"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hackek"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "A fejléc ellenőrző összege hibás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Héber"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Magasság"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Súgó"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Szia,\n"
-"\n"
-"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 "
-"utasításkészlettel.\n"
-"Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Egérmutató elrejtése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Elrejti az egérmutatót, ha az megjelenik az emulációs ablakban.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Gyorsbillentyű beállítások"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Gyorsbill."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Magyar"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hibrid Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegyből: "
 "%08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - rossz cél"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR mutató"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR érzékenysége:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO részletek"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO könyvtárak"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "OLASZORSZÁG"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ikon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario "
-"játékok használják."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Formátum változások kihagyása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Minden EFB formátum változás figyelmen kívül hagyása.\n"
-"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha "
-"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy "
-"írási kérelmét.\n"
-"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre "
-"vonatkozó funkciót vagy grafikus effektust.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Mentés importálása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Az importált fájl gsc kiterjesztésű\n"
-"de nem rendelkezik megfelelő fejléccel"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Az importált fájl hossza érvénytelen"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Az importált fájl sav kiterjesztésű\n"
-"de nem rendelkezik megfelelő fejléccel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Elindul"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Infó"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Információk"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Bemenet"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SD kártya behelyezése"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Írj be ide nevet..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "WAD telepítése"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Telepítés a Wii menübe"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "WAD telepítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Integritás ellenőrzési hiba"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Integritás ellenőrzés befejeződött"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Integritás ellenőrzés befejeződött. Nem találhatóak hibák."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"%d partíció integritás ellenőrzése sikertelen. A mentés valószínűleg sérült "
-"vagy helytelen hibajavítás történt rajta."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Felhasználói felület"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Felület beállítások"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Belső LZO hiba - tömörítés sikertelen"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3195,106 +3171,109 @@ msgstr ""
 "Belső LZO hiba - kitömörítés sikertelen (%d) (%li, %li) \n"
 "Próbáld újratölteni a mentést"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Belső LZO hiba - lzo_init() sikertelen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Belső felbontás:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (NAGYON lassú)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intró"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Érvénytelen méret(%x) vagy mágikus szó (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Érvénytelen érték!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Érvénytelen esemény fajta %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Érvénytelen fájl"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Érvénytelen opening.bnr található a következő gcm fájlban:\n"
-"%s\n"
-" Valószínűleg újra le kell mentened a játékot."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Nem megfelelő rögzített fájl"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Érvénytelen keresési paraméterek (nincs kiválasztott elem)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 "Érvénytelen keresési karakterlánc (számra töténő átalakítása sikertelen)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 "Érvénytelen keresési karakterlánc (még csak a karakterlánc hosszúsága "
 "támogatott)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Nem megfelelő mentés"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Olasz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPÁN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT Recompiler (ajánlott)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL kísérleti recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japán"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3304,64 +3283,75 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Ablak legfelül tartása"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Bill."
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreai"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L gomb"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "Bal analóg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Nyelv:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Késleltetés:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Bal kar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Bal kattintás a gyorsbillentyű megadásához.\n"
-"Szóköz lenyomásával törlés."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3371,7 +3361,7 @@ msgstr ""
 "Középső kattintás a törléshez.\n"
 "Jobb kattintás további beállításokhoz."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3379,203 +3369,211 @@ msgstr ""
 "Bal/jobb kattintás további beállításokhoz.\n"
 "Középső kattintás a törléshez."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Kevesebb mint"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "FPS alapú korlátozás"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Betöltés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Egyedi textúrák betöltése"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Állás betöltése az 1. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Állás betöltése a 2. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Állás betöltése a 3. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Állás betöltése a 4. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Állás betöltése az 5. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Állás betöltése a 6. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Állás betöltése a 7. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Állás betöltése a 8. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Állás betöltése..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wii rendszer menü betöltése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii rendszer menü betöltése %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Egyedi textúrák betöltése innen: User/Load/Textures/<game_id>/\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Napló"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Napló beállítások"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "FPS naplózás fájlba"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Napló típus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"A másodpercenként megjelenített képkockák számát naplózza a User/Logs/fps."
-"txt fájlba. Használd ezt a tulajdonságot a Dolphin teljesítményének "
-"méréséhez.\n"
-" \n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Napló kimenetek"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Naplózás"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Kapcsolat elveszett a szerverrel!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M gomb"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 eltérés\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU sebesség növelő hack"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark fájlok (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Főkar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Gyártó azonosító:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Gyártó:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3590,29 +3588,33 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "A memóriakártyán már van mentés ehhez a játékhoz"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "A memóriakártya már meg van nyitva"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Memória bájt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Memóriakártya"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3620,7 +3622,7 @@ msgstr ""
 "Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a "
 "használata előtt, helyreállítható de a meglévő adatok sérülhetnek!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3637,37 +3639,52 @@ msgstr ""
 "%s\n"
 "Át akarod másolni a régi fájlt erre az új helyre?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Egyebek"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Egyéb beállítások"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Változó"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3679,20 +3696,24 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Azonos szélességű betűtípus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3710,678 +3731,631 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "MEGJEGYZÉS: Az adatfolyam mérete nem egyezik az aktuális adat hosszúsággal\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Cím:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Név:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Natív GCI fájlok (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Új keresés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Következő lap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Következő keresés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Becenév:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Nincs ország (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Nem találhatók sem ISO sem WAD fájlok"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nem található játék kép fájl a(z) %s játékhoz"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Nincs leírás"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Nincs dokkolás"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Nincs fájl betöltve"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Nincs üres könyvtári jelzőszám bejegyzés"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Nincs rögzített fájl"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "%s játékhoz nem található mentési mappa"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Nincs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norvég"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Nem egyenlő"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Nincs beállítva"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Nincs csatlakoztatva"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Megjegyzés"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Megjegyzések:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Kódok száma:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuk gyorsítás"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Elem"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Elem hatótáv"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Ki"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Eltolás:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Képernyőn megjelenő üzenetek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Csak %d blokk szabad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Megnyitás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "A játékot &tartalmazó mappa megnyitása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Wii &mentések mappa megnyitása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Fájl megnyitása..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: környezet létrehozása sikertelen a(z) %s eszköz számára "
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nem található hang eszköz"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: %s eszköz nem nyitható meg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL textúra dekódoló"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP textúra dekódoló"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Lehetőségek"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Narancs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Egyéb"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. "
-"Kézileg kell leállítanod a játékot."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Kimenet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "F&elvétel visszajátszása..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Irányító"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Irányító"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Irányítók"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Paraméterek"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "%i partíció"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Javítások"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Mappák"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Szünet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Szünet a videó végén"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Képpont alapú fényhatások"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Tökéletes"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "%d perspektíva"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Indítás"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Felvétel visszajátszása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Indítás/Szünet"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Játszható"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Visszajátszási lehetőségek"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Játékosok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Változtatás jóváhagyása..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Hozz először létre egy perspektívát mielőtt mentenél"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plusz - minusz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Lengyel"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "1. port"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "2. port"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "3. port"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "4. port"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugál"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugál (brazil)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Utófeldolgozási effektus:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Túl korai PlayWiimote videó befejezés. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Gombkiosztás:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Előző lap"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Előző lap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Előző érték"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Gyorsítótár ürítése"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Kérdés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Kilépés"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R gomb"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "Jobb analóg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "OROSZORSZÁG"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Hatótáv"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Írásvédett mód"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Valódi"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Valódi Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Valódi Wiimote-ok"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Rögzítés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Rögzítési infó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Rögzítési beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vörös"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vörös balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vörös jobbra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika "
-"okoz.\n"
-"Ezáltal a megjelenített kép kevésbé lesz recézett.\n"
-"Erősen csökkenti az emuláció sebességét és néha hibákat okoz.\n"
-"Ha bizonytalan vagy, válaszd ezt: Nincs. "
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "A lista frissítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Játéklista frissítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Törlés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4391,242 +4365,320 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Megjelenítés a főablakban"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Alapra állítás"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Eredmények"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Jobbra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Jobb kar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Rumble funkció"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Orosz"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Ál&lás mentése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Biztonságos"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Mentés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "GCI mentése másként..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Állás mentés az 1. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Állás mentés a 2. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Állás mentés a 3. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Állás mentés a 4. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Állás mentés az 5. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Állás mentés a 6. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Állás mentés a 7. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Állás mentés a 8. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Állás mentése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Mentés másként..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Tömörített GCM/ISO mentése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Jelenlegi perspektíva mentése"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Kitömörített GCM/ISO mentése"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "%s állásmentés videója sérült, videó rögzítése leáll..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Méretezett EFB másolat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Keresés %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "ISO fájlok keresése"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Keresés..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Pillanatkép"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Keresés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Keresési szűrő"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Keresés az almappákban"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Ennek az elemnek a keresése"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "A következő hexa érték keresése:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "%s rész nem található a SYSCONF fájlban"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Választás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Válassz rögzítendő fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Válassz telepítendő Wii WAD fájlt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Válaszd ki a használni kívánt videókártyát.\n"
-"\n"
-"Ha bizonytalan vagy, használd az elsőt."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Válassz importálandó mentési fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Válassz lebegő ablakokat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Betöltendő fájl kiválasztása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Válassz mentési fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Válassz betöltendő állásmentést"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Válassz mentendő állást"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4644,272 +4696,292 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: Automatikus."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "A megadott irányító profil nem létezik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Kiválasztott betűtípus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"A teljes kijelző estén használatos felbontást állítja be.\n"
-"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belső felbontással. "
-"Hatása a teljesítményre elhanyagolható.\n"
-"\n"
-"Ha bizonytalan vagy, használd az asztali felbontást.\n"
-"Ha továbbra is bizonytalan vagy, használd a legmagasabb működő felbontást."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"A belsőleg használni kívánt grafikai API kiválasztása.\n"
-"Direct3D 9 többnyire a leggyorsabb. OpenGL viszont pontosabb. Direct3D 11 "
-"valahol a kettő közt van.\n"
-"Érdemes tudni, hogy a Direct3D leképzők csak Windows rendszereken működnek.\n"
-"\n"
-"Ha bizonytalan vagy, legyen a Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"A belsőleg használni kívánt grafikai API kiválasztása.\n"
-"Direct3D 9 többnyire a leggyorsabb. OpenGL viszont pontosabb. Direct3D 11 "
-"valahol a kettő közt van.\n"
-"Érdemes tudni, hogy a Direct3D leképzők csak Windows rendszereken működnek.\n"
-"\n"
-"Ha bizonytalan vagy, legyen az OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Küldés"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Érzékelő helyzete:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Elválasztó"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Szerb"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Beállítás &alapértelmezett ISO fájlként"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Beállítás alapértelmezett %c. memóriakártyaként"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Késleltetés beállítása (ms). Magasabb értékek csökkenthetik a hang "
-"recsegést. Csak OpenAL feldolgozó estén."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Beállítások..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Rázás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Rövid cím:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Oldalsó gombok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Konzol &mutatása"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Napló &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Állapotsor &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Eszközsor &mutatása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Meghajtók mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "EFB másolat régiók megjelenítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "FPS kijelzése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Franciaország mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "GameCube mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Bemeneti kijelző megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Olaszország mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "JAP mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Korea mutatása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "A játék nyelve:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Napló &beállítások megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Platformok mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Régiók mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Statisztikák megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Tajvan mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "USA mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Wad mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii mutatása"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "A játék leállítása előtt megjelenik egy megerősítő ablak."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Üzenetablak jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n"
-"Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de "
-"ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Az első blokk megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Késési idő számláló megjelenítése"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Üzenetek megjelenítése az emulációs képernyőn.\n"
-"Az üzenetek tartalma memória kártya írás, kép feldolgozó és processzor "
-"információ, valamint JIT gyorsítótár ürítés lehet."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Mentendő blokkok megjelenítése"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mentendő megjegyzések megjelenítése"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Mentendő ikonok megjelenítése"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Mentendő címek megjelenítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4921,83 +4993,82 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Ismeretlen mutatása"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Különféle statisztikák megjelenítése.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Oldalt tartott Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Méret"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "BIOS kihagyása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "DCBZ törlés kihagyása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Az EFB processzor hozzáférésének átugrása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n"
-"Néha a vizuális minőséget is növeli.\n"
-"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár "
-"pontosságát vagy kapcsold ki ezt az opciót.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "%i hely"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "A hely"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "B hely"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Pillanatkép"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Szoftveres képalkotó"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5010,155 +5081,173 @@ msgstr ""
 "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, "
 "válaszd ezt: 'Nem'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Hang beállítások"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Érvénytelen %s hang feldolgozó."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Hang puffer létrehozása sikertelen: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Szóköz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Hangszóró hangerő:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás "
-"nagyban növeli a vizuális minőséget, de erősen befolyásolja a teljesítményt "
-"és képhibákat okozhat bizonyos játékoknál.\n"
-"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" "
-"viszont kevesebb hibák eredményez. Általánosságban elmondható, minél kisebb "
-"a belső felbontás, annál jobb a teljesítmény.\n"
-"\n"
-"Ha bizonytalan vagy, válaszd ezt: 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "A lemez adatátviteli arány gyorsítása"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Négyzetes kar"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Normál irányító"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Indítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "&NetPlay indítása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Felvétel in&dítása"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Felvétel indítása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Állap."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Állás mentések"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Kormánykerék"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Kar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Leállítás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n"
-"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és "
-"jelentős sebességnövekedést okoz az EFB RAM-ban történő tárolásával "
-"szemben.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Ablakhoz igazítás"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Kivonás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Fájl sikeresen exportálva a(z) %s helyre"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Mentés fájlok sikeresen importálva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Lengetés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "VGA szál szinkronizálása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5167,81 +5256,110 @@ msgstr ""
 "véletlenszerű kifagyásokat kétmagos mód esetén. (BE = Kompatibilis, KI = "
 "Gyors)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Rendszer nyelv:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAJVAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS bemenet"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tábla balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tábla jobbra"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Pillanatkép készítése"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Teszt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textúra"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Textúra gyorsítótár"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Textúra formátum átfedés"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "A WAD sikeresen telepítve"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "A cím érvénytelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Az ellenőrző összeg sikeresen javítva"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "A választott könyvtár már szerepel a listán"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5250,7 +5368,7 @@ msgstr ""
 "%s fájl már van.\n"
 "Le akarod cserélni?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5259,45 +5377,33 @@ msgstr ""
 "%s fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már "
 "másik program által."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Az általad megadott (%s) fájl nem létezik"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "A név mező nem lehet üres"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "A név nem tartalmazhatja a ',' karaktert"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Minél biztonságosabbra állítod, annál kevésbé valószínű, hogy az emulátor "
-"RAM-ból történő textúra frissítést fog hiányolni.\n"
-"\n"
-"Ha bizonytalan vagy, használd a jobbszélső értéket."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "A másolni kívánt mentés érvénytelen méretű"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5305,36 +5411,48 @@ msgstr ""
 "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a "
 "rendszer alapértelmezettre."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "A szerver és kliens NetPlay verziói nem kompatibilisek!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "A szerver megtelt!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "A szerver válasza: a játék már fut!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "A szerver ismeretlen hibaüzenetet küldött!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "A megadott \"%s\" fájl nem létezik"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Az érték érvénytelen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Kinézet:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5342,7 +5460,7 @@ msgstr ""
 "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg "
 "befejezetlen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5350,7 +5468,7 @@ msgstr ""
 "Ezek a beállítások felülírják a Dolphin mag beállításait.\n"
 "A módosítatlan opcióknál a játék a Dolphin beállításait használja."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5358,121 +5476,163 @@ msgstr ""
 "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját "
 "magát az Action Replay-t."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ez a funkció lehetővé teszi a játék kamera változtatását.\n"
-"Pásztázáshoz tartsd lenyomva a jobb egér gombot és mozgasd az egeret, a "
-"mozgáshoz pedig tartsd lenyomva a középső egér gombot.\n"
-"Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével "
-"mozgasd a kamerát léptékenként (SHIFT+0 a gyorsabb mozgatáshoz, a SHIFT+9 "
-"pedig a lassabbhoz). Nyomd le a SHIFT+R kombinációt a kamera "
-"visszaállításához.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Ez megosztja a videó és processzor folyamatágakat, így azok  külön magon "
-"futhatnak.\n"
-"Számottevő sebességnövekedés érhető el egynél több magos számítógépeken, "
-"ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Küszöbérték"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Billentés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Cím"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "eddig:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Minden napló típus kijelölése"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Váltás teljes nézetre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Fent"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Kioldó gombok"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5480,41 +5640,24 @@ msgstr ""
 "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n"
 "Nem találhatóak Wiimote bt azonosítók "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Török"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Lemezjátszó"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Típus"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "ISMERETLEN"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ISMERETLEN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5522,195 +5665,177 @@ msgstr ""
 "A megadott értékek alapján nem sikerült a patch létrehozása.\n"
 "Bejegyzés módosítás nem történt."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként "
-"történő elemzése nem lehetséges.  Győződj meg róla, hogy helyesen írtad be.\n"
-"Szeretnéd átugrani ezt a sort és folytatni az elemzést?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Meghatározatlan %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Állás betöltés törlése"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Váratlan 0x80 hivás? Megszakítás..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Ismeretlen DVD parancs: %08x - végzetes hiba"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Ismeretlen bejegyzés típus %i a SYSCONF fájlban (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d "
 "Játékos kirúgása!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Fel"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Frissítés"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Előre tartott Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "EuRGB60 mód (PAL60) használata"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Teljes nézet használata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Hexa használat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Hibakezelők használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Több folyamatág használata a textúrák dekódolásához.\n"
-"Sebesség növekedést eredményezhet (főleg a két magnál többel rendelkező "
-"processzorok esetén).\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Általában ha az árnyaló összeállítása sikertelen, megjelenik egy "
-"hibaüzenet.\n"
-"Azonban, ennek az opciónak a kijelölésével elérhető a felugró ablak "
-"kihagyása, azaz a megszakítás nélküli játékmenet.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Kellékek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Érték"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Érték:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Érték:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbosity"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Kép"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuális"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Hangerő"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD telepítési hiba: hiba a cimke létrehozásakor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5722,25 +5847,27 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Figyelem"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Figyelem - DOL indítása nem megfelelő konzol módban!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Figyelem - ELF indítása nem megfelelő konzol módban!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Figyelem - ISO indítása nem megfelelő konzol módban!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5751,7 +5878,7 @@ msgstr ""
 "%s\n"
 "Akarod folytatni?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5764,7 +5891,7 @@ msgstr ""
 "és azonos néven fog szerepelni a memóriakártyán lévőkkel\n"
 "Folytatod?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5776,7 +5903,15 @@ msgstr ""
 "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása "
 "után."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5788,7 +5923,7 @@ msgstr ""
 "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. Ellenkező "
 "esetben szinkronizációs hibák jelentkezhetnek."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5822,182 +5957,167 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fájl nincs megnyitva."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Szélesvásznú hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Szélesség"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii konzol"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND gyökér könyvtár:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii mentés fájlok (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Fájlból olvasás nem sikerült"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote csatlakoztatva"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote beállítások"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Bal Windows"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows menü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Jobb Windows"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Word Wrap"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Folyamatban..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Írás a konzolba"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Írás a hibakeresőbe"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Írás fájlba"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Írás az ablakba"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice hiba: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 iniciálási hiba: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 fő hang létrehozási hiba: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Sárga"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Egy szabadon használható, a Dolphin csapat által készített DSP ROM amit "
-"használsz.\n"
-"Minden Wii játék hibátlanul fog működni, a legtöbb GC játéknak is "
-"megfelelően kell működnie, azonban a GBA/IPL/CARD UCodes nem fog működni.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Egy régebbi szabadon használható, a Dolphin csapat által készített DSP ROM "
-"amit használsz.\n"
-"Csak a Zelda UCode-ot alkalmazó játékok fognak megfelelően működni.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Nem zárhatod be a lapokat tartalmazó táblákat."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Választanod kell egy játékot!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Meg kell adnod egy nevet!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Meg kell adnod egy érvényes profil nevet."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6007,7 +6127,7 @@ msgstr ""
 "Le kívánod állítani a probléma javítást most?\n"
 "Ha a választásod \"Nem\", akkor a hang torz lehet."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6015,36 +6135,33 @@ msgstr ""
 "A GCM/ISO érvénytelennek tűnik (érvénytelen ország).\n"
 "Folytatod a PAL régióval?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"A SYSCONF fájl mérete nem megfelelő.\n"
-"0x%04x méretűnek kellene lennie (azonban 0x%04llx méretű)\n"
-"Akarsz újat létrehozni?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 kód nem támogatott"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero ismeretlen az emulátor számára: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ várakozás ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6056,77 +6173,30 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Egyedi]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[KÍSÉRLETI]\n"
-"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai "
-"processzor számára az OpenCL keretrendszert használva.\n"
-"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. "
-"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb "
-"esetben.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[KÍSÉRLETI]\n"
-"Keveset gyorsít az emuláción a megjelenítési lista gyorsítótárazásával.\n"
-"Habár előfordulhatnak hibák is.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "betöltő program (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute visszatért -1 alkalmazás fut!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar javítás:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear javítás: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| VAGY"
diff --git a/Languages/po/it.po b/Languages/po/it.po
index e3239a16d8..c01202c352 100644
--- a/Languages/po/it.po
+++ b/Languages/po/it.po
@@ -1,17 +1,18 @@
-# Translation of dolphin-emu.pot to Italian
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Mewster <mewster@libero.it>, 2013
+# Mewster <mewster@libero.it>, 2013-2014
 # RebuMan, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 17:08+0000\n"
-"Last-Translator: Mewster <mewster@libero.it>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/it/)\n"
 "Language: it\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (troppi per la visualizzazione)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Gioco : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,44 +56,93 @@ msgstr ""
 "\"%s\" non esiste.\n"
 " Creare una nuova Memory Card da 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è un ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopia%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d stadi"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d stadi (livello di qualità %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s esiste già, vuoi sovrascrivere?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-"Fallito il tentativo di ripulire %s. È possibile che l'immagine sia corrotta."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -89,7 +151,7 @@ msgstr ""
 "Fallito il tentativo di caricare %s come memory card\n"
 "La dimensione del file non è valida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,7 +160,7 @@ msgstr ""
 "Fallito il tentativo di caricare %s come memory card\n"
 "La dimensione della card non è valida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -108,378 +170,339 @@ msgstr ""
 "Il file non è abbastanza largo per essere un valido file memory card (0x%x "
 "bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Fallito il tentativo di aprire %s"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s fallito: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "Il file %s possiede una dimensione di 0 bytes"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s è già compresso! Impossibile comprimere ulteriormente."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s è un nome troppo lungo per il file; massimo 45 caratteri"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sElimina%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEsporta GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporta GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocchi Liberi; %u Voci Directory Libere"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&A proposito di..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "Avvia da &Unità DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Punti di interruzione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Sfoglia ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Gestore &Trucchi"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Impostazioni &DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Elimina ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Elimina ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&File"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Fotogramma per Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "Impostazioni &Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Impostazioni &Tasti di Scelta Rapida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Carica Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "Gestore &Memory Card (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opzioni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Gioca"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Proprietà"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "Modalità in &Sola-lettura"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Aggiorna Elenco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Resetta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Suono"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Arresta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Visualizza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Impostazioni &Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(SCONOSCIUTO)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(nessuno)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Nativo (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Nativo (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Nativo (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Nativo (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Nativo (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Nativo (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Inserisci il nome>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Nessuna risoluzione trovata>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nulla>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Premi Tasto>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistema>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Una finestra di NetPlay risulta già aperta!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Al momento non c'è alcun gioco in esecuzione."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Non è stato trovato un dispositivo bluetooth supportato.\n"
-"Devi connettere manualmente i tuoi wiimote."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ATTENZIONE:\n"
-"\n"
-"La modalità NetPlay funzionerà solamente con le seguenti impostazioni:\n"
-" - Abilita Dual Core [SPENTO]\n"
-" - DSP Emulator Engine uguale per ogni computer!\n"
-" - DSP su Thread Dedicato [SPENTO]\n"
-" - Framelimiter NON settato su [Audio]\n"
-"\n"
-"Tutti i giocatori devono cercare di utilizzare le stesse impostazioni e "
-"versioni di Dolphin.\n"
-"Disabilitare tutte le schede di memoria oppure condividerle inviandole a "
-"tutti i giocatori prima di iniziare.\n"
-"Il supporto per il Wiimote non è stato implementato.\n"
-"\n"
-"L'host deve inoltre avere aperto/inoltrato le porte TCP scelte!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "Baseboard AM"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Codici AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "A proposito di Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Accellerazione"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Precisione:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emula accuratamente le copie dell'EFB.\n"
-"Alcuni giochi dipendono da questa opzione per particolari effetti grafici o "
-"funzionalità di gameplay.\n"
-"\n"
-"Nel dubbio, lascia EFB su Texture."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Azione"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -494,7 +517,7 @@ msgstr ""
 "Codice Incriminato:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -502,7 +525,7 @@ msgstr ""
 "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in "
 "Aggiungi Codice (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -511,7 +534,7 @@ msgstr ""
 "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) nelle "
 "istruzioni Fill e Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -520,7 +543,7 @@ msgstr ""
 "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) nelle "
 "istruzioni Ram Write e Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -529,14 +552,14 @@ msgstr ""
 "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) "
 "nell'istruzione Write To Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Errore Action Replay: Valore non valido (%08x) nell'istruzione Memory Copy "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -545,176 +568,142 @@ msgstr ""
 "Errore Action Replay: Master Code e Write To CCXXXXXX non implementati (%s)\n"
 "I Master Code non sono necessari. Non usarli."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Errore Action Replay: codice AR non valido in riga: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: Dimensioni non valide %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Normal Code Type %08x (%s) non valido"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Code %i: Sottotipo %08x (%s) non valido"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: Sottotipo %08x (%s) non valido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adattatore:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Aggiungi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Aggiungi Codice ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Aggiungi Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Aggiungi nuovo riquadro"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Indirizzo:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Somma il valore specificato al Parametro zFar.\n"
-"Due modi di esprimere i valori in virgola mobile.\n"
-"Esempio: inserendo ''200'' o direttamente ''0.0002'', il risultato non "
-"cambia, il valore acquisito sarà ''0.0002''.\n"
-"Valori: (0->+/-Intero) oppure (0->+/-Frazionaro[6 cifre di precisione dopo "
-"la virgola])\n"
-"\n"
-"NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Somma il valore specificato al Parametro zNear.\n"
-"Due modi di esprimere i valori in virgola mobile.\n"
-"Esempio: inserendo ''200'' o direttamente ''0.0002'', il risultato non "
-"cambia, il valore acquisito sarà ''0.0002''.\n"
-"Valori: (0->+/-Intero) oppure (0->+/-Frazionaro[6 cifre di precisione dopo "
-"la virgola])\n"
-"\n"
-"NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Imposta la pressione del comando analogico necessaria per attivare i "
 "pulsanti."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Impostazioni Avanzate"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Tutti i file immagine GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Tutti i file Gamecube GCM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Tutti i Salvataggi di Stati di Gioco (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Tutti i file ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Tutti i file GC/Wii ISO compressi (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Tutti i file (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analizza"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Angolo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtraggio Anisotropico:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "L'apploader possiede dimensioni errate... è davvero un apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "L'Apploader non riesce a caricare dal file"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Applica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -724,16 +713,12 @@ msgstr ""
 "\n"
 "Nel dubbio, seleziona (nessuno)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabo"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Sei sicuro di voler eliminare \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -741,55 +726,82 @@ msgstr ""
 "Sei sicuro di voler eliminare questi file?\n"
 "Andranno persi definitivamente!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (sperimentale)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Rapporto d'Aspetto:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Almeno un riquadro deve rimanere aperto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Motore Audio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Errore nell'apertura della periferica AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Multiplo di 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (Dimensione Finestra)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Autoridimensiona la Finestra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -800,134 +812,150 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "Registro BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Indietro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Impostazioni Motore"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Motore:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Input in Background"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "all'Indietro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "File Header corrotto"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Dettagli Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Leva"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Impostazioni di Base"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Impostazioni di Base"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basso"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Fallita verifica checksum della Tabella di Allocazione Blocchi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blocchi"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blu Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blu Destro"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Sotto"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controlli Associati: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Corrotto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Cerca una directory da aggiungere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Seleziona una directory per le ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Seleziona la directory di destinazione"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Pulsanti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -935,120 +963,100 @@ msgstr ""
 "Bypassa la ripulitura della cache dei dati da parte dell'istruzione DCBZ. Di "
 "solito l'opzione è disabilitata."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache della Display List"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcola l'illuminazione dei modelli 3D tramite algoritmo per-pixel anziché "
-"per-vertex.\n"
-"Diminuisce leggermente la velocità di emulazione (a seconda della tua GPU).\n"
-"È generalmente un'opzione stabile, ma a volte potrebbe causare dei "
-"problemi.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Nel dubbio, lascia deselezionato."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Impossibile trovare il WiiMote sull'handler di connessione %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Impossibile leggere da DVD_Plugin - DVD-Interface: Errore Fatale"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Annulla"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Impossibile aprire %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Impossibile annullare con eventi in sospeso"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Impossibile usare questo file come memory card.\n"
-"%s\n"
-"non è un file memory card per gamecube valido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Impossibile utilizzare il file come memory card.\n"
-"Stai tentando di utilizzare lo stesso file in entrambi gli slot di ingresso?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Bloc Maiusc"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalano"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Area Centrale"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Cambia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Cambia &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Cambia Disco"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Cambia Gioco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1056,77 +1064,63 @@ msgstr ""
 "Modifica la lingua dell'interfaccia utente.\n"
 "Richiede il riavvio."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Cambia segno al Parametro zFar (dopo la correzione)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Cambia segno al Parametro zNear (dopo la correzione)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"La modifica di quest'opzione non avrà alcun effetto finché l'emulatore è in "
-"esecuzione!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
-msgstr "Codice Trucco"
+msgstr "Codice"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
-msgstr "Cerca Trucco"
+msgstr "Cerca Codice"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Gestore Trucchi"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Verifica l'Integrità della Partizione"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Sto verificando l'integrità..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Cinese (Semplificato)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Cinese (Tradizionale)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Imposta la directory principale per i DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Imposta la directory principale della NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Scegli una ISO predefinita:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Scegli una directory da aggiungere"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Scegli un file da aprire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Scegli una memory card:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1134,27 +1128,27 @@ msgstr ""
 "Scegli il file da utilizzare come apploader: (vale solo per i dischi "
 "costituiti da directory)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Scegli la cartella in cui estrarre"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Stick Circolare"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classic Controller"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Pulisci"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1162,183 +1156,230 @@ msgstr ""
 "Client disconnesso durante l'esecuzione del gioco!! La modalità NetPlay è "
 "disabilitata. È necessario arrestare il gioco manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Chiudi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Co&nfigura..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
-msgstr "Codice Info"
+msgstr "Info Codice"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Codice: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Note"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Note:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Comprimi le ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Compressione ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configurazione"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configura"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
-msgstr "Configura Vibrazione"
+msgstr "Configura Controlli"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configura i Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configura..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Conferma la Sovrascrittura del File"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Arresto su Conferma"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Collega"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Collega Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Collega Tastiera USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Collega Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Collega Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Collega Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Collega Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Collega Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Console"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Scansione Continua"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Converti in GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Copia non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Copia nella Memory Card %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Impossibile creare %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Impossibile inizializzare il motore %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Impossibile leggere \"%s\". Nessun disco trovato nell'unità, oppure non è un "
-"backup GC/Wii. Tieni presente che la maggior parte delle unità DVD nei PC "
-"non riesce a leggere i dischi originali GameCube/Wii."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Impossibile riconoscere il file ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Impossibile salvare %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1359,11 +1400,19 @@ msgstr ""
 "Se è così, allora potresti dover reimpostare la posizione della memory card "
 "nelle opzioni."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1371,38 +1420,46 @@ msgstr ""
 "Impossibile inizializzare i componenti di base.\n"
 "Verifica la tua configurazione."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Conteggio:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Paese:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Crea Codice AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Crea nuova prospettiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Autore: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Critico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Taglia Immagine lungo i Bordi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1412,200 +1469,191 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Directory attuale cambiata da %s a %s dopo wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Projection Hack Personalizzato"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Impostazioni Personalizzate Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Personalizza alcuni parametri di Orthographic Projection"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Ceco"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulazione DSP HLE (veloce)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interprete DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Ricompilatore DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Impostazioni DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE su Thread Separato"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD Root:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Errore Fatale: fallita lettura dal volume"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Errore Fatale: fallita lettura dal volume"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Dance Mat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Dimensione Dati"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Data:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "File Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zona Morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
-msgstr "."
+msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Decomprimi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Decomprimi ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Decompressione ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Diminuisci limite Frame"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Default"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ISO Predefinita:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Font predefinito"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Elimina"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Elimina Salvataggio"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Eliminare il file esistente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Descrizione"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Rileva"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Rilevato tentativo di leggere dal DVD più dati rispetto a quanti il buffer "
-"in uscita è capace di ospitarne. Corretto."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Periferica"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Impostazioni Periferica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Manopola"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1613,20 +1661,23 @@ msgstr ""
 "Falliti i checksum della Directory\n"
 "e del backup della Directory"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Disabilita"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Disabilita Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Disabilita Nebbia"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1640,290 +1691,213 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Disabilita l'emulazione delle copie dell'EFB.\n"
-"Vengono usate spesso negli effetti di post-processing o di render-to-"
-"texture, per cui anche se la selezione di questa impostazione fornirà "
-"maggiore velocità d'emulazione, causerà quasi sempre dei problemi.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Disabilita l'emulazione di una caratteristica hardware chiamata destination "
-"alpha, usata da molti giochi per visualizzare diversi effetti grafici.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Errore Lettura Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Aspetto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Visualizza gli input percepiti dall'emulatore.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "/"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Vuoi interrompere l'emulazione in corso?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decoder Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revisione: %s\n"
-"Compilato il: %s @ %s\n"
-"\n"
-"Dolphin è un emulatore Gamecube/Wii,\n"
-"originariamente creato da F|RES ed ector.\n"
-"Oggi Dolphin è un progetto open source dai tanti\n"
-"collaboratori, troppi per essere elencati.\n"
-"Se sei interessato, vai a vedere la pagina del progetto\n"
-"su http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Ringraziamenti speciali a Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 e Hotquik per i loro\n"
-"reverse engineering e documentazioni/demo.\n"
-"\n"
-"Grandi ringraziamenti a Gilles Mouchard il cui emulatore\n"
-"Microlib PPC ha contribuito allo sviluppo iniziale.\n"
-"\n"
-"Grazie a Frank Wille per il suo disassembler PowerPC,\n"
-"che or9 e noi abbiamo modificato per includere\n"
-"le specifiche di Gekko\n"
-"\n"
-"Grazie a hcs/destop per i loro decoder GC ADPCM.\n"
-"\n"
-"Non siamo associati in alcun modo con Nintendo.\n"
-"Gamecube e Wii sono marchi di proprietà di Nintendo.\n"
-"L'emulatore esiste per scopi educativi, e non\n"
-"dovrebbe essere utilizzato per giocare a giochi\n"
-"che non possiedi legalmente."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin - Configurazione Video %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Sito &Web Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configurazione Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin - Configurazione Wiimote Emulato"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin - Configurazione Controller GC"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Filmati TAS Dolphin (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin - Configurazione Wiimote"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin in &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin non trova nessuna ISO GC/Wii. Doppioclicca qui per cercare i file..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin è attualmente impostato per nascondere tutti i giochi. Doppioclicca "
-"qui per mostrare tutti i giochi..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin è impossibilitato a completare l'azione richiesta."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Raddoppia la velocità di clock della GPU emulata. Potrebbe velocizzare "
-"alcuni giochi (ON = Velocità. OFF = Compatibilità)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Giù"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Scarica Codici (Database WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Scaricati codici %lu. (%lu aggiunti)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Percussioni/Batteria"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Fittizio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Salva l'Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Salva il Target EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Salva i Frame"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Salva le Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Salva tutti i frame renderizzati in un file AVI in User/Dump/Frames/\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Salva tutte le texture decodificate in User/Dump/Texture/<game_id>/\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Salva il contenuto delle copie dell'EFB in User/Dump/Textures/\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Olandese"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Esci"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Copie EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1936,56 +1910,40 @@ msgstr ""
 "potrebbe essere necessario un riavvio per permettere a Windows di "
 "riconoscere il nuovo driver."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Aggiornamenti Anticipati della Memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Modifica"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Modifica Codice ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Modifica Configurazione"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Modifica Sovrascritture Locali"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Modifica Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Modifica prospettiva corrente"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effetto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Thread dell'Emulatore già in esecuzione"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1999,7 +1957,7 @@ msgstr ""
 "\n"
 "Nel dubbio, seleziona invece Virtuale."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2016,122 +1974,92 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wiimote Emulato"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Stato d'Emulazione: "
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Attiva"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Abilita la visualizzazione 3D stereoscopica utilizzando la tecnologia Nvidia "
-"3D Vision se supportata dalla tua GPU.\n"
-"Potrebbe causare problemi.\n"
-"Richiede lo schermo intero per funzionare.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Abilita Logging AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Attiva Unione Blocchi"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Abilita Calcolo delle Bounding Box"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Abilita Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Abilita Trucchi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Abilita Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Abilita Dual Core (aumenta la velocità)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Abilita Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Abilita Idle Skipping (aumenta la velocità)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Abilita MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Abilita Scansione Progressiva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Abilita Screen Saver"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Abilita Dati Altoparlante"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Abilita WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Abilita Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Abilita il filtraggio anisotropico.\n"
-"Migliora la qualità visiva delle texture visualizzate ad angolazioni "
-"inclinate.\n"
-"Potrebbe causare problemi in una minoranza di titoli.\n"
-"\n"
-"Nel dubbio, seleziona 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Abilita l'accesso rapido al disco. Necessario per alcuni giochi. (ON = "
-"Velocità, OFF = Compatibilità)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Attiva pagine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2144,7 +2072,7 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2156,34 +2084,25 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Se attivato, velocizza The Legend of Zelda: Twilight Princess. Da "
-"disattivare per qualsiasi altro gioco."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Abilita Projection Hack Personalizzato"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Non "
-"disponibile su OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo "
-"con motore OpenAL."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2195,7 +2114,7 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2203,7 +2122,11 @@ msgstr ""
 "Abilita l'Unità di Gestione della Memoria (MMU), necessaria per alcuni "
 "giochi. (ON = Compatibilità, OFF = Velocità)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2213,52 +2136,63 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Inglese"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Miglioramenti"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Inserire un nome per la nuova prospettiva"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Voce %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Voce 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Uguale"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Errore"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Errore nel caricamento della lingua selezionata. Ritorno alla lingua di "
 "sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2267,7 +2201,7 @@ msgstr ""
 "Errore: Dopo \"%s\", trovato %d (0x%X) invece del save marker %d (0x%X). "
 "Interruzione del caricamento dello stato di gioco..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2276,222 +2210,191 @@ msgstr ""
 "Errore: Tentativo di accesso ai font %s, che non risultano caricati. I "
 "giochi potrebbero non mostrare correttamente i caratteri, o crashare."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Esc"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
-"Gestione eccezione - accesso al di fuori dello spazio in memoria. %08llx"
-"%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Esegui"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Esci"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Esporta tutti i Salvataggi Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Esportazione non Riuscita"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Esporta File"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Esporta Registrazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Esporta Registrazione..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Esporta Salvataggio"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Esporta salvataggio Wii (Sperimentale)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Esporta tutti i salvataggi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Esportazione non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Esporta salvataggio come..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Estensione"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Parametro Extra"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Il Parametro Extra è utile solo in ''Metroid: Other M''."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Estrai Tutti i File..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Estrai Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Estrai DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Estrai Directory..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Estrai File..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Estrai Partizione..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Estrazione %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Estrazione di Tutti i File"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Estrazione Directory"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Estrazione..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Byte FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Lettore FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANCIA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Dimensione FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Connessione non riuscita!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Download dei codici non riuscito."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Estrazione in %s non riuscita!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Impossibile caricare la ROM DSP::»%s\n"
-"\n"
-"Questo file è necessario per utilizzare DSP LLE.\n"
-"Non è distribuito insieme a Dolphin perché contiene del materiale protetto "
-"da copyright.\n"
-"Utilizza DSPSpy per estrarre il file dalla tua console.\n"
-"\n"
-"Puoi anche utilizzare il motore DSP HLE, che non richiede alcuna ROM "
-"aggiuntiva.\n"
-"(Selezionalo dalla scheda, \"Audio\" della finestra di configurazione.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Impossibile caricare bthprops.cpl! Non sarà possibile connettere veri "
-"Wiimote e Dolphin stesso potrebbe crashare!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Impossibile caricare hid.dll! Non sarà possibile connettere veri Wiimote e "
-"Dolphin stesso potrebbe crashare!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Fallita lettura di %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Accesso a banner.bin non riuscito"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Fallita lettura dell'header bk"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Fallita lettura del blocco %d dei dati di salvataggio\n"
 "La Memory Card potrebbe essere incompleta\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2499,7 +2402,7 @@ msgstr ""
 "Fallita lettura del backup della tabella di allocazione blocchi\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2507,17 +2410,12 @@ msgstr ""
 "Fallita lettura della tabella di allocazione blocchi\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Fallita la lettura del file %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Fallita lettura dei dati dal file: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2525,7 +2423,7 @@ msgstr ""
 "Accesso alla directory di backup non riuscito\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2533,11 +2431,7 @@ msgstr ""
 "Accesso alla directory non riuscito\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Fallita lettura dell'header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2545,50 +2439,35 @@ msgstr ""
 "Fallita lettura dell'header\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Fallita lettura dell'header del file %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Lettura dell'ID univoco dall'immagine del disco non riuscita"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Scrittura di BT.DINF su SYSCONF non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Scrittura bkhdr non riuscita"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Fallita scrittura di dati sul file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Fallita la scrittura dell'intestazione di %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rapida"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Calcolo Rapido di Profondità"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Versione velocizzata della MMU. Non funziona per tutti i giochi."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2596,23 +2475,27 @@ msgstr ""
 "Desincronizzazione fatale. Interruzione della riproduzione. (Errore in "
 "PlayWiimote: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Lettore Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Info File"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Il file non contiene codici."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "File convertito in .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2620,7 +2503,7 @@ msgstr ""
 "Il file non può essere aperto\n"
 "o non possiede un'estensione valida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2629,97 +2512,93 @@ msgstr ""
 "Il file possiede l'estensione \"%s\"\n"
 "le estensioni valide sono (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Il file non è riconosciuto come una memory card"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "File non compresso"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Modalità di apertura sconosciuta : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Trova successivo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Trova precedente"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Primo Blocco"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Ripara Checksum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forza 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forza 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Forza Console a NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forza Filtraggio Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Forza il filtraggio delle texture anche se il gioco lo disabilita "
-"esplicitamente.\n"
-"Migliora leggermente la qualità delle texture ma causa artefatti in alcuni "
-"giochi.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Forza il gioco a output di risoluzioni widescreen.\n"
-"Causa problemi di visualizzazione in alcuni giochi.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Forza la modalità NTSC-J per utilizzare la ROM font giapponese.\n"
-"Se deselezionato, Dolphin utilizza per default la modalità NTSC-U,  ma "
-"abilita automaticamente questa impostazione durante l'utilizzo dei giochi "
-"giapponesi."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2727,559 +2606,581 @@ msgstr ""
 "Formattare come ascii (NTSC\\PAL)?\n"
 "Scegli 'no' per sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "in Avanti"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
-msgstr "Forward port (UPnP)"
+msgstr "Inoltra porta (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Trovati %d risultati per '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Trovati %x file di salvataggio"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Fotogramma "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avanza di un Fotogramma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Dump dei Frame con FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Informazioni Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Intervallo Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Salta &Fotogrammi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Framelimiter:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Fotogrammi da Registrare:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Visuale Libera"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francese"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Tasti"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Da"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Risoluzione a Schermo Intero"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "File GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "Pad GC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID Gioco:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Il Gioco è già in esecuzione!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Il Gioco non è in esecuzione!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Gioco non trovato!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Impostazioni Specifiche del Gioco"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Configurazione di Gioco"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "File Salvataggio GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "GameCube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Impostazioni &Controlli GameCube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Impostazioni Controlli GameCube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Codici Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Fallito l'avvio del GeckoCode (CT%i CST%i) (%s)\n"
-"(o è un codice non valido o è di un tipo non ancora supportato. Prova a "
-"utilizzare il gestore codici nativo spostando il file codehandler.bin nella "
-"cartella Sys e riavviando Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Generale"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Impostazioni Generali"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Tedesco"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: Indice troppo grande rispetto alla dimensione dell'elenco dei "
 "codici AR %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Impostazioni Grafiche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Maggiore di"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Aumenta di molto la qualità delle texture generate utilizzando gli effetti "
-"di rendering in texture.\n"
-"Aumentare la risoluzione interna aumenta gli effetti di questa "
-"impostazione.\n"
-"Riduce leggermente le performance e potrebbe causare problemi (anche se poco "
-"probabile).\n"
-"\n"
-"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Greco"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Destro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Chitarra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Somma di controllo dell'intestazione non riuscita"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Ebreaico"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Altezza"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Aiuto"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Ciao,\n"
-"\n"
-"Dolphin richiede Mac OS X 10.7 o superiori.\n"
-"Sfortunatamente, stai utilizzando una versione più vecchia di OS X.\n"
-"L'ultima versione di Dolphin che supporta OS X 10.6 è Dolphin 3.5\n"
-"Per poter utilizzare le versioni di Dolphin più recenti dovresti aggiornare "
-"a 10.7.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Salve,\n"
-"\n"
-"Dolphin richiede una CPU con il supporto alle istruzioni SSE2.\n"
-"Sfortunatamente la tua CPU non le supporta, per cui Dolphin non potrà essere "
-"eseguito.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Nascondi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Nascondi il Cursore del Mouse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Nasconde il cursore se sopra la finestra d'emulazione.\n"
-"\n"
-"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Configurazione Tasti di Scelta Rapida"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Tasti di Scelta Rapida"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Ungherese"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Ibrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Tentativo di ottenere dati da un ticket sconosciuto: %08x/"
 "%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Il gioco ha tentato di ricaricare un iOS o un titolo non "
-"disponibile nel tuo dump della NAND\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Il gioco ha tentato di ricaricare un titolo non disponibile "
+"nel tuo dump della NAND\n"
+"TitleID %016<PRIx64>.\n"
 "Ora Dolphin probabilmente si bloccherà."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - Destinazione invalida"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Impostazioni IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "Puntamento IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Puntatore a infrarossi (IR)"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Sensibilità IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Dettagli ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Directory ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Icona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Se abilitato, il registro delle bounding box sarà aggiornato. Usato dai "
-"giochi della serie Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignora Cambiamenti di Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignora qualunque cambiamento al formato dell'EFB.\n"
-"Migliora le prestazioni in molti giochi senza effetti collaterali. Causa "
-"però difetti grafici in una minoranza di titoli.\n"
-"\n"
-"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignora tutte le richieste da parte della CPU di leggere da o scrivere "
-"sull'EFB.\n"
-"Migliora le prestazioni in alcuni giochi, ma potrebbe disabilitare alcune "
-"funzionalità nel gameplay o alcuni effetti grafici.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importa Salvataggio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importa Salvataggi Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Importazione non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Il file importato ha estensione .gsc\n"
-"ma non ha un'intestazione corretta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Il file importato ha dimensioni non valide"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Il file importato ha estensione .sav\n"
-"ma non ha un'intestazione corretta"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "In Game"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Aumenta limite Frame"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informazioni"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Ins"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Inserisci qui il codice Criptato o Decriptato..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Inserisci SD Card"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Inserire qui il nome..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Installa WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Installa nel Menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"Chiamata di InstallExceptionHandler avvenuta, tuttavia questa piattaforma "
-"non la supporta ancora."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Installazione WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Errore di Controllo d'Integrità"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Controllo d'integrità completato"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Controllo d'integrità completato. Non sono stati trovati errori."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Fallito il controllo d'integrità per la partizione %d. Il tuo dump è "
-"probabilmente corrotto o è stata applicata scorrettamente una patch."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Impostazioni Interfaccia"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Errore Interno LZO - compressione non riuscita"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3288,105 +3189,108 @@ msgstr ""
 "Errore Interno LZO - decompressione non riuscita (%d) (%li, %li) \n"
 "Prova a caricare di nuovo lo stato di salvataggio"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Errore Interno LZO - lzo_init() fallito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Risoluzione Interna:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interprete (MOLTO lento)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Dimensione (%x) o Magic word (%x) non valida"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Valore non Valido!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "bat.map o voce directory non valide"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo di evento %i non valido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "File non valido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Trovato nel gcm un opening.bnr non valido:\n"
-"%s\n"
-"È possibile che sia necessario il redumping del gioco."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "File di registrazione non valido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Parametri di ricerca non validi (nessun oggetto selezionato)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Stringa di ricerca non valida (impossibile convertire in numero)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 "Stringa di ricerca non valida (solo stringhe di lunghezza pari sono "
 "supportate)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Stato non valido"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "GIAPPONE"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "Ricompilatore JIT (consigliato)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Ricompilatore sperimentale JITIL"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3396,64 +3300,75 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Finestra sempre in cima"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Combinazione Tasti"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Pulsante L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analogico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Lingua:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Salvataggio in %i Posizione"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latenza:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Sinistra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Levetta Sinistra"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Click sinistro del mouse per rilevare l'identità del tasto premuto.\n"
-"Premi 'spazio' per cancellare."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3463,7 +3378,7 @@ msgstr ""
 "Click centrale del mouse per cancellare.\n"
 "Click destro del mouse per altre opzioni."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3471,202 +3386,211 @@ msgstr ""
 "Click sinistro/destro per altre opzioni.\n"
 "Click centrale del mouse per cancellare."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Minore di"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limita per FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Carica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Carica Texture Personalizzate"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Carica Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Carica Stato di Gioco in Posizione 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Carica Stato di Gioco in Posizione 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Carica Stato di Gioco in Posizione 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Carica Stato di Gioco in Posizione 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Carica Stato di Gioco in Posizione 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Carica Stato di Gioco in Posizione 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Carica Stato di Gioco in Posizione 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Carica Stato di Gioco in Posizione 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Carica Stato di Gioco da Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr "Carica Stato di Gioco nello Slot 10"
+msgstr "Carica Stato di Gioco da Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Carica Stato di Gioco da Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Carica Stato di Gioco da Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Carica Stato di Gioco da Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Carica Stato di Gioco da Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Carica Stato di Gioco da Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Carica Stato di Gioco da Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Carica Stato di Gioco da Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr "Carica Stato di Gioco nello Slot 9"
+msgstr "Carica Stato di Gioco da Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Carica Stato di Gioco..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Carica Menu di Sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carica il Menu di Sistema Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Carica le texture da User/Load/Textures/<game_id>/\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Carica valori preimpostati dai modelli hack disponibili."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configurazione Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Log FPS su file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Tipi di Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Registra il numero di frame renderizzati ogni secondo in User/Logs/fps.txt. "
-"Usa questa funzione per misurare le performance di Dolphin.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Destinazione Logger"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Registrazione Eventi"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Persa connessione al server!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Pulsante M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"L'MD5 non corrisponde\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Speed Hack MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "File Gameshark MadCatz(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Levetta Principale"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID Produttore:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Produttore:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3681,29 +3605,33 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "La Memory Card possiede già un salvataggio per questo titolo"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "La Memory Card è già aperta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Scheda di Memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3711,7 +3639,7 @@ msgstr ""
 "Gestore Schede di Memoria - AVVISO: Eseguire una copia di sicurezza prima "
 "dell'uso!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3728,39 +3656,54 @@ msgstr ""
 "%s\n"
 "Si desidera copiare il precedente file in questa nuova locazione?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "La dimensione della Memory Card non coincide con la dimensione "
 "dell'intestazione"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mic"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Varie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Impostazioni Varie"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Mezza Incl."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3772,20 +3715,24 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Carattere a spaziatura fissa"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motore"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3803,316 +3750,288 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "*"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "NOTA: La dimensione dello stream non coincide con la dimensione dei dati\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "TN +"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "TN Inizio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "TN ."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "TN Canc"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "TN /"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "TN Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "TN Fine"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "TN Invio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "TN ="
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "TN Inizio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "TN Ins"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "TN Sinistra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "TN *"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "TN Pag Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "TN Pag Su"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "TN Destra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "TN Separatore"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "TN Spazio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "TN -"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "TN Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "TN Su"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nome: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "File GCI nativi(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nuova Ricerca"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Pagina Successiva"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Ricerca Successiva"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Nickname:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Nessun Paese (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Nessun ISO o WAD trovati"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Nessun output audio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nessun file banner trovato per il titolo %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Non è disponibile una descrizione"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Nessun aggancio"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Nessun file caricato"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Nessuna voce di directory libera"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Nessun file registrato"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Nessuna cartella di salvataggio trovata per il titolo %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Nessuno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norvegese"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Diverso"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Non Impostato"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Non è un file di salvataggio Wii o fallita lettura a causa della dimensione "
-"%x dell'intestazione del file"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Non collegato"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Note"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Note: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Avviso/i"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Bloc Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Numero Di Codici:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Accelerazione Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Oggetto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Intervallo Oggetto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Off"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Mostra Messaggi su Schermo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "&Documentazione Online"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Solo %d blocchi disponibili"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Apri"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Apri &percorso file"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Apri cartella dei &salvataggi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: impossibile creare il contesto per il dispositivo %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: impossibile trovare la periferica audio"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: impossibile aprire il dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Decoder Texture OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Decoder Texture OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4120,370 +4039,347 @@ msgstr ""
 "Apre il file di configurazione (in sola lettura) predefinito per questo "
 "gioco in un editor di testo separato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Apre le sovrascritture specificate dall'utente in un editor di testo "
-"separato."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opzioni"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Arancione"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
-"L'ordine dei file nella cartella non corrisponde all'ordine dei blocchi\n"
-"Clicca il tasto destro ed esporta tutti i salvataggi,\n"
-"e importali in una nuova memory card.\n"
+"L'ordine dei file nella cartella non corrisponde all'ordine dei blocchi.\n"
+"Clicca con il tasto destro ed esporta tutti i salvataggi,\n"
+"poi importali in una nuova memory card.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Altro"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Altro client disconnesso a gioco in corso!! La modalità di Gioco-Online "
-"viene disabilitata. Arrestare manualmente il gioco."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Output"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "&Riproduci Registrazione..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Pag Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Pag Su"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parametri"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partizione %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Partizione inesistente: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Percorsi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pausa al termine del filmato"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Illuminazione Per-Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfetto"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Prospettiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Gioca"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Riproduci Registrazione"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Gioca/Pausa"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Giocabile"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Opzioni di Riproduzione"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Giocatori"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Per favore confermare..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Si prega di creare un prospettiva prima di salvare"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Più-Meno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polacco"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Porta 1:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Porta 2:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Porta 3:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Porta 4:"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Porta:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portoghese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (Brasiliano)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Effetto di Post-Processing:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Termine prematuro del filmato in PlayController.  %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Termine prematuro del filmato in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Termine prematuro del filmato in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Preimpostazioni: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Pag. Precedente"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Pagina Precedente"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Valore Precedente"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Stamp"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profilo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Proprietà"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Ripulisci Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Conferma"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Esci"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Pulsante R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analogico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Intensità"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Modalità in Sola-lettura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Reale"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Balance Board Reale"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Wiimote Reale"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Wiimote Reali"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Registra"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Registra input"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Info di Registrazione"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opzioni di Registrazione"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rosso"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rosso Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rosso Destro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Riduce l'aliasing causato dalla rasterizzazione della grafica 3D.\n"
-"Rende l'immagine renderizzata meno cubettosa.\n"
-"Riduce pesantemente la velocità d'emulazione e a volte causa problemi.\n"
-"\n"
-"Nel dubbio, seleziona Nessuno."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Aggiorna Elenco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Aggiorna l'elenco dei giochi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4493,243 +4389,320 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Renderizza nella Finestra Principale"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Resetta"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Risultati"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Invio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisione:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Destra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Levetta Destra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibrazione"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
-"Esegue DSP LLE su un thread dedicato (non consigliato: potrebbe bloccarsi)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russo"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Sal&va Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Sicura"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Salva"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Salva GCI come.."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Salva sul più vecchio Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Salva Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Salva Stato di Gioco nello Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Salva Stato di Gioco nello Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Salva Stato di Gioco nello Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Salva Stato di Gioco nello Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Salva Stato di Gioco nello Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Salva Stato di Gioco nello Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Salva Stato di Gioco nello Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Salva Stato di Gioco nello Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Salva Stato di Gioco nello Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Salva Stato di Gioco nello Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Salva Stato di Gioco..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Salva GCM/ISO compressa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Salva prospettiva corrente"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Salva GCM/ISO decompressa"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Copia EFB in scala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizzo %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Ricerca ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Ricerca..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Screenshot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Bloc Scroll"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Cerca"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Filtro di Ricerca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Cerca nelle Sottocartelle"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Cerca Oggetto corrente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Cerca Valore esadecimale"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Sezione %s non trovata in SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Seleziona"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Seleziona la Registrazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Seleziona un file WAD Wii da installare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Seleziona l'adattatore hardware da utilizzare.\n"
-"\n"
-"Nel dubbio, usa il primo."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Seleziona un file di salvataggio da importare"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Seleziona finestre libere/mobili"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Seleziona il file da caricare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Seleziona il file di salvataggio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Seleziona lo stato di gioco da caricare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Seleziona lo stato di gioco da salvare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4748,275 +4721,293 @@ msgstr ""
 "\n"
 "Nel dubbio, seleziona Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Il profilo controller selezionato non esiste"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Font selezionato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Seleziona la risoluzione da utilizzare in modalità a schermo intero.\n"
-"Dovrebbe essere sempre maggiore o uguale alla risoluzione interna. L'impatto "
-"sulle prestazioni è trascurabile.\n"
-"\n"
-"Nel dubbio, usa la stessa risoluzione del desktop.\n"
-"Se sei ancora incerto, usa la più alta risoluzione funzionante."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Scegli quale API grafica usare internamente.\n"
-"Direct3D 9 è di solito la più rapida. OpenGL è la più precisa. Direct3D 11 "
-"si posiziona tra le due.\n"
-"Tieni presente che i motori Direct3D sono disponibili soltanto su Windows.\n"
-"\n"
-"Nel dubbio, usa Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Scegli quale API grafica usare internamente.\n"
-"Direct3D 9 è di solito la più rapida. OpenGL è la più precisa. Direct3D 11 "
-"si posiziona tra le due.\n"
-"Tieni presente che i motori Direct3D sono disponibili soltanto su Windows.\n"
-"\n"
-"Nel dubbio, usa Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Invia"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Posizione della Sensor Bar: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separatore"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbo"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Porta Seriale 1 - Questa porta viene utilizzata da dispositivi come "
-"l'adattatore di rete"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Imposta come ISO &predefinita"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Imposta %c come Memory Card predefinita"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione "
 "dell'elenco dei codici AR %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Imposta la latenza (in ms). Valori maggiori possono ridurre la scattosità "
-"dell'audio. Solo con motore OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Impostazioni..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Impossibile creare file di configurazione"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Scuoti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Nome breve:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Tasti Dorsali"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Mostra &Console"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Mostra Finestra di &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Mostra Barra di &Stato"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Mostra Barra degli St&rumenti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Mostra Predefiniti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Mostra Unità a Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Mostra le Regioni di Copia dell'EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Mostra FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Mostra Francia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Mostra GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Mostra Tasti di Input"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Mostra Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Mostra JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Mostra Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Mostra Lingua:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Mostra &Configurazione Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Mostra PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Mostra Piattaforme"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Mostra Regioni"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Mostra Informazioni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Mostra Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Mostra USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Mostra Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Mostra Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostra una messaggio di conferma prima di arrestare un gioco."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Mostra un avviso quando si verifica un potenziale grave errore.\n"
-"Disabilitando questa funzione si evita la comparsa di fastidiosi messaggi "
-"non rilevanti, tuttavia potrà accadere che Dolphin improvvisamente incorra "
-"in un crash senza alcuna apparente spiegazione."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Mostra primo blocco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Mostra contatore lag"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Mostra messaggi nell'area di emulazione.\n"
-"Questi messaggi includono scritture su memory card, informazioni sui motori "
-"video e CPU, e ripulitura della cache JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Mostra blocchi salvati"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mostra commento salvato"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Mostra icona di salvataggio"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Mostra titolo del salvataggio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5028,83 +5019,82 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Mostra sconosciuto"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Mostra diverse informazioni.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Wiimote in posizione di traverso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Cinese Semplificato"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Dimensioni"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Salta BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Salta ripulitura DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Salta Accesso della CPU all'EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Velocizza leggermente le copie dell'EFB nella RAM al prezzo dell'accuratezza "
-"d'emulazione.\n"
-"Se stai riscontrando problemi, prova ad aumentare l'accuratezza della cache "
-"delle texture o a disabilitare questa opzione.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Ingresso A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Ingresso B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Stamp"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderer Software"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5116,154 +5106,173 @@ msgstr ""
 "È utile solamente ai fini di debugging.\n"
 "Vuoi davvero abilitare il rendering software? Nel dubbio, seleziona 'No'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Impostazioni Audio"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Il motore audio %s non è valido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Creazione del buffer audio non riuscita: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Spazio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volume Altoparlante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Indica la risoluzione a cui bisogna renderizzare le immagini. Un'alta "
-"risoluzione aumenterà di molto la qualità visiva ma avrà un grande impatto "
-"sulle prestazioni, e potrebbe anche causare artefatti in alcuni giochi.\n"
-"\"Multiplo di 640x528\" è leggermente più lento di \"Dimensione Finestra\" "
-"ma causa meno problemi. In generale, minore è la risoluzione interna, "
-"migliori saranno le prestazioni.\n"
-"\n"
-"Nel dubbio, seleziona 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Aumenta la velocità di trasferimento dal Disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Squadratura"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Controller Standard"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Avvia &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Avvia Re&gistrazione"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Avvia Registrazione"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Stato"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Stati di Gioco"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Levetta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Arresta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Salva le copie dell'EFB in oggetti texture della GPU.\n"
-"Non è molto preciso, ma funziona abbastanza bene nella maggior parte dei "
-"titoli, e fornisce maggiore velocità rispetto l'EFB su RAM.\n"
-"\n"
-"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Adatta a Finestra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strimpellata"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "-"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Il file è stato esportato in %s con successo"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "I file di salvataggio sono stati importati con successo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Svedese"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Ruota/Oscilla"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Sincronizza thread GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5271,81 +5280,110 @@ msgstr ""
 "Sincronizza i thread della GPU e della CPU per prevenire alcuni blocchi "
 "casuali in modalità Dual Core. (ON = Compatibilità, OFF = Velocità)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Lingua di Sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Input TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Separatore Scheda (Tab)"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Semipiano sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Semipiano destro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Cattura uno Screenshot"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongo)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Prova"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Texture"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Cache Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Overlay Formato Texture"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "Il WAD è stato installato con successo"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "L'indirizzo non è valido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Il checksum è stato corretto con successo"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "La directory scelta è già in lista"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5354,7 +5392,7 @@ msgstr ""
 "Il file %s esiste già.\n"
 "Vuoi sostituirlo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5363,45 +5401,33 @@ msgstr ""
 "Impossibile aprire il file %s in scrittura. Verificare che non sia già "
 "aperto in un altro programma."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Il file %s è già stato aperto, l'intestazione non verrà scritta."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Il file specificato (%s) non esiste"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "il nome non può essere vuoto"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Il nome non può contenere il carattere ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Il codice AR decriptato risultante non contiene alcuna riga."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Più questo settaggio è settato verso \"Sicura\", meno saranno le probabilità "
-"che l'emulatore salti l'aggiornamento di una texture dalla RAM"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"Il file di salvataggio che si sta provando a copiare ha una dimensione non "
-"valida"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5409,36 +5435,48 @@ msgstr ""
 "La lingua selezionata non è supportata dal tuo sistema. Ritorno alla "
 "predefinita di sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Le versioni di NetPlay del server e del client non sono compatibili!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Il server è pieno!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
-msgstr "Il server ha risposto: il gioco è correntemente in esecuzione!"
+msgstr "Il server ha risposto: il gioco è attualmente in esecuzione!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
-msgstr "Il server invia un messaggio d'errore sconosciuto!"
+msgstr "Il server ha inviato un messaggio d'errore sconosciuto!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "il file specificato \"%s\" non esiste"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Il valore non è valido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5446,7 +5484,7 @@ msgstr ""
 "Deve esistere un ticket per 00000001/00000002. Il dump della tua NAND è "
 "probabilmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5454,134 +5492,170 @@ msgstr ""
 "Queste impostazioni possono sovrascrivere quelle settate in Dolphin. \n"
 "L'opzione 'indeterminato' utilizzerà le impostazioni di Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 "Questo simulatore di action replay non supporta codici automodificanti."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni "
-"giochi."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Questa impostazione ti permette di muovere la telecamera di gioco.\n"
-"Muovi il mouse tenendo premuto il tasto destro per ruotarla e tenendo "
-"premuto il tasto centrale del mouse per spostarla.\n"
-"Tieni premuto SHIFT e premi W, A, S o D per muovere la telecamera di una "
-"distanza fissa (SHIFT+0 muove la telecamera più velocemente e SHIFT+9 più "
-"lentamente). Premi SHIFT+R per resettare la telecamera.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Limita la velocità del gioco a uno specifico numero di frame ogni secondo "
-"(il massimo della velocità è 60 per lo standard NTSC e 50 per PAL). In "
-"alternativa, usa Audio per velocizzare in accordo con il DSP (potrebbe "
-"correggere l'audio a scatti ma potrebbe causare un rumore costante a seconda "
-"del gioco)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Consente di avviare su thread diversi i calcoli dedicati all'output video e "
-"quelli dedicati alla CPU per poterli eseguire su core distinti.\n"
-"Migliora la velocità sui PC multiprocessore, ma può anche ma può anche "
-"provocare occasionali crash o malfunzionamenti."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Permette di modificare manualmente il file di configurazione INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Sensibilità"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Inclina"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Titolo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "a"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Seleziona/Deseleziona tutti i Tipi di Log"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Imposta Aspetto"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Imposta Copie EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Imposta Nebbia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Visualizza a Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Imposta IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Sopra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Cinese Tradizionale"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Tentativo di caricamento di un tipo di file sconosciuto."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Grilletti"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
-msgid "Trying to read from invalid SYSCONF"
-msgstr "Tentativo di accesso da una SYSCONF non valida"
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
+msgid "Trying to read from invalid SYSCONF"
+msgstr "Tentativo di lettura da una SYSCONF non valida"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5589,41 +5663,24 @@ msgstr ""
 "Tentativo di lettura da una SYSCONF non valida\n"
 "Gli identificativi Wiimote bt non sono disponibili"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turco"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Mixer"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tipo"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Porta UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "Wiimote UDP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "SCONOSCIUTO"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5631,205 +5688,180 @@ msgstr ""
 "Impossibile creare la patch a partire dai valori forniti.\n"
 "Voce non modificata."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 "Impossibile analizzare come un codice criptato o decriptato valido la riga "
-"%lu del codice AR inserito. Assicurati di averlo inserito correttamente.\n"
+"%u del codice AR inserito. Assicurati di averlo inserito correttamente.\n"
 "Vuoi ignorare questa riga e continuare l'analisi?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "%i non definito"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Annulla Caricamento Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Annulla Salvataggio dello Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Chiamata 0x80 inaspettata? Interruzione..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando DVD %08x sconosciuto - errore fatale"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Comando 0x%08x sconosciuto"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
-msgstr "Voce %i sconosciuta in SYSCONF (%s@%x)!"
+msgstr "Voce sconosciuta di tipo %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
-msgstr "Messaggio ricevuto sconosciuto avente id : %d"
+msgstr "Ricevuto messaggio sconosciuto con id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
-"Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
-"espluso!!"
+"Ricevuto messaggio sconosciuto con id:%d ricevuto dal giocatore:%d Giocatore "
+"espulso!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Su"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Aggiorna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote in posizione verticale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Utilizza Modalità EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Usa Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Usa Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Avvisi di Errore"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Utilizza un algoritmo meno preciso per calcolare i valori di profondità.\n"
-"Causa problemi in alcuni giochi ma potrebbe fornire un buon aumento di "
-"velocità.\n"
-"\n"
-"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Utilizza più thread per decodificare le texture.\n"
-"Potrebbe fornire un incremento nella velocità d'emulazione (soprattutto "
-"nelle CPU con più di due core).\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Utilizza operazioni instabili per velocizzare il vertex streaming in OpenGL. "
-"Non ci sono problemi conosciuti sulle GPU supportate, ma nelle altre causerà "
-"seri problemi grafici e di stabilità.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Di solito viene visualizzato un messaggio di errore in caso di fallimento di "
-"compilazione di uno shader.\n"
-"Comunque, selezionando questa opzione si può decidere di nascondere i popup "
-"per giocare senza interruzioni.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilità"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Speed Hack VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valore"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valore:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valore: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verboso"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Vertex Streaming Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Installazione WAD non riuscita: errore nella creazione di %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
-msgstr "Fallita installazione del WAD: errore durante la creazione del ticket"
+msgstr "installazione WAD non riuscita: errore nella creazione del ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5841,25 +5873,27 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Attenzione"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Attenzione - avvio DOL in modalità console errata!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Attenzione - avvio ELF in modalità console errata!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Attenzione - avvio ISO in modalità console errata!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5871,7 +5905,7 @@ msgstr ""
 "%s\n"
 "Vuoi proseguire?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5885,7 +5919,7 @@ msgstr ""
 "dal nome uguale a quello dei file sulla tua memory card\n"
 "Continuare?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5897,7 +5931,15 @@ msgstr ""
 "salvataggio prima di continuare, o caricare questo stesso stato con modalità "
 "sola-lettura off."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5909,7 +5951,7 @@ msgstr ""
 "caricare questo stato in modalità sola-lettura off. Altrimenti probabilmente "
 "riscontrerai una desincronizzazione."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5930,192 +5972,178 @@ msgstr ""
 "Attenzione: hai caricato un salvataggio il cui filmato discorda al frame %d. "
 "Dovresti caricare un altro salvataggio prima di continuare, o caricare "
 "questo stato in modalità sola-lettura off. Altrimenti riscontrerai "
-"probabilmente una descincronizzazione.\n"
+"probabilmente una desincronizzazione.\n"
 "\n"
-"Maggiori informazioni: Il filmato attuale è lungo %d frames e il filmato "
-"dello stato di gioco è lungo %d frames.\n"
+"Maggiori informazioni: Il filmato attuale è lungo %d frame e il filmato "
+"dello stato di gioco è lungo %d frame.\n"
 "\n"
-"Al frame %d, il filmato attuale preme: Start=%d, A=%d, B=%d, X=%d, Y=%d, Z="
-"%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX="
-"%d, AnalogY=%d, CX=%d, CY=%d⏎\n"
-"⏎\n"
-"Al frame %d, il filmato del salvataggio dello stato di gioco preme:⏎\n"
+"Al frame %d, il filmato attuale preme:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
+"\n"
+"Al frame %d, il filmato del salvataggio dello stato di gioco preme:\n"
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
-msgstr "WaweFileWriter - file non aperto."
+msgstr "WaveFileWriter - file non aperto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Tremolo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Hack Widescreen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Larghezza"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Console Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Root NAND Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "File di Salvataggio Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Impossibile leggere dal file"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Collegato"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Vibrazione Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Impostazioni Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Sinistro"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Menù Windows"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Destro"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Adatta Testo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Attività in corso..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Scrivi Memory Card (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Scrivi nella Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Scrivi sul Debugger"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Scrivi su File"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Scrivi in Finestra"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "CreateSourceVoice XAudio2 non riuscita: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Inizializzazione XAudio2 non riuscita: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Creazione master voice XAudio2 non riuscita: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Giallo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Stai utilizzando una ROM DSP gratuita creata dal Dolphin Team.\n"
-"Tutti i giochi Wii e la maggior parte dei giochi GC funzioneranno "
-"correttamente, ma gli UCodes GBA/IPL/CARD invece no.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Stai utilizzando una vecchia ROM DSP gratuita creata dal Dolphin Team.\n"
-"Soltanto i giochi che utilizzano lo Zelda Ucode funzioneranno "
-"correttamente.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Non è possibile chiudere riquadri che hanno pagine al loro interno"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "È necessario selezionare un gioco!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Devi inserire un nome!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "È necessario inserire un valore decimale, esadecimale o ottale."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Devi inserire un nome valido per il profilo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "È necessario riavviare Dolphin affinché le modifiche abbiano effetto."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6125,7 +6153,7 @@ msgstr ""
 "Vuoi interrompere ora l'emulazione per correggere il problema?\n"
 "Se scegli \"No\", l'audio potrebbe essere disturbato."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6133,36 +6161,36 @@ msgstr ""
 "Il file GCM/ISO sembra non valido (paese non valido).\n"
 "Procedere con la zona PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Il tuo file SYSCONF possiede dimensioni errate.\n"
-"Dovrebbe essere 0x%04x (invece di 0x%04llx)\n"
+"Dovrebbe essere 0x%04x (invece di 0x%04<PRIx64>)\n"
 "Desideri generarne uno nuovo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Hack ZTP"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 codice non supportato"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero codice sconosciuto per dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ in attesa ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6174,77 +6202,30 @@ msgstr ""
 "\n"
 "Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Personalizzata]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[SPERIMENTALE]\n"
-"Punta a velocizzare l'emulazione relegando il compito di decoding delle "
-"texture alla GPU utilizzando il framework OpenCL.\n"
-"Comunque, al momento è causa di difetti noti alle texture in diversi giochi. "
-"Inoltre è più lento nella maggior parte dei casi rispetto alla decodifica "
-"delle texture effettuata dalla CPU.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[SPERIMENTALE]\n"
-"Velocizza leggermente l'emulazione salvando in cache la display list.\n"
-"Potrebbe causare dei problemi.\n"
-"\n"
-"Nel dubbio, lascia deselezionato."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Lettura Opcode da %x. Si prega di segnalarlo."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "caratteristica sconosciuta %d (ci si aspettava %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "messaggio sconosciuto ricevuto"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute ritorna -1 all'avvio dell'applicazione!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correzione zFar: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correzione zNear: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OR"
diff --git a/Languages/po/ja.po b/Languages/po/ja.po
index 17f4bdfe3e..445e0c8d19 100644
--- a/Languages/po/ja.po
+++ b/Languages/po/ja.po
@@ -1,17 +1,21 @@
-# Translation of dolphin-emu.pot to Japanese
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # Danbsky, 2011
-# DanbSky <smariojp@gmail.com>, 2013
+# Katabi Oka, 2015
+# Lioncash <mathew1800@gmail.com>, 2014
+# Lioncash <mathew1800@gmail.com>, 2014
+# DanbSky <smariojp@gmail.com>, 2013-2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-20 13:38+0000\n"
-"Last-Translator: DanbSky <smariojp@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -20,21 +24,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(該当数が多すぎます)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "タイトル："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! (...で無い)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,43 +63,93 @@ msgstr ""
 "メモリーカードファイル \"%s\" は存在しません。\n"
 " 容量16MBで新たに作成しますか ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "\"%s\" のスクラビングに失敗しました。おそらく壊れています。"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" は圧縮済みです！これ以上圧縮することはできません。"
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" は無効なファイル、またはゲームキューブ／Wii のISOではありません"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s コピー %1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d x"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d x (品質 %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (ディスク %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s はすでに存在します。上書きしますか？"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s のスクラビングに失敗しました。おそらく壊れています。"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +158,7 @@ msgstr ""
 "%s メモリーカードの読み込みに失敗\n"
 " 不正なカードファイルサイズです (0x%x バイト)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -97,7 +167,7 @@ msgstr ""
 "%s メモリーカードの読み込みに失敗\n"
 " 不正なカード容量です (0x%x バイト)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -107,376 +177,356 @@ msgstr ""
 "このファイルのサイズは小さすぎます。正しいファイルではありません (0x%x バイ"
 "ト)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s を開くのに失敗"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s failed: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s は0バイトのファイルです"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s は圧縮済みです！これ以上圧縮することはできません。"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s はファイル名が長すぎます、45文字までに収めてください"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s 削除 %s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s エクスポート GCI %s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s インポート GCI %s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u ブロック空き | %u エントリ空き"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& (...と...)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "Dolphinについて(&A)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "サウンド設定(&A)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
 msgstr "DVDドライブから起動(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "ブレークポイント(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "ISOファイルのあるフォルダを選択(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "チートコード編集ツール(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr "チートマネージャ(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "サウンド設定(&D)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "コントローラ設定(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "このタイトルの実体を削除(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "選択したタイトルの実体を全て削除(&D)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "エミュレーション(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "Frame Advance(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "全画面表示(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr "GitHub リポジトリ(&G)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "グラフィック設定(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "ホットキーのカスタマイズ(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "ステートロード(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "GCメモリーカードマネージャ(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
-msgstr "&Memory"
+msgstr "メモリ(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "記録(&M)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "開く(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "設定(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "一時停止(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "開始(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "プロパティ(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "読み込み専用 (&R)"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr "読み込み専用(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "ゲームリストを再更新(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "レジスタ(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "リセット(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "サウンド(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "ツール(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "描画(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "表示(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Wii入力設定(&W)"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "公式ウェブサイト(&W)"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "公式Wiki(英語)で動作状況を確認(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "補正有効"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "補正有効"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(不明)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "オフ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ (...に加えて)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Native (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
 msgstr "16 ビット"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Native (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Native (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Native (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr "32 ビット"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Native (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Native (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
 msgstr "8 ビット"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "コード名を入力してください"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
-msgstr "<対応できる解像度が見つかりません>"
+msgstr "＜対応できる解像度が見つかりません＞"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "なし"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "入力を待機..."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr "＜システムの言語＞"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "ネットプレイウィンドウは既に開かれています！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "ネットプレイウィンドウはすでに開かれています！"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "ゲームは現在、起動されていません"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 "サポートしているBluetoothデバイスが見つかりませんでした。\n"
 "手動でWii リモコンを接続する必要があります。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 "～ネットプレイに関しての注意事項～\n"
 "\n"
 "現在ネットプレイは以下の設定でしかうまく動作しません。\n"
-" - デュアルコア動作を行う 【無効】\n"
-" - DSPエミュレータ方式は全てのプレイヤーで統一しておく\n"
-" - DSP on Dedicated Thread【無効】\n"
-" - フレームリミットは「サウンド」”以外”に設定すること\n"
+" - DSPエミュレータ方式は全てのプレイヤーで統一する\n"
+" - 『DSP on Dedicated Thread』は無効に設定\n"
+" - Wii リモコンの拡張コントローラは各自で設定しておく\n"
 "\n"
 "全てのプレーヤーはDolphinのバージョンを同一に揃え、設定も統一すること。\n"
-"メモリーカードは無効にしておくか、参加するプレーヤーに同一のものを前もって配"
-"布しておく。\n"
-"Wii リモコンの入力サポートは実装されていません。\n"
+"メモリーカードは参加するプレーヤーに同一のものを前もって配布しておくか、無効"
+"にする。\n"
+"Wii リモコンの入力サポートはまだ実験的な状態です。使用は推奨されません。\n"
 "\n"
-"ホスト側は、TCPポートの開放を忘れずに！\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "Triforce基板"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "アクションリプレイコード"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Dolphinについて"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "加速度"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "精度："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"より正確なEFBコピーエミュレーションを行います。\n"
-"いくつかのゲームの画面効果やゲームプレイ性はこの機能に依っています。\n"
-"\n"
-"よく分からなければ、【Texture】を選択したままにしてください。"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "動作"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -491,14 +541,14 @@ msgstr ""
 "問題のあるコード：\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Add Code (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -507,7 +557,7 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -516,7 +566,7 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -525,12 +575,12 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay エラー: 不正な値 (%08x) in Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -540,171 +590,141 @@ msgstr ""
 "(%s)\n"
 "マスターコードは必要ありません。使用しないでください。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "エラー: 無効なコード ライン： %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: 条件付きコード: 不正なサイズ %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: 不正な種類の通常コード %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: 通常コード %i: 不正なサブタイプ %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: 通常コード 0: 不正なサブタイプ %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "タップが接続されています"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "タップは未接続です"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "ビデオカード："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "追加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "コードを追加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "パッチを追加"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Add new pane"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "追加"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "接続先："
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"zFarパラメータに指定した値を追加します\n"
-"浮動小数点数値の入力には2通りの表現が可能で、\n"
-"例えば''200''と''0.0002''は同じ値として解釈されます\n"
-"有効値： (0->+/-Integer) もしくは (0->+/-FP[6 digits of precision])\n"
-"\n"
-"補足：取得値はログウィンドウ／コンソールで確認します"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"zNearパラメータに指定した値を追加します\n"
-"浮動小数点数値の入力には2通りの表現が可能で、\n"
-"例えば''200''と''0.0002''は同じ値として解釈されます\n"
-"有効値： (0->+/-Integer) もしくは (0->+/-FP[6 digits of precision])\n"
-"\n"
-"補足：取得値はログウィンドウ／コンソールで確認します"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "ボタンが反応する感度を調整します"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "高度な設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "高度な設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "全ての GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "全ての GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "ゲームキューブ GCMファイル (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "GC GCMファイル (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "全てのステートセーブファイル (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Wii ISOファイル (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "圧縮されたGC/Wii ISOファイル (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "全てのファイル (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "分析"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "角度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "異方性フィルタリング："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "アンチエイリアス："
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Apploaderの日付"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Apploader のサイズが間違っています。このファイルは本当にApploaderですか？"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader ファイルから読み込むことができません"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
-msgstr "Apploader"
+msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "適用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -714,16 +734,12 @@ msgstr ""
 "\n"
 "よく分からなければ、【オフ】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "アラビア語"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" このプロファイルを削除しますか？"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -731,54 +747,81 @@ msgstr ""
 "これら複数のタイトルの実体ファイルを削除しますか？\n"
 "元に戻すことはできません！"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr "両方のスロットで同じファイルを使用しようとしていませんか？"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (実験的)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64 JIT (実験的)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "アスペクト比："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "At least one pane must remain open."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "サウンド"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "出力API (Audio Backend)"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "サウンド設定"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Error opening AO device.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "オーストラリア"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "開発チーム"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "自動"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "自動 (ゲーム解像度の倍数)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "自動 (ウィンドウサイズに拡大)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "ウィンドウサイズを自動調整"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -788,134 +831,150 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP register "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Back"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "出力設定"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "描画API："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "バックグラウンド入力を許可"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "後方"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "ファイルヘッダの不良"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "バランスWii ボード"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "バナー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "バナーの詳細"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "バナー表示"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "バー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "基本設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "バスドラ"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "バッテリ残量"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table checksum failed"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "ブロック数"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "青"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "青 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "青 - 右"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr "Borderless Fullscreen"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "下部"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "コマンド数: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Branch: %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "ダメダメ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "選択"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "ゲームリストに追加するフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "ISOのあるフォルダをブラウズ"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "出力先を選択"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "バッファ："
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "ボタン"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr "Bypass XFB"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -924,118 +983,113 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C-スティック"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-スティック"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr "CP register "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPUエミュレーション方式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "CPU設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"ピクセル単位での光源処理を行います。\n"
-"GPUの性能にもよりますが、数パーセント程度、動作速度が低下します。\n"
-"このオプションは通常安全ですが、時に描画バグを引き起こすことも あります。\n"
+"起動時にカスタムテクスチャをシステムメモリにキャッシュします\n"
+"大量にメモリを消費する代わりに、ロード時の引っかかりが軽減されます\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"3Dオブジェクトに対し、ピクセル単位での光源処理を行います。\n"
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"このオプションはまれに描画バグや速度低下を引き起こします。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "Can't find Wiimote by connection handle %02x"
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "%s を開くことができません"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Cannot unregister events with events pending"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 "そのファイルはメモリーカードデータとして使用できません\n"
 "%s\n"
 "これは不正なメモリーカードデータです"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"そのファイルはメモリーカードデータとして使用できません。\n"
-"両方のスロットで同じファイルを使用しようとしていませんか？"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "カタルーニャ語"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Center"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "変更"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "ディスクの入れ替え(&D)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "ディスクの入れ替え(&D)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "ディスクの入れ替え"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "ゲームを変更"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1043,75 +1097,63 @@ msgstr ""
 "Dolphin本体の表示言語を変更します\n"
 "変更のために再起動が必要です"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr "この設定は次回のゲーム開始時に反映されます！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "チャット欄"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "チートコード"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "チートマネージャ"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "コードサーチ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "チートコード編集ツール"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "パーティションの整合性をチェック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "最新版の入手先："
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "チェックしています..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "簡体字中国語"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "繁体字中国語"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "DVDルートフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "NANDのあるルートフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "ディスクチャンネルに表示するタイトルを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "追加したいフォルダを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "メモリーカードを選択"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "メモリーカードを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1119,27 +1161,27 @@ msgstr ""
 "apploaderとして使用するファイルを選択：(フォルダからのみ構築されたディスクに"
 "適用されます)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "保存先のフォルダを選択してください"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "丸み"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "クラシックコントローラ"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "全消去"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1147,183 +1189,233 @@ msgstr ""
 "クライアントとの接続が切断されました！ネットプレイは現在無効です。ゲームを停"
 "止してください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "閉じる"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Dolphin本体の設定(&N)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "コードの情報"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "コード："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Command"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "コメント"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "ゲーム紹介"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr "Compiled: %s @ %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "このタイトルを圧縮"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "選択したISOファイルを全て圧縮"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "圧縮しています..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr "計算"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr "MD5チェックサムを計算中..."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "本体設定"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "コントロールの設定"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "パッド設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Dolphin本体の設定を行います"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "ファイルの上書きを確認"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "動作停止時に確認"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "接続"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "バランスWii ボードを接続"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "USBキーボードの接続をエミュレート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "%iPのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "1PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "2PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "3PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "4PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Wii リモコンを接続"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "コンソール"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "接続状態を継続して監視する"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "コントローラ設定"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "コントローラ"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "GCIファイルに変換"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "コピー"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "コピーに失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "メモリーカード%cにコピー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "コア"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "%s を作成することができませんでした"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Could not initialize backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 "\"%s\" を読み込めませんでした。ディスクが入っていないか、GC/Wii のバックアッ"
 "プディスクではありません。オリジナルのGC/Wii のディスクはほとんどのPC用DVDド"
 "ライブでは読み込めない点に留意してください"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "ISOファイル %s を認識できませんでした"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
+msgid "Could not save %s."
 msgstr "%s をセーブできませんでした"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1343,11 +1435,19 @@ msgstr ""
 "メモリーカードファイルをデフォルトの場所から移動した場合は、本体設定よりその"
 "場所を再指定してください"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "拡張子'ini'に対して関連付けられているプログラムが見つかりません！"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1355,38 +1455,46 @@ msgstr ""
 "コアを初期化できませんでした。\n"
 "設定を確認してください。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "該当："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "該当：%lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "発売国"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "アクションリプレイコードを作成"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Create new perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "制作者： "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "致命的なエラー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "クロッピング"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1397,200 +1505,191 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "クロスフェーダー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Current directory changed from %s to %s after wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Custom Projection Hackの設定"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "設定画面に入ります"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "チェコ語"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "十字キー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "サウンド"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSPエミュレーション方式"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "DSP-HLE エミュレーション (高速)"
+msgstr "DSP HLE emulation (高速)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
-msgstr "DSP-LLE インタプリタ (低速)"
+msgstr "DSP LLE interpreter (低速)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
-msgstr "DSP-LLE リコンパイラ"
+msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "サウンドに関する設定を行います"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE on Separate Thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVDルート"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Fatal Error: failed to read from volume"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "マットコントローラ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "データサイズ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "発売日"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "'遊び'の調整"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "デバッグ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr "デバッグ用"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "デバッグ用項目"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ISOファイルへ復元"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "選択したファイルを全てISOファイルへ復元"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "復元中..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-msgid "Decrease Frame limit"
-msgstr "フレームリミットを下げる"
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
+msgid "Decrease Frame limit"
+msgstr "フレームリミット "
+
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "内部解像度 縮小"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "既定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "デフォルトISO"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "既定のフォント"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "削除"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "このセーブデータを削除"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "既存ファイル '%s' を削除しますか？"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "説明"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "説明"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "検出"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
-msgstr ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
+msgstr "Deterministic dual core: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "デバイス"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "デバイス設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "デバイスが見つかりません"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "ダイアル"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1598,20 +1697,23 @@ msgstr ""
 "ディレクトリのチェックサムに失敗\n"
 "ディレクトリバックアップのチェックサムにも失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "無効化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "Disable Bounding Box"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Disable Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Disable Fog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1625,25 +1727,25 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"一切のEFBコピーエミュレーションを行わないようにします。\n"
-"これは後処理やテクスチャエフェクトとして頻繁に使用されるもので、 無効にすると"
-"大きな動作速度の向上が見込めますが、ほぼ確実に 描画バグが発生するでしょう。\n"
+"bounding box エミュレーションを無効化します。\n"
+"GPUの動作が向上しますが、いくつかのゲームで不具合が発生します。\n"
 "\n"
-"よく分からなければ、チェックを入れないでください。"
+"よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -1652,231 +1754,179 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "ディスク"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "ディスク読み取りエラー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "表示設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"エミュレータが読み取った入力を画面に表示します。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
+"エミュレーションウインドウ上にメッセージを表示します。\n"
+"メモリーカードへのアクセス、起動時のシステム情報、 JIT cacheの消去などが含ま"
+"れます。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "動作中のゲームを停止しますか？"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II decoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s グラフィック設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin Webサイト(&W)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphinの設定"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
-msgid "Dolphin Emulated Wiimote Configuration"
-msgstr "Wii リモコンのエミュレーション設定"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr "Dolphin コントローラ設定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
+msgid "Dolphin Emulated Wiimote Configuration"
+msgstr "Wiiリモコンのエミュレーション設定"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "GCコントローラ設定"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr "Dolphin ホットキー設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr "Dolphin ネットプレイ"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr "Dolphin ネットプレイの準備"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS ムービー (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Wiiリモコンの設定"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin 開発状況(&G)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"ゲームリストは空です。この文章をダブルクリックして GC/Wii のISO または WBFS "
-"もしくは WADファイルのあるフォルダを選択してください。"
+"ゲームリストは空です。この文章をダブルクリックして GC/Wii の ディスクイメー"
+"ジ もしくは WAD ファイルのあるフォルダを選択してください。"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"リスト中の全てのゲームが設定により表示されていません。この文章をダブルクリッ"
-"クすると表示されるようになります"
+"リスト中の全てのゲームが設定により非表示になっています。この文章をダブルク"
+"リックすると表示されるようになります"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "要求された操作を完了することができませんでした。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"GPUのクロックレートを2倍にして動作させます。いくつかのタイトルで速度の向上が"
-"狙えます。[有効＝動作速度向上／無効＝互換性重視]"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Webからコードを入手 (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu個のコードが見つかりました。( 新規追加： %lu個 )"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr "Drawn Object Range"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "ドラムコントローラ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "ダミーデバイス"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "サウンドのダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "EFBターゲットをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "フレームをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr "Dump Objects"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr "Dump TEV Stages"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr "Dump Texture Fetches"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "テクスチャをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"User/Dump/Frames/ フォルダにレンダリングしたフレーム全てをダンプし、AVIとして"
-"保存します。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
-msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -1884,9 +1934,9 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -1894,21 +1944,17 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "終了"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Copies"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1920,56 +1966,40 @@ msgstr ""
 "Dolphinのバージョンを更新した場合は、ドライバを認識させるためにWindowsの再起"
 "動が必要になるかもしれません。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "欧州"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Early Memory Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "編集"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "コードを編集"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "iniを編集"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "パッチを編集"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Edit current perspective"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "編集"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "エフェクト"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr "Embedded Frame Buffer (内蔵フレームバッファ)"
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "エミュレーションスレッドはすでに稼働中です"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1983,7 +2013,7 @@ msgstr ""
 "\n"
 "よく分からなければ、【Virtual】を選択したままにしておいてください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2000,121 +2030,103 @@ msgstr ""
 "\n"
 "よく分からなければ、こちらを選択しておいてください。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wii リモコンをエミュレート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "動作状況："
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "有効"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"立体視表示を有効にします。使用するにはGPUによる Nvidia 3D Vision のサポートが"
-"必要です。\n"
-"ほとんどの場合何かしらの問題が発生するでしょう。\n"
-"この機能は全画面表示時のみ動作します。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "アクションリプレイコードのログを取得する"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Enable Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr "CPU Clock Override を使用する"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Enable Bounding Box Calculation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Enable Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "チートコードを有効化"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
-msgstr "Enable Dual Core"
+msgstr "デュアルコアで動作させる"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "デュアルコア動作を行う (速度向上)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
-msgid "Enable Idle Skipping"
-msgstr "Enable Idle Skipping"
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "Enable FPRF"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
+msgid "Enable Idle Skipping"
+msgstr "アイドルスキップを有効化"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "アイドルスキップ処理を行う (速度向上)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Enable MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "プログレッシブ表示を有効化"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "スクリーンセーバーを有効化"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "スピーカー出力の有効化"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
-msgstr "Enable WideScreen"
+msgstr "ワイドスクリーンを有効化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
-msgstr "ワイヤーフレーム有効化"
+msgstr "ワイヤーフレームを有効化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 "異方性フィルタリングを適用します。\n"
 "奥行きのあるテクスチャをより精細に描画することが出来ます。\n"
 "特定のゲームでは描画バグの原因になることがあります。\n"
+"Direct3Dにおいては、この項目を2x以上に設定することも Force Texture Filtering"
+"を有効にすることも同じ効果になります。\n"
 "\n"
 "よく分からなければ、【1x】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"ディスクの読み取り速度を向上させます。必要になるタイトルはわずかです [有効＝"
-"ロード時間短縮／無効＝互換性・安定性重視]"
+"ディスクの読み取り速度を向上させます。\n"
+"このオプションはいくつかのタイトルでクラッシュや他の問題を引き起こす可能性が"
+"あります。\n"
+" [有効＝ロード時間短縮／無効＝互換性重視]"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "ページ分けして表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2126,7 +2138,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2137,34 +2149,29 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr ""
-"トワイライトプリンセスにおいて、広大なエリアで発生するFPS低下を抑えます。他の"
-"タイトルでは無効にしてください"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Enables Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
-msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。OSX "
-"には現在未対応です"
+"には現在非対応です"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。"
-"OpenALのみ対応"
+"OpenAL/Pulseのみ対応"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
+msgid ""
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2176,7 +2183,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2184,7 +2191,11 @@ msgstr ""
 "メモリ管理機構を有効にします。いくつかのゲームで必要です [有効＝互換性・安定"
 "性重視／無効＝動作速度向上]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr "有効にすることでアクションリプレイ/Geckoコードが作用するようになります"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2194,58 +2205,69 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "英語"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "画質向上の設定"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Enter a name for the new perspective:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "エントリ %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "エントリ 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "に一致する"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "エラー"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "選択した言語の読み込みに失敗しました。＜システムの言語＞に設定を戻します"
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2254,218 +2276,191 @@ msgstr ""
 "エラー： フォント群 %s にアクセスを試みましたが読み込めませんでした。ゲームは"
 "フォントを正しく表示できないか、クラッシュするでしょう"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "ヨーロッパ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr "Exception handler - access below memory space. 0x%08x"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Execute"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
-msgstr "Dolphin を終了"
+msgstr "Dolphinを終了"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "全てのWiiセーブデータをエクスポート"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "エクスポートに失敗"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "ファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "録画ファイルのエクスポート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "録画ファイルのエクスポート"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "セーブデータをエクスポート"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "セーブデータをエクスポート (実験的)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "全てのセーブデータをエクスポート"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "エクスポートに失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "セーブデータのエクスポート先を選択"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "拡張コントローラ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr "External Frame Buffer (外部フレームバッファ)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "特殊パラメータ"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "『メトロイド Other M』のみに有用な設定です"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "全てのファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Apploaderを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOLを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "このフォルダを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "このファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "このパーティションを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s を抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "全てのファイルをエクスポート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "フォルダをエクスポート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "抽出しています..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO バイト"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO プレーヤー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "フランス"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FSTサイズ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "接続に失敗！"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "接続に失敗！"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "コードの取得に失敗しました"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
-msgstr "%s への抽出に失敗"
+msgstr "%sへの抽出に失敗"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"DSP ROMの読み込みに失敗しました：\t%s\n"
-"\n"
-"このファイルはDSP-LLEを使用するのに必要なものです\n"
-"これは著作権を持つデータなのでDolphinには含まれていません\n"
-"DSPSpyを使用してあなたのGC/Wii 実機よりダンプを行って下さい\n"
-"\n"
-"ダンプが難しい環境ではこのファイルが不要なDSP-HLEエンジンを使用してください\n"
-"(本体設定→\"サウンド\"で選択できます)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr "listenに失敗。別のネットプレイサーバーが動いていませんか？"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"実機リモコンの利用に必要なファイル bthprops.cpl の読み込みに失敗しました。"
-"Dolphin を強制終了します"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"実機リモコンの利用に必要なファイル hid.dll の読み込みに失敗しました。Dolphin "
-"を強制終了します"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Failed to read %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Failed to read banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Failed to read bk header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2473,7 +2468,7 @@ msgstr ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2481,17 +2476,12 @@ msgstr ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Failed to read data from file %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Failed to read data from file: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2499,7 +2489,7 @@ msgstr ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2507,11 +2497,7 @@ msgstr ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Failed to read header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2519,50 +2505,35 @@ msgstr ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "ファイル %d のヘッダ読み込みに失敗"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Failed to read unique ID from disc image"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Failed to write BT.DINF to SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Failed to write bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "次のファイルへの書き込みに失敗： %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Failed to write header for %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "ペルシア語"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Fast"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Fast Depth Calculation"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "高速なMMUを使用します。全てのゲームでうまく動くわけではありません"
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2570,23 +2541,27 @@ msgstr ""
 "致命的なdesyncが発生したため再生を中止します。 (Error in PlayWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "FIFO プレーヤー"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "ファイル情報"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "コードを含まないファイルです"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "ファイルはGCIへ変換されました"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2594,7 +2569,7 @@ msgstr ""
 "ファイルを開くことができませんでした\n"
 "もしくは有効な拡張子ではありません"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2603,89 +2578,83 @@ msgstr ""
 "このファイルの拡張子は \"%s\" です\n"
 "有効な拡張子は .raw/.gcp です"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "このファイルはメモリーカードとして認識されませんでした"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "圧縮されていないファイル"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "構造"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr " 'ini' は不明な拡張子です。開くことができません！"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"全てのテクスチャに対してフィルタリングを行います。\n"
+"いくつかのテクスチャの画質が向上しますが、テクスチャによっては 問題が発生する"
+"可能性もあります。\n"
+"Direct3Dにおいては、この項目を有効にすることも、 異方性フィルタリングを2x以上"
+"に設定することも同じ効果になります。\n"
+"\n"
+"よく分からなければ、チェックを外さないでください"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "次へ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "前へ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "ブロック開始位置"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "チェックサムを修正"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "強制的に 16:9 にする"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "強制的に 4:3 にする"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "コンソールを日本向け (NTSC-J) に設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Force Texture Filtering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"ゲーム側でフィルタ無効を明示している場面でも、強制的にフィルタリング を行いま"
-"す。\n"
-"特に高解像度出力時にテクスチャが綺麗になりますが、いくつかのゲーム で描画バグ"
-"を引き起こします。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"ゲームを強引にワイドスクリーンに対応させて出力します。\n"
-"このオプションは描画バグの原因になることがあります。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 "日本語フォントを使用するタイトルのために強制的にコンソールを NTSC-J に設定し"
@@ -2693,7 +2662,27 @@ msgstr ""
 "チェックを外した状態ではDolphinは NTSC-U を使用しますが、日本のタイトルをプレ"
 "イ時には自動的にこの設定は有効になります"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"ゲームを強引にワイドスクリーンに対応させて出力します。\n"
+"アスペクト比4:3のゲームに対しては、この設定を有効にすると共に、 アスペクト比"
+"設定で【強制的に16:9にする】を選択してください。\n"
+"この設定は描画バグを引き起こす可能性があります。\n"
+"ワイドスクリーン化のチートコードを使用する場合は無効にしてください。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2701,406 +2690,453 @@ msgstr ""
 "ASCII コードでフォーマットしますか？ (NTSC もしくは PAL)\n"
 "Shift_JIS (NTSC-J) ではフォーマットできません"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "前方"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "ポート開放を自動で設定 (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "検索結果：%d 件 '"
+msgid "Found %u results for '"
+msgstr "検索結果：%u 件 '"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr " %x 個のセーブデータが見つかりました"
+msgid "Found %u save files"
+msgstr " %u 個のセーブデータが見つかりました"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "フレーム"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "フレーム"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Frame Advance"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "FFV1を使用してフレームをダンプ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "フレームの情報"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "フレームの範囲"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "フレームスキップ(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "フレームリミット："
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "録画フレーム数設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "フランス"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "フリールック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr "フリールック 速度増加"
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr "フリールック 速度減少"
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr "フリールック 下へ"
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr "フリールック 左へ"
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr "フリールック 右へ"
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr "フリールック 上へ"
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr "フリールック リセット"
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr "フリールック 速度リセット"
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr "フリールック  ズームイン"
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr "フリールック ズームアウト"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "フランス語"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "フレットボタン"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "開始"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "全画面"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr "全画面表示時の解像度："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI ファイル (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "入力(GC)"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "GCI フォルダ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr "ゲームボーイアドバンスROMファイル (*.gba)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "ゲームID"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ゲームID"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "すでに起動しています！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "ゲームが起動していません！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "ゲームが見つかりません！"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "固有設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "ゲーム設定"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "ゲームキューブ"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr "GCコントローラ接続タップ"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr "ゲームキューブ コントローラ設定"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr "ゲームキューブ デバイス設定"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr "GCメモリーカードファイル (*.raw,*.gcp)"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "ゲームキューブ"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "ゲームキューブ入力設定(&P)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "メモリーカードファイル (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "ゲームキューブの入力設定を行います"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Geckoコード"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Geckoコードの実行に失敗 (CT%i CST%i) (%s)\n"
-"(コードに問題があるか、まだサポートされていないタイプのコードです\n"
-"ネイティブコードハンドラを試してみてください。Sys フォルダに codehandler.bin "
-"を置き、Dolphinを再起動することで利用できます)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "一般"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "一般"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "ドイツ語"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "ドイツ"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: インデックスのサイズがコードリストのサイズを上回っています %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "ビデオ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "描画に関する設定を行います"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "より大きい"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 "テクスチャエフェクトを表示するために作成されたテクスチャの品質を 著しく向上さ"
 "せます。\n"
 "特に高解像度出力時に効果が大きく出ます。\n"
-"動作速度は少々低下し、まれに描画バグの原因にもなることもあります。\n"
+"GPU負荷が多少増加し、まれに描画バグの原因となることもあります。\n"
+"\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "ギリシア語"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "緑"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "緑 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "緑 - 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "ギターコントローラ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "高速化(Hacks)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr "Hardware rasterization"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Header checksum failed"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "範囲(縦)"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "ヘルプ"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"こんにちはこんにちは！\n"
-"\n"
-"このバージョンのDolphinの動作には Mac OS X 10.7 以上が必要なんだ。\n"
-"残念ながら君の使っているOSはこれより古いから、起動することができないみた"
-"い・・・\n"
-"Dolphin 3.5 なら Mac OS X 10.6 でも動作するけど、もっと新しいバージョンを使い"
-"たいならOSをアップグレードしてね。\n"
-"\n"
-"さよなら！\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"こんにちはこんにちは！\n"
-"\n"
-"Dolphinを動作させるにはSSE2をサポートしたCPUが必要なんだ。\n"
-"でも残念ながら君の使っているCPUはこれに対応してなくて、起動することができない"
-"みたい・・・\n"
-"\n"
-"さよなら！\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "隠す"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "マウスカーソルを隠す"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 "エミュレーションウィンドウにフォーカスがあるときは、マウスカーソルを 表示しな"
 "いようにします。\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+"値を大きくすることでCPU性能を増大させ、\n"
+"不安定な速度で動作するタイトルの\n"
+"フレームレートを安定させることができます。\n"
+"逆に小さくすれば、動作速度は低下しますが\n"
+"CPUの負荷も小さくなります。\n"
+"\n"
+"注意：\n"
+"デフォルト(100%)以外の値では、\n"
+"クラッシュやバグが発生する可能性があります。\n"
+"あくまでも自己責任での使用を前提とし、\n"
+"デフォルト以外の値で発生したバグについては\n"
+"報告しないでください。"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "ホスト"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "ホットキーの設定"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "ホットキー"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybrid Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 "IOCTL_ES_LAUNCH: あなたの NAND ダンプに含まれていない IOS やファイルを読み込"
 "もうとしました\n"
-"TitleID %016llx.\n"
-" Dolphin を停止します"
+"TitleID %016<PRIx64>.\n"
+"Dolphin を停止します"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr "IPL with unknown hash %x"
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "ポインタ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR ポインタ"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "感度"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ゲームの詳細"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "フォルダ一覧"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "イタリア"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "アイコン"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"主にペーパーマリオシリーズで使われる、Bounding Boxレジスタをサポートします"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignore Format Changes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
@@ -3110,9 +3146,9 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
@@ -3124,129 +3160,142 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "セーブデータをインポート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Wii セーブデータのインポート"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "インポートに失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"インポートされたのは'gsc'ファイルのようです\n"
-"しかし正しいヘッダではありません"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "インポートしたファイルの長さが正しくありません"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"インポートされたのは'sav'ファイルのようです\n"
-"しかし正しいヘッダではありません"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "ソコソコ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "フレームリミットを上げる"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "内部解像度 拡大"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "情報"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "情報"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "入力"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "ここに暗号化or復号化されたコードを貼り付けてください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SDカードの挿入をエミュレート"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "コード名を入力してください"
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr "ここにコード名を入力..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "WiiメニューにWADファイルを追加"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Wiiメニューへインストール"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
-"ポートされていません"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "追加しています..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "エラーが確認されました！"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "完了"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "チェック終了。整合性に問題はありませんでした。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"パーティション %d に問題が見つかりました。 データが破損しているか、正しくパッ"
+"パーティション %s に問題が見つかりました。 データが破損しているか、正しくパッ"
 "チが当てられていない可能性があります。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "表示"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Dolphinの表示に関する設定"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Internal LZO Error - compression failed"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3255,103 +3304,106 @@ msgstr ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "もう一度ステートロードを試してみてください"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Internal LZO Error - lzo_init() failed"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr "内部名称"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "内部解像度の変更："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (非常に低速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "イントロ"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "無効な値です！"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Invalid bat.map or dir entry"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Invalid event type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "不正なファイル"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"このGCMの opening.bnr ファイルは正しくありません\n"
-"%s\n"
-" このゲームをダンプしなおしてください"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "不正な録画ファイル"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "エラー：オブジェクトを選択してください"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
-msgstr ""
+msgstr "無効な検索文字列。 数値に検索文字列を変換できませんでした。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
+msgstr "無効な検索文字列。偶数の長さの検索文字列のみがサポートされています。"
+
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "不正なステートファイル"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "イタリア語"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "日本"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "イタリア"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT Recompiler (推奨)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL experimental recompiler (実験的)"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "JITIL Recompiler (実験的)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "日本"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "日本語"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "韓国"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "最前面に表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3362,64 +3414,75 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "最前面に表示"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "キーボード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "キー設定"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr "キー"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "韓国"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "韓国語"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Lボタン"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L (アナログ)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "GUI言語："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "%iつ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "レイテンシー："
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
-msgstr "左スティック"
+msgstr "Lスティック"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"左クリックでキーの入力待ち\n"
-"スペースキーを入力で消去します"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Lスティック"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3429,7 +3492,7 @@ msgstr ""
 "中クリックで消去\n"
 "右クリックで詳細設定に入ります"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3437,114 +3500,122 @@ msgstr ""
 "左or右クリックで設定画面に入ります\n"
 "中クリックで消去します"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "より小さい"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "FPSによる制限を有効化"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "ライセンス"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+"指定したFPSの値にゲームスピードを制限するオプションです。(ノート：NTSCは60、"
+"PALは50がフルスピード)"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "読込"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "カスタムテクスチャを読み込む"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "ステートロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "1つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "2つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "3つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "4つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "5つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "6つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "7つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "8つ前のステートをロード"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "ステートロード - スロット 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "ステートロード - スロット 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "ステートロード - スロット 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "ステートロード - スロット 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "ステートロード - スロット 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "ステートロード - スロット 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "ステートロード - スロット 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "ステートロード - スロット 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "ステートロード - スロット 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "ステートロード - スロット 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "ファイルからロード"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wiiメニューを起動"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -3553,86 +3624,97 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "特定のゲーム向けの設定値を読み込みます"
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr "選択したスロットから読込"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr "選択したスロットから読込"
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "ログ"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "ログの設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "FPSのログを保存"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr "レンダリング時間を記録"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "表示するログ情報"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"FPSのログを User/Logs/fps.txt に保存します。\n"
+"レンダリング所要時間のログを User/Logs/render_time.txt に保存します。\n"
+"Dolphinのベンチマークとして有用な機能です。\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "ログ出力先"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "ログ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "サーバーとの接続が切断されました！"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
-msgstr ""
-"MD5の不整合\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
+msgstr "MD5チェックサム"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Speed Hack"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "コントロールスティック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "メーカー"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "メーカーID"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "メーカー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3646,35 +3728,41 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "最大"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
+"有効にしているとWiiメニューやいくつかのタイトルで動作速度が低下する場合があり"
+"ます"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
 msgstr "このタイトルのセーブデータはすでに存在します"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "すでに開いています"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "メモリバイト"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "メモリーカード"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "メモリーカードマネージャ　～使用前にはバックアップを！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3691,37 +3779,52 @@ msgstr ""
 "%s\n"
 "この場所に古いファイルをコピーしますか？\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "メモリカードのファイルサイズが、ヘッダのサイズに一致していません"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "メニュー"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "マイク"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "最小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "その他"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "その他の設定"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "感度変更"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3733,20 +3836,24 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "等幅フォント"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "モーションプラス"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "モーター"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3764,332 +3871,306 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
+"情報: ストリームサイズとデータの長さが一致しません\n"
+"\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "名前"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "名前： "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "ネイティブ GCI ファイル(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "オランダ"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "新規検索"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "次のページ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "続けて検索"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "ニックネーム："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "No Country (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "リストに項目がありません！"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "出力しない"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "%s のバナーファイルはありません"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "説明なし"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "読み込みファイルなし"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr "空きエントリがありません"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "録画ファイルなし"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "%s のセーブフォルダがありません"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "なし"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "ノルウェー語"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "に一致しない"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "未確認"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "Not a Wii save or read failure for file header size %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "未接続"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "ノート"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "補足： "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "注意"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "行数："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "ヌンチャク"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "ヌンチャクの加速度"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "オブジェクト"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "オブジェクトの範囲"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "オフ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "オフセット値："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "オンスクリーンメッセージを表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "オンラインガイドを表示(&D)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "残り %d ブロックしかありません！"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "開く"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "実体のあるフォルダを開く(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "セーブデータのあるフォルダを開く(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "起動するファイルを選択"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: can't create context for device %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: can't find sound devices"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: can't open device %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
-msgstr ""
+msgstr "テキストエディタでこのゲームのデフォルト設定を確認できます"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "オレンジ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4099,346 +4180,335 @@ msgstr ""
 "右クリックメニューから全てのセーブデータをエクスポートし、\n"
 "新しくメモリーカードを作成して、そこへインポートを行ってください\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "その他"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 "ゲーム中に他のプレーヤーが切断されてしまいました！手動でゲームを停止させてく"
 "ださい"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "出力"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr "Overlay Information"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
 msgstr "録画ファイルを再生(&L)"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "パッド"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "パッド"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "パラメータ"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "パーティション %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "パーティションが存在しません： %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "パッチ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "フォルダ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "一時停止"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr "再生終了時に一時停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr "フォーカスが外れたら一時停止"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+"エミュレーションウィンドウからフォーカスが外れた際に一時停止するようにします"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Lighting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "カンペキ！"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspective %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "機種"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "開始"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "録画ファイルを再生"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "開始／一時停止"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "サクサク"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "再生オプション"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "プレイヤー一覧"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "確認"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Please create a perspective before saving"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "ポーランド語"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr "ポート %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "ポート 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "ポート 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "ポート 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "ポート 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "ポート:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "ポルトガル語"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr "ポストプロセス シェーダー設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "ブラジル語"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr "カスタムテクスチャの事前読込"
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr ""
+msgstr "Premature movie end in PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr ""
+msgstr "Premature movie end in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr ""
+msgstr "Premature movie end in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "プリセット："
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "前のページ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "ここより前"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "プロファイル"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "プロパティ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
-msgstr "キャッシュの整頓を実行"
+msgstr "キャッシュの消去を実行"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "確認"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "終了"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Rボタン"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R (アナログ)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "ロシア"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "範囲"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "範囲／強さ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
-msgstr "読み込み専用 有効／無効"
+msgstr "読み込み専用 切替"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "実機バランスWii ボードを接続"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "実機Wii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "実機Wii リモコンの設定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "録画"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "入力を記録"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "録画情報"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
-msgstr "録画オプション"
+msgstr "録画設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "赤"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "赤 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "赤 - 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 "3Dグラフィックスのエイリアシングを軽減させます。\n"
 "使用すると画面のじらじらした部分を滑らかな表示にすることができます。\n"
-"このオプションは大きな動作速度低下を招き、また描画バグの原因に なることもあり"
+"このオプションは大きなGPU負荷をもたらし、また描画バグの原因に なることもあり"
 "ます。\n"
 "\n"
 "よく分からなければ、【なし】のままにしておいてください。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "再更新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "ゲームリストを再更新"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "ゲームリストを再更新します"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "リージョン"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "削除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4448,243 +4518,322 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "メインウィンドウ部分に描画"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr "Rendering"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "初期化"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "結果表示欄"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "リビジョン"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "Revision: %s"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
-msgstr "右スティック"
+msgstr "Rスティック"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Rスティック"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "振動"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"DSP-LLEの処理を別スレッドに分離して行います (非推奨:フリーズの原因になります)"
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "ロシア"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "ロシア語"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "ステートセーブ(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Safe"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "保存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "セーブデータの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "最古のステートに上書き保存"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "ステートセーブ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "ステートセーブ - スロット 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "ステートセーブ - スロット 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "ステートセーブ - スロット 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "ステートセーブ - スロット 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "ステートセーブ - スロット 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "ステートセーブ - スロット 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "ステートセーブ - スロット 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "ステートセーブ - スロット 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "ステートセーブ - スロット 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "ステートセーブ - スロット 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "ファイルとして保存"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "ファイルとして保存"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "圧縮するタイトルの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Save current perspective"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "復元するタイトルの保存先を選択"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+"以下の場所に128MBで仮想SDファイルを作成します\n"
+"/Wii/sd.raw"
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Savestate movie %s の破損を確認しました。録画を中止しています..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Scaled EFB Copy"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "確認しています... .%s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "確認中..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "確認中..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "画面撮影"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "検索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "フィルタリング"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "サブフォルダも検索"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "現在のオブジェクトを検索"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "値を検索"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Section %s not found in SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "カラムの表示／非表示"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr "ステートスロット 1"
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr "ステートスロット 10"
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr "ステートスロット 2"
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr "ステートスロット 3"
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr "ステートスロット 4"
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr "ステートスロット 5"
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr "ステートスロット 6"
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr "ステートスロット 7"
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr "ステートスロット 8"
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr "ステートスロット 9"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr "ステートスロットを選択"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "録画ファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "追加するWADファイルを選択"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"描画に使用するビデオカードを選択します。\n"
-"\n"
-"よく分からなければ、一番上のものを選択してください。"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "インポートするセーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Select floating windows"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "ロードするファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "セーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "ロードするステートセーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "ステートセーブの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4700,272 +4849,327 @@ msgstr ""
 "\n"
 "よく分からなければ、【自動】を選択してください。"
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "選択されたプロファイルは存在しません"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "選択したフォント"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"描画に使用するビデオカードを選択します。\n"
+"\n"
+"よく分からなければ、一番上のものを選択してください。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"全画面表示時の解像度を選択します。\n"
-"内部解像度と同じか、それより上の解像度を選択してください。 高解像度であっても"
-"動作速度にはほとんど影響しません。\n"
+"フルスクリーン表示時の解像度を選択します。\n"
+"内部解像度と同じか、より高い解像度を選択してください。 高解像度であっても動作"
+"速度にはほとんど影響しません。\n"
 "\n"
-"よく分からなければ、デスクトップの解像度と同じものを、\n"
-"もしくは、正常に動作する一番高い解像度を選択してください。"
+"よく分からなければ、【自動】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+"立体視の表示方式を選択できます。立体視が可能なハードウェアが必要ですが、より"
+"良い奥行き感が味わえます。\n"
+"多くの3Dテレビでは、Side-by-Side または Top-and-Bottom 方式を採用していま"
+"す。\n"
+"3Dメガネの場合は Anaglyph を選んでください。\n"
+"このオプションはエミュレーション速度に大きな影響があり、 時に描画バグの原因に"
+"もなります。\n"
+"\n"
+"よく分からなければ、Off にしてください。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 "描画に使用するグラフィックスAPIを選択します。\n"
-"通常【Direct3D9】が最も高速ですが、【OpenGL】はより正確です。\n"
-"【Direct3D11】は2つの間のような動作になります。\n"
-"Direct3D9/Direct3D11 は Windows のみ使用可能です。\n"
-"\n"
-"よく分からなければ、【Direct3D11】を選択してください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
-msgid ""
-"Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
-"\n"
-"If unsure, use OpenGL."
-msgstr ""
-"描画に使用するグラフィックスAPIを選択します。\n"
-"通常【Direct3D9】が最も高速ですが、【OpenGL】はより正確です。\n"
-"【Direct3D11】は2つの間のような動作になります。\n"
-"Direct3D9/Direct3D11 は Windows のみ使用可能です。\n"
+"【Software Renderer】はデバック用途としてのみ有用なものです。\n"
+"理由もなく選択することは避けましょう。\n"
 "\n"
 "よく分からなければ、【OpenGL】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
+msgid ""
+"Selects what graphics API to use internally.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
+"\n"
+"If unsure, select OpenGL."
+msgstr ""
+"描画に使用するグラフィックスAPIを選択します。\n"
+"【Software Renderer】はデバック用途としてのみ有用なものです。\n"
+"理由もなく選択することは避けましょう。\n"
+"【Direct3D】と【OpenGL】のどちらが良いかはゲームによって 異なります。両方試し"
+"て上手く動作する方を選びましょう。\n"
+"\n"
+"よく分からなければ、【OpenGL】を選択してください。"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "送信"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "センサーバーの位置"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separator"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "セルビア語"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr "シリアルポート：ブロードバンドアダプタなどのデバイスが接続できます"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Wiiメニュー(ディスクチャンネル)に表示(&D)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "メモリーカード%cを既定として設定"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: インデックスのサイズがコードリストのサイズを上回っていま"
 "す %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr "ゲームキューブのシステム言語を変更できます"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr "ゲームキューブのシステム言語を変更できます"
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"レイテンシーを調整します（単位：ms）。高くすることで音の問題を軽減できます。"
-"OpenALのみ"
+"レイテンシーを調整します（単位:ms）。高くすることで音の問題を軽減できます。"
+"OpenALのみ設定可能"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "設定"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Cant create setting file"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "シェイク"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "通称"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "LRトリガー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "コンソール(&C)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "ログを表示(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "ステータスバー(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "ツールバー(&T)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
-msgid "Show Defaults"
-msgstr ""
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "オーストラリア"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
+msgid "Show Defaults"
+msgstr "デフォルト設定を表示"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "DVDドライブ内のソフトを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Show EFB Copy Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "FPSを表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr "フレームカウンタを表示"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "フランス"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "ゲームキューブ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "ドイツ"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "キー入力を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "イタリア"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "日本"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "韓国"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr "ラグカウンタを表示"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "次の言語で表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "ログの設定を表示(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "オランダ"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL規格"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "特定機種のソフトだけを表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "特定リージョンのソフトだけを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "ロシア"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "スペイン"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "統計情報を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "アメリカ合衆国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "不明"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "WAD(Wiiウェア/VC/チャンネル)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "ゲーム停止前に確認ウィンドウが表示されるようになります"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 "潜在的に深刻なエラーが発生した場合にダイアログを表示します\n"
-"無効にすると致命的でないエラー表示に悩まされなくなりますが、クラッシュ時にエ"
-"ラー表示なしに突然強制終了されるようになります"
+"無効にすると致命的でないエラー表示には悩まされなくなりますが、クラッシュ時に"
+"エラー表示なしに突然強制終了されるようになります"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "ブロック開始位置を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "ラグカウンターを表示"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"エミュレーションウインドウ上にメッセージを表示します。\n"
-"メモリーカードへの書き込み、起動時のシステム情報、 JIT cacheの消去などが含ま"
-"れます。"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "ブロック数を表示"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "コメントを表示"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "アイコンを表示"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "タイトルを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4977,13 +5181,9 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "不明"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
@@ -4991,34 +5191,46 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "横持ち(Sideways)で使用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "サイズ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "BIOSをスキップ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Skip DCBZ clearing"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Skip EFB Access from CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
@@ -5026,35 +5238,34 @@ msgid ""
 msgstr ""
 "RAM設定時、エミュレーション精度を少し犠牲にして、速度向上を 行うオプションで"
 "す。\n"
-"時に画質を向上させることもあるようです。\n"
 "何か不具合が発生した場合はこのオプションを無効にするか、 『Texture Cache』を"
 "【Safe】側に設定してください。\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "スロット %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "スロットA"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "スロットB"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "スクリーンショット"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5065,154 +5276,187 @@ msgstr ""
 "デバッグ用途としてのみ有用なものです。\n"
 "それでも使用しますか？よく分からなければ、選択しないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "サウンド設定"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Sound backend %s is not valid."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Sound buffer creation failed: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "スペイン"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr "スピーカー パン調整"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "リモコンスピーカーの音量"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 "内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上し"
 "ます。\n"
-"しかし、ゲームによっては非常に重くなったり描画バグの原因となります。\n"
+"しかし同時にGPU負荷が増大し、ゲームによっては描画バグの原因となります。\n"
 "【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描"
 "画バグは発生しにくくなります。\n"
-"また一般的に内部解像度が低いほど、動作速度は向上します。\n"
+"一般的に内部解像度が低いほど、動作速度は向上します。\n"
 "\n"
 "よく分からなければ、【1x Native】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Speed up Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "丸み"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
+"CPUとGPUのスレッドを分離し、別々のコアで処理するようにします\n"
+"有効にすると動作速度が大きく向上しますが、クラッシュやバグの原因になる場合も"
+"あります"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "標準コントローラ"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "スタート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "ネットプレイを開始(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "録画を開始(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr "入力の記録を開始(&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
-msgstr "録画を開始"
+msgstr "入力の記録を開始"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "動作率"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "ステートセーブ／ロード"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "SPEED FORCE"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr "表示方式"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr "立体視"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "スティック"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
-msgstr ""
-"EFBコピーをGPUにテクスチャオブジェクトとして格納します。\n"
-"これは不正確な処理ですが、ほとんどのゲームで上手く働き、 また【RAM】設定より"
-"も高速に動作します。\n"
-"\n"
-"よく分からなければ、こちらを選択しておいてください。"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
+msgstr "Store EFB Copies to Texture Only"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "ウィンドウに合わせる"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "ストラム"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Subtract"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "%s へのエクスポートに成功しました"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "セーブファイルのインポートに成功"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "スウェーデン語"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr "%u セーブデータを %s へエクスポートすることに成功しました"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr "サポート"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr "視点を入れ替える"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"有効にすると左右の視点を入れ替えます。交差法を試したい時に有効です。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "動き"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synchronize GPU thread"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5220,81 +5464,110 @@ msgstr ""
 "CPU／GPUスレッドを同期させることでデュアルコア動作時のフリーズを抑制します "
 "[有効＝互換性・安定性重視／無効＝動作速度向上]"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "システムの言語："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "台湾"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS Input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr "TAS Input - コントローラ %d"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr "TAS Input - Wiiリモコン %d"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "左テーブル"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "右テーブル"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "台湾"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "画面撮影"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "タルコンガ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "テスト"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Texture"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "テクスチャフォーマット情報表示"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WADファイルの追加に成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "無効なアドレスです"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr "チェックサムの修正に成功しました"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr "選択したフォルダはすでにリストに存在します！"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5303,7 +5576,7 @@ msgstr ""
 "%s はすでに存在します\n"
 "上書きしますか？"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5312,46 +5585,34 @@ msgstr ""
 "ファイル %s に書き込むことができませんでした。他のプログラムによって使用され"
 "ていないか確認してください。"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "ファイル %s は既に開かれているため、ファイルヘッダーは書き込まれません。"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
-#, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "指定したファイル (%s) は存在しません"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
 msgstr "空の名前は使用できません"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
 msgstr "',' を含む名前は使用できません"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/Core/Movie.cpp:184
+#, c-format
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
+
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "復号化しましたが、このコードにはひとつも行が含まれていません。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
-msgstr ""
-"このスライダをSafe側に設定しておくと、RAMからのテクスチャ更新に 失敗しにくく"
-"なります。\n"
-"\n"
-"よく分からなければ、右端に合わせておいてください。"
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
+msgstr "コピーしようとしているセーブデータのサイズが正しくありません"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "コピーしようとしているセーブファイルのサイズが正しくありません"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5359,43 +5620,58 @@ msgstr ""
 "選択した言語はこのシステムではサポートされていません。デフォルト設定を使用し"
 "ます"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "サーバーとクライアントでネットプレイのバージョンに互換性がありません！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "このサーバーは満員です！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "サーバーより：このゲームは、現在実行中です！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "サーバーは、不明なエラーメッセージを送信しました！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定されたファイル \"%s\" は存在しません"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "無効な値です"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "テーマ："
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+"このフォルダには gci ファイルが多すぎます\n"
+"%s\n"
+"127個より多く保存することは出来ません"
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 "00000001/00000002のチケットが必要です。おそらく不完全なNANDダンプです。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5405,7 +5681,7 @@ msgstr ""
 "　　 本体設定でデュアルコア処理を有効化している場合でも、このゲームのみシング"
 "ルコア動作が可能"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5413,125 +5689,171 @@ msgstr ""
 "このアクションリプレイシミュレータは、アクションリプレイそのものを変更する"
 "コードはサポートしていません。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"有効にしているとWiiメニューやいくつかのタイトルで動作速度が低下する場合があり"
-"ます"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"ゲーム内のカメラに干渉することが出来るようになる機能です。\n"
-"\n"
-"・右クリックを押しながらマウスを移動 - カメラを振る\n"
-"・Shiftキーを押しながらW/A/S/Dキー - カメラの移動\n"
-"　　(Shift+0キーを押すごとに移動距離2倍、Shift+9キーで2分の1)\n"
-"・Shift+Rキー - カメラのリセット\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"指定したFPSの値にゲームスピードを合わせるオプションです。(ノート：NTSCは60、"
-"PALは50がフルスピード)【サウンド】を選択するとDSPの処理に沿った速度となり、こ"
-"れは一部のゲームでクリックノイズを改善しますが、別のノイズを生み出す可能性が"
-"あります。"
+"このタイトルは DSP HLE に対応していないようです。\n"
+"HomeBrewの場合は DSP LLE を試してください。\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"CPUとGPUのスレッドを分離し、別々のコアで処理するようにします\n"
-"有効にすると動作速度が大きく向上しますが、クラッシュやバグの原因になる場合も"
-"あります"
+"このタイトルは DSP HLE に対応していないようです。\n"
+"HomeBrewの場合は DSP LLE を試してください。\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "このゲームの設定をテキストで編集します"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr "このタイトルの設定をテキストで編集します"
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "しきい値"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "傾き"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "タイトル"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "終了"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "全てのログ情報を選択／解除"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "アスペクト比 設定切替"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "EFB Copies 設定切替"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "フォグ処理 設定切替"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr "フレームリミット 切替"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "全画面表示 切替"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "内部解像度 設定切替"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr "一時停止 切替"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "上部"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "不明なファイルタイプを読み込もうとしました"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "トリガー"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Trying to read from invalid SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5539,41 +5861,24 @@ msgstr ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "トルコ語"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "ターンテーブル"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "形式"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDPポート:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDPで接続"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "不明"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "アメリカ合衆国"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5581,97 +5886,110 @@ msgstr ""
 "この値ではパッチを作成できません。\n"
 "入力された値が不正です。"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"暗号化または復号化コードとして入力された内の行 %lu を解析できません。内容を確"
+"暗号化または復号化コードとして入力された内の行 %u を解析できません。内容を確"
 "認して下さい。\n"
 "この行を無視して解析を続けますか？"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "未定義 %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "直前のステートロードの取消"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "直前のステートセーブの取消"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Unexpected 0x80 call? Aborting..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "フィルタ無し"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Unknown DVD command %08x - fatal error"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Unknown command 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Unknown entry type %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "次のIDから不明なメッセージを受信 : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "上"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "再取得"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "直立状態(Upright)で使用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "EuRGB60 (PAL60) モードを使用"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "全画面で表示"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "16進"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "PAL60 (EuRGB60) モードを使用"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "パニックハンドラを使用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
@@ -5680,102 +5998,70 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"テクスチャのデコードに複数のスレッドを使用するようにします。\n"
-"特に3つ以上のコアを持つCPUで動作速度が向上する可能性があります。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"推奨されない方法でOpenGLの頂点ストリームの処理速度を向上させます。\n"
-"サポートされているGPUでは特に問題になりませんが、そうでない場合は このオプ"
-"ションは深刻な不具合をもたらします。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"通常、シェーダーのコンパイルに失敗すると、エラーメッセージが表示され るように"
-"なっています。\n"
-"このオプションを有効にすることで、このエラーメッセージをスキップして 快適な"
-"ゲームプレイが可能になります。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "ユーティリティ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "垂直同期 (V-Sync)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Speed Hack"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "値"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "値："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "値："
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "Various Statistics"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbosityモード"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Vertex Streaming Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "描画"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr "音量を下げる"
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr "無音 切替"
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr "音量を上げる"
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installation failed: error creating %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD installation failed: error creating ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5787,25 +6073,27 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Warning - starting DOL in wrong console mode!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Warning - starting ELF in wrong console mode!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Warning - starting ISO in wrong console mode!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5816,7 +6104,7 @@ msgstr ""
 "%s\n"
 "続けますか？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5830,7 +6118,7 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5838,15 +6126,27 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
 "should load another save before continuing, or load this state with read-"
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
+"注意：ムービーのバイト%d (0x%X)上にミスマッチするステートをロードしました。作"
+"業を続行する前に、他のステートをロード、または読み取り専用モードをオフにして"
+"このステートをロードする必要があります。無視して続けると、おそらくDesyncしま"
+"す。"
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5865,179 +6165,165 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - file not open."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "ワーミー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "疑似ワイドスクリーン化"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "範囲(横)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii コンソール"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NANDルート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wiiセーブデータ (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: ファイルからの読み込みができませんでした"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "入力(Wii)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wii リモコン"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wii リモコン %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wii リモコン %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wii リモコン接続中"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wii リモコンの振動を有効化"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wii リモコンの設定を行います"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "デバイス設定"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "ワードラップ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "動作中..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "メモリーカードへの書込を許可"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "コンソールに出力"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "デバッガに書込"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "ファイルに出力"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "ウィンドウに出力"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黄"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"DSP-LLEの代わりに、開発中の合法DSP ROMを使用します。\n"
-"全てのWiiタイトルとほとんどのゲームキューブタイトルで正常に動作しますが、GBA/"
-"IPL/CARD Ucode型のものには対応していません。\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"DSP-LLEの代わりに、開発中の合法DSP ROMを使用します。このROMは古いバージョンで"
-"す。\n"
-"Zelda ucode型のタイトルでしか上手く動作しません\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "You can't close panes that have pages in them."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "ソフトが選ばれていません"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "ゲームが選ばれていません！"
+
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
 msgstr "名前が入力されていません！"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "10進数・16進数・8進数いずれかの有効な値を入力してください。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "有効なプロファイル名を入力してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "変更を有効にするにはDolphinを再起動してください"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6047,7 +6333,7 @@ msgstr ""
 "この問題を修正するために動作を停止しますか？\n"
 "\"いいえ\"を選択した場合、歪んだ音のままゲームが始まるでしょう"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6055,36 +6341,36 @@ msgstr ""
 "この GCM/ISO ファイルは不正と思われます (国情報が無効)\n"
 "PAL規格と仮定して続けますか？"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"このSYSCONFファイルのサイズが正しくないようです\n"
-"正しくは 0x%04x (このファイルは 0x%04llx)\n"
-"新しく作成しますか？"
+"SYSCONFファイルのサイズが正しくないようです\n"
+"正しくは 0x%04x (このファイルは 0x%04<PRIx64>)\n"
+"新しいものを作成しますか？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "03コードはサポートされていません"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr "Zero code unknown to Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ 入力を待機... ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6096,76 +6382,30 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[ カスタム設定 ]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"◆◆◆実験的機能◆◆◆\n"
-"OpenCLフレームワークをGPU上で利用し、テクスチャのデコード処理の 負荷軽減を計"
-"り、動作速度を向上させるのが目的です。\n"
-"現状、様々なゲームで描画バグが発生することが知られています。 またほとんどの場"
-"合でCPUによる通常のデコードよりも遅くなります。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"◆◆◆実験的機能◆◆◆\n"
-"ディスプレイリストのキャッシュにより動作速度を向上させます。\n"
-"ほとんどの場合何かしらの問題が発生するでしょう。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "　"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "unknown flavor %d (expected %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "unknown message received"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returned -1 on application run!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar 補正値："
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear 補正値："
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| (...もしくは)"
diff --git a/Languages/po/ko.po b/Languages/po/ko.po
index 9d786d2dae..7549898b58 100644
--- a/Languages/po/ko.po
+++ b/Languages/po/ko.po
@@ -1,17 +1,18 @@
-# Translation of dolphin-emu.pot to Korean
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Siegfried <iori3000@hanafos.com>, 2013
+# Siegfried <iori3000@hanafos.com>, 2013-2014
 # Siegfried <iori3000@hanafos.com>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ko/)\n"
 "Language: ko\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (표시하기에 너무 많은)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "게임 :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,43 +56,93 @@ msgstr ""
 "\"%s\"가 존재하지 않습니다.\n"
 " 새로운 16MB 메모리카드를 생성해요?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
-msgstr "\"%s\"는 비적합 GCM/ISO 파일임, 혹은 GC/Wii ISO가 아님."
+msgstr "\"%s\"는 부적합한 GCM/ISO 파일이거나, GC/Wii ISO가 아닙니다."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s복사%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d 샘플들"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d 샘플들 (품질 수준 %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s가 이미 존재함, 덮어씁니까?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s 가 실패해서 취소되었습니다. 이미지가 손상된 것 같습니다."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +151,7 @@ msgstr ""
 "%s 는 메모리카드로써 불러오기에 실패했습니다 \n"
 " 카드 파일 크기가 유효하지 않습니다 (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -97,7 +160,7 @@ msgstr ""
 "%s 는 메모리카드로써 로드하는데에 실패했습니다 \n"
 " 카드 크기가 유효하지 않습니다 (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -106,362 +169,339 @@ msgstr ""
 "%s 는 메모리카드로써 불러오기에 실패했습니다 \n"
 "파일이 유효한 메모리 카드 파일이 될 만큼 충분히 크지 않습니다. (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s가 열기에 실패했습니다"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s 는 0 바이트 파일임"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s 는 이미 압축됨! 그것을 더이상 압축할 수 없습니다."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s 는 너무 긴 파일이름 입니다, 최대 글자수는 45 입니다."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s삭제%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI 내보내기%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI 가져오기%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "돌핀에 대해(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "DVD 드라이브에서 부트(&B)..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "브레이크포인트(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "ISO 폴더탐색(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "치트 매니저(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "오디오 설정(&D)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "ISO 삭제(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "선택된 ISO들 삭제(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "에뮬레이션(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "파일(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "프레임 진행(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "전체화면(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "그래픽 설정(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "도움(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "단축키 설정(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "상태 로드(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "메모리 카드 매니저(GC) (&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "메모리(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "열기(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "옵션(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "일시정지(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "실행(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "속성(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "읽기-전용 모드(&R)"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "게임목록 새로 고침(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "레지스터들(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "리셋(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "사운드(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "중지(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "도구(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "비디오(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "보기(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "위모트 설정(&W)"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "위키(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+z원거리"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+z근거리"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(알려지지 않음)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(끔)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x 원본 (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 비트"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x 원본 (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x 원본 (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x 원본 (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 비트"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D 비전"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x 원본 (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x 원본 (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 비트"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<여기에 이름을 넣으세요>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<발견된 해상도가 없음>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<없음>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<키를 누르세요>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<시스템>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "넷플레이 윈도우가 이미 열려있습니다!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "현재 게임이 구동되고 있지 않습니다."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"지원되는 블루투스 장치를 찾을 수 없습니다.\n"
-"위모트를 수동으로 연결해야합니다."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-기반보드"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR 코드"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "돌핀에 대해"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "가속"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "정확성:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"정확하게 EFB 복사를 에뮬합니다.\n"
-"일부 게임들은 그래픽 효과나 게임플레이 기능을 이것에 의존합니다.\n"
-"\n"
-"모르겠으면, 텍스처에 EFB를 체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "   [ 액션 ]"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -476,14 +516,14 @@ msgstr ""
 "범인 코드:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 코드 추가 (%s)에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -492,7 +532,7 @@ msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 채우기와 슬라이드(%s)"
 "에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -501,7 +541,7 @@ msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 램 쓰기와 채우기 (%s)"
 "에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -509,12 +549,12 @@ msgid ""
 msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 포인터 (%s)에 쓰기에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "액션 리플레이 에러: 비적합 크기 (%08x), 메모리 복사 (%s)에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -524,172 +564,140 @@ msgstr ""
 "(%s)\n"
 "마스터 코드가 필요하지 않습니다. 마스터 코드를 사용하지 마세요."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "액션 리플레이 에러: 비적합 AR 코드 라인: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "액션 리플레이: 조건적 코드: 비적합 크기 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "액션 리플레이: 비적합 일반 코드 타입 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "액션 리플레이: 일반 코드 %i: 비적합 서브타입 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "액션 리플레이: 일반 코드 0: 비적합 서브타입 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "어댑터:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "추가"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "액션리플레이 코드 추가"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "패치 추가"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "새로운 창 추가"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "추가..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "주소 :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"상세화 값을 z원거리 파라미터에 추가합니다.\n"
-"부동소수점 값을 표현하는 두가지 방법이 있다\n"
-"예: \"200\" 이나 \"0.0002\"를 직접적으로 넣기, 그것은 같은 효과를 낸다, 그 실"
-"질적 값은 \"0.0002\"가 될 것이다.\n"
-"값: (0->+/-정수) or (0->+/-부동소수[6개 숫자 정확성])\n"
-"\n"
-"알아두기: 얻어진 값들에 대해 로그윈도우/콘솔을 체크하세요."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"상세화 값을 z근거리 파라미터에 추가합니다.\n"
-"부동소수점 값을 표현하는 두가지 방법이 있다\n"
-"예: \"200\" 이나 \"0.0002\"를 직접적으로 넣기, 그것은 같은 효과를 낸다, 그 실"
-"질적 값은 \"0.0002\"가 될 것이다.\n"
-"값: (0->+/-정수) or (0->+/-부동소수[6개 숫자 정확성])\n"
-"\n"
-"알아두기: 얻어진 값들에 대해 로그윈도우/콘솔을 체크하세요."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "버튼들 활성화에 필요한 아날로그 컨트롤 압력을 조정하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "고급"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "고급 설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "모든 GC/Wii 파일들 (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "모든 GC/Wii 이미지들 (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "모든 게임큐브 GCM 파일들 (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "모든 상태들 저장 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "모든 Wii ISO 파일들 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "모든 압축된 GC/Wii ISO 파일들 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "모든 파일 (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "분석"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "각도"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "비등방성 필터링:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "안티-앨리어싱:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "앱로더가 잘못된 크기임... 정말 앱로더입니까?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "앱로더가 파일로 부터 로드할 수 없음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "앱로더:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "적용"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -699,16 +707,12 @@ msgstr ""
 "\n"
 "모르겠으면, (끄기)를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "아랍어"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" 를 정말로 지우고 싶습니까?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -716,54 +720,81 @@ msgstr ""
 "이 파일들을 정말로 지우고 싶습니까?\n"
 "그것들은 영원히 사라집니다!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (실험적)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "종횡비:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "적어도 하나의 창이 열려 있어야합니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "오디오"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "오디오 백엔드:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: AO 장치를 열기 에러.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "자동"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "자동 (640x528의 배수)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "자동 (윈도우 크기)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "윈도우 크기 자동 조정"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -773,252 +804,250 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP 레지스터"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "뒤로"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "백엔드 설정"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "백엔드:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "백그라운드 입력"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "뒤로"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "배드 파일 헤더"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "밸런스 보드"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "       배너"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "배너 세부사항"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "배너:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "바"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "기본"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "기본 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "베이스"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "블럭 할당 테이블 체크섬을 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "블럭들"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "파랑"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "파랑 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "파랑 오른쪽"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "아래"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "바운드 컨트롤들: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "고장남"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "폴더탐색"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "추가할 디렉토리 둘러보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "ISO 디렉토리 불러오기..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "출력 디렉토리 둘러보기"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "버퍼:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "버튼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 "DCBZ 명령에 의해 데이터 캐쉬 청소를 우회합니다. 보통은 이 옵션을 꺼둡니다."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C 스틱"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-스틱"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP 레지"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU 에뮬레이터 엔진"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "화면표시 목록 캐쉬"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"버텍스단위 대신에 픽셀단위 3D 그래픽 광원을 계산합니다.\n"
-"일부 비율(GPU힘에 달림)로 에뮬레이션 속도를 감소시킵니다.\n"
-"이것은 보통 안전한 향상입니다, 하지만 때때로 이슈들을 유발할지도 모릅니다.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"모르겠으면, 언체크 상태로 두세요."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "%02x 연결핸들에 의해 위모트를 찾을 수 없음"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "DVD_플러그인 - DVD-인터페이스에서 읽을 수 없음: 치명적 에러"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "취소"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "%s를 열수 없음"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "이벤트들 미해결을 지닌 이벤트들을 등록하지 않을 수 없음"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"그 파일을 메모리 카드로 사용할 수 없습니다.\n"
-"%s\n"
-"는 유효한 게임큐브 메모리 카드 파일이 아닙니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"그 파일을 메모리 카드로 사용할 수 없음.\n"
-"둘다의 슬롯들에 같은 파일을 사용하려 합니까?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "카탈로니아어"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "중앙"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "변경"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "디스크 변경(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "디스크 변경"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "게임 변경"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1026,102 +1055,90 @@ msgstr ""
 "유저 인터페이스의 언어를 변경.\n"
 "재시작이 요구됨."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "표시를 z원거리 파라미터로 변경 (정정 후에)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "표시를 z근거리 파라미터로 변경 (정정 후에)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "에뮬레이터가 작동하고 있는 동안에 이 변경은 효과가 없을 겁니다!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "채팅"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "치트 코드"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "치트 찾기"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "치트들 관리자"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "파티션 완전성 체크"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "파티션 완전성 체크중..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "중국어 (간소화)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "중국어 (전통)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "DVD 루트 디렉토리 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "NAND 루트 디렉토리 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "디폴트 ISO 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "추가할 디렉토리 선택"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "열려는 파일 선택"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "메모리 카드 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "앱로더로 사용할 파일을 선택: (디렉토리들로만 구성된 디스크들에게만 적용됨)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "압축해제할 폴더를 선택"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "서클 스틱"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "클래식"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "깨끗이"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1129,183 +1146,230 @@ msgstr ""
 "게임이 구동되는 중에 클라이언트 연결해제됨!! 넷플레이 불가능. 수동으로 게임"
 "을 중지해야합니다."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "닫기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "환경설정(&n)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "코드 정보"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "코드:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "명령"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "주석"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "주석:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "ISO 압축..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "선택된 ISO들 압축..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "ISO 압축하기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr " 환경  "
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "환경설정"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "컨트롤 설정"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "패드들 설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "환경설정..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "파일 덮어쓰기 확정"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "중지시 확인"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "연결"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "밸런스 보드 연결"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "USB 키보드 연결"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "위모트 %i 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "위모트 1 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "위모트 2 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "위모트 3 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "위모트 4 연결"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "연결중..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "콘솔"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "반복 스캔하기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "컨트롤"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "GCI 로 변환"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "복사 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "메모리카드 %c 에 복사"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "코어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "%s 를 생성할 수 없었습니다"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "백엔드 %s 를 초기화할 수 없었습니다"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"\"%s\"를 읽을 수 없었습니다.  드라이브안에 디스크가 없음, 혹은 그것은 GC/Wii "
-"백업이 아님. 본래의 게임큐브와 Wii 디스크들은 대부분의 PC DVD 드라이브들에서 "
-"읽어질 수 없음을 아세요."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "%s ISO 파일을 인식할 수 없었습니다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "%s 를 저장할 수 없었습니다"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1324,11 +1388,19 @@ msgstr ""
 "에뮬레이터 디렉토리를 이동한 후에 이 메시지를 받고 있나요?\n"
 "그렇다면, 옵션에서 메모리카드 위치를 재지정해야 할겁니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "확장자 'ini'에 대한 열린 명령을 발견할 수 없었습니다!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1336,38 +1408,46 @@ msgstr ""
 "코어를 초기화할 수 없었습니다\n"
 "당신의 환경설정을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "카운트:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "국가:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "AR 코드 생성"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "새로운 관점 생성"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "만든이:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "치명적"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "자르기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1377,200 +1457,191 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "wxFileSelector후에 현재 디렉토리가 %s에서 %s로 변경됨!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "사용자 지정 프로젝션 핵:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "사용자 지정 프로젝션 핵 설정"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "일부 정 투영 파라미터들을 커스터마이즈."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "체코"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-패드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "오디오"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP 에뮬레이터 엔진"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE 에뮬레이션 (빠름)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE 인터프리터 (느림)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE 리컴파일러"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "DSP 설정"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD 루트:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVD저수준읽기 - 치명적 에러: 볼륨에서 읽기를 실패했습니다"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVD저수준비암호화읽기 - 치명적 에러: 볼륨에서 읽기를 실패했습니다."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "댄스 매트"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "데이터 크기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "날짜:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro 파일들(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "데드 존"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "디버그"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "디버깅"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "10진수의"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "ISO 압축해제..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "선택된 ISO들 압축해제..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "ISO 압축해제하기"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "프레임 제한 감소"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "기본"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "기본 ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "기본 폰트"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "삭제"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "저장 지우기"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "기존 '%s'파일을 삭제합니까?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "설명"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "감지"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"출력 버퍼 안에 적합한 것보다 더 많은 데이터 읽기 시도가 감지되었습니다. 고정"
-"(Clamp)."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "장비"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "장비 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "다이얼"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1578,20 +1649,23 @@ msgstr ""
 "디렉토리 체크섬이 실패했습니다\n"
 " 그리고 디렉토리 백업 체크섬이 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "비활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "목적지 알파 비활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "안개 끔"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1605,257 +1679,213 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"\"EFB 복사\" 에뮬레이션을 비활성합니다.\n"
-"이들은 종종 후-처리나 텍스처로 렌더 효과들에 사용됩니다, 그래서 이 세팅을 체"
-"크하면 대단한 속도향상을 가져오지만 그것은 거의 항상 이슈들도 유발합니다.\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"다양한 그래픽 효과들을 위해 많은 게임들에서 사용되는, 목적지 알파라 불리는 하"
-"드웨어 특성의 에뮬레이션을 비활성화합니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "디스크"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "디스크 읽기 에러"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "화면표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"에뮬레이터에서 읽혀진 입력들을 표시합니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "나누기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "돌비 프로 로직 II 디코더"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "돌핀"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "돌핀 %s 그래픽 환경설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "돌핀 웹 사이트(&W)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "돌핀 환경설정"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "돌핀 에뮬된 위모트 환경설정"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "돌핀 FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "돌핀 GC패드 환경설정"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "돌핀 TAS 동영상 (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "돌핀 위모트 환경설정"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "돌핀 구글 코드(&G)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"돌핀이 어느 GC/Wii ISO도 찾을 수 없었습니다. 파일을 둘러보려면 여기를 더블클"
-"릭하세요..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"돌핀이 현재 모든 게임들을 숨기게 설정됨. 모든 게임들을 보려면 여기를 더블클"
-"릭..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "돌핀이 요청된 액션을 완수할 수 없었습니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"에뮬된 GPU 클럭 속도를 두배로 합니다. 일부 게임들이 빨라질지도 (켬 = 빠름, "
-"끔 = 호환성)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "아래"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "코드(WiiRD 데이터베이스) 다운로드"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu 코드들이 다운로드됨. (추가된 %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "드럼"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "더미"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "오디오 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "EFB 타겟 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "프레임들 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "텍스처들 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"모든 렌더된 프레임들을 User/Dump/Frames/안에 AVI 파일로 덤프합니다\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"User/Dump/Textures/<game id>/ 에 디코드된 게임 텍스처들을 덤프합니다\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"User/Dump/Textures/로 EFB 복사의 내용을 덤프합니다\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "네덜란드어"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "종료(&x)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB 복사"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1867,56 +1897,40 @@ msgstr ""
 "-- 최근에 돌핀 배포를 업그레이드했다면, 윈도우즈가 새로운 드라이버를 인식하"
 "는 관점에서 재부팅이 필요할 겁니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "유럽"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "빠른 메모리 업데이트"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "편집"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "액션리플레이 코드 편집"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "환경 편집"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "패치 편집"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "현재 관점 편집"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "편집..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "효과"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "내장형 프레임 버퍼"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "에뮬 쓰레드가 이미 구동중임"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1930,7 +1944,7 @@ msgstr ""
 "\n"
 "모르겠으면, 대신에 \"가상 XFB 에뮬레이션\"을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1946,120 +1960,92 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "에뮬된 위모트"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "에뮬레이션 상태:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "활성"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"당신의 GPU에서 지원되면  엔비디아 3D 비전 기술을 사용한 입체영상을 통해 3D 효"
-"과들을 활성화합니다.\n"
-"아마도 이슈들을 일으킵니다.\n"
-"작동하려면 전체화면이 요구됩니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "AR 로깅 활성"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "블록 합치기 활성"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "바운딩 박스 계산 켜기"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "캐쉬 활성"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "치트 활성"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "듀얼 코어 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "듀얼 코어 활성 (속도상승)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "아이들 스킵 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "아이들 스킵 활성 (속도상승)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "MMU 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "프로그레시브 스캔 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "스크린 세이버 활성"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "스피커 데이터를 켭니다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "와이드스크린 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "와이어프레임 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"비등방성 필터링 활성.\n"
-"비스듬한 보기 각도들에 있는 텍스처들의 비주얼 품질을 향상시킨다.\n"
-"소수 게임에서 이슈들을 일으킬지도 모른다.\n"
-"\n"
-"모르겠으면, 1x를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"빠른 디스크 엑세스 활성. 일부 게임들에서 요구됨. (켬 = 빠른, 끔 = 호환성)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "페이지 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2071,7 +2057,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2083,33 +2069,25 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"The Legend of Zelda: Twilight Princess를 속도를 올리려면 켬. 다른 게임을 위해"
-"서는 끔."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "사용자 지정 프로젝션 핵 활성화"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OSX에서는 않됨."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔드 전"
-"용."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2121,13 +2099,17 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "일부 게임들에 필요한 메모리 관리 유닛 활성. (켬 = 호환성, 끔 = 빠름)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2137,50 +2119,61 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "끝"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "영어"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "향상"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "새로운 관점을 위한 이름을 입력하세요:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "엔트리 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "엔트리 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "같음"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "에러"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2189,7 +2182,7 @@ msgstr ""
 "에러: \"%s\" 뒤에, %d (0x%X)를 발견 %d (0x%X) 세이브 표시 대신에. 상태저장 로"
 "드를 취소합니다..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2198,218 +2191,191 @@ msgstr ""
 "에러: %s 폰트들을 접근 시도함 하지만 그것들은 로드되지 않습니다. 게임들이 올"
 "바르게 폰트들을 보여주지 않을 수 있다, 혹은 깨짐."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "유포리아"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "예외 핸들러 - 메모리 공간 아래를 접근. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "실행"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "나가기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
-msgstr ""
+msgstr "모든 Will 저장들 내보내기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "내보내기 실패했습니다"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "파일 내보내기"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "(입력) 기록 내보내기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "(입력) 기록 내보내기..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "저장 내보내기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Wii 저장 내보내기 (실험적)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "모든 저장들을 내보내기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr ""
+msgstr "내보내기 실패"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "저장을 다른 이름으로 내보내기..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "확장"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "외부 프레임 버퍼"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "추가 매개변수"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "추가 매개변수는 ''Metroid: Other M''에서만 유용합니다."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "모든 파일들 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "앱로더 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOL 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "디렉토리 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "파일 압축 풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "파티션 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "모든 파일들 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "디렉토리 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "압축풀기..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO 바이트"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO 플레이어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "프랑스"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST 크기:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "연결에 실패했습니다!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "코드들 다운로드에 실패했습니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "%s로 압축풀기 실패했습니다!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"DSP 롬을 로드하는 데 실패했습니다:\t%s\n"
-"\n"
-"이 파일은 DSP LLE 사용에 요구됩니다.\n"
-"그것은 저작권 데이터를 포함해서 돌핀에는 포함되지 않습니다.\n"
-"물리적 콘솔에서 그 파일을 덤프하기위해 DSPSpy를 사용하세요.\n"
-"\n"
-"롬 덤프들을 요구하지 않는 DSP HLE 엔진을 사용할 수도 있습니다.\n"
-"(환경설정의 \"오디오\" 탭에서 그것을 선택하세요.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"bthprops.cpl 로드에 실패했습니다! 리얼 위모트 연결이 작동하지 않습니다 그래"
-"서 돌핀이 갑자기 깨질지도 모릅니다!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"hid.dll 로드에 실패했습니다! 리얼 위모트 연결이 작동하지 않습니다 그래서 돌핀"
-"이 갑자기 깨질지도 모릅니다!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "%s 읽기에 실패"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "banner.bin 읽기에 실패했습니다"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "bk 헤더 읽기에 실패했습니다"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"저장 데이터의 %d 블럭 읽기에 실패했습니다\n"
-"메모리카드가 잘렸을 지도\n"
-"파일위치:%llx"
+"저장 데이터의 %d 블럭 읽기를 실패했습니다\n"
+"메모리카드가 잘렸을 지도 모릅니다\n"
+"파일위지:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2417,7 +2383,7 @@ msgstr ""
 "블럭 할당 테이블 백업을 올바르게 읽기에 실패했습니다\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2425,17 +2391,12 @@ msgstr ""
 "블럭 할당 테이블을 올바르게 읽기에 실패했습니다\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "%d 파일로 부터 데이터 읽기 실패"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "파일: %s 에서 데이터 읽기에 실패했습니다"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2443,7 +2404,7 @@ msgstr ""
 "디렉토리 백업을 올바르게 읽기에 실패했습니다\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2451,11 +2412,7 @@ msgstr ""
 "디렉토리를 올바르게 읽기에 실패했습니다\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "헤더 읽기에 실패했습니다"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2463,50 +2420,35 @@ msgstr ""
 "해더를 올바르게 읽기에 실패했습니다\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "디스크 이미지로 부터 유일한 ID를 읽기에 실패했습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "BT.DINF를 SYSCONF로 쓰기에 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "bkhdr를 쓰기에 실패"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "%s 에 대한 헤더 쓰기에 실패"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "페르시아어"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "빠름"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "빠른 깊이 계산"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "MMU의 빠른 버전. 모든 게임에 대해 작동하지는 않는다."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2514,23 +2456,27 @@ msgstr ""
 "치명적 비동기. 재생을 중단합니다. (PlayWiimote에서 에러: %u != %u, byte "
 "%u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "FIFO 플레이어"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "파일 정보"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "파일이 코드를 지니지 않었습니다."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "파일이 .gci 로 변환되었습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2538,7 +2484,7 @@ msgstr ""
 "파일을 열 수 없었습니다\n"
 "혹은 적합한 확장자가 아닙니다"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2547,94 +2493,93 @@ msgstr ""
 "파일이 확장자 \"%s\"를 가집니다\n"
 "적합한 확장자들은 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "파일이 메모리카드로 인식되지 않는다"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "파일이 압축되지 않었습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: 알려지지 않은 열기 모드: 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "파일시스템"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "'ini'파일타입은 알려지지 않음! 열지 않겠습니다!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "다음 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "이전 찾기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "첫번째 블럭"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "체크섬들 고침"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "강제 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "강제 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "콘솔을 NTSC-J로 강제시킴"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "강제 텍스처 필터링"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"게임이 명백히 그것을 껐더라도 텍스처 필터링을 강제시킨다.\n"
-"텍스처 품질을 향상시킨다 하지만 일부 게임들에서는 결함들을 유발한다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"와이드스크린 해상도 그래픽을 출력하게 게임을 강제시킵니다.\n"
-"일부 게임에서 그래픽 결함을 유발합니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-" 일본 롬 폰트를 사용하기 위해 NTSC-J 모드를 강제시킵니다.\n"
-"언체크로 두면, 돌핀 기본은 NTSC-U 이고 일본 게임들을 플레이할 때 자동적으로 "
-"이 세팅이 활성화됩니다."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2642,552 +2587,579 @@ msgstr ""
 "ascii (NTSC\\PAL)로 포멧?\n"
 "sjis (NTSC-J)에 대해서 선택하지 마세요"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "앞으로"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "앞 포트(UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "%d 개 찾았습니다 '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
+#, c-format
+msgid "Found %u save files"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "프레임"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "프레임"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "프레임 진행"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "프레임 덤프가 FFV1를 사용"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "프레임 정보"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "프레임 범위"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "프레임 스킵(&k)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "프레임제한:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "녹화할 프레임"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "자유로운 보기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "프랑스어"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "프렛들"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "From"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "전체화면"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "전체화면 해상도:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI 파일(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC패드"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "게임 ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "게임이 이미 구동중입니다!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "게임이 구동중이지 않습니다!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "게임이 없습니다!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "게임-상세 설정"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "게임환경"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "게임큐브 게임저장 파일(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "게임큐브"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "게임큐브 패드 설정(&P)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "게임큐브 패드 설정"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko 코드"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Gecko코드가 (CT%i CST%i) (%s) 구동에 실패했습니다\n"
-"(잘못된 코드이거나 코드 타입이 아직 지원되지 않습니다. codehandler.bin 파일"
-"을  Sys 폴더에 위치시키고 돌핀을 재시작해서 원본 코드 핸들러를 사용해보세요.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "일반"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "일반 설정"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "독일어"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: 인덱스가 ar 코드 리스트 크기 %lu 보다 더 큽니다 "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "그래픽"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "그래픽 설정"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "보다 큰"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"\"텍스처에 렌더\" 효과들을 사용하여 생성된 텍스쳐들의 질을 엄청나게 향상시킵"
-"니다.\n"
-"내부 해상도를 올리면 이 세팅의 효과를 향상시킵니다.\n"
-"성능을 약간 감소시키고 이슈를 아마도 유발할 수 있습니다 (예상 밖일지라도).\n"
-"\n"
-"모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "그리스어"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "초록"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "초록 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "초록 오른쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "기타"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "핵"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "헤더 체크섬 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "히브리어"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "높이"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "도움"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"하이,\n"
-"\n"
-"돌핀은 맥 OS X 10.7나 이상이 필요합니다.\n"
-"불행하게도 당신은 OS X의 옛 버전을 구동하고 계십니다.\n"
-"OS X 10.6을 지원하는 최종 돌핀 버전은 돌핀3.5 입니다\n"
-"최신 돌핀 버전을 사용하시려면 10.7이나 이상으로 업그레이드해주세요.\n"
-"\n"
-"사요나라!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"안녕,\n"
-"\n"
-"돌핀은 당신의 CPU가 SSE2 확장들을 지원하길 요구합니다.\n"
-"유감스럽게도 당신의 CPU는 그들을 지원하지 않습니다, 그래서 돌핀은 구동하지 않"
-"을 겁니다.\n"
-"\n"
-"사요나라!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "숨김"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "마우스 커서 숨김"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"에뮬레이션 윈도우 위에 마우스 커서가 있을 때 숨깁니다.\n"
-"\n"
-"모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "홈"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "호스트"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "단축키 설정"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "단축키들"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "헝가리어"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "하이브리드 위모트"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: 알려지지 않은 티켓: %08x/%08x 에서 데이터를 얻으려 시도했"
 "습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: 게임이 IOS나 낸드 덤프에 적합하지 않은 타이틀을  리로드 시도"
-"했습니다\n"
-"TitleID %016llx.\n"
-"돌핀은 이제 멈추려할 것입니다."
+"IOCTL_ES_LAUNCH: 게임이 낸드 덤프에 적합하지 않은 타이틀을 리로드 시도했습니"
+"다\n"
+"TitleID %016<PRIx64>.\n"
+"돌핀은 이제 멈추게 될 것입니다."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - 잘못된 대상"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR 포인터"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR 감도:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO 세부사항"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO 디렉토리들"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "이탈리아"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "아이콘"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"체크하면, 바운딩 박스 레지스터들이 업데이트될 것입니다. Paper Mario 게임들에"
-"서 사용됩니다."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "포멧 변경들을 무시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"EFB 포멧에 모든 변경들을 무시합니다.\n"
-"네거티브 효과 없는 많은 게임들에서 성능을 향상시킵니다. 소수 다른 게임들에서 "
-"그래픽 결함을 유발하긴 합니다.\n"
-"\n"
-"모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"EFB에서 읽거나 쓰는 CPU의 모든 요구들을 무시합니다.\n"
-"일부 게임들에서 성능을 향상시킵니다, 하지만 일부 게임플레이관련 특성들이나 그"
-"래픽 효과들이 비활성화 될지 모릅니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "저장을 가져오기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr ""
+msgstr "Wii 저장 가져오기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr ""
+msgstr "가져오기 실패"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"가져온 파일은 gsc 확장자를 가진다\n"
-"하지만 올바른 헤더를 가지고 있지 않습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "가져온 파일이 비적합 길이를 가지고 있습니다"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"가져온 파일이 sav 확장자를 지닌다\n"
-"하지만 올바른 해더를 지니지 않는다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "게임안"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "프레임 제한 증가"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "정보"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "정보"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "입력"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "삽입"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "암호화되거나 암호해독된 코드를 여기에 삽입하세요..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SD 카드 삽입"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "이름을 여기에 넣으시오..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "WAD 설치"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Wii 메뉴에 설치"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
-"니다."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "WAD 설치하기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "완전성 체크 에러"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "완전성 체크 완료됨"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "완전성 체크가 완료되었습니다. 에러가 발견되지 않었습니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"파티션 %d 에 대한 완전성 체크가 실패하였습니다. 당신의 덤프가 오염되었거나 잘"
-"못 패치된 것 같습니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "인터페이스"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "인터페이스 설정"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "내부 LZO 에러 - 압축 실패했습니다"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3196,103 +3168,106 @@ msgstr ""
 "내부 LZO 에러 - 압축해제 실패했습니다 (%d) (%li, %li) \n"
 "상태 로딩을 다시 해보세요"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "내부 LZO 에러 -  lzo_init() 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "내부 해상도:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "인터프리터 (매우 느림)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "소개화면"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "비적합 크기(%x) 혹은 마법 낱말 (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "비적합 값!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "비적합 bat.map 혹은 디렉토리 엔트리"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
-msgstr "비적합 이벤트 타입 %i"
+msgstr "부적합한 이벤트 타입 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
-msgstr "비적합 파일"
+msgstr "부적합 파일"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"비적합 opening.bnr이 gcm: 에서 발견됨:\n"
-"%s\n"
-" 당신은 이 게임을 리덤프해야할 지도."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
-msgstr "비적합 기록 파일"
+msgstr "부적합 기록 파일"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
-msgstr "비적합 찾기 파라미터 (선택된 오브젝트 없음)"
+msgstr "부적합한 찾기 파라미터 (선택된 오브젝트 없음)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
-msgstr "비적합 찾기 스트링 (숫자로 변환될 수 없었습니다)"
+msgstr "부적합한 찾기 스트링 (숫자로 변환될 수 없었습니다)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
-msgstr "비적합 찾기 스트링 (짝수 길이 스트링만 지원됩니다)"
+msgstr "부적합한 찾기 스트링 (짝수 길이 스트링만 지원됩니다)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "비적합 상태"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "이탈리아어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "일본"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT 리컴파일러 (권장)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL 실험적 리컴파일러"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "일본어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "한국"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3302,64 +3277,75 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "윈도우를 맨위로 유지"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "        [ 키 ]"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "한국어"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L 버튼"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-아날로그"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "언어:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "최근 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "지연:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "왼쪽 스틱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"단축키를 감지하려면 좌 클릭하세요.\n"
-"지우려면 스페이스를 입력하세요."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3369,7 +3355,7 @@ msgstr ""
 "중-클릭 지우기.\n"
 "우-클릭 더 많은 옵션들."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3377,202 +3363,211 @@ msgstr ""
 "좌/우-클릭 옵션들 더.\n"
 "중-클릭 지우기."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "보다 더 적은"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "FPS로 제한"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "로드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "커스텀 텍스처 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "최근 1 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "최근 2 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "최근 3 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "최근 4 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "최근 5 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "최근 6 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "최근 7 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "최근 8 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "슬롯1 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "최근 10 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "슬롯2 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "슬롯3 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "슬롯4 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "슬롯5 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "슬롯6 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "슬롯7 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "슬롯8 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "최근 9 상태 로드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "상태 로드..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wii 시스템 메뉴 로드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii 시스템 메뉴 %d %c 로드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"User/Load/Textures/<game id>/ 에서 커스텀 텍스처들을 로드\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "핵 패턴들로 부터 사용 가능한 사전설정 값을 로드합니다."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "로그"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "로그 환경설정"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "FPS를 파일에 기록"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "로그 타입"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"초당 렌더되는 프레임 수치를 User/Logs/fps.txt 에 기록합니다. 돌핀의 성능을 측"
-"정하고 싶을때 이 기능을 사용하세요.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "로거 출력"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "로깅"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "서버에 연결을 잃어버림!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M 버튼"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 미스매치\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU 스피드 핵"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz 게임샤크 파일들(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "메인 스틱"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "제작사 ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "제작사:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3587,29 +3582,33 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "최대값"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "메모리카드가 이 타이틀에 대해 저장을 이미 가짐"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "메모리카드가 이미 열려짐"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "메모리 바이트"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "메모리 카드"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3617,7 +3616,7 @@ msgstr ""
 "메모리 카드 메니저 경고-사용하기 전에 백업을 만드세요, 고쳐져야 겠지만 훼손"
 "될 수 있습니다."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3634,37 +3633,52 @@ msgstr ""
 "%s로\n"
 "오래된 파일을 이 새로운 위치로 복사하고 싶습니까?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "메모리카드 파일크기가 헤더 크기와 불일치합니다"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "메뉴"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "마이크"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "최소값"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "기타"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "기타 설정"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "수정자"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3676,20 +3690,24 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "단일띄어쓰기 폰트"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "모션 플러스"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "모터"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3707,332 +3725,305 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "곱하기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "알림: 스트림 사이즈가 실제 데이터 길이와 매치되지 않습니다\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP 덧셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP 시작"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP 10진수"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP 삭제"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP 나누기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP 아래"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP 끝"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP 엔터"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP 같은"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP 홈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP 삽입"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP 왼쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP 곱셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP 페이지 다운"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP 페이지 업"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP 오른쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP 분리기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP 스페이스"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP 뺄셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP 탭"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP 위"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "이름:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "이름:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "원본 GCI 파일들(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "새로운 스캔"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "다음 페이지"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "다음 스캔"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "별명 :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "국가 없음 (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "ISO나 WADS가 없음"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
-msgstr "오디오 출력이 없습니다"
+msgstr "오디오 출력 없음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "%s 타이틀에 대한 배너 파일이 없음"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "적합한 상세설명 없음"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "도킹 없음"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "로드된 파일이 없음"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "빈 디렉토리 목록 엔트리들이 없음"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "녹화된 파일이 없음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "%s 타이틀에 대한 저장 폴더가 없음"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "없음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "노르웨이 북몰어"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "같지 않음"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "설정 안함"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "Wii 저장이 아니거나 파일 헤더 크기 %x 에 대한 읽기 실패 "
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "연결되지 않음"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "참고 사항"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "참고:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "알림"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "코드 번호:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "눈처크"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "눈처크 가속"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "오브젝트"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "오브젝트 범위"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "끔"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "오프셋:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "온-스크린 메시지 보여주기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr ""
+msgstr "온라인 &문서"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "%d 블럭들만 유용한"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "열기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "담고 있는 폴더 열기(&c)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Wii 저장 폴더 열기(&s)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "파일 열기..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: %s 장치에 대한 맥락(context)을 만들 수 없음"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: 사운드 장치들을 찾을 수 없음"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: %s 장치를 열 수 없음"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL 텍스처 디코더"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP 텍스처 디코더"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
+"외부 텍스트 에디터로 이 게임에 대한 디폴트 (읽기-전용) 환경설정을 엽니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "옵션"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "주황"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4042,345 +4033,326 @@ msgstr ""
 "우클릭하시고 모든 세이브들을 내보네세요,\n"
 "그리고 새로운 메모리카드로 세이브들을 가져오세요\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "다른 것들"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"게임이 구동되는 중에 다른 클라이언트가 연결해제됨!! 넷플레이 불가능됨. 수동으"
-"로 게임을 중지하라."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "출력"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "(입력) 기록 재생(&l)..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "패드"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "패드"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "패드들"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "페이지 다운"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "페이지 업"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "단락"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "매개변수들"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "파티션 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "파티션이 존재하지 않습니다: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "패치"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "경로"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "일시정지"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "무비의 끝에서 멈추기"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "픽셀단위 광원"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "완벽한"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "관점 %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr " 실행  "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "(입력) 기록 재생"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "실행/일시정지"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "플레이가능"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "재생 옵션"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "플레이어"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "확인해주세요..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "저장하기전에 관점을 생성해 주세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "플러스-마이너스"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "폴란드어"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "포트 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "포트 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "포트 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "포트 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "포트:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "포르투갈어"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "포르투갈어 (브라질)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "후-처리 효과:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "PlayController에 영상마무리가 미완성되었습니다. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "사전설정:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "이전 페이지"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "이전 페이지"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "이전 값"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "프린트"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "프로파일"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "속성"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
-msgstr "캐쉬 제거(Purge)"
+msgstr "캐쉬 제거"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "질문"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "종료"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R 버튼"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-아날로그"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "램"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "러시아"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "반지름"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "범위"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "읽기-전용 모드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "실제"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "리얼 밸런스 보드"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "실제 위모트"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "리얼 위모트"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "녹화"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
-msgstr ""
+msgstr "입력 녹화"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "녹화 정보"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "녹화 옵션"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "빨강"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "빨강 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "빨강 오른쪽"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"3D 그래픽들을 레스터화함으로 유발되는 앨리어싱의 양을 줄입니다.\n"
-"이것은 렌더된 그림이 덜 블럭져 보이게 합니다.\n"
-"심각하게 에뮬레이션 속도를 감속시키고 때때로 이슈들을 유발합니다.\n"
-"\n"
-"모르겠으면, 없음을 선택하세요."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "갱신"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "목록 새로 고침"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "게임 목록 새로 고침"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "제거"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4390,242 +4362,320 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "메인 윈도우에 렌더"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "리셋"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "결과"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "개정판:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "오른쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "오른쪽 스틱"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "진동"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "러시아어"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "상태 저장(&v) "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "안전"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "저장"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "다른 이름으로 GCI 저장..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "가장 오래된 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "슬롯1 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "슬롯 10 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "슬롯2 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "슬롯3 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "슬롯4 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "슬롯5 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "슬롯6 상태 저장 "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "슬롯7 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "슬롯8 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "슬롯 9 상태 저장"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "상태 저장..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "압축된 GCM/ISO를 저장"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "현재 관점을 저장"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "압축풀린 GCM/ISO를 저장"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "스케일된 EFB 복사"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "스캐닝 %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "ISO들을 검사하기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "스캐닝..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "스크린샷"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "스크롤 락"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "찾기"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "필터 찾기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "하위폴더들 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "최근 오브젝트 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "헥스 값 찾기:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "기록 파일 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "설치할 Wii WAD 파일 선택"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"사용할 하드웨어 어댑터를 선택하세요.\n"
-"\n"
-"의심 스러울 때는, 처음 것을 사용하세요."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "가져올 저장 파일을 선택"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "유동적인 윈도우즈 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "로드할 파일 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "저장 파일을 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "로드할 상태 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "저장할 상태 선택"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4643,270 +4693,291 @@ msgstr ""
 "\n"
 "모르겠으면, 자동을 선택하세요."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "선택된 컨트롤러 프로파일이 존재하지 않습니다"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "선택된 폰트"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"전체화면 모드에서 사용될 화면표시 해상도를 선택하세요.\n"
-"이것은 내부 해상도보다 더 크거나 같아야합니다. 성능 영향은 무시해도 될 정도입"
-"니다.\n"
-"\n"
-"모르겠으면, 데스크탑 해상도를 사용하세요.\n"
-"그래도 모르겠으면, 작동하는 최고 해상도를 사용하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"내부적으로 사용할 그래픽 API를 선택합니다.\n"
-"Direct3D 9은 보통 가장 빠릅니다. OpenGL이 더 정확하긴합니다. Direct3D 11은 "
-"둘 사이쯤 입니다.\n"
-"Direct3D 백엔드들은 윈도우즈들에서만 이용할 수 있다는 것을 알아두세요.\n"
-"\n"
-"모르겠으면, Direct3D 11을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"내부적으로 어떤 그래픽 API를 사용할지 선택합니다.\n"
-"Direct3D 9은 보통 가장 빠릅니다. OpenGL은 더 정확하긴 합니다. Dirct3D 11은 "
-"둘 사이 어딘가입니다.\n"
-"Direct3D 백엔드들은 윈도우즈들에서만 이용할 수 있다는 것을 알아두세요.\n"
-"\n"
-"모르겠으면, Direct3D 9을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "보내기"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "센서 바 위치:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "분리자"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "세르비아어"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "시리얼 포트 1 - 이것은 넷 어댑터같은 디바이스가 사용하는 포트이다"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "디폴트 ISO로 설정(&d)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "기본 메모리카드 %c 로 설정"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: 목록이 ar 코드 목록 크기 %lu 보다 더 큽니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"지연(ms 단위로)을 설정합니다. 더 높은 값은 오디오 튐을 줄일 지도 모릅니다. "
-"OpenAL 백엔드 전용."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "설정..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "흔들기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "단축 이름:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "숄더 버튼"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "콘솔 보기(&C)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "로그 보기(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "상태바 표시(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "툴바 표시(&T)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
-msgid "Show Defaults"
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
+msgid "Show Defaults"
+msgstr "디폴트 보여주기"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "드라이브 표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "EFB 복사 영역"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "FPS 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "프랑스"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "게임큐브"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "입력 표시 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "이탈리아"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "JAP (일본 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "한국"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "언어 보기:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "로그 환경설정(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL (유럽 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "플랫폼 표시"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "지역 표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "통계들"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "타이완"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "USA (미국 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "게임을 멈추기 전에 확인 상자 보여주기."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"잠재적으로 심각한 에러가 발생했을 때 메시지 박스를 보여줍니다.\n"
-"이것을 끄면 짜증나고 심각하지 않은 메시지들을 피할 수도 있습니다, 하지만 그것"
-"은 돌핀이 전혀 설명 없이 갑자기 고장난다는 것을 의미할 수도 있습니다."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "첫번째 블럭 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "랙 계측기 보여주기"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"에뮬레이션 화면상에 메시지들을 보여줍니다.\n"
-"이 메시지들은 메모리 카드 쓰기, 비디오 백엔드와 CPU 정보, 그리고 JIT 캐시 비"
-"우기를 포함합니다."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "저장 블럭들 보기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "저장 주석 보기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "저장 아이콘 보기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "저장 타이틀 보기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4917,83 +4988,82 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "알려지지 않음"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"다양한 통계들을 보여줍니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "사이드웨이 위모트"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "간소화 중국어"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "크기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "바이오스 스킵"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "DCBZ 청소 건너뛰기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "CPU로 부터 EFB 엑세스를 스킵"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"에뮬레이션 정확도를 만족시킴으로 \"EFB를 램에 복사\"를 조금 속도향상시킵니"
-"다.\n"
-"때때로 비주얼 퀄리티도 향상시킵니다.\n"
-"어느 이슈를 겪는다면, 텍스처 캐쉬 정확도를 올려보거나 이 옵션을 끄세요.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "슬롯 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "슬롯 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "슬롯 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "스냅샷"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "소프트웨어 렌더러"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5004,153 +5074,173 @@ msgstr ""
 "디버깅 목적으로만 유용합니다.\n"
 "소프트웨어 렌더링을 활성을 정말 원합니까? 모르겠으면, '아니오'를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "사운드 설정"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "사운드 백엔드 %s는 적합하지 않습니다."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "사운드 버퍼 생성 실패했습니다: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "스페이스"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "스페인어"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "스피커 볼륨:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"렌더에 사용되는 해상도를 지정합니다. 고해상도는 비주얼 퀄리티를 향상시킬 것이"
-"지만 또한 꽤 성능에 버거울거고 특정 게임들에서는 결함을 유발할지도 모릅니"
-"다.\n"
-"\"640x528의 배수\" 는 \"윈도우 크기\"보다 좀 느리지만 더 적은 이슈들을 냅니"
-"다. 일반적으로 말해서, 낮은 내부 해상도일 수록, 더 나은 성능이 나올 것입니"
-"다.\n"
-"\n"
-"모르겠으면, 640x528를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "디스크 전송율 속도 상승"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "스퀘어 스틱"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "표준 컨트롤러"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "시작"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "넷플레이 시작(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "(입력) 기록 시작(&c)"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "(입력) 기록 시작"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "상태"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "상태 저장"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "운전대"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "스틱"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "중지"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"GPU 텍스처 오브젝트안의 EFB 복사들을 담습니다.\n"
-"이것은 그렇게 정확하지는 않습니다. 하지만 대부분의 게임에서 충분히 잘 작동하"
-"고 \"램에 EFB\"를 넘는 대단한 속도향상을 줍니다.\n"
-"모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "윈도우로 늘림"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "스트럼"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "빼기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "성공적으로 파일을 %s로 내보냈음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "세이브 파일들을 성공적으로 가져왔음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "스웨덴어"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "스윙"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "GPU 쓰레드 동기화"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5158,81 +5248,110 @@ msgstr ""
 "듀얼 코어 모드에서 랜덤 프리징들 막기를 돕기위해 GPU와 CPU 쓰레드들을 동기화"
 "합니다. (켬 = 호환성, 끔 = 빠름)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "시스템 언어:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "타이완"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS 입력"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "탭"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "탭 분리"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "테이블 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "테이블 오른쪽"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "스크린샷 찍기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "타루콩가 (봉고스)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "테스트"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "텍스처"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "텍스처 캐쉬"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "텍스처 포멧 오버레이"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD가 성공적으로 설치되었습니다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
-msgstr "그 주소는 비적합 입니다"
+msgstr "주소가 부적합 합니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "체크섬이 성공적으로 고쳐졌습니다"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "선택된 디렉토리는 이미 리스트에 있다"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5241,7 +5360,7 @@ msgstr ""
 "%s 파일이 이미 존재합니다.\n"
 "그것을 바꾸시겠습니까?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5250,44 +5369,33 @@ msgstr ""
 "%s 파일은 쓰기위해 열릴 수 없었습니다. 다른 프로그램에 의해 이미 열려져있는"
 "지 체크해주세요."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "%s 파일이 이미 열려 있었습니다, 파일 헤더는 기록되지 않을 것입니다."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "당신이 기술한 파일 (%s)는 존재하지 않습니다"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "이름은 비워둘 수 없습니다"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "이른은 ',' 문자를 포함할 수 없습니다"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "해독된 AR 코드 결과가 없습니다."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"이것을 안전하게 정할 수록, 에뮬레이터가 램으로 부터 텍스처 업데이트들을 덜 놓"
-"치는 경향이 있습니다.\n"
-"모르겠으면, 가장 오른쪽 값을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "당신이 복사하려는 저장은 비적합 파일 크기입니다."
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5295,36 +5403,48 @@ msgstr ""
 "선택된 언어는 당신의 시스템에서 지원되지 않습니다. 시스템 디폴트로 돌아갑니"
 "다."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "서버와 클라이언트의 넷플레이 버전들이 호환되지 않는다!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "서버가 가득참!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "서버가 응답했습니다: 그 게임은 현재 구동중이다!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "서버가 알려지지 않은 에러 메시지를 보냈음!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "기술된 \"%s\" 파일은 존재하지 않는다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
-msgstr "값이 비적합 합니다"
+msgstr "값이 부적합 합니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "테마:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5332,15 +5452,15 @@ msgstr ""
 "00000001/00000002에 대한 티켓이 있어야한다. 당신의 NAND 덤프는 아마도 미완성"
 "이다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 "이 설정들은 핵심 돌핀 설정들을 덮어씁니다.\n"
-"결정되지않은 것은 게임이 돌핀의 설정을 사용함을 뜻합니다."
+"결정되지 않은 것은 게임이 돌핀의 설정을 사용함을 뜻합니다."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5348,123 +5468,163 @@ msgstr ""
 "이 액션 리플레이 시뮬레이터는 액션 리플레이 스스로 수정한 코드를 지원하지 않"
 "는다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "이것은 Wii 메뉴와 일부 게임들에서 느려짐을 유발할 수 있다."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"이것은 게임의 카메라를 변경하도록 허용합니다.\\n\n"
-"회전하려면 마우스 오른쪽 버튼을 누른 상태로 마우스를 움직이시고 \n"
-"이동하려면 마우스 가운데 버튼을 누른 상태로 마우스를 움직이세요.\\n\n"
-"특정 스텝 거리로 카메라 이동을 하려면 쉬프트를 누른 상태로 WASD키들 중에 하나"
-"를 누르세요 (쉬프트+0 은 더 빠르게 쉬프트+9은 더 느리게 이동). 카메라를 리셋"
-"하려면 쉬프트+R을 누르세요.\\n\n"
-"\\n\n"
-"모르겠으면. 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"이것은 게임 스피드를 명시된 초당 프레임 수치로 제한합니다 (풀 스피드는 NTSC "
-"60 PAL 50 입니다). 대안으로, DSP (오디오 클릭들을 고치나 또한 게임에 따라서"
-"는 지속적인 노이즈를 유발할 수 있는)를 이용하는 오디오 병목을 사용합니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"이것은 비디오와 CPU 쓰레드들을 분리한다, 그래서 그들은 분리된 코어들 상에서 "
-"구동될 수 있다.\n"
-"두개 이상의 코어를 가진 PC들 상에서 주요 속도 향상들을 유발한다, 하지만 갑작"
-"스런 깨짐/결함들을 일으킬 수도 있다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "이것은 수동으로 INI 환경파일을 수정하게 해줄겁니다"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "한계점"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "기울기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "    제목"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "To"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "모든 로그 타입 토글"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "화면 비율 토글"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "EFB 복사 토글"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "안개 토글"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "전체화면 토글"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "IR 토글"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "위"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "전통 중국어"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "알려지지 않은 파일 타입을 로드시도했다."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "트리거"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
-msgid "Trying to read from invalid SYSCONF"
-msgstr "비적합 SYSCONF로 부터 읽기 시도"
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
+msgid "Trying to read from invalid SYSCONF"
+msgstr "부적합한 SYSCONF로 부터 읽기 시도"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5472,41 +5632,24 @@ msgstr ""
 "효한 SYSCONF에서 읽기 시도\n"
 "위모트 bt id들은 유용하지 않습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "터키어"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "턴테이블"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "타입"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP 포트:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP 위모트"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "알려지지 않음"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "알려지지않은_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "미국"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5514,196 +5657,179 @@ msgstr ""
 "주어진 값들에서 패치를 생성할 수 없습니다.\n"
 "항목이 수정되지 않았습니다."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"입력된 AR 코드의 %lu 라인을 적합한 암호화되거나 해독된 코드로 분석할 수 없습"
-"니다. 올바로 타이핑했는지 확인하세요\n"
+"입력된 AR 코드의 %u 라인을 적합한 암호화되거나 해독된 코드로 분석할 수 없습니"
+"다. 올바로 타이핑했는지 확인하세요\n"
 "이 라인을 무시하고 분석을 계속하겠습니까?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "정의되지 않은 %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "상태 로드 되돌림"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "상태 저장 풀기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "예상하지 못한 0x80 콜? 중단시킴..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "알려지지 않은"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "알려지지 않은 DVD 명령 %08x - 치명적 에러"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "알려지지 않은 명령 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "알려지지 않은 엔트리 타입 %i SYSCONF (%s@%x)안에!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "id : %d의 알려지지 않은 메시지를 받었다"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "위"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "업데이트"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "업라이트 위모트"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "EuRGB60 모드 (PAL60) 사용"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "전체화면 사용"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "16진수 사용"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "패닉 핸들러 사용"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"깊이 값들을 계산하기 위해 덜 적확한 알고리즘을 사용합니다.\n"
-"소수 게임들에서 이슈들을 유발하지만  괜찮은 속도증가를 줄것입니다.\n"
-"\n"
-"모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"텍스처를 디코드하기 위해 멀티 쓰레드를 사용합니다.\n"
-"속도향상될 겁니다 (특히 듀얼코어 이상의 CPU들 상에서).\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"보통 쉐이더 편집이 실패하면, 에러 메시지가 표시됩니다.\n"
-"그렇지만, 이 옵션 체크로 자유로운 게임플레이를 방해하는 팝업들을 스킵할 수 있"
-"습니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "유틸리티"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "수직-동기화"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam 스피드 핵"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "값"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "값:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "값:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "상세설명"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "버텍스 스트리밍 핵"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "비디오"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "가상"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "볼륨"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD 설치 실패했습니다: 에러 생성 %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD 설치 실패했습니다: 에러 생성 티켓"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5715,25 +5841,27 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "경고"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "경고 - 잘못된 콘솔 모드에서 DOL을 시작!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "경고 - 잘못된 콘솔 모드에서 ELF 시작!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "경고 - 잘못된 콘솔 모드에서 ISO 시작!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5744,7 +5872,7 @@ msgstr ""
 "%s\n"
 "계속하고 싶습니까?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5757,7 +5885,7 @@ msgstr ""
 "그리고 당신의 메모리카드에 파일로 같은 이름을 가집니다\n"
 "계속합니까?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5768,7 +5896,15 @@ msgstr ""
 "%u > %u). You should load another save before continuing, or load this state "
 "with read-only mode off."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5779,7 +5915,7 @@ msgstr ""
 "전에 다른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그"
 "렇지 않으면 아마도 싱크 어긋남이 생길겁니다."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5812,178 +5948,165 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - 파일이 열리지 않습니다."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "훼미"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "와이드스크린 핵"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "너비"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii 콘솔"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND 루트:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 저장 파일들 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: 파일로 부터 읽을 수 없었습니다"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "위모트"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "위모트"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "위모트 %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "위모트가 연결됨"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "위모트 모터"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "위모트 설정"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "위모트"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "윈도우즈 왼쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "윈도우즈 메뉴"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "윈도우즈 오른쪽"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "자동 줄바꿈"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "작동중..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "메모리카드를 기록합니다 (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "콘솔에 쓰기"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "디버거에 기록"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "파일에 쓰기"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "윈도우에 쓰기"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice 실패: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 초기화 실패: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 매스터 보이스 생성 실패: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF 레지"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "노랑"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"당신은 돌핀팀에 의해 만들어진 무료 DSP 롬을 사용하고 있습니다.\n"
-"모든 Wii 게임들은 올바르게 작동할 것입니다, 그리고 대부분의 GC 게임들도 잘 작"
-"동할 겁니다, 하지만 GBA/IPL/CARD UCode들은 작동하지 않을 겁니다.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"당신은 돌핀 팀에 의해 만들어진 무료 dsp 롬을 사용하고 있습니다.\n"
-"Zelda Ucode를 사용하는 게임들만이 올바르게 작동할 것입니다.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "당신은 페이지들을 가진 창을 닫을 수 없습니다."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "게임을 선택해야 합니다!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "이름을 넣어야 합니다!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "적합한 10진수나 16진수나 8진수 값을 넣어야 합니다."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "적합한 프로파일 이름을 넣어야 합니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "변경이 적용되려면 돌핀을 재시작 해야 합니다."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -5993,44 +6116,44 @@ msgstr ""
 "문제를 고치기위해 지금 중단하시겠습니까?\n"
 "\"아니오\"를 선택하면, 오디오가 왜곡될 지도 모릅니다."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
-"당신의 GCM/ISO 파일이 비적합(비적합 국가)인 것 같습니다.\n"
+"당신의 GCM/ISO 파일이 부적합(부적합 국가)인 것 같습니다.\n"
 "PAL 지역으로 계속합니까?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"SYSCONF 파일 크기가 잘못되어있습니다 \n"
-"0x%04x 이어야합니다 (하지만 0x%04llx 임) \n"
-"새로 생성하시겠습니까?"
+"당신의 SYSCONF 파일 크기가 틀립니다.\n"
+"0x%04x 이어야 합니다(하지만 0x%04<PRIx64> 입니다)\n"
+"새로운 것을 생성하시겠습니까?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP 핵"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 코드는 지원되지 않습니다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "돌핀에 알려지지 않은 Zero 코드: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ 대기 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6042,76 +6165,30 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[사용자 지정]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[실험적]\n"
-"OpenCL 프레임워크를 사용하는 GPU에 텍스처 디코딩을 없앰으로 에뮬레이션을 속도"
-"향상시킬 목적입니다.\n"
-"하지만, 지금 당장은 다양한 게임에서 텍스처 결함을 유발하는 것으로 알려집니"
-"다. 또한 대부분의 경우에서 정규 CPU 텍스처 디코딩보다 느립니다.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[실험적]\n"
-"화면표시 목록을 캐쉬함으로 에뮬레이션을 약간 속도향상시킵니다.\n"
-"이슈들을 일으킬 수 있지만.\n"
-"\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "앱로더 (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: %x 에서 옵코드 읽기. 보고해주세요."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "들"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "애플리케이션 구동상에서 wxExecute가 -1을 반환했습니다!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "z원거리 정정:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "z근거리 정정:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OR"
diff --git a/Languages/po/nb.po b/Languages/po/nb.po
index 23ae8fcade..dede3e2c16 100644
--- a/Languages/po/nb.po
+++ b/Languages/po/nb.po
@@ -1,19 +1,21 @@
-# Translation of dolphin-emu.pot to Norwegian Bokmaal
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# chriztr <chriztr@gmail.com>, 2013
-# KHRZ <e-k-nut@hotmail.com>, 2013
+# Christer Hansen <chriztr@gmail.com>, 2013
+# KHRZ <e-k-nut@hotmail.com>, 2013-2015
 # KHRZ <e-k-nut@hotmail.com>, 2011,2013
 # KHRZ <e-k-nut@hotmail.com>, 2011
+# Tokiko <tokikoenai@gmail.com>, 2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-17 20:01+0000\n"
-"Last-Translator: KHRZ <e-k-nut@hotmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/dolphin-"
 "emu/language/nb/)\n"
 "Language: nb\n"
@@ -22,475 +24,487 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
-msgid " (too many to display)"
-msgstr "(for mange å vise)"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
+msgid " (too many to display)"
+msgstr "(for mange til å vise)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Spill :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! IKKE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
-"\"%s\" eksisterer ikke.\n"
-" Lag et nytt 16MB Minnekort?"
+"\"%s\" finnes ikke.\n"
+"Opprett et nytt 16MB-minnekort?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
-msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO."
+msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller er ikke en GC/Wii-ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopier%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d samples"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d samples (kvalitetsnivå %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
-msgstr "%s eksisterer allerede. Overskriv?"
+msgstr "%s finnes allerede, overskriv?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s mislykket i å skrubbe. Sannsynligvis er bildefilen korrupt."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
-"%s mislyktes i å laste som et minnekort \n"
-" Minnekortstørrelse er ugyldig (0x%x byte)"
+"%s kunne ikke lastes som minnekort \n"
+"Kortfilstørrelse er ugyldig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
-"%s mislyktes i å laste som et minnekort \n"
-" Minnekortstørrelse ugyldig (0x%x byte)"
+"%s kunne ikke lastes som minnekort \n"
+"Kortstørrelse ugyldig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
-"%s mislyktes i å laste som et minnekort \n"
+"%s kunne ikke lastes som minnekort \n"
 " Minnekortstørrelse er for liten til å være et gyldig minnekort (0x%x byte)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s kunne ikke åpne"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s mislyktes: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s er en 0-byte fil"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s er allerede komprimert! Kan ikke komprimere videre."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s er for langt for et filnavn, maks antall tegn er 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSlett%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEksporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
-msgstr "%u Ledige Blokker; %u Ledige Dir Entries"
+msgstr "%u ledige blokker; %u ledige dir-oppføringer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& OG"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Om..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Start fra DVD-stasjon..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Brytepunkter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Søk etter ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Jukse&kode-manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Innstillinger for &DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Slett ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Slett merkede ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
-msgstr "&Emulasjon"
+msgstr "&Emulering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Fil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Bilde for bilde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Fullskjerm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Grafikkinstllinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Innstillinger for &hurtigtaster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "Åpne hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Minnekort Manager (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Minne"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Åpne..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Innstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Spill"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "Skrivebeskyttet-&modus"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Oppdater liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
-msgstr "&Restart"
+msgstr "&Tilbakestill"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Lyd"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "S&topp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Verktøy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "Vi&s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Innstillinger for &Wiikontroller"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(UKJENT)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(av)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ LEGG TIL"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Opprinnelig størrelse (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16-bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Opprinnelig størrelse (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Opprinnelig størrelse (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Opprinnelig størrelse (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32-bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Opprinnelig størrelse (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Opprinnelig størrelse (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8-bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Sett inn navn her>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Ingen oppløsning funnet>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Ingenting>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Trykk på en knapp>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Et NetPlay-vindu er allerede oppe!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Det kjøres ingen spill nå."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"En støttet bluetooth-enhet kunne ikke finnes.\n"
-" Du må manuelt koble til dine WiiMote-er."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ADVARSEL:\n"
-"\n"
-"\n"
-"\n"
-"Netplay vil kun fungere under følgende innstillinger:\n"
-"\n"
-"- Tillat Dobbelkjerne [AV]\n"
-"\n"
-"- DSP emulator motor må være det samme på alle datamaskiner!\n"
-"\n"
-"- DSP på Dedikert CPU-tråd [AV]\n"
-"\n"
-"- Bilde-pr-sekund-begrensning: IKKE satt til [Audio]\n"
-"\n"
-"\n"
-"\n"
-"Alle spillere bør bruke den samme Dolphin-versjonen og innstillinger.\n"
-"\n"
-"Alle minnekort må være identiske mellom spillerne, eller deaktivert.\n"
-"\n"
-"Wiimote-støtte har enda ikke blitt implementert!\n"
-"\n"
-"\n"
-"\n"
-"Hosten må ha valgt TCP-port åpen/forwarded!\n"
-"\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "<AR-koder>"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Om Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Aksellerasjon"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Nøyaktighet:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emuler EFB-kopier nøyaktig.\n"
-" Noen spill avhenger av dette for visse grafiske effekter eller gameplay-"
-"funksjonaliteter.\n"
-" \n"
-" Hvis usikker, velg EFB-til-tekstur isteden."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Aksjon"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -505,7 +519,7 @@ msgstr ""
 "Skyldig-kode:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -513,7 +527,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Legg Til "
 "Kode (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -522,7 +536,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) in Fyll Og "
 "Skli (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -531,7 +545,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Ram-skriv "
 "Og Fyll (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -540,12 +554,12 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Skriv Til "
 "Peker (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Feil: Ugyldig verdi (%08x) i Minnekopi (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -555,174 +569,142 @@ msgstr ""
 "(%s)\n"
 " Master koder behøves ikke. Ikke bruk master koder."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Feil: Ugyldig AR-kode linje: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Kondisjonsbasert Kode: Ugyldig Størrelse %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Ugyldig Normal Kodetype %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Kode %i: ugyldig Sub-type %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Kode 0: Ugyldig Sub-type %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
-msgstr "Legg Til"
+msgstr "Legg til"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Legg til Action Replay Kode"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Legg til Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Legg til ny rute"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Legg til..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adresse :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Legger til den spesifiserte verdi til zFar-parameteren.\n"
-"To måter å uttrykke floating point-verdier.\n"
-"For eksempel: Ved å skrive ''200'' eller ''0.0002'' direkte, produseres like "
-"effekter, den oppnådde verdi blir ''0.0002''.\n"
-"Verdier: (0->+/-Integer) eller (0->+/-FP[6 sifre med presisjon])\n"
-"\n"
-"MERKNAD: Sjekk Loggvindu/Konsoll for de oppnådde verdier."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Legger til den spesifiserte verdi til zNear-parameteren.\n"
-"To måter å uttrykke floating point-verdier.\n"
-"For eksempel: Ved å skrive ''200'' eller ''0.0002'' direkte, produseres like "
-"effekter, den oppnådde verdi blir ''0.0002''.\n"
-"Verdier: (0->+/-Integer) eller (0->+/-FP[6 sifre med presisjon])\n"
-"\n"
-"MERKNAD: Sjekk Loggvindu/Konsoll for de oppnådde verdier."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Juster analogkontrolltrykket som kreves for å aktivere knapper."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avansert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Avanserte innstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Alle GameCube/Wii filer (elf, dol, gcm, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Alle GameCube/Wii avbildningsfiler/rip (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Alle GameCube GCM-filer (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Alle hurtiglagringene (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii ISO-filer (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle komprimerte GC/Wii-filer (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Alle filer (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analyser"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Vinkel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropisk filtrering:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Kantutjevning:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Applikasjonslasteren er i feil størrelse... er dette virkelig en "
 "applikasjonslaster?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Applikasjonlaster klarte ikke å laste fra fil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Applikasjonslaster:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Bruk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -732,16 +714,12 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Er du sikker på at du vil slette \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -749,56 +727,83 @@ msgstr ""
 "Er du sikker på at du vil slette disse filene?\n"
 "De vil bli borte for alltid!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Er du sikker på at du vil slette denne filen?\n"
 "Den vil bli borte for alltid!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (eksperimentell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Aspektforhold:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Minst en rute må stå åpen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Audio Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Automatisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Multiplum av 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Automatisk (Vindusstørrelse):"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Automatisk juster Vindusstørrelse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -808,134 +813,150 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP-register"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Tilbake"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Backend-innstillinger"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Bakgrunnsinndata"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Bakover"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Dårlig Fil-header"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balansebrett"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Bannerdetaljer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Grunnleggende Innstillinger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Blokkallokasjontabellsjekksum feilet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blokker"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blå"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blå Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blå Høyre"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Bunn"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bundede Kontroller: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Bla etter"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Bla etter en mappe å legge til"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Bla etter en ISO-mappe..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Bla etter lagringssted"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Knapper"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -943,118 +964,100 @@ msgstr ""
 "Overstyr tømmingen av data-cache-en av DCBZ-instruksjonen. Vanligvis bør "
 "denne innstillingen stå uaktivert."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C-joystick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-joystick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP-register"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU-emulatormotor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cacher Display-lister"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Kalkuler lys på 3D-grafikk per-piksel istedenfor per punkt.\n"
-"Minker emulasjonsfarten med noen prosent (avhengig av din GPU)\n"
-"Dette er vanligvis en trygg forbedring, men kan forårsake noen problemer.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Hvis usikker, la stå avslått."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Kan ikke finne WiiMote fra koblingshandler %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Kan ikke åpne %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Kan ikke avregistrere events med events under behandling"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Kan ikke bruke den filen som et minnekort.\n"
-" %s\n"
-" er ikke en gyldig GameCube-minnekortfil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Kan ikke bruke den filen som et minnekort.\n"
-"Prøver du å bruke samme fil i begge slotter?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalansk"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Senter"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Endre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
-msgstr "Endre &Disk..."
+msgstr "Endre &disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
-msgstr "Endre Disk"
+msgstr "Endre disk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
-msgstr "Endre Spill"
+msgstr "Endre spill"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1062,75 +1065,63 @@ msgstr ""
 "Endre språk for brukerinnstillinger.\n"
 "Krever omstart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Å endre dette vil ikke ha noen effekt mens emulatoren kjører!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Juksekode"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Juksekodesøk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Juksekode Manager"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Sjekk partisjonsintegritet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Sjekker integritet..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Kinesisk (Simplifisert)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Kinesisk (Tradisjonell)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Velg en DVD-rotmappe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Velg en NAND-rotmappe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Velg en standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Velg en mappe å legge til"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Velg en fil å åpne"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Velg et minnekort:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1138,27 +1129,27 @@ msgstr ""
 "Velg fil til å bruke som applikasjonslaster: (gjelder kun for disker laget "
 "fra mapper)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Velg mappen å ekstrahere til"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Sirkel-joystick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassisk"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Tøm"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1166,183 +1157,230 @@ msgstr ""
 "Klientfrakobling mens spillet kjørte!! NetPlay er slått av. Du må manuelt "
 "stoppe spillet."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Lukk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Ko&nfigurer..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Kodeinfo"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kode:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Kommando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Kommentar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Kommentar:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Komprimer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Komprimer valgte ISO-er..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Komprimerer ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Konfig"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Konfigurer Kontroller"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Konfigurer Kontrollere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Konfigurer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Bekreft filoverskriving"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Bekreft ved Stans"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Koble til"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Koble til balansebrett"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Koble til USB-tastatur"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Koble til Wiikontroller %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Koble til Wiikontroller 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Koble til Wiikontroller 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Koble til Wiikontroller 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Koble til Wiikontroller 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konsoll"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Kontinuerlig skanning"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Kontroll"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Konverter til GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopi feilet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopier til minnekort %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Kjerne"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Kunne ikke lage %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Kunne ikke initialisere backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Kunne ikke lese \"%s\". Det er ingen disk i diskstasjonen, eller dette er "
-"ikke en GC/Wii-backup. Vennligst merk at originale GameCube og Wii-disker "
-"ikke kan leses av de fleste PC-DVD-diskstasjoner."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kunne ikke gjennkjenne ISO-fil %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Kunne ikke lagre %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1368,11 +1406,19 @@ msgstr ""
 "I så tilfelle, må du kanskje re-spesifisere minnekortslokasjonen i "
 "innstillingene."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Kunne ikke finne åpningskommandoen for utvidelsen 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1380,38 +1426,46 @@ msgstr ""
 "Kunne ikke initialisere kjernen.\n"
 "Sjekk kofigurasjonen din."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Antall:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Lag AR-kode"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Lag nytt perspektiv"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Skaper:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Krum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1421,200 +1475,191 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Kryssutfase"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Nåværende mappe endret fra %s til %s etter wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Selvdefinert projeksjons-hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Innstillinger for selvdefinerte projeksjons-hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Selvdefiner noen ortografisk projeksjons-parametere."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "CPU Emulatormotor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE-emulering (raskt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (tregt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE re-kompilering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Innstillinger for DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE på Separat Tråd"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD-rot:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Fatal Feil: Mislyktes i å lese fra volum"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Fatal Feil: Mislyktes i å lese fra volum"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Dansematte"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Datastørrelse"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Dato:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro-filer(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Dødsone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Desimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Dekomprimer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Dekomprimer valgte ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Dekomprimerer ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Reduser bilder i sekundet begrensning"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Standard tekst-font"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Slett"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Slett lagringsfil"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Slett den eksiterende filen '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Finn automatisk"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Forsøkte å lese mer data fra DVD-en enn det som får plass i ut-bufferen. "
-"Clamp-krasj."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Device"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Innstillinger for enhet"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Ring"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1622,20 +1667,23 @@ msgstr ""
 "Mappestisjekksum misyktes\n"
 " og mappesti backup-sjekksummen mislyktes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Deaktiver Destinasjon Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Deaktiver tåke (fog)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1649,320 +1697,213 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Deaktiver emulasjon av EFB-kopier.\n"
-"Disse blir ofte brukt for post-prosessering eller render-til-tekstur "
-"effekter, so mens dette alternativet kan gi en god ytelsesøkning, forårsaker "
-"det som regel også feil.\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Deaktiverer emulasjonen for maskinvarefunksjonen som kalles \"destinasjon "
-"alpha\" som er brukt i mange spill for forskjellige grafiske effekter.\n"
-"\n"
-"Hvis du er usikker så la denne være urørt!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Feil ved lesing av disk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Visning"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Vis bruker-inndataen lest av emulatoren.\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Del"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Vil du stoppe pågående emulering?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II-dekoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"\n"
-"Copyright(c) 2003-2013+ Dolphin Team\n"
-"\n"
-"\n"
-"\n"
-"Branch: %s\n"
-"\n"
-"Revisjon: %s\n"
-"\n"
-"Kompilert: %s @ %s\n"
-"\n"
-"\n"
-"\n"
-"Dolphin er en GameCube/Wii emulator, som ble\n"
-"\n"
-"opprinnelig skrevet av F|RES og ector.\n"
-"\n"
-"Idag er Dolphin et åpent-kildekode prosjekt med mange\n"
-"\n"
-"bidragsytere, for mange til å oppramses.\n"
-"\n"
-"Om interessert, gå til prosjektsiden ved\n"
-"\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"\n"
-"\n"
-"Spesiell takk til Bushing, Costis, CrowTRobo,\n"
-"\n"
-"Marcan, Segjer, Titanik, or9 og Hotquik for deres\n"
-"\n"
-"reverse engineering og dokumentasjon/demoer.\n"
-"\n"
-"\n"
-"\n"
-"Stor takk til Gilles Mouchard hvorav hans Microlib PPC-\n"
-"\n"
-"emulator ga vår utvikling en kjappstart.\n"
-"\n"
-"\n"
-"\n"
-"Takk til Frank Wille for hans PowerPC disassembler,\n"
-"\n"
-"som or9 og vi modifiserte til å innkludere Gekko spesifiker.\n"
-"\n"
-"\n"
-"\n"
-"Takk til hcs/destop for deres GC ADPCM-dekoder.\n"
-"\n"
-"\n"
-"\n"
-"Vi er ikke affiliert med Nintendo på noen måte.\n"
-"\n"
-"GameCube og Wii er varemerker av Nintendo.\n"
-"\n"
-"Emulatoren er kun for utdanningshensikt,\n"
-"\n"
-"og må ikke brukes til å spille spill du ikke\n"
-"\n"
-"lovlig eier."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafikkinnstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphins &nettside"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Konfigurer dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin emulert Wiikontroller konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC-kontroll konfigurasjon"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS-Filmer (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote Konfigurasjon"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin på &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for å bla "
-"etter filer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin er satt til å gjemme alle spill. Dobbeltklikk her for å vise alle "
-"spill..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin kunne ikke fullføre den forespurte handligen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Dobler den emulerte klokkehastigheten for GPU'en. Dette kan øke hastigheten "
-"i noen spill (PÅ = Kjapp, AV = Kompatiblitet)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Ned"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Last ned juksekoder (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Lastet ned %lu koder. (la til %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Trommer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Juksedukke"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Dump Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Dump EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Skjermdumping"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Dump teksturer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dump alle renderte bilder til en AVI-fil i mappen User/Dump/Frames/\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dump spillteksturer til mappen User/Dump/Textures/<game id>/\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Dump alt innholdet i EFB-kopier til mappen User/Dump/Textures/\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Avslutt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB-kopier"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1974,56 +1915,40 @@ msgstr ""
 "%d. %d -- Hvis du nylig har oppdatert din Dolphin distribusjon, kreves "
 "sannsynligvis en reboot for at Windows skal detektere defn nye driveren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Tidlige minneoppdateringer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Endre"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Endre ActionReplay-kode"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Endre konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Endre Lokale Overkjøringer"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Endre patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Endre nåværende perspektiv"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Endre..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Embedded Frame Buffer (EFB)"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Emulator-CPU-tråden kjører allerede"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -2037,7 +1962,7 @@ msgstr ""
 "\n"
 "Hvis usikker, benytt virtuell XFB isteden."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2053,120 +1978,92 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulert Wiikontroller"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Emulasjonsstatus:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Aktiver"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Tillat 3D-effekter via stereoskopi ved å bruke Nvidia 3D Vision-teknologi om "
-"det støttes av din GPU.\n"
-"Kan muligens forårsake feil.\n"
-"Krever fullskjerm for å virke.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Aktiver AR-logging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Aktiver Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Aktiver Bounding Box-kalkulasjoner"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Aktiver cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Aktiver juksekoder"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Aktiver bruk av dobbelkjerne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Aktiver bruk av dobbelkjerne (for bedre ytelse)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Aktiver Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Aktiver Idle Skipping (for bedre ytelse)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Aktiver MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Aktiver progressiv skanning"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Aktiver skjermbeskytter"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Tillat høytaler data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Aktiver widescreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Aktiver wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Tillater anisotropisk filtrering.\n"
-"Øker bildekvaliteten for teksturer med skjeve visningsvinkler.\n"
-"\n"
-"Hvis usikker, velg 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Aktiver rask disktilgang. Trengs for noen få spill. (PÅ = Raskt, AV = "
-"Kompitabelt)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Aktiver sider"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2178,7 +2075,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2190,34 +2087,25 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Aktiver dette for å bedre ytelsen i The Legend Of Zelda: Twillight Princess. "
-"Deaktiver for andre spill."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Tillater Selvdefinerte Projeksjons-hack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Ikke tilgjengelig på "
-"OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Aktiver Dolphin Pro Logic II-emulering med 5.1 surround. Kun for OpenAL "
-"backend."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2230,7 +2118,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2238,7 +2126,11 @@ msgstr ""
 "Tillater Memory Management Unit (MMU), som trengs for noen spill. (PÅ = "
 "Kompitabelt, AV = Raskt)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2248,50 +2140,61 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Slutt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Engelsk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Forbedringer"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Skriv inn et navn for det nye perspektivet:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entry %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entry 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Lik"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Feil"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2300,7 +2203,7 @@ msgstr ""
 "Feil: Etter \"%s\", ble %d (0x%X) funnet isteden for lagringsmarkøren %d (0x"
 "%X). Avbryter savestate-lasting..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2309,218 +2212,193 @@ msgstr ""
 "Feil: Prøver å åpne %s-fonter, men de lastes ikke. Det kan hende spill ikke "
 "åpner fonter korrekt, eller krasjer."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Unntakshandler - tilgang under minneområde. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Kjør"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Avslutt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Eksporter alle Wii-lagringsfiler"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Eksportering mislyktes"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Eksporter fil"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Eksporter opptak"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Eksporter opptak..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Eksporter lagringsfil"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Eksporter alle lagringsfiler"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Eksportering mislyktes"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Eksporter lagringsfil som..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Utvidelse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Ekstern bildebuffer (EFB)"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Ekstra parameter"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Ekstra parameter nyttig kun i ''Metroid: Other M\"."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Ekstraher alle filer..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Ekstraher applikasjonslaster..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Ekstraher DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Ekstraher mappe..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Ekstraher fil..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Ekstraher partisjon..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Ekstraherer %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Ekstraherer alle filer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Ekstraherer mappe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Ekstraherer..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO-Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO-spiller"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANKRIKE"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST-størrelse:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Tilkobling mislyktes!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Nedlasting av koder mislyktes."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Ekstrahering til %s mislyktes!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Kunne ikke laste DSP ROM:\t%s\n"
-"\n"
-"Denne filen kreves for å bruke DSP LLE.\n"
-"Den følger ikke med Dolphin, da den inneholder kopibeskyttet data.\n"
-"Bruk DSPSpy til å dumpe filen fra din fysiske konsoll.\n"
-"\n"
-"Du kan benytte DSP HLE-motoren som ikke krever noen ROM-dump.\n"
-"(Velg den fra \"audio\"-panelet i konfigurasjonspanelet.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Mislyktes å laste inn bthprops.cpl! Å koble til ekte Wii-kontrollere vil "
-"ikke fungere og Dolphin kan kræsje tilfeldig!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Mislyktes å laste inn hid.dll! Å koble til ekte Wii-kontrollere vil ikke "
-"fungere og Dolphin kan kræsje tilfeldig!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Mislyktes i å lese %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Kunne ikke lese banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Kunne ikke lese bk-header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Mislyktes i å lese blokk %d av lagringsdataen\n"
-" Minnekortet kan ha blitt trunktert\n"
-" Filposisjon:%llx"
+"\n"
+"Minnekortet kan ha blitt trunktert\n"
+"\n"
+"Filposisjon:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2528,7 +2406,7 @@ msgstr ""
 "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2536,17 +2414,12 @@ msgstr ""
 "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Kunne ikke lese data fra filen %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Kunne ikke lese data fra fil: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2554,7 +2427,7 @@ msgstr ""
 "Kunne ikke lese mappesti-backup'en korrekt\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2562,11 +2435,7 @@ msgstr ""
 "Kunne ikke lese mappestien korrekt\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Kunne ikke lese header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2574,50 +2443,35 @@ msgstr ""
 "Kunne ikke lese headeren korrekt\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Kunne ikke lese header for fil %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Kunne ikke lese unik ID fra disk-bildet"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Kunne ikke skrive BT.DINF til SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Kunne ikke skrive bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Kunne ikke skrive data til fil: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Kunne ikke skrive header for %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Persisk"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rask"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Kjapp dyp kalkulasjon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Rask versjon av MMU. Fungerer ikke for alle spill."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2625,23 +2479,27 @@ msgstr ""
 "Fatal desynkronisering. Avbryter avspilling. (Feil i PlayWiimote: %u != %u, "
 "byte %u)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo-spiller"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Filinformasjon"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Filen inneholder ingen koder."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Fil konvertert til .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2649,7 +2507,7 @@ msgstr ""
 "Filen kunne ikke åpnes\n"
 "eller har ingen gyldig utvidelse"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2658,95 +2516,93 @@ msgstr ""
 "Filen har utvidelsen \"%s\"\n"
 "gyldige utvidelser er (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Filen kjennes ikke igjen som et minnekort"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Filen ikke komprimert"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Ukjent åpenmodus: 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Filtypen 'ini' er ukjent! kan ikke åpnes!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Finn neste"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Finn forrige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Første blokk"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Fiks sjekksummer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Tving 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Tving 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Tving konsoll til NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Tving teksturfiltrering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Tvinger bilineær teksturfiltrering, til og med om spillet bestemt har "
-"avslått det.\n"
-"Forbedrer teksturkvalitet noe, men forårsaker feil i noen spill.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Tving spillet til å rendere grafikk for widescreen-oppløsninger.\n"
-"Merk at dette kan forårsake grafiske feil.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Tving NTSC-J-modus for å bruke japansk ROM-font.\n"
-"Er dette avslått, benytter Dolphin NTSC-U som standard og går automatisk "
-"over til denne innstillingen når japanske spill spilles."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2754,558 +2610,579 @@ msgstr ""
 "Formater som ascii (NTSC\\PAL)?\n"
 "Velg nei for sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Send frem"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Forward port (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Fant %d resultater for '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Fant %x lagringsfiler"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Stillbilde"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Stillbilde"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Bilde-for-bilde modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Spillopptak bruker FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Frame info"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Bilderekkevidde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Frame S&kipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Framelimit:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Bilder til opptak:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Fri utkikk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Fransk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Fra"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Fullskjerm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Fullskjermsoppløsning:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI Fil(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC-kontroll"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Spill-ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Spillet kjører allerede!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Et spill kjører ikke!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Spill ikke funnet!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Spill-spesifikke Innstillinger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Spillkonfigurasjon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube-lagringsfiler(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "GameCube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Innstillinger for &GameCube-kontroll"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "GameCube-minnekort (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Innstillinger for GameCube-kontroll"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko-juksekoder"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"GeckoCode mislyktes i å kjøre (CT%i CST%i) (%s)\n"
-" (Enten en dårlig kode, eller så støttes ikke kodetypen. Prøv å bruke den "
-"medbragte kodehandleren ved å plassere codehandler.bin-filen i Sys-mappen og "
-"restart Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Generelt"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Tysk"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Indeksen er større enn AR-kodelistens størrelse %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Innstillinger for grafikk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Større enn"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Øker kvaliteten drastisk på teksturer generert ved rendering-til-tekstur-"
-"ekkekter.\n"
-" Å øke den interne oppløsningen vil øke effekten av denne innstillingen.\n"
-" Senker ytelsen noe og kan muligens forårsake problemer (men mest sannsyling "
-"ikke)\n"
-" \n"
-" Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Gresk"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Grønn"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Grønn venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Grønn høyre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Header-sjekksum feilet"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Høyde"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Hjelp"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hei,\n"
-"\n"
-"\n"
-"\n"
-"Dolphin krever Max OS X 10.7 eller nyere.\n"
-"\n"
-"Dessverre kjører du en gammel versjon av OS X.\n"
-"\n"
-"The seneste versjonen av Dolphin som støtter OS X 10.6 er Dolphin 3.5\n"
-"\n"
-"Vennligst oppgrader til 10.7 eller nyere for å bruke siste Dolphin-versjon.\n"
-"\n"
-"\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hei,\n"
-"\n"
-"Dolphin krever at din CPU støtter SSE2-utvidelser.\n"
-"Dessverre støttes de ikke av din CPU, så Dolphin vil ikke kjøre.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Gjem"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Gjem musepeker"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Gjemmer musepekeren hvis den er over emulasjonsvinduet.\n"
-"\n"
-"Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Hjem"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Vert"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Konfigurer hurtigtaster"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Hurtigtaster"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybrid Wiikontroller"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: Forsøkte å få data fra en ukjent billett: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Spillet kunne ikke relaste en IOS eller tittel som ikke er "
-"tilgjengelig i ditt NAND-dump\n"
+"IOCTL_ES_LAUNCH: Spillet forsøkte å re-laste ios eller en billett som ikke "
+"finnes i din NAND-dump\n"
 "\n"
-"TitleID %016llx.\n"
+"TitleID %016<PRIx64>.\n"
 "\n"
-"Dolphin vil sannsynligvis krasje nå."
+"Dolphin vil sannsynligvis krasje nå"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - dårlig destinasjon"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Innstillinger for IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR-peker"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR-sensitivitet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO-detaljer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO-mapper"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ikon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Hvis aktivert, vil bounding box-registre bli oppdatert. Brukt av Paper Mario-"
-"spillene."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorer formatendringer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignorer endringer til EFB-formatet.\n"
-"Øker ytelsen i mange spill uten negative effekter. Forårsaker derimot "
-"grafiske defekter i en small mengde andre spill.\n"
-"\n"
-"Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignorer kall fra CPU-en til å lese fra eller skrive til EFB-en.\n"
-"Øker ytelsen i noen spill, men kan deaktivere noen gameplay-relaterte "
-"funksjoner eller grafiske effekter.\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importer lagringsfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importer Wii-lagringsfil"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Importering mislyktes"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Importert fil har .gsc-utvidelse\n"
-"men har ikke korrekt header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "importert fil har ugyldig lengde"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Importert fil har .sav-utvidelse\n"
-"men har ikke korrekt header"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "I spillet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Øke bilder i sekundet begrensning"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informasjon"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Inndata"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Sett inn"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Sett inn Kryptert eller Dekryptert kode her..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Sett inn SD-kort"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Sett inn navn her..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Installer WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
-msgstr "Installer til Wii Meny"
+msgstr "Installer til Wii-meny"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
-msgstr "Installer WAD..."
+msgstr "Installerer WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Feil i Integritetssjekk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Integritetssjekk fullført"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Integritetssjekk fullført. Ingen feil ble oppdaget."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Integritetssjekk for partisjonen %d feilet. Ditt spill-rip er mest "
-"sannsynlig korrupt, eller har blitt patchet feil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Kontrollpanel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Innstillinger for kontrollpanel"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Intern LZO-feil - komprimering mislyktes"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3314,103 +3191,106 @@ msgstr ""
 "Intern LZO-feil - dekomprimering mislyktes (%d) (%li, %li) \n"
 "Prøv å laste Save State'en igjen"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Intern LZO-feil - lzo_init() mislyktes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Intern bildeoppløsning:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (VELDIG treg)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Ugyldig størrelse (%x) eller magisk ord (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Ugyldig verdi!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Ugyldig bat.map eller mappesti"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Ugyldig event-type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Ugyldig fil"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Ugyldig opening.bnr funnet i gcm:\n"
-"%s\n"
-" Det kan hende du må re-dumpe dette spillet."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Ugyldig opptaksfil"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Ugyldige søkeparametre (inget objekt valgt)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Ugyldig søkestring (kunne ikke konverte til tall)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Ugyldig søkestring (bare strenger av partallslengde støttes)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Ugyldig hurtiglagring"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italiensk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT rekompilator (anbefalt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL eksperimentell rekompilator"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japansk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3420,64 +3300,75 @@ msgstr ""
 " \n"
 " Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Hold vindu på toppen"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Tast"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreansk"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L-Knappen"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "Venstre-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Siste %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Forsinkelse:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Venstre Joystick"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Venstreklikk for å oppdage hot-taster.\n"
-"Trykk space for å klarere."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3487,7 +3378,7 @@ msgstr ""
 "Middelklikk for å tømme.\n"
 "Høyreklikk for flere alternativer."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3495,200 +3386,211 @@ msgstr ""
 "Venstre/Høyre-klikk for flere alternativer.\n"
 "Middelklikk for å tømme."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Mindre enn"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Begrens med FPS (bilder-per-sekund)"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Last inn"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Last inn brukerlagde teksturer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Last inn hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Last inn hurtiglagring siste 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Last inn hurtiglagring siste 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Last inn hurtiglagring siste 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Last inn hurtiglagring siste 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Last inn hurtiglagring siste 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Last inn hurtiglagring siste 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Last inn hurtiglagring siste 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Last inn hurtiglagring siste 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Åpne hurtiglagringsplass nr. 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Last inn hurtiglagring siste 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Åpne hurtiglagringsplass nr. 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Åpne hurtiglagringsplass nr. 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Åpne hurtiglagringsplass nr. 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Åpne hurtiglagringsplass nr. 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Åpne hurtiglagringsplass nr. 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Åpne hurtiglagringsplass nr. 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Åpne hurtiglagringsplass nr. 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Last inn hurtiglagring siste 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Åpne hurtiglagring..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Last inn Wii System Meny"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Last inn Wii System Meny %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Laster inn brukerlagde teksturer fra mappen User/Load/Textures/<game id>/\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Last in forhåndsvalgte verdier fra tilgjengelige hack-mønstre."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Logg"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Logg-innstillinger"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Logg FPS til fil"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Loggtyper"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Logg antallet bilder rendert per sekund til User/Logs/fps.txt. Bruk denne "
-"funksjonaliteten hvis du vil måle ytelsen til Dolphin."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Logger utdata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Mistet koblingen til server!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M-knappen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Ytelses-hack for MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark-filer(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Hoved-joystick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Skaper-ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Skaper:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3703,29 +3605,33 @@ msgstr ""
 " \n"
 " Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Maximum"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Minnekortet har allerede en lagringsfil for denne tittelen."
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Minnekort allerede åpnet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Memory Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Minnekort"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3733,7 +3639,7 @@ msgstr ""
 "Minnekort Manager ADVARSEL - Lag backup før du benytter, det skal bli "
 "fikset, men den kan tukle med lagringsfilene dine!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3750,37 +3656,52 @@ msgstr ""
 "%s\n"
 "Vil du kopiere den gamle filen til denne nye plasseringen?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "Minnekortfilstørrelse matcher ikke header-størrelsen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Meny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mic"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Minimum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Diverse"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Diverse Innstillinger"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modifiserer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3792,20 +3713,24 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Mono-mellomrom tekst-font"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3823,313 +3748,287 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multipliser"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "MERK: Streamstørrelsen matcher ikke den faktiske datalengden\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Legg Til"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begynn"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Desimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divider"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Ned"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Erlik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Hjem"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Venstre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multipliser"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Høyre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Mellomrom"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Mellomrom"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Minus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Opp"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Navn:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Navn:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Maskinvare-innfødte GCI-filer(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nytt Søk"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Neste Side"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Neste Søk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Brukernavn :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Intet Land (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Ingen ISO- eller WAD-filer funnet"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Ingen lydutgang"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Inngen banner-fil funnet for tittelen %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Ingen beskrivelse tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Ingen dokking"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Ingen fil lastet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Ingen ledige mappestiindeks-entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Ingen opptaksfil"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Ingen lagringsmappe funnet for tittel %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Ingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norsk Bokmål"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Ikke lik"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Ikke satt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "Ikke en Wii-lagringsfil, eller lesefeil for filheaderstørrelse %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notater"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notater:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Merknad"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Antall koder:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuk Aksellerasjon"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Objekt Radius"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Av"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "On-Screen Meldinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online & Dokumentasjon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Kun %d blokker tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Åpne"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Åpne &tilholdsmappe"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Åpne Wii-&lagringsfil-mappe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Åpne fil..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: Kan ikke lage forbindelse med enheten %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kan ikke finne lydenhet"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kan ikke åpne enhet %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Teksturdekoder"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Teksturdekoder"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4137,20 +4036,18 @@ msgstr ""
 "Åpner standard (read-only) konfigurasjon for dette spillet i en ekstern "
 "teksteditor."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr "Åpner de valgte overkjøringene i en ekstern teksteditor."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Alternativer"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oransje"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4161,346 +4058,326 @@ msgstr ""
 "Høyreklikk og eksporter alt du har lagret,\n"
 "og importer dette inn på et nytt minnekort\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Annet"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Den andre klienten koblet fra mens spillet kjøret! NetPlay er frakoblet. Du "
-"må stoppe spillet manuelt."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Utdata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Spi&ll av opptak..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Kontroll"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Kontroll"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Kontrollere"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parametere"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partisjon %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Partisjonen finnes ikke: &lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patcher"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Mappestier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pause på slutten av filmen"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pikselbelysning"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfekt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektiv %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Spill"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Spill av opptak"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Spill/Pause"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Spillbar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Avspillingsalterntiver"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Spillere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Vennligst bekreft..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Vennligst lag et persektiv før du lagrer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Pluss-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polsk"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugisisk"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisisk (Brasilsk)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "postprosesseringseffekt:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Prematur filmslutt i PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Prematur filmslutt i PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Prematur filmslutt i PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Forhåndsinnstillinger:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Forrige side"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Forrige side"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Forrige verdi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Tøm hurtigbuffer"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Spørsmål"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Avslutt"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R-knappen"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "Høyre-analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSSLAND"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Rekkevidde"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Skrivebeskyttet-modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Ekte"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Ekte balansebrett"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Ekte Wiikontroller"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Ekte Wiikontrollere"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Opptak"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Gjør input opptak"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Opptaksinformasjon"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opptaksinnstillinger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rød"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rød Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rød Høyre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Reduserer mengden firkant-avgrensning forårsaket av rasteriseringen av 3D-"
-"grafikk.\n"
-"Dette gjør at det gjengitte bildet ser mindre klumpete, men senker også "
-"ytelsen kraftig, og kan forårsake feil.\n"
-"\n"
-"Hvis usikker, velg ingen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Oppdater liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Oppdater spilliste"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Fjern"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4510,243 +4387,320 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Spill i hovedvinduet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Restart"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultater"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Tilbake"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisjon:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Høyre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Høyre Joystick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
-"Kjør DSP LLE på en dedikert CPU-tråd (ikke anbefalt: Kan forårsake frys)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russisk"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Lagre Sa&ve State"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Sikker"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Lagre"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Lagre GCI som..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Lagre eldste hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Lagre hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Hurtiglagringsplass nr. 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Lagre hurtiglagring nr 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Hurtiglagringsplass nr. 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Hurtiglagringsplass nr. 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Hurtiglagringsplass nr. 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Hurtiglagringsplass nr. 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Hurtiglagringsplass nr. 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Hurtiglagringsplass nr. 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Hurtiglagringsplass nr. 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Lagre hurtiglagring nr 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Hurtiglagring..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Lagre komprimert GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Lagre nåværende perspektiv"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Lagre dekomprimert GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Save State-film %s er korrupt, opptak avsluttes..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Skalert EFB-kopi"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Søker etter ISO-filer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Søker..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "SkjDump"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Søk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Søkefilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Søk i Undermapper"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Søk i dette objektet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Søk etter hex-verdi:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Seksjon %s ikke funnet i SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Velg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Velg opptaksfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Velg en Wii WAD-fil å innstallere"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Velg en maskinvareadapter å bruke.\n"
-"\n"
-"Om du er i tvil, benytt den første."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Velg en lagringsfil å importere"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Velg flytvindu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Velg fil å laste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Velg lagringsfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Velg en save state å laste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Velg en save state å lagre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4764,271 +4718,291 @@ msgstr ""
 "\n"
 "Hvis usikker, velg Automatisk."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Valgt kontrolprofil eksisterer ikke"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Valgt font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Velger visningsoppløsningen brukt i fullskjermsmodus.\n"
-"Denne bør alltid være større eller lik den interne oppløsningen. "
-"Ytelsespåvirkningen er ubetydelig.\n"
-"\n"
-"Hvis usikker, velg skrivebordsoppløsningen din.\n"
-"Hvis fortsatt usikker, bruk den høyeste oppløsingen som fungerer for deg."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Velg hvilken grafikk-API som skal brukes internt.\n"
-" Direct3D 9 er vanligvis den raskeste. OpenGL er mer nøyaktig. Direct3D 11 "
-"ligger et sted imellom de to.\n"
-" Merk at Direct3D bakendene kun er tilgjengelig på Windows.\n"
-" \n"
-" Hvis usikker, benytt Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Velg hvilken grafikk-API som skal brukes internt.\n"
-" Direct3D 9 er vanligvis den raskeste. OpenGL er mer nøyaktig. Direct3D 11 "
-"ligger et sted imellom de to.\n"
-" Merk at Direct3D bakendene kun er tilgjengelig på Windows.\n"
-" \n"
-" Hvis usikker, benytt OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Send"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Sensorbarposisjon:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separatør"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Sett som &standard-ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Sett som standard Minnekort %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Sett forsinkelsen (i ms). Høyere verdier kan redusere audioknaking. Kun for "
-"OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Innstillinger..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Kan ikke lage innstillingsfil"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Rist"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Kortnavn:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Skulderknapper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Vis &Konsoll"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Vis &Logg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Vis &Statusbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Vis &Verktøylinje"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Vis Standardverdier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Vis DVD-stasjoner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Vis Kopieringsregioner for EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Vis Bildefrekvens (FPS)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Vis Frankrike"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Vis GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Vis Inndata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Vis Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Vis JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Vis Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Vis Språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Vis Loggk&onfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Vis PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Vis Plattformer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Vis Regioner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Vis Statistikker"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Vis Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Vis USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Vis WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Vis Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Vis en bekreftelsesboks før spill stoppes."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Vis en meldingsboks når en potensielt alvorlig feil inntreffer.\n"
-"Ved å deaktivere denne, kan irriterende og ikke-kritiske meldinger unngås, "
-"men det kan også forårsake\n"
-"at Dolphin plutselig krasjer uten noen forklaring."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Vis første blokk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Vis lagteller"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Vis meldinger på emulasjonsområdet av skjermen.\n"
-" Disse meldingene innkluderer minnekortskrivninger, Video-backend- og CPU-"
-"informasjon, og JIT cache-tømninger."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Vis lagringsblokker"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Vis lagringskommentar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Vis lagringsikon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Vis lagringstittel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5039,83 +5013,82 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Vis ukjent"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Vis diverse statistikker.\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Sideveis-pekende Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Størrelse"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Dropp BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Hopp over DCBZ-tømming"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Dropp EFB Access fra CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Øker ytelsen noe for EFB-til-RAM-kopier ved å ofre emulasjonsnøyaktighet.\n"
-"Økeri noen tilfeller den visuelle kvaliteten.\n"
-"Hvis du opplever problemer, prøv å øke tekstur-cache-nøyaktigheten, eller "
-"deaktiver dette alternativet.\n"
-"\n"
-"Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Stillbilde"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Software-renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5126,153 +5099,173 @@ msgstr ""
 "Det er kun nyttig for å debugge.\n"
 "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Innstillinger for Audio"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Audio backend %s er ugyldig"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Laging av lydbuffer mislyktes: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Mellomrom"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spansk"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Høytalervolum:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Spesifiserer renderingsoppløsningen. En høy oppløsningen vil øke den "
-"visuelle kvaliteten kraftig, men kan også senke ytelsen og forårsake feil i "
-"visse spill.\n"
-"\"Multiplum av 640x528\" er noe tregere enn \"Vindusstørrelse\", men "
-"forårsaker mindre feil. Generelt gir lavere intern oppløsning bedre ytelse.\n"
-"\n"
-"Hvis usikker, velg 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Øk diskoverføringshatighet"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Kvadrat-joystick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standardkontroller"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Start &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Start &opptak"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Start opptak"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Hurtiglagringsfiler"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Ratt"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Joystick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Stopp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Lagre EFB-kopier i GPU-teksturobjekter.\n"
-"Dette er ikke så nøyaktig, men det fungerer bra nok for de fleste spill og "
-"gir en god ytelsesøkning over EFB-til-RAM.\n"
-"\n"
-"Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Strekk til Vindu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Klimpre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Trekk Fra"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Eksportering av fil til %s vellykket"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Importering av lagringsfiler vellykket"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Svensk"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Sving"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synkroniser GPU-tråd"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5280,81 +5273,110 @@ msgstr ""
 "Synkroniserer GPU- og CPU-trådene for å hindre tilfeldige krasj i "
 "dobbelkjernemodus. (PÅ = kompatibel, AV = raskt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Systemspråk:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS-input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab-splitting"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tabell Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tabell Høyre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Ta skjermbilde"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongoer)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Tekstur"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Tekstur-cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Teksturformat overlegg"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "Installasjon av WAD-fil var vellykket"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Adressen er ugyldig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Fiksing av sjekksummen var vellykket"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Den valgte mappen finnes allerede i listen"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5363,7 +5385,7 @@ msgstr ""
 "Filen %s eksisterer allerede.\n"
 "Ønsker du å erstatte den?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5372,88 +5394,88 @@ msgstr ""
 "Filen %s kunne åpnes for skriving. Vennligst sjekk at den ikke allerede er "
 "åpen i et annet program."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Filen %s er allerede åpen, fil-headeren vil ikke bli skrevet."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Filen du spesifiserte (%s) eksisterer ikke"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Navnet kan ikke være blankt"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Navnet kan ikke inneholde tegnet ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Den dekrypterte AR-koden inneholder ingen linjer."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Jo tryggere denne settes, jo mindre sannsynlig er det at emulatoren vil "
-"mangle noen teksturoppdateringer fra RAM.\n"
-" \n"
-" Hvis usikker, bruk verdien mest til høyre."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Lagringsfilen du forsøker å åpne har en ugyldig filstørrelse"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Det valgte språket støttes ikke av ditt system. Går tilbake til standard."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Serverens og klientens NetPlay-versjoner er ukompitable!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Serveren er full!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Serveren responderte: Spillet kjører!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Serveren sendte en ukjent feilmelding!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Den spesifiserte filen \"%s\" eksisterer ikke"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Verdien er ugyldig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 "Det må være en billett for 00000001/00000002. Din NAND-dump er ukomplett."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5461,7 +5483,7 @@ msgstr ""
 "Disse innstillingene overstyrer Dolphins kjerneinnstillinger.\n"
 "Ubestemt betyr at spillet bruker Dolphins kjerneinnstillinger."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5469,120 +5491,163 @@ msgstr ""
 "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve "
 "Action Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Denne funksjonen tillater deg å endre spillets kameraposisjon. Hold nede "
-"høyre museknapp og flytt musen for å snu på kameraet. Hold nede SHIFT og "
-"press en av tastene WASD for å flytte kameraet en viss distanse (SHIFT + 0 "
-"for å flytte raskere og SHIFT + 9 for å flytte saktere). Trykk SHIFT + R for "
-"å resette kameraet. Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Dette begrenser hastigheten til et bestemt antall bilder per sekund (60 for "
-"NTSC og 50 for PAL). Alternativt kan du bruke innstillingen Audio (kan fikse "
-"diverse klikkelyder, men kan også forårsake konstant støy i enkelte spill)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Dette splitter opp Video- og CPU- trådene, så de kan kjære på separate "
-"kjerner.\n"
-"Øker ytelsen på datamaskiner med mer enn én kjerne,\n"
-"men kan også føre til feil/krasj."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Terskel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Tittel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Til"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Bytt alle loggtypene"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Skift bildestørrelse"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Slå på EFB-kopi"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Slå på tåke"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Bytt mellom fullskjermspilling eller vinduspilling."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Slå på IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Topp"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Tradisjonell Kinesisk"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Forsøkte å laste en ukjent filtype."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Triggere"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Forsøker å lese fra ugyldig SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5590,41 +5655,24 @@ msgstr ""
 "Forsøker å lese fra ugyldig SYSCONF\n"
 "Wiikontroller bt ids er ikke tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Dreieskive"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Type"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP Port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "UKJENT"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UKJENT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5632,204 +5680,179 @@ msgstr ""
 "Kunne ikke lage patch fra gitte verdier.\n"
 " Modifiseringen ble ikke gjort."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Kunne ikke parsere linje %lu fra den innskrevne AR-koden som en gyldig "
+"Kunne ikke parsere linje %u fra den innskrevne AR-koden som en gyldig "
 "kryptert eller dekryptert kode. Sørg for at du tastet den inn korrekt.\n"
+"\n"
 "Ønsker du å ignorere denne linjen og fortsette parsering?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Udefinert %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Angre åpning av hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Angre hurtiglagring"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Uforventet 0x80 kall? Avbryter..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Ukjent DVD-kommando%08x - fatal feil"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Ukjent kommando 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Ukjent entry-type %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ukjent melding mottatt med ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Opp"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Oppdater"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Mot-skjerm-pekende Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Bruk EuRGB60-modus (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Bruk fullskjerm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Bruk Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Bruk panikkadvarslere"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Bruk en mindre nøyaktig algoritme for å beregne dybde verdier. ⏎\n"
-"Kan forårsake problemer i enkelte spill, men kan gi en anstendig "
-"hastighetsøkning. ⏎\n"
-"⏎\n"
-"Hvis du er usikker så la denne være aktivert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Bruk flere CPU-tråder til å dekode teksturer.\n"
-"Kan resultere i en ytelsesøkning (spesielt på CPU-er med mer enn to "
-"kjerner.)\n"
-"\n"
-"Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Bruker usikre operasjoner for å øke farten på vertex streaming i OpenGL. Det "
-"er ingen kjente problemer med dette på støttede GPU'er, men det vil skape "
-"stor ustabilitet og grafiske feil på andre.\n"
-"\n"
-"\n"
-"\n"
-"Hvis usikker, la stå umerket."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Vanligvis om shader-kompilering mislykkes, vil en feilmelding vises.\n"
-"En kan derimot droppe disse pop-up-ene for å tillate uavbrutt spilling ved å "
-"aktivere dette alternativet.\n"
-"\n"
-"Hvis usikker, la stå deaktivert."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Verktøyet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "Vertikal synkronisering"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Speed Hack"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Verdi"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Verdi:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Verdi:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbøsitet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Vertex Streaming Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volum"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD-installasjon feilet: Skaper feil %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD-installasjon mislyktes: Feil ved ticket-laging"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5841,25 +5864,27 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Advarsel"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Advarsel - starter DOL i feil konsollmodus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Advarsel - starter ELF i feil konsollmodus!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Advarsel - starter ISO i feil konsollmodus!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5870,7 +5895,7 @@ msgstr ""
 "%s\n"
 "Ønsker du å fortsette?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5883,7 +5908,7 @@ msgstr ""
 "og har samme navn som en fil på ditt minnekort\n"
 "Fortsette?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5894,7 +5919,15 @@ msgstr ""
 "spilles. (Byte %u > %u) (Frame %u > %u). Du burde laste en annen savestate "
 "før du fortsetter, eller laste denne savestate-en med kun-les modus av."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5906,7 +5939,7 @@ msgstr ""
 "denne savestate-en med les-kun modus av. Ellers får du sannsynligvis en "
 "desynkronisering."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5940,178 +5973,165 @@ msgstr ""
 " Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DOpp=%d, DNed=%d, DVenstre=%d, "
 "DHøyre=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fil ikke åpen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Widescreen Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Bredde"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii-konsoll"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND-rot:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii-lagringsfiler (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Kunne ikke lese fra fil"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiikontroller"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "WiiMote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiikontroller %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiikontroller tilkoblet"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiikontroller-motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Innstillinger for Wiikontroller"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiikontrollere"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Venstre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Meny"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Høyre"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Ordkrumning"
+msgstr "Tekstbryting"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Arbeider..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Skriv til minnekortene (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Skriv til konsoll"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Skriv til debugger"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Skriv til fil"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Skriv til vindu ->"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice mislyktes: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2-initialisering mislyktes: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 master voice-laging mislyktes: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF-register"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Gul"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Du bruker en gratis DSP ROM laget av Dolphin-teamet.\n"
-" Alle Wii-spill vil fungere korret, og de fleste GameCube-spill burde også "
-"fungere fint, men GBA/IPL/CARD UKoder vil ikke fungere.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Du bruker en gammel gratis DSP ROM laget av Dolphin-teamet.\n"
-" Kun spill som bruker Zelda UCode vil fungere korrekt.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Du kan ikke lukke panelene som har sider/faner i dem."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Du må velge et spill!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Du må skrive inn et navn!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Du må skrive inn en gyldig desimal, hexadesimal eller octal verdi."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Du må skrive inn et gyldig profilnavn."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Du må restarte Dolphin for at endringen skal tre i kraft."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6121,7 +6141,7 @@ msgstr ""
 " Vil du stoppe nå for å fikse problemet=\n"
 " Hvis du velger \"Nei\", kan audio ha knasing."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6129,36 +6149,38 @@ msgstr ""
 "Din GCM/ISO-fil synes å være ugyldig (ugyldig land).\n"
 "Fortsette som fra PAL-regionen?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Din SYSCONF-fil er av feil størrelse.\n"
-"Den skal være 0x%04x (men er 0x%04llx)\n"
+"\n"
+"Den skal være 0x%04x (men er  0x%04<PRIx64>)\n"
+"\n"
 "Ønsker du å generere en ny en?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP-hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3-kode støttes ikke"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero-kode ukjent for Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ venter ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6169,77 +6191,30 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Selvdefinert]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EKSPERIMENTIELL]\n"
-"Sikter på å øke emulasjonsytelsen ved å avlaste teksturdekoding til GPU-en "
-"ved å bruke OpenCL-rammeverket.\n"
-"Derimot er det for tiden kjent for å skape teksturdefeksjoner i diverse "
-"spill. Det er også tregere enn vanlig CPU-teksturdekoding i de fleste "
-"tilfeller.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EKSPERIMENTIELL]\n"
-"Øker emulasjonsytelsen litt ved å cache visningslister.\n"
-"Kan muligens skape problemer.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "applikasjonslaster (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "Ukjent smak %d (forventet %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "Ukjent melding mottatt"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returnerte -1 på applikasjonskjøring!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar korreksjon: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear korreksjon: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| ELLER"
diff --git a/Languages/po/nl.po b/Languages/po/nl.po
index 6e39f4daf6..412a850280 100644
--- a/Languages/po/nl.po
+++ b/Languages/po/nl.po
@@ -1,18 +1,22 @@
-# Translation of dolphin-emu.pot to Dutch
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Garteal <garteal@gmail.com>, 2013
+# Garteal <garteal@gmail.com>, 2013-2014
 # MADCreations <http://www.dpro.freehosting.org>, 2011
-# M4rinus <marinus@live.com>, 2013
+# Marinus Schot <marinus@live.com>, 2013
+# Mourits Pvllen <mauritspullen@gmail.com>, 2014
+# Pierre Bourdon <delroth@gmail.com>, 2014
+# Tijmen <tijmen.wildervanck@gmail.com>, 2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-15 14:49+0000\n"
-"Last-Translator: Garteal <garteal@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/nl/)\n"
 "Language: nl\n"
@@ -21,21 +25,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin is en vrij beschikbare en open-source GameCube en Wii emulator.\n"
+"\n"
+"Gebruik deze software niet om games te spelen die je niet legaal hebt "
+"gekregen.\n"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(te veel om weer te geven)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Spel :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NIET"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,44 +65,94 @@ msgstr ""
 "\"%s\" bestaat niet.\n"
 "Wilt u een nieuwe 16MB geheugenkaart aanmaken?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+"Het lukte niet om \"%s\" te comprimeren. Waarschijnlijk is de image corrupt."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" is al gecomprimeerd! Kan niet nog meer comprimeren."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
-msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO."
+msgstr "\"%s\" is een ongeldig GCM/ISO bestand of het is geen GC/Wii ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopieer%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d samples"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d samples (kwaliteitsniveau %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s  bestaat al, wilt u het vervangen?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-"Het lukte niet om %s te comprimeren. Waarschijnlijk is de image corrupt."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -90,7 +161,7 @@ msgstr ""
 "%s kon niet worden geladen als een geheugenkaart\\n\n"
 "Bestandsgrootte op kaart is onjuist (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -99,7 +170,7 @@ msgstr ""
 "%s kon niet worden geladen als een geheugenkaart\\n\n"
 "Kaartgrootte is onjuist (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -109,378 +180,339 @@ msgstr ""
 "Bestand is niet groot genoeg om een geldige geheugenkaart bestand te zijn (0x"
 "%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Kon %s niet openen"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s gefaald: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s is een 0 byte bestand"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s is al gecomprimeerd! Kan niet nog meer comprimeren."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s is te lang voor de bestandsnaam, maximaal aantal karakters is 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sVerwijder%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExporteer GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporteer GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Vrije Blokken; %u Vrije Bestands Invoer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& EN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Over..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Start van DVD Drive..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "&Geluids Instellingen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "&Start van DVD Backup..."
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Breekpunten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Blader voor ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&DSP Instellingen"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Verwijder ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Verwijder geselecteerde ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulatie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Frame Avanceren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Volledig Scherm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Grafische Instellingen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Help"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Sneltoets Instellingen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Laad staat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Geheugenkaart Manager (GC) "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Geheugen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Open..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opties "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pauze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Speel "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Eigenschappen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Alleen-lezen modus"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr "&Alleen-Lezen Modus"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Lijst Vernieuwen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registers"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Geluid "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Tools"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Bekijk "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote Instellingen "
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(ONBEKEND)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(uit) "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Native (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Native (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Native (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Native (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Native (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Native (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Vul naam hier in> "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Geen resoluties gevonden> "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Niks>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Druk op een knop>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Systeem>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Er is al een NetPlay venster geopend!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Er staat geen spel aan."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Er is geen ondersteunde bluetooth apparaat gevonden.\n"
-"Koppel je Wiimotes handmadig aan het systeem."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ALERT:\n"
-"\n"
-"Netplay zal op dit moment alleen goed werken wanneer je de volgende "
-"instellingen gebruikt:\n"
-" - Dual Core [UIT]\n"
-" - DSP Emulator Engine moet hetzelfde zijn op alle computers!\n"
-" - DSP op toegeweide thread [UIT]\n"
-" - Framelimit NIET op [Audio]\n"
-"\n"
-"Alle spelers moeten dezelfde Dolphin versie en instellingen gebruiken.\n"
-"Schakel alle geheugenkaarten uit of stuur ze naar alle spelers voor het "
-"spelen.\n"
-"Wiimote ondersteuning is niet geïmplementeerd.\n"
-"\n"
-"Je moet de TCP poort forwarden voor het hosten!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR Codes"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Over Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Acceleratie"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Accuratie:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emuleer de EFB kopieën nauwkeurig.\n"
-"Sommige spellen zijn hiervan afhankelijk voor een aantal grafische effecten "
-"of gameplay functionaliteit.\n"
-"\n"
-"Bij geval van twijfel, markeer EFB to Texture."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Actie"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -495,7 +527,7 @@ msgstr ""
 "Verantwoordelijke code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -503,7 +535,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : address = %08x) in Voeg Code "
 "Toe (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -512,7 +544,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Vul en Schuif "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -521,7 +553,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Ram Schrijf "
 "En Vul (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -530,12 +562,12 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Schrijf Naar "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Fout: Verkeerde waarde  (%08x) in Geheugen Kopie (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -545,173 +577,141 @@ msgstr ""
 "geimplementeerd (%s)\\n\n"
 "Master codes zijn niet nodig. Gebruik geen master codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Fout: foutive AR code regel: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditionele Code: Onjuiste Grootte %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Onjuiste Normal Code Type %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Code %i: Onjuist subtype %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: Onjuist Subtype %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Voeg toe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Voeg een ActionReplay Code toe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Voeg een Patch toe"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Voeg een nieuwe paneel toe"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Voeg toe..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adres :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Voegt de specifieke waarde toe aan de zFar parameter. \n"
-"Twee manieren om de floating point values te representeren. \n"
-"Voorbeeld: het direct invoeren van \"200\" of \"0.0002\" levert hetzelfde "
-"effect, de uiteindelijke waarde zal \"0.0002\" zijn. \n"
-"Waardes: (0 -> +/- Integer) of (0 -> +/-FP[6 decimalen van precisie])\n"
-"\n"
-"NB: Controleer de uiteindelijke waardes in LogWindow/Console."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Voegt de specifieke waarde toe aan de zNear parameter. \n"
-"Twee manieren om de floating point values te representeren. \n"
-"Voorbeeld: het direct invoeren van \"200\" of \"0.0002\" levert hetzelfde "
-"effect, de uiteindelijke waarde zal \"0.0002\" zijn. \n"
-"Waardes: (0 -> +/- Integer) of (0 -> +/-FP[6 decimalen van precisie])\n"
-"\n"
-"NB: Controleer de uiteindelijke waardes in LogWindow/Console."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Stel de vereiste analoge control drukgevoeligheid in om de knop te activeren."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Geavanceerde Instellingen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Alle GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Alle Gamecube GCM bestanden (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Alle Save Staten (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii ISO Bestanden (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Alle Bestanden (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analyseer"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Hoek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropic Filtering:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader heeft de verkeerde grootte.. is het wel echt een Apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader kan het bestand niet laden"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Toepassen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -721,16 +721,12 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer (uit)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Weet je zeker dat je  \"%s\"? wilt verwijderen?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -738,56 +734,83 @@ msgstr ""
 "Weet je zeker dat je dit bestand wilt verwijderen?\n"
 "Deze gegevens zijn niet terug te halen!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Weet je zeker dat je dit bestand wilt verwijderen?  Deze gegevens zijn niet "
 "terug te halen!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (Experimenteel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Beeldverhouding:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Er moet tenminste één paneel open blijven."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Geluid"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Geluid Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Veelvoud van 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Automatisch (Venster Grootte)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Venster grootte automatisch aanpassen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -797,134 +820,150 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP register "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Terug"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Backend Instellingen"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Geluids backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Achtergrond invoer"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Terug"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Verkeerde bestands header"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Banner Details"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Balk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Basis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Basis Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blokken"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blauw"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blauw Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blauw Rechts"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Onder"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Gekoppelde controls: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Defect"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Zoek"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Zoek een folder om toe te voegen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Zoek een ISO folder"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Zoek een uitvoer folder"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -932,120 +971,100 @@ msgstr ""
 "Voorkomt het legen van de data cache door de DCBZ instructie. Laat deze "
 "optie meestal ongeactiveerd. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP Reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulatie Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Activeer scherm lijst caching."
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Bereken belichting van 3D graphics per-pixel, in plaats van per vertex.\n"
-"Verlaagt de emulatiesnelheid met een aantal procent (afhankelijk van je "
-"grafische kaart).\n"
-"Dit is meestal een veilige toevoeging, maar kan in sommige gevallen "
-"problemen opleveren.\n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"In geval van twijfel leeg laten."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Kan Wiimote met verbinding %02x niet vinden"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatale Error"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Kan %s niet openen"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Kan geen events afmelden als er events in afwachting zijn"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Kan dat bestand niet als geheugenkaart gebruiken.\\n\n"
-"%s\\n\n"
-"is geen geldig gamecube geheugenkaart bestand."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Kan dat bestand niet als geheugenkaart gebruiken. \n"
-"Probeer je hetzelfde bestand in beide slots te gebruiken?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalaans"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Middelpunt"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Verander"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Verander &Schijf"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Verander Schijf"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Spel veranderen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1053,75 +1072,63 @@ msgstr ""
 "Verander de taal van de gebruikersinterface.\n"
 "Vereist een herstart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Verandert teken van zVer parameter (na correctie)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Verandert teken van zDichtbij parameter (na correctie)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Cheat Zoeken"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Cheats Manager"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Controleer Partitie integriteit"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Integriteit controleren..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinees (Vereenvoudigd)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinees (Traditioneel)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Kies een DVD Station:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Kies een NAND basismap:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Kies een standaard ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Kies een folder om toe te voegen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Kies een bestand om te openen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Kies een geheugen kaart:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1129,27 +1136,27 @@ msgstr ""
 "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen "
 "uit mappen zijn opgebouwd)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Kies de folder om naar uit te pakken"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Cirkel Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassiek"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Legen"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1157,183 +1164,230 @@ msgstr ""
 "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. "
 "Je moet het spel handmatig stoppen."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Sluit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "In&stellingen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Code Info"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Code: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Commando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Reactie"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Reactie:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimeer ISO ..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Comprimeer geselecteerde ISO's ..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "ISO wordt gecomprimeerd"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Config"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configureer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configureer Besturing"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configureer Besturing Pads"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configureer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Bevestig om bestand over te schrijven."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Bevestiging bij Stop"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Verbind"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Verbind Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Verbind USB Toetsenbord"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Verbind Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Verbind Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Verbind Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Verbind Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Verbind Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Console"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Continu scannen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Bestuur"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Omzetten naar GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopiëren mislukt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopieer naar MemKaart %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Het volgende bestanden kon niet gemaakt worden %s "
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Kon de %s backend niet initialiseren."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Kon het bestnad \"%s\" niet lezen. Er is geen schijf in de drive, of het is "
-"geen GC/Wii backup.Meeste PC DVD drives kunnen geen originele Gamecube en "
-"Wii schijven lezen!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kon ISO bestand %s niet herkennen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Kon %s niet opslaan"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1354,11 +1408,19 @@ msgstr ""
 "Zo ja, dan moet je je memory card locatie opnieuw aangeven in de "
 "configuratie."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Kon geen open commando vinden voor extensie 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1366,38 +1428,46 @@ msgstr ""
 "Kon de kern niet initialiseren.\n"
 "Controleer je instellingen."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Tel:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Maak AR Code"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Maak een nieuwe  perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Auteur:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritiek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1407,200 +1477,191 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Huidige map verandert van %s naar %s na wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Aangepaste Projectie Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Aangepaste Projectie Instellingen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Pas sommige orthogonale projectie parameters aan."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tsjechisch"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP Emulator Motor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulatie (snel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE hercompileerder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "DSP Instellingen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE op toegeweide thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD Station:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Fatale Error: kan het volume niet lezen"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Fatale Error: kan het volume niet lezen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Dansmat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Data grootte"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Datum:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro bestanden(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Dode Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Fouthersteller"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimaal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Decomprimeer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Decomprimeer geselecteerde ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Decomprimeer ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Verlaag framelimit"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Standaard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Standaard ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Standaard font"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Verwijder"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Verwijder Save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Verwijder het bestaande bestand '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Beschrijving"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detect"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Poging gedecteerd om meer data af te lezen van een DVD dan dat er in de "
-"buffer past. Klem"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Apparaat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Apparaat Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Bellen"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1608,20 +1669,23 @@ msgstr ""
 "Map checksum is mislukt\n"
 " en map backup checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Disable Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Schakel Fog uit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1635,287 +1699,213 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Schakel de emulatie van EFB kopieën uit.\n"
-"Dit wordt vaak gebruik voor post-processing of render-naar-texture effects. "
-"Alhoewel deze instelling een speedup geeft, veroorzaakt het ook bijna altijd "
-"problemen.\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Sla de destination alpha pass over die in veel spellen voor verschillende "
-"grafische effecten gebruikt wordt.\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Schijf"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Schijf Lees Fout"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Scherm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Weergeef de gelezen inputs van de emulator.\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Verdelen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Wil je de emulatie stoppen?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II decodering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branche: %s\n"
-"Revisie: %s\n"
-"Gecompiled op: %s @ %s\n"
-"\n"
-"Dolphin is een Gamecube/Wii emulator dat oorspronkelijk was ontwikkeld door "
-"F|RES en ector. Tegenwoordig is Dolphin een open source project met vele "
-"bijdragers, te veel om op te noemen.\n"
-"Als je geïnteresseerd bent, bezoek onze project pagina op\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Speciale dank aan Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 en Hotquik voor hun\n"
-"reverse engineering en docs/demos.\n"
-"\n"
-"Grote dank aan Gilles Mouchard wiens Microlib PPC\n"
-"emulator onze ontwikkeling een grote schop vooruit gaf.\n"
-"\n"
-"Dank aan Frank Wille voor zijn PowerPC disassembler,\n"
-"dat or9 en wij hebben aangepast om de Gekko bijzonderheden te omvatten.\n"
-"\n"
-"Dank aan hcs/destop voor hun GC ADPCM decoder.\n"
-"\n"
-"We zijn niet verbonden met Nintendo op geen enkele manier.\n"
-"Gamecube en Wii zijn handelsmerken van Nintendo.\n"
-"De emulator is alleen voor educatieve doeleinden\n"
-"en mag niet worden gebruikt om spellen te spelen die je niet legaal bezit."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafische Configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin &Web Site"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin Configuratie"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Geëmuleerde Wiimote configuratie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GCPad Configuratie"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Film (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote configuratie"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin op &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin kan geen GC/Wii ISO's vinden. Dubbelklik om bestanden te zoeken..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle "
-"spellen te weergeven..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin kan de verzochte actie niet uitvoeren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Verdubbelt de geemuleerde GPU clock snelheid. Kan de emulatie versnellen. "
-"(AAN = Snel, UIT = Compatibel)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Omlaag"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Download Codes (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu codes gedownload. (%lu toegevoegd)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Drums"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Pop"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Dump Geluid"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Dump EFB Doel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Dump Frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Dump Textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dump alle gerenderde afbeeldingen naar een AVI bestand in User/Dump/Frames/\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dump gedecodeerde spel textures naar User/Dump/Textures/<game id>/\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Dump de inhoud van de EFB kopiën naar User/Dump/Textures/\n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "Sl&uiten"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Regio kopie"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1927,56 +1917,40 @@ msgstr ""
 "versie %d.%d -- Als je recentelijk Dolphin hebt geupgrade is het mogelijk "
 "dat je Windows moet herstarten om deze de driver te  detecteren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Vroege Geheugen Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Wijzig"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Wijzig ActionReplay Code"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Wijzig Configuratie"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Wijzig lokale overschrijvingen"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Wijzig Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Wijzig het huidige perspectief"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Wijzig..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effect"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Ingebedde Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Emu Thread draait al!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1990,7 +1964,7 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer virtuele XFB emulatie."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2006,121 +1980,92 @@ msgstr ""
 "\n"
 "In geval van twijfel geselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Geëmuleerde Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Emulatie Staat:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Activeer"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Schakel 3D effecten in via Stereoscopie door gebruik te maken van Nvidia 3D "
-"Vision technologie als het ondersteund wordt door je grafische kaart. \n"
-"Kan wellicht problemen veroorzaken. \n"
-"Volledig scherm moet ingeschakeld zijn om dit te laten werken.\n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Activeer AR Logging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Activeer Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Activeer Bounding Box Berekeningen"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Activeer Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Activeer Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Activeer Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Activeer Dual Core (verhoogt de snelheid)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Activeer Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activeer Idle Skipping (verhoogt de snelheid)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Activeer MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Activeer Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Activeer Schermbeveiliger"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Activeer Speaker Data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Activeer BreedBeeld"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Activeer Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Schakel anisotropische filtering in.\n"
-"Verbetert de  visuele kwaliteit van textures die op de schuine kijkhoek. \n"
-"Kan in enkele gevallen problemen opleveren met bepaalde spellen.\n"
-"\n"
-"In geval van twijfel selecteer 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = "
-"Snel, UIT = Compatibel)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Activeer Pagina's"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2132,7 +2077,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2144,34 +2089,25 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. "
-"Uitschakelen voor elk ander spel."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Schakelt aangepaste projectie hack in"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Activeert Dolby Pro Logic II emulatie met 5.1 surround. Niet beschikbaar met "
-"OSX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Activeert Dolby Pro Logic II emulatie met 5.1 surround. Alleen voor OpenAL "
-"backend."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2184,7 +2120,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2192,7 +2128,11 @@ msgstr ""
 "Schakel de Memory Management Unit in, die nodig is voor sommige games. (AAN "
 "= Compatibel, UIT = Snel)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2202,52 +2142,63 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Einde"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Engels"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Verbeteringen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Voeg een naam toe voor een nieuwe perspectief:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Toegang %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Toegang 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Gelijk"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Error (Fout)"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de "
 "systeemtaal."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2256,7 +2207,7 @@ msgstr ""
 "Fout: Na \\\"%s\\\", gevonden %d (0x%X) in plaats van bewaar punt %d (0x%X). "
 "Bewaarstaat laadactie wordt geannuleerd..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2266,219 +2217,191 @@ msgstr ""
 "geladen. Spellen kunnen wellicht lettertypes niet juist afbeelden, of "
 "crashen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Verlaten"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforie"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Sluit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exporteer alle Wii saves"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Exporteren Mislukt"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exporteer Bestand"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exporteer Opname..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exporteer Opname..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exporteer Save"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exporteer Wii save (Experimenteel)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exporteer alle saves..."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Exporteren mislukt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exporteer save als..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extensie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Externe Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Extra Parameter"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Alle Bestanden Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Apploader Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOL Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Map Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Bestand Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Partitie Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Alle Bestanden Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Uitpakken van de map"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Uitpakken..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO Speler"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "Frankrijk"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST Groote:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Verbinden Mislukt!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Mislukt om de codes te downloaden."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Mislukt om naar %s uit te pakken!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Kon de volgende DSP ROM niet laden:\t %s\n"
-"\n"
-"Dit bestand is vereist als je DSP LLE wil gebruiken.\n"
-"Het bestand is niet toegevoegd aan Dolphin aangezien het materiaal valt dat "
-"onder copyright valt.\n"
-"Gebruik DSPSpy om deze bestanden van je fysieke console te dumpen. \n"
-"\n"
-"Je kunt wel de DSP HLE motor gebruiken die geen ROM dumps vereist.\n"
-"(Stel deze in via de \"Audio\" tab of het configuratie scherm.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Fout tijdens het laden van bthprops.cpl! Je kunt echte Wiimotes niet meer "
-"verbinden en Dolphin kan onverwachts crashen!"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Fout tijdens het laden van hid.dll! Je kunt echte Wiimotes niet meer "
-"verbinden en Dolphin kan onverwachts crashen!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Kon geen data lezen van %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Mislukt om banner.bin te lezen"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "bk header lezen mislukt"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Het lezen van de save data blok %d is mislukt\\n\n"
 "De geheugenkaart is wellicht afgeknot\\n\n"
-"BestandsPositie:%llx"
+"BestandsPositie:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2486,7 +2409,7 @@ msgstr ""
 "Het lezen van de block allocation table backup is mislukt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2494,17 +2417,12 @@ msgstr ""
 "Het lezen van de block allocation table is mislukt\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Mislukt om gegevens uit %d te lezen"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Kon geen data lezen van bestand: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2512,7 +2430,7 @@ msgstr ""
 "Het lezen van de map backup is mislukt\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2520,11 +2438,7 @@ msgstr ""
 "Het lezen van de map is mislukt\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Kon de header niet lezen"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2532,50 +2446,35 @@ msgstr ""
 "Het lezen van de header is mislukt\n"
 "(0x000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Kon de header niet lezen voor bestand %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Het lezen van de unieke ID van de schijf image is mislukt"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Het schrijven van BT.DINF naar SYSCONF is mislukt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Mislukt om te schrijven bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Kon geen data schrijven in bestand: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Het schrijven van header voor %s is mislukt"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Snel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Snelle Diepte Calculatie"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Snelle versie van de MMU. Werkt niet voor elk spel."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2583,23 +2482,27 @@ msgstr ""
 "Fatale desync. Terugspelen wordt geannuleerd. (Fout in SpeelWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo Speler"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Bestands Info"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Bestand bevat geen codes."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Bestand geconverteerd naar .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2607,7 +2510,7 @@ msgstr ""
 "Bestand kon niet geopend worden\n"
 "of heeft geen valide extensie"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2616,96 +2519,93 @@ msgstr ""
 "Bestand heeft de extensie \"%s\"\n"
 "juiste extensie zijn (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Bestand is niet herkend als geheugenkaart"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Bestand niet gecompressed"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Onbekende open mode: 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Bestand systeem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Zoek volgende"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Zoek vorige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Eerste Blok"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Herstel Checksums"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forceer 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forceer 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
-msgstr "Forceer Textuur Filtering"
+msgstr "Forceer NTSC-J Console"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forceer Texture Filtering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Forceert texture filtering zelfs als het spel het niet toe laat.\n"
-"Verbetert de textuur kwaliteit (vooral bij gebruik van een hoge interne "
-"resolutie) maar veroorzaakt glitches in sommige games. \n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Forceer het spel om in breedbeeld weer te geven.\n"
-"Merk op dat dit beeldhaperingen zou kunnen veroorzaken. \n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Forceert NTSC-J mode om het Japanese ROM lettertype te gebruiken. \n"
-"Als dit veld leeggelaten wordt zal Dolphin automatisch NTSC-U kiezen, en "
-"deze instelling automatisch aanzetten als je de Japanese versie van spellen "
-"speelt."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2713,555 +2613,579 @@ msgstr ""
 "Formateer als ascii (NTSC\\{AL)? \n"
 "Kies nee voor sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Vooruit"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "Poort forwarden (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "%d resulataten gevonden voor '"
+msgid "Found %u results for '"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "%x saves gevonden"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Frame Geavanceerd"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Frame Dumps gebruiken FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Frame Informatie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Frame Bereik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Frame O&verslaan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Framelimiet:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Frames om op te nemen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Vrije kijk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Frans"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Van"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Volledig scherm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Volledige Scherm Resolutie:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI Bestand(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Spel ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Het spel draait al!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Het spel draait niet!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Spel niet gevonden!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Spel Specifieke Instellingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Spel Config"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube Savegame bestanden(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Gamecube &Pad Instellingen"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube Pad Instellingen"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko Codes"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"GeckoCode kon niet starten (CT%i CST%i) (%s)\\n\n"
-"(ofwel door een onjuiste code of het type code is nog niet ondersteund. "
-"Probeer de originele code, door het codehandler.bin bestand in de Sys "
-"directory te plaatsen en Dolphin opnieuw op te starten.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Algemeen"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Algemene Instellingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Duits"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Index is groter dan de grootte van de AR code lijst %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafische"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Grafische instellingen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Grooter dan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Verbetert de kwaliteit van texturen enorm wanneer deze gegenereerd zijn met "
-"render-naar-texture effecten.\n"
-"Het verhogen van de interne resolutie zal het effect van deze instelling "
-"verhogen.\n"
-"Deze optie verminderd de prestatie enigszins en kan mogelijk problemen "
-"veroorzaken (hoewel onwaarschijnlijk).\n"
-"\n"
-"Bij geval van twijfel gemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grieks"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Groen "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Groen Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Groen Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitaar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Header checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebreeuws"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Hoogte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Help"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hallo,\n"
-"\n"
-"Dolphin vereist Mac OS X 10.7 of hoger.\n"
-"Helaas gebruik je een oude versie van OS X.\n"
-"De laatste versie van Dolphin dat OS X 10.6 ondersteunt is Dolphin 3.5\n"
-"Upgrade alsjeblieft naar 10.7 of hoger om de nieuwste versie van Dolphin te "
-"kunnen gebruiken.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hoi,\n"
-"\n"
-"Dolphin vereist dat je CPU ondersteuning heeft voor SSE2 extensies \n"
-"Helaas ondersteund je CPU deze niet, dus kan Dolphin niet draaien.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Verberg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Verberg Muis Cursor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Verbergt de cursor als deze boven het emulatie venster is. \n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Thuis"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Sneltoets Configuratie"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Hongaarse"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybride Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Poging tot verkrijgen van data van een onbekende ticket: "
 "%08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 "IOCTL_ES_LAUNCH: Het spel probeerde het IOS of een titel die niet "
 "beschikbaar is in je NAND dump te laten\n"
-"TitleID %016llx.\n"
+"TitleID %016<PRIx64>.\n"
 "Dolphin zal waarschijnlijk blijven hangen."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR Aanwijzer"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR Gevoeligheid:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO Details"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO Map"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIË"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Icoon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Wanneer dit geselecteerd is, worden de bounding box registers ge-update. "
-"Gebruikt door de Paper Mario spellen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Negeer formaat veranderingen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Negeer elke verandering aan het EFB formaat. \n"
-"Verbeterd de performance in veel spelen zonder negatief effect. Veroorzaakt "
-"echter in een klein aantal spellen grafische defecten.\n"
-"\n"
-"In geval van twijfel ingevuld laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Negeer elke poging van de CPU om te lezen van of te schrijven naar de EFB.\n"
-"Verbeterd de prestaties in sommige spellen, maar kan enkele gameplay "
-"gerelateerde features of grafische effecten uitschakelen. \n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importeer Save"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importeer Wii save"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Importeren mislukt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Geimporteerd bestand heeft gsc extensie\n"
-"maar heeft niet de juiste header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Geimporteerd bestand heeft een onjuiste lengte"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Geimporteerd bestand heeft sav extension\n"
-"maar heeft geen juiste header"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "In Game"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Verhoog framelimit"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informatie"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Invoer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Toevoegen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Voer Gecodeerde of Gedecodeerde code hier in..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Schakel SD Card in"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Voeg naam hier toe"
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Installeer WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Installeren in Wii-menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
-"niet."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "WAD aan het installeren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Integriteitscontrole Fout"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Integriteitscontrole afgerond"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Integriteitscontrole afgerond. Geen fouten gevonden."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Integriteitscontrole for partitie %d mislukt. De dump is waarschijnlijk "
-"corrupt or is verkeerd gepatcht. "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interface Instellingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Interface Instellingen"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Interne LZO fout - compressie is mislukt"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3270,103 +3194,106 @@ msgstr ""
 "Interne LZO fout - decompressie is mislukt (%d) (%li, %li) \n"
 "Probeer de staat opnieuw te laden"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Interne LZO fout - lzo_init() is mislukt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Interne Resolutie:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreteer (Behoorlijk langzaam)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Onjuiste grootte (%x) of Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Onjuiste waarde!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Onjuiste bat.map of map vermelding"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Onjuist event type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Onjuist bestand"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Onjuiste opening.bnr gevonden in gcm:\n"
-"%s\n"
-"Wellicht moet je dit spel opnieuw dumpen"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Onjuist opname bestand"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Ongeldige zoek-parameters (geen object geselecteerd)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Ongeldige zoekopdracht (niet in staat naar nummers te converteren)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Ongeldige zoekopdracht (alleen even string lengte ondersteund)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Onjuiste staat"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italië"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT Recompiler (aanbevolen)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL experimentele recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japans"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3376,64 +3303,75 @@ msgstr ""
 "\\n\n"
 "Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Houdt venster bovenop"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Toets"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreaans"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L Knop"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analoog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Taal:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Laatste %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Wachttijd:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Linker Knuppel"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Links-klik om sneltoetsen te detecteren.\n"
-"Druk op spatie om te legen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3443,7 +3381,7 @@ msgstr ""
 "Midden-klik om te wissen.\n"
 "Klik met de rechtermuisknop voor meer opties."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3451,202 +3389,211 @@ msgstr ""
 "Links / Rechts-klik voor meer opties.\n"
 "Midden-klik om te wissen."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Minder dan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limiteer met behulp van FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Laad"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Laad Aangepaste Textures"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Laad staat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Laad laatste staat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Laad laatste staat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Laad laatste staat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Laad laatste staat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Laad laatste staat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Laad laatste staat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Laad laatste staat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Laad laatste staat 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Laad staat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "Laad staat 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Laad staat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Laad staat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Laad staat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Laad staat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Laad staat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Laad staat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Laad staat 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "Laad staat 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Laad staat..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Laad Wii System Menu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Laad Wii System Menu %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Laad aangepaste textures van User/Load/Textures/<game id>/\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Logboek"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Logboek configuratie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Log FPS naar bestand"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Log Types"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Log de hoeveelheid beelden gecreeerd per seconde naar User/Logs/fps.txt. "
-"Gebruik deze optie als je de prestaties van Dolphin wilt meten.\\n\n"
-"\\n\n"
-"Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Logger Uitvoer"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Logboek Bijhouden"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Verbinding met de server verloren!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Knop"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"Verkeerde MD5\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Snelheids Hack"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark bestanden(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Hoofd Knuppel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Maker ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Maker:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3660,29 +3607,33 @@ msgstr ""
 "\n"
 "In geval van twijfel laat dit uitgevinkt."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "De geheugenkaart heeft al een save voor deze titel"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "De geheugenkaart is al geopend"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Geheugen Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Geheugen Kaart"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3690,7 +3641,7 @@ msgstr ""
 "Geheugenkaart Manager Waarschuwing - Maak backups voor gebruik, het zou "
 "moeten werken"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3707,39 +3658,54 @@ msgstr ""
 "%s\n"
 "Wil je de oude bestanden naar de nieuwe lokatie kopiëren?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "Het formaat van de geheugenkaart komt niet overeen met het formaat van de "
 "header."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Microfoon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Overig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Overige Instellingen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Aanpasser"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3751,20 +3717,24 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Niet-proportioneel (monospace) lettertype"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3783,314 +3753,287 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Vermenigvuldigen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "Notitie: Steam grootte komt niet overeen met werkelijke lengte\\n\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Toevoegen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimaal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Verwijderen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Verdalen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Omlaag"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP Einde"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Gelijk"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Thuis"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Invoegen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Vermenigvuldigen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Pagina Omlaang"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Pagina Omhoog"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Rechts"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Scheiding"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Ruimte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Aftrekken"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Omhoog"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Naam:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Naam:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI-bestanden (*. GCI)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nieuwe Scan"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Volgende Scan"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Gebruikersnaam :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Geen land (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Geen ISOs of WADS gevonden."
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Geen audio output"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Geen banner gevonden voor titel  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Geen omschrijving beschikbaar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Geen docking"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Geen bestand geladen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Geen vrije map indexes"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Geen opgenomen bestand"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Geen save map gevonden voor titel %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Geen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Noorweegse Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Niet gelijk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Niet ingesteld"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Geen Wii save of het lezen van de grootte van bestandsheader %x is mislukt"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Opmerkingen"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Opmerkingen:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Opmerkingen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Aantal Codes:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuk Acceleratie"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Object"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Object Bereik"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Uit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Afstand:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "In-Scherm Berichtgeving"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online & Documentatie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Er zijn maar %d blocks beschikaarr"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Open"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Open &bevattende map"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Open Wii &save map"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Open Bestand..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: Kan geen context aanmaken voor device %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kan geen geluids devices vinden"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kan device %s niet openen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
@@ -4098,22 +4041,18 @@ msgstr ""
 "Opent de standaard (alleen lezen) configuratie voor deze spel in een externe "
 "tekst editor."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Opent de gebruiker gespecificeerde overschrijvingen in een externe tekst "
-"editor."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opties"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oranje"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4124,345 +4063,326 @@ msgstr ""
 "Rechts-klik en exporteer alle save bestanden,\n"
 "en importeer de saves naar een nieuwe geheugenkaart\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Overige"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"De andere client is losgekoppeld terwijl het spel draait!! NetPlay is "
-"uitgeschakeld. Je moet het spel handmatig stoppen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Uitgang"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Opname afspelen"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraaf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parameters"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partitie %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Patitie bestaat niet: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pauze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pauze aan het eind van de film"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Belichting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfect"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectief %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Speel"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Speel Opname"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Spel/Pauze"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Speelbaar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Terugspeel Opties"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Spelers"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Bevestig alsjeblieft..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Maak een perspectief voor het opslaan"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Ongeveer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Pools"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Poort 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Poort 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Poort 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Poort 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Poort :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugees"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugees (Braziliaans)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Presets: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Vorige Pagina"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Vorige Pagina"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Vorige waarden"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profiel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Cache leegmaken"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Vraag"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Stoppen"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R Knop"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analoog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSLAND"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radius"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Afstand"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Alleen-lezen modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Echt"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Echte Balance Board"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Echte Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Echte Wiimotes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Speel Opnemen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Neem input op"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Opname Informatie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opname Opties"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rood"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rood Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rood Rechts"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Vermindert de hoeveelheid aliasing veroorzaakt door rasteren 3D-graphics.\n"
-"Dit maakt de gerenderde afbeelding minder hoekig. \n"
-"Vermindert de emulatie snelheid enorm, en kan soms problemen veroorzaken.\n"
-"\n"
-"In geval van twijfel selecteer Geen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Ververs"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Lijst Verversen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Ververs de speellijst"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Verwijder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4473,244 +4393,320 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Geef weer op hoofdscherm"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Opnieuw"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultaten"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisie:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Rechter Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
-"Zet DSP LLE op een toegeweide thread (niet aangeraden omdat het freezes kan "
-"veroorzaken)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russisch"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "S&la Staat Op"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Betrouwbaar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Opslaan"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Sla GCI op als..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Sla oudste staat op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Sla staat op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Sla Staat 1 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "Sla Staat 10 op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Sla Staat 2 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Sla Staat 3 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Sla Staat 4 op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Sla Staat 5 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Sla Staat 6 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Sla Staat 7 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Sla Staat 8 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "Sla Staat 9 op"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Sla staat op als..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Sla gecomprimeerde GCM / ISO op"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Sla huidige perspectief op"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Sla gedecomprimeerd GCM / ISO op"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Geschaalde EFB Kopie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Scannen van %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Scannen voor ISO's"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Scannen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Slot"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Zoeken"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Zoekfilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Zoeken in submappen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Zoek huidige Object"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Zoek naar hex Waarde:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Sectie %s niet gevonden in SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Selecteer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Selecteer de opname Bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Selecteer een Wii WAD bestand om te installeren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Selecteer de te gebruiken hardware-adapter.\n"
-"\n"
-"In geval van twijfel, gebruik de eerste."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Selecteer een save file om te importeren"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Selecteer zwevende vensters"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Selecteer het bestand om het te laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Selecteer het save - bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Selecteer de Staat om te laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Selecteer de Staat om op te slaan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4726,273 +4722,292 @@ msgstr ""
 "Force 4:3: Strek de afbeelding naar een beeldverhouding van 4:3\n"
 "Stretch naar het venster: Stretch de afbeelding naar je venster grootte."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Geselecteerd controller profiel bestaat niet"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Geselecteerde font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Selecteert de weergave resolutie die wordt gebruikt in volledige scherm "
-"modus.\n"
-"Dit moet altijd groter of gelijk zijn dan de interne resolutie. Deze optie "
-"heeft weinig impact op de prestaties.\n"
-"\n"
-"In geval van twijfel, gebruik je desktop resolutie. \n"
-"Als je nog steeds twijfelt, gebruik de hoogste resolutie die voor jou werkt."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Selecteer de intern te gebruiken grafische API.\n"
-"Direct3D 9 is meestal de snelste. OpenGL is echter nauwkeuriger. Direct3D 11 "
-"zit ergens tussenin.\n"
-"Let erop dat de Direct3D backends alleen op Windows beschikbaar zijn.\n"
-"\n"
-"In geval van twijfel gebruik Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Selecteer de intern te gebruiken grafische API.\n"
-"Direct3D 9 is meestal de snelste. OpenGL is echter nauwkeuriger. Direct3D 11 "
-"zit ergens tussenin.\n"
-"Let erop dat de Direct3D backends alleen op Windows beschikbaar zijn.\n"
-"\n"
-"In geval van twijfel gebruik OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Verzend"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Sensor Bar Positie:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Servisch"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Serial Port 1 - Dit is de poort die apparaten zoals de net-adapter gebruiken"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Ingesteld als &standaard ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Ingesteld als standaard memcard% c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Index is groter dan de grootte van de AR Code lijst %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Zet de wachttijd (in ms). Hogere waarden kunnen krakende audio verminderen. "
-"Alleen voor OpenAL instellingen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Instellingen..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Kan het instellingen bestand niet aanmaken"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Schudden"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Korte Naam:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Schouder Knoppen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Toon &Console"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Toon &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Toon &Statusbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Toon &Toolbar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Toon standaarden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Toon Schijven"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Weergeef EFB Kopie Regios"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Toon FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Toon Frans"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
-msgstr "Toon Gamecube"
+msgstr "Toon GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Toon Input Venster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Toon Italië"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Toon JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Toon Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Toon Taal:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Bekijk Log &Configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Toon PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Toon Platformen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Toon Regio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Weergeef statistieken"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Toon Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Toon USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Toon Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Toon Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Toon een bevestigingsvenster voordat u stopt met een spel."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Toon een bericht wanneer er een mogelijk ernstige fout is opgetreden.\n"
-"Als je dit uitschakeld zie je geen irritante berichten, maar het betekend "
-"ook dat Dolphin spontaan uit kan vallen zonder enige reden."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Toon eerste blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Toon vertragingsteller"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Geef berichten weer op het emulatiescherm.\\n\n"
-"Dit betreft berichten betreffende geheugenkaart schrijven, video "
-"instellingen, CPU informatie, en JIT cache verversing."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Toon save blocks"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Toon save commentaar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Toon save icon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Toon save titel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -5004,84 +5019,82 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Toon onbekend"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Weergeef een aantal verschillende statistieken.\n"
-"\n"
-"In geval van twijfel leeg laten."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Zijdelings Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Vereenvoudigd Chinees"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Grootte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Sla BIOS Over"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Sla het legen van DCBZ over"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Sla EFB toegang van de CPU over"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Versnelt het EFB naar RAM kopiëren lichtelijk door de nauwkeurigheid van de "
-"emulatie op te offeren.\n"
-"Verbetert soms ook de beeldkwaliteit.\n"
-"Wanneer er enige problemen optreden, probeer dan de texture cache precisie "
-"te verhogen of schakel deze optie uit.\n"
-"\n"
-"Bij geval van twijfel ongemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Software Weergever"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5093,154 +5106,173 @@ msgstr ""
 "Weet je zeker dat je software rendering aan wil zetten? In geval van "
 "twijfel, selecteer 'Nee'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Geluids Instellingen"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Geluids backend %s is niet juist."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Het aanmaken van de geluids buffer  is mislukt: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Ruimte"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spaans"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Speaker Volume:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Specificeert de resolutie die gebruikt wordt voor het renderen. Een hoge "
-"resolutie verbeterd de visuele kwaliteit enorm, maar zorgt voor een flinke "
-"deuk in de prestaties en kan glitches veroorzaken in sommige spellen.\n"
-"\"Meervouden van 640x528\" is een stuk trager dan \"Venster Grootte\" maar "
-"veroorzaakt minder problemen. Over het algemeen geld dat hoe lager de "
-"interne resolutie, hoe beter de prestaties.\n"
-"\n"
-"In geval van twijfel selecteer 640x528"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Versnel Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Vierkante knuppel"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standaard Controller"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Start &netplay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Start Op&nemen"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Start Opnemen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Staat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Opgeslage Staten"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Stuurwiel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Knuppel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Stop"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Sla EFB kopieën op in GPU texture objecten.\n"
-"Dit is niet zo nauwkeurig, maar het werkt goed genoeg voor de meeste spellen "
-"en levert een flinke versnelling op ten opzichte van EFB naar RAM.\n"
-"\n"
-"Bij geval van twijfel gemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Uitrekken naar Venster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Onttrekken "
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Bestand succesvol gexporteerd naar %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Succesvol save games geimporteerd"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Zweeds"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Zwaai"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synchroniseer GPU thread"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5248,81 +5280,110 @@ msgstr ""
 "Synchroniseert de GPU en CPU threads om willekeurige freezes te voorkomen in "
 "Dual Core modus. (Aan = Compatibel, Uit = Snel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Systeem Taal:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS Ingang"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Linker Tabel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Rechter Tabel"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Neem een Schermafdruk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Texture"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Texture Formaat Overlay"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "De WAD is succesvol geinstalleerd"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Het adres is onjuist"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "De checksum was met succes gefixt"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "De gekozen map  is al in de lijst"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5331,7 +5392,7 @@ msgstr ""
 "Het bestand %s bestaat al.\n"
 "Wilt u het vervangen?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5340,48 +5401,34 @@ msgstr ""
 "Het bestand %s kon niet worden geopend om te schrijven. Controleer of het "
 "niet open is in een ander programma."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "Het bestand %s was al open, de bestands header zal niet worden weggeschreven."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Het opgegeven bestand(%s) bestaat niet"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "De naam mag niet leeg zijn"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "De naam mag niet het volgende teken bevatten ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "De resulterende gedecodeerde AR code bevat geen regels."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Hoe veiliger je deze afstelt, hoe kleiner de kans is dat de emulator texture "
-"updates vanuit de RAM mist.\n"
-"\n"
-"Bij geval van twijfel de meest rechtse waarde gebruiken."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"Het save bestand dat je probeert te kopiëren heeft een onjuiste bestands "
-"grootte"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5389,36 +5436,48 @@ msgstr ""
 "De geselecteerde taal wordt niet door je systeem ondersteund. Dolphin zal "
 "terugvallen op je systeems taal."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "De NetPlay versie van de server en client zijn incompatibel!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "De server is vol!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "De server reageerde: het spel draait al!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "De server verstuurde een onbekende foutmelding!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Het opgegeven bestand \"%s\" bestaat niet"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "De waarde is onjuist"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Thema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5426,7 +5485,7 @@ msgstr ""
 "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is "
 "waarschijnlijk incompleet."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5434,7 +5493,7 @@ msgstr ""
 "Deze instellingen overschrijven interne Dolphin instellingen.\n"
 "Onbepaald betekent dat het spel maakt gebruik van Dolphin's instellingen."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5442,123 +5501,163 @@ msgstr ""
 "Deze action replay simulator ondersteund geen codes die de Action Replay "
 "zelf aanpassen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Deze functie stelt je in staat de camera van het spel te veranderen. \\n\n"
-"Houd de rechter muisknop ingedrukt en beweeg de muis om de camera te "
-"verschuiven.\\n Houd SHIFT ingedrukt en druk op een van de WASD knoppen om "
-"de camera met een stap afstand te bewegen (SHIFT+0 om sneller- en SHIFT+9 om "
-"langzamer te bewegen). Druk SHIFT+R om de camera te resetten.\\n\n"
-"\\n\n"
-"Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Dit limiteert de emulatie snelheid naar de gespecificeerde frames per "
-"seconde. (NTSC: 60, PAL: 50). Gebruik Audio om het te limiteren met behulp "
-"van de DSP (kan het klikkend geluid verhelpen, maar kan ook constant lawaai "
-"ten gevolge hebben, afhankelijk van welk spel gespeelt wordt)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Dit splitst de Video-en CPU-threads, zodat ze kunnen worden uitgevoerd op "
-"afzonderlijke cores.\n"
-"Leidt tot grote snelheid verbeteringen op pc's met meer dan een kern, maar "
-"kan ook leiden tot crashes / glitches zo nu en dan."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Drempelwaarde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Kantelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Titel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Naar"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Zet Alle Log Types Aan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Schakel beeldverhouding"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Schakel EFB kopieën"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Schakel fog"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Volledig Scherm Inschakelen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Schakel IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Boven"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chinees (Traditioneel)"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Poging tot het laden van een onbekend bestands type."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Trekkers"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Poging tot het inlezen van een ongeldige SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5566,41 +5665,24 @@ msgstr ""
 "Poging tot het inlezen van een ongeldige SYSCONF\n"
 "Wiimote bt ids zijn niet beschikbaar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turks"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Draaischijf"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Type"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP Port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote "
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "ONBEKEND"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ONBEKEND_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5608,203 +5690,186 @@ msgstr ""
 "Niet mogelijk om patch te creëren vanuit de gegeven waardes.\\n\n"
 "Entry niet aangepast."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Niet in staat om regel %lu van de ingevoerde AR code te verwerken als een "
+"Niet in staat om regel %u van de ingevoerde AR code te verwerken als een "
 "geldige gecodeerde of gedecodeerde code. Controleer of je deze op de juiste "
 "manier hebt ingevoerd. \n"
 "Wil je deze regel negeren en verder gaan met verwerken?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Onbepaalde %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Ongedaan maken van Load staat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Save staat ongedaan maken"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Onverwachtte 0x80 fout? Annuleren..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Onbekend DVD commando %08x - fatale fout"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Onbekende commando 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Onbekende vermeldingstype %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Onbekend bericht ontvangen met id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
 "eruitgeschopt!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Omhoog"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Update"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote rechtop"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Gebruik EuRGB60 Mode (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Gebruik &Volledig Scherm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Gebruik Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Gebruik Panic Handlers"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 "Gebruikt een minder accurate algoritme om de diepte waardes te calculeren.\n"
-"Kan problemen in een paar spellen geven, maar geeft een redelijke speedup.\n"
+"Kan problemen in een paar spellen geven, maar kan een redelijke speedup "
+"geven, afhankelijk van je GPU en/of de game.\n"
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Gebruik meerdere threads om textures te decoderen. \n"
-"Kan voor betere prestaties zorgen (vooral op CPUs met meer dan twee cores).\n"
-"\n"
-"In geval van twijfel ongemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Gebruikt onveilige operaties om de vertex streaming te versnellen in OpenGL. "
-"Er zijn geen problemen op ondersteunde GPU's, maar het kan voor "
-"stabiliteits- en grafische problemen zorgen.\n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Als shader compilatie mislukt wordt gebruikelijk een foutmelding weergeven.\n"
-"Men kan echter de popups overslaan zodat je zonder interrupties kan spelen "
-"door deze optie in te schakelen. \n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Hulpprogramma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Speed Hack"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Waarde"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Waarde:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Waarde:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Breedsprakigheid"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Vertex Streaming Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtueel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installatie mislukt: fout bij het creëren van %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD installatie mislukt: fout bij het creëren van ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5816,25 +5881,27 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Waarschuwing - DOL wordt in de verkeerde console mode gestart!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Waarschuwing - ELF  wordt in de verkeerde console mode gestart!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5846,7 +5913,7 @@ msgstr ""
 "%s\n"
 "Weet je zeker dat je door wil gaan?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5859,7 +5926,7 @@ msgstr ""
 "en heeft dezelfde naam als een bestand op je geheugenkaart\n"
 "Doorgaan?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5870,7 +5937,15 @@ msgstr ""
 "> %u) (frame %u > %u). Je dient een andere save te laden voordat je verder "
 "gaat, of deze staat laden met alleen-lezen uitgeschakeld. "
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5882,7 +5957,7 @@ msgstr ""
 "of deze staat laden met alleen-lezen uitgeschakeld. Anders zullen er "
 "waarschijnlijk synchronisatie problemen optreden. "
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5917,178 +5992,165 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DOmhoog=%d, DOmlaag=%d, DLinks=%d, "
 "DRechts=%d, L=%d, R=%d, LT=%d, RT=%d, AnaloogX=%d, AnaloogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - bestand niet open."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Breedbeeld Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Breedte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii Console "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND basismap:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii save bestanden (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Kon het bestand niet lezen"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Connected"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote instellingen"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Venster Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Venster Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Venster Rechts"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Regelafbreking"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Werken..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Schrijf memcards (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Schrijf naar Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Schrijf naar Fouthersteller"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Schrijf naar Bestand"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Schrijf naar venster"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice is mislukt: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 initialisatie mislukt: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 master voice creatie mislukt: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF Reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Geel"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Je gebruikt een gratis DSP ROM gemaakt door de Dolphin team.\n"
-"Alle Wii spellen en de meeste Gamecube spellen zullen correct werken, maar "
-"de GBA/IPL/CARD UCodes zullen niet werken.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Je maakt gebruik van een gratis DSP ROM gemaakt door de Dolphin team.\n"
-"Alleen Zelda UCode spellen zullen hier goed mee werken.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "U kunt geen panelen sluiten die paginas bevatten."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
 msgstr "Je moet een spel kiezen!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Je moet een naam invoeren!"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Je moet een naam invoeren."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Je moet een geldige profiel naam invoeren!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6098,7 +6160,7 @@ msgstr ""
 "Wil je nu stoppen om het probleem op te lossen?\n"
 "Als je \"Nee\" selecteert kan het geluid vervromd klinken."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6106,36 +6168,36 @@ msgstr ""
 "Je GCM/ISO bestand lijkt ongeldig (ongeldig land).\n"
 "Doorgaan met PAL regio?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Je SYSCONF bestand heeft een onjuiste grootte. \n"
-"Het zou 0x%04x moet zijn, maar is 0x%04llx \n"
+"Het zou 0x%04x moet zijn (maar is 0x%04<PRIx64>)\n"
 "Wil je een nieuwe genereren?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 code niet ondersteund"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero code onbekend voor Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ wachten ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6147,76 +6209,30 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Aangepast]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTEEL]\n"
-"Probeert de emulatie te versnellen door texture decodering via de GPU te "
-"doen door gebruik te maken van de OpenCL framework.\n"
-"Het veroorzaakt echter texture defecten in verschillende spellen. Het is ook "
-"trager dan normale CPU texture decoding in veel gevallen. \n"
-"\n"
-"In geval van twijfel ongemarkeerd laten."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTEEL]\n"
-"Versnelt emulatie een beetje door display lijsten te cachen.\n"
-"Veroorzaakt wellicht probleem. \n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "applader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "geen"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "onbekende flavor %d (verwacht %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "onbekende bericht ontvangen"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zVer correctie:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zDichtbij correctie:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OF"
diff --git a/Languages/po/pl.po b/Languages/po/pl.po
index 088b004393..8e454ad6bc 100644
--- a/Languages/po/pl.po
+++ b/Languages/po/pl.po
@@ -1,17 +1,20 @@
-# Translation of dolphin-emu.pot to Polish
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Baszta <baszta2@gmail.com>, 2011,2013
-# Robert202 <Robert@10g.pl>, 2013
+# Dragoon Aethis <dragoon@dragonic.eu>, 2015
+# Krzysztof Baszczok <baszta2@gmail.com>, 2011,2013
+# M T <michtrz@gmail.com>, 2014
+# Robert <Robert@10g.pl>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -21,21 +24,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(za dużo do wyświetlenia)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Gra :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,46 +59,95 @@ msgstr ""
 "\"%s\" nie istnieje.\n"
 "Stworzyć nową 16MB kartę pamięci?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" jest niewłaściwym plikiem GMC/ISO lub nie jest prawidłowym obrazem GC/"
 "Wii ISO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopiuj%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d próbki"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d próbki (poziom jakości %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s już istnieje, zastąpić?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr ""
-"Oczyszczanie %s nie powiodło się. Obraz prawdopodobnie jest uszkodzony."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -92,7 +156,7 @@ msgstr ""
 "Wczytanie %s jako karty pamięci nie powiodło się\n"
 "Niewłaściwa wielkość pliku (0x%x bajtów)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -101,7 +165,7 @@ msgstr ""
 "Wczytanie %s jako karty pamięci nie powiodło się\n"
 "Niewłaściwa wielkość karty (0x%x bajtów)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -111,362 +175,339 @@ msgstr ""
 "Plik nie jest wystarczającej wielkości by być poprawnym plikiem karty "
 "pamięci (0x%x bajtów)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Nie można otworzyć %s"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s jest plikiem o wadze 0 bajtów"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s jest już skompresowany! Bardziej się nie da."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "Nazwa pliku %s jest zbyt długa, max 45 znaków"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sUsuń%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEksportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u wolnych bloków; %u wolnych wejść katalogowych"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&O programie..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Załaduj z napędu DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Breakpointy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Załaduj z ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Menadżer cheatów"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&Ustawienia DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Usuń ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Usuń wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulacja"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Plik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Wyprzedzanie klatek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Pełny ekran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Ustawienia graficzne"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "Ustawienia &hotkey'ów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Wczytaj stan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Menadżer karty pamięci (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Pamięć"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Otwórz..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opcje"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Wstrzymaj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Graj"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Właściwości"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "Tryb &Tylko do odczytu"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Odśwież listę"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Rejestry"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Dźwięk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Narzędzia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Wideo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Widok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Ustawienia Wiilota"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(Nieznany)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(wyłączone)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
-msgstr ""
+msgstr "+ DODAJ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Native (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bitów"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Native (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Native (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Native (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bity"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Native (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Native (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bitów"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Podaj nazwę>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Brak rozdzielczości>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nic>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Naciśnij klawisz>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Okno NetPlay jest już otwarte!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Gra nie jest aktualnie uruchomiona."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Nie znaleziono wspieranego urządzenia bluetooth.\n"
-"Należy ręcznie podłączyć Wiiloty."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Kody AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "O Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Przyspieszenie"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Dokładność:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Dokładnie emuluje kopie EFB.\n"
-"Niektóre gry wymagają tego do określonych efektów graficznych lub funkcji.\n"
-"\n"
-"W razie wątpliwości, włącz EFB to Texture."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Akcja"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -481,7 +522,7 @@ msgstr ""
 "Kod:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -489,7 +530,7 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Add Code "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -498,7 +539,7 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Fill and "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -507,7 +548,7 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Ram Write "
 "And Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -516,12 +557,12 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Write To "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Błąd Action Replay: Niewłaściwa wartość (%08x) w Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -531,172 +572,140 @@ msgstr ""
 "zaimplementowane (%s)\n"
 "Master kody nie są potrzebne. Nie używaj master kodów."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Błąd Action Replay: niewłaściwa linia kodu AR: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: Niewłaściwy rozmiar %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Niewłaściwy typ Normal Code %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Code %i: Niewłaściwy podtyp %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: Niewłaściwy podtyp %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Dodaj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Dodaj kod ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Dodaj łatkę"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Dodaj nowy panel"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adres :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Dodaje wskazaną wartość do parametru zFar.\n"
-"Dwa sposoby wyrażenia wartości floating point.\n"
-"Przykład: wprowadzenie \"200\" lub \"0.0002\" bezpośrednio, generuje te same "
-"efekty, dokładną wartością będzie \"0.0002\".\n"
-"Wartości: (0->*/-Integer) lub (0->+/-FP[6 miejsc precyzji])\n"
-"\n"
-"Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartości."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Dodaje wskazaną wartość do parametru zNear.\n"
-"Dwa sposoby wyrażenia wartości floating point.\n"
-"Przykład: wprowadzenie \"200\" lub \"0.0002\" bezpośrednio, generuje te same "
-"efekty, dokładną wartością będzie \"0.0002\".\n"
-"Wartości: (0->*/-Integer) lub (0->+/-FP[6 miejsc precyzji])\n"
-"\n"
-"Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartości."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Reguluje siłę nacisku wymaganego do aktywacji przycisków."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs,  ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Pliki GCM"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Stany zapisu (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Wszystkie obrazy Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Spakowane obrazy GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Wszystkie pliki (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analizuj"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Kąt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtrowanie anizotropowe:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Antyaliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader niewłaściwego rozmiaru... Czy to rzeczywiście apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader nie mógł wczytać z pliku"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -706,16 +715,12 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz (wyłączone)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabski"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Czy jesteś pewny by usunąc \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -723,54 +728,81 @@ msgstr ""
 "Czy jesteś pewny by usunąc te pliki?\n"
 "Przepadną na zawsze!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (eksperymentalne)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Proporcje ekranu:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Przynajmniej jeden panel musi pozostać otwarty."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
-msgstr "Audio Backend :"
+msgstr "Backend Audio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Wiele z 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (rozmiar okna)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Auto-dopasowanie rozmiaru okna"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -780,134 +812,150 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP rejestr"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Wstecz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
-msgstr "Ustawienia Backend'u"
+msgstr "Ustawienia Backendu"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
-msgstr "Backend :"
+msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Wejście w tle"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "W tył"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Zły nagłówek pliku"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
-msgstr ""
+msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Baner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Szczegóły banera"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Baner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Wajcha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Podstawowy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Ustawienia podstawowe"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Suma kontrolna Block Allocation Table nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Bloki"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Niebieski"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Niebieski lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Niebieski prawo"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Dół"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bound Controls: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Zepsuty"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Szukaj"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Szukaj folder do dodania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Szukaj folder ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Szukaj folderu wyjściowego"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Bufor:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -915,117 +963,100 @@ msgstr ""
 "Omija oczyszczanie cache'u danych przez instrukcję DCBZ. Zazwyczaj pozostaw "
 "tę opcję wyłączoną."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Silnik emulacji CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Oblicza światła grafiki 3D na pixel zamiast na wierzchołek.\n"
-"Obniża szybkość emulacji o kilka procent (zależne od GPU).\n"
-"Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować błędy.\\nW razie "
-"wątpliwości, pozostaw włączone."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Nie można odnaleźć Wiilota przez handle połączenia %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny błąd"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Nie moża otworzyć %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Nie można wyrejestrować zdarzeń podczas ich wykonywania"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Tego pliku nie można użyć jako karty pamięci.\n"
-"%s\n"
-"nie jest właściwym plikiem karty pamięci GC"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Tego pliku nie można użyć jako karty pamięci.\n"
-"Chcesz użyć tego samego pliku w obu slotach?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Kataloński"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Środek"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Zmień"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Zmień &dysk"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Zmień dysk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Zmień grę"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1033,76 +1064,63 @@ msgstr ""
 "Zmień język UI.\n"
 "Restert wymagany."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Zmienia symbol do parametru zFar (po poprawce)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Zmienia symbol do parametru zNear (po poprawce)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"Zmiana tego nie będzie miała wpływu jeśli emulator jest w trakcie pracy!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Szukaj cheatów"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Menadżer cheatów"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Sprawdź integralność partycji"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Sprawdzanie integralności..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chiński uproszczony"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinski (Tradycyjny)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Wybierz folder źródłowy DVD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Wybierz folder źródłowy NAND"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Wybierz domyślne ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Wybierz folder do dodania"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Wybierz plik do otwarcia"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Wybierz kartę pamięci:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1110,27 +1128,27 @@ msgstr ""
 "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z "
 "folderów)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
-msgstr "Wypakuj do"
+msgstr "Wybierz folder do wypakowania"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1138,183 +1156,230 @@ msgstr ""
 "Klient rozłączony podczas uruchomionej gry! NetPlay wyłączony. Musisz "
 "ręcznie zatrzymać grę."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Zamknij"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Ko&nfiguruj..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Info kodu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Polecenie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Komentarz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Komentarz:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Kompresuj ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Kompresuj wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Kompresowanie ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Konfig"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Konfiguracja"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Konfiguracja sterowania"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Konfiguracja padów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Konfiguruj..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Potwierdź nadpis pliku"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Potwierdź przy zatrzymaniu"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Połącz"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
-msgstr ""
+msgstr "Podłącz Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Podłącz klawiaturę USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Połącz Wiilot %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Połącz Wiilot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Połącz Wiilot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Połącz Wiilot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Połącz Wiilot 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Łączę..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konsola"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Skanowanie ciągłe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Sterowanie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Konwertuj do GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopiowanie nie powiodło się"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopiuj do Memcard %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Rdzeń"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Nie można utworzyć %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Beckend %s nie mógł zostać zainicjalizowany."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Nie można odczytać \"%s\". Brak nośnika w napędzie lub to nie jest backup GC/"
-"Wii. Zwróć uwagę, że oryginalne nośniki GC i Wii nie będą odczytywane przez "
-"większość napędów DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Nie rozpoznao pliku ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Nie można zapisać %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1334,11 +1399,19 @@ msgstr ""
 "Czy wiadomość ta pojawia się po przeniesieniu folderu emulatora?\n"
 "Jeśli tak, należy ponownie określić ścieżki kart pamięci w opcjach programu."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1346,38 +1419,46 @@ msgstr ""
 "Nie można zainicjować rdzenia.\n"
 "Sprawdź konfigurację."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Ilość:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Kraj:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Utwórz kod AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Utwórz nową perspektywę"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Twórca:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Obcięcie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1387,200 +1468,191 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Suwak"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Aktualny folder zmieniono z %s na %s po wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Ustawienia Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Własne parametry Orthographic Projection"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Czeski"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
-msgstr "DSP Emulator Engine"
+msgstr "Silnik emulacji DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "DSP HLE emulacja (szybkie)"
+msgstr "Emulacja DSP HLE (szybka)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
-msgstr "DSP LLE interpreter (wolne)"
+msgstr "Interpreter DSP LLE (wolny)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
-msgstr "DSP LLE rekompilator"
+msgstr "Rekompilator DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Ustawienia DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Źródło DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Fatal Error: błąd odczytu dysku"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Fatal Error: błąd odczytu dysku"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
-msgstr ""
+msgstr "Mata do tańczenia"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Rozmiar danych"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Data:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Pliki Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Dead Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debuguj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Dziesiętnie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Wypakuj ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Wypakuj wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Wypakowywanie ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-msgid "Decrease Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
+msgid "Decrease Frame limit"
+msgstr "Zmniejsz limit klatek"
+
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Domyślne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Domyślne ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Domyślna czcionka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Usuń"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Usuń zapis"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Usunąć istniejący plik '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Opis"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Wykryj"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Wykryto próbę odczytu więcej danych z DVD niż mieści się w buforze "
-"wyjściowym. Zapchało się."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Urządzenie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Ustawienia urządzenia"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Pokrętło"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1588,20 +1660,23 @@ msgstr ""
 "Suma kontrolna folderu oraz \n"
 "folderu zapasowego nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
-msgid "Disable Destination Alpha"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
+msgid "Disable Destination Alpha"
+msgstr "Wyłącz Destination Alpha"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Wyłącz mgłę"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1615,253 +1690,213 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Wyłącz emulację kopii EFB.\n"
-"Często wykorzystywane do post-processingu lub efektów render-to-texture, "
-"więc włączając tą opcję uzyskasz przyspieszenie, prawie zawsze powoduje "
-"błędy.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Dysk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Dłąd odczytu dysku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Ekran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Wyświetla wejścia odczytane przez emulator.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Podziel"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Zatrzymać aktualną emulację?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dekoder Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Ustawienia graficzne %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin strona &WWW"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Konfiguracja Dolphin'a"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Konfiguracja emulowanego Wiilota"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Konfiguracja GCPad'a"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Filmy TAS (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Konfiguracja Wiilot'a"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin na &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by "
-"przeglądać pliki..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by "
-"pokazać wszystkie gry..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Program nie był w stanie zakończyć żądanej akcji."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Dół"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Ściągnij kody (baza WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Pobrano %lu kodów. (dodano %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Perkusja"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Atrapa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Zrzut audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Zrzut EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Zrzut klatek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Zrzut tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zrzuca wszystkie renderowane klatki do pliku AVI w User/Dump/Frames/\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zrzuć tekstury gry do User/Dump/Textures/<game id>/\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Zrzuca zawartość kopii EFB do User/Dump/Textures/\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Wyjście"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Copies"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1873,56 +1908,40 @@ msgstr ""
 "%d. %d -- Jeśli ostatnio aktualizowałeś program, ponowne uruchomienie "
 "systemu jest wymagane aby sterownik zaczął działać."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "Europa"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Early Memory Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Edycja"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Edytuj kody ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Edytuj konfigurację"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Edytuj patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Edytuj bierzącą perspektywę"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Wątek emulacji jest już uruchomiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1937,7 +1956,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, włącz wirtualną emulację XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1953,121 +1972,92 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulowany Wiilot"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Stan emulacji:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Włącz"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Włącza efekty 3D poprzez stereoskopię używając technologii Nvidia 3D Vision "
-"jeśli jest wspierana przez twoją GPU.\n"
-"Może powodować błędy.\n"
-"Wymagany tryb pełnoekranowy.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Włącz log AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Włącz łączenie bloków"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Włącz Bounding Box Calculation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Włącz cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Włącz kody"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Włącz 2 rdzenie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Włącz 2 rdzenie (przyspieszenie)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Włącz Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Włącz Idle Skipping (przyspieszenie)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Włącz MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Włącz Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Włącz wygaszacz ekranu"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Włącz dane głosu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Włącz WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Włącz Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Włącza filtrowanie anizotropowe.\n"
-"Poprawia jakość tekstur dla obiektów obserwowanych pod dużymi kątami.\n"
-"Może powodować błędy w kilku grach.\n"
-"\n"
-"W razie wątpliwości, wybierz 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Włącz szybki dostęp do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = "
-"kompatybilne)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Włącz strony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2079,7 +2069,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2091,32 +2081,25 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Włącz to by przyspieszyć The Legend of Zelda: Twilight Princess. Wyłącz dla "
-"KAŻDEJ innej gry."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Włącza Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Włącza emulację Dolby Pro Logic II używając 5.1 surround. Niedostępne na OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2128,7 +2111,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2136,7 +2119,11 @@ msgstr ""
 "Włącza Memory Management Unit, wymagane dla niektórych gier. (ON = "
 "kompatybilny, OFF = szybko)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2146,50 +2133,61 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Koniec"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Angielski"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Ulepszenia"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Wprowadź nazwę nowej perspektywy:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Wejście %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Wejście 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Równy"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Błąd"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2198,7 +2196,7 @@ msgstr ""
 "Błąd: Po \"%s\", znaleziono %d (0x%X) zamiast save maker'a %d (0x%X). "
 "Anulowanie wczytywania zapisanego stanu..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2207,214 +2205,191 @@ msgstr ""
 "Błąd: Próba dostępu do czcionek %s ale nie są one wczytane. Gry mogą "
 "pokazywać czcionki niewłaściwie lub zawieścić się."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Handler wyjątku - dostęp poniżej obszaru pamięci. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
-msgstr ""
+msgstr "Wyjdź"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
-msgstr ""
+msgstr "Eksportuj wszystkie zapisy Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Eksportuj nieudany"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Eksportuj plik"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Eksportuj nagranie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Eksportuj nagranie..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Eksportuj zapis"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Eksportuj zapis Wii (eksperymentalne)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Eksportuj wszystkie zapisy"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr ""
+msgstr "Eksportowanie nieudane"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Eksportuj zapis jako..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Parametr Dodatkowy"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Wypakuj wszystkie pliki..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Wypakuj Apploader'a..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Wypakuj DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Wypakuj folder..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Wypakuj plik..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Wypakuj partycję..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Wypakowywanie %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Wypakowywanie wszystkich plików"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Wypakowywanie folderu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Wypakowywanie..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Bajt FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "Francja"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Rozmiar FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Połączenie nieudane!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Pobieranie kodów nieudane!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Wypakowanie do %s nie udało się!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Wczytanie DSP ROM'u nie powiodło się:\t%s\n"
-"\n"
-"Ten plik jest wymagany gdy używasz DSP LLE.\n"
-"Nie jest dołączany do programu, ponieważ jest chroniony prawami autorskimi.\n"
-"Użyj DSPSpy by zrobić zrzut pliku z Twojej konsoli.\n"
-"\n"
-"Możesz wykorzystać silnik DSP HLE, który nie wymaga ROM'ów.\n"
-"(Wybierz z zakładki \"Audio\" okna konfiguracyjnego.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Nieudany odczyt %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Błąd odczytu banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Odczyt nagłówka bk nie powiódł się"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Błąd odczytu bloku %d zapisanego pliku\n"
 "Karta pamięci może być okrojona\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2422,7 +2397,7 @@ msgstr ""
 "Błąd poprawnego odczytu block allocation table backup\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2430,17 +2405,12 @@ msgstr ""
 "Błąd poprawnego odczytu block allocation table\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Odczyt z %d nieudany"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Odczyt z pliku %s nie powiódł się"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2448,7 +2418,7 @@ msgstr ""
 "Błąd poprawnego odczytu folderu zapasowego\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2456,11 +2426,7 @@ msgstr ""
 "Błąd poprawnego odczytu folderu\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Odczyt nagłówka nie powiódł się"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2468,50 +2434,35 @@ msgstr ""
 "Błąd poprawnego odczytu nagłówka\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Błąd odczytu unikalnego ID z obrazu dysku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Błąd zapisu BT.DINF do SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Zapis bkhdr nie powiódł się"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Zapis nagłówka do %s nie powiódł się"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Szybki"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
-msgstr ""
+msgstr "Szybkie obliczenia głębokości"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2519,23 +2470,27 @@ msgstr ""
 "Fatal desync. Anulowanie playback'u. (Błąd w PlayWiimote: %u != %u, byte "
 "%u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Informacja o pliku"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Plik nie zawiera kodów."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Plik skonwertowany do .gci."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2543,7 +2498,7 @@ msgstr ""
 "Nie można otworzyć pliku\n"
 "lub posiada niewłaściwe rozszerzenie"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2552,94 +2507,93 @@ msgstr ""
 "Plik posiada rozszerzenie \"%s\"\n"
 "poprawne rozszerzenia to (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Plik nierozpoznany jako karta pamięci"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Plik nie skompresowany"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "System plików"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Nieznany plik typu 'ini'! Nie otworzy się!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Następny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Poprzedni"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Blok pierwszy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Napraw sumy kontrolne"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Wymuś 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Wymuś 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Wymuś konsolę jako NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Wymuś filtrowanie tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Wymusza dwuliniowe filtrowanie tekstur jeśli gra jawnie je wyłączyła.\n"
-"Poprawia jakość tekstur, ale może powodować błędy w niektórych grach.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłaczone."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Wymusza od gry wyświetlanie grafiki w szerszych rozdzielczościach.\n"
-"Możliwe błędy graficzne.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Wymusza tryb NTSC-J dla użycia czcionek japońskiego ROMu.\n"
-"Pozostaw wyłączone, domyślnie NTSC-U i automatycznie włącza gdy gramy w "
-"japońskie gry."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2647,551 +2601,578 @@ msgstr ""
 "Formatować jako ascii (NTSC\\PAL)?\n"
 "Wybierz nie dla sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "W przód"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
+msgstr "Przekieruj port (UPnP)"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
+#, c-format
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %d results for '"
-msgstr "Znaleziono %d dla '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Klatka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Klatka"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Frame Advance"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Zrzuty klatek używają FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Frame Info"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Zasięg klatki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "Frame S&kipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Limit klatek:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Klatki do nagrania"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Free Look"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francuski"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Gryfy"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Z"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
-msgstr "FullScr"
+msgstr "Pełny Ekran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Rozdzielczość pełnoekranowa:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Plik GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID gry:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Gra jest już uruchomiona!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Gra nie jest uruchomiona!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Nie znaleziono gry!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Specyficzne ustawienia gry"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Konfiguracja gry"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Ustawienia &pada GC"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Karty pamięci GC (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Ustawienia pada GC"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Kody Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Błąd uruchomienia GeckoCode (CT%i CST%i) (%s)\n"
-"(zły kod albo typ kodu nie jest jeszcze wspierany. Spróbuj użyć natywnej "
-"obsługi kodu poprzez wklejenie pliku codehandler.bin w folderze Sys oraz "
-"zrestartowaniiu programu)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Główne"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Niemiecki"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Indeks jest większy niż rozmiar listy kodów AR %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Ustawienia graficzne"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Większy niż"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Znacznie poprawia jakość tekstur generowanych wykorzystując renderowanie do "
-"efektów tekstur.\n"
-"Zwiększenie wewnętrznej rozdzielczości poprawi efekt tego ustawienia.\n"
-"Odrobinę zmniejsza wydajność i może powodować problemy (mało "
-"prawdopodobne).\n"
-"\n"
-"W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grecki"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zielony"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Zielony lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zielony prawo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitara"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacki"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Suma kontrolna nagłówka nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebrajski"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Wysokość"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Pomoc"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hej!\n"
-"\n"
-"Dolphin wymaga Mac OS X 10.7 lub nowszego.\n"
-"Niestety pracujesz na starszej wersji OS X'a.\n"
-"Ostatnią wersją Dolphin'a, która wspiera OS X 10.6 jest Dolphin 3.5.\n"
-"Proszę uaktualnić system do wersji 10.7 lub nowszej, w celu korzystania z "
-"najnowszych wersji Dolphin'a.\n"
-"\n"
-"Narka!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Siema,\n"
-"Dolphin wymaga od procesora rozszerzeń SSE2.\n"
-"Niestety Twój procesor ich nie posiada, dlatego Dolphin nie ruszy.\n"
-"\n"
-"Pozdro i poćwicz!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Ukryj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Ukryj kursor myszy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Ukrywa kursor myszy jeśli znajduje się nad oknem emulacji.\n"
-"\n"
-"W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Konfiguracja skrótów klawiszowych"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Węgierski"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybrydowy Wiilot"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Próba otrzymania danych z nieznanego ticket'u: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Gra próbowała ponownie wczytać IOS lub tytuł, który jest "
+"IOCTL_ES_LAUNCH: Gra próbowała ponownie wczytać tytuł, który jest "
 "niedostępny w Twoim zrzucie NAND\n"
-"TitleID %016llx.\n"
+"TitleID %016<PRIx64>.\n"
 "Program teraz chyba się zawiesi :C"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - zła ścieżka"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Ustawienia IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Wskaźnik IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Czułość IR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Szczegóły ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Foldery ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "Włochy"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ikona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Jeśli włączone, bounding box registers zostaną zaktualizowane. "
-"Wykorzystywane przez gry Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignoruj zmiany formatu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignoruje wszystkie zmiany formatu EFB.\n"
-"Poprawia wydajność w wielu grach bez negatywnych skutków. Powoduje defekty "
-"graficzne w małej ilości innych gier.\n"
-"\n"
-"W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignoruje wszystkie próby odczytu/zapisu EFB od CPU.\n"
-"Poprawia wydajność w niektórych grach, ale może wyłączyć niektóre funkcje "
-"powiązane z grą lub efekty graficzne.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importuj zapis"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr ""
+msgstr "Importuj zapis Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr ""
+msgstr "Importowanie nieudane"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Zaimportowany plik posiada rozszerzenie gsc\n"
-"lecz nie posiada właściwego nagłówka"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Zaimportowany plik jest niewłąściwej wielkości"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Zaimportowany plik posiada rozszerzenie sav\n"
-"lecz nie posiada właściwego nagłówka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "W grze"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
-msgid "Increase Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
+msgid "Increase Frame limit"
+msgstr "Zwiększ limit klatek"
+
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informacja"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Wejście"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Wstaw"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Włóż kartę SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Wprowadź nazwę tutaj..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Zainstaluj WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Zainstaluj do Wii Menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Instalacja WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Błąd sprawdzania integralności"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Sprawdzanie integralności zakończone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Sprawdzanie integralności zakończone. Nie znaleziono błędów."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Sprawdzenie integralności dla partycji %d nie powiodło się. Twój zrzut jest "
-"prawdopodobnie uszkodzony lub został źle spatchowany."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interfejs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Ustawienia interfejsu"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Wewnętrzny błąd LZO - kompresja nie powiodła się"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3200,172 +3181,186 @@ msgstr ""
 "Wewnętrzny błąd LZO - dekompresja nie powiodła się (%d) (%li, %li) \n"
 "Wczytaj stan ponownie"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Wewnętrzny błąd LZO - lzo_init() nie powiodło się"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Wewnętrzna rozdzielczość:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
-msgstr "Interpreter (BARDZO wolne)"
+msgstr "Interpreter (BARDZO wolny)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Niewłaściwy rozmiar (%x) lub Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Niewłaściwa wartość!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Niewłaściwe bat.map lub wejście folderu"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Niewłaściwy typ zdarzenia %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Niewłaściwy plik"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Niewłaściwy opening.bnr odnaleziony w gcm:\n"
-"%s\n"
-"Będziesz musiał ponownie zrzucić grę."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Newłaściwy plik nagrania"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Niewłaściwy parametr przeszukiwania (nie wybrano obiektu)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Niewłaściwy łańcuch przeszukiwania (nie udało się zamienić na liczbę)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 "Niewłaściwy łańcuch przeszukiwania (wspierane są tylko równe długości "
 "łańcucha)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Niewłaściwy stan"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Włoski"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "Japonia"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
-msgstr "JIT Recompiler (zalecane)"
+msgstr "Rekompilator JIT (zalecany)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japoński"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "Korea"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Utrzymaj okno na wierzchu.\n"
+"Utrzymuj okno gry na wierzchu.\n"
 "\n"
-"W razie wątpliwości, pozostaw wyączone."
+"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Okno na wierzchu"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Klawisz"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreański"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Język:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
-msgstr ""
+msgstr "Ostatni %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Opóźnienie:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Gałka lewa"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"LPM by wykryc skróty klawiszowe.\n"
-"Wciśnij spację by wyczyścic."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3375,7 +3370,7 @@ msgstr ""
 "ŚPM by wyczyścic.\n"
 "PPM więcej opcji."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3383,202 +3378,211 @@ msgstr ""
 "LPM/PPM więcej opcji.\n"
 "ŚPM by wyczyścić."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Mniej niż"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limit FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Wczytaj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Wczytaj własne tekstury"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
-msgstr ""
+msgstr "Wczytaj stan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
-msgstr ""
+msgstr "Wczytaj stan Ostatni 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Wczytaj stan Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr ""
+msgstr "Wczytaj stan Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Wczytaj stan Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Wczytaj stan Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Wczytaj stan Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Wczytaj stan Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Wczytaj stan Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Wczytaj stan Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Wczytaj stan Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr ""
+msgstr "Wczytaj stan Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Wczytaj stan..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wczytaj Wii System Menu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wczytaj Wii System Menu %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Wczytuje tekstury  z User/Load/Textures/<game id>/\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Ładuje wartości wcześniej ustawione z dostępnych hack patterns"
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Konfiguracja Logu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Zapisz FPS do pliku"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Typy logów"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Zapisz liczbę renderowanych klatek na sekundę do User/Logs/fps.txt. Użyj tej "
-"opcji jeśli chcesz zmierzyć wydajność programu.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Logger Outputs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Połączenie z serwerem przerwane!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 niepoprawne\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Speed Hack"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Pliki MadCatz Gameshark(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Główna gałka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID twórcy:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Twórca:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3593,29 +3597,33 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Karta pamięci już posiada zapis dla tego tytułu"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Karta pamięci już otwarta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Bajt pamięci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Karta pamięci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3623,7 +3631,7 @@ msgstr ""
 "Memory Card Manager OSTRZEŻENIE - Twórz kopie zapasowe przed użyciem, "
 "powinno zostać naprawione, ale może namieszać!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3640,37 +3648,52 @@ msgstr ""
 "%s\n"
 "Czy chcesz skopiować stary plik do nowej lokacji?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "Wielkość pliku karty pamięci nie odpowiada wielkości nagłówka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Różne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Ustawienia różne"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Zmiennik"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3682,20 +3705,24 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Nieproporcjonalna czcionka"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3713,678 +3740,636 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Pomnóż"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "Notka: Wielkość strumienia nie zgadza się z właściwą długością danych\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nazwa:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Natywne pliki GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nowe skanowanie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Następna strona"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Następne skanowanie"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Ksywa:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "No Country (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Nie odnaleziono IOS/WAD"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Brak wyjścia audio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nie odnaleziono pliku banera dla tytułu %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Brak opisu"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Brak dokowania"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Nie wczytano żadnego pliku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Brak wolnych wejść folderów"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Brak nagranego pliku"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Nie odnaleziono folderu zapisu dla tytułu %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Żadne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norweski"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Nie równe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Nie ustawiono"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "To nie jest zapis Wii lub błąd odczytu rozmiaru nagłówka pliku %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Nie połączono"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notatki"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notatki:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Uwagi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Liczba kodów:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Acelerator Nunchak'a"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Zasięg objektu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Wyłączone"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
-msgstr "On-Screen Display Messages"
+msgstr "Wiadomości na ekranie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr ""
+msgstr "&Dokumentacja online"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Dostępnych tylko %d bloków"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Otwórz"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Otwórz &folder zawartości"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Otwórz folder &zapisów Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Otwórz plik..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: nie można utworzyć kontekstu dla urządzenia %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nie można odnaleźć urządzeń dźwiękowych"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: nie można otworzyć urządzenia %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Texture Decoder"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
+"Otwiera domyślną konfigurację dla tej gry (tylko do odczytu) w zewnętrznym "
+"edytorze tekstowym."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opcje"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Pomarańczowy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
+"Kolejność plików w folderze niezgodna z kolejnością bloków\n"
+"PPM i wyeksportuj wszystkie zapisy,\n"
+"następnie zaimportuj te zapisy do nowej karty pamięci\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Pozostałe"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Inny klient rozłączony podczas uruchomionej gry! NetPlay wyłączony. Musisz "
-"ręcznie zatrzymać grę."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Wyjście"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Od&twórz nagranie"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pady"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Paramerty"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partycja %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Ścieżki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Zatrzymaj na koncu filmu"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Lighting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfekcyjny"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspekrtywa %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Play"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Odtwórz nagranie"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Play/Pause"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Grywalny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Opcje playback'u"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Gracze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Potwierdź..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Proszę utworzyć perspektywę przed zapisem"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polski"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugalski"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalski (Brazylijski)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Premature movie end in PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Premature movie end in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Premature movie end in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Presets: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Poprzednia strona"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Poprzednia wartość"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Drukuj"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Właściwości"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
-msgstr "Purge Cache"
+msgstr "Wyczyść cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Pytanie"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Zamknij"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "Rosja"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
-msgstr ""
+msgstr "Zasięg"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Zasięg"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Tryb tylko do odczytu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Prawdziwy"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
-msgstr ""
+msgstr "Prawdziwy Balance Board"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Prawdziwy Wiilot"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Prawdziwe Wiiloty"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Nagranie"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
-msgstr ""
+msgstr "Nagrywaj wejście"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Informacje nagrywania"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opcje nagrywania"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Czerwony"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Czerwony lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Czerwony prawo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Redukuje ilośc aliasingu powodowanego przez rasteryzowaną grafikę 3D.\n"
-"Sprawia, że renderowany obraz jest bardziej wygładzony.\n"
-"Bardzo obniża szybkość emulacji i czasem powoduje błędy.\n"
-"\n"
-"W razie wątpliwości, wybierz Żadne."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Odśwież listę"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Odśwież listę gier"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Usuń"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4394,242 +4379,320 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Generuj w oknie głównym"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Wynik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
+msgstr "Rewizja:"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Prawo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Gałka prawa"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Wibracje"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Rosyjski"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Zapisz &stan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Bezpieczny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Zapisz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Zapisz GCI jako..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
-msgstr ""
+msgstr "Zapisz najstarszy stan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
-msgstr ""
+msgstr "Zapisz stan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
-msgstr "Slot stanu 1"
+msgstr "Zapisz stan Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
-msgstr ""
+msgstr "Zapisz stan Slot 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
-msgstr "Slot stanu 2"
+msgstr "Zapisz stan Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
-msgstr "Slot stanu 3"
+msgstr "Zapisz stan Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
-msgstr "Slot stanu 4"
+msgstr "Zapisz stan Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
-msgstr "Slot stanu 5"
+msgstr "Zapisz stan Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
-msgstr "Slot stanu 6"
+msgstr "Zapisz stan Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
-msgstr "Slot stanu 8"
+msgstr "Zapisz stan Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
-msgstr "Slot stanu 9"
+msgstr "Zapisz stan Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
-msgstr ""
+msgstr "Zapisz stan Slot 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Zapisz stan..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Zapisz spakowany GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Zapisz bierzącą perspektywę"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Zapisz wypakowany GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Scaled EFB Copy"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Sknauję %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Przeszukuję obrazy ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Przeszukuję..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Szukaj"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Filtr wyszukiwania"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Przeszukuj podfoldery"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Przeszukaj bieżący obiekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Szukaj wartości hex:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Nie odnaleziono sekcji %s w SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Select"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Wybierz plik nagrania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Wybierz plik Wii WAD do zainstalowania"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Wybierz adapter sprzętowy.\n"
-"\n"
-"W razie wątpliwości, wybierz pierwszy."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Wybierz plik zapisu do importowania"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Select floating windows"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Wybierz plik do wczytania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Wybierz plik do zapisu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Wybierz stan do wczytania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Wybierz stan do zapisu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4647,270 +4710,291 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Wybrany progil kontrolera nie istnieje"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Wybrana czcionka"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Wybiera rozdzielczość w trybie pełnoekranowym.\n"
-"Powinno być zawsze większe bądź równe rozdzielczości wewnętrznej. Wzrost "
-"wydajności nieistotny.\n"
-"\n"
-"W razie wątpliwości, użyj rozdzielczości komputera.\n"
-"Jeśli nadal masz wątpliwości, użyj najwyższej działającej rozdzielczości."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Wybiera, które graficzne API ma być użyte wewnętrznie.\n"
-"Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokładne. "
-"Direct3D 11 jest pomiędzy tymi opcjami.\n"
-"Należy zauważyć, że Direct3D dostępny jest tylko pod systemami Windows.\n"
-"\n"
-"W razie wątpliwości, użyj Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Wybiera, które graficzne API ma być użyte wewnętrznie.\n"
-"Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokładne. "
-"Direct3D 11 jest pomiędzy tymi opcjami.\n"
-"Należy zauważyć, że Direct3D dostępny jest tylko pod systemami Windows.\n"
-"\n"
-"W razie wątpliwości, użyj OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Wyślij"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Pozycja Sensor Bar'a"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separator"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbski"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Ustaw jako domyślne ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Ustaw jako domyślną kartę pamięci %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: Indeks jest większy niz rozmiar listy kodu AR %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Ustaw opóźnienie (ms). Wyższe wartości mogą zniwelować trzaski dźwięków. "
-"Tylko OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Ustawienia..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Wstrząs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Krótka nazwa:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Przyciski tylnie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Pokaż &konsolę"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Pokaż &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Pokaż pasek &stanu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Pokaż pasek &narzędzi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
-msgid "Show Defaults"
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
+msgid "Show Defaults"
+msgstr "Pokaż domyślne"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Pokaż napędy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Pokaż EFB Copy Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Pokaż FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Pokaż Francję"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Pokaż GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
-msgid "Show Input Display"
-msgstr "Pokaż Input Display"
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:216
+msgid "Show Input Display"
+msgstr "Pokaż wejścia ekranu"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Pokaż Włochy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Pokaż Japonię"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Pokaż Koreę"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Pokaż język:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Pokaż &konfigurację logu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Pokaż PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Pokaż platformy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Pokaż regiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Pokaż statystyki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Pokaż Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Pokaż USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Pokaż WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Pokaż Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Pokazuje okno dialogowe gdy wystąpi potencjalnie poważny błąd.\n"
-"Wyłączenie tego pozwoli uniknąć denerwujących i mało ważnych wiadomości, ale "
-"może spowodować zamknięcie programu bez żadnego ostrzeżenia."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Pokaż pierwszy blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Pokaż licznik opóźnienia"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Wyświetla wiadomości na ekrnie emulacji.\n"
-"Wiadomości zawierają informacje o zapisach do karty pamięci, video backend, "
-"informacje o procesorze oraz oczyszczaniu cache'u JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Pokaż bloki zapisu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Pokaż komentarz zapisu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Pokaż ikonę zapisu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Pokaż tytuł zapisu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4921,83 +5005,82 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Pokaż niewiadome"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Pokaż różne statystyki.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Willot bokiem"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chiński uproszczony"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Rozmiar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Pomiń BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Pomiń oczyszczanie DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Pomiń EFB Access z CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Przyspiesza kopie EFB do RAMu, poświęcając dokładność emulacji.\n"
-"Czasami poprawia jakość grafiki.\n"
-"Jeśli odczuwasz jakieś błędy, spróbuj podnieść dokładność cachu tekstur lub "
-"wyłącz tą opcję.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderer Programowy"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5009,154 +5092,173 @@ msgstr ""
 "Czy na pewno chcesz włączyć renderowanie programowe? W razie wątpliwości, "
 "wybierz 'Nie'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Ustawienia dźwięku"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Niewłaściwy sound beckend %s."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Utworzenie bufora dźwięku nie powiodło się: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Poziom głośnika:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Określa rozdzielczość do renderowania. Wysoka rozdzielczość podniesie jakość "
-"grafiki, ale znacznie obciąża wydajność i może powodować błędy w niektórych "
-"grach.\n"
-"\"Wiele z 640x528\" jest wolniejsze od \"Rozmiar Okna\", ale powoduje mniej "
-"błędów. Ogólnie mówiąc, im mniejsza rozdzielczość wewnętrzna, tym lepsza "
-"będzie wydajność.\n"
-"\n"
-"W razie wątpliwości, wybierz 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Przyspiesz Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standardowy kontroler"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Start &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "&Rozpocznij nagrywanie"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Rozpocznij nagrywanie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Stan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Stany zapisu"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Kierownica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Gałka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Stop"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Przechowuje kopie EFB w obiektach tekstur GPU.\n"
-"Niezbyt dokładne, ale działa wystarczająco dobrze w większości grach i daje "
-"dobrego kopa przy EFB do RAMu :D.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Rozciągnij do okna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Struny"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Wyciągnij"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Sukcesywnie wyeksportowano plik do %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Importowanie zapisów zakończone powodzeniem"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Zamach"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synchronizuj wątek GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5164,81 +5266,110 @@ msgstr ""
 "Synchronizuje wątki GPU i CPU by zapobiec zawieszaniu w trybie dwóch rdzeni "
 "(ON = zgodne, OFF = szybkie)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Język systemu:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "Taiwan"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Wejście TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Talerz lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Talerz prawo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Zrób zdjęcie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Tekstura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Cache tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Format pokrycia tekstur"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD zainstalowany poprawnie"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Nieprawidłowy adres"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Suma kontrolna poprawnie naprawiona"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Wybrany folder jest już na liście"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5247,7 +5378,7 @@ msgstr ""
 "Plik %s już istnieje.\n"
 "Zastąpić?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5256,81 +5387,81 @@ msgstr ""
 "Nie można otworzyć pliku %s do zapisu. Sprawdź czy nie jest używany przez "
 "inny program."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Plik, który wybrałeś (%s) nie istnieje"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Nazwa nie może być pusta"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Nazwa nie może zawierać znaku ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator "
-"pominie aktualizacje tekstur z RAMu.\n"
-"\n"
-"W razie wątpliwości, wybierz wartość na końcu po prawej."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Zapis, który chcesz skopiować posiada niewłaściwą wielkość pliku."
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Wybrany język nie jest wspierany przez Twój system. Ustawienia domyślne."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Wersje NetPlay klienta i serwera są niekompatybilne!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Serwer pełny!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Odpowiedź serwera: gra aktualnie uruchomiona!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Serwer odesłał nieznany błąd!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Wskazany plik \"%s\" nie istnieje."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Niewłaściwa wartość"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
-msgstr "Kompozycja:"
+msgstr "Motyw:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5338,7 +5469,7 @@ msgstr ""
 "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes "
 "prawdopodobnie niekompletny."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5346,7 +5477,7 @@ msgstr ""
 "Te ustawienia przewyższaja źródłowe ustawienia programu.\n"
 "Nieokreślone ustawienia odczytywane są ze źródłowych."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5354,119 +5485,163 @@ msgstr ""
 "Ten symulator action replay nie wspiera kodów, które modyfikują Action "
 "Replay'a."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ta opcja pozwala na zmianę kamery w grze.\n"
-"Poruszaj myszką, trzymając prawy przycisk by obracać kamerą oraz środkowy "
-"przycisk by przesuwać.\n"
-"Trzymaj SHIFT oraz jeden z przycisków WSAD by przesunąć kamerę o określony "
-"krok odległości (SHIFT+0 szybciej, SHIFT+9 wolniej). Naciśnij SHIFT+R w celu "
-"zrestartowania kamery.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Rozdziela wątki wideo i CPU tak by mogły działać na osobnych rdzeniach.\n"
-"Znacznie zwiększa wydajność na komputerach z więcej niż jednym rdzeniem, ale "
-"powoduje także okazjonalne błedy."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Pozwala na ręczną edycję pliku konfiguracyjnego."
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Threshold"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Przechylenie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Tytuł"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Do"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Przełącz wszystkie typy logów"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
-msgstr ""
+msgstr "Przełącz proporcje obrazu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
-msgstr ""
+msgstr "Przełącz EFB Copies"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
+msgstr "Przełącz mgłę"
+
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Przełącz na pełny ekran"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
+msgstr "Przełącz IR"
+
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Góra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chiński tradycyjny"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Próbowano odczytać nieznany typ pliku."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Spusty"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Próba odczytu z niewłaściwego SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5474,41 +5649,24 @@ msgstr ""
 "Próba odczytu z niewłaściwego SYSCONF\n"
 "bt id Wiilota niedostępne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turecki"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "DJ Gramofon"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Typ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Port UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiilot"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "Nieznany"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "Nieznany_%X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5516,192 +5674,178 @@ msgstr ""
 "Nie można utworzyć patcha z podanych wartości.\n"
 "Wejście nie zostało zmienione."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Nie można przeanalizować %lu linii wprowadzonego kodu AR jako poprawnego "
+"Nie można przeanalizować %u linii wprowadzonego kodu AR jako poprawnego "
 "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n"
 "Czy chcesz pominąć linię i kontynuować analizę?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Niezdefiniowane %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Cofnij wczytywanie stanu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
-msgstr ""
+msgstr "Cofnij zapisywanie stanu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Nieoczekiwane wywołanie 0x80? Przerywanie..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Nieznane polecenie DVD %08x - poważny błąd"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Nieznane polecenie 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Nieznany typ wejścia %i w SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Nieznana wiadomość o ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Góra"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Willot pionowo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Użyj trybu EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Użyj trybu pełnoekranowego"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Użyj HEX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Użyj Panic Handlers"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Używa wielu wątków do dekodowania tekstur.\n"
-"Możliwe przyspieszenie (zwłaszcza dla CPU z więcej niż 2 rdzeniami).\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Zazwyczaj, jeśli kompilacja shaderów nie powiedzie się, jest wyświetlany "
-"błąd.\n"
-"Jednak, można pominąć wyskakujące okienka by cieszyć się nieprzerwaną grą "
-"gdy zaznaczymy tą opcję.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Narzędzie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Wartość"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Wartość:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Wartość:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbosity"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Wideo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Wirtualny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Poziom"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalacja WAD nie powiodła się: błąd tworzenia %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instalacja WAD nie powiodła się: błąd tworzenia biletu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5713,25 +5857,27 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Ostrzeżenie - uruchomienie DOL w złym trybie konsoli!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Ostrzeżenie - uruchomienie ELF w złym trybie konsoli!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Ostrzeżenie - uruchomienie ISO w złym trybie konsoli!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5742,7 +5888,7 @@ msgstr ""
 "%s\n"
 "Kontynuować?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5755,7 +5901,7 @@ msgstr ""
 "i mają taką samą nazwę jak plik na Twojej karcie pamięci\n"
 "Kontynuować?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5766,7 +5912,15 @@ msgstr ""
 "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed "
 "kontynuacją lub wczytaj ten stan z wyłączonym trybem tylko do odczytu."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5778,7 +5932,7 @@ msgstr ""
 "ten stan z wyłączonym trybem tylko do odczytu. W przeciwnym razie może "
 "nastąpić desynchronizacja."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5811,179 +5965,166 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - plik nie jest otwarty."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Widescreen Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Szerokość"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Konsola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Źródło Wii NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Pliki zapisu Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: nie moża odczytać z pliku"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiilot"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiilot"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiilot %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiilot połączony"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiilot Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Ustawienia Wiilota"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiiloty"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Zawijanie wierszy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Pracuję..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
-msgid "Write memcards (GC)"
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
+msgid "Write memcards (GC)"
+msgstr "Zapisz karty pamięci (GC)"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Zapisz do konsoli"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Zapisz do Debugger'a"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Zapisz do pliku"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Wpisz do okna"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice nie powiodło się: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Inicjalizacja XAudio2 nie powiodła się: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Utworzenie XAudio2 master voice nie powiodło się: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Żółty"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Używasz darmowych romów DSP stworzonych przez Zespół Dolphin'a.\n"
-"Wszystkie gry Wii będą działały poprawnie oraz większość gier GC również, "
-"ale UCody GBA/IPL/CARD nie będą działać.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Używasz darmowych romów DSP stworzonych przez Zespół Dolphin'a.\n"
-"Tylko gry Zelda UCode będą działały poprawnie.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Nie możesz zamknąć paneli jeśli są w nich strony."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Wybierz grę!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Musisz wprowadzić nazwę!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 "Musisz wprowadzić poprawną wartość dziesiętną, szestnastkową lub ósemkową."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Musisz wprowadzić poprawną nazwę profilu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -5993,7 +6134,7 @@ msgstr ""
 "Czy chcesz zatrzymać i naprawić problrm?\n"
 "Jeśli wybierzesz \"Nie\", audio będzie zniekształcone."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6001,36 +6142,36 @@ msgstr ""
 "Twój plik GMC/ISO wygląda na niewłaściwy (niewłaściwy kraj).\n"
 "Kontynuować w regionie PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Twój plik SYSCONF posiada niewłaściwy rozmiar.\n"
-"Powinno być 0x%04x (jest 0x%04llx)\n"
+"Powinno być 0x%04x (jest 0x%04<PRIx64>)\n"
 "Czy chcesz wygenerować nowy?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Kod 3 zero niewspierany"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Kod zero nieznany dla programu: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ czekam ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6042,77 +6183,30 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Własne]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EKSPERYMENTALNE]\n"
-"Celuje w przyspieszenie emulacji poprzez przełożenie dekodowania tekstur na "
-"GPU wykorzystując frameworki OpenCL.\n"
-"Jednak, w tej chwili jest znane z powodowania defektów tekstur w niektórych "
-"grach. Dodatkowo jest wolniejsze od powszechnego dekodowania tekstur przez "
-"CPU w większości przypadków.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EKSPERYMENTALNE]\n"
-"Przyspiesza emulację nieznacznie poprzez caching display lists.\n"
-"Możliwe błędy.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute zwrócił -1 przy uruchamianiu programu!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar Correction: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear Correction: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OR"
diff --git a/Languages/po/pt.po b/Languages/po/pt.po
index b741aac1e4..2b0378222d 100644
--- a/Languages/po/pt.po
+++ b/Languages/po/pt.po
@@ -1,17 +1,18 @@
-# Translation of dolphin-emu.pot to Portuguese
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# 100tpt <100nome.portugal@gmail.com>, 2013
+# João Frade <100nome.portugal@gmail.com>, 2013
 # Zilaan <nunogomesrebelo@hotmail.com>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-16 18:55+0000\n"
-"Last-Translator: 100tpt <100nome.portugal@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/pt/)\n"
 "Language: pt\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(demasiados para mostrar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Jogo: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NÃO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,414 +56,446 @@ msgstr ""
 "\"%s\" Inexistente.\n"
 " Criar um novo cartão de memória de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d amostras"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d amostras (nível de qualidade %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s já existe, substituir?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s falha ao ficar scrubbed. Provavelmente a imagem está corrompida."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s falha ao abrir"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s é um ficheiro com 0 bytes"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s já está comprimido! Não é possível comprimir mais."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
+msgid "%s was not a directory, moved to *.original"
 msgstr ""
-"%s é demasiado longo para um nome de ficheiro, o máximo de caracteres é 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEliminar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocos livres; %u Entradas de directórios livres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& E"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Arrancar através da unidade de DVD ..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Pontos de partida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Procurar ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Gestor de Cheats"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&Definições de DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Eliminar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Eliminar ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Definições Gráficas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Definições de Teclas de Atalho"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "&Carregar Estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Gestor de Cartão de Memória(GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opções"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Começar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Modo só de leitura"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Som"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Parar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Ver"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Definições Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zLonge"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zPerto"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(DESCONHECIDO)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(desligado)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Introduza aqui o nome>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Resoluções não encontradas>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Pressione Tecla>"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistema>"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Uma janela NetPlay já está aberta!!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Nenhum jogo actualmente a correr."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Sobre o Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Aceleração"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Precisão:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Acção"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -465,7 +510,7 @@ msgstr ""
 "Culprit Code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -473,7 +518,7 @@ msgstr ""
 "Erro Action Replay: Tamanho Inválido (%08x : address = %08x) em Adição de "
 "Código (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -482,7 +527,7 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em "
 "Preenchimento e Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -491,7 +536,7 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita e "
 "Preenchimento Ram (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -500,185 +545,153 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita para "
 "Ponteiro (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Erro Action Replay: Valor inválido (%08x) em cópia de memória (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Erro Action Replay: linha de código AR inválida: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay:Código Condicional: Tamanho Inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Tipo de código normal inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Código normal %i: Subtipo inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Código Normal 0: Subtipo Inválido %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Adicionar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Adicionar Código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Adicionar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Adicionar novo painel"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Localização :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Adiciona o valor específico a um parâmetro zFar.\n"
-"Duas formas de expressar os valores dos pontos flutuantes.\n"
-"Exemplo: introduzindo ''200'' ou ''0.0002'' directamente, produz efeitos "
-"iguais, o valor adquirido será ''0.0002''.\n"
-"Valores: (0->+/-Integer) or (0->+/-FP[6 digitos de precisão])\n"
-"\n"
-"NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Adiciona o valor específico para o parâmetro zNear.\n"
-"Duas formas de expressar os valores de pontos flutuantes.\n"
-"Exemplo: introduzindo ''200'' or ''0.0002'' directamente, produz efeitos "
-"iguais,o valor adquirido será ''0.0002''.\n"
-"Valores: (0->+/-Integer) or (0->+/-FP[6 digitos de precisão])\n"
-"\n"
-"NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Ajustar a pressão de controlo analógico necessária para activar os botões."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Definições avançadas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Todos os ficheiros Gamecube GCM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Todos os Estados Guardados (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Todos os ficheiros Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Todos os ficheiros (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analisar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Ângulo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtro Anisotrópico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Serrilhamento"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader é do tamanho errado...é mesmo uma apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader impossibilitada de carregar através do ficheiro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -688,16 +701,12 @@ msgstr ""
 "\n"
 "Em caso de dúvida, seleccione (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Árabe"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Tem a certeza que quer apagar \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -705,56 +714,83 @@ msgstr ""
 "Tem a certeza que quer apagar estes ficheiros?\n"
 "Serão eliminados permanentemente!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Tem a certeza que quer eliminar este ficheiro?  Será eliminado "
 "permanentemente!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Proporção de ecrã:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Pelo menos um painel deve manter-se aberto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Áudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Áudio Backend :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Automático"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Automático (Multiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (Dimensão da Janela)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Ajuste Automático da Dimensão da Janela"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -764,250 +800,249 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Trás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Definições Backend"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Introdução em segundo plano"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Retroceder"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Cabeçalho de ficheiro inválido"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Detalhes de Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Definições Básicas"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baixo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Verificação da Tabela de Atribuição de Blocos falhou"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blocos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul Direita"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Inferior"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controlos agregados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Inactivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Procurar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Procurar por uma pasta para adicionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Procurar por uma pasta de ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Procurar por pasta de destino"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Botões"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Motor de emulador de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache de listas de Visualização"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcula a iluminação de gráficos 3D por pixel em vez de por vértice.\n"
-"Diminui a velocidade de emulação por uma percentagem variável (dependendo do "
-"seu GPU).\n"
-"Isto normalmente é uma melhoria segura, mas por vezes poderá causar "
-"problemas.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Impossível abrir %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Impossível retirar registo de eventos quando há eventos pendentes"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Não é possível utilizar o ficheiro como cartão de memória.\n"
-"Está a tentar utilizar o mesmo ficheiro nas duas slots?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalão"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centro"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Mudar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Mudar &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Mudar Disco"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Mudar de Jogo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1015,76 +1050,63 @@ msgstr ""
 "Mudar o idioma do interface do utilizador. \n"
 "Necessário reiniciar. "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Alterações assinaladas a parâmetro zFar  (após correcção)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"Alterações não vão surtir efeito enquanto o emulador estiver em execução!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Conversa"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Código de Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Procura de Cheats"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Gestor de Cheats"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "A verificar integridade..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Escolha uma pasta de raiz do DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Escolha uma pasta de raiz NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Escolha um ISO padrão:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Escolha uma pasta para adicionar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Escolha um ficheiro para abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Escolha um cartão de memória:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1092,27 +1114,27 @@ msgstr ""
 "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos "
 "construídos através de pastas)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Escolha a pasta para extrair"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Stick circular"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clássico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Limpar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1120,183 +1142,230 @@ msgstr ""
 "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá "
 "que parar o jogo manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Fechar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Info de Código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Comentário"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Comentar:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "A comprimir ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configuração"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configuração de Controlos"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configuração de Comandos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Confirmar Substituição de Ficheiro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Confirmar Ao Parar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Conectar Teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "A conectar..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Consola"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Controlo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Converter para GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Cópia Falhou"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Copiar para o Cartão de memória %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Não foi possível criar %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Não foi possível iniciar o backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Não foi possível ler \"%s\". Não há um disco na unidade, ou não é um backup "
-"de GC/Wii.  Tenha atenção que discos de jogos originais Gamecube ou Wii não "
-"serão lidos na maioria das unidades de DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Não foi possível reconhecer ficheiro ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Não foi possível guardar %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1309,11 +1378,19 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1321,38 +1398,46 @@ msgstr ""
 "Não foi possível iniciar o core.\n"
 "Verifique a sua configuração."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Contador:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "País"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Criar um código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Criar nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Criador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Crítico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Recortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1362,200 +1447,191 @@ msgstr ""
 "\n"
 "em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Desvanecimento cruzado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Hack de projecção personalizada"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Definições de Hack de projecção customizada"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Personalizar alguns parâmetros de Projecção Ortogonal."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Checo"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Motor de Emulador DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulação de DSP HLE (rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpretador DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Recompilador de DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Definições de DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Raiz de DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Dimensão de Dados"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Data:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro files(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zona morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Depuração"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Depuração"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "A descomprimir ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Padrão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "ISO Padrão:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Tipo de letra Padrão"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Apagar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Apagar Jogo Guardado"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Apagar o ficheiro existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Descrição"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Detectada tentativa de leitura excessiva de dados do DVD, mais do que pode "
-"caber dentro do buffer externo."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Definições de Dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Marcação"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1563,20 +1639,23 @@ msgstr ""
 "Verificação de pasta falhou\n"
 " e verificação da cópia de segurança de pasta falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Desactivar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Desactivar Nevoeiro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1590,254 +1669,213 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Desactiva a emulação de cópias EFB.\n"
-"Estas são frequentemente utilizadas para pós-processamento ou efeitos de "
-"renderização de textura, portanto se activar esta definição aumentará "
-"bastante o desempenho mas quase sempre poderá também provocar problemas.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Erro de leitura de disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Visualização"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Mostrar as entradas lidas pelo emulador.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Deseja parar a emulação actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Configurações Gráficas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin &Web Site"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configurações Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuração da emulação de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Configuração de GCPad "
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS filmes (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Configuração Dolphin do Wiimote"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin em &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"O Dolphin não conseguiu encontrar ISOs de GC/Wii.  Duplo clique aqui para "
-"procurar ficheiros..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin está actualmente definido para esconder todos os jogos.  Duplo "
-"clique aqui para mostrar todos os jogos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Baixo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Download de Códigos (Base de dados WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Descarregados %lu códigos. (adicionados %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambores"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Depositar Áudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Depositar Alvo EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Depositar Quadros"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Depositar Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Deposite todos os quadros renderizados para um ficheiro AVI em User/Dump/"
-"Frames/\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Depositar texturas do jogo para User/Dump/Textures/<game id>/\n"
-"\n"
-"Em caso de dúvida. mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Depositar todo o conteúdo das cópias EFB em User/Dump/Textures/\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holandês"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "S&air"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Cópias EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1846,56 +1884,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Actualizações de Memória Inicial"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Editar"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Editar Código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Editar Configuração"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Editar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Editar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efeito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Frame Buffer Embutido"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Thread de Emulador já em execução"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1909,7 +1931,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, active a opção emulação virtual XFB como alternativa."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1925,121 +1947,92 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Wiimote Emulado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Estado da Emulação:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Activar"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Activa efeitos estereoscópicos 3D utilizando a tecnologia Nvidia 3D Vision, "
-"se for suportada pelo seu GPU.\n"
-"Possivelmente provoca falhas.\n"
-"\n"
-"Necessita de ecrã inteiro para funcionar.\n"
-"Em caso de dúvida mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Activar Execução de relatórios AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Activar Fusão de blocos"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Activar Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Activar Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Activar Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Activar Dual Core (aumento de desempenho)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Activar Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activar Idle Skipping (aumento de desempenho)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Activar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Activar Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Activar Protector de Ecrã"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Activar Ecrã Panorâmico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Activar Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Activar o filtro anisotrópico.\n"
-"Melhora a qualidade visual das texturas que estão em ângulos oblíquos.\n"
-"Poderá causar problemas num pequeno número de jogos.\n"
-"\n"
-"Em caso de dúvida, seleccione 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Activar acesso rápido ao disco.  Necessário para alguns jogos. (ON = Rápido, "
-"OFF = Compatível)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Activar Páginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2052,7 +2045,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2064,30 +2057,25 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr ""
-"Activar isto para aumentar desempenho no The Legend of Zelda: Twilight "
-"Princess. Desactive para qualquer outro jogo."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Hack de projecção customizada"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
-msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
+msgid ""
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2099,7 +2087,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2107,7 +2095,11 @@ msgstr ""
 "Activa a Unidade de Gestão de Memória, necessária em alguns jogos. (ON = "
 "Compatível, OFF = Rápido)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2117,59 +2109,70 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fim"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Inglês"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Melhorias"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Introduza um nome para a nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Erro"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão "
 "do sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2178,213 +2181,188 @@ msgstr ""
 "Erro: Tentativa de acesso ao tipo de letra %s mas não estão carregadas. Os "
 "jogos poderão não mostrar os tipos de letra correctamente, ou crashar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
-"Manipulador de excepções - acesso inferior ao espaço da memória. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Sair"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exportar Todos os Jogos Guardados Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "A Exportação Falhou"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportar Ficheiro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportar Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportar Gravação..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportar Jogo Guardado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar jogo guardado Wii (Experimental)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportar todos os jogos guardados"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "A exportação falhou"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exportar guardar como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extensão"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Frame Buffer externo"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Parâmetro Extra"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parâmetro Extra apenas útil em \"Metroid: Other M\"."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extrair Todos os Ficheiros..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extrair Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extrair DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extrair Pasta..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extrair Ficheiro..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extrair Partição..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "A Extrair %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "A Extrair Todos os Ficheiros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "A Extrair Pasta"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "A Extrair..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "Reprodutor FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANÇA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Tamanho FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "A Conexão Falhou!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Falha ao descarregar códigos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Falha ao extrair para %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Falha ao carregar DSP ROM:\t%s\n"
-"\n"
-"Este ficheiro é necessário para utilizar DSP LLE.\n"
-"Não está incluido no Dolphin por conter dados protegidos por direitos de "
-"autor.\n"
-"Utilize DSPSpy para depositar o ficheiro a partir da sua consola física.\n"
-"\n"
-"Poderá utilizar o motor DSP HLE que não necessita de depósitos ROM.\n"
-"(Escolha-o através do separador \"Áudio\" na janela de configuração.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Falha ao ler banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2393,7 +2371,7 @@ msgstr ""
 "atribuídos\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2401,17 +2379,12 @@ msgstr ""
 "Falha ao ler a tabela de blocos atribuídos\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Falha ao ler dados do ficheiro %d"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2419,7 +2392,7 @@ msgstr ""
 "Falha ao ler correctamente a pasta com cópia de segurança\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2427,11 +2400,7 @@ msgstr ""
 "Falha ao ler a pasta correctamente\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Falha ao ler cabeçalho"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2439,72 +2408,61 @@ msgstr ""
 "Falha ao ler o cabeçalho correctamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Falha ao ler ID único da imagem do disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Falha ao escrever BT.DINF para SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Falha ao escrever bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Falha ao escrever cabeçalho para %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Versão rápida do MMU.  Não funciona em todos os jogos."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Reprodutor Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Informação de Ficheiro"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "O ficheiro não continha códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Ficheiro convertido para .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2512,7 +2470,7 @@ msgstr ""
 "O ficheiro não pôde ser aberto\n"
 "ou não tem uma extensão válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2521,95 +2479,93 @@ msgstr ""
 "O ficheiro tem a extensão \"%s\"\n"
 "as extensões válidas são (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Ficheiro não comprimido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Modo aberto desconhecido : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Sistema de ficheiros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Procurar seguinte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Procurar anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Primeiro Bloco"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Corrigir Checksums"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Definir a consola como NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Forçar Filtro de Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força o filtro de textura mesmo que o jogo emulado o tenha desactivado "
-"explicitamente.\n"
-"Melhora ligeiramente a qualidade das texturas mas provoca falhas em alguns "
-"jogos.\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força o jogo a ter gráficos adaptados a resoluções de ecrã panorâmico.\n"
-"Poderá causar falhas gráficas em alguns jogos.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Força o modo NTSC-J para utilizar a font de ROM Japonesa.\n"
-"Se deixar desactivada, o dolphin utiliza a NTSC-U como padrão e "
-"automaticamente activa esta definição quando um jogo Japonês é jogado."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2617,525 +2573,575 @@ msgstr ""
 "Formatar como ascii (NTSC\\PAL)?\n"
 "Escolha não para sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Frente"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Encontrados %d resultados para '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
+#, c-format
+msgid "Found %u save files"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Depósitos de Quadros usam FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Alcance de Quadros"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "S&altar Quadros"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Limite de Quadros:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Quadros para Gravar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Vista Livre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francês"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Trastes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Resolução em ecrã Inteiro:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Ficheiro GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "ComandoGC"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID do Jogo:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "O jogo já está a correr!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "O jogo não está a correr!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Jogo não encontrado!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Definições específicas por jogo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Configuração de Jogo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Definições de Comando &Gamecube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Definições de Comando Gamecube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Códigos Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Geral"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Alemão"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Index é maior que o tamanho da lista de código %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Definições Gráficas"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Maior Que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grego"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Verificação de Cabeçalho falhou"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebraico"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Olá,\n"
-"\n"
-"O Dolphin requer que o seu CPU tenha suporte para extensões SSE2.\n"
-"Infelizmente o seu CPU não as suporta, portanto o Dolphin não vai correr.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Esconder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Esconder o cursor do rato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Esconde o ponteiro do rato se estiver por cima da janela de emulação.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Configuração de Teclas de atalho"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Teclas de Atalho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Hibrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS:Tentativa de obter dados de um ticket desconhecido: %08x/"
 "%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - destino inválido"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Definições IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IV"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Ponteiro Infra Vermelho"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Sensibilidade de Infra Vermelhos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Detalhes ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Pastas ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "Itália"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ícone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorar Mudanças de Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignora quaisquer mudanças no formato EFB.\n"
-"Melhora o desempenho em muitos jogos sem qualquer efeito negativo. Apesar de "
-"provocar falhas gráficas num pequeno número de jogos.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignora qualquer tentativa de leitura ou escrita do CPU para o EFB.\n"
-"Melhora o desempenho em alguns jogos, mas poderá desabilitar algumas "
-"funcionalidades do jogo ou efeitos gráficos.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importar Jogo Guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importar Jogo Guardado Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "A importação falhou"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"O ficheiro importado tem a extensão gsc\n"
-"mas não tem um cabeçalho correcto"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "O ficheiro importado tem um tamanho inválido"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"O ficheiro importado tem a extensão sav\n"
-"mas não tem um cabeçalho correcto"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Em Jogo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Informação"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informação"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Inserir"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Inserir Cartão SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Introduza o nome aqui..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Instalar para o Menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "A Instalar WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Iinterface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Definições de interface"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Erro interno de LZO - compressão falhou"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3144,167 +3150,181 @@ msgstr ""
 "Erro interno de LZO - a descompressão falhou (%d) (%li, %li) \n"
 "Tente carregar o estado novamente"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erro interno de LZO - lzo_init() falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Resolução Interna:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Tamanho Inválido(%x) ou palavra mágica (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Valor inválido!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "bat.map inválido ou entrada de pasta"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo de evento inválido %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Ficheiro inválido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Encontrado opening.bnr inválido em gcm:\n"
-"%s\n"
-" Poderá ter que refazer o depósito deste jogo."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Ficheiro de Gravação inválido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Estado Inválido"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPÃO"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonês"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "COREIA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Tecla"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Botão L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick Esquerdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Clique esquerdo para detectar teclas de atalho. \n"
-"Prima barra de espaço para limpar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3314,7 +3334,7 @@ msgstr ""
 "Clique botão do meio para limpar.\n"
 "Clique botão direito para mais opções."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3322,198 +3342,211 @@ msgstr ""
 "Clique Esquerdo/Direito para mais opções.\n"
 "Botão do meio para limpar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Inferior que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limitar por FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Carregar Texturas Personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Carregar Estado Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Carregar Estado Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Carregar Estado Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Carregar Estado Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Carregar Estado Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Carregar Estado Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Carregar Estado Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Carregar Estado Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Carregar Estado..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Carregar Sistema de Menu Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carregar Sistema de Menu Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Carrega texturas personalizadas a partir de User/Load/Textures/<game id>/\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Carregar Valores de origem para padrões de hack disponíveis."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Relatório"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configuração de Relatório"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Tipos de Relatório"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Saídas de Gerador de Relatórios"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Relatório em execução"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "A ligação ao servidor perdeu-se!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Botão M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 não combina\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Hack de velocidade"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "ficheiros MadCatz Gameshark(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Stick Principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID do autor:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Fabricante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3522,29 +3555,33 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "O cartão de memória já tem um jogo guardado para este título"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "O cartão de memória já abriu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Byte de Memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Cartão de memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3552,7 +3589,7 @@ msgstr ""
 "Gestor de Cartões de memória AVISO-Faça cópias de segurança antes de "
 "utilizar, deve estar corrigido mas também pode danificar!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3569,37 +3606,52 @@ msgstr ""
 "%s\n"
 "Quer fazer uma cópia do ficheiro antigo para esta nova localização?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mic"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Diversos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Configurações Diversas"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3611,20 +3663,24 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Tipo de letra monoespaçada"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3643,678 +3699,630 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Adicionar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Começar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Apagar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Baixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP Fim"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Início"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Inserir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Página abaixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Página acima"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Direita"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Espaço"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtrair"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Cima"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Ficheiros GCI nativos(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Nova procura"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Próxima Página"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Próxima Procura"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Alcunha :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Sem País (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Nenhum ISO ou WAD encontrado"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Sem saída de áudio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nenhum ficheiro banner foi encontrado para o título  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Nenhuma descrição disponível"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Sem colocação"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Nenhum ficheiro carregado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Sem entradas de índice para pastas livres"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Nenhum ficheiro de gravação"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Não foi encontrada a pasta de jogo guardado para o título %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Nenhum"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Bokmaal Norueguês"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Não igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Não definido"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notas"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Noticia"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Número De Códigos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Aceleração Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objecto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Alcance de Objecto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Desligado"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "Online e documentação"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Apenas %d blocos disponíveis"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Abrir &Pasta"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Abrir Pasta de &Jogo guardado Wii "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Abrir ficheiro..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: não foram encontrados dispositivos de som"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: não foi possível abrir dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Descodificador de Textura OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Descodificador de Textura OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opções"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Laranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Outro"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"O outro cliente desligou enquanto o jogo corria!! Netplay está desactivado. "
-"Manualmente parou o jogo."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Destino"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "R&eproduzir Gravação..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Comando"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Comandos"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Página Abaixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Página Acima"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Parágrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parâmetros"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partição %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Caminhos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Fazer pausa no fim do filme"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Iluminação por Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfeito"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Começar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Tocar Gravação"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Começar/Pausar"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Jogável"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Opções de Reprodução"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Jogadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Por favor confirme..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Por favor crie uma perspectiva antes de guardar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Mais-Menos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polaco"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Português"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasileiro)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Efeito de Pós-Processamento"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Predefinições:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Pág Anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Limpar Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Questão"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Sair"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Botão R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Alcance"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Modo só de leitura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Wiimote Real"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Wiimotes Reais"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Gravar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Gravar entradas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Informação de Gravação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Opções de Gravação"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermelho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermelho Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermelho Direita"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Reduz a quantidade de serrilhamento causado pela rasterização de gráficos "
-"3D.\n"
-"Isto faz com que a imagem renderizada seja menos pixelizada.\n"
-"diminui bastante a velocidade de emulação e por vezes provoca falhas.\n"
-"\n"
-"Em caso de dúvida, seleccione Nenhum."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Actualizar lista de Jogos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Remover"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4324,242 +4332,320 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Renderizar para a Janela Principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisão:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibração"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russo"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Gua&rdar Estado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Guardar GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Guardar Estado Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Guardar Estado Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Guardar Estado Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Guardar Estado Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Guardar Estado Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Guardar Estado Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Guardar Estado Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Guardar Estado Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Guardar Estado..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Guardar GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Guardar perspectiva actual"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Jogo guardado descomprimido GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "O filme de Savestate  %s está corrupto, gravação de filme a parar..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Cópia EFB Escalada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "A procurar %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "A procurar ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Em Analise..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Filtro de Pesquisa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Procurar em Sub-Pastas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Selecção %s não encontrada em SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Seleccione o Ficheiro de Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Seleccione um ficheiro Wii WAD para instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Escolha um adaptador de hardware a usar.\n"
-"\n"
-"Em caso de dúvida, utilize o primeiro."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Seleccione um ficheiro de jogo guardado para importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Seleccionar janelas flutuantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Seleccione o ficheiro para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Seleccione o ficheiro de jogo guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Seleccione o estado para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Seleccione o estado para gravar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4577,255 +4663,291 @@ msgstr ""
 "da sua proporção.\n"
 "Em caso de dúvida, seleccione Automático."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Tipo de letra seleccionado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Selecciona a resolução utilizada em modo de ecrã inteiro.\n"
-"Isto deverá ser maior ou igual que a resolução interna. O impacto no "
-"desempenho é infimo.\n"
-"\n"
-"Em caso de dúvida, utilize a resolução do ambiente de trabalho.\n"
-"Se ainda tiver dúvidas, utilize a resolução mais alta que funcione melhor."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Enviar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Posição da Barra de Sensor:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Sérvio"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Serial Port 1 - Esta é a porta em que dispositivos tais como adaptadores de "
-"rede utilizam"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Definir como ISO &padrão"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Definir como cartão de memória padrão %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Definições..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Abanar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Abreviatura:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Botões Shoulder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Mostrar &Consola"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Mostrar &Relatório"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Mostrar &Barra de estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Mostrar Barra de Ferramen&tas"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Mostrar Unidades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar Regiões de Cópia EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Mostrar visualização de Entradas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Mostrar Itália"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Mostrar Japão"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Mostrar Coreia"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Mostrar Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Mostrar &Configuração de Relatório"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Mostrar Pal"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Mostrar Plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Mostrar Regiões"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Mostrar Estatísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar uma caixa de confirmação antes de parar um jogo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Mostrar uma caixa de mensagem quando um erro potencialmente sério ocorra.\n"
-"Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também "
-"poderá não explicar o motivo pelo qual o Dolphin crashe de repente."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Mostrar primeiro bloco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Mostrar blocos de guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mostrar guardar comentário"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Mostrar ícone de guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Mostrar o título de jogo guardado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4837,84 +4959,82 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Mostrar desconhecido"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Mostra várias estatísticas.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Wiimote na horizontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Dimensão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Saltar Bios"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Ignorar o acesso do EFB a partir do CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Aumenta ligeiramente as cópias de EFB para RAM ao sacrificar a precisão da "
-"emulação.\n"
-"Por vezes também aumenta a qualidade visual.\n"
-"Se está a experenciar quaisquer problemas, tente aumentar a precisão do "
-"cache de textura ou desactive esta opção.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Captura de ecrã"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderizador por Software"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4927,234 +5047,282 @@ msgstr ""
 "Tem a certeza que quer activar a renderização por software? Em caso de "
 "dúvida, seleccione 'Não'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Definições de Som"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Backend de Som %s não é válido"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Criação do buffer de som falhou: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Espaço"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volume do Altifalante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Especifica a resolução utilizada. Uma resolução alta irá aumentar bastante a "
-"qualidade visual mas também será bastante pesada para o desempenho e poderá "
-"causar falhas em alguns jogos.\n"
-"\"Multiplo de 640x528\" é um pouco mais lento que \"Tamanho da Janela\" mas "
-"provoca menos problemas. Geralmente, quanto mais baixa for a resolução "
-"interna, melhor será o desempenho. \n"
-"\n"
-"Em caso de dúvida, seleccione 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Aumente a taxa de transferência do disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Stick quadrado"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Comando padrão"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Começar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Começar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "&Começar Gravação"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Começar Gravação"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Estados Guardados"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Parar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"Guarda cópias EFB em objectos de textura GPU.\n"
-"Isto não é tão preciso, mas funciona suficientemente bem para a maioria dos "
-"jogos e proporciona mais velocidade que o EFB para RAM.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Ajustar à janela"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Subtrair"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Ficheiros extraídos com sucesso para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Sucesso na importação de ficheiros de jogo guardado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Balanço"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Idioma do sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab divisão"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table Direita"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Tirar Screenshot"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Teste"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Cache de Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Formato da textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "O WAD foi instalado correctamente"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "O caminho é inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "A checksum foi reparada com sucesso"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "A pasta escolhida já está na lista"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5163,7 +5331,7 @@ msgstr ""
 "O ficheiro %s já existe.\n"
 "Deseja substituir?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5172,44 +5340,35 @@ msgstr ""
 "O ficheiro %s não pôde ser aberto para escrita. Por favor verifique se já "
 "está aberto por outro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser "
 "escrito."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "O ficheiro que especificou (%s) não existe"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "O nome não pode estar vazio"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "O nome não pode conter o caracter ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "O resultado do código AR desencriptado não contém quaisquer linhas."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"O Jogo Guardado que está a tentar copiar tem um tamanho de ficheiro inválido"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5217,36 +5376,48 @@ msgstr ""
 "O idioma seleccionado não é suportado pelo seu sistema. A repor padrão do "
 "sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "O servidor e a versão NetPlay do cliente são incompatíveis"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "O servidor está cheio!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "O servidor respondeu: O jogo está a correr neste momento!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "O servidor enviou uma mensagem de erro desconhecida!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "O ficheiro especificado \"%s\" não existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "O valor é inválido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5254,7 +5425,7 @@ msgstr ""
 "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está "
 "provavelmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5262,7 +5433,7 @@ msgstr ""
 "Estas definições substituem as definições raiz do Dolphin .\n"
 "Indeterminado significa que o jogo usa as definições do Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5270,112 +5441,163 @@ msgstr ""
 "Este simulador de Action Replay não suporta códigos que modifiquem o próprio "
 "Action Replay"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Isto divide as threads de Vídeo e CPU, para que possam ser utilizadas em "
-"núcleos (cores) separados.\n"
-"Provoca aumentos significativos de velocidade em PCs com mais de um núcleo, "
-"mas também poderá causar crashes ou falhas."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Isto permite a edição manual do ficheiro de configuração INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Limite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Para"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Alternar Todos os Tipos de Relatório"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Alternar Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Topo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Tentou carregar um tipo de ficheiro desconhecido."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Gatilhos"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Tentativa de leitura inválida de SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5383,235 +5605,200 @@ msgstr ""
 "Tentativa de leitura inválida de SYSCONF\n"
 " ids bt de wiimote não estão disponíveis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turco"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Rotação"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tipo"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Porta UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "DESCONHECIDO"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Não foi possível analisar a linha %lu do código AR inserido como um código "
-"encriptado ou desencriptado válido.  Verifique se o escreveu correctamente.\n"
-"Quer ignorar esta linha e continuar a analisar?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Indefinido %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Retroceder Carregamento de Estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando de DVD desconhecido %08x - Erro fatal"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Comando desconhecido 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipo de entrada desconhecida %i em SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Mensagem desconhecida recebida com a id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
 "jogador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Cima"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Actualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote na vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Usar modo EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Utilizar Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Usar Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Usar Manipuladores de Pânico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Utiliza threads múltiplos para descodificar as texturas.\n"
-"Poderá resultar em maior rapidez (especialmente em CPUs com mais de dois "
-"cores).\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Normalmente quando um shader de complilação falha, uma mensagem de erro é "
-"mostrada.\n"
-"No entanto, poderá saltar os popups para impedir a interrupção do jogo ao "
-"activar esta opção.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilidade"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valor: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbosidade"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Vídeo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalação WAD falhou: erro ao criar %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5624,25 +5811,27 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Aviso"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Aviso - a começar DOL  em modo errado de consola!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Aviso - A iniciar um  ELF em modo errado de consola!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Aviso - A iniciar um ISO em modo errado de consola!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5654,7 +5843,7 @@ msgstr ""
 "%s\n"
 "Deseja continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5667,7 +5856,7 @@ msgstr ""
 "e tem o mesmo nome que um ficheiro no seu cartão de memória\n"
 "Continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5675,7 +5864,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5683,7 +5880,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5702,180 +5899,172 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - ficheiro não aberto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Hack de Ecrã Panorâmico"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Largura"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Raiz de NAND Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Não foi possível ler do ficheiro"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Conectado"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Motor de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Definições de Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Janelas Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Menu de Janelas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Janelas Direita"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Moldar o texto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "A trabalhar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Escrever para Consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Escrever para Ficheiro"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Escrever para a Janela"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice falhou: %#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Inicialização do XAudio2 falhou: %#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Criação de master voice do XAudio2 falhou: %#X"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Não pode fechar painéis que contenham páginas."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Tem que escolher um jogo!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Tem que introduzir um nome!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Tem que introduzir um valor decimal,  hexadecimal ou octal válido."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Tem que introduzir um nome de perfil válido."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5883,36 +6072,33 @@ msgstr ""
 "O seu ficheiro GCM/ISO parece ser inválido (país inválido).\n"
 "Continuar com a região PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"O seu ficheiro SYSCONF tem o tamanho errado.\n"
-"Deveria ser 0x%04x (mas é 0x%04llx)\n"
-"Pretende gerar um novo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Código Zero 3 não é suportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Código Zero desconhecido para o Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ em espera ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5924,78 +6110,30 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Costumizar]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Tem como objectivo aumentar a velocidade de emulação ao transferir a tarefa "
-"de descodificação de texturas para o GPU utilizando a tecnologia OpenCL.\n"
-"No entanto, neste momento é sabido que provoca defeitos ao nível das "
-"texturas em vários jogos. É também mais lento que a normal descodificação de "
-"textura pelo CPU na maioria dos casos.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Aumenta ligeiramente a velocidade de emulação ao fazer cache das listas de "
-"visualização.\n"
-"Possívelmente causa falhas.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "mensagem desconhecida recebida"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute devolveu -1 quando a aplicação executou!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correcção zFar: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correcção zNear: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| OU"
diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po
index 67769caddd..e7f38431c6 100644
--- a/Languages/po/pt_BR.po
+++ b/Languages/po/pt_BR.po
@@ -1,22 +1,26 @@
-# Translation of dolphin-emu.pot to Brazilian Portuguese
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Maldonny <eu.charles@hotmail.com>, 2013
+# Charles Fernando da Silva <eu.charles@hotmail.com>, 2013-2015
 # Dante Jr. <danteprojetos@gmail.com>, 2011
+# David Rodrigues <david.proweb@gmail.com>, 2014
+# Felipefpl, 2015
+# Felipefpl, 2015
 # Runo <i.am.runo@gmail.com>, 2013
-# Maldonny <eu.charles@hotmail.com>, 2013
-# Mateus Cassiano <jhonn.copperfield@gmail.com>, 2013
-# Mateus Cassiano <jhonn.copperfield@gmail.com>, 2013
+# Charles Fernando da Silva <eu.charles@hotmail.com>, 2013
+# Mateus B. Cassiano <jhonn.copperfield@gmail.com>, 2013-2015
+# Mateus B. Cassiano <jhonn.copperfield@gmail.com>, 2013
 # Runo <i.am.runo@gmail.com>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-14 12:33+0000\n"
-"Last-Translator: Maldonny <eu.charles@hotmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "dolphin-emu/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -25,464 +29,533 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
-msgid " (too many to display)"
-msgstr "(muitos para mostrar)"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin é um emulador de GameCube e Wii gratuito e de código aberto.\n"
+"\n"
+"Este software não deve ser utilizado para jogar jogos que você não possuí "
+"legalmente.\n"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(IP interno)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
+msgid " (too many to display)"
+msgstr "(muitos pra exibir)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Jogo : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NÃO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 "\"%s\" não existe.\n"
-"Criar um novo Memory Card de 16MB?"
+"Criar um novo Memcard de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "Falha ao reduzir \"%s\". A imagem provavelmente está corrompida."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" já está comprimido! Não é possível comprimir novamente."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
-msgstr ""
-"\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii."
+msgstr "\"%s\" é um arquivo GCM/ISO inválido, ou não é uma ISO de GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d amostras"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d amostras (nível de qualidade %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+"%s\n"
+"não foi carregado porque possuí o mesmo nome interno do save carregado "
+"anteriormente\n"
+"%s"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+"%s\n"
+"não foi carregado porque é um arquivo GCI inválido.\n"
+"O tamanho do arquivo (%<PRIx64>) não corresponde ao tamanho salvo no "
+"cabeçalho (%d)"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+"%s\n"
+"não foi carregado porque é um arquivo GCI inválido.\n"
+"O número de blocos deveria ser %d"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+"%s\n"
+"não foi carregado porque não há blocos livres suficientes no Memory Card "
+"virtual"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+"%s\n"
+"não foi carregado porque há menos de 10%% de espaço livre no Memory Card "
+"virtual\n"
+"Total de Blocos: %d; Blocos Livres: %d"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (Disco %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr "IPL %s encontrado na pasta %s. O disco pode não ser reconhecido"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
-msgstr "%s já existe, deseja substituir?"
+msgstr "%s já existe, sobrescrever?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s não pôde ser \"limpo\". A imagem provavelmente está corrompida."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
-"%s falhou ao ser carregado como Memory Card\n"
-" O tamanho é inválido (0x%x bytes)"
+"%s falhou em carregar como um memory card\n"
+" O tamanho do arquivo do cartão é inválido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
-"%s falhou ao ser carregado como Memory Card\n"
-" O tamanho é inválido (0x%x bytes)"
+"%s falhou em carregar como um memory card\n"
+" O tamanho do arquivo do cartão é inválido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
-"%s não pôde ser carregado como um Memory Card \n"
-"o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x "
-"bytes)"
+"%s falhou em carregar como um memory card \n"
+"o arquivo não é grande o bastante pra ser um arquivo de memory card válido "
+"(0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "Falha ao abrir %s"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
+"%s não é uma pasta, falha ao mover para *.original.\n"
+"Verifique se você tem permissões de escrita ou mova o arquivo para fora do "
+"Dolphin"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s falhou: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr "%s não era uma pasta, movido para *.original"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s é um arquivo de 0 bytes"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s Já está comprimido! Não é possível comprimir mais."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s é muito longo para o nome do arquivo, o máximo de caractéres é 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
-msgstr "%sDeletar%s"
+msgstr "%sApagar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& E"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Carregar a Partir do Drive de DVD..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "Configurações de &Som"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "Iniciar de um Disco de &Backup..."
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Pontos de Interrupção"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Procurar por ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr "Gerenciador de &Cheats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Configurações do &DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "Configurações de &Controles"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
-msgstr "&Deletar ISO..."
+msgstr "&Apagar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
-msgstr "&Deletar ISOs selecionadas..."
+msgstr "&Apagar as ISOs selecionadas..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Arquivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
-msgstr "Avançar Quadro"
+msgstr "&Avançar Frame"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
-msgid "&Graphics Settings"
-msgstr "Configurações de &Gráficos"
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr "Repositório no &GitHub"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:229
+msgid "&Graphics Settings"
+msgstr "&Configurações dos Gráficos"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
-msgstr "Configurações de &Teclas de Atalho"
+msgstr "&Configurações das Hotkeys"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
-msgstr "&Carregar Instante Salvo"
+msgstr "&Carregar State"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
-msgstr "Gerenciador de Cartão de &Memória (GC)"
+msgstr "&Gerenciador de Cartão de Memória (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "Gravação"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opções"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Jogar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Modo Somente Leitura"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr "Modo &Somente-Leitura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
-msgstr "&Recarregar Lista"
+msgstr "&Atualizar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
-msgstr "&Registradores"
+msgstr "&Registros"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
-msgstr "&Reiniciar"
+msgstr "&Resetar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Som"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Parar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
-msgstr "Ferramen&tas"
+msgstr "&Ferramentas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
-msgstr "&Video"
+msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
-msgstr "&Ver"
+msgstr "&Visualizar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Configurações de &Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "&Website"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr "(Erro: Problemas no host)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "(Erro: Desconectado)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr "(Erro: versão do Dolphin muito antiga)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(DESCONHECIDO)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr "(Erro: Socket)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr "(Erro: Sem resposta)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr "(Erro: Desconhecido)"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+"(C) 2003-2015+ Equipe Dolphin. \"GameCube\" e \"Wii\" são marcas registradas "
+"da Nintendo. Dolphin não é afiliado à Nintendo de nenhuma maneira."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(desligado)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ ADD"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Nativo (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Nativo (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Nativo (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Nativo (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Nativo (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Nativo (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8-bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Insira o nome aqui>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
-msgstr "<Nennhuma resolução encontrada>"
+msgstr "<Nenhuma resolução achada>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Pressione Tecla>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Idioma do Sistema>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistema>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "Uma janela de Netplay já está aberta!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Uma janela de Netplay já está aberta!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
-msgstr "Não tem nenhum jogo rodando no momento."
+msgstr "Um jogo não está atualmente em execução."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 "Não foi possível encontrar um dispositivo Bluetooth compatível.\n"
 "Você deve conectar seus Wiimotes manualmente."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"ALERTA:\n"
+"ATENÇÃO:\n"
 "\n"
-"Netplay só funcionará com as seguintes configurações:\n"
-" - Ativar Dois Núcleos [OFF]\n"
-" - O emulador do motor DSP deve ser o mesmo em TODOS os PCs!\n"
-" - DSP em um Thread Dedicado [OFF]\n"
-" - Limite de quadros não definido para [Audio]\n"
+"O Netplay só funcionará corretamente com as seguintes configurações:\n"
+" - A Engine de Emulação DSP precisa ser a mesma em todos os computadores!\n"
+" - DSP em Thread Dedicado [DESLIGADO]\n"
+" - Defina manualmente as extensões para cada Wiimote\n"
 "\n"
-"Todos os jogadores devem usar a mesma versão e configurações do Dolphin.\n"
-"Todos os memory cards devem ser iguais ou desativados.\n"
-"Suporte ao Wiimote não deve estar ativado!\n"
+"Todos os jogadores devem usar a mesma versão do Dolphin e as mesmas "
+"configurações.\n"
+"Todos os Memory Cards precisam ser idênticos entre os jogadores ou "
+"desativados.\n"
+"O suporte à Wiimotes é bem precário. Não utilize.\n"
 "\n"
-"O host deve escolher uma porta TCP aberta/encaminhada! \n"
+"Se estiver se conectando diretamente a porta UDP escolhida pelo host precisa "
+"estar aberta/encaminhada!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Sobre o Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Aceleração"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Precisão:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emula as Cópias do EFB com precisão.\n"
-"Alguns jogos dependem disso para certos efeitos visuais ou funções de "
-"jogabilidade.\n"
-"\n"
-"Se estiver em dúvida, mude o EFB para Textura."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Ação"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -491,848 +564,898 @@ msgid ""
 "Culprit Code:\n"
 "%s"
 msgstr ""
-"Erro de decodificação de código no Action Replay:\n"
-"Falha no Teste de Paridade\n"
+"Erro de Desencriptação do Código do Action Replay:\n"
+"Falhou na Verificação de Paridade\n"
 "\n"
 "Código Culpado:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
-"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code "
-"(%s)"
+"Erro do Action Replay: Tamanho inválido (%08x : endereço = %08x) em "
+"Adicionar Código (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
-"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e "
-"Slide (%s)"
+"Erro do Action Replay: Tamanho inválido (%08x : endereço = %08x) em "
+"Preencher e Deslizar (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
-"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write "
-"e Fill (%s)"
+"Erro do Action Replay: Tamanho inválido (%08x : endereço = %08x) na Gravação "
+"e Preenchimento da RAM (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
-"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to "
-"Pointer (%s)"
+"Erro do Action Replay: Tamanho inválido (%08x : endereço = %08x) na Gravação "
+"do Ponteiro (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
-msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)"
+msgstr "Erro do Action Replay: Valor inválido (%08x) na Cópia da Memória (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
-"Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado "
-"(%s)\n"
-"Master codes não são necessários. Não use master codes."
+"Erro do Action Replay: O Código Mestre e a Gravação em CCXXXXXX não está "
+"implementado (%s)\n"
+"Os códigos mestre não são necessários. Não use códigos mestre."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
-msgstr "Erro no Action Replay: Linha de código AR inválida: %s"
+msgstr "Erro do Action Replay: Linha de código AR inválida: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Código Condicional: Tamanho Inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
-msgstr "Action Replay: Tipo de Normal Code Inválido %08x (%s)"
+msgstr "Action Replay: Tipo de Código Normal Inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
-msgstr "Action Replay: Normal Code %i: Subtipo inválido %08x (%s)"
+msgstr "Action Replay: Código Normal %i: Sub-tipo Inválido %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
-msgstr "Action Replay: Normal Code 0: Subtipo inválido %08x (%s)"
+msgstr "Action Replay: Código Normal 0: Sub-tipo Inválido %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "Adaptador Detectado"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "Adaptador Não Detectado"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Adicionar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
-msgstr "Adicionar Código de ActionReplay"
+msgstr "Adicionar Código do Action Replay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Adicionar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Adicionar novo painel"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Endereço:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Adiciona o valor especificado ao Parâmetro do zFar.\n"
-"Duas formas de expressar os valores flutuantes do ponteiro.\n"
-"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir "
-"efeitos iguais, o valor adquirido será ''0.0002''.\n"
-"Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n"
-"\n"
-"NOTA: Confira a Janela de Log/Console para ver os valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Adiciona o valor especificado ao Parâmetro do zNear.\n"
-"Duas formas de expressar os valores flutuantes do ponteiro.\n"
-"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir "
-"efeitos iguais, o valor adquirido será ''0.0002''.\n"
-"Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n"
-"\n"
-"NOTA: Confira a Janela de Log/Console para ver os valores adquiridos."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
-msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões"
+msgstr ""
+"Ajustar a pressão do controle analógico requerida pra ativar os botões."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avançado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
-msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
+msgstr "Todos os arquivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "Todos os arquivos GameCube CGM (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Todos os arquivos Gamecube CGM (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
-msgstr "Todos os Instantes Salvos (sav, s##)"
+msgstr "Todos os Save States (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
-msgstr "Todos os Arquivos ISO Wii"
+msgstr "Todos os Arquivos ISO do Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
-msgstr "Todos os arquivos ISO GC/Wii comprimidos"
+msgstr "Todos os arquivos ISO do GC/Wii comprimidos (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Todos os arquivos (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
-msgstr "Analizar"
+msgstr "Analisar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Ângulo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
-msgstr "Filtragem Anisotrópica"
+msgstr "Filtragem Anisotrópica:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Data do AppLoader:"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
-msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?"
+msgstr "O Apploader é do tamanho errado... É realmente um Apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
-msgstr "O Apploader não pôde carregar do arquivo"
+msgstr "O Apploader foi incapaz de carregar do arquivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
-"Aplica um efeito pós-processamento depois de gerar um quadro.\n"
+"Aplica um efeito pós-processamento após terminar um frame.\n"
 "\n"
-"Se estiver em dúvida, selecione (desligado)."
+"Se não tiver certeza, selecione (desligado)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Árabe"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Você tem certeza de que quer apagar \"%s\"?"
+msgstr "Você tem certeza que você quer apagar \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
 msgstr ""
-"Você tem certeza que deseja apagar estes arquivos?\n"
-"Eles estarão perdidos para sempre!"
+"Você tem certeza que você quer apagar estes arquivos?\n"
+"Eles sumirão para sempre!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
-"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
-"sempre!"
+"Você tem certeza que você quer apagar este arquivo? Ele sumirá para sempre!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr "Está tentando usar o mesmo arquivo nos dois slots?"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (experimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "JIT ARM64 (experimental)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
-msgstr "Proporção:"
+msgstr "Proporção do Aspecto:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
-msgstr "Pelo menos um painél deve permanecer aberto."
+msgstr "Pelo menos um painel deve permanecer aberto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+"Tenta detectar e pular loops de espera.\n"
+"Na dúvida, mantenha essa opção ativada."
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Áudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
-msgstr "Backend de Audio"
+msgstr "Backend do Áudio"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Configurações de som"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
-msgid "Auto"
-msgstr "Automático"
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Austrália"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "Autores"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
+msgid "Auto"
+msgstr "Auto"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Múltiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (Tamanho da Janela)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
-msgstr "Ajustar Automaticamente o Tamanho da Janela"
+msgstr "Auto-Ajustar o Tamanho da Janela"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ajusta automaticamente o tamanho da janela para a sua resolução interna.\n"
+"Automaticamente ajusta o tamanho da janela a sua resolução interna.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr "BAT Incorreto, Dolphin vai fechar agora"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
-msgstr "Registrador BP"
+msgstr "Registro do BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Voltar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Configurações do Backend"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
-msgstr "Input em Background"
+msgstr "Input de 2º Plano"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
-msgstr "Para trás"
+msgstr "Pra trás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Header de Arquivo Ruim"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
-msgstr "Detalhes de Banner"
+msgstr "Detalhes do Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
-msgstr "Alavanca"
+msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Configurações Básicas"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baixo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
-msgid "Block Allocation Table checksum failed"
-msgstr "Falha no teste de Mesa de Alocação de Blocos"
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Bateria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/Core/HW/GCMemcard.cpp:147
+msgid "Block Allocation Table checksum failed"
+msgstr "A Verificação da Tabela de Alocação de Blocos Falhou"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Blocos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul Direito"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
-msgid "Bottom"
-msgstr "Embaixo"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr "Tela Cheia Sem Bordas"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
+msgid "Bottom"
+msgstr "Rodapé"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controles Acoplados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Branch: %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Quebrado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Procurar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
-msgstr "Procurar por um diretório para adicionar"
+msgstr "Procurar por um diretório pra adicionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
-msgstr "Procurar por um diretório de ISO..."
+msgstr "Procurar por um diretório de ISOs..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
-msgstr "Procurar por um diretório de output"
+msgstr "Procurar por um diretório de saída"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Botões"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr "Ignorar XFB"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
-"Pula a limpeza do cache de dados da instrução DCBZ. Normalmente, deixe esta "
+"Pula a limpeza do cache de dados da instração DCBZ. Geralmente deixe esta "
 "opção desativada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "Analógico C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "Analógico-C"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr "Registrador CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
-msgstr "Motor de Emulação do CPU"
+msgstr "Engine do Emulador da CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cache das Listas de Display"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "Opções de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Calcula a iluminação dos gráficos 3D por-pixel ao invés de por vetor.\n"
-"Diminui um pouco a velocidade de emulação (dependendo da sua GPU).\n"
-"Isso é geralmente uma melhoria segura, mas pode causar problemas às vezes.\n"
+"Cria um cache com as texturas personalizadas ao iniciar a emulação.\n"
+"Utiliza grandes quantidades de memória RAM mas evita possíveis engasgos "
+"durante a execução dos jogos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desligada."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Calcula a iluminação dos objetos 3D pixel a pixel ao invés de vértice a "
+"vértice, suavizando a aparência de polígonos iluminados e tornando "
+"triângulos individuais menos perceptíveis.\n"
+"Em casos raros pode causar quedas de performance ou problemas gráficos.\n"
+"\n"
+"Na dúvida, mantenha essa opção desligada."
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Não foi possível encontrar o WiiMote pela conexão %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+"Não foi possível encontrar o Wiimote pelo identificador de conexão %02x"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "Não é possível ler do DVD_Plugin - DVD-Interface: Erro Fatal"
+msgstr "Não consegue ler do DVD_Plugin - DVD-Interface: Erro Fatal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Não é possível abrir %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Não é possível usar aquele arquivo como um Memory Card.\n"
-"%s\n"
-"não é um arquivo de Memory Card válido"
+"Não é possível usar este arquivo como Memory Card.\n"
+"%s não é um arquivo de Memory Card de GameCube válido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Não é possível usar aquele arquivo como um Memory Card.\n"
-"Você está tentando usar o mesmo arquivo nos dois slots?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalão"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centralizar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Mudar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "Trocar &Disco"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Mudar &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
-msgstr "Mudar o Disco"
+msgstr "Mudar Disco"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Mudar Jogo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr "Trocar o disco para %s"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
-"Mudar a linguagem da interface de usuário.\n"
-"Requer reinício."
+"Muda o idioma da interface de usuário.\n"
+"Requer reiniciar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Muda o sinal para o parâmetro do zFar (após a correção)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr "Alterar essa opção enquanto o emulador está rodando não terá efeito. "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Muda o sinal para o parâmetro do zNear (após a correção)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
-msgstr "Códigos de Cheat"
+msgstr "Códigos de Trapaça"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "Gerenciador de Cheats"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
-msgstr "Busca de Cheats"
+msgstr "Busca de Trapaças"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Gerenciador de Cheat"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
-msgstr "Checar Integridade da Partição"
+msgstr "Verificar a Integridade da Partição"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Verificar atualizações:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
-msgstr "Checando Integridade..."
+msgstr "Verificando a integridade..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
-msgstr "Escolher um diretório raiz de DVD:"
+msgstr "Escolha um diretório raiz de DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
-msgstr "Escolha um diretório raíz para o NAND:"
+msgstr "Escolha um diretório raiz de NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
-msgstr "Escolher uma ISO padrão:"
+msgstr "Escolha uma ISO padrão:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
-msgstr "Escolher um diretório para adicionar"
+msgstr "Escolha um diretório pra adicionar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
-msgstr "Escolher um arquivo para abrir"
+msgstr "Escolha um arquivo pra abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
-msgstr "Escolher um cartão de memória:"
+msgstr "Escolha um memory card:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
-"Escolher um arquivo para ser usado como apploader: (aplicável somente para "
-"discos construídos de diretórios)"
+"Escolha um arquivo pra usar como apploader: (se aplica só pra discos "
+"construídos dos diretórios)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
-msgstr "Escolha a pasta para extrair"
+msgstr "Escolha a pasta pra qual extrair"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Analógico Circular"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clássico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Limpar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
-"O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. "
-"Você deve parar o jogo manualmente."
+"O Cliente desconectou enquanto o jogo está rodando!! O NetPlay foi "
+"desativado. Você deve parar o jogo manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Fechar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Informação do Código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
-msgstr "Comandos"
+msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Comentário"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Comentário:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr "Compilado em: %s @ %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
-msgstr "Comprimir ISOs selecionadas..."
+msgstr "Comprimir as ISOs selecionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Comprimindo ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr "Calcular"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr "Calculando checksum MD5"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Configurar Controle"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Configurar Controles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
-msgstr "Confirmar sobrescrição de arquivo"
+msgstr "Confirmar a Sobrescrição do Arquivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Confirmar ao Parar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
-msgstr "Conectar Balance Board"
+msgstr "Conectar o Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Conectar Teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Conectar Wiimotes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "Conectado"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Console"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
-msgstr "Scanning Contínuo"
+msgstr "Escaneamento Contínuo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Controle"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "Configurações de controles"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Controles"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+"Controla a distância do plano de convergência. É a distância a partir de "
+"onde os objetos virtuais vão aparecer na frente da tela.\n"
+"Um valor mais alto cria um efeito fora da tela mais forte enquanto um valor "
+"mais baixo é mais confortável."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+"Controla a distância de separação entre as câmeras virtuais.\n"
+"Um valor mais alto cria uma sensação de profundidade mais forte enquanto um "
+"valor mais baixo é mais confortável."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr "Convergência Mínima:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr "Convergência:"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
-msgstr "Converter para GCI"
+msgstr "Converter pra GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "Copiar"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
-msgstr "Falha na Cópia"
+msgstr "Falhou em copiar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
-msgstr "Copiar para Cartão de Memória %c"
+msgstr "Copiar pro Memory Card %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
-msgstr "Núcleo"
+msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Não pôde criar %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
-msgstr "Não foi possível inicializar o Backend 5s. %s"
+msgstr "Não pôde inicializar o backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma "
-"cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem "
-"ser lidos pela maioria dos leitores de DVD dos PCs."
+"Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é disco "
+"de backup do GC/Wii. Note que os discos originais de GameCube e Wii não "
+"podem ser lidos pelos leitores de DVD dos PCs."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
-msgstr "Não foi possível reconhecer o arquivo ISO %s"
+msgstr "Não conseguiu reconhecer o arquivo ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Não foi possível salvar %s"
+msgid "Could not save %s."
+msgstr "Não foi possível salvar %s."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1344,283 +1467,293 @@ msgid ""
 "If so, then you may need to re-specify your memory card location in the "
 "options."
 msgstr ""
-"Não foi possível gravar no arquivo de Memory Card %s.\n"
+"Não pôde gravar no arquivo de memory card %s.\n"
 "\n"
-"Você está executando o Dolphin em um CD/DVD, ou o arquivo está protegido de "
-"gravação?\n"
+"Você está executando o Dolphin em um CD/DVD ou talvez o arquivo do save está "
+"protegido contra gravação?\n"
 "\n"
-"Você recebeu esta mensagem após mudar o diretório do emulador?\n"
-"Se sim, então você precisa especificar a localização do Memory Card na "
+"Você está recebendo esta mensagem após mudar o diretório do emulador?\n"
+"Se sim, então você pode precisar re-especificar o local do memory card nas "
 "opções."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
-msgid "Couldn't find open command for extension 'ini'!"
-msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!"
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr "Não foi possível criar o cliente"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr "Não foi possível criar o peer."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
+msgid "Couldn't find open command for extension 'ini'!"
+msgstr "Não pôde achar o comando de abertura pra extensão 'ini'!"
+
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
-"Não foi possível iniciar o Núcleo (core). \n"
-"Cheque suas configurações"
+"Não pôde inicializar o core.\n"
+"Verifique suas configurações."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr "Não foi possível procurar o servidor central %s"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Contagem:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "Contagem: %lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "País:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Criar Código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Criar nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Criador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Crítico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Cortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Corta a imagem de 4:3 para 5:4 ou de 16:9 para 16:10.\n"
+"Corta a imagem de 4:3 pra 5:4 ou de 16:9 pra 16:10.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
-msgstr "Diretória atual foi alterado de %s para %s conforme wxFileSelector!"
+msgstr "O diretório atual mudou de %s pra %s após o wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Hack de Projeção Customizado"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr "Personalizado"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Configurações de Hack de Projeção Customizado"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tcheco"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
-msgstr "Direcional Digital"
+msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
-msgstr "Motor de Emulação do DSP"
+msgstr "Engine do Emulador do DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "Emulação HLE do DSP (rápido)"
+msgstr "Emulação HLE do DSP (rápida)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpretador LLE do DSP (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "Recompilador LLE do DSP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Configurações de Áudio"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE em um Thread Separado"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "Raiz do DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Tapete de Dança"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
-msgstr "Tamanho de Arquivo"
+msgstr "Tamanho dos Dados"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Data:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Arquivos Datel Maxdrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Zona Morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr "Apenas Depuração"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
-msgstr "Descomprimir ISOs selecionados..."
+msgstr "Descomprimir as ISOs selecionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Descomprimindo ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-msgid "Decrease Frame limit"
-msgstr "Diminuir limite de Quadros"
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr "Diminuir Convergência"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr "Diminuir Profundidade"
+
+#: Source/Core/Core/HotkeyManager.cpp:49
+msgid "Decrease Frame limit"
+msgstr "Diminuir o Limite dos Frames"
+
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "Diminuir IR"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Padrão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
-msgstr "ISO Padrão:"
+msgstr "ISO padrão:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
-msgstr "Fonte Padrão"
+msgstr "Fonte padrão"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
-msgstr "Excluir"
+msgstr "Apagar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
-msgstr "Excluir Save"
+msgstr "Apagar Save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Apagar o arquivo existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr "Porcentagem de Profundidade:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr "Profundidade:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Descrição"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "Descrição:"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
-msgstr ""
-"Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de "
-"saída. Segurando."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
+msgstr "Dual core determinístico:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
-msgstr "Configurações de Dispositivo"
+msgstr "Configurações do Dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "Dispositivo não encontrado"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Discar"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr "Escurece a tela após 5 minutos de inatividade."
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr "Direto"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr "Conexão Direta"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
-"A checagem de diretório falhou\n"
-" e a checagem de Backup de Diretório falhou"
+"A verificação do diretório falhou\n"
+"e a verificação do backup do diretório falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Desativar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "Desativar Bounding Box"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
-msgstr "Desabilitar Destination Alpha"
+msgstr "Desativar o Destino Alfa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
-msgstr "Desativar Neblina"
+msgstr "Desativar Névoa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1628,296 +1761,245 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Desativa a emulação do XFB.\n"
-"Aumenta bastante a performance mas pode causar problemas em vários jogos que "
-"precisam dela (especialmente aplicativos indie/homebrew).\n"
+"Desativa qualquer emulação do XFB.\n"
+"Acelera muito a emulação mas causa problemas gráficos pesados em muitos "
+"jogos que precisam dela (especialmente aplicativos homebrew).\n"
 "\n"
-"Se estiver em dúvida, deixe isto ativado."
+"Se não tiver certeza, deixe isto selecionado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Desativa a emulação de cópias do EFB.\n"
-"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de "
-"textura, portanto apesar de esta opção aumentar bastante a velocidade, ela "
-"quase sempre causa problemas.\n"
+"Desativa a emulação de bounding boxes.\n"
+"Pode melhorar bastante a performance da GPU, mas causa problemas em alguns "
+"jogos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção ativada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Desabilita a emulação de um recurso de hardware chamado Destination Alpha, "
-"que é usado em muitos jogos para criar vários efeitos gráficos.\n"
+"Desativa a emulação de uma função de hardware chamada destination alpha, "
+"usada em muitos jogos para vários efeitos gráficos.\n"
+"Essa opção não causa nenhum impacto no D3D e no OpenGL para desktop, mas no "
+"OpenGL ES esse efeito é renderizado em dois passos, o que causa um impacto "
+"de performance menor porém perceptível.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
-msgstr "Erro na leitura do Disco"
+msgstr "Erro de Leitura do Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr "Desconectado do servidor traversal"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
-msgstr "Display"
+msgstr "Exibição"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Mostra os Inputs lidos pelo Emulador.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Mostra notificações na janela de emulação.\n"
+"Essas mensagens incluem escritas no Memory Card, informações do backend de "
+"vídeo e da CPU, e limpeza do cache JIT, entre outras."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Você quer parar a emulação atual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decodificador Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revisão: %s\n"
-"Compilado: %s @ %s\n"
-"\n"
-"Dolphin é um emulador de Gamecube/Wii, que foi\n"
-"escrito originalmente por F|RES e ector.\n"
-"Hoje o Dolphin é um projeto de código aberto com \n"
-"muitos contribuidores, muitos para listar.\n"
-"Se tiver algum interesse, visite a página do projeto em\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Agradecimentos especiais à Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 e Hotquik por fazer a\n"
-"engenharia reversa e pelos docs/demos.\n"
-"\n"
-"Somos muito gratos à Gilles Mouchard cujo \n"
-"Microlib PPC emulator ajudou nosso projeto.\n"
-"\n"
-"Agradecemos à Frank Wille pelo PowerPC disassembler,\n"
-"que modificamos para incluir as especificações Gekko.\n"
-"\n"
-"Agradecemos à hcs/destop por seu GC ADPCM decoder.\n"
-"\n"
-"Não possuímos nenhum tipo de ligação com a Nintendo.\n"
-"Gamecube e Wii são produtos da Nintendo.\n"
-"Este emulador é apenas para fins educacionais\n"
-"e não deve ser usado para rodar jogos que você\n"
-"não possui legalmente."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
-msgstr "Configurações %s Gráficas do Dolphin"
+msgstr "Configurações Gráficas do %s no Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "&Web Site do Dolphin"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Configuração do Dolphin"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
-msgid "Dolphin Emulated Wiimote Configuration"
-msgstr "Configuração de Wiimote Emulado do Dolphin"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
+msgid "Dolphin Emulated Wiimote Configuration"
+msgstr "Configuração do Wiimote Emulado do Dolphin"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Configuração do GCPad do Dolphin"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Filmes TAS do Dolphin (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Configuração de Wiimote Dolphin"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin no &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin não pôde encontrar ISOs de GC/Wii. Clique duas vezes aqui para "
-"procurar por arquivos..."
+"Dolphin não encontrou nenhuma ISO de GameCube/Wii ou WADs. Clique duas vezes "
+"aqui para procurar por arquivos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin atualmente está configurado para esconder todos os jogos. Duplo-"
-"clique aqui para mostrar todos os jogos..."
+"Dolphin está configurado atualmente para ocultar todos os jogos. Clique duas "
+"vezes aqui para mostrar todos os jogos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr "Versão do Dolphin muito antiga para o servidor traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
-msgstr "O Dolphin não conseguiu completar a ação requisitada."
+msgstr "O Dolphin foi incapaz de completar a ação requisitada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Duplica a taxa de emulação da GPU. Pode acelerar alguns jogos (ON = Rápido, "
-"OFF = Compatível)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
-msgstr "Para Baixo"
+msgstr "Pra Baixo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
-msgstr "Download de Códigos (Banco de Dados WiiRD)"
+msgstr "Baixar Códigos (Banco de Dados WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
-msgstr "Códigos %lu baixados. (Adicionados %lu)"
+msgstr "Baixados %lu códigos. (adicionados %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr "Extensão dos Objetos Desenhados"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr "Driver Não Detectado"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Bateria"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
-msgstr "Dummy"
+msgstr "Imitação"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
-msgstr "Extrair Áudio"
+msgstr "Dumpar Áudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
-msgstr "Extrair Código EFB"
+msgstr "Dumpar o Alvo EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
-msgstr "Extrair Quadros"
+msgstr "Dumpar Frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr "Extrair Objetos"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr "Extrair Estágios TEV"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr "Extrair Fetches de Textura"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
-msgstr "Extrair Texturas"
+msgstr "Dumpar Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/"
-"Frames/\n"
+"Extrair as texturas decodificadas do jogo na pasta User/Dump/Textures/"
+"<game_id>/.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Extrair texturas do jogo para Usuário/Despejo/Texturas/<id do jogo>/\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
+"Extrai o conteúdo das cópias EFB na pasta User/Dump/Textures/.\n"
 "\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Transfere o conteúdo das cópias do EFB para User/Dump/Textures/\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Holandês"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
-msgstr "&Sair"
+msgstr "S&air"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "Cópias de EFB"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1925,61 +2007,45 @@ msgid ""
 "reboot is probably required at this point to get Windows to see the new "
 "driver."
 msgstr ""
-"ERRO: Essa versão do Dolphin precisa de um driver TAP-Win32 no mínimo com a "
-"versão %d.%d -- Se você mudou a versão do Dolphin recentemente, reiniciar o "
-"PC é provavelmente necessário no momento para que o Windows veja o novo "
-"driver."
+"ERRO: Esta versão do Dolphin requer um driver TAP-Win32 que seja pelo menos "
+"da versão %d.%d -- Se você recentemente atualizou sua distribuição do "
+"Dolphin, um reiniciar é provavelmente requerido neste ponto pra fazer o "
+"Windows ver o novo driver."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
-msgstr "Atualizações prévias de Memória"
+msgstr "Atualizações Prévias de Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Editar"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
-msgstr "Editar Código ActionReplay"
+msgstr "Editar Código do Action Replay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Editar Configuração"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Editar substituições locais"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Editar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Editar perspectiva atual"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efeito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Frame Buffer Embutido"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr "Frame Buffer Embutido (EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
-msgstr "Este Thread de Emulação já está rodando"
+msgstr "Thread de Emulação já em execução"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1987,13 +2053,13 @@ msgid ""
 "\n"
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
-"Emula os XFBs com precisão.\n"
-"Diminui muito a performance e impossibilita a renderização em resoluções "
-"altas mas é necessário para emular corretamente um certo número de jogos.\n"
+"Emula os XFBs precisamente.\n"
+"A emulação fica muito lenta e proíbe a renderização de alta resolução mas é "
+"necessário pra emular um número de jogos apropriadamente.\n"
 "\n"
-"Se estiver em dúvida, selecione Virtual."
+"Se não tiver certeza, selecione a emulação virtual do XFB ao invés disto."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -2003,1369 +2069,1420 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 "Emula os XFBs usando objetos de textura da GPU.\n"
-"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que "
-"o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em "
-"especial aplicativos homebrew/amadores).\n"
+"Conserta muitos jogos os quais não funcionam sem a emulação do XFB enquanto "
+"não sendo mais lenta do que a emulação verdadeira do XFB. Contudo, ele ainda "
+"pode falhar pra muitos outros jogos (especialmente aplicativos homebrew).\n"
 "\n"
-"Se estiver em dúvida, deixe isto ativado."
+"Se não tiver certeza, deixe isto selecionado."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
-msgstr "Emular Wiimote"
+msgstr "Wiimote Emulado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
-msgstr "Estado de Emulação"
+msgstr "Estado da Emulação:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Ativar"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D "
-"Vision se isto for suportado pela sua GPU.\n"
-"Pode causar problemas.\n"
-"Pecisa estar em Tela Cheia para funcionar.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
-msgstr "Ativar Registro AR"
+msgstr "Ativar Registro do AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Ativar Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr "Ativar Sobreposição do Clock da CPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Ativar Cálculo de Caixas Limitadoras"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Ativar Cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
-msgstr "Ativar Cheats"
+msgstr "Ativar Trapaças"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
-msgstr "Ativar Modo de Dois Núcleos"
+msgstr "Ativar Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
-msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)"
+msgstr "Ativar Dual Core (aumento na velocidade)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "Ativar FPRF"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
-msgstr "Ativar Idle Skipping"
+msgstr "Ativar Pulo Inativo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
-msgstr "Ativar Idle Skipping (Aumento na velocidade)"
+msgstr "Ativar Pulo Inativo (aumento na velocidade)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Ativar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
-msgstr "Ativar Varredura Progressiva"
+msgstr "Ativar Scan Progressivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
-msgstr "Ativar Salva-Tela"
+msgstr "Ativar Proteção de Tela"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
-msgstr "Ativar Dados do Auto-falante"
+msgstr "Ativar Dados do Auto-Falante"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Ativar WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Ativar Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Ativar Filtro Anisotrópico.\n"
-"Melhora a qualidade visual das texturas quando são vistas de ângulos "
+"Ativa a filtragem anisotrópica.\n"
+"Melhora a qualidade visual das texturas que estão em ângulos de visualização "
 "oblíquos.\n"
-"Pode causar problemas em um número pequeno de jogos. \n"
+"Pode causar problemas em um pequeno número de jogos.\n"
+"No Direct3D, selecionando qualquer valor acima de 1x também terá o mesmo "
+"efeito de ativar a opção \"Forçar Filtragem de Textura\".\n"
 "\n"
-"Se estiver em dúvida, selecione 1x."
+"Na dúvida, mantenha essa opção em 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, "
-"OFF = Compativel)"
+"Ativa acesso rápido ao disco. Pode causar travamentos e outros problemas em "
+"alguns jogos (Ativado = Rápido, Desativado = Compatível)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
-msgstr "Ativar Paginas"
+msgstr "Ativar páginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ative isto se você quiser usar toda a tela para a renderização.\n"
-"Se isto estiver desativado, uma janela será criada para a renderização.\n"
+"Ative isto se você quer que a tela inteira seja usada pra renderização.\n"
+"Se isto está desativado, uma janela de renderização será criada ao invés "
+"disto.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Tive esta opção se você quiser usar a janela principal do Dolphin para "
-"mostrar o jogo em vez de uma janela separada para a renderização.\n"
+"Ative isto se você quer usar a janela principal do Dolphin pra renderização "
+"ao invés de uma janela separada.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight "
-"Princess. Disative para QUALQUER UM outro jogo."
+"Ativa a emulação do Dolby Pro Logic II usando surround 5.1. Não disponível "
+"no OS X."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Ativa Hack de Projeção Personalizado"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Não disponível "
-"no OSX."
+"Ativa a emulação do Dolby Pro Logic II usando surround 5.1. Disponível "
+"apenas nos backends OpenAL ou Pulse."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível "
-"apenas no backend OpenAL."
+"Ativa o cálculo da Flag de Resultado com Ponto Flutuante, necessária em "
+"alguns jogos. (Ligado = Compatível, Desligado = Rápido)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Enables progressive scan if supported by the emulated software.\n"
-"Most games don't care about this.\n"
+"Ativa o scan progressivo se suportado pelo software emulado.\n"
+"A maioria dos jogos não se importa com isto.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado"
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
-"Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. "
-"(ON = Compativel, OFF = Rapido)"
+"Ativa a Unidade de Gerenciamento de Memória, necessária pra alguns jogos. "
+"(ON = Compatível, OFF = Rápida)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr "Ativa o uso de cheats Action Replay e Gecko."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Codifica as gravações de quadros usando o codec FFV1. \n"
+"Codifica os dumps dos frames usando o codec FFV1. \n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Fim"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr "Enet Não Inicializou"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Inglês"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
-msgstr "Improvisos"
+msgstr "Melhorias"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Insira um nome para a nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
-msgstr "Entry %d/%d"
+msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
-msgstr "Entry 1/%d"
+msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Erro"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr "Erro ao salvar o arquivo."
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
-"Erro: Depois de \"%s\", foi encontrado %d (0x%X) ao invés do marcador de "
-"save %d (0x%X). Abortando carregamento de instante salvo..."
+"Erro: Após \"%s\", foi achado %d (0x%X) ao invés do marcador de save %d (0x"
+"%X). Abortando o carregamento do save state..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 "Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos "
-"podem não mostrar as fontes corretamente, ou travar."
+"podem não mostrar as fontes corretamente, ou ter um crash."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
-msgstr "Sair"
+msgstr "Fuga"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
-msgstr "Euphoria"
+msgstr "Euforia"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "Europa"
+
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
 #, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr ""
-"Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx"
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr "Gerenciador de exceções - acesso abaixo do espaço de memória. 0x%08x"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Sair"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
-msgstr "Exportar todos os saves do Wii"
+msgstr "Exportar Todos os Saves do Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Falha na Exportação"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportar Arquivo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportar Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportar Gravação..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportar Save"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar save do Wii (Experimental)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportar todos os saves"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr "Falha na exportação"
+msgstr "Falhou em exportar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
-msgstr "Exportar Salvar como..."
+msgstr "Exportar o save como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Extensão"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Frame Buffer Externo"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr "Frame Buffer Externo (XFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Parâmetro Extra"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parâmetro Extra útil apenas em \"Metroid Other M\""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
-msgstr "Extrair Todos os arquivos..."
+msgstr "Extrair Todos os Arquivos..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extrair Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extrair DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
-msgstr "Extrair diretorio..."
+msgstr "Extrair Diretório..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extrair Arquivo..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extrair Partição..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraindo %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
-msgstr "Extraindo todos os arquivos"
+msgstr "Extraindo Todos os Arquivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
-msgstr "Extraindo diretorio"
+msgstr "Extraindo Diretório"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extraindo..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Byte do FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANÇA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
-msgstr "Tamanho FST:"
+msgstr "Tamanho do FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "Falha ao se conectar!"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
-msgstr "Falha ao Conectar\""
+msgstr "Falhou em Conectar!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
-msgstr "Falha ao dazer o download de códigos."
+msgstr "Falhou em baixar os códigos."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
-msgstr "Falha ao extrair %s!"
+msgstr "Falhou em extrair para %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Falha ao carregar a ROM do DSP:\t%s\n"
-"\n"
-"Este arquivo é necessário para usar o modo LLE do DSP.\n"
-"Ele não stá incluso no Dolphin por conter dados com direitos autorais.\n"
-"Use o DSPSpy para fazer o dump do arquivo do seu console.\n"
-"\n"
-"Você pode usar o motor HLE do DSP que não precisa do dump da ROM.\n"
-"(Escolha-o na aba \"Áudio\" da Janela de Configuração.)"
+"Falha ao procurar novo nome de arquivo\n"
+"%s\n"
+"será substituído"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr "Falha no listen. Há outra instância do servidor NetPlay executando?"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr "Falha ao abrir o arquivo de entrada \"%s\"."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Falha ao carregar bthprops.cpl! Conectar Wiimotes reais não irá funcionar e "
-"o Dolphin pode fechar inesperadamente!"
+"Falha ao abrir o arquivo de saída \"%s\".\n"
+"Certifique-se de que você tem permissões para escrever na pasta de destino e "
+"de que a mídia não é somente leitura. "
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Falha ao carregar hid.dll! Conectar Wiimotes reais não irá funcionar e o "
-"Dolphin pode fechar inesperadamente!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
-msgstr "Falha ao ler %s"
+msgstr "Falhou em ler %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Falha ao ler banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Falha ao ler o bk header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Falha ao ler o bloco %d do salva\n"
+"Falhou em ler o bloco %d dos dados salvos\n"
 "O Memory Card pode estar truncado\n"
-"Posição no Arquivo:%llx"
+"Posição do Arquivo: %<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
-"Falha ao ler mesa de alocação de blocos corretamente\n"
+"Falhou em ler a tabela de alocação dos blocos corretamente\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
-"Falha ao ler mesa de alocação de blocos corretamente\n"
+"Falhou em ler a tabela de alocação dos blocos corretamente\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Falha ao ler dados do arquivo %d"
+msgid "Failed to read data from gci file %s"
+msgstr "Falha ao ler dados do arquivo GCI %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Falha ao ler dados do arquivo: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
-"Não foii possível ler o Backup do diretório corretamente\n"
+"Falhou em ler o backup do diretório corretamente\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
-"Não foi possível ler o diretório corretamente\n"
+"Falhou em ler o diretório corretamente\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Falha ao ler o header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
-"Não foi possível ler o header corretamente\n"
+"Falhou em ler o cabeçalho corretamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Falha ao ler o header para o arquivo %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
-msgstr "Não foi possível ler ID exclusivo da imagem do disco"
+msgstr "Falhou em ler a ID única da imagem do disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr "Falha ao atualizar o código do país no SYSCONF"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
-msgstr "Falha ao escrever BT.DINF no SYSCONF"
+msgstr "Falhou ao gravar o BT.DINF no SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Falha ao escrever bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Falha ao escrever dados no arquivo: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
+"Falha ao escrever no arquivo de saída \"%s\".\n"
+"Certifique-se de que há espaço livre suficiente na mídia de destino."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Falha ao escrever o header para %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Persa"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Cálculo Rápido de Profundidade"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Rápida versão do MMU. Não funciona para todos os jogos."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
-"Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, "
+"Desincronização fatal. Abortando o playback. (Erro no PlayWiimote: %u != %u, "
 "byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Informações do Arquivo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr "Tamanho"
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
-msgstr "O arquivo não contém códigos."
+msgstr "O arquivo não continha códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
-msgstr "Arquivo convertido para .gci"
+msgstr "Arquivo convertido pra .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
-"O arquivo não pode ser aberto\n"
+"O arquivo não pôde ser aberto\n"
 "ou não tem uma extensão válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 "O arquivo tem a extensão \"%s\"\n"
-"extensões válidas são (.raw/.gcp)"
+"as extensões válidas são (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
-msgstr "Arquivo não reconhecido como Memory Card"
+msgstr "O arquivo não é reconhecido como um memory card"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Arquivo não comprimido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Modo de abertura desconhecido : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr "Falha ao escrever o arquivo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
-msgstr "Arquivo de sistema"
+msgstr "Sistema de Arquivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
-msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!"
+msgstr "O tipo de arquivo 'ini' é desconhecido! Ele não abrirá!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Filtra todas as texturas, incluíndo qualquer textura que o jogo definiu "
+"explicitamente como não filtrada.\n"
+"Pode melhorar a qualidade de algumas texturas em alguns jogos mas causará "
+"problemas em outros.\n"
+"No Direct3D, definir a Filtragem Anisotrópica acima de 1x também resultará "
+"no mesmo efeito de ativar essa opção.\n"
+"\n"
+"Na dúvida, mantenha essa opção desativada."
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
-msgstr "Achar Próximo"
+msgstr "Achar o próximo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
-msgstr "Achar Anterior"
+msgstr "Achar o anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Primeiro Bloco"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
-msgstr "Corrigir Checksums"
+msgstr "Consertar as Verificações"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
-msgstr "Forçar Console para NTSC-J"
+msgstr "Forçar o Console pra NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
-msgstr "Forçar Filtro de Texturas"
+msgstr "Forçar a Filtragem das Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força filtro de texturas mesmo que o jogo tenha desativado-o "
-"explicitamente.\n"
-"Melhora um pouco a qualidade das texturas mas causa erros em certos jogos.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Força o jogo a gerar gráficos para resoluções widescreen.\n"
-"Causa erros na imagem em alguns jogos.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Força o modo NTSC-J para usar a fonte da ROM Japonesa.\n"
-"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção "
-"automaticamente quando você jogar jogos japoneses."
+"Força o modo NTSC-J para usar a ROM de fonte Japonesa.\n"
+"Quando essa opção está desligada o Dolphin usa o modo NTSC-U por padrão e "
+"ativa o modo NTSC-J automaticamente ao iniciar jogos Japoneses."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Força o jogo a exibir gráficos em qualquer proporção de tela.\n"
+"Use essa opção com a \"Proporção de Tela\" definida em \"Forçar 16:9\" para "
+"rodar jogos que suportam apenas a proporção 4:3 em 16:9.\n"
+"Não costuma produzir bons resultados pois causa problemas com a UI e outros "
+"pequenos defeitos gráficos em alguns jogos.\n"
+"Desnecessário (e prejudicial) se estiver utilizando qualquer patch "
+"widescreen baseado em códigos AR/Gecko.\n"
+"\n"
+"Na dúvida, mantenha essa opção desativada."
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 "Formatar como ascii (NTSC\\PAL)?\n"
-"Escolha não para sjis (NTSC-J)"
+"Escolha não pra sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
-msgstr "Para frente"
+msgstr "Pra frente"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
-msgstr "Porta adiante (UPnP)"
+msgstr "Abrir porta (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "%d resultados encontrados para '"
+msgid "Found %u results for '"
+msgstr "%u resultados encontrados para '"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "%x arquivos salvos encontrados"
+msgid "Found %u save files"
+msgstr "%u arquivos de save encontrados"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
-msgstr "Quadro"
+msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
-msgstr "Quadro"
+msgstr "Frame "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
-msgstr "Avançar Quadro"
+msgstr "Avanço dos Frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
-msgstr "Extração de Quadros usando FFV1"
+msgstr "Os Dumpos dos Frames usam FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Informação do Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
-msgstr "Alcanço do Quadro"
+msgstr "Alcance do Frame"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
-msgstr "Frame S&kipping"
+msgstr "Pulo dos F&rames"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
-msgstr "Limitador de FPS:"
+msgstr "Limite dos Frames:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
-msgstr "QUadros para Capturar"
+msgstr "Frames Pra Gravar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "França"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Olhar Livre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr "Diminuir Velocidade Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr "Aumentar Velocidade Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr "Mover para Baixo Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr "Mover para Esquerda Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr "Mover para Direita Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr "Mover para Cima Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr "Resetar Câmera Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr "Resetar Velocidade Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr "Zoom In Freelook"
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr "Zoom Out Freelook"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Francês"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
-msgstr "Notas"
+msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Resolução da Tela Cheia:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr "Resolução de Tela Cheia:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
-msgstr "Arquivo GCI(*.gci)"
+msgstr "Arquivo GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "Pasta GCI"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
+"Arquivo GCI não foi carregado porque é de uma região diferente do Memory "
+"Card atual:\n"
+"%s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+"GCMemcardDirectory: ClearBlock foi chamado com um endereço de bloco inválido"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr "Cartuchos de Game Boy Advance (*.gba)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "ID do Jogo"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
-msgstr "ID do jogo:"
+msgstr "ID do Jogo:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "O jogo já está rodando!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "O jogo não está rodando!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
-msgstr "Jogo não encontrado!"
+msgstr "O jogo não foi achado!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
-msgid "Game-Specific Settings"
-msgstr "Opções especificas do jogo"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
-msgid "GameConfig"
-msgstr "Opçõesdojogo"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
-msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
-msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Configurações de &Controle de Gamecube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Configurações do controle de Gamecube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
-msgid "Gecko Codes"
-msgstr "Códigos Gecko"
-
-#: Source/Core/Core/Src/GeckoCode.cpp:246
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
 #, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
 msgstr ""
-"Falha ao rodar o GeckoCode (CT%i CST%i) (%s)\n"
-"(É um código ruim ou um tipo de código não suportado. Tente usar o "
-"processador de código nativo colocando o arquivo codehandler.bin no "
-"diretório Sys e reiniciando o Dolphin.)"
+"O jogo gravou dados sobre o save de outro jogo, corrupção de dados à frente "
+"%x, %x"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
+msgid "Game-Specific Settings"
+msgstr "Configurações Específicas-do-Jogo"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
+msgid "GameConfig"
+msgstr "Configurações do Jogo"
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr "Adaptador de GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr "Memory Cards do GameCube (*.raw,*.gcp)"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
+msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
+msgstr "Arquivos dos Saves do GameCube (*.gci;*.gcs;*.sav)"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
+msgid "Gecko Codes"
+msgstr "Códigos do Gecko"
+
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Geral"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Alemão"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Alemanha"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
-msgstr "GetARCode: O índice é maior que a lista de códigos AR de tamanho %lu"
+msgstr ""
+"GetARCode: O índice é maior do que o tamanho da lista de códigos AR %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
-msgstr "Configurações Gráficas"
+msgstr "Configurações dos gráficos"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Maior do que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Aumenta muito a qualidade das texturas geradas usando efeitos de "
-"renderização para textura.\n"
-"Aumentar a Resolução Interna vai melhorar o efeito desta opção.\n"
-"Diminui um pouco a performance e pode causar problemas (embora seja "
-"improvável).\n"
+"Aumenta drasticamente a qualidade das texturas geradas através de efeitos "
+"render-to-texture.\n"
+"Aumentar a resolução interna vai melhorar o efeito dessa opção.\n"
+"Aumenta levemente o trabalho da GPU e causa um número muito pequeno de "
+"defeitos gráficos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto ativado."
+"Na dúvida, mantenha essa opção ativada."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grego"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr "Rasterização por hardware"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
-msgstr "A checagem do header falhou"
+msgstr "A verificação do cabeçalho falhou"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Olá,\n"
-"\n"
-"Dolphin requer Mac OS X 10.7 ou superior para funcionar.\n"
-"Infelizmente você está executando uma versão antiga do OS X.\n"
-"A última versão do Dolphin que suporta OS X 10.6 é o Dolphin 3.5\n"
-"Atualize para 10.7 ou superior para usar as novas versões do Dolphin.\n"
-"\n"
-"Até mais!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Olá\n"
-"\n"
-"O Dolphin precisa que a sua CPU tenha suporte a extensões SSE2. \n"
-"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não "
-"funcionará.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Ocultar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
-msgstr "Esconder Cursor Do Mouse"
+msgstr "Esconder o Cursor Do Mouse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 "Oculta o cursor do mouse quando ele está em cima da janela de emulação.\n"
 "\n"
-"Se estiver em dúvida, deixe isto ativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+"Valores altos permitem que jogos com taxas de FPS variáveis rodem a uma taxa "
+"de quadros maior, exigindo mais poder de processamento da CPU. Valores "
+"baixos permitem que jogos com taxas de FPS variáveis rodem a uma taxa de "
+"quadros menor, exigindo menos poder de processamento da CPU.\n"
+"\n"
+"ATENÇÃO: Mudar essa opção para valores diferentes do padrão (100%) pode e "
+"provavelmente irá causar problemas e falhas na maior parte dos jogos. Use "
+"por sua conta e risco. Por favor, não reporte bugs que ocorrem ao utilizar "
+"clocks diferentes do valor padrão."
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Configuração de Teclas de Atalho"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr "Código do Host:"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+"O código do host é muito grande.\n"
+"Por favor verifique novamente se o seu código está correto"
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
-msgstr "Teclas de Atalho"
+msgstr "Hotkeys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
-msgstr "Wiimote Hibrido"
+msgstr "Wiimote Híbrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
-"IOCTL_ES_GETVIEWS:Tentou adiquirir dados de um ticket desconhecido: %08x/%08x"
+"IOCTL_ES_GETVIEWS: Tentou obter os dados de um ticket desconhecido: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: O jogo tentou recarregar um IOS ou um título não disponível "
-"no dump do seu NAND\n"
-"TitleID %016llx.\n"
-"Dolphin provavelmente vai travar agora."
+"IOCTL_ES_LAUNCH: O jogo tentou recarregar um título que não está disponível "
+"no seu dump do NAND\n"
+"TitleID %016<PRIx64>.\n"
+"O Dolphin provavelmente travará agora."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - Destino ruim"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr "IOCTL_ES_LAUNCH: Arquivo DOL inválido!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
-msgstr "Definições de IPL"
+msgstr "Configurações do IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr "IPL com hash desconhecida %x"
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Ponteiro IR"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
-msgstr "Sensibilidade IR:"
+msgstr "Sensibilidade do IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Detalhes da ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
-msgstr "Diretórios de ISO"
+msgstr "Diretórios das ISOs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITÁLIA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
-msgstr "Icone"
+msgstr "Ícone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Se isto for ativado, os registradores das caixas de limite serão "
-"atualizados. Usado pelos jogos do Paper Mario."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorar Mudanças de Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Ignora qualquer mudança no formato do EFB.\n"
-"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa "
-"defeitos gráficos em um pequeno número de jogos, no entanto.\n"
+"Ignora quaisquer mudanças no formato do EFB.\n"
+"Melhora a performance em muitos jogos sem qualquer efeito negativo. No "
+"entanto pode causar defeitos gráficos em um pequeno número de jogos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto ativado."
+"Na dúvida, mantenha essa opção ativada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignora quaisquer pedidos da CPU de ler ou escrever no EFB.\n"
-"Melhora a performance em alguns jogos, mas pode desativar algumas funções "
-"dos jogos ou efeitos gráficos.\n"
+"Ignora quaisquer pedidos da CPU para ler ou escrever no EFB.\n"
+"Melhora a performance em alguns jogos, mas pode desabilitar alguns efeitos "
+"gráficos ou algumas funções relacionadas à jogabilidade.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Implementa o modo tela cheia através de uma janela sem bordas que se estende "
+"por toda a tela ao invés de utilizar o modo exclusivo.\n"
+"Permite transições rápidas entre o modo tela cheia e janela mas aumenta "
+"levemente a latência, torna o movimento menos suave e diminuí levemente a "
+"performance.\n"
+"O modo exclusivo é necessário para que o NVIDIA 3D Vision funcione no "
+"backend Direct3D.\n"
+"\n"
+"Na dúvida, mantenha essa opção desativada."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importar Save"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr "Importar jogo salvo do Wii"
+msgstr "Importar Save do Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr "Falha na importação"
+msgstr "Falhou em importar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"O arquivo importado tem a extensão gsc\n"
-"mas não tem um header correto"
+"O arquivo importado tem a extensão GSC\n"
+"mas não tem um cabeçalho correto."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "O arquivo importado tem comprimento inválido"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr "O arquivo importado tem comprimento inválido."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"O arquivo importado tem a extensão sav\n"
-"mas não tem um header correto"
+"O arquivo importado tem a extensão SAV\n"
+"mas não tem um cabeçalho correto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
-msgstr "Funciona"
+msgstr "Dentro do Jogo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr "Aumentar Convergência"
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr "Aumentar Profundidade"
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
-msgstr "Aumentar limite de Quadros"
+msgstr "Aumentar o Limite dos Frames"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "Aumentar IR"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
-msgstr "Info"
+msgstr "Informação"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informação"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
-msgstr "Entrada"
+msgstr "Entrada dos Dados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Inserir"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
-msgstr "Inserir Código Encryptado ou Decriptado aqui..."
+msgstr "Inserir código Encriptado ou Desencriptado aqui..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
-msgstr "Insira cartão SD"
+msgstr "Inserir Cartão SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Insira nome aqui.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr "Insira o nome aqui..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
-msgstr "Instalar para o menu do WII"
+msgstr "Instalar no Menu do Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
-"suporte a ele."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Instalando WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
-msgstr "Erro na Checagem de Integridade"
+msgstr "Erro na Verificação de Integridade"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
-msgstr "Checagem de Integridade completa"
+msgstr "Verificação de integridade completada"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
-msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado."
+msgstr "Verificação de integridade completada. Nenhum erro foi achado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Checagem de Integridade para a partição %d falhou. Sua cópia deve estar "
-"corrompida ou foi incorretamente corrigido (patch)."
+"O teste de integridade para %s falhou. A imagem do disco provavelmente está "
+"corrompida ou um patch foi aplicado de maneira incorreta."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Interface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
-msgstr "Opções de interface"
+msgstr "Configurações da Interface"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
-msgstr "Erro Interno do LZO - A compressão falhou"
+msgstr "Erro Interno do LZO - a compressão falhou"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 "Erro Interno do LZO - a descompressão falhou (%d) (%li, %li) \n"
-"Tente recarregar o Estado Salvo"
+"Tente carregar o state de novo"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erro Interno do LZO - lzo_init() falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr "Nome Interno:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Resolução Interna:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpretador (MUITO lento)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Tamanho Inválido(%x) ou palavra Mágica(%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr "Entrada de diretório ou bat.map inválido."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Valor Inválido!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Bat.map ou entrada de Diretório inválidas"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo de evento %i inválido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Arquivo inválido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
-msgstr ""
-"Arquivo opening.bnr inválido encontrado no gcm:\n"
-"%s\n"
-"Você pode precisar extraí-lo novamente do jogo."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
+msgstr "Host inválido"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr "Índice inválido"
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Arquivo de gravação inválido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Parâmetros de busca inválidos (nenhum objeto selecionado)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
-msgstr "String de busca inválida (não foi possível converter para número)"
+msgstr "String de busca inválida (não pôde converter pro número)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
-"String de busca inválida (apenas comprimentos correspondentes de string são "
-"suportados)"
+"String de busca inválida (só comprimentos par das strings são suportados)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Estado Salvo Inválido"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr "Valor inválido."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPÃO"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "Itália"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr "Input Interativo"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
-msgstr "Recompilador JIT (Recomendado)"
+msgstr "Recompilador JIT (recomendado)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Recompilador experimental JITIL"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "Recompilador JITIL (lento, experimental)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "Japão"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonês"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "CORÉIA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "Manter Janela no Topo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3373,280 +3490,309 @@ msgid ""
 msgstr ""
 "Mantém a janela do jogo na frente de todas as outras janelas.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Manter Janela no Topo"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "Teclado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Tecla"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr "Teclas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr "Remover Jogador"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "Coréia"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Botão L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
-msgstr "Linguagem:"
+msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Último %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latência:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Analógico Esquerdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"Clique com o botão esquerdo para detectar teclas de atalho.\n"
-"Pressione Enter para deixar vazio."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Eixo esquerdo"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
-"Clique com o esquerdo para detectar entrada.\n"
-"Clique do meio para limpar.\n"
-"Clique direito para mais opções."
+"Clique com o botão esquerdo pra detectar entrada de dados.\n"
+"Clique com o botão do meio pra limpar.\n"
+"Clique com o botão direito pra mais opções."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
-"Clique da Esquerda/Direita para mais opções.\n"
-"Clique do meio para limpar."
+"Clique com os botões Esquerdo/Direito pra mais opções.\n"
+"Clique com o botão do meio pra limpar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
-msgstr "Menor que"
+msgstr "Menor Do Que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Limitar por FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "Licença"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+"Limita a velocidade máxima do jogo para a quantidade especificada de quadros "
+"por segundo (a velocidade real é 60 para NTSC e 50 para PAL)."
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Carregar Texturas Personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
-msgstr "Carregar Instante Salvo"
+msgstr "Carregar State"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
-msgstr "Carregar Último Instante Salvo 1"
+msgstr "Carregar o Último State 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
-msgstr "Carregar Último Instante Salvo 2"
+msgstr "Carregar o Último State 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
-msgstr "Carregar Último Instante Salvo 3"
+msgstr "Carregar o Último State 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
-msgstr "Carregar Último Instante Salvo 4"
+msgstr "Carregar o Último State 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
-msgstr "Carregar Último Instante Salvo 5"
+msgstr "Carregar o Último State 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
-msgstr "Carregar Último Instante Salvo 6"
+msgstr "Carregar o Último State 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
-msgstr "Carregar Último Instante Salvo 7"
+msgstr "Carregar o Último State 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
-msgstr "Carregar Último Instante Salvo 8"
+msgstr "Carregar o Último State 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
-msgstr "Carregar Instante Salvo do Slot 1"
+msgstr "Carregar o Slot do State 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr "Carregar Instante Salvo do Slot 10"
+msgstr "Carregar o Slot do State 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
-msgstr "Carregar Instante Salvo do Slot 2"
+msgstr "Carregar o Slot do State 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
-msgstr "Carregar Instante Salvo do Slot 3"
+msgstr "Carregar o Slot do State 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
-msgstr "Carregar Instante Salvo do Slot 4"
+msgstr "Carregar o Slot do State 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
-msgstr "Carregar Instante Salvo do Slot 5"
+msgstr "Carregar o Slot do State 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
-msgstr "Carregar Instante Salvo do Slot 6"
+msgstr "Carregar o Slot do State 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
-msgstr "Carregar Instante Salvo do Slot 7"
+msgstr "Carregar o Slot do State 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
-msgstr "Carregar Instante Salvo do Slot 8"
+msgstr "Carregar o Slot do State 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr "Carregar Instante Salvo do Slot 9"
+msgstr "Carregar o Slot do State 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
-msgstr "Carregar Instante Salvo..."
+msgstr "Carregar o State..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
-msgstr "Carregar Menu de Sistema do Wii"
+msgstr "Carregar o Menu de Sistema do Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
-msgstr "Carregar Menu de Sistema do Wii %d %c"
+msgstr "Carregar o Menu de Sistema do Wii %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Carrega texturas de alta definição do diretório User/Load/Textures/<id do "
-"jogo>/\n"
+"Carrega texturas personalizadas da pasta User/Load/Textures/<game_id>/.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr "Carregar do slot selecionado"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr "Carregar state do slot selecionado"
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr "%d funções boas carregadas, %d funções ruins ignoradas."
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr "LocalHost"
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Configuração do Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Registrar FPS em arquivo"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr "Salvar Tempo de Renderização"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
-msgstr "Tipo de Log"
+msgstr "Tipos de Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Registra o número de quadros renderizados por segundo em User/Logs/fps.txt. "
-"Use este recurso para medir a performance do Dolphin.\n"
+"Registra o tempo de renderização de cada frame no arquivo User/Logs/"
+"render_time.txt. Use essa função quando quiser medir a performance do "
+"Dolphin.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
-msgstr "Resposta do Logger"
+msgstr "Saída de Dados do Logger"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
-msgstr "Logando"
+msgstr "Registrando"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
-msgstr "A conexão com o servidor foi perdida!"
+msgstr "Perdeu a conexão com o servidor!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
-msgstr "Butão M"
+msgstr "Botão M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
-msgstr ""
-"Incompatibilidade do MD5\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
+msgstr "Checksum MD5:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Hack de velocidade MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
-msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
+msgstr "Arquivos de Gameshark do MadCatz (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Analógico Principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
-msgid "Maker ID:"
-msgstr "ID da fabricante:"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "Fabricante"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
+msgid "Maker ID:"
+msgstr "ID do Fabricante:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Fabricante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3654,44 +3800,48 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Faz os objetos distantes ficarem mais visíveis por remover a névoa, "
-"aumentando assim os detalhes gerais.\n"
-"Desativar a névoa pode atrapalhar a emulação de jogos que dependem de névoa "
-"adequada.\n"
+"Torna os objetos distantes mais visíveis removendo a névoa, aumentando assim "
+"os detalhes gerais.\n"
+"Desativar a névoa quebrará alguns jogos os quais dependem da emulação de "
+"névoa apropriada.\n"
 "\n"
-"Se estiver em dúvida, deixe essa opção desligada."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Máximo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "O Memory Card já tem um arquivo de salva deste título"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr "Pode causar lentidão no Menu do Wii e em alguns jogos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr "O Memory Card já possuí um save para esse jogo."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
-msgstr "O Memory Card já está aberto"
+msgstr "O memory card já está aberto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Byte de Memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
-msgstr "Cartão de memoria"
+msgstr "Memory Card"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
-"AVISO - Faça backups antes de usar, deve estar funcionando mas pode "
-"corromper coisas!"
+"AVISO do Gerenciador de Memory Cards - Faça backups antes de usar, deve "
+"estar consertado mas pode corromper coisas!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3701,70 +3851,89 @@ msgid ""
 "%s\n"
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
-"O nome do arquivo de Memory Card no Slot %c está incorreto\n"
+"O nome do arquivo do memory card no Slot %c está incorreto\n"
 "Região não especificada\n"
 "\n"
-"O diretório do Slot %c foi mudado para\n"
+"O caminho do Slot %c foi mudado para\n"
 "%s\n"
-"Você gostaria de copiar o arquivo antigo para o novo local?\n"
+"Você gostaria de copiar o arquivo antigo pra este novo local?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr "MemoryCard: ClearBlock chamado no endereço inválido %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr "MemoryCard: Read chamado com endereço de origem inválido, %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr "MemoryCard: Write chamado com endereço de destino inválido, %x"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
-msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header"
+msgstr ""
+"O tamanho do arquivo do memory card não combina com o tamanho do cabeçalho"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Microfone"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Mínimo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
-msgstr "Diversas"
+msgstr "Miscelâneas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
-msgstr "Opções diversas"
+msgstr "Configurações Mistas"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Modifica as texturas para que elas mostrem o formato em que elas estão "
-"codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das "
-"vezes.\n"
+"Modifica as texturas pra mostrar o formato no qual elas estão codificadas. "
+"Precisa resetar a emulação na maioria dos casos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr "Sombras Monoscópicas"
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Fonte Monospaced"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3774,7 +3943,8 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
-"Mova o Mouse sobre uma opção para ver uma descrição detalhada sobre ela.\n"
+"Mova o ponteiro do mouse sobre uma opção pra exibir uma descrição "
+"detalhada.\n"
 "\n"
 "\n"
 "\n"
@@ -3782,931 +3952,972 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
-msgstr "NOTA: O tamanho do stream não corresponde ao comprimento dos dados\n"
+msgstr ""
+"NOTA: O tamanho do stream não combina com o comprimento real dos dados\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
-msgstr "NP Adicionar"
+msgstr "Adicionar NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
-msgstr "NP Começar"
+msgstr "Começar NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
-msgstr "NP Decimal"
+msgstr "Decimal NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
-msgstr "NP Deletar"
+msgstr "Apagar NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
-msgstr "NP Dividir"
+msgstr "Dividir NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
-msgstr "NP Baixar"
+msgstr "Pra Baixo NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
-msgstr "NP Fim"
+msgstr "Fim NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
-msgstr "NP Enter"
+msgstr "Enter NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
-msgstr "NP Igual"
+msgstr "Igual NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
-msgstr "NP Home"
+msgstr "Home NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
-msgstr "NP Inserir"
+msgstr "Inserir NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
-msgstr "NP Esquerda"
+msgstr "Esquerda NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
-msgstr "NP Multiplicar"
+msgstr "Multiplicar NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
-msgstr "NP Descer Página"
+msgstr "Page Down NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
-msgstr "NP Subir Página"
+msgstr "Page Up NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
-msgstr "NP Direita"
+msgstr "Direita NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
-msgstr "NP Separador"
+msgstr "Separador NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
-msgstr "NP Espaço"
+msgstr "Espaço NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
-msgstr "NP Subtrair"
+msgstr "Subtrair NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
-msgstr "NP Tab"
+msgstr "Aba NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
-msgstr "NP Cima"
+msgstr "Pra Cima NP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
-msgstr "Arquivos GCI nativos(*.gci)"
+msgstr "Arquivos GCI nativos (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "Holanda"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr "O Netplay perdeu a sincronia. Não é possível se recuperar desse erro."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
-msgstr "Nova Busca"
+msgstr "Novo Scan"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
-msgstr "Próxima Página"
+msgstr "Página Seguinte"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
-msgstr "Próxima Busca"
+msgstr "Próximo Scan"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
-msgstr "Nick:"
+msgstr "Apelido:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Sem região (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Sem ISOs ou WADs achados"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
-msgstr "Nenhuma saída de áudio"
+msgstr "Nenhuma saída de dados do áudio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Nenhum arquivo de banner encontrado para o título  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
-msgstr "Descrição indisponível"
+msgstr "Nenhuma descrição disponível"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Sem colocação"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Nenhum arquivo carregado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Não há entradas de índice de diretório livres"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr "Não há entradas livres no índice de diretórios."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Nenhum arquivo gravado"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Nenhuma pasta de salva encontrada para o título %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
+"Arquivo undo.dtm não encontrado, cancelando reversão do carregamento de "
+"state para evitar perda de sincronia com o filme"
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Nenhum"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norueguês Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
-msgstr "Não igual"
+msgstr "Não é Igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
-msgstr "Indefinido"
+msgstr "Não Definido"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-"Nenhum arquivo salvo do Wii save ou falha ao ler o header de tamanho %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notas"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
-msgstr "Noticía"
+msgstr "Nota"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
-msgstr "Números dos códigos:"
+msgstr "Números Dos Códigos:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Aceleração do Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr "Orientação do Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr "Eixo do nunchuk"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objeto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Alcance do Objeto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Desligado"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
-msgstr "Mostrar Mensagens na Tela"
+msgstr "Mensagens de Exibição Na Tela"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr "&Documentação Online"
+msgstr "Documentação &Online"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
-msgstr "Apenas %d blocos disponíveis"
+msgstr "Só %d blocos disponíveis"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
-msgstr "Abrir &conteúdo da pasta"
+msgstr "Abrir a &pasta de contenção"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
-msgstr "Abrir pasta do &save do WII"
+msgstr "Abrir a pasta &dos saves do Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
-msgstr "Abrir Arquivo..."
+msgstr "Abrir arquivo..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
-msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s"
+msgstr "OpenAL: não pôde criar o contexto pro dispositivo %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
-msgstr "OpenAL: Não foi possível encontrar dispositivos de som"
+msgstr "OpenAL: não pôde achar os dispositivos de som"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
-msgstr "OpenAL: não foi possível abrir o dispositivo %s"
+msgstr "OpenAL: não pôde abrir o dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Decodificador de Texturas OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Decodificador de Texturas OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
-"Abre a configuração padrão (somente leitura) para este jogo em um editor de "
+"Abre a configuração padrão (somente-leitura) pra este jogo num editor de "
 "texto externo."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-"Abre as substituições especificadas pelo usuário em um editor de texto "
-"externo."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opções"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Laranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
-"A ordem dos arquivos no Diretório de Arquivos não bate \n"
-"Clique com o botão direito e exporte todos os jogos salvos, \n"
-"e importe-os para um novo Memory Card\n"
+"A ordem dos arquivos no Diretório de Arquivos não combina com a ordem dos "
+"blocos\n"
+"Clique com o botão direito e exporte todos os saves, \n"
+"e importe os saves pra um novo memory card\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr "Orientação"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Outros"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Outro Client desconectou enquanto o jogo rodava!! O Netplay foi "
-"desabilitado. Você deve parar o jogo manualmente."
+"Outro cliente se desconectou enquanto o jogo está rodando!! O Netplay foi "
+"desativado. Você deve parar o jogo manualmente."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
-msgstr "Saída"
+msgstr "Saída de Dados"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "R&eproduzir gravação..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr "Sobrepor Informações"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr "E&xecutar Gravação de Entrada..."
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
-msgstr "Controle"
+msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
-msgstr "Controle"
+msgstr "Pad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
-msgstr "Controles"
+msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Parágrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parâmetros"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partição %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Partição não existe: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
-msgstr "Diretórios"
+msgstr "Caminhos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pausar no fim do vídeo"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr "Pausar no Fim do Filme"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr "Pausar ao Perder Foco"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr "Pausa o emulador quando o foco é retirado da janela de emulação."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
-msgstr "Iluminação Por Pixels"
+msgstr "Iluminação Por-Pixels"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfeito"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
-msgid "Play"
-msgstr "Executar"
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "Plataforma"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
+msgid "Play"
+msgstr "Reproduzir"
+
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Reproduzir Gravação"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Executar/Pausar"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Jogável"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
-msgstr "Opções de Reprodução"
+msgstr "Opções do Playback"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Jogadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
-msgstr "Favor confirmar..."
+msgstr "Por favor confirmar..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
-msgstr "Favor criar uma perspectiva antes de salvar"
+msgstr "Por favor criar uma perspectiva antes de salvar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
-msgstr "Positivo-Negativo"
+msgstr "Mais-Menos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polonês"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr "Porta %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Porta 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Porta 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Porta 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Porta 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Porta:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Português"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasil)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
-msgstr "Efeito Pós-Processamento"
+msgstr "Efeito de Pós-Processamento:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr "Pré-carregar Texturas Personalizadas"
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u"
+msgstr "Fim prematuro do filme no PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u"
+msgstr "Fim prematuro do filme no PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u"
+msgstr "Fim prematuro do filme no PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Predefinidos:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
-msgstr "Pág. Anterior"
+msgstr "Página Anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
-msgstr "Valor anterior"
+msgstr "Valor Anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
-msgstr "Limpar o Cache"
+msgstr "Limpar Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr "Coloque as ROMs do IPL em User/GC/{região}."
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Questão"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Sair"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Botão R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RÚSSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
-msgstr "Alcance"
+msgstr "Área"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Alcance"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
-msgstr "Modo Somente Leitura"
+msgstr "Modo Somente-Leitura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
-msgstr "Real"
+msgstr "Verdadeiro"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
-msgstr "Balance Board Real"
+msgstr "Balance Board Verdadeiro"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
-msgstr "Wiimote Real"
+msgstr "Wiimote Verdadeiro"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
-msgstr "Wiimotes Reais"
+msgstr "Wiimotes Verdadeiros"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Gravar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
-msgstr "Gravar entrada"
+msgstr "Gravar a entrada de dados"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
-msgstr "Informações de Gravação"
+msgstr "Informações da Gravação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
-msgstr "Opções de Gravação"
+msgstr "Opções da Gravação"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermelho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermelho Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermelho Direito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Reduz a quantidade de serrilhados causado pela rasterização de gráficos 3D.\n"
-"Isso faz com que a imagem renderizada fique menos quadriculada.\n"
-"Diminui de forma severa a velocidade da emulação e pode causar problemas.\n"
+"Reduz a quantidade de aliasing causada ao rasterizar gráficos 3D.\n"
+"Isso suaviza bordas serrilhadas nos objetos.\n"
+"Aumenta drasticamente o trabalho da GPU e em alguns casos causa problemas "
+"gráficos.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção em \"Nenhum\"."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Atualizar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Atualizar a lista de jogos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "Região"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Remover"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Renderiza o jogo usando apenas linhas.\n"
+"Renderiza a cena como um wireframe.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Renderizar na Janela Principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
-msgid "Reset"
-msgstr "Reiniciar"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr "Renderização"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr "Relato: GCIFolder está gravando em bloco não alocado %x"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
+msgid "Reset"
+msgstr "Resetar"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr "Redefinir Configurações Traversal"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr "Repetir"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Retornar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revisão:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "Revisão: %s"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Analógico Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Eixo direito"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibração"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"Executar DSP LLE em um thread dedicado (não recomendado: pode causar "
-"congelamentos)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "Rússia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russo"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
-msgstr "Sal&var Instante Atual"
+msgstr "Sa&lvar State"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Salvar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
-msgstr "Salvar GCI como..."
+msgstr "Salvar o GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
-msgstr "Salvar Instante Antigo"
+msgstr "Salvar o State Mais Antigo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
-msgstr "Salvar Instante Atual"
+msgstr "Save State"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
-msgstr "Salvar Instante Atual no Slot 1"
+msgstr "Slot do Save State 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
-msgstr "Salvar Instante Atual no Slot 10"
+msgstr "Slot do Save State 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
-msgstr "Salvar Instante Atual no Slot 2"
+msgstr "Slot do Save State 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
-msgstr "Salvar Instante Atual no Slot 3"
+msgstr "Slot do Save State 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
-msgstr "Salvar Instante Atual no Slot 4"
+msgstr "Slot do Save State 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
-msgstr "Salvar Instante Atual no Slot 5"
+msgstr "Slot do Save State 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
-msgstr "Salvar Instante Atual no Slot 6"
+msgstr "Slot do Save State 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
-msgstr "Salvar Instante Atual no Slot 7"
+msgstr "Slot do Save State 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
-msgstr "Salvar Instante Atual no Slot 8"
+msgstr "Slot do Save State 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
-msgstr "Salvar Instante Atual no Slot 9"
+msgstr "Slot do Save State 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
-msgstr "Salvar Instante Atual..."
+msgstr "Salvar State..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
-msgstr "Salvar GCM/ISO comprimido"
+msgstr "Salvar o GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Salvar perspectiva atual"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
-msgstr "Salvar GCM/ISO descomprimido"
+msgstr "Salvar o GCM/ISO descomprimido"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr "Salvar state no slot selecionado"
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr "Salvar no slot selecionado"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr "Salvo em User/Wii/sd.raw (o tamanho padrão é 128MB)"
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
-msgstr "O Instante Salvo capturado %s está corrompido, parando captura..."
+msgstr ""
+"O filme do save state %s está corrompido, parando a gravação do filme..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
-msgstr "Cópia Escalada do EFB"
+msgstr "Cópia em Escala do EFB"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Escaneando %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
-msgstr "Procurando por ISOs"
+msgstr "Escaneando por ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Escaneando..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
-msgstr "ScrShot"
+msgstr "ScreenShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+"Falha ao tirar screenshot: Não foi possível abrir o arquivo \"%s\" (erro %d)"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Busca"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
-msgstr "Filtro de Busca"
+msgstr "Filtro da Busca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
-msgstr "Procurar em sub-pastas"
+msgstr "Procurar nas Sub-Pastas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
-msgstr "Pesquisar Objeto atual"
+msgstr "Procurar no objeto atual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
-msgstr "Buscar valor hexadecimal:"
+msgstr "Procurar por um valor hexadecimal:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
-msgstr "A seção %s não foi encontrada no SYSCONF"
+msgstr "A seção %s não foi achada no SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Selecionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "Selecionar Colunas"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr "Selecionar Slot %i"
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr "Selecionar Slot de State 1"
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr "Selecionar Slot de State 10"
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr "Selecionar Slot de State 2"
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr "Selecionar Slot de State 3"
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr "Selecionar Slot de State 4"
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr "Selecionar Slot de State 5"
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr "Selecionar Slot de State 6"
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr "Selecionar Slot de State 7"
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr "Selecionar Slot de State 8"
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr "Selecionar Slot de State 9"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr "Selecionar slot de State"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
-msgstr "Selecione o arquivo de Gravação"
+msgstr "Selecione o Arquivo da Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
-msgstr "Selecione um arquivo WAD de Wii para instalar"
+msgstr "Selecione um arquivo WAD do Wii pra instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Selecione um adaptador de hardware para ser usado.\n"
-"Se estiver em dúvida, use o primeiro."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
-msgstr "Selecione um arquivo de jogo salvo para importar"
+msgstr "Selecione um arquivo de save pra importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
-msgstr "Selecionar Janelas flutuantes"
+msgstr "Selecionar janelas flutuantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
-msgstr "Selecione um arquivo para carregar"
+msgstr "Selecione um arquivo pra carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
-msgstr "Selecione o arquivo de salva"
+msgstr "Selecione o arquivo do save"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
-msgstr "Selecione um instante para carregar"
+msgstr "Selecione um state pra carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
-msgstr "Selecione um instante para salvar"
+msgstr "Selecione um state pra salvar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4716,668 +4927,800 @@ msgid ""
 "\n"
 "If unsure, select Auto."
 msgstr ""
-"Selecione a proporção da tela para usar ao renderizar:\n"
-"Auto: Usa a proporção nativa\n"
-"Forçar 16:9: Redimensiona a imagem para a proporção 16:9\n"
-"Forçar 4:3: Redimensiona a imagem para a proporção 4:3\n"
-"Redimensionar para a Tela: Redimensiona a imagem para o tamanho da tela.\n"
+"Selecione qual proporção de aspecto usar quando renderizar:\n"
+"Auto: Usa a proporção de aspecto nativa\n"
+"Forçar 16:9: Estica a imagem pra uma proporção de aspecto de 16:9\n"
+"Forçar 4:3: Estica a imagem pra uma proporção de aspecto de 4:3\n"
+"Esticar até a Janela: Estica a imagem pro tamanho da janela.\n"
 "\n"
-"Se estiver em dúvida, selecione Automático."
+"Se não tiver certeza, selecione Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr "O perfil de controle especificado não existe"
+msgstr "O perfil do controle selecionado não existe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
-msgstr "Fonte Selecionada"
+msgstr "Fonte selecionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"Seleciona o adaptador de vídeo a ser utilizado.\n"
+"\n"
+"Na dúvida, escolha o primeiro da lista."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Seleciona que resolução será usada no modo Tela Cheia.\n"
-"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na "
-"performance é insignificante.\n"
+"Seleciona a resolução de tela a ser usada no modo tela cheia.\n"
+"A resolução deve ser sempre maior ou igual à resolução interna. O impacto na "
+"performance é desprezível.\n"
 "\n"
-"Se estiver em dúvida, use a resolução da sua Área de Trabalho.\n"
-"Se ainda estiver em dúvida, use a maior disponível.."
+"Na dúvida, escolha \"Automático\"."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+"Seleciona o modo de estereoscopia 3D. A estereoscopia permite uma sensação "
+"maior de profundidade se você possuír o hardware necessário.\n"
+"Lado a Lado e Sobreposto são modos utilizados pela maioria das TVs 3D.\n"
+"Anáglifo é usado com óculos 3D Vermelho-Ciano.\n"
+"Diminui drasticamente a velocidade de emulação e algumas vezes causa "
+"problemas.\n"
+"\n"
+"Na dúvida, escolha \"Desligado\"."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Selecione qual API gráfica será usada internamente.\n"
-"Direct3D 9 geralmente é a mais rápida. No entanto, a OpenGL é a mais "
-"precisa. Direct3D 11 fica entre as outras duas.\n"
-"Lembre-se que os Direct3D backends só estão disponíveis no Windows.\n"
+"Seleciona qual API gráfica deve ser utilizada internamente. O renderizador "
+"por software é extremamente lento, útil apenas para depuração, então a menos "
+"que você tenha motivos específicos para usá-lo, você deverá selecionar o "
+"OpenGL.\n"
 "\n"
-"Se estiver em dúvida, use Direct3D 11."
+"Na dúvida, escolha OpenGL."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Selecione qual API gráfica será usada internamente.\n"
-"Direct3D 9 geralmente é a mais rápida. No entanto, a OpenGL é a mais "
-"precisa. Direct3D 11 fica entre as outras duas.\n"
-"Lembre-se que os Direct3D backends só estão disponíveis no Windows.\n"
+"Seleciona qual API gráfica deve ser utilizada internamente. O renderizador "
+"por software é extremamente lento, útil apenas para depuração, então você "
+"deverá escolher entre o Direct3D ou o OpenGL. Jogos diferentes e GPUs "
+"funcionarão melhor ou pior em cada API, então para a melhor experiência "
+"recomendamos testar ambas e escolher aquela que for menos problemática.\n"
 "\n"
-"Se estiver em dúvida, use Direct3D 11."
+"Na dúvida, escolha OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Enviar"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
-msgstr "Posição da Sensor Bar:"
+msgstr "Posição da Barra do Sensor:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Sérvio"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Porta Serial 1 - Esta é a porta usada por dispositivos como o adaptador de "
-"rede"
+"Porta Serial 1 - Esta é a porta que dispositivos como o adaptador de rede "
+"usam."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr "O servidor rejeitou a tentativa traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
-msgstr "Definir como ISO &padrão"
+msgstr "Definir como a &ISO padrão"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
-msgstr "Definir como Memory Card padrão%c"
+msgstr "Definir como o memory card padrão %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
-"SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu"
+"SetARCode_IsActive: O índice é maior do que o tamanho da lista de códigos AR "
+"%lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr "Define o idioma do sistema do GameCube."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+"Define a saída de vídeo do Wii para 60Hz (480i) ao invés de 50Hz (576i) nos "
+"jogos PAL.\n"
+"Pode não funcionar com todos os jogos."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr "Define o idioma do sistema do Wii."
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Configura a latência (em ms). Valores mais altos podem reduzir problemas de "
-"corte no áudio. Disponível apenas no backend OpenAL."
+"Define a latência (em ms). Valores altos podem reduzir picotamentos no "
+"áudio. Apenas no backend OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Configurações..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr "SetupWiiMemory: Não foi possível criar o arquivo setting.txt"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Não foi possível criar o arquivo de configurações"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
-msgstr "Sacudir"
+msgstr "Balançar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Nome Curto:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Botões Superiores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Mostrar &Console"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
-msgstr "Mostrar Janela de &Log"
+msgstr "Mostrar &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
-msgstr "Mostrar barra de &Status"
+msgstr "Mostrar a &Barra de Status"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
-msgstr "Mostrar Barra de &Ferramentas"
+msgstr "Mostrar a &Barra de Ferramentas"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "Mostrar Austrália"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Mostrar Padrões"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Mostrar Drives"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
-msgstr "Mostrar Regiões de Cópia do EFB"
+msgstr "Mostrar as Regiões de Cópia do EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr "Mostrar Contador de Frames"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
-msgid "Show Input Display"
-msgstr "Mostrar"
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "Mostrar Alemanha"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:216
+msgid "Show Input Display"
+msgstr "Mostrar a Exibição da Entrada de Dados"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Mostrar Itália"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Mostrar JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Mostrar Coréia"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr "Mostrar Contador de Lag"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
-msgstr "Mostrar Idioma:"
+msgstr "Mostrar o Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
-msgstr "Mostrar &Configuração de Logs"
+msgstr "Mostrar a &Configuração dos Logs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "Mostrar Holanda"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Mostrar Plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Mostrar Regiões"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "Mostrar Rússia"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "Mostrar Espanha"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Mostrar Estatísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "Mostrar Desconhecido"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
-msgid "Show a confirmation box before stopping a game."
-msgstr "Mostrar uma janela de confirmação antes de parar um jogo."
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr "Mostrar Global"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
+msgid "Show a confirmation box before stopping a game."
+msgstr "Mostra uma caixa de confirmação antes de parar um jogo."
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Mostra uma mensagem quando erros potencialmente sérios ocorreram. \n"
-"Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também "
-"pode fazer com que o Dolphin trave sem nenhuma explicação."
+"Mostra popups quando erros sérios acontecem.\n"
+"Desativar essa opção evita mensagens de problemas recorrentes e erros não-"
+"fatais mas pode resultar em travamentos sem explicação quando um erro severo "
+"acontecer."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Mostrar o primeiro bloco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Mostar o contador de lag"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Mostra mensagens na área da tela de emulação.\n"
-"Essas mensagens incluem acesso ao Memory Card, informações sobre o backend "
-"de vídeo e a CPU, e limpeza do cache do JIT."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
-msgstr "Mostrar blocos de save"
+msgstr "Mostrar os blocos dos saves"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Mostar comentário do save"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
-msgstr "Mostrar ícone do salva"
+msgstr "Mostrar ícone do save"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
-msgstr "Mostrar título do salva"
+msgstr "Mostrar título do save"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Mostra o número de quadros renderizados por segundo como uma forma de medir "
-"a velocidade da emulação.\n"
+"Mostra o número de frames renderizados por segundo como uma medida da "
+"velocidade da emulação.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Mostra desconhecido"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Mostrar várias estatísticas.\n"
+"Mostra várias estatísticas de renderização.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Wiimote na Horizontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Tamanho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Pular a BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
-msgstr "Pular limpeza DCBZ"
+msgstr "Pular a limpeza do DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
-msgstr "Não permite o acesso da CPU ao EFB"
+msgstr "Pular o Acesso do EFB da CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Pula a sincronização com a GPU nas cópias EFB. Causa defeitos gráficos em um "
+"pequeno número de jogos.\n"
+"\n"
+"Na dúvida, mantenha essa opção ativada."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Aumenta a velocidade de cópias do EFB para a RAM sacrificando um pouco a "
+"Aumenta levemente a velocidade das cópias EFB para a RAM sacrificando a "
 "precisão da emulação.\n"
-"Às vezes também aumenta a qualidade visual.\n"
-"Se você está tendo problemas, tente aumentar a Precisão do Cache de Texturas "
-"ou desative esta opção.\n"
+"Se estiver tendo problemas, tente aumentar a precisão do cache de texturas "
+"ou desative essa opção.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
-msgstr "Captura de tela"
+msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Renderizador por Software"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr "Erro de socket ao enviar para o servidor traversal"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
 "It's only useful for debugging purposes.\n"
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
-"O Renderizador por Software é bem mais lento que os outros backends.\n"
-"É útil apenas para a depuração de problemas.\n"
-"Você realmente quer utilizar o Renderizador por Software? Se estiver em "
-"dúvida, pressione 'Não'."
+"A renderização do software é uma ordem de magnitude mais lenta do que usar "
+"os outros backends.\n"
+"Só é útil pra propósitos de debugging.\n"
+"Você realmente quer ativar a renderização do software? Se não tiver certeza, "
+"selecione 'Não'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+"Alguma coisa deu muito errado.\n"
+"Interrompendo a gravação de vídeo.\n"
+"Seu vídeo provavelmente estará corrompido."
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
-msgstr "Configurações de Som"
+msgstr "Configurações do Som"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
-msgstr "O Backend de Som %s não é válido."
+msgstr "O Backend do som %s não é válido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Falha na criação do buffer de som: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Barra de Espaço"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "Espanha"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr "Balanço do Speaker"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Volume do Auto-Falante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a "
-"qualidade visual mas é bastante pesada e pode causar problemas em alguns "
-"jogos.\n"
-"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa "
-"menos problemas. De forma geral, quanto menor for a resolução interna, maior "
-"será a performance.\n"
+"Especifica a resolução a ser usada na renderização. Uma resolução maior "
+"melhora drasticamente a qualidade visual, mas também aumenta drasticamente o "
+"trabalho da GPU e pode causar problemas em alguns jogos.\n"
+"\"Múltiplo de 640x528\" resulta em um tamanho um pouco maior que a janela "
+"mas causa menos problemas. Em outras palavras, resoluções internas menores "
+"resultam em melhor performance, mas reduzem a qualidade visual.\n"
 "\n"
-"Se estiver em dúvida, selecione 640x528."
+"Na dúvida, escolha 640x528. "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
-msgstr "Aumentar a velocidade de transferência do disco"
+msgstr "Acelera a Taxa de Transferência do Disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Analógico Quadrado"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
+"Divide as threads de CPU e GPU para que possam rodar em núcleos separados.\n"
+"Resulta em aumentos significativos de performance na maioria dos "
+"computadores modernos, mas podem causar travamentos e problemas em alguns "
+"casos."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Controle Padrão"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
-msgstr "Iniciar NetPlay"
+msgstr "Iniciar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Iniciar Ca&ptura"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr "Iniciar &Gravação de Entrada"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
-msgstr "Iniciar Captura"
+msgstr "Iniciar Gravação"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
-msgstr "Instante Atual"
+msgstr "State"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Instante Salvos"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr "Modo de Estereoscopia 3D:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr "Estereoscopia"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Analógico"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Parar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
-msgstr ""
-"Armazena as cópias do EFB em objetos de textura da GPU.\n"
-"Esta opção não é tão precisa, mas funciona bem para a maioria dos jogos e é "
-"bem mais rápido do que EFB para RAM.\n"
-"\n"
-"Se estiver em dúvida, deixe isto ativado."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
+msgstr "Armazenar Cópias EFB Somente na Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
-msgstr "Redimensionar para a Tela"
+msgstr "Esticar até a Janela"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Palheta"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Subtrair"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Arquivo exportado com sucesso para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
-msgstr "Arquivos de salva importados com sucesso"
+msgstr "Arquivos dos saves importados com sucesso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Sueco"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr "%u saves exportados com sucesso para %s"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr "Suporte"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr "Inverter Olhos"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Inverte o olho esquerdo e direito. Útil se quiser ver estereoscopia lado a "
+"lado com a técnica de olhos cruzados."
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Balançar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
-msgstr "Sincronizar thread da GPU"
+msgstr "Sincronizar o thread da GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
-"Sincroniza as threads da GPU e da CPU para ajudar a evitar travamentos "
-"aleatórios no modo Dual Core. (ATIVADO = Compatível, DESATIVADO = Rápido)"
+"Sincroniza os threads da GPU e da CPU pra ajudar a impedir congelamentos "
+"aleatórios no modo Dual Core. (ON = Compatível, OFF = Rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr "Erro de sintaxe"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Idioma do Sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
-msgstr "Input do TAS"
+msgstr "Entrada de Dados do TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr "TAS Input - Controle %d"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr "TAS Input - Wiimote %d"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
-msgstr "Tab"
+msgstr "Aba"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Divisão de aba"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
-msgstr "Esquerda da Mesa"
+msgstr "A Esquerda da Tabela"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
-msgstr "Direita da Mesa"
+msgstr "A Direita da Tabela"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
-msgstr "Capturar Tela"
+msgstr "Fazer uma Screenshot"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Testar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textura"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
-msgstr "Cache de Texturas"
+msgstr "Cache das Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
-msgstr "Sobreposição Formato das Texturas"
+msgstr "Sobreposição do Formato das Texturas"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+"A opção \"Seguro\" elimina as chances da GPU perder uma atualização das "
+"texturas da RAM.\n"
+"Uma precisão menor pode deixar o texto em alguns jogos ilegível.\n"
+"\n"
+"Na dúvia, use o valor mais próximo da direita."
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "O WAD foi instalado com sucesso"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "O endereço é inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "O Checksum foi corrigido com sucesso"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr "O checksum foi corrigido com sucesso."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "O diretório escolhido já está na lista"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr "A pasta escolhida já está na lista."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+"A imagem do disco \"%s\" está corrompida.\n"
+"O hash do bloco %<PRIu64> é %08x ao invés de %08x."
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 "O arquivo %s já existe.\n"
-"Deseja substituí-lo?"
+"Você deseja substituí-lo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
-"O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não "
-"está aberto em outro programa."
+"O arquivo %s não pôde ser aberto pra gravação. Por favor verifique se ele já "
+"foi aberto por outro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
-msgstr "O Arquivo %s já foi aberto, o header do arquivo não será escrito."
+msgstr "O Arquivo %s já foi aberto, o cabeçalho do arquivo não será gravado."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
-#, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "O arquivo que você especificou (%s) não existe"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
 msgstr "O nome não pode ficar vazio"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "O nome não pode conter o caracter ','"
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr "O nome não pode conter o caractere ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/Core/Movie.cpp:184
+#, c-format
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr "O jogo gravado (%s) é diferente do jogo selecionado (%s)"
+
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
-msgstr "O código AR resultante da derciptação não contém nenhuma linha."
+msgstr "O código AR desencriptado resultante não contém quaisquer linhas."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Quanto mais segura for a opção selecionada, menor será a probabilidade do "
-"emulador perder alguma atualização de textura da RAM.\n"
-"\n"
-"Se estiver em dúvida, use o o valor mais à direita."
+"O save que você está tentando copiar tem um tamanho de arquivo inválido."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-"O Salva que você está tentando copiar tem um tamanho de arquivo inválido"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5385,468 +5728,513 @@ msgstr ""
 "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do "
 "sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
-msgstr "As versões de NetPlay do Client e do Servidor são incompatíveis!"
+msgstr "As versões do NetPlay do cliente e do servidor são incompatíveis!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "O servidor está cheio!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "O servidor respondeu: O jogo está rodando no momento!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "O servidor enviou uma mensagem de erro desconhecida!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "O arquivo especificado \"%s\" não existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "O valor é inválido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+"Há muitos arquivos GCI na pasta %s\n"
+"Somente os primeiros 127 arquivos vão estar disponíveis"
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr "Nào há nada para desfazer!"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
-"É necessário um ticket para 00000001/00000002. O NAND que você extraiu "
-"provavelmente está incompleto."
+"Deve haver um ticket para 00000001/00000002. Seu dump do NAND está "
+"provavelmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
-"Estas configurações substituem as configurações do núcleo do Dolphin.\n"
+"Estas configurações sobrescrevem as configurações do núcleo do Dolphin.\n"
 "Indeterminado significa que o jogo usa as configurações do Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
-"Este simulador de Action Replay não suporta códigos que modifiquem o Action "
-"Replay em si."
+"Este simulador de Action Replay não suporta códigos que modifiquem o próprio "
+"Action Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"Isto pode causar diminuição da performance no Wii Menu e em alguns jogos."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Este recurso permite mover a câmera do jogo.\n"
-"Mova o mouse segurando o botão direito para alterar o ângulo em qualquer "
-"direção.\n"
+"Essa função permite movimentar a câmera do jogo.\n"
+"Mova o mouse enquanto segura o botão direito para ajustar o ângulo ou "
+"enquanto segura o botão do meio para mover a câmera.\n"
 "Segure SHIFT e pressione uma das teclas WASD para mover a câmera em uma "
-"certa distância (SHIFT+0 para mover mais rápido e SHIFT+9 para mover mais "
-"devagar). Pressione SHIFT+R para voltar a câmera para a posição padrão.\n"
+"certa distância (SHIFT+2 para mover mais rápido e SHIFT+1 para mover mais "
+"devagar). Pressione SHIFT+R para resetar a câmera e SHIFT+F para resetar a "
+"velocidade de movimento.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Na dúvida, mantenha essa opção desativada."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Isso limita a velocidade do jogo para o número especificado de quadros por "
-"segundo (60 para NTSC e 50 para PAL). Em alternativa, use o áudio para "
-"acelerar usando DSP  (deve consertar cortes no áudio mas pode causar ruído "
-"constante dependendo do jogo)."
+"Esse software pode ser incompatível com a emulação DSP HLE. Tente usar LLE "
+"se esse software é um homebrew.\n"
+"\n"
+"DSPHLE: ucode desconhecido (CRC = %08x) - forçando AX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Isto separa os segmentos de Áudio e Vídeo, para que eles possam ser rodados "
-"em núcleos diferentes.\n"
-"Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas "
-"também pode causar travamentos/erros ocasionais."
+"Esse software pode ser incompatível com a emulação DSP HLE. Tente usar LLE "
+"se esse software é um homebrew.\n"
+"\n"
+"DSPHLE: ucode desconhecido (CRC = %08x) - forçando AXWii."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
+"Esse valor é somado com o valor de convergência definido nas configurações "
+"gráficas."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+"Esse valor é multiplicado com a profundidade definida nas configurações "
+"gráficas."
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+"Essa versão do Dolphin foi baixada de um website que rouba dinheiro dos "
+"desenvolvedores do emulador. Por favor, baixe o Dolphin do site oficial:\n"
+"https://dolphin-emu.org/"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+"Isso permite que você edite o arquivo INI de configurações manualmente."
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Threshold"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Inclinar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr "Timeout ao conectar-se com o servidor traversal"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
-msgstr "Para"
+msgstr "Até"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
-msgstr "Ligar/Desligar Todos os Logs"
+msgstr "Ligar/Desligar Todos os Tipos de Logs"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
-msgstr "Ligar/Desligar Proporção"
+msgstr "Ligar/Desligar a Proporção do Aspecto"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
-msgstr "Ligar/Desligar Cópias de EFB"
+msgstr "Ligar/Desligar as Cópias do EFB"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
-msgstr "Ligar/Desligar Neblina"
+msgstr "Ligar/Desligar a Névoa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr "Ligar/Desligar Limitador de Frames"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
-msgstr "Ir para Tela Cheia"
+msgstr "Ligar/Desligar a Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
-msgstr "Ligar/Desligar IR"
+msgstr "Ligar/Desligar o IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr "Ligar/Desligar Pausa"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
-msgstr "Topo"
+msgstr "Frente"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
-msgid "Tried to load an unknown file type."
-msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido."
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr "Traversal"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr "Servidor traversal não respondeu enquanto conectava-se ao host."
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr "Traversal:"
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr "Tentou desencriptar dados de um volume não-Wii"
+
+#: Source/Core/Core/Boot/Boot.cpp:443
+msgid "Tried to load an unknown file type."
+msgstr "Tentou carregar um tipo de arquivo desconhecido."
+
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Gatilhos"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr "Tentando criar índice inválido no Memory Card."
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Tentando ler de um SYSCONF inválido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 "Tentando ler de um SYSCONF inválido\n"
-"Os Bt IDs do Wiimote não estão disponíveis"
+"As IDs do bt do Wiimote não estão disponíveis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turco"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
-msgstr "Turntable"
+msgstr "Plataforma Giratória"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tipo"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Porta UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "Wiimote UDP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "DESCONHECIDO"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONHECIDO_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
-"Impossível criar patch com os valores dados. \n"
-"Nada modificado."
+"Incapaz de criar patch com os valores dados.\n"
+"A entrada não foi modificada."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Não foi possível analisar a linha %lu do código AR digitado como código "
-"válido encriptado ou decriptad. Certifique-se de que você digitou "
+"Incapaz de analisar a linha %u do código AR inserido como um código "
+"encriptado ou desencriptado válido. Tenha certeza de que você o digitou "
 "corretamente.\n"
-"Você gostaria de ignorar esta linha e continuar a análise?"
+"Você gostaria de ignorar esta linha e continuar a analisar?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
-msgstr "%i indefinido"
+msgstr "%i Indefinido"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
-msgstr "Desfazer Instante Carregado"
+msgstr "Desfazer o Carregar State"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
-msgstr "Desfazer Instante Salvo"
+msgstr "Desfazer o Save State"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Chamada 0x80 inesperada? Abortando..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
-msgstr "Comando de DVD desconhecido %08x - Erro Fatal"
+msgstr "Comando de DVD desconhecido %08x - erro fatal"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Comando desconhecido 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipo de entrada desconhecido %i no SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr "Erro desconhecido %x"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr "Erro de Memory Card desconhecido"
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
-msgstr "Menssagem desconhecida recebida com identificação: %d"
+msgstr "Mensagem desconhecida recebida com a id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
-"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
+"Mensagem desconhecida com a id: %d recebida do jogador: %d Chutando o "
+"jogador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr "Versão não oficial detectada"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
-msgstr "Para cima"
+msgstr "Pra cima"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Atualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Wiimote na Vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Usar modo EuRGB60 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Usar Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
-msgstr "Usar Hex"
+msgstr "Usar Hexadecimal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "Usar Modo PAL60 (EuRGB60)"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
-msgstr "Usar Panic Handlers"
+msgstr "Usar Gerenciadores de Pânico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Usa um algoritmo de menor precisão para calcular os dados de profundidade.\n"
-"Causa problemas em alguns jogos, mas pode garantir um aumento considerável "
-"na velocidade.\n"
+"Usa um algoritmo menos preciso para calcular valores de profundidade.\n"
+"Causa problemas em alguns jogos, mas permite um aumento de performance "
+"considerável dependendo do jogo e/ou da sua GPU.\n"
 "\n"
-"Se estiver em dúvida, deixe desmarcado."
+"Na dúvida, mantenha essa opção ativada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Usa múltiplos segmentos para decodificar texturas.\n"
-"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de "
-"dois núcleos).\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Usar um único buffer de profundidade para os dois olhos. Necessário em "
+"alguns jogos."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Usa operações inseguras para acelerar o fluxo de vértice em OpenGL. Não há "
-"problemas conhecidos quanto ao suporte das GPUs, mas pode causar diversos "
-"problemas gráficos e de instabilidade.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desmarcado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é "
-"mostrada.\n"
-"No entanto, é possível impedir estas mensagens de interromperem o jogo "
-"ativando esta opção.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Utilitário"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hack de Velocidade VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "Várias Estatísticas"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Verbosidade"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hack de Fluxo de Vértice"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Vídeo"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr "Aumentar Volume"
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr "Ligar/Desligar Mudo"
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr "Diminuir Volume"
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
-msgstr "Falha na instalação da WAD: Erro na criação de %s"
+msgstr "A instalação do WAD falhou: erro ao criar %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
-msgstr "Falha na instalação da WAD: Erro na criação do ticket"
+msgstr "A instalação do WAD falhou: erro ao criar o ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Espera alinhamentos verticais para reduzir rasgos na imagem.\n"
-"Diminui a performance se a velocidade de emulação estiver abaixo de 100%.\n"
+"Espera por espaços verticais de modo a reduzir os rasgos.\n"
+"Diminui a performance se a velocidade da emulação está abaixo dos 100%.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Aviso"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
-msgstr "Aviso - Inicializando DOL no modo de console errado!"
+msgstr "Aviso - inicializando o DOL no modo de console errado!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Aviso - Inicializando ELF no modo de console errado!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
-msgstr "Aviso - Inicializando ISO no modo de console errado!"
+msgstr "Aviso - inicializando a ISO no modo de console errado!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+"Atenção número de blocos BAT %d não corresponde ao cabeçalho carregado %d"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
 "%s\n"
 "Do you wish to continue?"
 msgstr ""
-"Aviso! É recomendado que você tenha um backup de todos os arquivos na "
-"pasta:\n"
+"Aviso! É aconselhado fazer um backup de todos os arquivos na pasta:\n"
 "%s\n"
-"Deseja continuar?"
+"Você deseja continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5854,35 +6242,46 @@ msgid ""
 "and have the same name as a file on your memcard\n"
 "Continue?"
 msgstr ""
-"Aviso: Isso vai substituir quaisquer arquivos de save existentes na pasta :\n"
+"Aviso: Isto sobrescreverá quaisquer arquivos de save que estão na pasta:\n"
 "%s\n"
-"que tenham o mesmo nome de um arquivo do Memory Card\n"
+"e que tenham o mesmo nome de um arquivo no seu memory card\n"
 "Continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
 "%u > %u) (frame %u > %u). You should load another save before continuing, or "
 "load this state with read-only mode off."
 msgstr ""
-"Atenção: Você carregou um jogo salvo que está depois do fim do vídeo atual. "
-"(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, "
-"ou carregar este instante com o modo somente-leitura desligado."
+"Aviso: Você carregou um save que está após o fim do filme atual. (byte %u > "
+"%u) (frame %u > %u). Você deveria carregar outro save antes de continuar, ou "
+"carregar este state com o modo somente-leitura desligado."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+"Atenção: Você carregou um save onde o filme termina antes do frame atual no "
+"save (byte %u < %u) (frame %u < %u). Você deve carregar outro save antes de "
+"continuar."
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
 "should load another save before continuing, or load this state with read-"
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
-"Atenção: Você carregou um jogo salvo cuja cena não bate com a atual no byte "
-"%d (0x%X).Você deveria carregar outro save antes de continuar, ou carregar "
-"este instante com o modo somente-leitura desligado. Caso contrário você "
-"provavelmente terá uma desincronização."
+"Aviso: Você carregou um save cujo filme não combina com o byte %d (0x%X). "
+"Você deveria carregar outro save antes de continuar, ou carregar este state "
+"com o modo somente-leitura desligado. Caso contrário você provavelmente terá "
+"uma desincronização."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5900,241 +6299,232 @@ msgid ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
-"Atenção: Você carregou um jogo salvo cuja cena não bate com a atual no "
-"quadro %d.Você deveria carregar outro save antes de continuar, ou carregar "
-"este instante com o modo somente-leitura desligado. Caso contrário você "
-"provavelmente terá uma desincronização.\n"
+"Aviso: Você carregou um save cujo filme não combina com o frame %d. Você "
+"deveria carregar outro save antes de continuar, ou carregar este state com o "
+"modo somente-leitura desligado. Caso contrário você provavelmente terá uma "
+"desincronização.\n"
 "\n"
-"Mais informações: A cena atual tem %d quadros e a cena do instante carregado "
-"tem %d quadros.\n"
+"Mais informações: O filme atual tem %d frames de comprimento e o filme do "
+"save state tem %d frames de comprimento.\n"
 "\n"
-"No quadro %d, a cena atual pressiona:\n"
+"No frame %d, o filme atual pressiona:\n"
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
 "\n"
-"No quadro %d, a cena do instante carregado pressiona:\n"
+"No frame %d, o filme do save state pressiona:\n"
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
-msgstr "WaveFileWriter - Arquivo não aberto."
+msgstr "WaveFileWriter - arquivo não aberto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Distorção"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
-msgstr "Hack de Widescreen"
+msgstr "Hack do Widescreen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Largura"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Console do Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
-msgstr "Raiz do Wii NAND"
+msgstr "Raiz NAND do Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Arquivos de Save do Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
-msgstr "WiiWAD: Não foi possível ler o arquivo"
+msgstr "WiiWAD: Não pôde ler do arquivo"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wiimote %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Conectado"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Motor do Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Configurações do Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Janelas da Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
-msgstr "Menu de Janelas"
+msgstr "Menu das Janelas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Janelas da Direita"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Word Wrap"
+msgstr "Ajuste de Palavras"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Funcionando..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr "Global"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Gravar memcards (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Escrever no Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Escrever no Debugger"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
-msgstr "Escrever para o Arquivo"
+msgstr "Escrever no Arquivo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Escrever na Janela"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice falhou: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 Falha na inicialização: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr "Registrador XF"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 Criação de Master Voice falhou: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Você está usando uma DSP ROM livre feita pela Dolphin Team.\n"
-"Todos os jogos do Wii funcionarão corretamente, e a maioria dos jogos de GC "
-"também devem funcionar bem, mas os GBA/IPL/CARD UCodes não irão funcionar.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Você está usando uma DSP ROM antiga feita pela Dolphin Team.\n"
-"Somente jogos usando Zelda UCode funcionarão corretamente.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
-msgstr "Você não pode fechar painéis que têm páginas neles."
+msgstr "Você não pode fechar os painéis que têm páginas neles."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Você deve escolher um jogo!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
+"Você redimensionou a janela enquanto extraía frames.\n"
+"Nada pode ser feito para gerenciar isso corretamente.\n"
+"Seu vídeo provavelmente ficará corrompido."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Você deve digitar um nome!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "Você precisa escolher um jogo!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Você precisa digitar um nome."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
-msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal."
+msgstr "Você deve inserir um valor decimal, hexadecimal ou octal válido."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
-msgstr "Você deve digitar um nome válido para o perfil."
+msgstr "Você deve inserir um nome de perfil válido."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
-msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito."
+msgstr ""
+"Você deve reiniciar o Dolphin de modo a fazer as mudanças terem efeito."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
-"Suas DSP ROMs possuem hashes incorretos.\n"
-"Gostaria de parar agora para resolver o problema?\n"
-"Se você escolher \"Não\", o áudio pode falhar."
+"Suas ROMs do DSP tem hashes incorretos.\n"
+"Você gostaria de parar agora pra consertar o problema?\n"
+"Se você selecionar \"Não\" o áudio poderia ficar deturpado."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
-"Sua GCM/ISO parece ser inválida (país inválido).\n"
+"Seu arquivo GCM/ISO parece ser inválido (país inválido).\n"
 "Continuar com a região PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"O seu arquivo SYSCONF é do tamanho errado.\n"
-"Ele deveria ter 0x%04x (mas tem 0x%04llx)\n"
-"Você gostaria de gerar um novo?"
+"Seu arquivo SYSCONF é do tamanho errado.\n"
+"Ele deveria ter 0x%04x (mas tem 0x%04<PRIx64>)\n"
+"Você quer gerar um novo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Hack do ZTP"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
-msgstr "Código Zero 3 não é suportado"
+msgstr "O código Zero 3 não é suportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Código Zero desconhecido pelo Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr "Código zero desconhecido pelo Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ Aguardando ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6144,80 +6534,32 @@ msgstr ""
 "[QUEBRADO]\n"
 "Destaca as regiões de onde o EFB foi copiado.\n"
 "\n"
-"Se estiver em dúvida, deixe isto desativado."
+"Se não tiver certeza, deixe isto desmarcado."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Personalizado]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de "
-"texturas para a GPU usando o Framework OpenCL.\n"
-"No entanto, em seu estado atual ele causa defeitos nas texturas em vários "
-"jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação "
-"usual da CPU.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTAL]\n"
-"Aumenta a velocidade da emulação fazendo um reservatório temporário de "
-"Dysplay Lists.\n"
-"Pode causar problemas.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "automático"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr "falsa conclusão"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "nenhum"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "flavor desconhecido %d (esperado %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "mensagem desconhecida recebida"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
-msgstr "wxExecute retornou -1 ao rodar o aplicativo!"
+msgstr "O wxExecute retornou -1 ao rodar o aplicativo!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "Correção do zFar:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "Correção do zNear:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
-msgstr "| OR"
+msgstr "| OU"
diff --git a/Languages/po/ru.po b/Languages/po/ru.po
index 461239c829..13dac4d095 100644
--- a/Languages/po/ru.po
+++ b/Languages/po/ru.po
@@ -1,41 +1,59 @@
-# Translation of dolphin-emu.pot to Russian
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# N69 <nanoposan69@gmail.com>, 2013
+# Alexander Zhukov <cyb3rm4n@gmail.com>, 2014
+# dffggff <nanoposan69@gmail.com>, 2013
+# dffggff <nanoposan69@gmail.com>, 2013
+# flashmozzg <flashmozzg@gmail.com>, 2014
 # Kein <kein-of@yandex.ru>, 2011
+# P@S@f <pavel-saf@mail.ru>, 2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(слишком много)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " Игра : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! НЕТ"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,44 +62,94 @@ msgstr ""
 "\"%s\" не существует.\n"
 " Создать новую карту памяти на 16Мб?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" неверный образ GCM/ISO, или не является образом игры для GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sКопировать%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d примеры"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d примеры (уровень качества %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s уже существует, переписать?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s не может быть сжат. Возможно образ поврежден."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -90,7 +158,7 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер файла карты поврежден (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -99,7 +167,7 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер карты поврежден (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -108,358 +176,339 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер файла неверен (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s не может быть открыт"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s - пустой файл"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s уже сжат! Больше сжать нельзя."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s слишком длинное имя файла, максимальная длина 45 знаков"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sУдалить%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sЭкспоритровать GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sИмпортировать GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Свободных блоков; %u Свободных папок"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& И"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&О программе"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Запустить игру с DVD-диска..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Закладки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Выбрать папку с ISO-файлами..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Менеджер &читов"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Настройка &DSP"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Удалить ISO-файл..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Удалить выбранные ISO-файлы..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Эмуляция"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Файл"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "&Frame Advance"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Полноэкранный режим"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "Настройка &видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Помощь"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Настройка \"Горячих\" клавиш"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "Быстрая &загрузка"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Менеджер карт памяти (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "Па&мять"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "Выбор &файла для запуска..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Опции"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Пауза"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Запустить"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Свойства"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "&Режим \"Только для чтения\""
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Обновить список игр"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Регистры"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Сбросить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "З&вук"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Остановить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Вид"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Настройка &Wiimote"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Энциклопедия"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(НЕИЗВЕСТНЫЙ)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(отключен)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
-msgstr ""
+msgstr "+ ДОБАВИТЬ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x Native (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 бит"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x Native (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x Native (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x Native (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 бита"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x Native (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x Native (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 бит"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Введите название>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Разрешений экрана не найдено>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Ничего>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Нажмите кнопку>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Системный>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Окно сетевой игры уже открыто!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Игра не запущена."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"Поддерживаемых устройств bluetooth не найдено.⏎ Вы должны вручную подключить "
-"wiimote'ы."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR-коды"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Об эмуляторе Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Ускорение"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Точность:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Действие"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -474,7 +523,7 @@ msgstr ""
 "Ошибочный код:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -482,7 +531,7 @@ msgstr ""
 "Ошибка ActionReplay: неверный размер (%08x : адрес = %08x) в добавляемом "
 "коде (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -491,7 +540,7 @@ msgstr ""
 "Ошибка Action Replay: Неверный размер  (%08x : address = %08x) в Fill и "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -500,7 +549,7 @@ msgstr ""
 "Ошибка Action Replay: Неверный размер (%08x : address = %08x) в заполнении "
 "ОЗУ (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -509,12 +558,12 @@ msgstr ""
 "Ошибка Action Replay: Неверный размер (%08x : address = %08x) в ОЗУ к точке "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Ошибка Action Replay: Неверное значение (%08x) в копии памяти (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -523,158 +572,140 @@ msgstr ""
 "Ошибка Action Replay: основной код и запись в CCXXXXXX не реализована (%s) ⏎ "
 "основные коды не нужны. Не используйте основные кодоы."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Ошибка Action Replay: неверная линия AR кода: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Неврный размер условного кода %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Неверный тип нормального кода %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Нормальный код %i: неверный подтип %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Нормальный код 0: неверный подтип %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Адаптер:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Добавить"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Добавление ActionReplay-кода"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Добавление патча"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Добавить панель"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Добавить..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Адрес :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Настройка давления аналога, необходима для активации кнопок."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Расширенные настройки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Все GC/Wii файлы (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Все GC/Wii образы (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Все GCM-файлы Gamecube (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Файлы быстрых сохранений (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Файлы образов Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Сжатые образа дисков GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Все файлы (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Анализ"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Ракурс"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Анизотропная фильтрация"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Сглаживание:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Загрузчик неверноего размера... это точно загрузчик?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Загрузчик недоступен при загрузке из файла"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Загрузчик:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Применить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -683,16 +714,12 @@ msgstr ""
 "Включить эффекты пост-процесса после завершения кадра. ⏎ ⏎ Если не уверены, "
 "выберете (выкл)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabic"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Вы уверены, что хотите удалить \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -700,54 +727,81 @@ msgstr ""
 "Вы уверены, что хотите удалить эти файлы?\n"
 "Они исчезнут навсегда!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (экспериментальный)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Соотношение сторон:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Хотя бы одна панель должна быть открыта."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Аудио"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Вывод аудио:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Авто"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Автоматически (Начиная с 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Автоматически (По размеру окна)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Автоматическая настройка размера окно"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -756,243 +810,249 @@ msgstr ""
 "Автоматическая настройка размера окна под ваше внутренние разрешение.⏎ ⏎ "
 "Если вы не уверены, то галочку не ставьте."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP регистры"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Назад"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Настройка вывода"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Вывод:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Фоновой ввод"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Взмах"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Неверный заголовок файла"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
-msgstr ""
+msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Логотип"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Данные логотипа"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Логотип:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Панель"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Основные"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Основные настройки"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Басы"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Блок таблицы размещения контрольной суммы неудачна"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Блоки"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Синий"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Синяя слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Синяя справа"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "снизу"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Элементы управления с привязкой: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Не работает"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Обзор"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Выберите папку с образами игр"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Выбор папки с ISO-файлами..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Укажите папку для сохранения"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Буфер:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
-msgstr "C Stick"
+msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
-msgstr "Режим эмуляции CPU"
+msgstr "Движок эмуляции CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Кэшировать списки экрана"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+msgid "Can't find Wiimote by connection handle %02x"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr ""
+msgstr "Ошибка чтения из DVD_Plugin - DVD-Interface: Критическая ошибка"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Отмена"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Не удалось открыть %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Нельзя использовать этот файл, как карту памяти\n"
-"Вы пытаетесь использовать один файл в обоих слотах?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Catalan"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Центр"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Сменить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Сменить &диск..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Изменить диск"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Сменить игру"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1000,102 +1060,89 @@ msgstr ""
 "Позволяет сменить язык интерфейса программы.\n"
 "Для активации требуется перезапуск."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr ""
-"Изменения данной опции вступят в силу только после перезапуска эмулятора."
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Чат"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Чит-код"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Поиск кодов"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Менеджер чит-кодов"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Проверка целостности раздела"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Проверка целостности ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinese (Simplified)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinese (Traditional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "Выберите основной DVD-диск:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "Выберете папку с NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Выберите файл образа:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Выберите папку для добавления в список"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Выберите файл карты памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Выберите карту памяти:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Выберите папку для сохранения файлов"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
-msgstr "Circle Stick"
+msgstr "Классический контролер."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Очистить"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1103,183 +1150,230 @@ msgstr ""
 "Клиент отсоединился во время игры! Сетевая игра остановлена. Вы должны "
 "остановить игру."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Закрыть"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "&Настройка эмулятора..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Информация о коде"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Код:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Команда"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Комментарий"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Комментарий:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Сжать ISO-файл..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Сжать выбранные ISO-файлы..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Сжатие образа"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Настройки"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Настройка"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Настройка управления"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Настроить контроллеры"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Настройка эмулятора..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Подтвердить перезапись файла"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Спрашивать при остановке"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Подключиться"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
-msgstr ""
+msgstr "Подключить Balance Board"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Подключить USB-клавиатуру"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Подключить Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Подключить Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Подключить Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Подключить Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Подключить Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Консоль"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Непрерывное сканирование"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Ctrl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Конвертировать в GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Копирование неудачно"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Копировать на карту памяти %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Ядро"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Не удалось создать %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Не удалось инициализировать вывод %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Не удалось прочесть \"%s\".  В приводе нет диска или он не является копией "
-"игры GC/Wii. Пожалйста, учитывайте, что большинство приводов для ПК не "
-"способны прочитать оригинальные диски для Gamecube и Wii."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Не удалось определить ISO образ %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Не удалось сохранить %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1292,265 +1386,280 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr "Невозможно инициализировать ядро.⏎ Проверьте вашу конфигурацию."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Счетчик:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Страна:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Создать новый AR-код"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Создать новую точку обозрения"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Создатель:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Критический"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
-msgstr "обрезать"
+msgstr "Обрезать"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Обрезает картинку с 4:3 до 5:4 и с 16:9 до 16:10\n"
+"\n"
+"Если не уверены, не ставьте галочку."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Текущая папка сменилась с %s на %s после wxFileSelector!"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Настройки Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Czech"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "Аудио"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Эмулятор движка DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "Эмуляция DSP HLE (быстрая)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "Интерпретатор DSP LLE (медленный)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE рекомпилятор"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Настройка аудио (DSP)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD-диск:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
-msgstr ""
+msgstr "Танцевальный Мат"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Размер данных"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Дата:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Файлы Datel MaxDrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Мертвая зона"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Отладка"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Отладчик"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Десятичный"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Распаковка ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Снять сжатие с выбранных ISO-файлов..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Распаковка ISO..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Сброс"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Образ по умолчанию:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Шрифт по умолчанию"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Удалить"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Удалить сохранение"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Удалить существующий файл '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Описание"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Определить"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Устройство"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Настройки устройств"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Вызов"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Отключен"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Отключить направление альфы"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Отключить туман"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1559,235 +1668,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Диск"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Ошибка чтения диска"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Изображение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "/"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Вы хотите остановить эмуляцию?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Декодер Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Настройки графики %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "&Веб-сайт эмулятора"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Настройки эмуляции"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Настройки эмулируемого Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Настройки Dolphin GCPad"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS ролики (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Настройка Wiimote"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "&Репозиторий на Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin не нашел образов игр GC/Wii. Щелкните дважды по этой надписи, чтобы "
-"указать путь..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin настроен на скрытие всех игр. Кликните здесь два раза, чтобы "
-"показать игры..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
-msgstr ""
+msgstr "Dolphin не смог выполнить запрашиваемое действие."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Вниз"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Скачать готовые коды (база WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Скачано %lu кодов. (добавлено %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Барабаны"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Макет"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Дампить аудио"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Дампить EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Дампить Кадры"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Дампить текстуры"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr "Сохраняет текстуры игры в User/Dump/Textures/<id игры>/ "
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Dutch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "&Закрыть"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Копии"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1799,56 +1886,40 @@ msgstr ""
 "-- Если вы недавно обновили Dolphin , то скорее всего необходимо перегрузить "
 "компьютер, чтобы Windows обнаружил новый драйвер."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "ЕВРОПА"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Ранние обновление памяти"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Изменить"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Изменить код ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Править вручную"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Изменить патч"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Изменить точку"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Эффект"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
-msgstr ""
+msgstr "Процесс эмулятора уже запущен!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1857,7 +1928,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1867,114 +1938,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Эмулируемый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Качество эмуляции:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Включить"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Включить логирование AR-событий"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Включить совмещение блоков"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Включить кэш"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Включить чит-коды"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Включить DualCore-режим"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Включить DualCore-режим (ускорение)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Включить IdleSkipping-режим"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Включить IdleSkipping-режим (ускорение)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Включить MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Включить прогрессивную развертку"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Включить режим \"Сохранения экрана\""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Включить динамик"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Включить широкий экран"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Включить каркас моделей"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Включает анизотропную фильтрацию. Повышает визуальное качество текстур, "
-"находящихся под наклоном к углу обзора.\n"
-"В некоторых играх возможны проблемы.\n"
-" Если не уверены , выберите 1х."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Активирует режим быстрого доступ к диску, необходим для некоторых игр "
-"(отключите для повышения совместимости)."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Включить страницы"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1982,7 +2031,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1990,34 +2039,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Ускоряет игру The Legend of Zelda: Twilight Princess. Для любой ДРУГОЙ игры "
-"данный хак должен быть ОТКЛЮЧЕН."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Включить Custom Projection Hack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Включить Dolby Pro Logic II эмуляцию, используя 5.1 канальный звук. Нет "
-"поддержки в OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Включить Dolby Pro Logic II эмуляцию, используя 5.1 канальный звук. "
-"Необходим OpenAL вывод звука."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2025,7 +2065,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2033,64 +2073,79 @@ msgstr ""
 "Активирует устройство управления памятью, требуется для некоторых игр "
 "(активация повышает совместимость, деактивация - скорость)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Конец"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "English"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Улучшения"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Введите имя для новой точки обозрения:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Запись %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Запись 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Равно"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Ошибки"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2099,231 +2154,211 @@ msgstr ""
 "Ошибка: Попытка использовать шрифт %s, но он не загружен. Игра может "
 "отображать шрифт некорректно или вылетить."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Эйфория"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Выполнить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
-msgstr ""
+msgstr "Выйти"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
-msgstr ""
+msgstr "Экспортировать все сохранения c Wii"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Экспорт неудачен"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Экспортирование файла"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Экспорт записи"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "&Экспортировать запись процесса"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Экспортировать сохранение"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Экспортировать сохранение Wii (эксперемент)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Экспортировать все сохранения"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr ""
+msgstr "Экспорт неудачен"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "&Экспортировать сохранение как..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Расширение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Внешний буфер кадров"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Экстра параметр"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Извлечь все файлы..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Извлечь apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Извлечь DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Извлесь папку..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Извлечь файл..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Извлечь раздел..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Извлечение %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Извлечение всех файлов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Извлечение папки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Подождите..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "Байт FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "ФРАНЦИЯ"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "Размер ТФС:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Ошибка подключания!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Ошибка скачивания кодов."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Ошибка извлечения в %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Невозможно прочитать %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Ошибка чтения banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Невозможно прочитать bk-заголовок"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Ошибка чтения данных из файла %d"
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Невозможно прочитать данные из файла: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2331,82 +2366,67 @@ msgstr ""
 "Невозможно прочитать директорию корректно \n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Невозможно прочитать заголовок"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Ошибка чтения уникального ID из образа диска"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Ошибка записи BT.DINF в SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Ошибка записи bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Ошибка записи заголовка для %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsi"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "быстрое"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Более быстрая верси MMU (работает не со всеми играми)."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Информация о файле"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Файл не содержит кодов."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Файл конвертирован в .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2414,7 +2434,7 @@ msgstr ""
 "Файл не может быть открыт\n"
 "или имеет неверное расширение"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2423,83 +2443,93 @@ msgstr ""
 "Файл имеет расширение \"%s\"\n"
 "допустимые расширения (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Файл не распознается как карта памяти"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Файл не сжат"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: неизвестный режим открытия : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Файловая система"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Тип файла 'ini' неизвестен! Его нельзя открыть!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Найти текст"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Найти предыдущий"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Первый блок"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Исправить контрольную сумму"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Запускать консоль в режиме NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Принудительная фильтрация текстур"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2507,511 +2537,573 @@ msgstr ""
 "Формат в ascii (NTSC\\PAL)?\n"
 "Выберите \"no\" для sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Вперед"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Найдено %d результатов для '"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
+#, c-format
+msgid "Found %u save files"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Кадр"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Кадр"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Покадровый режим"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Дампить кадры, используя FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Информация о кадре"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Диапазон кадра"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "&Пропуск кадров"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Лимит кадров:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Кадров для записи"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Свободный обзор"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "French"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Лады"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Из"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "ПолнЭкран"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Полноэкранное разрешение:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "Файл GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "Джойстик"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "ID игры:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Игра уже запущена!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Игра не запущена!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Игры не найдены!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Персональные настройки игр"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Настройки игры"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Файлы созранений GameCube(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Настройки джойстика Gamecube"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Настройка контроллера GameCube"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko-коды"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Общие"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "German"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Настройка видео"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Больше чем"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Greek"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Зеленый"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Зеленая слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Зеленая справа"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Гитара"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Хаки"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Ошибка контрольной суммы заголовка"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Высота"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Помощь"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Здравствуйте,\n"
-"\n"
-"Для запуска Dolphin необходимо, чтобы процессор поддерживал расширения "
-"SSE2.\n"
-"К сожалению, Ваш процессор их не поддерживает.\n"
-"\n"
-"Sayonara!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Спрятать"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Скрывать курсор мыши"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Дом"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Создать"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Настройка \"горячих\" клавиш"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Клавиши"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Hungarian"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Гибридный Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "Настройки консоли (IPL)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "ИК"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "ИК указатель"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Чувствительность IR-сигнала:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Данные образа"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Папки с файлами образов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ИТАЛИЯ"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Иконка"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Пропускать изменение формата"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Импортировать сохранение"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr ""
+msgstr "Импортировать сохранение с Wii"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr ""
+msgstr "Импорт неудачен"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Импортированный файл имеет расширение gsc\n"
-"но содержит неверный заголовок"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Импортиванный неверного размера"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Импортированный файл имеет расширение sav\n"
-"но содержит неверный заголовок"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Почти играбельна"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Информация"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Информация"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Ввод"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Вставьте сюда сам код (шифрованный или нешифрованный)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Вставить SD-карту"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Введите имя кода..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Установить WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Установить в меню Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Установка WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Ошибка проверки целостности"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Проверка целостности завершена"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Проверка целостности завершена. Ошибок не было найдено."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Настройки интерфейса"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Внутреняя ошибка LZO - ошибка сжатия"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3020,172 +3112,188 @@ msgstr ""
 "Внутреняя ошибка LZO - ошибка распаковки (%d) (%li, %li) \n"
 "Попробуйте звгрузить опять"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Внутреняя ошибка LZO - ошибка в lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Внутреннее разрешение:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Интерпретатор (ОЧЕНЬ медленно)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Заставка"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Неверное значение!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Неверный bat.map или каталог"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Неверный тип события %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Неверный файл"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"Неверный opening.bnr в gcm:\n"
-"%s\n"
-" Лучше сделать новую копию игры."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Неверный файл записи"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Неудачный поиск параметров (объект не выбран)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Неверное сохранение"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "ЯПОНИЯ"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT-рекомпилятор (рекомендуется)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL-экспериментальный рекомпилятор"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "КОРЕЯ"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Держать окно главным"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Комбинация"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Korean"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "Кнопка L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Язык"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Задержка:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Влево"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Левый стик"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3193,198 +3301,211 @@ msgstr ""
 "Левый/Правый клик для доп. опций\n"
 "Средний-клик - очистить."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Меньше чем"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Лимитировать FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Загр."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Использовать свои текстуры"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Быстрая загрузка 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Быстрая загрузка 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Быстрая загрузка 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Быстрая загрузка 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Быстрая загрузка 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Быстрая загрузка 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Быстрая загрузка 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Быстрая загрузка 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Загрузить игру..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Загрузить системное меню Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Загрузить системное меню Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Загружать свои текстуры из User/Load/Textures/<game_id>/\n"
-"\n"
-"Если вы не уверены, то галочку не ставьте."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Лог"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Настройка лог-записи"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Записывать FPS в файл"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Тип лога"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Logger Outputs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Окно лога"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Соединение с сервером потеряно!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "Кнопка M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 не совпадает\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Ускорить MMU (спидхак)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Файлы Gameshark MadCatz (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Основной стик"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "ID создателя:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Создатель:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3393,35 +3514,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Макс."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "На карте памяти уже есть сохранение этой игры"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Карта памяти уже открыта"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Байт памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Карта памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3432,37 +3557,52 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Меню"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Мик."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Мин."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Разное"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Разное"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Определение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3470,20 +3610,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Моноширный шрифт"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Мотор"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3494,909 +3638,950 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Умножить"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP +"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP /"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Вниз"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP ="
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Влево"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP *"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Вправо"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Пробел"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP -"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Вверх"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Имя:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Имя:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Стандартные CGI-файлы (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Новый поиск"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "След. страница"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Искать далее"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Ник :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Страна не указана (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "ISO/WAD-файлов не обнаружено"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Нет вывода звука"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Не найден баннер для  %s"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Нет описания"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Нет док станции"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Файл не загружен"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Нет файла для записи"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Не найдена папка с сохранениями для %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Отсутствует"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norwegian Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Не равно"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Неизвестно"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Не подключено"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Примечания"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Примечания:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Уведомления"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Кол-во кодов:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Ускорение Nunchuk"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Объект"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Объект диапазона"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Выкл"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "Выводить сообщения на экран"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr ""
+msgstr "Онлайн &Документация"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Доступно только %d блоков"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Открыть"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Открыть &папку с образом"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Открыть папку с &сохранениями Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Выбор файла для запуска..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: ошибка создания контекста для устройства %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: не найдена аудио-карта"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: ошибка открытия устройства %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "Декодер текстур OpenCL"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "Декодер текстур OpenMP"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Опции"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Другой"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Вывод"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Про&играть запись процесса"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Джойстик"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Джойстик"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Джойстики"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Параграф"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Параметры "
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Раздел %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Патчи"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Папки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Пауза"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Пауза в конце ролика"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "По-пискельное освещение"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Отлично"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Точка %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Запуск"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Проиграть записанное"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Старт/Пауза"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Играбельна"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Параметры просмотра"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Игроки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Пожалуйста, подтвердите..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Пожалуйста, создайте точку обозрения, прежде чем сохранять"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Плюс-Минус"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polish"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Порт 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Порт 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Порт 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Порт 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Порт :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portuguese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portuguese (Brazilian)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "Эффекты пост-обработки:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Преднастройки"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Пред. страница"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Пред. страница"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Предыдущее значение"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Профиль"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Свойства"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Очистить кэш"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Вопрос"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Выход"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "Кнопка R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "Память"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "РОССИЯ"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
-msgstr ""
+msgstr "Радиус"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Диапазон"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Режим \"только для чтения\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Настоящий"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Реальный Wimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Настоящий Wiimotes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Запись"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Информация о записи"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Опции записи"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Красный"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Красная слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Красная справа"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Обновить"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Обновление списка игр"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Удалить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Выводить изображение в главное окно"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Сброс настроек"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Результаты"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Ревизия:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Вправо"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Правый стик"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Видбрация"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Русский"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Быстрое &сохранение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "безопасное"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Сохр."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Сохранить CGI-файл как..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Быстрое сохранение 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Быстрое сохранение 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Быстрое сохранение 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Быстрое сохранение 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Быстрое сохранение 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Быстрое сохранение 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Быстрое сохранение 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Быстрое сохранение 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Сохранить игру как..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Выберите место для сохранения сжатого GCM/ISO-образа"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Сохранить точку"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Выберите место для сохранения несжатого GCM/ISO-образа"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Масштабируемые EFB копии"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканирование %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Поиск образов дисков"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Поиск..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Скриншот"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Поиск"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Фильтр поиска"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Искать в подпапках"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Найти текущий объект"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Найти HEX значение:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Секция %s не найдена в SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Выбрать"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Выберите файл для записи игрового процесса"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Выберете Wii WAD файл для установки"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Выберите файл сохранения для импорта"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Выберите плавающие окна"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Выберите файл для запуска..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Выберите файл сохранений Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Выберите файл сохранения для загрузки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Выберите или укажите файл для быстрого сохранения"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4407,251 +4592,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "Выбранный профиль контроллера не существует"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Выбранный шрифт"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Отправить"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Месторасположение сенсора:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Разделитель"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbian"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Последовательный порт №1 - тип порта, который используют такие устройства "
-"как сетевой адаптер."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Сделать &игрой по умолчанию"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Установить картой памяти по умолчанию %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Настройки..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Встряска"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Короткое имя:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "Shoulder Buttons"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Отображать &консоль"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Показать &лог"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Отображать панель &статуса"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Отображать панель &инструментов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Отображать игры на DVD"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Показывать регионы копии EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "Показывать FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Франции"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Показать вывод экрана"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Италии"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Кореи"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Отображать язык:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Показать &настройки логирования"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Отображать игры платформ..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Отображать игры регионов..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Показывать статистику"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Тайваня"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "WAD-файлы"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Активирует запрос подтверждения об остановке процесса эмуляции игры."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Включает режим уведомления об ошибках эмуляции.\n"
-"Отключение данной опции позволит избавиться от надоедливых некритичных "
-"ошибок\n"
-"во время игры, однако в случае вылета эмулятора вы не увидите никакой "
-"информации."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Показать первый блок"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Показать лаги счетчика"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Показать блоки"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Показать комментарий"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Показать иконку"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Показать заголовок"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4659,74 +4884,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Неизвестные"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Повернутый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Размер"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Пропускать загрузку BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Пропустить очистку DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Пропустить EFB доступ из ЦП"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Слот %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Слот A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Слот B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Снапшот"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Программный рендинг"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4734,141 +4967,173 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Настройки эмуляции звука"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Вывод звука %s не верен."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Ошибка создания аудио-буфера %s."
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Пробел"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spanish"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Громкость динамика:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Ускорить чтение с диска"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Квадратный стик"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Стандартный контроллер"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Старт"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "&Сетевая игра"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Начать &запись процесса"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Начать запись"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Статус"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Быстрые сохранения"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Рулевое колесо"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Стик"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Стоп"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Растянуть по окну"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Бренчать"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Вычитать"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Файл успешно экспортирован в %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Сохранение успешно импортировано"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Покачивание"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Синхронизировать поток GPU"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -4876,88 +5141,117 @@ msgstr ""
 "Синхронизировать GPU и CPU потоки, для исправления случайных зависаний в "
 "Двухядерном режиме. (ВКЛ = Совместимость, ВЫКЛ = Скорость)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Язык системы:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "ТАЙВАНЬ"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "Ввод TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Разделение таблицы"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Левая панель"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Правая панель"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Сделать скриншот"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Проверить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Текстура"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Кэширование текстур"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Наложение форматов текстур"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD-файл успешно установлен"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Неверный адрес"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Контрольная сумма успешно исправлена"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Выбпвнная папка уже в списке"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -4966,77 +5260,81 @@ msgstr ""
 "Файл %s не может быть открыт для записи. Проверьте, не открыт ли он другой "
 "программой."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Файл %s уже открыт, нельзя записать заголовок."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Указанный файл (%s) не существует"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "Имя не может быть пустым"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "Имя не может содержать знак ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Сохранение, которое вы пытаетесь скопировать имеет неверный размер"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Выбранный язык не поддерживается вашей системой. Возвращаемся к стандартному."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Версии \"сетевой игры\" сервера и клиента несовместимы!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Сервер заполнен!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Ответ с сервера: игра уже запущена!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Сервер прислал неизвестное сообщение об ошибке!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Указанный файл \"%s\" не существует"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Неверное значение"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Тема:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5044,7 +5342,7 @@ msgstr ""
 "Не найден билет для 00000001/00000002. Ваша копия NAND скорее всего не "
 "полная."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5056,7 +5354,7 @@ msgstr ""
 "включена, выключена и неопределена (применяется глобальное значение данной "
 "опции)."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5064,328 +5362,362 @@ msgstr ""
 "Симулятор action replay не поддерживает коды, которые меняют сам Action "
 "Replay. "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-"Активация данной опции может привести к замедлению эмуляции в Wii-меню и "
-"некоторых играх."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Это позволит вам вручную править INI файл с конфигурацией"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Порог"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Наклон"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Название"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "К"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
-msgstr ""
+msgstr "Включить все типы логгирования"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
-msgstr ""
+msgstr "Включить соотношение сторон"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
-msgstr ""
+msgstr "Включить EFB Копии"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
+msgstr "Включить туман"
+
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Включение полноэкранного режима"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
+msgstr "Включить ИК"
+
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "сверху"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Попытка загрузить неизвестный тип файла."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Рычажки"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Попытка чтения из неверного SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
+"Попытка чтения из неверного SYSCONF\n"
+"Wiimote bt ids недоступны"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turkish"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Таблица переключения"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Тип:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "Порт UDP:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "НЕИЗВЕСТНО"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "США"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Не определено %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Отменить загрузку"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Неожиданный вызов 0x80? Отмена..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Неизвестная комманда DVD %08x - критическая ошибка"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Неизвестная команда 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Неизвестный тип записи %i в SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Получено неизвестное сообщение с id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Вверх"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Обновить"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Перевернутый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Использовать EuRGB60-режим (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Использовать полноэкранный режим"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Использовать HEX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Показывать panic-уведомления (ошибки)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Утилиты"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Ускорение VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Значение"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Значение:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Значение:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Глубина анализа"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Видео"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Виртуальный"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Громкость"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Ошибка установки WAD: ошибка создания %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "Невозможно установить WAD: ошибка создания билета"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5393,25 +5725,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Предупреждение: запуск DOL в неправильном режиме!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Предупреждение: запуск ELF в неправильном режиме!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Предупреждение: запуск ISO в неправильном режиме!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5421,7 +5755,7 @@ msgstr ""
 "Предупреждение: Советуем создать резервную копию файлов папки: %s\n"
 "Хотите продолжить?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5434,7 +5768,7 @@ msgstr ""
 "с совпадающими именами будут переписаны\n"
 "Продолжить?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5442,7 +5776,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5450,7 +5792,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5469,180 +5811,172 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - файл не открыт."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Сглаз"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Форсировать \"Широкоформатный экран\""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Ширина"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Root:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Файлы сохранений Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Нельзя прочесть файл"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote подключен"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Включить поддержку мотора"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Настройка Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "Перенос строк"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Подождите..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Записывать карты памяти (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Выводить в консоль"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Записать в отладчик"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Сохранять в файл"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Записать в окно"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice ошибка: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 ошибка инициализации: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 ошибка создания master voice: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF reg"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Желтый"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Вы не можете закрыть панель, в которой есть страницы."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Выберите игру!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Введите название!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Нужно ввести десятичное или шестнадцатиричное число."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Введите правильное имя профиля."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Необходимо перезапустить Dolphin, чтобы изменения вступили в силу."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5650,35 +5984,33 @@ msgstr ""
 "Ваш файл GCM/ISO, видимо, неверен (неверный регион).\n"
 "Продолжить в режиме PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x\n"
-"Вы хотите создать новый?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "Включить ZTP-хак"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 code не поддерживается"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero code неизвестен dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ жду ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5686,64 +6018,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Модифицированный]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "загрузчик (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Чтение кода операции из %x. Пожалуйста сообщите."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute вернул -1 при запуске приложения!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar Коррекция: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear Коррекция: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| ИЛИ"
diff --git a/Languages/po/sr.po b/Languages/po/sr.po
index 021deff775..e41b554977 100644
--- a/Languages/po/sr.po
+++ b/Languages/po/sr.po
@@ -1,16 +1,17 @@
-# Translation of dolphin-emu.pot to Serbian
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
 # nikolassj, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/sr/)\n"
 "Language: sr\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "&"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Igra"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! NE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,413 +56,446 @@ msgstr ""
 "\"%s\" ne postoji.\n"
 " Kreiraj novu memorisku karticu (16mb)?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopiraj%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s vec postoji, zameniti?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s ije uspelo da bude scrubbed. Najverovatnije je \"image\" ostecen."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s nije uspelo da otvori"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s je 0 byte fajl"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s je vec kompresovan! Nemoze se kompresovati vise."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s je previse dugo za \"filename\", maximalno slova 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sObrisi%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& I"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&O"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Bootuj sa DVD drajvera"
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Trazi \"ISO\""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "&Chit Meneger "
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&DSP Opcije"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Obrisi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Obrisi oznacene ISO fajlove..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulacija"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Fajl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Pun Ekran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "&Graficke Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Hotkey Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "Loaduj Savestate"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Memorijska kartica (Meneger za GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Memorija"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Otvori..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "&Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Pokreni"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Pribor/Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Refresuj listu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "&Registri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Zvuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Alat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Pogledaj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote Opcije"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(NEPOZNAT/O)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(iskljucen/o)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Ubaci ime ovde>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Rezolucija nije pronadjena>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Nista>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Pritisni taster>"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistem>"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Netplay prozor je vec otvoren!!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Nijedna igra trenutno nije pokrenuta."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR Kodovi"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "O Dolphin-u"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Ubrzanje"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Akcija"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -459,213 +505,191 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Dodaj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Dodaj ActionReplay kod"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Dodaj Patch "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Dodaj nova okna"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adresa :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Primeni "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -673,295 +697,330 @@ msgstr ""
 "Jeste li sigurni da zelite da obrisete ove fajlove?\n"
 "Nestace zauvek!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Zvuk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Nazad "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "U nazad"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Baner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Detalji o Baneru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Baner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Osnovno/ni/ne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Osnovne opcije"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bas"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blue"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blue left "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blue right "
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Donji deo/dno"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Ostecen/a/nje..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Trazi"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Trazi ISO direktoriju"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Tasteri"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulacije \"Engine\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Odustani"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Nemoze otvoriti %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centar "
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Promeni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Promeni &Disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Promeni Disk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Promeni Igru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -969,101 +1028,89 @@ msgstr ""
 "Promeni jezik.\n"
 " Zahteva restart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chat/Caskanje"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Chit kod"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Trazi Chit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Chit Meneger"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Kineski (pojednostavljen)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Kineski (tradicionalan)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Biraj fajl da otvoris "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Biraj memorisku karticu:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Biraj folder u kome zelis da ekstraktujes "
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasik/a"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Ocisti"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1071,180 +1118,230 @@ msgstr ""
 "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras "
 "manualno zaustaviti igru."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Zatvori"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Informacija o kodu "
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Komanda"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Koment:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Kompresuj ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Kompresuj oznaceni ISO fajlovi..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Kompresivanje ISO fajla u toku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Podesi"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Povezivanje..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konzola"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Kontrola"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Konvertuj u GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopiranje neuspesno "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopiraj na memorisku karticu %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr ""
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
+msgid "Could not save %s."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1257,265 +1354,277 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Zemlja:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Kreiraj AR Kod"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Kreator "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Izseci"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Mrtva Zona "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Obrisi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Obrisi save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Obrisi postojeci fajl '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Detekuj"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Uredjaj "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Opcije Uredjaja "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Onemoguci \"Fog\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1524,231 +1633,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Error tokom ucitavanje diska"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Graficka Podesavanja "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin &Web Sajt"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin podesavanja/konfiguracija"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1757,56 +1848,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1815,7 +1890,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1825,108 +1900,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1934,7 +1993,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1942,28 +2001,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1971,1330 +2027,1431 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Kraj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Brzo "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Igra je vec pokrenuta!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Igra nije pokrenuta!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube "
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Nemacki "
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafike"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Graficke opcije/podesavanja/konfiguracije..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitara "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Pomoc"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO Detalji "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Informacija "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Ubaci ime ovde..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Uvod"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr ""
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italianski "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japanski "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA "
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Taster "
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Korejski "
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Ucitaj "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "Ucitaj State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "Ucitaj State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "Ucitaj State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "Ucitaj State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "Ucitaj State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "Uci State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "Ucitaj State Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "Ucitaj State Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Ucitaj State"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3303,35 +3460,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3342,37 +3503,52 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Meni"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3380,20 +3556,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3404,909 +3584,950 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr ""
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Izskljucen/o"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Otvori "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Otvori fajl..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Opcije "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pauza "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfektno "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Pokreni "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Pokreni snimanje "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polski "
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugalski "
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Stampaj "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Pitanje "
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Izadji "
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM "
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "Rusija"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Reset/Restart "
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Rezultati "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Siguran "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Snimaj"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Snimaj GCI kao..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "Snimaj State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "Snimaj State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "Snimaj State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "Snimaj State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "Snimaj State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "Snimaj State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "Snimaj State Slot 7 "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "Snimaj State Slot 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Snimaj state..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Snimaj kao..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Snimaj kompresovani GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Skeniranje za ISO fajlove "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Skeniranje..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Trazi Filter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Trazi Subfoldere "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Izaberi "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Izaberi Snimani fajl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Izaberi fajl za ucitavanje "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Izaberi \"snimani fajl/the save state\""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Izaberi state za ucitavanje "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Izaberi state za snimanje/save"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4317,244 +4538,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Odabrani font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Isprati"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4562,74 +4830,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Velicina"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4637,641 +4913,740 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Pokreni "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Pokreni &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Pokreni Sni&manje"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Pokreni Snimanje"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr " Zaustavi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Nepoznat/o"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Updejt "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video "
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Jacina zvuka "
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5279,25 +5654,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Upozorenje "
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5305,7 +5682,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5319,7 +5696,7 @@ msgstr ""
 "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n"
 " Nastavi?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5327,7 +5704,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5335,7 +5720,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5354,212 +5739,204 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Radi..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ cekanje ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5567,64 +5944,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| ILI"
diff --git a/Languages/po/sv.po b/Languages/po/sv.po
index c3edd5e6fc..534984b9a9 100644
--- a/Languages/po/sv.po
+++ b/Languages/po/sv.po
@@ -1,17 +1,20 @@
-# Translation of dolphin-emu.pot to Swedish
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# DolphinPhoenix <anton_r_3@hotmail.com>, 2013
-# DolphinPhoenix <anton_r_3@hotmail.com>, 2013
+# Anton Regnander <anton_r_3@hotmail.com>, 2013-2014
+# Anton Regnander <anton_r_3@hotmail.com>, 2014-2015
+# Anton Regnander <anton_r_3@hotmail.com>, 2013,2015
+# JosJuice, 2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-11 20:36+0000\n"
-"Last-Translator: DolphinPhoenix <anton_r_3@hotmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/sv/)\n"
 "Language: sv\n"
@@ -20,21 +23,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin är en GameCube- och Wii-emulator som är fri mjukvara.\n"
+"\n"
+"Det här programmet bör inte användas för att spela spel som du inte äger "
+"lagligt.\n"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(intern IP)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr "(för många att visa)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Spel: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! INTE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,441 +63,476 @@ msgstr ""
 "\"%s\" finns inte.\n"
 " Vill du skapa ett nytt 16MB minneskort?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "\"%s\" kunde inte rensas på onödig data. Den är antagligen korrupt."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "\"%s\" är redan komprimerad! Den kan inte komprimeras ytterligare."
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" är en ogiltig GCM/ISO-fil, eller inte en GC/Wii-ISO."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopiera%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
-msgstr "%d prov"
+msgstr "%d samplingar"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
-msgstr "%d prov (kvalitetsnivå %d)"
+msgstr "%d samplingar (kvalitetsnivå %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+"%s\n"
+"laddades inte eftersom det har samma samn som det tidigare laddade\n"
+"%s"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+"%s\n"
+"laddades inte eftersom det är en ogiltig GCI.\n"
+"Filstorleken (%<PRIx64>) matchar inte storleken som står i headern (%d)"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+"%s\n"
+"laddades inte, eftersom det är en ogiltig GCI-fil.\n"
+"Antalet block påstods vara %d"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+"%s\n"
+"laddades inte eftersom det inte finns tillräckligt med lediga block på det "
+"virtuella minneskortet"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+"%s\n"
+"laddades inte, eftersom det är mindre än 10%% ledigt utrymme på "
+"minneskortet.\n"
+"Totalt antal block: %d; Lediga block: %d"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (skiva %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+"IPL %s hittades i mappen %s. Det kan hända att skivan inte går att känna igen"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s finns redan, vill du skriva över?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s misslyckades att rensas. Förmodligen är bilden korrupt."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 "%s misslyckades att läsas in som ett minneskort \n"
-" Kortets filstorlek är ogiltig (0x%x bytes)"
+" Kortets filstorlek är ogiltig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 "%s misslyckades att läsas in som ett minneskort \n"
-" Kortets storlek är ogiltig (0x%x bytes)"
+" Kortets storlek är ogiltig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
-"%s misslyckades att läsas in som ett minneskort.\n"
+"%s misslyckades att läsas in som ett minneskort\n"
 "Filen är inte tillräckligt stor för att vara en giltig minneskortsfil (0x%x "
-"bytes)"
+"byte)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s misslyckades att öppnas"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
+"%s är inte en mapp och kunde inte flyttas till *.original.\n"
+"Kontrollera rättigheterna för att skriva eller flytta ut filen ur Dolphin."
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s misslyckades: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr "%s var inte en mapp. Den har flyttats till *.original"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s är en fil på 0 byte"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s är redan komprimerad! Kan inte komprimera den ytterligare."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s är för långt för filnamnet, maximalt antal tecken är 45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sRadera%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportera GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportera GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
-msgstr "%uFria block; %u fria mappingångar"
+msgstr "%u lediga block; %u lediga filkatalogsplatser"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& OCH"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "&Om..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "&Starta upp från DVD-enhet..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "&Ljudinställningar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "&Brytpunkter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "&Bläddra efter ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr "&Fuskhanterare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "&DSP-inställningar"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "&Kontrollinställningar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "&Radera ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "&Radera valda ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emulering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "&Arkiv"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "Avancerad &bildruta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "&Helskärm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "G&rafikinställningar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "&Kortkommandosinställningar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "L&äs in snabbsparning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "&Minneskorthanterare (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "&Minne"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "&Inspelning"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "&Öppna..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "A&lternativ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "&Spela"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr "S&krivskyddat läge"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "&Uppdatera lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
-msgstr "&Listor"
+msgstr "&Register"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "&Återställ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Ljud"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "S&toppa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "&Visa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Inställningar för &Wiimotes"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr "&Bevaka"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "&Webbplats"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr "(Fel: Ogiltig värd)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "(Fel: Tappade anslutningen)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr "(Fel: Dolphin är för gammalt)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(OKÄND)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr "(Fel: Socket)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr "(Fel: Timeout)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr "(Fel: Okänt)"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+"(c) 2003-2015+ Dolphin-teamet. \"GameCube\" och \"Wii\" är varumärken som "
+"tillhör Nintendo. Dolphin är inte associerat med Nintendo på något sätt."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(av)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
-msgstr "+ ADDERA"
+msgstr "+ PLUS"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x ursprunglig (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
 msgstr "16 bitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x ursprunglig (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x ursprunglig (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x ursprunglig (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr "32 bitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D-vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x ursprunglig (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x ursprunglig (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
 msgstr "8 bitar"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Ange namn här>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Inga upplösningar hittades>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Ingenting>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Tryck på en tangent>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "<Systemspråk>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<System>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "Det finns redan ett öppet nätspelsfönster!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Ett nätspelsfönster är redan öppet!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "Ett spel körs inte för tillfället."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"En stödjande bluetooth-enhet kunde inte hittas.\n"
-"Du måste ansluta dina wiimotes manuellt."
+"Ingen Bluetooth-enhet som stöds hittades.\n"
+"Du måste ansluta dina Wiimotes manuellt."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"VARNING:\n"
-"\n"
-"Nätspel kommer bara fungera med följande inställningar:\n"
-" - Aktivera dubbla kärnor [AV]\n"
-" - DSP-emulatormotorn måste vara likadana på alla datorer!\n"
-" - DSP på tillägnad tråd [AV]\n"
-" - Bildrutegränsen ska inte vara inställd på [Ljud]\n"
-"\n"
-"Alla spelare bör ha samma inställningar och version av Dolphin.\n"
-"Alla minneskort måste antingen vara identiska mellan spelare eller "
-"inaktiverade.\n"
-"Stöd för Wiimotes har inte införts!\n"
-"\n"
-"Värden måste ha angivit TCP-porten som öppen/vidarebefordrad!\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
-msgstr "AM-fotlist"
+msgstr "AM-baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR-koder"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Om Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Acceleration"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Precision:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"Emulerar EFB-kopior noggrant.\n"
-"Vissa spel förlitar sig på detta för vissa grafikeffekter eller "
-"spelfunktionalitet.\n"
-"\n"
-"Om du är osäker kan du markera EFB till Textur istället."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Handling"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -487,20 +542,20 @@ msgid ""
 "%s"
 msgstr ""
 "Dekrypteringsfel av Action Replay-kod:\n"
-"Paritetkontroll misslyckades\n"
+"Paritetskontroll misslyckades\n"
 "\n"
-"Brottkod:\n"
+"Orsakande kod:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
-"Action Replay-fel: Ogiltig storlek (%08x : address = %08x) i 'Lägg till "
+"Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Lägg till "
 "kod' (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -509,7 +564,7 @@ msgstr ""
 "Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Fill and "
 "Slide' (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -518,7 +573,7 @@ msgstr ""
 "Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Ram Write And "
 "Fill' (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -527,12 +582,12 @@ msgstr ""
 "Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Write To "
 "Pointer' (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay-fel: Ogiltigt värde (%08x) i minneskopia (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -542,172 +597,141 @@ msgstr ""
 "(%s)\n"
 "Masterkoder behövs inte. Använd inte masterkoder."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay-fel: ogiltig AR-kodrad: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Tillståndskod: Ogiltig storlek %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Ogiltig typ av normalkod %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normalkod %i: Ogiltig undertyp %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normalkod 0: Ogiltig undertyp %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "Adapter upptäcktes"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "Adapter upptäcktes inte"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Lägg till"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "Lägg till ActionReplay-kod"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Lägg till patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Lägg till ny panel"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adress:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Lägger till det valda värdet till parametern zFar.\n"
-"Två sätt att uttrycka de flytande punktvärdena.\n"
-"Exempel: Genom att skriva in ''200'' eller ''0.0002'' ger samma effekt och "
-"det erhållna värdet kommer att bli ''0.0002''.\n"
-"Värden: (0->+/-Heltal) eller (0->+/-FP[6 siffrors noggrannhet])\n"
-"\n"
-"OBS: Kontrollera LogWindow/Console för de erhållna värdena."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"Lägger till det valda värdet till parametern zNear.\n"
-"Två sätt att uttrycka de flytande punktvärdena.\n"
-"Exempel: Genom att skriva in ''200'' eller ''0.0002'' ger samma effekt och "
-"det erhållna värdet kommer att bli ''0.0002''.\n"
-"Värden: (0->+/-Heltal) eller (0->+/-FP[6 siffrors noggrannhet])\n"
-"\n"
-"OBS: Kontrollera LogWindow/Console för de erhållna värdena."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
-msgstr "Justerar analoga kontrolltrycket som krävs för att aktivera knappar."
+msgstr ""
+"Justerar trycket som krävs för att aktivera knappar på analoga kontroller."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Alla GC/Wii-filer (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Alla GC/Wii-bilder (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "Alla GCM-filer för GameCube (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Alla GCM-filer för Gamecube (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Alla snabbsparningar (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Alla ISO-filer för Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alla komprimerade ISO-filer för GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Alla filer (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analysera"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Vinkel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropisk filtrering:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Kantutjämning:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "Apploader-datum:"
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader är i fel storlek...är det verkligen en apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Det gick inte att läsa in apploader från fil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Verkställ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -717,16 +741,12 @@ msgstr ""
 "\n"
 "Om du är osäker kan du välja (av)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arabiska"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Vill du verkligen radera \"%s\"?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -734,55 +754,84 @@ msgstr ""
 "Vill du verkligen ta bort dessa filer?\n"
 "De kommer att försvinna för alltid!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 "Vill du verkligen radera denna fil? Den kommer att försvinna för alltid!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr "Försöker du använda samma fil på båda platser?"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (experimentell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64-JIT (experimentell)"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "Bildförhållande:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "Åtminstone en panel måste vara öppen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+"Försöker upptäcka och hoppa över tomgångsloopar.\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Ljud"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Ljudbackend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "Ljudinställningar"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Fel uppstod när AO-enhet skulle öppnas.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "Australien"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
-msgstr "Auto (multiplicerat av 640x528)"
+msgstr "Auto (multipel av 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Auto (fönsterstorlek)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Autojustera fönsterstorlek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -792,134 +841,150 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr "BAT är inkorrekt. Dolphin kommer nu avslutas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP-register"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Backsteg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Backendinställningar"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "Bakgrundsindata"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Tillbaka"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Dålig headerfil"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balansbräda"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Bannerdetaljer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
-msgstr "Takt"
+msgstr "Svajarm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Grundläggande inställningar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bas"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "Batteri"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Kontrollsummering för blockallokeringstabellen misslyckades"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Block"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blå"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blå vänster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blå höger"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Under"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bundna kontroller: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "Gren: %s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Trasig"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "Bläddra"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
-msgstr "Bläddra efter en filmapp som ska läggas till"
+msgstr "Bläddra efter en filkatalog som ska läggas till"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
-msgstr "Bläddra efter en ISO-sökväg..."
+msgstr "Bläddra efter en ISO-filkatalog..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
-msgstr "Bläddra mapp för utdata"
+msgstr "Bläddra filkatalog för utdata"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
-msgstr "Buffer:"
+msgstr "Buffert:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Knappar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr "Hoppa över XFB"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -927,120 +992,112 @@ msgstr ""
 "Kringgår rensning av datacachen för DCBZ-instruktionen. Vanligtvis brukar "
 "man lämna detta alternativ inaktiverat."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C-spak"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-spak"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr "CP-register"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "Processorns emulatormotor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Cachevisningslista"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "CPU-alternativ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Räknar ut belysning av 3D-grafik för varje bildpunkt hellre än för varje "
-"hörn.\n"
-"Emulatorns hastighet sjunker med några procent (beroende på din "
-"grafikprocessor).\n"
-"Detta är vanligtvis en säker förbättring, men kan orsaka fel ibland.\n"
+"Läser in anpassade texturer i RAM när emulation startas.\n"
+"Det här kan kräva mycket RAM men kan också fixa prestandaproblem.\n"
+"\n"
+"Om du är osäker kan du lämna det här omarkerat."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Beräknar ljussättning av 3D-objekt per pixel istället för per vertex, vilket "
+"ger ett mjukare utseende på belysta polygoner och gör individuella trianglar "
+"mindre märkbara.\n"
+"Kan i vissa fall leda till prestandaproblem eller grafiska problem.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Kan inte hitta Wiimote med anslutningshandtaget %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "Kan inte hitta Wiimote med anslutnings-handle %02x"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr "Kan inte läsa från DVD_Plugin - DVD-gränssnitt: Allvarligt fel"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "Kan inte öppna %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Kan inte avregistrera händelser när händelser väntar"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Kan inte använda denna fil som ett minneskort.\n"
 "%s\n"
-"är inte en giltig minneskortsfil för GameCube"
+"är inte en giltig GameCube-minneskortsfil och kan inte användas."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Kan inte använda denna fil som ett minneskort.\n"
-"Försöker du använda samma fil i båda spåren?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalanska"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Centrum"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Byt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "Byt &skiva"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "Byt s&kiva"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Byt skiva"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Byt spel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr "Bytte skiva till %s"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1048,103 +1105,91 @@ msgstr ""
 "Ändrar språket för användargränssnittet.\n"
 "Kräver omstart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "Ändrar tecken till parametern zFar (efter korrektion)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr "Att ändra detta kommer inte ha någon effekt medan emulatorn körs."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "Ändrar tecken till parametern zNear (efter korrigering)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "Detta kommer inte ha någon effekt om det ändras medan emulatorn körs!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Chatt"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Fuskkod"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "Fuskhanterare"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Sök efter fusk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Fuskhanterare"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Kontrollera partitionintegritet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "Leta efter uppdateringar:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Kontrollerar integritet..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Kinesiska (förenklad)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Kinesiska (traditionell)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
-msgstr "Välj en DVD-filkatalog:"
+msgstr "Välj en rotkatalog för DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
-msgstr "Välj en mapp till NAND-rot:"
+msgstr "Välj en rotkatalog till NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Välj en standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Välj en filkatalog att lägga till"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Välj en fil att öppna"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Välj ett minneskort:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "Välj fil som ska användas som apploader: (gäller endast skivor som är "
-"tillverkade från mappar)"
+"tillverkade från filkataloger)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
-msgstr "Välj mappen att extrahera till"
+msgstr "Välj filkatalogen att extrahera till"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Cirkelspak"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassisk"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Rensa"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1152,183 +1197,240 @@ msgstr ""
 "Klienten avbryter anslutningen medan spelet körs!! Nätspel är inaktiverat. "
 "Du måste stoppa spelet manuellt."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Stäng"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "Ko&nfigurera..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Kodinfo"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Kommando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Kommentar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Kommentar:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr "Kompilerad: %s @ %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Komprimera ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Komprimera valda ISOs..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Komprimerar ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr "Beräkna"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr "Beräknar MD5-kontrollsumma"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Konfig."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Konfigurera kontroll"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Konfigurera styrplattor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Konfigurera..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "Bekräfta överskrivning av fil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "Bekräfta vid stopp"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Anslut"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Anslut balansbräda"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "Anslut USB-tangentbord"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Anslut Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "Anslut Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "Anslut Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "Anslut Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "Anslut Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "Anslut Wiimotes"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "Ansluten"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Kommandotolk"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "Kontinuerlig skanning"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Kontroll"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "Kontrollinställningar"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "Kontroller"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+"Kontrollerar avståndet till konvergensplanet, det vill säga avståndet där "
+"virtuella objekt ser ut att vara framför skärmen.\n"
+"Ett högre värde skapar starkare utanför-skärmen-effekter, och ett lägre "
+"värde kan vara mer bekvämt."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+"Kontrollerar avståndet mellan de virtuella kamerorna.\n"
+"Ett högre värde ger ett starkare intryck av djup, och ett lägre värde kan "
+"kännas bekvämare."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr "Konvergens-minimum:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr "Konvergens:"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "Konvertera till GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "Kopiera"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopiering misslyckades"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Kopiera till minneskortet %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Kärna"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "Kunde inte skapa %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Kunde inte initiera backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 "Kunde inte läsa \"%s\".  Det finns ingen skiva i läsaren, eller så är det "
 "ingen GC/Wii-backup. Var god notera att originalskivor för GameCube och Wii "
-"inte kan läsas av de flesta PC DVD-läsare."
+"inte kan läsas av de flesta PC-DVD-läsare."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kunde inte känna igen ISO-fil %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "Kunde inte spara %s"
+msgid "Could not save %s."
+msgstr "Kunde inte spara %s."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1345,15 +1447,23 @@ msgstr ""
 "Kör du Dolphin från en CD/DVD-skiva, eller är sparningfilen kanske "
 "skrivskyddad?\n"
 "\n"
-"Får du detta efter att ha flyttat emulatorns filmapp?\n"
+"Får du detta efter att ha flyttat emulatorns filkatalog?\n"
 "I så fall kan du behöva ställa in dina minneskortsplatser i inställningarna "
 "igen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr "Kunde inte skapa klient"
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Kunde inte öppna kommandot för tillägget 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1361,38 +1471,46 @@ msgstr ""
 "Kunde inte initiera kärnan.\n"
 "Kontrollera dina konfigurationer."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
-msgid "Count:"
-msgstr "Räkna:"
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr "Kunde inte hitta centralserver %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
+msgid "Count:"
+msgstr "Antal:"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "Antal: %lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "Skapa AR-kod"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Skapa nytt perspektiv"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Skapare:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "Kritisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Beskär"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1402,222 +1520,216 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Överbländning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
-msgstr "Den aktuella filmappen ändrades från %s till %s efter wxFileSelector!"
+msgstr ""
+"Den aktuella filkatalogen ändrades från %s till %s efter wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Anpassad projektionshackning"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr "Anpassad"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Anpassade inställnignar för projektionhackning"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Anpassa några ortografiska projektionsparametrar."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Tjeckiska"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
-msgstr "Styrplatta"
+msgstr "Styrkors"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
-msgstr "DSP-emulatormotor"
+msgstr "Emulatormotor för DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "DSP HLE-emulation (snabb)"
+msgstr "DSP HLE-emulering (snabb)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE-interpreterare (långsam)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE-omkompilator"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "DSP-inställningar"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "DSPLLE på separat tråd"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD-rotkatalog:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Allvarligt fel: Misslyckades att läsa från volym"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-"DVDLowUnencryptedRead - Allvarligt fel: Misslyckades att läsa från volym"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "Dansmatta"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Datastorlek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Datum:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro-filer (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Död zon"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
-msgstr "Debug"
+msgstr "Felsök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr "Endast felsökning"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
-msgstr "Debuggning"
+msgstr "Felsökning"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Avkomprimera ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Avkomprimera valda ISOs..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Avkomprimerar ISO"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr "Sänk konvergens"
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr "Sänk djup"
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "Sänk bildrutegräns"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "Sänk intern upplösning"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Standardtypsnitt"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Radera"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Radera sparning"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Radera den existerande filen '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr "Djupandel:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr "Djup:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Beskrivning"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
-msgstr "Dektera"
+msgstr "Sök"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
-msgstr ""
-"Upptäckte försök att läsa mer data från DVD än vad som får plats i "
-"utbuffern. Trunkerar."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
+msgstr "Deterministiska dubbla kärnor:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "Enhet"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "Enhetsinställningar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "Enhet hittades inte"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Ring"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr "Gör skärmen mörkare efter fem minuters inaktivitet."
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr "Direkt"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr "Direkt anslutning"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 "Kontrollsummering av filkatalog misslyckades\n"
-" och kontrollsummeringen av filkatalogens säkerhetkopia misslyckades"
+" och kontrollsummeringen av filkatalogens säkerhetskopia misslyckades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "Inaktivera Bounding Box"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "Inaktivera Destination Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Inaktivera dimma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1625,296 +1737,237 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Inaktivera XFB-emulation.\n"
-"Snabbar upp emulationen mycket, men orsakar stora buggar i många spel som "
-"which förlitar sig på dem (speciellt hembryggda applikationer).\n"
+"Inaktivera all XFB-emulering.\n"
+"Snabbar upp emuleringen mycket, men orsakar stora buggar i många spel som "
+"förlitar sig på dem (speciellt hembyggda applikationer).\n"
 "\n"
 "Om du är osäker kan du lämna detta markerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"Inaktiverar emulation av EFB-kopior.\n"
-"Dessa används ofta för efterbehandlandling eller texturrenderingseffekter, "
-"så när denna inställning markeras ger den en stor prestandaökning att den "
-"nästa alltid orsakar fel.\n"
+"Inaktiverar emulering av Bounding Box.\n"
+"Detta kan förbättra GPU-prestandan mycket i ett antal spel, men vissa spel "
+"kommer inte fungera rätt.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Inaktiverar emulering av en hårdvarufunktion som heter destination alpha, "
-"som används i många spel för olika grafikeffekter.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Skiva"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Diskläsningsfel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr "Inte ansluten"
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "Skärm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"Visar inmatningarna som läses av emulation.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
+"Visar meddelanden ovanpå emulatorfönsterområdet.\n"
+"Meddelandena inkluderar skrivningar till minneskortet, videobackend, "
+"processorinformation, samt rensning av JIT-cache."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Dividera"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
-msgstr "Vill du stoppa den aktuella emulationen?"
+msgstr "Vill du stoppa den aktuella emuleringen?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II-dekoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin-teamet\n"
-"\n"
-"Förgrening: %s\n"
-"Version: %s\n"
-"Kompilerad: %s, kl %s\n"
-"\n"
-"Dolphin är en emulator för Gamecube/Wii, som\n"
-"skrevs ursprungligen av F|RES och ector.\n"
-"Idag är Dolphin ett projekt med öppen källkod med\n"
-"många bidragsgivare, för många för att kunna lista upp.\n"
-"Om du är intresserad kan du gå till projektsidan på\n"
-"http://code.google.com/p/dolphin-emu/.\n"
-"\n"
-"Jättestort tack till Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 och Hotquik för deras\n"
-"omvända ingenjörskonst och dokumentation/demos.\n"
-"\n"
-"Stort tack till Gilles Mouchard, vars Microlib PPC-\n"
-"emulator som gav vår utveckling en rivstart.\n"
-"\n"
-"Tack till Frank Wille för hans PowerPC-dissambler, som\n"
-"or9 och vi modifierade för att inkludera detaljer om Gekko.\n"
-"\n"
-"Tack till hcs/destop för deras GC ADPCM-dekoder.\n"
-"\n"
-"Vi har ingen koppling till Nintendo på något sätt.\n"
-"Gamecube och Wii är varumärken som tillhör Nintendo.\n"
-"Emulatorn är endast för utbildningsändamål och bör\n"
-"inte användas för att spela spel som du inte äger \n"
-"på ett lagligt sätt."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
-msgstr "Dolphin %s-grafikkonfiguration"
+msgstr "Dolphin - Grafikkonfiguration för %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphins &webbsida"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
-msgstr "Dolphin-konfiguration"
+msgstr "Dolphin - Konfiguration"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr "Dolphin - Kontrollkonfiguration"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
-msgstr "Dolphin konfiguration för emulerad Wiimote"
+msgstr "Dolphin - Konfiguration för emulerad Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC-kontrollskonfiguration"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
-msgid "Dolphin TAS Movies (*.dtm)"
-msgstr "Dolphin TAS-filmer (*.dtm)"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin konfiguration för Wiimote"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin på &Google Code"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
-msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
 msgstr ""
-"Dolphin kunde inte hitta några GC/Wii-ISOs. Dubbelklicka här för att bläddra "
-"efter filer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr "Dolphin - Nätspel"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr "Dolphin - Nätspelsinställningar"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
+msgid "Dolphin TAS Movies (*.dtm)"
+msgstr "Dolphin-TAS-filmer (*.dtm)"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
+msgstr ""
+"Dolphin kunde inte hitta några ISO/WAD-filer för GameCube/Wii. Dubbelklicka "
+"här för att bläddra efter filer..."
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
+msgid ""
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin är inställd på att gömma alla spel. Dubbelklicka här för att visa "
+"Dolphin är inställt på att gömma alla spel. Dubbelklicka här för att visa "
 "alla spel..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin kunde inte slutföra den begärda handlingen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-"Fördubblar den emulerade grafikprocessorns klockfrekvens. Kan öka "
-"hastigheten för en del spel (PÅ = snabb, AV = kompatibel)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Ned"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Ladda ned koder (WiiRD-databas)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Laddade ned %lu koder. (Lade till %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr "Drivrutin upptäcktes inte"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Trummor"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Dumpa ljud"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "Dumpa EFB-mål"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Dumpa bildrutor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr "Dumpa objekt"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr "Dumpa texturhämtningar"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Dumpa texturer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dumpa alla renderade bildrutor till en AVI-fil i User/Dump/Frames/\n"
+"Dumpar avkodade speltexturer till User/Dump/Textures/<spel-id>/.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Dumpa dekodade speltexturer till User/Dump/Textures/<spelets_id>/\n"
+"Dumpar innehåller av EFB-kopior till User/Dump/Textures/.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Dumpa innehållet av EFB-kopiorna till User/Dump/Textures/\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Nederländska"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "A&vsluta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB-kopior"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1927,56 +1980,40 @@ msgstr ""
 "förmodligen en omstart för tillfället för att få Windows att hitta den nya "
 "drivrutinen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Tidiga minnesuppdateringar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Redigera"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "Redigera Action Replay-kod"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Redigera konfig."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "Redigera lokala upphävanden"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Redigera patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Redigera aktuellt perspektiv"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Inbäddad bildrutebuffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr "Inbäddad bildrutebuffert (EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "Emuleringstråd körs redan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1985,12 +2022,12 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 "Emulerar XFB noggrant.\n"
-"Saktar ned emulatorn mycket och förhindrar högupplösningsrendering men är "
-"nödvändig för att emulera ett antal spel riktigt.\n"
+"Saktar ned emulatorn mycket och förhindrar högupplöst rendering, men är "
+"nödvändig för att emulera ett antal spel på rätt sätt.\n"
 "\n"
-"Om du är osäker kan du markera Virtuell XFB-emulation istället."
+"Om du är osäker kan du markera virtuell XFB-emulering istället."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1999,129 +2036,109 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Emulerar XFB med hjälp av grafikprocessors texturobjekt.\n"
+"Emulerar XFB med hjälp av grafikprocessorns texturobjekt.\n"
 "Fixar många spel som inte fungerar utan XFB-emulering medan den inte är lika "
 "långsam som en riktig XFB-emulering. Men den kan fortfarande misslyckas för "
 "många andra spel (speciellt hemmagjorda applikationer).\n"
 "\n"
 "Om du är osäker kan du lämna detta markerat."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Emulerad Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
-msgstr "Emulationsnabbsparning:"
+msgstr "Emuleringssnabbsparning:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "Aktivera"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Aktiverar 3D-effekter via stereoskopi med hjälp av Nvidia 3D Vision "
-"technology som det stöds av ditt.\n"
-"Kan orsaka fel.\n"
-"Kräver helskärm för att det ska fungera.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "Aktivera AR-loggning"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Aktivera blocksammanfogning"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr "Aktivera CPU-hastighetsöverskridning"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Aktivera beräkning av Bounding Box"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Aktivera cache"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Aktivera fusk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Aktivera dubbla kärnor"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Aktivera dubbla kärnor (höjer prestandan)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "Aktivera FPRF"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Aktivera överhoppning av tomgångsloopar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Aktivera överhoppning av tomgångsloopar (höjer prestandan)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "Aktivera MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Aktivera Progressive scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Aktivera skärmsläckare"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Aktivera högtalardata"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Aktivera bredbild"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "Aktivera Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Aktivera anisotropisk filtrering.\n"
-"Förbättrar den visuella kvaliteten för texturer som är ligger i indirekta "
+"Aktiverar anisotropisk filtrering.\n"
+"Förbättrar den visuella kvalitén för texturer som ligger i indirekta "
 "visningsvinklar.\n"
 "Kan orsaka fel i ett fåtal spel.\n"
+"När Direct3D används och detta är över 1x har detta också samma effekt som "
+"att aktivera \"Tvinga texturfiltrering\".\n"
 "\n"
 "Om du är osäker kan du välja 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Aktiverar snabb skivtillgång. Behövs för en del spel. (PÅ = Snabb, AV = "
-"Kompatibel)"
+"Aktiverar snabb skivläsning. Detta kan leda till kraschar och andra problem "
+"i vissa spel. (PÅ = snabb, AV = kompatibel)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Aktivera sidor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2134,46 +2151,43 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Aktivera detta om du vill använda Dolphins huvudfönstret för rendering "
+"Aktivera detta om du vill använda Dolphins huvudfönster för rendering "
 "istället för ett separat fönster.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"Aktivera detta för att snabba upp The Legend of Zelda: Twilight Princess. "
-"Inaktivera för NÅGOT ANNAT spel."
+"Aktiverar emulering av Dolby Pro Logic II med 5.1 surround-ljud. Inte "
+"tillgängligt för OS X."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Aktiverar anpassat projektionshack"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Inte "
-"tillgänglig för OSX."
+"Aktiverar emulering av Dolby Pro Logic II med 5.1 surround-ljud. Endast för "
+"OpenAL och Pulse-backends."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Endast "
-"OpenAL-backend."
+"Aktiverar beräkning av Floating Point Result Flag. Behövs för vissa spel. "
+"(PÅ = kompatibel, AV = snabb)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2185,7 +2199,7 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2193,7 +2207,11 @@ msgstr ""
 "Aktiverar minneshanterarenheten som behövs för några spel. (PÅ = Kompatibel, "
 "AV = Snabb)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr "Aktiverar Action Replay- och Gecko-fusk om det finns några."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2203,52 +2221,63 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr "Enet initialiserades inte"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "Engelska"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Förbättringar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Ange ett namn för det nya perspektivet:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Ingång %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Ingång 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Samma"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Fel"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Fel uppstod när valt språk skulle läsas in. Byter tillbaka till "
 "systemstandard."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr "Ett fel uppstod när filen sparades."
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2257,7 +2286,7 @@ msgstr ""
 "Fel: Efter \"%s\", hittades %d (0x%X) istället för sparningsmarkören %d (0x"
 "%X). Avbryter inläsning av snabbsparning..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2266,219 +2295,197 @@ msgstr ""
 "Fel: Försöker att komma åt %s typsnitt men de är inte inlästa. Spel kanske "
 "inte visar typsnitt korrekt, eller kraschar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "Europa"
+
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
 #, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Undantagshanterare - åtkomst under minnesutrymme. %08llx%08llx"
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr "Undantagshanterare - åtkomst under minnesutrymme. 0x%08x"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
-msgstr "Utför"
+msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Avsluta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Exportera alla Wii-sparningar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Exportering misslyckades"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Exportera fil"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Exportera inspelning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Exportera inspelning..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Exportera sparning"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "Exportera Wii-sparningar (experimentell)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "Exportera alla sparningar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "Exportering misslyckades"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Exportera sparning som..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Tillägg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Extern bildrutebuffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr "Extern bildrutebuffert (XFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "Extra parameter"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Extra parameter som endast är användbar i ''Metroid: Other M''."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Extraherar alla filer..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Extrahera apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "Extrahera DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Extrahera filkatalog..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Extrahera fil..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Extrahera partition..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraherar %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Extraherar alla filer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
-msgstr "Extraherar filmapp"
+msgstr "Extraherar filkatalog"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Extraherar..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO-byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO-spelare"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANKRIKE"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST-storlek:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "Misslyckades att ansluta!"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Misslyckades att ansluta!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Misslyckades att ladda ned koder."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Misslyckades att extrahera till %s!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"Misslyckades att läsa in DSP-ROM:\t%s\n"
-"\n"
-"Denna fil kräver att DSP LLE används.\n"
-"Den är inte inkluderad med Dolphin eftersom den innehåller "
-"upphovsrättsskyddad data.\n"
-"Använd DSPSpy för att dumpa filen från din fysiska konsol.\n"
-"\n"
-"Du kan använda motorn DSP HLE som inte kräver dumpningar av ROM.\n"
-"(Välj den från fliken \"Audio\" i konfigurationsdialogen.)"
+"Kunde inte hitta det nya filnamnet\n"
+"%s\n"
+"kommer skrivas över"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr "Misslyckades att lyssna. Körs nätspelsservern redan?"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr "Kunde inte öppna inmatningsfilen \"%s\"."
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"Misslyckades att läsa in bthprops.cpl! Det går inte att ansluta riktiga "
-"Wiimotes och Dolphin kan krascha utan förvarning!"
+"Kunde inte öppna utmatningsfilen \"%s\".\n"
+"Kontrollera att du har tillåtelse att skriva till mappen i fråga och att "
+"enheten inte är skrivskyddad."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"Misslyckades att läsa in hid.dll! Det går inte att ansluta riktiga Wiimotes "
-"och Dolphin kan krascha utan förvarning!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "Misslyckades att läsa %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "Misslyckades att läsa banner.bin"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "Misslyckades att läsa bk-header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"Misslyckades att läsa blocket %d i sparningsdatan\n"
-"Minneskortet kan vara trunkerad\n"
-"Filposition: %llx"
+"Misslyckades att läsa block %d i den sparade datan\n"
+"Minneskortet kanske har trunkerats\n"
+"Filens position:%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2487,7 +2494,7 @@ msgstr ""
 "korrekt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2495,37 +2502,28 @@ msgstr ""
 "Misslyckades att läsa blockallokeringstabellen korrekt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "Misslyckades att läsa data från fil %d"
+msgid "Failed to read data from gci file %s"
+msgstr "Kunde inte läsa data från GCI-filen \"%s\""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "Misslyckades att läsa data från fil: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
-"Misslyckades att läsa systemåterställningsmappen korrekt\n"
+"Misslyckades att läsa filkatalogen för systemåterställning korrekt\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
-"Misslyckades att läsa mappen korrekt\n"
+"Misslyckades att läsa filkatalog korrekt\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Misslyckades att läsa header"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2533,74 +2531,65 @@ msgstr ""
 "Misslyckades att läsa header korrekt\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "Misslyckades att läsa header för filen %d"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "Misslyckades att läsa unikt ID från disk-bilden"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr "Kunde inte uppdatera landskoden i SYSCONF"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Misslyckades att skriva BT.DINF till SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "Misslyckades att skriva bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "Misslyckades att skriva data till fil: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
+"Kunde inte skriva till utmatningsfilen \"%s\".\n"
+"Kontrollera att det finns tillräckligt med utrymme på målenheten."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "Misslyckades att skriva header för %s"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Persiska"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Snabb"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "Snabb kalkylering av djup"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Snabb version av MMU. Fungerar inte för alla spel."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
-"Allvarlig desynkronisering. Avbryter Aborting uppspelning. (Fel i "
-"PlayWiimote: %u != %u, byte %u.)%s"
+"Allvarlig desynkronisering. Avbryter uppspelning. (Fel i PlayWiimote: %u != "
+"%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo-spelare"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Filinformation"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr "Filstorlek"
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Filen innehöll inga koder."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Filen konverterades till .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2608,7 +2597,7 @@ msgstr ""
 "Filen kunde inte öppnas\n"
 "eller har inte en giltig filändelse"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2617,95 +2606,112 @@ msgstr ""
 "Filen har filändelsen \"%s\"\n"
 "giltiga filändelser är (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Filen känns inte igen som ett minneskort"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Filen är inte komprimerad"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Okänt öppet läge: 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr "Misslyckades att skriva till fil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Filtypen 'ini' är okänd! Kommer inte att öppnas!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Filtrerar alla texturer, även de som spel specifikt markerar som "
+"ofiltrerade.\n"
+"Kan förbättra kvalitén av vissa texturer i några spel, men kan leda till "
+"problem i andra spel.\n"
+"På Direct3D händer samma sak om anisotropisk filtrering är högre än 1x.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Hitta nästa"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Hitta föregående"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "Första block"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Fixa kontrollsummor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "Tvinga 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "Tvinga 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Tvinga konsol som NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Tvinga texturfiltrering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Tvingar texturfiltrering även om det emulerade spelet har aktiverat det.\n"
-"Förbättrar texturkvaliteten lite grann, men orsakar buggar i en del spel.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Tvingar spelets grafikutdata att visas i bredbildsupplösning.\n"
-"Orsakar grafikbuggar i några spel.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Tvingar att använda läget NTSC-J för att använda det japanska ROM-"
-"typsnittet.\n"
-"Lämna omarkerat, eftersom Dolphin anger NTSC-U som standardval och aktiverar "
-"automatiskt denna inställning när japanska spel spelas."
+"Tvingar NTSC-J-läget att användas så att det japanska ROM-teckensnittet "
+"används.\n"
+"Om detta är omarkerat använder Dolphin NTSC-U som standard och aktiverar den "
+"här inställningen automatiskt när japanska spel spelas."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Tvingar spel att rendera grafik i ett valfritt bildförhållande.\n"
+"Använd det med \"Bildförhållande\" satt till \"Tvinga 16:9\" för att tvinga "
+"4:3-spel att köras i 16:9.\n"
+"Resultatet är sällan bra och skapar ofta problem med grafik och gränssnitt.\n"
+"Om några Action Replay- eller Gecko-koder för bredbild används är den här "
+"inställningen onödig (och kan till och med göra grafiken värre).\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2713,407 +2719,437 @@ msgstr ""
 "Formatera som ascii (NTSC\\PAL)?\n"
 "Välj nej för sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "Framåt"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
-msgstr "Framåtport (UPnP)"
+msgstr "Vidaresänd port (UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "Hittade %d resultat för '"
+msgid "Found %u results for '"
+msgstr "Hittade %u resultat för '"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "Hittade %x sparningsfiler"
+msgid "Found %u save files"
+msgstr "Hittade %u sparningsfiler"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Bildruta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Bildruta"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Avancerad bildruta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Bildskärmsdumpar använder FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Bildruteinfo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Räckvidd för bildrutor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "&Hoppa över bildrutor"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Bildrutegräns:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
-msgstr "Bildrutor som ska spelas in"
+msgstr "Bildrutor att spela in"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "Frankrike"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Fri vy"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Franska"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Greppband"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Från"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Helskärm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
 msgstr "Helskärmsupplösning:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI-fil (*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC-kontroll"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "GCI-mapp"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
+"GCI-sparfilen laddades inte, eftersom regionen inte stämmer överens med "
+"minneskortets region:\n"
+"%s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr "GCMemcardDirectory: ClearBlock anropades med ogiltig blockadress"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr "Game Boy Advance-kassetter (*.gba)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "Spel-ID"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Spelets ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Spelet körs redan!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Spelet körs inte!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Spelet hittades inte!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Spelspecifika inställningar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Spelkonfig."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr "GameCube-adapter"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr "GameCube-kontrollkonfiguration"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr "GameCube-kontroller"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr "GameCube-minneskort (*.raw, *.gcp)"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube sparningsfiler (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "GameCube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Inställningar för &GameCube-kontroller"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "GameCube-minneskort (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Inställningar för GameCube-kontroller"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko-koder"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"GeckoCode misslyckades att köras (CT%i CST%i) (%s)\n"
-"(antingen en dålig kod eller är så stöds kodtypen inte ännu.) Försök att "
-"använda den inbyggda kodhanteraren genom att flytta filen codehandler.bin "
-"till mappen \"Sys\" och starta om Dolphin.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Allmänt"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Allmänna inställningar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Tyska"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "Tyskland"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Index är större än AR-kodlistans storlek %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Grafik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Grafikinställningar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Större än"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Höjer kraftigt kvaliteten på texturer som genereras med hjälp av "
-"textureffekter.\n"
-"Att höja den interna upplösningen kommer att förbättra effekten av denna "
-"inställning.\n"
-"Sänker prestandan en aning och kan orsaka fel (vilket är osannolikt).\n"
-"\n"
-"Om du är osäker kan du lämna detta markerat."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Grekiska"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Grön"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Grön vänster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Grön höger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitarr"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "Hackningar"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr "Hårdvarurasterisering"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Kontrollsumma för header misslyckades"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebreiska"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Höjd"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Hjälp"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hej,\n"
-"\n"
-"Dolphin kräver OS X 10.7 eller högre.\n"
-"Tyvärr använder du en gammal version av OS X.\n"
-"Den sista versionen av Dolphin som stödjer OS X 10.6 är Dolphin 3.5\n"
-"Var god uppgradera till 10.7 eller högre för att använda den senaste "
-"versionen av Dolphin.\n"
-"\n"
-"Adjö!\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hej,\n"
-"\n"
-"Dolphin kräver att din processor stödjer SSE2-tillägg.\n"
-"Tyvärr stödjer inte din processor dem, så Dolphin kommer inte att köras.\n"
-"\n"
-"Simma lugnt!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Göm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Göm muspekare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 "Gömmer muspekaren om den är ovanpå emulatorfönstret. \n"
 "\n"
-"Om du är osäker kan du lämna detta markerat."
+"Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Hem"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Värd"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Kortkommandoskonfiguration"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr "Värdkod:"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr "Värdkoden är för stor. Kontrollera att du har rätt kod."
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "Kortkommandon"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Ungerska"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Hybrid-Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr ""
 "IOCTL_ES_GETVIEWS: Försökte att hämta data från en okänd biljett: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Spelet försökte starta om IOS eller en titel som inte finns "
-"tillgänglig i din NAND-dumpning\n"
-"Titel-ID %016llx.\n"
-" Dolphin kommer troligtvis frysa sig nu"
+"IOCTL_ES_LAUNCH: Spelet försökte läsa om en titel som inte finns tillgänglig "
+"i din NAND-dump\n"
+"Titel-ID %016<PRIx64>.\n"
+"Dolphin kommer troligtvis frysa sig nu."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - dålig destination"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr "IOCTL_ES_LAUNCH: DOL-filen är ogiltig!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL-inställningar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr "IPL med okänd kontrollsumma %x"
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR-pekare"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR-känslighet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO-detaljer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
-msgstr "ISO-filmapp"
+msgstr "ISO-filkataloger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALIEN"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Ikon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Om den är markerad kommer alla bundna lådregister uppdateras. Används av "
-"Paper Mario-spelen."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "Ignorera formatändringar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
@@ -3123,143 +3159,161 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta markerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ignorera alla efterfrågor om att processorn ska läsa från eller skriva till "
+"Ignorera alla efterfrågor från processorn om att läsa från eller skriva till "
 "EFB.\n"
-"Förbättrar prestandan i några spel, man kan inaktivera några spelrelaterade "
-"funktioner eller grafikeffekter.\n"
+"Förbättrar prestandan i några spel, men kan göra så att vissa spelrelaterade "
+"funktioner eller grafikeffekter inte fungerar.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Importera sparning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "Importera Wii-sparning"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "Importering misslyckades"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 "Den importerade filen har filändelsen gsc\n"
-"man har inte en giltig header"
+"man har inte en giltig header."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Importerad fil har ogiltig längd"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr "Den importerade filen har en ogiltig längd."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
 "Den importerade filen har filändelsen sav\n"
-"men har inte en giltig header"
+"men har inte en giltig header."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "I spelet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr "Öka konvergens"
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr "Öka djup"
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "Höj bildrutegräns"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "Öka intern upplösning"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Information"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Indata"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Sätt in"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Skriv in krypterad eller dekrypterad kod här..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "Sätt in SD-kort"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
 msgstr "Ange namn här..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "Installera WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Installera till Wii-meny"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"InstallExceptionHandler anropade, man denna plattform stödjer inte det ännu."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "Installerar WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Integritetskontrollfel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Integritetskontroll slutförd"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Integritetskontroll slutförd. Inga fel har hittats."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Integritetskontroll för partition %d misslyckades. Din dumpning är troligvis "
-"korrupt eller har blivit patchad inkorrekt."
+"Integritetskontroll för %s misslyckades. Skivan är troligtvis korrupt eller "
+"har blivit modifierad inkorrekt."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Gränssnittsinställningar"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "Internt LZO-fel - kompremering misslyckades"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3268,103 +3322,106 @@ msgstr ""
 "Internt LZO-fel - avkomprimering misslyckades (%d) (%li, %li) \n"
 "Försök att läsa in snabbsparning igen"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Internt LZO-fel - lzo_init() misslyckades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr "Internt namn:"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "Intern upplösning:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
-msgstr "Interpreterare (RIKTIG långsam)"
+msgstr "Interpreterare (RIKTIGT långsam)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Ogiltig storlek (%x) eller magiskt ord (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr "Ogiltig bat.map eller katalog"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Ogiltigt värde!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Ogiltig bat.map eller mappingång"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Ogiltig händelsetyp %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Ogiltig fil"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
-msgstr ""
-"Ogiltig opening.bnr hittades i gcm:\n"
-"%s\n"
-" Du behöver nog göra en redump för detta spel."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
+msgstr "Ogiltig värd"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr "Ogiltigt index"
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Ogiltig inspelningsfil"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "Ogiltiga sökparametrar (inga objekt markerades)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
-msgstr "Ogiltig söksträng (kunde inte konvertera till nummer)"
+msgstr "Ogiltig söksträng (kunde inte konvertera till siffror)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Ogiltig söksträng (endast jämna stränglängder stöds)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Ogiltig snabbsparning"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr "Ogiltigt värde."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italienska"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "Italien"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT-kompilator (rekommenderas)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "Experimentell JITIL-kompilator"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "JITIL-kompilator (långsammare, experimentell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "Japan"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japanska"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "Visa alltid fönster överst"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3374,64 +3431,75 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Låt fönster vara överst"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "Tangentbord"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Tangent"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr "Tangenter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr "Sparka ut spelare"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "Korea"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Koreanska"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L-knapp"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Senaste %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Latens:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Vänster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Vänster spak"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"Vänsterklicka för att ange kortkommando.\n"
-"Tryck på mellanslag för att rensa."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "Vänster spak"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3441,210 +3509,224 @@ msgstr ""
 "Mittenklicka för att rensa.\n"
 "Högerklicka för fler alternativ."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
-"Vänster-/högerklicka för kler alternativ.\n"
+"Vänster-/högerklicka för fler alternativ.\n"
 "Mittenklicka för att rensa."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Mindre än"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "Begränsa efter bildrutefrekvens"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "Licens"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+"Begränsar spels hastighet till ett angivet antal bildrutor per sekund (full "
+"hastighet är 60 för NTSC och 50 för PAL)."
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Läs in"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Läs in anpassade texturer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Läs in snabbsparning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "Läs in senaste snabbsparning 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "Läs in senaste snabbsparning 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "Läs in senaste snabbsparning 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "Läs in senaste snabbsparning 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "Läs in senaste snabbsparning 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "Läs in senaste snabbsparning 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "Läs in senaste snabbsparning 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "Läs in senaste snabbsparning 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
-msgstr "Läs in snabbsparningsspår 1"
+msgstr "Läs in snabbsparningsplats 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr "Läs in snabbsparningsspår 10"
+msgstr "Läs in snabbsparningsplats 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
-msgstr "Läs in snabbsparningsspår 2"
+msgstr "Läs in snabbsparningsplats 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
-msgstr "Läs in snabbsparningsspår 3"
+msgstr "Läs in snabbsparningsplats 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
-msgstr "Läs in snabbsparningsspår 4"
+msgstr "Läs in snabbsparningsplats 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
-msgstr "Läs in snabbsparningsspår 5"
+msgstr "Läs in snabbsparningsplats 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
-msgstr "Läs in snabbsparningsspår 6"
+msgstr "Läs in snabbsparningsplats 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
-msgstr "Läs in snabbsparningsspår 7"
+msgstr "Läs in snabbsparningsplats 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
-msgstr "Läs in snabbsparningsspår 8"
+msgstr "Läs in snabbsparningsplats 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr "Läs in snabbsparningsspår 9"
+msgstr "Läs in snabbsparningsplats 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Läs in snabbsparning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Läs in Wii-systemmeny"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Läs in Wii-systemmeny %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Läser in anpassade texturer från User/Load/Textures/<spel_id>/\n"
+"Läser in anpassade texturer från User/Load/Textures/<spel-id>/.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Läs in föregående värden från hackmönster som är tillgängliga."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr "Ladda från vald plats"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr "Läs in snabbsparning från vald plats"
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr "Laddade %d giltiga funktioner, ignorerade %d ogiltiga funktioner."
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr "Localhost"
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Logg"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Loggkonfiguration"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "Logga FPS till fil"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Loggtyper"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Logga antalet renderade bildrutor per sekund till User/Logs/fps.txt. Använd "
-"denna funktion när du vill mäta Dolphins prestanda.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
-msgstr "Loggningsutgångar"
+msgstr "Loggningsutdata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Loggning"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Förlorade anslutning till server!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M-knapp"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
-msgstr ""
-"MD5 misspassar\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
+msgstr "MD5-kontrollsumma:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "Hastighetshack för MMU"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark-filer (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Huvudspak"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "Skapare"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Skapar-ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Skapare:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3659,29 +3741,33 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Minneskortet har redan en sparning för denna titel"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr "Kan leda till prestandaproblem i Wii-menyn och vissa spel."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr "Minneskortet har redan en sparning för denna titel."
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
-msgstr "Minneskort är redan öppnat"
+msgstr "Minneskortet har redan öppnats"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Minnesbyte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Minneskort"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3689,7 +3775,7 @@ msgstr ""
 "Minneskorthanterare - VARNING: Gör en säkerhetskopiering innan du använder "
 "detta, bör fungera men kan fördärva saker!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3699,44 +3785,59 @@ msgid ""
 "%s\n"
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
-"Minneskortsfilnamn i spår %c är ogiltig\n"
-"Regionen är inte specifierad\n"
+"Minneskortets filnamn i plats %c är ogiltig\n"
+"Regionen är inte specificerad\n"
 "\n"
-"Sökvägen för spåret %c ändrades till\n"
+"Sökvägen för platsen %c ändrades till\n"
 "%s\n"
 "Vill du kopiera den gamla filen till denna nya plats?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr "MemoryCard: ClearBlock anropades med ogiltig adress %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr "MemoryCard: Read anropades med ogiltig källadress, %x"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr "MemoryCard: Write anropades med ogiltig destinationsadress, %x"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "Minneskortets filstorlek stämmer inte överens med headerstorleken"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Meny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Övrigt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Övriga inställningar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Redigerare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3748,20 +3849,24 @@ msgstr ""
 "\n"
 "Om du är säker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr "Monoskopiska skuggor"
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Teckensnitt med fast teckenbredd"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3780,682 +3885,638 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Multiplicera"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
-msgstr "OBS: Strömningsstorlek stämmer inte överens med aktuell datalängd\n"
+msgstr ""
+"OBS: Strömningsstorleken stämmer inte överens med den faktiska datalängden\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Plus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Börja"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Dividering"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Ned"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Lika med"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Vänster"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiplicering"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Höger"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Avskiljare"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Mellanslag"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Minus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tabb"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Upp"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "Namn:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "Namn:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Ursprungliga GCI-filer (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "Nederländerna"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr "Nätspelet har desynkroniserats. Det går inte att fixa detta."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Ny sökning"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Nästa sökning"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Smeknamn:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Inget land (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Inga ISOs eller WADS hittades"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Inget utdata för ljud"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Ingen bannerfil hittades för titeln \"%s\""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Ingen beskrivning tillgänglig"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Ingen dockning"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "Ingen fil lästes in"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Inga fria ingångar till mappindex"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr "Inga lediga platser för mappar."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Ingen inspelad fil"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Ingen sparningsmapp hittades för titeln %s"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
+"Ingen undo.dtm hittades, avbryter ångring av snabbsparningsinläsning för att "
+"förhindra att inspelningen desynkroniseras"
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Ingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norsk bokmål"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Inte samma"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Inte angiven"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "Varken en Wii-sparning eller ett läsningsfel för headerfilstorleken %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Anteckningar"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Anteckningar:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Meddelande"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Antal koder:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuk-acceleration"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr "Nunchuk-spak"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Räckvidd för objekt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Av"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
-msgstr "Visningsmeddelanden på skärmen"
+msgstr "Skärmmeddelanden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "&Dokumentation online "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Endast %d block tillgängliga"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Öppna"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "Öppna &sökvägsmappen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Öppnar sparningsmappen för Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Öppna fil..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: kan inte skapa sammanhang för utrustningen %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: kan inte hitta någon ljudutrustning"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: kan inte öppna enheten %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL-texturdekodare"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP-texturdekodare"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
-"Öppnar standardkonfigurationen (skrivskyddat) för detta spel i en extern "
+"Öppnar standardkonfigurationen (skrivskyddad) för detta spel i en extern "
 "textredigerare."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr "Öppnar användarens specifika upphävanden i en extern textredigerare."
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
-msgstr "Inställningar"
+msgstr "Alternativ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Orange"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
-"Filsorteringen i filmappen stämmer inte överens med blocksorteringen\n"
+"Filsorteringen i filkatalogen stämmer inte överens med blocksorteringen\n"
 "Högerklicka och exportera alla sparningar,\n"
 "och importera alla sparningar till ett nytt minneskort\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Övrigt"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"En annan klient bröt anslutningen under tiden spelet kördes!! Nätspel är "
-"inaktiverat. Du stoppar spelet manuellt."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Utdata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
 msgstr "Spe&la upp inspelning..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Kontroll"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Kontroll"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Kontroller"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parametrar"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Partition %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "Partition finns inte: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Patcher"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Sökvägar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Pausa vid slutet av film"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr "Pausa vid slutet av inspelningar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr "Pausa när fokus förloras"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr "Pausar emulatorn när emulationsfönstret förlorar fokus."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Ljus per bildpunkt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Perfekt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektiv %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "Plattform"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Spela"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Spela upp inspelning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Spela/Pausa"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Spelbar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Uppspelningsalternativ"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Spelare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Var god bekräfta..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Var god skapa ett perspektiv innan du sparar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polska"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr "Port %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Port 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Port 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Port 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Port 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portugisiska"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisiska (brasiliansk)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
-msgstr "Efterprocesseringseffekt:"
+msgstr "Efterbehandlingseffekt:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr "Ladda anpassade texturer i förhand"
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr "För tidigt filmslut i PlayController. %u + 8 > %u"
+msgstr "Tidigt inspelningsslut i PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr "För tidigt filmslut i PlayWiimote. %u + %d > %u"
+msgstr "Tidigt inspelningsslut i PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr "För tidigt filmslut i PlayWiimote. %u > %u"
+msgstr "Tidigt inspelningsslut i PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Snabbväljare:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Föreg. sida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Föregående värde"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Skriv ut"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Töm cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr "Lägg BIOS-ROM i User/GC/{region}."
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Fråga"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Avsluta"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R-knapp"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RYSSLAND"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "Radie"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Räckvidd"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "Skrivskyddat läge"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Riktig"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "Riktig balansbräda"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Riktig Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
-msgstr "Verkliga Wiimotes"
+msgstr "Riktiga Wiimotes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Spela in"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Inspelningsinmatning"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Inspelningsinformation"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
-msgstr "Inspelningsinställningar"
+msgstr "Inspelningsalternativ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Röd"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Röd vänster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Röd höger"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"Reducerar mängden kantutjämningen som orsakas av rastrerad 3D-grafik.\n"
-"Detta låter den renderande bilden se mindre blockliknande.\n"
-"Sänker emulatorhastigheten kraftigt och kan ibland orsaka fel.\n"
-"\n"
-"Om du är osäker kan du välja Ingen."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Uppdatera lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "Uppdatera spellista"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "Region"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Ta bort"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4465,243 +4526,320 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Rendera till huvudfönstret"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr "Rendering"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr "Rapport: GCIFolder skriver till oallokerat block %x"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Återställ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Resultat"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr "Försök igen"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "Revision:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "Revision: %s"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Höger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Höger spak"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "Höger spak"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Vibration"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr ""
-"Kör DSP LLE på en tillägnad tråd (rekommenderas inte; kan orsaka frysningar)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "Ryssland"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Ryska"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "Spa&ra snabbsparning"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Säker"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Spara"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "Spara GCI som..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "Spara äldsta snabbsparning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Spara snabbsparning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
-msgstr "Spara snabbsparningsspår 1"
+msgstr "Spara snabbsparningsplats 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
-msgstr "Spara snabbsparningsspår 10"
+msgstr "Spara snabbsparningsplats 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
-msgstr "Spara snabbsparningsspår 2"
+msgstr "Spara snabbsparningsplats 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
-msgstr "Spara snabbsparningsspår 3"
+msgstr "Spara snabbsparningsplats 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
-msgstr "Spara snabbsparningsspår 4"
+msgstr "Spara snabbsparningsplats 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
-msgstr "Spara snabbsparningsspår 5"
+msgstr "Spara snabbsparningsplats 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
-msgstr "Spara snabbsparningsspår 6"
+msgstr "Spara snabbsparningsplats 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
-msgstr "Spara snabbsparningsspår 7"
+msgstr "Spara snabbsparningsplats 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
-msgstr "Spara snabbsparningsspår 8"
+msgstr "Spara snabbsparningsplats 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
-msgstr "Spara snabbsparningsspår 9"
+msgstr "Spara snabbsparningsplats 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Spara snabbsparning..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "Spara komprimerad GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Spara aktuellt perspektiv"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "Spara avkomprimerad GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr "Snabbspara på vald plats"
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr "Spara på vald plats"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr "Sparas till /Wii/sd.raw (standardstorleken är 128 MiB)"
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
-msgstr "Snabbsparningens film %s är korrupt. Filminspelningen stoppas..."
+msgstr "Snabbsparningsinspelningen %s är korrupt. Inspelningen stoppas..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Skalad EFB-kopia"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Skannar %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Skannar efter ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Skannar..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Skärmdump"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr "Kunde inte ta bild: Filen \"%s\" kunde inte öppnas (felkod %d)"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Sök"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Sökfilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Sök undermappar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
-msgstr "Spara aktuellt objekt"
+msgstr "Sök aktuellt objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Sök efter hex-värde:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Sektion %s hittades inte i SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Välj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "Välj kolumner"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr "Välj plats %i"
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr "Välj snabbsparningsplats 1"
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr "Välj snabbsparningsplats 10"
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr "Välj snabbsparningsplats 2"
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr "Välj snabbsparningsplats 3"
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr "Välj snabbsparningsplats 4"
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr "Välj snabbsparningsplats 5"
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr "Välj snabbsparningsplats 6"
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr "Välj snabbsparningsplats 7"
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr "Välj snabbsparningsplats 8"
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr "Välj snabbsparningsplats 9"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr "Välj snabbsparningsplats"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Spara inspelningsfilen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Välj en Wii WAD-fil som ska installeras"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Välj en hårdvara som ska användas.\n"
-"\n"
-"Om du är osäker kan du välja den första."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Välj en sparningsfil att importera"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Välj flytande fönster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
-msgstr "Öppna fil"
+msgstr "Öppna fil att läsa in"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Välj sparningsfilen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Välj snabbsparning att läsa in"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Välj snabbsparning att spara"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4719,274 +4857,321 @@ msgstr ""
 "\n"
 "Om du är osäker kan du välja Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Den valda kontrollprofilen finns inte"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Valt typsnitt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"Väljer en hårdvaruadapter att använda.\n"
+"\n"
+"Om du är osäker kan du välja den första."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 "Väljer visningsupplösningen i helskärmsläge.\n"
-"Detta borde alltid vara större än eller samma som den interna upplösningen. "
+"Detta bör alltid vara större än eller samma som den interna upplösningen. "
 "Påverkan på prestandan är obetydlig.\n"
 "\n"
-"Om du är osäker kan du välja ditt skrivbordsupplösning.\n"
-"Om du fortfarande är osäker kan du använda den högsta upplösningen som "
-"fungerar för dig."
+"Om du är osäker kan du välja auto."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 "Väljer vilket grafik-API som ska användas internt.\n"
-"Direct3D 9 är vanligtvis den snabbaste. OpenGL är mer noggrann. Direct3D 11 "
-"ligger någonstans mellan de båda.\n"
-"Observera att Direct3D-backend finns bara tillgängligt på Windows.\n"
+"Programvarurenderaren är extremt långsam och är därför bara användbar för "
+"att felsöka, så om du inte har en anledning att använda den bör du välja "
+"OpenGL här.\n"
 "\n"
-"Om du är osäker kan du använda Direct3D 11."
+"Om du är osäker kan du välja OpenGL."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 "Väljer vilket grafik-API som ska användas internt.\n"
-"Direct3D 9 är vanligtvis det snabbaste. OpenGL är dock mer noggrann. "
-"Direct3D 11 är någonstans mellan de båda.\n"
-"Notera att Direct3D-backends är endast tillgängliga för Windows.\n"
+"Programvarurenderaren är extremt långsam och är därför bara användbar för "
+"att felsöka, så om du inte har en anledning att använda den bör du välja "
+"antingen Direct3D eller OpenGL. Beroende på spel och GPU kan varje backend "
+"bete sig lite annorlunda, så för att få den bästa upplevelsen är det bra att "
+"prova båda och ta den som har minst problem.\n"
 "\n"
-"Om du är osäker kan du använda OpenGL."
+"Om du är osäker kan du välja OpenGL."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Skicka"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "Position för Sensor Bar:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Avskiljare"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbiska"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "Serieport 1 - Detta är porten som enheter, t.ex. nätadaptern, använder"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr "Serieport 1 - Detta är porten som enheter såsom nätadaptern använder."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "Ange som &standard-ISO"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "Ange som standardminneskort %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Indexet är större än storleken på listan över AR-koder "
 "%lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr "Ställer in GameCube-systemspråk."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+"Sätter Wii-bildläget till 60Hz (480i) istället för 50Hz (576i) för PAL-spel. "
+"Vissa spel stödjer inte detta."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr "Ställer in Wii-systemspråk."
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Anger latensen (i millisekunder). Högre värden kan reducera ljudknaster. "
-"Endast för OpenAL-backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Inställningar..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr "SetupWiiMemory: Kan inte skapa filen setting.txt"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "SetupWiiMem: Kan inte skapa inställningsfil"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "Skakning"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Kort namn:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
-msgstr "Avtyckarknappar"
+msgstr "Axelknappar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Visa kommando&tolk"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "Visa &logg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Visa &statusfält"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Visa &verktygsfält"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "Visa Australien"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Visa standardvärden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Visa drivrutiner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "Visa regioner för EFB-kopior"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
-msgstr "Visa bildrutefrekvens"
+msgstr "Visa bildfrekvens"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr "Visa bildruteräknare"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Visa Frankrike"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "Visa GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "Visa Tyskland"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Visa indata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "Visa Italien"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Visa JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Visa Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr "Visa laggräknare"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Visa språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "Visa logg&konfiguration"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "Visa Nederländerna"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "Visa PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Visa plattformar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Visa regioner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "Visa Ryssland"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "Visa Spanien"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "Visa statistik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Visa Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Visa USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "Visa okänd"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "Visa WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Visa Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr "Visa världen"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Visa en bekräftelsedialog innan ett spel stoppas."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 "Visar en meddelanderuta när ett möjligt allvarligt fel har inträffat.\n"
-"Om detta inaktiveras kan man undvika irriterande och icke-katastrofala "
-"meddelanden, men det kan även betyda att Dolphin helt plötsligt kraschar "
-"utan någon förklaring alls."
+"Om detta inaktiveras går det att undvika irriterande och icke-katastrofala "
+"meddelanden, men det kan också göra så att att allvarliga kraschar inte har "
+"någon förklaring alls."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "Visa första blocket"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Visa laggräknare"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Visa meddelanden i emulatorns fönsterområde.\n"
-"Dessa meddelanden inkluderar skrivningar till minneskortet, videobackend och "
-"processorinformation, samt rensning av JIT-cache."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Visa sparningsblock"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Visa sparningskommentar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Visa sparningsikon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Visa sparningstitel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4998,244 +5183,288 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Visa okänd"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Visa blandad statistik.\n"
+"Visar diverse renderingsstatistik.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
-msgid "Sideways Wiimote"
-msgstr "Vertikal Wiimote"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
+msgid "Sideways Wiimote"
+msgstr "Liggande Wiimote"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Storlek"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "Hoppa över BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr "Hoppa över rensning av DCBZ "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "Hoppa över tillgång till EFB från processorn"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Hoppar över GPU-synkronisering när EFB-kopior görs. Orsakar grafikproblem i "
+"ett litet antal spel.\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Snabbar en aning upp EFB för RAM-kopior genom att uppoffra "
-"emuleringsnogrannhet.\n"
-"Kan ibland även höja den visuella kvaliteten.\n"
-"Om du stöter på något fel, försök att höja nogrannheten för texturcachen "
+"Snabbar upp EFB-till-RAM-kopior en aning genom att uppoffra "
+"emuleringsnoggrannhet.\n"
+"Om du stöter på något fel, prova att höja noggrannheten för texturcachen "
 "eller inaktivera detta alternativ.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
-msgstr "Spår %i"
+msgstr "Plats %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
-msgstr "Spår A"
+msgstr "Plats A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
-msgstr "Spår B"
+msgstr "Plats B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "Ögonblicksbild"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Programrenderare"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
 "It's only useful for debugging purposes.\n"
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
-"Programvarurendering är storleksordning längsammare jämfört med att använda "
+"Programvarurendering är storleksordning långsammare jämfört med att använda "
 "andra backends.\n"
-"Den är endast användbar för avlusningssyften.\n"
+"Den är endast användbar för felsökningssyften.\n"
 "Vill du verkligen aktivera programvarurendering? Om du är osäker kan du "
 "välja 'Nej'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+"Något har gått helt fel.\n"
+"Videoinspelningen stoppas.\n"
+"Videon kommer antagligen innehålla fel."
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Ljudinställningar"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Ljudbackend %s är inte giltig."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Skapandet av ljudbuffer misslyckades: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
-msgstr "Mellanrum"
+msgstr "Mellanslag"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "Spanien"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spanska"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Högtalarvolym:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Anger upplösningen som ska renderas. En hög upplösning kommer att förbättra "
-"den visuella kvaliteten riktigt mycket, men påverkar även prestandan mycket "
-"och kan orsaka buggar på en del spel.\n"
-"\"Multiplicerat av 640x528\" är lite långsammare än \"Fönsterstorlek\" men "
-"orsakar mindre fel. Generellt sett, ju lägre den interna upplösningen är, "
-"desto högre kommer din prestanda bli.\n"
+"Anger upplösningen som används för att rendera. En hög upplösning förbättrar "
+"den visuella kvaliteten riktigt mycket, men påverkar även GPU-prestandan "
+"mycket och kan orsaka buggar i en del spel.\n"
+"\"Multipel av 640x528\" är lite långsammare än \"Fönsterstorlek\" men "
+"orsakar mindre fel. Generellt sett blir prestandan högre ju lägre den den "
+"interna upplösningen är.\n"
 "\n"
 "Om du är osäker kan du välja 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "Snabba upp disköverförningshastigheten"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Fyrkantsspak"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
+"Delar upp CPU- och GPU-trådarna så de kan köras på separata kärnor.\n"
+"Detta förbättrar prestandan mycket på de flesta moderna datorer, men kan "
+"även leda till krascher/buggar ibland."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Standardkontroll"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "Starta &nätspel"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
 msgstr "Starta &inspelning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Starta inspelning"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Snabbsparning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Snabbsparningar"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Ratt"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr "Läge för stereoskopisk 3D:"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr "Stereoskopi"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Spak"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Stoppa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
-msgstr ""
-"Lagrar EFB-kopior i grafikprocessors texturobjekt.\n"
-"Den är inte speciellt noggrann, men den fungerar tillräckligt bra med de "
-"flesta spelen och ger en bra prestanda jämfört med EFB till RAM.\n"
-"\n"
-"Om du är osäker kan du lämna detta markerat."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
+msgstr "Lagra EFB-kopior endast i texturer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Sträck ut till fönster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Slagskena"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
-msgstr "Subtrahera"
+msgstr "Minus"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
-msgstr "Lyckades exportera fil till %s"
+msgstr "Exporterade filen till %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
-msgstr "Lyckades importera sparningsfiler"
+msgstr "Importerade sparningsfiler"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "Svenska"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr "Exporterade %u sparningar till %s"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr "Byt plats på ögon"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Svängning "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "Synkronisera grafikprocessortråd"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
@@ -5244,81 +5473,112 @@ msgstr ""
 "slumpartade frysningar när läget \"Dubbla kärnor\" används. (PÅ = "
 "kompatibel, AV = snabb)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr "Syntaxfel"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Systemspråk:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
-msgstr "TAS-indata"
+msgstr "TAS-inmatning"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr "TAS-inmatning - Kontroll %d"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr "TAS-inmatning - Wiimote %d"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tabb"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tabbdelning"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tabell vänster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tabell höger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Ta en skärmdump"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
-msgstr "TaruKonga (Bongos)"
+msgstr "TaruKonga (Bongotrummor)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Textur"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "Texturcache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Överlägg för texturformat"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD har installerats utan problem."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Adressen är ogiltig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Kontrollsumman fixades utan problem"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr "Kontrollsumman fixades utan problem."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Valda filkatalogen finns redan i listan"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr "Den valda mappen finns redan i listan."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+"Skivan \"%s\" är korrupt.\n"
+"Kontrollsumman av blocket %<%PRIu64> är %08x istället för %08x."
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5327,7 +5587,7 @@ msgstr ""
 "Filen %s finns redan.\n"
 "Vill du ersätta den?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5336,45 +5596,33 @@ msgstr ""
 "Filen %s kunde inte öppnas för skrivning. Var god kontrollera om den redan "
 "är öppnad i ett annat program."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Filen %s var redan öppen, headerfilen kommer inte att skrivas."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
-#, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Filen du valde (%s) finns inte"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
 msgstr "Namnet kan inte vara tomt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
 msgstr "Namnet kan inte innehålla tecknet ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/Core/Movie.cpp:184
+#, c-format
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr "Det inspelade spelet (%s) är inte samma som det valda spelet (%s)"
+
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Den resulterande dekrypterade AR-koden innehåller inga rader."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
-msgstr ""
-"Ju säkrare du justerar detta, desto mindre sannorlikhet kommer emulatorn "
-"missa texturuppdateringar från RAM.\n"
-"\n"
-"Om du är osäker kan du använda värdet längst till höger."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
+msgstr "Sparfilen du försöker kopiera har en ogiltig storlek."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Sparningen du försöker kopiera har en ogiltig filstorlek"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5382,44 +5630,59 @@ msgstr ""
 "Det valda språket stöds inte av ditt system. Ändrar tillbaka till "
 "systemstandard."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Serverns och klientens nätspelsversioner är inkompatibla!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Servern är full"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Servern svarade: Spelet körs för tillfället!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Servern skickade ett okänt felmeddelande!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Den valda filen \"%s\" finns inte"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Värdet är ogiltigt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+"Det finns för många GCI-filer i mappen\n"
+"%s\n"
+"Bara de första 127 kommer vara tillgängliga."
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr "Det finns inget att ångra!"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 "Det måste finnas en biljett för 00000001/00000002. Din nanddump är "
-"förmodlingen ofullständig."
+"förmodligen ofullständig."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5427,7 +5690,7 @@ msgstr ""
 "Dessa inställningar upphäver Dolphins kärninställningar.\n"
 "'Undetermined' betyder att spelet använder Dolphins inställningar."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5435,124 +5698,178 @@ msgstr ""
 "Denna Action Replay-simulator stödjer inte koder som ändrar Action Replay "
 "själv."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Detta kan orsaka fartminskningar i Wii-menyn och vissa spel."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Denna funktion låter sig ändra spelets kamera.\n"
-"Flytta musen medan du håller ned den högra musknappen för att panorera och "
-"håll ned mittenknappen för att flytta.\n"
-"Håll ned SHIFT och använd tangenterna WASD för att flytta kameran ett visst "
-"avstånd (SHIFT+0 för att flytta snabbare och SHIFT+9 för att flytta "
-"långsammare). Tryck SHIFT+R för att återställa kameran.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"Detta begränsar spelets hastighet till ett angivet antal bildrutor per "
-"sekund (full hastighet är 60 för NTSC och 50 för PAL). Annars kan du välja "
-"Ljud för att strypa användningen av DSP (kan fixa ljudklickningar men kan "
-"även orsaka konstant brus beroende på spelet)."
+"Den här mjukvaran kan vara inkompatibel med DSP-HLE-emulering. Prova att "
+"använda LLE om det här är homebrew.\n"
+"\n"
+"DSPHLE: Okänd µcode (CRC = %08x) - AX kommer användas."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Detta delar upp video- och processortrådarna så de kan köras på separata "
-"kärnor.\n"
-"Detta orsakar stora förbättringar på datorer med mer än en kärna, men kan "
-"även orsaka en del kraschar/buggar."
+"Den här mjukvaran kan vara inkompatibel med DSP-HLE-emulering. Prova att "
+"använda LLE om det här är homebrew.\n"
+"\n"
+"DSPHLE: Okänd µcode (CRC = %08x) - AXWii kommer användas."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "Detta låter redigera INI-kofigueringsfilen manuellt"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
+"Det här värdet adderas med konvergensvärdet som har ställts in i "
+"grafikkonfigurationen."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+"Det här värdet multipliceras med djupet som har ställts in i "
+"grafikkonfigurationen."
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+"Den här versionen av Dolphin har laddats ner från en webbplats som tar "
+"pengar från emulatorns utvecklare. Dolphin bör laddas ner från den "
+"officiella hemsidan istället: https://dolphin-emu.org/"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr "Detta låter dig redigera INI-kofigueringsfilen manuellt."
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Tröskel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Lutning"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Titel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "till"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Markera/avmarkera alla loggtyper"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "Slå på/av bildförhållande"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "Slå på/av EFB-kopior"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "Slå på/av dimma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-msgid "Toggle Fullscreen"
-msgstr "Skifta mellan helskärm- och fönsterläge"
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
+msgid "Toggle Fullscreen"
+msgstr "Växla mellan helskärm- och fönsterläge"
+
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "Slå på/av IR"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Ovan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Traditionell kinesiska"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr "Försökte dekryptera data från en annan volymtyp än Wii-skiva"
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
-msgstr "Försökte installera en okänd filtyp."
+msgstr "Försökte läsa in en okänd filtyp."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
-msgstr "Axelknappar"
+msgstr "Avtryckare"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr "Försöker skapa ett ogiltigt minneskortsindex."
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Försöker att läsa från ogiltig SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5560,41 +5877,24 @@ msgstr ""
 "Försöker att läsa från ogiltig SYSCONF\n"
 "Wiimote bt ids är inte tillgänglig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turkiska"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Skivspelare"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Typ"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP-port:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "OKÄND"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "OKÄND_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5602,231 +5902,218 @@ msgstr ""
 "Det gick inte att skapa patch från de angivna värdena.\n"
 "Ingången ändrades inte."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Det gick inte att tolka rad %lu i AR-koden som en giltig kryperad eller "
-"dekrypterad kod. Se till att den är riktigt skriven.\n"
+"Det gick inte att tolka rad %u i den angivna AR-koden som en giltig "
+"krypterad eller dekrypterad kod. Se till att du har skrivit in den rätt.\n"
 "Vill du ignorera denna rad och fortsätta tolka resten?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Odefinerad %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Ångra inläsning av snabbsparning"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Ångra snabbsparning"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
-msgstr "Oväntat 0x80-anrop? Avbryter..."
+msgstr "Oväntat anrop av 0x80? Avbryter..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Okänd"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Okänt DVD-kommando %08x - katastrofalt fel"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Okänd kommando 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Okänd tillträdestyp %i i SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr "Okänt fel %x"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr "Okänt minneskortsfel"
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Tog emot ett okänt meddelande med id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Ett okänt meddelande togs emot med ID:%d från spelare:%d Sparkar spelare!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr "Inofficiell version upptäckt"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Upp"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Uppdatera"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
-msgstr "Upprätt Wiimote"
+msgstr "Stående Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "Använd EuRGB60-läge (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Använd helskärm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "Använd hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "Använd PAL60-läge (EuRGB60)"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Använd panikhanterare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Använd en mindre exakt algoritm för att beräkna djupvärden.\n"
-"Orsakar fel i några spel med kan ge en hyfsad prestandaacceleration.\n"
+"Använder en mindre exakt algoritm för att beräkna djupvärden.\n"
+"Orsakar fel i några fel, men kan ge en hyfsad prestandaacceleration beroende "
+"på spel och GPU.\n"
 "\n"
 "Om du är osäker kan du lämna detta markerat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
-"Använd flera trådar för att dekodra texturer.\n"
-"Kan resultera i en hastighetsökning (speciellt på processorer med fler än "
-"två kärnor).\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
+"Gör så att båda ögon använder samma djupbuffert. Vissa spel kräver detta."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Använder osäkra åtgärder för att snabba upp hörnströmning i OpenGL. Det "
-"finns inga kända problem på stödjande grafikprocessorer, men det kan annars "
-"orsaka allvarlig stabilitet och grafikproblem."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Ett felmeddelande visas vanligtvis om skuggningskompileringen misslyckas.\n"
-"Hur som helst, man kan hoppa över dialogrutorna för att undvika avbrott "
-"under spelets gång genom att markera detta alternativ.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Hjälpprogram"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "V-synk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "Hastighetshack för VBeam"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Värde"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Värde:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Värde: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "Diverse statistik"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "Avlusningsnivå"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "Hörnströmningshack"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Video"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Volym"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr "Volym ned"
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr "Volym av/på"
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr "Volym upp"
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD-installation misslyckades: Ett fel uppstod när %s skulle skapas"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 "WAD-installation misslyckades: Ett fel uppstod när biljett skulle skapas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Vänta på vertikala tomrum för att reducera screen tearing.\n"
+"Väntar på vertikala tomrum för att reducera screen tearing.\n"
 "Sänker prestandan om emulatorns hastighet är under 100 %.\n"
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Varning"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Varning - startar DOL i fel konsolläge!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Varning - startar ELF i fel konsolläge!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Varning - startar ISO i fel konsolläge!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr "Varning: Antalet BAT-block %d matchar inte den laddade filheadern %d"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5838,7 +6125,7 @@ msgstr ""
 "%s\n"
 "Vill du fortsätta?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5851,31 +6138,42 @@ msgstr ""
 "och har samma namn som en fil på ditt minneskort\n"
 "Vill du fortsätta?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
 "%u > %u) (frame %u > %u). You should load another save before continuing, or "
 "load this state with read-only mode off."
 msgstr ""
-"Varning: Du läste in en sparning som är efter den aktuella filmen. (byte %u "
-"> %u) (bildruta %u > %u). Du borde läsa in en annan sparning innan du "
-"fortsätter, eller läsa in denna snabbsparning med skrivskyddat läge "
+"Varning: Du läste in en sparning som är efter den aktuella inspelningen. "
+"(byte %u > %u) (bildruta %u > %u). Du borde läsa in en annan sparning innan "
+"du fortsätter, eller läsa in denna snabbsparning med skrivskyddat läge "
 "inaktiverat."
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+"Varning: Du läste in en sparning vars inspelning slutar före den nuvarande "
+"bildrutan i sparningensom är efter den aktuella inspelningen (byte %u < %u) "
+"(bildruta %u < %u). Du bör läsa in en annan sparning innan du fortsätter."
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
 "should load another save before continuing, or load this state with read-"
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
-"Varning: Du läste in en sparning, vars film misspassar på byte %d (0x%X). Du "
-"bör läsa in en annan sparning innan du fortsätter, eller läsa in denna "
-"snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
+"Varning: Du läste in en sparning vars inspelning inte matchar på byte %d (0x"
+"%X). Du bör läsa in en annan sparning innan du fortsätter, eller läsa in "
+"denna snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
 "desynkronisering."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5893,194 +6191,184 @@ msgid ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
-"Varning: Du läste in en sparning, vars film misspassar på bildrutan %d. Du "
-"bör läsa in en annan sparning innan du fortsätter, eller läsa in denna "
-"snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
+"Varning: Du läste in en sparning vars inspelning inte matchar på bildrutan "
+"%d. Du bör läsa in en annan sparning innan du fortsätter, eller läsa in "
+"denna snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
 "desynkronisering.\n"
 "\n"
-"Mer information: Den aktuella filmen är %d bildrutor lång och "
-"snabbsparningens film är %d bildrutor lång.\n"
+"Mer information: Den aktuella inspelningen är %d bildrutor lång och "
+"snabbsparningens inspelning är %d bildrutor lång.\n"
 "\n"
-"På bildrutan %d trycker den aktuella filmen:\n"
+"På bildrutan %d trycker den aktuella inspelningen på:\n"
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
 "\n"
-"På bildrutan %d, trycker snabbsparningens film:\n"
+"På bildrutan %d trycker snabbsparningens inspelning på:\n"
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fil är inte öppen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Svajarm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Bredbildshack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Bredd"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii-konsol"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
-msgstr "Wii nandrot:"
+msgstr "Wii-nandrot:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii-sparningsfiler (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Kunde inte läsa från fil"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote "
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wiimote %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote ansluten"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote-motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Inställningar för Wiimote"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Fönster vänster"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Fönstermeny"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Fönster höger"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Radbytning"
+msgstr "Radbrytning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Arbetar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr "Världen"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "Skriv minneskort (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
-msgstr "Skriv till kommandotolk"
+msgstr "Skriv till konsol"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Skriv till debuggaren"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Skriv till fil"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Skriv till fönster"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice misslyckades: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "Initiering av XAudio2 misslyckades: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr "XF-register "
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Misslyckades att skapa mästarröst för XAudio2: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF-register"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Gul"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"Du använder en kostnadsfri DSP-ROM som har skapats av Dolphin-teamet.\n"
-"Alla Wii-spel och de flesta GameCube-spelen kommer att fungera som de ska, "
-"men GBA/IPL/CARD UCodes kommer inte att fungera.\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Du använder gamla kostnadsfria DPS-roms som har skapats av Dolphin-teamet.\n"
-"Endast spel som använder Zelda Ucode kommer att fungera korrekt.\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Du kan inte stänga paneler som har sidor inuti sig."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Du måste välja ett spel!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
+"Du har ändrat storlek på fönstret medan video dumpades.\n"
+"Det går inte att hantera detta på ett korrekt sätt.\n"
+"Videon kommer antagligen innehålla fel."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Du måste ange ett namn!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "Du måste välja ett spel!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "Du måste skriva in ett namn."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Du måste ange en giltig decimal, hexadecimal eller oktalt värde."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Du måste ange ett giltigt profilnamn."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Du måste starta om Dolphin för att ändringarna ska träda i kraft."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -6090,7 +6378,7 @@ msgstr ""
 "Vill du stoppa nu för att fixa problemet?\n"
 "Om du väljer \"nej\" kan ljudet bli förvrängt."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -6098,36 +6386,36 @@ msgstr ""
 "Din GCM/ISO-fil verkar vara ogiltig (ogiltigt land).\n"
 "Vill du fortsätta med PAL-regionen?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "Din SYSCONF-fil är i fel storlek.\n"
-"Den borde vara 0x%04x (but is 0x%04llx)\n"
+"Den borde vara 0x%04x (men är 0x%04<PRIx64>)\n"
 "Vill du generera en ny?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP-hack"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3-kod stöds inte"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero-kod okänd för Dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr "Nollkod som är okänd för Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ väntar ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6139,77 +6427,30 @@ msgstr ""
 "\n"
 "Om du är osäker kan du lämna detta omarkerat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Anpassad]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTELL]\n"
-"Siktar mot att snabba upp emulatorn genom att lasta av texturdekodningar "
-"till grafikprocessorn med hjälp av OpenCL-strukturen.\n"
-"Hur som helst, för tillfället är denna funktion känd för att orsaka "
-"texturfel i en del spel. Den är även långsammare än vanliga "
-"texturdekodningar till processorn i de flesta fall.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[EXPERIMENTELL]\n"
-"Snabbar upp emulatorn lite grann genom att cacha visningslistan.\n"
-"Kan möjligtvis orsaka fel.\n"
-"\n"
-"Om du är osäker kan du lämna detta omarkerat."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Läser opkod från %x. Var god rapportera detta."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "auto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr "fake-completion"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "ingen"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "okänd funktion %d (förväntade %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "fick ett okänt meddelande"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returnerade -1 i applikationkörningen!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar-korrektion: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear-korrektion: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| ELLER"
diff --git a/Languages/po/tr.po b/Languages/po/tr.po
index 3fd31ca59c..0ecf1d43fb 100644
--- a/Languages/po/tr.po
+++ b/Languages/po/tr.po
@@ -1,17 +1,18 @@
-# Translation of dolphin-emu.pot to Turkish
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# mustafacan <m.can.elmaci@gmail.com>, 2013
+# Mustafa Can <m.can.elmaci@gmail.com>, 2013-2015
 # nlgzrgn <nlgzrgn@live.com>, 2011
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-12 05:20+0000\n"
-"Last-Translator: mustafacan <m.can.elmaci@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/tr/)\n"
 "Language: tr\n"
@@ -20,21 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
-msgid " (too many to display)"
-msgstr "(Göstermek için çok fazla)"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
+msgid " (too many to display)"
+msgstr "(göstermek için çok fazla öğe var)"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr "Oyun :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
-msgstr "! YOK"
+msgstr "! DEĞİL"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,45 +56,94 @@ msgstr ""
 "\"%s\" bulunamadı.\n"
 "16MB'lık yeni bir hafıza kartı oluşturulsun mu?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
-"\"%s\" hatalı bir GCM veya ISO dosyası, veya herhangi bir GC veya Wii kalıbı "
-"değil."
+"\"%s\" hatalı bir GCM/ISO dosyası, veya herhangi bir GC/Wii ISO kalıbı değil."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopyala%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
-msgstr ""
+msgstr "%d örnekler"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
+msgstr "%d örnekler (kalite seviyesi %d)"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s zaten var, üzerine yazılsın mı?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s küçültülemedi. Kalıp dosyası bozuk olabilir."
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -90,7 +152,7 @@ msgstr ""
 "%s hafıza kart dosyası olarak yüklenemedi \n"
 "Kart dosyası boyutu hatalı (0x%x bayt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -99,7 +161,7 @@ msgstr ""
 "%s hafıza kartı olarak yüklenemedi \n"
 "Kart boyutu hatalı (0x%x bayt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -108,360 +170,339 @@ msgstr ""
 "%s hafıza kartı olarak yüklenemedi. \n"
 "Dosya geçerli bir hafıza kartı dosyası olabilmek için çok küçük (0x%x bayt)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "%s açılamadı"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s başarısız: kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s dosyasının boyutu 0 bayt'tır."
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s zaten sıkıştırılmış! Tekrar sıkıştırmayı denemeyin!"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s adı çok uzun, izin verilen en fazla 45 karakterdir."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSil%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
-msgstr "%sGCI Ver%s"
+msgstr "%sGCI ver%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
-msgstr "%sGCI Al%s"
+msgstr "%sGCI al%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Boş Blok; %u Boş Dizin Girişi"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& VE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
-msgstr "Hakkında... (&A)"
+msgstr "&Hakkında..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "DVD Sürücüden Önyükle... (&B)"
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
-msgstr "Kesme noktaları (&B)"
+msgstr "&Kesme Noktaları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
-msgstr "Kalıplara Gözat... (&B)"
+msgstr "Kalıplara &Gözat... "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "Hile Yöneti&cisi"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "Ses Ayarları (&D)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
-msgstr "Kalıbı Sil... (&D)"
+msgstr "Kalıbı &Sil... "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
-msgstr "Seçilen Kalıpları Sil... (&D)"
+msgstr "Seçilen Kalıpları &Sil... "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "&Emülasyon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
-msgstr "Dosya (&F)"
+msgstr "&Dosya"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
-msgstr "Gelişmiş Kareleme (&F)"
+msgstr "Gelişmiş &Kareleme"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
-msgstr "Tam Ekran (&F)"
+msgstr "&Tam Ekran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
-msgstr "&Görüntü Ayarları"
+msgstr "&Grafik Ayarları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
-msgstr "Yardım (&H)"
+msgstr "&Yardım"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
-msgstr "Tuş ayarları (&H)"
+msgstr "&Kısayol Ayarları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
-msgstr "Durumu Yük&le"
+msgstr "Durumu &Yükle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
-msgstr "GC Hafıza Kartı Yönetici (&M)"
+msgstr "&Hafıza Kartı Yöneticisi (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
-msgstr "Hafıza (&M)"
+msgstr "&Hafıza "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
-msgstr "Aç...(&O)"
+msgstr "&Aç..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
-msgstr "Seçenekler (&O)"
+msgstr "&Seçenekler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
-msgstr "Duraklat (&P)"
+msgstr "&Duraklat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
-msgstr "Oynat (&P)"
+msgstr "&Oynat "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
-msgstr "Özellikler (&P)"
+msgstr "&Özellikler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "Salt okunu&r mod"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
-msgstr "Listeyi Yenile (&R)"
+msgstr "&Listeyi Yenile"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
-msgstr "Kayıtla&r"
+msgstr "&Kayıtlar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
-msgstr "Sıfı&rla"
+msgstr "&Sıfırla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "&Ses"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
-msgstr "Durdur (&S)"
+msgstr "&Durdur"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
-msgstr "Araçlar (&T)"
+msgstr "&Araçlar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
-msgstr "Görüntü (&V)"
+msgstr "&Görüntü"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
-msgstr "Görünüm (&V)"
+msgstr "&Görünüm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "&Wiimote Ayarları"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(BİLİNMEYEN)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(kapalı)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ EKLE"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "Orjinalin 1.5 katı (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
-msgstr "Orjinalin 1 katı (640x528)"
+msgstr "Orjinal (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "Orjinalin 2.5 katı (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "Orjinalin 2 katı (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "Orjinalin 3 katı (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "Orjinalin 4 katı (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 bit"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<Adı buraya ekleyin>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<Çözünürlük bulunamadı>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<Hiçbir şey>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<Tuşa Basın>"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<Sistem>"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "Bir NetPlay penceresi zaten açık!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
-msgid "A game is not currently running."
-msgstr "Bir oyun şu anda düzgün çalışmıyor."
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
-msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
+msgid "A game is not currently running."
+msgstr "Şu anda bir oyun çalışmıyor."
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
+msgid ""
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR Kodları"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "Dolphin Hakkında"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "Hızlandırma"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "Doğruluk:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"EFB kopya emülasyonunun gerçekçiliğini artırır. \n"
-"Bazı oyunlarda belirli görsel efektler için bu ayarın açık olması gerekir. \n"
-"\n"
-"Emin değilseniz, bunun yerine EFB'den Doku'ya seçeneğini işaretleyin."
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "Eylem"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -476,14 +517,14 @@ msgstr ""
 "Suçlu Kod:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 "Action Replay Hatası: Kod eklemede (%08x : adres = %08x) hatalı boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -492,16 +533,16 @@ msgstr ""
 "Action Replay Hatası: Doldurma ve kaydırmada (%08x : adres = %08x) hatalı "
 "boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
-"Action Replay Hatası: Anabellek yazma ve doldurmasında (%08x : adres = %08x) "
+"Action Replay Hatası: Ram yazma ve doldurmasında (%08x : adres = %08x) "
 "hatalı boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -510,207 +551,171 @@ msgstr ""
 "Action Replay Hatası: İşaretleyiciye yazarken (%08x : address = %08x) hatalı "
 "boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Hatası: Hafıza kopyalamada (%08x) hatalı değer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
-"Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)\n"
+"Action Replay Hatası: Ana Kod ve CCXXXXXX'e yaz kodu uygulanamadı (%s)\n"
 "Ana kodlar gerekli değil. Ana kodları kullanmayın."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Hatası: Hatalı AR kod satırı: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Şartlı Kod: Hatalı Boyut %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Hatalı Normal Kod Türü %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normal Kod %i: Hatalı alt tür %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Kod 0: Hatalı alt tür %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
-msgid "Adapter:"
-msgstr "Dönüştürücü:"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
+msgid "Adapter:"
+msgstr "Ekran kartı:"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "Ekle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
-msgstr "Action Replay Kodu Ekle"
+msgstr "ActionReplay Kodu Ekle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "Yama Ekle"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "Bölme ekle"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "Ekle..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "Adres :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"zFar Parametresine belirli bir değer ekler.\n"
-"Değişken nokta değerlerini ifade etmenin 2 yolu vardır.\n"
-"Örneğin: ''200'' veya ''0.0002'' gibi doğrudan değer girmek, eşit etki "
-"gösterir, ulaşılan değer ''0.0002'' olur.\n"
-"Değerler: (0->+/-Tam Sayı) veya (0->+/-FP[doğruluğun 6 rakamı])\n"
-"\n"
-"NOT: Ulaşılan değerler için Giriş Penceresi veya Konsolu denetleyin."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"zNear Parametresine belirli bir değer ekler.\n"
-"Değişken nokta değerlerini ifade etmenin 2 yolu vardır.\n"
-"Örneğin: ''200'' veya ''0.0002'' gibi doğrudan değer girmek, eşit etki "
-"gösterir, ulaşılan değer ''0.0002'' olur.\n"
-"Değerler: (0->+/-Tam Sayı) veya (0->+/-FP[doğruluğun 6 rakamı])\n"
-"\n"
-"NOT: Ulaşılan değerler için Giriş Penceresi veya Konsolu denetleyin."
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Düğmeleri etkinleştirmek için gerekli olan analog denetim basıncını "
 "ayarlayın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "Gelişmiş Ayarlar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "Tüm GameCube GCM Dosyaları (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "Tüm Kayıtlı Oyunlar (sav,s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "Tüm Wii kalıpları (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
-msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)"
+msgstr "Tüm sıkıştırılmış GC/Wii kalıpları (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "Tüm dosyalar (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "Analiz et"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "Açı"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "Filtreleme:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "Keskinleştirme:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "Apploader dosyadan yüklenemiyor."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "Uygula"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
-"Çerçevelerden sonra geç işleme etkisi uygula. \n"
+"Çerçeveyi bitirdikten sonra çerçeveye post-processing efekti uygula.\n"
 "\n"
-"Emin değilseniz, kapalı seçin."
+"Emin değilseniz, kapalı'yı seçin."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "Arapça"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" dosyasını silmek istiyor musunuz?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -718,56 +723,83 @@ msgstr ""
 "Bu dosyaları gerçekten silmek istiyor musunuz?\n"
 "Silindikten sonra bu dosyaları geri döndüremezsiniz!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
-"Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları "
+"Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyayı "
 "geri döndüremezsiniz!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (deneysel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
-msgid "Aspect Ratio:"
-msgstr "En-boy Oranı:"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
+msgid "Aspect Ratio:"
+msgstr "En-Boy Oranı:"
+
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "En az bir bölme açık kalmalıdır."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "Ses"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "Ses Çözücüsü:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
-msgid "AudioCommon: Error opening AO device.\n"
-msgstr "AudioCommon: AO sürücüyü açarken hata.\n"
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
+msgid "AudioCommon: Error opening AO device.\n"
+msgstr "AudioCommon: AO aygıtını açarken hata.\n"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "Otomatik"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "Otomatik (640x528'in katları)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "Otomatik (Pencere Boyutu)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "Pencere Boyutunu Otomatik Ayarla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -777,252 +809,252 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP kaydı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "Geri"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "Çözücü Ayarları"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "Çözücü:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
-msgstr "Arkaplanda Giriş"
+msgstr "Arkaplan Girişi"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "Geri"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "Kötü Dosya Başı"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "Balance Board"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "Afiş"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "Afiş Ayrıntıları"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "Afiş:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Çubuk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "Temel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "Temel Ayarlar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "Blok Ayırma Tablosu sağlaması başarısız."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "Bloklar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Mavi"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Mavi Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Mavi Sağ"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "Alt"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bağlı Denetimler: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "Bozuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
-msgstr "Gözat..."
+msgstr "Gözat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "Eklemek için bir klasöre gözat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "Bir kalıp konumu için gözat..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "Çıkış klasörü için gözat"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "Tampon:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"DCBZ işlemlerinin veri önbelleğini temizlemesini atlayın.\n"
+"\n"
+"Emin değilseniz, devre dışı bırakın."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C Çubuğu"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
-msgstr "C Çubuğu"
+msgstr "C-Çubuğu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP kaydı"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU Emülatör Motoru"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "Görüntü Listelerini Önbellekle"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel olarak "
-"hesaplar. \n"
-"Emülasyon hızını (GPU'ya bağlı olarak) biraz düşürebilir. \n"
-"Bu genelde güvenlidir, ama bazen sorunlara neden olabilir. \n"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
 "\n"
-"Emin değilseniz, işaretsiz bırakın."
+"If unsure, leave this unchecked."
+msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "Sap bağlantısı ile Wiimote bulunamadı: %02x"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata"
+msgstr "DVD_Plugin'den okunamıyor - DVD-Arabirimi : Önemli Hata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "İptal"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "%s açılamadı."
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
-"Bu dosya bir hafıza kartı olarak kullanılamıyor.\n"
-"%s\n"
-"Geçerli bir Gamecube hafıza kartı dosyası değil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"Bu dosya bir hafıza kartı olarak kullanılamıyor.\n"
-"2 slot için de aynı dosyayı deniyor olabilir misiniz?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Büyük Harf Kilidi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "Katalanca"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "Merkez"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "Değiştir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "&Diski Değiştir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "Diski Değiştir"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "Oyunu Değiştir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1030,76 +1062,63 @@ msgstr ""
 "Kullanıcı arabiriminin dilini değiştirin. \n"
 "Yeniden başlatma gerektirir."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "zFar Parametresinin işaretini değiştirir (düzeltme sonrası)"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "zNear Parametresinin işaretini değiştirir (düzeltme sonrası)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
 msgstr ""
-"Emülatör çalışırken değiştirirseniz herhangi bir etkisini göremezsiniz!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "Sohbet"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "Hile Kodu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "Hile Arama"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "Hile Yöneticisi"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "Bölüm Düzgünlüğünü Denetle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "Düzgünlük denetleniyor..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Çince (Basit)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Çince (Geleneksel)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "DVD kök dizinini seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "NAND kök dizinini seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "Varsayılan kalıbı seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "Eklemek için bir konum seçin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "Açmak için bir dosya seçin"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "Bir hafıza kartı seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1107,27 +1126,27 @@ msgstr ""
 "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere "
 "uygulanır)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "Genişletmek için bir klasör seçin"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Çember Çubuk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "Temizle"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1135,183 +1154,230 @@ msgstr ""
 "Oyun çalışırken istemci bağlantısı kesildi!! NetPlay iptal edildi. Oyunu "
 "elle durdurmalısınız."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "Kapat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
-msgstr "Yapıla&ndır"
+msgstr "Yapıla&ndırma"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "Kod Bilgisi"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "Komut"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "Yorum"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "Yorum:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "Kalıbı sıkıştır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "Seçili kalıpları sıkıştır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "Kalıp sıkıştırılıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "Yapılandırma"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "Denetimleri Yapılandır"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "Kolları Yapılandır"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "Yapılandır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
-msgstr "Dosyanın Üzerine Yazmaya İzin Ver"
+msgstr "Dosyanın Üzerine Yazmayı Onayla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
-msgstr "Durdurma Onayı İste"
+msgstr "Durdurmayı Onayla"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "Bağlan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "Balance Board Bağla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "USB Klavye Bağla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
-msgstr "Wiimote'u Bağla : %i"
+msgstr "%i. Wiimote'u Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
-msgstr "Wiimote 1'i Bağla"
+msgstr "1. Wiimote'u Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
-msgstr "Wiimote 2'yi Bağla"
+msgstr "2. Wiimote'u Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
-msgstr "Wiimote 3'ü Bağla"
+msgstr "3. Wiimote'u Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
-msgstr "Wiimote 4'ü Bağla"
+msgstr "4. Wiimote'u Bağla"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "Konsol"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Devamlı Arama"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "Denetim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "GCI'ya dönüştür"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "Kopyalama başarısız."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "Hafıza kartı %c 'ye kopyala"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "Çekirdek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "%s oluşturulamadı."
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Çözücü %s başlatılamadı."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-" \"%s\" okunamadı.  Sürücüde disk yok veya bu disk bir GC/Wii yedeği değil. "
-"Lütfen bilgisayarların çoğunun gerçek GameCube veya Wii disklerini "
-"okuyamadıklarını unutmayın."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kalıp dosyası %s tanınamadı."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "%s kaydedilemedi."
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1329,13 +1395,21 @@ msgstr ""
 "korumalı.\n"
 "\n"
 "Bunu emulatör klasörünü taşıdıktan sonra mı görüyorsunuz?\n"
-"Eğer öyleyse, ayarlardan memory card konumlarını düzeltin."
+"Eğer öyleyse, ayarlardan hafıza kartı konumlarını düzeltin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
-msgstr "Uzantı 'ini' için açma komutu bulunamadı."
+msgstr ".ini uzantısını açmak için bir komut bulunamadı."
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1343,38 +1417,46 @@ msgstr ""
 "Çekirdek başlatılamadı. \n"
 "Yapılandırmanızı denetleyin."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "Sayı:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "Ülke:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "AR Kodu Oluştur"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "Yeni perspektif oluştur"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "Oluşturan:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
-msgstr "Önemli"
+msgstr "Kritik"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "Kırp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1384,200 +1466,191 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Geçişli"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "wxFileSelector'den sonra şu anki konum %s 'den %s'ye değiştirilmiştir."
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
-"wx Dosya Seçiciden sonra şu anki konum %s 'den %s 'ye değiştirilmiştir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "Özel Görüntüleme Hilesi"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "Özel Görüntüleme Hilesi Ayarları"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Bazı ortografik projeksiyon parametrelerini özelleştir."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Çekçe"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "Yön Tuşları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "Ses"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "Ses Emülatörü Motoru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "DSP HLE Emülasyonu (Hızlı)"
+msgstr "DSP HLE emülasyonu (hızlı)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
-msgstr "DSP LLE Yorumlayıcı (Çok Yavaş)"
+msgstr "DSP LLE yorumlayıcı (yavaş)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
-msgstr "DSP LLE Yeniden Derleyici"
+msgstr "DSP LLE yeniden derleyici"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "Ses ayarları"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "Ayrı İşlem Birimi Üzerinde DSP LLE"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD Kök Dizini:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - Kritik Hata: Birimden okuma başarısız."
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - Kritik Hata: Birimden okuma başarısız."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
-msgstr ""
+msgstr "Dance Mat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "Veri Boyutu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "Tarih:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro dosyaları (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "Ölü Bölge"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "Hata ayıklama"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "Hata ayıklama"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Onluk taban"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "Kalıbı genişlet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "Seçili kalıpları genişlet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "Kalıp genişletiliyor..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-msgid "Decrease Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
+msgid "Decrease Frame limit"
+msgstr "Çerçeve Sınırını Azalt"
+
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "Varsayılan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "Varsayılan kalıp:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "Varsayılan yazı tipi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "Sil"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "Kaydı sil"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
-msgstr "'%s' dosyasını silmek istediğinizden emin misiniz?"
+msgstr "Varolan '%s' dosyasını silmek istediğinizden emin misiniz?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "Açıklama"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "Belirle"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"DVD'nin alabileceği veriden daha fazlasını sığdırma girişimi algılandı."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
-msgstr "Sürücü"
+msgstr "Aygıt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
-msgstr "Sürücü Ayarları"
+msgstr "Aygıt Ayarları"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Kadran"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "DirectX 10/11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "DirectX 9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1585,20 +1658,23 @@ msgstr ""
 "Konum doğrulama başarısız \n"
 "ve konum yedeği doğrulama da başarısız."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "İptal et"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
-msgid "Disable Destination Alpha"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
+msgid "Disable Destination Alpha"
+msgstr "Destination Alpha'yı Devre Dışı Bırak"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "Sisi İptal Et"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1607,262 +1683,218 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 "XFB emülasyonunu iptal et. \n"
-"Emülasyonu çok hızlandırır ama onlara dayanıklı oyunlarda (özellikle "
+"Emülasyonu epey hızlandırır ama XFB emülasyonu gerekli oyunlarda (özellikle "
 "homebrew uygulamalarında) önemli hatalara neden olabilir.\n"
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"EFB kopyalarının emülasyonunu iptal et. \n"
-"Bunlar genelde render-to-texture efektlerinin geç işlenmesinde kullanılır, "
-"bu ayarı açmak büyük bir hızlanma sağlar ama çoğu zaman önemli hatalara "
-"neden olabilir. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Çoğu oyunda çeşitli görsel efektler için hedef alpha geçişini atla. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "Disk Okuma Hatası"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
-msgid "Display"
-msgstr "Görüntü"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
-msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
 msgstr ""
-"Emülatör tarafından okunan girişleri göster. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
+msgid "Display"
+msgstr "Ekran"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
+msgid ""
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Böl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "Emülasyonu durdurmak istiyor musunuz?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
-msgstr "Dolby Pro Logic II dekoder"
+msgstr "Dolby Pro Logic II kod çözücüsü"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
-msgstr "Dolphin %s Görüntü Yapılandırması"
+msgstr "Dolphin %s Grafik Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin &Web Sitesi"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Taklit Wiimote Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC Kolu Yapılandırması"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Filmleri (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote Yapılandırması"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "&Google Code'da Dolphin"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
 msgstr ""
-"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak "
-"dosyalara göz atabilirsiniz..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
 msgstr ""
-"Dolphin şu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm "
-"oyunları görebilirsiniz."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin istenen işlemi gerçekleştiremedi."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "Aşağı"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "Kodları İndir (WiiRD Veritabanı)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
-msgstr "%lu kod indirildi. (%lu eklendi.)"
+msgstr "%lu kod indirildi. (%lu eklendi)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Davullar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "Kukla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "Sesi Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "EFB Hedef Dökümü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "Kareleri Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "Dokuları Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Yorumlanan çerçeveleri User/Dump/Frames içerisine bir AVI dosyası olarak "
-"kaydet. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Çözülen oyun dokularını User/Dump/Textures/<oyun id'si>/ konumuna kaydet. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"EFB kopyalarının içeriğini User/Dump/Textures içine kaydet. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Flemenkçe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
-msgstr "Çıkış (&x)"
+msgstr "&Çıkış "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB Kopyaları"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1871,59 +1903,43 @@ msgid ""
 "driver."
 msgstr ""
 "HATA: Dolphin'in bu sürümü bir TAP-Win32 sürücüsü gerektirir ve bu sürücü en "
-"azından %d.%d sürümü olmalıdır. --- Eğer Dolphin'i sürekli güncelliyorsanız, "
+"azından %d.%d sürümü olmalıdır. -- Eğer Dolphin'i sürekli güncelliyorsanız, "
 "Windows'un sürücüyü görmesi için yeniden başlatma gerekebilir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "AVRUPA"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "Erken Hafıza Güncellemeleri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "Düzen"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
-msgstr "Action Replay Kodunu Düzenle"
+msgstr "ActionReplay Kodunu Düzenle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "Yapılandırmayı Düzenle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "Yamayı Düzenle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "Şu anki perspektifi düzenle"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
-msgstr "Etki"
+msgstr "Efekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
-msgstr "Gömülü Çerçeve Tamponu"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
+msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
-msgstr "Emülasyon İşlem Birimi zaten çalışıyor."
+msgstr "Emülasyon işlemi zaten çalışıyor."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1937,7 +1953,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, bunun yerine sanal XFB emülasyonunu seçin."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1953,121 +1969,92 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "Taklit Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "Emülasyon Durumu:"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "İzin ver"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"GPU'nuz tarafından desteklenen nVidia 3D Vision teknolojisini kullanarak "
-"stereoskopik 3D efektleri açar. \n"
-"Bazı hatalara neden olabilir. \n"
-"Çalışması için tam ekran gereklidir.\n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "AR Geçmişine İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "Blok Birleşimine İzin Ver"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "Ön Belleğe İzin Ver"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "Hilelere İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "Çift Çekirdeğe İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "Çift Çekirdeğe İzin Ver (hızı artırır)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "Boşta Atlamaya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Boşta Atlamaya İzin Ver (hızı artırır)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "MMU'ya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "Progresif Taramaya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "Ekran Koruyucusuna İzin Ver"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "Hoparlör verisine izin ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "Geniş Ekrana İzin Ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
-msgstr "Geniş Çerçeveye İzin Ver"
+msgstr "Wireframe modu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
-"Filtrelemeyi etkinleştirir. \n"
-"Özellikle eğik açılı dokuların görsel kalitesini artırır. \n"
-"Oyunların çok azında bazı hatalara neden olabilir. \n"
-"\n"
-"Emin değilseniz, 1x seçin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
 msgstr ""
-"Disk erişimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı "
-"= Uyumlu)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "Sayfalara izin ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2081,7 +2068,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2093,34 +2080,25 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
-"The Legend of Zelda: Twilight Princess oyununu hızlandırır. Diğer tüm "
-"oyunlarda iptal edin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "Özel Gösterim Hilesini Etkinleştirir"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
-"5.1 surround sistemini kullanarak Dolby Pro Logic II'nin emulasyonunu "
-"etkinleştir. OSX'de kullanılamaz."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
 msgstr ""
-"5.1 surround sistemini kullanarak Dolby Pro Logic II'nin emulasyonunu "
-"etkinleştir. Sadece OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2132,7 +2110,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2140,7 +2118,11 @@ msgstr ""
 "Hafıza Yönetim Ünitesini etkinleştirir. Bazı oyunlarda gereklidir. (Açık = "
 "Uyumlu, Kapalı = Hızlı)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2150,275 +2132,263 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "Son"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "İngilizce"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "Geliştirmeler"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "Yeni perspektif için isim yazın:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Giriş %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Giriş 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "Eşit"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "Hata"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor."
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı "
-"yüklemesinden vazgeçiliyor..."
+"yüklemesi iptal ediliyor..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 "Hata: %s yazı tipleri düzgün yüklenemedi. Oyunlardaki yazılar düzgün "
-"görüntülenemeyebilir, veya oyunlar çakılabilir."
+"görüntülenemeyebilir, veya oyunlar çökebilir."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Esc"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "Özel durum işleyicisi - bellek alanı altında erişim. %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "Yürüt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "Çıkış"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "Tüm Wii Kayıtlarını Ver"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "Verme başarısız."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "Dosya Ver"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "Çekimi Ver"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "Çekimi Ver..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "Kaydı Ver"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
-msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)"
+msgstr "Wii Kayıtlı Oyununu Ver (Deneysel)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
-msgstr "Tüm Kayıtları Ver"
+msgstr "Tüm kayıtları ver"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
-msgstr "Verme başarısız."
+msgstr "Verme başarısız"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "Kaydı farklı ver..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "Uzantı"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
-msgstr "Harici Çerçeve Tamponu"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "İlave Parametre"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "İlave Parametre sadece \"Metroid: Other M\" oyununda kullanışlıdır."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "Tüm Dosyaları Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "Apploader'i Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "DOL'ü Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "Konumu Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "Dosyayı Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "Bölüntüyü Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "Tüm Dosyalar Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "Konum Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "Genişletiliyor..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO Bayt'ı"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO Oynatıcısı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANSA"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST Boyutu:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "Bağlantı başarısız!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "Kod indirme başarısız."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "%s 'ye genişletme başarısız!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"DSP ROM \t%s yüklenemedi.\n"
-"\n"
-"Bu dosya, DSP LLE'yi kullanabilmek için gereklidir.\n"
-"Telif hakkına sahip veri içerdiğinden Dolphin ile verilememektedir.\n"
-"DSPSpy kullanarak dosyayı fiziksel konsolunuzdan dökebilirsiniz.\n"
-"\n"
-"ROM dökümü gerektirmeyen DSP HLE'yi kullanabilirsiniz..\n"
-"(Bunu yapılandırma diyalogundaki \"Audio\" sekmesinden yapabilirsiniz.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "%s okunamadı"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "banner.bin okunamadı."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "bk başlığı okunamadı"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 "Kayıt verisinin %d bloğu okunamadı.\n"
 "Hafıza kartında sorun olabilir\n"
-"Dosya Konumu: %llx"
+"Dosya Konumu: %<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2426,7 +2396,7 @@ msgstr ""
 "Blok Ayırma Tablosu yedeği doğru okunamadı.\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2434,17 +2404,12 @@ msgstr ""
 "Blok Ayırma Tablosu doğru okunamadı.\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "%d dosyasından veri okunamadı."
+msgid "Failed to read data from gci file %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "%s dosyasından veri okunamadı"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2452,7 +2417,7 @@ msgstr ""
 "Konum yedeği doğru okunamadı.\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2460,11 +2425,7 @@ msgstr ""
 "Konum doğru okunamadı\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "Başlık okunamadı"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2472,50 +2433,35 @@ msgstr ""
 "Başlık doğru okunamadı\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
+#: Source/Core/DiscIO/VolumeGC.cpp:54
+msgid "Failed to read unique ID from disc image"
+msgstr "Disk kalıbının özgün ID'si okunamadı."
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
-msgid "Failed to read unique ID from disc image"
-msgstr "Disk kalıbının Unique ID'si okunamadı."
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "BT.DINF 'den SYSCONF 'a yazma başarısız."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "bkhdr yazılamadı."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "%s için başlık yazılamadı."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "Farsça"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "Hızlı"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
-msgstr ""
+msgstr "Hızlı Derinlik Hesaplaması"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz."
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2523,23 +2469,27 @@ msgstr ""
 "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, "
 "bayt %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo Oynatıcısı"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "Dosya Bilgisi"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "Dosya kod içermemektedir."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "Dosya .gci 'ye dönüştürüldü."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2547,103 +2497,102 @@ msgstr ""
 "Dosya açılamadı\n"
 "veya geçersiz bir uzantıya sahip."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
-"Dosya  \"%s\" uzantısına sahip \n"
+"Dosya \"%s\" uzantısına sahip \n"
 "doğru uzantılar .raw ve .gcp 'dir."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "Dosya bir hafıza kartı olarak tanınamadı."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "Dosya sıkıştırılmadı."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: Bilinmeyen açma modu : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "Dosya sistemi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "Sonrakini bul"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "Öncekini bul"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "İlk Blok"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "Sağlamayı Düzelt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
-msgstr "16:9 'a zorla"
+msgstr "16:9'a zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
-msgstr "4:3 'e zorla"
+msgstr "4:3'e zorla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr "Konsolu NTSC-J Olmaya Zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "Doku Filtrelemesine Zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Oyun kabul etmese de doku filtresini açar. \n"
-"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olur. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Oyunun görüntüsünü geniş ekrana uydurur. \n"
-"Bazı oyunlarda görüntü hatalarına neden olur. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"Japon ROM yazılarını kullanabilmek için emülatörü NTSC-J moduna zorlar.\n"
-"İşaretsiz bırakırsanız, Dolphin varsayılan olarak NTSC-U'yu seçecektir ve "
-"Japon oyunlarını oynarken bu ayarı etkinleştirecektir."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2651,541 +2600,577 @@ msgstr ""
 "ASCII olarak biçimlendir (NTSC\\PAL)?\n"
 "SJJS (NTSC-J) için Hayır seçin."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "İleri"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
+msgstr "İletme portu (UPnP)"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
+#, c-format
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %d results for '"
-msgstr "Bunun için %d sonuçlarını bul: '"
+msgid "Found %u save files"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
-#, c-format
-msgid "Found %x save files"
-msgstr "%x kayıt dosyası bulundu"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "Çerçeve"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "Çerçeve"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "Gelişmiş Çerçeveleme"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "Çerçeve dökümünde FFV1 kullan"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "Çerçeve Bilgisi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "Çerçeve Aralığı"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
-msgstr "Çerçeve Atlama(&K)"
+msgstr "Çerçeve &Atlama"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "Çerçeve Sınırı:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "Çekilecek Çerçeveler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "Serbest Bakış"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "Fransızca"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Perdeler"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "Buradan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "Tam Ekran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "Tam Ekran Çözünürlüğü:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
-msgstr "GCI Dosyası (*.gci)"
+msgstr "GCI Dosyası(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC Kolu"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "Oyun ID'si:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "Oyun zaten çalışıyor!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "Oyun çalışmıyor!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "Oyun bulunamadı!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "Oyuna Özel Ayarlar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "Oyun Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube kayıtlı oyun dosyası(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "GameCube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Gamecube Kolu Ayarları (&P)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "GameCube Kolu Ayarları"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko Kodları"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Gecko Kodu çalışmadı: (CT%i CST%i) (%s)\n"
-"(kötü bir kod veya türü henüz desteklenmiyor. Sys klasörüne bir codehandler."
-"bin dosyası ekleyerek Dolphin'i yeniden başlatıp, yerel kod işleyicini "
-"kullanmayı deneyebilirsiniz.)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "Genel"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "Genel Ayarlar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "Almanca"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: Ana sayfa kod liste boyutundan (%lu) daha büyük."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "Görüntü"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "Görüntü Ayarları"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "Daha Büyük"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Render-to-texture efektlerinde kullanılan doku kalitesini bayağı artırır. \n"
-"İç çözünürlüğü yükseltmek bu ayarın etkisini artırır. \n"
-"Performansı düşürüp, hatalara neden olabilir. \n"
-"\n"
-"Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Yunanca"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Yeşil"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Yeşil Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Yeşil Sağ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
-msgstr "Hack'ler"
+msgstr "Hileler"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "Başlık sağlama hatası"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "İbranice"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "Yükseklik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "Yardım"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Merhaba,\n"
-"\n"
-"Dolphin işlemcinizin SSE2 uzantı desteğine gerek duyar.\n"
-"Eğer işlemciniz desteklemiyorsa, Dolphin çalışmayacaktır.\n"
-"\n"
-"Sayanora!\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "Gizle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "Fare İşaretçisini Gizle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
-"Emülasyon penceresinin üzerine gelen fare imlecini gizler.\n"
+
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
 "\n"
-"Emin değilseniz, işaretli bırakın."
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
-msgstr "Home"
+msgstr "Ev"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "Barındırma"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "Kısayol Tuşu Yapılandırması"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
-msgstr "Tuşlar"
+msgstr "Kısayol Tuşları"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "Karışık Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: Bilinmeyen biletten veri alma denemesi: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Oyun IOS'u veya başlığı yeniden yüklemeyi denedi ve bu "
-"sizin NAND dökümünüze uyumlu değil.\n"
-"Başlık ID %016llx.\n"
-" Dolphin çakılacak gibi gözüküyor."
+"IOCTL_ES_LAUNCH: Oyun başlığı yeniden yüklemeyi denedi ve bu sizin NAND "
+"dökümünüze uyumlu değil.\n"
+"Başlık ID %016<PRIx64>.\n"
+"Dolphin çakılacak gibi gözüküyor."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - kötü durak"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL Ayarları"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "Kızılötesi"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "Kızılötesi İşaretleyici"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "Kızılötesi Hassasiyeti:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "Kalıp Ayrıntıları"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "Kalıp Konumları"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "İTALYA"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "Simge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-"Eğer işaretlenmişse, sınırlayıcı kutu kayıtları güncellenecektir. Paper "
-"Mario oyunları tarafından kullanılır."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
-msgstr "Birim değişimini yoksay"
+msgstr "Birim Değişimini Yoksay"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Herhangi bir EFB biçim değişikliğini yoksay. \n"
-"Herhangi bir olumsuz etki yaratmadan çoğu oyunda performansı artırır. Ama "
-"birkaç oyunda küçük görüntü sorunlarına neden olabilir. \n"
-"\n"
-"Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"CPU'nun EFB'den okuma ve EFB'ye yazma isteklerini reddeder. \n"
-"Bazı oyunlarda performansı artırır ama bazı oyun özelliklerini ve görsel "
-"efektleri engelleyebilir. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "Kayıt Al"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
-msgstr ""
+msgstr "Wii Kayıtlarını Al"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
-msgstr "Kayıt alma başarısız"
+msgstr "Alma başarısız"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Alınan dosya gsc uzantısına sahip\n"
-"ama başlığı düzgün değil."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "Alınan dosyanın uzunluğu hatalı."
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"Alınan dosya sav uzantısına sahip\n"
-"ama başlığı düzgün değil."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "Oyun İçi"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
-msgid "Increase Frame limit"
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
+msgid "Increase Frame limit"
+msgstr "Çerçeve Sınırını Arttır"
+
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "Bilgi"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "Bilgilendirme"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "Giriş"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Ekle"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Şifreli veya şifresiz kodu buraya ekleyin..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "SD Kart Ekle"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "Adı buraya yazın..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "WAD Kur"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "Wii Menüsüne kur"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr ""
-"Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu "
-"desteklemiyor."
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "WAD kuruluyor..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "Düzgünlük Denetleme Hatası"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "Düzgünlük denetlemesi tamamlandı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
-"Bölüntü %d için düzgünlük denetlemesi başarısız. Dökümünüz hasar görmüş veya "
-"yanlış yamanmış olabilir."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "Arabirim"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "Arabirim Ayarları"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "İç LZO Hatası - Sıkıştırma başarısız."
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3194,103 +3179,106 @@ msgstr ""
 "İç LZO Hatası - Genişletme başarısız (%d) (%li, %li) \n"
 "Durumu tekrar yüklemeyi deneyin."
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "İç LZO Hatası - lzo_init() başarısız."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "İç Çözünürlük:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "Interpreter (ÇOK yavaş)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "İntro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Yanlış boyut (%x) veya Sihirli kelime (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "Hatalı Değer!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "Hatalı bat.map veya konum girişi"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Hatalı olay türü: %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "Hatalı dosya"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"GCM 'nin içinde hatalı bir opening.bnr bulundu: \n"
-"%s\n"
-"Oyunu yeniden dökmeniz gerekebilir."
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "Hatalı çekim dosyası"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
-msgstr "Geçersiz arama parametre(ler)i (nesne seçilmedi)"
+msgstr "Geçersiz arama parametreleri (nesne seçilmedi)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Geçersiz arama dizesi (sadece düz dize uzunluğu destekleniyor)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "Hatalı durum"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPONYA"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
-msgstr "JIT derleyici (önerilir)"
+msgstr "JIT Yeniden Derleyici (önerilen)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL deneysel derleyici"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japonca"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KORE"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3300,64 +3288,75 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "Pencereyi üstte tut"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "Tuş"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Korece"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L Düğmesi"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
-msgstr "L Analog"
+msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "Dil:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "Son %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "Gecikme:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Sol Çubuk"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"Tuş belirlemek için sol tıklatın. \n"
-"Temizlemek için space'ye basın."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3367,7 +3366,7 @@ msgstr ""
 "temizlemek için orta, \n"
 "daha çok seçenek için sağ tıklatın."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3375,203 +3374,211 @@ msgstr ""
 "Daha çok seçenek için sol veya sağ, \n"
 "temizlemek için orta tıklatın."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "Daha Az"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "FPS Sınırlaması"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "Yükle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "Özel Dokuları Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
-msgstr "Son Durumu Yükle: 1"
+msgstr "Son 1. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
-msgstr "Son Durumu Yükle: 2"
+msgstr "Son 2. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
-msgstr "Son Durumu Yükle: 3"
+msgstr "Son 3. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
-msgstr "Son Durumu Yükle: 4"
+msgstr "Son 4. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
-msgstr "Son Durumu Yükle: 5"
+msgstr "Son 5. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
-msgstr "Son Durumu Yükle: 6"
+msgstr "Son 6. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
-msgstr "Son Durumu Yükle: 7"
+msgstr "Son 7. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
-msgstr "Son Durumu Yükle: 8"
+msgstr "Son 8. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
-msgstr "Durumu Yükle: 1"
+msgstr "1. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
-msgstr "Durumu Yükle: 10"
+msgstr "10. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
-msgstr "Durumu Yükle: 2"
+msgstr "2. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
-msgstr "Durumu Yükle: 3"
+msgstr "3. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
-msgstr "Durumu Yükle: 4"
+msgstr "4. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
-msgstr "Durumu Yükle: 5"
+msgstr "5. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
-msgstr "Durumu Yükle: 6"
+msgstr "6. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
-msgstr "Durumu Yükle: 7"
+msgstr "7. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
-msgstr "Durumu Yükle: 8"
+msgstr "8. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
-msgstr "Durumu Yükle: 9"
+msgstr "9. Durumu Yükle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "Durumu Yükle..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr "Wii Sistem Menüsünü Yükle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii Sistem Menüsünü Yükle %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Özel dokuları User/Load/Textures/<oyun id'si>/ konumundan yükle. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz."
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "Geçmiş"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "Geçmiş Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "FPS'yi dosyaya kaydet"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "Geçmiş Türü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını "
-"User/Logs/fps.txt dosyasına yazar. Dolphin'in performans'ını test etmek "
-"istiyorsanız bu özelliği kullanabilirsiniz.\n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "Geçmiş Çıkışı"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "Geçmiş"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "Sunucu bağlantısı kayboldu!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M Düğmesi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 eşleşmiyor\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU Hız Hilesi"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark dosyaları(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "Ana Çubuk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "Yapımcı ID'si:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "Yapımcı:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3579,38 +3586,48 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Sisi kaldırarak uzaktaki objeleri daha görünür kılar, bu sayede genel detay "
+"arttırılır.\n"
+"Sisi kaldırmak, düzgün sis emulasyonuna ihtiyaç duyan bazı oyunların "
+"çökmesine sebep olur.\n"
+"\n"
+"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "En fazla"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "Hafıza kartı bu başlık için zaten bir kayda sahip. "
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "Hafıza kartı zaten açık"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "Hafıza Baytı"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "Hafıza Kartı"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
-"Hafıza Kartı Yöneticisi Uyarısı-Kullanmadan önce yedekleme yapın, "
-"düzeltilmiş olması gerekiyor ama bozuk şeyler olabilir."
+"Hafıza Kartı Yöneticisi UYARI-Kullanmadan önce yedekleme yapın, düzeltilmiş "
+"olması gerekiyor ama bazı şeyleri bozabilir."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3627,37 +3644,52 @@ msgstr ""
 "%s\n"
 "Eski dosyaları bu yeni yere kopyalamak ister misiniz?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "Hafıza kartı dosya boyutu başlık boyutuyla eşleşmiyor"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "Mikrofon"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "En az"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "Çeşitli Ayarlar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Değiştirici"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3669,20 +3701,24 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "Boşluklu yazı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3700,925 +3736,958 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "Çarp"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "NOT: Yayın boyutu asıl veri boyutuyla eşleşmiyor.\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Ekle"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Başla"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Onluk Taban"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Sil"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Böl"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP Son"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Giriş"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Eşit"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Ev"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Yerleştir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Sol"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Çarp"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Sayfa Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Sayfa Yukarı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Sağ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Ayırıcı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Boşluk"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Çıkarma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Sekme"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Yukarı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "İsim:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "İsim:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "Doğal GCI Dosyaları(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "Yeni Tarama"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "Sonraki Tarama"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "Takma Ad :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "Ülke Yok (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "Kalıp bulunamadı"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "Ses çıkışı yok"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Başlık %s için afiş dosyası bulunamadı"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "Açıklama yok"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "Yerleştirme yok"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
-msgstr "Dosya Yüklenmedi"
+msgstr "Dosya yüklenmedi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "Boş dizin indeks girişi yok"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "Çekilmiş Dosya Yok"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "Başlık %s için kayıt klasörü bulunamadı"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "Hiçbiri"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norveççe (Bokmaal Lehçesi)"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "Eşit Değil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "Ayarlanmamış"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "Bir Wii kaydı değil veya bu başlık boyutu için okuma hatası: %x"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "Notlar"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "Notlar:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "Duyuru"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Sayı Kilidi"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "Kod Sayısı:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
-msgstr "Nunchuck"
+msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuck Hızlandırma"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "Nesne"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "Nesne Aralığı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "Kapalı"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "Uzantı:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
-msgstr ""
+msgstr "OSD Mesajları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
-msgstr "Online & Belgeler"
+msgstr "Çevrimiçi &Belgeler"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Sadece %d blok kullanılabilir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "Aç"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
-msgstr "Dosya konumunu aç (&C)"
+msgstr "Dosya &konumunu aç"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "Wii kayıt kla&sörünü aç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "Dosya aç..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
-msgstr "OpenAL: Sürücü %s için bağlam oluşturulamıyor"
+msgstr "OpenAL: Aygıt %s için bağlam oluşturulamıyor"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
-msgstr "OpenAL: Ses sürücüleri bulunamıyor"
+msgstr "OpenAL: Ses aygıtları bulunamıyor"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
-msgstr "OpenAL: Sürücü %s açılamıyor"
+msgstr "OpenAL: Aygıt %s açılamıyor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Doku Çözücü"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Doku Çözücü"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
+"Bu oyun için varsayılan (salt-okunur) konfigürasyon dosyasını harici metin "
+"düzenleyicisinde açar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "Seçenekler"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Turuncu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
-"Dosya dizinindeki sıra blok sırasıyla eşleşmiyor. \n"
+"Dosya dizinindeki sıra ile blok sırası eşleşmiyor. \n"
 "Tüm kayıtları vermek için sağ tıklatın, \n"
 "ve kayıtları yeni bir hafıza kartına alın.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "Diğer"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
+"must manually stop the game."
 msgstr ""
-"Oyun çalışırken diğer istemcinin bağlantısı kesildi!! NetPlay iptal edildi. "
-"Oyunu elle durdurmalısınız."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "Çıkış"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "Çekimi Oynat... (&L)"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "Kol"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "Kol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Kollar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Sayfa Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Sayfa Yukarı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "Parametreler"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "Bölüntü %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "Yamalar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "Yollar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "Duraklat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
-msgstr "Videonun sonunda duraklat"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "Piksel Aydınlatması"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "Mükemmel"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektif %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "Oynat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "Çekimi Oynat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "Oynat/Duraklat"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "Oynanabilir"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "Oynatma Seçenekleri"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "Oyuncular"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "Lütfen onaylayın..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "Kaydetmeden önce lütfen bir perspektif oluşturun"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Artı-Eksi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Lehçe"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "Bağ. Nok. 1:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "Bağ. Nok. 2:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "Bağ. Nok. 3:"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "Bağ. Nok. 4:"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "Bağ. Nok. :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portekizce"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portekizce (Brezilya)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
-msgstr "Geç İşleme Etkisi:"
+msgstr "Post-Processing Efekti:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "Önayarlar:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "Önceki Sayfa"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "Önceki Değer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "Yazdır"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "Özellikler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "Önbelleği Temizle"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "Soru"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "Çık"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R Düğmesi"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
-msgstr "R Analog"
+msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "Anabellek"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSYA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
-msgstr ""
+msgstr "Etki alanı"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "Aralık"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
-msgstr "Salt Okunur Mod"
+msgstr "Salt okunur mod"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "Gerçek"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
-msgstr ""
+msgstr "Gerçek Balance Board"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "Gerçek Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "Gerçek Wiimote'lar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "Çek"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "Girişi kaydet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "Çekim Bilgisi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "Çekim Seçenekleri"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Kırmızı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Kırmızı Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Kırmızı Sağ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"3D Görüntü yüzünden oluşan bozulmayı azaltır. \n"
-"Görüntünün daha kaliteli olmasını sağlar ama performansı çok düşürür.\n"
-"Emülasyon hızını çok düşürür ve bazen hatalara neden olur. \n"
-"\n"
-"Emin değilseniz, hiçbiri seçin."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "Yenile"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "Listeyi Yenile"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
-msgstr "Oyun Listesini Yenile"
+msgstr "Oyun listesini yenile"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "Kaldır"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Ekranı geniş çerçeve olarak yorumla. \n"
+"Ekranı wireframe (telkafes) olarak yorumla. \n"
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "Ana pencerede yorumla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "Sonuçlar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
+msgstr "Revizyon:"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "Sağ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Sağ Çubuk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "Gümbürtü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Rusça"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
-msgstr "Durumu Kaydet (&V)"
+msgstr "&Durumu Kaydet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "Güvenli"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "Kaydet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "GCI'yı farklı kaydet..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
-msgstr ""
+msgstr "En Eski Durumu kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "Durumu Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
-msgstr "Durumu Kaydet : 1"
+msgstr "1. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
-msgstr ""
+msgstr "10. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
-msgstr "Durumu Kaydet : 2"
+msgstr "2. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
-msgstr "Durumu Kaydet : 3"
+msgstr "3. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
-msgstr "Durumu Kaydet : 4"
+msgstr "4. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
-msgstr "Durumu Kaydet : 5"
+msgstr "5. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
-msgstr "Durumu Kaydet : 6"
+msgstr "6. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
-msgstr "Durumu Kaydet : 7"
+msgstr "7. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
-msgstr "Durumu Kaydet : 8"
+msgstr "8. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
-msgstr ""
+msgstr "9. Duruma Kaydet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "Durumu Kaydet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
-msgstr "Sıkıştırılan GCM/ISO'yu kaydet"
+msgstr "Sıkıştırılan kalıbı kaydet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "Şu anki perspektifi kaydet"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
-msgstr "Genişletilen GCM/ISO'yu kaydet"
+msgstr "Genişletilen kalıbı kaydet"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "Boyutlandırılmış EFB Kopyası"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "Taranıyor %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "Kalıplar taranıyor"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "Taranıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "Ekran Görüntüsü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Kaydırma Kilidi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "Ara"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "Arama Filtresi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "Alt Klasörleri Ara"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "Şu anki nesneyi ara"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "Hex değerini ara:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "SYSCONF içinde %s bölümü bulunamadı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "Seç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "Çekim Dosyasını Seç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "Kurmak için bir Wii WAD dosyası seçin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"Kullanmak için bir çevirici seçin. \n"
-"\n"
-"Emin değilseniz, ilkini kullanın."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "Almak için bir kayıt dosyası seçin"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "Sabit olmayan pencereyi seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "Yüklemek için dosyayı seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "Kayıt dosyasını seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "Yüklemek için durum seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "Kaydetmek için durum seçin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4632,275 +4701,295 @@ msgstr ""
 "Otomatik: Doğal en-boy oranını kullanır\n"
 "16:9'a Zorla: En-boy oranını 16:9 yapar. \n"
 "4:3'e Zorla: En-boy oranını 4:3 yapar. \n"
-"Pencereye göre: Görüntüyü pencereye göre yorumlar. \n"
+"Pencereye göre: Görüntüyü pencereye göre genişletir. \n"
 "\n"
 "Emin değilseniz, otomatik seçin."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Seçilmiş kumanda profili yok."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "Seçilen yazı tipi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"Tam ekran modunda kullanılacak olan çözünürlüğü seçin.\n"
-"Bu değer iç çözünürlükten büyük veya iç çözünürlüğün katı olmalıdır. "
-"Performansa olan etkisi ihmal edilebilir düzeydedir.\n"
-"\n"
-"Emin değilseniz, masaüstü çözünürlüğünüzü seçin.\n"
-"Hala emin değilseniz, kullanabildiğiniz en yüksek çözünürlüğü seçin."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"Hangi görüntü API'sinin kullanılacağını seçer.\n"
-"Direct3D 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. "
-"Direct3D 11 ikisinin arasıdır.\n"
-"Şunu unutmayın, Direct3D sadece Windows'da kullanılabilir.\n"
-"\n"
-"Emin değilseniz, Direct3D 11'i seçin."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
-"Hangi görüntü API'sinin kullanılacağını seçer.\n"
-"Direct3D 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. "
-"Direct3D 11 ikisinin arasıdır.\n"
-"Şunu unutmayın, Direct3D sadece Windows'da kullanılabilir.\n"
-"\n"
-"Emin değilseniz, OpenGL'yi seçin."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "Gönder"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
-msgstr "Sensör Çubuk Konumu:"
+msgstr "Sensör Çubuğu Konumu:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Bölücü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Sırpça"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
 msgstr ""
-"Seri Bağ.Nok. 1 - Bu bağlantı noktasına ağ adaptörü gibi sürücüler bağlanır"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
-msgstr "Varsayılan Kalıp Olarak Ayarla (&D)"
+msgstr "&Varsayılan Kalıp Olarak Ayarla"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
-msgstr "Varsayılan Hafıza Kartı %c olarak ayarla"
+msgstr "Varsayılan hafıza kartını %c olarak ayarla"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
-"Gecikmeyi ayarlayın (ms olarak). Yüksek değerler ses hışırtısını "
-"azaltabilir. Sadece OpenAL ile kullanılabilir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "Ayarlar..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
-msgstr "Sallama"
+msgstr "Salla"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "Kısa İsim:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
-msgstr "Shoulder Düğmeleri"
+msgstr "Omuz Düğmeleri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "Konsolu Göster (&C)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
-msgstr "Geçmişi Göster (&L)"
+msgstr "&Geçmişi Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "Durum Çubuğunu Gö&ster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "Araç Çubuğunu Gös&ter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "Varsayılanları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "Aygıtları Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "EFB Bölge Kopyalamasını Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
-msgstr "Kare Sayısını Göster"
+msgstr "FPS'yi goster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "Fransızları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "GameCube'leri Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "Görüntü Girişini Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "İtalyanları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "Japonları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "Korelileri Göster"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "Gösterme Dili:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
-msgstr "Geçmiş Yapılandırmasını Göster"
+msgstr "Geçmiş &Yapılandırmasını Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "PAL'ları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "Platformları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "Bölgeleri Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "İstatistikleri Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "Tayvanlıları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "Amerikanları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "WAD'ları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "Wii'leri Göster"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "Oyunu durdurmadan önce onay kutusu görüntüle."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"Ciddi bir potansiyel hatada uyarı kutusu göster. \n"
-"Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde "
-"hiçbir uyarı vermeden aniden kapanır."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "İlk bloğu göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "Lag sayacını göster"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"Mesajlarıi emulasyon ekranı bölümünde göster.\n"
-"Bu mesajlar memory card erişimi, video altyapısı, CPU bilgisi, ve JIT "
-"önbelleğini temizleme olabilir."
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "Kayıt bloklarını göster"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "Kayıt yorumunu göster"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "Kayıt simgesini göster"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "Kayıt başlığını göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4912,330 +5001,380 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "Bilinmeyenleri göster"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Çeşitli istatistikler gösterir. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "Yatay Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Basitleştirilmiş Çince"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "Boyut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
-msgstr "BIOS'u Geç"
+msgstr "BIOS'u Atla"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "DCBZ temizlemesini atla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "CPU'dan EFB'ye erişimi atla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Doğruluktan ödün vererek EFB'den RAM'e kopyalayı biraz hızlandırır. \n"
-"Bazen bu görüntü kalitesini de artırır. \n"
-"Herhangi bir sorun yaşarsanız, bu seçeneği iptal etmeyi veya doku ön belleği "
-"doğruluğunu artırmayı deneyin.\n"
-"Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
-msgstr "Enstantene"
+msgstr "Anlık görüntü al"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "Yazılımsal Yorumlayıcı"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
 "It's only useful for debugging purposes.\n"
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
-"Yazılım yorumlaması, diğer çözücülerden daha yavaştır.\n"
+"Yazılım yorumlaması, diğer çözücülerden çok daha yavaştır.\n"
 "Sadece hata ayıklamada kullanışlıdır.\n"
 "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin değilseniz, "
 "'Hayır' seçin."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "Ses Ayarları"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
-msgstr "Ses arkaucu %s geçerli değil."
+msgstr "Ses çözücüsü %s geçerli değil."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "Ses tamponu oluşturulamadı: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Boşluk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "Hoparlör Ses Seviyesi:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
-"Yorumlamada kullanılan çözünürlüğü belirler. Yüksek bir çözünürlük görsel "
-"kaliteyi artırır ama performansın düşmesine ve bazı oyunlarda hatalara neden "
-"olabilir. \n"
-"\"Multiple of 640x528\" seçeneği, \"Window Size\" 'den daha yavaştır ama "
-"daha az hataya neden olur. Genel konuşursak, bu çözünürlük ne kadar az "
-"olursa, performans o kadar iyi olacaktır. \n"
-"\n"
-"Emin değilseniz, 640x528'i seçin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
-msgstr "Disk Aktarım Oranını Hızlandır"
+msgstr "Disk Aktarım Oranını hızlandır"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Kare Çubuk"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "Varsayılan Denetim Aygıtı"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Başlat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "&NetPlay'i Başlat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "Çekimi Başlat (&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "Çekimi Başlat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "Durum"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "Durum Kayıtları"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "Direksiyon"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Çubuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "Durdur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
-"EFB kopyalarını GPU doku nesnelerinde saklayın.\n"
-"Bu pek doğru değildir, ancak EFB'den RAM'e seçiliyken yeteri kadar iyi "
-"çalışarak çoğu oyunu hızlandırır.\n"
-"\n"
-"Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "Pencereye Göre Ayarla"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Tıngırtı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "Çıkarma"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Dosya %s 'ye başarıyla verildi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "Kayıt dosyaları başarıyla alındı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "Hareket"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
-msgstr ""
+msgstr "GPU işlemini eşitle."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
+"GPU ve CPU işlemlerini eşitleyerek Çift Çekirdek modunda oluşan rastgele "
+"donmaları engelle. (Açık = Uyumlu, Kapalı = Hızlı)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "Sistem Dili:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAYVAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS Girişi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Sekme"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Sekme bölme"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tablo Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tablo Sağ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "Ekran Görüntüsü Al"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "Sınama"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "Doku"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
-msgstr "Doku Ön Belleği"
+msgstr "Doku Önbelleği"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "Doku Biçimi Kaplaması"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD Başarıyla yüklendi."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "Adres geçersiz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "Sağlama başarıyla düzeltildi"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "Seçilen konum zaten listede"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
-"%s zaten var.\n"
+"%s dosyası zaten var.\n"
 "Değiştirmek istiyor musunuz?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5244,45 +5383,33 @@ msgstr ""
 "Dosya %s yazmak için açılamadı. Lütfen başka bir uygulama tarafından "
 "kullanılıp kullanılmadığını denetleyin."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Dosya %s zaten açık, dosya başlığı yazılmayacaktır."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "Belirtilen dosya (%s) bulunamadı"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "İsim boş olamaz"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "İsim ',' karakterini içeremez"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "Ortaya çıkan şifresi çözülmüş AR kodu herhangi bir satır içermiyor."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
-"Bunu güvenli olarak ayarlarsanız, emülatörün RAM'den doku güncellemesi "
-"kaybetme oranı azalacaktır. \n"
-"\n"
-"Emin değilseniz, en sağdaki değeri kullanın."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "Kopyalamayı denediğiniz kaydın boyutu hatalı"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5290,36 +5417,48 @@ msgstr ""
 "Seçilen dili sisteminiz desteklememektedir. Sistem varsayılanına geri "
 "dönülüyor."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Sunucu ve istemcinin NetPlay sürümleri uyumlu değil!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "Sunucu dolu!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "Sunucu yanıtı: oyun şu anda çalışıyor!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "Sunucu bilinmeyen bir hata mesajı gönderdi!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Belirtilen dosya \"%s\" bulunamadı"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "Değer hatalı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5327,7 +5466,7 @@ msgstr ""
 "Burada 00000001/00000002 için bir bilet olmalıdır. NAND dökümünüz "
 "tamamlanmamış olabilir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5335,126 +5474,170 @@ msgstr ""
 "Bu ayarlar Dolphin'in kendi ayarları yerine kullanılır. \n"
 "Dolu kareler oyunun Dolphin'in ayarlarını kullandığını gösterir."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaşlamaya neden olabilir."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Bu özellik oyunun kamerasını değiştirmenizi sağlar.\n"
-"Sağ fare düğmesini basılı tutun ve fareyi gezdirerek kamerayı kendi "
-"etrafında döndürün. SHIFT tuşunu ve WASD tuşlarından birini kullanarak "
-"kamerayı hareket ettirin. (SHIFT+0 2 kat daha fazla hareket sağlar, SHIFT+9 "
-"bunu yarıya indirir.). Kamerayı sıfırlamak için SHIFT+R'ye basın.\n"
+
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
+msgid ""
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
 "\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
-msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"Bu, görüntü ve CPU işlem birimlerini ayırır, böylece ayrı çekirdeklerde "
-"çalışmalarına izin verir. \n"
-"Bilgisayarınızda çift çekirdek varsa hızınızı büyük oranda artırır,ama bazı "
-"çökme ve hatalara neden olabilir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir."
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "Eşik"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "Eğim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "Başlık"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "Buraya"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "Tüm Geçmiş Türlerini Seç"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
-msgstr "En-boy Oranını aç/kapat"
+msgstr "En-boy Oranını Aç/Kapat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
-msgstr "EFB Kopyalarını aç/kapat"
+msgstr "EFB Kopyalarını Aç/Kapat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
-msgstr "Fog aç/kapat"
+msgstr "Sisi Aç/Kapat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "Tam Ekran Moduna Geç"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
-msgstr "IR aç/kapat"
+msgstr "Kızılötesi'ni Aç/Kapat"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "Üst"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Geleneksel Çince"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "Tetikler"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Geçersiz SYSCONF'tan okumayı deniyor"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5462,41 +5645,24 @@ msgstr ""
 "Geçersiz SYSCONF'tan okumayı deniyor\n"
 "Wiimote BT ID'leri mevcut değil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Türkçe"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Döner Tabla"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "Tür"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP Bağ.Nok.:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "BİLİNMEYEN"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "BİLİNMEYEN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "AMERİKA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5504,191 +5670,178 @@ msgstr ""
 "Verilen değerlerden yama oluşturulamıyor. \n"
 "Girilen veri değiştirilmemiş."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"Girilen AR kodunun %lu 'nci satırı geçerli bir şifreli veya şifresi çözülmüş "
+"Girilen AR kodunun %u 'nci satırı geçerli bir şifreli veya şifresi çözülmüş "
 "kod olarak ayrıştırılamadı. Kodu doğru yazdığınızdan emin olun.\n"
 "Bu satırı yoksayıp ayrıştırmaya devam etmek istiyor musunuz?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "Belirsiz %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "Durum Yüklemeyi Geri Al"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "Durum Kaydetmeyi Geri Al"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Beklenmedik 0x80 çağrısı? Çıkılıyor..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Bilinmeyen DVD komutu %08x - önemli hata"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "Bilinmeyen komut 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "SYSCONF içinde bilinmeyen giriş türü %i (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Şu ID ile bilinmeyen mesaj alındı : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "Yukarı"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "Güncelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "Dik Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "EuRGB60 Modunu Kullan (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "Tam Ekran Kullan"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "HEX Kullan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "Önemli Hataları Bildir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Dokuları emüle etmek için birden fazla işlem birimi kullanın. \n"
-"Özellikle iki veya daha fazla çekirdeği olan işlemcilerde hızı artırır. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Shader derlemesi başarısız olursa, genelde bir hata mesajı gösterilir. \n"
-"Ancak oyunu bölmemesi için bu hataların gelmesini bu seçenekle "
-"engelleyebilirsiniz. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "Gereçler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "Dikey Eşitleme"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam Hız Hilesi"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "Değer"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "Değer:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "Değer:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
-msgid "Verbosity"
-msgstr "Duyuru/Hata/Uyarı"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "Görüntü"
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
+msgid "Verbosity"
+msgstr "Ayrıntı seviyesi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "Sanal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "Ses"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD kurulumu başarısız: %s oluşturmada hata"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD kurulumu başarısız: Ticket oluşturma hatası."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5700,25 +5853,27 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "Uyarı"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Uyarı - DOL yanlış konsol modunda başlatılıyor!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Uyarı - ELF yanlış konsol modunda başlatılıyor!"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Uyarı - Kalıp yanlış konsol modunda başlatılıyor!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5729,7 +5884,7 @@ msgstr ""
 "%s\n"
 "Devam edilsin mi?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5737,25 +5892,32 @@ msgid ""
 "and have the same name as a file on your memcard\n"
 "Continue?"
 msgstr ""
-"Uyarı: Bu,aşağıdaki klasördeki herhangi bir kayıtlı oyunun üzerine "
-"yazılacak:\n"
+"Uyarı: Bu, aşağıdaki klasördeki herhangi bir kayıtlı oyunun üzerine "
+"yazacak:\n"
 "%s\n"
 "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n"
 "Devam?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
 "%u > %u) (frame %u > %u). You should load another save before continuing, or "
 "load this state with read-only mode off."
 msgstr ""
-"Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. (Bayt "
-"%u > %u) (Çerçeve %u > %u). Devam etmeden önce başka bir kayıt yüklemeniz, "
-"veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi "
-"taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaşayacaksınız."
+"Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. (bayt "
+"%u > %u) (çerçeve %u > %u). Devam etmeden önce başka bir kayıt yüklemeniz, "
+"veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. "
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5767,7 +5929,7 @@ msgstr ""
 "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, "
 "senkronizasyon sorunu yaşayacaksınız."
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5801,176 +5963,165 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - dosya açılamadı."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Darbe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "Geniş Ekran Hilesi"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "Genişlik"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii Konsolu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Kök Dizini:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii kayıt dosyaları (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Dosyadan okuma başarısız"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote Bağlandı"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote Motoru"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote ayarları"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wiimote'lar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "Pencereleri Sola Döşe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "Pencere Menüsü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "Pencereleri Sağa Döşe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
-msgstr "Heceleme"
+msgstr "Sözcük Kaydırma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "Çalışıyor..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
-msgid "Write memcards (GC)"
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
+msgid "Write memcards (GC)"
+msgstr "Hafıza Kartlarına Yaz (GC)"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "Konsola Yaz"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "Hata ayıklayıcıya yaz"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "Dosyaya Yaz"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "Pencereye Yaz"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice başarsız: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 başlatılamadı: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 ana ses oluşturulamadı: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF kaydı"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Sarı"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"Dolphin Takımı tarafından yapılan eski bedava DSP ROM'ları "
-"kullanıyorsunuz. \n"
-"Sadece Zelda UCode oyunları bunlarla düzgün çalışabilir. \n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "Sayfalı bölmeleri kapatamazsınız."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "Bir oyun seçmelisiniz!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "Bir isim girmelisiniz!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
-msgstr "Doğru bir sekizlik,onluk veya onaltılık değer girmelisiniz."
+msgstr "Doğru bir sekizlik, onluk veya onaltılık değer girmelisiniz."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "Geçerli bir profil ismi girmelisiniz."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Değişikliğin etkili olması için Dolphin'i yeniden başlatmalısınız."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -5980,7 +6131,7 @@ msgstr ""
 "Sorunu düzeltmek için durdurmak istiyor musunuz?\n"
 "Eğer Hayır'ı, seçerseniz, seste sorun oluşabilir."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5988,36 +6139,36 @@ msgstr ""
 "GCM/ISO dosyanız hatalı gibi görünüyor (hatalı bölge). \n"
 "PAL gibi davranılsın mı?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "SYSCONF dosyanızın boyutu hatalı. \n"
-"0x%04x olmalıdır (sizinki: 0x%04llx) \n"
+"0x%04x olmalıdır (sizinki: 0x%04<PRIx64>) \n"
 "Yenisini oluşturmak ister misiniz?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP Hilesi"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
-msgstr "Sıfır-Üç kodu desteklenmemektedir."
+msgstr "Sıfır 3 kodu desteklenmemektedir."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Dolphin Sıfır kodu bilinmiyor: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ bekleniyor ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6029,76 +6180,30 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[Özel]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[DENEME AMAÇLI]\n"
-"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltır ve emülasyonu "
-"hızlandırır. \n"
-"Ancak, çeşitli oyunlarda doku bozulmalarına neden olabilmektedir. Ayrıca "
-"çoğu zaman CPU doku çözmesinden daha yavaştır. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[DENEME AMAÇLI]\n"
-"Görüntü listelerini önbelleğe alarak emülasyonu biraz hızlandırır. \n"
-"Bazı hatalara neden olabilir. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: %x 'den işlem kodu okunuyor. Lütfen bildirin."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
-msgstr "wxExecute uygulama çalışırken -1'e düştü!"
+msgstr "wxExecute uygulama çalışırken -1 döndürdü!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar Düzeltmesi:"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear Düzeltmesi:"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| VEYA"
diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po
index 563a67e553..c226e9502c 100644
--- a/Languages/po/zh_CN.po
+++ b/Languages/po/zh_CN.po
@@ -1,19 +1,24 @@
-# Translation of dolphin-emu.pot to Simplified Chinese
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Sentret_C <sentret_c@sina.cn>, 2013
+# Nisen <gaoboyuan8@qq.com>, 2014
+# Nisen <gaoboyuan8@qq.com>, 2015
+# Ryan Zhou <sentret_c@sina.cn>, 2013-2015
+# Nisen <gaoboyuan8@qq.com>, 2015
 # thegfw <thegfw@gmail.com>, 2011
-# lxf2000 <gaoboyuan8@qq.com>, 2013
-# Sentret_C <sentret_c@sina.cn>, 2013
+# Nisen <gaoboyuan8@qq.com>, 2013-2014
+# Ryan Zhou <sentret_c@sina.cn>, 2013
+# 天绝星 <c.cejhb@gmail.com>, 2015
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-21 05:18+0000\n"
-"Last-Translator: lxf2000 <gaoboyuan8@qq.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/dolphin-"
 "emu/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -22,21 +27,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+"\n"
+"Dolphin 是一个免费开源的 GameCube/Wii 模拟器。\n"
+"\n"
+"该软件不能用于运行你非法持有的游戏。\n"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr "(内部 IP)"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (项目太多，无法完全显示)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " 游戏 : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! 非"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -45,438 +66,484 @@ msgstr ""
 "\"%s\" 不存在。\n"
 " 创建一个新的 16MB 存储卡?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr "缩减 %s 失败。镜像可能有错误。"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr "%s 已经被压缩过! 无法对它进一步压缩。"
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" 不是一个有效的 GCM/ISO 文件，或者不是一个 GC/Wii 镜像。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr "%08X:  "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s复制%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr "%d 采样"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr "%d 采样 (质量等级 %d)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+"%s\n"
+"无法加载，因为有相同的内部文件名先前已载入并保存为\n"
+"%s"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+"%s\n"
+"无法加载，因为不是一个有效的 gci 文件。\n"
+"文件大小 (%<PRIx64>) 与文件头里的记录不匹配 (%d)"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+"%s\n"
+"无法加载，因为不是一个有效的 gci 文件。\n"
+"格子数量必须是 %d"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+"%s\n"
+"无法加载，因为虚拟存储卡上空闲格子数不足。"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+"%s\n"
+"无法加载，因为存储卡上剩余空间少于10%%\n"
+"总格子数: %d; 空闲格子数: %d"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr "%s (光盘 %i)"
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr "%s IPL 在 %s 目录中找到，磁盘可能无法识别。"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s 已经存在，是否覆盖?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "缩减 %s 失败。镜像可能有错误。"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
-"无法将 %s 载入为存储卡 \n"
+"无法将 %s 作为存储卡打开 \n"
 " 卡文件大小无效 (0x%x 字节)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
-"无法将 %s 载入为存储卡 \n"
+"无法将 %s 作为存储卡打开 \n"
 " 卡大小无效 (0x%x 字节)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
-"无法将 %s 载入为存储卡 \n"
+"无法将 %s 作为存储卡打开 \n"
 "相对于有效的存储卡文件，该文件太小 (0x%x 字节)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "无法打开 %s"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
+msgstr ""
+"%s 不是一个目录，未能移动至 *.original.\n"
+"请重新确认你的写入请求或者将其移动至 Dolphin 之外。"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:182
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s failed: kr=%x"
-msgstr "%s 失败：kr=%x"
+msgid "%s was not a directory, moved to *.original"
+msgstr "%s 不是一个目录，已移动至 *.original."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
-#, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s 是一个零字节文件"
-
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s 已经被压缩过! 无法对它进一步压缩。"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s 作为文件名太长，最大字符数为45"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s删除%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s导出 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s导入 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u 空闲区块; %u 空闲目录项目"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "&& 与"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "关于(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "从光驱启动(&B)..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr "音频设置(&A)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr "从 DVD 备份中启动(&B)…"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "断点(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "浏览镜像(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
 msgstr "金手指管理器(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "DSP设置(&D)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr "控制器设置(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "删除镜像(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "删除所选镜像(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "模拟(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "文件(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "帧数步进(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "切换全屏(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr "&GitHub 资源库"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "图形设置(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "热键设置(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "即时编译器(&J)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "载入状态(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
-msgstr "GC存储卡管理器(&M)"
+msgstr "GC 存储卡管理器(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "内存(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr "影片(&M)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "打开(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "选项(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "暂停游戏(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "开始游戏(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
 msgstr "只读模式(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "刷新列表(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "寄存器(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "重置游戏(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "声音(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "停止游戏(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "视频(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "视图(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Wii 控制器设置(&W)"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr "监视(&W)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr "网站(&W)"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "百科(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
-msgstr "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
+msgstr "（错误：主机错误）"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+远剪裁"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr "（错误：连接断开）"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+近剪裁"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr "（错误：模拟器版本太旧）"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(未知)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr "（错误：套接字 (Socket) 错误）"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr "（错误：超时）"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr "（未知错误）"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+"(C) 2003-2015+ Dolphin 团队。“GameCube”和“Wii”是任天堂的商标。Dolphin 与任天"
+"堂没有任何形式的关联。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(关)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr "+ 加"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr "0x44"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr "1.5x 原生 (960x792)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 位"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr "16位"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr "1x 原生 (640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr "2.5x 原生 (1600x1320)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr "2x 原生 (1280x1056)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 位"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
+msgstr "32位"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
-msgstr "3D Vision"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr "3x 原生 (1920x1584)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr "4x 原生 (2560x2112)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 位"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr "8位"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<在这里插入名称>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<未找到分辨率>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<无>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<请按键>"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
+msgstr "【系统语言】"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<系统>"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr "网络联机 (NetPlay) 窗口已经打开。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
-msgstr "A"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "已经有一个NetPlay窗口打开!!"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "目前没有游戏在运行。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
-"未发现支持的蓝牙设备。\n"
-"您需要手动连接您的 Wii 控制器。"
+"未能找到支持的蓝牙设备。\n"
+"你需要手动连接 Wii 控制器。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
-"注意:\n"
+"注意： \n"
 "\n"
-"Netplay 仅在如下设置时可用:\n"
-" - 启用多核处理 [关]\n"
-" - 所有计算机上的 DSP 模拟引擎必须一致!\n"
-" - 在专门的线程中模拟 DSP [关]\n"
-" - 帧数限制不为 [音频]\n"
+"网络对战 (Netplay) 仅在如下设置时可用：\n"
+"- 所有计算机上的 DSP 模拟引擎必须一致！\n"
+"- 在专门的线程中模拟 DSP 【关】\n"
+"- 手动设置每一个 Wii 控制器的扩展 \n"
 "\n"
-"所有玩家都应使用相同的 Dolphin 版本与设置。\n"
-"所有玩家的存储卡必须相同或禁用。\n"
-"尚未实现对 Wii 控制器的支持!\n"
+"所有玩家都应使用相同的 Dolphin 版本与设置。 \n"
+"所有玩家的存储卡必须相同或禁用。 \n"
+"对 Wii 控制器的支持可能不好，建议不要使用。\n"
 "\n"
-"主机必须开放/映射选定的 TCP 端口!\n"
+"如需直连主机必须开放/映射选定的 TCP 端口！ \n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-基板"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR 代码"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "关于 Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "加速度"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr "精确度:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-"精确地模拟 EFB 副本。\n"
-"一些游戏的特定图像效果或游戏机能需要此项。\n"
-"\n"
-"如果没有把握，请选择缓冲到材质。"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "操作"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -491,20 +558,20 @@ msgstr ""
 "错误代码:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 添加代码 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 填充和滑动 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -512,19 +579,19 @@ msgid ""
 msgstr ""
 "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 内存写入和填充 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr "Action Replay 错误: 无效大小 (%08x : 地址 = %08x) 于 写入到指针 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay 错误: 无效数值 (%08x) 于 内存复制 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -533,172 +600,140 @@ msgstr ""
 "Action Replay 错误: 主代码与写入到 CCXXXXXX 尚未实现(%s)\n"
 "不需要主代码。请不要使用主代码。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay 错误: 无效 AR 代码行: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: 条件代码: 无效大小 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: 无效正常代码类型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: 正常代码 %i: 无效子类型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: 正常代码 0: 无效子类型 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr "检测到适配器"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr "未检测到适配器"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "适配器:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
-msgstr "加号"
+msgstr "添加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "添加 ActionReplay 代码"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "添加补丁"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "添加新面板"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "添加..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "地址 :"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"将“远剪裁平面”移动指定值。\n"
-"有两种方法表达浮点数值。\n"
-"例如: 输入“200”或直接输入“0.0002”将产生同样的效果，系统都将捕捉到"
-"值“0.0002”。\n"
-"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n"
-"\n"
-"注意: 可在“日志窗口/控制台”中查看系统捕捉值。"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"将“近剪裁平面”移动指定值。\n"
-"有两种方法表达浮点数值。\n"
-"例如: 输入“200”或直接输入“0.0002”将产生同样的效果，系统都将捕捉到"
-"值“0.0002”。\n"
-"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n"
-"\n"
-"注意: 可在“日志窗口/控制台”中查看系统捕捉值。"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "调整激活按钮所需的模拟控制压力。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "高级"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "所有 GC/Wii 镜像 (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
+msgstr "所有 GameCube 文件 (gcm)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "所有 Gamecube GCM 文件 (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "所有存档状态 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "所有 Wii 镜像文件 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
-msgstr "所有压缩的 GC/Wii 镜像文件 (gcz)"
+msgstr "压缩的 GC/Wii 镜像文件 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "所有文件 (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr "视差图像"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr "分析"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr "角度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "各向异性过滤:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "抗锯齿:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr "应用载入器时间："
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "应用程序载入器大小错误...这真是一个应用程序载入器(apploader)?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "应用程序载入器不能从文件载入"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "应用载入器:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "应用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -708,16 +743,12 @@ msgstr ""
 "\n"
 "如果没有把握，请选择 (关)。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "阿拉伯语"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "您确定要删除 \"%s\" ?"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -725,54 +756,83 @@ msgstr ""
 "您确定想要删除这些文件?\n"
 "它们将无法恢复!"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "您确定想要删除此文件? 它将无法恢复!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr "你是否试图在两个插槽中使用相同的文件?"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr "Arm JIT (实验性)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr "Arm64 JIT（实验性）"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "宽高比:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "必须有一个窗口保持打开"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+"尝试检测并跳过等待循环。\n"
+"如果不确定，请勾选此项。"
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "音频"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "音频后端:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr "音频设置"
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: 打开 AO 设备错误.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr "澳大利亚"
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr "作者"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "自动"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "自动 (640x528 的倍数)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "自动 (窗口大小)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "自动调整窗口大小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -782,251 +842,261 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
-msgstr "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
+msgstr "BAT 错误，模拟器即将退出。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr "BP 寄存器"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "后"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "后端设置"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr "后端:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "后台输入"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "后"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "无效文件头"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr "平衡板"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "标志"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "标志详细信息"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "标志:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "摇把"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "基本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "基本设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "低音"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr "电池"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "区块分配表校验失败"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "区块"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "蓝"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "蓝 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "蓝 右"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr "无边界全屏"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "底部"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "绑定控制器: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr "分支：%s"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "损坏"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "浏览"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "浏览要添加的目录"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "浏览镜像目录..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "浏览输出目录"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "缓冲区:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "按键"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr "忽略 XFB"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr "绕过DCBZ指令对数据缓存的清除。通常不会启用此项。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr "C"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr "C 摇杆"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-摇杆"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
-msgstr "CP 注册"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
+msgstr "CP 寄存器"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU 模拟引擎"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
-msgstr "缓存显示列表"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
+msgstr "CPU 选项"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"逐个像素而非逐个顶点地计算 3D 图像的照明。\n"
-"在一定程度上降低模拟速度 (取决于您的 GPU) 。\n"
-"该增强通常是安全的，但偶尔也会造成问题。\n"
+"在启动时将自定义材质缓存到系统内存区。\n"
+"这需要指数级的内存但它会修正可能的卡顿。\n"
 "\n"
-"如果没有把握，请不要勾选此项。"
+"如果不确定，请不要勾选此项。"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"逐个像素而非逐个顶点地计算 3D 物体的照明，\n"
+"这会使发光多边形更平滑，单个三角形可见度降低。\n"
+"偶尔会造成卡顿或图像问题。\n"
+"\n"
+"如果不确定，请不要勾选此项。"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
 #, c-format
-msgid "Can't find WiiMote by connection handle %02x"
-msgstr "不能按照连接句柄 %02x 找到 Wii 控制器"
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr "不能按照连接句柄 %02x 找到 Wii 控制器。"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "不能从 DVD插件 - DVD接口读取数据: 严重错误"
+msgstr "不能从DVD插件(DVD_Plugin) - DVD接口(DVD_Interface)读取数据: 严重错误"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "取消"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "无法打开 %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "事件未决时不能反注册事件"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 "无法将该文件用作存储卡。\n"
 "%s\n"
-"不是有效的Gamecube存储卡文件"
+"不是有效的 GameCube 存储卡文件。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"无法将该文件用作存储卡。\n"
-"您是否试图在两个插槽中使用相同的文件?"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "中心"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "切换"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr "切换光盘(&D)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "切换光盘(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "切换光盘"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "切换游戏"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr "切换光盘至 %s"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1034,282 +1104,324 @@ msgstr ""
 "改变用户界面的语言。\n"
 "需要重启。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "改变“远裁切平面”参数的符号 (修正后)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr "模拟器正在运行时改动将不会生效。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "改变“近裁切平面”参数的符号 (修正后)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "模拟器正在运行时改动将不会生效!"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "聊天"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "金手指"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr "金手指管理"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "金手指搜索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "金手指管理"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr "检查分区完整性"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr "检查更新："
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr "正在检查完整性..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "简体中文"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "繁体中文"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "选择一个DVD根目录:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr "选择一个NAND根目录:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "选择一个默认镜像:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "选择一个要添加的目录"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "选择要打开的文件"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "选择一个存储卡:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr "选择要作为应用加载器的文件: (仅适用于由文件夹构成的光盘)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "选择提取目标文件夹"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "圆形杆"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "传统控制器"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "清除"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
-msgstr "游戏运行期间客户端断开连接!! NetPlay 已禁用。您必须手动停止游戏。"
+msgstr "游戏运行期间客户端断开连接！网络对战已禁用。您必须手动停止游戏。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "关闭"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "程序设置(&N)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "代码信息"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "代码:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "命令"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "注释"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "注释:"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr "编译：%s @ %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "压缩镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "压缩所选镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "正在压缩镜像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr "计算"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr "正在计算 MD5 值"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "设置"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "设置"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "设置面板"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "设置手柄"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "设置..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "确认文件覆盖"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr "停止游戏时确认"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "连接"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr "连接平衡板"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "连接 USB 键盘"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "连接 Wii 控制器 %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "连接 Wii 控制器 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "连接 Wii 控制器 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "连接 Wii 控制器 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "连接 Wii 控制器 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr "连接 Wii 控制器"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr "已连接"
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "控制台"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr "持续扫描"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "控制"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr "控制器设置"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr "控制器"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+"控制会聚平面的距离。即虚拟物体看起来出现在屏幕前方的距离。\n"
+"数值越高则凸出屏幕效果越强，而数值越低观感会越舒适。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+"控制虚拟摄像机之间的分开距离。\n"
+"数值越高则深度感会越强，而数值越低观感会越舒适。"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr "最小会聚："
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr "会聚："
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "转换到 GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr "复制"
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "复制失败"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
-msgstr "复制到内存卡 %c"
+msgstr "复制到存储卡 %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "核心"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "无法创建 %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "无法初始化后端 %s。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
 "无法读取\"%s\"。驱动器里没有光盘或不是 GC/Wii 备份。请注意多数 PC DVD 驱动器"
-"不能读取原始的 Gamecube 与 Wii 光盘。"
+"不能读取原始的 GameCube 与 Wii 光盘。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "无法识别镜像文件 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "无法保存 %s"
+msgid "Could not save %s."
+msgstr "不能保存 %s."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1328,11 +1440,19 @@ msgstr ""
 "您是否是在移动模拟器目录后收到这个消息?\n"
 "如果是这样，您可能需要在选项中重新指定您的存储卡位置。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr "无法创建客户端。"
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr "无法创建对等点。"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "找不到扩展名 'ini' 的打开命令!"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1340,238 +1460,240 @@ msgstr ""
 "无法初始化核心。\n"
 "请检查您的配置。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr "无法查找中心服务器 %s."
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "数量:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr "数量：%lu"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "国家:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "创建 AR 代码"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "创建新布局"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "创建者:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr "错误"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "裁切"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 "将图像由 4:3 裁切为 5:4 或由 16:9 裁切为 16:10。\n"
+"\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "经过 wxFileSelector 之后当前目录从 %s 改变为 %s!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "自定义投影修正"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
+msgstr "自定义"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "自定义投影修正设置"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "自定义一些正交投影参数。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "捷克语"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
-msgstr "D"
-
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "方向键"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "DSP音频"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "音频模拟引擎"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
-msgstr "音频 HLE 模拟(很快)"
+msgstr "音频 HLE 模拟 (很快)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
-msgstr "音频 LLE 解释(很慢)"
+msgstr "音频 LLE 解释 (很慢)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "音频 LLE 重编译器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "音频设置"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr "独立音频 LLE 线程"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD 根目录:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - 致命错误: 读取卷失败"
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - 致命错误: 读取卷失败"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr "跳舞毯"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "数据大小"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "日期:"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro 文件(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "死区"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "调试"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr "仅调试用。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr "调试"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "小数点"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "解压缩镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "解压缩所选镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "正在解压缩镜像"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr "减小会聚"
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr "减小深度"
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr "减少帧数限制"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr "减小 IR"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "默认"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "默认镜像:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "默认字体"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "删除"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "删除存档"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "删除已经存在的文件 '%s' 么?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr "深度百分比："
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr "深度："
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "说明"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr "说明："
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "检测"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
-msgstr "检测到尝试从DVD读取比合适的输出缓冲区内更多的数据。堆存。"
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
+msgstr "确定性双核："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "设备"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "设备设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr "未找到设备"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "拨号"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr "五分钟非活动状态后变暗屏幕。"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr "直接"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr "直接连接"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1579,20 +1701,23 @@ msgstr ""
 "目录校检失败\n"
 "和目录备份校检失败"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr "禁用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr "禁用边界框"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr "禁用目标 Alpha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "禁用雾化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1604,287 +1729,234 @@ msgstr ""
 "显著提高模拟速度，但在模拟许多需要 XFB 的游戏\n"
 "(尤其是自制应用) 时会造成严重故障。\n"
 "\n"
-"如果没有把握，请不要勾选此项。"
+"如果不确定，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
-"禁用对 EFB 副本的模拟。\n"
-"后期处理或渲染到纹理效果经常会使用到这些副本，\n"
-"因此勾选此项虽然会带来很大的提速但几乎总是会\n"
-"造成问题。\n"
+"禁用边界框计算。\n"
+"这可能较大改善 GPU 性能，但是一些游戏可能会停止运行。\n"
 "\n"
-"如果没有把握，请不要勾选此项。"
+"如果不确定，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 "禁用对名为目标 Alpha 的硬件功能的模拟，许多游戏\n"
 "使用该功能产生多种图像效果。\n"
+"这对 D3D 和 OpenGL 没有影响，但它在 OpenGL ES 中会渲染两次。\n"
 "\n"
 "如果不能确定，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "光盘"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "光盘读取错误"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr "与遍历服务器断开连接。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "显示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
-"显示模拟器读取到的输入值。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
+"在模拟屏幕区域显示消息。\n"
+"这些消息包括记忆卡写入，视频后端和 CPU 信息，以及 JIT 缓存清除。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "除号"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "您确定是否停止当前模拟?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr "杜比定向逻辑II解码器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin 团队\n"
-"\n"
-"分支: %s\n"
-"修订号: %s\n"
-"编译于: %s @ %s\n"
-"\n"
-"Dolphin 是一款 Gamecube/Wii 模拟器，其原作者为\n"
-"F|RES 和 ector。\n"
-"现在 Dolphin 是一个开源项目，贡献者之多不胜枚举。\n"
-"如果对本项目感兴趣，欢迎到我们的项目页面了解详情\n"
-"http://code.google.com/p/dolphin-emu/。\n"
-"\n"
-"特别感谢 Bushing, Costis, CrowTRobo, Marcan,\n"
-"Segher, Titanik, or9 与 Hotquik 所做的反向工程与\n"
-"文档/演示。\n"
-"\n"
-"非常感谢 Gilles Mouchard，其 Microlib PPC 模拟器\n"
-"为我们的开发提供了最初推动力。\n"
-"\n"
-"感谢 Frank Wille 的 PowerPC 反汇编程序，or9 与我们\n"
-"将其修改加入了 Gekko 特性。\n"
-"\n"
-"感谢 hcs/destop 的 GC ADPCM 解码器。\n"
-"\n"
-"我们与任天堂没有任何形式的关系。Gamecube 和 Wii\n"
-"是任天堂的商标。\n"
-"本模拟器仅作为教育用途，不得用于运行您非法拥有的游\n"
-"戏。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s 图形设置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin 网站(&W)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin 配置"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr "Dolphin 控制器配置"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin 模拟 Wii 控制器配置"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC 手柄设置"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr "Dolphin 快捷键"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr "Dolphin 联机"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr "Dolphin 联机设定"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS 电影 (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wii 控制器配置"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "&Google Code 上的 Dolphin"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
-msgstr "Dolphin 不能找到任何 GC/Wii 镜像。双击这里浏览文件..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
+msgstr "Dolphin 不能找到任何 GC/Wii 镜像或 WAD 文件。双击这里浏览文件……"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
-msgstr "Dolphin 当前设置为隐藏所有游戏。双击这里显示所有游戏..."
+msgstr "Dolphin 当前设置了隐藏所有游戏。双击这里显示所有游戏……"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr "对于遍历服务器的Dolphin 版本太老"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin未能完成请求的操作。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr "加倍模拟GPU的时钟频率。将会提高一些游戏的速度 (开 = 快速，关 = 兼容)"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
-msgstr "向下键"
+msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "下载代码 (WiiRD 数据库)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "已下载 %lu 代码(已添加 %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr "已绘制的对象范围"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr "未检测到驱动器"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "鼓 (太鼓达人)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "虚拟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "转储音频"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "转储 EFB 目标"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "转储帧"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr "转储对象"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr "转储 TEV 场景"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr "转储材质接收"
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "转储材质"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"将所有渲染的帧转储至 User/Dump/Frames/ 目录中\n"
-"的一个AVI 文件。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
-msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 "将解码的游戏材质转储到\n"
-"User/Dump/Textures/<游戏 ID>/ 目录中。\n"
+"<User>/Dump/Textures/<游戏ID>/ 目录中。\n"
 "\n"
-"如果没有把握，请不要勾选此项。"
+"如果不确定，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"将 EFB 副本的内容转储到 User/Dump/Textures/\n"
-"目录中。\n"
+"将 EFB 副本的内容转储到\n"
+"<User>/Dump/Textures/ 目录中。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "退出模拟(&X)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr "EFB 副本"
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1895,56 +1967,40 @@ msgstr ""
 "错误: 此版本的Dolphin需要%d.%d或更高版本的TAP-Win32驱动——如果您刚刚升级您的"
 "Dolphin，或许您现在需要重新启动您的计算机以使Windows加载新驱动。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "欧版"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr "内存提前更新"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "编辑"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "编辑 ActionReplay 代码"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "编辑设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr "编辑本地覆盖设置"
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "编辑补丁"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "编辑当前布局"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "编辑..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "效果"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr "嵌入式帧缓冲 (EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "模拟线程已经在运行"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1956,9 +2012,9 @@ msgstr ""
 "这会严重降低模拟速度并会禁用高分辨率渲染，但\n"
 "对于正确模拟一些游戏来说是必要的。\n"
 "\n"
-"如果没有把握，请勾选虚拟 XFB 模拟。"
+"如果不确定，请选择虚拟 XFB 模拟。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1972,121 +2028,102 @@ msgstr ""
 "不像真实 XFB 模拟那样慢。但在模拟其余很多游戏\n"
 "(尤其是自制应用) 时仍然会产生错误。\n"
 "\n"
-"如果没有把握，请勾选此项。"
+"如果不确定，请选择此项。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "模拟 Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "模拟器状态: "
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "启用"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"借助英伟达 3D Vision 技术 (如果您的 GPU 支持)\n"
-"实现3D效果。\n"
-"有可能造成错误。\n"
-"需要启用全屏以生效。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "启用AR记录"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "启用区块合并"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
+msgstr "启用 CPU 频率覆盖"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
-msgstr "启用边界框计算"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr "启用缓存"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "启用金手指"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "启用双核心"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "启用双核心 (加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr "启用 FPRF"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "启用空闲步进"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "启用空闲步进 (加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "启用 MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "启用逐行扫描"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr "允许屏幕保护程序"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr "启用扬声器"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "启用宽屏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "启用线框"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 "启用各向异性过滤。\n"
 "增强倾斜视角下纹理的视觉质量。\n"
 "在少部分游戏中可能造成问题。\n"
+"在 Direct3D 中调到 1x 以上的效果与启用“强制材质过滤”是一样的。\n"
 "\n"
-"如果没有把握，请选择1x。"
+"如果不确定，请选择“1x”。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
-msgstr "启用快速光盘访问。部分游戏需要。(开 = 快速，关 = 兼容)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
+msgstr ""
+"启用快速光盘访问。这会造成崩溃以及一些游戏的其他问题。（ON = 快速，OFF = 兼"
+"容）"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "启用页面"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2094,11 +2131,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 "启用此项以使用整个屏幕渲染画面。\n"
-"如果此项被禁用，一个渲染窗口将被创建。\n"
+"如果此项被禁用，画面将在一个窗口中渲染。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2110,28 +2147,25 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr "启用此项以提速《塞尔达传说：黄昏公主》。运行任何其它游戏时请禁用此项。"
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
+msgstr "启用杜比定向逻辑II模拟 5.1 环绕声。不适用于 OS X."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "启用自定义投影修正"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
-msgstr "启用杜比定向逻辑II模拟5.1环绕声。不适用于OSX。"
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
+msgstr "启用杜比定向逻辑II模拟5.1环绕声。仅适用于 OpenAL 和 Pulse 后端。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
-msgstr "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。"
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr "启用浮点结果标记运算，一些游戏需要。（开 = 兼容，关 = 快速）"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2143,13 +2177,17 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "启用内存管理单元。一些游戏需要 (开 = 兼容，关 = 快速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr "启用 Action Replay 和 Gecko 金手指代码"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2159,50 +2197,61 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr "以太网未初始化。"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "英语"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "增强"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "为新布局输入一个名字:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "条目 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "条目 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "等于"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "错误"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "加载选定语言错误。正在退回系统默认。"
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr "保存文件出错。"
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2211,7 +2260,7 @@ msgstr ""
 "错误: 在\"%s\"之后，发现了%d (0x%X)而非存档标记%d (0x%X)。正在中止读取即时存"
 "档..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2219,217 +2268,196 @@ msgid ""
 msgstr ""
 "错误:正在试图访问字体%s，但它们没有加载。游戏可能无法正确显示字体，或者崩溃。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "欢快"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "异常处理程序 - 访问下面的存储空间。 %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr "欧洲"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr "异常处理程序 - 访问下面的存储空间。0x%08x"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "执行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr "退出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr "导出所有 Wii 存档"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "导出失败"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "导出文件"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "导出录制"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "导出录制..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "导出存档"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "导出 Wii 存档 (实验性)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "导出所有存档"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr "导出失败"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "导出存档为..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "扩展"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr "外部帧缓冲 (XFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "外部参数"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "仅用于《银河战士：另一个M》的额外参数。"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "提取所有文件..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "提取应用加载器..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "提取 DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "提取目录..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "提取文件..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "提取分区..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "正在提取 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "正在提取所有文件"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "正在提取目录"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "正在提取..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr "FIFO 字节"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr "FIFO 回放器"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "法国"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST 大小:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr "连接失败！"
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "连接失败!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "下载代码失败。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "提取到 %s 失败!"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
-"无法载入 DSP ROM:\t%s\n"
-"\n"
-"使用 DSP LLE 需要此文件。\n"
-"该文件由于包含受版权保护的数据因而未包含在 Dolphin 中。\n"
-"请使用 DSPSpy 从您的真实主机中转储此文件。\n"
-"\n"
-"您可以使用不需要 ROM 转储的 DSP HLE 引擎。\n"
-"(在设置对话框的“音频”选项卡中进行选择。)"
+"无法找到新的文件名，\n"
+"%s\n"
+"将会被覆盖。"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr "监听失败。另一方的联机服务器是否在运行？"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr "无法打开输入文件“%s”。"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
-"载入 bthprops.cpl 失败! 将无法连接真实 Wii 控制器并且 Dolphin 可能出乎意料地"
-"崩溃!"
+"无法打开输出文件  \"%s\"。\n"
+"请检查是否有权限写入目标文件夹并且该媒体能够被写入。"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-"载入 hid.dll 失败! 将无法连接真实 Wii 控制器并且 Dolphin 可能出乎意料地崩溃!"
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr "读取 %s 失败"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "读取 banner.bin 失败"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr "读取bk头失败"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
-"无法读取存档中的区块 %d\n"
-"存储卡可能被截断\n"
-"文件位置:%llx"
+"读取存档中的区块 %d 失败\n"
+"记忆卡可能被截断\n"
+"文件位置：%<PRIx64>"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2437,7 +2465,7 @@ msgstr ""
 "无法正确读取区块分配表备份\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2445,17 +2473,12 @@ msgstr ""
 "无法正确读取区块分配表\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "从文件 %d 读取数据失败"
+msgid "Failed to read data from gci file %s"
+msgstr "从 GCI 文件 %s 读取数据失败。"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
-msgstr "从文件读取数据失败: %s"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2463,7 +2486,7 @@ msgstr ""
 "无法正确读取目录备份\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2471,11 +2494,7 @@ msgstr ""
 "无法正确地读取目录\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr "读取头部失败"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2483,73 +2502,64 @@ msgstr ""
 "无法正确地读取标头\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr "无法读取 %d 的文件头"
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "无法从光盘镜像读取独立 ID"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr "无法更新 SYSCONF 中的国家代码。"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "无法将 BT.DINF 写入 SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "无法写入 bkhdr"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
-msgstr "无法向文件 %s 写入数据"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
+msgstr ""
+"无法写入输出文件“%s”。\n"
+"请检查目标驱动器是否有足够多的可用空间。"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "写入文件头到 %s 失败"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "波斯语"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "快速"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr "快速深度计算"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "MMU快速版本。不是对所有游戏都有效。"
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 "致命的不同步。回放中止。(在PlayWiimote中发生错误: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr "Fifo 回放器"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr "文件信息"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr "文件大小"
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "文件未包含代码。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "文件已转换到 .cgi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2557,7 +2567,7 @@ msgstr ""
 "文件无法打开\n"
 "或没有有效的扩展名"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2566,94 +2576,107 @@ msgstr ""
 "文件扩展名为 \"%s\"\n"
 "有效扩展名为 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
-msgstr "文件不能被识别成内存卡"
+msgstr "文件不能识别为存储卡"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "文件未压缩"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO: 未知打开模式 : 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr "文件写入失败"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "文件类型 'ini' 未知! 不能打开!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"过滤所有材质，包括已明确设定为不过滤的任意游戏。\n"
+"可以提升一些游戏的某些纹理质量，但会导致其他游戏出现问题。\n"
+"在 Direct3D 模式下，设置 1x 以上的各向异性过滤与启用该选项的效果是一样的。\n"
+"\n"
+"如果不确定，请不要勾选此项。"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr "查找下一个"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr "查找上一个"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "第一个区块"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "修正校验和"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "强制 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "强制 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
-msgstr "强制使用NTSC-J"
+msgstr "强制使用 NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr "强制纹理过滤"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"强制使用纹理过滤 (即使被模拟游戏明确禁用它)。\n"
-"略微提高纹理质量但在一些游戏中会造成故障。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"强制游戏输出宽屏幕分辨率的图像。\n"
-"在一些游戏中会导致图像故障。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
-"启用NTSC-J模式后任何语言的游戏都将会使用日版中的字体。\n"
-"建议不要勾选此项，Dolphin默认使用NTSC-U模式，当运行日版游戏时这个设置会自动开"
-"启。"
+"启用 NTSC-J 模式后任何语言的游戏都将会使用日版中的字体。\n"
+"建议不要勾选此项，Dolphin 默认使用 NTSC-U 模式，当运行日版游戏时这个设置会自"
+"动开启。"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"强制游戏输出任何比例的图像。\n"
+"将图像比例设为【强制 16:9】后会使仅用 4:3 比例的游戏在 16:9 下运行。\n"
+"很少能够得到预想的结果并经常会部分破坏图像和游戏界面。\n"
+"如果使用任何 AR/Gecko 宽屏补丁代码则此项不必要而且会产生很多问题。\n"
+"\n"
+"如果不确定，请不要勾选此项。"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2661,399 +2684,444 @@ msgstr ""
 "使用ASCII格式 (NTSC\\PAL)?\n"
 "选择“否”将使用Shift-  (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "前"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr "转发端口(UPnP)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
-msgstr "找到了 '的%d个结果"
+msgid "Found %u results for '"
+msgstr "找到了 %u 个结果 '"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
-msgstr "找到 %x 存档文件"
+msgid "Found %u save files"
+msgstr "找到 %u 个存档文件"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr "帧"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr "帧"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "帧数步进"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr "使用FFV1转储帧"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr "帧信息"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr "帧范围"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "帧数跳跃(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "帧数限制:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr "录制帧数"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr "法国"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "自由视点"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr "自由视点减小速度"
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr "自由视点增加速度"
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr "自由视点下移"
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr "自由视点左移"
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr "自由视点右移"
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr "自由视点上移"
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr "自由视点重置"
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr "自由视点重置速度"
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr "自由视点拉近"
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr "自由视点远离"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "法语"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "品丝"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr "从"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "全屏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "全屏分辨率:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr "全屏分辨率："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr "GBA"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI 文件(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC手柄"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
+msgstr "GCI 文件夹"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
-msgstr "GX_CMD_INVL_VC"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr "未加载 GCI 保存文件，它的区域在该存储卡 %s 上是错误的。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr "GCMemcardDirectory: ClearBlock 被无效块地址调用"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr "GBA 游戏卡带 (*.gba)"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr "游戏 ID"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "游戏 ID:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "游戏已经运行!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "游戏没有运行!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr "游戏没有找到!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr "游戏覆盖了其他的游戏存档，数据损坏前部 %x, %x"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "特定游戏设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "游戏配置"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr "GameCube 适配器"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr "GameCube 控制器配置"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr "GameCube 控制器"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr "GameCube 存储卡 (*.raw,*.gcp)"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
-msgstr "GameCube存档文件(*.gci;*.gcs;*.sav)"
+msgstr "GameCube 存档文件 (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Gamecube 手柄设置(&P)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube 手柄设置"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko 代码"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-"Gecko码无法运行 (CT%i CST%i) (%s)\n"
-"(代码无效或不支持该类型。请将codehandler.bin文件放到Sys目录下并重启模拟器，尝"
-"试使用原生代码。)"
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "常规"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr "常规设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "德语"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr "德国"
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: 索引大于 AR 码列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "图形"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "图形设置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "大于"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"显著提高渲染到纹理效果所生成纹理的质量。\n"
+"显著提高渲染到纹理效果所生成纹理的质量。 \n"
 "提高内部分辨率将增强此选项的效果。\n"
-"轻微降低性能并有可能产生问题 (虽然可能性不大)。\n"
+"轻微提升 GPU 占用率并相对有可能产生一些图形问题。\n"
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "希腊语"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "绿"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "绿 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "绿 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "吉他 (吉他英雄)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr "修正"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr "硬件光栅处理"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "头部校检失败"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "高度"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "帮助"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"对不起，\n"
-"\n"
-"Dolphin 需要 Mac OS X 10.7 或更高版本。\n"
-"但是你运行的是较早版本的系统。\n"
-"支持 OS X 10.6 的 Dolphin 最新版本为 3.5\n"
-"请升级至 10.7 或更高来使用最新版 Dolphin。\n"
-"\n"
-"感谢您的使用！\n"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"对不起，\n"
-"\n"
-"Dolphin 需要您的 CPU 支持 SSE2 指令集。\n"
-"但是好像您的 CPU 并不支持，因此 Dolphin 将不能运行。\n"
-"\n"
-"感谢您的使用！\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "隐藏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "隐藏鼠标光标"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 "当鼠标光标位于模拟窗口前方时将其隐藏。\n"
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+"更高的数值可以在更高的帧速运行可变帧率游戏，会增加 CPU 负担。\n"
+"较低的数值可以以较低的帧速运行可变帧率游戏，节省 CPU 资源。\n"
+"\n"
+"警告：改动默认值 (100%) 可能会破坏游戏而导致故障。这样做需要您自担风险。\n"
+"请不要提交非默认时钟频率导致的错误。"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "主机"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "热键设置"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr "主机代码:"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+"主机代码长度太大。\n"
+"请重新检查你是否有正确的代码。"
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "热键"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "混合 Wii 控制器"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr "ID"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr "ID:"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS: 试图从一个未知的ticket（标签）获取数据: %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: 游戏试图重新加载一个在 NAND 转储中无效的 IOS 或标题。\n"
-"标题ID %016llx。\n"
+"IOCTL_ES_LAUNCH: 游戏试图重新加载一个在 NAND 转储中无效的标题。\n"
+"标题ID %016<PRIx64>。\n"
 "Dolphin 现在可能会中止。"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - 损坏的目标"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr "IOCTL_ES_LAUNCH: DOL 文件无效。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL 设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr "IPL 存在未知 Hash %x"
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "红外线"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "红外线指针"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "红外灵敏度:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "镜像详细信息"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "镜像目录"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "意大利"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "图标"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr "如果选择此项，边框寄存器将会更新。该设置用于纸片马里奥。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr "忽略格式变化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
@@ -3063,9 +3131,9 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
@@ -3077,125 +3145,150 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"用一个无边界的窗口来使用全屏模式而不是使用单独一个分辨率。\n"
+"这可以更快地切换全屏/窗口模式，但会造成轻微的输入延迟，移动的迟钝和性能下"
+"降。\n"
+"NVIDIA 3D 视觉需要使用单独分辨率模式和 Direct3D 后端。\n"
+"\n"
+"如果不确定，请不要勾选此项。"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "导入存档"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr "导入 Wii 存档"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr "导入失败"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"导入的文件有一个 gcs 扩展名\n"
+"导入的文件有一个 gcs 扩展名，\n"
 "但是它没有正确的文件头"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "导入的文件长度不正确"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr "导入的文件长度不正确。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"导入的文件有一个 sav 扩展名\n"
-"但是它没有正确的文件头"
+"导入的文件有一个 sav 扩展名，\n"
+"但是它没有正确的文件头。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "进游戏"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr "增加会聚"
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr "增加深度"
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr "增加帧数限制"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr "增加 IR"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "信息"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "信息"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "输入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "在这里插入加密的或者解密的代码..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "插入 SD 卡"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "在这里插入名称..."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr "在这里插入名称……"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "安装 WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "安装到 Wii 菜单"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr "安装异常处理程序已经呼叫，但是这个平台上还不支持。"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "正在安装 WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr "完整性校验失败"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr "完整性校验完成"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr "完整性校验完成。没有发现错误。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
-msgstr "分区 %d 完整性校验失败。您所转储的文件很可能已损坏或打了错误的补丁。"
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
+msgstr "%s 完整性校验失败。您所转储的文件很可能已损坏或打了错误的补丁。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr "界面"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "界面设置"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "内部 LZO 错误 - 压缩失败"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3204,103 +3297,106 @@ msgstr ""
 "内部 LZO 错误 - 解压失败 (%d) (%li, %li) \n"
 "请尝试重新加载状态"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "内部 LZO 错误 - lzo_init() 失败"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr "内部名称："
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "内部分辨率:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr "解释器 (非常慢)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "片头"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "无效大小(%x) 或 魔字(%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr "bat.map 文件或目录项目是无效的。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "无效值!"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "无效 bat.map 或 目录项目"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "无效事件类型 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "无效文件"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
-msgstr ""
-"在此 gcm 中发现了无效 opening.bnr:\n"
-"%s\n"
-"您可能需要重新转储此游戏。"
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
+msgstr "无效主机"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr "无效索引"
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "无效录制文件"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr "无效的搜索参数 (没有选择对象)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "无效的搜索字串 (无法转换成数字)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "无效的搜索字符串(仅支持相等长度的字符串)"
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "无效状态"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr "无效值。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "意大利语"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "日本"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr "意大利"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr "重复输入"
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr "JIT 重编译器 (推荐)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
-msgstr "JITIL 实验性重编译器"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
+msgstr "JITIL 重编译器（较慢，实验性）"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr "日本"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "日语"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "韩国"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr "窗口置顶"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3310,64 +3406,75 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
-msgstr "前端显示"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
+msgstr "键盘"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
 msgstr "按键"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr "踢除玩家"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr "韩国"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "韩语"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "左键"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-模拟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "语言:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr "最近 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr "延迟:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
-msgstr "左方向键"
+msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "左摇杆"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
-msgstr ""
-"左键单击检测热键。\n"
-"按空格清除。"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
+msgstr "左摇杆"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3377,7 +3484,7 @@ msgstr ""
 "中键单击清除。\n"
 "右键单击得到更多选项。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3385,203 +3492,219 @@ msgstr ""
 "左/右单击得到更多选项。\n"
 "中键单击清除。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "小于"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
-msgstr "依据FPS限速"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
+msgstr "许可"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr "限制游戏速度为给定的数值（NTSC 满速为 60, PAL 满速为 50）"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "载入"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr "加载自定义纹理"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr "载入状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr "载入最近状态 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr "载入最近状态 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr "载入最近状态 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr "载入最近状态 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr "载入最近状态 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr "载入最近状态 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr "载入最近状态 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr "载入最近状态 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "载入状态 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr "载入状态 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "载入状态 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "载入状态 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "载入状态 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "载入状态 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "载入状态 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "载入状态 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "载入状态 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr "载入状态 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "载入状态..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
-msgstr "加载Wii系统菜单"
+msgstr "加载 Wii 系统菜单"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
-msgstr "加载Wii系统菜单 %d%c"
+msgstr "加载 Wii 系统菜单 %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"加载 User/Load/Textures/<游戏 ID>/ 目录中的\n"
+"加载 <User>/Load/Textures/<游戏 ID>/ 目录中的\n"
 "自定义材质。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "从可用的修正模式加载预设值。"
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr "从选择的插槽中加载"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr "从选择的插槽中加载状态"
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr "加载了 %d 个完好函数，忽略了 %d 个损坏函数。"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr "本地主机"
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "日志"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "记录设置"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
-msgstr "记录FPS到文件"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
+msgstr "记录渲染时间到文件"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "记录类型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"将每秒渲染的帧数记录于 User/Logs/fps.txt。当您想要​\n"
-"衡量 Dolphin 的性能时可启用此功能。\n"
+"将每秒渲染的帧数记录于 <User>/Logs/fps.txt。当你想要衡量 Dolphin 的性能时可启"
+"用此功能。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "记录输出"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "记录中"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "丢失服务器连接!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "中键"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
-msgstr ""
-"MD5 不匹配\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
+msgstr "MD5 值："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU 破解加速"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark 文件(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "主摇杆"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr "制作者"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "制作者ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "制作者:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3596,35 +3719,39 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr "最大"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "内存卡中已经有了该游戏的存档"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr "这会导致 Wii 菜单和一些游戏减速。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr "存储卡已经有了这个游戏的存档。"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
-msgstr "内存卡已经打开"
+msgstr "存储卡已经打开"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr "内存字节"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
-msgstr "内存卡"
+msgstr "存储卡"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
-msgstr "内存卡管理器 ▲注意▲-使用前先备份，进行过修复但仍有可能损坏数据！"
+msgstr "存储卡管理器 【注意】使用前先备份，进行过修复但仍有可能损坏数据！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3634,44 +3761,59 @@ msgid ""
 "%s\n"
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
-"在插槽 %c 中的内存卡文件名不正确\n"
+"插槽 %c 中的存储卡文件名不正确\n"
 "没有指定区域\n"
 "\n"
 "插槽 %c 路径被修改成\n"
 "%s\n"
 "你想复制旧文件到这个新位置吗?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr "MemoryCard: ClearBlock 在无效地址中 %x 调用"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr "MemoryCard: 在无效源地址 %x 中读取调用"
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr "MemoryCard: 在无效目标地址 %x 中写入调用"
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr "存储卡文件大小与文件头大小不匹配"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "菜单"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "麦克"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr "最小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "其它"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "其它设置"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "修改者"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3682,20 +3824,24 @@ msgstr ""
 "\n"
 "如果不确定，不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr "单视场阴影"
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "等宽字体"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "动感强化器"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "马达"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3705,7 +3851,7 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
-"将鼠标指针移至某一选项上以显示详细说明\n"
+"将鼠标指针移至某一选项上以显示详细说明。\n"
 "\n"
 "\n"
 "\n"
@@ -3713,332 +3859,304 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "乘号"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr "NOP"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "注意: 流大小与真实数据长度不匹配\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "小键盘加"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "小键盘 Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "小键盘点"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "小键盘 Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "小键盘除"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "小键盘下"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "小键盘 End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "小键盘 Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "小键盘等号"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "小键盘 Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "小键盘 Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "小键盘左"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "小键盘乘"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "小键盘 Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "小键盘 Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "小键盘右"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "小键盘 Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "小键盘空格"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "小键盘减"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "小键盘 Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "小键盘上"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "名称:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "名称:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "内部 GCI 文件(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr "荷兰"
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr "联机发生不同步，已无法恢复。"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "新建扫描"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "下一页"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "下一扫描"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "昵称 :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "无国家 (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "未找到镜像或者WAD"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr "无音频输出"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "没有找到标题为 %s 的标志文件"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr "没有可用的说明"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "禁用停靠"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr "未加载文件"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "没有空闲目录索引项目"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr "没有空闲目录索引项目。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr "没有已录制文件"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "没有找到名称为 %s 的存档文件夹"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr "未找到 undo.dtm 文件，为防止出现不同步撤销载入状态操作被取消。"
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "无"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "书面挪威语"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "不等于"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "未设置"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr "不是 Wii 存档或因为文件标头大小 %x 无法读取"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "未连接"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "说明"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "说明: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "提示"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "代码数量: "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "双节棍控制器"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "双节棍加速度"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr "双节棍控制器方向"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr "双节棍控制器"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr "英伟达 3D 立体幻镜"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr "对象"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr "对象范围"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "关闭"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "偏移量:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr "屏幕显示消息"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr "在线文档(&D)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "只有 %d 区块有效"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "打开"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "打开包含文件夹(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "打开 Wii 存档目录(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "打开文件..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: 不能创建设备 %s 上下文"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: 不能找到音频设备"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: 不能打开设备 %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr "OpenCL 纹理解码器"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr "OpenMP纹理解码器"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr "在外部文本编辑器中打开本游戏的默认 (只读) 设置。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr "在外部文本编辑器中打开用户指定的覆盖设置。"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "选项"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "橙"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
@@ -4048,587 +4166,654 @@ msgstr ""
 "右键单击并导出所有存档，\n"
 "之后将存档导入一个新的记忆卡\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr "方向"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr "其他"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
-msgstr "游戏运行期间其他客户端断开连接!! NetPlay 已禁用。您需要手动停止游戏。"
+"must manually stop the game."
+msgstr "游戏运行期间其他客户端断开连接！网络对战已禁用。您需要手动停止游戏。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "输出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr "覆盖信息"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
 msgstr "播放录制(&L)..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "手柄"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "手柄"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "手柄"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "段落"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "参数"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "分区 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr "分区不存在: %lu"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "补丁"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "路径"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "暂停"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr "在影片末尾暂停"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr "窗口非活动时暂停"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr "在窗口失去输入焦点时模拟器暂停运行。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr "逐像素照明"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "完美"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "布局 %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr "平台"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "开始"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "播放录制"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "开始/暂停"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "尚可"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr "回放选项"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "玩家"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "请确认..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "存储前请先创建一个布局"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "加-减"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "波兰语"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr "端口 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "端口 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "端口 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "端口 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "端口 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "端口 :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "葡萄牙语"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr "后处理着色器配置"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙语(巴西)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr "后处理效果:"
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr "预获取自定义材质"
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "在PlayController中提前结束影片。%u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "在 PlayWiimote 中提前结束影片。%u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "在PlayWiimote 中提前结束影片。%u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "预置: "
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "上一页"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "上一页"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "上一个值"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "打印"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "预设"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "属性"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "清除缓存"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr "将 BIOS ROM 放至 User/GC/{region}."
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "询问"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "退出"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "右键"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-模拟"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "内存"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "俄罗斯"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr "半径"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "范围"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "只读模式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "真实"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr "真实平衡板"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "真实 Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr "真实 Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr "录制"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr "录制输入"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr "录制信息"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr "录制选项"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "红"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "红 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "红 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
-"减轻栅格化 3D 图像产生的混叠。\n"
-"这将使渲染出的图像看起来不那么斑驳。\n"
+"减轻栅格化 3D 图像产生的锯齿。\n"
+"这将平滑物体边缘。\n"
 "严重降低模拟速度且有时产生问题。\n"
 "\n"
 "如果没有把握，选择“无”。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "刷新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "刷新列表"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "刷新游戏列表"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr "国家"
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "移除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"将场景以线框样式渲染\n"
+"将场景以线框样式渲染。\n"
 "\n"
-"如果没有把握，请不要勾选此项"
+"如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "渲染到主窗口"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr "正在渲染"
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr "报告: GCIFolder 正在写入未分配的区块 %x"
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "重置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr "重置遍历设置"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "结果"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr "重试"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "回车"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr "修订版:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
-msgid "Right"
-msgstr "向右键"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr "版本号: %s"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
+msgid "Right"
+msgstr "右"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "右摇杆"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr "右摇杆"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "震动"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
-msgstr "在专用的线程中运行DSP LLE (不推荐: 可能导致卡死)。"
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
+msgstr "俄罗斯"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "俄语"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "保存状态(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "安全"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "保存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "保存GCI为..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr "保存最早状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr "保存状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "保存状态 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr "保存状态 10"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "保存状态 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "保存状态 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "保存状态 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "保存状态 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "保存状态 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "保存状态 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "保存状态 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr "保存状态 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "保存状态..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "另存为..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "保存压缩的GCM/镜像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "保存当前布局"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "保存解压缩的GCM/镜像"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr "向选中的插槽存储状态"
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr "保存至所选插槽"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr "保存至 /Wii/sd.raw（默认大小是 128MB）"
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "即时存档影片 %s 被破坏, 影片录制停止..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr "缩放 EFB 副本"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr "正在扫描%s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "正在扫描镜像"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "正在扫描..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "截图"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr "截图失败：无法打开文件“%s”（错误 %d）"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr "搜索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "搜索过滤"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "搜索子目录"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr "搜索当前对象"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr "搜索十六进制值:"
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
-msgstr "未在SYSCONF中找到部分%s"
+msgstr "未在SYSCONF中找到部分 %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "选择"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr "选择列"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr "选择插槽 %i"
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr "选择状态 1"
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr "选择状态 10"
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr "选择状态 2"
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr "选择状态 3"
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr "选择状态 4"
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr "选择状态 5"
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr "选择状态 6"
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr "选择状态 7"
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr "选择状态 8"
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr "选择状态 9"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr "选择状态"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "选择录制文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "选择要安装的 Wii WAD 文件"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-"选择要使用的硬件适配器。\n"
-"如果没有把握，请使用第一个。"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "选择要导入的存档"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "选择浮动窗口"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "选择要载入的文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "选择一个存档文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "选择要载入的状态"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "选择要保存的状态"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4638,275 +4823,327 @@ msgid ""
 "\n"
 "If unsure, select Auto."
 msgstr ""
-"选择渲染时使用哪种宽高比:\n"
-"自动:使用原生宽高比。\n"
-"强制 16:9: 将图像拉伸至 16:9 宽高比。\n"
-"强制 4:3: 将图像拉伸至 4:3 宽高比。\n"
-"拉伸到窗口: 将图像拉伸至窗口大小。\n"
+"选择渲染时使用哪种宽高比：\n"
+"【自动】使用原生宽高比。\n"
+"【强制 16:9】将图像拉伸至 16:9 宽高比。\n"
+"【强制 4:3】将图像拉伸至 4:3 宽高比。\n"
+"【拉伸到窗口】将图像拉伸至窗口大小。\n"
 "\n"
-"如果没有把握，请选择“自动”。"
+"如果不确定，请选择【自动】。"
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "所选控制器预设不存在"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "所选字体"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"选择要使用的硬件适配器。\n"
+"\n"
+"如果没有把握，请使用第一个。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
-"选择全屏模式所使用的显示分辨率。\n"
-"该数值应始终大于或等于内部分辨率。对性能的影响\n"
-"可以忽略。\n"
+"选择全屏模式下的显示分辨率。\n"
+"该数值应始终大于或等于内部分辨率。对性能的影响可以忽略。\n"
 "\n"
-"如果没有把握，请使用您的桌面分辨率。\n"
-"如果仍然不能确定，使用最高的有效分辨率。"
+"如果没有把握，请选择自动。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+"选择 3D 显示方式。如果硬件支持，开启此功能可使你获得更真实的立体感。\n"
+"多数 3D 电视采用左右并列或上下并列模式。\n"
+"互补色模式用于红蓝眼镜。\n"
+"严重降低模拟速度，有时会造成问题。\n"
+"\n"
+"如果没有把握，请选择关。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
-"选择供内部使用的图像应用程序接口。\n"
-"Direct3D 9 通常最快，而 OpenGL 会更加精确，\n"
-"Direct3D 11 介乎两者之间。\n"
-"请注意 Direct3D 后端只在 Windows 下可用。\n"
-"\n"
-"如果没有把握，请选择 Direct3D 11。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
-msgid ""
-"Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
-"\n"
-"If unsure, use OpenGL."
-msgstr ""
-"选择内部使用哪种图像应用程序接口。\n"
-"Direct3D 9 通常最快，而 OpenGL 更加精确，\n"
-"Direct3D 11 介乎两者之间。\n"
-"请注意 Direct3D 后端只在 Windows 下可用。\n"
+"选择在内部使用的图形接口。\n"
+"软件渲染器非常慢，仅用于调试，如果你没有特定目的请选择 OpenGL。\n"
 "\n"
 "如果没有把握，请选择 OpenGL。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
+msgid ""
+"Selects what graphics API to use internally.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
+"\n"
+"If unsure, select OpenGL."
+msgstr ""
+"选择在内部使用的图形接口。\n"
+"软件渲染器非常慢，仅用于调试，如果你没有特定\n"
+"目的请选择 Direct3D 或 OpenGL。具体显示效果因\n"
+"游戏与 GPU 而异，因此为了更好的模拟效果建议二\n"
+"者分别尝试一下，然后选择问题较少的一个。\n"
+"\n"
+"如果没有把握，请选择 OpenGL。"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "发送"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
-msgstr "传感器栏位置:"
+msgstr "感应条位置:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "Separator"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "串行端口 1 - 这是网络适配器等设备使用的端口"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr "串行端口 1 - 这是网络适配器等设备使用的端口。"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr "服务器拒绝尝试遍历"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "设置为默认镜像(&D)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
-msgstr "设置为默认内存卡 %c"
+msgstr "设置为默认存储卡 %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: 索引大于 AR 码列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr "设置 GameCube 的系统语言。"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+"将 PAL 制式 Wii 游戏的显示模式由 50Hz (576i)  改为 60Hz (480i)。\n"
+"可能并不适用于所有游戏。"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr "设置 Wii 的系统语言。"
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr "设置延迟 (以毫秒计) 。较高的值或将减少音频噼啪声。仅适用于OpenAL后端。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "设置..."
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
+msgstr "SetupWiiMemory: 无法创建 setting.txt 文件"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
-msgstr "安装Wii内存：无法创建设置文件"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "震动"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "短名称:"
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr "肩部按钮"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "显示控制台(&C)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "显示日志(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "显示状态栏(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "显示工具栏(&T)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr "显示澳大利亚"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr "显示默认值"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "显示驱动器"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr "显示 EFB 复制范围"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "显示 FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr "显示帧计数器"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "显示法国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "显示 GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr "显示德国"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "显示输入回显"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "显示意大利"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "显示日本"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "显示韩国"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr "显示掉帧计数器"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "显示语言:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "显示日志设置(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr "显示荷兰"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "显示PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "显示平台"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "显示国家"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr "显示俄罗斯"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr "显示西班牙"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr "显示统计数据"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "显示台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "显示美国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr "显示未知"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "显示 Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "显示 Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr "显示全球"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "停止游戏时显示确认对话框"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
 "当潜在的严重错误发生时显示对话框。\n"
-"禁用此项可避免恼人的及非致命的消息，但也意味着Dolphin可能在没有任何说明的情况"
-"下突然崩溃。"
+"禁用此项可避免非致命消息的打扰，但也可能导致在没有任何说明的情况下突然崩溃。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "显示第一区块"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr "显示丢帧计数器"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-"在模拟屏幕区域显示消息。\n"
-"这些消息包括记忆卡写入，视频后端和CPU信息，以及JIT缓存清除。"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "显示存档区块"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "显示存档注释"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "显示存档图标"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "显示存档标题"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4917,48 +5154,59 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "显示未知"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"显示各种统计数据。\n"
+"显示各种渲染统计数据。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr "左右并排"
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "横置 Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "大小"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr "跳过 BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
-msgstr "跳过DCBZ清除"
+msgstr "跳过 DCBZ 清除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr "跳过 EFB 访问"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"跳过 GPU 对 EFB 副本的同步。在个别游戏中导致图像缺陷。\n"
+"\n"
+"如果没有把握，请勾选此项。"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
@@ -4966,35 +5214,34 @@ msgid ""
 msgstr ""
 "以牺牲模拟准确性为代价略微提高缓存 EFB 到\n"
 "内存的速度。\n"
-"有时也会提高视觉质量。\n"
 "如果遇到任何问题，请尝试提高纹理缓存精确度或\n"
 "禁用此项。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "插槽 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "插槽 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "插槽 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "截图"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
-msgstr "软件渲染器"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
+msgstr "套接字发送至遍历服务器时出错"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -5005,234 +5252,306 @@ msgstr ""
 "该渲染器仅适用于调试目的。\n"
 "您真的想要启用软件渲染吗? 如果不确定，请选择“否”。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+"出现了一些严重的问题，已停止视频渲染。\n"
+"视频可能会出错。"
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "声音后端 %s 无效."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "声音缓冲区创建失败: %s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "空格"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr "西班牙"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr "扬声器音高"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "扬声器音量:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 "指定渲染使用的分辨率。选择较高的分辨率将显著\n"
-"提高图像质量，但也将严重影响性能且可能在一些\n"
-"游戏中引起故障。\n"
-"“640x528 的倍数”比“窗口大小”略慢，但产生更少\n"
-"问题。一般而言，内部分辨率越低，性能将越高。\n"
+"提高图像质量，但也将显著增加 GPU 负荷且可能\n"
+"在一些游戏中引起故障。\n"
+"“640x528 的倍数”采用的尺寸将比“窗口大小”略大\n"
+"然而问题更少。一般而言，内部分辨率越低，性能\n"
+"将越高。\n"
 "\n"
 "如果没有把握，请选择 640x528。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "提升光盘传输率"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "方块键"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
+"分离 CPU 与 GPU 线程，以便于在不同的核心中运行。\n"
+"在多数新型计算机中将带来大幅提速，但可能导致偶发性的崩溃或故障。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "标准控制器"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "开始"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
-msgstr "开始 NetPlay(&N)"
+msgstr "开始网络对战(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "开始录制(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr "开始录制输入(&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "开始录制"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "状态存档"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr "方向盘"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr "立体 3D 模式"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr "立体"
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "摇杆"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
-msgstr ""
-"在 GPU 材质对象中存储 EFB 副本。\n"
-"这并不十分精确，但对多数游戏来说效果足够好且与\n"
-"缓冲 EFB 到 RAM 相比有显著提速。\n"
-"\n"
-"如果没有把握，请勾选此项。"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
+msgstr "仅存储 EFB 副本为纹理"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "拉伸到窗口大小"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "弹拨"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "减号"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "成功导出文件到 %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "成功导入存档文件"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
-msgstr "瑞典语"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
+msgstr "成功导出 %u 个存档至 %s"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr "支持"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr "交换双眼"
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"交换左右眼图像。主要用于采用交叉观察法观看并排图像时。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "挥舞"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr "同步 GPU 线程"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 "同步 GPU 与 CPU 线程以帮助防止双核模式下的偶发卡死。 (开=兼容，关=快速)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr "语法错误"
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "系统语言:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "台湾"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr "TAS 输入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr "TAS 输入 - 控制器 %d"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr "TAS 输入 - 控制器 %d"
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "Tab split（标签分割）"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "左唱盘"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "右唱盘"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr "台湾"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "屏幕截图"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (森喜刚鼓)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "测试"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "材质"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr "纹理缓存"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr "纹理格式覆盖"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+"选择 \"安全\" 将降低 GPU 丢失内存中纹理更新的几率。\n"
+"较低的精确度将导致一些游戏中文字扭曲。\n"
+"\n"
+"如果没有把握，请将滑块拖动至最右端。"
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD 安装成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "地址无效"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "校检和成功修复"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr "校检和成功修复。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "选择的目录已经存在于列表"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr "所选目录已经在列表中。"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+"磁盘切换为 \"%s\" 无法保存至 .dtm 文件。\n"
+"磁盘镜像的文件名不能超过 40 个字符。"
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+"磁盘镜像“%s”已损坏。\n"
+"块 Hash %<PRIu64> 是 %08x 而不是 %08x."
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5241,220 +5560,282 @@ msgstr ""
 "文件 %s 已经存在。\n"
 "是否替换?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr "文件%s无法以写入形式打开。请检查该文件是否已经被另一程序打开。"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "文件 %s 已经打开，文件头不会被写入。"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
-#, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "您指定的文件 %s 不存在"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
 msgstr "名称不能为空"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
 msgstr "名称不能包含字符 ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/Core/Movie.cpp:184
+#, c-format
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr "被录制的游戏 (%s) 与所选游戏 (%s) 不一致"
+
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "产生的已解密 AR 代码不包含任何行。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
-msgstr ""
-"越往“安全”方向调节，模拟器丢失内存中纹理更新的\n"
-"机率越小。\n"
-"\n"
-"如果没有把握，请将滑块拖动至最右。"
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
+msgstr "您正在试图复制的存档文件大小不合法。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "您正在试图复制的存档文件大小无效"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr "您的系统不支持选定的语言。正在退回系统默认。"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
-msgstr "服务器与客户端的 NetPlay 版本不兼容!"
+msgstr "服务器与客户端的网络对战版本不兼容！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "服务器已满!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "服务器回应: 游戏正在运行!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "服务器发送了一个未知错误消息!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定的文件 \"%s\" 不存在"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "这个值无效"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr "主题:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+"以下文件夹中 gci 文件过多\n"
+"%s\n"
+"将只有前 127 个可用"
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr "没有需要撤销的操作。"
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr "必须有一个标签给 00000001/00000002。你的NAND转储可能不完整。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
-"这些设置将覆盖核心Dolphin设置。\n"
-"未决设置将使用Dolphin的设置。"
+"这些设置将覆盖核心 Dolphin 设置。\n"
+"未决设置将使用 Dolphin 的设置。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr "此Action Replay模拟器不支持修改Action Replay本身的代码。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "这会导致 Wii 菜单和一些游戏减速。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 "此功能使您能够改变游戏的摄影机。\n"
-"按住鼠标右键移动鼠标以摇动镜头，按住鼠标中键\n"
-"移动鼠标以移动。\n"
-"按住 SHIFT 并按下 WASD 中的一个将以固定步长\n"
-"移动摄影机 (SHIFT+0加速，SHIFT+9减速)。\n"
-"按SHIFT+R以重置摄影机。\n"
+"按住鼠标右键移动鼠标以平移，按住鼠标中键移动\n"
+"鼠标以移动镜头。\n"
+"按住 SHIFT 并按下 WASD 其中之一将以固定步长\n"
+"移动摄影机 (SHIFT+2 加速，SHIFT+1 减速)。\n"
+"按 SHIFT+R 以重置摄影机，按 SHIFT+F 以重置速度。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
-"该选项将游戏速度限制为制定的帧率 (NTSC全速为60，PAL全速为50) 。也可以选择音频"
-"以使用DSP限制速度 (可能修正咔嗒声但也可能导致持续的噪音，因游戏而异) 。"
+"该游戏可能与 DSP HLE 模拟不兼容，如果这是 Homebrew 请尝试使用 LLE.\n"
+"\n"
+"DSP HLE: 未知 Ucode (CRC = %08x) - 强制 AX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"这将分离视频与 CPU 线程，以便于在不同的核心中运行。\n"
-"在有多于一个核心的 PC 中将带来大幅提速，但可能导致偶发性的崩溃或故障。"
+"该游戏可能与 DSP HLE 模拟不兼容，如果这是 Homebrew 请尝试使用 LLE.\n"
+"\n"
+"未知 Ucode (CRC = %08x) - 强制 AXWii."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "这将允许你手动编辑 INI 配置文件"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr "该数值将与图像设置中设定的会聚值相加。"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr "该数值将与图像设置中设定的深度值相乘。"
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+"该版本的 Dolphin 不是从官网下载的，请到 https://dolphin-emu.org/ 下载 "
+"Dolphin."
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr "这将允许你手动编辑 INI 配置文件。"
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "阈值"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "倾斜"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr "与遍历服务器的连接超时。"
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "标题"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr "至"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "切换所有日志类型"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr "切换宽高比"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr "切换 EFB 副本"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr "切换雾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr "切换帧数限制"
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "切换全屏"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr "切换内部分辨率"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr "切换暂停"
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "顶部"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr "上下并排"
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr "遍历"
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr "遍历服务器与主机的连接超时。"
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr "遍历："
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr "尝试从非 Wii 的分区中解码数据"
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "已经尝试载入未知文件类型."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "扳机"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr "尝试创建无效存储卡索引。"
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "正在尝试从无效的 SYSCONF 中读取"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5462,41 +5843,24 @@ msgstr ""
 "正在尝试从无效的 SYSCONF 中读取\n"
 "Wiimote bt ids 不可用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "转盘 (DJ 英雄)"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "类型"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP 端口:"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wii 控制器"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "未知"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "美国"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5504,199 +5868,182 @@ msgstr ""
 "无法从给出的值中创建补丁。\n"
 "项目未修正。"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
-"无法将所输入 AR 代码的第 %lu 行作为有效的加密或解密代码进行分析。 请确保代码"
-"输入正确。\n"
-"是否要忽略此行继续分析?"
+"不能将输入的 AR 代码的第 %u 行作为加密或解密的代码分析。请检查是否输入正"
+"确。\n"
+"是否忽略此行继续分析？"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "未定义的 %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "撤销载入状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr "撤销保存状态"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "意外的 0x80 呼叫? 正在中止..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "未知"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "未知 DVD 命令 %08x - 致命错误"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr "未知指令 0x%08x"
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "未知的项目类型 %i 在 SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr "未知错误 %x"
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr "未知存储卡错误。"
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "收到未知的消息，ID： %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "收到未知的消息，ID：%d 来自玩家:%d 剔除玩家!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-msgid "Up"
-msgstr "向上键"
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr "检测到非官方版本"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
+msgid "Up"
+msgstr "上"
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "更新"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "直握 Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "使用欧洲 RGB60 模式 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr "全屏显示"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "使用十六进制"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr "使用 PAL60 模式 (EuRGB60)"
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "使用警告程序"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"使用精确度较低的算法计算深度值。\n"
-"在一些游戏中将导致问题但可能带来可观的提速。\n"
+"使用精确度较低的算法计算深度值。 \n"
+"在一些游戏中将导致问题但可能带来可观的提速，取决于游戏和/或你的GPU。\n"
 "\n"
 "如果不能确定，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"使用多个线程解码纹理。\n"
-"可能带来提速 (尤其在含有多于两个核心的 CPU 上)。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
+msgstr "使用双眼单深度缓冲，部分游戏需要。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"使用不稳定的方法来加速 OpenGL 的顶点流。在已支持\n"
-"的 GPU 中尚未发现问题，反之则可能会造成严重的稳定\n"
-"性及图像的问题。\n"
-"\n"
-"如果不确定，不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"通常情况下如果着色器编译失败将显示错误消息。\n"
-"您可以勾选此项以跳过弹窗进而保证游戏不被打扰。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "实用扩展"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "垂直同步"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr "VBeam 破解加速"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "值"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "值:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "值: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr "各项统计数据"
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "详细"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr "顶点流破解"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "视频"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "虚拟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr "减小音量"
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr "静音切换"
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr "增大音量"
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD 安装失败: 创建 %s 错误"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD 安装失败：创建标签错误"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5708,25 +6055,27 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "警告 - 正在错误的终端模式下开始 DOL！"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "警告 - 正在错误的终端模式下开始 ELF！"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "警告 - 正在错误的终端模式下开始 ISO！"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr "电池报警格子数 %d 与已载入的文件头 %d 不匹配"
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5737,7 +6086,7 @@ msgstr ""
 "%s\n"
 "现在继续吗?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5749,7 +6098,7 @@ msgstr ""
 "%s\n"
 "要继续吗?"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5759,7 +6108,17 @@ msgstr ""
 "警告: 您读取的存档在当前影片结束之后。 (字节%u > %u) (帧%u > %u) 。您需要读取"
 "另一个存档方可继续，或关闭只读模式再读取此状态存档。"
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+"警告: 您读取的存档影片已结束在存档的当前帧之前(字节%u < %u) (帧%u < %u)。您需"
+"要读取另一个存档方可继续。"
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5769,7 +6128,7 @@ msgstr ""
 "警告: 您读取的存档在 %d (0x%X) 字节处与影片不匹配。您需要读取另一个存档方可继"
 "续，或关闭只读模式再读取此状态存档。否则将可能发生不同步。"
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5800,178 +6159,167 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "波形文件写入器 - 文件未打开."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "颤音"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
-msgstr "强制宽屏"
+msgstr "宽屏修正"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "宽度"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii 控制台"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr "Wii NAND 根目录:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 存档文件 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: 不能从文件读取"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
+msgstr "Wii控制器"
+
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
 msgstr "Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr "Wii 控制器 %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr "Wii 控制器 %i %s"
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wii 控制器已连接"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wii 控制器马达"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wii 控制器设置"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr "Wii 控制器"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "左 Windows"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "菜单键"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "右 Windows"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "自动换行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "工作中..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr "世界"
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr "写入存储卡 (GC)"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "写入到控制台"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr "写入到调试器"
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "写入到文件"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "写入到窗口"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 CreateSourceVoice failed: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
+msgstr "X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 加载失败: %#X"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr "XF 寄存器"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 主声音创建失败: %#X"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr "Y"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
-msgstr "XF 注册"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黄"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-"您正在使用 Dolphin 团队制作的自由 DSP ROM。\n"
-"所有 Wii 游戏都能正确运行，多数GC游戏也将运行良好，但GBA/IPL/CARD UCode将无法"
-"运行。\n"
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-"您正在使用 Dolphin 团队制作的旧版自由 DSP ROM。\n"
-"只有使用塞尔达 UCode 的游戏能够正确运行。\n"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "你不能关闭含有页面的面板。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "您必须选择一个游戏!!"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
+"在转储帧时你调整了窗口大小，这将无法正确处理。\n"
+"你的视频可能会损坏。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "您必须输入一个名称!"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr "您必须选择一个游戏！"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr "您必须输入一个名称。"
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "您必须输入一个有效的十进制、十六进制或八进制值。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "您必须输入一个有效的预设名称。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
-msgstr "您必须重新启动Dolphin以使改动生效。 "
+msgstr "您必须重新启动 Dolphin 以使改动生效。"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
@@ -5981,7 +6329,7 @@ msgstr ""
 "是否要现在停止以处理这个问题?\n"
 "如果选择“否”，声音可能会出现混乱。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5989,36 +6337,36 @@ msgstr ""
 "您的 GCM/ISO 文件似乎是无效的 (无效的国家)。\n"
 "是否要使用 PAL 地区继续?"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
 "您的 SYSCONF 文件大小不正确。\n"
-"正确的大小为 0x%04x (但您的是 0x%04llx)\n"
-"是否要生成一个新的?"
+"正确的大小为 0x%04x (但您的是 0x%04<PRIx64>)\n"
+"是否要生成一个新的？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "塞尔达传说：黄昏公主 修正"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr "Z"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 代码不支持"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
 msgstr "Dophin 未知的 Zero 代码: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ 等待中 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -6030,76 +6378,30 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[自定义]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[实验性]\n"
-"使用 OpenCL 框架将纹理解码工作转载至 GPU 旨在\n"
-"提高模拟速度。\n"
-"然而目前已知在多款游戏中会导致纹理缺陷。并且\n"
-"多数情况下比常规的 CPU 纹理解码要慢。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"[实验性]\n"
-"通过缓存显示列表略微提高模拟速度。\n"
-"然而也可能产生问题。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "应用程序载入器 (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Reading Opcode from %x. Please report."
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr "自动"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr "伪装-完成"
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr "无"
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr "未知的类型 %d (预期为 %d)"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr "接收到未知消息"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
-msgstr "wxExecute returned -1 on application run!"
+msgstr "wxExecute 在应用运行时返回了  -1！ "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "远剪裁平面修正: "
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "近剪裁平面修正: "
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| 或"
diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po
index a4ef9eb2fd..3e0ff80767 100644
--- a/Languages/po/zh_TW.po
+++ b/Languages/po/zh_TW.po
@@ -1,17 +1,19 @@
-# Translation of dolphin-emu.pot to Traditional Chinese
+# Translation of dolphin-emu.pot to LANGUAGE
 # Copyright (C) 2003-2013
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# khiav <khiav1118@yahoo.com.tw>, 2011
-# Sentret_C <sentret_c@sina.cn>, 2013
+# khiav kn <khiav1118@yahoo.com.tw>, 2011
+# khiav kn <khiav1118@yahoo.com.tw>, 2011
+# Ryan Zhou <sentret_c@sina.cn>, 2013
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:151
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-09 06:28-0500\n"
-"PO-Revision-Date: 2013-09-10 08:16+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
+"POT-Creation-Date: 2015-06-07 10:44+0000\n"
+"PO-Revision-Date: 2015-06-07 10:44+0000\n"
+"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/dolphin-"
 "emu/language/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -20,21 +22,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:516
+#: Source/Core/DolphinWX/AboutDolphin.cpp:56
+msgid ""
+"\n"
+"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+"\n"
+"This software should not be used to play games you do not legally own.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:527
+msgid " (internal IP)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:269
 msgid " (too many to display)"
 msgstr " (要顯示的項目太多)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:521
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:558
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:106
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:416
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:454
 msgid " Game : "
 msgstr " 遊戲："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:542
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:588
 msgid "! NOT"
 msgstr "! 非"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#: Source/Core/Core/HW/GCMemcard.cpp:31
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,413 +57,446 @@ msgstr ""
 "\"%s\" 不存在。\n"
 " 是否建立新的 16MB 記憶卡？"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:144
+#: Source/Core/DiscIO/CompressedBlob.cpp:177
+#, c-format
+msgid "\"%s\" failed to be scrubbed. Probably the image is corrupt."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:153
+#, c-format
+msgid "\"%s\" is already compressed! Cannot compress it further."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:178
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr "\"%s\" 為無效的 GCM/ISO 檔案，或非 GC/Wii ISO。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:730
-#, c-format
-msgid "%08X:  "
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#: Source/Core/DolphinWX/MemcardManager.cpp:201
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s複製%1$s"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:120
+#: Source/Core/VideoBackends/D3D/main.cpp:116
 #, c-format
 msgid "%d samples"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:119
+#: Source/Core/VideoBackends/D3D/main.cpp:114
 #, c-format
 msgid "%d samples (quality level %d)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:165
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:66
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it has the same internal filename as previously "
+"loaded save\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:86
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" File size (%<PRIx64>) does not match the size recorded in the header (%d)"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:77
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because it is an invalid gci.\n"
+" Number of blocks claimed to be %d"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:116
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there are not enough free blocks on virtual memorycard"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:107
+#, c-format
+msgid ""
+"%s\n"
+"was not loaded because there is less than 10%% free space on the memorycard\n"
+"Total Blocks: %d; Free Blocks: %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:422
+#, c-format
+msgid "%s (Disc %i)"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:188
+#, c-format
+msgid "%s IPL found in %s directory. The disc might not be recognized"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:192
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:371
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s 已經存在，是否覆寫？"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
-#, c-format
-msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "抹除 %s 失敗。也許檔案是不正確的。"
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#: Source/Core/Core/HW/GCMemcard.cpp:56
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#: Source/Core/Core/HW/GCMemcard.cpp:71
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#: Source/Core/Core/HW/GCMemcard.cpp:51
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:410
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:219
 #, c-format
-msgid "%s failed to open"
-msgstr "開啟 %s 失敗"
-
-#: Source/Core/Core/Src/x64MemTools.cpp:182
-#, c-format
-msgid "%s failed: kr=%x"
+msgid ""
+"%s is not a directory, failed to move to *.original.\n"
+" Verify your write permissions or move the file outside of Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:403
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:213
 #, c-format
-msgid "%s is a 0 byte file"
-msgstr "%s 為 0 位元的檔案"
+msgid "%s was not a directory, moved to *.original"
+msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
-#, c-format
-msgid "%s is already compressed! Cannot compress it further."
-msgstr "%s 已經被壓縮過了！無法再次進行壓縮。"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:388
-#, c-format
-msgid "%s is too long for the filename, max chars is 45"
-msgstr "%s 做為檔名太長了，最多允許 45 個位元"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/MemcardManager.cpp:207
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s刪除%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#: Source/Core/DolphinWX/MemcardManager.cpp:205
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s匯出 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#: Source/Core/DolphinWX/MemcardManager.cpp:203
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s匯入 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#: Source/Core/DolphinWX/MemcardManager.cpp:786
 #, c-format
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "剩餘 %u 個區塊；剩餘 %u 個目錄項目"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:558
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:587
 msgid "&& AND"
 msgstr "和(&&)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:303
+#: Source/Core/DolphinWX/FrameTools.cpp:383
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
-msgid "&Boot from DVD Drive..."
-msgstr "從 DVD 光碟機啟動(&B)..."
+#: Source/Core/DolphinWX/FrameTools.cpp:230
+msgid "&Audio Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/FrameTools.cpp:133
+msgid "&Boot from DVD Backup..."
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:283
 msgid "&Breakpoints"
 msgstr "中斷點(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+#: Source/Core/DolphinWX/FrameTools.cpp:145
 msgid "&Browse for ISOs..."
 msgstr "瀏覽 ISO 檔(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
-msgid "&Cheats Manager"
-msgstr "作弊檔管理器(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:245
+msgid "&Cheat Manager"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
-msgid "&DSP Settings"
-msgstr "DSP 設定(&D)"
+#: Source/Core/DolphinWX/FrameTools.cpp:231
+msgid "&Controller Settings"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:879
+#: Source/Core/DolphinWX/GameListCtrl.cpp:859
 msgid "&Delete ISO..."
 msgstr "刪除 ISO 檔(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+#: Source/Core/DolphinWX/GameListCtrl.cpp:886
 msgid "&Delete selected ISOs..."
 msgstr "刪除已選取的 ISO 檔(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:172
+#: Source/Core/DolphinWX/FrameTools.cpp:199
 msgid "&Emulation"
 msgstr "模擬器(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+#: Source/Core/DolphinWX/FrameTools.cpp:148
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:343
+#: Source/Core/DolphinWX/FrameTools.cpp:418
 msgid "&Frame Advance"
 msgstr "畫格步進(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:360
+#: Source/Core/DolphinWX/FrameTools.cpp:435
 msgid "&Fullscreen"
 msgstr "全螢幕(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/FrameTools.cpp:381
+msgid "&GitHub Repository"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:229
 msgid "&Graphics Settings"
 msgstr "影像設定(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:304
+#: Source/Core/DolphinWX/FrameTools.cpp:384
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:232
 msgid "&Hotkey Settings"
 msgstr "快捷鍵設定(&D)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+#: Source/Core/DolphinWX/FrameTools.cpp:285
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/FrameTools.cpp:173
 msgid "&Load State"
 msgstr "讀取進度(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/FrameTools.cpp:242
 msgid "&Memcard Manager (GC)"
 msgstr "GC 記憶卡管理器(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+#: Source/Core/DolphinWX/FrameTools.cpp:284
 msgid "&Memory"
 msgstr "記憶卡(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:223
+msgid "&Movie"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:396
 msgid "&Open..."
 msgstr "開啟(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:238
 msgid "&Options"
 msgstr "選項(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/FrameTools.cpp:407
 msgid "&Pause"
 msgstr "暫停(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:334
+#: Source/Core/DolphinWX/FrameTools.cpp:409
 msgid "&Play"
 msgstr "執行(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861
+#: Source/Core/DolphinWX/GameListCtrl.cpp:841
 msgid "&Properties"
 msgstr "屬性(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:356
-msgid "&Read-only mode"
-msgstr "唯讀模式(&R)"
+#: Source/Core/DolphinWX/FrameTools.cpp:431
+msgid "&Read-Only Mode"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:327
+#: Source/Core/DolphinWX/FrameTools.cpp:402
 msgid "&Refresh List"
 msgstr "更新列表(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/FrameTools.cpp:281
 msgid "&Registers"
 msgstr "寄存器(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:340
+#: Source/Core/DolphinWX/FrameTools.cpp:415
 msgid "&Reset"
 msgstr "重新啟動(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+#: Source/Core/DolphinWX/FrameTools.cpp:286
 msgid "&Sound"
 msgstr "聲音(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:337
+#: Source/Core/DolphinWX/FrameTools.cpp:412
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:211
+#: Source/Core/DolphinWX/FrameTools.cpp:264
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:239
+#: Source/Core/DolphinWX/FrameTools.cpp:287
 msgid "&Video"
 msgstr "影像(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:288
+#: Source/Core/DolphinWX/FrameTools.cpp:368
 msgid "&View"
 msgstr "檢視(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
-msgid "&Wiimote Settings"
-msgstr "Wiimote 設定(&W)"
+#: Source/Core/DolphinWX/FrameTools.cpp:282
+msgid "&Watch"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:862
+#: Source/Core/DolphinWX/FrameTools.cpp:379
+msgid "&Website"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:842
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
-msgid "'"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:55
+msgid "(Error: Bad host)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
-msgid "(-)+zFar"
-msgstr "(-)+zFar"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:59
+msgid "(Error: Disconnected)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
-msgid "(-)+zNear"
-msgstr "(-)+zNear"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:57
+msgid "(Error: Dolphin too old)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
-msgid "(UNKNOWN)"
-msgstr "(未知)"
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:61
+msgid "(Error: Socket)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:385
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:63
+msgid "(Error: Timeout)"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:65
+msgid "(Error: Unknown)"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:51
+msgid ""
+"(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of "
+"Nintendo. Dolphin is not affiliated with Nintendo in any way."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:724
 msgid "(off)"
 msgstr "(關閉)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:559
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:589
 msgid "+ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:663
-msgid "0x44"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
-msgid "16 bit"
-msgstr "16 位元"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "16-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "1x Native (640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "2.5x Native (1600x1320)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:352
 msgid "2x Native (1280x1056)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:149
-msgid "32 bit"
-msgstr "32 位元"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413
-msgid "3D Vision"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "32-bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "3x Native (1920x1584)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
 msgid "4x Native (2560x2112)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:147
-msgid "8 bit"
-msgstr "8 位元"
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:43
+msgid "8-bit"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:40
 msgid "<Insert name here>"
 msgstr "<插入名稱>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:279
 msgid "<No resolutions found>"
 msgstr "<無解析度設定>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:26
 msgid "<Nothing>"
 msgstr "<無>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
-msgid "<Press Key>"
-msgstr "<按任意鍵>"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
-msgid "<System>"
-msgstr "<系統>"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:704
-msgid "A"
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:72
+msgid "<System Language>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:233
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:266
-msgid "A NetPlay window is already open!!"
-msgstr "已經開啟一個網路對戰視窗！！"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:292
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:348
+msgid "A NetPlay window is already open!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:370
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:404
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:130
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:162
 msgid "A game is not currently running."
 msgstr "目前沒有執行遊戲。"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:85
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:320
 msgid ""
-"A supported bluetooth device could not be found.\n"
-"You must manually connect your wiimotes."
+"A supported Bluetooth device could not be found.\n"
+"You must manually connect your Wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:104
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:118
 msgid ""
 "ALERT:\n"
 "\n"
 "Netplay will only work with the following settings:\n"
-" - Enable Dual Core [OFF]\n"
 " - DSP Emulator Engine Must be the same on all computers!\n"
 " - DSP on Dedicated Thread [OFF]\n"
-" - Framelimit NOT set to [Audio]\n"
+" - Manually set the extensions for each Wiimote\n"
 "\n"
 "All players should use the same Dolphin version and settings.\n"
 "All memory cards must be identical between players or disabled.\n"
-"Wiimote support has not been implemented!\n"
+"Wiimote support is probably terrible. Don't use it.\n"
 "\n"
-"The host must have the chosen TCP port open/forwarded!\n"
+"If connecting directly host must have the chosen UDP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:99
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:54
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:34
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:105
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/ISOProperties.cpp:323
 msgid "AR Codes"
 msgstr "AR 代碼"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+#: Source/Core/DolphinWX/AboutDolphin.h:14
 msgid "About Dolphin"
 msgstr "關於 Dolphin"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
-msgid "Acceleration"
-msgstr "加速"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:494
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
-msgid ""
-"Accurately emulate EFB copies.\n"
-"Some games depend on this for certain graphical effects or gameplay "
-"functionality.\n"
-"\n"
-"If unsure, check EFB to Texture instead."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:255
-msgid "Action"
-msgstr "操作"
-
-#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#: Source/Core/Core/ARDecrypt.cpp:478
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -464,20 +511,20 @@ msgstr ""
 "兇手代碼：\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:657
+#: Source/Core/Core/ActionReplay.cpp:476
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於添加的代碼 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:745
+#: Source/Core/Core/ActionReplay.cpp:564
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於輸入 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:537
+#: Source/Core/Core/ActionReplay.cpp:356
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -485,7 +532,7 @@ msgid ""
 msgstr ""
 "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於 Ram 寫入及 輸入 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:597
+#: Source/Core/Core/ActionReplay.cpp:416
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -493,199 +540,164 @@ msgid ""
 msgstr ""
 "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於寫入至 指示器 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:792
+#: Source/Core/Core/ActionReplay.cpp:611
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay 錯誤：無效的數值 (%08x) 於記憶體複製 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:672
+#: Source/Core/Core/ActionReplay.cpp:491
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:184
+#: Source/Core/Core/ActionReplay.cpp:181
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay 錯誤：無效的 AR 代碼行： %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:862
+#: Source/Core/Core/ActionReplay.cpp:727
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay：有條件的代碼：無效的大小 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:935
+#: Source/Core/Core/ActionReplay.cpp:695
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay：無效的一般代碼類型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:886
+#: Source/Core/Core/ActionReplay.cpp:751
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:828
+#: Source/Core/Core/ActionReplay.cpp:647
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:248
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:181
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:203
+msgid "Adapter Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:160
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:205
+msgid "Adapter Not Detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:263
 msgid "Adapter:"
 msgstr "配接器："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+#: Source/Core/DolphinWX/WXInputBase.cpp:68
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:80
 msgid "Add"
 msgstr "新增"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1330
+#: Source/Core/DolphinWX/ISOProperties.cpp:1464
 msgid "Add ActionReplay Code"
 msgstr "新增 ActionReplay 代碼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1259
+#: Source/Core/DolphinWX/ISOProperties.cpp:1384
 msgid "Add Patch"
 msgstr "新增修正"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
-msgid "Add new pane"
-msgstr "新增面版"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:435
+#: Source/Core/DolphinWX/ISOProperties.cpp:456
 msgid "Add..."
 msgstr "新增..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-msgid "Address :"
-msgstr "位址..."
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
-msgid ""
-"Adds the specified value to zFar Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"添加指定的值到 zFar 參數。n兩種方法傳遞浮點值。\n"
-"例如：直接輸入 ''200'' 或 ''0.0002'' 它提供等值效果，取得的值將是 "
-"''0.0002''。\n"
-"值：(0->+/-整數) 或 (0->+/-FP[6 個小數點精確度])\n"
-"\n"
-"注意：檢查日誌/控制台視窗檢視取得的值。"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
-msgid ""
-"Adds the specified value to zNear Parameter.\n"
-"Two ways to express the floating point values.\n"
-"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
-"the acquired value will be ''0.0002''.\n"
-"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
-"\n"
-"NOTE: Check LogWindow/Console for the acquired values."
-msgstr ""
-"添加指定的值到 zNear 參數。\n"
-"兩種方法傳遞浮點值。\n"
-"例如：直接輸入 ''200'' 或 ''0.0002'' 它提供等值效果，取得的值將是 "
-"''0.0002''。\n"
-"值：(0->+/-整數) 或 (0->+/-FP[6 個小數點精確度])\n"
-"\n"
-"注意：檢查日誌/控制台視窗檢視取得的值。"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:808
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:840
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "調整模擬搖桿控制壓力需要活動的按鈕。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:537
 msgid "Advanced"
 msgstr "進階"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:81
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:620
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:679
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:809
-msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1171
+msgid "All GameCube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
-msgid "All Gamecube GCM files (gcm)"
-msgstr "所有 Gamecube GCM 檔案 (gcm)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
+#: Source/Core/DolphinWX/FrameTools.cpp:1587
+#: Source/Core/DolphinWX/FrameTools.cpp:1601
 msgid "All Save States (sav, s##)"
 msgstr "所有即時存檔 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1169
 msgid "All Wii ISO files (iso)"
 msgstr "所有 Wii ISO 檔案 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1189
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
-msgid "All files (*.*)|*.*"
-msgstr "所有檔案 (*.*)|*.*"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Anaglyph"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:271
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:265
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:286
+#: Source/Core/InputCommon/ControllerEmu.cpp:206
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:385
 msgid "Anisotropic Filtering:"
 msgstr "各向異性過濾："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:359
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:369
 msgid "Anti-Aliasing:"
 msgstr "邊緣抗鋸齒："
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+#: Source/Core/DolphinWX/ISOProperties.cpp:482
+msgid "Apploader Date:"
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeDirectory.cpp:300
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "程式讀取器為錯誤的大小...它是程式讀取器嗎？"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+#: Source/Core/DiscIO/VolumeDirectory.cpp:294
 msgid "Apploader unable to load from file"
 msgstr "程式讀取器無法從檔案中讀取"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:834
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:77
 msgid "Apploader:"
 msgstr "程式讀取器："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:124
 msgid "Apply"
 msgstr "套用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:141
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
-msgid "Arabic"
-msgstr "阿拉伯語"
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:667
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:697
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "是否確認刪除 \"%s\" ？"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015
+#: Source/Core/DolphinWX/GameListCtrl.cpp:998
 msgid ""
 "Are you sure you want to delete these files?\n"
 "They will be gone forever!"
@@ -693,297 +705,330 @@ msgstr ""
 "是否真的要刪除這些檔案？\n"
 "刪了之後就回不來了哦！"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1006
+#: Source/Core/DolphinWX/GameListCtrl.cpp:989
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:45
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:364
+msgid "Are you trying to use the same file in both slots?"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:30
 msgid "Arm JIT (experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:32
+msgid "Arm64 JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:65
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:296
 msgid "Aspect Ratio:"
 msgstr "畫面比例："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+#: Source/Core/DolphinWX/FrameAui.cpp:75
 msgid "At least one pane must remain open."
 msgstr "必須剩餘至少一個面板。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:59
+msgid ""
+"Attempt to detect and skip wait-loops.\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:72
+#: Source/Core/DolphinWX/FrameTools.cpp:554
 msgid "Audio"
 msgstr "聲音"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:66
 msgid "Audio Backend:"
 msgstr "聲音裝置："
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+#: Source/Core/DolphinWX/FrameTools.cpp:554
+msgid "Audio settings"
+msgstr ""
+
+#: Source/Core/AudioCommon/AOSoundStream.cpp:27
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/ISOProperties.cpp:141
+msgid "Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/AboutDolphin.cpp:61
+msgid "Authors"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:44
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:153
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Auto"
 msgstr "自動"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Multiple of 640x528)"
 msgstr "自動 (640x528 的倍數)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:351
 msgid "Auto (Window Size)"
 msgstr "自動 (視窗尺寸)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:315
 msgid "Auto adjust Window Size"
 msgstr "自動調整視窗尺寸"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:100
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:705
-msgid "B"
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:530
+msgid "BAT Incorrect, Dolphin will now exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:763
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+#: Source/Core/DolphinWX/WXInputBase.cpp:19
 msgid "Back"
 msgstr "返回"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:685
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:71
 msgid "Backend Settings"
 msgstr "裝置設定"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:212
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:58
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:235
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+#: Source/Core/Core/HotkeyManager.cpp:228
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:246
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:299
+#: Source/Core/Core/HW/GCPadEmu.cpp:85
 msgid "Background Input"
 msgstr "背景輸入"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
+#: Source/Core/InputCommon/ControllerEmu.cpp:188
 msgid "Backward"
 msgstr "向後"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:305
-msgid "Bad File Header"
-msgstr "損壞的檔頭"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:283
 msgid "Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:293
+#: Source/Core/DolphinWX/GameListCtrl.cpp:268
+#: Source/Core/DolphinWX/MemcardManager.cpp:644
+#: Source/Core/DolphinWX/FrameTools.cpp:353
 msgid "Banner"
 msgstr "橫幅"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:537
+#: Source/Core/DolphinWX/ISOProperties.cpp:595
 msgid "Banner Details"
 msgstr "圖示明細"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499
+#: Source/Core/DolphinWX/ISOProperties.cpp:551
 msgid "Banner:"
 msgstr "橫幅："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:322
 msgid "Basic"
 msgstr "基本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:75
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:304
+msgid "Battery"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:147
 msgid "Block Allocation Table checksum failed"
 msgstr "區塊分配表校驗失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+#: Source/Core/DolphinWX/MemcardManager.cpp:648
 msgid "Blocks"
 msgstr "區塊"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "藍"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "藍 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "藍 右"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:594
+msgid "Borderless Fullscreen"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Bottom"
 msgstr "下方"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:229
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:250
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "綁定控制器：%lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/AboutDolphin.cpp:52
+#, c-format
+msgid "Branch: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:382
 msgid "Broken"
 msgstr "破損"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse"
 msgstr "瀏覽"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246
+#: Source/Core/DolphinWX/GameListCtrl.cpp:221
 msgid "Browse for a directory to add"
 msgstr "瀏覽要新增的資料夾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:461
+#: Source/Core/DolphinWX/FrameTools.cpp:545
 msgid "Browse for an ISO directory..."
 msgstr "瀏覽 ISO 資料夾..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1082
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1058
 msgid "Browse for output directory"
 msgstr "瀏覽輸出的資料夾"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:347
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:194
 msgid "Buffer:"
 msgstr "緩衝："
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:108
+#: Source/Core/DolphinWX/TASInputDlg.cpp:122
+#: Source/Core/DolphinWX/TASInputDlg.cpp:228
+#: Source/Core/DolphinWX/TASInputDlg.cpp:328
+#: Source/Core/Core/HW/GCPadEmu.cpp:61
 msgid "Buttons"
 msgstr "按鈕"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:83
+msgid "Bypass XFB"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:338
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "C"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:65
+#: Source/Core/DolphinWX/TASInputDlg.cpp:312
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+#: Source/Core/Core/HW/GCPadEmu.cpp:67
 msgid "C-Stick"
 msgstr "C-搖桿"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:774
-msgid "CP reg"
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:774
+msgid "CP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:56
 msgid "CPU Emulator Engine"
 msgstr "CPU 模擬引擎"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
-msgid "Cache Display Lists"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:52
+msgid "CPU Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:134
 msgid ""
-"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
-"Decreases emulation speed by some percent (depending on your GPU).\n"
-"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"Cache custom textures to system RAM on startup.\n"
+"This can require exponentially more RAM but fixes possible stuttering.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1848
-#, c-format
-msgid "Can't find WiiMote by connection handle %02x"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:111
+msgid ""
+"Calculates lighting of 3D objects per-pixel rather than per-vertex, "
+"smoothing out the appearance of lit polygons and making individual triangles "
+"less noticeable.\n"
+"Rarely causes slowdowns or graphical issues.\n"
+"\n"
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:672
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:682
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1876
+#, c-format
+msgid "Can't find Wiimote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/HW/DVDInterface.cpp:343
 msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:114
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:126
+#: Source/Core/DolphinWX/WXInputBase.cpp:33
 msgid "Cancel"
 msgstr "取消"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:124
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:219
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:281
-#, c-format
-msgid "Cannot open %s"
-msgstr "無法開啟 %s"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:128
-msgid "Cannot unregister events with events pending"
-msgstr "事件未決定時無法註銷事件"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1073
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:314
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
-"is not a valid gamecube memory card file"
+"is not a valid GameCube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1103
-msgid ""
-"Cannot use that file as a memory card.\n"
-"Are you trying to use the same file in both slots?"
-msgstr ""
-"無法使用此檔案作為記憶卡。\n"
-"您要在相同的插槽中使用相同的檔案嗎？"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/WXInputBase.cpp:44
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
-msgid "Catalan"
-msgstr "加泰隆尼亞語"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+#: Source/Core/InputCommon/ControllerEmu.cpp:219
 msgid "Center"
 msgstr "中心"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:587
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:21
 msgid "Change"
 msgstr "更改"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/GameListCtrl.cpp:876
+msgid "Change &Disc"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:399
 msgid "Change &Disc..."
 msgstr "更換光碟(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/Core/HotkeyManager.cpp:14
 msgid "Change Disc"
 msgstr "更換光碟"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:579
+#: Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp:13
 msgid "Change Game"
 msgstr "更換遊戲"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503
+#: Source/Core/Core/Movie.cpp:1113
+#, c-format
+msgid "Change the disc to %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -991,283 +1036,318 @@ msgstr ""
 "更改用戶界面語系。\n"
 "需要重新啟動。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
-msgid "Changes sign to zFar Parameter (after correction)"
-msgstr "更改 zFar 參數符號 (在修正後)"
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:49
+msgid "Changing this will have no effect while the emulator is running."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
-msgid "Changes sign to zNear Parameter (after correction)"
-msgstr "更改 zNear 參數的符號 (在修正後)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507
-msgid "Changing this will have no effect while the emulator is running!"
-msgstr "更改此選項在模擬器執行時沒有效果！"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:132
 msgid "Chat"
 msgstr "聊天"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:46
 msgid "Cheat Code"
 msgstr "作弊代碼"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:167
+msgid "Cheat Manager"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:120
 msgid "Cheat Search"
 msgstr "尋找作弊代碼"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:17
-msgid "Cheats Manager"
-msgstr "作弊代碼管理器"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:645
+#: Source/Core/DolphinWX/ISOProperties.cpp:723
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
+#: Source/Core/DolphinWX/AboutDolphin.cpp:55
+msgid "Check for updates: "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
-msgid "Chinese (Simplified)"
-msgstr "Chinese (Simplified)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
-msgid "Chinese (Traditional)"
-msgstr "Chinese (Traditional)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:45
 msgid "Choose a DVD root directory:"
 msgstr "選擇一個 DVD 根目錄："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:49
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:808
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:42
 msgid "Choose a default ISO:"
 msgstr "選擇一個預設 ISO："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1233
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:128
 msgid "Choose a directory to add"
 msgstr "選擇一個要添加的資料夾"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1060
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:299
 msgid "Choose a file to open"
 msgstr "選擇一個要開啟的檔案"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+#: Source/Core/DolphinWX/MemcardManager.cpp:222
 msgid "Choose a memory card:"
 msgstr "選擇一個記憶卡："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:46
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr "選擇作為程式讀取器的檔案：(僅用於來讀取 光碟的目錄結構)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:793
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:834
+#: Source/Core/DolphinWX/ISOProperties.cpp:861
+#: Source/Core/DolphinWX/ISOProperties.cpp:914
 msgid "Choose the folder to extract to"
 msgstr "選擇提取的資料夾存放位置"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+#: Source/Core/InputCommon/ControllerEmu.cpp:205
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:537
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:968
+#: Source/Core/DolphinWX/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:569
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1005
+#: Source/Core/DolphinWX/LogWindow.cpp:130
 msgid "Clear"
 msgstr "清除"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:230
+#: Source/Core/Core/NetPlayServer.cpp:338
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉。您必須手動停止遊戲。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:587
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:627
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:278
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:132
+#: Source/Core/DolphinWX/MemcardManager.cpp:252
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:608
 msgid "Close"
 msgstr "關閉"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:227
 msgid "Co&nfigure..."
 msgstr "設定(&N)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:63
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:75
 msgid "Code Info"
 msgstr "代碼訊息"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:28
 msgid "Code: "
 msgstr "代碼："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/WXInputBase.cpp:40
 msgid "Command"
 msgstr "命令"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+#: Source/Core/DolphinWX/MemcardManager.cpp:646
 msgid "Comment"
 msgstr "註釋"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497
-msgid "Comment:"
-msgstr "註釋："
+#: Source/Core/DolphinWX/AboutDolphin.cpp:54
+#, c-format
+msgid "Compiled: %s @ %s"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:887
+#: Source/Core/DolphinWX/GameListCtrl.cpp:867
 msgid "Compress ISO..."
 msgstr "壓縮 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:902
+#: Source/Core/DolphinWX/GameListCtrl.cpp:888
 msgid "Compress selected ISOs..."
 msgstr "壓縮選擇的 ISO 檔..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Compressing ISO"
 msgstr "正在壓縮 ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/ISOProperties.cpp:488
+msgid "Compute"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1249
+#: Source/Core/DolphinWX/ISOProperties.cpp:1262
+msgid "Computing MD5 checksum"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:395
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Config"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:125
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:144
+#: Source/Core/DolphinWX/InputConfigDiag.h:130
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:234
 msgid "Configure"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:102
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:130
 msgid "Configure Control"
 msgstr "設定控制器"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:327
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:606
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:174
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:14
 msgid "Configure Pads"
 msgstr "設定控制器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:468
+#: Source/Core/DolphinWX/FrameTools.cpp:552
 msgid "Configure..."
 msgstr "模擬器設定..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1122
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1150
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1220
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1101
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1129
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1199
 msgid "Confirm File Overwrite"
 msgstr "確認檔案覆蓋"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:99
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:78
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:95
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:114
 msgid "Connect"
 msgstr "連接"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:377
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/FrameTools.cpp:452
+#: Source/Core/Core/HotkeyManager.cpp:35
 msgid "Connect Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:47
 msgid "Connect USB Keyboard"
 msgstr "連接 USB 鍵盤"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:373
+#: Source/Core/DolphinWX/FrameTools.cpp:448
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "連接 Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/Core/HotkeyManager.cpp:31
 msgid "Connect Wiimote 1"
 msgstr "連接 Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/Core/HotkeyManager.cpp:32
 msgid "Connect Wiimote 2"
 msgstr "連接 Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/Core/HotkeyManager.cpp:33
 msgid "Connect Wiimote 3"
 msgstr "連接 Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
+#: Source/Core/Core/HotkeyManager.cpp:34
 msgid "Connect Wiimote 4"
 msgstr "連接 Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:670
+#: Source/Core/DolphinWX/FrameTools.cpp:256
+msgid "Connect Wiimotes"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Connected"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:509
 msgid "Connecting..."
 msgstr "正在連接..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
-msgid "Console"
-msgstr "控制台"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:88
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:323
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+#: Source/Core/DolphinWX/WXInputBase.cpp:38
 msgid "Control"
 msgstr "控制器"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controller settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:555
+msgid "Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:145
+msgid ""
+"Controls the distance of the convergence plane. This is the distance at "
+"which virtual objects will appear to be in front of the screen.\n"
+"A higher value creates stronger out-of-screen effects while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:144
+msgid ""
+"Controls the separation distance between the virtual cameras.\n"
+"A higher value creates a stronger feeling of depth while a lower value is "
+"more comfortable."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:369
+msgid "Convergence Minimum: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:449
+msgid "Convergence:"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:194
 msgid "Convert to GCI"
 msgstr "轉換為 GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:384
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:154
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:547
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:553
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:570
+msgid "Copy"
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:365
 msgid "Copy failed"
 msgstr "複製失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#: Source/Core/DolphinWX/MemcardManager.cpp:811
 #, c-format
 msgid "Copy to Memcard %c"
 msgstr "複製至記憶卡 %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:367
+#: Source/Core/DolphinWX/ISOProperties.cpp:392
 msgid "Core"
 msgstr "核心"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
-#, c-format
-msgid "Could not create %s"
-msgstr "無法建立 %s"
-
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#: Source/Core/AudioCommon/AudioCommon.cpp:75
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "無法初始化 backend %s。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:139
+#: Source/Core/Core/CoreParameter.cpp:173
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
-"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"backup.  Please note that original GameCube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"無法讀取 \"%s\"。光碟機中沒有放入遊戲光碟，或是光碟並非為 GC/Wii 的備份檔案。"
-"請注意，原始的 Gamecube 及 Wii 光碟在大多數的 PC DVD 光碟機中是無法被正常讀取"
-"的。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:294
+#: Source/Core/Core/CoreParameter.cpp:279
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "無法識別 ISO 檔案 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589
+#: Source/Core/DolphinWX/ISOProperties.cpp:656
 #, c-format
-msgid "Could not save %s"
-msgstr "無法儲存 %s"
+msgid "Could not save %s."
+msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:109
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
@@ -1280,11 +1360,19 @@ msgid ""
 "options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1162
+#: Source/Core/Core/NetPlayClient.cpp:89
+msgid "Couldn't Create Client"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:100
+msgid "Couldn't create peer."
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:1201
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "找不到副檔名 'ini' 的開啟命令！"
 
-#: Source/Core/Core/Src/BootManager.cpp:158
+#: Source/Core/Core/BootManager.cpp:252
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1292,238 +1380,237 @@ msgstr ""
 "無法初始化核心。\n"
 "請檢查您的設定。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512
+#: Source/Core/Common/TraversalClient.cpp:219
+#, c-format
+msgid "Couldn't look up central server %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:53
 msgid "Count:"
 msgstr "數量："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:265
+#, c-format
+msgid "Count: %lu"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:476
 msgid "Country:"
 msgstr "國別："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:56
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:21
 msgid "Create AR Code"
 msgstr "建立 AR 代碼"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+#: Source/Core/DolphinWX/FrameAui.cpp:542
 msgid "Create new perspective"
 msgstr "建立一個新的透檢視"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:18
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:31
 msgid "Creator: "
 msgstr "作者："
 
-#: Source/Core/Common/Src/MsgHandler.cpp:54
+#: Source/Core/Common/MsgHandler.cpp:56
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:577
 msgid "Crop"
 msgstr "剪裁"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:140
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:633
+#: Source/Core/DolphinWX/FrameTools.cpp:692
 #, c-format
 msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
-msgid "Custom Projection Hack"
-msgstr "自訂投影修正"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:17
-msgid "Custom Projection Hack Settings"
-msgstr "自訂投影修正設定"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-msgid "Customize some Orthographic Projection parameters."
-msgstr "自訂一些直線投影參數。"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
-msgid "Czech"
-msgstr "Czech"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:706
-msgid "D"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:353
+msgid "Custom"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+#: Source/Core/Core/HW/GCPadEmu.cpp:79
 msgid "D-Pad"
 msgstr "十字方向鍵"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP"
-msgstr "聲音"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:36
 msgid "DSP Emulator Engine"
 msgstr "DSP 模擬引擎"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:345
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE 模擬器 (快)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:259
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:34
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE 解釋器 (慢)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:33
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE 重編譯器 (慢)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:470
-msgid "DSP settings"
-msgstr "聲音設定"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647
-msgid "DSPLLE on Separate Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:831
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:74
 msgid "DVD Root:"
 msgstr "DVD 根："
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
-msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
-msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:50
 msgid "Dance Mat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:153
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:44
 msgid "Data Size"
 msgstr "資料大小"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
-msgid "Date:"
-msgstr "日期："
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+#: Source/Core/DolphinWX/MemcardManager.cpp:536
+#: Source/Core/DolphinWX/MemcardManager.cpp:575
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro 檔案(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:247
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:255
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:269
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+#: Source/Core/InputCommon/ControllerEmu.cpp:153
+#: Source/Core/InputCommon/ControllerEmu.cpp:168
+#: Source/Core/InputCommon/ControllerEmu.cpp:176
+#: Source/Core/InputCommon/ControllerEmu.cpp:190
+#: Source/Core/InputCommon/ControllerEmu.cpp:204
 msgid "Dead Zone"
 msgstr "非作用區"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:46
 msgid "Debug"
 msgstr "除錯"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:107
+msgid "Debug Only"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:549
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+#: Source/Core/DolphinWX/WXInputBase.cpp:71
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+#: Source/Core/DolphinWX/GameListCtrl.cpp:864
 msgid "Decompress ISO..."
 msgstr "解壓 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/GameListCtrl.cpp:889
 msgid "Decompress selected ISOs..."
 msgstr "解壓選擇的 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1091
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1067
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1206
 msgid "Decompressing ISO"
 msgstr "ISO 解壓中"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/Core/HotkeyManager.cpp:65
+msgid "Decrease Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:63
+msgid "Decrease Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:49
 msgid "Decrease Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:967
+#: Source/Core/Core/HotkeyManager.cpp:42
+msgid "Decrease IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1004
 msgid "Default"
 msgstr "預設值"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:71
 msgid "Default ISO:"
 msgstr "預設的 ISO："
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+#: Source/Core/DolphinWX/LogWindow.cpp:100
 msgid "Default font"
 msgstr "預設的字型"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:981
+#: Source/Core/DolphinWX/WXInputBase.cpp:24
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1018
 msgid "Delete"
 msgstr "刪除"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+#: Source/Core/DolphinWX/MemcardManager.cpp:812
 msgid "Delete Save"
 msgstr "刪除存檔"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#: Source/Core/VideoCommon/AVIDump.cpp:92
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "刪除已存在的檔案 '%s' ？"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:680
+#: Source/Core/DolphinWX/ISOProperties.cpp:362
+msgid "Depth Percentage: "
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:442
+msgid "Depth:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:701
 msgid "Description"
 msgstr "描述"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/ISOProperties.cpp:549
+msgid "Description:"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Detect"
 msgstr "檢測"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
-msgid ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
+#: Source/Core/DolphinWX/ISOProperties.cpp:348
+msgid "Deterministic dual core: "
 msgstr ""
-"Detected attempt to read more data from the DVD than fit inside the out "
-"buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:118
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:953
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:146
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:990
 msgid "Device"
 msgstr "裝置"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:737
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:102
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:73
 msgid "Device Settings"
 msgstr "裝置設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:259
+msgid "Device not found"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:145
-msgid "Direct3D11"
-msgstr "Direct3D11"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:56
+msgid "Dims the screen after five minutes of inactivity."
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:140
-msgid "Direct3D9"
-msgstr "Direct3D9"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:56
+msgid "Direct"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:153
+msgid "Direct Connect"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:128
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1531,20 +1618,23 @@ msgstr ""
 "目錄校驗失敗\n"
 " 並且目錄備份校驗失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:506
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:522
+msgid "Disable Bounding Box"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:520
 msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:419
 msgid "Disable Fog"
 msgstr "關閉霧化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:129
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1553,231 +1643,213 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:113
 msgid ""
-"Disable emulation of EFB copies.\n"
-"These are often used for post-processing or render-to-texture effects, so "
-"while checking this setting gives a great speedup it almost always also "
-"causes issues.\n"
+"Disable the bounding box emulation.\n"
+"This may improve the GPU performance a lot, but some games will break.\n"
 "\n"
-"If unsure, leave this unchecked."
+"If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:123
 msgid ""
 "Disables emulation of a hardware feature called destination alpha, which is "
 "used in many games for various graphical effects.\n"
+"This has no performance impact on D3D and desktop OpenGL, but on OpenGL ES "
+"this is rendered in two passes, which has a minor but noticeable performance "
+"impact.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561
+#: Source/Core/DolphinWX/ISOProperties.cpp:617
 msgid "Disc"
 msgstr "光碟"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+#: Source/Core/DiscIO/DriveBlob.cpp:108 Source/Core/DiscIO/DriveBlob.cpp:127
 msgid "Disc Read Error"
 msgstr "光碟讀取錯誤"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321
+#: Source/Core/DolphinWX/FrameTools.cpp:1549
+msgid "Disconnected"
+msgstr ""
+
+#: Source/Core/Common/TraversalClient.cpp:225
+msgid "Disconnected from traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:326
 msgid "Display"
 msgstr "顯示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
 msgid ""
-"Display the inputs read by the emulator.\n"
-"\n"
-"If unsure, leave this unchecked."
+"Display messages over the emulation screen area.\n"
+"These messages include memory card writes, video backend and CPU "
+"information, and JIT cache clearing."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+#: Source/Core/DolphinWX/WXInputBase.cpp:72
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1039
+#: Source/Core/DolphinWX/FrameTools.cpp:1150
 msgid "Do you want to stop the current emulation?"
 msgstr "您要停止目前的模擬嗎？"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:650
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:37
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:901
+#: Source/Core/DolphinWX/AboutDolphin.cpp:49
+#: Source/Core/DolphinWX/FrameTools.cpp:996
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.cpp:21
-#, c-format
-msgid ""
-"Dolphin %s\n"
-"Copyright (c) 2003-2013+ Dolphin Team\n"
-"\n"
-"Branch: %s\n"
-"Revision: %s\n"
-"Compiled: %s @ %s\n"
-"\n"
-"Dolphin is a Gamecube/Wii emulator, which was\n"
-"originally written by F|RES and ector.\n"
-"Today Dolphin is an open source project with many\n"
-"contributors, too many to list.\n"
-"If interested, just go check out the project page at\n"
-"http://code.google.com/p/dolphin-emu/ .\n"
-"\n"
-"Special thanks to Bushing, Costis, CrowTRobo,\n"
-"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-"reverse engineering and docs/demos.\n"
-"\n"
-"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-"emulator gave our development a kickstart.\n"
-"\n"
-"Thanks to Frank Wille for his PowerPC disassembler,\n"
-"which or9 and we modified to include Gekko specifics.\n"
-"\n"
-"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-"\n"
-"We are not affiliated with Nintendo in any way.\n"
-"Gamecube and Wii are trademarks of Nintendo.\n"
-"The emulator is for educational purposes only\n"
-"and should not be used to play games you do\n"
-"not legally own."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:36
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:213
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s 影像設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
-msgid "Dolphin &Web Site"
-msgstr "Dolphin 官網(&W)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+#: Source/Core/DolphinWX/Config/ConfigMain.h:20
 msgid "Dolphin Configuration"
 msgstr "Dolphin 模擬器設定"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:197
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:44
+msgid "Dolphin Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:425
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin 模擬 Wiimote 設定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:382
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:376
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1205
-msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC 控制器設定"
+#: Source/Core/DolphinWX/FrameTools.cpp:1338
+msgid "Dolphin Hotkeys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:727
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:90
+msgid "Dolphin NetPlay"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:42
+msgid "Dolphin NetPlay Setup"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:816
+#: Source/Core/DolphinWX/FrameTools.cpp:1270
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS 影片 (*.dtm)"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
-msgid "Dolphin Wiimote Configuration"
-msgstr "Dolphin Wiimote 設定"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
-msgid "Dolphin at &Google Code"
-msgstr "Dolphin SVN (&G)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:354
+#: Source/Core/DolphinWX/GameListCtrl.cpp:328
 msgid ""
-"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
-"files..."
-msgstr "Dolphin 找不到任何 GC/Wii ISO。按兩下這裡瀏覽檔案..."
+"Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to "
+"browse for files..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358
+#: Source/Core/DolphinWX/GameListCtrl.cpp:332
 msgid ""
-"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"Dolphin is currently set to hide all games. Double-click here to show all "
 "games..."
-msgstr "Dolphin 目前被設定為隱藏所有遊戲。按兩下這裡顯示所有遊戲..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1162
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248
+#: Source/Core/Common/TraversalClient.cpp:222
+msgid "Dolphin too old for traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1141
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1228
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327
-msgid ""
-"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
-"= Compatible)"
-msgstr ""
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/WXInputBase.cpp:50
+#: Source/Core/InputCommon/ControllerEmu.cpp:184
 msgid "Down"
 msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:45
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:58
 msgid "Download Codes (WiiRD Database)"
 msgstr "下載代碼 (WiiRD 數據庫)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:292
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:288
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "已下載 %lu 條代碼。 (已添加 %lu 條)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:118
+msgid "Drawn Object Range"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:174
+msgid "Driver Not Detected"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Drums"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:27
 msgid "Dummy"
 msgstr "空"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648
+#: Source/Core/DolphinWX/FrameTools.cpp:221
 msgid "Dump Audio"
 msgstr "轉儲聲音"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:562
 msgid "Dump EFB Target"
 msgstr "轉儲 EFB 目標"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+#: Source/Core/DolphinWX/FrameTools.cpp:219
 msgid "Dump Frames"
 msgstr "轉儲畫格"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:104
+msgid "Dump Objects"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:112
+msgid "Dump TEV Stages"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:113
+msgid "Dump Texture Fetches"
+msgstr ""
+
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:558
 msgid "Dump Textures"
 msgstr "轉儲紋理"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:132
 msgid ""
-"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"Dump decoded game textures to User/Dump/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:135
 msgid ""
-"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"Dump the contents of EFB copies to User/Dump/Textures/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
-msgid ""
-"Dump the contents of EFB copies to User/Dump/Textures/\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:52
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:523
 msgid "Dutch"
 msgstr "Dutch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/FrameTools.cpp:147
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442
-msgid "EFB Copies"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#: Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp:209
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1786,56 +1858,40 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
-msgid "EUROPE"
-msgstr "EUROPE"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:137
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit"
-msgstr "編輯"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+#: Source/Core/DolphinWX/ARCodeAddEdit.h:21
 msgid "Edit ActionReplay Code"
 msgstr "編輯 ActionReplay 代碼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/ISOProperties.cpp:310
 msgid "Edit Config"
 msgstr "編輯 ini 設定檔"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
-msgid "Edit Local Overrides"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+#: Source/Core/DolphinWX/PatchAddEdit.h:25
 msgid "Edit Patch"
 msgstr "編輯修正"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:486
-msgid "Edit current perspective"
-msgstr "編輯目前版式"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
+#: Source/Core/DolphinWX/ISOProperties.cpp:434
+#: Source/Core/DolphinWX/ISOProperties.cpp:455
 msgid "Edit..."
 msgstr "編輯..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "效果"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
-msgid "Embedded Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:472
+msgid "Embedded Frame Buffer (EFB)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:191
+#: Source/Core/Core/Core.cpp:209
 msgid "Emu Thread already running"
 msgstr "模擬器線程已經執行中"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:131
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1844,7 +1900,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:130
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1854,108 +1910,92 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Emulated Wiimote"
 msgstr "模擬 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354
+#: Source/Core/DolphinWX/ISOProperties.cpp:380
 msgid "Emulation State: "
 msgstr "模擬狀態："
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-msgid "Enable"
-msgstr "開啟"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
-msgid ""
-"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
-"supported by your GPU.\n"
-"Possibly causes issues.\n"
-"Requires fullscreen to work.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:100
 msgid "Enable AR Logging"
 msgstr "開啟 AR 日誌"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
-msgid "Enable Block Merging"
-msgstr "開啟塊合併"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Enable Bounding Box Calculation"
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:24
+msgid "Enable CPU Clock Override"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447
-msgid "Enable Cache"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:53
 msgid "Enable Cheats"
 msgstr "開啟作弊"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#: Source/Core/DolphinWX/ISOProperties.cpp:333
 msgid "Enable Dual Core"
 msgstr "開啟雙核心"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:51
 msgid "Enable Dual Core (speedup)"
 msgstr "開啟雙核心 (加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/ISOProperties.cpp:339
+msgid "Enable FPRF"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:334
 msgid "Enable Idle Skipping"
 msgstr "開啟略過空閒"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:52
 msgid "Enable Idle Skipping (speedup)"
 msgstr "開啟略過空閒 (加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/ISOProperties.cpp:335
 msgid "Enable MMU"
 msgstr "開啟 MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:581
 msgid "Enable Progressive Scan"
 msgstr "開啟逐行掃瞄"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:769
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:42
 msgid "Enable Screen Saver"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:344
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/ISOProperties.cpp:358
 msgid "Enable WideScreen"
 msgstr "開啟寬螢幕"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:544
 msgid "Enable Wireframe"
 msgstr "開啟線框"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:108
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
 "Might cause issues in a small number of games.\n"
+"On Direct3D, setting this above 1x will also have the same effect as "
+"enabling \"Force Texture Filtering\".\n"
 "\n"
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/ISOProperties.cpp:344
 msgid ""
-"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
-"Compatible)"
-msgstr "開啟快速光碟存取。部份遊戲需要。(ON = 兼容、OFF = 快速)"
+"Enable fast disc access. This can cause crashes and other problems in some "
+"games. (ON = Fast, OFF = Compatible)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+#: Source/Core/DolphinWX/MemcardManager.cpp:825
 msgid "Enable pages"
 msgstr "開啟分頁瀏覽"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:99
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1963,7 +2003,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:103
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1971,28 +2011,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:52
 msgid ""
-"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
-"ANY other game."
-msgstr "開啟此選項將加速塞爾達傳說：曙光公主，請勿在其它遊戲中使用。"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
-msgid "Enables Custom Projection Hack"
-msgstr "開啟自訂投影修正"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:516
-msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
-"OSX."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS "
+"X."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:54
 msgid ""
-"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse "
+"backends only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/ISOProperties.cpp:340
+msgid ""
+"Enables Floating Point Result Flag calculation, needed for a few games. (ON "
+"= Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:104
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2000,70 +2037,85 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/ISOProperties.cpp:336
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "開啟記憶體管理單元，某些遊戲需要。(ON = 兼容、OFF = 快速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:60
+msgid "Enables the use of Action Replay and Gecko cheats."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:137
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/WXInputBase.cpp:45
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:124
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+#: Source/Core/Core/NetPlayServer.cpp:71
+msgid "Enet Didn't Initialize"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:47
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:32
+#: Source/Core/DolphinWX/ISOProperties.cpp:508
 msgid "English"
 msgstr "English"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:418
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:343
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:421
 msgid "Enhancements"
 msgstr "增強"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+#: Source/Core/DolphinWX/FrameAui.cpp:541
 msgid "Enter a name for the new perspective:"
 msgstr "為新透檢視輸入名稱："
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:193
 #, c-format
 msgid "Entry %d/%d"
 msgstr "項目 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:92
 #, c-format
 msgid "Entry 1/%d"
 msgstr "項目 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:194
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:87
 msgid "Equal"
 msgstr "等於"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
+#: Source/Core/DolphinWX/Main.cpp:344 Source/Core/DolphinWX/Main.cpp:351
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
+#: Source/Core/DolphinWX/WxUtils.cpp:55
 msgid "Error"
 msgstr "錯誤"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:424
+#: Source/Core/DolphinWX/Main.cpp:344
 msgid "Error loading selected language. Falling back to system default."
 msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
 
-#: Source/Core/Common/Src/ChunkFile.h:221
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:388
+msgid "Error saving file."
+msgstr ""
+
+#: Source/Core/Common/ChunkFile.h:289
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#: Source/Core/Core/HW/EXI_DeviceIPL.cpp:318
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2071,203 +2123,188 @@ msgid ""
 msgstr ""
 "錯誤：試圖存取字型 %s 但無法進行讀取。遊戲可能會無法顯示正確的字型或崩潰。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+#: Source/Core/DolphinWX/WXInputBase.cpp:22
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#: Source/Core/Core/Src/ArmMemTools.cpp:78
-#, c-format
-msgid "Exception handler - access below memory space. %08llx%08llx"
-msgstr "處理異常 - 存取下列記憶體空間。 %08llx%08llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:144
+msgid "Europe"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp:193
+#, c-format
+msgid "Exception handler - access below memory space. 0x%08x"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:53
 msgid "Execute"
 msgstr "執行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:366
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
+#: Source/Core/DolphinWX/FrameTools.cpp:441
+#: Source/Core/Core/HotkeyManager.cpp:29
 msgid "Exit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/FrameTools.cpp:244
 msgid "Export All Wii Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
-msgid "Export Failed"
-msgstr "匯出失敗"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:661
+#: Source/Core/DolphinWX/ISOProperties.cpp:736
 msgid "Export File"
 msgstr "匯出檔案"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/Core/HotkeyManager.cpp:24
 msgid "Export Recording"
 msgstr "匯出錄像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:353
+#: Source/Core/DolphinWX/FrameTools.cpp:428
 msgid "Export Recording..."
 msgstr "匯出錄像..."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+#: Source/Core/DolphinWX/MemcardManager.cpp:814
 msgid "Export Save"
 msgstr "匯出存檔"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/GameListCtrl.cpp:848
 msgid "Export Wii save (Experimental)"
 msgstr "匯出 Wii 存檔 (實驗性)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+#: Source/Core/DolphinWX/MemcardManager.cpp:815
 msgid "Export all saves"
 msgstr "匯出所有存檔"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:113
+#: Source/Core/DolphinWX/MemcardManager.cpp:464
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:58
 msgid "Export failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+#: Source/Core/DolphinWX/MemcardManager.cpp:570
 msgid "Export save as..."
 msgstr "匯出存檔為..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Extension"
 msgstr "擴充"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484
-msgid "External Frame Buffer"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:504
+msgid "External Frame Buffer (XFB)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
-msgid "Extra Parameter"
-msgstr "額外參數"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
-msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "僅在 ''銀河戰士：另一個 M'' 中有效的額外參數。"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636
+#: Source/Core/DolphinWX/ISOProperties.cpp:708
 msgid "Extract All Files..."
 msgstr "提取所有檔案..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:642
+#: Source/Core/DolphinWX/ISOProperties.cpp:715
 msgid "Extract Apploader..."
 msgstr "提取程式讀取器..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643
+#: Source/Core/DolphinWX/ISOProperties.cpp:716
 msgid "Extract DOL..."
 msgstr "提取 DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632
+#: Source/Core/DolphinWX/ISOProperties.cpp:701
 msgid "Extract Directory..."
 msgstr "提取資料夾..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634
+#: Source/Core/DolphinWX/ISOProperties.cpp:705
 msgid "Extract File..."
 msgstr "提取檔案..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629
+#: Source/Core/DolphinWX/ISOProperties.cpp:697
 msgid "Extract Partition..."
 msgstr "提取分割區..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:750
+#: Source/Core/DolphinWX/ISOProperties.cpp:819
 #, c-format
 msgid "Extracting %s"
 msgstr "%s 提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting All Files"
 msgstr "所有檔案提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733
+#: Source/Core/DolphinWX/ISOProperties.cpp:802
 msgid "Extracting Directory"
 msgstr "資料夾提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736
+#: Source/Core/DolphinWX/ISOProperties.cpp:805
 msgid "Extracting..."
 msgstr "提取中..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:904
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:909
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:45
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
-msgid "FRANCE"
-msgstr "FRANCE"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/ISOProperties.cpp:484
 msgid "FST Size:"
 msgstr "FST 大小"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:127
+#: Source/Core/Core/NetPlayClient.cpp:171
+msgid "Failed To Connect!"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:115
 msgid "Failed to Connect!"
 msgstr "連接失敗！"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:301
 msgid "Failed to download codes."
 msgstr "下載代碼失敗。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:872
+#: Source/Core/DolphinWX/ISOProperties.cpp:940
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "提取至 %s 失敗！"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:570
 #, c-format
 msgid ""
-"Failed to load DSP ROM:\t%s\n"
-"\n"
-"This file is required to use DSP LLE.\n"
-"It is not included with Dolphin as it contains copyrighted data.\n"
-"Use DSPSpy to dump the file from your physical console.\n"
-"\n"
-"You may use the DSP HLE engine which does not require ROM dumps.\n"
-"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+"Failed to find new filename\n"
+" %s\n"
+" will be overwritten"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:339
+msgid "Failed to listen. Is another instance of the NetPlay server running?"
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:160
+#: Source/Core/DiscIO/CompressedBlob.cpp:342
+#, c-format
+msgid "Failed to open the input file \"%s\"."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/CompressedBlob.cpp:350
+#, c-format
 msgid ""
-"Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
+"Failed to open the output file \"%s\".\n"
+"Check that you have permissions to write the target folder and that the "
+"media can be written."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
-msgid ""
-"Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin "
-"might crash unexpectedly!"
-msgstr ""
-
-#: Source/Core/Core/Src/Movie.cpp:785
+#: Source/Core/Core/Movie.cpp:884
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:189
-msgid "Failed to read banner.bin"
-msgstr "讀取 banner.bin 失敗"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:226
-msgid "Failed to read bk header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#: Source/Core/Core/HW/GCMemcard.cpp:184
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
-"FilePosition:%llx"
+"FilePosition:%<PRIx64>"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/Core/HW/GCMemcard.cpp:109
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2275,7 +2312,7 @@ msgstr ""
 "讀取正確的塊分配表備份失敗\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/HW/GCMemcard.cpp:103
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2283,17 +2320,12 @@ msgstr ""
 "讀取正確的塊分配表失敗\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:328
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:663
 #, c-format
-msgid "Failed to read data from file %d"
-msgstr "從檔案 %d 讀取數據失敗"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:420
-#, c-format
-msgid "Failed to read data from file: %s"
+msgid "Failed to read data from gci file %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/HW/GCMemcard.cpp:97
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2301,7 +2333,7 @@ msgstr ""
 "讀取目錄備份失敗\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+#: Source/Core/Core/HW/GCMemcard.cpp:91
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2309,11 +2341,7 @@ msgstr ""
 "讀取正確的目錄失敗\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:130
-msgid "Failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+#: Source/Core/Core/HW/GCMemcard.cpp:80
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2321,72 +2349,61 @@ msgstr ""
 "讀取正確的頭部失敗\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:299
-#, c-format
-msgid "Failed to read header for file %d"
-msgstr ""
-
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+#: Source/Core/DiscIO/VolumeGC.cpp:54
 msgid "Failed to read unique ID from disc image"
 msgstr "從光碟中讀取唯一的 ID 失敗"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:74
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:134
+msgid "Failed to update country code in SYSCONF"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:102
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "寫入 BT.DINF 至 SYSCONF 失敗"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:269
-msgid "Failed to write bkhdr"
-msgstr "寫入 bkhdr 失敗"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:428
+#: Source/Core/DiscIO/CompressedBlob.cpp:286
+#: Source/Core/DiscIO/CompressedBlob.cpp:381
 #, c-format
-msgid "Failed to write data to file: %s"
+msgid ""
+"Failed to write the output file \"%s\".\n"
+"Check that you have enough space available on the target drive."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:205
-#, c-format
-msgid "Failed to write header for %s"
-msgstr "檔案 %s 寫入檔頭失敗"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
-msgid "Farsi"
-msgstr "波斯語"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:498
 msgid "Fast"
 msgstr "快速"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:521
 msgid "Fast Depth Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
-msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "快速版本的 MMU。可能無法在所有遊戲上執行。"
-
-#: Source/Core/Core/Src/Movie.cpp:1042
+#: Source/Core/Core/Movie.cpp:1142
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+#: Source/Core/DolphinWX/FrameTools.cpp:252
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:80
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:361
+msgid "File Size"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:296
 msgid "File contained no codes."
 msgstr "檔案未含有代碼。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+#: Source/Core/DolphinWX/MemcardManager.cpp:418
 msgid "File converted to .gci"
 msgstr "檔案已轉換為 .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+#: Source/Core/DolphinWX/MemcardManager.cpp:433
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2394,7 +2411,7 @@ msgstr ""
 "無法開啟檔案\n"
 "或沒有一個有效的副檔名"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#: Source/Core/Core/HW/GCMemcard.cpp:45
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2403,83 +2420,93 @@ msgstr ""
 "檔案有副檔名 \"%s\"\n"
 "有效的副檔名是 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+#: Source/Core/DolphinWX/MemcardManager.cpp:430
 msgid "File is not recognized as a memcard"
 msgstr "檔案未被識別為一張記憶卡"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+#: Source/Core/DiscIO/CompressedBlob.cpp:335
 msgid "File not compressed"
 msgstr "檔案未壓縮"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:142
-#, c-format
-msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "FileIO：未知開啟模式： 0x%02x"
+#: Source/Core/DolphinWX/MemcardManager.cpp:424
+#: Source/Core/DolphinWX/MemcardManager.cpp:470
+#: Source/Core/DolphinWX/MemcardManager.cpp:518
+msgid "File write failed"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:549
+#: Source/Core/DolphinWX/ISOProperties.cpp:606
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1155
+#: Source/Core/DolphinWX/ISOProperties.cpp:1193
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "檔案類型 'ini' 未知！ 無法開啟！"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:114
+msgid ""
+"Filter all textures, including any that the game explicitly set as "
+"unfiltered.\n"
+"May improve quality of certain textures in some games, but will cause issues "
+"in others.\n"
+"On Direct3D, setting Anisotropic Filtering above 1x will also have the same "
+"effect as enabling this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:247
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:248
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+#: Source/Core/DolphinWX/MemcardManager.cpp:649
 msgid "First Block"
 msgstr "首數據區塊"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+#: Source/Core/DolphinWX/MemcardManager.cpp:821
 msgid "Fix Checksums"
 msgstr "修正校驗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 16:9"
 msgstr "強制 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Force 4:3"
 msgstr "強制 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:54
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:416
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
-msgid ""
-"Force texture filtering even if the emulated game explicitly disabled it.\n"
-"Improves texture quality slightly but causes glitches in some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
-msgid ""
-"Force the game to output graphics for widescreen resolutions.\n"
-"Causes graphical glitches is some games.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:61
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
-"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"If left unchecked, Dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:106
+msgid ""
+"Forces the game to output graphics for any aspect ratio.\n"
+"Use with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to "
+"run at 16:9.\n"
+"Rarely produces good results and often partially breaks graphics and game "
+"UIs.\n"
+"Unnecessary (and detrimental) if using any AR/Gecko-code widescreen "
+"patches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:33
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2487,509 +2514,573 @@ msgstr ""
 "格式為 ascii (NTSC\\PAL)?\n"
 "否為 sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+#: Source/Core/InputCommon/ControllerEmu.cpp:187
 msgid "Forward"
 msgstr "向前"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:156
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:168
 msgid "Forward port (UPnP)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:501
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:495
 #, c-format
-msgid "Found %d results for '"
+msgid "Found %u results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:65
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:91
 #, c-format
-msgid "Found %x save files"
+msgid "Found %u save files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:869
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:937
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:874
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:942
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:879
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:884
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/Core/HotkeyManager.cpp:20
 msgid "Frame Advance"
 msgstr "畫格步進"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:565
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:215
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:209
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:97
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+#: Source/Core/DolphinWX/FrameTools.cpp:160
 msgid "Frame S&kipping"
 msgstr "畫格省略(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:72
 msgid "Framelimit:"
 msgstr "畫格速限制："
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:185
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+#: Source/Core/DolphinWX/ISOProperties.cpp:147
+msgid "France"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:563
 msgid "Free Look"
 msgstr "自由視點"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+#: Source/Core/Core/HotkeyManager.cpp:52
+msgid "Freelook Decrease Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:53
+msgid "Freelook Increase Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:56
+msgid "Freelook Move Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:57
+msgid "Freelook Move Left"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:58
+msgid "Freelook Move Right"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:55
+msgid "Freelook Move Up"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:61
+msgid "Freelook Reset"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:54
+msgid "Freelook Reset Speed"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:59
+msgid "Freelook Zoom In"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:60
+msgid "Freelook Zoom Out"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:49
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:34
+#: Source/Core/DolphinWX/ISOProperties.cpp:514
 msgid "French"
 msgstr "French"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:118
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
+#: Source/Core/DolphinWX/FrameTools.cpp:549
 msgid "FullScr"
 msgstr "全螢幕"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264
-msgid "Fullscreen resolution:"
-msgstr "全螢幕解析度:"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:280
+msgid "Fullscreen Resolution:"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:52
+msgid "GBA"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:542
 msgid "GCI File(*.gci)"
 msgstr "GCI 檔案(*.gci)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "GCPad"
-msgstr "GC 控制器"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:667
-msgid "GX_CMD_INVL_VC"
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:30
+msgid "GCI Folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:55
+#, c-format
+msgid ""
+"GCI save file was not loaded because it is the wrong region for this memory "
+"card:\n"
+"%s"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:361
+msgid "GCMemcardDirectory: ClearBlock called with invalid block address"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+msgid "Game Boy Advance Carts (*.gba)"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:357
+msgid "Game ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:474
 msgid "Game ID:"
 msgstr "遊戲 ID ："
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:418
+#: Source/Core/Core/NetPlayClient.cpp:640
 msgid "Game is already running!"
 msgstr "遊戲正在執行！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:592
+#: Source/Core/Core/NetPlayClient.cpp:946
 msgid "Game isn't running!"
 msgstr "遊戲未執行！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:422
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:272
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:430
+#, c-format
+msgid "Game overwrote with another games save, data corruption ahead %x, %x "
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:417
 msgid "Game-Specific Settings"
 msgstr "遊戲規格設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+#: Source/Core/DolphinWX/ISOProperties.cpp:319
 msgid "GameConfig"
 msgstr "遊戲設定"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:73
+msgid "GameCube"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:150
+msgid "GameCube Adapter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:556
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:561
+msgid "GameCube Controller Configuration"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:78
+msgid "GameCube Controllers"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:303
+#: Source/Core/DolphinWX/MemcardManager.cpp:223
+msgid "GameCube Memory Cards (*.raw,*.gcp)"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:533
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
-msgid "Gamecube"
-msgstr "Gamecube"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
-msgid "Gamecube &Pad Settings"
-msgstr "Gamecube 控制器設定(&P)"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1064
-msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:471
-msgid "Gamecube Pad settings"
-msgstr "Gamecube 控制器設定"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/ISOProperties.cpp:325
 msgid "Gecko Codes"
 msgstr "Gecko 代碼"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:246
-#, c-format
-msgid ""
-"GeckoCode failed to run (CT%i CST%i) (%s)\n"
-"(either a bad code or the code type is not yet supported. Try using the "
-"native code handler by placing the codehandler.bin file into the Sys "
-"directory and restarting Dolphin.)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:203
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:70
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:226
 msgid "General"
 msgstr "一般"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:153
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:388
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:48
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:33
+#: Source/Core/DolphinWX/ISOProperties.cpp:511
 msgid "German"
 msgstr "German"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:439
+#: Source/Core/DolphinWX/ISOProperties.cpp:153
+msgid "Germany"
+msgstr ""
+
+#: Source/Core/Core/ActionReplay.cpp:258
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode：索引大於 ar 代碼列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics"
 msgstr "影像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:469
+#: Source/Core/DolphinWX/FrameTools.cpp:553
 msgid "Graphics settings"
 msgstr "影像設定"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:88
 msgid "Greater Than"
 msgstr "大於"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:110
 msgid ""
-"Greatly increases quality of textures generated using render to texture "
+"Greatly increases quality of textures generated using render-to-texture "
 "effects.\n"
 "Raising the internal resolution will improve the effect of this setting.\n"
-"Slightly decreases performance and possibly causes issues (although "
-"unlikely).\n"
+"Slightly increases GPU load and causes relatively few graphical issues.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
-msgid "Greek"
-msgstr "Greek"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "綠"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "綠 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "綠 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:468
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:80
+msgid "Hardware rasterization"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:119
 msgid "Header checksum failed"
 msgstr "檔頭校驗失敗"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:301
+#: Source/Core/InputCommon/ControllerEmu.cpp:221
 msgid "Height"
 msgstr "高度"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/WXInputBase.cpp:56
 msgid "Help"
 msgstr "說明"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:241
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires Mac OS X 10.7 or greater.\n"
-"Unfortunately you're running an old version of OS X.\n"
-"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:232
-msgid ""
-"Hi,\n"
-"\n"
-"Dolphin requires that your CPU has support for SSE2 extensions.\n"
-"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
-"\n"
-"Sayonara!\n"
-msgstr ""
-"Hi，\n"
-"\n"
-"Dolphin 需要您的 CPU 支援 SSE2 指令集。\n"
-"很不幸的您的 CPU 不支援它們，所以 Dolphin 將無法執行。\n"
-"\n"
-"再見！\n"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/ControllerEmu.cpp:217
 msgid "Hide"
 msgstr "隱藏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:317
 msgid "Hide Mouse Cursor"
 msgstr "隱藏滑鼠游標"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:102
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
-"If unsure, leave this checked."
+"If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp:32
+msgid ""
+"Higher values can make variable-framerate games run at a higher framerate, "
+"at the expense of CPU. Lower values can make variable-framerate games run at "
+"a lower framerate, saving CPU.\n"
+"\n"
+"WARNING: Changing this from the default (100%) can and will break games and "
+"cause glitches. Do so at your own risk. Please do not report bugs that occur "
+"with a non-default clock. "
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:46
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:80
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:144
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:97
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:156
 msgid "Host"
 msgstr "主機"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
-msgid "Hotkey Configuration"
-msgstr "快捷鍵設定"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:101
+msgid "Host Code :"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:288
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+#: Source/Core/Core/NetPlayClient.cpp:123
+msgid ""
+"Host code size is to large.\n"
+"Please recheck that you have the correct code"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:129
 msgid "Hotkeys"
 msgstr "快捷鍵"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-msgid "Hungarian"
-msgstr "Hungarian"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Hybrid Wiimote"
 msgstr "混合 Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:644
+#: Source/Core/DolphinWX/GameListCtrl.cpp:272
+msgid "ID"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:146
+msgid "ID:"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:679
 #, c-format
 msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
 msgstr "IOCTL_ES_GETVIEWS：試圖取得資料從未知的標簽： %08x/%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:905
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:956
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
-"available in your NAND dump\n"
-"TitleID %016llx.\n"
+"IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your "
+"NAND dump\n"
+"TitleID %016<PRIx64>.\n"
 " Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:413
-msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - 損毀的目標"
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:937
+msgid "IOCTL_ES_LAUNCH: The DOL file is invalid!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:100
 msgid "IPL Settings"
 msgstr "IPL 設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:273
+#: Source/Core/Core/Boot/Boot.cpp:182
+#, c-format
+msgid "IPL with unknown hash %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:115
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:263
 msgid "IR"
 msgstr "IR"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
-msgid "IR Pointer"
-msgstr "IR 指示器"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:111
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:349
 msgid "IR Sensitivity:"
 msgstr "IR 靈敏度："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:520
+#: Source/Core/DolphinWX/ISOProperties.cpp:578
 msgid "ISO Details"
 msgstr "ISO 明細"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:66
 msgid "ISO Directories"
 msgstr "ISO 資料夾"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
-msgid "ITALY"
-msgstr "ITALY"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+#: Source/Core/DolphinWX/MemcardManager.cpp:647
 msgid "Icon"
 msgstr "圖示"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-msgid ""
-"If checked, the bounding box registers will be updated. Used by the Paper "
-"Mario games."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:475
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:118
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
-"graphical defects in a small number of other games though.\n"
+"graphical defects in a small number of other games.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:117
 msgid ""
-"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Ignore any requests from the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
 "features or graphical effects.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:115
+msgid ""
+"Implement fullscreen mode with a borderless window spanning the whole screen "
+"instead of using exclusive mode.\n"
+"Allows for faster transitions between fullscreen and windowed mode, but "
+"slightly increases input latency, makes movement less smooth and slightly "
+"decreases performance.\n"
+"Exclusive mode is required for Nvidia 3D Vision to work in the Direct3D "
+"backend.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:813
 msgid "Import Save"
 msgstr "匯入存檔"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+#: Source/Core/DolphinWX/FrameTools.cpp:243
 msgid "Import Wii Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:93
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:124
 msgid "Import failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+#: Source/Core/DolphinWX/MemcardManager.cpp:459
 msgid ""
 "Imported file has gsc extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"匯入的檔案有 gsc 副檔名\n"
-"但是沒有正確的檔頭"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
-msgid "Imported file has invalid length"
-msgstr "匯入的檔案有無效的長度"
+#: Source/Core/DolphinWX/MemcardManager.cpp:447
+msgid "Imported file has invalid length."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:456
 msgid ""
 "Imported file has sav extension\n"
-"but does not have a correct header"
+"but does not have a correct header."
 msgstr ""
-"匯入的檔案有 sav 副檔名\n"
-"但是沒有正確的檔頭"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358
+#: Source/Core/DolphinWX/ISOProperties.cpp:384
 msgid "In Game"
 msgstr "遊戲中"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/Core/HotkeyManager.cpp:66
+msgid "Increase Convergence"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:64
+msgid "Increase Depth"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:50
 msgid "Increase Frame limit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/Core/HotkeyManager.cpp:41
+msgid "Increase IR"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:327
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:45
 msgid "Info"
 msgstr "訊息"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:51
+#: Source/Core/Common/MsgHandler.cpp:53
 msgid "Information"
 msgstr "訊息"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Input"
 msgstr "輸入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/WXInputBase.cpp:55
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:181
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "在這裡插入被加密或已解密的代碼..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:46
 msgid "Insert SD Card"
 msgstr "插入 SD 卡"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
-msgid "Insert name here.."
-msgstr "在這裡插入名稱.."
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:33
+msgid "Insert name here..."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/FrameTools.cpp:249
 msgid "Install WAD"
 msgstr "安裝 WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:891
+#: Source/Core/DolphinWX/GameListCtrl.cpp:871
 msgid "Install to Wii Menu"
 msgstr "安裝至 Wii 選單"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:288
-#: Source/Core/Core/Src/x64MemTools.cpp:357
-msgid ""
-"InstallExceptionHandler called, but this platform does not yet support it."
-msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1382
+#: Source/Core/DolphinWX/FrameTools.cpp:1490
 msgid "Installing WAD..."
 msgstr "正在安裝 WAD 至 Wii 選單..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:930
+#: Source/Core/DolphinWX/ISOProperties.cpp:990
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:936
+#: Source/Core/DolphinWX/ISOProperties.cpp:996
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:935
+#: Source/Core/DolphinWX/ISOProperties.cpp:995
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:927
+#: Source/Core/DolphinWX/ISOProperties.cpp:987
 #, c-format
 msgid ""
-"Integrity check for partition %d failed. Your dump is most likely corrupted "
-"or has been patched incorrectly."
+"Integrity check for %s failed. The disc image is most likely corrupted or "
+"has been patched incorrectly."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:71
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:633
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:128
 msgid "Interface Settings"
 msgstr "界面設定"
 
-#: Source/Core/Core/Src/State.cpp:269
+#: Source/Core/Core/State.cpp:343
 msgid "Internal LZO Error - compression failed"
 msgstr "內部 LZO 錯誤 - 壓縮失敗"
 
-#: Source/Core/Core/Src/State.cpp:393
+#: Source/Core/Core/State.cpp:466
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -2998,167 +3089,181 @@ msgstr ""
 "內部 LZO 錯誤 - 解壓縮失敗 (%d) (%li, %li) \n"
 "請重試讀取"
 
-#: Source/Core/Core/Src/State.cpp:530
+#: Source/Core/Core/State.cpp:593
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "內部 LZO 錯誤 - lzo_init() 失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:472
+msgid "Internal Name:"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:363
 msgid "Internal Resolution:"
 msgstr "内部解析度:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:43
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:25
 msgid "Interpreter (VERY slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357
+#: Source/Core/DolphinWX/ISOProperties.cpp:383
 msgid "Intro"
 msgstr "標題"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:235
-#, c-format
-msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "無效大小(%x) 或 Magic word (%x)"
+#: Source/Core/DolphinWX/MemcardManager.cpp:467
+msgid "Invalid bat.map or dir entry."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:617
-msgid "Invalid Value!"
-msgstr "無效的數值！"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
-msgid "Invalid bat.map or dir entry"
-msgstr "無效的 bat.map 或目錄項目"
-
-#: Source/Core/Core/Src/CoreTiming.cpp:556
+#: Source/Core/Core/CoreTiming.cpp:507
 #, c-format
 msgid "Invalid event type %i"
 msgstr "無效的事件類型 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+#: Source/Core/Core/HW/DVDInterface.cpp:516
 msgid "Invalid file"
 msgstr "無效的檔案"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
-#, c-format
-msgid ""
-"Invalid opening.bnr found in gcm:\n"
-"%s\n"
-" You may need to redump this game."
+#: Source/Core/Core/NetPlayClient.cpp:765
+msgid "Invalid host"
 msgstr ""
-"找到無效的 opening.bnr 於 gcm：\n"
-"%s\n"
-" 可能需要重新轉儲這個遊戲。"
 
-#: Source/Core/Core/Src/Movie.cpp:728
+#: Source/Core/DolphinWX/MemcardManager.cpp:566
+msgid "Invalid index"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:829
 msgid "Invalid recording file"
 msgstr "無效的錄像檔"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:471
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:465
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:454
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:448
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:442
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:436
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:530
-msgid "Invalid state"
-msgstr "無效的狀態"
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:73
+msgid "Invalid value."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:51
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:36
+#: Source/Core/DolphinWX/ISOProperties.cpp:520
 msgid "Italian"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
-msgid "JAPAN"
-msgstr "JAPAN"
+#: Source/Core/DolphinWX/ISOProperties.cpp:150
+msgid "Italy"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+#: Source/Core/Core/HotkeyManager.cpp:229
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:247
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:302
+#: Source/Core/Core/HW/GCPadEmu.cpp:86
+msgid "Iterative Input"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:27
 msgid "JIT Recompiler (recommended)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:48
-msgid "JITIL experimental recompiler"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:28
+msgid "JITIL Recompiler (slower, experimental)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+#: Source/Core/DolphinWX/ISOProperties.cpp:168
+msgid "Japan"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:31
+#: Source/Core/DolphinWX/ISOProperties.cpp:505
 msgid "Japanese"
 msgstr "Japanese"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
-msgid "KOREA"
-msgstr "KOREA"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:316
+msgid "Keep Window on Top"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:101
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
-msgid "Keep window on top"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:53
+#: Source/Core/Core/HW/GCKeyboard.cpp:16
+msgid "Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-msgid "Key"
-msgstr "鍵"
+#: Source/Core/Core/HotkeyManager.cpp:216
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:219
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:223
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:231
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:235
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:239
+msgid "Keys"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:169
+msgid "Kick Player"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:171
+msgid "Korea"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:40
+#: Source/Core/DolphinWX/ISOProperties.cpp:532
 msgid "Korean"
 msgstr "Korean"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+#: Source/Core/Core/HW/GCPadEmu.cpp:47
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+#: Source/Core/DolphinWX/WXInputBase.cpp:31
 msgid "L Button"
 msgstr "L 鈕"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+#: Source/Core/Core/HW/GCPadEmu.cpp:51
 msgid "L-Analog"
 msgstr "L-類比"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:120
 msgid "Language:"
 msgstr "語系："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:418
+#: Source/Core/DolphinWX/FrameTools.cpp:493
 #, c-format
 msgid "Last %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:68
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/WXInputBase.cpp:47
+#: Source/Core/InputCommon/ControllerEmu.cpp:185
 msgid "Left"
 msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "左 搖桿"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:273
-msgid ""
-"Left click to detect hotkeys.\n"
-"Enter space to clear."
+#: Source/Core/DolphinWX/TASInputDlg.cpp:216
+msgid "Left stick"
 msgstr ""
-"按左鍵檢測快捷鍵。\n"
-"按鍵盤空白鍵為清除。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:742
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:774
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3168,7 +3273,7 @@ msgstr ""
 "中鍵清除。\n"
 "右鍵取得更多選項。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:747
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:779
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3176,195 +3281,211 @@ msgstr ""
 "左/右鍵取得更多選項。\n"
 "中鍵清除。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:89
 msgid "Less Than"
 msgstr "小於"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-msgid "Limit by FPS"
+#: Source/Core/DolphinWX/AboutDolphin.cpp:60
+msgid "License"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:979
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:62
+msgid ""
+"Limits the game speed to the specified number of frames per second (full "
+"speed is 60 for NTSC and 50 for PAL)."
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1016
 msgid "Load"
 msgstr "讀取"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:559
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:232
+#: Source/Core/Core/HotkeyManager.cpp:117
 msgid "Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219
+#: Source/Core/Core/HotkeyManager.cpp:104
 msgid "Load State Last 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220
+#: Source/Core/Core/HotkeyManager.cpp:105
 msgid "Load State Last 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:221
+#: Source/Core/Core/HotkeyManager.cpp:106
 msgid "Load State Last 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:222
+#: Source/Core/Core/HotkeyManager.cpp:107
 msgid "Load State Last 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:223
+#: Source/Core/Core/HotkeyManager.cpp:108
 msgid "Load State Last 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:224
+#: Source/Core/Core/HotkeyManager.cpp:109
 msgid "Load State Last 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:225
+#: Source/Core/Core/HotkeyManager.cpp:110
 msgid "Load State Last 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:226
+#: Source/Core/Core/HotkeyManager.cpp:111
 msgid "Load State Last 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/Core/HotkeyManager.cpp:68
 msgid "Load State Slot 1"
 msgstr "讀取儲存格 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
+#: Source/Core/Core/HotkeyManager.cpp:77
 msgid "Load State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/Core/HotkeyManager.cpp:69
 msgid "Load State Slot 2"
 msgstr "讀取儲存格 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/Core/HotkeyManager.cpp:70
 msgid "Load State Slot 3"
 msgstr "讀取儲存格 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/Core/HotkeyManager.cpp:71
 msgid "Load State Slot 4"
 msgstr "讀取儲存格 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/Core/HotkeyManager.cpp:72
 msgid "Load State Slot 5"
 msgstr "讀取儲存格 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/Core/HotkeyManager.cpp:73
 msgid "Load State Slot 6"
 msgstr "讀取儲存格 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/Core/HotkeyManager.cpp:74
 msgid "Load State Slot 7"
 msgstr "讀取儲存格 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/Core/HotkeyManager.cpp:75
 msgid "Load State Slot 8"
 msgstr "讀取儲存格 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
+#: Source/Core/Core/HotkeyManager.cpp:76
 msgid "Load State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/FrameTools.cpp:497
 msgid "Load State..."
 msgstr "讀取進度檔..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/FrameTools.cpp:1525
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1412
+#: Source/Core/DolphinWX/FrameTools.cpp:1520
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "讀取 Wii 系統選單 (%d%c)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:133
 msgid ""
-"Load custom textures from User/Load/Textures/<game_id>/\n"
+"Load custom textures from User/Load/Textures/<game_id>/.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
-msgid "Load preset values from hack patterns available."
-msgstr "讀取可用的修正設定預設檔"
+#: Source/Core/Core/HotkeyManager.cpp:102
+msgid "Load from selected slot"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:38
+#: Source/Core/DolphinWX/FrameTools.cpp:509
+msgid "Load state from selected slot"
+msgstr ""
+
+#: Source/Core/Core/PowerPC/PPCSymbolDB.cpp:359
+#, c-format
+msgid "Loaded %d good functions, ignored %d bad functions."
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:529
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:535
+msgid "Localhost"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.h:33
 msgid "Log"
 msgstr "記錄"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:24
 msgid "Log Configuration"
 msgstr "記錄設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
-msgid "Log FPS to file"
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:314
+msgid "Log Render Time to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:75
 msgid "Log Types"
 msgstr "記錄類型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:125
 msgid ""
-"Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
+"Log the render time of every frame to User/Logs/render_time.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:70
 msgid "Logger Outputs"
 msgstr "記錄輸出"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109
-#: Source/Core/DolphinWX/Src/Frame.cpp:320
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:121
+#: Source/Core/DolphinWX/Frame.cpp:438
 msgid "Logging"
 msgstr "日誌"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:323
+#: Source/Core/Core/NetPlayClient.cpp:528
 msgid "Lost connection to server!"
 msgstr "遺失與伺服器的連接"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/WXInputBase.cpp:34
 msgid "M Button"
 msgstr "M 鈕"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:155
-#, c-format
-msgid ""
-"MD5 mismatch\n"
-" %016llx%016llx != %016llx%016llx"
+#: Source/Core/DolphinWX/ISOProperties.cpp:486
+msgid "MD5 Checksum:"
 msgstr ""
-"MD5 不符合\n"
-" %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-msgid "MMU Speed Hack"
-msgstr "MMU 速度修正"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+#: Source/Core/DolphinWX/MemcardManager.cpp:535
+#: Source/Core/DolphinWX/MemcardManager.cpp:574
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark 檔案(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+#: Source/Core/DolphinWX/TASInputDlg.cpp:309
+#: Source/Core/Core/HW/GCPadEmu.cpp:66
 msgid "Main Stick"
 msgstr "主搖桿"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/GameListCtrl.cpp:271
+#: Source/Core/DolphinWX/FrameTools.cpp:355
+msgid "Maker"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:478
 msgid "Maker ID:"
 msgstr "廠商 ID："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:495
+#: Source/Core/DolphinWX/ISOProperties.cpp:547
 msgid "Maker:"
 msgstr "廠商："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:122
 msgid ""
 "Makes distant objects more visible by removing fog, thus increasing the "
 "overall detail.\n"
@@ -3373,35 +3494,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:113
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:116
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:351
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:354
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
-msgid "Memcard already has a save for this title"
-msgstr "記憶卡中已經存在一個此標題的存檔"
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:60
+msgid "May cause slow down in Wii Menu and some games."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+#: Source/Core/DolphinWX/MemcardManager.cpp:453
+msgid "Memcard already has a save for this title."
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:296
 msgid "Memcard already opened"
 msgstr "記憶卡已經開啟"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:924
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:929
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:29
+#: Source/Core/DolphinWX/MemcardManager.cpp:230
 msgid "Memory Card"
 msgstr "記憶卡"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+#: Source/Core/DolphinWX/MemcardManager.h:22
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "記憶卡管理器警告-在使用前請先備份，以防止出現損毀時無法復原！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:376
+#: Source/Core/Core/CoreParameter.cpp:357
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3418,37 +3543,52 @@ msgstr ""
 "%s\n"
 "是否要複製舊檔案至新路徑？\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:179
+#, c-format
+msgid "MemoryCard: ClearBlock called on invalid address %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:149
+#, c-format
+msgid "MemoryCard: Read called with invalid source address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardRaw.cpp:162
+#, c-format
+msgid "MemoryCard: Write called with invalid destination address, %x"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcard.cpp:85
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+#: Source/Core/DolphinWX/WXInputBase.cpp:42
 msgid "Menu"
 msgstr "選單"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:31
 msgid "Mic"
 msgstr "麥克風"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:112
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:115
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:350
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:353
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:577
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:598
 msgid "Misc"
 msgstr "雜項"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:788
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:70
 msgid "Misc Settings"
 msgstr "其它設定"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:282
+#: Source/Core/InputCommon/ControllerEmu.cpp:151
+#: Source/Core/InputCommon/ControllerEmu.cpp:202
 msgid "Modifier"
 msgstr "Modifier"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:127
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3456,20 +3596,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+#: Source/Core/DolphinWX/ISOProperties.cpp:376
+msgid "Monoscopic Shadows"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogWindow.cpp:101
 msgid "Monospaced font"
 msgstr "等寬字型"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:286
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:290
+#: Source/Core/Core/HW/GCPadEmu.cpp:76
 msgid "Motor"
 msgstr "馬達"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:663
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:684
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3487,909 +3631,950 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/WXInputBase.cpp:67
 msgid "Multiply"
 msgstr "多重分插"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
-msgid "NOP"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:637
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:631
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/WXInputBase.cpp:121
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/WXInputBase.cpp:116
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/WXInputBase.cpp:124
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+#: Source/Core/DolphinWX/WXInputBase.cpp:118
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/WXInputBase.cpp:125
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/WXInputBase.cpp:112
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/WXInputBase.cpp:115
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+#: Source/Core/DolphinWX/WXInputBase.cpp:103
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+#: Source/Core/DolphinWX/WXInputBase.cpp:119
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+#: Source/Core/DolphinWX/WXInputBase.cpp:108
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+#: Source/Core/DolphinWX/WXInputBase.cpp:117
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+#: Source/Core/DolphinWX/WXInputBase.cpp:109
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+#: Source/Core/DolphinWX/WXInputBase.cpp:120
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/WXInputBase.cpp:114
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/WXInputBase.cpp:113
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/WXInputBase.cpp:111
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/WXInputBase.cpp:122
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+#: Source/Core/DolphinWX/WXInputBase.cpp:101
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/WXInputBase.cpp:123
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+#: Source/Core/DolphinWX/WXInputBase.cpp:102
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/WXInputBase.cpp:110
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+#: Source/Core/DolphinWX/ISOProperties.cpp:545
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:57
 msgid "Name:"
 msgstr "名稱："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:62
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:299
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:570
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:29
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:25
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:74
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:214
 msgid "Name: "
 msgstr "名稱："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+#: Source/Core/DolphinWX/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/MemcardManager.cpp:573
 msgid "Native GCI files(*.gci)"
 msgstr "原始 GCI 檔案(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138
+#: Source/Core/DolphinWX/ISOProperties.cpp:156
+msgid "Netherlands"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:931
+msgid "Netplay has desynced. There is no way to recover from this."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:34
 msgid "New Scan"
 msgstr "新的搜尋"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+#: Source/Core/DolphinWX/MemcardManager.cpp:211
+#: Source/Core/DolphinWX/MemcardManager.cpp:823
 msgid "Next Page"
 msgstr "下一頁"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:142
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:38
 msgid "Next Scan"
 msgstr "尋找下一個"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:63
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:78
 msgid "Nickname :"
 msgstr "暱稱："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
-msgid "No Country (SDK)"
-msgstr "無國家 (SDK)"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:360
-msgid "No ISOs or WADS found"
-msgstr "找不到 ISO 或 WAD"
-
-#: Source/Core/Core/Src/ConfigManager.h:17
+#: Source/Core/Core/ConfigManager.h:16
 msgid "No audio output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:552
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "找不到標題 %s 的圖示檔案"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:771
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:778
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:782
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
-msgid "No docking"
-msgstr "不停靠"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:871
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:876
 msgid "No file loaded"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
-msgid "No free dir index entries"
-msgstr "沒有剩餘的目錄索引項目"
+#: Source/Core/DolphinWX/MemcardManager.cpp:444
+msgid "No free directory index entries."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:912
 msgid "No recorded file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:545
-#, c-format
-msgid "No save folder found for title %s"
-msgstr "找不到標題 %s 的存檔資料夾"
+#: Source/Core/Core/State.cpp:686
+msgid "No undo.dtm found, aborting undo load state to prevent movie desyncs"
+msgstr ""
 
-#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:138
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:118
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:614
+#: Source/Core/VideoBackends/D3D/main.cpp:112
+#: Source/Core/VideoBackends/OGL/main.cpp:124
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:47
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:23
 msgid "None"
 msgstr "無"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
-msgid "Norwegian Bokmaal"
-msgstr "Norwegian Bokmaal"
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:193
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:86
 msgid "Not Equal"
 msgstr "不相等"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:797
+#: Source/Core/DolphinWX/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/ISOProperties.cpp:381
+#: Source/Core/DolphinWX/GameListCtrl.cpp:777
 msgid "Not Set"
 msgstr "未設定"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:141
-#, c-format
-msgid "Not a Wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/Main.cpp:669
+#: Source/Core/DolphinWX/Main.cpp:508
 msgid "Not connected"
 msgstr "未連接"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
-msgid "Notes"
-msgstr "註釋"
-
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp:30
 msgid "Notes: "
 msgstr "注意："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:42
+#: Source/Core/DolphinWX/FrameAui.cpp:76 Source/Core/DolphinWX/FrameAui.cpp:81
+#: Source/Core/DolphinWX/FrameAui.cpp:512
+#: Source/Core/DolphinWX/FrameAui.cpp:559
+#: Source/Core/DolphinWX/FrameAui.cpp:567
 msgid "Notice"
 msgstr "注意"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+#: Source/Core/DolphinWX/WXInputBase.cpp:97
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:65
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:77
 msgid "Number Of Codes: "
 msgstr "代碼數量："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:35
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp:19
 msgid "Nunchuk"
 msgstr "Nunchuk"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
-msgid "Nunchuk Acceleration"
-msgstr "Nunchuk 加速"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:167
+msgid "Nunchuk orientation"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889
+#: Source/Core/DolphinWX/TASInputDlg.cpp:162
+msgid "Nunchuk stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Nvidia 3D Vision"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:894
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:116
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:43
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
 msgid "Off"
 msgstr "關閉"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:61
 msgid "Offset:"
 msgstr "偏移："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:300
+#: Source/Core/DolphinWX/FrameTools.cpp:380
 msgid "Online &Documentation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#: Source/Core/DolphinWX/MemcardManager.cpp:441
 #, c-format
 msgid "Only %d blocks available"
 msgstr "僅 %d 個區塊可用"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/FrameTools.cpp:543
+#: Source/Core/Core/HotkeyManager.cpp:13
 msgid "Open"
 msgstr "開啟"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:870
+#: Source/Core/DolphinWX/GameListCtrl.cpp:850
 msgid "Open &containing folder"
 msgstr "開啟內容資料夾(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/GameListCtrl.cpp:847
 msgid "Open Wii &save folder"
 msgstr "開啟 Wii 存檔資料夾(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:459
+#: Source/Core/DolphinWX/FrameTools.cpp:543
 msgid "Open file..."
 msgstr "開啟檔案..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#: Source/Core/AudioCommon/OpenALStream.cpp:54
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL：無法關聯至裝置 %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+#: Source/Core/AudioCommon/OpenALStream.cpp:64
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL：找不到聲音裝置"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#: Source/Core/AudioCommon/OpenALStream.cpp:59
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL：無法開啟裝置 %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
-msgid "OpenCL Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
-msgid "OpenMP Texture Decoder"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291
+#: Source/Core/DolphinWX/ISOProperties.cpp:314
 msgid ""
 "Opens the default (read-only) configuration for this game in an external "
 "text editor."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:295
-msgid "Opens the user specified overrides in an external text editor."
-msgstr ""
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+#: Source/Core/Core/HotkeyManager.cpp:227
+#: Source/Core/Core/HW/GCKeyboardEmu.cpp:245
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:298
+#: Source/Core/Core/HW/GCPadEmu.cpp:84
 msgid "Options"
 msgstr "選項"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "橘"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#: Source/Core/DolphinWX/MemcardManager.cpp:473
 msgid ""
 "Order of files in the File Directory do not match the block order\n"
 "Right click and export all of the saves,\n"
 "and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:325
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507
+#: Source/Core/DolphinWX/TASInputDlg.cpp:120
+msgid "Orientation"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:330
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:524
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:259
+#: Source/Core/Core/NetPlayClient.cpp:411
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
-"manually stop the game."
-msgstr "其它客戶端在遊戲執行時連接埠口！！已關閉網路對戰。您需要手動停止遊戲。"
+"must manually stop the game."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:560
 msgid "Output"
 msgstr "輸出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:350
-msgid "P&lay Recording..."
-msgstr "播放錄像(&L)..."
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:88
+msgid "Overlay Information"
+msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:18
+#: Source/Core/DolphinWX/FrameTools.cpp:425
+msgid "P&lay Input Recording..."
+msgstr ""
+
+#: Source/Core/Core/HW/GCPad.cpp:17
 msgid "Pad"
 msgstr "控制器"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:621
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:30
 msgid "Pad "
 msgstr "控制器"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "控制器"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+#: Source/Core/DolphinWX/WXInputBase.cpp:100
 msgid "Page Down"
 msgstr "下一頁"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+#: Source/Core/DolphinWX/WXInputBase.cpp:99
 msgid "Page Up"
 msgstr "上一頁"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+#: Source/Core/DolphinWX/WXInputBase.cpp:27
 msgid "Paragraph"
 msgstr "段落"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
-msgid "Parameters"
-msgstr "參數"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#: Source/Core/DolphinWX/ISOProperties.cpp:215
 #, c-format
 msgid "Partition %i"
 msgstr "分割區 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:852
-#, c-format
-msgid "Partition doesn't exist: %lu"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+#: Source/Core/DolphinWX/ISOProperties.cpp:321
 msgid "Patches"
 msgstr "修正"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:75
 msgid "Paths"
 msgstr "路徑"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1643
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+#: Source/Core/DolphinWX/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/FrameTools.cpp:1781
+#: Source/Core/DolphinWX/FrameTools.cpp:1782
 msgid "Pause"
 msgstr "暫停"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
-msgid "Pause at end of movie"
+#: Source/Core/DolphinWX/FrameTools.cpp:209
+msgid "Pause at End of Movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
+msgid "Pause on Focus Lost"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
+msgid "Pauses the emulator when focus is taken away from the emulation window."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:415
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:360
+#: Source/Core/DolphinWX/ISOProperties.cpp:386
 msgid "Perfect"
 msgstr "完美"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#: Source/Core/DolphinWX/FrameAui.cpp:543
 #, c-format
 msgid "Perspective %d"
 msgstr "版式 %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:463
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1652
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1653
+#: Source/Core/DolphinWX/FrameTools.cpp:351
+msgid "Platform"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:146
+#: Source/Core/DolphinWX/FrameTools.cpp:547
+#: Source/Core/DolphinWX/FrameTools.cpp:1787
+#: Source/Core/DolphinWX/FrameTools.cpp:1788
 msgid "Play"
 msgstr "執行"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/Core/HotkeyManager.cpp:23
 msgid "Play Recording"
 msgstr "播放錄像"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
-msgid "Play/Pause"
-msgstr "執行/暫停"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+#: Source/Core/DolphinWX/ISOProperties.cpp:385
 msgid "Playable"
 msgstr "可玩"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:135
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:138
 msgid "Players"
 msgstr "玩家"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1040
+#: Source/Core/DolphinWX/FrameTools.cpp:1151
 msgid "Please confirm..."
 msgstr "請確認..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+#: Source/Core/DolphinWX/FrameAui.cpp:511
 msgid "Please create a perspective before saving"
 msgstr "請在儲存前建立一個新的透檢視"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+#: Source/Core/DolphinWX/WXInputBase.cpp:28
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
-msgid "Polish"
-msgstr "Polish"
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:86
+#, c-format
+msgid "Port %i"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
-msgid "Port 1"
-msgstr "埠口 1"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
-msgid "Port 2"
-msgstr "埠口 2"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721
-msgid "Port 3"
-msgstr "埠口 3"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
-msgid "Port 4"
-msgstr "埠口 4"
-
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:92
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:136
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:107
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:149
 msgid "Port :"
 msgstr "埠口："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
-msgid "Portuguese"
-msgstr "Portuguese"
+#: Source/Core/DolphinWX/PostProcessingConfigDiag.cpp:25
+msgid "Post Processing Shader Configuration"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
-msgid "Portuguese (Brazilian)"
-msgstr "Portuguese (Brazilian)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:402
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:932
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:560
+msgid "Prefetch Custom Textures"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:1033
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1051
+#: Source/Core/Core/Movie.cpp:1152
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1028
+#: Source/Core/Core/Movie.cpp:1131
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
-msgid "Presets: "
-msgstr "預設："
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+#: Source/Core/DolphinWX/MemcardManager.cpp:210
 msgid "Prev Page"
 msgstr "上一頁"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+#: Source/Core/DolphinWX/MemcardManager.cpp:822
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:66
 msgid "Previous Value"
 msgstr "上一個數值"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+#: Source/Core/DolphinWX/WXInputBase.cpp:52
 msgid "Print"
 msgstr "列印"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:949
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:986
 msgid "Profile"
 msgstr "設定檔"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+#: Source/Core/DolphinWX/ISOProperties.h:57
 msgid "Properties"
 msgstr "屬性"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+#: Source/Core/DolphinWX/FrameTools.cpp:347
 msgid "Purge Cache"
 msgstr "清理快取"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:52
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:69
+msgid "Put BIOS roms in User/GC/{region}."
+msgstr ""
+
+#: Source/Core/Common/MsgHandler.cpp:54
 msgid "Question"
 msgstr "問題"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:169
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:337
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:184
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:181
 msgid "Quit"
 msgstr "離開"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+#: Source/Core/Core/HW/GCPadEmu.cpp:49
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/WXInputBase.cpp:32
 msgid "R Button"
 msgstr "R 鈕"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+#: Source/Core/Core/HW/GCPadEmu.cpp:53
 msgid "R-Analog"
 msgstr "R-類比"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
-msgid "RAM"
-msgstr "RAM"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
-msgid "RUSSIA"
-msgstr "RUSSIA"
-
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/ControllerEmu.cpp:152
 msgid "Radius"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:577
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:608
 msgid "Range"
 msgstr "範圍"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/Core/HotkeyManager.cpp:25
 msgid "Read-only mode"
 msgstr "唯讀模式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:488
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:508
 msgid "Real"
 msgstr "實體"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:64
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:290
 msgid "Real Balance Board"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:220
 msgid "Real Wiimote"
 msgstr "實體 Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:80
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:316
 msgid "Real Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:205
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:410
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:801
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:199
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:404
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:806
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:357
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:204
 msgid "Record input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:155
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:183
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "紅"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "紅 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "紅 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:109
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
-"This makes the rendered picture look less blocky.\n"
-"Heavily decreases emulation speed and sometimes causes issues.\n"
+"This smooths out jagged edges on objects.\n"
+"Heavily increases GPU load and sometimes causes graphical issues.\n"
 "\n"
 "If unsure, select None."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:77
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:958
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:313
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:995
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh"
 msgstr "更新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/Core/HotkeyManager.cpp:15
 msgid "Refresh List"
 msgstr "更新列表"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:460
+#: Source/Core/DolphinWX/FrameTools.cpp:544
 msgid "Refresh game list"
 msgstr "更新遊戲列表"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:417
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:439
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805
+#: Source/Core/DolphinWX/FrameTools.cpp:359
+msgid "Region"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:436
+#: Source/Core/DolphinWX/ISOProperties.cpp:457
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:83
 msgid "Remove"
 msgstr "移除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:121
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:318
 msgid "Render to Main Window"
 msgstr "渲染至主視窗"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:970
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:52
+msgid "Rendering"
+msgstr ""
+
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:341
+#, c-format
+msgid "Report: GCIFolder Writing to unallocated block %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1007
+#: Source/Core/Core/HotkeyManager.cpp:19
 msgid "Reset"
 msgstr "重置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:167
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:73
+msgid "Reset Traversal Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:60
 msgid "Results"
 msgstr "結果"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:560
+msgid "Retry"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:21
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+#: Source/Core/DolphinWX/ISOProperties.cpp:480
 msgid "Revision:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+#: Source/Core/DolphinWX/AboutDolphin.cpp:53
+#, c-format
+msgid "Revision: %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:49
+#: Source/Core/InputCommon/ControllerEmu.cpp:186
 msgid "Right"
 msgstr "右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "右 搖桿"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+#: Source/Core/DolphinWX/TASInputDlg.cpp:217
+msgid "Right stick"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:156
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:289
+#: Source/Core/Core/HW/GCPadEmu.cpp:75
 msgid "Rumble"
 msgstr "震動"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
-msgid ""
-"Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."
+#: Source/Core/DolphinWX/ISOProperties.cpp:159
+msgid "Russia"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
-msgid "Russian"
-msgstr "Russian"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+#: Source/Core/DolphinWX/FrameTools.cpp:174
 msgid "Sa&ve State"
 msgstr "儲存進度(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:496
 msgid "Safe"
 msgstr "安全"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:980
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:177
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:1017
 msgid "Save"
 msgstr "儲存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+#: Source/Core/DolphinWX/MemcardManager.cpp:540
 msgid "Save GCI as..."
 msgstr "另存 GCI ..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:228
+#: Source/Core/DolphinWX/FrameTools.cpp:500
+#: Source/Core/Core/HotkeyManager.cpp:113
 msgid "Save Oldest State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:231
+#: Source/Core/Core/HotkeyManager.cpp:116
 msgid "Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208
+#: Source/Core/Core/HotkeyManager.cpp:79
 msgid "Save State Slot 1"
 msgstr "儲存至儲存格 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217
+#: Source/Core/Core/HotkeyManager.cpp:88
 msgid "Save State Slot 10"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
+#: Source/Core/Core/HotkeyManager.cpp:80
 msgid "Save State Slot 2"
 msgstr "儲存至儲存格 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
+#: Source/Core/Core/HotkeyManager.cpp:81
 msgid "Save State Slot 3"
 msgstr "儲存至儲存格 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
+#: Source/Core/Core/HotkeyManager.cpp:82
 msgid "Save State Slot 4"
 msgstr "儲存至儲存格 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
+#: Source/Core/Core/HotkeyManager.cpp:83
 msgid "Save State Slot 5"
 msgstr "儲存至儲存格 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
+#: Source/Core/Core/HotkeyManager.cpp:84
 msgid "Save State Slot 6"
 msgstr "儲存至儲存格 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
+#: Source/Core/Core/HotkeyManager.cpp:85
 msgid "Save State Slot 7"
 msgstr "儲存至儲存格 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
+#: Source/Core/Core/HotkeyManager.cpp:86
 msgid "Save State Slot 8"
 msgstr "儲存至儲存格 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
+#: Source/Core/Core/HotkeyManager.cpp:87
 msgid "Save State Slot 9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:407
+#: Source/Core/DolphinWX/FrameTools.cpp:482
 msgid "Save State..."
 msgstr "另存進度..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/ISOProperties.cpp:670
+#: Source/Core/DolphinWX/ISOProperties.cpp:680
 msgid "Save as..."
 msgstr "另存為..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1185
 msgid "Save compressed GCM/ISO"
 msgstr "儲存已壓縮的 GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:485
-msgid "Save current perspective"
-msgstr "儲存目前版式"
-
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1174
 msgid "Save decompressed GCM/ISO"
 msgstr "儲存已解壓縮的 GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:794
+#: Source/Core/DolphinWX/FrameTools.cpp:505
+msgid "Save state to selected slot"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:101
+msgid "Save to selected slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:59
+msgid "Saved to /Wii/sd.raw (default size is 128mb)"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:893
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "儲存的影片 %s 是損毀的，影片錄製停止..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:414
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:546
+#: Source/Core/DolphinWX/GameListCtrl.cpp:509
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:529
+#: Source/Core/DolphinWX/GameListCtrl.cpp:492
 msgid "Scanning for ISOs"
 msgstr "正在掃瞄 ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:530
+#: Source/Core/DolphinWX/GameListCtrl.cpp:493
 msgid "Scanning..."
 msgstr "正在掃瞄..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
+#: Source/Core/DolphinWX/FrameTools.cpp:550
 msgid "ScrShot"
 msgstr "截圖"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+#: Source/Core/VideoCommon/ImageWrite.cpp:46
+#, c-format
+msgid "Screenshot failed: Could not open file \"%s\" (error %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:98
 msgid "Scroll Lock"
 msgstr "滾動鎖定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:246
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:97
 msgid "Search Filter"
 msgstr "搜索篩選"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:37
 msgid "Search Subfolders"
 msgstr "搜尋子資料夾"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:238
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:232
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:242
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:236
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
-#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#: Source/Core/Common/SysConf.h:94 Source/Core/Common/SysConf.h:117
+#: Source/Core/Common/SysConf.h:137 Source/Core/Common/SysConf.h:158
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "項目 %s 在 SYSCONF 中找不到"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:539
+#: Source/Core/DolphinWX/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:571
 msgid "Select"
 msgstr "選擇"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:725
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138
+#: Source/Core/DolphinWX/FrameTools.cpp:350
+msgid "Select Columns"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:522
+#, c-format
+msgid "Select Slot %i"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:90
+msgid "Select State Slot 1"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:99
+msgid "Select State Slot 10"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:91
+msgid "Select State Slot 2"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:92
+msgid "Select State Slot 3"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:93
+msgid "Select State Slot 4"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:94
+msgid "Select State Slot 5"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:95
+msgid "Select State Slot 6"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:96
+msgid "Select State Slot 7"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:97
+msgid "Select State Slot 8"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:98
+msgid "Select State Slot 9"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:175
+msgid "Select State slot"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:814
+#: Source/Core/DolphinWX/FrameTools.cpp:1268
 msgid "Select The Recording File"
 msgstr "選擇已錄製的檔案"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1370
+#: Source/Core/DolphinWX/FrameTools.cpp:1478
 msgid "Select a Wii WAD file to install"
 msgstr "選擇要安裝的 Wii WAD"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
-msgid ""
-"Select a hardware adapter to use.\n"
-"\n"
-"If unsure, use the first one."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+#: Source/Core/DolphinWX/MemcardManager.cpp:528
 msgid "Select a save file to import"
 msgstr "選擇要匯入的存檔"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+#: Source/Core/DolphinWX/FrameAui.cpp:327
 msgid "Select floating windows"
 msgstr "選擇浮動視窗"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:618
+#: Source/Core/DolphinWX/FrameTools.cpp:677
 msgid "Select the file to load"
 msgstr "選擇要讀取的檔案"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328
+#: Source/Core/DolphinWX/FrameTools.cpp:1436
 msgid "Select the save file"
 msgstr "選擇存檔"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
+#: Source/Core/DolphinWX/FrameTools.cpp:1585
 msgid "Select the state to load"
 msgstr "選擇要讀取的進度"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
+#: Source/Core/DolphinWX/FrameTools.cpp:1599
 msgid "Select the state to save"
 msgstr "選擇要儲存的進度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:105
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4400,247 +4585,291 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:49
+#: Source/Core/InputCommon/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+#: Source/Core/DolphinWX/LogWindow.cpp:102
 msgid "Selected font"
 msgstr "選擇字型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:97
+msgid ""
+"Selects a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:98
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
 "Performance impact is negligible.\n"
 "\n"
-"If unsure, use your desktop resolution.\n"
-"If still unsure, use the highest resolution which works for you."
+"If unsure, select auto."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:143
+msgid ""
+"Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better "
+"feeling of depth if you have the necessary hardware.\n"
+"Side-by-Side and Top-and-Bottom are used by most 3D TVs.\n"
+"Anaglyph is used for Red-Cyan colored glasses.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select Off."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:95
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"unless you have a reason to use it you'll want to select OpenGL here.\n"
 "\n"
-"If unsure, use Direct3D 11."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:93
 msgid ""
 "Selects what graphics API to use internally.\n"
-"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
-"Direct3D 11 is somewhere between the two.\n"
-"Note that the Direct3D backends are only available on Windows.\n"
+"The software renderer is extremely slow and only useful for debugging, so "
+"you'll want to use either Direct3D or OpenGL. Different games and different "
+"GPUs will behave differently on each backend, so for the best emulation "
+"experience it's recommended to try both and choose the one that's less "
+"problematic.\n"
 "\n"
-"If unsure, use OpenGL."
+"If unsure, select OpenGL."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:125
 msgid "Send"
 msgstr "傳送"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:110
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:348
 msgid "Sensor Bar Position:"
 msgstr "傳感器位置："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/WXInputBase.cpp:69
 msgid "Separator"
 msgstr "分離器"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
-msgid "Serbian"
-msgstr "Serbian"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:86
 msgid ""
-"Serial Port 1 - This is the port which devices such as the net adapter use"
-msgstr "埠口 1 - 這是類似於網卡等裝置使用的埠口。"
+"Serial Port 1 - This is the port which devices such as the net adapter use."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:871
+#: Source/Core/Core/NetPlayClient.cpp:762
+msgid "Server rejected traversal attempt"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:851
 msgid "Set as &default ISO"
 msgstr "設為預設 ISO (&D)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#: Source/Core/DolphinWX/MemcardManager.cpp:824
 #, c-format
 msgid "Set as default Memcard %c"
 msgstr "設定為預設記憶卡 %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:450
+#: Source/Core/Core/ActionReplay.cpp:269
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive：索引大於 ar 代碼列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:521
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:55
+msgid "Sets the GameCube system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:57
 msgid ""
-"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL "
+"games.\n"
+"May not work for all games."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:58
+msgid "Sets the Wii system language."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:50
+msgid ""
+"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
-msgid "Settings..."
-msgstr "設定..."
-
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:252
-msgid "SetupWiiMem: Cant create setting file"
+#: Source/Core/Core/Boot/Boot_BS2Emu.cpp:229
+msgid "SetupWiiMemory: Cant create setting.txt file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Shake"
 msgstr "搖晃"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493
-msgid "Short Name:"
-msgstr "短名："
-
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:92
+#: Source/Core/DolphinWX/TASInputDlg.cpp:222
+#: Source/Core/DolphinWX/TASInputDlg.cpp:314
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:221
-msgid "Show &Console"
-msgstr "顯示控制台(&C)"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+#: Source/Core/DolphinWX/FrameTools.cpp:272
 msgid "Show &Log"
 msgstr "顯示日誌視窗(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/FrameTools.cpp:269
 msgid "Show &Statusbar"
 msgstr "顯示狀態欄(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:214
+#: Source/Core/DolphinWX/FrameTools.cpp:267
 msgid "Show &Toolbar"
 msgstr "顯示工具列(&T)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290
+#: Source/Core/DolphinWX/FrameTools.cpp:322
+msgid "Show Australia"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:313
 msgid "Show Defaults"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:285
+#: Source/Core/DolphinWX/FrameTools.cpp:345
 msgid "Show Drives"
 msgstr "顯示裝置"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:545
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:313
 msgid "Show FPS"
 msgstr "顯示 FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:213
+msgid "Show Frame Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:324
 msgid "Show France"
 msgstr "顯示 France"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:261
+#: Source/Core/DolphinWX/FrameTools.cpp:308
 msgid "Show GameCube"
 msgstr "顯示 GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559
+#: Source/Core/DolphinWX/FrameTools.cpp:326
+msgid "Show Germany"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:216
 msgid "Show Input Display"
 msgstr "輸入顯示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/FrameTools.cpp:328
 msgid "Show Italy"
 msgstr "顯示 Italy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/FrameTools.cpp:315
 msgid "Show JAP"
 msgstr "顯示 JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/FrameTools.cpp:330
 msgid "Show Korea"
 msgstr "顯示 Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
+#: Source/Core/DolphinWX/FrameTools.cpp:211
+msgid "Show Lag Counter"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:490
 msgid "Show Language:"
 msgstr "顯示語系："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+#: Source/Core/DolphinWX/FrameTools.cpp:273
 msgid "Show Log &Configuration"
 msgstr "日誌記錄設定(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:270
+#: Source/Core/DolphinWX/FrameTools.cpp:332
+msgid "Show Netherlands"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:317
 msgid "Show PAL"
 msgstr "顯示 PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+#: Source/Core/DolphinWX/FrameTools.cpp:305
 msgid "Show Platforms"
 msgstr "顯示平台"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+#: Source/Core/DolphinWX/FrameTools.cpp:314
 msgid "Show Regions"
 msgstr "顯示區域"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+#: Source/Core/DolphinWX/FrameTools.cpp:334
+msgid "Show Russia"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:336
+msgid "Show Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:546
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/FrameTools.cpp:338
 msgid "Show Taiwan"
 msgstr "顯示 Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:272
+#: Source/Core/DolphinWX/FrameTools.cpp:319
 msgid "Show USA"
 msgstr "顯示 USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/FrameTools.cpp:342
+msgid "Show Unknown"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:310
 msgid "Show Wad"
 msgstr "顯示 Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/FrameTools.cpp:306
 msgid "Show Wii"
 msgstr "顯示 Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+#: Source/Core/DolphinWX/FrameTools.cpp:340
+msgid "Show World"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:113
 msgid "Show a confirmation box before stopping a game."
 msgstr "在停止遊戲後顯示一個確認框。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
-"Disabling this may avoid annoying and non-fatal messages, but it may also "
-"mean that Dolphin suddenly crashes without any explanation at all."
+"Disabling this may avoid annoying and non-fatal messages, but it may result "
+"in major crashes having no explanation at all."
 msgstr ""
-"在遇到潛在的多個錯誤時顯示一個訊息框。\n"
-"關閉此選項可以阻止全部非關鍵的錯誤訊息，但是它可能導致 Dolphin 在沒有任何徵兆"
-"的情況下崩潰。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+#: Source/Core/DolphinWX/MemcardManager.cpp:838
 msgid "Show first block"
 msgstr "顯示第一個區塊"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
-msgid "Show lag counter"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501
-msgid ""
-"Show messages on the emulation screen area.\n"
-"These messages include memory card writes, video backend and CPU "
-"information, and JIT cache clearing."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+#: Source/Core/DolphinWX/MemcardManager.cpp:837
 msgid "Show save blocks"
 msgstr "顯示存檔區塊"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+#: Source/Core/DolphinWX/MemcardManager.cpp:835
 msgid "Show save comment"
 msgstr "顯示存檔描述"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+#: Source/Core/DolphinWX/MemcardManager.cpp:836
 msgid "Show save icon"
 msgstr "顯示存檔圖示"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+#: Source/Core/DolphinWX/MemcardManager.cpp:834
 msgid "Show save title"
 msgstr "顯示存檔標題"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:124
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4648,74 +4877,82 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
-msgid "Show unknown"
-msgstr "顯示 未知"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:126
 msgid ""
-"Show various statistics.\n"
+"Show various rendering statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:310
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Side-by-Side"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:300
 msgid "Sideways Wiimote"
 msgstr "橫握 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:38
+#: Source/Core/DolphinWX/ISOProperties.cpp:526
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:301
+#: Source/Core/DolphinWX/GameListCtrl.cpp:274
 msgid "Size"
 msgstr "大小"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:702
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:58
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+#: Source/Core/DolphinWX/ISOProperties.cpp:337
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:474
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:119
+msgid ""
+"Skip GPU synchronizing on EFB copies. Causes graphical defects in a small "
+"number of games.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:142
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
-"Sometimes also increases visual quality.\n"
 "If you're experiencing any issues, try raising texture cache accuracy or "
 "disable this option.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:389
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:403
+#: Source/Core/DolphinWX/FrameTools.cpp:464
+#: Source/Core/DolphinWX/FrameTools.cpp:478
 #, c-format
 msgid "Slot %i"
 msgstr "儲存格 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:706
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:75
 msgid "Slot A"
 msgstr "插槽 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:707
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:76
 msgid "Slot B"
 msgstr "插槽 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+#: Source/Core/DolphinWX/WXInputBase.cpp:54
 msgid "Snapshot"
 msgstr "截圖"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:45
-msgid "Software Renderer"
+#: Source/Core/Common/TraversalClient.cpp:228
+msgid "Socket error sending to traversal server"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+#: Source/Core/DolphinWX/VideoConfigDiag.h:94
 msgid ""
 "Software rendering is an order of magnitude slower than using the other "
 "backends.\n"
@@ -4723,221 +4960,282 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+#: Source/Core/VideoCommon/AVIDump.cpp:195
+msgid ""
+"Something has gone seriously wrong.\n"
+"Stopping video recording.\n"
+"Your video will likely be broken."
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:57
 msgid "Sound Settings"
 msgstr "聲音設定"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#: Source/Core/AudioCommon/AudioCommon.cpp:78
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "聲音 backend %s 是無效的。"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
-#, c-format
-msgid "Sound buffer creation failed: %s"
-msgstr "聲音緩衝建立失敗：%s"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+#: Source/Core/DolphinWX/WXInputBase.cpp:23
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/ISOProperties.cpp:162
+msgid "Spain"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:50
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:35
+#: Source/Core/DolphinWX/ISOProperties.cpp:517
 msgid "Spanish"
 msgstr "Spanish"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:114
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:303
+msgid "Speaker Pan"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:352
 msgid "Speaker Volume:"
 msgstr "揚聲器音量："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:116
 msgid ""
-"Specifies the resolution used to render at. A high resolution will improve "
-"visual quality a lot but is also quite heavy on performance and might cause "
-"glitches in certain games.\n"
-"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
-"issues. Generally speaking, the lower the internal resolution is, the better "
-"your performance will be.\n"
+"Specifies the resolution used to render at. A high resolution greatly "
+"improves visual quality, but also greatly increases GPU load and can cause "
+"issues in certain games.\n"
+"\"Multiple of 640x528\" will result in a size slightly larger than \"Window "
+"Size\" but yield fewer issues. Generally speaking, the lower the internal "
+"resolution is, the better your performance will be.\n"
 "\n"
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330
+#: Source/Core/DolphinWX/ISOProperties.cpp:343
 msgid "Speed up Disc Transfer Rate"
 msgstr "加速光碟傳輸率"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:231
-msgid "Square Stick"
-msgstr "Square Stick"
+#: Source/Core/DolphinWX/Config/GeneralConfigPane.cpp:58
+msgid ""
+"Splits the CPU and GPU threads so they can be run on separate cores.\n"
+"Provides major speed improvements on most modern PCs, but can cause "
+"occasional crashes/glitches."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:48
 msgid "Standard Controller"
 msgstr "標準控制器"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:343
+#: Source/Core/DolphinWX/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:123
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:190
+#: Source/Core/Core/HW/GCPadEmu.cpp:40
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+#: Source/Core/DolphinWX/FrameTools.cpp:247
 msgid "Start &NetPlay"
 msgstr "開始網路對戰(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:347
-msgid "Start Re&cording"
-msgstr "開始錄製(&C)"
+#: Source/Core/DolphinWX/FrameTools.cpp:422
+msgid "Start Re&cording Input"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/Core/HotkeyManager.cpp:22
 msgid "Start Recording"
 msgstr "開始錄製"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:302
+#: Source/Core/DolphinWX/GameListCtrl.cpp:275
+#: Source/Core/DolphinWX/FrameTools.cpp:363
 msgid "State"
 msgstr "狀態"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
-msgid "State Saves"
-msgstr "即時存檔"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:90
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:49
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:431
+msgid "Stereoscopic 3D Mode:"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:412
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:454
+msgid "Stereoscopy"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "搖桿"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:464
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:412
+#: Source/Core/DolphinWX/FrameTools.cpp:548
+#: Source/Core/Core/HotkeyManager.cpp:18
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
-msgid ""
-"Store EFB copies in GPU texture objects.\n"
-"This is not so accurate, but it works well enough for most games and gives a "
-"great speedup over EFB to RAM.\n"
-"\n"
-"If unsure, leave this checked."
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:476
+msgid "Store EFB Copies to Texture Only"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:294
 msgid "Stretch to Window"
 msgstr "拉伸至視窗"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+#: Source/Core/DolphinWX/WXInputBase.cpp:70
 msgid "Subtract"
 msgstr "減少"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:109
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:53
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "成功匯出檔案至 %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:89
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:120
 msgid "Successfully imported save files"
 msgstr "成功匯入存檔"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
-msgid "Swedish"
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:100
+#, c-format
+msgid "Sucessfully exported %u saves to %s"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:276
+#: Source/Core/DolphinWX/AboutDolphin.cpp:62
+msgid "Support"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:452
+msgid "Swap Eyes"
+msgstr ""
+
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:146
+msgid ""
+"Swaps the left and right eye. Mostly useful if you want to view side-by-side "
+"cross-eyed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:266
 msgid "Swing"
 msgstr "揮舞"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/ISOProperties.cpp:341
 msgid "Synchronize GPU thread"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/ISOProperties.cpp:342
 msgid ""
 "Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
 "Core mode. (ON = Compatible, OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:785
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:256
+msgid "Syntax error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp:96
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:67
 msgid "System Language:"
 msgstr "系統語系："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
-msgid "TAIWAN"
-msgstr "TAIWAN"
-
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+#: Source/Core/DolphinWX/TASInputDlg.h:26
+#: Source/Core/DolphinWX/FrameTools.cpp:207
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+#: Source/Core/DolphinWX/FrameTools.cpp:721
+#, c-format
+msgid "TAS Input - Controller %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:728
+#, c-format
+msgid "TAS Input - Wiimote %d"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:20
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
-msgid "Tab split"
-msgstr "分離面版"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table 右"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:363
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:466
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:174
+msgid "Taiwan"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:438
+#: Source/Core/DolphinWX/FrameTools.cpp:550
+#: Source/Core/Core/HotkeyManager.cpp:28
 msgid "Take Screenshot"
 msgstr "截取畫面"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:51
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:535
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:567
 msgid "Test"
 msgstr "測試"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
-msgid "Texture"
-msgstr "紋理"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:462
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:482
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:547
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:228
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:120
+msgid ""
+"The \"Safe\" setting eliminates the likelihood of the GPU missing texture "
+"updates from RAM.\n"
+"Lower accuracies cause in-game text to appear garbled in certain games.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+
+#: Source/Core/Core/CoreParameter.cpp:240
 msgid "The WAD has been installed successfully"
 msgstr "WAD 已經安裝成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:185
+#: Source/Core/Core/ActionReplay.cpp:184
 msgid "The address is invalid"
 msgstr "位址無效"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
-msgid "The checksum was successfully fixed"
-msgstr "校驗已經被成功修復"
+#: Source/Core/DolphinWX/MemcardManager.cpp:514
+msgid "The checksum was successfully fixed."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1240
-msgid "The chosen directory is already in the list"
-msgstr "選取的資料夾已經在列表中"
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:135
+msgid "The chosen directory is already in the list."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1219
+#: Source/Core/Core/HW/DVDInterface.cpp:535
+#, c-format
+msgid ""
+"The disc change to \"%s\" could not be saved in the .dtm file.\n"
+"The filename of the disc image must not be longer than 40 characters."
+msgstr ""
+
+#: Source/Core/DiscIO/CompressedBlob.cpp:110
+#, c-format
+msgid ""
+"The disc image \"%s\" is corrupt.\n"
+"Hash of block %<PRIu64> is %08x instead of %08x."
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1099
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1127
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1198
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4946,89 +5244,93 @@ msgstr ""
 "檔案 %s 已經存在。\n"
 "是否要進行取代？"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:39
+#: Source/Core/AudioCommon/WaveFile.cpp:41
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr "檔案 %s 無法開啟進行寫入。請確認是否有別的程式正在使用該檔案。"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:32
+#: Source/Core/AudioCommon/WaveFile.cpp:34
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "檔案 %s 已經開啟，檔頭無法被寫入。"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#: Source/Core/DolphinWX/FrameAui.cpp:566
+msgid "The name cannot be empty"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameAui.cpp:558
+msgid "The name cannot contain the character ','"
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:184
 #, c-format
-msgid "The file you specified (%s) does not exist"
-msgstr "指定的檔案 (%s) 不存在"
+msgid "The recorded game (%s) is not the same as the selected game (%s)"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
-msgid "The name can not be empty"
-msgstr "名稱不能為空"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
-msgid "The name can not contain the character ','"
-msgstr "名稱不能含有字符 ','"
-
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:144
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
-msgid ""
-"The safer you adjust this, the less likely the emulator will be missing any "
-"texture updates from RAM.\n"
-"\n"
-"If unsure, use the rightmost value."
+#: Source/Core/DolphinWX/MemcardManager.cpp:450
+msgid "The save you are trying to copy has an invalid file size."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
-msgid "The save you are trying to copy has an invalid file size"
-msgstr "您嘗試複製的檔案有一個無效的檔案大小"
-
-#: Source/Core/DolphinWX/Src/Main.cpp:431
+#: Source/Core/DolphinWX/Main.cpp:351
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr "選擇的語系不支援您的系統。將使用系統預設值。"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:93
+#: Source/Core/Core/NetPlayClient.cpp:208
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "伺服器與客戶端的網路對戰版本不兼容！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:90
+#: Source/Core/Core/NetPlayClient.cpp:205
 msgid "The server is full!"
 msgstr "伺服器已滿！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:96
+#: Source/Core/Core/NetPlayClient.cpp:211
 msgid "The server responded: the game is currently running!"
 msgstr "伺服器回應：遊戲目前正在執行！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:99
+#: Source/Core/Core/NetPlayClient.cpp:214
 msgid "The server sent an unknown error message!"
 msgstr "伺服器發生了一個未知錯誤訊息！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:121
+#: Source/Core/Core/CoreParameter.cpp:155
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定的檔案 \"%s\" 不存在"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:186
+#: Source/Core/Core/ActionReplay.cpp:187
 msgid "The value is invalid"
 msgstr "這個數值無效"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:588
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:168
+#, c-format
+msgid ""
+"There are too many gci files in the folder\n"
+"%s\n"
+"Only the first 127 will be available"
+msgstr ""
+
+#: Source/Core/Core/State.cpp:691
+msgid "There is nothing to undo!"
+msgstr ""
+
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp:611
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr "必須有 00000001/00000002 的標簽。這個 NAND dump 可能是不完整的。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/ISOProperties.cpp:330
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5036,116 +5338,169 @@ msgstr ""
 "這些設定將替代核心 Dolphin 設定。\n"
 "未確定表示遊戲使用 Dolphin 的設定。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:345
+#: Source/Core/Core/ActionReplay.cpp:852
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr "Action replay 模擬器不支援被 Action Replay 自身修改的代碼。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
-msgid "This could cause slow down in Wii Menu and some games."
-msgstr "這可能會使 Wii Menu 和部分遊戲降速。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:139
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
 "the middle button to move.\n"
 "Hold SHIFT and press one of the WASD keys to move the camera by a certain "
-"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
-"SHIFT+R to reset the camera.\n"
+"step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press "
+"SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:96
+#, c-format
 msgid ""
-"This limits the game speed to the specified number of frames per second "
-"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
-"throttle using the DSP (might fix audio clicks but can also cause constant "
-"noise depending on the game)."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"DSPHLE: Unknown ucode (CRC = %08x) - forcing AX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+#: Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp:90
+#, c-format
 msgid ""
-"This splits the Video and CPU threads, so they can be run on separate "
-"cores.\n"
-"Causes major speed improvements on PCs with more than one core, but can also "
-"cause occasional crashes/glitches."
+"This title might be incompatible with DSP HLE emulation. Try using LLE if "
+"this is homebrew.\n"
+"\n"
+"Unknown ucode (CRC = %08x) - forcing AXWii."
 msgstr ""
-"這將分離影像和 CPU 線程，所以它們可以執行於獨立的內核中。\n"
-"可以在多核心的 PC 上取得非常大的加速，但是也可能導致偶爾崩潰或圖片問題。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
-msgid "This will let you Manually Edit the INI config file"
-msgstr "這將允許您手工編輯 INI 設定檔案"
+#: Source/Core/DolphinWX/ISOProperties.cpp:372
+msgid ""
+"This value is added to the convergence value set in the graphics "
+"configuration."
+msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:237
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
+#: Source/Core/DolphinWX/ISOProperties.cpp:364
+msgid ""
+"This value is multiplied with the depth set in the graphics configuration."
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:243
+msgid ""
+"This version of Dolphin was downloaded from a website stealing money from "
+"developers of the emulator. Please download Dolphin from the official "
+"website instead: https://dolphin-emu.org/"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:311
+msgid "This will let you manually edit the INI config file."
+msgstr ""
+
+#: Source/Core/InputCommon/ControllerEmu.cpp:158
+#: Source/Core/InputCommon/ControllerEmu.cpp:163
 msgid "Threshold"
 msgstr "閾值"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "Tilt"
 msgstr "傾斜"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294
+#: Source/Core/Common/TraversalClient.cpp:231
+msgid "Timeout connecting to traversal server"
+msgstr ""
+
+#: Source/Core/DolphinWX/GameListCtrl.cpp:269
+#: Source/Core/DolphinWX/MemcardManager.cpp:645
 msgid "Title"
 msgstr "標題"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:106
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:125
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:61
 msgid "Toggle All Log Types"
 msgstr "全選/全部取消"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/Core/HotkeyManager.cpp:45
 msgid "Toggle Aspect Ratio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/Core/HotkeyManager.cpp:46
 msgid "Toggle EFB Copies"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/Core/HotkeyManager.cpp:47
 msgid "Toggle Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:465
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/Core/HotkeyManager.cpp:48
+msgid "Toggle Frame limit"
+msgstr ""
+
+#: Source/Core/DolphinWX/FrameTools.cpp:549
+#: Source/Core/Core/HotkeyManager.cpp:27
 msgid "Toggle Fullscreen"
 msgstr "切換全螢幕"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/Core/HotkeyManager.cpp:44
 msgid "Toggle IR"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/Core/HotkeyManager.cpp:17
+msgid "Toggle Pause"
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:338
 msgid "Top"
 msgstr "上方"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:433
+msgid "Top-and-Bottom"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:39
+#: Source/Core/DolphinWX/ISOProperties.cpp:529
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:414
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:57
+msgid "Traversal"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:759
+msgid "Traversal server timed out connecting to the host"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:90
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:367
+msgid "Traversal: "
+msgstr ""
+
+#: Source/Core/DiscIO/VolumeGC.cpp:34
+#: Source/Core/DiscIO/VolumeDirectory.cpp:79
+#: Source/Core/DiscIO/VolumeWad.cpp:44
+msgid "Tried to decrypt data from a non-Wii volume"
+msgstr ""
+
+#: Source/Core/Core/Boot/Boot.cpp:443
 msgid "Tried to load an unknown file type."
 msgstr "已嘗試讀取從未知的檔案類型。"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+#: Source/Core/Core/HW/GCPadEmu.cpp:70
 msgid "Triggers"
 msgstr "扳機"
 
-#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+#: Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp:86
+msgid "Trying to create invalid memory card index."
+msgstr ""
+
+#: Source/Core/Common/SysConf.h:82 Source/Core/Common/SysConf.h:105
 msgid "Trying to read from invalid SYSCONF"
 msgstr "嘗試讀取從無效的 SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:59
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5153,219 +5508,198 @@ msgstr ""
 "嘗試讀取從無效的 SYSCONF\n"
 "Wiimote bt ids 是無效的"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
-msgid "Turkish"
-msgstr "Turkish"
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Turntable"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:73
 msgid "Type"
 msgstr "類型"
 
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
-msgid "UDP Port:"
-msgstr "UDP 埠口："
-
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:270
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
-msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
-msgid "UNKNOWN"
-msgstr "未知"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:764
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/ISOProperties.cpp:165
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#: Source/Core/DolphinWX/ARCodeAddEdit.cpp:126
 #, c-format
 msgid ""
-"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"Unable to parse line %u of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/FrameTools.cpp:527
 #, c-format
 msgid "Undefined %i"
 msgstr "未指定 %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/FrameTools.cpp:501
+#: Source/Core/Core/HotkeyManager.cpp:114
 msgid "Undo Load State"
 msgstr "取消讀取進度"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:230
+#: Source/Core/DolphinWX/FrameTools.cpp:502
+#: Source/Core/Core/HotkeyManager.cpp:115
 msgid "Undo Save State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:726
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:722
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:192
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:85
+#: Source/Core/DolphinWX/ISOProperties.cpp:181
+#: Source/Core/DolphinWX/ISOProperties.cpp:536
 msgid "Unknown"
 msgstr "未知"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:968
+#: Source/Core/Core/HW/DVDInterface.cpp:1298
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "未知的 DVD 命令 %08x - 致命錯誤"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
-#, c-format
-msgid "Unknown command 0x%08x"
-msgstr ""
-
-#: Source/Core/Common/Src/SysConf.cpp:132
+#: Source/Core/Common/SysConf.cpp:146
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "未知的登錄類型 %i 於 SYSCONF (%s@%x)！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:296
+#: Source/Core/Core/NetPlayClient.cpp:768
+#, c-format
+msgid "Unknown error %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/MemcardManager.cpp:438
+#: Source/Core/DolphinWX/MemcardManager.cpp:477
+msgid "Unknown memory card error"
+msgstr ""
+
+#: Source/Core/Core/NetPlayClient.cpp:446
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "接收到帶有未知 id 的錯誤訊息：%d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:394
+#: Source/Core/Core/NetPlayServer.cpp:585
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+#: Source/Core/DolphinWX/Main.cpp:245
+msgid "Unofficial version detected"
+msgstr ""
+
+#: Source/Core/DolphinWX/WXInputBase.cpp:48
+#: Source/Core/InputCommon/ControllerEmu.cpp:183
 msgid "Up"
 msgstr "上"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85
-#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+#: Source/Core/DolphinWX/Cheats/CheatsWindow.cpp:97
 msgid "Update"
 msgstr "更新"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:311
+#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:301
 msgid "Upright Wiimote"
 msgstr "直握 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
-msgid "Use EuRGB60 Mode (PAL60)"
-msgstr "使用 EuRGB60 模式 (PAL60)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:305
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:580
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:35
 msgid "Use Hex"
 msgstr "使用 Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
+#: Source/Core/DolphinWX/Config/WiiConfigPane.cpp:43
+msgid "Use PAL60 Mode (EuRGB60)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
 msgid "Use Panic Handlers"
 msgstr "顯示錯誤提示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:112
 msgid ""
 "Use a less accurate algorithm to calculate depth values.\n"
-"Causes issues in a few games but might give a decent speedup.\n"
+"Causes issues in a few games, but can give a decent speedup depending on the "
+"game and/or your GPU.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
-msgid ""
-"Use multiple threads to decode textures.\n"
-"Might result in a speedup (especially on CPUs with more than two cores).\n"
-"\n"
-"If unsure, leave this unchecked."
+#: Source/Core/DolphinWX/ISOProperties.cpp:377
+msgid "Use a single depth buffer for both eyes. Needed for a few games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
-msgid ""
-"Uses unsafe operations to speed up vertex streaming in OpenGL. There are no "
-"known problems on supported GPUs, but it will cause severe stability and "
-"graphical issues otherwise.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
-msgid ""
-"Usually if shader compilation fails, an error message is displayed.\n"
-"However, one may skip the popups to allow interruption free gameplay by "
-"checking this option.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:98
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:568
 msgid "Utility"
 msgstr "工具"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:304
 msgid "V-Sync"
 msgstr "垂直同步"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326
-msgid "VBeam Speed Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:79
 msgid "Value"
 msgstr "數值"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+#: Source/Core/DolphinWX/PatchAddEdit.cpp:76
 msgid "Value:"
 msgstr "數值："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:577
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:32
 msgid "Value: "
 msgstr "數值："
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+#: Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp:93
+msgid "Various Statistics"
+msgstr ""
+
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:49
 msgid "Verbosity"
 msgstr "事件"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505
-msgid "Vertex Streaming Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
-msgid "Video"
-msgstr "影像"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:507
 msgid "Virtual"
 msgstr "虛擬"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676
+#: Source/Core/DolphinWX/Config/AudioConfigPane.cpp:61
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:475
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:504
+#: Source/Core/Core/HotkeyManager.cpp:37
+msgid "Volume Down"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:39
+msgid "Volume Toggle Mute"
+msgstr ""
+
+#: Source/Core/Core/HotkeyManager.cpp:38
+msgid "Volume Up"
+msgstr ""
+
+#: Source/Core/DiscIO/NANDContentLoader.cpp:461
+#: Source/Core/DiscIO/NANDContentLoader.cpp:485
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installation 失敗：錯誤於建立 %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:524
+#: Source/Core/DiscIO/NANDContentLoader.cpp:500
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:107
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5373,25 +5707,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:53
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:86
+#: Source/Core/DolphinWX/MemcardManager.cpp:598
+#: Source/Core/DolphinWX/VideoConfigDiag.h:95
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:44
+#: Source/Core/Common/MsgHandler.cpp:55
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:279
+#: Source/Core/Core/Boot/Boot.cpp:312
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "警告 - DOL 啟動於錯誤的主機模式！"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:329
-msgid "Warning - starting ELF in wrong console mode!"
-msgstr "警告 - ELF 啟動於錯誤的主機模式！"
-
-#: Source/Core/Core/Src/Boot/Boot.cpp:209
+#: Source/Core/Core/Boot/Boot.cpp:248
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "警告 - ISO 啟動於錯誤的主機模式！"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:563
+#: Source/Core/Core/HW/GCMemcardDirectory.cpp:539
+#, c-format
+msgid "Warning BAT number of blocks %d does not match file header loaded %d"
+msgstr ""
+
+#: Source/Core/Core/HW/WiiSaveCrypted.cpp:604
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5402,7 +5738,7 @@ msgstr ""
 "%s\n"
 "您要繼續嗎？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#: Source/Core/DolphinWX/MemcardManager.cpp:597
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5415,7 +5751,7 @@ msgstr ""
 "以及在您記憶卡中 相同檔案名的檔案\n"
 "要繼續嗎？"
 
-#: Source/Core/Core/Src/Movie.cpp:837
+#: Source/Core/Core/Movie.cpp:939
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5423,7 +5759,15 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:854
+#: Source/Core/Core/Movie.cpp:916
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie ends before the current frame in the "
+"save (byte %u < %u) (frame %u < %u). You should load another save before "
+"continuing."
+msgstr ""
+
+#: Source/Core/Core/Movie.cpp:956
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5431,7 +5775,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:864
+#: Source/Core/Core/Movie.cpp:966
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5450,180 +5794,172 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:96
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:119
+#: Source/Core/AudioCommon/WaveFile.cpp:98
+#: Source/Core/AudioCommon/WaveFile.cpp:121
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - 檔案無法開啟。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:418
 msgid "Widescreen Hack"
 msgstr "寬螢幕修正"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+#: Source/Core/InputCommon/ControllerEmu.cpp:220
 msgid "Width"
 msgstr "寬度"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+#: Source/Core/DolphinWX/Config/ConfigMain.cpp:74
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:380
+#: Source/Core/DolphinWX/ISOProperties.cpp:403
 msgid "Wii Console"
 msgstr "Wii 主機"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:837
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:80
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1330
+#: Source/Core/DolphinWX/FrameTools.cpp:1438
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 存檔 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+#: Source/Core/DiscIO/WiiWad.cpp:70
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD：無法從檔案中讀取"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:20
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
+#: Source/Core/Core/HW/Wiimote.cpp:19
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp:57
+msgid "Wiimote "
+msgstr ""
+
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:217
 #, c-format
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:671
+#: Source/Core/DolphinWX/FrameTools.cpp:1548
+#, c-format
+msgid "Wiimote %i %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Main.cpp:510
 msgid "Wiimote Connected"
 msgstr "Wiimote 已連接"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:108
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:342
 msgid "Wiimote Motor"
 msgstr "Wiimote 馬達"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:472
-msgid "Wiimote settings"
-msgstr "Wiimote 設定"
-
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+#: Source/Core/DolphinWX/ControllerConfigDiag.cpp:249
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/WXInputBase.cpp:126
 msgid "Windows Left"
 msgstr "視窗 左"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/WXInputBase.cpp:128
 msgid "Windows Menu"
 msgstr "視窗 選單"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/WXInputBase.cpp:127
 msgid "Windows Right"
 msgstr "視窗 右"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+#: Source/Core/DolphinWX/LogWindow.cpp:117
 msgid "Word Wrap"
 msgstr "自動換行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:909
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1092
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228
+#: Source/Core/DolphinWX/ISOProperties.cpp:968
+#: Source/Core/DolphinWX/ISOProperties.cpp:1250
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1068
+#: Source/Core/DolphinWX/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/FrameTools.cpp:1491
 msgid "Working..."
 msgstr "執行中..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:353
+#: Source/Core/DolphinWX/ISOProperties.cpp:177
+msgid "World"
+msgstr ""
+
+#: Source/Core/DolphinWX/NetPlay/NetWindow.cpp:200
 msgid "Write memcards (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:56
 msgid "Write to Console"
 msgstr "寫入至控制台"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
-msgid "Write to Debugger"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:54
 msgid "Write to File"
 msgstr "寫入至檔案"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/LogConfigWindow.cpp:58
 msgid "Write to Window"
 msgstr "寫入至視窗"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
-#, c-format
-msgid "XAudio2 CreateSourceVoice failed: %#X"
-msgstr "XAudio2 建立原始聲音失敗： %#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
-#, c-format
-msgid "XAudio2 init failed: %#X"
-msgstr "XAudio2 初始化失敗： %#X"
-
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
-#, c-format
-msgid "XAudio2 master voice creation failed: %#X"
-msgstr "XAudio2 主聲音建立失敗： %#X"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:776
-msgid "XF reg"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:411
+msgid "X"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:778
+msgid "XF register "
+msgstr ""
+
+#: Source/Core/DolphinWX/TASInputDlg.cpp:412
+msgid "Y"
+msgstr ""
+
+#: Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黃"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
-msgid ""
-"You are using a free DSP ROM made by the Dolphin Team.\n"
-"All Wii games will work correctly, and most GC games should also work fine, "
-"but the GBA/IPL/CARD UCodes will not work.\n"
-msgstr ""
-
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
-msgid ""
-"You are using an old free DSP ROM made by the Dolphin Team.\n"
-"Only games using the Zelda UCode will work correctly.\n"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+#: Source/Core/DolphinWX/FrameAui.cpp:80
 msgid "You can't close panes that have pages in them."
 msgstr "您不能關閉有頁面的面板。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:239
-msgid "You must choose a game!!"
-msgstr "您必須選擇一個遊戲！！"
+#: Source/Core/VideoCommon/AVIDump.cpp:222
+msgid ""
+"You have resized the window while dumping frames.\n"
+"Nothing can be done to handle this properly.\n"
+"Your video will likely be broken."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:610
-msgid "You must enter a name!"
-msgstr "您必須輸入一個名稱！"
+#: Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp:298
+msgid "You must choose a game!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:455
+#: Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp:65
+msgid "You must enter a name."
+msgstr ""
+
+#: Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp:208
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "您必須輸入一個有效的十進制，十六進制或八進制的數值。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:655
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:685
 msgid "You must enter a valid profile name."
 msgstr "您必須輸入一個有效的設定檔名稱。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:929
+#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:202
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "You must restart Dolphin in order for the change to take effect."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+#: Source/Core/Core/DSP/DSPCore.cpp:61
 msgid ""
 "Your DSP ROMs have incorrect hashes.\n"
 "Would you like to stop now to fix the problem?\n"
 "If you select \"No\", audio might be garbled."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:177
+#: Source/Core/Core/CoreParameter.cpp:192
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5631,36 +5967,33 @@ msgstr ""
 "GCM/ISO 檔案似乎是無效的 (無效的區域)。\n"
 "是否以 PAL 制式繼續？"
 
-#: Source/Core/Common/Src/SysConf.cpp:45
+#: Source/Core/Common/SysConf.cpp:56
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
-"It should be 0x%04x (but is 0x%04llx)\n"
+"It should be 0x%04x (but is 0x%04<PRIx64>)\n"
 "Do you want to generate a new one?"
 msgstr ""
-"SYSCONF 檔案為不正確的大小。\n"
-"應該是 0x%04x (而非 0x%04llx)\n"
-"是否要建立新的檔案？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-msgid "ZTP hack"
-msgstr "ZTP 修正"
+#: Source/Core/DolphinWX/TASInputDlg.cpp:413
+msgid "Z"
+msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:377
+#: Source/Core/Core/ActionReplay.cpp:884
 msgid "Zero 3 code not supported"
 msgstr "不支援 Zero 3 代碼"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:398
+#: Source/Core/Core/ActionReplay.cpp:905
 #, c-format
-msgid "Zero code unknown to dolphin: %08x"
-msgstr "Zero code 未知於 dolphin: %08x"
+msgid "Zero code unknown to Dolphin: %08x"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:504
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:495
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:534
 msgid "[ waiting ]"
 msgstr "[ 等候中 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/VideoConfigDiag.cpp:128
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5668,64 +6001,30 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
-msgid "[Custom]"
-msgstr "[自訂]"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
-msgid ""
-"[EXPERIMENTAL]\n"
-"Aims to speed up emulation by offloading texture decoding to the GPU using "
-"the OpenCL framework.\n"
-"However, right now it's known to cause texture defects in various games. "
-"Also it's slower than regular CPU texture decoding in most cases.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
-msgid ""
-"[EXPERIMENTAL]\n"
-"Speeds up emulation a bit by caching display lists.\n"
-"Possibly causes issues though.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:813
+#: Source/Core/DolphinWX/Config/PathConfigPane.cpp:47
 msgid "apploader (.img)"
 msgstr "程式讀取器 (.img)"
 
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
-#, c-format
-msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT：從 %x 中讀取 Opcode 。請回報。"
+#: Source/Core/DolphinWX/ISOProperties.cpp:350
+msgid "auto"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:947
+#: Source/Core/DolphinWX/ISOProperties.cpp:352
+msgid "fake-completion"
+msgstr ""
+
+#: Source/Core/DolphinWX/ISOProperties.cpp:351
+msgid "none"
+msgstr ""
+
+#: Source/Core/DolphinWX/FifoPlayerDlg.cpp:952
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:242
-#, c-format
-msgid "unknown flavor %d (expected %d)"
-msgstr ""
-
-#: Source/Core/Core/Src/x64MemTools.cpp:236
-msgid "unknown message received"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1165
+#: Source/Core/DolphinWX/ISOProperties.cpp:1214
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute 返回 -1 在應用程式執行時！"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
-msgid "zFar Correction: "
-msgstr "zFar 修正："
-
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
-msgid "zNear Correction: "
-msgstr "zNear 修正："
-
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:545
+#: Source/Core/DolphinWX/InputConfigDiag.cpp:574
 msgid "| OR"
 msgstr "| 或"
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000000..28a78bfbe9
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,171 @@
+# Dolphin - A GameCube / Wii / Triforce Emulator
+
+[Homepage](https://dolphin-emu.org/) | [Project Site](https://github.com/dolphin-emu/dolphin) | [Forums](https://forums.dolphin-emu.org/) | [Wiki](https://wiki.dolphin-emu.org/) | [Issue Tracker](https://code.google.com/p/dolphin-emu/issues/list) | [Coding Style](https://github.com/dolphin-emu/dolphin/blob/master/Contributing.md) | [Transifex Page](https://www.transifex.com/projects/p/dolphin-emu/)
+
+Dolphin is an emulator for running GameCube, Wii, and Triforce games on
+Windows, Linux, OS X, and recent Android devices. It's licensed under
+the terms of the GNU General Public License, version 2 or later (GPLv2+).
+
+Please read the [FAQ](https://dolphin-emu.org/docs/faq/) before using Dolphin.
+
+## System Requirements
+* OS
+    * Microsoft Windows (Vista or higher).
+    * Linux.
+    * Apple Mac OS X (10.9 or higher).
+    * Unix-like systems other than Linux might work but are not officially supported.
+* Processor
+    * A CPU with SSE2 support.
+    * A modern CPU (3 GHz and Dual Core, not older than 2008) is highly recommended.
+* Graphics
+    * A reasonably modern graphics card (Direct3D 10.0 / OpenGL 3.0).
+    * A graphics card that supports Direct3D 11 / OpenGL 4.4 is recommended.
+
+## Installation on Windows
+Use the solution file `Source/dolphin-emu.sln` to build Dolphin on Windows.
+Visual Studio 2013 is a hard requirement since previous versions don't support
+many C++ features that we use. Other compilers might be able to build Dolphin
+on Windows but have not been tested and are not recommended to be used.
+
+An installer can be created by using the `Installer_win32.nsi` and
+`Installer_x64.nsi` scripts in the Installer directory. This will require the
+Nullsoft Scriptable Install System (NSIS) to be installed. Creating an
+installer is not necessary to run Dolphin since the Build directory contains
+a working Dolphin distribution.
+
+## Installation on Linux and OS X
+Dolphin requires [CMake](http://www.cmake.org/) for systems other than Windows. Many libraries are
+bundled with Dolphin and used if they're not installed on your system. CMake
+will inform you if a bundled library is used or if you need to install any
+missing packages yourself.
+
+### Build Steps:
+1. `mkdir Build`
+2. `cd Build`
+3. `cmake ..`
+4. `make`
+
+On OS X, an application bundle will be created in `./Binaries`.
+
+On Linux, it's strongly recommended to perform a global installation via `sudo make install`.
+
+## Installation on Android
+Dolphin requires [Android Studio](http://developer.android.com/tools/studio/index.html) to build
+the Android UI. Import the Gradle project located in `./Source/Android`, and then execute the
+Gradle task `assembleDebug` to build, or `installDebug` to install the UI onto a connected device.
+
+In order to launch the app, you must build and include the native Dolphin libraries into the UI project.
+(Building native code requires the [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html).)
+Android Studio will do this for you if you create `Source/Android/build.properties`, and place the
+following inside:
+
+```
+makeArgs=<make-args>
+```
+
+Replace `<make-args>` with any arguments you want to pass to `make`, and then execute the
+`assembleDebug` or `installDebug` task corresponding to the hardware platform you are targeting.
+For example, to deploy to a Nexus 9, which runs the AArch64 architecture, execute `installArm_64Debug`.
+A list of available tasks can be found in Android Studio in the Gradle tray, located at the top-right
+corner of the IDE by default.
+
+The native libraries will be compiled, and copied into `./Source/Android/app/libs`. Android Studio
+and Gradle will include any libraries in that folder into the APK at build time.
+
+## Uninstalling
+When Dolphin has been installed with the NSIS installer, you can uninstall
+Dolphin like any other Windows application.
+
+Linux users can run `cat install_manifest.txt | xargs -d '\n' rm` as root from the build directory
+to uninstall Dolphin from their system.
+
+OS X users can simply delete Dolphin.app to uninstall it.
+
+Additionally, you'll want to remove the global user directory (see below to
+see where it's stored) if you don't plan to reinstall Dolphin.
+
+## Command Line Usage
+`Usage: Dolphin [-h] [-d] [-l] [-e <str>] [-b] [-V <str>] [-A <str>]`  
+
+* -h, --help Show this help message  
+* -d, --debugger Opens the debugger  
+* -l, --logger Opens the logger  
+* -e, --exec=<str> Loads the specified file (DOL,ELF,WAD,GCM,ISO)  
+* -b, --batch Exit Dolphin with emulator  
+* -V, --video_backend=<str> Specify a video backend  
+* -A, --audio_emulation=<str> Low level (LLE) or high level (HLE) audio  
+
+Available DSP emulation engines are HLE (High Level Emulation) and
+LLE (Low Level Emulation). HLE is fast but often less accurate while LLE is
+slow but close to perfect. Note that LLE has two submodes (Interpreter and
+Recompiler), which cannot be selected from the command line.
+
+Available video backends are "D3D" (only available on Windows) and
+"OGL". There's also "Software Renderer", which uses the CPU for rendering and
+is intended for debugging purposes only.
+
+## Sys Files
+* `totaldb.dsy`: Database of symbols (for devs only)
+* `GC/font_ansi.bin`: font dumps
+* `GC/font_sjis.bin`: font dumps
+* `GC/dsp_coef.bin`: DSP dumps
+* `GC/dsp_rom.bin`: DSP dumps
+* `Wii/clientca.pem`: Wii network certificate
+* `Wii/clientcacakey.pem`: Wii network certificate
+* `Wii/rootca.pem`: Wii network certificate
+
+The DSP dumps included with Dolphin have been written from scratch and do not
+contain any copyrighted material. They should work for most purposes, however
+some games implement copy protection by checksumming the dumps. You will need
+to dump the DSP files from a console and replace the default dumps if you want
+to fix those issues.
+
+Wii network certificates must be extracted from a Wii IOS. A guide for that can be found [here](https://wiki.dolphin-emu.org/index.php?title=Wii_Network_Guide).
+
+## Folder Structure
+These folders are installed read-only and should not be changed:
+
+* `GameSettings`: per-game default settings database
+* `GC`: DSP and font dumps
+* `Maps`: symbol tables (dev only)
+* `Shaders`: post-processing shaders
+* `Themes`: icon themes for GUI
+* `Resources`: icons that are theme-agnostic
+* `Wii`: default Wii NAND contents
+
+## User Folder Structure
+A number of user writeable directories are created for caching purposes or for
+allowing the user to edit their contents. On OS X and Linux these folders are
+stored in `~/Library/Application Support/Dolphin/` and `~/.dolphin-emu`
+respectively. On Windows the user directory is stored in the `My Documents`
+folder by default, but there are various way to override this behavior:
+
+* Creating a file called `portable.txt` next to the Dolphin executable will
+  store the user directory in a local directory called "User" next to the
+  Dolphin executable.
+* If the registry string value `LocalUserConfig` exists in
+  `HKEY_CURRENT_USER/Software/Dolphin Emulator` and has the value **1**,
+  Dolphin will always start in portable mode.
+* If the registry string value `UserConfigPath` exists in
+  `HKEY_CURRENT_USER/Software/Dolphin Emulator`, the user folders will be
+  stored in the directory given by that string. The other two methods will be
+  prioritized over this setting.
+
+
+List of user folders:
+
+* `Cache`: used to cache the ISO list
+* `Config`: configuration files
+* `Dump`: anything dumped from Dolphin
+* `GameConfig`: additional settings to be applied per-game
+* `GC`: memory cards and system BIOS
+* `Load`: custom textures
+* `Logs`: logs, if enabled
+* `ScreenShots`: screenshots taken via Dolphin
+* `StateSaves`: save states
+* `Wii`: Wii NAND contents
+
+## Custom Textures
+Custom textures have to be placed in the user directory under
+`Load/Textures/[GameID]/`. You can find the Game ID by right-clicking a game
+in the ISO list and selecting "ISO Properties".
diff --git a/Readme.txt b/Readme.txt
deleted file mode 100644
index e23d0e0ec1..0000000000
--- a/Readme.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Dolphin-emu - The Gamecube / Wii Emulator
-==========================================
-Homesite: http://dolphin-emu.org/
-Project Site: http://code.google.com/p/dolphin-emu
-
-Dolphin-emu is a emulator for Gamecube, Wii, Triforce that lets
-you run Wii/GCN/Tri games on your Windows/Linux/Mac PC system.
-
-Open Source Release under GPL 2
-
-Project Leaders: F|RES, ector
-
-Team members: http://code.google.com/p/dolphin-emu/people/
-
-Please read the FAQ before use:
-
-http://dolphin-emu.org/docs/faq/
-
-System Requirements:
-* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X (10.6 or higher).
-  Windows XP x64 is NOT supported.
-* Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz).
-  Dual Core for speed boost.
-* Graphics: Any reasonably modern graphics card (Direct3D9/OpenGL 2.1, shader model 3.0).
-
-[Command line usage]
-Usage: Dolphin [-h] [-d] [-l] [-e <str>] [-b] [-V <str>] [-A <str>]
-  -h, --help                	Show this help message
-  -d, --debugger            	Opens the debugger
-  -l, --logger              	Opens the logger
-  -e, --exec=<str>          	Loads the specified file (DOL,ELF,WAD,GCM,ISO)
-  -b, --batch             	Exit Dolphin with emulator
-  -V, --video_backend=<str>  	Specify a video plugin
-  -A, --audio_emulation=<str>	Low level (LLE) or high level (HLE) audio
-
-[Libraries]
-Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html)
-*.pdb = Program Debug Database (use these symbols with a program debugger)
-
-[DSP Emulator Engines]
-HLE: High Level DSP Emulation
-LLE: Low Level DSP Emulation (requires DSP dumps)
-     Recompiler is faster than interpreter but may be buggy.
-
-[Video Backends]
-Direct3D9: Render with Direct3D 9
-Direct3D11: Render with Direct3D 11
-OpenGL: Render with OpenGL + Cg Shader Language
-Software Renderer: Render using the CPU only (for devs only)
-
-[Sys Files]
-totaldb.dsy: Database of symbols (for devs only)
-font_ansi.bin/font_sjis.bin: font dumps
-setting-usa/jpn/usa.txt: config files for Wii
-
-[Support Folders]
-Cache: used to cache the ISO list
-Config: emulator configuration files
-Dump: anything dumped from dolphin will go here
-GameConfig: holds the INI game config files
-GC: Gamecube memory cards
-Load: custom textures
-Logs: logs go here
-Maps: symbol tables go here (dev only)
-OpenCL: OpenCL code
-ScreenShots: screenshots are saved here
-Shaders: post-processing shaders
-StateSaves: save states are stored here
-Wii: Wii saves and config is stored here
diff --git a/Source/.clang-format b/Source/.clang-format
new file mode 100644
index 0000000000..0df930b2da
--- /dev/null
+++ b/Source/.clang-format
@@ -0,0 +1,55 @@
+---
+Language:        Cpp
+BasedOnStyle:  LLVM
+#AccessModifierOffset: -2
+#ConstructorInitializerIndentWidth: 4
+#AlignEscapedNewlinesLeft: false
+#AlignTrailingComments: true
+#AllowAllParametersOfDeclarationOnNextLine: true
+#AllowShortBlocksOnASingleLine: false
+#AllowShortIfStatementsOnASingleLine: false
+#AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+#AlwaysBreakTemplateDeclarations: false
+#AlwaysBreakBeforeMultilineStrings: false
+#BreakBeforeBinaryOperators: false
+#BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+#BinPackParameters: true
+ColumnLimit:     120
+#ConstructorInitializerAllOnOneLineOrOnePerLine: false
+#DerivePointerBinding: false
+#ExperimentalAutoDetectBinPacking: false
+#IndentCaseLabels: false
+#MaxEmptyLinesToKeep: 1
+#KeepEmptyLinesAtTheStartOfBlocks: true
+#NamespaceIndentation: None
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: true
+#PenaltyBreakBeforeFirstCallParameter: 19
+#PenaltyBreakComment: 300
+#PenaltyBreakString: 1000
+#PenaltyBreakFirstLessLess: 120
+#PenaltyExcessCharacter: 1000000
+#PenaltyReturnTypeOnItsOwnLine: 60
+#PointerBindsToType: false
+#SpacesBeforeTrailingComments: 1
+#Cpp11BracedListStyle: true
+#Standard:        Cpp11
+IndentWidth:     4
+TabWidth:        4
+UseTab:          ForIndentation 
+BreakBeforeBraces: Allman
+#IndentFunctionDeclarationAfterType: false
+#SpacesInParentheses: false
+#SpacesInAngles:  false
+#SpaceInEmptyParentheses: false
+#SpacesInCStyleCastParentheses: false
+#SpacesInContainerLiterals: true
+#SpaceBeforeAssignmentOperators: true
+#ContinuationIndentWidth: 4
+#CommentPragmas:  '^ IWYU pragma:'
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#SpaceBeforeParens: ControlStatements
+...
+
diff --git a/Source/Android/.classpath b/Source/Android/.classpath
deleted file mode 100644
index d3bb07b44c..0000000000
--- a/Source/Android/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/Source/Android/.gitignore b/Source/Android/.gitignore
index 31bce7aa41..a053548512 100644
--- a/Source/Android/.gitignore
+++ b/Source/Android/.gitignore
@@ -1,7 +1,43 @@
-gen
-obj
-#ui_atlas.zim
-ui_atlas.zim.png
-#assets/ui_atlas.zim
-#jni/ui_atlas.cpp
-#jni/ui_atlas.h
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+/bin/
+/gen/
+/libs/
+/obj/
+
+# Copied by cmake
+*/*/*/assets/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.iws
+*~
+*.swp
+workspace.xml
+tasks.xml
+.gradle/*
+.idea
+gradle/
+build/
+*.so
+*.iml
+build.properties
\ No newline at end of file
diff --git a/Source/Android/.project b/Source/Android/.project
deleted file mode 100644
index b4a12698bf..0000000000
--- a/Source/Android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dolphinemulator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/Source/Android/.settings/org.eclipse.jdt.core.prefs b/Source/Android/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2ddc8..0000000000
--- a/Source/Android/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
deleted file mode 100644
index c80638bb38..0000000000
--- a/Source/Android/AndroidManifest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.dolphinemu.dolphinemu"
-    android:versionCode="11"
-    android:versionName="0.11" 
-    android:installLocation="auto">
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="18" />
-
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <uses-feature android:name="android.hardware.screen.landscape" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" /> 
-
-    <application
-        android:icon="@drawable/launcher"
-        android:label="@string/app_name" >
-        <activity
-            android:name="org.dolphinemu.dolphinemu.DolphinEmulator"
-            android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity" />
-
-        <activity android:name="org.dolphinemu.dolphinemu.EmulationActivity"
-                  android:screenOrientation="landscape" />
-
-        <activity
-            android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
-            android:label="@string/settings" />
-
-    </application>
-
-</manifest>
diff --git a/Source/Android/android.toolchain.cmake b/Source/Android/android.toolchain.cmake
index 0f7e340678..d5a9d47e0b 100644
--- a/Source/Android/android.toolchain.cmake
+++ b/Source/Android/android.toolchain.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2010-2011, Ethan Rublee
-# Copyright (c) 2011-2013, Andrey Kamaev
+# Copyright (c) 2011-2014, Andrey Kamaev
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,9 @@
 #     this list of conditions and the following disclaimer in the documentation
 #     and/or other materials provided with the distribution.
 #
-# 3.  The name of the copyright holders may be used to endorse or promote
-#     products derived from this software without specific prior written
-#     permission.
+# 3.  Neither the name of the copyright holder nor the names of its
+#     contributors 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
@@ -29,28 +29,19 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # ------------------------------------------------------------------------------
-#  Android CMake toolchain file, for use with the Android NDK r5-r8
-#  Requires cmake 2.6.3 or newer (2.8.5 or newer is recommended).
+#  Android CMake toolchain file, for use with the Android NDK r5-r10e
+#  Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended).
 #  See home page: https://github.com/taka-no-me/android-cmake
 #
-#  The file is mantained by the OpenCV project. The latest version can be get at
-#  http://code.opencv.org/projects/opencv/repository/revisions/master/changes/android/android.toolchain.cmake
-#
 #  Usage Linux:
 #   $ export ANDROID_NDK=/absolute/path/to/the/android-ndk
 #   $ mkdir build && cd build
 #   $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake ..
 #   $ make -j8
 #
-#  Usage Linux (using standalone toolchain):
-#   $ export ANDROID_STANDALONE_TOOLCHAIN=/absolute/path/to/android-toolchain
-#   $ mkdir build && cd build
-#   $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake ..
-#   $ make -j8
-#
 #  Usage Windows:
 #     You need native port of make to build your project.
-#     Android NDK r7 (or newer) already has make.exe on board.
+#     Android NDK r7 (and newer) already has make.exe on board.
 #     For older NDK you have to install it separately.
 #     For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm
 #
@@ -66,51 +57,63 @@
 #    ANDROID_NDK=/opt/android-ndk - path to the NDK root.
 #      Can be set as environment variable. Can be set only at first cmake run.
 #
-#    ANDROID_STANDALONE_TOOLCHAIN=/opt/android-toolchain - path to the
-#      standalone toolchain. This option is not used if full NDK is found
-#      (ignored if ANDROID_NDK is set).
-#      Can be set as environment variable. Can be set only at first cmake run.
-#
 #    ANDROID_ABI=armeabi-v7a - specifies the target Application Binary
 #      Interface (ABI). This option nearly matches to the APP_ABI variable
 #      used by ndk-build tool from Android NDK.
 #
 #      Possible targets are:
-#        "armeabi" - matches to the NDK ABI with the same name.
-#           See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
-#        "armeabi-v7a" - matches to the NDK ABI with the same name.
-#           See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#        "armeabi" - ARMv5TE based CPU with software floating point operations
+#        "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions
+#            this ABI target is used by default
 #        "armeabi-v7a with NEON" - same as armeabi-v7a, but
 #            sets NEON as floating-point unit
 #        "armeabi-v7a with VFPV3" - same as armeabi-v7a, but
-#            sets VFPV3 as floating-point unit (has 32 registers instead of 16).
-#        "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP.
-#        "x86" - matches to the NDK ABI with the same name.
-#            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
-#        "mips" - matches to the NDK ABI with the same name
-#            (It is not tested on real devices by the authos of this toolchain)
-#            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#            sets VFPV3 as floating-point unit (has 32 registers instead of 16)
+#        "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP
+#        "x86" - IA-32 instruction set
+#        "mips" - MIPS32 instruction set
+#
+#      64-bit ABIs for NDK r10 and newer:
+#        "arm64-v8a" - ARMv8 AArch64 instruction set
+#        "x86_64" - Intel64 instruction set (r1)
+#        "mips64" - MIPS64 instruction set (r6)
 #
 #    ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for.
 #      Option is read-only when standalone toolchain is used.
+#      Note: building for "android-L" requires explicit configuration.
 #
-#    ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.6 - the name of compiler
+#    ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler
 #      toolchain to be used. The list of possible values depends on the NDK
-#      version. For NDK r8c the possible values are:
+#      version. For NDK r10c the possible values are:
 #
-#        * arm-linux-androideabi-4.4.3
+#        * aarch64-linux-android-4.9
+#        * aarch64-linux-android-clang3.4
+#        * aarch64-linux-android-clang3.5
 #        * arm-linux-androideabi-4.6
-#        * arm-linux-androideabi-clang3.1
-#        * mipsel-linux-android-4.4.3
+#        * arm-linux-androideabi-4.8
+#        * arm-linux-androideabi-4.9 (default)
+#        * arm-linux-androideabi-clang3.4
+#        * arm-linux-androideabi-clang3.5
+#        * mips64el-linux-android-4.9
+#        * mips64el-linux-android-clang3.4
+#        * mips64el-linux-android-clang3.5
 #        * mipsel-linux-android-4.6
-#        * mipsel-linux-android-clang3.1
-#        * x86-4.4.3
+#        * mipsel-linux-android-4.8
+#        * mipsel-linux-android-4.9
+#        * mipsel-linux-android-clang3.4
+#        * mipsel-linux-android-clang3.5
 #        * x86-4.6
-#        * x86-clang3.1
+#        * x86-4.8
+#        * x86-4.9
+#        * x86-clang3.4
+#        * x86-clang3.5
+#        * x86_64-4.9
+#        * x86_64-clang3.4
+#        * x86_64-clang3.5
 #
 #    ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions
-#      instead of Thumb. Is not available for "x86" (inapplicable) and
-#      "armeabi-v6 with VFP" (is forced to be ON) ABIs.
+#      instead of Thumb. Is not available for "armeabi-v6 with VFP"
+#      (is forced to be ON) ABI.
 #
 #    ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker
 #      errors even if they are not used.
@@ -119,13 +122,6 @@
 #      libraries. Automatically turned for NDK r5x and r6x due to GLESv2
 #      problems.
 #
-#    LIBRARY_OUTPUT_PATH_ROOT=${CMAKE_SOURCE_DIR} - where to output binary
-#      files. See additional details below.
-#
-#    ANDROID_SET_OBSOLETE_VARIABLES=ON - if set, then toolchain defines some
-#      obsolete variables which were used by previous versions of this file for
-#      backward compatibility.
-#
 #    ANDROID_STL=gnustl_static - specify the runtime to use.
 #
 #      Possible values are:
@@ -182,113 +178,10 @@
 #    ANDROID and BUILD_ANDROID will be set to true, you may test any of these
 #    variables to make necessary Android-specific configuration changes.
 #
-#    Also ARMEABI or ARMEABI_V7A or X86 or MIPS will be set true, mutually
-#    exclusive. NEON option will be set true if VFP is set to NEON.
+#    Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64
+#    will be set true, mutually exclusive. NEON option will be set true
+#    if VFP is set to NEON.
 #
-#    LIBRARY_OUTPUT_PATH_ROOT should be set in cache to determine where Android
-#    libraries will be installed.
-#    Default is ${CMAKE_SOURCE_DIR}, and the android libs will always be
-#    under the ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}
-#    (depending on the target ABI). This is convenient for Android packaging.
-#
-#  Change Log:
-#   - initial version December 2010
-#   - April 2011
-#     [+] added possibility to build with NDK (without standalone toolchain)
-#     [+] support cross-compilation on Windows (native, no cygwin support)
-#     [+] added compiler option to force "char" type to be signed
-#     [+] added toolchain option to compile to 32-bit ARM instructions
-#     [+] added toolchain option to disable SWIG search
-#     [+] added platform "armeabi-v7a with VFPV3"
-#     [~] ARM_TARGETS renamed to ARM_TARGET
-#     [+] EXECUTABLE_OUTPUT_PATH is set by toolchain (required on Windows)
-#     [~] Fixed bug with ANDROID_API_LEVEL variable
-#     [~] turn off SWIG search if it is not found first time
-#   - May 2011
-#     [~] ANDROID_LEVEL is renamed to ANDROID_API_LEVEL
-#     [+] ANDROID_API_LEVEL is detected by toolchain if not specified
-#     [~] added guard to prevent changing of output directories on the first
-#         cmake pass
-#     [~] toolchain exits with error if ARM_TARGET is not recognized
-#   - June 2011
-#     [~] default NDK path is updated for version r5c
-#     [+] variable CMAKE_SYSTEM_PROCESSOR is set based on ARM_TARGET
-#     [~] toolchain install directory is added to linker paths
-#     [-] removed SWIG-related stuff from toolchain
-#     [+] added macro find_host_package, find_host_program to search
-#         packages/programs on the host system
-#     [~] fixed path to STL library
-#   - July 2011
-#     [~] fixed options caching
-#     [~] search for all supported NDK versions
-#     [~] allowed spaces in NDK path
-#   - September 2011
-#     [~] updated for NDK r6b
-#   - November 2011
-#     [*] rewritten for NDK r7
-#     [+] x86 toolchain support (experimental)
-#     [+] added "armeabi-v6 with VFP" ABI for ARMv6 processors.
-#     [~] improved compiler and linker flags management
-#     [+] support different build flags for Release and Debug configurations
-#     [~] by default compiler flags the same as used by ndk-build (but only
-#         where reasonable)
-#     [~] ANDROID_NDK_TOOLCHAIN_ROOT is splitted to ANDROID_STANDALONE_TOOLCHAIN
-#         and ANDROID_TOOLCHAIN_ROOT
-#     [~] ARM_TARGET is renamed to ANDROID_ABI
-#     [~] ARMEABI_NDK_NAME is renamed to ANDROID_NDK_ABI_NAME
-#     [~] ANDROID_API_LEVEL is renamed to ANDROID_NATIVE_API_LEVEL
-#   - January 2012
-#     [+] added stlport_static support (experimental)
-#     [+] added special check for cygwin
-#     [+] filtered out hidden files (starting with .) while globbing inside NDK
-#     [+] automatically applied GLESv2 linkage fix for NDK revisions 5-6
-#     [+] added ANDROID_GET_ABI_RAWNAME to get NDK ABI names by CMake flags
-#   - February 2012
-#     [+] updated for NDK r7b
-#     [~] fixed cmake try_compile() command
-#     [~] Fix for missing install_name_tool on OS X
-#   - March 2012
-#     [~] fixed incorrect C compiler flags
-#     [~] fixed CMAKE_SYSTEM_PROCESSOR change on ANDROID_ABI change
-#     [+] improved toolchain loading speed
-#     [+] added assembler language support (.S)
-#     [+] allowed preset search paths and extra search suffixes
-#   - April 2012
-#     [+] updated for NDK r7c
-#     [~] fixed most of problems with compiler/linker flags and caching
-#     [+] added option ANDROID_FUNCTION_LEVEL_LINKING
-#   - May 2012
-#     [+] updated for NDK r8
-#     [+] added mips architecture support
-#   - August 2012
-#     [+] updated for NDK r8b
-#     [~] all intermediate files generated by toolchain are moved to CMakeFiles
-#     [~] libstdc++ and libsupc are removed from explicit link libraries
-#     [+] added CCache support (via NDK_CCACHE environment or cmake variable)
-#     [+] added gold linker support for NDK r8b
-#     [~] fixed mips linker flags for NDK r8b
-#   - September 2012
-#     [+] added NDK release name detection (see ANDROID_NDK_RELEASE)
-#     [+] added support for all C++ runtimes from NDK
-#         (system, gabi++, stlport, gnustl)
-#     [+] improved warnings on known issues of NDKs
-#     [~] use gold linker as default if available (NDK r8b)
-#     [~] globally turned off rpath
-#     [~] compiler options are aligned with NDK r8b
-#   - October 2012
-#     [~] fixed C++ linking: explicitly link with math library (OpenCV #2426)
-#   - November 2012
-#     [+] updated for NDK r8c
-#     [+] added support for clang compiler
-#   - December 2012
-#     [+] suppress warning about unused CMAKE_TOOLCHAIN_FILE variable
-#     [+] adjust API level to closest compatible as NDK does
-#     [~] fixed ccache full path search
-#     [+] updated for NDK r8d
-#     [~] compiler options are aligned with NDK r8d
-#   - March 2013
-#     [+] updated for NDK r8e (x86 version)
-#     [+] support x86_64 version of NDK
 # ------------------------------------------------------------------------------
 
 cmake_minimum_required( VERSION 2.6.3 )
@@ -299,146 +192,146 @@ if( DEFINED CMAKE_CROSSCOMPILING )
 endif()
 
 if( CMAKE_TOOLCHAIN_FILE )
- # touch toolchain variable only to suppress "unused variable" warning
+ # touch toolchain variable to suppress "unused variable" warning
 endif()
 
+# inherit settings in recursive loads
 get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
 if( _CMAKE_IN_TRY_COMPILE )
  include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL )
 endif()
 
 # this one is important
-set( CMAKE_SYSTEM_NAME Linux )
+if( CMAKE_VERSION VERSION_GREATER "3.0.99" )
+ set( CMAKE_SYSTEM_NAME Android )
+else()
+ set( CMAKE_SYSTEM_NAME Linux )
+endif()
+
 # this one not so much
 set( CMAKE_SYSTEM_VERSION 1 )
 
-# rpath makes low sence for Android
+# rpath makes low sense for Android
+set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" )
 set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
 
-set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
-if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
+# NDK search paths
+set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
+if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS )
  if( CMAKE_HOST_WIN32 )
   file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
-  set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}/android-ndk" "$ENV{SystemDrive}/NVPACK/android-ndk" )
+  set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" )
  else()
   file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS )
-  set( ANDROID_NDK_SEARCH_PATHS /opt/android-ndk "${ANDROID_NDK_SEARCH_PATHS}/NVPACK/android-ndk" )
+  set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" )
  endif()
 endif()
-if(NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH)
+if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
  set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain )
 endif()
 
+# known ABIs
 set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" )
+set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" )
 set( ANDROID_SUPPORTED_ABIS_x86 "x86" )
-set( ANDROID_SUPPORTED_ABIS_mipsel "mips" )
+set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" )
+set( ANDROID_SUPPORTED_ABIS_mips "mips" )
+set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" )
 
+# API level defaults
 set( ANDROID_DEFAULT_NDK_API_LEVEL 8 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 )
 set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 )
 set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 )
 
 
 macro( __LIST_FILTER listvar regex )
- if( ${listvar} )
-  foreach( __val ${${listvar}} )
-   if( __val MATCHES "${regex}" )
-    list( REMOVE_ITEM ${listvar} "${__val}" )
-   endif()
-  endforeach()
- endif()
+  if( ${listvar} )
+    foreach( __val ${${listvar}} )
+      if( __val MATCHES "${regex}" )
+        list( REMOVE_ITEM ${listvar} "${__val}" )
+      endif()
+    endforeach()
+  endif()
 endmacro()
 
 macro( __INIT_VARIABLE var_name )
- set( __test_path 0 )
- foreach( __var ${ARGN} )
-  if( __var STREQUAL "PATH" )
-   set( __test_path 1 )
-   break()
-  endif()
- endforeach()
- if( __test_path AND NOT EXISTS "${${var_name}}" )
-  unset( ${var_name} CACHE )
- endif()
- if( "${${var_name}}" STREQUAL "" )
-  set( __values 0 )
+  set( __test_path 0 )
   foreach( __var ${ARGN} )
-   if( __var STREQUAL "VALUES" )
-    set( __values 1 )
-   elseif( NOT __var STREQUAL "PATH" )
-    set( __obsolete 0 )
-    if( __var MATCHES "^OBSOLETE_.*$" )
-     string( REPLACE "OBSOLETE_" "" __var "${__var}" )
-     set( __obsolete 1 )
-    endif()
-    if( __var MATCHES "^ENV_.*$" )
-     string( REPLACE "ENV_" "" __var "${__var}" )
-     set( __value "$ENV{${__var}}" )
-    elseif( DEFINED ${__var} )
-     set( __value "${${__var}}" )
-    else()
-     if( __values )
-      set( __value "${__var}" )
-     else()
-      set( __value "" )
-     endif()
-    endif()
-    if( NOT "${__value}" STREQUAL "" )
-     if( __test_path )
-      if( EXISTS "${__value}" )
-       file( TO_CMAKE_PATH "${__value}" ${var_name} )
-       if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE )
-        message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." )
-       endif()
-       break()
-      endif()
-     else()
-      set( ${var_name} "${__value}" )
-       if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE )
-        message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." )
-       endif()
+    if( __var STREQUAL "PATH" )
+      set( __test_path 1 )
       break()
-     endif()
     endif()
-   endif()
   endforeach()
-  unset( __value )
-  unset( __values )
-  unset( __obsolete )
- elseif( __test_path )
-  file( TO_CMAKE_PATH "${${var_name}}" ${var_name} )
- endif()
- unset( __test_path )
+
+  if( __test_path AND NOT EXISTS "${${var_name}}" )
+    unset( ${var_name} CACHE )
+  endif()
+
+  if( " ${${var_name}}" STREQUAL " " )
+    set( __values 0 )
+    foreach( __var ${ARGN} )
+      if( __var STREQUAL "VALUES" )
+        set( __values 1 )
+      elseif( NOT __var STREQUAL "PATH" )
+        if( __var MATCHES "^ENV_.*$" )
+          string( REPLACE "ENV_" "" __var "${__var}" )
+          set( __value "$ENV{${__var}}" )
+        elseif( DEFINED ${__var} )
+          set( __value "${${__var}}" )
+        elseif( __values )
+          set( __value "${__var}" )
+        else()
+          set( __value "" )
+        endif()
+
+        if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") )
+          set( ${var_name} "${__value}" )
+          break()
+        endif()
+      endif()
+    endforeach()
+    unset( __value )
+    unset( __values )
+  endif()
+
+  if( __test_path )
+    file( TO_CMAKE_PATH "${${var_name}}" ${var_name} )
+  endif()
+  unset( __test_path )
 endmacro()
 
 macro( __DETECT_NATIVE_API_LEVEL _var _path )
- SET( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*$" )
- FILE( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" )
- if( NOT __apiFileContent )
-  message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." )
- endif()
- string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" )
- unset( __apiFileContent )
- unset( __ndkApiLevelRegex )
+  set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" )
+  file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" )
+  if( NOT __apiFileContent )
+    message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." )
+  endif()
+  string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" )
+  unset( __apiFileContent )
+  unset( __ndkApiLevelRegex )
 endmacro()
 
 macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root )
  if( EXISTS "${_root}" )
-  file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" )
-  __LIST_FILTER( __gccExePath "^[.].*" )
-  list( LENGTH __gccExePath __gccExePathsCount )
-  if( NOT __gccExePathsCount EQUAL 1  AND NOT _CMAKE_IN_TRY_COMPILE )
-   message( WARNING "Could not determine machine name for compiler from ${_root}" )
-   set( ${_var} "" )
+    file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" )
+    __LIST_FILTER( __gccExePath "^[.].*" )
+    list( LENGTH __gccExePath __gccExePathsCount )
+    if( NOT __gccExePathsCount EQUAL 1  AND NOT _CMAKE_IN_TRY_COMPILE )
+      message( WARNING "Could not determine machine name for compiler from ${_root}" )
+      set( ${_var} "" )
+    else()
+      get_filename_component( __gccExeName "${__gccExePath}" NAME_WE )
+      string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" )
+    endif()
+    unset( __gccExePath )
+    unset( __gccExePathsCount )
+    unset( __gccExeName )
   else()
-   get_filename_component( __gccExeName "${__gccExePath}" NAME_WE )
-   string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" )
+    set( ${_var} "" )
   endif()
-  unset( __gccExePath )
-  unset( __gccExePathsCount )
-  unset( __gccExeName )
- else()
-  set( ${_var} "" )
- endif()
 endmacro()
 
 
@@ -461,7 +354,7 @@ endif()
 
 
 # detect current host platform
-if( NOT DEFINED ANDROID_NDK_HOST_X64 AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) )
  set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" )
  mark_as_advanced( ANDROID_NDK_HOST_X64 )
 endif()
@@ -486,17 +379,19 @@ if( NOT ANDROID_NDK_HOST_X64 )
 endif()
 
 # see if we have path to Android NDK
-__INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK )
+if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN )
+  __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK )
+endif()
 if( NOT ANDROID_NDK )
  # see if we have path to Android standalone toolchain
- __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN OBSOLETE_ANDROID_NDK_TOOLCHAIN_ROOT OBSOLETE_ENV_ANDROID_NDK_TOOLCHAIN_ROOT )
+ __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN )
 
  if( NOT ANDROID_STANDALONE_TOOLCHAIN )
   #try to find Android NDK in one of the the default locations
   set( __ndkSearchPaths )
   foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} )
    foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} )
-    list( APPEND __ndkSearchPaths "${__ndkSearchPath}${suffix}" )
+    list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" )
    endforeach()
   endforeach()
   __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} )
@@ -516,24 +411,22 @@ if( NOT ANDROID_NDK )
   endif( ANDROID_NDK )
  endif( NOT ANDROID_STANDALONE_TOOLCHAIN )
 endif( NOT ANDROID_NDK )
+
 # remember found paths
 if( ANDROID_NDK )
  get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE )
- # try to detect change
- if( CMAKE_AR )
-  string( LENGTH "${ANDROID_NDK}" __length )
-  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath )
-  if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK )
-   message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first.
-   " )
-  endif()
-  unset( __androidNdkPreviousPath )
-  unset( __length )
- endif()
  set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE )
  set( BUILD_WITH_ANDROID_NDK True )
- file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX r[0-9]+[a-z]? )
- string( REGEX MATCH r[0-9]+[a-z]? ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" )
+ if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" )
+  file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" )
+  string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" )
+ else()
+  set( ANDROID_NDK_RELEASE "r1x" )
+  set( ANDROID_NDK_RELEASE_FULL "unreleased" )
+ endif()
+ string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" )
+ string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum )
+ math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" )
 elseif( ANDROID_STANDALONE_TOOLCHAIN )
  get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE )
  # try to detect change
@@ -556,10 +449,55 @@ else()
     or
       export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain
     or put the toolchain or NDK in the default path:
-      sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}
+      sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk
       sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" )
 endif()
 
+# android NDK layout
+if( BUILD_WITH_ANDROID_NDK )
+ if( NOT DEFINED ANDROID_NDK_LAYOUT )
+  # try to automatically detect the layout
+  if( EXISTS "${ANDROID_NDK}/RELEASE.TXT")
+   set( ANDROID_NDK_LAYOUT "RELEASE" )
+  elseif( EXISTS "${ANDROID_NDK}/../../linux-x86/toolchain/" )
+   set( ANDROID_NDK_LAYOUT "LINARO" )
+  elseif( EXISTS "${ANDROID_NDK}/../../gcc/" )
+   set( ANDROID_NDK_LAYOUT "ANDROID" )
+  endif()
+ endif()
+ set( ANDROID_NDK_LAYOUT "${ANDROID_NDK_LAYOUT}" CACHE STRING "The inner layout of NDK" )
+ mark_as_advanced( ANDROID_NDK_LAYOUT )
+ if( ANDROID_NDK_LAYOUT STREQUAL "LINARO" )
+  set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment
+  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../${ANDROID_NDK_HOST_SYSTEM_NAME}/toolchain" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" )
+ elseif( ANDROID_NDK_LAYOUT STREQUAL "ANDROID" )
+  set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment
+  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../gcc/${ANDROID_NDK_HOST_SYSTEM_NAME}/arm" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" )
+ else() # ANDROID_NDK_LAYOUT STREQUAL "RELEASE"
+  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/toolchains" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
+  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME2}" )
+ endif()
+ get_filename_component( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK_TOOLCHAINS_PATH}" ABSOLUTE )
+
+ # try to detect change of NDK
+ if( CMAKE_AR )
+  string( LENGTH "${ANDROID_NDK_TOOLCHAINS_PATH}" __length )
+  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath )
+  if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK_TOOLCHAINS_PATH )
+   message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first.
+   " )
+  endif()
+  unset( __androidNdkPreviousPath )
+  unset( __length )
+ endif()
+endif()
+
+
 # get all the details about standalone toolchain
 if( BUILD_WITH_STANDALONE_TOOLCHAIN )
  __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" )
@@ -569,12 +507,18 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN )
  if( NOT __availableToolchainMachines )
   message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." )
  endif()
- if( __availableToolchainMachines MATCHES i686 )
+ if( __availableToolchainMachines MATCHES x86_64 )
+  set( __availableToolchainArchs "x86_64" )
+ elseif( __availableToolchainMachines MATCHES i686 )
   set( __availableToolchainArchs "x86" )
+ elseif( __availableToolchainMachines MATCHES aarch64 )
+  set( __availableToolchainArchs "arm64" )
  elseif( __availableToolchainMachines MATCHES arm )
   set( __availableToolchainArchs "arm" )
+ elseif( __availableToolchainMachines MATCHES mips64el )
+  set( __availableToolchainArchs "mips64" )
  elseif( __availableToolchainMachines MATCHES mipsel )
-  set( __availableToolchainArchs "mipsel" )
+  set( __availableToolchainArchs "mips" )
  endif()
  execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion
                   OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE )
@@ -587,21 +531,47 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN )
  endif()
 endif()
 
-macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __host_system_name )
+macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath )
  foreach( __toolchain ${${__availableToolchainsLst}} )
-  if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK}/toolchains/${__toolchain}/prebuilt/" )
-   string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" )
+  if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" )
+   SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" )
+   FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" )
+   if( __toolchainVersionStr )
+    string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" )
+    string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" )
+   else()
+    string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" )
+   endif()
+   unset( __toolchainVersionStr )
+   unset( __toolchainVersionRegex )
   else()
    set( __gcc_toolchain "${__toolchain}" )
   endif()
-  __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK}/toolchains/${__gcc_toolchain}/prebuilt/${__host_system_name}" )
+  __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" )
   if( __machine )
-   string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?$" __version "${__gcc_toolchain}" )
-   string( REGEX MATCH "^[^-]+" __arch "${__gcc_toolchain}" )
-   list( APPEND __availableToolchainMachines "${__machine}" )
-   list( APPEND __availableToolchainArchs "${__arch}" )
-   list( APPEND __availableToolchainCompilerVersions "${__version}" )
-   list( APPEND ${__availableToolchainsVar} "${__toolchain}" )
+   string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" )
+   if( __machine MATCHES x86_64 )
+    set( __arch "x86_64" )
+   elseif( __machine MATCHES i686 )
+    set( __arch "x86" )
+   elseif( __machine MATCHES aarch64 )
+    set( __arch "arm64" )
+   elseif( __machine MATCHES arm )
+    set( __arch "arm" )
+   elseif( __machine MATCHES mips64el )
+    set( __arch "mips64" )
+   elseif( __machine MATCHES mipsel )
+    set( __arch "mips" )
+   else()
+    set( __arch "" )
+   endif()
+   #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n")
+   if (__arch)
+    list( APPEND __availableToolchainMachines "${__machine}" )
+    list( APPEND __availableToolchainArchs "${__arch}" )
+    list( APPEND __availableToolchainCompilerVersions "${__version}" )
+    list( APPEND ${__availableToolchainsVar} "${__toolchain}" )
+   endif()
   endif()
   unset( __gcc_toolchain )
  endforeach()
@@ -615,29 +585,30 @@ if( BUILD_WITH_ANDROID_NDK )
  set( __availableToolchainMachines "" )
  set( __availableToolchainArchs "" )
  set( __availableToolchainCompilerVersions "" )
- if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_NAME}/" )
+ if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_TOOLCHAIN_NAME}/" )
   # do not go through all toolchains if we know the name
   set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" )
-  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME} )
-  if( NOT __availableToolchains AND NOT ANDROID_NDK_HOST_SYSTEM_NAME STREQUAL ANDROID_NDK_HOST_SYSTEM_NAME2 )
-   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
+  if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 )
+   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" )
    if( __availableToolchains )
-    set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+    set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} )
    endif()
   endif()
  endif()
  if( NOT __availableToolchains )
-  file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" )
+  file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" )
   if( __availableToolchains )
    list(SORT __availableToolchainsLst) # we need clang to go after gcc
   endif()
   __LIST_FILTER( __availableToolchainsLst "^[.]" )
   __LIST_FILTER( __availableToolchainsLst "llvm" )
-  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME} )
-  if( NOT __availableToolchains AND NOT ANDROID_NDK_HOST_SYSTEM_NAME STREQUAL ANDROID_NDK_HOST_SYSTEM_NAME2 )
-   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+  __LIST_FILTER( __availableToolchainsLst "renderscript" )
+  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
+  if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 )
+   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" )
    if( __availableToolchains )
-    set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+    set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} )
    endif()
   endif()
  endif()
@@ -660,11 +631,11 @@ if( NOT ANDROID_SUPPORTED_ABIS )
 endif()
 
 # choose target ABI
-__INIT_VARIABLE( ANDROID_ABI OBSOLETE_ARM_TARGET OBSOLETE_ARM_TARGETS VALUES ${ANDROID_SUPPORTED_ABIS} )
+__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} )
 # verify that target ABI is supported
 list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx )
 if( __androidAbiIdx EQUAL -1 )
- string( REPLACE ";" "\", \"", PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
+ string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
  message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain.
    Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\"
    " )
@@ -676,28 +647,45 @@ if( ANDROID_ABI STREQUAL "x86" )
  set( X86 true )
  set( ANDROID_NDK_ABI_NAME "x86" )
  set( ANDROID_ARCH_NAME "x86" )
- set( ANDROID_ARCH_FULLNAME "x86" )
  set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" )
  set( CMAKE_SYSTEM_PROCESSOR "i686" )
+elseif( ANDROID_ABI STREQUAL "x86_64" )
+ set( X86 true )
+ set( X86_64 true )
+ set( ANDROID_NDK_ABI_NAME "x86_64" )
+ set( ANDROID_ARCH_NAME "x86_64" )
+ set( CMAKE_SYSTEM_PROCESSOR "x86_64" )
+ set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" )
+elseif( ANDROID_ABI STREQUAL "mips64" )
+ set( MIPS64 true )
+ set( ANDROID_NDK_ABI_NAME "mips64" )
+ set( ANDROID_ARCH_NAME "mips64" )
+ set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" )
+ set( CMAKE_SYSTEM_PROCESSOR "mips64" )
 elseif( ANDROID_ABI STREQUAL "mips" )
  set( MIPS true )
  set( ANDROID_NDK_ABI_NAME "mips" )
  set( ANDROID_ARCH_NAME "mips" )
- set( ANDROID_ARCH_FULLNAME "mipsel" )
  set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" )
  set( CMAKE_SYSTEM_PROCESSOR "mips" )
+elseif( ANDROID_ABI STREQUAL "arm64-v8a" )
+ set( ARM64_V8A true )
+ set( ANDROID_NDK_ABI_NAME "arm64-v8a" )
+ set( ANDROID_ARCH_NAME "arm64" )
+ set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" )
+ set( CMAKE_SYSTEM_PROCESSOR "aarch64" )
+ set( VFPV3 true )
+ set( NEON true )
 elseif( ANDROID_ABI STREQUAL "armeabi" )
  set( ARMEABI true )
  set( ANDROID_NDK_ABI_NAME "armeabi" )
  set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_ARCH_FULLNAME "arm" )
  set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
  set( CMAKE_SYSTEM_PROCESSOR "armv5te" )
 elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" )
  set( ARMEABI_V6 true )
  set( ANDROID_NDK_ABI_NAME "armeabi" )
  set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_ARCH_FULLNAME "arm" )
  set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
  set( CMAKE_SYSTEM_PROCESSOR "armv6" )
  # need always fallback to older platform
@@ -706,14 +694,12 @@ elseif( ANDROID_ABI STREQUAL "armeabi-v7a")
  set( ARMEABI_V7A true )
  set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
  set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_ARCH_FULLNAME "arm" )
  set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
  set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
 elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" )
  set( ARMEABI_V7A true )
  set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
  set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_ARCH_FULLNAME "arm" )
  set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
  set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
  set( VFPV3 true )
@@ -721,7 +707,6 @@ elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" )
  set( ARMEABI_V7A true )
  set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
  set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_ARCH_FULLNAME "arm" )
  set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
  set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
  set( VFPV3 true )
@@ -737,7 +722,7 @@ if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMa
 endif()
 
 if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 )
- __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD OBSOLETE_FORCE_ARM VALUES OFF )
+ __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF )
  set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE )
  mark_as_advanced( ANDROID_FORCE_ARM_BUILD )
 else()
@@ -755,7 +740,7 @@ if( ANDROID_TOOLCHAIN_NAME )
 To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" )
  endif()
  list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch )
- if( NOT __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME )
+ if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME )
   message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." )
  endif()
 else()
@@ -766,8 +751,9 @@ else()
  math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" )
  foreach( __idx RANGE ${__availableToolchainsCount} )
   list( GET __availableToolchainArchs ${__idx} __toolchainArch )
-  if( __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME )
+  if( __toolchainArch STREQUAL ANDROID_ARCH_NAME )
    list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion )
+   string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}")
    if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion )
     set( __toolchainMaxVersion "${__toolchainVersion}" )
     set( __toolchainIdx ${__idx} )
@@ -794,15 +780,16 @@ unset( __availableToolchainCompilerVersions )
 
 # choose native API level
 __INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL )
-string( REGEX MATCH "[0-9]+" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" )
+string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" )
+string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL )
 # adjust API level
 set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} )
 foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
- if( NOT __level GREATER ANDROID_NATIVE_API_LEVEL AND NOT __level LESS __real_api_level )
+ if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level )
   set( __real_api_level ${__level} )
  endif()
 endforeach()
-if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL EQUAL __real_api_level )
+if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level )
  message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'")
  set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} )
 endif()
@@ -814,12 +801,13 @@ if( __levelIdx EQUAL -1 )
 else()
  if( BUILD_WITH_ANDROID_NDK )
   __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" )
-  if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL )
+  if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 )
    message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." )
   endif()
   unset( __realApiLevel )
  endif()
  set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE )
+ set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} )
  if( CMAKE_VERSION VERSION_GREATER "2.8" )
   list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS )
   set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
@@ -831,23 +819,14 @@ unset( __levelIdx )
 # remember target ABI
 set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE )
 if( CMAKE_VERSION VERSION_GREATER "2.8" )
- list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME} )
- set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME}} )
+ list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} )
+ set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} )
 endif()
 
 
 # runtime choice (STL, rtti, exceptions)
 if( NOT ANDROID_STL )
- # honor legacy ANDROID_USE_STLPORT
- if( DEFINED ANDROID_USE_STLPORT )
-  if( ANDROID_USE_STLPORT )
-   set( ANDROID_STL stlport_static )
-  endif()
-  message( WARNING "You are using an obsolete variable ANDROID_USE_STLPORT to select the STL variant. Use -DANDROID_STL=stlport_static instead." )
- endif()
- if( NOT ANDROID_STL )
   set( ANDROID_STL gnustl_static )
- endif()
 endif()
 set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" )
 set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" )
@@ -920,7 +899,11 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN )
  set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" )
 
  if( NOT ANDROID_STL STREQUAL "none" )
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" )
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" )
+  if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" )
+   # old location ( pre r8c )
+   set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" )
+  endif()
   if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" )
    list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" )
   elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" )
@@ -970,12 +953,12 @@ if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" )
  string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}")
 elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" )
  string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}")
- string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-4.6" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
- if( NOT EXISTS "${ANDROID_NDK}/toolchains/llvm-${ANDROID_CLANG_VERSION}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}/bin/clang${TOOL_OS_SUFFIX}" )
+ string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
+ if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" )
   message( FATAL_ERROR "Could not find the Clang compiler driver" )
  endif()
  set( ANDROID_COMPILER_IS_CLANG 1 )
- set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/llvm-${ANDROID_CLANG_VERSION}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
+ set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
 else()
  set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
  unset( ANDROID_COMPILER_IS_CLANG CACHE )
@@ -989,7 +972,7 @@ endif()
 
 # setup paths and STL for NDK
 if( BUILD_WITH_ANDROID_NDK )
- set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
+ set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
  set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" )
 
  if( ANDROID_STL STREQUAL "none" )
@@ -1003,7 +986,7 @@ if( BUILD_WITH_ANDROID_NDK )
   set( ANDROID_EXCEPTIONS       ON )
   set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" )
  elseif( ANDROID_STL MATCHES "gabi" )
-  if( ANDROID_NDK_RELEASE STRLESS "r7" )
+  if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
    message( FATAL_ERROR "gabi++ is not awailable in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.")
   endif()
   set( ANDROID_RTTI             ON )
@@ -1011,12 +994,12 @@ if( BUILD_WITH_ANDROID_NDK )
   set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" )
   set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" )
  elseif( ANDROID_STL MATCHES "stlport" )
-  if( NOT ANDROID_NDK_RELEASE STRLESS "r8d" )
+  if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d
    set( ANDROID_EXCEPTIONS       ON )
   else()
    set( ANDROID_EXCEPTIONS       OFF )
   endif()
-  if( ANDROID_NDK_RELEASE STRLESS "r7" )
+  if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
    set( ANDROID_RTTI            OFF )
   else()
    set( ANDROID_RTTI            ON )
@@ -1037,7 +1020,7 @@ if( BUILD_WITH_ANDROID_NDK )
   else()
    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
   endif()
-  set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" )
+  set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" )
   if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
    set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
   else()
@@ -1048,11 +1031,11 @@ if( BUILD_WITH_ANDROID_NDK )
  endif()
  # find libsupc++.a - rtti & exceptions
  if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" )
-  if( ANDROID_NDK_RELEASE STRGREATER "r8" ) # r8b
-   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" )
-  elseif( NOT ANDROID_NDK_RELEASE STRLESS "r7" AND ANDROID_NDK_RELEASE STRLESS "r8b")
-   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" )
-  else( ANDROID_NDK_RELEASE STRLESS "r7" )
+  set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer
+  if( NOT EXISTS "${__libsupcxx}" )
+   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r7-r8
+  endif()
+  if( NOT EXISTS "${__libsupcxx}" ) # before r7
    if( ARMEABI_V7A )
     if( ANDROID_FORCE_ARM_BUILD )
      set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" )
@@ -1075,15 +1058,7 @@ endif()
 # case of shared STL linkage
 if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl )
  string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" )
- if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" )
-  get_filename_component( __libstlname "${__libstl}" NAME )
-  execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
-  if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
-   message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
-  endif()
-  unset( __fileCopyProcess )
-  unset( __libstlname )
- endif()
+ # TODO: check if .so file exists before the renaming
 endif()
 
 
@@ -1102,7 +1077,7 @@ unset( _ndk_ccache )
 
 # setup the cross-compiler
 if( NOT CMAKE_C_COMPILER )
- if( NDK_CCACHE )
+ if( NDK_CCACHE AND NOT ANDROID_SYSROOT MATCHES "[ ;\"]" )
   set( CMAKE_C_COMPILER   "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" )
   set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" )
   if( ANDROID_COMPILER_IS_CLANG )
@@ -1147,10 +1122,14 @@ endif()
 include( CMakeForceCompiler )
 CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU )
 if( ANDROID_COMPILER_IS_CLANG )
- set( CMAKE_C_COMPILER_ID Clang)
+ set( CMAKE_C_COMPILER_ID Clang )
 endif()
 set( CMAKE_C_PLATFORM_ID Linux )
-set( CMAKE_C_SIZEOF_DATA_PTR 4 )
+if( X86_64 OR MIPS64 OR ARM64_V8A )
+ set( CMAKE_C_SIZEOF_DATA_PTR 8 )
+else()
+ set( CMAKE_C_SIZEOF_DATA_PTR 4 )
+endif()
 set( CMAKE_C_HAS_ISYSROOT 1 )
 set( CMAKE_C_COMPILER_ABI ELF )
 CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU )
@@ -1158,7 +1137,7 @@ if( ANDROID_COMPILER_IS_CLANG )
  set( CMAKE_CXX_COMPILER_ID Clang)
 endif()
 set( CMAKE_CXX_PLATFORM_ID Linux )
-set( CMAKE_CXX_SIZEOF_DATA_PTR 4 )
+set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} )
 set( CMAKE_CXX_HAS_ISYSROOT 1 )
 set( CMAKE_CXX_COMPILER_ABI ELF )
 set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C )
@@ -1170,23 +1149,52 @@ set( CMAKE_ASM_COMPILER_FORCED TRUE )
 set( CMAKE_COMPILER_IS_GNUASM 1)
 set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm )
 
+foreach( lang C CXX ASM )
+ if( ANDROID_COMPILER_IS_CLANG )
+  set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} )
+ else()
+  set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} )
+ endif()
+endforeach()
+
 # flags and definitions
 remove_definitions( -DANDROID )
 add_definitions( -DANDROID )
 
-if(ANDROID_SYSROOT MATCHES "[ ;\"]")
- set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" )
+if( ANDROID_SYSROOT MATCHES "[ ;\"]" )
+ if( CMAKE_HOST_WIN32 )
+  # try to convert path to 8.3 form
+  file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" )
+  execute_process( COMMAND "$ENV{ComSpec}" /c "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "${ANDROID_SYSROOT}"
+                   OUTPUT_VARIABLE __path OUTPUT_STRIP_TRAILING_WHITESPACE
+                   RESULT_VARIABLE __result ERROR_QUIET )
+  if( __result EQUAL 0 )
+   file( TO_CMAKE_PATH "${__path}" ANDROID_SYSROOT )
+   set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" )
+  else()
+   set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" )
+  endif()
+ else()
+  set( ANDROID_CXX_FLAGS "'--sysroot=${ANDROID_SYSROOT}'" )
+ endif()
  if( NOT _CMAKE_IN_TRY_COMPILE )
-  # quotes will break try_compile and compiler identification
-  message(WARNING "Your Android system root has non-alphanumeric symbols. It can break compiler features detection and the whole build.")
+  # quotes can break try_compile and compiler identification
+  message(WARNING "Path to your Android NDK (or toolchain) has non-alphanumeric symbols.\nThe build might be broken.\n")
  endif()
 else()
  set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" )
 endif()
 
 # NDK flags
-if( ARMEABI OR ARMEABI_V7A )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fpic -funwind-tables" )
+if (ARM64_V8A )
+ set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -funwind-tables" )
+ set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" )
+ set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer -fno-strict-aliasing" )
+ if( NOT ANDROID_COMPILER_IS_CLANG )
+  set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" )
+ endif()
+elseif( ARMEABI OR ARMEABI_V7A)
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" )
  if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 )
   set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" )
   set( ANDROID_CXX_FLAGS_DEBUG   "-marm -fno-omit-frame-pointer -fno-strict-aliasing" )
@@ -1201,17 +1209,15 @@ if( ARMEABI OR ARMEABI_V7A )
    set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
   endif()
  endif()
-elseif( X86 )
+elseif( X86 OR X86_64 )
  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" )
  if( NOT ANDROID_COMPILER_IS_CLANG )
   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
- else()
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fPIC" )
  endif()
  set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" )
  set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer -fno-strict-aliasing" )
-elseif( MIPS )
- set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0" )
+elseif( MIPS OR MIPS64 )
+ set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" )
  set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" )
  set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer" )
  if( NOT ANDROID_COMPILER_IS_CLANG )
@@ -1249,22 +1255,18 @@ elseif( ARMEABI )
  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" )
 endif()
 
+if( ANDROID_STL MATCHES "gnustl" AND (EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}") )
+ set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+ set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+ set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
+else()
+ set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+ set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+ set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
+endif()
+
 # STL
 if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
- if( ANDROID_STL MATCHES "gnustl" )
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
- else()
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
- endif()
- if ( X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" )
-  # workaround "undefined reference to `__dso_handle'" problem
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
- endif()
  if( EXISTS "${__libstl}" )
   set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" )
   set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" )
@@ -1283,21 +1285,24 @@ if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
   set( CMAKE_C_LINK_EXECUTABLE       "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" )
  endif()
  if( ANDROID_STL MATCHES "gnustl" )
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} -lm" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} -lm" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} -lm" )
+  if( NOT EXISTS "${ANDROID_LIBM_PATH}" )
+   set( ANDROID_LIBM_PATH -lm )
+  endif()
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} ${ANDROID_LIBM_PATH}" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} ${ANDROID_LIBM_PATH}" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIBM_PATH}" )
  endif()
 endif()
 
 # variables controlling optional build flags
-if (ANDROID_NDK_RELEASE STRLESS "r7")
+if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
  # libGLESv2.so in NDK's prior to r7 refers to missing external symbols.
  # So this flag option is required for all projects using OpenGL from native.
  __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES ON )
 else()
  __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES OFF )
 endif()
-__INIT_VARIABLE( ANDROID_NO_UNDEFINED OBSOLETE_NO_UNDEFINED VALUES ON )
+__INIT_VARIABLE( ANDROID_NO_UNDEFINED                       VALUES ON )
 __INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING             VALUES ON )
 __INIT_VARIABLE( ANDROID_GOLD_LINKER                        VALUES ON )
 __INIT_VARIABLE( ANDROID_NOEXECSTACK                        VALUES ON )
@@ -1305,8 +1310,8 @@ __INIT_VARIABLE( ANDROID_RELRO                              VALUES ON )
 
 set( ANDROID_NO_UNDEFINED           ${ANDROID_NO_UNDEFINED}           CACHE BOOL "Show all undefined symbols as linker errors" )
 set( ANDROID_SO_UNDEFINED           ${ANDROID_SO_UNDEFINED}           CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
-set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
-set( ANDROID_GOLD_LINKER            ${ANDROID_GOLD_LINKER}            CACHE BOOL "Enables gold linker (only avaialble for NDK r8b for ARM and x86 architectures on linux-86 and darwin-x86 hosts)" )
+set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" )
+set( ANDROID_GOLD_LINKER            ${ANDROID_GOLD_LINKER}            CACHE BOOL "Enables gold linker" )
 set( ANDROID_NOEXECSTACK            ${ANDROID_NOEXECSTACK}            CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
 set( ANDROID_RELRO                  ${ANDROID_RELRO}                  CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" )
 mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO )
@@ -1321,7 +1326,14 @@ if( ARMEABI_V7A )
 endif()
 
 if( ANDROID_NO_UNDEFINED )
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" )
+ if( MIPS )
+  # there is some sysroot-related problem in mips linker...
+  if( NOT ANDROID_SYSROOT MATCHES "[ ;\"]" )
+   set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib" )
+  endif()
+ else()
+  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" )
+ endif()
 endif()
 
 if( ANDROID_SO_UNDEFINED )
@@ -1334,9 +1346,9 @@ if( ANDROID_FUNCTION_LEVEL_LINKING )
 endif()
 
 if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" )
- if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE STRGREATER "r8b") AND (ARMEABI OR ARMEABI_V7A OR X86) )
+ if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) )
   set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" )
- elseif( ANDROID_NDK_RELEASE STRGREATER "r8b")
+ elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b
   set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" )
  elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE )
   message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342
@@ -1360,13 +1372,7 @@ if( ANDROID_RELRO )
 endif()
 
 if( ANDROID_COMPILER_IS_CLANG )
- set( ANDROID_CXX_FLAGS "-Qunused-arguments ${ANDROID_CXX_FLAGS}" )
- if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD )
-  set( ANDROID_CXX_FLAGS_RELEASE "-target thumbv7-none-linux-androideabi ${ANDROID_CXX_FLAGS_RELEASE}" )
-  set( ANDROID_CXX_FLAGS_DEBUG   "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS_DEBUG}" )
- else()
-  set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS}" )
- endif()
+ set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" )
  if( BUILD_WITH_ANDROID_NDK )
   set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" )
  endif()
@@ -1401,9 +1407,19 @@ set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FL
 set( CMAKE_EXE_LINKER_FLAGS    "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" )
 
 if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" )
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" )
- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" )
- set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" )
+ set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" )
+ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" )
+ set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" )
+endif()
+
+# pie/pic
+if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) )
+ set( CMAKE_POSITION_INDEPENDENT_CODE TRUE )
+ set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie")
+else()
+ set( CMAKE_POSITION_INDEPENDENT_CODE FALSE )
+ set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" )
+ set( CMAKE_C_FLAGS   "-fpic ${CMAKE_C_FLAGS}" )
 endif()
 
 # configure rtti
@@ -1428,21 +1444,75 @@ endif()
 
 # global includes and link directories
 include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
-link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
+get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning
+link_directories( "${__android_install_path}" )
+
+# detect if need link crtbegin_so.o explicitly
+if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK )
+ set( __cmd "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" )
+ string( REPLACE "<CMAKE_CXX_COMPILER>" "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" __cmd "${__cmd}" )
+ string( REPLACE "<CMAKE_C_COMPILER>"   "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"   __cmd "${__cmd}" )
+ string( REPLACE "<CMAKE_SHARED_LIBRARY_CXX_FLAGS>" "${CMAKE_CXX_FLAGS}" __cmd "${__cmd}" )
+ string( REPLACE "<LANGUAGE_COMPILE_FLAGS>" "" __cmd "${__cmd}" )
+ string( REPLACE "<LINK_FLAGS>" "${CMAKE_SHARED_LINKER_FLAGS}" __cmd "${__cmd}" )
+ string( REPLACE "<CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>" "-shared" __cmd "${__cmd}" )
+ string( REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG>" "" __cmd "${__cmd}" )
+ string( REPLACE "<TARGET_SONAME>" "" __cmd "${__cmd}" )
+ string( REPLACE "<TARGET>" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain_crtlink_test.so" __cmd "${__cmd}" )
+ string( REPLACE "<OBJECTS>" "\"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" __cmd "${__cmd}" )
+ string( REPLACE "<LINK_LIBRARIES>" "" __cmd "${__cmd}" )
+ separate_arguments( __cmd )
+ foreach( __var ANDROID_NDK ANDROID_NDK_TOOLCHAINS_PATH ANDROID_STANDALONE_TOOLCHAIN )
+  if( ${__var} )
+   set( __tmp "${${__var}}" )
+   separate_arguments( __tmp )
+   string( REPLACE "${__tmp}" "${${__var}}" __cmd "${__cmd}")
+  endif()
+ endforeach()
+ string( REPLACE "'" "" __cmd "${__cmd}" )
+ string( REPLACE "\"" "" __cmd "${__cmd}" )
+ execute_process( COMMAND ${__cmd} RESULT_VARIABLE __cmd_result OUTPUT_QUIET ERROR_QUIET )
+ if( __cmd_result EQUAL 0 )
+  set( ANDROID_EXPLICIT_CRT_LINK ON )
+ else()
+  set( ANDROID_EXPLICIT_CRT_LINK OFF )
+ endif()
+endif()
+
+if( ANDROID_EXPLICIT_CRT_LINK )
+ set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
+ set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
+endif()
 
 # setup output directories
-set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" )
 set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" )
 
-if(NOT _CMAKE_IN_TRY_COMPILE)
- if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
-  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
- else()
-  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
- endif()
- set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" )
+if( NOT DEFINED LIBRARY_OUTPUT_PATH_ROOT
+      OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml"
+      OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") )
+  set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" )
+  if( NOT _CMAKE_IN_TRY_COMPILE )
+    if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
+      set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
+    else()
+      set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
+    endif()
+    set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" )
+  endif()
 endif()
 
+# copy shaed stl library to build directory
+if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH )
+  get_filename_component( __libstlname "${__libstl}" NAME )
+  execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
+  if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
+    message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
+  endif()
+  unset( __fileCopyProcess )
+  unset( __libstlname )
+endif()
+
+
 # set these global flags for cmake client scripts to change behavior
 set( ANDROID True )
 set( BUILD_ANDROID True )
@@ -1500,27 +1570,13 @@ macro( find_host_program )
 endmacro()
 
 
-macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR )
- if( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI" )
-  set( ${VAR} "armeabi" )
- elseif( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI_V7A" )
-  set( ${VAR} "armeabi-v7a" )
- elseif( "${TOOLCHAIN_FLAG}" STREQUAL "X86" )
-  set( ${VAR} "x86" )
- elseif( "${TOOLCHAIN_FLAG}" STREQUAL "MIPS" )
-  set( ${VAR} "mips" )
- else()
-  set( ${VAR} "unknown" )
- endif()
-endmacro()
-
-
 # export toolchain settings for the try_compile() command
-if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" )
+if( NOT _CMAKE_IN_TRY_COMPILE )
  set( __toolchain_config "")
- foreach( __var NDK_CCACHE  LIBRARY_OUTPUT_PATH_ROOT  ANDROID_FORBID_SYGWIN  ANDROID_SET_OBSOLETE_VARIABLES
+ foreach( __var NDK_CCACHE  LIBRARY_OUTPUT_PATH_ROOT  ANDROID_FORBID_SYGWIN
                 ANDROID_NDK_HOST_X64
                 ANDROID_NDK
+                ANDROID_NDK_LAYOUT
                 ANDROID_STANDALONE_TOOLCHAIN
                 ANDROID_TOOLCHAIN_NAME
                 ANDROID_ABI
@@ -1534,9 +1590,12 @@ if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" )
                 ANDROID_GOLD_LINKER
                 ANDROID_NOEXECSTACK
                 ANDROID_RELRO
+                ANDROID_LIBM_PATH
+                ANDROID_EXPLICIT_CRT_LINK
+                ANDROID_APP_PIE
                 )
   if( DEFINED ${__var} )
-   if( "${__var}" MATCHES " ")
+   if( ${__var} MATCHES " ")
     set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" )
    else()
     set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" )
@@ -1548,19 +1607,22 @@ if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" )
 endif()
 
 
-# set some obsolete variables for backward compatibility
-set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" )
-mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES )
-if( ANDROID_SET_OBSOLETE_VARIABLES )
- set( ANDROID_API_LEVEL ${ANDROID_NATIVE_API_LEVEL} )
- set( ARM_TARGET "${ANDROID_ABI}" )
- set( ARMEABI_NDK_NAME "${ANDROID_NDK_ABI_NAME}" )
+# force cmake to produce / instead of \ in build commands for Ninja generator
+if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 )
+ # it is a bad hack after all
+ # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW
+ set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW
+ set( CMAKE_CROSSCOMPILING TRUE )    # stop recursion
+ enable_language( C )
+ enable_language( CXX )
+ # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it
+ unset( MINGW )
 endif()
 
 
 # Variables controlling behavior or set by cmake toolchain:
-#   ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips"
-#   ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14 (depends on NDK version)
+#   ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64"
+#   ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version)
 #   ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none
 #   ANDROID_FORBID_SYGWIN : ON/OFF
 #   ANDROID_NO_UNDEFINED : ON/OFF
@@ -1571,46 +1633,42 @@ endif()
 #   ANDROID_RELRO : ON/OFF
 #   ANDROID_FORCE_ARM_BUILD : ON/OFF
 #   ANDROID_STL_FORCE_FEATURES : ON/OFF
-#   ANDROID_SET_OBSOLETE_VARIABLES : ON/OFF
+#   ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product/<product_name>/obj/lib/libm.so) to workaround unresolved `sincos`
 # Can be set only at the first run:
-#   ANDROID_NDK
-#   ANDROID_STANDALONE_TOOLCHAIN
+#   ANDROID_NDK : path to your NDK install
+#   NDK_CCACHE : path to your ccache executable
 #   ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain
 #   ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems)
+#   ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID)
 #   LIBRARY_OUTPUT_PATH_ROOT : <any valid path>
-#   NDK_CCACHE : <path to your ccache executable>
-# Obsolete:
-#   ANDROID_API_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL
-#   ARM_TARGET : superseded by ANDROID_ABI
-#   ARM_TARGETS : superseded by ANDROID_ABI (can be set only)
-#   ANDROID_NDK_TOOLCHAIN_ROOT : superseded by ANDROID_STANDALONE_TOOLCHAIN (can be set only)
-#   ANDROID_USE_STLPORT : superseded by ANDROID_STL=stlport_static
-#   ANDROID_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL (completely removed)
+#   ANDROID_STANDALONE_TOOLCHAIN
 #
 # Primary read-only variables:
 #   ANDROID : always TRUE
 #   ARMEABI : TRUE for arm v6 and older devices
 #   ARMEABI_V6 : TRUE for arm v6
 #   ARMEABI_V7A : TRUE for arm v7a
+#   ARM64_V8A : TRUE for arm64-v8a
 #   NEON : TRUE if NEON unit is enabled
 #   VFPV3 : TRUE if VFP version 3 is enabled
 #   X86 : TRUE if configured for x86
+#   X86_64 : TRUE if configured for x86_64
 #   MIPS : TRUE if configured for mips
-#   BUILD_ANDROID : always TRUE
+#   MIPS64 : TRUE if configured for mips64
 #   BUILD_WITH_ANDROID_NDK : TRUE if NDK is used
 #   BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used
 #   ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform
-#   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI
-#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e; set only for NDK
-#   ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI
+#   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI
+#   ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK
+#   ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor)
+#   ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI
 #   ANDROID_SYSROOT : path to the compiler sysroot
 #   TOOL_OS_SUFFIX : "" or ".exe" depending on host platform
 #   ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used
-# Obsolete:
-#   ARMEABI_NDK_NAME : superseded by ANDROID_NDK_ABI_NAME
 #
 # Secondary (less stable) read-only variables:
-#   ANDROID_COMPILER_VERSION : GCC version used
+#   ANDROID_COMPILER_VERSION : GCC version used (not Clang version)
+#   ANDROID_CLANG_VERSION : version of clang compiler if clang is used
 #   ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform
 #   ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI
 #   ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux"
@@ -1621,12 +1679,10 @@ endif()
 #   ANDROID_RTTI : if rtti is enabled by the runtime
 #   ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime
 #   ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used
-#   ANDROID_CLANG_VERSION : version of clang compiler if clang is used
 #
 # Defaults:
 #   ANDROID_DEFAULT_NDK_API_LEVEL
 #   ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH}
 #   ANDROID_NDK_SEARCH_PATHS
-#   ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH
 #   ANDROID_SUPPORTED_ABIS_${ARCH}
 #   ANDROID_SUPPORTED_NDK_VERSIONS
diff --git a/Source/Android/app/.gitignore b/Source/Android/app/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/Source/Android/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
new file mode 100644
index 0000000000..8f7134c290
--- /dev/null
+++ b/Source/Android/app/build.gradle
@@ -0,0 +1,225 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "22.0.1"
+
+    lintOptions {
+        // This is important as it will run lint but not abort on error
+        // Lint has some overly obnoxious "errors" that should really be warnings
+        abortOnError false
+    }
+
+    defaultConfig {
+        applicationId "org.dolphinemu.dolphinemu"
+        minSdkVersion 21
+        targetSdkVersion 21
+
+        // TODO This should be set to the Buildbot build number for release builds, and be "1" for debug builds.
+        versionCode 13
+
+        // TODO This should be set to the string currently provided by NativeLibrary.GetVersionString().
+        versionName "0.13"
+    }
+
+    signingConfigs {
+        release {
+            if (project.hasProperty('keystore')) {
+                storeFile file(project.property('keystore'))
+                storePassword project.property('storepass')
+                keyAlias project.property('keyalias')
+                keyPassword project.property('keypass')
+            }
+        }
+    }
+
+    // Define build types, which are orthogonal to product flavors.
+    buildTypes {
+        // Signed by release key, allowing for upload to Play Store.
+        release {
+            signingConfig signingConfigs.release
+        }
+
+        // Signed by debug key disallowing distribution on Play Store.
+        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix '-debug'
+            jniDebuggable true
+
+            tasks.withType(JavaCompile) {
+                compileTask -> compileTask.dependsOn(compileNative)
+            }
+        }
+    }
+
+    // Define product flavors, which can be split into categories. Common examples
+    // of product flavors are paid vs. free, ARM vs. x86, etc.
+    productFlavors {
+        arm_64 {
+            flavorDimension "abi"
+            ndk {
+                abiFilter "arm64-v8a"
+            }
+        }
+
+        x86_64 {
+            flavorDimension "abi"
+            ndk {
+                abiFilter "x86_64"
+            }
+        }
+    }
+}
+
+dependencies {
+
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:support-v13:22.0.0'
+    compile 'com.android.support:cardview-v7:21.0.3'
+    compile 'com.android.support:recyclerview-v7:21.0.3'
+
+    // For showing the banner as a circle a-la Material Design Guidelines
+    compile 'de.hdodenhof:circleimageview:1.2.2'
+
+    // For loading huge screenshots from the disk.
+    compile 'com.squareup.picasso:picasso:2.5.2'
+}
+
+task setupCMake(type: Exec) {
+    // Check if a build properties file exists.
+    def propsFile = rootProject.file("build.properties")
+
+    // If it does, call CMake.
+    if (propsFile.canRead()) {
+        // Read the properties file's contents.
+        def buildProperties = new Properties()
+        buildProperties.load(new FileInputStream(propsFile))
+
+        String abi = getAbi()
+
+        mkdir('build/' + abi)
+        workingDir 'build/' + abi
+
+        executable 'cmake'
+
+        args "-DANDROID=true",
+                "-DANDROID_NATIVE_API_LEVEL=android-18",
+                "-DCMAKE_TOOLCHAIN_FILE=../../../android.toolchain.cmake",
+                "../../../../..",
+                "-DGIT_EXECUTABLE=" + getGitPath(),
+                "-DANDROID_NDK=" + getNdkPath(),
+                "-DANDROID_TOOLCHAIN_NAME=" + getToolchainName(),
+                "-DANDROID_ABI=" + abi
+    } else {
+        executable 'echo'
+        args 'No build.properties found; skipping CMake.'
+    }
+}
+
+task compileNative(type: Exec, dependsOn: 'setupCMake') {
+    // Check if a build properties file exists.
+    def propsFile = rootProject.file("build.properties")
+
+    // If it does, call make.
+    if (propsFile.canRead()) {
+        // Read the properties file's contents.
+        def buildProperties = new Properties()
+        buildProperties.load(new FileInputStream(propsFile))
+
+        String abi = getAbi()
+
+        workingDir 'build/' + abi
+
+        executable 'make'
+
+        args buildProperties.makeArgs
+    } else {
+        executable 'echo'
+        args 'No build.properties found; skipping native build.'
+    }
+}
+
+String getGitPath() {
+    try {
+        def stdout = new ByteArrayOutputStream()
+
+        exec {
+            commandLine 'which', 'git'
+            standardOutput = stdout
+        }
+
+        def gitPath = stdout.toString().trim()
+        project.logger.quiet("Gradle: Found git executuable:" + gitPath)
+
+        return gitPath
+    } catch (ignored) {
+        // Shouldn't happen. How did the user get this file without git?
+        project.logger.error("Gradle error: Couldn't find git executable.")
+        return null;
+    }
+}
+
+String getNdkPath() {
+    try {
+        def stdout = new ByteArrayOutputStream()
+
+        exec {
+            // ndk-build.cmd is a file unique to the root directory of android-ndk-r10e.
+            commandLine 'locate', 'ndk-build.cmd'
+            standardOutput = stdout
+        }
+
+        def ndkCmdPath = stdout.toString()
+        def ndkPath = ndkCmdPath.substring(0, ndkCmdPath.lastIndexOf('/'))
+
+        project.logger.quiet("Gradle: Found Android NDK:" + ndkPath)
+
+        return ndkPath
+    } catch (ignored) {
+        project.logger.error("Gradle error: Couldn't find NDK.")
+        return null;
+    }
+}
+
+String getAbi() {
+    String taskName = getGradle().startParameter.taskNames[0]
+    String abi;
+
+    if (taskName == null) {
+        return ""
+    }
+
+    project.logger.quiet("Gradle: Build = " + taskName)
+
+    if (taskName.contains("Arm_64")) {
+        abi = "arm64-v8a"
+    } else if (taskName.contains("Arm")) {
+        abi = "armeabi-v7a"
+    } else if (taskName.contains("X86_64")) {
+        abi = "x86_64"
+    }
+
+    project.logger.quiet("Gradle: ABI name: " + abi)
+    return abi;
+}
+
+String getToolchainName() {
+    String taskName = getGradle().startParameter.taskNames[0]
+    String toolchain;
+
+    if (taskName == null) {
+        return ""
+    }
+
+    if (taskName.contains("Arm_64")) {
+        toolchain = "aarch64-linux-android-4.9"
+    } else if (taskName.contains("Arm")) {
+        toolchain = "arm-linux-androideabi-4.9"
+    } else if (taskName.contains("X86_64")) {
+        toolchain = "x86_64-4.9"
+    }
+
+    project.logger.quiet("Gradle: ABI name: " + toolchain)
+    return toolchain;
+}
\ No newline at end of file
diff --git a/Source/Android/app/proguard-rules.pro b/Source/Android/app/proguard-rules.pro
new file mode 100644
index 0000000000..52592ad511
--- /dev/null
+++ b/Source/Android/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/sigma/apps/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
new file mode 100644
index 0000000000..cf1848ddd5
--- /dev/null
+++ b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/Source/Android/app/src/arm/res/values/arrays.xml b/Source/Android/app/src/arm/res/values/arrays.xml
new file mode 100644
index 0000000000..a98f723b24
--- /dev/null
+++ b/Source/Android/app/src/arm/res/values/arrays.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- All lists for ListPreference keys/values are placed here -->
+<resources>
+
+    <!-- New UI CPU Core selection - ARM32 -->
+    <string-array name="string_emu_cores" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit_arm_recompiler</item>
+    </string-array>
+    <string-array name="int_emu_cores" translatable="false">
+        <item>0</item>
+        <item>3</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/arm/res/values/strings.xml b/Source/Android/app/src/arm/res/values/strings.xml
new file mode 100644
index 0000000000..ec82295355
--- /dev/null
+++ b/Source/Android/app/src/arm/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of the app -->
+    <string name="title_new_ui">Dolphin ARM32</string>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/arm_64/res/values/arrays.xml b/Source/Android/app/src/arm_64/res/values/arrays.xml
new file mode 100644
index 0000000000..12ed1695da
--- /dev/null
+++ b/Source/Android/app/src/arm_64/res/values/arrays.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- All lists for ListPreference keys/values are placed here -->
+<resources>
+
+    <!-- New UI CPU Core selection - ARM64 -->
+    <string-array name="string_emu_cores" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit_arm64_recompiler</item>
+    </string-array>
+    <string-array name="int_emu_cores" translatable="false">
+        <item>0</item>
+        <item>4</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/arm_64/res/values/strings.xml b/Source/Android/app/src/arm_64/res/values/strings.xml
new file mode 100644
index 0000000000..c98efb06b6
--- /dev/null
+++ b/Source/Android/app/src/arm_64/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of the app -->
+    <string name="title_new_ui">Dolphin ARM64</string>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3c87d9fd41
--- /dev/null
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,70 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.dolphinemu.dolphinemu">
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.gamepad"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false"/>
+
+    <uses-feature android:glEsVersion="0x00030000" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:allowBackup="true"
+        android:supportsRtl="true"
+        android:isGame="true"
+        android:banner="@drawable/banner_tv">
+
+        <activity
+            android:name=".activities.GameGridActivity"
+            android:theme="@style/DolphinGamecube">
+
+            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".activities.AddDirectoryActivity"
+            android:theme="@style/DolphinGamecube"
+            android:label="@string/add_directory_title"/>
+
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:theme="@style/DolphinSettingsGamecube"
+            android:label="@string/grid_menu_settings"/>
+
+        <activity
+            android:name=".activities.EmulationActivity"
+            android:theme="@style/DolphinEmulationGamecube"/>
+
+
+        <service android:name=".services.AssetCopyService"/>
+
+        <service android:name=".services.SettingsSaveService"/>
+
+        <provider
+            android:name=".model.GameProvider"
+            android:authorities="${applicationId}.provider"
+            android:enabled="true"
+            android:exported="false">
+        </provider>
+
+    </application>
+
+</manifest>
+
diff --git a/Source/Android/app/src/main/assets/GCPadNew.ini b/Source/Android/app/src/main/assets/GCPadNew.ini
new file mode 100644
index 0000000000..cdd12f148e
--- /dev/null
+++ b/Source/Android/app/src/main/assets/GCPadNew.ini
@@ -0,0 +1,104 @@
+[GCPad1]
+Device = Android/0/Touchscreen
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
+Buttons/Start = `Button 2`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+D-Pad/Up = `Button 6`
+D-Pad/Down = `Button 7`
+D-Pad/Left = `Button 8`
+D-Pad/Right = `Button 9`
+[GCPad2]
+Device = Android/1/Touchscreen
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
+Buttons/Start = `Button 2`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+D-Pad/Up = `Button 6`
+D-Pad/Down = `Button 7`
+D-Pad/Left = `Button 8`
+D-Pad/Right = `Button 9`
+[GCPad3]
+Device = Android/2/Touchscreen
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
+Buttons/Start = `Button 2`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+D-Pad/Up = `Button 6`
+D-Pad/Down = `Button 7`
+D-Pad/Left = `Button 8`
+D-Pad/Right = `Button 9`
+[GCPad4]
+Device = Android/3/Touchscreen
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
+Buttons/Start = `Button 2`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+D-Pad/Up = `Button 6`
+D-Pad/Down = `Button 7`
+D-Pad/Left = `Button 8`
+D-Pad/Right = `Button 9`
\ No newline at end of file
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
new file mode 100644
index 0000000000..d8b1b6c112
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu;
+
+import android.util.Log;
+import android.view.Surface;
+import android.widget.Toast;
+
+import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+
+/**
+ * Class which contains methods that interact
+ * with the native side of the Dolphin code.
+ */
+public final class NativeLibrary
+{
+	private static EmulationActivity mEmulationActivity;
+
+	/**
+	 * Button type for use in onTouchEvent
+	 */
+	public static final class ButtonType
+	{
+		public static final int BUTTON_A         = 0;
+		public static final int BUTTON_B         = 1;
+		public static final int BUTTON_START     = 2;
+		public static final int BUTTON_X         = 3;
+		public static final int BUTTON_Y         = 4;
+		public static final int BUTTON_Z         = 5;
+		public static final int BUTTON_UP        = 6;
+		public static final int BUTTON_DOWN      = 7;
+		public static final int BUTTON_LEFT      = 8;
+		public static final int BUTTON_RIGHT     = 9;
+		public static final int STICK_MAIN       = 10;
+		public static final int STICK_MAIN_UP    = 11;
+		public static final int STICK_MAIN_DOWN  = 12;
+		public static final int STICK_MAIN_LEFT  = 13;
+		public static final int STICK_MAIN_RIGHT = 14;
+		public static final int STICK_C          = 15;
+		public static final int STICK_C_UP       = 16;
+		public static final int STICK_C_DOWN     = 17;
+		public static final int STICK_C_LEFT     = 18;
+		public static final int STICK_C_RIGHT    = 19;
+		public static final int TRIGGER_L        = 20;
+		public static final int TRIGGER_R        = 21;
+	}
+
+	/**
+	 * Button states
+	 */
+	public static final class ButtonState
+	{
+		public static final int RELEASED = 0;
+		public static final int PRESSED = 1;
+	}
+
+	private NativeLibrary()
+	{
+		// Disallows instantiation.
+	}
+
+	/**
+	 * Default touchscreen device
+	 */
+	public static final String TouchScreenDevice = "Touchscreen";
+
+	/**
+	 * Handles button press events for a gamepad.
+	 * 
+	 * @param Device The input descriptor of the gamepad.
+	 * @param Button Key code identifying which button was pressed.
+	 * @param Action Mask identifying which action is happing (button pressed down, or button released).
+	 *
+	 * @return If we handled the button press.
+	 */
+	public static native boolean onGamePadEvent(String Device, int Button, int Action);
+
+	/**
+	 * Handles gamepad movement events.
+	 * 
+	 * @param Device The device ID of the gamepad.
+	 * @param Axis   The axis ID
+	 * @param Value  The value of the axis represented by the given ID.
+	 */
+	public static native void onGamePadMoveEvent(String Device, int Axis, float Value);
+
+	/**
+	 * Gets a value from a key in the given ini-based config file.
+	 * 
+	 * @param configFile The ini-based config file to get the value from.
+	 * @param Section    The section key that the actual key is in.
+	 * @param Key        The key to get the value from.
+	 * @param Default    The value to return in the event the given key doesn't exist.
+	 * 
+	 * @return the value stored at the key, or a default value if it doesn't exist.
+	 */
+	public static native String GetConfig(String configFile, String Section, String Key, String Default);
+
+	/**
+	 * Sets a value to a key in the given ini config file.
+	 * 
+	 * @param configFile The ini-based config file to add the value to.
+	 * @param Section    The section key for the ini key
+	 * @param Key        The actual ini key to set.
+	 * @param Value      The string to set the ini key to.
+	 */
+	public static native void SetConfig(String configFile, String Section, String Key, String Value);
+
+	/**
+	 * Sets the filename to be run during emulation.
+	 * 
+	 * @param filename The filename to be run during emulation.
+	 */
+	public static native void SetFilename(String filename);
+
+	/**
+	 * Gets the embedded banner within the given ISO/ROM.
+	 * 
+	 * @param filename the file path to the ISO/ROM.
+	 * 
+	 * @return an integer array containing the color data for the banner.
+	 */
+	public static native int[] GetBanner(String filename);
+
+	/**
+	 * Gets the embedded title of the given ISO/ROM.
+	 * 
+	 * @param filename The file path to the ISO/ROM.
+	 * 
+	 * @return the embedded title of the ISO/ROM.
+	 */
+	public static native String GetTitle(String filename);
+
+	public static native String GetDescription(String filename);
+	public static native String GetGameId(String filename);
+
+	public static native int GetCountry(String filename);
+
+	public static native String GetCompany(String filename);
+	public static native long GetFilesize(String filename);
+
+	public static native int GetPlatform(String filename);
+
+	/**
+	 * Gets the Dolphin version string.
+	 * 
+	 * @return the Dolphin version string.
+	 */
+	public static native String GetVersionString();
+
+	/**
+	 * Returns if the phone supports NEON or not
+	 *
+	 * @return true if it supports NEON, false otherwise.
+	 */
+	public static native boolean SupportsNEON();
+
+	/**
+	 * Saves a screen capture of the game
+	 *
+	 */
+	public static native void SaveScreenShot();
+
+	/**
+	 * Saves a game state to the slot number.
+	 *
+	 * @param slot  The slot location to save state to.
+	 */
+	public static native void SaveState(int slot);
+
+	/**
+	 * Loads a game state from the slot number.
+	 *
+	 * @param slot  The slot location to load state from.
+	 */
+	public static native void LoadState(int slot);
+
+	/**
+	 * Creates the initial folder structure in /sdcard/dolphin-emu/
+	 */
+	public static native void CreateUserFolders();
+
+	/**
+	 * Sets the current working user directory
+	 * If not set, it auto-detects a location
+	 */
+	public static native void SetUserDirectory(String directory);
+
+	/**
+	 * Returns the current working user directory
+	 */
+	public static native String GetUserDirectory();
+
+	/**
+	 * Begins emulation.
+	 * 
+	 * @param surf The surface to render to.
+	 */
+	public static native void Run(Surface surf);
+
+	/** Unpauses emulation from a paused state. */
+	public static native void UnPauseEmulation();
+
+	/** Pauses emulation. */
+	public static native void PauseEmulation();
+
+	/** Stops emulation. */
+	public static native void StopEmulation();
+
+	/**
+	 * Enables or disables CPU block profiling
+	 * @param enable
+	 */
+	public static native void SetProfiling(boolean enable);
+
+	/**
+	 * Writes out the block profile results
+	 */
+	public static native void WriteProfileResults();
+
+	/**
+	 * @return If we have an alert
+	 */
+	public static native boolean HasAlertMsg();
+
+	/**
+	 * @return The alert string
+	 */
+	public static native String GetAlertMsg();
+
+	/**
+	 * Clears event in the JNI so we can continue onward
+	 */
+	public static native void ClearAlertMsg();
+
+	/** Native EGL functions not exposed by Java bindings **/
+	public static native void eglBindAPI(int api);
+
+	/**
+	 * The methods C++ uses to find references to Java classes and methods
+	 * are really expensive. Rather than calling them every time we want to
+	 * run them, do it once when we load the native library.
+	 */
+	private static native void CacheClassesAndMethods();
+
+	static
+	{
+		try
+		{
+			System.loadLibrary("main");
+		}
+		catch (UnsatisfiedLinkError ex)
+		{
+			Log.e("NativeLibrary", ex.toString());
+		}
+
+		CacheClassesAndMethods();
+	}
+
+	public static void displayAlertMsg(final String alert)
+	{
+		Log.e("DolphinEmu", "Alert: " + alert);
+		mEmulationActivity.runOnUiThread(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Toast.makeText(mEmulationActivity, "Panic Alert: " + alert, Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+
+	public static void setEmulationActivity(EmulationActivity emulationActivity)
+	{
+		Log.v("DolphinEmu", "Registering EmulationActivity.");
+		mEmulationActivity = emulationActivity;
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
new file mode 100644
index 0000000000..1cbc30e7e5
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
@@ -0,0 +1,136 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.app.Activity;
+import android.content.AsyncQueryHandler;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toolbar;
+
+import org.dolphinemu.dolphinemu.BuildConfig;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.adapters.FileAdapter;
+import org.dolphinemu.dolphinemu.model.GameDatabase;
+import org.dolphinemu.dolphinemu.model.GameProvider;
+
+/**
+ * An Activity that shows a list of files and folders, allowing the user to tell the app which folder(s)
+ * contains the user's games.
+ */
+public class AddDirectoryActivity extends Activity implements FileAdapter.FileClickListener
+{
+	public static final String KEY_CURRENT_PATH = BuildConfig.APPLICATION_ID + ".path";
+
+	private FileAdapter mAdapter;
+	private Toolbar mToolbar;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.activity_add_directory);
+
+		mToolbar = (Toolbar) findViewById(R.id.toolbar_folder_list);
+		setActionBar(mToolbar);
+
+		RecyclerView recyclerView = (RecyclerView) findViewById(R.id.list_files);
+
+		// Specifying the LayoutManager determines how the RecyclerView arranges views.
+		RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+		recyclerView.setLayoutManager(layoutManager);
+
+		String path;
+		// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
+		if (savedInstanceState == null)
+		{
+			path = Environment.getExternalStorageDirectory().getPath();
+		}
+		else
+		{
+			// Get the path we were looking at before we rotated.
+			path = savedInstanceState.getString(KEY_CURRENT_PATH);
+		}
+
+		mAdapter = new FileAdapter(path, this);
+		recyclerView.setAdapter(mAdapter);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.menu_add_directory, menu);
+
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId())
+		{
+			case R.id.menu_up_one_level:
+				mAdapter.upOneLevel();
+				break;
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
+
+
+	@Override
+	protected void onSaveInstanceState(Bundle outState)
+	{
+		super.onSaveInstanceState(outState);
+
+		// Save the path we're looking at so when rotation is done, we start from same folder.
+		outState.putString(KEY_CURRENT_PATH, mAdapter.getPath());
+	}
+
+	/**
+	 * Add a directory to the library, and if successful, end the activity.
+	 *
+	 * @param path The target directory's path.
+	 */
+	@Override
+	public void addDirectory()
+	{
+		// Set up a callback for when the addition is complete
+		// TODO This has a nasty warning on it; find a cleaner way to do this Insert asynchronously
+		AsyncQueryHandler handler = new AsyncQueryHandler(getContentResolver())
+		{
+			@Override
+			protected void onInsertComplete(int token, Object cookie, Uri uri)
+			{
+				Intent resultData = new Intent();
+
+				resultData.putExtra(KEY_CURRENT_PATH, mAdapter.getPath());
+				setResult(RESULT_OK, resultData);
+
+				finish();
+			}
+		};
+
+		ContentValues file = new ContentValues();
+		file.put(GameDatabase.KEY_FOLDER_PATH, mAdapter.getPath());
+
+		handler.startInsert(0,                // We don't need to identify this call to the handler
+				null,                        // We don't need to pass additional data to the handler
+				GameProvider.URI_FOLDER,    // Tell the GameProvider we are adding a folder
+				file);                        // Tell the GameProvider what folder we are adding
+	}
+
+	@Override
+	public void updateSubtitle(String path)
+	{
+		mToolbar.setSubtitle(path);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
new file mode 100644
index 0000000000..e1804abf96
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -0,0 +1,334 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.fragments.EmulationFragment;
+
+import java.util.List;
+
+public final class EmulationActivity extends Activity
+{
+	private View mDecorView;
+
+	private boolean mDeviceHasTouchScreen;
+	private boolean mSystemUiVisible;
+
+	/**
+	 * Handlers are a way to pass a message to an Activity telling it to do something
+	 * on the UI thread. This Handler responds to any message, even blank ones, by
+	 * hiding the system UI.
+	 */
+	private Handler mSystemUiHider = new Handler()
+	{
+		@Override
+		public void handleMessage(Message msg)
+		{
+			hideSystemUI();
+		}
+	};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		mDeviceHasTouchScreen = getPackageManager().hasSystemFeature("android.hardware.touchscreen");
+
+		// Get a handle to the Window containing the UI.
+		mDecorView = getWindow().getDecorView();
+
+		// Set these options now so that the SurfaceView the game renders into is the right size.
+		mDecorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+
+		// Set the ActionBar to follow the navigation/status bar's visibility changes.
+		mDecorView.setOnSystemUiVisibilityChangeListener(
+				new View.OnSystemUiVisibilityChangeListener()
+				{
+					@Override
+					public void onSystemUiVisibilityChange(int flags)
+					{
+						mSystemUiVisible = (flags & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
+
+						if (mSystemUiVisible)
+						{
+							getActionBar().show();
+							hideSystemUiAfterDelay();
+						}
+						else
+						{
+							getActionBar().hide();
+						}
+					}
+				}
+		);
+
+		setContentView(R.layout.activity_emulation);
+
+		Intent gameToEmulate = getIntent();
+		String path = gameToEmulate.getStringExtra("SelectedGame");
+		String title = gameToEmulate.getStringExtra("SelectedTitle");
+
+		setTitle(title);
+
+		// Instantiate an EmulationFragment.
+		EmulationFragment emulationFragment = EmulationFragment.newInstance(path);
+
+		// Add fragment to the activity - this triggers all its lifecycle callbacks.
+		getFragmentManager().beginTransaction()
+				.add(R.id.frame_content, emulationFragment, EmulationFragment.FRAGMENT_TAG)
+				.commit();
+	}
+
+	@Override
+	protected void onStart()
+	{
+		super.onStart();
+		Log.d("DolphinEmu", "EmulationActivity starting.");
+		NativeLibrary.setEmulationActivity(this);
+	}
+
+	@Override
+	protected void onStop()
+	{
+		super.onStop();
+		Log.d("DolphinEmu", "EmulationActivity stopping.");
+
+		NativeLibrary.setEmulationActivity(null);
+	}
+
+	@Override
+	protected void onPostCreate(Bundle savedInstanceState)
+	{
+		super.onPostCreate(savedInstanceState);
+
+		// Give the user a few seconds to see what the controls look like, then hide them.
+		hideSystemUiAfterDelay();
+	}
+
+	@Override
+	public void onWindowFocusChanged(boolean hasFocus)
+	{
+		super.onWindowFocusChanged(hasFocus);
+
+		if (hasFocus)
+		{
+			hideSystemUiAfterDelay();
+		}
+		else
+		{
+			// If the window loses focus (i.e. a dialog box, or a popup menu is on screen
+			// stop hiding the UI.
+			mSystemUiHider.removeMessages(0);
+		}
+	}
+
+	@Override
+	public void onBackPressed()
+	{
+		if (!mDeviceHasTouchScreen && !mSystemUiVisible)
+		{
+			showSystemUI();
+		}
+		else
+		{
+			// Let the system handle it; i.e. quit the activity TODO or show "are you sure?" dialog.
+			super.onBackPressed();
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.menu_emulation, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId())
+		{
+			// Enable/Disable input overlay.
+			case R.id.enableInputOverlay:
+			{
+				EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager()
+						.findFragmentByTag(EmulationFragment.FRAGMENT_TAG);
+
+				emulationFragment.toggleInputOverlayVisibility();
+
+				return true;
+			}
+
+			// Screenshot capturing
+			case R.id.takeScreenshot:
+				NativeLibrary.SaveScreenShot();
+				return true;
+
+			// Save state slots
+			case R.id.saveSlot1:
+				NativeLibrary.SaveState(0);
+				return true;
+
+			case R.id.saveSlot2:
+				NativeLibrary.SaveState(1);
+				return true;
+
+			case R.id.saveSlot3:
+				NativeLibrary.SaveState(2);
+				return true;
+
+			case R.id.saveSlot4:
+				NativeLibrary.SaveState(3);
+				return true;
+
+			case R.id.saveSlot5:
+				NativeLibrary.SaveState(4);
+				return true;
+
+			// Load state slots
+			case R.id.loadSlot1:
+				NativeLibrary.LoadState(0);
+				return true;
+
+			case R.id.loadSlot2:
+				NativeLibrary.LoadState(1);
+				return true;
+
+			case R.id.loadSlot3:
+				NativeLibrary.LoadState(2);
+				return true;
+
+			case R.id.loadSlot4:
+				NativeLibrary.LoadState(3);
+				return true;
+
+			case R.id.loadSlot5:
+				NativeLibrary.LoadState(4);
+				return true;
+
+			case R.id.exitEmulation:
+			{
+				// Create a confirmation method for quitting the current emulation instance.
+				AlertDialog.Builder builder = new AlertDialog.Builder(this);
+				builder.setTitle(R.string.overlay_exit_emulation);
+				builder.setMessage(R.string.overlay_exit_emulation_confirm);
+				builder.setNegativeButton(R.string.no, null);
+				builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener()
+				{
+					public void onClick(DialogInterface dialog, int which)
+					{
+						onDestroy();
+					}
+				});
+				builder.show();
+				return true;
+			}
+
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	// Gets button presses
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event)
+	{
+		int action = 0;
+
+		switch (event.getAction())
+		{
+			case KeyEvent.ACTION_DOWN:
+				// Handling the case where the back button is pressed.
+				if (event.getKeyCode() == KeyEvent.KEYCODE_BACK)
+				{
+					onBackPressed();
+					return true;
+				}
+
+				// Normal key events.
+				action = NativeLibrary.ButtonState.PRESSED;
+				break;
+			case KeyEvent.ACTION_UP:
+				action = NativeLibrary.ButtonState.RELEASED;
+				break;
+			default:
+				return false;
+		}
+		InputDevice input = event.getDevice();
+		boolean handled = NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action);
+		return handled;
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event)
+	{
+		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0))
+		{
+			return super.dispatchGenericMotionEvent(event);
+		}
+
+		// Don't attempt to do anything if we are disconnecting a device.
+		if (event.getActionMasked() == MotionEvent.ACTION_CANCEL)
+			return true;
+
+		InputDevice input = event.getDevice();
+		List<InputDevice.MotionRange> motions = input.getMotionRanges();
+
+		for (InputDevice.MotionRange range : motions)
+		{
+			NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), range.getAxis(), event.getAxisValue(range.getAxis()));
+		}
+
+		return true;
+	}
+
+	private void hideSystemUiAfterDelay()
+	{
+		// Clear any pending hide events.
+		mSystemUiHider.removeMessages(0);
+
+		// Add a new hide event, to occur 3 seconds from now.
+		mSystemUiHider.sendEmptyMessageDelayed(0, 3000);
+	}
+
+	private void hideSystemUI()
+	{
+		mSystemUiVisible = false;
+
+		mDecorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+				View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+				View.SYSTEM_UI_FLAG_FULLSCREEN |
+				View.SYSTEM_UI_FLAG_IMMERSIVE);
+	}
+
+	private void showSystemUI()
+	{
+		mSystemUiVisible = true;
+
+		mDecorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+				View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+
+		hideSystemUiAfterDelay();
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
new file mode 100644
index 0000000000..cbb4ab8058
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
@@ -0,0 +1,227 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.app.Activity;
+import android.app.LoaderManager;
+import android.content.CursorLoader;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.Toolbar;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.adapters.GameAdapter;
+import org.dolphinemu.dolphinemu.model.GameDatabase;
+import org.dolphinemu.dolphinemu.model.GameProvider;
+import org.dolphinemu.dolphinemu.services.AssetCopyService;
+
+/**
+ * The main Activity of the Lollipop style UI. Shows a grid of games on tablets & landscape phones,
+ * shows a list of games on portrait phones.
+ */
+public final class GameGridActivity extends Activity implements LoaderManager.LoaderCallbacks<Cursor>
+{
+	private static final int REQUEST_ADD_DIRECTORY = 1;
+
+	private static final int LOADER_ID_GAMES = 1;
+	// TODO When each platform has its own tab, there should be a LOADER_ID for each platform.
+
+	private GameAdapter mAdapter;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_game_grid);
+
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_game_list);
+		setActionBar(toolbar);
+
+		ImageButton buttonAddDirectory = (ImageButton) findViewById(R.id.button_add_directory);
+		RecyclerView recyclerView = (RecyclerView) findViewById(R.id.grid_games);
+
+		// TODO Rather than calling into native code, this should use the commented line below.
+		// String versionName = BuildConfig.VERSION_NAME;
+		String versionName = NativeLibrary.GetVersionString();
+		toolbar.setSubtitle(versionName);
+
+		// Specifying the LayoutManager determines how the RecyclerView arranges views.
+		RecyclerView.LayoutManager layoutManager = new GridLayoutManager(this,
+				getResources().getInteger(R.integer.game_grid_columns));
+		recyclerView.setLayoutManager(layoutManager);
+
+		recyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(8));
+
+		// Create an adapter that will relate the dataset to the views on-screen.
+		getLoaderManager().initLoader(LOADER_ID_GAMES, null, this);
+		mAdapter = new GameAdapter();
+		recyclerView.setAdapter(mAdapter);
+
+		buttonAddDirectory.setOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View view)
+			{
+				Intent fileChooser = new Intent(GameGridActivity.this, AddDirectoryActivity.class);
+
+				// The second argument to this method is read below in onActivityResult().
+				startActivityForResult(fileChooser, REQUEST_ADD_DIRECTORY);
+			}
+		});
+
+		// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
+		if (savedInstanceState == null)
+		{
+			SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+			boolean assetsCopied = preferences.getBoolean("assetsCopied", false);
+
+			// Only perform these extensive copy operations once.
+			if (!assetsCopied)
+			{
+				// Copy assets into appropriate locations.
+				Intent copyAssets = new Intent(this, AssetCopyService.class);
+				startService(copyAssets);
+			}
+		}
+	}
+
+	/**
+	 * Callback from AddDirectoryActivity. Applies any changes necessary to the GameGridActivity.
+	 *
+	 * @param requestCode An int describing whether the Activity that is returning did so successfully.
+	 * @param resultCode  An int describing what Activity is giving us this callback.
+	 * @param result      The information the returning Activity is providing us.
+	 */
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent result)
+	{
+		// If the user picked a file, as opposed to just backing out.
+		if (resultCode == RESULT_OK)
+		{
+			// Sanity check to make sure the Activity that just returned was the AddDirectoryActivity;
+			// other activities might use this callback in the future (don't forget to change Javadoc!)
+			if (requestCode == REQUEST_ADD_DIRECTORY)
+			{
+				getLoaderManager().restartLoader(LOADER_ID_GAMES, null, this);
+			}
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.menu_game_grid, menu);
+		return true;
+	}
+
+	/**
+	 * Called by the framework whenever any actionbar/toolbar icon is clicked.
+	 *
+	 * @param item The icon that was clicked on.
+	 * @return True if the event was handled, false to bubble it up to the OS.
+	 */
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId())
+		{
+			case R.id.menu_settings:
+				// Launch the Settings Actvity.
+				Intent settings = new Intent(this, SettingsActivity.class);
+				startActivity(settings);
+				return true;
+
+			case R.id.menu_refresh:
+				getContentResolver().insert(GameProvider.URI_REFRESH, null);
+				getLoaderManager().restartLoader(LOADER_ID_GAMES, null, this);
+
+				return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Callback that's invoked when the system has initialized the Loader and
+	 * is ready to start the query. This usually happens when initLoader() is
+	 * called. Here, we use it to make a DB query for games.
+	 *
+	 * @param id   The ID value passed to the initLoader() call that triggered this.
+	 * @param args The args bundle supplied by the caller.
+	 * @return A new Loader instance that is ready to start loading.
+	 */
+	@Override
+	public Loader<Cursor> onCreateLoader(int id, Bundle args)
+	{
+		Log.d("DolphinEmu", "Creating loader with id: " + id);
+
+		// Take action based on the ID of the Loader that's being created.
+		switch (id)
+		{
+			case LOADER_ID_GAMES:
+				// TODO Play some sort of load-starting animation; maybe fade the list out.
+
+				return new CursorLoader(
+						this,                           // Parent activity context
+						GameProvider.URI_GAME,          // URI of table to query
+						null,                           // Return all columns
+						null,                           // No selection clause
+						null,                           // No selection arguments
+						GameDatabase.KEY_GAME_TITLE + " asc"   // Sort by game name, ascending order
+				);
+
+			default:
+				Log.e("DolphinEmu", "Bad ID passed in.");
+				return null;
+		}
+	}
+
+	/**
+	 * Callback that's invoked when the Loader returned in onCreateLoader is finished
+	 * with its task. In this case, the game DB query is finished, so we should put the results
+	 * on screen.
+	 *
+	 * @param loader The loader that finished.
+	 * @param data   The data the Loader loaded.
+	 */
+	@Override
+	public void onLoadFinished(Loader<Cursor> loader, Cursor data)
+	{
+		int id = loader.getId();
+		Log.d("DolphinEmu", "Loader finished with id: " + id);
+
+		// TODO When each platform has its own tab, this should just call into those tabs instead.
+		switch (id)
+		{
+			case LOADER_ID_GAMES:
+				mAdapter.swapCursor(data);
+				// TODO Play some sort of load-finished animation; maybe fade the list in.
+				break;
+
+			default:
+				Log.e("DolphinEmu", "Bad ID passed in.");
+		}
+
+	}
+
+	@Override
+	public void onLoaderReset(Loader<Cursor> loader)
+	{
+		Log.d("DolphinEmu", "Loader resetting.");
+
+		// TODO ¯\_(ツ)_/¯
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/SettingsActivity.java
new file mode 100644
index 0000000000..fe1ddd14d4
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/SettingsActivity.java
@@ -0,0 +1,41 @@
+package org.dolphinemu.dolphinemu.activities;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.fragments.SettingsFragment;
+import org.dolphinemu.dolphinemu.services.SettingsSaveService;
+
+public final class SettingsActivity extends Activity
+{
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		// Display the fragment as the main content.
+		getFragmentManager().beginTransaction()
+				.replace(android.R.id.content, new SettingsFragment(), "settings_fragment")
+				.commit();
+	}
+
+	/**
+	 * If this is called, the user has left the settings screen (potentially through the
+	 * home button) and will expect their changes to be persisted. So we kick off an
+	 * IntentService which will do so on a background thread.
+	 */
+	@Override
+	protected void onStop()
+	{
+		super.onStop();
+
+		Log.d("DolphinEmulator", "Settings activity stopping. Saving settings to INI...");
+
+		// Copy assets into appropriate locations.
+		Intent settingsSaver = new Intent(this, SettingsSaveService.class);
+		startService(settingsSaver);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
new file mode 100644
index 0000000000..8d07b6c101
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
@@ -0,0 +1,212 @@
+package org.dolphinemu.dolphinemu.adapters;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.model.FileListItem;
+import org.dolphinemu.dolphinemu.viewholders.FileViewHolder;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+
+public final class FileAdapter extends RecyclerView.Adapter<FileViewHolder> implements View.OnClickListener
+{
+	private ArrayList<FileListItem> mFileList;
+
+	private String mPath;
+
+	private FileClickListener mListener;
+
+	/**
+	 * Initializes the dataset to be displayed, and associates the Adapter with the
+	 * Activity as an event listener.
+	 *
+	 * @param path     A String containing the path to the directory to be shown by this Adapter.
+	 * @param listener An Activity that can respond to callbacks from this Adapter.
+	 */
+	public FileAdapter(String path, FileClickListener listener)
+	{
+		mFileList = generateFileList(new File(path));
+		mListener = listener;
+		mListener.updateSubtitle(path);
+	}
+
+	/**
+	 * Called by the LayoutManager when it is necessary to create a new view.
+	 *
+	 * @param parent   The RecyclerView (I think?) the created view will be thrown into.
+	 * @param viewType Not used here, but useful when more than one type of child will be used in the RecyclerView.
+	 * @return The created ViewHolder with references to all the child view's members.
+	 */
+	@Override
+	public FileViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+	{
+		// Create a new view.
+		View listItem = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.list_item_file, parent, false);
+
+		listItem.setOnClickListener(this);
+
+		// Use that view to create a ViewHolder.
+		return new FileViewHolder(listItem);
+	}
+
+	/**
+	 * Called by the LayoutManager when a new view is not necessary because we can recycle
+	 * an existing one (for example, if a view just scrolled onto the screen from the bottom, we
+	 * can use the view that just scrolled off the top instead of inflating a new one.)
+	 *
+	 * @param holder   A ViewHolder representing the view we're recycling.
+	 * @param position The position of the 'new' view in the dataset.
+	 */
+	@Override
+	public void onBindViewHolder(FileViewHolder holder, int position)
+	{
+		// Get a reference to the item from the dataset; we'll use this to fill in the view contents.
+		final FileListItem file = mFileList.get(position);
+
+		// Fill in the view contents.
+		switch (file.getType())
+		{
+			case FileListItem.TYPE_FOLDER:
+				holder.imageType.setImageResource(R.drawable.ic_folder);
+				break;
+
+			case FileListItem.TYPE_GC:
+				holder.imageType.setImageResource(R.drawable.ic_gamecube);
+				break;
+
+			case FileListItem.TYPE_WII:
+				holder.imageType.setImageResource(R.drawable.ic_wii);
+				break;
+
+			case FileListItem.TYPE_OTHER:
+				holder.imageType.setImageResource(android.R.color.transparent);
+				break;
+		}
+
+		holder.textFileName.setText(file.getFilename());
+		holder.itemView.setTag(file.getPath());
+	}
+
+	/**
+	 * Called by the LayoutManager to find out how much data we have.
+	 *
+	 * @return Size of the dataset.
+	 */
+	@Override
+	public int getItemCount()
+	{
+		return mFileList.size();
+	}
+
+	/**
+	 * When a file is clicked, determine if it is a directory; if it is, show that new directory's
+	 * contents. If it is not, end the activity successfully.
+	 *
+	 * @param view The View representing the file the user clicked on.
+	 */
+	@Override
+	public void onClick(final View view)
+	{
+		final String path = (String) view.getTag();
+
+		File clickedFile = new File(path);
+
+		if (clickedFile.isDirectory())
+		{
+			final ArrayList<FileListItem> fileList = generateFileList(clickedFile);
+
+			if (fileList.isEmpty())
+			{
+				Toast.makeText(view.getContext(), R.string.add_directory_empty_folder, Toast.LENGTH_SHORT).show();
+			}
+			else
+			{
+				// Delay the loading of the new directory to give a little bit of time for UI feedback
+				// to happen. Hacky, but good enough for now; this is necessary because we're modifying
+				// the RecyclerView's contents, rather than constructing a new one.
+				view.getHandler().postDelayed(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						mFileList = fileList;
+						notifyDataSetChanged();
+						mListener.updateSubtitle(path);
+					}
+				}, 200);
+			}
+		}
+		else
+		{
+			// Pass the activity the path of the parent directory of the clicked file.
+			mListener.addDirectory();
+		}
+	}
+
+	/**
+	 * For a given directory, return a list of Files it contains.
+	 *
+	 * @param directory A File representing the directory that should have its contents displayed.
+	 * @return The list of files contained in the directory.
+	 */
+	private ArrayList<FileListItem> generateFileList(File directory)
+	{
+		File[] children = directory.listFiles();
+		ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(children.length);
+
+		for (File child : children)
+		{
+			if (!child.isHidden())
+			{
+				FileListItem item = new FileListItem(child);
+				fileList.add(item);
+			}
+		}
+
+		mPath = directory.getAbsolutePath();
+
+		Collections.sort(fileList);
+		return fileList;
+	}
+
+	public String getPath()
+	{
+		return mPath;
+	}
+
+	public void setPath(String path)
+	{
+		File directory = new File(path);
+
+		mFileList = generateFileList(directory);
+		notifyDataSetChanged();
+		mListener.updateSubtitle(path);
+	}
+
+	public void upOneLevel()
+	{
+		File currentDirectory = new File(mPath);
+		File parentDirectory = currentDirectory.getParentFile();
+
+		mFileList = generateFileList(parentDirectory);
+		notifyDataSetChanged();
+		mListener.updateSubtitle(mPath);
+	}
+
+	/**
+	 * Callback to the containing Activity.
+	 */
+	public interface FileClickListener
+	{
+		void addDirectory();
+
+		void updateSubtitle(String path);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
new file mode 100644
index 0000000000..d296c5e023
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -0,0 +1,288 @@
+package org.dolphinemu.dolphinemu.adapters;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.squareup.picasso.Picasso;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.dolphinemu.dialogs.GameDetailsDialog;
+import org.dolphinemu.dolphinemu.model.GameDatabase;
+import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
+
+/**
+ * This adapter, unlike {@link FileAdapter} which is backed by an ArrayList, gets its
+ * information from a database Cursor. This fact, paired with the usage of ContentProviders
+ * and Loaders, allows for efficient display of a limited view into a (possibly) large dataset.
+ */
+public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> implements
+		View.OnClickListener,
+		View.OnLongClickListener
+{
+	private Cursor mCursor;
+	private GameDataSetObserver mObserver;
+
+	private boolean mDatasetValid;
+
+	/**
+	 * Initializes the adapter's observer, which watches for changes to the dataset. The adapter will
+	 * display no data until a Cursor is supplied by a CursorLoader.
+	 */
+	public GameAdapter()
+	{
+		mDatasetValid = false;
+		mObserver = new GameDataSetObserver();
+	}
+
+	/**
+	 * Called by the LayoutManager when it is necessary to create a new view.
+	 *
+	 * @param parent   The RecyclerView (I think?) the created view will be thrown into.
+	 * @param viewType Not used here, but useful when more than one type of child will be used in the RecyclerView.
+	 * @return The created ViewHolder with references to all the child view's members.
+	 */
+	@Override
+	public GameViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+	{
+		// Create a new view.
+		View gameCard = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.card_game, parent, false);
+
+		gameCard.setOnClickListener(this);
+		gameCard.setOnLongClickListener(this);
+
+		// Use that view to create a ViewHolder.
+		return new GameViewHolder(gameCard);
+	}
+
+	/**
+	 * Called by the LayoutManager when a new view is not necessary because we can recycle
+	 * an existing one (for example, if a view just scrolled onto the screen from the bottom, we
+	 * can use the view that just scrolled off the top instead of inflating a new one.)
+	 *
+	 * @param holder   A ViewHolder representing the view we're recycling.
+	 * @param position The position of the 'new' view in the dataset.
+	 */
+	@Override
+	public void onBindViewHolder(GameViewHolder holder, int position)
+	{
+		if (mDatasetValid)
+		{
+			if (mCursor.moveToPosition(position))
+			{
+				// Fill in the view contents.
+				Picasso.with(holder.imageScreenshot.getContext())
+						.load(mCursor.getString(GameDatabase.GAME_COLUMN_SCREENSHOT_PATH))
+						.fit()
+						.centerCrop()
+						.error(R.drawable.no_banner)
+						.into(holder.imageScreenshot);
+
+				holder.textGameTitle.setText(mCursor.getString(GameDatabase.GAME_COLUMN_TITLE));
+				holder.textCompany.setText(mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY));
+
+				// TODO These shouldn't be necessary once the move to a DB-based model is complete.
+				holder.gameId = mCursor.getString(GameDatabase.GAME_COLUMN_GAME_ID);
+				holder.path = mCursor.getString(GameDatabase.GAME_COLUMN_PATH);
+				holder.title = mCursor.getString(GameDatabase.GAME_COLUMN_TITLE);
+				holder.description = mCursor.getString(GameDatabase.GAME_COLUMN_DESCRIPTION);
+				holder.country = mCursor.getInt(GameDatabase.GAME_COLUMN_COUNTRY);
+				holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY);
+				holder.screenshotPath = mCursor.getString(GameDatabase.GAME_COLUMN_SCREENSHOT_PATH);
+			}
+			else
+			{
+				Log.e("DolphinEmu", "Can't bind view; Cursor is not valid.");
+			}
+		}
+		else
+		{
+			Log.e("DolphinEmu", "Can't bind view; dataset is not valid.");
+		}
+
+
+	}
+
+	/**
+	 * Called by the LayoutManager to find out how much data we have.
+	 *
+	 * @return Size of the dataset.
+	 */
+	@Override
+	public int getItemCount()
+	{
+		if (mDatasetValid && mCursor != null)
+		{
+			return mCursor.getCount();
+		}
+		Log.e("DolphinEmu", "Dataset is not valid.");
+		return 0;
+	}
+
+	/**
+	 * Return the contents of the _id column for a given row.
+	 *
+	 * @param position The row for which Android wants an ID.
+	 * @return A valid ID from the database, or 0 if not available.
+	 */
+	@Override
+	public long getItemId(int position)
+	{
+		if (mDatasetValid && mCursor != null)
+		{
+			if (mCursor.moveToPosition(position))
+			{
+				return mCursor.getLong(GameDatabase.COLUMN_DB_ID);
+			}
+		}
+
+		Log.e("DolphinEmu", "Dataset is not valid.");
+		return 0;
+	}
+
+	/**
+	 * Tell Android whether or not each item in the dataset has a stable identifier.
+	 * Which it does, because it's a database, so always tell Android 'true'.
+	 *
+	 * @param hasStableIds ignored.
+	 */
+	@Override
+	public void setHasStableIds(boolean hasStableIds)
+	{
+		super.setHasStableIds(true);
+	}
+
+	/**
+	 * When a load is finished, call this to replace the existing data with the newly-loaded
+	 * data.
+	 *
+	 * @param cursor The newly-loaded Cursor.
+	 */
+	public void swapCursor(Cursor cursor)
+	{
+		// Sanity check.
+		if (cursor == mCursor)
+		{
+			return;
+		}
+
+		// Before getting rid of the old cursor, disassociate it from the Observer.
+		final Cursor oldCursor = mCursor;
+		if (oldCursor != null && mObserver != null)
+		{
+			oldCursor.unregisterDataSetObserver(mObserver);
+		}
+
+		mCursor = cursor;
+		if (mCursor != null)
+		{
+			// Attempt to associate the new Cursor with the Observer.
+			if (mObserver != null)
+			{
+				mCursor.registerDataSetObserver(mObserver);
+			}
+
+			mDatasetValid = true;
+		}
+		else
+		{
+			mDatasetValid = false;
+		}
+
+		notifyDataSetChanged();
+	}
+
+	/**
+	 * Launches the game that was clicked on.
+	 *
+	 * @param view The card representing the game the user wants to play.
+	 */
+	@Override
+	public void onClick(View view)
+	{
+		GameViewHolder holder = (GameViewHolder) view.getTag();
+
+		// Start the emulation activity and send the path of the clicked ISO to it.
+		Intent intent = new Intent(view.getContext(), EmulationActivity.class);
+
+		intent.putExtra("SelectedGame", holder.path);
+		intent.putExtra("SelectedTitle", holder.title);
+
+		view.getContext().startActivity(intent);
+	}
+
+	/**
+	 * Launches the details activity for this Game, using an ID stored in the
+	 * details button's Tag.
+	 *
+	 * @param view The Card button that was long-clicked.
+	 */
+	@Override
+	public boolean onLongClick(View view)
+	{
+		GameViewHolder holder = (GameViewHolder) view.getTag();
+
+		// Get the ID of the game we want to look at.
+		// TODO This should be all we need to pass in, eventually.
+		// String gameId = (String) holder.gameId;
+
+		Activity activity = (Activity) view.getContext();
+		GameDetailsDialog.newInstance(holder.title,
+				holder.description,
+				holder.country,
+				holder.company,
+				holder.path,
+				holder.screenshotPath).show(activity.getFragmentManager(), "game_details");
+
+		return true;
+	}
+
+	public static class SpacesItemDecoration extends RecyclerView.ItemDecoration
+	{
+		private int space;
+
+		public SpacesItemDecoration(int space)
+		{
+			this.space = space;
+		}
+
+		@Override
+		public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state)
+		{
+			outRect.left = space;
+			outRect.right = space;
+			outRect.bottom = space;
+			outRect.top = space;
+		}
+	}
+
+	private final class GameDataSetObserver extends DataSetObserver
+	{
+		@Override
+		public void onChanged()
+		{
+			super.onChanged();
+
+			mDatasetValid = true;
+			notifyDataSetChanged();
+		}
+
+		@Override
+		public void onInvalidated()
+		{
+			super.onInvalidated();
+
+			mDatasetValid = false;
+			notifyDataSetChanged();
+		}
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
new file mode 100644
index 0000000000..04c7253cb5
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
@@ -0,0 +1,102 @@
+package org.dolphinemu.dolphinemu.dialogs;
+
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.squareup.picasso.Picasso;
+
+import org.dolphinemu.dolphinemu.BuildConfig;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public final class GameDetailsDialog extends DialogFragment
+{
+	public static final String ARGUMENT_GAME_TITLE = BuildConfig.APPLICATION_ID + ".game_title";
+	public static final String ARGUMENT_GAME_DESCRIPTION = BuildConfig.APPLICATION_ID + ".game_description";
+	public static final String ARGUMENT_GAME_COUNTRY = BuildConfig.APPLICATION_ID + ".game_country";
+	public static final String ARGUMENT_GAME_DATE = BuildConfig.APPLICATION_ID + ".game_date";
+	public static final String ARGUMENT_GAME_PATH = BuildConfig.APPLICATION_ID + ".game_path";
+	public static final String ARGUMENT_GAME_SCREENSHOT_PATH = BuildConfig.APPLICATION_ID + ".game_screenshot_path";
+
+	// TODO Add all of this to the Loader in GameActivity.java
+	public static GameDetailsDialog newInstance(String title, String description, int country, String company, String path, String screenshotPath)
+	{
+		GameDetailsDialog fragment = new GameDetailsDialog();
+
+		Bundle arguments = new Bundle();
+		arguments.putString(ARGUMENT_GAME_TITLE, title);
+		arguments.putString(ARGUMENT_GAME_DESCRIPTION, description);
+		arguments.putInt(ARGUMENT_GAME_COUNTRY, country);
+		arguments.putString(ARGUMENT_GAME_DATE, company);
+		arguments.putString(ARGUMENT_GAME_PATH, path);
+		arguments.putString(ARGUMENT_GAME_SCREENSHOT_PATH, screenshotPath);
+		fragment.setArguments(arguments);
+
+		return fragment;
+	}
+
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState)
+	{
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		ViewGroup contents = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.dialog_game_details, null);
+
+		final ImageView imageGameScreen = (ImageView) contents.findViewById(R.id.image_game_screen);
+		CircleImageView circleBanner = (CircleImageView) contents.findViewById(R.id.circle_banner);
+
+		TextView textTitle = (TextView) contents.findViewById(R.id.text_game_title);
+		TextView textDescription = (TextView) contents.findViewById(R.id.text_company);
+
+		TextView textCountry = (TextView) contents.findViewById(R.id.text_country);
+		TextView textDate = (TextView) contents.findViewById(R.id.text_date);
+
+		ImageButton buttonLaunch = (ImageButton) contents.findViewById(R.id.button_launch);
+
+		int countryIndex = getArguments().getInt(ARGUMENT_GAME_COUNTRY);
+		String country = getResources().getStringArray(R.array.country_names)[countryIndex];
+
+		textTitle.setText(getArguments().getString(ARGUMENT_GAME_TITLE));
+		textDescription.setText(getArguments().getString(ARGUMENT_GAME_DESCRIPTION));
+		textCountry.setText(country);
+		textDate.setText(getArguments().getString(ARGUMENT_GAME_DATE));
+		buttonLaunch.setOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View view)
+			{
+				// Start the emulation activity and send the path of the clicked ROM to it.
+				Intent intent = new Intent(view.getContext(), EmulationActivity.class);
+
+				intent.putExtra("SelectedGame", getArguments().getString(ARGUMENT_GAME_PATH));
+				intent.putExtra("SelectedTitle", getArguments().getString(ARGUMENT_GAME_TITLE));
+
+				startActivity(intent);
+			}
+		});
+
+		// Fill in the view contents.
+		Picasso.with(imageGameScreen.getContext())
+				.load(getArguments().getString(ARGUMENT_GAME_SCREENSHOT_PATH))
+				.fit()
+				.centerCrop()
+				.noFade()
+				.noPlaceholder()
+				.into(imageGameScreen);
+
+		circleBanner.setImageResource(R.drawable.no_banner);
+
+		builder.setView(contents);
+		return builder.create();
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
new file mode 100644
index 0000000000..aea1f39df0
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
@@ -0,0 +1,184 @@
+package org.dolphinemu.dolphinemu.dialogs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link AlertDialog} derivative that listens for
+ * motion events from controllers and joysticks.
+ */
+public final class MotionAlertDialog extends AlertDialog
+{
+	// The selected input preference
+	private final Preference inputPref;
+
+	private boolean firstEvent = true;
+	private final ArrayList<Float> m_values = new ArrayList<Float>();
+
+	/**
+	 * Constructor
+	 *
+	 * @param ctx       The current {@link Context}.
+	 * @param inputPref The Preference to show this dialog for.
+	 */
+	public MotionAlertDialog(Context ctx, Preference inputPref)
+	{
+		super(ctx);
+
+		this.inputPref = inputPref;
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)
+	{
+		Log.d("InputConfigFragment", "Received key event: " + event.getAction());
+		switch (event.getAction())
+		{
+			case KeyEvent.ACTION_DOWN:
+			case KeyEvent.ACTION_UP:
+
+				InputDevice input = event.getDevice();
+				saveInput(input, event, null, false);
+
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
+
+	// Method that will be called within dispatchGenericMotionEvent
+	// that handles joystick/controller movements.
+	private boolean onMotionEvent(MotionEvent event)
+	{
+		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
+			return false;
+
+		Log.d("InputConfigFragment", "Received motion event: " + event.getAction());
+
+		InputDevice input = event.getDevice();
+		List<InputDevice.MotionRange> motions = input.getMotionRanges();
+		if (firstEvent)
+		{
+			m_values.clear();
+
+			for (InputDevice.MotionRange range : motions)
+			{
+				m_values.add(event.getAxisValue(range.getAxis()));
+			}
+
+			firstEvent = false;
+		}
+		else
+		{
+			for (int a = 0; a < motions.size(); ++a)
+			{
+				InputDevice.MotionRange range = motions.get(a);
+
+				if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
+				{
+					saveInput(input, null, range, false);
+				}
+				else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
+				{
+					saveInput(input, null, range, true);
+				}
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event)
+	{
+		if (onKeyDown(event.getKeyCode(), event))
+			return true;
+
+		return super.dispatchKeyEvent(event);
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event)
+	{
+		if (onMotionEvent(event))
+			return true;
+
+		return super.dispatchGenericMotionEvent(event);
+	}
+
+	/**
+	 * Saves the provided input setting both to the INI file (so native code can use it) and as an
+	 * Android preference (so it persists correctly, and is human-readable.)
+	 *
+	 * @param device       Required; the InputDevice from which the input event originated.
+	 * @param keyEvent     If the event was a button push, this KeyEvent represents it and is required.
+	 * @param motionRange  If the event was an axis movement, this MotionRange represents it and is required.
+	 * @param axisPositive If the event was an axis movement, this boolean indicates the direction and is required.
+	 */
+	private void saveInput(InputDevice device, KeyEvent keyEvent, InputDevice.MotionRange motionRange, boolean axisPositive)
+	{
+		String bindStr = null;
+		String uiString = null;
+
+		if (keyEvent != null)
+		{
+			bindStr = "Device '" + device.getDescriptor() + "'-Button " + keyEvent.getKeyCode();
+			uiString = device.getName() + ": Button " + keyEvent.getKeyCode();
+		}
+
+		if (motionRange != null)
+		{
+			if (axisPositive)
+			{
+				bindStr = "Device '" + device.getDescriptor() + "'-Axis " + motionRange.getAxis() + "+";
+				uiString = device.getName() + ": Axis " + motionRange.getAxis() + "+";
+			}
+			else
+			{
+				bindStr = "Device '" + device.getDescriptor() + "'-Axis " + motionRange.getAxis() + "-";
+				uiString = device.getName() + ": Axis " + motionRange.getAxis() + "-";
+			}
+		}
+
+		if (bindStr != null)
+		{
+			NativeLibrary.SetConfig("Dolphin.ini", "Android", inputPref.getKey(), bindStr);
+		}
+		else
+		{
+			Log.e("DolphinEmu", "Failed to save input to INI.");
+		}
+
+
+		if (uiString != null)
+		{
+			SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+			SharedPreferences.Editor editor = preferences.edit();
+
+			editor.putString(inputPref.getKey(), uiString);
+			editor.apply();
+
+			inputPref.setSummary(uiString);
+		}
+		else
+		{
+			Log.e("DolphinEmu", "Failed to save input to preference.");
+		}
+
+		dismiss();
+	}
+}
\ No newline at end of file
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
new file mode 100644
index 0000000000..70dff7237e
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
@@ -0,0 +1,222 @@
+package org.dolphinemu.dolphinemu.fragments;
+
+import android.app.Fragment;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.dolphinemu.dolphinemu.BuildConfig;
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.overlay.InputOverlay;
+
+
+public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback
+{
+	public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".emulation_fragment";
+
+	private static final String ARGUMENT_GAME_PATH = BuildConfig.APPLICATION_ID + ".game_path";
+
+	private SharedPreferences mPreferences;
+
+	private SurfaceView mSurfaceView;
+	private Surface mSurface;
+
+	private InputOverlay mInputOverlay;
+
+	private Thread mEmulationThread;
+
+	private String mPath;
+
+	private boolean mEmulationStarted;
+	private boolean mEmulationRunning;
+
+
+	public static EmulationFragment newInstance(String path)
+	{
+		EmulationFragment fragment = new EmulationFragment();
+
+		Bundle arguments = new Bundle();
+		arguments.putString(ARGUMENT_GAME_PATH, path);
+		fragment.setArguments(arguments);
+
+		return fragment;
+	}
+
+	/**
+	 * Initialize anything that doesn't depend on the layout / views in here.
+	 */
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		// So this fragment doesn't restart on configuration changes; i.e. rotation.
+		setRetainInstance(true);
+
+		mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+	}
+
+	/**
+	 * Initialize the UI and start emulation in here.
+	 */
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+	{
+		mPath = getArguments().getString(ARGUMENT_GAME_PATH);
+		NativeLibrary.SetFilename(mPath);
+
+		View contents = inflater.inflate(R.layout.fragment_emulation, container, false);
+
+		mSurfaceView = (SurfaceView) contents.findViewById(R.id.surface_emulation);
+		mInputOverlay = (InputOverlay) contents.findViewById(R.id.surface_input_overlay);
+
+		mSurfaceView.getHolder().addCallback(this);
+
+		// If the input overlay was previously disabled, then don't show it.
+		if (!mPreferences.getBoolean("showInputOverlay", true))
+		{
+			mInputOverlay.setVisibility(View.GONE);
+		}
+
+
+		if (savedInstanceState == null)
+		{
+			mEmulationThread = new Thread(mEmulationRunner);
+		}
+		else
+		{
+			// Likely a rotation occurred.
+			// TODO Pass native code the Surface, which will have been recreated, from surfaceChanged()
+			// TODO Also, write the native code that will get the video backend to accept the new Surface as one of its own.
+		}
+
+		return contents;
+	}
+
+	@Override
+	public void onStart()
+	{
+		super.onStart();
+		startEmulation();
+	}
+
+	@Override
+	public void onStop()
+	{
+		super.onStop();
+		pauseEmulation();
+	}
+
+	@Override
+	public void onDestroyView()
+	{
+		super.onDestroyView();
+		if (getActivity().isFinishing())
+		{
+			NativeLibrary.StopEmulation();
+		}
+	}
+
+	public void toggleInputOverlayVisibility()
+	{
+		SharedPreferences.Editor editor = mPreferences.edit();
+
+		// If the overlay is currently set to INVISIBLE
+		if (!mPreferences.getBoolean("showInputOverlay", false))
+		{
+			// Set it to VISIBLE
+			mInputOverlay.setVisibility(View.VISIBLE);
+			editor.putBoolean("showInputOverlay", true);
+		}
+		else
+		{
+			// Set it to INVISIBLE
+			mInputOverlay.setVisibility(View.GONE);
+			editor.putBoolean("showInputOverlay", false);
+		}
+
+		editor.apply();
+	}
+
+	@Override
+	public void surfaceCreated(SurfaceHolder holder)
+	{
+		Log.d("DolphinEmu", "Surface created.");
+	}
+
+	@Override
+	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
+	{
+		Log.d("DolphinEmu", "Surface changed. Resolution: " + width + "x" + height);
+		mSurface = holder.getSurface();
+	}
+
+	@Override
+	public void surfaceDestroyed(SurfaceHolder holder)
+	{
+		Log.d("DolphinEmu", "Surface destroyed.");
+
+		if (mEmulationRunning)
+		{
+			pauseEmulation();
+		}
+	}
+
+	private void startEmulation()
+	{
+		if (!mEmulationStarted)
+		{
+			Log.d("DolphinEmu", "Starting emulation thread.");
+
+			mEmulationThread.start();
+		}
+		else
+		{
+			Log.d("DolphinEmu", "Resuming emulation.");
+			NativeLibrary.UnPauseEmulation();
+		}
+
+		mEmulationRunning = true;
+	}
+
+	private void pauseEmulation()
+	{
+		Log.d("DolphinEmu", "Pausing emulation.");
+
+		NativeLibrary.PauseEmulation();
+		mEmulationRunning = false;
+	}
+
+	private Runnable mEmulationRunner = new Runnable()
+	{
+		@Override
+		public void run()
+		{
+			mEmulationRunning = true;
+			mEmulationStarted = true;
+
+			// Loop until onSurfaceCreated succeeds
+			while (mSurface == null)
+			{
+				if (!mEmulationRunning)
+				{
+					// So that if the user quits before this gets a surface, we don't loop infinitely.
+					return;
+				}
+			}
+
+			Log.i("DolphinEmu", "Starting emulation: " + mSurface);
+
+			// Start emulation using the provided Surface.
+			NativeLibrary.Run(mSurface);
+		}
+	};
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SettingsFragment.java
new file mode 100644
index 0000000000..8f77e4a72d
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SettingsFragment.java
@@ -0,0 +1,197 @@
+package org.dolphinemu.dolphinemu.fragments;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.ListPreference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.utils.EGLHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.microedition.khronos.opengles.GL10;
+
+public final class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+	private SharedPreferences mPreferences;
+	private ListPreference mVideoBackendPreference;
+
+	private final EGLHelper mEglHelper = new EGLHelper(EGLHelper.EGL_OPENGL_ES2_BIT);
+	private final String mVendor = mEglHelper.getGL().glGetString(GL10.GL_VENDOR);
+
+	private final String mVersion = mEglHelper.getGL().glGetString(GL10.GL_VERSION);
+
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		// Load the preferences from an XML resource
+		addPreferencesFromResource(R.xml.preferences);
+
+		// TODO Below here is effectively ported from the old VideoSettingsFragment. There is
+		// TODO probably a simpler way to do this, but potentially could require UI discussion/feedback.
+
+		// Setting valid video backends.
+		mVideoBackendPreference = (ListPreference) findPreference("gpuPref");
+		final boolean deviceSupportsGL = mEglHelper.supportsOpenGL();
+		final boolean deviceSupportsGLES3 = mEglHelper.supportsGLES3();
+
+		if (deviceSupportsGL)
+		{
+			mVideoBackendPreference.setEntries(R.array.videoBackendEntriesGL);
+			mVideoBackendPreference.setEntryValues(R.array.videoBackendValuesGL);
+		}
+		else if (deviceSupportsGLES3)
+		{
+			mVideoBackendPreference.setEntries(R.array.videoBackendEntriesGLES3);
+			mVideoBackendPreference.setEntryValues(R.array.videoBackendValuesGLES3);
+		}
+		else
+		{
+			mVideoBackendPreference.setEntries(R.array.videoBackendEntriesNoGLES3);
+			mVideoBackendPreference.setEntryValues(R.array.videoBackendValuesNoGLES3);
+		}
+
+		//
+		// Set available post processing shaders
+		//
+
+		List<CharSequence> shader_names = new ArrayList<CharSequence>();
+		List<CharSequence> shader_values = new ArrayList<CharSequence>();
+
+		// Disabled option
+		shader_names.add("Disabled");
+		shader_values.add("");
+
+		// TODO Since shaders are included with the APK, we know what they are at build-time. We should
+		// TODO be able to run this logic somehow at build-time and not rely on the device doing it.
+
+		File shaders_folder = new File(Environment.getExternalStorageDirectory() + File.separator + "dolphin-emu" + File.separator + "Shaders");
+		if (shaders_folder.exists())
+		{
+			File[] shaders = shaders_folder.listFiles();
+			for (File file : shaders)
+			{
+				if (file.isFile())
+				{
+					String filename = file.getName();
+					if (filename.endsWith(".glsl"))
+					{
+						// Strip the extension and put it in to the list
+						shader_names.add(filename.substring(0, filename.lastIndexOf('.')));
+						shader_values.add(filename.substring(0, filename.lastIndexOf('.')));
+					}
+				}
+			}
+		}
+
+		final ListPreference shader_preference = (ListPreference) findPreference("postProcessingShader");
+		shader_preference.setEntries(shader_names.toArray(new CharSequence[shader_names.size()]));
+		shader_preference.setEntryValues(shader_values.toArray(new CharSequence[shader_values.size()]));
+
+		//
+		// Disable all options if Software Rendering is used.
+		//
+		// Note that the numeric value in 'getPreference()'
+		// denotes the placement on the UI. So if more elements are
+		// added to the video settings, these may need to change.
+		//
+		mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+
+		if (mVideoBackendPreference.getValue().equals("Software Renderer"))
+		{
+			findPreference("enhancements").setEnabled(false);
+			findPreference("hacks").setEnabled(false);
+			findPreference("showFPS").setEnabled(false);
+		}
+		else if (mVideoBackendPreference.getValue().equals("OGL"))
+		{
+			findPreference("enhancements").setEnabled(true);
+			findPreference("hacks").setEnabled(true);
+			findPreference("showFPS").setEnabled(true);
+
+			// Check if we support stereo
+			// If we support desktop GL then we must support at least OpenGL 3.2
+			// If we only support OpenGLES then we need both OpenGLES 3.1 and AEP
+			if ((mEglHelper.supportsOpenGL() && mEglHelper.GetVersion() >= 320) ||
+					(mEglHelper.supportsGLES3() && mEglHelper.GetVersion() >= 310 && mEglHelper.SupportsExtension("GL_ANDROID_extension_pack_es31a")))
+				findPreference("StereoscopyScreen").setEnabled(true);
+			else
+				findPreference("StereoscopyScreen").setEnabled(false);
+		}
+
+		// Also set a listener, so that if someone changes the video backend, it will disable
+		// the video settings, upon the user choosing "Software Rendering".
+		mPreferences.registerOnSharedPreferenceChangeListener(this);
+	}
+
+	@Override
+	public void onSharedPreferenceChanged(SharedPreferences preferences, String key)
+	{
+		if (key.equals("gpuPref"))
+		{
+			if (preferences.getString(key, "Software Renderer").equals("Software Renderer"))
+			{
+				findPreference("enhancements").setEnabled(false);
+				findPreference("hacks").setEnabled(false);
+				findPreference("showFPS").setEnabled(false);
+			}
+			else if (preferences.getString(key, "Software Renderer").equals("OGL"))
+			{
+				findPreference("enhancements").setEnabled(true);
+				findPreference("hacks").setEnabled(true);
+				findPreference("showFPS").setEnabled(true);
+
+				// Create an alert telling them that their phone sucks
+				if (mEglHelper.supportsGLES3()
+						&& mVendor.equals("Qualcomm")
+						&& getQualcommVersion() == 14.0f)
+				{
+					AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+					builder.setTitle(R.string.device_compat_warning);
+					builder.setMessage(R.string.device_gles3compat_warning_msg);
+					builder.setPositiveButton(R.string.yes, null);
+					builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener()
+					{
+						public void onClick(DialogInterface dialog, int which)
+						{
+							// Get an editor.
+							SharedPreferences.Editor editor = mPreferences.edit();
+							editor.putString("gpuPref", "Software Renderer");
+							editor.apply();
+							mVideoBackendPreference.setValue("Software Renderer");
+						}
+					});
+					builder.show();
+				}
+			}
+		}
+	}
+
+	private float getQualcommVersion()
+	{
+		final int start = mVersion.indexOf("V@") + 2;
+		final StringBuilder versionBuilder = new StringBuilder();
+
+		for (int i = start; i < mVersion.length(); i++)
+		{
+			char c = mVersion.charAt(i);
+
+			// End of numeric portion of version string.
+			if (c == ' ')
+				break;
+
+			versionBuilder.append(c);
+		}
+
+		return Float.parseFloat(versionBuilder.toString());
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
new file mode 100644
index 0000000000..e6fdacc110
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
@@ -0,0 +1,95 @@
+package org.dolphinemu.dolphinemu.model;
+
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class FileListItem implements Comparable<FileListItem>
+{
+	public static final int TYPE_FOLDER = 0;
+	public static final int TYPE_GC = 1;
+	public static final int TYPE_WII = 2;
+	public static final int TYPE_WII_WARE = 3;
+	public static final int TYPE_OTHER = 4;
+
+	private int mType;
+	private String mFilename;
+	private String mPath;
+
+	public FileListItem(File file)
+	{
+		mPath = file.getAbsolutePath();
+		mFilename = file.getName();
+
+		if (file.isDirectory())
+		{
+			mType = TYPE_FOLDER;
+		}
+		else
+		{
+			int extensionStart = mPath.lastIndexOf('.');
+			if (extensionStart < 1)
+			{
+				// Ignore hidden files & files without extensions.
+				mType = TYPE_OTHER;
+			}
+			else
+			{
+				String fileExtension = mPath.substring(extensionStart);
+
+				// The extensions we care about.
+				Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
+
+				// Check that the file has an extension we care about before trying to read out of it.
+				if (allowedExtensions.contains(fileExtension))
+				{
+					// Add 1 because 0 = TYPE_FOLDER
+					mType = NativeLibrary.GetPlatform(mPath) + 1;
+				}
+				else
+				{
+					mType = TYPE_OTHER;
+				}
+			}
+		}
+	}
+
+	public int getType()
+	{
+		return mType;
+	}
+
+	public String getFilename()
+	{
+		return mFilename;
+	}
+
+	public String getPath()
+	{
+		return mPath;
+	}
+
+	@Override
+	public int compareTo(FileListItem theOther)
+	{
+		if (theOther.getType() == getType())
+		{
+			return getFilename().toLowerCase().compareTo(theOther.getFilename().toLowerCase());
+		}
+		else
+		{
+			if (getType() > theOther.getType())
+			{
+				return 1;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
new file mode 100644
index 0000000000..ae52261b45
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
@@ -0,0 +1,154 @@
+package org.dolphinemu.dolphinemu.model;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+
+import java.io.File;
+
+public final class Game
+{
+	public static final int PLATFORM_GC = 0;
+	public static final int PLATFORM_WII = 1;
+	public static final int PLATFORM_WII_WARE = 2;
+
+	// Copied from IVolume::ECountry. Update these if that is ever modified.
+	public static final int COUNTRY_EUROPE = 0;
+	public static final int COUNTRY_JAPAN = 1;
+	public static final int COUNTRY_USA = 2;
+	public static final int COUNTRY_AUSTRALIA = 3;
+	public static final int COUNTRY_FRANCE = 4;
+	public static final int COUNTRY_GERMANY = 5;
+	public static final int COUNTRY_ITALY = 6;
+	public static final int COUNTRY_KOREA = 7;
+	public static final int COUNTRY_NETHERLANDS = 8;
+	public static final int COUNTRY_RUSSIA = 9;
+	public static final int COUNTRY_SPAIN = 10;
+	public static final int COUNTRY_TAIWAN = 11;
+	public static final int COUNTRY_WORLD = 12;
+	public static final int COUNTRY_UNKNOWN = 13;
+
+	private static final String PATH_SCREENSHOT_FOLDER = "file:///sdcard/dolphin-emu/ScreenShots/";
+
+	private String mTitle;
+	private String mDescription;
+	private String mPath;
+	private String mGameId;
+	private String mScreenshotFolderPath;
+	private String mCompany;
+
+	private int mPlatform;
+	private int mCountry;
+
+	public Game(int platform, String title, String description, int country, String path, String gameId, String company)
+	{
+		mPlatform = platform;
+		mTitle = title;
+		mDescription = description;
+		mCountry = country;
+		mPath = path;
+		mGameId = gameId;
+		mCompany = company;
+		mScreenshotFolderPath = PATH_SCREENSHOT_FOLDER + getGameId() + "/";
+	}
+
+	public int getPlatform()
+	{
+		return mPlatform;
+	}
+
+	public String getTitle()
+	{
+		return mTitle;
+	}
+
+	public String getDescription()
+	{
+		return mDescription;
+	}
+
+	public String getCompany()
+	{
+		return mCompany;
+	}
+
+	public int getCountry()
+	{
+		return mCountry;
+	}
+
+	public String getPath()
+	{
+		return mPath;
+	}
+
+	public String getGameId()
+	{
+		return mGameId;
+	}
+
+	public String getScreenshotFolderPath()
+	{
+		return mScreenshotFolderPath;
+	}
+
+	public String getScreenPath()
+	{
+		// Count how many screenshots are available, so we can use the most recent one.
+		File screenshotFolder = new File(mScreenshotFolderPath.substring(mScreenshotFolderPath.indexOf('s') - 1));
+		int screenCount = 0;
+
+		if (screenshotFolder.isDirectory())
+		{
+			screenCount = screenshotFolder.list().length;
+		}
+
+		String screenPath = mScreenshotFolderPath
+				+ getGameId() + "-"
+				+ screenCount + ".png";
+
+		return screenPath;
+	}
+
+	public static ContentValues asContentValues(int platform, String title, String description, int country, String path, String gameId, String company)
+	{
+		ContentValues values = new ContentValues();
+
+		// TODO Come up with a way of finding the most recent screenshot that doesn't involve counting files
+		String screenshotFolderPath = PATH_SCREENSHOT_FOLDER + gameId + "/";
+
+		// Count how many screenshots are available, so we can use the most recent one.
+		File screenshotFolder = new File(screenshotFolderPath.substring(screenshotFolderPath.indexOf('s') - 1));
+		int screenCount = 0;
+
+		if (screenshotFolder.isDirectory())
+		{
+			screenCount = screenshotFolder.list().length;
+		}
+
+		String screenPath = screenshotFolderPath
+				+ gameId + "-"
+				+ screenCount + ".png";
+
+		values.put(GameDatabase.KEY_GAME_PLATFORM, platform);
+		values.put(GameDatabase.KEY_GAME_TITLE, title);
+		values.put(GameDatabase.KEY_GAME_DESCRIPTION, description);
+		values.put(GameDatabase.KEY_GAME_COUNTRY, company);
+		values.put(GameDatabase.KEY_GAME_PATH, path);
+		values.put(GameDatabase.KEY_GAME_ID, gameId);
+		values.put(GameDatabase.KEY_GAME_COMPANY, company);
+		values.put(GameDatabase.KEY_GAME_SCREENSHOT_PATH, screenPath);
+
+		return values;
+	}
+
+	public static Game fromCursor(Cursor cursor)
+	{
+		return new Game(cursor.getInt(GameDatabase.GAME_COLUMN_PLATFORM),
+				cursor.getString(GameDatabase.GAME_COLUMN_TITLE),
+				cursor.getString(GameDatabase.GAME_COLUMN_DESCRIPTION),
+				cursor.getInt(GameDatabase.GAME_COLUMN_COUNTRY),
+				cursor.getString(GameDatabase.GAME_COLUMN_PATH),
+				cursor.getString(GameDatabase.GAME_COLUMN_GAME_ID),
+				cursor.getString(GameDatabase.GAME_COLUMN_COMPANY));
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java
new file mode 100644
index 0000000000..6604717d92
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java
@@ -0,0 +1,240 @@
+package org.dolphinemu.dolphinemu.model;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A helper class that provides several utilities simplifying interaction with
+ * the SQLite database.
+ */
+public final class GameDatabase extends SQLiteOpenHelper
+{
+	private static final int DB_VERSION = 1;
+
+	public static final int COLUMN_DB_ID = 0;
+
+	public static final int GAME_COLUMN_PATH = 1;
+	public static final int GAME_COLUMN_PLATFORM = 2;
+	public static final int GAME_COLUMN_TITLE = 3;
+	public static final int GAME_COLUMN_DESCRIPTION = 4;
+	public static final int GAME_COLUMN_COUNTRY = 5;
+	public static final int GAME_COLUMN_GAME_ID = 6;
+	public static final int GAME_COLUMN_COMPANY = 7;
+	public static final int GAME_COLUMN_SCREENSHOT_PATH = 8;
+
+	public static final int FOLDER_COLUMN_PATH = 1;
+
+	public static final String KEY_DB_ID = "_id";
+
+	public static final String KEY_GAME_PATH = "path";
+	public static final String KEY_GAME_PLATFORM = "platform";
+	public static final String KEY_GAME_TITLE = "title";
+	public static final String KEY_GAME_DESCRIPTION = "description";
+	public static final String KEY_GAME_COUNTRY = "country";
+	public static final String KEY_GAME_ID = "game_id";
+	public static final String KEY_GAME_COMPANY = "company";
+	public static final String KEY_GAME_SCREENSHOT_PATH = "screenshot_path";
+
+	public static final String KEY_FOLDER_PATH = "path";
+
+	public static final String TABLE_NAME_FOLDERS = "folders";
+	public static final String TABLE_NAME_GAMES = "games";
+
+	private static final String TYPE_PRIMARY = " INTEGER PRIMARY KEY";
+	private static final String TYPE_INTEGER = " INTEGER";
+	private static final String TYPE_STRING = " TEXT";
+
+	private static final String CONSTRAINT_UNIQUE = " UNIQUE";
+
+	private static final String SEPARATOR = ", ";
+
+	private static final String SQL_CREATE_GAMES = "CREATE TABLE " + TABLE_NAME_GAMES + "("
+			+ KEY_DB_ID + TYPE_PRIMARY + SEPARATOR
+			+ KEY_GAME_PATH + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_PLATFORM + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_TITLE + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_DESCRIPTION + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_COUNTRY + TYPE_INTEGER + SEPARATOR
+			+ KEY_GAME_ID + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_COMPANY + TYPE_STRING + SEPARATOR
+			+ KEY_GAME_SCREENSHOT_PATH + TYPE_STRING + ")";
+
+	private static final String SQL_CREATE_FOLDERS = "CREATE TABLE " + TABLE_NAME_FOLDERS + "("
+			+ KEY_DB_ID + TYPE_PRIMARY + SEPARATOR
+			+ KEY_FOLDER_PATH + TYPE_STRING + CONSTRAINT_UNIQUE + ")";
+
+	private static final String SQL_DELETE_GAMES = "DROP TABLE IF EXISTS " + TABLE_NAME_GAMES;
+
+	public GameDatabase(Context context)
+	{
+		// Superclass constructor builds a database or uses an existing one.
+		super(context, "games.db", null, DB_VERSION);
+	}
+
+	@Override
+	public void onCreate(SQLiteDatabase database)
+	{
+		Log.d("DolphinEmu", "GameDatabase - Creating database...");
+
+		Log.v("DolphinEmu", "Executing SQL: " + SQL_CREATE_GAMES);
+		database.execSQL(SQL_CREATE_GAMES);
+
+		Log.v("DolphinEmu", "Executing SQL: " + SQL_CREATE_FOLDERS);
+		database.execSQL(SQL_CREATE_FOLDERS);
+	}
+
+	@Override
+	public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion)
+	{
+		Log.i("DolphinEmu", "Upgrading database from schema version " + oldVersion + " to " + newVersion);
+
+		Log.v("DolphinEmu", "Executing SQL: " + SQL_DELETE_GAMES);
+		database.execSQL(SQL_DELETE_GAMES);
+
+		Log.v("DolphinEmu", "Executing SQL: " + SQL_CREATE_GAMES);
+		database.execSQL(SQL_CREATE_GAMES);
+
+		Log.v("DolphinEmu", "Re-scanning library with new schema.");
+		scanLibrary(database);
+	}
+
+	public void scanLibrary(SQLiteDatabase database)
+	{
+		// Before scanning known folders, go through the game table and remove any entries for which the file itself is missing.
+		Cursor fileCursor = database.query(TABLE_NAME_GAMES,
+				null,    // Get all columns.
+				null,    // Get all rows.
+				null,
+				null,    // No grouping.
+				null,
+				null);    // Order of games is irrelevant.
+
+		// Possibly overly defensive, but ensures that moveToNext() does not skip a row.
+		fileCursor.moveToPosition(-1);
+
+		while (fileCursor.moveToNext())
+		{
+			String gamePath = fileCursor.getString(GAME_COLUMN_PATH);
+			File game = new File(gamePath);
+
+			if (!game.exists())
+			{
+				Log.e("DolphinEmu", "Game file no longer exists. Removing from the library: " + gamePath);
+				database.delete(TABLE_NAME_GAMES,
+						KEY_DB_ID + " = ?",
+						new String[]{Long.toString(fileCursor.getLong(COLUMN_DB_ID))});
+			}
+		}
+
+
+		// Get a cursor listing all the folders the user has added to the library.
+		Cursor folderCursor = database.query(TABLE_NAME_FOLDERS,
+				null,    // Get all columns.
+				null,    // Get all rows.
+				null,
+				null,    // No grouping.
+				null,
+				null);    // Order of folders is irrelevant.
+
+		Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
+
+		// Possibly overly defensive, but ensures that moveToNext() does not skip a row.
+		folderCursor.moveToPosition(-1);
+
+		// Iterate through all results of the DB query (i.e. all folders in the library.)
+		while (folderCursor.moveToNext())
+		{
+
+			String folderPath = folderCursor.getString(FOLDER_COLUMN_PATH);
+			File folder = new File(folderPath);
+
+			Log.i("DolphinEmu", "Reading files from library folder: " + folderPath);
+
+			// Iterate through every file in the folder.
+			File[] children = folder.listFiles();
+
+			if (children != null)
+			{
+				for (File file : children)
+				{
+					if (!file.isHidden() && !file.isDirectory())
+					{
+						String filePath = file.getPath();
+
+						int extensionStart = filePath.lastIndexOf('.');
+						if (extensionStart > 0)
+						{
+							String fileExtension = filePath.substring(extensionStart);
+
+							// Check that the file has an extension we care about before trying to read out of it.
+							if (allowedExtensions.contains(fileExtension))
+							{
+								String name = NativeLibrary.GetTitle(filePath);
+
+								// If the game's title field is empty, use the filename.
+								if (name.isEmpty())
+								{
+									name = filePath.substring(filePath.lastIndexOf("/") + 1);
+								}
+
+								ContentValues game = Game.asContentValues(NativeLibrary.GetPlatform(filePath),
+										name,
+										NativeLibrary.GetDescription(filePath).replace("\n", " "),
+										NativeLibrary.GetCountry(filePath),
+										filePath,
+										NativeLibrary.GetGameId(filePath),
+										NativeLibrary.GetCompany(filePath));
+
+								// Try to update an existing game first.
+								int rowsMatched = database.update(TABLE_NAME_GAMES,    // Which table to update.
+										game,                                            // The values to fill the row with.
+										KEY_GAME_ID + " = ?",                            // The WHERE clause used to find the right row.
+										new String[]{game.getAsString(KEY_GAME_ID)});    // The ? in WHERE clause is replaced with this,
+								// which is provided as an array because there
+								// could potentially be more than one argument.
+
+								// If update fails, insert a new game instead.
+								if (rowsMatched == 0)
+								{
+									Log.v("DolphinEmu", "Adding game: " + game.getAsString(KEY_GAME_TITLE));
+									database.insert(TABLE_NAME_GAMES, null, game);
+								}
+								else
+								{
+									Log.v("DolphinEmu", "Updated game: " + game.getAsString(KEY_GAME_TITLE));
+								}
+							}
+						}
+					}
+				}
+			}
+			// If the folder is empty because it no longer exists, remove it from the library.
+			else if (!folder.exists())
+			{
+				Log.e("DolphinEmu", "Folder no longer exists. Removing from the library: " + folderPath);
+				database.delete(TABLE_NAME_FOLDERS,
+						KEY_DB_ID + " = ?",
+						new String[]{Long.toString(folderCursor.getLong(COLUMN_DB_ID))});
+			}
+			else
+			{
+				Log.e("DolphinEmu", "Folder contains no games: " + folderPath);
+			}
+		}
+
+
+		folderCursor.close();
+		database.close();
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java
new file mode 100644
index 0000000000..dd83851a91
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameProvider.java
@@ -0,0 +1,149 @@
+package org.dolphinemu.dolphinemu.model;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.BuildConfig;
+
+/**
+ * Provides an interface allowing Activities to interact with the SQLite database.
+ * CRUD methods in this class can be called by Activities using getContentResolver().
+ */
+public final class GameProvider extends ContentProvider
+{
+	public static final String REFRESH_LIBRARY = "refresh";
+
+	public static final String AUTHORITY = "content://" + BuildConfig.APPLICATION_ID + ".provider";
+	public static final Uri URI_FOLDER = Uri.parse(AUTHORITY + "/" + GameDatabase.TABLE_NAME_FOLDERS + "/");
+	public static final Uri URI_GAME = Uri.parse(AUTHORITY + "/" + GameDatabase.TABLE_NAME_GAMES + "/");
+	public static final Uri URI_REFRESH = Uri.parse(AUTHORITY + "/" + REFRESH_LIBRARY + "/");
+
+	public static final String MIME_TYPE_FOLDER = "vnd.android.cursor.item/vnd.dolphin.folder";
+	public static final String MIME_TYPE_GAME = "vnd.android.cursor.item/vnd.dolphin.game";
+
+
+	private GameDatabase mDbHelper;
+
+	@Override
+	public boolean onCreate()
+	{
+		Log.i("DolphinEmu", "Creating Content Provider...");
+
+		mDbHelper = new GameDatabase(getContext());
+
+		return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
+	{
+		Log.i("DolphinEmu", "Querying URI: " + uri);
+
+		SQLiteDatabase db = mDbHelper.getReadableDatabase();
+
+		String table = uri.getLastPathSegment();
+
+		if (table == null)
+		{
+			Log.e("DolphinEmu", "Badly formatted URI: " + uri);
+			return null;
+		}
+
+		Cursor cursor = db.query(table, projection, selection, selectionArgs, null, null, sortOrder);
+		cursor.setNotificationUri(getContext().getContentResolver(), uri);
+
+		return cursor;
+	}
+
+	@Override
+	public String getType(Uri uri)
+	{
+		Log.v("DolphinEmu", "Getting MIME type for URI: " + uri);
+		String lastSegment = uri.getLastPathSegment();
+
+		if (lastSegment == null)
+		{
+			Log.e("DolphinEmu", "Badly formatted URI: " + uri);
+			return null;
+		}
+
+		if (lastSegment.equals(GameDatabase.TABLE_NAME_FOLDERS))
+		{
+			return MIME_TYPE_FOLDER;
+		}
+		else if (lastSegment.equals(GameDatabase.TABLE_NAME_GAMES))
+		{
+			return MIME_TYPE_GAME;
+		}
+
+		Log.e("DolphinEmu", "Unknown MIME type for URI: " + uri);
+		return null;
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values)
+	{
+		Log.i("DolphinEmu", "Inserting row at URI: " + uri);
+
+		SQLiteDatabase database = mDbHelper.getWritableDatabase();
+		String table = uri.getLastPathSegment();
+
+		long id = -1;
+
+		if (table != null)
+		{
+			if (table.equals(REFRESH_LIBRARY))
+			{
+				Log.i("DolphinEmu", "URI specified table REFRESH_LIBRARY. No insertion necessary; refreshing library contents...");
+				mDbHelper.scanLibrary(database);
+				return uri;
+			}
+
+			id = database.insertWithOnConflict(table, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+
+			// If insertion was successful...
+			if (id > 0)
+			{
+				// If we just added a folder, add its contents to the game list.
+				if (table.equals(GameDatabase.TABLE_NAME_FOLDERS))
+				{
+					mDbHelper.scanLibrary(database);
+				}
+
+				// Notify the UI that its contents should be refreshed.
+				getContext().getContentResolver().notifyChange(uri, null);
+				uri = Uri.withAppendedPath(uri, Long.toString(id));
+			}
+			else
+			{
+				Log.e("DolphinEmu", "Row already exists: " + uri + " id: " + id);
+			}
+		}
+		else
+		{
+			Log.e("DolphinEmu", "Badly formatted URI: " + uri);
+		}
+
+		database.close();
+
+		return uri;
+	}
+
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs)
+	{
+		Log.e("DolphinEmu", "Delete operations unsupported. URI: " + uri);
+		return 0;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs)
+	{
+		Log.e("DolphinEmu", "Update operations unsupported. URI: " + uri);
+		return 0;
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
new file mode 100644
index 0000000000..fc1a75cd0f
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -0,0 +1,290 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.overlay;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceManager;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.MotionEvent;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.View.OnTouchListener;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.NativeLibrary.ButtonState;
+import org.dolphinemu.dolphinemu.NativeLibrary.ButtonType;
+import org.dolphinemu.dolphinemu.R;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Draws the interactive input overlay on top of the
+ * {@link NativeGLSurfaceView} that is rendering emulation.
+ */
+public final class InputOverlay extends SurfaceView implements OnTouchListener
+{
+	private final Set<InputOverlayDrawableButton> overlayButtons = new HashSet<InputOverlayDrawableButton>();
+	private final Set<InputOverlayDrawableJoystick> overlayJoysticks = new HashSet<InputOverlayDrawableJoystick>();
+
+	/**
+	 * Resizes a {@link Bitmap} by a given scale factor
+	 * 
+	 * @param context The current {@link Context}
+	 * @param bitmap  The {@link Bitmap} to scale.
+	 * @param scale   The scale factor for the bitmap.
+	 * 
+	 * @return The scaled {@link Bitmap}
+	 */
+	public static Bitmap resizeBitmap(Context context, Bitmap bitmap, float scale)
+	{
+		// Retrieve screen dimensions.
+		DisplayMetrics dm = context.getResources().getDisplayMetrics();
+
+		Bitmap bitmapResized = Bitmap.createScaledBitmap(bitmap,
+				(int)(dm.heightPixels * scale),
+				(int)(dm.heightPixels * scale),
+				true);
+		return bitmapResized;
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param context The current {@link Context}.
+	 * @param attrs   {@link AttributeSet} for parsing XML attributes.
+	 */
+	public InputOverlay(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+
+		// Add all the overlay items to the HashSet.
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_a, ButtonType.BUTTON_A));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_b, ButtonType.BUTTON_B));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_x, ButtonType.BUTTON_X));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_y, ButtonType.BUTTON_Y));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_z, ButtonType.BUTTON_Z));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_start, ButtonType.BUTTON_START));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_l, ButtonType.TRIGGER_L));
+		overlayButtons.add(initializeOverlayButton(context, R.drawable.gcpad_r, ButtonType.TRIGGER_R));
+		overlayJoysticks.add(initializeOverlayJoystick(context,
+				R.drawable.gcpad_joystick_range, R.drawable.gcpad_joystick,
+				ButtonType.STICK_MAIN));
+
+		// Set the on touch listener.
+		setOnTouchListener(this);
+
+		// Force draw
+		setWillNotDraw(false);
+
+		// Request focus for the overlay so it has priority on presses.
+		requestFocus();
+	}
+
+	@Override
+	public void draw(Canvas canvas)
+	{
+		super.draw(canvas);
+
+		for (InputOverlayDrawableButton button : overlayButtons)
+		{
+			button.draw(canvas);
+		}
+
+		for (InputOverlayDrawableJoystick joystick: overlayJoysticks)
+		{
+			joystick.draw(canvas);
+		}
+	}
+
+	@Override
+	public boolean onTouch(View v, MotionEvent event)
+	{
+		int pointerIndex = event.getActionIndex();
+
+		for (InputOverlayDrawableButton button : overlayButtons)
+		{
+			// Determine the button state to apply based on the MotionEvent action flag.
+			switch(event.getAction() & MotionEvent.ACTION_MASK)
+			{
+			case MotionEvent.ACTION_DOWN:
+			case MotionEvent.ACTION_POINTER_DOWN:
+			case MotionEvent.ACTION_MOVE:
+				// If a pointer enters the bounds of a button, press that button.
+				if (button.getBounds().contains((int)event.getX(pointerIndex), (int)event.getY(pointerIndex)))
+					NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, button.getId(), ButtonState.PRESSED);
+				break;
+			case MotionEvent.ACTION_UP:
+			case MotionEvent.ACTION_POINTER_UP:
+				// If a pointer ends, release the button it was pressing.
+				if (button.getBounds().contains((int)event.getX(pointerIndex), (int)event.getY(pointerIndex)))
+ 					NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, button.getId(), ButtonState.RELEASED);
+				break;
+			}
+		}
+
+
+		for (InputOverlayDrawableJoystick joystick : overlayJoysticks)
+		{
+			joystick.TrackEvent(event);
+			int[] axisIDs = joystick.getAxisIDs();
+			float[] axises = joystick.getAxisValues();
+
+			for (int i = 0; i < 4; i++)
+				NativeLibrary.onGamePadMoveEvent(NativeLibrary.TouchScreenDevice, axisIDs[i], axises[i]);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Initializes an InputOverlayDrawableButton, given by resId, with all of the
+	 * parameters set for it to be properly shown on the InputOverlay. 
+	 * <p>
+	 * This works due to the way the X and Y coordinates are stored within
+	 * the {@link SharedPreferences}.
+	 * <p>
+	 * In the input overlay configuration menu,
+	 * once a touch event begins and then ends (ie. Organizing the buttons to one's own liking for the overlay).
+	 * the X and Y coordinates of the button at the END of its touch event
+	 * (when you remove your finger/stylus from the touchscreen) are then stored
+	 * within a SharedPreferences instance so that those values can be retrieved here.
+	 * <p>
+	 * This has a few benefits over the conventional way of storing the values
+	 * (ie. within the Dolphin ini file).
+	 * <ul>
+	 *     <li>No native calls</li>
+	 *     <li>Keeps Android-only values inside the Android environment</li>
+	 * </ul>
+	 * <p>
+	 * Technically no modifications should need to be performed on the returned
+	 * InputOverlayDrawableButton. Simply add it to the HashSet of overlay items and wait
+	 * for Android to call the onDraw method.
+	 * 
+	 * @param context  The current {@link Context}.
+	 * @param resId    The resource ID of the {@link Drawable} to get the {@link Bitmap} of.
+	 * @param buttonId Identifier for determining what type of button the initialized InputOverlayDrawableButton represents.
+	 * 
+	 * @return An {@link InputOverlayDrawableButton} with the correct drawing bounds set.
+	 *
+	 */
+	private static InputOverlayDrawableButton initializeOverlayButton(Context context, int resId, int buttonId)
+	{
+		// Resources handle for fetching the initial Drawable resource.
+		final Resources res = context.getResources();
+
+		// SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableButton.
+		final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+		// Decide scale based on button ID
+		float scale;
+		float overlaySize = sPrefs.getInt("controls_size", 25);
+		overlaySize += 25;
+		overlaySize /= 50;
+
+		switch (resId)
+		{
+		case R.drawable.gcpad_b:
+			scale = 0.13f * overlaySize;
+			break;
+		case R.drawable.gcpad_x:
+		case R.drawable.gcpad_y:
+			scale = 0.18f * overlaySize;
+			break;
+		case R.drawable.gcpad_start:
+			scale = 0.12f * overlaySize;
+			break;
+		default:
+			scale = 0.20f * overlaySize;
+			break;
+		}
+
+		// Initialize the InputOverlayDrawableButton.
+		final Bitmap bitmap = resizeBitmap(context, BitmapFactory.decodeResource(res, resId), scale);
+		final InputOverlayDrawableButton overlayDrawable = new InputOverlayDrawableButton(res, bitmap, buttonId);
+
+		// String ID of the Drawable. This is what is passed into SharedPreferences
+		// to check whether or not a value has been set.
+		final String drawableId = res.getResourceEntryName(resId);
+
+		// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
+		// These were set in the input overlay configuration menu.
+		int drawableX = (int) sPrefs.getFloat(drawableId+"-X", 0f);
+		int drawableY = (int) sPrefs.getFloat(drawableId+"-Y", 0f);
+
+		// Intrinsic width and height of the InputOverlayDrawableButton.
+		// For any who may not know, intrinsic width/height
+		// are the original unmodified width and height of the image.
+		int intrinWidth = overlayDrawable.getIntrinsicWidth();
+		int intrinHeight = overlayDrawable.getIntrinsicHeight();
+
+		// Now set the bounds for the InputOverlayDrawableButton.
+		// This will dictate where on the screen (and the what the size) the InputOverlayDrawableButton will be.
+		overlayDrawable.setBounds(drawableX, drawableY, drawableX+intrinWidth, drawableY+intrinHeight);
+
+		return overlayDrawable;
+	}
+
+	/**
+	 * Initializes an {@link InputOverlayDrawableJoystick} 
+	 * 
+	 * @param context   The current {@link Context}
+	 * @param resOuter  Resource ID for the outer image of the joystick (the static image that shows the circular bounds).
+	 * @param resInner  Resource ID for the inner image of the joystick (the one you actually move around).
+	 * @param joystick    Identifier for which joystick this is.
+	 * 
+	 * @return the initialized {@link InputOverlayDrawableJoystick}.
+	 */
+	private static InputOverlayDrawableJoystick initializeOverlayJoystick(Context context, int resOuter, int resInner, int joystick)
+	{
+		// Resources handle for fetching the initial Drawable resource.
+		final Resources res = context.getResources();
+
+		// SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableJoystick.
+		final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+		// Initialize the InputOverlayDrawableJoystick.
+		float overlaySize = sPrefs.getInt("controls_size", 20);
+		overlaySize += 30;
+		overlaySize /= 50;
+		final Bitmap bitmapOuter = resizeBitmap(context, BitmapFactory.decodeResource(res, resOuter), 0.30f * overlaySize);
+		final Bitmap bitmapInner = BitmapFactory.decodeResource(res, resInner);
+
+		// String ID of the Drawable. This is what is passed into SharedPreferences
+		// to check whether or not a value has been set.
+		final String drawableId = res.getResourceEntryName(resOuter);
+
+		// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
+		// These were set in the input overlay configuration menu.
+		int drawableX = (int) sPrefs.getFloat(drawableId+"-X", 0f);
+		int drawableY = (int) sPrefs.getFloat(drawableId+"-Y", 0f);
+
+		// Now set the bounds for the InputOverlayDrawableJoystick.
+		// This will dictate where on the screen (and the what the size) the InputOverlayDrawableJoystick will be.
+		int outerSize = bitmapOuter.getWidth();
+		Rect outerRect = new Rect(drawableX, drawableY, drawableX + outerSize, drawableY + outerSize);
+		Rect innerRect = new Rect(0, 0, outerSize / 4, outerSize / 4);
+
+		final InputOverlayDrawableJoystick overlayDrawable
+				= new InputOverlayDrawableJoystick(res,
+					bitmapOuter, bitmapInner,
+					outerRect, innerRect,
+					joystick);
+
+
+		return overlayDrawable;
+	}
+	
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
new file mode 100644
index 0000000000..e02e352e56
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.overlay;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+
+/**
+ * Custom {@link BitmapDrawable} that is capable
+ * of storing it's own ID.
+ */
+public final class InputOverlayDrawableButton extends BitmapDrawable
+{
+	// The ID identifying what type of button this Drawable represents.
+	private int buttonType;
+
+	/**
+	 * Constructor
+	 * 
+	 * @param res         {@link Resources} instance.
+	 * @param bitmap      {@link Bitmap} to use with this Drawable.
+	 * @param buttonType  Identifier for this type of button.
+	 */
+	public InputOverlayDrawableButton(Resources res, Bitmap bitmap, int buttonType)
+	{
+		super(res, bitmap);
+
+		this.buttonType = buttonType;
+	}
+
+	/**
+	 * Gets this InputOverlayDrawableButton's button ID.
+	 * 
+	 * @return this InputOverlayDrawableButton's button ID.
+	 */
+	public int getId()
+	{
+		return buttonType;
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
new file mode 100644
index 0000000000..d4082e4289
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.overlay;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.view.MotionEvent;
+
+/**
+ * Custom {@link BitmapDrawable} that is capable
+ * of storing it's own ID.
+ */
+public final class InputOverlayDrawableJoystick extends BitmapDrawable
+{
+	private final int[] axisIDs = {0, 0, 0, 0};
+	private final float[] axises = {0f, 0f};
+	private final BitmapDrawable ringInner;
+	private int trackId = -1;
+
+	/**
+	 * Constructor
+	 *
+	 * @param res         {@link Resources} instance.
+	 * @param bitmapOuter {@link Bitmap} which represents the outer non-movable part of the joystick.
+	 * @param bitmapInner {@link Bitmap} which represents the inner movable part of the joystick.
+	 * @param rectOuter   {@link Rect} which represents the outer joystick bounds.
+	 * @param rectInner   {@link Rect} which represents the inner joystick bounds.
+	 * @param joystick    Identifier for which joystick this is.
+	 */
+	public InputOverlayDrawableJoystick(Resources res,
+	                                    Bitmap bitmapOuter, Bitmap bitmapInner,
+	                                    Rect rectOuter, Rect rectInner,
+	                                    int joystick)
+	{
+		super(res, bitmapOuter);
+		this.setBounds(rectOuter);
+
+		this.ringInner = new BitmapDrawable(res, bitmapInner);
+		this.ringInner.setBounds(rectInner);
+		SetInnerBounds();
+		this.axisIDs[0] = joystick + 1;
+		this.axisIDs[1] = joystick + 2;
+		this.axisIDs[2] = joystick + 3;
+		this.axisIDs[3] = joystick + 4;
+	}
+
+	@Override
+	public void draw(Canvas canvas)
+	{
+		super.draw(canvas);
+
+		ringInner.draw(canvas);
+	}
+
+	public void TrackEvent(MotionEvent event)
+	{
+		int pointerIndex = event.getActionIndex();
+
+		switch(event.getAction() & MotionEvent.ACTION_MASK)
+		{
+		case MotionEvent.ACTION_DOWN:
+		case MotionEvent.ACTION_POINTER_DOWN:
+			if (getBounds().contains((int)event.getX(pointerIndex), (int)event.getY(pointerIndex)))
+				trackId = event.getPointerId(pointerIndex);
+			break;
+		case MotionEvent.ACTION_UP:
+		case MotionEvent.ACTION_POINTER_UP:
+			if (trackId == event.getPointerId(pointerIndex))
+			{
+				axises[0] = axises[1] = 0.0f;
+				SetInnerBounds();
+				trackId = -1;
+			}
+			break;
+		}
+
+		if (trackId == -1)
+			return;
+
+		for (int i = 0; i < event.getPointerCount(); i++)
+		{
+			if (trackId == event.getPointerId(i))
+			{
+				float touchX = event.getX(i);
+				float touchY = event.getY(i);
+				float maxY = getBounds().bottom;
+				float maxX = getBounds().right;
+				touchX -= getBounds().centerX();
+				maxX -= getBounds().centerX();
+				touchY -= getBounds().centerY();
+				maxY -= getBounds().centerY();
+				final float AxisX = touchX / maxX;
+				final float AxisY = touchY / maxY;
+				axises[0] = AxisY;
+				axises[1] = AxisX;
+
+				SetInnerBounds();
+			}
+		}
+	}
+
+	public float[] getAxisValues()
+	{
+		float[] joyaxises = {0f, 0f, 0f, 0f};
+		joyaxises[1] = Math.min(axises[0], 1.0f);
+		joyaxises[0] = Math.min(axises[0], 0.0f);
+		joyaxises[3] = Math.min(axises[1], 1.0f);
+		joyaxises[2] = Math.min(axises[1], 0.0f);
+		return joyaxises;
+	}
+
+	public int[] getAxisIDs()
+	{
+		return axisIDs;
+	}
+
+	private void SetInnerBounds()
+	{
+		float floatX = this.getBounds().centerX();
+		float floatY = this.getBounds().centerY();
+		floatY += axises[0] * (this.getBounds().height() / 2);
+		floatX += axises[1] * (this.getBounds().width() / 2);
+		int X = (int)(floatX);
+		int Y = (int)(floatY);
+		int width = this.ringInner.getBounds().width() / 2;
+		int height = this.ringInner.getBounds().height() / 2;
+		this.ringInner.setBounds(X - width, Y - height,
+				X + width,  Y + height);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java
new file mode 100644
index 0000000000..1f6f94bc8a
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright 2014 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.services;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.utils.UserPreferences;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * A service that spawns its own thread in order to copy several binary and shader files
+ * from the Dolphin APK to the external file system.
+ */
+public final class AssetCopyService extends IntentService
+{
+	private static final String TAG = "DolphinEmulator";
+
+	public AssetCopyService()
+	{
+		// Superclass constructor is called to name the thread on which this service executes.
+		super("AssetCopyService");
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent)
+	{
+		String BaseDir = NativeLibrary.GetUserDirectory();
+		String ConfigDir = BaseDir + File.separator + "Config";
+		String GCDir = BaseDir + File.separator + "GC";
+
+		// Copy assets if needed
+		File file = new File(GCDir + File.separator + "font_sjis.bin");
+		if(!file.exists())
+		{
+			NativeLibrary.CreateUserFolders();
+			copyAsset("dsp_coef.bin", GCDir + File.separator + "dsp_coef.bin");
+			copyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin");
+			copyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin");
+			copyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin");
+			copyAssetFolder("Shaders", BaseDir + File.separator + "Shaders");
+		}
+		else
+		{
+			Log.v(TAG, "Skipping asset copy operation.");
+		}
+
+		// Always copy over the GCPad config in case of change or corruption.
+		// Not a user configurable file.
+		copyAsset("GCPadNew.ini", ConfigDir + File.separator + "GCPadNew.ini");
+
+		// Load the configuration keys set in the Dolphin ini and gfx ini files
+		// into the application's shared preferences.
+		UserPreferences.LoadIniToPrefs(this);
+
+		// Record the fact that we've done this before, so we don't do it on every launch.
+		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+		SharedPreferences.Editor editor = preferences.edit();
+
+		editor.putBoolean("assetsCopied", true);
+		editor.commit();
+	}
+
+	private void copyAsset(String asset, String output)
+	{
+		Log.v(TAG, "Copying " + asset + " to " + output);
+		InputStream in = null;
+		OutputStream out = null;
+
+		try
+		{
+			in = getAssets().open(asset);
+			out = new FileOutputStream(output);
+			copyFile(in, out);
+			in.close();
+			out.close();
+		}
+		catch (IOException e)
+		{
+			Log.e(TAG, "Failed to copy asset file: " + asset, e);
+		}
+	}
+
+	private void copyAssetFolder(String assetFolder, String outputFolder)
+	{
+		Log.v(TAG, "Copying " + assetFolder + " to " + outputFolder);
+
+		try
+		{
+			for (String file : getAssets().list(assetFolder))
+			{
+				copyAsset(assetFolder + File.separator + file, outputFolder + File.separator + file);
+			}
+		}
+		catch (IOException e)
+		{
+			Log.e(TAG, "Failed to copy asset folder: " + assetFolder, e);
+		}
+	}
+
+	private void copyFile(InputStream in, OutputStream out) throws IOException
+	{
+		byte[] buffer = new byte[1024];
+		int read;
+
+		while ((read = in.read(buffer)) != -1)
+		{
+			out.write(buffer, 0, read);
+		}
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SettingsSaveService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SettingsSaveService.java
new file mode 100644
index 0000000000..1cf018ed16
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SettingsSaveService.java
@@ -0,0 +1,30 @@
+package org.dolphinemu.dolphinemu.services;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.utils.UserPreferences;
+
+/**
+ * IntentServices, unlike regular services, inherently run on a background thread.
+ * This IntentService saves all the options the user set in the Java-based UI into
+ * INI files the native code can read.
+ */
+public final class SettingsSaveService extends IntentService
+{
+	private static final String TAG = "DolphinEmulator";
+
+	public SettingsSaveService()
+	{
+		super("SettingsSaveService");
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent)
+	{
+		Log.v(TAG, "Saving settings to INI files...");
+		UserPreferences.SavePrefsToIni(this);
+		Log.v(TAG, "Save successful.");
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CPUHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CPUHelper.java
new file mode 100644
index 0000000000..30be6e2213
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CPUHelper.java
@@ -0,0 +1,395 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.dolphinemu.dolphinemu.R;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+/**
+ * Utility class for retrieving information
+ * from a device's CPU.
+ */
+public final class CPUHelper
+{
+	private int revision;
+	private int variant;
+	private int numCores;
+	private String implementerID = "N/A";
+	private String part = "N/A";
+	private String hardware = "N/A";
+	private String processorInfo = "N/A";
+	private String features = "N/A";
+
+	private final Context ctx;
+
+	/**
+	 * Constructor
+	 * 
+	 * @param ctx The current {@link Context}.
+	 */
+	public CPUHelper(Context ctx)
+	{
+		this.ctx = ctx;
+
+		try
+		{
+			// TODO: Should do other architectures as well (x86 and MIPS).
+			// Can do differentiating between platforms by using
+			// android.os.Build.CPU_ABI.
+			//
+			// CPU_ABI.contains("armeabi") == get ARM info.
+			// CPU_ABI.contains("x86") == get x86 info.
+			// CPU_ABI.contains("mips") == get MIPS info.
+			//
+			// However additional testing should be done across devices,
+			// I highly doubt /proc/cpuinfo retains the same formatting
+			// on different architectures.
+			//
+			// If push comes to shove, we can simply spit out the cpuinfo
+			// contents. I would like to avoid this if possible, however.
+
+			if (Build.CPU_ABI.contains("arm"))
+			{
+				getARMInfo();
+			}
+			else
+			{
+				Log.e("CPUHelper", "CPU architecture not supported yet.");
+			}
+		}
+		catch (IOException ioe)
+		{
+			Log.e("CPUHelper", ioe.getMessage());
+		}
+	}
+
+	/**
+	 * Gets the revision number of the CPU.
+	 * 
+	 * @return the revision number of the CPU.
+	 */
+	public int getRevision()
+	{
+		return revision;
+	}
+
+
+	/**
+	 * Gets the CPU variant number.
+	 * 
+	 * @return the CPU variant number.
+	 */
+	public int getVariant()
+	{
+		return variant;
+	}
+
+	/**
+	 * Gets the total number of cores in the CPU.
+	 * 
+	 * @return the total number of cores in the CPU.
+	 */
+	public int getNumCores()
+	{
+		return numCores;
+	}
+
+	/**
+	 * Gets the name of the implementer of the CPU.
+	 * 
+	 * @return the name of the implementer of the CPU.
+	 */
+	public String getImplementer()
+	{
+		return implementerID;
+	}
+
+	/**
+	 * Gets the specific processor type of the CPU.
+	 * 
+	 * @return the specific processor type.
+	 */
+	public String getProcessorType()
+	{
+		return part;
+	}
+
+	/**
+	 * Gets the internal name of the hardware.
+	 * 
+	 * @return the internal name of the hardware.
+	 */
+	public String getHardware()
+	{
+		return hardware;
+	}
+
+	/**
+	 * Get the processor info string.
+	 * 
+	 * @return the processor info string.
+	 */
+	public String getProcessorInfo()
+	{
+		return processorInfo;
+	}
+
+	/**
+	 * Gets the features supported by the CPU.
+	 * 
+	 * @return the features supported by the CPU.
+	 */
+	public String getFeatures()
+	{
+		return features;
+	}
+
+	/**
+	 * Whether or not this CPU is using the ARM architecture.
+	 * 
+	 * @return true if this CPU uses the ARM architecture; false otherwise.
+	 */
+	public static boolean isARM()
+	{
+		return Build.CPU_ABI.contains("arm");
+	}
+
+	/**
+	 * Whether or not this CPU is using the ARM64 architecture.
+	 *
+	 * @return true if this CPU uses the ARM64 architecture; false otherwise.
+	 */
+	public static boolean isARM64() { return Build.CPU_ABI.contains("arm64"); }
+
+	/**
+	 * Whether or not this CPU is using the x86 architecture.
+	 * 
+	 * @return true if this CPU uses the x86 architecture; false otherwise.
+	 */
+	public static boolean isX86()
+	{
+		return Build.CPU_ABI.contains("x86");
+	}
+
+	/**
+	 * Whether or not this CPU is using the MIPS architecture.
+	 * 
+	 * @return true if this CPU uses the MIPS architecture; false otherwise.
+	 */
+	public static boolean isMIPS()
+	{
+		return Build.CPU_ABI.contains("mips");
+	}
+
+	// Retrieves information for ARM CPUs.
+	private void getARMInfo() throws IOException
+	{
+		File info = new File("/proc/cpuinfo");
+		if (info.exists())
+		{
+			BufferedReader br = new BufferedReader(new FileReader(info));
+
+			String line;
+			while ((line = br.readLine()) != null)
+			{
+				if (line.contains("Processor\t:"))
+				{
+					this.processorInfo = parseLine(line);
+				}
+				else if (line.contains("Hardware\t:"))
+				{
+					this.hardware = parseLine(line);
+				}
+				else if (line.contains("Features\t:"))
+				{
+					this.features = parseLine(line);
+				}
+				else if (line.contains("CPU implementer\t:"))
+				{
+					this.implementerID = parseArmID(Integer.decode(parseLine(line)));
+				}
+				else if (line.contains("CPU part\t:"))
+				{
+					this.part = parseArmPartNumber(Integer.decode(parseLine(line)));
+				}
+				else if (line.contains("CPU revision\t:"))
+				{
+					this.revision = Integer.decode(parseLine(line));
+				}
+				else if (line.contains("CPU variant\t:"))
+				{
+					this.variant = Integer.decode(parseLine(line));
+				}
+				else if (line.contains("processor\t:")) // Lower case indicates a specific core number
+				{
+					this.numCores++;
+				}
+			}
+
+			br.close();
+		}
+	}
+
+	// Basic function for parsing cpuinfo format strings.
+	// cpuinfo format strings consist of [label:info] parts.
+	// We only want to retrieve the info portion so we split
+	// them using ':' as a delimeter.
+	private String parseLine(String line)
+	{
+		String[] temp = line.split(":");
+		if (temp.length != 2)
+			return "N/A";
+
+		return temp[1].trim();
+	}
+
+	// Parses an ARM CPU ID.
+	private String parseArmID(int id)
+	{
+		switch (id)
+		{
+			case 0x41:
+				return "ARM Limited";
+			
+			case 0x44:
+				return "Digital Equipment Corporation";
+		
+			case 0x4D:
+				return "Freescale Semiconductor Inc.";
+
+			case 0x4E:
+				return "Nvidia Corporation";
+
+			case 0x51:
+				return "Qualcomm Inc.";
+
+			case 0x56:
+				return "Marvell Semiconductor Inc.";
+
+			case 0x69:
+				return "Intel Corporation";
+
+			default:
+				return "N/A";
+		}
+	}
+
+	// Parses the ARM CPU Part number.
+	private String parseArmPartNumber(int partNum)
+	{
+		switch (partNum)
+		{
+			// Qualcomm part numbers.
+			case 0x00F:
+				return "Qualcomm Scorpion";
+
+			case 0x02D:
+				return "Qualcomm Dual Scorpion";
+
+			case 0x04D:
+				return "Qualcomm Dual Krait";
+
+			case 0x06F:
+				return "Qualcomm Quad Krait";
+
+			// Marvell Semiconductor part numbers
+			case 0x131:
+				return "Marvell Feroceon";
+
+			case 0x581:
+				return "Marvell PJ4/PJ4b";
+
+			case 0x584:
+				return "Marvell Dual PJ4/PJ4b";
+
+			// Official ARM part numbers.
+			case 0x920:
+				return "ARM920";
+
+			case 0x922:
+				return "ARM922";
+
+			case 0x926:
+				return "ARM926";
+
+			case 0x940:
+				return "ARM940";
+
+			case 0x946:
+				return "ARM946";
+
+			case 0x966:
+				return "ARM966";
+
+			case 0x968:
+				return "ARM968";
+
+			case 0xB02:
+				return "ARM11 MPCore";
+
+			case 0xB36:
+				return "ARM1136";
+
+			case 0xB56:
+				return "ARM1156";
+
+			case 0xB76:
+				return "ARM1176";
+
+			case 0xC05:
+				return "ARM Cortex A5";
+
+			case 0xC07:
+				return "ARM Cortex-A7 MPCore";
+
+			case 0xC08:
+				return "ARM Cortex A8";
+
+			case 0xC09:
+				return "ARM Cortex A9";
+
+			case 0xC0C:
+				return "ARM Cortex A12";
+
+			case 0xC0F:
+				return "ARM Cortex A15";
+
+			case 0xC14:
+				return "ARM Cortex R4";
+
+			case 0xC15:
+				return "ARM Cortex R5";
+
+			case 0xC20:
+				return "ARM Cortex M0";
+
+			case 0xC21:
+				return "ARM Cortex M1";
+
+			case 0xC23:
+				return "ARM Cortex M3";
+
+			case 0xC24:
+				return "ARM Cortex M4";
+
+			case 0xC60:
+				return "ARM Cortex M0+";
+
+			case 0xD03:
+				return "ARM Cortex A53";
+
+			case 0xD07:
+				return "ARM Cortex A57 MPCore";
+
+
+			default: // Unknown/Not yet added to list.
+				return String.format(ctx.getString(R.string.unknown_part_num), partNum);
+		}
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
new file mode 100644
index 0000000000..24d192d412
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
@@ -0,0 +1,393 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2+
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.utils;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+import javax.microedition.khronos.opengles.GL10;
+
+import android.opengl.GLES30;
+import android.util.Log;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
+/**
+ * Utility class that abstracts all the stuff about
+ * EGL initialization out of the way if all that is 
+ * wanted is to query the underlying GL API for information.
+ */
+public final class EGLHelper
+{
+	private final EGL10 mEGL;
+	private final EGLDisplay mDisplay;
+	private EGLConfig[] mEGLConfigs;
+	private EGLContext mEGLContext;
+	private EGLSurface mEGLSurface;
+	private GL10 mGL;
+
+	// GL support flags
+	private boolean supportGL;
+	private boolean supportGLES2;
+	private boolean supportGLES3;
+
+	// Renderable type bitmasks
+	public static final int EGL_OPENGL_ES_BIT      = 0x0001;
+	public static final int EGL_OPENGL_ES2_BIT     = 0x0004;
+	public static final int EGL_OPENGL_BIT         = 0x0008;
+	public static final int EGL_OPENGL_ES3_BIT_KHR = 0x0040;
+
+	// API types
+	public static final int EGL_OPENGL_ES_API = 0x30A0;
+	public static final int EGL_OPENGL_API    = 0x30A2;
+
+	/**
+	 * Constructor
+	 * <p>
+	 * Initializes the underlying {@link EGLSurface} with a width and height of 1.
+	 * This is useful if all you need to use this class for is to query information
+	 * from specific API contexts.
+	 * 
+	 * @param renderableType Bitmask indicating which types of client API contexts
+	 *                       the framebuffer config must support.
+	 */
+	public EGLHelper(int renderableType)
+	{
+		this(1, 1, renderableType);
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param width          Width of the underlying {@link EGLSurface}.
+	 * @param height         Height of the underlying {@link EGLSurface}. 
+	 * @param renderableType Bitmask indicating which types of client API contexts
+	 *                       the framebuffer config must support.
+	 */
+	public EGLHelper(int width, int height, int renderableType)
+	{
+		// Initialize handle to an EGL display.
+		mEGL = (EGL10) EGLContext.getEGL();
+		mDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+
+		// If a display is present, initialize EGL.
+		if (mDisplay != EGL10.EGL_NO_DISPLAY)
+		{
+			int[] version = new int[2];
+			if (mEGL.eglInitialize(mDisplay, version))
+			{
+				// Detect supported GL APIs, initialize configs, etc.
+				detect();
+
+				// Create context and surface
+				create(width, height, renderableType);
+			}
+			else
+			{
+				Log.e("EGLHelper", "Error initializing EGL.");
+			}
+		}
+		else
+		{
+			Log.e("EGLHelper", "Error initializing EGL display.");
+		}
+	}
+
+	/**
+	 * Releases all resources associated with this helper.
+	 * <p>
+	 * This should be called whenever this helper is no longer needed. 
+	 */
+	public void closeHelper()
+	{
+		mEGL.eglTerminate(mDisplay);
+	}
+
+	/**
+	 * Gets information through EGL.<br/>
+	 * <p>
+	 * Index 0: Vendor     <br/>
+	 * Index 1: Version    <br/>
+	 * Index 2: Renderer   <br/>
+	 * Index 3: Extensions <br/>
+	 * 
+	 * @return information retrieved through EGL.
+	 */
+	public String[] getEGLInfo()
+	{
+		String[] info = {
+			mGL.glGetString(GL10.GL_VENDOR),
+			mGL.glGetString(GL10.GL_VERSION),
+			mGL.glGetString(GL10.GL_RENDERER),
+			mGL.glGetString(GL10.GL_EXTENSIONS),
+		};
+
+		return info;
+	}
+
+	/**
+	 * Whether or not this device supports OpenGL.
+	 * 
+	 * @return true if this device supports OpenGL; false otherwise.
+	 */
+	public boolean supportsOpenGL()
+	{
+		return supportGL;
+	}
+
+	/**
+	 * Whether or not this device supports OpenGL ES 2.
+	 * <br/>
+	 * Note that if this returns true, then OpenGL ES 1 is also supported.
+	 * 
+	 * @return true if this device supports OpenGL ES 2; false otherwise.
+	 */
+	public boolean supportsGLES2()
+	{
+		return supportGLES2;
+	}
+
+	/**
+	 * Whether or not this device supports OpenGL ES 3.
+	 * <br/>
+	 * Note that if this returns true, then OpenGL ES 1 and 2 are also supported.
+	 * 
+	 * @return true if this device supports OpenGL ES 3; false otherwise.
+	 */
+	public boolean supportsGLES3()
+	{
+		return supportGLES3;
+	}
+
+	/**
+	 * Gets the underlying {@link EGL10} instance.
+	 * 
+	 * @return the underlying {@link EGL10} instance.
+	 */
+	public EGL10 getEGL()
+	{
+		return mEGL;
+	}
+
+	/**
+	 * Gets the underlying {@link GL10} instance.
+	 * 
+	 * @return the underlying {@link GL10} instance.
+	 */
+	public GL10 getGL()
+	{
+		return mGL;
+	}
+
+	/**
+	 * Gets the underlying {@link EGLDisplay}.
+	 * 
+	 * @return the underlying {@link EGLDisplay}
+	 */
+	public EGLDisplay getDisplay()
+	{
+		return mDisplay;
+	}
+
+	/**
+	 * Gets all supported framebuffer configurations for this device.
+	 * 
+	 * @return all supported framebuffer configurations for this device.
+	 */
+	public EGLConfig[] getConfigs()
+	{
+		return mEGLConfigs;
+	}
+
+	/**
+	 * Gets the underlying {@link EGLContext}.
+	 * 
+	 * @return the underlying {@link EGLContext}.
+	 */
+	public EGLContext getContext()
+	{
+		return mEGLContext;
+	}
+
+	/**
+	 * Gets the underlying {@link EGLSurface}.
+	 * 
+	 * @return the underlying {@link EGLSurface}.
+	 */
+	public EGLSurface getSurface()
+	{
+		return mEGLSurface;
+	}
+
+	// Detects the specific kind of GL modes that are supported
+	private boolean detect()
+	{
+		// Get total number of configs available.
+		int[] numConfigs = new int[1];
+		if (!mEGL.eglGetConfigs(mDisplay, null, 0, numConfigs))
+		{
+			Log.e("EGLHelper", "Error retrieving number of EGL configs available.");
+			return false;
+		}
+
+		// Now get all the configurations
+		mEGLConfigs = new EGLConfig[numConfigs[0]];
+		if (!mEGL.eglGetConfigs(mDisplay, mEGLConfigs, mEGLConfigs.length, numConfigs))
+		{
+			Log.e("EGLHelper", "Error retrieving all EGL configs.");
+			return false;
+		}
+
+		for (int i = 0; i < mEGLConfigs.length; i++)
+		{
+			int[] attribVal = new int[1];
+			boolean ret = mEGL.eglGetConfigAttrib(mDisplay, mEGLConfigs[i], EGL10.EGL_RENDERABLE_TYPE, attribVal);
+			if (ret)
+			{
+				if ((attribVal[0] & EGL_OPENGL_BIT) != 0)
+					supportGL = true;
+
+				if ((attribVal[0] & EGL_OPENGL_ES2_BIT) != 0)
+					supportGLES2 = true;
+
+				if ((attribVal[0] & EGL_OPENGL_ES3_BIT_KHR) != 0)
+					supportGLES3 = true;
+			}
+		}
+
+		return true;
+	}
+
+	// Creates the context and surface.
+	private void create(int width, int height, int renderableType)
+	{
+		int[] attribs = {
+			EGL10.EGL_WIDTH, width,
+			EGL10.EGL_HEIGHT, height,
+			EGL10.EGL_NONE
+		};
+
+		// Initially we just assume GLES2 will be the default context.
+		int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+		int[] ctx_attribs = {
+			EGL_CONTEXT_CLIENT_VERSION, 2,
+			EGL10.EGL_NONE
+		};
+
+		// Determine the type of context that will be created
+		// and change the attribute arrays accordingly.
+		switch (renderableType)
+		{
+			case EGL_OPENGL_ES_BIT:
+				ctx_attribs[1] = 1;
+				break;
+
+			case EGL_OPENGL_BIT:
+				ctx_attribs[0] = EGL10.EGL_NONE;
+				break;
+
+			case EGL_OPENGL_ES3_BIT_KHR:
+				ctx_attribs[1] = 3;
+				break;
+
+			case EGL_OPENGL_ES2_BIT:
+			default: // Fall-back to GLES 2.
+				ctx_attribs[1] = 2;
+				break;
+		}
+		if (renderableType == EGL_OPENGL_BIT)
+			NativeLibrary.eglBindAPI(EGL_OPENGL_API);
+		else
+			NativeLibrary.eglBindAPI(EGL_OPENGL_ES_API);
+
+		mEGLContext = mEGL.eglCreateContext(mDisplay, mEGLConfigs[0], EGL10.EGL_NO_CONTEXT, ctx_attribs);
+		mEGLSurface = mEGL.eglCreatePbufferSurface(mDisplay, mEGLConfigs[0], attribs);
+		mEGL.eglMakeCurrent(mDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+		mGL = (GL10) mEGLContext.getGL();
+	}
+
+	/**
+	 * Simplified call to {@link GL10#glGetString(int)}
+	 * <p>
+	 * Accepts the following constants:
+	 * <ul>
+	 *    <li>GL_VENDOR - Company responsible for the GL implementation.</li>
+	 *    <li>GL_VERSION - Version or release number.</li>
+	 *    <li>GL_RENDERER - Name of the renderer</li>
+	 *    <li>GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language </li>
+	 * </ul>
+	 * 
+	 * @param glEnum A symbolic constant within {@link GL10}.
+	 * 
+	 * @return the string information represented by {@code glEnum}.
+	 */
+	public String glGetString(int glEnum)
+	{
+		return mGL.glGetString(glEnum);
+	}
+
+	/**
+	 * Simplified call to {@link GLES30#glGetStringi(int, int)}
+	 * <p>
+	 * Accepts the following constants:
+	 * <ul>
+	 *    <li>GL_VENDOR - Company responsible for the GL implementation.</li>
+	 *    <li>GL_VERSION - Version or release number.</li>
+	 *    <li>GL_RENDERER - Name of the renderer</li>
+	 *    <li>GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language </li>
+	 *    <li>GL_EXTENSIONS - Extension string supported by the implementation at {@code index}.</li>
+	 * </ul>
+	 * 
+	 * @param glEnum A symbolic GL constant
+	 * @param index  The index of the string to return.
+	 * 
+	 * @return the string information represented by {@code glEnum} and {@code index}.
+	 */
+	public String glGetStringi(int glEnum, int index)
+	{
+		return GLES30.glGetStringi(glEnum, index);
+	}
+
+	public boolean SupportsExtension(String extension)
+	{
+		int[] num_ext = new int[1];
+		GLES30.glGetIntegerv(GLES30.GL_NUM_EXTENSIONS, num_ext, 0);
+
+		for (int i = 0; i < num_ext[0]; ++i)
+		{
+			String ext = GLES30.glGetStringi(GLES30.GL_EXTENSIONS, i);
+			if (ext.equals(extension))
+				return true;
+		}
+		return false;
+	}
+
+	public int GetVersion()
+	{
+		int[] major = new int[1];
+		int[] minor = new int[1];
+		GLES30.glGetIntegerv(GLES30.GL_MAJOR_VERSION, major, 0);
+		GLES30.glGetIntegerv(GLES30.GL_MINOR_VERSION, minor, 0);
+		return major[0] * 100 + minor[0] * 10;
+	}
+
+	/**
+	 * Simplified call to {@link GL10#glGetIntegerv(int, int[], int)
+	 * 
+	 * @param glEnum A symbolic GL constant.
+	 * 
+	 * @return the integer information represented by {@code glEnum}.
+	 */
+	public int glGetInteger(int glEnum)
+	{
+		int[] val = new int[1];
+		mGL.glGetIntegerv(glEnum, val, 0);
+		return val[0];
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
new file mode 100644
index 0000000000..9e651fc102
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
@@ -0,0 +1,66 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.util.AttributeSet;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.dialogs.MotionAlertDialog;
+
+/**
+ * {@link Preference} subclass that represents a preference
+ * used for assigning a key bind.
+ */
+public final class InputBindingPreference extends EditTextPreference
+{
+	/**
+	 * Constructor that is called when inflating an InputBindingPreference from XML.
+	 *
+	 * @param context The current {@link Context}.
+	 * @param attrs   The attributes of the XML tag that is inflating the preference.
+	 */
+	public InputBindingPreference(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+	}
+
+	@Override
+	protected void onClick()
+	{
+		// Begin the creation of the input alert.
+		final MotionAlertDialog dialog = new MotionAlertDialog(getContext(), this);
+
+		// Set the cancel button.
+		dialog.setButton(AlertDialog.BUTTON_NEGATIVE, getContext().getString(R.string.cancel), new AlertDialog.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				// Do nothing. Just makes the cancel button show up.
+			}
+		});
+
+		// Set the title and description message.
+		dialog.setTitle(R.string.input_binding);
+		dialog.setMessage(String.format(getContext().getString(R.string.input_binding_descrip), getTitle()));
+
+		// Don't allow the dialog to close when a user taps
+		// outside of it. They must press cancel or provide an input.
+		dialog.setCanceledOnTouchOutside(false);
+
+		// Everything is set, show the dialog.
+		dialog.show();
+	}
+
+	@Override
+	public CharSequence getSummary()
+	{
+		String summary = super.getSummary().toString();
+		return String.format(summary, getText());
+	}
+
+
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SliderPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SliderPreference.java
new file mode 100644
index 0000000000..eab6f74ff0
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SliderPreference.java
@@ -0,0 +1,94 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import org.dolphinemu.dolphinemu.R;
+
+public class SliderPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener, View.OnClickListener
+{
+	private static final String androidns = "http://schemas.android.com/apk/res/android";
+
+	// SeekBar
+	private int m_max, m_value;
+	private SeekBar m_seekbar;
+
+	// TextView
+	private TextView m_textview;
+
+	public SliderPreference(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+
+		// Seekbar values
+		m_value = attrs.getAttributeIntValue(androidns, "defaultValue", 0);
+		m_max = attrs.getAttributeIntValue(androidns, "max", 100);
+	}
+
+	@Override
+	protected View onCreateDialogView()
+	{
+		LayoutInflater inflater = LayoutInflater.from(getContext());
+		LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.slider_layout, null, false);
+
+		m_seekbar = (SeekBar)layout.findViewById(R.id.sliderSeekBar);
+		m_textview = (TextView)layout.findViewById(R.id.sliderTextView);
+
+		if (shouldPersist())
+			m_value = Integer.valueOf(getPersistedString(Integer.toString(m_value)));
+
+		m_seekbar.setMax(m_max);
+		m_seekbar.setProgress(m_value);
+		setProgressText(m_value);
+		m_seekbar.setOnSeekBarChangeListener(this);
+
+		return layout;
+	}
+
+	// SeekBar overrides
+	@Override
+	public void onProgressChanged(SeekBar seek, int value, boolean fromTouch)
+	{
+		m_value = value;
+		setProgressText(value);
+	}
+
+	@Override
+	public void onStartTrackingTouch(SeekBar seek) {}
+	@Override
+	public void onStopTrackingTouch(SeekBar seek) {}
+
+	void setProgressText(int value)
+	{
+		m_textview.setText(String.valueOf(value));
+	}
+
+	@Override
+	public void showDialog(Bundle state)
+	{
+		super.showDialog(state);
+
+		Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
+		positiveButton.setOnClickListener(this);
+	}
+
+	@Override
+	public void onClick(View v)
+	{
+		if (shouldPersist())
+		{
+			persistString(Integer.toString(m_seekbar.getProgress()));
+			callChangeListener(m_seekbar.getProgress());
+		}
+		((AlertDialog) getDialog()).dismiss();
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
similarity index 76%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
index 93fc9cf890..168bd2dd93 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
@@ -1,17 +1,18 @@
 /**
  * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
+ * Licensed under GPLv2+
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.settings;
-
-import org.dolphinemu.dolphinemu.NativeLibrary;
+package org.dolphinemu.dolphinemu.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.preference.PreferenceManager;
 
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
 /**
  * A class that retrieves all of the set user preferences in Android, in a safe way.
  * <p>
@@ -21,12 +22,17 @@ import android.preference.PreferenceManager;
  */
 public final class UserPreferences
 {
+	private UserPreferences()
+	{
+		// Disallows instantiation.
+	}
+
 	/**
-	 * Loads the set config items from the Dolphin config files to the shared preferences of this front-end
+	 * Loads the settings stored in the Dolphin ini config files to the shared preferences of this front-end.
 	 * 
 	 * @param ctx The context used to retrieve the SharedPreferences instance.
 	 */
-	public static void LoadDolphinConfigToPrefs(Context ctx)
+	public static void LoadIniToPrefs(Context ctx)
 	{
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
 
@@ -34,25 +40,35 @@ public final class UserPreferences
 		SharedPreferences.Editor editor = prefs.edit();
 
 		// Add the settings.
-		editor.putString("cpuCorePref",   getConfig("Dolphin.ini", "Core", "CPUCore", "3"));
+		if (Build.CPU_ABI.contains("arm64"))
+			editor.putString("cpuCorePref",   getConfig("Dolphin.ini", "Core", "CPUCore", "4"));
+		else
+			editor.putString("cpuCorePref",   getConfig("Dolphin.ini", "Core", "CPUCore", "3"));
+
 		editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True"));
 		editor.putBoolean("fastmemPref", getConfig("Dolphin.ini", "Core", "Fastmem", "False").equals("True"));
 
-		editor.putString("gpuPref",               getConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer"));
+		editor.putString("gpuPref",               getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL"));
 		editor.putBoolean("showFPS",              getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
 		editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True"));
 
 		editor.putString("internalResolution",     getConfig("gfx_opengl.ini", "Settings", "EFBScale", "2") );
+		editor.putString("FSAA",                   getConfig("gfx_opengl.ini", "Settings", "MSAA", "0"));
 		editor.putString("anisotropicFiltering",   getConfig("gfx_opengl.ini", "Enhancements", "MaxAnisotropy", "0"));
-		editor.putBoolean("scaledEFBCopy",         getConfig("gfx_opengl.ini", "Hacks", "EFBScaleCopy", "True").equals("True"));
+		editor.putString("postProcessingShader",   getConfig("gfx_opengl.ini", "Enhancements", "PostProcessingShader", ""));
+		editor.putBoolean("scaledEFBCopy",         getConfig("gfx_opengl.ini", "Hacks", "EFBScaledCopy", "True").equals("True"));
 		editor.putBoolean("perPixelLighting",      getConfig("gfx_opengl.ini", "Settings", "EnablePixelLighting", "False").equals("True"));
 		editor.putBoolean("forceTextureFiltering", getConfig("gfx_opengl.ini", "Enhancements", "ForceFiltering", "False").equals("True"));
 		editor.putBoolean("disableFog",            getConfig("gfx_opengl.ini", "Settings", "DisableFog", "False").equals("True"));
 		editor.putBoolean("skipEFBAccess",         getConfig("gfx_opengl.ini", "Hacks", "EFBAccessEnable", "False").equals("True"));
-		editor.putBoolean("ignoreFormatChanges",   getConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", "False").equals("False"));
+		editor.putBoolean("ignoreFormatChanges",   getConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", "False").equals("True"));
+		editor.putString("stereoscopyMode", getConfig("gfx_opengl.ini", "Enhancements", "StereoMode", "0"));
+		editor.putBoolean("stereoSwapEyes",        getConfig("gfx_opengl.ini", "Enhancements", "StereoSwapEyes", "False").equals("True"));
+		editor.putString("stereoDepth",            getConfig("gfx_opengl.ini", "Enhancements", "StereoDepth", "20"));
+		editor.putString("stereoConvergence",      getConfig("gfx_opengl.ini", "Enhancements", "StereoConvergence", "20"));
 
-		String efbCopyOn     = getConfig("gfx_opengl.ini", "Hacks", "EFBCopyEnable", "False");
-		String efbToTexture  = getConfig("gfx_opengl.ini", "Hacks", "EFBToTextureEnable", "False");
+		String efbCopyOn     = getConfig("gfx_opengl.ini", "Hacks", "EFBCopyEnable", "True");
+		String efbToTexture  = getConfig("gfx_opengl.ini", "Hacks", "EFBToTextureEnable", "True");
 		String efbCopyCache  = getConfig("gfx_opengl.ini", "Hacks", "EFBCopyCacheEnable", "False");
 
 		if (efbCopyOn.equals("False"))
@@ -90,12 +106,12 @@ public final class UserPreferences
 			editor.putString("externalFrameBuffer", "Real");
 		}
 
-		editor.putBoolean("cacheDisplayLists",       getConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", "False").equals("True"));
 		editor.putBoolean("disableDestinationAlpha", getConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", "False").equals("True"));
 		editor.putBoolean("fastDepthCalculation",    getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True"));
+		editor.putString("aspectRatio", getConfig("gfx_opengl.ini", "Settings", "AspectRatio", "0"));
 
 		// Apply the changes.
-		editor.commit();
+		editor.apply();
 	}
 
 	// Small utility method that shortens calls to NativeLibrary.GetConfig.
@@ -105,11 +121,11 @@ public final class UserPreferences
 	}
 
 	/** 
-	 * Writes the config to the Dolphin ini file. 
+	 * Writes the preferences set in the front-end to the Dolphin ini files.
 	 * 
 	 * @param ctx The context used to retrieve the user settings.
 	 * */
-	public static void SaveConfigToDolphinIni(Context ctx)
+	public static void SavePrefsToIni(Context ctx)
 	{
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
 
@@ -138,7 +154,7 @@ public final class UserPreferences
 		boolean ignoreFormatChanges = prefs.getBoolean("ignoreFormatChanges", false);
 
 		// EFB copy method to use.
-		String efbCopyMethod = prefs.getString("efbCopyMethod", "Off");
+		String efbCopyMethod = prefs.getString("efbCopyMethod", "Texture");
 
 		// Texture cache accuracy. Falls back to "Fast" up error.
 		String textureCacheAccuracy = prefs.getString("textureCacheAccuracy", "128");
@@ -146,21 +162,27 @@ public final class UserPreferences
 		// External frame buffer emulation. Falls back to disabled upon error.
 		String externalFrameBuffer = prefs.getString("externalFrameBuffer", "Disabled");
 
-		// Whether or not display list caching is enabled.
-		boolean dlistCachingEnabled = prefs.getBoolean("cacheDisplayLists", false);
-
 		// Whether or not to disable destination alpha.
 		boolean disableDstAlphaPass = prefs.getBoolean("disableDestinationAlpha", false);
 
 		// Whether or not to use fast depth calculation.
 		boolean useFastDepthCalc = prefs.getBoolean("fastDepthCalculation", true);
 
+		// Aspect ratio selection
+		String aspectRatio = prefs.getString("aspectRatio", "0");
+
 		// Internal resolution. Falls back to 1x Native upon error.
 		String internalResolution = prefs.getString("internalResolution", "2");
 
+		// FSAA Level. Falls back to 1x upon error.
+		String FSAALevel = prefs.getString("FSAA", "0");
+
 		// Anisotropic Filtering Level. Falls back to 1x upon error.
 		String anisotropicFiltLevel = prefs.getString("anisotropicFiltering", "0");
 
+		// Post processing shader setting
+		String postProcessing = prefs.getString("postProcessingShader", "");
+
 		// Whether or not Scaled EFB copies are used.
 		boolean usingScaledEFBCopy = prefs.getBoolean("scaledEFBCopy", true);
 
@@ -173,6 +195,17 @@ public final class UserPreferences
 		// Whether or not fog is disabled.
 		boolean fogIsDisabled = prefs.getBoolean("disableFog", false);
 
+		// Stereoscopy setting
+		String stereoscopyMode = prefs.getString("stereoscopyMode", "0");
+
+		// Stereoscopy swap eyes
+		boolean stereoscopyEyeSwap = prefs.getBoolean("stereoSwapEyes", false);
+
+		// Stereoscopy separation
+		String stereoscopySeparation = prefs.getString("stereoDepth", "20");
+
+		// Stereoscopy convergence
+		String stereoscopyConvergence = prefs.getString("stereoConvergence", "20");
 
 		// CPU related Settings
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUCore", currentEmuCore);
@@ -187,6 +220,7 @@ public final class UserPreferences
 		// Video Hack Settings
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBAccessEnable", skipEFBAccess ? "False" : "True");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", ignoreFormatChanges ? "True" : "False");
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "AspectRatio", aspectRatio);
 
 		// Set EFB Copy Method 
 		if (efbCopyMethod.equals("Off"))
@@ -230,16 +264,21 @@ public final class UserPreferences
 			NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "UseRealXFB", "True");
 		}
 
-		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", dlistCachingEnabled ? "True" : "False");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", disableDstAlphaPass ? "True" : "False");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", useFastDepthCalc ? "True" : "False");
 
 		//-- Enhancement Settings --//
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "EFBScale", internalResolution);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "MSAA", FSAALevel);
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "MaxAnisotropy", anisotropicFiltLevel);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "PostProcessingShader", postProcessing);
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBScaledCopy", usingScaledEFBCopy ? "True" : "False");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "EnablePixelLighting", usingPerPixelLighting ? "True" : "False");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "ForceFiltering", isForcingTextureFiltering ? "True" : "False");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "DisableFog", fogIsDisabled ? "True" : "False");
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "StereoMode", stereoscopyMode);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "StereoSwapEyes", stereoscopyEyeSwap ? "True" : "False");
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "StereoDepth", stereoscopySeparation);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Enhancements", "StereoConvergence", stereoscopyConvergence);
 	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
new file mode 100644
index 0000000000..902e5299f4
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
@@ -0,0 +1,30 @@
+package org.dolphinemu.dolphinemu.viewholders;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.dolphinemu.dolphinemu.R;
+
+/**
+ * A simple class that stores references to views so that the FileAdapter doesn't need to
+ * keep calling findViewById(), which is expensive.
+ */
+public class FileViewHolder extends RecyclerView.ViewHolder
+{
+	public View itemView;
+
+	public TextView textFileName;
+	public ImageView imageType;
+
+	public FileViewHolder(View itemView)
+	{
+		super(itemView);
+
+		this.itemView = itemView;
+
+		textFileName = (TextView) itemView.findViewById(R.id.text_file_name);
+		imageType = (ImageView) itemView.findViewById(R.id.image_type);
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java
new file mode 100644
index 0000000000..592a2ecf32
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java
@@ -0,0 +1,40 @@
+package org.dolphinemu.dolphinemu.viewholders;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.dolphinemu.dolphinemu.R;
+
+/**
+ * A simple class that stores references to views so that the GameAdapter doesn't need to
+ * keep calling findViewById(), which is expensive.
+ */
+public class GameViewHolder extends RecyclerView.ViewHolder
+{
+	public ImageView imageScreenshot;
+	public TextView textGameTitle;
+	public TextView textCompany;
+
+	public String gameId;
+
+	// TODO Not need any of this stuff. Currently only the properties dialog needs it.
+	public String path;
+	public String title;
+	public String description;
+	public int country;
+	public String company;
+	public String screenshotPath;
+
+	public GameViewHolder(View itemView)
+	{
+		super(itemView);
+
+		itemView.setTag(this);
+
+		imageScreenshot = (ImageView) itemView.findViewById(R.id.image_game_screen);
+		textGameTitle = (TextView) itemView.findViewById(R.id.text_game_title);
+		textCompany = (TextView) itemView.findViewById(R.id.text_company);
+	}
+}
diff --git a/Source/Android/app/src/main/res/anim/button_elevation.xml b/Source/Android/app/src/main/res/anim/button_elevation.xml
new file mode 100644
index 0000000000..d96b299541
--- /dev/null
+++ b/Source/Android/app/src/main/res/anim/button_elevation.xml
@@ -0,0 +1,19 @@
+<!-- res/anim/button_elevation.xml -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <objectAnimator
+            android:propertyName="translationZ"
+            android:duration="@android:integer/config_shortAnimTime"
+            android:valueFrom="@dimen/elevation_low"
+            android:valueTo="@dimen/elevation_high"
+            android:valueType="floatType"/>
+    </item>
+    <item>
+        <objectAnimator
+            android:propertyName="translationZ"
+            android:duration="@android:integer/config_shortAnimTime"
+            android:valueFrom="@dimen/elevation_high"
+            android:valueTo="@dimen/elevation_low"
+            android:valueType="floatType"/>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a.png
new file mode 100644
index 0000000000..1b06c02e91
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..281e2cce8b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b.png
new file mode 100644
index 0000000000..4a2fce33e2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..38903deeaf
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c.png
new file mode 100644
index 0000000000..941e808d0b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..033bbb413a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad.png
new file mode 100644
index 0000000000..bef4bd338a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..f917478275
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..955ad245c7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..268f5aed18
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..18ec98bbe5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..80b2a3bb65
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..5c084fb6ad
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..9d4971cdcd
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..6ae73c47b9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick.png
new file mode 100644
index 0000000000..7d76fe18a6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..0efcec37b7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..50908e35ca
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l.png
new file mode 100644
index 0000000000..a39e4b163c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..511b8ea382
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r.png
new file mode 100644
index 0000000000..89d7a75497
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..940ea44b58
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start.png
new file mode 100644
index 0000000000..8685c69999
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..1385fbf20d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x.png
new file mode 100644
index 0000000000..ae6152009d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..b18ee63095
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y.png
new file mode 100644
index 0000000000..d17b3d6997
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..5c2d2084b5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z.png
new file mode 100644
index 0000000000..3fbb99cb03
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..a180a1520c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png
new file mode 100644
index 0000000000..481643ecd5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_company.png
new file mode 100644
index 0000000000..69dba7ac8f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_company.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png
new file mode 100644
index 0000000000..2eec57e591
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png
new file mode 100644
index 0000000000..590def8b80
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png
new file mode 100644
index 0000000000..6614ea4f4d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_drawer.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png
new file mode 100644
index 0000000000..9f5c756099
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png
new file mode 100644
index 0000000000..d128a17277
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..3b9af56e5d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png
new file mode 100644
index 0000000000..c90a3b6b43
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_file.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..5df998b9fe
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_menu_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png
new file mode 100644
index 0000000000..164385d047
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png
new file mode 100644
index 0000000000..cd16fdd508
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png
new file mode 100644
index 0000000000..f9a8915fd2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png
new file mode 100644
index 0000000000..ab4d4be283
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a.png
new file mode 100644
index 0000000000..10ec9b1120
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..f8f19736c7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b.png
new file mode 100644
index 0000000000..848364cfd7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..f6372ad45f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c.png
new file mode 100644
index 0000000000..80bbd89a7b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..1a4e364590
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad.png
new file mode 100644
index 0000000000..1e21661f4f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..92bbf38b8f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..6df60a536c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..4ca6bb3fdb
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..42c5792a8a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..68355c1036
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..4955dea697
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..7d6850811c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..49aa077114
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick.png
new file mode 100644
index 0000000000..c5e6b3a990
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..751bd76900
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..230a577975
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l.png
new file mode 100644
index 0000000000..fcffa64f6b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..9d65af8cdc
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r.png
new file mode 100644
index 0000000000..beacd4f0e1
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..99c381f32b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start.png
new file mode 100644
index 0000000000..b71409464e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..24da90413c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x.png
new file mode 100644
index 0000000000..8bdff55027
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..cb7d423448
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y.png
new file mode 100644
index 0000000000..ebb9c20fab
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..ddc68febc6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z.png
new file mode 100644
index 0000000000..d65d4d3d10
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..3c74a2a679
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png b/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png
new file mode 100644
index 0000000000..e6339193ea
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a.png
new file mode 100644
index 0000000000..bd996107e6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..7837e46058
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b.png
new file mode 100644
index 0000000000..6d8c40dd6c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..3ceb1ad24f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c.png
new file mode 100644
index 0000000000..b7cff6224b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..939fc8b22f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad.png
new file mode 100644
index 0000000000..b1bb74dc5d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..c403bfe4d4
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..f00c5241a5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..ce76ba3ec9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..56f2955a26
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..a8aea3e726
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..7bff06a932
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..71d634411b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..9a6c65f76c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick.png
new file mode 100644
index 0000000000..0a580b7bb0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..54ef0252ea
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..8159402fd6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l.png
new file mode 100644
index 0000000000..1b5e4d93e2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..2dda917a6e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r.png
new file mode 100644
index 0000000000..3b13ccc86a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..8769c5c657
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start.png
new file mode 100644
index 0000000000..6b032d26bf
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..1db374ff1e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x.png
new file mode 100644
index 0000000000..7f560abc73
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..68b1c49874
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y.png
new file mode 100644
index 0000000000..5c37451987
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..23a2b0fae8
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z.png
new file mode 100644
index 0000000000..7e569fa572
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..44a2720a40
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png
new file mode 100644
index 0000000000..6f0fb23f4d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png
new file mode 100644
index 0000000000..977dd3427a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_company.png
new file mode 100644
index 0000000000..481de5052d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_company.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png
new file mode 100644
index 0000000000..34ab76ac9e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png
new file mode 100644
index 0000000000..46c6a2ae4e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_drawer.png
new file mode 100644
index 0000000000..b05c026c18
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_drawer.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png
new file mode 100644
index 0000000000..1c5797c9e0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png
new file mode 100644
index 0000000000..5f972fb801
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..065f08541d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_file.png
new file mode 100644
index 0000000000..aad03cbf38
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_file.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..a15687a8cd
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_menu_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png
new file mode 100644
index 0000000000..8d1e433a56
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_refresh.png
new file mode 100644
index 0000000000..235c84f1e5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_refresh.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings.png
new file mode 100644
index 0000000000..fdcf657fad
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png
new file mode 100644
index 0000000000..43718bf98d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/banner_tv.png b/Source/Android/app/src/main/res/drawable-xhdpi/banner_tv.png
new file mode 100644
index 0000000000..36a02cb2dc
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/banner_tv.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a.png
new file mode 100644
index 0000000000..e0f9e0dd20
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..0ced23c378
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b.png
new file mode 100644
index 0000000000..409e010127
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..a0e5dbb681
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c.png
new file mode 100644
index 0000000000..9a10b58201
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..d9630b5de0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad.png
new file mode 100644
index 0000000000..7eda219a9e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..febfed7d85
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..d07e5d3288
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..144ed158d9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..486091add2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..175c7e2b7b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..a883e372bc
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..3192e0c1e9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..1137e07168
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick.png
new file mode 100644
index 0000000000..63b0572577
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..79efdcd57c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..5ea2425e22
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l.png
new file mode 100644
index 0000000000..f93b5d3f40
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..625674419c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r.png
new file mode 100644
index 0000000000..dbcfbcad91
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..9698caf33b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start.png
new file mode 100644
index 0000000000..d5e10def25
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..ed5da5b815
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x.png
new file mode 100644
index 0000000000..f4b21f2ae5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..d1551ab79d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y.png
new file mode 100644
index 0000000000..2dd41ad424
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..a897ec5b78
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z.png
new file mode 100644
index 0000000000..21e1209f38
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..b47b53255e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
new file mode 100644
index 0000000000..7ba4e10ea2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png
new file mode 100644
index 0000000000..67042105d2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png
new file mode 100644
index 0000000000..750d7ff388
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png
new file mode 100644
index 0000000000..e5cc9bc28b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png
new file mode 100644
index 0000000000..9ecb630740
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png
new file mode 100644
index 0000000000..bcf49dd73c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_drawer.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png
new file mode 100644
index 0000000000..e5f54cef01
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..5efa0a6ced
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..06fdfa1d92
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png
new file mode 100644
index 0000000000..38e94fd104
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_file.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..653847bde9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_menu_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png
new file mode 100644
index 0000000000..a55d19922f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png
new file mode 100644
index 0000000000..5f89fc257b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png
new file mode 100644
index 0000000000..12e5d100dd
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png
new file mode 100644
index 0000000000..048ab5609f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a.png
new file mode 100644
index 0000000000..0c5b2b2c38
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..790d9cd83c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b.png
new file mode 100644
index 0000000000..f5c723c9ab
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..3792c93628
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c.png
new file mode 100644
index 0000000000..995a87b9bf
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..c495cf6f0d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad.png
new file mode 100644
index 0000000000..f12421c762
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..720a04f24d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..d238e2cb0d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..fd9af958f8
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..6f69894628
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..5ecb6820bf
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..c09c608848
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..04e5352495
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..b7b22dd7b8
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick.png
new file mode 100644
index 0000000000..226f3a131c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..1764b71d85
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..240ec5006b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l.png
new file mode 100644
index 0000000000..a763b046a7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..0999a962ff
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r.png
new file mode 100644
index 0000000000..eb4c73da87
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..a7d95a9742
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start.png
new file mode 100644
index 0000000000..819c514bf3
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..a01537bad9
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x.png
new file mode 100644
index 0000000000..4e0642d897
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..190a138790
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y.png
new file mode 100644
index 0000000000..0454149ac4
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..b83e3013d0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z.png
new file mode 100644
index 0000000000..1533adda30
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..801760e403
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
new file mode 100644
index 0000000000..5a603b6bc3
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 0000000000..72cedcad4f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_company.png
new file mode 100644
index 0000000000..96fa6ac8f0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_company.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png
new file mode 100644
index 0000000000..6fa2c3b33c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png
new file mode 100644
index 0000000000..076602cca3
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 0000000000..f7e3b3079d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_drawer.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png
new file mode 100644
index 0000000000..0d1ac48767
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..03271360fb
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..1f7e577295
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png
new file mode 100644
index 0000000000..34efa40606
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_file.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..c0e71acba6
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_menu_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png
new file mode 100644
index 0000000000..043acd808e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png
new file mode 100644
index 0000000000..72128fe690
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png
new file mode 100644
index 0000000000..6bb8f6e080
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png
new file mode 100644
index 0000000000..161241408e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/banner_tv.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/banner_tv.png
new file mode 100644
index 0000000000..5b1dcd919d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/banner_tv.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a.png
new file mode 100644
index 0000000000..7229b7bcb2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a_pressed.png
new file mode 100644
index 0000000000..d1012a7692
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_a_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b.png
new file mode 100644
index 0000000000..7445a3cb34
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b_pressed.png
new file mode 100644
index 0000000000..bcd1097253
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_b_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c.png
new file mode 100644
index 0000000000..918ac0efe7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c_pressed.png
new file mode 100644
index 0000000000..83f2272fe1
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_c_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad.png
new file mode 100644
index 0000000000..ae2262f786
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png
new file mode 100644
index 0000000000..b992c33f42
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_down.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png
new file mode 100644
index 0000000000..1875c08811
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png
new file mode 100644
index 0000000000..01cd286234
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_downright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png
new file mode 100644
index 0000000000..30c25b944b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_left.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png
new file mode 100644
index 0000000000..2249c3240e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_right.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png
new file mode 100644
index 0000000000..fa01bb9c2d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_up.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png
new file mode 100644
index 0000000000..6b69dc10ab
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_pressed_upleft.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_upright.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_upright.png
new file mode 100644
index 0000000000..b386bc6f47
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_dpad_upright.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick.png
new file mode 100644
index 0000000000..5e065adfcd
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_pressed.png
new file mode 100644
index 0000000000..97238ac989
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_range.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_range.png
new file mode 100644
index 0000000000..57417a1c4b
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_joystick_range.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l.png
new file mode 100644
index 0000000000..7a883fc012
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l_pressed.png
new file mode 100644
index 0000000000..71e673de23
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_l_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r.png
new file mode 100644
index 0000000000..0f619c8d0d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r_pressed.png
new file mode 100644
index 0000000000..b3c83d5289
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_r_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start.png
new file mode 100644
index 0000000000..819dece06e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start_pressed.png
new file mode 100644
index 0000000000..135375c803
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_start_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x.png
new file mode 100644
index 0000000000..2f2e2db89a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x_pressed.png
new file mode 100644
index 0000000000..a636227f77
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_x_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y.png
new file mode 100644
index 0000000000..bd9a13cdf0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y_pressed.png
new file mode 100644
index 0000000000..28588af109
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_y_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z.png
new file mode 100644
index 0000000000..f00a80d6e4
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z_pressed.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z_pressed.png
new file mode 100644
index 0000000000..d4912af7f7
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/gcpad_z_pressed.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png
new file mode 100644
index 0000000000..2bef059583
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_company.png
new file mode 100644
index 0000000000..967aa1fbe2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_company.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png
new file mode 100644
index 0000000000..f11d5351f3
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png
new file mode 100644
index 0000000000..7a3c198ee4
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..a24c1f14fb
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png
new file mode 100644
index 0000000000..7cc0084756
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png
new file mode 100644
index 0000000000..d271d8e03f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png
new file mode 100644
index 0000000000..97e9ca945c
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png
new file mode 100644
index 0000000000..97717c2fc8
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png differ
diff --git a/Source/Android/assets/NoBanner.png b/Source/Android/app/src/main/res/drawable/no_banner.png
similarity index 100%
rename from Source/Android/assets/NoBanner.png
rename to Source/Android/app/src/main/res/drawable/no_banner.png
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
new file mode 100644
index 0000000000..fbdfec87f5
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_accent.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="?android:colorAccent"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
new file mode 100644
index 0000000000..31f064c0ac
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/circle_grey"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_add_directory.xml b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
new file mode 100644
index 0000000000..72d66c3950
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_folder_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/dolphin_blue"
+        android:minHeight="?android:attr/actionBarSize"
+        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
+        android:elevation="6dp"/>
+
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/list_files"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        tools:listitem="@layout/list_item_file"
+        android:elevation="4dp"
+        android:background="@android:color/white"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml
new file mode 100644
index 0000000000..63ea99ba83
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml
@@ -0,0 +1,5 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:id="@+id/frame_content">
+</FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_game_grid.xml b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
new file mode 100644
index 0000000000..53ac5d614e
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_game_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:colorPrimary"
+        android:minHeight="?android:attr/actionBarSize"
+        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
+        android:elevation="6dp"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/grid_games"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/grid_card_game"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+
+        <ImageButton
+            android:id="@+id/button_add_directory"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_alignBottom="@+id/image_game_screen"
+            android:layout_alignEnd="@+id/text_game_title"
+            android:layout_marginBottom="28dp"
+            android:background="@drawable/oval_ripple_accent"
+            android:src="@drawable/ic_add"
+            android:stateListAnimator="@anim/button_elevation"
+            android:elevation="4dp"
+            android:layout_gravity="bottom|right"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_settings.xml b/Source/Android/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000000..d72e5a0142
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+
+    <FrameLayout
+        android:id="@+id/frame_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        tools:listitem="@layout/list_item_file"
+        android:elevation="4dp"
+        android:background="@android:color/white"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
new file mode 100644
index 0000000000..b18bc9e7ee
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    xmlns:tools="http://schemas.android.com/tools"
+                                    android:layout_width="0dp"
+                                    tools:layout_width="224dp"
+                                    android:layout_height="256dp"
+                                    android:transitionName="card_game"
+                                    android:focusable="true"
+                                    android:clickable="true"
+                                    android:foreground="?android:attr/selectableItemBackground"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/image_game_screen"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:transitionName="image_game_screen"
+            android:layout_weight="1"
+            tools:src="@drawable/placeholder_screenshot"
+            tools:scaleType="centerCrop"/>
+
+        <TextView
+            android:id="@+id/text_game_title"
+            style="@android:style/TextAppearance.Material.Subhead"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_toStartOf="@+id/button_details"
+            android:ellipsize="end"
+            android:lines="1"
+            android:maxLines="1"
+            tools:text="The Legend of Zelda: The Wind Waker"/>
+
+        <TextView
+            android:id="@+id/text_company"
+            style="@android:style/TextAppearance.Material.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:ellipsize="end"
+            android:lines="1"
+            android:maxLines="1"
+            tools:text="Nintendo"/>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
+
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
new file mode 100644
index 0000000000..1d7b63468b
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_height="match_parent"
+             android:layout_width="match_parent"
+             android:transitionName="card_game">
+
+    <RelativeLayout
+        android:layout_width="480dp"
+        android:layout_height="match_parent">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/circle_banner"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_below="@+id/image_game_screen"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="24dp"
+            tools:src="@drawable/placeholder_banner"
+            app:border_color="?android:colorAccent"
+            app:border_width="2dp"
+            />
+
+        <ImageView
+            android:id="@+id/image_game_screen"
+            android:layout_width="match_parent"
+            android:layout_height="320dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:transitionName="image_game_screen"
+            tools:scaleType="centerCrop"
+            tools:src="@drawable/placeholder_screenshot"/>
+
+        <TextView
+            android:id="@+id/text_game_title"
+            style="@android:style/TextAppearance.Material.Headline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@+id/image_game_screen"
+            android:layout_marginLeft="36dp"
+            android:layout_marginRight="36dp"
+            android:layout_marginTop="24dp"
+            android:layout_toEndOf="@+id/circle_banner"
+            android:ellipsize="end"
+            tools:text="Rhythm Heaven Fever"/>
+
+        <TextView
+            android:id="@+id/text_company"
+            style="@android:style/TextAppearance.Material.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignEnd="@+id/text_game_title"
+            android:layout_alignStart="@+id/text_game_title"
+            android:layout_below="@+id/text_game_title"
+            android:layout_marginTop="8dp"
+            tools:text="Zany rhythm action!"
+            />
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/text_company"
+            android:layout_marginTop="16dp"
+
+            android:background="#1F000000"/>
+
+        <ImageView
+            android:id="@+id/icon_country"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignStart="@+id/circle_banner"
+            android:layout_alignTop="@+id/divider"
+            android:layout_marginTop="24dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_country"/>
+
+        <ImageView
+            android:id="@+id/icon_company"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignStart="@+id/icon_country"
+            android:layout_below="@+id/icon_country"
+            android:layout_marginTop="16dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_company"
+            android:layout_marginBottom="16dp"/>
+
+        <TextView
+            android:id="@+id/text_country"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/icon_country"
+            android:layout_alignStart="@+id/text_company"
+            android:layout_alignTop="@+id/icon_country"
+            android:gravity="center_vertical"
+            tools:text="United States"/>
+
+        <TextView
+            android:id="@+id/text_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/icon_company"
+            android:layout_alignStart="@+id/text_country"
+            android:layout_alignTop="@+id/icon_company"
+            android:gravity="center_vertical"
+            tools:text="Nintendo"/>
+
+        <ImageButton
+            android:id="@+id/button_launch"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_alignBottom="@+id/image_game_screen"
+            android:layout_alignEnd="@+id/text_game_title"
+            android:layout_marginBottom="-28dp"
+            android:background="@drawable/oval_ripple_accent"
+            android:src="@drawable/ic_play"
+            android:stateListAnimator="@anim/button_elevation"
+            android:elevation="4dp"/>
+    </RelativeLayout>
+
+
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/fragment_emulation.xml b/Source/Android/app/src/main/res/layout/fragment_emulation.xml
new file mode 100644
index 0000000000..451e4bec60
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/fragment_emulation.xml
@@ -0,0 +1,22 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context="org.dolphinemu.dolphinemu.fragments.EmulationFragment">
+
+    <!-- This is what everything is rendered to during emulation -->
+    <SurfaceView
+        android:id="@+id/surface_emulation"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:focusable="false"
+        android:focusableInTouchMode="false"/>
+
+    <!-- This is the onscreen input overlay -->
+    <org.dolphinemu.dolphinemu.overlay.InputOverlay
+        android:id="@+id/surface_input_overlay"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"/>
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_file.xml b/Source/Android/app/src/main/res/layout/list_item_file.xml
new file mode 100644
index 0000000000..16140c5994
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/list_item_file.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="56dp"
+              android:background="?android:attr/selectableItemBackground"
+              android:focusable="true"
+              android:clickable="true"
+              android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/image_type"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/oval_ripple_grey"
+        android:padding="4dp"
+        tools:src="@drawable/ic_wii"/>
+
+    <TextView
+        android:id="@+id/text_file_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_weight="1"
+        android:textSize="16sp"
+        tools:text="File Name"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/slider_layout.xml b/Source/Android/app/src/main/res/layout/slider_layout.xml
new file mode 100644
index 0000000000..a667ff6489
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/slider_layout.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:weightSum="1"
+              android:gravity="center_horizontal">
+
+	<SeekBar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/sliderSeekBar"
+		/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		tools:text="Sample Text"
+		android:id="@+id/sliderTextView"
+		android:textStyle="bold"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml b/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml
new file mode 100644
index 0000000000..7c103d831f
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml
@@ -0,0 +1,64 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Enable/Disabe Input Overlay -->
+    <item
+        android:id="@+id/enableInputOverlay"
+        android:showAsAction="ifRoom"
+        android:title="@string/disable_input_overlay"/>
+
+    <!-- Save State Slots -->
+    <item
+        android:id="@+id/takeScreenshot"
+        android:showAsAction="ifRoom"
+        android:title="@string/overlay_screenshot"/>
+    <item
+        android:id="@+id/saveStateRoot"
+        android:showAsAction="never"
+        android:title="@string/overlay_savestate">
+        <menu>
+            <item android:id="@+id/saveSlot1"
+                  android:title="@string/overlay_slot1"/>
+
+            <item android:id="@+id/saveSlot2"
+                  android:title="@string/overlay_slot2"/>
+
+            <item android:id="@+id/saveSlot3"
+                  android:title="@string/overlay_slot3"/>
+
+            <item android:id="@+id/saveSlot4"
+                  android:title="@string/overlay_slot4"/>
+
+            <item android:id="@+id/saveSlot5"
+                  android:title="@string/overlay_slot5"/>
+        </menu>
+    </item>
+
+    <!-- Load State Slots -->
+    <item
+        android:id="@+id/loadStateRoot"
+        android:showAsAction="never"
+        android:title="@string/overlay_loadstate">
+        <menu>
+            <item android:id="@+id/loadSlot1"
+                  android:title="@string/overlay_slot1"/>
+
+            <item android:id="@+id/loadSlot2"
+                  android:title="@string/overlay_slot2"/>
+
+            <item android:id="@+id/loadSlot3"
+                  android:title="@string/overlay_slot3"/>
+
+            <item android:id="@+id/loadSlot4"
+                  android:title="@string/overlay_slot4"/>
+
+            <item android:id="@+id/loadSlot5"
+                  android:title="@string/overlay_slot5"/>
+        </menu>
+    </item>
+
+    <item
+        android:id="@+id/exitEmulation"
+        android:showAsAction="ifRoom"
+        android:title="@string/overlay_exit_emulation">
+    </item>
+</menu>
diff --git a/Source/Android/res/menu/gamelist_menu.xml b/Source/Android/app/src/main/res/menu/gamelist_menu.xml
similarity index 100%
rename from Source/Android/res/menu/gamelist_menu.xml
rename to Source/Android/app/src/main/res/menu/gamelist_menu.xml
diff --git a/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
new file mode 100644
index 0000000000..667d28a4f0
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- TODO Please give me an icon! -->
+    <item
+        android:id="@+id/menu_up_one_level"
+        android:title="@string/add_directory_up_one_level"
+        android:showAsAction="ifRoom|withText"/>
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_emulation.xml b/Source/Android/app/src/main/res/menu/menu_emulation.xml
new file mode 100644
index 0000000000..627d1bc9e3
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/menu_emulation.xml
@@ -0,0 +1,77 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity">
+
+
+    <!-- Enable/Disabe Input Overlay -->
+    <item
+        android:id="@+id/enableInputOverlay"
+        android:showAsAction="ifRoom"
+        android:title="@string/emulation_toggle_input"/>
+
+    <!-- Save State Slots -->
+    <item
+        android:id="@+id/takeScreenshot"
+        android:showAsAction="ifRoom"
+        android:title="@string/overlay_screenshot"/>
+    <item
+        android:id="@+id/saveStateRoot"
+        android:showAsAction="never"
+        android:title="@string/overlay_savestate">
+        <menu>
+            <item
+                android:id="@+id/saveSlot1"
+                android:title="@string/overlay_slot1"/>
+
+            <item
+                android:id="@+id/saveSlot2"
+                android:title="@string/overlay_slot2"/>
+
+            <item
+                android:id="@+id/saveSlot3"
+                android:title="@string/overlay_slot3"/>
+
+            <item
+                android:id="@+id/saveSlot4"
+                android:title="@string/overlay_slot4"/>
+
+            <item
+                android:id="@+id/saveSlot5"
+                android:title="@string/overlay_slot5"/>
+        </menu>
+    </item>
+
+    <!-- Load State Slots -->
+    <item
+        android:id="@+id/loadStateRoot"
+        android:showAsAction="never"
+        android:title="@string/overlay_loadstate">
+        <menu>
+            <item
+                android:id="@+id/loadSlot1"
+                android:title="@string/overlay_slot1"/>
+
+            <item
+                android:id="@+id/loadSlot2"
+                android:title="@string/overlay_slot2"/>
+
+            <item
+                android:id="@+id/loadSlot3"
+                android:title="@string/overlay_slot3"/>
+
+            <item
+                android:id="@+id/loadSlot4"
+                android:title="@string/overlay_slot4"/>
+
+            <item
+                android:id="@+id/loadSlot5"
+                android:title="@string/overlay_slot5"/>
+        </menu>
+    </item>
+
+    <item
+        android:id="@+id/exitEmulation"
+        android:showAsAction="ifRoom"
+        android:title="@string/overlay_exit_emulation">
+    </item>
+</menu>
diff --git a/Source/Android/app/src/main/res/menu/menu_game_grid.xml b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
new file mode 100644
index 0000000000..ca0f117e4f
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_refresh"
+        android:title="@string/grid_menu_refresh"
+        android:icon="@drawable/ic_refresh"
+        android:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_settings"
+        android:title="@string/grid_menu_settings"
+        android:icon="@drawable/ic_settings"
+        android:showAsAction="ifRoom"/>
+
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-ja/strings.xml b/Source/Android/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000000..59e72d1819
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Title of the app -->
+    <string name="app_name">Dolphin Emulator</string>
+
+    <!-- Navigation-related Strings -->
+    <string name="drawer_open">ナビゲーションウィンドウを開く</string>
+    <string name="drawer_close">ナビゲーションウィンドウを閉じる</string>
+
+    <!-- About Fragment -->
+    <string name="build_revision">ビルドのバージョン</string>
+    <string name="supports_gles3">サポートのOpenGL ES 3</string>
+    <string name="supports_neon">サポートのNEON</string>
+    <string name="general">一般</string>
+    <string name="cpu">CPU</string>
+    <string name="gles_two">GLES 2</string>
+    <string name="gles_three">GLES 3</string>
+    <string name="desktop_gl">OpenGL</string>
+
+    <!-- About Menu - CPU Info -->
+    <string name="cpu_abi_one">CPU ABI 1</string>
+    <string name="cpu_abi_two">CPU ABI 2</string>
+    <string name="cpu_info">CPU情報</string>
+    <string name="cpu_type">CPUタイプ</string>
+    <string name="cpu_features">CPUの命令セットと機能</string>
+    <string name="num_cores">CPUコア</string>
+    <string name="cpu_implementer">CPUの実装</string>
+    <string name="cpu_hardware">ハードウェア</string>
+    <string name="unknown_part_num">不明 (%1$d)。 我々はそれを文書化することができますので、この番号を報告してください。 </string>
+
+    <!-- Folder Browser -->
+    <string name="current_dir">現在のディレクトリ： %1$s</string>
+    <string name="parent_directory">親ディレクトリ</string>
+    <string name="file_size">ファイルサイズ: %1$s</string>
+
+    <!-- Game List Activity -->
+    <string name="clear_game_list">クリア</string>
+    <string name="clear_game_list_confirm">ゲームリストからすべての項目を削除しますか？</string>
+    <string name="game_list">ゲームリスト</string>
+    <string name="browse_folder">フォルダの参照</string>
+    <string name="settings">設定</string>
+    <string name="about">について</string>
+    <string name="file_size_gib">ファイルサイズ: %.2f GiB</string>
+    <string name="file_size_mib">ファイルサイズ: %.2f MiB</string>
+
+    <!-- Game List Activity - Device Compatibility AlertDialog -->
+    <string name="device_compat_warning">デバイスの互換性の警告</string>
+    <string name="device_compat_warning_msg">この電話は、NEON拡張をサポートしていません。 おそらくDolphinを実行することはできません。\nあなたはとにかくそれを実行してみますか？</string>
+    <string name="device_gles3compat_warning_msg">デバイスはOpenGLES3のビデオドライバのバグがあります。\nあなたはとにかくそれを使用してみたいのですか？</string>
+
+    <!-- Game List Fragment -->
+    <string name="file_clicked">クリックされたファイル： %1$s</string>
+
+    <!-- Emulation Window Overlay -->
+    <string name="enable_input_overlay">入力オーバーレイを有効</string>
+    <string name="disable_input_overlay">入力オーバーレイを無効</string>
+    <string name="overlay_screenshot">スクリーンショットを撮る</string>
+    <string name="overlay_savestate">ステートセーブ</string>
+    <string name="overlay_loadstate">ステートロード</string>
+    <string name="overlay_exit_emulation">終了</string>
+    <string name="overlay_exit_emulation_confirm">このゲームを終了してもよろしいですか？</string>
+    <string name="overlay_slot1">スロット 1</string>
+    <string name="overlay_slot2">スロット 2</string>
+    <string name="overlay_slot3">スロット 3</string>
+    <string name="overlay_slot4">スロット 4</string>
+    <string name="overlay_slot5">スロット 5</string>
+
+    <!-- Input Config Fragment -->
+    <string name="input_settings">入力</string>
+    <string name="input_overlay">入力オーバーレイ</string>
+    <string name="input_overlay_desc">画面上の入力のオーバーレイを設定し。</string>
+    <string name="input_overlay_layout">入力オーバーレイレイアウト</string>
+    <string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
+    <string name="controls_size">コントロールのサイズを調整し</string>
+    <string name="gamecube_bindings">ゲームキューブコントローラの入力バインディング</string>
+    <string name="controller_0">コントローラ1</string>
+    <string name="controller_1">コントローラ2</string>
+    <string name="controller_2">コントローラ3</string>
+    <string name="controller_3">コントローラ4</string>
+    <string name="enable_controller">コントローラを有効</string>
+    <string name="wiimote_bindings">Wiiリモコンの入力バインディング</string>
+    <string name="wiimote_1">Wiiリモコン1</string>
+    <string name="wiimote_2">Wiiリモコン2</string>
+    <string name="wiimote_3">Wiiリモコン3</string>
+    <string name="wiimote_4">Wiiリモコン4</string>
+    <string name="enable_wiimote">Wiiリモコンを有効</string>
+    <string name="input_binding">入力バインディング</string>
+    <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
+    <!-- GameCube buttons (May be shared with Wiimote stuff too) -->
+    <string name="button_a">Aボタン</string>
+    <string name="button_b">Bボタン</string>
+    <string name="button_start">スタートボタン</string>
+    <string name="button_x">Xボタン</string>
+    <string name="button_y">Yボタン</string>
+    <string name="button_z">Zボタン</string>
+    <string name="dpad_up">D-Pad: ↑</string>
+    <string name="dpad_down">D-Pad: ↓</string>
+    <string name="dpad_left">D-Pad: ←</string>
+    <string name="dpad_right">D-Pad: →</string>
+    <string name="main_stick_up">コントロールスティック: ↑</string>
+    <string name="main_stick_down">コントロールスティック: ↓</string>
+    <string name="main_stick_left">コントロールスティック: ←</string>
+    <string name="main_stick_right">コントロールスティック: →</string>
+    <string name="c_stick_up">C-スティック: ↑</string>
+    <string name="c_stick_down">C-スティック: ↓</string>
+    <string name="c_stick_left">C-スティック: ←</string>
+    <string name="c_stick_right">C-スティック: →</string>
+    <string name="trigger_left">左のトリガー</string>
+    <string name="trigger_right">右のトリガー</string>
+    <!-- Wiimote (+ extension) only buttons -->
+    <string name="button_one">ボタン1</string>
+    <string name="button_two">ボタン2</string>
+    <string name="button_plus">ボタン+</string>
+    <string name="button_minus">ボタン-</string>
+    <string name="button_home">ホームボタン</string>
+    <string name="ir_up">IR ↑</string>
+    <string name="ir_down">IR ↓</string>
+    <string name="ir_left">IR ←</string>
+    <string name="ir_right">IR →</string>
+    <string name="ir_forward">IR前方</string>
+    <string name="ir_backward">IR後方</string>
+    <string name="swing_up">スイング ↑</string>
+    <string name="swing_down">スイング ↓</string>
+    <string name="swing_left">スイング ←</string>
+    <string name="swing_right">スイング →</string>
+    <string name="tilt_forward">前方を傾</string>
+    <string name="tilt_backward">後方を傾</string>
+    <string name="tilt_left">左を傾</string>
+    <string name="tilt_right">右を傾</string>
+    <string name="shake_x">Xを振る</string>
+    <string name="shake_y">Yを振る</string>
+    <string name="shake_z">Zを振る</string>
+
+    <!-- CPU Preference Fragment -->
+    <string name="interpreter">Interpreter</string>
+    <string name="jit64_recompiler">JIT64 Recompiler</string>
+    <string name="jitil_recompiler">JITIL Recompiler</string>
+    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
+    <string name="jit_arm64_recompiler">JIT ARM64 Recompiler</string>
+    <string name="cpu_settings">CPU</string>
+    <string name="cpu_core">CPUコア</string>
+    <string name="cpu_core_desc">%s</string>
+    <string name="dual_core">デュアルコア</string>
+    <string name="dual_core_descrip">処理のための2つのCPUコアを使用して。速度が向上します。</string>
+    <string name="fastmem">Fastmem</string>
+    <string name="fastmem_desc">メモリアクセスのために潜在的に危険な最適化を使用して。</string>
+
+    <!-- Video Preference Fragment -->
+    <string name="video_settings">ビデオ</string>
+    <string name="software_renderer">Software Renderer</string>
+    <string name="opengl_es3">OpenGL ES</string>
+    <string name="opengl">OpenGL</string>
+    <string name="video_backend">ビデオレンダラ</string>
+    <string name="video_backend_desc">%s</string>
+    <string name="show_fps">FPSを表示</string>
+    <string name="show_fps_descrip">エミュレーション速度の指標として、画面左上に毎秒レンダリングされた フレーム数を表示します。</string>
+
+    <string name="enhancements">画質向上の設定</string>
+    <string name="internal_resolution">内部解像度の変更</string>
+    <string name="internal_resolution_descrip">内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上します。 しかし、ゲームによっては非常に重くなったり描画バグの原因となります。 【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描画バグは発生しにくくなります。 また一般的に内部解像度が低いほど、動作速度は向上します。</string>
+    <string name="FSAA">フルシーンアンチエイリアシング</string>
+    <string name="FSAA_descrip">3Dグラフィックスをラスタライズによって生じるエイリアシングの量が減少。 レンダリングされた画像はあまりギザギザになります。 抽選でエミュレーション速度を下げます。問題を引き起こす可能性があります。</string>
+    <string name="anisotropic_filtering">異方性フィルタリング</string>
+    <string name="anisotropic_filtering_descrip">異方性フィルタリングを適用します。 奥行きのあるテクスチャをより精細に描画することが出来ます。 特定のゲームでは描画バグの原因になることがあります。</string>
+    <string name="postprocessing_shader">ポストプロセッシングシェーダー</string>
+    <string name="postprocessing_shader_descrip">フレーム終了後の後処理効果を適用する。</string>
+    <string name="scaled_efb_copy">Scaled EFB Copy</string>
+    <string name="scaled_efb_copy_descrip">テクスチャエフェクトを表示するために作成されたテクスチャの品質を著しく向上させます。 特に高解像度出力時に効果が大きく出ます。 動作速度は少々低下し、まれに描画バグの原因にもなることもあります。</string>
+    <string name="per_pixel_lighting">Per-Pixel Lighting</string>
+    <string name="per_pixel_lighting_descrip">ピクセル単位での光源処理を行います。 GPUの性能にもよりますが、数パーセント程度、動作速度が低下します。 このオプションは通常安全ですが、時に描画バグを引き起こすこともあります</string>
+    <string name="force_texture_filtering">Force Texture Filtering</string>
+    <string name="force_texture_filtering_descrip">ゲーム側でフィルタ無効を明示している場面でも、強制的にフィルタリングを行います。 特に高解像度出力時にテクスチャが綺麗になりますが、いくつかのゲームで描画バグを引き起こします。</string>
+    <string name="disable_fog">霧を無効</string>
+    <string name="disable_fog_descrip">フォグ処理を無効化します。これにより遠景の高精細化が期待できます。いくつかのタイトルではフォグ処理に頼った画面効果が正しく表示 されなくなります。</string>
+
+    <string name="hacks">高速化(Hacks)</string>
+    <string name="embedded_frame_buffer">内蔵フレームバッファ</string>
+    <string name="skip_efb_access">CPUからEFBアクセスをスキップ</string>
+    <string name="skip_efb_access_descrip">EFBへの読み取り/書き込みにCPUから作られたすべての要求を無視。</string>
+    <string name="ignore_format_changes">フォーマットの変更を無視</string>
+    <string name="ignore_format_changes_descrip">EFB形式への変更を無視。</string>
+    <string name="efb_copy_method">EFBコピー方法</string>
+    <string name="efb_copy_method_descrip">EFBコピーをエミュレート方法を決定。</string>
+    <string name="efb_copy_texture">テクスチャ</string>
+    <string name="efb_copy_ram_uncached">RAM (キャッシュない)</string>
+    <string name="efb_copy_ram_cached">RAM (キャッシュ)</string>
+    <string name="texture_cache">テクスチャキャッシュ</string>
+    <string name="texture_cache_accuracy">テクスチャキャッシュ確度</string>
+    <string name="texture_cache_accuracy_descrip">この選択をSafe設定しておくと、RAMからのテクスチャ更新に 失敗しにくなります。</string>
+    <string name="texture_cache_accuracy_low">低</string>
+    <string name="texture_cache_accuracy_medium">平</string>
+    <string name="texture_cache_accuracy_high">高</string>
+    <string name="external_frame_buffer">外部フレームバッファ</string>
+    <string name="external_frame_buffer_descrip">XFBをエミュレート方法を決定。</string>
+    <string name="external_frame_buffer_virtual">バーチャル</string>
+    <string name="external_frame_buffer_real">実機</string>
+    <string name="disable_destination_alpha">Disable Destination Alpha</string>
+    <string name="disable_destination_alpha_descrip">多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ 。</string>
+    <string name="fast_depth_calculation">高速奥行き計算</string>
+    <string name="fast_depth_calculation_descrip">深度値を計算するために精度の低いアルゴリズムを使用します。</string>
+
+    <!-- Miscellaneous -->
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="cancel">キャンセル</string>
+    <string name="disabled">無効</string>
+    <string name="other">その他</string>
+
+</resources>
diff --git a/Source/Android/app/src/main/res/values-w1000dp/integers.xml b/Source/Android/app/src/main/res/values-w1000dp/integers.xml
new file mode 100644
index 0000000000..5cd4e24f38
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w1000dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="game_grid_columns">4</integer>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-w1050dp/dimens.xml b/Source/Android/app/src/main/res/values-w1050dp/dimens.xml
new file mode 100644
index 0000000000..92fcb2b668
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w1050dp/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 1024dp of available width.  -->
+    <dimen name="activity_horizontal_margin">96dp</dimen>
+</resources>
diff --git a/Source/Android/app/src/main/res/values-w500dp/integers.xml b/Source/Android/app/src/main/res/values-w500dp/integers.xml
new file mode 100644
index 0000000000..d2955c0ae3
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w500dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="game_grid_columns">2</integer>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-w750dp/integers.xml b/Source/Android/app/src/main/res/values-w750dp/integers.xml
new file mode 100644
index 0000000000..f049d8b44e
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w750dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="game_grid_columns">3</integer>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values-w820dp/dimens.xml b/Source/Android/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000000..d27181e85e
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width.  -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000000..9cdf07d876
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- All lists for ListPreference keys/values are placed here -->
+<resources>
+
+    <!-- CPU core selection - X86_64 -->
+    <string-array name="emuCoreEntriesX86_64" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit64_recompiler</item>
+        <item>@string/jitil_recompiler</item>
+    </string-array>
+    <string-array name="emuCoreValuesX86_64" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+    
+    <!-- CPU core selection - ARM -->
+    <string-array name="emuCoreEntriesARM" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit_arm_recompiler</item>
+    </string-array>
+    <string-array name="emuCoreValuesARM" translatable="false">
+        <item>0</item>
+        <item>3</item>
+    </string-array>
+
+    <!-- CPU core selection - ARM64 -->
+    <string-array name="emuCoreEntriesARM64" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit_arm64_recompiler</item>
+    </string-array>
+    <string-array name="emuCoreValuesARM64" translatable="false">
+        <item>0</item>
+        <item>4</item>
+    </string-array>
+    
+    <!-- CPU core selection - Other -->
+    <string-array name="emuCoreEntriesOther" translatable="false">
+        <item>@string/interpreter</item>
+    </string-array>
+    <string-array name="emuCoreValuesOther" translatable="false">
+        <item>0</item>
+    </string-array>
+
+    <!-- New UI CPU Core selection - Default -->
+    <string-array name="string_emu_cores" translatable="false">
+        <item>@string/interpreter</item>
+    </string-array>
+    <string-array name="int_emu_cores" translatable="false">
+        <item>0</item>
+    </string-array>
+    
+    <!-- Video Backend Selection - Supports OpenGL ES 3 -->
+    <string-array name="videoBackendEntriesGLES3" translatable="false">
+        <item>@string/software_renderer</item>
+        <item>@string/opengl_es3</item>
+    </string-array>
+    <string-array name="videoBackendValuesGLES3" translatable="false">
+        <item>Software Renderer</item>
+        <item>OGL</item>
+    </string-array>
+
+    <!-- Video Backend Selection - Supports desktop OpenGL -->
+    <string-array name="videoBackendEntriesGL" translatable="false">
+        <item>@string/software_renderer</item>
+        <item>@string/opengl</item>
+    </string-array>
+    <string-array name="videoBackendValuesGL" translatable="false">
+        <item>Software Renderer</item>
+        <item>OGL</item>
+    </string-array>
+    
+    <!-- Video Backend Selection - No OpenGL ES 3 support -->
+    <string-array name="videoBackendEntriesNoGLES3" translatable="false">
+        <item>@string/software_renderer</item>
+    </string-array>
+    <string-array name="videoBackendValuesNoGLES3" translatable="false">
+        <item>Software Renderer</item>
+    </string-array>
+    
+    <!-- EFB Copy Method Preference -->
+    <string-array name="efbCopyMethodEntries" translatable="false">
+        <item>@string/disabled</item>
+        <item>@string/efb_copy_texture</item>
+        <item>@string/efb_copy_ram_uncached</item>
+        <item>@string/efb_copy_ram_cached</item>
+    </string-array>
+    <string-array name="efbCopyMethodValues" translatable="false">
+        <item>Off</item>
+        <item>Texture</item>
+        <item>RAM (cached)</item>
+        <item>RAM (uncached)</item>
+    </string-array>
+    
+    <!-- Texture Cache Accuracy Preference -->
+    <string-array name="textureCacheAccuracyEntries" translatable="false">
+        <item>@string/texture_cache_accuracy_low</item>
+        <item>@string/texture_cache_accuracy_medium</item>
+        <item>@string/texture_cache_accuracy_high</item>
+    </string-array>
+    <string-array name="textureCacheAccuracyValues" translatable="false">
+        <item>128</item>
+        <item>512</item>
+        <item>0</item>
+    </string-array>
+    
+    <!-- External Frame Buffer Preference -->
+    <string-array name="externalFrameBufferEntries" translatable="false">
+        <item>@string/disabled</item>
+        <item>@string/external_frame_buffer_virtual</item>
+        <item>@string/external_frame_buffer_real</item>
+    </string-array>
+    <string-array name="externalFrameBufferValues" translatable="false">
+        <item>Disabled</item>
+        <item>Virtual</item>
+        <item>Real</item>
+    </string-array>
+    
+    <!-- Internal Resolution Preference -->
+    <string-array name="internalResolutionEntries" translatable="false">
+        <item>1x Native (640x528)</item>
+        <item>1.5x Native (960x792)</item>
+        <item>2x Native (1280x1056)</item>
+        <item>2.5x Native (1600x1320)</item>
+        <item>3x Native (1920x1584)</item>
+        <item>4x Native (2560x2112)</item>
+    </string-array>
+    <string-array name="internalResolutionValues" translatable="false">
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
+
+    <!-- FSAA Preference -->
+    <string-array name="FSAAEntries" translatable="false">
+        <item>1x</item>
+        <item>2x</item>
+        <item>4x</item>
+    </string-array>
+    <string-array name="FSAAValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Anisotropic Filtering Preference -->
+    <string-array name="anisotropicFilteringEntries" translatable="false">
+        <item>1x</item>
+        <item>2x</item>
+        <item>4x</item>
+        <item>8x</item>
+        <item>16x</item>
+    </string-array>
+    <string-array name="anisotropicFilteringValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- Stereoscopy Preference -->
+    <string-array name="stereoscopyEntries" translatable="false">
+        <item>Off</item>
+        <item>Side-by-Side</item>
+        <item>Top-and-Bottom</item>
+        <item>Anaglyph</item>
+    </string-array>
+    <string-array name="stereoscopyValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <!-- Aspect Ratio Preference -->
+    <string-array name="aspectRatioEntries" translatable="false">
+        <item>Auto</item>
+        <item>Force 16:9</item>
+        <item>Force 4:3</item>
+        <item>Stretch To Window</item>
+    </string-array>
+    <string-array name="aspectRatioValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="country_names">
+        <item>Europe</item>
+        <item>Japan</item>
+        <item>USA</item>
+        <item>Australia</item>
+        <item>France</item>
+        <item>Germany</item>
+        <item>Italy</item>
+        <item>Korea</item>
+        <item>Netherlands</item>
+        <item>Russia</item>
+        <item>Spain</item>
+        <item>Taiwan</item>
+        <item>Unknown</item>
+    </string-array>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..d7b7847125
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="dolphin_blue">#2196f3</color>
+    <color name="dolphin_blue_dark">#1976d2</color>
+
+    <color name="dolphin_accent_wii">#9e9e9e</color>
+    <color name="dolphin_accent_wiiware">#2979ff</color>
+    <color name="dolphin_accent_gamecube">#651fff</color>
+
+    <color name="circle_grey">#bdbdbd</color>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..72b7d0fcaf
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="diameter">48dp</dimen>
+    <dimen name="elevation_low">1dp</dimen>
+    <dimen name="elevation_high">4dp</dimen>
+    <dimen name="add_button_margin">16dp</dimen>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/integers.xml b/Source/Android/app/src/main/res/values/integers.xml
new file mode 100644
index 0000000000..9ddac4cff1
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="game_grid_columns">1</integer>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..e01c06da3a
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Title of the app -->
+    <string name="app_name">Dolphin Emulator</string>
+
+    <!-- Navigation-related Strings -->
+    <string name="drawer_open">Open navigation drawer</string>
+    <string name="drawer_close">Close navigation drawer</string>
+
+    <!-- About Fragment -->
+    <string name="build_revision">Build Revision</string>
+    <string name="supports_gles3">Supports OpenGL ES 3</string>
+    <string name="supports_neon">Supports NEON</string>
+    <string name="general">General</string>
+    <string name="cpu">CPU</string>
+    <string name="gles_two">GLES 2</string>
+    <string name="gles_three">GLES 3</string>
+    <string name="desktop_gl">OpenGL</string>
+
+    <!-- About Menu - CPU Info -->
+    <string name="cpu_abi_one">CPU ABI 1</string>
+    <string name="cpu_abi_two">CPU ABI 2</string>
+    <string name="cpu_info">CPU Info</string>
+    <string name="cpu_type">CPU Type</string>
+    <string name="cpu_features">CPU Features</string>
+    <string name="num_cores">Number of Cores</string>
+    <string name="cpu_implementer">CPU Implementer</string>
+    <string name="cpu_hardware">Hardware</string>
+    <string name="unknown_part_num">Unknown (%1$d). Please report this number so it can be documented!</string>
+
+    <!-- Folder Browser -->
+    <string name="current_dir">Current Dir: %1$s</string>
+    <string name="parent_directory">Parent Directory</string>
+    <string name="file_size">File Size: %1$s</string>
+
+
+    <!-- Game List Activity -->
+    <string name="clear_game_list">Clear game list</string>
+    <string name="clear_game_list_confirm">Do you want to clear the game list?</string>
+    <string name="game_list">Game List</string>
+    <string name="browse_folder">Browse Folder</string>
+    <string name="settings">Settings</string>
+    <string name="about">About</string>
+    <string name="file_size_gib">File Size: %.2f GiB</string>
+    <string name="file_size_mib">File Size: %.2f MiB</string>
+
+    <!-- Game List Activity - Device Compatibility AlertDialog -->
+    <string name="device_compat_warning">Device Compatibility Warning</string>
+    <string name="device_compat_warning_msg">Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?</string>
+    <string name="device_gles3compat_warning_msg">Your device has known buggy video drivers for OpenGL ES 3.\nDo you want to try anyway?</string>
+
+    <!-- Game List Fragment -->
+    <string name="file_clicked">File clicked: %1$s</string>
+
+    <!-- Emulation Overlay -->
+    <string name="enable_input_overlay">Enable Input Overlay</string>
+    <string name="disable_input_overlay">Disable Input Overlay</string>
+    <string name="overlay_screenshot">Take Screenshot</string>
+    <string name="overlay_savestate">Save State</string>
+    <string name="overlay_loadstate">Load State</string>
+    <string name="overlay_exit_emulation">Exit</string>
+    <string name="overlay_exit_emulation_confirm">Are you sure you wish to exit this game?</string>
+    <string name="overlay_slot1">Slot 1</string>
+    <string name="overlay_slot2">Slot 2</string>
+    <string name="overlay_slot3">Slot 3</string>
+    <string name="overlay_slot4">Slot 4</string>
+    <string name="overlay_slot5">Slot 5</string>
+
+    <!-- Input Config Fragment -->
+    <string name="input_settings">Input</string>
+    <string name="input_overlay">Input Overlay</string>
+    <string name="input_overlay_desc">Configure the onscreen input overlay.</string>
+    <string name="input_overlay_layout">Input Overlay Layout</string>
+    <string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
+    <string name="controls_size">Adjust the control size</string>
+    <string name="gamecube_bindings">GameCube Controller Bindings</string>
+    <string name="controller_0">Controller 1</string>
+    <string name="controller_1">Controller 2</string>
+    <string name="controller_2">Controller 3</string>
+    <string name="controller_3">Controller 4</string>
+    <string name="enable_controller">Enable controller</string>
+    <string name="wiimote_bindings">Wiimote Bindings</string>
+    <string name="wiimote_1">Wiimote 1</string>
+    <string name="wiimote_2">Wiimote 2</string>
+    <string name="wiimote_3">Wiimote 3</string>
+    <string name="wiimote_4">Wiimote 4</string>
+    <string name="enable_wiimote">Enable Wiimote</string>
+    <string name="input_binding">Input Binding</string>
+    <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
+    <!-- GameCube buttons (May be shared with Wiimote stuff too) -->
+    <string name="button_a">Button A</string>
+    <string name="button_b">Button B</string>
+    <string name="button_start">Button Start</string>
+    <string name="button_x">Button X</string>
+    <string name="button_y">Button Y</string>
+    <string name="button_z">Button Z</string>
+    <string name="dpad_up">D-Pad Up</string>
+    <string name="dpad_down">D-Pad Down</string>
+    <string name="dpad_left">D-Pad Left</string>
+    <string name="dpad_right">D-Pad Right</string>
+    <string name="main_stick_up">Main Stick Up</string>
+    <string name="main_stick_down">Main Stick Down</string>
+    <string name="main_stick_left">Main Stick Left</string>
+    <string name="main_stick_right">Main Stick Right</string>
+    <string name="c_stick_up">C Stick Up</string>
+    <string name="c_stick_down">C Stick Down</string>
+    <string name="c_stick_left">C Stick Left</string>
+    <string name="c_stick_right">C Stick Right</string>
+    <string name="trigger_left">Trigger L</string>
+    <string name="trigger_right">Trigger R</string>
+    <!-- Wiimote (+ extension) only buttons -->
+    <string name="button_one">Button 1</string>
+    <string name="button_two">Button 2</string>
+    <string name="button_plus">Button +</string>
+    <string name="button_minus">Button -</string>
+    <string name="button_home">Button Home</string>
+    <string name="ir_up">IR Up</string>
+    <string name="ir_down">IR Down</string>
+    <string name="ir_left">IR Left</string>
+    <string name="ir_right">IR Right</string>
+    <string name="ir_forward">IR Forward</string>
+    <string name="ir_backward">IR Backward</string>
+    <string name="swing_up">Swing Up</string>
+    <string name="swing_down">Swing Down</string>
+    <string name="swing_left">Swing Left</string>
+    <string name="swing_right">Swing Right</string>
+    <string name="tilt_forward">Tilt Forward</string>
+    <string name="tilt_backward">Tilt Backward</string>
+    <string name="tilt_left">Tilt Left</string>
+    <string name="tilt_right">Tilt Right</string>
+    <string name="shake_x">Shake X</string>
+    <string name="shake_y">Shake Y</string>
+    <string name="shake_z">Shake Z</string>
+
+    <!-- CPU Preference Fragment -->
+    <string name="interpreter">Interpreter</string>
+    <string name="jit64_recompiler">JIT64 Recompiler</string>
+    <string name="jitil_recompiler">JITIL Recompiler</string>
+    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
+    <string name="jit_arm64_recompiler">JIT ARM64 Recompiler</string>
+    <string name="cpu_settings">CPU</string>
+    <string name="cpu_core">CPU Core</string>
+    <string name="cpu_core_desc">%s</string>
+    <string name="dual_core">Dual Core</string>
+    <string name="dual_core_descrip">Split workload to two CPU cores instead of one. Increases speed.</string>
+    <string name="fastmem">Fastmem</string>
+    <string name="fastmem_desc">Uses potentially unsafe optimizations for memory access.</string>
+
+    <!-- Video Preference Fragment -->
+    <string name="video_settings">Video</string>
+    <string name="software_renderer">Software Renderer</string>
+    <string name="opengl_es3">OpenGL ES</string>
+    <string name="opengl">OpenGL</string>
+    <string name="video_backend">Video Backend</string>
+    <string name="video_backend_desc">%s</string>
+    <string name="show_fps">Show FPS</string>
+    <string name="show_fps_descrip">Show the number of frames rendered per second as a measure of emulation speed.</string>
+
+    <string name="enhancements">Enhancements</string>
+    <string name="internal_resolution">Internal Resolution</string>
+    <string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string>
+    <string name="FSAA">Full-scene Anti-aliasing</string>
+    <string name="FSAA_descrip">Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues.</string>
+    <string name="anisotropic_filtering">Anisotropic Filtering</string>
+    <string name="anisotropic_filtering_descrip">Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games.</string>
+    <string name="postprocessing_shader">Post Processing Shader</string>
+    <string name="postprocessing_shader_descrip">Apply a post-processing effect after finishing a frame.</string>
+    <string name="scaled_efb_copy">Scaled EFB Copy</string>
+    <string name="scaled_efb_copy_descrip">Greatly increases quality of textures generated using render to texture effects. Raising the internal resolution will improve the effect of this setting. Slightly decreases performance and possibly causes issues (although unlikely).</string>
+    <string name="per_pixel_lighting">Per-Pixel Lighting</string>
+    <string name="per_pixel_lighting_descrip">Calculate lighting of 3D graphics per-pixel rather than per vertex. Decreases emulation speed by some percent (depending on your GPU). This usually is a safe enhancement, but might cause issues sometimes.</string>
+    <string name="force_texture_filtering">Force Texture Filtering</string>
+    <string name="force_texture_filtering_descrip">Force texture filtering even if the emulated game explicitly disabled it. Improves texture quality slightly but causes glitches in some games.</string>
+    <string name="disable_fog">Disable Fog</string>
+    <string name="disable_fog_descrip">Makes distant objects more visible by removing fog, thus increasing the overall detail. Disabling fog will break some games which rely on proper fog emulation.</string>
+    <string name="stereoscopy">Stereoscopy</string>
+    <string name="stereoscopy_descrip">Stereoscopy allows you to get a better feeling of depth if you have the necessary hardware.\nHeavily decreases emulation speed and sometimes causes issues</string>
+    <string name="stereoscopy_mode">Stereoscopy Mode</string>
+    <string name="stereoscopy_mode_descrip">Select the stereoscopic 3D mode.</string>
+    <string name="sterescopy_depth">Depth</string>
+    <string name="sterescopy_depth_descrip">Control the distance between the virtual cameras.\nA higher value creates a stronger feeling of depth while a lower value is more comfortable.</string>
+    <string name="convergence">Convergence</string>
+    <string name="convergence_descrip">Control the distance of the convergence plane, this is the distance at which objects will appear to be in front of the screen.\nA higher value creates stronger out-of-screen effects while a lower value is more comfortable.</string>
+    <string name="swap_eyes">Swap Eyes</string>
+    <string name="swap_eyes_descrip">Swap the left and right eye, mostly useful if you want to view side-by-side cross-eyed.</string>
+
+    <string name="hacks">Hacks</string>
+    <string name="embedded_frame_buffer">Embedded Frame Buffer</string>
+    <string name="skip_efb_access">Skip EFB Access from CPU</string>
+    <string name="skip_efb_access_descrip">Ignore any requests from the CPU to read/write to the EFB.</string>
+    <string name="ignore_format_changes">Ignore Format Changes</string>
+    <string name="ignore_format_changes_descrip">Ignore any changes to the EFB format.</string>
+    <string name="efb_copy_method">EFB Copy Method</string>
+    <string name="efb_copy_method_descrip">Determines how EFB copies will be emulated.</string>
+    <string name="efb_copy_texture">Texture</string>
+    <string name="efb_copy_ram_uncached">RAM (uncached)</string>
+    <string name="efb_copy_ram_cached">RAM (cached)</string>
+    <string name="texture_cache">Texture Cache</string>
+    <string name="texture_cache_accuracy">Texture Cache Accuracy</string>
+    <string name="texture_cache_accuracy_descrip">The safer the selection, the less likely the emulator will be missing any texture updates from RAM.</string>
+    <string name="texture_cache_accuracy_low">Low</string>
+    <string name="texture_cache_accuracy_medium">Medium</string>
+    <string name="texture_cache_accuracy_high">High</string>
+    <string name="external_frame_buffer">External Frame Buffer</string>
+    <string name="external_frame_buffer_descrip">Determines how the XFB will be emulated.</string>
+    <string name="external_frame_buffer_virtual">Virtual</string>
+    <string name="external_frame_buffer_real">Real</string>
+    <string name="disable_destination_alpha">Disable Destination Alpha</string>
+    <string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
+    <string name="fast_depth_calculation">Fast Depth Calculation</string>
+    <string name="fast_depth_calculation_descrip">Uses a less accurate algorithm to calculate depth values.</string>
+    <string name="aspect_ratio">Aspect Ratio</string>
+    <string name="aspect_ratio_descrip">Select what aspect ratio to use when rendering</string>
+
+    <!-- Miscellaneous -->
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="cancel">Cancel</string>
+    <string name="disabled">Disabled</string>
+    <string name="other">Other</string>
+
+    <!-- New UI Strings -->
+    <string name="title_new_ui">Dolphin New UI</string>
+
+
+    <!-- Game Grid Screen-->
+    <string name="grid_menu_settings">Settings</string>
+    <string name="grid_menu_refresh">Refresh Library</string>
+
+    <!-- Add Directory Screen-->
+    <string name="add_directory_title">Add Folder to Library</string>
+    <string name="add_directory_up_one_level">Up one level</string>
+    <string name="add_directory_empty_folder">That folder is empty.</string>
+
+    <!-- Preferences Screen -->
+    <string name="preferences_cpu">CPU Settings</string>
+    <string name="preferences_input">Input Settings</string>
+    <string name="preferences_video">Video Settings</string>
+    <string name="emulation_title">Emulation Activity</string>
+
+    <string name="emulation_toggle_input">Toggle Input Overlay</string>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..bec7fc0035
--- /dev/null
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- inherit from the material theme -->
+    <style name="DolphinBase" parent="android:Theme.Material.Light.NoActionBar">
+        <!-- Main theme colors -->
+        <!--   your app branding color for the app bar -->
+        <item name="android:colorPrimary">@color/dolphin_blue</item>
+        <!--   darker variant for the status bar and contextual app bars -->
+        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    </style>
+
+    <!-- Same as above, but use default action bar, and mandate margins. -->
+    <style name="DolphinSettingsBase" parent="android:Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/dolphin_blue</item>
+        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    </style>
+
+    <!-- Inherit from the Base Dolphin Theme-->
+    <style name="DolphinWii" parent="DolphinBase">
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+    </style>
+
+    <style name="DolphinGamecube" parent="DolphinBase">
+        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
+    <style name="DolphinWiiware" parent="DolphinBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+    </style>
+
+    <!-- Inherit from the Base Dolphin Settings Theme-->
+    <style name="DolphinSettingsWii" parent="DolphinSettingsBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+    </style>
+
+    <style name="DolphinSettingsGamecube" parent="DolphinSettingsBase">
+        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
+    <style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+    </style>
+
+    <!-- Themes for Dialogs -->
+    <style name="DolphinDialogBase" parent="android:Theme.Material.Light.Dialog">
+        <item name="android:colorPrimary">@color/dolphin_blue</item>
+        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    </style>
+
+    <!-- Inherit from the Base Dolphin Dialog Theme-->
+    <style name="DolphinDialogWii" parent="DolphinDialogBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+    </style>
+
+    <style name="DolphinDialogGamecube" parent="DolphinDialogBase">
+        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
+    <style name="DolphinDialogWiiware" parent="DolphinDialogBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+    </style>
+
+    <style name="DolphinEmulationBase" parent="android:Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/dolphin_blue</item>
+        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <!-- Inherit from the Base Dolphin Emulation Theme-->
+    <style name="DolphinEmulationWii" parent="DolphinEmulationBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
+    </style>
+
+    <style name="DolphinEmulationGamecube" parent="DolphinEmulationBase">
+        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
+    <style name="DolphinEmulationWiiware" parent="DolphinEmulationBase">
+        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000000..7e6a9f09ce
--- /dev/null
+++ b/Source/Android/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="preferences_cpu"
+        android:title="@string/preferences_cpu">
+
+        <!-- CPU Settings -->
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="dualCorePref"
+            android:summary="@string/dual_core_descrip"
+            android:title="@string/dual_core"/>
+
+        <ListPreference
+            android:key="cpuCorePref"
+            android:summary="@string/cpu_core_desc"
+            android:title="@string/cpu_core"
+            android:entries="@array/string_emu_cores"
+            android:entryValues="@array/int_emu_cores"/>
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="fastmemPref"
+            android:summary="@string/fastmem_desc"
+            android:title="@string/fastmem"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="preferences_input"
+        android:title="@string/preferences_input">
+
+        <PreferenceScreen
+            android:key="input_overlay"
+            android:summary="@string/input_overlay_desc"
+            android:title="@string/input_overlay">
+
+            <Preference
+                android:key="inputOverlayConfigPref"
+                android:summary="@string/input_overlay_layout_desc"
+                android:title="@string/input_overlay_layout">
+
+                <intent
+                    android:targetClass="org.dolphinemu.dolphinemu.settings.input.overlayconfig.OverlayConfigActivity"
+                    android:targetPackage="org.dolphinemu.dolphinemu.debug"/>
+
+            </Preference>
+
+            <SeekBarPreference
+                android:defaultValue="25"
+                android:key="controls_size"
+                android:max="75"
+                android:title="@string/controls_size"/>
+
+        </PreferenceScreen>
+
+        <!-- GameCube controller bindings -->
+        <PreferenceScreen
+            android:key="gamecube_bindings"
+            android:title="@string/gamecube_bindings">
+            <PreferenceScreen
+                android:key="gamecube_bindings_control_0"
+                android:title="@string/controller_0">
+                <CheckBoxPreference
+                    android:key="enableController1"
+                    android:title="@string/enable_controller"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputA_0"
+                    android:summary="%s"
+                    android:title="@string/button_a"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputB_0"
+                    android:summary="%s"
+                    android:title="@string/button_b"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputX_0"
+                    android:summary="%s"
+                    android:title="@string/button_x"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputY_0"
+                    android:summary="%s"
+                    android:title="@string/button_y"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputZ_0"
+                    android:summary="%s"
+                    android:title="@string/button_z"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputStart_0"
+                    android:summary="%s"
+                    android:title="@string/button_start"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="DPadUp_0"
+                    android:summary="%s"
+                    android:title="@string/dpad_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="DPadDown_0"
+                    android:summary="%s"
+                    android:title="@string/dpad_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="DPadLeft_0"
+                    android:summary="%s"
+                    android:title="@string/dpad_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="DPadRight_0"
+                    android:summary="%s"
+                    android:title="@string/dpad_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="MainUp_0"
+                    android:summary="%s"
+                    android:title="@string/main_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="MainDown_0"
+                    android:summary="%s"
+                    android:title="@string/main_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="MainLeft_0"
+                    android:summary="%s"
+                    android:title="@string/main_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="MainRight_0"
+                    android:summary="%s"
+                    android:title="@string/main_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="CStickUp_0"
+                    android:summary="%s"
+                    android:title="@string/c_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="CStickDown_0"
+                    android:summary="%s"
+                    android:title="@string/c_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="CStickLeft_0"
+                    android:summary="%s"
+                    android:title="@string/c_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="CStickRight_0"
+                    android:summary="%s"
+                    android:title="@string/c_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputL_0"
+                    android:summary="%s"
+                    android:title="@string/trigger_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController1"
+                    android:key="InputR_0"
+                    android:summary="%s"
+                    android:title="@string/trigger_right"/>
+            </PreferenceScreen>
+            <PreferenceScreen
+                android:key="gamecube_bindings_control_1"
+                android:title="@string/controller_1">
+                <CheckBoxPreference
+                    android:key="enableController2"
+                    android:title="@string/enable_controller"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputA_1"
+                    android:summary="%s"
+                    android:title="@string/button_a"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputB_1"
+                    android:summary="%s"
+                    android:title="@string/button_b"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputX_1"
+                    android:summary="%s"
+                    android:title="@string/button_x"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputY_1"
+                    android:summary="%s"
+                    android:title="@string/button_y"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputZ_1"
+                    android:summary="%s"
+                    android:title="@string/button_z"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputStart_1"
+                    android:summary="%s"
+                    android:title="@string/button_start"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="DPadUp_1"
+                    android:summary="%s"
+                    android:title="@string/dpad_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="DPadDown_1"
+                    android:summary="%s"
+                    android:title="@string/dpad_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="DPadLeft_1"
+                    android:summary="%s"
+                    android:title="@string/dpad_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="DPadRight_1"
+                    android:summary="%s"
+                    android:title="@string/dpad_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="MainUp_1"
+                    android:summary="%s"
+                    android:title="@string/main_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="MainDown_1"
+                    android:summary="%s"
+                    android:title="@string/main_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="MainLeft_1"
+                    android:summary="%s"
+                    android:title="@string/main_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="MainRight_1"
+                    android:summary="%s"
+                    android:title="@string/main_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="CStickUp_1"
+                    android:summary="%s"
+                    android:title="@string/c_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="CStickDown_1"
+                    android:summary="%s"
+                    android:title="@string/c_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="CStickLeft_1"
+                    android:summary="%s"
+                    android:title="@string/c_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="CStickRight_1"
+                    android:summary="%s"
+                    android:title="@string/c_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputL_1"
+                    android:summary="%s"
+                    android:title="@string/trigger_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController2"
+                    android:key="InputR_1"
+                    android:summary="%s"
+                    android:title="@string/trigger_right"/>
+            </PreferenceScreen>
+            <PreferenceScreen
+                android:key="gamecube_bindings_control_2"
+                android:title="@string/controller_2">
+                <CheckBoxPreference
+                    android:key="enableController3"
+                    android:title="@string/enable_controller"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputA_2"
+                    android:summary="%s"
+                    android:title="@string/button_a"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputB_2"
+                    android:summary="%s"
+                    android:title="@string/button_b"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputX_2"
+                    android:summary="%s"
+                    android:title="@string/button_x"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputY_2"
+                    android:summary="%s"
+                    android:title="@string/button_y"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputZ_2"
+                    android:summary="%s"
+                    android:title="@string/button_z"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputStart_2"
+                    android:summary="%s"
+                    android:title="@string/button_start"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="DPadUp_2"
+                    android:summary="%s"
+                    android:title="@string/dpad_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="DPadDown_2"
+                    android:summary="%s"
+                    android:title="@string/dpad_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="DPadLeft_2"
+                    android:summary="%s"
+                    android:title="@string/dpad_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="DPadRight_2"
+                    android:summary="%s"
+                    android:title="@string/dpad_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="MainUp_2"
+                    android:summary="%s"
+                    android:title="@string/main_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="MainDown_2"
+                    android:summary="%s"
+                    android:title="@string/main_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="MainLeft_2"
+                    android:summary="%s"
+                    android:title="@string/main_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="MainRight_2"
+                    android:summary="%s"
+                    android:title="@string/main_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="CStickUp_2"
+                    android:summary="%s"
+                    android:title="@string/c_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="CStickDown_2"
+                    android:summary="%s"
+                    android:title="@string/c_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="CStickLeft_2"
+                    android:summary="%s"
+                    android:title="@string/c_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="CStickRight_2"
+                    android:summary="%s"
+                    android:title="@string/c_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputL_2"
+                    android:summary="%s"
+                    android:title="@string/trigger_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController3"
+                    android:key="InputR_2"
+                    android:summary="%s"
+                    android:title="@string/trigger_right"/>
+            </PreferenceScreen>
+            <PreferenceScreen
+                android:key="gamecube_bindings_control_3"
+                android:title="@string/controller_3">
+                <CheckBoxPreference
+                    android:key="enableController4"
+                    android:title="@string/enable_controller"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputA_3"
+                    android:summary="%s"
+                    android:title="@string/button_a"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputB_3"
+                    android:summary="%s"
+                    android:title="@string/button_b"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputX_3"
+                    android:summary="%s"
+                    android:title="@string/button_x"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputY_3"
+                    android:summary="%s"
+                    android:title="@string/button_y"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputZ_3"
+                    android:summary="%s"
+                    android:title="@string/button_z"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputStart_3"
+                    android:summary="%s"
+                    android:title="@string/button_start"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="DPadUp_3"
+                    android:summary="%s"
+                    android:title="@string/dpad_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="DPadDown_3"
+                    android:summary="%s"
+                    android:title="@string/dpad_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="DPadLeft_3"
+                    android:summary="%s"
+                    android:title="@string/dpad_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="DPadRight_3"
+                    android:summary="%s"
+                    android:title="@string/dpad_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="MainUp_3"
+                    android:summary="%s"
+                    android:title="@string/main_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="MainDown_3"
+                    android:summary="%s"
+                    android:title="@string/main_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="MainLeft_3"
+                    android:summary="%s"
+                    android:title="@string/main_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="MainRight_3"
+                    android:summary="%s"
+                    android:title="@string/main_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="CStickUp_3"
+                    android:summary="%s"
+                    android:title="@string/c_stick_up"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="CStickDown_3"
+                    android:summary="%s"
+                    android:title="@string/c_stick_down"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="CStickLeft_3"
+                    android:summary="%s"
+                    android:title="@string/c_stick_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="CStickRight_3"
+                    android:summary="%s"
+                    android:title="@string/c_stick_right"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputL_3"
+                    android:summary="%s"
+                    android:title="@string/trigger_left"/>
+
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                    android:dependency="enableController4"
+                    android:key="InputR_3"
+                    android:summary="%s"
+                    android:title="@string/trigger_right"/>
+            </PreferenceScreen>
+        </PreferenceScreen>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="preferences_video"
+        android:title="@string/preferences_video"><!-- Video Settings -->
+
+
+        <!-- Video Enhancements -->
+        <PreferenceScreen
+            android:title="@string/enhancements"
+            android:key="enhancements">
+
+            <ListPreference
+                android:entries="@array/internalResolutionEntries"
+                android:entryValues="@array/internalResolutionValues"
+                android:key="internalResolution"
+                android:summary="@string/internal_resolution_descrip"
+                android:title="@string/internal_resolution"/>
+
+            <ListPreference
+                android:entries="@array/FSAAEntries"
+                android:entryValues="@array/FSAAValues"
+                android:key="FSAA"
+                android:summary="@string/FSAA_descrip"
+                android:title="@string/FSAA"/>
+
+            <ListPreference
+                android:entries="@array/anisotropicFilteringEntries"
+                android:entryValues="@array/anisotropicFilteringValues"
+                android:key="anisotropicFiltering"
+                android:summary="@string/anisotropic_filtering_descrip"
+                android:title="@string/anisotropic_filtering"/>
+
+            <ListPreference
+                android:key="postProcessingShader"
+                android:summary="@string/postprocessing_shader_descrip"
+                android:title="@string/postprocessing_shader"/>
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="scaledEFBCopy"
+                android:summary="@string/scaled_efb_copy_descrip"
+                android:title="@string/scaled_efb_copy"/>
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="perPixelLighting"
+                android:summary="@string/per_pixel_lighting_descrip"
+                android:title="@string/per_pixel_lighting"/>
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="forceTextureFiltering"
+                android:summary="@string/force_texture_filtering_descrip"
+                android:title="@string/force_texture_filtering"/>
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="disableFog"
+                android:summary="@string/disable_fog_descrip"
+                android:title="@string/disable_fog"/>
+
+            <PreferenceScreen
+                android:key="StereoscopyScreen"
+                android:summary="@string/stereoscopy_descrip"
+                android:title="@string/stereoscopy">
+
+                <ListPreference
+                    android:entries="@array/stereoscopyEntries"
+                    android:entryValues="@array/stereoscopyValues"
+                    android:key="stereoscopyMode"
+                    android:summary="@string/stereoscopy_mode_descrip"
+                    android:title="@string/stereoscopy_mode"/>
+
+                <org.dolphinemu.dolphinemu.utils.SliderPreference
+                    android:defaultValue="20"
+                    android:key="stereoDepth"
+                    android:max="100"
+                    android:summary="@string/sterescopy_depth_descrip"
+                    android:title="@string/sterescopy_depth"/>
+
+                <org.dolphinemu.dolphinemu.utils.SliderPreference
+                    android:defaultValue="20"
+                    android:key="stereoConvergence"
+                    android:max="500"
+                    android:summary="@string/convergence_descrip"
+                    android:title="@string/convergence"/>
+
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="stereoSwapEyes"
+                    android:summary="@string/swap_eyes_descrip"
+                    android:title="@string/swap_eyes"/>
+            </PreferenceScreen>
+        </PreferenceScreen>
+
+        <!-- Video Hacks -->
+        <PreferenceScreen
+            android:title="@string/hacks"
+            android:key="hacks">
+            <PreferenceCategory android:title="@string/embedded_frame_buffer">
+
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="skipEFBAccess"
+                    android:summary="@string/skip_efb_access_descrip"
+                    android:title="@string/skip_efb_access"/>
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="ignoreFormatChanges"
+                    android:summary="@string/ignore_format_changes_descrip"
+                    android:title="@string/ignore_format_changes"/>
+
+                <ListPreference
+                    android:defaultValue="Texture"
+                    android:entries="@array/efbCopyMethodEntries"
+                    android:entryValues="@array/efbCopyMethodValues"
+                    android:key="efbCopyMethod"
+                    android:summary="@string/efb_copy_method_descrip"
+                    android:title="@string/efb_copy_method"/>
+
+            </PreferenceCategory>
+
+            <!-- Texture Cache -->
+            <PreferenceCategory android:title="@string/texture_cache">
+                <ListPreference
+                    android:defaultValue="Low"
+                    android:entries="@array/textureCacheAccuracyEntries"
+                    android:entryValues="@array/textureCacheAccuracyValues"
+                    android:key="textureCacheAccuracy"
+                    android:summary="@string/texture_cache_accuracy_descrip"
+                    android:title="@string/texture_cache_accuracy"/>
+            </PreferenceCategory>
+
+            <!-- External Frame Buffer -->
+            <PreferenceCategory android:title="@string/external_frame_buffer">
+                <ListPreference
+                    android:defaultValue="Disabled"
+                    android:entries="@array/externalFrameBufferEntries"
+                    android:entryValues="@array/externalFrameBufferValues"
+                    android:key="externalFrameBuffer"
+                    android:summary="@string/external_frame_buffer_descrip"
+                    android:title="@string/external_frame_buffer"/>
+            </PreferenceCategory>
+
+
+            <!-- Other Hacks -->
+            <PreferenceCategory android:title="@string/other">
+
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="disableDestinationAlpha"
+                    android:summary="@string/disable_destination_alpha_descrip"
+                    android:title="@string/disable_destination_alpha"/>
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="fastDepthCalculation"
+                    android:summary="@string/fast_depth_calculation_descrip"
+                    android:title="@string/fast_depth_calculation"/>
+
+                <ListPreference
+                    android:defaultValue="0"
+                    android:entries="@array/aspectRatioEntries"
+                    android:entryValues="@array/aspectRatioValues"
+                    android:key="aspectRatio"
+                    android:summary="@string/aspect_ratio_descrip"
+                    android:title="@string/aspect_ratio"/>
+
+            </PreferenceCategory>
+        </PreferenceScreen>
+
+        <ListPreference
+            android:key="gpuPref"
+            android:summary="@string/video_backend_desc"
+            android:title="@string/video_backend"/>
+
+        <CheckBoxPreference
+            android:key="showFPS"
+            android:summary="@string/show_fps_descrip"
+            android:title="@string/show_fps"/>
+
+    </PreferenceCategory>
+
+    <!-- TODO Add the About information here too. -->
+</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/app/src/x86_64/res/values/arrays.xml b/Source/Android/app/src/x86_64/res/values/arrays.xml
new file mode 100644
index 0000000000..a6eeff8c60
--- /dev/null
+++ b/Source/Android/app/src/x86_64/res/values/arrays.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- All lists for ListPreference keys/values are placed here -->
+<resources>
+
+    <!-- New UI CPU Core selection - x86_64 -->
+    <string-array name="string_emu_cores" translatable="false">
+        <item>@string/interpreter</item>
+        <item>@string/jit64_recompiler</item>
+        <item>@string/jitil_recompiler</item>
+    </string-array>
+    <string-array name="int_emu_cores" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/x86_64/res/values/strings.xml b/Source/Android/app/src/x86_64/res/values/strings.xml
new file mode 100644
index 0000000000..ec82295355
--- /dev/null
+++ b/Source/Android/app/src/x86_64/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Title of the app -->
+    <string name="title_new_ui">Dolphin ARM32</string>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/assets/ButtonA.png b/Source/Android/assets/ButtonA.png
deleted file mode 100644
index 7e685324ae..0000000000
Binary files a/Source/Android/assets/ButtonA.png and /dev/null differ
diff --git a/Source/Android/assets/ButtonB.png b/Source/Android/assets/ButtonB.png
deleted file mode 100644
index 21da4c20f1..0000000000
Binary files a/Source/Android/assets/ButtonB.png and /dev/null differ
diff --git a/Source/Android/assets/ButtonStart.png b/Source/Android/assets/ButtonStart.png
deleted file mode 100644
index e79a9269ee..0000000000
Binary files a/Source/Android/assets/ButtonStart.png and /dev/null differ
diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini
deleted file mode 100644
index 944bbf75bb..0000000000
--- a/Source/Android/assets/Dolphin.ini
+++ /dev/null
@@ -1,186 +0,0 @@
-[General]
-GCMPathes = 0
-LastFilename = 
-ShowLag = False
-RecursiveGCMPaths = False
-NANDRoot = //sdcard/dolphin-emu/Wii
-WirelessMac = 
-[Core]
-CPUCore = 3
-CPUThread = False
-GFXBackend = Software Renderer
-HLE_BS2 = False
-Fastmem = False
-DSPThread = False
-DSPHLE = True
-SkipIdle = True
-DefaultGCM = 
-DVDRoot = 
-Apploader = 
-EnableCheats = False
-SelectedLanguage = 0
-DPL2Decoder = False
-Latency = 14
-MemcardA = 
-MemcardB = 
-SlotA = 1
-SlotB = 255
-SerialPort1 = 255
-BBA_MAC = 
-SIDevice0 = 6
-SIDevice1 = 0
-SIDevice2 = 0
-SIDevice3 = 0
-WiiSDCard = False
-WiiKeyboard = False
-WiimoteReconnectOnLoad = True
-WiimoteContinuousScanning = False
-WiimoteEnableSpeaker = True
-RunCompareServer = False
-RunCompareClient = False
-FrameLimit = 0x00000001
-UseFPS = False
-[Interface]
-ConfirmStop = False
-UsePanicHandlers = True
-OnScreenDisplayMessages = True
-HideCursor = False
-AutoHideCursor = False
-MainWindowPosX = 100
-MainWindowPosY = 100
-MainWindowWidth = 800
-MainWindowHeight = 600
-Language = 0
-ShowToolbar = True
-ShowStatusbar = True
-ShowLogWindow = False
-ShowLogConfigWindow = False
-ShowConsole = False
-ThemeName40 = Clean
-[Hotkeys]
-Open = 79
-OpenModifier = 2
-ChangeDisc = 0
-ChangeDiscModifier = 0
-RefreshList = 0
-RefreshListModifier = 0
-PlayPause = 349
-PlayPauseModifier = 0
-Stop = 27
-StopModifier = 0
-Reset = 0
-ResetModifier = 0
-FrameAdvance = 0
-FrameAdvanceModifier = 0
-StartRecording = 0
-StartRecordingModifier = 0
-PlayRecording = 0
-PlayRecordingModifier = 0
-ExportRecording = 0
-ExportRecordingModifier = 0
-Readonlymode = 0
-ReadonlymodeModifier = 0
-ToggleFullscreen = 13
-ToggleFullscreenModifier = 1
-Screenshot = 348
-ScreenshotModifier = 0
-Exit = 0
-ExitModifier = 0
-Wiimote1Connect = 344
-Wiimote1ConnectModifier = 1
-Wiimote2Connect = 345
-Wiimote2ConnectModifier = 1
-Wiimote3Connect = 346
-Wiimote3ConnectModifier = 1
-Wiimote4Connect = 347
-Wiimote4ConnectModifier = 1
-LoadStateSlot1 = 340
-LoadStateSlot1Modifier = 0
-LoadStateSlot2 = 341
-LoadStateSlot2Modifier = 0
-LoadStateSlot3 = 342
-LoadStateSlot3Modifier = 0
-LoadStateSlot4 = 343
-LoadStateSlot4Modifier = 0
-LoadStateSlot5 = 344
-LoadStateSlot5Modifier = 0
-LoadStateSlot6 = 345
-LoadStateSlot6Modifier = 0
-LoadStateSlot7 = 346
-LoadStateSlot7Modifier = 0
-LoadStateSlot8 = 347
-LoadStateSlot8Modifier = 0
-SaveStateSlot1 = 340
-SaveStateSlot1Modifier = 4
-SaveStateSlot2 = 341
-SaveStateSlot2Modifier = 4
-SaveStateSlot3 = 342
-SaveStateSlot3Modifier = 4
-SaveStateSlot4 = 343
-SaveStateSlot4Modifier = 4
-SaveStateSlot5 = 344
-SaveStateSlot5Modifier = 4
-SaveStateSlot6 = 345
-SaveStateSlot6Modifier = 4
-SaveStateSlot7 = 346
-SaveStateSlot7Modifier = 4
-SaveStateSlot8 = 347
-SaveStateSlot8Modifier = 4
-LoadLastState1 = 0
-LoadLastState1Modifier = 0
-LoadLastState2 = 0
-LoadLastState2Modifier = 0
-LoadLastState3 = 0
-LoadLastState3Modifier = 0
-LoadLastState4 = 0
-LoadLastState4Modifier = 0
-LoadLastState5 = 0
-LoadLastState5Modifier = 0
-LoadLastState6 = 0
-LoadLastState6Modifier = 0
-LoadLastState7 = 0
-LoadLastState7Modifier = 0
-LoadLastState8 = 0
-LoadLastState8Modifier = 0
-SaveFirstState = 0
-SaveFirstStateModifier = 0
-UndoLoadState = 351
-UndoLoadStateModifier = 0
-UndoSaveState = 351
-UndoSaveStateModifier = 4
-[Display]
-FullscreenResolution = Auto
-Fullscreen = False
-RenderToMain = False
-RenderWindowXPos = -1
-RenderWindowYPos = -1
-RenderWindowWidth = 640
-RenderWindowHeight = 480
-RenderWindowAutoSize = False
-KeepWindowOnTop = False
-ProgressiveScan = False
-DisableScreenSaver = True
-ForceNTSCJ = False
-[GameList]
-ListDrives = False
-ListWad = True
-ListWii = True
-ListGC = True
-ListJap = True
-ListPal = True
-ListUsa = True
-ListFrance = True
-ListItaly = True
-ListKorea = True
-ListTaiwan = True
-ListUnknown = True
-ListSort = 3
-ListSortSecondary = 0
-[Movie]
-PauseMovie = False
-Author = 
-[DSP]
-EnableJIT = True
-DumpAudio = False
-Backend = OpenSLES
-Volume = 100
diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
deleted file mode 100644
index 42144db1ce..0000000000
--- a/Source/Android/assets/GCPadNew.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[GCPad1]
-Device = Android/0/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 10`
-Main Stick/Down = `Axis 11`
-Main Stick/Left = `Axis 12`
-Main Stick/Right = `Axis 13`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 14`
-C-Stick/Down = `Axis 15`
-C-Stick/Left = `Axis 16`
-C-Stick/Right = `Axis 17`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 18`
-Triggers/R = `Axis 19`
-D-Pad/Up = `Button 6`
-D-Pad/Down = `Button 7`
-D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
-[GCPad2]
-[GCPad3]
-[GCPad4]
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
new file mode 100644
index 0000000000..9405f3fd18
--- /dev/null
+++ b/Source/Android/build.gradle
@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/Source/Android/build.xml b/Source/Android/build.xml
deleted file mode 100644
index dc36e5c45a..0000000000
--- a/Source/Android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Dolphin Emulator" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/Source/Android/code-style-java.jar b/Source/Android/code-style-java.jar
new file mode 100644
index 0000000000..04a041c048
Binary files /dev/null and b/Source/Android/code-style-java.jar differ
diff --git a/Source/Android/custom_rules.xml b/Source/Android/custom_rules.xml
deleted file mode 100644
index c19d48e25f..0000000000
--- a/Source/Android/custom_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Dolphin" default="help">
-    <property name="ndkbuildopt" value=""/>
-    <target name="-pre-build">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg line="-j4 ${ndkbuildopt}"/>
-        </exec>
-	<copy todir="${jar.libs.dir}/armeabi-v7a">
-		<fileset
-			dir="../../libs/armeabi-v7a"
-			includes="libmain.so" />
-	</copy>
-    </target>
-    <target name="clean" depends="android_rules.clean">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg value="clean"/>
-        </exec>
-    </target>
-</project>
diff --git a/Source/Android/gradle.properties b/Source/Android/gradle.properties
new file mode 100644
index 0000000000..1d3591c8a4
--- /dev/null
+++ b/Source/Android/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/Source/Android/gradlew b/Source/Android/gradlew
new file mode 100755
index 0000000000..91a7e269e1
--- /dev/null
+++ b/Source/Android/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/Source/Android/gradlew.bat b/Source/Android/gradlew.bat
new file mode 100644
index 0000000000..aec99730b4
--- /dev/null
+++ b/Source/Android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Source/Android/jni/Application.mk b/Source/Android/jni/Application.mk
deleted file mode 100644
index 5941ec944e..0000000000
--- a/Source/Android/jni/Application.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-APP_STL := stlport_static
-APP_ABI := armeabi-v7a 
-
-#APP_ABI := armeabi-v7a
diff --git a/Source/Android/libs/android-support-v13.jar b/Source/Android/libs/android-support-v13.jar
deleted file mode 100644
index e75351a507..0000000000
Binary files a/Source/Android/libs/android-support-v13.jar and /dev/null differ
diff --git a/Source/Android/project.properties b/Source/Android/project.properties
deleted file mode 100644
index a3ee5ab64f..0000000000
--- a/Source/Android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/res/drawable-hdpi/ic_menu_file.png
deleted file mode 100644
index f204740905..0000000000
Binary files a/Source/Android/res/drawable-hdpi/ic_menu_file.png and /dev/null differ
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
deleted file mode 100644
index 6f441b41da..0000000000
Binary files a/Source/Android/res/drawable-hdpi/ic_menu_folder.png and /dev/null differ
diff --git a/Source/Android/res/drawable-hdpi/launcher.png b/Source/Android/res/drawable-hdpi/launcher.png
deleted file mode 100644
index da35bbad81..0000000000
Binary files a/Source/Android/res/drawable-hdpi/launcher.png and /dev/null differ
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/res/drawable-mdpi/ic_menu_file.png
deleted file mode 100644
index dee2577897..0000000000
Binary files a/Source/Android/res/drawable-mdpi/ic_menu_file.png and /dev/null differ
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
deleted file mode 100644
index cc81e57f7e..0000000000
Binary files a/Source/Android/res/drawable-mdpi/ic_menu_folder.png and /dev/null differ
diff --git a/Source/Android/res/drawable-mdpi/launcher.png b/Source/Android/res/drawable-mdpi/launcher.png
deleted file mode 100644
index 03e5eea949..0000000000
Binary files a/Source/Android/res/drawable-mdpi/launcher.png and /dev/null differ
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
deleted file mode 100644
index 85369c338e..0000000000
Binary files a/Source/Android/res/drawable-xhdpi/ic_menu_file.png and /dev/null differ
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
deleted file mode 100644
index 78500a93c1..0000000000
Binary files a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png and /dev/null differ
diff --git a/Source/Android/res/drawable-xhdpi/launcher.png b/Source/Android/res/drawable-xhdpi/launcher.png
deleted file mode 100644
index 28770da81f..0000000000
Binary files a/Source/Android/res/drawable-xhdpi/launcher.png and /dev/null differ
diff --git a/Source/Android/res/drawable-xxhdpi/launcher.png b/Source/Android/res/drawable-xxhdpi/launcher.png
deleted file mode 100644
index 7cb72b57bb..0000000000
Binary files a/Source/Android/res/drawable-xxhdpi/launcher.png and /dev/null differ
diff --git a/Source/Android/res/drawable/ic_drawer.png b/Source/Android/res/drawable/ic_drawer.png
deleted file mode 100644
index f62119bb3b..0000000000
Binary files a/Source/Android/res/drawable/ic_drawer.png and /dev/null differ
diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml
deleted file mode 100644
index 9c5b84e9ed..0000000000
--- a/Source/Android/res/layout/about_layout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/AboutItemTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
-        android:layout_marginTop="6dip"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <TextView
-        android:id="@+id/AboutItemSubTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/emulation_view.xml b/Source/Android/res/layout/emulation_view.xml
deleted file mode 100644
index 9dcdf11166..0000000000
--- a/Source/Android/res/layout/emulation_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <!-- This is what everything is rendered to during emulation -->
-    <org.dolphinemu.dolphinemu.NativeGLSurfaceView 
-        android:id="@+id/emulationView"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:focusable="false"
-        android:focusableInTouchMode="false"/>
-
-</merge>
\ No newline at end of file
diff --git a/Source/Android/res/layout/gamelist_activity.xml b/Source/Android/res/layout/gamelist_activity.xml
deleted file mode 100644
index 2c22d36afa..0000000000
--- a/Source/Android/res/layout/gamelist_activity.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<android.support.v4.widget.DrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <FrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    <ListView
-            android:id="@+id/left_drawer"
-            android:layout_width="240dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:choiceMode="singleChoice"
-            android:divider="@android:color/transparent"
-            android:dividerHeight="0dp"
-            android:background="#333"/>
-</android.support.v4.widget.DrawerLayout>
diff --git a/Source/Android/res/layout/gamelist_folderbrowser_list.xml b/Source/Android/res/layout/gamelist_folderbrowser_list.xml
deleted file mode 100644
index e386000c79..0000000000
--- a/Source/Android/res/layout/gamelist_folderbrowser_list.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:padding="3dp">
-
-    <ImageView
-        android:id="@+id/ListItemIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginRight="6dip"/>
-
-    <TextView
-        android:id="@+id/ListItemSubTitle"
-        android:layout_width="fill_parent"
-        android:layout_height="26dip" 
-
-        android:layout_toRightOf="@id/ListItemIcon"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-
-        android:singleLine="true"
-        android:ellipsize="marquee"/>
-
-    <TextView
-        android:id="@+id/ListItemTitle"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-
-        android:layout_toRightOf="@id/ListItemIcon"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_above="@id/ListItemSubTitle"
-        android:layout_alignWithParentIfMissing="true"
-
-        android:gravity="center_vertical"
-        android:textStyle="bold" />
-
-</RelativeLayout>
diff --git a/Source/Android/res/layout/gamelist_listview.xml b/Source/Android/res/layout/gamelist_listview.xml
deleted file mode 100644
index bbd1a43c07..0000000000
--- a/Source/Android/res/layout/gamelist_listview.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gamelist"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:choiceMode="singleChoice"
-    android:dividerHeight="1dp"/>
\ No newline at end of file
diff --git a/Source/Android/res/layout/prefs_viewpager.xml b/Source/Android/res/layout/prefs_viewpager.xml
deleted file mode 100644
index f07fc62c46..0000000000
--- a/Source/Android/res/layout/prefs_viewpager.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".PrefsActivity" />
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
deleted file mode 100644
index 2066f4b10b..0000000000
--- a/Source/Android/res/layout/sidemenu.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:gravity="left"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/SideMenuTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginTop="5dip"
-        android:singleLine="true"
-        android:text="@+id/TextView01"
-        android:textAppearance="?android:attr/textAppearanceLarge" 
-        android:textStyle="bold" />
-
-</LinearLayout>
diff --git a/Source/Android/res/menu/emuwindow_overlay.xml b/Source/Android/res/menu/emuwindow_overlay.xml
deleted file mode 100644
index 048e14b8fe..0000000000
--- a/Source/Android/res/menu/emuwindow_overlay.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/saveStateRoot"
-        android:showAsAction="ifRoom"
-        android:title="@string/overlay_savestate">
-        <menu>
-            <item android:id="@+id/saveSlot1"
-                  android:title="@string/overlay_slot1"/>
-
-            <item android:id="@+id/saveSlot2"
-                  android:title="@string/overlay_slot2"/>
-
-            <item android:id="@+id/saveSlot3"
-                  android:title="@string/overlay_slot3"/>
-
-            <item android:id="@+id/saveSlot4"
-                  android:title="@string/overlay_slot4"/>
-
-            <item android:id="@+id/saveSlot5"
-                  android:title="@string/overlay_slot5"/>
-        </menu>
-    </item>
-
-    <item
-        android:id="@+id/loadStateRoot"
-        android:showAsAction="ifRoom"
-        android:title="@string/overlay_loadstate">
-        <menu>
-            <item android:id="@+id/loadSlot1"
-                  android:title="@string/overlay_slot1"/>
-
-            <item android:id="@+id/loadSlot2"
-                  android:title="@string/overlay_slot2"/>
-
-            <item android:id="@+id/loadSlot3"
-                  android:title="@string/overlay_slot3"/>
-
-            <item android:id="@+id/loadSlot4"
-                  android:title="@string/overlay_slot4"/>
-
-            <item android:id="@+id/loadSlot5"
-                  android:title="@string/overlay_slot5"/>
-        </menu>
-    </item>
-</menu>
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
deleted file mode 100644
index 39c6a252bd..0000000000
--- a/Source/Android/res/values-ja/strings.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Title of the app -->
-    <string name="app_name">Dolphin Emulator</string>
-    
-    <!-- Navigation-related Strings -->
-    <string name="drawer_open">ナビゲーションウィンドウを開く</string>
-    <string name="drawer_close">ナビゲーションウィンドウを閉じる</string>
-    
-    <!-- About Fragment -->
-    <string name="build_revision">ビルドのバージョン</string>
-    <string name="supports_gles3">サポートのOpenGL ES 3</string>
-    
-    <!-- Folder Browser -->
-    <string name="current_dir">現在のディレクトリ： </string>
-    <string name="parent_directory">親ディレクトリ</string>
-    <string name="file_size">ファイルサイズ: </string>
-    
-    <!-- Game List Activity -->
-    <string name="clear_game_list">クリア</string>
-    <string name="clear_game_list_confirm">ゲームリストからすべての項目を削除しますか？</string>
-    <string name="game_list">ゲームリスト</string>
-    <string name="browse_folder">フォルダの参照</string>
-    <string name="settings">設定</string>
-    <string name="about">について</string>
-
-    <!-- Game List Fragment -->
-    <string name="file_clicked">クリックされたファイル： </string>
-
-    <!-- Emulation Window Overlay -->
-    <string name="overlay_savestate">ステートセーブ</string>
-    <string name="overlay_loadstate">ステートロード</string>
-    <string name="overlay_slot1">スロット 1</string>
-    <string name="overlay_slot2">スロット 2</string>
-    <string name="overlay_slot3">スロット 3</string>
-    <string name="overlay_slot4">スロット 4</string>
-    <string name="overlay_slot5">スロット 5</string>
-
-    <!-- Input Config Fragment -->
-    <string name="input_settings">入力</string>
-    <string name="input_binding">入力バインディング</string>
-    <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
-    <string name="button_a">Aボタン</string>
-    <string name="button_b">Bボタン</string>
-    <string name="button_start">スタートボタン</string>
-    <string name="button_x">Xボタン</string>
-    <string name="button_y">Yボタン</string>
-    <string name="button_z">Zボタン</string>
-    <string name="dpad_up">D-Pad: ↑</string>
-    <string name="dpad_down">D-Pad: ↓</string>
-    <string name="dpad_left">D-Pad: ←</string>
-    <string name="dpad_right">D-Pad: →</string>
-    <string name="main_stick_up">コントロールスティック: ↑</string>
-    <string name="main_stick_down">コントロールスティック: ↓</string>
-    <string name="main_stick_left">コントロールスティック: ←</string>
-    <string name="main_stick_right">コントロールスティック: →</string>
-    <string name="c_stick_up">C-スティック: ↑</string>
-    <string name="c_stick_down">C-スティック: ↓</string>
-    <string name="c_stick_left">C-スティック: ←</string>
-    <string name="c_stick_right">C-スティック: →</string>
-    <string name="trigger_left">左のトリガー</string>
-    <string name="trigger_right">右のトリガー</string>
-    
-    <!-- Prefs Fragment -->
-    <string name="interpreter">Interpreter</string>
-    <string name="jit64_recompiler">JIT64 Recompiler</string>
-    <string name="jitil_recompiler">JITIL Recompiler</string>
-    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
-    <string name="cpu_core">CPUコア</string>
-    <string name="cpu_settings">CPU</string>
-    <string name="emu_core_to_use">使用するエミュレーションコア</string>
-    <string name="dual_core">デュアルコア</string>
-    <string name="dual_core_descrip">処理のための2つのCPUコアを使用して。速度が向上します。</string>
-    <string name="fastmem">Fastmem</string>
-    <string name="fastmem_desc">メモリアクセスのために潜在的に危険な最適化を使用して。</string>
-    <string name="video_settings">ビデオ</string>
-    <string name="software_renderer">Software Renderer</string>
-    <string name="opengl_es3">OpenGL ES 3</string>
-    <string name="video_backend">ビデオレンダラ</string>
-    <string name="video_backend_to_use">使用するビデオレンダラー</string>
-    <string name="show_fps">FPSを表示</string>
-    <string name="show_fps_descrip">エミュレーション速度の指標として、画面左上に毎秒レンダリングされた フレーム数を表示します。</string>
-    <string name="draw_onscreen_controls">画面上のコントロールを描画</string>
-    
-    <string name="enhancements">画質向上の設定</string>
-    <string name="internal_resolution">内部解像度の変更</string>
-    <string name="internal_resolution_descrip">内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上します。 しかし、ゲームによっては非常に重くなったり描画バグの原因となります。 【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描画バグは発生しにくくなります。 また一般的に内部解像度が低いほど、動作速度は向上します。</string>
-    <string name="anisotropic_filtering">異方性フィルタリング</string>
-    <string name="anisotropic_filtering_descrip">異方性フィルタリングを適用します。 奥行きのあるテクスチャをより精細に描画することが出来ます。 特定のゲームでは描画バグの原因になることがあります。</string>
-    <string name="scaled_efb_copy">Scaled EFB Copy</string>
-    <string name="scaled_efb_copy_descrip">テクスチャエフェクトを表示するために作成されたテクスチャの品質を著しく向上させます。 特に高解像度出力時に効果が大きく出ます。 動作速度は少々低下し、まれに描画バグの原因にもなることもあります。</string>
-    <string name="per_pixel_lighting">Per-Pixel Lighting</string>
-    <string name="per_pixel_lighting_descrip">ピクセル単位での光源処理を行います。 GPUの性能にもよりますが、数パーセント程度、動作速度が低下します。 このオプションは通常安全ですが、時に描画バグを引き起こすこともあります</string>
-    <string name="force_texture_filtering">Force Texture Filtering</string>
-    <string name="force_texture_filtering_descrip">ゲーム側でフィルタ無効を明示している場面でも、強制的にフィルタリングを行います。 特に高解像度出力時にテクスチャが綺麗になりますが、いくつかのゲームで描画バグを引き起こします。</string>
-    <string name="disable_fog">霧を無効</string>
-    <string name="disable_fog_descrip">フォグ処理を無効化します。これにより遠景の高精細化が期待できます。いくつかのタイトルではフォグ処理に頼った画面効果が正しく表示 されなくなります。</string>
-    
-    <string name="hacks">高速化(Hacks)</string>
-    <string name="embedded_frame_buffer">内蔵フレームバッファ</string>
-    <string name="skip_efb_access">CPUからEFBアクセスをスキップ</string>
-    <string name="skip_efb_access_descrip">EFBへの読み取り/書き込みにCPUから作られたすべての要求を無視。</string>
-    <string name="ignore_format_changes">フォーマットの変更を無視</string>
-    <string name="ignore_format_changes_descrip">EFB形式への変更を無視。</string>
-    <string name="efb_copy_method">EFBコピー方法</string>
-    <string name="efb_copy_method_descrip">EFBコピーをエミュレート方法を決定。</string>
-    <string name="efb_copy_texture">テクスチャ</string>
-    <string name="efb_copy_ram_uncached">RAM (キャッシュない)</string>
-    <string name="efb_copy_ram_cached">RAM (キャッシュ)</string>
-    <string name="texture_cache">テクスチャキャッシュ</string>
-    <string name="texture_cache_accuracy">テクスチャキャッシュ確度</string>
-    <string name="texture_cache_accuracy_descrip">この選択をSafe設定しておくと、RAMからのテクスチャ更新に 失敗しにくなります。</string>
-    <string name="texture_cache_accuracy_low">低</string>
-    <string name="texture_cache_accuracy_medium">平</string>
-    <string name="texture_cache_accuracy_high">高</string>
-    <string name="external_frame_buffer">外部フレームバッファ</string>
-    <string name="external_frame_buffer_descrip">XFBをエミュレート方法を決定。</string>
-    <string name="external_frame_buffer_virtual">バーチャル</string>
-    <string name="external_frame_buffer_real">実機</string>
-    <string name="cache_display_lists">Cache Display Lists</string>
-    <string name="cache_display_lists_descrip">ディスプレイリストをキャッシュすることによりエミュレーション速度を向上。</string>
-    <string name="disable_destination_alpha">Disable Destination Alpha</string>
-    <string name="disable_destination_alpha_descrip">多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ 。</string>
-    <string name="fast_depth_calculation">高速奥行き計算</string>
-    <string name="fast_depth_calculation_descrip">深度値を計算するために精度の低いアルゴリズムを使用します。</string>
-    
-    <!-- Miscellaneous -->
-    <string name="yes">はい</string>
-    <string name="no">いいえ</string>
-    <string name="cancel">キャンセル</string>
-    <string name="disabled">無効</string>
-    <string name="other">その他</string>
-
-</resources>
diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml
deleted file mode 100644
index 2144440a33..0000000000
--- a/Source/Android/res/values/arrays.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- All lists for ListPreference keys/values are placed here -->
-<resources>
-    
-    <!-- CPU core selection - X86 -->
-    <string-array name="emuCoreEntriesX86" translatable="false">
-        <item>@string/interpreter</item>
-        <item>@string/jit64_recompiler</item>
-        <item>@string/jitil_recompiler</item>
-    </string-array>
-    <string-array name="emuCoreValuesX86" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-    
-    <!-- CPU core selection - ARM -->
-    <string-array name="emuCoreEntriesARM" translatable="false">
-        <item>@string/interpreter</item>
-        <item>@string/jit_arm_recompiler</item>
-    </string-array>
-    <string-array name="emuCoreValuesARM" translatable="false">
-        <item>0</item>
-        <item>3</item>
-    </string-array>
-    
-    <!-- CPU core selection - Other -->
-    <string-array name="emuCoreEntriesOther" translatable="false">
-        <item>@string/interpreter</item>
-    </string-array>
-    <string-array name="emuCoreValuesOther" translatable="false">
-        <item>0</item>
-    </string-array>
-    
-    
-    <!-- Video Backend Selection - Supports OpenGL ES 3 -->
-    <string-array name="videoBackendEntriesGLES3" translatable="false">
-        <item>@string/software_renderer</item>
-        <item>@string/opengl_es3</item>
-    </string-array>
-    <string-array name="videoBackendValuesGLES3" translatable="false">
-        <item>Software Renderer</item>
-        <item>OGL</item>
-    </string-array>
-    
-    <!-- Video Backend Selection - No OpenGL ES 3 support -->
-    <string-array name="videoBackendEntriesNoGLES3" translatable="false">
-        <item>@string/software_renderer</item>
-    </string-array>
-    <string-array name="videoBackendValuesNoGLES3" translatable="false">
-        <item>Software Renderer</item>
-    </string-array>
-    
-    
-    <!-- EFB Copy Method Preference -->
-    <string-array name="efbCopyMethodEntries" translatable="false">
-        <item>@string/disabled</item>
-        <item>@string/efb_copy_texture</item>
-        <item>@string/efb_copy_ram_uncached</item>
-        <item>@string/efb_copy_ram_cached</item>
-    </string-array>
-    <string-array name="efbCopyMethodValues" translatable="false">
-        <item>Off</item>
-        <item>Texture</item>
-        <item>RAM (cached)</item>
-        <item>RAM (uncached)</item>
-    </string-array>
-    
-    <!-- Texture Cache Accuracy Preference -->
-    <string-array name="textureCacheAccuracyEntries" translatable="false">
-        <item>@string/texture_cache_accuracy_low</item>
-        <item>@string/texture_cache_accuracy_medium</item>
-        <item>@string/texture_cache_accuracy_high</item>
-    </string-array>
-    <string-array name="textureCacheAccuracyValues" translatable="false">
-        <item>128</item>
-        <item>512</item>
-        <item>0</item>
-    </string-array>
-    
-    <!-- External Frame Buffer Preference -->
-    <string-array name="externalFrameBufferEntries" translatable="false">
-        <item>@string/disabled</item>
-        <item>@string/external_frame_buffer_virtual</item>
-        <item>@string/external_frame_buffer_real</item>
-    </string-array>
-    <string-array name="externalFrameBufferValues" translatable="false">
-        <item>Disabled</item>
-        <item>Virtual</item>
-        <item>Real</item>
-    </string-array>
-    
-    <!-- Internal Resolution Preference -->
-    <string-array name="internalResolutionEntries" translatable="false">
-        <item>1x Native (640x528)</item>
-        <item>1.5x Native (960x792)</item>
-        <item>2x Native (1280x1056)</item>
-        <item>2.5x Native (1600x1320)</item>
-        <item>3x Native (1920x1584)</item>
-        <item>4x Native (2560x2112)</item>
-    </string-array>
-    <string-array name="internalResolutionValues" translatable="false">
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-    
-    <!-- Anisotropic Filtering Preference -->
-    <string-array name="anisotropicFilteringEntries" translatable="false">
-        <item>1x</item>
-        <item>2x</item>
-        <item>4x</item>
-        <item>8x</item>
-        <item>16x</item>
-    </string-array>
-    <string-array name="anisotropicFilteringValues" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-    
-</resources>
\ No newline at end of file
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
deleted file mode 100644
index 5c8a1269af..0000000000
--- a/Source/Android/res/values/strings.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Title of the app -->
-    <string name="app_name">Dolphin Emulator</string>
-
-    <!-- Navigation-related Strings -->
-    <string name="drawer_open">Open navigation drawer</string>
-    <string name="drawer_close">Close navigation drawer</string>
-
-    <!-- About Fragment -->
-    <string name="build_revision">Build Revision</string>
-    <string name="supports_gles3">Supports OpenGL ES 3</string>
-
-    <!-- Folder Browser -->
-    <string name="current_dir">Current Dir: </string>
-    <string name="parent_directory">Parent Directory</string>
-    <string name="file_size">File Size: </string>
-
-    <!-- Game List Activity -->
-    <string name="clear_game_list">Clear game list</string>
-    <string name="clear_game_list_confirm">Do you want to clear the game list?</string>
-    <string name="game_list">Game List</string>
-    <string name="browse_folder">Browse Folder</string>
-    <string name="settings">Settings</string>
-    <string name="about">About</string>
-
-    <!-- Game List Fragment -->
-    <string name="file_clicked">File clicked: </string>
-
-    <!-- Emulation Overlay -->
-    <string name="overlay_savestate">Save State</string>
-    <string name="overlay_loadstate">Load State</string>
-    <string name="overlay_slot1">Slot 1</string>
-    <string name="overlay_slot2">Slot 2</string>
-    <string name="overlay_slot3">Slot 3</string>
-    <string name="overlay_slot4">Slot 4</string>
-    <string name="overlay_slot5">Slot 5</string>
-
-    <!-- Input Config Fragment -->
-    <string name="input_settings">Input</string>
-    <string name="input_binding">Input Binding</string>
-    <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
-    <string name="button_a">Button A</string>
-    <string name="button_b">Button B</string>
-    <string name="button_start">Button Start</string>
-    <string name="button_x">Button X</string>
-    <string name="button_y">Button Y</string>
-    <string name="button_z">Button Z</string>
-    <string name="dpad_up">D-Pad Up</string>
-    <string name="dpad_down">D-Pad Down</string>
-    <string name="dpad_left">D-Pad Left</string>
-    <string name="dpad_right">D-Pad Right</string>
-    <string name="main_stick_up">Main Stick Up</string>
-    <string name="main_stick_down">Main Stick Down</string>
-    <string name="main_stick_left">Main Stick Left</string>
-    <string name="main_stick_right">Main Stick Right</string>
-    <string name="c_stick_up">C Stick Up</string>
-    <string name="c_stick_down">C Stick Down</string>
-    <string name="c_stick_left">C Stick Left</string>
-    <string name="c_stick_right">C Stick Right</string>
-    <string name="trigger_left">Trigger L</string>
-    <string name="trigger_right">Trigger R</string>
-
-    <!-- Preference Related -->
-    <string name="interpreter">Interpreter</string>
-    <string name="jit64_recompiler">JIT64 Recompiler</string>
-    <string name="jitil_recompiler">JITIL Recompiler</string>
-    <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
-    <string name="cpu_core">CPU Core</string>
-    <string name="cpu_settings">CPU</string>
-    <string name="emu_core_to_use">Emulation core to use</string>
-    <string name="dual_core">Dual Core</string>
-    <string name="dual_core_descrip">Split workload to two CPU cores instead of one. Increases speed.</string>
-    <string name="fastmem">Fastmem</string>
-    <string name="fastmem_desc">Uses potentially unsafe optimizations for memory access.</string>
-    <string name="video_settings">Video</string>
-    <string name="software_renderer">Software Renderer</string>
-    <string name="opengl_es3">OpenGL ES 3</string>
-    <string name="video_backend">Video Backend</string>
-    <string name="video_backend_to_use">Video backend to use</string>
-    <string name="show_fps">Show FPS</string>
-    <string name="show_fps_descrip">Show the number of frames rendered per second as a measure of emulation speed.</string>
-    <string name="draw_onscreen_controls">Draw on-screen controls</string>
-    
-    <string name="enhancements">Enhancements</string>
-    <string name="internal_resolution">Internal Resolution</string>
-    <string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string>
-    <string name="anisotropic_filtering">Anisotropic Filtering</string>
-    <string name="anisotropic_filtering_descrip">Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games.</string>
-    <string name="scaled_efb_copy">Scaled EFB Copy</string>
-    <string name="scaled_efb_copy_descrip">Greatly increases quality of textures generated using render to texture effects. Raising the internal resolution will improve the effect of this setting. Slightly decreases performance and possibly causes issues (although unlikely).</string>
-    <string name="per_pixel_lighting">Per-Pixel Lighting</string>
-    <string name="per_pixel_lighting_descrip">Calculate lighting of 3D graphics per-pixel rather than per vertex. Decreases emulation speed by some percent (depending on your GPU). This usually is a safe enhancement, but might cause issues sometimes.</string>
-    <string name="force_texture_filtering">Force Texture Filtering</string>
-    <string name="force_texture_filtering_descrip">Force texture filtering even if the emulated game explicitly disabled it. Improves texture quality slightly but causes glitches in some games.</string>
-    <string name="disable_fog">Disable Fog</string>
-    <string name="disable_fog_descrip">Makes distant objects more visible by removing fog, thus increasing the overall detail. Disabling fog will break some games which rely on proper fog emulation.</string>
-    
-    <string name="hacks">Hacks</string>
-    <string name="embedded_frame_buffer">Embedded Frame Buffer</string>
-    <string name="skip_efb_access">Skip EFB Access from CPU</string>
-    <string name="skip_efb_access_descrip">Ignore any requests from the CPU to read/write to the EFB.</string>
-    <string name="ignore_format_changes">Ignore Format Changes</string>
-    <string name="ignore_format_changes_descrip">Ignore any changes to the EFB format.</string>
-    <string name="efb_copy_method">EFB Copy Method</string>
-    <string name="efb_copy_method_descrip">Determines how EFB copies will be emulated.</string>
-    <string name="efb_copy_texture">Texture</string>
-    <string name="efb_copy_ram_uncached">RAM (uncached)</string>
-    <string name="efb_copy_ram_cached">RAM (cached)</string>
-    <string name="texture_cache">Texture Cache</string>
-    <string name="texture_cache_accuracy">Texture Cache Accuracy</string>
-    <string name="texture_cache_accuracy_descrip">The safer the selection, the less likely the emulator will be missing any texture updates from RAM.</string>
-    <string name="texture_cache_accuracy_low">Low</string>
-    <string name="texture_cache_accuracy_medium">Medium</string>
-    <string name="texture_cache_accuracy_high">High</string>
-    <string name="external_frame_buffer">External Frame Buffer</string>
-    <string name="external_frame_buffer_descrip">Determines how the XFB will be emulated.</string>
-    <string name="external_frame_buffer_virtual">Virtual</string>
-    <string name="external_frame_buffer_real">Real</string>
-    <string name="cache_display_lists">Cache Display Lists</string>
-    <string name="cache_display_lists_descrip">Speeds up emulation a bit by caching display lists.</string>
-    <string name="disable_destination_alpha">Disable Destination Alpha</string>
-    <string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
-    <string name="fast_depth_calculation">Fast Depth Calculation</string>
-    <string name="fast_depth_calculation_descrip">Uses a less accurate algorithm to calculate depth values.</string>
-    
-    <!-- Miscellaneous -->
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="cancel">Cancel</string>
-    <string name="disabled">Disabled</string>
-    <string name="other">Other</string>
-    
-
-</resources>
diff --git a/Source/Android/res/xml/cpu_prefs.xml b/Source/Android/res/xml/cpu_prefs.xml
deleted file mode 100644
index 4316e1fcc5..0000000000
--- a/Source/Android/res/xml/cpu_prefs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- CPU Settings -->
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="dualCorePref"
-        android:summary="@string/dual_core_descrip"
-        android:title="@string/dual_core" />
-
-    <ListPreference
-        android:key="cpuCorePref"
-        android:summary="@string/emu_core_to_use"
-        android:title="@string/cpu_core" />
-
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="fastmemPref"
-        android:summary="@string/fastmem_desc"
-        android:title="@string/fastmem" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml
deleted file mode 100644
index daddf93e3d..0000000000
--- a/Source/Android/res/xml/input_prefs.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-	    <Preference
-	        android:key="InputA"
-	        android:title="@string/button_a" />
-	
-	    <Preference
-	        android:key="InputB"
-	        android:title="@string/button_b" />
-	
-	    <Preference
-	        android:key="InputX"
-	        android:title="@string/button_x" />
-	
-	    <Preference
-	        android:key="InputY"
-	        android:title="@string/button_y" />
-	
-	    <Preference
-	        android:key="InputZ"
-	        android:title="@string/button_z" />
-	
-	    <Preference
-	        android:key="InputStart"
-	        android:title="@string/button_start" />
-	
-	    <Preference
-	        android:key="DPadUp"
-	        android:title="@string/dpad_up" />
-	
-	    <Preference
-	        android:key="DPadDown"
-	        android:title="@string/dpad_down" />
-	
-	    <Preference
-	           android:key="DPadLeft"
-	           android:title="@string/dpad_left" />
-	
-	    <Preference
-	           android:key="DPadRight"
-	           android:title="@string/dpad_right" />
-	
-	    <Preference
-	        android:key="MainUp"
-	        android:title="@string/main_stick_up" />
-	
-	    <Preference
-	        android:key="MainDown"
-	        android:title="@string/main_stick_down" />
-	
-	    <Preference
-	        android:key="MainLeft"
-	        android:title="@string/main_stick_left" />
-	
-	    <Preference
-	        android:key="MainRight"
-	        android:title="@string/main_stick_right" />
-	
-	    <Preference
-	        android:key="CStickUp"
-	        android:title="@string/c_stick_up" />
-	
-	    <Preference
-	        android:key="CStickDown"
-	        android:title="@string/c_stick_down" />
-	
-	    <Preference
-	        android:key="CStickLeft"
-	        android:title="@string/c_stick_left" />
-	
-	    <Preference
-	        android:key="CStickRight"
-	        android:title="@string/c_stick_right" />
-	
-	    <Preference
-	        android:key="InputL"
-	        android:title="@string/trigger_left" />
-	    
-	    <Preference
-	        android:key="InputR"
-	        android:title="@string/trigger_right" />
-</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
deleted file mode 100644
index 311c6ce8a9..0000000000
--- a/Source/Android/res/xml/video_prefs.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <!-- Video Settings -->
-
-
-    <!-- Video Enhancements -->
-    <PreferenceScreen android:title="@string/enhancements">
-
-        <ListPreference
-            android:entries="@array/internalResolutionEntries"
-            android:entryValues="@array/internalResolutionValues"
-            android:key="internalResolution"
-            android:summary="@string/internal_resolution_descrip"
-            android:title="@string/internal_resolution"/>
-
-        <ListPreference 
-            android:entries="@array/anisotropicFilteringEntries"
-            android:entryValues="@array/anisotropicFilteringValues"
-            android:key="anisotropicFiltering"
-            android:summary="@string/anisotropic_filtering_descrip"
-            android:title="@string/anisotropic_filtering"/>
-
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="scaledEFBCopy"
-            android:summary="@string/scaled_efb_copy_descrip"
-            android:title="@string/scaled_efb_copy"/>
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="perPixelLighting"
-            android:summary="@string/per_pixel_lighting_descrip"
-            android:title="@string/per_pixel_lighting"/>
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="forceTextureFiltering"
-            android:summary="@string/force_texture_filtering_descrip"
-            android:title="@string/force_texture_filtering"/>
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="disableFog"
-            android:summary="@string/disable_fog_descrip"
-            android:title="@string/disable_fog"/>
-
-    </PreferenceScreen>
-
-    <!-- Video Hacks -->
-    <PreferenceScreen android:title="@string/hacks">
-        <PreferenceCategory android:title="@string/embedded_frame_buffer">
-
-         <CheckBoxPreference
-             android:defaultValue="false"
-             android:key="skipEFBAccess"
-             android:summary="@string/skip_efb_access_descrip"
-             android:title="@string/skip_efb_access"/>
-
-         <CheckBoxPreference
-             android:defaultValue="true"
-             android:key="ignoreFormatChanges"
-             android:summary="@string/ignore_format_changes_descrip" 
-             android:title="@string/ignore_format_changes"/>
-
-         <ListPreference
-             android:defaultValue="Texture"
-             android:entries="@array/efbCopyMethodEntries"
-             android:entryValues="@array/efbCopyMethodValues"
-             android:key="efbCopyMethod"
-             android:summary="@string/efb_copy_method_descrip"
-             android:title="@string/efb_copy_method"/>
-
-     </PreferenceCategory>
-
-        <!-- Texture Cache -->
-        <PreferenceCategory android:title="@string/texture_cache">
-         <ListPreference
-             android:defaultValue="Low"
-             android:entries="@array/textureCacheAccuracyEntries"
-             android:entryValues="@array/textureCacheAccuracyValues"
-             android:key="textureCacheAccuracy"
-             android:summary="@string/texture_cache_accuracy_descrip"
-             android:title="@string/texture_cache_accuracy"/>
-        </PreferenceCategory>
-
-        <!-- External Frame Buffer -->
-        <PreferenceCategory android:title="@string/external_frame_buffer">
-        <ListPreference
-            android:defaultValue="Disabled"
-            android:entries="@array/externalFrameBufferEntries"
-            android:entryValues="@array/externalFrameBufferValues"
-            android:key="externalFrameBuffer"
-            android:summary="@string/external_frame_buffer_descrip"
-            android:title="@string/external_frame_buffer"/>
-        </PreferenceCategory>
-
-
-        <!-- Other Hacks -->
-        <PreferenceCategory android:title="@string/other">
-
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="cacheDisplayLists"
-                android:summary="@string/cache_display_lists_descrip"
-                android:title="@string/cache_display_lists"/>
-
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="disableDestinationAlpha"
-                android:summary="@string/disable_destination_alpha_descrip"
-                android:title="@string/disable_destination_alpha"/>
-
-            <CheckBoxPreference 
-                android:defaultValue="true"
-                android:key="fastDepthCalculation"
-                android:summary="@string/fast_depth_calculation_descrip"
-                android:title="@string/fast_depth_calculation"/>
-
-        </PreferenceCategory>
-    </PreferenceScreen>
-
-    <ListPreference
-       android:key="gpuPref"
-       android:summary="@string/video_backend_to_use"
-       android:title="@string/video_backend" />
-
-    <CheckBoxPreference
-       android:key="showFPS"
-       android:summary="@string/show_fps_descrip"
-       android:title="@string/show_fps"/>
-    <!--
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="drawOnscreenControls"
-        android:title="@string/draw_onscreen_controls"/>
-        -->
-</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/settings.gradle b/Source/Android/settings.gradle
new file mode 100644
index 0000000000..e7b4def49c
--- /dev/null
+++ b/Source/Android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
deleted file mode 100644
index 8b29e607d7..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu;
-
-import android.app.Activity;
-import android.app.ListFragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
-
-/**
- * Represents the about screen.
- */
-public final class AboutFragment extends ListFragment
-{
-	private static Activity m_activity;
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-	{
-		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
-		ListView mMainList = (ListView) rootView.findViewById(R.id.gamelist);
-
-		String yes = getString(R.string.yes);
-		String no = getString(R.string.no);
-
-		List<AboutFragmentItem> Input = new ArrayList<AboutFragmentItem>();
-		Input.add(new AboutFragmentItem(getString(R.string.build_revision), NativeLibrary.GetVersionString()));
-		Input.add(new AboutFragmentItem(getString(R.string.supports_gles3), VideoSettingsFragment.SupportsGLES3() ? yes : no));
-
-		AboutFragmentAdapter adapter = new AboutFragmentAdapter(m_activity, R.layout.about_layout, Input);
-		mMainList.setAdapter(adapter);
-		mMainList.setEnabled(false);  // Makes the list view non-clickable.
-
-		return mMainList;
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// Cache the activity instance.
-		m_activity = activity;
-	}
-
-	// Represents an item in the AboutFragment.
-	private static final class AboutFragmentItem
-	{
-		private final String title;
-		private final String subtitle;
-
-		public AboutFragmentItem(String title, String subtitle)
-		{
-			this.title = title;
-			this.subtitle = subtitle;
-		}
-		
-		public String getTitle()
-		{
-			return title;
-		}
-		
-		public String getSubTitle()
-		{
-			return subtitle;
-		}
-	}
-
-	// The adapter that manages the displaying of items in this AboutFragment.
-	private static final class AboutFragmentAdapter extends ArrayAdapter<AboutFragmentItem>
-	{
-		private final Context ctx;
-		private final int id;
-		private final List<AboutFragmentItem> items;
-
-		public AboutFragmentAdapter(Context ctx, int id, List<AboutFragmentItem> items)
-		{
-			super(ctx, id, items);
-
-			this.ctx = ctx;
-			this.id = id;
-			this.items = items;
-		}
-
-		@Override
-		public AboutFragmentItem getItem(int index)
-		{
-			return items.get(index);
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent)
-		{
-			View v = convertView;
-			if (v == null)
-			{
-				LayoutInflater vi = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				v = vi.inflate(id, parent, false);
-			}
-			
-			final AboutFragmentItem item = items.get(position);
-			if (item != null)
-			{
-				TextView title    = (TextView) v.findViewById(R.id.AboutItemTitle);
-				TextView subtitle = (TextView) v.findViewById(R.id.AboutItemSubTitle);
-
-				if (title != null)
-					title.setText(item.getTitle());
-
-				if (subtitle != null)
-					subtitle.setText(item.getSubTitle());
-			}
-
-			return v;
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
deleted file mode 100644
index 9c27615b14..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import org.dolphinemu.dolphinemu.gamelist.GameListActivity;
-import org.dolphinemu.dolphinemu.settings.UserPreferences;
-
-import java.io.*;
-
-/**
- * The main activity of this emulator.
- */
-public final class DolphinEmulator extends Activity 
-{
-	private void CopyAsset(String asset, String output)
-	{
-		InputStream in = null;
-		OutputStream out = null;
-
-		try
-		{
-			in = getAssets().open(asset);
-			out = new FileOutputStream(output);
-			copyFile(in, out);
-			in.close();
-			out.close();
-		}
-		catch (IOException e)
-		{
-			Log.e("DolphinEmulator", "Failed to copy asset file: " + asset, e);
-		}
-	}
-
-	private void copyFile(InputStream in, OutputStream out) throws IOException
-	{
-		byte[] buffer = new byte[1024];
-		int read;
-
-		while ((read = in.read(buffer)) != -1)
-		{
-			out.write(buffer, 0, read);
-		}
-	}
-
-	/** Called when the activity is first created. */
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		if (savedInstanceState == null)
-		{
-			Intent GameListIntent = new Intent(this, GameListActivity.class);
-			startActivity(GameListIntent);
-
-			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
-			String ConfigDir = BaseDir + File.separator + "Config";
-			String GCDir = BaseDir + File.separator + "GC";
-
-			// Copy assets if needed
-			File file = new File(GCDir + File.separator + "font_sjis.bin");
-			if(!file.exists())
-			{
-				NativeLibrary.CreateUserFolders();
-				CopyAsset("ButtonA.png",     BaseDir + File.separator + "ButtonA.png");
-				CopyAsset("ButtonB.png",     BaseDir + File.separator + "ButtonB.png");
-				CopyAsset("ButtonStart.png", BaseDir + File.separator + "ButtonStart.png");
-				CopyAsset("NoBanner.png",    BaseDir + File.separator + "NoBanner.png");
-				CopyAsset("GCPadNew.ini",    ConfigDir + File.separator + "GCPadNew.ini");
-				CopyAsset("Dolphin.ini",     ConfigDir + File.separator + "Dolphin.ini");
-				CopyAsset("dsp_coef.bin",    GCDir + File.separator + "dsp_coef.bin");
-				CopyAsset("dsp_rom.bin",     GCDir + File.separator + "dsp_rom.bin");
-				CopyAsset("font_ansi.bin",   GCDir + File.separator + "font_ansi.bin");
-				CopyAsset("font_sjis.bin",   GCDir + File.separator + "font_sjis.bin");
-			}
-
-			// Load the configuration keys set in the Dolphin ini and gfx ini files
-			// into the application's shared preferences.
-			UserPreferences.LoadDolphinConfigToPrefs(this);
-		}
-	}
-}
\ No newline at end of file
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
deleted file mode 100644
index 784839470a..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.DisplayMetrics;
-import android.view.*;
-import android.view.WindowManager.LayoutParams;
-import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
-import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
-
-import java.util.List;
-
-/**
- * This is the activity where all of the emulation handling happens.
- * This activity is responsible for displaying the SurfaceView that we render to.
- */
-public final class EmulationActivity extends Activity
-{
-	private boolean Running;
-	private boolean IsActionBarHidden = false;
-	private float screenWidth;
-	private float screenHeight;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-
-		// Retrieve screen dimensions.
-		DisplayMetrics displayMetrics = new DisplayMetrics();
-		WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut
-		wm.getDefaultDisplay().getMetrics(displayMetrics);
-		this.screenHeight = displayMetrics.heightPixels;
-		this.screenWidth = displayMetrics.widthPixels;
-
-		// Request window features for the emulation view.
-		getWindow().addFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
-		getWindow().addFlags(LayoutParams.FLAG_FULLSCREEN);
-		getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-
-		// Set the transparency for the action bar.
-		ColorDrawable actionBarBackground = new ColorDrawable(Color.parseColor("#303030"));
-		actionBarBackground.setAlpha(175);
-		getActionBar().setBackgroundDrawable(actionBarBackground);
-
-		// Set the native rendering screen width/height.
-		// Also get the intent passed from the GameList when the game
-		// was selected. This is so the path of the game can be retrieved
-		// and set on the native side of the code so the emulator can actually
-		// load the game.
-		Intent gameToEmulate = getIntent();
-
-		// Due to a bug in Adreno, it renders the screen rotated 90 degrees when using OpenGL
-		// Flip the width and height when on Adreno to work around this.
-		// Mali isn't affected by this bug.
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		if (prefs.getString("gpuPref", "Software Rendering").equals("OGL")
-				&& VideoSettingsFragment.SupportsGLES3()
-				&& VideoSettingsFragment.m_GLVendor.equals("Qualcomm"))
-			NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth);
-		else
-			NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight);
-
-		NativeLibrary.SetFilename(gameToEmulate.getStringExtra("SelectedGame"));
-		Running = true;
-
-		// Set the emulation window.
-		setContentView(R.layout.emulation_view);
-
-		// Hide the action bar by default so it doesn't get in the way.
-		getActionBar().hide();
-		IsActionBarHidden = true;
-	}
-
-	@Override
-	public void onStop()
-	{
-		super.onStop();
-		if (Running)
-			NativeLibrary.StopEmulation();
-	}
-
-	@Override
-	public void onPause()
-	{
-		super.onPause();
-		if (Running)
-			NativeLibrary.PauseEmulation();
-	}
-
-	@Override
-	public void onResume()
-	{
-		super.onResume();
-		if (Running)
-			NativeLibrary.UnPauseEmulation();
-	}
-	
-	@Override
-	public boolean onTouchEvent(MotionEvent event)
-	{
-		float X = event.getX();
-		float Y = event.getY();
-		int Action = event.getActionMasked();
-
-		// Converts button locations 0 - 1 to OGL screen coords -1.0 - 1.0
-		float ScreenX = ((X / screenWidth) * 2.0f) - 1.0f;
-		float ScreenY = ((Y / screenHeight) * -2.0f) + 1.0f;
-
-		NativeLibrary.onTouchEvent(Action, ScreenX, ScreenY);
-		
-		return false;
-	}
-	
-	@Override
-	public void onBackPressed()
-	{
-		// The back button in the emulation
-		// window is the toggle for the action bar.
-		if (IsActionBarHidden)
-		{
-			IsActionBarHidden = false;
-			getActionBar().show();
-		}
-		else
-		{
-			IsActionBarHidden = true;
-			getActionBar().hide();
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.emuwindow_overlay, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onMenuItemSelected(int itemId, MenuItem item)
-	{
-		switch(item.getItemId())
-		{
-			// Save state slots
-			case R.id.saveSlot1:
-				NativeLibrary.SaveState(0);
-				return true;
-
-			case R.id.saveSlot2:
-				NativeLibrary.SaveState(1);
-				return true;
-
-			case R.id.saveSlot3:
-				NativeLibrary.SaveState(2);
-				return true;
-
-			case R.id.saveSlot4:
-				NativeLibrary.SaveState(3);
-				return true;
-
-			case R.id.saveSlot5:
-				NativeLibrary.SaveState(4);
-				return true;
-
-			// Load state slot
-			case R.id.loadSlot1:
-				NativeLibrary.LoadState(0);
-				return true;
-
-			case R.id.loadSlot2:
-				NativeLibrary.LoadState(1);
-				return true;
-
-			case R.id.loadSlot3:
-				NativeLibrary.LoadState(2);
-				return true;
-
-			case R.id.loadSlot4:
-				NativeLibrary.LoadState(3);
-				return true;
-
-			case R.id.loadSlot5:
-				NativeLibrary.LoadState(4);
-				return true;
-
-			default:
-				return super.onMenuItemSelected(itemId, item);
-		}
-	}
-
-	// Gets button presses
-	@Override
-	public boolean dispatchKeyEvent(KeyEvent event)
-	{
-		int action = 0;
-
-		// Special catch for the back key
-		// Currently disabled because stopping and starting emulation is broken.
-		/*
-		if (event.getSource() == InputDevice.SOURCE_KEYBOARD
-			&& event.getKeyCode() == KeyEvent.KEYCODE_BACK
-			&& event.getAction() == KeyEvent.ACTION_UP)
-		{
-			if (Running)
-				NativeLibrary.StopEmulation();
-			Running = false;
-			Intent ListIntent = new Intent(this, GameListActivity.class);
-			startActivityForResult(ListIntent, 1);
-			return true;
-		}
-		*/
-
-		if (Running)
-		{
-			switch (event.getAction())
-			{
-				case KeyEvent.ACTION_DOWN:
-					// Handling the case where the back button is pressed.
-					if (event.getKeyCode() == KeyEvent.KEYCODE_BACK)
-					{
-						onBackPressed();
-						return true;
-					}
-
-					// Normal key events.
-					action = 0;
-					break;
-				case KeyEvent.ACTION_UP:
-					action = 1;
-					break;
-				default:
-					return false;
-			}
-			InputDevice input = event.getDevice();
-			NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean dispatchGenericMotionEvent(MotionEvent event)
-	{
-		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0) || !Running)
-		{
-			return super.dispatchGenericMotionEvent(event);
-		}
-
-		InputDevice input = event.getDevice();
-		List<InputDevice.MotionRange> motions = input.getMotionRanges();
-
-		for (InputDevice.MotionRange range : motions)
-		{
-			NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis()));
-		}
-
-		return true;
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
deleted file mode 100644
index c508b1f810..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-/**
- * The surface that rendering is done to.
- */
-public final class NativeGLSurfaceView extends SurfaceView
-{
-	private static Thread myRun;
-	private static boolean Running = false;
-	private static boolean Created = false;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param context The current {@link Context}.
-	 */
-	public NativeGLSurfaceView(Context context, AttributeSet attribs)
-	{
-		super(context, attribs);
-
-		if (!Created)
-		{
-			myRun = new Thread() 
-			{
-				@Override
-				public void run() {
-					NativeLibrary.Run(getHolder().getSurface());
-				}
-			};
-
-			getHolder().addCallback(new SurfaceHolder.Callback()
-			{
-					public void surfaceCreated(SurfaceHolder holder)
-					{
-						// TODO Auto-generated method stub
-						if (!Running)
-						{
-							myRun.start();
-							Running = true;
-						}
-					}
-
-					public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
-					{
-						// TODO Auto-generated method stub
-					}
-
-					public void surfaceDestroyed(SurfaceHolder holder)
-					{
-						// TODO Auto-generated method stub
-					}
-			 });
-
-			Created = true;
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
deleted file mode 100644
index d52532fb2e..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu;
-
-import android.util.Log;
-import android.view.Surface;
-
-/**
- * Class which contains methods that interact
- * with the native side of the Dolphin code.
- */
-public final class NativeLibrary
-{
-	/**
-	 * Handles touch events.
-	 * 
-	 * @param Action Mask for the action being performed.
-	 * @param X      Location on the screen's X-axis that the touch event occurred.
-	 * @param Y      Location on the screen's Y-axis that the touch event occurred.
-	 */
-	public static native void onTouchEvent(int Action, float X, float Y);
-
-	/**
-	 * Handles button press events for a gamepad.
-	 * 
-	 * @param Device The input descriptor of the gamepad.
-	 * @param Button Key code identifying which button was pressed.
-	 * @param Action Mask identifying which action is happing (button pressed down, or button released).
-	 */
-	public static native void onGamePadEvent(String Device, int Button, int Action);
-
-	/**
-	 * Handles gamepad movement events.
-	 * 
-	 * @param Device The device ID of the gamepad.
-	 * @param Axis   The axis ID
-	 * @param Value  The value of the axis represented by the given ID.
-	 */
-	public static native void onGamePadMoveEvent(String Device, int Axis, float Value);
-
-	/**
-	 * Gets a value from a key in the given ini-based config file.
-	 * 
-	 * @param configFile The ini-based config file to get the value from.
-	 * @param Section    The section key that the actual key is in.
-	 * @param Key        The key to get the value from.
-	 * @param Default    The value to return in the event the given key doesn't exist.
-	 * 
-	 * @return the value stored at the key, or a default value if it doesn't exist.
-	 */
-	public static native String GetConfig(String configFile, String Section, String Key, String Default);
-
-	/**
-	 * Sets a value to a key in the given ini config file.
-	 * 
-	 * @param configFile The ini-based config file to add the value to.
-	 * @param Section    The section key for the ini key
-	 * @param Key        The actual ini key to set.
-	 * @param Value      The string to set the ini key to.
-	 */
-	public static native void SetConfig(String configFile, String Section, String Key, String Value);
-
-	/**
-	 * Sets the filename to be run during emulation.
-	 * 
-	 * @param filename The filename to be run during emulation.
-	 */
-	public static native void SetFilename(String filename);
-
-	/**
-	 * Sets the dimensions of the rendering window.
-	 * 
-	 * @param width  The new width of the rendering window (in pixels).
-	 * @param height The new height of the rendering window (in pixels).
-	 */
-	public static native void SetDimensions(int width, int height);
-
-	/**
-	 * Gets the embedded banner within the given ISO/ROM.
-	 * 
-	 * @param filename the file path to the ISO/ROM.
-	 * 
-	 * @return an integer array containing the color data for the banner.
-	 */
-	public static native int[] GetBanner(String filename);
-
-	/**
-	 * Gets the embedded title of the given ISO/ROM.
-	 * 
-	 * @param filename The file path to the ISO/ROM.
-	 * 
-	 * @return the embedded title of the ISO/ROM.
-	 */
-	public static native String GetTitle(String filename);
-
-	/**
-	 * Gets the Dolphin version string.
-	 * 
-	 * @return the Dolphin version string.
-	 */
-	public static native String GetVersionString();
-
-	/**
-	 * Saves a game state to the slot number.
-	 *
-	 * @param slot  The slot location to save state to.
-	 */
-	public static native void SaveState(int slot);
-
-	/**
-	 * Loads a game state from the slot number.
-	 *
-	 * @param slot  The slot location to load state from.
-	 */
-	public static native void LoadState(int slot);
-
-	/**
-	 * Creates the initial folder structure in /sdcard/dolphin-emu/
-	 *
-	 */
-	public static native void CreateUserFolders();
-
-	/**
-	 * Begins emulation.
-	 * 
-	 * @param surf The surface to render to.
-	 */
-	public static native void Run(Surface surf);
-
-	/** Unpauses emulation from a paused state. */
-	public static native void UnPauseEmulation();
-
-	/** Pauses emulation. */
-	public static native void PauseEmulation();
-
-	/** Stops emulation. */
-	public static native void StopEmulation();
-
-	static
-	{
-		try
-		{
-			System.loadLibrary("main");
-		}
-		catch (UnsatisfiedLinkError ex)
-		{
-			Log.e("NativeLibrary", ex.toString());
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
deleted file mode 100644
index e28f30206d..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.folderbrowser;
-
-import android.app.Activity;
-import android.app.ListFragment;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-
-import java.io.File;
-import java.util.*;
-
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.gamelist.GameListActivity;
-
-/**
- * A basic folder browser {@link Fragment} that allows
- * the user to select ISOs/ROMs for playing within the
- * emulator.
- * <p>
- * Any valid ISO/ROM selected in this will be added to
- * the game list for easy browsing the next time the
- * application is used.
- * <p>
- * Note that this file browser does not display files 
- * or directories that are hidden
- */
-public final class FolderBrowser extends ListFragment
-{
-	private Activity m_activity;
-	private FolderBrowserAdapter adapter;
-	private ListView mFolderBrowserList;
-	private ListView rootView;
-	private static File currentDir = null;
-
-	// Populates the FolderView with the given currDir's contents.
-	private void Fill(File currDir)
-	{
-		m_activity.setTitle(getString(R.string.current_dir) + currDir.getName());
-		File[] dirs = currDir.listFiles();
-		List<FolderBrowserItem>dir = new ArrayList<FolderBrowserItem>();
-		List<FolderBrowserItem>fls = new ArrayList<FolderBrowserItem>();
-
-		// Supported extensions to filter by
-		Set<String> validExts = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
-
-		// Search for any directories or files within the current dir.
-		for(File entry : dirs)
-		{
-			try
-			{
-				String entryName = entry.getName();
-				boolean hasExtension = (entryName.lastIndexOf(".") != -1);
-
-				// Skip hidden folders/files.
-				if (!entry.isHidden())
-				{
-					if(entry.isDirectory())
-					{
-						dir.add(new FolderBrowserItem(entryName, entry.getAbsolutePath()));
-					}
-					else if (entry.isFile() && hasExtension)
-					{
-						if (validExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
-						{
-							fls.add(new FolderBrowserItem(entryName, getString(R.string.file_size)+entry.length(), entry.getAbsolutePath()));
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Log.e("FolderBrowser", ex.toString());
-			}
-		}
-
-		Collections.sort(dir);
-		Collections.sort(fls);
-		dir.addAll(fls);
-
-		// Check for a parent directory to the one we're currently in.
-		if (!currDir.getPath().equalsIgnoreCase("/"))
-			dir.add(0, new FolderBrowserItem("..", getString(R.string.parent_directory), currDir.getParent()));
-
-		adapter = new FolderBrowserAdapter(m_activity, R.layout.gamelist_folderbrowser_list, dir);
-		mFolderBrowserList = (ListView) rootView.findViewById(R.id.gamelist);
-		mFolderBrowserList.setAdapter(adapter);
-	}
-
-	@Override
-	public void onListItemClick(ListView lv, View v, int position, long id)
-	{
-		FolderBrowserItem item = adapter.getItem(position);
-		if(item.isDirectory())
-		{
-			currentDir = new File(item.getPath());
-			Fill(currentDir);
-		}
-		else
-		{
-			FolderSelected();
-		}
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-	{
-		if(currentDir == null)
-			currentDir = new File(Environment.getExternalStorageDirectory().getPath());
-
-		rootView = (ListView) inflater.inflate(R.layout.gamelist_listview, container, false);
-
-		Fill(currentDir);
-		return mFolderBrowserList;
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// Cache the activity instance.
-		m_activity = activity;
-	}
-
-
-	private void FolderSelected()
-	{
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-		int intDirectories = Integer.parseInt(Directories);
-
-		// Check to see if a path set in the Dolphin config
-		// matches the one the user is trying to add. If it's
-		// already set, then don't add it to the list again.
-		boolean pathNotPresent = true;
-		for (int i = 0; i < intDirectories; i++)
-		{
-			String gcmPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
-
-			if (gcmPath.equals(currentDir.getPath()))
-			{
-				pathNotPresent = false;
-			}
-			else
-			{
-				pathNotPresent = true;
-			}
-		}
-
-		// User doesn't have this path in the config, so add it.
-		if (pathNotPresent)
-		{
-			NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Integer.toString(intDirectories+1));
-			NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), currentDir.getPath());
-		}
-
-		((GameListActivity)m_activity).SwitchPage(0);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
deleted file mode 100644
index cae56338bd..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.folderbrowser;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.dolphinemu.dolphinemu.R;
-
-/**
- * The {@link ArrayAdapter} that backs the file browser.
- * <p>
- * This is responsible for correctly handling the display
- * of the items for the UI.
- */
-public final class FolderBrowserAdapter extends ArrayAdapter<FolderBrowserItem>
-{
-	private final Context c;
-	private final int id;
-	private final List<FolderBrowserItem> items;
-
-	public FolderBrowserAdapter(Context context, int textViewResourceId, List<FolderBrowserItem> objects)
-	{
-		super(context, textViewResourceId, objects);
-		c = context;
-		id = textViewResourceId;
-		items = objects;
-	}
-
-	@Override
-	public FolderBrowserItem getItem(int i)
-	{
-		return items.get(i);
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent)
-	{
-		View v = convertView;
-		if (v == null)
-		{
-			LayoutInflater vi = (LayoutInflater) c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			v = vi.inflate(id, parent, false);
-		}
-
-		final FolderBrowserItem item = items.get(position);
-		if (item != null)
-		{
-			ImageView icon    = (ImageView) v.findViewById(R.id.ListItemIcon);
-			TextView title    = (TextView) v.findViewById(R.id.ListItemTitle);
-			TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle);
-
-			if(title != null)
-			{
-				title.setText(item.getName());
-			}
-
-			if(subtitle != null)
-			{
-				// Remove the subtitle for all folders, except for the parent directory folder.
-				if (item.isDirectory() && !item.getSubtitle().equals(c.getResources().getString(R.string.parent_directory)))
-				{
-					subtitle.setVisibility(View.GONE);
-				}
-				else
-				{
-					subtitle.setText(item.getSubtitle());
-				}
-			}
-
-			if (icon != null)
-			{
-				if (item.isDirectory())
-				{
-					icon.setImageResource(R.drawable.ic_menu_folder);
-				}
-				else
-				{
-					icon.setImageResource(R.drawable.ic_menu_file);
-				}
-			}
-		}
-		return v;
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
deleted file mode 100644
index c2b2723664..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.folderbrowser;
-
-import java.io.File;
-
-/**
- * Represents an item in the folder browser list.
- */
-public final class FolderBrowserItem implements Comparable<FolderBrowserItem>
-{
-	private final String name;
-	private final String subtitle;
-	private final String path;
-	private final File underlyingFile;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param name     The name of the file/folder represented by this item.
-	 * @param subtitle The subtitle of this FolderBrowserItem to display.
-	 * @param path     The path of the file/folder represented by this item.
-	 */
-	public FolderBrowserItem(String name, String subtitle, String path)
-	{
-		this.name = name;
-		this.subtitle = subtitle;
-		this.path = path;
-		this.underlyingFile = new File(path);
-	}
-
-	/**
-	 * Constructor. Initializes a FolderBrowserItem with an empty subtitle.
-	 * 
-	 * @param name     The name of the file/folder represented by this item.
-	 * @param path     The path of the file/folder represented by this item.
-	 */
-	public FolderBrowserItem(String name, String path)
-	{
-		this.name = name;
-		this.subtitle = "";
-		this.path = path;
-		this.underlyingFile = new File(path);
-	}
-
-	/**
-	 * Gets the name of the file/folder represented by this FolderBrowserItem.
-	 * 
-	 * @return the name of the file/folder represented by this FolderBrowserItem.
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Gets the subtitle text of this FolderBrowserItem.
-	 * 
-	 * @return the subtitle text of this FolderBrowserItem.
-	 */
-	public String getSubtitle()
-	{
-		return subtitle;
-	}
-
-	/**
-	 * Gets the path of the file/folder represented by this FolderBrowserItem.
-	 * 
-	 * @return the path of the file/folder represented by this FolderBrowserItem.
-	 */
-	public String getPath()
-	{
-		return path;
-	}
-
-	/**
-	 * Gets the {@link File} representation of the underlying file/folder
-	 * represented by this FolderBrowserItem.
-	 * 
-	 * @return the {@link File} representation of the underlying file/folder
-	 * represented by this FolderBrowserItem.
-	 */
-	public File getUnderlyingFile()
-	{
-		return underlyingFile;
-	}
-
-	/**
-	 * Gets whether or not this FolderBrowserItem represents a directory.
-	 * 
-	 * @return true if this FolderBrowserItem represents a directory, false otherwise.
-	 */
-	public boolean isDirectory()
-	{
-		return underlyingFile.isDirectory();
-	}
-
-	public int compareTo(FolderBrowserItem other)
-	{
-		if(name != null)
-			return name.toLowerCase().compareTo(other.getName().toLowerCase()); 
-		else 
-			throw new NullPointerException("The name of this FolderBrowserItem is null");
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
deleted file mode 100644
index 5eaa24f9de..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.gamelist;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
-import android.view.*;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.AboutFragment;
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.folderbrowser.FolderBrowser;
-import org.dolphinemu.dolphinemu.settings.PrefsActivity;
-import org.dolphinemu.dolphinemu.sidemenu.SideMenuAdapter;
-import org.dolphinemu.dolphinemu.sidemenu.SideMenuItem;
-
-/**
- * The activity that implements all of the functions
- * for the game list.
- */
-public final class GameListActivity extends Activity
-		implements GameListFragment.OnGameListZeroListener
-{
-	private int mCurFragmentNum = 0;
-	private Fragment mCurFragment;
-
-	private ActionBarDrawerToggle mDrawerToggle;
-	private DrawerLayout mDrawerLayout;
-	private SideMenuAdapter mDrawerAdapter;
-	private ListView mDrawerList;
-
-	/**
-	 * Called from the {@link GameListFragment}.
-	 * <p>
-	 * This is called when there are no games
-	 * currently present within the game list.
-	 */
-	public void onZeroFiles()
-	{
-		mDrawerLayout.openDrawer(mDrawerList);
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.gamelist_activity);
-
-		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-		mDrawerList = (ListView) findViewById(R.id.left_drawer);
-
-		List<SideMenuItem> dir = new ArrayList<SideMenuItem>();
-		dir.add(new SideMenuItem(getString(R.string.game_list), 0));
-		dir.add(new SideMenuItem(getString(R.string.browse_folder), 1));
-		dir.add(new SideMenuItem(getString(R.string.settings), 2));
-		dir.add(new SideMenuItem(getString(R.string.about), 3));
-
-		mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir);
-		mDrawerList.setAdapter(mDrawerAdapter);
-		mDrawerList.setOnItemClickListener(mMenuItemClickListener);
-
-		// enable ActionBar app icon to behave as action to toggle nav drawer
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-		getActionBar().setHomeButtonEnabled(true);
-
-		// ActionBarDrawerToggle ties together the the proper interactions
-		// between the sliding drawer and the action bar app icon
-		mDrawerToggle = new ActionBarDrawerToggle(
-				this,                  /* host Activity */
-				mDrawerLayout,         /* DrawerLayout object */
-				R.drawable.ic_drawer,  /* nav drawer image to replace 'Up' caret */
-				R.string.drawer_open,  /* "open drawer" description for accessibility */
-				R.string.drawer_close  /* "close drawer" description for accessibility */
-		) {
-			public void onDrawerClosed(View view) {
-				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
-			}
-
-			public void onDrawerOpened(View drawerView) {
-				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
-			}
-		};
-		mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-		recreateFragment();
-	}
-
-	private void recreateFragment()
-	{
-		mCurFragment = new GameListFragment();
-		FragmentManager fragmentManager = getFragmentManager();
-		fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
-	}
-
-	/**
-	 * Switches to the {@link Fragment} represented
-	 * by the given ID number.
-	 * 
-	 * @param toPage the number representing the {@link Fragment} to switch to.l
-	 */
-	public void SwitchPage(int toPage)
-	{
-		if (mCurFragmentNum == toPage)
-			return;
-
-		switch (mCurFragmentNum)
-		{
-			// Folder browser
-			case 1:
-				recreateFragment();
-				break;
-
-			case 0: // Game List
-			case 2: // Settings
-			case 3: // About
-			/* Do Nothing */
-				break;
-		}
-
-		switch(toPage)
-		{
-			case 0:
-			{
-				mCurFragmentNum = 0;
-				mCurFragment = new GameListFragment();
-				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
-				invalidateOptionsMenu();
-			}
-			break;
-
-			case 1:
-			{
-				mCurFragmentNum = 1;
-				mCurFragment = new FolderBrowser();
-				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
-				invalidateOptionsMenu();
-			}
-			break;
-
-			case 2:
-			{
-				Intent intent = new Intent(this, PrefsActivity.class);
-				startActivity(intent);
-			}
-			break;
-
-			case 3:
-			{
-				mCurFragmentNum = 3;
-				mCurFragment = new AboutFragment();
-				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
-				invalidateOptionsMenu();
-			}
-			break;
-
-			default:
-				break;
-		}
-	}
-
-	private final AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
-	{
-		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-		{
-			SideMenuItem o = mDrawerAdapter.getItem(position);
-			mDrawerLayout.closeDrawer(mDrawerList);
-			SwitchPage(o.getID());
-		}
-	};
-
-	/**
-	 * When using the ActionBarDrawerToggle, you must call it during
-	 * onPostCreate() and onConfigurationChanged()...
-	 */
-	@Override
-	protected void onPostCreate(Bundle savedInstanceState)
-	{
-		super.onPostCreate(savedInstanceState);
-		// Sync the toggle state after onRestoreInstanceState has occurred.
-		mDrawerToggle.syncState();
-	}
-
-	@Override
-	public void onConfigurationChanged(Configuration newConfig)
-	{
-		super.onConfigurationChanged(newConfig);
-		// Pass any configuration change to the drawer toggle
-		mDrawerToggle.onConfigurationChanged(newConfig);
-	}
-
-	/* Called whenever we call invalidateOptionsMenu() */
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu)
-	{
-		return super.onPrepareOptionsMenu(menu);
-	}
-	
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		// Only show this in the game list.
-		if (this.mCurFragmentNum == 0)
-		{
-			MenuInflater inflater = getMenuInflater();
-			inflater.inflate(R.menu.gamelist_menu, menu);
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		// The action bar home/up action should open or close the drawer.
-		// ActionBarDrawerToggle will take care of this.
-		if (mDrawerToggle.onOptionsItemSelected(item))
-		{
-			return true;
-		}
-
-		// If clear game list is pressed.
-		if (item.getItemId() == R.id.clearGameList)
-		{
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.clear_game_list);
-			builder.setMessage(getString(R.string.clear_game_list_confirm));
-			builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener(){
-				public void onClick(DialogInterface dialog, int which)
-				{
-					String directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-					int intDirs = Integer.parseInt(directories);
-
-					for (int i = 0; i < intDirs; i++)
-					{
-						NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
-					}
-
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-
-					ArrayAdapter<GameListItem> adapter = ((GameListFragment)GameListActivity.this.mCurFragment).getAdapter();
-					adapter.clear();
-					adapter.notifyDataSetChanged();
-				}
-			});
-			builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which)
-				{
-					// Do nothing. This just make "No" appear.
-				}
-			});
-
-			builder.show();
-		}
-
-		return super.onOptionsItemSelected(item);
-	}
-	
-	@Override
-	public void onBackPressed()
-	{
-		SwitchPage(0);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
deleted file mode 100644
index 365a8200c5..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.gamelist;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.R;
-
-/**
- * The adapter backing the game list.
- * <p>
- * Responsible for handling each game list item individually.
- */
-public final class GameListAdapter extends ArrayAdapter<GameListItem>
-{
-	private final Context c;
-	private final int id;
-	private final List<GameListItem>items;
-
-	public GameListAdapter(Context context, int textViewResourceId, List<GameListItem> objects)
-	{
-		super(context, textViewResourceId, objects);
-		c = context;
-		id = textViewResourceId;
-		items = objects;
-	}
-
-	@Override
-	public GameListItem getItem(int i)
-	{
-		return items.get(i);
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent)
-	{
-		View v = convertView;
-		if (v == null)
-		{
-			LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			v = vi.inflate(id, parent, false);
-		}
-
-		final GameListItem item = items.get(position);
-		if (item != null)
-		{
-			TextView title    = (TextView) v.findViewById(R.id.ListItemTitle);
-			TextView subtitle = (TextView) v.findViewById(R.id.ListItemSubTitle);
-			ImageView icon    = (ImageView) v.findViewById(R.id.ListItemIcon);
-
-			if (title != null)
-				title.setText(item.getName());
-
-			if (subtitle != null)
-				subtitle.setText(item.getData());
-
-			if (icon != null)
-			{
-				icon.setImageBitmap(item.getImage());
-				icon.getLayoutParams().width = (int) ((860 / c.getResources().getDisplayMetrics().density) + 0.5);
-				icon.getLayoutParams().height = (int)((340 / c.getResources().getDisplayMetrics().density) + 0.5);
-			}
-		}
-
-		return v;
-	}
-}
-
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
deleted file mode 100644
index 508955d953..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.gamelist;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.dolphinemu.dolphinemu.EmulationActivity;
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-
-
-/**
- * The {@link Fragment} responsible for displaying the game list.
- */
-public final class GameListFragment extends Fragment
-{
-	private ListView mMainList;
-	private GameListAdapter mGameAdapter;
-	private static GameListActivity mMe;
-	private OnGameListZeroListener mCallback;
-
-	/**
-	 * Interface that defines how to handle the case
-	 * when there are zero game.
-	 */
-	public interface OnGameListZeroListener
-	{
-		/**
-		 * This is called when there are no games
-		 * currently present within the game list.
-		 */
-		void onZeroFiles();
-	}
-	
-	/**
-	 * Gets the adapter for this fragment.
-	 * 
-	 * @return the adapter for this fragment.
-	 */
-	public GameListAdapter getAdapter()
-	{
-	    return mGameAdapter;
-	}
-
-	private void Fill()
-	{
-		List<GameListItem> fls = new ArrayList<GameListItem>();
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-		int intDirectories = Integer.parseInt(Directories);
-
-		// Extensions to filter by.
-		Set<String> exts = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
-
-		for (int a = 0; a < intDirectories; ++a)
-		{
-			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + a, "");
-			File currentDir = new File(BrowseDir);
-			File[] dirs = currentDir.listFiles();
-			try
-			{
-				for (File entry : dirs)
-				{
-					String entryName = entry.getName();
-
-					if (!entry.isHidden() && !entry.isDirectory())
-					{
-						if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
-							fls.add(new GameListItem(mMe, entryName, getString(R.string.file_size)+entry.length(),entry.getAbsolutePath()));
-					}
-				}
-			}
-			catch (Exception ignored)
-			{
-			}
-		}
-		Collections.sort(fls);
-
-		mGameAdapter = new GameListAdapter(mMe, R.layout.gamelist_folderbrowser_list, fls);
-		mMainList.setAdapter(mGameAdapter);
-
-		if (fls.isEmpty())
-		{
-			mCallback.onZeroFiles();
-		}
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-	{
-		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
-		mMainList = (ListView) rootView.findViewById(R.id.gamelist);
-		mMainList.setOnItemClickListener(mGameItemClickListener);
-
-		Fill();
-
-		return mMainList;
-	}
-
-	private final AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
-	{
-		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-		{
-			GameListItem item = mGameAdapter.getItem(position);
-			onFileClick(item.getPath());
-		}
-	};
-
-	private void onFileClick(String o)
-	{
-		Toast.makeText(mMe, getString(R.string.file_clicked) + o, Toast.LENGTH_SHORT).show();
-
-		Intent intent = new Intent(mMe, EmulationActivity.class);
-		intent.putExtra("SelectedGame", o);
-		mMe.startActivity(intent);
-		mMe.finish();
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// This makes sure that the container activity has implemented
-		// the callback interface. If not, it throws an exception
-		try
-		{
-			mCallback = (OnGameListZeroListener) activity;
-			mMe = (GameListActivity) activity;
-		}
-		catch (ClassCastException e)
-		{
-			throw new ClassCastException(activity.toString()
-					+ " must implement OnGameListZeroListener");
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
deleted file mode 100644
index 67d61256d4..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.gamelist;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.dolphinemu.dolphinemu.NativeLibrary;
-
-/**
- * Represents an item in the game list.
- */
-public final class GameListItem implements Comparable<GameListItem>
-{
-	private String name;
-	private final String data;
-	private final String path;
-	private Bitmap image;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param ctx     The current {@link Context}
-	 * @param name    The name of this GameListItem.
-	 * @param data    The subtitle for this GameListItem
-	 * @param path    The file path for the game represented by this GameListItem.
-	 */
-	public GameListItem(Context ctx, String name, String data, String path)
-	{
-		this.name = name;
-		this.data = data;
-		this.path = path;
-
-		File file = new File(path);
-		if (!file.isDirectory() && !path.isEmpty())
-		{
-			int[] Banner = NativeLibrary.GetBanner(path);
-			if (Banner[0] == 0)
-			{
-				try
-				{
-					// Open the no banner icon.
-					InputStream noBannerPath = ctx.getAssets().open("NoBanner.png");
-
-					// Decode the bitmap.
-					image = BitmapFactory.decodeStream(noBannerPath);
-
-					// Scale the bitmap to match other banners.
-					image = Bitmap.createScaledBitmap(image, 96, 32, false);
-				}
-				catch (IOException e)
-				{
-					Log.e("GameListItem", e.toString());
-				}
-			}
-			else
-			{
-				image = Bitmap.createBitmap(Banner, 96, 32, Bitmap.Config.ARGB_8888);
-			}
-
-			this.name = NativeLibrary.GetTitle(path);
-		}
-	}
-
-	/**
-	 * Gets the name of this GameListItem.
-	 * 
-	 * @return the name of this GameListItem.
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Gets the subtitle of this GameListItem.
-	 * 
-	 * @return the subtitle of this GameListItem.
-	 */
-	public String getData()
-	{
-		return data;
-	}
-
-	/**
-	 * Gets the file path of the game represented by this GameListItem.
-	 * 
-	 * @return the file path of the game represented by this GameListItem.
-	 */
-	public String getPath()
-	{
-		return path;
-	}
-
-	/**
-	 * Gets the image data for this game as a {@link Bitmap}.
-	 * 
-	 * @return the image data for this game as a {@link Bitmap}.
-	 */
-	public Bitmap getImage()
-	{
-		return image;
-	}
-
-	public int compareTo(GameListItem o) 
-	{
-		if (name != null)
-			return name.toLowerCase().compareTo(o.getName().toLowerCase()); 
-		else 
-			throw new NullPointerException("The name of this GameListItem is null");
-	}
-}
-
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java
deleted file mode 100644
index eb81e53fc3..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.settings;
-
-import org.dolphinemu.dolphinemu.R;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.PreferenceFragment;
-
-/**
- * Responsible for the loading of the CPU preferences.
- */
-public final class CPUSettingsFragment extends PreferenceFragment
-{
-	private Activity m_activity;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.cpu_prefs);
-
-		final ListPreference cpuCores = (ListPreference) findPreference("cpuCorePref");
-
-		//
-		// Set valid emulation cores depending on the CPU architecture
-		// that the Android device is running on.
-		//
-		if (Build.CPU_ABI.contains("x86"))
-		{
-			cpuCores.setEntries(R.array.emuCoreEntriesX86);
-			cpuCores.setEntryValues(R.array.emuCoreValuesX86);
-		}
-		else if (Build.CPU_ABI.contains("arm"))
-		{
-			cpuCores.setEntries(R.array.emuCoreEntriesARM);
-			cpuCores.setEntryValues(R.array.emuCoreValuesARM);
-		}
-		else
-		{
-			cpuCores.setEntries(R.array.emuCoreEntriesOther);
-			cpuCores.setEntryValues(R.array.emuCoreValuesOther);
-		}
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// Cache the activity instance.
-		m_activity = activity;
-	}
-
-	@Override
-	public void onDestroy()
-	{
-		super.onDestroy();
-
-		// When this fragment is destroyed, force the settings to be saved to the ini file.
-		UserPreferences.SaveConfigToDolphinIni(m_activity);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
deleted file mode 100644
index 26e89f412d..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.settings;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
-import android.util.Log;
-import android.view.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-
-/**
- * The {@link Fragment} responsible for implementing the functionality
- * within the input control mapping config.
- */
-public final class InputConfigFragment extends PreferenceFragment
-{
-	private Activity m_activity;
-	private boolean firstEvent = true;
-	private static final ArrayList<Float> m_values = new ArrayList<Float>();
-
-	/**
-	 * Gets the descriptor for the given {@link InputDevice}.
-	 * 
-	 * @param input The {@link InputDevice} to get the descriptor of.
-	 * 
-	 * @return the descriptor for the given {@link InputDevice}.
-	 */
-	public static String getInputDesc(InputDevice input)
-	{
-		if (input == null)
-			return "null"; // Happens when the InputDevice is from an unknown source
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-		{
-			return input.getDescriptor();
-		}
-		else
-		{
-			List<InputDevice.MotionRange> motions = input.getMotionRanges();
-			String fakeid = "";
-
-			for (InputDevice.MotionRange range : motions)
-				fakeid += range.getAxis();
-
-			return fakeid;
-		}
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-
-		// Expand the preferences from the XML.
-		addPreferencesFromResource(R.xml.input_prefs);
-
-		// Set the summary messages of the preferences to whatever binding
-		// is currently set within the Dolphin config.
-		final String[] keys = 
-		{
-			"InputA", "InputB", "InputX", "InputY", "InputZ", "InputStart",
-			"DPadUp", "DPadDown", "DPadLeft", "DPadRight",
-			"MainUp", "MainDown", "MainLeft", "MainRight",
-			"CStickUp", "CStickDown", "CStickLeft", "CStickRight",
-			"InputL", "InputR",
-		};
-
-		Preference pref;
-		for (String key : keys)
-		{
-			String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key, "None");
-			pref = findPreference(key);
-			pref.setSummary(binding);
-		}
-	}
-
-	@Override
-	public boolean onPreferenceTreeClick(final PreferenceScreen screen, final Preference pref)
-	{
-		// Begin the creation of the input alert.
-		final MotionAlertDialog dialog = new MotionAlertDialog(m_activity);
-
-		// Set the key listener
-		dialog.setOnKeyListener(new AlertDialog.OnKeyListener()
-		{
-			public boolean onKey(DialogInterface dlg, int keyCode, KeyEvent event)
-			{
-				Log.d("InputConfigFragment", "Received key event: " + event.getAction());
-				switch (event.getAction())
-				{
-					case KeyEvent.ACTION_DOWN:
-					case KeyEvent.ACTION_UP:
-						InputDevice input = event.getDevice();
-						String bindStr = "Device '" + getInputDesc(input) + "'-Button " + event.getKeyCode();
-						NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
-						pref.setSummary(bindStr);
-						dialog.dismiss();
-						return true;
-
-					default:
-						break;
-				}
-
-				return false;
-			}
-		});
-
-		// Set the motion event listener.
-		dialog.setOnMotionEventListener(new MotionAlertDialog.OnMotionEventListener()
-		{
-			public boolean onMotion(MotionEvent event)
-			{
-				if (event == null || (event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
-					return false;
-
-				Log.d("InputConfigFragment", "Received motion event: " + event.getAction());
-
-				InputDevice input = event.getDevice();
-				List<InputDevice.MotionRange> motions = input.getMotionRanges();
-				if (firstEvent)
-				{
-					m_values.clear();
-
-					for (InputDevice.MotionRange range : motions)
-					{
-						m_values.add(event.getAxisValue(range.getAxis()));
-					}
-
-					firstEvent = false;
-				}
-				else
-				{
-					for (int a = 0; a < motions.size(); ++a)
-					{
-						InputDevice.MotionRange range = motions.get(a);
-
-						if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
-						{
-							String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-";
-							NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
-							pref.setSummary(bindStr);
-							dialog.dismiss();
-						}
-						else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
-						{
-							String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+";
-							NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
-							pref.setSummary(bindStr);
-							dialog.dismiss();
-						}
-					}
-				}
-
-				return true;
-			}
-		});
-
-		// Set the cancel button.
-		dialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.cancel), new AlertDialog.OnClickListener()
-		{
-			public void onClick(DialogInterface dialog, int which)
-			{
-				// Do nothing. This just makes the cancel button appear.
-			}
-		});
-
-		// Set the title and description message.
-		dialog.setTitle(R.string.input_binding);
-		dialog.setMessage(String.format(getString(R.string.input_binding_descrip), pref.getTitle()));
-
-		// Don't allow the dialog to close when a user taps
-		// outside of it. They must press cancel or provide an input.
-		dialog.setCanceledOnTouchOutside(false);
-
-		// Everything is set, show the dialog.
-		dialog.show();
-		return true;
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// Cache the activity instance.
-		m_activity = activity;
-	}
-
-	/**
-	 * {@link AlertDialog} class derivative that allows the motion listener
-	 * to be set anonymously, so the creation of an explicit class for
-	 * providing functionality is not necessary.
-	 */
-	private static final class MotionAlertDialog extends AlertDialog
-	{
-		private OnMotionEventListener motionListener;
-
-		/**
-		 * Constructor
-		 * 
-		 * @param ctx context to use this dialog in.
-		 */
-		public MotionAlertDialog(Context ctx)
-		{
-			super(ctx);
-		}
-
-		/**
-		 * Interface which defines a callback method for general
-		 * motion events. This allows motion event code to be set
-		 * in the event anonymous classes of this dialog are used.
-		 */
-		public interface OnMotionEventListener
-		{
-			/**
-			 * Denotes the behavior that should happen when a motion event occurs.
-			 * 
-			 * @param event Reference to the {@link MotionEvent} that occurred.
-			 * 
-			 * @return true if the {@link MotionEvent} is consumed in this call; false otherwise.
-			 */
-			boolean onMotion(MotionEvent event);
-		}
-
-		/**
-		 * Sets the motion listener.
-		 * 
-		 * @param listener The motion listener to set.
-		 */
-		public void setOnMotionEventListener(OnMotionEventListener listener)
-		{
-			this.motionListener = listener;
-		}
-
-		@Override
-		public boolean dispatchKeyEvent(KeyEvent event)
-		{
-			if (onKeyDown(event.getKeyCode(), event))
-				return true;
-
-			return super.dispatchKeyEvent(event);
-		}
-		
-		@Override
-		public boolean dispatchGenericMotionEvent(MotionEvent event)
-		{
-			if (motionListener.onMotion(event))
-				return true;
-
-			return super.dispatchGenericMotionEvent(event);
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
deleted file mode 100644
index 486110f6c9..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.settings;
-
-import org.dolphinemu.dolphinemu.R;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-
-/**
- * Main activity that manages all of the preference fragments used to display
- * the settings to the user.
- */
-public final class PrefsActivity extends Activity implements ActionBar.TabListener
-{
-	/**
-	 * The {@link android.support.v4.view.PagerAdapter} that will provide org.dolphinemu.dolphinemu.settings for each of the
-	 * sections. We use a {@link android.support.v4.app.FragmentPagerAdapter} derivative, which will
-	 * keep every loaded fragment in memory. If this becomes too memory intensive, it may be best to
-	 * switch to a {@link android.support.v4.app.FragmentStatePagerAdapter}.
-	 */
-	private SectionsPagerAdapter mSectionsPagerAdapter;
-
-	/**
-	 * The {@link ViewPager} that will host the section contents.
-	 */
-	private ViewPager mViewPager;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.prefs_viewpager);
-		
-		// Set up the action bar.
-		final ActionBar actionBar = getActionBar();
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-
-		// Create the adapter that will return a fragment for each of the three
-		// primary sections of the app.
-		mSectionsPagerAdapter = new SectionsPagerAdapter(getFragmentManager());
-
-		// Set up the ViewPager with the sections adapter.
-		mViewPager = (ViewPager) findViewById(R.id.pager);
-		mViewPager.setAdapter(mSectionsPagerAdapter);
-
-		// When swiping between different sections, select the corresponding
-		// tab. We can also use ActionBar.Tab#select() to do this if we have
-		// a reference to the Tab.
-		mViewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener()
-		{
-			@Override
-			public void onPageSelected(int position)
-			{
-				actionBar.setSelectedNavigationItem(position);
-			}
-		} );
-
-		// Create a tab with text corresponding to the page title defined by
-		// the adapter. Also specify this Activity object, which implements
-		// the TabListener interface, as the callback (listener) for when
-		// this tab is selected.
-		actionBar.addTab(actionBar.newTab().setText(R.string.cpu_settings).setTabListener(this));
-		actionBar.addTab(actionBar.newTab().setText(R.string.input_settings).setTabListener(this));
-		actionBar.addTab(actionBar.newTab().setText(R.string.video_settings).setTabListener(this));
-	}
-
-	public void onTabReselected(Tab tab, FragmentTransaction ft)
-	{
-		// Do nothing.
-	}
-
-	public void onTabSelected(Tab tab, FragmentTransaction ft)
-	{
-		// When the given tab is selected, switch to the corresponding page in the ViewPager.
-		mViewPager.setCurrentItem(tab.getPosition());
-	}
-
-	public void onTabUnselected(Tab tab, FragmentTransaction ft)
-	{
-		// Do nothing.
-	}
-
-	/**
-	 * A {@link FragmentPagerAdapter} that returns a fragment 
-	 * corresponding to one of the sections/tabs/pages.
-	 */
-	public final class SectionsPagerAdapter extends FragmentPagerAdapter
-	{
-		public SectionsPagerAdapter(FragmentManager fm)
-		{
-			super(fm);
-		}
-
-		@Override
-		public Fragment getItem(int position)
-		{
-			switch(position)
-			{
-				case 0:
-					return new CPUSettingsFragment();
-
-				case 1:
-					return new InputConfigFragment();
-
-				case 2:
-					return new VideoSettingsFragment();
-
-				default: // Should never happen.
-					return null;
-			}
-		}
-
-		@Override
-		public int getCount()
-		{
-			// Show total pages.
-			return 3;
-		}
-
-		@Override
-		public CharSequence getPageTitle(int position)
-		{
-			switch(position)
-			{
-				case 0:
-					return getString(R.string.cpu_settings);
-
-				case 1:
-					return getString(R.string.input_settings);
-
-				case 2:
-					return getString(R.string.video_settings);
-
-				default: // Should never happen.
-					return null;
-			}
-		}
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
deleted file mode 100644
index 498e6607b1..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.settings;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import org.dolphinemu.dolphinemu.R;
-
-import javax.microedition.khronos.egl.*;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * Responsible for handling the loading of the video preferences.
- */
-public final class VideoSettingsFragment extends PreferenceFragment
-{
-	public static String m_GLVersion;
-	public static String m_GLVendor;
-	public static String m_GLRenderer;
-	private Activity m_activity;
-
-	/**
-	 * Class which provides a means to check various
-	 * info about the OpenGL ES support for a device.
-	 */
-	public static final class VersionCheck
-	{
-		private EGL10 mEGL;
-		private EGLDisplay mEGLDisplay;
-		private EGLConfig[] mEGLConfigs;
-		private EGLConfig mEGLConfig;
-		private EGLContext mEGLContext;
-		private EGLSurface mEGLSurface;
-		private GL10 mGL;
-
-		String mThreadOwner;
-
-		public VersionCheck()
-		{
-			int[] version = new int[2];
-			int[] attribList = new int[] {
-					EGL10.EGL_WIDTH, 1,
-					EGL10.EGL_HEIGHT, 1,
-					EGL10.EGL_RENDERABLE_TYPE, 4,
-					EGL10.EGL_NONE
-			};
-			int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-			int[] ctx_attribs = new int[] {
-					EGL_CONTEXT_CLIENT_VERSION, 2,
-					EGL10.EGL_NONE
-			};
-
-			// No error checking performed, minimum required code to elucidate logic
-			mEGL = (EGL10) EGLContext.getEGL();
-			mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-			mEGL.eglInitialize(mEGLDisplay, version);
-			mEGLConfig = chooseConfig(); // Choosing a config is a little more complicated
-			mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, ctx_attribs);
-			mEGLSurface = mEGL.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig,  attribList);
-			mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
-			mGL = (GL10) mEGLContext.getGL();
-
-			// Record thread owner of OpenGL context
-			mThreadOwner = Thread.currentThread().getName();
-		}
-
-		/**
-		 * Gets the OpenGL ES version string.
-		 * 
-		 * @return  the OpenGL ES version string.
-		 */
-		public String getVersion()
-		{
-			return mGL.glGetString(GL10.GL_VERSION);
-		}
-
-		/**
-		 * Gets the OpenGL ES vendor string.
-		 * 
-		 * @return the OpenGL ES vendor string.
-		 */
-		public String getVendor()
-		{
-			return mGL.glGetString(GL10.GL_VENDOR);
-		}
-
-		/**
-		 * Gets the name of the OpenGL ES renderer.
-		 * 
-		 * @return the name of the OpenGL ES renderer.
-		 */
-		public String getRenderer()
-		{
-			return mGL.glGetString(GL10.GL_RENDERER);
-		}
-
-		private EGLConfig chooseConfig()
-		{
-			int[] attribList = new int[] {
-					EGL10.EGL_DEPTH_SIZE, 0,
-					EGL10.EGL_STENCIL_SIZE, 0,
-					EGL10.EGL_RED_SIZE, 8,
-					EGL10.EGL_GREEN_SIZE, 8,
-					EGL10.EGL_BLUE_SIZE, 8,
-					EGL10.EGL_ALPHA_SIZE, 8,
-					EGL10.EGL_NONE
-			};
-
-			// No error checking performed, minimum required code to elucidate logic
-			// Expand on this logic to be more selective in choosing a configuration
-			int[] numConfig = new int[1];
-			mEGL.eglChooseConfig(mEGLDisplay, attribList, null, 0, numConfig);
-			int configSize = numConfig[0];
-			mEGLConfigs = new EGLConfig[configSize];
-			mEGL.eglChooseConfig(mEGLDisplay, attribList, mEGLConfigs, configSize, numConfig);
-
-			return mEGLConfigs[0];  // Best match is probably the first configuration
-		}
-	}
-
-	/**
-	 * Checks if this device supports OpenGL ES 3.
-	 * 
-	 * @return true if this device supports OpenGL ES 3; false otherwise.
-	 */
-	public static boolean SupportsGLES3()
-	{
-		VersionCheck mbuffer = new VersionCheck();
-		m_GLVersion = mbuffer.getVersion();
-		m_GLVendor = mbuffer.getVendor();
-		m_GLRenderer = mbuffer.getRenderer();
-
-		boolean mSupportsGLES3 = false;
-
-		// Check for OpenGL ES 3 support (General case).
-		if (m_GLVersion != null && (m_GLVersion.contains("OpenGL ES 3.0") || m_GLVersion.equals("OpenGL ES 3.0")))
-			mSupportsGLES3 = true;
-
-		// Checking for OpenGL ES 3 support for certain Qualcomm devices.
-		if (!mSupportsGLES3 && m_GLVendor != null && m_GLVendor.equals("Qualcomm"))
-		{
-			if (m_GLRenderer.contains("Adreno (TM) 3"))
-			{
-				int mVStart = m_GLVersion.indexOf("V@") + 2;
-				int mVEnd = 0;
-				float mVersion;
-
-				for (int a = mVStart; a < m_GLVersion.length(); ++a)
-				{
-					if (m_GLVersion.charAt(a) == ' ')
-					{
-						mVEnd = a;
-						break;
-					}
-				}
-
-				mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
-
-				if (mVersion >= 14.0f)
-					mSupportsGLES3 = true;
-			}
-		}
-		return mSupportsGLES3;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.video_prefs);
-
-		//
-		// Setting valid video backends.
-		//
-		final ListPreference videoBackends = (ListPreference) findPreference("gpuPref");
-		final boolean deviceSupportsGLES3 = SupportsGLES3();
-
-		if (deviceSupportsGLES3)
-		{
-			videoBackends.setEntries(R.array.videoBackendEntriesGLES3);
-			videoBackends.setEntryValues(R.array.videoBackendValuesGLES3);
-		}
-		else
-		{
-			videoBackends.setEntries(R.array.videoBackendEntriesNoGLES3);
-			videoBackends.setEntryValues(R.array.videoBackendValuesNoGLES3);
-		}
-		
-		//
-		// Disable all options if Software Rendering is used.
-		//
-		// Note that the numeric value in 'getPreference()'
-		// denotes the placement on the UI. So if more elements are
-		// added to the video settings, these may need to change.
-		//
-		final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(m_activity);
-		final PreferenceScreen mainScreen = getPreferenceScreen();
-
-		if (videoBackends.getValue().equals("Software Renderer"))
-		{
-			mainScreen.getPreference(0).setEnabled(false);
-			mainScreen.getPreference(1).setEnabled(false);
-			mainScreen.getPreference(3).setEnabled(false);
-			//mainScreen.getPreference(4).setEnabled(true);
-		}
-		else if (videoBackends.getValue().equals("OGL"))
-		{
-			mainScreen.getPreference(0).setEnabled(true);
-			mainScreen.getPreference(1).setEnabled(true);
-			mainScreen.getPreference(3).setEnabled(true);
-			//mainScreen.getPreference(4).setEnabled(false);
-		}
-
-		// Also set a listener, so that if someone changes the video backend, it will disable
-		// the video settings, upon the user choosing "Software Rendering".
-		sPrefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener()
-		{
-			@Override
-			public void onSharedPreferenceChanged(SharedPreferences preference, String key)
-			{
-				if (key.equals("gpuPref"))
-				{
-					if (preference.getString(key, "Software Renderer").equals("Software Renderer"))
-					{
-						mainScreen.getPreference(0).setEnabled(false);
-						mainScreen.getPreference(1).setEnabled(false);
-						mainScreen.getPreference(3).setEnabled(false);
-						//mainScreen.getPreference(4).setEnabled(true);
-					}
-					else if (preference.getString(key, "Software Renderer").equals("OGL"))
-					{
-						mainScreen.getPreference(0).setEnabled(true);
-						mainScreen.getPreference(1).setEnabled(true);
-						mainScreen.getPreference(3).setEnabled(true);
-						//mainScreen.getPreference(4).setEnabled(false);
-					}
-				}
-			}
-		});
-	}
-
-	@Override
-	public void onAttach(Activity activity)
-	{
-		super.onAttach(activity);
-
-		// Cache the activity instance.
-		m_activity = activity;
-	}
-
-	@Override
-	public void onDestroy()
-	{
-		super.onDestroy();
-
-		// When the fragment is done being used, save the settings to the Dolphin ini file.
-		UserPreferences.SaveConfigToDolphinIni(m_activity);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
deleted file mode 100644
index 0e84009071..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.sidemenu;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.R;
-
-/**
- * Adapter that backs the sidebar menu.
- * <p>
- * Responsible for handling the elements of each sidebar item.
- */
-public final class SideMenuAdapter extends ArrayAdapter<SideMenuItem>
-{
-	private final Context c;
-	private final int id;
-	private final List<SideMenuItem>items;
-
-	public SideMenuAdapter(Context context, int textViewResourceId, List<SideMenuItem> objects)
-	{
-		super(context, textViewResourceId, objects);
-		c = context;
-		id = textViewResourceId;
-		items = objects;
-	}
-
-	@Override
-	public SideMenuItem getItem(int i)
-	{
-		return items.get(i);
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent)
-	{
-		View v = convertView;
-		if (v == null)
-		{
-			LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			v = vi.inflate(id, null);
-		}
-
-		final SideMenuItem item = items.get(position);
-		if (item != null)
-		{
-			TextView title = (TextView) v.findViewById(R.id.SideMenuTitle);
-
-			if (title != null)
-				title.setText(item.getName());
-		}
-
-		return v;
-	}
-}
-
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
deleted file mode 100644
index 402fad094c..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-package org.dolphinemu.dolphinemu.sidemenu;
-
-
-/**
- * Represents an item that goes in the sidemenu of the app.
- */
-public final class SideMenuItem
-{
-	private final String name;
-	private final int id;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param name The name of the SideMenuItem.
-	 * @param id   ID number of this specific SideMenuItem.
-	 */
-	public SideMenuItem(String name, int id)
-	{
-		this.name = name;
-		this.id = id;
-	}
-
-	/**
-	 * Gets the name of this SideMenuItem.
-	 * 
-	 * @return the name of this SideMenuItem.
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Gets the ID of this SideMenuItem.
-	 * 
-	 * @return the ID of this SideMenuItem.
-	 */
-	public int getID()
-	{
-		return id;
-	}
-}
-
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 97f8642fe1..267ceff2be 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1,12 +1,56 @@
+set(CMAKE_FAKELANG_CREATE_STATIC_LIBRARY "touch <TARGET>")
+if(ENABLE_PCH)
+	# This is actually a .h file, but trick cmake into compiling it as a source file
+	set(pch_out_filename "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/pch.dir/pch.h")
+	if (ANDROID)
+		set(pch_lib_filename "${LIBRARY_OUTPUT_PATH}/libpch.a")
+	else()
+		set(pch_lib_filename "${CMAKE_CURRENT_BINARY_DIR}/libpch.a")
+	endif()
+	set(pch_src_filename "${CMAKE_CURRENT_SOURCE_DIR}/PCH/pch.h")
+
+	if(APPLE)
+		set(type objective-c++-header)
+	else()
+		set(type c++-header)
+	endif()
+
+	set_source_files_properties(
+		PCH/pch.h PROPERTIES
+		COMPILE_FLAGS "-x ${type}"
+		HEADER_FILE_ONLY 0
+		LANGUAGE CXX)
+
+	add_library(pch STATIC PCH/pch.h)
+
+	add_custom_command(
+		TARGET pch
+		PRE_LINK
+		COMMAND ln -fs "${pch_out_filename}.o" "${pch_out_filename}.gch"
+		COMMAND ln -fs "${pch_out_filename}.o" "${pch_out_filename}.pch"
+		COMMAND cp "${pch_src_filename}" "${pch_out_filename}")
+
+	set_target_properties(
+		pch PROPERTIES
+		LINKER_LANGUAGE FAKELANG)
+endif(ENABLE_PCH)
+macro(add_dolphin_library lib srcs libs)
+	add_library(${lib} STATIC ${srcs})
+	target_link_libraries(${lib} ${libs})
+	if(ENABLE_PCH)
+		add_dependencies(${lib} pch)
+		set_source_files_properties(
+			${srcs} PROPERTIES
+			COMPILE_FLAGS "-include '${pch_out_filename}'"
+			OBJECT_DEPENDS "${pch_lib_filename}")
+	endif(ENABLE_PCH)
+endmacro(add_dolphin_library)
+
 add_subdirectory(Core)
-add_subdirectory(Plugins)
+add_subdirectory(UnitTests)
 
 if (DSPTOOL)
 	add_subdirectory(DSPTool)
 endif()
 
-if (UNITTESTS)
-	add_subdirectory(UnitTests)
-endif()
-
-# TODO: Add DSPSpy and TestSuite. Preferrably make them option()s and cpack components
+# TODO: Add DSPSpy. Preferrably make it option() and cpack component
diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp
new file mode 100644
index 0000000000..ee10133ae4
--- /dev/null
+++ b/Source/Core/AudioCommon/AOSoundStream.cpp
@@ -0,0 +1,80 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+
+#include "AudioCommon/AOSoundStream.h"
+#include "AudioCommon/Mixer.h"
+
+#if defined(HAVE_AO) && HAVE_AO
+
+void AOSound::SoundLoop()
+{
+	Common::SetCurrentThreadName("Audio thread - ao");
+
+	uint_32 numBytesToRender = 256;
+	ao_initialize();
+	default_driver = ao_default_driver_id();
+	format.bits = 16;
+	format.channels = 2;
+	format.rate = m_mixer->GetSampleRate();
+	format.byte_format = AO_FMT_LITTLE;
+
+	device = ao_open_live(default_driver, &format, nullptr /* no options */);
+	if (!device)
+	{
+		PanicAlertT("AudioCommon: Error opening AO device.\n");
+		ao_shutdown();
+		Stop();
+		return;
+	}
+
+	buf_size = format.bits/8 * format.channels * format.rate;
+
+	while (m_run_thread.load())
+	{
+		m_mixer->Mix(realtimeBuffer, numBytesToRender >> 2);
+
+		{
+		std::lock_guard<std::mutex> lk(soundCriticalSection);
+		ao_play(device, (char*)realtimeBuffer, numBytesToRender);
+		}
+
+		soundSyncEvent.Wait();
+	}
+}
+
+bool AOSound::Start()
+{
+	m_run_thread.store(true);
+	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
+
+	thread = std::thread(&AOSound::SoundLoop, this);
+	return true;
+}
+
+void AOSound::Update()
+{
+	soundSyncEvent.Set();
+}
+
+void AOSound::Stop()
+{
+	m_run_thread.store(false);
+	soundSyncEvent.Set();
+
+	{
+	std::lock_guard<std::mutex> lk(soundCriticalSection);
+	thread.join();
+
+	if (device)
+		ao_close(device);
+
+	ao_shutdown();
+
+	device = nullptr;
+	}
+}
+
+#endif
diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h
new file mode 100644
index 0000000000..a37c3f9467
--- /dev/null
+++ b/Source/Core/AudioCommon/AOSoundStream.h
@@ -0,0 +1,47 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
+#include "Common/Thread.h"
+
+#if defined(HAVE_AO) && HAVE_AO
+#include <ao/ao.h>
+#endif
+
+class AOSound final : public SoundStream
+{
+#if defined(HAVE_AO) && HAVE_AO
+	std::thread thread;
+	std::atomic<bool> m_run_thread;
+	std::mutex soundCriticalSection;
+	Common::Event soundSyncEvent;
+
+	int buf_size;
+
+	ao_device *device;
+	ao_sample_format format;
+	int default_driver;
+
+	short realtimeBuffer[1024 * 1024];
+
+public:
+	bool Start() override;
+	void SoundLoop() override;
+	void Stop() override;
+	void Update() override;
+
+	static bool isValid()
+	{
+		return true;
+	}
+
+#endif
+};
diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
similarity index 83%
rename from Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
rename to Source/Core/AudioCommon/AlsaSoundStream.cpp
index 2ccf4d22ae..5902edba94 100644
--- a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -1,18 +1,19 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <functional>
-
-#include "Common.h"
-#include "Thread.h"
-#include "AlsaSoundStream.h"
+#include "AudioCommon/AlsaSoundStream.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
 
 #define FRAME_COUNT_MIN 256
 #define BUFFER_SIZE_MAX 8192
 #define BUFFER_SIZE_BYTES (BUFFER_SIZE_MAX*2*2)
 
-AlsaSound::AlsaSound(CMixer *mixer) : SoundStream(mixer), thread_data(0), handle(NULL), frames_to_deliver(FRAME_COUNT_MIN)
+AlsaSound::AlsaSound()
+	: m_thread_status(ALSAThreadStatus::STOPPED)
+	, handle(nullptr)
+	, frames_to_deliver(FRAME_COUNT_MIN)
 {
 	mix_buffer = new u8[BUFFER_SIZE_BYTES];
 }
@@ -24,14 +25,14 @@ AlsaSound::~AlsaSound()
 
 bool AlsaSound::Start()
 {
-	thread = std::thread(std::mem_fun(&AlsaSound::SoundLoop), this);
-	thread_data = 0;
+	m_thread_status.store(ALSAThreadStatus::RUNNING);
+	thread = std::thread(&AlsaSound::SoundLoop, this);
 	return true;
 }
 
 void AlsaSound::Stop()
 {
-	thread_data = 1;
+	m_thread_status.store(ALSAThreadStatus::STOPPING);
 	thread.join();
 }
 
@@ -44,11 +45,11 @@ void AlsaSound::Update()
 void AlsaSound::SoundLoop()
 {
 	if (!AlsaInit()) {
-		thread_data = 2;
+		m_thread_status.store(ALSAThreadStatus::STOPPED);
 		return;
 	}
 	Common::SetCurrentThreadName("Audio thread - alsa");
-	while (!thread_data)
+	while (m_thread_status.load() == ALSAThreadStatus::RUNNING)
 	{
 		m_mixer->Mix(reinterpret_cast<short *>(mix_buffer), frames_to_deliver);
 		int rc = m_muted ? 1337 : snd_pcm_writei(handle, mix_buffer, frames_to_deliver);
@@ -57,13 +58,13 @@ void AlsaSound::SoundLoop()
 			// Underrun
 			snd_pcm_prepare(handle);
 		}
-		else if (rc < 0) 
+		else if (rc < 0)
 		{
 			ERROR_LOG(AUDIO, "writei fail: %s", snd_strerror(rc));
 		}
 	}
 	AlsaShutdown();
-	thread_data = 2;
+	m_thread_status.store(ALSAThreadStatus::STOPPED);
 }
 
 bool AlsaSound::AlsaInit()
@@ -77,7 +78,7 @@ bool AlsaSound::AlsaInit()
 	unsigned int periods;
 
 	err = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Audio open error: %s\n", snd_strerror(err));
 		return false;
@@ -86,21 +87,21 @@ bool AlsaSound::AlsaInit()
 	snd_pcm_hw_params_alloca(&hwparams);
 
 	err = snd_pcm_hw_params_any(handle, hwparams);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Broken configuration for this PCM: %s\n", snd_strerror(err));
 		return false;
 	}
-	
+
 	err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Access type not available: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16_LE);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Sample format not available: %s\n", snd_strerror(err));
 		return false;
@@ -108,14 +109,14 @@ bool AlsaSound::AlsaInit()
 
 	dir = 0;
 	err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &sample_rate, &dir);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Rate not available: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_hw_params_set_channels(handle, hwparams, 2);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Channels count not available: %s\n", snd_strerror(err));
 		return false;
@@ -123,7 +124,7 @@ bool AlsaSound::AlsaInit()
 
 	periods = BUFFER_SIZE_MAX / FRAME_COUNT_MIN;
 	err = snd_pcm_hw_params_set_periods_max(handle, hwparams, &periods, &dir);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Cannot set Minimum periods: %s\n", snd_strerror(err));
 		return false;
@@ -131,34 +132,34 @@ bool AlsaSound::AlsaInit()
 
 	buffer_size_max = BUFFER_SIZE_MAX;
 	err = snd_pcm_hw_params_set_buffer_size_max(handle, hwparams, &buffer_size_max);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Cannot set minimum buffer size: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_hw_params(handle, hwparams);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Unable to install hw params: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Cannot get buffer size: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_hw_params_get_periods_max(hwparams, &periods, &dir);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Cannot get periods: %s\n", snd_strerror(err));
 		return false;
 	}
 
-	//periods is the number of fragments alsa can wait for during one 
+	//periods is the number of fragments alsa can wait for during one
 	//buffer_size
 	frames_to_deliver = buffer_size / periods;
 	//limit the minimum size. pulseaudio advertises a minimum of 32 samples.
@@ -172,28 +173,28 @@ bool AlsaSound::AlsaInit()
 	snd_pcm_sw_params_alloca(&swparams);
 
 	err = snd_pcm_sw_params_current(handle, swparams);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "cannot init sw params: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_sw_params_set_start_threshold(handle, swparams, 0U);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "cannot set start thresh: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_sw_params(handle, swparams);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "cannot set sw params: %s\n", snd_strerror(err));
 		return false;
 	}
 
 	err = snd_pcm_prepare(handle);
-	if (err < 0) 
+	if (err < 0)
 	{
 		ERROR_LOG(AUDIO, "Unable to prepare: %s\n", snd_strerror(err));
 		return false;
@@ -204,11 +205,11 @@ bool AlsaSound::AlsaInit()
 
 void AlsaSound::AlsaShutdown()
 {
-	if (handle != NULL)
+	if (handle != nullptr)
 	{
 		snd_pcm_drop(handle);
 		snd_pcm_close(handle);
-		handle = NULL;
+		handle = nullptr;
 	}
 }
 
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h
new file mode 100644
index 0000000000..186e4871bb
--- /dev/null
+++ b/Source/Core/AudioCommon/AlsaSoundStream.h
@@ -0,0 +1,52 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <thread>
+
+#if defined(HAVE_ALSA) && HAVE_ALSA
+#include <alsa/asoundlib.h>
+#endif
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/CommonTypes.h"
+
+class AlsaSound final : public SoundStream
+{
+#if defined(HAVE_ALSA) && HAVE_ALSA
+public:
+	AlsaSound();
+	virtual ~AlsaSound();
+
+	bool Start() override;
+	void SoundLoop() override;
+	void Stop() override;
+	void Update() override;
+
+	static bool isValid()
+	{
+		return true;
+	}
+
+private:
+	enum class ALSAThreadStatus
+	{
+		RUNNING,
+		STOPPING,
+		STOPPED,
+	};
+
+	bool AlsaInit();
+	void AlsaShutdown();
+
+	u8 *mix_buffer;
+	std::thread thread;
+	std::atomic<ALSAThreadStatus> m_thread_status;
+
+	snd_pcm_t *handle;
+	int frames_to_deliver;
+#endif
+};
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
new file mode 100644
index 0000000000..f5438faca9
--- /dev/null
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -0,0 +1,203 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#include "AudioCommon/AlsaSoundStream.h"
+#include "AudioCommon/AOSoundStream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
+#include "AudioCommon/Mixer.h"
+#include "AudioCommon/NullSoundStream.h"
+#include "AudioCommon/OpenALStream.h"
+#include "AudioCommon/OpenSLESStream.h"
+#include "AudioCommon/PulseAudioStream.h"
+#include "AudioCommon/XAudio2_7Stream.h"
+#include "AudioCommon/XAudio2Stream.h"
+
+#include "Common/FileUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Movie.h"
+
+// This shouldn't be a global, at least not here.
+SoundStream* g_sound_stream = nullptr;
+
+static bool s_audio_dump_start = false;
+
+namespace AudioCommon
+{
+	static const int AUDIO_VOLUME_MIN = 0;
+	static const int AUDIO_VOLUME_MAX = 100;
+
+	SoundStream* InitSoundStream()
+	{
+		std::string backend = SConfig::GetInstance().sBackend;
+		if (backend == BACKEND_OPENAL && OpenALStream::isValid())
+			g_sound_stream = new OpenALStream();
+		else if (backend == BACKEND_NULLSOUND && NullSound::isValid())
+			g_sound_stream = new NullSound();
+		else if (backend == BACKEND_XAUDIO2)
+		{
+			if (XAudio2::isValid())
+				g_sound_stream = new XAudio2();
+			else if (XAudio2_7::isValid())
+				g_sound_stream = new XAudio2_7();
+		}
+		else if (backend == BACKEND_AOSOUND && AOSound::isValid())
+			g_sound_stream = new AOSound();
+		else if (backend == BACKEND_ALSA && AlsaSound::isValid())
+			g_sound_stream = new AlsaSound();
+		else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
+			g_sound_stream = new CoreAudioSound();
+		else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
+			g_sound_stream = new PulseAudio();
+		else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
+			g_sound_stream = new OpenSLESStream();
+
+		if (!g_sound_stream && NullSound::isValid())
+		{
+			WARN_LOG(DSPHLE, "Could not initialize backend %s, using %s instead.",
+				backend.c_str(), BACKEND_NULLSOUND);
+			g_sound_stream = new NullSound();
+		}
+
+		if (g_sound_stream)
+		{
+			UpdateSoundStream();
+			if (g_sound_stream->Start())
+			{
+				if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
+					StartAudioDump();
+
+				return g_sound_stream;
+			}
+			PanicAlertT("Could not initialize backend %s.", backend.c_str());
+		}
+
+		PanicAlertT("Sound backend %s is not valid.", backend.c_str());
+
+		delete g_sound_stream;
+		g_sound_stream = nullptr;
+		return nullptr;
+	}
+
+	void ShutdownSoundStream()
+	{
+		INFO_LOG(DSPHLE, "Shutting down sound stream");
+
+		if (g_sound_stream)
+		{
+			g_sound_stream->Stop();
+			if (SConfig::GetInstance().m_DumpAudio && s_audio_dump_start)
+				StopAudioDump();
+			delete g_sound_stream;
+			g_sound_stream = nullptr;
+		}
+
+		INFO_LOG(DSPHLE, "Done shutting down sound stream");
+	}
+
+	std::vector<std::string> GetSoundBackends()
+	{
+		std::vector<std::string> backends;
+
+		if (NullSound::isValid())
+			backends.push_back(BACKEND_NULLSOUND);
+		if (XAudio2_7::isValid() || XAudio2::isValid())
+			backends.push_back(BACKEND_XAUDIO2);
+		if (AOSound::isValid())
+			backends.push_back(BACKEND_AOSOUND);
+		if (AlsaSound::isValid())
+			backends.push_back(BACKEND_ALSA);
+		if (CoreAudioSound::isValid())
+			backends.push_back(BACKEND_COREAUDIO);
+		if (PulseAudio::isValid())
+			backends.push_back(BACKEND_PULSEAUDIO);
+		if (OpenALStream::isValid())
+			backends.push_back(BACKEND_OPENAL);
+		if (OpenSLESStream::isValid())
+			backends.push_back(BACKEND_OPENSLES);
+		return backends;
+	}
+
+	void UpdateSoundStream()
+	{
+		if (g_sound_stream)
+		{
+			int volume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume;
+			g_sound_stream->SetVolume(volume);
+		}
+	}
+
+	void ClearAudioBuffer(bool mute)
+	{
+		if (g_sound_stream)
+			g_sound_stream->Clear(mute);
+	}
+
+	void SendAIBuffer(short *samples, unsigned int num_samples)
+	{
+		if (!g_sound_stream)
+			return;
+
+		if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
+			StartAudioDump();
+		else if (!SConfig::GetInstance().m_DumpAudio && s_audio_dump_start)
+			StopAudioDump();
+
+		CMixer* pMixer = g_sound_stream->GetMixer();
+
+		if (pMixer && samples)
+		{
+			pMixer->PushSamples(samples, num_samples);
+		}
+
+		g_sound_stream->Update();
+	}
+
+	void StartAudioDump()
+	{
+		std::string audio_file_name_dtk = File::GetUserPath(D_DUMPAUDIO_IDX) + "dtkdump.wav";
+		std::string audio_file_name_dsp = File::GetUserPath(D_DUMPAUDIO_IDX) + "dspdump.wav";
+		File::CreateFullPath(audio_file_name_dtk);
+		File::CreateFullPath(audio_file_name_dsp);
+		g_sound_stream->GetMixer()->StartLogDTKAudio(audio_file_name_dtk);
+		g_sound_stream->GetMixer()->StartLogDSPAudio(audio_file_name_dsp);
+		s_audio_dump_start = true;
+	}
+
+	void StopAudioDump()
+	{
+		g_sound_stream->GetMixer()->StopLogDTKAudio();
+		g_sound_stream->GetMixer()->StopLogDSPAudio();
+		s_audio_dump_start = false;
+	}
+
+	void IncreaseVolume(unsigned short offset)
+	{
+		SConfig::GetInstance().m_IsMuted = false;
+		int& currentVolume = SConfig::GetInstance().m_Volume;
+		currentVolume += offset;
+		if (currentVolume > AUDIO_VOLUME_MAX)
+			currentVolume = AUDIO_VOLUME_MAX;
+		UpdateSoundStream();
+	}
+
+	void DecreaseVolume(unsigned short offset)
+	{
+		SConfig::GetInstance().m_IsMuted = false;
+		int& currentVolume = SConfig::GetInstance().m_Volume;
+		currentVolume -= offset;
+		if (currentVolume < AUDIO_VOLUME_MIN)
+			currentVolume = AUDIO_VOLUME_MIN;
+		UpdateSoundStream();
+	}
+
+	void ToggleMuteVolume()
+	{
+		bool& isMuted = SConfig::GetInstance().m_IsMuted;
+		isMuted = !isMuted;
+		UpdateSoundStream();
+	}
+}
diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h
new file mode 100644
index 0000000000..b404e20731
--- /dev/null
+++ b/Source/Core/AudioCommon/AudioCommon.h
@@ -0,0 +1,28 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/CommonTypes.h"
+
+
+class CMixer;
+
+extern SoundStream *g_sound_stream;
+
+namespace AudioCommon
+{
+	SoundStream* InitSoundStream();
+	void ShutdownSoundStream();
+	std::vector<std::string> GetSoundBackends();
+	void UpdateSoundStream();
+	void ClearAudioBuffer(bool mute);
+	void SendAIBuffer(short* samples, unsigned int num_samples);
+	void StartAudioDump();
+	void StopAudioDump();
+	void IncreaseVolume(unsigned short offset);
+	void DecreaseVolume(unsigned short offset);
+	void ToggleMuteVolume();
+}
diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj
index abb5dbf505..13aa887e32 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj
@@ -1,236 +1,78 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?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="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}</ProjectGuid>
-    <RootNamespace>AudioCommon</RootNamespace>
+    <ProjectGuid>{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup 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\CodeGen_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\CodeGen_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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AOSoundStream.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-    <ClCompile Include="Src\DSoundStream.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\NullSoundStream.cpp" />
-    <ClCompile Include="Src\OpenALStream.cpp" />
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\XAudio2Stream.cpp" />
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="NullSoundStream.cpp" />
+    <ClCompile Include="OpenALStream.cpp" />
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="XAudio2Stream.cpp" />
+    <ClCompile Include="XAudio2_7Stream.cpp">
+      <AdditionalIncludeDirectories>$(ExternalsDir)XAudio2_7;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AOSoundStream.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\DPL2Decoder.h" />
-    <ClInclude Include="Src\DSoundStream.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\NullSoundStream.h" />
-    <ClInclude Include="Src\OpenALStream.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\XAudio2Stream.h" />
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AlsaSoundStream.h" />
+    <ClInclude Include="AOSoundStream.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="CoreAudioSoundStream.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="NullSoundStream.h" />
+    <ClInclude Include="OpenALStream.h" />
+    <ClInclude Include="OpenSLESStream.h" />
+    <ClInclude Include="PulseAudioStream.h" />
+    <ClInclude Include="SoundStream.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="XAudio2Stream.h" />
+    <ClInclude Include="XAudio2_7Stream.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\SoundTouch\SoundTouch.vcxproj">
-      <Project>{68a5dd20-7057-448b-8fe0-b6ac8d205509}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(ExternalsDir)soundtouch\SoundTouch.vcxproj">
+      <Project>{ec082900-b4d8-42e9-9663-77f02f6936ae}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
index 30ff35a073..4447f9687a 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
@@ -1,56 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\AOSoundStream.cpp">
-      <Filter>SoundStreams</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSoundStream.cpp">
-      <Filter>SoundStreams</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\OpenALStream.cpp">
-      <Filter>SoundStreams</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\XAudio2Stream.cpp">
-      <Filter>SoundStreams</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NullSoundStream.cpp">
-      <Filter>SoundStreams</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\AOSoundStream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSoundStream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\NullSoundStream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\OpenALStream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\XAudio2Stream.h">
-      <Filter>SoundStreams</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DPL2Decoder.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="SoundStreams">
-      <UniqueIdentifier>{efb9f5b5-ab0c-455d-b78b-26df725386af}</UniqueIdentifier>
+      <UniqueIdentifier>{25ec8f16-fc60-4a63-bc3e-ad0272fd5942}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="NullSoundStream.cpp">
+      <Filter>SoundStreams</Filter>
+    </ClCompile>
+    <ClCompile Include="OpenALStream.cpp">
+      <Filter>SoundStreams</Filter>
+    </ClCompile>
+    <ClCompile Include="XAudio2Stream.cpp">
+      <Filter>SoundStreams</Filter>
+    </ClCompile>
+    <ClCompile Include="XAudio2_7Stream.cpp">
+      <Filter>SoundStreams</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="AOSoundStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="NullSoundStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="OpenALStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="XAudio2Stream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="XAudio2_7Stream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="PulseAudioStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="OpenSLESStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="CoreAudioSoundStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="AlsaSoundStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="SoundStream.h">
+      <Filter>SoundStreams</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt
index 939956460d..c36300b198 100644
--- a/Source/Core/AudioCommon/CMakeLists.txt
+++ b/Source/Core/AudioCommon/CMakeLists.txt
@@ -1,44 +1,40 @@
-set(SRCS	Src/AudioCommon.cpp
-			Src/DPL2Decoder.cpp
-			Src/Mixer.cpp
-			Src/WaveFile.cpp
-			Src/NullSoundStream.cpp)
+set(SRCS	AudioCommon.cpp
+			DPL2Decoder.cpp
+			Mixer.cpp
+			WaveFile.cpp
+			NullSoundStream.cpp)
 
 set(LIBS "")
 
 if(ANDROID)
-	set(SRCS ${SRCS} Src/OpenSLESStream.cpp)
+	set(SRCS ${SRCS} OpenSLESStream.cpp)
 	set(LIBS ${LIBS} OpenSLES)
 endif(ANDROID)
 
 if(ALSA_FOUND)
-	set(SRCS ${SRCS} Src/AlsaSoundStream.cpp)
+	set(SRCS ${SRCS} AlsaSoundStream.cpp)
 	set(LIBS ${LIBS} ${ALSA_LIBRARIES})
 endif(ALSA_FOUND)
 
 if(AO_FOUND)
-	set(SRCS ${SRCS} Src/AOSoundStream.cpp)
+	set(SRCS ${SRCS} AOSoundStream.cpp)
 	set(LIBS ${LIBS} ${AO_LIBRARIES})
 endif(AO_FOUND)
 
 if(OPENAL_FOUND)
-	set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp)
+	set(SRCS ${SRCS} OpenALStream.cpp aldlist.cpp)
 	set(LIBS ${LIBS} ${OPENAL_LIBRARY} SoundTouch )
 endif(OPENAL_FOUND)
 
 if(PULSEAUDIO_FOUND)
-	set(SRCS ${SRCS} Src/PulseAudioStream.cpp)
+	set(SRCS ${SRCS} PulseAudioStream.cpp)
 	set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES})
 endif(PULSEAUDIO_FOUND)
 
 if(WIN32)
-	set(SRCS ${SRCS} Src/DSoundStream.cpp)
-	set(SRCS ${SRCS} Src/XAudio2Stream.cpp)
-endif(WIN32)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(SRCS ${SRCS} Src/CoreAudioSoundStream.cpp)
+	set(SRCS ${SRCS} XAudio2Stream.cpp)
+elseif(APPLE)
+	set(SRCS ${SRCS} CoreAudioSoundStream.cpp)
 endif()
 
-add_library(audiocommon STATIC ${SRCS})
-target_link_libraries(audiocommon ${LIBS})
+add_dolphin_library(audiocommon "${SRCS}" "${LIBS}")
diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp
similarity index 82%
rename from Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
rename to Source/Core/AudioCommon/CoreAudioSoundStream.cpp
index 967eaa4b0a..3c1d6039af 100644
--- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
+++ b/Source/Core/AudioCommon/CoreAudioSoundStream.cpp
@@ -1,10 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #include <CoreServices/CoreServices.h>
 
-#include "CoreAudioSoundStream.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
 
 OSStatus CoreAudioSound::callback(void *inRefCon,
 	AudioUnitRenderActionFlags *ioActionFlags,
@@ -19,35 +19,29 @@ OSStatus CoreAudioSound::callback(void *inRefCon,
 	return noErr;
 }
 
-CoreAudioSound::CoreAudioSound(CMixer *mixer) : SoundStream(mixer)
-{
-}
-
-CoreAudioSound::~CoreAudioSound()
-{
-}
-
 bool CoreAudioSound::Start()
 {
 	OSStatus err;
 	AURenderCallbackStruct callback_struct;
 	AudioStreamBasicDescription format;
-	ComponentDescription desc;
-	Component component;
+	AudioComponentDescription desc;
+	AudioComponent component;
 
 	desc.componentType = kAudioUnitType_Output;
 	desc.componentSubType = kAudioUnitSubType_DefaultOutput;
 	desc.componentFlags = 0;
 	desc.componentFlagsMask = 0;
 	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-	component = FindNextComponent(NULL, &desc);
-	if (component == NULL) {
+	component = AudioComponentFindNext(nullptr, &desc);
+	if (component == nullptr)
+	{
 		ERROR_LOG(AUDIO, "error finding audio component");
 		return false;
 	}
 
-	err = OpenAComponent(component, &audioUnit);
-	if (err != noErr) {
+	err = AudioComponentInstanceNew(component, &audioUnit);
+	if (err != noErr)
+	{
 		ERROR_LOG(AUDIO, "error opening audio component");
 		return false;
 	}
@@ -58,7 +52,8 @@ bool CoreAudioSound::Start()
 				kAudioUnitProperty_StreamFormat,
 				kAudioUnitScope_Input, 0, &format,
 				sizeof(AudioStreamBasicDescription));
-	if (err != noErr) {
+	if (err != noErr)
+	{
 		ERROR_LOG(AUDIO, "error setting audio format");
 		return false;
 	}
@@ -69,12 +64,13 @@ bool CoreAudioSound::Start()
 				kAudioUnitProperty_SetRenderCallback,
 				kAudioUnitScope_Input, 0, &callback_struct,
 				sizeof callback_struct);
-	if (err != noErr) {
+	if (err != noErr)
+	{
 		ERROR_LOG(AUDIO, "error setting audio callback");
 		return false;
 	}
 
-    err = AudioUnitSetParameter(audioUnit,
+	err = AudioUnitSetParameter(audioUnit,
 					kHALOutputParam_Volume,
 					kAudioUnitParameterFlag_Output, 0,
 					m_volume / 100., 0);
@@ -82,13 +78,15 @@ bool CoreAudioSound::Start()
 		ERROR_LOG(AUDIO, "error setting volume");
 
 	err = AudioUnitInitialize(audioUnit);
-	if (err != noErr) {
+	if (err != noErr)
+	{
 		ERROR_LOG(AUDIO, "error initializing audiounit");
 		return false;
 	}
 
 	err = AudioOutputUnitStart(audioUnit);
-	if (err != noErr) {
+	if (err != noErr)
+	{
 		ERROR_LOG(AUDIO, "error starting audiounit");
 		return false;
 	}
@@ -99,7 +97,7 @@ bool CoreAudioSound::Start()
 void CoreAudioSound::SetVolume(int volume)
 {
 	OSStatus err;
-    m_volume = volume;
+	m_volume = volume;
 
 	err = AudioUnitSetParameter(audioUnit,
 					kHALOutputParam_Volume,
@@ -125,7 +123,7 @@ void CoreAudioSound::Stop()
 	if (err != noErr)
 		ERROR_LOG(AUDIO, "error uninitializing audiounit");
 
-	err = CloseComponent(audioUnit);
+	err = AudioComponentInstanceDispose(audioUnit);
 	if (err != noErr)
 		ERROR_LOG(AUDIO, "error closing audio component");
 }
diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h
new file mode 100644
index 0000000000..083fbb6e37
--- /dev/null
+++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h
@@ -0,0 +1,38 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef __APPLE__
+#include <AudioUnit/AudioUnit.h>
+#endif
+
+#include "AudioCommon/SoundStream.h"
+
+class CoreAudioSound final : public SoundStream
+{
+#ifdef __APPLE__
+public:
+	bool Start() override;
+	void SetVolume(int volume) override;
+	void SoundLoop() override;
+	void Stop() override;
+	void Update() override;
+
+	static bool isValid()
+	{
+		return true;
+	}
+
+private:
+	AudioUnit audioUnit;
+	int m_volume;
+
+	static OSStatus callback(void *inRefCon,
+		AudioUnitRenderActionFlags *ioActionFlags,
+		const AudioTimeStamp *inTimeStamp,
+		UInt32 inBusNumber, UInt32 inNumberFrames,
+		AudioBufferList *ioData);
+#endif
+};
diff --git a/Source/Core/AudioCommon/DPL2Decoder.cpp b/Source/Core/AudioCommon/DPL2Decoder.cpp
new file mode 100644
index 0000000000..b1b63250e4
--- /dev/null
+++ b/Source/Core/AudioCommon/DPL2Decoder.cpp
@@ -0,0 +1,394 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Dolby Pro Logic 2 decoder from ffdshow-tryout
+//  * Copyright 2001 Anders Johansson ajh@atri.curtin.edu.au
+//  * Copyright (c) 2004-2006 Milan Cutka
+//  * based on mplayer HRTF plugin by ylai
+
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <functional>
+#include <string.h>
+#include <vector>
+
+#include "AudioCommon/DPL2Decoder.h"
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+#ifndef M_SQRT1_2
+#define M_SQRT1_2 0.70710678118654752440
+#endif
+
+static int olddelay = -1;
+static unsigned int oldfreq = 0;
+static unsigned int dlbuflen;
+static int cyc_pos;
+static float l_fwr, r_fwr, lpr_fwr, lmr_fwr;
+static std::vector<float> fwrbuf_l, fwrbuf_r;
+static float adapt_l_gain, adapt_r_gain, adapt_lpr_gain, adapt_lmr_gain;
+static std::vector<float> lf, rf, lr, rr, cf, cr;
+static float LFE_buf[256];
+static unsigned int lfe_pos;
+static float *filter_coefs_lfe;
+static unsigned int len125;
+
+template<class T, class _ftype_t>
+static _ftype_t DotProduct(int count, const T *buf, const _ftype_t *coefficients)
+{
+	int i;
+	float sum0 = 0.0f, sum1 = 0.0f, sum2 = 0.0f, sum3 = 0.0f;
+
+	// Unrolled loop
+	for (i = 0; (i + 3) < count; i += 4)
+	{
+		sum0 += buf[i + 0] * coefficients[i + 0];
+		sum1 += buf[i + 1] * coefficients[i + 1];
+		sum2 += buf[i + 2] * coefficients[i + 2];
+		sum3 += buf[i + 3] * coefficients[i + 3];
+	}
+
+	// Epilogue of unrolled loop
+	for (; i < count; i++)
+		sum0 += buf[i] * coefficients[i];
+
+	return sum0 + sum1 + sum2 + sum3;
+}
+
+template<class T>
+static T FIRFilter(const T *buf, int pos, int len, int count, const float *coefficients)
+{
+	int count1, count2;
+
+	if (pos >= count)
+	{
+		pos -= count;
+		count1 = count; count2 = 0;
+	}
+	else
+	{
+		count2 = pos;
+		count1 = count - pos;
+		pos = len - count1;
+	}
+
+	// high part of window
+	const T *ptr = &buf[pos];
+
+	float r1 = DotProduct(count1, ptr, coefficients); coefficients += count1;
+	float r2 = DotProduct(count2, buf, coefficients);
+	return T(r1 + r2);
+}
+
+/*
+// Hamming
+//                        2*pi*k
+// w(k) = 0.54 - 0.46*cos(------), where 0 <= k < N
+//                         N-1
+//
+// n window length
+// w buffer for the window parameters
+*/
+static void Hamming(int n, float* w)
+{
+	float k = float(2*M_PI/((float)(n - 1))); // 2*pi/(N-1)
+
+	// Calculate window coefficients
+	for (int i = 0; i < n; i++)
+		*w++ = float(0.54 - 0.46*cos(k*(float)i));
+}
+
+/******************************************************************************
+*  FIR filter design
+******************************************************************************/
+
+/* Design FIR filter using the Window method
+
+n     filter length must be odd for HP and BS filters
+w     buffer for the filter taps (must be n long)
+fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS)
+0 < fc < 1 where 1 <=> Fs/2
+flags window and filter type as defined in filter.h
+variables are ored together: i.e. LP|HAMMING will give a
+low pass filter designed using a hamming window
+opt   beta constant used only when designing using kaiser windows
+
+returns 0 if OK, -1 if fail
+*/
+static float* DesignFIR(unsigned int *n, float* fc, float opt)
+{
+	unsigned int  o = *n & 1;                // Indicator for odd filter length
+	unsigned int  end = ((*n + 1) >> 1) - o; // Loop end
+
+	float k1 = 2 * float(M_PI);              // 2*pi*fc1
+	float k2 = 0.5f * (float)(1 - o);        // Constant used if the filter has even length
+	float g = 0.0f;                          // Gain
+	float t1;                                // Temporary variables
+	float fc1;                               // Cutoff frequencies
+
+	// Sanity check
+	if (*n == 0)
+		return nullptr;
+	MathUtil::Clamp(&fc[0], float(0.001), float(1));
+
+	float *w = (float*)calloc(sizeof(float), *n);
+
+	// Get window coefficients
+	Hamming(*n, w);
+
+	fc1 = *fc;
+	// Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2
+	fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1 / 2 : 0.25f;
+	k1 *= fc1;
+
+	// Low pass filter
+
+	// If the filter length is odd, there is one point which is exactly
+	// in the middle. The value at this point is 2*fCutoff*sin(x)/x,
+	// where x is zero. To make sure nothing strange happens, we set this
+	// value separately.
+	if (o)
+	{
+		w[end] = fc1 * w[end] * 2.0f;
+		g = w[end];
+	}
+
+	// Create filter
+	for (u32 i = 0; i < end; i++)
+	{
+		t1 = (float)(i + 1) - k2;
+		w[end - i - 1] = w[*n - end + i] = float(w[end - i - 1] * sin(k1 * t1)/(M_PI * t1)); // Sinc
+		g += 2*w[end - i - 1]; // Total gain in filter
+	}
+
+
+	// Normalize gain
+	g = 1/g;
+	for (u32 i = 0; i < *n; i++)
+		w[i] *= g;
+
+	return w;
+}
+
+static void OnSeek()
+{
+	l_fwr = r_fwr = lpr_fwr = lmr_fwr = 0;
+	std::fill(fwrbuf_l.begin(), fwrbuf_l.end(), 0.0f);
+	std::fill(fwrbuf_r.begin(), fwrbuf_r.end(), 0.0f);
+	adapt_l_gain = adapt_r_gain = adapt_lpr_gain = adapt_lmr_gain = 0;
+	std::fill(lf.begin(), lf.end(), 0.0f);
+	std::fill(rf.begin(), rf.end(), 0.0f);
+	std::fill(lr.begin(), lr.end(), 0.0f);
+	std::fill(rr.begin(), rr.end(), 0.0f);
+	std::fill(cf.begin(), cf.end(), 0.0f);
+	std::fill(cr.begin(), cr.end(), 0.0f);
+	lfe_pos = 0;
+	memset(LFE_buf, 0, sizeof(LFE_buf));
+}
+
+static void Done()
+{
+	OnSeek();
+
+	if (filter_coefs_lfe)
+	{
+		free(filter_coefs_lfe);
+	}
+
+	filter_coefs_lfe = nullptr;
+}
+
+static float* CalculateCoefficients125HzLowpass(int rate)
+{
+	len125 = 256;
+	float f = 125.0f / (rate / 2);
+	float *coeffs = DesignFIR(&len125, &f, 0);
+	static const float M3_01DB = 0.7071067812f;
+	for (unsigned int i = 0; i < len125; i++)
+	{
+		coeffs[i] *= M3_01DB;
+	}
+	return coeffs;
+}
+
+static float PassiveLock(float x)
+{
+	static const float MATAGCLOCK = 0.2f;  /* AGC range (around 1) where the matrix behaves passively */
+	const float x1 = x - 1;
+	const float ax1s = fabs(x - 1) * (1.0f / MATAGCLOCK);
+	return x1 - x1 / (1 + ax1s * ax1s) + 1;
+}
+
+static void MatrixDecode(const float *in, const int k, const int il,
+	const int ir, bool decode_rear,
+	const int _dlbuflen,
+	float _l_fwr, float _r_fwr,
+	float _lpr_fwr, float _lmr_fwr,
+	float *_adapt_l_gain, float *_adapt_r_gain,
+	float *_adapt_lpr_gain, float *_adapt_lmr_gain,
+	float *_lf, float *_rf, float *_lr,
+	float *_rr, float *_cf)
+{
+	static const float M9_03DB = 0.3535533906f;
+	static const float MATAGCTRIG = 8.0f;   /* (Fuzzy) AGC trigger */
+	static const float MATAGCDECAY = 1.0f;  /* AGC baseline decay rate (1/samp.) */
+	static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain,  0.50 - 0.55 is full cancellation. */
+
+	const int kr = (k + olddelay) % _dlbuflen;
+	float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr);
+	float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr);
+	// The 2nd axis has strong gain fluctuations, and therefore require
+	// limits.  The factor corresponds to the 1 / amplification of (Lt
+	// - Rt) when (Lt, Rt) is strongly correlated. (e.g. during
+	// dialogues).  It should be bigger than -12 dB to prevent
+	// distortion.
+	float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr;
+	float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr);
+	float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr);
+	float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr);
+	float lpr, lmr;
+	float l_agc, r_agc, lpr_agc, lmr_agc;
+	float f, d_gain, c_gain, c_agc_cfk;
+
+	/*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/
+	/* AGC adaption */
+	d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f;
+	f = d_gain * (1.0f / MATAGCTRIG);
+	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
+	*_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain;
+	*_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain;
+	/* Matrix */
+	l_agc = in[il] * PassiveLock(*_adapt_l_gain);
+	r_agc = in[ir] * PassiveLock(*_adapt_r_gain);
+	_cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2;
+	if (decode_rear)
+	{
+		_lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2;
+		// Stereo rear channel is steered with the same AGC steering as
+		// the decoding matrix. Note this requires a fast updating AGC
+		// at the order of 20 ms (which is the case here).
+		_lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr);
+		_rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr);
+	}
+
+	/*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/
+	lpr = (in[il] + in[ir]) * (float)M_SQRT1_2;
+	lmr = (in[il] - in[ir]) * (float)M_SQRT1_2;
+	/* AGC adaption */
+	d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain);
+	f = d_gain * (1.0f / MATAGCTRIG);
+	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
+	*_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain;
+	*_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain;
+	/* Matrix */
+	lpr_agc = lpr * PassiveLock(*_adapt_lpr_gain);
+	lmr_agc = lmr * PassiveLock(*_adapt_lmr_gain);
+	_lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2;
+	_rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2;
+
+	/*** CENTER FRONT CANCELLATION ***/
+	// A heuristic approach exploits that Lt + Rt gain contains the
+	// information about Lt, Rt correlation.  This effectively reshapes
+	// the front and rear "cones" to concentrate Lt + Rt to C and
+	// introduce Lt - Rt in L, R.
+	/* 0.67677 is the empirical lower bound for lpr_gain. */
+	c_gain = 8 * (*_adapt_lpr_gain - 0.67677f);
+	c_gain = c_gain > 0 ? c_gain : 0;
+	// c_gain should not be too high, not even reaching full
+	// cancellation (~ 0.50 - 0.55 at current AGC implementation), or
+	// the center will sound too narrow. */
+	c_gain = MATCOMPGAIN / (1 + c_gain * c_gain);
+	c_agc_cfk = c_gain * _cf[k];
+	_lf[k] -= c_agc_cfk;
+	_rf[k] -= c_agc_cfk;
+	_cf[k] += c_agc_cfk + c_agc_cfk;
+}
+
+void DPL2Decode(float *samples, int numsamples, float *out)
+{
+	static const unsigned int FWRDURATION = 240; // FWR average duration (samples)
+	static const int cfg_delay = 0;
+	static const unsigned int fmt_freq = 48000;
+	static const unsigned int fmt_nchannels = 2; // input channels
+
+	int cur = 0;
+
+	if (olddelay != cfg_delay || oldfreq != fmt_freq)
+	{
+		Done();
+		olddelay = cfg_delay;
+		oldfreq = fmt_freq;
+		dlbuflen = std::max(FWRDURATION, (fmt_freq * cfg_delay / 1000)); //+(len7000-1);
+		cyc_pos = dlbuflen - 1;
+		fwrbuf_l.resize(dlbuflen);
+		fwrbuf_r.resize(dlbuflen);
+		lf.resize(dlbuflen);
+		rf.resize(dlbuflen);
+		lr.resize(dlbuflen);
+		rr.resize(dlbuflen);
+		cf.resize(dlbuflen);
+		cr.resize(dlbuflen);
+		filter_coefs_lfe = CalculateCoefficients125HzLowpass(fmt_freq);
+		lfe_pos = 0;
+		memset(LFE_buf, 0, sizeof(LFE_buf));
+	}
+
+	float *in = samples; // Input audio data
+	float *end = in + numsamples * fmt_nchannels; // Loop end
+
+	while (in < end)
+	{
+		const int k = cyc_pos;
+
+		const int fwr_pos = (k + FWRDURATION) % dlbuflen;
+		/* Update the full wave rectified total amplitude */
+		/* Input matrix decoder */
+		l_fwr += fabs(in[0]) - fabs(fwrbuf_l[fwr_pos]);
+		r_fwr += fabs(in[1]) - fabs(fwrbuf_r[fwr_pos]);
+		lpr_fwr += fabs(in[0] + in[1]) - fabs(fwrbuf_l[fwr_pos] + fwrbuf_r[fwr_pos]);
+		lmr_fwr += fabs(in[0] - in[1]) - fabs(fwrbuf_l[fwr_pos] - fwrbuf_r[fwr_pos]);
+
+		/* Matrix encoded 2 channel sources */
+		fwrbuf_l[k] = in[0];
+		fwrbuf_r[k] = in[1];
+		MatrixDecode(in, k, 0, 1, true, dlbuflen,
+			l_fwr, r_fwr,
+			lpr_fwr, lmr_fwr,
+			&adapt_l_gain, &adapt_r_gain,
+			&adapt_lpr_gain, &adapt_lmr_gain,
+			&lf[0], &rf[0], &lr[0], &rr[0], &cf[0]);
+
+		out[cur + 0] = lf[k];
+		out[cur + 1] = rf[k];
+		out[cur + 2] = cf[k];
+		LFE_buf[lfe_pos] = (lf[k] + rf[k] + 2.0f * cf[k] + lr[k] + rr[k]) / 2.0f;
+		out[cur + 3] = FIRFilter(LFE_buf, lfe_pos, len125, len125, filter_coefs_lfe);
+		lfe_pos++;
+		if (lfe_pos == len125)
+		{
+			lfe_pos = 0;
+		}
+		out[cur + 4] = lr[k];
+		out[cur + 5] = rr[k];
+		// Next sample...
+		in += 2;
+		cur += 6;
+		cyc_pos--;
+		if (cyc_pos < 0)
+		{
+			cyc_pos += dlbuflen;
+		}
+	}
+}
+
+void DPL2Reset()
+{
+	olddelay = -1;
+	oldfreq = 0;
+	filter_coefs_lfe = nullptr;
+}
diff --git a/Source/Core/AudioCommon/DPL2Decoder.h b/Source/Core/AudioCommon/DPL2Decoder.h
new file mode 100644
index 0000000000..5bcc5ea244
--- /dev/null
+++ b/Source/Core/AudioCommon/DPL2Decoder.h
@@ -0,0 +1,8 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+void DPL2Decode(float *samples, int numsamples, float *out);
+void DPL2Reset();
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
new file mode 100644
index 0000000000..26dda83c82
--- /dev/null
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -0,0 +1,215 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/Mixer.h"
+#include "Common/CPUDetect.h"
+#include "Common/MathUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/VideoInterface.h"
+
+// UGLINESS
+#include "Core/PowerPC/PowerPC.h"
+
+#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
+#include <tmmintrin.h>
+#endif
+
+// Executed from sound stream thread
+unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit)
+{
+	unsigned int currentSample = 0;
+
+	// Cache access in non-volatile variable
+	// This is the only function changing the read value, so it's safe to
+	// cache it locally although it's written here.
+	// The writing pointer will be modified outside, but it will only increase,
+	// so we will just ignore new written data while interpolating.
+	// Without this cache, the compiler wouldn't be allowed to optimize the
+	// interpolation loop.
+	u32 indexR = m_indexR.load();
+	u32 indexW = m_indexW.load();
+
+	float numLeft = (float)(((indexW - indexR) & INDEX_MASK) / 2);
+	m_numLeftI = (numLeft + m_numLeftI*(CONTROL_AVG-1)) / CONTROL_AVG;
+	float offset = (m_numLeftI - LOW_WATERMARK) * CONTROL_FACTOR;
+	if (offset > MAX_FREQ_SHIFT) offset = MAX_FREQ_SHIFT;
+	if (offset < -MAX_FREQ_SHIFT) offset = -MAX_FREQ_SHIFT;
+
+	//render numleft sample pairs to samples[]
+	//advance indexR with sample position
+	//remember fractional offset
+
+	u32 framelimit = SConfig::GetInstance().m_Framelimit;
+	float aid_sample_rate = m_input_sample_rate + offset;
+	if (consider_framelimit && framelimit > 1)
+	{
+		aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;
+	}
+
+	const u32 ratio = (u32)(65536.0f * aid_sample_rate / (float)m_mixer->m_sampleRate);
+
+	s32 lvolume = m_LVolume.load();
+	s32 rvolume = m_RVolume.load();
+
+	// TODO: consider a higher-quality resampling algorithm.
+	for (; currentSample < numSamples * 2 && ((indexW-indexR) & INDEX_MASK) > 2; currentSample += 2)
+	{
+		u32 indexR2 = indexR + 2; //next sample
+
+		s16 l1 = Common::swap16(m_buffer[indexR & INDEX_MASK]); //current
+		s16 l2 = Common::swap16(m_buffer[indexR2 & INDEX_MASK]); //next
+		int sampleL = ((l1 << 16) + (l2 - l1) * (u16)m_frac) >> 16;
+		sampleL = (sampleL * lvolume) >> 8;
+		sampleL += samples[currentSample + 1];
+		MathUtil::Clamp(&sampleL, -32767, 32767);
+		samples[currentSample + 1] = sampleL;
+
+		s16 r1 = Common::swap16(m_buffer[(indexR + 1) & INDEX_MASK]); //current
+		s16 r2 = Common::swap16(m_buffer[(indexR2 + 1) & INDEX_MASK]); //next
+		int sampleR = ((r1 << 16) + (r2 - r1) * (u16)m_frac) >> 16;
+		sampleR = (sampleR * rvolume) >> 8;
+		sampleR += samples[currentSample];
+		MathUtil::Clamp(&sampleR, -32767, 32767);
+		samples[currentSample] = sampleR;
+
+		m_frac += ratio;
+		indexR += 2 * (u16)(m_frac >> 16);
+		m_frac &= 0xffff;
+	}
+
+	// Padding
+	short s[2];
+	s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
+	s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
+	s[0] = (s[0] * rvolume) >> 8;
+	s[1] = (s[1] * lvolume) >> 8;
+	for (; currentSample < numSamples * 2; currentSample += 2)
+	{
+		int sampleR = s[0] + samples[currentSample];
+		MathUtil::Clamp(&sampleR, -32767, 32767);
+		samples[currentSample] = sampleR;
+		int sampleL = s[1] + samples[currentSample + 1];
+		MathUtil::Clamp(&sampleL, -32767, 32767);
+		samples[currentSample + 1] = sampleL;
+	}
+
+	// Flush cached variable
+	m_indexR.store(indexR);
+
+	return numSamples;
+}
+
+unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider_framelimit)
+{
+	if (!samples)
+		return 0;
+
+	memset(samples, 0, num_samples * 2 * sizeof(short));
+
+	if (PowerPC::GetState() != PowerPC::CPU_RUNNING)
+	{
+		// Silence
+		return num_samples;
+	}
+
+	m_dma_mixer.Mix(samples, num_samples, consider_framelimit);
+	m_streaming_mixer.Mix(samples, num_samples, consider_framelimit);
+	m_wiimote_speaker_mixer.Mix(samples, num_samples, consider_framelimit);
+	return num_samples;
+}
+
+void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_samples)
+{
+	// Cache access in non-volatile variable
+	// indexR isn't allowed to cache in the audio throttling loop as it
+	// needs to get updates to not deadlock.
+	u32 indexW = m_indexW.load();
+
+	// Check if we have enough free space
+	// indexW == m_indexR results in empty buffer, so indexR must always be smaller than indexW
+	if (num_samples * 2 + ((indexW - m_indexR.load()) & INDEX_MASK) >= MAX_SAMPLES * 2)
+		return;
+
+	// AyuanX: Actual re-sampling work has been moved to sound thread
+	// to alleviate the workload on main thread
+	// and we simply store raw data here to make fast mem copy
+	int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (indexW & INDEX_MASK)) * sizeof(short);
+	if (over_bytes > 0)
+	{
+		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
+		memcpy(&m_buffer[0], samples + (num_samples * 4 - over_bytes) / sizeof(short), over_bytes);
+	}
+	else
+	{
+		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4);
+	}
+
+	m_indexW.fetch_add(num_samples * 2);
+}
+
+void CMixer::PushSamples(const short *samples, unsigned int num_samples)
+{
+	m_dma_mixer.PushSamples(samples, num_samples);
+	if (m_log_dsp_audio)
+		g_wave_writer_dsp.AddStereoSamplesBE(samples, num_samples);
+}
+
+void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples)
+{
+	m_streaming_mixer.PushSamples(samples, num_samples);
+	if (m_log_dtk_audio)
+		g_wave_writer_dtk.AddStereoSamplesBE(samples, num_samples);
+}
+
+void CMixer::PushWiimoteSpeakerSamples(const short *samples, unsigned int num_samples, unsigned int sample_rate)
+{
+	short samples_stereo[MAX_SAMPLES * 2];
+
+	if (num_samples < MAX_SAMPLES)
+	{
+		m_wiimote_speaker_mixer.SetInputSampleRate(sample_rate);
+
+		for (unsigned int i = 0; i < num_samples; ++i)
+		{
+			samples_stereo[i * 2] = Common::swap16(samples[i]);
+			samples_stereo[i * 2 + 1] = Common::swap16(samples[i]);
+		}
+
+		m_wiimote_speaker_mixer.PushSamples(samples_stereo, num_samples);
+	}
+}
+
+void CMixer::SetDMAInputSampleRate(unsigned int rate)
+{
+	m_dma_mixer.SetInputSampleRate(rate);
+}
+
+void CMixer::SetStreamInputSampleRate(unsigned int rate)
+{
+	m_streaming_mixer.SetInputSampleRate(rate);
+}
+
+void CMixer::SetStreamingVolume(unsigned int lvolume, unsigned int rvolume)
+{
+	m_streaming_mixer.SetVolume(lvolume, rvolume);
+}
+
+void CMixer::SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume)
+{
+	m_wiimote_speaker_mixer.SetVolume(lvolume, rvolume);
+}
+
+void CMixer::MixerFifo::SetInputSampleRate(unsigned int rate)
+{
+	m_input_sample_rate = rate;
+}
+
+void CMixer::MixerFifo::SetVolume(unsigned int lvolume, unsigned int rvolume)
+{
+	m_LVolume.store(lvolume + (lvolume >> 7));
+	m_RVolume.store(rvolume + (rvolume >> 7));
+}
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
new file mode 100644
index 0000000000..30a1d03efa
--- /dev/null
+++ b/Source/Core/AudioCommon/Mixer.h
@@ -0,0 +1,157 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <string>
+
+#include "AudioCommon/WaveFile.h"
+
+// 16 bit Stereo
+#define MAX_SAMPLES     (1024 * 2) // 64ms
+#define INDEX_MASK      (MAX_SAMPLES * 2 - 1)
+
+#define LOW_WATERMARK   1280 // 40 ms
+#define MAX_FREQ_SHIFT  200  // per 32000 Hz
+#define CONTROL_FACTOR  0.2f // in freq_shift per fifo size offset
+#define CONTROL_AVG     32
+
+class CMixer {
+
+public:
+	CMixer(unsigned int BackendSampleRate)
+		: m_dma_mixer(this, 32000)
+		, m_streaming_mixer(this, 48000)
+		, m_wiimote_speaker_mixer(this, 3000)
+		, m_sampleRate(BackendSampleRate)
+		, m_log_dtk_audio(0)
+		, m_log_dsp_audio(0)
+		, m_speed(0)
+	{
+		INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized");
+	}
+
+	virtual ~CMixer() {}
+
+	// Called from audio threads
+	virtual unsigned int Mix(short* samples, unsigned int numSamples, bool consider_framelimit = true);
+
+	// Called from main thread
+	virtual void PushSamples(const short* samples, unsigned int num_samples);
+	virtual void PushStreamingSamples(const short* samples, unsigned int num_samples);
+	virtual void PushWiimoteSpeakerSamples(const short* samples, unsigned int num_samples, unsigned int sample_rate);
+	unsigned int GetSampleRate() const { return m_sampleRate; }
+
+	void SetDMAInputSampleRate(unsigned int rate);
+	void SetStreamInputSampleRate(unsigned int rate);
+	void SetStreamingVolume(unsigned int lvolume, unsigned int rvolume);
+	void SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume);
+
+	virtual void StartLogDTKAudio(const std::string& filename)
+	{
+		if (!m_log_dtk_audio)
+		{
+			m_log_dtk_audio = true;
+			g_wave_writer_dtk.Start(filename, 48000);
+			g_wave_writer_dtk.SetSkipSilence(false);
+			NOTICE_LOG(DSPHLE, "Starting DTK Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "DTK Audio logging has already been started");
+		}
+	}
+
+	virtual void StopLogDTKAudio()
+	{
+		if (m_log_dtk_audio)
+		{
+			m_log_dtk_audio = false;
+			g_wave_writer_dtk.Stop();
+			NOTICE_LOG(DSPHLE, "Stopping DTK Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "DTK Audio logging has already been stopped");
+		}
+	}
+
+	virtual void StartLogDSPAudio(const std::string& filename)
+	{
+		if (!m_log_dsp_audio)
+		{
+			m_log_dsp_audio = true;
+			g_wave_writer_dsp.Start(filename, 32000);
+			g_wave_writer_dsp.SetSkipSilence(false);
+			NOTICE_LOG(DSPHLE, "Starting DSP Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "DSP Audio logging has already been started");
+		}
+	}
+
+	virtual void StopLogDSPAudio()
+	{
+		if (m_log_dsp_audio)
+		{
+			m_log_dsp_audio = false;
+			g_wave_writer_dsp.Stop();
+			NOTICE_LOG(DSPHLE, "Stopping DSP Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "DSP Audio logging has already been stopped");
+		}
+	}
+
+	float GetCurrentSpeed() const { return m_speed.load(); }
+	void UpdateSpeed(float val) { m_speed.store(val); }
+
+protected:
+	class MixerFifo {
+	public:
+		MixerFifo(CMixer *mixer, unsigned sample_rate)
+			: m_mixer(mixer)
+			, m_input_sample_rate(sample_rate)
+			, m_indexW(0)
+			, m_indexR(0)
+			, m_LVolume(256)
+			, m_RVolume(256)
+			, m_numLeftI(0.0f)
+			, m_frac(0)
+		{
+			memset(m_buffer, 0, sizeof(m_buffer));
+		}
+		void PushSamples(const short* samples, unsigned int num_samples);
+		unsigned int Mix(short* samples, unsigned int numSamples, bool consider_framelimit = true);
+		void SetInputSampleRate(unsigned int rate);
+		void SetVolume(unsigned int lvolume, unsigned int rvolume);
+	private:
+		CMixer *m_mixer;
+		unsigned m_input_sample_rate;
+		short m_buffer[MAX_SAMPLES * 2];
+		std::atomic<u32> m_indexW;
+		std::atomic<u32> m_indexR;
+		// Volume ranges from 0-256
+		std::atomic<s32> m_LVolume;
+		std::atomic<s32> m_RVolume;
+		float m_numLeftI;
+		u32 m_frac;
+	};
+	MixerFifo m_dma_mixer;
+	MixerFifo m_streaming_mixer;
+	MixerFifo m_wiimote_speaker_mixer;
+	unsigned int m_sampleRate;
+
+	WaveFileWriter g_wave_writer_dtk;
+	WaveFileWriter g_wave_writer_dsp;
+
+	bool m_log_dtk_audio;
+	bool m_log_dsp_audio;
+
+	std::atomic<float> m_speed; // Current rate of the emulation (1.0 = 100% speed)
+};
diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp
similarity index 79%
rename from Source/Core/AudioCommon/Src/NullSoundStream.cpp
rename to Source/Core/AudioCommon/NullSoundStream.cpp
index 95a9da4349..dab10aaf9c 100644
--- a/Source/Core/AudioCommon/Src/NullSoundStream.cpp
+++ b/Source/Core/AudioCommon/NullSoundStream.cpp
@@ -1,11 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "AudioCommon.h"
-#include "NullSoundStream.h"
-#include "../../Core/Src/HW/SystemTimers.h"
-#include "../../Core/Src/HW/AudioInterface.h"
+#include "AudioCommon/NullSoundStream.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/SystemTimers.h"
 
 void NullSound::SoundLoop()
 {
diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h
new file mode 100644
index 0000000000..0acdd3274a
--- /dev/null
+++ b/Source/Core/AudioCommon/NullSoundStream.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdlib>
+#include "AudioCommon/SoundStream.h"
+
+#define BUF_SIZE (48000 * 4 / 32)
+
+class NullSound final : public SoundStream
+{
+	// playback position
+	short realtimeBuffer[BUF_SIZE / sizeof(short)];
+
+public:
+	bool Start() override;
+	void SoundLoop() override;
+	void SetVolume(int volume) override;
+	void Stop() override;
+	void Clear(bool mute) override;
+	void Update() override;
+
+	static bool isValid() { return true; }
+};
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
similarity index 81%
rename from Source/Core/AudioCommon/Src/OpenALStream.cpp
rename to Source/Core/AudioCommon/OpenALStream.cpp
index ce59dc6c57..ff9eea6ad5 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -1,36 +1,42 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "aldlist.h"
-#include "OpenALStream.h"
-#include "DPL2Decoder.h"
+#include <thread>
+
+#include "AudioCommon/aldlist.h"
+#include "AudioCommon/DPL2Decoder.h"
+#include "AudioCommon/OpenALStream.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
 
 #if defined HAVE_OPENAL && HAVE_OPENAL
 
-soundtouch::SoundTouch soundTouch;
+#ifdef _WIN32
+#pragma comment(lib, "openal32.lib")
+#endif
+
+static soundtouch::SoundTouch soundTouch;
 
 //
 // AyuanX: Spec says OpenAL1.1 is thread safe already
 //
 bool OpenALStream::Start()
 {
-	ALDeviceList *pDeviceList = NULL;
-	ALCcontext *pContext = NULL;
-	ALCdevice *pDevice = NULL;
+	m_run_thread.store(true);
 	bool bReturn = false;
 
-	pDeviceList = new ALDeviceList();
-	if ((pDeviceList) && (pDeviceList->GetNumDevices()))
+	ALDeviceList pDeviceList;
+	if (pDeviceList.GetNumDevices())
 	{
-		char *defDevName = pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice());
+		char *defDevName = pDeviceList.GetDeviceName(pDeviceList.GetDefaultDevice());
 
 		WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName);
 
-		pDevice = alcOpenDevice(defDevName);
+		ALCdevice *pDevice = alcOpenDevice(defDevName);
 		if (pDevice)
 		{
-			pContext = alcCreateContext(pDevice, NULL);
+			ALCcontext *pContext = alcCreateContext(pDevice, nullptr);
 			if (pContext)
 			{
 				// Used to determine an appropriate period size (2x period = total buffer size)
@@ -39,7 +45,7 @@ bool OpenALStream::Start()
 				//period_size_in_millisec = 1000 / refresh;
 
 				alcMakeContextCurrent(pContext);
-				thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this);
+				thread = std::thread(&OpenALStream::SoundLoop, this);
 				bReturn = true;
 			}
 			else
@@ -52,7 +58,6 @@ bool OpenALStream::Start()
 		{
 			PanicAlertT("OpenAL: can't open device %s", defDevName);
 		}
-		delete pDeviceList;
 	}
 	else
 	{
@@ -60,7 +65,7 @@ bool OpenALStream::Start()
 	}
 
 	// Initialize DPL2 parameters
-	dpl2reset();
+	DPL2Reset();
 
 	soundTouch.clear();
 	return bReturn;
@@ -68,7 +73,7 @@ bool OpenALStream::Start()
 
 void OpenALStream::Stop()
 {
-	threadData = 1;
+	m_run_thread.store(false);
 	// kick the thread if it's waiting
 	soundSyncEvent.Set();
 
@@ -87,7 +92,7 @@ void OpenALStream::Stop()
 	ALCcontext *pContext = alcGetCurrentContext();
 	ALCdevice *pDevice = alcGetContextsDevice(pContext);
 
-	alcMakeContextCurrent(NULL);
+	alcMakeContextCurrent(nullptr);
 	alcDestroyContext(pContext);
 	alcCloseDevice(pDevice);
 }
@@ -109,7 +114,7 @@ void OpenALStream::Clear(bool mute)
 {
 	m_muted = mute;
 
-	if(m_muted)
+	if (m_muted)
 	{
 		soundTouch.clear();
 		alSourceStop(uiSource);
@@ -124,11 +129,11 @@ void OpenALStream::SoundLoop()
 {
 	Common::SetCurrentThreadName("Audio thread - openal");
 
-	bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder;
+	bool surround_capable = SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder;
 #if defined(__APPLE__)
 	bool float32_capable = false;
 	const ALenum AL_FORMAT_STEREO_FLOAT32 = 0;
-	// OSX does not have the alext AL_FORMAT_51CHN32 yet.
+	// OS X does not have the alext AL_FORMAT_51CHN32 yet.
 	surround_capable = false;
 	const ALenum AL_FORMAT_51CHN32 = 0;
 #else
@@ -136,7 +141,7 @@ void OpenALStream::SoundLoop()
 #endif
 
 	u32 ulFrequency = m_mixer->GetSampleRate();
-	numBuffers = Core::g_CoreStartupParameter.iLatency + 2; // OpenAL requires a minimum of two buffers
+	numBuffers = SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency + 2; // OpenAL requires a minimum of two buffers
 
 	memset(uiBuffers, 0, numBuffers * sizeof(ALuint));
 	uiSource = 0;
@@ -168,7 +173,7 @@ void OpenALStream::SoundLoop()
 	ALint iBuffersFilled = 0;
 	ALint iBuffersProcessed = 0;
 	ALint iState = 0;
-	ALuint uiBufferTemp[OAL_MAX_BUFFERS] = {0};
+	ALuint uiBufferTemp[OAL_MAX_BUFFERS] = { 0 };
 
 	soundTouch.setChannels(2);
 	soundTouch.setSampleRate(ulFrequency);
@@ -179,7 +184,7 @@ void OpenALStream::SoundLoop()
 	soundTouch.setSetting(SETTING_SEEKWINDOW_MS, 28);
 	soundTouch.setSetting(SETTING_OVERLAP_MS, 12);
 
-	while (!threadData)
+	while (m_run_thread.load())
 	{
 		// num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD.
 		const u32 stereo_16_bit_size = 4;
@@ -192,12 +197,12 @@ void OpenALStream::SoundLoop()
 		unsigned int minSamples = surround_capable ? 240 : 0; // DPL2 accepts 240 samples minimum (FWRDURATION)
 
 		numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples;
-		numSamples = m_mixer->Mix(realtimeBuffer, numSamples);
+		numSamples = m_mixer->Mix(realtimeBuffer, numSamples, false);
 
 		// Convert the samples from short to float
 		float dest[OAL_MAX_SAMPLES * STEREO_CHANNELS];
 		for (u32 i = 0; i < numSamples * STEREO_CHANNELS; ++i)
-			dest[i] = (float)realtimeBuffer[i] / (1 << 16);
+			dest[i] = (float)realtimeBuffer[i] / (1 << 15);
 
 		soundTouch.putSamples(dest, numSamples);
 
@@ -220,8 +225,6 @@ void OpenALStream::SoundLoop()
 			// many silence samples.  These do not need to be timestretched.
 			if (rate > 0.10)
 			{
-				// Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio
-				soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate)));
 				soundTouch.setTempo(rate);
 				if (rate > 10)
 				{
@@ -248,7 +251,15 @@ void OpenALStream::SoundLoop()
 			if (surround_capable)
 			{
 				float dpl2[OAL_MAX_SAMPLES * OAL_MAX_BUFFERS * SURROUND_CHANNELS];
-				dpl2decode(sampleBuffer, nSamples, dpl2);
+				DPL2Decode(sampleBuffer, nSamples, dpl2);
+				// zero-out the subwoofer channel - DPL2Decode generates a pretty
+				// good 5.0 but not a good 5.1 output.  Sadly there is not a 5.0
+				// AL_FORMAT_50CHN32 to make this super-explicit.
+				// DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR
+				for (u32 i = 0; i < nSamples; ++i)
+				{
+					dpl2[i*SURROUND_CHANNELS + 3 /*sub/lfe*/] = 0.0f;
+				}
 				alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * FRAME_SURROUND_FLOAT, ulFrequency);
 				ALenum err = alGetError();
 				if (err == AL_INVALID_ENUM)
diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
new file mode 100644
index 0000000000..e961900e41
--- /dev/null
+++ b/Source/Core/AudioCommon/OpenALStream.h
@@ -0,0 +1,86 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <thread>
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
+#include "Core/Core.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/SystemTimers.h"
+
+#if defined HAVE_OPENAL && HAVE_OPENAL
+#ifdef _WIN32
+#include <OpenAL/include/al.h>
+#include <OpenAL/include/alc.h>
+#include <OpenAL/include/alext.h>
+#elif defined __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alext.h>
+#endif
+
+#ifdef __APPLE__
+// Avoid conflict with objc.h (on Windows, ST uses the system BOOL type, so this doesn't work)
+#define BOOL SoundTouch_BOOL
+#endif
+
+#include <soundtouch/SoundTouch.h>
+#include <soundtouch/STTypes.h>
+
+#ifdef __APPLE__
+#undef BOOL
+#endif
+
+// 16 bit Stereo
+#define SFX_MAX_SOURCE          1
+#define OAL_MAX_BUFFERS         32
+#define OAL_MAX_SAMPLES         256
+#define STEREO_CHANNELS         2
+#define SURROUND_CHANNELS       6   // number of channels in surround mode
+#define SIZE_SHORT              2
+#define SIZE_FLOAT              4   // size of a float in bytes
+#define FRAME_STEREO_SHORT      STEREO_CHANNELS * SIZE_SHORT
+#define FRAME_STEREO_FLOAT      STEREO_CHANNELS * SIZE_FLOAT
+#define FRAME_SURROUND_FLOAT    SURROUND_CHANNELS * SIZE_FLOAT
+#endif
+
+class OpenALStream final : public SoundStream
+{
+#if defined HAVE_OPENAL && HAVE_OPENAL
+public:
+	OpenALStream() : uiSource(0)
+	{
+	}
+
+	bool Start() override;
+	void SoundLoop() override;
+	void SetVolume(int volume) override;
+	void Stop() override;
+	void Clear(bool mute) override;
+	void Update() override;
+
+	static bool isValid() { return true; }
+
+private:
+	std::thread thread;
+	std::atomic<bool> m_run_thread;
+
+	Common::Event soundSyncEvent;
+
+	short realtimeBuffer[OAL_MAX_SAMPLES * STEREO_CHANNELS];
+	soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SURROUND_CHANNELS * OAL_MAX_BUFFERS];
+	ALuint uiBuffers[OAL_MAX_BUFFERS];
+	ALuint uiSource;
+	ALfloat fVolume;
+
+	u8 numBuffers;
+#endif // HAVE_OPENAL
+};
diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
similarity index 79%
rename from Source/Core/AudioCommon/Src/OpenSLESStream.cpp
rename to Source/Core/AudioCommon/OpenSLESStream.cpp
index 26391d5d72..2f44ef25f0 100644
--- a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -1,27 +1,28 @@
 // Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #ifdef ANDROID
-#include "Common.h"
 #include <assert.h>
-#include "OpenSLESStream.h"
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
 
+#include "AudioCommon/OpenSLESStream.h"
+#include "Common/CommonTypes.h"
+
 // engine interfaces
 static SLObjectItf engineObject;
 static SLEngineItf engineEngine;
 static SLObjectItf outputMixObject;
 
 // buffer queue player interfaces
-static SLObjectItf bqPlayerObject = NULL;
+static SLObjectItf bqPlayerObject = nullptr;
 static SLPlayItf bqPlayerPlay;
 static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue;
 static SLMuteSoloItf bqPlayerMuteSolo;
 static SLVolumeItf bqPlayerVolume;
-static CMixer *g_mixer; 
+static CMixer *g_mixer;
 #define BUFFER_SIZE 512
 #define BUFFER_SIZE_IN_SAMPLES (BUFFER_SIZE / 2)
 
@@ -29,9 +30,10 @@ static CMixer *g_mixer;
 static short buffer[2][BUFFER_SIZE];
 static int curBuffer = 0;
 
-static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
+static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
+{
 	assert(bq == bqPlayerBufferQueue);
-	assert(NULL == context);
+	assert(nullptr == context);
 
 	short *nextBuffer = buffer[curBuffer];
 	int nextSize = sizeof(buffer[0]);
@@ -43,16 +45,16 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
 	// which for this code example would indicate a programming error
 	_assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
 
-
-	curBuffer ^= 1;	// Switch buffer
+	curBuffer ^= 1; // Switch buffer
 	// Render to the fresh buffer
 	g_mixer->Mix(reinterpret_cast<short *>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES);
 }
+
 bool OpenSLESStream::Start()
 {
 	SLresult result;
 	// create engine
-	result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
+	result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
 	assert(SL_RESULT_SUCCESS == result);
 	result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
 	assert(SL_RESULT_SUCCESS == result);
@@ -67,7 +69,7 @@ bool OpenSLESStream::Start()
 	SLDataFormat_PCM format_pcm = {
 		SL_DATAFORMAT_PCM,
 		2,
-		SL_SAMPLINGRATE_44_1,
+		m_mixer->GetSampleRate() * 1000,
 		SL_PCMSAMPLEFORMAT_FIXED_16,
 		SL_PCMSAMPLEFORMAT_FIXED_16,
 		SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT,
@@ -78,7 +80,7 @@ bool OpenSLESStream::Start()
 
 	// configure audio sink
 	SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
-	SLDataSink audioSnk = {&loc_outmix, NULL};
+	SLDataSink audioSnk = {&loc_outmix, nullptr};
 
 	// create audio player
 	const SLInterfaceID ids[2] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME};
@@ -93,41 +95,45 @@ bool OpenSLESStream::Start()
 	result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE,
 		&bqPlayerBufferQueue);
 	assert(SL_RESULT_SUCCESS == result);
-	result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL);
+	result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, nullptr);
 	assert(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
 	assert(SL_RESULT_SUCCESS == result);
 
-	// Render and enqueue a first buffer. (or should we just play the buffer empty?)
-	curBuffer = 0;
-
-	result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[curBuffer], sizeof(buffer[curBuffer]));
-	if (SL_RESULT_SUCCESS != result) {
-		return false;
-	}
+	// Render and enqueue a first buffer.
 	curBuffer ^= 1;
-	g_mixer = m_mixer;
+	g_mixer = m_mixer.get();
+
+	result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[0], sizeof(buffer[0]));
+	if (SL_RESULT_SUCCESS != result)
+		return false;
+
 	return true;
 }
 
 void OpenSLESStream::Stop()
 {
-	if (bqPlayerObject != NULL) {
+	if (bqPlayerObject != nullptr)
+	{
 		(*bqPlayerObject)->Destroy(bqPlayerObject);
-		bqPlayerObject = NULL;
-		bqPlayerPlay = NULL;
-		bqPlayerBufferQueue = NULL;
-		bqPlayerMuteSolo = NULL;
-		bqPlayerVolume = NULL;
+		bqPlayerObject = nullptr;
+		bqPlayerPlay = nullptr;
+		bqPlayerBufferQueue = nullptr;
+		bqPlayerMuteSolo = nullptr;
+		bqPlayerVolume = nullptr;
 	}
-	if (outputMixObject != NULL) {
+
+	if (outputMixObject != nullptr)
+	{
 		(*outputMixObject)->Destroy(outputMixObject);
-		outputMixObject = NULL;
+		outputMixObject = nullptr;
 	}
-	if (engineObject != NULL) {
+
+	if (engineObject != nullptr)
+	{
 		(*engineObject)->Destroy(engineObject);
-		engineObject = NULL;
-		engineEngine = NULL;
+		engineObject = nullptr;
+		engineEngine = nullptr;
 	}
 }
 #endif
diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h
new file mode 100644
index 0000000000..d56b0dfd97
--- /dev/null
+++ b/Source/Core/AudioCommon/OpenSLESStream.h
@@ -0,0 +1,24 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <thread>
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
+
+class OpenSLESStream final : public SoundStream
+{
+#ifdef ANDROID
+public:
+	bool Start() override;
+	void Stop() override;
+	static bool isValid() { return true; }
+
+private:
+	std::thread thread;
+	Common::Event soundSyncEvent;
+#endif // HAVE_OPENSL
+};
diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp
new file mode 100644
index 0000000000..1932ed031a
--- /dev/null
+++ b/Source/Core/AudioCommon/PulseAudioStream.cpp
@@ -0,0 +1,247 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "AudioCommon/DPL2Decoder.h"
+#include "AudioCommon/PulseAudioStream.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+
+namespace
+{
+const size_t BUFFER_SAMPLES = 512; // ~10 ms - needs to be at least 240 for surround
+}
+
+PulseAudio::PulseAudio()
+	: m_thread()
+	, m_run_thread()
+{
+}
+
+bool PulseAudio::Start()
+{
+	m_stereo = !SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder;
+	m_channels = m_stereo ? 2 : 5; // will tell PA we use a Stereo or 5.0 channel setup
+
+	NOTICE_LOG(AUDIO, "PulseAudio backend using %d channels", m_channels);
+
+	m_run_thread = true;
+	m_thread = std::thread(&PulseAudio::SoundLoop, this);
+
+	// Initialize DPL2 parameters
+	DPL2Reset();
+
+	return true;
+}
+
+void PulseAudio::Stop()
+{
+	m_run_thread = false;
+	m_thread.join();
+}
+
+void PulseAudio::Update()
+{
+	// don't need to do anything here.
+}
+
+// Called on audio thread.
+void PulseAudio::SoundLoop()
+{
+	Common::SetCurrentThreadName("Audio thread - pulse");
+
+	if (PulseInit())
+	{
+		while (m_run_thread.load() && m_pa_connected == 1 && m_pa_error >= 0)
+			m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, nullptr);
+
+		if (m_pa_error < 0)
+			ERROR_LOG(AUDIO, "PulseAudio error: %s", pa_strerror(m_pa_error));
+
+		PulseShutdown();
+	}
+}
+
+bool PulseAudio::PulseInit()
+{
+	m_pa_error = 0;
+	m_pa_connected = 0;
+
+	// create pulseaudio main loop and context
+	// also register the async state callback which is called when the connection to the pa server has changed
+	m_pa_ml = pa_mainloop_new();
+	m_pa_mlapi = pa_mainloop_get_api(m_pa_ml);
+	m_pa_ctx = pa_context_new(m_pa_mlapi, "dolphin-emu");
+	m_pa_error = pa_context_connect(m_pa_ctx, nullptr, PA_CONTEXT_NOFLAGS, nullptr);
+	pa_context_set_state_callback(m_pa_ctx, StateCallback, this);
+
+	// wait until we're connected to the pulseaudio server
+	while (m_pa_connected == 0 && m_pa_error >= 0)
+		m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, nullptr);
+
+	if (m_pa_connected == 2 || m_pa_error < 0)
+	{
+		ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s", pa_strerror(m_pa_error));
+		return false;
+	}
+
+	// create a new audio stream with our sample format
+	// also connect the callbacks for this stream
+	pa_sample_spec ss;
+	pa_channel_map channel_map;
+	pa_channel_map* channel_map_p = nullptr; // auto channel map
+	if (m_stereo)
+	{
+		ss.format = PA_SAMPLE_S16LE;
+		m_bytespersample = sizeof(s16);
+	}
+	else
+	{
+		// surround is remixed in floats, use a float PA buffer to save another conversion
+		ss.format = PA_SAMPLE_FLOAT32NE;
+		m_bytespersample = sizeof(float);
+
+		channel_map_p = &channel_map; // explicit channel map:
+		channel_map.channels = 5;
+		channel_map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+		channel_map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+		channel_map.map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+		channel_map.map[3] = PA_CHANNEL_POSITION_REAR_LEFT;
+		channel_map.map[4] = PA_CHANNEL_POSITION_REAR_RIGHT;
+	}
+	ss.channels = m_channels;
+	ss.rate = m_mixer->GetSampleRate();
+	assert(pa_sample_spec_valid(&ss));
+	m_pa_s = pa_stream_new(m_pa_ctx, "Playback", &ss, channel_map_p);
+	pa_stream_set_write_callback(m_pa_s, WriteCallback, this);
+	pa_stream_set_underflow_callback(m_pa_s, UnderflowCallback, this);
+
+	// connect this audio stream to the default audio playback
+	// limit buffersize to reduce latency
+	m_pa_ba.fragsize = -1;
+	m_pa_ba.maxlength = -1;          // max buffer, so also max latency
+	m_pa_ba.minreq = -1;             // don't read every byte, try to group them _a bit_
+	m_pa_ba.prebuf = -1;             // start as early as possible
+	m_pa_ba.tlength = BUFFER_SAMPLES * m_channels * m_bytespersample; // designed latency, only change this flag for low latency output
+	pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE);
+	m_pa_error = pa_stream_connect_playback(m_pa_s, nullptr, &m_pa_ba, flags, nullptr, nullptr);
+	if (m_pa_error < 0)
+	{
+		ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s", pa_strerror(m_pa_error));
+		return false;
+	}
+
+	INFO_LOG(AUDIO, "Pulse successfully initialized");
+	return true;
+}
+
+void PulseAudio::PulseShutdown()
+{
+	pa_context_disconnect(m_pa_ctx);
+	pa_context_unref(m_pa_ctx);
+	pa_mainloop_free(m_pa_ml);
+}
+
+void PulseAudio::StateCallback(pa_context* c)
+{
+	pa_context_state_t state = pa_context_get_state(c);
+	switch (state)
+	{
+	case PA_CONTEXT_FAILED:
+	case PA_CONTEXT_TERMINATED:
+		m_pa_connected = 2;
+		break;
+	case PA_CONTEXT_READY:
+		m_pa_connected = 1;
+		break;
+	default:
+		break;
+	}
+}
+// on underflow, increase pulseaudio latency in ~10ms steps
+void PulseAudio::UnderflowCallback(pa_stream* s)
+{
+	m_pa_ba.tlength += BUFFER_SAMPLES * m_channels * m_bytespersample;
+	pa_stream_set_buffer_attr(s, &m_pa_ba, nullptr, nullptr);
+
+	WARN_LOG(AUDIO, "pulseaudio underflow, new latency: %d bytes", m_pa_ba.tlength);
+}
+
+void PulseAudio::WriteCallback(pa_stream* s, size_t length)
+{
+	int bytes_per_frame = m_channels * m_bytespersample;
+	int frames = (length / bytes_per_frame);
+	size_t trunc_length = frames * bytes_per_frame;
+
+	// fetch dst buffer directly from pulseaudio, so no memcpy is needed
+	void* buffer;
+	m_pa_error = pa_stream_begin_write(s, &buffer, &trunc_length);
+
+	if (!buffer || m_pa_error < 0)
+		return; // error will be printed from main loop
+
+	if (m_stereo)
+	{
+		// use the raw s16 stereo mix
+		m_mixer->Mix((s16*) buffer, frames);
+	}
+	else
+	{
+		// get a floating point mix
+		s16 s16buffer_stereo[frames * 2];
+		m_mixer->Mix(s16buffer_stereo, frames); // implicitly mixes to 16-bit stereo
+
+		float floatbuffer_stereo[frames * 2];
+		// s16 to float
+		for (int i=0; i < frames * 2; ++i)
+		{
+			floatbuffer_stereo[i] = s16buffer_stereo[i] / float(1 << 15);
+		}
+
+		if (m_channels == 5) // Extract dpl2/5.0 Surround
+		{
+			float floatbuffer_6chan[frames * 6];
+			// DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR
+			DPL2Decode(floatbuffer_stereo, frames, floatbuffer_6chan);
+
+			// Discard the subwoofer channel - DPL2Decode generates a pretty
+			// good 5.0 but not a good 5.1 output.
+			const int dpl2_to_5chan[] = {0,1,2,4,5};
+			for (int i=0; i < frames; ++i)
+			{
+				for (int j=0; j < m_channels; ++j)
+				{
+					((float*)buffer)[m_channels * i + j] = floatbuffer_6chan[6 * i + dpl2_to_5chan[j]];
+				}
+			}
+		}
+		else
+		{
+			ERROR_LOG(AUDIO, "Unsupported number of PA channels requested: %d", (int)m_channels);
+			return;
+		}
+	}
+
+	m_pa_error = pa_stream_write(s, buffer, trunc_length, nullptr, 0, PA_SEEK_RELATIVE);
+}
+
+// Callbacks that forward to internal methods (required because PulseAudio is a C API).
+
+void PulseAudio::StateCallback(pa_context* c, void* userdata)
+{
+	PulseAudio* p = (PulseAudio*) userdata;
+	p->StateCallback(c);
+}
+
+void PulseAudio::UnderflowCallback(pa_stream* s, void* userdata)
+{
+	PulseAudio* p = (PulseAudio*) userdata;
+	p->UnderflowCallback(s);
+}
+
+void PulseAudio::WriteCallback(pa_stream* s, size_t length, void* userdata)
+{
+	PulseAudio* p = (PulseAudio*) userdata;
+	p->WriteCallback(s, length);
+}
diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h
new file mode 100644
index 0000000000..e3c74463b6
--- /dev/null
+++ b/Source/Core/AudioCommon/PulseAudioStream.h
@@ -0,0 +1,59 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
+#include <pulse/pulseaudio.h>
+#endif
+
+#include <atomic>
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+
+class PulseAudio final : public SoundStream
+{
+#if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
+public:
+	PulseAudio();
+
+	bool Start() override;
+	void Stop() override;
+	void Update() override;
+
+	static bool isValid() { return true; }
+
+	void StateCallback(pa_context *c);
+	void WriteCallback(pa_stream *s, size_t length);
+	void UnderflowCallback(pa_stream *s);
+
+private:
+	virtual void SoundLoop() override;
+
+	bool PulseInit();
+	void PulseShutdown();
+
+	// wrapper callback functions, last parameter _must_ be PulseAudio*
+	static void StateCallback(pa_context *c, void *userdata);
+	static void WriteCallback(pa_stream *s, size_t length, void *userdata);
+	static void UnderflowCallback(pa_stream *s, void *userdata);
+
+	std::thread m_thread;
+	std::atomic<bool> m_run_thread;
+
+	bool m_stereo; // stereo, else surround
+	int m_bytespersample;
+	int m_channels;
+
+	int m_pa_error;
+	int m_pa_connected;
+	pa_mainloop *m_pa_ml;
+	pa_mainloop_api *m_pa_mlapi;
+	pa_context *m_pa_ctx;
+	pa_stream *m_pa_s;
+	pa_buffer_attr m_pa_ba;
+#endif
+};
diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h
new file mode 100644
index 0000000000..18b1f6ba2e
--- /dev/null
+++ b/Source/Core/AudioCommon/SoundStream.h
@@ -0,0 +1,63 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include "AudioCommon/Mixer.h"
+#include "AudioCommon/WaveFile.h"
+#include "Common/CommonTypes.h"
+
+class SoundStream
+{
+protected:
+	std::unique_ptr<CMixer> m_mixer;
+	bool m_logAudio;
+	WaveFileWriter g_wave_writer;
+	bool m_muted;
+
+public:
+	SoundStream() : m_mixer(new CMixer(48000)), m_logAudio(false), m_muted(false) {}
+	virtual ~SoundStream() { }
+
+	static  bool isValid() { return false; }
+	CMixer* GetMixer() const { return m_mixer.get(); }
+	virtual bool Start() { return false; }
+	virtual void SetVolume(int) {}
+	virtual void SoundLoop() {}
+	virtual void Stop() {}
+	virtual void Update() {}
+	virtual void Clear(bool mute) { m_muted = mute; }
+	bool IsMuted() const { return m_muted; }
+
+	void StartLogAudio(const std::string& filename)
+	{
+		if (!m_logAudio)
+		{
+			m_logAudio = true;
+			g_wave_writer.Start(filename, m_mixer->GetSampleRate());
+			g_wave_writer.SetSkipSilence(false);
+			NOTICE_LOG(DSPHLE, "Starting Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "Audio logging already started");
+		}
+	}
+
+	void StopLogAudio()
+	{
+		if (m_logAudio)
+		{
+			m_logAudio = false;
+			g_wave_writer.Stop();
+			NOTICE_LOG(DSPHLE, "Stopping Audio logging");
+		}
+		else
+		{
+			WARN_LOG(DSPHLE, "Audio logging already stopped");
+		}
+	}
+};
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
deleted file mode 100644
index 5a657a5fd8..0000000000
--- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <functional>
-#include <string.h>
-
-#include "AOSoundStream.h"
-#include "Mixer.h"
-
-#if defined(HAVE_AO) && HAVE_AO
-
-void AOSound::SoundLoop()
-{
-	Common::SetCurrentThreadName("Audio thread - ao");
-
-	uint_32 numBytesToRender = 256;
-	ao_initialize();
-	default_driver = ao_default_driver_id();
-	format.bits = 16;
-	format.channels = 2;
-	format.rate = m_mixer->GetSampleRate();
-	format.byte_format = AO_FMT_LITTLE;
-
-	device = ao_open_live(default_driver, &format, NULL /* no options */);
-	if (!device)
-	{
-		PanicAlertT("AudioCommon: Error opening AO device.\n");
-		ao_shutdown();
-		Stop();
-		return;
-	}
-
-	buf_size = format.bits/8 * format.channels * format.rate;
-
-	while (!threadData)
-	{
-		m_mixer->Mix(realtimeBuffer, numBytesToRender >> 2);
-
-		{
-		std::lock_guard<std::mutex> lk(soundCriticalSection);
-		ao_play(device, (char*)realtimeBuffer, numBytesToRender);
-		}
-
-		soundSyncEvent.Wait();
-	}
-}
-
-bool AOSound::Start()
-{
-	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
-
-	thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this);
-	return true;
-}
-
-void AOSound::Update()
-{
-	soundSyncEvent.Set();
-}
-
-void AOSound::Stop()
-{
-	threadData = 1;
-	soundSyncEvent.Set();
-
-	{
-	std::lock_guard<std::mutex> lk(soundCriticalSection);
-	thread.join();
-
-	if (device)
-		ao_close(device);
-
-	ao_shutdown();
-
-	device = NULL;
-	}
-}
-
-AOSound::~AOSound()
-{
-}
-
-#endif
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.h b/Source/Core/AudioCommon/Src/AOSoundStream.h
deleted file mode 100644
index 0b3cef9f0e..0000000000
--- a/Source/Core/AudioCommon/Src/AOSoundStream.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _AOSOUNDSTREAM_H_
-#define _AOSOUNDSTREAM_H_
-
-#include "SoundStream.h"
-
-#if defined(HAVE_AO) && HAVE_AO
-#include <ao/ao.h>
-#endif
-
-#include "Thread.h"
-
-class AOSound : public SoundStream
-{
-#if defined(HAVE_AO) && HAVE_AO
-	std::thread thread;
-	std::mutex soundCriticalSection;
-	Common::Event soundSyncEvent;
-
-	int buf_size;
-
-	ao_device *device;
-	ao_sample_format format;
-	int default_driver;
-
-	short realtimeBuffer[1024 * 1024];
-
-public:
-	AOSound(CMixer *mixer) : SoundStream(mixer) {}
-
-	virtual ~AOSound();
-
-	virtual bool Start();
-
-	virtual void SoundLoop();
-
-	virtual void Stop();
-
-	static bool isValid() {
-		return true;
-	}
-
-	virtual bool usesMixer() const { 
-		return true; 
-	}
-
-	virtual void Update();
-
-#else
-public:
-	AOSound(CMixer *mixer) : SoundStream(mixer) {}
-#endif
-};
-
-#endif //_AOSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.h b/Source/Core/AudioCommon/Src/AlsaSoundStream.h
deleted file mode 100644
index 47c9e7ae82..0000000000
--- a/Source/Core/AudioCommon/Src/AlsaSoundStream.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ALSA_SOUND_STREAM_H
-#define _ALSA_SOUND_STREAM_H
-
-#if defined(HAVE_ALSA) && HAVE_ALSA
-#include <alsa/asoundlib.h>
-#endif
-
-#include "Common.h"
-#include "SoundStream.h"
-
-#include "Thread.h"
-
-class AlsaSound : public SoundStream
-{
-#if defined(HAVE_ALSA) && HAVE_ALSA
-public:
-	AlsaSound(CMixer *mixer);
-	virtual ~AlsaSound();
-
-	virtual bool Start();
-	virtual void SoundLoop();
-	virtual void Stop();
-
-	static bool isValid() {
-		return true;
-	}
-	virtual bool usesMixer() const { 
-		return true; 
-	}
-
-	virtual void Update();
-
-private:
-	bool AlsaInit();
-	void AlsaShutdown();
-
-	u8 *mix_buffer;
-	std::thread thread;
-	// 0 = continue
-	// 1 = shutdown
-	// 2 = done shutting down.
-	volatile int thread_data;
-
-	snd_pcm_t *handle;
-	int frames_to_deliver;
-#else
-public:
-	AlsaSound(CMixer *mixer) : SoundStream(mixer) {}
-#endif
-};
-
-#endif
-
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
deleted file mode 100644
index 8b343aa493..0000000000
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "AudioCommon.h"
-#include "FileUtil.h"
-#include "Mixer.h"
-#include "NullSoundStream.h"
-#include "DSoundStream.h"
-#include "XAudio2Stream.h"
-#include "AOSoundStream.h"
-#include "AlsaSoundStream.h"
-#include "CoreAudioSoundStream.h"
-#include "OpenALStream.h"
-#include "PulseAudioStream.h"
-#include "OpenSLESStream.h"
-#include "../../Core/Src/Movie.h"
-#include "../../Core/Src/ConfigManager.h"
-
-// This shouldn't be a global, at least not here.
-SoundStream *soundStream;
-
-namespace AudioCommon 
-{	
-	SoundStream *InitSoundStream(CMixer *mixer, void *hWnd) 
-	{
-		// TODO: possible memleak with mixer
-
-		std::string backend = SConfig::GetInstance().sBackend;
-		if (backend == BACKEND_OPENAL           && OpenALStream::isValid()) 
-			soundStream = new OpenALStream(mixer);
-		else if (backend == BACKEND_NULLSOUND   && NullSound::isValid()) 
-			soundStream = new NullSound(mixer, hWnd);
-		else if (backend == BACKEND_DIRECTSOUND && DSound::isValid()) 
-			soundStream = new DSound(mixer, hWnd);
-		else if (backend == BACKEND_XAUDIO2     && XAudio2::isValid()) 
-			soundStream = new XAudio2(mixer);
-		else if (backend == BACKEND_AOSOUND     && AOSound::isValid()) 
-			soundStream = new AOSound(mixer);
-		else if (backend == BACKEND_ALSA        && AlsaSound::isValid())
-			soundStream = new AlsaSound(mixer);
-		else if (backend == BACKEND_COREAUDIO   && CoreAudioSound::isValid()) 
-			soundStream = new CoreAudioSound(mixer);
-		else if (backend == BACKEND_PULSEAUDIO  && PulseAudio::isValid())
-			soundStream = new PulseAudio(mixer);
-		else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
-			soundStream = new OpenSLESStream(mixer);
-		if (soundStream != NULL)
-		{
-			UpdateSoundStream();
-			if (soundStream->Start())
-			{
-				if (SConfig::GetInstance().m_DumpAudio)
-				{
-					std::string audio_file_name = File::GetUserPath(D_DUMPAUDIO_IDX) + "audiodump.wav";
-					File::CreateFullPath(audio_file_name);
-					mixer->StartLogAudio(audio_file_name.c_str());
-				}
-
-				return soundStream;
-			}
-			PanicAlertT("Could not initialize backend %s.", backend.c_str());
-		}
-		PanicAlertT("Sound backend %s is not valid.", backend.c_str());
-
-		delete soundStream;
-		soundStream = NULL;
-		return NULL;
-	}
-
-	void ShutdownSoundStream() 
-	{
-		INFO_LOG(DSPHLE, "Shutting down sound stream");
-
-		if (soundStream) 
-		{
-			soundStream->Stop();
-			if (SConfig::GetInstance().m_DumpAudio)
-				soundStream->GetMixer()->StopLogAudio();
-				//soundStream->StopLogAudio();
-			delete soundStream;
-			soundStream = NULL;
-		}
-
-		INFO_LOG(DSPHLE, "Done shutting down sound stream");	
-	}
-
-	std::vector<std::string> GetSoundBackends() 
-	{
-		std::vector<std::string> backends;
-
-		if (NullSound::isValid())
-			backends.push_back(BACKEND_NULLSOUND);
-		if (DSound::isValid())
-			backends.push_back(BACKEND_DIRECTSOUND);
-		if (XAudio2::isValid())
-			backends.push_back(BACKEND_XAUDIO2);
-		if (AOSound::isValid())
-			backends.push_back(BACKEND_AOSOUND);
-		if (AlsaSound::isValid())
-			backends.push_back(BACKEND_ALSA);
-		if (CoreAudioSound::isValid())
-			backends.push_back(BACKEND_COREAUDIO);
-		if (PulseAudio::isValid())
-			backends.push_back(BACKEND_PULSEAUDIO);
-		if (OpenALStream::isValid())
-			backends.push_back(BACKEND_OPENAL);
-		if (OpenSLESStream::isValid())
-			backends.push_back(BACKEND_OPENSLES);
-		return backends;
-	}
-
-	bool UseJIT() 
-	{
-		if (!Movie::IsDSPHLE() && Movie::IsPlayingInput() && Movie::IsConfigSaved())
-		{
-			return true;
-		}
-		return SConfig::GetInstance().m_EnableJIT;
-	}
-
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock)
-	{
-		if (soundStream)
-		{
-			// audio typically doesn't maintain its own "paused" state
-			// (that's already handled by the CPU and whatever else being paused)
-			// so it should be good enough to only lock/unlock here.
-			CMixer* pMixer = soundStream->GetMixer();
-			if (pMixer)
-			{
-				std::mutex& csMixing = pMixer->MixerCritical();
-				if (doLock)
-					csMixing.lock();
-				else
-					csMixing.unlock();
-			}
-		}
-	}
-	void UpdateSoundStream()
-	{
-		if (soundStream)
-		{
-			soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2);
-			soundStream->SetVolume(SConfig::GetInstance().m_Volume);
-		}
-	}
-}
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.h b/Source/Core/AudioCommon/Src/AudioCommon.h
deleted file mode 100644
index cd1896396e..0000000000
--- a/Source/Core/AudioCommon/Src/AudioCommon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _AUDIO_COMMON_H_
-#define _AUDIO_COMMON_H_
-
-#include "Common.h"
-#include "SoundStream.h"
-
-
-class CMixer;
-
-extern SoundStream *soundStream;
-
-// UDSPControl
-union UDSPControl
-{
-	u16 Hex;
-	struct
-	{
-		u16 DSPReset       : 1; // Write 1 to reset and waits for 0
-		u16 DSPAssertInt   : 1;
-		u16 DSPHalt        : 1;
-
-		u16 AI             : 1;
-		u16 AI_mask        : 1;
-		u16 ARAM           : 1;
-		u16 ARAM_mask      : 1;
-		u16 DSP            : 1;
-		u16 DSP_mask       : 1;
-
-		u16 ARAM_DMAState  : 1; // DSPGetDMAStatus() uses this flag
-		u16 DSPInitCode    : 1;
-		u16 DSPInit        : 1; // DSPInit() writes to this flag
-		u16 pad            : 4;
-	};
-	UDSPControl(u16 _Hex = 0) : Hex(_Hex) {}
-};
-
-namespace AudioCommon 
-{
-	SoundStream *InitSoundStream(CMixer *mixer, void *hWnd);
-	void ShutdownSoundStream();
-	std::vector<std::string> GetSoundBackends();
-	bool UseJIT();
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-	void UpdateSoundStream();
-}
-
-#endif // _AUDIO_COMMON_H_
diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
deleted file mode 100644
index 27d8c62f7d..0000000000
--- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COREAUDIO_SOUND_STREAM_H
-#define _COREAUDIO_SOUND_STREAM_H
-
-#ifdef __APPLE__
-#include <AudioUnit/AudioUnit.h>
-#endif
-
-#include "SoundStream.h"
-
-class CoreAudioSound : public SoundStream
-{
-#ifdef __APPLE__
-public:
-	CoreAudioSound(CMixer *mixer);
-	virtual ~CoreAudioSound();
-
-	virtual bool Start();
-	virtual void SetVolume(int volume);
-	virtual void SoundLoop();
-	virtual void Stop();
-
-	static bool isValid() {
-		return true;
-	}
-	virtual bool usesMixer() const {
-		return true;
-	}
-
-	virtual void Update();
-
-private:
-	AudioUnit audioUnit;
-    int m_volume;
-
-	static OSStatus callback(void *inRefCon,
-		AudioUnitRenderActionFlags *ioActionFlags,
-		const AudioTimeStamp *inTimeStamp,
-		UInt32 inBusNumber, UInt32 inNumberFrames,
-		AudioBufferList *ioData);
-#else
-public:
-	CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {}
-#endif
-};
-
-#endif
diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
deleted file mode 100644
index 97bdb5413d..0000000000
--- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Dolby Pro Logic 2 decoder from ffdshow-tryout
-//  * Copyright 2001 Anders Johansson ajh@atri.curtin.edu.au
-//  * Copyright (c) 2004-2006 Milan Cutka
-//  * based on mplayer HRTF plugin by ylai
-
-#include <functional>
-#include <vector>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "DPL2Decoder.h"
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2 0.70710678118654752440
-#endif
-
-int olddelay = -1;
-unsigned int oldfreq = 0;
-unsigned int dlbuflen;
-int cyc_pos;
-float l_fwr, r_fwr, lpr_fwr, lmr_fwr;
-std::vector<float> fwrbuf_l, fwrbuf_r;
-float adapt_l_gain, adapt_r_gain, adapt_lpr_gain, adapt_lmr_gain;
-std::vector<float> lf, rf, lr, rr, cf, cr;
-float LFE_buf[256];
-unsigned int lfe_pos;
-float *filter_coefs_lfe;
-unsigned int len125;
-
-template<class T,class _ftype_t> static _ftype_t dotproduct(int count,const T *buf,const _ftype_t *coefficients)
-{
-	float sum0=0,sum1=0,sum2=0,sum3=0;
-	for (;count>=4;buf+=4,coefficients+=4,count-=4)
-	{
-		sum0+=buf[0]*coefficients[0];
-		sum1+=buf[1]*coefficients[1];
-		sum2+=buf[2]*coefficients[2];
-		sum3+=buf[3]*coefficients[3];
-	}
-	while (count--) sum0+= *buf++ * *coefficients++;
-	return sum0+sum1+sum2+sum3;
-}
-
-template<class T> static T firfilter(const T *buf, int pos, int len, int count, const float *coefficients)
-{
-	int count1, count2;
-
-	if (pos >= count)
-	{
-		pos -= count;
-		count1 = count; count2 = 0;
-	}
-	else
-	{
-		count2 = pos;
-		count1 = count - pos;
-		pos = len - count1;
-	}
-
-	// high part of window
-	const T *ptr = &buf[pos];
-
-	float r1=dotproduct(count1,ptr,coefficients);coefficients+=count1;
-	float r2=dotproduct(count2,buf,coefficients);
-	return T(r1+r2);
-}
-
-template<class T> inline const T& limit(const T& val, const T& min, const T& max)
-{
-	if (val < min) {
-		return min;
-	} else if (val > max) {
-		return max;
-	} else {
-		return val;
-	}
-}
-
-/*
-// Hamming
-//                        2*pi*k
-// w(k) = 0.54 - 0.46*cos(------), where 0 <= k < N
-//                         N-1
-//
-// n window length
-// w buffer for the window parameters
-*/
-void hamming(int n, float* w)
-{
-	int      i;
-	float k = float(2*M_PI/((float)(n-1))); // 2*pi/(N-1)
-
-	// Calculate window coefficients
-	for (i=0; i<n; i++)
-		*w++ = float(0.54 - 0.46*cos(k*(float)i));
-}
-
-/******************************************************************************
-*  FIR filter design
-******************************************************************************/
-
-/* Design FIR filter using the Window method
-
-n     filter length must be odd for HP and BS filters
-w     buffer for the filter taps (must be n long)
-fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS)
-0 < fc < 1 where 1 <=> Fs/2
-flags window and filter type as defined in filter.h
-variables are ored together: i.e. LP|HAMMING will give a
-low pass filter designed using a hamming window
-opt   beta constant used only when designing using kaiser windows
-
-returns 0 if OK, -1 if fail
-*/
-float* design_fir(unsigned int *n, float* fc, float opt)
-{
-	unsigned int  o   = *n & 1;              // Indicator for odd filter length
-	unsigned int  end = ((*n + 1) >> 1) - o; // Loop end
-	unsigned int  i;                         // Loop index
-
-	float k1 = 2 * float(M_PI);              // 2*pi*fc1
-	float k2 = 0.5f * (float)(1 - o);        // Constant used if the filter has even length
-	float g  = 0.0f;                         // Gain
-	float t1;                                // Temporary variables
-	float fc1;                               // Cutoff frequencies
-
-	// Sanity check
-	if(*n==0) return NULL;
-	fc[0]=limit(fc[0],float(0.001),float(1));
-
-	float *w=(float*)calloc(sizeof(float),*n);
-
-	// Get window coefficients
-	hamming(*n,w);
-
-	fc1=*fc;
-	// Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2
-	fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1/2 : 0.25f;
-	k1 *= fc1;
-
-	// Low pass filter
-
-	// If the filter length is odd, there is one point which is exactly
-	// in the middle. The value at this point is 2*fCutoff*sin(x)/x,
-	// where x is zero. To make sure nothing strange happens, we set this
-	// value separately.
-	if (o)
-	{
-		w[end] = fc1 * w[end] * 2.0f;
-		g=w[end];
-	}
-
-	// Create filter
-	for (i=0 ; i<end ; i++)
-	{
-		t1 = (float)(i+1) - k2;
-		w[end-i-1] = w[*n-end+i] = float(w[end-i-1] * sin(k1 * t1)/(M_PI * t1)); // Sinc
-		g += 2*w[end-i-1]; // Total gain in filter
-	}
-
-
-	// Normalize gain
-	g=1/g;
-	for (i=0; i<*n; i++)
-		w[i] *= g;
-
-	return w;
-}
-
-void onSeek(void)
-{
-	l_fwr = r_fwr = lpr_fwr = lmr_fwr = 0;
-	std::fill(fwrbuf_l.begin(), fwrbuf_l.end(), 0.0f);
-	std::fill(fwrbuf_r.begin(), fwrbuf_r.end(), 0.0f);
-	adapt_l_gain = adapt_r_gain = adapt_lpr_gain = adapt_lmr_gain = 0;
-	std::fill(lf.begin(), lf.end(), 0.0f);
-	std::fill(rf.begin(), rf.end(), 0.0f);
-	std::fill(lr.begin(), lr.end(), 0.0f);
-	std::fill(rr.begin(), rr.end(), 0.0f);
-	std::fill(cf.begin(), cf.end(), 0.0f);
-	std::fill(cr.begin(), cr.end(), 0.0f);
-	lfe_pos = 0;
-	memset(LFE_buf, 0, sizeof(LFE_buf));
-}
-
-void done(void)
-{
-	onSeek();
-	if (filter_coefs_lfe)
-	{
-		free(filter_coefs_lfe);
-	}
-	filter_coefs_lfe = NULL;
-}
-
-float* calc_coefficients_125Hz_lowpass(int rate)
-{
-	len125 = 256;
-	float f = 125.0f / (rate / 2);
-	float *coeffs = design_fir(&len125, &f, 0);
-	static const float M3_01DB = 0.7071067812f;
-	for (unsigned int i = 0; i < len125; i++)
-	{
-		coeffs[i] *= M3_01DB;
-	}
-	return coeffs;
-}
-
-float passive_lock(float x)
-{
-	static const float MATAGCLOCK = 0.2f;  /* AGC range (around 1) where the matrix behaves passively */
-	const float x1 = x - 1;
-	const float ax1s = fabs(x - 1) * (1.0f / MATAGCLOCK);
-	return x1 - x1 / (1 + ax1s * ax1s) + 1;
-}
-
-void matrix_decode(const float *in, const int k, const int il,
-	const int ir, bool decode_rear,
-	const int _dlbuflen,
-	float _l_fwr, float _r_fwr,
-	float _lpr_fwr, float _lmr_fwr,
-	float *_adapt_l_gain, float *_adapt_r_gain,
-	float *_adapt_lpr_gain, float *_adapt_lmr_gain,
-	float *_lf, float *_rf, float *_lr,
-	float *_rr, float *_cf)
-{
-	static const float M9_03DB = 0.3535533906f;
-	static const float MATAGCTRIG = 8.0f;   /* (Fuzzy) AGC trigger */
-	static const float MATAGCDECAY = 1.0f;  /* AGC baseline decay rate (1/samp.) */
-	static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain,  0.50 - 0.55 is full cancellation. */
-
-	const int kr = (k + olddelay) % _dlbuflen;
-	float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr);
-	float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr);
-	// The 2nd axis has strong gain fluctuations, and therefore require
-	// limits.  The factor corresponds to the 1 / amplification of (Lt
-	// - Rt) when (Lt, Rt) is strongly correlated. (e.g. during
-	// dialogues).  It should be bigger than -12 dB to prevent
-	// distortion.
-	float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr;
-	float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr);
-	float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr);
-	float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr);
-	float lpr, lmr;
-	float l_agc, r_agc, lpr_agc, lmr_agc;
-	float f, d_gain, c_gain, c_agc_cfk;
-
-	/*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/
-	/* AGC adaption */
-	d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f;
-	f = d_gain * (1.0f / MATAGCTRIG);
-	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
-	*_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain;
-	*_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain;
-	/* Matrix */
-	l_agc = in[il] * passive_lock(*_adapt_l_gain);
-	r_agc = in[ir] * passive_lock(*_adapt_r_gain);
-	_cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2;
-	if (decode_rear)
-	{
-		_lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2;
-		// Stereo rear channel is steered with the same AGC steering as
-		// the decoding matrix. Note this requires a fast updating AGC
-		// at the order of 20 ms (which is the case here).
-		_lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr);
-		_rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr);
-	}
-
-	/*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/
-	lpr = (in[il] + in[ir]) * (float)M_SQRT1_2;
-	lmr = (in[il] - in[ir]) * (float)M_SQRT1_2;
-	/* AGC adaption */
-	d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain);
-	f = d_gain * (1.0f / MATAGCTRIG);
-	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
-	*_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain;
-	*_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain;
-	/* Matrix */
-	lpr_agc = lpr * passive_lock(*_adapt_lpr_gain);
-	lmr_agc = lmr * passive_lock(*_adapt_lmr_gain);
-	_lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2;
-	_rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2;
-
-	/*** CENTER FRONT CANCELLATION ***/
-	// A heuristic approach exploits that Lt + Rt gain contains the
-	// information about Lt, Rt correlation.  This effectively reshapes
-	// the front and rear "cones" to concentrate Lt + Rt to C and
-	// introduce Lt - Rt in L, R.
-	/* 0.67677 is the empirical lower bound for lpr_gain. */
-	c_gain = 8 * (*_adapt_lpr_gain - 0.67677f);
-	c_gain = c_gain > 0 ? c_gain : 0;
-	// c_gain should not be too high, not even reaching full
-	// cancellation (~ 0.50 - 0.55 at current AGC implementation), or
-	// the center will sound too narrow. */
-	c_gain = MATCOMPGAIN / (1 + c_gain * c_gain);
-	c_agc_cfk = c_gain * _cf[k];
-	_lf[k] -= c_agc_cfk;
-	_rf[k] -= c_agc_cfk;
-	_cf[k] += c_agc_cfk + c_agc_cfk;
-}
-
-void dpl2decode(float *samples, int numsamples, float *out)
-{
-	static const unsigned int FWRDURATION = 240; // FWR average duration (samples)
-	static const int cfg_delay = 0;
-	static const unsigned int fmt_freq = 48000;
-	static const unsigned int fmt_nchannels = 2; // input channels
-
-	int cur = 0;
-
-	if (olddelay != cfg_delay || oldfreq != fmt_freq)
-	{
-		done();
-		olddelay = cfg_delay;
-		oldfreq = fmt_freq;
-		dlbuflen = std::max(FWRDURATION, (fmt_freq * cfg_delay / 1000)); //+(len7000-1);
-		cyc_pos = dlbuflen - 1;
-		fwrbuf_l.resize(dlbuflen);
-		fwrbuf_r.resize(dlbuflen);
-		lf.resize(dlbuflen);
-		rf.resize(dlbuflen);
-		lr.resize(dlbuflen);
-		rr.resize(dlbuflen);
-		cf.resize(dlbuflen);
-		cr.resize(dlbuflen);
-		filter_coefs_lfe = calc_coefficients_125Hz_lowpass(fmt_freq);
-		lfe_pos = 0;
-		memset(LFE_buf, 0, sizeof(LFE_buf));
-	}
-
-	float *in = samples; // Input audio data
-	float *end = in + numsamples * fmt_nchannels; // Loop end
-
-	while (in < end)
-	{
-		const int k = cyc_pos;
-
-		const int fwr_pos = (k + FWRDURATION) % dlbuflen;
-		/* Update the full wave rectified total amplitude */
-		/* Input matrix decoder */
-		l_fwr += fabs(in[0]) - fabs(fwrbuf_l[fwr_pos]);
-		r_fwr += fabs(in[1]) - fabs(fwrbuf_r[fwr_pos]);
-		lpr_fwr += fabs(in[0] + in[1]) - fabs(fwrbuf_l[fwr_pos] + fwrbuf_r[fwr_pos]);
-		lmr_fwr += fabs(in[0] - in[1]) - fabs(fwrbuf_l[fwr_pos] - fwrbuf_r[fwr_pos]);
-
-		/* Matrix encoded 2 channel sources */
-		fwrbuf_l[k] = in[0];
-		fwrbuf_r[k] = in[1];
-		matrix_decode(in, k, 0, 1, true, dlbuflen,
-			l_fwr, r_fwr,
-			lpr_fwr, lmr_fwr,
-			&adapt_l_gain, &adapt_r_gain,
-			&adapt_lpr_gain, &adapt_lmr_gain,
-			&lf[0], &rf[0], &lr[0], &rr[0], &cf[0]);
-
-		out[cur + 0] = lf[k];
-		out[cur + 1] = rf[k];
-		out[cur + 2] = cf[k];
-		LFE_buf[lfe_pos] = (out[0] + out[1]) / 2;
-		out[cur + 3] = firfilter(LFE_buf, lfe_pos, len125, len125, filter_coefs_lfe);
-		lfe_pos++;
-		if (lfe_pos == len125)
-		{
-			lfe_pos = 0;
-		}
-		out[cur + 4] = lr[k];
-		out[cur + 5] = rr[k];
-		// Next sample...
-		in += 2;
-		cur += 6;
-		cyc_pos--;
-		if (cyc_pos < 0)
-		{
-			cyc_pos += dlbuflen;
-		}
-	}
-}
-
-void dpl2reset()
-{
-	olddelay = -1;
-	oldfreq = 0;
-	filter_coefs_lfe = NULL;
-}
diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.h b/Source/Core/AudioCommon/Src/DPL2Decoder.h
deleted file mode 100644
index 8252918de3..0000000000
--- a/Source/Core/AudioCommon/Src/DPL2Decoder.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DPL2DECODER_H_
-#define _DPL2DECODER_H_
-
-void dpl2decode(float *samples, int numsamples, float *out);
-void dpl2reset();
-
-#endif  // _DPL2DECODER_H_
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
deleted file mode 100644
index 41a1dd9951..0000000000
--- a/Source/Core/AudioCommon/Src/DSoundStream.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-#include <functional>
-
-#include <windows.h>
-#include <dxerr.h>
-
-#include "AudioCommon.h"
-#include "DSoundStream.h"
-
-bool DSound::CreateBuffer()
-{
-	PCMWAVEFORMAT pcmwf;
-	DSBUFFERDESC dsbdesc;
-
-	memset(&pcmwf, 0, sizeof(PCMWAVEFORMAT));
-	memset(&dsbdesc, 0, sizeof(DSBUFFERDESC));
-
-	pcmwf.wf.wFormatTag = WAVE_FORMAT_PCM;
-	pcmwf.wf.nChannels = 2;
-	pcmwf.wf.nSamplesPerSec = m_mixer->GetSampleRate();
-	pcmwf.wf.nBlockAlign = 4;
-	pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * pcmwf.wf.nBlockAlign;
-	pcmwf.wBitsPerSample = 16;
-
-	// Fill out DSound buffer description.
-	dsbdesc.dwSize  = sizeof(DSBUFFERDESC);
-	dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
-	dsbdesc.dwBufferBytes = bufferSize = BUFSIZE;
-	dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf;
-	dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT;
-
-	HRESULT res = ds->CreateSoundBuffer(&dsbdesc, &dsBuffer, NULL);
-	if (SUCCEEDED(res))
-	{
-		dsBuffer->SetCurrentPosition(0);
-		dsBuffer->SetVolume(m_volume);
-		return true;
-	}
-	else
-	{
-		// Failed.
-		PanicAlertT("Sound buffer creation failed: %s", DXGetErrorString(res)); 
-		dsBuffer = NULL;
-		return false;
-	}
-}
-
-bool DSound::WriteDataToBuffer(DWORD dwOffset,                  // Our own write cursor.
-		char* soundData, // Start of our data.
-		DWORD dwSoundBytes) // Size of block to copy.
-{
-	// I want to record the regular audio to, how do I do that?
-
-	void *ptr1, *ptr2;
-	DWORD numBytes1, numBytes2;
-	// Obtain memory address of write block. This will be in two parts if the block wraps around.
-	HRESULT hr = dsBuffer->Lock(dwOffset, dwSoundBytes, &ptr1, &numBytes1, &ptr2, &numBytes2, 0);
-
-	// If the buffer was lost, restore and retry lock.
-	if (DSERR_BUFFERLOST == hr)
-	{
-		dsBuffer->Restore();
-		hr = dsBuffer->Lock(dwOffset, dwSoundBytes, &ptr1, &numBytes1, &ptr2, &numBytes2, 0);
-	}
-	if (SUCCEEDED(hr))
-	{
-		memcpy(ptr1, soundData, numBytes1);
-		if (ptr2 != 0)
-			memcpy(ptr2, soundData + numBytes1, numBytes2);
-
-		// Release the data back to DirectSound.
-		dsBuffer->Unlock(ptr1, numBytes1, ptr2, numBytes2);
-		return true;
-	}
-
-	return false;
-}
-
-// The audio thread.
-void DSound::SoundLoop()
-{
-	Common::SetCurrentThreadName("Audio thread - dsound");
-
-	currentPos = 0;
-	lastPos = 0;
-	dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
-
-	while (!threadData)
-	{
-		// No blocking inside the csection
-		dsBuffer->GetCurrentPosition((DWORD*)&currentPos, 0);
-		int numBytesToRender = FIX128(ModBufferSize(currentPos - lastPos));
-		if (numBytesToRender >= 256)
-		{
-			if (numBytesToRender > sizeof(realtimeBuffer))
-				PanicAlert("soundThread: too big render call");
-			m_mixer->Mix(realtimeBuffer, numBytesToRender / 4);
-			WriteDataToBuffer(lastPos, (char*)realtimeBuffer, numBytesToRender);
-			lastPos = ModBufferSize(lastPos + numBytesToRender);
-		}
-		soundSyncEvent.Wait();
-	}
-}
-
-bool DSound::Start()
-{
-	if (FAILED(DirectSoundCreate8(0, &ds, 0)))
-		return false;
-	if (hWnd)
-	{
-		HRESULT hr = ds->SetCooperativeLevel((HWND)hWnd, DSSCL_PRIORITY);
-	}
-	if (!CreateBuffer())
-		return false;
-
-	DWORD num1;
-	short* p1;
-	dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER);
-	memset(p1, 0, num1);
-	dsBuffer->Unlock(p1, num1, 0, 0);
-	thread = std::thread(std::mem_fun(&DSound::SoundLoop), this);
-	return true;
-}
-
-void DSound::SetVolume(int volume)
-{
-	// This is in "dBA attenuation" from 0 to -10000, logarithmic
-	m_volume = (int)floor(log10((float)volume) * 5000.0f) - 10000;
-
-	if (dsBuffer != NULL)
-		dsBuffer->SetVolume(m_volume);
-}
-
-void DSound::Update()
-{
-	soundSyncEvent.Set();
-}
-
-void DSound::Clear(bool mute)
-{
-	m_muted = mute;
-
-	if (dsBuffer != NULL)
-	{
-		if (m_muted)
-		{
-			dsBuffer->Stop();
-		}
-		else
-		{
-			dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
-		}
-	}
-}
-
-void DSound::Stop()
-{
-	threadData = 1;
-	// kick the thread if it's waiting
-	soundSyncEvent.Set();
-
-	thread.join();
-	dsBuffer->Stop();
-	dsBuffer->Release();
-	ds->Release();
-}
-
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.h b/Source/Core/AudioCommon/Src/DSoundStream.h
deleted file mode 100644
index 6145ea62e9..0000000000
--- a/Source/Core/AudioCommon/Src/DSoundStream.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSOUNDSTREAM_H_
-#define _DSOUNDSTREAM_H_
-
-#include "SoundStream.h"
-#include "Thread.h"
-
-#ifdef _WIN32
-#include <mmsystem.h>
-#include <dsound.h>
-
-#define BUFSIZE (1024 * 8 * 4)
-#endif
-
-class DSound : public SoundStream
-{
-#ifdef _WIN32
-	std::thread thread;
-	Common::Event soundSyncEvent;
-	void  *hWnd;
-
-	IDirectSound8* ds;
-	IDirectSoundBuffer* dsBuffer;
-
-	int bufferSize;     //i bytes
-	int m_volume;
-
-	// playback position
-	int currentPos;
-	int lastPos;
-	short realtimeBuffer[BUFSIZE / sizeof(short)];
-
-	inline int FIX128(int x)
-	{
-		return x & (~127);
-	}
-
-	inline int ModBufferSize(int x)
-	{
-		return (x + bufferSize) % bufferSize;
-	}
-
-	bool CreateBuffer();
-	bool WriteDataToBuffer(DWORD dwOffset, char* soundData, DWORD dwSoundBytes);
-
-public:
-	DSound(CMixer *mixer, void *_hWnd = NULL)
-		: SoundStream(mixer)
-		, bufferSize(0)
-		, currentPos(0)
-		, lastPos(0)
-		, dsBuffer(0)
-		, ds(0)
-		, hWnd(_hWnd)
-	{}
-
-	virtual ~DSound() {}
- 
-	virtual bool Start();
-	virtual void SoundLoop();
-	virtual void SetVolume(int volume);
-	virtual void Stop();
-	virtual void Clear(bool mute);
-	static bool isValid() { return true; }
-	virtual bool usesMixer() const { return true; }
-	virtual void Update();
-
-#else
-public:
-	DSound(CMixer *mixer, void *hWnd = NULL)
-		: SoundStream(mixer)
-	{}
-#endif
-};
-
-#endif //_DSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
deleted file mode 100644
index fb29f4902f..0000000000
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Atomic.h"
-#include "Mixer.h"
-#include "AudioCommon.h"
-#include "CPUDetect.h"
-#include "../../Core/Src/Host.h"
-
-#include "../../Core/Src/HW/AudioInterface.h"
-
-// UGLINESS
-#include "../../Core/Src/PowerPC/PowerPC.h"
-
-#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-// Executed from sound stream thread
-unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
-{
-	if (!samples)
-		return 0;
-
-	std::lock_guard<std::mutex> lk(m_csMixing);
-
-	if (PowerPC::GetState() != PowerPC::CPU_RUNNING)
-	{
-		// Silence
-		memset(samples, 0, numSamples * 4);
-		return numSamples;
-	}
-
-	unsigned int numLeft = GetNumSamples();
-	if (m_AIplaying) {
-		if (numLeft < numSamples)//cannot do much about this
-			m_AIplaying = false;
-		if (numLeft < MAX_SAMPLES/4)//low watermark
-			m_AIplaying = false;
-	} else {
-		if (numLeft > MAX_SAMPLES/2)//high watermark
-			m_AIplaying = true;
-	}
-
-	// Cache access in non-volatile variable
-	// This is the only function changing the read value, so it's safe to
-	// cache it locally although it's written here.
-	// The writing pointer will be modified outside, but it will only increase,
-	// so we will just ignore new written data while interpolating.
-	// Without this cache, the compiler wouldn't be allowed to optimize the
-	// interpolation loop.
-	u32 indexR = Common::AtomicLoad(m_indexR);
-	u32 indexW = Common::AtomicLoad(m_indexW);
-	
-	if (m_AIplaying) {
-		numLeft = (numLeft > numSamples) ? numSamples : numLeft;
-
-		if (AudioInterface::GetAIDSampleRate() == m_sampleRate) // (1:1)
-		{
-#if _M_SSE >= 0x301
-			if (cpu_info.bSSSE3 && !((numLeft * 2) % 8))
-			{
-				static const __m128i sr_mask =
-					_mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL,
-								  0x04050607L, 0x00010203L);
-
-				for (unsigned int i = 0; i < numLeft * 2; i += 8)
-				{
-					_mm_storeu_si128((__m128i *)&samples[i], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&m_buffer[(indexR + i) & INDEX_MASK]), sr_mask));
-				}
-			}
-			else
-#endif
-			{
-				for (unsigned int i = 0; i < numLeft * 2; i+=2)
-				{
-					samples[i] = Common::swap16(m_buffer[(indexR + i + 1) & INDEX_MASK]);
-					samples[i+1] = Common::swap16(m_buffer[(indexR + i) & INDEX_MASK]);
-				}
-			}
-			indexR += numLeft * 2;
-		}
-		else //linear interpolation
-		{
-			//render numleft sample pairs to samples[]
-			//advance indexR with sample position
-			//remember fractional offset
-
-			static u32 frac = 0;
-			const u32 ratio = (u32)( 65536.0f * (float)AudioInterface::GetAIDSampleRate() / (float)m_sampleRate );
-
-			for (u32 i = 0; i < numLeft * 2; i+=2) {
-				u32 indexR2 = indexR + 2; //next sample
-				if ((indexR2 & INDEX_MASK) == (indexW & INDEX_MASK)) //..if it exists
-					indexR2 = indexR;
-
-				s16 l1 = Common::swap16(m_buffer[indexR & INDEX_MASK]); //current
-				s16 l2 = Common::swap16(m_buffer[indexR2 & INDEX_MASK]); //next
-				int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac)  >> 16;
-				samples[i+1] = sampleL;
-
-				s16 r1 = Common::swap16(m_buffer[(indexR + 1) & INDEX_MASK]); //current
-				s16 r2 = Common::swap16(m_buffer[(indexR2 + 1) & INDEX_MASK]); //next
-				int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac)  >> 16;
-				samples[i] = sampleR;
-
-				frac += ratio;
-				indexR += 2 * (u16)(frac >> 16);
-				frac &= 0xffff;
-			}
-		}
-
-	} else {
-		numLeft = 0;
-	}
-
-	// Padding
-	if (numSamples > numLeft)
-	{
-		unsigned short s[2];
-		s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
-		s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
-		for (unsigned int i = numLeft*2; i < numSamples*2; i+=2)
-			*(u32*)(samples+i) = *(u32*)(s);
-//		memset(&samples[numLeft * 2], 0, (numSamples - numLeft) * 4);
-	}
-	
-	// Flush cached variable	
-	Common::AtomicStore(m_indexR, indexR);
-
-	//when logging, also throttle HLE audio
-	if (m_logAudio) {
-		if (m_AIplaying) {
-			Premix(samples, numLeft);
-
-			AudioInterface::Callback_GetStreaming(samples, numLeft, m_sampleRate);
-
-			g_wave_writer.AddStereoSamples(samples, numLeft);
-		}
-	}
-	else { 	//or mix as usual
-		// Add the DSPHLE sound, re-sampling is done inside
-		Premix(samples, numSamples);
-
-		// Add the DTK Music
-		// Re-sampling is done inside
-		AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate);
-	}
-
-	return numSamples;
-}
-
-
-void CMixer::PushSamples(const short *samples, unsigned int num_samples)
-{
-	// Cache access in non-volatile variable
-	// indexR isn't allowed to cache in the audio throttling loop as it
-	// needs to get updates to not deadlock.
-	u32 indexW = Common::AtomicLoad(m_indexW);
-	
-	if (m_throttle)
-	{
-		// The auto throttle function. This loop will put a ceiling on the CPU MHz.
-		while (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
-		{
-			if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted()) 
-				break;
-			// Shortcut key for Throttle Skipping
-			if (Host_GetKeyState('\t'))
-				break;
-			SLEEP(1);
-			soundStream->Update();
-		}
-	}
-
-	// Check if we have enough free space
-	// indexW == m_indexR results in empty buffer, so indexR must always be smaller than indexW
-	if (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
-		return;
-
-	// AyuanX: Actual re-sampling work has been moved to sound thread
-	// to alleviate the workload on main thread
-	// and we simply store raw data here to make fast mem copy
-	int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (indexW & INDEX_MASK)) * sizeof(short);
-	if (over_bytes > 0)
-	{
-		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
-		memcpy(&m_buffer[0], samples + (num_samples * 4 - over_bytes) / sizeof(short), over_bytes);
-	}
-	else
-	{
-		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4);
-	}
-	
-	Common::AtomicAdd(m_indexW, num_samples * 2);
-	
-	return;
-}
-
-unsigned int CMixer::GetNumSamples()
-{
-	// Guess how many samples would be available after interpolation.
-	// As interpolation needs at least on sample from the future to
-	// linear interpolate between them, one sample less is available.
-	// We also can't say the current interpolation state (specially
-	// the frac), so to be sure, subtract one again to be sure not
-	// to underflow the fifo.
-	
-	u32 numSamples = ((Common::AtomicLoad(m_indexW) - Common::AtomicLoad(m_indexR)) & INDEX_MASK) / 2;
-
-	if (AudioInterface::GetAIDSampleRate() == m_sampleRate)
-		; //numSamples = numSamples; // 1:1
-	else if (m_sampleRate == 48000 && AudioInterface::GetAIDSampleRate() == 32000)
-		numSamples = numSamples * 3 / 2 - 2; // most common case
-	else
-		numSamples = numSamples * m_sampleRate / AudioInterface::GetAIDSampleRate() - 2;
-
-	return numSamples;
-}
-
diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h
deleted file mode 100644
index 6d797d5c3e..0000000000
--- a/Source/Core/AudioCommon/Src/Mixer.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _MIXER_H_
-#define _MIXER_H_
-
-#include "WaveFile.h"
-#include "StdMutex.h"
-
-// 16 bit Stereo
-#define MAX_SAMPLES			(1024 * 8)
-#define INDEX_MASK			(MAX_SAMPLES * 2 - 1)
-#define RESERVED_SAMPLES	(256)
-
-class CMixer {
-	
-public:
-	CMixer(unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000)
-		: m_aiSampleRate(AISampleRate)
-		, m_dacSampleRate(DACSampleRate)
-		, m_bits(16)
-		, m_channels(2)
-		, m_HLEready(false)
-		, m_logAudio(0)
-		, m_indexW(0)
-		, m_indexR(0)
-		, m_AIplaying(true)
-	{
-		// AyuanX: The internal (Core & DSP) sample rate is fixed at 32KHz
-		// So when AI/DAC sample rate differs than 32KHz, we have to do re-sampling
-		m_sampleRate = BackendSampleRate;
-
-		memset(m_buffer, 0, sizeof(m_buffer));
-
-		INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized (AISampleRate:%i, DACSampleRate:%i)", AISampleRate, DACSampleRate);
-	}
-
-	virtual ~CMixer() {}
-
-	// Called from audio threads
-	virtual unsigned int Mix(short* samples, unsigned int numSamples);
-	virtual void Premix(short * /*samples*/, unsigned int /*numSamples*/) {}
-	unsigned int GetNumSamples();
-
-	// Called from main thread
-	virtual void PushSamples(const short* samples, unsigned int num_samples);
-	unsigned int GetSampleRate() {return m_sampleRate;}
-
-	void SetThrottle(bool use) { m_throttle = use;}
-
-	// TODO: do we need this
-	bool IsHLEReady() { return m_HLEready;}
-	void SetHLEReady(bool ready) { m_HLEready = ready;}
-	// ---------------------
-
-
-	virtual void StartLogAudio(const char *filename) {
-		if (! m_logAudio) {
-			m_logAudio = true;
-			g_wave_writer.Start(filename, GetSampleRate());
-			g_wave_writer.SetSkipSilence(false);
-			NOTICE_LOG(DSPHLE, "Starting Audio logging");
-		} else {
-			WARN_LOG(DSPHLE, "Audio logging has already been started");
-		}
-	}
-
-	virtual void StopLogAudio() {
-		if (m_logAudio) {
-			m_logAudio = false;
-			g_wave_writer.Stop();
-			NOTICE_LOG(DSPHLE, "Stopping Audio logging");
-		} else {
-			WARN_LOG(DSPHLE, "Audio logging has already been stopped");
-		}
-	}
-
-	std::mutex& MixerCritical() { return m_csMixing; }
-
-	float GetCurrentSpeed() const { return m_speed; }
-	void UpdateSpeed(volatile float val) { m_speed = val; }
-
-protected:
-	unsigned int m_sampleRate;
-	unsigned int m_aiSampleRate;
-	unsigned int m_dacSampleRate;
-	int m_bits;
-	int m_channels;
-
-	WaveFileWriter g_wave_writer;
-	
-	bool m_HLEready;
-	bool m_logAudio;
-
-	bool m_throttle;
-
-	short m_buffer[MAX_SAMPLES * 2];
-	volatile u32 m_indexW;
-	volatile u32 m_indexR;
-
-	bool m_AIplaying;
-	std::mutex m_csMixing;
-
-	volatile float m_speed; // Current rate of the emulation (1.0 = 100% speed)
-private:
-
-};
-
-#endif // _MIXER_H_
diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.h b/Source/Core/AudioCommon/Src/NullSoundStream.h
deleted file mode 100644
index a20c1e0d12..0000000000
--- a/Source/Core/AudioCommon/Src/NullSoundStream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NULLSOUNDSTREAM_H_
-#define _NULLSOUNDSTREAM_H_
-
-#include "SoundStream.h"
-#include "Thread.h"
-
-#define BUF_SIZE (48000 * 4 / 32)
-
-class NullSound : public SoundStream
-{
-	// playback position
-	short realtimeBuffer[BUF_SIZE / sizeof(short)];
-
-public:
-	NullSound(CMixer *mixer, void *hWnd = NULL)
-		: SoundStream(mixer)
-	{}
-
-	virtual ~NullSound() {}
-
-	virtual bool Start();
-	virtual void SoundLoop();
-	virtual void SetVolume(int volume);
-	virtual void Stop();
-	virtual void Clear(bool mute);
-	static bool isValid() { return true; }
-	virtual bool usesMixer() const { return true; }
-	virtual void Update();
-};
-
-#endif //_NULLSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
deleted file mode 100644
index 24217169bd..0000000000
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OPENALSTREAM_H_
-#define _OPENALSTREAM_H_
-
-#include "Common.h"
-#include "SoundStream.h"
-#include "Thread.h"
-
-#if defined HAVE_OPENAL && HAVE_OPENAL
-#ifdef _WIN32
-#include <OpenAL/include/al.h>
-#include <OpenAL/include/alc.h>
-#include <OpenAL/include/alext.h>
-#elif defined __APPLE__
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-#else
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
-#endif
-
-#include "Core.h"
-#include "HW/SystemTimers.h"
-#include "HW/AudioInterface.h"
-#include <soundtouch/SoundTouch.h>
-#include <soundtouch/STTypes.h>
-
-// 16 bit Stereo
-#define SFX_MAX_SOURCE			1
-#define OAL_MAX_BUFFERS			32
-#define OAL_MAX_SAMPLES			256
-#define STEREO_CHANNELS			2
-#define SURROUND_CHANNELS		6	// number of channels in surround mode
-#define SIZE_SHORT				2
-#define SIZE_FLOAT				4   // size of a float in bytes
-#define FRAME_STEREO_SHORT		STEREO_CHANNELS * SIZE_SHORT
-#define FRAME_STEREO_FLOAT		STEREO_CHANNELS * SIZE_FLOAT
-#define FRAME_SURROUND_FLOAT	SURROUND_CHANNELS * SIZE_FLOAT
-#endif
-
-class OpenALStream: public SoundStream
-{
-#if defined HAVE_OPENAL && HAVE_OPENAL
-public:
-	OpenALStream(CMixer *mixer, void *hWnd = NULL)
-		: SoundStream(mixer)
-		, uiSource(0)
-	{};
-
-	virtual ~OpenALStream() {};
-
-	virtual bool Start();
-	virtual void SoundLoop();
-	virtual void SetVolume(int volume);
-	virtual void Stop();
-	virtual void Clear(bool mute);
-	static bool isValid() { return true; }
-	virtual bool usesMixer() const { return true; }
-	virtual void Update();
-
-private:
-	std::thread thread;
-	Common::Event soundSyncEvent;
-
-	short realtimeBuffer[OAL_MAX_SAMPLES * STEREO_CHANNELS];
-	soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SURROUND_CHANNELS * OAL_MAX_BUFFERS];
-	ALuint uiBuffers[OAL_MAX_BUFFERS];
-	ALuint uiSource;
-	ALfloat fVolume;
-
-	u8 numBuffers;
-#else
-public:
-	OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
-#endif // HAVE_OPENAL
-};
-
-#endif // OPENALSTREAM
diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.h b/Source/Core/AudioCommon/Src/OpenSLESStream.h
deleted file mode 100644
index 839b5dc4b9..0000000000
--- a/Source/Core/AudioCommon/Src/OpenSLESStream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OPENSLSTREAM_H_
-#define _OPENSLSTREAM_H_
-
-#include "Thread.h"
-#include "SoundStream.h"
-
-class OpenSLESStream : public SoundStream
-{
-#ifdef ANDROID
-public:
-	OpenSLESStream(CMixer *mixer, void *hWnd = NULL)
-		: SoundStream(mixer)
-	{};
-
-	virtual ~OpenSLESStream() {};
-
-	virtual bool Start();
-	virtual void Stop();
-	static bool isValid() { return true; }
-	virtual bool usesMixer() const { return true; }
-
-private:
-	std::thread thread;
-	Common::Event soundSyncEvent;
-#else
-public:
-	OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
-#endif // HAVE_OPENSL
-};
-
-#endif
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
deleted file mode 100644
index 13307a8fe0..0000000000
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <functional>
-
-#include "Common.h"
-#include "Thread.h"
-
-#include "PulseAudioStream.h"
-
-namespace
-{
-const size_t BUFFER_SAMPLES = 512;
-const size_t CHANNEL_COUNT = 2;
-const size_t BUFFER_SIZE = BUFFER_SAMPLES * CHANNEL_COUNT;
-}
-
-PulseAudio::PulseAudio(CMixer *mixer)
-	: SoundStream(mixer)
-	, mix_buffer(BUFFER_SIZE)
-	, thread()
-	, run_thread()
-	, pa()
-{}
-
-bool PulseAudio::Start()
-{
-	run_thread = true;
-	thread = std::thread(std::mem_fun(&PulseAudio::SoundLoop), this);
-	return true;
-}
-
-void PulseAudio::Stop()
-{
-	run_thread = false;
-	thread.join();
-}
-
-void PulseAudio::Update()
-{
-	// don't need to do anything here.
-}
-
-// Called on audio thread.
-void PulseAudio::SoundLoop()
-{
-	Common::SetCurrentThreadName("Audio thread - pulse");
-
-	if (PulseInit())
-	{
-		while (run_thread)
-		{
-			m_mixer->Mix(&mix_buffer[0], mix_buffer.size() / CHANNEL_COUNT);
-			Write(&mix_buffer[0], mix_buffer.size() * sizeof(s16));
-		}
-
-		PulseShutdown();
-	}
-}
-
-bool PulseAudio::PulseInit()
-{
-	pa_sample_spec ss = {};
-	ss.format = PA_SAMPLE_S16LE;
-	ss.channels = 2;
-	ss.rate = m_mixer->GetSampleRate();
-
-	int error;
-	pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK,
-		nullptr, "audio", &ss, nullptr, nullptr, &error);
-
-	if (!pa)
-	{
-		ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s",
-			pa_strerror(error));
-		return false;
-	}
-	else
-	{
-		NOTICE_LOG(AUDIO, "Pulse successfully initialized.");
-		return true;
-	}
-}
-
-void PulseAudio::PulseShutdown()
-{
-	pa_simple_free(pa);
-}
-
-void PulseAudio::Write(const void *data, size_t length)
-{
-	int error;
-	if (pa_simple_write(pa, data, length, &error) < 0)
-	{
-		ERROR_LOG(AUDIO, "PulseAudio failed to write data: %s",
-			pa_strerror(error));
-	}
-}
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.h b/Source/Core/AudioCommon/Src/PulseAudioStream.h
deleted file mode 100644
index 62b7e86f82..0000000000
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PULSE_AUDIO_STREAM_H
-#define _PULSE_AUDIO_STREAM_H
-
-#if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
-#include <pulse/simple.h>
-#include <pulse/error.h>
-#endif
-
-#include "Common.h"
-#include "SoundStream.h"
-
-#include "Thread.h"
-
-#include <vector>
-
-class PulseAudio : public SoundStream
-{
-#if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
-public:
-	PulseAudio(CMixer *mixer);
-
-	virtual bool Start();
-	virtual void Stop(); 
-
-	static bool isValid() {return true;}
-
-	virtual bool usesMixer() const {return true;}
-
-	virtual void Update();
-
-private:
-	virtual void SoundLoop();
-
-	bool PulseInit();
-	void PulseShutdown();
-	void Write(const void *data, size_t bytes);
-
-	std::vector<s16> mix_buffer;
-	std::thread thread;
-	volatile bool run_thread;
-
-	pa_simple* pa;
-#else
-public:
-	PulseAudio(CMixer *mixer) : SoundStream(mixer) {}
-#endif
-};
-
-#endif
diff --git a/Source/Core/AudioCommon/Src/SoundStream.h b/Source/Core/AudioCommon/Src/SoundStream.h
deleted file mode 100644
index 855a0cc4f0..0000000000
--- a/Source/Core/AudioCommon/Src/SoundStream.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SOUNDSTREAM_H_
-#define _SOUNDSTREAM_H_
-
-#include "Common.h"
-#include "Mixer.h"
-#include "WaveFile.h"
-
-class SoundStream
-{
-protected:
-
-	CMixer *m_mixer;
-	// We set this to shut down the sound thread.
-	// 0=keep playing, 1=stop playing NOW.
-	volatile int threadData;
-	bool m_logAudio;
-	WaveFileWriter g_wave_writer;
-	bool m_muted;
-
-public:   
- SoundStream(CMixer *mixer) : m_mixer(mixer), threadData(0), m_logAudio(false), m_muted(false) {}
-	virtual ~SoundStream() { delete m_mixer;}
-
-	static  bool isValid() { return false; }  
-	virtual CMixer *GetMixer() const { return m_mixer; }
-	virtual bool Start() { return false; }
-	virtual void SetVolume(int) {}
-	virtual void SoundLoop() {}
-	virtual void Stop() {}
-	virtual void Update() {}
-	virtual void Clear(bool mute) { m_muted = mute; }
-	bool IsMuted() { return m_muted; }
-	virtual void StartLogAudio(const char *filename) {
-		if (! m_logAudio) {
-			m_logAudio = true;
-			g_wave_writer.Start(filename, m_mixer->GetSampleRate());
-			g_wave_writer.SetSkipSilence(false);
-			NOTICE_LOG(DSPHLE, "Starting Audio logging");
-		} else {
-			WARN_LOG(DSPHLE, "Audio logging already started");
-		}
-	}
-
-	virtual void StopLogAudio() {
-		if (m_logAudio) {
-			m_logAudio = false;
-			g_wave_writer.Stop();
-			NOTICE_LOG(DSPHLE, "Stopping Audio logging");
-		} else {
-			WARN_LOG(DSPHLE, "Audio logging already stopped");
-		}
-	}
-};
-
-#endif // _SOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h
deleted file mode 100644
index 26f528aace..0000000000
--- a/Source/Core/AudioCommon/Src/WaveFile.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// ---------------------------------------------------------------------------------
-// Class: WaveFileWriter
-// Description: Simple utility class to make it easy to write long 16-bit stereo
-// audio streams to disk.
-// Use Start() to start recording to a file, and AddStereoSamples to add wave data.
-// The float variant will convert from -1.0-1.0 range and clamp.
-// Alternatively, AddSamplesBE for big endian wave data.
-// If Stop is not called when it destructs, the destructor will call Stop().
-// ---------------------------------------------------------------------------------
-
-#ifndef _WAVEFILE_H_
-#define _WAVEFILE_H_
-
-#include "FileUtil.h"
-
-class WaveFileWriter
-{
-	File::IOFile file;
-	bool skip_silence;
-	u32 audio_size;
-	short *conv_buffer;
-	void Write(u32 value);
-	void Write4(const char *ptr);
-
-	WaveFileWriter& operator=(const WaveFileWriter&)/* = delete*/;
-
-public:
-	WaveFileWriter();
-	~WaveFileWriter();
-
-	bool Start(const char *filename, unsigned int HLESampleRate);
-	void Stop();
-
-	void SetSkipSilence(bool skip) { skip_silence = skip; }
-
-	void AddStereoSamples(const short *sample_data, u32 count);
-	void AddStereoSamplesBE(const short *sample_data, u32 count);  // big endian
-	u32 GetAudioSize() { return audio_size; }
-};
-
-#endif  // _WAVEFILE_H_
diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp
deleted file mode 100644
index 59a826365c..0000000000
--- a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "AudioCommon.h"
-#include "XAudio2Stream.h"
-
-const int NUM_BUFFERS = 3;
-const int SAMPLES_PER_BUFFER = 96;
-
-const int NUM_CHANNELS = 2;
-const int BUFFER_SIZE = SAMPLES_PER_BUFFER * NUM_CHANNELS;
-const int BUFFER_SIZE_BYTES = BUFFER_SIZE * sizeof(s16);
-
-void StreamingVoiceContext::SubmitBuffer(PBYTE buf_data)
-{
-	XAUDIO2_BUFFER buf = {};
-	buf.AudioBytes = BUFFER_SIZE_BYTES;
-	buf.pContext = buf_data;
-	buf.pAudioData = buf_data;
-
-	m_source_voice->SubmitSourceBuffer(&buf);
-}
-
-StreamingVoiceContext::StreamingVoiceContext(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent)
-	: m_mixer(pMixer)
-	, m_sound_sync_event(pSyncEvent)
-	, xaudio_buffer(new BYTE[NUM_BUFFERS * BUFFER_SIZE_BYTES]())
-{
-	WAVEFORMATEXTENSIBLE wfx = {};
-
-	wfx.Format.wFormatTag		= WAVE_FORMAT_EXTENSIBLE;
-	wfx.Format.nSamplesPerSec	= m_mixer->GetSampleRate();
-	wfx.Format.nChannels		= 2;
-	wfx.Format.wBitsPerSample	= 16;
-	wfx.Format.nBlockAlign		= wfx.Format.nChannels*wfx.Format.wBitsPerSample / 8;
-	wfx.Format.nAvgBytesPerSec	= wfx.Format.nSamplesPerSec * wfx.Format.nBlockAlign;
-	wfx.Format.cbSize			= sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
-	wfx.Samples.wValidBitsPerSample = 16;
-	wfx.dwChannelMask			= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
-	wfx.SubFormat				= KSDATAFORMAT_SUBTYPE_PCM;
-
-	// create source voice
-	HRESULT hr;
-	if (FAILED(hr = pXAudio2->CreateSourceVoice(&m_source_voice, &wfx.Format, XAUDIO2_VOICE_NOSRC, 1.0f, this)))
-	{
-		PanicAlertT("XAudio2 CreateSourceVoice failed: %#X", hr);
-		return;
-	}
-
-	m_source_voice->Start();
-
-	// start buffers with silence
-	for (int i = 0; i != NUM_BUFFERS; ++i)
-		SubmitBuffer(xaudio_buffer.get() + (i * BUFFER_SIZE_BYTES));
-}
-
-StreamingVoiceContext::~StreamingVoiceContext()
-{
-	if (m_source_voice)
-	{
-		m_source_voice->Stop();
-		m_source_voice->DestroyVoice();
-	}
-}
-
-void StreamingVoiceContext::Stop()
-{
-	if (m_source_voice)
-		m_source_voice->Stop();
-}
-
-void StreamingVoiceContext::Play()
-{
-	if (m_source_voice)
-		m_source_voice->Start();
-}
-
-void StreamingVoiceContext::OnBufferEnd(void* context)
-{
-	//  buffer end callback; gets SAMPLES_PER_BUFFER samples for a new buffer
-
-	if (!m_source_voice || !context)
-		return;
-
-	//m_sound_sync_event->Wait(); // sync
-	//m_sound_sync_event->Spin(); // or tight sync
-
-	m_mixer->Mix(static_cast<short*>(context), SAMPLES_PER_BUFFER);
-	SubmitBuffer(static_cast<BYTE*>(context));
-}
-
-bool XAudio2::Start()
-{
-	HRESULT hr;
-
-	// callback doesn't seem to run on a specific cpu anyways
-	IXAudio2* xaudptr;
-	if (FAILED(hr = XAudio2Create(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR)))
-	{
-		PanicAlertT("XAudio2 init failed: %#X", hr);
-		Stop();
-		return false;
-	}
-	m_xaudio2 = std::unique_ptr<IXAudio2, Releaser>(xaudptr);
-
-	// XAudio2 master voice
-	// XAUDIO2_DEFAULT_CHANNELS instead of 2 for expansion?
-	if (FAILED(hr = m_xaudio2->CreateMasteringVoice(&m_mastering_voice, 2, m_mixer->GetSampleRate())))
-	{
-		PanicAlertT("XAudio2 master voice creation failed: %#X", hr);
-		Stop();
-		return false;
-	}
-
-	// Volume
-	m_mastering_voice->SetVolume(m_volume);
-
-	m_voice_context = std::unique_ptr<StreamingVoiceContext>
-		(new StreamingVoiceContext(m_xaudio2.get(), m_mixer, m_sound_sync_event));
-
-	return true;
-}
-
-void XAudio2::SetVolume(int volume)
-{
-	//linear 1- .01
-	m_volume = (float)volume / 100.f;
-
-	if (m_mastering_voice)
-		m_mastering_voice->SetVolume(m_volume);
-}
-
-void XAudio2::Update()
-{
-	//m_sound_sync_event.Set();
-
-	//static int xi = 0;
-	//if (100000 == ++xi)
-	//{
-	//	xi = 0;
-	//	XAUDIO2_PERFORMANCE_DATA perfData;
-	//	pXAudio2->GetPerformanceData(&perfData);
-	//	NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples);
-	//	NOTICE_LOG(DSPHLE, "XAudio2	total glitches: %i", perfData.GlitchesSinceEngineStarted);
-	//}
-}
-
-void XAudio2::Clear(bool mute)
-{
-	m_muted = mute;
-
-	if (m_voice_context)
-	{
-		if (m_muted)
-			m_voice_context->Stop();
-		else
-			m_voice_context->Play();
-	}
-}
-
-void XAudio2::Stop()
-{
-	//m_sound_sync_event.Set();
-
-	m_voice_context.reset();
-
-	if (m_mastering_voice)
-	{
-		m_mastering_voice->DestroyVoice();
-		m_mastering_voice = nullptr;
-	}
-
-	m_xaudio2.reset();	// release interface
-}
diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.h b/Source/Core/AudioCommon/Src/XAudio2Stream.h
deleted file mode 100644
index 4310a46435..0000000000
--- a/Source/Core/AudioCommon/Src/XAudio2Stream.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _XAUDIO2STREAM_H_
-#define _XAUDIO2STREAM_H_
-
-#include "SoundStream.h"
-
-#ifdef _WIN32
-#include "Thread.h"
-#include <xaudio2.h>
-#include <memory>
-
-struct StreamingVoiceContext : public IXAudio2VoiceCallback
-{
-private:
-	CMixer* const m_mixer;
-	Common::Event& m_sound_sync_event;
-	IXAudio2SourceVoice* m_source_voice;
-	std::unique_ptr<BYTE[]> xaudio_buffer;
-
-	void SubmitBuffer(PBYTE buf_data);
-
-public:
-	StreamingVoiceContext(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent);
-	
-	~StreamingVoiceContext();
-	
-	void StreamingVoiceContext::Stop();
-	void StreamingVoiceContext::Play();
-	
-	STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) {}
-	STDMETHOD_(void, OnVoiceProcessingPassStart) (UINT32) {}
-	STDMETHOD_(void, OnVoiceProcessingPassEnd) () {}
-	STDMETHOD_(void, OnBufferStart) (void*) {}
-	STDMETHOD_(void, OnLoopEnd) (void*) {}   
-	STDMETHOD_(void, OnStreamEnd) () {}
-
-	STDMETHOD_(void, OnBufferEnd) (void* context);
-};
-
-#endif
-
-class XAudio2 : public SoundStream
-{
-#ifdef _WIN32
-
-	class Releaser
-	{
-	public:
-		template <typename R>
-		void operator()(R* ptr)
-		{
-			ptr->Release();
-		}
-	};
-
-private:
-	std::unique_ptr<IXAudio2, Releaser> m_xaudio2;
-	std::unique_ptr<StreamingVoiceContext> m_voice_context;
-	IXAudio2MasteringVoice *m_mastering_voice;
-
-	Common::Event m_sound_sync_event;
-	float m_volume;
-
-	const bool m_cleanup_com;
-
-public:
-	XAudio2(CMixer *mixer) 
-		: SoundStream(mixer)
-		, m_mastering_voice(nullptr)
-		, m_volume(1.0f)
-		, m_cleanup_com(SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED)))
-	{}
-
-	virtual ~XAudio2()
-	{
-		Stop();
-		if (m_cleanup_com)
-			CoUninitialize();
-	}
- 
-	virtual bool Start();
-	virtual void Stop();
-
-	virtual void Update();
-	virtual void Clear(bool mute);
-	virtual void SetVolume(int volume);
-	virtual bool usesMixer() const { return true; }
-
-	static bool isValid() { return true; }
-
-#else
-
-public:
-	XAudio2(CMixer *mixer, void *hWnd = NULL)
-		: SoundStream(mixer)
-	{}
-#endif
-};
-
-#endif //_XAUDIO2STREAM_H_
diff --git a/Source/Core/AudioCommon/Src/aldlist.h b/Source/Core/AudioCommon/Src/aldlist.h
deleted file mode 100644
index 645b759660..0000000000
--- a/Source/Core/AudioCommon/Src/aldlist.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef ALDEVICELIST_H
-#define ALDEVICELIST_H
-
-#include "CommonTypes.h"
-#ifdef _WIN32
-#pragma warning(disable: 4786)  //disable warning "identifier was truncated to
-								//'255' characters in the browser information"
-#endif
-#include <vector>
-#include <string>
-
-using namespace std;
-
-typedef struct
-{
-	string			strDeviceName;
-	s32				iMajorVersion;
-	s32				iMinorVersion;
-	u32	uiSourceCount;
-	vector<string>	*pvstrExtensions;
-	bool			bSelected;
-} ALDEVICEINFO, *LPALDEVICEINFO;
-
-class ALDeviceList
-{
-private:
-	vector<ALDEVICEINFO> vDeviceInfo;
-	s32 defaultDeviceIndex;
-	s32 filterIndex;
-
-public:
-	ALDeviceList ();
-	~ALDeviceList ();
-	s32 GetNumDevices();
-	char *GetDeviceName(s32 index);
-	void GetDeviceVersion(s32 index, s32 *major, s32 *minor);
-	u32 GetMaxNumSources(s32 index);
-	bool IsExtensionSupported(s32 index, char *szExtName);
-	s32 GetDefaultDevice();
-	void FilterDevicesMinVer(s32 major, s32 minor);
-	void FilterDevicesMaxVer(s32 major, s32 minor);
-	void FilterDevicesExtension(char *szExtName);
-	void ResetFilters();
-	s32 GetFirstFilteredDevice();
-	s32 GetNextFilteredDevice();
-
-private:
-	u32 GetMaxNumSources();
-};
-
-#endif // ALDEVICELIST_H
diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp
similarity index 76%
rename from Source/Core/AudioCommon/Src/WaveFile.cpp
rename to Source/Core/AudioCommon/WaveFile.cpp
index 7eabbb3b48..cdc109058c 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.cpp
+++ b/Source/Core/AudioCommon/WaveFile.cpp
@@ -1,27 +1,29 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "WaveFile.h"
-#include "../../Core/Src/ConfigManager.h"
+#include <string>
 
-enum {BUF_SIZE = 32*1024};
+#include "AudioCommon/WaveFile.h"
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+
+enum { BUF_SIZE = 32*1024 };
 
 WaveFileWriter::WaveFileWriter():
 	skip_silence(false),
 	audio_size(0),
-	conv_buffer(NULL)
+	conv_buffer(nullptr)
 {
 }
 
 WaveFileWriter::~WaveFileWriter()
 {
-	delete [] conv_buffer;
+	delete[] conv_buffer;
 	Stop();
 }
 
-bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
+bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRate)
 {
 	if (!conv_buffer)
 		conv_buffer = new short[BUF_SIZE];
@@ -29,14 +31,14 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
 	// Check if the file is already open
 	if (file)
 	{
-		PanicAlertT("The file %s was already open, the file header will not be written.", filename);
+		PanicAlertT("The file %s was already open, the file header will not be written.", filename.c_str());
 		return false;
 	}
 
 	file.Open(filename, "wb");
 	if (!file)
 	{
-		PanicAlertT("The file %s could not be opened for writing. Please check if it's already opened by another program.", filename);
+		PanicAlertT("The file %s could not be opened for writing. Please check if it's already opened by another program.", filename.c_str());
 		return false;
 	}
 
@@ -121,7 +123,7 @@ void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count)
 	if (count > BUF_SIZE * 2)
 		PanicAlert("WaveFileWriter - buffer too small (count = %u).", count);
 
-	if (skip_silence) 
+	if (skip_silence)
 	{
 		bool all_zero = true;
 
@@ -135,8 +137,12 @@ void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count)
 			return;
 	}
 
-	for (u32 i = 0; i < count * 2; i++)
-		conv_buffer[i] = Common::swap16((u16)sample_data[i]);
+	for (u32 i = 0; i < count; i++)
+	{
+		//Flip the audio channels from RL to LR
+		conv_buffer[2 * i] = Common::swap16((u16)sample_data[2 * i + 1]);
+		conv_buffer[2 * i + 1] = Common::swap16((u16)sample_data[2 * i]);
+	}
 
 	file.WriteBytes(conv_buffer, count * 4);
 	audio_size += count * 4;
diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h
new file mode 100644
index 0000000000..02ed48ced7
--- /dev/null
+++ b/Source/Core/AudioCommon/WaveFile.h
@@ -0,0 +1,43 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// ---------------------------------------------------------------------------------
+// Class: WaveFileWriter
+// Description: Simple utility class to make it easy to write long 16-bit stereo
+// audio streams to disk.
+// Use Start() to start recording to a file, and AddStereoSamples to add wave data.
+// The float variant will convert from -1.0-1.0 range and clamp.
+// Alternatively, AddSamplesBE for big endian wave data.
+// If Stop is not called when it destructs, the destructor will call Stop().
+// ---------------------------------------------------------------------------------
+
+#pragma once
+
+#include <string>
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+class WaveFileWriter : NonCopyable
+{
+public:
+	WaveFileWriter();
+	~WaveFileWriter();
+
+	bool Start(const std::string& filename, unsigned int HLESampleRate);
+	void Stop();
+
+	void SetSkipSilence(bool skip) { skip_silence = skip; }
+
+	void AddStereoSamples(const short *sample_data, u32 count);
+	void AddStereoSamplesBE(const short *sample_data, u32 count);  // big endian
+	u32 GetAudioSize() const { return audio_size; }
+
+private:
+	File::IOFile file;
+	bool skip_silence;
+	u32 audio_size;
+	short* conv_buffer;
+	void Write(u32 value);
+	void Write4(const char* ptr);
+};
diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp
new file mode 100644
index 0000000000..6e8762b4e9
--- /dev/null
+++ b/Source/Core/AudioCommon/XAudio2Stream.cpp
@@ -0,0 +1,261 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <xaudio2.h>
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/XAudio2Stream.h"
+#include "Common/Event.h"
+
+#ifndef XAUDIO2_DLL
+#error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path.
+#endif
+
+struct StreamingVoiceContext : public IXAudio2VoiceCallback
+{
+private:
+	CMixer* const m_mixer;
+	Common::Event& m_sound_sync_event;
+	IXAudio2SourceVoice* m_source_voice;
+	std::unique_ptr<BYTE[]> xaudio_buffer;
+
+	void SubmitBuffer(PBYTE buf_data);
+
+public:
+	StreamingVoiceContext(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent);
+
+	~StreamingVoiceContext();
+
+	void StreamingVoiceContext::Stop();
+	void StreamingVoiceContext::Play();
+
+	STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) {}
+	STDMETHOD_(void, OnVoiceProcessingPassStart) (UINT32) {}
+	STDMETHOD_(void, OnVoiceProcessingPassEnd) () {}
+	STDMETHOD_(void, OnBufferStart) (void*) {}
+	STDMETHOD_(void, OnLoopEnd) (void*) {}
+	STDMETHOD_(void, OnStreamEnd) () {}
+
+	STDMETHOD_(void, OnBufferEnd) (void* context);
+};
+
+const int NUM_BUFFERS = 3;
+const int SAMPLES_PER_BUFFER = 96;
+
+const int NUM_CHANNELS = 2;
+const int BUFFER_SIZE = SAMPLES_PER_BUFFER * NUM_CHANNELS;
+const int BUFFER_SIZE_BYTES = BUFFER_SIZE * sizeof(s16);
+
+void StreamingVoiceContext::SubmitBuffer(PBYTE buf_data)
+{
+	XAUDIO2_BUFFER buf = {};
+	buf.AudioBytes = BUFFER_SIZE_BYTES;
+	buf.pContext = buf_data;
+	buf.pAudioData = buf_data;
+
+	m_source_voice->SubmitSourceBuffer(&buf);
+}
+
+StreamingVoiceContext::StreamingVoiceContext(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent)
+	: m_mixer(pMixer)
+	, m_sound_sync_event(pSyncEvent)
+	, xaudio_buffer(new BYTE[NUM_BUFFERS * BUFFER_SIZE_BYTES]())
+{
+	WAVEFORMATEXTENSIBLE wfx = {};
+
+	wfx.Format.wFormatTag       = WAVE_FORMAT_EXTENSIBLE;
+	wfx.Format.nSamplesPerSec   = m_mixer->GetSampleRate();
+	wfx.Format.nChannels        = 2;
+	wfx.Format.wBitsPerSample   = 16;
+	wfx.Format.nBlockAlign      = wfx.Format.nChannels*wfx.Format.wBitsPerSample / 8;
+	wfx.Format.nAvgBytesPerSec  = wfx.Format.nSamplesPerSec * wfx.Format.nBlockAlign;
+	wfx.Format.cbSize           = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
+	wfx.Samples.wValidBitsPerSample = 16;
+	wfx.dwChannelMask           = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+	wfx.SubFormat               = KSDATAFORMAT_SUBTYPE_PCM;
+
+	// create source voice
+	HRESULT hr;
+	if (FAILED(hr = pXAudio2->CreateSourceVoice(&m_source_voice, &wfx.Format, XAUDIO2_VOICE_NOSRC, 1.0f, this)))
+	{
+		PanicAlert("XAudio2 CreateSourceVoice failed: %#X", hr);
+		return;
+	}
+
+	m_source_voice->Start();
+
+	// start buffers with silence
+	for (int i = 0; i != NUM_BUFFERS; ++i)
+		SubmitBuffer(xaudio_buffer.get() + (i * BUFFER_SIZE_BYTES));
+}
+
+StreamingVoiceContext::~StreamingVoiceContext()
+{
+	if (m_source_voice)
+	{
+		m_source_voice->Stop();
+		m_source_voice->DestroyVoice();
+	}
+}
+
+void StreamingVoiceContext::Stop()
+{
+	if (m_source_voice)
+		m_source_voice->Stop();
+}
+
+void StreamingVoiceContext::Play()
+{
+	if (m_source_voice)
+		m_source_voice->Start();
+}
+
+void StreamingVoiceContext::OnBufferEnd(void* context)
+{
+	//  buffer end callback; gets SAMPLES_PER_BUFFER samples for a new buffer
+
+	if (!m_source_voice || !context)
+		return;
+
+	//m_sound_sync_event->Wait(); // sync
+	//m_sound_sync_event->Spin(); // or tight sync
+
+	m_mixer->Mix(static_cast<short*>(context), SAMPLES_PER_BUFFER);
+	SubmitBuffer(static_cast<BYTE*>(context));
+}
+
+HMODULE XAudio2::m_xaudio2_dll = nullptr;
+typedef decltype(&XAudio2Create) XAudio2Create_t;
+void *XAudio2::PXAudio2Create = nullptr;
+
+bool XAudio2::InitLibrary()
+{
+	if (m_xaudio2_dll)
+	{
+		return true;
+	}
+
+	m_xaudio2_dll = ::LoadLibrary(XAUDIO2_DLL);
+	if (!m_xaudio2_dll)
+	{
+		return false;
+	}
+
+	if (!PXAudio2Create)
+	{
+		PXAudio2Create = (XAudio2Create_t)::GetProcAddress(m_xaudio2_dll, "XAudio2Create");
+		if (!PXAudio2Create)
+		{
+			::FreeLibrary(m_xaudio2_dll);
+			m_xaudio2_dll = nullptr;
+			return false;
+		}
+	}
+
+	return true;
+}
+
+XAudio2::XAudio2()
+	: m_mastering_voice(nullptr)
+	, m_volume(1.0f)
+	, m_cleanup_com(SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED)))
+{
+}
+
+XAudio2::~XAudio2()
+{
+	Stop();
+	if (m_cleanup_com)
+		CoUninitialize();
+}
+
+bool XAudio2::Start()
+{
+	HRESULT hr;
+
+	// callback doesn't seem to run on a specific CPU anyways
+	IXAudio2* xaudptr;
+	if (FAILED(hr = ((XAudio2Create_t)PXAudio2Create)(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR)))
+	{
+		PanicAlert("XAudio2 init failed: %#X", hr);
+		Stop();
+		return false;
+	}
+	m_xaudio2 = std::unique_ptr<IXAudio2, Releaser>(xaudptr);
+
+	// XAudio2 master voice
+	// XAUDIO2_DEFAULT_CHANNELS instead of 2 for expansion?
+	if (FAILED(hr = m_xaudio2->CreateMasteringVoice(&m_mastering_voice, 2, m_mixer->GetSampleRate())))
+	{
+		PanicAlert("XAudio2 master voice creation failed: %#X", hr);
+		Stop();
+		return false;
+	}
+
+	// Volume
+	m_mastering_voice->SetVolume(m_volume);
+
+	m_voice_context = std::unique_ptr<StreamingVoiceContext>
+		(new StreamingVoiceContext(m_xaudio2.get(), m_mixer.get(), m_sound_sync_event));
+
+	return true;
+}
+
+void XAudio2::SetVolume(int volume)
+{
+	//linear 1- .01
+	m_volume = (float)volume / 100.f;
+
+	if (m_mastering_voice)
+		m_mastering_voice->SetVolume(m_volume);
+}
+
+void XAudio2::Update()
+{
+	//m_sound_sync_event.Set();
+
+	//static int xi = 0;
+	//if (100000 == ++xi)
+	//{
+	//    xi = 0;
+	//    XAUDIO2_PERFORMANCE_DATA perfData;
+	//    pXAudio2->GetPerformanceData(&perfData);
+	//    NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples);
+	//    NOTICE_LOG(DSPHLE, "XAudio2 total glitches: %i", perfData.GlitchesSinceEngineStarted);
+	//}
+}
+
+void XAudio2::Clear(bool mute)
+{
+	m_muted = mute;
+
+	if (m_voice_context)
+	{
+		if (m_muted)
+			m_voice_context->Stop();
+		else
+			m_voice_context->Play();
+	}
+}
+
+void XAudio2::Stop()
+{
+	//m_sound_sync_event.Set();
+
+	m_voice_context.reset();
+
+	if (m_mastering_voice)
+	{
+		m_mastering_voice->DestroyVoice();
+		m_mastering_voice = nullptr;
+	}
+
+	m_xaudio2.reset(); // release interface
+
+	if (m_xaudio2_dll)
+	{
+		::FreeLibrary(m_xaudio2_dll);
+		m_xaudio2_dll = nullptr;
+		PXAudio2Create = nullptr;
+	}
+}
diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h
new file mode 100644
index 0000000000..5db92ef907
--- /dev/null
+++ b/Source/Core/AudioCommon/XAudio2Stream.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This audio backend uses XAudio2 via XAUDIO2_DLL
+// It works on Windows 8+, where it is included as an OS component.
+// This backend is always compiled, but only available if running on Win8+
+
+#pragma once
+
+#include <memory>
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
+
+#ifdef _WIN32
+
+struct StreamingVoiceContext;
+struct IXAudio2;
+struct IXAudio2MasteringVoice;
+
+#endif
+
+class XAudio2 final : public SoundStream
+{
+#ifdef _WIN32
+
+private:
+	class Releaser
+	{
+	public:
+		template <typename R>
+		void operator()(R* ptr)
+		{
+			ptr->Release();
+		}
+	};
+
+	std::unique_ptr<IXAudio2, Releaser> m_xaudio2;
+	std::unique_ptr<StreamingVoiceContext> m_voice_context;
+	IXAudio2MasteringVoice *m_mastering_voice;
+
+	Common::Event m_sound_sync_event;
+	float m_volume;
+
+	const bool m_cleanup_com;
+
+	static HMODULE m_xaudio2_dll;
+	static void *PXAudio2Create;
+
+	static bool InitLibrary();
+
+public:
+	XAudio2();
+	virtual ~XAudio2();
+
+	bool Start() override;
+	void Stop() override;
+
+	void Update() override;
+	void Clear(bool mute) override;
+	void SetVolume(int volume) override;
+
+	static bool isValid() { return InitLibrary(); }
+#endif
+};
diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
new file mode 100644
index 0000000000..853bc2289e
--- /dev/null
+++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
@@ -0,0 +1,248 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Note that this file *and this file only* must include XAudio2.h from the old
+// DXSDK instead of other possible places.
+
+#include <XAudio2_7/XAudio2.h>
+
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/XAudio2_7Stream.h"
+#include "Common/Event.h"
+
+struct StreamingVoiceContext2_7 : public IXAudio2VoiceCallback
+{
+private:
+	CMixer* const m_mixer;
+	Common::Event& m_sound_sync_event;
+	IXAudio2SourceVoice* m_source_voice;
+	std::unique_ptr<BYTE[]> xaudio_buffer;
+
+	void SubmitBuffer(PBYTE buf_data);
+
+public:
+	StreamingVoiceContext2_7(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent);
+
+	~StreamingVoiceContext2_7();
+
+	void StreamingVoiceContext2_7::Stop();
+	void StreamingVoiceContext2_7::Play();
+
+	STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) {}
+	STDMETHOD_(void, OnVoiceProcessingPassStart) (UINT32) {}
+	STDMETHOD_(void, OnVoiceProcessingPassEnd) () {}
+	STDMETHOD_(void, OnBufferStart) (void*) {}
+	STDMETHOD_(void, OnLoopEnd) (void*) {}
+	STDMETHOD_(void, OnStreamEnd) () {}
+
+	STDMETHOD_(void, OnBufferEnd) (void* context);
+};
+
+const int NUM_BUFFERS = 3;
+const int SAMPLES_PER_BUFFER = 96;
+
+const int NUM_CHANNELS = 2;
+const int BUFFER_SIZE = SAMPLES_PER_BUFFER * NUM_CHANNELS;
+const int BUFFER_SIZE_BYTES = BUFFER_SIZE * sizeof(s16);
+
+void StreamingVoiceContext2_7::SubmitBuffer(PBYTE buf_data)
+{
+	XAUDIO2_BUFFER buf = {};
+	buf.AudioBytes = BUFFER_SIZE_BYTES;
+	buf.pContext = buf_data;
+	buf.pAudioData = buf_data;
+
+	m_source_voice->SubmitSourceBuffer(&buf);
+}
+
+StreamingVoiceContext2_7::StreamingVoiceContext2_7(IXAudio2 *pXAudio2, CMixer *pMixer, Common::Event& pSyncEvent)
+	: m_mixer(pMixer)
+	, m_sound_sync_event(pSyncEvent)
+	, xaudio_buffer(new BYTE[NUM_BUFFERS * BUFFER_SIZE_BYTES]())
+{
+	WAVEFORMATEXTENSIBLE wfx = {};
+
+	wfx.Format.wFormatTag      = WAVE_FORMAT_EXTENSIBLE;
+	wfx.Format.nSamplesPerSec  = m_mixer->GetSampleRate();
+	wfx.Format.nChannels       = 2;
+	wfx.Format.wBitsPerSample  = 16;
+	wfx.Format.nBlockAlign     = wfx.Format.nChannels*wfx.Format.wBitsPerSample / 8;
+	wfx.Format.nAvgBytesPerSec = wfx.Format.nSamplesPerSec * wfx.Format.nBlockAlign;
+	wfx.Format.cbSize          = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
+	wfx.Samples.wValidBitsPerSample = 16;
+	wfx.dwChannelMask          = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+	wfx.SubFormat              = KSDATAFORMAT_SUBTYPE_PCM;
+
+	// create source voice
+	HRESULT hr;
+	if (FAILED(hr = pXAudio2->CreateSourceVoice(&m_source_voice, &wfx.Format, XAUDIO2_VOICE_NOSRC, 1.0f, this)))
+	{
+		PanicAlert("XAudio2_7 CreateSourceVoice failed: %#X", hr);
+		return;
+	}
+
+	m_source_voice->Start();
+
+	// start buffers with silence
+	for (int i = 0; i != NUM_BUFFERS; ++i)
+		SubmitBuffer(xaudio_buffer.get() + (i * BUFFER_SIZE_BYTES));
+}
+
+StreamingVoiceContext2_7::~StreamingVoiceContext2_7()
+{
+	if (m_source_voice)
+	{
+		m_source_voice->Stop();
+		m_source_voice->DestroyVoice();
+	}
+}
+
+void StreamingVoiceContext2_7::Stop()
+{
+	if (m_source_voice)
+		m_source_voice->Stop();
+}
+
+void StreamingVoiceContext2_7::Play()
+{
+	if (m_source_voice)
+		m_source_voice->Start();
+}
+
+void StreamingVoiceContext2_7::OnBufferEnd(void* context)
+{
+	//  buffer end callback; gets SAMPLES_PER_BUFFER samples for a new buffer
+
+	if (!m_source_voice || !context)
+		return;
+
+	//m_sound_sync_event->Wait(); // sync
+	//m_sound_sync_event->Spin(); // or tight sync
+
+	m_mixer->Mix(static_cast<short*>(context), SAMPLES_PER_BUFFER);
+	SubmitBuffer(static_cast<BYTE*>(context));
+}
+
+HMODULE XAudio2_7::m_xaudio2_dll = nullptr;
+
+void XAudio2_7::ReleaseIXAudio2(IXAudio2* ptr)
+{
+	ptr->Release();
+}
+
+bool XAudio2_7::InitLibrary()
+{
+	if (m_xaudio2_dll)
+	{
+		return true;
+	}
+
+	m_xaudio2_dll = ::LoadLibrary(TEXT("xaudio2_7.dll"));
+
+	return m_xaudio2_dll != nullptr;
+}
+
+XAudio2_7::XAudio2_7()
+	: m_mastering_voice(nullptr)
+	, m_volume(1.0f)
+	, m_cleanup_com(SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED)))
+{
+}
+
+XAudio2_7::~XAudio2_7()
+{
+	Stop();
+	if (m_cleanup_com)
+		CoUninitialize();
+}
+
+bool XAudio2_7::Start()
+{
+	HRESULT hr;
+
+	// callback doesn't seem to run on a specific CPU anyways
+	IXAudio2* xaudptr;
+	if (FAILED(hr = XAudio2Create(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR)))
+	{
+		PanicAlert("XAudio2_7 init failed: %#X", hr);
+		Stop();
+		return false;
+	}
+	m_xaudio2 = std::unique_ptr<IXAudio2, Releaser>(xaudptr);
+
+	// XAudio2 master voice
+	// XAUDIO2_DEFAULT_CHANNELS instead of 2 for expansion?
+	if (FAILED(hr = m_xaudio2->CreateMasteringVoice(&m_mastering_voice, 2, m_mixer->GetSampleRate())))
+	{
+		PanicAlert("XAudio2_7 master voice creation failed: %#X", hr);
+		Stop();
+		return false;
+	}
+
+	// Volume
+	m_mastering_voice->SetVolume(m_volume);
+
+	m_voice_context = std::unique_ptr<StreamingVoiceContext2_7>
+		(new StreamingVoiceContext2_7(m_xaudio2.get(), m_mixer.get(), m_sound_sync_event));
+
+	return true;
+}
+
+void XAudio2_7::SetVolume(int volume)
+{
+	//linear 1- .01
+	m_volume = (float)volume / 100.f;
+
+	if (m_mastering_voice)
+		m_mastering_voice->SetVolume(m_volume);
+}
+
+void XAudio2_7::Update()
+{
+	//m_sound_sync_event.Set();
+
+	//static int xi = 0;
+	//if (100000 == ++xi)
+	//{
+	//    xi = 0;
+	//    XAUDIO2_PERFORMANCE_DATA perfData;
+	//    pXAudio2->GetPerformanceData(&perfData);
+	//    NOTICE_LOG(DSPHLE, "XAudio2_7 latency (samples): %i", perfData.CurrentLatencyInSamples);
+	//    NOTICE_LOG(DSPHLE, "XAudio2_7 total glitches: %i", perfData.GlitchesSinceEngineStarted);
+	//}
+}
+
+void XAudio2_7::Clear(bool mute)
+{
+	m_muted = mute;
+
+	if (m_voice_context)
+	{
+		if (m_muted)
+			m_voice_context->Stop();
+		else
+			m_voice_context->Play();
+	}
+}
+
+void XAudio2_7::Stop()
+{
+	//m_sound_sync_event.Set();
+
+	m_voice_context.reset();
+
+	if (m_mastering_voice)
+	{
+		m_mastering_voice->DestroyVoice();
+		m_mastering_voice = nullptr;
+	}
+
+	m_xaudio2.reset(); // release interface
+
+	if (m_xaudio2_dll)
+	{
+		::FreeLibrary(m_xaudio2_dll);
+		m_xaudio2_dll = nullptr;
+	}
+}
diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h
new file mode 100644
index 0000000000..e1eccbdbdf
--- /dev/null
+++ b/Source/Core/AudioCommon/XAudio2_7Stream.h
@@ -0,0 +1,73 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This audio backend uses XAudio2 via XAudio2_7.dll
+// This version of the library is included in the June 2010 DirectX SDK and
+// works on all versions of Windows, however the SDK and/or redist must be
+// separately installed.
+// Therefore this backend is available iff:
+//  * SDK is available at compile-time
+//  * runtime dll is available at runtime
+// Dolphin ships the relevant SDK headers in Externals, so it's always available.
+
+#pragma once
+
+#include <memory>
+#include "AudioCommon/SoundStream.h"
+#include "Common/Event.h"
+
+#ifdef _WIN32
+
+#include <Windows.h>
+
+struct StreamingVoiceContext2_7;
+struct IXAudio2;
+struct IXAudio2MasteringVoice;
+
+#endif
+
+class XAudio2_7 final : public SoundStream
+{
+#ifdef _WIN32
+
+private:
+	static void ReleaseIXAudio2(IXAudio2 *ptr);
+
+	class Releaser
+	{
+	public:
+		template <typename R>
+		void operator()(R *ptr)
+		{
+			ReleaseIXAudio2(ptr);
+		}
+	};
+
+	std::unique_ptr<IXAudio2, Releaser> m_xaudio2;
+	std::unique_ptr<StreamingVoiceContext2_7> m_voice_context;
+	IXAudio2MasteringVoice *m_mastering_voice;
+
+	Common::Event m_sound_sync_event;
+	float m_volume;
+
+	const bool m_cleanup_com;
+
+	static HMODULE m_xaudio2_dll;
+
+	static bool InitLibrary();
+
+public:
+	XAudio2_7();
+	virtual ~XAudio2_7();
+
+	bool Start() override;
+	void Stop() override;
+
+	void Update() override;
+	void Clear(bool mute) override;
+	void SetVolume(int volume) override;
+
+	static bool isValid() { return InitLibrary(); }
+#endif
+};
diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp
similarity index 76%
rename from Source/Core/AudioCommon/Src/aldlist.cpp
rename to Source/Core/AudioCommon/aldlist.cpp
index fa11fe3282..e5fe5f2cb4 100644
--- a/Source/Core/AudioCommon/Src/aldlist.cpp
+++ b/Source/Core/AudioCommon/aldlist.cpp
@@ -1,17 +1,21 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 /*
  * Copyright (c) 2006, Creative Labs Inc.
  * 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.
  *     * Neither the name of Creative Labs Inc. nor the names of its contributors 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
@@ -22,11 +26,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Common.h"
-#include "aldlist.h"
+#include "AudioCommon/aldlist.h"
+#include "Common/Common.h"
 #ifdef _WIN32
-#include "../../../../Externals/OpenAL/include/al.h"
-#include "../../../../Externals/OpenAL/include/alc.h"
+#include "../../../Externals/OpenAL/include/al.h"
+#include "../../../Externals/OpenAL/include/alc.h"
 #elif defined(__APPLE__)
 #include <al.h>
 #include <alc.h>
@@ -36,16 +40,12 @@
 #endif
 
 
-/* 
+/*
  * Init call
  */
 ALDeviceList::ALDeviceList()
 {
-	ALDEVICEINFO	ALDeviceInfo;
-	char *devices;
-	s32 index;
-	const char *defaultDeviceName = NULL;
-	const char *actualDeviceName = NULL;
+	ALDEVICEINFO ALDeviceInfo;
 
 	// DeviceInfo vector stores, for each enumerated device, it's device name, selection status, spec version #, and extension support
 	vDeviceInfo.clear();
@@ -54,44 +54,43 @@ ALDeviceList::ALDeviceList()
 	defaultDeviceIndex = 0;
 
 	// grab function pointers for 1.0-API functions, and if successful proceed to enumerate all devices
-	//if (LoadOAL10Library(NULL, &ALFunction) == TRUE) {
-		if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+	//if (LoadOAL10Library(nullptr, &ALFunction) == TRUE) {
+		if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT"))
 		{
-			devices = (char *)alcGetString(NULL, ALC_DEVICE_SPECIFIER);
-			defaultDeviceName = (char *)alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-			index = 0;
-			// go through device list (each device terminated with a single NULL, list terminated with double NULL)
-			while (devices != NULL && strlen(devices) > 0) 
+			const char *devices = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
+			const char *defaultDeviceName = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER);
+			// go through device list (each device terminated with a single nullptr, list terminated with double nullptr)
+			for (s32 index = 0; devices != nullptr && strlen(devices) > 0; index++, devices += strlen(devices) + 1)
 			{
-				if (strcmp(defaultDeviceName, devices) == 0) 
+				if (strcmp(defaultDeviceName, devices) == 0)
 				{
 					defaultDeviceIndex = index;
 				}
 				ALCdevice *device = alcOpenDevice(devices);
-				if (device) 
+				if (device)
 				{
-					ALCcontext *context = alcCreateContext(device, NULL);
-					if (context) 
+					ALCcontext *context = alcCreateContext(device, nullptr);
+					if (context)
 					{
 						alcMakeContextCurrent(context);
 						// if new actual device name isn't already in the list, then add it...
-						actualDeviceName = alcGetString(device, ALC_DEVICE_SPECIFIER);
+						const char *actualDeviceName = alcGetString(device, ALC_DEVICE_SPECIFIER);
 						bool bNewName = true;
-						for (s32 i = 0; i < GetNumDevices(); i++) 
+						for (s32 i = 0; i < GetNumDevices(); i++)
 						{
-							if (strcmp(GetDeviceName(i), actualDeviceName) == 0) 
+							if (strcmp(GetDeviceName(i), actualDeviceName) == 0)
 							{
 								bNewName = false;
 							}
 						}
-						if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) 
+						if ((bNewName) && (actualDeviceName != nullptr) && (strlen(actualDeviceName) > 0))
 						{
 							ALDeviceInfo.bSelected = true;
 							ALDeviceInfo.strDeviceName = actualDeviceName;
 							alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(s32), &ALDeviceInfo.iMajorVersion);
 							alcGetIntegerv(device, ALC_MINOR_VERSION, sizeof(s32), &ALDeviceInfo.iMinorVersion);
 
-							ALDeviceInfo.pvstrExtensions = new vector<string>;
+							ALDeviceInfo.pvstrExtensions = new std::vector<std::string>;
 
 							// Check for ALC Extensions
 							if (alcIsExtensionPresent(device, "ALC_EXT_CAPTURE") == AL_TRUE)
@@ -107,7 +106,7 @@ ALDeviceList::ALDeviceList()
 								ALDeviceInfo.pvstrExtensions->push_back("AL_EXT_LINEAR_DISTANCE");
 							if (alIsExtensionPresent("AL_EXT_EXPONENT_DISTANCE") == AL_TRUE)
 								ALDeviceInfo.pvstrExtensions->push_back("AL_EXT_EXPONENT_DISTANCE");
-							
+
 							if (alIsExtensionPresent("EAX2.0") == AL_TRUE)
 								ALDeviceInfo.pvstrExtensions->push_back("EAX2.0");
 							if (alIsExtensionPresent("EAX3.0") == AL_TRUE)
@@ -125,13 +124,11 @@ ALDeviceList::ALDeviceList()
 
 							vDeviceInfo.push_back(ALDeviceInfo);
 						}
-						alcMakeContextCurrent(NULL);
+						alcMakeContextCurrent(nullptr);
 						alcDestroyContext(context);
 					}
 					alcCloseDevice(device);
 				}
-				devices += strlen(devices) + 1;
-				index += 1;
 			}
 		}
 	//}
@@ -139,15 +136,17 @@ ALDeviceList::ALDeviceList()
 	ResetFilters();
 }
 
-/* 
+/*
  * Exit call
  */
 ALDeviceList::~ALDeviceList()
 {
-	for (u32 i = 0; i < vDeviceInfo.size(); i++) {
-		if (vDeviceInfo[i].pvstrExtensions) {
-			vDeviceInfo[i].pvstrExtensions->clear();
-			delete vDeviceInfo[i].pvstrExtensions;
+	for (auto& di : vDeviceInfo)
+	{
+		if (di.pvstrExtensions)
+		{
+			di.pvstrExtensions->clear();
+			delete di.pvstrExtensions;
 		}
 	}
 
@@ -159,10 +158,10 @@ ALDeviceList::~ALDeviceList()
  */
 s32 ALDeviceList::GetNumDevices()
 {
-	return (s32)vDeviceInfo.size();	
+	return (s32)vDeviceInfo.size();
 }
 
-/* 
+/*
  * Returns the device name at an index in the complete device list
  */
 char * ALDeviceList::GetDeviceName(s32 index)
@@ -170,7 +169,7 @@ char * ALDeviceList::GetDeviceName(s32 index)
 	if (index < GetNumDevices())
 		return (char *)vDeviceInfo[index].strDeviceName.c_str();
 	else
-		return NULL;
+		return nullptr;
 }
 
 /*
@@ -178,13 +177,13 @@ char * ALDeviceList::GetDeviceName(s32 index)
  */
 void ALDeviceList::GetDeviceVersion(s32 index, s32 *major, s32 *minor)
 {
-	if (index < GetNumDevices()) {
+	if (index < GetNumDevices())
+	{
 		if (major)
 			*major = vDeviceInfo[index].iMajorVersion;
 		if (minor)
 			*minor = vDeviceInfo[index].iMinorVersion;
 	}
-	return;
 }
 
 /*
@@ -205,12 +204,15 @@ bool ALDeviceList::IsExtensionSupported(s32 index, char *szExtName)
 {
 	bool bReturn = false;
 
-	if (index < GetNumDevices()) {
-		for (u32 i = 0; i < vDeviceInfo[index].pvstrExtensions->size(); i++) {
-			if (!strcasecmp(vDeviceInfo[index].pvstrExtensions->at(i).c_str(), szExtName)) {
+	if (index < GetNumDevices())
+	{
+		for (auto& ext : *vDeviceInfo[index].pvstrExtensions)
+		{
+			if (!strcasecmp(ext.c_str(), szExtName))
+			{
 				bReturn = true;
 				break;
-			}				
+			}
 		}
 	}
 
@@ -225,29 +227,33 @@ s32 ALDeviceList::GetDefaultDevice()
 	return defaultDeviceIndex;
 }
 
-/* 
+/*
  * Deselects devices which don't have the specified minimum version
  */
 void ALDeviceList::FilterDevicesMinVer(s32 major, s32 minor)
 {
 	s32 dMajor = 0, dMinor = 0;
-	for (u32 i = 0; i < vDeviceInfo.size(); i++) {
+	for (u32 i = 0; i < vDeviceInfo.size(); i++)
+	{
 		GetDeviceVersion(i, &dMajor, &dMinor);
-		if ((dMajor < major) || ((dMajor == major) && (dMinor < minor))) {
+		if ((dMajor < major) || ((dMajor == major) && (dMinor < minor)))
+		{
 			vDeviceInfo[i].bSelected = false;
 		}
 	}
 }
 
-/* 
+/*
  * Deselects devices which don't have the specified maximum version
  */
 void ALDeviceList::FilterDevicesMaxVer(s32 major, s32 minor)
 {
 	s32 dMajor = 0, dMinor = 0;
-	for (u32 i = 0; i < vDeviceInfo.size(); i++) {
+	for (u32 i = 0; i < vDeviceInfo.size(); i++)
+	{
 		GetDeviceVersion(i, &dMajor, &dMinor);
-		if ((dMajor > major) || ((dMajor == major) && (dMinor > minor))) {
+		if ((dMajor > major) || ((dMajor == major) && (dMinor > minor)))
+		{
 			vDeviceInfo[i].bSelected = false;
 		}
 	}
@@ -260,16 +266,20 @@ void ALDeviceList::FilterDevicesExtension(char *szExtName)
 {
 	bool bFound;
 
-	for (u32 i = 0; i < vDeviceInfo.size(); i++) {
+	for (auto& di : vDeviceInfo)
+	{
 		bFound = false;
-		for (u32 j = 0; j < vDeviceInfo[i].pvstrExtensions->size(); j++) {
-			if (!strcasecmp(vDeviceInfo[i].pvstrExtensions->at(j).c_str(), szExtName)) {
+		for (auto& ext : *di.pvstrExtensions)
+		{
+			if (!strcasecmp(ext.c_str(), szExtName))
+			{
 				bFound = true;
 				break;
 			}
 		}
+
 		if (!bFound)
-			vDeviceInfo[i].bSelected = false;
+			di.bSelected = false;
 	}
 }
 
@@ -278,9 +288,11 @@ void ALDeviceList::FilterDevicesExtension(char *szExtName)
  */
 void ALDeviceList::ResetFilters()
 {
-	for (s32 i = 0; i < GetNumDevices(); i++) {
+	for (s32 i = 0; i < GetNumDevices(); i++)
+	{
 		vDeviceInfo[i].bSelected = true;
 	}
+
 	filterIndex = 0;
 }
 
@@ -291,11 +303,14 @@ s32 ALDeviceList::GetFirstFilteredDevice()
 {
 	s32 i;
 
-	for (i = 0; i < GetNumDevices(); i++) {
-		if (vDeviceInfo[i].bSelected == true) {
+	for (i = 0; i < GetNumDevices(); i++)
+	{
+		if (vDeviceInfo[i].bSelected == true)
+		{
 			break;
 		}
 	}
+
 	filterIndex = i + 1;
 	return i;
 }
@@ -307,11 +322,14 @@ s32 ALDeviceList::GetNextFilteredDevice()
 {
 	s32 i;
 
-	for (i = filterIndex; i < GetNumDevices(); i++) {
-		if (vDeviceInfo[i].bSelected == true) {
+	for (i = filterIndex; i < GetNumDevices(); i++)
+	{
+		if (vDeviceInfo[i].bSelected == true)
+		{
 			break;
 		}
 	}
+
 	filterIndex = i + 1;
 	return i;
 }
@@ -339,9 +357,9 @@ u32 ALDeviceList::GetMaxNumSources()
 	alDeleteSources(iSourceCount, uiSources);
 	if (alGetError() != AL_NO_ERROR)
 	{
-		for (u32 i = 0; i < 256; i++)
+		for (auto& uiSource : uiSources)
 		{
-			alDeleteSources(1, &uiSources[i]);
+			alDeleteSources(1, &uiSource);
 		}
 	}
 
diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h
new file mode 100644
index 0000000000..8de6ef2871
--- /dev/null
+++ b/Source/Core/AudioCommon/aldlist.h
@@ -0,0 +1,52 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+#ifdef _WIN32
+#pragma warning(disable: 4786)  //disable warning "identifier was truncated to
+								//'255' characters in the browser information"
+#endif
+
+typedef struct
+{
+	std::string               strDeviceName;
+	s32                       iMajorVersion;
+	s32                       iMinorVersion;
+	u32                       uiSourceCount;
+	std::vector<std::string>* pvstrExtensions;
+	bool                      bSelected;
+} ALDEVICEINFO, *LPALDEVICEINFO;
+
+class ALDeviceList
+{
+private:
+	std::vector<ALDEVICEINFO> vDeviceInfo;
+	s32 defaultDeviceIndex;
+	s32 filterIndex;
+
+public:
+	ALDeviceList();
+	~ALDeviceList();
+	s32 GetNumDevices();
+	char* GetDeviceName(s32 index);
+	void GetDeviceVersion(s32 index, s32* major, s32* minor);
+	u32 GetMaxNumSources(s32 index);
+	bool IsExtensionSupported(s32 index, char* szExtName);
+	s32 GetDefaultDevice();
+	void FilterDevicesMinVer(s32 major, s32 minor);
+	void FilterDevicesMaxVer(s32 major, s32 minor);
+	void FilterDevicesExtension(char* szExtName);
+	void ResetFilters();
+	s32 GetFirstFilteredDevice();
+	s32 GetNextFilteredDevice();
+
+private:
+	u32 GetMaxNumSources();
+};
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
index eec0afa3e5..710a439948 100644
--- a/Source/Core/CMakeLists.txt
+++ b/Source/Core/CMakeLists.txt
@@ -4,4 +4,10 @@ add_subdirectory(Core)
 add_subdirectory(DiscIO)
 add_subdirectory(DolphinWX)
 add_subdirectory(InputCommon)
+add_subdirectory(UICommon)
 add_subdirectory(VideoCommon)
+add_subdirectory(VideoBackends)
+
+if(ENABLE_QT)
+	add_subdirectory(DolphinQt)
+endif()
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
new file mode 100644
index 0000000000..0860d53cf0
--- /dev/null
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -0,0 +1,3994 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <vector>
+
+#include "Common/Arm64Emitter.h"
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+namespace Arm64Gen
+{
+
+const int kWRegSizeInBits = 32;
+const int kXRegSizeInBits = 64;
+
+// The below few functions are taken from V8.
+static int CountLeadingZeros(uint64_t value, int width)
+{
+	// TODO(jbramley): Optimize this for ARM64 hosts.
+	int count = 0;
+	uint64_t bit_test = 1ULL << (width - 1);
+	while ((count < width) && ((bit_test & value) == 0))
+	{
+		count++;
+		bit_test >>= 1;
+	}
+	return count;
+}
+
+static uint64_t LargestPowerOf2Divisor(uint64_t value)
+{
+	return value & -(int64_t)value;
+}
+
+static bool IsPowerOfTwo(uint64_t x)
+{
+	return (x != 0) && ((x & (x - 1)) == 0);
+}
+
+#define V8_UINT64_C(x) ((uint64_t)(x))
+
+bool IsImmArithmetic(uint64_t input, u32 *val, bool *shift)
+{
+	if (input < 4096)
+	{
+		*val = input;
+		*shift = false;
+		return true;
+	}
+	else if ((input & 0xFFF000) == input)
+	{
+		*val = input >> 12;
+		*shift = true;
+		return true;
+	}
+	return false;
+}
+
+bool IsImmLogical(uint64_t value, unsigned int width, unsigned int *n, unsigned int *imm_s, unsigned int *imm_r)
+{
+	//DCHECK((n != NULL) && (imm_s != NULL) && (imm_r != NULL));
+	// DCHECK((width == kWRegSizeInBits) || (width == kXRegSizeInBits));
+
+	bool negate = false;
+
+	// Logical immediates are encoded using parameters n, imm_s and imm_r using
+	// the following table:
+	//
+	//    N   imms    immr    size        S             R
+	//    1  ssssss  rrrrrr    64    UInt(ssssss)  UInt(rrrrrr)
+	//    0  0sssss  xrrrrr    32    UInt(sssss)   UInt(rrrrr)
+	//    0  10ssss  xxrrrr    16    UInt(ssss)    UInt(rrrr)
+	//    0  110sss  xxxrrr     8    UInt(sss)     UInt(rrr)
+	//    0  1110ss  xxxxrr     4    UInt(ss)      UInt(rr)
+	//    0  11110s  xxxxxr     2    UInt(s)       UInt(r)
+	// (s bits must not be all set)
+	//
+	// A pattern is constructed of size bits, where the least significant S+1 bits
+	// are set. The pattern is rotated right by R, and repeated across a 32 or
+	// 64-bit value, depending on destination register width.
+	//
+	// Put another way: the basic format of a logical immediate is a single
+	// contiguous stretch of 1 bits, repeated across the whole word at intervals
+	// given by a power of 2. To identify them quickly, we first locate the
+	// lowest stretch of 1 bits, then the next 1 bit above that; that combination
+	// is different for every logical immediate, so it gives us all the
+	// information we need to identify the only logical immediate that our input
+	// could be, and then we simply check if that's the value we actually have.
+	//
+	// (The rotation parameter does give the possibility of the stretch of 1 bits
+	// going 'round the end' of the word. To deal with that, we observe that in
+	// any situation where that happens the bitwise NOT of the value is also a
+	// valid logical immediate. So we simply invert the input whenever its low bit
+	// is set, and then we know that the rotated case can't arise.)
+
+	if (value & 1)
+	{
+		// If the low bit is 1, negate the value, and set a flag to remember that we
+		// did (so that we can adjust the return values appropriately).
+		negate = true;
+		value = ~value;
+	}
+
+	if (width == kWRegSizeInBits)
+	{
+		// To handle 32-bit logical immediates, the very easiest thing is to repeat
+		// the input value twice to make a 64-bit word. The correct encoding of that
+		// as a logical immediate will also be the correct encoding of the 32-bit
+		// value.
+
+		// The most-significant 32 bits may not be zero (ie. negate is true) so
+		// shift the value left before duplicating it.
+		value <<= kWRegSizeInBits;
+		value |= value >> kWRegSizeInBits;
+	}
+
+	// The basic analysis idea: imagine our input word looks like this.
+	//
+	//    0011111000111110001111100011111000111110001111100011111000111110
+	//                                                          c  b    a
+	//                                                          |<--d-->|
+	//
+	// We find the lowest set bit (as an actual power-of-2 value, not its index)
+	// and call it a. Then we add a to our original number, which wipes out the
+	// bottommost stretch of set bits and replaces it with a 1 carried into the
+	// next zero bit. Then we look for the new lowest set bit, which is in
+	// position b, and subtract it, so now our number is just like the original
+	// but with the lowest stretch of set bits completely gone. Now we find the
+	// lowest set bit again, which is position c in the diagram above. Then we'll
+	// measure the distance d between bit positions a and c (using CLZ), and that
+	// tells us that the only valid logical immediate that could possibly be equal
+	// to this number is the one in which a stretch of bits running from a to just
+	// below b is replicated every d bits.
+	uint64_t a = LargestPowerOf2Divisor(value);
+	uint64_t value_plus_a = value + a;
+	uint64_t b = LargestPowerOf2Divisor(value_plus_a);
+	uint64_t value_plus_a_minus_b = value_plus_a - b;
+	uint64_t c = LargestPowerOf2Divisor(value_plus_a_minus_b);
+
+	int d, clz_a, out_n;
+	uint64_t mask;
+
+	if (c != 0)
+	{
+		// The general case, in which there is more than one stretch of set bits.
+		// Compute the repeat distance d, and set up a bitmask covering the basic
+		// unit of repetition (i.e. a word with the bottom d bits set). Also, in all
+		// of these cases the N bit of the output will be zero.
+		clz_a = CountLeadingZeros(a, kXRegSizeInBits);
+		int clz_c = CountLeadingZeros(c, kXRegSizeInBits);
+		d = clz_a - clz_c;
+		mask = ((V8_UINT64_C(1) << d) - 1);
+		out_n = 0;
+	}
+	else
+	{
+		// Handle degenerate cases.
+		//
+		// If any of those 'find lowest set bit' operations didn't find a set bit at
+		// all, then the word will have been zero thereafter, so in particular the
+		// last lowest_set_bit operation will have returned zero. So we can test for
+		// all the special case conditions in one go by seeing if c is zero.
+		if (a == 0)
+		{
+			// The input was zero (or all 1 bits, which will come to here too after we
+			// inverted it at the start of the function), for which we just return
+			// false.
+			return false;
+		}
+		else
+		{
+			// Otherwise, if c was zero but a was not, then there's just one stretch
+			// of set bits in our word, meaning that we have the trivial case of
+			// d == 64 and only one 'repetition'. Set up all the same variables as in
+			// the general case above, and set the N bit in the output.
+			clz_a = CountLeadingZeros(a, kXRegSizeInBits);
+			d = 64;
+			mask = ~V8_UINT64_C(0);
+			out_n = 1;
+		}
+	}
+
+	// If the repeat period d is not a power of two, it can't be encoded.
+	if (!IsPowerOfTwo(d))
+		return false;
+
+	// If the bit stretch (b - a) does not fit within the mask derived from the
+	// repeat period, then fail.
+	if (((b - a) & ~mask) != 0)
+		return false;
+
+	// The only possible option is b - a repeated every d bits. Now we're going to
+	// actually construct the valid logical immediate derived from that
+	// specification, and see if it equals our original input.
+	//
+	// To repeat a value every d bits, we multiply it by a number of the form
+	// (1 + 2^d + 2^(2d) + ...), i.e. 0x0001000100010001 or similar. These can
+	// be derived using a table lookup on CLZ(d).
+	static const std::array<uint64_t, 6> multipliers =
+	{
+		0x0000000000000001UL,
+		0x0000000100000001UL,
+		0x0001000100010001UL,
+		0x0101010101010101UL,
+		0x1111111111111111UL,
+		0x5555555555555555UL,
+	};
+
+	int multiplier_idx = CountLeadingZeros(d, kXRegSizeInBits) - 57;
+
+	// Ensure that the index to the multipliers array is within bounds.
+	_dbg_assert_(DYNA_REC, (multiplier_idx >= 0) &&
+		(static_cast<size_t>(multiplier_idx) < multipliers.size()));
+
+	uint64_t multiplier = multipliers[multiplier_idx];
+	uint64_t candidate = (b - a) * multiplier;
+
+	// The candidate pattern doesn't match our input value, so fail.
+	if (value != candidate)
+		return false;
+
+	// We have a match! This is a valid logical immediate, so now we have to
+	// construct the bits and pieces of the instruction encoding that generates
+	// it.
+
+	// Count the set bits in our basic stretch. The special case of clz(0) == -1
+	// makes the answer come out right for stretches that reach the very top of
+	// the word (e.g. numbers like 0xffffc00000000000).
+	int clz_b = (b == 0) ? -1 : CountLeadingZeros(b, kXRegSizeInBits);
+	int s = clz_a - clz_b;
+
+	// Decide how many bits to rotate right by, to put the low bit of that basic
+	// stretch in position a.
+	int r;
+	if (negate)
+	{
+		// If we inverted the input right at the start of this function, here's
+		// where we compensate: the number of set bits becomes the number of clear
+		// bits, and the rotation count is based on position b rather than position
+		// a (since b is the location of the 'lowest' 1 bit after inversion).
+		s = d - s;
+		r = (clz_b + 1) & (d - 1);
+	}
+	else
+	{
+		r = (clz_a + 1) & (d - 1);
+	}
+
+	// Now we're done, except for having to encode the S output in such a way that
+	// it gives both the number of set bits and the length of the repeated
+	// segment. The s field is encoded like this:
+	//
+	//     imms    size        S
+	//    ssssss    64    UInt(ssssss)
+	//    0sssss    32    UInt(sssss)
+	//    10ssss    16    UInt(ssss)
+	//    110sss     8    UInt(sss)
+	//    1110ss     4    UInt(ss)
+	//    11110s     2    UInt(s)
+	//
+	// So we 'or' (-d << 1) with our computed s to form imms.
+	*n = out_n;
+	*imm_s = ((-d << 1) | (s - 1)) & 0x3f;
+	*imm_r = r;
+
+	return true;
+}
+
+void ARM64XEmitter::SetCodePtr(u8* ptr)
+{
+	m_code = ptr;
+	m_startcode = m_code;
+	m_lastCacheFlushEnd = ptr;
+}
+
+const u8* ARM64XEmitter::GetCodePtr() const
+{
+	return m_code;
+}
+
+u8* ARM64XEmitter::GetWritableCodePtr()
+{
+	return m_code;
+}
+
+void ARM64XEmitter::ReserveCodeSpace(u32 bytes)
+{
+	for (u32 i = 0; i < bytes/4; i++)
+		BRK(0);
+}
+
+const u8* ARM64XEmitter::AlignCode16()
+{
+	int c = int((u64)m_code & 15);
+	if (c)
+		ReserveCodeSpace(16-c);
+	return m_code;
+}
+
+const u8* ARM64XEmitter::AlignCodePage()
+{
+	int c = int((u64)m_code & 4095);
+	if (c)
+		ReserveCodeSpace(4096-c);
+	return m_code;
+}
+
+void ARM64XEmitter::FlushIcache()
+{
+	FlushIcacheSection(m_lastCacheFlushEnd, m_code);
+	m_lastCacheFlushEnd = m_code;
+}
+
+void ARM64XEmitter::FlushIcacheSection(u8* start, u8* end)
+{
+#if defined(IOS)
+	// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
+	sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
+#else
+#ifdef __clang__
+	__clear_cache(start, end);
+#else
+	__builtin___clear_cache(start, end);
+#endif
+#endif
+}
+
+// Exception generation
+static const u32 ExcEnc[][3] = {
+	{0, 0, 1}, // SVC
+	{0, 0, 2}, // HVC
+	{0, 0, 3}, // SMC
+	{1, 0, 0}, // BRK
+	{2, 0, 0}, // HLT
+	{5, 0, 1}, // DCPS1
+	{5, 0, 2}, // DCPS2
+	{5, 0, 3}, // DCPS3
+};
+
+// Arithmetic generation
+static const u32 ArithEnc[] = {
+	0x058, // ADD
+	0x258, // SUB
+};
+
+// Conditional Select
+static const u32 CondSelectEnc[][2] = {
+	{0, 0}, // CSEL
+	{0, 1}, // CSINC
+	{1, 0}, // CSINV
+	{1, 1}, // CSNEG
+};
+
+// Data-Processing (1 source)
+static const u32 Data1SrcEnc[][2] = {
+	{0, 0}, // RBIT
+	{0, 1}, // REV16
+	{0, 2}, // REV32
+	{0, 3}, // REV64
+	{0, 4}, // CLZ
+	{0, 5}, // CLS
+};
+
+// Data-Processing (2 source)
+static const u32 Data2SrcEnc[] = {
+	0x02, // UDIV
+	0x03, // SDIV
+	0x08, // LSLV
+	0x09, // LSRV
+	0x0A, // ASRV
+	0x0B, // RORV
+	0x10, // CRC32B
+	0x11, // CRC32H
+	0x12, // CRC32W
+	0x14, // CRC32CB
+	0x15, // CRC32CH
+	0x16, // CRC32CW
+	0x13, // CRC32X (64bit Only)
+	0x17, // XRC32CX (64bit Only)
+};
+
+// Data-Processing (3 source)
+static const u32 Data3SrcEnc[][2] = {
+	{0, 0}, // MADD
+	{0, 1}, // MSUB
+	{1, 0}, // SMADDL (64Bit Only)
+	{1, 1}, // SMSUBL (64Bit Only)
+	{2, 0}, // SMULH (64Bit Only)
+	{5, 0}, // UMADDL (64Bit Only)
+	{5, 1}, // UMSUBL (64Bit Only)
+	{6, 0}, // UMULH (64Bit Only)
+};
+
+// Logical (shifted register)
+static const u32 LogicalEnc[][2] = {
+	{0, 0}, // AND
+	{0, 1}, // BIC
+	{1, 0}, // OOR
+	{1, 1}, // ORN
+	{2, 0}, // EOR
+	{2, 1}, // EON
+	{3, 0}, // ANDS
+	{3, 1}, // BICS
+};
+
+// Load/Store Exclusive
+static u32 LoadStoreExcEnc[][5] = {
+	{0, 0, 0, 0, 0}, // STXRB
+	{0, 0, 0, 0, 1}, // STLXRB
+	{0, 0, 1, 0, 0}, // LDXRB
+	{0, 0, 1, 0, 1}, // LDAXRB
+	{0, 1, 0, 0, 1}, // STLRB
+	{0, 1, 1, 0, 1}, // LDARB
+	{1, 0, 0, 0, 0}, // STXRH
+	{1, 0, 0, 0, 1}, // STLXRH
+	{1, 0, 1, 0, 0}, // LDXRH
+	{1, 0, 1, 0, 1}, // LDAXRH
+	{1, 1, 0, 0, 1}, // STLRH
+	{1, 1, 1, 0, 1}, // LDARH
+	{2, 0, 0, 0, 0}, // STXR
+	{3, 0, 0, 0, 0}, // (64bit) STXR
+	{2, 0, 0, 0, 1}, // STLXR
+	{3, 0, 0, 0, 1}, // (64bit) STLXR
+	{2, 0, 0, 1, 0}, // STXP
+	{3, 0, 0, 1, 0}, // (64bit) STXP
+	{2, 0, 0, 1, 1}, // STLXP
+	{3, 0, 0, 1, 1}, // (64bit) STLXP
+	{2, 0, 1, 0, 0}, // LDXR
+	{3, 0, 1, 0, 0}, // (64bit) LDXR
+	{2, 0, 1, 0, 1}, // LDAXR
+	{3, 0, 1, 0, 1}, // (64bit) LDAXR
+	{2, 0, 1, 1, 0}, // LDXP
+	{3, 0, 1, 1, 0}, // (64bit) LDXP
+	{2, 0, 1, 1, 1}, // LDAXP
+	{3, 0, 1, 1, 1}, // (64bit) LDAXP
+	{2, 1, 0, 0, 1}, // STLR
+	{3, 1, 0, 0, 1}, // (64bit) STLR
+	{2, 1, 1, 0, 1}, // LDAR
+	{3, 1, 1, 0, 1}, // (64bit) LDAR
+};
+
+void ARM64XEmitter::EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr)
+{
+	bool b64Bit = Is64Bit(Rt);
+	s64 distance = (s64)ptr - (s64)m_code;
+
+	_assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", __FUNCTION__, distance);
+
+	distance >>= 2;
+
+	_assert_msg_(DYNA_REC, distance >= -0x40000 && distance <= 0x3FFFF, "%s: Received too large distance: %lx", __FUNCTION__, distance);
+
+	Rt = DecodeReg(Rt);
+	Write32((b64Bit << 31) | (0x34 << 24) | (op << 24) | \
+	        (((u32)distance << 5) & 0xFFFFE0) | Rt);
+}
+
+void ARM64XEmitter::EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const void* ptr)
+{
+	bool b64Bit = Is64Bit(Rt);
+	s64 distance = (s64)ptr - (s64)m_code;
+
+	_assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", __FUNCTION__, distance);
+
+	distance >>= 2;
+
+	_assert_msg_(DYNA_REC, distance >= -0x3FFF && distance < 0x3FFF, "%s: Received too large distance: %lx", __FUNCTION__, distance);
+
+	Rt = DecodeReg(Rt);
+	Write32((b64Bit << 31) | (0x36 << 24) | (op << 24) | \
+	        (bits << 19) | (distance << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeUnconditionalBranchInst(u32 op, const void* ptr)
+{
+	s64 distance = (s64)ptr - s64(m_code);
+
+	_assert_msg_(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %lx", __FUNCTION__, distance);
+
+	distance >>= 2;
+
+	_assert_msg_(DYNA_REC, distance >= -0x2000000LL && distance <= 0x1FFFFFFLL, "%s: Received too large distance: %lx", __FUNCTION__, distance);
+
+	Write32((op << 31) | (0x5 << 26) | (distance & 0x3FFFFFF));
+}
+
+void ARM64XEmitter::EncodeUnconditionalBranchInst(u32 opc, u32 op2, u32 op3, u32 op4, ARM64Reg Rn)
+{
+	Rn = DecodeReg(Rn);
+	Write32((0x6B << 25) | (opc << 21) | (op2 << 16) | (op3 << 10) | (Rn << 5) | op4);
+}
+
+void ARM64XEmitter::EncodeExceptionInst(u32 instenc, u32 imm)
+{
+	_assert_msg_(DYNA_REC, !(imm & ~0xFFFF), "%s: Exception instruction too large immediate: %d", __FUNCTION__, imm);
+
+	Write32((0xD4 << 24) | (ExcEnc[instenc][0] << 21) | (imm << 5) | (ExcEnc[instenc][1] << 2) | ExcEnc[instenc][2]);
+}
+
+void ARM64XEmitter::EncodeSystemInst(u32 op0, u32 op1, u32 CRn, u32 CRm, u32 op2, ARM64Reg Rt)
+{
+	Write32((0x354 << 22) | (op0 << 19) | (op1 << 16) | (CRn << 12) | (CRm << 8) | (op2 << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeArithmeticInst(u32 instenc, bool flags, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+	Write32((b64Bit << 31) | (flags << 29) | (ArithEnc[instenc] << 21) | \
+	        (Option.GetType() == ArithOption::TYPE_EXTENDEDREG ? (1 << 21) : 0) | (Rm << 16) | Option.GetData() | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeArithmeticCarryInst(u32 op, bool flags, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (op << 30) | (flags << 29) | \
+	        (0xD0 << 21) | (Rm << 16) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeCondCompareImmInst(u32 op, ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond)
+{
+	bool b64Bit = Is64Bit(Rn);
+
+	_assert_msg_(DYNA_REC, !(imm & ~0x1F), "%s: too large immediate: %d", __FUNCTION__, imm)
+	_assert_msg_(DYNA_REC, !(nzcv & ~0xF), "%s: Flags out of range: %d", __FUNCTION__, nzcv)
+
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (op << 30) | (1 << 29) | (0xD2 << 21) | \
+	        (imm << 16) | (cond << 12) | (1 << 11) | (Rn << 5) | nzcv);
+}
+
+void ARM64XEmitter::EncodeCondCompareRegInst(u32 op, ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond)
+{
+	bool b64Bit = Is64Bit(Rm);
+
+	_assert_msg_(DYNA_REC, !(nzcv & ~0xF), "%s: Flags out of range: %d", __FUNCTION__, nzcv)
+
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (op << 30) | (1 << 29) | (0xD2 << 21) | \
+	        (Rm << 16) | (cond << 12) | (Rn << 5) | nzcv);
+}
+
+void ARM64XEmitter::EncodeCondSelectInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (CondSelectEnc[instenc][0] << 30) | \
+	        (0xD4 << 21) | (Rm << 16) | (cond << 12) | (CondSelectEnc[instenc][1] << 10) | \
+	        (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeData1SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (0x2D6 << 21) | \
+	        (Data1SrcEnc[instenc][0] << 16) | (Data1SrcEnc[instenc][1] << 10) | \
+	        (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeData2SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (0x0D6 << 21) | \
+	        (Rm << 16) | (Data2SrcEnc[instenc] << 10) | \
+	        (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeData3SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Ra = DecodeReg(Ra);
+	Write32((b64Bit << 31) | (0xD8 << 21) | (Data3SrcEnc[instenc][0] << 21) | \
+	        (Rm << 16) | (Data3SrcEnc[instenc][1] << 15) | \
+	        (Ra << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeLogicalInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rm = DecodeReg(Rm);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (LogicalEnc[instenc][0] << 29) | (0x5 << 25) | (LogicalEnc[instenc][1] << 21) | \
+	        Shift.GetData() | (Rm << 16) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeLoadRegisterInst(u32 bitop, ARM64Reg Rt, u32 imm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	bool bVec = IsVector(Rt);
+
+	_assert_msg_(DYNA_REC, !(imm & 0xFFFFF), "%s: offset too large %d", __FUNCTION__, imm);
+
+	Rt = DecodeReg(Rt);
+	if (b64Bit && bitop != 0x2) // LDRSW(0x2) uses 64bit reg, doesn't have 64bit bit set
+		bitop |= 0x1;
+	Write32((bitop << 30) | (bVec << 26) | (0x18 << 24) | (imm << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeLoadStoreExcInst(u32 instenc,
+		ARM64Reg Rs, ARM64Reg Rt2, ARM64Reg Rn, ARM64Reg Rt)
+{
+	Rs = DecodeReg(Rs);
+	Rt2 = DecodeReg(Rt2);
+	Rn = DecodeReg(Rn);
+	Rt = DecodeReg(Rt);
+	Write32((LoadStoreExcEnc[instenc][0] << 30) | (0x8 << 24) | (LoadStoreExcEnc[instenc][1] << 23) | \
+	        (LoadStoreExcEnc[instenc][2] << 22) | (LoadStoreExcEnc[instenc][3] << 21) | (Rs << 16) | \
+	        (LoadStoreExcEnc[instenc][4] << 15) | (Rt2 << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeLoadStorePairedInst(u32 op, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	bool b128Bit = IsQuad(Rt);
+	bool bVec = IsVector(Rt);
+
+	if (b128Bit)
+		imm >>= 4;
+	else if (b64Bit)
+		imm >>= 3;
+	else
+		imm >>= 2;
+
+	_assert_msg_(DYNA_REC, !(imm & ~0xF), "%s: offset too large %d", __FUNCTION__, imm);
+
+	u32 opc = 0;
+	if (b128Bit)
+		opc = 2;
+	else if (b64Bit && bVec)
+		opc = 1;
+	else if (b64Bit && !bVec)
+		opc = 2;
+
+	Rt = DecodeReg(Rt);
+	Rt2 = DecodeReg(Rt2);
+	Rn = DecodeReg(Rn);
+	Write32((opc << 30) | (bVec << 26) | (op << 22) | (imm << 15) | (Rt2 << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeLoadStoreIndexedInst(u32 op, u32 op2, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	bool bVec = IsVector(Rt);
+
+	u32 offset = imm & 0x1FF;
+
+	_assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s: offset too large %d", __FUNCTION__, imm);
+
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 30) | (op << 22) | (bVec << 26) | (offset << 12) | (op2 << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeLoadStoreIndexedInst(u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm, u8 size)
+{
+	bool b64Bit = Is64Bit(Rt);
+	bool bVec = IsVector(Rt);
+
+	if (size == 64)
+		imm >>= 3;
+	else if (size == 32)
+		imm >>= 2;
+	else if (size == 16)
+		imm >>= 1;
+
+	_assert_msg_(DYNA_REC, imm >= 0, "%s(INDEX_UNSIGNED): offset must be positive %d", __FUNCTION__, imm);
+	_assert_msg_(DYNA_REC, !(imm & ~0xFFF), "%s(INDEX_UNSIGNED): offset too large %d", __FUNCTION__, imm);
+
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 30) | (op << 22) | (bVec << 26) | (imm << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeMOVWideInst(u32 op, ARM64Reg Rd, u32 imm, ShiftAmount pos)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	_assert_msg_(DYNA_REC, !(imm & ~0xFFFF), "%s: immediate out of range: %d", __FUNCTION__, imm);
+
+	Rd = DecodeReg(Rd);
+	Write32((b64Bit << 31) | (op << 29) | (0x25 << 23) | (pos << 21) | (imm << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeBitfieldMOVInst(u32 op, ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (op << 29) | (0x26 << 23) | (b64Bit << 22) | \
+	        (immr << 16) | (imms << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeLoadStoreRegisterOffset(u32 size, u32 opc, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	ARM64Reg decoded_Rm = DecodeReg(Rm.GetReg());
+
+	Write32((size << 30) | (opc << 22) | (0x1C1 << 21) | (decoded_Rm << 16) | \
+	        Rm.GetData() | (1 << 11) | (Rn << 5) | Rt);
+}
+
+void ARM64XEmitter::EncodeAddSubImmInst(u32 op, bool flags, u32 shift, u32 imm, ARM64Reg Rn, ARM64Reg Rd)
+{
+	bool b64Bit = Is64Bit(Rd);
+
+	_assert_msg_(DYNA_REC, !(imm & ~0xFFF), "%s: immediate too large: %x", __FUNCTION__, imm);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Write32((b64Bit << 31) | (op << 30) | (flags << 29) | (0x11 << 24) | (shift << 22) | \
+	        (imm << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeLogicalImmInst(u32 op, ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, int n)
+{
+	// Sometimes Rd is fixed to SP, but can still be 32bit or 64bit.
+	// Use Rn to determine bitness here.
+	bool b64Bit = Is64Bit(Rn);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((b64Bit << 31) | (op << 29) | (0x24 << 23) | (n << 22) | \
+	        (immr << 16) | (imms << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64XEmitter::EncodeLoadStorePair(u32 op, u32 load, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	u32 type_encode = 0;
+
+	switch (type)
+	{
+	case INDEX_UNSIGNED:
+		type_encode = 0b010;
+		break;
+	case INDEX_POST:
+		type_encode = 0b001;
+		break;
+	case INDEX_PRE:
+		type_encode = 0b011;
+		break;
+	case INDEX_SIGNED:
+		_assert_msg_(DYNA_REC, false, "%s doesn't support INDEX_SIGNED!", __FUNCTION__);
+		break;
+	}
+
+	if (b64Bit)
+	{
+		op |= 0b10;
+		imm >>= 3;
+	}
+	else
+	{
+		imm >>= 2;
+	}
+
+	Rt = DecodeReg(Rt);
+	Rt2 = DecodeReg(Rt2);
+	Rn = DecodeReg(Rn);
+
+	Write32((op << 30) | (0b101 << 27) | (type_encode << 23) | (load << 22) | \
+	        ((imm & 0x7F) << 15) | (Rt2 << 10) | (Rn << 5) | Rt);
+}
+void ARM64XEmitter::EncodeAddressInst(u32 op, ARM64Reg Rd, s32 imm)
+{
+	Rd = DecodeReg(Rd);
+
+	Write32((op << 31) | ((imm & 0x3) << 29) | (0x10 << 24) | \
+	        ((imm & 0x1FFFFC) << 3) | Rd);
+}
+
+void ARM64XEmitter::EncodeLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	_assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s received too large offset: %d", __FUNCTION__, imm);
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+
+	Write32((size << 30) | (0b111 << 27) | (op << 22) | ((imm & 0x1FF) << 12) | (Rn << 5) | Rt);
+}
+
+static inline bool IsInRangeImm19(s64 distance)
+{
+	return (distance >= -0x40000 && distance <= 0x3FFFF);
+}
+
+static inline bool IsInRangeImm14(s64 distance)
+{
+	return (distance >= -0x2000 && distance <= 0x1FFF);
+}
+
+static inline bool IsInRangeImm26(s64 distance)
+{
+	return (distance >= -0x2000000 && distance <= 0x1FFFFFF);
+}
+
+static inline u32 MaskImm19(s64 distance)
+{
+	return distance & 0x7FFFF;
+}
+
+static inline u32 MaskImm14(s64 distance)
+{
+	return distance & 0x3FFF;
+}
+
+static inline u32 MaskImm26(s64 distance)
+{
+	return distance & 0x3FFFFFF;
+}
+
+// FixupBranch branching
+void ARM64XEmitter::SetJumpTarget(FixupBranch const& branch)
+{
+	bool Not = false;
+	u32 inst = 0;
+	s64 distance = (s64)(m_code - branch.ptr);
+	distance >>= 2;
+
+	switch (branch.type)
+	{
+		case 1: // CBNZ
+			Not = true;
+		case 0: // CBZ
+		{
+			_assert_msg_(DYNA_REC, IsInRangeImm19(distance), "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance);
+			bool b64Bit = Is64Bit(branch.reg);
+			ARM64Reg reg = DecodeReg(branch.reg);
+			inst = (b64Bit << 31) | (0x1A << 25) | (Not << 24) | (MaskImm19(distance) << 5) | reg;
+		}
+		break;
+		case 2: // B (conditional)
+			_assert_msg_(DYNA_REC, IsInRangeImm19(distance), "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance);
+			inst = (0x2A << 25) | (MaskImm19(distance) << 5) | branch.cond;
+		break;
+		case 4: // TBNZ
+			Not = true;
+		case 3: // TBZ
+		{
+			_assert_msg_(DYNA_REC, IsInRangeImm14(distance), "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance);
+			ARM64Reg reg = DecodeReg(branch.reg);
+			inst = ((branch.bit & 0x20) << 26) | (0x1B << 25) | (Not << 24) | ((branch.bit & 0x1F) << 19) | (MaskImm14(distance) << 5) | reg;
+		}
+		break;
+		case 5: // B (uncoditional)
+			_assert_msg_(DYNA_REC, IsInRangeImm26(distance), "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance);
+			inst = (0x5 << 26) | MaskImm26(distance);
+		break;
+		case 6: // BL (unconditional)
+			_assert_msg_(DYNA_REC, IsInRangeImm26(distance), "%s(%d): Received too large distance: %lx", __FUNCTION__, branch.type, distance);
+			inst = (0x25 << 26) | MaskImm26(distance);
+		break;
+	}
+	*(u32*)branch.ptr = inst;
+}
+
+FixupBranch ARM64XEmitter::CBZ(ARM64Reg Rt)
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 0;
+	branch.reg = Rt;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::CBNZ(ARM64Reg Rt)
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 1;
+	branch.reg = Rt;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::B(CCFlags cond)
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 2;
+	branch.cond = cond;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::TBZ(ARM64Reg Rt, u8 bit)
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 3;
+	branch.reg = Rt;
+	branch.bit = bit;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::TBNZ(ARM64Reg Rt, u8 bit)
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 4;
+	branch.reg = Rt;
+	branch.bit = bit;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::B()
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 5;
+	HINT(HINT_NOP);
+	return branch;
+}
+FixupBranch ARM64XEmitter::BL()
+{
+	FixupBranch branch;
+	branch.ptr = m_code;
+	branch.type = 6;
+	HINT(HINT_NOP);
+	return branch;
+}
+
+// Compare and Branch
+void ARM64XEmitter::CBZ(ARM64Reg Rt, const void* ptr)
+{
+	EncodeCompareBranchInst(0, Rt, ptr);
+}
+void ARM64XEmitter::CBNZ(ARM64Reg Rt, const void* ptr)
+{
+	EncodeCompareBranchInst(1, Rt, ptr);
+}
+
+// Conditional Branch
+void ARM64XEmitter::B(CCFlags cond, const void* ptr)
+{
+	s64 distance = (s64)ptr - (s64)m_code;
+
+	distance >>= 2;
+
+	_assert_msg_(DYNA_REC, IsInRangeImm19(distance), "%s: Received too large distance: %p->%p %ld %lx", __FUNCTION__, m_code, ptr, distance, distance);
+	Write32((0x54 << 24) | (MaskImm19(distance) << 5) | cond);
+}
+
+// Test and Branch
+void ARM64XEmitter::TBZ(ARM64Reg Rt, u8 bits, const void* ptr)
+{
+	EncodeTestBranchInst(0, Rt, bits, ptr);
+}
+void ARM64XEmitter::TBNZ(ARM64Reg Rt, u8 bits, const void* ptr)
+{
+	EncodeTestBranchInst(1, Rt, bits, ptr);
+}
+
+// Unconditional Branch
+void ARM64XEmitter::B(const void* ptr)
+{
+	EncodeUnconditionalBranchInst(0, ptr);
+}
+void ARM64XEmitter::BL(const void* ptr)
+{
+	EncodeUnconditionalBranchInst(1, ptr);
+}
+
+void ARM64XEmitter::QuickCallFunction(ARM64Reg scratchreg, const void *func)
+{
+	s64 distance = (s64)func - (s64)m_code;
+	distance >>= 2;  // Can only branch to opcode-aligned (4) addresses
+	if (!IsInRangeImm26(distance))
+	{
+		// WARN_LOG(DYNA_REC, "Distance too far in function call (%p to %p)! Using scratch.", m_code, func);
+		MOVI2R(scratchreg, (uintptr_t)func);
+		BLR(scratchreg);
+	}
+	else
+	{
+		BL(func);
+	}
+}
+
+// Unconditional Branch (register)
+void ARM64XEmitter::BR(ARM64Reg Rn)
+{
+	EncodeUnconditionalBranchInst(0, 0x1F, 0, 0, Rn);
+}
+void ARM64XEmitter::BLR(ARM64Reg Rn)
+{
+	EncodeUnconditionalBranchInst(1, 0x1F, 0, 0, Rn);
+}
+void ARM64XEmitter::RET(ARM64Reg Rn)
+{
+	EncodeUnconditionalBranchInst(2, 0x1F, 0, 0, Rn);
+}
+void ARM64XEmitter::ERET()
+{
+	EncodeUnconditionalBranchInst(4, 0x1F, 0, 0, SP);
+}
+void ARM64XEmitter::DRPS()
+{
+	EncodeUnconditionalBranchInst(5, 0x1F, 0, 0, SP);
+}
+
+// Exception generation
+void ARM64XEmitter::SVC(u32 imm)
+{
+	EncodeExceptionInst(0, imm);
+}
+
+void ARM64XEmitter::HVC(u32 imm)
+{
+	EncodeExceptionInst(1, imm);
+}
+
+void ARM64XEmitter::SMC(u32 imm)
+{
+	EncodeExceptionInst(2, imm);
+}
+
+void ARM64XEmitter::BRK(u32 imm)
+{
+	EncodeExceptionInst(3, imm);
+}
+
+void ARM64XEmitter::HLT(u32 imm)
+{
+	EncodeExceptionInst(4, imm);
+}
+
+void ARM64XEmitter::DCPS1(u32 imm)
+{
+	EncodeExceptionInst(5, imm);
+}
+
+void ARM64XEmitter::DCPS2(u32 imm)
+{
+	EncodeExceptionInst(6, imm);
+}
+
+void ARM64XEmitter::DCPS3(u32 imm)
+{
+	EncodeExceptionInst(7, imm);
+}
+
+// System
+void ARM64XEmitter::_MSR(PStateField field, u8 imm)
+{
+	u32 op1 = 0, op2 = 0;
+	switch (field)
+	{
+		case FIELD_SPSel: op1 = 0; op2 = 5; break;
+		case FIELD_DAIFSet: op1 = 3; op2 = 6; break;
+		case FIELD_DAIFClr: op1 = 3; op2 = 7; break;
+		default:
+			_assert_msg_(DYNA_REC, false, "Invalid PStateField to do a imm move to");
+			break;
+	}
+	EncodeSystemInst(0, op1, 4, imm, op2, WSP);
+}
+
+static void GetSystemReg(PStateField field, int &o0, int &op1, int &CRn, int &CRm, int &op2)
+{
+	switch (field)
+{
+	case FIELD_NZCV:
+		o0 = 3; op1 = 3; CRn = 4; CRm = 2; op2 = 0;
+		break;
+	case FIELD_FPCR:
+		o0 = 3; op1 = 3; CRn = 4; CRm = 4; op2 = 0;
+		break;
+	case FIELD_FPSR:
+		o0 = 3; op1 = 3; CRn = 4; CRm = 4; op2 = 1;
+		break;
+	default:
+		_assert_msg_(DYNA_REC, false, "Invalid PStateField to do a register move from/to");
+		break;
+	}
+}
+
+void ARM64XEmitter::_MSR(PStateField field, ARM64Reg Rt)
+{
+	int o0 = 0, op1 = 0, CRn = 0, CRm = 0, op2 = 0;
+	_assert_msg_(DYNA_REC, Is64Bit(Rt), "MSR: Rt must be 64-bit");
+	GetSystemReg(field, o0, op1, CRn, CRm, op2);
+	EncodeSystemInst(o0, op1, CRn, CRm, op2, DecodeReg(Rt));
+}
+
+void ARM64XEmitter::MRS(ARM64Reg Rt, PStateField field)
+{
+	int o0 = 0, op1 = 0, CRn = 0, CRm = 0, op2 = 0;
+	_assert_msg_(DYNA_REC, Is64Bit(Rt), "MRS: Rt must be 64-bit");
+	GetSystemReg(field, o0, op1, CRn, CRm, op2);
+	EncodeSystemInst(o0 | 4, op1, CRn, CRm, op2, DecodeReg(Rt));
+}
+
+void ARM64XEmitter::HINT(SystemHint op)
+{
+	EncodeSystemInst(0, 3, 2, 0, op, WSP);
+}
+void ARM64XEmitter::CLREX()
+{
+	EncodeSystemInst(0, 3, 3, 0, 2, WSP);
+}
+void ARM64XEmitter::DSB(BarrierType type)
+{
+	EncodeSystemInst(0, 3, 3, type, 4, WSP);
+}
+void ARM64XEmitter::DMB(BarrierType type)
+{
+	EncodeSystemInst(0, 3, 3, type, 5, WSP);
+}
+void ARM64XEmitter::ISB(BarrierType type)
+{
+	EncodeSystemInst(0, 3, 3, type, 6, WSP);
+}
+
+// Add/Subtract (extended register)
+void ARM64XEmitter::ADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	ADD(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0));
+}
+
+void ARM64XEmitter::ADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(0, false, Rd, Rn, Rm, Option);
+}
+
+void ARM64XEmitter::ADDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticInst(0, true, Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0));
+}
+
+void ARM64XEmitter::ADDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(0, true, Rd, Rn, Rm, Option);
+}
+
+void ARM64XEmitter::SUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	SUB(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0));
+}
+
+void ARM64XEmitter::SUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(1, false, Rd, Rn, Rm, Option);
+}
+
+void ARM64XEmitter::SUBS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticInst(1, true, Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0));
+}
+
+void ARM64XEmitter::SUBS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(1, true, Rd, Rn, Rm, Option);
+}
+
+void ARM64XEmitter::CMN(ARM64Reg Rn, ARM64Reg Rm)
+{
+	CMN(Rn, Rm, ArithOption(Rn, ST_LSL, 0));
+}
+
+void ARM64XEmitter::CMN(ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(0, true, Is64Bit(Rn) ? ZR : WZR, Rn, Rm, Option);
+}
+
+void ARM64XEmitter::CMP(ARM64Reg Rn, ARM64Reg Rm)
+{
+	CMP(Rn, Rm, ArithOption(Rn, ST_LSL, 0));
+}
+
+void ARM64XEmitter::CMP(ARM64Reg Rn, ARM64Reg Rm, ArithOption Option)
+{
+	EncodeArithmeticInst(1, true, Is64Bit(Rn) ? ZR : WZR, Rn, Rm, Option);
+}
+
+// Add/Subtract (with carry)
+void ARM64XEmitter::ADC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticCarryInst(0, false, Rd, Rn, Rm);
+}
+void ARM64XEmitter::ADCS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticCarryInst(0, true, Rd, Rn, Rm);
+}
+void ARM64XEmitter::SBC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticCarryInst(1, false, Rd, Rn, Rm);
+}
+void ARM64XEmitter::SBCS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeArithmeticCarryInst(1, true, Rd, Rn, Rm);
+}
+
+// Conditional Compare (immediate)
+void ARM64XEmitter::CCMN(ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond)
+{
+	EncodeCondCompareImmInst(0, Rn, imm, nzcv, cond);
+}
+void ARM64XEmitter::CCMP(ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond)
+{
+	EncodeCondCompareImmInst(1, Rn, imm, nzcv, cond);
+}
+
+// Conditiona Compare (register)
+void ARM64XEmitter::CCMN(ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond)
+{
+	EncodeCondCompareRegInst(0, Rn, Rm, nzcv, cond);
+}
+void ARM64XEmitter::CCMP(ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond)
+{
+	EncodeCondCompareRegInst(1, Rn, Rm, nzcv, cond);
+}
+
+// Conditional Select
+void ARM64XEmitter::CSEL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	EncodeCondSelectInst(0, Rd, Rn, Rm, cond);
+}
+void ARM64XEmitter::CSINC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	EncodeCondSelectInst(1, Rd, Rn, Rm, cond);
+}
+void ARM64XEmitter::CSINV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	EncodeCondSelectInst(2, Rd, Rn, Rm, cond);
+}
+void ARM64XEmitter::CSNEG(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	EncodeCondSelectInst(3, Rd, Rn, Rm, cond);
+}
+
+// Data-Processing 1 source
+void ARM64XEmitter::RBIT(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(0, Rd, Rn);
+}
+void ARM64XEmitter::REV16(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(1, Rd, Rn);
+}
+void ARM64XEmitter::REV32(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(2, Rd, Rn);
+}
+void ARM64XEmitter::REV64(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(3, Rd, Rn);
+}
+void ARM64XEmitter::CLZ(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(4, Rd, Rn);
+}
+void ARM64XEmitter::CLS(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EncodeData1SrcInst(5, Rd, Rn);
+}
+
+// Data-Processing 2 source
+void ARM64XEmitter::UDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(0, Rd, Rn, Rm);
+}
+void ARM64XEmitter::SDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(1, Rd, Rn, Rm);
+}
+void ARM64XEmitter::LSLV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(2, Rd, Rn, Rm);
+}
+void ARM64XEmitter::LSRV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(3, Rd, Rn, Rm);
+}
+void ARM64XEmitter::ASRV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(4, Rd, Rn, Rm);
+}
+void ARM64XEmitter::RORV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(5, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32B(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(6, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32H(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(7, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32W(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(8, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32CB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(9, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32CH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(10, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32CW(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(11, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32X(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(12, Rd, Rn, Rm);
+}
+void ARM64XEmitter::CRC32CX(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData2SrcInst(13, Rd, Rn, Rm);
+}
+
+// Data-Processing 3 source
+void ARM64XEmitter::MADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(0, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::MSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(1, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::SMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(2, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::SMULL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	SMADDL(Rd, Rn, Rm, SP);
+}
+void ARM64XEmitter::SMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(3, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::SMULH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData3SrcInst(4, Rd, Rn, Rm, SP);
+}
+void ARM64XEmitter::UMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(5, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::UMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EncodeData3SrcInst(6, Rd, Rn, Rm, Ra);
+}
+void ARM64XEmitter::UMULH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData3SrcInst(7, Rd, Rn, Rm, SP);
+}
+void ARM64XEmitter::MUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData3SrcInst(0, Rd, Rn, Rm, SP);
+}
+void ARM64XEmitter::MNEG(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EncodeData3SrcInst(1, Rd, Rn, Rm, SP);
+}
+
+// Logical (shifted register)
+void ARM64XEmitter::AND(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(0, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::BIC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(1, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::ORR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(2, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::ORN(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(3, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::EOR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(4, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::EON(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(5, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::ANDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(6, Rd, Rn, Rm, Shift);
+}
+void ARM64XEmitter::BICS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift)
+{
+	EncodeLogicalInst(7, Rd, Rn, Rm, Shift);
+}
+
+void ARM64XEmitter::MOV(ARM64Reg Rd, ARM64Reg Rm, ArithOption Shift)
+{
+	ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, Shift);
+}
+
+void ARM64XEmitter::MOV(ARM64Reg Rd, ARM64Reg Rm)
+{
+	if (IsGPR(Rd) && IsGPR(Rm))
+		ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_LSL, 0));
+	else
+		_assert_msg_(DYNA_REC, false, "Non-GPRs not supported in MOV");
+}
+void ARM64XEmitter::MVN(ARM64Reg Rd, ARM64Reg Rm)
+{
+	ORN(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_LSL, 0));
+}
+void ARM64XEmitter::LSL(ARM64Reg Rd, ARM64Reg Rm, int shift)
+{
+	ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_LSL, shift));
+}
+void ARM64XEmitter::LSR(ARM64Reg Rd, ARM64Reg Rm, int shift)
+{
+	ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_LSR, shift));
+}
+void ARM64XEmitter::ASR(ARM64Reg Rd, ARM64Reg Rm, int shift)
+{
+	ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_ASR, shift));
+}
+void ARM64XEmitter::ROR(ARM64Reg Rd, ARM64Reg Rm, int shift)
+{
+	ORR(Rd, Is64Bit(Rd) ? ZR : WZR, Rm, ArithOption(Rm, ST_ROR, shift));
+}
+
+// Logical (immediate)
+void ARM64XEmitter::AND(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert)
+{
+	EncodeLogicalImmInst(0, Rd, Rn, immr, imms, invert);
+}
+void ARM64XEmitter::ANDS(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert)
+{
+	EncodeLogicalImmInst(3, Rd, Rn, immr, imms, invert);
+}
+void ARM64XEmitter::EOR(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert)
+{
+	EncodeLogicalImmInst(2, Rd, Rn, immr, imms, invert);
+}
+void ARM64XEmitter::ORR(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert)
+{
+	EncodeLogicalImmInst(1, Rd, Rn, immr, imms, invert);
+}
+void ARM64XEmitter::TST(ARM64Reg Rn, u32 immr, u32 imms, bool invert)
+{
+	EncodeLogicalImmInst(3, Is64Bit(Rn) ? ZR : WZR, Rn, immr, imms, invert);
+}
+
+// Add/subtract (immediate)
+void ARM64XEmitter::ADD(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift)
+{
+	EncodeAddSubImmInst(0, false, shift, imm, Rn, Rd);
+}
+void ARM64XEmitter::ADDS(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift)
+{
+	EncodeAddSubImmInst(0, true, shift, imm, Rn, Rd);
+}
+void ARM64XEmitter::SUB(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift)
+{
+	EncodeAddSubImmInst(1, false, shift, imm, Rn, Rd);
+}
+void ARM64XEmitter::SUBS(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift)
+{
+	EncodeAddSubImmInst(1, true, shift, imm, Rn, Rd);
+}
+void ARM64XEmitter::CMP(ARM64Reg Rn, u32 imm, bool shift)
+{
+	EncodeAddSubImmInst(1, true, shift, imm, Rn, Is64Bit(Rn) ? SP : WSP);
+}
+
+// Data Processing (Immediate)
+void ARM64XEmitter::MOVZ(ARM64Reg Rd, u32 imm, ShiftAmount pos)
+{
+	EncodeMOVWideInst(2, Rd, imm, pos);
+}
+void ARM64XEmitter::MOVN(ARM64Reg Rd, u32 imm, ShiftAmount pos)
+{
+	EncodeMOVWideInst(0, Rd, imm, pos);
+}
+void ARM64XEmitter::MOVK(ARM64Reg Rd, u32 imm, ShiftAmount pos)
+{
+	EncodeMOVWideInst(3, Rd, imm, pos);
+}
+
+// Bitfield move
+void ARM64XEmitter::BFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms)
+{
+	EncodeBitfieldMOVInst(1, Rd, Rn, immr, imms);
+}
+void ARM64XEmitter::SBFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms)
+{
+	EncodeBitfieldMOVInst(0, Rd, Rn, immr, imms);
+}
+void ARM64XEmitter::UBFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms)
+{
+	EncodeBitfieldMOVInst(2, Rd, Rn, immr, imms);
+}
+void ARM64XEmitter::EXTR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u32 shift)
+{
+	bool sf = Is64Bit(Rd);
+	bool N = sf;
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+	Write32((sf << 31) | (0x27 << 23) | (N << 22) | (Rm << 16) | (shift << 10) | (Rm << 5) | Rd);
+}
+void ARM64XEmitter::SXTB(ARM64Reg Rd, ARM64Reg Rn)
+{
+	SBFM(Rd, Rn, 0, 7);
+}
+void ARM64XEmitter::SXTH(ARM64Reg Rd, ARM64Reg Rn)
+{
+	SBFM(Rd, Rn, 0, 15);
+}
+void ARM64XEmitter::SXTW(ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, Is64Bit(Rd), "%s requires 64bit register as destination", __FUNCTION__);
+	SBFM(Rd, Rn, 0, 31);
+}
+void ARM64XEmitter::UXTB(ARM64Reg Rd, ARM64Reg Rn)
+{
+	UBFM(Rd, Rn, 0, 7);
+}
+void ARM64XEmitter::UXTH(ARM64Reg Rd, ARM64Reg Rn)
+{
+	UBFM(Rd, Rn, 0, 15);
+}
+
+// Load Register (Literal)
+void ARM64XEmitter::LDR(ARM64Reg Rt, u32 imm)
+{
+	EncodeLoadRegisterInst(0, Rt, imm);
+}
+void ARM64XEmitter::LDRSW(ARM64Reg Rt, u32 imm)
+{
+	EncodeLoadRegisterInst(2, Rt, imm);
+}
+void ARM64XEmitter::PRFM(ARM64Reg Rt, u32 imm)
+{
+	EncodeLoadRegisterInst(3, Rt, imm);
+}
+
+// Load/Store pair
+void ARM64XEmitter::LDP(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStorePair(0, 1, type, Rt, Rt2, Rn, imm);
+}
+void ARM64XEmitter::LDPSW(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStorePair(1, 1, type, Rt, Rt2, Rn, imm);
+}
+void ARM64XEmitter::STP(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStorePair(0, 0, type, Rt, Rt2, Rn, imm);
+}
+
+// Load/Store Exclusive
+void ARM64XEmitter::STXRB(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(0, Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::STLXRB(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(1, Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDXRB(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(2, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDAXRB(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(3, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::STLRB(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(4, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDARB(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(5, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::STXRH(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(6, Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::STLXRH(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(7, Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDXRH(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(8, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDAXRH(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(9, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::STLRH(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(10, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDARH(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(11, SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::STXR(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(12 + Is64Bit(Rt), Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::STLXR(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(14 + Is64Bit(Rt), Rs, SP, Rt, Rn);
+}
+void ARM64XEmitter::STXP(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(16 + Is64Bit(Rt), Rs, Rt2, Rt, Rn);
+}
+void ARM64XEmitter::STLXP(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(18 + Is64Bit(Rt), Rs, Rt2, Rt, Rn);
+}
+void ARM64XEmitter::LDXR(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(20 + Is64Bit(Rt), SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDAXR(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(22 + Is64Bit(Rt), SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDXP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(24 + Is64Bit(Rt), SP, Rt2, Rt, Rn);
+}
+void ARM64XEmitter::LDAXP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(26 + Is64Bit(Rt), SP, Rt2, Rt, Rn);
+}
+void ARM64XEmitter::STLR(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(28 + Is64Bit(Rt), SP, SP, Rt, Rn);
+}
+void ARM64XEmitter::LDAR(ARM64Reg Rt, ARM64Reg Rn)
+{
+	EncodeLoadStoreExcInst(30 + Is64Bit(Rt), SP, SP, Rt, Rn);
+}
+
+// Load/Store no-allocate pair (offset)
+void ARM64XEmitter::STNP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm)
+{
+	EncodeLoadStorePairedInst(0xA0, Rt, Rt2, Rn, imm);
+}
+void ARM64XEmitter::LDNP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm)
+{
+	EncodeLoadStorePairedInst(0xA1, Rt, Rt2, Rn, imm);
+}
+
+// Load/Store register (immediate post-indexed)
+// XXX: Most of these support vectors
+void ARM64XEmitter::STRB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(0x0E4, Rt, Rn, imm, 8);
+	else
+		EncodeLoadStoreIndexedInst(0x0E0,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDRB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(0x0E5, Rt, Rn, imm, 8);
+	else
+		EncodeLoadStoreIndexedInst(0x0E1,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDRSB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x0E6 : 0x0E7, Rt, Rn, imm, 8);
+	else
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x0E2 : 0x0E3,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::STRH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(0x1E4, Rt, Rn, imm, 16);
+	else
+		EncodeLoadStoreIndexedInst(0x1E0,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDRH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(0x1E5, Rt, Rn, imm, 16);
+	else
+		EncodeLoadStoreIndexedInst(0x1E1,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDRSH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x1E6 : 0x1E7, Rt, Rn, imm, 16);
+	else
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x1E2 : 0x1E3,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::STR(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x3E4 : 0x2E4, Rt, Rn, imm, Is64Bit(Rt) ? 64 : 32);
+	else
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x3E0 : 0x2E0,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDR(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x3E5 : 0x2E5, Rt, Rn, imm, Is64Bit(Rt) ? 64 : 32);
+	else
+		EncodeLoadStoreIndexedInst(Is64Bit(Rt) ? 0x3E1 : 0x2E1,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDRSW(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	if (type == INDEX_UNSIGNED)
+		EncodeLoadStoreIndexedInst(0x2E6, Rt, Rn, imm, 32);
+	else
+		EncodeLoadStoreIndexedInst(0x2E2,
+				type == INDEX_POST ? 1 : 3, Rt, Rn, imm);
+}
+
+// Load/Store register (register offset)
+void ARM64XEmitter::STRB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(0, 0, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDRB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(0, 1, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDRSB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	EncodeLoadStoreRegisterOffset(0, 3 - b64Bit, Rt, Rn, Rm);
+}
+void ARM64XEmitter::STRH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(1, 0, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDRH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(1, 1, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDRSH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	EncodeLoadStoreRegisterOffset(1, 3 - b64Bit, Rt, Rn, Rm);
+}
+void ARM64XEmitter::STR(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	EncodeLoadStoreRegisterOffset(2 + b64Bit, 0, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDR(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	bool b64Bit = Is64Bit(Rt);
+	EncodeLoadStoreRegisterOffset(2 + b64Bit, 1, Rt, Rn, Rm);
+}
+void ARM64XEmitter::LDRSW(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(2, 2, Rt, Rn, Rm);
+}
+void ARM64XEmitter::PRFM(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(3, 2, Rt, Rn, Rm);
+}
+
+// Load/Store register (unscaled offset)
+void ARM64XEmitter::STURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(0, 0, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(0, 1, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDURSB(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(0, Is64Bit(Rt) ? 2 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::STURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(1, 0, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(1, 1, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDURSH(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(1, Is64Bit(Rt) ? 2 : 3, Rt, Rn, imm);
+}
+void ARM64XEmitter::STUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(Is64Bit(Rt) ? 3 : 2, 0, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStoreUnscaled(Is64Bit(Rt) ? 3 : 2, 1, Rt, Rn, imm);
+}
+void ARM64XEmitter::LDURSW(ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	_assert_msg_(DYNA_REC, !Is64Bit(Rt), "%s must have a 64bit destination register!", __FUNCTION__);
+	EncodeLoadStoreUnscaled(2, 2, Rt, Rn, imm);
+}
+
+// Address of label/page PC-relative
+void ARM64XEmitter::ADR(ARM64Reg Rd, s32 imm)
+{
+	EncodeAddressInst(0, Rd, imm);
+}
+void ARM64XEmitter::ADRP(ARM64Reg Rd, s32 imm)
+{
+	EncodeAddressInst(1, Rd, imm >> 12);
+}
+
+// Wrapper around MOVZ+MOVK (and later MOVN)
+void ARM64XEmitter::MOVI2R(ARM64Reg Rd, u64 imm, bool optimize)
+{
+	unsigned int parts = Is64Bit(Rd) ? 4 : 2;
+	BitSet32 upload_part(0);
+
+	// Always start with a movz! Kills the dependency on the register.
+	bool use_movz = true;
+
+	if (!imm)
+	{
+		// Zero immediate, just clear the register. EOR is pointless when we have MOVZ, which looks clearer in disasm too.
+		MOVZ(Rd, 0, SHIFT_0);
+		return;
+	}
+
+	if ((Is64Bit(Rd) && imm == std::numeric_limits<u64>::max()) ||
+	    (!Is64Bit(Rd) && imm == std::numeric_limits<u32>::max()))
+	{
+		// Max unsigned value (or if signed, -1)
+		// Set to ~ZR
+		ARM64Reg ZR = Is64Bit(Rd) ? SP : WSP;
+		ORN(Rd, ZR, ZR, ArithOption(ZR, ST_LSL, 0));
+		return;
+	}
+
+	// TODO: Make some more systemic use of MOVN, but this will take care of most cases.
+	// Small negative integer. Use MOVN
+	if (!Is64Bit(Rd) && (imm | 0xFFFF0000) == imm)
+{
+		MOVN(Rd, ~imm, SHIFT_0);
+		return;
+	}
+
+
+	// XXX: Use MOVN when possible.
+	// XXX: Optimize more
+	// XXX: Support rotating immediates to save instructions
+	if (optimize)
+	{
+		for (unsigned int i = 0; i < parts; ++i)
+		{
+			if ((imm >> (i * 16)) & 0xFFFF)
+				upload_part[i] = 1;
+		}
+	}
+
+	u64 aligned_pc = (u64)GetCodePtr() & ~0xFFF;
+	s64 aligned_offset = (s64)imm - (s64)aligned_pc;
+	if (upload_part.Count() > 1 && std::abs(aligned_offset) < 0xFFFFFFFFLL)
+	{
+		// Immediate we are loading is within 4GB of our aligned range
+		// Most likely a address that we can load in one or two instructions
+		if (!(std::abs(aligned_offset) & 0xFFF))
+		{
+			// Aligned ADR
+			ADRP(Rd, (s32)aligned_offset);
+			return;
+		}
+		else
+		{
+			// If the address is within 1MB of PC we can load it in a single instruction still
+			s64 offset = (s64)imm - (s64)GetCodePtr();
+			if (offset >= -0xFFFFF && offset <= 0xFFFFF)
+			{
+				ADR(Rd, (s32)offset);
+				return;
+			}
+			else
+			{
+				ADRP(Rd, (s32)(aligned_offset & ~0xFFF));
+				ADD(Rd, Rd, imm & 0xFFF);
+				return;
+			}
+		}
+	}
+
+	for (unsigned i = 0; i < parts; ++i)
+	{
+		if (use_movz && upload_part[i])
+		{
+			MOVZ(Rd, (imm >> (i * 16)) & 0xFFFF, (ShiftAmount)i);
+			use_movz = false;
+		}
+		else
+		{
+			if (upload_part[i] || !optimize)
+				MOVK(Rd, (imm >> (i * 16)) & 0xFFFF, (ShiftAmount)i);
+		}
+	}
+}
+
+void ARM64XEmitter::ABI_PushRegisters(BitSet32 registers)
+{
+	int num_regs = registers.Count();
+
+	if (num_regs % 2)
+	{
+		bool first = true;
+
+		// Stack is required to be quad-word aligned.
+		u32 stack_size = ROUND_UP(num_regs * 8, 16);
+		u32 current_offset = 0;
+		std::vector<ARM64Reg> reg_pair;
+
+		for (auto it : registers)
+		{
+			if (first)
+			{
+				STR(INDEX_PRE, (ARM64Reg)(X0 + it), SP, -(s32)stack_size);
+				first = false;
+				current_offset += 16;
+			}
+			else
+			{
+				reg_pair.push_back((ARM64Reg)(X0 + it));
+				if (reg_pair.size() == 2)
+				{
+					STP(INDEX_UNSIGNED, reg_pair[0], reg_pair[1], SP, current_offset);
+					reg_pair.clear();
+					current_offset += 16;
+				}
+			}
+		}
+	}
+	else
+	{
+		std::vector<ARM64Reg> reg_pair;
+
+		for (auto it : registers)
+		{
+			reg_pair.push_back((ARM64Reg)(X0 + it));
+			if (reg_pair.size() == 2)
+			{
+				STP(INDEX_PRE, reg_pair[0], reg_pair[1], SP, -16);
+				reg_pair.clear();
+			}
+		}
+	}
+}
+
+void ARM64XEmitter::ABI_PopRegisters(BitSet32 registers, BitSet32 ignore_mask)
+{
+	int num_regs = registers.Count();
+
+	if (num_regs % 2)
+	{
+		bool first = true;
+
+		std::vector<ARM64Reg> reg_pair;
+
+		for (auto it : registers)
+		{
+			if (ignore_mask[it])
+				it = WSP;
+
+			if (first)
+			{
+				LDR(INDEX_POST, (ARM64Reg)(X0 + it), SP, 16);
+				first = false;
+			}
+			else
+			{
+				reg_pair.push_back((ARM64Reg)(X0 + it));
+				if (reg_pair.size() == 2)
+				{
+					LDP(INDEX_POST, reg_pair[0], reg_pair[1], SP, 16);
+					reg_pair.clear();
+				}
+			}
+		}
+	}
+	else
+	{
+		std::vector<ARM64Reg> reg_pair;
+
+		for (int i = 31; i >= 0; --i)
+		{
+			if (!registers[i])
+				continue;
+
+			int reg = i;
+
+			if (ignore_mask[reg])
+				reg = WSP;
+
+			reg_pair.push_back((ARM64Reg)(X0 + reg));
+			if (reg_pair.size() == 2)
+			{
+				LDP(INDEX_POST, reg_pair[1], reg_pair[0], SP, 16);
+				reg_pair.clear();
+			}
+		}
+	}
+}
+
+// Float Emitter
+void ARM64FloatEmitter::EmitLoadStoreImmediate(u8 size, u32 opc, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	u32 encoded_size = 0;
+	u32 encoded_imm = 0;
+
+	if (size == 8)
+		encoded_size = 0;
+	else if (size == 16)
+		encoded_size = 1;
+	else if (size == 32)
+		encoded_size = 2;
+	else if (size == 64)
+		encoded_size = 3;
+	else if (size == 128)
+		encoded_size = 0;
+
+	if (type == INDEX_UNSIGNED)
+	{
+		_assert_msg_(DYNA_REC, !(imm & ((size - 1) >> 3)), "%s(INDEX_UNSIGNED) immediate offset must be aligned to size! (%d) (%p)", __FUNCTION__, imm, m_emit->GetCodePtr());
+		_assert_msg_(DYNA_REC, imm >= 0, "%s(INDEX_UNSIGNED) immediate offset must be positive!", __FUNCTION__);
+		if (size == 16)
+			imm >>= 1;
+		else if (size == 32)
+			imm >>= 2;
+		else if (size == 64)
+			imm >>= 3;
+		else if (size == 128)
+			imm >>= 4;
+		encoded_imm = (imm & 0xFFF);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s immediate offset must be within range of -256 to 256!", __FUNCTION__);
+		encoded_imm = (imm & 0x1FF) << 2;
+		if (type == INDEX_POST)
+			encoded_imm |= 1;
+		else
+			encoded_imm |= 3;
+	}
+
+	Write32((encoded_size << 30) | (0xF << 26) | (type == INDEX_UNSIGNED ? (1 << 24) : 0) | \
+	        (size == 128 ? (1 << 23) : 0) | (opc << 22) | (encoded_imm << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::EmitScalar2Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rd), "%s only supports double and single registers!", __FUNCTION__);
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((M << 31) | (S << 29) | (0b11110001 << 21) | (type << 22) | (Rm << 16) | \
+	        (opcode << 12) | (1 << 11) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitThreeSame(bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__);
+	bool quad = IsQuad(Rd);
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((quad << 30) | (U << 29) | (0b1110001 << 21) | (size << 22) | \
+	        (Rm << 16) | (opcode << 11) | (1 << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitCopy(bool Q, u32 op, u32 imm5, u32 imm4, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((Q << 30) | (op << 29) | (0b111 << 25) | (imm5 << 16) | (imm4 << 11) | \
+	        (1 << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::Emit2RegMisc(bool Q, bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__);
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((Q << 30) | (U << 29) | (0b1110001 << 21) | (size << 22) | \
+	        (opcode << 12) | (1 << 11) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__);
+	bool quad = IsQuad(Rt);
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+
+	Write32((quad << 30) | (0b1101 << 24) | (L << 22) | (R << 21) | (opcode << 13) | \
+	        (S << 12) | (size << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsSingle(Rt), "%s doesn't support singles!", __FUNCTION__);
+	bool quad = IsQuad(Rt);
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((quad << 30) | (0x1B << 23) | (L << 22) | (R << 21) | (Rm << 16) | \
+	        (opcode << 13) | (S << 12) | (size << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::Emit1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__);
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((M << 31) | (S << 29) | (0xF1 << 21) | (type << 22) | (opcode << 15) | \
+	        (1 << 14) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitConversion(bool sf, bool S, u32 type, u32 rmode, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, Rn <= SP, "%s only supports GPR as source!", __FUNCTION__);
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((sf << 31) | (S << 29) | (0xF1 << 21) | (type << 22) | (rmode << 19) | \
+	        (opcode << 16) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitConvertScalarToInt(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round, bool sign)
+{
+	_dbg_assert_msg_(DYNA_REC, IsScalar(Rn), "fcvts: Rn must be floating point");
+	if (IsGPR(Rd))
+	{
+		// Use the encoding that transfers the result to a GPR.
+		bool sf = Is64Bit(Rd);
+		int type = IsDouble(Rn) ? 1 : 0;
+		Rd = DecodeReg(Rd);
+		Rn = DecodeReg(Rn);
+		int opcode = (sign ? 1 : 0);
+		int rmode = 0;
+		switch (round)
+		{
+		case ROUND_A: rmode = 0; opcode |= 4; break;
+		case ROUND_P: rmode = 1; break;
+		case ROUND_M: rmode = 2; break;
+		case ROUND_Z: rmode = 3; break;
+		case ROUND_N: rmode = 0; break;
+		}
+		EmitConversion2(sf, 0, true, type, rmode, opcode, 0, Rd, Rn);
+	}
+	else
+	{
+		// Use the encoding (vector, single) that keeps the result in the fp register.
+		int sz = IsDouble(Rn);
+		Rd = DecodeReg(Rd);
+		Rn = DecodeReg(Rn);
+		int opcode = 0;
+		switch (round)
+		{
+		case ROUND_A: opcode = 0x1C; break;
+		case ROUND_N: opcode = 0x1A; break;
+		case ROUND_M: opcode = 0x1B; break;
+		case ROUND_P: opcode = 0x1A; sz |= 2; break;
+		case ROUND_Z: opcode = 0x1B; sz |= 2; break;
+		}
+		Write32((0x5E << 24) | (sign << 29) | (sz << 22) | (1 << 21) | (opcode << 12) | (2 << 10) | (Rn << 5) | Rd);
+	}
+}
+
+void ARM64FloatEmitter::FCVTS(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round)
+{
+	EmitConvertScalarToInt(Rd, Rn, round, false);
+}
+
+void ARM64FloatEmitter::FCVTU(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round)
+{
+	EmitConvertScalarToInt(Rd, Rn, round, true);
+}
+
+void ARM64FloatEmitter::EmitConversion2(bool sf, bool S, bool direction, u32 type, u32 rmode, u32 opcode, int scale, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((sf << 31) | (S << 29) | (0xF0 << 21) | (direction << 21) | (type << 22) | (rmode << 19) | \
+		(opcode << 16) | (scale << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitCompare(bool M, bool S, u32 op, u32 opcode2, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rn), "%s doesn't support vector!", __FUNCTION__);
+	bool is_double = IsDouble(Rn);
+
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((M << 31) | (S << 29) | (0xF1 << 21) | (is_double << 22) | (Rm << 16) | \
+	        (op << 14) | (1 << 13) | (Rn << 5) | opcode2);
+}
+
+void ARM64FloatEmitter::EmitCondSelect(bool M, bool S, CCFlags cond, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__);
+	bool is_double = IsDouble(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((M << 31) | (S << 29) | (0xF1 << 21) | (is_double << 22) | (Rm << 16) | \
+	        (cond << 12) | (3 << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitPermute(u32 size, u32 op, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !IsSingle(Rd), "%s doesn't support singles!", __FUNCTION__);
+
+	bool quad = IsQuad(Rd);
+
+	u32 encoded_size = 0;
+	if (size == 16)
+		encoded_size = 1;
+	else if (size == 32)
+		encoded_size = 2;
+	else if (size == 64)
+		encoded_size = 3;
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((quad << 30) | (7 << 25) | (encoded_size << 22) | (Rm << 16) | (op << 12) | \
+	        (1 << 11) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitScalarImm(bool M, bool S, u32 type, u32 imm5, ARM64Reg Rd, u32 imm8)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__);
+
+	bool is_double = !IsSingle(Rd);
+
+	Rd = DecodeReg(Rd);
+
+	Write32((M << 31) | (S << 29) | (0xF1 << 21) | (is_double << 22) | (type << 22) | \
+	        (imm8 << 13) | (1 << 12) | (imm5 << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitShiftImm(bool Q, bool U, u32 immh, u32 immb, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, immh, "%s bad encoding! Can't have zero immh", __FUNCTION__);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((Q << 30) | (U << 29) | (0xF << 24) | (immh << 19) | (immb << 16) | \
+	        (opcode << 11) | (1 << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitScalarShiftImm(bool U, u32 immh, u32 immb, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((2 << 30) | (U << 29) | (0x3E << 23) | (immh << 19) | (immb << 16) | (opcode << 11) | (1 << 10) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitLoadStoreMultipleStructure(u32 size, bool L, u32 opcode, ARM64Reg Rt, ARM64Reg Rn)
+{
+	bool quad = IsQuad(Rt);
+	u32 encoded_size = 0;
+
+	if (size == 16)
+		encoded_size = 1;
+	else if (size == 32)
+		encoded_size = 2;
+	else if (size == 64)
+		encoded_size = 3;
+
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+
+	Write32((quad << 30) | (3 << 26) | (L << 22) | (opcode << 12) | \
+	        (encoded_size << 10) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::EmitLoadStoreMultipleStructurePost(u32 size, bool L, u32 opcode, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool quad = IsQuad(Rt);
+	u32 encoded_size = 0;
+
+	if (size == 16)
+		encoded_size = 1;
+	else if (size == 32)
+		encoded_size = 2;
+	else if (size == 64)
+		encoded_size = 3;
+
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((quad << 30) | (0b11001 << 23) | (L << 22) | (Rm << 16) | (opcode << 12) | \
+	        (encoded_size << 10) | (Rn << 5) | Rt);
+
+}
+
+void ARM64FloatEmitter::EmitScalar1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !IsQuad(Rd), "%s doesn't support vector!", __FUNCTION__);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+
+	Write32((M << 31) | (S << 29) | (0xF1 << 21) | (type << 22) | \
+	        (opcode << 15) | (1 << 14) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitVectorxElement(bool U, u32 size, bool L, u32 opcode, bool H, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool quad = IsQuad(Rd);
+
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+
+	Write32((quad << 30) | (U << 29) | (0xF <<  24) | (size << 22) | (L << 21) | \
+	        (Rm << 16) | (opcode << 12) | (H << 11) | (Rn << 5) | Rd);
+}
+
+void ARM64FloatEmitter::EmitLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	_assert_msg_(DYNA_REC, !(imm < -256 || imm > 255), "%s received too large offset: %d", __FUNCTION__, imm);
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+
+	Write32((size << 30) | (0xF << 26) | (op << 22) | ((imm & 0x1FF) << 12) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::EncodeLoadStorePair(u32 size, bool load, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	u32 type_encode = 0;
+	u32 opc = 0;
+
+	switch (type)
+	{
+	case INDEX_SIGNED:
+		type_encode = 0b010;
+		break;
+	case INDEX_POST:
+		type_encode = 0b001;
+		break;
+	case INDEX_PRE:
+		type_encode = 0b011;
+		break;
+	case INDEX_UNSIGNED:
+		_assert_msg_(DYNA_REC, false, "%s doesn't support INDEX_UNSIGNED!", __FUNCTION__);
+		break;
+	}
+
+	if (size == 128)
+	{
+		_assert_msg_(DYNA_REC, !(imm & 0xF), "%s received invalid offset 0x%x!", __FUNCTION__, imm);
+		opc = 2;
+		imm >>= 4;
+	}
+	else if (size == 64)
+	{
+		_assert_msg_(DYNA_REC, !(imm & 0x7), "%s received invalid offset 0x%x!", __FUNCTION__, imm);
+		opc = 1;
+		imm >>= 3;
+	}
+	else if (size == 32)
+	{
+		_assert_msg_(DYNA_REC, !(imm & 0x3), "%s received invalid offset 0x%x!", __FUNCTION__, imm);
+		opc = 0;
+		imm >>= 2;
+	}
+
+	Rt = DecodeReg(Rt);
+	Rt2 = DecodeReg(Rt2);
+	Rn = DecodeReg(Rn);
+
+	Write32((opc << 30) | (0b1011 << 26) | (type_encode << 23) | (load << 22) | \
+	        ((imm & 0x7F) << 15) | (Rt2 << 10) | (Rn << 5) | Rt);
+
+}
+
+void ARM64FloatEmitter::EncodeLoadStoreRegisterOffset(u32 size, bool load, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	_assert_msg_(DYNA_REC, Rm.GetType() == ArithOption::TYPE_EXTENDEDREG, "%s must contain an extended reg as Rm!", __FUNCTION__);
+
+	u32 encoded_size = 0;
+	u32 encoded_op = 0;
+	bool shift = false;
+
+	if (size == 8)
+	{
+		encoded_size = 0;
+		encoded_op = 0;
+	}
+	else if (size == 16)
+	{
+		encoded_size = 1;
+		encoded_op = 0;
+	}
+	else if (size == 32)
+	{
+		encoded_size = 2;
+		encoded_op = 0;
+	}
+	else if (size == 64)
+	{
+		encoded_size = 3;
+		encoded_op = 0;
+	}
+	else if (size == 128)
+	{
+		encoded_size = 0;
+		encoded_op = 2;
+	}
+
+	if (load)
+		encoded_op |= 1;
+
+	Rt = DecodeReg(Rt);
+	Rn = DecodeReg(Rn);
+	ARM64Reg decoded_Rm = DecodeReg(Rm.GetReg());
+
+	Write32((encoded_size << 30) | (encoded_op << 22) | (0b111100001 << 21) | (decoded_Rm << 16) | \
+	        Rm.GetData() | (1 << 11) | (Rn << 5) | Rt);
+}
+
+void ARM64FloatEmitter::LDR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EmitLoadStoreImmediate(size, 1, type, Rt, Rn, imm);
+}
+void ARM64FloatEmitter::STR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	EmitLoadStoreImmediate(size, 0, type, Rt, Rn, imm);
+}
+
+// Loadstore unscaled
+void ARM64FloatEmitter::LDUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	u32 encoded_size = 0;
+	u32 encoded_op = 0;
+
+	if (size == 8)
+	{
+		encoded_size = 0;
+		encoded_op = 1;
+	}
+	else if (size == 16)
+	{
+		encoded_size = 1;
+		encoded_op = 1;
+	}
+	else if (size == 32)
+	{
+		encoded_size = 2;
+		encoded_op = 1;
+	}
+	else if (size == 64)
+	{
+		encoded_size = 3;
+		encoded_op = 1;
+	}
+	else if (size == 128)
+	{
+		encoded_size = 0;
+		encoded_op = 3;
+	}
+
+	EmitLoadStoreUnscaled(encoded_size, encoded_op, Rt, Rn, imm);
+}
+void ARM64FloatEmitter::STUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm)
+{
+	u32 encoded_size = 0;
+	u32 encoded_op = 0;
+
+	if (size == 8)
+	{
+		encoded_size = 0;
+		encoded_op = 0;
+	}
+	else if (size == 16)
+	{
+		encoded_size = 1;
+		encoded_op = 0;
+	}
+	else if (size == 32)
+	{
+		encoded_size = 2;
+		encoded_op = 0;
+	}
+	else if (size == 64)
+	{
+		encoded_size = 3;
+		encoded_op = 0;
+	}
+	else if (size == 128)
+	{
+		encoded_size = 0;
+		encoded_op = 2;
+	}
+
+	EmitLoadStoreUnscaled(encoded_size, encoded_op, Rt, Rn, imm);
+
+}
+
+// Loadstore single structure
+void ARM64FloatEmitter::LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn)
+{
+	bool S = 0;
+	u32 opcode = 0;
+	u32 encoded_size = 0;
+	ARM64Reg encoded_reg = INVALID_REG;
+
+	if (size == 8)
+	{
+		S = (index & 4) != 0;
+		opcode = 0;
+		encoded_size = index & 3;
+		if (index & 8)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 16)
+	{
+		S = (index & 2) != 0;
+		opcode = 2;
+		encoded_size = (index & 1) << 1;
+		if (index & 4)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 32)
+	{
+		S = (index & 1) != 0;
+		opcode = 4;
+		encoded_size = 0;
+		if (index & 2)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+	else if (size == 64)
+	{
+		S = 0;
+		opcode = 4;
+		encoded_size = 1;
+		if (index == 1)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+
+	EmitLoadStoreSingleStructure(1, 0, opcode, S, encoded_size, encoded_reg, Rn);
+}
+
+void ARM64FloatEmitter::LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool S = 0;
+	u32 opcode = 0;
+	u32 encoded_size = 0;
+	ARM64Reg encoded_reg = INVALID_REG;
+
+	if (size == 8)
+	{
+		S = (index & 4) != 0;
+		opcode = 0;
+		encoded_size = index & 3;
+		if (index & 8)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 16)
+	{
+		S = (index & 2) != 0;
+		opcode = 2;
+		encoded_size = (index & 1) << 1;
+		if (index & 4)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 32)
+	{
+		S = (index & 1) != 0;
+		opcode = 4;
+		encoded_size = 0;
+		if (index & 2)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+	else if (size == 64)
+	{
+		S = 0;
+		opcode = 4;
+		encoded_size = 1;
+		if (index == 1)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+
+	EmitLoadStoreSingleStructure(1, 0, opcode, S, encoded_size, encoded_reg, Rn, Rm);
+}
+
+void ARM64FloatEmitter::LD1R(u8 size, ARM64Reg Rt, ARM64Reg Rn)
+{
+	EmitLoadStoreSingleStructure(1, 0, 6, 0, size >> 4, Rt, Rn);
+}
+
+void ARM64FloatEmitter::ST1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn)
+{
+	bool S = 0;
+	u32 opcode = 0;
+	u32 encoded_size = 0;
+	ARM64Reg encoded_reg = INVALID_REG;
+
+	if (size == 8)
+	{
+		S = (index & 4) != 0;
+		opcode = 0;
+		encoded_size = index & 3;
+		if (index & 8)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 16)
+	{
+		S = (index & 2) != 0;
+		opcode = 2;
+		encoded_size = (index & 1) << 1;
+		if (index & 4)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 32)
+	{
+		S = (index & 1) != 0;
+		opcode = 4;
+		encoded_size = 0;
+		if (index & 2)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+	else if (size == 64)
+	{
+		S = 0;
+		opcode = 4;
+		encoded_size = 1;
+		if (index == 1)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+
+	EmitLoadStoreSingleStructure(0, 0, opcode, S, encoded_size, encoded_reg, Rn);
+}
+
+void ARM64FloatEmitter::ST1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Reg Rm)
+{
+	bool S = 0;
+	u32 opcode = 0;
+	u32 encoded_size = 0;
+	ARM64Reg encoded_reg = INVALID_REG;
+
+	if (size == 8)
+	{
+		S = (index & 4) != 0;
+		opcode = 0;
+		encoded_size = index & 3;
+		if (index & 8)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 16)
+	{
+		S = (index & 2) != 0;
+		opcode = 2;
+		encoded_size = (index & 1) << 1;
+		if (index & 4)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+
+	}
+	else if (size == 32)
+	{
+		S = (index & 1) != 0;
+		opcode = 4;
+		encoded_size = 0;
+		if (index & 2)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+	else if (size == 64)
+	{
+		S = 0;
+		opcode = 4;
+		encoded_size = 1;
+		if (index == 1)
+			encoded_reg = EncodeRegToQuad(Rt);
+		else
+			encoded_reg = EncodeRegToDouble(Rt);
+	}
+
+	EmitLoadStoreSingleStructure(0, 0, opcode, S, encoded_size, encoded_reg, Rn, Rm);
+}
+
+// Loadstore multiple structure
+void ARM64FloatEmitter::LD1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__);
+	u32 opcode = 0;
+	if (count == 1)
+		opcode = 0b111;
+	else if (count == 2)
+		opcode = 0b1010;
+	else if (count == 3)
+		opcode = 0b0110;
+	else if (count == 4)
+		opcode = 0b0010;
+	EmitLoadStoreMultipleStructure(size, 1, opcode, Rt, Rn);
+}
+void ARM64FloatEmitter::LD1(u8 size, u8 count, IndexType type, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__);
+	_assert_msg_(DYNA_REC, type == INDEX_POST, "%s only supports post indexing!", __FUNCTION__);
+
+	u32 opcode = 0;
+	if (count == 1)
+		opcode = 0b111;
+	else if (count == 2)
+		opcode = 0b1010;
+	else if (count == 3)
+		opcode = 0b0110;
+	else if (count == 4)
+		opcode = 0b0010;
+	EmitLoadStoreMultipleStructurePost(size, 1, opcode, Rt, Rn, Rm);
+}
+void ARM64FloatEmitter::ST1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn)
+{
+	_assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__);
+	u32 opcode = 0;
+	if (count == 1)
+		opcode = 0b111;
+	else if (count == 2)
+		opcode = 0b1010;
+	else if (count == 3)
+		opcode = 0b0110;
+	else if (count == 4)
+		opcode = 0b0010;
+	EmitLoadStoreMultipleStructure(size, 0, opcode, Rt, Rn);
+}
+void ARM64FloatEmitter::ST1(u8 size, u8 count, IndexType type, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm)
+{
+	_assert_msg_(DYNA_REC, !(count == 0 || count > 4), "%s must have a count of 1 to 4 registers!", __FUNCTION__);
+	_assert_msg_(DYNA_REC, type == INDEX_POST, "%s only supports post indexing!", __FUNCTION__);
+
+	u32 opcode = 0;
+	if (count == 1)
+		opcode = 0b111;
+	else if (count == 2)
+		opcode = 0b1010;
+	else if (count == 3)
+		opcode = 0b0110;
+	else if (count == 4)
+		opcode = 0b0010;
+	EmitLoadStoreMultipleStructurePost(size, 0, opcode, Rt, Rn, Rm);
+}
+
+// Scalar - 1 Source
+void ARM64FloatEmitter::FMOV(ARM64Reg Rd, ARM64Reg Rn, bool top)
+{
+	if (IsScalar(Rd) && IsScalar(Rn))
+	{
+		EmitScalar1Source(0, 0, IsDouble(Rd), 0, Rd, Rn);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, !IsQuad(Rd) && !IsQuad(Rn), "FMOV can't move to/from quads");
+		int rmode = 0;
+		int opcode = 6;
+		int sf = 0;
+		if (IsSingle(Rd) && !Is64Bit(Rn) && !top)
+		{
+			// GPR to scalar single
+			opcode |= 1;
+		}
+		else if (!Is64Bit(Rd) && IsSingle(Rn) && !top)
+		{
+			// Scalar single to GPR - defaults are correct
+		}
+		else
+		{
+			// TODO
+			_assert_msg_(DYNA_REC, 0, "FMOV: Unhandled case");
+		}
+		Rd = DecodeReg(Rd);
+		Rn = DecodeReg(Rn);
+		Write32((sf << 31) | (0x1e2 << 20) | (rmode << 19) | (opcode << 16) | (Rn << 5) | Rd);
+	}
+}
+
+// Loadstore paired
+void ARM64FloatEmitter::LDP(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStorePair(size, true, type, Rt, Rt2, Rn, imm);
+}
+void ARM64FloatEmitter::STP(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm)
+{
+	EncodeLoadStorePair(size, false, type, Rt, Rt2, Rn, imm);
+}
+
+// Loadstore register offset
+void ARM64FloatEmitter::STR(u8 size, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(size, false, Rt, Rn, Rm);
+}
+void ARM64FloatEmitter::LDR(u8 size, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm)
+{
+	EncodeLoadStoreRegisterOffset(size, true, Rt, Rn, Rm);
+}
+
+void ARM64FloatEmitter::FABS(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EmitScalar1Source(0, 0, IsDouble(Rd), 1, Rd, Rn);
+}
+void ARM64FloatEmitter::FNEG(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EmitScalar1Source(0, 0, IsDouble(Rd), 2, Rd, Rn);
+}
+void ARM64FloatEmitter::FSQRT(ARM64Reg Rd, ARM64Reg Rn)
+{
+	EmitScalar1Source(0, 0, IsDouble(Rd), 3, Rd, Rn);
+}
+
+
+// Scalar - 2 Source
+void ARM64FloatEmitter::FADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 2, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 0, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 3, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 1, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMAX(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 4, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMIN(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 5, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMAXNM(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 6, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMINNM(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 7, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FNMUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitScalar2Source(0, 0, IsDouble(Rd), 8, Rd, Rn, Rm);
+}
+
+void ARM64FloatEmitter::FMADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EmitScalar3Source(IsDouble(Rd), Rd, Rn, Rm, Ra, 0);
+}
+void ARM64FloatEmitter::FMSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EmitScalar3Source(IsDouble(Rd), Rd, Rn, Rm, Ra, 1);
+}
+void ARM64FloatEmitter::FNMADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EmitScalar3Source(IsDouble(Rd), Rd, Rn, Rm, Ra, 2);
+}
+void ARM64FloatEmitter::FNMSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra)
+{
+	EmitScalar3Source(IsDouble(Rd), Rd, Rn, Rm, Ra, 3);
+}
+
+void ARM64FloatEmitter::EmitScalar3Source(bool isDouble, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra, int opcode)
+{
+	int type = isDouble ? 1 : 0;
+	Rd = DecodeReg(Rd);
+	Rn = DecodeReg(Rn);
+	Rm = DecodeReg(Rm);
+	Ra = DecodeReg(Ra);
+	int o1 = opcode >> 1;
+	int o0 = opcode & 1;
+	m_emit->Write32((0x1F << 24) | (type << 22) | (o1 << 21) | (Rm << 16) | (o0 << 15) | (Ra << 10) | (Rn << 5) | Rd);
+}
+
+// Scalar floating point immediate
+void ARM64FloatEmitter::FMOV(ARM64Reg Rd, uint8_t imm8)
+{
+	EmitScalarImm(0, 0, 0, 0, Rd, imm8);
+}
+
+// Vector
+void ARM64FloatEmitter::AND(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, 0, 3, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::BSL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(1, 1, 3, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index)
+{
+	u32 imm5 = 0;
+
+	if (size == 8)
+	{
+		imm5 = 1;
+		imm5 |= index << 1;
+	}
+	else if (size == 16)
+	{
+		imm5 = 2;
+		imm5 |= index << 2;
+	}
+	else if (size == 32)
+	{
+		imm5 = 4;
+		imm5 |= index << 3;
+	}
+	else if (size == 64)
+	{
+		imm5 = 8;
+		imm5 |= index << 4;
+	}
+
+	EmitCopy(IsQuad(Rd), 0, imm5, 0, Rd, Rn);
+}
+void ARM64FloatEmitter::FABS(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0xF, Rd, Rn);
+}
+void ARM64FloatEmitter::FADD(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, size >> 6, 0x1A, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMLA(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, size >> 6, 0x19, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FCVTL(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(false, 0, size >> 6, 0x17, Rd, Rn);
+}
+void ARM64FloatEmitter::FCVTL2(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(true, 0, size >> 6, 0x17, Rd, Rn);
+}
+void ARM64FloatEmitter::FCVTN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, dest_size >> 5, 0x16, Rd, Rn);
+}
+void ARM64FloatEmitter::FCVTZS(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0x1B, Rd, Rn);
+}
+void ARM64FloatEmitter::FCVTZU(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 2 | (size >> 6), 0x1B, Rd, Rn);
+}
+void ARM64FloatEmitter::FDIV(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(1, size >> 6, 0x1F, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(1, size >> 6, 0x1B, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FNEG(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 2 | (size >> 6), 0xF, Rd, Rn);
+}
+void ARM64FloatEmitter::FRSQRTE(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 2 | (size >> 6), 0x1D, Rd, Rn);
+}
+void ARM64FloatEmitter::FSUB(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, 2 | (size >> 6), 0x1A, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FMLS(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, 2 | (size >> 6), 0x19, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::NOT(ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 0, 5, Rd, Rn);
+}
+void ARM64FloatEmitter::ORR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, 2, 3, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::REV16(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, size >> 4, 1, Rd, Rn);
+}
+void ARM64FloatEmitter::REV32(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, size >> 4, 0, Rd, Rn);
+}
+void ARM64FloatEmitter::REV64(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, size >> 4, 0, Rd, Rn);
+}
+void ARM64FloatEmitter::SCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, size >> 6, 0x1D, Rd, Rn);
+}
+void ARM64FloatEmitter::UCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, size >> 6, 0x1D, Rd, Rn);
+}
+void ARM64FloatEmitter::SCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn, int scale)
+{
+	int imm = size * 2 - scale;
+	EmitShiftImm(IsQuad(Rd), 0, imm >> 3, imm & 7, 0x1C, Rd, Rn);
+}
+void ARM64FloatEmitter::UCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn, int scale)
+{
+	int imm = size * 2 - scale;
+	EmitShiftImm(IsQuad(Rd), 1, imm >> 3, imm & 7, 0x1C, Rd, Rn);
+}
+
+void ARM64FloatEmitter::XTN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, dest_size >> 4, 0x12, Rd, Rn);
+}
+
+// Move
+void ARM64FloatEmitter::DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	u32 imm5 = 0;
+
+	if (size == 8)
+		imm5 = 1;
+	else if (size == 16)
+		imm5 = 2;
+	else if (size == 32)
+		imm5 = 4;
+	else if (size == 64)
+		imm5 = 8;
+
+	EmitCopy(IsQuad(Rd), 0, imm5, 1, Rd, Rn);
+
+}
+void ARM64FloatEmitter::INS(u8 size, ARM64Reg Rd, u8 index, ARM64Reg Rn)
+{
+	u32 imm5 = 0;
+
+	if (size == 8)
+	{
+		imm5 = 1;
+		imm5 |= index << 1;
+	}
+	else if (size == 16)
+	{
+		imm5 = 2;
+		imm5 |= index << 2;
+	}
+	else if (size == 32)
+	{
+		imm5 = 4;
+		imm5 |= index << 3;
+	}
+	else if (size == 64)
+	{
+		imm5 = 8;
+		imm5 |= index << 4;
+	}
+
+	EmitCopy(1, 0, imm5, 3, Rd, Rn);
+}
+void ARM64FloatEmitter::INS(u8 size, ARM64Reg Rd, u8 index1, ARM64Reg Rn, u8 index2)
+{
+	u32 imm5 = 0, imm4 = 0;
+
+	if (size == 8)
+	{
+		imm5 = 1;
+		imm5 |= index1 << 1;
+		imm4 = index2;
+	}
+	else if (size == 16)
+	{
+		imm5 = 2;
+		imm5 |= index1 << 2;
+		imm4 = index2 << 1;
+	}
+	else if (size == 32)
+	{
+		imm5 = 4;
+		imm5 |= index1 << 3;
+		imm4 = index2 << 2;
+	}
+	else if (size == 64)
+	{
+		imm5 = 8;
+		imm5 |= index1 << 4;
+		imm4 = index2 << 3;
+	}
+
+	EmitCopy(1, 1, imm5, imm4, Rd, Rn);
+}
+
+void ARM64FloatEmitter::UMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index)
+{
+	bool b64Bit = Is64Bit(Rd);
+	_assert_msg_(DYNA_REC, Rd < SP, "%s destination must be a GPR!", __FUNCTION__);
+	_assert_msg_(DYNA_REC, !(b64Bit && size != 64), "%s must have a size of 64 when destination is 64bit!", __FUNCTION__);
+	u32 imm5 = 0;
+
+	if (size == 8)
+	{
+		imm5 = 1;
+		imm5 |= index << 1;
+	}
+	else if (size == 16)
+	{
+		imm5 = 2;
+		imm5 |= index << 2;
+	}
+	else if (size == 32)
+	{
+		imm5 = 4;
+		imm5 |= index << 3;
+	}
+	else if (size == 64)
+	{
+		imm5 = 8;
+		imm5 |= index << 4;
+	}
+
+	EmitCopy(b64Bit, 0, imm5, 7, Rd, Rn);
+}
+void ARM64FloatEmitter::SMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index)
+{
+	bool b64Bit = Is64Bit(Rd);
+	_assert_msg_(DYNA_REC, Rd < SP, "%s destination must be a GPR!", __FUNCTION__);
+	_assert_msg_(DYNA_REC, size != 64, "%s doesn't support 64bit destination. Use UMOV!", __FUNCTION__);
+	u32 imm5 = 0;
+
+	if (size == 8)
+	{
+		imm5 = 1;
+		imm5 |= index << 1;
+	}
+	else if (size == 16)
+	{
+		imm5 = 2;
+		imm5 |= index << 2;
+	}
+	else if (size == 32)
+	{
+		imm5 = 4;
+		imm5 |= index << 3;
+	}
+
+	EmitCopy(b64Bit, 0, imm5, 5, Rd, Rn);
+}
+
+// One source
+void ARM64FloatEmitter::FCVT(u8 size_to, u8 size_from, ARM64Reg Rd, ARM64Reg Rn)
+{
+	u32 dst_encoding = 0;
+	u32 src_encoding = 0;
+
+	if (size_to == 16)
+		dst_encoding = 3;
+	else if (size_to == 32)
+		dst_encoding = 0;
+	else if (size_to == 64)
+		dst_encoding = 1;
+
+	if (size_from == 16)
+		src_encoding = 3;
+	else if (size_from == 32)
+		src_encoding = 0;
+	else if (size_from == 64)
+		src_encoding = 1;
+
+	Emit1Source(0, 0, src_encoding, 4 | dst_encoding, Rd, Rn);
+}
+
+void ARM64FloatEmitter::SCVTF(ARM64Reg Rd, ARM64Reg Rn)
+{
+	if (IsScalar(Rn))
+	{
+		// Source is in FP register (like destination!). We must use a vector encoding.
+		bool sign = false;
+		Rd = DecodeReg(Rd);
+		Rn = DecodeReg(Rn);
+		int sz = IsDouble(Rn);
+		Write32((0x5e << 24) | (sign << 29) | (sz << 22) | (0x876 << 10) | (Rn << 5) | Rd);
+	}
+	else
+	{
+		bool sf = Is64Bit(Rn);
+		u32 type = 0;
+		if (IsDouble(Rd))
+			type = 1;
+		EmitConversion(sf, 0, type, 0, 2, Rd, Rn);
+	}
+}
+
+void ARM64FloatEmitter::UCVTF(ARM64Reg Rd, ARM64Reg Rn)
+{
+	if (IsScalar(Rn))
+	{
+		// Source is in FP register (like destination!). We must use a vector encoding.
+		bool sign = true;
+		Rd = DecodeReg(Rd);
+		Rn = DecodeReg(Rn);
+		int sz = IsDouble(Rn);
+		Write32((0x5e << 24) | (sign << 29) | (sz << 22) | (0x876 << 10) | (Rn << 5) | Rd);
+	}
+	else
+	{
+		bool sf = Is64Bit(Rn);
+		u32 type = 0;
+		if (IsDouble(Rd))
+			type = 1;
+
+		EmitConversion(sf, 0, type, 0, 3, Rd, Rn);
+	}
+}
+
+void ARM64FloatEmitter::SCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale)
+{
+	bool sf = Is64Bit(Rn);
+	u32 type = 0;
+	if (IsDouble(Rd))
+		type = 1;
+
+	EmitConversion2(sf, 0, false, type, 0, 2, 64 - scale, Rd, Rn);
+}
+
+void ARM64FloatEmitter::UCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale)
+{
+	bool sf = Is64Bit(Rn);
+	u32 type = 0;
+	if (IsDouble(Rd))
+		type = 1;
+
+	EmitConversion2(sf, 0, false, type, 0, 3, 64 - scale, Rd, Rn);
+}
+
+void ARM64FloatEmitter::FCMP(ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitCompare(0, 0, 0, 0, Rn, Rm);
+}
+void ARM64FloatEmitter::FCMP(ARM64Reg Rn)
+{
+	EmitCompare(0, 0, 0, 8, Rn, (ARM64Reg)0);
+}
+void ARM64FloatEmitter::FCMPE(ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitCompare(0, 0, 0, 0x10, Rn, Rm);
+}
+void ARM64FloatEmitter::FCMPE(ARM64Reg Rn)
+{
+	EmitCompare(0, 0, 0, 0x18, Rn, (ARM64Reg)0);
+}
+void ARM64FloatEmitter::FCMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(0, size >> 6, 0x1C, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FCMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0x1D, Rd, Rn);
+}
+void ARM64FloatEmitter::FCMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(1, size >> 6, 0x1C, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FCMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 2 | (size >> 6), 0x1C, Rd, Rn);
+}
+void ARM64FloatEmitter::FCMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitThreeSame(1, 2 | (size >> 6), 0x1C, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::FCMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0x0C, Rd, Rn);
+}
+void ARM64FloatEmitter::FCMLE(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 1, 2 | (size >> 6), 0xD, Rd, Rn);
+}
+void ARM64FloatEmitter::FCMLT(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0xE, Rd, Rn);
+}
+
+void ARM64FloatEmitter::FCSEL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond)
+{
+	EmitCondSelect(0, 0, cond, Rd, Rn, Rm);
+}
+
+// Permute
+void ARM64FloatEmitter::UZP1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b001, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::TRN1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b010, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::ZIP1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b011, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::UZP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b101, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::TRN2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b110, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::ZIP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+	EmitPermute(size, 0b111, Rd, Rn, Rm);
+}
+
+// Shift by immediate
+void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	SSHLL(src_size, Rd, Rn, shift, false);
+}
+void ARM64FloatEmitter::SSHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	SSHLL(src_size, Rd, Rn, shift, true);
+}
+void ARM64FloatEmitter::SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	SHRN(dest_size, Rd, Rn, shift, false);
+}
+void ARM64FloatEmitter::SHRN2(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	SHRN(dest_size, Rd, Rn, shift, true);
+}
+void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	USHLL(src_size, Rd, Rn, shift, false);
+}
+void ARM64FloatEmitter::USHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+	USHLL(src_size, Rd, Rn, shift, true);
+}
+void ARM64FloatEmitter::SXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	SXTL(src_size, Rd, Rn, false);
+}
+void ARM64FloatEmitter::SXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	SXTL(src_size, Rd, Rn, true);
+}
+void ARM64FloatEmitter::UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	UXTL(src_size, Rd, Rn, false);
+}
+void ARM64FloatEmitter::UXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn)
+{
+	UXTL(src_size, Rd, Rn, true);
+}
+
+void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper)
+{
+	_assert_msg_(DYNA_REC, shift < src_size, "%s shift amount must less than the element size!", __FUNCTION__);
+	u32 immh = 0;
+	u32 immb = shift & 0xFFF;
+
+	if (src_size == 8)
+	{
+		immh = 1;
+	}
+	else if (src_size == 16)
+	{
+		immh = 2 | ((shift >> 3) & 1);
+	}
+	else if (src_size == 32)
+	{
+		immh = 4 | ((shift >> 3) & 3);;
+	}
+	EmitShiftImm(upper, 0, immh, immb, 0b10100, Rd, Rn);
+}
+
+void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper)
+{
+	_assert_msg_(DYNA_REC, shift < src_size, "%s shift amount must less than the element size!", __FUNCTION__);
+	u32 immh = 0;
+	u32 immb = shift & 0xFFF;
+
+	if (src_size == 8)
+	{
+		immh = 1;
+	}
+	else if (src_size == 16)
+	{
+		immh = 2 | ((shift >> 3) & 1);
+	}
+	else if (src_size == 32)
+	{
+		immh = 4 | ((shift >> 3) & 3);;
+	}
+	EmitShiftImm(upper, 1, immh, immb, 0b10100, Rd, Rn);
+}
+
+void ARM64FloatEmitter::SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper)
+{
+	_assert_msg_(DYNA_REC, shift < dest_size, "%s shift amount must less than the element size!", __FUNCTION__);
+	u32 immh = 0;
+	u32 immb = shift & 0xFFF;
+
+	if (dest_size == 8)
+	{
+		immh = 1;
+	}
+	else if (dest_size == 16)
+	{
+		immh = 2 | ((shift >> 3) & 1);
+	}
+	else if (dest_size == 32)
+	{
+		immh = 4 | ((shift >> 3) & 3);;
+	}
+	EmitShiftImm(upper, 1, immh, immb, 0b10000, Rd, Rn);
+}
+
+void ARM64FloatEmitter::SXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, bool upper)
+{
+	SSHLL(src_size, Rd, Rn, 0, upper);
+}
+
+void ARM64FloatEmitter::UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, bool upper)
+{
+	USHLL(src_size, Rd, Rn, 0, upper);
+}
+
+// vector x indexed element
+void ARM64FloatEmitter::FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index)
+{
+	_assert_msg_(DYNA_REC, size == 32 || size == 64, "%s only supports 32bit or 64bit size!", __FUNCTION__);
+
+	bool L = false;
+	bool H = false;
+	if (size == 32)
+	{
+		L = index & 1;
+		H = (index >> 1) & 1;
+	}
+	else if (size == 64)
+	{
+		H = index == 1;
+	}
+
+	EmitVectorxElement(0, 2 | (size >> 6), L, 0x9, H, Rd, Rn, Rm);
+}
+
+void ARM64FloatEmitter::FMLA(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index)
+{
+	_assert_msg_(DYNA_REC, size == 32 || size == 64, "%s only supports 32bit or 64bit size!", __FUNCTION__);
+
+	bool L = false;
+	bool H = false;
+	if (size == 32)
+	{
+		L = index & 1;
+		H = (index >> 1) & 1;
+	}
+	else if (size == 64)
+	{
+		H = index == 1;
+	}
+
+	EmitVectorxElement(0, 2 | (size >> 6), L, 1, H, Rd, Rn, Rm);
+}
+
+void ARM64FloatEmitter::ABI_PushRegisters(BitSet32 registers, ARM64Reg tmp)
+{
+	bool bundled_loadstore = false;
+
+	for (int i = 0; i < 32; ++i)
+	{
+		if (!registers[i])
+			continue;
+
+		int count = 0;
+		while (++count < 4 && (i + count) < 32 && registers[i + count]) {}
+		if (count > 1)
+		{
+			bundled_loadstore = true;
+			break;
+		}
+	}
+
+	if (bundled_loadstore && tmp != INVALID_REG)
+	{
+		int num_regs = registers.Count();
+		m_emit->SUB(SP, SP, num_regs * 16);
+		m_emit->ADD(tmp, SP, 0);
+		std::vector<ARM64Reg> island_regs;
+		for (int i = 0; i < 32; ++i)
+		{
+			if (!registers[i])
+				continue;
+
+			int count = 0;
+
+			// 0 = true
+			// 1 < 4 && registers[i + 1] true!
+			// 2 < 4 && registers[i + 2] true!
+			// 3 < 4 && registers[i + 3] true!
+			// 4 < 4 && registers[i + 4] false!
+			while (++count < 4 && (i + count) < 32 && registers[i + count]) {}
+
+			if (count == 1)
+				island_regs.push_back((ARM64Reg)(Q0 + i));
+			else
+				ST1(64, count, INDEX_POST, (ARM64Reg)(Q0 + i), tmp);
+
+			i += count - 1;
+		}
+
+		// Handle island registers
+		std::vector<ARM64Reg> pair_regs;
+		for (auto& it : island_regs)
+		{
+			pair_regs.push_back(it);
+			if (pair_regs.size() == 2)
+			{
+				STP(128, INDEX_POST, pair_regs[0], pair_regs[1], tmp, 32);
+				pair_regs.clear();
+			}
+		}
+		if (pair_regs.size())
+			STR(128, INDEX_POST, pair_regs[0], tmp, 16);
+	}
+	else
+	{
+		std::vector<ARM64Reg> pair_regs;
+		for (auto it : registers)
+		{
+			pair_regs.push_back((ARM64Reg)(Q0 + it));
+			if (pair_regs.size() == 2)
+			{
+				STP(128, INDEX_PRE, pair_regs[0], pair_regs[1], SP, -32);
+				pair_regs.clear();
+			}
+		}
+		if (pair_regs.size())
+			STR(128, INDEX_PRE, pair_regs[0], SP, -16);
+	}
+}
+void ARM64FloatEmitter::ABI_PopRegisters(BitSet32 registers, ARM64Reg tmp)
+{
+	bool bundled_loadstore = false;
+	int num_regs = registers.Count();
+
+	for (int i = 0; i < 32; ++i)
+	{
+		if (!registers[i])
+			continue;
+
+		int count = 0;
+		while (++count < 4 && (i + count) < 32 && registers[i + count]) {}
+		if (count > 1)
+		{
+			bundled_loadstore = true;
+			break;
+		}
+	}
+
+	if (bundled_loadstore && tmp != INVALID_REG)
+	{
+		// The temporary register is only used to indicate that we can use this code path
+		std::vector<ARM64Reg> island_regs;
+		for (int i = 0; i < 32; ++i)
+		{
+			if (!registers[i])
+				continue;
+
+			int count = 0;
+			while (++count < 4 && (i + count) < 32 && registers[i + count]) {}
+
+			if (count == 1)
+				island_regs.push_back((ARM64Reg)(Q0 + i));
+			else
+				LD1(64, count, INDEX_POST, (ARM64Reg)(Q0 + i), SP);
+
+			i += count - 1;
+		}
+
+		// Handle island registers
+		std::vector<ARM64Reg> pair_regs;
+		for (auto& it : island_regs)
+		{
+			pair_regs.push_back(it);
+			if (pair_regs.size() == 2)
+			{
+				LDP(128, INDEX_POST, pair_regs[0], pair_regs[1], SP, 32);
+				pair_regs.clear();
+			}
+		}
+		if (pair_regs.size())
+			LDR(128, INDEX_POST, pair_regs[0], SP, 16);
+	}
+	else
+	{
+		bool odd = num_regs % 2;
+		std::vector<ARM64Reg> pair_regs;
+		for (int i = 31; i >= 0; --i)
+		{
+			if (!registers[i])
+				continue;
+
+			if (odd)
+			{
+				// First load must be a regular LDR if odd
+				odd = false;
+				LDR(128, INDEX_POST, (ARM64Reg)(Q0 + i), SP, 16);
+			}
+			else
+			{
+				pair_regs.push_back((ARM64Reg)(Q0 + i));
+				if (pair_regs.size() == 2)
+				{
+					LDP(128, INDEX_POST, pair_regs[1], pair_regs[0], SP, 32);
+					pair_regs.clear();
+				}
+			}
+		}
+	}
+}
+
+
+void ARM64XEmitter::ANDI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	unsigned int n, imm_s, imm_r;
+	if (!Is64Bit(Rn))
+		imm &= 0xFFFFFFFF;
+	if (IsImmLogical(imm, Is64Bit(Rn) ? 64 : 32, &n, &imm_s, &imm_r))
+	{
+		AND(Rd, Rn, imm_r, imm_s, n != 0);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "ANDSI2R - failed to construct logical immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		AND(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::ORRI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	unsigned int n, imm_s, imm_r;
+	if (IsImmLogical(imm, Is64Bit(Rn) ? 64 : 32, &n, &imm_s, &imm_r))
+	{
+		ORR(Rd, Rn, imm_r, imm_s, n != 0);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "ORRI2R - failed to construct logical immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		ORR(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::EORI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	unsigned int n, imm_s, imm_r;
+	if (IsImmLogical(imm, Is64Bit(Rn) ? 64 : 32, &n, &imm_s, &imm_r))
+	{
+		EOR(Rd, Rn, imm_r, imm_s, n != 0);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "EORI2R - failed to construct logical immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		EOR(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::ANDSI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	unsigned int n, imm_s, imm_r;
+	if (IsImmLogical(imm, Is64Bit(Rn) ? 64 : 32, &n, &imm_s, &imm_r))
+	{
+		ANDS(Rd, Rn, imm_r, imm_s, n != 0);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "ANDSI2R - failed to construct logical immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		ANDS(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::ADDI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+	{
+		ADD(Rd, Rn, val, shift);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "ADDI2R - failed to construct arithmetic immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		ADD(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::SUBI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+	{
+		SUB(Rd, Rn, val, shift);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "SUBI2R - failed to construct arithmetic immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		SUB(Rd, Rn, scratch);
+	}
+}
+
+void ARM64XEmitter::CMPI2R(ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+	{
+		CMP(Rn, val, shift);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "CMPI2R - failed to construct arithmetic immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		CMP(Rn, scratch);
+	}
+}
+
+bool ARM64XEmitter::TryADDI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+		ADD(Rd, Rn, val, shift);
+	else
+		return false;
+
+	return true;
+}
+
+bool ARM64XEmitter::TrySUBI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+		SUB(Rd, Rn, val, shift);
+	else
+		return false;
+
+	return true;
+}
+
+bool ARM64XEmitter::TryCMPI2R(ARM64Reg Rn, u32 imm)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+		CMP(Rn, val, shift);
+	else
+		return false;
+
+	return true;
+}
+
+bool ARM64XEmitter::TryANDI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm)
+{
+	u32 n, imm_r, imm_s;
+	if (IsImmLogical(imm, 32, &n, &imm_s, &imm_r))
+		AND(Rd, Rn, imm_r, imm_s, n != 0);
+	else
+		return false;
+
+	return true;
+}
+bool ARM64XEmitter::TryORRI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm)
+{
+	u32 n, imm_r, imm_s;
+	if (IsImmLogical(imm, 32, &n, &imm_s, &imm_r))
+		ORR(Rd, Rn, imm_r, imm_s, n != 0);
+	else
+		return false;
+
+	return true;
+}
+bool ARM64XEmitter::TryEORI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm)
+{
+	u32 n, imm_r, imm_s;
+	if (IsImmLogical(imm, 32, &n, &imm_s, &imm_r))
+		EOR(Rd, Rn, imm_r, imm_s, n != 0);
+	else
+		return false;
+
+	return true;
+}
+
+float FPImm8ToFloat(uint8_t bits)
+{
+	int sign = bits >> 7;
+	uint32_t f = (sign << 31);
+	int bit6 = (bits >> 6) & 1;
+	uint32_t exp = ((!bit6) << 7) | (0x7C * bit6) | ((bits >> 4) & 3);
+	uint32_t mantissa = (bits & 0xF) << 19;
+	f |= exp << 23;
+	f |= mantissa;
+	float fl;
+	memcpy(&fl, &f, sizeof(float));
+	return fl;
+}
+
+bool FPImm8FromFloat(float value, uint8_t *immOut)
+{
+	uint32_t f;
+	memcpy(&f, &value, sizeof(float));
+	uint32_t mantissa4 = (f & 0x7FFFFF) >> 19;
+	uint32_t exponent = (f >> 23) & 0xFF;
+	uint32_t sign = f >> 31;
+	if ((exponent >> 7) == ((exponent >> 6) & 1))
+		return false;
+	uint8_t imm8 = (sign << 7) | ((!(exponent >> 7)) << 6) | ((exponent & 3) << 4) | mantissa4;
+	float newFloat = FPImm8ToFloat(imm8);
+	if (newFloat == value)
+		*immOut = imm8;
+	else
+		return false;
+	return true;
+}
+
+void ARM64FloatEmitter::MOVI2F(ARM64Reg Rd, float value, ARM64Reg scratch, bool negate)
+{
+	_assert_msg_(DYNA_REC, !IsDouble(Rd), "MOVI2F does not yet support double precision");
+	uint8_t imm8;
+	if (value == 0.0)
+	{
+		FMOV(Rd, IsDouble(Rd) ? ZR : WZR);
+		if (negate)
+			FNEG(Rd, Rd);
+		// TODO: There are some other values we could generate with the float-imm instruction, like 1.0...
+	}
+	else if (FPImm8FromFloat(value, &imm8))
+	{
+		FMOV(Rd, imm8);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "Failed to find a way to generate FP immediate %f without scratch", value);
+		u32 ival;
+		if (negate)
+			value = -value;
+
+		memcpy(&ival, &value, sizeof(ival));
+		m_emit->MOVI2R(scratch, ival);
+		FMOV(Rd, scratch);
+	}
+}
+
+// TODO: Quite a few values could be generated easily using the MOVI instruction and friends.
+void ARM64FloatEmitter::MOVI2FDUP(ARM64Reg Rd, float value, ARM64Reg scratch)
+{
+	// TODO: Make it work with more element sizes
+	// TODO: Optimize - there are shorter solution for many values
+	ARM64Reg s = (ARM64Reg)(S0 + DecodeReg(Rd));
+	MOVI2F(s, value, scratch);
+	DUP(32, Rd, Rd, 0);
+}
+
+void ARM64XEmitter::SUBSI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch)
+{
+	u32 val;
+	bool shift;
+	if (IsImmArithmetic(imm, &val, &shift))
+	{
+		SUBS(Rd, Rn, val, shift);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, scratch != INVALID_REG, "ANDSI2R - failed to construct immediate value from %08x, need scratch", (u32)imm);
+		MOVI2R(scratch, imm);
+		SUBS(Rd, Rn, scratch);
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
new file mode 100644
index 0000000000..a5eb986e2f
--- /dev/null
+++ b/Source/Core/Common/Arm64Emitter.h
@@ -0,0 +1,954 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+
+#include "Common/ArmCommon.h"
+#include "Common/BitSet.h"
+#include "Common/CodeBlock.h"
+#include "Common/Common.h"
+
+namespace Arm64Gen
+{
+
+// X30 serves a dual purpose as a link register
+// Encoded as <u3:type><u5:reg>
+// Types:
+// 000 - 32bit GPR
+// 001 - 64bit GPR
+// 010 - VFP single precision
+// 100 - VFP double precision
+// 110 - VFP quad precision
+enum ARM64Reg
+{
+	// 32bit registers
+	W0 = 0, W1, W2, W3, W4, W5, W6,
+	W7, W8, W9, W10, W11, W12, W13, W14,
+	W15, W16, W17, W18, W19, W20, W21, W22,
+	W23, W24, W25, W26, W27, W28, W29, W30,
+
+	WSP, // 32bit stack pointer
+
+	// 64bit registers
+	X0 = 0x20, X1, X2, X3, X4, X5, X6,
+	X7, X8, X9, X10, X11, X12, X13, X14,
+	X15, X16, X17, X18, X19, X20, X21, X22,
+	X23, X24, X25, X26, X27, X28, X29, X30,
+
+	SP, // 64bit stack pointer
+
+	// VFP single precision registers
+	S0 = 0x40, S1, S2, S3, S4, S5, S6,
+	S7, S8, S9, S10, S11, S12, S13,
+	S14, S15, S16, S17, S18, S19, S20,
+	S21, S22, S23, S24, S25, S26, S27,
+	S28, S29, S30, S31,
+
+	// VFP Double Precision registers
+	D0 = 0x80, D1, D2, D3, D4, D5, D6, D7,
+	D8, D9, D10, D11, D12, D13, D14, D15,
+	D16, D17, D18, D19, D20, D21, D22, D23,
+	D24, D25, D26, D27, D28, D29, D30, D31,
+
+	// ASIMD Quad-Word registers
+	Q0 = 0xC0, Q1, Q2, Q3, Q4, Q5, Q6, Q7,
+	Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15,
+	Q16, Q17, Q18, Q19, Q20, Q21, Q22, Q23,
+	Q24, Q25, Q26, Q27, Q28, Q29, Q30, Q31,
+
+	// For PRFM(prefetch memory) encoding
+	// This is encoded in the Rt register
+	// Data preload
+	PLDL1KEEP = 0, PLDL1STRM,
+	PLDL2KEEP, PLDL2STRM,
+	PLDL3KEEP, PLDL3STRM,
+	// Instruction preload
+	PLIL1KEEP = 8, PLIL1STRM,
+	PLIL2KEEP, PLIL2STRM,
+	PLIL3KEEP, PLIL3STRM,
+	// Prepare for store
+	PLTL1KEEP = 16, PLTL1STRM,
+	PLTL2KEEP, PLTL2STRM,
+	PLTL3KEEP, PLTL3STRM,
+
+	WZR = WSP,
+	ZR = SP,
+
+	INVALID_REG = 0xFFFFFFFF
+};
+
+inline bool Is64Bit(ARM64Reg reg) { return (reg & 0x20) != 0; }
+inline bool IsSingle(ARM64Reg reg) { return (reg & 0xC0) == 0x40; }
+inline bool IsDouble(ARM64Reg reg) { return (reg & 0xC0) == 0x80; }
+inline bool IsScalar(ARM64Reg reg) { return IsSingle(reg) || IsDouble(reg); }
+inline bool IsQuad(ARM64Reg reg) { return (reg & 0xC0) == 0xC0; }
+inline bool IsVector(ARM64Reg reg) { return (reg & 0xC0) != 0; }
+inline bool IsGPR(ARM64Reg reg) { return (int)reg < 0x40; }
+
+inline ARM64Reg DecodeReg(ARM64Reg reg) { return (ARM64Reg)(reg & 0x1F); }
+inline ARM64Reg EncodeRegTo64(ARM64Reg reg) { return (ARM64Reg)(reg | 0x20); }
+inline ARM64Reg EncodeRegToSingle(ARM64Reg reg) { return (ARM64Reg)(DecodeReg(reg) + S0); }
+inline ARM64Reg EncodeRegToDouble(ARM64Reg reg) { return (ARM64Reg)((reg & ~0xC0) | 0x80); }
+inline ARM64Reg EncodeRegToQuad(ARM64Reg reg) { return (ARM64Reg)(reg | 0xC0); }
+
+// For AND/TST/ORR/EOR etc
+bool IsImmLogical(uint64_t value, unsigned int width, unsigned int *n, unsigned int *imm_s, unsigned int *imm_r);
+// For ADD/SUB
+bool IsImmArithmetic(uint64_t input, u32 *val, bool *shift);
+
+float FPImm8ToFloat(uint8_t bits);
+bool FPImm8FromFloat(float value, uint8_t *immOut);
+
+enum OpType
+{
+	TYPE_IMM = 0,
+	TYPE_REG,
+	TYPE_IMMSREG,
+	TYPE_RSR,
+	TYPE_MEM
+};
+
+enum ShiftType
+{
+	ST_LSL = 0,
+	ST_LSR = 1,
+	ST_ASR = 2,
+	ST_ROR = 3,
+};
+
+enum IndexType
+{
+	INDEX_UNSIGNED,
+	INDEX_POST,
+	INDEX_PRE,
+	INDEX_SIGNED, // used in LDP/STP
+};
+
+enum ShiftAmount
+{
+	SHIFT_0 = 0,
+	SHIFT_16 = 1,
+	SHIFT_32 = 2,
+	SHIFT_48 = 3,
+};
+
+enum RoundingMode {
+	ROUND_A,  // round to nearest, ties to away
+	ROUND_M,  // round towards -inf
+	ROUND_N,  // round to nearest, ties to even
+	ROUND_P,  // round towards +inf
+	ROUND_Z,  // round towards zero
+};
+
+struct FixupBranch
+{
+	u8* ptr;
+	// Type defines
+	// 0 = CBZ (32bit)
+	// 1 = CBNZ (32bit)
+	// 2 = B (conditional)
+	// 3 = TBZ
+	// 4 = TBNZ
+	// 5 = B (unconditional)
+	// 6 = BL (unconditional)
+	u32 type;
+
+	// Used with B.cond
+	CCFlags cond;
+
+	// Used with TBZ/TBNZ
+	u8 bit;
+
+	// Used with Test/Compare and Branch
+	ARM64Reg reg;
+};
+
+enum PStateField
+{
+	FIELD_SPSel = 0,
+	FIELD_DAIFSet,
+	FIELD_DAIFClr,
+	FIELD_NZCV,	// The only system registers accessible from EL0 (user space)
+	FIELD_FPCR = 0x340,
+	FIELD_FPSR = 0x341,
+};
+
+enum SystemHint
+{
+	HINT_NOP = 0,
+	HINT_YIELD,
+	HINT_WFE,
+	HINT_WFI,
+	HINT_SEV,
+	HINT_SEVL,
+};
+
+enum BarrierType
+{
+	OSHLD = 1,
+	OSHST = 2,
+	OSH   = 3,
+	NSHLD = 5,
+	NSHST = 6,
+	NSH   = 7,
+	ISHLD = 9,
+	ISHST = 10,
+	ISH   = 11,
+	LD    = 13,
+	ST    = 14,
+	SY    = 15,
+};
+
+class ArithOption
+{
+public:
+	enum WidthSpecifier
+	{
+		WIDTH_DEFAULT,
+		WIDTH_32BIT,
+		WIDTH_64BIT,
+	};
+
+	enum ExtendSpecifier
+	{
+		EXTEND_UXTB = 0x0,
+		EXTEND_UXTH = 0x1,
+		EXTEND_UXTW = 0x2, /* Also LSL on 32bit width */
+		EXTEND_UXTX = 0x3, /* Also LSL on 64bit width */
+		EXTEND_SXTB = 0x4,
+		EXTEND_SXTH = 0x5,
+		EXTEND_SXTW = 0x6,
+		EXTEND_SXTX = 0x7,
+	};
+
+	enum TypeSpecifier
+	{
+		TYPE_EXTENDEDREG,
+		TYPE_IMM,
+		TYPE_SHIFTEDREG,
+	};
+
+private:
+	ARM64Reg        m_destReg;
+	WidthSpecifier  m_width;
+	ExtendSpecifier m_extend;
+	TypeSpecifier   m_type;
+	ShiftType       m_shifttype;
+	u32             m_shift;
+
+public:
+	ArithOption(ARM64Reg Rd, bool index = false)
+	{
+		// Indexed registers are a certain feature of AARch64
+		// On Loadstore instructions that use a register offset
+		// We can have the register as an index
+		// If we are indexing then the offset register will
+		// be shifted to the left so we are indexing at intervals
+		// of the size of what we are loading
+		// 8-bit: Index does nothing
+		// 16-bit: Index LSL 1
+		// 32-bit: Index LSL 2
+		// 64-bit: Index LSL 3
+		if (index)
+			m_shift = 4;
+		else
+			m_shift = 0;
+
+		m_destReg = Rd;
+		m_type = TYPE_EXTENDEDREG;
+		if (Is64Bit(Rd))
+		{
+			m_width = WIDTH_64BIT;
+			m_extend = EXTEND_UXTX;
+		}
+		else
+		{
+			m_width = WIDTH_32BIT;
+			m_extend = EXTEND_UXTW;
+		}
+		m_shifttype = ST_LSL;
+	}
+	ArithOption(ARM64Reg Rd, ShiftType shift_type, u32 shift)
+	{
+		m_destReg = Rd;
+		m_shift = shift;
+		m_shifttype = shift_type;
+		m_type = TYPE_SHIFTEDREG;
+		if (Is64Bit(Rd))
+		{
+			m_width = WIDTH_64BIT;
+			if (shift == 64)
+				m_shift = 0;
+		}
+		else
+		{
+			m_width = WIDTH_32BIT;
+			if (shift == 32)
+				m_shift = 0;
+		}
+	}
+	TypeSpecifier GetType() const
+	{
+		return m_type;
+	}
+	ARM64Reg GetReg() const
+	{
+		return m_destReg;
+	}
+	u32 GetData() const
+	{
+		switch (m_type)
+		{
+			case TYPE_EXTENDEDREG:
+				return (m_extend << 13) |
+				       (m_shift << 10);
+			break;
+			case TYPE_SHIFTEDREG:
+				return (m_shifttype << 22) |
+				       (m_shift << 10);
+			break;
+			default:
+				_dbg_assert_msg_(DYNA_REC, false, "Invalid type in GetData");
+			break;
+		}
+		return 0;
+	}
+};
+
+class ARM64XEmitter
+{
+	friend class ARM64FloatEmitter;
+
+private:
+	u8* m_code;
+	u8* m_startcode;
+	u8* m_lastCacheFlushEnd;
+
+	void EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr);
+	void EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const void* ptr);
+	void EncodeUnconditionalBranchInst(u32 op, const void* ptr);
+	void EncodeUnconditionalBranchInst(u32 opc, u32 op2, u32 op3, u32 op4, ARM64Reg Rn);
+	void EncodeExceptionInst(u32 instenc, u32 imm);
+	void EncodeSystemInst(u32 op0, u32 op1, u32 CRn, u32 CRm, u32 op2, ARM64Reg Rt);
+	void EncodeArithmeticInst(u32 instenc, bool flags, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void EncodeArithmeticCarryInst(u32 op, bool flags, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EncodeCondCompareImmInst(u32 op, ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond);
+	void EncodeCondCompareRegInst(u32 op, ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond);
+	void EncodeCondSelectInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+	void EncodeData1SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn);
+	void EncodeData2SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EncodeData3SrcInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void EncodeLogicalInst(u32 instenc, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void EncodeLoadRegisterInst(u32 bitop, ARM64Reg Rt, u32 imm);
+	void EncodeLoadStoreExcInst(u32 instenc, ARM64Reg Rs, ARM64Reg Rt2, ARM64Reg Rn, ARM64Reg Rt);
+	void EncodeLoadStorePairedInst(u32 op, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm);
+	void EncodeLoadStoreIndexedInst(u32 op, u32 op2, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void EncodeLoadStoreIndexedInst(u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm, u8 size);
+	void EncodeMOVWideInst(u32 op, ARM64Reg Rd, u32 imm, ShiftAmount pos);
+	void EncodeBitfieldMOVInst(u32 op, ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms);
+	void EncodeLoadStoreRegisterOffset(u32 size, u32 opc, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void EncodeAddSubImmInst(u32 op, bool flags, u32 shift, u32 imm, ARM64Reg Rn, ARM64Reg Rd);
+	void EncodeLogicalImmInst(u32 op, ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, int n);
+	void EncodeLoadStorePair(u32 op, u32 load, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+	void EncodeAddressInst(u32 op, ARM64Reg Rd, s32 imm);
+	void EncodeLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+
+protected:
+	inline void Write32(u32 value)
+	{
+		*(u32*)m_code = value;
+		m_code += 4;
+	}
+
+public:
+	ARM64XEmitter()
+		: m_code(nullptr), m_startcode(nullptr), m_lastCacheFlushEnd(nullptr)
+	{
+	}
+
+	ARM64XEmitter(u8* code_ptr) {
+		m_code = code_ptr;
+		m_lastCacheFlushEnd = code_ptr;
+		m_startcode = code_ptr;
+	}
+
+	virtual ~ARM64XEmitter()
+	{
+	}
+
+	void SetCodePtr(u8* ptr);
+	void ReserveCodeSpace(u32 bytes);
+	const u8* AlignCode16();
+	const u8* AlignCodePage();
+	const u8* GetCodePtr() const;
+	void FlushIcache();
+	void FlushIcacheSection(u8* start, u8* end);
+	u8* GetWritableCodePtr();
+
+	// FixupBranch branching
+	void SetJumpTarget(FixupBranch const& branch);
+	FixupBranch CBZ(ARM64Reg Rt);
+	FixupBranch CBNZ(ARM64Reg Rt);
+	FixupBranch B(CCFlags cond);
+	FixupBranch TBZ(ARM64Reg Rt, u8 bit);
+	FixupBranch TBNZ(ARM64Reg Rt, u8 bit);
+	FixupBranch B();
+	FixupBranch BL();
+
+	// Compare and Branch
+	void CBZ(ARM64Reg Rt, const void* ptr);
+	void CBNZ(ARM64Reg Rt, const void* ptr);
+
+	// Conditional Branch
+	void B(CCFlags cond, const void* ptr);
+
+	// Test and Branch
+	void TBZ(ARM64Reg Rt, u8 bits, const void* ptr);
+	void TBNZ(ARM64Reg Rt, u8 bits, const void* ptr);
+
+	// Unconditional Branch
+	void B(const void* ptr);
+	void BL(const void* ptr);
+
+	// Unconditional Branch (register)
+	void BR(ARM64Reg Rn);
+	void BLR(ARM64Reg Rn);
+	void RET(ARM64Reg Rn = X30);
+	void ERET();
+	void DRPS();
+
+	// Exception generation
+	void SVC(u32 imm);
+	void HVC(u32 imm);
+	void SMC(u32 imm);
+	void BRK(u32 imm);
+	void HLT(u32 imm);
+	void DCPS1(u32 imm);
+	void DCPS2(u32 imm);
+	void DCPS3(u32 imm);
+
+	// System
+	void _MSR(PStateField field, u8 imm);
+
+	void _MSR(PStateField field, ARM64Reg Rt);
+	void MRS(ARM64Reg Rt, PStateField field);
+
+	void HINT(SystemHint op);
+	void CLREX();
+	void DSB(BarrierType type);
+	void DMB(BarrierType type);
+	void ISB(BarrierType type);
+
+	// Add/Subtract (Extended/Shifted register)
+	void ADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void ADDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ADDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void SUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void SUBS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SUBS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void CMN(ARM64Reg Rn, ARM64Reg Rm);
+	void CMN(ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+	void CMP(ARM64Reg Rn, ARM64Reg Rm);
+	void CMP(ARM64Reg Rn, ARM64Reg Rm, ArithOption Option);
+
+	// Add/Subtract (with carry)
+	void ADC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ADCS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SBC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SBCS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Conditional Compare (immediate)
+	void CCMN(ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond);
+	void CCMP(ARM64Reg Rn, u32 imm, u32 nzcv, CCFlags cond);
+
+	// Conditional Compare (register)
+	void CCMN(ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond);
+	void CCMP(ARM64Reg Rn, ARM64Reg Rm, u32 nzcv, CCFlags cond);
+
+	// Conditional Select
+	void CSEL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+	void CSINC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+	void CSINV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+	void CSNEG(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+
+	// Aliases
+	void CSET(ARM64Reg Rd, CCFlags cond)
+	{
+		ARM64Reg zr = Is64Bit(Rd) ? ZR : WZR;
+		CSINC(Rd, zr, zr, (CCFlags)((u32)cond ^ 1));
+	}
+	void NEG(ARM64Reg Rd, ARM64Reg Rs)
+	{
+		SUB(Rd, Is64Bit(Rd) ? ZR : WZR, Rs);
+	}
+
+	// Data-Processing 1 source
+	void RBIT(ARM64Reg Rd, ARM64Reg Rn);
+	void REV16(ARM64Reg Rd, ARM64Reg Rn);
+	void REV32(ARM64Reg Rd, ARM64Reg Rn);
+	void REV64(ARM64Reg Rd, ARM64Reg Rn);
+	void CLZ(ARM64Reg Rd, ARM64Reg Rn);
+	void CLS(ARM64Reg Rd, ARM64Reg Rn);
+
+	// Data-Processing 2 source
+	void UDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void LSLV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void LSRV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ASRV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void RORV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32B(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32H(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32W(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32CB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32CH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32CW(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32X(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void CRC32CX(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Data-Processing 3 source
+	void MADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void MSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void SMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void SMULL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void SMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void SMULH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void UMADDL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void UMSUBL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void UMULH(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void MUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void MNEG(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Logical (shifted register)
+	void AND(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void BIC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void ORR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void ORN(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void EOR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void EON(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void ANDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+	void BICS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ArithOption Shift);
+
+	// Wrap the above for saner syntax
+	void AND(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { AND(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void BIC(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { BIC(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void ORR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { ORR(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void ORN(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { ORN(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void EOR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { EOR(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void EON(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { EON(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void ANDS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { ANDS(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+	void BICS(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm) { BICS(Rd, Rn, Rm, ArithOption(Rd, ST_LSL, 0)); }
+
+	// Convenience wrappers around ORR. These match the official convenience syntax.
+	void MOV(ARM64Reg Rd, ARM64Reg Rm, ArithOption Shift);
+	void MOV(ARM64Reg Rd, ARM64Reg Rm);
+	void MVN(ARM64Reg Rd, ARM64Reg Rm);
+
+	// TODO: These are "slow" as they use arith+shift, should be replaced with UBFM/EXTR variants.
+	void LSR(ARM64Reg Rd, ARM64Reg Rm, int shift);
+	void LSL(ARM64Reg Rd, ARM64Reg Rm, int shift);
+	void ASR(ARM64Reg Rd, ARM64Reg Rm, int shift);
+	void ROR(ARM64Reg Rd, ARM64Reg Rm, int shift);
+
+	// Logical (immediate)
+	void AND(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert = false);
+	void ANDS(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert = false);
+	void EOR(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert = false);
+	void ORR(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms, bool invert = false);
+	void TST(ARM64Reg Rn, u32 immr, u32 imms, bool invert = false);
+
+	// Add/subtract (immediate)
+	void ADD(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift = false);
+	void ADDS(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift = false);
+	void SUB(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift = false);
+	void SUBS(ARM64Reg Rd, ARM64Reg Rn, u32 imm, bool shift = false);
+	void CMP(ARM64Reg Rn, u32 imm, bool shift = false);
+
+	// Data Processing (Immediate)
+	void MOVZ(ARM64Reg Rd, u32 imm, ShiftAmount pos = SHIFT_0);
+	void MOVN(ARM64Reg Rd, u32 imm, ShiftAmount pos = SHIFT_0);
+	void MOVK(ARM64Reg Rd, u32 imm, ShiftAmount pos = SHIFT_0);
+
+	// Bitfield move
+	void BFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms);
+	void SBFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms);
+	void UBFM(ARM64Reg Rd, ARM64Reg Rn, u32 immr, u32 imms);
+
+	// Extract register (ROR with two inputs, if same then faster on A67)
+	void EXTR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u32 shift);
+
+	// Aliases
+	void SXTB(ARM64Reg Rd, ARM64Reg Rn);
+	void SXTH(ARM64Reg Rd, ARM64Reg Rn);
+	void SXTW(ARM64Reg Rd, ARM64Reg Rn);
+	void UXTB(ARM64Reg Rd, ARM64Reg Rn);
+	void UXTH(ARM64Reg Rd, ARM64Reg Rn);
+
+	void UBFX(ARM64Reg Rd, ARM64Reg Rn, int lsb, int width)
+	{
+		UBFM(Rd, Rn, lsb, lsb + width <= (Is64Bit(Rn) ? 64 : 32));
+	}
+
+	// Load Register (Literal)
+	void LDR(ARM64Reg Rt, u32 imm);
+	void LDRSW(ARM64Reg Rt, u32 imm);
+	void PRFM(ARM64Reg Rt, u32 imm);
+
+	// Load/Store Exclusive
+	void STXRB(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void STLXRB(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void LDXRB(ARM64Reg Rt, ARM64Reg Rn);
+	void LDAXRB(ARM64Reg Rt, ARM64Reg Rn);
+	void STLRB(ARM64Reg Rt, ARM64Reg Rn);
+	void LDARB(ARM64Reg Rt, ARM64Reg Rn);
+	void STXRH(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void STLXRH(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void LDXRH(ARM64Reg Rt, ARM64Reg Rn);
+	void LDAXRH(ARM64Reg Rt, ARM64Reg Rn);
+	void STLRH(ARM64Reg Rt, ARM64Reg Rn);
+	void LDARH(ARM64Reg Rt, ARM64Reg Rn);
+	void STXR(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void STLXR(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rn);
+	void STXP(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn);
+	void STLXP(ARM64Reg Rs, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn);
+	void LDXR(ARM64Reg Rt, ARM64Reg Rn);
+	void LDAXR(ARM64Reg Rt, ARM64Reg Rn);
+	void LDXP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn);
+	void LDAXP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn);
+	void STLR(ARM64Reg Rt, ARM64Reg Rn);
+	void LDAR(ARM64Reg Rt, ARM64Reg Rn);
+
+	// Load/Store no-allocate pair (offset)
+	void STNP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm);
+	void LDNP(ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, u32 imm);
+
+	// Load/Store register (immediate indexed)
+	void STRB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDRB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDRSB(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STRH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDRH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDRSH(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STR(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDR(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDRSW(IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+
+	// Load/Store register (register offset)
+	void STRB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDRB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDRSB(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void STRH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDRH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDRSH(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void STR(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDR(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDRSW(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void PRFM(ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+
+	// Load/Store register (unscaled offset)
+	void STURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDURB(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDURSB(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDURH(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDURSH(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDUR(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void LDURSW(ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+
+	// Load/Store pair
+	void LDP(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+	void LDPSW(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+	void STP(IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+
+	// Address of label/page PC-relative
+	void ADR(ARM64Reg Rd, s32 imm);
+	void ADRP(ARM64Reg Rd, s32 imm);
+
+	// Wrapper around MOVZ+MOVK
+	void MOVI2R(ARM64Reg Rd, u64 imm, bool optimize = true);
+	template <class P>
+	void MOVP2R(ARM64Reg Rd, P *ptr)
+	{
+		_assert_msg_(DYNA_REC, Is64Bit(Rd), "Can't store pointers in 32-bit registers");
+		MOVI2R(Rd, (uintptr_t)ptr);
+	}
+
+	// Wrapper around AND x, y, imm etc. If you are sure the imm will work, no need to pass a scratch register.
+	void ANDI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void ANDSI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void TSTI2R(ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG) { ANDSI2R(Is64Bit(Rn) ? ZR : WZR, Rn, imm, scratch); }
+	void ORRI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void EORI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void CMPI2R(ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+
+	void ADDI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void SUBI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+	void SUBSI2R(ARM64Reg Rd, ARM64Reg Rn, u64 imm, ARM64Reg scratch = INVALID_REG);
+
+	bool TryADDI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm);
+	bool TrySUBI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm);
+	bool TryCMPI2R(ARM64Reg Rn, u32 imm);
+
+	bool TryANDI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm);
+	bool TryORRI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm);
+	bool TryEORI2R(ARM64Reg Rd, ARM64Reg Rn, u32 imm);
+
+	// ABI related
+	void ABI_PushRegisters(BitSet32 registers);
+	void ABI_PopRegisters(BitSet32 registers, BitSet32 ignore_mask = BitSet32(0));
+
+	// Utility to generate a call to a std::function object.
+	//
+	// Unfortunately, calling operator() directly is undefined behavior in C++
+	// (this method might be a thunk in the case of multi-inheritance) so we
+	// have to go through a trampoline function.
+	template <typename T, typename... Args>
+	static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
+	                                 Args... args)
+	{
+		(*f)(args...);
+	}
+
+	// This function expects you to have set up the state.
+	// Overwrites X0 and X30
+	template <typename T, typename... Args>
+	ARM64Reg ABI_SetupLambda(const std::function<T(Args...)>* f)
+	{
+		auto trampoline = &ARM64XEmitter::CallLambdaTrampoline<T, Args...>;
+		MOVI2R(X30, (uintptr_t)trampoline);
+		MOVI2R(X0, (uintptr_t)const_cast<void*>((const void*)f));
+		return X30;
+	}
+
+	// Plain function call
+	void QuickCallFunction(ARM64Reg scratchreg, const void *func);
+	template <typename T> void QuickCallFunction(ARM64Reg scratchreg, T func)
+	{
+		QuickCallFunction(scratchreg, (const void *)func);
+	}
+};
+
+class ARM64FloatEmitter
+{
+public:
+	ARM64FloatEmitter(ARM64XEmitter* emit) : m_emit(emit) {}
+
+	void LDR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STR(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+
+	// Loadstore unscaled
+	void LDUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void STUR(u8 size, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+
+	// Loadstore single structure
+	void LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn);
+	void LD1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Reg Rm);
+	void LD1R(u8 size, ARM64Reg Rt, ARM64Reg Rn);
+	void ST1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn);
+	void ST1(u8 size, ARM64Reg Rt, u8 index, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Loadstore multiple structure
+	void LD1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn);
+	void LD1(u8 size, u8 count, IndexType type, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm = SP);
+	void ST1(u8 size, u8 count, ARM64Reg Rt, ARM64Reg Rn);
+	void ST1(u8 size, u8 count, IndexType type, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm = SP);
+
+	// Loadstore paired
+	void LDP(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+	void STP(u8 size, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+
+	// Loadstore register offset
+	void STR(u8 size, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+	void LDR(u8 size, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+
+	// Scalar - 1 Source
+	void FABS(ARM64Reg Rd, ARM64Reg Rn);
+	void FNEG(ARM64Reg Rd, ARM64Reg Rn);
+	void FSQRT(ARM64Reg Rd, ARM64Reg Rn);
+	void FMOV(ARM64Reg Rd, ARM64Reg Rn, bool top = false);  // Also generalized move between GPR/FP
+
+	// Scalar - 2 Source
+	void FADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FDIV(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMAX(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMIN(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMAXNM(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMINNM(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FNMUL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Scalar - 3 Source. Note - the accumulator is last on ARM!
+	void FMADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void FMSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void FNMADD(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+	void FNMSUB(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra);
+
+	// Scalar floating point immediate
+	void FMOV(ARM64Reg Rd, uint8_t imm8);
+
+	// Vector
+	void AND(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void BSL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index);
+	void FABS(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FADD(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMLA(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMLS(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FCVTL(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCVTL2(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCVTN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCVTZS(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCVTZU(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FDIV(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FNEG(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FRSQRTE(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FSUB(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void NOT(ARM64Reg Rd, ARM64Reg Rn);
+	void ORR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void MOV(ARM64Reg Rd, ARM64Reg Rn)
+	{
+		ORR(Rd, Rn, Rn);
+	}
+	void REV16(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void REV32(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void REV64(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void SCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void UCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void SCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn, int scale);
+	void UCVTF(u8 size, ARM64Reg Rd, ARM64Reg Rn, int scale);
+	void XTN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn);
+
+	// Move
+	void DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void INS(u8 size, ARM64Reg Rd, u8 index, ARM64Reg Rn);
+	void INS(u8 size, ARM64Reg Rd, u8 index1, ARM64Reg Rn, u8 index2);
+	void UMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index);
+	void SMOV(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index);
+
+	// One source
+	void FCVT(u8 size_to, u8 size_from, ARM64Reg Rd, ARM64Reg Rn);
+
+	// Scalar convert float to int, in a lot of variants.
+	// Note that the scalar version of this operation has two encodings, one that goes to an integer register
+	// and one that outputs to a scalar fp register.
+	void FCVTS(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round);
+	void FCVTU(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round);
+
+	// Scalar convert int to float. No rounding mode specifier necessary.
+	void SCVTF(ARM64Reg Rd, ARM64Reg Rn);
+	void UCVTF(ARM64Reg Rd, ARM64Reg Rn);
+
+	// Scalar fixed point to float. scale is the number of fractional bits.
+	void SCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale);
+	void UCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale);
+
+	// Float comparison
+	void FCMP(ARM64Reg Rn, ARM64Reg Rm);
+	void FCMP(ARM64Reg Rn);
+	void FCMPE(ARM64Reg Rn, ARM64Reg Rm);
+	void FCMPE(ARM64Reg Rn);
+	void FCMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FCMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FCMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void FCMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCMLE(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+	void FCMLT(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+
+	// Conditional select
+	void FCSEL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, CCFlags cond);
+
+	// Permute
+	void UZP1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void TRN1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ZIP1(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void UZP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void TRN2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void ZIP2(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
+	// Shift by immediate
+	void SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void SSHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void USHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void SHRN2(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+	void SXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn);
+	void SXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn);
+	void UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn);
+	void UXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn);
+
+	// vector x indexed element
+	void FMUL(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index);
+	void FMLA(u8 esize, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, u8 index);
+
+	void MOVI2F(ARM64Reg Rd, float value, ARM64Reg scratch = INVALID_REG, bool negate = false);
+	void MOVI2FDUP(ARM64Reg Rd, float value, ARM64Reg scratch = INVALID_REG);
+
+	// ABI related
+	void ABI_PushRegisters(BitSet32 registers, ARM64Reg tmp = INVALID_REG);
+	void ABI_PopRegisters(BitSet32 registers, ARM64Reg tmp = INVALID_REG);
+
+private:
+	ARM64XEmitter* m_emit;
+	inline void Write32(u32 value) { m_emit->Write32(value); }
+
+	// Emitting functions
+	void EmitLoadStoreImmediate(u8 size, u32 opc, IndexType type, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void EmitScalar2Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitThreeSame(bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitCopy(bool Q, u32 op, u32 imm5, u32 imm4, ARM64Reg Rd, ARM64Reg Rn);
+	void Emit2RegMisc(bool Q, bool U, u32 size, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn);
+	void EmitLoadStoreSingleStructure(bool L, bool R, u32 opcode, bool S, u32 size, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm);
+	void Emit1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitConversion(bool sf, bool S, u32 type, u32 rmode, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitConversion2(bool sf, bool S, bool direction, u32 type, u32 rmode, u32 opcode, int scale, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitCompare(bool M, bool S, u32 op, u32 opcode2, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitCondSelect(bool M, bool S, CCFlags cond, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitPermute(u32 size, u32 op, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitScalarImm(bool M, bool S, u32 type, u32 imm5, ARM64Reg Rd, u32 imm8);
+	void EmitShiftImm(bool Q, bool U, u32 immh, u32 immb, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitScalarShiftImm(bool U, u32 immh, u32 immb, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitLoadStoreMultipleStructure(u32 size, bool L, u32 opcode, ARM64Reg Rt, ARM64Reg Rn);
+	void EmitLoadStoreMultipleStructurePost(u32 size, bool L, u32 opcode, ARM64Reg Rt, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitScalar1Source(bool M, bool S, u32 type, u32 opcode, ARM64Reg Rd, ARM64Reg Rn);
+	void EmitVectorxElement(bool U, u32 size, bool L, u32 opcode, bool H, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+	void EmitLoadStoreUnscaled(u32 size, u32 op, ARM64Reg Rt, ARM64Reg Rn, s32 imm);
+	void EmitConvertScalarToInt(ARM64Reg Rd, ARM64Reg Rn, RoundingMode round, bool sign);
+	void EmitScalar3Source(bool isDouble, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm, ARM64Reg Ra, int opcode);
+	void EncodeLoadStorePair(u32 size, bool load, IndexType type, ARM64Reg Rt, ARM64Reg Rt2, ARM64Reg Rn, s32 imm);
+	void EncodeLoadStoreRegisterOffset(u32 size, bool load, ARM64Reg Rt, ARM64Reg Rn, ArithOption Rm);
+
+	void SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper);
+	void USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper);
+	void SHRN(u8 dest_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper);
+	void SXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, bool upper);
+	void UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, bool upper);
+};
+
+class ARM64CodeBlock : public CodeBlock<ARM64XEmitter>
+{
+private:
+	void PoisonMemory() override
+	{
+		u32* ptr = (u32*)region;
+		u32* maxptr = (u32*)(region + region_size);
+		// If our memory isn't a multiple of u32 then this won't write the last remaining bytes with anything
+		// Less than optimal, but there would be nothing we could do but throw a runtime warning anyway.
+		// AArch64: 0xD4200000 = BRK 0
+		while (ptr < maxptr)
+			*ptr++ = 0xD4200000;
+	}
+};
+}
+
diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp
new file mode 100644
index 0000000000..aab1787ba6
--- /dev/null
+++ b/Source/Core/Common/ArmCPUDetect.cpp
@@ -0,0 +1,288 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <fstream>
+#include <sstream>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/StringUtil.h"
+
+// Only Linux platforms have /proc/cpuinfo
+#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
+const char procfile[] = "/proc/cpuinfo";
+
+static std::string GetCPUString()
+{
+	const std::string marker = "Hardware\t: ";
+	std::string cpu_string = "Unknown";
+
+	std::string line;
+	std::ifstream file(procfile);
+
+	if (!file)
+		return cpu_string;
+
+	while (std::getline(file, line))
+	{
+		if (line.find(marker) != std::string::npos)
+		{
+			cpu_string = line.substr(marker.length());
+			break;
+		}
+	}
+
+	return cpu_string;
+}
+
+static unsigned char GetCPUImplementer()
+{
+	const std::string marker = "CPU implementer\t: ";
+	unsigned char implementer = 0;
+
+	std::string line;
+	std::ifstream file(procfile);
+
+	if (!file)
+		return 0;
+
+	while (std::getline(file, line))
+	{
+		if (line.find(marker) != std::string::npos)
+		{
+			line = line.substr(marker.length());
+			sscanf(line.c_str(), "0x%02hhx", &implementer);
+			break;
+		}
+	}
+
+	return implementer;
+}
+
+static unsigned short GetCPUPart()
+{
+	const std::string marker = "CPU part\t: ";
+	unsigned short part = 0;
+
+	std::string line;
+	std::ifstream file(procfile);
+
+	if (!file)
+		return 0;
+
+	while (std::getline(file, line))
+	{
+		if (line.find(marker) != std::string::npos)
+		{
+			line = line.substr(marker.length());
+			sscanf(line.c_str(), "0x%03hx", &part);
+			break;
+		}
+	}
+
+	return part;
+}
+
+static bool CheckCPUFeature(const std::string& feature)
+{
+	const std::string marker = "Features\t: ";
+
+	std::string line;
+	std::ifstream file(procfile);
+
+	if (!file)
+		return 0;
+
+	while (std::getline(file, line))
+	{
+		if (line.find(marker) != std::string::npos)
+		{
+			std::stringstream line_stream(line);
+			std::string token;
+
+			while (std::getline(line_stream, token, ' '))
+			{
+				if (token == feature)
+					return true;
+			}
+		}
+	}
+
+	return false;
+}
+#endif
+
+static int GetCoreCount()
+{
+#ifdef __SYMBIAN32__
+	return 1;
+#elif defined(BLACKBERRY) || defined(IOS)
+	return 2;
+#else
+	const std::string marker = "processor\t: ";
+	int cores = 0;
+
+	std::string line;
+	std::ifstream file(procfile);
+
+	if (!file)
+		return 0;
+
+	while (std::getline(file, line))
+	{
+		if (line.find(marker) != std::string::npos)
+		{
+			++cores;
+		}
+	}
+
+	return cores;
+#endif
+}
+
+CPUInfo cpu_info;
+
+CPUInfo::CPUInfo()
+{
+	Detect();
+}
+
+// Detects the various CPU features
+void CPUInfo::Detect()
+{
+	// Set some defaults here
+	// When ARMv8 CPUs come out, these need to be updated.
+	HTT = false;
+#ifdef _M_ARM_64
+	OS64bit = true;
+	CPU64bit = true;
+	Mode64bit = true;
+#else
+	OS64bit = false;
+	CPU64bit = false;
+	Mode64bit = false;
+#endif
+	vendor = VENDOR_ARM;
+
+	// Get the information about the CPU
+	num_cores = GetCoreCount();
+#if defined(__SYMBIAN32__) || defined(BLACKBERRY) || defined(IOS)
+	bool isVFP3 = false;
+	bool isVFP4 = false;
+#ifdef IOS
+	isVFP3 = true;
+	// Check for swift arch (VFP4`)
+	#ifdef __ARM_ARCH_7S__
+		isVFP4 = true;
+	#endif // #ifdef __ARM_ARCH_7S__
+#elif defined(BLACKBERRY)
+	isVFP3 = true;
+	const char cpuInfoPath[] = "/pps/services/hw_info/inventory";
+	const std::string marker = "Processor_Name::";
+	const std::string qcCPU = "MSM";
+
+	std::string line;
+	std::ifstream file(cpuInfoPath);
+
+	if (file)
+	{
+		while (std::getline(file, line))
+		{
+			if (line.find(marker) != std::string::npos)
+			{
+				std::string first_three_chars = line.substr(marker.length(), qcCPU.length());
+
+				if (first_three_chars == qcCPU)
+				{
+					isVFP4 = true;
+				}
+
+				break;
+			}
+		}
+	}
+#endif
+	// Hardcode this for now
+	bSwp = true;
+	bHalf = true;
+	bThumb = false;
+	bFastMult = true;
+	bVFP = true;
+	bEDSP = true;
+	bThumbEE = isVFP3;
+	bNEON = isVFP3;
+	bVFPv3 = isVFP3;
+	bTLS = true;
+	bVFPv4 = isVFP4;
+	bIDIVa = isVFP4;
+	bIDIVt = isVFP4;
+	bFP = false;
+	bASIMD = false;
+#else
+	strncpy(cpu_string, GetCPUString().c_str(), sizeof(cpu_string));
+	bSwp = CheckCPUFeature("swp");
+	bHalf = CheckCPUFeature("half");
+	bThumb = CheckCPUFeature("thumb");
+	bFastMult = CheckCPUFeature("fastmult");
+	bVFP = CheckCPUFeature("vfp");
+	bEDSP = CheckCPUFeature("edsp");
+	bThumbEE = CheckCPUFeature("thumbee");
+	bNEON = CheckCPUFeature("neon");
+	bVFPv3 = CheckCPUFeature("vfpv3");
+	bTLS = CheckCPUFeature("tls");
+	bVFPv4 = CheckCPUFeature("vfpv4");
+	bIDIVa = CheckCPUFeature("idiva");
+	bIDIVt = CheckCPUFeature("idivt");
+	// Qualcomm Krait supports IDIVA but it doesn't report it. Check for krait.
+	if (GetCPUImplementer() == 0x51 && GetCPUPart() == 0x6F) // Krait(300) is 0x6F, Scorpion is 0x4D
+		bIDIVa = bIDIVt = true;
+	// These two require ARMv8 or higher
+#ifdef _M_ARM_64
+	bFP = CheckCPUFeature("fp");
+	bASIMD = CheckCPUFeature("asimd");
+	bAES = CheckCPUFeature("aes");
+	bCRC32 = CheckCPUFeature("crc32");
+	bSHA1 = CheckCPUFeature("sha1");
+	bSHA2 = CheckCPUFeature("sha2");
+#endif
+#endif
+	// On android, we build a separate library for ARMv7 so this is fine.
+	// TODO: Check for ARMv7 on other platforms.
+#if defined(__ARM_ARCH_7A__)
+	bArmV7 = true;
+#else
+	bArmV7 = false;
+#endif
+}
+
+// Turn the CPU info into a string we can show
+std::string CPUInfo::Summarize()
+{
+	std::string sum;
+#if defined(BLACKBERRY) || defined(IOS) || defined(__SYMBIAN32__)
+	sum = StringFromFormat("%i cores", num_cores);
+#else
+	if (num_cores == 1)
+		sum = StringFromFormat("%s, %i core", cpu_string, num_cores);
+	else
+		sum = StringFromFormat("%s, %i cores", cpu_string, num_cores);
+#endif
+	if (bSwp) sum += ", SWP";
+	if (bHalf) sum += ", Half";
+	if (bThumb) sum += ", Thumb";
+	if (bFastMult) sum += ", FastMult";
+	if (bVFP) sum += ", VFP";
+	if (bEDSP) sum += ", EDSP";
+	if (bThumbEE) sum += ", ThumbEE";
+	if (bNEON) sum += ", NEON";
+	if (bVFPv3) sum += ", VFPv3";
+	if (bTLS) sum += ", TLS";
+	if (bVFPv4) sum += ", VFPv4";
+	if (bIDIVa) sum += ", IDIVa";
+	if (bIDIVt) sum += ", IDIVt";
+	if (CPU64bit) sum += ", 64-bit";
+
+	return sum;
+}
diff --git a/Source/Core/Common/ArmCommon.h b/Source/Core/Common/ArmCommon.h
new file mode 100644
index 0000000000..3dd1592d0a
--- /dev/null
+++ b/Source/Core/Common/ArmCommon.h
@@ -0,0 +1,28 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+enum CCFlags
+{
+	CC_EQ = 0, // Equal
+	CC_NEQ, // Not equal
+	CC_CS, // Carry Set
+	CC_CC, // Carry Clear
+	CC_MI, // Minus (Negative)
+	CC_PL, // Plus
+	CC_VS, // Overflow
+	CC_VC, // No Overflow
+	CC_HI, // Unsigned higher
+	CC_LS, // Unsigned lower or same
+	CC_GE, // Signed greater than or equal
+	CC_LT, // Signed less than
+	CC_GT, // Signed greater than
+	CC_LE, // Signed less than or equal
+	CC_AL, // Always (unconditional) 14
+	CC_HS = CC_CS, // Alias of CC_CS  Unsigned higher or same
+	CC_LO = CC_CC, // Alias of CC_CC  Unsigned lower
+};
+const u32 NO_COND = 0xE0000000;
+
diff --git a/Source/Core/Common/Atomic.h b/Source/Core/Common/Atomic.h
new file mode 100644
index 0000000000..54c8e5b591
--- /dev/null
+++ b/Source/Core/Common/Atomic.h
@@ -0,0 +1,16 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+
+#include "Common/Atomic_Win32.h" // IWYU pragma: export
+
+#else
+
+// GCC-compatible compiler assumed!
+#include "Common/Atomic_GCC.h" // IWYU pragma: export
+
+#endif
diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h
new file mode 100644
index 0000000000..b075345c56
--- /dev/null
+++ b/Source/Core/Common/Atomic_GCC.h
@@ -0,0 +1,100 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// IWYU pragma: private, include "Common/Atomic.h"
+
+#pragma once
+
+#include "Common/Common.h"
+
+// Atomic operations are performed in a single step by the CPU. It is
+// impossible for other threads to see the operation "half-done."
+//
+// Some atomic operations can be combined with different types of memory
+// barriers called "Acquire semantics" and "Release semantics", defined below.
+//
+// Acquire semantics: Future memory accesses cannot be relocated to before the
+//                    operation.
+//
+// Release semantics: Past memory accesses cannot be relocated to after the
+//                    operation.
+//
+// These barriers affect not only the compiler, but also the CPU.
+
+namespace Common
+{
+
+inline void AtomicAdd(volatile u32& target, u32 value)
+{
+	__sync_add_and_fetch(&target, value);
+}
+
+inline void AtomicAnd(volatile u32& target, u32 value)
+{
+	__sync_and_and_fetch(&target, value);
+}
+
+inline void AtomicDecrement(volatile u32& target)
+{
+	__sync_add_and_fetch(&target, -1);
+}
+
+inline void AtomicIncrement(volatile u32& target)
+{
+	__sync_add_and_fetch(&target, 1);
+}
+
+inline void AtomicOr(volatile u32& target, u32 value)
+{
+	__sync_or_and_fetch(&target, value);
+}
+
+// Support clang versions older than 3.4.
+#if __clang__ && !__has_feature(cxx_atomic)
+template <typename T>
+_Atomic(T)* ToC11Atomic(volatile T* loc)
+{
+	return (_Atomic(T)*) loc;
+}
+
+#define __atomic_load_n(p, m) __c11_atomic_load(ToC11Atomic(p), m)
+#define __atomic_store_n(p, v, m) __c11_atomic_store(ToC11Atomic(p), v, m)
+#define __atomic_exchange_n(p, v, m) __c11_atomic_exchange(ToC11Atomic(p), v, m)
+#endif
+
+#ifndef __ATOMIC_RELAXED
+#error __ATOMIC_RELAXED not defined; your compiler version is too old.
+#endif
+
+template <typename T>
+inline T AtomicLoad(volatile T& src)
+{
+	return __atomic_load_n(&src, __ATOMIC_RELAXED);
+}
+
+template <typename T>
+inline T AtomicLoadAcquire(volatile T& src)
+{
+	return __atomic_load_n(&src, __ATOMIC_ACQUIRE);
+}
+
+template <typename T, typename U>
+inline void AtomicStore(volatile T& dest, U value)
+{
+	__atomic_store_n(&dest, value, __ATOMIC_RELAXED);
+}
+
+template <typename T, typename U>
+inline void AtomicStoreRelease(volatile T& dest, U value)
+{
+	__atomic_store_n(&dest, value, __ATOMIC_RELEASE);
+}
+
+template <typename T, typename U>
+inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
+{
+	return __atomic_exchange_n(&loc, newval, __ATOMIC_ACQ_REL);
+}
+
+}
diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h
new file mode 100644
index 0000000000..8b9a795832
--- /dev/null
+++ b/Source/Core/Common/Atomic_Win32.h
@@ -0,0 +1,93 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// IWYU pragma: private, include "Common/Atomic.h"
+
+#pragma once
+
+#include <Windows.h>
+
+#include "Common/Common.h"
+#include "Common/Intrinsics.h"
+
+// Atomic operations are performed in a single step by the CPU. It is
+// impossible for other threads to see the operation "half-done."
+//
+// Some atomic operations can be combined with different types of memory
+// barriers called "Acquire semantics" and "Release semantics", defined below.
+//
+// Acquire semantics: Future memory accesses cannot be relocated to before the
+//                    operation.
+//
+// Release semantics: Past memory accesses cannot be relocated to after the
+//                    operation.
+//
+// These barriers affect not only the compiler, but also the CPU.
+//
+// NOTE: Acquire and Release are not differentiated right now. They perform a
+// full memory barrier instead of a "one-way" memory barrier. The newest
+// Windows SDK has Acquire and Release versions of some Interlocked* functions.
+
+namespace Common
+{
+
+inline void AtomicAdd(volatile u32& target, u32 value)
+{
+	_InterlockedExchangeAdd((volatile LONG*)&target, (LONG)value);
+}
+
+inline void AtomicAnd(volatile u32& target, u32 value)
+{
+	_InterlockedAnd((volatile LONG*)&target, (LONG)value);
+}
+
+inline void AtomicIncrement(volatile u32& target)
+{
+	_InterlockedIncrement((volatile LONG*)&target);
+}
+
+inline void AtomicDecrement(volatile u32& target)
+{
+	_InterlockedDecrement((volatile LONG*)&target);
+}
+
+inline void AtomicOr(volatile u32& target, u32 value)
+{
+	_InterlockedOr((volatile LONG*)&target, (LONG)value);
+}
+
+template <typename T>
+inline T AtomicLoad(volatile T& src)
+{
+	return src; // 32-bit reads are always atomic.
+}
+
+template <typename T>
+inline T AtomicLoadAcquire(volatile T& src)
+{
+	T result = src; // 32-bit reads are always atomic.
+	_ReadBarrier(); // Compiler instruction only. x86 loads always have acquire semantics.
+	return result;
+}
+
+template <typename T, typename U>
+inline void AtomicStore(volatile T& dest, U value)
+{
+	dest = (T) value; // 32-bit writes are always atomic.
+}
+
+template <typename T, typename U>
+inline void AtomicStoreRelease(volatile T& dest, U value)
+{
+	_WriteBarrier(); // Compiler instruction only. x86 stores always have release semantics.
+	dest = (T) value; // 32-bit writes are always atomic.
+}
+
+template <typename T, typename U>
+inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
+{
+	return (T*) _InterlockedExchangePointer_acq((void* volatile*) &loc, (void*) newval);
+}
+
+}
diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h
new file mode 100644
index 0000000000..3b30a3cab0
--- /dev/null
+++ b/Source/Core/Common/BitField.h
@@ -0,0 +1,198 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Copyright 2014 Tony Wasserka
+// 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.
+//     * Neither the name of the owner nor the names of its contributors 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.
+
+
+#pragma once
+
+#include <limits>
+#include <type_traits>
+
+#include "Common.h"
+
+/*
+ * Abstract bitfield class
+ *
+ * Allows endianness-independent access to individual bitfields within some raw
+ * integer value. The assembly generated by this class is identical to the
+ * usage of raw bitfields, so it's a perfectly fine replacement.
+ *
+ * For BitField<X,Y,Z>, X is the distance of the bitfield to the LSB of the
+ * raw value, Y is the length in bits of the bitfield. Z is an integer type
+ * which determines the sign of the bitfield. Z must have the same size as the
+ * raw integer.
+ *
+ *
+ * General usage:
+ *
+ * Create a new union with the raw integer value as a member.
+ * Then for each bitfield you want to expose, add a BitField member
+ * in the union. The template parameters are the bit offset and the number
+ * of desired bits.
+ *
+ * Changes in the bitfield members will then get reflected in the raw integer
+ * value and vice-versa.
+ *
+ *
+ * Sample usage:
+ *
+ * union SomeRegister
+ * {
+ *     u32 hex;
+ *
+ *     BitField<0,7,u32> first_seven_bits;     // unsigned
+ *     BitField<7,8,u32> next_eight_bits;      // unsigned
+ *     BitField<3,15,s32> some_signed_fields;  // signed
+ * };
+ *
+ * This is equivalent to the little-endian specific code:
+ *
+ * union SomeRegister
+ * {
+ *     u32 hex;
+ *
+ *     struct
+ *     {
+ *         u32 first_seven_bits : 7;
+ *         u32 next_eight_bits : 8;
+ *     };
+ *     struct
+ *     {
+ *         u32 : 3; // padding
+ *         s32 some_signed_fields : 15;
+ *     };
+ * };
+ *
+ *
+ * Caveats:
+ *
+ * 1)
+ * BitField provides automatic casting from and to the storage type where
+ * appropriate. However, when using non-typesafe functions like printf, an
+ * explicit cast must be performed on the BitField object to make sure it gets
+ * passed correctly, e.g.:
+ * printf("Value: %d", (s32)some_register.some_signed_fields);
+ *
+ * 2)
+ * Not really a caveat, but potentially irritating: This class is used in some
+ * packed structures that do not guarantee proper alignment. Therefore we have
+ * to use #pragma pack here not to pack the members of the class, but instead
+ * to break GCC's assumption that the members of the class are aligned on
+ * sizeof(StorageType).
+ * TODO(neobrain): Confirm that this is a proper fix and not just masking
+ * symptoms.
+ */
+#pragma pack(1)
+template<std::size_t position, std::size_t bits, typename T>
+struct BitField
+{
+private:
+#ifndef _WIN32
+	// This constructor might be considered ambiguous:
+	// Would it initialize the storage or just the bitfield?
+	// Hence, delete it. Use the assignment operator to set bitfield values!
+	// MSVC 2013 Intellisense complains that this declaration isn't allowed
+	// in a union member, so disable it on Windows.
+	BitField(T val) = delete;
+#endif
+
+public:
+	// Force default constructor to be created
+	// so that we can use this within unions
+	BitField() = default;
+
+#ifndef _WIN32
+	// We explicitly delete the copy assignment operator here, because the
+	// default copy assignment would copy the full storage value, rather than
+	// just the bits relevant to this particular bit field.
+	// Ideally, we would just implement the copy assignment to copy only the
+	// relevant bits, but this requires compiler support for unrestricted
+	// unions.
+	// MSVC 2013 has no support for this, hence we disable this code on
+	// Windows (so that the default copy assignment operator will be used).
+	// For any C++11 conformant compiler we delete the operator to make sure
+	// we never use this inappropriate operator to begin with.
+	// TODO: Implement this operator properly once all target compilers
+	// support unrestricted unions.
+	BitField& operator=(const BitField&) = delete;
+#endif
+
+	__forceinline BitField& operator=(T val)
+	{
+		storage = (storage & ~GetMask()) | ((val << position) & GetMask());
+		return *this;
+	}
+
+	__forceinline T Value() const
+	{
+		if (std::numeric_limits<T>::is_signed)
+		{
+			std::size_t shift = 8 * sizeof(T) - bits;
+			return (T)(((storage & GetMask()) << (shift - position)) >> shift);
+		}
+		else
+		{
+			return (T)((storage & GetMask()) >> position);
+		}
+	}
+
+	__forceinline operator T() const
+	{
+		return Value();
+	}
+
+private:
+	// StorageType is T for non-enum types and the underlying type of T if
+	// T is an enumeration. Note that T is wrapped within an enable_if in the
+	// former case to workaround compile errors which arise when using
+	// std::underlying_type<T>::type directly.
+	typedef typename std::conditional<std::is_enum<T>::value,
+	                                  std::underlying_type<T>,
+	                                  std::enable_if<true,T>>::type::type StorageType;
+
+	// Unsigned version of StorageType
+	typedef typename std::make_unsigned<StorageType>::type StorageTypeU;
+
+	__forceinline StorageType GetMask() const
+	{
+		return ((~(StorageTypeU)0) >> (8 * sizeof(T) - bits)) << position;
+	}
+
+	StorageType storage;
+
+	static_assert(bits + position <= 8 * sizeof(T), "Bitfield out of range");
+
+	// And, you know, just in case people specify something stupid like bits=position=0x80000000
+	static_assert(position < 8 * sizeof(T), "Invalid position");
+	static_assert(bits <= 8 * sizeof(T), "Invalid number of bits");
+	static_assert(bits > 0, "Invalid number of bits");
+};
+#pragma pack()
diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h
new file mode 100644
index 0000000000..70b9204fa5
--- /dev/null
+++ b/Source/Core/Common/BitSet.h
@@ -0,0 +1,185 @@
+// This file is under the public domain.
+
+#pragma once
+
+#include <cstddef>
+#include <initializer_list>
+#include <type_traits>
+#include "CommonTypes.h"
+
+// Helper functions:
+
+#ifdef _WIN32
+template <typename T>
+static inline int CountSetBits(T v)
+{
+	// from https://graphics.stanford.edu/~seander/bithacks.html
+	// GCC has this built in, but MSVC's intrinsic will only emit the actual
+	// POPCNT instruction, which we're not depending on
+	v = v - ((v >> 1) & (T)~(T)0/3);
+	v = (v & (T)~(T)0/15*3) + ((v >> 2) & (T)~(T)0/15*3);
+	v = (v + (v >> 4)) & (T)~(T)0/255*15;
+	return (T)(v * ((T)~(T)0/255)) >> (sizeof(T) - 1) * 8;
+}
+static inline int LeastSignificantSetBit(u8 val)
+{
+	unsigned long index;
+	_BitScanForward(&index, val);
+	return (int)index;
+}
+static inline int LeastSignificantSetBit(u16 val)
+{
+	unsigned long index;
+	_BitScanForward(&index, val);
+	return (int)index;
+}
+static inline int LeastSignificantSetBit(u32 val)
+{
+	unsigned long index;
+	_BitScanForward(&index, val);
+	return (int)index;
+}
+static inline int LeastSignificantSetBit(u64 val)
+{
+	unsigned long index;
+	_BitScanForward64(&index, val);
+	return (int)index;
+}
+#else
+static inline int CountSetBits(u8 val) { return __builtin_popcount(val); }
+static inline int CountSetBits(u16 val) { return __builtin_popcount(val); }
+static inline int CountSetBits(u32 val) { return __builtin_popcount(val); }
+static inline int CountSetBits(u64 val) { return __builtin_popcountll(val); }
+static inline int LeastSignificantSetBit(u8 val) { return __builtin_ctz(val); }
+static inline int LeastSignificantSetBit(u16 val) { return __builtin_ctz(val); }
+static inline int LeastSignificantSetBit(u32 val) { return __builtin_ctz(val); }
+static inline int LeastSignificantSetBit(u64 val) { return __builtin_ctzll(val); }
+#endif
+
+// namespace avoids conflict with OS X Carbon; don't use BitSet<T> directly
+namespace BS
+{
+
+// Similar to std::bitset, this is a class which encapsulates a bitset, i.e.
+// using the set bits of an integer to represent a set of integers.  Like that
+// class, it acts like an array of bools:
+//     BitSet32 bs;
+//     bs[1] = true;
+// but also like the underlying integer ([0] = least significant bit):
+//     BitSet32 bs2 = ...;
+//     bs = (bs ^ bs2) & BitSet32(0xffff);
+// The following additional functionality is provided:
+// - Construction using an initializer list.
+//     BitSet bs { 1, 2, 4, 8 };
+// - Efficiently iterating through the set bits:
+//     for (int i : bs)
+//         [i is the *index* of a set bit]
+//   (This uses the appropriate CPU instruction to find the next set bit in one
+//   operation.)
+// - Counting set bits using .Count() - see comment on that method.
+
+// TODO: use constexpr when MSVC gets out of the Dark Ages
+
+template <typename IntTy>
+class BitSet
+{
+	static_assert(!std::is_signed<IntTy>::value, "BitSet should not be used with signed types");
+public:
+	// A reference to a particular bit, returned from operator[].
+	class Ref
+	{
+	public:
+		Ref(Ref&& other) : m_bs(other.m_bs), m_mask(other.m_mask) {}
+		Ref(BitSet* bs, IntTy mask) : m_bs(bs), m_mask(mask) {}
+		operator bool() const { return (m_bs->m_val & m_mask) != 0; }
+		bool operator=(bool set)
+		{
+			m_bs->m_val = (m_bs->m_val & ~m_mask) | (set ? m_mask : 0);
+			return set;
+		}
+	private:
+		BitSet* m_bs;
+		IntTy m_mask;
+	};
+
+	// A STL-like iterator is required to be able to use range-based for loops.
+	class Iterator
+	{
+	public:
+		Iterator(const Iterator& other) : m_val(other.m_val), m_bit(other.m_bit) {}
+		Iterator(IntTy val, int bit) : m_val(val), m_bit(bit) {}
+		Iterator& operator=(Iterator other) { new (this) Iterator(other); return *this; }
+		int operator*() { return m_bit; }
+		Iterator& operator++()
+		{
+			if (m_val == 0)
+			{
+				m_bit = -1;
+			}
+			else
+			{
+				int bit = LeastSignificantSetBit(m_val);
+				m_val &= ~(1 << bit);
+				m_bit = bit;
+			}
+			return *this;
+		}
+		Iterator operator++(int _)
+		{
+			Iterator other(*this);
+			++*this;
+			return other;
+		}
+		bool operator==(Iterator other) const { return m_bit == other.m_bit; }
+		bool operator!=(Iterator other) const { return m_bit != other.m_bit; }
+	private:
+		IntTy m_val;
+		int m_bit;
+	};
+
+	BitSet() : m_val(0) {}
+	explicit BitSet(IntTy val) : m_val(val) {}
+	BitSet(std::initializer_list<int> init)
+	{
+		m_val = 0;
+		for (int bit : init)
+			m_val |= (IntTy)1 << bit;
+	}
+
+	static BitSet AllTrue(size_t count)
+	{
+		return BitSet(count == sizeof(IntTy)*8 ? ~(IntTy)0 : (((IntTy)1 << count) - 1));
+	}
+
+	Ref operator[](size_t bit) { return Ref(this, (IntTy)1 << bit); }
+	const Ref operator[](size_t bit) const { return (*const_cast<BitSet*>(this))[bit]; }
+	bool operator==(BitSet other) const { return m_val == other.m_val; }
+	bool operator!=(BitSet other) const { return m_val != other.m_val; }
+	BitSet operator|(BitSet other) const { return BitSet(m_val | other.m_val); }
+	BitSet operator&(BitSet other) const { return BitSet(m_val & other.m_val); }
+	BitSet operator^(BitSet other) const { return BitSet(m_val ^ other.m_val); }
+	BitSet operator~() const { return BitSet(~m_val); }
+	BitSet& operator|=(BitSet other) { return *this = *this | other; }
+	BitSet& operator&=(BitSet other) { return *this = *this & other; }
+	BitSet& operator^=(BitSet other) { return *this = *this ^ other; }
+	operator u32() = delete;
+	operator bool() { return m_val != 0; }
+
+	// Warning: Even though on modern CPUs this is a single fast instruction,
+	// Dolphin's official builds do not currently assume POPCNT support on x86,
+	// so slower explicit bit twiddling is generated.  Still should generally
+	// be faster than a loop.
+	unsigned int Count() const { return CountSetBits(m_val); }
+
+	Iterator begin() const { Iterator it(m_val, 0); return ++it; }
+	Iterator end() const { return Iterator(m_val, -1); }
+
+	IntTy m_val;
+};
+
+}
+
+typedef BS::BitSet<u8> BitSet8;
+typedef BS::BitSet<u16> BitSet16;
+typedef BS::BitSet<u32> BitSet32;
+typedef BS::BitSet<u64> BitSet64;
diff --git a/Source/Core/Common/BlockingLoop.h b/Source/Core/Common/BlockingLoop.h
new file mode 100644
index 0000000000..7d4fec495b
--- /dev/null
+++ b/Source/Core/Common/BlockingLoop.h
@@ -0,0 +1,219 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+#include "Common/Event.h"
+#include "Common/Flag.h"
+
+namespace Common
+{
+
+// This class provides a synchronized loop.
+// It's a thread-safe way to trigger a new iteration without busy loops.
+// It's optimized for high-usage iterations which usually are already running while it's triggered often.
+// Be careful when using Wait() and Wakeup() at the same time. Wait() may block forever while Wakeup() is called regularly.
+class BlockingLoop
+{
+public:
+	BlockingLoop()
+	{
+		m_stopped.Set();
+	}
+
+	~BlockingLoop()
+	{
+		Stop();
+	}
+
+	// Triggers to rerun the payload of the Run() function at least once again.
+	// This function will never block and is designed to finish as fast as possible.
+	void Wakeup()
+	{
+		// Already running, so no need for a wakeup.
+		// This is the common case, so try to get this as fast as possible.
+		if (m_running_state.load() >= STATE_NEED_EXECUTION)
+			return;
+
+		// Mark that new data is available. If the old state will rerun the payload
+		// itself, we don't have to set the event to interrupt the worker.
+		if (m_running_state.exchange(STATE_NEED_EXECUTION) != STATE_SLEEPING)
+			return;
+
+		// Else as the worker thread may sleep now, we have to set the event.
+		m_new_work_event.Set();
+	}
+
+	// Wait for a complete payload run after the last Wakeup() call.
+	// If stopped, this returns immediately.
+	void Wait()
+	{
+		// already done
+		if (IsDone())
+			return;
+
+		// notifying this event will only wake up one thread, so use a mutex here to
+		// allow only one waiting thread. And in this way, we get an event free wakeup
+		// but for the first thread for free
+		std::lock_guard<std::mutex> lk(m_wait_lock);
+
+		// Wait for the worker thread to finish.
+		while (!IsDone())
+		{
+			m_done_event.Wait();
+		}
+
+		// As we wanted to wait for the other thread, there is likely no work remaining.
+		// So there is no need for a busy loop any more.
+		m_may_sleep.Set();
+	}
+
+	// Half start the worker.
+	// So this object is in a running state and Wait() will block until the worker calls Run().
+	// This may be called from any thread and is supposed to be called at least once before Wait() is used.
+	void Prepare()
+	{
+		// There is a race condition if the other threads call this function while
+		// the loop thread is initializing. Using this lock will ensure a valid state.
+		std::lock_guard<std::mutex> lk(m_prepare_lock);
+
+		if (!m_stopped.TestAndClear())
+			return;
+		m_running_state.store(STATE_LAST_EXECUTION); // so the payload will only be executed once without any Wakeup call
+		m_shutdown.Clear();
+		m_may_sleep.Set();
+	}
+
+	// Main loop of this object.
+	// The payload callback is called at least as often as it's needed to match the Wakeup() requirements.
+	// The optional timeout parameter is a timeout for how periodically the payload should be called.
+	// Use timeout = 0 to run without a timeout at all.
+	template<class F> void Run(F payload, int64_t timeout = 0)
+	{
+		// Asserts that Prepare is called at least once before we enter the loop.
+		// But a good implementation should call this before already.
+		Prepare();
+
+		while (!m_shutdown.IsSet())
+		{
+			payload();
+
+			switch (m_running_state.load())
+			{
+				case STATE_NEED_EXECUTION:
+					// We won't get notified while we are in the STATE_NEED_EXECUTION state, so maybe Wakeup was called.
+					// So we have to assume on finishing the STATE_NEED_EXECUTION state, that there may be some remaining tasks.
+					// To process this tasks, we call the payload again within the STATE_LAST_EXECUTION state.
+					m_running_state--;
+					break;
+
+				case STATE_LAST_EXECUTION:
+					// If we're still in the STATE_LAST_EXECUTION state, then Wakeup wasn't called within the last
+					// execution of the payload. This means we should be ready now.
+					// But bad luck, Wakeup may have been called right now. So break and rerun the payload
+					// if the state was touched.
+					if (m_running_state-- != STATE_LAST_EXECUTION)
+						break;
+
+					// Else we're likely in the STATE_DONE state now, so wakeup the waiting threads right now.
+					// However, if we're not in the STATE_DONE state any more, the event should also be
+					// triggered so that we'll skip the next waiting call quite fast.
+					m_done_event.Set();
+
+				case STATE_DONE:
+					// We're done now. So time to check if we want to sleep or if we want to stay in a busy loop.
+					if (m_may_sleep.TestAndClear())
+					{
+						// Try to set the sleeping state.
+						if (m_running_state-- != STATE_DONE)
+							break;
+					}
+					else
+					{
+						// Busy loop.
+						break;
+					}
+
+				case STATE_SLEEPING:
+					// Just relax
+					if (timeout > 0)
+					{
+						m_new_work_event.WaitFor(std::chrono::milliseconds(timeout));
+					}
+					else
+					{
+						m_new_work_event.Wait();
+					}
+					break;
+			}
+		}
+
+		// Shutdown down, so get a safe state
+		m_running_state.store(STATE_DONE);
+		m_stopped.Set();
+
+		// Wake up the last Wait calls.
+		m_done_event.Set();
+	}
+
+	// Quits the main loop.
+	// By default, it will wait until the main loop quits.
+	// Be careful to not use the blocking way within the payload of the Run() method.
+	void Stop(bool block = true)
+	{
+		if (m_stopped.IsSet())
+			return;
+
+		m_shutdown.Set();
+
+		// We have to interrupt the sleeping call to let the worker shut down soon.
+		Wakeup();
+
+		if (block)
+			Wait();
+	}
+
+	bool IsRunning() const
+	{
+		return !m_stopped.IsSet() && !m_shutdown.IsSet();
+	}
+
+	bool IsDone() const
+	{
+		return m_stopped.IsSet() || m_running_state.load() <= STATE_DONE;
+	}
+
+	// This function should be triggered regularly over time so
+	// that we will fall back from the busy loop to sleeping.
+	void AllowSleep()
+	{
+		m_may_sleep.Set();
+	}
+
+private:
+	std::mutex m_wait_lock;
+	std::mutex m_prepare_lock;
+
+	Flag m_stopped;  // If this is set, Wait() shall not block.
+	Flag m_shutdown; // If this is set, the loop shall end.
+
+	Event m_new_work_event;
+	Event m_done_event;
+
+	enum RUNNING_TYPE {
+		STATE_SLEEPING = 0,
+		STATE_DONE = 1,
+		STATE_LAST_EXECUTION = 2,
+		STATE_NEED_EXECUTION = 3
+	};
+	std::atomic<int> m_running_state; // must be of type RUNNING_TYPE
+
+	Flag m_may_sleep; // If this is set, we fall back from the busy loop to an event based synchronization.
+};
+
+}
diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp
new file mode 100644
index 0000000000..d69f561432
--- /dev/null
+++ b/Source/Core/Common/BreakPoints.cpp
@@ -0,0 +1,310 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/DebugInterface.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+bool BreakPoints::IsAddressBreakPoint(u32 address) const
+{
+	for (const TBreakPoint& bp : m_BreakPoints)
+		if (bp.iAddress == address)
+			return true;
+
+	return false;
+}
+
+bool BreakPoints::IsTempBreakPoint(u32 address) const
+{
+	for (const TBreakPoint& bp : m_BreakPoints)
+		if (bp.iAddress == address && bp.bTemporary)
+			return true;
+
+	return false;
+}
+
+BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const
+{
+	TBreakPointsStr bps;
+	for (const TBreakPoint& bp : m_BreakPoints)
+	{
+		if (!bp.bTemporary)
+		{
+			std::stringstream ss;
+			ss << std::hex << bp.iAddress << " " << (bp.bOn ? "n" : "");
+			bps.push_back(ss.str());
+		}
+	}
+
+	return bps;
+}
+
+void BreakPoints::AddFromStrings(const TBreakPointsStr& bpstrs)
+{
+	for (const std::string& bpstr : bpstrs)
+	{
+		TBreakPoint bp;
+		std::stringstream ss;
+		ss << std::hex << bpstr;
+		ss >> bp.iAddress;
+		bp.bOn = bpstr.find("n") != bpstr.npos;
+		bp.bTemporary = false;
+		Add(bp);
+	}
+}
+
+void BreakPoints::Add(const TBreakPoint& bp)
+{
+	if (!IsAddressBreakPoint(bp.iAddress))
+	{
+		m_BreakPoints.push_back(bp);
+		if (jit)
+			jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4, true);
+	}
+}
+
+void BreakPoints::Add(u32 em_address, bool temp)
+{
+	if (!IsAddressBreakPoint(em_address)) // only add new addresses
+	{
+		TBreakPoint pt; // breakpoint settings
+		pt.bOn = true;
+		pt.bTemporary = temp;
+		pt.iAddress = em_address;
+
+		m_BreakPoints.push_back(pt);
+
+		if (jit)
+			jit->GetBlockCache()->InvalidateICache(em_address, 4, true);
+	}
+}
+
+void BreakPoints::Remove(u32 em_address)
+{
+	for (auto i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i)
+	{
+		if (i->iAddress == em_address)
+		{
+			m_BreakPoints.erase(i);
+			if (jit)
+				jit->GetBlockCache()->InvalidateICache(em_address, 4, true);
+			return;
+		}
+	}
+}
+
+void BreakPoints::Clear()
+{
+	if (jit)
+	{
+		for (const TBreakPoint& bp : m_BreakPoints)
+		{
+			jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4, true);
+		}
+	}
+
+	m_BreakPoints.clear();
+}
+
+void BreakPoints::ClearAllTemporary()
+{
+	for (const TBreakPoint& bp : m_BreakPoints)
+	{
+		if (bp.bTemporary)
+		{
+			if (jit)
+				jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4, true);
+			Remove(bp.iAddress);
+		}
+	}
+}
+
+MemChecks::TMemChecksStr MemChecks::GetStrings() const
+{
+	TMemChecksStr mcs;
+	for (const TMemCheck& bp : m_MemChecks)
+	{
+		std::stringstream mc;
+		mc << std::hex << bp.StartAddress;
+		mc << " " << (bp.bRange ? bp.EndAddress : bp.StartAddress) << " " <<
+			(bp.bRange ? "n" : "") << (bp.OnRead ? "r" : "") <<
+			(bp.OnWrite ? "w" : "") << (bp.Log ? "l" : "") << (bp.Break ? "p" : "");
+		mcs.push_back(mc.str());
+	}
+
+	return mcs;
+}
+
+void MemChecks::AddFromStrings(const TMemChecksStr& mcstrs)
+{
+	for (const std::string& mcstr : mcstrs)
+	{
+		TMemCheck mc;
+		std::stringstream ss;
+		ss << std::hex << mcstr;
+		ss >> mc.StartAddress;
+		mc.bRange  = mcstr.find("n") != mcstr.npos;
+		mc.OnRead  = mcstr.find("r") != mcstr.npos;
+		mc.OnWrite = mcstr.find("w") != mcstr.npos;
+		mc.Log     = mcstr.find("l") != mcstr.npos;
+		mc.Break   = mcstr.find("p") != mcstr.npos;
+		if (mc.bRange)
+			ss >> mc.EndAddress;
+		else
+			mc.EndAddress = mc.StartAddress;
+		Add(mc);
+	}
+}
+
+void MemChecks::Add(const TMemCheck& _rMemoryCheck)
+{
+	bool had_any = HasAny();
+	if (GetMemCheck(_rMemoryCheck.StartAddress) == nullptr)
+		m_MemChecks.push_back(_rMemoryCheck);
+	// If this is the first one, clear the JIT cache so it can switch to
+	// watchpoint-compatible code.
+	if (!had_any && jit)
+		jit->ClearCache();
+}
+
+void MemChecks::Remove(u32 _Address)
+{
+	for (auto i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i)
+	{
+		if (i->StartAddress == _Address)
+		{
+			m_MemChecks.erase(i);
+			return;
+		}
+	}
+	if (!HasAny() && jit)
+		jit->ClearCache();
+}
+
+TMemCheck *MemChecks::GetMemCheck(u32 address)
+{
+	for (TMemCheck& bp : m_MemChecks)
+	{
+		if (bp.bRange)
+		{
+			if (address >= bp.StartAddress && address <= bp.EndAddress)
+				return &(bp);
+		}
+		else if (bp.StartAddress == address)
+		{
+			return &(bp);
+		}
+	}
+
+	// none found
+	return nullptr;
+}
+
+bool TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr, bool write, int size, u32 pc)
+{
+	if ((write && OnWrite) || (!write && OnRead))
+	{
+		if (Log)
+		{
+			INFO_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)",
+				pc, debug_interface->GetDescription(pc).c_str(),
+				write ? "Write" : "Read", size*8, size*2, iValue, addr,
+				debug_interface->GetDescription(addr).c_str()
+				);
+		}
+
+		return true;
+	}
+	return false;
+}
+
+
+bool Watches::IsAddressWatch(u32 _iAddress) const
+{
+	for (const TWatch& bp : m_Watches)
+		if (bp.iAddress == _iAddress)
+			return true;
+
+	return false;
+}
+
+Watches::TWatchesStr Watches::GetStrings() const
+{
+	TWatchesStr bps;
+	for (const TWatch& bp : m_Watches)
+	{
+		std::stringstream ss;
+		ss << std::hex << bp.iAddress << " " << bp.name;
+		bps.push_back(ss.str());
+	}
+
+	return bps;
+}
+
+void Watches::AddFromStrings(const TWatchesStr& bpstrs)
+{
+	for (const std::string& bpstr : bpstrs)
+	{
+		TWatch bp;
+		std::stringstream ss;
+		ss << std::hex << bpstr;
+		ss >> bp.iAddress;
+		ss >> std::ws;
+		getline(ss, bp.name);
+		Add(bp);
+	}
+}
+
+void Watches::Add(const TWatch& bp)
+{
+	if (!IsAddressWatch(bp.iAddress))
+	{
+		m_Watches.push_back(bp);
+	}
+}
+
+void Watches::Add(u32 em_address)
+{
+	if (!IsAddressWatch(em_address)) // only add new addresses
+	{
+		TWatch pt; // breakpoint settings
+		pt.bOn = true;
+		pt.iAddress = em_address;
+
+		m_Watches.push_back(pt);
+	}
+}
+
+void Watches::Update(int count, u32 em_address)
+{
+	m_Watches.at(count).iAddress = em_address;
+}
+
+void Watches::UpdateName(int count, const std::string name)
+{
+	m_Watches.at(count).name = name;
+}
+
+void Watches::Remove(u32 em_address)
+{
+	for (auto i = m_Watches.begin(); i != m_Watches.end(); ++i)
+	{
+		if (i->iAddress == em_address)
+		{
+			m_Watches.erase(i);
+			return;
+		}
+	}
+}
+
+void Watches::Clear()
+{
+	m_Watches.clear();
+}
diff --git a/Source/Core/Common/BreakPoints.h b/Source/Core/Common/BreakPoints.h
new file mode 100644
index 0000000000..79b2c03b41
--- /dev/null
+++ b/Source/Core/Common/BreakPoints.h
@@ -0,0 +1,141 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+class DebugInterface;
+
+struct TBreakPoint
+{
+	u32  iAddress;
+	bool bOn;
+	bool bTemporary;
+};
+
+struct TMemCheck
+{
+	TMemCheck()
+	{
+		numHits = 0;
+		StartAddress = EndAddress = 0;
+		bRange = OnRead = OnWrite = Log = Break = false;
+	}
+
+	u32 StartAddress;
+	u32 EndAddress;
+
+	bool bRange;
+
+	bool OnRead;
+	bool OnWrite;
+
+	bool Log;
+	bool Break;
+
+	u32 numHits;
+
+	// returns whether to break
+	bool Action(DebugInterface *dbg_interface, u32 _iValue, u32 addr,
+	            bool write, int size, u32 pc);
+};
+
+struct TWatch
+{
+	std::string name = "";
+	u32  iAddress;
+	bool bOn;
+};
+
+// Code breakpoints.
+class BreakPoints
+{
+public:
+	typedef std::vector<TBreakPoint> TBreakPoints;
+	typedef std::vector<std::string> TBreakPointsStr;
+
+	const TBreakPoints& GetBreakPoints() { return m_BreakPoints; }
+
+	TBreakPointsStr GetStrings() const;
+	void AddFromStrings(const TBreakPointsStr& bps);
+
+	// is address breakpoint
+	bool IsAddressBreakPoint(u32 address) const;
+	bool IsTempBreakPoint(u32 address) const;
+
+	// Add BreakPoint
+	void Add(u32 em_address, bool temp = false);
+	void Add(const TBreakPoint& bp);
+
+	// Remove Breakpoint
+	void Remove(u32 _iAddress);
+	void Clear();
+	void ClearAllTemporary();
+
+	void DeleteByAddress(u32 _Address);
+
+private:
+	TBreakPoints m_BreakPoints;
+	u32 m_iBreakOnCount;
+};
+
+
+// Memory breakpoints
+class MemChecks
+{
+public:
+	typedef std::vector<TMemCheck> TMemChecks;
+	typedef std::vector<std::string> TMemChecksStr;
+
+	TMemChecks m_MemChecks;
+
+	const TMemChecks& GetMemChecks() { return m_MemChecks; }
+
+	TMemChecksStr GetStrings() const;
+	void AddFromStrings(const TMemChecksStr& mcs);
+
+	void Add(const TMemCheck& _rMemoryCheck);
+
+	// memory breakpoint
+	TMemCheck *GetMemCheck(u32 address);
+	void Remove(u32 _Address);
+
+	void Clear() { m_MemChecks.clear(); }
+
+	bool HasAny() const { return !m_MemChecks.empty(); }
+};
+
+class Watches
+{
+public:
+	typedef std::vector<TWatch> TWatches;
+	typedef std::vector<std::string> TWatchesStr;
+
+	const TWatches& GetWatches() { return m_Watches; }
+
+	TWatchesStr GetStrings() const;
+	void AddFromStrings(const TWatchesStr& bps);
+
+	bool IsAddressWatch(u32 _iAddress) const;
+
+	// Add BreakPoint
+	void Add(u32 em_address);
+	void Add(const TWatch& bp);
+
+	void Update(int count, u32 em_address);
+	void UpdateName(int count, const std::string name);
+
+	// Remove Breakpoint
+	void Remove(u32 _iAddress);
+	void Clear();
+
+	void DeleteByAddress(u32 _Address);
+
+private:
+	TWatches m_Watches;
+};
diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp
new file mode 100644
index 0000000000..bb71c435b0
--- /dev/null
+++ b/Source/Core/Common/CDUtils.cpp
@@ -0,0 +1,228 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Most of the code in this file was shamelessly ripped from libcdio With minor adjustments
+
+#include <algorithm>
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+#include "Common/CDUtils.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#elif __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#include <IOKit/IOBSD.h>
+#include <IOKit/IOKitLib.h>
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IOMedia.h>
+#include <paths.h>
+#else
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#endif // WIN32
+
+#ifdef __linux__
+#include <linux/cdrom.h>
+#endif
+
+#ifdef _WIN32
+// takes a root drive path, returns true if it is a cdrom drive
+bool is_cdrom(const TCHAR* drive)
+{
+	return (DRIVE_CDROM == GetDriveType(drive));
+}
+
+// Returns a vector with the device names
+std::vector<std::string> cdio_get_devices()
+{
+	std::vector<std::string> drives;
+
+	const DWORD buffsize = GetLogicalDriveStrings(0, nullptr);
+	std::vector<TCHAR> buff(buffsize);
+	if (GetLogicalDriveStrings(buffsize, buff.data()) == buffsize - 1)
+	{
+		auto drive = buff.data();
+		while (*drive)
+		{
+			if (is_cdrom(drive))
+			{
+				std::string str(TStrToUTF8(drive));
+				str.pop_back(); // we don't want the final backslash
+				drives.push_back(std::move(str));
+			}
+
+			// advance to next drive
+			while (*drive++) {}
+		}
+	}
+	return drives;
+}
+#elif defined __APPLE__
+// Returns a pointer to an array of strings with the device names
+std::vector<std::string> cdio_get_devices()
+{
+	io_object_t   next_media;
+	mach_port_t   master_port;
+	kern_return_t kern_result;
+	io_iterator_t media_iterator;
+	CFMutableDictionaryRef classes_to_match;
+	std::vector<std::string> drives;
+
+	kern_result = IOMasterPort(MACH_PORT_NULL, &master_port);
+	if (kern_result != KERN_SUCCESS)
+		return drives;
+
+	classes_to_match = IOServiceMatching(kIOCDMediaClass);
+	if (classes_to_match == nullptr)
+		return drives;
+
+	CFDictionarySetValue(classes_to_match,
+		CFSTR(kIOMediaEjectableKey), kCFBooleanTrue);
+
+	kern_result = IOServiceGetMatchingServices(master_port,
+		classes_to_match, &media_iterator);
+	if (kern_result != KERN_SUCCESS)
+		return drives;
+
+	next_media = IOIteratorNext(media_iterator);
+	if (next_media != 0)
+	{
+		CFTypeRef str_bsd_path;
+
+		do
+		{
+			str_bsd_path =
+				IORegistryEntryCreateCFProperty(next_media,
+					CFSTR(kIOBSDNameKey), kCFAllocatorDefault,
+					0);
+			if (str_bsd_path == nullptr)
+			{
+				IOObjectRelease(next_media);
+				continue;
+			}
+
+			if (CFGetTypeID(str_bsd_path) == CFStringGetTypeID())
+			{
+				size_t buf_size = CFStringGetLength((CFStringRef)str_bsd_path) * 4 + 1;
+				char* buf = new char[buf_size];
+
+				if (CFStringGetCString((CFStringRef)str_bsd_path, buf, buf_size, kCFStringEncodingUTF8))
+				{
+					// Below, by appending 'r' to the BSD node name, we indicate
+					// a raw disk. Raw disks receive I/O requests directly and
+					// don't go through a buffer cache.
+					drives.push_back(std::string(_PATH_DEV "r") + buf);
+				}
+
+				delete[] buf;
+			}
+			CFRelease(str_bsd_path);
+			IOObjectRelease(next_media);
+		} while ((next_media = IOIteratorNext(media_iterator)) != 0);
+	}
+	IOObjectRelease(media_iterator);
+	return drives;
+}
+#else
+// checklist: /dev/cdrom, /dev/dvd /dev/hd?, /dev/scd? /dev/sr?
+static struct
+{
+	const char * format;
+	unsigned int num_min;
+	unsigned int num_max;
+} checklist[] =
+	{
+#ifdef __linux__
+		{ "/dev/cdrom", 0, 0 },
+		{ "/dev/dvd", 0, 0 },
+		{ "/dev/hd%c", 'a', 'z' },
+		{ "/dev/scd%d", 0, 27 },
+		{ "/dev/sr%d", 0, 27 },
+#else
+		{ "/dev/acd%d", 0, 27 },
+		{ "/dev/cd%d", 0, 27 },
+#endif
+		{ nullptr, 0, 0 }
+	};
+
+// Returns true if a device is a block or char device and not a symbolic link
+static bool is_device(const std::string& source_name)
+{
+	struct stat buf;
+	if (0 != lstat(source_name.c_str(), &buf))
+		return false;
+
+	return ((S_ISBLK(buf.st_mode) || S_ISCHR(buf.st_mode)) &&
+		!S_ISLNK(buf.st_mode));
+}
+
+// Check a device to see if it is a DVD/CD-ROM drive
+static bool is_cdrom(const std::string& drive, char *mnttype)
+{
+	// Check if the device exists
+	if (!is_device(drive))
+		return false;
+
+	bool is_cd = false;
+	// If it does exist, verify that it is a cdrom/dvd drive
+	int cdfd = open(drive.c_str(), (O_RDONLY | O_NONBLOCK), 0);
+	if (cdfd >= 0)
+	{
+#ifdef __linux__
+		if (ioctl(cdfd, CDROM_GET_CAPABILITY, 0) != -1)
+#endif
+			is_cd = true;
+		close(cdfd);
+	}
+	return is_cd;
+}
+
+// Returns a pointer to an array of strings with the device names
+std::vector<std::string> cdio_get_devices()
+{
+	std::vector<std::string> drives;
+	// Scan the system for DVD/CD-ROM drives.
+	for (unsigned int i = 0; checklist[i].format; ++i)
+	{
+		for (unsigned int j = checklist[i].num_min; j <= checklist[i].num_max; ++j)
+		{
+			std::string drive = StringFromFormat(checklist[i].format, j);
+			if (is_cdrom(drive, nullptr))
+			{
+				drives.push_back(std::move(drive));
+			}
+		}
+	}
+	return drives;
+}
+#endif
+
+// Returns true if device is a cdrom/dvd drive
+bool cdio_is_cdrom(std::string device)
+{
+#ifndef _WIN32
+	// Resolve symbolic links. This allows symbolic links to valid
+	// drives to be passed from the command line with the -e flag.
+	char resolved_path[MAX_PATH];
+	char *devname = realpath(device.c_str(), resolved_path);
+	if (!devname)
+		return false;
+	device = devname;
+#endif
+
+	std::vector<std::string> devices = cdio_get_devices();
+	for (const std::string& d : devices)
+	{
+		if (d == device)
+			return true;
+	}
+	return false;
+}
diff --git a/Source/Core/Common/CDUtils.h b/Source/Core/Common/CDUtils.h
new file mode 100644
index 0000000000..8c768dac37
--- /dev/null
+++ b/Source/Core/Common/CDUtils.h
@@ -0,0 +1,14 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+// Returns a pointer to an array of strings with the device names
+std::vector<std::string> cdio_get_devices();
+
+// Returns true if device is cdrom/dvd
+bool cdio_is_cdrom(std::string device);
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 6e230c7fa7..ff996887a0 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -1,56 +1,62 @@
-set(SRCS	Src/BreakPoints.cpp
-			Src/CDUtils.cpp
-			Src/ColorUtil.cpp
-			Src/ConsoleListener.cpp
-			Src/FileSearch.cpp
-			Src/FileUtil.cpp
-			Src/Hash.cpp
-			Src/IniFile.cpp
-			Src/LogManager.cpp
-			Src/MathUtil.cpp
-			Src/MemArena.cpp
-			Src/MemoryUtil.cpp
-			Src/Misc.cpp
-			Src/MsgHandler.cpp
-			Src/NandPaths.cpp
-			Src/SettingsHandler.cpp
-			Src/SDCardUtil.cpp
-			Src/StringUtil.cpp
-			Src/SymbolDB.cpp
-			Src/SysConf.cpp
-			Src/Thread.cpp
-			Src/Timer.cpp
-			Src/Version.cpp
-			Src/x64ABI.cpp
-			Src/x64Analyzer.cpp
-			Src/x64Emitter.cpp
-			Src/Crypto/aes_cbc.cpp
-			Src/Crypto/aes_core.cpp
-			Src/Crypto/bn.cpp
-			Src/Crypto/ec.cpp)
+set(SRCS BreakPoints.cpp
+         CDUtils.cpp
+         ColorUtil.cpp
+         ENetUtil.cpp
+         FileSearch.cpp
+         FileUtil.cpp
+         GekkoDisassembler.cpp
+         Hash.cpp
+         IniFile.cpp
+         JitRegister.cpp
+         MathUtil.cpp
+         MemArena.cpp
+         MemoryUtil.cpp
+         Misc.cpp
+         MsgHandler.cpp
+         NandPaths.cpp
+         Network.cpp
+         PcapFile.cpp
+         PerformanceCounter.cpp
+         Profiler.cpp
+         SettingsHandler.cpp
+         SDCardUtil.cpp
+         StringUtil.cpp
+         SymbolDB.cpp
+         SysConf.cpp
+         Thread.cpp
+         Timer.cpp
+         TraversalClient.cpp
+         Version.cpp
+         x64ABI.cpp
+         x64Analyzer.cpp
+         x64Emitter.cpp
+         Crypto/bn.cpp
+         Crypto/ec.cpp
+         Logging/ConsoleListenerNix.cpp
+         Logging/LogManager.cpp)
 
-if(_M_ARM) #ARM
-	set(SRCS	${SRCS}
-				Src/ArmCPUDetect.cpp
-				Src/ArmEmitter.cpp)
+set(LIBS enet)
+if(_M_ARM_64)
+	set(SRCS ${SRCS}
+	         Arm64Emitter.cpp
+	         ArmCPUDetect.cpp
+	         GenericFPURoundMode.cpp)
 else()
-	if(NOT _M_GENERIC) #X86
-		set(SRCS	${SRCS}
-					Src/x64FPURoundMode.cpp
-					Src/x64Thunk.cpp
-					)
+	if(_M_X86) #X86
+		set(SRCS ${SRCS}
+		         x64FPURoundMode.cpp
+		         x64CPUDetect.cpp)
+	else() # Generic
+		set(SRCS ${SRCS}
+		         GenericFPURoundMode.cpp
+		         GenericCPUDetect.cpp)
 	endif()
-	set(SRCS ${SRCS} Src/x64CPUDetect.cpp)
 endif()
-if(_M_GENERIC) #Generic
-	set(SRCS	${SRCS}
-				Src/GenericFPURoundMode.cpp)
+
+set(LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES})
+if(NOT APPLE AND NOT ANDROID)
+	set(LIBS ${LIBS} rt)
 endif()
-if(WIN32)
-	set(SRCS ${SRCS} Src/ExtendedTrace.cpp)
-endif(WIN32)
 
-enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS)
-
-add_library(common STATIC ${SRCS})
-target_link_libraries(common ${CMAKE_THREAD_LIBS_INIT})
+add_dolphin_library(common "${SRCS}" "${LIBS}")
+add_executable(traversal_server TraversalServer.cpp)
diff --git a/Source/Core/Common/CPUDetect.h b/Source/Core/Common/CPUDetect.h
new file mode 100644
index 0000000000..dd4922750e
--- /dev/null
+++ b/Source/Core/Common/CPUDetect.h
@@ -0,0 +1,93 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Detect the CPU, so we'll know which optimizations to use
+#pragma once
+
+#include <string>
+
+enum CPUVendor
+{
+	VENDOR_INTEL = 0,
+	VENDOR_AMD = 1,
+	VENDOR_ARM = 2,
+	VENDOR_OTHER = 3,
+};
+
+struct CPUInfo
+{
+	CPUVendor vendor;
+
+	char cpu_string[0x41];
+	char brand_string[0x21];
+	bool OS64bit;
+	bool CPU64bit;
+	bool Mode64bit;
+
+	bool HTT;
+	int num_cores;
+	int logical_cpu_count;
+
+	bool bSSE;
+	bool bSSE2;
+	bool bSSE3;
+	bool bSSSE3;
+	bool bPOPCNT;
+	bool bSSE4_1;
+	bool bSSE4_2;
+	bool bLZCNT;
+	bool bSSE4A;
+	bool bAVX;
+	bool bAVX2;
+	bool bBMI1;
+	bool bBMI2;
+	bool bFMA;
+	bool bFMA4;
+	bool bAES;
+	// FXSAVE/FXRSTOR
+	bool bFXSR;
+	bool bMOVBE;
+	// This flag indicates that the hardware supports some mode
+	// in which denormal inputs _and_ outputs are automatically set to (signed) zero.
+	bool bFlushToZero;
+	bool bLAHFSAHF64;
+	bool bLongMode;
+	bool bAtom;
+
+	// ARM specific CPUInfo
+	bool bSwp;
+	bool bHalf;
+	bool bThumb;
+	bool bFastMult;
+	bool bVFP;
+	bool bEDSP;
+	bool bThumbEE;
+	bool bNEON;
+	bool bVFPv3;
+	bool bTLS;
+	bool bVFPv4;
+	bool bIDIVa;
+	bool bIDIVt;
+	bool bArmV7;  // enable MOVT, MOVW etc
+
+	// ARMv8 specific
+	bool bFP;
+	bool bASIMD;
+	bool bCRC32;
+	bool bSHA1;
+	bool bSHA2;
+
+	// Call Detect()
+	explicit CPUInfo();
+
+	// Turn the CPU info into a string we can show
+	std::string Summarize();
+
+private:
+	// Detects the various CPU features
+	void Detect();
+};
+
+extern CPUInfo cpu_info;
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
new file mode 100644
index 0000000000..cd02192c86
--- /dev/null
+++ b/Source/Core/Common/ChunkFile.h
@@ -0,0 +1,455 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// Extremely simple serialization framework.
+
+// (mis)-features:
+// + Super fast
+// + Very simple
+// + Same code is used for serialization and deserializaition (in most cases)
+// - Zero backwards/forwards compatibility
+// - Serialization code for anything complex has to be manually written.
+
+#include <array>
+#include <cstddef>
+#include <deque>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Flag.h"
+
+// ewww
+#if _LIBCPP_VERSION || __GNUC__ >= 5
+#define IsTriviallyCopyable(T) std::is_trivially_copyable<typename std::remove_volatile<T>::type>::value
+#elif __GNUC__
+#define IsTriviallyCopyable(T) std::has_trivial_copy_constructor<T>::value
+#elif _MSC_VER >= 1800
+// work around bug
+#define IsTriviallyCopyable(T) (std::is_trivially_copyable<T>::value || std::is_pod<T>::value)
+#elif defined(_MSC_VER)
+#define IsTriviallyCopyable(T) std::has_trivial_copy<T>::value
+#else
+#error No version of is_trivially_copyable
+#endif
+
+
+template <class T>
+struct LinkedListItem : public T
+{
+	LinkedListItem<T> *next;
+};
+
+// Wrapper class
+class PointerWrap
+{
+public:
+	enum Mode
+	{
+		MODE_READ = 1, // load
+		MODE_WRITE, // save
+		MODE_MEASURE, // calculate size
+		MODE_VERIFY, // compare
+	};
+
+	u8 **ptr;
+	Mode mode;
+
+public:
+	PointerWrap(u8 **ptr_, Mode mode_) : ptr(ptr_), mode(mode_) {}
+
+	void SetMode(Mode mode_) { mode = mode_; }
+	Mode GetMode() const { return mode; }
+	u8** GetPPtr() { return ptr; }
+
+	template <typename K, class V>
+	void Do(std::map<K, V>& x)
+	{
+		u32 count = (u32)x.size();
+		Do(count);
+
+		switch (mode)
+		{
+		case MODE_READ:
+			for (x.clear(); count != 0; --count)
+			{
+				std::pair<K, V> pair;
+				Do(pair.first);
+				Do(pair.second);
+				x.insert(pair);
+			}
+			break;
+
+		case MODE_WRITE:
+		case MODE_MEASURE:
+		case MODE_VERIFY:
+			for (auto& elem : x)
+			{
+				Do(elem.first);
+				Do(elem.second);
+			}
+			break;
+		}
+	}
+
+	template <typename V>
+	void Do(std::set<V>& x)
+	{
+		u32 count = (u32)x.size();
+		Do(count);
+
+		switch (mode)
+		{
+		case MODE_READ:
+			for (x.clear(); count != 0; --count)
+			{
+				V value;
+				Do(value);
+				x.insert(value);
+			}
+			break;
+
+		case MODE_WRITE:
+		case MODE_MEASURE:
+		case MODE_VERIFY:
+			for (V& val : x)
+			{
+				Do(val);
+			}
+			break;
+		}
+	}
+
+	template <typename T>
+	void Do(std::vector<T>& x)
+	{
+		DoContainer(x);
+	}
+
+	template <typename T>
+	void Do(std::list<T>& x)
+	{
+		DoContainer(x);
+	}
+
+	template <typename T>
+	void Do(std::deque<T>& x)
+	{
+		DoContainer(x);
+	}
+
+	template <typename T>
+	void Do(std::basic_string<T>& x)
+	{
+		DoContainer(x);
+	}
+
+	template <typename T, typename U>
+	void Do(std::pair<T, U>& x)
+	{
+		Do(x.first);
+		Do(x.second);
+	}
+
+	template <typename T, std::size_t N>
+	void DoArray(std::array<T, N>& x)
+	{
+		DoArray(x.data(), (u32)x.size());
+	}
+
+	template <typename T>
+	void DoArray(T* x, u32 count)
+	{
+		static_assert(IsTriviallyCopyable(T), "Only sane for trivially copyable types");
+		DoVoid(x, count * sizeof(T));
+	}
+
+	void Do(Common::Flag& flag)
+	{
+		bool s = flag.IsSet();
+		Do(s);
+		if (mode == MODE_READ)
+			flag.Set(s);
+	}
+
+	template<typename T>
+	void Do(std::atomic<T>& atomic)
+	{
+		T temp = atomic.load();
+		Do(temp);
+		if (mode == MODE_READ)
+			atomic.store(temp);
+	}
+
+	template <typename T>
+	void Do(T& x)
+	{
+		static_assert(IsTriviallyCopyable(T), "Only sane for trivially copyable types");
+		// Note:
+		// Usually we can just use x = **ptr, etc.  However, this doesn't work
+		// for unions containing BitFields (long story, stupid language rules)
+		// or arrays.  This will get optimized anyway.
+		DoVoid((void*)&x, sizeof(x));
+	}
+
+	template <typename T>
+	void DoPOD(T& x)
+	{
+		DoVoid((void*)&x, sizeof(x));
+	}
+
+	template <typename T>
+	void DoPointer(T*& x, T* const base)
+	{
+		// pointers can be more than 2^31 apart, but you're using this function wrong if you need that much range
+		ptrdiff_t offset = x - base;
+		Do(offset);
+		if (mode == MODE_READ)
+		{
+			x = base + offset;
+		}
+	}
+
+	// Let's pretend std::list doesn't exist!
+	template <class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)>
+	void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end=0)
+	{
+		LinkedListItem<T>* list_cur = list_start;
+		LinkedListItem<T>* prev = nullptr;
+
+		while (true)
+		{
+			u8 shouldExist = (list_cur ? 1 : 0);
+			Do(shouldExist);
+			if (shouldExist == 1)
+			{
+				LinkedListItem<T>* cur = list_cur ? list_cur : TNew();
+				TDo(*this, (T*)cur);
+				if (!list_cur)
+				{
+					if (mode == MODE_READ)
+					{
+						cur->next = nullptr;
+						list_cur = cur;
+						if (prev)
+							prev->next = cur;
+						else
+							list_start = cur;
+					}
+					else
+					{
+						TFree(cur);
+						continue;
+					}
+				}
+			}
+			else
+			{
+				if (mode == MODE_READ)
+				{
+					if (prev)
+						prev->next = nullptr;
+					if (list_end)
+						*list_end = prev;
+					if (list_cur)
+					{
+						if (list_start == list_cur)
+							list_start = nullptr;
+						do
+						{
+							LinkedListItem<T>* next = list_cur->next;
+							TFree(list_cur);
+							list_cur = next;
+						} while (list_cur);
+					}
+				}
+				break;
+			}
+			prev = list_cur;
+			list_cur = list_cur->next;
+		}
+	}
+
+	void DoMarker(const std::string& prevName, u32 arbitraryNumber = 0x42)
+	{
+		u32 cookie = arbitraryNumber;
+		Do(cookie);
+
+		if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber)
+		{
+			PanicAlertT("Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load...",
+				prevName.c_str(), cookie, cookie, arbitraryNumber, arbitraryNumber);
+			mode = PointerWrap::MODE_MEASURE;
+		}
+	}
+
+private:
+	template <typename T>
+	void DoContainer(T& x)
+	{
+		u32 size = (u32)x.size();
+		Do(size);
+		x.resize(size);
+
+		for (auto& elem : x)
+			Do(elem);
+	}
+
+	__forceinline
+	void DoVoid(void *data, u32 size)
+	{
+		switch (mode)
+		{
+		case MODE_READ:
+			memcpy(data, *ptr, size);
+			break;
+
+		case MODE_WRITE:
+			memcpy(*ptr, data, size);
+			break;
+
+		case MODE_MEASURE:
+			break;
+
+		case MODE_VERIFY:
+			_dbg_assert_msg_(COMMON, !memcmp(data, *ptr, size),
+				"Savestate verification failure: buf %p != %p (size %u).\n",
+					data, *ptr, size);
+			break;
+		}
+
+		*ptr += size;
+	}
+};
+
+// NOTE: this class is only used in DolphinWX/ISOFile.cpp for caching loaded
+// ISO data. It will be removed when DolphinWX is, so please don't use it.
+class CChunkFileReader
+{
+public:
+	// Load file template
+	template<class T>
+	static bool Load(const std::string& _rFilename, u32 _Revision, T& _class)
+	{
+		INFO_LOG(COMMON, "ChunkReader: Loading %s", _rFilename.c_str());
+
+		if (!File::Exists(_rFilename))
+			return false;
+
+		// Check file size
+		const u64 fileSize = File::GetSize(_rFilename);
+		static const u64 headerSize = sizeof(SChunkHeader);
+		if (fileSize < headerSize)
+		{
+			ERROR_LOG(COMMON, "ChunkReader: File too small");
+			return false;
+		}
+
+		File::IOFile pFile(_rFilename, "rb");
+		if (!pFile)
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Can't open file for reading");
+			return false;
+		}
+
+		// read the header
+		SChunkHeader header;
+		if (!pFile.ReadArray(&header, 1))
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Bad header size");
+			return false;
+		}
+
+		// Check revision
+		if (header.Revision != _Revision)
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Wrong file revision, got %d expected %d",
+				header.Revision, _Revision);
+			return false;
+		}
+
+		// get size
+		const u32 sz = (u32)(fileSize - headerSize);
+		if (header.ExpectedSize != sz)
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Bad file size, got %d expected %d",
+				sz, header.ExpectedSize);
+			return false;
+		}
+
+		// read the state
+		std::vector<u8> buffer(sz);
+		if (!pFile.ReadArray(&buffer[0], sz))
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Error reading file");
+			return false;
+		}
+
+		u8* ptr = &buffer[0];
+		PointerWrap p(&ptr, PointerWrap::MODE_READ);
+		_class.DoState(p);
+
+		INFO_LOG(COMMON, "ChunkReader: Done loading %s", _rFilename.c_str());
+		return true;
+	}
+
+	// Save file template
+	template<class T>
+	static bool Save(const std::string& _rFilename, u32 _Revision, T& _class)
+	{
+		INFO_LOG(COMMON, "ChunkReader: Writing %s", _rFilename.c_str());
+		File::IOFile pFile(_rFilename, "wb");
+		if (!pFile)
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Error opening file for write");
+			return false;
+		}
+
+		// Get data
+		u8 *ptr = nullptr;
+		PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
+		_class.DoState(p);
+		size_t const sz = (size_t)ptr;
+		std::vector<u8> buffer(sz);
+		ptr = &buffer[0];
+		p.SetMode(PointerWrap::MODE_WRITE);
+		_class.DoState(p);
+
+		// Create header
+		SChunkHeader header;
+		header.Revision = _Revision;
+		header.ExpectedSize = (u32)sz;
+
+		// Write to file
+		if (!pFile.WriteArray(&header, 1))
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Failed writing header");
+			return false;
+		}
+
+		if (!pFile.WriteArray(&buffer[0], sz))
+		{
+			ERROR_LOG(COMMON, "ChunkReader: Failed writing data");
+			return false;
+		}
+
+		INFO_LOG(COMMON, "ChunkReader: Done writing %s", _rFilename.c_str());
+		return true;
+	}
+
+private:
+	struct SChunkHeader
+	{
+		u32 Revision;
+		u32 ExpectedSize;
+	};
+};
diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h
new file mode 100644
index 0000000000..ed1f464904
--- /dev/null
+++ b/Source/Core/Common/CodeBlock.h
@@ -0,0 +1,76 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+#include "Common/MemoryUtil.h"
+
+// Everything that needs to generate code should inherit from this.
+// You get memory management for free, plus, you can use all emitter functions without
+// having to prefix them with gen-> or something similar.
+// Example implementation:
+// class JIT : public CodeBlock<ARMXEmitter> {}
+template<class T> class CodeBlock : public T, NonCopyable
+{
+private:
+	// A privately used function to set the executable RAM space to something invalid.
+	// For debugging usefulness it should be used to set the RAM to a host specific breakpoint instruction
+	virtual void PoisonMemory() = 0;
+
+protected:
+	u8 *region;
+	size_t region_size;
+
+public:
+	CodeBlock() : region(nullptr), region_size(0) {}
+	virtual ~CodeBlock() { if (region) FreeCodeSpace(); }
+
+	// Call this before you generate any code.
+	void AllocCodeSpace(int size, void* hint = nullptr)
+	{
+		region_size = size;
+		region = (u8*)AllocateExecutableMemory(region_size, hint);
+		T::SetCodePtr(region);
+	}
+
+	// Always clear code space with breakpoints, so that if someone accidentally executes
+	// uninitialized, it just breaks into the debugger.
+	void ClearCodeSpace()
+	{
+		PoisonMemory();
+		ResetCodePtr();
+	}
+
+	// Call this when shutting down. Don't rely on the destructor, even though it'll do the job.
+	void FreeCodeSpace()
+	{
+		FreeMemoryPages(region, region_size);
+		region = nullptr;
+		region_size = 0;
+	}
+
+	bool IsInSpace(u8 *ptr) const
+	{
+		return (ptr >= region) && (ptr < (region + region_size));
+	}
+
+	// Cannot currently be undone. Will write protect the entire code region.
+	// Start over if you need to change the code (call FreeCodeSpace(), AllocCodeSpace()).
+	void WriteProtect()
+	{
+		WriteProtectMemory(region, region_size, true);
+	}
+
+	void ResetCodePtr()
+	{
+		T::SetCodePtr(region);
+	}
+
+	size_t GetSpaceLeft() const
+	{
+		return region_size - (T::GetCodePtr() - region);
+	}
+};
+
diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp
new file mode 100644
index 0000000000..21898f596e
--- /dev/null
+++ b/Source/Core/Common/ColorUtil.cpp
@@ -0,0 +1,88 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ColorUtil.h"
+#include "Common/CommonFuncs.h"
+
+namespace ColorUtil
+{
+
+static const int s_lut5to8[] = {
+	0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39,
+	0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B,
+	0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD,
+	0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF
+};
+
+static const int s_lut4to8[] = {
+	0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
+	0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF
+};
+
+static const int s_lut3to8[] = {
+	0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF
+};
+
+static u32 Decode5A3(u16 val)
+{
+	const u32 bg_color = 0x00000000;
+
+	int r, g, b, a;
+
+	if (val & 0x8000)
+	{
+		r = s_lut5to8[(val >> 10) & 0x1f];
+		g = s_lut5to8[(val >> 5) & 0x1f];
+		b = s_lut5to8[(val) & 0x1f];
+		a = 0xFF;
+	}
+	else
+	{
+		a = s_lut3to8[(val >> 12) & 0x7];
+		r = (s_lut4to8[(val >> 8) & 0xf] * a + (bg_color & 0xFF) * (255 - a)) / 255;
+		g = (s_lut4to8[(val >> 4) & 0xf] * a + ((bg_color >> 8) & 0xFF) * (255 - a)) / 255;
+		b = (s_lut4to8[(val) & 0xf] * a + ((bg_color >> 16) & 0xFF) * (255 - a)) / 255;
+		a = 0xFF;
+	}
+	return (a << 24) | (r << 16) | (g << 8) | b;
+}
+
+void decode5A3image(u32* dst, u16* src, int width, int height)
+{
+	for (int y = 0; y < height; y += 4)
+	{
+		for (int x = 0; x < width; x += 4)
+		{
+			for (int iy = 0; iy < 4; iy++, src += 4)
+			{
+				for (int ix = 0; ix < 4; ix++)
+				{
+					u32 RGBA = Decode5A3(Common::swap16(src[ix]));
+					dst[(y + iy) * width + (x + ix)] = RGBA;
+				}
+			}
+		}
+	}
+}
+
+void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height)
+{
+	for (int y = 0; y < height; y += 4)
+	{
+		for (int x = 0; x < width; x += 8)
+		{
+			for (int iy = 0; iy < 4; iy++, src += 8)
+			{
+				u32 *tdst = dst+(y+iy)*width+x;
+				for (int ix = 0; ix < 8; ix++)
+				{
+					// huh, this seems wrong. CI8, not 5A3, no?
+					tdst[ix] = ColorUtil::Decode5A3(Common::swap16(pal[src[ix]]));
+				}
+			}
+		}
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h
new file mode 100644
index 0000000000..14cc7075c5
--- /dev/null
+++ b/Source/Core/Common/ColorUtil.h
@@ -0,0 +1,15 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace ColorUtil
+{
+
+void decode5A3image(u32* dst, u16* src, int width, int height);
+void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height);
+
+}  // namespace
diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h
new file mode 100644
index 0000000000..8027e31878
--- /dev/null
+++ b/Source/Core/Common/Common.h
@@ -0,0 +1,152 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+// Git version number
+extern const char *scm_desc_str;
+extern const char *scm_branch_str;
+extern const char *scm_rev_str;
+extern const char *scm_rev_git_str;
+extern const char *netplay_dolphin_ver;
+
+// Force enable logging in the right modes. For some reason, something had changed
+// so that debugfast no longer logged.
+#if defined(_DEBUG) || defined(DEBUGFAST)
+#undef LOGGING
+#define LOGGING 1
+#endif
+
+#if defined(__GNUC__) || __clang__
+// Disable "unused function" warnings for the ones manually marked as such.
+#define UNUSED __attribute__((unused))
+#else
+// Not sure MSVC even checks this...
+#define UNUSED
+#endif
+
+#if defined(__GNUC__) || __clang__
+	#define EXPECT(x, y) __builtin_expect(x, y)
+	#define LIKELY(x)    __builtin_expect(!!(x), 1)
+	#define UNLIKELY(x)  __builtin_expect(!!(x), 0)
+	// Careful, wrong assumptions result in undefined behavior!
+	#define UNREACHABLE  __builtin_unreachable()
+	// Careful, wrong assumptions result in undefined behavior!
+	#define ASSUME(x)    do { if (!x) __builtin_unreachable(); } while (0)
+#else
+	#define EXPECT(x, y) (x)
+	#define LIKELY(x)    (x)
+	#define UNLIKELY(x)  (x)
+	// Careful, wrong assumptions result in undefined behavior!
+	#define UNREACHABLE  ASSUME(0)
+	#if defined(_MSC_VER)
+		// Careful, wrong assumptions result in undefined behavior!
+		#define ASSUME(x) __assume(x)
+	#else
+		#define ASSUME(x) do { void(x); } while (0)
+	#endif
+#endif
+
+// An inheritable class to disallow the copy constructor and operator= functions
+class NonCopyable
+{
+protected:
+	NonCopyable() {}
+	NonCopyable(const NonCopyable&&) {}
+	void operator=(const NonCopyable&&) {}
+private:
+	NonCopyable(NonCopyable&);
+	NonCopyable& operator=(NonCopyable& other);
+};
+
+#if defined _WIN32
+
+// Memory leak checks
+	#define CHECK_HEAP_INTEGRITY()
+
+// Alignment
+	#define GC_ALIGNED16(x) __declspec(align(16)) x
+	#define GC_ALIGNED32(x) __declspec(align(32)) x
+	#define GC_ALIGNED64(x) __declspec(align(64)) x
+	#define GC_ALIGNED128(x) __declspec(align(128)) x
+	#define GC_ALIGNED16_DECL(x) __declspec(align(16)) x
+	#define GC_ALIGNED64_DECL(x) __declspec(align(64)) x
+
+// Since they are always around on Windows
+	#define HAVE_WX 1
+	#define HAVE_OPENAL 1
+
+	#define HAVE_PORTAUDIO 1
+
+// Debug definitions
+	#if defined(_DEBUG)
+		#include <crtdbg.h>
+		#undef CHECK_HEAP_INTEGRITY
+		#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
+		// If you want to see how much a pain in the ass singletons are, for example:
+		// {614} normal block at 0x030C5310, 188 bytes long.
+		// Data: <Master Log      > 4D 61 73 74 65 72 20 4C 6F 67 00 00 00 00 00 00
+		struct CrtDebugBreak { CrtDebugBreak(int spot) { _CrtSetBreakAlloc(spot); } };
+		//CrtDebugBreak breakAt(614);
+	#endif // end DEBUG/FAST
+
+#endif
+
+// Windows compatibility
+#ifndef _WIN32
+#include <limits.h>
+#define MAX_PATH PATH_MAX
+
+#define __forceinline inline __attribute__((always_inline))
+#define GC_ALIGNED16(x) __attribute__((aligned(16))) x
+#define GC_ALIGNED32(x) __attribute__((aligned(32))) x
+#define GC_ALIGNED64(x) __attribute__((aligned(64))) x
+#define GC_ALIGNED128(x) __attribute__((aligned(128))) x
+#define GC_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
+#define GC_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
+#endif
+
+#ifdef _MSC_VER
+#define __strdup _strdup
+#define __getcwd _getcwd
+#define __chdir _chdir
+#else
+#define __strdup strdup
+#define __getcwd getcwd
+#define __chdir chdir
+#endif
+
+// Dummy macro for marking translatable strings that can not be immediately translated.
+// wxWidgets does not have a true dummy macro for this.
+#define _trans(a) a
+
+// Host communication.
+enum HOST_COMM
+{
+	// Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on
+	WM_USER_STOP = 10,
+	WM_USER_CREATE,
+	WM_USER_SETCURSOR,
+};
+
+// Used for notification on emulation state
+enum EMUSTATE_CHANGE
+{
+	EMUSTATE_CHANGE_PLAY = 1,
+	EMUSTATE_CHANGE_PAUSE,
+	EMUSTATE_CHANGE_STOP
+};
+
+#include "Common/CommonTypes.h" // IWYU pragma: export
+#include "Common/CommonFuncs.h" // IWYU pragma: export // NOLINT
+#include "Common/MsgHandler.h" // IWYU pragma: export
+#include "Common/Logging/Log.h" // IWYU pragma: export
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 4066febcca..13f1cfba18 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -1,276 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}</ProjectGuid>
-    <RootNamespace>Common</RootNamespace>
+    <ProjectGuid>{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}</ProjectGuid>
   </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </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'">
+  <ImportGroup 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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\polarssl\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\BreakPoints.cpp" />
-    <ClCompile Include="Src\CDUtils.cpp" />
-    <ClCompile Include="Src\ColorUtil.cpp" />
-    <ClCompile Include="Src\ConsoleListener.cpp" />
-    <ClCompile Include="Src\Crypto\aes_cbc.cpp" />
-    <ClCompile Include="Src\Crypto\aes_core.cpp" />
-    <ClCompile Include="Src\Crypto\bn.cpp" />
-    <ClCompile Include="Src\Crypto\ec.cpp" />
-    <ClCompile Include="Src\ExtendedTrace.cpp" />
-    <ClCompile Include="Src\FileSearch.cpp" />
-    <ClCompile Include="Src\FileUtil.cpp" />
-    <ClCompile Include="Src\Hash.cpp" />
-    <ClCompile Include="Src\IniFile.cpp" />
-    <ClCompile Include="Src\LogManager.cpp" />
-    <ClCompile Include="Src\MathUtil.cpp" />
-    <ClCompile Include="Src\MemArena.cpp" />
-    <ClCompile Include="Src\MemoryUtil.cpp" />
-    <ClCompile Include="Src\Misc.cpp" />
-    <ClCompile Include="Src\MsgHandler.cpp" />
-    <ClCompile Include="Src\NandPaths.cpp" />
-    <ClCompile Include="Src\SDCardUtil.cpp" />
-    <ClCompile Include="Src\SettingsHandler.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\StringUtil.cpp" />
-    <ClCompile Include="Src\SymbolDB.cpp" />
-    <ClCompile Include="Src\SysConf.cpp" />
-    <ClCompile Include="Src\Thread.cpp" />
-    <ClCompile Include="Src\Timer.cpp" />
-    <ClCompile Include="Src\Version.cpp" />
-    <ClCompile Include="Src\x64ABI.cpp" />
-    <ClCompile Include="Src\x64Analyzer.cpp" />
-    <ClCompile Include="Src\x64CPUDetect.cpp" />
-    <ClCompile Include="Src\x64Emitter.cpp" />
-    <ClCompile Include="Src\x64FPURoundMode.cpp" />
-    <ClCompile Include="Src\x64Thunk.cpp" />
+    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomic_GCC.h" />
+    <ClInclude Include="Atomic_Win32.h" />
+    <ClInclude Include="BitField.h" />
+    <ClInclude Include="BitSet.h" />
+    <ClInclude Include="BlockingLoop.h" />
+    <ClInclude Include="BreakPoints.h" />
+    <ClInclude Include="CDUtils.h" />
+    <ClInclude Include="ChunkFile.h" />
+    <ClInclude Include="CodeBlock.h" />
+    <ClInclude Include="ColorUtil.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="CommonFuncs.h" />
+    <ClInclude Include="CommonPaths.h" />
+    <ClInclude Include="CommonTypes.h" />
+    <ClInclude Include="CPUDetect.h" />
+    <ClInclude Include="DebugInterface.h" />
+    <ClInclude Include="ENetUtil.h" />
+    <ClInclude Include="Event.h" />
+    <ClInclude Include="FifoQueue.h" />
+    <ClInclude Include="FileSearch.h" />
+    <ClInclude Include="FileUtil.h" />
+    <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="Flag.h" />
+    <ClInclude Include="FPURoundMode.h" />
+    <ClInclude Include="GekkoDisassembler.h" />
+    <ClInclude Include="Hash.h" />
+    <ClInclude Include="IniFile.h" />
+    <ClInclude Include="JitRegister.h" />
+    <ClInclude Include="LinearDiskCache.h" />
+    <ClInclude Include="MathUtil.h" />
+    <ClInclude Include="MemArena.h" />
+    <ClInclude Include="MemoryUtil.h" />
+    <ClInclude Include="MsgHandler.h" />
+    <ClInclude Include="NandPaths.h" />
+    <ClInclude Include="Network.h" />
+    <ClInclude Include="PcapFile.h" />
+    <ClInclude Include="Profiler.h" />
+    <ClInclude Include="SDCardUtil.h" />
+    <ClInclude Include="SettingsHandler.h" />
+    <ClInclude Include="StdMakeUnique.h" />
+    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="SymbolDB.h" />
+    <ClInclude Include="SysConf.h" />
+    <ClInclude Include="Thread.h" />
+    <ClInclude Include="Timer.h" />
+    <ClInclude Include="TraversalClient.h" />
+    <ClInclude Include="TraversalProto.h" />
+    <ClInclude Include="x64ABI.h" />
+    <ClInclude Include="x64Analyzer.h" />
+    <ClInclude Include="x64Emitter.h" />
+    <ClInclude Include="Crypto\bn.h" />
+    <ClInclude Include="Crypto\ec.h" />
+    <ClInclude Include="Logging\ConsoleListener.h" />
+    <ClInclude Include="Logging\Log.h" />
+    <ClInclude Include="Logging\LogManager.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\Atomic.h" />
-    <ClInclude Include="Src\Atomic_GCC.h" />
-    <ClInclude Include="Src\Atomic_Win32.h" />
-    <ClInclude Include="Src\BreakPoints.h" />
-    <ClInclude Include="Src\CDUtils.h" />
-    <ClInclude Include="Src\ChunkFile.h" />
-    <ClInclude Include="Src\ColorUtil.h" />
-    <ClInclude Include="Src\Common.h" />
-    <ClInclude Include="Src\CommonFuncs.h" />
-    <ClInclude Include="Src\CommonPaths.h" />
-    <ClInclude Include="Src\CommonTypes.h" />
-    <ClInclude Include="Src\ConsoleListener.h" />
-    <ClInclude Include="Src\CPUDetect.h" />
-    <ClInclude Include="Src\Crypto\aes.h" />
-    <ClInclude Include="Src\Crypto\aes_locl.h" />
-    <ClInclude Include="Src\Crypto\tools.h" />
-    <ClInclude Include="Src\DebugInterface.h" />
-    <ClInclude Include="Src\ExtendedTrace.h" />
-    <ClInclude Include="Src\FifoQueue.h" />
-    <ClInclude Include="Src\FileSearch.h" />
-    <ClInclude Include="Src\FileUtil.h" />
-    <ClInclude Include="Src\FixedSizeQueue.h" />
-    <ClInclude Include="Src\Hash.h" />
-    <ClInclude Include="Src\IniFile.h" />
-    <ClInclude Include="Src\LinearDiskCache.h" />
-    <ClInclude Include="Src\Log.h" />
-    <ClInclude Include="Src\LogManager.h" />
-    <ClInclude Include="Src\MathUtil.h" />
-    <ClInclude Include="Src\MemArena.h" />
-    <ClInclude Include="Src\MemoryUtil.h" />
-    <ClInclude Include="Src\MsgHandler.h" />
-    <ClInclude Include="Src\NandPaths.h" />
-    <ClInclude Include="Src\SDCardUtil.h" />
-    <ClInclude Include="Src\SettingsHandler.h" />
-    <ClInclude Include="Src\Setup.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdThread.h" />
-    <ClInclude Include="Src\StringUtil.h" />
-    <ClInclude Include="Src\SymbolDB.h" />
-    <ClInclude Include="Src\SysConf.h" />
-    <ClInclude Include="Src\Thread.h" />
-    <ClInclude Include="Src\Thunk.h" />
-    <ClInclude Include="Src\Timer.h" />
-    <ClInclude Include="Src\x64ABI.h" />
-    <ClInclude Include="Src\x64Analyzer.h" />
-    <ClInclude Include="Src\x64Emitter.h" />
+    <ClCompile Include="BreakPoints.cpp" />
+    <ClCompile Include="CDUtils.cpp" />
+    <ClCompile Include="ColorUtil.cpp" />
+    <ClCompile Include="ENetUtil.cpp" />
+    <ClCompile Include="FileSearch.cpp" />
+    <ClCompile Include="FileUtil.cpp" />
+    <ClCompile Include="GekkoDisassembler.cpp" />
+    <ClCompile Include="Hash.cpp" />
+    <ClCompile Include="IniFile.cpp" />
+    <ClCompile Include="JitRegister.cpp" />
+    <ClCompile Include="Logging\ConsoleListenerWin.cpp" />
+    <ClCompile Include="MathUtil.cpp" />
+    <ClCompile Include="MemArena.cpp" />
+    <ClCompile Include="MemoryUtil.cpp" />
+    <ClCompile Include="Misc.cpp" />
+    <ClCompile Include="MsgHandler.cpp" />
+    <ClCompile Include="NandPaths.cpp" />
+    <ClCompile Include="Network.cpp" />
+    <ClCompile Include="PcapFile.cpp" />
+    <ClCompile Include="Profiler.cpp" />
+    <ClCompile Include="SDCardUtil.cpp" />
+    <ClCompile Include="SettingsHandler.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="SymbolDB.cpp" />
+    <ClCompile Include="SysConf.cpp" />
+    <ClCompile Include="Thread.cpp" />
+    <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="TraversalClient.cpp" />
+    <ClCompile Include="Version.cpp" />
+    <ClCompile Include="x64ABI.cpp" />
+    <ClCompile Include="x64Analyzer.cpp" />
+    <ClCompile Include="x64CPUDetect.cpp" />
+    <ClCompile Include="x64Emitter.cpp" />
+    <ClCompile Include="x64FPURoundMode.cpp" />
+    <ClCompile Include="XSaveWorkaround.cpp" />
+    <ClCompile Include="Crypto\bn.cpp" />
+    <ClCompile Include="Crypto\ec.cpp" />
+    <ClCompile Include="Logging\LogManager.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj">
+      <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj">
+      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="SCMRevGen.vcxproj">
+      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index a912cc3d8a..712122b3d1 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -1,125 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\BreakPoints.cpp" />
-    <ClCompile Include="Src\CDUtils.cpp" />
-    <ClCompile Include="Src\ColorUtil.cpp" />
-    <ClCompile Include="Src\ExtendedTrace.cpp" />
-    <ClCompile Include="Src\FileSearch.cpp" />
-    <ClCompile Include="Src\FileUtil.cpp" />
-    <ClCompile Include="Src\Hash.cpp" />
-    <ClCompile Include="Src\IniFile.cpp" />
-    <ClCompile Include="Src\MathUtil.cpp" />
-    <ClCompile Include="Src\MemArena.cpp" />
-    <ClCompile Include="Src\MemoryUtil.cpp" />
-    <ClCompile Include="Src\Misc.cpp" />
-    <ClCompile Include="Src\MsgHandler.cpp" />
-    <ClCompile Include="Src\NandPaths.cpp" />
-    <ClCompile Include="Src\SDCardUtil.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\StringUtil.cpp" />
-    <ClCompile Include="Src\SymbolDB.cpp" />
-    <ClCompile Include="Src\SysConf.cpp" />
-    <ClCompile Include="Src\Thread.cpp" />
-    <ClCompile Include="Src\Timer.cpp" />
-    <ClCompile Include="Src\Version.cpp" />
-    <ClCompile Include="Src\x64Analyzer.cpp" />
-    <ClCompile Include="Src\x64Emitter.cpp" />
-    <ClCompile Include="Src\LogManager.cpp">
-      <Filter>Logging</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ConsoleListener.cpp">
-      <Filter>Logging</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Crypto\aes_cbc.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Crypto\aes_core.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Crypto\bn.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Crypto\ec.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\SettingsHandler.cpp" />
-    <ClCompile Include="Src\x64ABI.cpp" />
-    <ClCompile Include="Src\x64CPUDetect.cpp" />
-    <ClCompile Include="Src\x64FPURoundMode.cpp" />
-    <ClCompile Include="Src\x64Thunk.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Atomic.h" />
-    <ClInclude Include="Src\Atomic_GCC.h" />
-    <ClInclude Include="Src\Atomic_Win32.h" />
-    <ClInclude Include="Src\BreakPoints.h" />
-    <ClInclude Include="Src\CDUtils.h" />
-    <ClInclude Include="Src\ChunkFile.h" />
-    <ClInclude Include="Src\ColorUtil.h" />
-    <ClInclude Include="Src\Common.h" />
-    <ClInclude Include="Src\CommonFuncs.h" />
-    <ClInclude Include="Src\CommonPaths.h" />
-    <ClInclude Include="Src\CommonTypes.h" />
-    <ClInclude Include="Src\CPUDetect.h" />
-    <ClInclude Include="Src\DebugInterface.h" />
-    <ClInclude Include="Src\ExtendedTrace.h" />
-    <ClInclude Include="Src\FifoQueue.h" />
-    <ClInclude Include="Src\FileSearch.h" />
-    <ClInclude Include="Src\FileUtil.h" />
-    <ClInclude Include="Src\FixedSizeQueue.h" />
-    <ClInclude Include="Src\Hash.h" />
-    <ClInclude Include="Src\IniFile.h" />
-    <ClInclude Include="Src\LinearDiskCache.h" />
-    <ClInclude Include="Src\MathUtil.h" />
-    <ClInclude Include="Src\MemArena.h" />
-    <ClInclude Include="Src\MemoryUtil.h" />
-    <ClInclude Include="Src\MsgHandler.h" />
-    <ClInclude Include="Src\NandPaths.h" />
-    <ClInclude Include="Src\SDCardUtil.h" />
-    <ClInclude Include="Src\Setup.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\StdThread.h" />
-    <ClInclude Include="Src\StringUtil.h" />
-    <ClInclude Include="Src\SymbolDB.h" />
-    <ClInclude Include="Src\SysConf.h" />
-    <ClInclude Include="Src\Thread.h" />
-    <ClInclude Include="Src\Thunk.h" />
-    <ClInclude Include="Src\Timer.h" />
-    <ClInclude Include="Src\x64Analyzer.h" />
-    <ClInclude Include="Src\x64Emitter.h" />
-    <ClInclude Include="Src\Log.h">
-      <Filter>Logging</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LogManager.h">
-      <Filter>Logging</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ConsoleListener.h">
-      <Filter>Logging</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Crypto\aes.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Crypto\aes_locl.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Crypto\tools.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
-    <ClInclude Include="Src\SettingsHandler.h" />
-    <ClInclude Include="Src\x64ABI.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{21b7df68-af69-45f4-9741-590a6a7f1ed1}</UniqueIdentifier>
+      <UniqueIdentifier>{0336df21-7c3f-48a9-b767-9cf11d8958a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{f078f36e-a0ff-4cd0-95f8-476100d68e68}</UniqueIdentifier>
+      <UniqueIdentifier>{c54973ce-5723-491c-ac23-41cea3565b05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomic_GCC.h" />
+    <ClInclude Include="Atomic_Win32.h" />
+    <ClInclude Include="BitField.h" />
+    <ClInclude Include="BitSet.h" />
+    <ClInclude Include="BlockingLoop.h" />
+    <ClInclude Include="BreakPoints.h" />
+    <ClInclude Include="CDUtils.h" />
+    <ClInclude Include="ChunkFile.h" />
+    <ClInclude Include="CodeBlock.h" />
+    <ClInclude Include="ColorUtil.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="CommonFuncs.h" />
+    <ClInclude Include="CommonPaths.h" />
+    <ClInclude Include="CommonTypes.h" />
+    <ClInclude Include="CPUDetect.h" />
+    <ClInclude Include="DebugInterface.h" />
+    <ClInclude Include="ENetUtil.h" />
+    <ClInclude Include="FifoQueue.h" />
+    <ClInclude Include="FileSearch.h" />
+    <ClInclude Include="FileUtil.h" />
+    <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="Flag.h" />
+    <ClInclude Include="FPURoundMode.h" />
+    <ClInclude Include="Hash.h" />
+    <ClInclude Include="IniFile.h" />
+    <ClInclude Include="LinearDiskCache.h" />
+    <ClInclude Include="MathUtil.h" />
+    <ClInclude Include="MemArena.h" />
+    <ClInclude Include="MemoryUtil.h" />
+    <ClInclude Include="MsgHandler.h" />
+    <ClInclude Include="NandPaths.h" />
+    <ClInclude Include="Network.h" />
+    <ClInclude Include="PcapFile.h" />
+    <ClInclude Include="Profiler.h" />
+    <ClInclude Include="SDCardUtil.h" />
+    <ClInclude Include="SettingsHandler.h" />
+    <ClInclude Include="StdMakeUnique.h" />
+    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="SymbolDB.h" />
+    <ClInclude Include="SysConf.h" />
+    <ClInclude Include="Thread.h" />
+    <ClInclude Include="Timer.h" />
+    <ClInclude Include="x64ABI.h" />
+    <ClInclude Include="x64Analyzer.h" />
+    <ClInclude Include="x64Emitter.h" />
+    <ClInclude Include="Logging\ConsoleListener.h">
+      <Filter>Logging</Filter>
+    </ClInclude>
+    <ClInclude Include="Logging\Log.h">
+      <Filter>Logging</Filter>
+    </ClInclude>
+    <ClInclude Include="Logging\LogManager.h">
+      <Filter>Logging</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\ec.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="Crypto\bn.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="GekkoDisassembler.h" />
+    <ClInclude Include="Event.h" />
+    <ClInclude Include="JitRegister.h" />
+    <ClInclude Include="TraversalClient.h" />
+    <ClInclude Include="TraversalProto.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="BreakPoints.cpp" />
+    <ClCompile Include="CDUtils.cpp" />
+    <ClCompile Include="ColorUtil.cpp" />
+    <ClCompile Include="ENetUtil.cpp" />
+    <ClCompile Include="FileSearch.cpp" />
+    <ClCompile Include="FileUtil.cpp" />
+    <ClCompile Include="Hash.cpp" />
+    <ClCompile Include="IniFile.cpp" />
+    <ClCompile Include="MathUtil.cpp" />
+    <ClCompile Include="MemArena.cpp" />
+    <ClCompile Include="MemoryUtil.cpp" />
+    <ClCompile Include="Misc.cpp" />
+    <ClCompile Include="MsgHandler.cpp" />
+    <ClCompile Include="NandPaths.cpp" />
+    <ClCompile Include="Network.cpp" />
+    <ClCompile Include="PcapFile.cpp" />
+    <ClCompile Include="Profiler.cpp" />
+    <ClCompile Include="SDCardUtil.cpp" />
+    <ClCompile Include="SettingsHandler.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="SymbolDB.cpp" />
+    <ClCompile Include="SysConf.cpp" />
+    <ClCompile Include="Thread.cpp" />
+    <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="Version.cpp" />
+    <ClCompile Include="x64ABI.cpp" />
+    <ClCompile Include="x64Analyzer.cpp" />
+    <ClCompile Include="x64CPUDetect.cpp" />
+    <ClCompile Include="x64Emitter.cpp" />
+    <ClCompile Include="x64FPURoundMode.cpp" />
+    <ClCompile Include="Crypto\bn.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Crypto\ec.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="Logging\LogManager.cpp">
+      <Filter>Logging</Filter>
+    </ClCompile>
+    <ClCompile Include="XSaveWorkaround.cpp" />
+    <ClCompile Include="GekkoDisassembler.cpp" />
+    <ClCompile Include="JitRegister.cpp" />
+    <ClCompile Include="TraversalClient.cpp" />
+    <ClCompile Include="Logging\ConsoleListenerWin.cpp">
+      <Filter>Logging</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
 </Project>
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
new file mode 100644
index 0000000000..ba398ff51d
--- /dev/null
+++ b/Source/Core/Common/CommonFuncs.h
@@ -0,0 +1,198 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#define SLEEP(x) Sleep(x)
+#else
+#include <unistd.h>
+#define SLEEP(x) usleep(x*1000)
+#endif
+
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#endif
+
+#include <cstddef>
+#include <string>
+#include <type_traits>
+#include "Common/CommonTypes.h"
+
+// Will fail to compile on a non-array:
+// TODO: make this a function when constexpr is available
+template <typename T>
+struct ArraySizeImpl : public std::extent<T>
+{ static_assert(std::is_array<T>::value, "is array"); };
+
+#define ArraySize(x) ArraySizeImpl<decltype(x)>::value
+
+#define b2(x)   (   (x) | (   (x) >> 1) )
+#define b4(x)   ( b2(x) | ( b2(x) >> 2) )
+#define b8(x)   ( b4(x) | ( b4(x) >> 4) )
+#define b16(x)  ( b8(x) | ( b8(x) >> 8) )
+#define b32(x)  (b16(x) | (b16(x) >>16) )
+#define ROUND_UP_POW2(x)  (b32(x - 1) + 1)
+
+#ifndef _WIN32
+
+#include <errno.h>
+#ifdef __linux__
+#include <byteswap.h>
+#elif defined __FreeBSD__
+#include <sys/endian.h>
+#endif
+
+// go to debugger mode
+	#ifdef GEKKO
+		#define Crash()
+	#elif defined _M_X86
+		#define Crash() {asm ("int $3");}
+	#else
+		#define Crash() { exit(1); }
+	#endif
+
+// GCC 4.8 defines all the rotate functions now
+// Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit
+#ifndef _rotl
+inline u32 _rotl(u32 x, int shift)
+{
+	shift &= 31;
+	if (!shift) return x;
+	return (x << shift) | (x >> (32 - shift));
+}
+
+inline u32 _rotr(u32 x, int shift)
+{
+	shift &= 31;
+	if (!shift) return x;
+	return (x >> shift) | (x << (32 - shift));
+}
+#endif
+
+inline u64 _rotl64(u64 x, unsigned int shift)
+{
+	unsigned int n = shift % 64;
+	return (x << n) | (x >> (64 - n));
+}
+
+inline u64 _rotr64(u64 x, unsigned int shift)
+{
+	unsigned int n = shift % 64;
+	return (x >> n) | (x << (64 - n));
+}
+
+#else // WIN32
+// Function Cross-Compatibility
+	#define strcasecmp _stricmp
+	#define strncasecmp _strnicmp
+	#define unlink _unlink
+	#define snprintf _snprintf
+	#define vscprintf _vscprintf
+
+// 64 bit offsets for Windows
+	#define fseeko _fseeki64
+	#define ftello _ftelli64
+	#define atoll _atoi64
+	#define stat64 _stat64
+	#define fstat64 _fstat64
+	#define fileno _fileno
+
+extern "C"
+{
+	__declspec(dllimport) void __stdcall DebugBreak(void);
+}
+	#define Crash() {DebugBreak();}
+
+	#if (_MSC_VER > 1800)
+	#error alignof compat can be removed
+	#else
+	#define alignof(x) __alignof(x)
+	#endif
+#endif // WIN32 ndef
+
+// Generic function to get last error message.
+// Call directly after the command or use the error num.
+// This function might change the error code.
+// Defined in Misc.cpp.
+std::string GetLastErrorMsg();
+
+namespace Common
+{
+inline u8 swap8(u8 _data) {return _data;}
+inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];}
+
+#ifdef ANDROID
+#undef swap16
+#undef swap32
+#undef swap64
+#endif
+
+#ifdef _WIN32
+inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
+inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
+inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
+#elif __linux__ && !(ANDROID && _M_ARM_64)
+// Android NDK r10c has broken builtin byte swap routines
+// Disabled for now.
+inline u16 swap16(u16 _data) {return bswap_16(_data);}
+inline u32 swap32(u32 _data) {return bswap_32(_data);}
+inline u64 swap64(u64 _data) {return bswap_64(_data);}
+#elif __APPLE__
+inline __attribute__((always_inline)) u16 swap16(u16 _data)
+	{return OSSwapInt16(_data);}
+inline __attribute__((always_inline)) u32 swap32(u32 _data)
+	{return OSSwapInt32(_data);}
+inline __attribute__((always_inline)) u64 swap64(u64 _data)
+	{return OSSwapInt64(_data);}
+#elif __FreeBSD__
+inline u16 swap16(u16 _data) {return bswap16(_data);}
+inline u32 swap32(u32 _data) {return bswap32(_data);}
+inline u64 swap64(u64 _data) {return bswap64(_data);}
+#else
+// Slow generic implementation.
+inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);}
+inline u32 swap32(u32 data) {return (swap16(data) << 16) | swap16(data >> 16);}
+inline u64 swap64(u64 data) {return ((u64)swap32(data) << 32) | swap32(data >> 32);}
+#endif
+
+inline u16 swap16(const u8* _pData) {return swap16(*(const u16*)_pData);}
+inline u32 swap32(const u8* _pData) {return swap32(*(const u32*)_pData);}
+inline u64 swap64(const u8* _pData) {return swap64(*(const u64*)_pData);}
+
+template <int count>
+void swap(u8*);
+
+template <>
+inline void swap<1>(u8* data)
+{}
+
+template <>
+inline void swap<2>(u8* data)
+{
+	*reinterpret_cast<u16*>(data) = swap16(data);
+}
+
+template <>
+inline void swap<4>(u8* data)
+{
+	*reinterpret_cast<u32*>(data) = swap32(data);
+}
+
+template <>
+inline void swap<8>(u8* data)
+{
+	*reinterpret_cast<u64*>(data) = swap64(data);
+}
+
+template <typename T>
+inline T FromBigEndian(T data)
+{
+	//static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types");
+
+	swap<sizeof(data)>(reinterpret_cast<u8*>(&data));
+	return data;
+}
+
+}  // Namespace Common
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
new file mode 100644
index 0000000000..b0a8dcd5de
--- /dev/null
+++ b/Source/Core/Common/CommonPaths.h
@@ -0,0 +1,118 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// Directory separators, do we need this?
+#define DIR_SEP "/"
+#define DIR_SEP_CHR '/'
+
+// The user data dir
+#define ROOT_DIR "."
+#ifdef _WIN32
+	#define USERDATA_DIR "User"
+	#define DOLPHIN_DATA_DIR "Dolphin"
+#elif defined __APPLE__
+	// On OS X, USERDATA_DIR exists within the .app, but *always* reference
+	// the copy in Application Support instead! (Copied on first run)
+	// You can use the File::GetUserPath() util for this
+	#define USERDATA_DIR "Contents/Resources/User"
+	#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
+#elif defined ANDROID
+	#define USERDATA_DIR "user"
+	#define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
+#else
+	#define USERDATA_DIR "user"
+	#ifdef USER_DIR
+		#define DOLPHIN_DATA_DIR USER_DIR
+	#else
+		#define DOLPHIN_DATA_DIR ".dolphin"
+	#endif
+#endif
+
+// Shared data dirs (Sys and shared User for Linux)
+#ifdef _WIN32
+	#define SYSDATA_DIR "Sys"
+#elif defined __APPLE__
+	#define SYSDATA_DIR "Contents/Resources/Sys"
+#elif defined ANDROID
+	#define SYSDATA_DIR "/sdcard/dolphin-emu"
+#else
+	#ifdef DATA_DIR
+		#define SYSDATA_DIR DATA_DIR "sys"
+	#else
+		#define SYSDATA_DIR "sys"
+	#endif
+#endif
+
+// Dirs in both User and Sys
+#define EUR_DIR "EUR"
+#define USA_DIR "USA"
+#define JAP_DIR "JAP"
+
+// Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
+#define GC_USER_DIR         "GC"
+#define WII_USER_DIR        "Wii"
+#define CONFIG_DIR          "Config"
+#define GAMESETTINGS_DIR    "GameSettings"
+#define MAPS_DIR            "Maps"
+#define CACHE_DIR           "Cache"
+#define SHADERCACHE_DIR     "ShaderCache"
+#define STATESAVES_DIR      "StateSaves"
+#define SCREENSHOTS_DIR     "ScreenShots"
+#define LOAD_DIR            "Load"
+#define HIRES_TEXTURES_DIR  "Textures"
+#define DUMP_DIR            "Dump"
+#define DUMP_TEXTURES_DIR   "Textures"
+#define DUMP_FRAMES_DIR     "Frames"
+#define DUMP_AUDIO_DIR      "Audio"
+#define DUMP_DSP_DIR        "DSP"
+#define LOGS_DIR            "Logs"
+#define MAIL_LOGS_DIR       "Mail"
+#define SHADERS_DIR         "Shaders"
+#define WII_SYSCONF_DIR     "shared2" DIR_SEP "sys"
+#define WII_WC24CONF_DIR    "shared2" DIR_SEP "wc24"
+#define THEMES_DIR          "Themes"
+#define ANAGLYPH_DIR        "Anaglyph"
+
+// Filenames
+// Files in the directory returned by GetUserPath(D_CONFIG_IDX)
+#define DOLPHIN_CONFIG  "Dolphin.ini"
+#define DEBUGGER_CONFIG "Debugger.ini"
+#define LOGGER_CONFIG   "Logger.ini"
+
+// Files in the directory returned by GetUserPath(D_LOGS_IDX)
+#define MAIN_LOG    "dolphin.log"
+
+// Files in the directory returned by GetUserPath(D_WIISYSCONF_IDX)
+#define WII_SYSCONF "SYSCONF"
+
+// Files in the directory returned by GetUserPath(D_DUMP_IDX)
+#define RAM_DUMP      "ram.raw"
+#define ARAM_DUMP     "aram.raw"
+#define FAKEVMEM_DUMP "fakevmem.raw"
+
+// Sys files
+#define TOTALDB     "totaldb.dsy"
+
+#define FONT_ANSI   "font_ansi.bin"
+#define FONT_SJIS   "font_sjis.bin"
+
+#define DSP_IROM    "dsp_rom.bin"
+#define DSP_COEF    "dsp_coef.bin"
+
+#define GC_IPL      "IPL.bin"
+#define GC_SRAM     "SRAM.raw"
+#define GC_MEMCARDA "MemoryCardA"
+#define GC_MEMCARDB "MemoryCardB"
+
+#define WII_STATE   "state.dat"
+
+#define WII_SETTING "setting.txt"
+
+#define GECKO_CODE_HANDLER "codehandler.bin"
+
+// Subdirs in Sys
+#define GC_SYS_DIR "GC"
+#define WII_SYS_DIR "Wii"
diff --git a/Source/Core/Common/CommonTypes.h b/Source/Core/Common/CommonTypes.h
new file mode 100644
index 0000000000..442b202ac2
--- /dev/null
+++ b/Source/Core/Common/CommonTypes.h
@@ -0,0 +1,47 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// This header contains type definitions that are shared between the Dolphin core and
+// other parts of the code. Any definitions that are only used by the core should be
+// placed in "Common.h" instead.
+
+#pragma once
+
+#include <cstdint>
+
+#ifdef _WIN32
+
+#include <tchar.h>
+
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef int8_t  s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
+
+#else
+
+#ifndef GEKKO
+
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef int8_t  s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
+
+#endif
+// For using Windows lock code
+#define TCHAR char
+#define LONG int
+
+#endif // _WIN32
diff --git a/Source/Core/Common/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp
new file mode 100644
index 0000000000..9311051a17
--- /dev/null
+++ b/Source/Core/Common/Crypto/bn.cpp
@@ -0,0 +1,112 @@
+// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
+// Licensed under the terms of the GNU GPL, version 2
+// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+#include <cstdio>
+#include <string.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Crypto/bn.h"
+
+static void bn_zero(u8 *d, u32 n)
+{
+	memset(d, 0, n);
+}
+
+static void bn_copy(u8 *d, const u8 *a, u32 n)
+{
+	memcpy(d, a, n);
+}
+
+int bn_compare(const u8 *a, const u8 *b, u32 n)
+{
+	u32 i;
+
+	for (i = 0; i < n; i++) {
+		if (a[i] < b[i])
+			return -1;
+		if (a[i] > b[i])
+			return 1;
+	}
+
+	return 0;
+}
+
+void bn_sub_modulus(u8 *a, const u8 *N, u32 n)
+{
+	u32 i;
+	u32 dig;
+	u8 c;
+
+	c = 0;
+	for (i = n - 1; i < n; i--) {
+		dig = N[i] + c;
+		c = (a[i] < dig);
+		a[i] -= dig;
+	}
+}
+
+void bn_add(u8 *d, const u8 *a, const u8 *b, const u8 *N, u32 n)
+{
+	u32 i;
+	u32 dig;
+	u8 c;
+
+	c = 0;
+	for (i = n - 1; i < n; i--) {
+		dig = a[i] + b[i] + c;
+		c = (dig >= 0x100);
+		d[i] = dig;
+	}
+
+	if (c)
+		bn_sub_modulus(d, N, n);
+
+	if (bn_compare(d, N, n) >= 0)
+		bn_sub_modulus(d, N, n);
+}
+
+void bn_mul(u8 *d, const u8 *a, const u8 *b, const u8 *N, u32 n)
+{
+	u32 i;
+	u8 mask;
+
+	bn_zero(d, n);
+
+	for (i = 0; i < n; i++)
+		for (mask = 0x80; mask != 0; mask >>= 1) {
+			bn_add(d, d, d, N, n);
+			if ((a[i] & mask) != 0)
+				bn_add(d, d, b, N, n);
+		}
+}
+
+void bn_exp(u8 *d, const u8 *a, const u8 *N, u32 n, const u8 *e, u32 en)
+{
+	u8 t[512];
+	u32 i;
+	u8 mask;
+
+	bn_zero(d, n);
+	d[n-1] = 1;
+	for (i = 0; i < en; i++)
+		for (mask = 0x80; mask != 0; mask >>= 1) {
+			bn_mul(t, d, d, N, n);
+			if ((e[i] & mask) != 0)
+				bn_mul(d, t, a, N, n);
+			else
+				bn_copy(d, t, n);
+		}
+}
+
+// only for prime N -- stupid but lazy, see if I care
+void bn_inv(u8 *d, const u8 *a, const u8 *N, u32 n)
+{
+	u8 t[512], s[512];
+
+	bn_copy(t, N, n);
+	bn_zero(s, n);
+	s[n-1] = 2;
+	bn_sub_modulus(t, s, n);
+	bn_exp(d, a, N, n, t, n);
+}
diff --git a/Source/Core/Common/Crypto/bn.h b/Source/Core/Common/Crypto/bn.h
new file mode 100644
index 0000000000..34eee13cc9
--- /dev/null
+++ b/Source/Core/Common/Crypto/bn.h
@@ -0,0 +1,16 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// bignum arithmetic
+
+int bn_compare(const u8 *a, const u8 *b, u32 n);
+void bn_sub_modulus(u8 *a, const u8 *N, u32 n);
+void bn_add(u8 *d, const u8 *a, const u8 *b, const u8 *N, u32 n);
+void bn_mul(u8 *d, const u8 *a, const u8 *b, const u8 *N, u32 n);
+void bn_inv(u8 *d, const u8 *a, const u8 *N, u32 n); // only for prime N
+void bn_exp(u8 *d, const u8 *a, const u8 *N, u32 n, const u8 *e, u32 en);
diff --git a/Source/Core/Common/Src/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
similarity index 79%
rename from Source/Core/Common/Src/Crypto/ec.cpp
rename to Source/Core/Common/Crypto/ec.cpp
index 6580dfb5ff..b29179e897 100644
--- a/Source/Core/Common/Src/Crypto/ec.cpp
+++ b/Source/Core/Common/Crypto/ec.cpp
@@ -1,49 +1,37 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
 
-#include "../Common.h"
-#include "tools.h"
+#include "Common/Common.h"
+#include "Common/Crypto/bn.h"
+#include "Common/Crypto/ec.h"
+
 // y**2 + x*y = x**3 + x + b
-/*
-static u8 ec_b[30] =
+UNUSED static const u8 ec_b[30] =
 	{0x00,0x66,0x64,0x7e,0xde,0x6c,0x33,0x2c,0x7f,0x8c,0x09,0x23,0xbb,0x58,0x21
 	,0x3b,0x33,0x3b,0x20,0xe9,0xce,0x42,0x81,0xfe,0x11,0x5f,0x7d,0x8f,0x90,0xad};
-*/
 
 // order of the addition group of points
-static u8 ec_N[30] =
+static const u8 ec_N[30] =
 	{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 	,0x13,0xe9,0x74,0xe7,0x2f,0x8a,0x69,0x22,0x03,0x1d,0x26,0x03,0xcf,0xe0,0xd7};
 
 // base point
-static u8 ec_G[60] =
+static const u8 ec_G[60] =
 	{0x00,0xfa,0xc9,0xdf,0xcb,0xac,0x83,0x13,0xbb,0x21,0x39,0xf1,0xbb,0x75,0x5f
 	,0xef,0x65,0xbc,0x39,0x1f,0x8b,0x36,0xf8,0xf8,0xeb,0x73,0x71,0xfd,0x55,0x8b
 	,0x01,0x00,0x6a,0x08,0xa4,0x19,0x03,0x35,0x06,0x78,0xe5,0x85,0x28,0xbe,0xbf
 	,0x8a,0x0b,0xef,0xf8,0x67,0xa7,0xca,0x36,0x71,0x6f,0x7e,0x01,0xf8,0x10,0x52};
 
-/*static void elt_print(char *name, u8 *a)
-{
-	u32 i;
-
-	printf("%s = ", name);
-
-	for (i = 0; i < 30; i++)
-		printf("%02x", a[i]);
-
-	printf("\n");
-}*/
-
 static void elt_copy(u8 *d, const u8 *a)
 {
 	memcpy(d, a, 30);
@@ -54,7 +42,7 @@ static void elt_zero(u8 *d)
 	memset(d, 0, 30);
 }
 
-static int elt_is_zero(u8 *d)
+static int elt_is_zero(const u8 *d)
 {
 	u32 i;
 
@@ -65,7 +53,7 @@ static int elt_is_zero(u8 *d)
 	return 1;
 }
 
-static void elt_add(u8 *d, u8 *a, u8 *b)
+static void elt_add(u8 *d, const u8 *a, const u8 *b)
 {
 	u32 i;
 
@@ -73,7 +61,7 @@ static void elt_add(u8 *d, u8 *a, u8 *b)
 		d[i] = a[i] ^ b[i];
 }
 
-static void elt_mul_x(u8 *d, u8 *a)
+static void elt_mul_x(u8 *d, const u8 *a)
 {
 	u8 carry, x, y;
 	u32 i;
@@ -91,7 +79,7 @@ static void elt_mul_x(u8 *d, u8 *a)
 	d[20] ^= carry << 2;
 }
 
-static void elt_mul(u8 *d, u8 *a, u8 *b)
+static void elt_mul(u8 *d, const u8 *a, const u8 *b)
 {
 	u32 i, n;
 	u8 mask;
@@ -115,9 +103,9 @@ static void elt_mul(u8 *d, u8 *a, u8 *b)
 }
 
 static const u8 square[16] =
-{0x00,0x01,0x04,0x05,0x10,0x11,0x14,0x15,0x40,0x41,0x44,0x45,0x50,0x51,0x54,0x55};
+	{0x00,0x01,0x04,0x05,0x10,0x11,0x14,0x15,0x40,0x41,0x44,0x45,0x50,0x51,0x54,0x55};
 
-static void elt_square_to_wide(u8 *d, u8 *a)
+static void elt_square_to_wide(u8 *d, const u8 *a)
 {
 	u32 i;
 
@@ -152,7 +140,7 @@ static void wide_reduce(u8 *d)
 	d[30] &= 1;
 }
 
-static void elt_square(u8 *d, u8 *a)
+static void elt_square(u8 *d, const u8 *a)
 {
 	u8 wide[60];
 
@@ -162,7 +150,7 @@ static void elt_square(u8 *d, u8 *a)
 	elt_copy(d, wide + 30);
 }
 
-static void itoh_tsujii(u8 *d, u8 *a, u8 *b, u32 j)
+static void itoh_tsujii(u8 *d, const u8 *a, const u8 *b, u32 j)
 {
 	u8 t[30];
 
@@ -175,7 +163,7 @@ static void itoh_tsujii(u8 *d, u8 *a, u8 *b, u32 j)
 	elt_mul(d, t, b);
 }
 
-static void elt_inv(u8 *d, u8 *a)
+static void elt_inv(u8 *d, const u8 *a)
 {
 	u8 t[30];
 	u8 s[30];
@@ -193,7 +181,7 @@ static void elt_inv(u8 *d, u8 *a)
 	elt_square(d, s);
 }
 
-/*static int point_is_on_curve(u8 *p)
+UNUSED static int point_is_on_curve(u8 *p)
 {
 	u8 s[30], t[30];
 	u8 *x, *y;
@@ -216,16 +204,17 @@ static void elt_inv(u8 *d, u8 *a)
 
 	return elt_is_zero(s);
 }
-*/
-static int point_is_zero(u8 *p)
+
+static int point_is_zero(const u8 *p)
 {
 	return elt_is_zero(p) && elt_is_zero(p + 30);
 }
 
-static void point_double(u8 *r, u8 *p)
+static void point_double(u8 *r, const u8 *p)
 {
 	u8 s[30], t[30];
-	u8 *px, *py, *rx, *ry;
+	const u8 *px, *py;
+	u8 *rx, *ry;
 
 	px = p;
 	py = p + 30;
@@ -254,10 +243,11 @@ static void point_double(u8 *r, u8 *p)
 	elt_add(ry, ry, t);
 }
 
-static void point_add(u8 *r, u8 *p, u8 *q)
+static void point_add(u8 *r, const u8 *p, const u8 *q)
 {
 	u8 s[30], t[30], u[30];
-	u8 *px, *py, *qx, *qy, *rx, *ry;
+	const u8 *px, *py, *qx, *qy;
+	u8 *rx, *ry;
 
 	px = p;
 	py = p + 30;
@@ -307,7 +297,7 @@ static void point_add(u8 *r, u8 *p, u8 *q)
 	elt_add(ry, s, rx);
 }
 
-void point_mul(u8 *d, const u8 *a, u8 *b)	// a is bignum
+static void point_mul(u8 *d, const u8 *a, const u8 *b) // a is bignum
 {
 	u32 i;
 	u8 mask;
@@ -323,18 +313,18 @@ void point_mul(u8 *d, const u8 *a, u8 *b)	// a is bignum
 		}
 }
 
-void silly_random(u8 * rndArea, u8 count) 
+static void silly_random(u8 * rndArea, u8 count)
 {
 	u16 i;
-	srand((unsigned) (time(NULL)));
+	srand((unsigned) (time(nullptr)));
 
-	for(i=0;i<count;i++)
+	for (i=0;i<count;i++)
 	{
 		rndArea[i]=rand();
-	} 
+	}
 }
 
-void generate_ecdsa(u8 *R, u8 *S, const u8 *k, u8 *hash)
+void generate_ecdsa(u8 *R, u8 *S, const u8 *k, const u8 *hash)
 {
 	u8 e[30];
 	u8 kk[30];
@@ -372,7 +362,7 @@ void generate_ecdsa(u8 *R, u8 *S, const u8 *k, u8 *hash)
 	bn_mul(S, minv, kk, ec_N, 30);
 }
 
-int check_ecdsa(u8 *Q, u8 *R, u8 *S, u8 *hash)
+UNUSED static int check_ecdsa(u8 *Q, u8 *R, u8 *S, const u8 *hash)
 {
 	u8 Sinv[30];
 	u8 e[30];
diff --git a/Source/Core/Common/Crypto/ec.h b/Source/Core/Common/Crypto/ec.h
new file mode 100644
index 0000000000..efbc7e903b
--- /dev/null
+++ b/Source/Core/Common/Crypto/ec.h
@@ -0,0 +1,11 @@
+// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
+// Licensed under the terms of the GNU GPL, version 2
+// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+void generate_ecdsa(u8 *R, u8 *S, const u8 *k, const u8 *hash);
+
+void ec_priv_to_pub(const u8 *k, u8 *Q);
diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h
new file mode 100644
index 0000000000..b64df6ce46
--- /dev/null
+++ b/Source/Core/Common/DebugInterface.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstring>
+#include <string>
+
+class DebugInterface
+{
+protected:
+	virtual ~DebugInterface() {}
+
+public:
+	virtual std::string Disassemble(unsigned int /*address*/) { return "NODEBUGGER"; }
+	virtual void GetRawMemoryString(int /*memory*/, unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
+	virtual int GetInstructionSize(int /*instruction*/) {return 1;}
+	virtual bool IsAlive() {return true;}
+	virtual bool IsBreakpoint(unsigned int /*address*/) {return false;}
+	virtual void SetBreakpoint(unsigned int /*address*/){}
+	virtual void ClearBreakpoint(unsigned int /*address*/){}
+	virtual void ClearAllBreakpoints() {}
+	virtual void ToggleBreakpoint(unsigned int /*address*/){}
+	virtual void AddWatch(unsigned int /*address*/){}
+	virtual void ClearAllMemChecks() {}
+	virtual bool IsMemCheck(unsigned int /*address*/) {return false;}
+	virtual void ToggleMemCheck(unsigned int /*address*/){}
+	virtual unsigned int ReadMemory(unsigned int /*address*/){return 0;}
+	virtual void WriteExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {}
+	virtual unsigned int ReadExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;}
+	virtual unsigned int ReadInstruction(unsigned int /*address*/){return 0;}
+	virtual unsigned int GetPC() {return 0;}
+	virtual void SetPC(unsigned int /*address*/) {}
+	virtual void Step() {}
+	virtual void RunToBreakpoint() {}
+	virtual void InsertBLR(unsigned int /*address*/, unsigned int /*value*/) {}
+	virtual int GetColor(unsigned int /*address*/){return 0xFFFFFFFF;}
+	virtual std::string GetDescription(unsigned int /*address*/) = 0;
+};
diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp
new file mode 100644
index 0000000000..365d69b04e
--- /dev/null
+++ b/Source/Core/Common/ENetUtil.cpp
@@ -0,0 +1,42 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "ENetUtil.h"
+
+#include "Common/CommonTypes.h"
+
+namespace ENetUtil
+{
+
+void WakeupThread(ENetHost* host)
+{
+	// Send ourselves a spurious message.  This is hackier than it should be.
+	// comex reported this as https://github.com/lsalzman/enet/issues/23, so
+	// hopefully there will be a better way to do it in the future.
+	ENetAddress address;
+	if (host->address.port != 0)
+		address.port = host->address.port;
+	else
+		enet_socket_get_address(host->socket, &address);
+	address.host = 0x0100007f; // localhost
+	u8 byte = 0;
+	ENetBuffer buf;
+	buf.data = &byte;
+	buf.dataLength = 1;
+	enet_socket_send(host->socket, &address, &buf, 1);
+}
+
+int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
+{
+	// wakeup packet received
+	if (host->receivedDataLength == 1 && host->receivedData[0] == 0)
+	{
+		event->type = (ENetEventType) 42;
+		return 1;
+	}
+	return 0;
+}
+
+
+}
diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h
new file mode 100644
index 0000000000..b727f9e108
--- /dev/null
+++ b/Source/Core/Common/ENetUtil.h
@@ -0,0 +1,15 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+#pragma once
+
+#include <enet/enet.h>
+
+namespace ENetUtil
+{
+
+void WakeupThread(ENetHost* host);
+int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
+
+}
diff --git a/Source/Core/Common/Event.h b/Source/Core/Common/Event.h
new file mode 100644
index 0000000000..db98ce1574
--- /dev/null
+++ b/Source/Core/Common/Event.h
@@ -0,0 +1,114 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Multithreaded event class. This allows waiting in a thread for an event to
+// be triggered in another thread. While waiting, the CPU will be available for
+// other tasks.
+// * Set(): triggers the event and wakes up the waiting thread.
+// * Wait(): waits for the event to be triggered.
+// * Reset(): tries to reset the event before the waiting thread sees it was
+//            triggered. Usually a bad idea.
+
+#pragma once
+
+#ifdef _WIN32
+#include <concrt.h>
+#endif
+
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include "Common/Flag.h"
+
+namespace Common {
+
+// Windows uses a specific implementation because std::condition_variable has
+// terrible performance for this kind of workload with MSVC++ 2013.
+#ifndef _WIN32
+class Event final
+{
+public:
+	void Set()
+	{
+		if (m_flag.TestAndSet())
+		{
+			std::lock_guard<std::mutex> lk(m_mutex);
+			m_condvar.notify_one();
+		}
+	}
+
+	void Wait()
+	{
+		if (m_flag.TestAndClear())
+			return;
+
+		std::unique_lock<std::mutex> lk(m_mutex);
+		m_condvar.wait(lk, [&]{ return m_flag.IsSet(); });
+		m_flag.Clear();
+	}
+
+	template<class Rep, class Period>
+	bool WaitFor(const std::chrono::duration<Rep, Period>& rel_time)
+	{
+		if (m_flag.TestAndClear())
+			return true;
+
+		std::unique_lock<std::mutex> lk(m_mutex);
+		bool signaled = m_condvar.wait_for(lk, rel_time,
+			[&]{ return m_flag.IsSet(); });
+		m_flag.Clear();
+
+		return signaled;
+	}
+
+	void Reset()
+	{
+		// no other action required, since wait loops on
+		// the predicate and any lingering signal will get
+		// cleared on the first iteration
+		m_flag.Clear();
+	}
+
+private:
+	Flag m_flag;
+	std::condition_variable m_condvar;
+	std::mutex m_mutex;
+};
+#else
+class Event final
+{
+public:
+	void Set()
+	{
+		m_event.set();
+	}
+
+	void Wait()
+	{
+		m_event.wait();
+		m_event.reset();
+	}
+
+	template<class Rep, class Period>
+	bool WaitFor(const std::chrono::duration<Rep, Period>& rel_time)
+	{
+		bool signaled = m_event.wait(
+			(u32)std::chrono::duration_cast<std::chrono::milliseconds>(rel_time).count()
+			) == 0;
+		m_event.reset();
+		return signaled;
+	}
+
+	void Reset()
+	{
+		m_event.reset();
+	}
+
+private:
+	concurrency::event m_event;
+};
+#endif
+
+}  // namespace Common
diff --git a/Source/Core/Common/FPURoundMode.h b/Source/Core/Common/FPURoundMode.h
new file mode 100644
index 0000000000..cf3f496c16
--- /dev/null
+++ b/Source/Core/Common/FPURoundMode.h
@@ -0,0 +1,45 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace FPURoundMode
+{
+	// TODO: MSVC currently produces broken code:
+	// https://connect.microsoft.com/VisualStudio/feedback/details/828892/vc-2013-miscompilation-with-enums-and-bit-fields
+	// Once that is fixed, change types in SetRoundMode(), SetSIMDMode(), and in UReg_FPSCR to 'RoundMode'.
+
+	enum RoundMode
+	{
+		ROUND_NEAR = 0,
+		ROUND_CHOP = 1,
+		ROUND_UP   = 2,
+		ROUND_DOWN = 3
+	};
+	enum PrecisionMode
+	{
+		PREC_24 = 0,
+		PREC_53 = 1,
+		PREC_64 = 2
+	};
+
+	void SetRoundMode(int mode);
+
+	void SetPrecisionMode(PrecisionMode mode);
+
+	void SetSIMDMode(int rounding_mode, bool non_ieee_mode);
+
+/*
+ * There are two different flavors of float to int conversion:
+ * _mm_cvtps_epi32() and _mm_cvttps_epi32().
+ *
+ * The first rounds according to the MXCSR rounding bits.
+ * The second one always uses round towards zero.
+ */
+	void SaveSIMDState();
+	void LoadSIMDState();
+	void LoadDefaultSIMDState();
+}
diff --git a/Source/Core/Common/FifoQueue.h b/Source/Core/Common/FifoQueue.h
new file mode 100644
index 0000000000..6f65253cc3
--- /dev/null
+++ b/Source/Core/Common/FifoQueue.h
@@ -0,0 +1,125 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// a simple lockless thread-safe,
+// single reader, single writer queue
+
+#include <algorithm>
+#include <atomic>
+#include <cstddef>
+
+#include "Common/CommonTypes.h"
+
+namespace Common
+{
+
+template <typename T, bool NeedSize = true>
+class FifoQueue
+{
+public:
+	FifoQueue() : m_size(0)
+	{
+		 m_write_ptr = m_read_ptr = new ElementPtr();
+	}
+
+	~FifoQueue()
+	{
+		// this will empty out the whole queue
+		delete m_read_ptr;
+	}
+
+	u32 Size() const
+	{
+		static_assert(NeedSize, "using Size() on FifoQueue without NeedSize");
+		return m_size.load();
+	}
+
+	bool Empty() const
+	{
+		return !m_read_ptr->next.load();
+	}
+
+	T& Front() const
+	{
+		return m_read_ptr->current;
+	}
+
+	template <typename Arg>
+	void Push(Arg&& t)
+	{
+		// create the element, add it to the queue
+		m_write_ptr->current = std::forward<Arg>(t);
+		// set the next pointer to a new element ptr
+		// then advance the write pointer
+		ElementPtr* new_ptr = new ElementPtr();
+		m_write_ptr->next.store(new_ptr, std::memory_order_release);
+		m_write_ptr = new_ptr;
+		if (NeedSize)
+			m_size++;
+	}
+
+	void Pop()
+	{
+		if (NeedSize)
+			m_size--;
+		ElementPtr *tmpptr = m_read_ptr;
+		// advance the read pointer
+		m_read_ptr = tmpptr->next.load();
+		// set the next element to nullptr to stop the recursive deletion
+		tmpptr->next.store(nullptr);
+		delete tmpptr; // this also deletes the element
+	}
+
+	bool Pop(T& t)
+	{
+		if (Empty())
+			return false;
+
+		if (NeedSize)
+			m_size--;
+
+		ElementPtr *tmpptr = m_read_ptr;
+		m_read_ptr = tmpptr->next.load(std::memory_order_acquire);
+		t = std::move(tmpptr->current);
+		tmpptr->next.store(nullptr);
+		delete tmpptr;
+		return true;
+	}
+
+	// not thread-safe
+	void Clear()
+	{
+		m_size.store(0);
+		delete m_read_ptr;
+		m_write_ptr = m_read_ptr = new ElementPtr();
+	}
+
+private:
+	// stores a pointer to element
+	// and a pointer to the next ElementPtr
+	class ElementPtr
+	{
+	public:
+		ElementPtr() : next(nullptr) {}
+
+		~ElementPtr()
+		{
+			ElementPtr* next_ptr = next.load();
+
+			if (next_ptr)
+				delete next_ptr;
+		}
+
+		T current;
+		std::atomic<ElementPtr*> next;
+	};
+
+	ElementPtr *m_write_ptr;
+	ElementPtr *m_read_ptr;
+	std::atomic<u32> m_size;
+};
+
+}
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
new file mode 100644
index 0000000000..13e99fe88a
--- /dev/null
+++ b/Source/Core/Common/FileSearch.cpp
@@ -0,0 +1,61 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#if !__clang__ && __GNUC__ == 4 && __GNUC_MINOR__ < 9
+#error <regex> is broken in GCC < 4.9; please upgrade
+#endif
+
+#include <algorithm>
+#include <functional>
+#include <regex>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+
+static std::vector<std::string> FileSearchWithTest(const std::vector<std::string>& directories, bool recursive, std::function<bool(const File::FSTEntry &)> callback)
+{
+	std::vector<std::string> result;
+	for (const std::string& directory : directories)
+	{
+		File::FSTEntry top = File::ScanDirectoryTree(directory, recursive);
+
+		std::function<void(File::FSTEntry&)> DoEntry;
+		DoEntry = [&](File::FSTEntry& entry) {
+			if (callback(entry))
+				result.push_back(entry.physicalName);
+			for (auto& child : entry.children)
+				DoEntry(child);
+		};
+		DoEntry(top);
+	}
+	// remove duplicates
+	std::sort(result.begin(), result.end());
+	result.erase(std::unique(result.begin(), result.end()), result.end());
+	return result;
+}
+
+std::vector<std::string> DoFileSearch(const std::vector<std::string>& globs, const std::vector<std::string>& directories, bool recursive)
+{
+	std::string regex_str = "^(";
+	for (const auto& str : globs)
+	{
+		if (regex_str.size() != 2)
+			regex_str += "|";
+		// convert glob to regex
+		regex_str += std::regex_replace(std::regex_replace(str, std::regex("\\."), "\\."), std::regex("\\*"), ".*");
+	}
+	regex_str += ")$";
+	std::regex regex(regex_str, std::regex_constants::icase);
+	return FileSearchWithTest(directories, recursive, [&](const File::FSTEntry& entry) {
+		return std::regex_match(entry.virtualName, regex);
+	});
+}
+
+std::vector<std::string> FindSubdirectories(const std::vector<std::string>& directories, bool recursive)
+{
+	return FileSearchWithTest(directories, true, [&](const File::FSTEntry& entry) {
+		return entry.isDirectory;
+	});
+}
diff --git a/Source/Core/Common/FileSearch.h b/Source/Core/Common/FileSearch.h
new file mode 100644
index 0000000000..cb15f84799
--- /dev/null
+++ b/Source/Core/Common/FileSearch.h
@@ -0,0 +1,11 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+std::vector<std::string> DoFileSearch(const std::vector<std::string>& globs, const std::vector<std::string>& directories, bool recursive = false);
+std::vector<std::string> FindSubdirectories(const std::vector<std::string>& directories, bool recursive);
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
new file mode 100644
index 0000000000..925e3f1ed3
--- /dev/null
+++ b/Source/Core/Common/FileUtil.cpp
@@ -0,0 +1,997 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <fcntl.h>
+#include <limits.h>
+#include <string>
+#include <vector>
+#include <sys/stat.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#ifdef _WIN32
+#include <commdlg.h>   // for GetSaveFileName
+#include <direct.h>    // getcwd
+#include <io.h>
+#include <objbase.h>   // guid stuff
+#include <shellapi.h>
+#include <windows.h>
+#else
+#include <dirent.h>
+#include <errno.h>
+#include <libgen.h>
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__)
+#include <CoreFoundation/CFBundle.h>
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFURL.h>
+#include <sys/param.h>
+#endif
+
+#ifndef S_ISDIR
+#define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
+#endif
+
+#ifdef BSD4_4
+#define stat64 stat
+#define fstat64 fstat
+#endif
+
+// This namespace has various generic functions related to files and paths.
+// The code still needs a ton of cleanup.
+// REMEMBER: strdup considered harmful!
+namespace File
+{
+
+// Remove any ending forward slashes from directory paths
+// Modifies argument.
+static void StripTailDirSlashes(std::string &fname)
+{
+	if (fname.length() > 1)
+	{
+		while (fname.back() == DIR_SEP_CHR)
+			fname.pop_back();
+	}
+}
+
+// Returns true if file filename exists
+bool Exists(const std::string &filename)
+{
+	struct stat64 file_info;
+
+	std::string copy(filename);
+	StripTailDirSlashes(copy);
+
+#ifdef _WIN32
+	int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info);
+#else
+	int result = stat64(copy.c_str(), &file_info);
+#endif
+
+	return (result == 0);
+}
+
+// Returns true if filename is a directory
+bool IsDirectory(const std::string &filename)
+{
+	struct stat64 file_info;
+
+	std::string copy(filename);
+	StripTailDirSlashes(copy);
+
+#ifdef _WIN32
+	int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info);
+#else
+	int result = stat64(copy.c_str(), &file_info);
+#endif
+
+	if (result < 0)
+	{
+		WARN_LOG(COMMON, "IsDirectory: stat failed on %s: %s",
+				 filename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+
+	return S_ISDIR(file_info.st_mode);
+}
+
+// Deletes a given filename, return true on success
+// Doesn't supports deleting a directory
+bool Delete(const std::string &filename)
+{
+	INFO_LOG(COMMON, "Delete: file %s", filename.c_str());
+
+	// Return true because we care about the file no
+	// being there, not the actual delete.
+	if (!Exists(filename))
+	{
+		WARN_LOG(COMMON, "Delete: %s does not exist", filename.c_str());
+		return true;
+	}
+
+	// We can't delete a directory
+	if (IsDirectory(filename))
+	{
+		WARN_LOG(COMMON, "Delete failed: %s is a directory", filename.c_str());
+		return false;
+	}
+
+#ifdef _WIN32
+	if (!DeleteFile(UTF8ToTStr(filename).c_str()))
+	{
+		WARN_LOG(COMMON, "Delete: DeleteFile failed on %s: %s",
+				 filename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+#else
+	if (unlink(filename.c_str()) == -1)
+	{
+		WARN_LOG(COMMON, "Delete: unlink failed on %s: %s",
+				 filename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+#endif
+
+	return true;
+}
+
+// Returns true if successful, or path already exists.
+bool CreateDir(const std::string &path)
+{
+	INFO_LOG(COMMON, "CreateDir: directory %s", path.c_str());
+#ifdef _WIN32
+	if (::CreateDirectory(UTF8ToTStr(path).c_str(), nullptr))
+		return true;
+	DWORD error = GetLastError();
+	if (error == ERROR_ALREADY_EXISTS)
+	{
+		WARN_LOG(COMMON, "CreateDir: CreateDirectory failed on %s: already exists", path.c_str());
+		return true;
+	}
+	ERROR_LOG(COMMON, "CreateDir: CreateDirectory failed on %s: %i", path.c_str(), error);
+	return false;
+#else
+	if (mkdir(path.c_str(), 0755) == 0)
+		return true;
+
+	int err = errno;
+
+	if (err == EEXIST)
+	{
+		WARN_LOG(COMMON, "CreateDir: mkdir failed on %s: already exists", path.c_str());
+		return true;
+	}
+
+	ERROR_LOG(COMMON, "CreateDir: mkdir failed on %s: %s", path.c_str(), strerror(err));
+	return false;
+#endif
+}
+
+// Creates the full path of fullPath returns true on success
+bool CreateFullPath(const std::string &fullPath)
+{
+	int panicCounter = 100;
+	INFO_LOG(COMMON, "CreateFullPath: path %s", fullPath.c_str());
+
+	if (File::Exists(fullPath))
+	{
+		INFO_LOG(COMMON, "CreateFullPath: path exists %s", fullPath.c_str());
+		return true;
+	}
+
+	size_t position = 0;
+	while (true)
+	{
+		// Find next sub path
+		position = fullPath.find(DIR_SEP_CHR, position);
+
+		// we're done, yay!
+		if (position == fullPath.npos)
+			return true;
+
+		// Include the '/' so the first call is CreateDir("/") rather than CreateDir("")
+		std::string const subPath(fullPath.substr(0, position + 1));
+		if (!File::IsDirectory(subPath))
+			File::CreateDir(subPath);
+
+		// A safety check
+		panicCounter--;
+		if (panicCounter <= 0)
+		{
+			ERROR_LOG(COMMON, "CreateFullPath: directory structure is too deep");
+			return false;
+		}
+		position++;
+	}
+}
+
+
+// Deletes a directory filename, returns true on success
+bool DeleteDir(const std::string &filename)
+{
+	INFO_LOG(COMMON, "DeleteDir: directory %s", filename.c_str());
+
+	// check if a directory
+	if (!File::IsDirectory(filename))
+	{
+		ERROR_LOG(COMMON, "DeleteDir: Not a directory %s", filename.c_str());
+		return false;
+	}
+
+#ifdef _WIN32
+	if (::RemoveDirectory(UTF8ToTStr(filename).c_str()))
+		return true;
+#else
+	if (rmdir(filename.c_str()) == 0)
+		return true;
+#endif
+	ERROR_LOG(COMMON, "DeleteDir: %s: %s", filename.c_str(), GetLastErrorMsg().c_str());
+
+	return false;
+}
+
+// renames file srcFilename to destFilename, returns true on success
+bool Rename(const std::string &srcFilename, const std::string &destFilename)
+{
+	INFO_LOG(COMMON, "Rename: %s --> %s",
+			srcFilename.c_str(), destFilename.c_str());
+#ifdef _WIN32
+	auto sf = UTF8ToTStr(srcFilename);
+	auto df = UTF8ToTStr(destFilename);
+	// The Internet seems torn about whether ReplaceFile is atomic or not.
+	// Hopefully it's atomic enough...
+	if (ReplaceFile(df.c_str(), sf.c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr))
+		return true;
+	// Might have failed because the destination doesn't exist.
+	if (GetLastError() == ERROR_FILE_NOT_FOUND)
+	{
+		if (MoveFile(sf.c_str(), df.c_str()))
+			return true;
+	}
+#else
+	if (rename(srcFilename.c_str(), destFilename.c_str()) == 0)
+		return true;
+#endif
+	ERROR_LOG(COMMON, "Rename: failed %s --> %s: %s",
+			  srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+	return false;
+}
+
+#ifndef _WIN32
+static void FSyncPath(const char *path)
+{
+	int fd = open(path, O_RDONLY);
+	if (fd != -1)
+	{
+		fsync(fd);
+		close(fd);
+	}
+}
+#endif
+
+bool RenameSync(const std::string &srcFilename, const std::string &destFilename)
+{
+	if (!Rename(srcFilename, destFilename))
+		return false;
+#ifdef _WIN32
+	int fd = _topen(UTF8ToTStr(srcFilename).c_str(), _O_RDONLY);
+	if (fd != -1)
+	{
+		_commit(fd);
+		close(fd);
+	}
+#else
+	char *path = strdup(srcFilename.c_str());
+	FSyncPath(path);
+	FSyncPath(dirname(path));
+	free(path);
+	path = strdup(destFilename.c_str());
+	FSyncPath(dirname(path));
+	free(path);
+#endif
+	return true;
+}
+
+// copies file srcFilename to destFilename, returns true on success
+bool Copy(const std::string &srcFilename, const std::string &destFilename)
+{
+	INFO_LOG(COMMON, "Copy: %s --> %s",
+			srcFilename.c_str(), destFilename.c_str());
+#ifdef _WIN32
+	if (CopyFile(UTF8ToTStr(srcFilename).c_str(), UTF8ToTStr(destFilename).c_str(), FALSE))
+		return true;
+
+	ERROR_LOG(COMMON, "Copy: failed %s --> %s: %s",
+			srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+	return false;
+#else
+
+	// buffer size
+#define BSIZE 1024
+
+	char buffer[BSIZE];
+
+	// Open input file
+	std::ifstream input;
+	OpenFStream(input, srcFilename, std::ifstream::in | std::ifstream::binary);
+	if (!input.is_open())
+	{
+		ERROR_LOG(COMMON, "Copy: input failed %s --> %s: %s",
+				srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+
+	// open output file
+	File::IOFile output(destFilename, "wb");
+
+	if (!output.IsOpen())
+	{
+		ERROR_LOG(COMMON, "Copy: output failed %s --> %s: %s",
+				srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+
+	// copy loop
+	while (!input.eof())
+	{
+		// read input
+		input.read(buffer, BSIZE);
+		if (!input)
+		{
+			ERROR_LOG(COMMON,
+					"Copy: failed reading from source, %s --> %s: %s",
+					srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+			return false;
+		}
+
+		// write output
+		if (!output.WriteBytes(buffer, BSIZE))
+		{
+			ERROR_LOG(COMMON,
+					"Copy: failed writing to output, %s --> %s: %s",
+					srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg().c_str());
+			return false;
+		}
+	}
+
+	return true;
+#endif
+}
+
+// Returns the size of filename (64bit)
+u64 GetSize(const std::string &filename)
+{
+	if (!Exists(filename))
+	{
+		WARN_LOG(COMMON, "GetSize: failed %s: No such file", filename.c_str());
+		return 0;
+	}
+
+	if (IsDirectory(filename))
+	{
+		WARN_LOG(COMMON, "GetSize: failed %s: is a directory", filename.c_str());
+		return 0;
+	}
+
+	struct stat64 buf;
+#ifdef _WIN32
+	if (_tstat64(UTF8ToTStr(filename).c_str(), &buf) == 0)
+#else
+	if (stat64(filename.c_str(), &buf) == 0)
+#endif
+	{
+		DEBUG_LOG(COMMON, "GetSize: %s: %lld",
+				filename.c_str(), (long long)buf.st_size);
+		return buf.st_size;
+	}
+
+	ERROR_LOG(COMMON, "GetSize: Stat failed %s: %s",
+			filename.c_str(), GetLastErrorMsg().c_str());
+	return 0;
+}
+
+// Overloaded GetSize, accepts file descriptor
+u64 GetSize(const int fd)
+{
+	struct stat64 buf;
+	if (fstat64(fd, &buf) != 0)
+	{
+		ERROR_LOG(COMMON, "GetSize: stat failed %i: %s",
+			fd, GetLastErrorMsg().c_str());
+		return 0;
+	}
+	return buf.st_size;
+}
+
+// Overloaded GetSize, accepts FILE*
+u64 GetSize(FILE *f)
+{
+	// can't use off_t here because it can be 32-bit
+	u64 pos = ftello(f);
+	if (fseeko(f, 0, SEEK_END) != 0)
+	{
+		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s",
+			  f, GetLastErrorMsg().c_str());
+		return 0;
+	}
+
+	u64 size = ftello(f);
+	if ((size != pos) && (fseeko(f, pos, SEEK_SET) != 0))
+	{
+		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s",
+			  f, GetLastErrorMsg().c_str());
+		return 0;
+	}
+
+	return size;
+}
+
+// creates an empty file filename, returns true on success
+bool CreateEmptyFile(const std::string &filename)
+{
+	INFO_LOG(COMMON, "CreateEmptyFile: %s", filename.c_str());
+
+	if (!File::IOFile(filename, "wb"))
+	{
+		ERROR_LOG(COMMON, "CreateEmptyFile: failed %s: %s",
+				  filename.c_str(), GetLastErrorMsg().c_str());
+		return false;
+	}
+
+	return true;
+}
+
+
+// Scans the directory tree gets, starting from _Directory and adds the
+// results into parentEntry. Returns the number of files+directories found
+FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive)
+{
+	INFO_LOG(COMMON, "ScanDirectoryTree: directory %s", directory.c_str());
+	// How many files + directories we found
+	FSTEntry parent_entry;
+	parent_entry.physicalName = directory;
+	parent_entry.isDirectory = true;
+	parent_entry.size = 0;
+#ifdef _WIN32
+	// Find the first file in the directory.
+	WIN32_FIND_DATA ffd;
+
+	HANDLE hFind = FindFirstFile(UTF8ToTStr(directory + "\\*").c_str(), &ffd);
+	if (hFind == INVALID_HANDLE_VALUE)
+	{
+		FindClose(hFind);
+		return parent_entry;
+	}
+	// Windows loop
+	do
+	{
+		const std::string virtual_name(TStrToUTF8(ffd.cFileName));
+#else
+	struct dirent dirent, *result = nullptr;
+
+	DIR *dirp = opendir(directory.c_str());
+	if (!dirp)
+			return parent_entry;
+
+		// non Windows loop
+		while (!readdir_r(dirp, &dirent, &result) && result)
+		{
+			const std::string virtual_name(result->d_name);
+	#endif
+			if (virtual_name == "." || virtual_name == "..")
+				continue;
+			auto physical_name = directory + DIR_SEP + virtual_name;
+			FSTEntry entry;
+			entry.isDirectory = IsDirectory(physical_name);
+			if (entry.isDirectory)
+			{
+				if (recursive)
+					entry = ScanDirectoryTree(physical_name, true);
+				else
+					entry.size = 0;
+			}
+			else
+			{
+				entry.size = GetSize(physical_name);
+			}
+			entry.virtualName = virtual_name;
+			entry.physicalName = physical_name;
+
+			++parent_entry.size;
+			// Push into the tree
+			parent_entry.children.push_back(entry);
+	#ifdef _WIN32
+		} while (FindNextFile(hFind, &ffd) != 0);
+	FindClose(hFind);
+#else
+	}
+	closedir(dirp);
+#endif
+	// Return number of entries found.
+	return parent_entry;
+}
+
+
+// Deletes the given directory and anything under it. Returns true on success.
+bool DeleteDirRecursively(const std::string &directory)
+{
+	INFO_LOG(COMMON, "DeleteDirRecursively: %s", directory.c_str());
+#ifdef _WIN32
+	// Find the first file in the directory.
+	WIN32_FIND_DATA ffd;
+	HANDLE hFind = FindFirstFile(UTF8ToTStr(directory + "\\*").c_str(), &ffd);
+
+	if (hFind == INVALID_HANDLE_VALUE)
+	{
+		FindClose(hFind);
+		return false;
+	}
+
+	// Windows loop
+	do
+	{
+		const std::string virtualName(TStrToUTF8(ffd.cFileName));
+#else
+	struct dirent dirent, *result = nullptr;
+	DIR *dirp = opendir(directory.c_str());
+	if (!dirp)
+		return false;
+
+	// non Windows loop
+	while (!readdir_r(dirp, &dirent, &result) && result)
+	{
+		const std::string virtualName = result->d_name;
+#endif
+
+		// check for "." and ".."
+		if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
+			((virtualName[0] == '.') && (virtualName[1] == '.') &&
+			 (virtualName[2] == '\0')))
+			continue;
+
+		std::string newPath = directory + DIR_SEP_CHR + virtualName;
+		if (IsDirectory(newPath))
+		{
+			if (!DeleteDirRecursively(newPath))
+			{
+				#ifndef _WIN32
+				closedir(dirp);
+				#endif
+
+				return false;
+			}
+		}
+		else
+		{
+			if (!File::Delete(newPath))
+			{
+				#ifndef _WIN32
+				closedir(dirp);
+				#endif
+
+				return false;
+			}
+		}
+
+#ifdef _WIN32
+	} while (FindNextFile(hFind, &ffd) != 0);
+	FindClose(hFind);
+#else
+	}
+	closedir(dirp);
+#endif
+	File::DeleteDir(directory);
+
+	return true;
+}
+
+// Create directory and copy contents (does not overwrite existing files)
+void CopyDir(const std::string &source_path, const std::string &dest_path)
+{
+	if (source_path == dest_path) return;
+	if (!File::Exists(source_path)) return;
+	if (!File::Exists(dest_path)) File::CreateFullPath(dest_path);
+
+#ifdef _WIN32
+	WIN32_FIND_DATA ffd;
+	HANDLE hFind = FindFirstFile(UTF8ToTStr(source_path + "\\*").c_str(), &ffd);
+
+	if (hFind == INVALID_HANDLE_VALUE)
+	{
+		FindClose(hFind);
+		return;
+	}
+
+	do
+	{
+		const std::string virtualName(TStrToUTF8(ffd.cFileName));
+#else
+	struct dirent dirent, *result = nullptr;
+	DIR *dirp = opendir(source_path.c_str());
+	if (!dirp) return;
+
+	while (!readdir_r(dirp, &dirent, &result) && result)
+	{
+		const std::string virtualName(result->d_name);
+#endif
+		// check for "." and ".."
+		if (virtualName == "." || virtualName == "..")
+			continue;
+
+		std::string source = source_path + DIR_SEP + virtualName;
+		std::string dest = dest_path + DIR_SEP + virtualName;
+		if (IsDirectory(source))
+		{
+			if (!File::Exists(dest)) File::CreateFullPath(dest + DIR_SEP);
+			CopyDir(source, dest);
+		}
+		else if (!File::Exists(dest)) File::Copy(source, dest);
+#ifdef _WIN32
+	} while (FindNextFile(hFind, &ffd) != 0);
+	FindClose(hFind);
+#else
+	}
+	closedir(dirp);
+#endif
+}
+
+// Returns the current directory
+std::string GetCurrentDir()
+{
+	char *dir;
+	// Get the current working directory (getcwd uses malloc)
+	if (!(dir = __getcwd(nullptr, 0)))
+	{
+		ERROR_LOG(COMMON, "GetCurrentDirectory failed: %s",
+				GetLastErrorMsg().c_str());
+		return nullptr;
+	}
+	std::string strDir = dir;
+	free(dir);
+	return strDir;
+}
+
+// Sets the current directory to the given directory
+bool SetCurrentDir(const std::string &directory)
+{
+	return __chdir(directory.c_str()) == 0;
+}
+
+std::string CreateTempDir()
+{
+#ifdef _WIN32
+	TCHAR temp[MAX_PATH];
+	if (!GetTempPath(MAX_PATH, temp))
+		return "";
+
+	GUID guid;
+	CoCreateGuid(&guid);
+	TCHAR tguid[40];
+	StringFromGUID2(guid, tguid, 39);
+	tguid[39] = 0;
+	std::string dir = TStrToUTF8(temp) + "/" + TStrToUTF8(tguid);
+	if (!CreateDir(dir))
+		return "";
+	dir = ReplaceAll(dir, "\\", DIR_SEP);
+	return dir;
+#else
+	const char* base = getenv("TMPDIR") ?: "/tmp";
+	std::string path = std::string(base) + "/DolphinWii.XXXXXX";
+	if (!mkdtemp(&path[0]))
+		return "";
+	return path;
+#endif
+}
+
+std::string GetTempFilenameForAtomicWrite(const std::string &path)
+{
+	std::string abs = path;
+#ifdef _WIN32
+	TCHAR absbuf[MAX_PATH];
+	if (_tfullpath(absbuf, UTF8ToTStr(path).c_str(), MAX_PATH) != nullptr)
+		abs = TStrToUTF8(absbuf);
+#else
+	char absbuf[PATH_MAX];
+	if (realpath(path.c_str(), absbuf) != nullptr)
+		abs = absbuf;
+#endif
+	return abs + ".xxx";
+}
+
+#if defined(__APPLE__)
+std::string GetBundleDirectory()
+{
+	CFURLRef BundleRef;
+	char AppBundlePath[MAXPATHLEN];
+	// Get the main bundle for the app
+	BundleRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+	CFStringRef BundlePath = CFURLCopyFileSystemPath(BundleRef, kCFURLPOSIXPathStyle);
+	CFStringGetFileSystemRepresentation(BundlePath, AppBundlePath, sizeof(AppBundlePath));
+	CFRelease(BundleRef);
+	CFRelease(BundlePath);
+
+	return AppBundlePath;
+}
+#endif
+
+#ifdef _WIN32
+std::string& GetExeDirectory()
+{
+	static std::string DolphinPath;
+	if (DolphinPath.empty())
+	{
+		TCHAR Dolphin_exe_Path[2048];
+		GetModuleFileName(nullptr, Dolphin_exe_Path, 2048);
+		DolphinPath = TStrToUTF8(Dolphin_exe_Path);
+		DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
+	}
+	return DolphinPath;
+}
+#endif
+
+std::string GetSysDirectory()
+{
+	std::string sysDir;
+
+#if defined (__APPLE__)
+	sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR;
+#elif defined (_WIN32)
+	sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
+#else
+	sysDir = SYSDATA_DIR;
+#endif
+	sysDir += DIR_SEP;
+
+	INFO_LOG(COMMON, "GetSysDirectory: Setting to %s:", sysDir.c_str());
+	return sysDir;
+}
+
+static std::string s_user_paths[NUM_PATH_INDICES];
+static void RebuildUserDirectories(unsigned int dir_index)
+{
+	switch (dir_index)
+	{
+	case D_USER_IDX:
+		s_user_paths[D_GCUSER_IDX]         = s_user_paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
+		s_user_paths[D_WIIROOT_IDX]        = s_user_paths[D_USER_IDX] + WII_USER_DIR;
+		s_user_paths[D_CONFIG_IDX]         = s_user_paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
+		s_user_paths[D_GAMESETTINGS_IDX]   = s_user_paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
+		s_user_paths[D_MAPS_IDX]           = s_user_paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
+		s_user_paths[D_CACHE_IDX]          = s_user_paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
+		s_user_paths[D_SHADERCACHE_IDX]    = s_user_paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
+		s_user_paths[D_SHADERS_IDX]        = s_user_paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
+		s_user_paths[D_STATESAVES_IDX]     = s_user_paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
+		s_user_paths[D_SCREENSHOTS_IDX]    = s_user_paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
+		s_user_paths[D_LOAD_IDX]           = s_user_paths[D_USER_IDX] + LOAD_DIR DIR_SEP;
+		s_user_paths[D_HIRESTEXTURES_IDX]  = s_user_paths[D_LOAD_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
+		s_user_paths[D_DUMP_IDX]           = s_user_paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
+		s_user_paths[D_DUMPFRAMES_IDX]     = s_user_paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+		s_user_paths[D_DUMPAUDIO_IDX]      = s_user_paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+		s_user_paths[D_DUMPTEXTURES_IDX]   = s_user_paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+		s_user_paths[D_DUMPDSP_IDX]        = s_user_paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+		s_user_paths[D_LOGS_IDX]           = s_user_paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
+		s_user_paths[D_MAILLOGS_IDX]       = s_user_paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+		s_user_paths[D_THEMES_IDX]         = s_user_paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
+		s_user_paths[F_DOLPHINCONFIG_IDX]  = s_user_paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+		s_user_paths[F_DEBUGGERCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+		s_user_paths[F_LOGGERCONFIG_IDX]   = s_user_paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+		s_user_paths[F_MAINLOG_IDX]        = s_user_paths[D_LOGS_IDX] + MAIN_LOG;
+		s_user_paths[F_RAMDUMP_IDX]        = s_user_paths[D_DUMP_IDX] + RAM_DUMP;
+		s_user_paths[F_ARAMDUMP_IDX]       = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;
+		s_user_paths[F_FAKEVMEMDUMP_IDX]   = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+		s_user_paths[F_GCSRAM_IDX]         = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
+		break;
+
+	case D_CONFIG_IDX:
+		s_user_paths[F_DOLPHINCONFIG_IDX]  = s_user_paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+		s_user_paths[F_DEBUGGERCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+		s_user_paths[F_LOGGERCONFIG_IDX]   = s_user_paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+		break;
+
+	case D_GCUSER_IDX:
+		s_user_paths[F_GCSRAM_IDX]         = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
+		break;
+
+	case D_DUMP_IDX:
+		s_user_paths[D_DUMPFRAMES_IDX]     = s_user_paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+		s_user_paths[D_DUMPAUDIO_IDX]      = s_user_paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+		s_user_paths[D_DUMPTEXTURES_IDX]   = s_user_paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+		s_user_paths[D_DUMPDSP_IDX]        = s_user_paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+		s_user_paths[F_RAMDUMP_IDX]        = s_user_paths[D_DUMP_IDX] + RAM_DUMP;
+		s_user_paths[F_ARAMDUMP_IDX]       = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;
+		s_user_paths[F_FAKEVMEMDUMP_IDX]   = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+		break;
+
+	case D_LOGS_IDX:
+		s_user_paths[D_MAILLOGS_IDX]       = s_user_paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+		s_user_paths[F_MAINLOG_IDX]        = s_user_paths[D_LOGS_IDX] + MAIN_LOG;
+		break;
+
+	case D_LOAD_IDX:
+		s_user_paths[D_HIRESTEXTURES_IDX]  = s_user_paths[D_LOAD_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
+		break;
+	}
+}
+
+// Gets a set user directory path
+// Don't call prior to setting the base user directory
+const std::string& GetUserPath(unsigned int dir_index)
+{
+	return s_user_paths[dir_index];
+}
+
+// Sets a user directory path
+// Rebuilds internal directory structure to compensate for the new directory
+void SetUserPath(unsigned int dir_index, const std::string& path)
+{
+	if (path.empty())
+		return;
+
+	s_user_paths[dir_index] = path;
+	RebuildUserDirectories(dir_index);
+}
+
+std::string GetThemeDir(const std::string& theme_name)
+{
+	std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
+
+	// If theme does not exist in user's dir load from shared directory
+	if (!File::Exists(dir))
+		dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
+
+	return dir;
+}
+
+bool WriteStringToFile(const std::string &str, const std::string& filename)
+{
+	return File::IOFile(filename, "wb").WriteBytes(str.data(), str.size());
+}
+
+bool ReadFileToString(const std::string& filename, std::string &str)
+{
+	File::IOFile file(filename, "rb");
+	auto const f = file.GetHandle();
+
+	if (!f)
+		return false;
+
+	size_t read_size;
+	str.resize(GetSize(f));
+	bool retval = file.ReadArray(&str[0], str.size(), &read_size);
+
+	return retval;
+}
+
+IOFile::IOFile()
+	: m_file(nullptr), m_good(true)
+{}
+
+IOFile::IOFile(std::FILE* file)
+	: m_file(file), m_good(true)
+{}
+
+IOFile::IOFile(const std::string& filename, const char openmode[])
+	: m_file(nullptr), m_good(true)
+{
+	Open(filename, openmode);
+}
+
+IOFile::~IOFile()
+{
+	Close();
+}
+
+IOFile::IOFile(IOFile&& other)
+	: m_file(nullptr), m_good(true)
+{
+	Swap(other);
+}
+
+IOFile& IOFile::operator=(IOFile&& other)
+{
+	Swap(other);
+	return *this;
+}
+
+void IOFile::Swap(IOFile& other)
+{
+	std::swap(m_file, other.m_file);
+	std::swap(m_good, other.m_good);
+}
+
+bool IOFile::Open(const std::string& filename, const char openmode[])
+{
+	Close();
+#ifdef _WIN32
+	_tfopen_s(&m_file, UTF8ToTStr(filename).c_str(), UTF8ToTStr(openmode).c_str());
+#else
+	m_file = fopen(filename.c_str(), openmode);
+#endif
+
+	m_good = IsOpen();
+	return m_good;
+}
+
+bool IOFile::Close()
+{
+	if (!IsOpen() || 0 != std::fclose(m_file))
+		m_good = false;
+
+	m_file = nullptr;
+	return m_good;
+}
+
+std::FILE* IOFile::ReleaseHandle()
+{
+	std::FILE* const ret = m_file;
+	m_file = nullptr;
+	return ret;
+}
+
+void IOFile::SetHandle(std::FILE* file)
+{
+	Close();
+	Clear();
+	m_file = file;
+}
+
+u64 IOFile::GetSize()
+{
+	if (IsOpen())
+		return File::GetSize(m_file);
+	else
+		return 0;
+}
+
+bool IOFile::Seek(s64 off, int origin)
+{
+	if (!IsOpen() || 0 != fseeko(m_file, off, origin))
+		m_good = false;
+
+	return m_good;
+}
+
+u64 IOFile::Tell() const
+{
+	if (IsOpen())
+		return ftello(m_file);
+	else
+		return -1;
+}
+
+bool IOFile::Flush()
+{
+	if (!IsOpen() || 0 != std::fflush(m_file))
+		m_good = false;
+
+	return m_good;
+}
+
+bool IOFile::Resize(u64 size)
+{
+	if (!IsOpen() || 0 !=
+#ifdef _WIN32
+		// ector: _chsize sucks, not 64-bit safe
+		// F|RES: changed to _chsize_s. i think it is 64-bit safe
+		_chsize_s(_fileno(m_file), size)
+#else
+		// TODO: handle 64bit and growing
+		ftruncate(fileno(m_file), size)
+#endif
+	)
+		m_good = false;
+
+	return m_good;
+}
+
+} // namespace
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
new file mode 100644
index 0000000000..1337ee1670
--- /dev/null
+++ b/Source/Core/Common/FileUtil.h
@@ -0,0 +1,244 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdio>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "Common/Common.h"
+
+#ifdef _WIN32
+#include "Common/StringUtil.h"
+#endif
+
+// User directory indices for GetUserPath
+enum {
+	D_USER_IDX,
+	D_GCUSER_IDX,
+	D_WIIROOT_IDX, // always points to User/Wii or global user-configured directory
+	D_SESSION_WIIROOT_IDX, // may point to minimal temporary directory for determinism
+	D_CONFIG_IDX, // global settings
+	D_GAMESETTINGS_IDX, // user-specified settings which override both the global and the default settings (per game)
+	D_MAPS_IDX,
+	D_CACHE_IDX,
+	D_SHADERCACHE_IDX,
+	D_SHADERS_IDX,
+	D_STATESAVES_IDX,
+	D_SCREENSHOTS_IDX,
+	D_HIRESTEXTURES_IDX,
+	D_DUMP_IDX,
+	D_DUMPFRAMES_IDX,
+	D_DUMPAUDIO_IDX,
+	D_DUMPTEXTURES_IDX,
+	D_DUMPDSP_IDX,
+	D_LOAD_IDX,
+	D_LOGS_IDX,
+	D_MAILLOGS_IDX,
+	D_THEMES_IDX,
+	F_DOLPHINCONFIG_IDX,
+	F_DEBUGGERCONFIG_IDX,
+	F_LOGGERCONFIG_IDX,
+	F_MAINLOG_IDX,
+	F_RAMDUMP_IDX,
+	F_ARAMDUMP_IDX,
+	F_FAKEVMEMDUMP_IDX,
+	F_GCSRAM_IDX,
+	NUM_PATH_INDICES
+};
+
+namespace File
+{
+
+// FileSystem tree node/
+struct FSTEntry
+{
+	bool isDirectory;
+	u64 size;                 // File length or number of entries from children
+	std::string physicalName; // Name on disk
+	std::string virtualName;  // Name in FST names table
+	std::vector<FSTEntry> children;
+};
+
+// Returns true if file filename exists
+bool Exists(const std::string &filename);
+
+// Returns true if filename is a directory
+bool IsDirectory(const std::string &filename);
+
+// Returns the size of filename (64bit)
+u64 GetSize(const std::string &filename);
+
+// Overloaded GetSize, accepts file descriptor
+u64 GetSize(const int fd);
+
+// Overloaded GetSize, accepts FILE*
+u64 GetSize(FILE *f);
+
+// Returns true if successful, or path already exists.
+bool CreateDir(const std::string &filename);
+
+// Creates the full path of fullPath returns true on success
+bool CreateFullPath(const std::string &fullPath);
+
+// Deletes a given filename, return true on success
+// Doesn't supports deleting a directory
+bool Delete(const std::string &filename);
+
+// Deletes a directory filename, returns true on success
+bool DeleteDir(const std::string &filename);
+
+// renames file srcFilename to destFilename, returns true on success
+bool Rename(const std::string &srcFilename, const std::string &destFilename);
+
+// ditto, but syncs the source file and, on Unix, syncs the directories after rename
+bool RenameSync(const std::string &srcFilename, const std::string &destFilename);
+
+// copies file srcFilename to destFilename, returns true on success
+bool Copy(const std::string &srcFilename, const std::string &destFilename);
+
+// creates an empty file filename, returns true on success
+bool CreateEmptyFile(const std::string &filename);
+
+// Recursive or non-recursive list of files under directory.
+FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive);
+
+// deletes the given directory and anything under it. Returns true on success.
+bool DeleteDirRecursively(const std::string &directory);
+
+// Returns the current directory
+std::string GetCurrentDir();
+
+// Create directory and copy contents (does not overwrite existing files)
+void CopyDir(const std::string &source_path, const std::string &dest_path);
+
+// Set the current directory to given directory
+bool SetCurrentDir(const std::string &directory);
+
+// Creates and returns the path to a new temporary directory.
+std::string CreateTempDir();
+
+// Get a filename that can hopefully be atomically renamed to the given path.
+std::string GetTempFilenameForAtomicWrite(const std::string &path);
+
+// Gets a set user directory path
+// Don't call prior to setting the base user directory
+const std::string& GetUserPath(unsigned int dir_index);
+
+// Sets a user directory path
+// Rebuilds internal directory structure to compensate for the new directory
+void SetUserPath(unsigned int dir_index, const std::string& path);
+
+// probably doesn't belong here
+std::string GetThemeDir(const std::string& theme_name);
+
+// Returns the path to where the sys file are
+std::string GetSysDirectory();
+
+#ifdef __APPLE__
+std::string GetBundleDirectory();
+#endif
+
+#ifdef _WIN32
+std::string &GetExeDirectory();
+#endif
+
+bool WriteStringToFile(const std::string& str, const std::string& filename);
+bool ReadFileToString(const std::string& filename, std::string& str);
+
+// simple wrapper for cstdlib file functions to
+// hopefully will make error checking easier
+// and make forgetting an fclose() harder
+class IOFile : public NonCopyable
+{
+public:
+	IOFile();
+	IOFile(std::FILE* file);
+	IOFile(const std::string& filename, const char openmode[]);
+
+	~IOFile();
+
+	IOFile(IOFile&& other);
+	IOFile& operator=(IOFile&& other);
+
+	void Swap(IOFile& other);
+
+	bool Open(const std::string& filename, const char openmode[]);
+	bool Close();
+
+	template <typename T>
+	bool ReadArray(T* data, size_t length, size_t* pReadBytes = nullptr)
+	{
+		size_t read_bytes = 0;
+		if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file)))
+			m_good = false;
+
+		if (pReadBytes)
+			*pReadBytes = read_bytes;
+
+		return m_good;
+	}
+
+	template <typename T>
+	bool WriteArray(const T* data, size_t length)
+	{
+		if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file))
+			m_good = false;
+
+		return m_good;
+	}
+
+	bool ReadBytes(void* data, size_t length)
+	{
+		return ReadArray(reinterpret_cast<char*>(data), length);
+	}
+
+	bool WriteBytes(const void* data, size_t length)
+	{
+		return WriteArray(reinterpret_cast<const char*>(data), length);
+	}
+
+	bool IsOpen() const { return nullptr != m_file; }
+
+	// m_good is set to false when a read, write or other function fails
+	bool IsGood() const { return m_good; }
+	operator void*() { return m_good ? m_file : nullptr; }
+
+	std::FILE* ReleaseHandle();
+
+	std::FILE* GetHandle() { return m_file; }
+
+	void SetHandle(std::FILE* file);
+
+	bool Seek(s64 off, int origin);
+	u64 Tell() const;
+	u64 GetSize();
+	bool Resize(u64 size);
+	bool Flush();
+
+	// clear error state
+	void Clear() { m_good = true; std::clearerr(m_file); }
+
+	std::FILE* m_file;
+	bool m_good;
+private:
+	IOFile(IOFile&);
+	IOFile& operator=(IOFile& other);
+};
+
+}  // namespace
+
+// To deal with Windows being dumb at unicode:
+template <typename T>
+void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode)
+{
+#ifdef _WIN32
+	fstream.open(UTF8ToTStr(filename).c_str(), openmode);
+#else
+	fstream.open(filename.c_str(), openmode);
+#endif
+}
diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h
new file mode 100644
index 0000000000..9918aed4d1
--- /dev/null
+++ b/Source/Core/Common/FixedSizeQueue.h
@@ -0,0 +1,77 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+
+// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
+// real STL classes.
+
+// Not fully featured, no safety checking yet. Add features as needed.
+
+// TODO: "inline" storage?
+
+template <class T, int N>
+class FixedSizeQueue
+{
+	T *storage;
+	int head;
+	int tail;
+	int count;  // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
+
+	// Make copy constructor private for now.
+	FixedSizeQueue(FixedSizeQueue &other) {}
+
+public:
+	FixedSizeQueue()
+	{
+		storage = new T[N];
+		clear();
+	}
+
+	~FixedSizeQueue()
+	{
+		delete[] storage;
+	}
+
+	void clear()
+	{
+		head = 0;
+		tail = 0;
+		count = 0;
+	}
+
+	void push(T t)
+	{
+		storage[tail] = t;
+		tail++;
+		if (tail == N)
+			tail = 0;
+		count++;
+	}
+
+	void pop()
+	{
+		head++;
+		if (head == N)
+			head = 0;
+		count--;
+	}
+
+	T pop_front()
+	{
+		const T &temp = storage[head];
+		pop();
+		return temp;
+	}
+
+	T &front() { return storage[head]; }
+	const T &front() const { return storage[head]; }
+
+	size_t size() const
+	{
+		return count;
+	}
+};
diff --git a/Source/Core/Common/Flag.h b/Source/Core/Common/Flag.h
new file mode 100644
index 0000000000..f2ed128f5a
--- /dev/null
+++ b/Source/Core/Common/Flag.h
@@ -0,0 +1,66 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Abstraction for a simple flag that can be toggled in a multithreaded way.
+//
+// Simple API:
+// * Set(bool = true): sets the Flag
+// * IsSet(): tests if the flag is set
+// * Clear(): clears the flag (equivalent to Set(false)).
+//
+// More advanced features:
+// * TestAndSet(bool = true): sets the flag to the given value. If a change was
+//                            needed (the flag did not already have this value)
+//                            the function returns true. Else, false.
+// * TestAndClear(): alias for TestAndSet(false).
+
+#pragma once
+
+#include <atomic>
+
+namespace Common {
+
+class Flag final
+{
+public:
+	// Declared as explicit since we do not want "= true" to work on a flag
+	// object - it should be made explicit that a flag is *not* a normal
+	// variable.
+	explicit Flag(bool initial_value = false) : m_val(initial_value) {}
+
+	void Set(bool val = true)
+	{
+		m_val.store(val);
+	}
+
+	void Clear()
+	{
+		Set(false);
+	}
+
+	bool IsSet() const
+	{
+		return m_val.load();
+	}
+
+	bool TestAndSet(bool val = true)
+	{
+		bool expected = !val;
+		return m_val.compare_exchange_strong(expected, val);
+	}
+
+	bool TestAndClear()
+	{
+		return TestAndSet(false);
+	}
+
+private:
+	// We are not using std::atomic_bool here because MSVC sucks as of VC++
+	// 2013 and does not implement the std::atomic_bool(bool) constructor.
+	//
+	// Re-evaluate next time we upgrade that piece of shit.
+	std::atomic<bool> m_val;
+};
+
+}  // namespace Common
diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
new file mode 100644
index 0000000000..2a04298fdd
--- /dev/null
+++ b/Source/Core/Common/GekkoDisassembler.cpp
@@ -0,0 +1,2289 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/* $VER: ppc_disasm.c V1.5 (27.05.2009)
+ *
+ * Disassembler module for the PowerPC microprocessor family
+ * Copyright (c) 1998-2001,2009,2011 Frank Wille
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 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 HOLDER 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.
+ */
+
+// Modified for use with Dolphin
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/GekkoDisassembler.h"
+#include "Common/StringUtil.h"
+
+// version/revision
+#define PPCDISASM_VER 1
+#define PPCDISASM_REV 6
+
+// general defines
+#define PPCIDXMASK      0xfc000000
+#define PPCIDX2MASK     0x000007fe
+#define PPCDMASK        0x03e00000
+#define PPCAMASK        0x001f0000
+#define PPCBMASK        0x0000f800
+#define PPCCMASK        0x000007c0
+#define PPCMMASK        0x0000003e
+#define PPCCRDMASK      0x03800000
+#define PPCCRAMASK      0x001c0000
+#define PPCLMASK        0x00600000
+#define PPCOE           0x00000400
+#define PPCVRC          0x00000400
+#define PPCDST          0x02000000
+#define PPCSTRM         0x00600000
+
+#define PPCIDXSH        26
+#define PPCDSH          21
+#define PPCASH          16
+#define PPCBSH          11
+#define PPCCSH          6
+#define PPCMSH          1
+#define PPCCRDSH        23
+#define PPCCRASH        18
+#define PPCLSH          21
+#define PPCIDX2SH       1
+
+#define PPCGETIDX(x)    (((x)&PPCIDXMASK)>>PPCIDXSH)
+#define PPCGETD(x)      (((x)&PPCDMASK)>>PPCDSH)
+#define PPCGETA(x)      (((x)&PPCAMASK)>>PPCASH)
+#define PPCGETB(x)      (((x)&PPCBMASK)>>PPCBSH)
+#define PPCGETC(x)      (((x)&PPCCMASK)>>PPCCSH)
+#define PPCGETM(x)      (((x)&PPCMMASK)>>PPCMSH)
+#define PPCGETCRD(x)    (((x)&PPCCRDMASK)>>PPCCRDSH)
+#define PPCGETCRA(x)    (((x)&PPCCRAMASK)>>PPCCRASH)
+#define PPCGETL(x)      (((x)&PPCLMASK)>>PPCLSH)
+#define PPCGETIDX2(x)   (((x)&PPCIDX2MASK)>>PPCIDX2SH)
+#define PPCGETSTRM(x)   (((x)&PPCSTRM)>>PPCDSH)
+
+
+static const char* trap_condition[32] = {
+	nullptr, "lgt",   "llt",   nullptr, "eq",    "lge",   "lle",   nullptr,
+	"gt",    nullptr, nullptr, nullptr, "ge",    nullptr, nullptr, nullptr,
+	"lt",    nullptr, nullptr, nullptr, "le",    nullptr, nullptr, nullptr,
+	"ne",    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+};
+
+static const char* cmpname[4] = {
+	"cmpw", "cmpd", "cmplw", "cmpld"
+};
+
+static const char* ps_cmpname[4] = {
+	"ps_cmpu0", "ps_cmpo0", "ps_cmpu1", "ps_cmpo1"
+};
+
+static const char* b_ext[4] = {
+	"", "l", "a", "la"
+};
+
+static const char* b_condition[8] = {
+	"ge", "le", "ne", "ns", "lt", "gt", "eq", "so"
+};
+
+static const char* b_decr[16] = {
+	"nzf", "zf", nullptr, nullptr, "nzt", "zt", nullptr, nullptr,
+	"nz",  "z",  nullptr, nullptr, "nz",  "z",  nullptr, nullptr
+};
+
+static const char* regsel[2] = {
+	"", "r"
+};
+
+static const char* oesel[2] = {
+	"", "o"
+};
+
+static const char* rcsel[2] = {
+	"", "."
+};
+
+static const char* ldstnames[24] = {
+	"lwz", "lwzu", "lbz", "lbzu", "stw", "stwu", "stb", "stbu", "lhz", "lhzu",
+	"lha", "lhau", "sth", "sthu", "lmw", "stmw", "lfs", "lfsu", "lfd", "lfdu",
+	"stfs", "stfsu", "stfd", "stfdu"
+};
+
+static const char* regnames[32] = {
+	"r0", "sp", "rtoc", "r3", "r4", "r5", "r6", "r7",
+	"r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
+	"r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
+	"r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"
+};
+
+// Initialize static class variables.
+u32* GekkoDisassembler::m_instr = nullptr;
+u32* GekkoDisassembler::m_iaddr = nullptr;
+std::string GekkoDisassembler::m_opcode = "";
+std::string GekkoDisassembler::m_operands = "";
+unsigned char GekkoDisassembler::m_type = 0;
+unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
+unsigned short GekkoDisassembler::m_sreg = 0;
+u32 GekkoDisassembler::m_displacement = 0;
+
+
+static std::string spr_name(int i)
+{
+	switch (i)
+	{
+	case 1: return "XER";
+	case 8: return "LR";
+	case 9: return "CTR";
+	case 18: return "DSIR";
+	case 19: return "DAR";
+	case 22: return "DEC";
+	case 25: return "SDR1";
+	case 26: return "SRR0";
+	case 27: return "SRR1";
+	case 272: return "SPRG0";
+	case 273: return "SPRG1";
+	case 274: return "SPRG2";
+	case 275: return "SPRG3";
+	case 282: return "EAR";
+	case 287: return "PVR";
+	case 528: return "IBAT0U";
+	case 529: return "IBAT0L";
+	case 530: return "IBAT1U";
+	case 531: return "IBAT1L";
+	case 532: return "IBAT2U";
+	case 533: return "IBAT2L";
+	case 534: return "IBAT3U";
+	case 535: return "IBAT3L";
+	case 536: return "DBAT0U";
+	case 537: return "DBAT0L";
+	case 538: return "DBAT1U";
+	case 539: return "DBAT1L";
+	case 540: return "DBAT2U";
+	case 541: return "DBAT2L";
+	case 542: return "DBAT3U";
+	case 543: return "DBAT3L";
+	case 912: return "GQR0";
+	case 913: return "GQR1";
+	case 914: return "GQR2";
+	case 915: return "GQR3";
+	case 916: return "GQR4";
+	case 917: return "GQR5";
+	case 918: return "GQR6";
+	case 919: return "GQR7";
+	case 920: return "HID2";
+	case 921: return "WPAR";
+	case 922: return "DMA_U";
+	case 923: return "DMA_L";
+	case 924: return "ECID_U";
+	case 925: return "ECID_M";
+	case 926: return "ECID_L";
+	case 936: return "UMMCR0";
+	case 937: return "UPMC1";
+	case 938: return "UPMC2";
+	case 939: return "USIA";
+	case 940: return "UMMCR1";
+	case 941: return "UPMC3";
+	case 942: return "UPMC4";
+	case 943: return "USDA";
+	case 952: return "MMCR0";
+	case 953: return "PMC1";
+	case 954: return "PMC2";
+	case 955: return "SIA";
+	case 956: return "MMCR1";
+	case 957: return "PMC3";
+	case 958: return "PMC4";
+	case 959: return "SDA";
+	case 1008: return "HID0";
+	case 1009: return "HID1";
+	case 1010: return "IABR";
+	case 1011: return "HID4";
+	case 1013: return "DABR";
+	case 1017: return "L2CR";
+	case 1019: return "ICTC";
+	case 1020: return "THRM1";
+	case 1021: return "THRM2";
+	case 1022: return "THRM3";
+	}
+
+	return StringFromFormat("%d", i);
+}
+
+
+static u32 swapda(u32 w)
+{
+	return ((w & 0xfc00ffff) | ((w&PPCAMASK) << 5) | ((w&PPCDMASK) >> 5));
+}
+
+
+static u32 swapab(u32 w)
+{
+	return ((w & 0xffe007ff) | ((w&PPCBMASK) << 5) | ((w&PPCAMASK) >> 5));
+}
+
+
+void GekkoDisassembler::ill(u32 in)
+{
+	if (in == 0)
+	{
+		m_opcode = "";
+		m_operands = "---";
+	}
+	else
+	{
+		m_opcode = "(ill)";
+		m_operands =  StringFromFormat("%08x", in);
+	}
+
+	m_flags |= PPCF_ILLEGAL;
+}
+
+// Generate immediate instruction operand.
+//
+// Type 0: D-mode, D,A,imm
+// Type 1: S-mode, A,S,imm
+// Type 2: S/D register is ignored (trap,cmpi)
+// Type 3: A register is ignored (li)
+std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
+{
+	int i = (int)(in & 0xffff);
+
+	m_type = PPCINSTR_IMM;
+
+	if (uimm == 0)
+	{
+		if (i > 0x7fff)
+			i -= 0x10000;
+	}
+	else
+	{
+		m_flags |= PPCF_UNSIGNED;
+	}
+	m_displacement = i;
+
+	switch (type)
+	{
+	case 0:
+		return StringFromFormat("%s, %s, %d", regnames[(int)PPCGETD(in)], regnames[(int)PPCGETA(in)], i);
+
+	case 1:
+		if (hex)
+			return StringFromFormat("%s, %s, 0x%.4X", regnames[(int)PPCGETA(in)], regnames[(int)PPCGETD(in)], i);
+		else
+			return StringFromFormat("%s, %s, %d", regnames[(int)PPCGETA(in)], regnames[(int)PPCGETD(in)], i);
+
+	case 2:
+		return StringFromFormat("%s, %d", regnames[(int)PPCGETA(in)], i);
+
+	case 3:
+		if (hex)
+			return StringFromFormat("%s, 0x%.4X", regnames[(int)PPCGETD(in)], i);
+		else
+			return StringFromFormat("%s, %d", regnames[(int)PPCGETD(in)], i);
+
+	default:
+		return StringFromFormat("%s", "imm(): Wrong type");
+	}
+}
+
+
+std::string GekkoDisassembler::ra_rb(u32 in)
+{
+	return StringFromFormat("%s, %s", regnames[(int)PPCGETA(in)], regnames[(int)PPCGETB(in)]);
+}
+
+
+std::string GekkoDisassembler::rd_ra_rb(u32 in, int mask)
+{
+	std::string result;
+
+	if (mask)
+	{
+		if (mask & 4)
+			result += StringFromFormat("%s, ", regnames[(int)PPCGETD(in)]);
+		if (mask & 2)
+			result += StringFromFormat("%s, ", regnames[(int)PPCGETA(in)]);
+		if (mask & 1)
+			result += StringFromFormat("%s, ", regnames[(int)PPCGETB(in)]);
+
+		size_t pos = result.rfind(", ");
+		if (pos != std::string::npos)
+		{
+			result.erase(pos, result.length() - pos);
+		}
+	}
+
+	return result;
+}
+
+
+std::string GekkoDisassembler::fd_ra_rb(u32 in, int mask)
+{
+	std::string result;
+
+	if (mask)
+	{
+		if (mask & 4)
+			result += StringFromFormat("f%d,", (int)PPCGETD(in));
+		if (mask & 2)
+			result += StringFromFormat("%s,", regnames[(int)PPCGETA(in)]);
+		if (mask & 1)
+			result += StringFromFormat("%s,", regnames[(int)PPCGETB(in)]);
+
+		// Drop the trailing comma
+		result.pop_back();
+	}
+
+	return result;
+}
+
+
+void GekkoDisassembler::trapi(u32 in, unsigned char dmode)
+{
+	const char* cnd = trap_condition[PPCGETD(in)];
+
+
+	m_flags |= dmode;
+	if (cnd != nullptr)
+	{
+		m_opcode = StringFromFormat("t%c%s", dmode ? 'd' : 'w', cnd);
+	}
+	else
+	{
+		m_opcode = StringFromFormat("t%ci", dmode ? 'd' : 'w');
+		m_operands = StringFromFormat("%d, ", PPCGETD(in));
+	}
+	m_operands += imm(in, 0, 2, false);
+}
+
+
+void GekkoDisassembler::cmpi(u32 in, int uimm)
+{
+	int i = (int)PPCGETL(in);
+
+	if (i < 2)
+	{
+		if (i != 0)
+			m_flags |= PPCF_64;
+
+		m_opcode = StringFromFormat("%si", cmpname[uimm * 2 + i]);
+
+		i = (int)PPCGETCRD(in);
+		if (i != 0)
+		{
+			m_operands += StringFromFormat("cr%c, ", '0' + i);
+		}
+
+		m_operands += imm(in, uimm, 2, false);
+	}
+	else
+	{
+		ill(in);
+	}
+}
+
+
+void GekkoDisassembler::addi(u32 in, const std::string& ext)
+{
+	if ((in & 0x08000000) && !PPCGETA(in))
+	{
+		m_opcode = StringFromFormat("l%s", ext.c_str());  // li, lis
+
+		if (ext == "i")
+			m_operands = imm(in, 0, 3, false);
+		else
+			m_operands = imm(in, 1, 3, true);
+	}
+	else
+	{
+		m_opcode = StringFromFormat("%s%s", (in & 0x8000) ? "sub" : "add", ext.c_str());
+
+		if (in & 0x8000)
+			in = (in ^ 0xffff) + 1;
+
+		m_operands = imm(in, 1, 0, false);
+	}
+}
+
+// Build a branch instr. and return number of chars written to operand.
+size_t GekkoDisassembler::branch(u32 in, const char* bname, int aform, int bdisp)
+{
+	int bo = (int)PPCGETD(in);
+	int bi = (int)PPCGETA(in);
+	char y = (char)(bo & 1);
+	const char* ext = b_ext[aform * 2 + (int)(in & 1)];
+
+	if (bdisp < 0)
+		y ^= 1;
+	y = (y != 0) ? '+' : '-';
+
+	if (bo & 4)
+	{
+		// standard case - no decrement
+		if (bo & 16)
+		{
+			// branch always
+			if (PPCGETIDX(in) != 16)
+			{
+				m_opcode = StringFromFormat("b%s%s", bname, ext);
+			}
+			else
+			{
+				m_opcode = StringFromFormat("bc%s", ext);
+				m_operands = StringFromFormat("%d, %d", bo, bi);
+			}
+		}
+		else // Branch conditional
+		{
+			m_opcode = StringFromFormat("b%s%s%s%c", b_condition[((bo & 8) >> 1) + (bi & 3)], bname, ext, y);
+
+			if (bi >= 4)
+			{
+				m_operands = StringFromFormat("cr%d", bi >> 2);
+			}
+		}
+	}
+	else
+	{
+		// CTR is decremented and checked
+		m_opcode = StringFromFormat("bd%s%s%s%c", b_decr[bo >> 1], bname, ext, y);
+
+		if ((bo & 16) == 0)
+		{
+			m_operands = StringFromFormat("%d", bi);
+		}
+	}
+
+	return m_operands.length();
+}
+
+
+void GekkoDisassembler::bc(u32 in)
+{
+	unsigned int d = (int)(in & 0xfffc);
+
+	if (d & 0x8000)
+		d |= 0xffff0000;
+
+	branch(in, "", (in & 2) ? 1 : 0, d);
+
+	if (in & 2)  // AA ?
+		m_operands = StringFromFormat("%s ->0x%.8X", m_operands.c_str(), d);
+	else
+		m_operands = StringFromFormat("%s ->0x%.8X", m_operands.c_str(), *m_iaddr + d);
+
+	m_type = PPCINSTR_BRANCH;
+	m_displacement = d;
+}
+
+
+void GekkoDisassembler::bli(u32 in)
+{
+	unsigned int d = (unsigned int)(in & 0x3fffffc);
+
+	if (d & 0x02000000)
+		d |= 0xfc000000;
+
+	m_opcode = StringFromFormat("b%s", b_ext[in & 3]);
+
+	if (in & 2)  // AA ?
+		m_operands = StringFromFormat("->0x%.8X", d);
+	else
+		m_operands = StringFromFormat("->0x%.8X", *m_iaddr + d);
+
+	m_type = PPCINSTR_BRANCH;
+	m_displacement = d;
+}
+
+
+void GekkoDisassembler::mcrf(u32 in, char c)
+{
+	if ((in & 0x0063f801) == 0)
+	{
+		m_opcode = StringFromFormat("mcrf%c", c);
+		m_operands = StringFromFormat("cr%d, cr%d", (int)PPCGETCRD(in), (int)PPCGETCRA(in));
+	}
+	else
+	{
+		ill(in);
+	}
+}
+
+
+void GekkoDisassembler::crop(u32 in, const char* n1, const char* n2)
+{
+	int crd = (int)PPCGETD(in);
+	int cra = (int)PPCGETA(in);
+	int crb = (int)PPCGETB(in);
+
+	if ((in & 1) == 0)
+	{
+		m_opcode = StringFromFormat("cr%s", (cra == crb && n2) ? n2 : n1);
+		if (cra == crb && n2)
+			m_operands = StringFromFormat("%d, %d", crd, cra);
+		else
+			m_operands = StringFromFormat("%d, %d, %d", crd, cra, crb);
+	}
+	else
+	{
+		ill(in);
+	}
+}
+
+
+void GekkoDisassembler::nooper(u32 in, const char* name, unsigned char dmode)
+{
+	if (in & (PPCDMASK | PPCAMASK | PPCBMASK | 1))
+	{
+		ill(in);
+	}
+	else
+	{
+		m_flags |= dmode;
+		m_opcode = name;
+	}
+}
+
+void GekkoDisassembler::rlw(u32 in, const char* name, int i)
+{
+	int s = (int)PPCGETD(in);
+	int a = (int)PPCGETA(in);
+	int bsh = (int)PPCGETB(in);
+	int mb = (int)PPCGETC(in);
+	int me = (int)PPCGETM(in);
+
+	m_opcode = StringFromFormat("rlw%s%c", name, in & 1 ? '.' : '\0');
+	m_operands = StringFromFormat("%s, %s, %s%d, %d, %d (%08x)", regnames[a], regnames[s], regsel[i], bsh, mb, me, HelperRotateMask(bsh, mb, me));
+}
+
+
+void GekkoDisassembler::ori(u32 in, const char* name)
+{
+	m_opcode = name;
+	m_operands = imm(in, 1, 1, true);
+}
+
+
+void GekkoDisassembler::rld(u32 in, const char* name, int i)
+{
+	int s = (int)PPCGETD(in);
+	int a = (int)PPCGETA(in);
+	int bsh = i ? (int)PPCGETB(in) : (int)(((in & 2) << 4) + PPCGETB(in));
+	int m = (int)(in & 0x7e0) >> 5;
+
+	m_flags |= PPCF_64;
+	m_opcode = StringFromFormat("rld%s%c", name, in & 1 ? '.' : '\0');
+	m_operands = StringFromFormat("%s, %s, %s%d, %d", regnames[a], regnames[s], regsel[i], bsh, m);
+}
+
+
+void GekkoDisassembler::cmp(u32 in)
+{
+	int i = (int)PPCGETL(in);
+
+	if (i < 2)
+	{
+		if (i != 0)
+			m_flags |= PPCF_64;
+
+		m_opcode = cmpname[((in&PPCIDX2MASK) ? 2 : 0) + i];
+
+		i = (int)PPCGETCRD(in);
+		if (i != 0)
+			m_operands += StringFromFormat("cr%c,", '0' + i);
+
+		m_operands += ra_rb(in);
+	}
+	else
+	{
+		ill(in);
+	}
+}
+
+
+void GekkoDisassembler::trap(u32 in, unsigned char dmode)
+{
+	int to = (int)PPCGETD(in);
+	const char* cnd = trap_condition[to];
+
+	if (cnd != nullptr)
+	{
+		m_flags |= dmode;
+		m_opcode = StringFromFormat("t%c%s", dmode ? 'd' : 'w', cnd);
+		m_operands = ra_rb(in);
+	}
+	else
+	{
+		if (to == 31)
+		{
+			if (dmode)
+			{
+				m_flags |= dmode;
+				m_opcode = "td";
+				m_operands = "31,0,0";
+			}
+			else
+			{
+				m_opcode = "trap";
+			}
+		}
+		else
+		{
+			ill(in);
+		}
+	}
+}
+
+// Standard instruction: xxxx rD,rA,rB
+void GekkoDisassembler::dab(u32 in, const char* name, int mask, int smode, int chkoe, int chkrc, unsigned char dmode)
+{
+	if (chkrc >= 0 && ((in & 1) != (unsigned int)chkrc))
+	{
+		ill(in);
+	}
+	else
+	{
+		m_flags |= dmode;
+
+		// rA,rS,rB
+		if (smode)
+			in = swapda(in);
+
+		m_opcode = StringFromFormat("%s%s%s", name, oesel[chkoe && (in&PPCOE)], rcsel[(chkrc < 0) && (in & 1)]);
+		m_operands = rd_ra_rb(in, mask);
+	}
+}
+
+// Last operand is no register: xxxx rD,rA,NB
+void GekkoDisassembler::rrn(u32 in, const char* name, int smode, int chkoe, int chkrc, unsigned char dmode)
+{
+	if (chkrc >= 0 && ((in & 1) != (unsigned int)chkrc))
+	{
+		ill(in);
+	}
+	else
+	{
+		m_flags |= dmode;
+
+		// rA,rS,NB
+		if (smode)
+			in = swapda(in);
+
+		m_opcode = StringFromFormat("%s%s%s", name, oesel[chkoe && (in&PPCOE)], rcsel[(chkrc < 0) && (in & 1)]);
+
+		m_operands = rd_ra_rb(in, 6);
+		m_operands += StringFromFormat(",%d",(int)PPCGETB(in));
+	}
+}
+
+
+void GekkoDisassembler::mtcr(u32 in)
+{
+	int s = (int)PPCGETD(in);
+	int crm = (int)(in & 0x000ff000) >> 12;
+
+	if (in & 0x00100801)
+	{
+		ill(in);
+	}
+	else
+	{
+		m_opcode = StringFromFormat("mtcr%c", crm == 0xff ? '\0' : 'f');
+
+		if (crm != 0xff)
+			m_operands += StringFromFormat("0x%02x,", crm);
+
+		m_operands += regnames[s];
+	}
+}
+
+
+void GekkoDisassembler::msr(u32 in, int smode)
+{
+	int s = (int)PPCGETD(in);
+	int sr = (int)(in & 0x000f0000) >> 16;
+
+	if (in & 0x0010f801)
+	{
+		ill(in);
+	}
+	else
+	{
+		m_flags |= PPCF_SUPER;
+		m_opcode = StringFromFormat("m%csr", smode ? 't' : 'f');
+
+		if (smode)
+			m_operands = StringFromFormat("%d, %s", sr, regnames[s]);
+		else
+			m_operands = StringFromFormat("%s, %d", regnames[s], sr);
+	}
+}
+
+
+void GekkoDisassembler::mspr(u32 in, int smode)
+{
+	int d = (int)PPCGETD(in);
+	int spr = (int)((PPCGETB(in) << 5) + PPCGETA(in));
+	int fmt = 0;
+
+	if (in & 1)
+	{
+		ill(in);
+	}
+	else
+	{
+		if (spr != 1 && spr != 8 && spr != 9)
+			m_flags |= PPCF_SUPER;
+
+		const char* x;
+		switch (spr)
+		{
+		case 1:
+			x = "xer";
+			break;
+
+		case 8:
+			x = "lr";
+			break;
+
+		case 9:
+			x = "ctr";
+			break;
+
+		default:
+			x = "spr";
+			fmt = 1;
+			break;
+		}
+
+		m_opcode = StringFromFormat("m%c%s", smode ? 't' : 'f', x);
+
+		if (fmt)
+		{
+			if (smode)
+				m_operands = StringFromFormat("%s, %s", spr_name(spr).c_str(), regnames[d]);
+			else
+				m_operands = StringFromFormat("%s, %s", regnames[d], spr_name(spr).c_str());
+		}
+		else
+		{
+			m_operands = regnames[d];
+		}
+	}
+}
+
+
+void GekkoDisassembler::mtb(u32 in)
+{
+	int d = (int)PPCGETD(in);
+	int tbr = (int)((PPCGETB(in) << 5) + PPCGETA(in));
+
+	if (in & 1)
+	{
+		ill(in);
+	}
+	else
+	{
+		m_operands += regnames[d];
+
+		char x;
+		switch (tbr)
+		{
+		case 268:
+			x = 'l';
+			break;
+
+		case 269:
+			x = 'u';
+			break;
+
+		default:
+			x = '\0';
+			m_flags |= PPCF_SUPER;
+			m_operands += StringFromFormat(",%d", tbr);
+			break;
+		}
+
+		m_opcode = StringFromFormat("mftb%c", x);
+	}
+}
+
+
+void GekkoDisassembler::sradi(u32 in)
+{
+	int s = (int)PPCGETD(in);
+	int a = (int)PPCGETA(in);
+	int bsh = (int)(((in & 2) << 4) + PPCGETB(in));
+
+	m_flags |= PPCF_64;
+	m_opcode = StringFromFormat("sradi%c", in & 1 ? '.' : '\0');
+	m_operands = StringFromFormat("%s, %s, %d", regnames[a], regnames[s], bsh);
+}
+
+void GekkoDisassembler::ldst(u32 in, const char* name, char reg, unsigned char dmode)
+{
+	int s = (int)PPCGETD(in);
+	int a = (int)PPCGETA(in);
+	int d = (u32)(in & 0xffff);
+
+	m_type = PPCINSTR_LDST;
+	m_flags |= dmode;
+	m_sreg = (short)a;
+	//  if (d >= 0x8000)
+	//    d -= 0x10000;
+	m_displacement = (u32)d;
+	m_opcode = name;
+
+	if (reg == 'r')
+	{
+		m_operands = StringFromFormat("%s, %s (%s)", regnames[s], ldst_offs(d).c_str(), regnames[a]);
+	}
+	else
+	{
+		m_operands = StringFromFormat("%c%d, %s (%s)", reg, s, ldst_offs(d).c_str(), regnames[a]);
+	}
+}
+
+// Standard floating point instruction: xxxx fD,fA,fC,fB
+void GekkoDisassembler::fdabc(u32 in, const char* name, int mask, unsigned char dmode)
+{
+	int err = 0;
+
+	m_flags |= dmode;
+	m_opcode = StringFromFormat("f%s%s", name, rcsel[in & 1]);
+	m_operands += StringFromFormat("f%d,", (int)PPCGETD(in));
+
+	if (mask & 4)
+		m_operands += StringFromFormat("f%d,", (int)PPCGETA(in));
+	else
+		err |= (int)PPCGETA(in);
+
+	if (mask & 2)
+		m_operands += StringFromFormat("f%d,", (int)PPCGETC(in));
+	else if (PPCGETC(in))
+		err |= (int)PPCGETC(in);
+
+	if (mask & 1)
+		m_operands += StringFromFormat("f%d,", (int)PPCGETB(in));
+	else if (!(mask & 8))
+		err |= (int)PPCGETB(in);
+
+	// Drop the trailing comma
+	m_operands.pop_back();
+
+	if (err)
+		ill(in);
+}
+
+void GekkoDisassembler::fmr(u32 in)
+{
+	m_opcode = StringFromFormat("fmr%s", rcsel[in & 1]);
+	m_operands = StringFromFormat("f%d, f%d", (int)PPCGETD(in), (int)PPCGETB(in));
+}
+
+// Indexed float instruction: xxxx fD,rA,rB
+void GekkoDisassembler::fdab(u32 in, const char* name, int mask)
+{
+	m_opcode = name;
+	m_operands = fd_ra_rb(in, mask);
+}
+
+
+void GekkoDisassembler::fcmp(u32 in, char c)
+{
+	if (in & 0x00600001)
+	{
+		ill(in);
+	}
+	else
+	{
+		m_opcode = StringFromFormat("fcmp%c", c);
+		m_operands = StringFromFormat("cr%d,f%d,f%d", (int)PPCGETCRD(in), (int)PPCGETA(in), (int)PPCGETB(in));
+	}
+}
+
+
+void GekkoDisassembler::mtfsb(u32 in, int n)
+{
+	if (in & (PPCAMASK | PPCBMASK))
+	{
+		ill(in);
+	}
+	else
+	{
+		m_opcode = StringFromFormat("mtfsb%d%s", n, rcsel[in & 1]);
+		m_operands = StringFromFormat("%d", (int)PPCGETD(in));
+	}
+}
+
+
+// Paired instructions
+
+#define RA ((inst >> 16) & 0x1f)
+#define RB ((inst >> 11) & 0x1f)
+#define RC ((inst >> 6) & 0x1f)
+#define RD ((inst >> 21) & 0x1f)
+#define RS ((inst >> 21) & 0x1f)
+#define FA ((inst >> 16) & 0x1f)
+#define FB ((inst >> 11) & 0x1f)
+#define FC ((inst >> 6) & 0x1f)
+#define FD ((inst >> 21) & 0x1f)
+#define FS ((inst >> 21) & 0x1f)
+#define IMM (inst & 0xffff)
+#define UIMM (inst & 0xffff)
+#define OFS (inst & 0xffff)
+#define OPCD ((inst >> 26) & 0x3f)
+#define XO_10 ((inst >> 1) & 0x3ff)
+#define XO_9 ((inst >> 1) & 0x1ff)
+#define XO_5 ((inst >> 1) & 0x1f)
+#define Rc (inst & 1)
+#define SH ((inst >> 11) & 0x1f)
+#define MB ((inst >> 6) & 0x1f)
+#define ME ((inst >> 1) & 0x1f)
+#define OE ((inst >> 10) & 1)
+#define TO ((inst >> 21) & 0x1f)
+#define CRFD ((inst >> 23) & 0x7)
+#define CRFS ((inst >> 18) & 0x7)
+#define CRBD ((inst >> 21) & 0x1f)
+#define CRBA ((inst >> 16) & 0x1f)
+#define CRBB ((inst >> 11) & 0x1f)
+#define L ((inst >> 21) & 1)
+#define NB ((inst >> 11) & 0x1f)
+#define AA ((inst >> 1) & 1)
+#define LK (inst & 1)
+#define LI ((inst >> 2) & 0xffffff)
+#define BO ((inst >> 21) & 0x1f)
+#define BI ((inst >> 16) & 0x1f)
+#define BD ((inst >> 2) & 0x3fff)
+
+#define MTFSFI_IMM ((inst >> 12) & 0xf)
+#define FM ((inst >> 17) & 0xff)
+#define SR ((inst >> 16) & 0xf)
+#define SPR ((inst >> 11) & 0x3ff)
+#define TBR ((inst >> 11) & 0x3ff)
+#define CRM ((inst >> 12) & 0xff)
+
+#define I ((inst >> 12) & 0x7)
+#define W ((inst >> 15) & 0x1)
+#define IX ((inst >> 7) & 0x7)
+#define WX ((inst >> 10) & 0x1)
+
+
+void GekkoDisassembler::ps(u32 inst)
+{
+	switch ((inst >> 1) & 0x1F)
+	{
+	case 6:
+		m_opcode = inst & 0x40 ? "psq_lux" : "psq_lx";
+		m_operands = StringFromFormat("p%u, (r%u + r%u), %d, qr%d", FD, RA, RB, WX, IX);
+		return;
+
+	case 7:
+		m_opcode = inst & 0x40 ? "psq_stux" : "psq_stx";
+		m_operands = StringFromFormat("p%u, r%u, r%u, %d, qr%d", FS, RA, RB, WX, IX);
+		return;
+
+	case 18:
+		m_opcode = "ps_div";
+		m_operands = StringFromFormat("p%u, p%u/p%u", FD, FA, FB);
+		return;
+
+	case 20:
+		m_opcode = "ps_sub";
+		m_operands = StringFromFormat("p%u, p%u-p%u", FD, FA, FB);
+		return;
+
+	case 21:
+		m_opcode = "ps_add";
+		m_operands = StringFromFormat("p%u, p%u+p%u", FD, FA, FB);
+		return;
+
+	case 23:
+		m_opcode = "ps_sel";
+		m_operands = StringFromFormat("p%u>=0?p%u:p%u", FD, FA, FC);
+		return;
+
+	case 24:
+		m_opcode = "ps_res";
+		m_operands = StringFromFormat("p%u, (1/p%u)", FD, FB);
+		return;
+
+	case 25:
+		m_opcode = "ps_mul";
+		m_operands = StringFromFormat("p%u, p%u*p%u", FD, FA, FC);
+		return;
+
+	case 26: // rsqrte
+		m_opcode = "ps_rsqrte";
+		m_operands = StringFromFormat("p%u, p%u", FD, FB);
+		return;
+
+	case 28: // msub
+		m_opcode = "ps_msub";
+		m_operands = StringFromFormat("p%u, p%u*p%u-p%u", FD, FA, FC, FB);
+		return;
+
+	case 29: // madd
+		m_opcode = "ps_madd";
+		m_operands = StringFromFormat("p%u, p%u*p%u+p%u", FD, FA, FC, FB);
+		return;
+
+	case 30: // nmsub
+		m_opcode = "ps_nmsub";
+		m_operands = StringFromFormat("p%u, -(p%u*p%u-p%u)", FD, FA, FC, FB);
+		return;
+
+	case 31: // nmadd
+		m_opcode = "ps_nmadd";
+		m_operands = StringFromFormat("p%u, -(p%u*p%u+p%u)", FD, FA, FC, FB);
+		return;
+
+	case 10:
+		m_opcode = "ps_sum0";
+		m_operands = StringFromFormat("p%u, 0=p%u+p%u, 1=p%u", FD, FA, FB, FC);
+		return;
+
+	case 11:
+		m_opcode = "ps_sum1";
+		m_operands = StringFromFormat("p%u, 0=p%u, 1=p%u+p%u", FD, FC, FA, FB);
+		return;
+
+	case 12:
+		m_opcode = "ps_muls0";
+		m_operands = StringFromFormat("p%u, p%u*p%u[0]", FD, FA, FC);
+		return;
+
+	case 13:
+		m_opcode = "ps_muls1";
+		m_operands = StringFromFormat("p%u, p%u*p%u[1]", FD, FA, FC);
+		return;
+
+	case 14:
+		m_opcode = "ps_madds0";
+		m_operands = StringFromFormat("p%u, p%u*p%u[0]+p%u", FD, FA, FC, FB);
+		return;
+
+	case 15:
+		m_opcode = "ps_madds1";
+		m_operands = StringFromFormat("p%u, p%u*p%u[1]+p%u", FD, FA, FC, FB);
+		return;
+	}
+
+	switch ((inst >> 1) & 0x3FF)
+	{
+		// 10-bit suckers  (?)
+	case 40: // nmadd
+		m_opcode = "ps_neg";
+		m_operands = StringFromFormat("p%u, -p%u", FD, FB);
+		return;
+
+	case 72: // nmadd
+		m_opcode = "ps_mr";
+		m_operands = StringFromFormat("p%u, p%u", FD, FB);
+		return;
+
+	case 136:
+		m_opcode = "ps_nabs";
+		m_operands = StringFromFormat("p%u, -|p%u|", FD, FB);
+		return;
+
+	case 264:
+		m_opcode = "ps_abs";
+		m_operands = StringFromFormat("p%u, |p%u|", FD, FB);
+		return;
+
+	case 0:
+	case 32:
+	case 64:
+	case 96:
+	{
+		m_opcode = ps_cmpname[(inst >> 6) & 0x3];
+
+		int i = (int)PPCGETCRD(inst);
+		if (i != 0)
+			m_operands += StringFromFormat("cr%c, ", '0' + i);
+		m_operands += StringFromFormat("p%u, p%u", FA, FB);
+		return;
+	}
+	case 528:
+		m_opcode = "ps_merge00";
+		m_operands = StringFromFormat("p%u, p%u[0],p%u[0]", FD, FA, FB);
+		return;
+
+	case 560:
+		m_opcode = "ps_merge01";
+		m_operands = StringFromFormat("p%u, p%u[0],p%u[1]", FD, FA, FB);
+		return;
+
+	case 592:
+		m_opcode = "ps_merge10";
+		m_operands = StringFromFormat("p%u, p%u[1],p%u[0]", FD, FA, FB);
+		return;
+
+	case 624:
+		m_opcode = "ps_merge11";
+		m_operands = StringFromFormat("p%u, p%u[1],p%u[1]", FD, FA, FB);
+		return;
+
+	case 1014:
+		if (inst & PPCDMASK)
+			ill(inst);
+		else
+			dab(inst, "dcbz_l", 3, 0, 0, 0, 0);
+	}
+
+	//	default:
+	m_opcode = StringFromFormat("ps_%i", ((inst >> 1) & 0x1f));
+	m_operands = "---";
+}
+
+void GekkoDisassembler::ps_mem(u32 inst)
+{
+	switch (PPCGETIDX(inst))
+	{
+	case 56:
+		m_opcode = "psq_l";
+		m_operands = StringFromFormat("p%u, %i(r%u), %d, qr%d", RS, SEX12(inst & 0xFFF), RA, W, I);
+		break;
+
+	case 57:
+		m_opcode = "psq_lu";
+		m_operands = StringFromFormat("p%u, %i(r%u), %d, qr%d", RS, SEX12(inst & 0xFFF), RA, W, I);;
+		break;
+
+	case 60:
+		m_opcode = "psq_st";
+		m_operands = StringFromFormat("p%u, %i(r%u), %d, qr%d", RS, SEX12(inst & 0xFFF), RA, W, I);
+		break;
+
+	case 61:
+		m_opcode = "psq_stu";
+		m_operands = StringFromFormat("p%u, %i(r%u), %d, qr%d", RS, SEX12(inst & 0xFFF), RA, W, I);
+		break;
+	}
+}
+
+// Disassemble PPC instruction and return a pointer to the next
+// instruction, or nullptr if an error occured.
+u32* GekkoDisassembler::DoDisassembly(bool big_endian)
+{
+	u32 in = *m_instr;
+
+	if (!big_endian)
+	{
+		in = (in & 0xff) << 24 | (in & 0xff00) << 8 | (in & 0xff0000) >> 8 |
+		     (in & 0xff000000) >> 24;
+	}
+
+	m_opcode.clear();
+	m_operands.clear();
+	m_type = PPCINSTR_OTHER;
+	m_flags = 0;
+
+	switch (PPCGETIDX(in))
+	{
+	case 2:
+		trapi(in, PPCF_64); // tdi
+		break;
+
+	case 3:
+		trapi(in, 0); // twi
+		break;
+
+	case 4:
+		ps(in);
+		break;
+
+	case 56:
+	case 57:
+	case 60:
+	case 61:
+		ps_mem(in);
+		break;
+
+	case 7:
+		m_opcode = "mulli";
+		m_operands = imm(in, 0, 0, false);
+		break;
+
+	case 8:
+		m_opcode = "subfic";
+		m_operands = imm(in, 0, 0, false);
+		break;
+
+	case 10:
+		cmpi(in, 1);      // cmpli
+		break;
+
+	case 11:
+		cmpi(in, 0);      // cmpi
+		break;
+
+	case 12:
+		addi(in, "ic");   // addic
+		break;
+
+	case 13:
+		addi(in, "ic.");  // addic.
+		break;
+
+	case 14:
+		addi(in, "i");    // addi
+		break;
+
+	case 15:
+		addi(in, "is");   // addis
+		break;
+
+	case 16:
+		bc(in);
+		break;
+
+	case 17:
+		if ((in & ~PPCIDXMASK) == 2)
+			m_opcode = "sc";
+		else
+			ill(in);
+		break;
+
+	case 18:
+		bli(in);
+		break;
+
+	case 19:
+		switch (PPCGETIDX2(in))
+		{
+		case 0:
+			mcrf(in, '\0');  // mcrf
+			break;
+
+		case 16:
+			branch(in, "lr", 0, 0);    // bclr
+			break;
+
+		case 33:
+			crop(in, "nor", "not");    // crnor
+			break;
+
+		case 50:
+			nooper(in, "rfi", PPCF_SUPER);
+			break;
+
+		case 129:
+			crop(in, "andc", nullptr); // crandc
+			break;
+
+		case 150:
+			nooper(in, "isync", 0);
+			break;
+
+		case 193:
+			crop(in, "xor", "clr");    // crxor
+			break;
+
+		case 225:
+			crop(in, "nand", nullptr); // crnand
+			break;
+
+		case 257:
+			crop(in, "and", nullptr);  // crand
+			break;
+
+		case 289:
+			crop(in, "eqv", "set");    // creqv
+			break;
+
+		case 417:
+			crop(in, "orc", nullptr);  // crorc
+			break;
+
+		case 449:
+			crop(in, "or", "move");    // cror
+			break;
+
+		case 528:
+			branch(in, "ctr", 0, 0);   // bcctr
+			break;
+
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 20:
+		rlw(in, "imi", 0); // rlwimi
+		break;
+
+	case 21:
+		rlw(in, "inm", 0); // rlwinm
+		break;
+
+	case 23:
+		rlw(in, "nm", 1);  // rlwnm
+		break;
+
+	case 24:
+		if (in & ~PPCIDXMASK)
+			ori(in, "ori");
+		else
+			m_opcode = "nop";
+		break;
+
+	case 25:
+		ori(in, "oris");
+		break;
+
+	case 26:
+		ori(in, "xori");
+		break;
+
+	case 27:
+		ori(in, "xoris");
+		break;
+
+	case 28:
+		ori(in, "andi.");
+		break;
+
+	case 29:
+		ori(in, "andis.");
+		break;
+
+	case 30:
+		switch (in & 0x1c)
+		{
+		case 0:
+			rld(in, "icl", 0);  // rldicl
+			break;
+		case 1:
+			rld(in, "icr", 0);  // rldicr
+			break;
+		case 2:
+			rld(in, "ic", 0);   // rldic
+			break;
+		case 3:
+			rld(in, "imi", 0);  // rldimi
+			break;
+		case 4:
+			rld(in, in & 2 ? "cl" : "cr", 1); // rldcl, rldcr
+			break;
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 31:
+		switch (PPCGETIDX2(in))
+		{
+		case 0:
+		case 32:
+			if (in & 1)
+				ill(in);
+			else
+				cmp(in); // cmp, cmpl
+			break;
+
+		case 4:
+			if (in & 1)
+				ill(in);
+			else
+				trap(in, 0); // tw
+			break;
+
+		case 8:
+		case (PPCOE >> 1) + 8:
+			dab(swapab(in), "subc", 7, 0, 1, -1, 0);
+			break;
+
+		case 9:
+			dab(in, "mulhdu", 7, 0, 0, -1, PPCF_64);
+			break;
+
+		case 10:
+		case (PPCOE >> 1) + 10:
+			dab(in, "addc", 7, 0, 1, -1, 0);
+			break;
+
+		case 11:
+			dab(in, "mulhwu", 7, 0, 0, -1, 0);
+			break;
+
+		case 19:
+			if (in & (PPCAMASK | PPCBMASK))
+				ill(in);
+			else
+				dab(in, "mfcr", 4, 0, 0, 0, 0);
+			break;
+
+		case 20:
+			dab(in, "lwarx", 7, 0, 0, 0, 0);
+			break;
+
+		case 21:
+			dab(in, "ldx", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 23:
+			dab(in, "lwzx", 7, 0, 0, 0, 0);
+			break;
+
+		case 24:
+			dab(in, "slw", 7, 1, 0, -1, 0);
+			break;
+
+		case 26:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "cntlzw", 6, 1, 0, -1, 0);
+			break;
+
+		case 27:
+			dab(in, "sld", 7, 1, 0, -1, PPCF_64);
+			break;
+
+		case 28:
+			dab(in, "and", 7, 1, 0, -1, 0);
+			break;
+
+		case 40:
+		case (PPCOE >> 1) + 40:
+			dab(swapab(in), "sub", 7, 0, 1, -1, 0);
+			break;
+
+		case 53:
+			dab(in, "ldux", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 54:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbst", 3, 0, 0, 0, 0);
+			break;
+
+		case 55:
+			dab(in, "lwzux", 7, 0, 0, 0, 0);
+			break;
+
+		case 58:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "cntlzd", 6, 1, 0, -1, PPCF_64);
+			break;
+
+		case 60:
+			dab(in, "andc", 7, 1, 0, -1, 0);
+			break;
+
+		case 68:
+			trap(in, PPCF_64); // td
+			break;
+
+		case 73:
+			dab(in, "mulhd", 7, 0, 0, -1, PPCF_64);
+			break;
+
+		case 75:
+			dab(in, "mulhw", 7, 0, 0, -1, 0);
+			break;
+
+		case 83:
+			if (in & (PPCAMASK | PPCBMASK))
+				ill(in);
+			else
+				dab(in, "mfmsr", 4, 0, 0, 0, PPCF_SUPER);
+			break;
+
+		case 84:
+			dab(in, "ldarx", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 86:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbf", 3, 0, 0, 0, 0);
+			break;
+
+		case 87:
+			dab(in, "lbzx", 7, 0, 0, 0, 0);
+			break;
+
+		case 104:
+		case (PPCOE >> 1) + 104:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "neg", 6, 0, 1, -1, 0);
+			break;
+
+		case 119:
+			dab(in, "lbzux", 7, 0, 0, 0, 0);
+			break;
+
+		case 124:
+			if (PPCGETD(in) == PPCGETB(in))
+				dab(in, "not", 6, 1, 0, -1, 0);
+			else
+				dab(in, "nor", 7, 1, 0, -1, 0);
+			break;
+
+		case 136:
+		case (PPCOE >> 1) + 136:
+			dab(in, "subfe", 7, 0, 1, -1, 0);
+			break;
+
+		case 138:
+		case (PPCOE >> 1) + 138:
+			dab(in, "adde", 7, 0, 1, -1, 0);
+			break;
+
+		case 144:
+			mtcr(in);
+			break;
+
+		case 146:
+			if (in & (PPCAMASK | PPCBMASK))
+				ill(in);
+			else
+				dab(in, "mtmsr", 4, 0, 0, 0, PPCF_SUPER);
+			break;
+
+		case 149:
+			dab(in, "stdx", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 150:
+			dab(in, "stwcx.", 7, 0, 0, 1, 0);
+			break;
+
+		case 151:
+			dab(in, "stwx", 7, 0, 0, 0, 0);
+			break;
+
+		case 181:
+			dab(in, "stdux", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 183:
+			dab(in, "stwux", 7, 0, 0, 0, 0);
+			break;
+
+		case 200:
+		case (PPCOE >> 1) + 200:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "subfze", 6, 0, 1, -1, 0);
+			break;
+
+		case 202:
+		case (PPCOE >> 1) + 202:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "addze", 6, 0, 1, -1, 0);
+			break;
+
+		case 210:
+			msr(in, 1); // mfsr
+			break;
+
+		case 214:
+			dab(in, "stdcx.", 7, 0, 0, 1, PPCF_64);
+			break;
+
+		case 215:
+			dab(in, "stbx", 7, 0, 0, 0, 0);
+			break;
+
+		case 232:
+		case (PPCOE >> 1) + 232:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "subfme", 6, 0, 1, -1, 0);
+			break;
+
+		case 233:
+		case (PPCOE >> 1) + 233:
+			dab(in, "mulld", 7, 0, 1, -1, PPCF_64);
+			break;
+
+		case 234:
+		case (PPCOE >> 1) + 234:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "addme", 6, 0, 1, -1, 0);
+			break;
+
+		case 235:
+		case (PPCOE >> 1) + 235:
+			dab(in, "mullw", 7, 0, 1, -1, 0);
+			break;
+
+		case 242:
+			if (in & PPCAMASK)
+				ill(in);
+			else
+				dab(in, "mtsrin", 5, 0, 0, 0, PPCF_SUPER);
+			break;
+
+		case 246:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbtst", 3, 0, 0, 0, 0);
+			break;
+
+		case 247:
+			dab(in, "stbux", 7, 0, 0, 0, 0);
+			break;
+
+		case 266:
+		case (PPCOE >> 1) + 266:
+			dab(in, "add", 7, 0, 1, -1, 0);
+			break;
+
+		case 278:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbt", 3, 0, 0, 0, 0);
+			break;
+
+		case 279:
+			dab(in, "lhzx", 7, 0, 0, 0, 0);
+			break;
+
+		case 284:
+			dab(in, "eqv", 7, 1, 0, -1, 0);
+			break;
+
+		case 306:
+			if (in & (PPCDMASK | PPCAMASK))
+				ill(in);
+			else
+				dab(in, "tlbie", 1, 0, 0, 0, PPCF_SUPER);
+			break;
+
+		case 310:
+			dab(in, "eciwx", 7, 0, 0, 0, 0);
+			break;
+
+		case 311:
+			dab(in, "lhzux", 7, 0, 0, 0, 0);
+			break;
+
+		case 316:
+			dab(in, "xor", 7, 1, 0, -1, 0);
+			break;
+
+		case 339:
+			mspr(in, 0); // mfspr
+			break;
+
+		case 341:
+			dab(in, "lwax", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 343:
+			dab(in, "lhax", 7, 0, 0, 0, 0);
+			break;
+
+		case 370:
+			nooper(in, "tlbia", PPCF_SUPER);
+			break;
+
+		case 371:
+			mtb(in); // mftb
+			break;
+
+		case 373:
+			dab(in, "lwaux", 7, 0, 0, 0, PPCF_64);
+			break;
+
+		case 375:
+			dab(in, "lhaux", 7, 0, 0, 0, 0);
+			break;
+
+		case 407:
+			dab(in, "sthx", 7, 0, 0, 0, 0);
+			break;
+
+		case 412:
+			dab(in, "orc", 7, 1, 0, -1, 0);
+			break;
+
+		case 413:
+			sradi(in); // sradi
+			break;
+
+		case 434:
+			if (in & (PPCDMASK | PPCAMASK))
+				ill(in);
+			else
+				dab(in, "slbie", 1, 0, 0, 0, PPCF_SUPER | PPCF_64);
+			break;
+
+		case 438:
+			dab(in, "ecowx", 7, 0, 0, 0, 0);
+			break;
+
+		case 439:
+			dab(in, "sthux", 7, 0, 0, 0, 0);
+			break;
+
+		case 444:
+			if (PPCGETD(in) == PPCGETB(in))
+				dab(in, "mr", 6, 1, 0, -1, 0);
+			else
+				dab(in, "or", 7, 1, 0, -1, 0);
+			break;
+
+		case 457:
+		case (PPCOE >> 1) + 457:
+			dab(in, "divdu", 7, 0, 1, -1, PPCF_64);
+			break;
+
+		case 459:
+		case (PPCOE >> 1) + 459:
+			dab(in, "divwu", 7, 0, 1, -1, 0);
+			break;
+
+		case 467:
+			mspr(in, 1); // mtspr
+			break;
+
+		case 470:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbi", 3, 0, 0, 0, 0);
+			break;
+
+		case 476:
+			dab(in, "nand", 7, 1, 0, -1, 0);
+			break;
+
+		case 489:
+		case (PPCOE >> 1) + 489:
+			dab(in, "divd", 7, 0, 1, -1, PPCF_64);
+			break;
+
+		case 491:
+		case (PPCOE >> 1) + 491:
+			dab(in, "divw", 7, 0, 1, -1, 0);
+			break;
+
+		case 498:
+			nooper(in, "slbia", PPCF_SUPER | PPCF_64);
+			break;
+
+		case 512:
+			if (in & 0x007ff801)
+			{
+				ill(in);
+			}
+			else
+			{
+				m_opcode = "mcrxr";
+				m_operands = StringFromFormat("cr%d", (int)PPCGETCRD(in));
+			}
+			break;
+
+		case 533:
+			dab(in, "lswx", 7, 0, 0, 0, 0);
+			break;
+
+		case 534:
+			dab(in, "lwbrx", 7, 0, 0, 0, 0);
+			break;
+
+		case 535:
+			fdab(in, "lfsx", 7);
+			break;
+
+		case 536:
+			dab(in, "srw", 7, 1, 0, -1, 0);
+			break;
+
+		case 539:
+			dab(in, "srd", 7, 1, 0, -1, PPCF_64);
+			break;
+
+		case 566:
+			nooper(in, "tlbsync", PPCF_SUPER);
+			break;
+
+		case 567:
+			fdab(in, "lfsux", 7);
+			break;
+
+		case 595:
+			msr(in, 0); // mfsr
+			break;
+
+		case 597:
+			rrn(in, "lswi", 0, 0, 0, 0);
+			break;
+
+		case 598:
+			nooper(in, "sync", PPCF_SUPER);
+			break;
+
+		case 599:
+			fdab(in, "lfdx", 7);
+			break;
+
+		case 631:
+			fdab(in, "lfdux", 7);
+			break;
+
+		case 659:
+			if (in & PPCAMASK)
+				ill(in);
+			else
+				dab(in, "mfsrin", 5, 0, 0, 0, PPCF_SUPER);
+			break;
+
+		case 661:
+			dab(in, "stswx", 7, 0, 0, 0, 0);
+			break;
+
+		case 662:
+			dab(in, "stwbrx", 7, 0, 0, 0, 0);
+			break;
+
+		case 663:
+			fdab(in, "stfsx", 7);
+			break;
+
+		case 695:
+			fdab(in, "stfsux", 7);
+			break;
+
+		case 725:
+			rrn(in, "stswi", 0, 0, 0, 0);
+			break;
+
+		case 727:
+			fdab(in, "stfdx", 7);
+			break;
+
+		case 759:
+			fdab(in, "stfdux", 7);
+			break;
+
+		case 790:
+			dab(in, "lhbrx", 7, 0, 0, 0, 0);
+			break;
+
+		case 792:
+			dab(in, "sraw", 7, 1, 0, -1, 0);
+			break;
+
+		case 794:
+			dab(in, "srad", 7, 1, 0, -1, PPCF_64);
+			break;
+
+		case 824:
+			rrn(in, "srawi", 1, 0, -1, 0);
+			break;
+
+		case 854:
+			nooper(in, "eieio", PPCF_SUPER);
+			break;
+
+		case 918:
+			dab(in, "sthbrx", 7, 0, 0, 0, 0);
+			break;
+
+		case 922:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "extsh", 6, 1, 0, -1, 0);
+			break;
+
+		case 954:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "extsb", 6, 1, 0, -1, 0);
+			break;
+
+		case 982:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "icbi", 3, 0, 0, 0, 0);
+			break;
+
+		case 983:
+			fdab(in, "stfiwx", 7);
+			break;
+
+		case 986:
+			if (in & PPCBMASK)
+				ill(in);
+			else
+				dab(in, "extsw", 6, 1, 0, -1, PPCF_64);
+			break;
+
+		case 1014:
+			if (in & PPCDMASK)
+				ill(in);
+			else
+				dab(in, "dcbz", 3, 0, 0, 0, 0);
+			break;
+
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 32:
+	case 33:
+	case 34:
+	case 35:
+	case 36:
+	case 37:
+	case 38:
+	case 39:
+	case 40:
+	case 41:
+	case 42:
+	case 43:
+	case 44:
+	case 45:
+	case 46:
+	case 47:
+		ldst(in, ldstnames[PPCGETIDX(in) - 32], 'r', 0);
+		break;
+
+	case 48:
+	case 49:
+	case 50:
+	case 51:
+	case 52:
+	case 53:
+	case 54:
+	case 55:
+		ldst(in, ldstnames[PPCGETIDX(in) - 32], 'f', 0);
+		break;
+
+	case 58:
+		switch (in & 3)
+		{
+		case 0:
+			ldst(in&~3, "ld", 'r', PPCF_64);
+			break;
+		case 1:
+			ldst(in&~3, "ldu", 'r', PPCF_64);
+			break;
+		case 2:
+			ldst(in&~3, "lwa", 'r', PPCF_64);
+			break;
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 59:
+		switch (in & 0x3e)
+		{
+		case 36:
+			fdabc(in, "divs", 5, 0);
+			break;
+
+		case 40:
+			fdabc(in, "subs", 5, 0);
+			break;
+
+		case 42:
+			fdabc(in, "adds", 5, 0);
+			break;
+
+		case 44:
+			fdabc(in, "sqrts", 1, 0);
+			break;
+
+		case 48:
+			fdabc(in, "res", 1, 0);
+			break;
+
+		case 50:
+			fdabc(in, "muls", 6, 0);
+			break;
+
+		case 56:
+			fdabc(in, "msubs", 7, 0);
+			break;
+
+		case 58:
+			fdabc(in, "madds", 7, 0);
+			break;
+
+		case 60:
+			fdabc(in, "nmsubs", 7, 0);
+			break;
+
+		case 62:
+			fdabc(in, "nmadds", 7, 0);
+			break;
+
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 62:
+		switch (in & 3)
+		{
+		case 0:
+			ldst(in&~3, "std", 'r', PPCF_64);
+			break;
+		case 1:
+			ldst(in&~3, "stdu", 'r', PPCF_64);
+			break;
+		default:
+			ill(in);
+			break;
+		}
+		break;
+
+	case 63:
+		if (in & 32)
+		{
+			switch (in & 0x1e)
+			{
+			case 4:
+				fdabc(in, "div", 5, 0);
+				break;
+
+			case 8:
+				fdabc(in, "sub", 5, 0);
+				break;
+
+			case 10:
+				fdabc(in, "add", 5, 0);
+				break;
+
+			case 12:
+				fdabc(in, "sqrt", 1, 0);
+				break;
+
+			case 14:
+				fdabc(in, "sel", 7, 0);
+				break;
+
+			case 18:
+				fdabc(in, "mul", 6, 0);
+				break;
+
+			case 20:
+				fdabc(in, "rsqrte", 1, 0);
+				break;
+
+			case 24:
+				fdabc(in, "msub", 7, 0);
+				break;
+
+			case 26:
+				fdabc(in, "madd", 7, 0);
+				break;
+
+			case 28:
+				fdabc(in, "nmsub", 7, 0);
+				break;
+
+			case 30:
+				fdabc(in, "nmadd", 7, 0);
+				break;
+
+			default:
+				ill(in);
+				break;
+			}
+		}
+		else
+		{
+			switch (PPCGETIDX2(in))
+			{
+			case 0:
+				fcmp(in, 'u');
+				break;
+
+			case 12:
+				fdabc(in, "rsp", 1, 0);
+				break;
+
+			case 14:
+				fdabc(in, "ctiw", 1, 0);
+				break;
+
+			case 15:
+				fdabc(in, "ctiwz", 1, 0);
+				break;
+
+			case 32:
+				fcmp(in, 'o');
+				break;
+
+			case 38:
+				mtfsb(in, 1);
+				break;
+
+			case 40:
+				fdabc(in, "neg", 10, 0);
+				break;
+
+			case 64:
+				mcrf(in, 's'); // mcrfs
+				break;
+
+			case 70:
+				mtfsb(in, 0);
+				break;
+
+			case 72:
+				fmr(in);
+				break;
+
+			case 134:
+				if ((in & 0x006f0800) == 0)
+				{
+					m_opcode = StringFromFormat("mtfsfi%s", rcsel[in & 1]);
+					m_operands = StringFromFormat("cr%d,%d", (int)PPCGETCRD(in), (int)(in & 0xf000) >> 12);
+				}
+				else
+				{
+					ill(in);
+				}
+				break;
+
+			case 136:
+				fdabc(in, "nabs", 10, 0);
+				break;
+
+			case 264:
+				fdabc(in, "abs", 10, 0);
+				break;
+
+			case 583:
+				if (in & (PPCAMASK | PPCBMASK))
+					ill(in);
+				else
+					dab(in, "mffs", 4, 0, 0, -1, 0);
+				break;
+
+			case 711:
+				if ((in & 0x02010000) == 0)
+				{
+					m_opcode = StringFromFormat("mtfsf%s", rcsel[in & 1]);
+					m_operands = StringFromFormat("0x%x,%u", (unsigned int)(in >> 17) & 0x01fe, (unsigned int)PPCGETB(in));
+				}
+				else
+				{
+					ill(in);
+				}
+				break;
+
+			case 814:
+				fdabc(in, "fctid", 10, PPCF_64);
+				break;
+
+			case 815:
+				fdabc(in, "fctidz", 10, PPCF_64);
+				break;
+
+			case 846:
+				fdabc(in, "fcfid", 10, PPCF_64);
+				break;
+
+			default:
+				ill(in);
+				break;
+			}
+		}
+		break;
+
+	default:
+		ill(in);
+		break;
+	}
+	return (m_instr + 1);
+}
+
+// simplified interface
+std::string GekkoDisassembler::Disassemble(u32 opcode, u32 current_instruction_address, bool big_endian)
+{
+	u32 opc = opcode;
+	u32 addr = current_instruction_address;
+
+	m_instr = (u32*)&opc;
+	m_iaddr = (u32*)&addr;
+
+	DoDisassembly(big_endian);
+
+	return m_opcode.append("\t").append(m_operands);
+}
+
+static const char* gprnames[] =
+{
+	" r0", " r1", " r2", " r3", " r4", " r5", " r6", " r7",
+	" r8", " r9", "r10", "r11", "r12", "r13", "r14", "r15",
+	"r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
+	"r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"
+};
+
+const char* GekkoDisassembler::GetGPRName(u32 index)
+{
+	if (index < 32)
+		return gprnames[index];
+
+	return nullptr;
+}
+
+static const char* fprnames[] =
+{
+	" f0", " f1", " f2", " f3", " f4", " f5", " f6", " f7",
+	" f8", " f9", "f10", "f11", "f12", "f13", "f14", "f15",
+	"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
+	"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31"
+};
+
+const char* GekkoDisassembler::GetFPRName(u32 index)
+{
+	if (index < 32)
+		return fprnames[index];
+
+	return nullptr;
+}
diff --git a/Source/Core/Common/GekkoDisassembler.h b/Source/Core/Common/GekkoDisassembler.h
new file mode 100644
index 0000000000..bfd293f10d
--- /dev/null
+++ b/Source/Core/Common/GekkoDisassembler.h
@@ -0,0 +1,156 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/* $VER: ppc_disasm.h V1.6 (09.12.2011)
+ *
+ * Disassembler module for the PowerPC microprocessor family
+ * Copyright (c) 1998-2001,2009,2011 Frank Wille
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 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 HOLDER 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.
+ */
+
+// Modified for use with Dolphin
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+class GekkoDisassembler final
+{
+public:
+	static std::string Disassemble(u32 opcode, u32 current_instruction_address, bool big_endian = true);
+	static const char* GetGPRName(u32 index);
+	static const char* GetFPRName(u32 index);
+
+private:
+	GekkoDisassembler() = delete;
+
+	static void ill(u32 in);
+	static std::string imm(u32 in, int uimm, int type, bool hex);
+
+	static std::string ra_rb(u32 in);
+	static std::string rd_ra_rb(u32 in, int mask);
+	static std::string fd_ra_rb(u32 in, int mask);
+
+	static void trapi(u32 in, unsigned char dmode);
+	static void cmpi(u32 in, int uimm);
+	static void addi(u32 in, const std::string& ext);
+	static size_t branch(u32 in, const char* bname, int aform, int bdisp);
+	static void bc(u32 in);
+	static void bli(u32 in);
+	static void mcrf(u32 in, char c);
+	static void crop(u32 in, const char* n1, const char* n2);
+	static void nooper(u32 in, const char* name, unsigned char dmode);
+	static void rlw(u32 in, const char* name, int i);
+	static void ori(u32 in, const char* name);
+	static void rld(u32 in, const char* name, int i);
+	static void cmp(u32 in);
+	static void trap(u32 in, unsigned char dmode);
+	static void dab(u32 in, const char* name, int mask, int smode, int chkoe, int chkrc, unsigned char dmode);
+	static void rrn(u32 in, const char* name, int smode, int chkoe, int chkrc, unsigned char dmode);
+	static void mtcr(u32 in);
+	static void msr(u32 in, int smode);
+	static void mspr(u32 in, int smode);
+	static void mtb(u32 in);
+	static void sradi(u32 in);
+	static void ldst(u32 in, const char* name, char reg, unsigned char dmode);
+	static void fdabc(u32 in, const char* name, int mask, unsigned char dmode);
+	static void fmr(u32 in);
+	static void fdab(u32 in, const char* name, int mask);
+	static void fcmp(u32 in, char c);
+	static void mtfsb(u32 in, int n);
+	static void ps(u32 inst);
+	static void ps_mem(u32 inst);
+
+	static u32* DoDisassembly(bool big_endian);
+
+	static u32 HelperRotateMask(int r, int mb, int me)
+	{
+		//first make 001111111111111 part
+		unsigned int begin = 0xFFFFFFFF >> mb;
+		//then make 000000000001111 part, which is used to flip the bits of the first one
+		unsigned int end = me < 31 ? (0xFFFFFFFF >> (me + 1)) : 0;
+		//do the bitflip
+		unsigned int mask = begin ^ end;
+		//and invert if backwards
+		if (me < mb)
+			mask = ~mask;
+		//rotate the mask so it can be applied to source reg
+		//return _rotl(mask, 32 - r);
+		return (mask << (32 - r)) | (mask >> r);
+	}
+
+	static std::string ldst_offs(u32 val)
+	{
+		if (val == 0)
+		{
+			return "0";
+		}
+		else
+		{
+			if (val & 0x8000)
+			{
+				return StringFromFormat("-0x%.4X", ((~val) & 0xffff) + 1);
+			}
+			else
+			{
+				return StringFromFormat("0x%.4X", val);
+			}
+		}
+	}
+
+	static int SEX12(u32 x)
+	{
+		return x & 0x800 ? (x | 0xFFFFF000) : x;
+	}
+
+	enum InstructionType
+	{
+		PPCINSTR_OTHER  = 0, // No additional info for other instr.
+		PPCINSTR_BRANCH = 1, // Branch dest. = PC+displacement
+		PPCINSTR_LDST   = 2, // Load/store instruction: displ(sreg)
+		PPCINSTR_IMM    = 3, // 16-bit immediate val. in displacement
+	};
+
+	enum Flags
+	{
+		PPCF_ILLEGAL  = (1 << 0), // Illegal PowerPC instruction
+		PPCF_UNSIGNED = (1 << 1), // Unsigned immediate instruction
+		PPCF_SUPER    = (1 << 2), // Supervisor level instruction
+		PPCF_64       = (1 << 3), // 64-bit only instruction
+	};
+
+	static u32* m_instr;           // Pointer to instruction to disassemble
+	static u32* m_iaddr;           // Instruction.address., usually the same as instr
+	static std::string m_opcode;   // Buffer for opcode, min. 10 chars.
+	static std::string m_operands; // Operand buffer, min. 24 chars.
+	static unsigned char m_type;   // Type of instruction, see below
+	static unsigned char m_flags;  // Additional flags
+	static unsigned short m_sreg;  // Register in load/store instructions
+	static u32 m_displacement;     // Branch- or load/store displacement
+};
diff --git a/Source/Core/Common/GenericCPUDetect.cpp b/Source/Core/Common/GenericCPUDetect.cpp
new file mode 100644
index 0000000000..8c82fb8667
--- /dev/null
+++ b/Source/Core/Common/GenericCPUDetect.cpp
@@ -0,0 +1,14 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CPUDetect.h"
+
+CPUInfo cpu_info;
+
+CPUInfo::CPUInfo() {}
+
+std::string CPUInfo::Summarize()
+{
+	return "Generic";
+}
diff --git a/Source/Core/Common/GenericFPURoundMode.cpp b/Source/Core/Common/GenericFPURoundMode.cpp
new file mode 100644
index 0000000000..506e619217
--- /dev/null
+++ b/Source/Core/Common/GenericFPURoundMode.cpp
@@ -0,0 +1,29 @@
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/FPURoundMode.h"
+
+// Generic, do nothing
+namespace FPURoundMode
+{
+	void SetRoundMode(int mode)
+	{
+	}
+	void SetPrecisionMode(PrecisionMode mode)
+	{
+	}
+	void SetSIMDMode(int rounding_mode, bool non_ieee_mode)
+	{
+	}
+	void SaveSIMDState()
+	{
+	}
+	void LoadSIMDState()
+	{
+	}
+	void LoadDefaultSIMDState()
+	{
+	}
+}
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp
new file mode 100644
index 0000000000..868de4e68f
--- /dev/null
+++ b/Source/Core/Common/Hash.cpp
@@ -0,0 +1,605 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include "Common/CommonFuncs.h"
+#include "Common/CPUDetect.h"
+#include "Common/Hash.h"
+#include "Common/Intrinsics.h"
+
+static u64 (*ptrHashFunction)(const u8 *src, u32 len, u32 samples) = &GetMurmurHash3;
+
+// uint32_t
+// WARNING - may read one more byte!
+// Implementation from Wikipedia.
+u32 HashFletcher(const u8* data_u8, size_t length)
+{
+	const u16* data = (const u16*)data_u8; /* Pointer to the data to be summed */
+	size_t len = (length + 1) / 2; /* Length in 16-bit words */
+	u32 sum1 = 0xffff, sum2 = 0xffff;
+
+	while (len)
+	{
+		size_t tlen = len > 360 ? 360 : len;
+		len -= tlen;
+
+		do
+		{
+			sum1 += *data++;
+			sum2 += sum1;
+		} while (--tlen);
+
+		sum1 = (sum1 & 0xffff) + (sum1 >> 16);
+		sum2 = (sum2 & 0xffff) + (sum2 >> 16);
+	}
+
+	// Second reduction step to reduce sums to 16 bits
+	sum1 = (sum1 & 0xffff) + (sum1 >> 16);
+	sum2 = (sum2 & 0xffff) + (sum2 >> 16);
+	return(sum2 << 16 | sum1);
+}
+
+
+// Implementation from Wikipedia
+// Slightly slower than Fletcher above, but slightly more reliable.
+#define MOD_ADLER 65521
+// data: Pointer to the data to be summed; len is in bytes
+u32 HashAdler32(const u8* data, size_t len)
+{
+	u32 a = 1, b = 0;
+
+	while (len)
+	{
+		size_t tlen = len > 5550 ? 5550 : len;
+		len -= tlen;
+
+		do
+		{
+			a += *data++;
+			b += a;
+		} while (--tlen);
+
+		a = (a & 0xffff) + (a >> 16) * (65536 - MOD_ADLER);
+		b = (b & 0xffff) + (b >> 16) * (65536 - MOD_ADLER);
+	}
+
+	// It can be shown that a <= 0x1013a here, so a single subtract will do.
+	if (a >= MOD_ADLER)
+	{
+		a -= MOD_ADLER;
+	}
+
+	// It can be shown that b can reach 0xfff87 here.
+	b = (b & 0xffff) + (b >> 16) * (65536 - MOD_ADLER);
+
+	if (b >= MOD_ADLER)
+	{
+		b -= MOD_ADLER;
+	}
+
+	return((b << 16) | a);
+}
+
+// Stupid hash - but can't go back now :)
+// Don't use for new things. At least it's reasonably fast.
+u32 HashEctor(const u8* ptr, int length)
+{
+	u32 crc = 0;
+
+	for (int i = 0; i < length; i++)
+	{
+		crc ^= ptr[i];
+		crc = (crc << 3) | (crc >> 29);
+	}
+
+	return(crc);
+}
+
+
+#if _ARCH_64
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+inline u64 getblock(const u64 * p, int i)
+{
+	return p[i];
+}
+
+//----------
+// Block mix - combine the key bits with the hash bits and scramble everything
+
+inline void bmix64(u64 & h1, u64 & h2, u64 & k1, u64 & k2, u64 & c1, u64 & c2)
+{
+	k1 *= c1;
+	k1  = _rotl64(k1, 23);
+	k1 *= c2;
+	h1 ^= k1;
+	h1 += h2;
+
+	h2  = _rotl64(h2, 41);
+
+	k2 *= c2;
+	k2  = _rotl64(k2, 23);
+	k2 *= c1;
+	h2 ^= k2;
+	h2 += h1;
+
+	h1 = h1 * 3 + 0x52dce729;
+	h2 = h2 * 3 + 0x38495ab5;
+
+	c1 = c1 * 5 + 0x7b7d159c;
+	c2 = c2 * 5 + 0x6bce6396;
+}
+
+//----------
+// Finalization mix - avalanches all bits to within 0.05% bias
+
+inline u64 fmix64(u64 k)
+{
+	k ^= k >> 33;
+	k *= 0xff51afd7ed558ccd;
+	k ^= k >> 33;
+	k *= 0xc4ceb9fe1a85ec53;
+	k ^= k >> 33;
+
+	return k;
+}
+
+u64 GetMurmurHash3(const u8 *src, u32 len, u32 samples)
+{
+	const u8 * data = (const u8*)src;
+	const int nblocks = len / 16;
+	u32 Step = (len / 8);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step = Step / samples;
+	if (Step < 1)
+		Step = 1;
+
+	u64 h1 = 0x9368e53c2f6af274;
+	u64 h2 = 0x586dcd208f7cd3fd;
+
+	u64 c1 = 0x87c37b91114253d5;
+	u64 c2 = 0x4cf5ad432745937f;
+
+
+	//----------
+	// body
+
+	const u64 * blocks = (const u64 *)(data);
+
+	for (int i = 0; i < nblocks; i+=Step)
+	{
+		u64 k1 = getblock(blocks, i*2+0);
+		u64 k2 = getblock(blocks, i*2+1);
+
+		bmix64(h1,h2,k1,k2,c1,c2);
+	}
+
+	//----------
+	// tail
+
+	const u8 * tail = (const u8*)(data + nblocks*16);
+
+	u64 k1 = 0;
+	u64 k2 = 0;
+
+	switch (len & 15)
+	{
+	case 15: k2 ^= u64(tail[14]) << 48;
+	case 14: k2 ^= u64(tail[13]) << 40;
+	case 13: k2 ^= u64(tail[12]) << 32;
+	case 12: k2 ^= u64(tail[11]) << 24;
+	case 11: k2 ^= u64(tail[10]) << 16;
+	case 10: k2 ^= u64(tail[ 9]) << 8;
+	case  9: k2 ^= u64(tail[ 8]) << 0;
+
+	case  8: k1 ^= u64(tail[ 7]) << 56;
+	case  7: k1 ^= u64(tail[ 6]) << 48;
+	case  6: k1 ^= u64(tail[ 5]) << 40;
+	case  5: k1 ^= u64(tail[ 4]) << 32;
+	case  4: k1 ^= u64(tail[ 3]) << 24;
+	case  3: k1 ^= u64(tail[ 2]) << 16;
+	case  2: k1 ^= u64(tail[ 1]) << 8;
+	case  1: k1 ^= u64(tail[ 0]) << 0;
+			bmix64(h1,h2,k1,k2,c1,c2);
+	};
+
+	//----------
+	// finalization
+
+	h2 ^= len;
+
+	h1 += h2;
+	h2 += h1;
+
+	h1 = fmix64(h1);
+	h2 = fmix64(h2);
+
+	h1 += h2;
+
+	return h1;
+}
+
+
+// CRC32 hash using the SSE4.2 instruction
+u64 GetCRC32(const u8 *src, u32 len, u32 samples)
+{
+#if _M_SSE >= 0x402 || defined(_M_ARM_64)
+	u64 h[4] = { len, 0, 0, 0 };
+	u32 Step = (len / 8);
+	const u64 *data = (const u64 *)src;
+	const u64 *end = data + Step;
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step = Step / samples;
+	if (Step < 1)
+		Step = 1;
+#endif
+
+#if _M_SSE >= 0x402
+	while (data < end - Step * 3)
+	{
+		h[0] = _mm_crc32_u64(h[0], data[Step * 0]);
+		h[1] = _mm_crc32_u64(h[1], data[Step * 1]);
+		h[2] = _mm_crc32_u64(h[2], data[Step * 2]);
+		h[3] = _mm_crc32_u64(h[3], data[Step * 3]);
+		data += Step * 4;
+	}
+	if (data < end - Step * 0)
+		h[0] = _mm_crc32_u64(h[0], data[Step * 0]);
+	if (data < end - Step * 1)
+		h[1] = _mm_crc32_u64(h[1], data[Step * 1]);
+	if (data < end - Step * 2)
+		h[2] = _mm_crc32_u64(h[2], data[Step * 2]);
+
+	if (len & 7)
+	{
+		u64 temp = 0;
+		memcpy(&temp, end, len & 7);
+		h[0] = _mm_crc32_u64(h[0], temp);
+	}
+#elif defined(_M_ARM_64)
+	// We should be able to use intrinsics for this
+	// Too bad the intrinsics for this instruction was added in GCC 4.9.1
+	// The Android NDK (as of r10e) only has GCC 4.9
+	// Once the Android NDK has a newer GCC version, update these to use intrinsics
+	while (data < end - Step * 3)
+	{
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[0])
+				: [two] "r" (h[0]),
+				  [three] "r" (data[Step * 0]));
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[1])
+				: [two] "r" (h[1]),
+				  [three] "r" (data[Step * 1]));
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[2])
+				: [two] "r" (h[2]),
+				  [three] "r" (data[Step * 2]));
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[3])
+				: [two] "r" (h[3]),
+				  [three] "r" (data[Step * 3]));
+
+		data += Step * 4;
+	}
+	if (data < end - Step * 0)
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[0])
+				: [two] "r" (h[0]),
+				  [three] "r" (data[Step * 0]));
+	if (data < end - Step * 1)
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[1])
+				: [two] "r" (h[1]),
+				  [three] "r" (data[Step * 1]));
+	if (data < end - Step * 2)
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[2])
+				: [two] "r" (h[2]),
+				  [three] "r" (data[Step * 2]));
+
+	if (len & 7)
+	{
+		u64 temp = 0;
+		memcpy(&temp, end, len & 7);
+		asm ("crc32x %w[res], %w[two], %x[three]"
+				: [res] "=r" (h[0])
+				: [two] "r" (h[0]),
+				  [three] "r" (temp));
+	}
+#endif
+
+#if _M_SSE >= 0x402 || defined(_M_ARM_64)
+	// FIXME: is there a better way to combine these partial hashes?
+	return h[0] + (h[1] << 10) + (h[2] << 21) + (h[3] << 32);
+#else
+	return 0;
+#endif
+
+}
+
+
+/*
+ * NOTE: This hash function is used for custom texture loading/dumping, so
+ * it should not be changed, which would require all custom textures to be
+ * recalculated for their new hash values. If the hashing function is
+ * changed, make sure this one is still used when the legacy parameter is
+ * true.
+ */
+u64 GetHashHiresTexture(const u8 *src, u32 len, u32 samples)
+{
+	const u64 m = 0xc6a4a7935bd1e995;
+	u64 h = len * m;
+	const int r = 47;
+	u32 Step = (len / 8);
+	const u64 *data = (const u64 *)src;
+	const u64 *end = data + Step;
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step = Step / samples;
+	if (Step < 1)
+		Step = 1;
+	while (data < end)
+	{
+		u64 k = data[0];
+		data+=Step;
+		k *= m;
+		k ^= k >> r;
+		k *= m;
+		h ^= k;
+		h *= m;
+	}
+
+	const u8 * data2 = (const u8*)end;
+
+	switch (len & 7)
+	{
+	case 7: h ^= u64(data2[6]) << 48;
+	case 6: h ^= u64(data2[5]) << 40;
+	case 5: h ^= u64(data2[4]) << 32;
+	case 4: h ^= u64(data2[3]) << 24;
+	case 3: h ^= u64(data2[2]) << 16;
+	case 2: h ^= u64(data2[1]) << 8;
+	case 1: h ^= u64(data2[0]);
+			h *= m;
+	};
+
+	h ^= h >> r;
+	h *= m;
+	h ^= h >> r;
+
+	return h;
+}
+#else
+// CRC32 hash using the SSE4.2 instruction
+u64 GetCRC32(const u8 *src, u32 len, u32 samples)
+{
+#if _M_SSE >= 0x402
+	u32 h = len;
+	u32 Step = (len/4);
+	const u32 *data = (const u32 *)src;
+	const u32 *end = data + Step;
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step  = Step / samples;
+	if (Step < 1)
+		Step = 1;
+	while (data < end)
+	{
+		h = _mm_crc32_u32(h, data[0]);
+		data += Step;
+	}
+
+	const u8 *data2 = (const u8*)end;
+	return (u64)_mm_crc32_u32(h, u32(data2[0]));
+#else
+	return 0;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+inline u32 getblock(const u32 * p, int i)
+{
+	return p[i];
+}
+
+//----------
+// Finalization mix - force all bits of a hash block to avalanche
+
+// avalanches all bits to within 0.25% bias
+
+inline u32 fmix32(u32 h)
+{
+	h ^= h >> 16;
+	h *= 0x85ebca6b;
+	h ^= h >> 13;
+	h *= 0xc2b2ae35;
+	h ^= h >> 16;
+
+	return h;
+}
+
+inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
+{
+	k1 *= c1;
+	k1  = _rotl(k1, 11);
+	k1 *= c2;
+	h1 ^= k1;
+	h1 += h2;
+
+	h2  = _rotl(h2, 17);
+
+	k2 *= c2;
+	k2  = _rotl(k2, 11);
+	k2 *= c1;
+	h2 ^= k2;
+	h2 += h1;
+
+	h1  = h1*3+0x52dce729;
+	h2  = h2*3+0x38495ab5;
+
+	c1  = c1*5+0x7b7d159c;
+	c2  = c2*5+0x6bce6396;
+}
+
+//----------
+
+u64 GetMurmurHash3(const u8* src, u32 len, u32 samples)
+{
+	const u8 * data = (const u8*)src;
+	u32 out[2];
+	const int nblocks = len / 8;
+	u32 Step = (len / 4);
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step = Step / samples;
+	if (Step < 1)
+		Step = 1;
+
+	u32 h1 = 0x8de1c3ac;
+	u32 h2 = 0xbab98226;
+
+	u32 c1 = 0x95543787;
+	u32 c2 = 0x2ad7eb25;
+
+	//----------
+	// body
+
+	const u32 * blocks = (const u32 *)(data + nblocks*8);
+
+	for (int i = -nblocks; i < 0; i+=Step)
+	{
+		u32 k1 = getblock(blocks,i*2+0);
+		u32 k2 = getblock(blocks,i*2+1);
+
+		bmix32(h1,h2,k1,k2,c1,c2);
+	}
+
+	//----------
+	// tail
+
+	const u8 * tail = (const u8*)(data + nblocks*8);
+
+	u32 k1 = 0;
+	u32 k2 = 0;
+
+	switch (len & 7)
+	{
+	case 7: k2 ^= tail[6] << 16;
+	case 6: k2 ^= tail[5] << 8;
+	case 5: k2 ^= tail[4] << 0;
+	case 4: k1 ^= tail[3] << 24;
+	case 3: k1 ^= tail[2] << 16;
+	case 2: k1 ^= tail[1] << 8;
+	case 1: k1 ^= tail[0] << 0;
+	        bmix32(h1,h2,k1,k2,c1,c2);
+	};
+
+	//----------
+	// finalization
+
+	h2 ^= len;
+
+	h1 += h2;
+	h2 += h1;
+
+	h1  = fmix32(h1);
+	h2  = fmix32(h2);
+
+	h1 += h2;
+	h2 += h1;
+
+	out[0] = h1;
+	out[1] = h2;
+
+	return *((u64 *)&out);
+}
+
+/*
+ * FIXME: The old 32-bit version of this hash made different hashes than the
+ * 64-bit version. Until someone can make a new version of the 32-bit one that
+ * makes identical hashes, this is just a c/p of the 64-bit one.
+ */
+u64 GetHashHiresTexture(const u8 *src, u32 len, u32 samples)
+{
+	const u64 m = 0xc6a4a7935bd1e995ULL;
+	u64 h = len * m;
+	const int r = 47;
+	u32 Step = (len / 8);
+	const u64 *data = (const u64 *)src;
+	const u64 *end = data + Step;
+	if (samples == 0)
+		samples = std::max(Step, 1u);
+	Step = Step / samples;
+	if (Step < 1)
+		Step = 1;
+	while (data < end)
+	{
+		u64 k = data[0];
+		data+=Step;
+		k *= m;
+		k ^= k >> r;
+		k *= m;
+		h ^= k;
+		h *= m;
+	}
+
+	const u8 * data2 = (const u8*)end;
+
+	switch (len & 7)
+	{
+	case 7: h ^= u64(data2[6]) << 48;
+	case 6: h ^= u64(data2[5]) << 40;
+	case 5: h ^= u64(data2[4]) << 32;
+	case 4: h ^= u64(data2[3]) << 24;
+	case 3: h ^= u64(data2[2]) << 16;
+	case 2: h ^= u64(data2[1]) << 8;
+	case 1: h ^= u64(data2[0]);
+			h *= m;
+	};
+
+	h ^= h >> r;
+	h *= m;
+	h ^= h >> r;
+
+	return h;
+}
+#endif
+
+u64 GetHash64(const u8 *src, u32 len, u32 samples)
+{
+	return ptrHashFunction(src, len, samples);
+}
+
+// sets the hash function used for the texture cache
+void SetHash64Function()
+{
+#if _M_SSE >= 0x402
+	if (cpu_info.bSSE4_2) // sse crc32 version
+	{
+		ptrHashFunction = &GetCRC32;
+	}
+	else
+#elif defined(_M_ARM_64)
+	if (cpu_info.bCRC32)
+	{
+		ptrHashFunction = &GetCRC32;
+	}
+	else
+#endif
+	{
+		ptrHashFunction = &GetMurmurHash3;
+	}
+}
+
+
+
diff --git a/Source/Core/Common/Hash.h b/Source/Core/Common/Hash.h
new file mode 100644
index 0000000000..6ece9fb9b5
--- /dev/null
+++ b/Source/Core/Common/Hash.h
@@ -0,0 +1,19 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+
+#include "Common/CommonTypes.h"
+
+u32 HashFletcher(const u8* data_u8, size_t length);  // FAST. Length & 1 == 0.
+u32 HashAdler32(const u8* data, size_t len);         // Fairly accurate, slightly slower
+u32 HashFNV(const u8* ptr, int length);              // Another fast and decent hash
+u32 HashEctor(const u8* ptr, int length);            // JUNK. DO NOT USE FOR NEW THINGS
+u64 GetCRC32(const u8 *src, u32 len, u32 samples);   // SSE4.2 version of CRC32
+u64 GetHashHiresTexture(const u8 *src, u32 len, u32 samples = 0);
+u64 GetMurmurHash3(const u8 *src, u32 len, u32 samples);
+u64 GetHash64(const u8 *src, u32 len, u32 samples);
+void SetHash64Function();
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
new file mode 100644
index 0000000000..9ea8f50533
--- /dev/null
+++ b/Source/Core/Common/IniFile.cpp
@@ -0,0 +1,435 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// see IniFile.h
+
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
+#include <fstream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+void IniFile::ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut)
+{
+	if (line[0] == '#')
+		return;
+
+	size_t firstEquals = line.find("=", 0);
+
+	if (firstEquals != std::string::npos)
+	{
+		// Yes, a valid line!
+		*keyOut = StripSpaces(line.substr(0, firstEquals));
+
+		if (valueOut)
+		{
+			*valueOut = StripQuotes(StripSpaces(line.substr(firstEquals + 1, std::string::npos)));
+		}
+	}
+}
+
+const std::string& IniFile::NULL_STRING = "";
+
+void IniFile::Section::Set(const std::string& key, const std::string& newValue)
+{
+	auto it = values.find(key);
+	if (it != values.end())
+		it->second = newValue;
+	else
+	{
+		values[key] = newValue;
+		keys_order.push_back(key);
+	}
+}
+
+void IniFile::Section::Set(const std::string& key, const std::string& newValue, const std::string& defaultValue)
+{
+	if (newValue != defaultValue)
+		Set(key, newValue);
+	else
+		Delete(key);
+}
+
+void IniFile::Section::Set(const std::string& key, const std::vector<std::string>& newValues)
+{
+	std::string temp;
+	// Join the strings with ,
+	for (const std::string& value : newValues)
+	{
+		temp = value + ",";
+	}
+	// remove last ,
+	temp.resize(temp.length() - 1);
+	Set(key, temp);
+}
+
+bool IniFile::Section::Get(const std::string& key, std::string* value, const std::string& defaultValue)
+{
+	auto it = values.find(key);
+	if (it != values.end())
+	{
+		*value = it->second;
+		return true;
+	}
+	else if (&defaultValue != &NULL_STRING)
+	{
+		*value = defaultValue;
+		return true;
+	}
+	else
+		return false;
+}
+
+bool IniFile::Section::Get(const std::string& key, std::vector<std::string>* out)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (!retval || temp.empty())
+	{
+		return false;
+	}
+	// ignore starting , if any
+	size_t subStart = temp.find_first_not_of(",");
+
+	// split by ,
+	while (subStart != std::string::npos)
+	{
+		// Find next ,
+		size_t subEnd = temp.find(',', subStart);
+		if (subStart != subEnd)
+			// take from first char until next ,
+			out->push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
+		// Find the next non , char
+		subStart = temp.find_first_not_of(",", subEnd);
+	}
+	return true;
+}
+
+bool IniFile::Section::Get(const std::string& key, int* value, int defaultValue)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (retval && TryParse(temp, value))
+		return true;
+	*value = defaultValue;
+	return false;
+}
+
+bool IniFile::Section::Get(const std::string& key, u32* value, u32 defaultValue)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (retval && TryParse(temp, value))
+		return true;
+	*value = defaultValue;
+	return false;
+}
+
+bool IniFile::Section::Get(const std::string& key, bool* value, bool defaultValue)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (retval && TryParse(temp, value))
+		return true;
+	*value = defaultValue;
+	return false;
+}
+
+bool IniFile::Section::Get(const std::string& key, float* value, float defaultValue)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (retval && TryParse(temp, value))
+		return true;
+	*value = defaultValue;
+	return false;
+}
+
+bool IniFile::Section::Get(const std::string& key, double* value, double defaultValue)
+{
+	std::string temp;
+	bool retval = Get(key, &temp);
+	if (retval && TryParse(temp, value))
+		return true;
+	*value = defaultValue;
+	return false;
+}
+
+bool IniFile::Section::Exists(const std::string& key) const
+{
+	return values.find(key) != values.end();
+}
+
+bool IniFile::Section::Delete(const std::string& key)
+{
+	auto it = values.find(key);
+	if (it == values.end())
+		return false;
+
+	values.erase(it);
+	keys_order.erase(std::find(keys_order.begin(), keys_order.end(), key));
+	return true;
+}
+
+// IniFile
+
+const IniFile::Section* IniFile::GetSection(const std::string& sectionName) const
+{
+	for (const Section& sect : sections)
+		if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
+			return (&(sect));
+	return nullptr;
+}
+
+IniFile::Section* IniFile::GetSection(const std::string& sectionName)
+{
+	for (Section& sect : sections)
+		if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
+			return (&(sect));
+	return nullptr;
+}
+
+IniFile::Section* IniFile::GetOrCreateSection(const std::string& sectionName)
+{
+	Section* section = GetSection(sectionName);
+	if (!section)
+	{
+		sections.emplace_back(sectionName);
+		section = &sections.back();
+	}
+	return section;
+}
+
+bool IniFile::DeleteSection(const std::string& sectionName)
+{
+	Section* s = GetSection(sectionName);
+	if (!s)
+		return false;
+	for (auto iter = sections.begin(); iter != sections.end(); ++iter)
+	{
+		if (&(*iter) == s)
+		{
+			sections.erase(iter);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool IniFile::Exists(const std::string& sectionName, const std::string& key) const
+{
+	const Section* section = GetSection(sectionName);
+	if (!section)
+		return false;
+	return section->Exists(key);
+}
+
+void IniFile::SetLines(const std::string& sectionName, const std::vector<std::string> &lines)
+{
+	Section* section = GetOrCreateSection(sectionName);
+	section->lines = lines;
+}
+
+bool IniFile::DeleteKey(const std::string& sectionName, const std::string& key)
+{
+	Section* section = GetSection(sectionName);
+	if (!section)
+		return false;
+	return section->Delete(key);
+}
+
+// Return a list of all keys in a section
+bool IniFile::GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const
+{
+	const Section* section = GetSection(sectionName);
+	if (!section)
+	{
+		return false;
+	}
+	*keys = section->keys_order;
+	return true;
+}
+
+// Return a list of all lines in a section
+bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments) const
+{
+	lines->clear();
+
+	const Section* section = GetSection(sectionName);
+	if (!section)
+		return false;
+
+	for (std::string line : section->lines)
+	{
+		line = StripSpaces(line);
+
+		if (remove_comments)
+		{
+			size_t commentPos = line.find('#');
+			if (commentPos == 0)
+			{
+				continue;
+			}
+
+			if (commentPos != std::string::npos)
+			{
+				line = StripSpaces(line.substr(0, commentPos));
+			}
+		}
+
+		lines->push_back(line);
+	}
+
+	return true;
+}
+
+void IniFile::SortSections()
+{
+	sections.sort();
+}
+
+bool IniFile::Load(const std::string& filename, bool keep_current_data)
+{
+	if (!keep_current_data)
+		sections.clear();
+	// first section consists of the comments before the first real section
+
+	// Open file
+	std::ifstream in;
+	OpenFStream(in, filename, std::ios::in);
+
+	if (in.fail())
+		return false;
+
+	Section* current_section = nullptr;
+	bool first_line = true;
+	while (!in.eof())
+	{
+		std::string line;
+
+		if (!std::getline(in, line))
+		{
+			if (in.eof())
+				return true;
+			else
+				return false;
+		}
+
+		// Skips the UTF-8 BOM at the start of files. Notepad likes to add this.
+		if (first_line && line.substr(0, 3) == "\xEF\xBB\xBF")
+			line = line.substr(3);
+		first_line = false;
+
+#ifndef _WIN32
+		// Check for CRLF eol and convert it to LF
+		if (!line.empty() && line.at(line.size()-1) == '\r')
+		{
+			line.erase(line.size()-1);
+		}
+#endif
+
+		if (line.size() > 0)
+		{
+			if (line[0] == '[')
+			{
+				size_t endpos = line.find("]");
+
+				if (endpos != std::string::npos)
+				{
+					// New section!
+					std::string sub = line.substr(1, endpos - 1);
+					current_section = GetOrCreateSection(sub);
+				}
+			}
+			else
+			{
+				if (current_section)
+				{
+					std::string key, value;
+					ParseLine(line, &key, &value);
+
+					// Lines starting with '$', '*' or '+' are kept verbatim.
+					// Kind of a hack, but the support for raw lines inside an
+					// INI is a hack anyway.
+					if ((key == "" && value == "") ||
+					    (line.size() >= 1 &&
+					     (line[0] == '$' ||
+					      line[0] == '+' ||
+					      line[0] == '*')))
+						current_section->lines.push_back(line);
+					else
+						current_section->Set(key, value);
+				}
+			}
+		}
+	}
+
+	in.close();
+	return true;
+}
+
+bool IniFile::Save(const std::string& filename)
+{
+	std::ofstream out;
+	std::string temp = File::GetTempFilenameForAtomicWrite(filename);
+	OpenFStream(out, temp, std::ios::out);
+
+	if (out.fail())
+	{
+		return false;
+	}
+
+	for (const Section& section : sections)
+	{
+		if (section.keys_order.size() != 0 || section.lines.size() != 0)
+			out << "[" << section.name << "]" << std::endl;
+
+		if (section.keys_order.size() == 0)
+		{
+			for (const std::string& s : section.lines)
+				out << s << std::endl;
+		}
+		else
+		{
+			for (const std::string& kvit : section.keys_order)
+			{
+				auto pair = section.values.find(kvit);
+				out << pair->first << " = " << pair->second << std::endl;
+			}
+		}
+	}
+
+	out.close();
+
+	return File::RenameSync(temp, filename);
+}
+
+// Unit test. TODO: Move to the real unit test framework.
+/*
+   int main()
+   {
+    IniFile ini;
+    ini.Load("my.ini");
+    ini.Set("Hej", "A", "amaskdfl");
+    ini.Set("Mossa", "A", "amaskdfl");
+    ini.Set("Aissa", "A", "amaskdfl");
+    //ini.Read("my.ini");
+    std::string x;
+    ini.Get("Hej", "B", &x, "boo");
+    ini.DeleteKey("Mossa", "A");
+    ini.DeleteSection("Mossa");
+    ini.SortSections();
+    ini.Save("my.ini");
+    //UpdateVars(ini);
+    return 0;
+   }
+ */
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
new file mode 100644
index 0000000000..fc39e783cc
--- /dev/null
+++ b/Source/Core/Common/IniFile.h
@@ -0,0 +1,148 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstring>
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+struct CaseInsensitiveStringCompare
+{
+	bool operator() (const std::string& a, const std::string& b) const
+	{
+		return strcasecmp(a.c_str(), b.c_str()) < 0;
+	}
+};
+
+class IniFile
+{
+public:
+	class Section
+	{
+		friend class IniFile;
+
+	public:
+		Section() {}
+		Section(const std::string& _name) : name(_name) {}
+
+		bool Exists(const std::string& key) const;
+		bool Delete(const std::string& key);
+
+		void Set(const std::string& key, const std::string& newValue);
+		void Set(const std::string& key, const std::string& newValue, const std::string& defaultValue);
+
+		bool Get(const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
+
+		void Set(const std::string& key, u32 newValue)
+		{
+			Set(key, StringFromFormat("0x%08x", newValue));
+		}
+
+		void Set(const std::string& key, float newValue)
+		{
+			Set(key, StringFromFormat("%f", newValue));
+		}
+
+		void Set(const std::string& key, double newValue)
+		{
+			Set(key, StringFromFormat("%f", newValue));
+		}
+
+		void Set(const std::string& key, int newValue)
+		{
+			Set(key, StringFromInt(newValue));
+		}
+
+		void Set(const std::string& key, bool newValue)
+		{
+			Set(key, StringFromBool(newValue));
+		}
+
+		template<typename T>
+		void Set(const std::string& key, T newValue, const T defaultValue)
+		{
+			if (newValue != defaultValue)
+				Set(key, newValue);
+			else
+				Delete(key);
+		}
+
+		void Set(const std::string& key, const std::vector<std::string>& newValues);
+
+		bool Get(const std::string& key, int* value, int defaultValue = 0);
+		bool Get(const std::string& key, u32* value, u32 defaultValue = 0);
+		bool Get(const std::string& key, bool* value, bool defaultValue = false);
+		bool Get(const std::string& key, float* value, float defaultValue = false);
+		bool Get(const std::string& key, double* value, double defaultValue = false);
+		bool Get(const std::string& key, std::vector<std::string>* values);
+
+		bool operator < (const Section& other) const
+		{
+			return name < other.name;
+		}
+
+	protected:
+		std::string name;
+
+		std::vector<std::string> keys_order;
+		std::map<std::string, std::string, CaseInsensitiveStringCompare> values;
+
+		std::vector<std::string> lines;
+	};
+
+	/**
+	 * Loads sections and keys.
+	 * @param filename filename of the ini file which should be loaded
+	 * @param keep_current_data If true, "extends" the currently loaded list of sections and keys with the loaded data (and replaces existing entries). If false, existing data will be erased.
+	 * @warning Using any other operations than "Get*" and "Exists" is untested and will behave unexpectedly
+	 * @todo This really is just a hack to support having two levels of gameinis (defaults and user-specified) and should eventually be replaced with a less stupid system.
+	 */
+	bool Load(const std::string& filename, bool keep_current_data = false);
+
+	bool Save(const std::string& filename);
+
+	// Returns true if key exists in section
+	bool Exists(const std::string& sectionName, const std::string& key) const;
+
+	template<typename T> bool GetIfExists(const std::string& sectionName, const std::string& key, T value)
+	{
+		if (Exists(sectionName, key))
+			return GetOrCreateSection(sectionName)->Get(key, value);
+
+		return false;
+	}
+
+	bool GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const;
+
+	void SetLines(const std::string& sectionName, const std::vector<std::string>& lines);
+	bool GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments = true) const;
+
+	bool DeleteKey(const std::string& sectionName, const std::string& key);
+	bool DeleteSection(const std::string& sectionName);
+
+	void SortSections();
+
+	Section* GetOrCreateSection(const std::string& section);
+
+	// This function is related to parsing data from lines of INI files
+	// It's used outside of IniFile, which is why it is exposed publicly
+	// In particular it is used in PostProcessing for its configuration
+	static void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut);
+
+private:
+	std::list<Section> sections;
+
+	const Section* GetSection(const std::string& section) const;
+	Section* GetSection(const std::string& section);
+	std::string* GetLine(const std::string& section, const std::string& key);
+	void CreateSection(const std::string& section);
+
+	static const std::string& NULL_STRING;
+};
diff --git a/Source/Core/Common/Intrinsics.h b/Source/Core/Common/Intrinsics.h
new file mode 100644
index 0000000000..15858d537e
--- /dev/null
+++ b/Source/Core/Common/Intrinsics.h
@@ -0,0 +1,31 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _M_X86
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+
+#if defined _M_GENERIC
+#  define _M_SSE 0
+#elif _MSC_VER || __INTEL_COMPILER
+#  define _M_SSE 0x402
+#elif defined __GNUC__
+# if defined __SSE4_2__
+#  define _M_SSE 0x402
+# elif defined __SSE4_1__
+#  define _M_SSE 0x401
+# elif defined __SSSE3__
+#  define _M_SSE 0x301
+# elif defined __SSE3__
+#  define _M_SSE 0x300
+# endif
+#endif
+
+#endif // _M_X86
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
new file mode 100644
index 0000000000..33dbcb52f9
--- /dev/null
+++ b/Source/Core/Common/JitRegister.cpp
@@ -0,0 +1,105 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <fstream>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/JitRegister.h"
+#include "Common/StringUtil.h"
+
+#ifdef _WIN32
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
+
+#if defined USE_OPROFILE && USE_OPROFILE
+#include <opagent.h>
+#endif
+
+#if defined USE_VTUNE
+#include <jitprofiling.h>
+#pragma comment(lib, "jitprofiling.lib")
+#endif
+
+#if defined USE_OPROFILE && USE_OPROFILE
+static op_agent_t s_agent = nullptr;
+#endif
+
+static File::IOFile s_perf_map_file;
+
+namespace JitRegister
+{
+
+void Init(const std::string& perf_dir)
+{
+#if defined USE_OPROFILE && USE_OPROFILE
+	s_agent = op_open_agent();
+#endif
+
+	if (!perf_dir.empty())
+	{
+		std::string filename = StringFromFormat("%s/perf-%d.map", perf_dir.data(), getpid());
+		s_perf_map_file.Open(filename, "w");
+		// Disable buffering in order to avoid missing some mappings
+		// if the event of a crash:
+		std::setvbuf(s_perf_map_file.GetHandle(), nullptr, _IONBF, 0);
+	}
+}
+
+void Shutdown()
+{
+#if defined USE_OPROFILE && USE_OPROFILE
+	op_close_agent(s_agent);
+	s_agent = nullptr;
+#endif
+
+#ifdef USE_VTUNE
+	iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, nullptr);
+#endif
+
+	if (s_perf_map_file.IsOpen())
+		s_perf_map_file.Close();
+}
+
+void RegisterV(const void* base_address, u32 code_size,
+	const char* format, va_list args)
+{
+#if !(defined USE_OPROFILE && USE_OPROFILE) && !defined(USE_VTUNE)
+	if (!s_perf_map_file.IsOpen())
+		return;
+#endif
+
+	std::string symbol_name = StringFromFormatV(format, args);
+
+#if defined USE_OPROFILE && USE_OPROFILE
+	op_write_native_code(s_agent, symbol_name.data(), (u64)base_address,
+		base_address, code_size);
+#endif
+
+#ifdef USE_VTUNE
+	iJIT_Method_Load jmethod = {0};
+	jmethod.method_id = iJIT_GetNewMethodID();
+	jmethod.method_load_address = const_cast<void*>(base_address);
+	jmethod.method_size = code_size;
+	jmethod.method_name = const_cast<char*>(symbol_name.data());
+	iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED, (void*)&jmethod);
+#endif
+
+	// Linux perf /tmp/perf-$pid.map:
+	if (s_perf_map_file.IsOpen())
+	{
+		std::string entry = StringFromFormat(
+			"%" PRIx64 " %x %s\n",
+			(u64)base_address, code_size, symbol_name.data());
+		s_perf_map_file.WriteBytes(entry.data(), entry.size());
+	}
+}
+
+}
diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h
new file mode 100644
index 0000000000..9342392a41
--- /dev/null
+++ b/Source/Core/Common/JitRegister.h
@@ -0,0 +1,37 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+#include <stdarg.h>
+#include <string>
+#include "Common/CommonTypes.h"
+
+namespace JitRegister
+{
+
+void Init(const std::string& perf_dir);
+void Shutdown();
+void RegisterV(const void* base_address, u32 code_size,
+	const char* format, va_list args);
+
+inline void Register(const void* base_address, u32 code_size,
+	const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	RegisterV(base_address, code_size, format, args);
+	va_end(args);
+}
+
+inline void Register(const void* start, const void* end,
+	const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	u32 code_size = (u32) ((const char*) end - (const char*) start);
+	RegisterV(start, code_size, format, args);
+	va_end(args);
+}
+
+}
diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h
similarity index 88%
rename from Source/Core/Common/Src/LinearDiskCache.h
rename to Source/Core/Common/LinearDiskCache.h
index 71ad169530..6b71508969 100644
--- a/Source/Core/Common/Src/LinearDiskCache.h
+++ b/Source/Core/Common/LinearDiskCache.h
@@ -1,16 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#pragma once
 
-#ifndef _LINEAR_DISKCACHE
-#define _LINEAR_DISKCACHE
-
-#include "Common.h"
+#include <cstring>
 #include <fstream>
+#include <string>
 
-// defined in Version.cpp
-extern const char *scm_rev_git_str;
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 
 // On disk format:
 //header{
@@ -50,7 +49,7 @@ class LinearDiskCache
 {
 public:
 	// return number of read entries
-	u32 OpenAndRead(const char *filename, LinearDiskCacheReader<K, V> &reader)
+	u32 OpenAndRead(const std::string& filename, LinearDiskCacheReader<K, V> &reader)
 	{
 		using std::ios_base;
 
@@ -66,13 +65,13 @@ public:
 		m_file.seekg(0, std::ios::beg);
 		std::fstream::pos_type start_pos = m_file.tellg();
 		std::streamoff file_size = end_pos - start_pos;
-		
+
 		if (m_file.is_open() && ValidateHeader())
 		{
 			// good header, read some key/value pairs
 			K key;
 
-			V *value = NULL;
+			V *value = nullptr;
 			u32 value_size;
 			u32 entry_number;
 
@@ -89,10 +88,10 @@ public:
 
 				// read key/value and pass to reader
 				if (Read(&key) &&
-					Read(value, value_size) && 
+					Read(value, value_size) &&
 					Read(&entry_number) &&
 					entry_number == m_num_entries+1)
- 				{
+				{
 					reader.Read(key, value, value_size);
 				}
 				else
@@ -117,7 +116,7 @@ public:
 		WriteHeader();
 		return 0;
 	}
-	
+
 	void Sync()
 	{
 		m_file.flush();
@@ -152,8 +151,8 @@ private:
 	{
 		char file_header[sizeof(Header)];
 
-		return (Read(file_header, sizeof(Header))
-			&& !memcmp((const char*)&m_header, file_header, sizeof(Header)));
+		return (Read(file_header, sizeof(Header)) &&
+		        !memcmp((const char*)&m_header, file_header, sizeof(Header)));
 	}
 
 	template <typename D>
@@ -187,5 +186,3 @@ private:
 	std::fstream m_file;
 	u32 m_num_entries;
 };
-
-#endif  // _LINEAR_DISKCACHE
diff --git a/Source/Core/Common/Logging/ConsoleListener.h b/Source/Core/Common/Logging/ConsoleListener.h
new file mode 100644
index 0000000000..acf12a5170
--- /dev/null
+++ b/Source/Core/Common/Logging/ConsoleListener.h
@@ -0,0 +1,19 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Logging/LogManager.h"
+
+class ConsoleListener : public LogListener
+{
+public:
+	ConsoleListener();
+	~ConsoleListener();
+
+	void Log(LogTypes::LOG_LEVELS, const char *text) override;
+
+private:
+	bool m_use_color;
+};
diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
new file mode 100644
index 0000000000..dd64ca314e
--- /dev/null
+++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
@@ -0,0 +1,46 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+
+#include "Common/Logging/ConsoleListener.h"
+
+ConsoleListener::ConsoleListener()
+{
+	m_use_color = !!isatty(fileno(stdout));
+}
+
+ConsoleListener::~ConsoleListener()
+{
+	fflush(nullptr);
+}
+
+void ConsoleListener::Log(LogTypes::LOG_LEVELS level, const char *text)
+{
+	char color_attr[16] = "";
+	char reset_attr[16] = "";
+
+	if (m_use_color)
+	{
+		strcpy(reset_attr, "\x1b[0m");
+		switch (level)
+		{
+		case LogTypes::LOG_LEVELS::LNOTICE:
+			// light green
+			strcpy(color_attr, "\x1b[92m");
+			break;
+		case LogTypes::LOG_LEVELS::LERROR:
+			// light red
+			strcpy(color_attr, "\x1b[91m");
+			break;
+		case LogTypes::LOG_LEVELS::LWARNING:
+			// light yellow
+			strcpy(color_attr, "\x1b[93m");
+			break;
+		default:
+			break;
+		}
+	}
+	fprintf(stderr, "%s%s%s", color_attr, text, reset_attr);
+}
diff --git a/Source/Core/Common/Logging/ConsoleListenerWin.cpp b/Source/Core/Common/Logging/ConsoleListenerWin.cpp
new file mode 100644
index 0000000000..aaa51b40ff
--- /dev/null
+++ b/Source/Core/Common/Logging/ConsoleListenerWin.cpp
@@ -0,0 +1,20 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <debugapi.h>
+
+#include "Common/Logging/ConsoleListener.h"
+
+ConsoleListener::ConsoleListener()
+{
+}
+
+ConsoleListener::~ConsoleListener()
+{
+}
+
+void ConsoleListener::Log(LogTypes::LOG_LEVELS level, const char *text)
+{
+	::OutputDebugStringA(text);
+}
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
new file mode 100644
index 0000000000..7f86270ce3
--- /dev/null
+++ b/Source/Core/Common/Logging/Log.h
@@ -0,0 +1,149 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace LogTypes
+{
+
+enum LOG_TYPE
+{
+	ACTIONREPLAY,
+	AUDIO,
+	AUDIO_INTERFACE,
+	BOOT,
+	COMMANDPROCESSOR,
+	COMMON,
+	CONSOLE,
+	DISCIO,
+	FILEMON,
+	DSPHLE,
+	DSPLLE,
+	DSP_MAIL,
+	DSPINTERFACE,
+	DVDINTERFACE,
+	DYNA_REC,
+	EXPANSIONINTERFACE,
+	GDB_STUB,
+	POWERPC,
+	GPFIFO,
+	OSHLE,
+	MASTER_LOG,
+	MEMMAP,
+	MEMCARD_MANAGER,
+	OSREPORT,
+	PAD,
+	PROCESSORINTERFACE,
+	PIXELENGINE,
+	SERIALINTERFACE,
+	SP1,
+	STREAMINGINTERFACE,
+	VIDEO,
+	VIDEOINTERFACE,
+	WII_IPC,
+	WII_IPC_DVD,
+	WII_IPC_ES,
+	WII_IPC_FILEIO,
+	WII_IPC_HID,
+	WII_IPC_HLE,
+	WII_IPC_NET,
+	WII_IPC_WC24,
+	WII_IPC_SSL,
+	WII_IPC_SD,
+	WII_IPC_STM,
+	WII_IPC_WIIMOTE,
+	WIIMOTE,
+	NETPLAY,
+
+	NUMBER_OF_LOGS // Must be last
+};
+
+enum LOG_LEVELS
+{
+	LNOTICE  = 1, // VERY important information that is NOT errors. Like startup and OSReports.
+	LERROR   = 2, // Critical errors
+	LWARNING = 3, // Something is suspicious.
+	LINFO    = 4, // General information.
+	LDEBUG   = 5, // Detailed debugging - might make things slow.
+};
+
+static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
+
+}  // namespace
+
+void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
+		const char *file, int line, const char *fmt, ...)
+#ifdef __GNUC__
+		__attribute__((format(printf, 5, 6)))
+#endif
+		;
+
+#if defined LOGGING || defined _DEBUG || defined DEBUGFAST
+#define MAX_LOGLEVEL LogTypes::LOG_LEVELS::LDEBUG
+#else
+#ifndef MAX_LOGLEVEL
+#define MAX_LOGLEVEL LogTypes::LOG_LEVELS::LWARNING
+#endif // loglevel
+#endif // logging
+
+#ifdef GEKKO
+#define GENERIC_LOG(t, v, ...)
+#else
+// Let the compiler optimize this out
+#define GENERIC_LOG(t, v, ...) { \
+	if (v <= MAX_LOGLEVEL) \
+		GenericLog(v, t, __FILE__, __LINE__, __VA_ARGS__); \
+	}
+#endif
+
+#define ERROR_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } while (0)
+#define WARN_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } while (0)
+#define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0)
+#define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0)
+#define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0)
+
+#define _dbg_assert_(_t_, _a_) \
+	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\
+		ERROR_LOG(_t_, "Error...\n\n  Line: %d\n  File: %s\n  Time: %s\n\nIgnore and continue?", \
+				   __LINE__, __FILE__, __TIME__); \
+		if (!PanicYesNo("*** Assertion (see log)***\n")) \
+			Crash(); \
+	}
+
+#ifdef _WIN32
+#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\
+	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\
+		ERROR_LOG(_t_, _msg_, __VA_ARGS__); \
+		if (!PanicYesNo(_msg_, __VA_ARGS__)) \
+			Crash(); \
+	}
+#else
+#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)\
+	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) {\
+		ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \
+		if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \
+			Crash(); \
+	}
+#endif
+
+
+#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
+
+#ifndef GEKKO
+#ifdef _WIN32
+#define _assert_msg_(_t_, _a_, _fmt_, ...) \
+	if (!(_a_)) {\
+		if (!PanicYesNo(_fmt_, __VA_ARGS__)) \
+			Crash(); \
+	}
+#else // not win32
+#define _assert_msg_(_t_, _a_, _fmt_, ...) \
+	if (!(_a_)) {\
+		if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \
+			Crash(); \
+	}
+#endif // WIN32
+#else // GEKKO
+#define _assert_msg_(_t_, _a_, _fmt_, ...)
+#endif
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
new file mode 100644
index 0000000000..29b88f168e
--- /dev/null
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -0,0 +1,202 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdarg>
+#include <cstring>
+#include <mutex>
+#include <ostream>
+#include <set>
+#include <string>
+
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
+#include "Common/Logging/LogManager.h"
+
+void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
+		const char *file, int line, const char* fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	if (LogManager::GetInstance())
+		LogManager::GetInstance()->Log(level, type,
+			file, line, fmt, args);
+	va_end(args);
+}
+
+LogManager *LogManager::m_logManager = nullptr;
+
+LogManager::LogManager()
+{
+	// create log files
+	m_Log[LogTypes::MASTER_LOG]         = new LogContainer("*",               "Master Log");
+	m_Log[LogTypes::BOOT]               = new LogContainer("BOOT",            "Boot");
+	m_Log[LogTypes::COMMON]             = new LogContainer("COMMON",          "Common");
+	m_Log[LogTypes::DISCIO]             = new LogContainer("DIO",             "Disc IO");
+	m_Log[LogTypes::FILEMON]            = new LogContainer("FileMon",         "File Monitor");
+	m_Log[LogTypes::PAD]                = new LogContainer("PAD",             "Pad");
+	m_Log[LogTypes::PIXELENGINE]        = new LogContainer("PE",              "PixelEngine");
+	m_Log[LogTypes::COMMANDPROCESSOR]   = new LogContainer("CP",              "CommandProc");
+	m_Log[LogTypes::VIDEOINTERFACE]     = new LogContainer("VI",              "VideoInt");
+	m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",              "SerialInt");
+	m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI",              "ProcessorInt");
+	m_Log[LogTypes::MEMMAP]             = new LogContainer("MI",              "MI & memmap");
+	m_Log[LogTypes::SP1]                = new LogContainer("SP1",             "Serial Port 1");
+	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",          "StreamingInt");
+	m_Log[LogTypes::DSPINTERFACE]       = new LogContainer("DSP",             "DSPInterface");
+	m_Log[LogTypes::DVDINTERFACE]       = new LogContainer("DVD",             "DVDInterface");
+	m_Log[LogTypes::GPFIFO]             = new LogContainer("GP",              "GPFifo");
+	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI",             "ExpansionInt");
+	m_Log[LogTypes::GDB_STUB]           = new LogContainer("GDB_STUB",        "GDB Stub");
+	m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",              "AudioInt");
+	m_Log[LogTypes::POWERPC]            = new LogContainer("PowerPC",         "IBM CPU");
+	m_Log[LogTypes::OSHLE]              = new LogContainer("HLE",             "HLE");
+	m_Log[LogTypes::DSPHLE]             = new LogContainer("DSPHLE",          "DSP HLE");
+	m_Log[LogTypes::DSPLLE]             = new LogContainer("DSPLLE",          "DSP LLE");
+	m_Log[LogTypes::DSP_MAIL]           = new LogContainer("DSPMails",        "DSP Mails");
+	m_Log[LogTypes::VIDEO]              = new LogContainer("Video",           "Video Backend");
+	m_Log[LogTypes::AUDIO]              = new LogContainer("Audio",           "Audio Emulator");
+	m_Log[LogTypes::DYNA_REC]           = new LogContainer("JIT",             "Dynamic Recompiler");
+	m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",         "Dolphin Console");
+	m_Log[LogTypes::OSREPORT]           = new LogContainer("OSREPORT",        "OSReport");
+	m_Log[LogTypes::WIIMOTE]            = new LogContainer("Wiimote",         "Wiimote");
+	m_Log[LogTypes::WII_IPC]            = new LogContainer("WII_IPC",         "WII IPC");
+	m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",     "WII IPC HID");
+	m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",     "WII IPC HLE");
+	m_Log[LogTypes::WII_IPC_DVD]        = new LogContainer("WII_IPC_DVD",     "WII IPC DVD");
+	m_Log[LogTypes::WII_IPC_ES]         = new LogContainer("WII_IPC_ES",      "WII IPC ES");
+	m_Log[LogTypes::WII_IPC_FILEIO]     = new LogContainer("WII_IPC_FILEIO",  "WII IPC FILEIO");
+	m_Log[LogTypes::WII_IPC_SD]         = new LogContainer("WII_IPC_SD",      "WII IPC SD");
+	m_Log[LogTypes::WII_IPC_STM]        = new LogContainer("WII_IPC_STM",     "WII IPC STM");
+	m_Log[LogTypes::WII_IPC_NET]        = new LogContainer("WII_IPC_NET",     "WII IPC NET");
+	m_Log[LogTypes::WII_IPC_WC24]       = new LogContainer("WII_IPC_WC24",    "WII IPC WC24");
+	m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",     "WII IPC SSL");
+	m_Log[LogTypes::WII_IPC_WIIMOTE]    = new LogContainer("WII_IPC_WIIMOTE", "WII IPC WIIMOTE");
+	m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",    "ActionReplay");
+	m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager", "MemCard Manager");
+	m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",         "Netplay");
+
+	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX));
+	m_consoleLog = new ConsoleListener();
+
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+	IniFile::Section* logs = ini.GetOrCreateSection("Logs");
+	IniFile::Section* options = ini.GetOrCreateSection("Options");
+	bool write_file;
+	bool write_console;
+	options->Get("WriteToFile", &write_file, false);
+	options->Get("WriteToConsole", &write_console, true);
+
+	for (LogContainer* container : m_Log)
+	{
+		bool enable;
+		logs->Get(container->GetShortName(), &enable, false);
+		container->SetEnable(enable);
+		if (enable && write_file)
+			container->AddListener(m_fileLog);
+		if (enable && write_console)
+			container->AddListener(m_consoleLog);
+	}
+}
+
+LogManager::~LogManager()
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_fileLog);
+		m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_consoleLog);
+	}
+
+	for (LogContainer* container : m_Log)
+		delete container;
+
+	delete m_fileLog;
+	delete m_consoleLog;
+}
+
+void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
+	const char *file, int line, const char *format, va_list args)
+{
+	char temp[MAX_MSGLEN];
+	LogContainer *log = m_Log[type];
+
+	if (!log->IsEnabled() || level > log->GetLevel() || !log->HasListeners())
+		return;
+
+	CharArrayFromFormatV(temp, MAX_MSGLEN, format, args);
+
+	std::string msg = StringFromFormat("%s %s:%u %c[%s]: %s\n",
+	                                   Common::Timer::GetTimeFormatted().c_str(),
+	                                   file, line,
+	                                   LogTypes::LOG_LEVEL_TO_CHAR[(int)level],
+	                                   log->GetShortName().c_str(), temp);
+#ifdef ANDROID
+	__android_log_write(ANDROID_LOG_INFO, "Dolphinemu", msg.c_str());
+#endif
+	log->Trigger(level, msg.c_str());
+}
+
+void LogManager::Init()
+{
+	m_logManager = new LogManager();
+}
+
+void LogManager::Shutdown()
+{
+	delete m_logManager;
+	m_logManager = nullptr;
+}
+
+LogContainer::LogContainer(const std::string& shortName, const std::string& fullName, bool enable)
+	: m_fullName(fullName),
+	  m_shortName(shortName),
+	  m_enable(enable),
+	  m_level(LogTypes::LWARNING)
+{
+}
+
+// LogContainer
+void LogContainer::AddListener(LogListener *listener)
+{
+	std::lock_guard<std::mutex> lk(m_listeners_lock);
+	m_listeners.insert(listener);
+}
+
+void LogContainer::RemoveListener(LogListener *listener)
+{
+	std::lock_guard<std::mutex> lk(m_listeners_lock);
+	m_listeners.erase(listener);
+}
+
+void LogContainer::Trigger(LogTypes::LOG_LEVELS level, const char *msg)
+{
+	std::lock_guard<std::mutex> lk(m_listeners_lock);
+
+	for (LogListener* listener : m_listeners)
+	{
+		listener->Log(level, msg);
+	}
+}
+
+FileLogListener::FileLogListener(const std::string& filename)
+{
+	OpenFStream(m_logfile, filename, std::ios::app);
+	SetEnable(true);
+}
+
+void FileLogListener::Log(LogTypes::LOG_LEVELS, const char *msg)
+{
+	if (!IsEnabled() || !IsValid())
+		return;
+
+	std::lock_guard<std::mutex> lk(m_log_lock);
+	m_logfile << msg << std::flush;
+}
diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
new file mode 100644
index 0000000000..c03610ae02
--- /dev/null
+++ b/Source/Core/Common/Logging/LogManager.h
@@ -0,0 +1,154 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdarg>
+#include <fstream>
+#include <mutex>
+#include <set>
+#include <string>
+
+#include "Common/Common.h"
+
+#define MAX_MESSAGES 8000
+#define MAX_MSGLEN  1024
+
+
+// pure virtual interface
+class LogListener
+{
+public:
+	virtual ~LogListener() {}
+
+	virtual void Log(LogTypes::LOG_LEVELS, const char *msg) = 0;
+};
+
+class FileLogListener : public LogListener
+{
+public:
+	FileLogListener(const std::string& filename);
+
+	void Log(LogTypes::LOG_LEVELS, const char *msg) override;
+
+	bool IsValid() const { return m_logfile.good(); }
+	bool IsEnabled() const { return m_enable; }
+	void SetEnable(bool enable) { m_enable = enable; }
+
+	const char* GetName() const { return "file"; }
+
+private:
+	std::mutex m_log_lock;
+	std::ofstream m_logfile;
+	bool m_enable;
+};
+
+class LogContainer
+{
+public:
+	LogContainer(const std::string& shortName, const std::string& fullName, bool enable = false);
+
+	std::string GetShortName() const { return m_shortName; }
+	std::string GetFullName() const { return m_fullName; }
+
+	void AddListener(LogListener* listener);
+	void RemoveListener(LogListener* listener);
+
+	void Trigger(LogTypes::LOG_LEVELS, const char *msg);
+
+	bool IsEnabled() const { return m_enable; }
+	void SetEnable(bool enable) { m_enable = enable; }
+
+	LogTypes::LOG_LEVELS GetLevel() const { return m_level; }
+
+	void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; }
+
+	bool HasListeners() const { return !m_listeners.empty(); }
+
+private:
+	std::string m_fullName;
+	std::string m_shortName;
+	bool m_enable;
+	LogTypes::LOG_LEVELS m_level;
+	std::mutex m_listeners_lock;
+	std::set<LogListener*> m_listeners;
+};
+
+class ConsoleListener;
+
+class LogManager : NonCopyable
+{
+private:
+	LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
+	FileLogListener *m_fileLog;
+	ConsoleListener *m_consoleLog;
+	static LogManager *m_logManager;  // Singleton. Ugh.
+
+	LogManager();
+	~LogManager();
+public:
+
+	static u32 GetMaxLevel() { return MAX_LOGLEVEL; }
+
+	void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
+			 const char *file, int line, const char *fmt, va_list args);
+
+	void SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
+	{
+		m_Log[type]->SetLevel(level);
+	}
+
+	void SetEnable(LogTypes::LOG_TYPE type, bool enable)
+	{
+		m_Log[type]->SetEnable(enable);
+	}
+
+	bool IsEnabled(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level = LogTypes::LNOTICE) const
+	{
+		return m_Log[type]->IsEnabled() && m_Log[type]->GetLevel() >= level;
+	}
+
+	std::string GetShortName(LogTypes::LOG_TYPE type) const
+	{
+		return m_Log[type]->GetShortName();
+	}
+
+	std::string GetFullName(LogTypes::LOG_TYPE type) const
+	{
+		return m_Log[type]->GetFullName();
+	}
+
+	void AddListener(LogTypes::LOG_TYPE type, LogListener *listener)
+	{
+		m_Log[type]->AddListener(listener);
+	}
+
+	void RemoveListener(LogTypes::LOG_TYPE type, LogListener *listener)
+	{
+		m_Log[type]->RemoveListener(listener);
+	}
+
+	FileLogListener *GetFileListener() const
+	{
+		return m_fileLog;
+	}
+
+	ConsoleListener *GetConsoleListener() const
+	{
+		return m_consoleLog;
+	}
+
+	static LogManager* GetInstance()
+	{
+		return m_logManager;
+	}
+
+	static void SetInstance(LogManager *logManager)
+	{
+		m_logManager = logManager;
+	}
+
+	static void Init();
+	static void Shutdown();
+};
diff --git a/Source/Core/Common/MathUtil.cpp b/Source/Core/Common/MathUtil.cpp
new file mode 100644
index 0000000000..07fa5bf293
--- /dev/null
+++ b/Source/Core/Common/MathUtil.cpp
@@ -0,0 +1,365 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <cstring>
+#include <limits>
+#include <numeric>
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+namespace MathUtil
+{
+
+u32 ClassifyDouble(double dvalue)
+{
+	// TODO: Optimize the below to be as fast as possible.
+	IntDouble value(dvalue);
+	u64 sign = value.i & DOUBLE_SIGN;
+	u64 exp  = value.i & DOUBLE_EXP;
+	if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP)
+	{
+		// Nice normalized number.
+		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+	}
+	else
+	{
+		u64 mantissa = value.i & DOUBLE_FRAC;
+		if (mantissa)
+		{
+			if (exp)
+			{
+				return PPC_FPCLASS_QNAN;
+			}
+			else
+			{
+				// Denormalized number.
+				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+			}
+		}
+		else if (exp)
+		{
+			//Infinite
+			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+		}
+		else
+		{
+			//Zero
+			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+		}
+	}
+}
+
+u32 ClassifyFloat(float fvalue)
+{
+	// TODO: Optimize the below to be as fast as possible.
+	IntFloat value(fvalue);
+	u32 sign = value.i & FLOAT_SIGN;
+	u32 exp  = value.i & FLOAT_EXP;
+	if (exp > FLOAT_ZERO && exp < FLOAT_EXP)
+	{
+		// Nice normalized number.
+		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+	}
+	else
+	{
+		u32 mantissa = value.i & FLOAT_FRAC;
+		if (mantissa)
+		{
+			if (exp)
+			{
+				return PPC_FPCLASS_QNAN; // Quiet NAN
+			}
+			else
+			{
+				// Denormalized number.
+				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+			}
+		}
+		else if (exp)
+		{
+			// Infinite
+			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+		}
+		else
+		{
+			//Zero
+			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+		}
+	}
+}
+
+const int frsqrte_expected_base[] =
+{
+	0x3ffa000, 0x3c29000, 0x38aa000, 0x3572000,
+	0x3279000, 0x2fb7000, 0x2d26000, 0x2ac0000,
+	0x2881000, 0x2665000, 0x2468000, 0x2287000,
+	0x20c1000, 0x1f12000, 0x1d79000, 0x1bf4000,
+	0x1a7e800, 0x17cb800, 0x1552800, 0x130c000,
+	0x10f2000, 0x0eff000, 0x0d2e000, 0x0b7c000,
+	0x09e5000, 0x0867000, 0x06ff000, 0x05ab800,
+	0x046a000, 0x0339800, 0x0218800, 0x0105800,
+};
+const int frsqrte_expected_dec[] =
+{
+	0x7a4, 0x700, 0x670, 0x5f2,
+	0x584, 0x524, 0x4cc, 0x47e,
+	0x43a, 0x3fa, 0x3c2, 0x38e,
+	0x35e, 0x332, 0x30a, 0x2e6,
+	0x568, 0x4f3, 0x48d, 0x435,
+	0x3e7, 0x3a2, 0x365, 0x32e,
+	0x2fc, 0x2d0, 0x2a8, 0x283,
+	0x261, 0x243, 0x226, 0x20b,
+};
+
+double ApproximateReciprocalSquareRoot(double val)
+{
+	union
+	{
+		double valf;
+		s64 vali;
+	};
+	valf = val;
+	s64 mantissa = vali & ((1LL << 52) - 1);
+	s64 sign = vali & (1ULL << 63);
+	s64 exponent = vali & (0x7FFLL << 52);
+
+	// Special case 0
+	if (mantissa == 0 && exponent == 0)
+		return sign ? -std::numeric_limits<double>::infinity() :
+		std::numeric_limits<double>::infinity();
+	// Special case NaN-ish numbers
+	if (exponent == (0x7FFLL << 52))
+	{
+		if (mantissa == 0)
+		{
+			if (sign)
+				return std::numeric_limits<double>::quiet_NaN();
+
+			return 0.0;
+		}
+
+		return 0.0 + valf;
+	}
+
+	// Negative numbers return NaN
+	if (sign)
+		return std::numeric_limits<double>::quiet_NaN();
+
+	if (!exponent)
+	{
+		// "Normalize" denormal values
+		do
+		{
+			exponent -= 1LL << 52;
+			mantissa <<= 1;
+		} while (!(mantissa & (1LL << 52)));
+		mantissa &= (1LL << 52) - 1;
+		exponent += 1LL << 52;
+	}
+
+	bool odd_exponent = !(exponent & (1LL << 52));
+	exponent = ((0x3FFLL << 52) - ((exponent - (0x3FELL << 52)) / 2)) & (0x7FFLL << 52);
+
+	int i = (int)(mantissa >> 37);
+	vali = sign | exponent;
+	int index = i / 2048 + (odd_exponent ? 16 : 0);
+	vali |= (s64)(frsqrte_expected_base[index] - frsqrte_expected_dec[index] * (i % 2048)) << 26;
+	return valf;
+}
+
+const int fres_expected_base[] =
+{
+	0x7ff800, 0x783800, 0x70ea00, 0x6a0800,
+	0x638800, 0x5d6200, 0x579000, 0x520800,
+	0x4cc800, 0x47ca00, 0x430800, 0x3e8000,
+	0x3a2c00, 0x360800, 0x321400, 0x2e4a00,
+	0x2aa800, 0x272c00, 0x23d600, 0x209e00,
+	0x1d8800, 0x1a9000, 0x17ae00, 0x14f800,
+	0x124400, 0x0fbe00, 0x0d3800, 0x0ade00,
+	0x088400, 0x065000, 0x041c00, 0x020c00,
+};
+const int fres_expected_dec[] =
+{
+	0x3e1, 0x3a7, 0x371, 0x340,
+	0x313, 0x2ea, 0x2c4, 0x2a0,
+	0x27f, 0x261, 0x245, 0x22a,
+	0x212, 0x1fb, 0x1e5, 0x1d1,
+	0x1be, 0x1ac, 0x19b, 0x18b,
+	0x17c, 0x16e, 0x15b, 0x15b,
+	0x143, 0x143, 0x12d, 0x12d,
+	0x11a, 0x11a, 0x108, 0x106,
+};
+
+// Used by fres and ps_res.
+double ApproximateReciprocal(double val)
+{
+	union
+	{
+		double valf;
+		s64 vali;
+	};
+
+	valf = val;
+	s64 mantissa = vali & ((1LL << 52) - 1);
+	s64 sign = vali & (1ULL << 63);
+	s64 exponent = vali & (0x7FFLL << 52);
+
+	// Special case 0
+	if (mantissa == 0 && exponent == 0)
+		return sign ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity();
+
+	// Special case NaN-ish numbers
+	if (exponent == (0x7FFLL << 52))
+	{
+		if (mantissa == 0)
+			return sign ? -0.0 : 0.0;
+		return 0.0 + valf;
+	}
+
+	// Special case small inputs
+	if (exponent < (895LL << 52))
+		return sign ? -std::numeric_limits<float>::max() : std::numeric_limits<float>::max();
+
+	// Special case large inputs
+	if (exponent >= (1149LL << 52))
+		return sign ? -0.0f : 0.0f;
+
+	exponent = (0x7FDLL << 52) - exponent;
+
+	int i = (int)(mantissa >> 37);
+	vali = sign | exponent;
+	vali |= (s64)(fres_expected_base[i / 1024] - (fres_expected_dec[i / 1024] * (i % 1024) + 1) / 2) << 29;
+	return valf;
+}
+
+}  // namespace
+
+inline void MatrixMul(int n, const float *a, const float *b, float *result)
+{
+	for (int i = 0; i < n; ++i)
+	{
+		for (int j = 0; j < n; ++j)
+		{
+			float temp = 0;
+			for (int k = 0; k < n; ++k)
+			{
+				temp += a[i * n + k] * b[k * n + j];
+			}
+			result[i * n + j] = temp;
+		}
+	}
+}
+
+// Calculate sum of a float list
+float MathFloatVectorSum(const std::vector<float>& Vec)
+{
+	return std::accumulate(Vec.begin(), Vec.end(), 0.0f);
+}
+
+void Matrix33::LoadIdentity(Matrix33 &mtx)
+{
+	memset(mtx.data, 0, sizeof(mtx.data));
+	mtx.data[0] = 1.0f;
+	mtx.data[4] = 1.0f;
+	mtx.data[8] = 1.0f;
+}
+
+void Matrix33::RotateX(Matrix33 &mtx, float rad)
+{
+	float s = sin(rad);
+	float c = cos(rad);
+	memset(mtx.data, 0, sizeof(mtx.data));
+	mtx.data[0] = 1;
+	mtx.data[4] = c;
+	mtx.data[5] = -s;
+	mtx.data[7] = s;
+	mtx.data[8] = c;
+}
+void Matrix33::RotateY(Matrix33 &mtx, float rad)
+{
+	float s = sin(rad);
+	float c = cos(rad);
+	memset(mtx.data, 0, sizeof(mtx.data));
+	mtx.data[0] = c;
+	mtx.data[2] = s;
+	mtx.data[4] = 1;
+	mtx.data[6] = -s;
+	mtx.data[8] = c;
+}
+
+void Matrix33::Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result)
+{
+	MatrixMul(3, a.data, b.data, result.data);
+}
+
+void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3])
+{
+	for (int i = 0; i < 3; ++i)
+	{
+		result[i] = 0;
+
+		for (int k = 0; k < 3; ++k)
+		{
+			result[i] += a.data[i * 3 + k] * vec[k];
+		}
+	}
+}
+
+void Matrix44::LoadIdentity(Matrix44 &mtx)
+{
+	memset(mtx.data, 0, sizeof(mtx.data));
+	mtx.data[0] = 1.0f;
+	mtx.data[5] = 1.0f;
+	mtx.data[10] = 1.0f;
+	mtx.data[15] = 1.0f;
+}
+
+void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
+{
+	for (int i = 0; i < 3; ++i)
+	{
+		for (int j = 0; j < 3; ++j)
+		{
+			mtx.data[i * 4 + j] = m33.data[i * 3 + j];
+		}
+	}
+
+	for (int i = 0; i < 3; ++i)
+	{
+		mtx.data[i * 4 + 3] = 0;
+		mtx.data[i + 12] = 0;
+	}
+	mtx.data[15] = 1.0f;
+}
+
+void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16])
+{
+	for (int i = 0; i < 16; ++i)
+	{
+		mtx.data[i] = mtxArray[i];
+	}
+}
+
+void Matrix44::Translate(Matrix44 &mtx, const float vec[3])
+{
+	LoadIdentity(mtx);
+	mtx.data[3] = vec[0];
+	mtx.data[7] = vec[1];
+	mtx.data[11] = vec[2];
+}
+
+void Matrix44::Shear(Matrix44 &mtx, const float a, const float b)
+{
+	LoadIdentity(mtx);
+	mtx.data[2] = a;
+	mtx.data[6] = b;
+}
+
+void Matrix44::Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result)
+{
+	MatrixMul(4, a.data, b.data, result.data);
+}
+
diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h
new file mode 100644
index 0000000000..1efeca4066
--- /dev/null
+++ b/Source/Core/Common/MathUtil.h
@@ -0,0 +1,240 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdlib>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+namespace MathUtil
+{
+template<class T>
+inline void Clamp(T* val, const T& min, const T& max)
+{
+	if (*val < min)
+		*val = min;
+	else if (*val > max)
+		*val = max;
+}
+
+template<class T>
+inline T Clamp(const T val, const T& min, const T& max)
+{
+	T ret = val;
+	Clamp(&ret, min, max);
+	return ret;
+}
+
+// The most significant bit of the fraction is an is-quiet bit on all architectures we care about.
+
+static const u64 DOUBLE_SIGN = 0x8000000000000000ULL,
+                 DOUBLE_EXP  = 0x7FF0000000000000ULL,
+                 DOUBLE_FRAC = 0x000FFFFFFFFFFFFFULL,
+                 DOUBLE_ZERO = 0x0000000000000000ULL,
+                 DOUBLE_QBIT = 0x0008000000000000ULL;
+
+static const u32 FLOAT_SIGN = 0x80000000,
+                 FLOAT_EXP  = 0x7F800000,
+                 FLOAT_FRAC = 0x007FFFFF,
+                 FLOAT_ZERO = 0x00000000;
+
+union IntDouble {
+	double d;
+	u64 i;
+
+	explicit IntDouble(u64 _i) : i(_i) {}
+	explicit IntDouble(double _d) : d(_d) {}
+};
+union IntFloat {
+	float f;
+	u32 i;
+
+	explicit IntFloat(u32 _i) : i(_i) {}
+	explicit IntFloat(float _f) : f(_f) {}
+};
+
+inline bool IsINF(double d)
+{
+	IntDouble x(d);
+	return (x.i & ~DOUBLE_SIGN) == DOUBLE_EXP;
+}
+
+inline bool IsNAN(double d)
+{
+	IntDouble x(d);
+	return ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
+	       ((x.i & DOUBLE_FRAC) != DOUBLE_ZERO);
+}
+
+inline bool IsQNAN(double d)
+{
+	IntDouble x(d);
+	return ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
+	       ((x.i & DOUBLE_QBIT) == DOUBLE_QBIT);
+}
+
+inline bool IsSNAN(double d)
+{
+	IntDouble x(d);
+	return ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
+	       ((x.i & DOUBLE_FRAC) != DOUBLE_ZERO) &&
+	       ((x.i & DOUBLE_QBIT) == DOUBLE_ZERO);
+}
+
+inline float FlushToZero(float f)
+{
+	IntFloat x(f);
+	if ((x.i & FLOAT_EXP) == 0)
+	{
+		x.i &= FLOAT_SIGN;  // turn into signed zero
+	}
+	return x.f;
+}
+
+inline double FlushToZero(double d)
+{
+	IntDouble x(d);
+	if ((x.i & DOUBLE_EXP) == 0)
+	{
+		x.i &= DOUBLE_SIGN;  // turn into signed zero
+	}
+	return x.d;
+}
+
+enum PPCFpClass
+{
+	PPC_FPCLASS_QNAN = 0x11,
+	PPC_FPCLASS_NINF = 0x9,
+	PPC_FPCLASS_NN   = 0x8,
+	PPC_FPCLASS_ND   = 0x18,
+	PPC_FPCLASS_NZ   = 0x12,
+	PPC_FPCLASS_PZ   = 0x2,
+	PPC_FPCLASS_PD   = 0x14,
+	PPC_FPCLASS_PN   = 0x4,
+	PPC_FPCLASS_PINF = 0x5,
+};
+
+// Uses PowerPC conventions for the return value, so it can be easily
+// used directly in CPU emulation.
+u32 ClassifyDouble(double dvalue);
+// More efficient float version.
+u32 ClassifyFloat(float fvalue);
+
+extern const int frsqrte_expected_base[];
+extern const int frsqrte_expected_dec[];
+extern const int fres_expected_base[];
+extern const int fres_expected_dec[];
+
+// PowerPC approximation algorithms
+double ApproximateReciprocalSquareRoot(double val);
+double ApproximateReciprocal(double val);
+
+template<class T>
+struct Rectangle
+{
+	T left;
+	T top;
+	T right;
+	T bottom;
+
+	Rectangle()
+	{ }
+
+	Rectangle(T theLeft, T theTop, T theRight, T theBottom)
+		: left(theLeft), top(theTop), right(theRight), bottom(theBottom)
+	{ }
+
+	bool operator==(const Rectangle& r) { return left==r.left && top==r.top && right==r.right && bottom==r.bottom; }
+
+	T GetWidth() const { return abs(right - left); }
+	T GetHeight() const { return abs(bottom - top); }
+
+	// If the rectangle is in a coordinate system with a lower-left origin, use
+	// this Clamp.
+	void ClampLL(T x1, T y1, T x2, T y2)
+	{
+		Clamp(&left, x1, x2);
+		Clamp(&right, x1, x2);
+		Clamp(&top, y2, y1);
+		Clamp(&bottom, y2, y1);
+	}
+
+	// If the rectangle is in a coordinate system with an upper-left origin,
+	// use this Clamp.
+	void ClampUL(T x1, T y1, T x2, T y2)
+	{
+		Clamp(&left, x1, x2);
+		Clamp(&right, x1, x2);
+		Clamp(&top, y1, y2);
+		Clamp(&bottom, y1, y2);
+	}
+};
+
+}  // namespace MathUtil
+
+float MathFloatVectorSum(const std::vector<float>&);
+
+#define ROUND_UP(x, a)   (((x) + (a) - 1) & ~((a) - 1))
+#define ROUND_DOWN(x, a) ((x) & ~((a) - 1))
+
+inline bool IsPow2(u32 imm) {return (imm & (imm - 1)) == 0;}
+
+// Rounds down. 0 -> undefined
+inline int IntLog2(u64 val)
+{
+#if defined(__GNUC__)
+	return 63 - __builtin_clzll(val);
+
+#elif defined(_MSC_VER)
+	unsigned long result = -1;
+	_BitScanReverse64(&result, val);
+	return result;
+
+#else
+	int result = -1;
+	while (val != 0)
+	{
+		val >>= 1;
+		++result;
+	}
+	return result;
+#endif
+}
+
+// Tiny matrix/vector library.
+// Used for things like Free-Look in the gfx backend.
+
+class Matrix33
+{
+public:
+	static void LoadIdentity(Matrix33 &mtx);
+
+	// set mtx to be a rotation matrix around the x axis
+	static void RotateX(Matrix33 &mtx, float rad);
+	// set mtx to be a rotation matrix around the y axis
+	static void RotateY(Matrix33 &mtx, float rad);
+
+	// set result = a x b
+	static void Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result);
+	static void Multiply(const Matrix33 &a, const float vec[3], float result[3]);
+
+	float data[9];
+};
+
+class Matrix44
+{
+public:
+	static void LoadIdentity(Matrix44 &mtx);
+	static void LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33);
+	static void Set(Matrix44 &mtx, const float mtxArray[16]);
+
+	static void Translate(Matrix44 &mtx, const float vec[3]);
+	static void Shear(Matrix44 &mtx, const float a, const float b = 0);
+
+	static void Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result);
+
+	float data[16];
+};
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
new file mode 100644
index 0000000000..291a23ed1f
--- /dev/null
+++ b/Source/Core/Common/MemArena.cpp
@@ -0,0 +1,279 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdlib>
+#include <set>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/MemArena.h"
+#include "Common/StringUtil.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <cerrno>
+#include <cstring>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#ifdef ANDROID
+#include <sys/ioctl.h>
+#include <linux/ashmem.h>
+#endif
+#endif
+
+#ifdef ANDROID
+#define ASHMEM_DEVICE "/dev/ashmem"
+
+static int AshmemCreateFileMapping(const char *name, size_t size)
+{
+	int fd, ret;
+	fd = open(ASHMEM_DEVICE, O_RDWR);
+	if (fd < 0)
+		return fd;
+
+	// We don't really care if we can't set the name, it is optional
+	ioctl(fd, ASHMEM_SET_NAME, name);
+
+	ret = ioctl(fd, ASHMEM_SET_SIZE, size);
+	if (ret < 0)
+	{
+		close(fd);
+		NOTICE_LOG(MEMMAP, "Ashmem returned error: 0x%08x", ret);
+		return ret;
+	}
+	return fd;
+}
+#endif
+
+void MemArena::GrabSHMSegment(size_t size)
+{
+#ifdef _WIN32
+	hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, (DWORD)(size), nullptr);
+#elif defined(ANDROID)
+	fd = AshmemCreateFileMapping("Dolphin-emu", size);
+	if (fd < 0)
+	{
+		NOTICE_LOG(MEMMAP, "Ashmem allocation failed");
+		return;
+	}
+#else
+	for (int i = 0; i < 10000; i++)
+	{
+		std::string file_name = StringFromFormat("dolphinmem.%d", i);
+		fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
+		if (fd != -1)
+		{
+			shm_unlink(file_name.c_str());
+			break;
+		}
+		else if (errno != EEXIST)
+		{
+			ERROR_LOG(MEMMAP, "shm_open failed: %s", strerror(errno));
+			return;
+		}
+	}
+	if (ftruncate(fd, size) < 0)
+		ERROR_LOG(MEMMAP, "Failed to allocate low memory space");
+#endif
+}
+
+
+void MemArena::ReleaseSHMSegment()
+{
+#ifdef _WIN32
+	CloseHandle(hMemoryMapping);
+	hMemoryMapping = 0;
+#else
+	close(fd);
+#endif
+}
+
+
+void *MemArena::CreateView(s64 offset, size_t size, void *base)
+{
+#ifdef _WIN32
+	return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+#else
+	void *retval = mmap(
+		base, size,
+		PROT_READ | PROT_WRITE,
+		MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED),
+		fd, offset);
+
+	if (retval == MAP_FAILED)
+	{
+		NOTICE_LOG(MEMMAP, "mmap failed");
+		return nullptr;
+	}
+	else
+	{
+		return retval;
+	}
+#endif
+}
+
+
+void MemArena::ReleaseView(void* view, size_t size)
+{
+#ifdef _WIN32
+	UnmapViewOfFile(view);
+#else
+	munmap(view, size);
+#endif
+}
+
+
+u8* MemArena::FindMemoryBase()
+{
+#if _ARCH_64
+#ifdef _WIN32
+	// 64 bit
+	u8* base = (u8*)VirtualAlloc(0, 0x400000000, MEM_RESERVE, PAGE_READWRITE);
+	VirtualFree(base, 0, MEM_RELEASE);
+	return base;
+#else
+	// Very precarious - mmap cannot return an error when trying to map already used pages.
+	// This makes the Windows approach above unusable on Linux, so we will simply pray...
+	return reinterpret_cast<u8*>(0x2300000000ULL);
+#endif
+
+#else // 32 bit
+#ifdef ANDROID
+	// Android 4.3 changed how mmap works.
+	// if we map it private and then munmap it, we can't use the base returned.
+	// This may be due to changes in them support a full SELinux implementation.
+	const int flags = MAP_ANON | MAP_SHARED;
+#else
+	const int flags = MAP_ANON | MAP_PRIVATE;
+#endif
+	const u32 MemSize = 0x31000000;
+	void* base = mmap(0, MemSize, PROT_NONE, flags, -1, 0);
+	if (base == MAP_FAILED)
+	{
+		PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno));
+		return 0;
+	}
+	munmap(base, MemSize);
+	return static_cast<u8*>(base);
+#endif
+}
+
+
+// yeah, this could also be done in like two bitwise ops...
+#define SKIP(a_flags, b_flags) \
+	if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) \
+		continue; \
+	if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) \
+		continue; \
+
+static bool Memory_TryBase(u8 *base, MemoryView *views, int num_views, u32 flags, MemArena *arena)
+{
+	// OK, we know where to find free space. Now grab it!
+	// We just mimic the popular BAT setup.
+
+	int i;
+	for (i = 0; i < num_views; i++)
+	{
+		MemoryView* view = &views[i];
+		void* view_base;
+		bool use_sw_mirror;
+
+		SKIP(flags, view->flags);
+
+#if _ARCH_64
+		// On 64-bit, we map the same file position multiple times, so we
+		// don't need the software fallback for the mirrors.
+		view_base = base + view->virtual_address;
+		use_sw_mirror = false;
+#else
+		// On 32-bit, we don't have the actual address space to store all
+		// the mirrors, so we just map the fallbacks somewhere in our address
+		// space and use the software fallbacks for mirroring.
+		view_base = base + (view->virtual_address & 0x3FFFFFFF);
+		use_sw_mirror = true;
+#endif
+
+		if (use_sw_mirror && (view->flags & MV_MIRROR_PREVIOUS))
+		{
+			view->view_ptr = views[i - 1].view_ptr;
+		}
+		else
+		{
+			view->mapped_ptr = arena->CreateView(view->shm_position, view->size, view_base);
+			view->view_ptr = view->mapped_ptr;
+		}
+
+		if (!view->view_ptr)
+		{
+			// Argh! ERROR! Free what we grabbed so far so we can try again.
+			MemoryMap_Shutdown(views, i+1, flags, arena);
+			return false;
+		}
+
+		if (view->out_ptr)
+			*(view->out_ptr) = (u8*) view->view_ptr;
+	}
+
+	return true;
+}
+
+static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags)
+{
+	u32 shm_position = 0;
+	u32 last_position = 0;
+
+	for (int i = 0; i < num_views; i++)
+	{
+		// Zero all the pointers to be sure.
+		views[i].mapped_ptr = nullptr;
+
+		SKIP(flags, views[i].flags);
+
+		if (views[i].flags & MV_MIRROR_PREVIOUS)
+			shm_position = last_position;
+		views[i].shm_position = shm_position;
+		last_position = shm_position;
+		shm_position += views[i].size;
+	}
+
+	return shm_position;
+}
+
+u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena)
+{
+	u32 total_mem = MemoryMap_InitializeViews(views, num_views, flags);
+
+	arena->GrabSHMSegment(total_mem);
+
+	// Now, create views in high memory where there's plenty of space.
+	u8 *base = MemArena::FindMemoryBase();
+	// This really shouldn't fail - in 64-bit, there will always be enough
+	// address space.
+	if (!Memory_TryBase(base, views, num_views, flags, arena))
+	{
+		PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
+		exit(0);
+		return nullptr;
+	}
+
+	return base;
+}
+
+void MemoryMap_Shutdown(MemoryView *views, int num_views, u32 flags, MemArena *arena)
+{
+	std::set<void*> freeset;
+	for (int i = 0; i < num_views; i++)
+	{
+		MemoryView* view = &views[i];
+		if (view->mapped_ptr && !freeset.count(view->mapped_ptr))
+		{
+			arena->ReleaseView(view->mapped_ptr, view->size);
+			freeset.insert(view->mapped_ptr);
+			view->mapped_ptr = nullptr;
+		}
+	}
+}
diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h
new file mode 100644
index 0000000000..fdb7ee1616
--- /dev/null
+++ b/Source/Core/Common/MemArena.h
@@ -0,0 +1,58 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "Common/CommonTypes.h"
+
+// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
+// Multiple views can mirror the same section of the block, which makes it very convenient for emulating
+// memory mirrors.
+
+class MemArena
+{
+public:
+	void GrabSHMSegment(size_t size);
+	void ReleaseSHMSegment();
+	void *CreateView(s64 offset, size_t size, void *base = nullptr);
+	void ReleaseView(void *view, size_t size);
+
+	// This finds 1 GB in 32-bit, 16 GB in 64-bit.
+	static u8 *FindMemoryBase();
+private:
+
+#ifdef _WIN32
+	HANDLE hMemoryMapping;
+#else
+	int fd;
+#endif
+};
+
+enum {
+	MV_MIRROR_PREVIOUS = 1,
+	MV_FAKE_VMEM = 2,
+	MV_WII_ONLY = 4,
+};
+
+struct MemoryView
+{
+	u8** out_ptr;
+	u64 virtual_address;
+	u32 size;
+	u32 flags;
+	void* mapped_ptr;
+	void* view_ptr;
+	u32 shm_position;
+};
+
+// Uses a memory arena to set up an emulator-friendly memory map according to
+// a passed-in list of MemoryView structures.
+u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena);
+void MemoryMap_Shutdown(MemoryView *views, int num_views, u32 flags, MemArena *arena);
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
new file mode 100644
index 0000000000..e4563e3409
--- /dev/null
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -0,0 +1,190 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdlib>
+#include <string>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MemoryUtil.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#include <psapi.h>
+#include "Common/StringUtil.h"
+#else
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+#else
+#include <sys/sysinfo.h>
+#endif
+#endif
+
+void* AllocateExecutableMemory(size_t size, void* map_hint)
+{
+#if defined(_WIN32)
+	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+#else
+	void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC,
+	                 MAP_ANON | MAP_PRIVATE, -1, 0);
+#endif /* defined(_WIN32) */
+
+#ifdef _WIN32
+	if (ptr == nullptr)
+#else
+	if (ptr == MAP_FAILED)
+#endif
+	{
+		ptr = nullptr;
+		PanicAlert("Failed to allocate executable memory.");
+	}
+
+#ifdef _X86_64
+	ptrdiff_t ofs = (u8*)ptr - (u8*)map_hint;
+	if (ofs < -0x80000000ll || ofs + size > 0x80000000ll)
+		PanicAlert("Executable range can't be used for RIP-relative addressing.");
+#endif
+
+	return ptr;
+}
+
+void* AllocateMemoryPages(size_t size)
+{
+#ifdef _WIN32
+	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
+#else
+	void* ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE,
+			MAP_ANON | MAP_PRIVATE, -1, 0);
+
+	if (ptr == MAP_FAILED)
+		ptr = nullptr;
+#endif
+
+	if (ptr == nullptr)
+		PanicAlert("Failed to allocate raw memory");
+
+	return ptr;
+}
+
+void* AllocateAlignedMemory(size_t size, size_t alignment)
+{
+	void* ptr = nullptr;
+#ifdef _WIN32
+	if (!(ptr = _aligned_malloc(size, alignment)))
+#else
+	if (posix_memalign(&ptr, alignment, size))
+#endif
+		PanicAlert("Failed to allocate aligned memory");
+
+	return ptr;
+}
+
+void FreeMemoryPages(void* ptr, size_t size)
+{
+#ifdef _WIN32
+	if (ptr && !VirtualFree(ptr, 0, MEM_RELEASE))
+#else
+	if (ptr && munmap(ptr, size))
+#endif
+		PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg().c_str());
+}
+
+void FreeAlignedMemory(void* ptr)
+{
+	if (ptr)
+	{
+#ifdef _WIN32
+		_aligned_free(ptr);
+#else
+		free(ptr);
+#endif
+	}
+}
+
+void ReadProtectMemory(void* ptr, size_t size)
+{
+#ifdef _WIN32
+	DWORD oldValue;
+	if (!VirtualProtect(ptr, size, PAGE_NOACCESS, &oldValue))
+#else
+	if (mprotect(ptr, size, PROT_NONE))
+#endif
+		PanicAlert("ReadProtectMemory failed!\n%s", GetLastErrorMsg().c_str());
+}
+
+void WriteProtectMemory(void* ptr, size_t size, bool allowExecute)
+{
+#ifdef _WIN32
+	DWORD oldValue;
+	if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue))
+#else
+	if (mprotect(ptr, size, PROT_READ | (allowExecute ? PROT_EXEC : 0)))
+#endif
+		PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg().c_str());
+}
+
+void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute)
+{
+#ifdef _WIN32
+	DWORD oldValue;
+	if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue))
+#else
+	if (mprotect(ptr, size, PROT_READ | PROT_WRITE | (allowExecute ? PROT_EXEC : 0)))
+#endif
+		PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg().c_str());
+}
+
+std::string MemUsage()
+{
+#ifdef _WIN32
+#pragma comment(lib, "psapi")
+	DWORD processID = GetCurrentProcessId();
+	HANDLE hProcess;
+	PROCESS_MEMORY_COUNTERS pmc;
+	std::string Ret;
+
+	// Print information about the memory usage of the process.
+
+	hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID);
+	if (nullptr == hProcess)
+		return "MemUsage Error";
+
+	if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc)))
+		Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str());
+
+	CloseHandle(hProcess);
+	return Ret;
+#else
+	return "";
+#endif
+}
+
+
+size_t MemPhysical()
+{
+#ifdef _WIN32
+	MEMORYSTATUSEX memInfo;
+	memInfo.dwLength = sizeof(MEMORYSTATUSEX);
+	GlobalMemoryStatusEx(&memInfo);
+	return memInfo.ullTotalPhys;
+#elif defined(__APPLE__)
+	int mib[2];
+	size_t physical_memory;
+	mib[0] = CTL_HW;
+	mib[1] = HW_MEMSIZE;
+	size_t length = sizeof(size_t);
+	sysctl(mib, 2, &physical_memory, &length, NULL, 0);
+	return physical_memory;
+#else
+	struct sysinfo memInfo;
+	sysinfo (&memInfo);
+	return (size_t)memInfo.totalram * memInfo.mem_unit;
+#endif
+}
diff --git a/Source/Core/Common/MemoryUtil.h b/Source/Core/Common/MemoryUtil.h
new file mode 100644
index 0000000000..248937611d
--- /dev/null
+++ b/Source/Core/Common/MemoryUtil.h
@@ -0,0 +1,24 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <string>
+
+void* AllocateExecutableMemory(size_t size, void* map_hint);
+void* AllocateMemoryPages(size_t size);
+void FreeMemoryPages(void* ptr, size_t size);
+void* AllocateAlignedMemory(size_t size,size_t alignment);
+void FreeAlignedMemory(void* ptr);
+void ReadProtectMemory(void* ptr, size_t size);
+void WriteProtectMemory(void* ptr, size_t size, bool executable = false);
+void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false);
+std::string MemUsage();
+size_t MemPhysical();
+
+void GuardMemoryMake(void* ptr, size_t size);
+void GuardMemoryUnmake(void* ptr, size_t size);
+
+inline int GetPageSize() { return 4096; }
diff --git a/Source/Core/Common/Misc.cpp b/Source/Core/Common/Misc.cpp
new file mode 100644
index 0000000000..849fa78c75
--- /dev/null
+++ b/Source/Core/Common/Misc.cpp
@@ -0,0 +1,30 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstring>
+#include <errno.h>
+
+#include "Common/CommonFuncs.h"
+
+// Generic function to get last error message.
+// Call directly after the command or use the error num.
+// This function might change the error code.
+std::string GetLastErrorMsg()
+{
+	const size_t buff_size = 256;
+	char err_str[buff_size];
+
+#ifdef _WIN32
+	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(),
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		err_str, buff_size, nullptr);
+#else
+	// Thread safe (XSI-compliant)
+	if (strerror_r(errno, err_str, buff_size))
+		return "";
+#endif
+
+	return std::string(err_str);
+}
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp
similarity index 89%
rename from Source/Core/Common/Src/MsgHandler.cpp
rename to Source/Core/Common/MsgHandler.cpp
index 0fa1cf39b8..5688c400ba 100644
--- a/Source/Core/Common/Src/MsgHandler.cpp
+++ b/Source/Core/Common/MsgHandler.cpp
@@ -1,11 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <stdio.h> // System
+#include <cstdarg>
+#include <cstdio>
+#include <string>
 
-#include "Common.h" // Local
-#include "StringUtil.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
 
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
 static MsgAlertHandler msg_handler = DefaultMsgHandler;
@@ -54,7 +56,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 		crit_caption = str_translator(_trans("Critical"));
 	}
 
-	switch(Style)
+	switch (Style)
 	{
 		case INFORMATION:
 			caption = info_caption;
@@ -72,7 +74,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 
 	va_list args;
 	va_start(args, format);
-	CharArrayFromFormatV(buffer, sizeof(buffer)-1, str_translator(format).c_str(), args);
+	CharArrayFromFormatV(buffer, sizeof(buffer) - 1, str_translator(format).c_str(), args);
 	va_end(args);
 
 	ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer);
diff --git a/Source/Core/Common/Src/MsgHandler.h b/Source/Core/Common/MsgHandler.h
similarity index 80%
rename from Source/Core/Common/Src/MsgHandler.h
rename to Source/Core/Common/MsgHandler.h
index 7de10c7b0a..45a28f8df3 100644
--- a/Source/Core/Common/Src/MsgHandler.h
+++ b/Source/Core/Common/MsgHandler.h
@@ -1,9 +1,8 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _MSGHANDLER_H_
-#define _MSGHANDLER_H_
+#pragma once
 
 #include <string>
 
@@ -16,14 +15,14 @@ enum MSG_TYPE
 	CRITICAL
 };
 
-typedef bool (*MsgAlertHandler)(const char* caption, const char* text, 
+typedef bool (*MsgAlertHandler)(const char* caption, const char* text,
                                 bool yes_no, int Style);
 typedef std::string (*StringTranslator)(const char* text);
 
 void RegisterMsgAlertHandler(MsgAlertHandler handler);
 void RegisterStringTranslator(StringTranslator translator);
 
-extern bool MsgAlert(bool yes_no, int Style, const char* format, ...)
+bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 #ifdef __GNUC__
 	__attribute__((format(printf, 3, 4)))
 #endif
@@ -32,29 +31,29 @@ void SetEnableAlert(bool enable);
 
 #ifndef GEKKO
 #ifdef _WIN32
-	#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) 
-	#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) 
-	#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) 
-	#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) 
-	#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) 
+	#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__)
+	#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__)
+	#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__)
+	#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__)
+	#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__)
 	// Use these macros (that do the same thing) if the message should be translated.
-	#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) 
-	#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) 
-	#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) 
-	#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) 
-	#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) 
+	#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__)
+	#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__)
+	#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__)
+	#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__)
+	#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__)
 #else
-	#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) 
-	#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) 
-	#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) 
-	#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) 
-	#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) 
+	#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__)
+	#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__)
+	#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__)
+	#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__)
+	#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__)
 	// Use these macros (that do the same thing) if the message should be translated.
-	#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) 
-	#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) 
-	#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) 
-	#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) 
-	#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) 
+	#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__)
+	#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__)
+	#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__)
+	#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__)
+	#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__)
 #endif
 #else
 // GEKKO
@@ -69,5 +68,3 @@ void SetEnableAlert(bool enable);
 	#define AskYesNoT(format, ...) ;
 	#define CriticalAlertT(format, ...) ;
 #endif
-
-#endif // _MSGHANDLER_H_
diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp
new file mode 100644
index 0000000000..6037137410
--- /dev/null
+++ b/Source/Core/Common/NandPaths.cpp
@@ -0,0 +1,145 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <fstream>
+#include <string>
+#include <utility>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+
+namespace Common
+{
+
+static std::string s_temp_wii_root;
+
+void InitializeWiiRoot(bool use_dummy)
+{
+	ShutdownWiiRoot();
+	if (use_dummy)
+	{
+		s_temp_wii_root = File::CreateTempDir();
+		if (s_temp_wii_root.empty())
+		{
+			ERROR_LOG(WII_IPC_FILEIO, "Could not create temporary directory");
+			return;
+		}
+		File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, s_temp_wii_root);
+		WARN_LOG(WII_IPC_FILEIO, "Using temporary directory %s for minimal Wii FS", s_temp_wii_root.c_str());
+		static bool s_registered;
+		if (!s_registered)
+		{
+			s_registered = true;
+			atexit(ShutdownWiiRoot);
+		}
+		File::SetUserPath(D_SESSION_WIIROOT_IDX, s_temp_wii_root);
+	}
+	else
+	{
+		File::SetUserPath(D_SESSION_WIIROOT_IDX, File::GetUserPath(D_WIIROOT_IDX));
+	}
+}
+
+void ShutdownWiiRoot()
+{
+	if (!s_temp_wii_root.empty())
+	{
+		File::DeleteDirRecursively(s_temp_wii_root);
+		s_temp_wii_root.clear();
+	}
+}
+
+std::string GetTicketFileName(u64 _titleID)
+{
+	return StringFromFormat("%s/ticket/%08x/%08x.tik",
+			File::GetUserPath(D_SESSION_WIIROOT_IDX).c_str(),
+			(u32)(_titleID >> 32), (u32)_titleID);
+}
+
+std::string GetTitleDataPath(u64 _titleID)
+{
+	return StringFromFormat("%s/title/%08x/%08x/data/",
+			File::GetUserPath(D_SESSION_WIIROOT_IDX).c_str(),
+			(u32)(_titleID >> 32), (u32)_titleID);
+}
+
+std::string GetTMDFileName(u64 _titleID)
+{
+	return GetTitleContentPath(_titleID) + "title.tmd";
+}
+std::string GetTitleContentPath(u64 _titleID)
+{
+	return StringFromFormat("%s/title/%08x/%08x/content/",
+			File::GetUserPath(D_SESSION_WIIROOT_IDX).c_str(),
+			(u32)(_titleID >> 32), (u32)_titleID);
+}
+
+bool CheckTitleTMD(u64 _titleID)
+{
+	const std::string TitlePath = GetTMDFileName(_titleID);
+	if (File::Exists(TitlePath))
+	{
+		File::IOFile pTMDFile(TitlePath, "rb");
+		u64 TitleID = 0;
+		pTMDFile.Seek(0x18C, SEEK_SET);
+		if (pTMDFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
+			return true;
+	}
+	INFO_LOG(DISCIO, "Invalid or no tmd for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF));
+	return false;
+}
+
+bool CheckTitleTIK(u64 _titleID)
+{
+	const std::string ticketFileName = Common::GetTicketFileName(_titleID);
+	if (File::Exists(ticketFileName))
+	{
+		File::IOFile pTIKFile(ticketFileName, "rb");
+		u64 TitleID = 0;
+		pTIKFile.Seek(0x1dC, SEEK_SET);
+		if (pTIKFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
+			return true;
+	}
+	INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF));
+	return false;
+}
+
+static void CreateReplacementFile(std::string &filename)
+{
+	std::ofstream replace;
+	OpenFStream(replace, filename, std::ios_base::out);
+	replace <<"\" __22__\n";
+	replace << "* __2a__\n";
+	//replace << "/ __2f__\n";
+	replace << ": __3a__\n";
+	replace << "< __3c__\n";
+	replace << "> __3e__\n";
+	replace << "? __3f__\n";
+	//replace <<"\\ __5c__\n";
+	replace << "| __7c__\n";
+}
+
+void ReadReplacements(replace_v& replacements)
+{
+	replacements.clear();
+	const std::string replace_fname = "/sys/replace";
+	std::string filename = File::GetUserPath(D_SESSION_WIIROOT_IDX) + replace_fname;
+
+	if (!File::Exists(filename))
+		CreateReplacementFile(filename);
+
+	std::ifstream f;
+	OpenFStream(f, filename, std::ios_base::in);
+	char letter;
+	std::string replacement;
+
+	while (f >> letter >> replacement && replacement.size())
+		replacements.emplace_back(letter, replacement);
+}
+
+}
diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h
new file mode 100644
index 0000000000..6a79abf3bf
--- /dev/null
+++ b/Source/Core/Common/NandPaths.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+static const u64 TITLEID_SYSMENU = 0x0000000100000002;
+static const std::string TITLEID_SYSMENU_STRING = "0000000100000002";
+
+namespace Common
+{
+	typedef std::pair<char, std::string> replace_t;
+	typedef std::vector<replace_t> replace_v;
+
+	void InitializeWiiRoot(bool use_temporary);
+	void ShutdownWiiRoot();
+
+	std::string GetTicketFileName(u64 _titleID);
+	std::string GetTMDFileName(u64 _titleID);
+	std::string GetTitleDataPath(u64 _titleID);
+	std::string GetTitleContentPath(u64 _titleID);
+	bool CheckTitleTMD(u64 _titleID);
+	bool CheckTitleTIK(u64 _titleID);
+	void ReadReplacements(replace_v& replacements);
+}
diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
new file mode 100644
index 0000000000..b0e0f5a624
--- /dev/null
+++ b/Source/Core/Common/Network.cpp
@@ -0,0 +1,70 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cctype>
+#include <ctime>
+
+#include "Common/Network.h"
+#include "Common/StringUtil.h"
+
+void GenerateMacAddress(const MACConsumer type, u8* mac)
+{
+	memset(mac, 0, MAC_ADDRESS_SIZE);
+
+	u8 const oui_bba[] = { 0x00, 0x09, 0xbf };
+	u8 const oui_ios[] = { 0x00, 0x17, 0xab };
+
+	switch (type)
+	{
+	case BBA:
+		memcpy(mac, oui_bba, 3);
+		break;
+	case IOS:
+		memcpy(mac, oui_ios, 3);
+		break;
+	}
+
+	srand((unsigned int)time(nullptr));
+
+	u8 id[3] =
+	{
+		(u8)rand(),
+		(u8)rand(),
+		(u8)rand()
+	};
+
+	memcpy(&mac[3], id, 3);
+}
+
+std::string MacAddressToString(const u8* mac)
+{
+	return StringFromFormat("%02x:%02x:%02x:%02x:%02x:%02x",
+	                        mac[0], mac[1], mac[2],
+	                        mac[3], mac[4], mac[5]);
+}
+
+bool StringToMacAddress(const std::string& mac_string, u8* mac)
+{
+	bool success = false;
+	if (!mac_string.empty())
+	{
+		int x = 0;
+		memset(mac, 0, MAC_ADDRESS_SIZE);
+
+		for (size_t i = 0; i < mac_string.size() && x < (MAC_ADDRESS_SIZE*2); ++i)
+		{
+			char c = tolower(mac_string.at(i));
+			if (c >= '0' && c <= '9')
+			{
+				mac[x / 2] |= (c - '0') << ((x & 1) ? 0 : 4); ++x;
+			}
+			else if (c >= 'a' && c <= 'f')
+			{
+				mac[x / 2] |= (c - 'a' + 10) << ((x & 1) ? 0 : 4); ++x;
+			}
+		}
+		success = x / 2 == MAC_ADDRESS_SIZE;
+	}
+	return success;
+}
diff --git a/Source/Core/Common/Network.h b/Source/Core/Common/Network.h
new file mode 100644
index 0000000000..aea8e729cd
--- /dev/null
+++ b/Source/Core/Common/Network.h
@@ -0,0 +1,24 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+enum MACConsumer
+{
+	BBA = 0,
+	IOS = 1
+};
+
+enum
+{
+	MAC_ADDRESS_SIZE = 6
+};
+
+void GenerateMacAddress(const MACConsumer type, u8* mac);
+std::string MacAddressToString(const u8* mac);
+bool StringToMacAddress(const std::string& mac_string, u8* mac);
diff --git a/Source/Core/Common/PcapFile.cpp b/Source/Core/Common/PcapFile.cpp
new file mode 100644
index 0000000000..0b34ce2daf
--- /dev/null
+++ b/Source/Core/Common/PcapFile.cpp
@@ -0,0 +1,66 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <chrono>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/PcapFile.h"
+
+namespace {
+
+const u32 PCAP_MAGIC = 0xa1b2c3d4;
+const u16 PCAP_VERSION_MAJOR = 2;
+const u16 PCAP_VERSION_MINOR = 4;
+const u32 PCAP_CAPTURE_LENGTH = 65535;
+
+// TODO(delroth): Make this configurable at PCAP creation time?
+const u32 PCAP_DATA_LINK_TYPE = 147;  // Reserved for internal use.
+
+// Designed to be directly written into the PCAP file. The PCAP format is
+// endian independent, so this works just fine.
+#pragma pack(push, 1)
+struct PCAPHeader
+{
+	u32 magic_number;
+	u16 version_major;
+	u16 version_minor;
+	s32 tz_offset;       // Offset in seconds from the GMT timezone.
+	u32 ts_accuracy;     // In practice, 0.
+	u32 capture_length;  // Size at which we truncate packets.
+	u32 data_link_type;
+};
+
+struct PCAPRecordHeader
+{
+	u32 ts_sec;
+	u32 ts_usec;
+	u32 size_in_file;  // Size after eventual truncation.
+	u32 real_size;     // Size before eventual truncation.
+};
+#pragma pack(pop)
+
+}  // namespace
+
+void PCAP::AddHeader()
+{
+	PCAPHeader hdr = {
+		PCAP_MAGIC, PCAP_VERSION_MAJOR, PCAP_VERSION_MINOR,
+		0, 0, PCAP_CAPTURE_LENGTH, PCAP_DATA_LINK_TYPE
+	};
+	m_fp->WriteBytes(&hdr, sizeof (hdr));
+}
+
+void PCAP::AddPacket(const u8* bytes, size_t size)
+{
+	std::chrono::system_clock::time_point now(std::chrono::system_clock::now());
+	auto ts = now.time_since_epoch();
+	PCAPRecordHeader rec_hdr = {
+		(u32)std::chrono::duration_cast<std::chrono::seconds>(ts).count(),
+		(u32)(std::chrono::duration_cast<std::chrono::microseconds>(ts).count() % 1000000),
+		(u32)size, (u32)size
+	};
+	m_fp->WriteBytes(&rec_hdr, sizeof (rec_hdr));
+	m_fp->WriteBytes(bytes, size);
+}
diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h
new file mode 100644
index 0000000000..7e1ecdf6b4
--- /dev/null
+++ b/Source/Core/Common/PcapFile.h
@@ -0,0 +1,44 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// PCAP is a standard file format for network capture files. This also extends
+// to any capture of packetized intercommunication data. This file provides a
+// class called PCAP which is a very light wrapper around the file format,
+// allowing only creating a new PCAP capture file and appending packets to it.
+//
+// Example use:
+//   PCAP pcap(new IOFile("test.pcap", "wb"));
+//   pcap.AddPacket(pkt);  // pkt is automatically casted to u8*
+
+#pragma once
+
+#include <cstddef>
+#include <memory>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+class PCAP final : public NonCopyable
+{
+public:
+	// Takes ownership of the file object. Assumes the file object is already
+	// opened in write mode.
+	explicit PCAP(File::IOFile* fp) : m_fp(fp)
+	{
+		AddHeader();
+	}
+
+	template <typename T>
+	void AddPacket(const T& obj)
+	{
+		AddPacket(reinterpret_cast<const u8*>(&obj), sizeof (obj));
+	}
+
+	void AddPacket(const u8* bytes, size_t size);
+
+private:
+	void AddHeader();
+
+	std::unique_ptr<File::IOFile> m_fp;
+};
diff --git a/Source/Core/Common/PerformanceCounter.cpp b/Source/Core/Common/PerformanceCounter.cpp
new file mode 100644
index 0000000000..a1b8c64e8c
--- /dev/null
+++ b/Source/Core/Common/PerformanceCounter.cpp
@@ -0,0 +1,48 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#if !defined(_WIN32)
+
+#include <cstdint>
+#include <ctime>
+
+#include <unistd.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/PerformanceCounter.h"
+
+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
+#if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK>0
+#define DOLPHIN_CLOCK CLOCK_MONOTONIC
+#else
+#define DOLPHIN_CLOCK CLOCK_REALTIME
+#endif
+#endif
+
+bool QueryPerformanceCounter(u64* out)
+{
+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
+	timespec tp;
+	if (clock_gettime(DOLPHIN_CLOCK, &tp))
+		return false;
+	*out = (u64) tp.tv_nsec + (u64) 1000000000 * (u64) tp.tv_sec;
+	return true;
+#else
+	*out = 0;
+	return false;
+#endif
+}
+
+bool QueryPerformanceFrequency(u64* out)
+{
+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0
+	*out = 1000000000;
+	return true;
+#else
+	*out = 1;
+	return false;
+#endif
+}
+
+#endif
diff --git a/Source/Core/Common/PerformanceCounter.h b/Source/Core/Common/PerformanceCounter.h
new file mode 100644
index 0000000000..97dc946ba1
--- /dev/null
+++ b/Source/Core/Common/PerformanceCounter.h
@@ -0,0 +1,17 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#if !defined(_WIN32)
+
+#include <cstdint>
+
+#include "Common/CommonTypes.h"
+
+typedef u64 LARGE_INTEGER;
+bool QueryPerformanceCounter(u64* out);
+bool QueryPerformanceFrequency(u64* lpFrequency);
+
+#endif
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
new file mode 100644
index 0000000000..8d347afb89
--- /dev/null
+++ b/Source/Core/Common/Profiler.cpp
@@ -0,0 +1,138 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <iomanip>
+#include <ios>
+#include <sstream>
+
+#include "Common/Profiler.h"
+#include "Common/Timer.h"
+
+static const u32 PROFILER_FIELD_LENGTH = 8;
+static const u32 PROFILER_FIELD_LENGTH_FP = PROFILER_FIELD_LENGTH + 3;
+static const int PROFILER_LAZY_DELAY = 60; // in frames
+
+std::list<Profiler*> Profiler::s_all_profilers;
+u32 Profiler::s_max_length = 0;
+u64 Profiler::s_frame_time;
+u64 Profiler::s_usecs_frame;
+
+std::string Profiler::s_lazy_result = "";
+int Profiler::s_lazy_delay = 0;
+
+Profiler::Profiler(const std::string& name)
+: m_name(name), m_usecs(0), m_usecs_min(-1), m_usecs_max(0), m_usecs_quad(0), m_calls(0), m_depth(0)
+{
+	m_time = Common::Timer::GetTimeUs();
+	s_max_length = std::max<u32>(s_max_length, u32(m_name.length()));
+
+	s_all_profilers.push_back(this);
+}
+
+Profiler::~Profiler()
+{
+	s_all_profilers.remove(this);
+}
+
+std::string Profiler::ToString()
+{
+	if (s_lazy_delay > 0)
+	{
+		s_lazy_delay--;
+		return s_lazy_result;
+	}
+	s_lazy_delay = PROFILER_LAZY_DELAY - 1;
+
+	// don't write anything if no profilation is enabled
+	if (s_all_profilers.empty())
+		return "";
+
+	u64 end = Common::Timer::GetTimeUs();
+	s_usecs_frame = end - s_frame_time;
+	s_frame_time = end;
+
+	std::ostringstream buffer;
+	buffer << std::setw(s_max_length) << std::left << "" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << "calls" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << "sum" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << "rel" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << "min" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << "avg" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << "stdev" << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << "max" << " ";
+	buffer << "/ usec" << std::endl;
+
+	for (auto profiler : s_all_profilers)
+	{
+		buffer << profiler->Read() << std::endl;
+	}
+	s_lazy_result = buffer.str();
+	return s_lazy_result;
+}
+
+void Profiler::Start()
+{
+	if (!m_depth++)
+	{
+		m_time = Common::Timer::GetTimeUs();
+	}
+}
+
+void Profiler::Stop()
+{
+	if (!--m_depth)
+	{
+		u64 end = Common::Timer::GetTimeUs();
+
+		u64 diff = end - m_time;
+
+		m_usecs += diff;
+		m_usecs_min = std::min(m_usecs_min, diff);
+		m_usecs_max = std::max(m_usecs_max, diff);
+		m_usecs_quad += diff * diff;
+		m_calls++;
+	}
+}
+
+std::string Profiler::Read()
+{
+	double avg = 0;
+	double stdev = 0;
+	double time_rel = 0;
+	if(m_calls)
+	{
+		avg = double(m_usecs)/m_calls;
+		stdev = std::sqrt(double(m_usecs_quad)/m_calls - avg*avg);
+	}
+	else
+	{
+		m_usecs_min = 0;
+	}
+	if(s_usecs_frame)
+	{
+		time_rel = double(m_usecs)*100/s_usecs_frame;
+	}
+
+	std::ostringstream buffer;
+
+	buffer << std::setw(s_max_length) << std::left << m_name << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << m_calls << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << m_usecs << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << time_rel << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << m_usecs_min << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << std::fixed << std::setprecision(2) << avg << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH_FP) << std::right << std::fixed << std::setprecision(2) << stdev << " ";
+	buffer << std::setw(PROFILER_FIELD_LENGTH) << std::right << m_usecs_max;
+
+	m_usecs = 0;
+	m_usecs_min = -1;
+	m_usecs_max = 0;
+	m_usecs_quad = 0;
+	m_calls = 0;
+
+	return buffer.str();
+}
diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h
new file mode 100644
index 0000000000..0b1a41dde3
--- /dev/null
+++ b/Source/Core/Common/Profiler.h
@@ -0,0 +1,59 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <list>
+#include <string>
+
+#include "CommonTypes.h"
+
+class Profiler
+{
+public:
+	Profiler(const std::string& name);
+	~Profiler();
+
+	static std::string ToString();
+
+	void Start();
+	void Stop();
+	std::string Read();
+
+private:
+	static std::list<Profiler*> s_all_profilers;
+	static u32 s_max_length;
+	static u64 s_frame_time;
+	static u64 s_usecs_frame;
+
+	static std::string s_lazy_result;
+	static int s_lazy_delay;
+
+	std::string m_name;
+	u64 m_usecs;
+	u64 m_usecs_min;
+	u64 m_usecs_max;
+	u64 m_usecs_quad;
+	u64 m_calls;
+	u64 m_time;
+	int m_depth;
+};
+
+class ProfilerExecuter
+{
+public:
+	ProfilerExecuter(Profiler* _p) : m_p(_p)
+	{
+		m_p->Start();
+	}
+	~ProfilerExecuter()
+	{
+		m_p->Stop();
+	}
+private:
+	Profiler* m_p;
+};
+
+// Warning: This profiler isn't thread safe. Only profile functions which doesn't run simultaneously
+#define PROFILE(name) static Profiler prof_gen(name); ProfilerExecuter prof_e(&prof_gen);
diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj
new file mode 100644
index 0000000000..d642b0c565
--- /dev/null
+++ b/Source/Core/Common/SCMRevGen.vcxproj
@@ -0,0 +1,53 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{41279555-F94F-4EBC-99DE-AF863C10C5C4}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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>
+  <PropertyGroup Label="UserMacros" />
+  <!--
+    OutDir is always created, which is annoying for SCMRevGen as it doesn't really have an outdir.
+    Here it's redirected to some other place to hide the annoyance.
+    -->
+  <PropertyGroup>
+    <OutDir>$(BuildRootDir)</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <PreBuildEvent>
+      <Command>cscript /nologo /E:JScript "make_scmrev.h.js"</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="make_scmrev.h.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- force_rebuild.h is a non-existent file used to "trick" msbuild into always re-running this project. -->
+    <ClInclude Include="force_rebuild.h" />
+    <ClInclude Include="scmrev.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Common/Src/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
similarity index 85%
rename from Source/Core/Common/Src/SDCardUtil.cpp
rename to Source/Core/Common/SDCardUtil.cpp
index cf37ffff3e..fe49202a59 100644
--- a/Source/Core/Common/Src/SDCardUtil.cpp
+++ b/Source/Core/Common/SDCardUtil.cpp
@@ -1,3 +1,7 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 /* mksdcard.c
 **
 ** Copyright 2007, The Android Open Source Project
@@ -28,14 +32,16 @@
 // A simple and portable piece of code used to generate a blank FAT32 image file.
 // Modified for Dolphin.
 
-#include "SDCardUtil.h"
-#include "FileUtil.h"
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <string>
 
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/SDCardUtil.h"
 
 #ifndef _WIN32
 #include <unistd.h> // for unlink()
@@ -187,7 +193,7 @@ static unsigned int write_empty(FILE* file, u64 count)
 	return 0;
 }
 
-bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename)
+bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename)
 {
 	u32 sectors_per_fat;
 	u32 sectors_per_disk;
@@ -195,8 +201,9 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename)
 	// Convert MB to bytes
 	disk_size *= 1024 * 1024;
 
-	if (disk_size < 0x800000 || disk_size > 0x800000000ULL) {
-		ERROR_LOG(COMMON, "Trying to create SD Card image of size %lliMB is out of range (8MB-32GB)", disk_size/(1024*1024));
+	if (disk_size < 0x800000 || disk_size > 0x800000000ULL)
+	{
+		ERROR_LOG(COMMON, "Trying to create SD Card image of size %" PRIu64 "MB is out of range (8MB-32GB)", disk_size/(1024*1024));
 		return false;
 	}
 
@@ -211,7 +218,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename)
 	FILE* const f = file.GetHandle();
 	if (!f)
 	{
-		ERROR_LOG(COMMON, "Could not create file '%s', aborting...\n", filename);
+		ERROR_LOG(COMMON, "Could not create file '%s', aborting...\n", filename.c_str());
 		return false;
 	}
 
@@ -228,31 +235,51 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename)
 	*  zero sectors
 	*/
 
-	if (write_sector(f, s_boot_sector))		goto FailWrite;
-	if (write_sector(f, s_fsinfo_sector))	goto FailWrite;
+	if (write_sector(f, s_boot_sector))
+		goto FailWrite;
+
+	if (write_sector(f, s_fsinfo_sector))
+		goto FailWrite;
+
 	if (BACKUP_BOOT_SECTOR > 0)
 	{
-		if (write_empty(f, BACKUP_BOOT_SECTOR - 2)) goto FailWrite;
-		if (write_sector(f, s_boot_sector))		goto FailWrite;
-		if (write_sector(f, s_fsinfo_sector))	goto FailWrite;
-		if (write_empty(f, RESERVED_SECTORS - 2 - BACKUP_BOOT_SECTOR)) goto FailWrite;
+		if (write_empty(f, BACKUP_BOOT_SECTOR - 2))
+			goto FailWrite;
+
+		if (write_sector(f, s_boot_sector))
+			goto FailWrite;
+
+		if (write_sector(f, s_fsinfo_sector))
+			goto FailWrite;
+
+		if (write_empty(f, RESERVED_SECTORS - 2 - BACKUP_BOOT_SECTOR))
+			goto FailWrite;
 	}
 	else
+	{
 		if (write_empty(f, RESERVED_SECTORS - 2)) goto FailWrite;
+	}
 
-	if (write_sector(f, s_fat_head))		goto FailWrite;
-	if (write_empty(f, sectors_per_fat-1))	goto FailWrite;
+	if (write_sector(f, s_fat_head))
+		goto FailWrite;
 
-	if (write_sector(f, s_fat_head))		goto FailWrite;
-	if (write_empty(f, sectors_per_fat-1))	goto FailWrite;
+	if (write_empty(f, sectors_per_fat - 1))
+		goto FailWrite;
 
-	if (write_empty(f, sectors_per_disk - RESERVED_SECTORS - 2*sectors_per_fat)) goto FailWrite;
+	if (write_sector(f, s_fat_head))
+		goto FailWrite;
+
+	if (write_empty(f, sectors_per_fat - 1))
+		goto FailWrite;
+
+	if (write_empty(f, sectors_per_disk - RESERVED_SECTORS - 2*sectors_per_fat))
+		goto FailWrite;
 
 	return true;
 
 FailWrite:
-	ERROR_LOG(COMMON, "Could not write to '%s', aborting...\n", filename);
-	if (unlink(filename) < 0)
-		ERROR_LOG(COMMON, "unlink(%s) failed\n%s", filename, GetLastErrorMsg());
+	ERROR_LOG(COMMON, "Could not write to '%s', aborting...\n", filename.c_str());
+	if (unlink(filename.c_str()) < 0)
+		ERROR_LOG(COMMON, "unlink(%s) failed\n%s", filename.c_str(), GetLastErrorMsg().c_str());
 	return false;
 }
diff --git a/Source/Core/Common/SDCardUtil.h b/Source/Core/Common/SDCardUtil.h
new file mode 100644
index 0000000000..64670aa9a9
--- /dev/null
+++ b/Source/Core/Common/SDCardUtil.h
@@ -0,0 +1,10 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "Common/CommonTypes.h"
+
+bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename);
diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj
deleted file mode 100644
index 803e059d19..0000000000
--- a/Source/Core/Common/SVNRevGen.vcxproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="make_scmrev.h.js">
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="force_rebuild.h" />
-    <ClInclude Include="Src\scmrev.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>
-    <RootNamespace>SVNRevGen</RootNamespace>
-    <ProjectName>SCMRevGen</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>
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>cscript /nologo /E:JScript "make_scmrev.h.js"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Core/Common/Src/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
similarity index 78%
rename from Source/Core/Common/Src/SettingsHandler.cpp
rename to Source/Core/Common/SettingsHandler.cpp
index 3bd9b27c2f..cfbda9795e 100644
--- a/Source/Core/Common/Src/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -1,24 +1,26 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Timer.h"
-#include "SettingsHandler.h"
-
-#include <time.h>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <string>
 
 #ifdef _WIN32
-#include <Windows.h>
 #include <mmsystem.h>
 #include <sys/timeb.h>
-#else
-#include <sys/time.h>
+#include <windows.h>
+#include "Common/CommonFuncs.h" // snprintf
 #endif
 
+#include "Common/CommonTypes.h"
+#include "Common/SettingsHandler.h"
+#include "Common/Timer.h"
+
 SettingsHandler::SettingsHandler()
 {
 	Reset();
@@ -29,7 +31,7 @@ const u8* SettingsHandler::GetData() const
 	return m_buffer;
 }
 
-const std::string SettingsHandler::GetValue(const std::string key)
+const std::string SettingsHandler::GetValue(const std::string& key)
 {
 	std::string delim = std::string("\r\n");
 	std::string toFind = delim + key + "=";
@@ -80,20 +82,18 @@ void SettingsHandler::Reset()
 	memset(m_buffer, 0, SETTINGS_SIZE);
 }
 
-void SettingsHandler::AddSetting(const char *key, const char *value)
+void SettingsHandler::AddSetting(const std::string& key, const std::string& value)
 {
-	while (*key != 0)
+	for (const char& c : key)
 	{
-		WriteByte(*key);
-		key++;
+		WriteByte(c);
 	}
 
 	WriteByte('=');
 
-	while (*value != 0)
+	for (const char& c : value)
 	{
-		WriteByte(*value);
-		value++;
+		WriteByte(c);
 	}
 
 	WriteByte(13);
diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h
new file mode 100644
index 0000000000..e1da1ea992
--- /dev/null
+++ b/Source/Core/Common/SettingsHandler.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Thanks to Treeki for writing the original class - 29/01/2012
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+class SettingsHandler
+{
+public:
+	SettingsHandler();
+
+	enum
+	{
+		SETTINGS_SIZE = 0x100,
+		// Key used to encrypt/decrypt setting.txt contents
+		INITIAL_SEED = 0x73B5DBFA
+	};
+
+	void AddSetting(const std::string& key, const std::string& value);
+
+	const u8 *GetData() const;
+	const std::string GetValue(const std::string& key);
+
+	void Decrypt();
+	void Reset();
+	const std::string generateSerialNumber();
+
+private:
+	void WriteByte(u8 b);
+
+	u8 m_buffer[SETTINGS_SIZE];
+	u32 m_position, m_key;
+	std::string decoded;
+};
diff --git a/Source/Core/Common/Src/ArmCPUDetect.cpp b/Source/Core/Common/Src/ArmCPUDetect.cpp
deleted file mode 100644
index ef49d6efb1..0000000000
--- a/Source/Core/Common/Src/ArmCPUDetect.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "CPUDetect.h"
-#include "FileUtil.h"
-
-// Only Linux platforms have /proc/cpuinfo
-#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
-const char procfile[] = "/proc/cpuinfo";
-
-char *GetCPUString()
-{
-	const char marker[] = "Hardware\t: ";
-	char *cpu_string = 0;
-	// Count the number of processor lines in /proc/cpuinfo
-	char buf[1024];
-
-	File::IOFile file(procfile, "r");
-	auto const fp = file.GetHandle();
-	if (!fp)
-		return 0;
-	
-	while (fgets(buf, sizeof(buf), fp))
-	{
-		if (strncmp(buf, marker, sizeof(marker) - 1))
-			continue;
-		cpu_string = buf + sizeof(marker) - 1;
-		cpu_string = strndup(cpu_string, strlen(cpu_string) - 1); // Strip the newline
-		break;
-	}
-	
-	return cpu_string;
-}
-
-unsigned char GetCPUImplementer()
-{
-	const char marker[] = "CPU implementer\t: ";
-	char *implementer_string = 0;
-	unsigned char implementer = 0;
-	char buf[1024];
-
-	File::IOFile file(procfile, "r");
-	auto const fp = file.GetHandle();
-	if (!fp)
-		return 0;
-
-	while (fgets(buf, sizeof(buf), fp))
-	{
-		if (strncmp(buf, marker, sizeof(marker) - 1))
-			continue;
-		implementer_string = buf + sizeof(marker) - 1;
-		implementer_string = strndup(implementer_string, strlen(implementer_string) - 1); // Strip the newline
-		sscanf(implementer_string, "0x%02hhx", &implementer);
-		break;
-	}
-
-	free(implementer_string);
-
-	return implementer;
-}
-
-unsigned short GetCPUPart()
-{
-	const char marker[] = "CPU part\t: ";
-	char *part_string = 0;
-	unsigned short part = 0;
-	char buf[1024];
-
-	File::IOFile file(procfile, "r");
-	auto const fp = file.GetHandle();
-	if (!fp)
-		return 0;
-
-	while (fgets(buf, sizeof(buf), fp))
-	{
-		if (strncmp(buf, marker, sizeof(marker) - 1))
-			continue;
-		part_string = buf + sizeof(marker) - 1;
-		part_string = strndup(part_string, strlen(part_string) - 1); // Strip the newline
-		sscanf(part_string, "0x%03hx", &part);
-		break;
-	}
-
-	free(part_string);
-
-	return part;
-}
-
-bool CheckCPUFeature(const char *feature)
-{
-	const char marker[] = "Features\t: ";
-	char buf[1024];
-
-	File::IOFile file(procfile, "r");
-	auto const fp = file.GetHandle();
-	if (!fp)
-		return 0;
-	
-	while (fgets(buf, sizeof(buf), fp))
-	{
-		if (strncmp(buf, marker, sizeof(marker) - 1))
-			continue;
-		char *featurestring = buf + sizeof(marker) - 1;
-		char *token = strtok(featurestring, " ");
-		while (token != NULL)
-		{
-			if (strstr(token, feature))
-				return true; 
-			token = strtok(NULL, " ");
-		}
-	}
-	
-	return false;
-}
-#endif
-
-int GetCoreCount()
-{
-#ifdef __SYMBIAN32__
-	return 1;
-#elif defined(BLACKBERRY) || defined(IOS)
-	return 2;
-#else
-	const char marker[] = "processor\t: ";
-	int cores = 0;
-	char buf[1024];
-
-	File::IOFile file(procfile, "r");
-	auto const fp = file.GetHandle();
-	if (!fp)
-		return 0;
-	
-	while (fgets(buf, sizeof(buf), fp))
-	{
-		if (strncmp(buf, marker, sizeof(marker) - 1))
-			continue;
-		++cores;
-	}
-	
-	return cores;
-#endif
-}
-
-CPUInfo cpu_info;
-
-CPUInfo::CPUInfo() {
-	Detect();
-}
-
-// Detects the various cpu features
-void CPUInfo::Detect()
-{
-	// Set some defaults here
-	// When ARMv8 cpus come out, these need to be updated.
-	HTT = false;
-	OS64bit = false;
-	CPU64bit = false;
-	Mode64bit = false;				 
-	vendor = VENDOR_ARM;
-	
-	// Get the information about the CPU 
-	num_cores = GetCoreCount();
-#if defined(__SYMBIAN32__) || defined(BLACKBERRY) || defined(IOS)
-	bool isVFP3 = false;
-	bool isVFP4 = false;
-#ifdef IOS
-	isVFP3 = true;
-    // Check for swift arch (VFP4`)
-    #ifdef __ARM_ARCH_7S__
-        isVFP4 = true;
-    #endif // #ifdef __ARM_ARCH_7S__
-#elif defined(BLACKBERRY)
-	isVFP3 = true;
-	const char cpuInfoPath[] = "/pps/services/hw_info/inventory";
-	const char marker[] = "Processor_Name::";
-	const char qcCPU[] = "MSM";
-	char buf[1024];
-	FILE* fp;
-	if (fp = fopen(cpuInfoPath, "r"))
-	{
-		while (fgets(buf, sizeof(buf), fp))
-		{
-			if (strncmp(buf, marker, sizeof(marker) - 1))
-				continue;
-			if (strncmp(buf + sizeof(marker) - 1, qcCPU, sizeof(qcCPU) - 1) == 0)
-				isVFP4 = true;
-			break;
-		}
-		fclose(fp);
-	}
-#endif
-	// Hardcode this for now
-	bSwp = true;
-	bHalf = true;
-	bThumb = false;
-	bFastMult = true;
-	bVFP = true;
-	bEDSP = true;
-	bThumbEE = isVFP3;
-	bNEON = isVFP3;
-	bVFPv3 = isVFP3;
-	bTLS = true;
-	bVFPv4 = isVFP4;
-	bIDIVa = isVFP4;
-	bIDIVt = isVFP4;
-	bFP = false;
-	bASIMD = false;
-#else
-	strncpy(cpu_string, GetCPUString(), sizeof(cpu_string));
-	bSwp = CheckCPUFeature("swp");
-	bHalf = CheckCPUFeature("half");
-	bThumb = CheckCPUFeature("thumb");
-	bFastMult = CheckCPUFeature("fastmult");
-	bVFP = CheckCPUFeature("vfp");
-	bEDSP = CheckCPUFeature("edsp");
-	bThumbEE = CheckCPUFeature("thumbee");
-	bNEON = CheckCPUFeature("neon");
-	bVFPv3 = CheckCPUFeature("vfpv3");
-	bTLS = CheckCPUFeature("tls");
-	bVFPv4 = CheckCPUFeature("vfpv4");
-	bIDIVa = CheckCPUFeature("idiva");
-	bIDIVt = CheckCPUFeature("idivt");
-	// Qualcomm Krait supports IDIVA but it doesn't report it. Check for krait.
-	if (GetCPUImplementer() == 0x51 && GetCPUPart() == 0x6F) // Krait(300) is 0x6F, Scorpion is 0x4D
-		bIDIVa = bIDIVt = true;
-	// These two require ARMv8 or higher
-	bFP = CheckCPUFeature("fp");
-	bASIMD = CheckCPUFeature("asimd");
-#endif
-// On android, we build a separate library for ARMv7 so this is fine.
-// TODO: Check for ARMv7 on other platforms.
-#if defined(__ARM_ARCH_7A__)
-	bArmV7 = true;
-#else
-	bArmV7 = false;
-#endif
-}
-
-// Turn the cpu info into a string we can show
-std::string CPUInfo::Summarize()
-{
-	std::string sum;
-#if defined(BLACKBERRY) || defined(IOS) || defined(__SYMBIAN32__)
-	sum = StringFromFormat("%i cores", num_cores);
-#else
-	if (num_cores == 1)
-		sum = StringFromFormat("%s, %i core", cpu_string, num_cores);
-	else
-		sum = StringFromFormat("%s, %i cores", cpu_string, num_cores);
-#endif
-	if (bSwp) sum += ", SWP";
-	if (bHalf) sum += ", Half";
-	if (bThumb) sum += ", Thumb";
-	if (bFastMult) sum += ", FastMult";
-	if (bVFP) sum += ", VFP";
-	if (bEDSP) sum += ", EDSP";
-	if (bThumbEE) sum += ", ThumbEE";
-	if (bNEON) sum += ", NEON";
-	if (bVFPv3) sum += ", VFPv3";
-	if (bTLS) sum += ", TLS";
-	if (bVFPv4) sum += ", VFPv4";
-	if (bIDIVa) sum += ", IDIVa";
-	if (bIDIVt) sum += ", IDIVt";
-
-	return sum;
-}
diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp
deleted file mode 100644
index 4299bf692e..0000000000
--- a/Source/Core/Common/Src/ArmEmitter.cpp
+++ /dev/null
@@ -1,1390 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "ArmEmitter.h"
-#include "CPUDetect.h"
-
-#include <assert.h>
-#include <stdarg.h>
-
-// For cache flushing on Symbian/iOS/Blackberry
-#ifdef __SYMBIAN32__
-#include <e32std.h>
-#endif
-
-#ifdef IOS
-#include <libkern/OSCacheControl.h>
-#include <sys/mman.h>
-#endif
-
-#ifdef BLACKBERRY
-#include <sys/mman.h>
-#endif
-
-namespace ArmGen
-{
-
-inline u32 RotR(u32 a, int amount) {
-	if (!amount) return a;
-	return (a >> amount) | (a << (32 - amount));
-}
-
-inline u32 RotL(u32 a, int amount) {
-	if (!amount) return a;
-	return (a << amount) | (a >> (32 - amount));
-}
-
-bool TryMakeOperand2(u32 imm, Operand2 &op2) {
-	// Just brute force it.
-	for (int i = 0; i < 16; i++) {
-		int mask = RotR(0xFF, i * 2);
-		if ((imm & mask) == imm) {
-			op2 = Operand2((u8)(RotL(imm, i * 2)), (u8)i);
-			return true;
-		}
-	}
-	return false;
-}
-
-bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse)
-{
-	if (!TryMakeOperand2(imm, op2)) {
-		*inverse = true;
-		return TryMakeOperand2(~imm, op2);
-	} else {
-		*inverse = false;
-		return true;
-	}
-}
-
-bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
-{
-	if (!TryMakeOperand2(imm, op2)) {
-		*negated = true;
-		return TryMakeOperand2(-imm, op2);
-	} else {
-		*negated = false;
-		return true;
-	}
-}
-
-Operand2 AssumeMakeOperand2(u32 imm) {
-	Operand2 op2;
-	bool result = TryMakeOperand2(imm, op2);
-	(void) result;
-	_dbg_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2.");
-	return op2;
-}
-
-bool ARMXEmitter::TrySetValue_TwoOp(ARMReg reg, u32 val)
-{
-	int ops = 0;
-	for (int i = 0; i < 16; i++)
-	{
-		if ((val >> (i*2)) & 0x3)
-		{
-			ops++;
-			i+=3;
-		}
-	}
-	if (ops > 2)
-		return false;
-	
-	bool first = true;
-	for (int i = 0; i < 16; i++, val >>=2) {
-		if (val & 0x3) {
-			first ? MOV(reg, Operand2((u8)val, (u8)((16-i) & 0xF)))
-				  : ORR(reg, reg, Operand2((u8)val, (u8)((16-i) & 0xF)));
-			first = false;
-			i+=3;
-			val >>= 6;
-		}
-	}
-	return true;
-}
-
-void ARMXEmitter::MOVI2F(ARMReg dest, float val, ARMReg tempReg, bool negate)
-{
-	union {float f; u32 u;} conv;
-	conv.f = negate ? -val : val;
-	// Try moving directly first if mantisse is empty
-	if (cpu_info.bVFPv3 && ((conv.u & 0x7FFFF) == 0))
-	{
-		// VFP Encoding for Imms: <7> Not(<6>) Repeat(<6>,5) <5:0> Zeros(19)
-		bool bit6 = (conv.u & 0x40000000) == 0x40000000;
-		bool canEncode = true;
-		for (u32 mask = 0x20000000; mask >= 0x2000000; mask >>= 1)
-		{
-			if (((conv.u & mask) == mask) == bit6)
-				canEncode = false;
-		}
-		if (canEncode)
-		{
-			u32 imm8 = (conv.u & 0x80000000) >> 24; // sign bit
-			imm8 |= (!bit6 << 6);
-			imm8 |= (conv.u & 0x1F80000) >> 19;
-			VMOV(dest, IMM(imm8));
-			return;
-		}
-	}
-	MOVI2R(tempReg, conv.u);
-	VMOV(dest, tempReg);
-	// Otherwise, possible to use a literal pool and VLDR directly (+- 1020)
-}
-
-void ARMXEmitter::ADDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
-{
-	Operand2 op2;
-	bool negated;
-	if (TryMakeOperand2_AllowNegation(val, op2, &negated)) {
-		if (!negated)
-			ADD(rd, rs, op2);
-		else
-			SUB(rd, rs, op2);
-	} else {
-		MOVI2R(scratch, val);
-		ADD(rd, rs, scratch);
-	}
-}
-
-void ARMXEmitter::ANDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
-{
-	Operand2 op2;
-	bool inverse;
-	if (TryMakeOperand2_AllowInverse(val, op2, &inverse)) {
-		if (!inverse) {
-			AND(rd, rs, op2);
-		} else {
-			BIC(rd, rs, op2);
-		}
-	} else {
-		MOVI2R(scratch, val);
-		AND(rd, rs, scratch);
-	}
-}
-
-void ARMXEmitter::CMPI2R(ARMReg rs, u32 val, ARMReg scratch)
-{
-	Operand2 op2;
-	bool negated;
-	if (TryMakeOperand2_AllowNegation(val, op2, &negated)) {
-		if (!negated)
-			CMP(rs, op2);
-		else
-			CMN(rs, op2);
-	} else {
-		MOVI2R(scratch, val);
-		CMP(rs, scratch);
-	}
-}
-
-void ARMXEmitter::ORI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
-{
-	Operand2 op2;
-	if (TryMakeOperand2(val, op2)) {
-		ORR(rd, rs, op2);
-	} else {
-		MOVI2R(scratch, val);
-		ORR(rd, rs, scratch);
-	}
-}
-
-void ARMXEmitter::FlushLitPool()
-{
-	for(std::vector<LiteralPool>::iterator it = currentLitPool.begin(); it != currentLitPool.end(); ++it) {
-		// Search for duplicates
-		for(std::vector<LiteralPool>::iterator old_it = currentLitPool.begin(); old_it != it; ++old_it) {
-			if ((*old_it).val == (*it).val)
-				(*it).loc = (*old_it).loc;
-		}
-
-		// Write the constant to Literal Pool
-		if (!(*it).loc)
-		{
-			(*it).loc = (s32)code;
-			Write32((*it).val);
-		}
-		s32 offset = (*it).loc - (s32)(*it).ldr_address - 8;
-
-		// Backpatch the LDR
-		*(u32*)(*it).ldr_address |= (offset >= 0) << 23 | abs(offset);
-	}
-	// TODO: Save a copy of previous pools in case they are still in range.
-	currentLitPool.clear();
-}
-
-void ARMXEmitter::AddNewLit(u32 val)
-{
-	LiteralPool pool_item;
-	pool_item.loc = 0;
-	pool_item.val = val;
-	pool_item.ldr_address = code;
-	currentLitPool.push_back(pool_item);
-}
-
-void ARMXEmitter::MOVI2R(ARMReg reg, u32 val, bool optimize)
-{
-	Operand2 op2;
-	bool inverse;
-
-	if (cpu_info.bArmV7 && !optimize)
-	{
-		// For backpatching on ARMv7
-		MOVW(reg, val & 0xFFFF);
-		MOVT(reg, val, true);
-	}
-	else if (TryMakeOperand2_AllowInverse(val, op2, &inverse)) {
-		inverse ? MVN(reg, op2) : MOV(reg, op2);
-	} else {
-		if (cpu_info.bArmV7)
-		{
-			// Use MOVW+MOVT for ARMv7+
-			MOVW(reg, val & 0xFFFF);
-			if(val & 0xFFFF0000)
-				MOVT(reg, val, true);
-		} else if (!TrySetValue_TwoOp(reg,val)) {
-			// Use literal pool for ARMv6.
-			AddNewLit(val);
-			LDR(reg, _PC); // To be backpatched later
-		}
-	}
-}
-
-void ARMXEmitter::QuickCallFunction(ARMReg reg, void *func) {
-	if (BLInRange(func)) {
-		BL(func);
-	} else {
-		MOVI2R(reg, (u32)(func));
-		BL(reg);
-	}
-}
-
-void ARMXEmitter::SetCodePtr(u8 *ptr)
-{
-	code = ptr;
-	startcode = code;
-	lastCacheFlushEnd = ptr;
-}
-
-const u8 *ARMXEmitter::GetCodePtr() const
-{
-	return code;
-}
-
-u8 *ARMXEmitter::GetWritableCodePtr()
-{
-	return code;
-}
-
-void ARMXEmitter::ReserveCodeSpace(u32 bytes)
-{
-	for (u32 i = 0; i < bytes/4; i++)
-		Write32(0xE1200070); //bkpt 0
-}
-
-const u8 *ARMXEmitter::AlignCode16()
-{
-	ReserveCodeSpace((-(s32)code) & 15);
-	return code;
-}
-
-const u8 *ARMXEmitter::AlignCodePage()
-{
-	ReserveCodeSpace((-(s32)code) & 4095);
-	return code;
-}
-
-void ARMXEmitter::FlushIcache()
-{
-	FlushIcacheSection(lastCacheFlushEnd, code);
-	lastCacheFlushEnd = code;
-}
-
-void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end)
-{
-#ifdef __SYMBIAN32__
-	User::IMB_Range(start, end);
-#elif defined(BLACKBERRY)
-	msync(start, end - start, MS_SYNC | MS_INVALIDATE_ICACHE);
-#elif defined(IOS)
-	// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
-	sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
-#elif !defined(_WIN32)
-#ifdef __clang__
-	__clear_cache(start, end);
-#else
-	__builtin___clear_cache(start, end);
-#endif
-#endif
-}
-
-void ARMXEmitter::SetCC(CCFlags cond)
-{
-	condition = cond << 28;
-}
-
-void ARMXEmitter::NOP(int count)
-{
-	for (int i = 0; i < count; i++) {
-		Write32(condition | 0x01A00000);
-	}
-}
-
-void ARMXEmitter::SETEND(bool BE)
-{
-	//SETEND is non-conditional
-	Write32( 0xF1010000 | (BE << 9));
-}
-void ARMXEmitter::BKPT(u16 arg)
-{
-	Write32(condition | 0x01200070 | (arg << 4 & 0x000FFF00) | (arg & 0x0000000F));
-}
-void ARMXEmitter::YIELD()
-{
-	Write32(condition | 0x0320F001);
-}
-
-FixupBranch ARMXEmitter::B()
-{
-	FixupBranch branch;
-	branch.type = 0; // Zero for B
-	branch.ptr = code;
-	branch.condition = condition;
-	//We'll write NOP here for now.
-	Write32(condition | 0x01A00000);
-	return branch;
-}
-FixupBranch ARMXEmitter::BL()
-{
-	FixupBranch branch;
-	branch.type = 1; // Zero for B
-	branch.ptr = code;
-	branch.condition = condition;
-	//We'll write NOP here for now.
-	Write32(condition | 0x01A00000);
-	return branch;
-}
-
-FixupBranch ARMXEmitter::B_CC(CCFlags Cond)
-{
-	FixupBranch branch;
-	branch.type = 0; // Zero for B
-	branch.ptr = code;
-	branch.condition = Cond << 28;
-	//We'll write NOP here for now.
-	Write32(condition | 0x01A00000);
-	return branch;
-}
-void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr)
-{
-	s32 distance = (s32)fnptr - (s32(code) + 8);
-        _dbg_assert_msg_(DYNA_REC, distance > -33554432
-                     && distance <=  33554432,
-                     "B_CC out of range (%p calls %p)", code, fnptr);
-
-	Write32((Cond << 28) | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF));
-}
-FixupBranch ARMXEmitter::BL_CC(CCFlags Cond)
-{
-	FixupBranch branch;
-	branch.type = 1; // Zero for B
-	branch.ptr = code;
-	branch.condition = Cond << 28;
-	//We'll write NOP here for now.
-	Write32(condition | 0x01A00000);
-	return branch;
-}
-void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
-{
-	s32 distance =  (s32(code) - 8)  - (s32)branch.ptr;
-     _dbg_assert_msg_(DYNA_REC, distance > -33554432
-                     && distance <=  33554432,
-                     "SetJumpTarget out of range (%p calls %p)", code,
-					 branch.ptr);
-	if(branch.type == 0) // B
-		*(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) &
-		0x00FFFFFF)); 
-	else // BL
-		*(u32*)branch.ptr =	(u32)(branch.condition | 0x0B000000 | ((distance >> 2)
-		& 0x00FFFFFF));
-}
-void ARMXEmitter::B (const void *fnptr)
-{
-	s32 distance = (s32)fnptr - (s32(code) + 8);
-        _dbg_assert_msg_(DYNA_REC, distance > -33554432
-                     && distance <=  33554432,
-                     "B out of range (%p calls %p)", code, fnptr);
-
-	Write32(condition | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF));
-}
-
-void ARMXEmitter::B(ARMReg src)
-{
-	Write32(condition | 0x12FFF10 | src);
-}
-
-bool ARMXEmitter::BLInRange(const void *fnptr) {
-	s32 distance = (s32)fnptr - (s32(code) + 8);
-	if (distance <= -33554432 || distance > 33554432)
-		return false;
-	else
-		return true;
-}
-
-void ARMXEmitter::BL(const void *fnptr)
-{
-	s32 distance = (s32)fnptr - (s32(code) + 8);
-        _dbg_assert_msg_(DYNA_REC, distance > -33554432
-                     && distance <=  33554432,
-                     "BL out of range (%p calls %p)", code, fnptr);
-	Write32(condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF));
-}
-void ARMXEmitter::BL(ARMReg src)
-{
-	Write32(condition | 0x12FFF30 | src);
-}
-void ARMXEmitter::PUSH(const int num, ...)
-{
-	u16 RegList = 0;
-	u8 Reg;
-	int i;
-	va_list vl;
-	va_start(vl, num);
-	for (i=0;i<num;i++)
-	{
-		Reg = va_arg(vl, u32);
-		RegList |= (1 << Reg);
-	}
-	va_end(vl);
-	Write32(condition | (2349 << 16) | RegList);
-}
-void ARMXEmitter::POP(const int num, ...)
-{
-	u16 RegList = 0;
-	u8 Reg;
-	int i;
-	va_list vl;
-	va_start(vl, num);
-	for (i=0;i<num;i++)
-	{
-		Reg = va_arg(vl, u32);
-		RegList |= (1 << Reg);
-	}
-	va_end(vl);
-	Write32(condition | (2237 << 16) | RegList);
-}
-
-void ARMXEmitter::WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, Operand2 op2)
-{
-	Write32(condition | (13 << 21) | (SetFlags << 20) | (dest << 12) | op2.Imm5() | (op << 4) | src);
-}
-void ARMXEmitter::WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, ARMReg op2)
-{
-	Write32(condition | (13 << 21) | (SetFlags << 20) | (dest << 12) | (op2 << 8) | (op << 4) | src);
-}
-
-// IMM, REG, IMMSREG, RSR 
-// -1 for invalid if the instruction doesn't support that
-const s32 InstOps[][4] = {{16, 0, 0, 0}, // AND(s)
-						  {17, 1, 1, 1}, // EOR(s)
-						  {18, 2, 2, 2}, // SUB(s)
-						  {19, 3, 3, 3}, // RSB(s)
-						  {20, 4, 4, 4}, // ADD(s)
-						  {21, 5, 5, 5}, // ADC(s)
-						  {22, 6, 6, 6}, // SBC(s)
-						  {23, 7, 7, 7}, // RSC(s)
-						  {24, 8, 8, 8}, // TST
-						  {25, 9, 9, 9}, // TEQ
-						  {26, 10, 10, 10}, // CMP
-						  {27, 11, 11, 11}, // CMN
-						  {28, 12, 12, 12}, // ORR(s)
-						  {29, 13, 13, 13}, // MOV(s)
-						  {30, 14, 14, 14}, // BIC(s)
-						  {31, 15, 15, 15}, // MVN(s)
-						  {24, -1, -1, -1}, // MOVW
-						  {26, -1, -1, -1}, // MOVT
-						 }; 
-
-const char *InstNames[] = { "AND",
-							"EOR",
-							"SUB",
-							"RSB",
-							"ADD",
-							"ADC",
-							"SBC",
-							"RSC",
-							"TST",
-							"TEQ",
-							"CMP",
-							"CMN",
-							"ORR",
-							"MOV",
-							"BIC",
-							"MVN"
-						  };
-
-void ARMXEmitter::AND (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm); }
-void ARMXEmitter::ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm, true); }
-void ARMXEmitter::EOR (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(1, Rd, Rn, Rm); }
-void ARMXEmitter::EORS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(1, Rd, Rn, Rm, true); }
-void ARMXEmitter::SUB (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(2, Rd, Rn, Rm); }
-void ARMXEmitter::SUBS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(2, Rd, Rn, Rm, true); }
-void ARMXEmitter::RSB (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(3, Rd, Rn, Rm); }
-void ARMXEmitter::RSBS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(3, Rd, Rn, Rm, true); }
-void ARMXEmitter::ADD (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(4, Rd, Rn, Rm); }
-void ARMXEmitter::ADDS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(4, Rd, Rn, Rm, true); }
-void ARMXEmitter::ADC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(5, Rd, Rn, Rm); }
-void ARMXEmitter::ADCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(5, Rd, Rn, Rm, true); }
-void ARMXEmitter::SBC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6, Rd, Rn, Rm); }
-void ARMXEmitter::SBCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6, Rd, Rn, Rm, true); }
-void ARMXEmitter::RSC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm); }
-void ARMXEmitter::RSCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm, true); }
-void ARMXEmitter::TST (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(8, R0, Rn, Rm, true); }
-void ARMXEmitter::TEQ (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(9, R0, Rn, Rm, true); }
-void ARMXEmitter::CMP (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(10, R0, Rn, Rm, true); }
-void ARMXEmitter::CMN (			  ARMReg Rn, Operand2 Rm) { WriteInstruction(11, R0, Rn, Rm, true); }
-void ARMXEmitter::ORR (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm); }
-void ARMXEmitter::ORRS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm, true); }
-void ARMXEmitter::MOV (ARMReg Rd,			 Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm); }
-void ARMXEmitter::MOVS(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm, true); }
-void ARMXEmitter::BIC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm); }
-void ARMXEmitter::BICS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm, true); }
-void ARMXEmitter::MVN (ARMReg Rd,			 Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm); }
-void ARMXEmitter::MVNS(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm, true); }
-void ARMXEmitter::MOVW(ARMReg Rd,			 Operand2 Rm) { WriteInstruction(16, Rd, R0, Rm); }
-void ARMXEmitter::MOVT(ARMReg Rd, Operand2 Rm, bool TopBits) { WriteInstruction(17, Rd, R0, TopBits ? Rm.Value >> 16 : Rm); }
-
-void ARMXEmitter::WriteInstruction (u32 Op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags) // This can get renamed later
-{
-	s32 op = InstOps[Op][Rm.GetType()]; // Type always decided by last operand
-	u32 Data = Rm.GetData();
-	if (Rm.GetType() == TYPE_IMM)
-	{
-		switch (Op)
-		{
-			// MOV cases that support IMM16
-			case 16:
-			case 17:
-				Data = Rm.Imm16();
-			break;
-			default:
-			break;
-		}
-	}
-	if (op == -1)
-		_dbg_assert_msg_(DYNA_REC, false, "%s not yet support %d", InstNames[Op], Rm.GetType()); 
-	Write32(condition | (op << 21) | (SetFlags ? (1 << 20) : 0) | Rn << 16 | Rd << 12 | Data);
-}
-
-// Data Operations
-void ARMXEmitter::WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2)
-{
-	Write32(condition | (0x7 << 24) | (Op << 20) | (dest << 16) | (Op2 << 12) | (r1 << 8) | (Op3 << 5) | (1 << 4) | r2);
-}
-void ARMXEmitter::UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor)
-{
-	if (!cpu_info.bIDIVa)
-		PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer.");
-	WriteSignedMultiply(3, 0xF, 0, dest, divisor, dividend);
-}
-void ARMXEmitter::SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor)
-{
-	if (!cpu_info.bIDIVa)
-		PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer.");
-	WriteSignedMultiply(1, 0xF, 0, dest, divisor, dividend);
-}
-void ARMXEmitter::LSL (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, false, dest, src, op2);}
-void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, true, dest, src, op2);}
-void ARMXEmitter::LSL (ARMReg dest, ARMReg src, ARMReg op2)	  { WriteShiftedDataOp(1, false, dest, src, op2);} 
-void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, ARMReg op2)	  { WriteShiftedDataOp(1, true, dest, src, op2);}
-void ARMXEmitter::LSR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(2, false, dest, src, op2);}
-void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(2, true, dest, src, op2);}
-void ARMXEmitter::LSR (ARMReg dest, ARMReg src, ARMReg op2)	  { WriteShiftedDataOp(3, false, dest, src, op2);}
-void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, ARMReg op2)   { WriteShiftedDataOp(3, true, dest, src, op2);}
-void ARMXEmitter::ASR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, false, dest, src, op2);}
-void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, true, dest, src, op2);}
-void ARMXEmitter::ASR (ARMReg dest, ARMReg src, ARMReg op2)   { WriteShiftedDataOp(5, false, dest, src, op2);}
-void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, ARMReg op2)   { WriteShiftedDataOp(5, true, dest, src, op2);}
-
-void ARMXEmitter::MUL (ARMReg dest,	ARMReg src, ARMReg op2)
-{
-	Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2);
-}
-void ARMXEmitter::MULS(ARMReg dest,	ARMReg src, ARMReg op2)
-{
-	Write32(condition | (1 << 20) | (dest << 16) | (src << 8) | (9 << 4) | op2);
-}
-
-void ARMXEmitter::Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) {
-	Write32(condition | (op << 20) | (destHi << 16) | (destLo << 12) | (rm << 8) | (9 << 4) | rn);
-}
-
-void ARMXEmitter::UMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn)
-{
-	Write4OpMultiply(0x8, destLo, destHi, rn, rm);
-}
-
-void ARMXEmitter::UMULLS(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn)
-{
-	Write4OpMultiply(0x9, destLo, destHi, rn, rm);
-}
-
-void ARMXEmitter::SMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn)
-{
-	Write4OpMultiply(0xC, destLo, destHi, rn, rm);
-}
-
-void ARMXEmitter::UMLAL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn)
-{
-	Write4OpMultiply(0xA, destLo, destHi, rn, rm);
-}
-
-void ARMXEmitter::SMLAL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn)
-{
-	Write4OpMultiply(0xE, destLo, destHi, rn, rm);
-}
-
-void ARMXEmitter::UBFX(ARMReg dest, ARMReg rn, u8 lsb, u8 width)
-{
-	Write32(condition | (0x7E0 << 16) | ((width - 1) << 16) | (dest << 12) | (lsb << 7) | (5 << 4) | rn);
-}
-
-void ARMXEmitter::CLZ(ARMReg rd, ARMReg rm)
-{
-	Write32(condition | (0x16F << 16) | (rd << 12) | (0xF1 << 4) | rm);
-}
-
-void ARMXEmitter::BFI(ARMReg rd, ARMReg rn, u8 lsb, u8 width)
-{
-	u32 msb = (lsb + width - 1);
-	if (msb > 31) msb = 31;
-	Write32(condition | (0x7C0 << 16) | (msb << 16) | (rd << 12) | (lsb << 7) | (1 << 4) | rn);
-}
-
-void ARMXEmitter::SXTB (ARMReg dest, ARMReg op2)
-{
-	Write32(condition | (0x6AF << 16) | (dest << 12) | (7 << 4) | op2);
-}
-
-void ARMXEmitter::SXTH (ARMReg dest, ARMReg op2, u8 rotation)
-{
-	SXTAH(dest, (ARMReg)15, op2, rotation);
-}
-void ARMXEmitter::SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation) 
-{
-	// bits ten and 11 are the rotation amount, see 8.8.232 for more
-	// information
-	Write32(condition | (0x6B << 20) | (src << 16) | (dest << 12) | (rotation << 10) | (7 << 4) | op2);
-}
-void ARMXEmitter::RBIT(ARMReg dest, ARMReg src)
-{
-	Write32(condition | (0x6F << 20) | (0xF << 16) | (dest << 12) | (0xF3 << 4) | src);
-}
-void ARMXEmitter::REV (ARMReg dest, ARMReg src) 
-{
-	Write32(condition | (0x6BF << 16) | (dest << 12) | (0xF3 << 4) | src);
-}
-void ARMXEmitter::REV16(ARMReg dest, ARMReg src)
-{
-	Write32(condition | (0x6BF << 16) | (dest << 12) | (0xFB << 4) | src);
-}
-
-void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g,		Operand2 op2)
-{
-	Write32(condition | (0x320F << 12) | (write_nzcvq << 19) | (write_g << 18) | op2.Imm12Mod());
-}
-void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g,		ARMReg src)
-{
-	Write32(condition | (0x120F << 12) | (write_nzcvq << 19) | (write_g << 18) | src);
-}
-void ARMXEmitter::MRS (ARMReg dest)
-{
-	Write32(condition | (16 << 20) | (15 << 16) | (dest << 12));
-}
-void ARMXEmitter::LDREX(ARMReg dest, ARMReg base)
-{
-	Write32(condition | (25 << 20) | (base << 16) | (dest << 12) | 0xF9F);
-}
-void ARMXEmitter::STREX(ARMReg result, ARMReg base, ARMReg op)
-{
-	_dbg_assert_msg_(DYNA_REC, (result != base && result != op), "STREX dest can't be other two registers");
-	Write32(condition | (24 << 20) | (base << 16) | (result << 12) | (0xF9 << 4) | op);
-}
-void ARMXEmitter::DMB ()
-{
-	Write32(0xF57FF05E);
-}
-void ARMXEmitter::SVC(Operand2 op)
-{
-	Write32(condition | (0x0F << 24) | op.Imm24());
-}
-
-// IMM, REG, IMMSREG, RSR
-// -1 for invalid if the instruction doesn't support that
-const s32 LoadStoreOps[][4] = {
-	{0x40, 0x60, 0x60, -1}, // STR
-	{0x41, 0x61, 0x61, -1}, // LDR
-	{0x44, 0x64, 0x64, -1}, // STRB
-	{0x45, 0x65, 0x65, -1}, // LDRB
-	// Special encodings
-	{ 0x4,  0x0,  -1, -1}, // STRH
-	{ 0x5,  0x1,  -1, -1}, // LDRH
-	{ 0x5,  0x1,  -1, -1}, // LDRSB
-	{ 0x5,  0x1,  -1, -1}, // LDRSH
-};
-const char *LoadStoreNames[] = {
-	"STR",
-	"LDR",
-	"STRB",
-	"LDRB",
-	"STRH",
-	"LDRH",
-	"LDRSB",
-	"LDRSH",
-};
-
-void ARMXEmitter::WriteStoreOp(u32 Op, ARMReg Rt, ARMReg Rn, Operand2 Rm, bool RegAdd)
-{
-	s32 op = LoadStoreOps[Op][Rm.GetType()]; // Type always decided by last operand
-	u32 Data;
-
-	// Qualcomm chipsets get /really/ angry if you don't use index, even if the offset is zero.
-	// Some of these encodings require Index at all times anyway. Doesn't really matter.
-	// bool Index = op2 != 0 ? true : false;
-	bool Index = true;
-	bool Add = false;
-
-	// Special Encoding (misc addressing mode)
-	bool SpecialOp = false;
-	bool Half = false;
-	bool SignedLoad = false;
-
-	if (op == -1)
-		_dbg_assert_msg_(DYNA_REC, false, "%s does not support %d", LoadStoreNames[Op], Rm.GetType()); 
-
-	switch (Op)
-	{
-		case 4: // STRH
-			SpecialOp = true;
-			Half = true;
-			SignedLoad = false;
-		break;
-		case 5: // LDRH
-			SpecialOp = true;
-			Half = true;
-			SignedLoad = false;
-		break;
-		case 6: // LDRSB
-			SpecialOp = true;
-			Half = false;
-			SignedLoad = true;
-		break;
-		case 7: // LDRSH
-			SpecialOp = true;
-			Half = true;
-			SignedLoad = true;
-		break;
-	}
-	switch (Rm.GetType())
-	{
-		case TYPE_IMM:
-		{
-			s32 Temp = (s32)Rm.Value;
-			Data = abs(Temp);
-			// The offset is encoded differently on this one.
-			if (SpecialOp)
-				Data = (Data & 0xF0 << 4) | (Data & 0xF);
-			if (Temp >= 0) Add = true;
-		}
-		break;
-		case TYPE_REG:
-			Data = Rm.GetData();
-			Add = RegAdd;
-			break;
-		case TYPE_IMMSREG:
-			if (!SpecialOp)
-			{
-				Data = Rm.GetData();
-				Add = RegAdd;
-				break;
-			}
-			// Intentional fallthrough: TYPE_IMMSREG not supported for misc addressing.
-		default:
-			// RSR not supported for any of these
-			// We already have the warning above
-			BKPT(0x2);
-			return;
-		break;
-	}
-	if (SpecialOp)
-	{
-		// Add SpecialOp things
-		Data = (0x9 << 4) | (SignedLoad << 6) | (Half << 5) | Data;
-	}
-	Write32(condition | (op << 20) | (Index << 24) | (Add << 23) | (Rn << 16) | (Rt << 12) | Data);
-}
-
-void ARMXEmitter::LDR (ARMReg dest, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(1, dest, base, op2, RegAdd);}
-void ARMXEmitter::LDRB(ARMReg dest, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(3, dest, base, op2, RegAdd);}
-void ARMXEmitter::LDRH(ARMReg dest, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(5, dest, base, op2, RegAdd);}
-void ARMXEmitter::LDRSB(ARMReg dest, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(6, dest, base, op2, RegAdd);}
-void ARMXEmitter::LDRSH(ARMReg dest, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(7, dest, base, op2, RegAdd);}
-void ARMXEmitter::STR  (ARMReg result, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(0, result, base, op2, RegAdd);}
-void ARMXEmitter::STRH (ARMReg result, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(4, result, base, op2, RegAdd);}
-void ARMXEmitter::STRB (ARMReg result, ARMReg base, Operand2 op2, bool RegAdd) { WriteStoreOp(2, result, base, op2, RegAdd);}
-
-void ARMXEmitter::WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList)
-{
-	Write32(condition | (op << 20) | (WriteBack << 21) | (dest << 16) | RegList);
-}
-void ARMXEmitter::STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...)
-{
-	u16 RegList = 0;
-	u8 Reg;
-	int i;
-	va_list vl;
-	va_start(vl, Regnum);
-	for (i=0;i<Regnum;i++)
-	{
-		Reg = va_arg(vl, u32);
-		RegList |= (1 << Reg);
-	}
-	va_end(vl);
-	WriteRegStoreOp(0x90, dest, WriteBack, RegList);
-}
-void ARMXEmitter::LDMFD(ARMReg dest, bool WriteBack, const int Regnum, ...)
-{
-	u16 RegList = 0;
-	u8 Reg;
-	int i;
-	va_list vl;
-	va_start(vl, Regnum);
-	for (i=0;i<Regnum;i++)
-	{
-		Reg = va_arg(vl, u32);
-		RegList |= (1 << Reg);
-	}
-	va_end(vl);
-	WriteRegStoreOp(0x89, dest, WriteBack, RegList);
-}
-
-ARMReg ARMXEmitter::SubBase(ARMReg Reg)
-{
-	if (Reg >= S0)
-	{
-		if (Reg >= D0)
-		{
-			if (Reg >= Q0)
-				return (ARMReg)((Reg - Q0) * 2); // Always gets encoded as a double register
-			return (ARMReg)(Reg - D0);
-		}
-		return (ARMReg)(Reg - S0);
-	}
-	return Reg;
-}
-
-// Double/single, Neon
-extern const VFPEnc VFPOps[16][2] = {
-	{{0xE0, 0xA0}, {0x20, 0xD1}}, // 0: VMLA
-	{{0xE1, 0xA4}, {  -1,   -1}}, // 1: VNMLA
-	{{0xE0, 0xA4}, {0x22, 0xD1}}, // 2: VMLS
-	{{0xE1, 0xA0}, {  -1,   -1}}, // 3: VNMLS
-	{{0xE3, 0xA0}, {0x20, 0xD0}}, // 4: VADD
-	{{0xE3, 0xA4}, {0x22, 0xD0}}, // 5: VSUB
-	{{0xE2, 0xA0}, {0x30, 0xD1}}, // 6: VMUL
-	{{0xE2, 0xA4}, {  -1,   -1}}, // 7: VNMUL
-	{{0xEB, 0xAC}, {  -1 /* 0x3B */,  -1 /* 0x70 */}}, // 8: VABS(Vn(0x0) used for encoding)
-	{{0xE8, 0xA0}, {  -1,   -1}}, // 9: VDIV
-	{{0xEB, 0xA4}, {  -1 /* 0x3B */,   -1 /* 0x78 */}}, // 10: VNEG(Vn(0x1) used for encoding)
-	{{0xEB, 0xAC}, {  -1,   -1}}, // 11: VSQRT (Vn(0x1) used for encoding)
-	{{0xEB, 0xA4}, {  -1,   -1}}, // 12: VCMP (Vn(0x4 | #0 ? 1 : 0) used for encoding)
-	{{0xEB, 0xAC}, {  -1,   -1}}, // 13: VCMPE (Vn(0x4 | #0 ? 1 : 0) used for encoding)
-	{{  -1,   -1}, {0x3B, 0x30}}, // 14: VABSi
-	};
-
-const char *VFPOpNames[16] = {
-	"VMLA",
-	"VNMLA",
-	"VMLS",
-	"VNMLS",
-	"VADD",
-	"VSUB",
-	"VMUL",
-	"VNMUL",
-	"VABS",
-	"VDIV",
-	"VNEG",
-	"VSQRT",
-	"VCMP",
-	"VCMPE",
-	"VABSi",
-};
-
-u32 ARMXEmitter::EncodeVd(ARMReg Vd)
-{
-	bool quad_reg = Vd >= Q0;
-	bool double_reg = Vd >= D0;
-
-	ARMReg Reg = SubBase(Vd);
-
-	if (quad_reg)
-		return ((Reg & 0x10) << 18) | ((Reg & 0xF) << 12);
-	else
-		if (double_reg)
-			return ((Reg & 0x10) << 18) | ((Reg & 0xF) << 12);
-		else
-			return ((Reg & 0x1) << 22) | ((Reg & 0x1E) << 11);
-}
-u32 ARMXEmitter::EncodeVn(ARMReg Vn)
-{
-	bool quad_reg = Vn >= Q0;
-	bool double_reg = Vn >= D0;
-	
-	ARMReg Reg = SubBase(Vn);
-	if (quad_reg)
-		return ((Reg & 0xF) << 16) | ((Reg & 0x10) << 3);
-	else
-		if (double_reg)
-			return ((Reg & 0xF) << 16) | ((Reg & 0x10) << 3);
-		else
-			return ((Reg & 0x1E) << 15) | ((Reg & 0x1) << 7);
-}
-u32 ARMXEmitter::EncodeVm(ARMReg Vm)
-{
-	bool quad_reg = Vm >= Q0;
-	bool double_reg = Vm >= D0;
-
-	ARMReg Reg = SubBase(Vm);
-
-	if (quad_reg)
-		return ((Reg & 0x10) << 1) | (Reg & 0xF);
-	else
-		if (double_reg)
-			return ((Reg & 0x10) << 1) | (Reg & 0xF);
-		else
-			return ((Reg & 0x1) << 5) | (Reg >> 1);
-}
-
-void ARMXEmitter::WriteVFPDataOp(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	bool quad_reg = Vd >= Q0;
-	bool double_reg = Vd >= D0 && Vd < Q0;
-
-	VFPEnc enc = VFPOps[Op][quad_reg];
-	if (enc.opc1 == -1 && enc.opc2 == -1)
-		_dbg_assert_msg_(DYNA_REC, false, "%s does not support %s", VFPOpNames[Op], quad_reg ? "NEON" : "VFP"); 
-	u32 VdEnc = EncodeVd(Vd);
-	u32 VnEnc = EncodeVn(Vn);
-	u32 VmEnc = EncodeVm(Vm);
-	u32 cond = quad_reg ? (0xF << 28) : condition;
-
-	Write32(cond | (enc.opc1 << 20) | VnEnc | VdEnc | (enc.opc2 << 4) | (quad_reg << 6) | (double_reg << 8) | VmEnc);
-}
-void ARMXEmitter::WriteVFPDataOp6bit(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm, u32 bit6)
-{
-	bool quad_reg = Vd >= Q0;
-	bool double_reg = Vd >= D0 && Vd < Q0;
-
-	VFPEnc enc = VFPOps[Op][quad_reg];
-	if (enc.opc1 == -1 && enc.opc2 == -1)
-		_dbg_assert_msg_(DYNA_REC, false, "%s does not support %s", VFPOpNames[Op], quad_reg ? "NEON" : "VFP"); 
-	u32 VdEnc = EncodeVd(Vd);
-	u32 VnEnc = EncodeVn(Vn);
-	u32 VmEnc = EncodeVm(Vm);
-	u32 cond = quad_reg ? (0xF << 28) : condition;
-
-	Write32(cond | (enc.opc1 << 20) | VnEnc | VdEnc | (enc.opc2 << 4) | (bit6 << 6) | (double_reg << 8) | VmEnc);
-}
-
-void ARMXEmitter::VMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(0, Vd, Vn, Vm); }
-void ARMXEmitter::VNMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(1, Vd, Vn, Vm); }
-void ARMXEmitter::VMLS(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(2, Vd, Vn, Vm); }
-void ARMXEmitter::VNMLS(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(3, Vd, Vn, Vm); }
-void ARMXEmitter::VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(4, Vd, Vn, Vm); }
-void ARMXEmitter::VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(5, Vd, Vn, Vm); }
-void ARMXEmitter::VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(6, Vd, Vn, Vm); }
-void ARMXEmitter::VNMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(7, Vd, Vn, Vm); }
-void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(8, Vd, D0, Vm); }
-void ARMXEmitter::VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm){ WriteVFPDataOp(9, Vd, Vn, Vm); }
-void ARMXEmitter::VNEG(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp(10, Vd, D1, Vm); }
-void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(11, Vd, D1, Vm, 3); }
-void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(12, Vd, D4, Vm, 1); }
-void ARMXEmitter::VCMPE(ARMReg Vd, ARMReg Vm){ WriteVFPDataOp6bit(13, Vd, D4, Vm, 1); }
-void ARMXEmitter::VCMP(ARMReg Vd){ WriteVFPDataOp6bit(12, Vd, D5, D0, 1); }
-void ARMXEmitter::VCMPE(ARMReg Vd){ WriteVFPDataOp6bit(13, Vd, D5, D0, 1); }
-
-void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, s16 offset)
-{
-	_dbg_assert_msg_(DYNA_REC, Dest >= S0 && Dest <= D31, "Passed Invalid dest register to VLDR");
-	_dbg_assert_msg_(DYNA_REC, Base <= R15, "Passed invalid Base register to VLDR");
-
-	bool Add = offset >= 0 ? true : false;
-	u32 imm = abs(offset);
-
-	_dbg_assert_msg_(DYNA_REC, (imm & 0xC03) == 0, "VLDR: Offset needs to be word aligned and small enough");
-
-	if (imm & 0xC03)
-		ERROR_LOG(DYNA_REC, "VLDR: Bad offset %08x", imm);
-
-	bool single_reg = Dest < D0;
-
-	Dest = SubBase(Dest);
-
-	if (single_reg)
-	{
-		Write32(condition | (0xD << 24) | (Add << 23) | ((Dest & 0x1) << 22) | (1 << 20) | (Base << 16) \
-			| ((Dest & 0x1E) << 11) | (10 << 8) | (imm >> 2));
-	}
-	else
-	{
-		Write32(condition | (0xD << 24) | (Add << 23) | ((Dest & 0x10) << 18) | (1 << 20) | (Base << 16) \
-			| ((Dest & 0xF) << 12) | (11 << 8) | (imm >> 2));
-	}
-}
-void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, s16 offset)
-{
-	_dbg_assert_msg_(DYNA_REC, Src >= S0 && Src <= D31, "Passed invalid src register to VSTR");
-	_dbg_assert_msg_(DYNA_REC, Base <= R15, "Passed invalid base register to VSTR");
-
-	bool Add = offset >= 0 ? true : false;
-	u32 imm = abs(offset);
-
-	_dbg_assert_msg_(DYNA_REC, (imm & 0xC03) == 0, "VSTR: Offset needs to be word aligned and small enough");
-
-	if (imm & 0xC03)
-		ERROR_LOG(DYNA_REC, "VSTR: Bad offset %08x", imm);
-
-	bool single_reg = Src < D0;
-
-	Src = SubBase(Src);
-
-	if (single_reg)
-	{
-		Write32(condition | (0xD << 24) | (Add << 23) | ((Src & 0x1) << 22) | (Base << 16) \
-			| ((Src & 0x1E) << 11) | (10 << 8) | (imm >> 2));
-	}
-	else
-	{
-		Write32(condition | (0xD << 24) | (Add << 23) | ((Src & 0x10) << 18) | (Base << 16) \
-			| ((Src & 0xF) << 12) | (11 << 8) | (imm >> 2));
-	}
-}
-
-void ARMXEmitter::VMRS(ARMReg Rt) {
-	Write32(condition | (0xEF << 20) | (1 << 16) | (Rt << 12) | 0xA10);
-}
-void ARMXEmitter::VMSR(ARMReg Rt) {
-	Write32(condition | (0xEE << 20) | (1 << 16) | (Rt << 12) | 0xA10);
-}
-
-// VFP and ASIMD
-void ARMXEmitter::VMOV(ARMReg Dest, Operand2 op2)
-{
-	_dbg_assert_msg_(DYNA_REC, cpu_info.bVFPv3, "VMOV #imm requires VFPv3");
-	bool double_reg = Dest >= D0;
-	Write32(condition | (0xEB << 20) | EncodeVd(Dest) | (0x5 << 9) | (double_reg << 8) | op2.Imm8VFP());
-}
-void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high)
-{
-	_dbg_assert_msg_(DYNA_REC, Src < S0, "This VMOV doesn't support SRC other than ARM Reg");
-	_dbg_assert_msg_(DYNA_REC, Dest >= D0, "This VMOV doesn't support DEST other than VFP");
-
-	Dest = SubBase(Dest);
-
-	Write32(condition | (0xE << 24) | (high << 21) | ((Dest & 0xF) << 16) | (Src << 12) \
-		| (0xB << 8) | ((Dest & 0x10) << 3) | (1 << 4));
-}
-
-void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src)
-{
-	if (Dest > R15)
-	{
-		if (Src < S0)
-		{
-			if (Dest < D0)
-			{
-				// Moving to a Neon register FROM ARM Reg
-				Dest = (ARMReg)(Dest - S0); 
-				Write32(condition | (0xE0 << 20) | ((Dest & 0x1E) << 15) | (Src << 12) \
-						| (0xA << 8) | ((Dest & 0x1) << 7) | (1 << 4));
-				return;
-			}
-			else
-			{
-				// Move 64bit from Arm reg
-				ARMReg Src2 = (ARMReg)(Src + 1);
-				Dest = SubBase(Dest); 
-				Write32(condition | (0xC4 << 20) | (Src2 << 16) | (Src << 12) \
-						| (0xB << 8) | ((Dest & 0x10) << 1) | (1 << 4) | (Dest & 0xF)); 
-				return;
-			}
-		}
-	}
-	else
-	{
-		if (Src > R15)
-		{
-			if (Src < D0)
-			{
-				// Moving to ARM Reg from Neon Register
-				Src = (ARMReg)(Src - S0);
-				Write32(condition | (0xE1 << 20) | ((Src & 0x1E) << 15) | (Dest << 12) \
-						| (0xA << 8) | ((Src & 0x1) << 7) | (1 << 4));
-				return;
-			}
-			else
-			{
-				// Move 64bit To Arm reg
-				ARMReg Dest2 = (ARMReg)(Dest + 1);
-				Src = SubBase(Src);
-				Write32(condition | (0xC5 << 20) | (Dest2 << 16) | (Dest << 12) \
-						| (0xB << 8) | ((Dest & 0x10) << 1) | (1 << 4) | (Src & 0xF)); 
-				return;
-			}
-		}
-		else
-		{
-			// Move Arm reg to Arm reg
-			_dbg_assert_msg_(DYNA_REC, false, "VMOV doesn't support moving ARM registers");
-		}
-	}
-	// Moving NEON registers
-	int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4;
-	(void) SrcSize;
-	int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4;
-	bool Single = DestSize == 1;
-	bool Quad = DestSize == 4;
-
-	_dbg_assert_msg_(DYNA_REC, SrcSize == DestSize, "VMOV doesn't support moving different register sizes");
-
-	Dest = SubBase(Dest);
-	Src = SubBase(Src);
-
-	if (Single)
-	{
-		Write32(condition | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x3 << 20) | ((Dest & 0x1E) << 11) \
-				| (0x5 << 9) | (1 << 6) | ((Src & 0x1) << 5) | ((Src & 0x1E) >> 1));
-	}
-	else
-	{
-		// Double and quad
-		if (Quad)
-		{
-			_dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use quad registers when you don't support ASIMD."); 
-			// Gets encoded as a Double register
-			Write32((0xF2 << 24) | ((Dest & 0x10) << 18) | (2 << 20) | ((Src & 0xF) << 16) \
-				| ((Dest & 0xF) << 12) | (1 << 8) | ((Src & 0x10) << 3) | (1 << 6) \
-				| ((Src & 0x10) << 1) | (1 << 4) | (Src & 0xF));
-
-		}
-		else
-		{
-			Write32(condition | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x3 << 20) | ((Dest & 0xF) << 12) \
-				| (0x2D << 6) | ((Src & 0x10) << 1) | (Src & 0xF));
-		}
-	}
-}
-
-void ARMXEmitter::VCVT(ARMReg Dest, ARMReg Source, int flags)
-{
-	bool single_reg = (Dest < D0) && (Source < D0);
-	bool single_double = !single_reg && (Source < D0 || Dest < D0);
-	bool single_to_double = Source < D0;
-	int op  = ((flags & TO_INT) ? (flags & ROUND_TO_ZERO) : (flags & IS_SIGNED)) ? 1 : 0;
-	int op2 = ((flags & TO_INT) ? (flags & IS_SIGNED) : 0) ? 1 : 0;
-	Dest = SubBase(Dest);
-	Source = SubBase(Source);
-
-	if (single_double)
-	{
-		// S32<->F64
-		if ((flags & TO_INT) || (flags & TO_FLOAT))
-		{
-			if (single_to_double)
-			{
-				Write32(condition | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x7 << 19) \
-					| ((Dest & 0xF) << 12) | (op << 7) | (0x2D << 6) | ((Source & 0x1) << 5) | (Source >> 1));
-			} else {
-				Write32(condition | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x7 << 19) | ((flags & TO_INT) << 18) | (op2 << 16) \
-					| ((Dest & 0x1E) << 11) | (op << 7) | (0x2D << 6) | ((Source & 0x10) << 1) | (Source & 0xF));
-			}
-		}
-		// F32<->F64
-		else {
-			if (single_to_double)
-			{
-				Write32(condition | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x3 << 20) | (0x7 << 16) \
-					| ((Dest & 0xF) << 12) | (0x2B << 6) | ((Source & 0x1) << 5) | (Source >> 1));
-			} else {
-				Write32(condition | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x3 << 20) | (0x7 << 16) \
-					| ((Dest & 0x1E) << 11) | (0x2F << 6) | ((Source & 0x10) << 1) | (Source & 0xF));
-			}
-		}
-	} else if (single_reg) {
-		Write32(condition | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x7 << 19) | ((flags & TO_INT) << 18) | (op2 << 16) \
-			| ((Dest & 0x1E) << 11) | (op << 7) | (0x29 << 6) | ((Source & 0x1) << 5) | (Source >> 1));
-	} else {
-		Write32(condition | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x7 << 19) | ((flags & TO_INT) << 18) | (op2 << 16) \
-			| ((Dest & 0xF) << 12) | (1 << 8) | (op << 7) | (0x29 << 6) | ((Source & 0x10) << 1) | (Source & 0xF));
-	}
-}
-
-void NEONXEmitter::VABD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	_dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VABD(float)");
-	_dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VABD(float) when CPU doesn't support it");
-	bool register_quad = Vd >= Q0;
-
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-	Vn = SubBase(Vn);
-	Vm = SubBase(Vm);
-
-	Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \
-		| ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \
-		| ((Vm & 0x10) << 1) | (Vm & 0xF));
-}
-void NEONXEmitter::VADD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	_dbg_assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VADD(integer)");
-	_dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it");
-
-	bool register_quad = Vd >= Q0;
-
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-	Vn = SubBase(Vn);
-	Vm = SubBase(Vm);
-
-	Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \
-		| ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \
-		| ((Vm & 0x10) << 1) | (Vm & 0xF));
-
-}
-void NEONXEmitter::VSUB(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	_dbg_assert_msg_(DYNA_REC, Vd >= Q0, "Pass invalid register to VSUB(integer)");
-	_dbg_assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VSUB(integer) when CPU doesn't support it");
-
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-	Vn = SubBase(Vn);
-	Vm = SubBase(Vm);
-
-	Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (encodedSize(Size) << 20) | ((Vn & 0xF) << 16) \
-		| ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \
-		| ((Vm & 0x10) << 1) | (Vm & 0xF));
-}
-
-void NEONXEmitter::VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm)
-{
-	u32 spacing = 0x7; // Only support loading to 1 reg 
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-
-	Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (1 << 21) | (Rn << 16) 
-			| ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6)
-			| (align << 4) | Rm);
-}
-
-void NEONXEmitter::VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm)
-{
-	u32 spacing = 0x8; // Single spaced registers
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-
-	Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (1 << 21) | (Rn << 16) 
-			| ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6)
-			| (align << 4) | Rm);
-}
-
-void NEONXEmitter::VST1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align, ARMReg Rm)
-{
-	u32 spacing = 0x7; // Single spaced registers
-	// Gets encoded as a double register
-	Vd = SubBase(Vd);
-
-	Write32((0xF4 << 24) | ((Vd & 0x10) << 18) | (Rn << 16) 
-			| ((Vd & 0xF) << 12) | (spacing << 8) | (encodedSize(Size) << 6)
-			| (align << 4) | Rm);
-}
-
-
-void NEONXEmitter::VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm)
-{
-	bool register_quad = Vd >= Q0;
-	Vd = SubBase(Vd);
-	Vm = SubBase(Vm);
-
-	Write32((0xF3 << 24) | (1 << 23) | ((Vd & 0x10) << 18) | (0x3 << 20)
-			| (encodedSize(Size) << 18) | ((Vd & 0xF) << 12) | (size << 7)
-			| (register_quad << 6) | ((Vm & 0x10) << 1) | (Vm & 0xF));
-}
-
-void NEONXEmitter::VREV64(NEONElementType Size, ARMReg Vd, ARMReg Vm)
-{
-	VREVX(2, Size, Vd, Vm);
-}
-
-void NEONXEmitter::VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm)
-{
-	VREVX(1, Size, Vd, Vm);
-}
-
-void NEONXEmitter::VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm)
-{
-	VREVX(0, Size, Vd, Vm);
-}
-
-void NEONXEmitter::VRSQRTE(NEONElementType Size, ARMReg Vd, ARMReg Vm)
-{
-	bool register_quad = Vd >= Q0;
-	Vd = SubBase(Vd);
-	Vm = SubBase(Vm);
-
-	Write32((0xF3 << 24) | (0xB << 20) | ((Vd & 0x10) << 18) | (0xB << 16)
-			| ((Vd & 0xF) << 12) | (9 << 7) | (Size & F_32 ? (1 << 8) : 0) | (register_quad << 6)
-			| ((Vm & 0x10) << 1) | (Vm & 0xF));
-}
-
-void NEONXEmitter::VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	bool register_quad = Vd >= Q0;
-	Vd = SubBase(Vd);
-	Vn = SubBase(Vn);
-	Vm = SubBase(Vm);
-
-	Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16)
-			| ((Vd & 0xF) << 12) | (1 << 8) | ((Vn & 0x10) << 3) 
-			| (register_quad << 6) | ((Vm & 0x10) << 1) | (1 << 4) | (Vm & 0xF));
-}
-void NEONXEmitter::VORR(ARMReg Vd, ARMReg Vn, ARMReg Vm)
-{
-	bool register_quad = Vd >= Q0;
-	Vd = SubBase(Vd);
-	Vn = SubBase(Vn);
-	Vm = SubBase(Vm);
-
-	Write32((0xF2 << 24) | (0x1 << 21) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16)
-			| ((Vd & 0xF) << 12) | (1 << 8) | ((Vn & 0x10) << 3) 
-			| (register_quad << 6) | ((Vm & 0x10) << 1) | (1 << 4) | (Vm & 0xF));
-}
-
-
-}
-
diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h
deleted file mode 100644
index 71597bbfd6..0000000000
--- a/Source/Core/Common/Src/ArmEmitter.h
+++ /dev/null
@@ -1,734 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
-
-#ifndef _DOLPHIN_ARM_CODEGEN_
-#define _DOLPHIN_ARM_CODEGEN_
-
-#include "Common.h"
-#include "MemoryUtil.h"
-#if defined(__SYMBIAN32__) || defined(PANDORA)
-#include <signal.h>
-#endif
-#include <vector>
-
-#undef _IP
-#undef R0
-#undef _SP
-#undef _LR
-#undef _PC
-
-// VCVT flags
-#define TO_FLOAT      0
-#define TO_INT        1 << 0
-#define IS_SIGNED     1 << 1
-#define ROUND_TO_ZERO 1 << 2
-
-namespace ArmGen
-{
-enum ARMReg
-{
-	// GPRs
-	R0 = 0, R1, R2, R3, R4, R5,
-	R6, R7, R8, R9, R10, R11,
-
-	// SPRs
-	// R13 - R15 are SP, LR, and PC.
-	// Almost always referred to by name instead of register number
-	R12 = 12, R13 = 13, R14 = 14, R15 = 15,
-	_IP = 12, _SP = 13, _LR = 14, _PC = 15,
-
-
-	// VFP single precision registers
-	S0, S1, S2, S3, S4, S5, S6,
-	S7, S8, S9, S10, S11, S12, S13,
-	S14, S15, S16, S17, S18, S19, S20,
-	S21, S22, S23, S24, S25, S26, S27,
-	S28, S29, S30, S31,
-
-	// VFP Double Precision registers
-	D0, D1, D2, D3, D4, D5, D6, D7,
-	D8, D9, D10, D11, D12, D13, D14, D15,
-	D16, D17, D18, D19, D20, D21, D22, D23,
-	D24, D25, D26, D27, D28, D29, D30, D31,
-	
-	// ASIMD Quad-Word registers
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7,
-	Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15,
-	INVALID_REG = 0xFFFFFFFF
-};
-
-enum CCFlags
-{
-	CC_EQ = 0, // Equal
-	CC_NEQ, // Not equal
-	CC_CS, // Carry Set
-	CC_CC, // Carry Clear
-	CC_MI, // Minus (Negative)
-	CC_PL, // Plus
-	CC_VS, // Overflow
-	CC_VC, // No Overflow
-	CC_HI, // Unsigned higher
-	CC_LS, // Unsigned lower or same
-	CC_GE, // Signed greater than or equal
-	CC_LT, // Signed less than
-	CC_GT, // Signed greater than
-	CC_LE, // Signed less than or equal
-	CC_AL, // Always (unconditional) 14
-	CC_HS = CC_CS, // Alias of CC_CS  Unsigned higher or same
-	CC_LO = CC_CC, // Alias of CC_CC  Unsigned lower
-};
-const u32 NO_COND = 0xE0000000;
-
-enum ShiftType
-{
-	ST_LSL = 0,
-	ST_ASL = 0,
-	ST_LSR = 1,
-	ST_ASR = 2,
-	ST_ROR = 3,
-	ST_RRX = 4
-};
-
-enum
-{
-	NUMGPRs = 13,
-};
-
-class ARMXEmitter;
-
-enum OpType
-{
-	TYPE_IMM = 0,
-	TYPE_REG,
-	TYPE_IMMSREG,
-	TYPE_RSR,
-	TYPE_MEM
-};
-
-// This is no longer a proper operand2 class. Need to split up.
-class Operand2
-{
-	friend class ARMXEmitter;
-protected:
-	u32 Value;
-
-private:
-	OpType Type;
-
-	// IMM types
-	u8	Rotation; // Only for u8 values
-
-	// Register types
-	u8 IndexOrShift;
-	ShiftType Shift;
-public:
-	OpType GetType()
-	{
-		return Type;
-	}
-	Operand2() {} 
-	Operand2(u32 imm, OpType type = TYPE_IMM)
-	{ 
-		Type = type; 
-		Value = imm; 
-		Rotation = 0;
-	}
-
-	Operand2(ARMReg Reg)
-	{
-		Type = TYPE_REG;
-		Value = Reg;
-		Rotation = 0;
-	}
-	Operand2(u8 imm, u8 rotation)
-	{
-		Type = TYPE_IMM;
-		Value = imm;
-		Rotation = rotation;
-	}
-	Operand2(ARMReg base, ShiftType type, ARMReg shift) // RSR
-	{
-		Type = TYPE_RSR;
-		_assert_msg_(DYNA_REC, type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount");
-		IndexOrShift = shift;
-		Shift = type;
-		Value = base;
-	}
-
-	Operand2(ARMReg base, ShiftType type, u8 shift)// For IMM shifted register
-	{
-		if(shift == 32) shift = 0;
-		switch (type)
-		{
-		case ST_LSL:
-			_assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSL %u", shift);
-			break;
-		case ST_LSR:
-			_assert_msg_(DYNA_REC, shift <= 32, "Invalid Operand2: LSR %u", shift);
-			if (!shift)
-				type = ST_LSL;
-			if (shift == 32)
-				shift = 0;
-			break;
-		case ST_ASR:
-			_assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSR %u", shift);
-			if (!shift)
-				type = ST_LSL;
-			if (shift == 32)
-				shift = 0;
-			break;
-		case ST_ROR:
-			_assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: ROR %u", shift);
-			if (!shift)
-				type = ST_LSL;
-			break;
-		case ST_RRX:
-			_assert_msg_(DYNA_REC, shift == 0, "Invalid Operand2: RRX does not take an immediate shift amount");
-			type = ST_ROR;
-			break;
-		}
-		IndexOrShift = shift;
-		Shift = type;
-		Value = base;
-		Type = TYPE_IMMSREG;
-	}
-	u32 GetData()
-	{
-		switch(Type)
-		{
-		case TYPE_IMM:
-			return Imm12Mod(); // This'll need to be changed later
-		case TYPE_REG:
-			return Rm();
-		case TYPE_IMMSREG:
-			return IMMSR();
-		case TYPE_RSR:
-			return RSR();
-		default:
-			_assert_msg_(DYNA_REC, false, "GetData with Invalid Type");
-			return 0;
-		}
-	}
-	u32 IMMSR() // IMM shifted register
-	{
-		_assert_msg_(DYNA_REC, Type == TYPE_IMMSREG, "IMMSR must be imm shifted register");
-		return ((IndexOrShift & 0x1f) << 7 | (Shift << 5) | Value);
-	}
-	u32 RSR() // Register shifted register
-	{
-		_assert_msg_(DYNA_REC, Type == TYPE_RSR, "RSR must be RSR Of Course");
-		return (IndexOrShift << 8) | (Shift << 5) | 0x10 | Value;
-	}
-	u32 Rm()
-	{
-		_assert_msg_(DYNA_REC, Type == TYPE_REG, "Rm must be with Reg");
-		return Value;
-	}
-
-	u32 Imm5()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm5 not IMM value");
-		return ((Value & 0x0000001F) << 7);
-	}
-	u32 Imm8()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value");
-		return Value & 0xFF;
-	}
-	u32 Imm8Rot() // IMM8 with Rotation
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value");
-		_assert_msg_(DYNA_REC, (Rotation & 0xE1) != 0, "Invalid Operand2: immediate rotation %u", Rotation);
-		return (1 << 25) | (Rotation << 7) | (Value & 0x000000FF);
-	}
-	u32 Imm12()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12 not IMM");
-		return (Value & 0x00000FFF);
-	}
-
-	u32 Imm12Mod()
-	{
-		// This is a IMM12 with the top four bits being rotation and the
-		// bottom eight being a IMM. This is for instructions that need to
-		// expand a 8bit IMM to a 32bit value and gives you some rotation as
-		// well.
-		// Each rotation rotates to the right by 2 bits
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12Mod not IMM");
-		return ((Rotation & 0xF) << 8) | (Value & 0xFF);
-	}
-	u32 Imm16()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM");
-		return ( (Value & 0xF000) << 4) | (Value & 0x0FFF);
-	}
-	u32 Imm16Low()
-	{
-		return Imm16();
-	}
-	u32 Imm16High() // Returns high 16bits
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM");
-		return ( ((Value >> 16) & 0xF000) << 4) | ((Value >> 16) & 0x0FFF);
-	}
-	u32 Imm24()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM");
-		return (Value & 0x0FFFFFFF);
-	}
-	// NEON and ASIMD specific
-	u32 Imm8ASIMD()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8ASIMD not IMM");
-		return  ((Value & 0x80) << 17) | ((Value & 0x70) << 12) | (Value & 0xF);
-	}
-	u32 Imm8VFP()
-	{
-		_assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8VFP not IMM");
-		return ((Value & 0xF0) << 12) | (Value & 0xF);
-	}
-};
-
-// Use these when you don't know if an imm can be represented as an operand2.
-// This lets you generate both an optimal and a fallback solution by checking
-// the return value, which will be false if these fail to find a Operand2 that
-// represents your 32-bit imm value.
-bool TryMakeOperand2(u32 imm, Operand2 &op2);
-bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse);
-bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated);
-
-// Use this only when you know imm can be made into an Operand2.
-Operand2 AssumeMakeOperand2(u32 imm);
-
-inline Operand2 R(ARMReg Reg)	{ return Operand2(Reg, TYPE_REG); }
-inline Operand2 IMM(u32 Imm)	{ return Operand2(Imm, TYPE_IMM); }
-inline Operand2 Mem(void *ptr)	{ return Operand2((u32)ptr, TYPE_IMM); }
-//usage: struct {int e;} s; STRUCT_OFFSET(s,e)
-#define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str)))
-
-
-struct FixupBranch
-{
-	u8 *ptr;
-	u32 condition; // Remembers our codition at the time
-	int type; //0 = B 1 = BL
-};
-
-struct LiteralPool
-{
-	s32 loc;
-	u8* ldr_address;
-	u32 val;
-};
-
-typedef const u8* JumpTarget;
-
-class ARMXEmitter
-{
-	friend struct OpArg;  // for Write8 etc
-	friend class NEONXEmitter;
-private:
-	u8 *code, *startcode;
-	u8 *lastCacheFlushEnd;
-	u32 condition;
-	std::vector<LiteralPool> currentLitPool;
-
-	void WriteStoreOp(u32 Op, ARMReg Rt, ARMReg Rn, Operand2 op2, bool RegAdd);
-	void WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList);
-	void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, ARMReg op2);
-	void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, Operand2 op2);
-	void WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2);
-
-	u32 EncodeVd(ARMReg Vd);
-	u32 EncodeVn(ARMReg Vn);
-	u32 EncodeVm(ARMReg Vm);
-	void WriteVFPDataOp(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void WriteVFPDataOp6bit(u32 Op, ARMReg Vd, ARMReg Vn, ARMReg Vm, u32 bit6);
-
-	void Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-
-	// New Ops
-	void WriteInstruction(u32 op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags = false);
-
-protected:
-	inline void Write32(u32 value) {*(u32*)code = value; code+=4;}
-
-public:
-	ARMXEmitter() : code(0), startcode(0), lastCacheFlushEnd(0) {
-		condition = CC_AL << 28;
-	}
-	ARMXEmitter(u8 *code_ptr) {
-		code = code_ptr;
-		lastCacheFlushEnd = code_ptr;
-		startcode = code_ptr;
-		condition = CC_AL << 28;
-	}
-	virtual ~ARMXEmitter() {}
-
-	void SetCodePtr(u8 *ptr);
-	void ReserveCodeSpace(u32 bytes);
-	const u8 *AlignCode16();
-	const u8 *AlignCodePage();
-	const u8 *GetCodePtr() const;
-	void FlushIcache();
-	void FlushIcacheSection(u8 *start, u8 *end);
-	u8 *GetWritableCodePtr();
-
-	void FlushLitPool();
-	void AddNewLit(u32 val);
-	bool TrySetValue_TwoOp(ARMReg reg, u32 val);
-
-	CCFlags GetCC() { return CCFlags(condition >> 28); }
-	void SetCC(CCFlags cond = CC_AL);
-
-	// Special purpose instructions
-
-	// Dynamic Endian Switching
-	void SETEND(bool BE);
-	// Debug Breakpoint
-	void BKPT(u16 arg);
-
-	// Hint instruction
-	void YIELD();
-
-	// Do nothing
-	void NOP(int count = 1); //nop padding - TODO: fast nop slides, for amd and intel (check their manuals)
-
-#ifdef CALL
-#undef CALL
-#endif
-
-	// Branching
-	FixupBranch B();
-	FixupBranch B_CC(CCFlags Cond);
-	void B_CC(CCFlags Cond, const void *fnptr);
-	FixupBranch BL();
-	FixupBranch BL_CC(CCFlags Cond);
-	void SetJumpTarget(FixupBranch const &branch);
-
-	void B (const void *fnptr);
-	void B (ARMReg src);
-	void BL(const void *fnptr);
-	void BL(ARMReg src);
-	bool BLInRange(const void *fnptr);
-
-	void PUSH(const int num, ...);
-	void POP(const int num, ...);
-
-	// New Data Ops
-	void AND (ARMReg Rd, ARMReg Rn, Operand2 Rm);
-	void ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm);
-	void EOR (ARMReg dest, ARMReg src, Operand2 op2);
-	void EORS(ARMReg dest, ARMReg src, Operand2 op2);
-	void SUB (ARMReg dest, ARMReg src, Operand2 op2);
-	void SUBS(ARMReg dest, ARMReg src, Operand2 op2);
-	void RSB (ARMReg dest, ARMReg src, Operand2 op2);
-	void RSBS(ARMReg dest, ARMReg src, Operand2 op2);
-	void ADD (ARMReg dest, ARMReg src, Operand2 op2);
-	void ADDS(ARMReg dest, ARMReg src, Operand2 op2);
-	void ADC (ARMReg dest, ARMReg src, Operand2 op2);
-	void ADCS(ARMReg dest, ARMReg src, Operand2 op2);
-	void LSL (ARMReg dest, ARMReg src, Operand2 op2);
-	void LSL (ARMReg dest, ARMReg src, ARMReg op2);
-	void LSLS(ARMReg dest, ARMReg src, Operand2 op2);
-	void LSLS(ARMReg dest, ARMReg src, ARMReg op2);
-	void LSR (ARMReg dest, ARMReg src, Operand2 op2);
-	void LSRS(ARMReg dest, ARMReg src, Operand2 op2);
-	void LSR (ARMReg dest, ARMReg src, ARMReg op2);
-	void LSRS(ARMReg dest, ARMReg src, ARMReg op2);
-	void ASR (ARMReg dest, ARMReg src, Operand2 op2);
-	void ASRS(ARMReg dest, ARMReg src, Operand2 op2);
-	void ASR (ARMReg dest, ARMReg src, ARMReg op2);
-	void ASRS(ARMReg dest, ARMReg src, ARMReg op2);
-	void SBC (ARMReg dest, ARMReg src, Operand2 op2);
-	void SBCS(ARMReg dest, ARMReg src, Operand2 op2);
-	void RBIT(ARMReg dest, ARMReg src);
-	void REV (ARMReg dest, ARMReg src);
-	void REV16 (ARMReg dest, ARMReg src);
-	void RSC (ARMReg dest, ARMReg src, Operand2 op2);
-	void RSCS(ARMReg dest, ARMReg src, Operand2 op2);
-	void TST (             ARMReg src, Operand2 op2);
-	void TEQ (             ARMReg src, Operand2 op2);
-	void CMP (             ARMReg src, Operand2 op2);
-	void CMN (             ARMReg src, Operand2 op2);
-	void ORR (ARMReg dest, ARMReg src, Operand2 op2);
-	void ORRS(ARMReg dest, ARMReg src, Operand2 op2);
-	void MOV (ARMReg dest,             Operand2 op2);
-	void MOVS(ARMReg dest,             Operand2 op2);
-	void BIC (ARMReg dest, ARMReg src, Operand2 op2);   // BIC = ANDN
-	void BICS(ARMReg dest, ARMReg src, Operand2 op2);
-	void MVN (ARMReg dest,             Operand2 op2);
-	void MVNS(ARMReg dest,             Operand2 op2);
-	void MOVW(ARMReg dest,             Operand2 op2);
-	void MOVT(ARMReg dest, Operand2 op2, bool TopBits = false);
-
-	// UDIV and SDIV are only available on CPUs that have 
-	// the idiva hardare capacity
-	void UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor);
-	void SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor);
-
-	void MUL (ARMReg dest,	ARMReg src, ARMReg op2);
-	void MULS(ARMReg dest,	ARMReg src, ARMReg op2);
-
-	void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-	void UMULLS(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-	void SMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-
-	void UMLAL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-	void SMLAL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm);
-
-	void SXTB(ARMReg dest, ARMReg op2);
-	void SXTH(ARMReg dest, ARMReg op2, u8 rotation = 0);
-	void SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation = 0);
-	void BFI(ARMReg rd, ARMReg rn, u8 lsb, u8 width);
-	void UBFX(ARMReg dest, ARMReg op2, u8 lsb, u8 width);
-	void CLZ(ARMReg rd, ARMReg rm);
-
-	// Using just MSR here messes with our defines on the PPC side of stuff (when this code was in dolphin...)
-	// Just need to put an underscore here, bit annoying.
-	void _MSR (bool nzcvq, bool g, Operand2 op2);
-	void _MSR (bool nzcvq, bool g, ARMReg src);
-	void MRS  (ARMReg dest);
-
-	// Memory load/store operations
-	void LDR  (ARMReg dest, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void LDRB (ARMReg dest, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void LDRH (ARMReg dest, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void LDRSB(ARMReg dest, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void LDRSH(ARMReg dest, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void STR  (ARMReg result, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void STRB (ARMReg result, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-	void STRH (ARMReg result, ARMReg base, Operand2 op2 = 0, bool RegAdd = true);
-
-	void STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...);
-	void LDMFD(ARMReg dest, bool WriteBack, const int Regnum, ...);
-
-	// Exclusive Access operations
-	void LDREX(ARMReg dest, ARMReg base);
-	// result contains the result if the instruction managed to store the value
-	void STREX(ARMReg result, ARMReg base, ARMReg op);
-	void DMB ();
-	void SVC(Operand2 op);
-
-	// NEON and ASIMD instructions
-	// None of these will be created with conditional since ARM
-	// is deprecating conditional execution of ASIMD instructions.
-	// ASIMD instructions don't even have a conditional encoding.
-
-	// Subtracts the base from the register to give us the real one
-	ARMReg SubBase(ARMReg Reg);	
-	
-	// VFP Only
-	void VLDR(ARMReg Dest, ARMReg Base, s16 offset);
-	void VSTR(ARMReg Src,  ARMReg Base, s16 offset);
-	void VCMP(ARMReg Vd, ARMReg Vm);
-	void VCMPE(ARMReg Vd, ARMReg Vm);
-	// Compares against zero
-	void VCMP(ARMReg Vd);
-	void VCMPE(ARMReg Vd);
-
-	void VNMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VNMLS(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VNMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VSQRT(ARMReg Vd, ARMReg Vm);
-
-	// NEON and VFP
-	void VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VABS(ARMReg Vd, ARMReg Vm);
-	void VNEG(ARMReg Vd, ARMReg Vm);
-	void VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VMLA(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VMLS(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VMOV(ARMReg Dest, Operand2 op2);
-	void VMOV(ARMReg Dest, ARMReg Src, bool high);
-	void VMOV(ARMReg Dest, ARMReg Src);
-	void VCVT(ARMReg Dest, ARMReg Src, int flags);
-
-	void VMRS(ARMReg Rt);
-	void VMSR(ARMReg Rt);
-
-	void QuickCallFunction(ARMReg scratchreg, void *func);
-
-	// Wrapper around MOVT/MOVW with fallbacks.
-	void MOVI2R(ARMReg reg, u32 val, bool optimize = true);
-	void MOVI2F(ARMReg dest, float val, ARMReg tempReg, bool negate = false);
-
-	void ADDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
-	void ANDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
-	void CMPI2R(ARMReg rs, u32 val, ARMReg scratch);
-	void ORI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
-
-
-};  // class ARMXEmitter
-
-enum NEONElementType
-{
-	I_8 = (1 << 0), 
-	I_16 = (1 << 1),
-	I_32 = (1 << 2),
-	I_64 = (1 << 3),
-	I_SIGNED = (1 << 4),
-	I_UNSIGNED = (1 << 5),
-	F_32 = (1 << 6)
-};
-
-enum NEONAlignment
-{
-	ALIGN_NONE = 0,
-	ALIGN_64 = 1,
-	ALIGN_128 = 2,
-	ALIGN_256 = 3
-};
-
-
-class NEONXEmitter
-{
-private:
-	ARMXEmitter *_emit;
-	ARMReg SubBase(ARMReg Reg) { return _emit->SubBase(Reg); }	
-	inline void Write32(u32 value) { _emit->Write32(value); }
-	
-	inline u32 encodedSize(u32 value)
-	{
-		if (value & I_8)
-			return 0;
-		else if (value & I_16)
-			return 1;
-		else if (value & I_32)
-			return 2;
-		else if (value & I_64)
-			return 3;
-		else
-			_dbg_assert_msg_(DYNA_REC, false, "Passed invalid size to integer NEON instruction");
-		return 0;
-	}
-	
-	void VREVX(u32 size, NEONElementType Size, ARMReg Vd, ARMReg Vm);
-
-public:
-	NEONXEmitter(ARMXEmitter *emit)
-		: _emit(emit)
-	{}
-
-	void VABD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VADD(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VSUB(NEONElementType Size, ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VREV64(NEONElementType Size, ARMReg Vd, ARMReg Vm);
-	void VREV32(NEONElementType Size, ARMReg Vd, ARMReg Vm);
-	void VREV16(NEONElementType Size, ARMReg Vd, ARMReg Vm);
-
-	void VRSQRTE(NEONElementType Size, ARMReg Vd, ARMReg Vm);
-
-	void VEOR(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-	void VORR(ARMReg Vd, ARMReg Vn, ARMReg Vm);
-
-	void VLD1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC);
-	void VLD2(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC);
-
-	void VST1(NEONElementType Size, ARMReg Vd, ARMReg Rn, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC);
-};
-
-// Everything that needs to generate X86 code should inherit from this.
-// You get memory management for free, plus, you can use all the MOV etc functions without
-// having to prefix them with gen-> or something similar.
-class ARMXCodeBlock : public ARMXEmitter
-{
-protected:
-	u8 *region;
-	size_t region_size;
-
-public:
-	ARMXCodeBlock() : region(NULL), region_size(0) {}
-	virtual ~ARMXCodeBlock() { if (region) FreeCodeSpace(); }
-
-	// Call this before you generate any code.
-	void AllocCodeSpace(int size)
-	{
-		region_size = size;
-		region = (u8*)AllocateExecutableMemory(region_size);
-		SetCodePtr(region);
-	}
-
-	// Always clear code space with breakpoints, so that if someone accidentally executes
-	// uninitialized, it just breaks into the debugger.
-	void ClearCodeSpace() 
-	{
-		// x86/64: 0xCC = breakpoint
-		memset(region, 0xCC, region_size);
-		ResetCodePtr();
-	}
-
-	// Call this when shutting down. Don't rely on the destructor, even though it'll do the job.
-	void FreeCodeSpace()
-	{
-#ifndef __SYMBIAN32__
-		FreeMemoryPages(region, region_size);
-#endif
-		region = NULL;
-		region_size = 0;
-	}
-
-	bool IsInSpace(u8 *ptr)
-	{
-		return ptr >= region && ptr < region + region_size;
-	}
-
-	// Cannot currently be undone. Will write protect the entire code region.
-	// Start over if you need to change the code (call FreeCodeSpace(), AllocCodeSpace()).
-	void WriteProtect()
-	{
-		WriteProtectMemory(region, region_size, true);
-	}
-	void UnWriteProtect()
-	{
-		UnWriteProtectMemory(region, region_size, false);
-	}
-
-	void ResetCodePtr()
-	{
-		SetCodePtr(region);
-	}
-
-	size_t GetSpaceLeft() const
-	{
-		return region_size - (GetCodePtr() - region);
-	}
-
-	u8 *GetBasePtr() {
-		return region;
-	}
-
-	size_t GetOffset(u8 *ptr) {
-		return ptr - region;
-	}
-};
-
-// VFP Specific
-struct VFPEnc {
-	s16 opc1;
-	s16 opc2;
-};
-extern const VFPEnc VFPOps[16][2];
-extern const char *VFPOpNames[16];
-
-}  // namespace
-
-#endif // _DOLPHIN_INTEL_CODEGEN_
diff --git a/Source/Core/Common/Src/Atomic.h b/Source/Core/Common/Src/Atomic.h
deleted file mode 100644
index 11ed451091..0000000000
--- a/Source/Core/Common/Src/Atomic.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ATOMIC_H_
-#define _ATOMIC_H_
-
-#ifdef _WIN32
-
-#include "Atomic_Win32.h"
-
-#else
-
-// GCC-compatible compiler assumed!
-#include "Atomic_GCC.h"
-
-#endif
-
-#endif
diff --git a/Source/Core/Common/Src/Atomic_GCC.h b/Source/Core/Common/Src/Atomic_GCC.h
deleted file mode 100644
index f923ba8b5e..0000000000
--- a/Source/Core/Common/Src/Atomic_GCC.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ATOMIC_GCC_H_
-#define _ATOMIC_GCC_H_
-
-#include "Common.h"
-
-// Atomic operations are performed in a single step by the CPU. It is
-// impossible for other threads to see the operation "half-done."
-//
-// Some atomic operations can be combined with different types of memory
-// barriers called "Acquire semantics" and "Release semantics", defined below.
-//
-// Acquire semantics: Future memory accesses cannot be relocated to before the
-//                    operation.
-//
-// Release semantics: Past memory accesses cannot be relocated to after the
-//                    operation.
-//
-// These barriers affect not only the compiler, but also the CPU.
-
-namespace Common
-{
-
-inline void AtomicAdd(volatile u32& target, u32 value) {
-	__sync_add_and_fetch(&target, value);
-}
-
-inline void AtomicAnd(volatile u32& target, u32 value) {
-	__sync_and_and_fetch(&target, value);
-}
-
-inline void AtomicDecrement(volatile u32& target) {
-	__sync_add_and_fetch(&target, -1);
-}
-
-inline void AtomicIncrement(volatile u32& target) {
-	__sync_add_and_fetch(&target, 1);
-}
-
-inline u32 AtomicLoad(volatile u32& src) {
-	return src; // 32-bit reads are always atomic.
-}
-inline u32 AtomicLoadAcquire(volatile u32& src) {
-	//keep the compiler from caching any memory references
-	u32 result = src; // 32-bit reads are always atomic.
-	//__sync_synchronize(); // TODO: May not be necessary.
-	// Compiler instruction only. x86 loads always have acquire semantics.
-	__asm__ __volatile__ ( "":::"memory" );
-	return result;
-}
-
-inline void AtomicOr(volatile u32& target, u32 value) {
-	__sync_or_and_fetch(&target, value);
-}
-
-inline void AtomicStore(volatile u32& dest, u32 value) {
-	dest = value; // 32-bit writes are always atomic.
-}
-inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
-	__sync_lock_test_and_set(&dest, value); // TODO: Wrong! This function is has acquire semantics.
-}
-
-}
-
-// Old code kept here for reference in case we need the parts with __asm__ __volatile__.
-#if 0
-LONG SyncInterlockedIncrement(LONG *Dest)
-{
-#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))
-  return  __sync_add_and_fetch(Dest, 1);
-#else
-  register int result;
-  __asm__ __volatile__("lock; xadd %0,%1"
-                       : "=r" (result), "=m" (*Dest)
-                       : "0" (1), "m" (*Dest)
-                       : "memory");
-  return result;
-#endif
-}
-
-LONG SyncInterlockedExchangeAdd(LONG *Dest, LONG Val)
-{
-#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))
-  return  __sync_add_and_fetch(Dest, Val);
-#else
-  register int result;
-  __asm__ __volatile__("lock; xadd %0,%1"
-                       : "=r" (result), "=m" (*Dest)
-                       : "0" (Val), "m" (*Dest)
-                       : "memory");
-  return result;
-#endif
-}
-
-LONG SyncInterlockedExchange(LONG *Dest, LONG Val)
-{
-#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))
-  return  __sync_lock_test_and_set(Dest, Val);
-#else
-  register int result;
-  __asm__ __volatile__("lock; xchg %0,%1"
-                       : "=r" (result), "=m" (*Dest)
-                       : "0" (Val), "m" (*Dest)
-                       : "memory");
-  return result;
-#endif
-}
-#endif
-
-#endif
diff --git a/Source/Core/Common/Src/Atomic_Win32.h b/Source/Core/Common/Src/Atomic_Win32.h
deleted file mode 100644
index 1b05f8e777..0000000000
--- a/Source/Core/Common/Src/Atomic_Win32.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ATOMIC_WIN32_H_
-#define _ATOMIC_WIN32_H_
-
-#include "Common.h"
-#include <intrin.h>
-#include <Windows.h>
-
-// Atomic operations are performed in a single step by the CPU. It is
-// impossible for other threads to see the operation "half-done."
-//
-// Some atomic operations can be combined with different types of memory
-// barriers called "Acquire semantics" and "Release semantics", defined below.
-//
-// Acquire semantics: Future memory accesses cannot be relocated to before the
-//                    operation.
-//
-// Release semantics: Past memory accesses cannot be relocated to after the
-//                    operation.
-//
-// These barriers affect not only the compiler, but also the CPU.
-//
-// NOTE: Acquire and Release are not differentiated right now. They perform a
-// full memory barrier instead of a "one-way" memory barrier. The newest
-// Windows SDK has Acquire and Release versions of some Interlocked* functions.
-
-namespace Common
-{
-
-inline void AtomicAdd(volatile u32& target, u32 value) {
-	InterlockedExchangeAdd((volatile LONG*)&target, (LONG)value);
-}
-
-inline void AtomicAnd(volatile u32& target, u32 value) {
-	_InterlockedAnd((volatile LONG*)&target, (LONG)value);
-}
-
-inline void AtomicIncrement(volatile u32& target) {
-	InterlockedIncrement((volatile LONG*)&target);
-}
-
-inline void AtomicDecrement(volatile u32& target) {
-	InterlockedDecrement((volatile LONG*)&target);
-}
-
-inline u32 AtomicLoad(volatile u32& src) {
-	return src; // 32-bit reads are always atomic.
-}
-inline u32 AtomicLoadAcquire(volatile u32& src) {
-	u32 result = src; // 32-bit reads are always atomic.
-	_ReadBarrier(); // Compiler instruction only. x86 loads always have acquire semantics.
-	return result;
-}
-
-inline void AtomicOr(volatile u32& target, u32 value) {
-	_InterlockedOr((volatile LONG*)&target, (LONG)value);
-}
-
-inline void AtomicStore(volatile u32& dest, u32 value) {
-	dest = value; // 32-bit writes are always atomic.
-}
-inline void AtomicStoreRelease(volatile u32& dest, u32 value) {
-	_WriteBarrier(); // Compiler instruction only. x86 stores always have release semantics.
-	dest = value; // 32-bit writes are always atomic.
-}
-
-}
-
-#endif
diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp
deleted file mode 100644
index 57d1b06538..0000000000
--- a/Source/Core/Common/Src/BreakPoints.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "DebugInterface.h"
-#include "BreakPoints.h"
-#include "../../Core/Src/PowerPC/JitCommon/JitBase.h"
-
-#include <sstream>
-#include <algorithm>
-
-bool BreakPoints::IsAddressBreakPoint(u32 _iAddress)
-{
-	for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i)
-		if (i->iAddress == _iAddress)
-			return true;
-	return false;
-}
-
-bool BreakPoints::IsTempBreakPoint(u32 _iAddress)
-{
-	for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i)
-		if (i->iAddress == _iAddress && i->bTemporary)
-			return true;
-	return false;
-}
-
-BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const
-{
-	TBreakPointsStr bps;
-	for (TBreakPoints::const_iterator i = m_BreakPoints.begin();
-		i != m_BreakPoints.end(); ++i)
-	{
-		if (!i->bTemporary)
-		{
-			std::stringstream bp;
-			bp << std::hex << i->iAddress << " " << (i->bOn ? "n" : "");
-			bps.push_back(bp.str());
-		}
-	}
-
-	return bps;
-}
-
-void BreakPoints::AddFromStrings(const TBreakPointsStr& bps)
-{
-	for (TBreakPointsStr::const_iterator i = bps.begin(); i != bps.end(); ++i)
-	{
-		TBreakPoint bp;
-		std::stringstream bpstr;
-		bpstr << std::hex << *i;
-		bpstr >> bp.iAddress;
-		bp.bOn = i->find("n") != i->npos;
-		bp.bTemporary = false;
-		Add(bp);
-	}
-}
-
-void BreakPoints::Add(const TBreakPoint& bp)
-{
-	if (!IsAddressBreakPoint(bp.iAddress))
-	{
-		m_BreakPoints.push_back(bp);
-		if (jit)
-			jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4);
-	}
-}
-
-void BreakPoints::Add(u32 em_address, bool temp)
-{
-	if (!IsAddressBreakPoint(em_address)) // only add new addresses
-	{
-		TBreakPoint pt; // breakpoint settings
-		pt.bOn = true;
-		pt.bTemporary = temp;
-		pt.iAddress = em_address;
-
-		m_BreakPoints.push_back(pt);
-
-		if (jit)
-			jit->GetBlockCache()->InvalidateICache(em_address, 4);
-	}
-}
-
-void BreakPoints::Remove(u32 em_address)
-{
-	for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i)
-	{
-		if (i->iAddress == em_address)
-		{
-			m_BreakPoints.erase(i);
-			if (jit)
-				jit->GetBlockCache()->InvalidateICache(em_address, 4);
-			return;
-		}
-	}
-}
-
-void BreakPoints::Clear()
-{
-	if (jit)
-	{
-		std::for_each(m_BreakPoints.begin(), m_BreakPoints.end(),
-			[](const TBreakPoint& bp)
-			{
-				jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4);
-			}
-		);
-	}
-	
-	m_BreakPoints.clear();
-}
-
-MemChecks::TMemChecksStr MemChecks::GetStrings() const
-{
-	TMemChecksStr mcs;
-	for (TMemChecks::const_iterator i = m_MemChecks.begin();
-		i != m_MemChecks.end(); ++i)
-	{
-		std::stringstream mc;
-		mc << std::hex << i->StartAddress;
-		mc << " " << (i->bRange ? i->EndAddress : i->StartAddress) << " " <<
-			(i->bRange ? "n" : "") << (i->OnRead ? "r" : "") <<
-			(i->OnWrite ? "w" : "") << (i->Log ? "l" : "") << (i->Break ? "p" : "");
-		mcs.push_back(mc.str());
-	}
-
-	return mcs;
-}
-
-void MemChecks::AddFromStrings(const TMemChecksStr& mcs)
-{
-	for (TMemChecksStr::const_iterator i = mcs.begin(); i != mcs.end(); ++i)
-	{
-		TMemCheck mc;
-		std::stringstream mcstr;
-		mcstr << std::hex << *i;
-		mcstr >> mc.StartAddress;
-		mc.bRange	= i->find("n") != i->npos;
-		mc.OnRead	= i->find("r") != i->npos;
-		mc.OnWrite	= i->find("w") != i->npos;
-		mc.Log		= i->find("l") != i->npos;
-		mc.Break	= i->find("p") != i->npos;
-		if (mc.bRange)
-			mcstr >> mc.EndAddress;
-		else
-			mc.EndAddress = mc.StartAddress;
-		Add(mc);
-	}
-}
-
-void MemChecks::Add(const TMemCheck& _rMemoryCheck)
-{
-	if (GetMemCheck(_rMemoryCheck.StartAddress) == 0)
-		m_MemChecks.push_back(_rMemoryCheck);
-}
-
-void MemChecks::Remove(u32 _Address)
-{
-	for (TMemChecks::iterator i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i)
-	{
-		if (i->StartAddress == _Address)
-		{
-			m_MemChecks.erase(i);
-			return;
-		}
-	}
-}
-
-TMemCheck *MemChecks::GetMemCheck(u32 address)
-{
-	for (TMemChecks::iterator i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i)
-	{
-		if (i->bRange)
-		{
-			if (address >= i->StartAddress && address <= i->EndAddress)
-				return &(*i);
-		}
-		else if (i->StartAddress == address)
-			return &(*i);
-	}
-
-	// none found
-	return 0;
-}
-
-void TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr,
-						bool write, int size, u32 pc)
-{
-	if ((write && OnWrite) || (!write && OnRead))
-	{
-		if (Log)
-		{
-			INFO_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)",
-				pc, debug_interface->getDescription(pc).c_str(),
-				write ? "Write" : "Read", size*8, size*2, iValue, addr,
-				debug_interface->getDescription(addr).c_str()
-				);
-		}
-		if (Break)
-			debug_interface->breakNow();
-	}
-}
diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h
deleted file mode 100644
index cc4f1fcbfb..0000000000
--- a/Source/Core/Common/Src/BreakPoints.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DEBUGGER_BREAKPOINTS_H
-#define _DEBUGGER_BREAKPOINTS_H
-
-#include <vector>
-#include <string>
-
-#include "Common.h"
-
-class DebugInterface;
-
-struct TBreakPoint
-{
-	u32		iAddress;
-	bool	bOn;
-	bool	bTemporary;
-};
-
-struct TMemCheck
-{
-	TMemCheck() {
-		numHits = 0;
-		StartAddress = EndAddress = 0;
-		bRange = OnRead = OnWrite = Log = Break = false;
-	}
-	u32 StartAddress;
-	u32 EndAddress;
-
-	bool	bRange;
-
-	bool	OnRead;
-	bool	OnWrite;
-
-	bool	Log;
-	bool	Break;
-
-	u32		numHits;
-
-	void Action(DebugInterface *dbg_interface, u32 _iValue, u32 addr,
-				bool write, int size, u32 pc);
-};
-
-// Code breakpoints.
-class BreakPoints
-{
-public:
-	typedef std::vector<TBreakPoint> TBreakPoints;
-	typedef std::vector<std::string> TBreakPointsStr;
-
-	const TBreakPoints& GetBreakPoints() { return m_BreakPoints; }
-
-	TBreakPointsStr GetStrings() const;
-	void AddFromStrings(const TBreakPointsStr& bps);
-
-	// is address breakpoint
-	bool IsAddressBreakPoint(u32 _iAddress);
-	bool IsTempBreakPoint(u32 _iAddress);
-
-	// Add BreakPoint
-	void Add(u32 em_address, bool temp=false);
-	void Add(const TBreakPoint& bp);
-
-	// Remove Breakpoint
-	void Remove(u32 _iAddress);
-	void Clear();
-
-    void DeleteByAddress(u32 _Address);
-
-private:
-	TBreakPoints m_BreakPoints;
-	u32	m_iBreakOnCount;
-};
-
-
-// Memory breakpoints
-class MemChecks
-{
-public:
-	typedef std::vector<TMemCheck> TMemChecks;
-	typedef std::vector<std::string> TMemChecksStr;
-
-	TMemChecks m_MemChecks;
-
-	const TMemChecks& GetMemChecks() { return m_MemChecks; }
-
-	TMemChecksStr GetStrings() const;
-	void AddFromStrings(const TMemChecksStr& mcs);
-
-	void Add(const TMemCheck& _rMemoryCheck);
-
-	// memory breakpoint
-	TMemCheck *GetMemCheck(u32 address);
-    void Remove(u32 _Address);
-
-	void Clear() { m_MemChecks.clear(); };
-};
-
-#endif
-
diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp
deleted file mode 100644
index f697476df5..0000000000
--- a/Source/Core/Common/Src/CDUtils.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// Most of the code in this file was shamelessly ripped from libcdio With minor adjustments
-
-#include "CDUtils.h"
-#include "Common.h"
-
-#include <memory> // for std::unique_ptr
-#ifdef _WIN32
-#include <windows.h>
-#include "StringUtil.h"
-#elif __APPLE__
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/IOBSD.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IOMedia.h>
-#include <paths.h>
-#else
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#endif // WIN32
-
-#ifdef __linux__
-#include <linux/cdrom.h>
-#endif
-
-#ifdef _WIN32
-// takes a root drive path, returns true if it is a cdrom drive
-bool is_cdrom(const TCHAR* drive)
-{
-	return (DRIVE_CDROM == GetDriveType(drive));
-}
-
-// Returns a vector with the device names
-std::vector<std::string> cdio_get_devices()
-{
-	std::vector<std::string> drives;
-
-	const DWORD buffsize = GetLogicalDriveStrings(0, NULL);
-	std::vector<TCHAR> buff(buffsize);
-	if (GetLogicalDriveStrings(buffsize, buff.data()) == buffsize - 1)
-	{
-		auto drive = buff.data();
-		while (*drive)
-		{
-			if (is_cdrom(drive))
-			{
-				std::string str(TStrToUTF8(drive));
-				str.pop_back();	// we don't want the final backslash
-				drives.push_back(std::move(str));
-			}
-
-			// advance to next drive
-			while (*drive++) {}
-		}
-	}
-	return drives;
-}
-#elif defined __APPLE__
-// Returns a pointer to an array of strings with the device names
-std::vector<std::string> cdio_get_devices()
-{
-	io_object_t   next_media;
-	mach_port_t   master_port;
-	kern_return_t kern_result;
-	io_iterator_t media_iterator;
-	CFMutableDictionaryRef classes_to_match;
-	std::vector<std::string> drives;
-
-	kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
-	if( kern_result != KERN_SUCCESS )
-		return( drives );
-
-	classes_to_match = IOServiceMatching( kIOCDMediaClass );
-	if( classes_to_match == NULL )
-		return( drives );
-
-	CFDictionarySetValue( classes_to_match,
-		CFSTR(kIOMediaEjectableKey), kCFBooleanTrue );
-
-	kern_result = IOServiceGetMatchingServices( master_port,
-		classes_to_match, &media_iterator );
-	if( kern_result != KERN_SUCCESS)
-		return( drives );
-
-	next_media = IOIteratorNext( media_iterator );
-	if( next_media != 0 )
-	{
-		char psz_buf[0x32];
-		size_t dev_path_length;
-		CFTypeRef str_bsd_path;
-
-		do
-		{
-			str_bsd_path =
-				IORegistryEntryCreateCFProperty( next_media,
-					CFSTR( kIOBSDNameKey ), kCFAllocatorDefault,
-					0 );
-			if( str_bsd_path == NULL )
-			{
-				IOObjectRelease( next_media );
-				continue;
-			}
-
-			// Below, by appending 'r' to the BSD node name, we indicate
-			// a raw disk. Raw disks receive I/O requests directly and
-			// don't go through a buffer cache.
-			snprintf( psz_buf, sizeof(psz_buf), "%s%c", _PATH_DEV, 'r' );
-			dev_path_length = strlen( psz_buf );
-
-			if( CFStringGetCString( (CFStringRef)str_bsd_path,
-				(char*)&psz_buf + dev_path_length,
-				sizeof(psz_buf) - dev_path_length,
-				kCFStringEncodingASCII))
-			{
-				if(psz_buf != NULL)
-				{
-					std::string str = psz_buf;
-					drives.push_back(str);
-				}
-			}
-			CFRelease( str_bsd_path );
-			IOObjectRelease( next_media );
-
-		} while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
-	}
-	IOObjectRelease( media_iterator );
-	return drives;
-}
-#else
-// checklist: /dev/cdrom, /dev/dvd /dev/hd?, /dev/scd? /dev/sr?
-static struct
-{
-	const char * format;
-	unsigned int num_min;
-	unsigned int num_max;
-} checklist[] =
-	{
-#ifdef __linux__
-		{ "/dev/cdrom", 0, 0 },
-		{ "/dev/dvd", 0, 0 },
-		{ "/dev/hd%c", 'a', 'z' },
-		{ "/dev/scd%d", 0, 27 },
-		{ "/dev/sr%d", 0, 27 },
-#else
-		{ "/dev/acd%d", 0, 27 },
-		{ "/dev/cd%d", 0, 27 },
-#endif
-		{ NULL, 0, 0 }
-	};
-
-// Returns true if a device is a block or char device and not a symbolic link
-bool is_device(const char *source_name)
-{
-	struct stat buf;
-	if (0 != lstat(source_name, &buf))
-		return false;
-
-	return ((S_ISBLK(buf.st_mode) || S_ISCHR(buf.st_mode)) &&
-		!S_ISLNK(buf.st_mode));
-}
-
-// Check a device to see if it is a DVD/CD-ROM drive
-static bool is_cdrom(const char *drive, char *mnttype)
-{
-	bool is_cd=false;
-	int cdfd;
-
-	// Check if the device exists
-	if (!is_device(drive))
-		return(false);
-
-	// If it does exist, verify that it is a cdrom/dvd drive
-	cdfd = open(drive, (O_RDONLY|O_NONBLOCK), 0);
-	if ( cdfd >= 0 )
-	{
-#ifdef __linux__
-		if (ioctl(cdfd, CDROM_GET_CAPABILITY, 0) != -1)
-#endif
-			is_cd = true;
-		close(cdfd);
-	}
-	return(is_cd);
-}
-
-// Returns a pointer to an array of strings with the device names
-std::vector<std::string> cdio_get_devices ()
-{
-	unsigned int i;
-	char drive[40];
-	std::vector<std::string> drives;
-
-	// Scan the system for DVD/CD-ROM drives.
-	for ( i=0; checklist[i].format; ++i )
-	{
-		unsigned int j;
-		for ( j=checklist[i].num_min; j<=checklist[i].num_max; ++j )
-		{
-			sprintf(drive, checklist[i].format, j);
-			if ( (is_cdrom(drive, NULL)) > 0 )
-			{
-				std::string str = drive;
-				drives.push_back(str);
-			}
-		}
-	}
-	return drives;
-}
-#endif
-
-// Returns true if device is a cdrom/dvd drive
-bool cdio_is_cdrom(std::string device)
-{
-#ifdef __linux__
-	// Resolve symbolic links. This allows symbolic links to valid
-	// drives to be passed from the command line with the -e flag.
-	char resolved_path[MAX_PATH];
-	char *devname = realpath(device.c_str(), resolved_path);
-	if (!devname)
-		return false;
-#endif
-
-	std::vector<std::string> devices = cdio_get_devices();
-	bool res = false;
-	for (unsigned int i = 0; i < devices.size(); i++)
-	{
-#ifdef __linux__
-		if (strncmp(devices[i].c_str(), devname, MAX_PATH) == 0)
-#else
-		if (strncmp(devices[i].c_str(), device.c_str(), MAX_PATH) == 0)
-#endif
-		{
-			res = true;
-			break;
-		}
-	}
-
-	devices.clear();
-	return res;
-}
-
diff --git a/Source/Core/Common/Src/CDUtils.h b/Source/Core/Common/Src/CDUtils.h
deleted file mode 100644
index 34b41a0d4f..0000000000
--- a/Source/Core/Common/Src/CDUtils.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _CDUTILS_H_
-#define _CDUTILS_H_
-
-#include <stdlib.h>
-#include <vector>
-#include <string>
-#include <stdio.h>
-
-// Returns a pointer to an array of strings with the device names
-std::vector<std::string> cdio_get_devices();
-
-// Returns true if device is cdrom/dvd
-bool cdio_is_cdrom(std::string device);
-
-#endif // _CDUTILS_H_
diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h
deleted file mode 100644
index be6ce34985..0000000000
--- a/Source/Core/Common/Src/CPUDetect.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Detect the cpu, so we'll know which optimizations to use
-#ifndef _CPUDETECT_H_
-#define _CPUDETECT_H_
-
-#include <string>
-
-enum CPUVendor
-{
-	VENDOR_INTEL = 0,
-	VENDOR_AMD = 1,
-	VENDOR_ARM = 2,
-	VENDOR_OTHER = 3,
-};
-
-struct CPUInfo
-{
-	CPUVendor vendor;
-
-	char cpu_string[0x21];
-	char brand_string[0x41];
-	bool OS64bit;
-	bool CPU64bit;
-	bool Mode64bit;
-
-	bool HTT;
-	int num_cores;
-	int logical_cpu_count;
-
-	bool bSSE;
-	bool bSSE2;
-	bool bSSE3;
-	bool bSSSE3;
-	bool bPOPCNT;
-	bool bSSE4_1;
-	bool bSSE4_2;
-	bool bLZCNT;
-	bool bSSE4A;
-	bool bAVX;
-	bool bAES;
-	bool bLAHFSAHF64;
-	bool bLongMode;
-
-	// ARM specific CPUInfo
-	bool bSwp;
-	bool bHalf;
-	bool bThumb;
-	bool bFastMult;
-	bool bVFP;
-	bool bEDSP;
-	bool bThumbEE;
-	bool bNEON;
-	bool bVFPv3;
-	bool bTLS;
-	bool bVFPv4;
-	bool bIDIVa;
-	bool bIDIVt;
-	bool bArmV7;  // enable MOVT, MOVW etc
-
-	// ARMv8 specific
-	bool bFP;
-	bool bASIMD;
-
-	// Call Detect()
-	explicit CPUInfo();
-
-	// Turn the cpu info into a string we can show
-	std::string Summarize();
-
-private:
-	// Detects the various cpu features
-	void Detect();
-};
-
-extern CPUInfo cpu_info;
-
-#endif // _CPUDETECT_H_
diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h
deleted file mode 100644
index 6fed73a7ed..0000000000
--- a/Source/Core/Common/Src/ChunkFile.h
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _POINTERWRAP_H_
-#define _POINTERWRAP_H_
-
-// Extremely simple serialization framework.
-
-// (mis)-features:
-// + Super fast
-// + Very simple
-// + Same code is used for serialization and deserializaition (in most cases)
-// - Zero backwards/forwards compatibility
-// - Serialization code for anything complex has to be manually written.
-
-#include <map>
-#include <vector>
-#include <list>
-#include <deque>
-#include <string>
-#include <type_traits>
-
-#include "Common.h"
-#include "FileUtil.h"
-
-template <class T>
-struct LinkedListItem : public T
-{
-	LinkedListItem<T> *next;
-};
-
-// Wrapper class
-class PointerWrap
-{
-public:
-	enum Mode
-	{
-		MODE_READ = 1, // load
-		MODE_WRITE, // save
-		MODE_MEASURE, // calculate size
-		MODE_VERIFY, // compare
-	};
-
-	u8 **ptr;
-	Mode mode;
-
-public:
-	PointerWrap(u8 **ptr_, Mode mode_) : ptr(ptr_), mode(mode_) {}
-
-	void SetMode(Mode mode_) { mode = mode_; }
-	Mode GetMode() const { return mode; }
-	u8** GetPPtr() { return ptr; }
-
-	template <typename K, class V>
-	void Do(std::map<K, V>& x)
-	{
-		u32 count = (u32)x.size();
-		Do(count);
-
-		switch (mode)
-		{
-		case MODE_READ:
-			for (x.clear(); count != 0; --count)
-			{
-				std::pair<K, V> pair;
-				Do(pair.first);
-				Do(pair.second);
-				x.insert(pair);
-			}
-			break;
-
-		case MODE_WRITE:
-		case MODE_MEASURE:
-		case MODE_VERIFY:
-			for (auto itr = x.begin(); itr != x.end(); ++itr)
-			{
-				Do(itr->first);
-				Do(itr->second);
-			}
-			break;
-		}
-	}
-
-	template <typename T>
-	void DoContainer(T& x)
-	{
-		u32 size = (u32)x.size();
-		Do(size);
-		x.resize(size);
-
-		for (auto itr = x.begin(); itr != x.end(); ++itr)
-			Do(*itr);
-	}
-
-	template <typename T>
-	void Do(std::vector<T>& x)
-	{
-		DoContainer(x);
-	}
-
-	template <typename T>
-	void Do(std::list<T>& x)
-	{
-		DoContainer(x);
-	}
-
-	template <typename T>
-	void Do(std::deque<T>& x)
-	{
-		DoContainer(x);
-	}
-
-	template <typename T>
-	void Do(std::basic_string<T>& x)
-	{
-		DoContainer(x);
-	}
-
-	template <typename T>
-	void DoArray(T* x, u32 count)
-	{
-		for (u32 i = 0; i != count; ++i)
-			Do(x[i]);
-	}
-
-	template <typename T>
-	void Do(T& x)
-	{
-		// Ideally this would be std::is_trivially_copyable, but not enough support yet
-		static_assert(std::is_pod<T>::value, "Only sane for POD types");
-		
-		DoVoid((void*)&x, sizeof(x));
-	}
-	
-	template <typename T>
-	void DoPOD(T& x)
-	{
-		DoVoid((void*)&x, sizeof(x));
-	}
-
-	template <typename T>
-	void DoPointer(T*& x, T* const base)
-	{
-		// pointers can be more than 2^31 apart, but you're using this function wrong if you need that much range
-		s32 offset = x - base;
-		Do(offset);
-		if (mode == MODE_READ)
-			x = base + offset;
-	}
-
-	// Let's pretend std::list doesn't exist!
-	template <class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)>
-	void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end=0)
-	{
-		LinkedListItem<T>* list_cur = list_start;
-		LinkedListItem<T>* prev = 0;
-
-		while (true)
-		{
-			u8 shouldExist = (list_cur ? 1 : 0);
-			Do(shouldExist);
-			if (shouldExist == 1)
-			{
-				LinkedListItem<T>* cur = list_cur ? list_cur : TNew();
-				TDo(*this, (T*)cur);
-				if (!list_cur)
-				{
-					if (mode == MODE_READ)
-					{
-						cur->next = 0;
-						list_cur = cur;
-						if (prev)
-							prev->next = cur;
-						else
-							list_start = cur;
-					}
-					else
-					{
-						TFree(cur);
-						continue;
-					}
-				}
-			}
-			else
-			{
-				if (mode == MODE_READ)
-				{
-					if (prev)
-						prev->next = 0;
-					if (list_end)
-						*list_end = prev;
-					if (list_cur)
-					{
-						if (list_start == list_cur)
-							list_start = 0;
-						do
-						{
-							LinkedListItem<T>* next = list_cur->next;
-							TFree(list_cur);
-							list_cur = next;
-						}
-						while (list_cur);
-					}
-				}
-				break;
-			}
-			prev = list_cur;
-			list_cur = list_cur->next;
-		}
-	}
-
-	void DoMarker(const char* prevName, u32 arbitraryNumber = 0x42)
-	{
-		u32 cookie = arbitraryNumber;
-		Do(cookie);
-
-		if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber)
-		{
-			PanicAlertT("Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load...",
-				prevName, cookie, cookie, arbitraryNumber, arbitraryNumber);
-			mode = PointerWrap::MODE_MEASURE;
-		}
-	}
-
-private:
-	__forceinline void DoByte(u8& x)
-	{
-		switch (mode)
-		{
-		case MODE_READ:
-			x = **ptr;
-			break;
-
-		case MODE_WRITE:
-			**ptr = x;
-			break;
-
-		case MODE_MEASURE:
-			break;
-
-		case MODE_VERIFY:
-			_dbg_assert_msg_(COMMON, (x == **ptr),
-				"Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n",
-					x, x, &x, **ptr, **ptr, *ptr);
-			break;
-
-		default:
-			break;
-		}
-
-		++(*ptr);
-	}
-
-	void DoVoid(void *data, u32 size)
-	{
-		for(u32 i = 0; i != size; ++i)
-			DoByte(reinterpret_cast<u8*>(data)[i]);
-	}
-};
-
-class CChunkFileReader
-{
-public:
-	// Load file template
-	template<class T>
-	static bool Load(const std::string& _rFilename, u32 _Revision, T& _class)
-	{
-		INFO_LOG(COMMON, "ChunkReader: Loading %s" , _rFilename.c_str());
-
-		if (!File::Exists(_rFilename))
-			return false;
-				
-		// Check file size
-		const u64 fileSize = File::GetSize(_rFilename);
-		static const u64 headerSize = sizeof(SChunkHeader);
-		if (fileSize < headerSize)
-		{
-			ERROR_LOG(COMMON,"ChunkReader: File too small");
-			return false;
-		}
-
-		File::IOFile pFile(_rFilename, "rb");
-		if (!pFile)
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading");
-			return false;
-		}
-
-		// read the header
-		SChunkHeader header;
-		if (!pFile.ReadArray(&header, 1))
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Bad header size");
-			return false;
-		}
-
-		// Check revision
-		if (header.Revision != _Revision)
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Wrong file revision, got %d expected %d",
-				header.Revision, _Revision);
-			return false;
-		}
-
-		// get size
-		const u32 sz = (u32)(fileSize - headerSize);
-		if (header.ExpectedSize != sz)
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Bad file size, got %d expected %d",
-				sz, header.ExpectedSize);
-			return false;
-		}
-
-		// read the state
-		std::vector<u8> buffer(sz);
-		if (!pFile.ReadArray(&buffer[0], sz))
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Error reading file");
-			return false;
-		}
-
-		u8* ptr = &buffer[0];
-		PointerWrap p(&ptr, PointerWrap::MODE_READ);
-		_class.DoState(p);
-		
-		INFO_LOG(COMMON, "ChunkReader: Done loading %s" , _rFilename.c_str());
-		return true;
-	}
-
-	// Save file template
-	template<class T>
-	static bool Save(const std::string& _rFilename, u32 _Revision, T& _class)
-	{
-		INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str());
-		File::IOFile pFile(_rFilename, "wb");
-		if (!pFile)
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Error opening file for write");
-			return false;
-		}
-
-		// Get data
-		u8 *ptr = 0;
-		PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
-		_class.DoState(p);
-		size_t const sz = (size_t)ptr;
-		std::vector<u8> buffer(sz);
-		ptr = &buffer[0];
-		p.SetMode(PointerWrap::MODE_WRITE);
-		_class.DoState(p);
-
-		// Create header
-		SChunkHeader header;
-		header.Revision = _Revision;
-		header.ExpectedSize = (u32)sz;
-
-		// Write to file
-		if (!pFile.WriteArray(&header, 1))
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Failed writing header");
-			return false;
-		}
-
-		if (!pFile.WriteArray(&buffer[0], sz))
-		{
-			ERROR_LOG(COMMON,"ChunkReader: Failed writing data");
-			return false;
-		}
-
-		INFO_LOG(COMMON,"ChunkReader: Done writing %s", _rFilename.c_str());
-		return true;
-	}
-
-private:
-	struct SChunkHeader
-	{
-		u32 Revision;
-		u32 ExpectedSize;
-	};
-};
-
-#endif  // _POINTERWRAP_H_
diff --git a/Source/Core/Common/Src/ColorUtil.cpp b/Source/Core/Common/Src/ColorUtil.cpp
deleted file mode 100644
index f338fb3f47..0000000000
--- a/Source/Core/Common/Src/ColorUtil.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ColorUtil.h"
-
-namespace ColorUtil
-{
-
-const int lut5to8[] = { 0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39,
-						0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B,
-						0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD,
-						0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF };
-const int lut4to8[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
-						0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF };
-const int lut3to8[] = { 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF };
-
-u32 Decode5A3(u16 val)
-{
-	const u32 bg_color = 0x00000000;
-
-	int r, g, b, a;
-
-	if (val & 0x8000)
-	{
-		r = lut5to8[(val >> 10) & 0x1f];
-		g = lut5to8[(val >> 5) & 0x1f];
-		b = lut5to8[(val) & 0x1f];
-		a = 0xFF;
-	}
-	else
-	{
-		a = lut3to8[(val >> 12) & 0x7];
-		r = (lut4to8[(val >> 8) & 0xf] * a + (bg_color & 0xFF) * (255 - a)) / 255;
-		g = (lut4to8[(val >> 4) & 0xf] * a + ((bg_color >> 8) & 0xFF) * (255 - a)) / 255;
-		b = (lut4to8[(val) & 0xf] * a + ((bg_color >> 16) & 0xFF) * (255 - a)) / 255;
-		a = 0xFF;
-	}
-	return (a << 24) | (r << 16) | (g << 8) | b;
-}
-
-}  // namespace
diff --git a/Source/Core/Common/Src/ColorUtil.h b/Source/Core/Common/Src/ColorUtil.h
deleted file mode 100644
index 8b666f1f5c..0000000000
--- a/Source/Core/Common/Src/ColorUtil.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COLORUTIL_H_
-#define _COLORUTIL_H_
-
-namespace ColorUtil
-{
-
-u32 Decode5A3(u16 val);
-
-}  // namespace
-
-#endif // _COLORUTIL_H_
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
deleted file mode 100644
index e148b6638c..0000000000
--- a/Source/Core/Common/Src/Common.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-// DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
-// since it slows down the build a lot.
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-// SVN version number
-extern const char *scm_rev_str;
-extern const char *netplay_dolphin_ver;
-
-// Force enable logging in the right modes. For some reason, something had changed
-// so that debugfast no longer logged.
-#if defined(_DEBUG) || defined(DEBUGFAST)
-#undef LOGGING
-#define LOGGING 1
-#endif
-
-#define STACKALIGN
-
-#if __cplusplus >= 201103 || defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define HAVE_CXX11_SYNTAX 1
-#endif
-
-#if HAVE_CXX11_SYNTAX
-// An inheritable class to disallow the copy constructor and operator= functions
-class NonCopyable
-{
-protected:
-	NonCopyable() {}
-	NonCopyable(const NonCopyable&&) {}
-	void operator=(const NonCopyable&&) {}
-private:
-	NonCopyable(NonCopyable&);
-	NonCopyable& operator=(NonCopyable& other);
-};
-#endif
-
-#include "Log.h"
-#include "CommonTypes.h"
-#include "MsgHandler.h"
-#include "CommonFuncs.h"
-
-#ifdef __APPLE__
-// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
-// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
-#if defined __i386__ && defined __GNUC__
-#undef STACKALIGN
-#define STACKALIGN __attribute__((__force_align_arg_pointer__))
-#endif
-
-#elif defined _WIN32
-
-// Check MSC ver
-	#if !defined _MSC_VER || _MSC_VER <= 1000
-		#error needs at least version 1000 of MSC
-	#endif
-
-	#define NOMINMAX
-
-// Memory leak checks
-	#define CHECK_HEAP_INTEGRITY()
-
-// Alignment
-	#define GC_ALIGNED16(x) __declspec(align(16)) x
-	#define GC_ALIGNED32(x) __declspec(align(32)) x
-	#define GC_ALIGNED64(x) __declspec(align(64)) x
-	#define GC_ALIGNED128(x) __declspec(align(128)) x
-	#define GC_ALIGNED16_DECL(x) __declspec(align(16)) x
-	#define GC_ALIGNED64_DECL(x) __declspec(align(64)) x
-
-// Since they are always around on windows
-	#define HAVE_WX 1
-	#define HAVE_OPENAL 1
-
-	#define HAVE_PORTAUDIO 1
-
-// Debug definitions
-	#if defined(_DEBUG)
-		#include <crtdbg.h>
-		#undef CHECK_HEAP_INTEGRITY
-		#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
-		// If you want to see how much a pain in the ass singletons are, for example:
-		// {614} normal block at 0x030C5310, 188 bytes long.
-		// Data: <Master Log      > 4D 61 73 74 65 72 20 4C 6F 67 00 00 00 00 00 00
-		struct CrtDebugBreak { CrtDebugBreak(int spot) { _CrtSetBreakAlloc(spot); } };
-		//CrtDebugBreak breakAt(614);
-	#endif // end DEBUG/FAST
-
-#endif
-
-// Windows compatibility
-#ifndef _WIN32
-#include <limits.h>
-#define MAX_PATH PATH_MAX
-#ifdef _LP64
-#define _M_X64 1
-#else
-#define _M_IX86 1
-#endif
-#define __forceinline inline __attribute__((always_inline))
-#define GC_ALIGNED16(x) __attribute__((aligned(16))) x
-#define GC_ALIGNED32(x) __attribute__((aligned(32))) x
-#define GC_ALIGNED64(x) __attribute__((aligned(64))) x
-#define GC_ALIGNED128(x) __attribute__((aligned(128))) x
-#define GC_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
-#define GC_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
-#endif
-
-#ifdef _MSC_VER
-#define __strdup _strdup
-#define __getcwd _getcwd
-#define __chdir _chdir
-#else
-#define __strdup strdup
-#define __getcwd getcwd
-#define __chdir chdir
-#endif
-
-// Dummy macro for marking translatable strings that can not be immediately translated.
-// wxWidgets does not have a true dummy macro for this.
-#define _trans(a) a
-
-#if defined _M_GENERIC
-#  define _M_SSE 0x0
-#elif defined __GNUC__
-# if defined __SSE4_2__
-#  define _M_SSE 0x402
-# elif defined __SSE4_1__
-#  define _M_SSE 0x401
-# elif defined __SSSE3__
-#  define _M_SSE 0x301
-# elif defined __SSE3__
-#  define _M_SSE 0x300
-# endif
-#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008
-#  define _M_SSE 0x402
-#endif
-
-// Host communication.
-enum HOST_COMM
-{
-	// Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on
-	WM_USER_STOP = 10,
-	WM_USER_CREATE,
-	WM_USER_SETCURSOR,
-};
-
-// Used for notification on emulation state
-enum EMUSTATE_CHANGE
-{
-	EMUSTATE_CHANGE_PLAY = 1,
-	EMUSTATE_CHANGE_PAUSE,
-	EMUSTATE_CHANGE_STOP
-};
-
-#endif // _COMMON_H_
diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
deleted file mode 100644
index 7f62684efb..0000000000
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COMMONFUNCS_H_
-#define _COMMONFUNCS_H_
-
-#ifdef _WIN32
-#define SLEEP(x) Sleep(x)
-#else
-#include <unistd.h>
-#define SLEEP(x) usleep(x*1000)
-#endif
-
-#include <cstddef>
-#include <type_traits>
-
-// Will fail to compile on a non-array:
-// TODO: make this a function when constexpr is available
-template <typename T>
-struct ArraySizeImpl : public std::extent<T>
-{ static_assert(std::is_array<T>::value, "is array"); };
-
-#define ArraySize(x) ArraySizeImpl<decltype(x)>::value
-
-#define b2(x)   (   (x) | (   (x) >> 1) )
-#define b4(x)   ( b2(x) | ( b2(x) >> 2) )
-#define b8(x)   ( b4(x) | ( b4(x) >> 4) )
-#define b16(x)  ( b8(x) | ( b8(x) >> 8) )  
-#define b32(x)  (b16(x) | (b16(x) >>16) )
-#define ROUND_UP_POW2(x)	(b32(x - 1) + 1)
-
-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC
-#include <emmintrin.h>
-static __inline __m128i __attribute__((__always_inline__))
-_mm_shuffle_epi8(__m128i a, __m128i mask)
-{
-	__m128i result;
-	__asm__("pshufb %1, %0"
-		: "=x" (result)
-		: "xm" (mask), "0" (a));
-	return result;
-}
-#endif
-
-#ifndef _WIN32
-
-#include <errno.h>
-#ifdef __linux__
-#include <byteswap.h>
-#elif defined __FreeBSD__
-#include <sys/endian.h>
-#endif
-
-// go to debugger mode
-	#ifdef GEKKO
-		#define Crash()
-	#elif defined _M_GENERIC
-		#define Crash() { exit(1); }
-	#else
-		#define Crash() {asm ("int $3");}
-	#endif
-
-// GCC 4.8 defines all the rotate functions now
-// Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit
-#ifndef _rotl
-inline u32 _rotl(u32 x, int shift) {
-	shift &= 31;
-	if (!shift) return x;
-	return (x << shift) | (x >> (32 - shift));
-}
-
-inline u32 _rotr(u32 x, int shift) {
-	shift &= 31;
-	if (!shift) return x;
-	return (x >> shift) | (x << (32 - shift));
-}
-#endif
-
-inline u64 _rotl64(u64 x, unsigned int shift){
-	unsigned int n = shift % 64;
-	return (x << n) | (x >> (64 - n));
-}
-
-inline u64 _rotr64(u64 x, unsigned int shift){
-	unsigned int n = shift % 64;
-	return (x >> n) | (x << (64 - n));
-}
-
-#else // WIN32
-// Function Cross-Compatibility
-	#define strcasecmp _stricmp
-	#define strncasecmp _strnicmp
-	#define unlink _unlink
-	#define snprintf _snprintf
-	#define vscprintf _vscprintf
-	
-// Locale Cross-Compatibility
-	#define locale_t _locale_t
-	#define freelocale _free_locale
-	#define newlocale(mask, locale, base) _create_locale(mask, locale)
-	
-	#define LC_GLOBAL_LOCALE	((locale_t)-1)
-	#define LC_ALL_MASK			LC_ALL
-	#define LC_COLLATE_MASK		LC_COLLATE
-	#define LC_CTYPE_MASK		LC_CTYPE
-	#define LC_MONETARY_MASK	LC_MONETARY
-	#define LC_NUMERIC_MASK		LC_NUMERIC
-	#define LC_TIME_MASK		LC_TIME
-	
-	inline locale_t uselocale(locale_t new_locale)
-	{
-		// Retrieve the current per thread locale setting
-		bool bIsPerThread = (_configthreadlocale(0) == _ENABLE_PER_THREAD_LOCALE);
-
-		// Retrieve the current thread-specific locale
-		locale_t old_locale = bIsPerThread ? _get_current_locale() : LC_GLOBAL_LOCALE;
-
-		if(new_locale == LC_GLOBAL_LOCALE)
-		{
-			// Restore the global locale
-			_configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
-		}
-		else if(new_locale != NULL)
-		{
-			// Configure the thread to set the locale only for this thread
-			_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
-
-			// Set all locale categories
-			for(int i = LC_MIN; i <= LC_MAX; i++)
-				setlocale(i, new_locale->locinfo->lc_category[i].locale);
-		}
-
-		return old_locale;
-	}
-
-// 64 bit offsets for windows
-	#define fseeko _fseeki64
-	#define ftello _ftelli64
-	#define atoll _atoi64
-	#define stat64 _stat64
-	#define fstat64 _fstat64
-	#define fileno _fileno
-
-	#if _M_IX86
-		#define Crash() {__asm int 3}
-	#else
-extern "C" {
-	__declspec(dllimport) void __stdcall DebugBreak(void);
-}
-		#define Crash() {DebugBreak();}
-	#endif // M_IX86
-#endif // WIN32 ndef
-
-// Dolphin's min and max functions
-#undef min
-#undef max
-
-template<class T>
-inline T min(const T& a, const T& b) {return a > b ? b : a;}
-template<class T>
-inline T max(const T& a, const T& b) {return a > b ? a : b;}
-
-// Generic function to get last error message.
-// Call directly after the command or use the error num.
-// This function might change the error code.
-// Defined in Misc.cpp.
-const char* GetLastErrorMsg();
-
-namespace Common
-{
-inline u8 swap8(u8 _data) {return _data;}
-inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];}
-
-#ifdef ANDROID
-#undef swap16
-#undef swap32
-#undef swap64
-#endif
-
-#ifdef _WIN32
-inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
-inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
-inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
-#elif _M_ARM
-inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} 
-inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} 
-inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}
-#elif __linux__
-inline u16 swap16(u16 _data) {return bswap_16(_data);}
-inline u32 swap32(u32 _data) {return bswap_32(_data);}
-inline u64 swap64(u64 _data) {return bswap_64(_data);}
-#elif __APPLE__
-inline __attribute__((always_inline)) u16 swap16(u16 _data)
-	{return (_data >> 8) | (_data << 8);}
-inline __attribute__((always_inline)) u32 swap32(u32 _data)
-	{return __builtin_bswap32(_data);}
-inline __attribute__((always_inline)) u64 swap64(u64 _data)
-	{return __builtin_bswap64(_data);}
-#elif __FreeBSD__
-inline u16 swap16(u16 _data) {return bswap16(_data);}
-inline u32 swap32(u32 _data) {return bswap32(_data);}
-inline u64 swap64(u64 _data) {return bswap64(_data);}
-#else
-// Slow generic implementation.
-inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);}
-inline u32 swap32(u32 data) {return (swap16(data) << 16) | swap16(data >> 16);}
-inline u64 swap64(u64 data) {return ((u64)swap32(data) << 32) | swap32(data >> 32);}
-#endif
-
-inline u16 swap16(const u8* _pData) {return swap16(*(const u16*)_pData);}
-inline u32 swap32(const u8* _pData) {return swap32(*(const u32*)_pData);}
-inline u64 swap64(const u8* _pData) {return swap64(*(const u64*)_pData);}
-
-template <int count>
-void swap(u8*);
-
-template <>
-inline void swap<1>(u8* data)
-{}
-
-template <>
-inline void swap<2>(u8* data)
-{
-	*reinterpret_cast<u16*>(data) = swap16(data);
-}
-
-template <>
-inline void swap<4>(u8* data)
-{
-	*reinterpret_cast<u32*>(data) = swap32(data);
-}
-
-template <>
-inline void swap<8>(u8* data)
-{
-	*reinterpret_cast<u64*>(data) = swap64(data);
-}
-
-template <typename T>
-inline T FromBigEndian(T data)
-{
-	//static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types");
-	
-	swap<sizeof(data)>(reinterpret_cast<u8*>(&data));
-	return data;
-}
-
-}  // Namespace Common
-
-#endif // _COMMONFUNCS_H_
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
deleted file mode 100644
index d171bcb0a7..0000000000
--- a/Source/Core/Common/Src/CommonPaths.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COMMON_PATHS_H_
-#define _COMMON_PATHS_H_
-
-// Make sure we pick up USER_DIR if set in config.h
-#include "Common.h"
-
-// Directory seperators, do we need this?
-#define DIR_SEP "/"
-#define DIR_SEP_CHR '/'
-
-// The user data dir
-#define ROOT_DIR "."
-#ifdef _WIN32
-	#define USERDATA_DIR "User"
-	#define DOLPHIN_DATA_DIR "Dolphin"
-#elif defined __APPLE__
-	// On OS X, USERDATA_DIR exists within the .app, but *always* reference
-	// the copy in Application Support instead! (Copied on first run)
-	// You can use the File::GetUserPath() util for this
-	#define USERDATA_DIR "Contents/Resources/User"
-	#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
-#elif defined ANDROID
-	#define USERDATA_DIR "user"
-	#define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
-#else
-	#define USERDATA_DIR "user"
-	#ifdef USER_DIR
-		#define DOLPHIN_DATA_DIR USER_DIR
-	#else
-		#define DOLPHIN_DATA_DIR ".dolphin"
-	#endif
-#endif
-
-// Shared data dirs (Sys and shared User for linux)
-#ifdef _WIN32
-	#define SYSDATA_DIR "Sys"
-#elif defined __APPLE__
-	#define SYSDATA_DIR "Contents/Resources/Sys"
-#elif defined ANDROID
-	#define SYSDATA_DIR "/sdcard/dolphin-emu"
-#else
-	#ifdef DATA_DIR
-		#define SYSDATA_DIR DATA_DIR "sys"
-	#else
-		#define SYSDATA_DIR "sys"
-	#endif
-#endif
-
-// Dirs in both User and Sys
-#define EUR_DIR "EUR"
-#define USA_DIR "USA"
-#define JAP_DIR "JAP"
-
-// Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
-#define GC_USER_DIR			"GC"
-#define WII_USER_DIR		"Wii"
-#define CONFIG_DIR			"Config"
-#define GAMESETTINGS_DIR	"GameSettings"
-#define MAPS_DIR			"Maps"
-#define CACHE_DIR			"Cache"
-#define SHADERCACHE_DIR		"ShaderCache"
-#define STATESAVES_DIR		"StateSaves"
-#define SCREENSHOTS_DIR		"ScreenShots"
-#define OPENCL_DIR			"OpenCL"
-#define LOAD_DIR 			"Load"
-#define HIRES_TEXTURES_DIR	LOAD_DIR DIR_SEP "Textures"
-#define DUMP_DIR			"Dump"
-#define DUMP_TEXTURES_DIR	"Textures"
-#define DUMP_FRAMES_DIR		"Frames"
-#define DUMP_AUDIO_DIR		"Audio"
-#define DUMP_DSP_DIR		"DSP"
-#define LOGS_DIR			"Logs"
-#define MAIL_LOGS_DIR		"Mail"
-#define SHADERS_DIR 		"Shaders"
-#define WII_SYSCONF_DIR		"shared2" DIR_SEP "sys"
-#define WII_WC24CONF_DIR	"shared2" DIR_SEP "wc24"
-#define THEMES_DIR			"Themes"
-
-// Filenames
-// Files in the directory returned by GetUserPath(D_CONFIG_IDX)
-#define DOLPHIN_CONFIG	"Dolphin.ini"
-#define DEBUGGER_CONFIG	"Debugger.ini"
-#define LOGGER_CONFIG	"Logger.ini"
-
-// Files in the directory returned by GetUserPath(D_LOGS_IDX)
-#define MAIN_LOG	"dolphin.log"
-
-// Files in the directory returned by GetUserPath(D_WIISYSCONF_IDX)
-#define WII_SYSCONF	"SYSCONF"
-
-// Files in the directory returned by GetUserPath(D_DUMP_IDX)
-#define RAM_DUMP	"ram.raw"
-#define ARAM_DUMP	"aram.raw"
-#define FAKEVMEM_DUMP	"fakevmem.raw"
-
-// Sys files
-#define TOTALDB		"totaldb.dsy"
-
-#define FONT_ANSI	"font_ansi.bin"
-#define FONT_SJIS	"font_sjis.bin"
-
-#define DSP_IROM	"dsp_rom.bin"
-#define DSP_COEF	"dsp_coef.bin"
-
-#define GC_IPL		"IPL.bin"
-#define GC_SRAM		"SRAM.raw"
-#define GC_MEMCARDA	"MemoryCardA"
-#define GC_MEMCARDB	"MemoryCardB"
-
-#define WII_STATE	"state.dat"
-
-#define WII_SETTING		"setting.txt"
-
-#define GECKO_CODE_HANDLER "codehandler.bin"
-
-// Subdirs in Sys
-#define GC_SYS_DIR "GC"
-#define WII_SYS_DIR "Wii"
-
-#endif // _COMMON_PATHS_H_
diff --git a/Source/Core/Common/Src/CommonTypes.h b/Source/Core/Common/Src/CommonTypes.h
deleted file mode 100644
index 600d5b7b72..0000000000
--- a/Source/Core/Common/Src/CommonTypes.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// This header contains type definitions that are shared between the Dolphin core and
-// other parts of the code. Any definitions that are only used by the core should be
-// placed in "Common.h" instead.
-
-#ifndef _COMMONTYPES_H_
-#define _COMMONTYPES_H_
-
-#ifdef _WIN32
-
-#include <tchar.h>
-
-typedef unsigned __int8 u8;
-typedef unsigned __int16 u16;
-typedef unsigned __int32 u32;
-typedef unsigned __int64 u64;
-
-typedef signed __int8 s8;
-typedef signed __int16 s16;
-typedef signed __int32 s32;
-typedef signed __int64 s64;
-
-#else
-
-#ifndef GEKKO
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long long u64;
-
-typedef signed char s8;
-typedef signed short s16;
-typedef signed int s32;
-typedef signed long long s64;
-
-#endif
-// For using windows lock code
-#define TCHAR char
-#define LONG int
-
-#endif // _WIN32
-
-#endif // _COMMONTYPES_H_
diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp
deleted file mode 100644
index 9a924d4beb..0000000000
--- a/Source/Core/Common/Src/ConsoleListener.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>  // min
-#include <string> // System: To be able to add strings with "+"
-#include <stdio.h>
-#include <math.h>
-#ifdef _WIN32
-#include <windows.h>
-#include <array>
-#else
-#include <stdarg.h>
-#endif
-
-#include "Common.h"
-#include "LogManager.h" // Common
-#include "ConsoleListener.h" // Common
-
-ConsoleListener::ConsoleListener()
-{
-#ifdef _WIN32
-	hConsole = NULL;
-	bUseColor = true;
-#else
-	bUseColor = isatty(fileno(stdout));
-#endif
-}
-
-ConsoleListener::~ConsoleListener()
-{
-	Close();
-}
-
-// 100, 100, "Dolphin Log Console"
-// Open console window - width and height is the size of console window
-// Name is the window title
-void ConsoleListener::Open(bool Hidden, int Width, int Height, const char *Title)
-{
-#ifdef _WIN32
-	if (!GetConsoleWindow())
-	{
-		// Open the console window and create the window handle for GetStdHandle()
-		AllocConsole();
-		// Hide
-		if (Hidden) ShowWindow(GetConsoleWindow(), SW_HIDE);
-		// Save the window handle that AllocConsole() created
-		hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-		// Set the console window title
-		SetConsoleTitle(UTF8ToTStr(Title).c_str());
-		// Set letter space
-		LetterSpace(80, 4000);
-		//MoveWindow(GetConsoleWindow(), 200,200, 800,800, true);
-	}
-	else
-	{
-		hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	}
-#endif
-}
-
-void ConsoleListener::UpdateHandle()
-{
-#ifdef _WIN32
-	hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-#endif
-}
-
-// Close the console window and close the eventual file handle
-void ConsoleListener::Close()
-{
-#ifdef _WIN32
-	if (hConsole == NULL)
-		return;
-	FreeConsole();
-	hConsole = NULL;
-#else
-	fflush(NULL);
-#endif
-}
-
-bool ConsoleListener::IsOpen()
-{
-#ifdef _WIN32
-	return (hConsole != NULL);
-#else
-	return true;
-#endif
-}
-
-/*
-  LetterSpace: SetConsoleScreenBufferSize and SetConsoleWindowInfo are
-	dependent on each other, that's the reason for the additional checks.  
-*/
-void ConsoleListener::BufferWidthHeight(int BufferWidth, int BufferHeight, int ScreenWidth, int ScreenHeight, bool BufferFirst)
-{
-#ifdef _WIN32
-	BOOL SB, SW;
-	if (BufferFirst)
-	{
-		// Change screen buffer size
-		COORD Co = {BufferWidth, BufferHeight};
-		SB = SetConsoleScreenBufferSize(hConsole, Co);
-		// Change the screen buffer window size
-		SMALL_RECT coo = {0,0,ScreenWidth, ScreenHeight}; // top, left, right, bottom
-		SW = SetConsoleWindowInfo(hConsole, TRUE, &coo);
-	}
-	else
-	{
-		// Change the screen buffer window size
-		SMALL_RECT coo = {0,0, ScreenWidth, ScreenHeight}; // top, left, right, bottom
-		SW = SetConsoleWindowInfo(hConsole, TRUE, &coo);
-		// Change screen buffer size
-		COORD Co = {BufferWidth, BufferHeight};
-		SB = SetConsoleScreenBufferSize(hConsole, Co);
-	}
-#endif
-}
-void ConsoleListener::LetterSpace(int Width, int Height)
-{
-#ifdef _WIN32
-	// Get console info
-	CONSOLE_SCREEN_BUFFER_INFO ConInfo;
-	GetConsoleScreenBufferInfo(hConsole, &ConInfo);
-
-	//
-	int OldBufferWidth = ConInfo.dwSize.X;
-	int OldBufferHeight = ConInfo.dwSize.Y;
-	int OldScreenWidth = (ConInfo.srWindow.Right - ConInfo.srWindow.Left);
-	int OldScreenHeight = (ConInfo.srWindow.Bottom - ConInfo.srWindow.Top);
-	//
-	int NewBufferWidth = Width;
-	int NewBufferHeight = Height;
-	int NewScreenWidth = NewBufferWidth - 1;
-	int NewScreenHeight = OldScreenHeight;
-
-	// Width
-	BufferWidthHeight(NewBufferWidth, OldBufferHeight, NewScreenWidth, OldScreenHeight, (NewBufferWidth > OldScreenWidth-1));
-	// Height
-	BufferWidthHeight(NewBufferWidth, NewBufferHeight, NewScreenWidth, NewScreenHeight, (NewBufferHeight > OldScreenHeight-1));
-
-	// Resize the window too
-	//MoveWindow(GetConsoleWindow(), 200,200, (Width*8 + 50),(NewScreenHeight*12 + 200), true);
-#endif
-}
-#ifdef _WIN32
-COORD ConsoleListener::GetCoordinates(int BytesRead, int BufferWidth)
-{
-	COORD Ret = {0, 0};
-	// Full rows
-	int Step = (int)floor((float)BytesRead / (float)BufferWidth);
-	Ret.Y += Step;
-	// Partial row
-	Ret.X = BytesRead - (BufferWidth * Step);
-	return Ret;
-}
-#endif
-void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool Resize)
-{
-#ifdef _WIN32
-	// Check size
-	if (Width < 8 || Height < 12) return;
-
-	bool DBef = true;
-	bool DAft = true;
-	std::string SLog = "";
-
-	const HWND hWnd = GetConsoleWindow();
-	const HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-
-	// Get console info
-	CONSOLE_SCREEN_BUFFER_INFO ConInfo;
-	GetConsoleScreenBufferInfo(hConsole, &ConInfo);
-	DWORD BufferSize = ConInfo.dwSize.X * ConInfo.dwSize.Y;
-
-	// ---------------------------------------------------------------------
-	//  Save the current text
-	// ------------------------
-	DWORD cCharsRead = 0;
-	COORD coordScreen = { 0, 0 };
-
-	static const int MAX_BYTES = 1024 * 16;
-
-	std::vector<std::array<TCHAR, MAX_BYTES>> Str;
-	std::vector<std::array<WORD, MAX_BYTES>> Attr;
-
-	// ReadConsoleOutputAttribute seems to have a limit at this level
-	static const int ReadBufferSize = MAX_BYTES - 32;
-
-	DWORD cAttrRead = ReadBufferSize;
-	DWORD BytesRead = 0;
-	while (BytesRead < BufferSize)
-	{
-		Str.resize(Str.size() + 1);
-		if (!ReadConsoleOutputCharacter(hConsole, Str.back().data(), ReadBufferSize, coordScreen, &cCharsRead))
-			SLog += StringFromFormat("WriteConsoleOutputCharacter error");
-
-		Attr.resize(Attr.size() + 1);
-		if (!ReadConsoleOutputAttribute(hConsole, Attr.back().data(), ReadBufferSize, coordScreen, &cAttrRead))
-			SLog += StringFromFormat("WriteConsoleOutputAttribute error");
-
-		// Break on error
-		if (cAttrRead == 0) break;
-		BytesRead += cAttrRead;
-		coordScreen = GetCoordinates(BytesRead, ConInfo.dwSize.X);
-	}
-	// Letter space
-	int LWidth = (int)(floor((float)Width / 8.0f) - 1.0f);
-	int LHeight = (int)(floor((float)Height / 12.0f) - 1.0f);
-	int LBufWidth = LWidth + 1;
-	int LBufHeight = (int)floor((float)BufferSize / (float)LBufWidth);
-	// Change screen buffer size
-	LetterSpace(LBufWidth, LBufHeight);
-
-
-	ClearScreen(true);
-	coordScreen.Y = 0;
-	coordScreen.X = 0;
-	DWORD cCharsWritten = 0;
-
-	int BytesWritten = 0;
-	DWORD cAttrWritten = 0;
-	for (size_t i = 0; i < Attr.size(); i++)
-	{
-		if (!WriteConsoleOutputCharacter(hConsole, Str[i].data(), ReadBufferSize, coordScreen, &cCharsWritten))
-			SLog += StringFromFormat("WriteConsoleOutputCharacter error");
-		if (!WriteConsoleOutputAttribute(hConsole, Attr[i].data(), ReadBufferSize, coordScreen, &cAttrWritten))
-			SLog += StringFromFormat("WriteConsoleOutputAttribute error");
-
-		BytesWritten += cAttrWritten;
-		coordScreen = GetCoordinates(BytesWritten, LBufWidth);
-	}	
-
-	const int OldCursor = ConInfo.dwCursorPosition.Y * ConInfo.dwSize.X + ConInfo.dwCursorPosition.X;
-	COORD Coo = GetCoordinates(OldCursor, LBufWidth);
-	SetConsoleCursorPosition(hConsole, Coo);
-
-	if (SLog.length() > 0) Log(LogTypes::LNOTICE, SLog.c_str());
-
-	// Resize the window too
-	if (Resize) MoveWindow(GetConsoleWindow(), Left,Top, (Width + 100),Height, true);
-#endif
-}
-
-void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text)
-{
-#if defined(_WIN32)
-	/*
-	const int MAX_BYTES = 1024*10;
-	char Str[MAX_BYTES];
-	va_list ArgPtr;
-	int Cnt;
-	va_start(ArgPtr, Text);
-	Cnt = vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
-	va_end(ArgPtr);
-	*/
-	DWORD cCharsWritten;
-	WORD Color;
-
-	switch (Level)
-	{
-	case NOTICE_LEVEL: // light green
-		Color = FOREGROUND_GREEN | FOREGROUND_INTENSITY;
-		break;
-	case ERROR_LEVEL: // light red
-		Color = FOREGROUND_RED | FOREGROUND_INTENSITY;
-		break;
-	case WARNING_LEVEL: // light yellow
-		Color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
-		break;
-	case INFO_LEVEL: // cyan
-		Color = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY;
-		break;
-	case DEBUG_LEVEL: // gray
-		Color = FOREGROUND_INTENSITY;
-		break;
-	default: // off-white
-		Color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
-		break;
-	}
-	if (strlen(Text) > 10)
-	{
-		// First 10 chars white
-		SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY);
-		WriteConsole(hConsole, Text, 10, &cCharsWritten, NULL);
-		Text += 10;
-	}
-	SetConsoleTextAttribute(hConsole, Color);
-	WriteConsole(hConsole, Text, (DWORD)strlen(Text), &cCharsWritten, NULL);
-#else
-	char ColorAttr[16] = "";
-	char ResetAttr[16] = "";
-
-	if (bUseColor)
-	{
-		strcpy(ResetAttr, "\033[0m");
-		switch (Level)
-		{
-		case NOTICE_LEVEL: // light green
-			strcpy(ColorAttr, "\033[92m");
-			break;
-		case ERROR_LEVEL: // light red
-			strcpy(ColorAttr, "\033[91m");
-			break;
-		case WARNING_LEVEL: // light yellow
-			strcpy(ColorAttr, "\033[93m");
-			break;
-		default:
-			break;
-		}
-	}
-	fprintf(stderr, "%s%s%s", ColorAttr, Text, ResetAttr);
-#endif
-}
-// Clear console screen
-void ConsoleListener::ClearScreen(bool Cursor)
-{ 
-#if defined(_WIN32)
-	COORD coordScreen = { 0, 0 }; 
-	DWORD cCharsWritten; 
-	CONSOLE_SCREEN_BUFFER_INFO csbi; 
-	DWORD dwConSize; 
-
-	HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); 
-
-	GetConsoleScreenBufferInfo(hConsole, &csbi); 
-	dwConSize = csbi.dwSize.X * csbi.dwSize.Y;
-	// Write space to the entire console
-	FillConsoleOutputCharacter(hConsole, TEXT(' '), dwConSize, coordScreen, &cCharsWritten); 
-	GetConsoleScreenBufferInfo(hConsole, &csbi); 
-	FillConsoleOutputAttribute(hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten);
-	// Reset cursor
-	if (Cursor) SetConsoleCursorPosition(hConsole, coordScreen); 
-#endif
-}
-
-
diff --git a/Source/Core/Common/Src/ConsoleListener.h b/Source/Core/Common/Src/ConsoleListener.h
deleted file mode 100644
index 84c379eb54..0000000000
--- a/Source/Core/Common/Src/ConsoleListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONSOLELISTENER_H
-#define _CONSOLELISTENER_H
-
-#include "LogManager.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-class ConsoleListener : public LogListener
-{
-public:
-	ConsoleListener();
-	~ConsoleListener();
-
-	void Open(bool Hidden = false, int Width = 100, int Height = 100, const char * Name = "Console");
-	void UpdateHandle();
-	void Close();
-	bool IsOpen();
-	void LetterSpace(int Width, int Height);
-	void BufferWidthHeight(int BufferWidth, int BufferHeight, int ScreenWidth, int ScreenHeight, bool BufferFirst);
-	void PixelSpace(int Left, int Top, int Width, int Height, bool);
-#ifdef _WIN32
-	COORD GetCoordinates(int BytesRead, int BufferWidth);
-#endif
-	void Log(LogTypes::LOG_LEVELS, const char *Text);
-	void ClearScreen(bool Cursor = true);
-
-private:
-#ifdef _WIN32
-	HWND GetHwnd(void);
-	HANDLE hConsole;
-#endif
-	bool bUseColor;
-};
-
-#endif  // _CONSOLELISTENER_H
diff --git a/Source/Core/Common/Src/Crypto/aes.h b/Source/Core/Common/Src/Crypto/aes.h
deleted file mode 100644
index 8d5059e1be..0000000000
--- a/Source/Core/Common/Src/Crypto/aes.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_H
-#define HEADER_AES_H
-
-// #include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
-
-#define AES_ENCRYPT 1
-#define AES_DECRYPT 0
-
-/* Because array size can't be a const in C, the following two are macros.
-   Both sizes are in bytes. */
-#define AES_MAXNR 14
-#define AES_BLOCK_SIZE 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st
-{
-#ifdef AES_LONG
-	unsigned long rd_key[4 * (AES_MAXNR + 1)];
-#else
-	unsigned int rd_key[4 * (AES_MAXNR + 1)];
-#endif
-	int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-const char* AES_options(void);
-
-int AES_set_encrypt_key(const unsigned char* userKey, const int bits,
-		AES_KEY* key);
-int AES_set_decrypt_key(const unsigned char* userKey, const int bits,
-		AES_KEY* key);
-
-void AES_encrypt(const unsigned char* in, unsigned char* out,
-		const AES_KEY* key);
-void AES_decrypt(const unsigned char* in, unsigned char* out,
-		const AES_KEY* key);
-
-void AES_ecb_encrypt(const unsigned char* in, unsigned char* out,
-		const AES_KEY* key, const int enc);
-void AES_cbc_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, const int enc);
-void AES_cfb128_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, int* num, const int enc);
-void AES_cfb1_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, int* num, const int enc);
-void AES_cfb8_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, int* num, const int enc);
-void AES_cfbr_encrypt_block(const unsigned char* in, unsigned char* out,
-		const int nbits, const AES_KEY* key,
-		unsigned char* ivec, const int enc);
-void AES_ofb128_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, int* num);
-
-
-void AES_ctr128_encrypt(const unsigned char* in, unsigned char* out,
-			const unsigned long length, const AES_KEY * key,
-			unsigned char ivec[AES_BLOCK_SIZE],
-			unsigned char ecount_buf[AES_BLOCK_SIZE],
-			unsigned int* num);
-
-/* For IGE, see also http://www.links.org/files/openssl-ige.pdf
-   NB: the IV is _two_ blocks long */
-void AES_ige_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		unsigned char* ivec, const int enc);
-
-
-/* NB: the IV is _four_ blocks long */
-void AES_bi_ige_encrypt(const unsigned char* in, unsigned char* out,
-		const unsigned long length, const AES_KEY* key,
-		const AES_KEY* key2, const unsigned char* ivec,
-		const int enc);
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* !HEADER_AES_H */
diff --git a/Source/Core/Common/Src/Crypto/aes_cbc.cpp b/Source/Core/Common/Src/Crypto/aes_cbc.cpp
deleted file mode 100644
index 780c35a88d..0000000000
--- a/Source/Core/Common/Src/Crypto/aes_cbc.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* crypto/aes/aes_cbc.c -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef AES_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
-#include "aes.h"
-#include "aes_locl.h"
-
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-		     const unsigned long length, const AES_KEY *key,
-		     unsigned char *ivec, const int enc) {
-
-	unsigned long n;
-	unsigned long len = length;
-	unsigned char tmp[AES_BLOCK_SIZE];
-	const unsigned char *iv = ivec;
-
-	assert(in && out && key && ivec);
-	assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
-
-	if (AES_ENCRYPT == enc) {
-		while (len >= AES_BLOCK_SIZE) {
-			for(n=0; n < AES_BLOCK_SIZE; ++n)
-				out[n] = in[n] ^ iv[n];
-			AES_encrypt(out, out, key);
-			iv = out;
-			len -= AES_BLOCK_SIZE;
-			in += AES_BLOCK_SIZE;
-			out += AES_BLOCK_SIZE;
-		}
-		if (len) {
-			for(n=0; n < len; ++n)
-				out[n] = in[n] ^ iv[n];
-			for(n=len; n < AES_BLOCK_SIZE; ++n)
-				out[n] = iv[n];
-			AES_encrypt(out, out, key);
-			iv = out;
-		}
-		memcpy(ivec,iv,AES_BLOCK_SIZE);
-	} else if (in != out) {
-		while (len >= AES_BLOCK_SIZE) {
-			AES_decrypt(in, out, key);
-			for(n=0; n < AES_BLOCK_SIZE; ++n)
-				out[n] ^= iv[n];
-			iv = in;
-			len -= AES_BLOCK_SIZE;
-			in  += AES_BLOCK_SIZE;
-			out += AES_BLOCK_SIZE;
-		}
-		if (len) {
-			AES_decrypt(in,tmp,key);
-			for(n=0; n < len; ++n)
-				out[n] = tmp[n] ^ iv[n];
-			iv = in;
-		}
-		memcpy(ivec,iv,AES_BLOCK_SIZE);
-	} else {
-		while (len >= AES_BLOCK_SIZE) {
-			memcpy(tmp, in, AES_BLOCK_SIZE);
-			AES_decrypt(in, out, key);
-			for(n=0; n < AES_BLOCK_SIZE; ++n)
-				out[n] ^= ivec[n];
-			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-			len -= AES_BLOCK_SIZE;
-			in += AES_BLOCK_SIZE;
-			out += AES_BLOCK_SIZE;
-		}
-		if (len) {
-			memcpy(tmp, in, AES_BLOCK_SIZE);
-			AES_decrypt(tmp, out, key);
-			for(n=0; n < len; ++n)
-				out[n] ^= ivec[n];
-			for(n=len; n < AES_BLOCK_SIZE; ++n)
-				out[n] = tmp[n];
-			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-		}
-	}
-}
diff --git a/Source/Core/Common/Src/Crypto/aes_core.cpp b/Source/Core/Common/Src/Crypto/aes_core.cpp
deleted file mode 100644
index ad54bc6006..0000000000
--- a/Source/Core/Common/Src/Crypto/aes_core.cpp
+++ /dev/null
@@ -1,1159 +0,0 @@
-/* crypto/aes/aes_core.c -*- mode:C; c-file-style: "eay" -*- */
-/**
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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.
- */
-
-/* Note: rewritten a little bit to provide error control and an OpenSSL-
-   compatible API */
-
-#ifndef AES_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
-#include <stdlib.h>
-#include "aes.h"
-#include "aes_locl.h"
-
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01];
-*/
-
-static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-static const u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-
-static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
-};
-static const u32 rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key) {
-
-	u32 *rk;
-   	int i = 0;
-	u32 temp;
-
-	if (!userKey || !key)
-		return -1;
-	if (bits != 128 && bits != 192 && bits != 256)
-		return -2;
-
-	rk = key->rd_key;
-
-	if (bits==128)
-		key->rounds = 10;
-	else if (bits==192)
-		key->rounds = 12;
-	else
-		key->rounds = 14;
-
-	rk[0] = GETU32(userKey     );
-	rk[1] = GETU32(userKey +  4);
-	rk[2] = GETU32(userKey +  8);
-	rk[3] = GETU32(userKey + 12);
-	if (bits == 128) {
-		for (;;) {
-			temp  = rk[3];
-			rk[4] = rk[0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[5] = rk[1] ^ rk[4];
-			rk[6] = rk[2] ^ rk[5];
-			rk[7] = rk[3] ^ rk[6];
-			if (++i == 10) {
-				return 0;
-			}
-			rk += 4;
-		}
-	}
-	rk[4] = GETU32(userKey + 16);
-	rk[5] = GETU32(userKey + 20);
-	if (bits == 192) {
-		for (;;) {
-			temp = rk[ 5];
-			rk[ 6] = rk[ 0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 7] = rk[ 1] ^ rk[ 6];
-			rk[ 8] = rk[ 2] ^ rk[ 7];
-			rk[ 9] = rk[ 3] ^ rk[ 8];
-			if (++i == 8) {
-				return 0;
-			}
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-			rk += 6;
-		}
-	}
-	rk[6] = GETU32(userKey + 24);
-	rk[7] = GETU32(userKey + 28);
-	if (bits == 256) {
-		for (;;) {
-			temp = rk[ 7];
-			rk[ 8] = rk[ 0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 9] = rk[ 1] ^ rk[ 8];
-			rk[10] = rk[ 2] ^ rk[ 9];
-			rk[11] = rk[ 3] ^ rk[10];
-			if (++i == 7) {
-				return 0;
-			}
-			temp = rk[11];
-			rk[12] = rk[ 4] ^
-				(Te2[(temp >> 24)       ] & 0xff000000) ^
-				(Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp      ) & 0xff] & 0x000000ff);
-			rk[13] = rk[ 5] ^ rk[12];
-			rk[14] = rk[ 6] ^ rk[13];
-			rk[15] = rk[ 7] ^ rk[14];
-
-			rk += 8;
-        	}
-	}
-	return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-			 AES_KEY *key) {
-
-        u32 *rk;
-	int i, j, status;
-	u32 temp;
-
-	/* first, start with an encryption schedule */
-	status = AES_set_encrypt_key(userKey, bits, key);
-	if (status < 0)
-		return status;
-
-	rk = key->rd_key;
-
-	/* invert the order of the round keys: */
-	for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-	}
-	/* apply the inverse MixColumn transform to all round keys but the first and the last: */
-	for (i = 1; i < (key->rounds); i++) {
-		rk += 4;
-		rk[0] =
-			Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
-		rk[1] =
-			Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
-		rk[2] =
-			Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
-		rk[3] =
-			Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
-	}
-	return 0;
-}
-
-#ifndef AES_ASM
-/*
- * Encrypt a single block
- * in and out can overlap
- */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(in     ) ^ rk[0];
-	s1 = GETU32(in +  4) ^ rk[1];
-	s2 = GETU32(in +  8) ^ rk[2];
-	s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-	/* round 1: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-   	/* round 2: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
-	/* round 3: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-   	/* round 4: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
-	/* round 5: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-   	/* round 6: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
-	/* round 7: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-   	/* round 8: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
-	/* round 9: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-	s0 =
-		(Te2[(t0 >> 24)       ] & 0xff000000) ^
-		(Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t3      ) & 0xff] & 0x000000ff) ^
-		rk[0];
-	PUTU32(out     , s0);
-	s1 =
-		(Te2[(t1 >> 24)       ] & 0xff000000) ^
-		(Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t0      ) & 0xff] & 0x000000ff) ^
-		rk[1];
-	PUTU32(out +  4, s1);
-	s2 =
-		(Te2[(t2 >> 24)       ] & 0xff000000) ^
-		(Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t1      ) & 0xff] & 0x000000ff) ^
-		rk[2];
-	PUTU32(out +  8, s2);
-	s3 =
-		(Te2[(t3 >> 24)       ] & 0xff000000) ^
-		(Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t2      ) & 0xff] & 0x000000ff) ^
-		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-/*
- * Decrypt a single block
- * in and out can overlap
- */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
-	rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-   	s0 =
-   		(Td4[(t0 >> 24)       ] << 24) ^
-   		(Td4[(t3 >> 16) & 0xff] << 16) ^
-   		(Td4[(t2 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t1      ) & 0xff])       ^
-   		rk[0];
-	PUTU32(out     , s0);
-   	s1 =
-   		(Td4[(t1 >> 24)       ] << 24) ^
-   		(Td4[(t0 >> 16) & 0xff] << 16) ^
-   		(Td4[(t3 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t2      ) & 0xff])       ^
-   		rk[1];
-	PUTU32(out +  4, s1);
-   	s2 =
-   		(Td4[(t2 >> 24)       ] << 24) ^
-   		(Td4[(t1 >> 16) & 0xff] << 16) ^
-   		(Td4[(t0 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t3      ) & 0xff])       ^
-   		rk[2];
-	PUTU32(out +  8, s2);
-   	s3 =
-   		(Td4[(t3 >> 24)       ] << 24) ^
-   		(Td4[(t2 >> 16) & 0xff] << 16) ^
-   		(Td4[(t1 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t0      ) & 0xff])       ^
-   		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-#endif /* AES_ASM */
diff --git a/Source/Core/Common/Src/Crypto/aes_locl.h b/Source/Core/Common/Src/Crypto/aes_locl.h
deleted file mode 100644
index c222ed744b..0000000000
--- a/Source/Core/Common/Src/Crypto/aes_locl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_LOCL_H
-#define HEADER_AES_LOCL_H
-
-
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined (_MSC_VER) && (defined (_M_IX86) || defined (_M_AMD64) || defined (_M_X64))
-# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-# define GETU32(p) SWAP(*((u32*)(p)))
-# define PUTU32(ct, st) {*((u32*)(ct)) = SWAP((st));}
-#else
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) {(ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st);}
-#endif
-
-#ifdef AES_LONG
-typedef unsigned long u32;
-#else
-typedef unsigned int u32;
-#endif
-typedef unsigned short u16;
-typedef unsigned char u8;
-
-#define MAXKC   (256 / 32)
-#define MAXKB   (256 / 8)
-#define MAXNR   14
-
-/* This controls loop-unrolling in aes_core.c */
-#undef FULL_UNROLL
-
-#endif /* !HEADER_AES_LOCL_H */
diff --git a/Source/Core/Common/Src/Crypto/bn.cpp b/Source/Core/Common/Src/Crypto/bn.cpp
deleted file mode 100644
index a0676df731..0000000000
--- a/Source/Core/Common/Src/Crypto/bn.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
-// Licensed under the terms of the GNU GPL, version 2
-// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
-#include <string.h>
-#include <stdio.h>
-#include "../Common.h"
-#include "tools.h"
-
-/*static void bn_print(char *name, u8 *a, u32 n)
-{
-	u32 i;
-
-	printf("%s = ", name);
-
-	for (i = 0; i < n; i++)
-		printf("%02x", a[i]);
-
-	printf("\n");
-}*/
-
-static void bn_zero(u8 *d, u32 n)
-{
-	memset(d, 0, n);
-}
-
-static void bn_copy(u8 *d, u8 *a, u32 n)
-{
-	memcpy(d, a, n);
-}
-
-int bn_compare(u8 *a, u8 *b, u32 n)
-{
-	u32 i;
-
-	for (i = 0; i < n; i++) {
-		if (a[i] < b[i])
-			return -1;
-		if (a[i] > b[i])
-			return 1;
-	}
-
-	return 0;
-}
-
-void bn_sub_modulus(u8 *a, u8 *N, u32 n)
-{
-	u32 i;
-	u32 dig;
-	u8 c;
-
-	c = 0;
-	for (i = n - 1; i < n; i--) {
-		dig = N[i] + c;
-		c = (a[i] < dig);
-		a[i] -= dig;
-	}
-}
-
-void bn_add(u8 *d, u8 *a, u8 *b, u8 *N, u32 n)
-{
-	u32 i;
-	u32 dig;
-	u8 c;
-
-	c = 0;
-	for (i = n - 1; i < n; i--) {
-		dig = a[i] + b[i] + c;
-		c = (dig >= 0x100);
-		d[i] = dig;
-	}
-
-	if (c)
-		bn_sub_modulus(d, N, n);
-
-	if (bn_compare(d, N, n) >= 0)
-		bn_sub_modulus(d, N, n);
-}
-
-void bn_mul(u8 *d, u8 *a, u8 *b, u8 *N, u32 n)
-{
-	u32 i;
-	u8 mask;
-
-	bn_zero(d, n);
-
-	for (i = 0; i < n; i++)
-		for (mask = 0x80; mask != 0; mask >>= 1) {
-			bn_add(d, d, d, N, n);
-			if ((a[i] & mask) != 0)
-				bn_add(d, d, b, N, n);
-		}
-}
-
-void bn_exp(u8 *d, u8 *a, u8 *N, u32 n, u8 *e, u32 en)
-{
-	u8 t[512];
-	u32 i;
-	u8 mask;
-
-	bn_zero(d, n);
-	d[n-1] = 1;
-	for (i = 0; i < en; i++)
-		for (mask = 0x80; mask != 0; mask >>= 1) {
-			bn_mul(t, d, d, N, n);
-			if ((e[i] & mask) != 0)
-				bn_mul(d, t, a, N, n);
-			else
-				bn_copy(d, t, n);
-		}
-}
-
-// only for prime N -- stupid but lazy, see if I care
-void bn_inv(u8 *d, u8 *a, u8 *N, u32 n)
-{
-	u8 t[512], s[512];
-
-	bn_copy(t, N, n);
-	bn_zero(s, n);
-	s[n-1] = 2;
-	bn_sub_modulus(t, s, n);
-	bn_exp(d, a, N, n, t, n);
-}
diff --git a/Source/Core/Common/Src/Crypto/tools.h b/Source/Core/Common/Src/Crypto/tools.h
deleted file mode 100644
index d97995c093..0000000000
--- a/Source/Core/Common/Src/Crypto/tools.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
-// Licensed under the terms of the GNU GPL, version 2
-// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
-#ifndef _TOOLS_H
-#define _TOOLS_H
-#include <polarssl/sha1.h>
-
-// bignum
-int bn_compare(u8 *a, u8 *b, u32 n);
-void bn_sub_modulus(u8 *a, u8 *N, u32 n);
-void bn_add(u8 *d, u8 *a, u8 *b, u8 *N, u32 n);
-void bn_mul(u8 *d, u8 *a, u8 *b, u8 *N, u32 n);
-void bn_inv(u8 *d, u8 *a, u8 *N, u32 n);	// only for prime N
-void bn_exp(u8 *d, u8 *a, u8 *N, u32 n, u8 *e, u32 en);
-void point_mul(u8 *d, const u8 *a, u8 *b);
-
-void generate_ecdsa(u8 *R, u8 *S, const u8 *k, u8 *hash);
-
-void ec_priv_to_pub(const u8 *k, u8 *Q);
-
-#endif
diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h
deleted file mode 100644
index 317cd0bb43..0000000000
--- a/Source/Core/Common/Src/DebugInterface.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _DEBUGINTERFACE_H
-#define _DEBUGINTERFACE_H
-
-#include <string>
-#include <string.h>
-
-class DebugInterface
-{
-protected:
-	virtual ~DebugInterface() {}
-
-public:
-	virtual void disasm(unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
-	virtual void getRawMemoryString(int /*memory*/, unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
-	virtual int getInstructionSize(int /*instruction*/) {return 1;}
-	virtual bool isAlive() {return true;}
-	virtual bool isBreakpoint(unsigned int /*address*/) {return false;}
-	virtual void setBreakpoint(unsigned int /*address*/){}
-	virtual void clearBreakpoint(unsigned int /*address*/){}
-	virtual void clearAllBreakpoints() {}
-	virtual void toggleBreakpoint(unsigned int /*address*/){}
-	virtual bool isMemCheck(unsigned int /*address*/) {return false;}
-	virtual void toggleMemCheck(unsigned int /*address*/){}
-	virtual unsigned int readMemory(unsigned int /*address*/){return 0;}
-	virtual void writeExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {}
-	virtual unsigned int readExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;}
-	virtual unsigned int readInstruction(unsigned int /*address*/){return 0;}
-	virtual unsigned int getPC() {return 0;}
-	virtual void setPC(unsigned int /*address*/) {}
-	virtual void step() {}
-	virtual void runToBreakpoint() {}
-	virtual void breakNow() {}
-	virtual void insertBLR(unsigned int /*address*/, unsigned int /*value*/) {}
-	virtual void showJitResults(unsigned int /*address*/) {};
-	virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;}
-	virtual std::string getDescription(unsigned int /*address*/) = 0;
-};
-
-#endif
diff --git a/Source/Core/Common/Src/ExtendedTrace.cpp b/Source/Core/Common/Src/ExtendedTrace.cpp
deleted file mode 100644
index 08740c3c95..0000000000
--- a/Source/Core/Common/Src/ExtendedTrace.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-// --------------------------------------------------------------------------------------
-//
-// Written by Zoltan Csizmadia, zoltan_csizmadia@yahoo.com
-// For companies(Austin,TX): If you would like to get my resume, send an email.
-//
-// The source is free, but if you want to use it, mention my name and e-mail address
-//
-// History:
-//    1.0      Initial version                  Zoltan Csizmadia
-//    1.1      WhineCube version                Masken
-//    1.2      Dolphin version                  Masken
-//
-// --------------------------------------------------------------------------------------
-
-#if defined(WIN32)
-
-#include <windows.h>
-#include <stdio.h>
-#include "ExtendedTrace.h"
-#include "StringUtil.h"
-using namespace std;
-
-#include <tchar.h>
-#include <ImageHlp.h>
-
-#define BUFFERSIZE   0x200
-#pragma warning(disable:4996)
-
-// Unicode safe char* -> TCHAR* conversion
-void PCSTR2LPTSTR( PCSTR lpszIn, LPTSTR lpszOut )
-{
-#if defined(UNICODE)||defined(_UNICODE)
-	ULONG index = 0; 
-	PCSTR lpAct = lpszIn;
-
-	for( ; ; lpAct++ )
-	{
-		lpszOut[index++] = (TCHAR)(*lpAct);
-		if ( *lpAct == 0 )
-			break;
-	} 
-#else
-	// This is trivial :)
-	strcpy( lpszOut, lpszIn );
-#endif
-}
-
-// Let's figure out the path for the symbol files
-// Search path= ".;%_NT_SYMBOL_PATH%;%_NT_ALTERNATE_SYMBOL_PATH%;%SYSTEMROOT%;%SYSTEMROOT%\System32;" + lpszIniPath
-// Note: There is no size check for lpszSymbolPath!
-static void InitSymbolPath( PSTR lpszSymbolPath, PCSTR lpszIniPath )
-{
-	CHAR lpszPath[BUFFERSIZE];
-
-	// Creating the default path
-	// ".;%_NT_SYMBOL_PATH%;%_NT_ALTERNATE_SYMBOL_PATH%;%SYSTEMROOT%;%SYSTEMROOT%\System32;"
-	strcpy( lpszSymbolPath, "." );
-
-	// environment variable _NT_SYMBOL_PATH
-	if ( GetEnvironmentVariableA( "_NT_SYMBOL_PATH", lpszPath, BUFFERSIZE ) )
-	{
-		strcat( lpszSymbolPath, ";" );
-		strcat( lpszSymbolPath, lpszPath );
-	}
-
-	// environment variable _NT_ALTERNATE_SYMBOL_PATH
-	if ( GetEnvironmentVariableA( "_NT_ALTERNATE_SYMBOL_PATH", lpszPath, BUFFERSIZE ) )
-	{
-		strcat( lpszSymbolPath, ";" );
-		strcat( lpszSymbolPath, lpszPath );
-	}
-
-	// environment variable SYSTEMROOT
-	if ( GetEnvironmentVariableA( "SYSTEMROOT", lpszPath, BUFFERSIZE ) )
-	{
-		strcat( lpszSymbolPath, ";" );
-		strcat( lpszSymbolPath, lpszPath );
-		strcat( lpszSymbolPath, ";" );
-
-		// SYSTEMROOT\System32
-		strcat( lpszSymbolPath, lpszPath );
-		strcat( lpszSymbolPath, "\\System32" );
-	}
-
-	// Add user defined path
-	if ( lpszIniPath != NULL )
-		if ( lpszIniPath[0] != '\0' )
-		{
-			strcat( lpszSymbolPath, ";" );
-			strcat( lpszSymbolPath, lpszIniPath );
-		}
-}
-
-// Uninitialize the loaded symbol files
-BOOL UninitSymInfo() {
-	return SymCleanup( GetCurrentProcess() );
-}
-
-// Initializes the symbol files
-BOOL InitSymInfo( PCSTR lpszInitialSymbolPath )
-{
-	CHAR     lpszSymbolPath[BUFFERSIZE];
-	DWORD    symOptions = SymGetOptions();
-
-	symOptions |= SYMOPT_LOAD_LINES; 
-	symOptions &= ~SYMOPT_UNDNAME;
-	SymSetOptions( symOptions );
-	InitSymbolPath( lpszSymbolPath, lpszInitialSymbolPath );
-
-	return SymInitialize( GetCurrentProcess(), lpszSymbolPath, TRUE);
-}
-
-// Get the module name from a given address
-static BOOL GetModuleNameFromAddress( UINT address, LPTSTR lpszModule )
-{
-	BOOL              ret = FALSE;
-	IMAGEHLP_MODULE   moduleInfo;
-
-	::ZeroMemory( &moduleInfo, sizeof(moduleInfo) );
-	moduleInfo.SizeOfStruct = sizeof(moduleInfo);
-
-	if ( SymGetModuleInfo( GetCurrentProcess(), (DWORD)address, &moduleInfo ) )
-	{
-		// Got it!
-		PCSTR2LPTSTR( moduleInfo.ModuleName, lpszModule );
-		ret = TRUE;
-	}
-	else
-		// Not found :(
-		_tcscpy( lpszModule, _T("?") );
-
-	return ret;
-}
-
-// Get function prototype and parameter info from ip address and stack address
-static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, LPTSTR lpszSymbol )
-{
-	BOOL              ret = FALSE;
-	DWORD             dwSymSize = 10000;
-	TCHAR             lpszUnDSymbol[BUFFERSIZE]=_T("?");
-	CHAR              lpszNonUnicodeUnDSymbol[BUFFERSIZE]="?";
-	LPTSTR            lpszParamSep = NULL;
-	LPTSTR            lpszParsed = lpszUnDSymbol;
-	PIMAGEHLP_SYMBOL  pSym = (PIMAGEHLP_SYMBOL)GlobalAlloc( GMEM_FIXED, dwSymSize );
-
-	::ZeroMemory( pSym, dwSymSize );
-	pSym->SizeOfStruct = dwSymSize;
-	pSym->MaxNameLength = dwSymSize - sizeof(IMAGEHLP_SYMBOL);
-
-	// Set the default to unknown
-	_tcscpy( lpszSymbol, _T("?") );
-
-	// Get symbol info for IP
-#ifndef _M_X64
-	DWORD             dwDisp = 0;
-	if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) )
-#else 
-	//makes it compile but hell im not sure if this works...
-	DWORD64           dwDisp = 0;
-	if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, (PDWORD64)&dwDisp, pSym ) )
-#endif
-	{
-		// Make the symbol readable for humans
-		UnDecorateSymbolName( pSym->Name, lpszNonUnicodeUnDSymbol, BUFFERSIZE, 
-			UNDNAME_COMPLETE | 
-			UNDNAME_NO_THISTYPE |
-			UNDNAME_NO_SPECIAL_SYMS |
-			UNDNAME_NO_MEMBER_TYPE |
-			UNDNAME_NO_MS_KEYWORDS |
-			UNDNAME_NO_ACCESS_SPECIFIERS );
-
-		// Symbol information is ANSI string
-		PCSTR2LPTSTR( lpszNonUnicodeUnDSymbol, lpszUnDSymbol );
-
-		// I am just smarter than the symbol file :)
-		if ( _tcscmp(lpszUnDSymbol, _T("_WinMain@16")) == 0 )
-			_tcscpy(lpszUnDSymbol, _T("WinMain(HINSTANCE,HINSTANCE,LPCTSTR,int)"));
-		else
-			if ( _tcscmp(lpszUnDSymbol, _T("_main")) == 0 )
-				_tcscpy(lpszUnDSymbol, _T("main(int,TCHAR * *)"));
-			else
-				if ( _tcscmp(lpszUnDSymbol, _T("_mainCRTStartup")) == 0 )
-					_tcscpy(lpszUnDSymbol, _T("mainCRTStartup()"));
-				else
-					if ( _tcscmp(lpszUnDSymbol, _T("_wmain")) == 0 )
-						_tcscpy(lpszUnDSymbol, _T("wmain(int,TCHAR * *,TCHAR * *)"));
-					else
-						if ( _tcscmp(lpszUnDSymbol, _T("_wmainCRTStartup")) == 0 )
-							_tcscpy(lpszUnDSymbol, _T("wmainCRTStartup()"));
-
-		lpszSymbol[0] = _T('\0');
-
-		// Let's go through the stack, and modify the function prototype, and insert the actual
-		// parameter values from the stack
-		if ( _tcsstr( lpszUnDSymbol, _T("(void)") ) == NULL && _tcsstr( lpszUnDSymbol, _T("()") ) == NULL)
-		{
-			ULONG index = 0;
-			for( ; ; index++ )
-			{
-				lpszParamSep = _tcschr( lpszParsed, _T(',') );
-				if ( lpszParamSep == NULL )
-					break;
-
-				*lpszParamSep = _T('\0');
-
-				_tcscat( lpszSymbol, lpszParsed );
-				_stprintf( lpszSymbol + _tcslen(lpszSymbol), _T("=0x%08X,"), *((ULONG*)(stackAddress) + 2 + index) );
-
-				lpszParsed = lpszParamSep + 1;
-			}
-
-			lpszParamSep = _tcschr( lpszParsed, _T(')') );
-			if ( lpszParamSep != NULL )
-			{
-				*lpszParamSep = _T('\0');
-
-				_tcscat( lpszSymbol, lpszParsed );
-				_stprintf( lpszSymbol + _tcslen(lpszSymbol), _T("=0x%08X)"), *((ULONG*)(stackAddress) + 2 + index) );
-
-				lpszParsed = lpszParamSep + 1;
-			}
-		}
-
-		_tcscat( lpszSymbol, lpszParsed );
-
-		ret = TRUE;
-	} 
-	GlobalFree( pSym );
-
-	return ret;
-}
-
-// Get source file name and line number from IP address
-// The output format is: "sourcefile(linenumber)" or
-//                       "modulename!address" or
-//                       "address"
-static BOOL GetSourceInfoFromAddress( UINT address, LPTSTR lpszSourceInfo )
-{
-	BOOL           ret = FALSE;
-	IMAGEHLP_LINE  lineInfo;
-	DWORD          dwDisp;
-	TCHAR          lpszFileName[BUFFERSIZE] = _T("");
-	TCHAR          lpModuleInfo[BUFFERSIZE] = _T("");
-
-	_tcscpy( lpszSourceInfo, _T("?(?)") );
-
-	::ZeroMemory( &lineInfo, sizeof( lineInfo ) );
-	lineInfo.SizeOfStruct = sizeof( lineInfo );
-
-	if ( SymGetLineFromAddr( GetCurrentProcess(), address, &dwDisp, &lineInfo ) )
-	{
-		// Got it. Let's use "sourcefile(linenumber)" format
-		PCSTR2LPTSTR( lineInfo.FileName, lpszFileName );
-		TCHAR fname[_MAX_FNAME];
-		TCHAR ext[_MAX_EXT];
-		_tsplitpath(lpszFileName, NULL, NULL, fname, ext);
-		_stprintf( lpszSourceInfo, _T("%s%s(%d)"), fname, ext, lineInfo.LineNumber );
-		ret = TRUE;
-	}
-	else
-	{
-		// There is no source file information. :(
-		// Let's use the "modulename!address" format
-		GetModuleNameFromAddress( address, lpModuleInfo );
-
-		if ( lpModuleInfo[0] == _T('?') || lpModuleInfo[0] == _T('\0'))
-			// There is no modulename information. :((
-			// Let's use the "address" format
-			_stprintf( lpszSourceInfo, _T("0x%08X"), address );
-		else
-			_stprintf( lpszSourceInfo, _T("%s!0x%08X"), lpModuleInfo, address );
-
-		ret = FALSE;
-	}
-
-	return ret;
-}
-
-void PrintFunctionAndSourceInfo(FILE* file, const STACKFRAME& callstack)
-{
-	TCHAR symInfo[BUFFERSIZE] = _T("?");
-	TCHAR srcInfo[BUFFERSIZE] = _T("?");
-
-	GetFunctionInfoFromAddresses((ULONG)callstack.AddrPC.Offset, (ULONG)callstack.AddrFrame.Offset, symInfo);
-	GetSourceInfoFromAddress((ULONG)callstack.AddrPC.Offset, srcInfo);
-	etfprint(file, "     " + TStrToUTF8(srcInfo) + " : " + TStrToUTF8(symInfo) + "\n");
-}
-
-void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file )
-{
-	STACKFRAME     callStack;
-	BOOL           bResult;
-	CONTEXT        context;
-	HANDLE         hProcess = GetCurrentProcess();
-
-	// If it's not this thread, let's suspend it, and resume it at the end
-	if ( hThread != GetCurrentThread() )
-		if ( SuspendThread( hThread ) == -1 )
-		{
-			// whaaat ?!
-			etfprint(file, "Call stack info failed\n");
-			return;
-		}
-
-		::ZeroMemory( &context, sizeof(context) );
-		context.ContextFlags = CONTEXT_FULL;
-
-		if ( !GetThreadContext( hThread, &context ) )
-		{
-			etfprint(file, "Call stack info failed\n");
-			return;
-		}
-
-		::ZeroMemory( &callStack, sizeof(callStack) );
-#ifndef _M_X64
-		callStack.AddrPC.Offset    = context.Eip;
-		callStack.AddrStack.Offset = context.Esp;
-		callStack.AddrFrame.Offset = context.Ebp;
-#else
-		callStack.AddrPC.Offset    = context.Rip;
-		callStack.AddrStack.Offset = context.Rsp;
-		callStack.AddrFrame.Offset = context.Rbp;
-#endif
-		callStack.AddrPC.Mode      = AddrModeFlat;
-		callStack.AddrStack.Mode   = AddrModeFlat;
-		callStack.AddrFrame.Mode   = AddrModeFlat;
-
-		etfprint(file, "Call stack info: \n");
-		etfprint(file, lpszMessage);
-
-		PrintFunctionAndSourceInfo(file, callStack);
-
-		for( ULONG index = 0; ; index++ ) 
-		{
-			bResult = StackWalk(
-				IMAGE_FILE_MACHINE_I386,
-				hProcess,
-				hThread,
-				&callStack,
-				NULL, 
-				NULL,
-				SymFunctionTableAccess,
-				SymGetModuleBase,
-				NULL);
-
-			if ( index == 0 )
-				continue;
-
-			if( !bResult || callStack.AddrFrame.Offset == 0 ) 
-				break;
-
-			PrintFunctionAndSourceInfo(file, callStack);
-
-		}
-
-		if ( hThread != GetCurrentThread() )
-			ResumeThread( hThread );
-}
-
-void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip, DWORD esp, DWORD ebp )
-{
-	STACKFRAME     callStack;
-	BOOL           bResult;
-	TCHAR          symInfo[BUFFERSIZE] = _T("?");
-	TCHAR          srcInfo[BUFFERSIZE] = _T("?");
-	HANDLE         hProcess = GetCurrentProcess();
-
-	// If it's not this thread, let's suspend it, and resume it at the end
-	if ( hThread != GetCurrentThread() )
-		if ( SuspendThread( hThread ) == -1 )
-		{
-			// whaaat ?!
-			etfprint(file, "Call stack info failed\n");
-			return;
-		}
-
-		::ZeroMemory( &callStack, sizeof(callStack) );
-		callStack.AddrPC.Offset    = eip;
-		callStack.AddrStack.Offset = esp;
-		callStack.AddrFrame.Offset = ebp;
-		callStack.AddrPC.Mode      = AddrModeFlat;
-		callStack.AddrStack.Mode   = AddrModeFlat;
-		callStack.AddrFrame.Mode   = AddrModeFlat;
-
-		etfprint(file, "Call stack info: \n");
-		etfprint(file, lpszMessage);
-
-		PrintFunctionAndSourceInfo(file, callStack);
-
-		for( ULONG index = 0; ; index++ ) 
-		{
-			bResult = StackWalk(
-				IMAGE_FILE_MACHINE_I386,
-				hProcess,
-				hThread,
-				&callStack,
-				NULL, 
-				NULL,
-				SymFunctionTableAccess,
-				SymGetModuleBase,
-				NULL);
-
-			if ( index == 0 )
-				continue;
-
-			if( !bResult || callStack.AddrFrame.Offset == 0 ) 
-				break;
-
-			PrintFunctionAndSourceInfo(file, callStack);
-		}
-
-		if ( hThread != GetCurrentThread() )
-			ResumeThread( hThread );
-}
-
-char g_uefbuf[2048];
-
-void etfprintf(FILE *file, const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	int len = vsprintf(g_uefbuf, format, ap);
-	fwrite(g_uefbuf, 1, len, file);
-	va_end(ap);
-}
-
-void etfprint(FILE *file, const std::string &text)
-{
-	size_t len = text.length();
-	fwrite(text.data(), 1, len, file);
-}
-
-#endif //WIN32
diff --git a/Source/Core/Common/Src/ExtendedTrace.h b/Source/Core/Common/Src/ExtendedTrace.h
deleted file mode 100644
index 6d33eb632d..0000000000
--- a/Source/Core/Common/Src/ExtendedTrace.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -----------------------------------------------------------------------------------------
-//
-// Written by Zoltan Csizmadia, zoltan_csizmadia@yahoo.com
-// For companies(Austin,TX): If you would like to get my resume, send an email.
-//
-// The source is free, but if you want to use it, mention my name and e-mail address
-//
-// History:
-//    1.0      Initial version                  Zoltan Csizmadia
-//    1.1      WhineCube version                Masken
-//    1.2      Dolphin version                  Masken
-//
-// ----------------------------------------------------------------------------------------
-
-#ifndef _EXTENDEDTRACE_H_INCLUDED_
-#define _EXTENDEDTRACE_H_INCLUDED_
-
-#if defined(WIN32)
-
-#include <windows.h>
-#include <tchar.h>
-
-#include <string>
-
-#pragma comment( lib, "imagehlp.lib" )
-
-#define EXTENDEDTRACEINITIALIZE( IniSymbolPath )	InitSymInfo( IniSymbolPath )
-#define EXTENDEDTRACEUNINITIALIZE()					UninitSymInfo()
-#define STACKTRACE(file)							StackTrace( GetCurrentThread(), "", file)
-#define STACKTRACE2(file, eip, esp, ebp) StackTrace(GetCurrentThread(), "", file, eip, esp, ebp)
-// class File;
-
-BOOL InitSymInfo( PCSTR );
-BOOL UninitSymInfo();
-void StackTrace(HANDLE, char const* msg, FILE *file);
-void StackTrace(HANDLE, char const* msg, FILE *file, DWORD eip, DWORD esp, DWORD ebp);
-
-// functions by Masken
-void etfprintf(FILE *file, const char *format, ...);
-void etfprint(FILE *file, const std::string &text);
-#define UEFBUFSIZE 2048
-extern char g_uefbuf[UEFBUFSIZE];
-
-#else	// not WIN32
-
-#define EXTENDEDTRACEINITIALIZE( IniSymbolPath )	((void)0)
-#define EXTENDEDTRACEUNINITIALIZE()					((void)0)
-#define STACKTRACE(file)							((void)0)
-#define STACKTRACE2(file, eip, esp, ebp)			((void)0)
-
-#endif	// WIN32
-
-#endif	// _EXTENDEDTRACE_H_INCLUDED_
diff --git a/Source/Core/Common/Src/FPURoundMode.h b/Source/Core/Common/Src/FPURoundMode.h
deleted file mode 100644
index 2e26047689..0000000000
--- a/Source/Core/Common/Src/FPURoundMode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef FPU_ROUND_MODE_H_
-#define FPU_ROUND_MODE_H_
-#include "Common.h"
-
-namespace FPURoundMode
-{
-	enum RoundModes
-	{
-		ROUND_NEAR = 0,
-		ROUND_CHOP,
-		ROUND_UP,
-		ROUND_DOWN
-	};
-	enum PrecisionModes {
-		PREC_24 = 0,
-		PREC_53,
-		PREC_64
-	};
-	void SetRoundMode(u32 mode);
-
-	void SetPrecisionMode(u32 mode);
-	
-	void SetSIMDMode(u32 mode);
-
-/*
- * There are two different flavors of float to int conversion:
- * _mm_cvtps_epi32() and _mm_cvttps_epi32(). 
- *
- * The first rounds according to the MXCSR rounding bits.
- * The second one always uses round towards zero.
- */
-	void SaveSIMDState();
-	void LoadSIMDState();
-	void LoadDefaultSIMDState();
-}
-#endif
diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h
deleted file mode 100644
index 01f0e4dd3c..0000000000
--- a/Source/Core/Common/Src/FifoQueue.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-#ifndef _FIFO_QUEUE_H_
-#define _FIFO_QUEUE_H_
-
-// a simple lockless thread-safe,
-// single reader, single writer queue
-
-#include "Atomic.h"
-
-namespace Common
-{
-
-template <typename T>
-class FifoQueue
-{
-public:
-	FifoQueue() : m_size(0)
-	{
-		 m_write_ptr = m_read_ptr = new ElementPtr();
-	}
-
-	~FifoQueue()
-	{
-		// this will empty out the whole queue
-		delete m_read_ptr;
-	}
-
-	u32 Size() const
-	{
-		return m_size;
-	}
-
-	bool Empty() const
-	{
-		//return (m_read_ptr == m_write_ptr);
-		return (0 == m_size);
-	}
-
-	T& Front() const
-	{
-		return *m_read_ptr->current;
-	}
-
-	template <typename Arg>
-	void Push(Arg&& t)
-	{
-		// create the element, add it to the queue
-		m_write_ptr->current = new T(std::forward<Arg>(t));
-		// set the next pointer to a new element ptr
-		// then advance the write pointer 
-		m_write_ptr = m_write_ptr->next = new ElementPtr();
-		Common::AtomicIncrement(m_size);
-	}
-
-	void Pop()
-	{
-		Common::AtomicDecrement(m_size);
-		ElementPtr *const tmpptr = m_read_ptr;
-		// advance the read pointer
-		m_read_ptr = m_read_ptr->next;
-		// set the next element to NULL to stop the recursive deletion
-		tmpptr->next = NULL;
-		delete tmpptr;	// this also deletes the element
-	}
-
-	bool Pop(T& t)
-	{
-		if (Empty())
-			return false;
-
-		t = std::move(Front());
-		Pop();
-
-		return true;
-	}
-
-	// not thread-safe
-	void Clear()
-	{
-		m_size = 0;
-		delete m_read_ptr;
-		m_write_ptr = m_read_ptr = new ElementPtr();
-	}
-
-private:
-	// stores a pointer to element
-	// and a pointer to the next ElementPtr
-	class ElementPtr
-	{
-	public:
-		ElementPtr() : current(NULL), next(NULL) {}
-
-		~ElementPtr()
-		{
-			if (current)
-			{
-				delete current;
-				// recusion ftw
-				if (next)
-					delete next;
-			}
-		}
-
-		T *volatile current;
-		ElementPtr *volatile next;
-	};
-
-	ElementPtr *volatile m_write_ptr;
-	ElementPtr *volatile m_read_ptr;
-	volatile u32 m_size;
-};
-
-}
-
-#endif
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp
deleted file mode 100644
index f790b68c4d..0000000000
--- a/Source/Core/Common/Src/FileSearch.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "CommonPaths.h"
-#ifndef _WIN32
-#include <sys/types.h>
-#include <dirent.h>
-#else
-#include <windows.h>
-#endif
-
-#include <string>
-#include <algorithm>
-
-#include "FileSearch.h"
-
-#include "StringUtil.h"
-
-
-CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
-{
-	// Reverse the loop order for speed?
-	for (size_t j = 0; j < _rSearchStrings.size(); j++)
-	{
-		for (size_t i = 0; i < _rDirectories.size(); i++)
-		{
-			FindFiles(_rSearchStrings[j], _rDirectories[i]);
-		}
-	}
-}
-
-
-void CFileSearch::FindFiles(const std::string& _searchString, const std::string& _strPath)
-{
-	std::string GCMSearchPath;
-	BuildCompleteFilename(GCMSearchPath, _strPath, _searchString);
-#ifdef _WIN32
-	WIN32_FIND_DATA findData;
-	HANDLE FindFirst = FindFirstFile(UTF8ToTStr(GCMSearchPath).c_str(), &findData);
-
-	if (FindFirst != INVALID_HANDLE_VALUE)
-	{
-		bool bkeepLooping = true;
-
-		while (bkeepLooping)
-		{			
-			if (findData.cFileName[0] != '.')
-			{
-				std::string strFilename;
-				BuildCompleteFilename(strFilename, _strPath, TStrToUTF8(findData.cFileName));
-				m_FileNames.push_back(strFilename);
-			}
-
-			bkeepLooping = FindNextFile(FindFirst, &findData) ? true : false;
-		}
-	}
-	FindClose(FindFirst);
-
-
-#else
-	// TODO: super lame/broken
-
-	auto end_match(_searchString);
-
-	// assuming we have a "*.blah"-like pattern
-	if (!end_match.empty() && end_match[0] == '*')
-		end_match.erase(0, 1);
-
-	// ugly
-	if (end_match == ".*")
-		end_match.clear();
-
-	DIR* dir = opendir(_strPath.c_str());
-
-	if (!dir)
-		return;
-
-	while (auto const dp = readdir(dir))
-	{
-		std::string found(dp->d_name);
-
-		if ((found != ".") && (found != "..")
-			&& (found.size() >= end_match.size())
-			&& std::equal(end_match.rbegin(), end_match.rend(), found.rbegin()))
-		{
-			std::string full_name;
-			if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR)
-				full_name = _strPath + found;
-			else
-				full_name = _strPath + DIR_SEP + found;
-
-			m_FileNames.push_back(full_name);
-		}
-	}
-
-	closedir(dir);
-#endif
-}
-
-const CFileSearch::XStringVector& CFileSearch::GetFileNames() const
-{
-	return m_FileNames;
-}
diff --git a/Source/Core/Common/Src/FileSearch.h b/Source/Core/Common/Src/FileSearch.h
deleted file mode 100644
index 55aaf4ebe6..0000000000
--- a/Source/Core/Common/Src/FileSearch.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _FILESEARCH_H_
-#define _FILESEARCH_H_
-
-#include <string>
-#include <vector>
-
-class CFileSearch
-{
-public:
-	typedef std::vector<std::string>XStringVector;
-
-	CFileSearch(const XStringVector& _rSearchStrings, const XStringVector& _rDirectories);
-	const XStringVector& GetFileNames() const;
-
-private:
-
-	void FindFiles(const std::string& _searchString, const std::string& _strPath);
-
-	XStringVector m_FileNames;
-};
-
-#endif // _FILESEARCH_H_
-
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
deleted file mode 100644
index 7663e11078..0000000000
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include <shlobj.h>		// for SHGetFolderPath
-#include <shellapi.h>
-#include <commdlg.h>	// for GetSaveFileName
-#include <io.h>
-#include <direct.h>		// getcwd
-#else
-#include <sys/param.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
-#endif
-
-#if defined(__APPLE__)
-#include <CoreFoundation/CFString.h>
-#include <CoreFoundation/CFURL.h>
-#include <CoreFoundation/CFBundle.h>
-#endif
-
-#include <algorithm>
-#include <sys/stat.h>
-
-#include "StringUtil.h"
-
-#ifndef S_ISDIR
-#define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
-#endif
-
-#ifdef BSD4_4
-#define stat64 stat
-#define fstat64 fstat
-#endif
-
-// This namespace has various generic functions related to files and paths.
-// The code still needs a ton of cleanup.
-// REMEMBER: strdup considered harmful!
-namespace File
-{
-
-// Remove any ending forward slashes from directory paths
-// Modifies argument.
-static void StripTailDirSlashes(std::string &fname)
-{
-	if (fname.length() > 1)
-	{
-		size_t i = fname.length() - 1;
-		while (fname[i] == DIR_SEP_CHR)
-			fname[i--] = '\0';
-	}
-	return;
-}
-
-// Returns true if file filename exists
-bool Exists(const std::string &filename)
-{
-	struct stat64 file_info;
-
-	std::string copy(filename);
-	StripTailDirSlashes(copy);
-
-#ifdef _WIN32
-	int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info);
-#else
-	int result = stat64(copy.c_str(), &file_info);
-#endif
-
-	return (result == 0);
-}
-
-// Returns true if filename is a directory
-bool IsDirectory(const std::string &filename)
-{
-	struct stat64 file_info;
-
-	std::string copy(filename);
-	StripTailDirSlashes(copy);
-
-#ifdef _WIN32
-	int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info);
-#else
-	int result = stat64(copy.c_str(), &file_info);
-#endif
-
-	if (result < 0) {
-		WARN_LOG(COMMON, "IsDirectory: stat failed on %s: %s", 
-				 filename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-
-	return S_ISDIR(file_info.st_mode);
-}
-
-// Deletes a given filename, return true on success
-// Doesn't supports deleting a directory
-bool Delete(const std::string &filename)
-{
-	INFO_LOG(COMMON, "Delete: file %s", filename.c_str());
-
-	// Return true because we care about the file no 
-	// being there, not the actual delete.
-	if (!Exists(filename))
-	{
-		WARN_LOG(COMMON, "Delete: %s does not exist", filename.c_str());
-		return true;
-	}
-
-	// We can't delete a directory
-	if (IsDirectory(filename))
-	{
-		WARN_LOG(COMMON, "Delete failed: %s is a directory", filename.c_str());
-		return false;
-	}
-
-#ifdef _WIN32
-	if (!DeleteFile(UTF8ToTStr(filename).c_str()))
-	{
-		WARN_LOG(COMMON, "Delete: DeleteFile failed on %s: %s", 
-				 filename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-#else
-	if (unlink(filename.c_str()) == -1) {
-		WARN_LOG(COMMON, "Delete: unlink failed on %s: %s", 
-				 filename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-#endif
-
-	return true;
-}
-
-// Returns true if successful, or path already exists.
-bool CreateDir(const std::string &path)
-{
-	INFO_LOG(COMMON, "CreateDir: directory %s", path.c_str());
-#ifdef _WIN32
-	if (::CreateDirectory(UTF8ToTStr(path).c_str(), NULL))
-		return true;
-	DWORD error = GetLastError();
-	if (error == ERROR_ALREADY_EXISTS)
-	{
-		WARN_LOG(COMMON, "CreateDir: CreateDirectory failed on %s: already exists", path.c_str());
-		return true;
-	}
-	ERROR_LOG(COMMON, "CreateDir: CreateDirectory failed on %s: %i", path.c_str(), error);
-	return false;
-#else
-	if (mkdir(path.c_str(), 0755) == 0)
-		return true;
-
-	int err = errno;
-
-	if (err == EEXIST)
-	{
-		WARN_LOG(COMMON, "CreateDir: mkdir failed on %s: already exists", path.c_str());
-		return true;
-	}
-
-	ERROR_LOG(COMMON, "CreateDir: mkdir failed on %s: %s", path.c_str(), strerror(err));
-	return false;
-#endif
-}
-
-// Creates the full path of fullPath returns true on success
-bool CreateFullPath(const std::string &fullPath)
-{
-	int panicCounter = 100;
-	INFO_LOG(COMMON, "CreateFullPath: path %s", fullPath.c_str());
-
-	if (File::Exists(fullPath))
-	{
-		INFO_LOG(COMMON, "CreateFullPath: path exists %s", fullPath.c_str());
-		return true;
-	}
-
-	size_t position = 0;
-	while (true)
-	{
-		// Find next sub path
-		position = fullPath.find(DIR_SEP_CHR, position);
-
-		// we're done, yay!
-		if (position == fullPath.npos)
-			return true;
-
-		// Include the '/' so the first call is CreateDir("/") rather than CreateDir("")
-		std::string const subPath(fullPath.substr(0, position + 1));
-		if (!File::IsDirectory(subPath))
-			File::CreateDir(subPath);
-
-		// A safety check
-		panicCounter--;
-		if (panicCounter <= 0)
-		{
-			ERROR_LOG(COMMON, "CreateFullPath: directory structure is too deep");
-			return false;
-		}
-		position++;
-	}
-}
-
-
-// Deletes a directory filename, returns true on success
-bool DeleteDir(const std::string &filename)
-{
-	INFO_LOG(COMMON, "DeleteDir: directory %s", filename.c_str());
-
-	// check if a directory
-	if (!File::IsDirectory(filename))
-	{
-		ERROR_LOG(COMMON, "DeleteDir: Not a directory %s", filename.c_str());
-		return false;
-	}
-
-#ifdef _WIN32
-	if (::RemoveDirectory(UTF8ToTStr(filename).c_str()))
-		return true;
-#else
-	if (rmdir(filename.c_str()) == 0)
-		return true;
-#endif
-	ERROR_LOG(COMMON, "DeleteDir: %s: %s", filename.c_str(), GetLastErrorMsg());
-
-	return false;
-}
-
-// renames file srcFilename to destFilename, returns true on success 
-bool Rename(const std::string &srcFilename, const std::string &destFilename)
-{
-	INFO_LOG(COMMON, "Rename: %s --> %s", 
-			srcFilename.c_str(), destFilename.c_str());
-	if (rename(srcFilename.c_str(), destFilename.c_str()) == 0)
-		return true;
-	ERROR_LOG(COMMON, "Rename: failed %s --> %s: %s", 
-			  srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-	return false;
-}
-
-// copies file srcFilename to destFilename, returns true on success 
-bool Copy(const std::string &srcFilename, const std::string &destFilename)
-{
-	INFO_LOG(COMMON, "Copy: %s --> %s", 
-			srcFilename.c_str(), destFilename.c_str());
-#ifdef _WIN32
-	if (CopyFile(UTF8ToTStr(srcFilename).c_str(), UTF8ToTStr(destFilename).c_str(), FALSE))
-		return true;
-
-	ERROR_LOG(COMMON, "Copy: failed %s --> %s: %s", 
-			srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-	return false;
-#else
-
-	// buffer size
-#define BSIZE 1024
-
-	char buffer[BSIZE];
-
-	// Open input file
-	FILE *input = fopen(srcFilename.c_str(), "rb");
-	if (!input)
-	{
-		ERROR_LOG(COMMON, "Copy: input failed %s --> %s: %s", 
-				srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-
-	// open output file
-	FILE *output = fopen(destFilename.c_str(), "wb");
-	if (!output)
-	{
-		fclose(input);
-		ERROR_LOG(COMMON, "Copy: output failed %s --> %s: %s", 
-				srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-
-	// copy loop
-	while (!feof(input))
-	{
-		// read input
-		int rnum = fread(buffer, sizeof(char), BSIZE, input);
-		if (rnum != BSIZE)
-		{
-			if (ferror(input) != 0)
-			{
-				ERROR_LOG(COMMON, 
-						"Copy: failed reading from source, %s --> %s: %s", 
-						srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-				goto bail;
-			}
-		}
-
-		// write output
-		int wnum = fwrite(buffer, sizeof(char), rnum, output);
-		if (wnum != rnum)
-		{
-			ERROR_LOG(COMMON, 
-					"Copy: failed writing to output, %s --> %s: %s", 
-					srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg());
-			goto bail;
-		}
-	}
-	// close files
-	fclose(input);
-	fclose(output);
-	return true;
-bail:
-	if (input)
-		fclose(input);
-	if (output)
-		fclose(output);
-	return false;
-#endif
-}
-
-// Returns the size of filename (64bit)
-u64 GetSize(const std::string &filename)
-{
-	if (!Exists(filename))
-	{
-		WARN_LOG(COMMON, "GetSize: failed %s: No such file", filename.c_str());
-		return 0;
-	}
-
-	if (IsDirectory(filename))
-	{
-		WARN_LOG(COMMON, "GetSize: failed %s: is a directory", filename.c_str());
-		return 0;
-	}
-	
-	struct stat64 buf;
-#ifdef _WIN32
-	if (_tstat64(UTF8ToTStr(filename).c_str(), &buf) == 0)
-#else
-	if (stat64(filename.c_str(), &buf) == 0)
-#endif
-	{
-		DEBUG_LOG(COMMON, "GetSize: %s: %lld",
-				filename.c_str(), (long long)buf.st_size);
-		return buf.st_size;
-	}
-
-	ERROR_LOG(COMMON, "GetSize: Stat failed %s: %s",
-			filename.c_str(), GetLastErrorMsg());
-	return 0;
-}
-
-// Overloaded GetSize, accepts file descriptor
-u64 GetSize(const int fd)
-{
-	struct stat64 buf;
-	if (fstat64(fd, &buf) != 0) {
-		ERROR_LOG(COMMON, "GetSize: stat failed %i: %s",
-			fd, GetLastErrorMsg());
-		return 0;
-	}
-	return buf.st_size;
-}
-
-// Overloaded GetSize, accepts FILE*
-u64 GetSize(FILE *f)
-{
-	// can't use off_t here because it can be 32-bit
-	u64 pos = ftello(f);
-	if (fseeko(f, 0, SEEK_END) != 0) {
-		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s",
-			  f, GetLastErrorMsg());
-		return 0;
-	}
-	u64 size = ftello(f);
-	if ((size != pos) && (fseeko(f, pos, SEEK_SET) != 0)) {
-		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s",
-			  f, GetLastErrorMsg());
-		return 0;
-	}
-	return size;
-}
-
-// creates an empty file filename, returns true on success 
-bool CreateEmptyFile(const std::string &filename)
-{
-	INFO_LOG(COMMON, "CreateEmptyFile: %s", filename.c_str()); 
-
-	if (!File::IOFile(filename, "wb"))
-	{
-		ERROR_LOG(COMMON, "CreateEmptyFile: failed %s: %s",
-				  filename.c_str(), GetLastErrorMsg());
-		return false;
-	}
-
-	return true;
-}
-
-
-// Scans the directory tree gets, starting from _Directory and adds the
-// results into parentEntry. Returns the number of files+directories found
-u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
-{
-	INFO_LOG(COMMON, "ScanDirectoryTree: directory %s", directory.c_str());
-	// How many files + directories we found
-	u32 foundEntries = 0;
-#ifdef _WIN32
-	// Find the first file in the directory.
-	WIN32_FIND_DATA ffd;
-
-	HANDLE hFind = FindFirstFile(UTF8ToTStr(directory + "\\*").c_str(), &ffd);
-	if (hFind == INVALID_HANDLE_VALUE)
-	{
-		FindClose(hFind);
-		return foundEntries;
-	}
-	// windows loop
-	do
-	{
-		FSTEntry entry;
-		const std::string virtualName(TStrToUTF8(ffd.cFileName));
-#else
-	struct dirent dirent, *result = NULL;
-
-	DIR *dirp = opendir(directory.c_str());
-	if (!dirp)
-		return 0;
-
-	// non windows loop
-	while (!readdir_r(dirp, &dirent, &result) && result)
-	{
-		FSTEntry entry;
-		const std::string virtualName(result->d_name);
-#endif
-		// check for "." and ".."
-		if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-				((virtualName[0] == '.') && (virtualName[1] == '.') && 
-				 (virtualName[2] == '\0')))
-			continue;
-		entry.virtualName = virtualName;
-		entry.physicalName = directory;
-		entry.physicalName += DIR_SEP + entry.virtualName;
-
-		if (IsDirectory(entry.physicalName.c_str()))
-		{
-			entry.isDirectory = true;
-			// is a directory, lets go inside
-			entry.size = ScanDirectoryTree(entry.physicalName, entry);
-			foundEntries += (u32)entry.size;
-		}
-		else
-		{ // is a file 
-			entry.isDirectory = false;
-			entry.size = GetSize(entry.physicalName.c_str());
-		}
-		++foundEntries;
-		// Push into the tree
-		parentEntry.children.push_back(entry);		
-#ifdef _WIN32 
-	} while (FindNextFile(hFind, &ffd) != 0);
-	FindClose(hFind);
-#else
-	}
-	closedir(dirp);
-#endif
-	// Return number of entries found.
-	return foundEntries;
-}
-
-
-// Deletes the given directory and anything under it. Returns true on success.
-bool DeleteDirRecursively(const std::string &directory)
-{
-	INFO_LOG(COMMON, "DeleteDirRecursively: %s", directory.c_str());
-#ifdef _WIN32
-	// Find the first file in the directory.
-	WIN32_FIND_DATA ffd;
-	HANDLE hFind = FindFirstFile(UTF8ToTStr(directory + "\\*").c_str(), &ffd);
-
-	if (hFind == INVALID_HANDLE_VALUE)
-	{
-		FindClose(hFind);
-		return false;
-	}
-
-	// windows loop
-	do
-	{
-		const std::string virtualName(TStrToUTF8(ffd.cFileName));
-#else
-	struct dirent dirent, *result = NULL;
-	DIR *dirp = opendir(directory.c_str());
-	if (!dirp)
-		return false;
-
-	// non windows loop
-	while (!readdir_r(dirp, &dirent, &result) && result)
-	{
-		const std::string virtualName = result->d_name;
-#endif
-
-		// check for "." and ".."
-		if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-			((virtualName[0] == '.') && (virtualName[1] == '.') && 
-			 (virtualName[2] == '\0')))
-			continue;
-
-		std::string newPath = directory + DIR_SEP_CHR + virtualName;
-		if (IsDirectory(newPath))
-		{
-			if (!DeleteDirRecursively(newPath))
-			{
-				#ifndef _WIN32
-				closedir(dirp);
-				#endif
-
-				return false;
-			}
-		}
-		else
-		{
-			if (!File::Delete(newPath))
-			{
-				#ifndef _WIN32
-				closedir(dirp);
-				#endif
-
-				return false;
-			}
-		}
-
-#ifdef _WIN32
-	} while (FindNextFile(hFind, &ffd) != 0);
-	FindClose(hFind);
-#else
-	}
-	closedir(dirp);
-#endif
-	File::DeleteDir(directory);
-		
-	return true;
-}
-
-// Create directory and copy contents (does not overwrite existing files)
-void CopyDir(const std::string &source_path, const std::string &dest_path)
-{
-	if (source_path == dest_path) return;
-	if (!File::Exists(source_path)) return;
-	if (!File::Exists(dest_path)) File::CreateFullPath(dest_path);
-
-#ifdef _WIN32
-	WIN32_FIND_DATA ffd;
-	HANDLE hFind = FindFirstFile(UTF8ToTStr(source_path + "\\*").c_str(), &ffd);
-
-	if (hFind == INVALID_HANDLE_VALUE)
-	{
-		FindClose(hFind);
-		return;
-	}
-
-	do
-	{
-		const std::string virtualName(TStrToUTF8(ffd.cFileName));
-#else
-	struct dirent dirent, *result = NULL;
-	DIR *dirp = opendir(source_path.c_str());
-	if (!dirp) return;
-
-	while (!readdir_r(dirp, &dirent, &result) && result)
-	{
-		const std::string virtualName(result->d_name);
-#endif
-		// check for "." and ".."
-		if (virtualName == "." || virtualName == "..")
-			continue;
-
-		std::string source, dest;
-		source = source_path + virtualName;
-		dest = dest_path + virtualName;
-		if (IsDirectory(source))
-		{
-			source += '/';
-			dest += '/';
-			if (!File::Exists(dest)) File::CreateFullPath(dest);
-			CopyDir(source, dest);
-		}
-		else if (!File::Exists(dest)) File::Copy(source, dest);
-#ifdef _WIN32
-	} while (FindNextFile(hFind, &ffd) != 0);
-	FindClose(hFind);
-#else
-	}
-	closedir(dirp);
-#endif
-}
-
-// Returns the current directory
-std::string GetCurrentDir()
-{
-	char *dir;
-	// Get the current working directory (getcwd uses malloc) 
-	if (!(dir = __getcwd(NULL, 0))) {
-
-		ERROR_LOG(COMMON, "GetCurrentDirectory failed: %s",
-				GetLastErrorMsg());
-		return NULL;
-	}
-	std::string strDir = dir;
-	free(dir);
-	return strDir;
-}
-
-// Sets the current directory to the given directory
-bool SetCurrentDir(const std::string &directory)
-{
-	return __chdir(directory.c_str()) == 0;
-}
-
-#if defined(__APPLE__)
-std::string GetBundleDirectory() 
-{
-	CFURLRef BundleRef;
-	char AppBundlePath[MAXPATHLEN];
-	// Get the main bundle for the app
-	BundleRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-	CFStringRef BundlePath = CFURLCopyFileSystemPath(BundleRef, kCFURLPOSIXPathStyle);
-	CFStringGetFileSystemRepresentation(BundlePath, AppBundlePath, sizeof(AppBundlePath));
-	CFRelease(BundleRef);
-	CFRelease(BundlePath);
-
-	return AppBundlePath;
-}
-#endif
-
-#ifdef _WIN32
-std::string& GetExeDirectory()
-{
-	static std::string DolphinPath;
-	if (DolphinPath.empty())
-	{
-		TCHAR Dolphin_exe_Path[2048];
-		GetModuleFileName(NULL, Dolphin_exe_Path, 2048);
-		DolphinPath = TStrToUTF8(Dolphin_exe_Path);
-		DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
-	}
-	return DolphinPath;
-}
-#endif
-
-std::string GetSysDirectory()
-{
-	std::string sysDir;
-
-#if defined (__APPLE__)
-	sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR;
-#elif defined (_WIN32)
-	sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
-#else
-	sysDir = SYSDATA_DIR;
-#endif
-	sysDir += DIR_SEP;
-
-	INFO_LOG(COMMON, "GetSysDirectory: Setting to %s:", sysDir.c_str());
-	return sysDir;
-}
-
-// Returns a string with a Dolphin data dir or file in the user's home
-// directory. To be used in "multi-user" mode (that is, installed).
-const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath)
-{
-	static std::string paths[NUM_PATH_INDICES];
-
-	// Set up all paths and files on the first run
-	if (paths[D_USER_IDX].empty())
-	{
-#ifdef _WIN32
-		// Detect where the User directory is. There are five different cases (on top of the
-		// command line flag, which overrides all this):
-		// 1. GetExeDirectory()\portable.txt exists
-		//    -> Use GetExeDirectory()\User
-		// 2. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true
-		//    -> Use GetExeDirectory()\User
-		// 3. HKCU\Software\Dolphin Emulator\UserConfigPath exists
-		//    -> Use this as the user directory path
-		// 4. My Documents exists
-		//    -> Use My Documents\Dolphin Emulator as the User directory path
-		// 5. Default
-		//    -> Use GetExeDirectory()\User
-
-		// Check our registry keys
-		HKEY hkey;
-		DWORD local = 0;
-		TCHAR configPath[MAX_PATH] = {0};
-		if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), NULL, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
-		{
-			DWORD size = 4;
-			if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), NULL, NULL, reinterpret_cast<LPBYTE>(&local), &size) != ERROR_SUCCESS)
-				local = 0;
-
-			size = MAX_PATH;
-			if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), NULL, NULL, (LPBYTE)configPath, &size) != ERROR_SUCCESS)
-				configPath[0] = 0;
-			RegCloseKey(hkey);
-		}
-
-		local = local || File::Exists(GetExeDirectory() + DIR_SEP "portable.txt");
-
-		// Get Program Files path in case we need it.
-		TCHAR my_documents[MAX_PATH];
-		bool my_documents_found = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, my_documents));
-
-		if (local) // Case 1-2
-			paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
-		else if (configPath[0]) // Case 3
-			paths[D_USER_IDX] = TStrToUTF8(configPath);
-		else if (my_documents_found) // Case 4
-			paths[D_USER_IDX] = TStrToUTF8(my_documents) + DIR_SEP "Dolphin Emulator" DIR_SEP;
-		else // Case 5
-			paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
-
-		// Prettify the path: it will be displayed in some places, we don't want a mix of \ and /.
-		paths[D_USER_IDX] = ReplaceAll(paths[D_USER_IDX], "\\", DIR_SEP);
-
-		// Make sure it ends in DIR_SEP.
-		if (*paths[D_USER_IDX].rbegin() != DIR_SEP_CHR)
-			paths[D_USER_IDX] += DIR_SEP;
-#else
-		if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
-			paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
-		else
-			paths[D_USER_IDX] = std::string(getenv("HOME") ? 
-				getenv("HOME") : getenv("PWD") ? 
-				getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
-#endif
-
-		paths[D_GCUSER_IDX]			= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
-		paths[D_WIIROOT_IDX]		= paths[D_USER_IDX] + WII_USER_DIR;
-		paths[D_WIIUSER_IDX]		= paths[D_WIIROOT_IDX] + DIR_SEP;
-		paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-		paths[D_GAMESETTINGS_IDX]	= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
-		paths[D_MAPS_IDX]			= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
-		paths[D_CACHE_IDX]			= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
-		paths[D_SHADERCACHE_IDX]	= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
-		paths[D_SHADERS_IDX]		= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
-		paths[D_STATESAVES_IDX]		= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
-		paths[D_SCREENSHOTS_IDX]	= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
-		paths[D_OPENCL_IDX]			= paths[D_USER_IDX] + OPENCL_DIR DIR_SEP;
-		paths[D_HIRESTEXTURES_IDX]	= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
-		paths[D_DUMP_IDX]			= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
-		paths[D_DUMPFRAMES_IDX]		= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-		paths[D_DUMPAUDIO_IDX]		= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-		paths[D_DUMPTEXTURES_IDX]	= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-		paths[D_DUMPDSP_IDX]		= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-		paths[D_LOGS_IDX]			= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-		paths[D_MAILLOGS_IDX]		= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-		paths[D_WIISYSCONF_IDX]		= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
-		paths[D_WIIWC24_IDX]		= paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
-		paths[D_THEMES_IDX]			= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
-		paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-		paths[F_DEBUGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-		paths[F_LOGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-		paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
-		paths[F_WIISYSCONF_IDX]		= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-		paths[F_RAMDUMP_IDX]		= paths[D_DUMP_IDX] + RAM_DUMP;
-		paths[F_ARAMDUMP_IDX]		= paths[D_DUMP_IDX] + ARAM_DUMP;
-		paths[F_FAKEVMEMDUMP_IDX]	= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-		paths[F_GCSRAM_IDX]			= paths[D_GCUSER_IDX] + GC_SRAM;
-	}
-
-	if (!newPath.empty())
-	{
-		if (!File::IsDirectory(newPath))
-		{
-			WARN_LOG(COMMON, "Invalid path specified %s", newPath.c_str());
-			return paths[DirIDX];
-		}
-		else
-		{
-			paths[DirIDX] = newPath;
-		}
-
-		switch (DirIDX)
-		{
-		case D_WIIROOT_IDX:
-			paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
-			paths[D_WIISYSCONF_IDX]	= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP;
-			paths[F_WIISYSCONF_IDX]	= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-			break;
-
-		case D_USER_IDX:
-			paths[D_GCUSER_IDX]				= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
-			paths[D_WIIROOT_IDX]			= paths[D_USER_IDX] + WII_USER_DIR;
-			paths[D_WIIUSER_IDX]			= paths[D_WIIROOT_IDX] + DIR_SEP;
-			paths[D_CONFIG_IDX]				= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-			paths[D_GAMESETTINGS_IDX]		= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
-			paths[D_MAPS_IDX]				= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
-			paths[D_CACHE_IDX]				= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
-			paths[D_SHADERCACHE_IDX]		= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
-			paths[D_SHADERS_IDX]			= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
-			paths[D_STATESAVES_IDX]			= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
-			paths[D_SCREENSHOTS_IDX]		= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
-			paths[D_OPENCL_IDX]				= paths[D_USER_IDX] + OPENCL_DIR DIR_SEP;
-			paths[D_HIRESTEXTURES_IDX]		= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMP_IDX]				= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
-			paths[D_DUMPFRAMES_IDX]			= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-			paths[D_DUMPAUDIO_IDX]			= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-			paths[D_DUMPTEXTURES_IDX]		= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMPDSP_IDX]			= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-			paths[D_LOGS_IDX]				= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-			paths[D_MAILLOGS_IDX]			= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-			paths[D_WIISYSCONF_IDX]			= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
-			paths[D_THEMES_IDX]				= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
-			paths[F_DOLPHINCONFIG_IDX]		= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-			paths[F_DEBUGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-			paths[F_LOGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-			paths[F_MAINLOG_IDX]			= paths[D_LOGS_IDX] + MAIN_LOG;
-			paths[F_WIISYSCONF_IDX]			= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-			paths[F_RAMDUMP_IDX]			= paths[D_DUMP_IDX] + RAM_DUMP;
-			paths[F_ARAMDUMP_IDX]			= paths[D_DUMP_IDX] + ARAM_DUMP;
-			paths[F_FAKEVMEMDUMP_IDX]		= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-			paths[F_GCSRAM_IDX]				= paths[D_GCUSER_IDX] + GC_SRAM;
-			break;
-
-		case D_CONFIG_IDX:
-			paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-			paths[F_DEBUGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-			paths[F_LOGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-			break;
-
-		case D_GCUSER_IDX:
-			paths[F_GCSRAM_IDX]			= paths[D_GCUSER_IDX] + GC_SRAM;
-			break;
-
-		case D_DUMP_IDX:
-			paths[D_DUMPFRAMES_IDX]		= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-			paths[D_DUMPAUDIO_IDX]		= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-			paths[D_DUMPTEXTURES_IDX]	= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMPDSP_IDX]		= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-			paths[F_RAMDUMP_IDX]		= paths[D_DUMP_IDX] + RAM_DUMP;
-			paths[F_ARAMDUMP_IDX]		= paths[D_DUMP_IDX] + ARAM_DUMP;
-			paths[F_FAKEVMEMDUMP_IDX]	= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-			break;
-		case D_LOGS_IDX:
-			paths[D_MAILLOGS_IDX]		= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-			paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
-		}
-
-		paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP;
-		paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP;
-		paths[D_WIISYSCONF_IDX]	= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP; 
-		paths[F_WIISYSCONF_IDX]	= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-	}
-
-	return paths[DirIDX];
-}
-
-std::string GetThemeDir(const std::string& theme_name)
-{
-	std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
-
-	// If theme does not exist in user's dir load from shared directory
-	if (!File::Exists(dir))
-		dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
-
-	return dir;
-}
-
-bool WriteStringToFile(bool text_file, const std::string &str, const char *filename)
-{
-	return File::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size());
-}
-
-bool ReadFileToString(bool text_file, const char *filename, std::string &str)
-{
-	File::IOFile file(filename, text_file ? "r" : "rb");
-	auto const f = file.GetHandle();
-
-	if (!f)
-		return false;
-
-	size_t read_size;
-	str.resize(GetSize(f));
-	bool retval = file.ReadArray(&str[0], str.size(), &read_size);
-
-	// On Windows, reading a text file automatically translates \r\n to \n.
-	// This means we will read less characters than the expected size of the
-	// file. In that case, ignore the return value and count ourselves.
-#ifdef _WIN32
-	if (text_file)
-	{
-		size_t count = 0;
-		for (size_t i = 0; i < read_size; ++i)
-		{
-			if (str[i] == '\n')
-				count += 2;
-			else
-				count += 1;
-		}
-
-		if (count != str.size())
-			return false;
-
-		str.resize(read_size);
-		return true;
-	}
-#endif
-
-	return retval;
-}
-
-IOFile::IOFile()
-	: m_file(NULL), m_good(true)
-{}
-
-IOFile::IOFile(std::FILE* file)
-	: m_file(file), m_good(true)
-{}
-
-IOFile::IOFile(const std::string& filename, const char openmode[])
-	: m_file(NULL), m_good(true)
-{
-	Open(filename, openmode);
-}
-
-IOFile::~IOFile()
-{
-	Close();
-}
-
-IOFile::IOFile(IOFile&& other)
-	: m_file(NULL), m_good(true)
-{
-	Swap(other);
-}
-
-IOFile& IOFile::operator=(IOFile&& other)
-{
-	Swap(other);
-	return *this;
-}
-
-void IOFile::Swap(IOFile& other)
-{
-	std::swap(m_file, other.m_file);
-	std::swap(m_good, other.m_good);
-}
-
-bool IOFile::Open(const std::string& filename, const char openmode[])
-{
-	Close();
-#ifdef _WIN32
-	_tfopen_s(&m_file, UTF8ToTStr(filename).c_str(), UTF8ToTStr(openmode).c_str());
-#else
-	m_file = fopen(filename.c_str(), openmode);
-#endif
-
-	m_good = IsOpen();
-	return m_good;
-}
-
-bool IOFile::Close()
-{
-	if (!IsOpen() || 0 != std::fclose(m_file))
-		m_good = false;
-
-	m_file = NULL;
-	return m_good;
-}
-
-std::FILE* IOFile::ReleaseHandle()
-{
-	std::FILE* const ret = m_file;
-	m_file = NULL;
-	return ret;
-}
-
-void IOFile::SetHandle(std::FILE* file)
-{
-	Close();
-	Clear();
-	m_file = file;
-}
-
-u64 IOFile::GetSize()
-{
-	if (IsOpen())
-		return File::GetSize(m_file);
-	else
-		return 0;
-}
-
-bool IOFile::Seek(s64 off, int origin)
-{
-	if (!IsOpen() || 0 != fseeko(m_file, off, origin))
-		m_good = false;
-
-	return m_good;
-}
-
-u64 IOFile::Tell()
-{
-	if (IsOpen())
-		return ftello(m_file);
-	else
-		return -1;
-}
-
-bool IOFile::Flush()
-{
-	if (!IsOpen() || 0 != std::fflush(m_file))
-		m_good = false;
-
-	return m_good;
-}
-
-bool IOFile::Resize(u64 size)
-{
-	if (!IsOpen() || 0 !=
-#ifdef _WIN32
-		// ector: _chsize sucks, not 64-bit safe
-		// F|RES: changed to _chsize_s. i think it is 64-bit safe
-		_chsize_s(_fileno(m_file), size)
-#else
-		// TODO: handle 64bit and growing
-		ftruncate(fileno(m_file), size)
-#endif
-	)
-		m_good = false;
-
-	return m_good;
-}
-
-} // namespace
diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h
deleted file mode 100644
index e3263ba233..0000000000
--- a/Source/Core/Common/Src/FileUtil.h
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _FILEUTIL_H_
-#define _FILEUTIL_H_
-
-#include <fstream>
-#include <cstdio>
-#include <string>
-#include <vector>
-#include <string.h>
-
-#include "Common.h"
-#include "StringUtil.h"
-
-// User directory indices for GetUserPath
-enum {
-	D_USER_IDX,
-	D_GCUSER_IDX,
-	D_WIIROOT_IDX,
-	D_WIIUSER_IDX,
-	D_CONFIG_IDX, // global settings
-	D_GAMESETTINGS_IDX, // user-specified settings which override both the global and the default settings (per game)
-	D_MAPS_IDX,
-	D_CACHE_IDX,
-	D_SHADERCACHE_IDX,
-	D_SHADERS_IDX,
-	D_STATESAVES_IDX,
-	D_SCREENSHOTS_IDX,
-	D_OPENCL_IDX,
-	D_HIRESTEXTURES_IDX,
-	D_DUMP_IDX,
-	D_DUMPFRAMES_IDX,
-	D_DUMPAUDIO_IDX,
-	D_DUMPTEXTURES_IDX,
-	D_DUMPDSP_IDX,
-	D_LOGS_IDX,
-	D_MAILLOGS_IDX,
-	D_WIISYSCONF_IDX,
-	D_WIIWC24_IDX,
-	D_THEMES_IDX,
-	F_DOLPHINCONFIG_IDX,
-	F_DEBUGGERCONFIG_IDX,
-	F_LOGGERCONFIG_IDX,
-	F_MAINLOG_IDX,
-	F_WIISYSCONF_IDX,
-	F_RAMDUMP_IDX,
-	F_ARAMDUMP_IDX,
-	F_FAKEVMEMDUMP_IDX,
-	F_GCSRAM_IDX,
-	NUM_PATH_INDICES
-};
-
-namespace File
-{
-
-// FileSystem tree node/ 
-struct FSTEntry
-{
-	bool isDirectory;
-	u64 size;						// file length or number of entries from children
-	std::string physicalName;		// name on disk
-	std::string virtualName;		// name in FST names table
-	std::vector<FSTEntry> children;
-};
-
-// Returns true if file filename exists
-bool Exists(const std::string &filename);
-
-// Returns true if filename is a directory
-bool IsDirectory(const std::string &filename);
-
-// Returns the size of filename (64bit)
-u64 GetSize(const std::string &filename);
-
-// Overloaded GetSize, accepts file descriptor
-u64 GetSize(const int fd);
-
-// Overloaded GetSize, accepts FILE*
-u64 GetSize(FILE *f);
-
-// Returns true if successful, or path already exists.
-bool CreateDir(const std::string &filename);
-
-// Creates the full path of fullPath returns true on success
-bool CreateFullPath(const std::string &fullPath);
-
-// Deletes a given filename, return true on success
-// Doesn't supports deleting a directory
-bool Delete(const std::string &filename);
-
-// Deletes a directory filename, returns true on success
-bool DeleteDir(const std::string &filename);
-
-// renames file srcFilename to destFilename, returns true on success 
-bool Rename(const std::string &srcFilename, const std::string &destFilename);
-
-// copies file srcFilename to destFilename, returns true on success 
-bool Copy(const std::string &srcFilename, const std::string &destFilename);
-
-// creates an empty file filename, returns true on success 
-bool CreateEmptyFile(const std::string &filename);
-
-// Scans the directory tree gets, starting from _Directory and adds the
-// results into parentEntry. Returns the number of files+directories found
-u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry);
-
-// deletes the given directory and anything under it. Returns true on success.
-bool DeleteDirRecursively(const std::string &directory);
-
-// Returns the current directory
-std::string GetCurrentDir();
-
-// Create directory and copy contents (does not overwrite existing files)
-void CopyDir(const std::string &source_path, const std::string &dest_path);
-
-// Set the current directory to given directory
-bool SetCurrentDir(const std::string &directory);
-
-// Returns a pointer to a string with a Dolphin data dir in the user's home
-// directory. To be used in "multi-user" mode (that is, installed).
-const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
-
-// probably doesn't belong here
-std::string GetThemeDir(const std::string& theme_name);
-
-// Returns the path to where the sys file are
-std::string GetSysDirectory();
-
-#ifdef __APPLE__
-std::string GetBundleDirectory();
-#endif
-
-#ifdef _WIN32
-std::string &GetExeDirectory();
-#endif
-
-bool WriteStringToFile(bool text_file, const std::string &str, const char *filename);
-bool ReadFileToString(bool text_file, const char *filename, std::string &str);
-
-// simple wrapper for cstdlib file functions to
-// hopefully will make error checking easier
-// and make forgetting an fclose() harder
-class IOFile : public NonCopyable
-{
-public:
-	IOFile();
-	IOFile(std::FILE* file);
-	IOFile(const std::string& filename, const char openmode[]);
-
-	~IOFile();
-	
-	IOFile(IOFile&& other);
-	IOFile& operator=(IOFile&& other);
-	
-	void Swap(IOFile& other);
-
-	bool Open(const std::string& filename, const char openmode[]);
-	bool Close();
-
-	template <typename T>
-	bool ReadArray(T* data, size_t length, size_t* pReadBytes = NULL)
-	{
-		size_t read_bytes = 0;
-		if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file)))
-			m_good = false;
-
-		if (pReadBytes)
-			*pReadBytes = read_bytes;
-
-		return m_good;
-	}
-
-	template <typename T>
-	bool WriteArray(const T* data, size_t length)
-	{
-		if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file))
-			m_good = false;
-
-		return m_good;
-	}
-
-	bool ReadBytes(void* data, size_t length)
-	{
-		return ReadArray(reinterpret_cast<char*>(data), length);
-	}
-
-	bool WriteBytes(const void* data, size_t length)
-	{
-		return WriteArray(reinterpret_cast<const char*>(data), length);
-	}
-
-	bool IsOpen() { return NULL != m_file; }
-
-	// m_good is set to false when a read, write or other function fails
-	bool IsGood() {	return m_good; }
-	operator void*() { return m_good ? m_file : NULL; }
-
-	std::FILE* ReleaseHandle();
-
-	std::FILE* GetHandle() { return m_file; }
-
-	void SetHandle(std::FILE* file);
-
-	bool Seek(s64 off, int origin);
-	u64 Tell();
-	u64 GetSize();
-	bool Resize(u64 size);
-	bool Flush();
-
-	// clear error state
-	void Clear() { m_good = true; std::clearerr(m_file); }
-
-	std::FILE* m_file;
-	bool m_good;
-private:
-	IOFile(IOFile&);
-	IOFile& operator=(IOFile& other);
-};
-
-}  // namespace
-
-// To deal with Windows being dumb at unicode:
-template <typename T>
-void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode)
-{
-#ifdef _WIN32
-	fstream.open(UTF8ToTStr(filename).c_str(), openmode);
-#else
-	fstream.open(filename.c_str(), openmode);
-#endif
-}
-
-#endif
diff --git a/Source/Core/Common/Src/FixedSizeQueue.h b/Source/Core/Common/Src/FixedSizeQueue.h
deleted file mode 100644
index 0fb625dd5a..0000000000
--- a/Source/Core/Common/Src/FixedSizeQueue.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _FIXED_SIZE_QUEUE_H_
-#define _FIXED_SIZE_QUEUE_H_
-
-// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
-// real STL classes.
-
-// Not fully featured, no safety checking yet. Add features as needed.
-
-// TODO: "inline" storage?
-
-template <class T, int N>
-class FixedSizeQueue
-{
-	T *storage;
-	int head;
-	int tail;
-	int count;  // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
-
-	// Make copy constructor private for now.
-	FixedSizeQueue(FixedSizeQueue &other) {	}
-
-public:
-	FixedSizeQueue()
-	{
-		storage = new T[N];
-		clear();
-	}
-
-	~FixedSizeQueue()
-	{
-		delete [] storage;
-	}
-
-	void clear() {
-		head = 0;
-		tail = 0;
-		count = 0;
-	}
-
-	void push(T t) {
-		storage[tail] = t;
-		tail++;
-		if (tail == N)
-			tail = 0;
-		count++;
-	}
-
-	void pop() {
-		head++;
-		if (head == N)
-			head = 0;
-		count--;
-	}
-
-	T pop_front() {
-		const T &temp = storage[head];
-		pop();
-		return temp;
-	}
-
-	T &front() { return storage[head]; }
-	const T &front() const { return storage[head]; }
-
-	size_t size() const {
-		return count;
-	}
-};
-
-#endif // _FIXED_SIZE_QUEUE_H_
-
diff --git a/Source/Core/Common/Src/GenericFPURoundMode.cpp b/Source/Core/Common/Src/GenericFPURoundMode.cpp
deleted file mode 100644
index cc878291a1..0000000000
--- a/Source/Core/Common/Src/GenericFPURoundMode.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "FPURoundMode.h"
-
-// Generic, do nothing
-namespace FPURoundMode
-{
-	void SetRoundMode(u32 mode)
-	{
-	}
-	void SetPrecisionMode(u32 mode)
-	{
-	}
-	void SetSIMDMode(u32 mode)
-	{
-	}
-	void SaveSIMDState()
-	{
-	}
-	void LoadSIMDState()
-	{
-	}
-	void LoadDefaultSIMDState()
-	{
-	}
-}
diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp
deleted file mode 100644
index 2e221ee396..0000000000
--- a/Source/Core/Common/Src/Hash.cpp
+++ /dev/null
@@ -1,520 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Hash.h"
-#if _M_SSE >= 0x402
-#include "CPUDetect.h"
-#include <nmmintrin.h>
-#endif
-
-static u64 (*ptrHashFunction)(const u8 *src, int len, u32 samples) = &GetMurmurHash3;
-
-// uint32_t
-// WARNING - may read one more byte!
-// Implementation from Wikipedia.
-u32 HashFletcher(const u8* data_u8, size_t length)
-{
-	const u16* data = (const u16*)data_u8; /* Pointer to the data to be summed */
-	size_t len = (length + 1) / 2; /* Length in 16-bit words */
-	u32 sum1 = 0xffff, sum2 = 0xffff;
-
-	while (len)
-	{
-		size_t tlen = len > 360 ? 360 : len;
-		len -= tlen;
-
-		do {
-			sum1 += *data++;
-			sum2 += sum1;
-		}
-		while (--tlen);
-
-		sum1 = (sum1 & 0xffff) + (sum1 >> 16);
-		sum2 = (sum2 & 0xffff) + (sum2 >> 16);
-	}
-
-	// Second reduction step to reduce sums to 16 bits
-	sum1 = (sum1 & 0xffff) + (sum1 >> 16);
-	sum2 = (sum2 & 0xffff) + (sum2 >> 16);
-	return(sum2 << 16 | sum1);
-}
-
-
-// Implementation from Wikipedia
-// Slightly slower than Fletcher above, but slightly more reliable.
-#define MOD_ADLER 65521
-// data: Pointer to the data to be summed; len is in bytes
-u32 HashAdler32(const u8* data, size_t len)
-{
-	u32 a = 1, b = 0;
-
-	while (len)
-	{
-		size_t tlen = len > 5550 ? 5550 : len;
-		len -= tlen;
-
-		do
-		{
-			a += *data++;
-			b += a;
-		}
-		while (--tlen);
-
-		a = (a & 0xffff) + (a >> 16) * (65536 - MOD_ADLER);
-		b = (b & 0xffff) + (b >> 16) * (65536 - MOD_ADLER);
-	}
-
-	// It can be shown that a <= 0x1013a here, so a single subtract will do.
-	if (a >= MOD_ADLER)
-	{
-		a -= MOD_ADLER;
-	}
-
-	// It can be shown that b can reach 0xfff87 here.
-	b = (b & 0xffff) + (b >> 16) * (65536 - MOD_ADLER);
-
-	if (b >= MOD_ADLER)
-	{
-		b -= MOD_ADLER;
-	}
-
-	return((b << 16) | a);
-}
-
-// Stupid hash - but can't go back now :)
-// Don't use for new things. At least it's reasonably fast.
-u32 HashEctor(const u8* ptr, int length)
-{
-	u32 crc = 0;
-
-	for (int i = 0; i < length; i++)
-	{
-		crc ^= ptr[i];
-		crc = (crc << 3) | (crc >> 29);
-	}
-
-	return(crc);
-}
-
-
-#ifdef _M_X64
-
-//-----------------------------------------------------------------------------
-// Block read - if your platform needs to do endian-swapping or can only
-// handle aligned reads, do the conversion here
-
-inline u64 getblock(const u64 * p, int i)
-{
-	return p[i];
-}
-
-//----------
-// Block mix - combine the key bits with the hash bits and scramble everything
-
-inline void bmix64(u64 & h1, u64 & h2, u64 & k1, u64 & k2, u64 & c1, u64 & c2)
-{
-	k1 *= c1; 
-	k1  = _rotl64(k1,23); 
-	k1 *= c2;
-	h1 ^= k1;
-	h1 += h2;
-
-	h2 = _rotl64(h2,41);
-
-	k2 *= c2; 
-	k2  = _rotl64(k2,23);
-	k2 *= c1;
-	h2 ^= k2;
-	h2 += h1;
-
-	h1 = h1*3+0x52dce729;
-	h2 = h2*3+0x38495ab5;
-
-	c1 = c1*5+0x7b7d159c;
-	c2 = c2*5+0x6bce6396;
-}
-
-//----------
-// Finalization mix - avalanches all bits to within 0.05% bias
-
-inline u64 fmix64(u64 k)
-{
-	k ^= k >> 33;
-	k *= 0xff51afd7ed558ccd;
-	k ^= k >> 33;
-	k *= 0xc4ceb9fe1a85ec53;
-	k ^= k >> 33;
-
-	return k;
-}
-
-u64 GetMurmurHash3(const u8 *src, int len, u32 samples)
-{
-	const u8 * data = (const u8*)src;
-	const int nblocks = len / 16;
-	u32 Step = (len / 8);
-	if(samples == 0) samples = max(Step, 1u);
-	Step = Step / samples;
-	if(Step < 1) Step = 1;
-
-	u64 h1 = 0x9368e53c2f6af274;
-	u64 h2 = 0x586dcd208f7cd3fd;
-
-	u64 c1 = 0x87c37b91114253d5;
-	u64 c2 = 0x4cf5ad432745937f;
-
-
-	//----------
-	// body
-
-	const u64 * blocks = (const u64 *)(data);
-
-	for(int i = 0; i < nblocks; i+=Step)
-	{
-		u64 k1 = getblock(blocks,i*2+0);
-		u64 k2 = getblock(blocks,i*2+1);
-
-		bmix64(h1,h2,k1,k2,c1,c2);
-	}
-
-	//----------
-	// tail
-
-	const u8 * tail = (const u8*)(data + nblocks*16);
-
-	u64 k1 = 0;
-	u64 k2 = 0;
-
-	switch(len & 15)
-	{
-	case 15: k2 ^= u64(tail[14]) << 48;
-	case 14: k2 ^= u64(tail[13]) << 40;
-	case 13: k2 ^= u64(tail[12]) << 32;
-	case 12: k2 ^= u64(tail[11]) << 24;
-	case 11: k2 ^= u64(tail[10]) << 16;
-	case 10: k2 ^= u64(tail[ 9]) << 8;
-	case  9: k2 ^= u64(tail[ 8]) << 0;
-
-	case  8: k1 ^= u64(tail[ 7]) << 56;
-	case  7: k1 ^= u64(tail[ 6]) << 48;
-	case  6: k1 ^= u64(tail[ 5]) << 40;
-	case  5: k1 ^= u64(tail[ 4]) << 32;
-	case  4: k1 ^= u64(tail[ 3]) << 24;
-	case  3: k1 ^= u64(tail[ 2]) << 16;
-	case  2: k1 ^= u64(tail[ 1]) << 8;
-	case  1: k1 ^= u64(tail[ 0]) << 0;
-			bmix64(h1,h2,k1,k2,c1,c2);
-	};
-
-	//----------
-	// finalization
-
-	h2 ^= len;
-
-	h1 += h2;
-	h2 += h1;
-
-	h1 = fmix64(h1);
-	h2 = fmix64(h2);
-
-	h1 += h2;
-
-	return h1;
-}
-
-
-// CRC32 hash using the SSE4.2 instruction
-u64 GetCRC32(const u8 *src, int len, u32 samples)
-{
-#if _M_SSE >= 0x402
-	u64 h = len;
-	u32 Step = (len / 8);
-	const u64 *data = (const u64 *)src;
-	const u64 *end = data + Step;
-	if(samples == 0) samples = max(Step, 1u);
-	Step = Step / samples;
-	if(Step < 1) Step = 1;
-	while(data < end)
-	{
-		h = _mm_crc32_u64(h, data[0]);
-		data += Step;
-	}
-
-	const u8 *data2 = (const u8*)end;
-	return _mm_crc32_u64(h, u64(data2[0]));
-#else
-	return 0;
-#endif
-}
-
-
-/* 
- * NOTE: This hash function is used for custom texture loading/dumping, so
- * it should not be changed, which would require all custom textures to be
- * recalculated for their new hash values. If the hashing function is
- * changed, make sure this one is still used when the legacy parameter is
- * true.
- */
-u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
-{
-	const u64 m = 0xc6a4a7935bd1e995;
-	u64 h = len * m;
-	const int r = 47;
-	u32 Step = (len / 8);
-	const u64 *data = (const u64 *)src;
-	const u64 *end = data + Step;
-	if(samples == 0) samples = max(Step, 1u);
-	Step = Step / samples;
-	if(Step < 1) Step = 1;
-	while(data < end)
-	{
-		u64 k = data[0];
-		data+=Step;
-		k *= m;
-		k ^= k >> r; 
-		k *= m;
-		h ^= k;
-		h *= m;
-	}
-
-	const u8 * data2 = (const u8*)end;
-
-	switch(len & 7)
-	{
-	case 7: h ^= u64(data2[6]) << 48;
-	case 6: h ^= u64(data2[5]) << 40;
-	case 5: h ^= u64(data2[4]) << 32;
-	case 4: h ^= u64(data2[3]) << 24;
-	case 3: h ^= u64(data2[2]) << 16;
-	case 2: h ^= u64(data2[1]) << 8;
-	case 1: h ^= u64(data2[0]);
-			h *= m;
-	};
- 
-	h ^= h >> r;
-	h *= m;
-	h ^= h >> r;
-
-	return h;
-} 
-#else
-// CRC32 hash using the SSE4.2 instruction
-u64 GetCRC32(const u8 *src, int len, u32 samples)
-{
-#if _M_SSE >= 0x402
-	u32 h = len;
-	u32 Step = (len/4);
-	const u32 *data = (const u32 *)src;
-	const u32 *end = data + Step;
-	if(samples == 0) samples = max(Step, 1u);
-	Step  = Step / samples;
-	if(Step < 1) Step = 1;
-	while(data < end)
-	{
-		h = _mm_crc32_u32(h, data[0]);
-		data += Step;
-	}
-
-	const u8 *data2 = (const u8*)end;
-	return (u64)_mm_crc32_u32(h, u32(data2[0]));
-#else
-	return 0;
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// Block read - if your platform needs to do endian-swapping or can only
-// handle aligned reads, do the conversion here
-
-inline u32 getblock(const u32 * p, int i)
-{
-	return p[i];
-}
-
-//----------
-// Finalization mix - force all bits of a hash block to avalanche
-
-// avalanches all bits to within 0.25% bias
-
-inline u32 fmix32(u32 h)
-{
-	h ^= h >> 16;
-	h *= 0x85ebca6b;
-	h ^= h >> 13;
-	h *= 0xc2b2ae35;
-	h ^= h >> 16;
-
-	return h;
-}
-
-inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
-{
-	k1 *= c1; 
-	k1  = _rotl(k1,11); 
-	k1 *= c2;
-	h1 ^= k1;
-	h1 += h2;
-
-	h2 = _rotl(h2,17);
-
-	k2 *= c2; 
-	k2  = _rotl(k2,11);
-	k2 *= c1;
-	h2 ^= k2;
-	h2 += h1;
-
-	h1 = h1*3+0x52dce729;
-	h2 = h2*3+0x38495ab5;
-
-	c1 = c1*5+0x7b7d159c;
-	c2 = c2*5+0x6bce6396;
-}
-
-//----------
-
-u64 GetMurmurHash3(const u8* src, int len, u32 samples)
-{
-	const u8 * data = (const u8*)src;
-	u32 out[2];
-	const int nblocks = len / 8;
-	u32 Step = (len / 4);
-	if(samples == 0) samples = max(Step, 1u);
-	Step = Step / samples;
-	if(Step < 1) Step = 1;
-
-	u32 h1 = 0x8de1c3ac;
-	u32 h2 = 0xbab98226;
-
-	u32 c1 = 0x95543787;
-	u32 c2 = 0x2ad7eb25;
-
-	//----------
-	// body
-
-	const u32 * blocks = (const u32 *)(data + nblocks*8);
-
-	for(int i = -nblocks; i < 0; i+=Step)
-	{
-		u32 k1 = getblock(blocks,i*2+0);
-		u32 k2 = getblock(blocks,i*2+1);
-
-		bmix32(h1,h2,k1,k2,c1,c2);
-	}
-
-	//----------
-	// tail
-	
-	const u8 * tail = (const u8*)(data + nblocks*8);
-
-	u32 k1 = 0;
-	u32 k2 = 0;
-
-	switch(len & 7)
-	{
-	case 7: k2 ^= tail[6] << 16;
-	case 6: k2 ^= tail[5] << 8;
-	case 5: k2 ^= tail[4] << 0;
-	case 4: k1 ^= tail[3] << 24;
-	case 3: k1 ^= tail[2] << 16;
-	case 2: k1 ^= tail[1] << 8;
-	case 1: k1 ^= tail[0] << 0;
-	        bmix32(h1,h2,k1,k2,c1,c2);
-	};
-
-	//----------
-	// finalization
-
-	h2 ^= len;
-
-	h1 += h2;
-	h2 += h1;
-
-	h1 = fmix32(h1);
-	h2 = fmix32(h2);
-
-	h1 += h2;
-	h2 += h1;
-
-	out[0] = h1;
-	out[1] = h2;
-	
-	return *((u64 *)&out);
-}
-
-/*
- * FIXME: The old 32-bit version of this hash made different hashes than the
- * 64-bit version. Until someone can make a new version of the 32-bit one that
- * makes identical hashes, this is just a c/p of the 64-bit one.
- */
-u64 GetHashHiresTexture(const u8 *src, int len, u32 samples)
-{
-	const u64 m = 0xc6a4a7935bd1e995ULL;
-	u64 h = len * m;
-	const int r = 47;
-	u32 Step = (len / 8);
-	const u64 *data = (const u64 *)src;
-	const u64 *end = data + Step;
-	if(samples == 0) samples = max(Step, 1u);
-	Step = Step / samples;
-	if(Step < 1) Step = 1;
-	while(data < end)
-	{
-		u64 k = data[0];
-		data+=Step;
-		k *= m; 
-		k ^= k >> r; 
-		k *= m;
-		h ^= k;
-		h *= m; 
-	}
-
-	const u8 * data2 = (const u8*)end;
-
-	switch(len & 7)
-	{
-	case 7: h ^= u64(data2[6]) << 48;
-	case 6: h ^= u64(data2[5]) << 40;
-	case 5: h ^= u64(data2[4]) << 32;
-	case 4: h ^= u64(data2[3]) << 24;
-	case 3: h ^= u64(data2[2]) << 16;
-	case 2: h ^= u64(data2[1]) << 8;
-	case 1: h ^= u64(data2[0]);
-			h *= m;
-	};
- 
-	h ^= h >> r;
-	h *= m;
-	h ^= h >> r;
-
-	return h;
-}
-#endif
-
-u64 GetHash64(const u8 *src, int len, u32 samples)
-{
-	return ptrHashFunction(src, len, samples);
-}
-
-// sets the hash function used for the texture cache
-void SetHash64Function(bool useHiresTextures)
-{
-	if (useHiresTextures)
-	{
-		ptrHashFunction = &GetHashHiresTexture;
-	}
-#if _M_SSE >= 0x402
-	else if (cpu_info.bSSE4_2 && !useHiresTextures) // sse crc32 version
-	{
-		ptrHashFunction = &GetCRC32;
-	}
-#endif
-	else
-	{
-		ptrHashFunction = &GetMurmurHash3;
-	}
-}
-
-
-
diff --git a/Source/Core/Common/Src/Hash.h b/Source/Core/Common/Src/Hash.h
deleted file mode 100644
index 8bf76cbe88..0000000000
--- a/Source/Core/Common/Src/Hash.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _HASH_H_
-#define _HASH_H_
-
-#include "Common.h"
-
-u32 HashFletcher(const u8* data_u8, size_t length);  // FAST. Length & 1 == 0.
-u32 HashAdler32(const u8* data, size_t len);         // Fairly accurate, slightly slower
-u32 HashFNV(const u8* ptr, int length);              // Another fast and decent hash
-u32 HashEctor(const u8* ptr, int length);            // JUNK. DO NOT USE FOR NEW THINGS
-u64 GetCRC32(const u8 *src, int len, u32 samples); // SSE4.2 version of CRC32
-u64 GetHashHiresTexture(const u8 *src, int len, u32 samples);
-u64 GetMurmurHash3(const u8 *src, int len, u32 samples);
-u64 GetHash64(const u8 *src, int len, u32 samples);
-void SetHash64Function(bool useHiresTextures);
-#endif // _HASH_H_
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp
deleted file mode 100644
index a86e101b01..0000000000
--- a/Source/Core/Common/Src/IniFile.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// see IniFile.h
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <string>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "IniFile.h"
-
-namespace {
-
-void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut)
-{
-	if (line[0] == '#')
-		return;
-
-	int FirstEquals = (int)line.find("=", 0);
-
-	if (FirstEquals >= 0)
-	{
-		// Yes, a valid line!
-		*keyOut = StripSpaces(line.substr(0, FirstEquals));
-		if (valueOut) *valueOut = StripQuotes(StripSpaces(line.substr(FirstEquals + 1, std::string::npos)));
-	}
-}
-
-}
-
-void IniFile::Section::Set(const char* key, const char* newValue)
-{
-	auto it = values.find(key);
-	if (it != values.end())
-		it->second = newValue;
-	else
-	{
-		values[key] = newValue;
-		keys_order.push_back(key);
-	}
-}
-
-void IniFile::Section::Set(const char* key, const std::string& newValue, const std::string& defaultValue)
-{
-	if (newValue != defaultValue)
-		Set(key, newValue);
-	else
-		Delete(key);
-}
-
-void IniFile::Section::Set(const char* key, const float newValue, const float defaultValue)
-{
-	if (newValue != defaultValue)
-		Set(key, newValue);
-	else
-		Delete(key);
-}
-
-void IniFile::Section::Set(const char* key, int newValue, int defaultValue)
-{
-	if (newValue != defaultValue)
-		Set(key, newValue);
-	else
-		Delete(key);
-}
-
-void IniFile::Section::Set(const char* key, bool newValue, bool defaultValue)
-{
-	if (newValue != defaultValue)
-		Set(key, newValue);
-	else
-		Delete(key);
-}
-
-void IniFile::Section::Set(const char* key, const std::vector<std::string>& newValues) 
-{
-	std::string temp;
-	// Join the strings with , 
-	std::vector<std::string>::const_iterator it;
-	for (it = newValues.begin(); it != newValues.end(); ++it)
-	{
-		temp = (*it) + ",";
-	}
-	// remove last ,
-	temp.resize(temp.length() - 1);
-	Set(key, temp.c_str());
-}
-
-bool IniFile::Section::Get(const char* key, std::string* value, const char* defaultValue)
-{
-	auto it = values.find(key);
-	if (it != values.end())
-	{
-		*value = it->second;
-		return true;
-	}
-	else if (defaultValue)
-	{
-		*value = defaultValue;
-		return true;
-	}
-	else
-		return false;
-}
-
-bool IniFile::Section::Get(const char* key, std::vector<std::string>& out)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (!retval || temp.empty())
-	{
-		return false;
-	}
-	// ignore starting , if any
-	size_t subStart = temp.find_first_not_of(",");
-	size_t subEnd;
-
-	// split by , 
-	while (subStart != std::string::npos) {
-		
-		// Find next , 
-		subEnd = temp.find_first_of(",", subStart);
-		if (subStart != subEnd) 
-			// take from first char until next , 
-			out.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
-	
-		// Find the next non , char
-		subStart = temp.find_first_not_of(",", subEnd);
-	} 
-	
-	return true;
-}
-
-bool IniFile::Section::Get(const char* key, int* value, int defaultValue)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (retval && TryParse(temp.c_str(), value))
-		return true;
-	*value = defaultValue;
-	return false;
-}
-
-bool IniFile::Section::Get(const char* key, u32* value, u32 defaultValue)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (retval && TryParse(temp, value))
-		return true;
-	*value = defaultValue;
-	return false;
-}
-
-bool IniFile::Section::Get(const char* key, bool* value, bool defaultValue)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (retval && TryParse(temp.c_str(), value))
-		return true;
-	*value = defaultValue;
-	return false;
-}
-
-bool IniFile::Section::Get(const char* key, float* value, float defaultValue)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (retval && TryParse(temp.c_str(), value))
-		return true;
-	*value = defaultValue;
-	return false;
-}
-
-bool IniFile::Section::Get(const char* key, double* value, double defaultValue)
-{
-	std::string temp;
-	bool retval = Get(key, &temp, 0);
-	if (retval && TryParse(temp.c_str(), value))
-		return true;
-	*value = defaultValue;
-	return false;
-}
-
-bool IniFile::Section::Exists(const char *key) const
-{
-	return values.find(key) != values.end();
-}
-
-bool IniFile::Section::Delete(const char *key)
-{
-	auto it = values.find(key);
-	if (it == values.end())
-		return false;
-
-	values.erase(it);
-	keys_order.erase(std::find(keys_order.begin(), keys_order.end(), key));
-	return true;
-}
-
-// IniFile
-
-const IniFile::Section* IniFile::GetSection(const char* sectionName) const
-{
-	for (std::vector<Section>::const_iterator iter = sections.begin(); iter != sections.end(); ++iter)
-		if (!strcasecmp(iter->name.c_str(), sectionName))
-			return (&(*iter));
-	return 0;
-}
-
-IniFile::Section* IniFile::GetSection(const char* sectionName)
-{
-	for (std::vector<Section>::iterator iter = sections.begin(); iter != sections.end(); ++iter)
-		if (!strcasecmp(iter->name.c_str(), sectionName))
-			return (&(*iter));
-	return 0;
-}
-
-IniFile::Section* IniFile::GetOrCreateSection(const char* sectionName)
-{
-	Section* section = GetSection(sectionName);
-	if (!section)
-	{
-		sections.push_back(Section(sectionName));
-		section = &sections[sections.size() - 1];
-	}
-	return section;
-}
-
-bool IniFile::DeleteSection(const char* sectionName)
-{
-	Section* s = GetSection(sectionName);
-	if (!s)
-		return false;
-	for (std::vector<Section>::iterator iter = sections.begin(); iter != sections.end(); ++iter)
-	{
-		if (&(*iter) == s)
-		{
-			sections.erase(iter);
-			return true;
-		}
-	}
-	return false;
-}
-
-bool IniFile::Exists(const char* sectionName, const char* key) const
-{
-	const Section* section = GetSection(sectionName);
-	if (!section)
-		return false;
-	return section->Exists(key);
-}
-
-void IniFile::SetLines(const char* sectionName, const std::vector<std::string> &lines)
-{
-	Section* section = GetOrCreateSection(sectionName);
-	section->lines = lines;
-}
-
-bool IniFile::DeleteKey(const char* sectionName, const char* key)
-{
-	Section* section = GetSection(sectionName);
-	if (!section)
-		return false;
-	return section->Delete(key);
-}
-
-// Return a list of all keys in a section
-bool IniFile::GetKeys(const char* sectionName, std::vector<std::string>& keys) const
-{
-	const Section* section = GetSection(sectionName);
-	if (!section)
-		return false;
-	keys = section->keys_order;
-	return true;
-}
-
-// Return a list of all lines in a section
-bool IniFile::GetLines(const char* sectionName, std::vector<std::string>& lines, const bool remove_comments) const
-{
-	const Section* section = GetSection(sectionName);
-	if (!section)
-		return false;
-
-	lines.clear();
-	for (std::vector<std::string>::const_iterator iter = section->lines.begin(); iter != section->lines.end(); ++iter)
-	{
-		std::string line = StripSpaces(*iter);
-
-		if (remove_comments)
-		{
-			int commentPos = (int)line.find('#');
-			if (commentPos == 0)
-			{
-				continue;
-			}
-
-			if (commentPos != (int)std::string::npos)
-			{
-				line = StripSpaces(line.substr(0, commentPos));
-			}
-		}
-
-		lines.push_back(line);
-	}
-
-	return true;
-}
-
-
-void IniFile::SortSections()
-{
-	std::sort(sections.begin(), sections.end());
-}
-
-bool IniFile::Load(const char* filename, bool keep_current_data)
-{
-	// Maximum number of letters in a line
-	static const int MAX_BYTES = 1024*32;
-
-	if (!keep_current_data)
-		sections.clear();
-	// first section consists of the comments before the first real section
-
-	// Open file
-	std::ifstream in;
-	OpenFStream(in, filename, std::ios::in);
-
-	if (in.fail()) return false;
-
-	Section* current_section = NULL;
-	while (!in.eof())
-	{
-		char templine[MAX_BYTES];
-		in.getline(templine, MAX_BYTES);
-		std::string line = templine;
-
-#ifndef _WIN32
-		// Check for CRLF eol and convert it to LF
-		if (!line.empty() && line.at(line.size()-1) == '\r')
-		{
-			line.erase(line.size()-1);
-		}
-#endif
-
-		if (line.size() > 0)
-		{
-			if (line[0] == '[')
-			{
-				size_t endpos = line.find("]");
-
-				if (endpos != std::string::npos)
-				{
-					// New section!
-					std::string sub = line.substr(1, endpos - 1);
-					current_section = GetOrCreateSection(sub.c_str());
-				}
-			}
-			else
-			{
-				if (current_section)
-				{
-					std::string key, value;
-					ParseLine(line, &key, &value);
-
-					// Lines starting with '$', '*' or '+' are kept verbatim.
-					// Kind of a hack, but the support for raw lines inside an
-					// INI is a hack anyway.
-					if ((key == "" && value == "")
-					        || (line.size() >= 1 && (line[0] == '$' || line[0] == '+' || line[0] == '*')))
-						current_section->lines.push_back(line.c_str());
-					else
-						current_section->Set(key, value.c_str());
-				}
-			}
-		}
-	}
-
-	in.close();
-	return true;
-}
-
-bool IniFile::Save(const char* filename)
-{
-	std::ofstream out;
-	OpenFStream(out, filename, std::ios::out);
-
-	if (out.fail())
-	{
-		return false;
-	}
-
-	for (auto iter = sections.begin(); iter != sections.end(); ++iter)
-	{
-		const Section& section = *iter;
-
-		if (section.keys_order.size() != 0 || section.lines.size() != 0)
-			out << "[" << section.name << "]" << std::endl;
-
-		if (section.keys_order.size() == 0)
-		{
-			for (auto liter = section.lines.begin(); liter != section.lines.end(); ++liter)
-			{
-				std::string s = *liter;
-				out << s << std::endl;
-			}
-		}
-		else
-		{
-			for (auto kvit = section.keys_order.begin(); kvit != section.keys_order.end(); ++kvit)
-			{
-				auto pair = section.values.find(*kvit);
-				out << pair->first << " = " << pair->second << std::endl;
-			}
-		}
-	}
-
-	out.close();
-
-	return true;
-}
-
-
-bool IniFile::Get(const char* sectionName, const char* key, std::string* value, const char* defaultValue)
-{
-	Section* section = GetSection(sectionName);
-	if (!section) {
-		if (defaultValue) {
-			*value = defaultValue;
-		}
-		return false;
-	}
-	return section->Get(key, value, defaultValue);
-}
-
-bool IniFile::Get(const char *sectionName, const char* key, std::vector<std::string>& values) 
-{
-	Section *section = GetSection(sectionName);
-	if (!section)
-		return false;
-	return section->Get(key, values);
-}
-
-bool IniFile::Get(const char* sectionName, const char* key, int* value, int defaultValue)
-{
-	Section *section = GetSection(sectionName);
-	if (!section) {
-		*value = defaultValue;
-		return false;
-	} else {
-		return section->Get(key, value, defaultValue);
-	}
-}
-
-bool IniFile::Get(const char* sectionName, const char* key, u32* value, u32 defaultValue)
-{
-	Section *section = GetSection(sectionName);
-	if (!section) {
-		*value = defaultValue;
-		return false;
-	} else {
-		return section->Get(key, value, defaultValue);
-	}
-}
-
-bool IniFile::Get(const char* sectionName, const char* key, bool* value, bool defaultValue)
-{
-	Section *section = GetSection(sectionName);
-	if (!section) {
-		*value = defaultValue;
-		return false;
-	} else {
-		return section->Get(key, value, defaultValue);
-	}
-}
-
-
-// Unit test. TODO: Move to the real unit test framework.
-/*
-   int main()
-   {
-    IniFile ini;
-    ini.Load("my.ini");
-    ini.Set("Hej", "A", "amaskdfl");
-    ini.Set("Mossa", "A", "amaskdfl");
-    ini.Set("Aissa", "A", "amaskdfl");
-    //ini.Read("my.ini");
-    std::string x;
-    ini.Get("Hej", "B", &x, "boo");
-    ini.DeleteKey("Mossa", "A");
-    ini.DeleteSection("Mossa");
-    ini.SortSections();
-    ini.Save("my.ini");
-    //UpdateVars(ini);
-    return 0;
-   }
- */
diff --git a/Source/Core/Common/Src/IniFile.h b/Source/Core/Common/Src/IniFile.h
deleted file mode 100644
index 0cf4ab902b..0000000000
--- a/Source/Core/Common/Src/IniFile.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _INIFILE_H_
-#define _INIFILE_H_
-
-#include <map>
-#include <string>
-#include <set>
-#include <vector>
-
-#include "StringUtil.h"
-
-struct CaseInsensitiveStringCompare
-{
-	bool operator() (const std::string& a, const std::string& b) const
-	{
-		return strcasecmp(a.c_str(), b.c_str()) < 0;
-	}
-};
-
-class IniFile
-{
-public:
-	class Section
-	{
-		friend class IniFile;
-
-	public:
-		Section() {}
-		Section(const std::string& _name) : name(_name) {}
-
-		bool Exists(const char *key) const;
-		bool Delete(const char *key);
-
-		void Set(const char* key, const char* newValue);
-		void Set(const char* key, const std::string& newValue, const std::string& defaultValue);
-
-		void Set(const std::string &key, const std::string &value) {
-			Set(key.c_str(), value.c_str());
-		}
-		bool Get(const char* key, std::string* value, const char* defaultValue);
-
-		void Set(const char* key, u32 newValue) {
-			Set(key, StringFromFormat("0x%08x", newValue).c_str());
-		}
-		void Set(const char* key, float newValue) {
-			Set(key, StringFromFormat("%f", newValue).c_str());
-		}
-		void Set(const char* key, const float newValue, const float defaultValue);
-		void Set(const char* key, double newValue) {
-			Set(key, StringFromFormat("%f", newValue).c_str());
-		}
-		
-		void Set(const char* key, int newValue, int defaultValue);
-		void Set(const char* key, int newValue) {
-			Set(key, StringFromInt(newValue).c_str());
-		}
-		
-		void Set(const char* key, bool newValue, bool defaultValue);
-		void Set(const char* key, bool newValue) {
-			Set(key, StringFromBool(newValue).c_str());
-		}
-		void Set(const char* key, const std::vector<std::string>& newValues);
-
-		bool Get(const char* key, int* value, int defaultValue = 0);
-		bool Get(const char* key, u32* value, u32 defaultValue = 0);
-		bool Get(const char* key, bool* value, bool defaultValue = false);
-		bool Get(const char* key, float* value, float defaultValue = false);
-		bool Get(const char* key, double* value, double defaultValue = false);
-		bool Get(const char* key, std::vector<std::string>& values);
-
-		bool operator < (const Section& other) const {
-			return name < other.name;
-		}
-
-	protected:
-		std::string name;
-
-		std::vector<std::string> keys_order;
-		std::map<std::string, std::string, CaseInsensitiveStringCompare> values;
-
-		std::vector<std::string> lines;
-	};
-
-	/**
-	 * Loads sections and keys.
-	 * @param filename filename of the ini file which should be loaded
-	 * @param keep_current_data If true, "extends" the currently loaded list of sections and keys with the loaded data (and replaces existing entries). If false, existing data will be erased.
-	 * @warning Using any other operations than "Get*" and "Exists" is untested and will behave unexpectedly
-	 * @todo This really is just a hack to support having two levels of gameinis (defaults and user-specified) and should eventually be replaced with a less stupid system.
-	 */
-	bool Load(const char* filename, bool keep_current_data = false);
-	bool Load(const std::string &filename, bool keep_current_data = false) { return Load(filename.c_str(), keep_current_data); }
-
-	bool Save(const char* filename);
-	bool Save(const std::string &filename) { return Save(filename.c_str()); }
-
-	// Returns true if key exists in section
-	bool Exists(const char* sectionName, const char* key) const;
-
-	// TODO: Get rid of these, in favor of the Section ones.
-	void Set(const char* sectionName, const char* key, const char* newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const char* sectionName, const char* key, const std::string& newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue.c_str());
-	}
-	void Set(const char* sectionName, const char* key, int newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const char* sectionName, const char* key, u32 newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const char* sectionName, const char* key, bool newValue) {
-		GetOrCreateSection(sectionName)->Set(key, newValue);
-	}
-	void Set(const char* sectionName, const char* key, const std::vector<std::string>& newValues) {
-		GetOrCreateSection(sectionName)->Set(key, newValues);
-	}
-
-	// TODO: Get rid of these, in favor of the Section ones.
-	bool Get(const char* sectionName, const char* key, std::string* value, const char* defaultValue = "");
-	bool Get(const char* sectionName, const char* key, int* value, int defaultValue = 0);
-	bool Get(const char* sectionName, const char* key, u32* value, u32 defaultValue = 0);
-	bool Get(const char* sectionName, const char* key, bool* value, bool defaultValue = false);
-	bool Get(const char* sectionName, const char* key, std::vector<std::string>& values);
-
-	template<typename T> bool GetIfExists(const char* sectionName, const char* key, T value)
-	{
-		if (Exists(sectionName, key))
-			return Get(sectionName, key, value);
-		return false;
-	}
-
-	bool GetKeys(const char* sectionName, std::vector<std::string>& keys) const;
-
-	void SetLines(const char* sectionName, const std::vector<std::string> &lines);
-	bool GetLines(const char* sectionName, std::vector<std::string>& lines, const bool remove_comments = true) const;
-
-	bool DeleteKey(const char* sectionName, const char* key);
-	bool DeleteSection(const char* sectionName);
-
-	void SortSections();
-
-	Section* GetOrCreateSection(const char* section);
-
-private:
-	std::vector<Section> sections;
-
-	const Section* GetSection(const char* section) const;
-	Section* GetSection(const char* section);
-	std::string* GetLine(const char* section, const char* key);
-	void CreateSection(const char* section);
-};
-
-#endif // _INIFILE_H_
diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
deleted file mode 100644
index 8691a825f8..0000000000
--- a/Source/Core/Common/Src/Log.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LOG_H_
-#define _LOG_H_
-
-#define	NOTICE_LEVEL  1  // VERY important information that is NOT errors. Like startup and OSReports.
-#define	ERROR_LEVEL   2  // Critical errors 
-#define	WARNING_LEVEL 3  // Something is suspicious.
-#define	INFO_LEVEL    4  // General information.
-#define	DEBUG_LEVEL   5  // Detailed debugging - might make things slow.
-
-namespace LogTypes
-{
-
-enum LOG_TYPE {
-	ACTIONREPLAY,
-	AUDIO,
-	AUDIO_INTERFACE,
-	BOOT,
-	COMMANDPROCESSOR,
-	COMMON,
-	CONSOLE,
-	DISCIO,
-	FILEMON,
-	DSPHLE,
-	DSPLLE,
-	DSP_MAIL,
-	DSPINTERFACE,
-	DVDINTERFACE,
-	DYNA_REC,
-	EXPANSIONINTERFACE,
-	GDB_STUB,
-	POWERPC,
-	GPFIFO,
-	OSHLE,
-	MASTER_LOG,
-	MEMMAP,
-	MEMCARD_MANAGER,
-	OSREPORT,
-	PAD, 
-	PROCESSORINTERFACE,
-	PIXELENGINE,
-	SERIALINTERFACE,
-	SP1,
-	STREAMINGINTERFACE,
-	VIDEO,
-	VIDEOINTERFACE,
-	WII_IOB,
-	WII_IPC,
-	WII_IPC_DVD,
-	WII_IPC_ES,
-	WII_IPC_FILEIO,
-	WII_IPC_HID,
-	WII_IPC_HLE,
-	WII_IPC_NET,
-	WII_IPC_WC24,
-	WII_IPC_SSL,
-	WII_IPC_SD,
-	WII_IPC_STM,
-	WII_IPC_WIIMOTE,
-	WIIMOTE,
-	NETPLAY,
-
-	NUMBER_OF_LOGS // Must be last
-};
-
-// FIXME: should this be removed?
-enum LOG_LEVELS {
-	LNOTICE = NOTICE_LEVEL,
-	LERROR = ERROR_LEVEL,
-	LWARNING = WARNING_LEVEL,
-	LINFO = INFO_LEVEL,
-	LDEBUG = DEBUG_LEVEL,
-};
-
-#define LOGTYPES_LEVELS LogTypes::LOG_LEVELS
-#define LOGTYPES_TYPE LogTypes::LOG_TYPE
-
-}  // namespace
-
-void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
-		const char *file, int line, const char *fmt, ...)
-#ifdef __GNUC__
-		__attribute__((format(printf, 5, 6)))
-#endif
-		;
-
-#if defined LOGGING || defined _DEBUG || defined DEBUGFAST
-#define MAX_LOGLEVEL DEBUG_LEVEL
-#else
-#ifndef MAX_LOGLEVEL
-#define MAX_LOGLEVEL WARNING_LEVEL
-#endif // loglevel
-#endif // logging
-
-#ifdef GEKKO
-#define GENERIC_LOG(t, v, ...)
-#else
-// Let the compiler optimize this out
-#define GENERIC_LOG(t, v, ...) { \
-	if (v <= MAX_LOGLEVEL) \
-		GenericLog(v, t, __FILE__, __LINE__, __VA_ARGS__); \
-	}
-#endif
-
-#define ERROR_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } while (0)
-#define WARN_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } while (0)
-#define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0)
-#define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0)
-#define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0)
-
-#if MAX_LOGLEVEL >= DEBUG_LEVEL
-#define _dbg_assert_(_t_, _a_) \
-	if (!(_a_)) {\
-		ERROR_LOG(_t_, "Error...\n\n  Line: %d\n  File: %s\n  Time: %s\n\nIgnore and continue?", \
-					   __LINE__, __FILE__, __TIME__); \
-		if (!PanicYesNo("*** Assertion (see log)***\n")) {Crash();} \
-	}
-#define _dbg_assert_msg_(_t_, _a_, ...)\
-	if (!(_a_)) {\
-		ERROR_LOG(_t_, __VA_ARGS__); \
-		if (!PanicYesNo(__VA_ARGS__)) {Crash();} \
-	}
-#define _dbg_update_() Host_UpdateLogDisplay();
-
-#else // not debug
-#define _dbg_update_() ;
-
-#ifndef _dbg_assert_
-#define _dbg_assert_(_t_, _a_) {}
-#define _dbg_assert_msg_(_t_, _a_, _desc_, ...) {}
-#endif // dbg_assert
-#endif // MAX_LOGLEVEL DEBUG
-
-#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
-
-#ifndef GEKKO
-#ifdef _WIN32
-#define _assert_msg_(_t_, _a_, _fmt_, ...)		\
-	if (!(_a_)) {\
-		if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \
-	}
-#else // not win32
-#define _assert_msg_(_t_, _a_, _fmt_, ...)		\
-	if (!(_a_)) {\
-		if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \
-	}
-#endif // WIN32
-#else // GEKKO
-#define _assert_msg_(_t_, _a_, _fmt_, ...)
-#endif
-
-#endif // _LOG_H_
diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
deleted file mode 100644
index 60f649b373..0000000000
--- a/Source/Core/Common/Src/LogManager.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-
-#ifdef ANDROID
-#include "Host.h"
-#endif
-#include "LogManager.h"
-#include "ConsoleListener.h"
-#include "Timer.h"
-#include "Thread.h"
-#include "FileUtil.h"
-
-void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
-		const char *file, int line, const char* fmt, ...)
-{
-	va_list args;
-	va_start(args, fmt);
-	if (LogManager::GetInstance())
-		LogManager::GetInstance()->Log(level, type,
-			file, line, fmt, args);
-	va_end(args);
-}
-
-LogManager *LogManager::m_logManager = NULL;
-
-LogManager::LogManager()
-{
-	// create log files
-	m_Log[LogTypes::MASTER_LOG]			= new LogContainer("*",				"Master Log");
-	m_Log[LogTypes::BOOT]				= new LogContainer("BOOT",			"Boot");
-	m_Log[LogTypes::COMMON]				= new LogContainer("COMMON",		"Common");
-	m_Log[LogTypes::DISCIO]				= new LogContainer("DIO",			"Disc IO");
-	m_Log[LogTypes::FILEMON]			= new LogContainer("FileMon",		"File Monitor");
-	m_Log[LogTypes::PAD]				= new LogContainer("PAD",			"Pad");
-	m_Log[LogTypes::PIXELENGINE]		= new LogContainer("PE",			"PixelEngine");
-	m_Log[LogTypes::COMMANDPROCESSOR]	= new LogContainer("CP",			"CommandProc");
-	m_Log[LogTypes::VIDEOINTERFACE]		= new LogContainer("VI",			"VideoInt");
-	m_Log[LogTypes::SERIALINTERFACE]	= new LogContainer("SI",			"SerialInt");
-	m_Log[LogTypes::PROCESSORINTERFACE]	= new LogContainer("PI",			"ProcessorInt");
-	m_Log[LogTypes::MEMMAP]				= new LogContainer("MI",			"MI & memmap");
-	m_Log[LogTypes::SP1]				= new LogContainer("SP1",			"Serial Port 1");
-	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",		"StreamingInt");
-	m_Log[LogTypes::DSPINTERFACE]		= new LogContainer("DSP",			"DSPInterface");
-	m_Log[LogTypes::DVDINTERFACE]		= new LogContainer("DVD",			"DVDInterface");
-	m_Log[LogTypes::GPFIFO]				= new LogContainer("GP",			"GPFifo");
-	m_Log[LogTypes::EXPANSIONINTERFACE]	= new LogContainer("EXI",			"ExpansionInt");
-	m_Log[LogTypes::GDB_STUB]			= new LogContainer("GDB_STUB",		"GDB Stub");
-	m_Log[LogTypes::AUDIO_INTERFACE]	= new LogContainer("AI",			"AudioInt");
-	m_Log[LogTypes::POWERPC]			= new LogContainer("PowerPC",		"IBM CPU");
-	m_Log[LogTypes::OSHLE]				= new LogContainer("HLE",			"HLE");
-	m_Log[LogTypes::DSPHLE]				= new LogContainer("DSPHLE",		"DSP HLE");
-	m_Log[LogTypes::DSPLLE]				= new LogContainer("DSPLLE",		"DSP LLE");
-	m_Log[LogTypes::DSP_MAIL]			= new LogContainer("DSPMails",		"DSP Mails");
-	m_Log[LogTypes::VIDEO]				= new LogContainer("Video",			"Video Backend");
-	m_Log[LogTypes::AUDIO]				= new LogContainer("Audio",			"Audio Emulator");
-	m_Log[LogTypes::DYNA_REC]			= new LogContainer("JIT",			"Dynamic Recompiler");
-	m_Log[LogTypes::CONSOLE]			= new LogContainer("CONSOLE",		"Dolphin Console");
-	m_Log[LogTypes::OSREPORT]			= new LogContainer("OSREPORT",		"OSReport");
-	m_Log[LogTypes::WIIMOTE]			= new LogContainer("Wiimote",		"Wiimote");
-	m_Log[LogTypes::WII_IOB]			= new LogContainer("WII_IOB",		"WII IO Bridge");
-	m_Log[LogTypes::WII_IPC]			= new LogContainer("WII_IPC",		"WII IPC");
-	m_Log[LogTypes::WII_IPC_HID]		= new LogContainer("WII_IPC_HID",	"WII IPC HID");
-	m_Log[LogTypes::WII_IPC_HLE]		= new LogContainer("WII_IPC_HLE",	"WII IPC HLE");
-	m_Log[LogTypes::WII_IPC_DVD]		= new LogContainer("WII_IPC_DVD",	"WII IPC DVD");
-	m_Log[LogTypes::WII_IPC_ES]			= new LogContainer("WII_IPC_ES",	"WII IPC ES");
-	m_Log[LogTypes::WII_IPC_FILEIO]		= new LogContainer("WII_IPC_FILEIO","WII IPC FILEIO");
-	m_Log[LogTypes::WII_IPC_SD]			= new LogContainer("WII_IPC_SD",	"WII IPC SD");
-	m_Log[LogTypes::WII_IPC_STM]		= new LogContainer("WII_IPC_STM",	"WII IPC STM");
-	m_Log[LogTypes::WII_IPC_NET]		= new LogContainer("WII_IPC_NET",	"WII IPC NET");
-	m_Log[LogTypes::WII_IPC_WC24]		= new LogContainer("WII_IPC_WC24",	"WII IPC WC24");
-	m_Log[LogTypes::WII_IPC_SSL]		= new LogContainer("WII_IPC_SSL",	"WII IPC SSL");
-	m_Log[LogTypes::WII_IPC_WIIMOTE]	= new LogContainer("WII_IPC_WIIMOTE","WII IPC WIIMOTE");
-	m_Log[LogTypes::ACTIONREPLAY]		= new LogContainer("ActionReplay",	"ActionReplay");
-	m_Log[LogTypes::MEMCARD_MANAGER]	= new LogContainer("MemCard Manager", "MemCard Manager");
-	m_Log[LogTypes::NETPLAY]			= new LogContainer("NETPLAY",		"Netplay");
-
-	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str());
-	m_consoleLog = new ConsoleListener();
-	m_debuggerLog = new DebuggerLogListener();
-
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_Log[i]->SetEnable(true);
-		m_Log[i]->AddListener(m_fileLog);
-		m_Log[i]->AddListener(m_consoleLog);
-#ifdef _MSC_VER
-		if (IsDebuggerPresent())
-			m_Log[i]->AddListener(m_debuggerLog);
-#endif
-	}
-}
-
-LogManager::~LogManager()
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_fileLog);
-		m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_consoleLog);
-		m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_debuggerLog);
-	}
-
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-		delete m_Log[i];
-
-	delete m_fileLog;
-	delete m_consoleLog;
-	delete m_debuggerLog;
-}
-
-void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
-	const char *file, int line, const char *format, va_list args)
-{
-	char temp[MAX_MSGLEN];
-	char msg[MAX_MSGLEN * 2];
-	LogContainer *log = m_Log[type];
-
-	if (!log->IsEnabled() || level > log->GetLevel() || ! log->HasListeners())
-		return;
-
-	CharArrayFromFormatV(temp, MAX_MSGLEN, format, args);
-
-	static const char level_to_char[7] = "-NEWID";
-	sprintf(msg, "%s %s:%u %c[%s]: %s\n",
-		Common::Timer::GetTimeFormatted().c_str(),
-		file, line, level_to_char[(int)level],
-		log->GetShortName(), temp);
-#ifdef ANDROID
-	Host_SysMessage(msg);	
-#endif
-	log->Trigger(level, msg);
-}
-
-void LogManager::Init()
-{
-	m_logManager = new LogManager();
-}
-
-void LogManager::Shutdown()
-{
-	delete m_logManager;
-	m_logManager = NULL;
-}
-
-LogContainer::LogContainer(const char* shortName, const char* fullName, bool enable)
-	: m_enable(enable)
-{
-	strncpy(m_fullName, fullName, 128);
-	strncpy(m_shortName, shortName, 32);
-	m_level = LogTypes::LWARNING;
-}
-
-// LogContainer
-void LogContainer::AddListener(LogListener *listener)
-{
-	std::lock_guard<std::mutex> lk(m_listeners_lock);
-	m_listeners.insert(listener);
-}
-
-void LogContainer::RemoveListener(LogListener *listener)
-{
-	std::lock_guard<std::mutex> lk(m_listeners_lock);
-	m_listeners.erase(listener);
-}
-
-void LogContainer::Trigger(LogTypes::LOG_LEVELS level, const char *msg)
-{
-	std::lock_guard<std::mutex> lk(m_listeners_lock);
-
-	std::set<LogListener*>::const_iterator i;
-	for (i = m_listeners.begin(); i != m_listeners.end(); ++i)
-	{
-		(*i)->Log(level, msg);
-	}
-}
-
-FileLogListener::FileLogListener(const char *filename)
-{
-	OpenFStream(m_logfile, filename, std::ios::app);
-	SetEnable(true);
-}
-
-void FileLogListener::Log(LogTypes::LOG_LEVELS, const char *msg)
-{
-	if (!IsEnabled() || !IsValid())
-		return;
-
-	std::lock_guard<std::mutex> lk(m_log_lock);
-	m_logfile << msg << std::flush;
-}
-
-void DebuggerLogListener::Log(LogTypes::LOG_LEVELS, const char *msg)
-{
-#if _MSC_VER
-	::OutputDebugStringA(msg);
-#endif
-}
diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h
deleted file mode 100644
index 120d7b5f98..0000000000
--- a/Source/Core/Common/Src/LogManager.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LOGMANAGER_H_
-#define _LOGMANAGER_H_
-
-#include "Log.h"
-#include "StringUtil.h"
-#include "Thread.h"
-#include "FileUtil.h"
-
-#include <set>
-#include <string.h>
-
-#define MAX_MESSAGES 8000
-#define MAX_MSGLEN  1024
-
-
-// pure virtual interface
-class LogListener
-{
-public:
-	virtual ~LogListener() {}
-
-	virtual void Log(LogTypes::LOG_LEVELS, const char *msg) = 0;
-};
-
-class FileLogListener : public LogListener
-{
-public:
-	FileLogListener(const char *filename);
-
-	void Log(LogTypes::LOG_LEVELS, const char *msg);
-
-	bool IsValid() { return !m_logfile.fail(); }
-	bool IsEnabled() const { return m_enable; }
-	void SetEnable(bool enable) { m_enable = enable; }
-
-	const char* GetName() const { return "file"; }
-
-private:
-	std::mutex m_log_lock;
-	std::ofstream m_logfile;
-	bool m_enable;
-};
-
-class DebuggerLogListener : public LogListener
-{
-public:
-	void Log(LogTypes::LOG_LEVELS, const char *msg);
-};
-
-class LogContainer
-{
-public:
-	LogContainer(const char* shortName, const char* fullName, bool enable = false);
-	
-	const char* GetShortName() const { return m_shortName; }
-	const char* GetFullName() const { return m_fullName; }
-
-	void AddListener(LogListener* listener);
-	void RemoveListener(LogListener* listener);
-
-	void Trigger(LogTypes::LOG_LEVELS, const char *msg);
-
-	bool IsEnabled() const { return m_enable; }
-	void SetEnable(bool enable) { m_enable = enable; }
-
-	LogTypes::LOG_LEVELS GetLevel() const { return m_level;	}
-
-	void SetLevel(LogTypes::LOG_LEVELS level) {	m_level = level; }
-
-	bool HasListeners() const { return !m_listeners.empty(); }
-
-private:
-	char m_fullName[128];
-	char m_shortName[32];
-	bool m_enable;
-	LogTypes::LOG_LEVELS m_level;
-	std::mutex m_listeners_lock;
-	std::set<LogListener*> m_listeners;
-};
-
-class ConsoleListener;
-
-class LogManager : NonCopyable
-{
-private:
-	LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
-	FileLogListener *m_fileLog;
-	ConsoleListener *m_consoleLog;
-	DebuggerLogListener *m_debuggerLog;
-	static LogManager *m_logManager;  // Singleton. Ugh.
-
-	LogManager();
-	~LogManager();
-public:
-
-	static u32 GetMaxLevel() { return MAX_LOGLEVEL;	}
-
-	void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
-			 const char *file, int line, const char *fmt, va_list args);
-
-	void SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
-	{
-		m_Log[type]->SetLevel(level);
-	}
-
-	void SetEnable(LogTypes::LOG_TYPE type, bool enable)
-	{
-		m_Log[type]->SetEnable(enable);
-	}
-
-	bool IsEnabled(LogTypes::LOG_TYPE type) const
-	{
-		return m_Log[type]->IsEnabled();
-	}
-
-	const char* GetShortName(LogTypes::LOG_TYPE type) const
-	{
-		return m_Log[type]->GetShortName();
-	}
-
-	const char* GetFullName(LogTypes::LOG_TYPE type) const
-	{
-		return m_Log[type]->GetFullName();
-	}
-
-	void AddListener(LogTypes::LOG_TYPE type, LogListener *listener)
-	{
-		m_Log[type]->AddListener(listener);
-	}
-
-	void RemoveListener(LogTypes::LOG_TYPE type, LogListener *listener)
-	{
-		m_Log[type]->RemoveListener(listener);
-	}
-
-	FileLogListener *GetFileListener() const
-	{
-		return m_fileLog;
-	}
-
-	ConsoleListener *GetConsoleListener() const
-	{
-		return m_consoleLog;
-	}
-
-	DebuggerLogListener *GetDebuggerListener() const
-	{
-		return m_debuggerLog;
-	}
-
-	static LogManager* GetInstance()
-	{
-		return m_logManager;
-	}
-
-	static void SetInstance(LogManager *logManager)
-	{
-		m_logManager = logManager;
-	}
-
-	static void Init();
-	static void Shutdown();
-};
-
-#endif // _LOGMANAGER_H_
diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp
deleted file mode 100644
index 0e90328ee0..0000000000
--- a/Source/Core/Common/Src/MathUtil.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "MathUtil.h"
-
-#include <cmath>
-#include <numeric>
-
-namespace MathUtil
-{
-
-u32 ClassifyDouble(double dvalue)
-{
-	// TODO: Optimize the below to be as fast as possible.
-	IntDouble value;
-	value.d = dvalue;
-	u64 sign = value.i & DOUBLE_SIGN;
-	u64 exp  = value.i & DOUBLE_EXP;
-	if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP) 
-	{
-		// Nice normalized number.
-		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
-	}
-	else
-	{
-		u64 mantissa = value.i & DOUBLE_FRAC;
-		if (mantissa)
-		{
-			if (exp)
-			{
-				return PPC_FPCLASS_QNAN;
-			}
-			else
-			{
-				// Denormalized number.
-				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
-			}
-		}
-		else if (exp)
-		{
-			//Infinite
-			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
-		}
-		else
-		{
-			//Zero
-			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
-		}
-	}
-}
-
-u32 ClassifyFloat(float fvalue)
-{
-	// TODO: Optimize the below to be as fast as possible.
-	IntFloat value;
-	value.f = fvalue;
-	u32 sign = value.i & FLOAT_SIGN;
-	u32 exp  = value.i & FLOAT_EXP;
-	if (exp > FLOAT_ZERO && exp < FLOAT_EXP) 
-	{
-		// Nice normalized number.
-		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
-	}
-	else
-	{
-		u32 mantissa = value.i & FLOAT_FRAC;
-		if (mantissa)
-		{
-			if (exp)
-			{
-				return PPC_FPCLASS_QNAN; // Quiet NAN
-			}
-			else
-			{
-				// Denormalized number.
-				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
-			}
-		} 
-		else if (exp) 
-		{
-			// Infinite
-			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
-		} 
-		else 
-		{
-			//Zero
-			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
-		}
-	}
-}
-
-
-}  // namespace
-
-inline void MatrixMul(int n, const float *a, const float *b, float *result)
-{
-	for (int i = 0; i < n; ++i)
-	{
-		for (int j = 0; j < n; ++j)
-		{
-			float temp = 0;
-			for (int k = 0; k < n; ++k)
-			{
-				temp += a[i * n + k] * b[k * n + j];
-			}
-			result[i * n + j] = temp;
-		}
-	}
-}
-
-// Calculate sum of a float list
-float MathFloatVectorSum(const std::vector<float>& Vec)
-{
-	return std::accumulate(Vec.begin(), Vec.end(), 0.0f);
-}
-
-void Matrix33::LoadIdentity(Matrix33 &mtx)
-{
-	memset(mtx.data, 0, sizeof(mtx.data));
-	mtx.data[0] = 1.0f;
-	mtx.data[4] = 1.0f;
-	mtx.data[8] = 1.0f;
-}
-
-void Matrix33::RotateX(Matrix33 &mtx, float rad)
-{
-	float s = sin(rad);
-	float c = cos(rad);
-	memset(mtx.data, 0, sizeof(mtx.data));
-	mtx.data[0] = 1;
-	mtx.data[4] = c;
-	mtx.data[5] = -s;
-	mtx.data[7] = s;
-	mtx.data[8] = c;
-}
-void Matrix33::RotateY(Matrix33 &mtx, float rad)
-{
-	float s = sin(rad);
-	float c = cos(rad);
-	memset(mtx.data, 0, sizeof(mtx.data));
-	mtx.data[0] = c;
-	mtx.data[2] = s;
-	mtx.data[4] = 1;
-	mtx.data[6] = -s;    
-	mtx.data[8] = c;
-}
-
-void Matrix33::Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result)
-{
-	MatrixMul(3, a.data, b.data, result.data);
-}
-
-void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3])
-{
-	for (int i = 0; i < 3; ++i) {
-		result[i] = 0;
-		for (int k = 0; k < 3; ++k) {
-			result[i] += a.data[i * 3 + k] * vec[k];
-		}
-	}
-}
-
-void Matrix44::LoadIdentity(Matrix44 &mtx)
-{
-	memset(mtx.data, 0, sizeof(mtx.data));
-	mtx.data[0] = 1.0f;
-	mtx.data[5] = 1.0f;
-	mtx.data[10] = 1.0f;
-	mtx.data[15] = 1.0f;
-}
-
-void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
-{
-	for (int i = 0; i < 3; ++i)
-	{
-		for (int j = 0; j < 3; ++j)
-		{
-			mtx.data[i * 4 + j] = m33.data[i * 3 + j];
-		}
-	}
-
-	for (int i = 0; i < 3; ++i)
-	{
-		mtx.data[i * 4 + 3] = 0;
-		mtx.data[i + 12] = 0;
-	}
-	mtx.data[15] = 1.0f;
-}
-
-void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16])
-{
-	for(int i = 0; i < 16; ++i) {
-		mtx.data[i] = mtxArray[i];
-	}
-}
-
-void Matrix44::Translate(Matrix44 &mtx, const float vec[3])
-{
-	LoadIdentity(mtx);
-	mtx.data[3] = vec[0];
-	mtx.data[7] = vec[1];
-	mtx.data[11] = vec[2];
-}
-
-void Matrix44::Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result)
-{
-	MatrixMul(4, a.data, b.data, result.data);
-}
-
diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h
deleted file mode 100644
index c0221836e3..0000000000
--- a/Source/Core/Common/Src/MathUtil.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _MATH_UTIL_H_
-#define _MATH_UTIL_H_
-
-#include "Common.h"
-
-#include <vector>
-#include "FPURoundMode.h"
-
-namespace MathUtil
-{
-
-static const u64 DOUBLE_SIGN = 0x8000000000000000ULL,
-	DOUBLE_EXP  = 0x7FF0000000000000ULL,
-	DOUBLE_FRAC = 0x000FFFFFFFFFFFFFULL,
-	DOUBLE_ZERO = 0x0000000000000000ULL;
-
-static const u32 FLOAT_SIGN = 0x80000000,
-	FLOAT_EXP  = 0x7F800000,
-	FLOAT_FRAC = 0x007FFFFF,
-	FLOAT_ZERO = 0x00000000;
-
-union IntDouble {
-	double d;
-	u64 i;
-};
-union IntFloat {
-	float f;
-	u32 i;
-};
-
-inline bool IsNAN(double d)
-{
-	IntDouble x; x.d = d;
-	return ( ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
-			 ((x.i & DOUBLE_FRAC) != DOUBLE_ZERO) );
-}
-
-inline bool IsQNAN(double d)
-{
-	IntDouble x; x.d = d;
-	return ( ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
-		     ((x.i & 0x0007fffffffffffULL) == 0x000000000000000ULL) &&
-		     ((x.i & 0x000800000000000ULL) == 0x000800000000000ULL) );
-}
-
-inline bool IsSNAN(double d)
-{
-	IntDouble x; x.d = d;
-	return( ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
-			((x.i & DOUBLE_FRAC) != DOUBLE_ZERO) &&
-			((x.i & 0x0008000000000000ULL) == DOUBLE_ZERO) );
-}
-
-inline float FlushToZero(float f)
-{
-	IntFloat x; x.f = f;
-	if ((x.i & FLOAT_EXP) == 0)
-		x.i &= FLOAT_SIGN;  // turn into signed zero
-	return x.f;
-}
-
-inline double FlushToZeroAsFloat(double d)
-{
-	IntDouble x; x.d = d;
-	if ((x.i & DOUBLE_EXP) < 0x3800000000000000ULL)
-		x.i &= DOUBLE_SIGN;  // turn into signed zero
-	return x.d;
-}
-
-enum PPCFpClass
-{
-	PPC_FPCLASS_QNAN = 0x11,
-	PPC_FPCLASS_NINF = 0x9,
-	PPC_FPCLASS_NN   = 0x8,
-	PPC_FPCLASS_ND   = 0x18,
-	PPC_FPCLASS_NZ   = 0x12,
-	PPC_FPCLASS_PZ   = 0x2,
-	PPC_FPCLASS_PD   = 0x14,
-	PPC_FPCLASS_PN   = 0x4,
-	PPC_FPCLASS_PINF = 0x5,
-};
-
-// Uses PowerPC conventions for the return value, so it can be easily
-// used directly in CPU emulation.
-u32 ClassifyDouble(double dvalue);
-// More efficient float version.
-u32 ClassifyFloat(float fvalue);
-
-template<class T>
-struct Rectangle
-{
-	T left;
-	T top;
-	T right;
-	T bottom;
-
-	Rectangle()
-	{ }
-
-	Rectangle(T theLeft, T theTop, T theRight, T theBottom)
-		: left(theLeft), top(theTop), right(theRight), bottom(theBottom)
-	{ }
-	
-	bool operator==(const Rectangle& r) { return left==r.left && top==r.top && right==r.right && bottom==r.bottom; }
-
-	T GetWidth() const { return abs(right - left); }
-	T GetHeight() const { return abs(bottom - top); }
-
-	// If the rectangle is in a coordinate system with a lower-left origin, use
-	// this Clamp.
-	void ClampLL(T x1, T y1, T x2, T y2)
-	{
-		if (left < x1) left = x1;
-		if (right > x2) right = x2;
-		if (top > y1) top = y1;
-		if (bottom < y2) bottom = y2;
-	}
-
-	// If the rectangle is in a coordinate system with an upper-left origin,
-	// use this Clamp.
-	void ClampUL(T x1, T y1, T x2, T y2) 
-	{
-		if (left < x1) left = x1;
-		if (right > x2) right = x2;
-		if (top < y1) top = y1;
-		if (bottom > y2) bottom = y2;
-	}
-};
-
-}  // namespace MathUtil
-
-inline float pow2f(float x) {return x * x;}
-inline double pow2(double x) {return x * x;}
-
-float MathFloatVectorSum(const std::vector<float>&);
-
-#define ROUND_UP(x, a)		(((x) + (a) - 1) & ~((a) - 1))
-#define ROUND_DOWN(x, a)	((x) & ~((a) - 1))
-
-// Rounds down. 0 -> undefined
-inline u64 Log2(u64 val)
-{
-#if defined(__GNUC__)
-	return 63 - __builtin_clzll(val);
-
-#elif defined(_MSC_VER) && defined(_M_X64)
-	unsigned long result = -1;
-	_BitScanReverse64(&result, val);
-	return result;
-
-#else
-	u64 result = -1;
-	while (val != 0)
-	{
-		val >>= 1;
-		++result;
-	}
-	return result;
-#endif
-}
-
-// Tiny matrix/vector library.
-// Used for things like Free-Look in the gfx backend.
-
-class Matrix33
-{
-public:
-	static void LoadIdentity(Matrix33 &mtx);
-
-	// set mtx to be a rotation matrix around the x axis
-	static void RotateX(Matrix33 &mtx, float rad);
-	// set mtx to be a rotation matrix around the y axis
-	static void RotateY(Matrix33 &mtx, float rad);
-
-	// set result = a x b
-	static void Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result);
-	static void Multiply(const Matrix33 &a, const float vec[3], float result[3]);
-
-	float data[9];
-};
-
-class Matrix44
-{
-public:
-	static void LoadIdentity(Matrix44 &mtx);
-	static void LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33);
-	static void Set(Matrix44 &mtx, const float mtxArray[16]);
-
-	static void Translate(Matrix44 &mtx, const float vec[3]);
-
-	static void Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result);
-
-	float data[16];
-};
-
-#endif // _MATH_UTIL_H_
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
deleted file mode 100644
index c8267c4411..0000000000
--- a/Source/Core/Common/Src/MemArena.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "MemoryUtil.h"
-#include "MemArena.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <cerrno>
-#include <cstring>
-#ifdef ANDROID
-#include <sys/ioctl.h>
-#include <linux/ashmem.h>
-#endif
-#endif
-#include <set>
-
-#if defined(__APPLE__)
-static const char* ram_temp_file = "/tmp/gc_mem.tmp";
-#elif !defined(_WIN32) // non OSX unixes
-static const char* ram_temp_file = "/dev/shm/gc_mem.tmp";
-#endif
-#ifdef ANDROID
-#define ASHMEM_DEVICE "/dev/ashmem"
-
-int AshmemCreateFileMapping(const char *name, size_t size)
-{
-	int fd, ret;
-	fd = open(ASHMEM_DEVICE, O_RDWR);
-	if (fd < 0)
-		return fd;
-
-	// We don't really care if we can't set the name, it is optional	
-	ret = ioctl(fd, ASHMEM_SET_NAME, name);
-
-	ret = ioctl(fd, ASHMEM_SET_SIZE, size);
-	if (ret < 0)
-	{
-		close(fd);
-		NOTICE_LOG(MEMMAP, "Ashmem returned error: 0x%08x", ret);
-		return ret;
-	}
-	return fd;
-}
-#endif
-
-void MemArena::GrabLowMemSpace(size_t size)
-{
-#ifdef _WIN32
-	hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), NULL);
-#elif defined(ANDROID)
-	fd = AshmemCreateFileMapping("Dolphin-emu", size);
-	if (fd < 0)
-	{
-		NOTICE_LOG(MEMMAP, "Ashmem allocation failed");
-		return;
-	}
-#else
-	mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
-	fd = open(ram_temp_file, O_RDWR | O_CREAT, mode);
-	unlink(ram_temp_file);
-	if (ftruncate(fd, size) < 0)
-		ERROR_LOG(MEMMAP, "Failed to allocate low memory space");
-	return;
-#endif
-}
-
-
-void MemArena::ReleaseSpace()
-{
-#ifdef _WIN32
-	CloseHandle(hMemoryMapping);
-	hMemoryMapping = 0;
-#else
-	close(fd);
-#endif
-}
-
-
-void *MemArena::CreateView(s64 offset, size_t size, void *base)
-{
-#ifdef _WIN32
-	return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
-#else
-	void *retval = mmap(
-		base, size,
-		PROT_READ | PROT_WRITE,
-		MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED),
-		fd, offset);
-
-	if (retval == MAP_FAILED)
-	{
-		NOTICE_LOG(MEMMAP, "mmap on %s failed", ram_temp_file);
-		return nullptr;
-	}
-	else
-	{
-		return retval;
-	}
-#endif
-}
-
-
-void MemArena::ReleaseView(void* view, size_t size)
-{
-#ifdef _WIN32
-	UnmapViewOfFile(view);
-#else
-	munmap(view, size);
-#endif
-}
-
-
-u8* MemArena::Find4GBBase()
-{
-#ifdef _M_X64
-#ifdef _WIN32
-	// 64 bit
-	u8* base = (u8*)VirtualAlloc(0, 0xE1000000, MEM_RESERVE, PAGE_READWRITE);
-	VirtualFree(base, 0, MEM_RELEASE);
-	return base;
-#else
-	// Very precarious - mmap cannot return an error when trying to map already used pages.
-	// This makes the Windows approach above unusable on Linux, so we will simply pray...
-	return reinterpret_cast<u8*>(0x2300000000ULL);
-#endif
-
-#else
-	// 32 bit
-#ifdef _WIN32
-	// The highest thing in any 1GB section of memory space is the locked cache. We only need to fit it.
-	u8* base = (u8*)VirtualAlloc(0, 0x31000000, MEM_RESERVE, PAGE_READWRITE);
-	if (base) {
-		VirtualFree(base, 0, MEM_RELEASE);
-	}
-	return base;
-#else
-#ifdef ANDROID
-	// Android 4.3 changed how mmap works.
-	// if we map it private and then munmap it, we can't use the base returned.
-	// This may be due to changes in them support a full SELinux implementation.
-	const int flags = MAP_ANON;
-#else
-	const int flags = MAP_ANON | MAP_PRIVATE;
-#endif
-	const u32 MemSize = 0x31000000;
-	void* base = mmap(0, MemSize, PROT_NONE, flags, -1, 0);
-	if (base == MAP_FAILED) {
-		PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno));
-		return 0;
-	}
-	munmap(base, MemSize);
-	return static_cast<u8*>(base);
-#endif
-#endif
-}
-
-
-// yeah, this could also be done in like two bitwise ops...
-#define SKIP(a_flags, b_flags) \
-	if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) \
-		continue; \
-	if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) \
-		continue; \
-
-
-static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) {
-	// OK, we know where to find free space. Now grab it!
-	// We just mimic the popular BAT setup.
-	u32 position = 0;
-	u32 last_position = 0;
-
-	// Zero all the pointers to be sure.
-	for (int i = 0; i < num_views; i++)
-	{
-		if (views[i].out_ptr_low)
-			*views[i].out_ptr_low = 0;
-		if (views[i].out_ptr)
-			*views[i].out_ptr = 0;
-	}
-
-	int i;
-	for (i = 0; i < num_views; i++)
-	{
-		SKIP(flags, views[i].flags);
-		if (views[i].flags & MV_MIRROR_PREVIOUS) {
-			position = last_position;
-		} else {
-			*(views[i].out_ptr_low) = (u8*)arena->CreateView(position, views[i].size);
-			if (!*views[i].out_ptr_low)
-				goto bail;
-		}
-#ifdef _M_X64
-		*views[i].out_ptr = (u8*)arena->CreateView(
-			position, views[i].size, base + views[i].virtual_address);
-#else
-		if (views[i].flags & MV_MIRROR_PREVIOUS) {
-			// No need to create multiple identical views.
-			*views[i].out_ptr = *views[i - 1].out_ptr;
-		} else {
-			*views[i].out_ptr = (u8*)arena->CreateView(
-				position, views[i].size, base + (views[i].virtual_address & 0x3FFFFFFF));
-			if (!*views[i].out_ptr)
-				goto bail;
-		}
-#endif
-		last_position = position;
-		position += views[i].size;
-	}
-
-	return true;
-
-bail:
-	// Argh! ERROR! Free what we grabbed so far so we can try again.
-	MemoryMap_Shutdown(views, i+1, flags, arena);
-	return false;
-}
-
-u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena)
-{
-	u32 total_mem = 0;
-	int base_attempts = 0;
-
-	for (int i = 0; i < num_views; i++)
-	{
-		SKIP(flags, views[i].flags);
-		if ((views[i].flags & MV_MIRROR_PREVIOUS) == 0)
-			total_mem += views[i].size;
-	}
-	// Grab some pagefile backed memory out of the void ...
-	arena->GrabLowMemSpace(total_mem);
-
-	// Now, create views in high memory where there's plenty of space.
-#ifdef _M_X64
-	u8 *base = MemArena::Find4GBBase();
-	// This really shouldn't fail - in 64-bit, there will always be enough
-	// address space.
-	if (!Memory_TryBase(base, views, num_views, flags, arena))
-	{
-		PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
-		exit(0);
-		return 0;
-	}
-#else
-#ifdef _WIN32
-	// Try a whole range of possible bases. Return once we got a valid one.
-	u32 max_base_addr = 0x7FFF0000 - 0x31000000;
-	u8 *base = NULL;
-
-	for (u32 base_addr = 0x40000; base_addr < max_base_addr; base_addr += 0x40000)
-	{
-		base_attempts++;
-		base = (u8 *)base_addr;
-		if (Memory_TryBase(base, views, num_views, flags, arena)) 
-		{
-			INFO_LOG(MEMMAP, "Found valid memory base at %p after %i tries.", base, base_attempts);
-			base_attempts = 0;
-			break;
-		}
-		
-	}
-#else
-	// Linux32 is fine with the x64 method, although limited to 32-bit with no automirrors.
-	u8 *base = MemArena::Find4GBBase();
-	if (!Memory_TryBase(base, views, num_views, flags, arena))
-	{
-		PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
-		exit(0);
-		return 0;
-	}
-#endif
-
-#endif
-	if (base_attempts)
-		PanicAlert("No possible memory base pointer found!");
-	return base;
-}
-
-void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena)
-{
-	std::set<void*> freeset;
-	for (int i = 0; i < num_views; i++)
-	{
-		const MemoryView* view = &views[i];
-		u8** outptrs[2] = {view->out_ptr_low, view->out_ptr};
-		for (int j = 0; j < 2; j++)
-		{
-			u8** outptr = outptrs[j];
-			if (outptr && *outptr && !freeset.count(*outptr))
-			{
-				arena->ReleaseView(*outptr, view->size);
-				freeset.insert(*outptr);
-				*outptr = NULL;
-			}
-		}
-	}
-}
diff --git a/Source/Core/Common/Src/MemArena.h b/Source/Core/Common/Src/MemArena.h
deleted file mode 100644
index 25d5c3ccbe..0000000000
--- a/Source/Core/Common/Src/MemArena.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _MEMARENA_H_
-#define _MEMARENA_H_
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "Common.h"
-
-// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
-// Multiple views can mirror the same section of the block, which makes it very convenient for emulating
-// memory mirrors.
-
-class MemArena
-{
-public:
-	void GrabLowMemSpace(size_t size);
-	void ReleaseSpace();
-	void *CreateView(s64 offset, size_t size, void *base = nullptr);
-	void ReleaseView(void *view, size_t size);
-
-	// This only finds 1 GB in 32-bit
-	static u8 *Find4GBBase();
-private:
-
-#ifdef _WIN32
-	HANDLE hMemoryMapping;
-#else
-	int fd;
-#endif
-};
-
-enum {
-	MV_MIRROR_PREVIOUS = 1,
-	MV_FAKE_VMEM = 2,
-	MV_WII_ONLY = 4,
-};
-
-struct MemoryView
-{
-	u8 **out_ptr_low;
-	u8 **out_ptr;
-	u32 virtual_address;
-	u32 size;
-	u32 flags;
-};
-
-// Uses a memory arena to set up an emulator-friendly memory map according to
-// a passed-in list of MemoryView structures.
-u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
-void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
-
-#endif // _MEMARENA_H_
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp
deleted file mode 100644
index ce1c5d8a54..0000000000
--- a/Source/Core/Common/Src/MemoryUtil.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "MemoryUtil.h"
-#include "StringUtil.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include <psapi.h>
-#else
-#include <errno.h>
-#include <stdio.h>
-#endif
-
-#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
-#include <unistd.h>
-#define PAGE_MASK     (getpagesize() - 1)
-#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK))
-#endif
-
-// This is purposely not a full wrapper for virtualalloc/mmap, but it
-// provides exactly the primitive operations that Dolphin needs.
-
-void* AllocateExecutableMemory(size_t size, bool low)
-{
-#if defined(_WIN32)
-	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-#else
-	static char *map_hint = 0;
-#if defined(__x86_64__) && !defined(MAP_32BIT)
-	// This OS has no flag to enforce allocation below the 4 GB boundary,
-	// but if we hint that we want a low address it is very likely we will
-	// get one.
-	// An older version of this code used MAP_FIXED, but that has the side
-	// effect of discarding already mapped pages that happen to be in the
-	// requested virtual memory range (such as the emulated RAM, sometimes).
-	if (low && (!map_hint))
-		map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */
-#endif
-	void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC,
-		MAP_ANON | MAP_PRIVATE
-#if defined(__x86_64__) && defined(MAP_32BIT)
-		| (low ? MAP_32BIT : 0)
-#endif
-		, -1, 0);
-#endif /* defined(_WIN32) */
-
-	// printf("Mapped executable memory at %p (size %ld)\n", ptr,
-	//	(unsigned long)size);
-	
-#if defined(__FreeBSD__)
-	if (ptr == MAP_FAILED)
-	{
-		ptr = NULL;
-#else
-	if (ptr == NULL)
-	{
-#endif	
-		PanicAlert("Failed to allocate executable memory");
-	}
-#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
-	else
-	{
-		if (low)
-		{
-			map_hint += size;
-			map_hint = (char*)round_page(map_hint); /* round up to the next page */
-			// printf("Next map will (hopefully) be at %p\n", map_hint);
-		}
-	}
-#endif
-
-#if defined(_M_X64)
-	if ((u64)ptr >= 0x80000000 && low == true)
-		PanicAlert("Executable memory ended up above 2GB!");
-#endif
-
-	return ptr;
-}
-
-void* AllocateMemoryPages(size_t size)
-{
-#ifdef _WIN32
-	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
-#else
-	void* ptr = mmap(0, size, PROT_READ | PROT_WRITE,
-			MAP_ANON | MAP_PRIVATE, -1, 0);
-#endif
-
-	// printf("Mapped memory at %p (size %ld)\n", ptr,
-	//	(unsigned long)size);
-
-	if (ptr == NULL)
-		PanicAlert("Failed to allocate raw memory");
-
-	return ptr;
-}
-
-void* AllocateAlignedMemory(size_t size,size_t alignment)
-{
-#ifdef _WIN32
-	void* ptr =  _aligned_malloc(size,alignment);
-#else
-	void* ptr = NULL;
-#ifdef ANDROID
-	ptr = memalign(alignment, size);
-#else
-	if (posix_memalign(&ptr, alignment, size) != 0)
-		ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
-#endif
-#endif
-
-	// printf("Mapped memory at %p (size %ld)\n", ptr,
-	//	(unsigned long)size);
-
-	if (ptr == NULL)
-		PanicAlert("Failed to allocate aligned memory");
-
-	return ptr;
-}
-
-void FreeMemoryPages(void* ptr, size_t size)
-{
-	if (ptr)
-	{
-#ifdef _WIN32
-	
-		if (!VirtualFree(ptr, 0, MEM_RELEASE))
-			PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg());
-		ptr = NULL; // Is this our responsibility?
-	
-#else
-		munmap(ptr, size);
-#endif
-	}
-}
-
-void FreeAlignedMemory(void* ptr)
-{
-	if (ptr)
-	{
-#ifdef _WIN32
-	_aligned_free(ptr);
-#else
-	free(ptr);
-#endif
-	}
-}
-
-void WriteProtectMemory(void* ptr, size_t size, bool allowExecute)
-{
-#ifdef _WIN32
-	DWORD oldValue;
-	if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue))
-		PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg());
-#else
-	mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_EXEC) : PROT_READ);
-#endif
-}
-
-void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute)
-{
-#ifdef _WIN32
-	DWORD oldValue;
-	if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue))
-		PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg());
-#else
-	mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_WRITE | PROT_EXEC) : PROT_WRITE | PROT_READ);
-#endif
-}
-
-std::string MemUsage()
-{
-#ifdef _WIN32
-#pragma comment(lib, "psapi")
-	DWORD processID = GetCurrentProcessId();
-	HANDLE hProcess;
-	PROCESS_MEMORY_COUNTERS pmc;
-	std::string Ret;
-
-	// Print information about the memory usage of the process.
-
-	hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID);
-	if (NULL == hProcess) return "MemUsage Error";
-
-	if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc)))
-		Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str());
-
-	CloseHandle(hProcess);
-	return Ret;
-#else
-	return "";
-#endif
-}
diff --git a/Source/Core/Common/Src/MemoryUtil.h b/Source/Core/Common/Src/MemoryUtil.h
deleted file mode 100644
index 49b2589da3..0000000000
--- a/Source/Core/Common/Src/MemoryUtil.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _MEMORYUTIL_H
-#define _MEMORYUTIL_H
-
-#ifndef _WIN32
-#include <sys/mman.h>
-#endif
-#include <string>
-
-void* AllocateExecutableMemory(size_t size, bool low = true);
-void* AllocateMemoryPages(size_t size);
-void FreeMemoryPages(void* ptr, size_t size);
-void* AllocateAlignedMemory(size_t size,size_t alignment);
-void FreeAlignedMemory(void* ptr);
-void WriteProtectMemory(void* ptr, size_t size, bool executable = false);
-void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false);
-std::string MemUsage();
-
-inline int GetPageSize() { return 4096; }
-
-#endif
diff --git a/Source/Core/Common/Src/Misc.cpp b/Source/Core/Common/Src/Misc.cpp
deleted file mode 100644
index ce42deb4d2..0000000000
--- a/Source/Core/Common/Src/Misc.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-// Neither Android nor OS X support TLS
-#if  defined(__APPLE__) || (ANDROID && __clang__)
-#define __thread
-#endif
-
-// Generic function to get last error message.
-// Call directly after the command or use the error num.
-// This function might change the error code.
-const char* GetLastErrorMsg()
-{
-	static const size_t buff_size = 255;
-
-#ifdef _WIN32
-	static __declspec(thread) char err_str[buff_size] = {};
-
-	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		err_str, buff_size, NULL);
-#else
-	static __thread char err_str[buff_size] = {};
-
-	// Thread safe (XSI-compliant)
-	strerror_r(errno, err_str, buff_size);
-#endif
-
-	return err_str;
-}
diff --git a/Source/Core/Common/Src/NandPaths.cpp b/Source/Core/Common/Src/NandPaths.cpp
deleted file mode 100644
index 601d2a51ee..0000000000
--- a/Source/Core/Common/Src/NandPaths.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "NandPaths.h"
-#include <fstream>
-
-namespace Common
-{
-
-std::string GetTicketFileName(u64 _titleID)
-{
-	char TicketFilename[1024];
-	sprintf(TicketFilename, "%sticket/%08x/%08x.tik",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
-
-	return TicketFilename;
-}
-
-std::string GetTitleDataPath(u64 _titleID)
-{
-	char path[1024];
-	sprintf(path, "%stitle/%08x/%08x/data/",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
-
-	return path;
-}
-
-std::string GetTMDFileName(u64 _titleID)
-{
-	return GetTitleContentPath(_titleID) + "title.tmd";
-}
-std::string GetTitleContentPath(u64 _titleID)
-{
-	char ContentPath[1024];
-	sprintf(ContentPath, "%stitle/%08x/%08x/content/",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID);
-
-	return ContentPath;
-}
-
-bool CheckTitleTMD(u64 _titleID)
-{
-	const std::string TitlePath = GetTMDFileName(_titleID);
-	if (File::Exists(TitlePath))
-	{
-		File::IOFile pTMDFile(TitlePath, "rb");
-		u64 TitleID = 0;
-		pTMDFile.Seek(0x18C, SEEK_SET);
-		if (pTMDFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
-			return true;
-	}
-	INFO_LOG(DISCIO, "Invalid or no tmd for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF));
-	return false;
-}
-
-bool CheckTitleTIK(u64 _titleID)
-{
-	const std::string ticketFileName = Common::GetTicketFileName(_titleID);	
-	if (File::Exists(ticketFileName))
-	{
-		File::IOFile pTIKFile(ticketFileName, "rb");
-		u64 TitleID = 0;
-		pTIKFile.Seek(0x1dC, SEEK_SET);
-		if (pTIKFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
-			return true;
-	}
-	INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF));
-	return false;
-}
-
-static void CreateReplacementFile(std::string &filename)
-{
-	std::ofstream replace;
-	OpenFStream(replace, filename, std::ios_base::out);
-	replace <<"\" __22__\n";
-	replace << "* __2a__\n";
-	//replace << "/ __2f__\n";
-	replace << ": __3a__\n";
-	replace << "< __3c__\n";
-	replace << "> __3e__\n";
-	replace << "? __3f__\n";
-	//replace <<"\\ __5c__\n";
-	replace << "| __7c__\n";
-}
-
-void ReadReplacements(replace_v& replacements)
-{
-	replacements.clear();
-	const std::string replace_fname = "/sys/replace";
-	std::string filename(File::GetUserPath(D_WIIROOT_IDX));
-	filename += replace_fname;
-
-	if (!File::Exists(filename))
-		CreateReplacementFile(filename);
-
-	std::ifstream f;
-	OpenFStream(f, filename, std::ios_base::in);
-	char letter;
-	std::string replacement;
-
-	while (f >> letter >> replacement && replacement.size())
-		replacements.push_back(std::make_pair(letter, replacement));
-}
-
-};
diff --git a/Source/Core/Common/Src/NandPaths.h b/Source/Core/Common/Src/NandPaths.h
deleted file mode 100644
index 19228d3176..0000000000
--- a/Source/Core/Common/Src/NandPaths.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __NANDPATHS_H__
-#define __NANDPATHS_H__
-
-#include <string>
-#include "CommonTypes.h"
-
-#define TITLEID_SYSMENU 0x0000000100000002ull
-
-namespace Common
-{
-	typedef std::pair<char, std::string> replace_t;
-	typedef std::vector<replace_t> replace_v;
-
-	std::string GetTicketFileName(u64 _titleID);
-	std::string GetTMDFileName(u64 _titleID);
-	std::string GetTitleDataPath(u64 _titleID);
-	std::string GetTitleContentPath(u64 _titleID);
-	bool CheckTitleTMD(u64 _titleID);
-	bool CheckTitleTIK(u64 _titleID);
-	void ReadReplacements(replace_v& replacements);
-}
-#endif
-
diff --git a/Source/Core/Common/Src/SDCardUtil.h b/Source/Core/Common/Src/SDCardUtil.h
deleted file mode 100644
index 4c88c0b30b..0000000000
--- a/Source/Core/Common/Src/SDCardUtil.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-
-bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename);
diff --git a/Source/Core/Common/Src/SettingsHandler.h b/Source/Core/Common/Src/SettingsHandler.h
deleted file mode 100644
index 9557dc5792..0000000000
--- a/Source/Core/Common/Src/SettingsHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Thanks to Treeki for writing the original class - 29/01/2012
-
-#pragma once
-
-#include <string>
-
-#include "Common.h"
-
-class SettingsHandler
-{
-public:
-	SettingsHandler();
-
-	enum
-	{
-		SETTINGS_SIZE = 0x100,
-		// Key used to encrypt/decrypt setting.txt contents
-		INITIAL_SEED = 0x73B5DBFA
-	};
-
-	void AddSetting(const char *key, const char *value);
-
-	const u8 *GetData() const;
-	const std::string GetValue(const std::string key);
-
-	void Decrypt();
-	void Reset();
-	const std::string generateSerialNumber();
-
-private:
-	void WriteByte(u8 b);
-
-	u8 m_buffer[SETTINGS_SIZE];
-	u32 m_position, m_key;
-	std::string decoded;
-};
diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h
deleted file mode 100644
index 048a7e8975..0000000000
--- a/Source/Core/Common/Src/StdConditionVariable.h
+++ /dev/null
@@ -1,170 +0,0 @@
-
-#ifndef CONDITION_VARIABLE_H_
-#define CONDITION_VARIABLE_H_
-
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
-#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-
-#ifndef __has_include
-#define __has_include(s) 0
-#endif
-
-#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ 
-
-// GCC 4.4 provides <condition_variable>
-#include <condition_variable>
-
-#elif __has_include(<condition_variable>) && !ANDROID
-
-// clang and libc++ provide <condition_variable> on OSX. However, the version
-// of libc++ bundled with OSX 10.7 and 10.8 is buggy: it uses _ as a variable.
-//
-// We work around this issue by undefining and redefining _.
-
-#undef _
-#include <condition_variable>
-#define _(s) wxGetTranslation((s))
-
-#else
-
-// partial std::condition_variable implementation for win32/pthread
-
-#include "StdMutex.h"
-
-#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
-#define USE_RVALUE_REFERENCES
-#endif
-
-#if defined(_WIN32) && defined(_M_X64)
-#define USE_CONDITION_VARIABLES
-#elif defined(_WIN32)
-#define USE_EVENTS
-#endif
-
-namespace std
-{
-
-class condition_variable
-{
-#if defined(_WIN32) && defined(USE_CONDITION_VARIABLES)
-	typedef CONDITION_VARIABLE native_type;
-#elif defined(_WIN32)
-	typedef HANDLE native_type;
-#else
-	typedef pthread_cond_t native_type;
-#endif
-
-public:
-
-#ifdef USE_EVENTS
-	typedef native_type native_handle_type;
-#else
-	typedef native_type* native_handle_type;
-#endif
-
-	condition_variable()
-	{
-#if defined(_WIN32) && defined(USE_CONDITION_VARIABLES)
-		InitializeConditionVariable(&m_handle);
-#elif defined(_WIN32)
-		m_handle = CreateEvent(NULL, false, false, NULL);
-#else
-		pthread_cond_init(&m_handle, NULL);
-#endif
-	}
-
-	~condition_variable()
-	{
-#if defined(_WIN32) && !defined(USE_CONDITION_VARIABLES)
-		CloseHandle(m_handle);
-#elif !defined(_WIN32)
-		pthread_cond_destroy(&m_handle);
-#endif
-	}
-
-	condition_variable(const condition_variable&) /*= delete*/;
-	condition_variable& operator=(const condition_variable&) /*= delete*/;
-
-	void notify_one()
-	{
-#if defined(_WIN32) && defined(USE_CONDITION_VARIABLES)
-		WakeConditionVariable(&m_handle);
-#elif defined(_WIN32)
-		SetEvent(m_handle);
-#else
-		pthread_cond_signal(&m_handle);
-#endif
-	}
-
-	void notify_all()
-	{
-#if defined(_WIN32) && defined(USE_CONDITION_VARIABLES)
-		WakeAllConditionVariable(&m_handle);
-#elif defined(_WIN32)
-		// TODO: broken
-		SetEvent(m_handle);
-#else
-		pthread_cond_broadcast(&m_handle);
-#endif
-	}
-
-	void wait(unique_lock<mutex>& lock)
-	{
-#ifdef _WIN32
-	#ifdef USE_SRWLOCKS
-		SleepConditionVariableSRW(&m_handle, lock.mutex()->native_handle(), INFINITE, 0);
-	#elif defined(USE_CONDITION_VARIABLES)
-		SleepConditionVariableCS(&m_handle, lock.mutex()->native_handle(), INFINITE);
-	#else
-		// TODO: broken, the unlock and wait need to be atomic
-		lock.unlock();
-		WaitForSingleObject(m_handle, INFINITE);
-		lock.lock();
-	#endif
-#else
-		pthread_cond_wait(&m_handle, lock.mutex()->native_handle());
-#endif
-	}
-
-	template <class Predicate>
-	void wait(unique_lock<mutex>& lock, Predicate pred)
-	{
-		while (!pred())
-			wait(lock);
-	}
-
-	//template <class Clock, class Duration>
-	//cv_status wait_until(unique_lock<mutex>& lock,
-	//	const chrono::time_point<Clock, Duration>& abs_time);
-
-	//template <class Clock, class Duration, class Predicate>
-	//	bool wait_until(unique_lock<mutex>& lock,
-	//	const chrono::time_point<Clock, Duration>& abs_time,
-	//	Predicate pred);
-
-	//template <class Rep, class Period>
-	//cv_status wait_for(unique_lock<mutex>& lock,
-	//	const chrono::duration<Rep, Period>& rel_time);
-
-	//template <class Rep, class Period, class Predicate>
-	//	bool wait_for(unique_lock<mutex>& lock,
-	//	const chrono::duration<Rep, Period>& rel_time,
-	//	Predicate pred);
-
-	native_handle_type native_handle()
-	{
-#ifdef USE_EVENTS
-		return m_handle;
-#else
-		return &m_handle;
-#endif
-	}
-
-private:
-	native_type m_handle;
-};
-
-}
-
-#endif
-#endif
diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h
deleted file mode 100644
index ce46a2f591..0000000000
--- a/Source/Core/Common/Src/StdMutex.h
+++ /dev/null
@@ -1,365 +0,0 @@
-
-#ifndef MUTEX_H_
-#define MUTEX_H_
-
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
-#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-
-#ifndef __has_include
-#define __has_include(s) 0
-#endif
-
-#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__
-// GCC 4.4 provides <mutex>
-#include <mutex>
-#elif __has_include(<mutex>) && !ANDROID
-// Clang + libc++
-#include <mutex>
-#else
-
-// partial <mutex> implementation for win32/pthread
-
-#include <algorithm>
-
-#if defined(_WIN32)
-// WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-#else
-// POSIX
-#include <pthread.h>
-
-#endif
-
-#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
-#define USE_RVALUE_REFERENCES
-#endif
-
-#if defined(_WIN32) && defined(_M_X64)
-#define USE_SRWLOCKS
-#endif
-
-namespace std
-{
-
-class recursive_mutex
-{
-#ifdef _WIN32
-	typedef CRITICAL_SECTION native_type;
-#else
-	typedef pthread_mutex_t native_type;
-#endif
-
-public:
-	typedef native_type* native_handle_type;
-
-	recursive_mutex(const recursive_mutex&) /*= delete*/;
-	recursive_mutex& operator=(const recursive_mutex&) /*= delete*/;
-
-	recursive_mutex()
-	{
-#ifdef _WIN32
-		InitializeCriticalSection(&m_handle);
-#else
-		pthread_mutexattr_t attr;
-		pthread_mutexattr_init(&attr);
-		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-		pthread_mutex_init(&m_handle, &attr);
-#endif
-	}
-
-	~recursive_mutex()
-	{
-#ifdef _WIN32
-		DeleteCriticalSection(&m_handle);
-#else
-		pthread_mutex_destroy(&m_handle);
-#endif
-	}
-
-	void lock()
-	{
-#ifdef _WIN32
-		EnterCriticalSection(&m_handle);
-#else
-		pthread_mutex_lock(&m_handle);
-#endif
-	}
-
-	void unlock()
-	{
-#ifdef _WIN32
-		LeaveCriticalSection(&m_handle);
-#else
-		pthread_mutex_unlock(&m_handle);
-#endif
-	}
-
-	bool try_lock()
-	{
-#ifdef _WIN32
-		return (0 != TryEnterCriticalSection(&m_handle));
-#else
-		return !pthread_mutex_trylock(&m_handle);
-#endif	
-	}
-
-	native_handle_type native_handle()
-	{
-		return &m_handle;
-	}
-
-private:
-	native_type m_handle;
-};
-
-#if !defined(_WIN32) || defined(USE_SRWLOCKS)
-
-class mutex
-{
-#ifdef _WIN32
-	typedef SRWLOCK native_type;
-#else
-	typedef pthread_mutex_t native_type;
-#endif
-
-public:
-	typedef native_type* native_handle_type;
-
-	mutex(const mutex&) /*= delete*/;
-	mutex& operator=(const mutex&) /*= delete*/;
-
-	mutex()
-	{
-#ifdef _WIN32
-		InitializeSRWLock(&m_handle);
-#else
-		pthread_mutex_init(&m_handle, NULL);
-#endif
-	}
-
-	~mutex()
-	{
-#ifdef _WIN32
-#else
-		pthread_mutex_destroy(&m_handle);
-#endif
-	}
-
-	void lock()
-	{
-#ifdef _WIN32
-		AcquireSRWLockExclusive(&m_handle);
-#else
-		pthread_mutex_lock(&m_handle);
-#endif
-	}
-
-	void unlock()
-	{
-#ifdef _WIN32
-		ReleaseSRWLockExclusive(&m_handle);
-#else
-		pthread_mutex_unlock(&m_handle);
-#endif
-	}
-
-	bool try_lock()
-	{
-#ifdef _WIN32
-		// XXX TryAcquireSRWLockExclusive requires Windows 7!
-		// return (0 != TryAcquireSRWLockExclusive(&m_handle));
-		return false;
-#else
-		return !pthread_mutex_trylock(&m_handle);
-#endif
-	}
-
-	native_handle_type native_handle()
-	{
-		return &m_handle;
-	}
-
-private:
-	native_type m_handle;
-};
-
-#else
-typedef recursive_mutex mutex;	// just use CriticalSections
-
-#endif
-
-enum defer_lock_t { defer_lock };
-enum try_to_lock_t { try_to_lock };
-enum adopt_lock_t { adopt_lock };
-
-template <class Mutex>
-class lock_guard
-{
-public:
-	typedef Mutex mutex_type;
-
-	explicit lock_guard(mutex_type& m)
-		: pm(m)
-	{
-		m.lock();
-	}
-
-	lock_guard(mutex_type& m, adopt_lock_t)
-		: pm(m)
-	{
-	}
-
-	~lock_guard()
-	{
-		pm.unlock();
-	}
-
-	lock_guard(lock_guard const&) /*= delete*/;
-	lock_guard& operator=(lock_guard const&) /*= delete*/;
-
-private:
-	mutex_type& pm;
-};
-
-template <class Mutex>
-class unique_lock
-{
-public:
-	typedef Mutex mutex_type;
-
-	unique_lock()
-		: pm(NULL), owns(false)
-	{}
-
-	/*explicit*/ unique_lock(mutex_type& m)
-		: pm(&m), owns(true)
-	{
-		m.lock();
-	}
-
-	unique_lock(mutex_type& m, defer_lock_t)
-		: pm(&m), owns(false)
-	{}
-
-	unique_lock(mutex_type& m, try_to_lock_t)
-		: pm(&m), owns(m.try_lock())
-	{}
-
-	unique_lock(mutex_type& m, adopt_lock_t)
-		: pm(&m), owns(true)
-	{}
-
-	//template <class Clock, class Duration>
-	//unique_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& abs_time);
-
-	//template <class Rep, class Period>
-	//unique_lock(mutex_type& m, const chrono::duration<Rep, Period>& rel_time);
-
-	~unique_lock()
-	{
-		if (owns_lock())
-			mutex()->unlock();
-	}
-
-#ifdef USE_RVALUE_REFERENCES
-	unique_lock& operator=(const unique_lock&) /*= delete*/;
-
-	unique_lock& operator=(unique_lock&& other)
-	{
-#else
-	unique_lock& operator=(const unique_lock& u)
-	{
-		// ugly const_cast to get around lack of rvalue references
-		unique_lock& other = const_cast<unique_lock&>(u);
-#endif
-		swap(other);
-		return *this;
-	}
-	
-#ifdef USE_RVALUE_REFERENCES
-	unique_lock(const unique_lock&) /*= delete*/;
-	
-	unique_lock(unique_lock&& other)
-		: pm(NULL), owns(false)
-	{
-#else
-	unique_lock(const unique_lock& u)
-		: pm(NULL), owns(false)
-	{
-		// ugly const_cast to get around lack of rvalue references
-		unique_lock& other = const_cast<unique_lock&>(u);	
-#endif
-		swap(other);
-	}
-
-	void lock()
-	{
-		mutex()->lock();
-		owns = true;
-	}
-
-	bool try_lock()
-	{
-		owns = mutex()->try_lock();
-		return owns;
-	}
-
-	//template <class Rep, class Period>
-	//bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-	//template <class Clock, class Duration>
-	//bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-	
-	void unlock()
-	{
-		mutex()->unlock();
-		owns = false;
-	}
-
-	void swap(unique_lock& u)
-	{
-		std::swap(pm, u.pm);
-		std::swap(owns, u.owns);
-	}
-
-	mutex_type* release()
-	{
-		auto const ret = mutex();
-
-		pm = NULL;
-		owns = false;
-
-		return ret;
-	}
-
-	bool owns_lock() const
-	{
-		return owns;
-	}
-
-	//explicit operator bool () const
-	//{
-	//	return owns_lock();
-	//}
-
-	mutex_type* mutex() const
-	{
-		return pm;
-	}
-
-private:
-	mutex_type* pm;
-	bool owns;
-};
-
-template <class Mutex>
-void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y)
-{
-	x.swap(y);
-}
-
-}
-
-#endif
-#endif
diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h
deleted file mode 100644
index e43d283443..0000000000
--- a/Source/Core/Common/Src/StdThread.h
+++ /dev/null
@@ -1,317 +0,0 @@
-
-#ifndef STD_THREAD_H_
-#define STD_THREAD_H_
-
-#define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
-#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-
-#ifndef __has_include
-#define __has_include(s) 0
-#endif
-
-#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__
-// GCC 4.4 provides <thread>
-#ifndef _GLIBCXX_USE_SCHED_YIELD
-#define _GLIBCXX_USE_SCHED_YIELD
-#endif
-#include <thread>
-#elif __has_include(<thread>) && !ANDROID
-// Clang + libc++
-#include <thread>
-#else
-
-// partial std::thread implementation for win32/pthread
-
-#include <algorithm>
-
-#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
-#define USE_RVALUE_REFERENCES
-#endif
-
-#ifdef __APPLE__
-#import <Foundation/NSAutoreleasePool.h>
-#endif
-
-#if defined(_WIN32)
-// WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-#if defined(_MSC_VER) && defined(_MT)
-// When linking with LIBCMT (the multithreaded C library), Microsoft recommends
-// using _beginthreadex instead of CreateThread.
-#define USE_BEGINTHREADEX
-#include <process.h>
-#endif
-
-#ifdef USE_BEGINTHREADEX
-#define THREAD_ID unsigned
-#define THREAD_RETURN unsigned __stdcall
-#else
-#define THREAD_ID DWORD
-#define THREAD_RETURN DWORD WINAPI
-#endif
-#define THREAD_HANDLE HANDLE
-
-#else
-// PTHREAD
-
-#include <unistd.h>
-
-#ifndef _POSIX_THREADS
-#error unsupported platform (no pthreads?)
-#endif
-
-#include <pthread.h>
-
-#define THREAD_ID pthread_t
-#define THREAD_HANDLE pthread_t
-#define THREAD_RETURN void*
-
-#endif
-
-namespace std
-{
-
-class thread
-{
-public:
-	typedef THREAD_HANDLE native_handle_type;
-
-	class id
-	{
-		friend class thread;
-	public:
-		id() : m_thread(0) {}
-		id(THREAD_ID _id) : m_thread(_id) {}
-
-		bool operator==(const id& rhs) const
-		{
-			return m_thread == rhs.m_thread;
-		}
-
-		bool operator!=(const id& rhs) const
-		{
-			return !(*this == rhs);
-		}
-
-		bool operator<(const id& rhs) const
-		{
-			return m_thread < rhs.m_thread;
-		}
-
-	private:
-		THREAD_ID m_thread;
-	};
-
-	// no variadic template support in msvc
-	//template <typename C, typename... A>
-	//thread(C&& func, A&&... args);
-
-	template <typename C>
-	thread(C func)
-	{
-		StartThread(new Func<C>(func));
-	}
-
-	template <typename C, typename A>
-	thread(C func, A arg)
-	{
-		StartThread(new FuncArg<C, A>(func, arg));
-	}
-
-	thread() /*= default;*/ {}
-
-#ifdef USE_RVALUE_REFERENCES
-	thread(const thread&) /*= delete*/;
-
-	thread(thread&& other)
-	{
-#else
-	thread(const thread& t)
-	{
-		// ugly const_cast to get around lack of rvalue references
-		thread& other = const_cast<thread&>(t);
-#endif
-		swap(other);
-	}
-
-#ifdef USE_RVALUE_REFERENCES
-	thread& operator=(const thread&) /*= delete*/;
-
-	thread& operator=(thread&& other)
-	{
-#else
-	thread& operator=(const thread& t)
-	{
-		// ugly const_cast to get around lack of rvalue references
-		thread& other = const_cast<thread&>(t);
-#endif
-		if (joinable())
-			detach();
-		swap(other);
-		return *this;
-	}
-
-	~thread()
-	{
-		if (joinable())
-			detach();
-	}
-
-	bool joinable() const
-	{
-		return m_id != id();
-	}
-
-	id get_id() const
-	{
-		return m_id;
-	}
-
-	native_handle_type native_handle()
-	{
-#ifdef _WIN32
-		return m_handle;
-#else
-		return m_id.m_thread;
-#endif
-	}
-
-	void join()
-	{
-#ifdef _WIN32
-		WaitForSingleObject(m_handle, INFINITE);
-		detach();
-#else
-		pthread_join(m_id.m_thread, NULL);
-		m_id = id();
-#endif
-	}
-
-	void detach()
-	{
-#ifdef _WIN32
-		CloseHandle(m_handle);
-#else
-		pthread_detach(m_id.m_thread);
-#endif
-		m_id = id();
-	}
-
-	void swap(thread& other)
-	{
-		std::swap(m_id, other.m_id);
-#ifdef _WIN32
-		std::swap(m_handle, other.m_handle);
-#endif
-	}
-	
-	static unsigned hardware_concurrency()
-	{
-#ifdef _WIN32
-		SYSTEM_INFO sysinfo;
-		GetSystemInfo(&sysinfo);
-		return static_cast<unsigned>(sysinfo.dwNumberOfProcessors);
-#else
-		return 0;
-#endif
-	}
-
-private:
-	id m_id;
-	
-#ifdef _WIN32
-	native_handle_type m_handle;
-#endif
-
-	template <typename F>
-	void StartThread(F* param)
-	{
-#ifdef USE_BEGINTHREADEX
-		m_handle = (HANDLE)_beginthreadex(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
-#elif defined(_WIN32)
-		m_handle = CreateThread(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
-#else
-		pthread_attr_t attr;
-		pthread_attr_init(&attr);
-		pthread_attr_setstacksize(&attr, 1024 * 1024);
-		if (pthread_create(&m_id.m_thread, &attr, &RunAndDelete<F>, param))
-			m_id = id();
-#endif
-	}
-	
-	template <typename C>
-	class Func
-	{
-	public:
-		Func(C _func) : func(_func) {}
-
-		void Run() { func(); }
-
-	private:
-		C const func;
-	};
-
-	template <typename C, typename A>
-	class FuncArg
-	{
-	public:
-		FuncArg(C _func, A _arg) : func(_func), arg(_arg) {}
-
-		void Run() { func(arg); }
-
-	private:
-		C const func;
-		A arg;
-	};
-
-	template <typename F>
-	static THREAD_RETURN RunAndDelete(void* param)
-	{
-#ifdef __APPLE__
-		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-#endif
-		static_cast<F*>(param)->Run();
-		delete static_cast<F*>(param);
-#ifdef __APPLE__
-		[pool release];
-#endif
-		return 0;
-	}
-};
-
-namespace this_thread
-{
-
-inline void yield()
-{
-#ifdef _WIN32
-	SwitchToThread();
-#else
-	sleep(0);
-#endif
-}
-
-inline thread::id get_id()
-{
-#ifdef _WIN32
-	return GetCurrentThreadId();
-#else
-	return pthread_self();
-#endif
-}
-
-}	// namespace this_thread
-
-}	// namespace std
-
-#undef USE_RVALUE_REFERENCES
-#undef USE_BEGINTHREADEX
-#undef THREAD_ID
-#undef THREAD_RETURN
-#undef THREAD_HANDLE
-
-#endif
-#endif
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp
deleted file mode 100644
index 189dfe98bc..0000000000
--- a/Source/Core/Common/Src/StringUtil.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <algorithm>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "StringUtil.h"
-
-#ifdef _WIN32
-	#include <Windows.h>
-#else
-	#include <iconv.h>
-	#include <errno.h>
-#endif
-
-// faster than sscanf
-bool AsciiToHex(const char* _szValue, u32& result)
-{
-	char *endptr = NULL;
-	const u32 value = strtoul(_szValue, &endptr, 16);
-
-	if (!endptr || *endptr)
-		return false;
-
-	result = value;
-	return true;
-}
-
-bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args)
-{
-	int writtenCount;
-
-#ifdef _WIN32
-	// You would think *printf are simple, right? Iterate on each character,
-	// if it's a format specifier handle it properly, etc.
-	//
-	// Nooooo. Not according to the C standard.
-	//
-	// According to the C99 standard (7.19.6.1 "The fprintf function")
-	//     The format shall be a multibyte character sequence
-	//
-	// Because some character encodings might have '%' signs in the middle of
-	// a multibyte sequence (SJIS for example only specifies that the first
-	// byte of a 2 byte sequence is "high", the second byte can be anything),
-	// printf functions have to decode the multibyte sequences and try their
-	// best to not screw up.
-	//
-	// Unfortunately, on Windows, the locale for most languages is not UTF-8
-	// as we would need. Notably, for zh_TW, Windows chooses EUC-CN as the
-	// locale, and completely fails when trying to decode UTF-8 as EUC-CN.
-	//
-	// On the other hand, the fix is simple: because we use UTF-8, no such
-	// multibyte handling is required as we can simply assume that no '%' char
-	// will be present in the middle of a multibyte sequence.
-	//
-	// This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l.
-	static locale_t c_locale = NULL;
-	if (!c_locale)
-		c_locale = _create_locale(LC_ALL, ".1252");
-	writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args);
-#else
-	writtenCount = vsnprintf(out, outsize, format, args);
-#endif
-
-	if (writtenCount > 0 && writtenCount < outsize)
-	{
-		out[writtenCount] = '\0';
-		return true;
-	}
-	else
-	{
-		out[outsize - 1] = '\0';
-		return false;
-	}
-}
-
-std::string StringFromFormat(const char* format, ...)
-{
-	va_list args;
-	char *buf = NULL;
-#ifdef _WIN32
-	int required = 0;
-
-	va_start(args, format);
-	required = _vscprintf(format, args);
-	buf = new char[required + 1];
-	CharArrayFromFormatV(buf, required + 1, format, args);
-	va_end(args);
-
-	std::string temp = buf;
-	delete[] buf;
-#else
-	va_start(args, format);
-	if (vasprintf(&buf, format, args) < 0)
-		ERROR_LOG(COMMON, "Unable to allocate memory for string");
-	va_end(args);
-
-	std::string temp = buf;
-	free(buf);
-#endif
-	return temp;
-}
-
-// For Debugging. Read out an u8 array.
-std::string ArrayToString(const u8 *data, u32 size, int line_len, bool spaces)
-{
-	std::ostringstream oss;
-	oss << std::setfill('0') << std::hex;
-	
-	for (int line = 0; size; ++data, --size)
-	{
-		oss << std::setw(2) << (int)*data;
-		
-		if (line_len == ++line)
-		{
-			oss << '\n';
-			line = 0;
-		}
-		else if (spaces)
-			oss << ' ';
-	}
-
-	return oss.str();
-}
-
-// Turns "  hej " into "hej". Also handles tabs.
-std::string StripSpaces(const std::string &str)
-{
-	const size_t s = str.find_first_not_of(" \t\r\n");
-
-	if (str.npos != s)
-		return str.substr(s, str.find_last_not_of(" \t\r\n") - s + 1);
-	else
-		return "";
-}
-
-// "\"hello\"" is turned to "hello"
-// This one assumes that the string has already been space stripped in both
-// ends, as done by StripSpaces above, for example.
-std::string StripQuotes(const std::string& s)
-{
-	if (s.size() && '\"' == s[0] && '\"' == *s.rbegin())
-		return s.substr(1, s.size() - 2);
-	else
-		return s;
-}
-
-bool TryParse(const std::string &str, u32 *const output)
-{
-	char *endptr = NULL;
-
-	// Reset errno to a value other than ERANGE
-	errno = 0;
-
-	unsigned long value = strtoul(str.c_str(), &endptr, 0);
-	
-	if (!endptr || *endptr)
-		return false;
-
-	if (errno == ERANGE)
-		return false;
-
-#if ULONG_MAX > UINT_MAX
-	if (value >= 0x100000000ull
-	    && value <= 0xFFFFFFFF00000000ull)
-		return false;
-#endif
-
-	*output = static_cast<u32>(value);
-	return true;
-}
-
-bool TryParse(const std::string &str, bool *const output)
-{
-	if ("1" == str || !strcasecmp("true", str.c_str()))
-		*output = true;
-	else if ("0" == str || !strcasecmp("false", str.c_str()))
-		*output = false;
-	else
-		return false;
-
-	return true;
-}
-
-std::string StringFromInt(int value)
-{
-	char temp[16];
-	sprintf(temp, "%i", value);
-	return temp;
-}
-
-std::string StringFromBool(bool value)
-{
-	return value ? "True" : "False";
-}
-
-bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension)
-{
-	if (full_path.empty())
-		return false;
-
-	size_t dir_end = full_path.find_last_of("/"
-	// windows needs the : included for something like just "C:" to be considered a directory
-#ifdef _WIN32
-		":"
-#endif
-	);
-	if (std::string::npos == dir_end)
-		dir_end = 0;
-	else
-		dir_end += 1;
-
-	size_t fname_end = full_path.rfind('.');
-	if (fname_end < dir_end || std::string::npos == fname_end)
-		fname_end = full_path.size();
-
-	if (_pPath)
-		*_pPath = full_path.substr(0, dir_end);
-
-	if (_pFilename)
-		*_pFilename = full_path.substr(dir_end, fname_end - dir_end);
-
-	if (_pExtension)
-		*_pExtension = full_path.substr(fname_end);
-
-	return true;
-}
-
-void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename)
-{
-	_CompleteFilename = _Path;
-
-	// check for seperator
-	if (DIR_SEP_CHR != *_CompleteFilename.rbegin())
-		_CompleteFilename += DIR_SEP_CHR;
-
-	// add the filename
-	_CompleteFilename += _Filename;
-}
-
-void SplitString(const std::string& str, const char delim, std::vector<std::string>& output)
-{
-	std::istringstream iss(str);
-	output.resize(1);
-
-	while (std::getline(iss, *output.rbegin(), delim))
-		output.push_back("");
-
-	output.pop_back();
-}
-
-std::string TabsToSpaces(int tab_size, const std::string &in)
-{
-	const std::string spaces(tab_size, ' ');
-	std::string out(in);
-
-	size_t i = 0;
-	while (out.npos != (i = out.find('\t')))
-		out.replace(i, 1, spaces);
-
-	return out;
-}
-
-std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest)
-{
-	while(1)
-	{
-		size_t pos = result.find(src);
-		if (pos == std::string::npos) break;
-		result.replace(pos, src.size(), dest);
-	}
-	return result;
-}
-
-// UriDecode and UriEncode are from http://www.codeguru.com/cpp/cpp/string/conversions/print.php/c12759
-// by jinq0123 (November 2, 2006)
-
-// Uri encode and decode.
-// RFC1630, RFC1738, RFC2396
-
-//#include <string>
-//#include <assert.h>
-
-const char HEX2DEC[256] = 
-{
-	/*       0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F */
-	/* 0 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* 1 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* 2 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* 3 */  0, 1, 2, 3,  4, 5, 6, 7,  8, 9,16,16, 16,16,16,16,
-
-	/* 4 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16,
-	/* 5 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* 6 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16,
-	/* 7 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-
-	/* 8 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* 9 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* A */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* B */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-
-	/* C */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* D */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* E */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16,
-	/* F */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16
-};
-
-std::string UriDecode(const std::string & sSrc)
-{
-	// Note from RFC1630:  "Sequences which start with a percent sign
-	// but are not followed by two hexadecimal characters (0-9, A-F) are reserved
-	// for future extension"
-
-	const unsigned char * pSrc = (const unsigned char *)sSrc.c_str();
-	const size_t SRC_LEN = sSrc.length();
-	const unsigned char * const SRC_END = pSrc + SRC_LEN;
-	const unsigned char * const SRC_LAST_DEC = SRC_END - 2;   // last decodable '%' 
-
-	char * const pStart = new char[SRC_LEN];
-	char * pEnd = pStart;
-
-	while (pSrc < SRC_LAST_DEC)
-	{
-		if (*pSrc == '%')
-		{
-			char dec1, dec2;
-			if (16 != (dec1 = HEX2DEC[*(pSrc + 1)])
-				&& 16 != (dec2 = HEX2DEC[*(pSrc + 2)]))
-			{
-				*pEnd++ = (dec1 << 4) + dec2;
-				pSrc += 3;
-				continue;
-			}
-		}
-
-		*pEnd++ = *pSrc++;
-	}
-
-	// the last 2- chars
-	while (pSrc < SRC_END)
-		*pEnd++ = *pSrc++;
-
-	std::string sResult(pStart, pEnd);
-	delete [] pStart;
-	return sResult;
-}
-
-// Only alphanum is safe.
-const char SAFE[256] =
-{
-	/*      0 1 2 3  4 5 6 7  8 9 A B  C D E F */
-	/* 0 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* 1 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* 2 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* 3 */ 1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0,
-
-	/* 4 */ 0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
-	/* 5 */ 1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
-	/* 6 */ 0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
-	/* 7 */ 1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
-
-	/* 8 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* 9 */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* A */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* B */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-
-	/* C */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* D */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* E */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-	/* F */ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0
-};
-
-std::string UriEncode(const std::string & sSrc)
-{
-	const char DEC2HEX[16 + 1] = "0123456789ABCDEF";
-	const unsigned char * pSrc = (const unsigned char *)sSrc.c_str();
-	const size_t SRC_LEN = sSrc.length();
-	unsigned char * const pStart = new unsigned char[SRC_LEN * 3];
-	unsigned char * pEnd = pStart;
-	const unsigned char * const SRC_END = pSrc + SRC_LEN;
-
-	for (; pSrc < SRC_END; ++pSrc)
-	{
-		if (SAFE[*pSrc]) 
-			*pEnd++ = *pSrc;
-		else
-		{
-			// escape this char
-			*pEnd++ = '%';
-			*pEnd++ = DEC2HEX[*pSrc >> 4];
-			*pEnd++ = DEC2HEX[*pSrc & 0x0F];
-		}
-	}
-
-	std::string sResult((char *)pStart, (char *)pEnd);
-	delete [] pStart;
-	return sResult;
-}
-
-#ifdef _WIN32
-
-std::string UTF16ToUTF8(const std::wstring& input)
-{
-	auto const size = WideCharToMultiByte(CP_UTF8, 0, input.data(), input.size(), nullptr, 0, nullptr, nullptr);
-
-	std::string output;
-	output.resize(size);
-
-	if (size == 0 || size != WideCharToMultiByte(CP_UTF8, 0, input.data(), input.size(), &output[0], output.size(), nullptr, nullptr))
-		output.clear();
-
-	return output;
-}
-
-std::wstring CPToUTF16(u32 code_page, const std::string& input)
-{
-	auto const size = MultiByteToWideChar(code_page, 0, input.data(), input.size(), nullptr, 0);
-
-	std::wstring output;
-	output.resize(size);
-
-	if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), input.size(), &output[0], output.size()))
-		output.clear();
-
-	return output;
-}
-
-std::wstring UTF8ToUTF16(const std::string& input)
-{
-	return CPToUTF16(CP_UTF8, input);
-}
-
-std::string SHIFTJISToUTF8(const std::string& input)
-{
-	return UTF16ToUTF8(CPToUTF16(932, input));
-}
-
-std::string CP1252ToUTF8(const std::string& input)
-{
-	return UTF16ToUTF8(CPToUTF16(1252, input));
-}
-
-#else
-
-template <typename T>
-std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
-{
-	std::string result;
-
-	iconv_t const conv_desc = iconv_open("UTF-8", fromcode);
-	if ((iconv_t)-1 == conv_desc)
-	{
-		ERROR_LOG(COMMON, "Iconv initialization failure [%s]: %s", fromcode, strerror(errno));
-	}
-	else
-	{
-		size_t const in_bytes = sizeof(T) * input.size();
-		size_t const out_buffer_size = 4 * in_bytes;
-
-		std::string out_buffer;
-		out_buffer.resize(out_buffer_size);
-
-		auto src_buffer = &input[0];
-		size_t src_bytes = in_bytes;
-		auto dst_buffer = &out_buffer[0];
-		size_t dst_bytes = out_buffer.size();
-
-		while (src_bytes != 0)
-		{
-			size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes,
-				&dst_buffer, &dst_bytes);
-
-			if ((size_t)-1 == iconv_result)
-			{
-				if (EILSEQ == errno || EINVAL == errno)
-				{
-					// Try to skip the bad character
-					if (src_bytes != 0)
-					{
-						--src_bytes;
-						++src_buffer;
-					}
-				}
-				else
-				{
-					ERROR_LOG(COMMON, "iconv failure [%s]: %s", fromcode, strerror(errno));
-					break;
-				}
-			}
-		}
-
-		out_buffer.resize(out_buffer_size - dst_bytes);
-		out_buffer.swap(result);
-		
-		iconv_close(conv_desc);
-	}
-	
-	return result;
-}
-
-std::string CP1252ToUTF8(const std::string& input)
-{
-	//return CodeToUTF8("CP1252//TRANSLIT", input);
-	//return CodeToUTF8("CP1252//IGNORE", input);
-	return CodeToUTF8("CP1252", input);
-}
-
-std::string SHIFTJISToUTF8(const std::string& input)
-{
-	//return CodeToUTF8("CP932", input);
-	return CodeToUTF8("SJIS", input);
-}
-
-std::string UTF16ToUTF8(const std::wstring& input)
-{
-	std::string result =
-	//	CodeToUTF8("UCS-2", input);
-	//	CodeToUTF8("UCS-2LE", input);
-	//	CodeToUTF8("UTF-16", input);
-		CodeToUTF8("UTF-16LE", input);
-
-	// TODO: why is this needed?
-	result.erase(std::remove(result.begin(), result.end(), 0x00), result.end());
-	return result;
-}
-
-#endif
diff --git a/Source/Core/Common/Src/StringUtil.h b/Source/Core/Common/Src/StringUtil.h
deleted file mode 100644
index 56c223641b..0000000000
--- a/Source/Core/Common/Src/StringUtil.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _STRINGUTIL_H_
-#define _STRINGUTIL_H_
-
-#include <stdarg.h>
-
-#include <vector>
-#include <string>
-#include <sstream>
-#include <iomanip>
-
-#include "Common.h"
-
-std::string StringFromFormat(const char* format, ...);
-// Cheap!
-bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args);
-
-template<size_t Count>
-inline void CharArrayFromFormat(char (& out)[Count], const char* format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	CharArrayFromFormatV(out, Count, format, args);
-	va_end(args);
-}
-
-// Good
-std::string ArrayToString(const u8 *data, u32 size, int line_len = 20, bool spaces = true);
-
-std::string StripSpaces(const std::string &s);
-std::string StripQuotes(const std::string &s);
-
-// Thousand separator. Turns 12345678 into 12,345,678
-template <typename I>
-std::string ThousandSeparate(I value, int spaces = 0)
-{
-	std::ostringstream oss;
-
-// std::locale("") seems to be broken on many platforms
-#if defined _WIN32 || (defined __linux__ && !defined __clang__)
-	oss.imbue(std::locale(""));
-#endif
-	oss << std::setw(spaces) << value;
-
-	return oss.str();
-}
-
-std::string StringFromInt(int value);
-std::string StringFromBool(bool value);
-
-bool TryParse(const std::string &str, bool *output);
-bool TryParse(const std::string &str, u32 *output);
-
-template <typename N>
-static bool TryParse(const std::string &str, N *const output)
-{
-	std::istringstream iss(str);
-	
-	N tmp = 0;
-	if (iss >> tmp)
-	{
-		*output = tmp;
-		return true;
-	}
-	else
-		return false;
-}
-
-// TODO: kill this
-bool AsciiToHex(const char* _szValue, u32& result);
-
-std::string TabsToSpaces(int tab_size, const std::string &in);
-
-void SplitString(const std::string& str, char delim, std::vector<std::string>& output);
-
-// "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
-bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension);
-
-void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename);
-std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest);
-std::string UriDecode(const std::string & sSrc);
-std::string UriEncode(const std::string & sSrc);
-
-std::string CP1252ToUTF8(const std::string& str);
-std::string SHIFTJISToUTF8(const std::string& str);
-std::string UTF16ToUTF8(const std::wstring& str);
-
-#ifdef _WIN32
-
-std::wstring UTF8ToUTF16(const std::string& str);
-
-#ifdef _UNICODE
-inline std::string TStrToUTF8(const std::wstring& str)
-{ return UTF16ToUTF8(str); }
-
-inline std::wstring UTF8ToTStr(const std::string& str)
-{ return UTF8ToUTF16(str); }
-#else
-inline std::string TStrToUTF8(const std::string& str)
-{ return str; }
-
-inline std::string UTF8ToTStr(const std::string& str)
-{ return str; }
-#endif
-
-#endif
-
-#endif // _STRINGUTIL_H_
diff --git a/Source/Core/Common/Src/SymbolDB.cpp b/Source/Core/Common/Src/SymbolDB.cpp
deleted file mode 100644
index 2dd4ee7473..0000000000
--- a/Source/Core/Common/Src/SymbolDB.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "SymbolDB.h"
-
-
-void SymbolDB::List()
-{
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-	{
-		DEBUG_LOG(OSHLE, "%s @ %08x: %i bytes (hash %08x) : %i calls",
-			iter->second.name.c_str(), iter->second.address,
-			iter->second.size, iter->second.hash,
-			iter->second.numCalls);
-	}
-	INFO_LOG(OSHLE, "%lu functions known in this program above.",
-		(unsigned long)functions.size());
-}
-
-void SymbolDB::Clear(const char *prefix)
-{
-	// TODO: honor prefix
-	functions.clear();
-	checksumToFunction.clear();
-}
-
-void SymbolDB::Index()
-{
-	int i = 0;
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-	{
-		iter->second.index = i++;
-	}
-}
-
-Symbol *SymbolDB::GetSymbolFromName(const char *name)
-{
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-	{
-		if (!strcmp(iter->second.name.c_str(), name))
-			return &iter->second;
-	}
-	return 0;
-}
-
-void SymbolDB::AddCompleteSymbol(const Symbol &symbol)
-{
-	functions.insert(std::pair<u32, Symbol>(symbol.address, symbol));
-}
diff --git a/Source/Core/Common/Src/SymbolDB.h b/Source/Core/Common/Src/SymbolDB.h
deleted file mode 100644
index e189ca24fa..0000000000
--- a/Source/Core/Common/Src/SymbolDB.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// This file contains a generic symbol map implementation. For CPU-specific
-// magic, derive and extend.
-
-#ifndef _SYMBOL_DB_H
-#define _SYMBOL_DB_H
-
-#include <string>
-#include <map>
-#include <vector>
-
-#include "Common.h"
-
-struct SCall
-{
-	SCall(u32 a, u32 b) :
-		function(a),
-		callAddress(b)
-	{}
-	u32 function;
-	u32 callAddress;
-};
-
-struct Symbol
-{
-	enum {
-		SYMBOL_FUNCTION = 0,
-		SYMBOL_DATA = 1,
-	};
-
-	Symbol() :
-		hash(0),
-		address(0),
-		flags(0),
-		size(0),
-		numCalls(0),
-		type(SYMBOL_FUNCTION),
-		analyzed(0)
-	{}
-
-	std::string name;
-	std::vector<SCall> callers; //addresses of functions that call this function
-	std::vector<SCall> calls;   //addresses of functions that are called by this function
-	u32 hash;            //use for HLE function finding
-	u32 address;
-	u32 flags;
-	int size;
-	int numCalls;
-	int type;
-	int index; // only used for coloring the disasm view
-	int analyzed;
-};
-
-enum
-{
-	FFLAG_TIMERINSTRUCTIONS=(1<<0),
-	FFLAG_LEAF=(1<<1),
-	FFLAG_ONLYCALLSNICELEAFS=(1<<2),
-	FFLAG_EVIL=(1<<3),
-	FFLAG_RFI=(1<<4),
-	FFLAG_STRAIGHT=(1<<5)
-};
-
-
-
-class SymbolDB
-{
-public:
-	typedef std::map<u32, Symbol>  XFuncMap;
-	typedef std::map<u32, Symbol*> XFuncPtrMap;
-
-protected:
-	XFuncMap    functions;
-	XFuncPtrMap checksumToFunction;
-
-public:
-	SymbolDB() {}
-	virtual ~SymbolDB() {}
-	virtual Symbol *GetSymbolFromAddr(u32 addr) { return 0; }
-	virtual Symbol *AddFunction(u32 startAddr) { return 0;}
-
-	void AddCompleteSymbol(const Symbol &symbol);
-
-	Symbol *GetSymbolFromName(const char *name);
-	Symbol *GetSymbolFromHash(u32 hash) {
-		XFuncPtrMap::iterator iter = checksumToFunction.find(hash);
-		if (iter != checksumToFunction.end())
-			return iter->second;
-		else
-			return 0;
-	}
-
-	const XFuncMap &Symbols() const {return functions;}
-	XFuncMap &AccessSymbols() {return functions;}
-
-	// deprecated
-	XFuncMap::iterator GetIterator() { return functions.begin(); }
-	XFuncMap::const_iterator GetConstIterator() { return functions.begin(); }
-	XFuncMap::iterator End() { return functions.end(); }
-
-	void Clear(const char *prefix = "");
-	void List();
-	void Index();
-};
-
-#endif
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
deleted file mode 100644
index b0328f7a1f..0000000000
--- a/Source/Core/Common/Src/Thread.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _THREAD_H_
-#define _THREAD_H_
-
-#include "StdConditionVariable.h"
-#include "StdMutex.h"
-#include "StdThread.h"
-
-// Don't include common.h here as it will break LogManager
-#include "CommonTypes.h"
-#include <stdio.h>
-#include <string.h>
-
-// This may not be defined outside _WIN32
-#ifndef _WIN32
-#ifndef INFINITE
-#define INFINITE 0xffffffff
-#endif
-
-//for gettimeofday and struct time(spec|val)
-#include <time.h>
-#include <sys/time.h>
-#endif
-
-namespace Common
-{
-
-int CurrentThreadId();
-
-void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
-void SetCurrentThreadAffinity(u32 mask);
-	
-class Event
-{
-public:
-	Event()
-		: is_set(false)
-	{};
-
-	void Set()
-	{
-		std::lock_guard<std::mutex> lk(m_mutex);
-		if (!is_set)
-		{
-			is_set = true;
-			m_condvar.notify_one();
-		}
-	}
-
-	void Wait()
-	{
-		std::unique_lock<std::mutex> lk(m_mutex);
-		m_condvar.wait(lk, IsSet(this));
-		is_set = false;
-	}
-
-	void Reset()
-	{
-		std::unique_lock<std::mutex> lk(m_mutex);
-		// no other action required, since wait loops on the predicate and any lingering signal will get cleared on the first iteration
-		is_set = false;
-	}
-
-private:
-	class IsSet
-	{
-	public:
-		IsSet(const Event* ev)
-			: m_event(ev)
-		{}
-
-		bool operator()()
-		{
-			return m_event->is_set;
-		}
-
-	private:
-		const Event* const m_event;
-	};
-
-	volatile bool is_set;
-	std::condition_variable m_condvar;
-	std::mutex m_mutex;
-};
-
-// TODO: doesn't work on windows with (count > 2)
-class Barrier
-{
-public:
-	Barrier(size_t count)
-		: m_count(count), m_waiting(0)
-	{}
-
-	// block until "count" threads call Sync()
-	bool Sync()
-	{
-		std::unique_lock<std::mutex> lk(m_mutex);
-
-		// TODO: broken when next round of Sync()s
-		// is entered before all waiting threads return from the notify_all
-
-		if (m_count == ++m_waiting)
-		{
-			m_waiting = 0;
-			m_condvar.notify_all();
-			return true;
-		}
-		else
-		{
-			m_condvar.wait(lk, IsDoneWating(this));
-			return false;
-		}
-	}
-
-private:
-	class IsDoneWating
-	{
-	public:
-		IsDoneWating(const Barrier* bar)
-			: m_bar(bar)
-		{}
-
-		bool operator()()
-		{
-			return (0 == m_bar->m_waiting);
-		}
-
-	private:
-		const Barrier* const m_bar;
-	};
-
-	std::condition_variable m_condvar;
-	std::mutex m_mutex;
-	const size_t m_count;
-	volatile size_t m_waiting;
-};
-	
-void SleepCurrentThread(int ms);
-void SwitchCurrentThread();	// On Linux, this is equal to sleep 1ms
-
-// Use this function during a spin-wait to make the current thread
-// relax while another thread is working. This may be more efficient
-// than using events because event functions use kernel calls.
-inline void YieldCPU()
-{
-	std::this_thread::yield();
-}
-	
-void SetCurrentThreadName(const char *name);
-	
-} // namespace Common
-
-#endif // _THREAD_H_
diff --git a/Source/Core/Common/Src/Thunk.h b/Source/Core/Common/Src/Thunk.h
deleted file mode 100644
index b1487badf8..0000000000
--- a/Source/Core/Common/Src/Thunk.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _THUNK_H_
-#define _THUNK_H_
-
-#include <map>
-
-#include "Common.h"
-#include "x64Emitter.h"
-
-// This simple class creates a wrapper around a C/C++ function that saves all fp state
-// before entering it, and restores it upon exit. This is required to be able to selectively
-// call functions from generated code, without inflicting the performance hit and increase
-// of complexity that it means to protect the generated code from this problem.
-
-// This process is called thunking.
-
-// There will only ever be one level of thunking on the stack, plus,
-// we don't want to pollute the stack, so we store away regs somewhere global.
-// NOT THREAD SAFE. This may only be used from the CPU thread.
-// Any other thread using this stuff will be FATAL.
-
-class ThunkManager : public Gen::XCodeBlock
-{
-	std::map<void *, const u8 *> thunks;
-
-	const u8 *save_regs;
-	const u8 *load_regs;
-
-public:
-	ThunkManager() {
-		Init();
-	}
-	~ThunkManager() {
-		Shutdown();
-	}
-	void *ProtectFunction(void *function, int num_params);
-private:
-	void Init();
-	void Shutdown();
-	void Reset();
-};
-
-#endif // _THUNK_H_
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp
deleted file mode 100644
index 945d2fac76..0000000000
--- a/Source/Core/Common/Src/Timer.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <time.h>
-
-#ifdef _WIN32
-#include <Windows.h>
-#include <mmsystem.h>
-#include <sys/timeb.h>
-#else
-#include <sys/time.h>
-#endif
-
-#include "Common.h"
-#include "Timer.h"
-#include "StringUtil.h"
-
-namespace Common
-{
-
-u32 Timer::GetTimeMs()
-{
-#ifdef _WIN32
-	return timeGetTime();
-#else
-	struct timeval t;
-	(void)gettimeofday(&t, NULL);
-	return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000));
-#endif
-}
-
-// --------------------------------------------
-// Initiate, Start, Stop, and Update the time
-// --------------------------------------------
-
-// Set initial values for the class
-Timer::Timer()
-	: m_LastTime(0), m_StartTime(0), m_Running(false)
-{
-	Update();
-}
-
-// Write the starting time
-void Timer::Start()
-{
-	m_StartTime = GetTimeMs();
-	m_Running = true;
-}
-
-// Stop the timer
-void Timer::Stop()
-{
-	// Write the final time
-	m_LastTime = GetTimeMs();
-	m_Running = false;
-}
-
-// Update the last time variable
-void Timer::Update()
-{
-	m_LastTime = GetTimeMs();
-	//TODO(ector) - QPF
-}
-
-// -------------------------------------
-// Get time difference and elapsed time
-// -------------------------------------
-
-// Get the number of milliseconds since the last Update()
-u64 Timer::GetTimeDifference()
-{
-	return GetTimeMs() - m_LastTime;
-}
-
-// Add the time difference since the last Update() to the starting time.
-// This is used to compensate for a paused game.
-void Timer::AddTimeDifference()
-{
-	m_StartTime += GetTimeDifference();
-}
-
-// Get the time elapsed since the Start()
-u64 Timer::GetTimeElapsed()
-{
-	// If we have not started yet, return 1 (because then I don't
-	// have to change the FPS calculation in CoreRerecording.cpp .
-	if (m_StartTime == 0) return 1;
-
-	// Return the final timer time if the timer is stopped
-	if (!m_Running) return (m_LastTime - m_StartTime);
-
-	return (GetTimeMs() - m_StartTime);
-}
-
-// Get the formatted time elapsed since the Start()
-std::string Timer::GetTimeElapsedFormatted() const
-{
-	// If we have not started yet, return zero
-	if (m_StartTime == 0)
-		return "00:00:00:000";
-
-	// The number of milliseconds since the start.
-	// Use a different value if the timer is stopped.
-	u64 Milliseconds;
-	if (m_Running)
-		Milliseconds = GetTimeMs() - m_StartTime;
-	else
-		Milliseconds = m_LastTime - m_StartTime;
-	// Seconds
-	u32 Seconds = (u32)(Milliseconds / 1000);
-	// Minutes
-	u32 Minutes = Seconds / 60;
-	// Hours
-	u32 Hours = Minutes / 60;
-
-	std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03i",
-		Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000);
-	return TmpStr;
-}
-
-// Get current time
-void Timer::IncreaseResolution()
-{
-#ifdef _WIN32
-	timeBeginPeriod(1);
-#endif
-}
-
-void Timer::RestoreResolution()
-{
-#ifdef _WIN32
-	timeEndPeriod(1);
-#endif
-}
-
-// Get the number of seconds since January 1 1970
-u64 Timer::GetTimeSinceJan1970()
-{
-	time_t ltime;
-	time(&ltime);
-	return((u64)ltime);
-}
-
-u64 Timer::GetLocalTimeSinceJan1970()
-{
-	time_t sysTime, tzDiff, tzDST;
-	struct tm * gmTime;
-
-	time(&sysTime);
-
-	// Account for DST where needed
-	gmTime = localtime(&sysTime);
-	if(gmTime->tm_isdst == 1)
-		tzDST = 3600;
-	else
-		tzDST = 0;
-
-	// Lazy way to get local time in sec
-	gmTime	= gmtime(&sysTime);
-	tzDiff = sysTime - mktime(gmTime);
-
-	return (u64)(sysTime + tzDiff + tzDST);
-}
-
-// Return the current time formatted as Minutes:Seconds:Milliseconds
-// in the form 00:00:000.
-std::string Timer::GetTimeFormatted()
-{
-	time_t sysTime;
-	struct tm * gmTime;
-	char formattedTime[13];
-	char tmp[13];
-
-	time(&sysTime);
-	gmTime = localtime(&sysTime);
-
-	strftime(tmp, 6, "%M:%S", gmTime);
-
-	// Now tack on the milliseconds
-#ifdef _WIN32
-	struct timeb tp;
-	(void)::ftime(&tp);
-	sprintf(formattedTime, "%s:%03i", tmp, tp.millitm);
-#else
-	struct timeval t;
-	(void)gettimeofday(&t, NULL);
-	sprintf(formattedTime, "%s:%03d", tmp, (int)(t.tv_usec / 1000));
-#endif
-
-	return std::string(formattedTime);
-}
-
-// Returns a timestamp with decimals for precise time comparisons
-// ----------------
-double Timer::GetDoubleTime()
-{
-#ifdef _WIN32
-	struct timeb tp;
-	(void)::ftime(&tp);
-#else
-	struct timeval t;
-	(void)gettimeofday(&t, NULL);
-#endif
-	// Get continuous timestamp
-	u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970();
-
-	// Remove a few years. We only really want enough seconds to make
-	// sure that we are detecting actual actions, perhaps 60 seconds is
-	// enough really, but I leave a year of seconds anyway, in case the
-	// user's clock is incorrect or something like that.
-	TmpSeconds = TmpSeconds - (38 * 365 * 24 * 60 * 60);
-
-	// Make a smaller integer that fits in the double
-	u32 Seconds = (u32)TmpSeconds;
-#ifdef _WIN32
-	double ms = tp.millitm / 1000.0 / 1000.0;
-#else
-	double ms = t.tv_usec / 1000000.0;
-#endif
-	double TmpTime = Seconds + ms;
-
-	return TmpTime;
-}
-
-} // Namespace Common
diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp
deleted file mode 100644
index db89a25a82..0000000000
--- a/Source/Core/Common/Src/Version.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "scmrev.h"
-
-#ifdef _DEBUG
-	#define BUILD_TYPE_STR "Debug "
-#elif defined DEBUGFAST
-	#define BUILD_TYPE_STR "DebugFast "
-#else
-	#define BUILD_TYPE_STR ""
-#endif
-
-const char *scm_rev_str = "Dolphin "
-#if !SCM_IS_MASTER
-	"[" SCM_BRANCH_STR "] "
-#endif
-
-#ifdef __INTEL_COMPILER
-	BUILD_TYPE_STR SCM_DESC_STR "-ICC";
-#else
-	BUILD_TYPE_STR SCM_DESC_STR;
-#endif
-
-#ifdef _M_X64
-#define NP_ARCH "x64"
-#else
-#ifdef _M_ARM
-#define NP_ARCH "ARM"
-#else	
-#define NP_ARCH "x86"
-#endif
-#endif
-
-#ifdef _WIN32
-const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH;
-#elif __APPLE__
-const char *netplay_dolphin_ver = SCM_DESC_STR " M" NP_ARCH;
-#else
-const char *netplay_dolphin_ver = SCM_DESC_STR " L" NP_ARCH;
-#endif
-
-const char *scm_rev_git_str = SCM_REV_STR;
diff --git a/Source/Core/Common/Src/stdafx.cpp b/Source/Core/Common/Src/stdafx.cpp
deleted file mode 100644
index b602b39925..0000000000
--- a/Source/Core/Common/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
diff --git a/Source/Core/Common/Src/stdafx.h b/Source/Core/Common/Src/stdafx.h
deleted file mode 100644
index 1a2e716e34..0000000000
--- a/Source/Core/Common/Src/stdafx.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#ifndef _WIN32_WINNT
-	#define _WIN32_WINNT 0x501
-#endif
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
-#define _CRT_SECURE_NO_DEPRECATE 1
-#define _CRT_NONSTDC_NO_DEPRECATE 1
-
-#include <windows.h>
-#include <tchar.h>
-#include <vector>
-
diff --git a/Source/Core/Common/Src/x64ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp
deleted file mode 100644
index b5726947fc..0000000000
--- a/Source/Core/Common/Src/x64ABI.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-using namespace Gen;
-
-// Shared code between Win64 and Unix64
-
-unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog) {
-	// On platforms other than Windows 32-bit: At the beginning of a function,
-	// the stack pointer is 4/8 bytes less than a multiple of 16; however, the
-	// function prolog immediately subtracts an appropriate amount to align
-	// it, so no alignment is required around a call. 
-	// In the functions generated by ThunkManager::ProtectFunction, we add the
-	// necessary subtraction (and 0x20 bytes shadow space for Win64) into this
-	// rather than having a separate prolog.
-	// On Windows 32-bit, the required alignment is only 4 bytes, so we just
-	// ensure that the frame size isn't misaligned.
-#ifdef _M_X64
-	// expect frameSize == 0
-	frameSize = noProlog ? 0x28 : 0;
-#elif defined(_WIN32)
-	frameSize = (frameSize + 3) & -4;
-#else
-	unsigned int existingAlignment = noProlog ? 0xc : 0;
-	frameSize -= existingAlignment;
-	frameSize = (frameSize + 15) & -16;
-	frameSize += existingAlignment;
-#endif
-	return frameSize;
-}
-
-void XEmitter::ABI_AlignStack(unsigned int frameSize, bool noProlog) {
-	unsigned int fillSize =
-		ABI_GetAlignedFrameSize(frameSize, noProlog) - frameSize;
-	if (fillSize != 0) {
-#ifdef _M_X64
-		SUB(64, R(RSP), Imm8(fillSize));
-#else
-		SUB(32, R(ESP), Imm8(fillSize));
-#endif
-	}
-}
-
-void XEmitter::ABI_RestoreStack(unsigned int frameSize, bool noProlog) {
-	unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize, noProlog);
-	if (alignedSize != 0) {
-#ifdef _M_X64
-		ADD(64, R(RSP), Imm8(alignedSize));
-#else
-		ADD(32, R(ESP), Imm8(alignedSize));
-#endif
-	}
-}
-
-#ifdef _M_IX86 // All32
-
-// Shared code between Win32 and Unix32
-void XEmitter::ABI_CallFunction(void *func) {
-	ABI_AlignStack(0);
-	CALL(func);
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) {
-	ABI_AlignStack(1 * 2);
-	PUSH(16, Imm16(param1));
-	CALL(func);
-	ABI_RestoreStack(1 * 2);
-}
-
-void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) {
-	ABI_AlignStack(1 * 2 + 1 * 4);
-	PUSH(16, Imm16(param2));
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_AlignStack(1 * 2 + 1 * 4);
-}
-
-void XEmitter::ABI_CallFunctionC(void *func, u32 param1) {
-	ABI_AlignStack(1 * 4);
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_RestoreStack(1 * 4);
-}
-
-void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) {
-	ABI_AlignStack(2 * 4);
-	PUSH(32, Imm32(param2));
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_RestoreStack(2 * 4);
-}
-
-void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) {
-	ABI_AlignStack(3 * 4);
-	PUSH(32, Imm32(param3));
-	PUSH(32, Imm32(param2));
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_RestoreStack(3 * 4);
-}
-
-void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) {
-	ABI_AlignStack(3 * 4);
-	PUSH(32, Imm32((u32)param3));
-	PUSH(32, Imm32(param2));
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_RestoreStack(3 * 4);
-}
-
-void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2,u32 param3, void *param4) {
-	ABI_AlignStack(4 * 4);
-	PUSH(32, Imm32((u32)param4));
-	PUSH(32, Imm32(param3));
-	PUSH(32, Imm32(param2));
-	PUSH(32, Imm32(param1));
-	CALL(func);
-	ABI_RestoreStack(4 * 4);
-}
-
-void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2,u32 param3) {
-	ABI_AlignStack(3 * 4);
-	PUSH(32, Imm32(param3));
-	PUSH(32, Imm32((u32)param2));
-	PUSH(32, Imm32((u32)param1));
-	CALL(func);
-	ABI_RestoreStack(3 * 4);
-}
-
-// Pass a register as a parameter.
-void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) {
-	ABI_AlignStack(1 * 4);
-	PUSH(32, R(reg1));
-	CALL(func);
-	ABI_RestoreStack(1 * 4);
-}
-
-// Pass two registers as parameters.
-void XEmitter::ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2)
-{
-	ABI_AlignStack(2 * 4);
-	PUSH(32, R(reg2));
-	PUSH(32, R(reg1));
-	CALL(func);
-	ABI_RestoreStack(2 * 4);
-}
-
-void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2)
-{
-	ABI_AlignStack(2 * 4);
-	PUSH(32, Imm32(param2));
-	PUSH(32, arg1);
-	CALL(func);
-	ABI_RestoreStack(2 * 4);
-}
-
-void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1)
-{
-	ABI_AlignStack(1 * 4);
-	PUSH(32, arg1);
-	CALL(func);
-	ABI_RestoreStack(1 * 4);
-}
-
-void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() {
-	PUSH(EBP);
-	MOV(32, R(EBP), R(ESP));
-	PUSH(EBX);
-	PUSH(ESI);
-	PUSH(EDI);
-	SUB(32, R(ESP), Imm8(0xc));
-}
-
-void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() {
-	ADD(32, R(ESP), Imm8(0xc));
-	POP(EDI);
-	POP(ESI);
-	POP(EBX);
-	POP(EBP);
-}
-
-#else //64bit
-
-// Common functions
-void XEmitter::ABI_CallFunction(void *func) {
-	ABI_AlignStack(0);
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32((u32)param1));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	MOV(32, R(ABI_PARAM2), Imm32((u32)param2));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-		&& distance <  0xFFFFFFFF80000000ULL) {
-			// Far call
-			MOV(64, R(RAX), Imm64((u64)func));
-			CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionC(void *func, u32 param1) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	MOV(32, R(ABI_PARAM2), Imm32(param2));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	MOV(32, R(ABI_PARAM2), Imm32(param2));
-	MOV(32, R(ABI_PARAM3), Imm32(param3));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	MOV(32, R(ABI_PARAM2), Imm32(param2));
-	MOV(64, R(ABI_PARAM3), Imm64((u64)param3));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4) {
-	ABI_AlignStack(0);
-	MOV(32, R(ABI_PARAM1), Imm32(param1));
-	MOV(32, R(ABI_PARAM2), Imm32(param2));
-	MOV(32, R(ABI_PARAM3), Imm32(param3));
-	MOV(64, R(ABI_PARAM4), Imm64((u64)param4));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3) {
-	ABI_AlignStack(0);
-	MOV(64, R(ABI_PARAM1), Imm64((u64)param1));
-	MOV(64, R(ABI_PARAM2), Imm64((u64)param2));
-	MOV(32, R(ABI_PARAM3), Imm32(param3));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-// Pass a register as a parameter.
-void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) {
-	ABI_AlignStack(0);
-	if (reg1 != ABI_PARAM1)
-		MOV(32, R(ABI_PARAM1), R(reg1));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-// Pass two registers as parameters.
-void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2) {
-	ABI_AlignStack(0);
-	if (reg2 != ABI_PARAM1) {
-		if (reg1 != ABI_PARAM1)
-			MOV(64, R(ABI_PARAM1), R(reg1));
-		if (reg2 != ABI_PARAM2)
-			MOV(64, R(ABI_PARAM2), R(reg2));
-	} else {
-		if (reg2 != ABI_PARAM2)
-			MOV(64, R(ABI_PARAM2), R(reg2));
-		if (reg1 != ABI_PARAM1)
-			MOV(64, R(ABI_PARAM1), R(reg1));
-	}
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2)
-{
-	ABI_AlignStack(0);
-	if (!arg1.IsSimpleReg(ABI_PARAM1))
-		MOV(32, R(ABI_PARAM1), arg1);
-	MOV(32, R(ABI_PARAM2), Imm32(param2));
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1)
-{
-	ABI_AlignStack(0);
-	if (!arg1.IsSimpleReg(ABI_PARAM1))
-		MOV(32, R(ABI_PARAM1), arg1);
-	u64 distance = u64(func) - (u64(code) + 5);
-	if (distance >= 0x0000000080000000ULL
-	 && distance <  0xFFFFFFFF80000000ULL) {
-		// Far call
-		MOV(64, R(RAX), Imm64((u64)func));
-		CALLptr(R(RAX));
-	} else {
-		CALL(func);
-	}
-	ABI_RestoreStack(0);
-}
-
-void XEmitter::ABI_PushAllCallerSavedRegsAndAdjustStack() {
-	PUSH(RCX);
-	PUSH(RDX);
-	PUSH(RSI); 
-	PUSH(RDI);
-	PUSH(R8);
-	PUSH(R9);
-	PUSH(R10);
-	PUSH(R11);
-	PUSH(R11);
-}
-
-void XEmitter::ABI_PopAllCallerSavedRegsAndAdjustStack() {
-	POP(R11);
-	POP(R11);
-	POP(R10);
-	POP(R9);
-	POP(R8);
-	POP(RDI); 
-	POP(RSI); 
-	POP(RDX);
-	POP(RCX);
-}
-
-
-#ifdef _WIN32
-// Win64 Specific Code
-
-void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() {
-	//we only want to do this once
-	PUSH(RBP);
-	MOV(64, R(RBP), R(RSP));
-	PUSH(RBX); 
-	PUSH(RSI); 
-	PUSH(RDI);
-	PUSH(R12); 
-	PUSH(R13); 
-	PUSH(R14); 
-	PUSH(R15);
-	SUB(64, R(RSP), Imm8(0x28));
-	//TODO: Also preserve XMM0-3?
-}
-
-void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() {
-	ADD(64, R(RSP), Imm8(0x28));
-	POP(R15);
-	POP(R14); 
-	POP(R13); 
-	POP(R12);
-	POP(RDI);
-	POP(RSI); 
-	POP(RBX); 
-	POP(RBP);
-}
-
-#else
-// Unix64 Specific Code
-
-void XEmitter::ABI_PushAllCalleeSavedRegsAndAdjustStack() {
-	PUSH(RBP);
-	MOV(64, R(RBP), R(RSP));
-	PUSH(RBX); 
-	PUSH(R12); 
-	PUSH(R13); 
-	PUSH(R14); 
-	PUSH(R15);
-	SUB(64, R(RSP), Imm8(8));
-}
-
-void XEmitter::ABI_PopAllCalleeSavedRegsAndAdjustStack() {
-	ADD(64, R(RSP), Imm8(8));
-	POP(R15);
-	POP(R14); 
-	POP(R13); 
-	POP(R12);
-	POP(RBX); 
-	POP(RBP);
-}
-
-#endif // WIN32
-
-#endif // 32bit
-
-
diff --git a/Source/Core/Common/Src/x64ABI.h b/Source/Core/Common/Src/x64ABI.h
deleted file mode 100644
index 837e4ec3d8..0000000000
--- a/Source/Core/Common/Src/x64ABI.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JIT_ABI_H_
-#define _JIT_ABI_H_
-
-#include "Common.h"
-
-// x86/x64 ABI:s, and helpers to help follow them when JIT-ing code.
-// All convensions return values in EAX (+ possibly EDX).
-
-// Linux 32-bit, Windows 32-bit (cdecl, System V):
-// * Caller pushes left to right
-// * Caller fixes stack after call
-// * function subtract from stack for local storage only.
-// Scratch:      EAX ECX EDX
-// Callee-save:  EBX ESI EDI EBP
-// Parameters:   -
-
-// Windows 64-bit
-// * 4-reg "fastcall" variant, very new-skool stack handling
-// * Callee moves stack pointer, to make room for shadow regs for the biggest function _it itself calls_
-// * Parameters passed in RCX, RDX, ... further parameters are MOVed into the allocated stack space.
-// Scratch:      RAX RCX RDX R8 R9 R10 R11
-// Callee-save:  RBX RSI RDI RBP R12 R13 R14 R15
-// Parameters:   RCX RDX R8 R9, further MOV-ed
-
-// Linux 64-bit
-// * 6-reg "fastcall" variant, old skool stack handling (parameters are pushed)
-// Scratch:      RAX RCX RDX RSI RDI R8 R9 R10 R11
-// Callee-save:  RBX RBP R12 R13 R14 R15
-// Parameters:   RDI RSI RDX RCX R8 R9
-
-#ifdef _M_IX86 // 32 bit calling convention, shared by all
-
-// 32-bit don't pass parameters in regs, but these are convenient to have anyway when we have to
-// choose regs to put stuff in.
-#define ABI_PARAM1 RCX
-#define ABI_PARAM2 RDX
-
-// There are no ABI_PARAM* here, since args are pushed.
-// 32-bit bog standard cdecl, shared between linux and windows
-// MacOSX 32-bit is same as System V with a few exceptions that we probably don't care much about.
-
-#else // 64 bit calling convention
-
-#ifdef _WIN32 // 64-bit Windows - the really exotic calling convention 
-
-#define ABI_PARAM1 RCX
-#define ABI_PARAM2 RDX
-#define ABI_PARAM3 R8
-#define ABI_PARAM4 R9
-
-#else  //64-bit Unix (hopefully MacOSX too) 
-
-#define ABI_PARAM1 RDI
-#define ABI_PARAM2 RSI
-#define ABI_PARAM3 RDX
-#define ABI_PARAM4 RCX
-#define ABI_PARAM5 R8
-#define ABI_PARAM6 R9
-
-#endif // WIN32
-
-#endif // X86
-
-#endif  // _JIT_ABI_H_
-
-
diff --git a/Source/Core/Common/Src/x64Analyzer.cpp b/Source/Core/Common/Src/x64Analyzer.cpp
deleted file mode 100644
index 9632c46125..0000000000
--- a/Source/Core/Common/Src/x64Analyzer.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "x64Analyzer.h"
-
-bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
-{
-	unsigned const char *startCodePtr = codePtr;
-	u8 rex = 0;
-	u8 codeByte = 0;
-	u8 codeByte2 = 0;
-	
-	//Check for regular prefix
-	info->operandSize = 4;
-	info->zeroExtend = false;
-	info->signExtend = false;
-	info->hasImmediate = false;
-	info->isMemoryWrite = false;
-
-	u8 modRMbyte = 0;
-	u8 sibByte = 0;
-	bool hasModRM = false;
-
-	int displacementSize = 0;
-
-	if (*codePtr == 0x66)
-	{
-		info->operandSize = 2;
-		codePtr++;
-	} 
-	else if (*codePtr == 0x67)
-	{
-		codePtr++;
-	}
-
-	//Check for REX prefix
-	if ((*codePtr & 0xF0) == 0x40)
-	{
-		rex = *codePtr;
-		if (rex & 8) //REX.W
-		{
-			info->operandSize = 8;
-		}
-		codePtr++;
-	}
-
-	codeByte = *codePtr++;
-
-	// Skip two-byte opcode byte 
-	bool twoByte = false; 
-	if(codeByte == 0x0F) 
-	{
-		twoByte = true; 
-		codeByte2 = *codePtr++;
-	}
-
-	if (!twoByte)
-	{
-		if ((codeByte & 0xF0) == 0x80 || 
-			((codeByte & 0xF8) == 0xC0 && (codeByte & 0x0E) != 0x02))
-		{
-			modRMbyte = *codePtr++;
-			hasModRM = true;
-		}
-	}
-	else
-	{
-		if (((codeByte2 & 0xF0) == 0x00 && (codeByte2 & 0x0F) >= 0x04 && (codeByte2 & 0x0D) != 0x0D) || 
-			(codeByte2 & 0xF0) == 0x30 || 
-			codeByte2 == 0x77 || 
-			(codeByte2 & 0xF0) == 0x80 || 
-			((codeByte2 & 0xF0) == 0xA0 && (codeByte2 & 0x07) <= 0x02) || 
-			(codeByte2 & 0xF8) == 0xC8) 
-		{
-			// No mod R/M byte 
-		}
-		else 
-		{
-			modRMbyte = *codePtr++;
-			hasModRM = true;
-		} 
-	}
-
-	if (hasModRM)
-	{
-		ModRM mrm(modRMbyte, rex);
-		info->regOperandReg = mrm.reg;
-		if (mrm.mod < 3)
-		{
-			if (mrm.rm == 4)
-			{
-				//SIB byte
-				sibByte = *codePtr++;
-				info->scaledReg = (sibByte >> 3) & 7;
-				info->otherReg = (sibByte & 7);
-				if (rex & 2) info->scaledReg += 8;
-				if (rex & 1) info->otherReg += 8;
-			}
-			else
-			{
-				//info->scaledReg = 
-			}
-		}
-		if (mrm.mod == 1 || mrm.mod == 2)
-		{
-			if (mrm.mod == 1)
-				displacementSize = 1;
-			else
-				displacementSize = 4;
-		}
-	}
-
-	if (displacementSize == 1)
-		info->displacement = (s32)(s8)*codePtr;
-	else
-		info->displacement = *((s32 *)codePtr);
-	codePtr += displacementSize;
-
-
-	switch (codeByte)
-	{
-	// writes
-	case 0xC6: // mem <- imm8
-		{
-			info->isMemoryWrite = true;
-			info->hasImmediate = true;
-			info->immediate = *codePtr;
-			codePtr++; //move past immediate
-		}
-		break;
-
-	case 0xC7: // mem <- imm16/32
-		{
-			info->isMemoryWrite = true;
-			if (info->operandSize == 2)
-			{
-				info->hasImmediate = true;
-				info->immediate = *(u16*)codePtr;
-				codePtr += 2;
-			}
-			else if (info->operandSize == 4)
-			{
-				info->hasImmediate = true;
-				info->immediate = *(u32*)codePtr;
-				codePtr += 4;
-			}
-			else if (info->operandSize == 8)
-			{
-				info->zeroExtend = true;
-				info->immediate = *(u32*)codePtr;
-				codePtr += 4;
-			}
-		}
-
-	case 0x89: // mem <- r16/32/64
-		{
-			info->isMemoryWrite = true;
-			break;
-		}
-
-	case 0x0F: // two-byte escape
-		{
-			info->isMemoryWrite = false;
-			switch (codeByte2)
-			{
-			case 0xB6: // movzx on byte
-				info->zeroExtend = true;
-				info->operandSize = 1;
-				break;
-			case 0xB7: // movzx on short
-				info->zeroExtend = true;
-				info->operandSize = 2;
-				break;
-			case 0xBE: // movsx on byte
-				info->signExtend = true;
-				info->operandSize = 1;
-				break;
-			case 0xBF: // movsx on short
-				info->signExtend = true;
-				info->operandSize = 2;
-				break;
-			default:
-				return false;
-			}
-			break;
-		}
-
-	case 0x8A: // r8 <- mem
-		{
-			info->isMemoryWrite = false;
-			if (info->operandSize == 4)
-			{
-				info->operandSize = 1;
-				break;
-			}
-			else
-				return false;
-		}
-
-	case 0x8B: // r16/32/64 <- mem
-		{
-			info->isMemoryWrite = false;
-			break;
-		}
-
-		break;
-
-	default:
-		return false;
-	}
-	info->instructionSize = (int)(codePtr - startCodePtr);
-	return true;
-}
diff --git a/Source/Core/Common/Src/x64Analyzer.h b/Source/Core/Common/Src/x64Analyzer.h
deleted file mode 100644
index 028d291079..0000000000
--- a/Source/Core/Common/Src/x64Analyzer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _X64ANALYZER_H_
-#define _X64ANALYZER_H_
-
-#include "Common.h"
-
-struct InstructionInfo
-{
-	int operandSize; //8, 16, 32, 64
-	int instructionSize;
-	int regOperandReg;
-	int otherReg;
-	int scaledReg;
-	bool zeroExtend;
-	bool signExtend;
-	bool hasImmediate;
-	bool isMemoryWrite;
-	u64 immediate;
-	s32 displacement;
-};
-
-struct ModRM
-{
-	int mod, reg, rm;
-	ModRM(u8 modRM, u8 rex)
-	{
-		mod = modRM >> 6;
-		reg = ((modRM >> 3) & 7) | ((rex & 4)?8:0);
-		rm = modRM & 7;
-	}
-};
-
-enum AccessType
-{
-	OP_ACCESS_READ = 0,
-	OP_ACCESS_WRITE = 1
-};
-
-bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info);
-
-#endif // _X64ANALYZER_H_
diff --git a/Source/Core/Common/Src/x64CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp
deleted file mode 100644
index e4eac54ef1..0000000000
--- a/Source/Core/Common/Src/x64CPUDetect.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <memory.h>
-
-#ifdef _WIN32
-#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
-#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
-#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64
-#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64
-#include <intrin.h>
-#undef _interlockedbittestandset
-#undef _interlockedbittestandreset
-#undef _interlockedbittestandset64
-#undef _interlockedbittestandreset64
-#else
-
-//#include <config/i386/cpuid.h>
-#ifndef _M_GENERIC
-#include <xmmintrin.h>
-#endif
-
-#if defined __FreeBSD__
-#include <sys/types.h>
-#include <machine/cpufunc.h>
-#else
-static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
-							unsigned int *ecx, unsigned int *edx)
-{
-#if defined _M_GENERIC
-	(*eax) = (*ebx) = (*ecx) = (*edx) = 0;
-#elif defined _LP64
-	// Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to
-	// restored at the end of the asm block.
-	__asm__ (
-		"cpuid;"
-		"movl  %%ebx,%1;"
-		: "=a" (*eax),
-		  "=S" (*ebx),
-		  "=c" (*ecx),
-		  "=d" (*edx)
-		: "a"  (*eax)
-		: "rbx"
-		);
-#else
-	__asm__ (
-		"cpuid;"
-		"movl  %%ebx,%1;"
-		: "=a" (*eax),
-		  "=S" (*ebx),
-		  "=c" (*ecx),
-		  "=d" (*edx)
-		: "a"  (*eax)
-		: "ebx"
-		);
-#endif
-}
-#endif /* defined __FreeBSD__ */
-
-static void __cpuid(int info[4], int x)
-{
-#if defined __FreeBSD__
-	do_cpuid((unsigned int)x, (unsigned int*)info);
-#else
-	unsigned int eax = x, ebx = 0, ecx = 0, edx = 0;
-	do_cpuid(&eax, &ebx, &ecx, &edx);
-	info[0] = eax;
-	info[1] = ebx;
-	info[2] = ecx;
-	info[3] = edx;
-#endif
-}
-
-#define _XCR_XFEATURE_ENABLED_MASK 0
-static unsigned long long _xgetbv(unsigned int index)
-{
-	unsigned int eax, edx;
-	__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
-	return ((unsigned long long)edx << 32) | eax;
-}
-
-#endif
-
-#include "Common.h"
-#include "CPUDetect.h"
-#include "StringUtil.h"
-
-CPUInfo cpu_info;
-
-CPUInfo::CPUInfo() {
-	Detect();
-}
-
-// Detects the various cpu features
-void CPUInfo::Detect()
-{
-	memset(this, 0, sizeof(*this));
-#ifdef _M_IX86
-	Mode64bit = false;
-#elif defined (_M_X64)
-	Mode64bit = true;
-	OS64bit = true;
-#endif
-	num_cores = 1;
-
-#ifdef _WIN32
-#ifdef _M_IX86
-	BOOL f64 = false;
-	IsWow64Process(GetCurrentProcess(), &f64);
-	OS64bit = (f64 == TRUE) ? true : false;
-#endif
-#endif
-	
-	// Set obvious defaults, for extra safety
-	if (Mode64bit) {
-		bSSE = true;
-		bSSE2 = true;
-		bLongMode = true;
-	}
-	
-	// Assume CPU supports the CPUID instruction. Those that don't can barely
-	// boot modern OS:es anyway.
-	int cpu_id[4];
-	memset(cpu_string, 0, sizeof(cpu_string));
-	
-	// Detect CPU's CPUID capabilities, and grab cpu string
-	__cpuid(cpu_id, 0x00000000);
-	u32 max_std_fn = cpu_id[0];  // EAX
-	*((int *)cpu_string) = cpu_id[1];
-	*((int *)(cpu_string + 4)) = cpu_id[3];
-	*((int *)(cpu_string + 8)) = cpu_id[2];
-	__cpuid(cpu_id, 0x80000000);
-	u32 max_ex_fn = cpu_id[0];
-	if (!strcmp(cpu_string, "GenuineIntel"))
-		vendor = VENDOR_INTEL;
-	else if (!strcmp(cpu_string, "AuthenticAMD"))
-		vendor = VENDOR_AMD;
-	else
-		vendor = VENDOR_OTHER;
-	
-	// Set reasonable default brand string even if brand string not available.
-	strcpy(brand_string, cpu_string);
-	
-	// Detect family and other misc stuff.
-	bool ht = false;
-	HTT = ht;
-	logical_cpu_count = 1;
-	if (max_std_fn >= 1) {
-		__cpuid(cpu_id, 0x00000001);
-		logical_cpu_count = (cpu_id[1] >> 16) & 0xFF;
-		ht = (cpu_id[3] >> 28) & 1;
-
-		if ((cpu_id[3] >> 25) & 1) bSSE = true;
-		if ((cpu_id[3] >> 26) & 1) bSSE2 = true;
-		if ((cpu_id[2])       & 1) bSSE3 = true;
-		if ((cpu_id[2] >> 9)  & 1) bSSSE3 = true;
-		if ((cpu_id[2] >> 19) & 1) bSSE4_1 = true;
-		if ((cpu_id[2] >> 20) & 1) bSSE4_2 = true;
-		if ((cpu_id[2] >> 25) & 1) bAES = true;
-
-		// AVX support requires 3 separate checks:
-		//  - Is the AVX bit set in CPUID?
-		//  - Is the XSAVE bit set in CPUID?
-		//  - XGETBV result has the XCR bit set.
-		if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
-		{
-			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
-				bAVX = true;
-		}
-	}
-	if (max_ex_fn >= 0x80000004) {
-		// Extract brand string
-		__cpuid(cpu_id, 0x80000002);
-		memcpy(brand_string, cpu_id, sizeof(cpu_id));
-		__cpuid(cpu_id, 0x80000003);
-		memcpy(brand_string + 16, cpu_id, sizeof(cpu_id));
-		__cpuid(cpu_id, 0x80000004);
-		memcpy(brand_string + 32, cpu_id, sizeof(cpu_id));
-	}
-	if (max_ex_fn >= 0x80000001) {
-		// Check for more features.
-		__cpuid(cpu_id, 0x80000001);
-		if (cpu_id[2] & 1) bLAHFSAHF64 = true;
-		if ((cpu_id[3] >> 29) & 1) bLongMode = true;
-	}
-
-	num_cores = (logical_cpu_count == 0) ? 1 : logical_cpu_count;
-	
-	if (max_ex_fn >= 0x80000008) {
-		// Get number of cores. This is a bit complicated. Following AMD manual here.
-		__cpuid(cpu_id, 0x80000008);
-		int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
-		if (apic_id_core_id_size == 0) {
-			if (ht) {
-				// New mechanism for modern Intel CPUs.
-				if (vendor == VENDOR_INTEL) {
-					__cpuid(cpu_id, 0x00000004);
-					int cores_x_package = ((cpu_id[0] >> 26) & 0x3F) + 1;
-					HTT = (cores_x_package < logical_cpu_count);
-					cores_x_package = ((logical_cpu_count % cores_x_package) == 0) ? cores_x_package : 1;
-					num_cores = (cores_x_package > 1) ? cores_x_package : num_cores;
-					logical_cpu_count /= cores_x_package;
-				}
-			}
-		} else {
-			// Use AMD's new method.
-			num_cores = (cpu_id[2] & 0xFF) + 1;
-		}
-	} 
-}
-
-// Turn the cpu info into a string we can show
-std::string CPUInfo::Summarize()
-{
-	std::string sum(cpu_string);
-	if (bSSE) sum += ", SSE";
-	if (bSSE2) sum += ", SSE2";
-	if (bSSE3) sum += ", SSE3";
-	if (bSSSE3) sum += ", SSSE3";
-	if (bSSE4_1) sum += ", SSE4.1";
-	if (bSSE4_2) sum += ", SSE4.2";
-	if (HTT) sum += ", HTT";
-	if (bAVX) sum += ", AVX";
-	if (bAES) sum += ", AES";
-	if (bLongMode) sum += ", 64-bit support";
-	return sum;
-}
diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp
deleted file mode 100644
index a5d7cb2f0f..0000000000
--- a/Source/Core/Common/Src/x64Emitter.cpp
+++ /dev/null
@@ -1,1639 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "CPUDetect.h"
-
-namespace Gen
-{
-
-// TODO(ector): Add EAX special casing, for ever so slightly smaller code.
-struct NormalOpDef
-{
-	u8 toRm8, toRm32, fromRm8, fromRm32, imm8, imm32, simm8, ext;
-};
-
-static const NormalOpDef nops[11] = 
-{
-	{0x00, 0x01, 0x02, 0x03, 0x80, 0x81, 0x83, 0}, //ADD
-	{0x10, 0x11, 0x12, 0x13, 0x80, 0x81, 0x83, 2}, //ADC
-
-	{0x28, 0x29, 0x2A, 0x2B, 0x80, 0x81, 0x83, 5}, //SUB
-	{0x18, 0x19, 0x1A, 0x1B, 0x80, 0x81, 0x83, 3}, //SBB
-
-	{0x20, 0x21, 0x22, 0x23, 0x80, 0x81, 0x83, 4}, //AND
-	{0x08, 0x09, 0x0A, 0x0B, 0x80, 0x81, 0x83, 1}, //OR
-
-	{0x30, 0x31, 0x32, 0x33, 0x80, 0x81, 0x83, 6}, //XOR
-	{0x88, 0x89, 0x8A, 0x8B, 0xC6, 0xC7, 0xCC, 0}, //MOV
-
-	{0x84, 0x85, 0x84, 0x85, 0xF6, 0xF7, 0xCC, 0}, //TEST (to == from)
-	{0x38, 0x39, 0x3A, 0x3B, 0x80, 0x81, 0x83, 7}, //CMP
-
-	{0x86, 0x87, 0x86, 0x87, 0xCC, 0xCC, 0xCC, 7}, //XCHG
-};
-
-enum NormalSSEOps
-{
-	sseCMP         = 0xC2,
-	sseADD         = 0x58, //ADD
-	sseSUB         = 0x5C, //SUB
-	sseAND         = 0x54, //AND
-	sseANDN        = 0x55, //ANDN
-	sseOR          = 0x56,
-	sseXOR         = 0x57,
-	sseMUL         = 0x59, //MUL
-	sseDIV         = 0x5E, //DIV
-	sseMIN         = 0x5D, //MIN
-	sseMAX         = 0x5F, //MAX
-	sseCOMIS       = 0x2F, //COMIS
-	sseUCOMIS      = 0x2E, //UCOMIS
-	sseSQRT        = 0x51, //SQRT
-	sseRSQRT       = 0x52, //RSQRT (NO DOUBLE PRECISION!!!)
-	sseMOVAPfromRM = 0x28, //MOVAP from RM
-	sseMOVAPtoRM   = 0x29, //MOVAP to RM
-	sseMOVUPfromRM = 0x10, //MOVUP from RM
-	sseMOVUPtoRM   = 0x11, //MOVUP to RM
-	sseMASKMOVDQU  = 0xF7,
-	sseLDDQU       = 0xF0,
-	sseSHUF        = 0xC6,
-	sseMOVNTDQ     = 0xE7,
-	sseMOVNTP      = 0x2B,
-};
-
-
-void XEmitter::SetCodePtr(u8 *ptr)
-{
-	code = ptr;
-}
-
-const u8 *XEmitter::GetCodePtr() const
-{
-	return code;
-}
-
-u8 *XEmitter::GetWritableCodePtr()
-{
-	return code;
-}
-
-void XEmitter::ReserveCodeSpace(int bytes)
-{
-	for (int i = 0; i < bytes; i++)
-		*code++ = 0xCC;
-}
-
-const u8 *XEmitter::AlignCode4()
-{
-	int c = int((u64)code & 3);
-	if (c)
-		ReserveCodeSpace(4-c);
-	return code;
-}
-
-const u8 *XEmitter::AlignCode16()
-{
-	int c = int((u64)code & 15);
-	if (c)
-		ReserveCodeSpace(16-c);
-	return code;
-}
-
-const u8 *XEmitter::AlignCodePage()
-{
-	int c = int((u64)code & 4095);
-	if (c)
-		ReserveCodeSpace(4096-c);
-	return code;
-}
-
-void XEmitter::WriteModRM(int mod, int rm, int reg)
-{
-	Write8((u8)((mod << 6) | ((rm & 7) << 3) | (reg & 7)));
-}
-
-void XEmitter::WriteSIB(int scale, int index, int base)
-{
-	Write8((u8)((scale << 6) | ((index & 7) << 3) | (base & 7)));
-}
-
-void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const
-{
-	if (customOp == -1)       customOp = operandReg;
-#ifdef _M_X64
-	u8 op = 0x40;
-	if (opBits == 64)         op |= 8;
-	if (customOp & 8)         op |= 4;
-	if (indexReg & 8)         op |= 2;
-	if (offsetOrBaseReg & 8)  op |= 1; //TODO investigate if this is dangerous
-	if (op != 0x40 ||
-		(bits == 8 && (offsetOrBaseReg & 0x10c) == 4) ||
-		(opBits == 8 && (customOp & 0x10c) == 4)) {
-		emit->Write8(op);
-		_dbg_assert_(DYNA_REC, (offsetOrBaseReg & 0x100) == 0 || bits != 8);
-		_dbg_assert_(DYNA_REC, (customOp & 0x100) == 0 || opBits != 8);
-	} else {
-		_dbg_assert_(DYNA_REC, (offsetOrBaseReg & 0x10c) == 0 ||
-				(offsetOrBaseReg & 0x10c) == 0x104 ||
-				bits != 8);
-		_dbg_assert_(DYNA_REC, (customOp & 0x10c) == 0 ||
-				(customOp & 0x10c) == 0x104 ||
-				opBits != 8);
-	}
-
-#else
-	_dbg_assert_(DYNA_REC, opBits != 64);
-	_dbg_assert_(DYNA_REC, (customOp & 8) == 0 || customOp == -1);
-	_dbg_assert_(DYNA_REC, (indexReg & 8) == 0);
-	_dbg_assert_(DYNA_REC, (offsetOrBaseReg & 8) == 0);
-	_dbg_assert_(DYNA_REC, opBits != 8 || (customOp & 0x10c) != 4 || customOp == -1);
-	_dbg_assert_(DYNA_REC, bits != 8 || (offsetOrBaseReg & 0x10c) != 4);
-#endif
-}
-
-void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg,
-	bool warn_64bit_offset) const
-{
-	if (_operandReg == 0xff)
-		_operandReg = (X64Reg)this->operandReg;
-	int mod = 0;
-	int ireg = indexReg;
-	bool SIB = false;
-	int _offsetOrBaseReg = this->offsetOrBaseReg;
-
-	if (scale == SCALE_RIP) //Also, on 32-bit, just an immediate address
-	{
-		// Oh, RIP addressing.
-		_offsetOrBaseReg = 5;
-		emit->WriteModRM(0, _operandReg&7, 5);
-		//TODO : add some checks
-#ifdef _M_X64
-		u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes;
-		s64 distance = (s64)offset - (s64)ripAddr;
-		_assert_msg_(DYNA_REC, (distance < 0x80000000LL
-					&& distance >=  -0x80000000LL) ||
-			     !warn_64bit_offset,
-			     "WriteRest: op out of range (0x%llx uses 0x%llx)",
-			     ripAddr, offset);
-		s32 offs = (s32)distance;
-		emit->Write32((u32)offs);
-#else
-		emit->Write32((u32)offset);
-#endif
-		return;
-	}
-
-	if (scale == 0)
-	{
-		// Oh, no memory, Just a reg.
-		mod = 3; //11
-	}
-	else if (scale >= 1)
-	{
-		//Ah good, no scaling.
-		if (scale == SCALE_ATREG && !((_offsetOrBaseReg & 7) == 4 || (_offsetOrBaseReg & 7) == 5))
-		{
-			//Okay, we're good. No SIB necessary.
-			int ioff = (int)offset;
-			if (ioff == 0)
-			{
-				mod = 0;
-			}
-			else if (ioff<-128 || ioff>127)
-			{
-				mod = 2; //32-bit displacement
-			}
-			else
-			{
-				mod = 1; //8-bit displacement
-			}
-		}
-		else if (scale >= SCALE_NOBASE_2 && scale <= SCALE_NOBASE_8)
-		{
-			SIB = true;
-			mod = 0;
-			_offsetOrBaseReg = 5;
-		}
-		else //if (scale != SCALE_ATREG)
-		{
-			if ((_offsetOrBaseReg & 7) == 4) //this would occupy the SIB encoding :(
-			{
-				//So we have to fake it with SIB encoding :(
-				SIB = true;
-			}
-
-			if (scale >= SCALE_1 && scale < SCALE_ATREG)
-			{
-				SIB = true;
-			}
-
-			if (scale == SCALE_ATREG && ((_offsetOrBaseReg & 7) == 4)) 
-			{
-				SIB = true;
-				ireg = _offsetOrBaseReg;
-			}
-
-			//Okay, we're fine. Just disp encoding.
-			//We need displacement. Which size?
-			int ioff = (int)(s64)offset;
-			if (ioff < -128 || ioff > 127)
-			{
-				mod = 2; //32-bit displacement
-			}
-			else
-			{
-				mod = 1; //8-bit displacement
-			}
-		}
-	}
-
-	// Okay. Time to do the actual writing
-	// ModRM byte:
-	int oreg = _offsetOrBaseReg;
-	if (SIB)
-		oreg = 4;
-	
-	// TODO(ector): WTF is this if about? I don't remember writing it :-)
-	//if (RIP)
-	//    oreg = 5;
-
-	emit->WriteModRM(mod, _operandReg&7, oreg&7);
-
-	if (SIB)
-	{
-		//SIB byte
-		int ss;
-		switch (scale)
-		{
-		case SCALE_NONE: _offsetOrBaseReg = 4; ss = 0; break; //RSP 
-		case SCALE_1: ss = 0; break;
-		case SCALE_2: ss = 1; break;
-		case SCALE_4: ss = 2; break;
-		case SCALE_8: ss = 3; break;
-		case SCALE_NOBASE_2: ss = 1; break;
-		case SCALE_NOBASE_4: ss = 2; break;
-		case SCALE_NOBASE_8: ss = 3; break;
-		case SCALE_ATREG: ss = 0; break;
-		default: _assert_msg_(DYNA_REC, 0, "Invalid scale for SIB byte"); ss = 0; break;
-		}
-		emit->Write8((u8)((ss << 6) | ((ireg&7)<<3) | (_offsetOrBaseReg&7)));
-	}
-
-	if (mod == 1) //8-bit disp
-	{
-		emit->Write8((u8)(s8)(s32)offset);
-	}
-	else if (mod == 2 || (scale >= SCALE_NOBASE_2 && scale <= SCALE_NOBASE_8)) //32-bit disp
-	{
-		emit->Write32((u32)offset);
-	}
-}
-
-
-// W = operand extended width (1 if 64-bit)
-// R = register# upper bit
-// X = scale amnt upper bit
-// B = base register# upper bit
-void XEmitter::Rex(int w, int r, int x, int b)
-{
-	w = w ? 1 : 0;		
-	r = r ? 1 : 0;
-	x = x ? 1 : 0;
-	b = b ? 1 : 0;
-	u8 rx = (u8)(0x40 | (w << 3) | (r << 2) | (x << 1) | (b));
-	if (rx != 0x40)
-		Write8(rx);
-}
-
-void XEmitter::JMP(const u8 *addr, bool force5Bytes)
-{
-	u64 fn = (u64)addr;
-	if (!force5Bytes)
-	{
-		s64 distance = (s64)(fn - ((u64)code + 2));
-		_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80,
-			     "Jump target too far away, needs force5Bytes = true");
-		//8 bits will do
-		Write8(0xEB);
-		Write8((u8)(s8)distance);
-	}
-	else
-	{
-		s64 distance = (s64)(fn - ((u64)code + 5));
-
-		_assert_msg_(DYNA_REC, distance >= -0x80000000LL
-			     && distance < 0x80000000LL,
-			     "Jump target too far away, needs indirect register");
-		Write8(0xE9);
-		Write32((u32)(s32)distance);
-	}
-}
-
-void XEmitter::JMPptr(const OpArg &arg2)
-{
-	OpArg arg = arg2;
-	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "JMPptr - Imm argument");
-	arg.operandReg = 4;
-	arg.WriteRex(this, 0, 0);
-	Write8(0xFF);
-	arg.WriteRest(this);
-}
-
-//Can be used to trap other processors, before overwriting their code
-// not used in dolphin
-void XEmitter::JMPself()
-{
-	Write8(0xEB);
-	Write8(0xFE);
-}
-
-void XEmitter::CALLptr(OpArg arg)
-{
-	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "CALLptr - Imm argument");
-	arg.operandReg = 2;
-	arg.WriteRex(this, 0, 0);
-	Write8(0xFF);
-	arg.WriteRest(this);
-}
-
-void XEmitter::CALL(const void *fnptr)
-{
-	u64 distance = u64(fnptr) - (u64(code) + 5);
-	_assert_msg_(DYNA_REC, distance < 0x0000000080000000ULL
-		     || distance >=  0xFFFFFFFF80000000ULL,
-		     "CALL out of range (%p calls %p)", code, fnptr);
-	Write8(0xE8);
-	Write32(u32(distance));
-}
-
-FixupBranch XEmitter::J(bool force5bytes)
-{
-	FixupBranch branch;
-	branch.type = force5bytes ? 1 : 0;
-	branch.ptr = code + (force5bytes ? 5 : 2);
-	if (!force5bytes)
-	{
-		//8 bits will do
-		Write8(0xEB);
-		Write8(0);
-	}
-	else
-	{
-		Write8(0xE9);
-		Write32(0);
-	}
-	return branch;
-}
-
-FixupBranch XEmitter::J_CC(CCFlags conditionCode, bool force5bytes)
-{
-	FixupBranch branch;
-	branch.type = force5bytes ? 1 : 0;
-	branch.ptr = code + (force5bytes ? 6 : 2);
-	if (!force5bytes)
-	{
-		//8 bits will do
-		Write8(0x70 + conditionCode);
-		Write8(0);
-	}
-	else
-	{
-		Write8(0x0F);
-		Write8(0x80 + conditionCode);
-		Write32(0);
-	}
-	return branch;
-}
-
-void XEmitter::J_CC(CCFlags conditionCode, const u8 * addr, bool force5Bytes)
-{
-	u64 fn = (u64)addr;
-	if (!force5Bytes)
-	{
-		s64 distance = (s64)(fn - ((u64)code + 2));
-		_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80, "Jump target too far away, needs force5Bytes = true");
-		//8 bits will do
-		Write8(0x70 + conditionCode);
-		Write8((u8)(s8)distance);
-	}
-	else
-	{
-		s64 distance = (s64)(fn - ((u64)code + 6));
-		_assert_msg_(DYNA_REC, distance >= -0x80000000LL
-			     && distance < 0x80000000LL,
-			     "Jump target too far away, needs indirect register");
-		Write8(0x0F);
-		Write8(0x80 + conditionCode);
-		Write32((u32)(s32)distance);
-	}
-}
-
-void XEmitter::SetJumpTarget(const FixupBranch &branch)
-{
-	if (branch.type == 0)
-	{
-		s64 distance = (s64)(code - branch.ptr);
-		_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80, "Jump target too far away, needs force5Bytes = true");
-		branch.ptr[-1] = (u8)(s8)distance;
-	}
-	else if (branch.type == 1)
-	{
-		s64 distance = (s64)(code - branch.ptr);
-		_assert_msg_(DYNA_REC, distance >= -0x80000000LL && distance < 0x80000000LL, "Jump target too far away, needs indirect register");
-		((s32*)branch.ptr)[-1] = (s32)distance;
-	}
-}
-
-// INC/DEC considered harmful on newer CPUs due to partial flag set.
-// Use ADD, SUB instead.
-
-/*
-void XEmitter::INC(int bits, OpArg arg)
-{
-	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "INC - Imm argument");
-	arg.operandReg = 0;
-	if (bits == 16) {Write8(0x66);}
-	arg.WriteRex(this, bits, bits);
-	Write8(bits == 8 ? 0xFE : 0xFF);
-	arg.WriteRest(this);
-}
-void XEmitter::DEC(int bits, OpArg arg)
-{
-	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "DEC - Imm argument");
-	arg.operandReg = 1;
-	if (bits == 16) {Write8(0x66);}
-	arg.WriteRex(this, bits, bits);
-	Write8(bits == 8 ? 0xFE : 0xFF);
-	arg.WriteRest(this);
-}
-*/
-
-//Single byte opcodes
-//There is no PUSHAD/POPAD in 64-bit mode.
-void XEmitter::INT3() {Write8(0xCC);}
-void XEmitter::RET()  {Write8(0xC3);}
-void XEmitter::RET_FAST()  {Write8(0xF3); Write8(0xC3);} //two-byte return (rep ret) - recommended by AMD optimization manual for the case of jumping to a ret
-
-void XEmitter::NOP(int count)
-{
-	// TODO: look up the fastest nop sleds for various sizes
-	int i;
-	switch (count) {
-	case 1:
-		Write8(0x90);
-		break;
-	case 2:
-		Write8(0x66);
-		Write8(0x90);
-		break;
-	default:
-		for (i = 0; i < count; i++) {
-			Write8(0x90);
-		}
-		break;
-	}
-} 
-
-void XEmitter::PAUSE() {Write8(0xF3); NOP();} //use in tight spinloops for energy saving on some cpu
-void XEmitter::CLC()  {Write8(0xF8);} //clear carry
-void XEmitter::CMC()  {Write8(0xF5);} //flip carry
-void XEmitter::STC()  {Write8(0xF9);} //set carry
-
-//TODO: xchg ah, al ???
-void XEmitter::XCHG_AHAL()
-{
-	Write8(0x86);
-	Write8(0xe0);
-	// alt. 86 c4
-}
-
-//These two can not be executed on early Intel 64-bit CPU:s, only on AMD!
-void XEmitter::LAHF() {Write8(0x9F);}
-void XEmitter::SAHF() {Write8(0x9E);}
-
-void XEmitter::PUSHF() {Write8(0x9C);}
-void XEmitter::POPF()  {Write8(0x9D);}
-
-void XEmitter::LFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xE8);}
-void XEmitter::MFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xF0);}
-void XEmitter::SFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xF8);}
-
-void XEmitter::WriteSimple1Byte(int bits, u8 byte, X64Reg reg)
-{
-	if (bits == 16) {Write8(0x66);}
-	Rex(bits == 64, 0, 0, (int)reg >> 3);
-	Write8(byte + ((int)reg & 7));
-}
-
-void XEmitter::WriteSimple2Byte(int bits, u8 byte1, u8 byte2, X64Reg reg)
-{
-	if (bits == 16) {Write8(0x66);}
-	Rex(bits==64, 0, 0, (int)reg >> 3);
-	Write8(byte1);
-	Write8(byte2 + ((int)reg & 7));
-}
-
-void XEmitter::CWD(int bits)
-{
-	if (bits == 16) {Write8(0x66);}
-	Rex(bits == 64, 0, 0, 0);
-	Write8(0x99);
-}
-
-void XEmitter::CBW(int bits)
-{
-	if (bits == 8) {Write8(0x66);}
-	Rex(bits == 32, 0, 0, 0);
-	Write8(0x98);
-}
-
-//Simple opcodes
-
-
-//push/pop do not need wide to be 64-bit
-void XEmitter::PUSH(X64Reg reg) {WriteSimple1Byte(32, 0x50, reg);}
-void XEmitter::POP(X64Reg reg)  {WriteSimple1Byte(32, 0x58, reg);}
-
-void XEmitter::PUSH(int bits, const OpArg &reg) 
-{ 
-	if (reg.IsSimpleReg())
-		PUSH(reg.GetSimpleReg());
-	else if (reg.IsImm())
-	{
-		switch (reg.GetImmBits())
-		{
-		case 8:
-			Write8(0x6A);
-			Write8((u8)(s8)reg.offset);
-			break;
-		case 16:
-			Write8(0x66);
-			Write8(0x68);
-			Write16((u16)(s16)(s32)reg.offset);
-			break;
-		case 32:
-			Write8(0x68);
-			Write32((u32)reg.offset);
-			break;
-		default:
-			_assert_msg_(DYNA_REC, 0, "PUSH - Bad imm bits");
-			break;
-		}
-	}
-	else
-	{
-		if (bits == 16)
-			Write8(0x66);
-		reg.WriteRex(this, bits, bits);
-		Write8(0xFF);
-		reg.WriteRest(this, 0, (X64Reg)6);
-	}
-}
-
-void XEmitter::POP(int /*bits*/, const OpArg &reg)
-{ 
-	if (reg.IsSimpleReg())
-		POP(reg.GetSimpleReg());
-	else
-		INT3();
-}
-
-void XEmitter::BSWAP(int bits, X64Reg reg)
-{
-	if (bits >= 32)
-	{
-		WriteSimple2Byte(bits, 0x0F, 0xC8, reg);
-	}
-	else if (bits == 16)
-	{
-		ROL(16, R(reg), Imm8(8));
-	}
-	else if (bits == 8)
-	{
-		// Do nothing - can't bswap a single byte...
-	}
-	else
-	{
-		_assert_msg_(DYNA_REC, 0, "BSWAP - Wrong number of bits");
-	}
-}
-
-// Undefined opcode - reserved
-// If we ever need a way to always cause a non-breakpoint hard exception...
-void XEmitter::UD2()
-{
-	Write8(0x0F);
-	Write8(0x0B);
-}
-
-void XEmitter::PREFETCH(PrefetchLevel level, OpArg arg)
-{
-	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "PREFETCH - Imm argument");;
-	arg.operandReg = (u8)level;
-	arg.WriteRex(this, 0, 0);
-	Write8(0x0F);
-	Write8(0x18);
-	arg.WriteRest(this);
-}
-
-void XEmitter::SETcc(CCFlags flag, OpArg dest)
-{
-	if (dest.IsImm()) _assert_msg_(DYNA_REC, 0, "SETcc - Imm argument");
-	dest.operandReg = 0;
-	dest.WriteRex(this, 0, 0);
-	Write8(0x0F);
-	Write8(0x90 + (u8)flag);
-	dest.WriteRest(this);
-}
-
-void XEmitter::CMOVcc(int bits, X64Reg dest, OpArg src, CCFlags flag)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "CMOVcc - Imm argument");
-	src.operandReg = dest;
-	src.WriteRex(this, bits, bits);
-	Write8(0x0F);
-	Write8(0x40 + (u8)flag);
-	src.WriteRest(this);
-}
-
-void XEmitter::WriteMulDivType(int bits, OpArg src, int ext)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "WriteMulDivType - Imm argument");
-	src.operandReg = ext;
-	if (bits == 16) Write8(0x66);
-	src.WriteRex(this, bits, bits);
-	if (bits == 8)
-	{
-		Write8(0xF6);
-	}
-	else
-	{
-		Write8(0xF7);
-	}
-	src.WriteRest(this);
-}
-
-void XEmitter::MUL(int bits, OpArg src)  {WriteMulDivType(bits, src, 4);}
-void XEmitter::DIV(int bits, OpArg src)  {WriteMulDivType(bits, src, 6);}
-void XEmitter::IMUL(int bits, OpArg src) {WriteMulDivType(bits, src, 5);}
-void XEmitter::IDIV(int bits, OpArg src) {WriteMulDivType(bits, src, 7);}
-void XEmitter::NEG(int bits, OpArg src)  {WriteMulDivType(bits, src, 3);}
-void XEmitter::NOT(int bits, OpArg src)  {WriteMulDivType(bits, src, 2);}
-
-void XEmitter::WriteBitSearchType(int bits, X64Reg dest, OpArg src, u8 byte2)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "WriteBitSearchType - Imm argument");
-	src.operandReg = (u8)dest;
-	if (bits == 16) Write8(0x66);
-	src.WriteRex(this, bits, bits);
-	Write8(0x0F);
-	Write8(byte2);
-	src.WriteRest(this);
-}
-
-void XEmitter::MOVNTI(int bits, OpArg dest, X64Reg src)
-{
-	if (bits <= 16) _assert_msg_(DYNA_REC, 0, "MOVNTI - bits<=16");
-	WriteBitSearchType(bits, src, dest, 0xC3);
-}
-
-void XEmitter::BSF(int bits, X64Reg dest, OpArg src) {WriteBitSearchType(bits,dest,src,0xBC);} //bottom bit to top bit
-void XEmitter::BSR(int bits, X64Reg dest, OpArg src) {WriteBitSearchType(bits,dest,src,0xBD);} //top bit to bottom bit
-
-void XEmitter::MOVSX(int dbits, int sbits, X64Reg dest, OpArg src)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "MOVSX - Imm argument");
-	if (dbits == sbits) {
-		MOV(dbits, R(dest), src);
-		return;
-	}
-	src.operandReg = (u8)dest;
-	if (dbits == 16) Write8(0x66);
-	src.WriteRex(this, dbits, sbits);
-	if (sbits == 8)
-	{
-		Write8(0x0F);
-		Write8(0xBE);
-	}
-	else if (sbits == 16)
-	{
-		Write8(0x0F);
-		Write8(0xBF);
-	}
-	else if (sbits == 32 && dbits == 64)
-	{
-		Write8(0x63);
-	}
-	else
-	{
-		Crash();
-	}
-	src.WriteRest(this);
-}
-
-void XEmitter::MOVZX(int dbits, int sbits, X64Reg dest, OpArg src)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "MOVZX - Imm argument");
-	if (dbits == sbits) {
-		MOV(dbits, R(dest), src);
-		return;
-	}
-	src.operandReg = (u8)dest;
-	if (dbits == 16) Write8(0x66);
-	//the 32bit result is automatically zero extended to 64bit
-	src.WriteRex(this, dbits == 64 ? 32 : dbits, sbits);
-	if (sbits == 8)
-	{
-		Write8(0x0F);
-		Write8(0xB6);
-	}
-	else if (sbits == 16)
-	{
-		Write8(0x0F);
-		Write8(0xB7);
-	}
-	else if (sbits == 32 && dbits == 64)
-	{
-		Write8(0x8B);
-	}
-	else
-	{
-		Crash();
-	}
-	src.WriteRest(this);
-}
-
-
-void XEmitter::LEA(int bits, X64Reg dest, OpArg src)
-{
-	if (src.IsImm()) _assert_msg_(DYNA_REC, 0, "LEA - Imm argument");
-	src.operandReg = (u8)dest;
-	if (bits == 16) Write8(0x66); //TODO: performance warning
-	src.WriteRex(this, bits, bits);
-	Write8(0x8D);
-	src.WriteRest(this, 0, (X64Reg)0xFF, bits == 64);
-}
-
-//shift can be either imm8 or cl
-void XEmitter::WriteShift(int bits, OpArg dest, OpArg &shift, int ext)
-{
-	bool writeImm = false;
-	if (dest.IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "WriteShift - can't shift imms");
-	}
-	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
-	{
-		_assert_msg_(DYNA_REC, 0, "WriteShift - illegal argument"); 
-	}
-	dest.operandReg = ext;
-	if (bits == 16) Write8(0x66);
-	dest.WriteRex(this, bits, bits, 0);
-	if (shift.GetImmBits() == 8)
-	{
-		//ok an imm
-		u8 imm = (u8)shift.offset;
-		if (imm == 1)
-		{
-			Write8(bits == 8 ? 0xD0 : 0xD1);
-		}
-		else
-		{
-			writeImm = true;
-			Write8(bits == 8 ? 0xC0 : 0xC1);
-		}
-	}
-	else
-	{
-		Write8(bits == 8 ? 0xD2 : 0xD3);
-	}
-	dest.WriteRest(this, writeImm ? 1 : 0);
-	if (writeImm)
-		Write8((u8)shift.offset);
-}
-
-// large rotates and shift are slower on intel than amd
-// intel likes to rotate by 1, and the op is smaller too
-void XEmitter::ROL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 0);}
-void XEmitter::ROR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 1);}
-void XEmitter::RCL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 2);}
-void XEmitter::RCR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 3);}
-void XEmitter::SHL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 4);}
-void XEmitter::SHR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 5);}
-void XEmitter::SAR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 7);}
-
-// index can be either imm8 or register, don't use memory destination because it's slow
-void XEmitter::WriteBitTest(int bits, OpArg &dest, OpArg &index, int ext)
-{
-	if (dest.IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "WriteBitTest - can't test imms");
-	}
-	if ((index.IsImm() && index.GetImmBits() != 8))
-	{
-		_assert_msg_(DYNA_REC, 0, "WriteBitTest - illegal argument"); 
-	}
-	if (bits == 16) Write8(0x66);
-	if (index.IsImm())
-	{
-		dest.WriteRex(this, bits, bits);
-		Write8(0x0F); Write8(0xBA);
-		dest.WriteRest(this, 1, (X64Reg)ext);
-		Write8((u8)index.offset);
-	}
-	else
-	{
-		X64Reg operand = index.GetSimpleReg();
-		dest.WriteRex(this, bits, bits, operand);
-		Write8(0x0F); Write8(0x83 + 8*ext);
-		dest.WriteRest(this, 1, operand);
-	}
-}
-
-void XEmitter::BT(int bits, OpArg dest, OpArg index)  {WriteBitTest(bits, dest, index, 4);}
-void XEmitter::BTS(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 5);}
-void XEmitter::BTR(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 6);}
-void XEmitter::BTC(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 7);}
-
-//shift can be either imm8 or cl
-void XEmitter::SHRD(int bits, OpArg dest, OpArg src, OpArg shift)
-{
-	if (dest.IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "SHRD - can't use imms as destination");
-	}
-	if (!src.IsSimpleReg())
-	{
-		_assert_msg_(DYNA_REC, 0, "SHRD - must use simple register as source");
-	}
-	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
-	{
-		_assert_msg_(DYNA_REC, 0, "SHRD - illegal shift"); 
-	}
-	if (bits == 16) Write8(0x66);
-	X64Reg operand = src.GetSimpleReg();
-	dest.WriteRex(this, bits, bits, operand);
-	if (shift.GetImmBits() == 8)
-	{
-		Write8(0x0F); Write8(0xAC);
-		dest.WriteRest(this, 1, operand);
-		Write8((u8)shift.offset);
-	}
-	else
-	{
-		Write8(0x0F); Write8(0xAD);
-		dest.WriteRest(this, 0, operand);
-	}
-}
-
-void XEmitter::SHLD(int bits, OpArg dest, OpArg src, OpArg shift)
-{
-	if (dest.IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "SHLD - can't use imms as destination");
-	}
-	if (!src.IsSimpleReg())
-	{
-		_assert_msg_(DYNA_REC, 0, "SHLD - must use simple register as source");
-	}
-	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
-	{
-		_assert_msg_(DYNA_REC, 0, "SHLD - illegal shift"); 
-	}
-	if (bits == 16) Write8(0x66);
-	X64Reg operand = src.GetSimpleReg();
-	dest.WriteRex(this, bits, bits, operand);
-	if (shift.GetImmBits() == 8)
-	{
-		Write8(0x0F); Write8(0xA4);
-		dest.WriteRest(this, 1, operand);
-		Write8((u8)shift.offset);
-	}
-	else
-	{
-		Write8(0x0F); Write8(0xA5);
-		dest.WriteRest(this, 0, operand);
-	}
-}
-
-void OpArg::WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg _operandReg, int bits)
-{
-	if (bits == 16)
-		emit->Write8(0x66);
-
-	this->operandReg = (u8)_operandReg;
-	WriteRex(emit, bits, bits);
-	emit->Write8(op);
-	WriteRest(emit);
-}
-
-//operand can either be immediate or register
-void OpArg::WriteNormalOp(XEmitter *emit, bool toRM, NormalOp op, const OpArg &operand, int bits) const
-{
-	X64Reg _operandReg = (X64Reg)this->operandReg;
-	if (IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Imm argument, wrong order");
-	}
-
-	if (bits == 16)
-		emit->Write8(0x66);
-
-	int immToWrite = 0;
-
-	if (operand.IsImm())
-	{
-		_operandReg = (X64Reg)0;
-		WriteRex(emit, bits, bits);
-
-		if (!toRM)
-		{
-			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Writing to Imm (!toRM)");
-		}
-
-		if (operand.scale == SCALE_IMM8 && bits == 8) 
-		{
-			emit->Write8(nops[op].imm8);
-			immToWrite = 8;
-		}
-		else if ((operand.scale == SCALE_IMM16 && bits == 16) ||
-				 (operand.scale == SCALE_IMM32 && bits == 32) || 
-				 (operand.scale == SCALE_IMM32 && bits == 64))
-		{
-			emit->Write8(nops[op].imm32);
-			immToWrite = bits == 16 ? 16 : 32;
-		}
-		else if ((operand.scale == SCALE_IMM8 && bits == 16) ||
-				 (operand.scale == SCALE_IMM8 && bits == 32) ||
-				 (operand.scale == SCALE_IMM8 && bits == 64))
-		{
-			emit->Write8(nops[op].simm8);
-			immToWrite = 8;
-		}
-		else if (operand.scale == SCALE_IMM64 && bits == 64)
-		{
-			if (op == nrmMOV)
-			{
-				emit->Write8(0xB8 + (offsetOrBaseReg & 7));
-				emit->Write64((u64)operand.offset);
-				return;
-			}
-			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Only MOV can take 64-bit imm");
-		}
-		else
-		{
-			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Unhandled case");
-		}
-		_operandReg = (X64Reg)nops[op].ext; //pass extension in REG of ModRM
-	}
-	else
-	{
-		_operandReg = (X64Reg)operand.offsetOrBaseReg;
-		WriteRex(emit, bits, bits, _operandReg);
-		// mem/reg or reg/reg op
-		if (toRM)
-		{
-			emit->Write8(bits == 8 ? nops[op].toRm8 : nops[op].toRm32);
-			// _assert_msg_(DYNA_REC, code[-1] != 0xCC, "ARGH4");
-		}
-		else
-		{
-			emit->Write8(bits == 8 ? nops[op].fromRm8 : nops[op].fromRm32);
-			// _assert_msg_(DYNA_REC, code[-1] != 0xCC, "ARGH5");
-		}
-	}
-	WriteRest(emit, immToWrite>>3, _operandReg);
-	switch (immToWrite)
-	{
-	case 0:
-		break;
-	case 8:
-		emit->Write8((u8)operand.offset);
-		break;
-	case 16:
-		emit->Write16((u16)operand.offset);
-		break;
-	case 32:
-		emit->Write32((u32)operand.offset);
-		break;
-	default:
-		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Unhandled case");
-	}
-}
-
-void XEmitter::WriteNormalOp(XEmitter *emit, int bits, NormalOp op, const OpArg &a1, const OpArg &a2)
-{
-	if (a1.IsImm())
-	{
-		//Booh! Can't write to an imm
-		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - a1 cannot be imm");
-		return;
-	}
-	if (a2.IsImm())
-	{
-		a1.WriteNormalOp(emit, true, op, a2, bits);
-	}
-	else
-	{
-		if (a1.IsSimpleReg())
-		{
-			a2.WriteNormalOp(emit, false, op, a1, bits);
-		}
-		else
-		{
-			a1.WriteNormalOp(emit, true, op, a2, bits);
-		}
-	}
-}
-
-void XEmitter::ADD (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmADD, a1, a2);}
-void XEmitter::ADC (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmADC, a1, a2);}
-void XEmitter::SUB (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmSUB, a1, a2);}
-void XEmitter::SBB (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmSBB, a1, a2);}
-void XEmitter::AND (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmAND, a1, a2);}
-void XEmitter::OR  (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmOR , a1, a2);}
-void XEmitter::XOR (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmXOR, a1, a2);}
-void XEmitter::MOV (int bits, const OpArg &a1, const OpArg &a2) 
-{
-#ifdef _DEBUG
-	_assert_msg_(DYNA_REC, !a1.IsSimpleReg() || !a2.IsSimpleReg() || a1.GetSimpleReg() != a2.GetSimpleReg(), "Redundant MOV @ %p - bug in JIT?", 
-				 code); 
-#endif
-	WriteNormalOp(this, bits, nrmMOV, a1, a2);
-}
-void XEmitter::TEST(int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmTEST, a1, a2);}
-void XEmitter::CMP (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmCMP, a1, a2);}
-void XEmitter::XCHG(int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(this, bits, nrmXCHG, a1, a2);}
-
-void XEmitter::IMUL(int bits, X64Reg regOp, OpArg a1, OpArg a2)
-{
-	if (bits == 8) {
-		_assert_msg_(DYNA_REC, 0, "IMUL - illegal bit size!");
-		return;
-	}
-	if (a1.IsImm()) {
-		_assert_msg_(DYNA_REC, 0, "IMUL - second arg cannot be imm!");
-		return;
-	}
-	if (!a2.IsImm())
-	{
-		_assert_msg_(DYNA_REC, 0, "IMUL - third arg must be imm!");
-		return;
-	}
-
-	if (bits == 16)
-		Write8(0x66);
-	a1.WriteRex(this, bits, bits, regOp);
-
-	if (a2.GetImmBits() == 8) {
-		Write8(0x6B);
-		a1.WriteRest(this, 1, regOp);
-		Write8((u8)a2.offset);
-	} else {
-		Write8(0x69);
-		if (a2.GetImmBits() == 16 && bits == 16) {
-			a1.WriteRest(this, 2, regOp);
-			Write16((u16)a2.offset);
-		} else if (a2.GetImmBits() == 32 &&
-			(bits == 32 || bits == 64)) {
-				a1.WriteRest(this, 4, regOp);
-				Write32((u32)a2.offset);
-		} else {
-			_assert_msg_(DYNA_REC, 0, "IMUL - unhandled case!");
-		}
-	}
-}
-
-void XEmitter::IMUL(int bits, X64Reg regOp, OpArg a)
-{
-	if (bits == 8) {
-		_assert_msg_(DYNA_REC, 0, "IMUL - illegal bit size!");
-		return;
-	}
-	if (a.IsImm())
-	{
-		IMUL(bits, regOp, R(regOp), a) ;
-		return;
-	}
-
-	if (bits == 16)
-		Write8(0x66);
-	a.WriteRex(this, bits, bits, regOp);
-	Write8(0x0F);
-	Write8(0xAF);
-	a.WriteRest(this, 0, regOp);
-}
-
-
-void XEmitter::WriteSSEOp(int size, u8 sseOp, bool packed, X64Reg regOp, OpArg arg, int extrabytes)
-{
-	if (size == 64 && packed)
-		Write8(0x66); //this time, override goes upwards
-	if (!packed)
-		Write8(size == 64 ? 0xF2 : 0xF3);
-	arg.operandReg = regOp;
-	arg.WriteRex(this, 0, 0);
-	Write8(0x0F);
-	Write8(sseOp);
-	arg.WriteRest(this, extrabytes);
-}
-
-void XEmitter::MOVD_xmm(X64Reg dest, const OpArg &arg) {WriteSSEOp(64, 0x6E, true, dest, arg, 0);}
-void XEmitter::MOVD_xmm(const OpArg &arg, X64Reg src) {WriteSSEOp(64, 0x7E, true, src, arg, 0);}
-
-void XEmitter::MOVQ_xmm(X64Reg dest, OpArg arg) {
-#ifdef _M_X64
-		// Alternate encoding
-		// This does not display correctly in MSVC's debugger, it thinks it's a MOVD
-		arg.operandReg = dest;
-		Write8(0x66);
-		arg.WriteRex(this, 64, 0);
-		Write8(0x0f);
-		Write8(0x6E);
-		arg.WriteRest(this, 0);
-#else
-		arg.operandReg = dest;
-		Write8(0xF3);
-		Write8(0x0f);
-		Write8(0x7E);
-		arg.WriteRest(this, 0);
-#endif
-}
-
-void XEmitter::MOVQ_xmm(OpArg arg, X64Reg src) {
-	if (arg.IsSimpleReg())
-		PanicAlert("Emitter: MOVQ_xmm doesn't support single registers as destination");
-	if (src > 7)
-	{
-		// Alternate encoding
-		// This does not display correctly in MSVC's debugger, it thinks it's a MOVD
-		arg.operandReg = src;
-		Write8(0x66);
-		arg.WriteRex(this, 64, 0);
-		Write8(0x0f);
-		Write8(0x7E);
-		arg.WriteRest(this, 0);
-	} else {
-		arg.operandReg = src;
-		arg.WriteRex(this, 0, 0);
-		Write8(0x66);
-		Write8(0x0f);
-		Write8(0xD6);
-		arg.WriteRest(this, 0);
-	}
-}
-
-void XEmitter::WriteMXCSR(OpArg arg, int ext)
-{
-	if (arg.IsImm() || arg.IsSimpleReg()) 
-		_assert_msg_(DYNA_REC, 0, "MXCSR - invalid operand");
-
-	arg.operandReg = ext;
-	arg.WriteRex(this, 0, 0);
-	Write8(0x0F);
-	Write8(0xAE);
-	arg.WriteRest(this);
-}
-
-void XEmitter::STMXCSR(OpArg memloc) {WriteMXCSR(memloc, 3);}
-void XEmitter::LDMXCSR(OpArg memloc) {WriteMXCSR(memloc, 2);}
-
-void XEmitter::MOVNTDQ(OpArg arg, X64Reg regOp)   {WriteSSEOp(64, sseMOVNTDQ, true, regOp, arg);}
-void XEmitter::MOVNTPS(OpArg arg, X64Reg regOp)   {WriteSSEOp(32, sseMOVNTP, true, regOp, arg);}
-void XEmitter::MOVNTPD(OpArg arg, X64Reg regOp)   {WriteSSEOp(64, sseMOVNTP, true, regOp, arg);}
-
-void XEmitter::ADDSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseADD, false, regOp, arg);}
-void XEmitter::ADDSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseADD, false, regOp, arg);}
-void XEmitter::SUBSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseSUB, false, regOp, arg);}
-void XEmitter::SUBSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseSUB, false, regOp, arg);}
-void XEmitter::CMPSS(X64Reg regOp, OpArg arg, u8 compare)   {WriteSSEOp(32, sseCMP, false, regOp, arg,1); Write8(compare);}
-void XEmitter::CMPSD(X64Reg regOp, OpArg arg, u8 compare)   {WriteSSEOp(64, sseCMP, false, regOp, arg,1); Write8(compare);}
-void XEmitter::MULSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMUL, false, regOp, arg);}
-void XEmitter::MULSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMUL, false, regOp, arg);}
-void XEmitter::DIVSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseDIV, false, regOp, arg);}
-void XEmitter::DIVSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseDIV, false, regOp, arg);}
-void XEmitter::MINSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMIN, false, regOp, arg);}
-void XEmitter::MINSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMIN, false, regOp, arg);}
-void XEmitter::MAXSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMAX, false, regOp, arg);}
-void XEmitter::MAXSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMAX, false, regOp, arg);}
-void XEmitter::SQRTSS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseSQRT, false, regOp, arg);}
-void XEmitter::SQRTSD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseSQRT, false, regOp, arg);}
-void XEmitter::RSQRTSS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, sseRSQRT, false, regOp, arg);}
-
-void XEmitter::ADDPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseADD, true, regOp, arg);}
-void XEmitter::ADDPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseADD, true, regOp, arg);}
-void XEmitter::SUBPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseSUB, true, regOp, arg);}
-void XEmitter::SUBPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseSUB, true, regOp, arg);}
-void XEmitter::CMPPS(X64Reg regOp, OpArg arg, u8 compare)   {WriteSSEOp(32, sseCMP, true, regOp, arg,1); Write8(compare);}
-void XEmitter::CMPPD(X64Reg regOp, OpArg arg, u8 compare)   {WriteSSEOp(64, sseCMP, true, regOp, arg,1); Write8(compare);}
-void XEmitter::ANDPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseAND, true, regOp, arg);}
-void XEmitter::ANDPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseAND, true, regOp, arg);}
-void XEmitter::ANDNPS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseANDN, true, regOp, arg);}
-void XEmitter::ANDNPD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseANDN, true, regOp, arg);}
-void XEmitter::ORPS(X64Reg regOp, OpArg arg)    {WriteSSEOp(32, sseOR, true, regOp, arg);}
-void XEmitter::ORPD(X64Reg regOp, OpArg arg)    {WriteSSEOp(64, sseOR, true, regOp, arg);}
-void XEmitter::XORPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseXOR, true, regOp, arg);}
-void XEmitter::XORPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseXOR, true, regOp, arg);}
-void XEmitter::MULPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMUL, true, regOp, arg);}
-void XEmitter::MULPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMUL, true, regOp, arg);}
-void XEmitter::DIVPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseDIV, true, regOp, arg);}
-void XEmitter::DIVPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseDIV, true, regOp, arg);}
-void XEmitter::MINPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMIN, true, regOp, arg);}
-void XEmitter::MINPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMIN, true, regOp, arg);}
-void XEmitter::MAXPS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMAX, true, regOp, arg);}
-void XEmitter::MAXPD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMAX, true, regOp, arg);}
-void XEmitter::SQRTPS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseSQRT, true, regOp, arg);}
-void XEmitter::SQRTPD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseSQRT, true, regOp, arg);}
-void XEmitter::RSQRTPS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, sseRSQRT, true, regOp, arg);}
-void XEmitter::SHUFPS(X64Reg regOp, OpArg arg, u8 shuffle) {WriteSSEOp(32, sseSHUF, true, regOp, arg,1); Write8(shuffle);} 
-void XEmitter::SHUFPD(X64Reg regOp, OpArg arg, u8 shuffle) {WriteSSEOp(64, sseSHUF, true, regOp, arg,1); Write8(shuffle);} 
-
-void XEmitter::COMISS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseCOMIS, true, regOp, arg);} //weird that these should be packed
-void XEmitter::COMISD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseCOMIS, true, regOp, arg);} //ordered
-void XEmitter::UCOMISS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, sseUCOMIS, true, regOp, arg);} //unordered
-void XEmitter::UCOMISD(X64Reg regOp, OpArg arg) {WriteSSEOp(64, sseUCOMIS, true, regOp, arg);}
-
-void XEmitter::MOVAPS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseMOVAPfromRM, true, regOp, arg);}
-void XEmitter::MOVAPD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseMOVAPfromRM, true, regOp, arg);}
-void XEmitter::MOVAPS(OpArg arg, X64Reg regOp)  {WriteSSEOp(32, sseMOVAPtoRM, true, regOp, arg);}
-void XEmitter::MOVAPD(OpArg arg, X64Reg regOp)  {WriteSSEOp(64, sseMOVAPtoRM, true, regOp, arg);}
-
-void XEmitter::MOVUPS(X64Reg regOp, OpArg arg)  {WriteSSEOp(32, sseMOVUPfromRM, true, regOp, arg);}
-void XEmitter::MOVUPD(X64Reg regOp, OpArg arg)  {WriteSSEOp(64, sseMOVUPfromRM, true, regOp, arg);}
-void XEmitter::MOVUPS(OpArg arg, X64Reg regOp)  {WriteSSEOp(32, sseMOVUPtoRM, true, regOp, arg);}
-void XEmitter::MOVUPD(OpArg arg, X64Reg regOp)  {WriteSSEOp(64, sseMOVUPtoRM, true, regOp, arg);}
-
-void XEmitter::MOVSS(X64Reg regOp, OpArg arg)   {WriteSSEOp(32, sseMOVUPfromRM, false, regOp, arg);}
-void XEmitter::MOVSD(X64Reg regOp, OpArg arg)   {WriteSSEOp(64, sseMOVUPfromRM, false, regOp, arg);}
-void XEmitter::MOVSS(OpArg arg, X64Reg regOp)   {WriteSSEOp(32, sseMOVUPtoRM, false, regOp, arg);}
-void XEmitter::MOVSD(OpArg arg, X64Reg regOp)   {WriteSSEOp(64, sseMOVUPtoRM, false, regOp, arg);}
-
-void XEmitter::CVTPS2PD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5A, true, regOp, arg);}
-void XEmitter::CVTPD2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, true, regOp, arg);}
-
-void XEmitter::CVTSD2SS(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5A, false, regOp, arg);}
-void XEmitter::CVTSS2SD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5A, false, regOp, arg);}
-void XEmitter::CVTSD2SI(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x2D, false, regOp, arg);}
-
-void XEmitter::CVTDQ2PD(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0xE6, false, regOp, arg);}
-void XEmitter::CVTDQ2PS(X64Reg regOp, OpArg arg) {WriteSSEOp(32, 0x5B, true, regOp, arg);}
-void XEmitter::CVTPD2DQ(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0xE6, false, regOp, arg);}
-void XEmitter::CVTPS2DQ(X64Reg regOp, OpArg arg) {WriteSSEOp(64, 0x5B, true, regOp, arg);}
-
-void XEmitter::CVTTSS2SI(X64Reg xregdest, OpArg arg) {WriteSSEOp(32, 0x2C, false, xregdest, arg);}
-void XEmitter::CVTTPS2DQ(X64Reg xregdest, OpArg arg) {WriteSSEOp(32, 0x5B, false, xregdest, arg);}
-
-void XEmitter::MASKMOVDQU(X64Reg dest, X64Reg src)  {WriteSSEOp(64, sseMASKMOVDQU, true, dest, R(src));}
-
-void XEmitter::MOVMSKPS(X64Reg dest, OpArg arg) {WriteSSEOp(32, 0x50, true, dest, arg);}
-void XEmitter::MOVMSKPD(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x50, true, dest, arg);}
-
-void XEmitter::LDDQU(X64Reg dest, OpArg arg)    {WriteSSEOp(64, sseLDDQU, false, dest, arg);} // For integer data only
-
-// THESE TWO ARE UNTESTED.
-void XEmitter::UNPCKLPS(X64Reg dest, OpArg arg) {WriteSSEOp(32, 0x14, true, dest, arg);}
-void XEmitter::UNPCKHPS(X64Reg dest, OpArg arg) {WriteSSEOp(32, 0x15, true, dest, arg);}
-
-void XEmitter::UNPCKLPD(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x14, true, dest, arg);}
-void XEmitter::UNPCKHPD(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x15, true, dest, arg);}
-
-void XEmitter::MOVDDUP(X64Reg regOp, OpArg arg) 
-{
-	if (cpu_info.bSSE3)
-	{
-		WriteSSEOp(64, 0x12, false, regOp, arg); //SSE3 movddup
-	}
-	else
-	{
-		// Simulate this instruction with SSE2 instructions
-		if (!arg.IsSimpleReg(regOp))
-			MOVSD(regOp, arg);
-		UNPCKLPD(regOp, R(regOp));
-	}
-}
-
-//There are a few more left
-
-// Also some integer instructions are missing
-void XEmitter::PACKSSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x6B, true, dest, arg);}
-void XEmitter::PACKSSWB(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x63, true, dest, arg);}
-//void PACKUSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x66, true, dest, arg);} // WRONG
-void XEmitter::PACKUSWB(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x67, true, dest, arg);}
-
-void XEmitter::PUNPCKLBW(X64Reg dest, const OpArg &arg) {WriteSSEOp(64, 0x60, true, dest, arg);}
-void XEmitter::PUNPCKLWD(X64Reg dest, const OpArg &arg) {WriteSSEOp(64, 0x61, true, dest, arg);}
-void XEmitter::PUNPCKLDQ(X64Reg dest, const OpArg &arg) {WriteSSEOp(64, 0x62, true, dest, arg);}
-//void PUNPCKLQDQ(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x60, true, dest, arg);}
-
-void XEmitter::PSRLW(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x71, true, (X64Reg)2, R(reg));
-	Write8(shift);
-}
-
-void XEmitter::PSRLD(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x72, true, (X64Reg)2, R(reg));
-	Write8(shift);
-}
-
-void XEmitter::PSRLQ(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x73, true, (X64Reg)2, R(reg));
-	Write8(shift);
-}
-
-void XEmitter::PSLLW(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x71, true, (X64Reg)6, R(reg));
-	Write8(shift);
-}
-
-void XEmitter::PSLLD(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x72, true, (X64Reg)6, R(reg));
-	Write8(shift);
-}
-
-void XEmitter::PSLLQ(X64Reg reg, int shift) {
-	WriteSSEOp(64, 0x73, true, (X64Reg)6, R(reg));
-	Write8(shift);
-}
-
-// WARNING not REX compatible
-void XEmitter::PSRAW(X64Reg reg, int shift) {
-	if (reg > 7)
-		PanicAlert("The PSRAW-emitter does not support regs above 7");
-	Write8(0x66);
-	Write8(0x0f);
-	Write8(0x71);
-	Write8(0xE0 | reg);
-	Write8(shift);
-}
-
-// WARNING not REX compatible
-void XEmitter::PSRAD(X64Reg reg, int shift) {
-	if (reg > 7)
-		PanicAlert("The PSRAD-emitter does not support regs above 7");
-	Write8(0x66);
-	Write8(0x0f);
-	Write8(0x72);
-	Write8(0xE0 | reg);
-	Write8(shift);
-}
-
-void XEmitter::PSHUFB(X64Reg dest, OpArg arg) {
-	if (!cpu_info.bSSSE3) {
-		PanicAlert("Trying to use PSHUFB on a system that doesn't support it. Bad programmer.");
-	}
-	Write8(0x66);
-	arg.operandReg = dest;
-	arg.WriteRex(this, 0, 0);
-	Write8(0x0f);
-	Write8(0x38);
-	Write8(0x00);
-	arg.WriteRest(this, 0);
-}
-
-void XEmitter::PAND(X64Reg dest, OpArg arg)     {WriteSSEOp(64, 0xDB, true, dest, arg);}
-void XEmitter::PANDN(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xDF, true, dest, arg);}
-void XEmitter::PXOR(X64Reg dest, OpArg arg)     {WriteSSEOp(64, 0xEF, true, dest, arg);}
-void XEmitter::POR(X64Reg dest, OpArg arg)      {WriteSSEOp(64, 0xEB, true, dest, arg);}
-
-void XEmitter::PADDB(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xFC, true, dest, arg);}
-void XEmitter::PADDW(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xFD, true, dest, arg);}
-void XEmitter::PADDD(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xFE, true, dest, arg);}
-void XEmitter::PADDQ(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xD4, true, dest, arg);}
-
-void XEmitter::PADDSB(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xEC, true, dest, arg);}
-void XEmitter::PADDSW(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xED, true, dest, arg);}
-void XEmitter::PADDUSB(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0xDC, true, dest, arg);}
-void XEmitter::PADDUSW(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0xDD, true, dest, arg);}
-
-void XEmitter::PSUBB(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xF8, true, dest, arg);}
-void XEmitter::PSUBW(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xF9, true, dest, arg);}
-void XEmitter::PSUBD(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xFA, true, dest, arg);}
-void XEmitter::PSUBQ(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xDB, true, dest, arg);}
-
-void XEmitter::PSUBSB(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xE8, true, dest, arg);}
-void XEmitter::PSUBSW(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xE9, true, dest, arg);}
-void XEmitter::PSUBUSB(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0xD8, true, dest, arg);}
-void XEmitter::PSUBUSW(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0xD9, true, dest, arg);}
-
-void XEmitter::PAVGB(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xE0, true, dest, arg);}
-void XEmitter::PAVGW(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xE3, true, dest, arg);}
-
-void XEmitter::PCMPEQB(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x74, true, dest, arg);}
-void XEmitter::PCMPEQW(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x75, true, dest, arg);}
-void XEmitter::PCMPEQD(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x76, true, dest, arg);}
-
-void XEmitter::PCMPGTB(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x64, true, dest, arg);}
-void XEmitter::PCMPGTW(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x65, true, dest, arg);}
-void XEmitter::PCMPGTD(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0x66, true, dest, arg);}
-
-void XEmitter::PEXTRW(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSEOp(64, 0xC5, true, dest, arg); Write8(subreg);}
-void XEmitter::PINSRW(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSEOp(64, 0xC4, true, dest, arg); Write8(subreg);}
-
-void XEmitter::PMADDWD(X64Reg dest, OpArg arg)  {WriteSSEOp(64, 0xF5, true, dest, arg); }
-void XEmitter::PSADBW(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xF6, true, dest, arg);}
-
-void XEmitter::PMAXSW(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xEE, true, dest, arg); }
-void XEmitter::PMAXUB(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xDE, true, dest, arg); }
-void XEmitter::PMINSW(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xEA, true, dest, arg); }
-void XEmitter::PMINUB(X64Reg dest, OpArg arg)   {WriteSSEOp(64, 0xDA, true, dest, arg); }
-
-void XEmitter::PMOVMSKB(X64Reg dest, OpArg arg)    {WriteSSEOp(64, 0xD7, true, dest, arg); }
-
-void XEmitter::PSHUFLW(X64Reg regOp, OpArg arg, u8 shuffle)   {WriteSSEOp(64, 0x70, false, regOp, arg, 1); Write8(shuffle);}
-
-// Prefixes
-
-void XEmitter::LOCK()  { Write8(0xF0); }
-void XEmitter::REP()   { Write8(0xF3); }
-void XEmitter::REPNE() { Write8(0xF2); }
-
-void XEmitter::FWAIT()
-{
-	Write8(0x9B);
-}
-
-void XEmitter::RTDSC() { Write8(0x0F); Write8(0x31); }
-	
-// helper routines for setting pointers
-void XEmitter::CallCdeclFunction3(void* fnptr, u32 arg0, u32 arg1, u32 arg2)
-{
-	using namespace Gen;
-#ifdef _M_X64
-
-#ifdef _MSC_VER
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8),  Imm32(arg2));
-	CALL(fnptr);
-#else
-	MOV(32, R(RDI), Imm32(arg0));
-	MOV(32, R(RSI), Imm32(arg1));
-	MOV(32, R(RDX), Imm32(arg2));
-	CALL(fnptr);
-#endif
-
-#else
-	ABI_AlignStack(3 * 4);
-	PUSH(32, Imm32(arg2));
-	PUSH(32, Imm32(arg1));
-	PUSH(32, Imm32(arg0));
-	CALL(fnptr);
-#ifdef _WIN32
-	// don't inc stack
-#else
-	ABI_RestoreStack(3 * 4);
-#endif
-#endif
-}
-
-void XEmitter::CallCdeclFunction4(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3)
-{
-	using namespace Gen;
-#ifdef _M_X64
-
-#ifdef _MSC_VER
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	MOV(32, R(R9), Imm32(arg3));
-	CALL(fnptr);
-#else
-	MOV(32, R(RDI), Imm32(arg0));
-	MOV(32, R(RSI), Imm32(arg1));
-	MOV(32, R(RDX), Imm32(arg2));
-	MOV(32, R(RCX), Imm32(arg3));
-	CALL(fnptr);
-#endif
-
-#else
-	ABI_AlignStack(4 * 4);
-	PUSH(32, Imm32(arg3));
-	PUSH(32, Imm32(arg2));
-	PUSH(32, Imm32(arg1));
-	PUSH(32, Imm32(arg0));
-	CALL(fnptr);
-#ifdef _WIN32
-	// don't inc stack
-#else
-	ABI_RestoreStack(4 * 4);
-#endif
-#endif
-}
-
-void XEmitter::CallCdeclFunction5(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
-{
-	using namespace Gen;
-#ifdef _M_X64
-
-#ifdef _MSC_VER
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8),  Imm32(arg2));
-	MOV(32, R(R9),  Imm32(arg3));
-	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
-	CALL(fnptr);
-#else
-	MOV(32, R(RDI), Imm32(arg0));
-	MOV(32, R(RSI), Imm32(arg1));
-	MOV(32, R(RDX), Imm32(arg2));
-	MOV(32, R(RCX), Imm32(arg3));
-	MOV(32, R(R8),  Imm32(arg4));
-	CALL(fnptr);
-#endif
-
-#else
-	ABI_AlignStack(5 * 4);
-	PUSH(32, Imm32(arg4));
-	PUSH(32, Imm32(arg3));
-	PUSH(32, Imm32(arg2));
-	PUSH(32, Imm32(arg1));
-	PUSH(32, Imm32(arg0));
-	CALL(fnptr);
-#ifdef _WIN32
-	// don't inc stack
-#else
-	ABI_RestoreStack(5 * 4);
-#endif
-#endif
-}
-
-void XEmitter::CallCdeclFunction6(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
-{
-	using namespace Gen;
-#ifdef _M_X64
-
-#ifdef _MSC_VER
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	MOV(32, R(R9), Imm32(arg3));
-	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
-	MOV(32, MDisp(RSP, 0x28), Imm32(arg5));
-	CALL(fnptr);
-#else
-	MOV(32, R(RDI), Imm32(arg0));
-	MOV(32, R(RSI), Imm32(arg1));
-	MOV(32, R(RDX), Imm32(arg2));
-	MOV(32, R(RCX), Imm32(arg3));
-	MOV(32, R(R8), Imm32(arg4));
-	MOV(32, R(R9), Imm32(arg5));
-	CALL(fnptr);
-#endif
-
-#else
-	ABI_AlignStack(6 * 4);
-	PUSH(32, Imm32(arg5));
-	PUSH(32, Imm32(arg4));
-	PUSH(32, Imm32(arg3));
-	PUSH(32, Imm32(arg2));
-	PUSH(32, Imm32(arg1));
-	PUSH(32, Imm32(arg0));
-	CALL(fnptr);
-#ifdef _WIN32
-	// don't inc stack
-#else
-	ABI_RestoreStack(6 * 4);
-#endif
-#endif
-}
-
-#ifdef _M_X64
-
-// See header
-void XEmitter::___CallCdeclImport3(void* impptr, u32 arg0, u32 arg1, u32 arg2) {
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	CALLptr(M(impptr));
-}
-void XEmitter::___CallCdeclImport4(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3) {
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	MOV(32, R(R9), Imm32(arg3));
-	CALLptr(M(impptr));
-}
-void XEmitter::___CallCdeclImport5(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4) {
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	MOV(32, R(R9), Imm32(arg3));
-	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
-	CALLptr(M(impptr));
-}
-void XEmitter::___CallCdeclImport6(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5) {
-	MOV(32, R(RCX), Imm32(arg0));
-	MOV(32, R(RDX), Imm32(arg1));
-	MOV(32, R(R8), Imm32(arg2));
-	MOV(32, R(R9), Imm32(arg3));
-	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
-	MOV(32, MDisp(RSP, 0x28), Imm32(arg5));
-	CALLptr(M(impptr));
-}
-
-#endif
-
-}
diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h
deleted file mode 100644
index c42c955ec4..0000000000
--- a/Source/Core/Common/Src/x64Emitter.h
+++ /dev/null
@@ -1,767 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
-
-#ifndef _DOLPHIN_INTEL_CODEGEN_
-#define _DOLPHIN_INTEL_CODEGEN_
-
-#include "Common.h"
-#include "MemoryUtil.h"
-
-namespace Gen
-{
-
-enum X64Reg
-{
-	EAX = 0, EBX = 3, ECX = 1, EDX = 2,
-	ESI = 6, EDI = 7, EBP = 5, ESP = 4,
-	
-	RAX = 0, RBX = 3, RCX = 1, RDX = 2,
-	RSI = 6, RDI = 7, RBP = 5, RSP = 4,
-	R8  = 8, R9  = 9, R10 = 10,R11 = 11,
-	R12 = 12,R13 = 13,R14 = 14,R15 = 15,
-
-	AL = 0, BL = 3, CL = 1, DL = 2,
-	SIL = 6, DIL = 7, BPL = 5, SPL = 4,
-	AH = 0x104, BH = 0x107, CH = 0x105, DH = 0x106,
-
-	AX = 0, BX = 3, CX = 1, DX = 2,
-	SI = 6, DI = 7, BP = 5, SP = 4,
-
-	XMM0=0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7, 
-	XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15,
-
-	INVALID_REG = 0xFFFFFFFF
-};
-
-enum CCFlags
-{
-	CC_O   = 0,
-	CC_NO  = 1,
-	CC_B   = 2, CC_C  = 2, CC_NAE = 2,
-	CC_NB  = 3, CC_NC = 3, CC_AE  = 3,
-	CC_Z   = 4, CC_E   = 4,
-	CC_NZ  = 5,	CC_NE  = 5, 
-	CC_BE  = 6, CC_NA  = 6,
-	CC_NBE = 7, CC_A   = 7,
-	CC_S   = 8,
-	CC_NS  = 9,
-	CC_P   = 0xA, CC_PE  = 0xA,
-	CC_NP  = 0xB, CC_PO  = 0xB,
-	CC_L   = 0xC, CC_NGE = 0xC,
-	CC_NL  = 0xD, CC_GE  = 0xD,
-	CC_LE  = 0xE, CC_NG  = 0xE,
-	CC_NLE = 0xF, CC_G   = 0xF
-};
-
-enum
-{
-	NUMGPRs = 16,
-	NUMXMMs = 16,
-};
-
-enum
-{
-	SCALE_NONE = 0,
-	SCALE_1 = 1,
-	SCALE_2 = 2,
-	SCALE_4 = 4,
-	SCALE_8 = 8,
-	SCALE_ATREG = 16,
-	//SCALE_NOBASE_1 is not supported and can be replaced with SCALE_ATREG
-	SCALE_NOBASE_2 = 34,
-	SCALE_NOBASE_4 = 36,
-	SCALE_NOBASE_8 = 40,
-	SCALE_RIP = 0xFF,
-	SCALE_IMM8  = 0xF0,
-	SCALE_IMM16 = 0xF1,
-	SCALE_IMM32 = 0xF2,
-	SCALE_IMM64 = 0xF3,
-};
-
-enum NormalOp {
-	nrmADD,
-	nrmADC,
-	nrmSUB,
-	nrmSBB,
-	nrmAND,
-	nrmOR ,
-	nrmXOR,
-	nrmMOV,
-	nrmTEST,
-	nrmCMP,
-	nrmXCHG,
-};
-
-class XEmitter;
-
-// RIP addressing does not benefit from micro op fusion on Core arch
-struct OpArg
-{
-	OpArg() {}  // dummy op arg, used for storage
-	OpArg(u64 _offset, int _scale, X64Reg rmReg = RAX, X64Reg scaledReg = RAX)
-	{
-		operandReg = 0;
-		scale = (u8)_scale;
-		offsetOrBaseReg = (u16)rmReg;
-		indexReg = (u16)scaledReg;
-		//if scale == 0 never mind offsetting
-		offset = _offset;
-	}
-	void WriteRex(XEmitter *emit, int opBits, int bits, int customOp = -1) const;
-	void WriteRest(XEmitter *emit, int extraBytes=0, X64Reg operandReg=(X64Reg)0xFF, bool warn_64bit_offset = true) const;
-	void WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg operandReg, int bits);
-	// This one is public - must be written to
-	u64 offset;  // use RIP-relative as much as possible - 64-bit immediates are not available.
-	u16 operandReg;
-
-	void WriteNormalOp(XEmitter *emit, bool toRM, NormalOp op, const OpArg &operand, int bits) const;
-	bool IsImm() const {return scale == SCALE_IMM8 || scale == SCALE_IMM16 || scale == SCALE_IMM32 || scale == SCALE_IMM64;}
-	bool IsSimpleReg() const {return scale == SCALE_NONE;}
-	bool IsSimpleReg(X64Reg reg) const {
-		if (!IsSimpleReg())
-			return false;
-		return GetSimpleReg() == reg;
-	}
-
-	bool CanDoOpWith(const OpArg &other) const
-	{
-		if (IsSimpleReg()) return true;
-		if (!IsSimpleReg() && !other.IsSimpleReg() && !other.IsImm()) return false;
-		return true;
-	}
-
-	int GetImmBits() const
-	{
-		switch (scale)
-		{
-		case SCALE_IMM8: return 8;
-		case SCALE_IMM16: return 16;
-		case SCALE_IMM32: return 32;
-		case SCALE_IMM64: return 64;
-		default: return -1;
-		}
-	}
-
-	X64Reg GetSimpleReg() const
-	{
-		if (scale == SCALE_NONE)
-			return (X64Reg)offsetOrBaseReg;
-		else
-			return INVALID_REG;
-	}
-private:
-	u8 scale;
-	u16 offsetOrBaseReg;
-	u16 indexReg;
-};
-
-inline OpArg M(void *ptr)	    {return OpArg((u64)ptr, (int)SCALE_RIP);}
-inline OpArg R(X64Reg value)	{return OpArg(0, SCALE_NONE, value);}
-inline OpArg MatR(X64Reg value) {return OpArg(0, SCALE_ATREG, value);}
-inline OpArg MDisp(X64Reg value, int offset) {
-	return OpArg((u32)offset, SCALE_ATREG, value);
-}
-inline OpArg MComplex(X64Reg base, X64Reg scaled, int scale, int offset) {
-	return OpArg(offset, scale, base, scaled);
-}
-inline OpArg MScaled(X64Reg scaled, int scale, int offset) {
-	if (scale == SCALE_1)
-		return OpArg(offset, SCALE_ATREG, scaled);
-	else
-		return OpArg(offset, scale | 0x20, RAX, scaled);
-}
-inline OpArg MRegSum(X64Reg base, X64Reg offset) {
-	return MComplex(base, offset, 1, 0);
-}
-inline OpArg Imm8 (u8 imm)  {return OpArg(imm, SCALE_IMM8);}
-inline OpArg Imm16(u16 imm) {return OpArg(imm, SCALE_IMM16);} //rarely used
-inline OpArg Imm32(u32 imm) {return OpArg(imm, SCALE_IMM32);}
-inline OpArg Imm64(u64 imm) {return OpArg(imm, SCALE_IMM64);}
-#ifdef _M_X64
-inline OpArg ImmPtr(void* imm) {return Imm64((u64)imm);}
-#else
-inline OpArg ImmPtr(void* imm) {return Imm32((u32)imm);}
-#endif
-inline u32 PtrOffset(void* ptr, void* base) {
-#ifdef _M_X64
-	s64 distance = (s64)ptr-(s64)base;
-	if (distance >= 0x80000000LL ||
-	    distance < -0x80000000LL) {
-		_assert_msg_(DYNA_REC, 0, "pointer offset out of range");
-		return 0;
-	}
-	return (u32)distance;
-#else
-	return (u32)ptr-(u32)base;
-#endif
-}
-
-//usage: int a[]; ARRAY_OFFSET(a,10)
-#define ARRAY_OFFSET(array,index) ((u32)((u64)&(array)[index]-(u64)&(array)[0]))
-//usage: struct {int e;} s; STRUCT_OFFSET(s,e)
-#define STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
-
-struct FixupBranch
-{
-	u8 *ptr;
-	int type; //0 = 8bit 1 = 32bit
-};
-
-enum SSECompare
-{
-	EQ = 0,
-	LT,
-	LE,
-	UNORD,
-	NEQ,
-	NLT,
-	NLE,
-	ORD,
-};
-
-typedef const u8* JumpTarget;
-
-class XEmitter
-{
-	friend struct OpArg;  // for Write8 etc
-private:
-	u8 *code;
-
-	void Rex(int w, int r, int x, int b);
-	void WriteSimple1Byte(int bits, u8 byte, X64Reg reg);
-	void WriteSimple2Byte(int bits, u8 byte1, u8 byte2, X64Reg reg);
-	void WriteMulDivType(int bits, OpArg src, int ext);
-	void WriteBitSearchType(int bits, X64Reg dest, OpArg src, u8 byte2);
-	void WriteShift(int bits, OpArg dest, OpArg &shift, int ext);
-	void WriteBitTest(int bits, OpArg &dest, OpArg &index, int ext);
-	void WriteMXCSR(OpArg arg, int ext);
-	void WriteSSEOp(int size, u8 sseOp, bool packed, X64Reg regOp, OpArg arg, int extrabytes = 0);
-	void WriteNormalOp(XEmitter *emit, int bits, NormalOp op, const OpArg &a1, const OpArg &a2);
-
-protected:
-	inline void Write8(u8 value)   {*code++ = value;}
-	inline void Write16(u16 value) {*(u16*)code = (value); code += 2;}
-	inline void Write32(u32 value) {*(u32*)code = (value); code += 4;}
-	inline void Write64(u64 value) {*(u64*)code = (value); code += 8;}
-
-public:
-	XEmitter() { code = NULL; }
-	XEmitter(u8 *code_ptr) { code = code_ptr; }
-	virtual ~XEmitter() {}
-
-	void WriteModRM(int mod, int rm, int reg);
-	void WriteSIB(int scale, int index, int base);
-
-	void SetCodePtr(u8 *ptr);
-	void ReserveCodeSpace(int bytes);
-	const u8 *AlignCode4();
-	const u8 *AlignCode16();
-	const u8 *AlignCodePage();
-	const u8 *GetCodePtr() const;
-	u8 *GetWritableCodePtr();
-
-	// Looking for one of these? It's BANNED!! Some instructions are slow on modern CPU
-	// INC, DEC, LOOP, LOOPNE, LOOPE, ENTER, LEAVE, XCHG, XLAT, REP MOVSB/MOVSD, REP SCASD + other string instr., 
-	// INC and DEC are slow on Intel Core, but not on AMD. They create a
-	// false flag dependency because they only update a subset of the flags.
-	// XCHG is SLOW and should be avoided.
-
-	// Debug breakpoint
-	void INT3();
-
-	// Do nothing
-	void NOP(int count = 1); //nop padding - TODO: fast nop slides, for amd and intel (check their manuals)
-
-	// Save energy in wait-loops on P4 only. Probably not too useful.
-	void PAUSE();
-
-	// Flag control
-	void STC();
-	void CLC();
-	void CMC();
-
-	// These two can not be executed in 64-bit mode on early Intel 64-bit CPU:s, only on Core2 and AMD!
-	void LAHF(); // 3 cycle vector path
-	void SAHF(); // direct path fast
-
-
-	// Stack control
-	void PUSH(X64Reg reg);
-	void POP(X64Reg reg);
-	void PUSH(int bits, const OpArg &reg);
-	void POP(int bits, const OpArg &reg);
-	void PUSHF();
-	void POPF();
-
-	// Flow control
-	void RET();
-	void RET_FAST();
-	void UD2();
-	FixupBranch J(bool force5bytes = false);
-
-	void JMP(const u8 * addr, bool force5Bytes = false);
-	void JMP(OpArg arg);
-	void JMPptr(const OpArg &arg);
-	void JMPself(); //infinite loop!
-#ifdef CALL
-#undef CALL
-#endif
-	void CALL(const void *fnptr);
-	void CALLptr(OpArg arg);
-
-	FixupBranch J_CC(CCFlags conditionCode, bool force5bytes = false);
-	//void J_CC(CCFlags conditionCode, JumpTarget target);
-	void J_CC(CCFlags conditionCode, const u8 * addr, bool force5Bytes = false);
-
-	void SetJumpTarget(const FixupBranch &branch);
-
-	void SETcc(CCFlags flag, OpArg dest);
-	// Note: CMOV brings small if any benefit on current cpus.
-	void CMOVcc(int bits, X64Reg dest, OpArg src, CCFlags flag);
-
-	// Fences
-	void LFENCE();
-	void MFENCE();
-	void SFENCE();
-
-	// Bit scan
-	void BSF(int bits, X64Reg dest, OpArg src); //bottom bit to top bit
-	void BSR(int bits, X64Reg dest, OpArg src); //top bit to bottom bit
-
-	// Cache control
-	enum PrefetchLevel
-	{
-		PF_NTA, //Non-temporal (data used once and only once)
-		PF_T0,  //All cache levels
-		PF_T1,  //Levels 2+ (aliased to T0 on AMD)
-		PF_T2,  //Levels 3+ (aliased to T0 on AMD)
-	};
-	void PREFETCH(PrefetchLevel level, OpArg arg);
-	void MOVNTI(int bits, OpArg dest, X64Reg src);
-	void MOVNTDQ(OpArg arg, X64Reg regOp);
-	void MOVNTPS(OpArg arg, X64Reg regOp);
-	void MOVNTPD(OpArg arg, X64Reg regOp);
-
-	// Multiplication / division
-	void MUL(int bits, OpArg src); //UNSIGNED
-	void IMUL(int bits, OpArg src); //SIGNED
-	void IMUL(int bits, X64Reg regOp, OpArg src);
-	void IMUL(int bits, X64Reg regOp, OpArg src, OpArg imm);
-	void DIV(int bits, OpArg src);
-	void IDIV(int bits, OpArg src);
-
-	// Shift 
-	void ROL(int bits, OpArg dest, OpArg shift);
-	void ROR(int bits, OpArg dest, OpArg shift);
-	void RCL(int bits, OpArg dest, OpArg shift);
-	void RCR(int bits, OpArg dest, OpArg shift);
-	void SHL(int bits, OpArg dest, OpArg shift);
-	void SHR(int bits, OpArg dest, OpArg shift);
-	void SAR(int bits, OpArg dest, OpArg shift);
-
-	// Bit Test
-	void BT(int bits, OpArg dest, OpArg index);
-	void BTS(int bits, OpArg dest, OpArg index);
-	void BTR(int bits, OpArg dest, OpArg index);
-	void BTC(int bits, OpArg dest, OpArg index);
-
-	// Double-Precision Shift
-	void SHRD(int bits, OpArg dest, OpArg src, OpArg shift);
-	void SHLD(int bits, OpArg dest, OpArg src, OpArg shift);
-
-	// Extend EAX into EDX in various ways
-	void CWD(int bits = 16);
-	inline void CDQ() {CWD(32);}
-	inline void CQO() {CWD(64);}
-	void CBW(int bits = 8);
-	inline void CWDE() {CBW(16);}
-	inline void CDQE() {CBW(32);}
-
-	// Load effective address
-	void LEA(int bits, X64Reg dest, OpArg src);
-
-	// Integer arithmetic
-	void NEG (int bits, OpArg src);
-	void ADD (int bits, const OpArg &a1, const OpArg &a2);
-	void ADC (int bits, const OpArg &a1, const OpArg &a2);
-	void SUB (int bits, const OpArg &a1, const OpArg &a2);
-	void SBB (int bits, const OpArg &a1, const OpArg &a2);
-	void AND (int bits, const OpArg &a1, const OpArg &a2);
-	void CMP (int bits, const OpArg &a1, const OpArg &a2);
-
-	// Bit operations
-	void NOT (int bits, OpArg src);
-	void OR  (int bits, const OpArg &a1, const OpArg &a2);
-	void XOR (int bits, const OpArg &a1, const OpArg &a2);
-	void MOV (int bits, const OpArg &a1, const OpArg &a2);
-	void TEST(int bits, const OpArg &a1, const OpArg &a2);
-
-	// Are these useful at all? Consider removing.
-	void XCHG(int bits, const OpArg &a1, const OpArg &a2);
-	void XCHG_AHAL();
-
-	// Byte swapping (32 and 64-bit only).
-	void BSWAP(int bits, X64Reg reg);
-
-	// Sign/zero extension
-	void MOVSX(int dbits, int sbits, X64Reg dest, OpArg src); //automatically uses MOVSXD if necessary
-	void MOVZX(int dbits, int sbits, X64Reg dest, OpArg src); 
-
-	// WARNING - These two take 11-13 cycles and are VectorPath! (AMD64)
-	void STMXCSR(OpArg memloc);
-	void LDMXCSR(OpArg memloc);
-
-	// Prefixes
-	void LOCK();
-	void REP();
-	void REPNE();
-
-	void FWAIT();
-
-	// SSE/SSE2: Floating point arithmetic
-	void ADDSS(X64Reg regOp, OpArg arg);  
-	void ADDSD(X64Reg regOp, OpArg arg);  
-	void SUBSS(X64Reg regOp, OpArg arg);  
-	void SUBSD(X64Reg regOp, OpArg arg);  
-	void MULSS(X64Reg regOp, OpArg arg);  
-	void MULSD(X64Reg regOp, OpArg arg);  
-	void DIVSS(X64Reg regOp, OpArg arg);  
-	void DIVSD(X64Reg regOp, OpArg arg);  
-	void MINSS(X64Reg regOp, OpArg arg);  
-	void MINSD(X64Reg regOp, OpArg arg);  
-	void MAXSS(X64Reg regOp, OpArg arg);  
-	void MAXSD(X64Reg regOp, OpArg arg);  
-	void SQRTSS(X64Reg regOp, OpArg arg); 
-	void SQRTSD(X64Reg regOp, OpArg arg); 
-	void RSQRTSS(X64Reg regOp, OpArg arg);
-
-	// SSE/SSE2: Floating point bitwise (yes)
-	void CMPSS(X64Reg regOp, OpArg arg, u8 compare);  
-	void CMPSD(X64Reg regOp, OpArg arg, u8 compare);  
-	void ANDSS(X64Reg regOp, OpArg arg);  
-	void ANDSD(X64Reg regOp, OpArg arg);  
-	void ANDNSS(X64Reg regOp, OpArg arg); 
-	void ANDNSD(X64Reg regOp, OpArg arg); 
-	void ORSS(X64Reg regOp, OpArg arg);   
-	void ORSD(X64Reg regOp, OpArg arg);   
-	void XORSS(X64Reg regOp, OpArg arg);   
-	void XORSD(X64Reg regOp, OpArg arg);   
-
-	// SSE/SSE2: Floating point packed arithmetic (x4 for float, x2 for double)
-	void ADDPS(X64Reg regOp, OpArg arg); 
-	void ADDPD(X64Reg regOp, OpArg arg); 
-	void SUBPS(X64Reg regOp, OpArg arg); 
-	void SUBPD(X64Reg regOp, OpArg arg); 
-	void CMPPS(X64Reg regOp, OpArg arg, u8 compare);  
-	void CMPPD(X64Reg regOp, OpArg arg, u8 compare);
-	void MULPS(X64Reg regOp, OpArg arg);
-	void MULPD(X64Reg regOp, OpArg arg);
-	void DIVPS(X64Reg regOp, OpArg arg);
-	void DIVPD(X64Reg regOp, OpArg arg);
-	void MINPS(X64Reg regOp, OpArg arg);
-	void MINPD(X64Reg regOp, OpArg arg);
-	void MAXPS(X64Reg regOp, OpArg arg);
-	void MAXPD(X64Reg regOp, OpArg arg);
-	void SQRTPS(X64Reg regOp, OpArg arg);
-	void SQRTPD(X64Reg regOp, OpArg arg);
-	void RSQRTPS(X64Reg regOp, OpArg arg);
-
-	// SSE/SSE2: Floating point packed bitwise (x4 for float, x2 for double)
-	void ANDPS(X64Reg regOp, OpArg arg); 
-	void ANDPD(X64Reg regOp, OpArg arg); 
-	void ANDNPS(X64Reg regOp, OpArg arg);
-	void ANDNPD(X64Reg regOp, OpArg arg);
-	void ORPS(X64Reg regOp, OpArg arg);
-	void ORPD(X64Reg regOp, OpArg arg);
-	void XORPS(X64Reg regOp, OpArg arg);
-	void XORPD(X64Reg regOp, OpArg arg);
-
-	// SSE/SSE2: Shuffle components. These are tricky - see Intel documentation.
-	void SHUFPS(X64Reg regOp, OpArg arg, u8 shuffle);  
-	void SHUFPD(X64Reg regOp, OpArg arg, u8 shuffle);  
-	
-	// SSE/SSE2: Useful alternative to shuffle in some cases.
-	void MOVDDUP(X64Reg regOp, OpArg arg);
-
-	// THESE TWO ARE NEW AND UNTESTED
-	void UNPCKLPS(X64Reg dest, OpArg src);
-	void UNPCKHPS(X64Reg dest, OpArg src);
-
-	// These are OK.
-	void UNPCKLPD(X64Reg dest, OpArg src);
-	void UNPCKHPD(X64Reg dest, OpArg src);
-
-	// SSE/SSE2: Compares.
-	void COMISS(X64Reg regOp, OpArg arg);
-	void COMISD(X64Reg regOp, OpArg arg);
-	void UCOMISS(X64Reg regOp, OpArg arg);
-	void UCOMISD(X64Reg regOp, OpArg arg);
-
-	// SSE/SSE2: Moves. Use the right data type for your data, in most cases.
-	void MOVAPS(X64Reg regOp, OpArg arg);
-	void MOVAPD(X64Reg regOp, OpArg arg);
-	void MOVAPS(OpArg arg, X64Reg regOp);
-	void MOVAPD(OpArg arg, X64Reg regOp);
-
-	void MOVUPS(X64Reg regOp, OpArg arg);
-	void MOVUPD(X64Reg regOp, OpArg arg);
-	void MOVUPS(OpArg arg, X64Reg regOp);
-	void MOVUPD(OpArg arg, X64Reg regOp);
-
-	void MOVSS(X64Reg regOp, OpArg arg);
-	void MOVSD(X64Reg regOp, OpArg arg);
-	void MOVSS(OpArg arg, X64Reg regOp);
-	void MOVSD(OpArg arg, X64Reg regOp);
-
-	void MOVD_xmm(X64Reg dest, const OpArg &arg);
-	void MOVQ_xmm(X64Reg dest, OpArg arg);
-	void MOVD_xmm(const OpArg &arg, X64Reg src);
-	void MOVQ_xmm(OpArg arg, X64Reg src);
-
-	// SSE/SSE2: Generates a mask from the high bits of the components of the packed register in question.
-	void MOVMSKPS(X64Reg dest, OpArg arg);
-	void MOVMSKPD(X64Reg dest, OpArg arg);
-
-	// SSE2: Selective byte store, mask in src register. EDI/RDI specifies store address. This is a weird one.
-	void MASKMOVDQU(X64Reg dest, X64Reg src);
-	void LDDQU(X64Reg dest, OpArg src);
-
-	// SSE/SSE2: Data type conversions.
-	void CVTPS2PD(X64Reg dest, OpArg src);
-	void CVTPD2PS(X64Reg dest, OpArg src);
-	void CVTSS2SD(X64Reg dest, OpArg src);
-	void CVTSD2SS(X64Reg dest, OpArg src);
-	void CVTSD2SI(X64Reg dest, OpArg src);
-	void CVTDQ2PD(X64Reg regOp, OpArg arg);
-	void CVTPD2DQ(X64Reg regOp, OpArg arg);
-	void CVTDQ2PS(X64Reg regOp, OpArg arg);
-	void CVTPS2DQ(X64Reg regOp, OpArg arg);
-
-	void CVTTSS2SI(X64Reg xregdest, OpArg arg);  // Yeah, destination really is a GPR like EAX!
-	void CVTTPS2DQ(X64Reg regOp, OpArg arg);
-
-	// SSE2: Packed integer instructions
-	void PACKSSDW(X64Reg dest, OpArg arg);
-	void PACKSSWB(X64Reg dest, OpArg arg);
-	//void PACKUSDW(X64Reg dest, OpArg arg);
-	void PACKUSWB(X64Reg dest, OpArg arg);
-
-	void PUNPCKLBW(X64Reg dest, const OpArg &arg);
-	void PUNPCKLWD(X64Reg dest, const OpArg &arg);
-	void PUNPCKLDQ(X64Reg dest, const OpArg &arg);
-
-	void PAND(X64Reg dest, OpArg arg);
-	void PANDN(X64Reg dest, OpArg arg);   
-	void PXOR(X64Reg dest, OpArg arg);    
-	void POR(X64Reg dest, OpArg arg);     
-
-	void PADDB(X64Reg dest, OpArg arg);
-	void PADDW(X64Reg dest, OpArg arg);   
-	void PADDD(X64Reg dest, OpArg arg);   
-	void PADDQ(X64Reg dest, OpArg arg);   
-
-	void PADDSB(X64Reg dest, OpArg arg);  
-	void PADDSW(X64Reg dest, OpArg arg);  
-	void PADDUSB(X64Reg dest, OpArg arg); 
-	void PADDUSW(X64Reg dest, OpArg arg); 
-
-	void PSUBB(X64Reg dest, OpArg arg);   
-	void PSUBW(X64Reg dest, OpArg arg);   
-	void PSUBD(X64Reg dest, OpArg arg);   
-	void PSUBQ(X64Reg dest, OpArg arg);   
-
-	void PSUBSB(X64Reg dest, OpArg arg);  
-	void PSUBSW(X64Reg dest, OpArg arg);  
-	void PSUBUSB(X64Reg dest, OpArg arg); 
-	void PSUBUSW(X64Reg dest, OpArg arg); 
-
-	void PAVGB(X64Reg dest, OpArg arg);   
-	void PAVGW(X64Reg dest, OpArg arg);   
-
-	void PCMPEQB(X64Reg dest, OpArg arg); 
-	void PCMPEQW(X64Reg dest, OpArg arg); 
-	void PCMPEQD(X64Reg dest, OpArg arg); 
-
-	void PCMPGTB(X64Reg dest, OpArg arg); 
-	void PCMPGTW(X64Reg dest, OpArg arg); 
-	void PCMPGTD(X64Reg dest, OpArg arg); 
-
-	void PEXTRW(X64Reg dest, OpArg arg, u8 subreg);
-	void PINSRW(X64Reg dest, OpArg arg, u8 subreg);
-
-	void PMADDWD(X64Reg dest, OpArg arg); 
-	void PSADBW(X64Reg dest, OpArg arg);  
-
-	void PMAXSW(X64Reg dest, OpArg arg);  
-	void PMAXUB(X64Reg dest, OpArg arg);  
-	void PMINSW(X64Reg dest, OpArg arg);  
-	void PMINUB(X64Reg dest, OpArg arg);  
-
-	void PMOVMSKB(X64Reg dest, OpArg arg);
-	void PSHUFB(X64Reg dest, OpArg arg);
-
-	void PSHUFLW(X64Reg dest, OpArg arg, u8 shuffle);
-
-	void PSRLW(X64Reg reg, int shift);
-	void PSRLD(X64Reg reg, int shift);
-	void PSRLQ(X64Reg reg, int shift);
-
-	void PSLLW(X64Reg reg, int shift);
-	void PSLLD(X64Reg reg, int shift);
-	void PSLLQ(X64Reg reg, int shift);
-
-	void PSRAW(X64Reg reg, int shift);
-	void PSRAD(X64Reg reg, int shift);
-
-	void RTDSC();
-
-	// Utility functions
-	// The difference between this and CALL is that this aligns the stack
-	// where appropriate.
-	void ABI_CallFunction(void *func);
-
-	void ABI_CallFunctionC16(void *func, u16 param1);
-	void ABI_CallFunctionCC16(void *func, u32 param1, u16 param2);
-	
-	// These only support u32 parameters, but that's enough for a lot of uses.
-	// These will destroy the 1 or 2 first "parameter regs".
-	void ABI_CallFunctionC(void *func, u32 param1);
-	void ABI_CallFunctionCC(void *func, u32 param1, u32 param2);
-	void ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3);
-	void ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3);
-	void ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2,u32 param3, void *param4);
-	void ABI_CallFunctionPPC(void *func, void *param1, void *param2,u32 param3);
-	void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2);
-	void ABI_CallFunctionA(void *func, const Gen::OpArg &arg1);
-
-	// Pass a register as a parameter.
-	void ABI_CallFunctionR(void *func, Gen::X64Reg reg1);
-	void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2);
-
-	// A function that doesn't have any control over what it will do to regs,
-	// such as the dispatcher, should be surrounded by these.
-	void ABI_PushAllCalleeSavedRegsAndAdjustStack();
-	void ABI_PopAllCalleeSavedRegsAndAdjustStack();
-
-	// A function that doesn't know anything about it's surroundings, should
-	// be surrounded by these to establish a safe environment, where it can roam free.
-	// An example is a backpatch injected function.
-	void ABI_PushAllCallerSavedRegsAndAdjustStack();
-	void ABI_PopAllCallerSavedRegsAndAdjustStack();
-
-	unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog = false);
-	void ABI_AlignStack(unsigned int frameSize, bool noProlog = false);
-	void ABI_RestoreStack(unsigned int frameSize, bool noProlog = false);
-
-	#ifdef _M_IX86
-	inline int ABI_GetNumXMMRegs() { return 8; }
-	#else
-	inline int ABI_GetNumXMMRegs() { return 16; }
-	#endif
-
-	// Strange call wrappers.
-	void CallCdeclFunction3(void* fnptr, u32 arg0, u32 arg1, u32 arg2);
-	void CallCdeclFunction4(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3);
-	void CallCdeclFunction5(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);
-	void CallCdeclFunction6(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
-
-#if defined(_M_IX86) 
-
-	#define CallCdeclFunction3_I(a,b,c,d) CallCdeclFunction3((void *)(a), (b), (c), (d))
-	#define CallCdeclFunction4_I(a,b,c,d,e) CallCdeclFunction4((void *)(a), (b), (c), (d), (e)) 
-	#define CallCdeclFunction5_I(a,b,c,d,e,f) CallCdeclFunction5((void *)(a), (b), (c), (d), (e), (f)) 
-	#define CallCdeclFunction6_I(a,b,c,d,e,f,g) CallCdeclFunction6((void *)(a), (b), (c), (d), (e), (f), (g)) 
-
-	#define DECLARE_IMPORT(x)
-
-#else
-
-	// Comments from VertexLoader.cpp about these horrors:
-
-	// This is a horrible hack that is necessary in 64-bit mode because Opengl32.dll is based way, way above the 32-bit
-	// address space that is within reach of a CALL, and just doing &fn gives us these high uncallable addresses. So we
-	// want to grab the function pointers from the import table instead.
-
-	void ___CallCdeclImport3(void* impptr, u32 arg0, u32 arg1, u32 arg2);
-	void ___CallCdeclImport4(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3);
-	void ___CallCdeclImport5(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);
-	void ___CallCdeclImport6(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
-
-	#define CallCdeclFunction3_I(a,b,c,d) ___CallCdeclImport3(&__imp_##a,b,c,d)
-	#define CallCdeclFunction4_I(a,b,c,d,e) ___CallCdeclImport4(&__imp_##a,b,c,d,e)
-	#define CallCdeclFunction5_I(a,b,c,d,e,f) ___CallCdeclImport5(&__imp_##a,b,c,d,e,f)
-	#define CallCdeclFunction6_I(a,b,c,d,e,f,g) ___CallCdeclImport6(&__imp_##a,b,c,d,e,f,g)
-
-	#define DECLARE_IMPORT(x) extern "C" void *__imp_##x
-
-#endif
-};  // class XEmitter
-
-
-// Everything that needs to generate X86 code should inherit from this.
-// You get memory management for free, plus, you can use all the MOV etc functions without
-// having to prefix them with gen-> or something similar.
-class XCodeBlock : public XEmitter
-{
-protected:
-	u8 *region;
-	size_t region_size;
-
-public:
-	XCodeBlock() : region(NULL), region_size(0) {}
-	virtual ~XCodeBlock() { if (region) FreeCodeSpace(); }
-
-	// Call this before you generate any code.
-	void AllocCodeSpace(int size)
-	{
-		region_size = size;
-		region = (u8*)AllocateExecutableMemory(region_size);
-		SetCodePtr(region);
-	}
-
-	// Always clear code space with breakpoints, so that if someone accidentally executes
-	// uninitialized, it just breaks into the debugger.
-	void ClearCodeSpace() 
-	{
-		// x86/64: 0xCC = breakpoint
-		memset(region, 0xCC, region_size);
-		ResetCodePtr();
-	}
-
-	// Call this when shutting down. Don't rely on the destructor, even though it'll do the job.
-	void FreeCodeSpace()
-	{
-		FreeMemoryPages(region, region_size);
-		region = NULL;
-		region_size = 0;
-	}
-
-	bool IsInSpace(u8 *ptr)
-	{
-		return ptr >= region && ptr < region + region_size;
-	}
-
-	// Cannot currently be undone. Will write protect the entire code region.
-	// Start over if you need to change the code (call FreeCodeSpace(), AllocCodeSpace()).
-	void WriteProtect()
-	{
-		WriteProtectMemory(region, region_size, true);
-	}
-
-	void ResetCodePtr()
-	{
-		SetCodePtr(region);
-	}
-
-	size_t GetSpaceLeft() const
-	{
-		return region_size - (GetCodePtr() - region);
-	}
-};
-
-}  // namespace
-
-#endif // _DOLPHIN_INTEL_CODEGEN_
diff --git a/Source/Core/Common/Src/x64FPURoundMode.cpp b/Source/Core/Common/Src/x64FPURoundMode.cpp
deleted file mode 100644
index 903d58e499..0000000000
--- a/Source/Core/Common/Src/x64FPURoundMode.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FPURoundMode.h"
-
-#ifndef _WIN32
-static const unsigned short FPU_ROUND_NEAR = 0 << 10;
-static const unsigned short FPU_ROUND_DOWN = 1 << 10;
-static const unsigned short FPU_ROUND_UP   = 2 << 10;
-static const unsigned short FPU_ROUND_CHOP = 3 << 10;
-static const unsigned short FPU_ROUND_MASK = 3 << 10;
-#include <xmmintrin.h>
-#endif
-
-const u32 MASKS = 0x1F80;  // mask away the interrupts.
-const u32 DAZ = 0x40;
-const u32 FTZ = 0x8000;
-
-namespace FPURoundMode
-{
-	// Get the default SSE states here.
-	static u32 saved_sse_state = _mm_getcsr();
-	static const u32 default_sse_state = _mm_getcsr();
-
-	void SetRoundMode(u32 mode)
-	{
-		// Set FPU rounding mode to mimic the PowerPC's
-		#ifdef _M_IX86
-			// This shouldn't really be needed anymore since we use SSE
-		#ifdef _WIN32
-			const int table[4] = 
-			{
-				_RC_NEAR,
-				_RC_CHOP,
-				_RC_UP,
-				_RC_DOWN
-			};
-			_set_controlfp(_MCW_RC, table[mode]);
-		#else
-			const unsigned short table[4] = 
-			{
-				FPU_ROUND_NEAR,
-				FPU_ROUND_CHOP,
-				FPU_ROUND_UP,
-				FPU_ROUND_DOWN
-			};
-			unsigned short _mode;
-			asm ("fstcw %0" : "=m" (_mode) : );
-			_mode = (_mode & ~FPU_ROUND_MASK) | table[mode];
-			asm ("fldcw %0" : : "m" (_mode));
-		#endif
-		#endif
-	}
-
-	void SetPrecisionMode(u32 mode)
-	{
-		#ifdef _M_IX86
-			// sets the floating-point lib to 53-bit
-			// PowerPC has a 53bit floating pipeline only
-			// eg: sscanf is very sensitive
-		#ifdef _WIN32
-			_control87(_PC_53, MCW_PC);
-		#else
-			const unsigned short table[4] = {
-				0 << 8, // FPU_PREC_24
-				2 << 8, // FPU_PREC_53
-				3 << 8, // FPU_PREC_64
-				3 << 8, // FPU_PREC_MASK
-			};
-			unsigned short _mode;
-			asm ("fstcw %0" : : "m" (_mode));
-			_mode = (_mode & ~table[3]) | table[mode];
-			asm ("fldcw %0" : : "m" (_mode));
-		#endif
-		#else
-			//x64 doesn't need this - fpu is done with SSE
-			//but still - set any useful sse options here
-		#endif
-	}
-	void SetSIMDMode(u32 mode)
-	{
-		static const u32 ssetable[4] = 
-		{
-			(0 << 13) | MASKS,
-			(3 << 13) | MASKS,
-			(2 << 13) | MASKS,
-			(1 << 13) | MASKS,
-		};
-		u32 csr = ssetable[mode];
-		_mm_setcsr(csr);
-	}
-
-	void SaveSIMDState()
-	{
-		saved_sse_state = _mm_getcsr();
-	}
-	void LoadSIMDState()
-	{
-		_mm_setcsr(saved_sse_state);
-	}
-	void LoadDefaultSIMDState()
-	{
-		_mm_setcsr(default_sse_state);
-	}
-}
diff --git a/Source/Core/Common/Src/x64Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp
deleted file mode 100644
index a9c19060de..0000000000
--- a/Source/Core/Common/Src/x64Thunk.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-
-#include "Common.h"
-#include "MemoryUtil.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-
-#define THUNK_ARENA_SIZE 1024*1024*1
-
-namespace
-{
-
-static u8 GC_ALIGNED32(saved_fp_state[16 * 4 * 4]);
-static u8 GC_ALIGNED32(saved_gpr_state[16 * 8]);
-static u16 saved_mxcsr;
-
-}  // namespace
-
-using namespace Gen;
-
-void ThunkManager::Init()
-{
-	AllocCodeSpace(THUNK_ARENA_SIZE);
-	save_regs = GetCodePtr();
-	for (int i = 2; i < ABI_GetNumXMMRegs(); i++)
-		MOVAPS(M(saved_fp_state + i * 16), (X64Reg)(XMM0 + i));
-	STMXCSR(M(&saved_mxcsr));
-#ifdef _M_X64
-	MOV(64, M(saved_gpr_state + 0 ), R(RCX));
-	MOV(64, M(saved_gpr_state + 8 ), R(RDX));
-	MOV(64, M(saved_gpr_state + 16), R(R8) );
-	MOV(64, M(saved_gpr_state + 24), R(R9) );
-	MOV(64, M(saved_gpr_state + 32), R(R10));
-	MOV(64, M(saved_gpr_state + 40), R(R11));
-#ifndef _WIN32
-	MOV(64, M(saved_gpr_state + 48), R(RSI));
-	MOV(64, M(saved_gpr_state + 56), R(RDI));
-#endif
-	MOV(64, M(saved_gpr_state + 64), R(RBX));
-#else
-	MOV(32, M(saved_gpr_state + 0 ), R(RCX));
-	MOV(32, M(saved_gpr_state + 4 ), R(RDX));
-#endif
-	RET();
-	load_regs = GetCodePtr();
-	LDMXCSR(M(&saved_mxcsr));
-	for (int i = 2; i < ABI_GetNumXMMRegs(); i++)
-		MOVAPS((X64Reg)(XMM0 + i), M(saved_fp_state + i * 16));
-#ifdef _M_X64
-	MOV(64, R(RCX), M(saved_gpr_state + 0 ));
-	MOV(64, R(RDX), M(saved_gpr_state + 8 ));
-	MOV(64, R(R8) , M(saved_gpr_state + 16));
-	MOV(64, R(R9) , M(saved_gpr_state + 24));
-	MOV(64, R(R10), M(saved_gpr_state + 32));
-	MOV(64, R(R11), M(saved_gpr_state + 40));
-#ifndef _WIN32
-	MOV(64, R(RSI), M(saved_gpr_state + 48));
-	MOV(64, R(RDI), M(saved_gpr_state + 56));
-#endif
-	MOV(64, R(RBX), M(saved_gpr_state + 64));
-#else
-	MOV(32, R(RCX), M(saved_gpr_state + 0 ));
-	MOV(32, R(RDX), M(saved_gpr_state + 4 ));
-#endif
-	RET();
-}
-
-void ThunkManager::Reset()
-{
-	thunks.clear();
-	ResetCodePtr();
-}
-
-void ThunkManager::Shutdown()
-{
-	Reset();
-	FreeCodeSpace();
-}
-
-void *ThunkManager::ProtectFunction(void *function, int num_params)
-{
-	std::map<void *, const u8 *>::iterator iter;
-	iter = thunks.find(function);
-	if (iter != thunks.end())
-		return (void *)iter->second;
-	if (!region)
-		PanicAlert("Trying to protect functions before the emu is started. Bad bad bad.");
-
-	const u8 *call_point = GetCodePtr();
-#ifdef _M_X64
-	// Make sure to align stack.
-	ABI_AlignStack(0, true);
-	CALL((void*)save_regs);
-	CALL((void*)function);
-	CALL((void*)load_regs);
-	ABI_RestoreStack(0, true);
-	RET();
-#else
-	CALL((void*)save_regs);
-	// Since parameters are in the previous stack frame, not in registers, this takes some
-	// trickery : we simply re-push the parameters. might not be optimal, but that doesn't really
-	// matter.
-	ABI_AlignStack(num_params * 4, true);
-	unsigned int alignedSize = ABI_GetAlignedFrameSize(num_params * 4);
-	for (int i = 0; i < num_params; i++) {
-		// ESP is changing, so we do not need i
-		PUSH(32, MDisp(ESP, alignedSize));
-	}
-	CALL(function);
-	ABI_RestoreStack(num_params * 4, true);
-	CALL((void*)load_regs);
-	RET();
-#endif
-
-	thunks[function] = call_point;
-	return (void *)call_point;
-}
diff --git a/Source/Core/Common/StdMakeUnique.h b/Source/Core/Common/StdMakeUnique.h
new file mode 100644
index 0000000000..b3e38649d8
--- /dev/null
+++ b/Source/Core/Common/StdMakeUnique.h
@@ -0,0 +1,82 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// VS 2013 defines __cplusplus as 199711L but has std::make_unique.
+#if __cplusplus > 201103L || _MSC_VER >= 1800
+#include <memory>
+#else
+
+// Implementation of C++14 std::make_unique, which is not supported by all the
+// compilers we care about yet.
+//
+// NOTE: This code is based on the libc++ implementation of std::make_unique.
+//
+// Copyright (c) 2009-2014 by the libc++ contributors.
+//
+// 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 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 SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+
+namespace std
+{
+
+struct unspecified {};
+
+template<class T>
+struct unique_if
+{
+	typedef std::unique_ptr<T> unique_single;
+};
+
+template<class T>
+struct unique_if<T[]>
+{
+	typedef std::unique_ptr<T[]> unique_array_unknown_bound;
+};
+
+template<class T, size_t N>
+struct unique_if<T[N]>
+{
+	typedef void unique_array_known_bound;
+};
+
+template<class T, class... Args>
+inline typename unique_if<T>::unique_single make_unique(Args&&... args)
+{
+	return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template<class T>
+inline typename unique_if<T>::unique_array_unknown_bound make_unique(size_t n)
+{
+	typedef typename std::remove_extent<T>::type U;
+	return std::unique_ptr<T>(new U[n]());
+}
+
+template<class T, class... Args>
+typename unique_if<T>::unique_array_known_bound make_unique(Args&&...) = delete;
+
+}  // namespace std
+
+#endif // __cplusplus
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
new file mode 100644
index 0000000000..903131a5d3
--- /dev/null
+++ b/Source/Core/Common/StringUtil.cpp
@@ -0,0 +1,448 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iomanip>
+#include <istream>
+#include <limits.h>
+#include <string>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#ifdef _WIN32
+	#include <Windows.h>
+#else
+	#include <iconv.h>
+	#include <locale.h>
+	#include <errno.h>
+#endif
+
+#if !defined(_WIN32) && !defined(ANDROID)
+static locale_t GetCLocale()
+{
+	static locale_t c_locale = newlocale(LC_ALL_MASK, "C", nullptr);
+	return c_locale;
+}
+#endif
+
+// faster than sscanf
+bool AsciiToHex(const std::string& _szValue, u32& result)
+{
+	// Set errno to a good state.
+	errno = 0;
+
+	char *endptr = nullptr;
+	const u32 value = strtoul(_szValue.c_str(), &endptr, 16);
+
+	if (!endptr || *endptr)
+		return false;
+
+	if (errno == ERANGE)
+		return false;
+
+	result = value;
+	return true;
+}
+
+bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args)
+{
+	int writtenCount;
+
+#ifdef _WIN32
+	// You would think *printf are simple, right? Iterate on each character,
+	// if it's a format specifier handle it properly, etc.
+	//
+	// Nooooo. Not according to the C standard.
+	//
+	// According to the C99 standard (7.19.6.1 "The fprintf function")
+	//     The format shall be a multibyte character sequence
+	//
+	// Because some character encodings might have '%' signs in the middle of
+	// a multibyte sequence (SJIS for example only specifies that the first
+	// byte of a 2 byte sequence is "high", the second byte can be anything),
+	// printf functions have to decode the multibyte sequences and try their
+	// best to not screw up.
+	//
+	// Unfortunately, on Windows, the locale for most languages is not UTF-8
+	// as we would need. Notably, for zh_TW, Windows chooses EUC-CN as the
+	// locale, and completely fails when trying to decode UTF-8 as EUC-CN.
+	//
+	// On the other hand, the fix is simple: because we use UTF-8, no such
+	// multibyte handling is required as we can simply assume that no '%' char
+	// will be present in the middle of a multibyte sequence.
+	//
+	// This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l.
+	static _locale_t c_locale = nullptr;
+	if (!c_locale)
+		c_locale = _create_locale(LC_ALL, ".1252");
+	writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args);
+#else
+	#if !defined(ANDROID)
+	locale_t previousLocale = uselocale(GetCLocale());
+	#endif
+	writtenCount = vsnprintf(out, outsize, format, args);
+	#if !defined(ANDROID)
+	uselocale(previousLocale);
+	#endif
+#endif
+
+	if (writtenCount > 0 && writtenCount < outsize)
+	{
+		out[writtenCount] = '\0';
+		return true;
+	}
+	else
+	{
+		out[outsize - 1] = '\0';
+		return false;
+	}
+}
+
+std::string StringFromFormat(const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	std::string res = StringFromFormatV(format, args);
+	va_end(args);
+	return std::move(res);
+}
+
+std::string StringFromFormatV(const char* format, va_list args)
+{
+	char *buf = nullptr;
+#ifdef _WIN32
+	int required = _vscprintf(format, args);
+	buf = new char[required + 1];
+	CharArrayFromFormatV(buf, required + 1, format, args);
+
+	std::string temp = buf;
+	delete[] buf;
+#else
+	#if !defined(ANDROID)
+	locale_t previousLocale = uselocale(GetCLocale());
+	#endif
+	if (vasprintf(&buf, format, args) < 0)
+		ERROR_LOG(COMMON, "Unable to allocate memory for string");
+	#if !defined(ANDROID)
+	uselocale(previousLocale);
+	#endif
+
+	std::string temp = buf;
+	free(buf);
+#endif
+	return std::move(temp);
+}
+
+// For Debugging. Read out an u8 array.
+std::string ArrayToString(const u8 *data, u32 size, int line_len, bool spaces)
+{
+	std::ostringstream oss;
+	oss << std::setfill('0') << std::hex;
+
+	for (int line = 0; size; ++data, --size)
+	{
+		oss << std::setw(2) << (int)*data;
+
+		if (line_len == ++line)
+		{
+			oss << '\n';
+			line = 0;
+		}
+		else if (spaces)
+			oss << ' ';
+	}
+
+	return oss.str();
+}
+
+// Turns "  hej " into "hej". Also handles tabs.
+std::string StripSpaces(const std::string &str)
+{
+	const size_t s = str.find_first_not_of(" \t\r\n");
+
+	if (str.npos != s)
+		return str.substr(s, str.find_last_not_of(" \t\r\n") - s + 1);
+	else
+		return "";
+}
+
+// "\"hello\"" is turned to "hello"
+// This one assumes that the string has already been space stripped in both
+// ends, as done by StripSpaces above, for example.
+std::string StripQuotes(const std::string& s)
+{
+	if (s.size() && '\"' == s[0] && '\"' == *s.rbegin())
+		return s.substr(1, s.size() - 2);
+	else
+		return s;
+}
+
+bool TryParse(const std::string &str, u32 *const output)
+{
+	char *endptr = nullptr;
+
+	// Reset errno to a value other than ERANGE
+	errno = 0;
+
+	unsigned long value = strtoul(str.c_str(), &endptr, 0);
+
+	if (!endptr || *endptr)
+		return false;
+
+	if (errno == ERANGE)
+		return false;
+
+#if ULONG_MAX > UINT_MAX
+	if (value >= 0x100000000ull &&
+	    value <= 0xFFFFFFFF00000000ull)
+		return false;
+#endif
+
+	*output = static_cast<u32>(value);
+	return true;
+}
+
+bool TryParse(const std::string &str, bool *const output)
+{
+	if ("1" == str || !strcasecmp("true", str.c_str()))
+		*output = true;
+	else if ("0" == str || !strcasecmp("false", str.c_str()))
+		*output = false;
+	else
+		return false;
+
+	return true;
+}
+
+std::string StringFromInt(int value)
+{
+	char temp[16];
+	sprintf(temp, "%i", value);
+	return temp;
+}
+
+std::string StringFromBool(bool value)
+{
+	return value ? "True" : "False";
+}
+
+bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension)
+{
+	if (full_path.empty())
+		return false;
+
+	size_t dir_end = full_path.find_last_of("/"
+	// Windows needs the : included for something like just "C:" to be considered a directory
+#ifdef _WIN32
+		":"
+#endif
+	);
+	if (std::string::npos == dir_end)
+		dir_end = 0;
+	else
+		dir_end += 1;
+
+	size_t fname_end = full_path.rfind('.');
+	if (fname_end < dir_end || std::string::npos == fname_end)
+		fname_end = full_path.size();
+
+	if (_pPath)
+		*_pPath = full_path.substr(0, dir_end);
+
+	if (_pFilename)
+		*_pFilename = full_path.substr(dir_end, fname_end - dir_end);
+
+	if (_pExtension)
+		*_pExtension = full_path.substr(fname_end);
+
+	return true;
+}
+
+void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename)
+{
+	_CompleteFilename = _Path;
+
+	// check for seperator
+	if (DIR_SEP_CHR != *_CompleteFilename.rbegin())
+		_CompleteFilename += DIR_SEP_CHR;
+
+	// add the filename
+	_CompleteFilename += _Filename;
+}
+
+void SplitString(const std::string& str, const char delim, std::vector<std::string>& output)
+{
+	std::istringstream iss(str);
+	output.resize(1);
+
+	while (std::getline(iss, *output.rbegin(), delim))
+		output.push_back("");
+
+	output.pop_back();
+}
+
+std::string TabsToSpaces(int tab_size, const std::string &in)
+{
+	const std::string spaces(tab_size, ' ');
+	std::string out(in);
+
+	size_t i = 0;
+	while (out.npos != (i = out.find('\t')))
+		out.replace(i, 1, spaces);
+
+	return out;
+}
+
+std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest)
+{
+	size_t pos = 0;
+
+	if (src == dest)
+		return result;
+
+	while ((pos = result.find(src, pos)) != std::string::npos)
+	{
+		result.replace(pos, src.size(), dest);
+		pos += dest.length();
+	}
+
+	return result;
+}
+
+#ifdef _WIN32
+
+std::string UTF16ToUTF8(const std::wstring& input)
+{
+	auto const size = WideCharToMultiByte(CP_UTF8, 0, input.data(), (int)input.size(), nullptr, 0, nullptr, nullptr);
+
+	std::string output;
+	output.resize(size);
+
+	if (size == 0 || size != WideCharToMultiByte(CP_UTF8, 0, input.data(), (int)input.size(), &output[0], (int)output.size(), nullptr, nullptr))
+	{
+		output.clear();
+	}
+
+	return output;
+}
+
+std::wstring CPToUTF16(u32 code_page, const std::string& input)
+{
+	auto const size = MultiByteToWideChar(code_page, 0, input.data(), (int)input.size(), nullptr, 0);
+
+	std::wstring output;
+	output.resize(size);
+
+	if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), (int)input.size(), &output[0], (int)output.size()))
+	{
+		output.clear();
+	}
+
+	return output;
+}
+
+std::wstring UTF8ToUTF16(const std::string& input)
+{
+	return CPToUTF16(CP_UTF8, input);
+}
+
+std::string SHIFTJISToUTF8(const std::string& input)
+{
+	return UTF16ToUTF8(CPToUTF16(932, input));
+}
+
+std::string CP1252ToUTF8(const std::string& input)
+{
+	return UTF16ToUTF8(CPToUTF16(1252, input));
+}
+
+#else
+
+template <typename T>
+std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
+{
+	std::string result;
+
+	iconv_t const conv_desc = iconv_open("UTF-8", fromcode);
+	if ((iconv_t)-1 == conv_desc)
+	{
+		ERROR_LOG(COMMON, "Iconv initialization failure [%s]: %s", fromcode, strerror(errno));
+	}
+	else
+	{
+		size_t const in_bytes = sizeof(T) * input.size();
+		size_t const out_buffer_size = 4 * in_bytes;
+
+		std::string out_buffer;
+		out_buffer.resize(out_buffer_size);
+
+		auto src_buffer = &input[0];
+		size_t src_bytes = in_bytes;
+		auto dst_buffer = &out_buffer[0];
+		size_t dst_bytes = out_buffer.size();
+
+		while (src_bytes != 0)
+		{
+			size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes,
+				&dst_buffer, &dst_bytes);
+
+			if ((size_t)-1 == iconv_result)
+			{
+				if (EILSEQ == errno || EINVAL == errno)
+				{
+					// Try to skip the bad character
+					if (src_bytes != 0)
+					{
+						--src_bytes;
+						++src_buffer;
+					}
+				}
+				else
+				{
+					ERROR_LOG(COMMON, "iconv failure [%s]: %s", fromcode, strerror(errno));
+					break;
+				}
+			}
+		}
+
+		out_buffer.resize(out_buffer_size - dst_bytes);
+		out_buffer.swap(result);
+
+		iconv_close(conv_desc);
+	}
+
+	return result;
+}
+
+std::string CP1252ToUTF8(const std::string& input)
+{
+	//return CodeToUTF8("CP1252//TRANSLIT", input);
+	//return CodeToUTF8("CP1252//IGNORE", input);
+	return CodeToUTF8("CP1252", input);
+}
+
+std::string SHIFTJISToUTF8(const std::string& input)
+{
+	//return CodeToUTF8("CP932", input);
+	return CodeToUTF8("SJIS", input);
+}
+
+std::string UTF16ToUTF8(const std::wstring& input)
+{
+	std::string result = CodeToUTF8("UTF-16LE", input);
+
+	// TODO: why is this needed?
+	result.erase(std::remove(result.begin(), result.end(), 0x00), result.end());
+	return result;
+}
+
+#endif
diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
new file mode 100644
index 0000000000..ac4cbc7369
--- /dev/null
+++ b/Source/Core/Common/StringUtil.h
@@ -0,0 +1,134 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdarg>
+#include <cstddef>
+#include <iomanip>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Common/Common.h"
+
+std::string StringFromFormatV(const char* format, va_list args);
+
+std::string StringFromFormat(const char* format, ...)
+#if !defined _WIN32
+// On compilers that support function attributes, this gives StringFromFormat
+// the same errors and warnings that printf would give.
+ __attribute__ ((__format__(printf, 1, 2)))
+#endif
+;
+
+// Cheap!
+bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args);
+
+template<size_t Count>
+inline void CharArrayFromFormat(char (& out)[Count], const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	CharArrayFromFormatV(out, Count, format, args);
+	va_end(args);
+}
+
+// Good
+std::string ArrayToString(const u8 *data, u32 size, int line_len = 20, bool spaces = true);
+
+std::string StripSpaces(const std::string &s);
+std::string StripQuotes(const std::string &s);
+
+// Thousand separator. Turns 12345678 into 12,345,678
+template <typename I>
+std::string ThousandSeparate(I value, int spaces = 0)
+{
+	std::ostringstream oss;
+
+// std::locale("") seems to be broken on many platforms
+#if defined _WIN32 || (defined __linux__ && !defined __clang__)
+	oss.imbue(std::locale(""));
+#endif
+	oss << std::setw(spaces) << value;
+
+	return oss.str();
+}
+
+std::string StringFromInt(int value);
+std::string StringFromBool(bool value);
+
+bool TryParse(const std::string &str, bool *output);
+bool TryParse(const std::string &str, u32 *output);
+
+template <typename N>
+static bool TryParse(const std::string &str, N *const output)
+{
+	std::istringstream iss(str);
+	// is this right? not doing this breaks reading floats on locales that use different decimal separators
+	iss.imbue(std::locale("C"));
+
+	N tmp = 0;
+	if (iss >> tmp)
+	{
+		*output = tmp;
+		return true;
+	}
+	else
+		return false;
+}
+
+template <typename N>
+bool TryParseVector(const std::string& str, std::vector<N>* output, const char delimiter = ',')
+{
+	output->clear();
+	std::istringstream buffer(str);
+	std::string variable;
+
+	while (std::getline(buffer, variable, delimiter))
+	{
+		N tmp = 0;
+		if (!TryParse(variable, &tmp))
+			return false;
+		output->push_back(tmp);
+	}
+	return true;
+}
+
+// TODO: kill this
+bool AsciiToHex(const std::string& _szValue, u32& result);
+
+std::string TabsToSpaces(int tab_size, const std::string &in);
+
+void SplitString(const std::string& str, char delim, std::vector<std::string>& output);
+
+// "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
+bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension);
+
+void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename);
+std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest);
+
+std::string CP1252ToUTF8(const std::string& str);
+std::string SHIFTJISToUTF8(const std::string& str);
+std::string UTF16ToUTF8(const std::wstring& str);
+
+#ifdef _WIN32
+
+std::wstring UTF8ToUTF16(const std::string& str);
+
+#ifdef _UNICODE
+inline std::string TStrToUTF8(const std::wstring& str)
+{ return UTF16ToUTF8(str); }
+
+inline std::wstring UTF8ToTStr(const std::string& str)
+{ return UTF8ToUTF16(str); }
+#else
+inline std::string TStrToUTF8(const std::string& str)
+{ return str; }
+
+inline std::string UTF8ToTStr(const std::string& str)
+{ return str; }
+#endif
+
+#endif
diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp
new file mode 100644
index 0000000000..9e7b553b13
--- /dev/null
+++ b/Source/Core/Common/SymbolDB.cpp
@@ -0,0 +1,57 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+#include <map>
+#include <string>
+#include <utility>
+
+#include "Common/CommonTypes.h"
+#include "Common/SymbolDB.h"
+#include "Common/Logging/Log.h"
+
+void SymbolDB::List()
+{
+	for (const auto& func : functions)
+	{
+		DEBUG_LOG(OSHLE, "%s @ %08x: %i bytes (hash %08x) : %i calls",
+		          func.second.name.c_str(), func.second.address,
+		          func.second.size, func.second.hash,
+		          func.second.numCalls);
+	}
+	INFO_LOG(OSHLE, "%lu functions known in this program above.",
+	         (unsigned long)functions.size());
+}
+
+void SymbolDB::Clear(const char *prefix)
+{
+	// TODO: honor prefix
+	functions.clear();
+	checksumToFunction.clear();
+}
+
+void SymbolDB::Index()
+{
+	int i = 0;
+	for (auto& func : functions)
+	{
+		func.second.index = i++;
+	}
+}
+
+Symbol* SymbolDB::GetSymbolFromName(const std::string& name)
+{
+	for (auto& func : functions)
+	{
+		if (func.second.name == name)
+			return &func.second;
+	}
+
+	return nullptr;
+}
+
+void SymbolDB::AddCompleteSymbol(const Symbol &symbol)
+{
+	functions.insert(std::pair<u32, Symbol>(symbol.address, symbol));
+}
diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h
new file mode 100644
index 0000000000..9e2094ab87
--- /dev/null
+++ b/Source/Core/Common/SymbolDB.h
@@ -0,0 +1,103 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This file contains a generic symbol map implementation. For CPU-specific
+// magic, derive and extend.
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+struct SCall
+{
+	SCall(u32 a, u32 b) :
+		function(a),
+		callAddress(b)
+	{}
+	u32 function;
+	u32 callAddress;
+};
+
+struct Symbol
+{
+	enum {
+		SYMBOL_FUNCTION = 0,
+		SYMBOL_DATA = 1,
+	};
+
+	Symbol() :
+		hash(0),
+		address(0),
+		flags(0),
+		size(0),
+		numCalls(0),
+		type(SYMBOL_FUNCTION),
+		analyzed(0)
+	{}
+
+	std::string name;
+	std::vector<SCall> callers; //addresses of functions that call this function
+	std::vector<SCall> calls;   //addresses of functions that are called by this function
+	u32 hash;            //use for HLE function finding
+	u32 address;
+	u32 flags;
+	int size;
+	int numCalls;
+	int type;
+	int index; // only used for coloring the disasm view
+	int analyzed;
+};
+
+enum
+{
+	FFLAG_TIMERINSTRUCTIONS  = (1<<0),
+	FFLAG_LEAF               = (1<<1),
+	FFLAG_ONLYCALLSNICELEAFS = (1<<2),
+	FFLAG_EVIL               = (1<<3),
+	FFLAG_RFI                = (1<<4),
+	FFLAG_STRAIGHT           = (1<<5)
+};
+
+
+
+class SymbolDB
+{
+public:
+	typedef std::map<u32, Symbol>  XFuncMap;
+	typedef std::map<u32, Symbol*> XFuncPtrMap;
+
+protected:
+	XFuncMap    functions;
+	XFuncPtrMap checksumToFunction;
+
+public:
+	SymbolDB() {}
+	virtual ~SymbolDB() {}
+	virtual Symbol *GetSymbolFromAddr(u32 addr) { return nullptr; }
+	virtual Symbol *AddFunction(u32 startAddr) { return nullptr; }
+
+	void AddCompleteSymbol(const Symbol &symbol);
+
+	Symbol* GetSymbolFromName(const std::string& name);
+	Symbol* GetSymbolFromHash(u32 hash)
+	{
+		XFuncPtrMap::iterator iter = checksumToFunction.find(hash);
+		if (iter != checksumToFunction.end())
+			return iter->second;
+		else
+			return nullptr;
+	}
+
+	const XFuncMap &Symbols() const { return functions; }
+	XFuncMap &AccessSymbols() { return functions; }
+
+	void Clear(const char *prefix = "");
+	void List();
+	void Index();
+};
diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/SysConf.cpp
similarity index 88%
rename from Source/Core/Common/Src/SysConf.cpp
rename to Source/Core/Common/SysConf.cpp
index 9f2581845e..047114774a 100644
--- a/Source/Core/Common/Src/SysConf.cpp
+++ b/Source/Core/Common/SysConf.cpp
@@ -1,15 +1,22 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FileUtil.h"
-#include "SysConf.h"
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/SysConf.h"
 
 SysConf::SysConf()
 	: m_IsValid(false)
 {
-	m_FilenameDefault = File::GetUserPath(F_WIISYSCONF_IDX);
-	m_IsValid = LoadFromFile(m_FilenameDefault.c_str());
+	UpdateLocation();
 }
 
 SysConf::~SysConf()
@@ -23,14 +30,18 @@ SysConf::~SysConf()
 
 void SysConf::Clear()
 {
-	for (std::vector<SSysConfEntry>::const_iterator i = m_Entries.begin();
-			i < m_Entries.end() - 1; i++)
+	for (auto i = m_Entries.begin(); i < m_Entries.end() - 1; ++i)
 		delete [] i->data;
+
 	m_Entries.clear();
 }
 
-bool SysConf::LoadFromFile(const char *filename)
+bool SysConf::LoadFromFile(const std::string& filename)
 {
+	if (m_IsValid)
+		Clear();
+	m_IsValid = false;
+
 	// Basic check
 	if (!File::Exists(filename))
 	{
@@ -38,18 +49,20 @@ bool SysConf::LoadFromFile(const char *filename)
 		GenerateSysConf();
 		return true;
 	}
-		
+
 	u64 size = File::GetSize(filename);
 	if (size != SYSCONF_SIZE)
 	{
-		if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04llx)\nDo you want to generate a new one?", 
+		if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04" PRIx64 ")\nDo you want to generate a new one?",
 					SYSCONF_SIZE, size))
 		{
 			GenerateSysConf();
 			return true;
 		}
 		else
+		{
 			return false;
+		}
 	}
 
 	File::IOFile f(filename, "rb");
@@ -58,6 +71,7 @@ bool SysConf::LoadFromFile(const char *filename)
 		if (LoadFromFileInternal(f.ReleaseHandle()))
 		{
 			m_Filename = filename;
+			m_IsValid = true;
 			return true;
 		}
 	}
@@ -83,8 +97,7 @@ bool SysConf::LoadFromFileInternal(FILE *fh)
 	}
 
 	// Last offset is an invalid entry. We ignore it throughout this class
-	for (std::vector<SSysConfEntry>::iterator i = m_Entries.begin();
-			i < m_Entries.end() - 1; i++)
+	for (auto i = m_Entries.begin(); i < m_Entries.end() - 1; ++i)
 	{
 		SSysConfEntry& curEntry = *i;
 		f.Seek(curEntry.offset, SEEK_SET);
@@ -99,6 +112,7 @@ bool SysConf::LoadFromFileInternal(FILE *fh)
 		f.ReadArray(curEntry.name, curEntry.nameLength);
 		curEntry.name[curEntry.nameLength] = '\0';
 		// Get length of data
+		curEntry.data = nullptr;
 		curEntry.dataLength = 0;
 		switch (curEntry.type)
 		{
@@ -146,12 +160,12 @@ bool SysConf::LoadFromFileInternal(FILE *fh)
 }
 
 // Returns the size of the item in file
-unsigned int create_item(SSysConfEntry &item, SysconfType type, const std::string &name,
+static unsigned int create_item(SSysConfEntry &item, SysconfType type, const std::string &name,
 		const int data_length, unsigned int offset)
 {
 	item.offset = offset;
 	item.type = type;
-	item.nameLength = name.length();
+	item.nameLength = (u8)(name.length());
 	strncpy(item.name, name.c_str(), 32);
 	item.dataLength = data_length;
 	item.data = new u8[data_length];
@@ -298,8 +312,8 @@ void SysConf::GenerateSysConf()
 	items[26].data[0] = 0x01;
 
 
-	for (int i = 0; i < 27; i++)
-		m_Entries.push_back(items[i]);
+	for (const SSysConfEntry& item : items)
+		m_Entries.push_back(item);
 
 	File::CreateFullPath(m_FilenameDefault);
 	File::IOFile g(m_FilenameDefault, "wb");
@@ -314,7 +328,7 @@ void SysConf::GenerateSysConf()
 	}
 	const u16 end_data_offset = Common::swap16(current_offset);
 	g.WriteBytes(&end_data_offset, 2);
-	
+
 	// Write the items
 	const u8 null_byte = 0;
 	for (int i = 0; i != 27; ++i)
@@ -354,14 +368,14 @@ void SysConf::GenerateSysConf()
 	g.WriteBytes("SCed", 4);
 
 	m_Filename = m_FilenameDefault;
+	m_IsValid = true;
 }
 
-bool SysConf::SaveToFile(const char *filename)
+bool SysConf::SaveToFile(const std::string& filename)
 {
 	File::IOFile f(filename, "r+b");
 
-	for (std::vector<SSysConfEntry>::iterator i = m_Entries.begin();
-			i < m_Entries.end() - 1; i++)
+	for (auto i = m_Entries.begin(); i < m_Entries.end() - 1; ++i)
 	{
 		// Seek to after the name of this entry
 		f.Seek(i->offset + i->nameLength + 1, SEEK_SET);
@@ -389,7 +403,8 @@ bool SysConf::Save()
 {
 	if (!m_IsValid)
 		return false;
-	return SaveToFile(m_Filename.c_str());
+
+	return SaveToFile(m_Filename);
 }
 
 void SysConf::UpdateLocation()
@@ -398,20 +413,20 @@ void SysConf::UpdateLocation()
 	if (m_IsValid)
 		Save();
 
-	// Clear the old filename and set the default filename to the new user path 
+	// Clear the old filename and set the default filename to the new user path
 	// So that it can be generated if the file does not exist in the new location
 	m_Filename.clear();
-	m_FilenameDefault =  File::GetUserPath(F_WIISYSCONF_IDX);
+	// Note: We don't use the dummy Wii root here (if in use) because this is
+	// all tied up with the configuration code.  In the future this should
+	// probably just be synced with the other settings.
+	m_FilenameDefault = File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP WII_SYSCONF_DIR DIR_SEP WII_SYSCONF;
 	Reload();
 }
 
 bool SysConf::Reload()
 {
-	if (m_IsValid)
-		Clear();
-
 	std::string& filename = m_Filename.empty() ? m_FilenameDefault : m_Filename;
 
-	m_IsValid = LoadFromFile(filename.c_str());
+	LoadFromFile(filename);
 	return m_IsValid;
 }
diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/SysConf.h
similarity index 85%
rename from Source/Core/Common/Src/SysConf.h
rename to Source/Core/Common/SysConf.h
index 30b5632cf5..9234636318 100644
--- a/Source/Core/Common/Src/SysConf.h
+++ b/Source/Core/Common/SysConf.h
@@ -1,13 +1,17 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef __SYSCONF_MANAGER_h__
-#define __SYSCONF_MANAGER_h__
+#pragma once
 
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
 #include <string>
 #include <vector>
 
+#include "Common/Common.h"
+
 // This class is meant to edit the values in a given Wii SYSCONF file
 // It currently does not add/remove/rearrange sections,
 // instead only modifies exiting sections' data
@@ -55,7 +59,7 @@ struct SSysConfEntry
 	{
 		if (buffer)
 		{
-			memcpy(data, buffer, min<u16>(bufferSize, dataLength));
+			memcpy(data, buffer, std::min<u16>(bufferSize, dataLength));
 			return true;
 		}
 		return false;
@@ -80,7 +84,7 @@ public:
 		}
 
 		std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
-		for (; index < m_Entries.end() - 1; index++)
+		for (; index < m_Entries.end() - 1; ++index)
 		{
 			if (strcmp(index->name, sectionName) == 0)
 				break;
@@ -103,7 +107,7 @@ public:
 		}
 
 		std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
-		for (; index < m_Entries.end() - 1; index++)
+		for (; index < m_Entries.end() - 1; ++index)
 		{
 			if (strcmp(index->name, sectionName) == 0)
 				break;
@@ -123,7 +127,7 @@ public:
 			return false;
 
 		std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
-		for (; index < m_Entries.end() - 1; index++)
+		for (; index < m_Entries.end() - 1; ++index)
 		{
 			if (strcmp(index->name, sectionName) == 0)
 				break;
@@ -144,7 +148,7 @@ public:
 			return false;
 
 		std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
-		for (; index < m_Entries.end() - 1; index++)
+		for (; index < m_Entries.end() - 1; ++index)
 		{
 			if (strcmp(index->name, sectionName) == 0)
 				break;
@@ -160,8 +164,8 @@ public:
 	}
 
 	bool Save();
-	bool SaveToFile(const char* filename);
-	bool LoadFromFile(const char* filename);
+	bool SaveToFile(const std::string& filename);
+	bool LoadFromFile(const std::string& filename);
 	bool Reload();
 	// This function is used when the NAND root is changed
 	void UpdateLocation();
@@ -176,5 +180,3 @@ private:
 	std::vector<SSysConfEntry> m_Entries;
 	bool m_IsValid;
 };
-
-#endif // __SYSCONF_MANAGER_h__
diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Thread.cpp
similarity index 86%
rename from Source/Core/Common/Src/Thread.cpp
rename to Source/Core/Common/Thread.cpp
index 4040d04e42..fb091ee2a7 100644
--- a/Source/Core/Common/Src/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -1,9 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Thread.h"
-#include "Common.h"
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
 
 #ifdef __APPLE__
 #include <mach/mach.h>
@@ -11,8 +12,9 @@
 #include <pthread_np.h>
 #endif
 
-#ifdef USE_BEGINTHREADEX
-#include <process.h>
+#ifdef USE_VTUNE
+#include <ittnotify.h>
+#pragma comment(lib, "libittnotify.lib")
 #endif
 
 namespace Common
@@ -28,7 +30,7 @@ int CurrentThreadId()
 	return 0;
 #endif
 }
-	
+
 #ifdef _WIN32
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
@@ -55,7 +57,7 @@ void SwitchCurrentThread()
 // Sets the debugger-visible name of the current thread.
 // Uses undocumented (actually, it is now documented) trick.
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vsdebug/html/vxtsksettingthreadname.asp
-	
+
 // This is implemented much nicer in upcoming msvc++, see:
 // http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx
 void SetCurrentThreadName(const char* szThreadName)
@@ -84,7 +86,7 @@ void SetCurrentThreadName(const char* szThreadName)
 	__except(EXCEPTION_CONTINUE_EXECUTION)
 	{}
 }
-	
+
 #else // !WIN32, so must be POSIX threads
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
@@ -126,6 +128,10 @@ void SetCurrentThreadName(const char* szThreadName)
 #else
 	pthread_setname_np(pthread_self(), szThreadName);
 #endif
+#ifdef USE_VTUNE
+	// VTune uses OS thread names by default but probably supports longer names when set via its own API.
+	__itt_thread_set_name(szThreadName);
+#endif
 }
 
 #endif
diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h
new file mode 100644
index 0000000000..359137b8fe
--- /dev/null
+++ b/Source/Core/Common/Thread.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <thread>
+
+// Don't include Common.h here as it will break LogManager
+#include "Common/CommonTypes.h"
+
+// This may not be defined outside _WIN32
+#ifndef _WIN32
+#ifndef INFINITE
+#define INFINITE 0xffffffff
+#endif
+#endif
+
+namespace Common
+{
+
+int CurrentThreadId();
+
+void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
+void SetCurrentThreadAffinity(u32 mask);
+
+void SleepCurrentThread(int ms);
+void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms
+
+// Use this function during a spin-wait to make the current thread
+// relax while another thread is working. This may be more efficient
+// than using events because event functions use kernel calls.
+inline void YieldCPU()
+{
+	std::this_thread::yield();
+}
+
+void SetCurrentThreadName(const char *name);
+
+} // namespace Common
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
new file mode 100644
index 0000000000..451e6a0725
--- /dev/null
+++ b/Source/Core/Common/Timer.cpp
@@ -0,0 +1,264 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <ctime>
+#include <string>
+
+#ifdef _WIN32
+#include <mmsystem.h>
+#include <sys/timeb.h>
+#include <windows.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
+
+namespace Common
+{
+
+u32 Timer::GetTimeMs()
+{
+#ifdef _WIN32
+	return timeGetTime();
+#elif defined __APPLE__
+	struct timeval t;
+	(void)gettimeofday(&t, nullptr);
+	return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000));
+#else
+	struct timespec t;
+	(void)clock_gettime(CLOCK_MONOTONIC, &t);
+	return ((u32)(t.tv_sec * 1000 + t.tv_nsec / 1000000));
+#endif
+}
+
+#ifdef _WIN32
+double GetFreq()
+{
+	LARGE_INTEGER freq;
+	QueryPerformanceFrequency(&freq);
+	return 1000000.0 / double(freq.QuadPart);
+}
+#endif
+
+u64 Timer::GetTimeUs()
+{
+#ifdef _WIN32
+	LARGE_INTEGER time;
+	static double freq = GetFreq();
+	QueryPerformanceCounter(&time);
+	return u64(double(time.QuadPart) * freq);
+#elif defined __APPLE__
+	struct timeval t;
+	(void)gettimeofday(&t, nullptr);
+	return ((u64)(t.tv_sec * 1000000 + t.tv_usec));
+#else
+	struct timespec t;
+	(void)clock_gettime(CLOCK_MONOTONIC, &t);
+	return ((u64)(t.tv_sec * 1000000 + t.tv_nsec / 1000));
+#endif
+}
+
+// --------------------------------------------
+// Initiate, Start, Stop, and Update the time
+// --------------------------------------------
+
+// Set initial values for the class
+Timer::Timer()
+	: m_LastTime(0), m_StartTime(0), m_Running(false)
+{
+	Update();
+}
+
+// Write the starting time
+void Timer::Start()
+{
+	m_StartTime = GetTimeMs();
+	m_Running = true;
+}
+
+// Stop the timer
+void Timer::Stop()
+{
+	// Write the final time
+	m_LastTime = GetTimeMs();
+	m_Running = false;
+}
+
+// Update the last time variable
+void Timer::Update()
+{
+	m_LastTime = GetTimeMs();
+	//TODO(ector) - QPF
+}
+
+// -------------------------------------
+// Get time difference and elapsed time
+// -------------------------------------
+
+// Get the number of milliseconds since the last Update()
+u64 Timer::GetTimeDifference()
+{
+	return GetTimeMs() - m_LastTime;
+}
+
+// Add the time difference since the last Update() to the starting time.
+// This is used to compensate for a paused game.
+void Timer::AddTimeDifference()
+{
+	m_StartTime += GetTimeDifference();
+}
+
+// Get the time elapsed since the Start()
+u64 Timer::GetTimeElapsed()
+{
+	// If we have not started yet, return 1 (because then I don't
+	// have to change the FPS calculation in CoreRerecording.cpp .
+	if (m_StartTime == 0) return 1;
+
+	// Return the final timer time if the timer is stopped
+	if (!m_Running) return (m_LastTime - m_StartTime);
+
+	return (GetTimeMs() - m_StartTime);
+}
+
+// Get the formatted time elapsed since the Start()
+std::string Timer::GetTimeElapsedFormatted() const
+{
+	// If we have not started yet, return zero
+	if (m_StartTime == 0)
+		return "00:00:00:000";
+
+	// The number of milliseconds since the start.
+	// Use a different value if the timer is stopped.
+	u64 Milliseconds;
+	if (m_Running)
+		Milliseconds = GetTimeMs() - m_StartTime;
+	else
+		Milliseconds = m_LastTime - m_StartTime;
+	// Seconds
+	u32 Seconds = (u32)(Milliseconds / 1000);
+	// Minutes
+	u32 Minutes = Seconds / 60;
+	// Hours
+	u32 Hours = Minutes / 60;
+
+	std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03" PRIu64,
+		Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000);
+	return TmpStr;
+}
+
+// Get current time
+void Timer::IncreaseResolution()
+{
+#ifdef _WIN32
+	timeBeginPeriod(1);
+#endif
+}
+
+void Timer::RestoreResolution()
+{
+#ifdef _WIN32
+	timeEndPeriod(1);
+#endif
+}
+
+// Get the number of seconds since January 1 1970
+u64 Timer::GetTimeSinceJan1970()
+{
+	time_t ltime;
+	time(&ltime);
+	return((u64)ltime);
+}
+
+u64 Timer::GetLocalTimeSinceJan1970()
+{
+	time_t sysTime, tzDiff, tzDST;
+	struct tm * gmTime;
+
+	time(&sysTime);
+
+	// Account for DST where needed
+	gmTime = localtime(&sysTime);
+	if (gmTime->tm_isdst == 1)
+		tzDST = 3600;
+	else
+		tzDST = 0;
+
+	// Lazy way to get local time in sec
+	gmTime = gmtime(&sysTime);
+	tzDiff = sysTime - mktime(gmTime);
+
+	return (u64)(sysTime + tzDiff + tzDST);
+}
+
+// Return the current time formatted as Minutes:Seconds:Milliseconds
+// in the form 00:00:000.
+std::string Timer::GetTimeFormatted()
+{
+	time_t sysTime;
+	time(&sysTime);
+
+	struct tm * gmTime = localtime(&sysTime);
+
+	char tmp[13];
+	strftime(tmp, 6, "%M:%S", gmTime);
+
+	// Now tack on the milliseconds
+#ifdef _WIN32
+	struct timeb tp;
+	(void)::ftime(&tp);
+	return StringFromFormat("%s:%03i", tmp, tp.millitm);
+#elif defined __APPLE__
+	struct timeval t;
+	(void)gettimeofday(&t, nullptr);
+	return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000));
+#else
+	struct timespec t;
+	(void)clock_gettime(CLOCK_MONOTONIC, &t);
+	return StringFromFormat("%s:%03d", tmp, (int)(t.tv_nsec / 1000000));
+#endif
+}
+
+// Returns a timestamp with decimals for precise time comparisons
+// ----------------
+double Timer::GetDoubleTime()
+{
+#ifdef _WIN32
+	struct timeb tp;
+	(void)::ftime(&tp);
+#elif defined __APPLE__
+	struct timeval t;
+	(void)gettimeofday(&t, nullptr);
+#else
+	struct timespec t;
+	(void)clock_gettime(CLOCK_MONOTONIC, &t);
+#endif
+	// Get continuous timestamp
+	u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970();
+
+	// Remove a few years. We only really want enough seconds to make
+	// sure that we are detecting actual actions, perhaps 60 seconds is
+	// enough really, but I leave a year of seconds anyway, in case the
+	// user's clock is incorrect or something like that.
+	TmpSeconds = TmpSeconds - (38 * 365 * 24 * 60 * 60);
+
+	// Make a smaller integer that fits in the double
+	u32 Seconds = (u32)TmpSeconds;
+#ifdef _WIN32
+	double ms = tp.millitm / 1000.0 / 1000.0;
+#elif defined __APPLE__
+	double ms = t.tv_usec / 1000000.0;
+#else
+	double ms = t.tv_nsec / 1000000000.0;
+#endif
+	double TmpTime = Seconds + ms;
+
+	return TmpTime;
+}
+
+} // Namespace Common
diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Timer.h
similarity index 83%
rename from Source/Core/Common/Src/Timer.h
rename to Source/Core/Common/Timer.h
index 920a001282..e5b828af25 100644
--- a/Source/Core/Common/Src/Timer.h
+++ b/Source/Core/Common/Timer.h
@@ -1,12 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#pragma once
 
-#include "Common.h"
 #include <string>
+#include "Common/CommonTypes.h"
 
 namespace Common
 {
@@ -34,6 +33,7 @@ public:
 	u64 GetTimeElapsed();
 
 	static u32 GetTimeMs();
+	static u64 GetTimeUs();
 
 private:
 	u64 m_LastTime;
@@ -42,5 +42,3 @@ private:
 };
 
 } // Namespace Common
-
-#endif // _TIMER_H_
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp
new file mode 100644
index 0000000000..f17ce0d921
--- /dev/null
+++ b/Source/Core/Common/TraversalClient.cpp
@@ -0,0 +1,356 @@
+// This file is public domain, in case it's useful to anyone. -comex
+
+#include "Common/Timer.h"
+#include "Common/TraversalClient.h"
+
+static void GetRandomishBytes(u8* buf, size_t size)
+{
+	// We don't need high quality random numbers (which might not be available),
+	// just non-repeating numbers!
+	static std::mt19937 prng(enet_time_get());
+	static std::uniform_int_distribution<unsigned int> u8_distribution(0, 255);
+	for (size_t i = 0; i < size; i++)
+		buf[i] = u8_distribution(prng);
+}
+
+TraversalClient::TraversalClient(ENetHost* netHost, const std::string& server, const u16 port)
+	: m_NetHost(netHost)
+	, m_Client(nullptr)
+	, m_FailureReason(0)
+	, m_ConnectRequestId(0)
+	, m_PendingConnect(false)
+	, m_Server(server)
+	, m_port(port)
+	, m_PingTime(0)
+{
+	netHost->intercept = TraversalClient::InterceptCallback;
+
+	Reset();
+
+	ReconnectToServer();
+}
+
+TraversalClient::~TraversalClient()
+{
+}
+
+void TraversalClient::ReconnectToServer()
+{
+	if (enet_address_set_host(&m_ServerAddress, m_Server.c_str()))
+	{
+		OnFailure(BadHost);
+		return;
+	}
+	m_ServerAddress.port = m_port;
+
+	m_State = Connecting;
+
+	TraversalPacket hello = {};
+	hello.type = TraversalPacketHelloFromClient;
+	hello.helloFromClient.protoVersion = TraversalProtoVersion;
+	SendTraversalPacket(hello);
+	if (m_Client)
+		m_Client->OnTraversalStateChanged();
+}
+
+static ENetAddress MakeENetAddress(TraversalInetAddress* address)
+{
+	ENetAddress eaddr;
+	if (address->isIPV6)
+	{
+		eaddr.port = 0; // no support yet :(
+	}
+	else
+	{
+		eaddr.host = address->address[0];
+		eaddr.port = ntohs(address->port);
+	}
+	return eaddr;
+}
+
+void TraversalClient::ConnectToClient(const std::string& host)
+{
+	if (host.size() > sizeof(TraversalHostId))
+	{
+		PanicAlert("host too long");
+		return;
+	}
+	TraversalPacket packet = {};
+	packet.type = TraversalPacketConnectPlease;
+	memcpy(packet.connectPlease.hostId.data(), host.c_str(), host.size());
+	m_ConnectRequestId = SendTraversalPacket(packet);
+	m_PendingConnect = true;
+}
+
+bool TraversalClient::TestPacket(u8* data, size_t size, ENetAddress* from)
+{
+	if (from->host == m_ServerAddress.host &&
+	    from->port == m_ServerAddress.port)
+	{
+		if (size < sizeof(TraversalPacket))
+		{
+			ERROR_LOG(NETPLAY, "Received too-short traversal packet.");
+		}
+		else
+		{
+			HandleServerPacket((TraversalPacket*) data);
+			return true;
+		}
+	}
+	return false;
+}
+
+//--Temporary until more of the old netplay branch is moved over
+void TraversalClient::Update()
+{
+	ENetEvent netEvent;
+	if (enet_host_service(m_NetHost, &netEvent, 4) > 0)
+	{
+		switch (netEvent.type)
+		{
+		case ENET_EVENT_TYPE_RECEIVE:
+			TestPacket(netEvent.packet->data, netEvent.packet->dataLength, &netEvent.peer->address);
+
+			enet_packet_destroy(netEvent.packet);
+			break;
+		default:
+			break;
+		}
+	}
+	HandleResends();
+}
+
+void TraversalClient::HandleServerPacket(TraversalPacket* packet)
+{
+	u8 ok = 1;
+	switch (packet->type)
+	{
+	case TraversalPacketAck:
+		if (!packet->ack.ok)
+		{
+			OnFailure(ServerForgotAboutUs);
+			break;
+		}
+		for (auto it = m_OutgoingTraversalPackets.begin(); it != m_OutgoingTraversalPackets.end(); ++it)
+		{
+			if (it->packet.requestId == packet->requestId)
+			{
+				m_OutgoingTraversalPackets.erase(it);
+				break;
+			}
+		}
+		break;
+	case TraversalPacketHelloFromServer:
+		if (m_State != Connecting)
+			break;
+		if (!packet->helloFromServer.ok)
+		{
+			OnFailure(VersionTooOld);
+			break;
+		}
+		m_HostId = packet->helloFromServer.yourHostId;
+		m_State = Connected;
+		if (m_Client)
+			m_Client->OnTraversalStateChanged();
+		break;
+	case TraversalPacketPleaseSendPacket:
+		{
+		// security is overrated.
+		ENetAddress addr = MakeENetAddress(&packet->pleaseSendPacket.address);
+		if (addr.port != 0)
+		{
+			char message[] = "Hello from Dolphin Netplay...";
+			ENetBuffer buf;
+			buf.data = message;
+			buf.dataLength = sizeof(message) - 1;
+			enet_socket_send(m_NetHost->socket, &addr, &buf, 1);
+		}
+		else
+		{
+			// invalid IPV6
+			ok = 0;
+		}
+		break;
+		}
+	case TraversalPacketConnectReady:
+	case TraversalPacketConnectFailed:
+		{
+		if (!m_PendingConnect || packet->connectReady.requestId != m_ConnectRequestId)
+			break;
+
+		m_PendingConnect = false;
+
+		if (!m_Client)
+			break;
+
+		if (packet->type == TraversalPacketConnectReady)
+			m_Client->OnConnectReady(MakeENetAddress(&packet->connectReady.address));
+		else
+			m_Client->OnConnectFailed(packet->connectFailed.reason);
+		break;
+		}
+	default:
+		WARN_LOG(NETPLAY, "Received unknown packet with type %d", packet->type);
+		break;
+	}
+	if (packet->type != TraversalPacketAck)
+	{
+		TraversalPacket ack = {};
+		ack.type = TraversalPacketAck;
+		ack.requestId = packet->requestId;
+		ack.ack.ok = ok;
+
+		ENetBuffer buf;
+		buf.data = &ack;
+		buf.dataLength = sizeof(ack);
+		if (enet_socket_send(m_NetHost->socket, &m_ServerAddress, &buf, 1) == -1)
+			OnFailure(SocketSendError);
+	}
+}
+
+void TraversalClient::OnFailure(FailureReason reason)
+{
+	m_State = Failure;
+	m_FailureReason = reason;
+
+	switch (reason)
+	{
+	case TraversalClient::BadHost:
+		PanicAlertT("Couldn't look up central server %s", m_Server.c_str());
+		break;
+	case TraversalClient::VersionTooOld:
+		PanicAlertT("Dolphin too old for traversal server");
+		break;
+	case TraversalClient::ServerForgotAboutUs:
+		PanicAlertT("Disconnected from traversal server");
+		break;
+	case TraversalClient::SocketSendError:
+		PanicAlertT("Socket error sending to traversal server");
+		break;
+	case TraversalClient::ResendTimeout:
+		PanicAlertT("Timeout connecting to traversal server");
+		break;
+	}
+
+	if (m_Client)
+		m_Client->OnTraversalStateChanged();
+}
+
+void TraversalClient::ResendPacket(OutgoingTraversalPacketInfo* info)
+{
+	info->sendTime = enet_time_get();
+	info->tries++;
+	ENetBuffer buf;
+	buf.data = &info->packet;
+	buf.dataLength = sizeof(info->packet);
+	if (enet_socket_send(m_NetHost->socket, &m_ServerAddress, &buf, 1) == -1)
+		OnFailure(SocketSendError);
+}
+
+void TraversalClient::HandleResends()
+{
+	enet_uint32 now = enet_time_get();
+	for (auto& tpi : m_OutgoingTraversalPackets)
+	{
+		if (now - tpi.sendTime >= (u32) (300 * tpi.tries))
+		{
+			if (tpi.tries >= 5)
+			{
+				OnFailure(ResendTimeout);
+				m_OutgoingTraversalPackets.clear();
+				break;
+			}
+			else
+			{
+				ResendPacket(&tpi);
+			}
+		}
+	}
+	HandlePing();
+}
+
+void TraversalClient::HandlePing()
+{
+	enet_uint32 now = enet_time_get();
+	if (m_State == Connected && now - m_PingTime >= 500)
+	{
+		TraversalPacket ping = {};
+		ping.type = TraversalPacketPing;
+		ping.ping.hostId = m_HostId;
+		SendTraversalPacket(ping);
+		m_PingTime = now;
+	}
+}
+
+TraversalRequestId TraversalClient::SendTraversalPacket(const TraversalPacket& packet)
+{
+	OutgoingTraversalPacketInfo info;
+	info.packet = packet;
+	GetRandomishBytes((u8*) &info.packet.requestId, sizeof(info.packet.requestId));
+	info.tries = 0;
+	m_OutgoingTraversalPackets.push_back(info);
+	ResendPacket(&m_OutgoingTraversalPackets.back());
+	return info.packet.requestId;
+}
+
+void TraversalClient::Reset()
+{
+	m_PendingConnect = false;
+	m_Client = nullptr;
+}
+
+int ENET_CALLBACK TraversalClient::InterceptCallback(ENetHost* host, ENetEvent* event)
+{
+	auto traversalClient = g_TraversalClient.get();
+	if (traversalClient->TestPacket(host->receivedData, host->receivedDataLength, &host->receivedAddress)
+			|| (host->receivedDataLength == 1 && host->receivedData[0] == 0))
+	{
+		event->type = (ENetEventType)42;
+		return 1;
+	}
+	return 0;
+}
+
+std::unique_ptr<TraversalClient> g_TraversalClient;
+std::unique_ptr<ENetHost> g_MainNetHost;
+
+// The settings at the previous TraversalClient reset - notably, we
+// need to know not just what port it's on, but whether it was
+// explicitly requested.
+static std::string g_OldServer;
+static u16 g_OldPort;
+
+bool EnsureTraversalClient(const std::string& server, u16 port)
+{
+
+	if (!g_MainNetHost || !g_TraversalClient || server != g_OldServer || port != g_OldPort)
+	{
+		g_OldServer = server;
+		g_OldPort = port ;
+
+		ENetAddress addr = { ENET_HOST_ANY, 0 };
+		ENetHost* host = enet_host_create(
+			&addr, // address
+			50, // peerCount
+			1, // channelLimit
+			0, // incomingBandwidth
+			0); // outgoingBandwidth
+		if (!host)
+		{
+			g_MainNetHost.reset();
+			return false;
+		}
+		g_MainNetHost.reset(host);
+		g_TraversalClient.reset(new TraversalClient(g_MainNetHost.get(), server, port));
+	}
+	return true;
+}
+
+void ReleaseTraversalClient()
+{
+	if (!g_TraversalClient)
+		return;
+
+	g_TraversalClient.release();
+	g_MainNetHost.release();
+}
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
new file mode 100644
index 0000000000..ddfb38fce1
--- /dev/null
+++ b/Source/Core/Common/TraversalClient.h
@@ -0,0 +1,81 @@
+// This file is public domain, in case it's useful to anyone. -comex
+
+#pragma once
+#include <functional>
+#include <list>
+#include <memory>
+#include <random>
+#include <enet/enet.h>
+#include "Common/Common.h"
+#include "Common/Thread.h"
+#include "Common/TraversalProto.h"
+
+class TraversalClientClient
+{
+public:
+	virtual ~TraversalClientClient(){};
+	virtual void OnTraversalStateChanged()=0;
+	virtual void OnConnectReady(ENetAddress addr)=0;
+	virtual void OnConnectFailed(u8 reason)=0;
+};
+
+class TraversalClient
+{
+public:
+	enum State
+	{
+		Connecting,
+		Connected,
+		Failure
+	};
+	enum FailureReason
+	{
+		BadHost = 0x300,
+		VersionTooOld,
+		ServerForgotAboutUs,
+		SocketSendError,
+		ResendTimeout,
+	};
+	TraversalClient(ENetHost* netHost, const std::string& server, const u16 port);
+	~TraversalClient();
+	void Reset();
+	void ConnectToClient(const std::string& host);
+	void ReconnectToServer();
+	void Update();
+	// called from NetHost
+	bool TestPacket(u8* data, size_t size, ENetAddress* from);
+	void HandleResends();
+
+	ENetHost* m_NetHost;
+	TraversalClientClient* m_Client;
+	TraversalHostId m_HostId;
+	State m_State;
+	int m_FailureReason;
+
+private:
+	struct OutgoingTraversalPacketInfo
+	{
+		TraversalPacket packet;
+		int tries;
+		enet_uint32 sendTime;
+	};
+	void HandleServerPacket(TraversalPacket* packet);
+	void ResendPacket(OutgoingTraversalPacketInfo* info);
+	TraversalRequestId SendTraversalPacket(const TraversalPacket& packet);
+	void OnFailure(FailureReason reason);
+	void HandlePing();
+	static int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
+	TraversalRequestId m_ConnectRequestId;
+	bool m_PendingConnect;
+	std::list<OutgoingTraversalPacketInfo> m_OutgoingTraversalPackets;
+	ENetAddress m_ServerAddress;
+	std::string m_Server;
+	u16         m_port;
+	enet_uint32 m_PingTime;
+};
+extern std::unique_ptr<TraversalClient> g_TraversalClient;
+// the NetHost connected to the TraversalClient.
+extern std::unique_ptr<ENetHost> g_MainNetHost;
+// Create g_TraversalClient and g_MainNetHost if necessary.
+bool EnsureTraversalClient(const std::string& server, u16 port);
+void ReleaseTraversalClient();
diff --git a/Source/Core/Common/TraversalProto.h b/Source/Core/Common/TraversalProto.h
new file mode 100644
index 0000000000..5036c3dbcc
--- /dev/null
+++ b/Source/Core/Common/TraversalProto.h
@@ -0,0 +1,96 @@
+// This file is public domain, in case it's useful to anyone. -comex
+
+#pragma once
+#include <array>
+#include "Common/CommonTypes.h"
+
+#define NETPLAY_CODE_SIZE 8
+typedef std::array<char, NETPLAY_CODE_SIZE> TraversalHostId;
+typedef u64 TraversalRequestId;
+
+enum TraversalPacketType
+{
+	// [*->*]
+	TraversalPacketAck = 0,
+	// [c->s]
+	TraversalPacketPing = 1,
+	// [c->s]
+	TraversalPacketHelloFromClient = 2,
+	// [s->c]
+	TraversalPacketHelloFromServer = 3,
+	// [c->s] When connecting, first the client asks the central server...
+	TraversalPacketConnectPlease = 4,
+	// [s->c] ...who asks the game host to send a UDP packet to the
+	// client... (an ack implies success)
+	TraversalPacketPleaseSendPacket = 5,
+	// [s->c] ...which the central server relays back to the client.
+	TraversalPacketConnectReady = 6,
+	// [s->c] Alternately, the server might not have heard of this host.
+	TraversalPacketConnectFailed = 7
+};
+
+enum
+{
+	TraversalProtoVersion = 0
+};
+
+enum TraversalConnectFailedReason
+{
+	TraversalConnectFailedClientDidntRespond = 0,
+	TraversalConnectFailedClientFailure,
+	TraversalConnectFailedNoSuchClient
+};
+
+#pragma pack(push, 1)
+struct TraversalInetAddress
+{
+	u8 isIPV6;
+	u32 address[4];
+	u16 port;
+};
+struct TraversalPacket
+{
+	u8 type;
+	TraversalRequestId requestId;
+	union
+	{
+		struct
+		{
+			u8 ok;
+		} ack;
+		struct
+		{
+			TraversalHostId hostId;
+		} ping;
+		struct
+		{
+			u8 protoVersion;
+		} helloFromClient;
+		struct
+		{
+			u8 ok;
+			TraversalHostId yourHostId;
+			TraversalInetAddress yourAddress; // currently unused
+		} helloFromServer;
+		struct
+		{
+			TraversalHostId hostId;
+		} connectPlease;
+		struct
+		{
+			TraversalInetAddress address;
+		} pleaseSendPacket;
+		struct
+		{
+			TraversalRequestId requestId;
+			TraversalInetAddress address;
+		} connectReady;
+		struct
+		{
+			TraversalRequestId requestId;
+			u8 reason;
+		} connectFailed;
+	};
+};
+#pragma pack(pop)
+
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
new file mode 100644
index 0000000000..6631b6359a
--- /dev/null
+++ b/Source/Core/Common/TraversalServer.cpp
@@ -0,0 +1,459 @@
+// This file is public domain, in case it's useful to anyone. -comex
+
+// The central server implementation.
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fcntl.h>
+#include <unistd.h>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include "Common/TraversalProto.h"
+
+#define DEBUG 1
+#define NUMBER_OF_TRIES 5
+
+static u64 currentTime;
+
+struct OutgoingPacketInfo
+{
+	TraversalPacket packet;
+	TraversalRequestId misc;
+	sockaddr_in6 dest;
+	int tries;
+	u64 sendTime;
+};
+
+template <typename T>
+struct EvictEntry
+{
+	u64 updateTime;
+	T value;
+};
+
+template <typename V>
+struct EvictFindResult
+{
+	bool found;
+	V* value;
+};
+
+template <typename K, typename V>
+EvictFindResult<V> EvictFind(std::unordered_map<K, EvictEntry<V>>& map, const K& key, bool refresh = false)
+{
+	retry:
+	const u64 expiryTime = 30 * 1000000; // 30s
+	EvictFindResult<V> result;
+	if (map.bucket_count())
+	{
+		auto bucket = map.bucket(key);
+		auto it = map.begin(bucket);
+		for (; it != map.end(bucket); ++it)
+		{
+			if (currentTime - it->second.updateTime > expiryTime)
+			{
+				map.erase(it->first);
+				goto retry;
+			}
+			if (it->first == key)
+			{
+				if (refresh)
+					it->second.updateTime = currentTime;
+				result.found = true;
+				result.value = &it->second.value;
+				return result;
+			}
+		}
+	}
+#if DEBUG
+	printf("failed to find key '");
+	for (size_t i = 0; i < sizeof(key); i++) {
+		printf("%02x", ((u8 *) &key)[i]);
+	}
+	printf("'\n");
+#endif
+	result.found = false;
+	return result;
+}
+
+template <typename K, typename V>
+V* EvictSet(std::unordered_map<K, EvictEntry<V>>& map, const K& key)
+{
+	// can't use a local_iterator to emplace...
+	auto& result = map[key];
+	result.updateTime = currentTime;
+	return &result.value;
+}
+
+namespace std
+{
+	template <>
+	struct hash<TraversalHostId>
+	{
+		size_t operator()(const TraversalHostId& id) const
+		{
+			auto p = (u32*) id.data();
+			return p[0] ^ ((p[1] << 13) | (p[1] >> 19));
+		}
+	};
+}
+
+static int sock;
+static int urandomFd;
+static std::unordered_map<
+	TraversalRequestId,
+	OutgoingPacketInfo
+> outgoingPackets;
+static std::unordered_map<
+	TraversalHostId,
+	EvictEntry<TraversalInetAddress>
+> connectedClients;
+
+static TraversalInetAddress MakeInetAddress(const sockaddr_in6& addr)
+{
+	if (addr.sin6_family != AF_INET6)
+	{
+		fprintf(stderr, "bad sockaddr_in6\n");
+		exit(1);
+	}
+	u32* words = (u32*) addr.sin6_addr.s6_addr;
+	TraversalInetAddress result = {0};
+	if (words[0] == 0 && words[1] == 0 && words[2] == 0xffff0000)
+	{
+		result.isIPV6 = false;
+		result.address[0] = words[3];
+	}
+	else
+	{
+		result.isIPV6 = true;
+		memcpy(result.address, words, sizeof(result.address));
+	}
+	result.port = addr.sin6_port;
+	return result;
+}
+
+static sockaddr_in6 MakeSinAddr(const TraversalInetAddress& addr)
+{
+	sockaddr_in6 result;
+#ifdef SIN6_LEN
+	result.sin6_len = sizeof(result);
+#endif
+	result.sin6_family = AF_INET6;
+	result.sin6_port = addr.port;
+	result.sin6_flowinfo = 0;
+	if (addr.isIPV6)
+	{
+		memcpy(&result.sin6_addr, addr.address, 16);
+	}
+	else
+	{
+		u32* words = (u32*) result.sin6_addr.s6_addr;
+		words[0] = 0;
+		words[1] = 0;
+		words[2] = 0xffff0000;
+		words[3] = addr.address[0];
+	}
+	result.sin6_scope_id = 0;
+	return result;
+}
+
+static void GetRandomBytes(void* output, size_t size)
+{
+	static u8 bytes[8192];
+	static size_t bytesLeft = 0;
+	if (bytesLeft < size)
+	{
+		ssize_t rv = read(urandomFd, bytes, sizeof(bytes));
+		if (rv != sizeof(bytes))
+		{
+			perror("read from /dev/urandom");
+			exit(1);
+		}
+		bytesLeft = sizeof(bytes);
+	}
+	memcpy(output, bytes + (bytesLeft -= size), size);
+}
+
+static void GetRandomHostId(TraversalHostId* hostId)
+{
+	char buf[9];
+	u32 num;
+	GetRandomBytes(&num, sizeof(num));
+	sprintf(buf, "%08x", num);
+	memcpy(hostId->data(), buf, 8);
+}
+
+static const char* SenderName(sockaddr_in6* addr)
+{
+	static char buf[INET6_ADDRSTRLEN + 10];
+	inet_ntop(PF_INET6, &addr->sin6_addr, buf, sizeof(buf));
+	sprintf(buf + strlen(buf), ":%d", ntohs(addr->sin6_port));
+	return buf;
+}
+
+static void TrySend(const void* buffer, size_t size, sockaddr_in6* addr)
+{
+#if DEBUG
+	printf("-> %d %llu %s\n", ((TraversalPacket*) buffer)->type,
+		   (long long)((TraversalPacket*) buffer)->requestId, SenderName(addr));
+#endif
+	if ((size_t) sendto(sock, buffer, size, 0, (sockaddr*) addr, sizeof(*addr)) != size)
+	{
+		perror("sendto");
+	}
+}
+
+static TraversalPacket* AllocPacket(const sockaddr_in6& dest, TraversalRequestId misc = 0)
+{
+	TraversalRequestId requestId;
+	GetRandomBytes(&requestId, sizeof(requestId));
+	OutgoingPacketInfo* info = &outgoingPackets[requestId];
+	info->dest = dest;
+	info->misc = misc;
+	info->tries = 0;
+	info->sendTime = currentTime;
+	TraversalPacket* result = &info->packet;
+	memset(result, 0, sizeof(*result));
+	result->requestId = requestId;
+	return result;
+}
+
+static void SendPacket(OutgoingPacketInfo* info)
+{
+	info->tries++;
+	info->sendTime = currentTime;
+	TrySend(&info->packet, sizeof(info->packet), &info->dest);
+}
+
+
+static void ResendPackets()
+{
+	std::vector<std::pair<TraversalInetAddress, TraversalRequestId>> todoFailures;
+	todoFailures.clear();
+	for (auto it = outgoingPackets.begin(); it != outgoingPackets.end();)
+	{
+		OutgoingPacketInfo* info = &it->second;
+		if (currentTime - info->sendTime >= (u64) (300000 * info->tries))
+		{
+			if (info->tries >= NUMBER_OF_TRIES)
+			{
+				if (info->packet.type == TraversalPacketPleaseSendPacket)
+				{
+					todoFailures.push_back(std::make_pair(info->packet.pleaseSendPacket.address, info->misc));
+				}
+				it = outgoingPackets.erase(it);
+				continue;
+			}
+			else
+			{
+				SendPacket(info);
+			}
+		}
+		++it;
+	}
+
+	for (const auto& p : todoFailures)
+	{
+		TraversalPacket* fail = AllocPacket(MakeSinAddr(p.first));
+		fail->type = TraversalPacketConnectFailed;
+		fail->connectFailed.requestId = p.second;
+		fail->connectFailed.reason = TraversalConnectFailedClientDidntRespond;
+	}
+}
+
+static void HandlePacket(TraversalPacket* packet, sockaddr_in6* addr)
+{
+#if DEBUG
+	printf("<- %d %llu %s\n", packet->type, (long long)packet->requestId, SenderName(addr));
+#endif
+	bool packetOk = true;
+	switch (packet->type)
+	{
+		case TraversalPacketAck:
+			{
+			auto it = outgoingPackets.find(packet->requestId);
+			if (it == outgoingPackets.end())
+				break;
+
+			OutgoingPacketInfo* info = &it->second;
+
+			if (info->packet.type == TraversalPacketPleaseSendPacket)
+			{
+				TraversalPacket* ready = AllocPacket(MakeSinAddr(info->packet.pleaseSendPacket.address));
+				if (packet->ack.ok)
+				{
+					ready->type = TraversalPacketConnectReady;
+					ready->connectReady.requestId = info->misc;
+					ready->connectReady.address = MakeInetAddress(info->dest);
+				}
+				else
+				{
+					ready->type = TraversalPacketConnectFailed;
+					ready->connectFailed.requestId = info->misc;
+					ready->connectFailed.reason = TraversalConnectFailedClientFailure;
+				}
+			}
+
+		outgoingPackets.erase(it);
+		break;
+		}
+	case TraversalPacketPing:
+		{
+		auto r = EvictFind(connectedClients, packet->ping.hostId, true);
+		packetOk = r.found;
+		break;
+		}
+	case TraversalPacketHelloFromClient:
+		{
+		u8 ok = packet->helloFromClient.protoVersion <= TraversalProtoVersion;
+		TraversalPacket* reply = AllocPacket(*addr);
+		reply->type = TraversalPacketHelloFromServer;
+		reply->helloFromServer.ok = ok;
+		if (ok)
+		{
+			TraversalHostId hostId;
+			TraversalInetAddress* iaddr;
+			// not that there is any significant change of
+			// duplication, but...
+			GetRandomHostId(&hostId);
+			while (true)
+			{
+				auto r = EvictFind(connectedClients, hostId);
+				if (!r.found)
+				{
+					iaddr = EvictSet(connectedClients, hostId);
+					break;
+				}
+			}
+
+			*iaddr = MakeInetAddress(*addr);
+
+			reply->helloFromServer.yourAddress = *iaddr;
+			reply->helloFromServer.yourHostId = hostId;
+		}
+		break;
+		}
+	case TraversalPacketConnectPlease:
+		{
+		TraversalHostId& hostId = packet->connectPlease.hostId;
+		auto r = EvictFind(connectedClients, hostId);
+		if (!r.found)
+		{
+			TraversalPacket* reply = AllocPacket(*addr);
+			reply->type = TraversalPacketConnectFailed;
+			reply->connectFailed.requestId = packet->requestId;
+			reply->connectFailed.reason = TraversalConnectFailedNoSuchClient;
+		}
+		else
+		{
+			TraversalPacket* please = AllocPacket(MakeSinAddr(*r.value), packet->requestId);
+			please->type = TraversalPacketPleaseSendPacket;
+			please->pleaseSendPacket.address = MakeInetAddress(*addr);
+		}
+		break;
+		}
+	default:
+		fprintf(stderr, "received unknown packet type %d from %s\n", packet->type, SenderName(addr));
+	}
+	if (packet->type != TraversalPacketAck)
+	{
+		TraversalPacket ack = {};
+		ack.type = TraversalPacketAck;
+		ack.requestId = packet->requestId;
+		ack.ack.ok = packetOk;
+		TrySend(&ack, sizeof(ack), addr);
+	}
+}
+
+int main()
+{
+	int rv;
+
+	urandomFd = open("/dev/urandom", O_RDONLY);
+	if (urandomFd < 0)
+	{
+		perror("open /dev/urandom");
+		return 1;
+	}
+
+	sock = socket(PF_INET6, SOCK_DGRAM, 0);
+	if (sock == -1)
+	{
+		perror("socket");
+		return 1;
+	}
+	int no = 0;
+	rv = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+	if (rv < 0)
+	{
+		perror("setsockopt IPV6_V6ONLY");
+		return 1;
+	}
+	in6_addr any = IN6ADDR_ANY_INIT;
+	sockaddr_in6 addr;
+#ifdef SIN6_LEN
+	addr.sin6_len = sizeof(addr);
+#endif
+	addr.sin6_family = AF_INET6;
+	addr.sin6_port = htons(6262);
+	addr.sin6_flowinfo = 0;
+	addr.sin6_addr = any;
+	addr.sin6_scope_id = 0;
+
+	rv = bind(sock, (sockaddr*) &addr, sizeof(addr));
+	if (rv < 0)
+	{
+		perror("bind");
+		return 1;
+	}
+
+	timeval tv;
+	tv.tv_sec = 0;
+	tv.tv_usec = 300000;
+	rv = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+	if (rv < 0)
+	{
+		perror("setsockopt SO_RCVTIMEO");
+		return 1;
+	}
+
+	while (true)
+	{
+		sockaddr_in6 raddr;
+		socklen_t addrLen = sizeof(raddr);
+		TraversalPacket packet;
+		// note: switch to recvmmsg (yes, mmsg) if this becomes
+		// expensive
+		rv = recvfrom(sock, &packet, sizeof(packet), 0, (sockaddr*) &raddr, &addrLen);
+		if (gettimeofday(&tv, nullptr) < 0)
+		{
+			perror("gettimeofday");
+			exit(1);
+		}
+		currentTime = (u64) tv.tv_sec * 1000000 + tv.tv_usec;
+		if (rv < 0)
+		{
+			if (errno != EINTR && errno != EAGAIN)
+			{
+				perror("recvfrom");
+				return 1;
+			}
+		}
+		else if ((size_t) rv < sizeof(packet))
+		{
+			fprintf(stderr, "received short packet from %s\n", SenderName(&raddr));
+		}
+		else
+		{
+			HandlePacket(&packet, &raddr);
+		}
+		ResendPackets();
+	}
+}
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
new file mode 100644
index 0000000000..2ac01cd22e
--- /dev/null
+++ b/Source/Core/Common/Version.cpp
@@ -0,0 +1,38 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "scmrev.h"
+#include "Common/Common.h"
+
+#ifdef _DEBUG
+	#define BUILD_TYPE_STR "Debug "
+#elif defined DEBUGFAST
+	#define BUILD_TYPE_STR "DebugFast "
+#else
+	#define BUILD_TYPE_STR ""
+#endif
+
+const char *scm_rev_str = "Dolphin "
+#if !SCM_IS_MASTER
+	"[" SCM_BRANCH_STR "] "
+#endif
+
+#ifdef __INTEL_COMPILER
+	BUILD_TYPE_STR SCM_DESC_STR "-ICC";
+#else
+	BUILD_TYPE_STR SCM_DESC_STR;
+#endif
+
+#ifdef _WIN32
+const char *netplay_dolphin_ver = SCM_DESC_STR " Win";
+#elif __APPLE__
+const char *netplay_dolphin_ver = SCM_DESC_STR " Mac";
+#else
+const char *netplay_dolphin_ver = SCM_DESC_STR " Lin";
+#endif
+
+const char *scm_rev_git_str = SCM_REV_STR;
+
+const char *scm_desc_str = SCM_DESC_STR;
+const char *scm_branch_str = SCM_BRANCH_STR;
diff --git a/Source/Core/Common/XSaveWorkaround.cpp b/Source/Core/Common/XSaveWorkaround.cpp
new file mode 100644
index 0000000000..a91af47a39
--- /dev/null
+++ b/Source/Core/Common/XSaveWorkaround.cpp
@@ -0,0 +1,61 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#if defined(_WIN32)
+
+#include <math.h>
+#include <Windows.h>
+
+typedef decltype(&GetEnabledXStateFeatures) GetEnabledXStateFeatures_t;
+
+int __cdecl EnableXSaveWorkaround()
+{
+	// Some Windows environments may have hardware support for AVX/FMA,
+	// but the OS does not support it. The CRT math library does not support
+	// this scenario, so we have to manually tell it not to use FMA3
+	// instructions.
+
+	// The API name is somewhat misleading - we're testing for OS support
+	// here.
+	if (!IsProcessorFeaturePresent(PF_XSAVE_ENABLED))
+	{
+		_set_FMA3_enable(0);
+		return 0;
+	}
+
+	// Even if XSAVE feature is enabled, we have to see if
+	// GetEnabledXStateFeatures function is present, and see what it says about
+	// AVX state.
+	auto kernel32Handle = GetModuleHandle(TEXT("kernel32.dll"));
+	if (kernel32Handle == nullptr)
+	{
+		std::abort();
+	}
+
+	auto pGetEnabledXStateFeatures = (GetEnabledXStateFeatures_t)GetProcAddress(
+		kernel32Handle, "GetEnabledXStateFeatures");
+	if (pGetEnabledXStateFeatures == nullptr ||
+		(pGetEnabledXStateFeatures() & XSTATE_MASK_AVX) == 0)
+	{
+		_set_FMA3_enable(0);
+	}
+
+	return 0;
+}
+
+// Create a segment which is recognized by the linker to be part of the CRT
+// initialization. XI* = C startup, XC* = C++ startup. "A" placement is reserved
+// for system use. Thus, the earliest we can get is XIB (C startup is before
+// C++).
+#pragma section(".CRT$XIB", read)
+
+// Place a symbol in the special segment, make it have C linkage so that
+// referencing it doesn't require ugly decorated names.
+// Use /include:XSaveWorkaround linker flag to enable this.
+extern "C" {
+	__declspec(allocate(".CRT$XIB"))
+	decltype(&EnableXSaveWorkaround) XSaveWorkaround = EnableXSaveWorkaround;
+};
+
+#endif
diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js
index f2978987dc..97c68cc923 100644
--- a/Source/Core/Common/make_scmrev.h.js
+++ b/Source/Core/Common/make_scmrev.h.js
@@ -1,14 +1,23 @@
 var wshShell		= new ActiveXObject("WScript.Shell")
 var oFS				= new ActiveXObject("Scripting.FileSystemObject");
 
-var outfile			= "./Src/scmrev.h";
+var outfile			= "./scmrev.h";
 var cmd_revision	= " rev-parse HEAD";
 var cmd_describe	= " describe --always --long --dirty";
 var cmd_branch		= " rev-parse --abbrev-ref HEAD";
 
 function GetGitExe()
 {
-	for (var gitexe in {"git.cmd":1, "git":1})
+	try
+	{
+		gitexe = wshShell.RegRead("HKCU\\Software\\GitExtensions\\gitcommand");
+		wshShell.Exec(gitexe);
+		return gitexe;
+	}
+	catch (e)
+	{}
+
+	for (var gitexe in {"git.cmd":1, "git":1, "git.bat":1})
 	{
 		try
 		{
@@ -56,7 +65,7 @@ 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);
+var isStable	= +("master" == branch || "stable" == branch);
 
 // remove hash (and trailing "-0" if needed) from description
 describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2');
@@ -65,7 +74,7 @@ var out_contents =
 	"#define SCM_REV_STR \"" + revision + "\"\n" +
 	"#define SCM_DESC_STR \"" + describe + "\"\n" +
 	"#define SCM_BRANCH_STR \"" + branch + "\"\n" +
-	"#define SCM_IS_MASTER " + isMaster + "\n";
+	"#define SCM_IS_MASTER " + isStable + "\n";
 
 // check if file needs updating
 if (out_contents == GetFileContents(outfile))
diff --git a/Source/Core/Common/x64ABI.cpp b/Source/Core/Common/x64ABI.cpp
new file mode 100644
index 0000000000..493cd13876
--- /dev/null
+++ b/Source/Core/Common/x64ABI.cpp
@@ -0,0 +1,234 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
+using namespace Gen;
+
+// Shared code between Win64 and Unix64
+
+void XEmitter::ABI_CalculateFrameSize(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp)
+{
+	size_t shadow = 0;
+#if defined(_WIN32)
+	shadow = 0x20;
+#endif
+
+	int count = (mask & ABI_ALL_GPRS).Count();
+	rsp_alignment -= count * 8;
+	size_t subtraction = 0;
+	int fpr_count = (mask & ABI_ALL_FPRS).Count();
+	if (fpr_count)
+	{
+		// If we have any XMMs to save, we must align the stack here.
+		subtraction = rsp_alignment & 0xf;
+	}
+	subtraction += 16 * fpr_count;
+	size_t xmm_base_subtraction = subtraction;
+	subtraction += needed_frame_size;
+	subtraction += shadow;
+	// Final alignment.
+	rsp_alignment -= subtraction;
+	subtraction += rsp_alignment & 0xf;
+
+	*shadowp = shadow;
+	*subtractionp = subtraction;
+	*xmm_offsetp = subtraction - xmm_base_subtraction;
+}
+
+size_t XEmitter::ABI_PushRegistersAndAdjustStack(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size)
+{
+	size_t shadow, subtraction, xmm_offset;
+	ABI_CalculateFrameSize(mask, rsp_alignment, needed_frame_size, &shadow, &subtraction, &xmm_offset);
+
+	for (int r : mask & ABI_ALL_GPRS)
+		PUSH((X64Reg)r);
+
+	if (subtraction)
+		SUB(64, R(RSP), subtraction >= 0x80 ? Imm32((u32)subtraction) : Imm8((u8)subtraction));
+
+	for (int x : mask & ABI_ALL_FPRS)
+	{
+		MOVAPD(MDisp(RSP, (int)xmm_offset), (X64Reg)(x - 16));
+		xmm_offset += 16;
+	}
+
+	return shadow;
+}
+
+void XEmitter::ABI_PopRegistersAndAdjustStack(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size)
+{
+	size_t shadow, subtraction, xmm_offset;
+	ABI_CalculateFrameSize(mask, rsp_alignment, needed_frame_size, &shadow, &subtraction, &xmm_offset);
+
+	for (int x : mask & ABI_ALL_FPRS)
+	{
+		MOVAPD((X64Reg) (x - 16), MDisp(RSP, (int)xmm_offset));
+		xmm_offset += 16;
+	}
+
+	if (subtraction)
+		ADD(64, R(RSP), subtraction >= 0x80 ? Imm32((u32)subtraction) : Imm8((u8)subtraction));
+
+	for (int r = 15; r >= 0; r--)
+	{
+		if (mask[r])
+			POP((X64Reg)r);
+	}
+}
+
+// Common functions
+void XEmitter::ABI_CallFunction(const void *func)
+{
+	u64 distance = u64(func) - (u64(code) + 5);
+	if (distance >= 0x0000000080000000ULL &&
+	    distance <  0xFFFFFFFF80000000ULL)
+	{
+		// Far call
+		MOV(64, R(RAX), Imm64((u64)func));
+		CALLptr(R(RAX));
+	}
+	else
+	{
+		CALL(func);
+	}
+}
+
+void XEmitter::ABI_CallFunctionC16(const void *func, u16 param1)
+{
+	MOV(32, R(ABI_PARAM1), Imm32((u32)param1));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCC16(const void *func, u32 param1, u16 param2)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(32, R(ABI_PARAM2), Imm32((u32)param2));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionC(const void *func, u32 param1)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCC(const void *func, u32 param1, u32 param2)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCP(const void *func, u32 param1, void *param2)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(64, R(ABI_PARAM2), Imm64((u64)param2));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCCC(const void *func, u32 param1, u32 param2, u32 param3)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	MOV(32, R(ABI_PARAM3), Imm32(param3));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCCP(const void *func, u32 param1, u32 param2, void *param3)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	MOV(64, R(ABI_PARAM3), Imm64((u64)param3));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionCCCP(const void *func, u32 param1, u32 param2, u32 param3, void *param4)
+{
+	MOV(32, R(ABI_PARAM1), Imm32(param1));
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	MOV(32, R(ABI_PARAM3), Imm32(param3));
+	MOV(64, R(ABI_PARAM4), Imm64((u64)param4));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionPC(const void *func, void *param1, u32 param2)
+{
+	MOV(64, R(ABI_PARAM1), Imm64((u64)param1));
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionPPC(const void *func, void *param1, void *param2, u32 param3)
+{
+	MOV(64, R(ABI_PARAM1), Imm64((u64)param1));
+	MOV(64, R(ABI_PARAM2), Imm64((u64)param2));
+	MOV(32, R(ABI_PARAM3), Imm32(param3));
+	ABI_CallFunction(func);
+}
+
+// Pass a register as a parameter.
+void XEmitter::ABI_CallFunctionR(const void *func, X64Reg reg1)
+{
+	if (reg1 != ABI_PARAM1)
+		MOV(32, R(ABI_PARAM1), R(reg1));
+	ABI_CallFunction(func);
+}
+
+// Pass two registers as parameters.
+void XEmitter::ABI_CallFunctionRR(const void *func, X64Reg reg1, X64Reg reg2)
+{
+	MOVTwo(64, ABI_PARAM1, reg1, 0, ABI_PARAM2, reg2);
+	ABI_CallFunction(func);
+}
+
+void XEmitter::MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, s32 offset1, Gen::X64Reg dst2, Gen::X64Reg src2)
+{
+	if (dst1 == src2 && dst2 == src1)
+	{
+		XCHG(bits, R(src1), R(src2));
+		if (offset1)
+			ADD(bits, R(dst1), Imm32(offset1));
+	}
+	else if (src2 != dst1)
+	{
+		if (dst1 != src1 && offset1)
+			LEA(bits, dst1, MDisp(src1, offset1));
+		else if (dst1 != src1)
+			MOV(bits, R(dst1), R(src1));
+		else if (offset1)
+			ADD(bits, R(dst1), Imm32(offset1));
+		if (dst2 != src2)
+			MOV(bits, R(dst2), R(src2));
+	}
+	else
+	{
+		if (dst2 != src2)
+			MOV(bits, R(dst2), R(src2));
+		if (dst1 != src1 && offset1)
+			LEA(bits, dst1, MDisp(src1, offset1));
+		else if (dst1 != src1)
+			MOV(bits, R(dst1), R(src1));
+		else if (offset1)
+			ADD(bits, R(dst1), Imm32(offset1));
+	}
+}
+
+void XEmitter::ABI_CallFunctionAC(int bits, const void *func, const Gen::OpArg &arg1, u32 param2)
+{
+	if (!arg1.IsSimpleReg(ABI_PARAM1))
+		MOV(bits, R(ABI_PARAM1), arg1);
+	MOV(32, R(ABI_PARAM2), Imm32(param2));
+	ABI_CallFunction(func);
+}
+
+void XEmitter::ABI_CallFunctionA(int bits, const void *func, const Gen::OpArg &arg1)
+{
+	if (!arg1.IsSimpleReg(ABI_PARAM1))
+		MOV(bits, R(ABI_PARAM1), arg1);
+	ABI_CallFunction(func);
+}
+
diff --git a/Source/Core/Common/x64ABI.h b/Source/Core/Common/x64ABI.h
new file mode 100644
index 0000000000..2f0b0111f0
--- /dev/null
+++ b/Source/Core/Common/x64ABI.h
@@ -0,0 +1,60 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/BitSet.h"
+#include "Common/x64Emitter.h"
+
+// x64 ABI:s, and helpers to help follow them when JIT-ing code.
+// All convensions return values in EAX (+ possibly EDX).
+
+// Windows 64-bit
+// * 4-reg "fastcall" variant, very new-skool stack handling
+// * Callee moves stack pointer, to make room for shadow regs for the biggest function _it itself calls_
+// * Parameters passed in RCX, RDX, ... further parameters are MOVed into the allocated stack space.
+// Scratch:      RAX RCX RDX R8 R9 R10 R11
+// Callee-save:  RBX RSI RDI RBP R12 R13 R14 R15
+// Parameters:   RCX RDX R8 R9, further MOV-ed
+
+// Linux 64-bit
+// * 6-reg "fastcall" variant, old skool stack handling (parameters are pushed)
+// Scratch:      RAX RCX RDX RSI RDI R8 R9 R10 R11
+// Callee-save:  RBX RBP R12 R13 R14 R15
+// Parameters:   RDI RSI RDX RCX R8 R9
+
+#define ABI_ALL_FPRS BitSet32(0xffff0000)
+#define ABI_ALL_GPRS BitSet32(0x0000ffff)
+
+#ifdef _WIN32 // 64-bit Windows - the really exotic calling convention
+
+#define ABI_PARAM1 RCX
+#define ABI_PARAM2 RDX
+#define ABI_PARAM3 R8
+#define ABI_PARAM4 R9
+
+// xmm0-xmm15 use the upper 16 bits in the functions that push/pop registers.
+#define ABI_ALL_CALLER_SAVED \
+	(BitSet32 { RAX, RCX, RDX, R8, R9, R10, R11, \
+	            XMM0+16, XMM1+16, XMM2+16, XMM3+16, XMM4+16, XMM5+16 })
+#else  //64-bit Unix / OS X
+
+#define ABI_PARAM1 RDI
+#define ABI_PARAM2 RSI
+#define ABI_PARAM3 RDX
+#define ABI_PARAM4 RCX
+#define ABI_PARAM5 R8
+#define ABI_PARAM6 R9
+
+// FIXME: avoid pushing all 16 XMM registers when possible? most functions we call probably
+// don't actually clobber them.
+#define ABI_ALL_CALLER_SAVED \
+	(BitSet32 { RAX, RCX, RDX, RDI, RSI, R8, R9, R10, R11 } | \
+	 ABI_ALL_FPRS)
+#endif // WIN32
+
+#define ABI_ALL_CALLEE_SAVED (~ABI_ALL_CALLER_SAVED)
+
+#define ABI_RETURN RAX
+
diff --git a/Source/Core/Common/x64Analyzer.cpp b/Source/Core/Common/x64Analyzer.cpp
new file mode 100644
index 0000000000..eab55d9de6
--- /dev/null
+++ b/Source/Core/Common/x64Analyzer.cpp
@@ -0,0 +1,241 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/x64Analyzer.h"
+
+bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
+{
+	unsigned const char *startCodePtr = codePtr;
+	u8 rex = 0;
+	u32 opcode;
+	int opcode_length;
+
+	//Check for regular prefix
+	info->operandSize = 4;
+	info->zeroExtend = false;
+	info->signExtend = false;
+	info->hasImmediate = false;
+	info->isMemoryWrite = false;
+	info->byteSwap = false;
+
+	u8 modRMbyte = 0;
+	u8 sibByte = 0;
+	bool hasModRM = false;
+
+	int displacementSize = 0;
+
+	if (*codePtr == 0x66)
+	{
+		info->operandSize = 2;
+		codePtr++;
+	}
+	else if (*codePtr == 0x67)
+	{
+		codePtr++;
+	}
+
+	//Check for REX prefix
+	if ((*codePtr & 0xF0) == 0x40)
+	{
+		rex = *codePtr;
+		if (rex & 8) //REX.W
+		{
+			info->operandSize = 8;
+		}
+		codePtr++;
+	}
+
+	opcode = *codePtr++;
+	opcode_length = 1;
+	if (opcode == 0x0F)
+	{
+		opcode = (opcode << 8) | *codePtr++;
+		opcode_length = 2;
+		if ((opcode & 0xFB) == 0x38)
+		{
+			opcode = (opcode << 8) | *codePtr++;
+			opcode_length = 3;
+		}
+	}
+
+	switch (opcode_length)
+	{
+		case 1:
+			if ((opcode & 0xF0) == 0x80 ||
+			    ((opcode & 0xF8) == 0xC0 && (opcode & 0x0E) != 0x02))
+			{
+				modRMbyte = *codePtr++;
+				hasModRM = true;
+			}
+			break;
+		case 2:
+			if (((opcode & 0xF0) == 0x00 && (opcode & 0x0F) >= 0x04 && (opcode & 0x0D) != 0x0D) ||
+			    ((opcode & 0xF0) == 0xA0 && (opcode & 0x07) <= 0x02) ||
+			    (opcode & 0xF0) == 0x30 ||
+			    (opcode & 0xFF) == 0x77 ||
+			    (opcode & 0xF0) == 0x80 ||
+			    (opcode & 0xF8) == 0xC8)
+			{
+				// No mod R/M byte
+			}
+			else
+			{
+				modRMbyte = *codePtr++;
+				hasModRM = true;
+			}
+			break;
+		case 3:
+			// TODO: support more 3-byte opcode instructions
+			if ((opcode & 0xFE) == 0xF0)
+			{
+				modRMbyte = *codePtr++;
+				hasModRM = true;
+			}
+			break;
+	}
+
+	if (hasModRM)
+	{
+		ModRM mrm(modRMbyte, rex);
+		info->regOperandReg = mrm.reg;
+		if (mrm.mod < 3)
+		{
+			if (mrm.rm == 4)
+			{
+				//SIB byte
+				sibByte = *codePtr++;
+				info->scaledReg = (sibByte >> 3) & 7;
+				info->otherReg = (sibByte & 7);
+				if (rex & 2) info->scaledReg += 8;
+				if (rex & 1) info->otherReg += 8;
+			}
+			else
+			{
+				//info->scaledReg =
+			}
+		}
+		if (mrm.mod == 1 || mrm.mod == 2)
+		{
+			if (mrm.mod == 1)
+				displacementSize = 1;
+			else
+				displacementSize = 4;
+		}
+	}
+
+	if (displacementSize == 1)
+		info->displacement = (s32)(s8)*codePtr;
+	else
+		info->displacement = *((s32*)codePtr);
+	codePtr += displacementSize;
+
+	switch (opcode)
+	{
+	case 0xC6: // mem <- imm8
+		info->isMemoryWrite = true;
+		info->hasImmediate = true;
+		info->immediate = *codePtr;
+		info->operandSize = 1;
+		codePtr++;
+		break;
+
+	case 0xC7: // mem <- imm16/32
+		info->isMemoryWrite = true;
+		switch (info->operandSize)
+		{
+		case 2:
+			info->hasImmediate = true;
+			info->immediate = *(u16*)codePtr;
+			codePtr += 2;
+			break;
+
+		case 4:
+			info->hasImmediate = true;
+			info->immediate = *(u32*)codePtr;
+			codePtr += 4;
+			break;
+
+		case 8:
+			info->zeroExtend = true;
+			info->immediate = *(u32*)codePtr;
+			codePtr += 4;
+			break;
+		}
+		break;
+
+	case 0x88: // mem <- r8
+		info->isMemoryWrite = true;
+		if (info->operandSize != 4)
+		{
+			return false;
+		}
+		info->operandSize = 1;
+		break;
+
+	case 0x89: // mem <- r16/32/64
+		info->isMemoryWrite = true;
+		break;
+
+	case 0x8A: // r8 <- mem
+		if (info->operandSize != 4)
+		{
+			return false;
+		}
+		info->operandSize = 1;
+		break;
+
+	case 0x8B: // r16/32/64 <- mem
+		break;
+
+	case 0x0FB6: // movzx on byte
+		info->zeroExtend = true;
+		info->operandSize = 1;
+		break;
+
+	case 0x0FB7: // movzx on short
+		info->zeroExtend = true;
+		info->operandSize = 2;
+		break;
+
+	case 0x0FBE: // movsx on byte
+		info->signExtend = true;
+		info->operandSize = 1;
+		break;
+
+	case 0x0FBF: // movsx on short
+		info->signExtend = true;
+		info->operandSize = 2;
+		break;
+
+	case 0x0F38F0: // movbe read
+		info->byteSwap = true;
+		break;
+
+	case 0x0F38F1: // movbe write
+		info->byteSwap = true;
+		info->isMemoryWrite = true;
+		break;
+
+	default:
+		return false;
+	}
+	info->instructionSize = (int)(codePtr - startCodePtr);
+	return true;
+}
+
+bool InstructionInfo::operator==(const InstructionInfo &other) const
+{
+	return operandSize     == other.operandSize     &&
+	       instructionSize == other.instructionSize &&
+	       regOperandReg   == other.regOperandReg   &&
+	       otherReg        == other.otherReg        &&
+	       scaledReg       == other.scaledReg       &&
+	       zeroExtend      == other.zeroExtend      &&
+	       signExtend      == other.signExtend      &&
+	       hasImmediate    == other.hasImmediate    &&
+	       isMemoryWrite   == other.isMemoryWrite   &&
+	       byteSwap        == other.byteSwap        &&
+	       immediate       == other.immediate       &&
+	       displacement    == other.displacement;
+}
diff --git a/Source/Core/Common/x64Analyzer.h b/Source/Core/Common/x64Analyzer.h
new file mode 100644
index 0000000000..08faa25957
--- /dev/null
+++ b/Source/Core/Common/x64Analyzer.h
@@ -0,0 +1,44 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+struct InstructionInfo
+{
+	int operandSize; //8, 16, 32, 64
+	int instructionSize;
+	int regOperandReg;
+	int otherReg;
+	int scaledReg;
+	bool zeroExtend;
+	bool signExtend;
+	bool hasImmediate;
+	bool isMemoryWrite;
+	bool byteSwap;
+	u64 immediate;
+	s32 displacement;
+
+	bool operator==(const InstructionInfo &other) const;
+};
+
+struct ModRM
+{
+	int mod, reg, rm;
+	ModRM(u8 modRM, u8 rex)
+	{
+		mod = modRM >> 6;
+		reg = ((modRM >> 3) & 7) | ((rex & 4) ? 8 : 0);
+		rm = modRM & 7;
+	}
+};
+
+enum AccessType
+{
+	OP_ACCESS_READ = 0,
+	OP_ACCESS_WRITE = 1
+};
+
+bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info);
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp
new file mode 100644
index 0000000000..0e9f32e622
--- /dev/null
+++ b/Source/Core/Common/x64CPUDetect.cpp
@@ -0,0 +1,243 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/Intrinsics.h"
+
+#ifndef _WIN32
+
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#endif
+
+static inline void __cpuidex(int info[4], int function_id, int subfunction_id)
+{
+#ifdef __FreeBSD__
+	// Despite the name, this is just do_cpuid() with ECX as second input.
+	cpuid_count((u_int)function_id, (u_int)subfunction_id, (u_int*)info);
+#else
+	info[0] = function_id;    // eax
+	info[2] = subfunction_id; // ecx
+	__asm__(
+		"cpuid"
+		: "=a" (info[0]),
+		  "=b" (info[1]),
+		  "=c" (info[2]),
+		  "=d" (info[3])
+		: "a" (function_id),
+		  "c" (subfunction_id)
+	);
+#endif
+}
+
+static inline void __cpuid(int info[4], int function_id)
+{
+	return __cpuidex(info, function_id, 0);
+}
+
+#define _XCR_XFEATURE_ENABLED_MASK 0
+static u64 _xgetbv(u32 index)
+{
+	u32 eax, edx;
+	__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
+	return ((u64)edx << 32) | eax;
+}
+
+#endif // ifndef _WIN32
+
+CPUInfo cpu_info;
+
+CPUInfo::CPUInfo()
+{
+	Detect();
+}
+
+// Detects the various CPU features
+void CPUInfo::Detect()
+{
+	memset(this, 0, sizeof(*this));
+#ifdef _M_X86_64
+	Mode64bit = true;
+	OS64bit = true;
+#endif
+	num_cores = 1;
+
+	// Set obvious defaults, for extra safety
+	if (Mode64bit)
+	{
+		bSSE = true;
+		bSSE2 = true;
+		bLongMode = true;
+	}
+
+	// Assume CPU supports the CPUID instruction. Those that don't can barely
+	// boot modern OS:es anyway.
+	int cpu_id[4];
+	memset(brand_string, 0, sizeof(brand_string));
+
+	// Detect CPU's CPUID capabilities, and grab CPU string
+	__cpuid(cpu_id, 0x00000000);
+	u32 max_std_fn = cpu_id[0];  // EAX
+	*((int *)brand_string) = cpu_id[1];
+	*((int *)(brand_string + 4)) = cpu_id[3];
+	*((int *)(brand_string + 8)) = cpu_id[2];
+	__cpuid(cpu_id, 0x80000000);
+	u32 max_ex_fn = cpu_id[0];
+	if (!strcmp(brand_string, "GenuineIntel"))
+		vendor = VENDOR_INTEL;
+	else if (!strcmp(brand_string, "AuthenticAMD"))
+		vendor = VENDOR_AMD;
+	else
+		vendor = VENDOR_OTHER;
+
+	// Set reasonable default brand string even if brand string not available.
+	strcpy(cpu_string, brand_string);
+
+	// Detect family and other misc stuff.
+	bool ht = false;
+	HTT = ht;
+	logical_cpu_count = 1;
+	if (max_std_fn >= 1)
+	{
+		__cpuid(cpu_id, 0x00000001);
+		int family = ((cpu_id[0] >> 8) & 0xf) + ((cpu_id[0] >> 20) & 0xff);
+		int model = ((cpu_id[0] >> 4) & 0xf) + ((cpu_id[0] >> 12) & 0xf0);
+		// Detect people unfortunate enough to be running Dolphin on an Atom
+		if (family == 6 && (model == 0x1C || model == 0x26 ||model == 0x27 || model == 0x35 || model == 0x36 ||
+		                    model == 0x37 || model == 0x4A || model == 0x4D || model == 0x5A || model == 0x5D))
+			bAtom = true;
+		logical_cpu_count = (cpu_id[1] >> 16) & 0xFF;
+		ht = (cpu_id[3] >> 28) & 1;
+
+		if ((cpu_id[3] >> 25) & 1) bSSE = true;
+		if ((cpu_id[3] >> 26) & 1) bSSE2 = true;
+		if ((cpu_id[2])       & 1) bSSE3 = true;
+		if ((cpu_id[2] >> 9)  & 1) bSSSE3 = true;
+		if ((cpu_id[2] >> 19) & 1) bSSE4_1 = true;
+		if ((cpu_id[2] >> 20) & 1) bSSE4_2 = true;
+		if ((cpu_id[2] >> 22) & 1) bMOVBE = true;
+		if ((cpu_id[2] >> 25) & 1) bAES = true;
+
+		if ((cpu_id[3] >> 24) & 1)
+		{
+			// We can use FXSAVE.
+			bFXSR = true;
+		}
+
+		// AVX support requires 3 separate checks:
+		//  - Is the AVX bit set in CPUID?
+		//  - Is the XSAVE bit set in CPUID?
+		//  - XGETBV result has the XCR bit set.
+		if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
+		{
+			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
+			{
+				bAVX = true;
+				if ((cpu_id[2] >> 12) & 1)
+					bFMA = true;
+			}
+		}
+
+		if (max_std_fn >= 7)
+		{
+			__cpuidex(cpu_id, 0x00000007, 0x00000000);
+			// careful; we can't enable AVX2 unless the XSAVE/XGETBV checks above passed
+			if ((cpu_id[1] >> 5) & 1)
+				bAVX2 = bAVX;
+			if ((cpu_id[1] >> 3) & 1)
+				bBMI1 = true;
+			if ((cpu_id[1] >> 8) & 1)
+				bBMI2 = true;
+		}
+	}
+
+	bFlushToZero = bSSE;
+
+	if (max_ex_fn >= 0x80000004)
+	{
+		// Extract CPU model string
+		__cpuid(cpu_id, 0x80000002);
+		memcpy(cpu_string, cpu_id, sizeof(cpu_id));
+		__cpuid(cpu_id, 0x80000003);
+		memcpy(cpu_string + 16, cpu_id, sizeof(cpu_id));
+		__cpuid(cpu_id, 0x80000004);
+		memcpy(cpu_string + 32, cpu_id, sizeof(cpu_id));
+	}
+	if (max_ex_fn >= 0x80000001)
+	{
+		// Check for more features.
+		__cpuid(cpu_id, 0x80000001);
+		if (cpu_id[2] & 1) bLAHFSAHF64 = true;
+		if ((cpu_id[2] >> 5) & 1) bLZCNT = true;
+		if ((cpu_id[2] >> 16) & 1) bFMA4 = true;
+		if ((cpu_id[3] >> 29) & 1) bLongMode = true;
+	}
+
+	num_cores = (logical_cpu_count == 0) ? 1 : logical_cpu_count;
+
+	if (max_ex_fn >= 0x80000008)
+	{
+		// Get number of cores. This is a bit complicated. Following AMD manual here.
+		__cpuid(cpu_id, 0x80000008);
+		int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
+		if (apic_id_core_id_size == 0)
+		{
+			if (ht)
+			{
+				// New mechanism for modern Intel CPUs.
+				if (vendor == VENDOR_INTEL)
+				{
+					__cpuidex(cpu_id, 0x00000004, 0x00000000);
+					int cores_x_package = ((cpu_id[0] >> 26) & 0x3F) + 1;
+					HTT = (cores_x_package < logical_cpu_count);
+					cores_x_package = ((logical_cpu_count % cores_x_package) == 0) ? cores_x_package : 1;
+					num_cores = (cores_x_package > 1) ? cores_x_package : num_cores;
+					logical_cpu_count /= cores_x_package;
+				}
+			}
+		}
+		else
+		{
+			// Use AMD's new method.
+			num_cores = (cpu_id[2] & 0xFF) + 1;
+		}
+	}
+}
+
+// Turn the CPU info into a string we can show
+std::string CPUInfo::Summarize()
+{
+	std::string sum(cpu_string);
+	sum += " (";
+	sum += brand_string;
+	sum += ")";
+
+	if (bSSE) sum += ", SSE";
+	if (bSSE2)
+	{
+		sum += ", SSE2";
+		if (!bFlushToZero)
+			sum += " (but not DAZ!)";
+	}
+	if (bSSE3) sum += ", SSE3";
+	if (bSSSE3) sum += ", SSSE3";
+	if (bSSE4_1) sum += ", SSE4.1";
+	if (bSSE4_2) sum += ", SSE4.2";
+	if (HTT) sum += ", HTT";
+	if (bAVX) sum += ", AVX";
+	if (bAVX2) sum += ", AVX2";
+	if (bBMI1) sum += ", BMI1";
+	if (bBMI2) sum += ", BMI2";
+	if (bFMA) sum += ", FMA";
+	if (bAES) sum += ", AES";
+	if (bMOVBE) sum += ", MOVBE";
+	if (bLongMode) sum += ", 64-bit support";
+	return sum;
+}
+
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
new file mode 100644
index 0000000000..1c1a8b9754
--- /dev/null
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -0,0 +1,2120 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/x64Emitter.h"
+#include "Common/Logging/Log.h"
+
+namespace Gen
+{
+
+// TODO(ector): Add EAX special casing, for ever so slightly smaller code.
+struct NormalOpDef
+{
+	u8 toRm8, toRm32, fromRm8, fromRm32, imm8, imm32, simm8, eaximm8, eaximm32, ext;
+};
+
+// 0xCC is code for invalid combination of immediates
+static const NormalOpDef normalops[11] =
+{
+	{0x00, 0x01, 0x02, 0x03, 0x80, 0x81, 0x83, 0x04, 0x05, 0}, //ADD
+	{0x10, 0x11, 0x12, 0x13, 0x80, 0x81, 0x83, 0x14, 0x15, 2}, //ADC
+
+	{0x28, 0x29, 0x2A, 0x2B, 0x80, 0x81, 0x83, 0x2C, 0x2D, 5}, //SUB
+	{0x18, 0x19, 0x1A, 0x1B, 0x80, 0x81, 0x83, 0x1C, 0x1D, 3}, //SBB
+
+	{0x20, 0x21, 0x22, 0x23, 0x80, 0x81, 0x83, 0x24, 0x25, 4}, //AND
+	{0x08, 0x09, 0x0A, 0x0B, 0x80, 0x81, 0x83, 0x0C, 0x0D, 1}, //OR
+
+	{0x30, 0x31, 0x32, 0x33, 0x80, 0x81, 0x83, 0x34, 0x35, 6}, //XOR
+	{0x88, 0x89, 0x8A, 0x8B, 0xC6, 0xC7, 0xCC, 0xCC, 0xCC, 0}, //MOV
+
+	{0x84, 0x85, 0x84, 0x85, 0xF6, 0xF7, 0xCC, 0xA8, 0xA9, 0}, //TEST (to == from)
+	{0x38, 0x39, 0x3A, 0x3B, 0x80, 0x81, 0x83, 0x3C, 0x3D, 7}, //CMP
+
+	{0x86, 0x87, 0x86, 0x87, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 7}, //XCHG
+};
+
+enum NormalSSEOps
+{
+	sseCMP         = 0xC2,
+	sseADD         = 0x58, //ADD
+	sseSUB         = 0x5C, //SUB
+	sseAND         = 0x54, //AND
+	sseANDN        = 0x55, //ANDN
+	sseOR          = 0x56,
+	sseXOR         = 0x57,
+	sseMUL         = 0x59, //MUL
+	sseDIV         = 0x5E, //DIV
+	sseMIN         = 0x5D, //MIN
+	sseMAX         = 0x5F, //MAX
+	sseCOMIS       = 0x2F, //COMIS
+	sseUCOMIS      = 0x2E, //UCOMIS
+	sseSQRT        = 0x51, //SQRT
+	sseRSQRT       = 0x52, //RSQRT (NO DOUBLE PRECISION!!!)
+	sseMOVAPfromRM = 0x28, //MOVAP from RM
+	sseMOVAPtoRM   = 0x29, //MOVAP to RM
+	sseMOVUPfromRM = 0x10, //MOVUP from RM
+	sseMOVUPtoRM   = 0x11, //MOVUP to RM
+	sseMOVLPfromRM = 0x12,
+	sseMOVLPtoRM   = 0x13,
+	sseMOVHPfromRM = 0x16,
+	sseMOVHPtoRM   = 0x17,
+	sseMOVHLPS     = 0x12,
+	sseMOVLHPS     = 0x16,
+	sseMOVDQfromRM = 0x6F,
+	sseMOVDQtoRM   = 0x7F,
+	sseMASKMOVDQU  = 0xF7,
+	sseLDDQU       = 0xF0,
+	sseSHUF        = 0xC6,
+	sseMOVNTDQ     = 0xE7,
+	sseMOVNTP      = 0x2B,
+};
+
+
+void XEmitter::SetCodePtr(u8* ptr)
+{
+	code = ptr;
+}
+
+const u8* XEmitter::GetCodePtr() const
+{
+	return code;
+}
+
+u8* XEmitter::GetWritableCodePtr()
+{
+	return code;
+}
+
+void XEmitter::ReserveCodeSpace(int bytes)
+{
+	for (int i = 0; i < bytes; i++)
+		*code++ = 0xCC;
+}
+
+const u8* XEmitter::AlignCode4()
+{
+	int c = int((u64)code & 3);
+	if (c)
+		ReserveCodeSpace(4-c);
+	return code;
+}
+
+const u8* XEmitter::AlignCode16()
+{
+	int c = int((u64)code & 15);
+	if (c)
+		ReserveCodeSpace(16-c);
+	return code;
+}
+
+const u8* XEmitter::AlignCodePage()
+{
+	int c = int((u64)code & 4095);
+	if (c)
+		ReserveCodeSpace(4096-c);
+	return code;
+}
+
+// This operation modifies flags; check to see the flags are locked.
+// If the flags are locked, we should immediately and loudly fail before
+// causing a subtle JIT bug.
+void XEmitter::CheckFlags()
+{
+	_assert_msg_(DYNA_REC, !flags_locked, "Attempt to modify flags while flags locked!");
+}
+
+void XEmitter::WriteModRM(int mod, int reg, int rm)
+{
+	Write8((u8)((mod << 6) | ((reg & 7) << 3) | (rm & 7)));
+}
+
+void XEmitter::WriteSIB(int scale, int index, int base)
+{
+	Write8((u8)((scale << 6) | ((index & 7) << 3) | (base & 7)));
+}
+
+void OpArg::WriteREX(XEmitter* emit, int opBits, int bits, int customOp) const
+{
+	if (customOp == -1)       customOp = operandReg;
+	u8 op = 0x40;
+	// REX.W (whether operation is a 64-bit operation)
+	if (opBits == 64)         op |= 8;
+	// REX.R (whether ModR/M reg field refers to R8-R15.
+	if (customOp & 8)         op |= 4;
+	// REX.X (whether ModR/M SIB index field refers to R8-R15)
+	if (indexReg & 8)         op |= 2;
+	// REX.B (whether ModR/M rm or SIB base or opcode reg field refers to R8-R15)
+	if (offsetOrBaseReg & 8)  op |= 1;
+	// Write REX if wr have REX bits to write, or if the operation accesses
+	// SIL, DIL, BPL, or SPL.
+	if (op != 0x40 ||
+	    (scale == SCALE_NONE && bits == 8 && (offsetOrBaseReg & 0x10c) == 4) ||
+	    (opBits == 8 && (customOp & 0x10c) == 4))
+	{
+		emit->Write8(op);
+		// Check the operation doesn't access AH, BH, CH, or DH.
+		_dbg_assert_(DYNA_REC, (offsetOrBaseReg & 0x100) == 0);
+		_dbg_assert_(DYNA_REC, (customOp & 0x100) == 0);
+	}
+}
+
+void OpArg::WriteVEX(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp, int mmmmm, int W) const
+{
+	int R = !(regOp1 & 8);
+	int X = !(indexReg & 8);
+	int B = !(offsetOrBaseReg & 8);
+
+	int vvvv = (regOp2 == X64Reg::INVALID_REG) ? 0xf : (regOp2 ^ 0xf);
+
+	// do we need any VEX fields that only appear in the three-byte form?
+	if (X == 1 && B == 1 && W == 0 && mmmmm == 1)
+	{
+		u8 RvvvvLpp = (R << 7) | (vvvv << 3) | (L << 2) | pp;
+		emit->Write8(0xC5);
+		emit->Write8(RvvvvLpp);
+	}
+	else
+	{
+		u8 RXBmmmmm = (R << 7) | (X << 6) | (B << 5) | mmmmm;
+		u8 WvvvvLpp = (W << 7) | (vvvv << 3) | (L << 2) | pp;
+		emit->Write8(0xC4);
+		emit->Write8(RXBmmmmm);
+		emit->Write8(WvvvvLpp);
+	}
+}
+
+void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
+	bool warn_64bit_offset) const
+{
+	if (_operandReg == INVALID_REG)
+		_operandReg = (X64Reg)this->operandReg;
+	int mod = 0;
+	int ireg = indexReg;
+	bool SIB = false;
+	int _offsetOrBaseReg = this->offsetOrBaseReg;
+
+	if (scale == SCALE_RIP) //Also, on 32-bit, just an immediate address
+	{
+		// Oh, RIP addressing.
+		_offsetOrBaseReg = 5;
+		emit->WriteModRM(0, _operandReg, _offsetOrBaseReg);
+		//TODO : add some checks
+		u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes;
+		s64 distance = (s64)offset - (s64)ripAddr;
+		_assert_msg_(DYNA_REC,
+		             (distance < 0x80000000LL &&
+		              distance >=  -0x80000000LL) ||
+		             !warn_64bit_offset,
+		             "WriteRest: op out of range (0x%" PRIx64 " uses 0x%" PRIx64 ")",
+		             ripAddr, offset);
+		s32 offs = (s32)distance;
+		emit->Write32((u32)offs);
+		return;
+	}
+
+	if (scale == 0)
+	{
+		// Oh, no memory, Just a reg.
+		mod = 3; //11
+	}
+	else
+	{
+		//Ah good, no scaling.
+		if (scale == SCALE_ATREG && !((_offsetOrBaseReg & 7) == 4 || (_offsetOrBaseReg & 7) == 5))
+		{
+			//Okay, we're good. No SIB necessary.
+			int ioff = (int)offset;
+			if (ioff == 0)
+			{
+				mod = 0;
+			}
+			else if (ioff<-128 || ioff>127)
+			{
+				mod = 2; //32-bit displacement
+			}
+			else
+			{
+				mod = 1; //8-bit displacement
+			}
+		}
+		else if (scale >= SCALE_NOBASE_2 && scale <= SCALE_NOBASE_8)
+		{
+			SIB = true;
+			mod = 0;
+			_offsetOrBaseReg = 5;
+		}
+		else
+		{
+			if ((_offsetOrBaseReg & 7) == 4) //this would occupy the SIB encoding :(
+			{
+				//So we have to fake it with SIB encoding :(
+				SIB = true;
+			}
+
+			if (scale >= SCALE_1 && scale < SCALE_ATREG)
+			{
+				SIB = true;
+			}
+
+			if (scale == SCALE_ATREG && ((_offsetOrBaseReg & 7) == 4))
+			{
+				SIB = true;
+				ireg = _offsetOrBaseReg;
+			}
+
+			//Okay, we're fine. Just disp encoding.
+			//We need displacement. Which size?
+			int ioff = (int)(s64)offset;
+			if (ioff < -128 || ioff > 127)
+			{
+				mod = 2; //32-bit displacement
+			}
+			else
+			{
+				mod = 1; //8-bit displacement
+			}
+		}
+	}
+
+	// Okay. Time to do the actual writing
+	// ModRM byte:
+	int oreg = _offsetOrBaseReg;
+	if (SIB)
+		oreg = 4;
+
+	emit->WriteModRM(mod, _operandReg&7, oreg&7);
+
+	if (SIB)
+	{
+		//SIB byte
+		int ss;
+		switch (scale)
+		{
+		case SCALE_NONE: _offsetOrBaseReg = 4; ss = 0; break; //RSP
+		case SCALE_1: ss = 0; break;
+		case SCALE_2: ss = 1; break;
+		case SCALE_4: ss = 2; break;
+		case SCALE_8: ss = 3; break;
+		case SCALE_NOBASE_2: ss = 1; break;
+		case SCALE_NOBASE_4: ss = 2; break;
+		case SCALE_NOBASE_8: ss = 3; break;
+		case SCALE_ATREG: ss = 0; break;
+		default: _assert_msg_(DYNA_REC, 0, "Invalid scale for SIB byte"); ss = 0; break;
+		}
+		emit->Write8((u8)((ss << 6) | ((ireg&7)<<3) | (_offsetOrBaseReg&7)));
+	}
+
+	if (mod == 1) //8-bit disp
+	{
+		emit->Write8((u8)(s8)(s32)offset);
+	}
+	else if (mod == 2 || (scale >= SCALE_NOBASE_2 && scale <= SCALE_NOBASE_8)) //32-bit disp
+	{
+		emit->Write32((u32)offset);
+	}
+}
+
+// W = operand extended width (1 if 64-bit)
+// R = register# upper bit
+// X = scale amnt upper bit
+// B = base register# upper bit
+void XEmitter::Rex(int w, int r, int x, int b)
+{
+	w = w ? 1 : 0;
+	r = r ? 1 : 0;
+	x = x ? 1 : 0;
+	b = b ? 1 : 0;
+	u8 rx = (u8)(0x40 | (w << 3) | (r << 2) | (x << 1) | (b));
+	if (rx != 0x40)
+		Write8(rx);
+}
+
+void XEmitter::JMP(const u8* addr, bool force5Bytes)
+{
+	u64 fn = (u64)addr;
+	if (!force5Bytes)
+	{
+		s64 distance = (s64)(fn - ((u64)code + 2));
+		_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80,
+			     "Jump target too far away, needs force5Bytes = true");
+		//8 bits will do
+		Write8(0xEB);
+		Write8((u8)(s8)distance);
+	}
+	else
+	{
+		s64 distance = (s64)(fn - ((u64)code + 5));
+
+		_assert_msg_(DYNA_REC,
+		             distance >= -0x80000000LL && distance < 0x80000000LL,
+		             "Jump target too far away, needs indirect register");
+		Write8(0xE9);
+		Write32((u32)(s32)distance);
+	}
+}
+
+void XEmitter::JMPptr(const OpArg& arg2)
+{
+	OpArg arg = arg2;
+	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "JMPptr - Imm argument");
+	arg.operandReg = 4;
+	arg.WriteREX(this, 0, 0);
+	Write8(0xFF);
+	arg.WriteRest(this);
+}
+
+//Can be used to trap other processors, before overwriting their code
+// not used in Dolphin
+void XEmitter::JMPself()
+{
+	Write8(0xEB);
+	Write8(0xFE);
+}
+
+void XEmitter::CALLptr(OpArg arg)
+{
+	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "CALLptr - Imm argument");
+	arg.operandReg = 2;
+	arg.WriteREX(this, 0, 0);
+	Write8(0xFF);
+	arg.WriteRest(this);
+}
+
+void XEmitter::CALL(const void* fnptr)
+{
+	u64 distance = u64(fnptr) - (u64(code) + 5);
+	_assert_msg_(DYNA_REC,
+	             distance < 0x0000000080000000ULL ||
+	             distance >=  0xFFFFFFFF80000000ULL,
+	             "CALL out of range (%p calls %p)", code, fnptr);
+	Write8(0xE8);
+	Write32(u32(distance));
+}
+
+FixupBranch XEmitter::J(bool force5bytes)
+{
+	FixupBranch branch;
+	branch.type = force5bytes ? 1 : 0;
+	branch.ptr = code + (force5bytes ? 5 : 2);
+	if (!force5bytes)
+	{
+		//8 bits will do
+		Write8(0xEB);
+		Write8(0);
+	}
+	else
+	{
+		Write8(0xE9);
+		Write32(0);
+	}
+	return branch;
+}
+
+FixupBranch XEmitter::J_CC(CCFlags conditionCode, bool force5bytes)
+{
+	FixupBranch branch;
+	branch.type = force5bytes ? 1 : 0;
+	branch.ptr = code + (force5bytes ? 6 : 2);
+	if (!force5bytes)
+	{
+		//8 bits will do
+		Write8(0x70 + conditionCode);
+		Write8(0);
+	}
+	else
+	{
+		Write8(0x0F);
+		Write8(0x80 + conditionCode);
+		Write32(0);
+	}
+	return branch;
+}
+
+void XEmitter::J_CC(CCFlags conditionCode, const u8* addr)
+{
+	u64 fn = (u64)addr;
+	s64 distance = (s64)(fn - ((u64)code + 2));
+	if (distance < -0x80 || distance >= 0x80)
+	{
+		distance = (s64)(fn - ((u64)code + 6));
+		_assert_msg_(DYNA_REC,
+		             distance >= -0x80000000LL && distance < 0x80000000LL,
+		             "Jump target too far away, needs indirect register");
+		Write8(0x0F);
+		Write8(0x80 + conditionCode);
+		Write32((u32)(s32)distance);
+	}
+	else
+	{
+		Write8(0x70 + conditionCode);
+		Write8((u8)(s8)distance);
+	}
+}
+
+void XEmitter::SetJumpTarget(const FixupBranch& branch)
+{
+	if (branch.type == 0)
+	{
+		s64 distance = (s64)(code - branch.ptr);
+		_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80, "Jump target too far away, needs force5Bytes = true");
+		branch.ptr[-1] = (u8)(s8)distance;
+	}
+	else if (branch.type == 1)
+	{
+		s64 distance = (s64)(code - branch.ptr);
+		_assert_msg_(DYNA_REC, distance >= -0x80000000LL && distance < 0x80000000LL, "Jump target too far away, needs indirect register");
+		((s32*)branch.ptr)[-1] = (s32)distance;
+	}
+}
+
+// INC/DEC considered harmful on newer CPUs due to partial flag set.
+// Use ADD, SUB instead.
+
+/*
+void XEmitter::INC(int bits, OpArg arg)
+{
+	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "INC - Imm argument");
+	arg.operandReg = 0;
+	if (bits == 16) {Write8(0x66);}
+	arg.WriteREX(this, bits, bits);
+	Write8(bits == 8 ? 0xFE : 0xFF);
+	arg.WriteRest(this);
+}
+void XEmitter::DEC(int bits, OpArg arg)
+{
+	if (arg.IsImm()) _assert_msg_(DYNA_REC, 0, "DEC - Imm argument");
+	arg.operandReg = 1;
+	if (bits == 16) {Write8(0x66);}
+	arg.WriteREX(this, bits, bits);
+	Write8(bits == 8 ? 0xFE : 0xFF);
+	arg.WriteRest(this);
+}
+*/
+
+//Single byte opcodes
+//There is no PUSHAD/POPAD in 64-bit mode.
+void XEmitter::INT3() {Write8(0xCC);}
+void XEmitter::RET()  {Write8(0xC3);}
+void XEmitter::RET_FAST()  {Write8(0xF3); Write8(0xC3);} //two-byte return (rep ret) - recommended by AMD optimization manual for the case of jumping to a ret
+
+// The first sign of decadence: optimized NOPs.
+void XEmitter::NOP(size_t size)
+{
+	_dbg_assert_(DYNA_REC, (int)size > 0);
+	while (true)
+	{
+		switch (size)
+		{
+		case 0:
+			return;
+		case 1:
+			Write8(0x90);
+			return;
+		case 2:
+			Write8(0x66); Write8(0x90);
+			return;
+		case 3:
+			Write8(0x0F); Write8(0x1F); Write8(0x00);
+			return;
+		case 4:
+			Write8(0x0F); Write8(0x1F); Write8(0x40); Write8(0x00);
+			return;
+		case 5:
+			Write8(0x0F); Write8(0x1F); Write8(0x44); Write8(0x00);
+			Write8(0x00);
+			return;
+		case 6:
+			Write8(0x66); Write8(0x0F); Write8(0x1F); Write8(0x44);
+			Write8(0x00); Write8(0x00);
+			return;
+		case 7:
+			Write8(0x0F); Write8(0x1F); Write8(0x80); Write8(0x00);
+			Write8(0x00); Write8(0x00); Write8(0x00);
+			return;
+		case 8:
+			Write8(0x0F); Write8(0x1F); Write8(0x84); Write8(0x00);
+			Write8(0x00); Write8(0x00); Write8(0x00); Write8(0x00);
+			return;
+		case 9:
+			Write8(0x66); Write8(0x0F); Write8(0x1F); Write8(0x84);
+			Write8(0x00); Write8(0x00); Write8(0x00); Write8(0x00);
+			Write8(0x00);
+			return;
+		case 10:
+			Write8(0x66); Write8(0x66); Write8(0x0F); Write8(0x1F);
+			Write8(0x84); Write8(0x00); Write8(0x00); Write8(0x00);
+			Write8(0x00); Write8(0x00);
+			return;
+		default:
+			// Even though x86 instructions are allowed to be up to 15 bytes long,
+			// AMD advises against using NOPs longer than 11 bytes because they
+			// carry a performance penalty on CPUs older than AMD family 16h.
+			Write8(0x66); Write8(0x66); Write8(0x66); Write8(0x0F);
+			Write8(0x1F); Write8(0x84); Write8(0x00); Write8(0x00);
+			Write8(0x00); Write8(0x00); Write8(0x00);
+			size -= 11;
+			continue;
+		}
+	}
+}
+
+void XEmitter::PAUSE() {Write8(0xF3); NOP();} //use in tight spinloops for energy saving on some CPU
+void XEmitter::CLC()  {CheckFlags(); Write8(0xF8);} //clear carry
+void XEmitter::CMC()  {CheckFlags(); Write8(0xF5);} //flip carry
+void XEmitter::STC()  {CheckFlags(); Write8(0xF9);} //set carry
+
+//TODO: xchg ah, al ???
+void XEmitter::XCHG_AHAL()
+{
+	Write8(0x86);
+	Write8(0xe0);
+	// alt. 86 c4
+}
+
+//These two can not be executed on early Intel 64-bit CPU:s, only on AMD!
+void XEmitter::LAHF() {Write8(0x9F);}
+void XEmitter::SAHF() {CheckFlags(); Write8(0x9E);}
+
+void XEmitter::PUSHF() {Write8(0x9C);}
+void XEmitter::POPF()  {CheckFlags(); Write8(0x9D);}
+
+void XEmitter::LFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xE8);}
+void XEmitter::MFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xF0);}
+void XEmitter::SFENCE() {Write8(0x0F); Write8(0xAE); Write8(0xF8);}
+
+void XEmitter::WriteSimple1Byte(int bits, u8 byte, X64Reg reg)
+{
+	if (bits == 16)
+		Write8(0x66);
+	Rex(bits == 64, 0, 0, (int)reg >> 3);
+	Write8(byte + ((int)reg & 7));
+}
+
+void XEmitter::WriteSimple2Byte(int bits, u8 byte1, u8 byte2, X64Reg reg)
+{
+	if (bits == 16)
+		Write8(0x66);
+	Rex(bits==64, 0, 0, (int)reg >> 3);
+	Write8(byte1);
+	Write8(byte2 + ((int)reg & 7));
+}
+
+void XEmitter::CWD(int bits)
+{
+	if (bits == 16)
+		Write8(0x66);
+	Rex(bits == 64, 0, 0, 0);
+	Write8(0x99);
+}
+
+void XEmitter::CBW(int bits)
+{
+	if (bits == 8)
+		Write8(0x66);
+	Rex(bits == 32, 0, 0, 0);
+	Write8(0x98);
+}
+
+//Simple opcodes
+
+
+//push/pop do not need wide to be 64-bit
+void XEmitter::PUSH(X64Reg reg) {WriteSimple1Byte(32, 0x50, reg);}
+void XEmitter::POP(X64Reg reg)  {WriteSimple1Byte(32, 0x58, reg);}
+
+void XEmitter::PUSH(int bits, const OpArg& reg)
+{
+	if (reg.IsSimpleReg())
+		PUSH(reg.GetSimpleReg());
+	else if (reg.IsImm())
+	{
+		switch (reg.GetImmBits())
+		{
+		case 8:
+			Write8(0x6A);
+			Write8((u8)(s8)reg.offset);
+			break;
+		case 16:
+			Write8(0x66);
+			Write8(0x68);
+			Write16((u16)(s16)(s32)reg.offset);
+			break;
+		case 32:
+			Write8(0x68);
+			Write32((u32)reg.offset);
+			break;
+		default:
+			_assert_msg_(DYNA_REC, 0, "PUSH - Bad imm bits");
+			break;
+		}
+	}
+	else
+	{
+		if (bits == 16)
+			Write8(0x66);
+		reg.WriteREX(this, bits, bits);
+		Write8(0xFF);
+		reg.WriteRest(this, 0, (X64Reg)6);
+	}
+}
+
+void XEmitter::POP(int /*bits*/, const OpArg& reg)
+{
+	if (reg.IsSimpleReg())
+		POP(reg.GetSimpleReg());
+	else
+		_assert_msg_(DYNA_REC, 0, "POP - Unsupported encoding");
+}
+
+void XEmitter::BSWAP(int bits, X64Reg reg)
+{
+	if (bits >= 32)
+	{
+		WriteSimple2Byte(bits, 0x0F, 0xC8, reg);
+	}
+	else if (bits == 16)
+	{
+		ROL(16, R(reg), Imm8(8));
+	}
+	else if (bits == 8)
+	{
+		// Do nothing - can't bswap a single byte...
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, 0, "BSWAP - Wrong number of bits");
+	}
+}
+
+// Undefined opcode - reserved
+// If we ever need a way to always cause a non-breakpoint hard exception...
+void XEmitter::UD2()
+{
+	Write8(0x0F);
+	Write8(0x0B);
+}
+
+void XEmitter::PREFETCH(PrefetchLevel level, OpArg arg)
+{
+	_assert_msg_(DYNA_REC, !arg.IsImm(), "PREFETCH - Imm argument");
+	arg.operandReg = (u8)level;
+	arg.WriteREX(this, 0, 0);
+	Write8(0x0F);
+	Write8(0x18);
+	arg.WriteRest(this);
+}
+
+void XEmitter::SETcc(CCFlags flag, OpArg dest)
+{
+	_assert_msg_(DYNA_REC, !dest.IsImm(), "SETcc - Imm argument");
+	dest.operandReg = 0;
+	dest.WriteREX(this, 0, 8);
+	Write8(0x0F);
+	Write8(0x90 + (u8)flag);
+	dest.WriteRest(this);
+}
+
+void XEmitter::CMOVcc(int bits, X64Reg dest, OpArg src, CCFlags flag)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "CMOVcc - Imm argument");
+	_assert_msg_(DYNA_REC, bits != 8, "CMOVcc - 8 bits unsupported");
+	if (bits == 16)
+		Write8(0x66);
+	src.operandReg = dest;
+	src.WriteREX(this, bits, bits);
+	Write8(0x0F);
+	Write8(0x40 + (u8)flag);
+	src.WriteRest(this);
+}
+
+void XEmitter::WriteMulDivType(int bits, OpArg src, int ext)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "WriteMulDivType - Imm argument");
+	CheckFlags();
+	src.operandReg = ext;
+	if (bits == 16)
+		Write8(0x66);
+	src.WriteREX(this, bits, bits, 0);
+	if (bits == 8)
+	{
+		Write8(0xF6);
+	}
+	else
+	{
+		Write8(0xF7);
+	}
+	src.WriteRest(this);
+}
+
+void XEmitter::MUL(int bits, const OpArg& src)  {WriteMulDivType(bits, src, 4);}
+void XEmitter::DIV(int bits, const OpArg& src)  {WriteMulDivType(bits, src, 6);}
+void XEmitter::IMUL(int bits, const OpArg& src) {WriteMulDivType(bits, src, 5);}
+void XEmitter::IDIV(int bits, const OpArg& src) {WriteMulDivType(bits, src, 7);}
+void XEmitter::NEG(int bits, const OpArg& src)  {WriteMulDivType(bits, src, 3);}
+void XEmitter::NOT(int bits, const OpArg& src)  {WriteMulDivType(bits, src, 2);}
+
+void XEmitter::WriteBitSearchType(int bits, X64Reg dest, OpArg src, u8 byte2, bool rep)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "WriteBitSearchType - Imm argument");
+	CheckFlags();
+	src.operandReg = (u8)dest;
+	if (bits == 16)
+		Write8(0x66);
+	if (rep)
+		Write8(0xF3);
+	src.WriteREX(this, bits, bits);
+	Write8(0x0F);
+	Write8(byte2);
+	src.WriteRest(this);
+}
+
+void XEmitter::MOVNTI(int bits, const OpArg& dest, X64Reg src)
+{
+	if (bits <= 16)
+		_assert_msg_(DYNA_REC, 0, "MOVNTI - bits<=16");
+	WriteBitSearchType(bits, src, dest, 0xC3);
+}
+
+void XEmitter::BSF(int bits, X64Reg dest, const OpArg& src) {WriteBitSearchType(bits,dest,src,0xBC);} // Bottom bit to top bit
+void XEmitter::BSR(int bits, X64Reg dest, const OpArg& src) {WriteBitSearchType(bits,dest,src,0xBD);} // Top bit to bottom bit
+
+void XEmitter::TZCNT(int bits, X64Reg dest, const OpArg& src)
+{
+	CheckFlags();
+	if (!cpu_info.bBMI1)
+		PanicAlert("Trying to use BMI1 on a system that doesn't support it. Bad programmer.");
+	WriteBitSearchType(bits, dest, src, 0xBC, true);
+}
+void XEmitter::LZCNT(int bits, X64Reg dest, const OpArg& src)
+{
+	CheckFlags();
+	if (!cpu_info.bLZCNT)
+		PanicAlert("Trying to use LZCNT on a system that doesn't support it. Bad programmer.");
+	WriteBitSearchType(bits, dest, src, 0xBD, true);
+}
+
+void XEmitter::MOVSX(int dbits, int sbits, X64Reg dest, OpArg src)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "MOVSX - Imm argument");
+	if (dbits == sbits)
+	{
+		MOV(dbits, R(dest), src);
+		return;
+	}
+	src.operandReg = (u8)dest;
+	if (dbits == 16)
+		Write8(0x66);
+	src.WriteREX(this, dbits, sbits);
+	if (sbits == 8)
+	{
+		Write8(0x0F);
+		Write8(0xBE);
+	}
+	else if (sbits == 16)
+	{
+		Write8(0x0F);
+		Write8(0xBF);
+	}
+	else if (sbits == 32 && dbits == 64)
+	{
+		Write8(0x63);
+	}
+	else
+	{
+		Crash();
+	}
+	src.WriteRest(this);
+}
+
+void XEmitter::MOVZX(int dbits, int sbits, X64Reg dest, OpArg src)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "MOVZX - Imm argument");
+	if (dbits == sbits)
+	{
+		MOV(dbits, R(dest), src);
+		return;
+	}
+	src.operandReg = (u8)dest;
+	if (dbits == 16)
+		Write8(0x66);
+	//the 32bit result is automatically zero extended to 64bit
+	src.WriteREX(this, dbits == 64 ? 32 : dbits, sbits);
+	if (sbits == 8)
+	{
+		Write8(0x0F);
+		Write8(0xB6);
+	}
+	else if (sbits == 16)
+	{
+		Write8(0x0F);
+		Write8(0xB7);
+	}
+	else if (sbits == 32 && dbits == 64)
+	{
+		Write8(0x8B);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, 0, "MOVZX - Invalid size");
+	}
+	src.WriteRest(this);
+}
+
+void XEmitter::WriteMOVBE(int bits, u8 op, X64Reg reg, const OpArg& arg)
+{
+	_assert_msg_(DYNA_REC, cpu_info.bMOVBE, "Generating MOVBE on a system that does not support it.");
+	if (bits == 8)
+	{
+		MOV(8, op & 1 ? arg : R(reg), op & 1 ? R(reg) : arg);
+		return;
+	}
+	if (bits == 16)
+		Write8(0x66);
+	_assert_msg_(DYNA_REC, !arg.IsSimpleReg() && !arg.IsImm(), "MOVBE: need r<-m or m<-r!");
+	arg.WriteREX(this, bits, bits, reg);
+	Write8(0x0F);
+	Write8(0x38);
+	Write8(op);
+	arg.WriteRest(this, 0, reg);
+}
+void XEmitter::MOVBE(int bits, X64Reg dest, const OpArg& src) {WriteMOVBE(bits, 0xF0, dest, src);}
+void XEmitter::MOVBE(int bits, const OpArg& dest, X64Reg src) {WriteMOVBE(bits, 0xF1, src, dest);}
+
+void XEmitter::LoadAndSwap(int size, X64Reg dst, const OpArg& src)
+{
+	if (cpu_info.bMOVBE)
+	{
+		MOVBE(size, dst, src);
+	}
+	else
+	{
+		MOV(size, R(dst), src);
+		BSWAP(size, dst);
+	}
+}
+
+void XEmitter::SwapAndStore(int size, const OpArg& dst, X64Reg src)
+{
+	if (cpu_info.bMOVBE)
+	{
+		MOVBE(size, dst, src);
+	}
+	else
+	{
+		BSWAP(size, src);
+		MOV(size, dst, R(src));
+	}
+}
+
+
+void XEmitter::LEA(int bits, X64Reg dest, OpArg src)
+{
+	_assert_msg_(DYNA_REC, !src.IsImm(), "LEA - Imm argument");
+	src.operandReg = (u8)dest;
+	if (bits == 16)
+		Write8(0x66); //TODO: performance warning
+	src.WriteREX(this, bits, bits);
+	Write8(0x8D);
+	src.WriteRest(this, 0, INVALID_REG, bits == 64);
+}
+
+//shift can be either imm8 or cl
+void XEmitter::WriteShift(int bits, OpArg dest, const OpArg& shift, int ext)
+{
+	CheckFlags();
+	bool writeImm = false;
+	if (dest.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "WriteShift - can't shift imms");
+	}
+	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
+	{
+		_assert_msg_(DYNA_REC, 0, "WriteShift - illegal argument");
+	}
+	dest.operandReg = ext;
+	if (bits == 16)
+		Write8(0x66);
+	dest.WriteREX(this, bits, bits, 0);
+	if (shift.GetImmBits() == 8)
+	{
+		//ok an imm
+		u8 imm = (u8)shift.offset;
+		if (imm == 1)
+		{
+			Write8(bits == 8 ? 0xD0 : 0xD1);
+		}
+		else
+		{
+			writeImm = true;
+			Write8(bits == 8 ? 0xC0 : 0xC1);
+		}
+	}
+	else
+	{
+		Write8(bits == 8 ? 0xD2 : 0xD3);
+	}
+	dest.WriteRest(this, writeImm ? 1 : 0);
+	if (writeImm)
+		Write8((u8)shift.offset);
+}
+
+// large rotates and shift are slower on Intel than AMD
+// Intel likes to rotate by 1, and the op is smaller too
+void XEmitter::ROL(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 0);}
+void XEmitter::ROR(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 1);}
+void XEmitter::RCL(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 2);}
+void XEmitter::RCR(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 3);}
+void XEmitter::SHL(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 4);}
+void XEmitter::SHR(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 5);}
+void XEmitter::SAR(int bits, const OpArg& dest, const OpArg& shift) {WriteShift(bits, dest, shift, 7);}
+
+// index can be either imm8 or register, don't use memory destination because it's slow
+void XEmitter::WriteBitTest(int bits, const OpArg& dest, const OpArg& index, int ext)
+{
+	CheckFlags();
+	if (dest.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "WriteBitTest - can't test imms");
+	}
+	if ((index.IsImm() && index.GetImmBits() != 8))
+	{
+		_assert_msg_(DYNA_REC, 0, "WriteBitTest - illegal argument");
+	}
+	if (bits == 16)
+		Write8(0x66);
+	if (index.IsImm())
+	{
+		dest.WriteREX(this, bits, bits);
+		Write8(0x0F); Write8(0xBA);
+		dest.WriteRest(this, 1, (X64Reg)ext);
+		Write8((u8)index.offset);
+	}
+	else
+	{
+		X64Reg operand = index.GetSimpleReg();
+		dest.WriteREX(this, bits, bits, operand);
+		Write8(0x0F); Write8(0x83 + 8*ext);
+		dest.WriteRest(this, 1, operand);
+	}
+}
+
+void XEmitter::BT(int bits, const OpArg& dest, const OpArg& index)  {WriteBitTest(bits, dest, index, 4);}
+void XEmitter::BTS(int bits, const OpArg& dest, const OpArg& index) {WriteBitTest(bits, dest, index, 5);}
+void XEmitter::BTR(int bits, const OpArg& dest, const OpArg& index) {WriteBitTest(bits, dest, index, 6);}
+void XEmitter::BTC(int bits, const OpArg& dest, const OpArg& index) {WriteBitTest(bits, dest, index, 7);}
+
+//shift can be either imm8 or cl
+void XEmitter::SHRD(int bits, const OpArg& dest, const OpArg& src, const OpArg& shift)
+{
+	CheckFlags();
+	if (dest.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "SHRD - can't use imms as destination");
+	}
+	if (!src.IsSimpleReg())
+	{
+		_assert_msg_(DYNA_REC, 0, "SHRD - must use simple register as source");
+	}
+	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
+	{
+		_assert_msg_(DYNA_REC, 0, "SHRD - illegal shift");
+	}
+	if (bits == 16)
+		Write8(0x66);
+	X64Reg operand = src.GetSimpleReg();
+	dest.WriteREX(this, bits, bits, operand);
+	if (shift.GetImmBits() == 8)
+	{
+		Write8(0x0F); Write8(0xAC);
+		dest.WriteRest(this, 1, operand);
+		Write8((u8)shift.offset);
+	}
+	else
+	{
+		Write8(0x0F); Write8(0xAD);
+		dest.WriteRest(this, 0, operand);
+	}
+}
+
+void XEmitter::SHLD(int bits, const OpArg& dest, const OpArg& src, const OpArg& shift)
+{
+	CheckFlags();
+	if (dest.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "SHLD - can't use imms as destination");
+	}
+	if (!src.IsSimpleReg())
+	{
+		_assert_msg_(DYNA_REC, 0, "SHLD - must use simple register as source");
+	}
+	if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8))
+	{
+		_assert_msg_(DYNA_REC, 0, "SHLD - illegal shift");
+	}
+	if (bits == 16)
+		Write8(0x66);
+	X64Reg operand = src.GetSimpleReg();
+	dest.WriteREX(this, bits, bits, operand);
+	if (shift.GetImmBits() == 8)
+	{
+		Write8(0x0F); Write8(0xA4);
+		dest.WriteRest(this, 1, operand);
+		Write8((u8)shift.offset);
+	}
+	else
+	{
+		Write8(0x0F); Write8(0xA5);
+		dest.WriteRest(this, 0, operand);
+	}
+}
+
+void OpArg::WriteSingleByteOp(XEmitter* emit, u8 op, X64Reg _operandReg, int bits)
+{
+	if (bits == 16)
+		emit->Write8(0x66);
+
+	this->operandReg = (u8)_operandReg;
+	WriteREX(emit, bits, bits);
+	emit->Write8(op);
+	WriteRest(emit);
+}
+
+//operand can either be immediate or register
+void OpArg::WriteNormalOp(XEmitter* emit, bool toRM, NormalOp op, const OpArg& operand, int bits) const
+{
+	X64Reg _operandReg;
+	if (IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Imm argument, wrong order");
+	}
+
+	if (bits == 16)
+		emit->Write8(0x66);
+
+	int immToWrite = 0;
+
+	if (operand.IsImm())
+	{
+		WriteREX(emit, bits, bits);
+
+		if (!toRM)
+		{
+			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Writing to Imm (!toRM)");
+		}
+
+		if (operand.scale == SCALE_IMM8 && bits == 8)
+		{
+			// op al, imm8
+			if (!scale && offsetOrBaseReg == AL && normalops[op].eaximm8 != 0xCC)
+			{
+				emit->Write8(normalops[op].eaximm8);
+				emit->Write8((u8)operand.offset);
+				return;
+			}
+			// mov reg, imm8
+			if (!scale && op == nrmMOV)
+			{
+				emit->Write8(0xB0 + (offsetOrBaseReg & 7));
+				emit->Write8((u8)operand.offset);
+				return;
+			}
+			// op r/m8, imm8
+			emit->Write8(normalops[op].imm8);
+			immToWrite = 8;
+		}
+		else if ((operand.scale == SCALE_IMM16 && bits == 16) ||
+				 (operand.scale == SCALE_IMM32 && bits == 32) ||
+				 (operand.scale == SCALE_IMM32 && bits == 64))
+		{
+			// Try to save immediate size if we can, but first check to see
+			// if the instruction supports simm8.
+			// op r/m, imm8
+			if (normalops[op].simm8 != 0xCC &&
+			    ((operand.scale == SCALE_IMM16 && (s16)operand.offset == (s8)operand.offset) ||
+			     (operand.scale == SCALE_IMM32 && (s32)operand.offset == (s8)operand.offset)))
+			{
+				emit->Write8(normalops[op].simm8);
+				immToWrite = 8;
+			}
+			else
+			{
+				// mov reg, imm
+				if (!scale && op == nrmMOV && bits != 64)
+				{
+					emit->Write8(0xB8 + (offsetOrBaseReg & 7));
+					if (bits == 16)
+						emit->Write16((u16)operand.offset);
+					else
+						emit->Write32((u32)operand.offset);
+					return;
+				}
+				// op eax, imm
+				if (!scale && offsetOrBaseReg == EAX && normalops[op].eaximm32 != 0xCC)
+				{
+					emit->Write8(normalops[op].eaximm32);
+					if (bits == 16)
+						emit->Write16((u16)operand.offset);
+					else
+						emit->Write32((u32)operand.offset);
+					return;
+				}
+				// op r/m, imm
+				emit->Write8(normalops[op].imm32);
+				immToWrite = bits == 16 ? 16 : 32;
+			}
+		}
+		else if ((operand.scale == SCALE_IMM8 && bits == 16) ||
+				 (operand.scale == SCALE_IMM8 && bits == 32) ||
+				 (operand.scale == SCALE_IMM8 && bits == 64))
+		{
+			// op r/m, imm8
+			emit->Write8(normalops[op].simm8);
+			immToWrite = 8;
+		}
+		else if (operand.scale == SCALE_IMM64 && bits == 64)
+		{
+			if (scale)
+			{
+				_assert_msg_(DYNA_REC, 0, "WriteNormalOp - MOV with 64-bit imm requres register destination");
+			}
+			// mov reg64, imm64
+			else if (op == nrmMOV)
+			{
+				emit->Write8(0xB8 + (offsetOrBaseReg & 7));
+				emit->Write64((u64)operand.offset);
+				return;
+			}
+			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Only MOV can take 64-bit imm");
+		}
+		else
+		{
+			_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Unhandled case %d %d", operand.scale, bits);
+		}
+		_operandReg = (X64Reg)normalops[op].ext; //pass extension in REG of ModRM
+	}
+	else
+	{
+		_operandReg = (X64Reg)operand.offsetOrBaseReg;
+		WriteREX(emit, bits, bits, _operandReg);
+		// op r/m, reg
+		if (toRM)
+		{
+			emit->Write8(bits == 8 ? normalops[op].toRm8 : normalops[op].toRm32);
+		}
+		// op reg, r/m
+		else
+		{
+			emit->Write8(bits == 8 ? normalops[op].fromRm8 : normalops[op].fromRm32);
+		}
+	}
+	WriteRest(emit, immToWrite >> 3, _operandReg);
+	switch (immToWrite)
+	{
+	case 0:
+		break;
+	case 8:
+		emit->Write8((u8)operand.offset);
+		break;
+	case 16:
+		emit->Write16((u16)operand.offset);
+		break;
+	case 32:
+		emit->Write32((u32)operand.offset);
+		break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - Unhandled case");
+	}
+}
+
+void XEmitter::WriteNormalOp(int bits, NormalOp op, const OpArg& a1, const OpArg& a2)
+{
+	if (a1.IsImm())
+	{
+		//Booh! Can't write to an imm
+		_assert_msg_(DYNA_REC, 0, "WriteNormalOp - a1 cannot be imm");
+		return;
+	}
+	if (a2.IsImm())
+	{
+		a1.WriteNormalOp(this, true, op, a2, bits);
+	}
+	else
+	{
+		if (a1.IsSimpleReg())
+		{
+			a2.WriteNormalOp(this, false, op, a1, bits);
+		}
+		else
+		{
+			_assert_msg_(DYNA_REC, a2.IsSimpleReg() || a2.IsImm(), "WriteNormalOp - a1 and a2 cannot both be memory");
+			a1.WriteNormalOp(this, true, op, a2, bits);
+		}
+	}
+}
+
+void XEmitter::ADD (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmADD, a1, a2);}
+void XEmitter::ADC (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmADC, a1, a2);}
+void XEmitter::SUB (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmSUB, a1, a2);}
+void XEmitter::SBB (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmSBB, a1, a2);}
+void XEmitter::AND (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmAND, a1, a2);}
+void XEmitter::OR  (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmOR , a1, a2);}
+void XEmitter::XOR (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmXOR, a1, a2);}
+void XEmitter::MOV (int bits, const OpArg& a1, const OpArg& a2)
+{
+	if (a1.IsSimpleReg() && a2.IsSimpleReg() && a1.GetSimpleReg() == a2.GetSimpleReg())
+		ERROR_LOG(DYNA_REC, "Redundant MOV @ %p - bug in JIT?", code);
+	WriteNormalOp(bits, nrmMOV, a1, a2);
+}
+void XEmitter::TEST(int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmTEST, a1, a2);}
+void XEmitter::CMP (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(bits, nrmCMP, a1, a2);}
+void XEmitter::XCHG(int bits, const OpArg& a1, const OpArg& a2) {WriteNormalOp(bits, nrmXCHG, a1, a2);}
+void XEmitter::CMP_or_TEST(int bits, const OpArg& a1, const OpArg& a2)
+{
+	CheckFlags();
+	if (a1.IsSimpleReg() && a2.IsImm() && a2.offset == 0) // turn 'CMP reg, 0' into shorter 'TEST reg, reg'
+	{
+		WriteNormalOp(bits, nrmTEST, a1, a1);
+	}
+	else
+	{
+		WriteNormalOp(bits, nrmCMP, a1, a2);
+	}
+}
+
+void XEmitter::IMUL(int bits, X64Reg regOp, const OpArg& a1, const OpArg& a2)
+{
+	CheckFlags();
+	if (bits == 8)
+	{
+		_assert_msg_(DYNA_REC, 0, "IMUL - illegal bit size!");
+		return;
+	}
+
+	if (a1.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "IMUL - second arg cannot be imm!");
+		return;
+	}
+
+	if (!a2.IsImm())
+	{
+		_assert_msg_(DYNA_REC, 0, "IMUL - third arg must be imm!");
+		return;
+	}
+
+	if (bits == 16)
+		Write8(0x66);
+	a1.WriteREX(this, bits, bits, regOp);
+
+	if (a2.GetImmBits() == 8 ||
+	    (a2.GetImmBits() == 16 && (s8)a2.offset == (s16)a2.offset) ||
+	    (a2.GetImmBits() == 32 && (s8)a2.offset == (s32)a2.offset))
+	{
+		Write8(0x6B);
+		a1.WriteRest(this, 1, regOp);
+		Write8((u8)a2.offset);
+	}
+	else
+	{
+		Write8(0x69);
+		if (a2.GetImmBits() == 16 && bits == 16)
+		{
+			a1.WriteRest(this, 2, regOp);
+			Write16((u16)a2.offset);
+		}
+		else if (a2.GetImmBits() == 32 && (bits == 32 || bits == 64))
+		{
+			a1.WriteRest(this, 4, regOp);
+			Write32((u32)a2.offset);
+		}
+		else
+		{
+			_assert_msg_(DYNA_REC, 0, "IMUL - unhandled case!");
+		}
+	}
+}
+
+void XEmitter::IMUL(int bits, X64Reg regOp, const OpArg& a)
+{
+	CheckFlags();
+	if (bits == 8)
+	{
+		_assert_msg_(DYNA_REC, 0, "IMUL - illegal bit size!");
+		return;
+	}
+
+	if (a.IsImm())
+	{
+		IMUL(bits, regOp, R(regOp), a) ;
+		return;
+	}
+
+	if (bits == 16)
+		Write8(0x66);
+	a.WriteREX(this, bits, bits, regOp);
+	Write8(0x0F);
+	Write8(0xAF);
+	a.WriteRest(this, 0, regOp);
+}
+
+
+void XEmitter::WriteSSEOp(u8 opPrefix, u16 op, X64Reg regOp, OpArg arg, int extrabytes)
+{
+	if (opPrefix)
+		Write8(opPrefix);
+	arg.operandReg = regOp;
+	arg.WriteREX(this, 0, 0);
+	Write8(0x0F);
+	if (op > 0xFF)
+		Write8((op >> 8) & 0xFF);
+	Write8(op & 0xFF);
+	arg.WriteRest(this, extrabytes);
+}
+
+static int GetVEXmmmmm(u16 op)
+{
+	// Currently, only 0x38 and 0x3A are used as secondary escape byte.
+	if ((op >> 8) == 0x3A)
+		return 3;
+	else if ((op >> 8) == 0x38)
+		return 2;
+	else
+		return 1;
+}
+
+static int GetVEXpp(u8 opPrefix)
+{
+	if (opPrefix == 0x66)
+		return 1;
+	else if (opPrefix == 0xF3)
+		return 2;
+	else if (opPrefix == 0xF2)
+		return 3;
+	else
+		return 0;
+}
+
+void XEmitter::WriteVEXOp(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W, int extrabytes)
+{
+	int mmmmm = GetVEXmmmmm(op);
+	int pp = GetVEXpp(opPrefix);
+	// FIXME: we currently don't support 256-bit instructions, and "size" is not the vector size here
+	arg.WriteVEX(this, regOp1, regOp2, 0, pp, mmmmm, W);
+	Write8(op & 0xFF);
+	arg.WriteRest(this, extrabytes, regOp1);
+}
+
+void XEmitter::WriteVEXOp4(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg regOp3, int W)
+{
+	WriteVEXOp(opPrefix, op, regOp1, regOp2, arg, W, 1);
+	Write8((u8)regOp3 << 4);
+}
+
+void XEmitter::WriteAVXOp(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W, int extrabytes)
+{
+	if (!cpu_info.bAVX)
+		PanicAlert("Trying to use AVX on a system that doesn't support it. Bad programmer.");
+	WriteVEXOp(opPrefix, op, regOp1, regOp2, arg, W, extrabytes);
+}
+
+void XEmitter::WriteAVXOp4(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg regOp3, int W)
+{
+	if (!cpu_info.bAVX)
+		PanicAlert("Trying to use AVX on a system that doesn't support it. Bad programmer.");
+	WriteVEXOp4(opPrefix, op, regOp1, regOp2, arg, regOp3, W);
+}
+
+void XEmitter::WriteFMA3Op(u8 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W)
+{
+	if (!cpu_info.bFMA)
+		PanicAlert("Trying to use FMA3 on a system that doesn't support it. Computer is v. f'n madd.");
+	WriteVEXOp(0x66, 0x3800 | op, regOp1, regOp2, arg, W);
+}
+
+void XEmitter::WriteFMA4Op(u8 op, X64Reg dest, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W)
+{
+	if (!cpu_info.bFMA4)
+		PanicAlert("Trying to use FMA4 on a system that doesn't support it. Computer is v. f'n madd.");
+	WriteVEXOp4(0x66, 0x3A00 | op, dest, regOp1, arg, regOp2, W);
+}
+
+void XEmitter::WriteBMIOp(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes)
+{
+	CheckFlags();
+	if (size != 32 && size != 64)
+		PanicAlert("VEX GPR instructions only support 32-bit and 64-bit modes!");
+	int W = size == 64;
+	WriteVEXOp(opPrefix, op, regOp1, regOp2, arg, W, extrabytes);
+}
+
+void XEmitter::WriteBMI1Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes)
+{
+	if (!cpu_info.bBMI1)
+		PanicAlert("Trying to use BMI1 on a system that doesn't support it. Bad programmer.");
+	WriteBMIOp(size, opPrefix, op, regOp1, regOp2, arg, extrabytes);
+}
+
+void XEmitter::WriteBMI2Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes)
+{
+	if (!cpu_info.bBMI2)
+		PanicAlert("Trying to use BMI2 on a system that doesn't support it. Bad programmer.");
+	WriteBMIOp(size, opPrefix, op, regOp1, regOp2, arg, extrabytes);
+}
+
+void XEmitter::MOVD_xmm(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x6E, dest, arg, 0);}
+void XEmitter::MOVD_xmm(const OpArg& arg, X64Reg src) {WriteSSEOp(0x66, 0x7E, src, arg, 0);}
+
+void XEmitter::MOVQ_xmm(X64Reg dest, OpArg arg)
+{
+		// Alternate encoding
+		// This does not display correctly in MSVC's debugger, it thinks it's a MOVD
+		arg.operandReg = dest;
+		Write8(0x66);
+		arg.WriteREX(this, 64, 0);
+		Write8(0x0f);
+		Write8(0x6E);
+		arg.WriteRest(this, 0);
+}
+
+void XEmitter::MOVQ_xmm(OpArg arg, X64Reg src)
+{
+	if (src > 7 || arg.IsSimpleReg())
+	{
+		// Alternate encoding
+		// This does not display correctly in MSVC's debugger, it thinks it's a MOVD
+		arg.operandReg = src;
+		Write8(0x66);
+		arg.WriteREX(this, 64, 0);
+		Write8(0x0f);
+		Write8(0x7E);
+		arg.WriteRest(this, 0);
+	}
+	else
+	{
+		arg.operandReg = src;
+		arg.WriteREX(this, 0, 0);
+		Write8(0x66);
+		Write8(0x0f);
+		Write8(0xD6);
+		arg.WriteRest(this, 0);
+	}
+}
+
+void XEmitter::WriteMXCSR(OpArg arg, int ext)
+{
+	if (arg.IsImm() || arg.IsSimpleReg())
+		_assert_msg_(DYNA_REC, 0, "MXCSR - invalid operand");
+
+	arg.operandReg = ext;
+	arg.WriteREX(this, 0, 0);
+	Write8(0x0F);
+	Write8(0xAE);
+	arg.WriteRest(this);
+}
+
+void XEmitter::STMXCSR(const OpArg& memloc) {WriteMXCSR(memloc, 3);}
+void XEmitter::LDMXCSR(const OpArg& memloc) {WriteMXCSR(memloc, 2);}
+
+void XEmitter::MOVNTDQ(const OpArg& arg, X64Reg regOp) {WriteSSEOp(0x66, sseMOVNTDQ, regOp, arg);}
+void XEmitter::MOVNTPS(const OpArg& arg, X64Reg regOp) {WriteSSEOp(0x00, sseMOVNTP, regOp, arg);}
+void XEmitter::MOVNTPD(const OpArg& arg, X64Reg regOp) {WriteSSEOp(0x66, sseMOVNTP, regOp, arg);}
+
+void XEmitter::ADDSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseADD, regOp, arg);}
+void XEmitter::ADDSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseADD, regOp, arg);}
+void XEmitter::SUBSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseSUB, regOp, arg);}
+void XEmitter::SUBSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseSUB, regOp, arg);}
+void XEmitter::CMPSS(X64Reg regOp, const OpArg& arg, u8 compare) {WriteSSEOp(0xF3, sseCMP, regOp, arg, 1); Write8(compare);}
+void XEmitter::CMPSD(X64Reg regOp, const OpArg& arg, u8 compare) {WriteSSEOp(0xF2, sseCMP, regOp, arg, 1); Write8(compare);}
+void XEmitter::MULSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseMUL, regOp, arg);}
+void XEmitter::MULSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseMUL, regOp, arg);}
+void XEmitter::DIVSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseDIV, regOp, arg);}
+void XEmitter::DIVSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseDIV, regOp, arg);}
+void XEmitter::MINSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseMIN, regOp, arg);}
+void XEmitter::MINSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseMIN, regOp, arg);}
+void XEmitter::MAXSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseMAX, regOp, arg);}
+void XEmitter::MAXSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseMAX, regOp, arg);}
+void XEmitter::SQRTSS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0xF3, sseSQRT, regOp, arg);}
+void XEmitter::SQRTSD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0xF2, sseSQRT, regOp, arg);}
+void XEmitter::RSQRTSS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, sseRSQRT, regOp, arg);}
+
+void XEmitter::ADDPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseADD, regOp, arg);}
+void XEmitter::ADDPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseADD, regOp, arg);}
+void XEmitter::SUBPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseSUB, regOp, arg);}
+void XEmitter::SUBPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseSUB, regOp, arg);}
+void XEmitter::CMPPS(X64Reg regOp, const OpArg& arg, u8 compare) {WriteSSEOp(0x00, sseCMP, regOp, arg, 1); Write8(compare);}
+void XEmitter::CMPPD(X64Reg regOp, const OpArg& arg, u8 compare) {WriteSSEOp(0x66, sseCMP, regOp, arg, 1); Write8(compare);}
+void XEmitter::ANDPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseAND, regOp, arg);}
+void XEmitter::ANDPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseAND, regOp, arg);}
+void XEmitter::ANDNPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseANDN, regOp, arg);}
+void XEmitter::ANDNPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseANDN, regOp, arg);}
+void XEmitter::ORPS(X64Reg regOp, const OpArg& arg)    {WriteSSEOp(0x00, sseOR, regOp, arg);}
+void XEmitter::ORPD(X64Reg regOp, const OpArg& arg)    {WriteSSEOp(0x66, sseOR, regOp, arg);}
+void XEmitter::XORPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseXOR, regOp, arg);}
+void XEmitter::XORPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseXOR, regOp, arg);}
+void XEmitter::MULPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseMUL, regOp, arg);}
+void XEmitter::MULPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseMUL, regOp, arg);}
+void XEmitter::DIVPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseDIV, regOp, arg);}
+void XEmitter::DIVPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseDIV, regOp, arg);}
+void XEmitter::MINPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseMIN, regOp, arg);}
+void XEmitter::MINPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseMIN, regOp, arg);}
+void XEmitter::MAXPS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x00, sseMAX, regOp, arg);}
+void XEmitter::MAXPD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0x66, sseMAX, regOp, arg);}
+void XEmitter::SQRTPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseSQRT, regOp, arg);}
+void XEmitter::SQRTPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseSQRT, regOp, arg);}
+void XEmitter::RSQRTPS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x00, sseRSQRT, regOp, arg);}
+void XEmitter::SHUFPS(X64Reg regOp, const OpArg& arg, u8 shuffle) {WriteSSEOp(0x00, sseSHUF, regOp, arg,1); Write8(shuffle);}
+void XEmitter::SHUFPD(X64Reg regOp, const OpArg& arg, u8 shuffle) {WriteSSEOp(0x66, sseSHUF, regOp, arg,1); Write8(shuffle);}
+
+void XEmitter::COMISS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseCOMIS, regOp, arg);} //weird that these should be packed
+void XEmitter::COMISD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseCOMIS, regOp, arg);} //ordered
+void XEmitter::UCOMISS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x00, sseUCOMIS, regOp, arg);} //unordered
+void XEmitter::UCOMISD(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x66, sseUCOMIS, regOp, arg);}
+
+void XEmitter::MOVAPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseMOVAPfromRM, regOp, arg);}
+void XEmitter::MOVAPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseMOVAPfromRM, regOp, arg);}
+void XEmitter::MOVAPS(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x00, sseMOVAPtoRM, regOp, arg);}
+void XEmitter::MOVAPD(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x66, sseMOVAPtoRM, regOp, arg);}
+
+void XEmitter::MOVUPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseMOVUPfromRM, regOp, arg);}
+void XEmitter::MOVUPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseMOVUPfromRM, regOp, arg);}
+void XEmitter::MOVUPS(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x00, sseMOVUPtoRM, regOp, arg);}
+void XEmitter::MOVUPD(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x66, sseMOVUPtoRM, regOp, arg);}
+
+void XEmitter::MOVDQA(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseMOVDQfromRM, regOp, arg);}
+void XEmitter::MOVDQA(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x66, sseMOVDQtoRM, regOp, arg);}
+void XEmitter::MOVDQU(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0xF3, sseMOVDQfromRM, regOp, arg);}
+void XEmitter::MOVDQU(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0xF3, sseMOVDQtoRM, regOp, arg);}
+
+void XEmitter::MOVSS(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF3, sseMOVUPfromRM, regOp, arg);}
+void XEmitter::MOVSD(X64Reg regOp, const OpArg& arg)   {WriteSSEOp(0xF2, sseMOVUPfromRM, regOp, arg);}
+void XEmitter::MOVSS(const OpArg& arg, X64Reg regOp)   {WriteSSEOp(0xF3, sseMOVUPtoRM, regOp, arg);}
+void XEmitter::MOVSD(const OpArg& arg, X64Reg regOp)   {WriteSSEOp(0xF2, sseMOVUPtoRM, regOp, arg);}
+
+void XEmitter::MOVLPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseMOVLPfromRM, regOp, arg);}
+void XEmitter::MOVLPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseMOVLPfromRM, regOp, arg);}
+void XEmitter::MOVLPS(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x00, sseMOVLPtoRM, regOp, arg);}
+void XEmitter::MOVLPD(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x66, sseMOVLPtoRM, regOp, arg);}
+
+void XEmitter::MOVHPS(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x00, sseMOVHPfromRM, regOp, arg);}
+void XEmitter::MOVHPD(X64Reg regOp, const OpArg& arg)  {WriteSSEOp(0x66, sseMOVHPfromRM, regOp, arg);}
+void XEmitter::MOVHPS(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x00, sseMOVHPtoRM, regOp, arg);}
+void XEmitter::MOVHPD(const OpArg& arg, X64Reg regOp)  {WriteSSEOp(0x66, sseMOVHPtoRM, regOp, arg);}
+
+void XEmitter::MOVHLPS(X64Reg regOp1, X64Reg regOp2) {WriteSSEOp(0x00, sseMOVHLPS, regOp1, R(regOp2));}
+void XEmitter::MOVLHPS(X64Reg regOp1, X64Reg regOp2) {WriteSSEOp(0x00, sseMOVLHPS, regOp1, R(regOp2));}
+
+void XEmitter::CVTPS2PD(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x00, 0x5A, regOp, arg);}
+void XEmitter::CVTPD2PS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x66, 0x5A, regOp, arg);}
+
+void XEmitter::CVTSD2SS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF2, 0x5A, regOp, arg);}
+void XEmitter::CVTSS2SD(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0x5A, regOp, arg);}
+void XEmitter::CVTSD2SI(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF2, 0x2D, regOp, arg);}
+void XEmitter::CVTSS2SI(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0x2D, regOp, arg);}
+void XEmitter::CVTSI2SD(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF2, 0x2A, regOp, arg);}
+void XEmitter::CVTSI2SS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0x2A, regOp, arg);}
+
+void XEmitter::CVTDQ2PD(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0xE6, regOp, arg);}
+void XEmitter::CVTDQ2PS(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x00, 0x5B, regOp, arg);}
+void XEmitter::CVTPD2DQ(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF2, 0xE6, regOp, arg);}
+void XEmitter::CVTPS2DQ(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x66, 0x5B, regOp, arg);}
+
+void XEmitter::CVTTSD2SI(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF2, 0x2C, regOp, arg);}
+void XEmitter::CVTTSS2SI(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0x2C, regOp, arg);}
+void XEmitter::CVTTPS2DQ(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0xF3, 0x5B, regOp, arg);}
+void XEmitter::CVTTPD2DQ(X64Reg regOp, const OpArg& arg) {WriteSSEOp(0x66, 0xE6, regOp, arg);}
+
+void XEmitter::MASKMOVDQU(X64Reg dest, X64Reg src)  {WriteSSEOp(0x66, sseMASKMOVDQU, dest, R(src));}
+
+void XEmitter::MOVMSKPS(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x00, 0x50, dest, arg);}
+void XEmitter::MOVMSKPD(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x50, dest, arg);}
+
+void XEmitter::LDDQU(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0xF2, sseLDDQU, dest, arg);} // For integer data only
+
+// THESE TWO ARE UNTESTED.
+void XEmitter::UNPCKLPS(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x00, 0x14, dest, arg);}
+void XEmitter::UNPCKHPS(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x00, 0x15, dest, arg);}
+
+void XEmitter::UNPCKLPD(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x14, dest, arg);}
+void XEmitter::UNPCKHPD(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x15, dest, arg);}
+
+void XEmitter::MOVDDUP(X64Reg regOp, const OpArg& arg)
+{
+	if (cpu_info.bSSE3)
+	{
+		WriteSSEOp(0xF2, 0x12, regOp, arg); //SSE3 movddup
+	}
+	else
+	{
+		// Simulate this instruction with SSE2 instructions
+		if (!arg.IsSimpleReg(regOp))
+			MOVSD(regOp, arg);
+		UNPCKLPD(regOp, R(regOp));
+	}
+}
+
+//There are a few more left
+
+// Also some integer instructions are missing
+void XEmitter::PACKSSDW(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x6B, dest, arg);}
+void XEmitter::PACKSSWB(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x63, dest, arg);}
+void XEmitter::PACKUSWB(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x67, dest, arg);}
+
+void XEmitter::PUNPCKLBW(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x60, dest, arg);}
+void XEmitter::PUNPCKLWD(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x61, dest, arg);}
+void XEmitter::PUNPCKLDQ(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x62, dest, arg);}
+void XEmitter::PUNPCKLQDQ(X64Reg dest, const OpArg& arg) {WriteSSEOp(0x66, 0x6C, dest, arg);}
+
+void XEmitter::PSRLW(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x71, (X64Reg)2, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSRLD(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x72, (X64Reg)2, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSRLQ(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x73, (X64Reg)2, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSRLQ(X64Reg reg, const OpArg& arg)
+{
+	WriteSSEOp(0x66, 0xd3, reg, arg);
+}
+
+void XEmitter::PSRLDQ(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x73, (X64Reg)3, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSLLW(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x71, (X64Reg)6, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSLLD(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x72, (X64Reg)6, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSLLQ(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x73, (X64Reg)6, R(reg));
+	Write8(shift);
+}
+
+void XEmitter::PSLLDQ(X64Reg reg, int shift)
+{
+	WriteSSEOp(0x66, 0x73, (X64Reg)7, R(reg));
+	Write8(shift);
+}
+
+
+// WARNING not REX compatible
+void XEmitter::PSRAW(X64Reg reg, int shift)
+{
+	if (reg > 7)
+		PanicAlert("The PSRAW-emitter does not support regs above 7");
+	Write8(0x66);
+	Write8(0x0f);
+	Write8(0x71);
+	Write8(0xE0 | reg);
+	Write8(shift);
+}
+
+// WARNING not REX compatible
+void XEmitter::PSRAD(X64Reg reg, int shift)
+{
+	if (reg > 7)
+		PanicAlert("The PSRAD-emitter does not support regs above 7");
+	Write8(0x66);
+	Write8(0x0f);
+	Write8(0x72);
+	Write8(0xE0 | reg);
+	Write8(shift);
+}
+
+void XEmitter::WriteSSSE3Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes)
+{
+	if (!cpu_info.bSSSE3)
+		PanicAlert("Trying to use SSSE3 on a system that doesn't support it. Bad programmer.");
+	WriteSSEOp(opPrefix, op, regOp, arg, extrabytes);
+}
+
+void XEmitter::WriteSSE41Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes)
+{
+	if (!cpu_info.bSSE4_1)
+		PanicAlert("Trying to use SSE4.1 on a system that doesn't support it. Bad programmer.");
+	WriteSSEOp(opPrefix, op, regOp, arg, extrabytes);
+}
+
+void XEmitter::PSHUFB(X64Reg dest, const OpArg& arg)   {WriteSSSE3Op(0x66, 0x3800, dest, arg);}
+void XEmitter::PTEST(X64Reg dest, const OpArg& arg)    {WriteSSE41Op(0x66, 0x3817, dest, arg);}
+void XEmitter::PACKUSDW(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x382b, dest, arg);}
+
+void XEmitter::PMOVSXBW(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3820, dest, arg);}
+void XEmitter::PMOVSXBD(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3821, dest, arg);}
+void XEmitter::PMOVSXBQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3822, dest, arg);}
+void XEmitter::PMOVSXWD(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3823, dest, arg);}
+void XEmitter::PMOVSXWQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3824, dest, arg);}
+void XEmitter::PMOVSXDQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3825, dest, arg);}
+void XEmitter::PMOVZXBW(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3830, dest, arg);}
+void XEmitter::PMOVZXBD(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3831, dest, arg);}
+void XEmitter::PMOVZXBQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3832, dest, arg);}
+void XEmitter::PMOVZXWD(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3833, dest, arg);}
+void XEmitter::PMOVZXWQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3834, dest, arg);}
+void XEmitter::PMOVZXDQ(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3835, dest, arg);}
+
+void XEmitter::PBLENDVB(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3810, dest, arg);}
+void XEmitter::BLENDVPS(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3814, dest, arg);}
+void XEmitter::BLENDVPD(X64Reg dest, const OpArg& arg) {WriteSSE41Op(0x66, 0x3815, dest, arg);}
+void XEmitter::BLENDPS(X64Reg dest, const OpArg& arg, u8 blend) {WriteSSE41Op(0x66, 0x3A0C, dest, arg, 1); Write8(blend);}
+void XEmitter::BLENDPD(X64Reg dest, const OpArg& arg, u8 blend) {WriteSSE41Op(0x66, 0x3A0D, dest, arg, 1); Write8(blend);}
+
+void XEmitter::PAND(X64Reg dest, const OpArg& arg)     {WriteSSEOp(0x66, 0xDB, dest, arg);}
+void XEmitter::PANDN(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xDF, dest, arg);}
+void XEmitter::PXOR(X64Reg dest, const OpArg& arg)     {WriteSSEOp(0x66, 0xEF, dest, arg);}
+void XEmitter::POR(X64Reg dest, const OpArg& arg)      {WriteSSEOp(0x66, 0xEB, dest, arg);}
+
+void XEmitter::PADDB(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xFC, dest, arg);}
+void XEmitter::PADDW(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xFD, dest, arg);}
+void XEmitter::PADDD(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xFE, dest, arg);}
+void XEmitter::PADDQ(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xD4, dest, arg);}
+
+void XEmitter::PADDSB(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xEC, dest, arg);}
+void XEmitter::PADDSW(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xED, dest, arg);}
+void XEmitter::PADDUSB(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0xDC, dest, arg);}
+void XEmitter::PADDUSW(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0xDD, dest, arg);}
+
+void XEmitter::PSUBB(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xF8, dest, arg);}
+void XEmitter::PSUBW(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xF9, dest, arg);}
+void XEmitter::PSUBD(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xFA, dest, arg);}
+void XEmitter::PSUBQ(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xFB, dest, arg);}
+
+void XEmitter::PSUBSB(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xE8, dest, arg);}
+void XEmitter::PSUBSW(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xE9, dest, arg);}
+void XEmitter::PSUBUSB(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0xD8, dest, arg);}
+void XEmitter::PSUBUSW(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0xD9, dest, arg);}
+
+void XEmitter::PAVGB(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xE0, dest, arg);}
+void XEmitter::PAVGW(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xE3, dest, arg);}
+
+void XEmitter::PCMPEQB(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x74, dest, arg);}
+void XEmitter::PCMPEQW(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x75, dest, arg);}
+void XEmitter::PCMPEQD(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x76, dest, arg);}
+
+void XEmitter::PCMPGTB(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x64, dest, arg);}
+void XEmitter::PCMPGTW(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x65, dest, arg);}
+void XEmitter::PCMPGTD(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0x66, dest, arg);}
+
+void XEmitter::PEXTRW(X64Reg dest, const OpArg& arg, u8 subreg) {WriteSSEOp(0x66, 0xC5, dest, arg); Write8(subreg);}
+void XEmitter::PINSRW(X64Reg dest, const OpArg& arg, u8 subreg) {WriteSSEOp(0x66, 0xC4, dest, arg); Write8(subreg);}
+void XEmitter::PINSRD(X64Reg dest, const OpArg& arg, u8 subreg) {WriteSSE41Op(0x66, 0x3A22, dest, arg); Write8(subreg);}
+
+void XEmitter::PMADDWD(X64Reg dest, const OpArg& arg)  {WriteSSEOp(0x66, 0xF5, dest, arg); }
+void XEmitter::PSADBW(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xF6, dest, arg);}
+
+void XEmitter::PMAXSW(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xEE, dest, arg); }
+void XEmitter::PMAXUB(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xDE, dest, arg); }
+void XEmitter::PMINSW(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xEA, dest, arg); }
+void XEmitter::PMINUB(X64Reg dest, const OpArg& arg)   {WriteSSEOp(0x66, 0xDA, dest, arg); }
+
+void XEmitter::PMOVMSKB(X64Reg dest, const OpArg& arg)    {WriteSSEOp(0x66, 0xD7, dest, arg); }
+void XEmitter::PSHUFD(X64Reg regOp, const OpArg& arg, u8 shuffle)    {WriteSSEOp(0x66, 0x70, regOp, arg, 1); Write8(shuffle);}
+void XEmitter::PSHUFLW(X64Reg regOp, const OpArg& arg, u8 shuffle)   {WriteSSEOp(0xF2, 0x70, regOp, arg, 1); Write8(shuffle);}
+void XEmitter::PSHUFHW(X64Reg regOp, const OpArg& arg, u8 shuffle)   {WriteSSEOp(0xF3, 0x70, regOp, arg, 1); Write8(shuffle);}
+
+// VEX
+void XEmitter::VADDSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0xF2, sseADD, regOp1, regOp2, arg);}
+void XEmitter::VSUBSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0xF2, sseSUB, regOp1, regOp2, arg);}
+void XEmitter::VMULSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0xF2, sseMUL, regOp1, regOp2, arg);}
+void XEmitter::VDIVSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0xF2, sseDIV, regOp1, regOp2, arg);}
+void XEmitter::VADDPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseADD, regOp1, regOp2, arg);}
+void XEmitter::VSUBPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseSUB, regOp1, regOp2, arg);}
+void XEmitter::VMULPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseMUL, regOp1, regOp2, arg);}
+void XEmitter::VDIVPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseDIV, regOp1, regOp2, arg);}
+void XEmitter::VSQRTSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)  {WriteAVXOp(0xF2, sseSQRT, regOp1, regOp2, arg);}
+void XEmitter::VCMPPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, u8 compare)  {WriteAVXOp(0x66, sseCMP, regOp1, regOp2, arg, 0, 1); Write8(compare);}
+void XEmitter::VSHUFPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, u8 shuffle) {WriteAVXOp(0x66, sseSHUF, regOp1, regOp2, arg, 0, 1); Write8(shuffle);}
+void XEmitter::VUNPCKLPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg){WriteAVXOp(0x66, 0x14, regOp1, regOp2, arg);}
+void XEmitter::VUNPCKHPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg){WriteAVXOp(0x66, 0x15, regOp1, regOp2, arg);}
+void XEmitter::VBLENDVPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg regOp3) {WriteAVXOp4(0x66, 0x3A4B, regOp1, regOp2, arg, regOp3);}
+
+void XEmitter::VANDPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x00, sseAND, regOp1, regOp2, arg);}
+void XEmitter::VANDPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseAND, regOp1, regOp2, arg);}
+void XEmitter::VANDNPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)  {WriteAVXOp(0x00, sseANDN, regOp1, regOp2, arg);}
+void XEmitter::VANDNPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)  {WriteAVXOp(0x66, sseANDN, regOp1, regOp2, arg);}
+void XEmitter::VORPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteAVXOp(0x00, sseOR, regOp1, regOp2, arg);}
+void XEmitter::VORPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteAVXOp(0x66, sseOR, regOp1, regOp2, arg);}
+void XEmitter::VXORPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x00, sseXOR, regOp1, regOp2, arg);}
+void XEmitter::VXORPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, sseXOR, regOp1, regOp2, arg);}
+
+void XEmitter::VPAND(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteAVXOp(0x66, 0xDB, regOp1, regOp2, arg);}
+void XEmitter::VPANDN(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteAVXOp(0x66, 0xDF, regOp1, regOp2, arg);}
+void XEmitter::VPOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)     {WriteAVXOp(0x66, 0xEB, regOp1, regOp2, arg);}
+void XEmitter::VPXOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteAVXOp(0x66, 0xEF, regOp1, regOp2, arg);}
+
+void XEmitter::VFMADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x98, regOp1, regOp2, arg);}
+void XEmitter::VFMADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xA8, regOp1, regOp2, arg);}
+void XEmitter::VFMADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xB8, regOp1, regOp2, arg);}
+void XEmitter::VFMADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x98, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xA8, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xB8, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADD132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x99, regOp1, regOp2, arg);}
+void XEmitter::VFMADD213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xA9, regOp1, regOp2, arg);}
+void XEmitter::VFMADD231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xB9, regOp1, regOp2, arg);}
+void XEmitter::VFMADD132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x99, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADD213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xA9, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADD231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xB9, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x9A, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xAA, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xBA, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x9A, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xAA, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xBA, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x9B, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xAB, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xBB, regOp1, regOp2, arg);}
+void XEmitter::VFMSUB132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0x9B, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xAB, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUB231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)    {WriteFMA3Op(0xBB, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9C, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAC, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBC, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9C, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAC, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBC, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9D, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAD, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBD, regOp1, regOp2, arg);}
+void XEmitter::VFNMADD132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9D, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAD, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMADD231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBD, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9E, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAE, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBE, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9E, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAE, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBE, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9F, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAF, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBF, regOp1, regOp2, arg);}
+void XEmitter::VFNMSUB132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0x9F, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xAF, regOp1, regOp2, arg, 1);}
+void XEmitter::VFNMSUB231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)   {WriteFMA3Op(0xBF, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADDSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0x96, regOp1, regOp2, arg);}
+void XEmitter::VFMADDSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xA6, regOp1, regOp2, arg);}
+void XEmitter::VFMADDSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xB6, regOp1, regOp2, arg);}
+void XEmitter::VFMADDSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0x96, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADDSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xA6, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMADDSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xB6, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUBADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0x97, regOp1, regOp2, arg);}
+void XEmitter::VFMSUBADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xA7, regOp1, regOp2, arg);}
+void XEmitter::VFMSUBADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xB7, regOp1, regOp2, arg);}
+void XEmitter::VFMSUBADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0x97, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUBADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xA7, regOp1, regOp2, arg, 1);}
+void XEmitter::VFMSUBADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA3Op(0xB7, regOp1, regOp2, arg, 1);}
+
+#define FMA4(name, op) \
+void XEmitter::name(X64Reg dest, X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteFMA4Op(op, dest, regOp1, regOp2, arg, 1);} \
+void XEmitter::name(X64Reg dest, X64Reg regOp1, const OpArg& arg, X64Reg regOp2) {WriteFMA4Op(op, dest, regOp1, regOp2, arg, 0);}
+
+FMA4(VFMADDSUBPS, 0x5C)
+FMA4(VFMADDSUBPD, 0x5D)
+FMA4(VFMSUBADDPS, 0x5E)
+FMA4(VFMSUBADDPD, 0x5F)
+FMA4(VFMADDPS, 0x68)
+FMA4(VFMADDPD, 0x69)
+FMA4(VFMADDSS, 0x6A)
+FMA4(VFMADDSD, 0x6B)
+FMA4(VFMSUBPS, 0x6C)
+FMA4(VFMSUBPD, 0x6D)
+FMA4(VFMSUBSS, 0x6E)
+FMA4(VFMSUBSD, 0x6F)
+FMA4(VFNMADDPS, 0x78)
+FMA4(VFNMADDPD, 0x79)
+FMA4(VFNMADDSS, 0x7A)
+FMA4(VFNMADDSD, 0x7B)
+FMA4(VFNMSUBPS, 0x7C)
+FMA4(VFNMSUBPD, 0x7D)
+FMA4(VFNMSUBSS, 0x7E)
+FMA4(VFNMSUBSD, 0x7F)
+#undef FMA4
+
+void XEmitter::SARX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2) {WriteBMI2Op(bits, 0xF3, 0x38F7, regOp1, regOp2, arg);}
+void XEmitter::SHLX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2) {WriteBMI2Op(bits, 0x66, 0x38F7, regOp1, regOp2, arg);}
+void XEmitter::SHRX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2) {WriteBMI2Op(bits, 0xF2, 0x38F7, regOp1, regOp2, arg);}
+void XEmitter::RORX(int bits, X64Reg regOp, const OpArg& arg, u8 rotate)      {WriteBMI2Op(bits, 0xF2, 0x3AF0, regOp, INVALID_REG, arg, 1); Write8(rotate);}
+void XEmitter::PEXT(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteBMI2Op(bits, 0xF3, 0x38F5, regOp1, regOp2, arg);}
+void XEmitter::PDEP(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteBMI2Op(bits, 0xF2, 0x38F5, regOp1, regOp2, arg);}
+void XEmitter::MULX(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteBMI2Op(bits, 0xF2, 0x38F6, regOp2, regOp1, arg);}
+void XEmitter::BZHI(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2) {WriteBMI2Op(bits, 0x00, 0x38F5, regOp1, regOp2, arg);}
+void XEmitter::BLSR(int bits, X64Reg regOp, const OpArg& arg)                 {WriteBMI1Op(bits, 0x00, 0x38F3, (X64Reg)0x1, regOp, arg);}
+void XEmitter::BLSMSK(int bits, X64Reg regOp, const OpArg& arg)               {WriteBMI1Op(bits, 0x00, 0x38F3, (X64Reg)0x2, regOp, arg);}
+void XEmitter::BLSI(int bits, X64Reg regOp, const OpArg& arg)                 {WriteBMI1Op(bits, 0x00, 0x38F3, (X64Reg)0x3, regOp, arg);}
+void XEmitter::BEXTR(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2){WriteBMI1Op(bits, 0x00, 0x38F7, regOp1, regOp2, arg);}
+void XEmitter::ANDN(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg) {WriteBMI1Op(bits, 0x00, 0x38F2, regOp1, regOp2, arg);}
+
+// Prefixes
+
+void XEmitter::LOCK()  { Write8(0xF0); }
+void XEmitter::REP()   { Write8(0xF3); }
+void XEmitter::REPNE() { Write8(0xF2); }
+void XEmitter::FSOverride() { Write8(0x64); }
+void XEmitter::GSOverride() { Write8(0x65); }
+
+void XEmitter::FWAIT()
+{
+	Write8(0x9B);
+}
+
+// TODO: make this more generic
+void XEmitter::WriteFloatLoadStore(int bits, FloatOp op, FloatOp op_80b, const OpArg& arg)
+{
+	int mf = 0;
+	_assert_msg_(DYNA_REC, !(bits == 80 && op_80b == floatINVALID), "WriteFloatLoadStore: 80 bits not supported for this instruction");
+	switch (bits)
+	{
+	case 32: mf = 0; break;
+	case 64: mf = 4; break;
+	case 80: mf = 2; break;
+	default: _assert_msg_(DYNA_REC, 0, "WriteFloatLoadStore: invalid bits (should be 32/64/80)");
+	}
+	Write8(0xd9 | mf);
+	// x87 instructions use the reg field of the ModR/M byte as opcode:
+	if (bits == 80)
+		op = op_80b;
+	arg.WriteRest(this, 0, (X64Reg) op);
+}
+
+void XEmitter::FLD(int bits, const OpArg& src)   { WriteFloatLoadStore(bits, floatLD, floatLD80, src); }
+void XEmitter::FST(int bits, const OpArg& dest)  { WriteFloatLoadStore(bits, floatST, floatINVALID, dest); }
+void XEmitter::FSTP(int bits, const OpArg& dest) { WriteFloatLoadStore(bits, floatSTP, floatSTP80, dest); }
+void XEmitter::FNSTSW_AX() { Write8(0xDF); Write8(0xE0); }
+
+void XEmitter::RDTSC() { Write8(0x0F); Write8(0x31); }
+
+// helper routines for setting pointers
+void XEmitter::CallCdeclFunction3(void* fnptr, u32 arg0, u32 arg1, u32 arg2)
+{
+#ifdef _MSC_VER
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8),  Imm32(arg2));
+	CALL(fnptr);
+#else
+	MOV(32, R(RDI), Imm32(arg0));
+	MOV(32, R(RSI), Imm32(arg1));
+	MOV(32, R(RDX), Imm32(arg2));
+	CALL(fnptr);
+#endif
+}
+
+void XEmitter::CallCdeclFunction4(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3)
+{
+#ifdef _MSC_VER
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	MOV(32, R(R9), Imm32(arg3));
+	CALL(fnptr);
+#else
+	MOV(32, R(RDI), Imm32(arg0));
+	MOV(32, R(RSI), Imm32(arg1));
+	MOV(32, R(RDX), Imm32(arg2));
+	MOV(32, R(RCX), Imm32(arg3));
+	CALL(fnptr);
+#endif
+}
+
+void XEmitter::CallCdeclFunction5(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
+{
+#ifdef _MSC_VER
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8),  Imm32(arg2));
+	MOV(32, R(R9),  Imm32(arg3));
+	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
+	CALL(fnptr);
+#else
+	MOV(32, R(RDI), Imm32(arg0));
+	MOV(32, R(RSI), Imm32(arg1));
+	MOV(32, R(RDX), Imm32(arg2));
+	MOV(32, R(RCX), Imm32(arg3));
+	MOV(32, R(R8),  Imm32(arg4));
+	CALL(fnptr);
+#endif
+}
+
+void XEmitter::CallCdeclFunction6(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+{
+#ifdef _MSC_VER
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	MOV(32, R(R9), Imm32(arg3));
+	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
+	MOV(32, MDisp(RSP, 0x28), Imm32(arg5));
+	CALL(fnptr);
+#else
+	MOV(32, R(RDI), Imm32(arg0));
+	MOV(32, R(RSI), Imm32(arg1));
+	MOV(32, R(RDX), Imm32(arg2));
+	MOV(32, R(RCX), Imm32(arg3));
+	MOV(32, R(R8), Imm32(arg4));
+	MOV(32, R(R9), Imm32(arg5));
+	CALL(fnptr);
+#endif
+}
+
+// See header
+void XEmitter::___CallCdeclImport3(void* impptr, u32 arg0, u32 arg1, u32 arg2)
+{
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	CALLptr(M(impptr));
+}
+void XEmitter::___CallCdeclImport4(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3)
+{
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	MOV(32, R(R9), Imm32(arg3));
+	CALLptr(M(impptr));
+}
+void XEmitter::___CallCdeclImport5(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
+{
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	MOV(32, R(R9), Imm32(arg3));
+	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
+	CALLptr(M(impptr));
+}
+void XEmitter::___CallCdeclImport6(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+{
+	MOV(32, R(RCX), Imm32(arg0));
+	MOV(32, R(RDX), Imm32(arg1));
+	MOV(32, R(R8), Imm32(arg2));
+	MOV(32, R(R9), Imm32(arg3));
+	MOV(32, MDisp(RSP, 0x20), Imm32(arg4));
+	MOV(32, MDisp(RSP, 0x28), Imm32(arg5));
+	CALLptr(M(impptr));
+}
+
+}
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
new file mode 100644
index 0000000000..c62254aec4
--- /dev/null
+++ b/Source/Core/Common/x64Emitter.h
@@ -0,0 +1,992 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
+
+#pragma once
+
+#include <cstddef>
+#include <cstring>
+#include <functional>
+
+#include "Common/BitSet.h"
+#include "Common/CodeBlock.h"
+#include "Common/CommonTypes.h"
+
+namespace Gen
+{
+
+enum X64Reg
+{
+	EAX = 0, EBX = 3, ECX = 1, EDX = 2,
+	ESI = 6, EDI = 7, EBP = 5, ESP = 4,
+
+	RAX = 0, RBX = 3, RCX = 1, RDX = 2,
+	RSI = 6, RDI = 7, RBP = 5, RSP = 4,
+	R8  = 8, R9  = 9, R10 = 10,R11 = 11,
+	R12 = 12,R13 = 13,R14 = 14,R15 = 15,
+
+	AL = 0, BL = 3, CL = 1, DL = 2,
+	SIL = 6, DIL = 7, BPL = 5, SPL = 4,
+	AH = 0x104, BH = 0x107, CH = 0x105, DH = 0x106,
+
+	AX = 0, BX = 3, CX = 1, DX = 2,
+	SI = 6, DI = 7, BP = 5, SP = 4,
+
+	XMM0=0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
+	XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15,
+
+	YMM0=0, YMM1, YMM2, YMM3, YMM4, YMM5, YMM6, YMM7,
+	YMM8, YMM9, YMM10, YMM11, YMM12, YMM13, YMM14, YMM15,
+
+	INVALID_REG = 0xFFFFFFFF
+};
+
+enum CCFlags
+{
+	CC_O   = 0,
+	CC_NO  = 1,
+	CC_B   = 2, CC_C   = 2, CC_NAE = 2,
+	CC_NB  = 3, CC_NC  = 3, CC_AE  = 3,
+	CC_Z   = 4, CC_E   = 4,
+	CC_NZ  = 5, CC_NE  = 5,
+	CC_BE  = 6, CC_NA  = 6,
+	CC_NBE = 7, CC_A   = 7,
+	CC_S   = 8,
+	CC_NS  = 9,
+	CC_P   = 0xA, CC_PE  = 0xA,
+	CC_NP  = 0xB, CC_PO  = 0xB,
+	CC_L   = 0xC, CC_NGE = 0xC,
+	CC_NL  = 0xD, CC_GE  = 0xD,
+	CC_LE  = 0xE, CC_NG  = 0xE,
+	CC_NLE = 0xF, CC_G   = 0xF
+};
+
+enum
+{
+	NUMGPRs = 16,
+	NUMXMMs = 16,
+};
+
+enum
+{
+	SCALE_NONE = 0,
+	SCALE_1 = 1,
+	SCALE_2 = 2,
+	SCALE_4 = 4,
+	SCALE_8 = 8,
+	SCALE_ATREG = 16,
+	//SCALE_NOBASE_1 is not supported and can be replaced with SCALE_ATREG
+	SCALE_NOBASE_2 = 34,
+	SCALE_NOBASE_4 = 36,
+	SCALE_NOBASE_8 = 40,
+	SCALE_RIP = 0xFF,
+	SCALE_IMM8  = 0xF0,
+	SCALE_IMM16 = 0xF1,
+	SCALE_IMM32 = 0xF2,
+	SCALE_IMM64 = 0xF3,
+};
+
+enum NormalOp {
+	nrmADD,
+	nrmADC,
+	nrmSUB,
+	nrmSBB,
+	nrmAND,
+	nrmOR ,
+	nrmXOR,
+	nrmMOV,
+	nrmTEST,
+	nrmCMP,
+	nrmXCHG,
+};
+
+enum SSECompare {
+	CMP_EQ = 0,
+	CMP_LT = 1,
+	CMP_LE = 2,
+	CMP_UNORD = 3,
+	CMP_NEQ = 4,
+	CMP_NLT = 5,
+	CMP_NLE = 6,
+	CMP_ORD = 7,
+};
+
+enum FloatOp {
+	floatLD = 0,
+	floatST = 2,
+	floatSTP = 3,
+	floatLD80 = 5,
+	floatSTP80 = 7,
+
+	floatINVALID = -1,
+};
+
+class XEmitter;
+
+// RIP addressing does not benefit from micro op fusion on Core arch
+struct OpArg
+{
+	friend class XEmitter; // For accessing offset and operandReg
+
+	OpArg() {}  // dummy op arg, used for storage
+	OpArg(u64 _offset, int _scale, X64Reg rmReg = RAX, X64Reg scaledReg = RAX)
+	{
+		operandReg = 0;
+		scale = (u8)_scale;
+		offsetOrBaseReg = (u16)rmReg;
+		indexReg = (u16)scaledReg;
+		//if scale == 0 never mind offsetting
+		offset = _offset;
+	}
+	bool operator==(const OpArg& b) const
+	{
+		return operandReg == b.operandReg && scale == b.scale && offsetOrBaseReg == b.offsetOrBaseReg &&
+		       indexReg == b.indexReg && offset == b.offset;
+	}
+	void WriteREX(XEmitter* emit, int opBits, int bits, int customOp = -1) const;
+	void WriteVEX(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp, int mmmmm, int W = 0) const;
+	void WriteRest(XEmitter* emit, int extraBytes=0, X64Reg operandReg=INVALID_REG, bool warn_64bit_offset = true) const;
+	void WriteFloatModRM(XEmitter* emit, FloatOp op);
+	void WriteSingleByteOp(XEmitter* emit, u8 op, X64Reg operandReg, int bits);
+
+	u64 Imm64() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM64); return (u64)offset; }
+	u32 Imm32() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM32); return (u32)offset; }
+	u16 Imm16() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM16); return (u16)offset; }
+	u8  Imm8()  const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM8);  return (u8)offset; }
+
+	s64 SImm64() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM64); return (s64)offset; }
+	s32 SImm32() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM32); return (s32)offset; }
+	s16 SImm16() const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM16); return (s16)offset; }
+	s8  SImm8()  const { _dbg_assert_(DYNA_REC, scale == SCALE_IMM8);  return (s8)offset; }
+
+	void WriteNormalOp(XEmitter* emit, bool toRM, NormalOp op, const OpArg& operand, int bits) const;
+	bool IsImm() const {return scale == SCALE_IMM8 || scale == SCALE_IMM16 || scale == SCALE_IMM32 || scale == SCALE_IMM64;}
+	bool IsSimpleReg() const {return scale == SCALE_NONE;}
+	bool IsSimpleReg(X64Reg reg) const
+	{
+		if (!IsSimpleReg())
+			return false;
+		return GetSimpleReg() == reg;
+	}
+
+	bool CanDoOpWith(const OpArg& other) const
+	{
+		if (IsSimpleReg()) return true;
+		if (!IsSimpleReg() && !other.IsSimpleReg() && !other.IsImm()) return false;
+		return true;
+	}
+
+	int GetImmBits() const
+	{
+		switch (scale)
+		{
+		case SCALE_IMM8: return 8;
+		case SCALE_IMM16: return 16;
+		case SCALE_IMM32: return 32;
+		case SCALE_IMM64: return 64;
+		default: return -1;
+		}
+	}
+
+	X64Reg GetSimpleReg() const
+	{
+		if (scale == SCALE_NONE)
+			return (X64Reg)offsetOrBaseReg;
+		else
+			return INVALID_REG;
+	}
+
+	void AddMemOffset(int val)
+	{
+		_dbg_assert_msg_(DYNA_REC, scale == SCALE_RIP || (scale <= SCALE_ATREG && scale > SCALE_NONE),
+		                 "Tried to increment an OpArg which doesn't have an offset");
+		offset += val;
+	}
+
+private:
+	u8 scale;
+	u16 offsetOrBaseReg;
+	u16 indexReg;
+	u64 offset;  // Also used to store immediates.
+	u16 operandReg;
+};
+
+template <typename T>
+inline OpArg M(const T* ptr)    {return OpArg((u64)(const void*)ptr, (int)SCALE_RIP);}
+inline OpArg R(X64Reg value)    {return OpArg(0, SCALE_NONE, value);}
+inline OpArg MatR(X64Reg value) {return OpArg(0, SCALE_ATREG, value);}
+
+inline OpArg MDisp(X64Reg value, ptrdiff_t offset)
+{
+	return OpArg(offset, SCALE_ATREG, value);
+}
+
+inline OpArg MComplex(X64Reg base, X64Reg scaled, int scale, ptrdiff_t offset)
+{
+	return OpArg(offset, scale, base, scaled);
+}
+
+inline OpArg MScaled(X64Reg scaled, int scale, ptrdiff_t offset)
+{
+	if (scale == SCALE_1)
+		return OpArg(offset, SCALE_ATREG, scaled);
+	else
+		return OpArg(offset, scale | 0x20, RAX, scaled);
+}
+
+inline OpArg MRegSum(X64Reg base, X64Reg offset)
+{
+	return MComplex(base, offset, 1, 0);
+}
+
+inline OpArg Imm8 (u8 imm)  {return OpArg(imm, SCALE_IMM8);}
+inline OpArg Imm16(u16 imm) {return OpArg(imm, SCALE_IMM16);} //rarely used
+inline OpArg Imm32(u32 imm) {return OpArg(imm, SCALE_IMM32);}
+inline OpArg Imm64(u64 imm) {return OpArg(imm, SCALE_IMM64);}
+inline OpArg ImmPtr(const void* imm) {return Imm64((u64)imm);}
+
+inline bool FitsInS32(const ptrdiff_t distance)
+{
+	return distance <   0x80000000LL &&
+	       distance >= -0x80000000LL;
+}
+
+//usage: int a[]; ARRAY_OFFSET(a,10)
+#define ARRAY_OFFSET(array,index) ((u32)((u64)&(array)[index]-(u64)&(array)[0]))
+//usage: struct {int e;} s; STRUCT_OFFSET(s,e)
+#define STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
+
+struct FixupBranch
+{
+	u8* ptr;
+	int type; //0 = 8bit 1 = 32bit
+};
+
+typedef const u8* JumpTarget;
+
+class XEmitter
+{
+	friend struct OpArg;  // for Write8 etc
+private:
+	u8* code;
+	bool flags_locked;
+
+	void CheckFlags();
+
+	void Rex(int w, int r, int x, int b);
+	void WriteSimple1Byte(int bits, u8 byte, X64Reg reg);
+	void WriteSimple2Byte(int bits, u8 byte1, u8 byte2, X64Reg reg);
+	void WriteMulDivType(int bits, OpArg src, int ext);
+	void WriteBitSearchType(int bits, X64Reg dest, OpArg src, u8 byte2, bool rep = false);
+	void WriteShift(int bits, OpArg dest, const OpArg& shift, int ext);
+	void WriteBitTest(int bits, const OpArg& dest, const OpArg& index, int ext);
+	void WriteMXCSR(OpArg arg, int ext);
+	void WriteSSEOp(u8 opPrefix, u16 op, X64Reg regOp, OpArg arg, int extrabytes = 0);
+	void WriteSSSE3Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes = 0);
+	void WriteSSE41Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes = 0);
+	void WriteVEXOp(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W = 0, int extrabytes = 0);
+	void WriteVEXOp4(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg regOp3, int W = 0);
+	void WriteAVXOp(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W = 0, int extrabytes = 0);
+	void WriteAVXOp4(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg regOp3, int W = 0);
+	void WriteFMA3Op(u8 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W = 0);
+	void WriteFMA4Op(u8 op, X64Reg dest, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W = 0);
+	void WriteBMIOp(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes = 0);
+	void WriteBMI1Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes = 0);
+	void WriteBMI2Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int extrabytes = 0);
+	void WriteMOVBE(int bits, u8 op, X64Reg regOp, const OpArg& arg);
+	void WriteFloatLoadStore(int bits, FloatOp op, FloatOp op_80b, const OpArg& arg);
+	void WriteNormalOp(int bits, NormalOp op, const OpArg& a1, const OpArg& a2);
+
+	void ABI_CalculateFrameSize(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp);
+
+protected:
+	inline void Write8(u8 value)   {*code++ = value;}
+	inline void Write16(u16 value) {*(u16*)code = (value); code += 2;}
+	inline void Write32(u32 value) {*(u32*)code = (value); code += 4;}
+	inline void Write64(u64 value) {*(u64*)code = (value); code += 8;}
+
+public:
+	XEmitter() { code = nullptr; flags_locked = false; }
+	XEmitter(u8* code_ptr) { code = code_ptr; flags_locked = false; }
+	virtual ~XEmitter() {}
+
+	void WriteModRM(int mod, int rm, int reg);
+	void WriteSIB(int scale, int index, int base);
+
+	void SetCodePtr(u8* ptr);
+	void ReserveCodeSpace(int bytes);
+	const u8* AlignCode4();
+	const u8* AlignCode16();
+	const u8* AlignCodePage();
+	const u8* GetCodePtr() const;
+	u8* GetWritableCodePtr();
+
+	void LockFlags() { flags_locked = true; }
+	void UnlockFlags() { flags_locked = false; }
+
+	// Looking for one of these? It's BANNED!! Some instructions are slow on modern CPU
+	// INC, DEC, LOOP, LOOPNE, LOOPE, ENTER, LEAVE, XCHG, XLAT, REP MOVSB/MOVSD, REP SCASD + other string instr.,
+	// INC and DEC are slow on Intel Core, but not on AMD. They create a
+	// false flag dependency because they only update a subset of the flags.
+	// XCHG is SLOW and should be avoided.
+
+	// Debug breakpoint
+	void INT3();
+
+	// Do nothing
+	void NOP(size_t count = 1);
+
+	// Save energy in wait-loops on P4 only. Probably not too useful.
+	void PAUSE();
+
+	// Flag control
+	void STC();
+	void CLC();
+	void CMC();
+
+	// These two can not be executed in 64-bit mode on early Intel 64-bit CPU:s, only on Core2 and AMD!
+	void LAHF(); // 3 cycle vector path
+	void SAHF(); // direct path fast
+
+
+	// Stack control
+	void PUSH(X64Reg reg);
+	void POP(X64Reg reg);
+	void PUSH(int bits, const OpArg& reg);
+	void POP(int bits, const OpArg& reg);
+	void PUSHF();
+	void POPF();
+
+	// Flow control
+	void RET();
+	void RET_FAST();
+	void UD2();
+	FixupBranch J(bool force5bytes = false);
+
+	void JMP(const u8* addr, bool force5Bytes = false);
+	void JMPptr(const OpArg& arg);
+	void JMPself(); //infinite loop!
+#ifdef CALL
+#undef CALL
+#endif
+	void CALL(const void* fnptr);
+	void CALLptr(OpArg arg);
+
+	FixupBranch J_CC(CCFlags conditionCode, bool force5bytes = false);
+	//void J_CC(CCFlags conditionCode, JumpTarget target);
+	void J_CC(CCFlags conditionCode, const u8* addr);
+
+	void SetJumpTarget(const FixupBranch& branch);
+
+	void SETcc(CCFlags flag, OpArg dest);
+	// Note: CMOV brings small if any benefit on current CPUs.
+	void CMOVcc(int bits, X64Reg dest, OpArg src, CCFlags flag);
+
+	// Fences
+	void LFENCE();
+	void MFENCE();
+	void SFENCE();
+
+	// Bit scan
+	void BSF(int bits, X64Reg dest, const OpArg& src); // Bottom bit to top bit
+	void BSR(int bits, X64Reg dest, const OpArg& src); // Top bit to bottom bit
+
+	// Cache control
+	enum PrefetchLevel
+	{
+		PF_NTA, //Non-temporal (data used once and only once)
+		PF_T0,  //All cache levels
+		PF_T1,  //Levels 2+ (aliased to T0 on AMD)
+		PF_T2,  //Levels 3+ (aliased to T0 on AMD)
+	};
+	void PREFETCH(PrefetchLevel level, OpArg arg);
+	void MOVNTI(int bits, const OpArg& dest, X64Reg src);
+	void MOVNTDQ(const OpArg& arg, X64Reg regOp);
+	void MOVNTPS(const OpArg& arg, X64Reg regOp);
+	void MOVNTPD(const OpArg& arg, X64Reg regOp);
+
+	// Multiplication / division
+	void MUL(int bits, const OpArg& src);  // UNSIGNED
+	void IMUL(int bits, const OpArg& src); // SIGNED
+	void IMUL(int bits, X64Reg regOp, const OpArg& src);
+	void IMUL(int bits, X64Reg regOp, const OpArg& src, const OpArg& imm);
+	void DIV(int bits, const OpArg& src);
+	void IDIV(int bits, const OpArg& src);
+
+	// Shift
+	void ROL(int bits, const OpArg& dest, const OpArg& shift);
+	void ROR(int bits, const OpArg& dest, const OpArg& shift);
+	void RCL(int bits, const OpArg& dest, const OpArg& shift);
+	void RCR(int bits, const OpArg& dest, const OpArg& shift);
+	void SHL(int bits, const OpArg& dest, const OpArg& shift);
+	void SHR(int bits, const OpArg& dest, const OpArg& shift);
+	void SAR(int bits, const OpArg& dest, const OpArg& shift);
+
+	// Bit Test
+	void BT(int bits, const OpArg& dest, const OpArg& index);
+	void BTS(int bits, const OpArg& dest, const OpArg& index);
+	void BTR(int bits, const OpArg& dest, const OpArg& index);
+	void BTC(int bits, const OpArg& dest, const OpArg& index);
+
+	// Double-Precision Shift
+	void SHRD(int bits, const OpArg& dest, const OpArg& src, const OpArg& shift);
+	void SHLD(int bits, const OpArg& dest, const OpArg& src, const OpArg& shift);
+
+	// Extend EAX into EDX in various ways
+	void CWD(int bits = 16);
+	inline void CDQ() {CWD(32);}
+	inline void CQO() {CWD(64);}
+	void CBW(int bits = 8);
+	inline void CWDE() {CBW(16);}
+	inline void CDQE() {CBW(32);}
+
+	// Load effective address
+	void LEA(int bits, X64Reg dest, OpArg src);
+
+	// Integer arithmetic
+	void NEG (int bits, const OpArg& src);
+	void ADD (int bits, const OpArg& a1, const OpArg& a2);
+	void ADC (int bits, const OpArg& a1, const OpArg& a2);
+	void SUB (int bits, const OpArg& a1, const OpArg& a2);
+	void SBB (int bits, const OpArg& a1, const OpArg& a2);
+	void AND (int bits, const OpArg& a1, const OpArg& a2);
+	void CMP (int bits, const OpArg& a1, const OpArg& a2);
+
+	// Bit operations
+	void NOT (int bits, const OpArg& src);
+	void OR  (int bits, const OpArg& a1, const OpArg& a2);
+	void XOR (int bits, const OpArg& a1, const OpArg& a2);
+	void MOV (int bits, const OpArg& a1, const OpArg& a2);
+	void TEST(int bits, const OpArg& a1, const OpArg& a2);
+
+	void CMP_or_TEST(int bits, const OpArg& a1, const OpArg& a2);
+
+	// Are these useful at all? Consider removing.
+	void XCHG(int bits, const OpArg& a1, const OpArg& a2);
+	void XCHG_AHAL();
+
+	// Byte swapping (32 and 64-bit only).
+	void BSWAP(int bits, X64Reg reg);
+
+	// Sign/zero extension
+	void MOVSX(int dbits, int sbits, X64Reg dest, OpArg src); //automatically uses MOVSXD if necessary
+	void MOVZX(int dbits, int sbits, X64Reg dest, OpArg src);
+
+	// Available only on Atom or >= Haswell so far. Test with cpu_info.bMOVBE.
+	void MOVBE(int bits, X64Reg dest, const OpArg& src);
+	void MOVBE(int bits, const OpArg& dest, X64Reg src);
+	void LoadAndSwap(int size, X64Reg dst, const OpArg& src);
+	void SwapAndStore(int size, const OpArg& dst, X64Reg src);
+
+	// Available only on AMD >= Phenom or Intel >= Haswell
+	void LZCNT(int bits, X64Reg dest, const OpArg& src);
+	// Note: this one is actually part of BMI1
+	void TZCNT(int bits, X64Reg dest, const OpArg& src);
+
+	// WARNING - These two take 11-13 cycles and are VectorPath! (AMD64)
+	void STMXCSR(const OpArg& memloc);
+	void LDMXCSR(const OpArg& memloc);
+
+	// Prefixes
+	void LOCK();
+	void REP();
+	void REPNE();
+	void FSOverride();
+	void GSOverride();
+
+	// x87
+	enum x87StatusWordBits {
+		x87_InvalidOperation = 0x1,
+		x87_DenormalizedOperand = 0x2,
+		x87_DivisionByZero = 0x4,
+		x87_Overflow = 0x8,
+		x87_Underflow = 0x10,
+		x87_Precision = 0x20,
+		x87_StackFault = 0x40,
+		x87_ErrorSummary = 0x80,
+		x87_C0 = 0x100,
+		x87_C1 = 0x200,
+		x87_C2 = 0x400,
+		x87_TopOfStack = 0x2000 | 0x1000 | 0x800,
+		x87_C3 = 0x4000,
+		x87_FPUBusy = 0x8000,
+	};
+
+	void FLD(int bits, const OpArg& src);
+	void FST(int bits, const OpArg& dest);
+	void FSTP(int bits, const OpArg& dest);
+	void FNSTSW_AX();
+	void FWAIT();
+
+	// SSE/SSE2: Floating point arithmetic
+	void ADDSS(X64Reg regOp, const OpArg& arg);
+	void ADDSD(X64Reg regOp, const OpArg& arg);
+	void SUBSS(X64Reg regOp, const OpArg& arg);
+	void SUBSD(X64Reg regOp, const OpArg& arg);
+	void MULSS(X64Reg regOp, const OpArg& arg);
+	void MULSD(X64Reg regOp, const OpArg& arg);
+	void DIVSS(X64Reg regOp, const OpArg& arg);
+	void DIVSD(X64Reg regOp, const OpArg& arg);
+	void MINSS(X64Reg regOp, const OpArg& arg);
+	void MINSD(X64Reg regOp, const OpArg& arg);
+	void MAXSS(X64Reg regOp, const OpArg& arg);
+	void MAXSD(X64Reg regOp, const OpArg& arg);
+	void SQRTSS(X64Reg regOp, const OpArg& arg);
+	void SQRTSD(X64Reg regOp, const OpArg& arg);
+	void RSQRTSS(X64Reg regOp, const OpArg& arg);
+
+	// SSE/SSE2: Floating point bitwise (yes)
+	void CMPSS(X64Reg regOp, const OpArg& arg, u8 compare);
+	void CMPSD(X64Reg regOp, const OpArg& arg, u8 compare);
+
+	// SSE/SSE2: Floating point packed arithmetic (x4 for float, x2 for double)
+	void ADDPS(X64Reg regOp, const OpArg& arg);
+	void ADDPD(X64Reg regOp, const OpArg& arg);
+	void SUBPS(X64Reg regOp, const OpArg& arg);
+	void SUBPD(X64Reg regOp, const OpArg& arg);
+	void CMPPS(X64Reg regOp, const OpArg& arg, u8 compare);
+	void CMPPD(X64Reg regOp, const OpArg& arg, u8 compare);
+	void MULPS(X64Reg regOp, const OpArg& arg);
+	void MULPD(X64Reg regOp, const OpArg& arg);
+	void DIVPS(X64Reg regOp, const OpArg& arg);
+	void DIVPD(X64Reg regOp, const OpArg& arg);
+	void MINPS(X64Reg regOp, const OpArg& arg);
+	void MINPD(X64Reg regOp, const OpArg& arg);
+	void MAXPS(X64Reg regOp, const OpArg& arg);
+	void MAXPD(X64Reg regOp, const OpArg& arg);
+	void SQRTPS(X64Reg regOp, const OpArg& arg);
+	void SQRTPD(X64Reg regOp, const OpArg& arg);
+	void RSQRTPS(X64Reg regOp, const OpArg& arg);
+
+	// SSE/SSE2: Floating point packed bitwise (x4 for float, x2 for double)
+	void ANDPS(X64Reg regOp, const OpArg& arg);
+	void ANDPD(X64Reg regOp, const OpArg& arg);
+	void ANDNPS(X64Reg regOp, const OpArg& arg);
+	void ANDNPD(X64Reg regOp, const OpArg& arg);
+	void ORPS(X64Reg regOp, const OpArg& arg);
+	void ORPD(X64Reg regOp, const OpArg& arg);
+	void XORPS(X64Reg regOp, const OpArg& arg);
+	void XORPD(X64Reg regOp, const OpArg& arg);
+
+	// SSE/SSE2: Shuffle components. These are tricky - see Intel documentation.
+	void SHUFPS(X64Reg regOp, const OpArg& arg, u8 shuffle);
+	void SHUFPD(X64Reg regOp, const OpArg& arg, u8 shuffle);
+
+	// SSE/SSE2: Useful alternative to shuffle in some cases.
+	void MOVDDUP(X64Reg regOp, const OpArg& arg);
+
+	void UNPCKLPS(X64Reg dest, const OpArg& src);
+	void UNPCKHPS(X64Reg dest, const OpArg& src);
+	void UNPCKLPD(X64Reg dest, const OpArg& src);
+	void UNPCKHPD(X64Reg dest, const OpArg& src);
+
+	// SSE/SSE2: Compares.
+	void COMISS(X64Reg regOp, const OpArg& arg);
+	void COMISD(X64Reg regOp, const OpArg& arg);
+	void UCOMISS(X64Reg regOp, const OpArg& arg);
+	void UCOMISD(X64Reg regOp, const OpArg& arg);
+
+	// SSE/SSE2: Moves. Use the right data type for your data, in most cases.
+	void MOVAPS(X64Reg regOp, const OpArg& arg);
+	void MOVAPD(X64Reg regOp, const OpArg& arg);
+	void MOVAPS(const OpArg& arg, X64Reg regOp);
+	void MOVAPD(const OpArg& arg, X64Reg regOp);
+
+	void MOVUPS(X64Reg regOp, const OpArg& arg);
+	void MOVUPD(X64Reg regOp, const OpArg& arg);
+	void MOVUPS(const OpArg& arg, X64Reg regOp);
+	void MOVUPD(const OpArg& arg, X64Reg regOp);
+
+	void MOVDQA(X64Reg regOp, const OpArg& arg);
+	void MOVDQA(const OpArg& arg, X64Reg regOp);
+	void MOVDQU(X64Reg regOp, const OpArg& arg);
+	void MOVDQU(const OpArg& arg, X64Reg regOp);
+
+	void MOVSS(X64Reg regOp, const OpArg& arg);
+	void MOVSD(X64Reg regOp, const OpArg& arg);
+	void MOVSS(const OpArg& arg, X64Reg regOp);
+	void MOVSD(const OpArg& arg, X64Reg regOp);
+
+	void MOVLPS(X64Reg regOp, const OpArg& arg);
+	void MOVLPD(X64Reg regOp, const OpArg& arg);
+	void MOVLPS(const OpArg& arg, X64Reg regOp);
+	void MOVLPD(const OpArg& arg, X64Reg regOp);
+
+	void MOVHPS(X64Reg regOp, const OpArg& arg);
+	void MOVHPD(X64Reg regOp, const OpArg& arg);
+	void MOVHPS(const OpArg& arg, X64Reg regOp);
+	void MOVHPD(const OpArg& arg, X64Reg regOp);
+
+	void MOVHLPS(X64Reg regOp1, X64Reg regOp2);
+	void MOVLHPS(X64Reg regOp1, X64Reg regOp2);
+
+	// Be careful when using these overloads for reg <--> xmm moves.
+	// The one you cast to OpArg with R(reg) is the x86 reg, the other
+	// one is the xmm reg.
+	// ie: "MOVD_xmm(eax, R(xmm1))" generates incorrect code (movd xmm0, rcx)
+	//     use "MOVD_xmm(R(eax), xmm1)" instead.
+	void MOVD_xmm(X64Reg dest, const OpArg& arg);
+	void MOVQ_xmm(X64Reg dest, OpArg arg);
+	void MOVD_xmm(const OpArg& arg, X64Reg src);
+	void MOVQ_xmm(OpArg arg, X64Reg src);
+
+	// SSE/SSE2: Generates a mask from the high bits of the components of the packed register in question.
+	void MOVMSKPS(X64Reg dest, const OpArg& arg);
+	void MOVMSKPD(X64Reg dest, const OpArg& arg);
+
+	// SSE2: Selective byte store, mask in src register. EDI/RDI specifies store address. This is a weird one.
+	void MASKMOVDQU(X64Reg dest, X64Reg src);
+	void LDDQU(X64Reg dest, const OpArg& src);
+
+	// SSE/SSE2: Data type conversions.
+	void CVTPS2PD(X64Reg dest, const OpArg& src);
+	void CVTPD2PS(X64Reg dest, const OpArg& src);
+	void CVTSS2SD(X64Reg dest, const OpArg& src);
+	void CVTSI2SS(X64Reg dest, const OpArg& src);
+	void CVTSD2SS(X64Reg dest, const OpArg& src);
+	void CVTSI2SD(X64Reg dest, const OpArg& src);
+	void CVTDQ2PD(X64Reg regOp, const OpArg& arg);
+	void CVTPD2DQ(X64Reg regOp, const OpArg& arg);
+	void CVTDQ2PS(X64Reg regOp, const OpArg& arg);
+	void CVTPS2DQ(X64Reg regOp, const OpArg& arg);
+
+	void CVTTPS2DQ(X64Reg regOp, const OpArg& arg);
+	void CVTTPD2DQ(X64Reg regOp, const OpArg& arg);
+
+	// Destinations are X64 regs (rax, rbx, ...) for these instructions.
+	void CVTSS2SI(X64Reg xregdest, const OpArg& src);
+	void CVTSD2SI(X64Reg xregdest, const OpArg& src);
+	void CVTTSS2SI(X64Reg xregdest, const OpArg& arg);
+	void CVTTSD2SI(X64Reg xregdest, const OpArg& arg);
+
+	// SSE2: Packed integer instructions
+	void PACKSSDW(X64Reg dest, const OpArg& arg);
+	void PACKSSWB(X64Reg dest, const OpArg& arg);
+	void PACKUSDW(X64Reg dest, const OpArg& arg);
+	void PACKUSWB(X64Reg dest, const OpArg& arg);
+
+	void PUNPCKLBW(X64Reg dest, const OpArg& arg);
+	void PUNPCKLWD(X64Reg dest, const OpArg& arg);
+	void PUNPCKLDQ(X64Reg dest, const OpArg& arg);
+	void PUNPCKLQDQ(X64Reg dest, const OpArg& arg);
+
+	void PTEST(X64Reg dest, const OpArg& arg);
+	void PAND(X64Reg dest, const OpArg& arg);
+	void PANDN(X64Reg dest, const OpArg& arg);
+	void PXOR(X64Reg dest, const OpArg& arg);
+	void POR(X64Reg dest, const OpArg& arg);
+
+	void PADDB(X64Reg dest, const OpArg& arg);
+	void PADDW(X64Reg dest, const OpArg& arg);
+	void PADDD(X64Reg dest, const OpArg& arg);
+	void PADDQ(X64Reg dest, const OpArg& arg);
+
+	void PADDSB(X64Reg dest, const OpArg& arg);
+	void PADDSW(X64Reg dest, const OpArg& arg);
+	void PADDUSB(X64Reg dest, const OpArg& arg);
+	void PADDUSW(X64Reg dest, const OpArg& arg);
+
+	void PSUBB(X64Reg dest, const OpArg& arg);
+	void PSUBW(X64Reg dest, const OpArg& arg);
+	void PSUBD(X64Reg dest, const OpArg& arg);
+	void PSUBQ(X64Reg dest, const OpArg& arg);
+
+	void PSUBSB(X64Reg dest, const OpArg& arg);
+	void PSUBSW(X64Reg dest, const OpArg& arg);
+	void PSUBUSB(X64Reg dest, const OpArg& arg);
+	void PSUBUSW(X64Reg dest, const OpArg& arg);
+
+	void PAVGB(X64Reg dest, const OpArg& arg);
+	void PAVGW(X64Reg dest, const OpArg& arg);
+
+	void PCMPEQB(X64Reg dest, const OpArg& arg);
+	void PCMPEQW(X64Reg dest, const OpArg& arg);
+	void PCMPEQD(X64Reg dest, const OpArg& arg);
+
+	void PCMPGTB(X64Reg dest, const OpArg& arg);
+	void PCMPGTW(X64Reg dest, const OpArg& arg);
+	void PCMPGTD(X64Reg dest, const OpArg& arg);
+
+	void PEXTRW(X64Reg dest, const OpArg& arg, u8 subreg);
+	void PINSRW(X64Reg dest, const OpArg& arg, u8 subreg);
+	void PINSRD(X64Reg dest, const OpArg& arg, u8 subreg);
+
+	void PMADDWD(X64Reg dest, const OpArg& arg);
+	void PSADBW(X64Reg dest, const OpArg& arg);
+
+	void PMAXSW(X64Reg dest, const OpArg& arg);
+	void PMAXUB(X64Reg dest, const OpArg& arg);
+	void PMINSW(X64Reg dest, const OpArg& arg);
+	void PMINUB(X64Reg dest, const OpArg& arg);
+
+	void PMOVMSKB(X64Reg dest, const OpArg& arg);
+	void PSHUFD(X64Reg dest, const OpArg& arg, u8 shuffle);
+	void PSHUFB(X64Reg dest, const OpArg& arg);
+
+	void PSHUFLW(X64Reg dest, const OpArg& arg, u8 shuffle);
+	void PSHUFHW(X64Reg dest, const OpArg& arg, u8 shuffle);
+
+	void PSRLW(X64Reg reg, int shift);
+	void PSRLD(X64Reg reg, int shift);
+	void PSRLQ(X64Reg reg, int shift);
+	void PSRLQ(X64Reg reg, const OpArg& arg);
+	void PSRLDQ(X64Reg reg, int shift);
+
+	void PSLLW(X64Reg reg, int shift);
+	void PSLLD(X64Reg reg, int shift);
+	void PSLLQ(X64Reg reg, int shift);
+	void PSLLDQ(X64Reg reg, int shift);
+
+	void PSRAW(X64Reg reg, int shift);
+	void PSRAD(X64Reg reg, int shift);
+
+	// SSE4: data type conversions
+	void PMOVSXBW(X64Reg dest, const OpArg& arg);
+	void PMOVSXBD(X64Reg dest, const OpArg& arg);
+	void PMOVSXBQ(X64Reg dest, const OpArg& arg);
+	void PMOVSXWD(X64Reg dest, const OpArg& arg);
+	void PMOVSXWQ(X64Reg dest, const OpArg& arg);
+	void PMOVSXDQ(X64Reg dest, const OpArg& arg);
+	void PMOVZXBW(X64Reg dest, const OpArg& arg);
+	void PMOVZXBD(X64Reg dest, const OpArg& arg);
+	void PMOVZXBQ(X64Reg dest, const OpArg& arg);
+	void PMOVZXWD(X64Reg dest, const OpArg& arg);
+	void PMOVZXWQ(X64Reg dest, const OpArg& arg);
+	void PMOVZXDQ(X64Reg dest, const OpArg& arg);
+
+	// SSE4: blend instructions
+	void PBLENDVB(X64Reg dest, const OpArg& arg);
+	void BLENDVPS(X64Reg dest, const OpArg& arg);
+	void BLENDVPD(X64Reg dest, const OpArg& arg);
+	void BLENDPS(X64Reg dest, const OpArg& arg, u8 blend);
+	void BLENDPD(X64Reg dest, const OpArg& arg, u8 blend);
+
+	// AVX
+	void VADDSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VSUBSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VMULSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VDIVSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VADDPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VSUBPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VMULPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VDIVPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VSQRTSD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VCMPPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, u8 compare);
+	void VSHUFPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, u8 shuffle);
+	void VUNPCKLPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VUNPCKHPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VBLENDVPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg, X64Reg mask);
+
+	void VANDPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VANDPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VANDNPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VANDNPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VORPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VORPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VXORPS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VXORPD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+
+	void VPAND(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VPANDN(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VPOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VPXOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+
+	// FMA3
+	void VFMADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADD231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUB231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMADD231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB132SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB213SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB231SS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB132SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB213SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFNMSUB231SD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMADDSUB231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD132PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD213PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD231PS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD132PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD213PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void VFMSUBADD231PD(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+
+	#define FMA4(name) \
+	void name(X64Reg dest, X64Reg regOp1, X64Reg regOp2, const OpArg& arg); \
+	void name(X64Reg dest, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+
+	FMA4(VFMADDSUBPS)
+	FMA4(VFMADDSUBPD)
+	FMA4(VFMSUBADDPS)
+	FMA4(VFMSUBADDPD)
+	FMA4(VFMADDPS)
+	FMA4(VFMADDPD)
+	FMA4(VFMADDSS)
+	FMA4(VFMADDSD)
+	FMA4(VFMSUBPS)
+	FMA4(VFMSUBPD)
+	FMA4(VFMSUBSS)
+	FMA4(VFMSUBSD)
+	FMA4(VFNMADDPS)
+	FMA4(VFNMADDPD)
+	FMA4(VFNMADDSS)
+	FMA4(VFNMADDSD)
+	FMA4(VFNMSUBPS)
+	FMA4(VFNMSUBPD)
+	FMA4(VFNMSUBSS)
+	FMA4(VFNMSUBSD)
+	#undef FMA4
+
+	// VEX GPR instructions
+	void SARX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+	void SHLX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+	void SHRX(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+	void RORX(int bits, X64Reg regOp, const OpArg& arg, u8 rotate);
+	void PEXT(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void PDEP(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void MULX(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+	void BZHI(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+	void BLSR(int bits, X64Reg regOp, const OpArg& arg);
+	void BLSMSK(int bits, X64Reg regOp, const OpArg& arg);
+	void BLSI(int bits, X64Reg regOp, const OpArg& arg);
+	void BEXTR(int bits, X64Reg regOp1, const OpArg& arg, X64Reg regOp2);
+	void ANDN(int bits, X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
+
+	void RDTSC();
+
+	// Utility functions
+	// The difference between this and CALL is that this aligns the stack
+	// where appropriate.
+	void ABI_CallFunction(const void* func);
+
+	void ABI_CallFunctionC16(const void* func, u16 param1);
+	void ABI_CallFunctionCC16(const void* func, u32 param1, u16 param2);
+
+	// These only support u32 parameters, but that's enough for a lot of uses.
+	// These will destroy the 1 or 2 first "parameter regs".
+	void ABI_CallFunctionC(const void* func, u32 param1);
+	void ABI_CallFunctionCC(const void* func, u32 param1, u32 param2);
+	void ABI_CallFunctionCP(const void* func, u32 param1, void* param2);
+	void ABI_CallFunctionCCC(const void* func, u32 param1, u32 param2, u32 param3);
+	void ABI_CallFunctionCCP(const void* func, u32 param1, u32 param2, void* param3);
+	void ABI_CallFunctionCCCP(const void* func, u32 param1, u32 param2,u32 param3, void* param4);
+	void ABI_CallFunctionPC(const void* func, void* param1, u32 param2);
+	void ABI_CallFunctionPPC(const void* func, void* param1, void* param2, u32 param3);
+	void ABI_CallFunctionAC(int bits, const void* func, const OpArg& arg1, u32 param2);
+	void ABI_CallFunctionA(int bits, const void* func, const OpArg& arg1);
+
+	// Pass a register as a parameter.
+	void ABI_CallFunctionR(const void* func, X64Reg reg1);
+	void ABI_CallFunctionRR(const void* func, X64Reg reg1, X64Reg reg2);
+
+	// Helper method for the above, or can be used separately.
+	void MOVTwo(int bits, X64Reg dst1, X64Reg src1, s32 offset, X64Reg dst2,X64Reg src2);
+
+	// Saves/restores the registers and adjusts the stack to be aligned as
+	// required by the ABI, where the previous alignment was as specified.
+	// Push returns the size of the shadow space, i.e. the offset of the frame.
+	size_t ABI_PushRegistersAndAdjustStack(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size = 0);
+	void ABI_PopRegistersAndAdjustStack(BitSet32 mask, size_t rsp_alignment, size_t needed_frame_size = 0);
+
+	inline int ABI_GetNumXMMRegs() { return 16; }
+
+	// Strange call wrappers.
+	void CallCdeclFunction3(void* fnptr, u32 arg0, u32 arg1, u32 arg2);
+	void CallCdeclFunction4(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3);
+	void CallCdeclFunction5(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+	void CallCdeclFunction6(void* fnptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
+
+	// Comments from VertexLoader.cpp about these horrors:
+
+	// This is a horrible hack that is necessary in 64-bit mode because Opengl32.dll is based way, way above the 32-bit
+	// address space that is within reach of a CALL, and just doing &fn gives us these high uncallable addresses. So we
+	// want to grab the function pointers from the import table instead.
+
+	void ___CallCdeclImport3(void* impptr, u32 arg0, u32 arg1, u32 arg2);
+	void ___CallCdeclImport4(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3);
+	void ___CallCdeclImport5(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+	void ___CallCdeclImport6(void* impptr, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
+
+	#define CallCdeclFunction3_I(a,b,c,d) ___CallCdeclImport3(&__imp_##a,b,c,d)
+	#define CallCdeclFunction4_I(a,b,c,d,e) ___CallCdeclImport4(&__imp_##a,b,c,d,e)
+	#define CallCdeclFunction5_I(a,b,c,d,e,f) ___CallCdeclImport5(&__imp_##a,b,c,d,e,f)
+	#define CallCdeclFunction6_I(a,b,c,d,e,f,g) ___CallCdeclImport6(&__imp_##a,b,c,d,e,f,g)
+
+	#define DECLARE_IMPORT(x) extern "C" void *__imp_##x
+
+	// Utility to generate a call to a std::function object.
+	//
+	// Unfortunately, calling operator() directly is undefined behavior in C++
+	// (this method might be a thunk in the case of multi-inheritance) so we
+	// have to go through a trampoline function.
+	template <typename T, typename... Args>
+	static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
+	                                 Args... args)
+	{
+		(*f)(args...);
+	}
+
+	template <typename T, typename... Args>
+	void ABI_CallLambdaC(const std::function<T(Args...)>* f, u32 p1)
+	{
+		// Double casting is required by VC++ for some reason.
+		auto trampoline = (void(*)())&XEmitter::CallLambdaTrampoline<T, Args...>;
+		ABI_CallFunctionPC((void*)trampoline, const_cast<void*>((const void*)f), p1);
+	}
+};  // class XEmitter
+
+class X64CodeBlock : public CodeBlock<XEmitter>
+{
+private:
+	void PoisonMemory() override
+	{
+		// x86/64: 0xCC = breakpoint
+		memset(region, 0xCC, region_size);
+	}
+};
+
+}  // namespace
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
new file mode 100644
index 0000000000..0ebbaeefd0
--- /dev/null
+++ b/Source/Core/Common/x64FPURoundMode.cpp
@@ -0,0 +1,70 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cfenv>
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/FPURoundMode.h"
+#include "Common/Intrinsics.h"
+
+namespace FPURoundMode
+{
+	// Get the default SSE states here.
+	static u32 saved_sse_state = _mm_getcsr();
+	static const u32 default_sse_state = _mm_getcsr();
+
+	void SetRoundMode(int mode)
+	{
+		// Convert PowerPC to native rounding mode.
+		static const int rounding_mode_lut[] = {
+			FE_TONEAREST,
+			FE_TOWARDZERO,
+			FE_UPWARD,
+			FE_DOWNWARD
+		};
+		fesetround(rounding_mode_lut[mode]);
+	}
+
+	void SetPrecisionMode(PrecisionMode /* mode */)
+	{
+		//x64 doesn't need this - fpu is done with SSE
+	}
+
+	void SetSIMDMode(int rounding_mode, bool non_ieee_mode)
+	{
+		// OR-mask for disabling FPU exceptions (bits 7-12 in the MXCSR register)
+		const u32 EXCEPTION_MASK = 0x1F80;
+		// Flush-To-Zero (non-IEEE mode: denormal outputs are set to +/- 0)
+		const u32 FTZ = 0x8000;
+		// lookup table for FPSCR.RN-to-MXCSR.RC translation
+		static const u32 simd_rounding_table[] =
+		{
+			(0 << 13) | EXCEPTION_MASK, // nearest
+			(3 << 13) | EXCEPTION_MASK, // -inf
+			(2 << 13) | EXCEPTION_MASK, // +inf
+			(1 << 13) | EXCEPTION_MASK, // zero
+		};
+		u32 csr = simd_rounding_table[rounding_mode];
+
+		if (non_ieee_mode)
+		{
+			csr |= FTZ;
+		}
+		_mm_setcsr(csr);
+	}
+
+	void SaveSIMDState()
+	{
+		saved_sse_state = _mm_getcsr();
+	}
+	void LoadSIMDState()
+	{
+		_mm_setcsr(saved_sse_state);
+	}
+	void LoadDefaultSIMDState()
+	{
+		_mm_setcsr(default_sse_state);
+	}
+}
diff --git a/Source/Core/Core/Src/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp
similarity index 80%
rename from Source/Core/Core/Src/ARDecrypt.cpp
rename to Source/Core/Core/ARDecrypt.cpp
index db3134acb0..b9bb235850 100644
--- a/Source/Core/Core/Src/ARDecrypt.cpp
+++ b/Source/Core/Core/ARDecrypt.cpp
@@ -1,33 +1,32 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Most of the code in this file is from:
-// GCNcrypt - Gamecube AR Crypto Program
+// GCNcrypt - GameCube AR Crypto Program
 // Copyright (C) 2003-2004 Parasyte
 
-
-#include "ARDecrypt.h"
 #include <algorithm>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Core/ARDecrypt.h"
+
 namespace ActionReplay
 {
 
 // Alphanumeric filter for text<->bin conversion
-const char *filter = "0123456789ABCDEFGHJKMNPQRTUVWXYZILOS";
+static const char *filter = "0123456789ABCDEFGHJKMNPQRTUVWXYZILOS";
 
-u32 genseeds[0x20];
+static u32 genseeds[0x20];
 
-
-const u8 bitstringlen[0x08] = {
-	0x06, 0x0A, 0x0C, 0x11, 0x11, 0x08, 0x07, 0x20,
-};
-
-const u8 gentable0[0x38] = {
+static const u8 gentable0[0x38] = {
 	0x39, 0x31, 0x29, 0x21, 0x19, 0x11, 0x09, 0x01,
 	0x3A, 0x32, 0x2A, 0x22, 0x1A, 0x12, 0x0A, 0x02,
 	0x3B, 0x33, 0x2B, 0x23, 0x1B, 0x13, 0x0B, 0x03,
@@ -36,14 +35,14 @@ const u8 gentable0[0x38] = {
 	0x1E, 0x16, 0x0E, 0x06, 0x3D, 0x35, 0x2D, 0x25,
 	0x1D, 0x15, 0x0D, 0x05, 0x1C, 0x14, 0x0C, 0x04,
 };
-const u8 gentable1[0x08] = {
+static const u8 gentable1[0x08] = {
 	0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01,
 };
-const u8 gentable2[0x10] = {
+static const u8 gentable2[0x10] = {
 	0x01, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E,
 	0x0F, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1C,
 };
-const u8 gentable3[0x30] = {
+static const u8 gentable3[0x30] = {
 	0x0E, 0x11, 0x0B, 0x18, 0x01, 0x05, 0x03, 0x1C,
 	0x0F, 0x06, 0x15, 0x0A, 0x17, 0x13, 0x0C, 0x04,
 	0x1A, 0x08, 0x10, 0x07, 0x1B, 0x14, 0x0D, 0x02,
@@ -52,21 +51,21 @@ const u8 gentable3[0x30] = {
 	0x22, 0x35, 0x2E, 0x2A, 0x32, 0x24, 0x1D, 0x20,
 };
 
-const u16 crctable0[0x10] = {
+static const u16 crctable0[0x10] = {
 	0x0000, 0x1081, 0x2102, 0x3183, 0x4204, 0x5285, 0x6306, 0x7387,
 	0x8408, 0x9489, 0xA50A, 0xB58B, 0xC60C, 0xD68D, 0xE70E, 0xF78F,
 };
-const u16 crctable1[0x10] = {
+static const u16 crctable1[0x10] = {
 	0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
 	0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
 };
 
-const u8 gensubtable[0x08] = {
+static const u8 gensubtable[0x08] = {
 	0x34, 0x1C, 0x84, 0x9E, 0xFD, 0xA4, 0xB6, 0x7B,
 };
 
 
-const u32 table0[0x40] = {
+static const u32 table0[0x40] = {
 	0x01010400, 0x00000000, 0x00010000, 0x01010404, 0x01010004, 0x00010404, 0x00000004, 0x00010000,
 	0x00000400, 0x01010400, 0x01010404, 0x00000400, 0x01000404, 0x01010004, 0x01000000, 0x00000004,
 	0x00000404, 0x01000400, 0x01000400, 0x00010400, 0x00010400, 0x01010000, 0x01010000, 0x01000404,
@@ -76,7 +75,7 @@ const u32 table0[0x40] = {
 	0x01010404, 0x00010004, 0x01010000, 0x01000404, 0x01000004, 0x00000404, 0x00010404, 0x01010400,
 	0x00000404, 0x01000400, 0x01000400, 0x00000000, 0x00010004, 0x00010400, 0x00000000, 0x01010004,
 };
-const u32 table1[0x40] = {
+static const u32 table1[0x40] = {
 	0x80108020, 0x80008000, 0x00008000, 0x00108020, 0x00100000, 0x00000020, 0x80100020, 0x80008020,
 	0x80000020, 0x80108020, 0x80108000, 0x80000000, 0x80008000, 0x00100000, 0x00000020, 0x80100020,
 	0x00108000, 0x00100020, 0x80008020, 0x00000000, 0x80000000, 0x00008000, 0x00108020, 0x80100000,
@@ -86,7 +85,7 @@ const u32 table1[0x40] = {
 	0x00008020, 0x80108000, 0x00100000, 0x80000020, 0x00100020, 0x80008020, 0x80000020, 0x00100020,
 	0x00108000, 0x00000000, 0x80008000, 0x00008020, 0x80000000, 0x80100020, 0x80108020, 0x00108000,
 };
-const u32 table2[0x40] = {
+static const u32 table2[0x40] = {
 	0x00000208, 0x08020200, 0x00000000, 0x08020008, 0x08000200, 0x00000000, 0x00020208, 0x08000200,
 	0x00020008, 0x08000008, 0x08000008, 0x00020000, 0x08020208, 0x00020008, 0x08020000, 0x00000208,
 	0x08000000, 0x00000008, 0x08020200, 0x00000200, 0x00020200, 0x08020000, 0x08020008, 0x00020208,
@@ -96,7 +95,7 @@ const u32 table2[0x40] = {
 	0x08000208, 0x00020000, 0x08000000, 0x08020208, 0x00000008, 0x00020208, 0x00020200, 0x08000008,
 	0x08020000, 0x08000208, 0x00000208, 0x08020000, 0x00020208, 0x00000008, 0x08020008, 0x00020200,
 };
-const u32 table3[0x40] = {
+static const u32 table3[0x40] = {
 	0x00802001, 0x00002081, 0x00002081, 0x00000080, 0x00802080, 0x00800081, 0x00800001, 0x00002001,
 	0x00000000, 0x00802000, 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00800080, 0x00800001,
 	0x00000001, 0x00002000, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002001, 0x00002080,
@@ -106,7 +105,7 @@ const u32 table3[0x40] = {
 	0x00802081, 0x00000081, 0x00000001, 0x00002000, 0x00800001, 0x00002001, 0x00802080, 0x00800081,
 	0x00002001, 0x00002080, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002000, 0x00802080,
 };
-const u32 table4[0x40] = {
+static const u32 table4[0x40] = {
 	0x00000100, 0x02080100, 0x02080000, 0x42000100, 0x00080000, 0x00000100, 0x40000000, 0x02080000,
 	0x40080100, 0x00080000, 0x02000100, 0x40080100, 0x42000100, 0x42080000, 0x00080100, 0x40000000,
 	0x02000000, 0x40080000, 0x40080000, 0x00000000, 0x40000100, 0x42080100, 0x42080100, 0x02000100,
@@ -116,7 +115,7 @@ const u32 table4[0x40] = {
 	0x42080100, 0x00080100, 0x42000000, 0x42080100, 0x02080000, 0x00000000, 0x40080000, 0x42000000,
 	0x00080100, 0x02000100, 0x40000100, 0x00080000, 0x00000000, 0x40080000, 0x02080100, 0x40000100,
 };
-const u32 table5[0x40] = {
+static const u32 table5[0x40] = {
 	0x20000010, 0x20400000, 0x00004000, 0x20404010, 0x20400000, 0x00000010, 0x20404010, 0x00400000,
 	0x20004000, 0x00404010, 0x00400000, 0x20000010, 0x00400010, 0x20004000, 0x20000000, 0x00004010,
 	0x00000000, 0x00400010, 0x20004010, 0x00004000, 0x00404000, 0x20004010, 0x00000010, 0x20400010,
@@ -126,7 +125,7 @@ const u32 table5[0x40] = {
 	0x00404010, 0x20404000, 0x00000000, 0x20400010, 0x00000010, 0x00004000, 0x20400000, 0x00404010,
 	0x00004000, 0x00400010, 0x20004010, 0x00000000, 0x20404000, 0x20000000, 0x00400010, 0x20004010,
 };
-const u32 table6[0x40] = {
+static const u32 table6[0x40] = {
 	0x00200000, 0x04200002, 0x04000802, 0x00000000, 0x00000800, 0x04000802, 0x00200802, 0x04200800,
 	0x04200802, 0x00200000, 0x00000000, 0x04000002, 0x00000002, 0x04000000, 0x04200002, 0x00000802,
 	0x04000800, 0x00200802, 0x00200002, 0x04000800, 0x04000002, 0x04200000, 0x04200800, 0x00200002,
@@ -136,7 +135,7 @@ const u32 table6[0x40] = {
 	0x00000802, 0x04000002, 0x04200802, 0x04200000, 0x00200800, 0x00000000, 0x00000002, 0x04200802,
 	0x00000000, 0x00200802, 0x04200000, 0x00000800, 0x04000002, 0x04000800, 0x00000800, 0x00200002,
 };
-const u32 table7[0x40] = {
+static const u32 table7[0x40] = {
 	0x10001040, 0x00001000, 0x00040000, 0x10041040, 0x10000000, 0x10001040, 0x00000040, 0x10000000,
 	0x00040040, 0x10040000, 0x10041040, 0x00041000, 0x10041000, 0x00041040, 0x00001000, 0x00000040,
 	0x10040000, 0x10000040, 0x10001000, 0x00001040, 0x00041000, 0x00040040, 0x10040040, 0x10041000,
@@ -148,53 +147,58 @@ const u32 table7[0x40] = {
 };
 
 
-void generateseeds(u32 *seeds, const u8 *seedtable, u8 doreverse)
+static void generateseeds(u32 *seeds, const u8 *seedtable, u8 doreverse)
 {
-	int i,j;
 	u32 tmp3;
 	u8 array0[0x38],array1[0x38],array2[0x08];
 	u8 tmp,tmp2;
 
-	i = 0;
-	while (i < 0x38)
+	for (int i = 0; i < 0x38; ++i)
 	{
 		tmp = (gentable0[i] - 1);
-		array0[i++] = ((u32)(0-(seedtable[tmp>>3] & gentable1[tmp&7])) >> 31);
+		array0[i] = ((u32)(0-(seedtable[tmp>>3] & gentable1[tmp&7])) >> 31);
 	}
 
-	i = 0;
-	while (i < 0x10)
+	for (int i = 0; i < 0x10; ++i)
 	{
 		memset(array2,0,8);
 		tmp2 = gentable2[i];
 
-		for (j = 0; j < 0x38; j++)
+		for (int j = 0; j < 0x38; j++)
 		{
 			tmp = (tmp2+j);
 
 			if (j > 0x1B)
 			{
-				if (tmp > 0x37) tmp-=0x1C;
+				if (tmp > 0x37)
+				{
+					tmp-=0x1C;
+				}
+			}
+			else if (tmp > 0x1B)
+			{
+				tmp-=0x1C;
 			}
-			else if (tmp > 0x1B) tmp-=0x1C;
 
 			array1[j] = array0[tmp];
 		}
-		for (j = 0; j < 0x30; j++)
+		for (int j = 0; j < 0x30; j++)
 		{
-			if (!array1[gentable3[j]-1]) continue;
+			if (!array1[gentable3[j]-1])
+			{
+				continue;
+			}
 			tmp = (((j*0x2AAB)>>16) - (j>>0x1F));
 			array2[tmp] |= (gentable1[j-(tmp*6)]>>2);
 		}
 		seeds[i<<1] = ((array2[0]<<24)|(array2[2]<<16)|(array2[4]<<8)|array2[6]);
 		seeds[(i<<1)+1] = ((array2[1]<<24)|(array2[3]<<16)|(array2[5]<<8)|array2[7]);
-		i++;
 	}
 
 	if (!doreverse)
 	{
-		j = 0x1F;
-		for (i = 0; i < 16; i+=2)
+		int j = 0x1F;
+		for (int i = 0; i < 16; i+=2)
 		{
 			tmp3 = seeds[i];
 			seeds[i] = seeds[j-1];
@@ -208,53 +212,48 @@ void generateseeds(u32 *seeds, const u8 *seedtable, u8 doreverse)
 	}
 }
 
-void buildseeds()
+static void buildseeds()
 {
 	generateseeds(genseeds,gensubtable,0);
 }
 
-void getcode(u32 *src, u32 *addr, u32 *val)
+static void getcode(u32 *src, u32 *addr, u32 *val)
 {
 	*addr = Common::swap32(src[0]);
 	*val = Common::swap32(src[1]);
 }
 
-void setcode(u32 *dst, u32 addr, u32 val)
+static void setcode(u32 *dst, u32 addr, u32 val)
 {
 	dst[0] = Common::swap32(addr);
 	dst[1] = Common::swap32(val);
 }
 
-u16 gencrc16(u32 *codes, u16 size)
+static u16 gencrc16(u32 *codes, u16 size)
 {
-	u16 ret=0;
-	u8 tmp=0,tmp2;
-	int i;
+	u16 ret = 0;
 
 	if (size > 0)
 	{
-		while (tmp < size)
+		for (u8 tmp = 0; tmp < size; ++tmp)
 		{
-			for (i = 0; i < 4; i++)
+			for (int i = 0; i < 4; ++i)
 			{
-				tmp2 = ((codes[tmp] >> (i<<3))^ret);
+				u8 tmp2 = ((codes[tmp] >> (i<<3))^ret);
 				ret = ((crctable0[(tmp2>>4)&0x0F]^crctable1[tmp2&0x0F])^(ret>>8));
 			}
-			tmp++;
 		}
 	}
 	return ret;
 }
 
-u8 verifycode(u32 *codes, u16 size)
+static u8 verifycode(u32 *codes, u16 size)
 {
-	u16 tmp;
-
-	tmp = gencrc16(codes,size);
+	u16 tmp = gencrc16(codes,size);
 	return (((tmp>>12)^(tmp>>8)^(tmp>>4)^tmp)&0x0F);
 }
 
-void unscramble1(u32 *addr, u32 *val)
+static void unscramble1(u32 *addr, u32 *val)
 {
 	u32 tmp;
 
@@ -281,7 +280,7 @@ void unscramble1(u32 *addr, u32 *val)
 	*val ^= tmp;
 }
 
-void unscramble2(u32 *addr, u32 *val)
+static void unscramble2(u32 *addr, u32 *val)
 {
 	u32 tmp;
 
@@ -308,7 +307,7 @@ void unscramble2(u32 *addr, u32 *val)
 	*addr = _rotr((*addr^tmp),4);
 }
 
-void decryptcode(u32 *seeds, u32 *code)
+static void decryptcode(u32 *seeds, u32 *code)
 {
 	u32 addr,val;
 	u32 tmp,tmp2;
@@ -330,7 +329,7 @@ void decryptcode(u32 *seeds, u32 *code)
 	setcode(code,val,addr);
 }
 
-bool getbitstring(u32 *ctrl, u32 *out, u8 len)
+static bool getbitstring(u32 *ctrl, u32 *out, u8 len)
 {
 	u32 tmp=(ctrl[0]+(ctrl[1]<<2));
 
@@ -343,14 +342,17 @@ bool getbitstring(u32 *ctrl, u32 *out, u8 len)
 			ctrl[1]++;
 			tmp = (ctrl[0]+(ctrl[1]<<2));
 		}
-		if (ctrl[1] >= ctrl[3]) return false;
+		if (ctrl[1] >= ctrl[3])
+		{
+			return false;
+		}
 		*out = ((*out<<1) | ((tmp >> (0x1F-ctrl[2])) & 1));
 		ctrl[2]++;
 	}
 	return true;
 }
 
-bool batchdecrypt(u32 *codes, u16 size)
+static bool batchdecrypt(u32 *codes, u16 size)
 {
 	u32 tmp,*ptr=codes;
 	u32 tmparray[4] = { 0 },tmparray2[8] = { 0 };
@@ -370,27 +372,30 @@ bool batchdecrypt(u32 *codes, u16 size)
 	tmparray[1] = 0;
 	tmparray[2] = 4; // Skip crc
 	tmparray[3] = size;
-	getbitstring(tmparray,tmparray2+1,11);	// Game id
-	getbitstring(tmparray,tmparray2+2,17);	// Code id
-	getbitstring(tmparray,tmparray2+3,1);	// Master code
-	getbitstring(tmparray,tmparray2+4,1);	// Unknown
-	getbitstring(tmparray,tmparray2+5,2);	// Region
+	getbitstring(tmparray,tmparray2+1,11); // Game id
+	getbitstring(tmparray,tmparray2+2,17); // Code id
+	getbitstring(tmparray,tmparray2+3,1);  // Master code
+	getbitstring(tmparray,tmparray2+4,1);  // Unknown
+	getbitstring(tmparray,tmparray2+5,2);  // Region
 
 	// Grab gameid and region from the last decrypted code
-	// Maybe check this against dolphin's GameID? - "code is for wrong game" type msg
+	// TODO: Maybe check this against Dolphin's GameID? - "code is for wrong game" type msg
 	//gameid = tmparray2[1];
 	//region = tmparray2[5];
 
 	tmp = codes[0];
 	codes[0] &= 0x0FFFFFFF;
-	if ((tmp>>28) != verifycode(codes,size)) return false;
+	if ((tmp>>28) != verifycode(codes,size))
+	{
+		return false;
+	}
 
 	return true;
 
 	// Unfinished (so says Parasyte :p )
 }
 
-int GetVal(const char *flt, char chr)
+static int GetVal(const char *flt, char chr)
 {
 	int ret = (int)(strchr(flt,chr) - flt);
 	switch (ret)
@@ -409,25 +414,26 @@ int GetVal(const char *flt, char chr)
 	return ret;
 }
 
-int alphatobin(u32 *dst, std::vector<std::string> alpha, int size)
+static int alphatobin(u32 *dst, const std::vector<std::string>& alpha, int size)
 {
-	int i,j=0,k;
-	int ret=0,org=(size+1);
+	int j = 0;
+	int ret = 0;
+	int org = size + 1;
 	u32 bin[2];
 	u8 parity;
 
-	while (size)
+	for (; size; --size)
 	{
-		bin[0]=0;
-		for (i = 0; i < 6; i++)
+		bin[0] = 0;
+		for (int i = 0; i < 6; i++)
 		{
 			bin[0] |= (GetVal(filter,alpha[j>>1][i]) << (((5-i)*5)+2));
 		}
 		bin[0] |= (GetVal(filter,alpha[j>>1][6]) >> 3);
 		dst[j++] = bin[0];
 
-		bin[1]=0;
-		for (i = 0; i < 6; i++)
+		bin[1] = 0;
+		for (int i = 0; i < 6; i++)
 		{
 			bin[1] |= (GetVal(filter,alpha[j>>1][i+6]) << (((5-i)*5)+4));
 		}
@@ -435,16 +441,20 @@ int alphatobin(u32 *dst, std::vector<std::string> alpha, int size)
 		dst[j++] = bin[1];
 
 		//verify parity bit
-		k=0;
-		parity=0;
-		for (i = 0; i < 64; i++)
+		int k = 0;
+		parity = 0;
+		for (int i = 0; i < 64; i++)
 		{
-			if (i == 32) k++;
+			if (i == 32)
+			{
+				k++;
+			}
 			parity ^= (bin[k] >> (i-(k<<5)));
 		}
-		if ((parity&1) != (GetVal(filter,alpha[(j-2)>>1][12])&1)) ret=(org-size);
-
-		size--;
+		if ((parity&1) != (GetVal(filter,alpha[(j-2)>>1][12])&1))
+		{
+			ret=(org-size);
+		}
 	}
 
 	return ret;
@@ -456,12 +466,11 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
 	buildseeds();
 
 	u32 uCodes[1200];
-	u32 i,ret;
+	u32 ret;
 
-	for(i = 0; i < vCodes.size(); ++i)
+	for (std::string& s : vCodes)
 	{
-		transform(vCodes[i].begin(), vCodes[i].end(), vCodes[i].begin(), toupper);
-		//PanicAlert("Encrypted AR Code\n%s", vCodes[i].c_str());
+		std::transform(s.begin(), s.end(), s.begin(), toupper);
 	}
 
 	if ((ret=alphatobin(uCodes, vCodes, (int)vCodes.size())))
@@ -473,9 +482,9 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
 	{
 		// Commented out since we just send the code anyways and hope for the best XD
 		//PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\n"
-		//	"First Code in Block(should be verification code):\n%s", vCodes[0].c_str());
+		// "First Code in Block(should be verification code):\n%s", vCodes[0].c_str());
 
-		for (i = 0; i < (vCodes.size()<<1); i+=2)
+		for (size_t i = 0; i < (vCodes.size()<<1); i+=2)
 		{
 			AREntry op;
 			op.cmd_addr = uCodes[i];
@@ -487,7 +496,7 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
 	else
 	{
 		// Skip passing the verification code back
-		for (i = 2; i < (vCodes.size()<<1); i+=2)
+		for (size_t i = 2; i < (vCodes.size()<<1); i+=2)
 		{
 			AREntry op;
 			op.cmd_addr = uCodes[i];
diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h
new file mode 100644
index 0000000000..084c0c6d03
--- /dev/null
+++ b/Source/Core/Core/ARDecrypt.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Core/ActionReplay.h"
+
+namespace ActionReplay
+{
+
+void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops);
+
+} //namespace
diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp
new file mode 100644
index 0000000000..a3319098ea
--- /dev/null
+++ b/Source/Core/Core/ActionReplay.cpp
@@ -0,0 +1,943 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// -----------------------------------------------------------------------------------------
+// Partial Action Replay code system implementation.
+// Will never be able to support some AR codes - specifically those that patch the running
+// Action Replay engine itself - yes they do exist!!!
+// Action Replay actually is a small virtual machine with a limited number of commands.
+// It probably is Turing complete - but what does that matter when AR codes can write
+// actual PowerPC code...
+// -----------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------------------
+// Code Types:
+// (Unconditional) Normal Codes (0): this one has subtypes inside
+// (Conditional) Normal Codes (1 - 7): these just compare values and set the line skip info
+// Zero Codes: any code with no address.  These codes are used to do special operations like memory copy, etc
+// -------------------------------------------------------------------------------------------------------------
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ActionReplay.h"
+#include "Core/ARDecrypt.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace ActionReplay
+{
+
+enum
+{
+	// Zero Code Types
+	ZCODE_END  = 0x00,
+	ZCODE_NORM = 0x02,
+	ZCODE_ROW  = 0x03,
+	ZCODE_04   = 0x04,
+
+	// Conditional Codes
+	CONDTIONAL_EQUAL                 = 0x01,
+	CONDTIONAL_NOT_EQUAL             = 0x02,
+	CONDTIONAL_LESS_THAN_SIGNED      = 0x03,
+	CONDTIONAL_GREATER_THAN_SIGNED   = 0x04,
+	CONDTIONAL_LESS_THAN_UNSIGNED    = 0x05,
+	CONDTIONAL_GREATER_THAN_UNSIGNED = 0x06,
+	CONDTIONAL_AND                   = 0x07, // bitwise AND
+
+	// Conditional Line Counts
+	CONDTIONAL_ONE_LINE        = 0x00,
+	CONDTIONAL_TWO_LINES       = 0x01,
+	CONDTIONAL_ALL_LINES_UNTIL = 0x02,
+	CONDTIONAL_ALL_LINES       = 0x03,
+
+	// Data Types
+	DATATYPE_8BIT        = 0x00,
+	DATATYPE_16BIT       = 0x01,
+	DATATYPE_32BIT       = 0x02,
+	DATATYPE_32BIT_FLOAT = 0x03,
+
+	// Normal Code 0 Subtypes
+	SUB_RAM_WRITE     = 0x00,
+	SUB_WRITE_POINTER = 0x01,
+	SUB_ADD_CODE      = 0x02,
+	SUB_MASTER_CODE   = 0x03,
+};
+
+// pointer to the code currently being run, (used by log messages that include the code name)
+static ARCode const* current_code = nullptr;
+
+static bool b_RanOnce = false;
+static std::vector<ARCode> arCodes;
+static std::vector<ARCode> activeCodes;
+static bool logSelf = false;
+static std::vector<std::string> arLog;
+
+struct ARAddr
+{
+	union
+	{
+		u32 address;
+		struct
+		{
+			u32 gcaddr : 25;
+			u32 size : 2;
+			u32 type : 3;
+			u32 subtype : 2;
+		};
+	};
+
+	ARAddr(const u32 addr) : address(addr) {}
+	u32 GCAddress() const { return gcaddr | 0x80000000; }
+	operator u32() const { return address; }
+};
+
+// ----------------------
+// AR Remote Functions
+void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad)
+{
+	// Parses the Action Replay section of a game ini file.
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats &&
+		!forceLoad)
+		return;
+
+	arCodes.clear();
+
+	std::vector<std::string> enabledLines;
+	std::set<std::string> enabledNames;
+	localIni.GetLines("ActionReplay_Enabled", &enabledLines);
+	for (const std::string& line : enabledLines)
+	{
+		if (line.size() != 0 && line[0] == '$')
+		{
+			std::string name = line.substr(1, line.size() - 1);
+			enabledNames.insert(name);
+		}
+	}
+
+	const IniFile* inis[2] = {&globalIni, &localIni};
+	for (const IniFile* ini : inis)
+	{
+		std::vector<std::string> lines;
+		std::vector<std::string> encryptedLines;
+		ARCode currentCode;
+
+		ini->GetLines("ActionReplay", &lines);
+
+		for (const std::string& line : lines)
+		{
+			if (line.empty())
+			{
+				continue;
+			}
+
+			std::vector<std::string> pieces;
+
+			// Check if the line is a name of the code
+			if (line[0] == '$')
+			{
+				if (currentCode.ops.size())
+				{
+					arCodes.push_back(currentCode);
+					currentCode.ops.clear();
+				}
+				if (encryptedLines.size())
+				{
+					DecryptARCode(encryptedLines, currentCode.ops);
+					arCodes.push_back(currentCode);
+					currentCode.ops.clear();
+					encryptedLines.clear();
+				}
+
+				currentCode.name = line.substr(1, line.size() - 1);
+				currentCode.active = enabledNames.find(currentCode.name) != enabledNames.end();
+				currentCode.user_defined = (ini == &localIni);
+			}
+			else
+			{
+				SplitString(line, ' ', pieces);
+
+				// Check if the AR code is decrypted
+				if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
+				{
+					AREntry op;
+					bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr);
+					bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
+
+					if (success_addr && success_val)
+					{
+						currentCode.ops.push_back(op);
+					}
+					else
+					{
+						PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str());
+
+						if (!success_addr)
+							PanicAlertT("The address is invalid");
+
+						if (!success_val)
+							PanicAlertT("The value is invalid");
+					}
+				}
+				else
+				{
+					SplitString(line, '-', pieces);
+					if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5)
+					{
+						// Encrypted AR code
+						// Decryption is done in "blocks", so we must push blocks into a vector,
+						// then send to decrypt when a new block is encountered, or if it's the last block.
+						encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]);
+					}
+				}
+			}
+		}
+
+		// Handle the last code correctly.
+		if (currentCode.ops.size())
+		{
+			arCodes.push_back(currentCode);
+		}
+		if (encryptedLines.size())
+		{
+			DecryptARCode(encryptedLines, currentCode.ops);
+			arCodes.push_back(currentCode);
+		}
+	}
+
+	UpdateActiveList();
+}
+
+void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalIni, IniFile& localIni)
+{
+	LoadCodes(globalIni, localIni, true);
+	_arCodes = arCodes;
+}
+
+
+static void LogInfo(const char *format, ...)
+{
+	if (!b_RanOnce)
+	{
+		if (LogManager::GetMaxLevel() >= LogTypes::LINFO || logSelf)
+		{
+			char* temp = (char*)alloca(strlen(format)+512);
+			va_list args;
+			va_start(args, format);
+			CharArrayFromFormatV(temp, 512, format, args);
+			va_end(args);
+			INFO_LOG(ACTIONREPLAY, "%s", temp);
+
+			if (logSelf)
+			{
+				std::string text = temp;
+				text += '\n';
+				arLog.push_back(text);
+			}
+		}
+	}
+}
+
+size_t GetCodeListSize()
+{
+	return arCodes.size();
+}
+
+ARCode GetARCode(size_t index)
+{
+	if (index > arCodes.size())
+	{
+		PanicAlertT("GetARCode: Index is greater than "
+			"ar code list size %lu", (unsigned long)index);
+		return ARCode();
+	}
+	return arCodes[index];
+}
+
+void SetARCode_IsActive(bool active, size_t index)
+{
+	if (index > arCodes.size())
+	{
+		PanicAlertT("SetARCode_IsActive: Index is greater than "
+			"ar code list size %lu", (unsigned long)index);
+		return;
+	}
+	arCodes[index].active = active;
+	UpdateActiveList();
+}
+
+void UpdateActiveList()
+{
+	bool old_value = SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats;
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = false;
+	b_RanOnce = false;
+	activeCodes.clear();
+	for (auto& arCode : arCodes)
+	{
+		if (arCode.active)
+			activeCodes.push_back(arCode);
+	}
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = old_value;
+}
+
+void EnableSelfLogging(bool enable)
+{
+	logSelf = enable;
+}
+
+const std::vector<std::string> &GetSelfLog()
+{
+	return arLog;
+}
+
+bool IsSelfLogging()
+{
+	return logSelf;
+}
+
+// ----------------------
+// Code Functions
+static bool Subtype_RamWriteAndFill(const ARAddr& addr, const u32 data)
+{
+	const u32 new_addr = addr.GCAddress();
+
+	LogInfo("Hardware Address: %08x", new_addr);
+	LogInfo("Size: %08x", addr.size);
+
+	switch (addr.size)
+	{
+	case DATATYPE_8BIT:
+	{
+		LogInfo("8-bit Write");
+		LogInfo("--------");
+		u32 repeat = data >> 8;
+		for (u32 i = 0; i <= repeat; ++i)
+		{
+			PowerPC::HostWrite_U8(data & 0xFF, new_addr + i);
+			LogInfo("Wrote %08x to address %08x", data & 0xFF, new_addr + i);
+		}
+		LogInfo("--------");
+		break;
+	}
+
+	case DATATYPE_16BIT:
+	{
+		LogInfo("16-bit Write");
+		LogInfo("--------");
+		u32 repeat = data >> 16;
+		for (u32 i = 0; i <= repeat; ++i)
+		{
+			PowerPC::HostWrite_U16(data & 0xFFFF, new_addr + i * 2);
+			LogInfo("Wrote %08x to address %08x", data & 0xFFFF, new_addr + i * 2);
+		}
+		LogInfo("--------");
+		break;
+	}
+
+	case DATATYPE_32BIT_FLOAT:
+	case DATATYPE_32BIT: // Dword write
+		LogInfo("32-bit Write");
+		LogInfo("--------");
+		PowerPC::HostWrite_U32(data, new_addr);
+		LogInfo("Wrote %08x to address %08x", data, new_addr);
+		LogInfo("--------");
+		break;
+
+	default:
+		LogInfo("Bad Size");
+		PanicAlertT("Action Replay Error: Invalid size "
+			"(%08x : address = %08x) in Ram Write And Fill (%s)",
+			addr.size, addr.gcaddr, current_code->name.c_str());
+		return false;
+	}
+
+	return true;
+}
+
+static bool Subtype_WriteToPointer(const ARAddr& addr, const u32 data)
+{
+	const u32 new_addr = addr.GCAddress();
+	const u32 ptr = PowerPC::HostRead_U32(new_addr);
+
+	LogInfo("Hardware Address: %08x", new_addr);
+	LogInfo("Size: %08x", addr.size);
+
+	switch (addr.size)
+	{
+	case DATATYPE_8BIT:
+	{
+		LogInfo("Write 8-bit to pointer");
+		LogInfo("--------");
+		const u8 thebyte = data & 0xFF;
+		const u32 offset = data >> 8;
+		LogInfo("Pointer: %08x", ptr);
+		LogInfo("Byte: %08x", thebyte);
+		LogInfo("Offset: %08x", offset);
+		PowerPC::HostWrite_U8(thebyte, ptr + offset);
+		LogInfo("Wrote %08x to address %08x", thebyte, ptr + offset);
+		LogInfo("--------");
+		break;
+	}
+
+	case DATATYPE_16BIT:
+	{
+		LogInfo("Write 16-bit to pointer");
+		LogInfo("--------");
+		const u16 theshort = data & 0xFFFF;
+		const u32 offset = (data >> 16) << 1;
+		LogInfo("Pointer: %08x", ptr);
+		LogInfo("Byte: %08x", theshort);
+		LogInfo("Offset: %08x", offset);
+		PowerPC::HostWrite_U16(theshort, ptr + offset);
+		LogInfo("Wrote %08x to address %08x", theshort, ptr + offset);
+		LogInfo("--------");
+		break;
+	}
+
+	case DATATYPE_32BIT_FLOAT:
+	case DATATYPE_32BIT:
+		LogInfo("Write 32-bit to pointer");
+		LogInfo("--------");
+		PowerPC::HostWrite_U32(data, ptr);
+		LogInfo("Wrote %08x to address %08x", data, ptr);
+		LogInfo("--------");
+		break;
+
+	default:
+		LogInfo("Bad Size");
+		PanicAlertT("Action Replay Error: Invalid size "
+			"(%08x : address = %08x) in Write To Pointer (%s)",
+			addr.size, addr.gcaddr, current_code->name.c_str());
+		return false;
+	}
+	return true;
+}
+
+static bool Subtype_AddCode(const ARAddr& addr, const u32 data)
+{
+	// Used to increment/decrement a value in memory
+	const u32 new_addr = addr.GCAddress();
+
+	LogInfo("Hardware Address: %08x", new_addr);
+	LogInfo("Size: %08x", addr.size);
+
+	switch (addr.size)
+	{
+	case DATATYPE_8BIT:
+		LogInfo("8-bit Add");
+		LogInfo("--------");
+		PowerPC::HostWrite_U8(PowerPC::HostRead_U8(new_addr) + data, new_addr);
+		LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(new_addr) + (data & 0xFF), new_addr);
+		LogInfo("--------");
+		break;
+
+	case DATATYPE_16BIT:
+		LogInfo("16-bit Add");
+		LogInfo("--------");
+		PowerPC::HostWrite_U16(PowerPC::HostRead_U16(new_addr) + data, new_addr);
+		LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U16(new_addr) + (data & 0xFFFF), new_addr);
+		LogInfo("--------");
+		break;
+
+	case DATATYPE_32BIT:
+		LogInfo("32-bit Add");
+		LogInfo("--------");
+		PowerPC::HostWrite_U32(PowerPC::HostRead_U32(new_addr) + data, new_addr);
+		LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U32(new_addr) + data, new_addr);
+		LogInfo("--------");
+		break;
+
+	case DATATYPE_32BIT_FLOAT:
+	{
+		LogInfo("32-bit floating Add");
+		LogInfo("--------");
+
+		const u32 read = PowerPC::HostRead_U32(new_addr);
+		const float fread = *((float*)&read) + (float)data; // data contains an integer value
+		const u32 newval = *((u32*)&fread);
+		PowerPC::HostWrite_U32(newval, new_addr);
+		LogInfo("Old Value %08x", read);
+		LogInfo("Increment %08x", data);
+		LogInfo("New value %08x", newval);
+		LogInfo("--------");
+		break;
+	}
+
+	default:
+		LogInfo("Bad Size");
+		PanicAlertT("Action Replay Error: Invalid size "
+			"(%08x : address = %08x) in Add Code (%s)",
+			addr.size, addr.gcaddr, current_code->name.c_str());
+		return false;
+	}
+	return true;
+}
+
+static bool Subtype_MasterCodeAndWriteToCCXXXXXX(const ARAddr& addr, const u32 data)
+{
+	// code not yet implemented - TODO
+	// u32 new_addr = (addr & 0x01FFFFFF) | 0x80000000;
+	// u8  mcode_type = (data & 0xFF0000) >> 16;
+	// u8  mcode_count = (data & 0xFF00) >> 8;
+	// u8  mcode_number = data & 0xFF;
+	PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
+		"Master codes are not needed. Do not use master codes.", current_code->name.c_str());
+	return false;
+}
+
+static bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr& addr, const u32 data) // This needs more testing
+{
+	const u32 new_addr = ((ARAddr*)&val_last)->GCAddress();
+	const u8 size = ((ARAddr*)&val_last)->size;
+
+	const s16 addr_incr = (s16)(data & 0xFFFF);
+	const s8  val_incr = (s8)(data >> 24);
+	const u8  write_num = (data & 0xFF0000) >> 16;
+
+	u32 val = addr;
+	u32 curr_addr = new_addr;
+
+	LogInfo("Current Hardware Address: %08x", new_addr);
+	LogInfo("Size: %08x", addr.size);
+	LogInfo("Write Num: %08x", write_num);
+	LogInfo("Address Increment: %i", addr_incr);
+	LogInfo("Value Increment: %i", val_incr);
+
+	switch (size)
+	{
+	case DATATYPE_8BIT:
+		LogInfo("8-bit Write");
+		LogInfo("--------");
+		for (int i = 0; i < write_num; ++i)
+		{
+			PowerPC::HostWrite_U8(val & 0xFF, curr_addr);
+			curr_addr += addr_incr;
+			val += val_incr;
+			LogInfo("Write %08x to address %08x", val & 0xFF, curr_addr);
+
+			LogInfo("Value Update: %08x", val);
+			LogInfo("Current Hardware Address Update: %08x", curr_addr);
+		}
+		LogInfo("--------");
+		break;
+
+	case DATATYPE_16BIT:
+		LogInfo("16-bit Write");
+		LogInfo("--------");
+		for (int i=0; i < write_num; ++i)
+		{
+			PowerPC::HostWrite_U16(val & 0xFFFF, curr_addr);
+			LogInfo("Write %08x to address %08x", val & 0xFFFF, curr_addr);
+			curr_addr += addr_incr * 2;
+			val += val_incr;
+			LogInfo("Value Update: %08x", val);
+			LogInfo("Current Hardware Address Update: %08x", curr_addr);
+		}
+		LogInfo("--------");
+		break;
+
+	case DATATYPE_32BIT:
+		LogInfo("32-bit Write");
+		LogInfo("--------");
+		for (int i = 0; i < write_num; ++i)
+		{
+			PowerPC::HostWrite_U32(val, curr_addr);
+			LogInfo("Write %08x to address %08x", val, curr_addr);
+			curr_addr += addr_incr * 4;
+			val += val_incr;
+			LogInfo("Value Update: %08x", val);
+			LogInfo("Current Hardware Address Update: %08x", curr_addr);
+		}
+		LogInfo("--------");
+		break;
+
+	default:
+		LogInfo("Bad Size");
+		PanicAlertT("Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)", size, new_addr, current_code->name.c_str());
+		return false;
+	}
+	return true;
+}
+
+// Looks like this is new?? - untested
+static bool ZeroCode_MemoryCopy(const u32 val_last, const ARAddr& addr, const u32 data)
+{
+	const u32 addr_dest = val_last | 0x06000000;
+	const u32 addr_src = addr.GCAddress();
+
+	const u8 num_bytes = data & 0x7FFF;
+
+	LogInfo("Dest Address: %08x", addr_dest);
+	LogInfo("Src Address: %08x", addr_src);
+	LogInfo("Size: %08x", num_bytes);
+
+	if ((data & ~0x7FFF) == 0x0000)
+	{
+		if ((data >> 24) != 0x0)
+		{ // Memory Copy With Pointers Support
+			LogInfo("Memory Copy With Pointers Support");
+			LogInfo("--------");
+			for (int i = 0; i < 138; ++i)
+			{
+				PowerPC::HostWrite_U8(PowerPC::HostRead_U8(addr_src + i), addr_dest + i);
+				LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(addr_src + i), addr_dest + i);
+			}
+			LogInfo("--------");
+		}
+		else
+		{ // Memory Copy Without Pointer Support
+			LogInfo("Memory Copy Without Pointers Support");
+			LogInfo("--------");
+			for (int i=0; i < num_bytes; ++i)
+			{
+				PowerPC::HostWrite_U8(PowerPC::HostRead_U8(addr_src + i), addr_dest + i);
+				LogInfo("Wrote %08x to address %08x", PowerPC::HostRead_U8(addr_src + i), addr_dest + i);
+			}
+			LogInfo("--------");
+			return true;
+		}
+	}
+	else
+	{
+		LogInfo("Bad Value");
+		PanicAlertT("Action Replay Error: Invalid value (%08x) in Memory Copy (%s)", (data & ~0x7FFF), current_code->name.c_str());
+		return false;
+	}
+	return true;
+}
+
+static bool NormalCode(const ARAddr& addr, const u32 data)
+{
+	switch (addr.subtype)
+	{
+	case SUB_RAM_WRITE: // Ram write (and fill)
+		LogInfo("Doing Ram Write And Fill");
+		if (!Subtype_RamWriteAndFill(addr, data))
+			return false;
+		break;
+
+	case SUB_WRITE_POINTER: // Write to pointer
+		LogInfo("Doing Write To Pointer");
+		if (!Subtype_WriteToPointer(addr, data))
+			return false;
+		break;
+
+	case SUB_ADD_CODE: // Increment Value
+		LogInfo("Doing Add Code");
+		if (!Subtype_AddCode(addr, data))
+			return false;
+		break;
+
+	case SUB_MASTER_CODE: // Master Code & Write to CCXXXXXX
+		LogInfo("Doing Master Code And Write to CCXXXXXX (ncode not supported)");
+		if (!Subtype_MasterCodeAndWriteToCCXXXXXX(addr, data))
+			return false;
+		break;
+
+	default:
+		LogInfo("Bad Subtype");
+		PanicAlertT("Action Replay: Normal Code 0: Invalid Subtype %08x (%s)", addr.subtype, current_code->name.c_str());
+		return false;
+		break;
+	}
+
+	return true;
+}
+
+static bool CompareValues(const u32 val1, const u32 val2, const int type)
+{
+	switch (type)
+	{
+	case CONDTIONAL_EQUAL:
+		LogInfo("Type 1: If Equal");
+		return (val1 == val2);
+		break;
+
+	case CONDTIONAL_NOT_EQUAL:
+		LogInfo("Type 2: If Not Equal");
+		return (val1 != val2);
+		break;
+
+	case CONDTIONAL_LESS_THAN_SIGNED:
+		LogInfo("Type 3: If Less Than (Signed)");
+		return ((int)val1 < (int)val2);
+		break;
+
+	case CONDTIONAL_GREATER_THAN_SIGNED:
+		LogInfo("Type 4: If Greater Than (Signed)");
+		return ((int)val1 >(int)val2);
+		break;
+
+	case CONDTIONAL_LESS_THAN_UNSIGNED:
+		LogInfo("Type 5: If Less Than (Unsigned)");
+		return (val1 < val2);
+		break;
+
+	case CONDTIONAL_GREATER_THAN_UNSIGNED:
+		LogInfo("Type 6: If Greater Than (Unsigned)");
+		return (val1 > val2);
+		break;
+
+	case CONDTIONAL_AND:
+		LogInfo("Type 7: If And");
+		return !!(val1 & val2); // bitwise AND
+		break;
+
+	default: LogInfo("Unknown Compare type");
+		PanicAlertT("Action Replay: Invalid Normal Code Type %08x (%s)", type, current_code->name.c_str());
+		return false;
+		break;
+	}
+}
+
+static bool ConditionalCode(const ARAddr& addr, const u32 data, int* const pSkipCount)
+{
+	const u32 new_addr = addr.GCAddress();
+
+	LogInfo("Size: %08x", addr.size);
+	LogInfo("Hardware Address: %08x", new_addr);
+
+	bool result = true;
+
+	switch (addr.size)
+	{
+	case DATATYPE_8BIT:
+		result = CompareValues((u32)PowerPC::HostRead_U8(new_addr), (data & 0xFF), addr.type);
+		break;
+
+	case DATATYPE_16BIT:
+		result = CompareValues((u32)PowerPC::HostRead_U16(new_addr), (data & 0xFFFF), addr.type);
+		break;
+
+	case DATATYPE_32BIT_FLOAT:
+	case DATATYPE_32BIT:
+		result = CompareValues(PowerPC::HostRead_U32(new_addr), data, addr.type);
+		break;
+
+	default:
+		LogInfo("Bad Size");
+		PanicAlertT("Action Replay: Conditional Code: Invalid Size %08x (%s)", addr.size, current_code->name.c_str());
+		return false;
+		break;
+	}
+
+	// if the comparison failed we need to skip some lines
+	if (false == result)
+	{
+		switch (addr.subtype)
+		{
+		case CONDTIONAL_ONE_LINE:
+		case CONDTIONAL_TWO_LINES:
+			*pSkipCount = addr.subtype + 1; // Skip 1 or 2 lines
+			break;
+
+		// Skip all lines,
+		// Skip lines until a "00000000 40000000" line is reached
+		case CONDTIONAL_ALL_LINES:
+		case CONDTIONAL_ALL_LINES_UNTIL:
+			*pSkipCount = -(int) addr.subtype;
+			break;
+
+		default:
+			LogInfo("Bad Subtype");
+			PanicAlertT("Action Replay: Normal Code %i: Invalid subtype %08x (%s)", 1, addr.subtype, current_code->name.c_str());
+			return false;
+			break;
+		}
+	}
+
+	return true;
+}
+
+
+void RunAllActive()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
+	{
+		for (auto& activeCode : activeCodes)
+		{
+			if (activeCode.active)
+			{
+				activeCode.active = RunCode(activeCode);
+				LogInfo("\n");
+			}
+		}
+
+		b_RanOnce = true;
+	}
+}
+
+bool RunCode(const ARCode &arcode)
+{
+	// The mechanism is different than what the real AR uses, so there may be compatibility problems.
+
+	bool doFillNSlide = false;
+	bool doMemoryCopy = false;
+
+	// used for conditional codes
+	int skip_count = 0;
+
+	u32 val_last = 0;
+
+	current_code = &arcode;
+
+	LogInfo("Code Name: %s", arcode.name.c_str());
+	LogInfo("Number of codes: %i", arcode.ops.size());
+
+	for (const AREntry& entry : arcode.ops)
+	{
+		const ARAddr& addr = *(ARAddr*)&entry.cmd_addr;
+		const u32 data = entry.value;
+
+		// after a conditional code, skip lines if needed
+		if (skip_count)
+		{
+			if (skip_count > 0) // skip x lines
+			{
+				LogInfo("Line skipped");
+				--skip_count;
+			}
+			else if (-CONDTIONAL_ALL_LINES == skip_count)
+			{
+				// skip all lines
+				LogInfo("All Lines skipped");
+				return true; // don't need to iterate through the rest of the ops
+			}
+			else if (-CONDTIONAL_ALL_LINES_UNTIL == skip_count)
+			{
+				// skip until a "00000000 40000000" line is reached
+				LogInfo("Line skipped");
+				if (addr == 0 && 0x40000000 == data) // check for an endif line
+					skip_count = 0;
+			}
+
+			continue;
+		}
+
+		LogInfo("--- Running Code: %08x %08x ---", addr.address, data);
+		//LogInfo("Command: %08x", cmd);
+
+		// Do Fill & Slide
+		if (doFillNSlide)
+		{
+			doFillNSlide = false;
+			LogInfo("Doing Fill And Slide");
+			if (false == ZeroCode_FillAndSlide(val_last, addr, data))
+				return false;
+			continue;
+		}
+
+		// Memory Copy
+		if (doMemoryCopy)
+		{
+			doMemoryCopy = false;
+			LogInfo("Doing Memory Copy");
+			if (false == ZeroCode_MemoryCopy(val_last, addr, data))
+				return false;
+			continue;
+		}
+
+		// ActionReplay program self modification codes
+		if (addr >= 0x00002000 && addr < 0x00003000)
+		{
+			LogInfo("This action replay simulator does not support codes that modify Action Replay itself.");
+			PanicAlertT("This action replay simulator does not support codes that modify Action Replay itself.");
+			return false;
+		}
+
+		// skip these weird init lines
+		// TODO: Where are the "weird init lines"?
+		//if (iter == code.ops.begin() && cmd == 1)
+		//continue;
+
+		// Zero codes
+		if (0x0 == addr) // Check if the code is a zero code
+		{
+			const u8 zcode = (data >> 29);
+
+			LogInfo("Doing Zero Code %08x", zcode);
+
+			switch (zcode)
+			{
+			case ZCODE_END: // END OF CODES
+				LogInfo("ZCode: End Of Codes");
+				return true;
+				break;
+
+				// TODO: the "00000000 40000000"(end if) codes fall into this case, I don't think that is correct
+			case ZCODE_NORM: // Normal execution of codes
+				// Todo: Set register 1BB4 to 0
+				LogInfo("ZCode: Normal execution of codes, set register 1BB4 to 0 (zcode not supported)");
+				break;
+
+			case ZCODE_ROW: // Executes all codes in the same row
+				// Todo: Set register 1BB4 to 1
+				LogInfo("ZCode: Executes all codes in the same row, Set register 1BB4 to 1 (zcode not supported)");
+				PanicAlertT("Zero 3 code not supported");
+				return false;
+				break;
+
+			case ZCODE_04: // Fill & Slide or Memory Copy
+				if (0x3 == ((data >> 25) & 0x03))
+				{
+					LogInfo("ZCode: Memory Copy");
+					doMemoryCopy = true;
+					val_last = data;
+				}
+				else
+				{
+					LogInfo("ZCode: Fill And Slide");
+					doFillNSlide = true;
+					val_last = data;
+				}
+				break;
+
+			default:
+				LogInfo("ZCode: Unknown");
+				PanicAlertT("Zero code unknown to Dolphin: %08x", zcode);
+				return false;
+				break;
+			}
+
+			// done handling zero codes
+			continue;
+		}
+
+		// Normal codes
+		LogInfo("Doing Normal Code %08x", addr.type);
+		LogInfo("Subtype: %08x", addr.subtype);
+
+		switch (addr.type)
+		{
+		case 0x00:
+			if (false == NormalCode(addr, data))
+				return false;
+			break;
+
+		default:
+			LogInfo("This Normal Code is a Conditional Code");
+			if (false == ConditionalCode(addr, data, &skip_count))
+				return false;
+			break;
+		}
+	}
+
+	b_RanOnce = true;
+
+	return true;
+}
+
+std::vector<ARCode>* GetARCodes()
+{
+	return &arCodes;
+}
+
+} // namespace ActionReplay
diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h
new file mode 100644
index 0000000000..1109eb0fa0
--- /dev/null
+++ b/Source/Core/Core/ActionReplay.h
@@ -0,0 +1,44 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include "Common/CommonTypes.h"
+
+class IniFile;
+
+namespace ActionReplay
+{
+
+struct AREntry
+{
+	AREntry() {}
+	AREntry(u32 _addr, u32 _value) : cmd_addr(_addr), value(_value) {}
+	u32 cmd_addr;
+	u32 value;
+};
+
+struct ARCode
+{
+	std::string name;
+	std::vector<AREntry> ops;
+	bool active;
+	bool user_defined;
+};
+
+void RunAllActive();
+bool RunCode(const ARCode &arcode);
+void LoadCodes(const IniFile &globalini, const IniFile &localIni, bool forceLoad);
+void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalini, IniFile &localIni);
+size_t GetCodeListSize();
+ARCode GetARCode(size_t index);
+void SetARCode_IsActive(bool active, size_t index);
+void UpdateActiveList();
+void EnableSelfLogging(bool enable);
+const std::vector<std::string> &GetSelfLog();
+bool IsSelfLogging();
+std::vector<ARCode>* GetARCodes();
+}  // namespace
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
new file mode 100644
index 0000000000..6ff550c449
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -0,0 +1,459 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Host.h"
+#include "Core/PatchEngine.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/VolumeCreator.h"
+
+void CBoot::Load_FST(bool _bIsWii)
+{
+	if (!DVDInterface::VolumeIsValid())
+		return;
+
+	const DiscIO::IVolume& volume = DVDInterface::GetVolume();
+
+	// copy first 20 bytes of disc to start of Mem 1
+	DVDInterface::DVDRead(/*offset*/0, /*address*/0, /*length*/0x20, false);
+
+	// copy of game id
+	Memory::Write_U32(Memory::Read_U32(0x0000), 0x3180);
+
+	u32 shift = 0;
+	if (_bIsWii)
+		shift = 2;
+
+	u32 fstOffset  = volume.Read32(0x0424, _bIsWii) << shift;
+	u32 fstSize    = volume.Read32(0x0428, _bIsWii) << shift;
+	u32 maxFstSize = volume.Read32(0x042c, _bIsWii) << shift;
+
+	u32 arenaHigh = ROUND_DOWN(0x817FFFFF - maxFstSize, 0x20);
+	Memory::Write_U32(arenaHigh, 0x00000034);
+
+	// load FST
+	DVDInterface::DVDRead(fstOffset, arenaHigh, fstSize, _bIsWii);
+	Memory::Write_U32(arenaHigh, 0x00000038);
+	Memory::Write_U32(maxFstSize, 0x0000003c);
+}
+
+void CBoot::UpdateDebugger_MapLoaded()
+{
+	Host_NotifyMapLoaded();
+}
+
+bool CBoot::FindMapFile(std::string* existing_map_file,
+                        std::string* writable_map_file,
+                        std::string* title_id)
+{
+	std::string title_id_str;
+	size_t name_begin_index;
+
+	SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	switch (_StartupPara.m_BootType)
+	{
+	case SCoreStartupParameter::BOOT_WII_NAND:
+	{
+		const DiscIO::INANDContentLoader& Loader =
+				DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename);
+		if (Loader.IsValid())
+		{
+			u64 TitleID = Loader.GetTitleID();
+			title_id_str = StringFromFormat("%08X_%08X",
+					(u32)(TitleID >> 32) & 0xFFFFFFFF,
+					(u32)TitleID & 0xFFFFFFFF);
+		}
+		break;
+	}
+
+	case SCoreStartupParameter::BOOT_ELF:
+	case SCoreStartupParameter::BOOT_DOL:
+		// Strip the .elf/.dol file extension and directories before the name
+		name_begin_index = _StartupPara.m_strFilename.find_last_of("/") + 1;
+		if ((_StartupPara.m_strFilename.find_last_of("\\") + 1) > name_begin_index)
+		{
+			name_begin_index = _StartupPara.m_strFilename.find_last_of("\\") + 1;
+		}
+		title_id_str = _StartupPara.m_strFilename.substr(
+				name_begin_index, _StartupPara.m_strFilename.size() - 4 - name_begin_index);
+		break;
+
+	default:
+		title_id_str = _StartupPara.GetUniqueID();
+		break;
+	}
+
+	if (writable_map_file)
+		*writable_map_file = File::GetUserPath(D_MAPS_IDX) + title_id_str + ".map";
+
+	if (title_id)
+		*title_id = title_id_str;
+
+	bool found = false;
+	static const std::string maps_directories[] = {
+		File::GetUserPath(D_MAPS_IDX),
+		File::GetSysDirectory() + MAPS_DIR DIR_SEP
+	};
+	for (size_t i = 0; !found && i < ArraySize(maps_directories); ++i)
+	{
+		std::string path = maps_directories[i] + title_id_str + ".map";
+		if (File::Exists(path))
+		{
+			found = true;
+			if (existing_map_file)
+				*existing_map_file = path;
+		}
+	}
+
+	return found;
+}
+
+bool CBoot::LoadMapFromFilename()
+{
+	std::string strMapFilename;
+	bool found = FindMapFile(&strMapFilename, nullptr);
+	if (found && g_symbolDB.LoadMap(strMapFilename))
+	{
+		UpdateDebugger_MapLoaded();
+		return true;
+	}
+
+	return false;
+}
+
+// If ipl.bin is not found, this function does *some* of what BS1 does:
+// loading IPL(BS2) and jumping to it.
+// It does not initialize the hardware or anything else like BS1 does.
+bool CBoot::Load_BS2(const std::string& _rBootROMFilename)
+{
+	const u32 USA = 0x1FCE3FD6;
+	const u32 USA_v1_1 = 0x4D5935D1;
+	const u32 JAP = 0x87424396;
+	const u32 PAL = 0xA0EA7341;
+	//const u32 PanasonicQJ = 0xAEA8265C;
+	//const u32 PanasonicQU = 0x94015753;
+
+	// Load the whole ROM dump
+	std::string data;
+	if (!File::ReadFileToString(_rBootROMFilename, data))
+		return false;
+
+	u32 ipl_hash = HashAdler32((const u8*)data.data(), data.size());
+	std::string ipl_region;
+	switch (ipl_hash)
+	{
+	case USA:
+	case USA_v1_1:
+		ipl_region = USA_DIR;
+		break;
+	case JAP:
+		ipl_region = JAP_DIR;
+		break;
+	case PAL:
+		ipl_region = EUR_DIR;
+		break;
+	default:
+		PanicAlertT("IPL with unknown hash %x", ipl_hash);
+		break;
+	}
+
+	std::string BootRegion = _rBootROMFilename.substr(_rBootROMFilename.find_last_of(DIR_SEP) - 3, 3);
+	if (BootRegion != ipl_region)
+		PanicAlertT("%s IPL found in %s directory. The disc might not be recognized",
+		            ipl_region.c_str(), BootRegion.c_str());
+
+	// Run the descrambler over the encrypted section containing BS1/BS2
+	CEXIIPL::Descrambler((u8*)data.data() + 0x100, 0x1AFE00);
+
+	// TODO: Execution is supposed to start at 0xFFF00000, not 0x81200000;
+	// copying the initial boot code to 0x81200000 is a hack.
+	// For now, HLE the first few instructions and start at 0x81200150
+	// to work around this.
+	Memory::CopyToEmu(0x01200000, data.data() + 0x100, 0x700);
+	Memory::CopyToEmu(0x01300000, data.data() + 0x820, 0x1AFE00);
+	PowerPC::ppcState.gpr[3] = 0xfff0001f;
+	PowerPC::ppcState.gpr[4] = 0x00002030;
+	PowerPC::ppcState.gpr[5] = 0x0000009c;
+	PowerPC::ppcState.msr = 0x00002030;
+	PowerPC::ppcState.spr[SPR_HID0] = 0x0011c464;
+	PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_IBAT3U] = 0xfff0001f;
+	PowerPC::ppcState.spr[SPR_IBAT3L] = 0xfff00001;
+	PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+	PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+	PowerPC::ppcState.spr[SPR_DBAT3U] = 0xfff0001f;
+	PowerPC::ppcState.spr[SPR_DBAT3L] = 0xfff00001;
+	PC = 0x81200150;
+	return true;
+}
+
+
+// Third boot step after BootManager and Core. See Call schedule in BootManager.cpp
+bool CBoot::BootUp()
+{
+	SCoreStartupParameter& _StartupPara =
+	SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str());
+
+	g_symbolDB.Clear();
+
+	// PAL Wii uses NTSC framerate and linecount in 60Hz modes
+	const bool bPAL60 = _StartupPara.bWii && SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60");
+	VideoInterface::Preset(_StartupPara.bNTSC || bPAL60);
+
+	switch (_StartupPara.m_BootType)
+	{
+	// GCM and Wii
+	case SCoreStartupParameter::BOOT_ISO:
+	{
+		DVDInterface::SetVolumeName(_StartupPara.m_strFilename);
+		DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
+		if (!DVDInterface::VolumeIsValid())
+			return false;
+
+		const DiscIO::IVolume& pVolume = DVDInterface::GetVolume();
+
+		if ((pVolume.GetVolumeType() == DiscIO::IVolume::WII_DISC) != _StartupPara.bWii)
+		{
+			PanicAlertT("Warning - starting ISO in wrong console mode!");
+		}
+
+		std::string unique_id = DVDInterface::GetVolume().GetUniqueID();
+		if (unique_id.size() >= 4)
+			VideoInterface::SetRegionReg(unique_id.at(3));
+
+		u32 tmd_size;
+		std::unique_ptr<u8[]> tmd_buf = pVolume.GetTMD(&tmd_size);
+		if (tmd_size)
+		{
+			WII_IPC_HLE_Interface::ES_DIVerify(tmd_buf.get(), tmd_size);
+		}
+
+		_StartupPara.bWii = pVolume.GetVolumeType() == DiscIO::IVolume::WII_DISC;
+
+		// HLE BS2 or not
+		if (_StartupPara.bHLE_BS2)
+		{
+			EmulatedBS2(_StartupPara.bWii);
+		}
+		else if (!Load_BS2(_StartupPara.m_strBootROM))
+		{
+			// If we can't load the bootrom file we HLE it instead
+			EmulatedBS2(_StartupPara.bWii);
+		}
+		else
+		{
+			// Load patches if they weren't already
+			PatchEngine::LoadPatches();
+		}
+
+		// Scan for common HLE functions
+		if (_StartupPara.bSkipIdle && _StartupPara.bHLE_BS2 && !_StartupPara.bEnableDebugging)
+		{
+			PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
+			SignatureDB db;
+			if (db.Load(File::GetSysDirectory() + TOTALDB))
+			{
+				db.Apply(&g_symbolDB);
+				HLE::PatchFunctions();
+				db.Clear();
+			}
+		}
+
+		// Try to load the symbol map if there is one, and then scan it for
+		// and eventually replace code
+		if (LoadMapFromFilename())
+			HLE::PatchFunctions();
+
+		break;
+	}
+
+	// DOL
+	case SCoreStartupParameter::BOOT_DOL:
+	{
+		CDolLoader dolLoader(_StartupPara.m_strFilename);
+		if (!dolLoader.IsValid())
+			return false;
+
+		// Check if we have gotten a Wii file or not
+		bool dolWii = dolLoader.IsWii();
+		if (dolWii != _StartupPara.bWii)
+		{
+			PanicAlertT("Warning - starting DOL in wrong console mode!");
+		}
+
+		bool BS2Success = false;
+
+		if (dolWii)
+		{
+			BS2Success = EmulatedBS2(dolWii);
+		}
+		else if ((!DVDInterface::VolumeIsValid() || DVDInterface::GetVolume().GetVolumeType() != DiscIO::IVolume::WII_DISC) &&
+		         !_StartupPara.m_strDefaultISO.empty())
+		{
+			DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
+			BS2Success = EmulatedBS2(dolWii);
+		}
+
+		if (!_StartupPara.m_strDVDRoot.empty())
+		{
+			NOTICE_LOG(BOOT, "Setting DVDRoot %s", _StartupPara.m_strDVDRoot.c_str());
+			DVDInterface::SetVolumeDirectory(_StartupPara.m_strDVDRoot, dolWii, _StartupPara.m_strApploader, _StartupPara.m_strFilename);
+			BS2Success = EmulatedBS2(dolWii);
+		}
+
+		DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
+
+		if (!BS2Success)
+		{
+			// Set up MSR and the BAT SPR registers.
+			UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
+			m_MSR.FP = 1;
+			m_MSR.DR = 1;
+			m_MSR.IR = 1;
+			m_MSR.EE = 1;
+			PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+			PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+			PowerPC::ppcState.spr[SPR_IBAT4U] = 0x90001fff;
+			PowerPC::ppcState.spr[SPR_IBAT4L] = 0x10000002;
+			PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+			PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+			PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+			PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+			PowerPC::ppcState.spr[SPR_DBAT4U] = 0x90001fff;
+			PowerPC::ppcState.spr[SPR_DBAT4L] = 0x10000002;
+			PowerPC::ppcState.spr[SPR_DBAT5U] = 0xd0001fff;
+			PowerPC::ppcState.spr[SPR_DBAT5L] = 0x1000002a;
+
+			dolLoader.Load();
+			PC = dolLoader.GetEntryPoint();
+		}
+
+		if (LoadMapFromFilename())
+			HLE::PatchFunctions();
+
+		break;
+	}
+
+	// ELF
+	case SCoreStartupParameter::BOOT_ELF:
+	{
+		// load image or create virtual drive from directory
+		if (!_StartupPara.m_strDVDRoot.empty())
+		{
+			NOTICE_LOG(BOOT, "Setting DVDRoot %s", _StartupPara.m_strDVDRoot.c_str());
+			DVDInterface::SetVolumeDirectory(_StartupPara.m_strDVDRoot, _StartupPara.bWii);
+		}
+		else if (!_StartupPara.m_strDefaultISO.empty())
+		{
+			NOTICE_LOG(BOOT, "Loading default ISO %s", _StartupPara.m_strDefaultISO.c_str());
+			DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
+		}
+		else
+		{
+			DVDInterface::SetVolumeDirectory(_StartupPara.m_strFilename, _StartupPara.bWii);
+		}
+
+		DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
+
+		// Poor man's bootup
+		if(_StartupPara.bWii)
+			SetupWiiMemory(DiscIO::IVolume::COUNTRY_UNKNOWN);
+		else
+			EmulatedBS2_GC(true);
+
+		Load_FST(_StartupPara.bWii);
+		if(!Boot_ELF(_StartupPara.m_strFilename))
+			return false;
+
+		UpdateDebugger_MapLoaded();
+		Dolphin_Debugger::AddAutoBreakpoints();
+		break;
+	}
+
+	// Wii WAD
+	case SCoreStartupParameter::BOOT_WII_NAND:
+		Boot_WiiWAD(_StartupPara.m_strFilename);
+
+		if (LoadMapFromFilename())
+			HLE::PatchFunctions();
+
+		// load default image or create virtual drive from directory
+		if (!_StartupPara.m_strDVDRoot.empty())
+			DVDInterface::SetVolumeDirectory(_StartupPara.m_strDVDRoot, true);
+		else if (!_StartupPara.m_strDefaultISO.empty())
+			DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
+
+		DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
+		break;
+
+
+	// Bootstrap 2 (AKA: Initial Program Loader, "BIOS")
+	case SCoreStartupParameter::BOOT_BS2:
+	{
+		DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
+		if (Load_BS2(_StartupPara.m_strBootROM))
+		{
+			if (LoadMapFromFilename())
+				HLE::PatchFunctions();
+		}
+		else
+		{
+			return false;
+		}
+		break;
+	}
+
+	case SCoreStartupParameter::BOOT_DFF:
+		// do nothing
+		break;
+
+	default:
+	{
+		PanicAlertT("Tried to load an unknown file type.");
+		return false;
+	}
+	}
+
+	// HLE jump to loader (homebrew).  Disabled when Gecko is active as it interferes with the code handler
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
+	{
+		HLE::Patch(0x80001800, "HBReload");
+		Memory::CopyToEmu(0x00001804, "STUBHAXX", 8);
+	}
+
+	// Not part of the binary itself, but either we or Gecko OS might insert
+	// this, and it doesn't clear the icache properly.
+	HLE::Patch(0x800018a8, "GeckoCodehandler");
+	return true;
+}
diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h
new file mode 100644
index 0000000000..fbf221b7a6
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot.h
@@ -0,0 +1,59 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdlib>
+#include <string>
+
+#include "DiscIO/Volume.h"
+
+struct CountrySetting
+{
+	const std::string area;
+	const std::string video;
+	const std::string game;
+	const std::string code;
+};
+
+class CBoot
+{
+public:
+
+	static bool BootUp();
+	static bool IsElfWii(const std::string& filename);
+
+	// Tries to find a map file for the current game by looking first in the
+	// local user directory, then in the shared user directory.
+	//
+	// If existing_map_file is not nullptr and a map file exists, it is set to the
+	// path to the existing map file.
+	//
+	// If writable_map_file is not nullptr, it is set to the path to where a map
+	// file should be saved.
+	//
+	// If title_id is not nullptr, it is set to the title id
+	//
+	// Returns true if a map file exists, false if none could be found.
+	static bool FindMapFile(std::string* existing_map_file,
+	                        std::string* writable_map_file,
+	                        std::string* title_id = nullptr);
+
+private:
+	static void RunFunction(u32 _iAddr);
+
+	static void UpdateDebugger_MapLoaded();
+
+	static bool LoadMapFromFilename();
+	static bool Boot_ELF(const std::string& filename);
+	static bool Boot_WiiWAD(const std::string& filename);
+
+	static bool EmulatedBS2_GC(bool skipAppLoader = false);
+	static bool EmulatedBS2_Wii();
+	static bool EmulatedBS2(bool _bIsWii);
+	static bool Load_BS2(const std::string& _rBootROMFilename);
+	static void Load_FST(bool _bIsWii);
+
+	static bool SetupWiiMemory(DiscIO::IVolume::ECountry country);
+};
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
new file mode 100644
index 0000000000..9e79fac6cf
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -0,0 +1,437 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/SettingsHandler.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/MemTools.h"
+#include "Core/PatchEngine.h"
+#include "Core/Boot/Boot.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
+void CBoot::RunFunction(u32 _iAddr)
+{
+	PC = _iAddr;
+	LR = 0x00;
+
+	while (PC != 0x00)
+		PowerPC::SingleStep();
+}
+
+// __________________________________________________________________________________________________
+// GameCube Bootstrap 2 HLE:
+// copy the apploader to 0x81200000
+// execute the apploader, function by function, using the above utility.
+bool CBoot::EmulatedBS2_GC(bool skipAppLoader)
+{
+	INFO_LOG(BOOT, "Faking GC BS2...");
+
+	// Set up MSR and the BAT SPR registers.
+	UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
+	m_MSR.FP = 1;
+	m_MSR.DR = 1;
+	m_MSR.IR = 1;
+	m_MSR.EE = 1;
+	PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+	PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+
+	// Clear ALL memory
+	Memory::Clear();
+
+	// Write necessary values
+	// Here we write values to memory that the apploader does not take care of. Game info goes
+	// to 0x80000000 according to YAGCD 4.2.
+	DVDInterface::DVDRead(/*offset*/0x00000000, /*address*/0x00000000, 0x20, false); // write disc info
+
+	PowerPC::HostWrite_U32(0x0D15EA5E, 0x80000020); // Booted from bootrom. 0xE5207C22 = booted from jtag
+	PowerPC::HostWrite_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail)
+	// TODO determine why some games fail when using a retail ID. (Seem to take different EXI paths, see Ikaruga for example)
+	PowerPC::HostWrite_U32(0x10000006, 0x8000002C); // Console type - DevKit  (retail ID == 0x00000003) see YAGCD 4.2.1.1.2
+
+	PowerPC::HostWrite_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC
+						 ? 0 : 1, 0x800000CC); // Fake the VI Init of the IPL (YAGCD 4.2.1.4)
+
+	PowerPC::HostWrite_U32(0x01000000, 0x800000d0); // ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM)
+
+	PowerPC::HostWrite_U32(0x09a7ec80, 0x800000F8); // Bus Clock Speed
+	PowerPC::HostWrite_U32(0x1cf7c580, 0x800000FC); // CPU Clock Speed
+
+	PowerPC::HostWrite_U32(0x4c000064, 0x80000300); // Write default DFI Handler:     rfi
+	PowerPC::HostWrite_U32(0x4c000064, 0x80000800); // Write default FPU Handler:     rfi
+	PowerPC::HostWrite_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi
+
+	PowerPC::HostWrite_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8); // Preset time base ticks
+	// HIO checks this
+	//PowerPC::HostWrite_U16(0x8200,     0x000030e6); // Console type
+
+	HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader
+
+	// Load Apploader to Memory - The apploader is hardcoded to begin at 0x2440 on the disc,
+	// but the size can differ between discs. Compare with YAGCD chap 13.
+	const DiscIO::IVolume& volume = DVDInterface::GetVolume();
+	u32 iAppLoaderOffset = 0x2440;
+	u32 iAppLoaderEntry = volume.Read32(iAppLoaderOffset + 0x10, false);
+	u32 iAppLoaderSize = volume.Read32(iAppLoaderOffset + 0x14, false) + volume.Read32(iAppLoaderOffset + 0x18, false);
+	if ((iAppLoaderEntry == (u32)-1) || (iAppLoaderSize == (u32)-1) || skipAppLoader)
+	{
+		INFO_LOG(BOOT, "GC BS2: Not running apploader!");
+		return false;
+	}
+	DVDInterface::DVDRead(iAppLoaderOffset + 0x20, 0x01200000, iAppLoaderSize, false);
+
+	// Setup pointers like real BS2 does
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC)
+	{
+		PowerPC::ppcState.gpr[1] = 0x81566550;  // StackPointer, used to be set to 0x816ffff0
+		PowerPC::ppcState.gpr[2] = 0x81465cc0;  // Global pointer to Small Data Area 2 Base (haven't seen anything use it...meh)
+		PowerPC::ppcState.gpr[13] = 0x81465320; // Global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it)
+	}
+	else
+	{
+		PowerPC::ppcState.gpr[1] = 0x815edca8;
+		PowerPC::ppcState.gpr[2] = 0x814b5b20;
+		PowerPC::ppcState.gpr[13] = 0x814b4fc0;
+	}
+
+	// TODO - Make Apploader(or just RunFunction()) debuggable!!!
+
+	// Call iAppLoaderEntry.
+	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderEntry");
+	u32 iAppLoaderFuncAddr = 0x80003100;
+	PowerPC::ppcState.gpr[3] = iAppLoaderFuncAddr + 0;
+	PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4;
+	PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8;
+	RunFunction(iAppLoaderEntry);
+	u32 iAppLoaderInit = PowerPC::Read_U32(iAppLoaderFuncAddr + 0);
+	u32 iAppLoaderMain = PowerPC::Read_U32(iAppLoaderFuncAddr + 4);
+	u32 iAppLoaderClose = PowerPC::Read_U32(iAppLoaderFuncAddr + 8);
+
+	// iAppLoaderInit
+	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderInit");
+	PowerPC::ppcState.gpr[3] = 0x81300000;
+	RunFunction(iAppLoaderInit);
+
+	// iAppLoaderMain - Here we load the apploader, the DOL (the exe) and the FST (filesystem).
+	// To give you an idea about where the stuff is located on the disc take a look at yagcd
+	// ch 13.
+	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderMain");
+	do
+	{
+		PowerPC::ppcState.gpr[3] = 0x81300004;
+		PowerPC::ppcState.gpr[4] = 0x81300008;
+		PowerPC::ppcState.gpr[5] = 0x8130000c;
+
+		RunFunction(iAppLoaderMain);
+
+		u32 iRamAddress = PowerPC::Read_U32(0x81300004);
+		u32 iLength     = PowerPC::Read_U32(0x81300008);
+		u32 iDVDOffset  = PowerPC::Read_U32(0x8130000c);
+
+		INFO_LOG(MASTER_LOG, "DVDRead: offset: %08x   memOffset: %08x   length: %i", iDVDOffset, iRamAddress, iLength);
+		DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength, false);
+
+	} while (PowerPC::ppcState.gpr[3] != 0x00);
+
+	// iAppLoaderClose
+	DEBUG_LOG(MASTER_LOG, "call iAppLoaderClose");
+	RunFunction(iAppLoaderClose);
+
+	// return
+	PC = PowerPC::ppcState.gpr[3];
+
+	// Load patches
+	PatchEngine::LoadPatches();
+
+	// If we have any patches that need to be applied very early, here's a good place
+	PatchEngine::ApplyFramePatches();
+
+	return true;
+}
+
+bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country)
+{
+	static const CountrySetting SETTING_EUROPE = {"EUR", "PAL",  "EU", "LE"};
+	static const std::map<DiscIO::IVolume::ECountry, const CountrySetting> country_settings = {
+		{DiscIO::IVolume::COUNTRY_EUROPE, SETTING_EUROPE},
+		{DiscIO::IVolume::COUNTRY_USA,    {"USA", "NTSC", "US", "LU"}},
+		{DiscIO::IVolume::COUNTRY_JAPAN,  {"JPN", "NTSC", "JP", "LJ"}},
+		{DiscIO::IVolume::COUNTRY_KOREA,  {"KOR", "NTSC", "KR", "LKH"}},
+		//TODO: Determine if Taiwan have their own specific settings.
+		//      Also determine if there are other specific settings
+		//      for other countries.
+		{DiscIO::IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
+	};
+	auto entryPos = country_settings.find(country);
+	const CountrySetting& country_setting =
+		(entryPos != country_settings.end()) ?
+		  entryPos->second :
+		  SETTING_EUROPE; //Default to EUROPE
+
+	SettingsHandler gen;
+	std::string serno;
+	std::string settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
+	if (File::Exists(settings_Filename))
+	{
+		File::IOFile settingsFileHandle(settings_Filename, "rb");
+		if (settingsFileHandle.ReadBytes((void*)gen.GetData(), SettingsHandler::SETTINGS_SIZE))
+		{
+			gen.Decrypt();
+			serno = gen.GetValue("SERNO");
+			gen.Reset();
+		}
+		File::Delete(settings_Filename);
+	}
+
+	if (serno.empty() || serno == "000000000")
+	{
+		if (Core::g_want_determinism)
+			serno = "123456789";
+		else
+			serno = gen.generateSerialNumber();
+		INFO_LOG(BOOT, "No previous serial number found, generated one instead: %s", serno.c_str());
+	}
+	else
+	{
+		INFO_LOG(BOOT, "Using serial number: %s", serno.c_str());
+	}
+
+	std::string model = "RVL-001(" + country_setting.area + ")";
+	gen.AddSetting("AREA", country_setting.area);
+	gen.AddSetting("MODEL", model);
+	gen.AddSetting("DVD", "0");
+	gen.AddSetting("MPCH", "0x7FFE");
+	gen.AddSetting("CODE", country_setting.code);
+	gen.AddSetting("SERNO", serno);
+	gen.AddSetting("VIDEO", country_setting.video);
+	gen.AddSetting("GAME", country_setting.game);
+
+	File::CreateFullPath(settings_Filename);
+	{
+		File::IOFile settingsFileHandle(settings_Filename, "wb");
+
+		if (!settingsFileHandle.WriteBytes(gen.GetData(), SettingsHandler::SETTINGS_SIZE))
+		{
+			PanicAlertT("SetupWiiMemory: Cant create setting.txt file");
+			return false;
+		}
+		// Write the 256 byte setting.txt to memory.
+		Memory::CopyToEmu(0x3800, gen.GetData(), SettingsHandler::SETTINGS_SIZE);
+	}
+
+	INFO_LOG(BOOT, "Setup Wii Memory...");
+
+	/*
+	Set hardcoded global variables to Wii memory. These are partly collected from
+	Wiibrew. These values are needed for the games to function correctly. A few
+	values in this region will also be placed here by the game as it boots.
+	They are:
+	0x80000038  Start of FST
+	0x8000003c  Size of FST Size
+	0x80000060  Copyright code
+	*/
+
+	// When booting a WAD or the system menu, there will probably not be a disc inserted
+	if (DVDInterface::VolumeIsValid())
+		DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20, false); // Game Code
+
+	Memory::Write_U32(0x0D15EA5E, 0x00000020);                  // Another magic word
+	Memory::Write_U32(0x00000001, 0x00000024);                  // Unknown
+	Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028);        // MEM1 size 24MB
+	Memory::Write_U32(0x00000023, 0x0000002c);                  // Production Board Model
+	Memory::Write_U32(0x00000000, 0x00000030);                  // Init
+	Memory::Write_U32(0x817FEC60, 0x00000034);                  // Init
+	// 38, 3C should get start, size of FST through apploader
+	Memory::Write_U32(0x38a00040, 0x00000060);                  // Exception init
+	Memory::Write_U32(0x8008f7b8, 0x000000e4);                  // Thread Init
+	Memory::Write_U32(Memory::REALRAM_SIZE, 0x000000f0);        // "Simulated memory size" (debug mode?)
+	Memory::Write_U32(0x8179b500, 0x000000f4);                  // __start
+	Memory::Write_U32(0x0e7be2c0, 0x000000f8);                  // Bus speed
+	Memory::Write_U32(0x2B73A840, 0x000000fc);                  // CPU speed
+	Memory::Write_U16(0x0000, 0x000030e6);                      // Console type
+	Memory::Write_U32(0x00000000, 0x000030c0);                  // EXI
+	Memory::Write_U32(0x00000000, 0x000030c4);                  // EXI
+	Memory::Write_U32(0x00000000, 0x000030dc);                  // Time
+	Memory::Write_U32(0x00000000, 0x000030d8);                  // Time
+	Memory::Write_U16(0x8201, 0x000030e6);                      // Dev console / debug capable
+	Memory::Write_U32(0x00000000, 0x000030f0);                  // Apploader
+	Memory::Write_U32(0x01800000, 0x00003100);                  // BAT
+	Memory::Write_U32(0x01800000, 0x00003104);                  // BAT
+	Memory::Write_U32(0x00000000, 0x0000310c);                  // Init
+	Memory::Write_U32(0x8179d500, 0x00003110);                  // Init
+	Memory::Write_U32(0x04000000, 0x00003118);                  // Unknown
+	Memory::Write_U32(0x04000000, 0x0000311c);                  // BAT
+	Memory::Write_U32(0x93400000, 0x00003120);                  // BAT
+	Memory::Write_U32(0x90000800, 0x00003124);                  // Init - MEM2 low
+	Memory::Write_U32(0x93ae0000, 0x00003128);                  // Init - MEM2 high
+	Memory::Write_U32(0x93ae0000, 0x00003130);                  // IOS MEM2 low
+	Memory::Write_U32(0x93b00000, 0x00003134);                  // IOS MEM2 high
+	Memory::Write_U32(0x00000012, 0x00003138);                  // Console type
+	// 40 is copied from 88 after running apploader
+	Memory::Write_U32(0x00090204, 0x00003140);                  // IOS revision (IOS9, v2.4)
+	Memory::Write_U32(0x00062507, 0x00003144);                  // IOS date in USA format (June 25, 2007)
+	Memory::Write_U16(0x0113, 0x0000315e);                      // Apploader
+	Memory::Write_U32(0x0000FF16, 0x00003158);                  // DDR ram vendor code
+	Memory::Write_U32(0x00000000, 0x00003160);                  // Init semaphore (sysmenu waits for this to clear)
+	Memory::Write_U32(0x00090204, 0x00003188);                  // Expected IOS revision
+
+	Memory::Write_U8(0x80, 0x0000315c);                         // OSInit
+	Memory::Write_U16(0x0000, 0x000030e0);                      // PADInit
+	Memory::Write_U32(0x80000000, 0x00003184);                  // GameID Address
+
+	// Fake the VI Init of the IPL
+	Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC ? 0 : 1, 0x000000CC);
+
+	// Clear exception handler. Why? Don't we begin with only zeros?
+	for (int i = 0x3000; i <= 0x3038; i += 4)
+	{
+		Memory::Write_U32(0x00000000, i);
+	}
+	return true;
+}
+
+// __________________________________________________________________________________________________
+// Wii Bootstrap 2 HLE:
+// copy the apploader to 0x81200000
+// execute the apploader
+bool CBoot::EmulatedBS2_Wii()
+{
+	INFO_LOG(BOOT, "Faking Wii BS2...");
+
+	// setup Wii memory
+	DiscIO::IVolume::ECountry country_code = DiscIO::IVolume::COUNTRY_UNKNOWN;
+	if (DVDInterface::VolumeIsValid())
+		country_code = DVDInterface::GetVolume().GetCountry();
+	if (SetupWiiMemory(country_code) == false)
+		return false;
+
+	// Execute the apploader
+	bool apploaderRan = false;
+	if (DVDInterface::VolumeIsValid() && DVDInterface::GetVolume().GetVolumeType() == DiscIO::IVolume::WII_DISC)
+	{
+		// This is some kind of consistency check that is compared to the 0x00
+		// values as the game boots. This location keep the 4 byte ID for as long
+		// as the game is running. The 6 byte ID at 0x00 is overwritten sometime
+		// after this check during booting.
+		DVDInterface::DVDRead(0, 0x3180, 4, true);
+
+		// Set up MSR and the BAT SPR registers.
+		UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
+		m_MSR.FP = 1;
+		m_MSR.DR = 1;
+		m_MSR.IR = 1;
+		m_MSR.EE = 1;
+		PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+		PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+		PowerPC::ppcState.spr[SPR_IBAT4U] = 0x90001fff;
+		PowerPC::ppcState.spr[SPR_IBAT4L] = 0x10000002;
+		PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+		PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+		PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+		PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+		PowerPC::ppcState.spr[SPR_DBAT4U] = 0x90001fff;
+		PowerPC::ppcState.spr[SPR_DBAT4L] = 0x10000002;
+		PowerPC::ppcState.spr[SPR_DBAT5U] = 0xd0001fff;
+		PowerPC::ppcState.spr[SPR_DBAT5L] = 0x1000002a;
+
+		Memory::Write_U32(0x4c000064, 0x00000300); // Write default DSI Handler:     rfi
+		Memory::Write_U32(0x4c000064, 0x00000800); // Write default FPU Handler:     rfi
+		Memory::Write_U32(0x4c000064, 0x00000C00); // Write default Syscall Handler: rfi
+
+		HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader
+
+		PowerPC::ppcState.gpr[1] = 0x816ffff0; // StackPointer
+
+		u32 iAppLoaderOffset = 0x2440; // 0x1c40;
+
+		// Load Apploader to Memory
+		const DiscIO::IVolume& volume = DVDInterface::GetVolume();
+		u32 iAppLoaderEntry = volume.Read32(iAppLoaderOffset + 0x10, true);
+		u32 iAppLoaderSize = volume.Read32(iAppLoaderOffset + 0x14, true);
+		if ((iAppLoaderEntry == (u32)-1) || (iAppLoaderSize == (u32)-1))
+		{
+			ERROR_LOG(BOOT, "Invalid apploader. Probably your image is corrupted.");
+			return false;
+		}
+		DVDInterface::DVDRead(iAppLoaderOffset + 0x20, 0x01200000, iAppLoaderSize, true);
+
+		//call iAppLoaderEntry
+		DEBUG_LOG(BOOT, "Call iAppLoaderEntry");
+
+		u32 iAppLoaderFuncAddr = 0x80004000;
+		PowerPC::ppcState.gpr[3] = iAppLoaderFuncAddr + 0;
+		PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4;
+		PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8;
+		RunFunction(iAppLoaderEntry);
+		u32 iAppLoaderInit = PowerPC::Read_U32(iAppLoaderFuncAddr + 0);
+		u32 iAppLoaderMain = PowerPC::Read_U32(iAppLoaderFuncAddr + 4);
+		u32 iAppLoaderClose = PowerPC::Read_U32(iAppLoaderFuncAddr + 8);
+
+		// iAppLoaderInit
+		DEBUG_LOG(BOOT, "Run iAppLoaderInit");
+		PowerPC::ppcState.gpr[3] = 0x81300000;
+		RunFunction(iAppLoaderInit);
+
+		// Let the apploader load the exe to memory. At this point I get an unknown IPC command
+		// (command zero) when I load Wii Sports or other games a second time. I don't notice
+		// any side effects however. It's a little disconcerting however that Start after Stop
+		// behaves differently than the first Start after starting Dolphin. It means something
+		// was not reset correctly.
+		DEBUG_LOG(BOOT, "Run iAppLoaderMain");
+		do
+		{
+			PowerPC::ppcState.gpr[3] = 0x81300004;
+			PowerPC::ppcState.gpr[4] = 0x81300008;
+			PowerPC::ppcState.gpr[5] = 0x8130000c;
+
+			RunFunction(iAppLoaderMain);
+
+			u32 iRamAddress = PowerPC::Read_U32(0x81300004);
+			u32 iLength     = PowerPC::Read_U32(0x81300008);
+			u32 iDVDOffset  = PowerPC::Read_U32(0x8130000c) << 2;
+
+			INFO_LOG(BOOT, "DVDRead: offset: %08x   memOffset: %08x   length: %i", iDVDOffset, iRamAddress, iLength);
+			DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength, true);
+		} while (PowerPC::ppcState.gpr[3] != 0x00);
+
+		// iAppLoaderClose
+		DEBUG_LOG(BOOT, "Run iAppLoaderClose");
+		RunFunction(iAppLoaderClose);
+
+		apploaderRan = true;
+
+		// Pass the "#002 check"
+		// Apploader writes the IOS version and revision here, we copy it
+		// Fake IOSv9 r2.4 if no version is found (elf loading)
+		u32 firmwareVer = PowerPC::Read_U32(0x80003188);
+		PowerPC::Write_U32(firmwareVer ? firmwareVer : 0x00090204, 0x80003140);
+
+		// Load patches and run startup patches
+		PatchEngine::LoadPatches();
+
+		// return
+		PC = PowerPC::ppcState.gpr[3];
+	}
+
+	return apploaderRan;
+}
+
+// Returns true if apploader has run successfully
+bool CBoot::EmulatedBS2(bool _bIsWii)
+{
+	return _bIsWii ? EmulatedBS2_Wii() : EmulatedBS2_GC();
+}
diff --git a/Source/Core/Core/Boot/Boot_DOL.cpp b/Source/Core/Core/Boot/Boot_DOL.cpp
new file mode 100644
index 0000000000..e925df1470
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot_DOL.cpp
@@ -0,0 +1,111 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonFuncs.h"
+#include "Common/FileUtil.h"
+
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
+CDolLoader::CDolLoader(u8* buffer, size_t size)
+{
+	m_is_valid = Initialize(buffer, size);
+}
+
+CDolLoader::CDolLoader(const std::string& filename)
+{
+	const u64 size = File::GetSize(filename);
+	std::vector<u8> temp_buffer(size);
+
+	{
+	File::IOFile pStream(filename, "rb");
+	pStream.ReadBytes(temp_buffer.data(), temp_buffer.size());
+	}
+
+	m_is_valid = Initialize(temp_buffer.data(), temp_buffer.size());
+}
+
+CDolLoader::~CDolLoader()
+{
+}
+
+bool CDolLoader::Initialize(u8* buffer, size_t size)
+{
+	if (size < sizeof(SDolHeader))
+		return false;
+
+	memcpy(&m_dolheader, buffer, sizeof(SDolHeader));
+
+	// swap memory
+	u32* p = (u32*)&m_dolheader;
+	for (size_t i = 0; i < (sizeof(SDolHeader) / sizeof(u32)); i++)
+		p[i] = Common::swap32(p[i]);
+
+	const u32 HID4_pattern = Common::swap32(0x7c13fba6);
+	const u32 HID4_mask = Common::swap32(0xfc1fffff);
+
+	m_is_wii = false;
+
+	m_text_sections.reserve(DOL_NUM_TEXT);
+	for (int i = 0; i < DOL_NUM_TEXT; ++i)
+	{
+		if (m_dolheader.textSize[i] != 0)
+		{
+			if (size < m_dolheader.textOffset[i] + m_dolheader.textSize[i])
+				return false;
+
+			u8* text_start = buffer + m_dolheader.textOffset[i];
+			m_text_sections.emplace_back(text_start, text_start + m_dolheader.textSize[i]);
+
+			for (unsigned int j = 0; !m_is_wii && j < (m_dolheader.textSize[i] / sizeof(u32)); ++j)
+			{
+				u32 word = ((u32*)text_start)[j];
+				if ((word & HID4_mask) == HID4_pattern)
+					m_is_wii = true;
+			}
+		}
+		else
+		{
+			// Make sure that m_text_sections indexes match header indexes
+			m_text_sections.emplace_back();
+		}
+	}
+
+	m_data_sections.reserve(DOL_NUM_DATA);
+	for (int i = 0; i < DOL_NUM_DATA; ++i)
+	{
+		if (m_dolheader.dataSize[i] != 0)
+		{
+			if (size < m_dolheader.dataOffset[i] + m_dolheader.dataSize[i])
+				return false;
+
+			u8* data_start = buffer + m_dolheader.dataOffset[i];
+			m_data_sections.emplace_back(data_start, data_start + m_dolheader.dataSize[i]);
+		}
+		else
+		{
+			// Make sure that m_data_sections indexes match header indexes
+			m_data_sections.emplace_back();
+		}
+	}
+
+	return true;
+}
+
+void CDolLoader::Load() const
+{
+	// load all text (code) sections
+	for (size_t i = 0; i < m_text_sections.size(); ++i)
+		if (!m_text_sections[i].empty())
+			Memory::CopyToEmu(m_dolheader.textAddress[i], m_text_sections[i].data(), m_text_sections[i].size());
+
+	// load all data sections
+	for (size_t i = 0; i < m_data_sections.size(); ++i)
+		if (!m_data_sections[i].empty())
+			Memory::CopyToEmu(m_dolheader.dataAddress[i], m_data_sections[i].data(), m_data_sections[i].size());
+}
diff --git a/Source/Core/Core/Boot/Boot_DOL.h b/Source/Core/Core/Boot/Boot_DOL.h
new file mode 100644
index 0000000000..9d2c6f3683
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot_DOL.h
@@ -0,0 +1,58 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+class CDolLoader
+{
+public:
+	CDolLoader(const std::string& filename);
+	CDolLoader(u8* buffer, size_t size);
+	~CDolLoader();
+
+	bool IsValid()      const { return m_is_valid; }
+	bool IsWii()        const { return m_is_wii; }
+	u32 GetEntryPoint() const { return m_dolheader.entryPoint; }
+
+	// Load into emulated memory
+	void Load() const;
+
+private:
+	enum
+	{
+		DOL_NUM_TEXT = 7,
+		DOL_NUM_DATA = 11
+	};
+
+	struct SDolHeader
+	{
+		u32 textOffset[DOL_NUM_TEXT];
+		u32 dataOffset[DOL_NUM_DATA];
+
+		u32 textAddress[DOL_NUM_TEXT];
+		u32 dataAddress[DOL_NUM_DATA];
+
+		u32 textSize[DOL_NUM_TEXT];
+		u32 dataSize[DOL_NUM_DATA];
+
+		u32 bssAddress;
+		u32 bssSize;
+		u32 entryPoint;
+	};
+	SDolHeader m_dolheader;
+
+	std::vector<std::vector<u8>> m_data_sections;
+	std::vector<std::vector<u8>> m_text_sections;
+
+	bool m_is_valid;
+	bool m_is_wii;
+
+	// Copy sections to internal buffers
+	bool Initialize(u8* buffer, size_t size);
+};
diff --git a/Source/Core/Core/Boot/Boot_ELF.cpp b/Source/Core/Core/Boot/Boot_ELF.cpp
new file mode 100644
index 0000000000..7f09fa7f2a
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot_ELF.cpp
@@ -0,0 +1,102 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/FileUtil.h"
+#include "Common/StdMakeUnique.h"
+
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/ElfReader.h"
+#include "Core/HLE/HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+
+bool CBoot::IsElfWii(const std::string& filename)
+{
+	/* We already check if filename existed before we called this function, so
+	   there is no need for another check, just read the file right away */
+
+	size_t filesize = File::GetSize(filename);
+	auto elf = std::make_unique<u8 []>(filesize);
+
+	{
+	File::IOFile f(filename, "rb");
+	f.ReadBytes(elf.get(), filesize);
+	}
+
+	// Use the same method as the DOL loader uses: search for mfspr from HID4,
+	// which should only be used in Wii ELFs.
+	//
+	// Likely to have some false positives/negatives, patches implementing a
+	// better heuristic are welcome.
+
+	// Swap these once, instead of swapping every word in the file.
+	u32 HID4_pattern = Common::swap32(0x7c13fba6);
+	u32 HID4_mask = Common::swap32(0xfc1fffff);
+	ElfReader reader(elf.get());
+
+	for (int i = 0; i < reader.GetNumSections(); ++i)
+	{
+		if (reader.IsCodeSection(i))
+		{
+			u32* code = (u32*)reader.GetSectionDataPtr(i);
+			for (u32 j = 0; j < reader.GetSectionSize(i) / sizeof(u32); ++j)
+			{
+				if ((code[j] & HID4_mask) == HID4_pattern)
+					return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+
+bool CBoot::Boot_ELF(const std::string& filename)
+{
+	// Read ELF from file
+	size_t filesize = File::GetSize(filename);
+	auto elf = std::make_unique<u8 []>(filesize);
+
+	{
+	File::IOFile f(filename, "rb");
+	f.ReadBytes(elf.get(), filesize);
+	}
+
+	// Load ELF into GameCube Memory
+	ElfReader reader(elf.get());
+	if (!reader.LoadIntoMemory())
+		return false;
+
+	// Set up MSR and the BAT SPR registers.
+	UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
+	m_MSR.FP = 1;
+	m_MSR.DR = 1;
+	m_MSR.IR = 1;
+	m_MSR.EE = 1;
+	PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_IBAT4U] = 0x90001fff;
+	PowerPC::ppcState.spr[SPR_IBAT4L] = 0x10000002;
+	PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+	PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+	PowerPC::ppcState.spr[SPR_DBAT4U] = 0x90001fff;
+	PowerPC::ppcState.spr[SPR_DBAT4L] = 0x10000002;
+	PowerPC::ppcState.spr[SPR_DBAT5U] = 0xd0001fff;
+	PowerPC::ppcState.spr[SPR_DBAT5L] = 0x1000002a;
+
+	if (!reader.LoadSymbols())
+	{
+		if (LoadMapFromFilename())
+			HLE::PatchFunctions();
+	}
+	else
+	{
+		HLE::PatchFunctions();
+	}
+
+	PC = reader.GetEntryPoint();
+
+	return true;
+}
diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
new file mode 100644
index 0000000000..66f2ed2b7d
--- /dev/null
+++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
@@ -0,0 +1,132 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <memory>
+#include <string>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StdMakeUnique.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/PatchEngine.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/WiiWad.h"
+
+static u32 state_checksum(u32 *buf, int len)
+{
+	u32 checksum = 0;
+	len = len >> 2;
+
+	for (int i = 0; i < len; i++)
+	{
+		checksum += buf[i];
+	}
+
+	return checksum;
+}
+
+struct StateFlags
+{
+	u32 checksum;
+	u8 flags;
+	u8 type;
+	u8 discstate;
+	u8 returnto;
+	u32 unknown[6];
+};
+
+bool CBoot::Boot_WiiWAD(const std::string& _pFilename)
+{
+	std::string state_filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_STATE);
+
+	if (File::Exists(state_filename))
+	{
+		File::IOFile state_file(state_filename, "r+b");
+		StateFlags state;
+		state_file.ReadBytes(&state, sizeof(StateFlags));
+
+		state.type = 0x03; // TYPE_RETURN
+		state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags) - 4);
+
+		state_file.Seek(0, SEEK_SET);
+		state_file.WriteBytes(&state, sizeof(StateFlags));
+	}
+	else
+	{
+		File::CreateFullPath(state_filename);
+		File::IOFile state_file(state_filename, "a+b");
+		StateFlags state;
+		memset(&state, 0, sizeof(StateFlags));
+		state.type = 0x03; // TYPE_RETURN
+		state.discstate = 0x01; // DISCSTATE_WII
+		state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags) - 4);
+		state_file.WriteBytes(&state, sizeof(StateFlags));
+	}
+
+	const DiscIO::INANDContentLoader& ContentLoader = DiscIO::CNANDContentManager::Access().GetNANDLoader(_pFilename);
+	if (!ContentLoader.IsValid())
+		return false;
+
+	u64 titleID = ContentLoader.GetTitleID();
+	// create data directory
+	File::CreateFullPath(Common::GetTitleDataPath(titleID));
+
+	if (titleID == TITLEID_SYSMENU)
+		HLE_IPC_CreateVirtualFATFilesystem();
+	// setup Wii memory
+	if (!SetupWiiMemory(ContentLoader.GetCountry()))
+		return false;
+
+	// DOL
+	const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex());
+	if (pContent == nullptr)
+		return false;
+
+	WII_IPC_HLE_Interface::SetDefaultContentFile(_pFilename);
+
+	std::unique_ptr<CDolLoader> pDolLoader;
+	if (pContent->m_pData)
+	{
+		pDolLoader = std::make_unique<CDolLoader>(pContent->m_pData, pContent->m_Size);
+	}
+	else
+	{
+		pDolLoader = std::make_unique<CDolLoader>(pContent->m_Filename);
+	}
+	if (!pDolLoader->IsValid())
+		return false;
+
+	pDolLoader->Load();
+	PC = pDolLoader->GetEntryPoint();
+
+	// Pass the "#002 check"
+	// Apploader should write the IOS version and revision to 0x3140, and compare it
+	// to 0x3188 to pass the check, but we don't do it, and i don't know where to read the IOS rev...
+	// Currently we just write 0xFFFF for the revision, copy manually and it works fine :p
+
+	// TODO : figure it correctly : where should we read the IOS rev that the wad "needs" ?
+	Memory::Write_U16(ContentLoader.GetIosVersion(), 0x00003140);
+	Memory::Write_U16(0xFFFF, 0x00003142);
+	Memory::Write_U32(Memory::Read_U32(0x00003140), 0x00003188);
+
+	// Load patches and run startup patches
+	const std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(_pFilename));
+	if (pVolume != nullptr)
+		PatchEngine::LoadPatches();
+
+	return true;
+}
+
diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp
new file mode 100644
index 0000000000..dbf911123b
--- /dev/null
+++ b/Source/Core/Core/Boot/ElfReader.cpp
@@ -0,0 +1,195 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+
+#include "Core/Boot/ElfReader.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+
+static void bswap(u32 &w) {w = Common::swap32(w);}
+static void bswap(u16 &w) {w = Common::swap16(w);}
+
+static void byteswapHeader(Elf32_Ehdr &ELF_H)
+{
+	bswap(ELF_H.e_type);
+	bswap(ELF_H.e_machine);
+	bswap(ELF_H.e_ehsize);
+	bswap(ELF_H.e_phentsize);
+	bswap(ELF_H.e_phnum);
+	bswap(ELF_H.e_shentsize);
+	bswap(ELF_H.e_shnum);
+	bswap(ELF_H.e_shstrndx);
+	bswap(ELF_H.e_version);
+	bswap(ELF_H.e_entry);
+	bswap(ELF_H.e_phoff);
+	bswap(ELF_H.e_shoff);
+	bswap(ELF_H.e_flags);
+}
+
+static void byteswapSegment(Elf32_Phdr &sec)
+{
+	bswap(sec.p_align);
+	bswap(sec.p_filesz);
+	bswap(sec.p_flags);
+	bswap(sec.p_memsz);
+	bswap(sec.p_offset);
+	bswap(sec.p_paddr);
+	bswap(sec.p_vaddr);
+	bswap(sec.p_type);
+}
+
+static void byteswapSection(Elf32_Shdr &sec)
+{
+	bswap(sec.sh_addr);
+	bswap(sec.sh_addralign);
+	bswap(sec.sh_entsize);
+	bswap(sec.sh_flags);
+	bswap(sec.sh_info);
+	bswap(sec.sh_link);
+	bswap(sec.sh_name);
+	bswap(sec.sh_offset);
+	bswap(sec.sh_size);
+	bswap(sec.sh_type);
+}
+
+ElfReader::ElfReader(void *ptr)
+{
+	base = (char*)ptr;
+	base32 = (u32*)ptr;
+	header = (Elf32_Ehdr*)ptr;
+	byteswapHeader(*header);
+
+	segments = (Elf32_Phdr *)(base + header->e_phoff);
+	sections = (Elf32_Shdr *)(base + header->e_shoff);
+
+	for (int i = 0; i < GetNumSegments(); i++)
+	{
+		byteswapSegment(segments[i]);
+	}
+
+	for (int i = 0; i < GetNumSections(); i++)
+	{
+		byteswapSection(sections[i]);
+	}
+	entryPoint = header->e_entry;
+}
+
+const char* ElfReader::GetSectionName(int section) const
+{
+	if (sections[section].sh_type == SHT_NULL)
+		return nullptr;
+
+	int nameOffset = sections[section].sh_name;
+	char* ptr = (char*)GetSectionDataPtr(header->e_shstrndx);
+
+	if (ptr)
+		return ptr + nameOffset;
+	else
+		return nullptr;
+}
+
+// This is just a simple elf loader, good enough to load elfs generated by devkitPPC
+bool ElfReader::LoadIntoMemory()
+{
+	DEBUG_LOG(MASTER_LOG, "String section: %i", header->e_shstrndx);
+
+	// Should we relocate?
+	bRelocate = (header->e_type != ET_EXEC);
+
+	if (bRelocate)
+	{
+		PanicAlert("Error: Dolphin doesn't know how to load a relocatable elf.");
+		return false;
+	}
+
+	INFO_LOG(MASTER_LOG, "%i segments:", header->e_phnum);
+
+	// Copy segments into ram.
+	for (int i = 0; i < header->e_phnum; i++)
+	{
+		Elf32_Phdr* p = segments + i;
+
+		INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ",
+							 p->p_type, p->p_vaddr, p->p_filesz, p->p_memsz);
+
+		if (p->p_type == PT_LOAD)
+		{
+			u32 writeAddr = p->p_vaddr;
+			const u8* src = GetSegmentPtr(i);
+			u32 srcSize = p->p_filesz;
+			u32 dstSize = p->p_memsz;
+
+			Memory::CopyToEmu(writeAddr, src, srcSize);
+			if (srcSize < dstSize)
+				Memory::Memset(writeAddr + srcSize, 0, dstSize - srcSize); //zero out bss
+
+			INFO_LOG(MASTER_LOG, "Loadable Segment Copied to %08x, size %08x", writeAddr, p->p_memsz);
+		}
+	}
+
+	INFO_LOG(MASTER_LOG, "Done loading.");
+	return true;
+}
+
+SectionID ElfReader::GetSectionByName(const char *name, int firstSection) const
+{
+	for (int i = firstSection; i < header->e_shnum; i++)
+	{
+		const char* secname = GetSectionName(i);
+
+		if (secname != nullptr && strcmp(name, secname) == 0)
+			return i;
+	}
+	return -1;
+}
+
+bool ElfReader::LoadSymbols()
+{
+	bool hasSymbols = false;
+	SectionID sec = GetSectionByName(".symtab");
+	if (sec != -1)
+	{
+		int stringSection = sections[sec].sh_link;
+		const char* stringBase = (const char *)GetSectionDataPtr(stringSection);
+
+		//We have a symbol table!
+		Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec));
+		int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym);
+		for (int sym = 0; sym < numSymbols; sym++)
+		{
+			int size = Common::swap32(symtab[sym].st_size);
+			if (size == 0)
+				continue;
+
+			// int bind = symtab[sym].st_info >> 4;
+			int type = symtab[sym].st_info & 0xF;
+			int sectionIndex = Common::swap16(symtab[sym].st_shndx);
+			int value = Common::swap32(symtab[sym].st_value);
+			const char* name = stringBase + Common::swap32(symtab[sym].st_name);
+			if (bRelocate)
+				value += sectionAddrs[sectionIndex];
+
+			int symtype = Symbol::SYMBOL_DATA;
+			switch (type)
+			{
+			case STT_OBJECT:
+				symtype = Symbol::SYMBOL_DATA; break;
+			case STT_FUNC:
+				symtype = Symbol::SYMBOL_FUNCTION; break;
+			default:
+				continue;
+			}
+			g_symbolDB.AddKnownSymbol(value, size, name, symtype);
+			hasSymbols = true;
+		}
+	}
+	g_symbolDB.Index();
+	return hasSymbols;
+}
diff --git a/Source/Core/Core/Boot/ElfReader.h b/Source/Core/Core/Boot/ElfReader.h
new file mode 100644
index 0000000000..28822e8a45
--- /dev/null
+++ b/Source/Core/Core/Boot/ElfReader.h
@@ -0,0 +1,76 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/Boot/ElfTypes.h"
+
+enum KnownElfTypes
+{
+	KNOWNELF_PSP = 0,
+	KNOWNELF_DS  = 1,
+	KNOWNELF_GBA = 2,
+	KNOWNELF_GC  = 3,
+};
+
+typedef int SectionID;
+
+class ElfReader
+{
+private:
+	char* base;
+	u32* base32;
+
+	Elf32_Ehdr* header;
+	Elf32_Phdr* segments;
+	Elf32_Shdr* sections;
+
+	u32 *sectionAddrs;
+	bool bRelocate;
+	u32 entryPoint;
+
+public:
+	ElfReader(void* ptr);
+	~ElfReader() { }
+
+	u32 Read32(int off) const { return base32[off>>2]; }
+
+	// Quick accessors
+	ElfType GetType() const { return (ElfType)(header->e_type); }
+	ElfMachine GetMachine() const { return (ElfMachine)(header->e_machine); }
+	u32 GetEntryPoint() const { return entryPoint; }
+	u32 GetFlags() const { return (u32)(header->e_flags); }
+	bool LoadIntoMemory();
+	bool LoadSymbols();
+
+	int GetNumSegments() const { return (int)(header->e_phnum); }
+	int GetNumSections() const { return (int)(header->e_shnum); }
+	const u8* GetPtr(int offset) const { return (u8*)base + offset; }
+	const char* GetSectionName(int section) const;
+	const u8 *GetSectionDataPtr(int section) const
+	{
+		if (section < 0 || section >= header->e_shnum)
+			return nullptr;
+		if (sections[section].sh_type != SHT_NOBITS)
+			return GetPtr(sections[section].sh_offset);
+		else
+			return nullptr;
+	}
+	bool IsCodeSection(int section) const
+	{
+		return sections[section].sh_type == SHT_PROGBITS;
+	}
+	const u8* GetSegmentPtr(int segment)
+	{
+		return GetPtr(segments[segment].p_offset);
+	}
+	u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; }
+	int GetSectionSize(SectionID section) const { return sections[section].sh_size; }
+	SectionID GetSectionByName(const char* name, int firstSection = 0) const; //-1 for not found
+
+	bool DidRelocate() const
+	{
+		return bRelocate;
+	}
+};
diff --git a/Source/Core/Core/Boot/ElfTypes.h b/Source/Core/Core/Boot/ElfTypes.h
new file mode 100644
index 0000000000..3728d82f6d
--- /dev/null
+++ b/Source/Core/Core/Boot/ElfTypes.h
@@ -0,0 +1,276 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// ELF Header Constants
+
+// File type
+enum ElfType
+{
+	ET_NONE   = 0,
+	ET_REL    = 1,
+	ET_EXEC   = 2,
+	ET_DYN    = 3,
+	ET_CORE   = 4,
+	ET_LOPROC = 0xFF00,
+	ET_HIPROC = 0xFFFF,
+};
+
+// Machine/Architecture
+enum ElfMachine
+{
+	EM_NONE  = 0,
+	EM_M32   = 1,
+	EM_SPARC = 2,
+	EM_386   = 3,
+	EM_68K   = 4,
+	EM_88K   = 5,
+	EM_860   = 7,
+	EM_MIPS  = 8
+};
+
+// File version
+#define EV_NONE    0
+#define EV_CURRENT 1
+
+// Identification index
+#define EI_MAG0    0
+#define EI_MAG1    1
+#define EI_MAG2    2
+#define EI_MAG3    3
+#define EI_CLASS   4
+#define EI_DATA    5
+#define EI_VERSION 6
+#define EI_PAD     7
+#define EI_NIDENT 16
+
+// Magic number
+#define ELFMAG0 0x7F
+#define ELFMAG1  'E'
+#define ELFMAG2  'L'
+#define ELFMAG3  'F'
+
+// File class
+#define ELFCLASSNONE 0
+#define ELFCLASS32   1
+#define ELFCLASS64   2
+
+// Encoding
+#define ELFDATANONE 0
+#define ELFDATA2LSB 1
+#define ELFDATA2MSB 2
+
+
+
+// Sections constants
+
+// Section indexes
+#define SHN_UNDEF          0
+#define SHN_LORESERVE 0xFF00
+#define SHN_LOPROC    0xFF00
+#define SHN_HIPROC    0xFF1F
+#define SHN_ABS       0xFFF1
+#define SHN_COMMON    0xFFF2
+#define SHN_HIRESERVE 0xFFFF
+
+// Section types
+#define SHT_NULL            0
+#define SHT_PROGBITS        1
+#define SHT_SYMTAB          2
+#define SHT_STRTAB          3
+#define SHT_RELA            4
+#define SHT_HASH            5
+#define SHT_DYNAMIC         6
+#define SHT_NOTE            7
+#define SHT_NOBITS          8
+#define SHT_REL             9
+#define SHT_SHLIB          10
+#define SHT_DYNSYM         11
+#define SHT_LOPROC 0x70000000
+#define SHT_HIPROC 0x7FFFFFFF
+#define SHT_LOUSER 0x80000000
+#define SHT_HIUSER 0xFFFFFFFF
+
+// Custom section types
+#define SHT_PSPREL 0x700000a0
+
+
+// Section flags
+enum ElfSectionFlags
+{
+	SHF_WRITE     = 0x1,
+	SHF_ALLOC     = 0x2,
+	SHF_EXECINSTR = 0x4,
+	SHF_MASKPROC  = 0xF0000000,
+};
+
+// Symbol binding
+#define STB_LOCAL   0
+#define STB_GLOBAL  1
+#define STB_WEAK    2
+#define STB_LOPROC 13
+#define STB_HIPROC 15
+
+// Symbol types
+#define STT_NOTYPE   0
+#define STT_OBJECT   1
+#define STT_FUNC     2
+#define STT_SECTION  3
+#define STT_FILE     4
+#define STT_LOPROC  13
+#define STT_HIPROC  15
+
+// Undefined name
+#define STN_UNDEF 0
+
+// Relocation types
+#define R_386_NONE      0
+#define R_386_32        1
+#define R_386_PC32      2
+#define R_386_GOT32     3
+#define R_386_PLT32     4
+#define R_386_COPY      5
+#define R_386_GLOB_DAT  6
+#define R_386_JMP_SLOT  7
+#define R_386_RELATIVE  8
+#define R_386_GOTOFF    9
+#define R_386_GOTPC    10
+
+// Segment types
+#define PT_NULL             0
+#define PT_LOAD             1
+#define PT_DYNAMIC          2
+#define PT_INTERP           3
+#define PT_NOTE             4
+#define PT_SHLIB            5
+#define PT_PHDR             6
+#define PT_LOPROC  0x70000000
+#define PT_HIPROC  0x7FFFFFFF
+
+// Segment flags
+#define PF_X 1
+#define PF_W 2
+#define PF_R 4
+
+// Dynamic Array Tags
+#define DT_NULL              0
+#define DT_NEEDED            1
+#define DT_PLTRELSZ          2
+#define DT_PLTGOT            3
+#define DT_HASH              4
+#define DT_STRTAB            5
+#define DT_SYMTAB            6
+#define DT_RELA              7
+#define DT_RELASZ            8
+#define DT_RELAENT           9
+#define DT_STRSZ            10
+#define DT_SYMENT           11
+#define DT_INIT             12
+#define DT_FINI             13
+#define DT_SONAME           14
+#define DT_RPATH            15
+#define DT_SYMBOLIC         16
+#define DT_REL              17
+#define DT_RELSZ            18
+#define DT_RELENT           19
+#define DT_PLTREL           20
+#define DT_DEBUG            21
+#define DT_TEXTREL          22
+#define DT_JMPREL           23
+#define DT_LOPROC   0x70000000
+#define DT_HIPROC   0x7FFFFFFF
+
+// ELF file header
+struct Elf32_Ehdr
+{
+	u8     e_ident[EI_NIDENT];
+	u16    e_type;
+	u16    e_machine;
+	u32    e_version;
+	u32    e_entry;
+	u32    e_phoff;
+	u32    e_shoff;
+	u32    e_flags;
+	u16    e_ehsize;
+	u16    e_phentsize;
+	u16    e_phnum;
+	u16    e_shentsize;
+	u16    e_shnum;
+	u16    e_shstrndx;
+};
+
+// Section header
+struct Elf32_Shdr
+{
+	u32 sh_name;
+	u32 sh_type;
+	u32 sh_flags;
+	u32 sh_addr;
+	u32 sh_offset;
+	u32 sh_size;
+	u32 sh_link;
+	u32 sh_info;
+	u32 sh_addralign;
+	u32 sh_entsize;
+};
+
+// Segment header
+struct Elf32_Phdr
+{
+	u32 p_type;
+	u32 p_offset;
+	u32 p_vaddr;
+	u32 p_paddr;
+	u32 p_filesz;
+	u32 p_memsz;
+	u32 p_flags;
+	u32 p_align;
+};
+
+// Symbol table entry
+struct Elf32_Sym
+{
+	u32 st_name;
+	u32 st_value;
+	u32 st_size;
+	u8  st_info;
+	u8  st_other;
+	u16 st_shndx;
+};
+
+#define ELF32_ST_BIND(i)   ((i)>>4)
+#define ELF32_ST_TYPE(i)   ((i)&0xf)
+#define ELF32_ST_INFO(b,t) (((b)<<4)+((t)&0xf))
+
+// Relocation entries
+struct Elf32_Rel
+{
+	u32 r_offset;
+	u32 r_info;
+};
+
+struct Elf32_Rela
+{
+	u32 r_offset;
+	u32 r_info;
+	s32 r_addend;
+};
+
+#define ELF32_R_SYM(i) ((i)>>8)
+#define ELF32_R_TYPE(i) ((u8)(i))
+#define ELF32_R_INFO(s,t) (((s)<<8 )+(u8)(t))
+
+
+struct Elf32_Dyn
+{
+	s32 d_tag;
+	union
+	{
+		u32 d_val;
+		u32 d_ptr;
+	} d_un;
+};
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
new file mode 100644
index 0000000000..85396fad4b
--- /dev/null
+++ b/Source/Core/Core/BootManager.cpp
@@ -0,0 +1,335 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// File description
+// -------------
+// Purpose of this file: Collect boot settings for Core::Init()
+
+// Call sequence: This file has one of the first function called when a game is booted,
+// the boot sequence in the code is:
+
+// DolphinWX:    FrameTools.cpp         StartGame
+// Core          BootManager.cpp        BootCore
+//               Core.cpp               Init                     Thread creation
+//                                      EmuThread                Calls CBoot::BootUp
+//               Boot.cpp               CBoot::BootUp()
+//                                      CBoot::EmulatedBS2_Wii() / GC() or Load_BS2()
+
+
+// Includes
+// ----------------
+#include <string>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+#include "Common/SysConf.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace BootManager
+{
+
+// TODO this is an ugly hack which allows us to restore values trampled by per-game settings
+// Apply fire liberally
+struct ConfigCache
+{
+	bool valid, bCPUThread, bSkipIdle, bSyncGPUOnSkipIdleHack, bFPRF, bAccurateNaNs, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread,
+	     bSyncGPU, bFastDiscSpeed, bDSPHLE, bHLE_BS2, bProgressive;
+	int iCPUCore, Volume;
+	int iWiimoteSource[MAX_BBMOTES];
+	SIDevices Pads[MAX_SI_CHANNELS];
+	unsigned int framelimit, frameSkip;
+	TEXIDevices m_EXIDevice[MAX_EXI_CHANNELS];
+	std::string strBackend, sBackend;
+	std::string m_strGPUDeterminismMode;
+	bool bSetFramelimit, bSetEXIDevice[MAX_EXI_CHANNELS], bSetVolume, bSetPads[MAX_SI_CHANNELS], bSetWiimoteSource[MAX_BBMOTES], bSetFrameSkip;
+};
+static ConfigCache config_cache;
+
+static GPUDeterminismMode ParseGPUDeterminismMode(const std::string& mode)
+{
+	if (mode == "auto")
+		return GPU_DETERMINISM_AUTO;
+	if (mode == "none")
+		return GPU_DETERMINISM_NONE;
+	if (mode == "fake-completion")
+		return GPU_DETERMINISM_FAKE_COMPLETION;
+
+	NOTICE_LOG(BOOT, "Unknown GPU determinism mode %s", mode.c_str());
+	return GPU_DETERMINISM_AUTO;
+}
+
+// Boot the ISO or file
+bool BootCore(const std::string& _rFilename)
+{
+	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	// Use custom settings for debugging mode
+	Host_SetStartupDebuggingParameters();
+
+	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
+	StartUp.m_strFilename = _rFilename;
+	SConfig::GetInstance().m_LastFilename = _rFilename;
+	SConfig::GetInstance().SaveSettings();
+	StartUp.bRunCompareClient = false;
+	StartUp.bRunCompareServer = false;
+
+	// This is saved separately from everything because it can be changed in SConfig::AutoSetup()
+	config_cache.bHLE_BS2 = StartUp.bHLE_BS2;
+
+	// If for example the ISO file is bad we return here
+	if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT))
+		return false;
+
+	// Load game specific settings
+	if (StartUp.GetUniqueID().size() == 6)
+	{
+		IniFile game_ini = StartUp.LoadGameIni();
+
+		config_cache.valid = true;
+		config_cache.bCPUThread = StartUp.bCPUThread;
+		config_cache.bSkipIdle = StartUp.bSkipIdle;
+		config_cache.bSyncGPUOnSkipIdleHack = StartUp.bSyncGPUOnSkipIdleHack;
+		config_cache.iCPUCore = StartUp.iCPUCore;
+		config_cache.bFPRF = StartUp.bFPRF;
+		config_cache.bAccurateNaNs = StartUp.bAccurateNaNs;
+		config_cache.bMMU = StartUp.bMMU;
+		config_cache.bDCBZOFF = StartUp.bDCBZOFF;
+		config_cache.bSyncGPU = StartUp.bSyncGPU;
+		config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed;
+		config_cache.bDSPHLE = StartUp.bDSPHLE;
+		config_cache.strBackend = StartUp.m_strVideoBackend;
+		config_cache.m_strGPUDeterminismMode = StartUp.m_strGPUDeterminismMode;
+		config_cache.m_EnableJIT = SConfig::GetInstance().m_DSPEnableJIT;
+		config_cache.Volume = SConfig::GetInstance().m_Volume;
+		config_cache.sBackend = SConfig::GetInstance().sBackend;
+		config_cache.framelimit = SConfig::GetInstance().m_Framelimit;
+		config_cache.frameSkip = SConfig::GetInstance().m_FrameSkip;
+		config_cache.bProgressive = StartUp.bProgressive;
+		for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
+		{
+			config_cache.iWiimoteSource[i] = g_wiimote_sources[i];
+		}
+		for (unsigned int i = 0; i < MAX_SI_CHANNELS; ++i)
+		{
+			config_cache.Pads[i] = SConfig::GetInstance().m_SIDevice[i];
+		}
+		for (unsigned int i = 0; i < MAX_EXI_CHANNELS; ++i)
+		{
+			config_cache.m_EXIDevice[i] = SConfig::GetInstance().m_EXIDevice[i];
+		}
+		std::fill_n(config_cache.bSetWiimoteSource, (int)MAX_BBMOTES, false);
+		std::fill_n(config_cache.bSetPads, (int)MAX_SI_CHANNELS, false);
+		std::fill_n(config_cache.bSetEXIDevice, (int)MAX_EXI_CHANNELS, false);
+		config_cache.bSetFramelimit = false;
+		config_cache.bSetFrameSkip = false;
+
+		// General settings
+		IniFile::Section* core_section     = game_ini.GetOrCreateSection("Core");
+		IniFile::Section* dsp_section      = game_ini.GetOrCreateSection("DSP");
+		IniFile::Section* controls_section = game_ini.GetOrCreateSection("Controls");
+
+		core_section->Get("CPUThread",        &StartUp.bCPUThread, StartUp.bCPUThread);
+		core_section->Get("SkipIdle",         &StartUp.bSkipIdle, StartUp.bSkipIdle);
+		core_section->Get("SyncOnSkipIdle",   &StartUp.bSyncGPUOnSkipIdleHack, StartUp.bSyncGPUOnSkipIdleHack);
+		core_section->Get("FPRF",             &StartUp.bFPRF, StartUp.bFPRF);
+		core_section->Get("AccurateNaNs",     &StartUp.bAccurateNaNs, StartUp.bAccurateNaNs);
+		core_section->Get("MMU",              &StartUp.bMMU, StartUp.bMMU);
+		core_section->Get("DCBZ",             &StartUp.bDCBZOFF, StartUp.bDCBZOFF);
+		core_section->Get("SyncGPU",          &StartUp.bSyncGPU, StartUp.bSyncGPU);
+		core_section->Get("FastDiscSpeed",    &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed);
+		core_section->Get("DSPHLE",           &StartUp.bDSPHLE, StartUp.bDSPHLE);
+		core_section->Get("GFXBackend",       &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend);
+		core_section->Get("CPUCore",          &StartUp.iCPUCore, StartUp.iCPUCore);
+		core_section->Get("HLE_BS2",          &StartUp.bHLE_BS2, StartUp.bHLE_BS2);
+		core_section->Get("ProgressiveScan",  &StartUp.bProgressive, StartUp.bProgressive);
+		if (core_section->Get("FrameLimit",   &SConfig::GetInstance().m_Framelimit, SConfig::GetInstance().m_Framelimit))
+			config_cache.bSetFramelimit = true;
+		if (core_section->Get("FrameSkip",    &SConfig::GetInstance().m_FrameSkip))
+		{
+			config_cache.bSetFrameSkip = true;
+			Movie::SetFrameSkipping(SConfig::GetInstance().m_FrameSkip);
+		}
+
+		if (dsp_section->Get("Volume",        &SConfig::GetInstance().m_Volume, SConfig::GetInstance().m_Volume))
+			config_cache.bSetVolume = true;
+		dsp_section->Get("EnableJIT",         &SConfig::GetInstance().m_DSPEnableJIT, SConfig::GetInstance().m_DSPEnableJIT);
+		dsp_section->Get("Backend",           &SConfig::GetInstance().sBackend, SConfig::GetInstance().sBackend);
+		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
+		core_section->Get("GPUDeterminismMode", &StartUp.m_strGPUDeterminismMode, StartUp.m_strGPUDeterminismMode);
+
+		for (unsigned int i = 0; i < MAX_SI_CHANNELS; ++i)
+		{
+			int source;
+			controls_section->Get(StringFromFormat("PadType%u", i), &source, -1);
+			if (source >= (int) SIDEVICE_NONE && source <= (int) SIDEVICE_AM_BASEBOARD)
+			{
+				SConfig::GetInstance().m_SIDevice[i] = (SIDevices) source;
+				config_cache.bSetPads[i] = true;
+			}
+		}
+
+		// Wii settings
+		if (StartUp.bWii)
+		{
+			// Flush possible changes to SYSCONF to file
+			SConfig::GetInstance().m_SYSCONF->Save();
+
+			int source;
+			for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
+			{
+				controls_section->Get(StringFromFormat("WiimoteSource%u", i), &source, -1);
+				if (source != -1 && g_wiimote_sources[i] != (unsigned) source && source >= WIIMOTE_SRC_NONE && source <= WIIMOTE_SRC_HYBRID)
+				{
+					config_cache.bSetWiimoteSource[i] = true;
+					g_wiimote_sources[i] = source;
+					WiimoteReal::ChangeWiimoteSource(i, source);
+				}
+			}
+			controls_section->Get("WiimoteSourceBB", &source, -1);
+			if (source != -1 && g_wiimote_sources[WIIMOTE_BALANCE_BOARD] != (unsigned) source && (source == WIIMOTE_SRC_NONE || source == WIIMOTE_SRC_REAL))
+			{
+				config_cache.bSetWiimoteSource[WIIMOTE_BALANCE_BOARD] = true;
+				g_wiimote_sources[WIIMOTE_BALANCE_BOARD] = source;
+				WiimoteReal::ChangeWiimoteSource(WIIMOTE_BALANCE_BOARD, source);
+			}
+		}
+	}
+
+	StartUp.m_GPUDeterminismMode = ParseGPUDeterminismMode(StartUp.m_strGPUDeterminismMode);
+
+	// Movie settings
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
+	{
+		StartUp.bCPUThread = Movie::IsDualCore();
+		StartUp.bSkipIdle = Movie::IsSkipIdle();
+		StartUp.bDSPHLE = Movie::IsDSPHLE();
+		StartUp.bProgressive = Movie::IsProgressive();
+		StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
+		StartUp.iCPUCore = Movie::GetCPUMode();
+		StartUp.bSyncGPU = Movie::IsSyncGPU();
+		for (int i = 0; i < 2; ++i)
+		{
+			if (Movie::IsUsingMemcard(i) && Movie::IsStartingFromClearSave() && !StartUp.bWii)
+			{
+				if (File::Exists(File::GetUserPath(D_GCUSER_IDX) + StringFromFormat("Movie%s.raw", (i == 0) ? "A" : "B")))
+					File::Delete(File::GetUserPath(D_GCUSER_IDX) + StringFromFormat("Movie%s.raw", (i == 0) ? "A" : "B"));
+			}
+		}
+	}
+
+	if (NetPlay::IsNetPlayRunning())
+	{
+		StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
+		StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
+		StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard;
+		StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore;
+		SConfig::GetInstance().m_DSPEnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
+		SConfig::GetInstance().m_OCEnable = g_NetPlaySettings.m_OCEnable;
+		SConfig::GetInstance().m_OCFactor = g_NetPlaySettings.m_OCFactor;
+		SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0];
+		SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1];
+		config_cache.bSetEXIDevice[0] = true;
+		config_cache.bSetEXIDevice[1] = true;
+	}
+
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", StartUp.bProgressive);
+
+	// Run the game
+	// Init the core
+	if (!Core::Init())
+	{
+		PanicAlertT("Couldn't init the core.\nCheck your configuration.");
+		return false;
+	}
+
+	return true;
+}
+
+void Stop()
+{
+	Core::Stop();
+
+	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	StartUp.m_strUniqueID = "00000000";
+	if (config_cache.valid)
+	{
+		config_cache.valid = false;
+		StartUp.bCPUThread = config_cache.bCPUThread;
+		StartUp.bSkipIdle = config_cache.bSkipIdle;
+		StartUp.bSyncGPUOnSkipIdleHack = config_cache.bSyncGPUOnSkipIdleHack;
+		StartUp.iCPUCore = config_cache.iCPUCore;
+		StartUp.bFPRF = config_cache.bFPRF;
+		StartUp.bAccurateNaNs = config_cache.bAccurateNaNs;
+		StartUp.bMMU = config_cache.bMMU;
+		StartUp.bDCBZOFF = config_cache.bDCBZOFF;
+		StartUp.bSyncGPU = config_cache.bSyncGPU;
+		StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed;
+		StartUp.bDSPHLE = config_cache.bDSPHLE;
+		StartUp.m_strVideoBackend = config_cache.strBackend;
+		StartUp.m_strGPUDeterminismMode = config_cache.m_strGPUDeterminismMode;
+		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
+		StartUp.bHLE_BS2 = config_cache.bHLE_BS2;
+		SConfig::GetInstance().sBackend = config_cache.sBackend;
+		SConfig::GetInstance().m_DSPEnableJIT = config_cache.m_EnableJIT;
+		StartUp.bProgressive = config_cache.bProgressive;
+		SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", config_cache.bProgressive);
+
+		// Only change these back if they were actually set by game ini, since they can be changed while a game is running.
+		if (config_cache.bSetFramelimit)
+			SConfig::GetInstance().m_Framelimit = config_cache.framelimit;
+		if (config_cache.bSetFrameSkip)
+		{
+			SConfig::GetInstance().m_FrameSkip = config_cache.frameSkip;
+			Movie::SetFrameSkipping(config_cache.frameSkip);
+		}
+		if (config_cache.bSetVolume)
+			SConfig::GetInstance().m_Volume = config_cache.Volume;
+
+		for (unsigned int i = 0; i < MAX_SI_CHANNELS; ++i)
+		{
+			if (config_cache.bSetPads[i])
+			{
+				SConfig::GetInstance().m_SIDevice[i] = config_cache.Pads[i];
+			}
+
+		}
+		for (unsigned int i = 0; i < MAX_EXI_CHANNELS; ++i)
+		{
+			if (config_cache.bSetEXIDevice[i])
+			{
+				SConfig::GetInstance().m_EXIDevice[i] = config_cache.m_EXIDevice[i];
+			}
+		}
+		if (StartUp.bWii)
+		{
+			for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
+			{
+				if (config_cache.bSetWiimoteSource[i])
+				{
+					g_wiimote_sources[i] = config_cache.iWiimoteSource[i];
+					WiimoteReal::ChangeWiimoteSource(i, config_cache.iWiimoteSource[i]);
+				}
+
+			}
+		}
+
+	}
+}
+
+} // namespace
diff --git a/Source/Core/Core/BootManager.h b/Source/Core/Core/BootManager.h
new file mode 100644
index 0000000000..b74eee675a
--- /dev/null
+++ b/Source/Core/Core/BootManager.h
@@ -0,0 +1,14 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+namespace BootManager
+{
+bool BootCore(const std::string& _rFilename);
+
+void Stop();
+}
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index d02f19556e..da3dcfcff3 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -1,251 +1,265 @@
-set(SRCS	Src/ActionReplay.cpp
-			Src/ARDecrypt.cpp
-			Src/BootManager.cpp
-			Src/ConfigManager.cpp
-			Src/Console.cpp
-			Src/Core.cpp
-			Src/CoreParameter.cpp
-			Src/CoreTiming.cpp
-			Src/DSPEmulator.cpp
-			Src/ec_wii.cpp
-			Src/GeckoCodeConfig.cpp
-			Src/GeckoCode.cpp
-			Src/Movie.cpp
-			Src/NetPlayClient.cpp
-			Src/NetPlayServer.cpp
-			Src/PatchEngine.cpp
-			Src/State.cpp
-			Src/stdafx.cpp
-			Src/Tracer.cpp
-			Src/VolumeHandler.cpp
-			Src/Boot/Boot_BS2Emu.cpp
-			Src/Boot/Boot.cpp
-			Src/Boot/Boot_DOL.cpp
-			Src/Boot/Boot_ELF.cpp
-			Src/Boot/Boot_WiiWAD.cpp
-			Src/Boot/ElfReader.cpp
-			Src/Debugger/Debugger_SymbolMap.cpp
-			Src/Debugger/Dump.cpp
-			Src/Debugger/PPCDebugInterface.cpp
-			Src/DSP/assemble.cpp
-			Src/DSP/disassemble.cpp
-			Src/DSP/DSPAccelerator.cpp
-			Src/DSP/DSPIntCCUtil.cpp
-			Src/DSP/DSPIntExtOps.cpp
-			Src/DSP/DSPHWInterface.cpp
-			Src/DSP/DSPMemoryMap.cpp
-			Src/DSP/DSPStacks.cpp
-			Src/DSP/DSPAnalyzer.cpp
-			Src/DSP/DspIntArithmetic.cpp
-			Src/DSP/DspIntBranch.cpp
-			Src/DSP/DspIntLoadStore.cpp
-			Src/DSP/DspIntMisc.cpp
-			Src/DSP/DspIntMultiplier.cpp
-			Src/DSP/DSPEmitter.cpp
-			Src/DSP/DSPCodeUtil.cpp
-			Src/DSP/LabelMap.cpp
-			Src/DSP/DSPInterpreter.cpp
-			Src/DSP/DSPCore.cpp
-			Src/DSP/DSPTables.cpp
-			Src/DSP/Jit/DSPJitRegCache.cpp
-			Src/DSP/Jit/DSPJitExtOps.cpp
-			Src/DSP/Jit/DSPJitBranch.cpp
-			Src/DSP/Jit/DSPJitCCUtil.cpp
-			Src/DSP/Jit/DSPJitArithmetic.cpp
-			Src/DSP/Jit/DSPJitLoadStore.cpp
-			Src/DSP/Jit/DSPJitMultiplier.cpp
-			Src/DSP/Jit/DSPJitUtil.cpp
-			Src/DSP/Jit/DSPJitMisc.cpp
-			Src/FifoPlayer/FifoAnalyzer.cpp
-			Src/FifoPlayer/FifoDataFile.cpp
-			Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
-			Src/FifoPlayer/FifoPlayer.cpp
-			Src/FifoPlayer/FifoRecordAnalyzer.cpp
-			Src/FifoPlayer/FifoRecorder.cpp
-			Src/HLE/HLE.cpp
-			Src/HLE/HLE_Misc.cpp
-			Src/HLE/HLE_OS.cpp
-			Src/HW/AudioInterface.cpp
-			Src/HW/CPU.cpp
-			Src/HW/DSP.cpp
-			Src/HW/DSPHLE/UCodes/UCode_AX.cpp
-			Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
-			Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
-			Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
-			Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
-			Src/HW/DSPHLE/UCodes/UCodes.cpp
-			Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
-			Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
-			Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
-			Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
-			Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
-			Src/HW/DSPHLE/HLEMixer.cpp
-			Src/HW/DSPHLE/MailHandler.cpp
-			Src/HW/DSPHLE/DSPHLE.cpp
-			Src/HW/DSPLLE/DSPDebugInterface.cpp
-			Src/HW/DSPLLE/DSPHost.cpp
-			Src/HW/DSPLLE/DSPSymbols.cpp
-			Src/HW/DSPLLE/DSPLLEGlobals.cpp
-			Src/HW/DSPLLE/DSPLLE.cpp
-			Src/HW/DSPLLE/DSPLLETools.cpp
-			Src/HW/DVDInterface.cpp
-			Src/HW/EXI_Channel.cpp
-			Src/HW/EXI.cpp
-			Src/HW/EXI_Device.cpp
-			Src/HW/EXI_DeviceAD16.cpp
-			Src/HW/EXI_DeviceAMBaseboard.cpp
-			Src/HW/EXI_DeviceEthernet.cpp
-			Src/HW/EXI_DeviceGecko.cpp
-			Src/HW/EXI_DeviceIPL.cpp
-			Src/HW/EXI_DeviceMemoryCard.cpp
-			Src/HW/EXI_DeviceMic.cpp
-			Src/HW/GCMemcard.cpp
-			Src/HW/GCPad.cpp
-			Src/HW/GCPadEmu.cpp
-			Src/HW/GPFifo.cpp
-			Src/HW/HW.cpp
-			Src/HW/Memmap.cpp
-			Src/HW/MemmapFunctions.cpp
-			Src/HW/MemoryInterface.cpp
-			Src/HW/ProcessorInterface.cpp
-			Src/HW/SI.cpp
-			Src/HW/SI_DeviceAMBaseboard.cpp
-			Src/HW/SI_Device.cpp
-			Src/HW/SI_DeviceDanceMat.cpp
-			Src/HW/SI_DeviceGBA.cpp
-			Src/HW/SI_DeviceGCController.cpp
-			Src/HW/SI_DeviceGCSteeringWheel.cpp
-			Src/HW/Sram.cpp
-			Src/HW/StreamADPCM.cpp
-			Src/HW/SystemTimers.cpp
-			Src/HW/VideoInterface.cpp
-			Src/HW/WII_IOB.cpp
-			Src/HW/WII_IPC.cpp
-			Src/HW/Wiimote.cpp
-			Src/HW/WiimoteEmu/WiimoteEmu.cpp
-			Src/HW/WiimoteEmu/Attachment/Classic.cpp
-			Src/HW/WiimoteEmu/Attachment/Attachment.cpp
-			Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
-			Src/HW/WiimoteEmu/Attachment/Drums.cpp
-			Src/HW/WiimoteEmu/Attachment/Guitar.cpp
-			Src/HW/WiimoteEmu/Attachment/Turntable.cpp
-			Src/HW/WiimoteEmu/EmuSubroutines.cpp
-			Src/HW/WiimoteEmu/Encryption.cpp
-			Src/HW/WiimoteEmu/Speaker.cpp
-			Src/HW/WiimoteReal/WiimoteReal.cpp
-			Src/IPC_HLE/ICMPLin.cpp
-			Src/IPC_HLE/WII_IPC_HLE.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
-			Src/IPC_HLE/WII_Socket.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
-			Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
-			Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
-			Src/IPC_HLE/WiiMote_HID_Attr.cpp
-			Src/PowerPC/LUT_frsqrtex.cpp
-			Src/PowerPC/PowerPC.cpp
-			Src/PowerPC/PPCAnalyst.cpp
-			Src/PowerPC/PPCCache.cpp
-			Src/PowerPC/PPCSymbolDB.cpp
-			Src/PowerPC/PPCTables.cpp
-			Src/PowerPC/Profiler.cpp
-			Src/PowerPC/SignatureDB.cpp
-			Src/PowerPC/JitInterface.cpp
-			Src/PowerPC/Interpreter/Interpreter_Branch.cpp
-			Src/PowerPC/Interpreter/Interpreter.cpp
-			Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
-			Src/PowerPC/Interpreter/Interpreter_Integer.cpp
-			Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
-			Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
-			Src/PowerPC/Interpreter/Interpreter_Paired.cpp
-			Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
-			Src/PowerPC/Interpreter/Interpreter_Tables.cpp
-			Src/PowerPC/JitCommon/JitBase.cpp
-			Src/PowerPC/JitCommon/JitCache.cpp)
+set(SRCS	ActionReplay.cpp
+			ARDecrypt.cpp
+			BootManager.cpp
+			ConfigManager.cpp
+			Core.cpp
+			CoreParameter.cpp
+			CoreTiming.cpp
+			DSPEmulator.cpp
+			ec_wii.cpp
+			GeckoCodeConfig.cpp
+			GeckoCode.cpp
+			HotkeyManager.cpp
+			MemTools.cpp
+			Movie.cpp
+			NetPlayClient.cpp
+			NetPlayServer.cpp
+			PatchEngine.cpp
+			State.cpp
+			Boot/Boot_BS2Emu.cpp
+			Boot/Boot.cpp
+			Boot/Boot_DOL.cpp
+			Boot/Boot_ELF.cpp
+			Boot/Boot_WiiWAD.cpp
+			Boot/ElfReader.cpp
+			Debugger/Debugger_SymbolMap.cpp
+			Debugger/Dump.cpp
+			Debugger/PPCDebugInterface.cpp
+			DSP/DSPAssembler.cpp
+			DSP/DSPDisassembler.cpp
+			DSP/DSPAccelerator.cpp
+			DSP/DSPCaptureLogger.cpp
+			DSP/DSPIntCCUtil.cpp
+			DSP/DSPIntExtOps.cpp
+			DSP/DSPHWInterface.cpp
+			DSP/DSPMemoryMap.cpp
+			DSP/DSPStacks.cpp
+			DSP/DSPAnalyzer.cpp
+			DSP/DSPIntArithmetic.cpp
+			DSP/DSPIntBranch.cpp
+			DSP/DSPIntLoadStore.cpp
+			DSP/DSPIntMisc.cpp
+			DSP/DSPIntMultiplier.cpp
+			DSP/DSPEmitter.cpp
+			DSP/DSPCodeUtil.cpp
+			DSP/LabelMap.cpp
+			DSP/DSPInterpreter.cpp
+			DSP/DSPCore.cpp
+			DSP/DSPTables.cpp
+			DSP/Jit/DSPJitRegCache.cpp
+			DSP/Jit/DSPJitExtOps.cpp
+			DSP/Jit/DSPJitBranch.cpp
+			DSP/Jit/DSPJitCCUtil.cpp
+			DSP/Jit/DSPJitArithmetic.cpp
+			DSP/Jit/DSPJitLoadStore.cpp
+			DSP/Jit/DSPJitMultiplier.cpp
+			DSP/Jit/DSPJitUtil.cpp
+			DSP/Jit/DSPJitMisc.cpp
+			FifoPlayer/FifoAnalyzer.cpp
+			FifoPlayer/FifoDataFile.cpp
+			FifoPlayer/FifoPlaybackAnalyzer.cpp
+			FifoPlayer/FifoPlayer.cpp
+			FifoPlayer/FifoRecordAnalyzer.cpp
+			FifoPlayer/FifoRecorder.cpp
+			HLE/HLE.cpp
+			HLE/HLE_Misc.cpp
+			HLE/HLE_OS.cpp
+			HW/AudioInterface.cpp
+			HW/CPU.cpp
+			HW/DSP.cpp
+			HW/DSPHLE/UCodes/AX.cpp
+			HW/DSPHLE/UCodes/AXWii.cpp
+			HW/DSPHLE/UCodes/CARD.cpp
+			HW/DSPHLE/UCodes/GBA.cpp
+			HW/DSPHLE/UCodes/INIT.cpp
+			HW/DSPHLE/UCodes/ROM.cpp
+			HW/DSPHLE/UCodes/UCodes.cpp
+			HW/DSPHLE/UCodes/Zelda.cpp
+			HW/DSPHLE/UCodes/ZeldaADPCM.cpp
+			HW/DSPHLE/UCodes/ZeldaSynth.cpp
+			HW/DSPHLE/UCodes/ZeldaVoice.cpp
+			HW/DSPHLE/MailHandler.cpp
+			HW/DSPHLE/DSPHLE.cpp
+			HW/DSPLLE/DSPDebugInterface.cpp
+			HW/DSPLLE/DSPHost.cpp
+			HW/DSPLLE/DSPSymbols.cpp
+			HW/DSPLLE/DSPLLEGlobals.cpp
+			HW/DSPLLE/DSPLLE.cpp
+			HW/DSPLLE/DSPLLETools.cpp
+			HW/DVDInterface.cpp
+			HW/EXI_Channel.cpp
+			HW/EXI.cpp
+			HW/EXI_Device.cpp
+			HW/EXI_DeviceAD16.cpp
+			HW/EXI_DeviceAGP.cpp
+			HW/EXI_DeviceAMBaseboard.cpp
+			HW/EXI_DeviceEthernet.cpp
+			HW/EXI_DeviceGecko.cpp
+			HW/EXI_DeviceIPL.cpp
+			HW/EXI_DeviceMemoryCard.cpp
+			HW/EXI_DeviceMic.cpp
+			HW/GCKeyboard.cpp
+			HW/GCKeyboardEmu.cpp
+			HW/GCMemcard.cpp
+			HW/GCMemcardDirectory.cpp
+			HW/GCMemcardRaw.cpp
+			HW/GCPad.cpp
+			HW/GCPadEmu.cpp
+			HW/GPFifo.cpp
+			HW/HW.cpp
+			HW/Memmap.cpp
+			HW/MemoryInterface.cpp
+			HW/MMIO.cpp
+			HW/ProcessorInterface.cpp
+			HW/SI.cpp
+			HW/SI_DeviceAMBaseboard.cpp
+			HW/SI_Device.cpp
+			HW/SI_DeviceDanceMat.cpp
+			HW/SI_DeviceGBA.cpp
+			HW/SI_DeviceGCController.cpp
+			HW/SI_DeviceGCSteeringWheel.cpp
+			HW/SI_DeviceKeyboard.cpp
+			HW/Sram.cpp
+			HW/StreamADPCM.cpp
+			HW/SystemTimers.cpp
+			HW/VideoInterface.cpp
+			HW/WII_IPC.cpp
+			HW/Wiimote.cpp
+			HW/WiimoteEmu/WiimoteEmu.cpp
+			HW/WiimoteEmu/Attachment/Classic.cpp
+			HW/WiimoteEmu/Attachment/Attachment.cpp
+			HW/WiimoteEmu/Attachment/Nunchuk.cpp
+			HW/WiimoteEmu/Attachment/Drums.cpp
+			HW/WiimoteEmu/Attachment/Guitar.cpp
+			HW/WiimoteEmu/Attachment/Turntable.cpp
+			HW/WiimoteEmu/EmuSubroutines.cpp
+			HW/WiimoteEmu/Encryption.cpp
+			HW/WiimoteEmu/Speaker.cpp
+			HW/WiimoteReal/WiimoteReal.cpp
+			HW/WiiSaveCrypted.cpp
+			IPC_HLE/ICMPLin.cpp
+			IPC_HLE/WII_IPC_HLE.cpp
+			IPC_HLE/WII_IPC_HLE_Device_DI.cpp
+			IPC_HLE/WII_IPC_HLE_Device_es.cpp
+			IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+			IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+			IPC_HLE/WII_Socket.cpp
+			IPC_HLE/WII_IPC_HLE_Device_net.cpp
+			IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
+			IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
+			IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+			IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
+			IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+			IPC_HLE/WiiMote_HID_Attr.cpp
+			PowerPC/MMU.cpp
+			PowerPC/PowerPC.cpp
+			PowerPC/PPCAnalyst.cpp
+			PowerPC/PPCCache.cpp
+			PowerPC/PPCSymbolDB.cpp
+			PowerPC/PPCTables.cpp
+			PowerPC/Profiler.cpp
+			PowerPC/SignatureDB.cpp
+			PowerPC/JitInterface.cpp
+			PowerPC/Interpreter/Interpreter_Branch.cpp
+			PowerPC/Interpreter/Interpreter.cpp
+			PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
+			PowerPC/Interpreter/Interpreter_Integer.cpp
+			PowerPC/Interpreter/Interpreter_LoadStore.cpp
+			PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
+			PowerPC/Interpreter/Interpreter_Paired.cpp
+			PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
+			PowerPC/Interpreter/Interpreter_Tables.cpp
+			PowerPC/JitCommon/JitAsmCommon.cpp
+			PowerPC/JitCommon/JitBase.cpp
+			PowerPC/JitCommon/JitCache.cpp
+			PowerPC/JitILCommon/IR.cpp
+			PowerPC/JitILCommon/JitILBase_Branch.cpp
+			PowerPC/JitILCommon/JitILBase_LoadStore.cpp
+			PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp
+			PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp
+			PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp
+			PowerPC/JitILCommon/JitILBase_Paired.cpp
+			PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp
+			PowerPC/JitILCommon/JitILBase_Integer.cpp
+			)
 
-if(NOT _M_GENERIC)
+if(_M_X86)
 	set(SRCS ${SRCS}
-			Src/x64MemTools.cpp
-			Src/PowerPC/Jit64IL/IR.cpp
-			Src/PowerPC/Jit64IL/IR_X86.cpp
-			Src/PowerPC/Jit64IL/JitILAsm.cpp
-			Src/PowerPC/Jit64IL/JitIL_Branch.cpp
-			Src/PowerPC/Jit64IL/JitIL.cpp
-			Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
-			Src/PowerPC/Jit64IL/JitIL_Integer.cpp
-			Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
-			Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
-			Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
-			Src/PowerPC/Jit64IL/JitIL_Paired.cpp
-			Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
-			Src/PowerPC/Jit64IL/JitIL_Tables.cpp
-			Src/PowerPC/Jit64/Jit64_Tables.cpp
-			Src/PowerPC/Jit64/JitAsm.cpp
-			Src/PowerPC/Jit64/Jit_Branch.cpp
-			Src/PowerPC/Jit64/Jit.cpp
-			Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
-			Src/PowerPC/Jit64/Jit_Integer.cpp
-			Src/PowerPC/Jit64/Jit_LoadStore.cpp
-			Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
-			Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
-			Src/PowerPC/Jit64/Jit_Paired.cpp
-			Src/PowerPC/Jit64/JitRegCache.cpp
-			Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
-			Src/PowerPC/JitCommon/JitBackpatch.cpp
-			Src/PowerPC/JitCommon/JitAsmCommon.cpp
-			Src/PowerPC/JitCommon/Jit_Util.cpp)
-endif()
-if(_M_ARM)
+			PowerPC/Jit64IL/IR_X86.cpp
+			PowerPC/Jit64IL/JitIL.cpp
+			PowerPC/Jit64IL/JitIL_Tables.cpp
+			PowerPC/Jit64/Jit64_Tables.cpp
+			PowerPC/Jit64/JitAsm.cpp
+			PowerPC/Jit64/Jit_Branch.cpp
+			PowerPC/Jit64/Jit.cpp
+			PowerPC/Jit64/Jit_FloatingPoint.cpp
+			PowerPC/Jit64/Jit_Integer.cpp
+			PowerPC/Jit64/Jit_LoadStore.cpp
+			PowerPC/Jit64/Jit_LoadStoreFloating.cpp
+			PowerPC/Jit64/Jit_LoadStorePaired.cpp
+			PowerPC/Jit64/Jit_Paired.cpp
+			PowerPC/Jit64/JitRegCache.cpp
+			PowerPC/Jit64/Jit_SystemRegisters.cpp
+			PowerPC/Jit64Common/Jit64AsmCommon.cpp
+			PowerPC/JitCommon/JitBackpatch.cpp
+			PowerPC/JitCommon/Jit_Util.cpp
+			PowerPC/JitCommon/TrampolineCache.cpp)
+elseif(_M_ARM_64)
 	set(SRCS ${SRCS}
-			Src/ArmMemTools.cpp
-			Src/PowerPC/JitArm32/Jit.cpp
-			Src/PowerPC/JitArm32/JitAsm.cpp
-			Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
-			Src/PowerPC/JitArm32/JitArm_Tables.cpp
-			Src/PowerPC/JitArm32/JitArmCache.cpp
-			Src/PowerPC/JitArm32/JitRegCache.cpp
-			Src/PowerPC/JitArm32/JitFPRCache.cpp
-			Src/PowerPC/JitArm32/JitArm_Branch.cpp
-			Src/PowerPC/JitArm32/JitArm_Integer.cpp
-			Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
-			Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
-			Src/PowerPC/JitArm32/JitArm_Paired.cpp
-			Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp
-			Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
-			Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp)
+	         PowerPC/JitArm64/Jit.cpp
+	         PowerPC/JitArm64/JitAsm.cpp
+	         PowerPC/JitArm64/JitArm64Cache.cpp
+	         PowerPC/JitArm64/JitArm64_RegCache.cpp
+	         PowerPC/JitArm64/JitArm64_BackPatch.cpp
+	         PowerPC/JitArm64/JitArm64_Branch.cpp
+	         PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
+	         PowerPC/JitArm64/JitArm64_Integer.cpp
+	         PowerPC/JitArm64/JitArm64_LoadStore.cpp
+	         PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp
+	         PowerPC/JitArm64/JitArm64_Paired.cpp
+	         PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
+	         PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
+	         PowerPC/JitArm64/Jit_Util.cpp
+	         PowerPC/JitArm64/JitArm64_Tables.cpp)
 endif()
 
-set(LIBS bdisasm inputcommon videosoftware sfml-network)
-
-if(NOT USE_GLES OR USE_GLES3)
-	set(LIBS ${LIBS} videoogl)
-endif()
+set(LIBS
+	audiocommon
+	bdisasm
+	common
+	discio
+	enet
+	inputcommon
+	${LZO}
+	sfml-network
+	sfml-system
+	videoogl
+	videosoftware
+	z
+	)
 
 if(LIBUSB_FOUND)
 	# Using shared LibUSB
 	set(LIBS	${LIBS}	${LIBUSB_LIBRARIES})
-	set(SRCS	${SRCS}	Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp)
+	set(SRCS	${SRCS}	IPC_HLE/WII_IPC_HLE_Device_hid.cpp
+	        	       	HW/SI_GCAdapter.cpp)
 endif(LIBUSB_FOUND)
 
 set(LIBS ${LIBS} ${POLARSSL_LIBRARY})
 
 if(WIN32)
-	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
-		Src/HW/WiimoteReal/IOWin.cpp)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Apple.cpp Src/HW/WiimoteReal/IOdarwin.mm)
+	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
+elseif(APPLE)
+	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
+	set(LIBS ${LIBS}
+		${IOB_LIBRARY})
 elseif(UNIX)
-	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Unix.cpp)
-	if((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND BLUEZ_FOUND)
-		set(SRCS ${SRCS} Src/HW/WiimoteReal/IONix.cpp)
+	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Unix.cpp)
+	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND BLUEZ_FOUND)
+		set(SRCS ${SRCS} HW/WiimoteReal/IONix.cpp)
 		set(LIBS ${LIBS} bluetooth)
 	else()
-		set(SRCS ${SRCS} Src/HW/WiimoteReal/IODummy.cpp)
+		set(SRCS ${SRCS} HW/WiimoteReal/IODummy.cpp)
 	endif()
 endif()
 
@@ -258,8 +272,7 @@ if(OPROFILE_FOUND)
 endif(OPROFILE_FOUND)
 
 if(GDBSTUB)
-	set(SRCS ${SRCS} Src/PowerPC/GDBStub.cpp)
+	set(SRCS ${SRCS} PowerPC/GDBStub.cpp)
 endif(GDBSTUB)
 
-add_library(core STATIC ${SRCS})
-target_link_libraries(core ${LIBS})
+add_dolphin_library(core "${SRCS}" "${LIBS}")
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
new file mode 100644
index 0000000000..7d7323bd54
--- /dev/null
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -0,0 +1,526 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/SI.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DiscIO/NANDContentLoader.h"
+
+SConfig* SConfig::m_Instance;
+
+SConfig::SConfig()
+{
+	// Make sure we have log manager
+	LoadSettings();
+}
+
+void SConfig::Init()
+{
+	m_Instance = new SConfig;
+}
+
+void SConfig::Shutdown()
+{
+	delete m_Instance;
+	m_Instance = nullptr;
+}
+
+SConfig::~SConfig()
+{
+	SaveSettings();
+	delete m_SYSCONF;
+}
+
+
+void SConfig::SaveSettings()
+{
+	NOTICE_LOG(BOOT, "Saving settings to %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff
+
+	SaveGeneralSettings(ini);
+	SaveInterfaceSettings(ini);
+	SaveDisplaySettings(ini);
+	SaveGameListSettings(ini);
+	SaveCoreSettings(ini);
+	SaveMovieSettings(ini);
+	SaveDSPSettings(ini);
+	SaveInputSettings(ini);
+	SaveFifoPlayerSettings(ini);
+
+	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	m_SYSCONF->Save();
+}
+
+void SConfig::SaveGeneralSettings(IniFile& ini)
+{
+	IniFile::Section* general = ini.GetOrCreateSection("General");
+
+	// General
+	general->Set("LastFilename", m_LastFilename);
+	general->Set("ShowLag", m_ShowLag);
+	general->Set("ShowFrameCount", m_ShowFrameCount);
+
+	// ISO folders
+	// Clear removed folders
+	int oldPaths;
+	int numPaths = (int)m_ISOFolder.size();
+	general->Get("ISOPaths", &oldPaths, 0);
+	for (int i = numPaths; i < oldPaths; i++)
+	{
+		ini.DeleteKey("General", StringFromFormat("ISOPath%i", i));
+	}
+
+	general->Set("ISOPaths", numPaths);
+	for (int i = 0; i < numPaths; i++)
+	{
+		general->Set(StringFromFormat("ISOPath%i", i), m_ISOFolder[i]);
+	}
+
+	general->Set("RecursiveISOPaths", m_RecursiveISOFolder);
+	general->Set("NANDRootPath", m_NANDPath);
+	general->Set("WirelessMac", m_WirelessMac);
+
+#ifdef USE_GDBSTUB
+#ifndef _WIN32
+	general->Set("GDBSocket", m_LocalCoreStartupParameter.gdb_socket);
+#endif
+	general->Set("GDBPort", m_LocalCoreStartupParameter.iGDBPort);
+#endif
+}
+
+void SConfig::SaveInterfaceSettings(IniFile& ini)
+{
+	IniFile::Section* interface = ini.GetOrCreateSection("Interface");
+
+	interface->Set("ConfirmStop", m_LocalCoreStartupParameter.bConfirmStop);
+	interface->Set("UsePanicHandlers", m_LocalCoreStartupParameter.bUsePanicHandlers);
+	interface->Set("OnScreenDisplayMessages", m_LocalCoreStartupParameter.bOnScreenDisplayMessages);
+	interface->Set("HideCursor", m_LocalCoreStartupParameter.bHideCursor);
+	interface->Set("AutoHideCursor", m_LocalCoreStartupParameter.bAutoHideCursor);
+	interface->Set("MainWindowPosX", (m_LocalCoreStartupParameter.iPosX == -32000) ? 0 : m_LocalCoreStartupParameter.iPosX); // TODO - HAX
+	interface->Set("MainWindowPosY", (m_LocalCoreStartupParameter.iPosY == -32000) ? 0 : m_LocalCoreStartupParameter.iPosY); // TODO - HAX
+	interface->Set("MainWindowWidth", m_LocalCoreStartupParameter.iWidth);
+	interface->Set("MainWindowHeight", m_LocalCoreStartupParameter.iHeight);
+	interface->Set("Language", m_InterfaceLanguage);
+	interface->Set("ShowToolbar", m_InterfaceToolbar);
+	interface->Set("ShowStatusbar", m_InterfaceStatusbar);
+	interface->Set("ShowLogWindow", m_InterfaceLogWindow);
+	interface->Set("ShowLogConfigWindow", m_InterfaceLogConfigWindow);
+	interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo);
+	interface->Set("ThemeName40", m_LocalCoreStartupParameter.theme_name);
+	interface->Set("PauseOnFocusLost", m_PauseOnFocusLost);
+}
+
+void SConfig::SaveDisplaySettings(IniFile& ini)
+{
+	IniFile::Section* display = ini.GetOrCreateSection("Display");
+
+	display->Set("FullscreenResolution", m_LocalCoreStartupParameter.strFullscreenResolution);
+	display->Set("Fullscreen", m_LocalCoreStartupParameter.bFullscreen);
+	display->Set("RenderToMain", m_LocalCoreStartupParameter.bRenderToMain);
+	display->Set("RenderWindowXPos", m_LocalCoreStartupParameter.iRenderWindowXPos);
+	display->Set("RenderWindowYPos", m_LocalCoreStartupParameter.iRenderWindowYPos);
+	display->Set("RenderWindowWidth", m_LocalCoreStartupParameter.iRenderWindowWidth);
+	display->Set("RenderWindowHeight", m_LocalCoreStartupParameter.iRenderWindowHeight);
+	display->Set("RenderWindowAutoSize", m_LocalCoreStartupParameter.bRenderWindowAutoSize);
+	display->Set("KeepWindowOnTop", m_LocalCoreStartupParameter.bKeepWindowOnTop);
+	display->Set("ProgressiveScan", m_LocalCoreStartupParameter.bProgressive);
+	display->Set("DisableScreenSaver", m_LocalCoreStartupParameter.bDisableScreenSaver);
+	display->Set("ForceNTSCJ", m_LocalCoreStartupParameter.bForceNTSCJ);
+}
+
+void SConfig::SaveGameListSettings(IniFile& ini)
+{
+	IniFile::Section* gamelist = ini.GetOrCreateSection("GameList");
+
+	gamelist->Set("ListDrives", m_ListDrives);
+	gamelist->Set("ListWad", m_ListWad);
+	gamelist->Set("ListWii", m_ListWii);
+	gamelist->Set("ListGC", m_ListGC);
+	gamelist->Set("ListJap", m_ListJap);
+	gamelist->Set("ListPal", m_ListPal);
+	gamelist->Set("ListUsa", m_ListUsa);
+	gamelist->Set("ListAustralia", m_ListAustralia);
+	gamelist->Set("ListFrance", m_ListFrance);
+	gamelist->Set("ListGermany", m_ListGermany);
+	gamelist->Set("ListItaly", m_ListItaly);
+	gamelist->Set("ListKorea", m_ListKorea);
+	gamelist->Set("ListNetherlands", m_ListNetherlands);
+	gamelist->Set("ListRussia", m_ListRussia);
+	gamelist->Set("ListSpain", m_ListSpain);
+	gamelist->Set("ListTaiwan", m_ListTaiwan);
+	gamelist->Set("ListWorld", m_ListWorld);
+	gamelist->Set("ListUnknown", m_ListUnknown);
+	gamelist->Set("ListSort", m_ListSort);
+	gamelist->Set("ListSortSecondary", m_ListSort2);
+
+	gamelist->Set("ColorCompressed", m_ColorCompressed);
+
+	gamelist->Set("ColumnPlatform", m_showSystemColumn);
+	gamelist->Set("ColumnBanner", m_showBannerColumn);
+	gamelist->Set("ColumnNotes", m_showMakerColumn);
+	gamelist->Set("ColumnID", m_showIDColumn);
+	gamelist->Set("ColumnRegion", m_showRegionColumn);
+	gamelist->Set("ColumnSize", m_showSizeColumn);
+	gamelist->Set("ColumnState", m_showStateColumn);
+}
+
+void SConfig::SaveCoreSettings(IniFile& ini)
+{
+	IniFile::Section* core = ini.GetOrCreateSection("Core");
+
+	core->Set("HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2);
+	core->Set("CPUCore", m_LocalCoreStartupParameter.iCPUCore);
+	core->Set("Fastmem", m_LocalCoreStartupParameter.bFastmem);
+	core->Set("CPUThread", m_LocalCoreStartupParameter.bCPUThread);
+	core->Set("DSPHLE", m_LocalCoreStartupParameter.bDSPHLE);
+	core->Set("SkipIdle", m_LocalCoreStartupParameter.bSkipIdle);
+	core->Set("SyncOnSkipIdle", m_LocalCoreStartupParameter.bSyncGPUOnSkipIdleHack);
+	core->Set("SyncGPU", m_LocalCoreStartupParameter.bSyncGPU);
+	core->Set("SyncGpuMaxDistance", m_LocalCoreStartupParameter.iSyncGpuMaxDistance);
+	core->Set("SyncGpuMinDistance", m_LocalCoreStartupParameter.iSyncGpuMinDistance);
+	core->Set("SyncGpuOverclock", m_LocalCoreStartupParameter.fSyncGpuOverclock);
+	core->Set("DefaultISO", m_LocalCoreStartupParameter.m_strDefaultISO);
+	core->Set("DVDRoot", m_LocalCoreStartupParameter.m_strDVDRoot);
+	core->Set("Apploader", m_LocalCoreStartupParameter.m_strApploader);
+	core->Set("EnableCheats", m_LocalCoreStartupParameter.bEnableCheats);
+	core->Set("SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage);
+	core->Set("DPL2Decoder", m_LocalCoreStartupParameter.bDPL2Decoder);
+	core->Set("Latency", m_LocalCoreStartupParameter.iLatency);
+	core->Set("MemcardAPath", m_strMemoryCardA);
+	core->Set("MemcardBPath", m_strMemoryCardB);
+	core->Set("AgpCartAPath", m_strGbaCartA);
+	core->Set("AgpCartBPath", m_strGbaCartB);
+	core->Set("SlotA", m_EXIDevice[0]);
+	core->Set("SlotB", m_EXIDevice[1]);
+	core->Set("SerialPort1", m_EXIDevice[2]);
+	core->Set("BBA_MAC", m_bba_mac);
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+	{
+		core->Set(StringFromFormat("SIDevice%i", i), m_SIDevice[i]);
+	}
+	core->Set("WiiSDCard", m_WiiSDCard);
+	core->Set("WiiKeyboard", m_WiiKeyboard);
+	core->Set("WiimoteContinuousScanning", m_WiimoteContinuousScanning);
+	core->Set("WiimoteEnableSpeaker", m_WiimoteEnableSpeaker);
+	core->Set("RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer);
+	core->Set("RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
+	core->Set("FrameLimit", m_Framelimit);
+	core->Set("FrameSkip", m_FrameSkip);
+	core->Set("Overclock", m_OCFactor);
+	core->Set("OverclockEnable", m_OCEnable);
+	core->Set("GFXBackend", m_LocalCoreStartupParameter.m_strVideoBackend);
+	core->Set("GPUDeterminismMode", m_LocalCoreStartupParameter.m_strGPUDeterminismMode);
+	core->Set("GameCubeAdapter", m_GameCubeAdapter);
+	core->Set("AdapterRumble", m_AdapterRumble);
+}
+
+void SConfig::SaveMovieSettings(IniFile& ini)
+{
+	IniFile::Section* movie = ini.GetOrCreateSection("Movie");
+
+	movie->Set("PauseMovie", m_PauseMovie);
+	movie->Set("Author", m_strMovieAuthor);
+	movie->Set("DumpFrames", m_DumpFrames);
+	movie->Set("DumpFramesSilent", m_DumpFramesSilent);
+	movie->Set("ShowInputDisplay", m_ShowInputDisplay);
+}
+
+void SConfig::SaveDSPSettings(IniFile& ini)
+{
+	IniFile::Section* dsp = ini.GetOrCreateSection("DSP");
+
+	dsp->Set("EnableJIT", m_DSPEnableJIT);
+	dsp->Set("DumpAudio", m_DumpAudio);
+	dsp->Set("Backend", sBackend);
+	dsp->Set("Volume", m_Volume);
+	dsp->Set("CaptureLog", m_DSPCaptureLog);
+}
+
+void SConfig::SaveInputSettings(IniFile& ini)
+{
+	IniFile::Section* input = ini.GetOrCreateSection("Input");
+
+	input->Set("BackgroundInput", m_BackgroundInput);
+}
+
+void SConfig::SaveFifoPlayerSettings(IniFile& ini)
+{
+	IniFile::Section* fifoplayer = ini.GetOrCreateSection("FifoPlayer");
+
+	fifoplayer->Set("LoopReplay", m_LocalCoreStartupParameter.bLoopFifoReplay);
+}
+
+void SConfig::LoadSettings()
+{
+	INFO_LOG(BOOT, "Loading Settings from %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+
+	LoadGeneralSettings(ini);
+	LoadInterfaceSettings(ini);
+	LoadDisplaySettings(ini);
+	LoadGameListSettings(ini);
+	LoadCoreSettings(ini);
+	LoadMovieSettings(ini);
+	LoadDSPSettings(ini);
+	LoadInputSettings(ini);
+	LoadFifoPlayerSettings(ini);
+
+	m_SYSCONF = new SysConf();
+}
+
+void SConfig::LoadGeneralSettings(IniFile& ini)
+{
+	IniFile::Section* general = ini.GetOrCreateSection("General");
+
+	general->Get("LastFilename", &m_LastFilename);
+	general->Get("ShowLag", &m_ShowLag, false);
+	general->Get("ShowFrameCount", &m_ShowFrameCount, false);
+#ifdef USE_GDBSTUB
+#ifndef _WIN32
+	general->Get("GDBSocket", &m_LocalCoreStartupParameter.gdb_socket, "");
+#endif
+	general->Get("GDBPort", &(m_LocalCoreStartupParameter.iGDBPort), -1);
+#endif
+
+	m_ISOFolder.clear();
+	int numISOPaths;
+
+	if (general->Get("ISOPaths", &numISOPaths, 0))
+	{
+		for (int i = 0; i < numISOPaths; i++)
+		{
+			std::string tmpPath;
+			general->Get(StringFromFormat("ISOPath%i", i), &tmpPath, "");
+			m_ISOFolder.push_back(std::move(tmpPath));
+		}
+	}
+	// Check for old file path (Changed in 4.0-4003)
+	// This can probably be removed after 5.0 stable is launched
+	else if (general->Get("GCMPathes", &numISOPaths, 0))
+	{
+		for (int i = 0; i < numISOPaths; i++)
+		{
+			std::string tmpPath;
+			general->Get(StringFromFormat("GCMPath%i", i), &tmpPath, "");
+			bool found = false;
+			for (size_t j = 0; j < m_ISOFolder.size(); ++j)
+			{
+				if (m_ISOFolder[j] == tmpPath)
+				{
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+				m_ISOFolder.push_back(std::move(tmpPath));
+		}
+	}
+
+	if (!general->Get("RecursiveISOPaths", &m_RecursiveISOFolder, false))
+	{
+		// Check for old name
+		general->Get("RecursiveGCMPaths", &m_RecursiveISOFolder, false);
+	}
+
+	general->Get("NANDRootPath", &m_NANDPath);
+	File::SetUserPath(D_WIIROOT_IDX, m_NANDPath);
+	general->Get("WirelessMac", &m_WirelessMac);
+}
+
+void SConfig::LoadInterfaceSettings(IniFile& ini)
+{
+	IniFile::Section* interface = ini.GetOrCreateSection("Interface");
+
+	interface->Get("ConfirmStop",             &m_LocalCoreStartupParameter.bConfirmStop,      true);
+	interface->Get("UsePanicHandlers",        &m_LocalCoreStartupParameter.bUsePanicHandlers, true);
+	interface->Get("OnScreenDisplayMessages", &m_LocalCoreStartupParameter.bOnScreenDisplayMessages, true);
+	interface->Get("HideCursor",              &m_LocalCoreStartupParameter.bHideCursor,       false);
+	interface->Get("AutoHideCursor",          &m_LocalCoreStartupParameter.bAutoHideCursor,   false);
+	interface->Get("MainWindowPosX",          &m_LocalCoreStartupParameter.iPosX,             100);
+	interface->Get("MainWindowPosY",          &m_LocalCoreStartupParameter.iPosY,             100);
+	interface->Get("MainWindowWidth",         &m_LocalCoreStartupParameter.iWidth,            800);
+	interface->Get("MainWindowHeight",        &m_LocalCoreStartupParameter.iHeight,           600);
+	interface->Get("Language",                &m_InterfaceLanguage,                           0);
+	interface->Get("ShowToolbar",             &m_InterfaceToolbar,                            true);
+	interface->Get("ShowStatusbar",           &m_InterfaceStatusbar,                          true);
+	interface->Get("ShowLogWindow",           &m_InterfaceLogWindow,                          false);
+	interface->Get("ShowLogConfigWindow",     &m_InterfaceLogConfigWindow,                    false);
+	interface->Get("ExtendedFPSInfo",         &m_InterfaceExtendedFPSInfo,                    false);
+	interface->Get("ThemeName40",             &m_LocalCoreStartupParameter.theme_name,        "Clean");
+	interface->Get("PauseOnFocusLost",        &m_PauseOnFocusLost,                            false);
+}
+
+void SConfig::LoadDisplaySettings(IniFile& ini)
+{
+	IniFile::Section* display = ini.GetOrCreateSection("Display");
+
+	display->Get("Fullscreen",           &m_LocalCoreStartupParameter.bFullscreen,             false);
+	display->Get("FullscreenResolution", &m_LocalCoreStartupParameter.strFullscreenResolution, "Auto");
+	display->Get("RenderToMain",         &m_LocalCoreStartupParameter.bRenderToMain,           false);
+	display->Get("RenderWindowXPos",     &m_LocalCoreStartupParameter.iRenderWindowXPos,       -1);
+	display->Get("RenderWindowYPos",     &m_LocalCoreStartupParameter.iRenderWindowYPos,       -1);
+	display->Get("RenderWindowWidth",    &m_LocalCoreStartupParameter.iRenderWindowWidth,      640);
+	display->Get("RenderWindowHeight",   &m_LocalCoreStartupParameter.iRenderWindowHeight,     480);
+	display->Get("RenderWindowAutoSize", &m_LocalCoreStartupParameter.bRenderWindowAutoSize,   false);
+	display->Get("KeepWindowOnTop",      &m_LocalCoreStartupParameter.bKeepWindowOnTop,        false);
+	display->Get("ProgressiveScan",      &m_LocalCoreStartupParameter.bProgressive,            false);
+	display->Get("DisableScreenSaver",   &m_LocalCoreStartupParameter.bDisableScreenSaver,     true);
+	display->Get("ForceNTSCJ",           &m_LocalCoreStartupParameter.bForceNTSCJ,             false);
+}
+
+void SConfig::LoadGameListSettings(IniFile& ini)
+{
+	IniFile::Section* gamelist = ini.GetOrCreateSection("GameList");
+
+	gamelist->Get("ListDrives",        &m_ListDrives,  false);
+	gamelist->Get("ListWad",           &m_ListWad,     true);
+	gamelist->Get("ListWii",           &m_ListWii,     true);
+	gamelist->Get("ListGC",            &m_ListGC,      true);
+	gamelist->Get("ListJap",           &m_ListJap,     true);
+	gamelist->Get("ListPal",           &m_ListPal,     true);
+	gamelist->Get("ListUsa",           &m_ListUsa,     true);
+
+	gamelist->Get("ListAustralia",     &m_ListAustralia,     true);
+	gamelist->Get("ListFrance",        &m_ListFrance,        true);
+	gamelist->Get("ListGermany",       &m_ListGermany,       true);
+	gamelist->Get("ListItaly",         &m_ListItaly,         true);
+	gamelist->Get("ListKorea",         &m_ListKorea,         true);
+	gamelist->Get("ListNetherlands",   &m_ListNetherlands,   true);
+	gamelist->Get("ListRussia",        &m_ListRussia,        true);
+	gamelist->Get("ListSpain",         &m_ListSpain,         true);
+	gamelist->Get("ListTaiwan",        &m_ListTaiwan,        true);
+	gamelist->Get("ListWorld",         &m_ListWorld,         true);
+	gamelist->Get("ListUnknown",       &m_ListUnknown,       true);
+	gamelist->Get("ListSort",          &m_ListSort,       3);
+	gamelist->Get("ListSortSecondary", &m_ListSort2,      0);
+
+	// Determines if compressed games display in blue
+	gamelist->Get("ColorCompressed", &m_ColorCompressed, true);
+
+	// Gamelist columns toggles
+	gamelist->Get("ColumnPlatform",   &m_showSystemColumn,  true);
+	gamelist->Get("ColumnBanner",     &m_showBannerColumn,  true);
+	gamelist->Get("ColumnNotes",      &m_showMakerColumn,   true);
+	gamelist->Get("ColumnID",         &m_showIDColumn,      false);
+	gamelist->Get("ColumnRegion",     &m_showRegionColumn,  true);
+	gamelist->Get("ColumnSize",       &m_showSizeColumn,    true);
+	gamelist->Get("ColumnState",      &m_showStateColumn,   true);
+}
+
+void SConfig::LoadCoreSettings(IniFile& ini)
+{
+	IniFile::Section* core = ini.GetOrCreateSection("Core");
+
+	core->Get("HLE_BS2",      &m_LocalCoreStartupParameter.bHLE_BS2, false);
+#ifdef _M_X86
+	core->Get("CPUCore",      &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_JIT64);
+#elif _M_ARM_64
+	core->Get("CPUCore",      &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_JITARM64);
+#else
+	core->Get("CPUCore",      &m_LocalCoreStartupParameter.iCPUCore, PowerPC::CORE_INTERPRETER);
+#endif
+	core->Get("Fastmem",           &m_LocalCoreStartupParameter.bFastmem,      true);
+	core->Get("DSPHLE",            &m_LocalCoreStartupParameter.bDSPHLE,       true);
+	core->Get("CPUThread",         &m_LocalCoreStartupParameter.bCPUThread,    true);
+	core->Get("SkipIdle",          &m_LocalCoreStartupParameter.bSkipIdle,     true);
+	core->Get("SyncOnSkipIdle",    &m_LocalCoreStartupParameter.bSyncGPUOnSkipIdleHack, true);
+	core->Get("DefaultISO",        &m_LocalCoreStartupParameter.m_strDefaultISO);
+	core->Get("DVDRoot",           &m_LocalCoreStartupParameter.m_strDVDRoot);
+	core->Get("Apploader",         &m_LocalCoreStartupParameter.m_strApploader);
+	core->Get("EnableCheats",      &m_LocalCoreStartupParameter.bEnableCheats, false);
+	core->Get("SelectedLanguage",  &m_LocalCoreStartupParameter.SelectedLanguage, 0);
+	core->Get("DPL2Decoder",       &m_LocalCoreStartupParameter.bDPL2Decoder, false);
+	core->Get("Latency",           &m_LocalCoreStartupParameter.iLatency, 2);
+	core->Get("MemcardAPath",      &m_strMemoryCardA);
+	core->Get("MemcardBPath",      &m_strMemoryCardB);
+	core->Get("AgpCartAPath",      &m_strGbaCartA);
+	core->Get("AgpCartBPath",      &m_strGbaCartB);
+	core->Get("SlotA",       (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD);
+	core->Get("SlotB",       (int*)&m_EXIDevice[1], EXIDEVICE_NONE);
+	core->Get("SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE);
+	core->Get("BBA_MAC",           &m_bba_mac);
+	core->Get("TimeProfiling",     &m_LocalCoreStartupParameter.bJITILTimeProfiling, false);
+	core->Get("OutputIR",          &m_LocalCoreStartupParameter.bJITILOutputIR,      false);
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+	{
+		core->Get(StringFromFormat("SIDevice%i", i), (u32*)&m_SIDevice[i], (i == 0) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE);
+	}
+	core->Get("WiiSDCard",                 &m_WiiSDCard,                                   false);
+	core->Get("WiiKeyboard",               &m_WiiKeyboard,                                 false);
+	core->Get("WiimoteContinuousScanning", &m_WiimoteContinuousScanning,                   false);
+	core->Get("WiimoteEnableSpeaker",      &m_WiimoteEnableSpeaker,                        false);
+	core->Get("RunCompareServer",          &m_LocalCoreStartupParameter.bRunCompareServer, false);
+	core->Get("RunCompareClient",          &m_LocalCoreStartupParameter.bRunCompareClient, false);
+	core->Get("MMU",                       &m_LocalCoreStartupParameter.bMMU,              false);
+	core->Get("BBDumpPort",                &m_LocalCoreStartupParameter.iBBDumpPort,       -1);
+	core->Get("SyncGPU",                   &m_LocalCoreStartupParameter.bSyncGPU,          false);
+	core->Get("SyncGpuMaxDistance",        &m_LocalCoreStartupParameter.iSyncGpuMaxDistance,  200000);
+	core->Get("SyncGpuMinDistance",        &m_LocalCoreStartupParameter.iSyncGpuMinDistance, -200000);
+	core->Get("SyncGpuOverclock",          &m_LocalCoreStartupParameter.fSyncGpuOverclock, 1.0);
+	core->Get("FastDiscSpeed",             &m_LocalCoreStartupParameter.bFastDiscSpeed,    false);
+	core->Get("DCBZ",                      &m_LocalCoreStartupParameter.bDCBZOFF,          false);
+	core->Get("FrameLimit",                &m_Framelimit,                                  1); // auto frame limit by default
+	core->Get("Overclock",                 &m_OCFactor,                                    1.0f);
+	core->Get("OverclockEnable",           &m_OCEnable,                                    false);
+	core->Get("FrameSkip",                 &m_FrameSkip,                                   0);
+	core->Get("GFXBackend",                &m_LocalCoreStartupParameter.m_strVideoBackend, "");
+	core->Get("GPUDeterminismMode",        &m_LocalCoreStartupParameter.m_strGPUDeterminismMode, "auto");
+	core->Get("GameCubeAdapter",           &m_GameCubeAdapter,                             true);
+	core->Get("AdapterRumble",             &m_AdapterRumble,                               true);
+}
+
+void SConfig::LoadMovieSettings(IniFile& ini)
+{
+	IniFile::Section* movie = ini.GetOrCreateSection("Movie");
+
+	movie->Get("PauseMovie", &m_PauseMovie, false);
+	movie->Get("Author", &m_strMovieAuthor, "");
+	movie->Get("DumpFrames", &m_DumpFrames, false);
+	movie->Get("DumpFramesSilent", &m_DumpFramesSilent, false);
+	movie->Get("ShowInputDisplay", &m_ShowInputDisplay, false);
+}
+
+void SConfig::LoadDSPSettings(IniFile& ini)
+{
+	IniFile::Section* dsp = ini.GetOrCreateSection("DSP");
+
+	dsp->Get("EnableJIT", &m_DSPEnableJIT, true);
+	dsp->Get("DumpAudio", &m_DumpAudio, false);
+#if defined __linux__ && HAVE_ALSA
+	dsp->Get("Backend", &sBackend, BACKEND_ALSA);
+#elif defined __APPLE__
+	dsp->Get("Backend", &sBackend, BACKEND_COREAUDIO);
+#elif defined _WIN32
+	dsp->Get("Backend", &sBackend, BACKEND_XAUDIO2);
+#elif defined ANDROID
+	dsp->Get("Backend", &sBackend, BACKEND_OPENSLES);
+#else
+	dsp->Get("Backend", &sBackend, BACKEND_NULLSOUND);
+#endif
+	dsp->Get("Volume", &m_Volume, 100);
+	dsp->Get("CaptureLog", &m_DSPCaptureLog, false);
+
+	m_IsMuted = false;
+}
+
+void SConfig::LoadInputSettings(IniFile& ini)
+{
+	IniFile::Section* input = ini.GetOrCreateSection("Input");
+
+	input->Get("BackgroundInput", &m_BackgroundInput, false);
+}
+
+void SConfig::LoadFifoPlayerSettings(IniFile& ini)
+{
+	IniFile::Section* fifoplayer = ini.GetOrCreateSection("FifoPlayer");
+
+	fifoplayer->Get("LoopReplay", &m_LocalCoreStartupParameter.bLoopFifoReplay, true);
+}
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
new file mode 100644
index 0000000000..6034fa9c1a
--- /dev/null
+++ b/Source/Core/Core/ConfigManager.h
@@ -0,0 +1,160 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/SysConf.h"
+#include "Core/CoreParameter.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/SI_Device.h"
+
+// DSP Backend Types
+#define BACKEND_NULLSOUND   _trans("No audio output")
+#define BACKEND_ALSA        "ALSA"
+#define BACKEND_AOSOUND     "AOSound"
+#define BACKEND_COREAUDIO   "CoreAudio"
+#define BACKEND_OPENAL      "OpenAL"
+#define BACKEND_PULSEAUDIO  "Pulse"
+#define BACKEND_XAUDIO2     "XAudio2"
+#define BACKEND_OPENSLES    "OpenSLES"
+struct SConfig : NonCopyable
+{
+	// Wii Devices
+	bool m_WiiSDCard;
+	bool m_WiiKeyboard;
+	bool m_WiimoteContinuousScanning;
+	bool m_WiimoteEnableSpeaker;
+
+	// name of the last used filename
+	std::string m_LastFilename;
+
+	// ISO folder
+	std::vector<std::string> m_ISOFolder;
+	bool m_RecursiveISOFolder;
+
+	SCoreStartupParameter m_LocalCoreStartupParameter;
+	std::string m_NANDPath;
+
+	std::string m_strMemoryCardA;
+	std::string m_strMemoryCardB;
+	std::string m_strGbaCartA;
+	std::string m_strGbaCartB;
+	TEXIDevices m_EXIDevice[3];
+	SIDevices m_SIDevice[4];
+	std::string m_bba_mac;
+
+	// interface language
+	int m_InterfaceLanguage;
+	// framelimit choose
+	unsigned int m_Framelimit;
+	bool m_OCEnable;
+	float m_OCFactor;
+	// other interface settings
+	bool m_InterfaceToolbar;
+	bool m_InterfaceStatusbar;
+	bool m_InterfaceLogWindow;
+	bool m_InterfaceLogConfigWindow;
+	bool m_InterfaceExtendedFPSInfo;
+
+	bool m_ListDrives;
+	bool m_ListWad;
+	bool m_ListWii;
+	bool m_ListGC;
+	bool m_ListPal;
+	bool m_ListUsa;
+	bool m_ListJap;
+	bool m_ListAustralia;
+	bool m_ListFrance;
+	bool m_ListGermany;
+	bool m_ListItaly;
+	bool m_ListKorea;
+	bool m_ListNetherlands;
+	bool m_ListRussia;
+	bool m_ListSpain;
+	bool m_ListTaiwan;
+	bool m_ListWorld;
+	bool m_ListUnknown;
+	int m_ListSort;
+	int m_ListSort2;
+
+	// Game list column toggles
+	bool m_showSystemColumn;
+	bool m_showBannerColumn;
+	bool m_showMakerColumn;
+	bool m_showIDColumn;
+	bool m_showRegionColumn;
+	bool m_showSizeColumn;
+	bool m_showStateColumn;
+
+	// Toggles whether compressed titles show up in blue in the game list
+	bool m_ColorCompressed;
+
+	std::string m_WirelessMac;
+	bool m_PauseMovie;
+	bool m_ShowLag;
+	bool m_ShowFrameCount;
+	std::string m_strMovieAuthor;
+	unsigned int m_FrameSkip;
+	bool m_DumpFrames;
+	bool m_DumpFramesSilent;
+	bool m_ShowInputDisplay;
+
+	bool m_PauseOnFocusLost;
+
+	// DSP settings
+	bool m_DSPEnableJIT;
+	bool m_DSPCaptureLog;
+	bool m_DumpAudio;
+	bool m_IsMuted;
+	int m_Volume;
+	std::string sBackend;
+
+	// Input settings
+	bool m_BackgroundInput;
+	bool m_GameCubeAdapter;
+	bool m_AdapterRumble;
+
+	SysConf* m_SYSCONF;
+
+	// Save settings
+	void SaveSettings();
+
+	// Load settings
+	void LoadSettings();
+
+	// Return the permanent and somewhat globally used instance of this struct
+	static SConfig& GetInstance() { return(*m_Instance); }
+
+	static void Init();
+	static void Shutdown();
+
+private:
+	SConfig();
+	~SConfig();
+
+	void SaveGeneralSettings(IniFile& ini);
+	void SaveInterfaceSettings(IniFile& ini);
+	void SaveDisplaySettings(IniFile& ini);
+	void SaveGameListSettings(IniFile& ini);
+	void SaveCoreSettings(IniFile& ini);
+	void SaveDSPSettings(IniFile& ini);
+	void SaveInputSettings(IniFile& ini);
+	void SaveMovieSettings(IniFile& ini);
+	void SaveFifoPlayerSettings(IniFile& ini);
+
+	void LoadGeneralSettings(IniFile& ini);
+	void LoadInterfaceSettings(IniFile& ini);
+	void LoadDisplaySettings(IniFile& ini);
+	void LoadGameListSettings(IniFile& ini);
+	void LoadCoreSettings(IniFile& ini);
+	void LoadDSPSettings(IniFile& ini);
+	void LoadInputSettings(IniFile& ini);
+	void LoadMovieSettings(IniFile& ini);
+	void LoadFifoPlayerSettings(IniFile& ini);
+
+	static SConfig* m_Instance;
+};
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
new file mode 100644
index 0000000000..604de6f170
--- /dev/null
+++ b/Source/Core/Core/Core.cpp
@@ -0,0 +1,847 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cctype>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "AudioCommon/AudioCommon.h"
+
+#include "Common/Atomic.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/MathUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/CoreTiming.h"
+#include "Core/DSPEmulator.h"
+#include "Core/Host.h"
+#include "Core/MemTools.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayProto.h"
+#include "Core/PatchEngine.h"
+#include "Core/State.h"
+#include "Core/Boot/Boot.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/HW.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IPC_HLE/WII_Socket.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#ifdef USE_GDBSTUB
+#include "Core/PowerPC/GDBStub.h"
+#endif
+
+#include "DiscIO/FileMonitor.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+// This can mostly be removed when we move to VS2015
+// to use the thread_local keyword
+#ifdef _MSC_VER
+#define ThreadLocalStorage __declspec(thread)
+#elif defined __ANDROID__ || defined __APPLE__
+// This will most likely have to stay, to support android
+#include <pthread.h>
+#else // Everything besides VS and Android
+#define ThreadLocalStorage __thread
+#endif
+
+// TODO: ugly, remove
+bool g_aspect_wide;
+
+namespace Core
+{
+
+bool g_want_determinism;
+
+// Declarations and definitions
+static Common::Timer s_timer;
+static volatile u32 s_drawn_frame = 0;
+static u32 s_drawn_video = 0;
+
+// Function forwarding
+void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
+
+// Function declarations
+void EmuThread();
+
+static bool s_is_stopping = false;
+static bool s_hardware_initialized = false;
+static bool s_is_started = false;
+static void* s_window_handle = nullptr;
+static std::string s_state_filename;
+static std::thread s_emu_thread;
+static StoppedCallbackFunc s_on_stopped_callback = nullptr;
+
+static std::thread s_cpu_thread;
+static bool s_request_refresh_info = false;
+static int s_pause_and_lock_depth = 0;
+static bool s_is_framelimiter_temp_disabled = false;
+
+#ifdef ThreadLocalStorage
+static ThreadLocalStorage bool tls_is_cpu_thread = false;
+#else
+static pthread_key_t s_tls_is_cpu_key;
+static pthread_once_t s_cpu_key_is_init = PTHREAD_ONCE_INIT;
+static void InitIsCPUKey()
+{
+	pthread_key_create(&s_tls_is_cpu_key, nullptr);
+}
+#endif
+
+bool GetIsFramelimiterTempDisabled()
+{
+	return s_is_framelimiter_temp_disabled;
+}
+
+void SetIsFramelimiterTempDisabled(bool disable)
+{
+	s_is_framelimiter_temp_disabled = disable;
+}
+
+std::string GetStateFileName() { return s_state_filename; }
+void SetStateFileName(const std::string& val) { s_state_filename = val; }
+
+void FrameUpdateOnCPUThread()
+{
+	if (NetPlay::IsNetPlayRunning())
+		NetPlayClient::SendTimeBase();
+}
+
+// Display messages and return values
+
+// Formatted stop message
+std::string StopMessage(bool main_thread, const std::string& message)
+{
+	return StringFromFormat("Stop [%s %i]\t%s\t%s",
+		main_thread ? "Main Thread" : "Video Thread", Common::CurrentThreadId(), MemUsage().c_str(), message.c_str());
+}
+
+void DisplayMessage(const std::string& message, int time_in_ms)
+{
+	if (!IsRunning())
+		return;
+
+	// Actually displaying non-ASCII could cause things to go pear-shaped
+	for (const char& c : message)
+	{
+		if (!std::isprint(c))
+			return;
+	}
+
+	g_video_backend->Video_AddMessage(message, time_in_ms);
+	Host_UpdateTitle(message);
+}
+
+bool IsRunning()
+{
+	return (GetState() != CORE_UNINITIALIZED) || s_hardware_initialized;
+}
+
+bool IsRunningAndStarted()
+{
+	return s_is_started && !s_is_stopping;
+}
+
+bool IsRunningInCurrentThread()
+{
+	return IsRunning() && IsCPUThread();
+}
+
+bool IsCPUThread()
+{
+#ifdef ThreadLocalStorage
+	return tls_is_cpu_thread;
+#else
+	// Use pthread implementation for Android and Mac
+	// Make sure that s_tls_is_cpu_key is initialized
+	pthread_once(&s_cpu_key_is_init, InitIsCPUKey);
+	return pthread_getspecific(s_tls_is_cpu_key);
+#endif
+}
+
+bool IsGPUThread()
+{
+	const SCoreStartupParameter& _CoreParameter =
+		SConfig::GetInstance().m_LocalCoreStartupParameter;
+	if (_CoreParameter.bCPUThread)
+	{
+		return (s_emu_thread.joinable() && (s_emu_thread.get_id() == std::this_thread::get_id()));
+	}
+	else
+	{
+		return IsCPUThread();
+	}
+}
+
+// This is called from the GUI thread. See the booting call schedule in
+// BootManager.cpp
+bool Init()
+{
+	const SCoreStartupParameter& _CoreParameter =
+		SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (s_emu_thread.joinable())
+	{
+		if (IsRunning())
+		{
+			PanicAlertT("Emu Thread already running");
+			return false;
+		}
+
+		// The Emu Thread was stopped, synchronize with it.
+		s_emu_thread.join();
+	}
+
+	Core::UpdateWantDeterminism(/*initial*/ true);
+
+	INFO_LOG(OSREPORT, "Starting core = %s mode",
+		_CoreParameter.bWii ? "Wii" : "GameCube");
+	INFO_LOG(OSREPORT, "CPU Thread separate = %s",
+		_CoreParameter.bCPUThread ? "Yes" : "No");
+
+	Host_UpdateMainFrame(); // Disable any menus or buttons at boot
+
+	g_aspect_wide = _CoreParameter.bWii;
+	if (g_aspect_wide)
+	{
+		IniFile gameIni = _CoreParameter.LoadGameIni();
+		gameIni.GetOrCreateSection("Wii")->Get("Widescreen", &g_aspect_wide,
+		     !!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.AR"));
+	}
+
+	s_window_handle = Host_GetRenderHandle();
+
+	// Start the emu thread
+	s_emu_thread = std::thread(EmuThread);
+
+	return true;
+}
+
+// Called from GUI thread
+void Stop()  // - Hammertime!
+{
+	if (GetState() == CORE_STOPPING)
+		return;
+
+	const SCoreStartupParameter& _CoreParameter =
+		SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	s_is_stopping = true;
+
+	g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP);
+
+	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");
+
+	// Stop the CPU
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
+	PowerPC::Stop();
+
+	// Kick it if it's waiting (code stepping wait loop)
+	CCPU::StepOpcode();
+
+	if (_CoreParameter.bCPUThread)
+	{
+		// Video_EnterLoop() should now exit so that EmuThread()
+		// will continue concurrently with the rest of the commands
+		// in this function. We no longer rely on Postmessage.
+		INFO_LOG(CONSOLE, "%s", StopMessage(true, "Wait for Video Loop to exit ...").c_str());
+
+		g_video_backend->Video_ExitLoop();
+	}
+	if (s_emu_thread.joinable())
+		s_emu_thread.join();
+}
+
+static void DeclareAsCPUThread()
+{
+#ifdef ThreadLocalStorage
+	tls_is_cpu_thread = true;
+#else
+	// Use pthread implementation for Android and Mac
+	// Make sure that s_tls_is_cpu_key is initialized
+	pthread_once(&s_cpu_key_is_init, InitIsCPUKey);
+	pthread_setspecific(s_tls_is_cpu_key, (void*)true);
+#endif
+}
+
+static void UndeclareAsCPUThread()
+{
+#ifdef ThreadLocalStorage
+	tls_is_cpu_thread = false;
+#else
+	// Use pthread implementation for Android and Mac
+	// Make sure that s_tls_is_cpu_key is initialized
+	pthread_once(&s_cpu_key_is_init, InitIsCPUKey);
+	pthread_setspecific(s_tls_is_cpu_key, (void*)false);
+#endif
+}
+
+// Create the CPU thread, which is a CPU + Video thread in Single Core mode.
+static void CpuThread()
+{
+	DeclareAsCPUThread();
+
+	const SCoreStartupParameter& _CoreParameter =
+		SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (_CoreParameter.bCPUThread)
+	{
+		Common::SetCurrentThreadName("CPU thread");
+	}
+	else
+	{
+		Common::SetCurrentThreadName("CPU-GPU thread");
+		g_video_backend->Video_Prepare();
+	}
+
+	if (_CoreParameter.bFastmem)
+		EMM::InstallExceptionHandler(); // Let's run under memory watch
+
+	if (!s_state_filename.empty())
+		State::LoadAs(s_state_filename);
+
+	s_is_started = true;
+
+
+	#ifdef USE_GDBSTUB
+	#ifndef _WIN32
+	if (!_CoreParameter.gdb_socket.empty())
+	{
+		gdb_init_local(_CoreParameter.gdb_socket.data());
+		gdb_break();
+	}
+	else
+	#endif
+	if (_CoreParameter.iGDBPort > 0)
+	{
+		gdb_init(_CoreParameter.iGDBPort);
+		// break at next instruction (the first instruction)
+		gdb_break();
+	}
+	#endif
+
+	// Enter CPU run loop. When we leave it - we are done.
+	CCPU::Run();
+
+	s_is_started = false;
+
+	if (!_CoreParameter.bCPUThread)
+		g_video_backend->Video_Cleanup();
+
+	if (_CoreParameter.bFastmem)
+		EMM::UninstallExceptionHandler();
+
+	return;
+}
+
+static void FifoPlayerThread()
+{
+	const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (_CoreParameter.bCPUThread)
+	{
+		Common::SetCurrentThreadName("FIFO player thread");
+	}
+	else
+	{
+		g_video_backend->Video_Prepare();
+		Common::SetCurrentThreadName("FIFO-GPU thread");
+	}
+
+	s_is_started = true;
+	DeclareAsCPUThread();
+
+	// Enter CPU run loop. When we leave it - we are done.
+	if (FifoPlayer::GetInstance().Open(_CoreParameter.m_strFilename))
+	{
+		FifoPlayer::GetInstance().Play();
+		FifoPlayer::GetInstance().Close();
+	}
+
+	UndeclareAsCPUThread();
+	s_is_started = false;
+
+	if (!_CoreParameter.bCPUThread)
+		g_video_backend->Video_Cleanup();
+
+	return;
+}
+
+// Initialize and create emulation thread
+// Call browser: Init():s_emu_thread().
+// See the BootManager.cpp file description for a complete call schedule.
+void EmuThread()
+{
+	const SCoreStartupParameter& core_parameter =
+		SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	Common::SetCurrentThreadName("Emuthread - Starting");
+
+	if (SConfig::GetInstance().m_OCEnable)
+		DisplayMessage("WARNING: running at non-native CPU clock! Game may not be stable.", 8000);
+	DisplayMessage(cpu_info.brand_string, 8000);
+	DisplayMessage(cpu_info.Summarize(), 8000);
+	DisplayMessage(core_parameter.m_strFilename, 3000);
+
+	// For a time this acts as the CPU thread...
+	DeclareAsCPUThread();
+
+	Movie::Init();
+
+	HW::Init();
+
+	if (!g_video_backend->Initialize(s_window_handle))
+	{
+		PanicAlert("Failed to initialize video backend!");
+		Host_Message(WM_USER_STOP);
+		return;
+	}
+
+	OSD::AddMessage("Dolphin " + g_video_backend->GetName() + " Video Backend.", 5000);
+
+	if (cpu_info.HTT)
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = cpu_info.num_cores > 4;
+	else
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = cpu_info.num_cores > 2;
+
+	if (!DSP::GetDSPEmulator()->Initialize(core_parameter.bWii, core_parameter.bDSPThread))
+	{
+		HW::Shutdown();
+		g_video_backend->Shutdown();
+		PanicAlert("Failed to initialize DSP emulation!");
+		Host_Message(WM_USER_STOP);
+		return;
+	}
+
+	bool init_controllers = false;
+	if (!g_controller_interface.IsInit())
+	{
+		Pad::Initialize(s_window_handle);
+		Keyboard::Initialize(s_window_handle);
+		init_controllers = true;
+	}
+	else
+	{
+		// Update references in case controllers were refreshed
+		Pad::LoadConfig();
+		Keyboard::LoadConfig();
+	}
+
+	// Load and Init Wiimotes - only if we are booting in Wii mode
+	if (core_parameter.bWii)
+	{
+		if (init_controllers)
+			Wiimote::Initialize(s_window_handle, !s_state_filename.empty());
+		else
+			Wiimote::LoadConfig();
+
+		// Activate Wiimotes which don't have source set to "None"
+		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
+			if (g_wiimote_sources[i])
+				GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);
+
+	}
+
+	AudioCommon::InitSoundStream();
+
+	// The hardware is initialized.
+	s_hardware_initialized = true;
+
+	// Boot to pause or not
+	Core::SetState(core_parameter.bBootToPause ? Core::CORE_PAUSE : Core::CORE_RUN);
+
+	// Load GCM/DOL/ELF whatever ... we boot with the interpreter core
+	PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
+
+	CBoot::BootUp();
+
+	// Thread is no longer acting as CPU Thread
+	UndeclareAsCPUThread();
+
+	// Setup our core, but can't use dynarec if we are compare server
+	if (core_parameter.iCPUCore != PowerPC::CORE_INTERPRETER
+	    && (!core_parameter.bRunCompareServer || core_parameter.bRunCompareClient))
+	{
+		PowerPC::SetMode(PowerPC::MODE_JIT);
+	}
+	else
+	{
+		PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
+	}
+
+	// Update the window again because all stuff is initialized
+	Host_UpdateDisasmDialog();
+	Host_UpdateMainFrame();
+
+	// Determine the CPU thread function
+	void (*cpuThreadFunc)(void);
+	if (core_parameter.m_BootType == SCoreStartupParameter::BOOT_DFF)
+		cpuThreadFunc = FifoPlayerThread;
+	else
+		cpuThreadFunc = CpuThread;
+
+	// ENTER THE VIDEO THREAD LOOP
+	if (core_parameter.bCPUThread)
+	{
+		// This thread, after creating the EmuWindow, spawns a CPU
+		// thread, and then takes over and becomes the video thread
+		Common::SetCurrentThreadName("Video thread");
+
+		g_video_backend->Video_Prepare();
+
+		// Spawn the CPU thread
+		s_cpu_thread = std::thread(cpuThreadFunc);
+
+		// become the GPU thread
+		g_video_backend->Video_EnterLoop();
+
+		// We have now exited the Video Loop
+		INFO_LOG(CONSOLE, "%s", StopMessage(false, "Video Loop Ended").c_str());
+	}
+	else // SingleCore mode
+	{
+		// The spawned CPU Thread also does the graphics.
+		// The EmuThread is thus an idle thread, which sleeps while
+		// waiting for the program to terminate. Without this extra
+		// thread, the video backend window hangs in single core mode
+		// because no one is pumping messages.
+		Common::SetCurrentThreadName("Emuthread - Idle");
+
+		// Spawn the CPU+GPU thread
+		s_cpu_thread = std::thread(cpuThreadFunc);
+
+		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+		{
+			g_video_backend->PeekMessages();
+			Common::SleepCurrentThread(20);
+		}
+	}
+
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
+
+	// Wait for s_cpu_thread to exit
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping CPU-GPU thread ...").c_str());
+
+	#ifdef USE_GDBSTUB
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping GDB ...").c_str());
+	gdb_deinit();
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "GDB stopped.").c_str());
+	#endif
+
+	s_cpu_thread.join();
+
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "CPU thread stopped.").c_str());
+
+	if (core_parameter.bCPUThread)
+		g_video_backend->Video_Cleanup();
+
+	FileMon::Close();
+
+	// Stop audio thread - Actually this does nothing when using HLE
+	// emulation, but stops the DSP Interpreter when using LLE emulation.
+	DSP::GetDSPEmulator()->DSP_StopSoundStream();
+
+	// We must set up this flag before executing HW::Shutdown()
+	s_hardware_initialized = false;
+	INFO_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str());
+	HW::Shutdown();
+	INFO_LOG(CONSOLE, "%s", StopMessage(false, "HW shutdown").c_str());
+
+	if (init_controllers)
+	{
+		Wiimote::Shutdown();
+		Keyboard::Shutdown();
+		Pad::Shutdown();
+		init_controllers = false;
+	}
+
+	g_video_backend->Shutdown();
+	AudioCommon::ShutdownSoundStream();
+
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Main Emu thread stopped").c_str());
+
+	// Clear on screen messages that haven't expired
+	g_video_backend->Video_ClearMessages();
+
+	// Reload sysconf file in order to see changes committed during emulation
+	if (core_parameter.bWii)
+		SConfig::GetInstance().m_SYSCONF->Reload();
+
+	INFO_LOG(CONSOLE, "Stop [Video Thread]\t\t---- Shutdown complete ----");
+	Movie::Shutdown();
+	PatchEngine::Shutdown();
+
+	s_is_stopping = false;
+
+	if (s_on_stopped_callback)
+		s_on_stopped_callback();
+}
+
+// Set or get the running state
+
+void SetState(EState _State)
+{
+	switch (_State)
+	{
+	case CORE_PAUSE:
+		CCPU::EnableStepping(true);  // Break
+		Wiimote::Pause();
+		break;
+	case CORE_RUN:
+		CCPU::EnableStepping(false);
+		Wiimote::Resume();
+		break;
+	default:
+		PanicAlert("Invalid state");
+		break;
+	}
+}
+
+EState GetState()
+{
+	if (s_is_stopping)
+		return CORE_STOPPING;
+
+	if (s_hardware_initialized)
+	{
+		if (CCPU::IsStepping())
+			return CORE_PAUSE;
+		else
+			return CORE_RUN;
+	}
+
+	return CORE_UNINITIALIZED;
+}
+
+static std::string GenerateScreenshotName()
+{
+	const std::string& gameId = SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID();
+	std::string path = File::GetUserPath(D_SCREENSHOTS_IDX) + gameId + DIR_SEP_CHR;
+
+	if (!File::CreateFullPath(path))
+	{
+		// fallback to old-style screenshots, without folder.
+		path = File::GetUserPath(D_SCREENSHOTS_IDX);
+	}
+
+	//append gameId, path only contains the folder here.
+	path += gameId;
+
+	std::string name;
+	for (int i = 1; File::Exists(name = StringFromFormat("%s-%d.png", path.c_str(), i)); ++i)
+	{
+		// TODO?
+	}
+
+	return name;
+}
+
+void SaveScreenShot()
+{
+	const bool bPaused = (GetState() == CORE_PAUSE);
+
+	SetState(CORE_PAUSE);
+
+	g_video_backend->Video_Screenshot(GenerateScreenshotName());
+
+	if (!bPaused)
+		SetState(CORE_RUN);
+}
+
+void RequestRefreshInfo()
+{
+	s_request_refresh_info = true;
+}
+
+bool PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	if (!IsRunning())
+		return true;
+
+	// let's support recursive locking to simplify things on the caller's side,
+	// and let's do it at this outer level in case the individual systems don't support it.
+	if (doLock ? s_pause_and_lock_depth++ : --s_pause_and_lock_depth)
+		return true;
+
+	// first pause or unpause the CPU
+	bool wasUnpaused = CCPU::PauseAndLock(doLock, unpauseOnUnlock);
+	ExpansionInterface::PauseAndLock(doLock, unpauseOnUnlock);
+
+	// audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).
+	DSP::GetDSPEmulator()->PauseAndLock(doLock, unpauseOnUnlock);
+
+	// video has to come after CPU, because CPU thread can wait for video thread (s_efbAccessRequested).
+	g_video_backend->PauseAndLock(doLock, unpauseOnUnlock);
+	return wasUnpaused;
+}
+
+// Apply Frame Limit and Display FPS info
+// This should only be called from VI
+void VideoThrottle()
+{
+	// Update info per second
+	u32 ElapseTime = (u32)s_timer.GetTimeDifference();
+	if ((ElapseTime >= 1000 && s_drawn_video > 0) || s_request_refresh_info)
+	{
+		UpdateTitle();
+
+		// Reset counter
+		s_timer.Update();
+		Common::AtomicStore(s_drawn_frame, 0);
+		s_drawn_video = 0;
+	}
+
+	s_drawn_video++;
+}
+
+// Executed from GPU thread
+// reports if a frame should be skipped or not
+// depending on the framelimit set
+bool ShouldSkipFrame(int skipped)
+{
+	const u32 TargetFPS = (SConfig::GetInstance().m_Framelimit > 1)
+		? (SConfig::GetInstance().m_Framelimit - 1) * 5
+		: VideoInterface::TargetRefreshRate;
+	const u32 frames = Common::AtomicLoad(s_drawn_frame);
+	const bool fps_slow = !(s_timer.GetTimeDifference() < (frames + skipped) * 1000 / TargetFPS);
+
+	return fps_slow;
+}
+
+// --- Callbacks for backends / engine ---
+
+// Should be called from GPU thread when a frame is drawn
+void Callback_VideoCopiedToXFB(bool video_update)
+{
+	if (video_update)
+		Common::AtomicIncrement(s_drawn_frame);
+	Movie::FrameUpdate();
+}
+
+void UpdateTitle()
+{
+	u32 ElapseTime = (u32)s_timer.GetTimeDifference();
+	s_request_refresh_info = false;
+	SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (ElapseTime == 0)
+		ElapseTime = 1;
+
+	float FPS = (float) (Common::AtomicLoad(s_drawn_frame) * 1000.0 / ElapseTime);
+	float VPS = (float) (s_drawn_video * 1000.0 / ElapseTime);
+	float Speed = (float) (s_drawn_video * (100 * 1000.0) / (VideoInterface::TargetRefreshRate * ElapseTime));
+
+	// Settings are shown the same for both extended and summary info
+	std::string SSettings = StringFromFormat("%s %s | %s | %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC",
+		g_video_backend->GetDisplayName().c_str(), _CoreParameter.bDSPHLE ? "HLE" : "LLE");
+
+	std::string SFPS;
+
+	if (Movie::IsPlayingInput())
+		SFPS = StringFromFormat("VI: %u/%u - Input: %u/%u - FPS: %.0f - VPS: %.0f - %.0f%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed);
+	else if (Movie::IsRecordingInput())
+		SFPS = StringFromFormat("VI: %u - Input: %u - FPS: %.0f - VPS: %.0f - %.0f%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed);
+	else
+	{
+		SFPS = StringFromFormat("FPS: %.0f - VPS: %.0f - %.0f%%", FPS, VPS, Speed);
+		if (SConfig::GetInstance().m_InterfaceExtendedFPSInfo)
+		{
+			// Use extended or summary information. The summary information does not print the ticks data,
+			// that's more of a debugging interest, it can always be optional of course if someone is interested.
+			static u64 ticks = 0;
+			static u64 idleTicks = 0;
+			u64 newTicks = CoreTiming::GetTicks();
+			u64 newIdleTicks = CoreTiming::GetIdleTicks();
+
+			u64 diff = (newTicks - ticks) / 1000000;
+			u64 idleDiff = (newIdleTicks - idleTicks) / 1000000;
+
+			ticks = newTicks;
+			idleTicks = newIdleTicks;
+
+			float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100;
+
+			SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)",
+					_CoreParameter.bSkipIdle ? "~" : "",
+					(int)(diff),
+					(int)(diff - idleDiff),
+					(int)(idleDiff),
+					SystemTimers::GetTicksPerSecond() / 1000000,
+					_CoreParameter.bSkipIdle ? "~" : "",
+					TicksPercentage);
+		}
+	}
+	// This is our final "frame counter" string
+	std::string SMessage = StringFromFormat("%s | %s", SSettings.c_str(), SFPS.c_str());
+
+	// Update the audio timestretcher with the current speed
+	if (g_sound_stream)
+	{
+		CMixer* pMixer = g_sound_stream->GetMixer();
+		pMixer->UpdateSpeed((float)Speed / 100);
+	}
+
+	Host_UpdateTitle(SMessage);
+}
+
+void SetOnStoppedCallback(StoppedCallbackFunc callback)
+{
+	s_on_stopped_callback = callback;
+}
+
+void UpdateWantDeterminism(bool initial)
+{
+	// For now, this value is not itself configurable.  Instead, individual
+	// settings that depend on it, such as GPU determinism mode. should have
+	// override options for testing,
+	bool new_want_determinism =
+		Movie::IsPlayingInput() ||
+		Movie::IsRecordingInput() ||
+		NetPlay::IsNetPlayRunning();
+	if (new_want_determinism != g_want_determinism || initial)
+	{
+		WARN_LOG(COMMON, "Want determinism <- %s", new_want_determinism ? "true" : "false");
+
+		bool was_unpaused = Core::PauseAndLock(true);
+
+		g_want_determinism = new_want_determinism;
+		WiiSockMan::GetInstance().UpdateWantDeterminism(new_want_determinism);
+		g_video_backend->UpdateWantDeterminism(new_want_determinism);
+		// We need to clear the cache because some parts of the JIT depend on want_determinism, e.g. use of FMA.
+		JitInterface::ClearCache();
+		Common::InitializeWiiRoot(g_want_determinism);
+
+		Core::PauseAndLock(false, was_unpaused);
+	}
+}
+
+} // Core
diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
new file mode 100644
index 0000000000..1eea2be226
--- /dev/null
+++ b/Source/Core/Core/Core.h
@@ -0,0 +1,87 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Core
+
+// The external interface to the emulator core. Plus some extras.
+// This is another part of the emu that needs cleaning - Core.cpp really has
+// too much random junk inside.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+// TODO: ugly, remove
+extern bool g_aspect_wide;
+
+namespace Core
+{
+
+extern bool g_want_determinism;
+
+bool GetIsFramelimiterTempDisabled();
+void SetIsFramelimiterTempDisabled(bool disable);
+
+void Callback_VideoCopiedToXFB(bool video_update);
+
+enum EState
+{
+	CORE_UNINITIALIZED,
+	CORE_PAUSE,
+	CORE_RUN,
+	CORE_STOPPING
+};
+
+bool Init();
+void Stop();
+
+std::string StopMessage(bool, const std::string&);
+
+bool IsRunning();
+bool IsRunningAndStarted(); // is running and the CPU loop has been entered
+bool IsRunningInCurrentThread(); // this tells us whether we are running in the CPU thread.
+bool IsCPUThread(); // this tells us whether we are the CPU thread.
+bool IsGPUThread();
+
+void SetState(EState _State);
+EState GetState();
+
+void SaveScreenShot();
+
+void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
+
+// This displays messages in a user-visible way.
+void DisplayMessage(const std::string& message, int time_in_ms);
+
+std::string GetStateFileName();
+void SetStateFileName(const std::string& val);
+
+void SetBlockStart(u32 addr);
+
+void FrameUpdateOnCPUThread();
+
+bool ShouldSkipFrame(int skipped);
+void VideoThrottle();
+void RequestRefreshInfo();
+
+void UpdateTitle();
+
+// waits until all systems are paused and fully idle, and acquires a lock on that state.
+// or, if doLock is false, releases a lock on that state and optionally unpauses.
+// calls must be balanced (once with doLock true, then once with doLock false) but may be recursive.
+// the return value of the first call should be passed in as the second argument of the second call.
+bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
+
+// for calling back into UI code without introducing a dependency on it in core
+typedef void(*StoppedCallbackFunc)(void);
+void SetOnStoppedCallback(StoppedCallbackFunc callback);
+
+// Run on the GUI thread when the factors change.
+void UpdateWantDeterminism(bool initial = false);
+
+}  // namespace
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 70941527d5..3b51bee474 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -1,614 +1,490 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{8C60E805-0DA5-4E25-8F84-038DB504BB0D}</ProjectGuid>
-    <RootNamespace>Core</RootNamespace>
+    <ProjectGuid>{E54CF649-140E-4255-81A5-30A673C1FB36}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup 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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;..\..\..\Externals\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\ActionReplay.cpp" />
-    <ClCompile Include="Src\ARDecrypt.cpp" />
-    <ClCompile Include="Src\BootManager.cpp" />
-    <ClCompile Include="Src\Boot\Boot.cpp" />
-    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp" />
-    <ClCompile Include="Src\Boot\Boot_DOL.cpp" />
-    <ClCompile Include="Src\Boot\Boot_ELF.cpp" />
-    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp" />
-    <ClCompile Include="Src\Boot\ElfReader.cpp" />
-    <ClCompile Include="Src\ConfigManager.cpp" />
-    <ClCompile Include="Src\Console.cpp" />
-    <ClCompile Include="Src\Core.cpp" />
-    <ClCompile Include="Src\CoreParameter.cpp" />
-    <ClCompile Include="Src\CoreTiming.cpp" />
-    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
-    <ClCompile Include="Src\Debugger\Dump.cpp" />
-    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
-    <ClCompile Include="Src\DSP\assemble.cpp" />
-    <ClCompile Include="Src\DSP\disassemble.cpp" />
-    <ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
-    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
-    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPCore.cpp" />
-    <ClCompile Include="Src\DSP\DSPEmitter.cpp" />
-    <ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
-    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\DspIntBranch.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
-    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMisc.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
-    <ClCompile Include="Src\DSP\DSPStacks.cpp" />
-    <ClCompile Include="Src\DSP\DSPTables.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
-    <ClCompile Include="Src\DSP\LabelMap.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp" />
-    <ClCompile Include="Src\GeckoCode.cpp" />
-    <ClCompile Include="Src\GeckoCodeConfig.cpp" />
-    <ClCompile Include="Src\HLE\HLE.cpp" />
-    <ClCompile Include="Src\HLE\HLE_Misc.cpp" />
-    <ClCompile Include="Src\HLE\HLE_OS.cpp" />
-    <ClCompile Include="Src\HW\AudioInterface.cpp" />
-    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp" />
-    <ClCompile Include="Src\HW\CPU.cpp" />
-    <ClCompile Include="Src\HW\DSP.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp" />
-    <ClCompile Include="Src\HW\DVDInterface.cpp" />
-    <ClCompile Include="Src\HW\EXI.cpp" />
-    <ClCompile Include="Src\HW\EXI_Channel.cpp" />
-    <ClCompile Include="Src\HW\EXI_Device.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
-    <ClCompile Include="Src\HW\GCMemcard.cpp" />
-    <ClCompile Include="Src\HW\GCPad.cpp" />
-    <ClCompile Include="Src\HW\GCPadEmu.cpp" />
-    <ClCompile Include="Src\HW\GPFifo.cpp" />
-    <ClCompile Include="Src\HW\HW.cpp" />
-    <ClCompile Include="Src\HW\Memmap.cpp" />
-    <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
-    <ClCompile Include="Src\HW\MemoryInterface.cpp" />
-    <ClCompile Include="Src\HW\ProcessorInterface.cpp" />
-    <ClCompile Include="Src\HW\SI.cpp" />
-    <ClCompile Include="Src\HW\SI_Device.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp" />
-    <ClCompile Include="Src\HW\Sram.cpp" />
-    <ClCompile Include="Src\HW\StreamADPCM.cpp" />
-    <ClCompile Include="Src\HW\SystemTimers.cpp" />
-    <ClCompile Include="Src\HW\VideoInterface.cpp" />
-    <ClCompile Include="Src\HW\Wiimote.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp" />
-    <ClCompile Include="Src\HW\WII_IOB.cpp" />
-    <ClCompile Include="Src\HW\WII_IPC.cpp" />
-    <ClCompile Include="Src\IPC_HLE\ICMPWin.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_hid.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_Socket.cpp" />
-    <ClCompile Include="Src\x64MemTools.cpp" />
-    <ClCompile Include="Src\Movie.cpp" />
-    <ClCompile Include="Src\NetPlayClient.cpp" />
-    <ClCompile Include="Src\NetPlayServer.cpp" />
-    <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\DSPEmulator.cpp" />
-    <ClCompile Include="Src\ec_wii.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp" />
-    <ClCompile Include="Src\PowerPC\JitInterface.cpp" />
-    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp" />
-    <ClCompile Include="Src\PowerPC\PowerPC.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCCache.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCTables.cpp" />
-    <ClCompile Include="Src\PowerPC\Profiler.cpp" />
-    <ClCompile Include="Src\PowerPC\SignatureDB.cpp" />
-    <ClCompile Include="Src\State.cpp">
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">false</OpenMPSupport>
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</OpenMPSupport>
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</OpenMPSupport>
+    <ClCompile Include="ActionReplay.cpp" />
+    <ClCompile Include="ARDecrypt.cpp" />
+    <ClCompile Include="BootManager.cpp" />
+    <ClCompile Include="Boot\Boot.cpp" />
+    <ClCompile Include="Boot\Boot_BS2Emu.cpp" />
+    <ClCompile Include="Boot\Boot_DOL.cpp" />
+    <ClCompile Include="Boot\Boot_ELF.cpp" />
+    <ClCompile Include="Boot\Boot_WiiWAD.cpp" />
+    <ClCompile Include="Boot\ElfReader.cpp" />
+    <ClCompile Include="ConfigManager.cpp" />
+    <ClCompile Include="Core.cpp" />
+    <ClCompile Include="CoreParameter.cpp" />
+    <ClCompile Include="CoreTiming.cpp" />
+    <ClCompile Include="Debugger\Debugger_SymbolMap.cpp" />
+    <ClCompile Include="Debugger\Dump.cpp" />
+    <ClCompile Include="Debugger\PPCDebugInterface.cpp" />
+    <ClCompile Include="DSPEmulator.cpp" />
+    <ClCompile Include="DSP\DSPAssembler.cpp" />
+    <ClCompile Include="DSP\DSPDisassembler.cpp" />
+    <ClCompile Include="DSP\DSPAccelerator.cpp" />
+    <ClCompile Include="DSP\DSPAnalyzer.cpp" />
+    <ClCompile Include="DSP\DSPCaptureLogger.cpp" />
+    <ClCompile Include="DSP\DSPCodeUtil.cpp" />
+    <ClCompile Include="DSP\DSPCore.cpp" />
+    <ClCompile Include="DSP\DSPEmitter.cpp" />
+    <ClCompile Include="DSP\DSPHWInterface.cpp" />
+    <ClCompile Include="DSP\DSPIntArithmetic.cpp" />
+    <ClCompile Include="DSP\DSPIntBranch.cpp" />
+    <ClCompile Include="DSP\DSPIntCCUtil.cpp" />
+    <ClCompile Include="DSP\DSPInterpreter.cpp" />
+    <ClCompile Include="DSP\DSPIntExtOps.cpp" />
+    <ClCompile Include="DSP\DSPIntLoadStore.cpp" />
+    <ClCompile Include="DSP\DSPIntMisc.cpp" />
+    <ClCompile Include="DSP\DSPIntMultiplier.cpp" />
+    <ClCompile Include="DSP\DSPMemoryMap.cpp" />
+    <ClCompile Include="DSP\DSPStacks.cpp" />
+    <ClCompile Include="DSP\DSPTables.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitArithmetic.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitBranch.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitCCUtil.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitExtOps.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitLoadStore.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitMisc.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitMultiplier.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitRegCache.cpp" />
+    <ClCompile Include="DSP\Jit\DSPJitUtil.cpp" />
+    <ClCompile Include="DSP\LabelMap.cpp" />
+    <ClCompile Include="ec_wii.cpp" />
+    <ClCompile Include="FifoPlayer\FifoAnalyzer.cpp" />
+    <ClCompile Include="FifoPlayer\FifoDataFile.cpp" />
+    <ClCompile Include="FifoPlayer\FifoPlaybackAnalyzer.cpp" />
+    <ClCompile Include="FifoPlayer\FifoPlayer.cpp" />
+    <ClCompile Include="FifoPlayer\FifoRecordAnalyzer.cpp" />
+    <ClCompile Include="FifoPlayer\FifoRecorder.cpp" />
+    <ClCompile Include="GeckoCode.cpp" />
+    <ClCompile Include="GeckoCodeConfig.cpp" />
+    <ClCompile Include="HLE\HLE.cpp" />
+    <ClCompile Include="HLE\HLE_Misc.cpp" />
+    <ClCompile Include="HLE\HLE_OS.cpp" />
+    <ClCompile Include="HotkeyManager.cpp" />
+    <ClCompile Include="HW\AudioInterface.cpp" />
+    <ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp" />
+    <ClCompile Include="HW\CPU.cpp" />
+    <ClCompile Include="HW\DSP.cpp" />
+    <ClCompile Include="HW\DSPHLE\DSPHLE.cpp" />
+    <ClCompile Include="HW\DSPHLE\MailHandler.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPDebugInterface.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPHost.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPLLE.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPLLEGlobals.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPLLETools.cpp" />
+    <ClCompile Include="HW\DSPLLE\DSPSymbols.cpp" />
+    <ClCompile Include="HW\DVDInterface.cpp" />
+    <ClCompile Include="HW\EXI.cpp" />
+    <ClCompile Include="HW\EXI_Channel.cpp" />
+    <ClCompile Include="HW\EXI_Device.cpp" />
+    <ClCompile Include="HW\EXI_DeviceAD16.cpp" />
+    <ClCompile Include="HW\EXI_DeviceAGP.cpp" />
+    <ClCompile Include="HW\EXI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="HW\EXI_DeviceEthernet.cpp" />
+    <ClCompile Include="HW\EXI_DeviceGecko.cpp" />
+    <ClCompile Include="HW\EXI_DeviceIPL.cpp" />
+    <ClCompile Include="HW\EXI_DeviceMemoryCard.cpp" />
+    <ClCompile Include="HW\EXI_DeviceMic.cpp" />
+    <ClCompile Include="HW\GCKeyboard.cpp" />
+    <ClCompile Include="HW\GCKeyboardEmu.cpp" />
+    <ClCompile Include="HW\GCMemcard.cpp" />
+    <ClCompile Include="HW\GCMemcardDirectory.cpp" />
+    <ClCompile Include="HW\GCMemcardRaw.cpp" />
+    <ClCompile Include="HW\GCPad.cpp" />
+    <ClCompile Include="HW\GCPadEmu.cpp" />
+    <ClCompile Include="HW\GPFifo.cpp" />
+    <ClCompile Include="HW\HW.cpp" />
+    <ClCompile Include="HW\Memmap.cpp" />
+    <ClCompile Include="HW\MemoryInterface.cpp" />
+    <ClCompile Include="HW\MMIO.cpp" />
+    <ClCompile Include="HW\ProcessorInterface.cpp" />
+    <ClCompile Include="HW\SI.cpp" />
+    <ClCompile Include="HW\SI_Device.cpp" />
+    <ClCompile Include="HW\SI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="HW\SI_DeviceDanceMat.cpp" />
+    <ClCompile Include="HW\SI_DeviceGBA.cpp" />
+    <ClCompile Include="HW\SI_DeviceGCController.cpp" />
+    <ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp" />
+    <ClCompile Include="HW\SI_DeviceKeyboard.cpp" />
+    <ClCompile Include="HW\SI_GCAdapter.cpp">
+      <!--
+      Disable "nonstandard extension used : zero-sized array in struct/union" warning,
+      which is hit in libusb.h.
+      -->
+      <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="HW\Sram.cpp" />
+    <ClCompile Include="HW\StreamADPCM.cpp" />
+    <ClCompile Include="HW\SystemTimers.cpp" />
+    <ClCompile Include="HW\VideoInterface.cpp" />
+    <ClCompile Include="HW\Wiimote.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Attachment.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Classic.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Drums.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Guitar.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Turntable.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\EmuSubroutines.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Encryption.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\Speaker.cpp" />
+    <ClCompile Include="HW\WiimoteEmu\WiimoteEmu.cpp" />
+    <ClCompile Include="HW\WiimoteReal\IOWin.cpp" />
+    <ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp" />
+    <ClCompile Include="HW\WII_IPC.cpp" />
+    <ClCompile Include="HW\WiiSaveCrypted.cpp" />
+    <ClCompile Include="IPC_HLE\ICMPWin.cpp" />
+    <ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
+      <!--
+      Disable "nonstandard extension used : zero-sized array in struct/union" warning,
+      which is hit in libusb.h.
+      -->
+      <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="Src\Tracer.cpp" />
-    <ClCompile Include="Src\VolumeHandler.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
+    <ClCompile Include="IPC_HLE\WII_Socket.cpp" />
+    <ClCompile Include="MemTools.cpp" />
+    <ClCompile Include="Movie.cpp" />
+    <ClCompile Include="NetPlayClient.cpp" />
+    <ClCompile Include="NetPlayServer.cpp" />
+    <ClCompile Include="PatchEngine.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Branch.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Integer.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Paired.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Tables.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\IR.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Branch.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_FloatingPoint.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Integer.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStore.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStoreFloating.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStorePaired.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Paired.cpp" />
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_SystemRegisters.cpp" />
+    <ClCompile Include="PowerPC\Jit64IL\IR_X86.cpp" />
+    <ClCompile Include="PowerPC\Jit64IL\JitIL.cpp" />
+    <ClCompile Include="PowerPC\Jit64IL\JitIL_Tables.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit64_Tables.cpp" />
+    <ClCompile Include="PowerPC\Jit64\JitAsm.cpp" />
+    <ClCompile Include="PowerPC\Jit64\JitRegCache.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_Branch.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_FloatingPoint.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_Integer.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStore.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_Paired.cpp" />
+    <ClCompile Include="PowerPC\Jit64\Jit_SystemRegisters.cpp" />
+    <ClCompile Include="PowerPC\Jit64Common\Jit64AsmCommon.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\JitAsmCommon.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\JitBackpatch.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\JitBase.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\JitCache.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\Jit_Util.cpp" />
+    <ClCompile Include="PowerPC\JitCommon\TrampolineCache.cpp" />
+    <ClCompile Include="PowerPC\JitInterface.cpp" />
+    <ClCompile Include="PowerPC\MMU.cpp" />
+    <ClCompile Include="PowerPC\PowerPC.cpp" />
+    <ClCompile Include="PowerPC\PPCAnalyst.cpp" />
+    <ClCompile Include="PowerPC\PPCCache.cpp" />
+    <ClCompile Include="PowerPC\PPCSymbolDB.cpp" />
+    <ClCompile Include="PowerPC\PPCTables.cpp" />
+    <ClCompile Include="PowerPC\Profiler.cpp" />
+    <ClCompile Include="PowerPC\SignatureDB.cpp" />
+    <ClCompile Include="State.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\ActionReplay.h" />
-    <ClInclude Include="Src\ARDecrypt.h" />
-    <ClInclude Include="Src\BootManager.h" />
-    <ClInclude Include="Src\Boot\Boot.h" />
-    <ClInclude Include="Src\Boot\Boot_DOL.h" />
-    <ClInclude Include="Src\Boot\Boot_ELF.h" />
-    <ClInclude Include="Src\Boot\ElfReader.h" />
-    <ClInclude Include="Src\Boot\ElfTypes.h" />
-    <ClInclude Include="Src\ConfigManager.h" />
-    <ClInclude Include="Src\Console.h" />
-    <ClInclude Include="Src\Core.h" />
-    <ClInclude Include="Src\CoreParameter.h" />
-    <ClInclude Include="Src\CoreTiming.h" />
-    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h" />
-    <ClInclude Include="Src\Debugger\Dump.h" />
-    <ClInclude Include="Src\Debugger\GCELF.h" />
-    <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
-    <ClInclude Include="Src\DSP\assemble.h" />
-    <ClInclude Include="Src\DSP\disassemble.h" />
-    <ClInclude Include="Src\DSP\DSPAccelerator.h" />
-    <ClInclude Include="Src\DSP\DSPAnalyzer.h" />
-    <ClInclude Include="Src\DSP\DSPBreakpoints.h" />
-    <ClInclude Include="Src\DSP\DSPCodeUtil.h" />
-    <ClInclude Include="Src\DSP\DSPCommon.h" />
-    <ClInclude Include="Src\DSP\DSPCore.h" />
-    <ClInclude Include="Src\DSP\DSPEmitter.h" />
-    <ClInclude Include="Src\DSP\DSPHost.h" />
-    <ClInclude Include="Src\DSP\DSPHWInterface.h" />
-    <ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
-    <ClInclude Include="Src\DSP\DSPInterpreter.h" />
-    <ClInclude Include="Src\DSP\DSPIntExtOps.h" />
-    <ClInclude Include="Src\DSP\DSPIntUtil.h" />
-    <ClInclude Include="Src\DSP\DSPMemoryMap.h" />
-    <ClInclude Include="Src\DSP\DSPStacks.h" />
-    <ClInclude Include="Src\DSP\DSPTables.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
-    <ClInclude Include="Src\DSP\LabelMap.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h" />
-    <ClInclude Include="Src\GeckoCode.h" />
-    <ClInclude Include="Src\GeckoCodeConfig.h" />
-    <ClInclude Include="Src\HLE\HLE.h" />
-    <ClInclude Include="Src\HLE\HLE_Misc.h" />
-    <ClInclude Include="Src\HLE\HLE_OS.h" />
-    <ClInclude Include="Src\Host.h" />
-    <ClInclude Include="Src\HW\AudioInterface.h" />
-    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h" />
-    <ClInclude Include="Src\HW\CPU.h" />
-    <ClInclude Include="Src\HW\DSP.h" />
-    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h" />
-    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h" />
-    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h" />
-    <ClInclude Include="Src\HW\DVDInterface.h" />
-    <ClInclude Include="Src\HW\EXI.h" />
-    <ClInclude Include="Src\HW\EXI_Channel.h" />
-    <ClInclude Include="Src\HW\EXI_Device.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAD16.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceGecko.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
-    <ClInclude Include="Src\HW\GCMemcard.h" />
-    <ClInclude Include="Src\HW\GCPad.h" />
-    <ClInclude Include="Src\HW\GCPadEmu.h" />
-    <ClInclude Include="Src\HW\GPFifo.h" />
-    <ClInclude Include="Src\HW\HW.h" />
-    <ClInclude Include="Src\HW\Memmap.h" />
-    <ClInclude Include="Src\HW\MemoryInterface.h" />
-    <ClInclude Include="Src\HW\ProcessorInterface.h" />
-    <ClInclude Include="Src\HW\SI.h" />
-    <ClInclude Include="Src\HW\SI_Device.h" />
-    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h" />
-    <ClInclude Include="Src\HW\Sram.h" />
-    <ClInclude Include="Src\HW\StreamADPCM.h" />
-    <ClInclude Include="Src\HW\SystemTimers.h" />
-    <ClInclude Include="Src\HW\VideoInterface.h" />
-    <ClInclude Include="Src\HW\Wiimote.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h" />
-    <ClInclude Include="Src\HW\WII_IOB.h" />
-    <ClInclude Include="Src\HW\WII_IPC.h" />
-    <ClInclude Include="Src\IPC_HLE\hci.h" />
-    <ClInclude Include="Src\IPC_HLE\fakepoll.h" />
-    <ClInclude Include="Src\IPC_HLE\ICMP.h" />
-    <ClInclude Include="Src\IPC_HLE\l2cap.h" />
-    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_hid.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_Socket.h" />
-    <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\Movie.h" />
-    <ClInclude Include="Src\NetPlayClient.h" />
-    <ClInclude Include="Src\NetPlayProto.h" />
-    <ClInclude Include="Src\NetPlayServer.h" />
-    <ClInclude Include="Src\ec_wii.h" />
-    <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\DSPEmulator.h" />
-    <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
-    <ClInclude Include="Src\PowerPC\Gekko.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h" />
-    <ClInclude Include="Src\PowerPC\JitInterface.h" />
-    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h" />
-    <ClInclude Include="Src\PowerPC\PowerPC.h" />
-    <ClInclude Include="Src\PowerPC\PPCAnalyst.h" />
-    <ClInclude Include="Src\PowerPC\PPCCache.h" />
-    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h" />
-    <ClInclude Include="Src\PowerPC\PPCTables.h" />
-    <ClInclude Include="Src\PowerPC\Profiler.h" />
-    <ClInclude Include="Src\PowerPC\SignatureDB.h" />
-    <ClInclude Include="Src\State.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Tracer.h" />
-    <ClInclude Include="Src\VolumeHandler.h" />
+    <ClInclude Include="ActionReplay.h" />
+    <ClInclude Include="ARDecrypt.h" />
+    <ClInclude Include="BootManager.h" />
+    <ClInclude Include="Boot\Boot.h" />
+    <ClInclude Include="Boot\Boot_DOL.h" />
+    <ClInclude Include="Boot\ElfReader.h" />
+    <ClInclude Include="Boot\ElfTypes.h" />
+    <ClInclude Include="ConfigManager.h" />
+    <ClInclude Include="Core.h" />
+    <ClInclude Include="CoreParameter.h" />
+    <ClInclude Include="CoreTiming.h" />
+    <ClInclude Include="Debugger\Debugger_SymbolMap.h" />
+    <ClInclude Include="Debugger\Dump.h" />
+    <ClInclude Include="Debugger\GCELF.h" />
+    <ClInclude Include="Debugger\PPCDebugInterface.h" />
+    <ClInclude Include="DSPEmulator.h" />
+    <ClInclude Include="DSP\DSPAssembler.h" />
+    <ClInclude Include="DSP\DSPDisassembler.h" />
+    <ClInclude Include="DSP\DSPAccelerator.h" />
+    <ClInclude Include="DSP\DSPAnalyzer.h" />
+    <ClInclude Include="DSP\DSPBreakpoints.h" />
+    <ClInclude Include="DSP\DSPCaptureLogger.h" />
+    <ClInclude Include="DSP\DSPCodeUtil.h" />
+    <ClInclude Include="DSP\DSPCommon.h" />
+    <ClInclude Include="DSP\DSPCore.h" />
+    <ClInclude Include="DSP\DSPEmitter.h" />
+    <ClInclude Include="DSP\DSPHost.h" />
+    <ClInclude Include="DSP\DSPHWInterface.h" />
+    <ClInclude Include="DSP\DSPIntCCUtil.h" />
+    <ClInclude Include="DSP\DSPInterpreter.h" />
+    <ClInclude Include="DSP\DSPIntExtOps.h" />
+    <ClInclude Include="DSP\DSPIntUtil.h" />
+    <ClInclude Include="DSP\DSPMemoryMap.h" />
+    <ClInclude Include="DSP\DSPStacks.h" />
+    <ClInclude Include="DSP\DSPTables.h" />
+    <ClInclude Include="DSP\Jit\DSPJitRegCache.h" />
+    <ClInclude Include="DSP\LabelMap.h" />
+    <ClInclude Include="ec_wii.h" />
+    <ClInclude Include="FifoPlayer\FifoAnalyzer.h" />
+    <ClInclude Include="FifoPlayer\FifoDataFile.h" />
+    <ClInclude Include="FifoPlayer\FifoFileStruct.h" />
+    <ClInclude Include="FifoPlayer\FifoPlaybackAnalyzer.h" />
+    <ClInclude Include="FifoPlayer\FifoPlayer.h" />
+    <ClInclude Include="FifoPlayer\FifoRecordAnalyzer.h" />
+    <ClInclude Include="FifoPlayer\FifoRecorder.h" />
+    <ClInclude Include="GeckoCode.h" />
+    <ClInclude Include="GeckoCodeConfig.h" />
+    <ClInclude Include="HLE\HLE.h" />
+    <ClInclude Include="HLE\HLE_Misc.h" />
+    <ClInclude Include="HLE\HLE_OS.h" />
+    <ClInclude Include="Host.h" />
+    <ClInclude Include="HotkeyManager.h" />
+    <ClInclude Include="HW\AudioInterface.h" />
+    <ClInclude Include="HW\BBA-TAP\TAP_Win32.h" />
+    <ClInclude Include="HW\CPU.h" />
+    <ClInclude Include="HW\DSP.h" />
+    <ClInclude Include="HW\DSPHLE\DSPHLE.h" />
+    <ClInclude Include="HW\DSPHLE\MailHandler.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h" />
+    <ClInclude Include="HW\DSPLLE\DSPDebugInterface.h" />
+    <ClInclude Include="HW\DSPLLE\DSPLLE.h" />
+    <ClInclude Include="HW\DSPLLE\DSPLLEGlobals.h" />
+    <ClInclude Include="HW\DSPLLE\DSPLLETools.h" />
+    <ClInclude Include="HW\DSPLLE\DSPSymbols.h" />
+    <ClInclude Include="HW\DVDInterface.h" />
+    <ClInclude Include="HW\EXI.h" />
+    <ClInclude Include="HW\EXI_Channel.h" />
+    <ClInclude Include="HW\EXI_Device.h" />
+    <ClInclude Include="HW\EXI_DeviceAD16.h" />
+    <ClInclude Include="HW\EXI_DeviceAGP.h" />
+    <ClInclude Include="HW\EXI_DeviceAMBaseboard.h" />
+    <ClInclude Include="HW\EXI_DeviceEthernet.h" />
+    <ClInclude Include="HW\EXI_DeviceGecko.h" />
+    <ClInclude Include="HW\EXI_DeviceIPL.h" />
+    <ClInclude Include="HW\EXI_DeviceMemoryCard.h" />
+    <ClInclude Include="HW\EXI_DeviceMic.h" />
+    <ClInclude Include="HW\GCKeyboard.h" />
+    <ClInclude Include="HW\GCKeyboardEmu.h" />
+    <ClInclude Include="HW\GCMemcard.h" />
+    <ClInclude Include="HW\GCMemcardDirectory.h" />
+    <ClInclude Include="HW\GCMemcardRaw.h" />
+    <ClInclude Include="HW\GCPad.h" />
+    <ClInclude Include="HW\GCPadEmu.h" />
+    <ClInclude Include="HW\GPFifo.h" />
+    <ClInclude Include="HW\HW.h" />
+    <ClInclude Include="HW\Memmap.h" />
+    <ClInclude Include="HW\MemoryInterface.h" />
+    <ClInclude Include="HW\MMIO.h" />
+    <ClInclude Include="HW\MMIOHandlers.h" />
+    <ClInclude Include="HW\ProcessorInterface.h" />
+    <ClInclude Include="HW\SI.h" />
+    <ClInclude Include="HW\SI_Device.h" />
+    <ClInclude Include="HW\SI_DeviceAMBaseboard.h" />
+    <ClInclude Include="HW\SI_DeviceDanceMat.h" />
+    <ClInclude Include="HW\SI_DeviceGBA.h" />
+    <ClInclude Include="HW\SI_DeviceGCController.h" />
+    <ClInclude Include="HW\SI_DeviceGCSteeringWheel.h" />
+    <ClInclude Include="HW\SI_DeviceKeyboard.h" />
+    <ClInclude Include="HW\SI_GCAdapter.h" />
+    <ClInclude Include="HW\Sram.h" />
+    <ClInclude Include="HW\StreamADPCM.h" />
+    <ClInclude Include="HW\SystemTimers.h" />
+    <ClInclude Include="HW\VideoInterface.h" />
+    <ClInclude Include="HW\Wiimote.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Attachment.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Classic.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Drums.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Guitar.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Nunchuk.h" />
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Turntable.h" />
+    <ClInclude Include="HW\WiimoteEmu\Encryption.h" />
+    <ClInclude Include="HW\WiimoteEmu\MatrixMath.h" />
+    <ClInclude Include="HW\WiimoteEmu\WiimoteEmu.h" />
+    <ClInclude Include="HW\WiimoteEmu\WiimoteHid.h" />
+    <ClInclude Include="HW\WiimoteReal\WiimoteReal.h" />
+    <ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" />
+    <ClInclude Include="HW\WiiSaveCrypted.h" />
+    <ClInclude Include="HW\WII_IPC.h" />
+    <ClInclude Include="IPC_HLE\hci.h" />
+    <ClInclude Include="IPC_HLE\ICMP.h" />
+    <ClInclude Include="IPC_HLE\l2cap.h" />
+    <ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h" />
+    <ClInclude Include="IPC_HLE\WII_Socket.h" />
+    <ClInclude Include="MachineContext.h" />
+    <ClInclude Include="MemTools.h" />
+    <ClInclude Include="Movie.h" />
+    <ClInclude Include="NetPlayClient.h" />
+    <ClInclude Include="NetPlayProto.h" />
+    <ClInclude Include="NetPlayServer.h" />
+    <ClInclude Include="PatchEngine.h" />
+    <ClInclude Include="PowerPC\CPUCoreBase.h" />
+    <ClInclude Include="PowerPC\Gekko.h" />
+    <ClInclude Include="PowerPC\Interpreter\Interpreter.h" />
+    <ClInclude Include="PowerPC\Interpreter\Interpreter_FPUtils.h" />
+    <ClInclude Include="PowerPC\Interpreter\Interpreter_Tables.h" />
+    <ClInclude Include="PowerPC\Jit64IL\JitIL.h" />
+    <ClInclude Include="PowerPC\Jit64IL\JitIL_Tables.h" />
+    <ClInclude Include="PowerPC\Jit64\Jit.h" />
+    <ClInclude Include="PowerPC\Jit64\Jit64_Tables.h" />
+    <ClInclude Include="PowerPC\Jit64\JitAsm.h" />
+    <ClInclude Include="PowerPC\Jit64\JitRegCache.h" />
+    <ClInclude Include="PowerPC\JitILCommon\IR.h" />
+    <ClInclude Include="PowerPC\JitILCommon\JitILBase.h" />
+    <ClInclude Include="PowerPC\Jit64Common\Jit64AsmCommon.h" />
+    <ClInclude Include="PowerPC\JitCommon\JitAsmCommon.h" />
+    <ClInclude Include="PowerPC\JitCommon\JitBase.h" />
+    <ClInclude Include="PowerPC\JitCommon\JitCache.h" />
+    <ClInclude Include="PowerPC\JitCommon\Jit_Util.h" />
+    <ClInclude Include="PowerPC\JitCommon\TrampolineCache.h" />
+    <ClInclude Include="PowerPC\JitInterface.h" />
+    <ClInclude Include="PowerPC\PowerPC.h" />
+    <ClInclude Include="PowerPC\PPCAnalyst.h" />
+    <ClInclude Include="PowerPC\PPCCache.h" />
+    <ClInclude Include="PowerPC\PPCSymbolDB.h" />
+    <ClInclude Include="PowerPC\PPCTables.h" />
+    <ClInclude Include="PowerPC\Profiler.h" />
+    <ClInclude Include="PowerPC\SignatureDB.h" />
+    <ClInclude Include="State.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
+    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
-      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
+    <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj">
+      <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
+    <ProjectReference Include="$(ExternalsDir)libusb\libusb_static_2013.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
-      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
+    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
+      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
+    <ProjectReference Include="$(ExternalsDir)miniupnpc\miniupnpc.vcxproj">
+      <Project>{31643fdb-1bb8-4965-9de7-000fc88d35ae}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj">
+      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)portaudio\build\portaudio.vcxproj">
+      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
+      <Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
+      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
+      <Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
+      <Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 7b3a436959..142fc63b7c 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -1,1212 +1,1253 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\ConfigManager.cpp" />
-    <ClCompile Include="Src\Console.cpp" />
-    <ClCompile Include="Src\Core.cpp" />
-    <ClCompile Include="Src\CoreParameter.cpp" />
-    <ClCompile Include="Src\CoreTiming.cpp" />
-    <ClCompile Include="Src\x64MemTools.cpp" />
-    <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\DSPEmulator.cpp" />
-    <ClCompile Include="Src\State.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\Tracer.cpp" />
-    <ClCompile Include="Src\VolumeHandler.cpp" />
-    <ClCompile Include="Src\ActionReplay.cpp">
-      <Filter>ActionReplay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ARDecrypt.cpp">
-      <Filter>ActionReplay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_DOL.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_ELF.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Boot\ElfReader.cpp">
-      <Filter>Boot</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\Dump.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp">
-      <Filter>Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPEmitter.cpp">
-      <Filter>DSPCore\JIT</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\assemble.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\disassemble.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPAccelerator.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPCore.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPHWInterface.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPInterpreter.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPStacks.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPTables.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\LabelMap.cpp">
-      <Filter>DSPCore</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCode.cpp">
-      <Filter>GeckoCode</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCodeConfig.cpp">
-      <Filter>GeckoCode</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE_Misc.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HLE\HLE_OS.cpp">
-      <Filter>HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntBranch.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntMisc.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GCPad.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GCPadEmu.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_Channel.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_Device.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Sram.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSP.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\GPFifo.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\MemoryInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\ProcessorInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\AudioInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\StreamADPCM.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\DVDInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_Device.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\VideoInterface.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\HW.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\CPU.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Memmap.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\MemmapFunctions.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\SystemTimers.cpp">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PowerPC.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCCache.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\PPCTables.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\Profiler.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\SignatureDB.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WII_IPC.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WII_IOB.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HW\Wiimote.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BootManager.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp">
-      <Filter>FifoPlayer</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Movie.cpp" />
-    <ClCompile Include="Src\HW\GCMemcard.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PowerPC\JitInterface.cpp">
-      <Filter>PowerPC</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetPlayClient.cpp" />
-    <ClCompile Include="Src\NetPlayServer.cpp" />
-    <ClCompile Include="Src\IPC_HLE\ICMPWin.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ec_wii.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_Socket.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\ConfigManager.h" />
-    <ClInclude Include="Src\Console.h" />
-    <ClInclude Include="Src\Core.h" />
-    <ClInclude Include="Src\CoreParameter.h" />
-    <ClInclude Include="Src\CoreTiming.h" />
-    <ClInclude Include="Src\Host.h" />
-    <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\DSPEmulator.h" />
-    <ClInclude Include="Src\State.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Tracer.h" />
-    <ClInclude Include="Src\VolumeHandler.h" />
-    <ClInclude Include="Src\ARDecrypt.h">
-      <Filter>ActionReplay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ActionReplay.h">
-      <Filter>ActionReplay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot_DOL.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\Boot_ELF.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\ElfTypes.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Boot\ElfReader.h">
-      <Filter>Boot</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\Dump.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\GCELF.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\PPCDebugInterface.h">
-      <Filter>Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPEmitter.h">
-      <Filter>DSPCore\JIT</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\assemble.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\disassemble.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCore.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPAccelerator.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPAnalyzer.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPBreakpoints.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCodeUtil.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPCommon.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPHWInterface.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPInterpreter.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPMemoryMap.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPStacks.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPTables.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\LabelMap.h">
-      <Filter>DSPCore</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCodeConfig.h">
-      <Filter>GeckoCode</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCode.h">
-      <Filter>GeckoCode</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE_OS.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HLE\HLE_Misc.h">
-      <Filter>HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntUtil.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntCCUtil.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPIntExtOps.h">
-      <Filter>DSPCore\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GCPadEmu.h">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GCPad.h">
-      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceMic.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_Channel.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_Device.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceAD16.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceGecko.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceIPL.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Sram.h">
-      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSP.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DSP\DSPHost.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\GPFifo.h">
-      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\MemoryInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\ProcessorInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\AudioInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\StreamADPCM.h">
-      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DVDInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceGCController.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_Device.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SI_DeviceGBA.h">
-      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\VideoInterface.h">
-      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h">
-      <Filter>PowerPC\Interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h">
-      <Filter>PowerPC\JitCommon</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\Jit.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h">
-      <Filter>PowerPC\Jit64</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h">
-      <Filter>PowerPC\JitIL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\HW.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\CPU.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Memmap.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\SystemTimers.h">
-      <Filter>HW %28Flipper/Hollywood%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Gekko.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\SignatureDB.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PowerPC.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCAnalyst.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCCache.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\PPCTables.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\Profiler.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI - Drive Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WII_IPC.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\hci.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\l2cap.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WII_IOB.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wii IO Bridge</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\Wiimote.h">
-      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\CPUCoreBase.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BootManager.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h">
-      <Filter>FifoPlayer</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Movie.h" />
-    <ClInclude Include="Src\HW\GCMemcard.h">
-      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PowerPC\JitInterface.h">
-      <Filter>PowerPC</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\NetPlayClient.h" />
-    <ClInclude Include="Src\NetPlayProto.h" />
-    <ClInclude Include="Src\NetPlayServer.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\fakepoll.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\ICMP.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_hid.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ec_wii.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_Socket.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="ActionReplay">
-      <UniqueIdentifier>{c871a264-a881-44f2-88b1-406b282cd9fe}</UniqueIdentifier>
+      <UniqueIdentifier>{e0d231ab-7a66-45ce-a8e4-c0225308f763}</UniqueIdentifier>
     </Filter>
     <Filter Include="Boot">
-      <UniqueIdentifier>{0fe14029-e862-44b4-9358-d1cd44e42454}</UniqueIdentifier>
+      <UniqueIdentifier>{2472fb36-5473-4d49-ad2d-3699b78ab6e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Debugger">
-      <UniqueIdentifier>{fba97574-484f-4330-9674-69c0aeffd22f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GeckoCode">
-      <UniqueIdentifier>{684ba5fe-ccca-4d1b-94fa-3a2119353257}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HLE">
-      <UniqueIdentifier>{67aea903-7a27-4b1e-a4af-60f58818ba58}</UniqueIdentifier>
+      <UniqueIdentifier>{ed683a12-55f0-49cb-918b-c7edbcf57268}</UniqueIdentifier>
     </Filter>
     <Filter Include="DSPCore">
-      <UniqueIdentifier>{81d2e0cb-4bea-47ed-9bc3-fdc461ea4148}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DSPCore\JIT">
-      <UniqueIdentifier>{6aa99e27-bf15-43dc-8f14-c80383037a99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DSPCore\Interpreter">
-      <UniqueIdentifier>{45a9bf0a-e022-4ace-a99f-df675a0b251d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC">
-      <UniqueIdentifier>{1905e5c1-a593-454d-b0a0-68bf6cdbec12}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\Interpreter">
-      <UniqueIdentifier>{57e4ab87-a563-40c5-9a3d-6b5443750a96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\JitCommon">
-      <UniqueIdentifier>{1f8821ba-2dde-4b1a-9125-5f74006b1053}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\Jit64">
-      <UniqueIdentifier>{02777c32-ac14-4a06-9006-8ffc370bc231}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="PowerPC\JitIL">
-      <UniqueIdentifier>{0201c158-1162-48d8-b6d4-239d8202d200}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29">
-      <UniqueIdentifier>{21df1345-8145-4179-8cf5-a26b6887de5d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\AI - Audio Interface">
-      <UniqueIdentifier>{b34c5e25-c21d-401b-9b21-990f1a7908e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DI - Drive Interface">
-      <UniqueIdentifier>{b948ee86-1471-42b2-ab6f-ca0ce1c9e4d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE">
-      <UniqueIdentifier>{a25bdd3e-b989-4c5b-b56c-2f37ab4972c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE">
-      <UniqueIdentifier>{1966cfa5-57f3-4fdb-8d32-d34f033903af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes">
-      <UniqueIdentifier>{43f6de5c-946b-426d-9735-b774c3365ae4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE">
-      <UniqueIdentifier>{9f00a3b5-c0f3-4a3f-a756-25435ea996e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\EXI - Expansion Interface">
-      <UniqueIdentifier>{decdd68e-4e41-4589-bc13-5318705e2f94}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\GCPad">
-      <UniqueIdentifier>{e88d682e-a0c2-438d-9283-ab1ec250d3ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo">
-      <UniqueIdentifier>{36465b2e-d5c4-402c-abff-ed04c84a1566}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\PI - Processor Interface">
-      <UniqueIdentifier>{b7771463-73bf-457b-891f-9dcaa04076ea}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\SI - Serial Interface">
-      <UniqueIdentifier>{e34c8a58-7799-4afe-b0f9-1c5ff759639b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\MI - Memory Interface">
-      <UniqueIdentifier>{2ee04eb4-0d32-4e15-bd0e-811d408de20c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\VI - Video Interface">
-      <UniqueIdentifier>{808c3dc1-5fec-4565-8c2e-fa7e1232a31c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
-      <UniqueIdentifier>{ef5b78c3-47ec-4bd6-9809-f9e7da6e0861}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wii IO Bridge">
-      <UniqueIdentifier>{49635c9b-0874-4e71-9165-edaae632ab1c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29">
-      <UniqueIdentifier>{e2711d6f-b5f5-4c74-97c2-66f9620a2d86}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\DI - Drive Interface">
-      <UniqueIdentifier>{1be114bb-c572-4cdb-9650-4d24d282d4bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\ES">
-      <UniqueIdentifier>{ff0e9f64-a636-4998-8cae-fe122c8da934}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\FS">
-      <UniqueIdentifier>{30eda257-4d78-4db7-873e-c408db52d772}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
-      <UniqueIdentifier>{ed6f41bf-4f52-402b-ab1d-d5bf9e71c538}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Net">
-      <UniqueIdentifier>{362606ce-fa05-4829-831f-bf9e0acf9909}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
-      <UniqueIdentifier>{ebe09d6a-7cd0-4909-83e9-abafd3e8571f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
-      <UniqueIdentifier>{e7c723c0-693a-4cf8-973a-b349537adcc7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote">
-      <UniqueIdentifier>{0ab9fa49-fd0b-4eba-aa9f-2b774baa8e63}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu">
-      <UniqueIdentifier>{c53079fe-d19c-4492-b37e-bf8bd4f55fa8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment">
-      <UniqueIdentifier>{565ae8e7-ae6e-42f9-ae13-90c1aa017856}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Real">
-      <UniqueIdentifier>{1c21a3e1-b791-4a23-b0d5-ed2b2c34007f}</UniqueIdentifier>
+      <UniqueIdentifier>{35594696-15a6-44cb-b811-04e3195eecf5}</UniqueIdentifier>
     </Filter>
     <Filter Include="FifoPlayer">
-      <UniqueIdentifier>{ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586}</UniqueIdentifier>
+      <UniqueIdentifier>{659f0a99-77cf-46a0-a7a3-95afdd99be72}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GeckoCode">
+      <UniqueIdentifier>{c1c76a12-b4f3-4a46-84e6-e11980b2e997}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HLE">
+      <UniqueIdentifier>{256586c3-3a1b-4d7b-9f4a-2f7ffac9d23e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29">
+      <UniqueIdentifier>{d060b137-c211-44eb-9cad-fc12dedbea73}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29">
+      <UniqueIdentifier>{becbad5b-2531-410c-b032-2da2f078b178}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC">
+      <UniqueIdentifier>{ebd24590-dfdc-433e-a411-21723e4b7cb5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\Interpreter">
+      <UniqueIdentifier>{523f8d77-4aa6-4762-8f27-96f02b5070b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\Jit64">
+      <UniqueIdentifier>{c67be826-2935-4d25-a213-e132fa2e63ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\JitCommon">
+      <UniqueIdentifier>{c88ec388-371f-4401-851c-a32dcdc0b88b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\JitIL">
+      <UniqueIdentifier>{f26d3866-92d1-4623-9445-caf9a065ed74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DSPCore\Interpreter">
+      <UniqueIdentifier>{6204f663-bbd0-4eb5-bc15-e3778d8b6091}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DSPCore\Jit">
+      <UniqueIdentifier>{7042fb6f-9284-4469-bc7c-9302e0d984aa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\AI - Audio Interface">
+      <UniqueIdentifier>{d657188a-426d-46c8-af0a-caa148c6ed1b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DI - Drive Interface">
+      <UniqueIdentifier>{2832269e-5c7d-47f8-b212-afcd9145e427}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE">
+      <UniqueIdentifier>{9a10faaa-40c3-446c-81b6-5fc7a79d5329}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE">
+      <UniqueIdentifier>{7a29a81c-1fee-4e5b-bfe1-5f941837bdc9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes">
+      <UniqueIdentifier>{0eecffe7-f680-4d21-a05f-2f12c8244833}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE">
+      <UniqueIdentifier>{9fcd7c03-c4be-477b-9c15-5f096ab9d0f6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote">
+      <UniqueIdentifier>{69d8dcb1-f22b-47af-b1e4-f700b1a42e77}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu">
+      <UniqueIdentifier>{079f3720-45c8-4c54-8589-b7d00a8bc1ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Real">
+      <UniqueIdentifier>{bc3e845a-3d01-4713-aa32-f27110838d0c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment">
+      <UniqueIdentifier>{cdbd65da-541f-47d2-8fdc-e99e73e98e69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\EXI - Expansion Interface">
+      <UniqueIdentifier>{d19f1218-0e28-4f24-a4b3-33fac750a899}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GCKeyboard">
+      <UniqueIdentifier>{15452851-6ca5-4520-bbf1-d4b810317be3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HW %28Flipper/Hollywood%29\GCMemcard">
-      <UniqueIdentifier>{3e9e6e83-c1bf-45f9-aeff-231f98f60d29}</UniqueIdentifier>
+      <UniqueIdentifier>{d7b3050d-3dd9-4284-969c-c5ad3b3662d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GCPad">
+      <UniqueIdentifier>{15452851-6ca5-4520-bbf1-d4b810317be2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo">
+      <UniqueIdentifier>{2ef543bc-8125-4b96-9627-6d8c15a5b36a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\MI - Memory Interface">
+      <UniqueIdentifier>{dea96a0c-0274-4c9f-915e-97472e7f4578}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\PI - Processor Interface">
+      <UniqueIdentifier>{9fbdb5b5-9179-4488-b0bf-75c1ccdb3a61}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\SI - Serial Interface">
+      <UniqueIdentifier>{11385524-b10b-419b-8390-710791c53550}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\VI - Video Interface">
+      <UniqueIdentifier>{fa27e799-34c8-440a-9de3-6720df6022e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
+      <UniqueIdentifier>{2b41ab45-ba8c-45dc-92cc-9107c1fa3e36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\DI">
+      <UniqueIdentifier>{9370a21f-a7bf-4973-8258-290253617653}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\ES">
+      <UniqueIdentifier>{3f85582a-e612-4582-b0fa-ecc27ba3658c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\FS">
+      <UniqueIdentifier>{1f5662c1-885f-4ed4-9f10-cc8e98eaa35d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
+      <UniqueIdentifier>{1fb00563-01ba-42c4-82de-2c66371e614a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\Net">
+      <UniqueIdentifier>{4620ba8f-5638-4d56-941e-69fc4a4dfc07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
+      <UniqueIdentifier>{83c278e5-6b06-4cd0-96fb-2e3c88eb32d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="IPC HLE %28IOS/Starlet%29\USB">
-      <UniqueIdentifier>{321a9af5-9b3d-4620-888c-fe9d02e9559e}</UniqueIdentifier>
+      <UniqueIdentifier>{4a090016-76d5-43dd-95a4-abedfc11ef31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
+      <UniqueIdentifier>{8352be4d-d37d-4f55-adec-b940a9712802}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\JitILCommon">
+      <UniqueIdentifier>{827afa93-1a80-4835-93ae-b5516d95867f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="PowerPC\Jit64Common">
+      <UniqueIdentifier>{81956f71-d9fe-454f-96a6-855195d611c4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <ClCompile Include="BootManager.cpp" />
+    <ClCompile Include="ConfigManager.cpp" />
+    <ClCompile Include="Core.cpp" />
+    <ClCompile Include="CoreParameter.cpp" />
+    <ClCompile Include="CoreTiming.cpp" />
+    <ClCompile Include="ec_wii.cpp" />
+    <ClCompile Include="HotkeyManager.cpp" />
+    <ClCompile Include="MemTools.cpp" />
+    <ClCompile Include="Movie.cpp" />
+    <ClCompile Include="NetPlayClient.cpp" />
+    <ClCompile Include="NetPlayServer.cpp" />
+    <ClCompile Include="PatchEngine.cpp" />
+    <ClCompile Include="State.cpp" />
+    <ClCompile Include="ActionReplay.cpp">
+      <Filter>ActionReplay</Filter>
+    </ClCompile>
+    <ClCompile Include="ARDecrypt.cpp">
+      <Filter>ActionReplay</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\Boot.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\Boot_BS2Emu.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\Boot_DOL.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\Boot_ELF.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\Boot_WiiWAD.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Boot\ElfReader.cpp">
+      <Filter>Boot</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\Debugger_SymbolMap.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\Dump.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\PPCDebugInterface.cpp">
+      <Filter>Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntArithmetic.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntBranch.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntCCUtil.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPInterpreter.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntExtOps.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntLoadStore.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntMisc.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPIntMultiplier.cpp">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitArithmetic.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitBranch.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitCCUtil.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitExtOps.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitLoadStore.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitMisc.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitMultiplier.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitRegCache.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\Jit\DSPJitUtil.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPEmitter.cpp">
+      <Filter>DSPCore\Jit</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoDataFile.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoPlaybackAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoPlayer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoRecordAnalyzer.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayer\FifoRecorder.cpp">
+      <Filter>FifoPlayer</Filter>
+    </ClCompile>
+    <ClCompile Include="GeckoCode.cpp">
+      <Filter>GeckoCode</Filter>
+    </ClCompile>
+    <ClCompile Include="GeckoCodeConfig.cpp">
+      <Filter>GeckoCode</Filter>
+    </ClCompile>
+    <ClCompile Include="HLE\HLE.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HLE\HLE_Misc.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HLE\HLE_OS.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Branch.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_FloatingPoint.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Integer.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_LoadStore.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Paired.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_SystemRegisters.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Interpreter\Interpreter_Tables.cpp">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit64_Tables.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\AudioInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\StreamADPCM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DVDInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\DSPHLE.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPHLE\MailHandler.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPDebugInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPHost.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPLLE.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPLLEGlobals.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPLLETools.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSPLLE\DSPSymbols.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\DSP.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_Channel.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_Device.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceAD16.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceAGP.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceAMBaseboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceEthernet.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceGecko.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceIPL.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceMemoryCard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\EXI_DeviceMic.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\Sram.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCMemcard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCMemcardDirectory.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCMemcardRaw.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCPad.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCPadEmu.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GPFifo.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\MemoryInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\ProcessorInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_Device.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceAMBaseboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceDanceMat.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceGBA.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceGCController.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_DeviceKeyboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\VideoInterface.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Attachment.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Classic.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Drums.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Guitar.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Nunchuk.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Attachment\Turntable.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\EmuSubroutines.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Encryption.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\Speaker.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteEmu\WiimoteEmu.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteReal\IOWin.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WII_IPC.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\CPU.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\HW.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\Memmap.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\MMIO.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SystemTimers.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\WiiSaveCrypted.cpp">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPAssembler.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPAccelerator.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPAnalyzer.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPCaptureLogger.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPCodeUtil.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPCore.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPDisassembler.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSPEmulator.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPHWInterface.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPMemoryMap.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPStacks.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\DSPTables.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="DSP\LabelMap.cpp">
+      <Filter>DSPCore</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\ICMPWin.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_Socket.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\Wiimote.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitInterface.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\PowerPC.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\PPCAnalyst.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\PPCCache.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\PPCSymbolDB.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\PPCTables.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Profiler.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\SignatureDB.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\Jit_Util.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\JitAsmCommon.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\JitBase.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\JitCache.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\TrampolineCache.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64IL\IR_X86.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64IL\JitIL.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64IL\JitIL_Tables.cpp">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_Branch.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_SystemRegisters.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_FloatingPoint.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_Integer.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStore.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStoreFloating.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_LoadStorePaired.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\Jit_Paired.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\JitAsm.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64\JitRegCache.cpp">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Branch.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_FloatingPoint.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Integer.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStore.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStoreFloating.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_LoadStorePaired.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_Paired.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\JitILBase_SystemRegisters.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitILCommon\IR.cpp">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCKeyboardEmu.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCKeyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\GCKeyboard.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\GCKeyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\MMU.cpp">
+      <Filter>PowerPC</Filter>
+    </ClCompile>
+    <ClCompile Include="HW\SI_GCAdapter.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\JitCommon\JitBackpatch.cpp">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClCompile>
+    <ClCompile Include="PowerPC\Jit64Common\Jit64AsmCommon.cpp">
+      <Filter>PowerPC\Jit64Common</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BootManager.h" />
+    <ClInclude Include="ConfigManager.h" />
+    <ClInclude Include="Core.h" />
+    <ClInclude Include="CoreParameter.h" />
+    <ClInclude Include="CoreTiming.h" />
+    <ClInclude Include="ec_wii.h" />
+    <ClInclude Include="Host.h" />
+    <ClInclude Include="HotkeyManager.h" />
+    <ClInclude Include="MemTools.h" />
+    <ClInclude Include="Movie.h" />
+    <ClInclude Include="NetPlayClient.h" />
+    <ClInclude Include="NetPlayProto.h" />
+    <ClInclude Include="NetPlayServer.h" />
+    <ClInclude Include="PatchEngine.h" />
+    <ClInclude Include="State.h" />
+    <ClInclude Include="ActionReplay.h">
+      <Filter>ActionReplay</Filter>
+    </ClInclude>
+    <ClInclude Include="ARDecrypt.h">
+      <Filter>ActionReplay</Filter>
+    </ClInclude>
+    <ClInclude Include="Boot\Boot.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Boot\Boot_DOL.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Boot\ElfReader.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Boot\ElfTypes.h">
+      <Filter>Boot</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\Debugger_SymbolMap.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\Dump.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\GCELF.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\PPCDebugInterface.h">
+      <Filter>Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPIntCCUtil.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPInterpreter.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPIntExtOps.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPIntUtil.h">
+      <Filter>DSPCore\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\Jit\DSPJitRegCache.h">
+      <Filter>DSPCore\Jit</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPEmitter.h">
+      <Filter>DSPCore\Jit</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoDataFile.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoFileStruct.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoPlaybackAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoPlayer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoRecordAnalyzer.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayer\FifoRecorder.h">
+      <Filter>FifoPlayer</Filter>
+    </ClInclude>
+    <ClInclude Include="GeckoCode.h">
+      <Filter>GeckoCode</Filter>
+    </ClInclude>
+    <ClInclude Include="GeckoCodeConfig.h">
+      <Filter>GeckoCode</Filter>
+    </ClInclude>
+    <ClInclude Include="HLE\HLE.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HLE\HLE_Misc.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HLE\HLE_OS.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Interpreter\Interpreter.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Interpreter\Interpreter_FPUtils.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Interpreter\Interpreter_Tables.h">
+      <Filter>PowerPC\Interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64\Jit.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64\Jit64_Tables.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\AudioInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\StreamADPCM.h">
+      <Filter>HW %28Flipper/Hollywood%29\AI - Audio Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DVDInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\DSPHLE.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPHLE\MailHandler.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPLLE\DSPDebugInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPHost.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPLLE\DSPLLE.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPLLE\DSPLLEGlobals.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPLLE\DSPLLETools.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSPLLE\DSPSymbols.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\DSP.h">
+      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_Channel.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_Device.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceAD16.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceAGP.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceAMBaseboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceEthernet.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceGecko.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceIPL.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceMemoryCard.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\EXI_DeviceMic.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\BBA-TAP\TAP_Win32.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\Sram.h">
+      <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCMemcard.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCMemcardDirectory.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCMemcardRaw.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCPadEmu.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCPad.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCPad</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GPFifo.h">
+      <Filter>HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\MemoryInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\MI - Memory Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\ProcessorInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_Device.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceAMBaseboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceDanceMat.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceGBA.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceGCController.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceGCSteeringWheel.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_DeviceKeyboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\VideoInterface.h">
+      <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Attachment.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Classic.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Drums.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Guitar.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Nunchuk.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Attachment\Turntable.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu\Attachment</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\Encryption.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\MatrixMath.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\WiimoteEmu.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteEmu\WiimoteHid.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Emu</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteReal\WiimoteReal.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote\Real</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WII_IPC.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wii IPC</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\CPU.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\HW.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\Memmap.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\MMIO.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\MMIOHandlers.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SystemTimers.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\WiiSaveCrypted.h">
+      <Filter>HW %28Flipper/Hollywood%29</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPAssembler.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPAccelerator.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPAnalyzer.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPBreakpoints.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPCaptureLogger.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPCodeUtil.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPCommon.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPCore.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPDisassembler.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSPEmulator.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPHWInterface.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPMemoryMap.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPStacks.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\DSPTables.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="DSP\LabelMap.h">
+      <Filter>DSPCore</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h">
+      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\ICMP.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_Socket.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\hci.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\l2cap.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\Wiimote.h">
+      <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\CPUCoreBase.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Gekko.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitInterface.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\PowerPC.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\PPCAnalyst.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\PPCCache.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\PPCSymbolDB.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\PPCTables.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Profiler.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\SignatureDB.h">
+      <Filter>PowerPC</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitCommon\Jit_Util.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitCommon\JitAsmCommon.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitCommon\JitBase.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitCommon\JitCache.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitCommon\TrampolineCache.h">
+      <Filter>PowerPC\JitCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64IL\JitIL.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64IL\JitIL_Tables.h">
+      <Filter>PowerPC\JitIL</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64\JitRegCache.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64\JitAsm.h">
+      <Filter>PowerPC\Jit64</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitILCommon\JitILBase.h">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\JitILCommon\IR.h">
+      <Filter>PowerPC\JitILCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="MachineContext.h" />
+    <ClInclude Include="HW\GCKeyboardEmu.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCKeyboard</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\GCKeyboard.h">
+      <Filter>HW %28Flipper/Hollywood%29\GCKeyboard</Filter>
+    </ClInclude>
+    <ClInclude Include="HW\SI_GCAdapter.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="PowerPC\Jit64Common\Jit64AsmCommon.h">
+      <Filter>PowerPC\Jit64Common</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+</Project>
diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp
new file mode 100644
index 0000000000..7806683fc9
--- /dev/null
+++ b/Source/Core/Core/CoreParameter.cpp
@@ -0,0 +1,451 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <memory>
+
+#include "Common/CDUtils.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h" // for bWii
+#include "Core/CoreParameter.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/VolumeCreator.h"
+
+SCoreStartupParameter::SCoreStartupParameter()
+: bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
+  bJITNoBlockCache(false), bJITNoBlockLinking(false),
+  bJITOff(false),
+  bJITLoadStoreOff(false), bJITLoadStorelXzOff(false),
+  bJITLoadStorelwzOff(false), bJITLoadStorelbzxOff(false),
+  bJITLoadStoreFloatingOff(false), bJITLoadStorePairedOff(false),
+  bJITFloatingPointOff(false), bJITIntegerOff(false),
+  bJITPairedOff(false), bJITSystemRegistersOff(false),
+  bJITBranchOff(false),
+  bJITILTimeProfiling(false), bJITILOutputIR(false),
+  bFPRF(false), bAccurateNaNs(false),
+  bCPUThread(true), bDSPThread(false), bDSPHLE(true),
+  bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false),
+  bHLE_BS2(true), bEnableCheats(false),
+  bEnableMemcardSaving(true),
+  bDPL2Decoder(false), iLatency(14),
+  bRunCompareServer(false), bRunCompareClient(false),
+  bMMU(false), bDCBZOFF(false),
+  iBBDumpPort(0),
+  bFastDiscSpeed(false), bSyncGPU(false),
+  SelectedLanguage(0), bWii(false),
+  bConfirmStop(false), bHideCursor(false),
+  bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true),
+  iRenderWindowXPos(-1), iRenderWindowYPos(-1),
+  iRenderWindowWidth(640), iRenderWindowHeight(480),
+  bRenderWindowAutoSize(false), bKeepWindowOnTop(false),
+  bFullscreen(false), bRenderToMain(false),
+  bProgressive(false), bDisableScreenSaver(false),
+  iPosX(100), iPosY(100), iWidth(800), iHeight(600),
+  bLoopFifoReplay(true)
+{
+	LoadDefaults();
+}
+
+void SCoreStartupParameter::LoadDefaults()
+{
+	bEnableDebugging = false;
+	bAutomaticStart = false;
+	bBootToPause = false;
+
+	#ifdef USE_GDBSTUB
+	iGDBPort = -1;
+	#ifndef _WIN32
+	gdb_socket = "";
+	#endif
+	#endif
+
+	iCPUCore = PowerPC::CORE_JIT64;
+	bCPUThread = false;
+	bSkipIdle = false;
+	bSyncGPUOnSkipIdleHack = true;
+	bRunCompareServer = false;
+	bDSPHLE = true;
+	bFastmem = true;
+	bFPRF = false;
+	bAccurateNaNs = false;
+	bMMU = false;
+	bDCBZOFF = false;
+	iBBDumpPort = -1;
+	bSyncGPU = false;
+	bFastDiscSpeed = false;
+	bEnableMemcardSaving = true;
+	SelectedLanguage = 0;
+	bWii = false;
+	bDPL2Decoder = false;
+	iLatency = 14;
+
+	iPosX = 100;
+	iPosY = 100;
+	iWidth = 800;
+	iHeight = 600;
+
+	bLoopFifoReplay = true;
+
+	bJITOff = false; // debugger only settings
+	bJITLoadStoreOff = false;
+	bJITLoadStoreFloatingOff = false;
+	bJITLoadStorePairedOff = false;
+	bJITFloatingPointOff = false;
+	bJITIntegerOff = false;
+	bJITPairedOff = false;
+	bJITSystemRegistersOff = false;
+
+	m_strName = "NONE";
+	m_strUniqueID = "00000000";
+}
+
+static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country)
+{
+	switch (country)
+	{
+	case DiscIO::IVolume::COUNTRY_USA:
+		return USA_DIR;
+
+	case DiscIO::IVolume::COUNTRY_TAIWAN:
+	case DiscIO::IVolume::COUNTRY_KOREA:
+		// TODO: Should these have their own Region Dir?
+	case DiscIO::IVolume::COUNTRY_JAPAN:
+		return JAP_DIR;
+
+	case DiscIO::IVolume::COUNTRY_AUSTRALIA:
+	case DiscIO::IVolume::COUNTRY_EUROPE:
+	case DiscIO::IVolume::COUNTRY_FRANCE:
+	case DiscIO::IVolume::COUNTRY_GERMANY:
+	case DiscIO::IVolume::COUNTRY_ITALY:
+	case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+	case DiscIO::IVolume::COUNTRY_RUSSIA:
+	case DiscIO::IVolume::COUNTRY_SPAIN:
+	case DiscIO::IVolume::COUNTRY_WORLD:
+		return EUR_DIR;
+
+	case DiscIO::IVolume::COUNTRY_UNKNOWN:
+	default:
+		return nullptr;
+	}
+}
+
+bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
+{
+	std::string set_region_dir(EUR_DIR);
+
+	switch (_BootBS2)
+	{
+	case BOOT_DEFAULT:
+		{
+			bool bootDrive = cdio_is_cdrom(m_strFilename);
+			// Check if the file exist, we may have gotten it from a --elf command line
+			// that gave an incorrect file name
+			if (!bootDrive && !File::Exists(m_strFilename))
+			{
+				PanicAlertT("The specified file \"%s\" does not exist", m_strFilename.c_str());
+				return false;
+			}
+
+			std::string Extension;
+			SplitPath(m_strFilename, nullptr, nullptr, &Extension);
+			if (!strcasecmp(Extension.c_str(), ".gcm") ||
+				!strcasecmp(Extension.c_str(), ".iso") ||
+				!strcasecmp(Extension.c_str(), ".wbfs") ||
+				!strcasecmp(Extension.c_str(), ".ciso") ||
+				!strcasecmp(Extension.c_str(), ".gcz") ||
+				bootDrive)
+			{
+				m_BootType = BOOT_ISO;
+				std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(m_strFilename));
+				if (pVolume == nullptr)
+				{
+					if (bootDrive)
+						PanicAlertT("Could not read \"%s\".  "
+								"There is no disc in the drive, or it is not a GC/Wii backup.  "
+								"Please note that original GameCube and Wii discs cannot be read "
+								"by most PC DVD drives.", m_strFilename.c_str());
+					else
+						PanicAlertT("\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO.",
+								m_strFilename.c_str());
+					return false;
+				}
+				m_strName = pVolume->GetInternalName();
+				m_strUniqueID = pVolume->GetUniqueID();
+				m_revision = pVolume->GetRevision();
+
+				// Check if we have a Wii disc
+				bWii = pVolume.get()->GetVolumeType() == DiscIO::IVolume::WII_DISC;
+
+				const char* retrieved_region_dir = GetRegionOfCountry(pVolume->GetCountry());
+				if (!retrieved_region_dir)
+				{
+					if (!PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)."
+						"\nContinue with PAL region?"))
+						return false;
+					retrieved_region_dir = EUR_DIR;
+				}
+
+				set_region_dir = retrieved_region_dir;
+				bNTSC = set_region_dir == USA_DIR || set_region_dir == JAP_DIR;
+			}
+			else if (!strcasecmp(Extension.c_str(), ".elf"))
+			{
+				bWii = CBoot::IsElfWii(m_strFilename);
+				set_region_dir = USA_DIR;
+				m_BootType = BOOT_ELF;
+				bNTSC = true;
+			}
+			else if (!strcasecmp(Extension.c_str(), ".dol"))
+			{
+				CDolLoader dolfile(m_strFilename);
+				bWii = dolfile.IsWii();
+				set_region_dir = USA_DIR;
+				m_BootType = BOOT_DOL;
+				bNTSC = true;
+			}
+			else if (!strcasecmp(Extension.c_str(), ".dff"))
+			{
+				bWii = true;
+				set_region_dir = USA_DIR;
+				bNTSC = true;
+				m_BootType = BOOT_DFF;
+
+				std::unique_ptr<FifoDataFile> ddfFile(FifoDataFile::Load(m_strFilename, true));
+
+				if (ddfFile)
+				{
+					bWii = ddfFile->GetIsWii();
+				}
+			}
+			else if (DiscIO::CNANDContentManager::Access().GetNANDLoader(m_strFilename).IsValid())
+			{
+				std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(m_strFilename));
+				const DiscIO::INANDContentLoader& ContentLoader = DiscIO::CNANDContentManager::Access().GetNANDLoader(m_strFilename);
+
+				if (ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()) == nullptr)
+				{
+					//WAD is valid yet cannot be booted. Install instead.
+					u64 installed = DiscIO::CNANDContentManager::Access().Install_WiiWAD(m_strFilename);
+					if (installed)
+						SuccessAlertT("The WAD has been installed successfully");
+					return false; //do not boot
+				}
+
+				const char* retrieved_region_dir = GetRegionOfCountry(ContentLoader.GetCountry());
+				set_region_dir = retrieved_region_dir ? retrieved_region_dir : EUR_DIR;
+				bNTSC = set_region_dir == USA_DIR || set_region_dir == JAP_DIR;
+
+				bWii = true;
+				m_BootType = BOOT_WII_NAND;
+
+				if (pVolume)
+				{
+					m_strName = pVolume->GetInternalName();
+					m_strUniqueID = pVolume->GetUniqueID();
+				}
+				else
+				{
+					// null pVolume means that we are loading from nand folder (Most Likely Wii Menu)
+					// if this is the second boot we would be using the Name and id of the last title
+					m_strName.clear();
+					m_strUniqueID.clear();
+				}
+
+				// Use the TitleIDhex for name and/or unique ID if launching from nand folder
+				// or if it is not ascii characters (specifically sysmenu could potentially apply to other things)
+				std::string titleidstr = StringFromFormat("%016" PRIx64, ContentLoader.GetTitleID());
+
+				if (m_strName.empty())
+				{
+					m_strName = titleidstr;
+				}
+				if (m_strUniqueID.empty())
+				{
+					m_strUniqueID = titleidstr;
+				}
+			}
+			else
+			{
+				PanicAlertT("Could not recognize ISO file %s", m_strFilename.c_str());
+				return false;
+			}
+		}
+		break;
+
+	case BOOT_BS2_USA:
+		set_region_dir = USA_DIR;
+		m_strFilename.clear();
+		bNTSC = true;
+		break;
+
+	case BOOT_BS2_JAP:
+		set_region_dir = JAP_DIR;
+		m_strFilename.clear();
+		bNTSC = true;
+		break;
+
+	case BOOT_BS2_EUR:
+		set_region_dir = EUR_DIR;
+		m_strFilename.clear();
+		bNTSC = false;
+		break;
+	}
+
+	// Setup paths
+	CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, set_region_dir, true);
+	CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, set_region_dir, false);
+	m_strSRAM = File::GetUserPath(F_GCSRAM_IDX);
+	if (!bWii)
+	{
+		if (!bHLE_BS2)
+		{
+			m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + set_region_dir + DIR_SEP GC_IPL;
+			if (!File::Exists(m_strBootROM))
+				m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + set_region_dir + DIR_SEP GC_IPL;
+
+			if (!File::Exists(m_strBootROM))
+			{
+				WARN_LOG(BOOT, "Bootrom file %s not found - using HLE.", m_strBootROM.c_str());
+				bHLE_BS2 = true;
+			}
+		}
+	}
+	else if (bWii && !bHLE_BS2)
+	{
+		WARN_LOG(BOOT, "GC bootrom file will not be loaded for Wii mode.");
+		bHLE_BS2 = true;
+	}
+
+	return true;
+}
+
+void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, const std::string& gameRegion, bool isSlotA)
+{
+	std::string ext("." + gameRegion + ".raw");
+	if (memcardPath.empty())
+	{
+		// Use default memcard path if there is no user defined name
+		std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB;
+		memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext;
+	}
+	else
+	{
+		std::string filename = memcardPath;
+		std::string region = filename.substr(filename.size()-7, 3);
+		bool hasregion = false;
+		hasregion |= region.compare(USA_DIR) == 0;
+		hasregion |= region.compare(JAP_DIR) == 0;
+		hasregion |= region.compare(EUR_DIR) == 0;
+		if (!hasregion)
+		{
+			// filename doesn't have region in the extension
+			if (File::Exists(filename))
+			{
+				// If the old file exists we are polite and ask if we should copy it
+				std::string oldFilename = filename;
+				filename.replace(filename.size()-4, 4, ext);
+				if (PanicYesNoT("Memory Card filename in Slot %c is incorrect\n"
+					"Region not specified\n\n"
+					"Slot %c path was changed to\n"
+					"%s\n"
+					"Would you like to copy the old file to this new location?\n",
+					isSlotA ? 'A':'B', isSlotA ? 'A':'B', filename.c_str()))
+				{
+					if (!File::Copy(oldFilename, filename))
+						PanicAlertT("Copy failed");
+				}
+			}
+			memcardPath = filename; // Always correct the path!
+		}
+		else if (region.compare(gameRegion) != 0)
+		{
+			// filename has region, but it's not == gameRegion
+			// Just set the correct filename, the EXI Device will create it if it doesn't exist
+			memcardPath = filename.replace(filename.size()-ext.size(), ext.size(), ext);
+		}
+	}
+}
+
+DiscIO::IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const
+{
+	DiscIO::IVolume::ELanguage language;
+	if (wii)
+		language = (DiscIO::IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
+	else
+		language = (DiscIO::IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1);
+
+	// Get rid of invalid values (probably doesn't matter, but might as well do it)
+	if (language > DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0)
+		language = DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN;
+	return language;
+}
+
+IniFile SCoreStartupParameter::LoadDefaultGameIni() const
+{
+	return LoadDefaultGameIni(GetUniqueID(), m_revision);
+}
+
+IniFile SCoreStartupParameter::LoadLocalGameIni() const
+{
+	return LoadLocalGameIni(GetUniqueID(), m_revision);
+}
+
+IniFile SCoreStartupParameter::LoadGameIni() const
+{
+	return LoadGameIni(GetUniqueID(), m_revision);
+}
+
+IniFile SCoreStartupParameter::LoadDefaultGameIni(const std::string& id, u16 revision)
+{
+	IniFile game_ini;
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename, true);
+	return game_ini;
+}
+
+IniFile SCoreStartupParameter::LoadLocalGameIni(const std::string& id, u16 revision)
+{
+	IniFile game_ini;
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + filename, true);
+	return game_ini;
+}
+
+IniFile SCoreStartupParameter::LoadGameIni(const std::string& id, u16 revision)
+{
+	IniFile game_ini;
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename, true);
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + filename, true);
+	return game_ini;
+}
+
+// Returns all possible filenames in ascending order of priority
+std::vector<std::string> SCoreStartupParameter::GetGameIniFilenames(const std::string& id, u16 revision)
+{
+	std::vector<std::string> filenames;
+
+	// INIs that match all regions
+	if (id.size() >= 4)
+		filenames.push_back(id.substr(0, 3) + ".ini");
+
+	// Regular INIs
+	filenames.push_back(id + ".ini");
+
+	// INIs with specific revisions
+	filenames.push_back(id + StringFromFormat("r%d", revision) + ".ini");
+
+	return filenames;
+}
diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h
new file mode 100644
index 0000000000..3cf744b987
--- /dev/null
+++ b/Source/Core/Core/CoreParameter.h
@@ -0,0 +1,272 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/IniFile.h"
+#include "DiscIO/Volume.h"
+
+enum Hotkey
+{
+	HK_OPEN,
+	HK_CHANGE_DISC,
+	HK_REFRESH_LIST,
+
+	HK_PLAY_PAUSE,
+	HK_STOP,
+	HK_RESET,
+	HK_FRAME_ADVANCE,
+
+	HK_START_RECORDING,
+	HK_PLAY_RECORDING,
+	HK_EXPORT_RECORDING,
+	HK_READ_ONLY_MODE,
+
+	HK_FULLSCREEN,
+	HK_SCREENSHOT,
+	HK_EXIT,
+
+	HK_WIIMOTE1_CONNECT,
+	HK_WIIMOTE2_CONNECT,
+	HK_WIIMOTE3_CONNECT,
+	HK_WIIMOTE4_CONNECT,
+	HK_BALANCEBOARD_CONNECT,
+
+	HK_VOLUME_DOWN,
+	HK_VOLUME_UP,
+	HK_VOLUME_TOGGLE_MUTE,
+
+	HK_INCREASE_IR,
+	HK_DECREASE_IR,
+
+	HK_TOGGLE_IR,
+	HK_TOGGLE_AR,
+	HK_TOGGLE_EFBCOPIES,
+	HK_TOGGLE_FOG,
+	HK_TOGGLE_THROTTLE,
+
+	HK_DECREASE_FRAME_LIMIT,
+	HK_INCREASE_FRAME_LIMIT,
+
+	HK_FREELOOK_DECREASE_SPEED,
+	HK_FREELOOK_INCREASE_SPEED,
+	HK_FREELOOK_RESET_SPEED,
+	HK_FREELOOK_UP,
+	HK_FREELOOK_DOWN,
+	HK_FREELOOK_LEFT,
+	HK_FREELOOK_RIGHT,
+	HK_FREELOOK_ZOOM_IN,
+	HK_FREELOOK_ZOOM_OUT,
+	HK_FREELOOK_RESET,
+
+	HK_DECREASE_DEPTH,
+	HK_INCREASE_DEPTH,
+	HK_DECREASE_CONVERGENCE,
+	HK_INCREASE_CONVERGENCE,
+
+	HK_LOAD_STATE_SLOT_1,
+	HK_LOAD_STATE_SLOT_2,
+	HK_LOAD_STATE_SLOT_3,
+	HK_LOAD_STATE_SLOT_4,
+	HK_LOAD_STATE_SLOT_5,
+	HK_LOAD_STATE_SLOT_6,
+	HK_LOAD_STATE_SLOT_7,
+	HK_LOAD_STATE_SLOT_8,
+	HK_LOAD_STATE_SLOT_9,
+	HK_LOAD_STATE_SLOT_10,
+
+	HK_SAVE_STATE_SLOT_1,
+	HK_SAVE_STATE_SLOT_2,
+	HK_SAVE_STATE_SLOT_3,
+	HK_SAVE_STATE_SLOT_4,
+	HK_SAVE_STATE_SLOT_5,
+	HK_SAVE_STATE_SLOT_6,
+	HK_SAVE_STATE_SLOT_7,
+	HK_SAVE_STATE_SLOT_8,
+	HK_SAVE_STATE_SLOT_9,
+	HK_SAVE_STATE_SLOT_10,
+
+	HK_SELECT_STATE_SLOT_1,
+	HK_SELECT_STATE_SLOT_2,
+	HK_SELECT_STATE_SLOT_3,
+	HK_SELECT_STATE_SLOT_4,
+	HK_SELECT_STATE_SLOT_5,
+	HK_SELECT_STATE_SLOT_6,
+	HK_SELECT_STATE_SLOT_7,
+	HK_SELECT_STATE_SLOT_8,
+	HK_SELECT_STATE_SLOT_9,
+	HK_SELECT_STATE_SLOT_10,
+
+	HK_SAVE_STATE_SLOT_SELECTED,
+	HK_LOAD_STATE_SLOT_SELECTED,
+
+	HK_LOAD_LAST_STATE_1,
+	HK_LOAD_LAST_STATE_2,
+	HK_LOAD_LAST_STATE_3,
+	HK_LOAD_LAST_STATE_4,
+	HK_LOAD_LAST_STATE_5,
+	HK_LOAD_LAST_STATE_6,
+	HK_LOAD_LAST_STATE_7,
+	HK_LOAD_LAST_STATE_8,
+	HK_LOAD_LAST_STATE_9,
+	HK_LOAD_LAST_STATE_10,
+
+	HK_SAVE_FIRST_STATE,
+	HK_UNDO_LOAD_STATE,
+	HK_UNDO_SAVE_STATE,
+	HK_SAVE_STATE_FILE,
+	HK_LOAD_STATE_FILE,
+
+	NUM_HOTKEYS,
+};
+
+enum GPUDeterminismMode
+{
+	GPU_DETERMINISM_AUTO,
+	GPU_DETERMINISM_NONE,
+	// This is currently the only mode.  There will probably be at least
+	// one more at some point.
+	GPU_DETERMINISM_FAKE_COMPLETION,
+};
+
+struct SCoreStartupParameter
+{
+	// Settings
+	bool bEnableDebugging;
+	#ifdef USE_GDBSTUB
+	int  iGDBPort;
+	#ifndef _WIN32
+	std::string gdb_socket;
+	#endif
+	#endif
+	bool bAutomaticStart;
+	bool bBootToPause;
+
+	int iCPUCore;
+
+	// JIT (shared between JIT and JITIL)
+	bool bJITNoBlockCache, bJITNoBlockLinking;
+	bool bJITOff;
+	bool bJITLoadStoreOff, bJITLoadStorelXzOff, bJITLoadStorelwzOff, bJITLoadStorelbzxOff;
+	bool bJITLoadStoreFloatingOff;
+	bool bJITLoadStorePairedOff;
+	bool bJITFloatingPointOff;
+	bool bJITIntegerOff;
+	bool bJITPairedOff;
+	bool bJITSystemRegistersOff;
+	bool bJITBranchOff;
+	bool bJITILTimeProfiling;
+	bool bJITILOutputIR;
+
+	bool bFastmem;
+	bool bFPRF;
+	bool bAccurateNaNs;
+
+	bool bCPUThread;
+	bool bDSPThread;
+	bool bDSPHLE;
+	bool bSkipIdle;
+	bool bSyncGPUOnSkipIdleHack;
+	bool bNTSC;
+	bool bForceNTSCJ;
+	bool bHLE_BS2;
+	bool bEnableCheats;
+	bool bEnableMemcardSaving;
+
+	bool bDPL2Decoder;
+	int iLatency;
+
+	bool bRunCompareServer;
+	bool bRunCompareClient;
+
+	bool bMMU;
+	bool bDCBZOFF;
+	int iBBDumpPort;
+	bool bFastDiscSpeed;
+
+	bool bSyncGPU;
+	int iSyncGpuMaxDistance;
+	int iSyncGpuMinDistance;
+	float fSyncGpuOverclock;
+
+	int SelectedLanguage;
+
+	bool bWii;
+
+	// Interface settings
+	bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages;
+	std::string theme_name;
+
+	// Display settings
+	std::string strFullscreenResolution;
+	int iRenderWindowXPos, iRenderWindowYPos;
+	int iRenderWindowWidth, iRenderWindowHeight;
+	bool bRenderWindowAutoSize, bKeepWindowOnTop;
+	bool bFullscreen, bRenderToMain;
+	bool bProgressive, bDisableScreenSaver;
+
+	int iPosX, iPosY, iWidth, iHeight;
+
+	// Fifo Player related settings
+	bool bLoopFifoReplay;
+
+	enum EBootBS2
+	{
+		BOOT_DEFAULT,
+		BOOT_BS2_JAP,
+		BOOT_BS2_USA,
+		BOOT_BS2_EUR,
+	};
+
+	enum EBootType
+	{
+		BOOT_ISO,
+		BOOT_ELF,
+		BOOT_DOL,
+		BOOT_WII_NAND,
+		BOOT_BS2,
+		BOOT_DFF
+	};
+	EBootType m_BootType;
+
+	std::string m_strVideoBackend;
+	std::string m_strGPUDeterminismMode;
+
+	// set based on the string version
+	GPUDeterminismMode m_GPUDeterminismMode;
+
+	// files
+	std::string m_strFilename;
+	std::string m_strBootROM;
+	std::string m_strSRAM;
+	std::string m_strDefaultISO;
+	std::string m_strDVDRoot;
+	std::string m_strApploader;
+	std::string m_strUniqueID;
+	std::string m_strName;
+	u16 m_revision;
+
+	std::string m_perfDir;
+
+	// Constructor just calls LoadDefaults
+	SCoreStartupParameter();
+
+	void LoadDefaults();
+	bool AutoSetup(EBootBS2 _BootBS2);
+	const std::string &GetUniqueID() const { return m_strUniqueID; }
+	void CheckMemcardPath(std::string& memcardPath, const std::string& gameRegion, bool isSlotA);
+	DiscIO::IVolume::ELanguage GetCurrentLanguage(bool wii) const;
+
+	IniFile LoadDefaultGameIni() const;
+	IniFile LoadLocalGameIni() const;
+	IniFile LoadGameIni() const;
+
+	static IniFile LoadDefaultGameIni(const std::string& id, u16 revision);
+	static IniFile LoadLocalGameIni(const std::string& id, u16 revision);
+	static IniFile LoadGameIni(const std::string& id, u16 revision);
+
+	static std::vector<std::string> GetGameIniFilenames(const std::string& id, u16 revision);
+};
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
new file mode 100644
index 0000000000..103785dbcf
--- /dev/null
+++ b/Source/Core/Core/CoreTiming.cpp
@@ -0,0 +1,558 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include "Common/ChunkFile.h"
+#include "Common/FifoQueue.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+#define MAX_SLICE_LENGTH 20000
+
+namespace CoreTiming
+{
+
+struct EventType
+{
+	TimedCallback callback;
+	std::string name;
+};
+
+static std::vector<EventType> event_types;
+
+struct BaseEvent
+{
+	s64 time;
+	u64 userdata;
+	int type;
+};
+
+typedef LinkedListItem<BaseEvent> Event;
+
+// STATE_TO_SAVE
+static Event *first;
+static std::mutex tsWriteLock;
+static Common::FifoQueue<BaseEvent, false> tsQueue;
+
+// event pools
+static Event *eventPool = nullptr;
+
+static float lastOCFactor;
+int slicelength;
+static int maxSliceLength = MAX_SLICE_LENGTH;
+
+static s64 idledCycles;
+static u32 fakeDecStartValue;
+static u64 fakeDecStartTicks;
+
+s64 globalTimer;
+u64 fakeTBStartValue;
+u64 fakeTBStartTicks;
+
+static int ev_lost;
+
+
+static void (*advanceCallback)(int cyclesExecuted) = nullptr;
+
+static Event* GetNewEvent()
+{
+	if (!eventPool)
+		return new Event;
+
+	Event* ev = eventPool;
+	eventPool = ev->next;
+	return ev;
+}
+
+static void FreeEvent(Event* ev)
+{
+	ev->next = eventPool;
+	eventPool = ev;
+}
+
+static void EmptyTimedCallback(u64 userdata, int cyclesLate) {}
+
+// Changing the CPU speed in Dolphin isn't actually done by changing the physical clock rate,
+// but by changing the amount of work done in a particular amount of time. This tends to be more
+// compatible because it stops the games from actually knowing directly that the clock rate has
+// changed, and ensures that anything based on waiting a specific number of cycles still works.
+//
+// Technically it might be more accurate to call this changing the IPC instead of the CPU speed,
+// but the effect is largely the same.
+static int DowncountToCycles(int downcount)
+{
+	return (int)(downcount / lastOCFactor);
+}
+
+static int CyclesToDowncount(int cycles)
+{
+	return (int)(cycles * lastOCFactor);
+}
+
+int RegisterEvent(const std::string& name, TimedCallback callback)
+{
+	EventType type;
+	type.name = name;
+	type.callback = callback;
+
+	// check for existing type with same name.
+	// we want event type names to remain unique so that we can use them for serialization.
+	for (auto& event_type : event_types)
+	{
+		if (name == event_type.name)
+		{
+			WARN_LOG(POWERPC, "Discarded old event type \"%s\" because a new type with the same name was registered.", name.c_str());
+			// we don't know if someone might be holding on to the type index,
+			// so we gut the old event type instead of actually removing it.
+			event_type.name = "_discarded_event";
+			event_type.callback = &EmptyTimedCallback;
+		}
+	}
+
+	event_types.push_back(type);
+	return (int)event_types.size() - 1;
+}
+
+void UnregisterAllEvents()
+{
+	if (first)
+		PanicAlert("Cannot unregister events with events pending");
+	event_types.clear();
+}
+
+void Init()
+{
+	lastOCFactor = SConfig::GetInstance().m_OCEnable ? SConfig::GetInstance().m_OCFactor : 1.0f;
+	PowerPC::ppcState.downcount = CyclesToDowncount(maxSliceLength);
+	slicelength = maxSliceLength;
+	globalTimer = 0;
+	idledCycles = 0;
+
+	ev_lost = RegisterEvent("_lost_event", &EmptyTimedCallback);
+}
+
+void Shutdown()
+{
+	std::lock_guard<std::mutex> lk(tsWriteLock);
+	MoveEvents();
+	ClearPendingEvents();
+	UnregisterAllEvents();
+
+	while (eventPool)
+	{
+		Event *ev = eventPool;
+		eventPool = ev->next;
+		delete ev;
+	}
+}
+
+static void EventDoState(PointerWrap &p, BaseEvent* ev)
+{
+	p.Do(ev->time);
+
+	// this is why we can't have (nice things) pointers as userdata
+	p.Do(ev->userdata);
+
+	// we can't savestate ev->type directly because events might not get registered in the same order (or at all) every time.
+	// so, we savestate the event's type's name, and derive ev->type from that when loading.
+	std::string name;
+	if (p.GetMode() != PointerWrap::MODE_READ)
+		name = event_types[ev->type].name;
+
+	p.Do(name);
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		bool foundMatch = false;
+		for (unsigned int i = 0; i < event_types.size(); ++i)
+		{
+			if (name == event_types[i].name)
+			{
+				ev->type = i;
+				foundMatch = true;
+				break;
+			}
+		}
+		if (!foundMatch)
+		{
+			WARN_LOG(POWERPC, "Lost event from savestate because its type, \"%s\", has not been registered.", name.c_str());
+			ev->type = ev_lost;
+		}
+	}
+}
+
+void DoState(PointerWrap &p)
+{
+	std::lock_guard<std::mutex> lk(tsWriteLock);
+	p.Do(slicelength);
+	p.Do(globalTimer);
+	p.Do(idledCycles);
+	p.Do(fakeDecStartValue);
+	p.Do(fakeDecStartTicks);
+	p.Do(fakeTBStartValue);
+	p.Do(fakeTBStartTicks);
+	p.Do(lastOCFactor);
+	p.DoMarker("CoreTimingData");
+
+	MoveEvents();
+
+	p.DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, EventDoState>(first);
+	p.DoMarker("CoreTimingEvents");
+}
+
+u64 GetTicks()
+{
+	return (u64)globalTimer;
+}
+
+u64 GetIdleTicks()
+{
+	return (u64)idledCycles;
+}
+
+// This is to be called when outside threads, such as the graphics thread, wants to
+// schedule things to be executed on the main thread.
+void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata)
+{
+	_assert_msg_(POWERPC, !Core::IsCPUThread(), "ScheduleEvent_Threadsafe from wrong thread");
+	if (Core::g_want_determinism)
+	{
+		ERROR_LOG(POWERPC, "Someone scheduled an off-thread \"%s\" event while netplay or movie play/record "
+		                   "was active.  This is likely to cause a desync.",
+		                   event_types[event_type].name.c_str());
+	}
+	std::lock_guard<std::mutex> lk(tsWriteLock);
+	Event ne;
+	ne.time = globalTimer + cyclesIntoFuture;
+	ne.type = event_type;
+	ne.userdata = userdata;
+	tsQueue.Push(ne);
+}
+
+// Executes an event immediately, then returns.
+void ScheduleEvent_Immediate(int event_type, u64 userdata)
+{
+	_assert_msg_(POWERPC, Core::IsCPUThread(), "ScheduleEvent_Immediate from wrong thread");
+	event_types[event_type].callback(userdata, 0);
+}
+
+// Same as ScheduleEvent_Threadsafe(0, ...) EXCEPT if we are already on the CPU thread
+// in which case this is the same as ScheduleEvent_Immediate.
+void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata)
+{
+	if (Core::IsCPUThread())
+	{
+		event_types[event_type].callback(userdata, 0);
+	}
+	else
+	{
+		ScheduleEvent_Threadsafe(0, event_type, userdata);
+	}
+}
+
+void ClearPendingEvents()
+{
+	while (first)
+	{
+		Event *e = first->next;
+		FreeEvent(first);
+		first = e;
+	}
+}
+
+static void AddEventToQueue(Event* ne)
+{
+	Event* prev = nullptr;
+	Event** pNext = &first;
+	for (;;)
+	{
+		Event*& next = *pNext;
+		if (!next || ne->time < next->time)
+		{
+			ne->next = next;
+			next = ne;
+			break;
+		}
+		prev = next;
+		pNext = &prev->next;
+	}
+}
+
+// This must be run ONLY from within the CPU thread
+// cyclesIntoFuture may be VERY inaccurate if called from anything else
+// than Advance
+void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata)
+{
+	_assert_msg_(POWERPC, Core::IsCPUThread() || Core::GetState() == Core::CORE_PAUSE,
+				 "ScheduleEvent from wrong thread");
+	Event *ne = GetNewEvent();
+	ne->userdata = userdata;
+	ne->type = event_type;
+	ne->time = globalTimer + cyclesIntoFuture;
+	AddEventToQueue(ne);
+}
+
+void RegisterAdvanceCallback(void (*callback)(int cyclesExecuted))
+{
+	advanceCallback = callback;
+}
+
+bool IsScheduled(int event_type)
+{
+	if (!first)
+		return false;
+	Event *e = first;
+	while (e)
+	{
+		if (e->type == event_type)
+			return true;
+		e = e->next;
+	}
+	return false;
+}
+
+void RemoveEvent(int event_type)
+{
+	if (!first)
+		return;
+
+	while (first)
+	{
+		if (first->type == event_type)
+		{
+			Event *next = first->next;
+			FreeEvent(first);
+			first = next;
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	if (!first)
+		return;
+
+	Event *prev = first;
+	Event *ptr = prev->next;
+	while (ptr)
+	{
+		if (ptr->type == event_type)
+		{
+			prev->next = ptr->next;
+			FreeEvent(ptr);
+			ptr = prev->next;
+		}
+		else
+		{
+			prev = ptr;
+			ptr = ptr->next;
+		}
+	}
+}
+
+void RemoveAllEvents(int event_type)
+{
+	MoveEvents();
+	RemoveEvent(event_type);
+}
+
+void SetMaximumSlice(int maximumSliceLength)
+{
+	maxSliceLength = maximumSliceLength;
+}
+
+void ForceExceptionCheck(int cycles)
+{
+	if (DowncountToCycles(PowerPC::ppcState.downcount) > cycles)
+	{
+		slicelength -= (DowncountToCycles(PowerPC::ppcState.downcount) - cycles); // Account for cycles already executed by adjusting the slicelength
+		PowerPC::ppcState.downcount = CyclesToDowncount(cycles);
+	}
+}
+
+void ResetSliceLength()
+{
+	maxSliceLength = MAX_SLICE_LENGTH;
+}
+
+
+//This raise only the events required while the fifo is processing data
+void ProcessFifoWaitEvents()
+{
+	MoveEvents();
+
+	if (!first)
+		return;
+
+	while (first)
+	{
+		if (first->time <= globalTimer)
+		{
+			Event* evt = first;
+			first = first->next;
+			event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
+			FreeEvent(evt);
+		}
+		else
+		{
+			break;
+		}
+	}
+}
+
+void MoveEvents()
+{
+	BaseEvent sevt;
+	while (tsQueue.Pop(sevt))
+	{
+		Event *evt = GetNewEvent();
+		evt->time = sevt.time;
+		evt->userdata = sevt.userdata;
+		evt->type = sevt.type;
+		AddEventToQueue(evt);
+	}
+}
+
+void Advance()
+{
+	MoveEvents();
+
+	int cyclesExecuted = slicelength - DowncountToCycles(PowerPC::ppcState.downcount);
+	globalTimer += cyclesExecuted;
+	lastOCFactor = SConfig::GetInstance().m_OCEnable ? SConfig::GetInstance().m_OCFactor : 1.0f;
+	PowerPC::ppcState.downcount = CyclesToDowncount(slicelength);
+
+	while (first)
+	{
+		if (first->time <= globalTimer)
+		{
+			//LOG(POWERPC, "[Scheduler] %s     (%lld, %lld) ",
+			//             event_types[first->type].name ? event_types[first->type].name : "?", (u64)globalTimer, (u64)first->time);
+			Event* evt = first;
+			first = first->next;
+			event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
+			FreeEvent(evt);
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	if (!first)
+	{
+		WARN_LOG(POWERPC, "WARNING - no events in queue. Setting downcount to 10000");
+		PowerPC::ppcState.downcount += CyclesToDowncount(10000);
+	}
+	else
+	{
+		slicelength = (int)(first->time - globalTimer);
+		if (slicelength > maxSliceLength)
+			slicelength = maxSliceLength;
+		PowerPC::ppcState.downcount = CyclesToDowncount(slicelength);
+	}
+
+	if (advanceCallback)
+		advanceCallback(cyclesExecuted);
+}
+
+void LogPendingEvents()
+{
+	Event *ptr = first;
+	while (ptr)
+	{
+		INFO_LOG(POWERPC, "PENDING: Now: %" PRId64 " Pending: %" PRId64 " Type: %d", globalTimer, ptr->time, ptr->type);
+		ptr = ptr->next;
+	}
+}
+
+void Idle()
+{
+	//DEBUG_LOG(POWERPC, "Idle");
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPUOnSkipIdleHack)
+	{
+		//When the FIFO is processing data we must not advance because in this way
+		//the VI will be desynchronized. So, We are waiting until the FIFO finish and
+		//while we process only the events required by the FIFO.
+		ProcessFifoWaitEvents();
+		g_video_backend->Video_Sync(0);
+	}
+
+	idledCycles += DowncountToCycles(PowerPC::ppcState.downcount);
+	PowerPC::ppcState.downcount = 0;
+}
+
+std::string GetScheduledEventsSummary()
+{
+	Event *ptr = first;
+	std::string text = "Scheduled events\n";
+	text.reserve(1000);
+	while (ptr)
+	{
+		unsigned int t = ptr->type;
+		if (t >= event_types.size())
+			PanicAlertT("Invalid event type %i", t);
+
+		const std::string& name = event_types[ptr->type].name;
+
+		text += StringFromFormat("%s : %" PRIi64 " %016" PRIx64 "\n", name.c_str(), ptr->time, ptr->userdata);
+		ptr = ptr->next;
+	}
+	return text;
+}
+
+u32 GetFakeDecStartValue()
+{
+	return fakeDecStartValue;
+}
+
+void SetFakeDecStartValue(u32 val)
+{
+	fakeDecStartValue = val;
+}
+
+u64 GetFakeDecStartTicks()
+{
+	return fakeDecStartTicks;
+}
+
+void SetFakeDecStartTicks(u64 val)
+{
+	fakeDecStartTicks = val;
+}
+
+u64 GetFakeTBStartValue()
+{
+	return fakeTBStartValue;
+}
+
+void SetFakeTBStartValue(u64 val)
+{
+	fakeTBStartValue = val;
+}
+
+u64 GetFakeTBStartTicks()
+{
+	return fakeTBStartTicks;
+}
+
+void SetFakeTBStartTicks(u64 val)
+{
+	fakeTBStartTicks = val;
+}
+
+}  // namespace
+
diff --git a/Source/Core/Core/Src/CoreTiming.h b/Source/Core/Core/CoreTiming.h
similarity index 83%
rename from Source/Core/Core/Src/CoreTiming.h
rename to Source/Core/Core/CoreTiming.h
index bbb35f33b2..69d92871ae 100644
--- a/Source/Core/Core/Src/CoreTiming.h
+++ b/Source/Core/Core/CoreTiming.h
@@ -1,9 +1,8 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _CORETIMING_H
-#define _CORETIMING_H
+#pragma once
 
 // This is a system to schedule events into the emulated machine's future. Time is measured
 // in main CPU clock cycles.
@@ -18,15 +17,18 @@
 // inside callback:
 //   ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
 
-#include "Common.h"
-
 #include <string>
+#include "Common/CommonTypes.h"
 
-#include "ChunkFile.h"
+class PointerWrap;
 
 namespace CoreTiming
 {
 
+extern s64 globalTimer;
+extern u64 fakeTBStartValue;
+extern u64 fakeTBStartTicks;
+
 void Init();
 void Shutdown();
 
@@ -38,18 +40,17 @@ u64 GetIdleTicks();
 void DoState(PointerWrap &p);
 
 // Returns the event_type identifier. if name is not unique, an existing event_type will be discarded.
-int RegisterEvent(const char *name, TimedCallback callback);
+int RegisterEvent(const std::string& name, TimedCallback callback);
 void UnregisterAllEvents();
 
-// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from disk,
-// when we implement state saves.
-void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata=0);
-void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata=0);
-void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata=0);
+// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from savestates.
+void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata = 0);
+void ScheduleEvent_Immediate(int event_type, u64 userdata = 0);
+void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata = 0);
+void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata = 0);
 
 // We only permit one event of each type in the queue at a time.
 void RemoveEvent(int event_type);
-void RemoveThreadsafeEvent(int event_type);
 void RemoveAllEvents(int event_type);
 bool IsScheduled(int event_type);
 void Advance();
@@ -81,9 +82,6 @@ void SetFakeTBStartTicks(u64 val);
 
 void ForceExceptionCheck(int cycles);
 
-extern int downcount;
 extern int slicelength;
 
-}; // end of namespace
-
-#endif
+} // end of namespace
diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp
new file mode 100644
index 0000000000..d7be9d61f4
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAccelerator.cpp
@@ -0,0 +1,172 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+#include "Core/DSP/DSPAccelerator.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+// The hardware adpcm decoder :)
+static s16 ADPCM_Step(u32& _rSamplePos)
+{
+	const s16 *pCoefTable = (const s16 *)&g_dsp.ifx_regs[DSP_COEF_A1_0];
+
+	if ((_rSamplePos & 15) == 0)
+	{
+		g_dsp.ifx_regs[DSP_PRED_SCALE] = DSPHost::ReadHostMemory((_rSamplePos & ~15) >> 1);
+		_rSamplePos += 2;
+	}
+
+	int scale = 1 << (g_dsp.ifx_regs[DSP_PRED_SCALE] & 0xF);
+	int coef_idx = (g_dsp.ifx_regs[DSP_PRED_SCALE] >> 4) & 0x7;
+
+	s32 coef1 = pCoefTable[coef_idx * 2 + 0];
+	s32 coef2 = pCoefTable[coef_idx * 2 + 1];
+
+	int temp = (_rSamplePos & 1) ?
+	       (DSPHost::ReadHostMemory(_rSamplePos >> 1) & 0xF) :
+	       (DSPHost::ReadHostMemory(_rSamplePos >> 1) >> 4);
+
+	if (temp >= 8)
+		temp -= 16;
+
+	// 0x400 = 0.5  in 11-bit fixed point
+	int val = (scale * temp) + ((0x400 + coef1 * (s16)g_dsp.ifx_regs[DSP_YN1] + coef2 * (s16)g_dsp.ifx_regs[DSP_YN2]) >> 11);
+
+	MathUtil::Clamp(&val, -0x7FFF, 0x7FFF);
+
+	g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
+	g_dsp.ifx_regs[DSP_YN1] = val;
+
+	_rSamplePos++;
+
+	// The advanced interpolation (linear, polyphase,...) is done by the ucode,
+	// so we don't need to bother with it here.
+	return val;
+}
+
+u16 dsp_read_aram_d3()
+{
+	// Zelda ucode reads ARAM through 0xffd3.
+	const u32 EndAddress = (g_dsp.ifx_regs[DSP_ACEAH] << 16) | g_dsp.ifx_regs[DSP_ACEAL];
+	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
+	u16 val = 0;
+
+	switch (g_dsp.ifx_regs[DSP_FORMAT])
+	{
+		case 0x5:   // u8 reads
+			val = DSPHost::ReadHostMemory(Address);
+			Address++;
+			break;
+		case 0x6:   // u16 reads
+			val = (DSPHost::ReadHostMemory(Address * 2) << 8) | DSPHost::ReadHostMemory(Address * 2 + 1);
+			Address++;
+			break;
+		default:
+			ERROR_LOG(DSPLLE, "dsp_read_aram_d3() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
+			break;
+	}
+
+	if (Address >= EndAddress)
+	{
+		// Set address back to start address. (never seen this here!)
+		Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
+	}
+
+	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
+	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
+	return val;
+}
+
+void dsp_write_aram_d3(u16 value)
+{
+	// Zelda ucode writes a bunch of zeros to ARAM through d3 during
+	// initialization.  Don't know if it ever does it later, too.
+	// Pikmin 2 Wii writes non-stop to 0x10008000-0x1000801f (non-zero values too)
+	// Zelda TP Wii writes non-stop to 0x10000000-0x1000001f (non-zero values too)
+	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
+
+	switch (g_dsp.ifx_regs[DSP_FORMAT])
+	{
+		case 0xA:   // u16 writes
+			DSPHost::WriteHostMemory(value >> 8, Address * 2);
+			DSPHost::WriteHostMemory(value & 0xFF, Address * 2 + 1);
+			Address++;
+			break;
+		default:
+			ERROR_LOG(DSPLLE, "dsp_write_aram_d3() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
+			break;
+	}
+
+	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
+	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
+}
+
+u16 dsp_read_accelerator()
+{
+	const u32 EndAddress = (g_dsp.ifx_regs[DSP_ACEAH] << 16) | g_dsp.ifx_regs[DSP_ACEAL];
+	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
+	u16 val;
+	u8 step_size_bytes = 0;
+
+	// let's do the "hardware" decode DSP_FORMAT is interesting - the Zelda
+	// ucode seems to indicate that the bottom two bits specify the "read size"
+	// and the address multiplier.  The bits above that may be things like sign
+	// extension and do/do not use ADPCM.  It also remains to be figured out
+	// whether there's a difference between the usual accelerator "read
+	// address" and 0xd3.
+	switch (g_dsp.ifx_regs[DSP_FORMAT])
+	{
+		case 0x00:  // ADPCM audio
+			if ((EndAddress & 15) == 0)
+				step_size_bytes = 1;
+			else
+				step_size_bytes = 2;
+			val = ADPCM_Step(Address);
+			break;
+		case 0x0A:  // 16-bit PCM audio
+			val = (DSPHost::ReadHostMemory(Address * 2) << 8) | DSPHost::ReadHostMemory(Address * 2 + 1);
+			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
+			g_dsp.ifx_regs[DSP_YN1] = val;
+			step_size_bytes = 2;
+			Address++;
+			break;
+		case 0x19:  // 8-bit PCM audio
+			val = DSPHost::ReadHostMemory(Address) << 8;
+			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
+			g_dsp.ifx_regs[DSP_YN1] = val;
+			step_size_bytes = 2;
+			Address++;
+			break;
+		default:
+			ERROR_LOG(DSPLLE, "dsp_read_accelerator() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
+			step_size_bytes = 2;
+			Address++;
+			val = 0;
+			break;
+	}
+
+	// TODO: Take GAIN into account
+	// adpcm = 0, pcm8 = 0x100, pcm16 = 0x800
+	// games using pcm8 : Phoenix Wright Ace Attorney (WiiWare), Megaman 9-10 (WiiWare)
+	// games using pcm16: GC Sega games, ...
+
+	// Check for loop.
+	// Somehow, YN1 and YN2 must be initialized with their "loop" values,
+	// so yeah, it seems likely that we should raise an exception to let
+	// the DSP program do that, at least if DSP_FORMAT == 0x0A.
+	if (Address == (EndAddress + step_size_bytes - 1))
+	{
+		// Set address back to start address.
+		Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
+		DSPCore_SetException(EXP_ACCOV);
+	}
+
+	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
+	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
+	return val;
+}
diff --git a/Source/Core/Core/DSP/DSPAccelerator.h b/Source/Core/Core/DSP/DSPAccelerator.h
new file mode 100644
index 0000000000..dcdee91d24
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAccelerator.h
@@ -0,0 +1,12 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+u16 dsp_read_accelerator();
+
+u16 dsp_read_aram_d3();
+void dsp_write_aram_d3(u16 value);
diff --git a/Source/Core/Core/DSP/DSPAnalyzer.cpp b/Source/Core/Core/DSP/DSPAnalyzer.cpp
new file mode 100644
index 0000000000..f57eb05601
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAnalyzer.cpp
@@ -0,0 +1,162 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <array>
+
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
+
+namespace DSPAnalyzer {
+
+// Holds data about all instructions in RAM.
+std::array<u8, ISPACE> code_flags;
+
+// Good candidates for idle skipping is mail wait loops. If we're time slicing
+// between the main CPU and the DSP, if the DSP runs into one of these, it might
+// as well give up its time slice immediately, after executing once.
+
+// Max signature length is 6. A 0 in a signature is ignored.
+#define NUM_IDLE_SIGS 8
+#define MAX_IDLE_SIG_SIZE 6
+
+// 0xFFFF means ignore.
+const u16 idle_skip_sigs[NUM_IDLE_SIGS][MAX_IDLE_SIG_SIZE + 1] =
+{
+	// From AX:
+	{ 0x26fc,         // LRS   $30, @DMBH
+	  0x02c0, 0x8000, // ANDCF $30, #0x8000
+	  0x029d, 0xFFFF, // JLZ 0x027a
+	  0, 0 },     // RET
+	{ 0x27fc,         // LRS   $31, @DMBH
+	  0x03c0, 0x8000, // ANDCF $31, #0x8000
+	  0x029d, 0xFFFF, // JLZ 0x027a
+	  0, 0 },     // RET
+	{ 0x26fe,         // LRS   $30, @CMBH
+	  0x02c0, 0x8000, // ANDCF $30, #0x8000
+	  0x029c, 0xFFFF, // JLNZ 0x0280
+	  0, 0 },     // RET
+	{ 0x27fe,         // LRS   $31, @CMBH
+	  0x03c0, 0x8000, // ANDCF $31, #0x8000
+	  0x029c, 0xFFFF, // JLNZ 0x0280
+	  0, 0 },     // RET
+	{ 0x26fc,         // LRS  $AC0.M, @DMBH
+	  0x02a0, 0x8000, // ANDF $AC0.M, #0x8000
+	  0x029c, 0xFFFF, // JLNZ 0x????
+	  0, 0 },
+	{ 0x27fc,         // LRS  $AC1.M, @DMBH
+	  0x03a0, 0x8000, // ANDF $AC1.M, #0x8000
+	  0x029c, 0xFFFF, // JLNZ 0x????
+	  0, 0 },
+	// From Zelda:
+	{ 0x00de, 0xFFFE, // LR    $AC0.M, @CMBH
+	  0x02c0, 0x8000, // ANDCF $AC0.M, #0x8000
+	  0x029c, 0xFFFF, // JLNZ 0x05cf
+	  0 },
+	// From Zelda - experimental
+	{ 0x00da, 0x0352, // LR     $AX0.H, @0x0352
+	  0x8600,         // TSTAXH $AX0.H
+	  0x0295, 0xFFFF, // JZ    0x????
+	  0, 0 }
+};
+
+static void Reset()
+{
+	code_flags.fill(0);
+}
+
+static void AnalyzeRange(int start_addr, int end_addr)
+{
+	// First we run an extremely simplified version of a disassembler to find
+	// where all instructions start.
+
+	// This may not be 100% accurate in case of jump tables!
+	// It could get desynced, which would be bad. We'll see if that's an issue.
+	u16 last_arithmetic = 0;
+	for (int addr = start_addr; addr < end_addr;)
+	{
+		UDSPInstruction inst = dsp_imem_read(addr);
+		const DSPOPCTemplate *opcode = GetOpTemplate(inst);
+		if (!opcode)
+		{
+			addr++;
+			continue;
+		}
+		code_flags[addr] |= CODE_START_OF_INST;
+		// Look for loops.
+		if ((inst & 0xffe0) == 0x0060 || (inst & 0xff00) == 0x1100)
+		{
+			// BLOOP, BLOOPI
+			u16 loop_end = dsp_imem_read(addr + 1);
+			code_flags[addr] |= CODE_LOOP_START;
+			code_flags[loop_end] |= CODE_LOOP_END;
+		}
+		else if ((inst & 0xffe0) == 0x0040 || (inst & 0xff00) == 0x1000)
+		{
+			// LOOP, LOOPI
+			code_flags[addr] |= CODE_LOOP_START;
+			code_flags[addr + 1] |= CODE_LOOP_END;
+		}
+
+		// Mark the last arithmetic/multiplier instruction before a branch.
+		// We must update the SR reg at these instructions
+		if (opcode->updates_sr)
+		{
+			last_arithmetic = addr;
+		}
+
+		if (opcode->branch && !opcode->uncond_branch)
+		{
+			code_flags[last_arithmetic] |= CODE_UPDATE_SR;
+		}
+
+		// If an instruction potentially raises exceptions, mark the following
+		// instruction as needing to check for exceptions
+		if (opcode->opcode == 0x00c0 ||
+			opcode->opcode == 0x1800 ||
+			opcode->opcode == 0x1880 ||
+			opcode->opcode == 0x1900 ||
+			opcode->opcode == 0x1980 ||
+			opcode->opcode == 0x2000 ||
+			opcode->extended
+			)
+		code_flags[addr + opcode->size] |= CODE_CHECK_INT;
+
+		addr += opcode->size;
+	}
+
+	// Next, we'll scan for potential idle skips.
+	for (int s = 0; s < NUM_IDLE_SIGS; s++)
+	{
+		for (int addr = start_addr; addr < end_addr; addr++)
+		{
+			bool found = false;
+			for (int i = 0; i < MAX_IDLE_SIG_SIZE + 1; i++)
+			{
+				if (idle_skip_sigs[s][i] == 0)
+					found = true;
+				if (idle_skip_sigs[s][i] == 0xFFFF)
+					continue;
+				if (idle_skip_sigs[s][i] != dsp_imem_read(addr + i))
+					break;
+			}
+			if (found)
+			{
+				INFO_LOG(DSPLLE, "Idle skip location found at %02x (sigNum:%d)", addr, s+1);
+				code_flags[addr] |= CODE_IDLE_SKIP;
+			}
+		}
+	}
+	INFO_LOG(DSPLLE, "Finished analysis.");
+}
+
+void Analyze()
+{
+	Reset();
+	AnalyzeRange(0x0000, 0x1000);  // IRAM
+	AnalyzeRange(0x8000, 0x9000);  // IROM
+}
+
+}  // namespace
diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h
new file mode 100644
index 0000000000..b55cccc21a
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAnalyzer.h
@@ -0,0 +1,41 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include "Common/CommonTypes.h"
+
+// Basic code analysis.
+namespace DSPAnalyzer
+{
+#define ISPACE 65536
+
+// Useful things to detect:
+// * Loop endpoints - so that we can avoid checking for loops every cycle.
+
+enum
+{
+	CODE_START_OF_INST = 1,
+	CODE_IDLE_SKIP     = 2,
+	CODE_LOOP_START    = 4,
+	CODE_LOOP_END      = 8,
+	CODE_UPDATE_SR     = 16,
+	CODE_CHECK_INT     = 32,
+};
+
+// Easy to query array covering the whole of instruction memory.
+// Just index by address.
+// This one will be helpful for debuggers and jits.
+extern std::array<u8, ISPACE> code_flags;
+
+// This one should be called every time IRAM changes - which is basically
+// every time that a new ucode gets uploaded, and never else. At that point,
+// we can do as much static analysis as we want - but we should always throw
+// all old analysis away. Luckily the entire address space is only 64K code
+// words and the actual code space 8K instructions in total, so we can do
+// some pretty expensive analysis if necessary.
+void Analyze();
+
+}  // namespace
diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp
new file mode 100644
index 0000000000..895d4bc579
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAssembler.cpp
@@ -0,0 +1,1015 @@
+// Copyright 2009 Dolphin Emulator Project
+// Copyright 2005 Duddie, wntrmute, Hermes
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#include "Core/DSP/DSPAssembler.h"
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPTables.h"
+
+static const char *err_string[] =
+{
+	"",
+	"Unknown Error",
+	"Unknown opcode",
+	"Not enough parameters",
+	"Too many parameters",
+	"Wrong parameter",
+	"Expected parameter of type 'string'",
+	"Expected parameter of type 'value'",
+	"Expected parameter of type 'register'",
+	"Expected parameter of type 'memory pointer'",
+	"Expected parameter of type 'immediate'",
+	"Incorrect binary value",
+	"Incorrect hexadecimal value",
+	"Incorrect decimal value",
+	"Label already exists",
+	"Label not defined",
+	"No matching brackets",
+	"This opcode cannot be extended",
+	"Given extending params for non extensible opcode",
+	"Wrong parameter: must be accumulator register",
+	"Wrong parameter: must be mid accumulator register",
+	"Invalid register",
+	"Number out of range"
+};
+
+DSPAssembler::DSPAssembler(const AssemblerSettings &settings) :
+	gdg_buffer(nullptr),
+	m_cur_addr(0),
+	m_cur_pass(0),
+	m_current_param(0),
+	settings_(settings)
+
+{
+}
+
+DSPAssembler::~DSPAssembler()
+{
+	if (gdg_buffer)
+		free(gdg_buffer);
+}
+
+bool DSPAssembler::Assemble(const std::string& text, std::vector<u16> &code, std::vector<int> *line_numbers)
+{
+	if (line_numbers)
+		line_numbers->clear();
+	const char *fname = "tmp.asm";
+	if (!File::WriteStringToFile(text, fname))
+		return false;
+	InitPass(1);
+	if (!AssembleFile(fname, 1))
+		return false;
+
+	// We now have the size of the output buffer
+	if (m_totalSize > 0)
+	{
+		gdg_buffer = (char *)malloc(m_totalSize * sizeof(u16) + 4);
+		if (!gdg_buffer)
+			return false;
+
+		memset(gdg_buffer, 0, m_totalSize * sizeof(u16));
+	} else
+		return false;
+
+	InitPass(2);
+	if (!AssembleFile(fname, 2))
+		return false;
+
+	code.resize(m_totalSize);
+	for (int i = 0; i < m_totalSize; i++)
+	{
+		code[i] = *(u16 *)(gdg_buffer + i * 2);
+	}
+
+	if (gdg_buffer)
+	{
+		free(gdg_buffer);
+		gdg_buffer = nullptr;
+	}
+
+	last_error_str = "(no errors)";
+	last_error = ERR_OK;
+
+	return true;
+}
+
+void DSPAssembler::ShowError(err_t err_code, const char *extra_info)
+{
+
+	if (!settings_.force)
+		failed = true;
+
+	char error_buffer[1024];
+	char *buf_ptr = error_buffer;
+	buf_ptr += sprintf(buf_ptr, "%i : %s ", code_line, cur_line.c_str());
+	if (!extra_info)
+		extra_info = "-";
+
+	if (m_current_param == 0)
+		buf_ptr += sprintf(buf_ptr, "ERROR: %s Line: %d : %s\n", err_string[err_code], code_line, extra_info);
+	else
+		buf_ptr += sprintf(buf_ptr, "ERROR: %s Line: %d Param: %d : %s\n",
+						   err_string[err_code], code_line, m_current_param, extra_info);
+	last_error_str = error_buffer;
+	last_error = err_code;
+}
+
+static char *skip_spaces(char *ptr)
+{
+	while (*ptr == ' ')
+		ptr++;
+	return ptr;
+}
+
+// Parse a standalone value - it can be a number in one of several formats or a label.
+s32 DSPAssembler::ParseValue(const char *str)
+{
+	bool negative = false;
+	s32 val = 0;
+	const char *ptr = str;
+
+	if (ptr[0] == '#')
+	{
+		ptr++;
+		negative = true;  // Wow! Double # (needed one to get in here) negates???
+	}
+	if (ptr[0] == '-')
+	{
+		ptr++;
+		negative = true;
+	}
+	if (ptr[0] == '0')
+	{
+		if (ptr[1] >= '0' && ptr[1] <= '9')
+		{
+			for (int i = 0; ptr[i] != 0; i++)
+			{
+				val *= 10;
+				if (ptr[i] >= '0' && ptr[i] <= '9')
+					val += ptr[i] - '0';
+				else
+					ShowError(ERR_INCORRECT_DEC, str);
+			}
+		}
+		else
+		{
+			switch (ptr[1])
+			{
+			case 'X': // hex
+				for (int i = 2 ; ptr[i] != 0 ; i++)
+				{
+					val <<= 4;
+					if (ptr[i] >= 'a' && ptr[i] <= 'f')
+						val += (ptr[i]-'a'+10);
+					else if (ptr[i] >= 'A' && ptr[i] <= 'F')
+						val += (ptr[i]-'A'+10);
+					else if (ptr[i] >= '0' && ptr[i] <= '9')
+						val += (ptr[i] - '0');
+					else
+						ShowError(ERR_INCORRECT_HEX, str);
+				}
+				break;
+			case '\'': // binary
+				for (int i = 2; ptr[i] != 0; i++)
+				{
+					val *=2;
+					if (ptr[i] >= '0' && ptr[i] <= '1')
+						val += ptr[i] - '0';
+					else
+						ShowError(ERR_INCORRECT_BIN, str);
+				}
+				break;
+			default:
+				// value is 0 or error
+				val = 0;
+				break;
+			}
+		}
+	}
+	else
+	{
+		// Symbol starts with a digit - it's a dec number.
+		if (ptr[0] >= '0' && ptr[0] <= '9')
+		{
+			for (int i = 0; ptr[i] != 0; i++)
+			{
+				val *= 10;
+				if (ptr[i] >= '0' && ptr[i] <= '9')
+					val += ptr[i] - '0';
+				else
+					ShowError(ERR_INCORRECT_DEC, str);
+			}
+		}
+		else  // Everything else is a label.
+		{
+			// Lookup label
+			u16 value;
+			if (labels.GetLabelValue(ptr, &value))
+				return value;
+			if (m_cur_pass == 2)
+				ShowError(ERR_UNKNOWN_LABEL, str);
+		}
+	}
+	if (negative)
+		return -val;
+	return val;
+}
+
+// This function splits the given src string into three parts:
+// - Text before the first opening ('(') parenthesis
+// - Text within the first and last opening ('(') and closing (')') parentheses.
+// - If text follows after these parentheses, then this is what is returned from the function.
+//
+// Note that the first opening parenthesis and the last closing parenthesis are discarded from the string.
+// For example: Say "Test (string) 1234" is the string passed in as src.
+//
+// - src will become "Test "
+// - dst will become "string"
+// - Returned string from the function will be " 1234"
+//
+char *DSPAssembler::FindBrackets(char *src, char *dst)
+{
+	s32 len = (s32) strlen(src);
+	s32 first = -1;
+	s32 count = 0;
+	s32 i, j;
+	j = 0;
+	for (i = 0 ; i < len ; i++)
+	{
+		if (src[i] == '(')
+		{
+			if (first < 0)
+			{
+				count = 1;
+				src[i] = 0x0;
+				first = i;
+			}
+			else
+			{
+				count++;
+				dst[j++] = src[i];
+			}
+		}
+		else if (src[i] == ')')
+		{
+			if (--count == 0)
+			{
+				dst[j] = 0;
+				return &src[i+1];
+			}
+			else
+			{
+				dst[j++] = src[i];
+			}
+		}
+		else
+		{
+			if (first >= 0)
+				dst[j++] = src[i];
+		}
+	}
+	if (count)
+		ShowError(ERR_NO_MATCHING_BRACKETS);
+	return nullptr;
+}
+
+// Bizarre in-place expression evaluator.
+u32 DSPAssembler::ParseExpression(const char *ptr)
+{
+	char *pbuf;
+	s32 val = 0;
+
+	char *d_buffer = (char *)malloc(1024);
+	char *s_buffer = (char *)malloc(1024);
+	strcpy(s_buffer, ptr);
+
+	while ((pbuf = FindBrackets(s_buffer, d_buffer)) != nullptr)
+	{
+		val = ParseExpression(d_buffer);
+		sprintf(d_buffer, "%s%d%s", s_buffer, val, pbuf);
+		strcpy(s_buffer, d_buffer);
+	}
+
+	int j = 0;
+	for (int i = 0; i < ((s32)strlen(s_buffer) + 1) ; i++)
+	{
+		char c = s_buffer[i];
+		if (c != ' ')
+			d_buffer[j++] = c;
+	}
+
+	for (int i = 0; i < ((s32)strlen(d_buffer) + 1) ; i++)
+	{
+		char c = d_buffer[i];
+		if (c == '-')
+		{
+			if (i == 0)
+				c = '#';
+			else
+			{
+				switch (d_buffer[i - 1])
+				{
+				case '/':
+				case '%':
+				case '*':
+					c = '#';
+				}
+			}
+		}
+		d_buffer[i] = c;
+	}
+
+	while ((pbuf = strstr(d_buffer, "+")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) + ParseExpression(pbuf+1);
+		sprintf(d_buffer, "%d", val);
+	}
+
+	while ((pbuf = strstr(d_buffer, "-")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) - ParseExpression(pbuf+1);
+		if (val < 0)
+		{
+			val = 0x10000 + (val & 0xffff); // ATTENTION: avoid a terrible bug!!! number cannot write with '-' in sprintf
+			fprintf(stderr, "WARNING: Number Underflow at Line: %d \n", code_line);
+		}
+		sprintf(d_buffer, "%d", val);
+	}
+
+	while ((pbuf = strstr(d_buffer, "*")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) * ParseExpression(pbuf+1);
+		sprintf(d_buffer, "%d", val);
+	}
+
+	while ((pbuf = strstr(d_buffer, "/")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) / ParseExpression(pbuf+1);
+		sprintf(d_buffer, "%d", val);
+	}
+
+	while ((pbuf = strstr(d_buffer, "|")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) | ParseExpression(pbuf+1);
+		sprintf(d_buffer, "%d", val);
+	}
+
+	while ((pbuf = strstr(d_buffer, "&")) != nullptr)
+	{
+		*pbuf = 0x0;
+		val = ParseExpression(d_buffer) & ParseExpression(pbuf+1);
+		sprintf(d_buffer, "%d", val);
+	}
+
+	val = ParseValue(d_buffer);
+	free(d_buffer);
+	free(s_buffer);
+	return val;
+}
+
+// Destroys parstr
+u32 DSPAssembler::GetParams(char *parstr, param_t *par)
+{
+	u32 count = 0;
+	char *tmpstr = skip_spaces(parstr);
+	tmpstr = strtok(tmpstr, ",\x00");
+	for (int i = 0; i < 10; i++)
+	{
+		if (tmpstr == nullptr)
+			break;
+		tmpstr = skip_spaces(tmpstr);
+		if (strlen(tmpstr) == 0)
+			break;
+		if (tmpstr)
+			count++;
+		else
+			break;
+
+		par[i].type = P_NONE;
+		switch (tmpstr[0])
+		{
+		case '"':
+			par[i].str = strtok(tmpstr, "\"");
+			par[i].type = P_STR;
+			break;
+		case '#':
+			par[i].val = ParseExpression(tmpstr + 1);
+			par[i].type = P_IMM;
+			break;
+		case '@':
+			if (tmpstr[1] == '$')
+			{
+				par[i].val = ParseExpression(tmpstr + 2);
+				par[i].type = P_PRG;
+			}
+			else
+			{
+				par[i].val = ParseExpression(tmpstr + 1);
+				par[i].type = P_MEM;
+			}
+			break;
+		case '$':
+			par[i].val = ParseExpression(tmpstr + 1);
+			par[i].type = P_REG;
+			break;
+
+		default:
+			par[i].val = ParseExpression(tmpstr);
+			par[i].type = P_VAL;
+			break;
+		}
+		tmpstr = strtok(nullptr, ",\x00");
+	}
+	return count;
+}
+
+const opc_t *DSPAssembler::FindOpcode(const char *opcode, u32 par_count, const opc_t * const opcod, int opcod_size)
+{
+	if (opcode[0] == 'C' && opcode[1] == 'W')
+		return &cw;
+
+	AliasMap::const_iterator alias_iter = aliases.find(opcode);
+	if (alias_iter != aliases.end())
+		opcode = alias_iter->second.c_str();
+	for (int i = 0; i < opcod_size; i++)
+	{
+		const opc_t *opc = &opcod[i];
+		if (strcmp(opc->name, opcode) == 0)
+		{
+			if (par_count < opc->param_count)
+			{
+				ShowError(ERR_NOT_ENOUGH_PARAMETERS);
+			}
+			if (par_count > opc->param_count)
+			{
+				ShowError(ERR_TOO_MANY_PARAMETERS);
+			}
+			return opc;
+		}
+	}
+	ShowError(ERR_UNKNOWN_OPCODE);
+	return nullptr;
+}
+
+// weird...
+static u16 get_mask_shifted_down(u16 mask)
+{
+	while (!(mask & 1))
+		mask >>= 1;
+	return mask;
+}
+
+bool DSPAssembler::VerifyParams(const opc_t *opc, param_t *par, int count, bool ext)
+{
+	for (int i = 0; i < count; i++)
+	{
+		const int current_param = i + 1;  // just for display.
+		if (opc->params[i].type != par[i].type || (par[i].type & P_REG))
+		{
+			if (par[i].type == P_VAL &&
+				(opc->params[i].type == P_ADDR_I || opc->params[i].type == P_ADDR_D))
+			{
+				// Data and instruction addresses are valid as VAL values.
+				continue;
+			}
+
+			if ((opc->params[i].type & P_REG) && (par[i].type & P_REG))
+			{
+				// Just a temp. Should be replaced with more purposeful vars.
+				int value;
+
+				// modified by Hermes: test the register range
+				switch ((unsigned)opc->params[i].type)
+				{
+				case P_REG18:
+				case P_REG19:
+				case P_REG1A:
+					value = (opc->params[i].type >> 8) & 31;
+					if ((int)par[i].val < value ||
+						(int)par[i].val > value + get_mask_shifted_down(opc->params[i].mask))
+					{
+						if (ext)
+							fprintf(stderr, "(ext) ");
+
+						fprintf(stderr, "%s   (param %i)", cur_line.c_str(), current_param);
+						ShowError(ERR_INVALID_REGISTER);
+					}
+					break;
+				case P_PRG:
+					if ((int)par[i].val < 0 || (int)par[i].val > 0x3)
+					{
+						if (ext)
+							fprintf(stderr, "(ext) ");
+
+						fprintf(stderr, "%s   (param %i)", cur_line.c_str(), current_param);
+						ShowError(ERR_INVALID_REGISTER);
+					}
+					break;
+				case P_ACC:
+					if ((int)par[i].val < 0x20 || (int)par[i].val > 0x21)
+					{
+						if (ext)
+							fprintf(stderr, "(ext) ");
+
+						if (par[i].val >= 0x1e && par[i].val <= 0x1f)
+						{
+							fprintf(stderr, "%i : %s ", code_line, cur_line.c_str());
+							fprintf(stderr, "WARNING: $ACM%d register used instead of $ACC%d register Line: %d Param: %d Ext: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param, ext);
+						}
+						else if (par[i].val >= 0x1c && par[i].val <= 0x1d)
+						{
+							fprintf(stderr, "WARNING: $ACL%d register used instead of $ACC%d register Line: %d Param: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
+						}
+						else
+						{
+							ShowError(ERR_WRONG_PARAMETER_ACC);
+						}
+					}
+					break;
+				case P_ACCM:
+					if ((int)par[i].val < 0x1e || (int)par[i].val > 0x1f)
+					{
+						if (ext)
+							fprintf(stderr, "(ext) ");
+
+						if (par[i].val >= 0x1c && par[i].val <= 0x1d)
+						{
+							fprintf(stderr, "WARNING: $ACL%d register used instead of $ACM%d register Line: %d Param: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
+						}
+						else if (par[i].val >= 0x20 && par[i].val <= 0x21)
+						{
+							fprintf(stderr, "WARNING: $ACC%d register used instead of $ACM%d register Line: %d Param: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
+						}
+						else
+						{
+							ShowError(ERR_WRONG_PARAMETER_ACC);
+						}
+					}
+					break;
+
+				case P_ACCL:
+					if ((int)par[i].val < 0x1c || (int)par[i].val > 0x1d)
+					{
+						if (ext)
+							fprintf(stderr, "(ext) ");
+
+						if (par[i].val >= 0x1e && par[i].val <= 0x1f)
+						{
+							fprintf(stderr, "%s ", cur_line.c_str());
+							fprintf(stderr, "WARNING: $ACM%d register used instead of $ACL%d register Line: %d Param: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
+						}
+						else if (par[i].val >= 0x20 && par[i].val <= 0x21)
+						{
+							fprintf(stderr, "%s ", cur_line.c_str());
+							fprintf(stderr, "WARNING: $ACC%d register used instead of $ACL%d register Line: %d Param: %d\n",
+								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
+						}
+						else
+						{
+							ShowError(ERR_WRONG_PARAMETER_ACC);
+						}
+					}
+					break;
+/*				case P_ACCM_D: //P_ACC_MID:
+					if ((int)par[i].val < 0x1e || (int)par[i].val > 0x1f)
+					{
+						ShowError(ERR_WRONG_PARAMETER_MID_ACC);
+					}
+					break;*/
+				}
+				continue;
+			}
+
+			switch (par[i].type & (P_REG | 7))
+			{
+			case P_REG:
+				if (ext) fprintf(stderr, "(ext) ");
+				ShowError(ERR_EXPECTED_PARAM_REG);
+				break;
+			case P_MEM:
+				if (ext) fprintf(stderr, "(ext) ");
+				ShowError(ERR_EXPECTED_PARAM_MEM);
+				break;
+			case P_VAL:
+				if (ext) fprintf(stderr, "(ext) ");
+				ShowError(ERR_EXPECTED_PARAM_VAL);
+				break;
+			case P_IMM:
+				if (ext) fprintf(stderr, "(ext) ");
+				ShowError(ERR_EXPECTED_PARAM_IMM);
+				break;
+			}
+			ShowError(ERR_WRONG_PARAMETER);
+			break;
+		}
+		else if ((opc->params[i].type & 3) != 0 && (par[i].type & 3) != 0)
+		{
+			// modified by Hermes: test NUMBER range
+			int value = get_mask_shifted_down(opc->params[i].mask);
+			unsigned int valueu = 0xffff & ~(value >> 1);
+			if ((int)par[i].val < 0)
+			{
+				if (value == 7) // value 7 por sbclr/sbset
+				{
+					fprintf(stderr,"Value must be from 0x0 to 0x%x\n", value);
+					ShowError(ERR_OUT_RANGE_NUMBER);
+				}
+				else if (opc->params[i].type == P_MEM)
+				{
+					if (value < 256)
+						fprintf(stderr, "Address value must be from 0x%x to 0x%x\n",valueu, (value>>1));
+					else
+						fprintf(stderr, "Address value must be from 0x0 to 0x%x\n", value);
+
+					ShowError(ERR_OUT_RANGE_NUMBER);
+				}
+				else if ((int)par[i].val < -((value >> 1) + 1))
+				{
+					if (value < 128)
+						fprintf(stderr, "Value must be from -0x%x to 0x%x, is %i\n",
+						        (value >> 1) + 1, value >> 1, par[i].val);
+					else
+						fprintf(stderr, "Value must be from -0x%x to 0x%x or 0x0 to 0x%x, is %i\n",
+						        (value >> 1) + 1, value >> 1, value, par[i].val);
+
+					ShowError(ERR_OUT_RANGE_NUMBER);
+				}
+			}
+			else
+			{
+				if (value == 7) // value 7 por sbclr/sbset
+				{
+					if (par[i].val > (unsigned)value)
+					{
+						fprintf(stderr,"Value must be from 0x%x to 0x%x, is %i\n",valueu, value, par[i].val);
+						ShowError(ERR_OUT_RANGE_NUMBER);
+					}
+				}
+				else if (opc->params[i].type == P_MEM)
+				{
+					if (value < 256)
+						value >>= 1; // addressing 8 bit with sign
+					if (par[i].val > (unsigned)value &&
+						(par[i].val < valueu || par[i].val > (unsigned)0xffff))
+					{
+						if (value < 256)
+							fprintf(stderr,"Address value must be from 0x%x to 0x%x, is %04x\n", valueu, value, par[i].val);
+						else
+							fprintf(stderr,"Address value must be minor of 0x%x\n", value+1);
+						ShowError(ERR_OUT_RANGE_NUMBER);
+					}
+				}
+				else
+				{
+					if (value < 128)
+						value >>= 1; // special case ASL/ASR/LSL/LSR
+					if (par[i].val > (unsigned)value)
+					{
+						if (value < 64)
+							fprintf(stderr,"Value must be from -0x%x to 0x%x, is %i\n", (value + 1), value, par[i].val);
+						else
+							fprintf(stderr,"Value must be minor of 0x%x, is %i\n", value + 1, par[i].val);
+						ShowError(ERR_OUT_RANGE_NUMBER);
+					}
+				}
+			}
+			continue;
+		}
+	}
+	m_current_param = 0;
+	return true;
+}
+
+
+// Merge opcode with params.
+void DSPAssembler::BuildCode(const opc_t *opc, param_t *par, u32 par_count, u16 *outbuf)
+{
+	outbuf[m_cur_addr] |= opc->opcode;
+	for (u32 i = 0; i < par_count; i++)
+	{
+		// Ignore the "reverse" parameters since they are implicit.
+		if (opc->params[i].type != P_ACC_D && opc->params[i].type != P_ACCM_D)
+		{
+			u16 t16 = outbuf[m_cur_addr + opc->params[i].loc];
+			u16 v16 = par[i].val;
+			if (opc->params[i].lshift > 0)
+				v16 <<= opc->params[i].lshift;
+			else
+				v16 >>= -opc->params[i].lshift;
+			v16 &= opc->params[i].mask;
+			outbuf[m_cur_addr + opc->params[i].loc] = t16 | v16;
+		}
+	}
+}
+
+void DSPAssembler::InitPass(int pass)
+{
+	failed = false;
+	if (pass == 1)
+	{
+		// Reset label table. Pre-populate with hw addresses and registers.
+		labels.Clear();
+		labels.RegisterDefaults();
+		aliases.clear();
+		aliases["S15"] = "SET15";
+		aliases["S16"] = "SET16";
+		aliases["S40"] = "SET40";
+	}
+	m_cur_addr = 0;
+	m_totalSize = 0;
+	cur_segment = SEGMENT_CODE;
+	segment_addr[SEGMENT_CODE] = 0;
+	segment_addr[SEGMENT_DATA] = 0;
+	segment_addr[SEGMENT_OVERLAY] = 0;
+}
+
+bool DSPAssembler::AssembleFile(const char *fname, int pass)
+{
+	int disable_text = 0; // modified by Hermes
+
+	std::ifstream fsrc;
+	OpenFStream(fsrc, fname, std::ios_base::in);
+
+	if (fsrc.fail())
+	{
+		std::cerr << "Cannot open file " << fname << std::endl;
+		return false;
+	}
+
+	//printf("%s: Pass %d\n", fname, pass);
+	code_line = 0;
+	m_cur_pass = pass;
+
+#define LINEBUF_SIZE 1024
+	char line[LINEBUF_SIZE] = {0};
+	while (!failed && !fsrc.fail() && !fsrc.eof())
+	{
+		int opcode_size = 0;
+		fsrc.getline(line, LINEBUF_SIZE);
+		if (fsrc.fail())
+			break;
+
+		cur_line = line;
+		//printf("A: %s\n", line);
+		code_line++;
+
+		param_t params[10] = {{0, P_NONE, nullptr}};
+		param_t params_ext[10] = {{0, P_NONE, nullptr}};
+
+		bool upper = true;
+		for (int i = 0; i < LINEBUF_SIZE; i++)
+		{
+			char c = line[i];
+			// This stuff handles /**/ and // comments.
+			// modified by Hermes : added // and /* */ for long commentaries
+			if (c == '/')
+			{
+				if (i < 1023)
+				{
+					if (line[i+1] == '/')
+						c = 0x00;
+					else if (line[i+1] == '*')
+					{
+						// toggle comment mode.
+						disable_text = !disable_text;
+					}
+				}
+			}
+			else if (c == '*')
+			{
+				if (i < 1023 && line[i+1] == '/' && disable_text)
+				{
+					disable_text = 0;
+					c = 32;
+					line[i + 1] = 32;
+				}
+			}
+
+			// turn text into spaces if disable_text is on (in a comment).
+			if (disable_text && ((unsigned char)c) > 32) c = 32;
+
+			if (c == 0x0a || c == 0x0d || c == ';')
+				c = 0x00;
+			if (c == 0x09) // tabs to spaces
+				c = ' ';
+			if (c == '"')
+				upper = !upper;
+			if (upper && c >= 'a' && c <= 'z') // convert to uppercase
+				c = c - 'a' + 'A';
+			line[i] = c;
+			if (c == 0)
+				break; // modified by Hermes
+		}
+		char *ptr = line;
+
+		std::string label;
+
+		size_t col_pos = std::string(line).find(":");
+		if (col_pos != std::string::npos)
+		{
+			bool valid = true;
+
+			for (int j = 0; j < (int)col_pos; j++)
+			{
+				if (j == 0)
+					if (!((ptr[j] >= 'A' && ptr[j] <= 'Z') || (ptr[j] == '_')))
+						valid = false;
+				if (!((ptr[j] >= '0' && ptr[j] <= '9') || (ptr[j] >= 'A' && ptr[j] <= 'Z') || (ptr[j] == '_')))
+					valid = false;
+			}
+			if (valid)
+			{
+				label = std::string(line).substr(0, col_pos);
+				ptr += col_pos + 1;
+			}
+		}
+
+		char* opcode = strtok(ptr, " ");
+		char* opcode_ext = nullptr;
+
+		u32 params_count = 0;
+		u32 params_count_ext = 0;
+		if (opcode)
+		{
+			if ((opcode_ext = strstr(opcode, "'")) != nullptr)
+			{
+				opcode_ext[0] = '\0';
+				opcode_ext++;
+				if (strlen(opcode_ext) == 0)
+					opcode_ext = nullptr;
+			}
+			// now we have opcode and label
+
+			params_count = 0;
+			params_count_ext = 0;
+
+			char *paramstr = strtok(nullptr, "\0");
+			char *paramstr_ext = nullptr;
+			// there is valid opcode so probably we have parameters
+
+			if (paramstr)
+			{
+				if ((paramstr_ext = strstr(paramstr, ":")) != nullptr)
+				{
+					paramstr_ext[0] = '\0';
+					paramstr_ext++;
+				}
+			}
+
+			if (paramstr)
+				params_count = GetParams(paramstr, params);
+			if (paramstr_ext)
+				params_count_ext = GetParams(paramstr_ext, params_ext);
+		}
+
+		if (!label.empty())
+		{
+			// there is a valid label so lets store it in labels table
+			u32 lval = m_cur_addr;
+			if (opcode)
+			{
+				if (strcmp(opcode, "EQU") == 0)
+				{
+					lval = params[0].val;
+					opcode = nullptr;
+				}
+			}
+			if (pass == 1)
+				labels.RegisterLabel(label, lval);
+		}
+
+		if (opcode == nullptr)
+			continue;
+
+		// check if opcode is reserved compiler word
+		if (strcmp("INCLUDE", opcode) == 0)
+		{
+			if (params[0].type == P_STR)
+			{
+				char *tmpstr;
+				u32 thisCodeline = code_line;
+
+				if (include_dir.size())
+				{
+					tmpstr = (char *)malloc(include_dir.size() + strlen(params[0].str) + 2);
+					sprintf(tmpstr, "%s/%s", include_dir.c_str(), params[0].str);
+				}
+				else
+				{
+					tmpstr = (char *)malloc(strlen(params[0].str) + 1);
+					strcpy(tmpstr, params[0].str);
+				}
+
+				AssembleFile(tmpstr, pass);
+
+				code_line = thisCodeline;
+
+				free(tmpstr);
+			}
+			else
+				ShowError(ERR_EXPECTED_PARAM_STR);
+			continue;
+		}
+
+		if (strcmp("INCDIR", opcode) == 0)
+		{
+			if (params[0].type == P_STR)
+				include_dir = params[0].str;
+			else
+				ShowError(ERR_EXPECTED_PARAM_STR);
+			continue;
+		}
+
+		if (strcmp("ORG", opcode) == 0)
+		{
+			if (params[0].type == P_VAL)
+				m_cur_addr = params[0].val;
+			else
+				ShowError(ERR_EXPECTED_PARAM_VAL);
+			continue;
+		}
+
+		if (strcmp("SEGMENT", opcode) == 0)
+		{
+			if (params[0].type == P_STR)
+			{
+				segment_addr[cur_segment] = m_cur_addr;
+				if (strcmp("DATA", params[0].str) == 0)
+					cur_segment = SEGMENT_DATA;
+				if (strcmp("CODE", params[0].str) == 0)
+					cur_segment = SEGMENT_CODE;
+				m_cur_addr = segment_addr[cur_segment];
+			}
+			else
+				ShowError(ERR_EXPECTED_PARAM_STR);
+			continue;
+		}
+
+		const opc_t *opc = FindOpcode(opcode, params_count, opcodes, opcodes_size);
+		if (!opc)
+			opc = &cw;
+
+		opcode_size = opc->size;
+
+		VerifyParams(opc, params, params_count);
+
+		const opc_t *opc_ext = nullptr;
+		// Check for opcode extensions.
+		if (opc->extended)
+		{
+			if (opcode_ext)
+			{
+				opc_ext = FindOpcode(opcode_ext, params_count_ext, opcodes_ext, opcodes_ext_size);
+				VerifyParams(opc_ext, params_ext, params_count_ext, true);
+			}
+			else if (params_count_ext)
+				ShowError(ERR_EXT_PAR_NOT_EXT);
+		}
+		else
+		{
+			if (opcode_ext)
+				ShowError(ERR_EXT_CANT_EXTEND_OPCODE);
+			if (params_count_ext)
+				ShowError(ERR_EXT_PAR_NOT_EXT);
+		}
+
+		if (pass == 2)
+		{
+			// generate binary
+			((u16 *)gdg_buffer)[m_cur_addr] = 0x0000;
+			BuildCode(opc, params, params_count, (u16 *)gdg_buffer);
+			if (opc_ext)
+				BuildCode(opc_ext, params_ext, params_count_ext, (u16 *)gdg_buffer);
+		}
+
+		m_cur_addr += opcode_size;
+		m_totalSize += opcode_size;
+	};
+
+	if (!failed)
+		fsrc.close();
+
+	return !failed;
+}
diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h
new file mode 100644
index 0000000000..ba1df0018b
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPAssembler.h
@@ -0,0 +1,118 @@
+// Copyright 2009 Dolphin Emulator Project
+// Copyright 2005 Duddie
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
+
+enum err_t
+{
+	ERR_OK = 0,
+	ERR_UNKNOWN,
+	ERR_UNKNOWN_OPCODE,
+	ERR_NOT_ENOUGH_PARAMETERS,
+	ERR_TOO_MANY_PARAMETERS,
+	ERR_WRONG_PARAMETER,
+	ERR_EXPECTED_PARAM_STR,
+	ERR_EXPECTED_PARAM_VAL,
+	ERR_EXPECTED_PARAM_REG,
+	ERR_EXPECTED_PARAM_MEM,
+	ERR_EXPECTED_PARAM_IMM,
+	ERR_INCORRECT_BIN,
+	ERR_INCORRECT_HEX,
+	ERR_INCORRECT_DEC,
+	ERR_LABEL_EXISTS,
+	ERR_UNKNOWN_LABEL,
+	ERR_NO_MATCHING_BRACKETS,
+	ERR_EXT_CANT_EXTEND_OPCODE,
+	ERR_EXT_PAR_NOT_EXT,
+	ERR_WRONG_PARAMETER_ACC,
+	ERR_WRONG_PARAMETER_MID_ACC,
+	ERR_INVALID_REGISTER,
+	ERR_OUT_RANGE_NUMBER
+};
+
+
+// Unless you want labels to carry over between files, you probably
+// want to create a new DSPAssembler for every file you assemble.
+class DSPAssembler
+{
+public:
+	DSPAssembler(const AssemblerSettings &settings);
+	~DSPAssembler();
+
+	// line_numbers is optional (and not yet implemented). It'll receieve a list of ints,
+	// one for each word of code, indicating the source assembler code line number it came from.
+
+	// If returns false, call GetErrorString to get some text to present to the user.
+	bool Assemble(const std::string& text, std::vector<u16> &code, std::vector<int> *line_numbers = nullptr);
+
+	std::string GetErrorString() const { return last_error_str; }
+	err_t GetError() const { return last_error; }
+
+private:
+	struct param_t
+	{
+		u32       val;
+		partype_t type;
+		char      *str;
+	};
+
+	enum segment_t
+	{
+		SEGMENT_CODE = 0,
+		SEGMENT_DATA,
+		SEGMENT_OVERLAY,
+		SEGMENT_MAX
+	};
+
+	// Utility functions
+	s32 ParseValue(const char *str);
+	u32 ParseExpression(const char *ptr);
+
+	u32 GetParams(char *parstr, param_t *par);
+
+	void InitPass(int pass);
+	bool AssembleFile(const char *fname, int pass);
+
+	void ShowError(err_t err_code, const char *extra_info = nullptr);
+	// void ShowWarning(err_t err_code, const char *extra_info = nullptr);
+
+	char *FindBrackets(char *src, char *dst);
+	const opc_t *FindOpcode(const char *opcode, u32 par_count, const opc_t * const opcod, int opcod_size);
+	bool VerifyParams(const opc_t *opc, param_t *par, int count, bool ext = false);
+	void BuildCode(const opc_t *opc, param_t *par, u32 par_count, u16 *outbuf);
+
+	char *gdg_buffer;
+
+	std::string include_dir;
+	std::string cur_line;
+
+	u32 m_cur_addr;
+	int m_totalSize;
+	u8  m_cur_pass;
+
+	LabelMap labels;
+
+	u32 code_line;
+	bool failed;
+	std::string last_error_str;
+	err_t last_error;
+
+	typedef std::map<std::string, std::string> AliasMap;
+	AliasMap aliases;
+
+	segment_t cur_segment;
+	u32 segment_addr[SEGMENT_MAX];
+	int m_current_param;
+	const AssemblerSettings settings_;
+};
diff --git a/Source/Core/Core/Src/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h
similarity index 78%
rename from Source/Core/Core/Src/DSP/DSPBreakpoints.h
rename to Source/Core/Core/DSP/DSPBreakpoints.h
index 96c116f5a1..ebaa0f53b3 100644
--- a/Source/Core/Core/Src/DSP/DSPBreakpoints.h
+++ b/Source/Core/Core/DSP/DSPBreakpoints.h
@@ -1,11 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _DSP_BREAKPOINTS
-#define _DSP_BREAKPOINTS
+#pragma once
 
-#include "Common.h"
+#include <cstring>
+#include "Common/CommonTypes.h"
 
 // super fast breakpoints for a limited range.
 // To be used interchangeably with the BreakPoints class.
@@ -16,7 +16,7 @@ public:
 	{
 		Clear();
 	}
-	
+
 	// is address breakpoint
 	bool IsAddressBreakPoint(u32 addr)
 	{
@@ -27,7 +27,7 @@ public:
 	bool Add(u32 addr, bool temp=false)
 	{
 		bool was_one = b[addr] != 0;
-		
+
 		if (!was_one)
 		{
 			b[addr] = temp ? 2 : 1;
@@ -49,8 +49,7 @@ public:
 
 	void Clear()
 	{
-		for (int i = 0; i < 65536; i++)
-			b[i] = 0;
+		memset(b, 0, sizeof(b));
 	}
 
 	void DeleteByAddress(u32 addr)
@@ -61,5 +60,3 @@ public:
 private:
 	u8 b[65536];
 };
-
-#endif
diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.cpp b/Source/Core/Core/DSP/DSPCaptureLogger.cpp
new file mode 100644
index 0000000000..f8a16b0bdb
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCaptureLogger.cpp
@@ -0,0 +1,79 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <memory>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/PcapFile.h"
+
+#include "Core/DSP/DSPCaptureLogger.h"
+
+// Definition of the packet structures stored in PCAP capture files.
+
+const u8 IFX_ACCESS_PACKET_MAGIC = 0;
+const u8 DMA_PACKET_MAGIC = 1;
+
+#pragma pack(push, 1)
+struct IFXAccessPacket
+{
+	u8 magic;    // IFX_ACCESS_PACKET_MAGIC
+	u8 is_read;  // 0 for writes, 1 for reads.
+	u16 address;
+	u16 value;
+};
+
+// Followed by the bytes of the DMA.
+struct DMAPacket
+{
+	u8 magic;         // DMA_PACKET_MAGIC
+	u16 dma_control;  // Value of the DMA control register.
+	u32 gc_address;   // Address in the GC RAM.
+	u16 dsp_address;  // Address in the DSP RAM.
+	u16 length;       // Length in bytes.
+};
+#pragma pack(pop)
+
+PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(const std::string& pcap_filename)
+	: m_pcap(new PCAP(new File::IOFile(pcap_filename, "wb")))
+{
+}
+
+PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(PCAP* pcap) : m_pcap(pcap)
+{
+}
+
+PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap)
+	: m_pcap(std::move(pcap))
+{
+}
+
+void PCAPDSPCaptureLogger::LogIFXAccess(bool read, u16 address, u16 value)
+{
+	IFXAccessPacket pkt;
+	pkt.magic = IFX_ACCESS_PACKET_MAGIC;
+	pkt.is_read = !!read;  // Make sure we actually have 0/1.
+	pkt.address = address;
+	pkt.value = value;
+
+	m_pcap->AddPacket(pkt);
+}
+
+void PCAPDSPCaptureLogger::LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+                                  u16 length, const u8* data)
+{
+	// The length of a DMA cannot be above 64K, so we use a static buffer for
+	// the construction of the packet.
+	static u8 buffer[0x10000];
+
+	DMAPacket* pkt = reinterpret_cast<DMAPacket*>(&buffer[0]);
+	pkt->magic = DMA_PACKET_MAGIC;
+	pkt->dma_control = control;
+	pkt->gc_address = gc_address;
+	pkt->dsp_address = dsp_address;
+	pkt->length = length;
+	memcpy(&buffer[sizeof (DMAPacket)], data, length);
+
+	m_pcap->AddPacket(buffer, sizeof (DMAPacket) + length);
+}
diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h
new file mode 100644
index 0000000000..e8e7d2ccc0
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCaptureLogger.h
@@ -0,0 +1,78 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "Common/Common.h"
+
+class PCAP;
+
+// An interface used to capture and log structured data about internal DSP
+// data transfers.
+//
+// Note: these calls are done within the DSP emulator in critical paths and at
+// a high frequency. Implementations must try and avoid blocking for too long.
+class DSPCaptureLogger
+{
+public:
+	virtual ~DSPCaptureLogger() {}
+
+	// Accesses (reads or writes) to memory mapped registers (external
+	// interface, also known as IFX). These are always 16 bits accesses.
+	virtual void LogIFXRead(u16 address, u16 read_value) = 0;
+	virtual void LogIFXWrite(u16 address, u16 written_value) = 0;
+
+	// DMAs to/from main memory from/to DSP memory. We let the interpretation
+	// of the "control" field to the layer that analyze the logs and do not
+	// perform our own interpretation of it. Thus there is only one call which
+	// is used for DRAM/IRAM in any direction (to/from DSP).
+	//
+	// Length is expressed in bytes, not DSP words.
+	virtual void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+	                    u16 length, const u8* data) = 0;
+};
+
+// A dummy implementation of a capture logger that does nothing. This is the
+// default implementation used by the DSP emulator.
+//
+// Can also be inherited from if you want to only override part of the methods.
+class DefaultDSPCaptureLogger : public DSPCaptureLogger
+{
+public:
+	virtual void LogIFXRead(u16 address, u16 read_value) override {}
+	virtual void LogIFXWrite(u16 address, u16 written_value) override {}
+	virtual void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+	                    u16 length, const u8* data) override {}
+};
+
+// A capture logger implementation that logs to PCAP files in a custom
+// packet-based format.
+class PCAPDSPCaptureLogger final : public DSPCaptureLogger, NonCopyable
+{
+public:
+	// Automatically creates a writeable file (truncate existing file).
+	PCAPDSPCaptureLogger(const std::string& pcap_filename);
+	// Takes ownership of pcap.
+	PCAPDSPCaptureLogger(PCAP* pcap);
+	PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap);
+
+	virtual void LogIFXRead(u16 address, u16 read_value) override
+	{
+		LogIFXAccess(true, address, read_value);
+	}
+	virtual void LogIFXWrite(u16 address, u16 written_value) override
+	{
+		LogIFXAccess(false, address, written_value);
+	}
+	virtual void LogDMA(u16 control, u32 gc_address, u16 dsp_address,
+	                    u16 length, const u8* data) override;
+
+private:
+	void LogIFXAccess(bool read, u16 address, u16 value);
+
+	std::unique_ptr<PCAP> m_pcap;
+};
diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp
new file mode 100644
index 0000000000..5803dab384
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp
@@ -0,0 +1,216 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/DSP/DSPAssembler.h"
+#include "Core/DSP/DSPCodeUtil.h"
+#include "Core/DSP/DSPDisassembler.h"
+
+bool Assemble(const std::string& text, std::vector<u16> &code, bool force)
+{
+	AssemblerSettings settings;
+	// settings.pc = 0;
+	// settings.decode_registers = false;
+	// settings.decode_names = false;
+	settings.force = force;
+	// settings.print_tabs = false;
+	// settings.ext_separator = '\'';
+
+	// TODO: fix the terrible api of the assembler.
+	DSPAssembler assembler(settings);
+	if (!assembler.Assemble(text, code))
+	{
+		std::cerr << assembler.GetErrorString() << std::endl;
+		return false;
+	}
+
+	return true;
+}
+
+bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text)
+{
+	if (code.empty())
+		return false;
+
+	AssemblerSettings settings;
+
+	// These two prevent roundtripping.
+	settings.show_hex = true;
+	settings.show_pc = line_numbers;
+	settings.ext_separator = '\'';
+	settings.decode_names = true;
+	settings.decode_registers = true;
+
+	DSPDisassembler disasm(settings);
+	bool success = disasm.Disassemble(0, code, 0x0000, text);
+	return success;
+}
+
+bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2)
+{
+	if (code1.size() != code2.size())
+		printf("Size difference! 1=%i 2=%i\n", (int)code1.size(), (int)code2.size());
+	u32 count_equal = 0;
+	const int min_size = std::min<int>((int)code1.size(), (int)code2.size());
+
+	AssemblerSettings settings;
+	DSPDisassembler disassembler(settings);
+	for (int i = 0; i < min_size; i++)
+	{
+		if (code1[i] == code2[i])
+		{
+			count_equal++;
+		}
+		else
+		{
+			std::string line1, line2;
+			u16 pc = i;
+			disassembler.DisassembleOpcode(&code1[0], 0x0000, 2, &pc, line1);
+			pc = i;
+			disassembler.DisassembleOpcode(&code2[0], 0x0000, 2, &pc, line2);
+			printf("!! %04x : %04x vs %04x - %s  vs  %s\n", i, code1[i], code2[i], line1.c_str(), line2.c_str());
+		}
+	}
+	if (code2.size() != code1.size())
+	{
+		printf("Extra code words:\n");
+		const std::vector<u16> &longest = code1.size() > code2.size() ? code1 : code2;
+		for (int i = min_size; i < (int)longest.size(); i++)
+		{
+			u16 pc = i;
+			std::string line;
+			disassembler.DisassembleOpcode(&longest[0], 0x0000, 2, &pc, line);
+			printf("!! %s\n", line.c_str());
+		}
+	}
+	printf("Equal instruction words: %i / %i\n", count_equal, min_size);
+	return code1.size() == code2.size() && code1.size() == count_equal;
+}
+
+void GenRandomCode(u32 size, std::vector<u16> &code)
+{
+	code.resize(size);
+	for (u32 i = 0; i < size; i++)
+	{
+		code[i] = rand() ^ (rand() << 8);
+	}
+}
+
+void CodeToHeader(const std::vector<u16> &code, std::string _filename,
+				  const char *name, std::string &header)
+{
+	std::vector<u16> code_padded = code;
+	// Pad with nops to 32byte boundary
+	while (code_padded.size() & 0x7f)
+		code_padded.push_back(0);
+	header.clear();
+	header.reserve(code_padded.size() * 4);
+	header.append("#define NUM_UCODES 1\n\n");
+	std::string filename;
+	SplitPath(_filename, nullptr, &filename, nullptr);
+	header.append(StringFromFormat("const char* UCODE_NAMES[NUM_UCODES] = {\"%s\"};\n\n", filename.c_str()));
+	header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n");
+
+	header.append("\t{\n\t\t");
+	for (u32 j = 0; j < code_padded.size(); j++)
+	{
+		if (j && ((j & 15) == 0))
+			header.append("\n\t\t");
+		header.append(StringFromFormat("0x%04x, ", code_padded[j]));
+	}
+	header.append("\n\t},\n");
+
+	header.append("};\n");
+}
+
+void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string>* filenames,
+				   u32 numCodes, const char *name, std::string &header)
+{
+	std::vector<std::vector<u16> > codes_padded;
+	u32 reserveSize = 0;
+	for (u32 i = 0; i < numCodes; i++)
+	{
+		codes_padded.push_back(codes[i]);
+		// Pad with nops to 32byte boundary
+		while (codes_padded.at(i).size() & 0x7f)
+			codes_padded.at(i).push_back(0);
+
+		reserveSize += (u32)codes_padded.at(i).size();
+	}
+	header.clear();
+	header.reserve(reserveSize * 4);
+	header.append(StringFromFormat("#define NUM_UCODES %u\n\n", numCodes));
+	header.append("const char* UCODE_NAMES[NUM_UCODES] = {\n");
+	for (u32 i = 0; i < numCodes; i++)
+	{
+		std::string filename;
+		if (! SplitPath(filenames->at(i), nullptr, &filename, nullptr))
+			filename = filenames->at(i);
+		header.append(StringFromFormat("\t\"%s\",\n", filename.c_str()));
+	}
+	header.append("};\n\n");
+	header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n");
+
+	for (u32 i = 0; i < numCodes; i++)
+	{
+		if (codes[i].size() == 0)
+			continue;
+
+		header.append("\t{\n\t\t");
+		for (u32 j = 0; j < codes_padded.at(i).size(); j++)
+		{
+			if (j && ((j & 15) == 0))
+				header.append("\n\t\t");
+			header.append(StringFromFormat("0x%04x, ", codes_padded.at(i).at(j)));
+		}
+		header.append("\n\t},\n");
+	}
+	header.append("};\n");
+}
+
+void CodeToBinaryStringBE(const std::vector<u16> &code, std::string &str)
+{
+	str.resize(code.size() * 2);
+	for (size_t i = 0; i < code.size(); i++)
+	{
+		str[i * 2 + 0] = code[i] >> 8;
+		str[i * 2 + 1] = code[i] & 0xff;
+	}
+}
+
+void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code)
+{
+	code.resize(str.size() / 2);
+	for (size_t i = 0; i < code.size(); i++)
+	{
+		code[i] = ((u16)(u8)str[i * 2 + 0] << 8) | ((u16)(u8)str[i * 2 + 1]);
+	}
+}
+
+bool LoadBinary(const std::string& filename, std::vector<u16> &code)
+{
+	std::string buffer;
+	if (!File::ReadFileToString(filename, buffer))
+		return false;
+
+	BinaryStringBEToCode(buffer, code);
+	return true;
+}
+
+bool SaveBinary(const std::vector<u16> &code, const std::string& filename)
+{
+	std::string buffer;
+	CodeToBinaryStringBE(code, buffer);
+	if (!File::WriteStringToFile(buffer, filename))
+		return false;
+	return true;
+}
diff --git a/Source/Core/Core/DSP/DSPCodeUtil.h b/Source/Core/Core/DSP/DSPCodeUtil.h
new file mode 100644
index 0000000000..4117f814f4
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCodeUtil.h
@@ -0,0 +1,27 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+bool Assemble(const std::string& text, std::vector<u16> &code, bool force = false);
+bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text);
+bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2);
+void GenRandomCode(u32 size, std::vector<u16> &code);
+void CodeToHeader(const std::vector<u16> &code, std::string _filename,
+				  const char *name, std::string &header);
+void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> *filenames,
+				   u32 numCodes, const char *name, std::string &header);
+
+// Big-endian, for writing straight to file using File::WriteStringToFile.
+void CodeToBinaryStringBE(const std::vector<u16> &code, std::string &str);
+void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code);
+
+// Load code (big endian binary).
+bool LoadBinary(const std::string& filename, std::vector<u16> &code);
+bool SaveBinary(const std::vector<u16> &code, const std::string& filename);
diff --git a/Source/Core/Core/DSP/DSPCommon.h b/Source/Core/Core/DSP/DSPCommon.h
new file mode 100644
index 0000000000..b60dd54da5
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCommon.h
@@ -0,0 +1,9 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+typedef u16 UDSPInstruction;
diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp
new file mode 100644
index 0000000000..54262ede66
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCore.cpp
@@ -0,0 +1,453 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/MemoryUtil.h"
+
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+
+SDSP g_dsp;
+DSPBreakpoints dsp_breakpoints;
+static DSPCoreState core_state = DSPCORE_STOP;
+u16 cyclesLeft = 0;
+bool init_hax = false;
+DSPEmitter *dspjit = nullptr;
+std::unique_ptr<DSPCaptureLogger> g_dsp_cap;
+static Common::Event step_event;
+
+// Returns false if the hash fails and the user hits "Yes"
+static bool VerifyRoms()
+{
+	struct DspRomHashes
+	{
+		u32 hash_irom; // dsp_rom.bin
+		u32 hash_drom; // dsp_coef.bin
+	} KNOWN_ROMS[] = {
+		// Official Nintendo ROM
+		{ 0x66f334fe, 0xf3b93527 },
+
+		// LM1234 replacement ROM (Zelda UCode only)
+		{ 0x9c8f593c, 0x10000001 },
+
+		// delroth's improvement on LM1234 replacement ROM (Zelda and AX only,
+		// IPL/Card/GBA still broken)
+		{ 0xd9907f71, 0xb019c2fb }
+	};
+
+	u32 hash_irom = HashAdler32((u8*)g_dsp.irom, DSP_IROM_BYTE_SIZE);
+	u32 hash_drom = HashAdler32((u8*)g_dsp.coef, DSP_COEF_BYTE_SIZE);
+	int rom_idx = -1;
+
+	for (u32 i = 0; i < sizeof (KNOWN_ROMS) / sizeof (KNOWN_ROMS[0]); ++i)
+	{
+		DspRomHashes& rom = KNOWN_ROMS[i];
+		if (hash_irom == rom.hash_irom && hash_drom == rom.hash_drom)
+			rom_idx = i;
+	}
+
+	if (rom_idx < 0)
+	{
+		if (AskYesNoT("Your DSP ROMs have incorrect hashes.\n"
+			"Would you like to stop now to fix the problem?\n"
+			"If you select \"No\", audio might be garbled."))
+			return false;
+	}
+
+	if (rom_idx == 1)
+	{
+		DSPHost::OSD_AddMessage("You are using an old free DSP ROM made by the Dolphin Team.", 6000);
+		DSPHost::OSD_AddMessage("Only games using the Zelda UCode will work correctly.", 6000);
+	}
+	else if (rom_idx == 2)
+	{
+		DSPHost::OSD_AddMessage("You are using a free DSP ROM made by the Dolphin Team.", 8000);
+		DSPHost::OSD_AddMessage("All Wii games will work correctly, and most GC games should ", 8000);
+		DSPHost::OSD_AddMessage("also work fine, but the GBA/IPL/CARD UCodes will not work.\n", 8000);
+	}
+
+	return true;
+}
+
+static void DSPCore_FreeMemoryPages()
+{
+	FreeMemoryPages(g_dsp.irom, DSP_IROM_BYTE_SIZE);
+	FreeMemoryPages(g_dsp.iram, DSP_IRAM_BYTE_SIZE);
+	FreeMemoryPages(g_dsp.dram, DSP_DRAM_BYTE_SIZE);
+	FreeMemoryPages(g_dsp.coef, DSP_COEF_BYTE_SIZE);
+	g_dsp.irom = g_dsp.iram = g_dsp.dram = g_dsp.coef = nullptr;
+}
+
+bool DSPCore_Init(const DSPInitOptions& opts)
+{
+	g_dsp.step_counter = 0;
+	cyclesLeft = 0;
+	init_hax = false;
+	dspjit = nullptr;
+
+	g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
+	g_dsp.iram = (u16*)AllocateMemoryPages(DSP_IRAM_BYTE_SIZE);
+	g_dsp.dram = (u16*)AllocateMemoryPages(DSP_DRAM_BYTE_SIZE);
+	g_dsp.coef = (u16*)AllocateMemoryPages(DSP_COEF_BYTE_SIZE);
+
+	memcpy(g_dsp.irom, opts.irom_contents.data(), DSP_IROM_BYTE_SIZE);
+	memcpy(g_dsp.coef, opts.coef_contents.data(), DSP_COEF_BYTE_SIZE);
+
+	// Try to load real ROM contents.
+	if (!VerifyRoms())
+	{
+		DSPCore_FreeMemoryPages();
+		return false;
+	}
+
+	memset(&g_dsp.r,0,sizeof(g_dsp.r));
+
+	for (int i = 0; i < 4; i++)
+	{
+		g_dsp.reg_stack_ptr[i] = 0;
+		for (int j = 0; j < DSP_STACK_DEPTH; j++)
+		{
+			g_dsp.reg_stack[i][j] = 0;
+		}
+	}
+
+	// Fill IRAM with HALT opcodes.
+	for (int i = 0; i < DSP_IRAM_SIZE; i++)
+	{
+		g_dsp.iram[i] = 0x0021; // HALT opcode
+	}
+
+	// Just zero out DRAM.
+	for (int i = 0; i < DSP_DRAM_SIZE; i++)
+	{
+		g_dsp.dram[i] = 0;
+	}
+
+	// Copied from a real console after the custom UCode has been loaded.
+	// These are the indexing wrapping registers.
+	g_dsp.r.wr[0] = 0xffff;
+	g_dsp.r.wr[1] = 0xffff;
+	g_dsp.r.wr[2] = 0xffff;
+	g_dsp.r.wr[3] = 0xffff;
+
+	g_dsp.r.sr |= SR_INT_ENABLE;
+	g_dsp.r.sr |= SR_EXT_INT_ENABLE;
+
+	g_dsp.cr = 0x804;
+	gdsp_ifx_init();
+	// Mostly keep IRAM write protected. We unprotect only when DMA-ing
+	// in new ucodes.
+	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+
+	// Initialize JIT, if necessary
+	if (opts.core_type == DSPInitOptions::CORE_JIT)
+		dspjit = new DSPEmitter();
+
+	g_dsp_cap.reset(opts.capture_logger);
+
+	core_state = DSPCORE_RUNNING;
+	return true;
+}
+
+void DSPCore_Shutdown()
+{
+	if (core_state == DSPCORE_STOP)
+		return;
+
+	core_state = DSPCORE_STOP;
+
+	if (dspjit)
+	{
+		delete dspjit;
+		dspjit = nullptr;
+	}
+
+	DSPCore_FreeMemoryPages();
+
+	g_dsp_cap.reset();
+}
+
+void DSPCore_Reset()
+{
+	g_dsp.pc = DSP_RESET_VECTOR;
+
+	g_dsp.r.wr[0] = 0xffff;
+	g_dsp.r.wr[1] = 0xffff;
+	g_dsp.r.wr[2] = 0xffff;
+	g_dsp.r.wr[3] = 0xffff;
+
+	DSPAnalyzer::Analyze();
+}
+
+void DSPCore_SetException(u8 level)
+{
+	g_dsp.exceptions |= 1 << level;
+}
+
+// Notify that an external interrupt is pending (used by thread mode)
+void DSPCore_SetExternalInterrupt(bool val)
+{
+	g_dsp.external_interrupt_waiting = val;
+}
+
+// Coming from the CPU
+void DSPCore_CheckExternalInterrupt()
+{
+	if (! dsp_SR_is_flag_set(SR_EXT_INT_ENABLE))
+		return;
+
+	// Signal the SPU about new mail
+	DSPCore_SetException(EXP_INT);
+
+	g_dsp.cr &= ~CR_EXTERNAL_INT;
+}
+
+
+void DSPCore_CheckExceptions()
+{
+	// Early out to skip the loop in the common case.
+	if (g_dsp.exceptions == 0)
+		return;
+
+	for (int i = 7; i > 0; i--)
+	{
+		// Seems exp int are not masked by sr_int_enable
+		if (g_dsp.exceptions & (1 << i))
+		{
+			if (dsp_SR_is_flag_set(SR_INT_ENABLE) || (i == EXP_INT))
+			{
+				// store pc and sr until RTI
+				dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
+				dsp_reg_store_stack(DSP_STACK_D, g_dsp.r.sr);
+
+				g_dsp.pc = i * 2;
+				g_dsp.exceptions &= ~(1 << i);
+				if (i == 7)
+					g_dsp.r.sr &= ~SR_EXT_INT_ENABLE;
+				else
+					g_dsp.r.sr &= ~SR_INT_ENABLE;
+				break;
+			}
+			else
+			{
+#if defined(_DEBUG) || defined(DEBUGFAST)
+				ERROR_LOG(DSPLLE, "Firing exception %d failed", i);
+#endif
+			}
+		}
+	}
+}
+
+// Delegate to JIT or interpreter as appropriate.
+// Handle state changes and stepping.
+int DSPCore_RunCycles(int cycles)
+{
+	if (dspjit)
+	{
+		if (g_dsp.external_interrupt_waiting)
+		{
+			DSPCore_CheckExternalInterrupt();
+			DSPCore_CheckExceptions();
+			DSPCore_SetExternalInterrupt(false);
+		}
+
+		cyclesLeft = cycles;
+		DSPCompiledCode pExecAddr = (DSPCompiledCode)dspjit->enterDispatcher;
+		pExecAddr();
+
+		if (g_dsp.reset_dspjit_codespace)
+			dspjit->ClearIRAMandDSPJITCodespaceReset();
+
+		return cyclesLeft;
+	}
+
+	while (cycles > 0)
+	{
+		switch (core_state)
+		{
+		case DSPCORE_RUNNING:
+			// Seems to slow things down
+#if defined(_DEBUG) || defined(DEBUGFAST)
+			cycles = DSPInterpreter::RunCyclesDebug(cycles);
+#else
+			cycles = DSPInterpreter::RunCycles(cycles);
+#endif
+			break;
+
+		case DSPCORE_STEPPING:
+			step_event.Wait();
+			if (core_state != DSPCORE_STEPPING)
+				continue;
+
+			DSPInterpreter::Step();
+			cycles--;
+
+			DSPHost::UpdateDebugger();
+			break;
+		case DSPCORE_STOP:
+			break;
+		}
+	}
+	return cycles;
+}
+
+void DSPCore_SetState(DSPCoreState new_state)
+{
+	core_state = new_state;
+	// kick the event, in case we are waiting
+	if (new_state == DSPCORE_RUNNING)
+		step_event.Set();
+	// Sleep(10);
+	DSPHost::UpdateDebugger();
+}
+
+DSPCoreState DSPCore_GetState()
+{
+	return core_state;
+}
+
+void DSPCore_Step()
+{
+	if (core_state == DSPCORE_STEPPING)
+		step_event.Set();
+}
+
+void CompileCurrent()
+{
+	dspjit->Compile(g_dsp.pc);
+
+	bool retry = true;
+
+	while (retry)
+	{
+		retry = false;
+		for (u16 i = 0x0000; i < 0xffff; ++i)
+		{
+			if (!dspjit->unresolvedJumps[i].empty())
+			{
+				u16 addrToCompile = dspjit->unresolvedJumps[i].front();
+				dspjit->Compile(addrToCompile);
+				if (!dspjit->unresolvedJumps[i].empty())
+					retry = true;
+			}
+		}
+	}
+}
+
+u16 DSPCore_ReadRegister(int reg)
+{
+	switch (reg)
+	{
+	case DSP_REG_AR0:
+	case DSP_REG_AR1:
+	case DSP_REG_AR2:
+	case DSP_REG_AR3:
+		return g_dsp.r.ar[reg - DSP_REG_AR0];
+	case DSP_REG_IX0:
+	case DSP_REG_IX1:
+	case DSP_REG_IX2:
+	case DSP_REG_IX3:
+		return g_dsp.r.ix[reg - DSP_REG_IX0];
+	case DSP_REG_WR0:
+	case DSP_REG_WR1:
+	case DSP_REG_WR2:
+	case DSP_REG_WR3:
+		return g_dsp.r.wr[reg - DSP_REG_WR0];
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		return g_dsp.r.st[reg - DSP_REG_ST0];
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		return g_dsp.r.ac[reg - DSP_REG_ACH0].h;
+	case DSP_REG_CR:     return g_dsp.r.cr;
+	case DSP_REG_SR:     return g_dsp.r.sr;
+	case DSP_REG_PRODL:  return g_dsp.r.prod.l;
+	case DSP_REG_PRODM:  return g_dsp.r.prod.m;
+	case DSP_REG_PRODH:  return g_dsp.r.prod.h;
+	case DSP_REG_PRODM2: return g_dsp.r.prod.m2;
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		return g_dsp.r.ax[reg - DSP_REG_AXL0].l;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		return g_dsp.r.ax[reg - DSP_REG_AXH0].h;
+	case DSP_REG_ACL0:
+	case DSP_REG_ACL1:
+		return g_dsp.r.ac[reg - DSP_REG_ACL0].l;
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+		return g_dsp.r.ac[reg - DSP_REG_ACM0].m;
+	default:
+		_assert_msg_(DSP_CORE, 0, "cannot happen");
+		return 0;
+	}
+}
+
+void DSPCore_WriteRegister(int reg, u16 val)
+{
+	switch (reg)
+	{
+	case DSP_REG_AR0:
+	case DSP_REG_AR1:
+	case DSP_REG_AR2:
+	case DSP_REG_AR3:
+		g_dsp.r.ar[reg - DSP_REG_AR0] = val;
+		break;
+	case DSP_REG_IX0:
+	case DSP_REG_IX1:
+	case DSP_REG_IX2:
+	case DSP_REG_IX3:
+		g_dsp.r.ix[reg - DSP_REG_IX0] = val;
+		break;
+	case DSP_REG_WR0:
+	case DSP_REG_WR1:
+	case DSP_REG_WR2:
+	case DSP_REG_WR3:
+		g_dsp.r.wr[reg - DSP_REG_WR0] = val;
+		break;
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		g_dsp.r.st[reg - DSP_REG_ST0] = val;
+		break;
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		g_dsp.r.ac[reg - DSP_REG_ACH0].h = val;
+		break;
+	case DSP_REG_CR:     g_dsp.r.cr = val; break;
+	case DSP_REG_SR:     g_dsp.r.sr = val; break;
+	case DSP_REG_PRODL:  g_dsp.r.prod.l = val; break;
+	case DSP_REG_PRODM:  g_dsp.r.prod.m = val; break;
+	case DSP_REG_PRODH:  g_dsp.r.prod.h = val; break;
+	case DSP_REG_PRODM2: g_dsp.r.prod.m2 = val; break;
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		g_dsp.r.ax[reg - DSP_REG_AXL0].l = val;
+		break;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		g_dsp.r.ax[reg - DSP_REG_AXH0].h = val;
+		break;
+	case DSP_REG_ACL0:
+	case DSP_REG_ACL1:
+		g_dsp.r.ac[reg - DSP_REG_ACL0].l = val;
+		break;
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+		g_dsp.r.ac[reg - DSP_REG_ACM0].m = val;
+		break;
+	}
+}
diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h
new file mode 100644
index 0000000000..6fa8498268
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPCore.h
@@ -0,0 +1,325 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <atomic>
+#include <memory>
+#include <string>
+
+#include "Core/DSP/DSPBreakpoints.h"
+#include "Core/DSP/DSPCaptureLogger.h"
+#include "Core/DSP/DSPEmitter.h"
+
+#define DSP_IRAM_BYTE_SIZE  0x2000
+#define DSP_IRAM_SIZE       0x1000
+#define DSP_IRAM_MASK       0x0fff
+
+#define DSP_IROM_BYTE_SIZE  0x2000
+#define DSP_IROM_SIZE       0x1000
+#define DSP_IROM_MASK       0x0fff
+
+#define DSP_DRAM_BYTE_SIZE  0x2000
+#define DSP_DRAM_SIZE       0x1000
+#define DSP_DRAM_MASK       0x0fff
+
+#define DSP_COEF_BYTE_SIZE  0x1000
+#define DSP_COEF_SIZE       0x800
+#define DSP_COEF_MASK       0x7ff
+
+#define DSP_RESET_VECTOR    0x8000
+
+#define DSP_STACK_DEPTH 0x20
+#define DSP_STACK_MASK  0x1f
+
+#define DSP_CR_IMEM     2
+#define DSP_CR_DMEM     0
+#define DSP_CR_TO_CPU   1
+#define DSP_CR_FROM_CPU 0
+
+
+// Register table taken from libasnd
+#define DSP_REG_AR0     0x00 // address registers
+#define DSP_REG_AR1     0x01
+#define DSP_REG_AR2     0x02
+#define DSP_REG_AR3     0x03
+
+#define DSP_REG_IX0     0x04 // indexing registers (actually, mostly used as increments)
+#define DSP_REG_IX1     0x05
+#define DSP_REG_IX2     0x06
+#define DSP_REG_IX3     0x07
+
+#define DSP_REG_WR0     0x08 // address wrapping registers. should be initialized to 0xFFFF if not used.
+#define DSP_REG_WR1     0x09
+#define DSP_REG_WR2     0x0a
+#define DSP_REG_WR3     0x0b
+
+#define DSP_REG_ST0     0x0c // stacks.
+#define DSP_REG_ST1     0x0d
+#define DSP_REG_ST2     0x0e
+#define DSP_REG_ST3     0x0f
+
+#define DSP_REG_CR      0x12 // Seems to be the top 8 bits of LRS/SRS.
+#define DSP_REG_SR      0x13
+
+#define DSP_REG_PRODL   0x14 // product.
+#define DSP_REG_PRODM   0x15
+#define DSP_REG_PRODH   0x16
+#define DSP_REG_PRODM2  0x17
+
+#define DSP_REG_AXL0    0x18
+#define DSP_REG_AXL1    0x19
+#define DSP_REG_AXH0    0x1a
+#define DSP_REG_AXH1    0x1b
+
+#define DSP_REG_ACC0    0x1c // accumulator (global)
+#define DSP_REG_ACC1    0x1d
+
+#define DSP_REG_ACL0    0x1c // Low accumulator
+#define DSP_REG_ACL1    0x1d
+#define DSP_REG_ACM0    0x1e // Mid accumulator
+#define DSP_REG_ACM1    0x1f
+#define DSP_REG_ACH0    0x10 // Sign extended 8 bit register 0
+#define DSP_REG_ACH1    0x11 // Sign extended 8 bit register 1
+
+// Hardware registers address
+
+#define DSP_COEF_A1_0   0xa0
+
+#define DSP_DSCR        0xc9 // DSP DMA Control Reg
+#define DSP_DSPA        0xcd // DSP DMA Address (DSP)
+#define DSP_DSBL        0xcb // DSP DMA Block Length
+#define DSP_DSMAH       0xce // DSP DMA Address High (External)
+#define DSP_DSMAL       0xcf // DSP DMA Address Low (External)
+
+#define DSP_FORMAT      0xd1 // Sample format
+#define DSP_ACUNK       0xd2 // Set to 3 on my dumps
+#define DSP_ACDATA1     0xd3 // used only by Zelda ucodes
+#define DSP_ACSAH       0xd4 // Start of loop
+#define DSP_ACSAL       0xd5
+#define DSP_ACEAH       0xd6 // End of sample (and loop)
+#define DSP_ACEAL       0xd7
+#define DSP_ACCAH       0xd8 // Current playback position
+#define DSP_ACCAL       0xd9
+#define DSP_PRED_SCALE  0xda // ADPCM predictor and scale
+#define DSP_YN1         0xdb
+#define DSP_YN2         0xdc
+#define DSP_ACCELERATOR 0xdd // ADPCM accelerator read. Used by AX.
+#define DSP_GAIN        0xde
+#define DSP_ACUNK2      0xdf // Set to 0xc on my dumps
+
+#define DSP_AMDM        0xef // ARAM DMA Request Mask 0: DMA with ARAM unmasked 1: masked
+
+#define DSP_DIRQ        0xfb // DSP Irq Rest
+#define DSP_DMBH        0xfc // DSP Mailbox H
+#define DSP_DMBL        0xfd // DSP Mailbox L
+#define DSP_CMBH        0xfe // CPU Mailbox H
+#define DSP_CMBL        0xff // CPU Mailbox L
+
+#define DMA_TO_DSP      0
+#define DMA_TO_CPU      1
+
+// Stacks
+#define DSP_STACK_C     0
+#define DSP_STACK_D     1
+
+// cr (Not g_dsp.r[CR]) bits
+// See HW/DSP.cpp.
+#define CR_EXTERNAL_INT 0x0002
+#define CR_HALT         0x0004
+#define CR_INIT         0x0400
+
+
+// SR bits
+#define SR_CARRY           0x0001
+#define SR_OVERFLOW        0x0002
+#define SR_ARITH_ZERO      0x0004
+#define SR_SIGN            0x0008
+#define SR_OVER_S32        0x0010 // set when there was mod/tst/cmp on accu and result is over s32
+#define SR_TOP2BITS        0x0020 // if the upper (ac?.m/ax?.h) 2 bits are equal
+#define SR_LOGIC_ZERO      0x0040
+#define SR_OVERFLOW_STICKY 0x0080 // set at the same time as 0x2 (under same conditions) - but not cleared the same
+#define SR_100             0x0100 // unknown
+#define SR_INT_ENABLE      0x0200 // Not 100% sure but duddie says so. This should replace the hack, if so.
+#define SR_400             0x0400 // unknown
+#define SR_EXT_INT_ENABLE  0x0800 // Appears in zelda - seems to disable external interrupts
+#define SR_1000            0x1000 // unknown
+#define SR_MUL_MODIFY      0x2000 // 1 = normal. 0 = x2   (M0, M2) (Free mul by 2)
+#define SR_40_MODE_BIT     0x4000 // 0 = "16", 1 = "40"  (SET16, SET40)  Controls sign extension when loading mid accums and data saturation for stores from mid accums.
+#define SR_MUL_UNSIGNED    0x8000 // 0 = normal. 1 = unsigned  (CLR15, SET15) If set, treats ax?.l as unsigned (MULX family only).
+
+// This should be the bits affected by CMP. Does not include logic zero.
+#define SR_CMP_MASK    0x3f
+
+// exceptions vector
+#define EXP_STOVF       1 // 0x0002 stack under/over flow
+#define EXP_2           2 // 0x0004
+#define EXP_3           3 // 0x0006
+#define EXP_4           4 // 0x0008
+#define EXP_ACCOV       5 // 0x000a accelerator address overflow
+#define EXP_6           6 // 0x000c
+#define EXP_INT         7 // 0x000e external int (message from CPU)
+
+struct DSP_Regs
+{
+	u16 ar[4];
+	u16 ix[4];
+	u16 wr[4];
+	u16 st[4];
+	u16 cr;
+	u16 sr;
+
+	union
+	{
+		u64 val;
+		struct
+		{
+			u16 l;
+			u16 m;
+			u16 h;
+			u16 m2;//if this gets in the way, drop it.
+		};
+	} prod;
+
+	union
+	{
+		u32 val;
+		struct {
+			u16 l;
+			u16 h;
+		};
+	} ax[2];
+
+	union
+	{
+		u64 val;
+		struct
+		{
+			u16 l;
+			u16 m;
+			u16 h;
+		};
+	} ac[2];
+};
+
+// All the state of the DSP should be in this struct. Any DSP state that is not filled on init
+// should be moved here.
+struct SDSP
+{
+	DSP_Regs r;
+	u16 pc;
+#if PROFILE
+	u16 err_pc;
+#endif
+
+	// This is NOT the same cr as r.cr.
+	// This register is shared with the main emulation, see DSP.cpp
+	// The engine has control over 0x0C07 of this reg.
+	// Bits are defined in a struct in DSP.cpp.
+	u16 cr;
+
+	u8 reg_stack_ptr[4];
+	u8 exceptions;   // pending exceptions
+	volatile bool external_interrupt_waiting;
+	bool reset_dspjit_codespace;
+
+	// DSP hardware stacks. They're mapped to a bunch of registers, such that writes
+	// to them push and reads pop.
+	// Let's make stack depth 32 for now, which is way more than what's needed.
+	// The real DSP has different depths for the different stacks, but it would
+	// be strange if any ucode relied on stack overflows since on the DSP, when
+	// the stack overflows, you're screwed.
+	u16 reg_stack[4][DSP_STACK_DEPTH];
+
+	// For debugging.
+	u32 iram_crc;
+	u64 step_counter;
+
+	// Mailbox.
+	std::atomic<u32> mbox[2];
+
+	// Accelerator / DMA / other hardware registers. Not GPRs.
+	u16 ifx_regs[256];
+
+	// When state saving, all of the above can just be memcpy'd into the save state.
+	// The below needs special handling.
+	u16 *iram;
+	u16 *dram;
+	u16 *irom;
+	u16 *coef;
+
+	// This one doesn't really belong here.
+	u8  *cpu_ram;
+};
+
+extern SDSP g_dsp;
+extern DSPBreakpoints dsp_breakpoints;
+extern DSPEmitter *dspjit;
+extern u16 cyclesLeft;
+extern bool init_hax;
+extern std::unique_ptr<DSPCaptureLogger> g_dsp_cap;
+
+struct DSPInitOptions
+{
+	// DSP IROM blob, which is where the DSP boots from. Embedded into the DSP.
+	std::array<u16, DSP_IROM_SIZE> irom_contents;
+
+	// DSP DROM blob, which contains resampling coefficients.
+	std::array<u16, DSP_COEF_SIZE> coef_contents;
+
+	// Core used to emulate the DSP.
+	// Default: CORE_JIT.
+	enum CoreType
+	{
+		CORE_INTERPRETER,
+		CORE_JIT,
+	};
+	CoreType core_type;
+
+	// Optional capture logger used to log internal DSP data transfers.
+	// Default: dummy implementation, does nothing.
+	DSPCaptureLogger* capture_logger;
+
+	DSPInitOptions()
+		: core_type(CORE_JIT),
+		  capture_logger(new DefaultDSPCaptureLogger())
+	{
+	}
+};
+
+// Initializes the DSP emulator using the provided options. Takes ownership of
+// all the pointers contained in the options structure.
+bool DSPCore_Init(const DSPInitOptions& opts);
+
+void DSPCore_Reset();
+void DSPCore_Shutdown(); // Frees all allocated memory.
+
+void DSPCore_CheckExternalInterrupt();
+void DSPCore_CheckExceptions();
+void DSPCore_SetExternalInterrupt(bool val);
+
+// sets a flag in the pending exception register.
+void DSPCore_SetException(u8 level);
+
+void CompileCurrent();
+
+enum DSPCoreState
+{
+	DSPCORE_STOP = 0,
+	DSPCORE_RUNNING,
+	DSPCORE_STEPPING,
+};
+
+int DSPCore_RunCycles(int cycles);
+
+// These are meant to be called from the UI thread.
+void DSPCore_SetState(DSPCoreState new_state);
+DSPCoreState DSPCore_GetState();
+
+void DSPCore_Step();
+
+u16 DSPCore_ReadRegister(int reg);
+void DSPCore_WriteRegister(int reg, u16 val);
diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp
new file mode 100644
index 0000000000..f84f61aea3
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPDisassembler.cpp
@@ -0,0 +1,329 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2005 Duddie
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstdlib>
+#include <fstream>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPTables.h"
+
+DSPDisassembler::DSPDisassembler(const AssemblerSettings &settings)
+	: settings_(settings)
+{
+}
+
+DSPDisassembler::~DSPDisassembler()
+{
+	// Some old code for logging unknown ops.
+	std::string filename = File::GetUserPath(D_DUMPDSP_IDX) + "UnkOps.txt";
+	std::ofstream uo(filename);
+	if (!uo)
+		return;
+
+	int count = 0;
+	for (const auto& entry : unk_opcodes)
+	{
+		if (entry.second > 0)
+		{
+			count++;
+			uo << StringFromFormat("OP%04x\t%d", entry.first, entry.second);
+			for (int j = 15; j >= 0; j--)  // print op bits
+			{
+				if ((j & 0x3) == 3)
+					uo << "\tb";
+
+				uo << StringFromFormat("%d", (entry.first >> j) & 0x1);
+			}
+
+			uo << "\n";
+		}
+	}
+
+	uo << StringFromFormat("Unknown opcodes count: %d\n", count);
+}
+
+bool DSPDisassembler::Disassemble(int start_pc, const std::vector<u16> &code, int base_addr, std::string &text)
+{
+	const char *tmp1 = "tmp1.bin";
+
+	// First we have to dump the code to a bin file.
+	{
+	File::IOFile f(tmp1, "wb");
+	f.WriteArray(&code[0], code.size());
+	}
+
+	// Run the two passes.
+	return DisassembleFile(tmp1, base_addr, 1, text) && DisassembleFile(tmp1, base_addr, 2, text);
+}
+
+std::string DSPDisassembler::DisassembleParameters(const DSPOPCTemplate& opc, u16 op1, u16 op2)
+{
+	std::string buf;
+
+	for (int j = 0; j < opc.param_count; j++)
+	{
+		if (j > 0)
+			buf += ", ";
+
+		u32 val = (opc.params[j].loc >= 1) ? op2 : op1;
+		val &= opc.params[j].mask;
+		if (opc.params[j].lshift < 0)
+			val = val << (-opc.params[j].lshift);
+		else
+			val = val >> opc.params[j].lshift;
+
+		u32 type = opc.params[j].type;
+		if ((type & 0xff) == 0x10)
+			type &= 0xff00;
+
+		if (type & P_REG)
+		{
+			// Check for _D parameter - if so flip.
+			if ((type == P_ACC_D) || (type == P_ACCM_D))  // Used to be P_ACCM_D TODO verify
+				val = (~val & 0x1) | ((type & P_REGS_MASK) >> 8);
+			else
+				val |= (type & P_REGS_MASK) >> 8;
+			type &= ~P_REGS_MASK;
+		}
+
+		switch (type)
+		{
+		case P_REG:
+			if (settings_.decode_registers)
+				buf += StringFromFormat("$%s", pdregname(val));
+			else
+				buf += StringFromFormat("$%d", val);
+			break;
+
+		case P_PRG:
+			if (settings_.decode_registers)
+				buf += StringFromFormat("@$%s", pdregname(val));
+			else
+				buf += StringFromFormat("@$%d", val);
+			break;
+
+		case P_VAL:
+		case P_ADDR_I:
+		case P_ADDR_D:
+			if (settings_.decode_names)
+			{
+				buf += pdname(val);
+			}
+			else
+			{
+				buf += StringFromFormat("0x%04x", val);
+			}
+			break;
+
+		case P_IMM:
+			if (opc.params[j].size != 2)
+			{
+				if (opc.params[j].mask == 0x003f) // LSL, LSR, ASL, ASR
+					buf += StringFromFormat("#%d", (val & 0x20) ? (val | 0xFFFFFFC0) : val);  // 6-bit sign extension
+				else
+					buf += StringFromFormat("#0x%02x", val);
+			}
+			else
+			{
+				buf += StringFromFormat("#0x%04x", val);
+			}
+			break;
+
+		case P_MEM:
+			if (opc.params[j].size != 2)
+				val = (u16)(s16)(s8)val;
+
+			if (settings_.decode_names)
+				buf += StringFromFormat("@%s", pdname(val));
+			else
+				buf += StringFromFormat("@0x%04x", val);
+			break;
+
+		default:
+			ERROR_LOG(DSPLLE, "Unknown parameter type: %x", opc.params[j].type);
+			break;
+		}
+	}
+
+	return buf;
+}
+
+static std::string MakeLowerCase(std::string in)
+{
+	std::transform(in.begin(), in.end(), in.begin(), ::tolower);
+
+	return in;
+}
+
+bool DSPDisassembler::DisassembleOpcode(const u16 *binbuf, int base_addr, int pass, u16 *pc, std::string &dest)
+{
+	std::string buf(" ");
+
+	if ((*pc & 0x7fff) >= 0x1000)
+	{
+		++pc;
+		dest.append("; outside memory");
+		return false;
+	}
+
+	const u32 op1 = binbuf[*pc & 0x0fff];
+
+	const DSPOPCTemplate *opc = nullptr;
+	const DSPOPCTemplate *opc_ext = nullptr;
+
+	// find opcode
+	for (int j = 0; j < opcodes_size; j++)
+	{
+		u16 mask = opcodes[j].opcode_mask;
+
+		if ((op1 & mask) == opcodes[j].opcode)
+		{
+			opc = &opcodes[j];
+			break;
+		}
+	}
+	const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
+	if (!opc)
+		opc = &fake_op;
+
+	bool extended = false;
+	bool only7bitext = false;
+
+	if (((opc->opcode >> 12) == 0x3) && (op1 & 0x007f))
+	{
+		extended = true;
+		only7bitext = true;
+	}
+	else if (((opc->opcode >> 12) > 0x3) && (op1 & 0x00ff))
+	{
+		extended = true;
+	}
+
+	if (extended)
+	{
+		// opcode has an extension
+		// find opcode
+		for (int j = 0; j < opcodes_ext_size; j++)
+		{
+			if (only7bitext)
+			{
+				if (((op1 & 0x7f) & opcodes_ext[j].opcode_mask) == opcodes_ext[j].opcode)
+				{
+					opc_ext = &opcodes_ext[j];
+					break;
+				}
+			}
+			else
+			{
+				if ((op1 & opcodes_ext[j].opcode_mask) == opcodes_ext[j].opcode)
+				{
+					opc_ext = &opcodes_ext[j];
+					break;
+				}
+			}
+		}
+	}
+
+	// printing
+
+	if (settings_.show_pc)
+		buf += StringFromFormat("%04x ", *pc);
+
+	u32 op2;
+
+	// Size 2 - the op has a large immediate.
+	if (opc->size == 2)
+	{
+		op2 = binbuf[(*pc + 1) & 0x0fff];
+		if (settings_.show_hex)
+			buf += StringFromFormat("%04x %04x ", op1, op2);
+	}
+	else
+	{
+		op2 = 0;
+		if (settings_.show_hex)
+			buf += StringFromFormat("%04x      ", op1);
+	}
+
+	std::string opname = opc->name;
+	if (settings_.lower_case_ops)
+		opname = MakeLowerCase(opname);
+
+	std::string ext_buf;
+	if (extended)
+		ext_buf = StringFromFormat("%s%c%s", opname.c_str(), settings_.ext_separator, opc_ext->name);
+	else
+		ext_buf = opname;
+	if (settings_.lower_case_ops)
+		ext_buf = MakeLowerCase(ext_buf);
+
+	if (settings_.print_tabs)
+		buf += StringFromFormat("%s\t", ext_buf.c_str());
+	else
+		buf += StringFromFormat("%-12s", ext_buf.c_str());
+
+	if (opc->param_count > 0)
+		buf += DisassembleParameters(*opc, op1, op2);
+
+	// Handle opcode extension.
+	if (extended)
+	{
+		if (opc->param_count > 0)
+			buf += " ";
+
+		buf += ": ";
+
+		if (opc_ext->param_count > 0)
+			buf += DisassembleParameters(*opc_ext, op1, op2);
+	}
+
+	if (opc->opcode_mask == 0)
+	{
+		// unknown opcode
+		unk_opcodes[op1]++;
+		buf += "\t\t; *** UNKNOWN OPCODE ***";
+	}
+
+	if (extended)
+		*pc += opc_ext->size;
+	else
+		*pc += opc->size;
+
+	if (pass == 2)
+		dest.append(buf);
+
+	return true;
+}
+
+bool DSPDisassembler::DisassembleFile(const std::string& name, int base_addr, int pass, std::string &output)
+{
+	File::IOFile in(name, "rb");
+	if (!in)
+	{
+		printf("gd_dis_file: No input\n");
+		return false;
+	}
+
+	const int size = ((int)in.GetSize() & ~1) / 2;
+	std::vector<u16> binbuf(size);
+	in.ReadArray(binbuf.data(), size);
+	in.Close();
+
+	// Actually do the disassembly.
+	for (u16 pc = 0; pc < size;)
+	{
+		DisassembleOpcode(binbuf.data(), base_addr, pass, &pc, output);
+		if (pass == 2)
+			output.append("\n");
+	}
+
+	return true;
+}
diff --git a/Source/Core/Core/DSP/DSPDisassembler.h b/Source/Core/Core/DSP/DSPDisassembler.h
new file mode 100644
index 0000000000..dd90314b68
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPDisassembler.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2005 Duddie
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
+
+struct AssemblerSettings
+{
+	AssemblerSettings()
+		: print_tabs(false),
+		  show_hex(false),
+		  show_pc(false),
+		  force(false),
+		  decode_names(true),
+		  decode_registers(true),
+		  ext_separator('\''),
+		  lower_case_ops(true),
+		  pc(0)
+	{
+	}
+
+	bool print_tabs;
+	bool show_hex;
+	bool show_pc;
+	bool force;
+	bool decode_names;
+	bool decode_registers;
+	char ext_separator;
+	bool lower_case_ops;
+
+	u16 pc;
+};
+
+class DSPDisassembler
+{
+public:
+	DSPDisassembler(const AssemblerSettings &settings);
+	~DSPDisassembler();
+
+	bool Disassemble(int start_pc, const std::vector<u16> &code, int base_addr, std::string &text);
+
+	// Warning - this one is trickier to use right.
+	// Use pass == 2 if you're just using it by itself.
+	bool DisassembleOpcode(const u16 *binbuf, int base_addr, int pass, u16 *pc, std::string &dest);
+
+private:
+	// Moves PC forward and writes the result to dest.
+	bool DisassembleFile(const std::string& name, int base_addr, int pass, std::string &output);
+
+	std::string DisassembleParameters(const DSPOPCTemplate& opc, u16 op1, u16 op2);
+	std::map<u16, int> unk_opcodes;
+
+	const AssemblerSettings settings_;
+
+	LabelMap labels;
+};
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/DSP/DSPEmitter.cpp
similarity index 86%
rename from Source/Core/Core/Src/DSP/DSPEmitter.cpp
rename to Source/Core/Core/DSP/DSPEmitter.cpp
index a63d17628b..cdb7b12c1a 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp
+++ b/Source/Core/Core/DSP/DSPEmitter.cpp
@@ -1,18 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #include <cstring>
 
-#include "DSPEmitter.h"
-#include "DSPMemoryMap.h"
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPInterpreter.h"
-#include "DSPAnalyzer.h"
-#include "Jit/DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 #define MAX_BLOCK_SIZE 250
 #define DSP_IDLE_SKIP_CYCLES 0x1000
@@ -21,14 +18,14 @@ using namespace Gen;
 
 DSPEmitter::DSPEmitter() : gpr(*this), storeIndex(-1), storeIndex2(-1)
 {
-	m_compiledCode = NULL;
+	m_compiledCode = nullptr;
 
 	AllocCodeSpace(COMPILED_CODE_SIZE);
 
 	blocks = new DSPCompiledCode[MAX_BLOCKS];
 	blockLinks = new Block[MAX_BLOCKS];
 	blockSize = new u16[MAX_BLOCKS];
-	
+
 	compileSR = 0;
 	compileSR |= SR_INT_ENABLE;
 	compileSR |= SR_EXT_INT_ENABLE;
@@ -37,15 +34,15 @@ DSPEmitter::DSPEmitter() : gpr(*this), storeIndex(-1), storeIndex2(-1)
 	stubEntryPoint = CompileStub();
 
 	//clear all of the block references
-	for(int i = 0x0000; i < MAX_BLOCKS; i++)
+	for (int i = 0x0000; i < MAX_BLOCKS; i++)
 	{
 		blocks[i] = (DSPCompiledCode)stubEntryPoint;
-		blockLinks[i] = 0;
+		blockLinks[i] = nullptr;
 		blockSize[i] = 0;
 	}
 }
 
-DSPEmitter::~DSPEmitter() 
+DSPEmitter::~DSPEmitter()
 {
 	delete[] blocks;
 	delete[] blockLinks;
@@ -55,26 +52,26 @@ DSPEmitter::~DSPEmitter()
 
 void DSPEmitter::ClearIRAM()
 {
-	for(int i = 0x0000; i < 0x1000; i++)
+	for (int i = 0x0000; i < 0x1000; i++)
 	{
 		blocks[i] = (DSPCompiledCode)stubEntryPoint;
-		blockLinks[i] = 0;
+		blockLinks[i] = nullptr;
 		blockSize[i] = 0;
 		unresolvedJumps[i].clear();
 	}
 	g_dsp.reset_dspjit_codespace = true;
 }
 
-void DSPEmitter::ClearIRAMandDSPJITCodespaceReset() 
+void DSPEmitter::ClearIRAMandDSPJITCodespaceReset()
 {
 	ClearCodeSpace();
 	CompileDispatcher();
 	stubEntryPoint = CompileStub();
 
-	for(int i = 0x0000; i < 0x10000; i++)
+	for (int i = 0x0000; i < 0x10000; i++)
 	{
 		blocks[i] = (DSPCompiledCode)stubEntryPoint;
-		blockLinks[i] = 0;
+		blockLinks[i] = nullptr;
 		blockSize[i] = 0;
 		unresolvedJumps[i].clear();
 	}
@@ -104,9 +101,9 @@ void DSPEmitter::checkExceptions(u32 retval)
 
 bool DSPEmitter::FlagsNeeded()
 {
-	if (!(DSPAnalyzer::code_flags[compilePC] & DSPAnalyzer::CODE_START_OF_INST) || 
-		(DSPAnalyzer::code_flags[compilePC] & DSPAnalyzer::CODE_UPDATE_SR))	
-		return true; 
+	if (!(DSPAnalyzer::code_flags[compilePC] & DSPAnalyzer::CODE_START_OF_INST) ||
+		(DSPAnalyzer::code_flags[compilePC] & DSPAnalyzer::CODE_UPDATE_SR))
+		return true;
 	else
 		return false;
 }
@@ -171,7 +168,7 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst)
 			}
 		}
 	}
-	
+
 	// Main instruction
 	if (!opTable[inst]->jitFunc)
 	{
@@ -249,11 +246,11 @@ void DSPEmitter::Compile(u16 start_addr)
 		if (DSPAnalyzer::code_flags[compilePC-1] & DSPAnalyzer::CODE_LOOP_END)
 		{
 			MOVZX(32, 16, EAX, M(&(g_dsp.r.st[2])));
-			CMP(32, R(EAX), Imm32(0));
+			TEST(32, R(EAX), R(EAX));
 			FixupBranch rLoopAddressExit = J_CC(CC_LE, true);
 
 			MOVZX(32, 16, EAX, M(&g_dsp.r.st[3]));
-			CMP(32, R(EAX), Imm32(0));
+			TEST(32, R(EAX), R(EAX));
 			FixupBranch rLoopCounterExit = J_CC(CC_LE, true);
 
 			if (!opcode->branch)
@@ -267,7 +264,7 @@ void DSPEmitter::Compile(u16 start_addr)
 			DSPJitRegCache c(gpr);
 			HandleLoop();
 			gpr.saveRegs();
-			if (!DSPHost_OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
+			if (!DSPHost::OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
 			{
 				MOV(16, R(EAX), Imm16(DSP_IDLE_SKIP_CYCLES));
 			}
@@ -301,7 +298,7 @@ void DSPEmitter::Compile(u16 start_addr)
 				DSPJitRegCache c(gpr);
 				//don't update g_dsp.pc -- the branch insn already did
 				gpr.saveRegs();
-				if (!DSPHost_OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
+				if (!DSPHost::OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
 				{
 					MOV(16, R(EAX), Imm16(DSP_IDLE_SKIP_CYCLES));
 				}
@@ -337,7 +334,7 @@ void DSPEmitter::Compile(u16 start_addr)
 	{
 		blockLinks[start_addr] = blockLinkEntry;
 
-		for(u16 i = 0x0000; i < 0xffff; ++i)
+		for (u16 i = 0x0000; i < 0xffff; ++i)
 		{
 			if (!unresolvedJumps[i].empty())
 			{
@@ -348,14 +345,14 @@ void DSPEmitter::Compile(u16 start_addr)
 				{
 					// Mark the block to be recompiled again
 					blocks[i] = (DSPCompiledCode)stubEntryPoint;
-					blockLinks[i] = 0;
+					blockLinks[i] = nullptr;
 					blockSize[i] = 0;
 				}
 			}
 		}
 	}
 
-	if (blockSize[start_addr] == 0) 
+	if (blockSize[start_addr] == 0)
 	{
 		// just a safeguard, should never happen anymore.
 		// if it does we might get stuck over in RunForCycles.
@@ -364,7 +361,7 @@ void DSPEmitter::Compile(u16 start_addr)
 	}
 
 	gpr.saveRegs();
-	if (!DSPHost_OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
+	if (!DSPHost::OnThread() && DSPAnalyzer::code_flags[start_addr] & DSPAnalyzer::CODE_IDLE_SKIP)
 	{
 		MOV(16, R(EAX), Imm16(DSP_IDLE_SKIP_CYCLES));
 	}
@@ -387,12 +384,14 @@ const u8 *DSPEmitter::CompileStub()
 void DSPEmitter::CompileDispatcher()
 {
 	enterDispatcher = AlignCode16();
-	ABI_PushAllCalleeSavedRegsAndAdjustStack();
+	// We don't use floating point (high 16 bits).
+	BitSet32 registers_used = ABI_ALL_CALLEE_SAVED & BitSet32(0xffff);
+	ABI_PushRegistersAndAdjustStack(registers_used, 8);
 
 	const u8 *dispatcherLoop = GetCodePtr();
 
 	FixupBranch exceptionExit;
-	if (DSPHost_OnThread())
+	if (DSPHost::OnThread())
 	{
 		CMP(8, M(const_cast<bool*>(&g_dsp.external_interrupt_waiting)), Imm8(0));
 		exceptionExit = J_CC(CC_NE);
@@ -404,15 +403,9 @@ void DSPEmitter::CompileDispatcher()
 
 
 	// Execute block. Cycles executed returned in EAX.
-#ifdef _M_IX86
-	MOVZX(32, 16, ECX, M(&g_dsp.pc));
-	MOV(32, R(EBX), ImmPtr(blocks));
-	JMPptr(MComplex(EBX, ECX, SCALE_4, 0));
-#else
-	MOVZX(64, 16, ECX, M(&g_dsp.pc));//for clarity, use 64 here.
+	MOVZX(64, 16, ECX, M(&g_dsp.pc));
 	MOV(64, R(RBX), ImmPtr(blocks));
 	JMPptr(MComplex(RBX, RCX, SCALE_8, 0));
-#endif
 
 	returnDispatcher = GetCodePtr();
 
@@ -423,11 +416,11 @@ void DSPEmitter::CompileDispatcher()
 
 	// DSP gave up the remaining cycles.
 	SetJumpTarget(_halt);
-	if (DSPHost_OnThread())
+	if (DSPHost::OnThread())
 	{
 		SetJumpTarget(exceptionExit);
 	}
 	//MOV(32, M(&cyclesLeft), Imm32(0));
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
+	ABI_PopRegistersAndAdjustStack(registers_used, 8);
 	RET();
 }
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.h b/Source/Core/Core/DSP/DSPEmitter.h
similarity index 93%
rename from Source/Core/Core/Src/DSP/DSPEmitter.h
rename to Source/Core/Core/DSP/DSPEmitter.h
index acf0ab0fd2..a6738e2045 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.h
+++ b/Source/Core/Core/DSP/DSPEmitter.h
@@ -1,24 +1,24 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _DSPEMITTER_H
-#define _DSPEMITTER_H
+#pragma once
 
 #include <list>
 
-#include "DSPCommon.h"
-#include "x64Emitter.h"
-#include "Jit/DSPJitRegCache.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/DSP/DSPCommon.h"
+#include "Core/DSP/Jit/DSPJitRegCache.h"
 
 #define COMPILED_CODE_SIZE 2097152
-
-#define MAX_BLOCKS 0x10000
+#define MAX_BLOCKS         0x10000
 
 typedef u32 (*DSPCompiledCode)();
 typedef const u8 *Block;
 
-class DSPEmitter : public Gen::XCodeBlock, NonCopyable
+class DSPEmitter : public Gen::X64CodeBlock
 {
 public:
 	DSPEmitter();
@@ -41,10 +41,7 @@ public:
 
 	// CC Util
 	void Update_SR_Register64(Gen::X64Reg val = Gen::EAX);
-	void Update_SR_Register64_Carry(Gen::X64Reg val,
-					Gen::X64Reg carry_ovfl);
-	void Update_SR_Register64_Carry2(Gen::X64Reg val,
-					 Gen::X64Reg carry_ovfl);
+	void Update_SR_Register64_Carry(Gen::X64Reg val, Gen::X64Reg carry_ovfl, bool carry_eq = false);
 	void Update_SR_Register16(Gen::X64Reg val = Gen::EAX);
 	void Update_SR_Register16_OverS32(Gen::X64Reg val = Gen::EAX);
 
@@ -263,7 +260,7 @@ private:
 	// The index of the last stored ext value (compile time).
 	int storeIndex;
 	int storeIndex2;
-	
+
 	// Counts down.
 	// int cycles;
 
@@ -275,17 +272,13 @@ private:
 	void round_long_acc(Gen::X64Reg long_acc = Gen::EAX);
 	void set_long_acc(int _reg, Gen::X64Reg acc = Gen::EAX);
 	void get_acc_h(int _reg, Gen::X64Reg acc = Gen::EAX, bool sign = true);
-	void set_acc_h(int _reg, Gen::OpArg arg = R(Gen::EAX));
+	void set_acc_h(int _reg, const Gen::OpArg& arg = R(Gen::EAX));
 	void get_acc_m(int _reg, Gen::X64Reg acc = Gen::EAX, bool sign = true);
-	void set_acc_m(int _reg, Gen::OpArg arg = R(Gen::EAX));
+	void set_acc_m(int _reg, const Gen::OpArg& arg = R(Gen::EAX));
 	void get_acc_l(int _reg, Gen::X64Reg acc = Gen::EAX, bool sign = true);
-	void set_acc_l(int _reg, Gen::OpArg arg = R(Gen::EAX));
+	void set_acc_l(int _reg, const Gen::OpArg& arg = R(Gen::EAX));
 	void get_long_acx(int _reg, Gen::X64Reg acx = Gen::EAX);
 	void get_ax_l(int _reg, Gen::X64Reg acx = Gen::EAX);
 	void get_ax_h(int _reg, Gen::X64Reg acc = Gen::EAX);
 	void get_long_acc(int _reg, Gen::X64Reg acc = Gen::EAX);
 };
-
-
-#endif // _DSPEMITTER_H
-
diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp
new file mode 100644
index 0000000000..08ba2fa40f
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPHWInterface.cpp
@@ -0,0 +1,348 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonFuncs.h"
+#include "Common/CPUDetect.h"
+#include "Common/Intrinsics.h"
+#include "Common/MemoryUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/DSP/DSPAccelerator.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPTables.h"
+
+static void gdsp_do_dma();
+
+void gdsp_ifx_init()
+{
+	for (int i = 0; i < 256; i++)
+	{
+		g_dsp.ifx_regs[i] = 0;
+	}
+
+	g_dsp.mbox[0].store(0);
+	g_dsp.mbox[1].store(0);
+}
+
+u32 gdsp_mbox_peek(u8 mbx)
+{
+	return g_dsp.mbox[mbx].load();
+}
+
+void gdsp_mbox_write_h(u8 mbx, u16 val)
+{
+	const u32 old_value = g_dsp.mbox[mbx].load(std::memory_order_acquire);
+	const u32 new_value = (old_value & 0xffff) | (val << 16);
+
+	g_dsp.mbox[mbx].store(new_value & ~0x80000000, std::memory_order_release);
+}
+
+void gdsp_mbox_write_l(u8 mbx, u16 val)
+{
+	const u32 old_value = g_dsp.mbox[mbx].load(std::memory_order_acquire);
+	const u32 new_value = (old_value & ~0xffff) | val;
+
+	g_dsp.mbox[mbx].store(new_value | 0x80000000, std::memory_order_release);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (mbx == GDSP_MBOX_DSP)
+	{
+		INFO_LOG(DSP_MAIL, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
+	} else {
+		INFO_LOG(DSP_MAIL, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
+	}
+#endif
+}
+
+u16 gdsp_mbox_read_h(u8 mbx)
+{
+	if (init_hax && mbx)
+	{
+		return 0x8054;
+	}
+
+	return (u16)(g_dsp.mbox[mbx].load() >> 16); // TODO: mask away the top bit?
+}
+
+u16 gdsp_mbox_read_l(u8 mbx)
+{
+	const u32 value = g_dsp.mbox[mbx].load(std::memory_order_acquire);
+	g_dsp.mbox[mbx].store(value & ~0x80000000, std::memory_order_release);
+
+	if (init_hax && mbx)
+	{
+		init_hax = false;
+		DSPCore_Reset();
+		return 0x4348;
+	}
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (mbx == GDSP_MBOX_DSP)
+	{
+		INFO_LOG(DSP_MAIL, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
+	} else {
+		INFO_LOG(DSP_MAIL, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
+	}
+#endif
+
+	return (u16)value;
+}
+
+void gdsp_ifx_write(u32 addr, u32 val)
+{
+	g_dsp_cap->LogIFXWrite(addr, val);
+
+	switch (addr & 0xff)
+	{
+		case DSP_DIRQ:
+			if (val & 0x1)
+				DSPHost::InterruptRequest();
+			else
+				INFO_LOG(DSPLLE, "Unknown Interrupt Request pc=%04x (%04x)", g_dsp.pc, val);
+			break;
+
+		case DSP_DMBH:
+			gdsp_mbox_write_h(GDSP_MBOX_DSP, val);
+			break;
+
+		case DSP_DMBL:
+			gdsp_mbox_write_l(GDSP_MBOX_DSP, val);
+			break;
+
+		case DSP_CMBH:
+			return gdsp_mbox_write_h(GDSP_MBOX_CPU, val);
+
+		case DSP_CMBL:
+			return gdsp_mbox_write_l(GDSP_MBOX_CPU, val);
+
+		case DSP_DSBL:
+			g_dsp.ifx_regs[DSP_DSBL] = val;
+			g_dsp.ifx_regs[DSP_DSCR] |= 4; // Doesn't really matter since we do DMA instantly
+			if (!g_dsp.ifx_regs[DSP_AMDM])
+				gdsp_do_dma();
+			else
+				NOTICE_LOG(DSPLLE, "Masked DMA skipped");
+			g_dsp.ifx_regs[DSP_DSCR] &= ~4;
+			g_dsp.ifx_regs[DSP_DSBL] = 0;
+			break;
+
+		case DSP_ACDATA1: // Accelerator write (Zelda type) - "UnkZelda"
+			dsp_write_aram_d3(val);
+			break;
+
+		case DSP_GAIN:
+			if (val)
+			{
+				INFO_LOG(DSPLLE,"Gain Written: 0x%04x", val);
+			}
+		case DSP_DSPA:
+		case DSP_DSMAH:
+		case DSP_DSMAL:
+		case DSP_DSCR:
+			g_dsp.ifx_regs[addr & 0xFF] = val;
+			break;
+/*
+		case DSP_ACCAL:
+			dsp_step_accelerator();
+			break;
+*/
+		default:
+			if ((addr & 0xff) >= 0xa0)
+			{
+				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
+				{
+					INFO_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
+				}
+				else
+				{
+					ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
+				}
+			}
+			else
+			{
+				ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
+			}
+			g_dsp.ifx_regs[addr & 0xFF] = val;
+			break;
+	}
+}
+
+static u16 _gdsp_ifx_read(u16 addr)
+{
+	switch (addr & 0xff)
+	{
+		case DSP_DMBH:
+			return gdsp_mbox_read_h(GDSP_MBOX_DSP);
+
+		case DSP_DMBL:
+			return gdsp_mbox_read_l(GDSP_MBOX_DSP);
+
+		case DSP_CMBH:
+			return gdsp_mbox_read_h(GDSP_MBOX_CPU);
+
+		case DSP_CMBL:
+			return gdsp_mbox_read_l(GDSP_MBOX_CPU);
+
+		case DSP_DSCR:
+			return g_dsp.ifx_regs[addr & 0xFF];
+
+		case DSP_ACCELERATOR:  // ADPCM Accelerator reads
+			return dsp_read_accelerator();
+
+		case DSP_ACDATA1: // Accelerator reads (Zelda type) - "UnkZelda"
+			return dsp_read_aram_d3();
+
+		default:
+			if ((addr & 0xff) >= 0xa0)
+			{
+				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
+				{
+					INFO_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, g_dsp.ifx_regs[addr & 0xFF]);
+				}
+				else
+				{
+					ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
+				}
+			}
+			else
+			{
+				ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
+			}
+			return g_dsp.ifx_regs[addr & 0xFF];
+	}
+}
+
+u16 gdsp_ifx_read(u16 addr)
+{
+	u16 retval = _gdsp_ifx_read(addr);
+	g_dsp_cap->LogIFXRead(addr, retval);
+	return retval;
+}
+
+static const u8* gdsp_idma_in(u16 dsp_addr, u32 addr, u32 size)
+{
+	UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+
+	u8* dst = ((u8*)g_dsp.iram);
+	for (u32 i = 0; i < size; i += 2)
+	{
+		*(u16*)&dst[dsp_addr + i] = Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x0fffffff]);
+	}
+	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+
+	DSPHost::CodeLoaded((const u8*)g_dsp.iram + dsp_addr, size);
+
+	NOTICE_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc);
+
+	return dst + dsp_addr;
+}
+
+static const u8* gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size)
+{
+	ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size);
+
+	return nullptr;
+}
+
+#if _M_SSE >= 0x301
+static const __m128i s_mask = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L);
+#endif
+
+// TODO: These should eat clock cycles.
+static const u8* gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size)
+{
+	u8* dst = ((u8*)g_dsp.dram);
+
+#if _M_SSE >= 0x301
+	if (cpu_info.bSSSE3 && !(size % 16))
+	{
+		for (u32 i = 0; i < size; i += 16)
+		{
+			_mm_storeu_si128((__m128i *)&dst[dsp_addr + i], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]), s_mask));
+		}
+	}
+	else
+#endif
+	{
+		for (u32 i = 0; i < size; i += 2)
+		{
+			*(u16*)&dst[dsp_addr + i] = Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]);
+		}
+	}
+	INFO_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)", addr, dsp_addr / 2, size);
+
+	return dst + dsp_addr;
+}
+
+static const u8* gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size)
+{
+	const u8* src = ((const u8*)g_dsp.dram);
+
+#if _M_SSE >= 0x301
+	if (cpu_info.bSSSE3 && !(size % 16))
+	{
+		for (u32 i = 0; i < size; i += 16)
+		{
+			_mm_storeu_si128((__m128i *)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&src[dsp_addr + i]), s_mask));
+		}
+	}
+	else
+#endif
+	{
+		for (u32 i = 0; i < size; i += 2)
+		{
+			*(u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF] = Common::swap16(*(const u16*)&src[dsp_addr + i]);
+		}
+	}
+
+	INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size);
+
+	return src + dsp_addr;
+}
+
+static void gdsp_do_dma()
+{
+	u32 addr     = (g_dsp.ifx_regs[DSP_DSMAH] << 16) | g_dsp.ifx_regs[DSP_DSMAL];
+	u16 ctl      = g_dsp.ifx_regs[DSP_DSCR];
+	u16 dsp_addr = g_dsp.ifx_regs[DSP_DSPA] * 2;
+	u16 len      = g_dsp.ifx_regs[DSP_DSBL];
+
+	if (len > 0x4000)
+	{
+		ERROR_LOG(DSPLLE, "DMA ERROR: PC: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
+		exit(0);
+	}
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	DEBUG_LOG(DSPLLE, "DMA pc: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
+#endif
+
+	const u8* copied_data_ptr = nullptr;
+	switch (ctl & 0x3)
+	{
+		case (DSP_CR_DMEM | DSP_CR_TO_CPU):
+			copied_data_ptr = gdsp_ddma_out(dsp_addr, addr, len);
+			break;
+
+		case (DSP_CR_DMEM | DSP_CR_FROM_CPU):
+			copied_data_ptr = gdsp_ddma_in(dsp_addr, addr, len);
+			break;
+
+		case (DSP_CR_IMEM | DSP_CR_TO_CPU):
+			copied_data_ptr = gdsp_idma_out(dsp_addr, addr, len);
+			break;
+
+		case (DSP_CR_IMEM | DSP_CR_FROM_CPU):
+			copied_data_ptr = gdsp_idma_in(dsp_addr, addr, len);
+			break;
+	}
+
+	if (copied_data_ptr)
+		g_dsp_cap->LogDMA(ctl, addr, dsp_addr, len, copied_data_ptr);
+
+}
diff --git a/Source/Core/Core/DSP/DSPHWInterface.h b/Source/Core/Core/DSP/DSPHWInterface.h
new file mode 100644
index 0000000000..b53655628e
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPHWInterface.h
@@ -0,0 +1,22 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#define GDSP_MBOX_CPU   0
+#define GDSP_MBOX_DSP   1
+
+u32  gdsp_mbox_peek(u8 mbx);
+void gdsp_mbox_write_h(u8 mbx, u16 val);
+void gdsp_mbox_write_l(u8 mbx, u16 val);
+u16  gdsp_mbox_read_h(u8 mbx);
+u16  gdsp_mbox_read_l(u8 mbx);
+
+void gdsp_ifx_init();
+
+void gdsp_ifx_write(u32 addr, u32 val);
+u16  gdsp_ifx_read(u16 addr);
diff --git a/Source/Core/Core/DSP/DSPHost.h b/Source/Core/Core/DSP/DSPHost.h
new file mode 100644
index 0000000000..b3af7db2ca
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPHost.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+// The user of the DSPCore library must supply a few functions so that the
+// emulation core can access the environment it runs in. If the emulation
+// core isn't used, for example in an asm/disasm tool, then most of these
+// can be stubbed out.
+
+namespace DSPHost
+{
+u8 ReadHostMemory(u32 addr);
+void WriteHostMemory(u8 value, u32 addr);
+void OSD_AddMessage(const std::string& str, u32 ms);
+bool OnThread();
+bool IsWiiHost();
+void InterruptRequest();
+void CodeLoaded(const u8 *ptr, int size);
+void UpdateDebugger();
+}
diff --git a/Source/Core/Core/DSP/DSPIntArithmetic.cpp b/Source/Core/Core/DSP/DSPIntArithmetic.cpp
new file mode 100644
index 0000000000..4bd924939e
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntArithmetic.cpp
@@ -0,0 +1,1159 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
+
+// Arithmetic and accumulator control.
+
+namespace DSPInterpreter {
+
+// CLR $acR
+// 1000 r001 xxxx xxxx
+// Clears accumulator $acR
+//
+// flags out: --10 0100
+void clr(const UDSPInstruction opc)
+{
+	u8 reg = (opc >> 11) & 0x1;
+
+	dsp_set_long_acc(reg, 0);
+	Update_SR_Register64(0);
+	zeroWriteBackLog();
+}
+
+// CLRL $acR.l
+// 1111 110r xxxx xxxx
+// Clears (and rounds!) $acR.l - low 16 bits of accumulator $acR.
+//
+// flags out: --xx xx00
+void clrl(const UDSPInstruction opc)
+{
+	u8 reg = (opc >> 8) & 0x1;
+	s64 acc = dsp_round_long_acc(dsp_get_long_acc(reg));
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(reg, acc);
+	Update_SR_Register64(acc);
+}
+
+//----
+
+// ANDCF $acD.m, #I
+// 0000 001r 1100 0000
+// iiii iiii iiii iiii
+// Set logic zero (LZ) flag in status register $sr if result of logic AND of
+// accumulator mid part $acD.m with immediate value I is equal I.
+//
+// flags out: -x-- ----
+void andcf(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+
+	u16 imm = dsp_fetch_code();
+	u16 val = dsp_get_acc_m(reg);
+	Update_SR_LZ(((val & imm) == imm) ? true : false);
+}
+
+// ANDF $acD.m, #I
+// 0000 001r 1010 0000
+// iiii iiii iiii iiii
+// Set logic zero (LZ) flag in status register $sr if result of logical AND
+// operation of accumulator mid part $acD.m with immediate value I is equal
+// immediate value 0.
+//
+// flags out: -x-- ----
+void andf(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+
+	u16 imm = dsp_fetch_code();
+	u16 val = dsp_get_acc_m(reg);
+	Update_SR_LZ(((val & imm) == 0) ? true : false);
+}
+
+//----
+
+// TST
+// 1011 r001 xxxx xxxx
+// Test accumulator %acR.
+//
+// flags out: --xx xx00
+void tst(const UDSPInstruction opc)
+{
+	u8 reg = (opc >> 11) & 0x1;
+
+	s64 acc = dsp_get_long_acc(reg);
+	Update_SR_Register64(acc);
+	zeroWriteBackLog();
+}
+
+// TSTAXH $axR.h
+// 1000 011r xxxx xxxx
+// Test high part of secondary accumulator $axR.h.
+//
+// flags out: --x0 xx00
+void tstaxh(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+
+	s16 val = dsp_get_ax_h(reg);
+	Update_SR_Register16(val);
+	zeroWriteBackLog();
+}
+
+//----
+
+// CMP
+// 1000 0010 xxxx xxxx
+// Compares accumulator $ac0 with accumulator $ac1.
+//
+// flags out: x-xx xxxx
+void cmp(const UDSPInstruction opc)
+{
+	s64 acc0 = dsp_get_long_acc(0);
+	s64 acc1 = dsp_get_long_acc(1);
+	s64 res = dsp_convert_long_acc(acc0 - acc1);
+
+	Update_SR_Register64(res, isCarry2(acc0, res), isOverflow(acc0, -acc1, res)); // CF -> influence on ABS/0xa100
+	zeroWriteBackLog();
+}
+
+// CMPAR $acS axR.h
+// 110r s001 xxxx xxxx
+// Compares accumulator $acS with accumulator axR.h.
+// Not described by Duddie's doc - at least not as a separate instruction.
+//
+// flags out: x-xx xxxx
+void cmpar(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 12) & 0x1;
+	u8 sreg = (opc >> 11) & 0x1;
+
+	s64 sr = dsp_get_long_acc(sreg);
+	s64 rr = (s16)g_dsp.r.ax[rreg].h;
+	rr <<= 16;
+	s64 res = dsp_convert_long_acc(sr - rr);
+
+	Update_SR_Register64(res, isCarry2(sr, res), isOverflow(sr, -rr, res));
+	zeroWriteBackLog();
+}
+
+// CMPI $amD, #I
+// 0000 001r 1000 0000
+// iiii iiii iiii iiii
+// Compares mid accumulator $acD.hm ($amD) with sign extended immediate value I.
+// Although flags are being set regarding whole accumulator register.
+//
+// flags out: x-xx xxxx
+void cmpi(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+
+	s64 val = dsp_get_long_acc(reg);
+	s64 imm = (s64)(s16)dsp_fetch_code() << 16; // Immediate is considered to be at M level in the 40-bit accumulator.
+	s64 res = dsp_convert_long_acc(val - imm);
+
+	Update_SR_Register64(res, isCarry2(val, res), isOverflow(val, -imm, res));
+}
+
+// CMPIS $acD, #I
+// 0000 011d iiii iiii
+// Compares accumulator with short immediate. Comaprison is executed
+// by subtracting short immediate (8bit sign extended) from mid accumulator
+// $acD.hm and computing flags based on whole accumulator $acD.
+//
+// flags out: x-xx xxxx
+void cmpis(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(areg);
+	s64 val = (s8)opc;
+	val <<= 16;
+	s64 res = dsp_convert_long_acc(acc - val);
+
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -val, res));
+}
+
+//----
+
+// XORR $acD.m, $axS.h
+// 0011 00sd 0xxx xxxx
+// Logic XOR (exclusive or) middle part of accumulator $acD.m with
+// high part of secondary accumulator $axS.h.
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void xorr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m ^ g_dsp.r.ax[sreg].h;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// ANDR $acD.m, $axS.h
+// 0011 01sd 0xxx xxxx
+// Logic AND middle part of accumulator $acD.m with high part of
+// secondary accumulator $axS.h.
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void andr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m & g_dsp.r.ax[sreg].h;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// ORR $acD.m, $axS.h
+// 0011 10sd 0xxx xxxx
+// Logic OR middle part of accumulator $acD.m with high part of
+// secondary accumulator $axS.h.
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void orr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m | g_dsp.r.ax[sreg].h;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// ANDC $acD.m, $ac(1-D).m
+// 0011 110d 0xxx xxxx
+// Logic AND middle part of accumulator $acD.m with middle part of
+// accumulator $ac(1-D).m
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void andc(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m & g_dsp.r.ac[1 - dreg].m;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// ORC $acD.m, $ac(1-D).m
+// 0011 111d 0xxx xxxx
+// Logic OR middle part of accumulator $acD.m with middle part of
+// accumulator $ac(1-D).m.
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void orc(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m | g_dsp.r.ac[1 - dreg].m;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// XORC $acD.m
+// 0011 000d 1xxx xxxx
+// Logic XOR (exclusive or) middle part of accumulator $acD.m with $ac(1-D).m
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void xorc(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m ^ g_dsp.r.ac[1 - dreg].m;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// NOT $acD.m
+// 0011 001d 1xxx xxxx
+// Invert all bits in dest reg, aka xor with 0xffff
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void notc(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u16 accm = g_dsp.r.ac[dreg].m ^ 0xffff;
+
+	zeroWriteBackLogPreserveAcc(dreg);
+
+	g_dsp.r.ac[dreg].m = accm;
+	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
+}
+
+// XORI $acD.m, #I
+// 0000 001r 0010 0000
+// iiii iiii iiii iiii
+// Logic exclusive or (XOR) of accumulator mid part $acD.m with
+// immediate value I.
+//
+// flags out: --xx xx00
+void xori(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+	u16 imm = dsp_fetch_code();
+	g_dsp.r.ac[reg].m ^= imm;
+
+	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
+}
+
+// ANDI $acD.m, #I
+// 0000 001r 0100 0000
+// iiii iiii iiii iiii
+// Logic AND of accumulator mid part $acD.m with immediate value I.
+//
+// flags out: --xx xx00
+void andi(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+	u16 imm = dsp_fetch_code();
+	g_dsp.r.ac[reg].m &= imm;
+
+	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
+}
+
+// ORI $acD.m, #I
+// 0000 001r 0110 0000
+// iiii iiii iiii iiii
+// Logic OR of accumulator mid part $acD.m with immediate value I.
+//
+// flags out: --xx xx00
+void ori(const UDSPInstruction opc)
+{
+	u8 reg  = (opc >> 8) & 0x1;
+	u16 imm = dsp_fetch_code();
+	g_dsp.r.ac[reg].m |= imm;
+
+	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
+}
+
+//----
+
+// ADDR $acD.M, $axS.L
+// 0100 0ssd xxxx xxxx
+// Adds register $axS.L to accumulator $acD.M register.
+//
+// flags out: x-xx xxxx
+void addr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 ax = 0;
+
+	switch (sreg)
+	{
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
+		break;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
+		break;
+	default:
+		ax = 0;
+		break;
+	}
+
+	ax <<= 16;
+	s64 res = acc + ax;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, ax, res));
+}
+
+// ADDAX $acD, $axS
+// 0100 10sd xxxx xxxx
+// Adds secondary accumulator $axS to accumulator register $acD.
+//
+// flags out: x-xx xxxx
+void addax(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 ax  = dsp_get_long_acx(sreg);
+	s64 res = acc + ax;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, ax, res));
+}
+
+// ADD $acD, $ac(1-D)
+// 0100 110d xxxx xxxx
+// Adds accumulator $ac(1-D) to accumulator register $acD.
+//
+// flags out: x-xx xxxx
+void add(const UDSPInstruction opc)
+{
+	u8 dreg  = (opc >> 8) & 0x1;
+
+	s64 acc0 = dsp_get_long_acc(dreg);
+	s64 acc1 = dsp_get_long_acc(1 - dreg);
+	s64 res = acc0 + acc1;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc0, res), isOverflow(acc0, acc1, res));
+}
+
+// ADDP $acD
+// 0100 111d xxxx xxxx
+// Adds product register to accumulator register.
+//
+// flags out: x-xx xxxx
+void addp(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 prod = dsp_get_long_prod();
+	s64 res = acc + prod;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, prod, res));
+}
+
+// ADDAXL $acD, $axS.l
+// 0111 00sd xxxx xxxx
+// Adds secondary accumulator $axS.l to accumulator register $acD.
+// should be unsigned values!!
+//
+// flags out: x-xx xxxx
+void addaxl(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 9) & 0x1;
+	u8 dreg = (opc >> 8) & 0x1;
+
+	u64 acc = dsp_get_long_acc(dreg);
+	u16 acx = (u16)dsp_get_ax_l(sreg);
+
+	u64 res = acc + acx;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, (s64)res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64((s64)res, isCarry(acc, res), isOverflow((s64)acc, (s64)acx, (s64)res));
+}
+
+// ADDI $amR, #I
+// 0000 001r 0000 0000
+// iiii iiii iiii iiii
+// Adds immediate (16-bit sign extended) to mid accumulator $acD.hm.
+//
+// flags out: x-xx xxxx
+void addi(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(areg);
+	s64 imm = (s16)dsp_fetch_code();
+	imm <<= 16;
+	s64 res = acc + imm;
+
+	dsp_set_long_acc(areg, res);
+	res = dsp_get_long_acc(areg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, imm, res));
+}
+
+// ADDIS $acD, #I
+// 0000 010d iiii iiii
+// Adds short immediate (8-bit sign extended) to mid accumulator $acD.hm.
+//
+// flags out: x-xx xxxx
+void addis(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 imm = (s8)(u8)opc;
+	imm <<= 16;
+	s64 res = acc + imm;
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, imm, res));
+}
+
+// INCM $acsD
+// 0111 010d xxxx xxxx
+// Increment 24-bit mid-accumulator $acsD.
+//
+// flags out: x-xx xxxx
+void incm(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 sub = 0x10000;
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 res = acc + sub;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, sub, res));
+}
+
+// INC $acD
+// 0111 011d xxxx xxxx
+// Increment accumulator $acD.
+//
+// flags out: x-xx xxxx
+void inc(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 res = acc + 1;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, 1, res));
+}
+
+//----
+
+// SUBR $acD.M, $axS.L
+// 0101 0ssd xxxx xxxx
+// Subtracts register $axS.L from accumulator $acD.M register.
+//
+// flags out: x-xx xxxx
+void subr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 ax = 0;
+
+	switch (sreg)
+	{
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
+		break;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
+		break;
+	default:
+		ax = 0;
+		break;
+	}
+
+	ax <<= 16;
+	s64 res = acc - ax;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -ax, res));
+}
+
+// SUBAX $acD, $axS
+// 0101 10sd xxxx xxxx
+// Subtracts secondary accumulator $axS from accumulator register $acD.
+//
+// flags out: x-xx xxxx
+void subax(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 acx = dsp_get_long_acx(sreg);
+	s64 res = acc - acx;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -acx, res));
+}
+
+// SUB $acD, $ac(1-D)
+// 0101 110d xxxx xxxx
+// Subtracts accumulator $ac(1-D) from accumulator register $acD.
+//
+// flags out: x-xx xxxx
+void sub(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc1 = dsp_get_long_acc(dreg);
+	s64 acc2 = dsp_get_long_acc(1 - dreg);
+	s64 res = acc1 - acc2;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc1, res), isOverflow(acc1, -acc2, res));
+}
+
+// SUBP $acD
+// 0101 111d xxxx xxxx
+// Subtracts product register from accumulator register.
+//
+// flags out: x-xx xxxx
+void subp(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 prod = dsp_get_long_prod();
+	s64 res = acc - prod;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -prod, res));
+}
+
+// DECM $acsD
+// 0111 100d xxxx xxxx
+// Decrement 24-bit mid-accumulator $acsD.
+//
+// flags out: x-xx xxxx
+void decm(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x01;
+
+	s64 sub = 0x10000;
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 res = acc - sub;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -sub, res));
+}
+
+// DEC $acD
+// 0111 101d xxxx xxxx
+// Decrement accumulator $acD.
+//
+// flags out: x-xx xxxx
+void dec(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x01;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	s64 res = acc - 1;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -1, res));
+}
+
+//----
+
+// NEG $acD
+// 0111 110d xxxx xxxx
+// Negate accumulator $acD.
+//
+// flags out: --xx xx00
+void neg(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+	acc = 0 - acc;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+// ABS  $acD
+// 1010 d001 xxxx xxxx
+// absolute value of $acD
+//
+// flags out: --xx xx00
+void abs(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 11) & 0x1;
+
+	s64 acc = dsp_get_long_acc(dreg);
+
+	if (acc < 0)
+		acc = 0 - acc;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+//----
+
+// MOVR $acD, $axS.R
+// 0110 0srd xxxx xxxx
+// Moves register $axS.R (sign extended) to middle accumulator $acD.hm.
+// Sets $acD.l to 0.
+//
+// flags out: --xx xx00
+void movr(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 8) & 0x1;
+	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
+
+	s64 ax = 0;
+	switch (sreg)
+	{
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
+		break;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
+		break;
+	default:
+		ax = 0;
+		break;
+	}
+	ax <<= 16;
+	ax &= ~0xffff;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(areg, ax);
+	Update_SR_Register64(ax);
+}
+
+// MOVAX $acD, $axS
+// 0110 10sd xxxx xxxx
+// Moves secondary accumulator $axS to accumulator $axD.
+//
+// flags out: --xx xx00
+void movax(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s64 acx = dsp_get_long_acx(sreg);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acx);
+	Update_SR_Register64(acx);
+}
+
+// MOV $acD, $ac(1-D)
+// 0110 110d xxxx xxxx
+// Moves accumulator $ax(1-D) to accumulator $axD.
+//
+// flags out: --x0 xx00
+void mov(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u64 acc = dsp_get_long_acc(1 - dreg);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(acc);
+}
+
+//----
+
+// LSL16 $acR
+// 1111 000r xxxx xxxx
+// Logically shifts left accumulator $acR by 16.
+//
+// flags out: --xx xx00
+void lsl16(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_acc(areg);
+	acc <<= 16;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(areg, acc);
+	Update_SR_Register64(dsp_get_long_acc(areg));
+}
+
+// LSR16 $acR
+// 1111 010r xxxx xxxx
+// Logically shifts right accumulator $acR by 16.
+//
+// flags out: --xx xx00
+void lsr16(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 8) & 0x1;
+
+	u64 acc = dsp_get_long_acc(areg);
+	acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes
+	acc >>= 16;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(areg, (s64)acc);
+	Update_SR_Register64(dsp_get_long_acc(areg));
+}
+
+// ASR16 $acR
+// 1001 r001 xxxx xxxx
+// Arithmetically shifts right accumulator $acR by 16.
+//
+// flags out: --xx xx00
+void asr16(const UDSPInstruction opc)
+{
+	u8 areg = (opc >> 11) & 0x1;
+
+	s64 acc = dsp_get_long_acc(areg);
+	acc >>= 16;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(areg, acc);
+	Update_SR_Register64(dsp_get_long_acc(areg));
+}
+
+// LSL $acR, #I
+// 0001 010r 00ii iiii
+// Logically shifts left accumulator $acR by number specified by value I.
+//
+// flags out: --xx xx00
+void lsl(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x01;
+	u16 shift = opc & 0x3f;
+	u64 acc = dsp_get_long_acc(rreg);
+
+	acc <<= shift;
+
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// LSR $acR, #I
+// 0001 010r 01ii iiii
+// Logically shifts right accumulator $acR by number specified by value
+// calculated by negating sign extended bits 0-6.
+//
+// flags out: --xx xx00
+void lsr(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x01;
+	u16 shift;
+	u64 acc = dsp_get_long_acc(rreg);
+	acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes
+
+	if ((opc & 0x3f) == 0)
+		shift = 0;
+	else
+		shift = 0x40 - (opc & 0x3f);
+
+	acc >>= shift;
+
+	dsp_set_long_acc(rreg, (s64)acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// ASL $acR, #I
+// 0001 010r 10ii iiii
+// Logically shifts left accumulator $acR by number specified by value I.
+//
+// flags out: --xx xx00
+void asl(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x01;
+	u16 shift = opc & 0x3f;
+	u64 acc = dsp_get_long_acc(rreg);
+
+	acc <<= shift;
+
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// ASR $acR, #I
+// 0001 010r 11ii iiii
+// Arithmetically shifts right accumulator $acR by number specified by
+// value calculated by negating sign extended bits 0-6.
+//
+// flags out: --xx xx00
+void asr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x01;
+	u16 shift;
+
+	if ((opc & 0x3f) == 0)
+		shift = 0;
+	else
+		shift = 0x40 - (opc & 0x3f);
+
+	// arithmetic shift
+	s64 acc = dsp_get_long_acc(dreg);
+	acc >>= shift;
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+// LSRN  (fixed parameters)
+// 0000 0010 1100 1010
+// Logically shifts right accumulator $ACC0 by lower 7-bit (signed) value in $AC1.M
+// (if value negative, becomes left shift).
+//
+// flags out: --xx xx00
+void lsrn(const UDSPInstruction opc)
+{
+	s16 shift;
+	u16 accm = (u16)dsp_get_acc_m(1);
+	u64 acc = dsp_get_long_acc(0);
+	acc &= 0x000000FFFFFFFFFFULL;
+
+	if ((accm & 0x3f) == 0)
+		shift = 0;
+	else if (accm & 0x40)
+		shift = -0x40 + (accm & 0x3f);
+	else
+		shift = accm & 0x3f;
+
+	if (shift > 0)
+	{
+		acc >>= shift;
+	}
+	else if (shift < 0)
+	{
+		acc <<= -shift;
+	}
+
+	dsp_set_long_acc(0, (s64)acc);
+	Update_SR_Register64(dsp_get_long_acc(0));
+}
+
+// ASRN  (fixed parameters)
+// 0000 0010 1100 1011
+// Arithmetically shifts right accumulator $ACC0 by lower 7-bit (signed) value in $AC1.M
+// (if value negative, becomes left shift).
+//
+// flags out: --xx xx00
+void asrn(const UDSPInstruction opc)
+{
+	s16 shift;
+	u16 accm = (u16)dsp_get_acc_m(1);
+	s64 acc = dsp_get_long_acc(0);
+
+	if ((accm & 0x3f) == 0)
+		shift = 0;
+	else if (accm & 0x40)
+		shift = -0x40 + (accm & 0x3f);
+	else
+		shift = accm & 0x3f;
+
+	if (shift > 0)
+	{
+		acc >>= shift;
+	}
+	else if (shift < 0)
+	{
+		acc <<= -shift;
+	}
+
+	dsp_set_long_acc(0, acc);
+	Update_SR_Register64(dsp_get_long_acc(0));
+}
+
+// LSRNRX $acD, $axS.h
+// 0011 01sd 1xxx xxxx
+// Logically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AX[S].H
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void lsrnrx(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s16 shift;
+	u16 axh = g_dsp.r.ax[sreg].h;
+	u64 acc = dsp_get_long_acc(dreg);
+	acc &= 0x000000FFFFFFFFFFULL;
+
+	if ((axh & 0x3f) == 0)
+		shift = 0;
+	else if (axh & 0x40)
+		shift = -0x40 + (axh & 0x3f);
+	else
+		shift = axh & 0x3f;
+
+	if (shift > 0)
+	{
+		acc <<= shift;
+	}
+	else if (shift < 0)
+	{
+		acc >>= -shift;
+	}
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, (s64)acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+// ASRNRX $acD, $axS.h
+// 0011 10sd 1xxx xxxx
+// Arithmetically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AX[S].H
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void asrnrx(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s16 shift;
+	u16 axh = g_dsp.r.ax[sreg].h;
+	s64 acc = dsp_get_long_acc(dreg);
+
+	if ((axh & 0x3f) == 0)
+		shift = 0;
+	else if (axh & 0x40)
+		shift = -0x40 + (axh & 0x3f);
+	else
+		shift = axh & 0x3f;
+
+	if (shift > 0)
+	{
+		acc <<= shift;
+	}
+	else if (shift < 0)
+	{
+		acc >>= -shift;
+	}
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+// LSRNR  $acD
+// 0011 110d 1xxx xxxx
+// Logically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void lsrnr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s16 shift;
+	u16 accm = (u16)dsp_get_acc_m(1 - dreg);
+	u64 acc = dsp_get_long_acc(dreg);
+	acc &= 0x000000FFFFFFFFFFULL;
+
+	if ((accm & 0x3f) == 0)
+		shift = 0;
+	else if (accm & 0x40)
+		shift = -0x40 + (accm & 0x3f);
+	else
+		shift = accm & 0x3f;
+
+	if (shift > 0)
+		acc <<= shift;
+	else if (shift < 0)
+		acc >>= -shift;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, (s64)acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+// ASRNR  $acD
+// 0011 111d 1xxx xxxx
+// Arithmetically shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
+// x = extension (7 bits!!)
+//
+// flags out: --xx xx00
+void asrnr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s16 shift;
+	u16 accm = (u16)dsp_get_acc_m(1 - dreg);
+	s64 acc = dsp_get_long_acc(dreg);
+
+	if ((accm & 0x3f) == 0)
+		shift = 0;
+	else if (accm & 0x40)
+		shift = -0x40 + (accm & 0x3f);
+	else
+		shift = accm & 0x3f;
+
+	if (shift > 0)
+		acc <<= shift;
+	else if (shift < 0)
+		acc >>= -shift;
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(dreg));
+}
+
+
+}  // namespace
+
diff --git a/Source/Core/Core/DSP/DSPIntBranch.cpp b/Source/Core/Core/DSP/DSPIntBranch.cpp
new file mode 100644
index 0000000000..318196d520
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntBranch.cpp
@@ -0,0 +1,269 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPStacks.h"
+
+namespace DSPInterpreter {
+
+// Generic call implementation
+// CALLcc addressA
+// 0000 0010 1011 cccc
+// aaaa aaaa aaaa aaaa
+// Call function if condition cc has been met. Push program counter of
+// instruction following "call" to $st0. Set program counter to address
+// represented by value that follows this "call" instruction.
+void call(const UDSPInstruction opc)
+{
+	// must be outside the if.
+	u16 dest = dsp_fetch_code();
+	if (CheckCondition(opc & 0xf))
+	{
+		dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
+		g_dsp.pc = dest;
+	}
+}
+
+// Generic callr implementation
+// CALLRcc $R
+// 0001 0111 rrr1 cccc
+// Call function if condition cc has been met. Push program counter of
+// instruction following "call" to call stack $st0. Set program counter to
+// register $R.
+void callr(const UDSPInstruction opc)
+{
+	if (CheckCondition(opc & 0xf))
+	{
+		u8 reg  = (opc >> 5) & 0x7;
+		u16 addr = dsp_op_read_reg(reg);
+		dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
+		g_dsp.pc = addr;
+	}
+}
+
+// Generic if implementation
+// IFcc
+// 0000 0010 0111 cccc
+// Execute following opcode if the condition has been met.
+void ifcc(const UDSPInstruction opc)
+{
+	if (!CheckCondition(opc & 0xf))
+	{
+		// skip the next opcode - we have to lookup its size.
+		dsp_skip_inst();
+	}
+}
+
+// Generic jmp implementation
+// Jcc addressA
+// 0000 0010 1001 cccc
+// aaaa aaaa aaaa aaaa
+// Jump to addressA if condition cc has been met. Set program counter to
+// address represented by value that follows this "jmp" instruction.
+void jcc(const UDSPInstruction opc)
+{
+	u16 dest = dsp_fetch_code();
+	if (CheckCondition(opc & 0xf))
+	{
+		g_dsp.pc = dest;
+	}
+}
+
+// Generic jmpr implementation
+// JMPcc $R
+// 0001 0111 rrr0 cccc
+// Jump to address; set program counter to a value from register $R.
+void jmprcc(const UDSPInstruction opc)
+{
+	if (CheckCondition(opc & 0xf))
+	{
+		u8 reg  = (opc >> 5) & 0x7;
+		g_dsp.pc = dsp_op_read_reg(reg);
+	}
+}
+
+// Generic ret implementation
+// RETcc
+// 0000 0010 1101 cccc
+// Return from subroutine if condition cc has been met. Pops stored PC
+// from call stack $st0 and sets $pc to this location.
+void ret(const UDSPInstruction opc)
+{
+	if (CheckCondition(opc & 0xf))
+	{
+		g_dsp.pc = dsp_reg_load_stack(DSP_STACK_C);
+	}
+}
+
+// RTI
+// 0000 0010 1111 1111
+// Return from exception. Pops stored status register $sr from data stack
+// $st1 and program counter PC from call stack $st0 and sets $pc to this
+// location.
+void rti(const UDSPInstruction opc)
+{
+	g_dsp.r.sr = dsp_reg_load_stack(DSP_STACK_D);
+	g_dsp.pc = dsp_reg_load_stack(DSP_STACK_C);
+
+}
+
+// HALT
+// 0000 0000 0020 0001
+// Stops execution of DSP code. Sets bit DSP_CR_HALT in register DREG_CR.
+void halt(const UDSPInstruction opc)
+{
+	g_dsp.cr |= 0x4;
+	g_dsp.pc--;
+}
+
+
+// LOOP handling: Loop stack is used to control execution of repeated blocks of
+// instructions. Whenever there is value on stack $st2 and current PC is equal
+// value at $st2, then value at stack $st3 is decremented. If value is not zero
+// then PC is modified with value from call stack $st0. Otherwise values from
+// call stack $st0 and both loop stacks $st2 and $st3 are popped and execution
+// continues at next opcode.
+void HandleLoop()
+{
+	// Handle looping hardware.
+	const u16 rCallAddress = g_dsp.r.st[0];
+	const u16 rLoopAddress = g_dsp.r.st[2];
+	u16& rLoopCounter = g_dsp.r.st[3];
+
+	if (rLoopAddress > 0 && rLoopCounter > 0)
+	{
+		// FIXME: why -1? because we just read past it.
+		if (g_dsp.pc - 1 == rLoopAddress)
+		{
+			rLoopCounter--;
+			if (rLoopCounter > 0)
+			{
+				g_dsp.pc = rCallAddress;
+			}
+			else
+			{
+				// end of loop
+				dsp_reg_load_stack(0);
+				dsp_reg_load_stack(2);
+				dsp_reg_load_stack(3);
+			}
+		}
+	}
+}
+
+
+// LOOP $R
+// 0000 0000 010r rrrr
+// Repeatedly execute following opcode until counter specified by value
+// from register $R reaches zero. Each execution decrement counter. Register
+// $R remains unchanged. If register $R is set to zero at the beginning of loop
+// then looped instruction will not get executed.
+// Actually, this instruction simply prepares the loop stacks for the above.
+// The looping hardware takes care of the rest.
+void loop(const UDSPInstruction opc)
+{
+	u16 reg = opc & 0x1f;
+	u16 cnt = dsp_op_read_reg(reg);
+	u16 loop_pc = g_dsp.pc;
+
+	if (cnt)
+	{
+		dsp_reg_store_stack(0, g_dsp.pc);
+		dsp_reg_store_stack(2, loop_pc);
+		dsp_reg_store_stack(3, cnt);
+	}
+	else
+	{
+		dsp_skip_inst();
+	}
+}
+
+// LOOPI #I
+// 0001 0000 iiii iiii
+// Repeatedly execute following opcode until counter specified by
+// immediate value I reaches zero. Each execution decrement counter. If
+// immediate value I is set to zero at the beginning of loop then looped
+// instruction will not get executed.
+// Actually, this instruction simply prepares the loop stacks for the above.
+// The looping hardware takes care of the rest.
+void loopi(const UDSPInstruction opc)
+{
+	u16 cnt = opc & 0xff;
+	u16 loop_pc = g_dsp.pc;
+
+	if (cnt)
+	{
+		dsp_reg_store_stack(0, g_dsp.pc);
+		dsp_reg_store_stack(2, loop_pc);
+		dsp_reg_store_stack(3, cnt);
+	}
+	else
+	{
+		dsp_skip_inst();
+	}
+}
+
+
+// BLOOP $R, addrA
+// 0000 0000 011r rrrr
+// aaaa aaaa aaaa aaaa
+// Repeatedly execute block of code starting at following opcode until
+// counter specified by value from register $R reaches zero. Block ends at
+// specified address addrA inclusive, ie. opcode at addrA is the last opcode
+// included in loop. Counter is pushed on loop stack $st3, end of block address
+// is pushed on loop stack $st2 and repeat address is pushed on call stack $st0.
+// Up to 4 nested loops are allowed.
+void bloop(const UDSPInstruction opc)
+{
+	u16 reg = opc & 0x1f;
+	u16 cnt = dsp_op_read_reg(reg);
+	u16 loop_pc = dsp_fetch_code();
+
+	if (cnt)
+	{
+		dsp_reg_store_stack(0, g_dsp.pc);
+		dsp_reg_store_stack(2, loop_pc);
+		dsp_reg_store_stack(3, cnt);
+	}
+	else
+	{
+		g_dsp.pc = loop_pc;
+		dsp_skip_inst();
+	}
+}
+
+// BLOOPI #I, addrA
+// 0001 0001 iiii iiii
+// aaaa aaaa aaaa aaaa
+// Repeatedly execute block of code starting at following opcode until
+// counter specified by immediate value I reaches zero. Block ends at specified
+// address addrA inclusive, ie. opcode at addrA is the last opcode included in
+// loop. Counter is pushed on loop stack $st3, end of block address is pushed
+// on loop stack $st2 and repeat address is pushed on call stack $st0. Up to 4
+// nested loops are allowed.
+void bloopi(const UDSPInstruction opc)
+{
+	u16 cnt = opc & 0xff;
+	u16 loop_pc = dsp_fetch_code();
+
+	if (cnt)
+	{
+		dsp_reg_store_stack(0, g_dsp.pc);
+		dsp_reg_store_stack(2, loop_pc);
+		dsp_reg_store_stack(3, cnt);
+	}
+	else
+	{
+		g_dsp.pc = loop_pc;
+		dsp_skip_inst();
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/DSP/DSPIntCCUtil.cpp
similarity index 85%
rename from Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
rename to Source/Core/Core/DSP/DSPIntCCUtil.cpp
index af75aedcc3..310006a724 100644
--- a/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
+++ b/Source/Core/Core/DSP/DSPIntCCUtil.cpp
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
@@ -7,9 +7,9 @@
 
 // HELPER FUNCTIONS
 
-#include "DSPIntCCUtil.h"
-#include "DSPCore.h"
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
 
 namespace DSPInterpreter {
 
@@ -27,7 +27,7 @@ void Update_SR_Register64(s64 _Value, bool carry, bool overflow)
 	if (overflow)
 	{
 		g_dsp.r.sr |= SR_OVERFLOW;
-		g_dsp.r.sr  |= SR_OVERFLOW_STICKY; 
+		g_dsp.r.sr  |= SR_OVERFLOW_STICKY;
 	}
 
 	// 0x04
@@ -79,14 +79,14 @@ void Update_SR_Register16(s16 _Value, bool carry, bool overflow, bool overS32)
 		g_dsp.r.sr |= SR_ARITH_ZERO;
 	}
 
-	// 0x08 
+	// 0x08
 	if (_Value < 0)
 	{
 		g_dsp.r.sr |= SR_SIGN;
 	}
 
 	// 0x10
-	if (overS32) 
+	if (overS32)
 	{
 		g_dsp.r.sr |= SR_OVER_S32;
 	}
@@ -100,7 +100,7 @@ void Update_SR_Register16(s16 _Value, bool carry, bool overflow, bool overS32)
 
 void Update_SR_LZ(bool value)
 {
-	if (value == true) 
+	if (value == true)
 		g_dsp.r.sr |= SR_LOGIC_ZERO;
 	else
 		g_dsp.r.sr &= ~SR_LOGIC_ZERO;
@@ -111,31 +111,38 @@ inline int GetMultiplyModifier()
 	return (g_dsp.r.sr & SR_MUL_MODIFY)?1:2;
 }
 
-inline bool isCarry() {
+inline bool isCarry()
+{
 	return (g_dsp.r.sr & SR_CARRY) ? true : false;
 }
 
-inline bool isOverflow() {
+inline bool isOverflow()
+{
 	return (g_dsp.r.sr & SR_OVERFLOW) ? true : false;
 }
 
-inline bool isOverS32() {
+inline bool isOverS32()
+{
 	return (g_dsp.r.sr & SR_OVER_S32) ? true : false;
 }
 
-inline bool isLess() {
+inline bool isLess()
+{
 	return (!(g_dsp.r.sr & SR_OVERFLOW) != !(g_dsp.r.sr & SR_SIGN));
 }
 
-inline bool isZero() {
+inline bool isZero()
+{
 	return (g_dsp.r.sr & SR_ARITH_ZERO) ? true : false;
 }
 
-inline bool isLogicZero() {
+inline bool isLogicZero()
+{
 	return (g_dsp.r.sr & SR_LOGIC_ZERO) ? true : false;
 }
 
-inline bool isConditionA() {
+inline bool isConditionA()
+{
 	return (((g_dsp.r.sr & SR_OVER_S32) || (g_dsp.r.sr & SR_TOP2BITS)) && !(g_dsp.r.sr & SR_ARITH_ZERO)) ? true : false;
 }
 
@@ -156,11 +163,11 @@ bool CheckCondition(u8 _Condition)
 		return isLess() || isZero();
 	case 0x4: // NZ - Not Zero
 		return !isZero();
-	case 0x5: // Z - Zero 
+	case 0x5: // Z - Zero
 		return isZero();
 	case 0x6: // NC - Not carry
 		return !isCarry();
-	case 0x7: // C - Carry 
+	case 0x7: // C - Carry
 		return isCarry();
 	case 0x8: // ? - Not over s32
 		return !isOverS32();
diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/DSPIntCCUtil.h
new file mode 100644
index 0000000000..287e57fba4
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntCCUtil.h
@@ -0,0 +1,44 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#pragma once
+
+// Anything to do with SR and conditions goes here.
+
+#include "Common/CommonTypes.h"
+
+namespace DSPInterpreter
+{
+
+bool CheckCondition(u8 _Condition);
+
+int GetMultiplyModifier();
+
+void Update_SR_Register16(s16 _Value, bool carry = false, bool overflow = false, bool overS32 = false);
+void Update_SR_Register64(s64 _Value, bool carry = false, bool overflow = false);
+void Update_SR_LZ(bool value);
+
+inline bool isCarry(u64 val, u64 result)
+{
+	return (val > result);
+}
+
+inline bool isCarry2(u64 val, u64 result)
+{
+	return (val >= result);
+}
+
+inline bool isOverflow(s64 val1, s64 val2, s64 res)
+{
+	return ((val1 ^ res) & (val2 ^ res)) < 0;
+}
+
+inline bool isOverS32(s64 acc)
+{
+	return (acc != (s32)acc) ? true : false;
+}
+
+}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp b/Source/Core/Core/DSP/DSPIntExtOps.cpp
similarity index 96%
rename from Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
rename to Source/Core/Core/DSP/DSPIntExtOps.cpp
index bc448233ba..189874db7c 100644
--- a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
+++ b/Source/Core/Core/DSP/DSPIntExtOps.cpp
@@ -1,13 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DSPIntUtil.h"
-#include "DSPMemoryMap.h"
 #include "DSPIntExtOps.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 //not needed for game ucodes (it slows down interpreter/dspjit32 + easier to compare int VS dspjit64 without it)
-//#define PRECISE_BACKLOG 
+//#define PRECISE_BACKLOG
 
 // Extended opcodes do not exist on their own. These opcodes can only be
 // attached to opcodes that allow extending (8 (or 7) lower bits of opcode not used by
@@ -29,12 +29,12 @@ inline static void writeToBackLog(int i, int idx, u16 value)
 namespace DSPInterpreter
 {
 
-namespace Ext 
+namespace Ext
 {
 
 inline bool IsSameMemArea(u16 a, u16 b)
 {
-//LM: tested on WII
+	// LM: tested on Wii
 	if ((a>>10)==(b>>10))
 		return true;
 	else
@@ -63,7 +63,7 @@ void ir(const UDSPInstruction opc)
 void nr(const UDSPInstruction opc)
 {
 	u8 reg = opc & 0x3;
-	
+
 	writeToBackLog(0, reg, dsp_increase_addr_reg(reg, (s16)g_dsp.r.ix[reg]));
 }
 
@@ -75,7 +75,7 @@ void mv(const UDSPInstruction opc)
 	u8 sreg = (opc & 0x3) + DSP_REG_ACL0;
 	u8 dreg = ((opc >> 2) & 0x3);
 
-	switch(sreg)
+	switch (sreg)
 	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
@@ -87,7 +87,7 @@ void mv(const UDSPInstruction opc)
 		break;
 	}
 }
-	
+
 // S @$arD, $acS.S
 // xxxx xxxx 001s s0dd
 // Store value of $acS.S in the memory pointed by register $arD.
@@ -97,7 +97,7 @@ void s(const UDSPInstruction opc)
 	u8 dreg = opc & 0x3;
 	u8 sreg = ((opc >> 3) & 0x3) + DSP_REG_ACL0;
 
-	switch(sreg)
+	switch (sreg)
 	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
@@ -120,7 +120,7 @@ void sn(const UDSPInstruction opc)
 	u8 dreg = opc & 0x3;
 	u8 sreg = ((opc >> 3) & 0x3) + DSP_REG_ACL0;
 
-	switch(sreg)
+	switch (sreg)
 	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
@@ -136,14 +136,14 @@ void sn(const UDSPInstruction opc)
 
 // L $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Load $axD.D/$acD.D with value from memory pointed by register $arS.
 // Post increment register $arS.
 void l(const UDSPInstruction opc)
 {
 	u8 sreg = opc & 0x3;
 	u8 dreg = ((opc >> 3) & 0x7) + DSP_REG_AXL0;
-	
-	if ((dreg >= DSP_REG_ACM0) && (g_dsp.r.sr & SR_40_MODE_BIT)) 
+
+	if ((dreg >= DSP_REG_ACM0) && (g_dsp.r.sr & SR_40_MODE_BIT))
 	{
 		u16 val = dsp_dmem_read(g_dsp.r.ar[sreg]);
 		writeToBackLog(0, dreg - DSP_REG_ACM0 + DSP_REG_ACH0, (val & 0x8000) ? 0xFFFF : 0x0000);
@@ -160,14 +160,14 @@ void l(const UDSPInstruction opc)
 
 // LN $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Load $axD.D/$acD.D with value from memory pointed by register $arS.
 // Add indexing register $ixS to register $arS.
 void ln(const UDSPInstruction opc)
 {
 	u8 sreg = opc & 0x3;
 	u8 dreg = ((opc >> 3) & 0x7) + DSP_REG_AXL0;
 
-	if ((dreg >= DSP_REG_ACM0) && (g_dsp.r.sr & SR_40_MODE_BIT)) 
+	if ((dreg >= DSP_REG_ACM0) && (g_dsp.r.sr & SR_40_MODE_BIT))
 	{
 		u16 val = dsp_dmem_read(g_dsp.r.ar[sreg]);
 		writeToBackLog(0, dreg - DSP_REG_ACM0 + DSP_REG_ACH0, (val & 0x8000) ? 0xFFFF : 0x0000);
@@ -196,7 +196,7 @@ void ls(const UDSPInstruction opc)
 
 	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[0]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
-	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
+	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
 
 
@@ -269,7 +269,7 @@ void sl(const UDSPInstruction opc)
 
 	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[3]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
-	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
+	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
 
 // SLN $acS.m, $axD.D
@@ -329,7 +329,7 @@ void slnm(const UDSPInstruction opc)
 // LD $ax0.d, $ax1.r, @$arS
 // xxxx xxxx 11dr 00ss
 // example for "nx'ld $AX0.L, $AX1.L, @$AR3"
-// Loads the word pointed by AR0 to AX0.H, then loads the word pointed by AR3 to AX0.L. 
+// Loads the word pointed by AR0 to AX0.H, then loads the word pointed by AR3 to AX0.L.
 // Increments AR0 and AR3.
 // If AR0 and AR3 point into the same memory page (upper 6 bits of addr are the same -> games are not doing that!)
 // then the value pointed by AR0 is loaded to BOTH AX0.H and AX0.L.
@@ -532,7 +532,7 @@ void applyWriteBackLog()
 // then 0 | ext output = ext output and if it did then bitwise or is still the
 // right thing to do
 // Only needed for cases when mainop and extended are modifying the same ACC
-// Games are not doing that + in motorola (similar dsp) dox this is forbidden to do.
+// Games are not doing that + in motorola (similar DSP) dox this is forbidden to do.
 void zeroWriteBackLog()
 {
 #ifdef PRECISE_BACKLOG
@@ -545,18 +545,18 @@ void zeroWriteBackLog()
 #endif
 }
 
-void zeroWriteBackLogPreserveAcc(u8 acc) 
+void zeroWriteBackLogPreserveAcc(u8 acc)
 {
 #ifdef PRECISE_BACKLOG
 	for (int i = 0; writeBackLogIdx[i] != -1; i++)
 	{
 		// acc0
-		if ((acc == 0) &&  
+		if ((acc == 0) &&
 			((writeBackLogIdx[i] == DSP_REG_ACL0) || (writeBackLogIdx[i] == DSP_REG_ACM0) || (writeBackLogIdx[i] == DSP_REG_ACH0)))
 			continue;
-		
+
 		// acc1
-		if ((acc == 1) && 
+		if ((acc == 1) &&
 			((writeBackLogIdx[i] == DSP_REG_ACL1) || (writeBackLogIdx[i] == DSP_REG_ACM1) || (writeBackLogIdx[i] == DSP_REG_ACH1)))
 			continue;
 
diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/DSPIntExtOps.h
new file mode 100644
index 0000000000..8aa18b830d
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntExtOps.h
@@ -0,0 +1,45 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2005 Duddie
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/DSP/DSPCommon.h"
+
+// Extended opcode support.
+// Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension
+// can be stored.
+
+namespace DSPInterpreter
+{
+namespace Ext
+{
+void l(const UDSPInstruction opc);
+void ln(const UDSPInstruction opc);
+void ls(const UDSPInstruction opc);
+void lsn(const UDSPInstruction opc);
+void lsm(const UDSPInstruction opc);
+void lsnm(const UDSPInstruction opc);
+void sl(const UDSPInstruction opc);
+void sln(const UDSPInstruction opc);
+void slm(const UDSPInstruction opc);
+void slnm(const UDSPInstruction opc);
+void s(const UDSPInstruction opc);
+void sn(const UDSPInstruction opc);
+void ld(const UDSPInstruction opc);
+void ldax(const UDSPInstruction opc);
+void ldn(const UDSPInstruction opc);
+void ldaxn(const UDSPInstruction opc);
+void ldm(const UDSPInstruction opc);
+void ldaxm(const UDSPInstruction opc);
+void ldnm(const UDSPInstruction opc);
+void ldaxnm(const UDSPInstruction opc);
+void mv(const UDSPInstruction opc);
+void dr(const UDSPInstruction opc);
+void ir(const UDSPInstruction opc);
+void nr(const UDSPInstruction opc);
+void nop(const UDSPInstruction opc);
+
+} // end namespace Ext
+} // end namespace DSPinterpeter
diff --git a/Source/Core/Core/DSP/DSPIntLoadStore.cpp b/Source/Core/Core/DSP/DSPIntLoadStore.cpp
new file mode 100644
index 0000000000..7ea1efe64d
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntLoadStore.cpp
@@ -0,0 +1,263 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+
+namespace DSPInterpreter {
+
+// SRS @M, $(0x18+S)
+// 0010 1sss mmmm mmmm
+// Move value from register $(0x18+D) to data memory pointed by address
+// CR[0-7] | M. That is, the upper 8 bits of the address are the
+// bottom 8 bits from CR, and the lower 8 bits are from the 8-bit immediate.
+// Note: pc+=2 in duddie's doc seems wrong
+void srs(const UDSPInstruction opc)
+{
+	u8 reg   = ((opc >> 8) & 0x7) + 0x18;
+	u16 addr = (g_dsp.r.cr << 8) | (opc & 0xFF);
+
+	if (reg >= DSP_REG_ACM0)
+		dsp_dmem_write(addr, dsp_op_read_reg_and_saturate(reg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(addr, dsp_op_read_reg(reg));
+}
+
+// LRS $(0x18+D), @M
+// 0010 0ddd mmmm mmmm
+// Move value from data memory pointed by address CR[0-7] | M to register
+// $(0x18+D).  That is, the upper 8 bits of the address are the bottom 8 bits
+// from CR, and the lower 8 bits are from the 8-bit immediate.
+void lrs(const UDSPInstruction opc)
+{
+	u8 reg   = ((opc >> 8) & 0x7) + 0x18;
+	u16 addr = (g_dsp.r.cr << 8) | (opc & 0xFF);
+	dsp_op_write_reg(reg, dsp_dmem_read(addr));
+	dsp_conditional_extend_accum(reg);
+}
+
+// LR $D, @M
+// 0000 0000 110d dddd
+// mmmm mmmm mmmm mmmm
+// Move value from data memory pointed by address M to register $D.
+void lr(const UDSPInstruction opc)
+{
+	u8 reg   = opc & DSP_REG_MASK;
+	u16 addr = dsp_fetch_code();
+	u16 val  = dsp_dmem_read(addr);
+	dsp_op_write_reg(reg, val);
+	dsp_conditional_extend_accum(reg);
+}
+
+// SR @M, $S
+// 0000 0000 111s ssss
+// mmmm mmmm mmmm mmmm
+// Store value from register $S to a memory pointed by address M.
+void sr(const UDSPInstruction opc)
+{
+	u8 reg   = opc & DSP_REG_MASK;
+	u16 addr = dsp_fetch_code();
+
+	if (reg >= DSP_REG_ACM0)
+		dsp_dmem_write(addr, dsp_op_read_reg_and_saturate(reg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(addr, dsp_op_read_reg(reg));
+}
+
+// SI @M, #I
+// 0001 0110 mmmm mmmm
+// iiii iiii iiii iiii
+// Store 16-bit immediate value I to a memory location pointed by address
+// M (M is 8-bit value sign extended).
+void si(const UDSPInstruction opc)
+{
+	u16 addr = (s8)opc;
+	u16 imm = dsp_fetch_code();
+	dsp_dmem_write(addr, imm);
+}
+
+// LRR $D, @$S
+// 0001 1000 0ssd dddd
+// Move value from data memory pointed by addressing register $S to register $D.
+void lrr(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 5) & 0x3;
+	u8 dreg = opc & 0x1f;
+
+	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
+	dsp_op_write_reg(dreg, val);
+	dsp_conditional_extend_accum(dreg);
+}
+
+// LRRD $D, @$S
+// 0001 1000 1ssd dddd
+// Move value from data memory pointed by addressing register $S toregister $D.
+// Decrement register $S.
+void lrrd(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 5) & 0x3;
+	u8 dreg = opc & 0x1f;
+
+	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
+	dsp_op_write_reg(dreg, val);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[sreg] = dsp_decrement_addr_reg(sreg);
+}
+
+// LRRI $D, @$S
+// 0001 1001 0ssd dddd
+// Move value from data memory pointed by addressing register $S to register $D.
+// Increment register $S.
+void lrri(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 5) & 0x3;
+	u8 dreg = opc & 0x1f;
+
+	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
+	dsp_op_write_reg(dreg, val);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[sreg] = dsp_increment_addr_reg(sreg);
+}
+
+// LRRN $D, @$S
+// 0001 1001 1ssd dddd
+// Move value from data memory pointed by addressing register $S to register $D.
+// Add indexing register $(0x4+S) to register $S.
+void lrrn(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 5) & 0x3;
+	u8 dreg = opc & 0x1f;
+
+	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
+	dsp_op_write_reg(dreg, val);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[sreg] = dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]);
+}
+
+// SRR @$D, $S
+// 0001 1010 0dds ssss
+// Store value from source register $S to a memory location pointed by
+// addressing register $D.
+void srr(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 5) & 0x3;
+	u8 sreg = opc & 0x1f;
+
+	if (sreg >= DSP_REG_ACM0)
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
+}
+
+// SRRD @$D, $S
+// 0001 1010 1dds ssss
+// Store value from source register $S to a memory location pointed by
+// addressing register $D. Decrement register $D.
+void srrd(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 5) & 0x3;
+	u8 sreg = opc & 0x1f;
+
+	if (sreg >= DSP_REG_ACM0)
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
+
+	g_dsp.r.ar[dreg] = dsp_decrement_addr_reg(dreg);
+}
+
+// SRRI @$D, $S
+// 0001 1011 0dds ssss
+// Store value from source register $S to a memory location pointed by
+// addressing register $D. Increment register $D.
+void srri(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 5) & 0x3;
+	u8 sreg = opc & 0x1f;
+
+	if (sreg >= DSP_REG_ACM0)
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
+
+	g_dsp.r.ar[dreg] = dsp_increment_addr_reg(dreg);
+}
+
+// SRRN @$D, $S
+// 0001 1011 1dds ssss
+// Store value from source register $S to a memory location pointed by
+// addressing register $D. Add DSP_REG_IX0 register to register $D.
+void srrn(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 5) & 0x3;
+	u8 sreg = opc & 0x1f;
+
+	if (sreg >= DSP_REG_ACM0)
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
+	else
+		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
+
+	g_dsp.r.ar[dreg] = dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]);
+}
+
+// ILRR $acD.m, @$arS
+// 0000 001d 0001 00ss
+// Move value from instruction memory pointed by addressing register
+// $arS to mid accumulator register $acD.m.
+void ilrr(const UDSPInstruction opc)
+{
+	u16 reg  = opc & 0x3;
+	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
+
+	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
+	dsp_conditional_extend_accum(dreg);
+}
+
+// ILRRD $acD.m, @$arS
+// 0000 001d 0001 01ss
+// Move value from instruction memory pointed by addressing register
+// $arS to mid accumulator register $acD.m. Decrement addressing register $arS.
+void ilrrd(const UDSPInstruction opc)
+{
+	u16 reg  = opc & 0x3;
+	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
+
+	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[reg] = dsp_decrement_addr_reg(reg);
+}
+
+// ILRRI $acD.m, @$S
+// 0000 001d 0001 10ss
+// Move value from instruction memory pointed by addressing register
+// $arS to mid accumulator register $acD.m. Increment addressing register $arS.
+void ilrri(const UDSPInstruction opc)
+{
+	u16 reg  = opc & 0x3;
+	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
+
+	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[reg] = dsp_increment_addr_reg(reg);
+}
+
+// ILRRN $acD.m, @$arS
+// 0000 001d 0001 11ss
+// Move value from instruction memory pointed by addressing register
+// $arS to mid accumulator register $acD.m. Add corresponding indexing
+// register $ixS to addressing register $arS.
+void ilrrn(const UDSPInstruction opc)
+{
+	u16 reg  = opc & 0x3;
+	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
+
+	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
+	dsp_conditional_extend_accum(dreg);
+	g_dsp.r.ar[reg] = dsp_increase_addr_reg(reg, (s16)g_dsp.r.ix[reg]);
+}
+
+}  // namespace
diff --git a/Source/Core/Core/DSP/DSPIntMisc.cpp b/Source/Core/Core/DSP/DSPIntMisc.cpp
new file mode 100644
index 0000000000..241dd96b6e
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntMisc.cpp
@@ -0,0 +1,161 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
+
+namespace DSPInterpreter {
+
+// MRR $D, $S
+// 0001 11dd ddds ssss
+// Move value from register $S to register $D.
+void mrr(const UDSPInstruction opc)
+{
+	u8 sreg = opc & 0x1f;
+	u8 dreg = (opc >> 5) & 0x1f;
+
+	if (sreg >= DSP_REG_ACM0)
+		dsp_op_write_reg(dreg, dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
+	else
+		dsp_op_write_reg(dreg, dsp_op_read_reg(sreg));
+
+	dsp_conditional_extend_accum(dreg);
+}
+
+// LRI $D, #I
+// 0000 0000 100d dddd
+// iiii iiii iiii iiii
+// Load immediate value I to register $D.
+//
+// DSPSpy discovery: This, and possibly other instructions that load a
+// register, has a different behaviour in S40 mode if loaded to AC0.M: The
+// value gets sign extended to the whole accumulator! This does not happen in
+// S16 mode.
+void lri(const UDSPInstruction opc)
+{
+	u8 reg  = opc & DSP_REG_MASK;
+	u16 imm = dsp_fetch_code();
+	dsp_op_write_reg(reg, imm);
+	dsp_conditional_extend_accum(reg);
+}
+
+// LRIS $(0x18+D), #I
+// 0000 1ddd iiii iiii
+// Load immediate value I (8-bit sign extended) to accumulator register.
+void lris(const UDSPInstruction opc)
+{
+	u8 reg  = ((opc >> 8) & 0x7) + DSP_REG_AXL0;
+	u16 imm = (s8)opc;
+	dsp_op_write_reg(reg, imm);
+	dsp_conditional_extend_accum(reg);
+}
+
+//----
+
+// NX
+// 1000 -000 xxxx xxxx
+// No operation, but can be extended with extended opcode.
+// This opcode is supposed to do nothing - it's used if you want to use
+// an opcode extension but not do anything. At least according to duddie.
+void nx(const UDSPInstruction opc)
+{
+	zeroWriteBackLog();
+}
+
+//----
+
+// DAR $arD
+// 0000 0000 0000 01dd
+// Decrement address register $arD.
+void dar(const UDSPInstruction opc)
+{
+	g_dsp.r.ar[opc & 0x3] = dsp_decrement_addr_reg(opc & 0x3);
+}
+
+// IAR $arD
+// 0000 0000 0000 10dd
+// Increment address register $arD.
+void iar(const UDSPInstruction opc)
+{
+	g_dsp.r.ar[opc & 0x3] = dsp_increment_addr_reg(opc & 0x3);
+}
+
+// SUBARN $arD
+// 0000 0000 0000 11dd
+// Subtract indexing register $ixD from an addressing register $arD.
+// used only in IPL-NTSC ucode
+void subarn(const UDSPInstruction opc)
+{
+	u8 dreg = opc & 0x3;
+	g_dsp.r.ar[dreg] = dsp_decrease_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]);
+}
+
+// ADDARN $arD, $ixS
+// 0000 0000 0001 ssdd
+// Adds indexing register $ixS to an addressing register $arD.
+// It is critical for the Zelda ucode that this one wraps correctly.
+void addarn(const UDSPInstruction opc)
+{
+	u8 dreg = opc & 0x3;
+	u8 sreg = (opc >> 2) & 0x3;
+	g_dsp.r.ar[dreg] = dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[sreg]);
+}
+
+//----
+
+// SBCLR #I
+// 0001 0011 aaaa aiii
+// bit of status register $sr. Bit number is calculated by adding 6 to
+// immediate value I.
+void sbclr(const UDSPInstruction opc)
+{
+	u8 bit = (opc & 0x7) + 6;
+	g_dsp.r.sr &= ~(1 << bit);
+}
+
+// SBSET #I
+// 0001 0010 aaaa aiii
+// Set bit of status register $sr. Bit number is calculated by adding 6 to
+// immediate value I.
+void sbset(const UDSPInstruction opc)
+{
+	u8 bit = (opc & 0x7) + 6;
+	g_dsp.r.sr |= (1 << bit);
+}
+
+// This is a bunch of flag setters, flipping bits in SR.
+void srbith(const UDSPInstruction opc)
+{
+	zeroWriteBackLog();
+	switch ((opc >> 8) & 0xf)
+	{
+	case 0xa:  // M2
+		g_dsp.r.sr &= ~SR_MUL_MODIFY;
+		break;
+	case 0xb:  // M0
+		g_dsp.r.sr |= SR_MUL_MODIFY;
+		break;
+	case 0xc:  // CLR15
+		g_dsp.r.sr &= ~SR_MUL_UNSIGNED;
+		break;
+	case 0xd:  // SET15
+		g_dsp.r.sr |= SR_MUL_UNSIGNED;
+		break;
+	case 0xe:  // SET16 (CLR40)
+		g_dsp.r.sr &= ~SR_40_MODE_BIT;
+		break;
+	case 0xf:  // SET40
+		g_dsp.r.sr |= SR_40_MODE_BIT;
+		break;
+	default:
+		break;
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/Core/DSP/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/DSPIntMultiplier.cpp
new file mode 100644
index 0000000000..6644f61448
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPIntMultiplier.cpp
@@ -0,0 +1,596 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+
+// Multiplier and product register control
+
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPTables.h"
+
+namespace DSPInterpreter {
+
+// Only MULX family instructions have unsigned/mixed support.
+inline s64 dsp_get_multiply_prod(u16 a, u16 b, u8 sign)
+{
+	s64 prod;
+
+	if ((sign == 1) && (g_dsp.r.sr & SR_MUL_UNSIGNED)) //unsigned
+		prod = (u32)(a * b);
+	else if ((sign == 2) && (g_dsp.r.sr & SR_MUL_UNSIGNED)) //mixed
+		prod = a * (s16)b;
+	else
+		prod = (s16)a * (s16)b; //signed
+
+	// Conditionally multiply by 2.
+	if ((g_dsp.r.sr & SR_MUL_MODIFY) == 0)
+		prod <<= 1;
+
+	return prod;
+}
+
+inline s64 dsp_multiply(u16 a, u16 b, u8 sign = 0)
+{
+	s64 prod = dsp_get_multiply_prod(a, b, sign);
+	return prod;
+}
+
+inline s64 dsp_multiply_add(u16 a, u16 b, u8 sign = 0)
+{
+	s64 prod = dsp_get_long_prod() + dsp_get_multiply_prod(a, b, sign);
+	return prod;
+}
+
+inline s64 dsp_multiply_sub(u16 a, u16 b, u8 sign = 0)
+{
+	s64 prod = dsp_get_long_prod() - dsp_get_multiply_prod(a, b, sign);
+	return prod;
+}
+
+inline s64 dsp_multiply_mulx(u8 axh0, u8 axh1, u16 val1, u16 val2)
+{
+	s64 result;
+
+	if ((axh0==0) && (axh1==0))
+		result = dsp_multiply(val1, val2, 1); // unsigned support ON if both ax?.l regs are used
+	else if ((axh0==0) && (axh1==1))
+		result = dsp_multiply(val1, val2, 2); // mixed support ON (u16)axl.0  * (s16)axh.1
+	else if ((axh0==1) && (axh1==0))
+		result = dsp_multiply(val2, val1, 2); // mixed support ON (u16)axl.1  * (s16)axh.0
+	else
+		result = dsp_multiply(val1, val2, 0); // unsigned support OFF if both ax?.h regs are used
+
+	return result;
+}
+
+//----
+
+// CLRP
+// 1000 0100 xxxx xxxx
+// Clears product register $prod.
+// Magic numbers taken from duddie's doc
+//
+// 00ff_(fff0 + 0010)_0000 = 0100_0000_0000, conveniently, lower 40bits = 0
+//
+// It's not ok, to just zero all of them, correct values should be set because of
+// direct use of prod regs by AX/AXWII (look @that part of ucode).
+void clrp(const UDSPInstruction opc)
+{
+	zeroWriteBackLog();
+
+	g_dsp.r.prod.l = 0x0000;
+	g_dsp.r.prod.m = 0xfff0;
+	g_dsp.r.prod.h = 0x00ff;
+	g_dsp.r.prod.m2 = 0x0010;
+}
+
+// TSTPROD
+// 1000 0101 xxxx xxxx
+// Test prod regs value.
+//
+// flags out: --xx xx0x
+void tstprod(const UDSPInstruction opc)
+{
+	s64 prod = dsp_get_long_prod();
+	Update_SR_Register64(prod);
+	zeroWriteBackLog();
+}
+
+//----
+
+// MOVP $acD
+// 0110 111d xxxx xxxx
+// Moves multiply product from $prod register to accumulator $acD register.
+//
+// flags out: --xx xx0x
+void movp(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = dsp_get_long_prod();
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(acc);
+}
+
+// MOVNP $acD
+// 0111 111d xxxx xxxx
+// Moves negative of multiply product from $prod register to accumulator
+// $acD register.
+//
+// flags out: --xx xx0x
+void movnp(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+
+	s64 acc = -dsp_get_long_prod();
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(acc);
+}
+
+// MOVPZ $acD
+// 1111 111d xxxx xxxx
+// Moves multiply product from $prod register to accumulator $acD
+// register and sets (rounds) $acD.l to 0
+//
+// flags out: --xx xx0x
+void movpz(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x01;
+
+	s64 acc = dsp_get_long_prod_round_prodl();
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, acc);
+	Update_SR_Register64(acc);
+}
+
+// ADDPAXZ $acD, $axS
+// 1111 10sd xxxx xxxx
+// Adds secondary accumulator $axS to product register and stores result
+// in accumulator register. Low 16-bits of $acD ($acD.l) are set (round) to 0.
+//
+// TODO: ugly code and still small error here (+/- 1 in .m - randomly)
+// flags out: --xx xx0x
+void addpaxz(const UDSPInstruction opc)
+{
+	u8 dreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	s64 oldprod = dsp_get_long_prod();
+	s64 prod = dsp_get_long_prod_round_prodl();
+	s64 ax = dsp_get_long_acx(sreg);
+	s64 res = prod + (ax & ~0xffff);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_acc(dreg, res);
+	res = dsp_get_long_acc(dreg);
+	Update_SR_Register64(res, isCarry(oldprod, res), false);
+}
+
+//----
+
+// MULAXH
+// 1000 0011 xxxx xxxx
+// Multiply $ax0.h by $ax0.h
+void mulaxh(const UDSPInstruction opc)
+{
+	s64 prod = dsp_multiply(dsp_get_ax_h(0), dsp_get_ax_h(0));
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+//----
+
+// MUL $axS.l, $axS.h
+// 1001 s000 xxxx xxxx
+// Multiply low part $axS.l of secondary accumulator $axS by high part
+// $axS.h of secondary accumulator $axS (treat them both as signed).
+void mul(const UDSPInstruction opc)
+{
+	u8 sreg  = (opc >> 11) & 0x1;
+
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply(axh, axl);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MULAC $axS.l, $axS.h, $acR
+// 1001 s10r xxxx xxxx
+// Add product register to accumulator register $acR. Multiply low part
+// $axS.l of secondary accumulator $axS by high part $axS.h of secondary
+// accumulator $axS (treat them both as signed).
+//
+// flags out: --xx xx0x
+void mulac(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 11) & 0x1;
+
+	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply(axl, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULMV $axS.l, $axS.h, $acR
+// 1001 s11r xxxx xxxx
+// Move product register to accumulator register $acR. Multiply low part
+// $axS.l of secondary accumulator $axS by high part $axS.h of secondary
+// accumulator $axS (treat them both as signed).
+//
+// flags out: --xx xx0x
+void mulmv(const UDSPInstruction opc)
+{
+	u8 rreg  = (opc >> 8) & 0x1;
+	u8 sreg  = ((opc >> 11) & 0x1);
+
+	s64 acc = dsp_get_long_prod();
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply(axl, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULMVZ $axS.l, $axS.h, $acR
+// 1001 s01r xxxx xxxx
+// Move product register to accumulator register $acR and clear (round) low part
+// of accumulator register $acR.l. Multiply low part $axS.l of secondary
+// accumulator $axS by high part $axS.h of secondary accumulator $axS (treat
+// them both as signed).
+//
+// flags out: --xx xx0x
+void mulmvz(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 11) & 0x1;
+
+	s64 acc = dsp_get_long_prod_round_prodl();
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply(axl, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+//----
+
+// MULX $ax0.S, $ax1.T
+// 101s t000 xxxx xxxx
+// Multiply one part $ax0 by one part $ax1.
+// Part is selected by S and T bits. Zero selects low part, one selects high part.
+void mulx(const UDSPInstruction opc)
+{
+	u8 treg = ((opc >> 11) & 0x1);
+	u8 sreg = ((opc >> 12) & 0x1);
+
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MULXAC $ax0.S, $ax1.T, $acR
+// 101s t01r xxxx xxxx
+// Add product register to accumulator register $acR. Multiply one part
+// $ax0 by one part $ax1. Part is selected by S and
+// T bits. Zero selects low part, one selects high part.
+//
+// flags out: --xx xx0x
+void mulxac(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 treg = (opc >> 11) & 0x1;
+	u8 sreg = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULXMV $ax0.S, $ax1.T, $acR
+// 101s t11r xxxx xxxx
+// Move product register to accumulator register $acR. Multiply one part
+// $ax0 by one part $ax1. Part is selected by S and
+// T bits. Zero selects low part, one selects high part.
+//
+// flags out: --xx xx0x
+void mulxmv(const UDSPInstruction opc)
+{
+	u8 rreg = ((opc >> 8) & 0x1);
+	u8 treg = (opc >> 11) & 0x1;
+	u8 sreg = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_prod();
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULXMVZ $ax0.S, $ax1.T, $acR
+// 101s t01r xxxx xxxx
+// Move product register to accumulator register $acR and clear (round) low part
+// of accumulator register $acR.l. Multiply one part $ax0 by one part $ax1
+// Part is selected by S and T bits. Zero selects low part,
+// one selects high part.
+//
+// flags out: --xx xx0x
+void mulxmvz(const UDSPInstruction opc)
+{
+	u8 rreg  = (opc >> 8) & 0x1;
+	u8 treg = (opc >> 11) & 0x1;
+	u8 sreg = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_prod_round_prodl();
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+//----
+
+// MULC $acS.m, $axT.h
+// 110s t000 xxxx xxxx
+// Multiply mid part of accumulator register $acS.m by high part $axS.h of
+// secondary accumulator $axS (treat them both as signed).
+void mulc(const UDSPInstruction opc)
+{
+	u8 treg = (opc >> 11) & 0x1;
+	u8 sreg = (opc >> 12) & 0x1;
+
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MULCAC $acS.m, $axT.h, $acR
+// 110s	t10r xxxx xxxx
+// Multiply mid part of accumulator register $acS.m by high part $axS.h of
+// secondary accumulator $axS  (treat them both as signed). Add product
+// register before multiplication to accumulator $acR.
+//
+// flags out: --xx xx0x
+void mulcac(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 treg  = (opc >> 11) & 0x1;
+	u8 sreg  = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULCMV $acS.m, $axT.h, $acR
+// 110s t11r xxxx xxxx
+// Multiply mid part of accumulator register $acS.m by high part $axT.h of
+// secondary accumulator $axT  (treat them both as signed). Move product
+// register before multiplication to accumulator $acR.
+// possible mistake in duddie's doc axT.h rather than axS.h
+//
+// flags out: --xx xx0x
+void mulcmv(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 treg  = (opc >> 11) & 0x1;
+	u8 sreg  = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_prod();
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+// MULCMVZ $acS.m, $axT.h, $acR
+// 110s	t01r xxxx xxxx
+// (fixed possible bug in duddie's description, s->t)
+// Multiply mid part of accumulator register $acS.m by high part $axT.h of
+// secondary accumulator $axT  (treat them both as signed). Move product
+// register before multiplication to accumulator $acR, set (round) low part of
+// accumulator $acR.l to zero.
+//
+// flags out: --xx xx0x
+void mulcmvz(const UDSPInstruction opc)
+{
+	u8 rreg = (opc >> 8) & 0x1;
+	u8 treg  = (opc >> 11) & 0x1;
+	u8 sreg  = (opc >> 12) & 0x1;
+
+	s64 acc = dsp_get_long_prod_round_prodl();
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+	dsp_set_long_acc(rreg, acc);
+	Update_SR_Register64(dsp_get_long_acc(rreg));
+}
+
+//----
+
+// MADDX ax0.S ax1.T
+// 1110 00st xxxx xxxx
+// Multiply one part of secondary accumulator $ax0 (selected by S) by
+// one part of secondary accumulator $ax1 (selected by T) (treat them both as
+// signed) and add result to product register.
+void maddx(const UDSPInstruction opc)
+{
+	u8 treg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_add(val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MSUBX $(0x18+S*2), $(0x19+T*2)
+// 1110 01st xxxx xxxx
+// Multiply one part of secondary accumulator $ax0 (selected by S) by
+// one part of secondary accumulator $ax1 (selected by T) (treat them both as
+// signed) and subtract result from product register.
+void msubx(const UDSPInstruction opc)
+{
+	u8 treg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
+	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
+	s64 prod = dsp_multiply_sub(val1, val2);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MADDC $acS.m, $axT.h
+// 1110 10st xxxx xxxx
+// Multiply middle part of accumulator $acS.m by high part of secondary
+// accumulator $axT.h (treat them both as signed) and add result to product
+// register.
+void maddc(const UDSPInstruction opc)
+{
+	u8 treg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply_add(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MSUBC $acS.m, $axT.h
+// 1110 11st xxxx xxxx
+// Multiply middle part of accumulator $acS.m by high part of secondary
+// accumulator $axT.h (treat them both as signed) and subtract result from
+// product register.
+void msubc(const UDSPInstruction opc)
+{
+	u8 treg = (opc >> 8) & 0x1;
+	u8 sreg = (opc >> 9) & 0x1;
+
+	u16 accm = dsp_get_acc_m(sreg);
+	u16 axh = dsp_get_ax_h(treg);
+	s64 prod = dsp_multiply_sub(accm, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MADD $axS.l, $axS.h
+// 1111 001s xxxx xxxx
+// Multiply low part $axS.l of secondary accumulator $axS by high part
+// $axS.h of secondary accumulator $axS (treat them both as signed) and add
+// result to product register.
+void madd(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 8) & 0x1;
+
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply_add(axl, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+// MSUB $axS.l, $axS.h
+// 1111 011s xxxx xxxx
+// Multiply low part $axS.l of secondary accumulator $axS by high part
+// $axS.h of secondary accumulator $axS (treat them both as signed) and
+// subtract result from product register.
+void msub(const UDSPInstruction opc)
+{
+	u8 sreg = (opc >> 8) & 0x1;
+
+	u16 axl = dsp_get_ax_l(sreg);
+	u16 axh = dsp_get_ax_h(sreg);
+	s64 prod = dsp_multiply_sub(axl, axh);
+
+	zeroWriteBackLog();
+
+	dsp_set_long_prod(prod);
+}
+
+}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h
similarity index 83%
rename from Source/Core/Core/Src/DSP/DSPIntUtil.h
rename to Source/Core/Core/DSP/DSPIntUtil.h
index 7299d7e8c9..6e245e9a28 100644
--- a/Source/Core/Core/Src/DSP/DSPIntUtil.h
+++ b/Source/Core/Core/DSP/DSPIntUtil.h
@@ -1,37 +1,14 @@
-/*====================================================================
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2005 Duddie
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-   filename:     gdsp_opcodes_helper.h
-   project:      GameCube DSP Tool (gcdsp)
-   created:      2005.03.04
-   mail:		  duddie@walla.com
+#pragma once
 
-   Copyright (c) 2005 Duddie
+#include "Common/CommonTypes.h"
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _DSP_INT_UTIL_H
-#define _DSP_INT_UTIL_H
-
-#include "Common.h"
-
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
-#include "DSPMemoryMap.h"
-#include "DSPStacks.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPStacks.h"
 
 
 // ---------------------------------------------------------------------------------------
@@ -57,7 +34,7 @@ static inline u16 dsp_increase_addr_reg(u16 reg, s16 _ix)
 	u32 ar = g_dsp.r.ar[reg];
 	u32 wr = g_dsp.r.wr[reg];
 	s32 ix = _ix;
-	
+
 	u32 mx = (wr | 1) << 1;
 	u32 nar = ar + ix;
 	u32 dar = (nar ^ ar ^ ix) & mx;
@@ -75,7 +52,7 @@ static inline u16 dsp_increase_addr_reg(u16 reg, s16 _ix)
 	return nar;
 }
 
-static inline u16 dsp_decrease_addr_reg(u16 reg, s16 _ix) 
+static inline u16 dsp_decrease_addr_reg(u16 reg, s16 _ix)
 {
 	u32 ar = g_dsp.r.ar[reg];
 	u32 wr = g_dsp.r.wr[reg];
@@ -98,23 +75,23 @@ static inline u16 dsp_decrease_addr_reg(u16 reg, s16 _ix)
 	return nar;
 }
 
-static inline u16 dsp_increment_addr_reg(u16 reg) 
+static inline u16 dsp_increment_addr_reg(u16 reg)
 {
 	u32 ar = g_dsp.r.ar[reg];
 	u32 wr = g_dsp.r.wr[reg];
 
 	u32 nar = ar + 1;
-	
+
 	if ((nar ^ ar) > ((wr | 1) << 1))
 		nar -= wr + 1;
 	return nar;
 }
 
-static inline u16 dsp_decrement_addr_reg(u16 reg) 
+static inline u16 dsp_decrement_addr_reg(u16 reg)
 {
 	u32 ar = g_dsp.r.ar[reg];
 	u32 wr = g_dsp.r.wr[reg];
-	
+
 	u32 nar = ar + wr;
 
 	if (((nar ^ ar) & ((wr | 1) << 1)) > wr)
@@ -244,9 +221,9 @@ static inline void dsp_op_write_reg(int _reg, u16 val)
 	}
 }
 
-static inline void dsp_conditional_extend_accum(int reg) 
+static inline void dsp_conditional_extend_accum(int reg)
 {
-	switch (reg) 
+	switch (reg)
 	{
 	case DSP_REG_ACM0:
 	case DSP_REG_ACM1:
@@ -344,12 +321,12 @@ inline u16 dsp_op_read_reg_and_saturate(u8 _reg)
 	if (g_dsp.r.sr & SR_40_MODE_BIT)
 	{
 		s64 acc = dsp_get_long_acc(_reg);
-	
-		if (acc != (s32)acc) 
+
+		if (acc != (s32)acc)
 		{
 			if (acc > 0)
 				return 0x7fff;
-			else 
+			else
 				return 0x8000;
 		}
 		else
@@ -381,5 +358,3 @@ inline s16 dsp_get_ax_h(int _reg)
 {
 	return (s16)g_dsp.r.ax[_reg].h;
 }
-
-#endif
diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp
new file mode 100644
index 0000000000..281e7c96a6
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPInterpreter.cpp
@@ -0,0 +1,208 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
+
+namespace DSPInterpreter {
+
+// NOTE: These have nothing to do with g_dsp.r.cr !
+
+void WriteCR(u16 val)
+{
+	// reset
+	if (val & 1)
+	{
+		INFO_LOG(DSPLLE,"DSP_CONTROL RESET");
+		DSPCore_Reset();
+		val &= ~1;
+	}
+	// init
+	else if (val == 4)
+	{
+		// HAX!
+		// OSInitAudioSystem ucode should send this mail - not DSP core itself
+		INFO_LOG(DSPLLE,"DSP_CONTROL INIT");
+		init_hax = true;
+		val |= 0x800;
+	}
+
+	// update cr
+	g_dsp.cr = val;
+}
+
+u16 ReadCR()
+{
+	if (g_dsp.pc & 0x8000)
+	{
+		g_dsp.cr |= 0x800;
+	}
+	else
+	{
+		g_dsp.cr &= ~0x800;
+	}
+
+	return g_dsp.cr;
+}
+
+void Step()
+{
+	DSPCore_CheckExceptions();
+
+	g_dsp.step_counter++;
+
+#if PROFILE
+	g_dsp.err_pc = g_dsp.pc;
+
+	ProfilerAddDelta(g_dsp.err_pc, 1);
+	if (g_dsp.step_counter == 1)
+	{
+		ProfilerInit();
+	}
+
+	if ((g_dsp.step_counter & 0xFFFFF) == 0)
+	{
+		ProfilerDump(g_dsp.step_counter);
+	}
+#endif
+
+	u16 opc = dsp_fetch_code();
+	ExecuteInstruction(UDSPInstruction(opc));
+
+	if (DSPAnalyzer::code_flags[g_dsp.pc - 1] & DSPAnalyzer::CODE_LOOP_END)
+		HandleLoop();
+}
+
+// Used by thread mode.
+int RunCyclesThread(int cycles)
+{
+	while (true)
+	{
+		if (g_dsp.cr & CR_HALT)
+			return 0;
+
+		if (g_dsp.external_interrupt_waiting)
+		{
+			DSPCore_CheckExternalInterrupt();
+			DSPCore_SetExternalInterrupt(false);
+		}
+
+		Step();
+		cycles--;
+		if (cycles < 0)
+			return 0;
+	}
+}
+
+// This one has basic idle skipping, and checks breakpoints.
+int RunCyclesDebug(int cycles)
+{
+	// First, let's run a few cycles with no idle skipping so that things can progress a bit.
+	for (int i = 0; i < 8; i++)
+	{
+		if (g_dsp.cr & CR_HALT)
+			return 0;
+		if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
+		{
+			DSPCore_SetState(DSPCORE_STEPPING);
+			return cycles;
+		}
+		Step();
+		cycles--;
+		if (cycles < 0)
+			return 0;
+	}
+
+	while (true)
+	{
+		// Next, let's run a few cycles with idle skipping, so that we can skip
+		// idle loops.
+		for (int i = 0; i < 8; i++)
+		{
+			if (g_dsp.cr & CR_HALT)
+				return 0;
+			if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
+			{
+				DSPCore_SetState(DSPCORE_STEPPING);
+				return cycles;
+			}
+			// Idle skipping.
+			if (DSPAnalyzer::code_flags[g_dsp.pc] & DSPAnalyzer::CODE_IDLE_SKIP)
+				return 0;
+			Step();
+			cycles--;
+			if (cycles < 0)
+				return 0;
+		}
+
+		// Now, lets run some more without idle skipping.
+		for (int i = 0; i < 200; i++)
+		{
+			if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
+			{
+				DSPCore_SetState(DSPCORE_STEPPING);
+				return cycles;
+			}
+			Step();
+			cycles--;
+			if (cycles < 0)
+				return 0;
+			// We don't bother directly supporting pause - if the main emu pauses,
+			// it just won't call this function anymore.
+		}
+	}
+}
+
+// Used by non-thread mode. Meant to be efficient.
+int RunCycles(int cycles)
+{
+	// First, let's run a few cycles with no idle skipping so that things can
+	// progress a bit.
+	for (int i = 0; i < 8; i++)
+	{
+		if (g_dsp.cr & CR_HALT)
+			return 0;
+		Step();
+		cycles--;
+		if (cycles < 0)
+			return 0;
+	}
+
+	while (true)
+	{
+		// Next, let's run a few cycles with idle skipping, so that we can skip
+		// idle loops.
+		for (int i = 0; i < 8; i++)
+		{
+			if (g_dsp.cr & CR_HALT)
+				return 0;
+			// Idle skipping.
+			if (DSPAnalyzer::code_flags[g_dsp.pc] & DSPAnalyzer::CODE_IDLE_SKIP)
+				return 0;
+			Step();
+			cycles--;
+			if (cycles < 0)
+				return 0;
+		}
+
+		// Now, lets run some more without idle skipping.
+		for (int i = 0; i < 200; i++)
+		{
+			Step();
+			cycles--;
+			if (cycles < 0)
+				return 0;
+			// We don't bother directly supporting pause - if the main emu pauses,
+			// it just won't call this function anymore.
+		}
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/DSPInterpreter.h
similarity index 95%
rename from Source/Core/Core/Src/DSP/DSPInterpreter.h
rename to Source/Core/Core/DSP/DSPInterpreter.h
index c2e144a682..d6316fc77e 100644
--- a/Source/Core/Core/Src/DSP/DSPInterpreter.h
+++ b/Source/Core/Core/DSP/DSPInterpreter.h
@@ -1,16 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _DSPINTERPRETER_H
-#define _DSPINTERPRETER_H
+#pragma once
 
-#include "DSPTables.h"
+#include "Core/DSP/DSPCommon.h"
 
 #define DSP_REG_MASK    0x1f
 
-namespace DSPInterpreter {
-
+namespace DSPInterpreter
+{
 void Step();
 
 // See: DspIntBranch.cpp
@@ -23,8 +22,6 @@ int RunCyclesThread(int cycles);
 int RunCycles(int cycles);
 int RunCyclesDebug(int cycles);
 
-void Stop();
-
 void WriteCR(u16 val);
 u16  ReadCR();
 
@@ -106,7 +103,7 @@ void asr16(const UDSPInstruction opc);
 void lsl(const UDSPInstruction opc);
 void lsr(const UDSPInstruction opc);
 void asl(const UDSPInstruction opc);
-void asr(const UDSPInstruction opc);  
+void asr(const UDSPInstruction opc);
 void lsrn(const UDSPInstruction opc);
 void asrn(const UDSPInstruction opc);
 void dar(const UDSPInstruction opc);
@@ -152,5 +149,3 @@ void tstprod(const UDSPInstruction opc);
 void abs(const UDSPInstruction opc);
 
 }  // namespace
-
-#endif // _DSPINTERPRETER_H
diff --git a/Source/Core/Core/DSP/DSPMemoryMap.cpp b/Source/Core/Core/DSP/DSPMemoryMap.cpp
new file mode 100644
index 0000000000..8a3deb1506
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPMemoryMap.cpp
@@ -0,0 +1,63 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+
+u16 dsp_imem_read(u16 addr)
+{
+	switch (addr >> 12)
+	{
+	case 0:   // 0xxx IRAM
+		return g_dsp.iram[addr & DSP_IRAM_MASK];
+
+	case 8:   // 8xxx IROM - contains code to receive code for IRAM, and a bunch of mixing loops.
+		return g_dsp.irom[addr & DSP_IROM_MASK];
+
+	default:  // Unmapped/non-existing memory
+		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Executing from invalid (%04x) memory", g_dsp.pc, addr);
+		return 0;
+	}
+}
+
+u16 dsp_dmem_read(u16 addr)
+{
+	switch (addr >> 12)
+	{
+	case 0x0:  // 0xxx DRAM
+		return g_dsp.dram[addr & DSP_DRAM_MASK];
+
+	case 0x1:  // 1xxx COEF
+		DEBUG_LOG(DSPLLE, "%04x : Coefficient Read @ %04x", g_dsp.pc, addr);
+		return g_dsp.coef[addr & DSP_COEF_MASK];
+
+	case 0xf:  // Fxxx HW regs
+		return gdsp_ifx_read(addr);
+
+	default:   // Unmapped/non-existing memory
+		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Read from UNKNOWN (%04x) memory", g_dsp.pc, addr);
+		return 0;
+	}
+}
+
+void dsp_dmem_write(u16 addr, u16 val)
+{
+	switch (addr >> 12)
+	{
+	case 0x0: // 0xxx DRAM
+		g_dsp.dram[addr & DSP_DRAM_MASK] = val;
+		break;
+
+	case 0xf: // Fxxx HW regs
+		gdsp_ifx_write(addr, val);
+		break;
+
+	default:  // Unmapped/non-existing memory
+		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Write to UNKNOWN (%04x) memory", g_dsp.pc, addr);
+		break;
+	}
+}
diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h
new file mode 100644
index 0000000000..c9f7476862
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPMemoryMap.h
@@ -0,0 +1,33 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPTables.h"
+
+u16  dsp_imem_read(u16 addr);
+void dsp_dmem_write(u16 addr, u16 val);
+u16  dsp_dmem_read(u16 addr);
+
+inline u16 dsp_fetch_code()
+{
+	u16 opc = dsp_imem_read(g_dsp.pc);
+
+	g_dsp.pc++;
+	return opc;
+}
+
+inline u16 dsp_peek_code()
+{
+	return dsp_imem_read(g_dsp.pc);
+}
+
+inline void dsp_skip_inst()
+{
+	g_dsp.pc += opTable[dsp_peek_code()]->size;
+}
diff --git a/Source/Core/Core/DSP/DSPStacks.cpp b/Source/Core/Core/DSP/DSPStacks.cpp
new file mode 100644
index 0000000000..becafff966
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPStacks.cpp
@@ -0,0 +1,38 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPStacks.h"
+
+// Stacks. The stacks are outside the DSP RAM, in dedicated hardware.
+
+static void dsp_reg_stack_push(int stack_reg)
+{
+	g_dsp.reg_stack_ptr[stack_reg]++;
+	g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
+	g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]] = g_dsp.r.st[stack_reg];
+}
+
+static void dsp_reg_stack_pop(int stack_reg)
+{
+	g_dsp.r.st[stack_reg] = g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]];
+	g_dsp.reg_stack_ptr[stack_reg]--;
+	g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
+}
+
+void dsp_reg_store_stack(int stack_reg, u16 val)
+{
+	dsp_reg_stack_push(stack_reg);
+	g_dsp.r.st[stack_reg] = val;
+}
+
+u16 dsp_reg_load_stack(int stack_reg)
+{
+	u16 val = g_dsp.r.st[stack_reg];
+	dsp_reg_stack_pop(stack_reg);
+	return val;
+}
diff --git a/Source/Core/Core/DSP/DSPStacks.h b/Source/Core/Core/DSP/DSPStacks.h
new file mode 100644
index 0000000000..8df4d1eb3a
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPStacks.h
@@ -0,0 +1,11 @@
+// Copyright 2008 Dolphin Emulator Project
+// Copyright 2004 Duddie & Tratax
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+void dsp_reg_store_stack(int stack_reg, u16 val);
+u16 dsp_reg_load_stack(int stack_reg);
diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp
new file mode 100644
index 0000000000..757ae6f2c1
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPTables.cpp
@@ -0,0 +1,577 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
+
+#include "Common/CommonTypes.h"
+
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntExtOps.h"
+#include "Core/DSP/DSPTables.h"
+
+void nop(const UDSPInstruction opc)
+{
+	// The real nop is 0. Anything else is bad.
+	if (opc)
+	{
+		ERROR_LOG(DSPLLE, "LLE: Unrecognized opcode 0x%04x", opc);
+	}
+}
+
+const DSPOPCTemplate opcodes[] =
+{
+	//                                                         # of parameters----+   {type, size, loc, lshift, mask}                                                               branch        reads PC       // instruction approximation
+	// name      opcode  mask    interpreter function     JIT function    size-V  V   param 1                       param 2                       param 3                    extendable    uncond.       updates SR
+	{"NOP",      0x0000, 0xfffc, nop,                     &DSPEmitter::nop,    1, 0, {},                                                                                     false, false, false, false, false}, // no operation
+
+	{"DAR",      0x0004, 0xfffc, DSPInterpreter::dar,     &DSPEmitter::dar,    1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false}, // $arD--
+	{"IAR",      0x0008, 0xfffc, DSPInterpreter::iar,     &DSPEmitter::iar,    1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false}, // $arD++
+	{"SUBARN",   0x000c, 0xfffc, DSPInterpreter::subarn,  &DSPEmitter::subarn, 1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false}, // $arD -= $ixS
+	{"ADDARN",   0x0010, 0xfff0, DSPInterpreter::addarn,  &DSPEmitter::addarn, 1, 2, {{P_REG, 1, 0, 0, 0x0003},     {P_REG04, 1, 0, 2, 0x000c}},                             false, false, false, false, false}, // $arD += $ixS
+
+	{"HALT",     0x0021, 0xffff, DSPInterpreter::halt,    &DSPEmitter::halt,   1, 0, {},                                                                                     false, true, true, false, false}, // halt until reset
+
+	{"RETGE",    0x02d0, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if greater or equal
+	{"RETL",     0x02d1, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if less
+	{"RETG",     0x02d2, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if greater
+	{"RETLE",    0x02d3, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if less or equal
+	{"RETNZ",    0x02d4, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if not zero
+	{"RETZ",     0x02d5, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if zero
+	{"RETNC",    0x02d6, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if not carry
+	{"RETC",     0x02d7, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if carry
+	{"RETx8",    0x02d8, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if TODO
+	{"RETx9",    0x02d9, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if TODO
+	{"RETxA",    0x02da, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if TODO
+	{"RETxB",    0x02db, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if TODO
+	{"RETLNZ",   0x02dc, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if logic not zero
+	{"RETLZ",    0x02dd, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if logic zero
+	{"RETO",     0x02de, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false}, // return if overflow
+	{"RET",      0x02df, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, true, false, false}, // unconditional return
+
+	{"RTI",      0x02ff, 0xffff, DSPInterpreter::rti,     &DSPEmitter::rti,    1, 0, {},                                                                                     false, true, true, false, false}, // return from interrupt
+
+	{"CALLGE",   0x02b0, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if greater or equal
+	{"CALLL",    0x02b1, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if less
+	{"CALLG",    0x02b2, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if greater
+	{"CALLLE",   0x02b3, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if less or equal
+	{"CALLNZ",   0x02b4, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if not zero
+	{"CALLZ",    0x02b5, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if zero
+	{"CALLNC",   0x02b6, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if not carry
+	{"CALLC",    0x02b7, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if carry
+	{"CALLx8",   0x02b8, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if TODO
+	{"CALLx9",   0x02b9, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if TODO
+	{"CALLxA",   0x02ba, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if TODO
+	{"CALLxB",   0x02bb, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if TODO
+	{"CALLLNZ",  0x02bc, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if logic not zero
+	{"CALLLZ",   0x02bd, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if logic zero
+	{"CALLO",    0x02be, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // call if overflow
+	{"CALL",     0x02bf, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, true, true, false},  // unconditional call
+
+	{"IFGE",     0x0270, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if greater or equal
+	{"IFL",      0x0271, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if less
+	{"IFG",      0x0272, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if greater
+	{"IFLE",     0x0273, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if less or equal
+	{"IFNZ",     0x0274, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if not zero
+	{"IFZ",      0x0275, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if zero
+	{"IFNC",     0x0276, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if not carry
+	{"IFC",      0x0277, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if carry
+	{"IFx8",     0x0278, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if TODO
+	{"IFx9",     0x0279, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if TODO
+	{"IFxA",     0x027a, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if TODO
+	{"IFxB",     0x027b, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if TODO
+	{"IFLNZ",    0x027c, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if logic not zero
+	{"IFLZ",     0x027d, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if logic zero
+	{"IFO",      0x027e, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false}, // if overflow
+	{"IF",       0x027f, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, true, true, false},  // what is this, I don't even...
+
+	{"JGE",      0x0290, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if greater or equal
+	{"JL",       0x0291, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if less
+	{"JG",       0x0292, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if greater
+	{"JLE",      0x0293, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if less or equal
+	{"JNZ",      0x0294, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if not zero
+	{"JZ",       0x0295, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if zero
+	{"JNC",      0x0296, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if not carry
+	{"JC",       0x0297, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if carry
+	{"JMPx8",    0x0298, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if TODO
+	{"JMPx9",    0x0299, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if TODO
+	{"JMPxA",    0x029a, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if TODO
+	{"JMPxB",    0x029b, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if TODO
+	{"JLNZ",     0x029c, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if logic not zero
+	{"JLZ",      0x029d, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if logic zero
+	{"JO",       0x029e, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false}, // jump if overflow
+	{"JMP",      0x029f, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, true, true, false},  // unconditional jump
+
+	{"JRGE",     0x1700, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if greater or equal
+	{"JRL",      0x1701, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if less
+	{"JRG",      0x1702, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if greater
+	{"JRLE",     0x1703, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if less or equal
+	{"JRNZ",     0x1704, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if not zero
+	{"JRZ",      0x1705, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if zero
+	{"JRNC",     0x1706, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if not carry
+	{"JRC",      0x1707, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if carry
+	{"JMPRx8",   0x1708, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if TODO
+	{"JMPRx9",   0x1709, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if TODO
+	{"JMPRxA",   0x170a, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if TODO
+	{"JMPRxB",   0x170b, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if TODO
+	{"JRLNZ",    0x170c, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if logic not zero
+	{"JRLZ",     0x170d, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if logic zero
+	{"JRO",      0x170e, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false}, // jump to $R if overflow
+	{"JMPR",     0x170f, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, true, false, false},  // jump to $R
+
+	{"CALLRGE",  0x1710, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if greater or equal
+	{"CALLRL",   0x1711, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if less
+	{"CALLRG",   0x1712, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if greater
+	{"CALLRLE",  0x1713, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if less or equal
+	{"CALLRNZ",  0x1714, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if not zero
+	{"CALLRZ",   0x1715, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if zero
+	{"CALLRNC",  0x1716, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if not carry
+	{"CALLRC",   0x1717, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if carry
+	{"CALLRx8",  0x1718, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if TODO
+	{"CALLRx9",  0x1719, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if TODO
+	{"CALLRxA",  0x171a, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if TODO
+	{"CALLRxB",  0x171b, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if TODO
+	{"CALLRLNZ", 0x171c, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if logic not zero
+	{"CALLRLZ",  0x171d, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if logic zero
+	{"CALLRO",   0x171e, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false}, // call $R if overflow
+	{"CALLR",    0x171f, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, true, true, false},  // call $R
+
+	{"SBCLR",    0x1200, 0xff00, DSPInterpreter::sbclr,   &DSPEmitter::sbclr,  1, 1, {{P_IMM, 1, 0, 0, 0x0007}},                                                             false, false, false, false, false}, // $sr &= ~(I + 6)
+	{"SBSET",    0x1300, 0xff00, DSPInterpreter::sbset,   &DSPEmitter::sbset,  1, 1, {{P_IMM, 1, 0, 0, 0x0007}},                                                             false, false, false, false, false}, // $sr |= (I + 6)
+
+	{"LSL",      0x1400, 0xfec0, DSPInterpreter::lsl,     &DSPEmitter::lsl,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true}, // $acR <<= I
+	{"LSR",      0x1440, 0xfec0, DSPInterpreter::lsr,     &DSPEmitter::lsr,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true}, // $acR >>= I (shifting in zeros)
+	{"ASL",      0x1480, 0xfec0, DSPInterpreter::asl,     &DSPEmitter::asl,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true}, // $acR <<= I
+	{"ASR",      0x14c0, 0xfec0, DSPInterpreter::asr,     &DSPEmitter::asr,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true}, // $acR >>= I (shifting in sign bits)
+
+	// these two were discovered by ector
+	{"LSRN",     0x02ca, 0xffff, DSPInterpreter::lsrn,    &DSPEmitter::lsrn,   1, 0, {},                                                                                     false, false, false, false, true}, // $ac0 >>=/<<= $ac1.m[0-6]
+	{"ASRN",     0x02cb, 0xffff, DSPInterpreter::asrn,    &DSPEmitter::asrn,   1, 0, {},                                                                                     false, false, false, false, true}, // $ac0 >>=/<<= $ac1.m[0-6] (arithmetic)
+
+	{"LRI",      0x0080, 0xffe0, DSPInterpreter::lri,     &DSPEmitter::lri,    2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, false}, // $D = I
+	{"LR",       0x00c0, 0xffe0, DSPInterpreter::lr,      &DSPEmitter::lr,     2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_MEM, 2, 1, 0, 0xffff}},                               false, false, false, true, false}, // $D = MEM[M]
+	{"SR",       0x00e0, 0xffe0, DSPInterpreter::sr,      &DSPEmitter::sr,     2, 2, {{P_MEM, 2, 1, 0, 0xffff},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, true, false}, // MEM[M] = $S
+
+	{"MRR",      0x1c00, 0xfc00, DSPInterpreter::mrr,     &DSPEmitter::mrr,    1, 2, {{P_REG, 1, 0, 5, 0x03e0},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false}, // $D = $S
+
+	{"SI",       0x1600, 0xff00, DSPInterpreter::si,      &DSPEmitter::si,     2, 2, {{P_MEM, 1, 0, 0, 0x00ff},     {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, false}, // MEM[M] = I
+
+	{"ADDIS",    0x0400, 0xfe00, DSPInterpreter::addis,   &DSPEmitter::addis,  1, 2, {{P_ACCM,  1, 0, 8, 0x0100},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true}, // $acD.hm += I
+	{"CMPIS",    0x0600, 0xfe00, DSPInterpreter::cmpis,   &DSPEmitter::cmpis,  1, 2, {{P_ACCM,  1, 0, 8, 0x0100},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true}, // FLAGS($acD - I)
+	{"LRIS",     0x0800, 0xf800, DSPInterpreter::lris,    &DSPEmitter::lris,   1, 2, {{P_REG18, 1, 0, 8, 0x0700},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true}, // $(D+24) = I
+
+	{"ADDI",     0x0200, 0xfeff, DSPInterpreter::addi,    &DSPEmitter::addi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $acD.hm += I
+	{"XORI",     0x0220, 0xfeff, DSPInterpreter::xori,    &DSPEmitter::xori,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $acD.m ^= I
+	{"ANDI",     0x0240, 0xfeff, DSPInterpreter::andi,    &DSPEmitter::andi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $acD.m &= I
+	{"ORI",      0x0260, 0xfeff, DSPInterpreter::ori,     &DSPEmitter::ori,    2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $acD.m |= I
+	{"CMPI",     0x0280, 0xfeff, DSPInterpreter::cmpi,    &DSPEmitter::cmpi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // FLAGS(($acD.hm - I) | $acD.l)
+
+	{"ANDF",     0x02a0, 0xfeff, DSPInterpreter::andf,    &DSPEmitter::andf,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $sr.LZ = ($acD.m & I) == 0 ? 1 : 0
+	{"ANDCF",    0x02c0, 0xfeff, DSPInterpreter::andcf,   &DSPEmitter::andcf,  2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true}, // $sr.LZ = ($acD.m & I) == I ? 1 : 0
+
+	{"ILRR",     0x0210, 0xfefc, DSPInterpreter::ilrr,    &DSPEmitter::ilrr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false}, // $acD.m = IMEM[$arS]
+	{"ILRRD",    0x0214, 0xfefc, DSPInterpreter::ilrrd,   &DSPEmitter::ilrrd,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false}, // $acD.m = IMEM[$arS--]
+	{"ILRRI",    0x0218, 0xfefc, DSPInterpreter::ilrri,   &DSPEmitter::ilrri,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false}, // $acD.m = IMEM[$arS++]
+	{"ILRRN",    0x021c, 0xfefc, DSPInterpreter::ilrrn,   &DSPEmitter::ilrrn,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false}, // $acD.m = IMEM[$arS]; $arS += $ixS
+
+	// LOOPS
+	{"LOOP",     0x0040, 0xffe0, DSPInterpreter::loop,    &DSPEmitter::loop,   1, 1, {{P_REG, 1, 0, 0, 0x001f}},                                                             false, true, true, true, false}, // run next instruction $R times
+	{"BLOOP",    0x0060, 0xffe0, DSPInterpreter::bloop,   &DSPEmitter::bloop,  2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_ADDR_I, 2, 1, 0, 0xffff}},                            false, true, true, true, false}, // COMEFROM addr $R times
+	{"LOOPI",    0x1000, 0xff00, DSPInterpreter::loopi,   &DSPEmitter::loopi,  1, 1, {{P_IMM, 1, 0, 0, 0x00ff}},                                                             false, true, true, true, false}, // run next instruction I times
+	{"BLOOPI",   0x1100, 0xff00, DSPInterpreter::bloopi,  &DSPEmitter::bloopi, 2, 2, {{P_IMM, 1, 0, 0, 0x00ff},     {P_ADDR_I, 2, 1, 0, 0xffff}},                            false, true, true, true, false}, // COMEFROM addr I times
+
+	// load and store value pointed by indexing reg and increment; LRR/SRR variants
+	{"LRR",      0x1800, 0xff80, DSPInterpreter::lrr,     &DSPEmitter::lrr,    1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false}, // $D = MEM[$arS]
+	{"LRRD",     0x1880, 0xff80, DSPInterpreter::lrrd,    &DSPEmitter::lrrd,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false}, // $D = MEM[$arS--]
+	{"LRRI",     0x1900, 0xff80, DSPInterpreter::lrri,    &DSPEmitter::lrri,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false}, // $D = MEM[$arS++]
+	{"LRRN",     0x1980, 0xff80, DSPInterpreter::lrrn,    &DSPEmitter::lrrn,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false}, // $D = MEM[$arS]; $arS += $ixS
+
+	{"SRR",      0x1a00, 0xff80, DSPInterpreter::srr,     &DSPEmitter::srr,    1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false}, // MEM[$arD] = $S
+	{"SRRD",     0x1a80, 0xff80, DSPInterpreter::srrd,    &DSPEmitter::srrd,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false}, // MEM[$arD--] = $S
+	{"SRRI",     0x1b00, 0xff80, DSPInterpreter::srri,    &DSPEmitter::srri,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false}, // MEM[$arD++] = $S
+	{"SRRN",     0x1b80, 0xff80, DSPInterpreter::srrn,    &DSPEmitter::srrn,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false}, // MEM[$arD] = $S; $arD += $ixD
+
+	//2
+	{"LRS",      0x2000, 0xf800, DSPInterpreter::lrs,     &DSPEmitter::lrs,    1, 2, {{P_REG18, 1, 0, 8, 0x0700},   {P_MEM, 1, 0, 0, 0x00ff}},                               false, false, false, false, false}, // $(D+24) = MEM[($cr[0-7] << 8) | I]
+	{"SRS",      0x2800, 0xf800, DSPInterpreter::srs,     &DSPEmitter::srs,    1, 2, {{P_MEM,   1, 0, 0, 0x00ff},   {P_REG18, 1, 0, 8, 0x0700}},                             false, false, false, false, false}, // MEM[($cr[0-7] << 8) | I] = $(S+24)
+
+// opcodes that can be extended
+
+	//3 - main opcode defined by 9 bits, extension defined by last 7 bits!!
+	{"XORR",     0x3000, 0xfc80, DSPInterpreter::xorr,    &DSPEmitter::xorr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true}, // $acD.m ^= $axS.h
+	{"ANDR",     0x3400, 0xfc80, DSPInterpreter::andr,    &DSPEmitter::andr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true}, // $acD.m &= $axS.h
+	{"ORR",      0x3800, 0xfc80, DSPInterpreter::orr,     &DSPEmitter::orr,    1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true}, // $acD.m |= $axS.h
+	{"ANDC",     0x3c00, 0xfe80, DSPInterpreter::andc,    &DSPEmitter::andc,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true}, // $acD.m &= $ac(1-D).m
+	{"ORC",      0x3e00, 0xfe80, DSPInterpreter::orc,     &DSPEmitter::orc,    1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true}, // $acD.m |= $ac(1-D).m
+	{"XORC",     0x3080, 0xfe80, DSPInterpreter::xorc,    &DSPEmitter::xorc,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true}, // $acD.m ^= $ac(1-D).m
+	{"NOT",      0x3280, 0xfe80, DSPInterpreter::notc,    &DSPEmitter::notc,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acD.m = ~$acD.m
+	{"LSRNRX",   0x3480, 0xfc80, DSPInterpreter::lsrnrx,  &DSPEmitter::lsrnrx, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true}, // $acD >>=/<<= $axS.h[0-6]
+	{"ASRNRX",   0x3880, 0xfc80, DSPInterpreter::asrnrx,  &DSPEmitter::asrnrx, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true}, // $acD >>=/<<= $axS.h[0-6] (arithmetic)
+	{"LSRNR",    0x3c80, 0xfe80, DSPInterpreter::lsrnr,   &DSPEmitter::lsrnr,  1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true}, // $acD >>=/<<= $ac(1-D).m[0-6]
+	{"ASRNR",    0x3e80, 0xfe80, DSPInterpreter::asrnr,   &DSPEmitter::asrnr,  1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true}, // $acD >>=/<<= $ac(1-D).m[0-6] (arithmetic)
+
+	//4
+	{"ADDR",     0x4000, 0xf800, DSPInterpreter::addr,    &DSPEmitter::addr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true}, // $acD += $(S+24)
+	{"ADDAX",    0x4800, 0xfc00, DSPInterpreter::addax,   &DSPEmitter::addax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true}, // $acD += $axS
+	{"ADD",      0x4c00, 0xfe00, DSPInterpreter::add,     &DSPEmitter::add,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true}, // $acD += $ac(1-D)
+	{"ADDP",     0x4e00, 0xfe00, DSPInterpreter::addp,    &DSPEmitter::addp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true}, // $acD += $prod
+
+	//5
+	{"SUBR",     0x5000, 0xf800, DSPInterpreter::subr,    &DSPEmitter::subr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true}, // $acD -= $(S+24)
+	{"SUBAX",    0x5800, 0xfc00, DSPInterpreter::subax,   &DSPEmitter::subax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true}, // $acD -= $axS
+	{"SUB",      0x5c00, 0xfe00, DSPInterpreter::sub,     &DSPEmitter::sub,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true}, // $acD -= $ac(1-D)
+	{"SUBP",     0x5e00, 0xfe00, DSPInterpreter::subp,    &DSPEmitter::subp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true}, // $acD -= $prod
+
+	//6
+	{"MOVR",     0x6000, 0xf800, DSPInterpreter::movr,    &DSPEmitter::movr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true}, // $acD.hm = $(S+24); $acD.l = 0
+	{"MOVAX",    0x6800, 0xfc00, DSPInterpreter::movax,   &DSPEmitter::movax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true}, // $acD = $axS
+	{"MOV",      0x6c00, 0xfe00, DSPInterpreter::mov,     &DSPEmitter::mov,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true}, // $acD = $ax(1-D)
+	{"MOVP",     0x6e00, 0xfe00, DSPInterpreter::movp,    &DSPEmitter::movp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true}, // $acD = $prod
+
+	//7
+	{"ADDAXL",   0x7000, 0xfc00, DSPInterpreter::addaxl,  &DSPEmitter::addaxl, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG18, 1, 0, 9, 0x0200}},                             true, false, false, false, true}, // $acD += $axS.l
+	{"INCM",     0x7400, 0xfe00, DSPInterpreter::incm,    &DSPEmitter::incm,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acsD++
+	{"INC",      0x7600, 0xfe00, DSPInterpreter::inc,     &DSPEmitter::inc,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acD++
+	{"DECM",     0x7800, 0xfe00, DSPInterpreter::decm,    &DSPEmitter::decm,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acsD--
+	{"DEC",      0x7a00, 0xfe00, DSPInterpreter::dec,     &DSPEmitter::dec,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acD--
+	{"NEG",      0x7c00, 0xfe00, DSPInterpreter::neg,     &DSPEmitter::neg,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acD = -$acD
+	{"MOVNP",    0x7e00, 0xfe00, DSPInterpreter::movnp,   &DSPEmitter::movnp,  1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true}, // $acD = -$prod
+
+	//8
+	{"NX",       0x8000, 0xf700, DSPInterpreter::nx,      &DSPEmitter::nx,     1, 0, {},                                                                                     true, false, false, false, false}, // extendable nop
+	{"CLR",      0x8100, 0xf700, DSPInterpreter::clr,     &DSPEmitter::clr,    1, 1, {{P_ACC,   1, 0, 11, 0x0800}},                                                          true, false, false, false, true},  // $acD = 0
+	{"CMP",      0x8200, 0xff00, DSPInterpreter::cmp,     &DSPEmitter::cmp,    1, 0, {},                                                                                     true, false, false, false, true},  // FLAGS($ac0 - $ac1)
+	{"MULAXH",   0x8300, 0xff00, DSPInterpreter::mulaxh,  &DSPEmitter::mulaxh, 1, 0, {},                                                                                     true, false, false, false, true},  // $prod = $ax0.h * $ax0.h
+	{"CLRP",     0x8400, 0xff00, DSPInterpreter::clrp,    &DSPEmitter::clrp,   1, 0, {},                                                                                     true, false, false, false, true},  // $prod = 0
+	{"TSTPROD",  0x8500, 0xff00, DSPInterpreter::tstprod, &DSPEmitter::tstprod,1, 0, {},                                                                                     true, false, false, false, true},  // FLAGS($prod)
+	{"TSTAXH",   0x8600, 0xfe00, DSPInterpreter::tstaxh,  &DSPEmitter::tstaxh, 1, 1, {{P_REG1A, 1, 0, 8, 0x0100}},                                                           true, false, false, false, true},  // FLAGS($axR.h)
+	{"M2",       0x8a00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // enable "$prod *= 2" after every multiplication
+	{"M0",       0x8b00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // disable "$prod *= 2" after every multiplication
+	{"CLR15",    0x8c00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // set normal multiplication
+	{"SET15",    0x8d00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // set unsigned multiplication in MUL
+	{"SET16",    0x8e00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // set 16 bit sign extension width
+	{"SET40",    0x8f00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false}, // set 40 bit sign extension width
+
+	//9
+	{"MUL",      0x9000, 0xf700, DSPInterpreter::mul,     &DSPEmitter::mul,    1, 2, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800}},                            true, false, false, false, true}, // $prod = $axS.l * $axS.h
+	{"ASR16",    0x9100, 0xf700, DSPInterpreter::asr16,   &DSPEmitter::asr16,  1, 1, {{P_ACC,   1, 0, 11, 0x0800}},                                                          true, false, false, false, true}, // $acD >>= 16 (shifting in sign bits)
+	{"MULMVZ",   0x9200, 0xf600, DSPInterpreter::mulmvz,  &DSPEmitter::mulmvz, 1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR.hm = $prod.hm; $acR.l = 0; $prod = $axS.l * $axS.h
+	{"MULAC",    0x9400, 0xf600, DSPInterpreter::mulac,   &DSPEmitter::mulac,  1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR += $prod; $prod = $axS.l * $axS.h
+	{"MULMV",    0x9600, 0xf600, DSPInterpreter::mulmv,   &DSPEmitter::mulmv,  1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR = $prod; $prod = $axS.l * $axS.h
+
+	//a-b
+	{"MULX",     0xa000, 0xe700, DSPInterpreter::mulx,    &DSPEmitter::mulx,   1, 2, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}},                           true, false, false, false, true}, // $prod = $ax0.S * $ax1.T
+	{"ABS",      0xa100, 0xf700, DSPInterpreter::abs,     &DSPEmitter::abs,    1, 1, {{P_ACC,    1, 0, 11, 0x0800}},                                                         true, false, false, false, true}, // $acD = abs($acD)
+	{"MULXMVZ",  0xa200, 0xe600, DSPInterpreter::mulxmvz, &DSPEmitter::mulxmvz,1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR.hm = $prod.hm; $acR.l = 0; $prod = $ax0.S * $ax1.T
+	{"MULXAC",   0xa400, 0xe600, DSPInterpreter::mulxac,  &DSPEmitter::mulxac, 1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR += $prod; $prod = $ax0.S * $ax1.T
+	{"MULXMV",   0xa600, 0xe600, DSPInterpreter::mulxmv,  &DSPEmitter::mulxmv, 1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR = $prod; $prod = $ax0.S * $ax1.T
+	{"TST",      0xb100, 0xf700, DSPInterpreter::tst,     &DSPEmitter::tst,    1, 1, {{P_ACC,    1, 0, 11, 0x0800}},                                                         true, false, false, false, true}, // FLAGS($acR)
+
+	//c-d
+	{"MULC",     0xc000, 0xe700, DSPInterpreter::mulc,    &DSPEmitter::mulc,   1, 2, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800}},                            true, false, false, false, true}, // $prod = $acS.m * $axS.h
+	{"CMPAR",    0xc100, 0xe700, DSPInterpreter::cmpar,   &DSPEmitter::cmpar,  1, 2, {{P_ACC,  1, 0, 11, 0x0800},   {P_REG1A, 1, 0, 12, 0x1000}},                            true, false, false, false, true}, // FLAGS($acS - axR.h)
+	{"MULCMVZ",  0xc200, 0xe600, DSPInterpreter::mulcmvz, &DSPEmitter::mulcmvz,1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR.hm, $acR.l, $prod = $prod.hm, 0, $acS.m * $axS.h
+	{"MULCAC",   0xc400, 0xe600, DSPInterpreter::mulcac,  &DSPEmitter::mulcac, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR, $prod = $acR + $prod, $acS.m * $axS.h
+	{"MULCMV",   0xc600, 0xe600, DSPInterpreter::mulcmv,  &DSPEmitter::mulcmv, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true}, // $acR, $prod = $prod, $acS.m * $axS.h
+
+	//e
+	{"MADDX",    0xe000, 0xfc00, DSPInterpreter::maddx,   &DSPEmitter::maddx,  1, 2, {{P_REGM18, 1, 0, 8, 0x0200},  {P_REGM19, 1, 0, 7, 0x0100}},                            true, false, false, false, true}, // $prod += $ax0.S * $ax1.T
+	{"MSUBX",    0xe400, 0xfc00, DSPInterpreter::msubx,   &DSPEmitter::msubx,  1, 2, {{P_REGM18, 1, 0, 8, 0x0200},  {P_REGM19, 1, 0, 7, 0x0100}},                            true, false, false, false, true}, // $prod -= $ax0.S * $ax1.T
+	{"MADDC",    0xe800, 0xfc00, DSPInterpreter::maddc,   &DSPEmitter::maddc,  1, 2, {{P_ACCM,   1, 0, 9, 0x0200},  {P_REG19, 1, 0, 7, 0x0100}},                             true, false, false, false, true}, // $prod += $acS.m * $axT.h
+	{"MSUBC",    0xec00, 0xfc00, DSPInterpreter::msubc,   &DSPEmitter::msubc,  1, 2, {{P_ACCM,   1, 0, 9, 0x0200},  {P_REG19, 1, 0, 7, 0x0100}},                             true, false, false, false, true}, // $prod -= $acS.m * $axT.h
+
+	//f
+	{"LSL16",    0xf000, 0xfe00, DSPInterpreter::lsl16,   &DSPEmitter::lsl16,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true}, // $acR <<= 16
+	{"MADD",     0xf200, 0xfe00, DSPInterpreter::madd,    &DSPEmitter::madd,   1, 2, {{P_REG18, 1, 0,  8, 0x0100},  {P_REG1A, 1, 0, 8, 0x0100}},                             true, false, false, false, true}, // $prod += $axS.l * $axS.h
+	{"LSR16",    0xf400, 0xfe00, DSPInterpreter::lsr16,   &DSPEmitter::lsr16,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true}, // $acR >>= 16
+	{"MSUB",     0xf600, 0xfe00, DSPInterpreter::msub,    &DSPEmitter::msub,   1, 2, {{P_REG18, 1, 0,  8, 0x0100},  {P_REG1A, 1, 0, 8, 0x0100}},                             true, false, false, false, true}, // $prod -= $axS.l * $axS.h
+	{"ADDPAXZ",  0xf800, 0xfc00, DSPInterpreter::addpaxz, &DSPEmitter::addpaxz,1, 2, {{P_ACC,   1, 0,  9, 0x0200},  {P_AX, 1, 0, 8, 0x0100}},                                true, false, false, false, true}, // $acD.hm = $prod.hm + $ax.h; $acD.l = 0
+	{"CLRL",     0xfc00, 0xfe00, DSPInterpreter::clrl,    &DSPEmitter::clrl,   1, 1, {{P_ACCL,  1, 0, 11, 0x0800}},                                                          true, false, false, false, true}, // $acR.l = 0
+	{"MOVPZ",    0xfe00, 0xfe00, DSPInterpreter::movpz,   &DSPEmitter::movpz,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true}, // $acD.hm = $prod.hm; $acD.l = 0
+};
+
+const DSPOPCTemplate cw =
+	{"CW",     0x0000, 0x0000, nop, nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
+
+// extended opcodes
+
+const DSPOPCTemplate opcodes_ext[] =
+{
+	{"XXX",    0x0000, 0x00fc, DSPInterpreter::Ext::nop,  &DSPEmitter::nop,  1, 1, {{P_VAL, 1, 0, 0, 0x00ff}}, false, false, false, false, false}, // no operation
+
+	{"DR",     0x0004, 0x00fc, DSPInterpreter::Ext::dr,   &DSPEmitter::dr,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $arR--
+	{"IR",     0x0008, 0x00fc, DSPInterpreter::Ext::ir,   &DSPEmitter::ir,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $arR++
+	{"NR",     0x000c, 0x00fc, DSPInterpreter::Ext::nr,   &DSPEmitter::nr,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $arR += $ixR
+	{"MV",     0x0010, 0x00f0, DSPInterpreter::Ext::mv,   &DSPEmitter::mv,   1, 2, {{P_REG18, 1, 0, 2, 0x000c}, {P_REG1C, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $(D+24) = $(S+28)
+
+	{"S",      0x0020, 0x00e4, DSPInterpreter::Ext::s,    &DSPEmitter::s,    1, 2, {{P_PRG, 1, 0, 0, 0x0003}, {P_REG1C, 1, 0, 3, 0x0018}}, false, false, false, false, false}, // MEM[$D++] = $(S+28)
+	{"SN",     0x0024, 0x00e4, DSPInterpreter::Ext::sn,   &DSPEmitter::sn,   1, 2, {{P_PRG, 1, 0, 0, 0x0003}, {P_REG1C, 1, 0, 3, 0x0018}}, false, false, false, false, false}, // MEM[$D] = $(D+28); $D += $(D+4)
+
+	{"L",      0x0040, 0x00c4, DSPInterpreter::Ext::l,    &DSPEmitter::l,    1, 2, {{P_REG18, 1, 0, 3, 0x0038}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $(D+24) = MEM[$S++]
+	{"LN",     0x0044, 0x00c4, DSPInterpreter::Ext::ln,   &DSPEmitter::ln,   1, 2, {{P_REG18, 1, 0, 3, 0x0038}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $(D+24) = MEM[$S]; $S += $(S+4)
+
+	{"LS",     0x0080, 0x00ce, DSPInterpreter::Ext::ls,   &DSPEmitter::ls,   1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false}, // $(D+24) = MEM[$ar0++]; MEM[$ar3++] = $acS.m
+	{"SL",     0x0082, 0x00ce, DSPInterpreter::Ext::sl,   &DSPEmitter::sl,   1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false}, // MEM[$ar0++] = $acS.m; $(D+24) = MEM[$ar3++]
+	{"LSN",    0x0084, 0x00ce, DSPInterpreter::Ext::lsn,  &DSPEmitter::lsn,  1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false}, // $(D+24) = MEM[$ar0]; MEM[$ar3++] = $acS.m; $ar0 += $ix0
+	{"SLN",    0x0086, 0x00ce, DSPInterpreter::Ext::sln,  &DSPEmitter::sln,  1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false}, // MEM[$ar0] = $acS.m; $(D+24) = MEM[$ar3++]; $ar0 += $ix0
+	{"LSM",    0x0088, 0x00ce, DSPInterpreter::Ext::lsm,  &DSPEmitter::lsm,  1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false}, // $(D+24) = MEM[$ar0++]; MEM[$ar3] = $acS.m; $ar3 += $ix3
+	{"SLM",    0x008a, 0x00ce, DSPInterpreter::Ext::slm,  &DSPEmitter::slm,  1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false}, // MEM[$ar0++] = $acS.m; $(D+24) = MEM[$ar3]; $ar3 += $ix3
+	{"LSNM",   0x008c, 0x00ce, DSPInterpreter::Ext::lsnm, &DSPEmitter::lsnm, 1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false}, // $(D+24) = MEM[$ar0]; MEM[$ar3] = $acS.m; $ar0 += $ix0; $ar3 += $ix3
+	{"SLNM",   0x008e, 0x00ce, DSPInterpreter::Ext::slnm, &DSPEmitter::slnm, 1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false}, // MEM[$ar0] = $acS.m; $(D+24) = MEM[$ar3]; $ar0 += $ix0; $ar3 += $ix3
+
+	{"LDAX",   0x00c3, 0x00cf, DSPInterpreter::Ext::ldax,   &DSPEmitter::ldax,   1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false}, // $axR.h = MEM[$arS++]; $axR.l = MEM[$ar3++]
+	{"LDAXN",  0x00c7, 0x00cf, DSPInterpreter::Ext::ldaxn,  &DSPEmitter::ldaxn,  1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false}, // $axR.h = MEM[$arS]; $axR.l = MEM[$ar3++]; $arS += $ixS
+	{"LDAXM",  0x00cb, 0x00cf, DSPInterpreter::Ext::ldaxm,  &DSPEmitter::ldaxm,  1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false}, // $axR.h = MEM[$arS++]; $axR.l = MEM[$ar3]; $ar3 += $ix3
+	{"LDAXNM", 0x00cf, 0x00cf, DSPInterpreter::Ext::ldaxnm, &DSPEmitter::ldaxnm, 1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false}, // $axR.h = MEM[$arS]; $axR.l = MEM[$ar3]; $arS += $ixS; $ar3 += $ix3
+
+	{"LD",     0x00c0, 0x00cc, DSPInterpreter::Ext::ld,   &DSPEmitter::ld,   1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $ax0.D = MEM[$arS++]; $ax1.R = MEM[$ar3++]
+	{"LDN",    0x00c4, 0x00cc, DSPInterpreter::Ext::ldn,  &DSPEmitter::ldn,  1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $ax0.D = MEM[$arS]; $ax1.R = MEM[$ar3++]; $arS += $ixS
+	{"LDM",    0x00c8, 0x00cc, DSPInterpreter::Ext::ldm,  &DSPEmitter::ldm,  1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $ax0.D = MEM[$arS++]; $ax1.R = MEM[$ar3]; $ar3 += $ix3
+	{"LDNM",   0x00cc, 0x00cc, DSPInterpreter::Ext::ldnm, &DSPEmitter::ldnm, 1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false}, // $ax0.D = MEM[$arS]; $ax1.R = MEM[$ar3]; $arS += $ixS; $ar3 += $ix3
+};
+
+const int opcodes_size = sizeof(opcodes) / sizeof(DSPOPCTemplate);
+const int opcodes_ext_size = sizeof(opcodes_ext) / sizeof(DSPOPCTemplate);
+
+const pdlabel_t pdlabels[] =
+{
+	{0xffa0, "COEF_A1_0", "COEF_A1_0",},
+	{0xffa1, "COEF_A2_0", "COEF_A2_0",},
+	{0xffa2, "COEF_A1_1", "COEF_A1_1",},
+	{0xffa3, "COEF_A2_1", "COEF_A2_1",},
+	{0xffa4, "COEF_A1_2", "COEF_A1_2",},
+	{0xffa5, "COEF_A2_2", "COEF_A2_2",},
+	{0xffa6, "COEF_A1_3", "COEF_A1_3",},
+	{0xffa7, "COEF_A2_3", "COEF_A2_3",},
+	{0xffa8, "COEF_A1_4", "COEF_A1_4",},
+	{0xffa9, "COEF_A2_4", "COEF_A2_4",},
+	{0xffaa, "COEF_A1_5", "COEF_A1_5",},
+	{0xffab, "COEF_A2_5", "COEF_A2_5",},
+	{0xffac, "COEF_A1_6", "COEF_A1_6",},
+	{0xffad, "COEF_A2_6", "COEF_A2_6",},
+	{0xffae, "COEF_A1_7", "COEF_A1_7",},
+	{0xffaf, "COEF_A2_7", "COEF_A2_7",},
+
+	{0xffb0, "0xffb0", nullptr,},
+	{0xffb1, "0xffb1", nullptr,},
+	{0xffb2, "0xffb2", nullptr,},
+	{0xffb3, "0xffb3", nullptr,},
+	{0xffb4, "0xffb4", nullptr,},
+	{0xffb5, "0xffb5", nullptr,},
+	{0xffb6, "0xffb6", nullptr,},
+	{0xffb7, "0xffb7", nullptr,},
+	{0xffb8, "0xffb8", nullptr,},
+	{0xffb9, "0xffb9", nullptr,},
+	{0xffba, "0xffba", nullptr,},
+	{0xffbb, "0xffbb", nullptr,},
+	{0xffbc, "0xffbc", nullptr,},
+	{0xffbd, "0xffbd", nullptr,},
+	{0xffbe, "0xffbe", nullptr,},
+	{0xffbf, "0xffbf", nullptr,},
+
+	{0xffc0, "0xffc0", nullptr,},
+	{0xffc1, "0xffc1", nullptr,},
+	{0xffc2, "0xffc2", nullptr,},
+	{0xffc3, "0xffc3", nullptr,},
+	{0xffc4, "0xffc4", nullptr,},
+	{0xffc5, "0xffc5", nullptr,},
+	{0xffc6, "0xffc6", nullptr,},
+	{0xffc7, "0xffc7", nullptr,},
+	{0xffc8, "0xffc8", nullptr,},
+	{0xffc9, "DSCR", "DSP DMA Control Reg",},
+	{0xffca, "0xffca", nullptr,},
+	{0xffcb, "DSBL", "DSP DMA Block Length",},
+	{0xffcc, "0xffcc", nullptr,},
+	{0xffcd, "DSPA", "DSP DMA DMEM Address",},
+	{0xffce, "DSMAH", "DSP DMA Mem Address H",},
+	{0xffcf, "DSMAL", "DSP DMA Mem Address L",},
+
+	{0xffd0, "0xffd0",nullptr,},
+	{0xffd1, "SampleFormat", "SampleFormat",},
+	{0xffd2, "0xffd2",nullptr,},
+	{0xffd3, "UnkZelda", "Unk Zelda reads/writes from/to it",},
+	{0xffd4, "ACSAH", "Accelerator start address H",},
+	{0xffd5, "ACSAL", "Accelerator start address L",},
+	{0xffd6, "ACEAH", "Accelerator end address H",},
+	{0xffd7, "ACEAL", "Accelerator end address L",},
+	{0xffd8, "ACCAH", "Accelerator current address H",},
+	{0xffd9, "ACCAL", "Accelerator current address L",},
+	{0xffda, "pred_scale", "pred_scale",},
+	{0xffdb, "yn1", "yn1",},
+	{0xffdc, "yn2", "yn2",},
+	{0xffdd, "ARAM", "Direct Read from ARAM (uses ADPCM)",},
+	{0xffde, "GAIN", "Gain",},
+	{0xffdf, "0xffdf", nullptr,},
+
+	{0xffe0, "0xffe0",nullptr,},
+	{0xffe1, "0xffe1",nullptr,},
+	{0xffe2, "0xffe2",nullptr,},
+	{0xffe3, "0xffe3",nullptr,},
+	{0xffe4, "0xffe4",nullptr,},
+	{0xffe5, "0xffe5",nullptr,},
+	{0xffe6, "0xffe6",nullptr,},
+	{0xffe7, "0xffe7",nullptr,},
+	{0xffe8, "0xffe8",nullptr,},
+	{0xffe9, "0xffe9",nullptr,},
+	{0xffea, "0xffea",nullptr,},
+	{0xffeb, "0xffeb",nullptr,},
+	{0xffec, "0xffec",nullptr,},
+	{0xffed, "0xffed",nullptr,},
+	{0xffee, "0xffee",nullptr,},
+	{0xffef, "AMDM", "ARAM DMA Request Mask",},
+
+	{0xfff0, "0xfff0",nullptr,},
+	{0xfff1, "0xfff1",nullptr,},
+	{0xfff2, "0xfff2",nullptr,},
+	{0xfff3, "0xfff3",nullptr,},
+	{0xfff4, "0xfff4",nullptr,},
+	{0xfff5, "0xfff5",nullptr,},
+	{0xfff6, "0xfff6",nullptr,},
+	{0xfff7, "0xfff7",nullptr,},
+	{0xfff8, "0xfff8",nullptr,},
+	{0xfff9, "0xfff9",nullptr,},
+	{0xfffa, "0xfffa",nullptr,},
+	{0xfffb, "DIRQ", "DSP IRQ Request",},
+	{0xfffc, "DMBH", "DSP Mailbox H",},
+	{0xfffd, "DMBL", "DSP Mailbox L",},
+	{0xfffe, "CMBH", "CPU Mailbox H",},
+	{0xffff, "CMBL", "CPU Mailbox L",},
+};
+
+const u32 pdlabels_size = sizeof(pdlabels) / sizeof(pdlabel_t);
+
+const pdlabel_t regnames[] =
+{
+	{0x00, "AR0",       "Addr Reg 00",},
+	{0x01, "AR1",       "Addr Reg 01",},
+	{0x02, "AR2",       "Addr Reg 02",},
+	{0x03, "AR3",       "Addr Reg 03",},
+	{0x04, "IX0",       "Index Reg 0",},
+	{0x05, "IX1",       "Index Reg 1",},
+	{0x06, "IX2",       "Index Reg 2",},
+	{0x07, "IX3",       "Index Reg 3",},
+	{0x08, "WR0",       "Wrapping Register 0",},
+	{0x09, "WR1",       "Wrapping Register 1",},
+	{0x0a, "WR2",       "Wrapping Register 2",},
+	{0x0b, "WR3",       "Wrapping Register 3",},
+	{0x0c, "ST0",       "Call stack",},
+	{0x0d, "ST1",       "Data stack",},
+	{0x0e, "ST2",       "Loop addr stack",},
+	{0x0f, "ST3",       "Loop counter",},
+	{0x10, "AC0.H",     "Accu High 0",},
+	{0x11, "AC1.H",     "Accu High 1",},
+	{0x12, "CR",        "Config Register",},
+	{0x13, "SR",        "Special Register",},
+	{0x14, "PROD.L",    "Prod L",},
+	{0x15, "PROD.M1",   "Prod M1",},
+	{0x16, "PROD.H",    "Prod H",},
+	{0x17, "PROD.M2",   "Prod M2",},
+	{0x18, "AX0.L",     "Extra Accu L 0",},
+	{0x19, "AX1.L",     "Extra Accu L 1",},
+	{0x1a, "AX0.H",     "Extra Accu H 0",},
+	{0x1b, "AX1.H",     "Extra Accu H 1",},
+	{0x1c, "AC0.L",     "Accu Low 0",},
+	{0x1d, "AC1.L",     "Accu Low 1",},
+	{0x1e, "AC0.M",     "Accu Mid 0",},
+	{0x1f, "AC1.M",     "Accu Mid 1",},
+
+	// To resolve combined register names.
+	{0x20, "ACC0",      "Accu Full 0",},
+	{0x21, "ACC1",      "Accu Full 1",},
+	{0x22, "AX0",       "Extra Accu 0",},
+	{0x23, "AX1",       "Extra Accu 1",},
+};
+
+const DSPOPCTemplate *opTable[OPTABLE_SIZE];
+const DSPOPCTemplate *extOpTable[EXT_OPTABLE_SIZE];
+u16 writeBackLog[WRITEBACKLOGSIZE];
+int writeBackLogIdx[WRITEBACKLOGSIZE];
+
+const char* pdname(u16 val)
+{
+	static char tmpstr[12]; // nasty
+
+	for (const pdlabel_t& pdlabel : pdlabels)
+	{
+		if (pdlabel.addr == val)
+			return pdlabel.name;
+	}
+
+	sprintf(tmpstr, "0x%04x", val);
+	return tmpstr;
+}
+
+const char *pdregname(int val)
+{
+	return regnames[val].name;
+}
+
+const char *pdregnamelong(int val)
+{
+	return regnames[val].description;
+}
+
+const DSPOPCTemplate *GetOpTemplate(const UDSPInstruction &inst)
+{
+	return opTable[inst];
+}
+
+
+// This function could use the above GetOpTemplate, but then we'd lose the
+// nice property that it catches colliding op masks.
+void InitInstructionTable()
+{
+	// ext op table
+	for (int i = 0; i < EXT_OPTABLE_SIZE; i++)
+	{
+		extOpTable[i] = &cw;
+
+		for (const DSPOPCTemplate& ext : opcodes_ext)
+		{
+			u16 mask = ext.opcode_mask;
+			if ((mask & i) == ext.opcode)
+			{
+				if (extOpTable[i] == &cw)
+				{
+					extOpTable[i] = &ext;
+				}
+				else
+				{
+					//if the entry already in the table
+					//is a strict subset, allow it
+					if ((extOpTable[i]->opcode_mask | ext.opcode_mask) != extOpTable[i]->opcode_mask)
+					{
+						ERROR_LOG(DSPLLE, "opcode ext table place %d already in use by %s when inserting %s", i, extOpTable[i]->name, ext.name);
+					}
+				}
+			}
+		}
+	}
+
+	// op table
+	for (const DSPOPCTemplate*& opcode : opTable)
+	{
+		opcode = &cw;
+	}
+
+	for (int i = 0; i < OPTABLE_SIZE; i++)
+	{
+		for (const DSPOPCTemplate& opcode : opcodes)
+		{
+			u16 mask = opcode.opcode_mask;
+			if ((mask & i) == opcode.opcode)
+			{
+				if (opTable[i] == &cw)
+					opTable[i] = &opcode;
+				else
+					ERROR_LOG(DSPLLE, "opcode table place %d already in use for %s", i, opcode.name);
+			}
+		}
+	}
+
+	for (int& elem : writeBackLogIdx)
+	{
+		elem = -1;
+	}
+}
diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h
new file mode 100644
index 0000000000..97b920a1a9
--- /dev/null
+++ b/Source/Core/Core/DSP/DSPTables.h
@@ -0,0 +1,147 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
+
+#pragma once
+
+#include "Core/DSP/DSPCommon.h"
+#include "Core/DSP/DSPEmitter.h"
+
+// The non-ADDR ones that end with _D are the opposite one - if the bit specify
+// ACC0, then ACC_D will be ACC1.
+
+// The values of these are very important.
+// For the reg ones, the value >> 8 is the base register.
+// & 0x80  means it's a "D".
+
+enum partype_t
+{
+	P_NONE      = 0x0000,
+	P_VAL       = 0x0001,
+	P_IMM       = 0x0002,
+	P_MEM       = 0x0003,
+	P_STR       = 0x0004,
+	P_ADDR_I    = 0x0005,
+	P_ADDR_D    = 0x0006,
+	P_REG       = 0x8000,
+	P_REG04     = P_REG | 0x0400, // IX
+	P_REG08     = P_REG | 0x0800,
+	P_REG18     = P_REG | 0x1800,
+	P_REGM18    = P_REG | 0x1810, // used in multiply instructions
+	P_REG19     = P_REG | 0x1900,
+	P_REGM19    = P_REG | 0x1910, // used in multiply instructions
+	P_REG1A     = P_REG | 0x1a80,
+	P_REG1C     = P_REG | 0x1c00,
+	// P_ACC       = P_REG | 0x1c10, // used for global accum (gcdsptool's value)
+	P_ACCL      = P_REG | 0x1c00, // used for low part of accum
+	P_ACCM      = P_REG | 0x1e00, // used for mid part of accum
+	// The following are not in gcdsptool
+	P_ACCM_D    = P_REG | 0x1e80,
+	P_ACC       = P_REG | 0x2000, // used for full accum.
+	P_ACC_D     = P_REG | 0x2080,
+	P_AX        = P_REG | 0x2200,
+	P_REGS_MASK = 0x03f80, // gcdsptool's value = 0x01f80
+	P_REF       = P_REG | 0x4000,
+	P_PRG       = P_REF | P_REG,
+
+	// The following seem like junk:
+	// P_REG10     = P_REG | 0x1000,
+	// P_AX_D      = P_REG | 0x2280,
+};
+
+#define OPTABLE_SIZE 0xffff + 1
+#define EXT_OPTABLE_SIZE 0xff + 1
+
+void nop(const UDSPInstruction opc);
+
+typedef void (*dspIntFunc)(const UDSPInstruction);
+typedef void (DSPEmitter::*dspJitFunc)(const UDSPInstruction);
+
+struct param2_t
+{
+	partype_t type;
+	u8 size;
+	u8 loc;
+	s8 lshift;
+	u16 mask;
+};
+
+struct DSPOPCTemplate
+{
+	const char *name;
+	u16 opcode;
+	u16 opcode_mask;
+
+	dspIntFunc intFunc;
+	dspJitFunc jitFunc;
+
+	u8 size;
+	u8 param_count;
+	param2_t params[8];
+	bool extended;
+	bool branch;
+	bool uncond_branch;
+	bool reads_pc;
+	bool updates_sr;
+};
+
+typedef DSPOPCTemplate opc_t;
+
+// Opcodes
+extern const DSPOPCTemplate opcodes[];
+extern const int opcodes_size;
+extern const DSPOPCTemplate opcodes_ext[];
+extern const int opcodes_ext_size;
+extern const DSPOPCTemplate cw;
+
+#define WRITEBACKLOGSIZE 5
+
+extern const DSPOPCTemplate *opTable[OPTABLE_SIZE];
+extern const DSPOPCTemplate *extOpTable[EXT_OPTABLE_SIZE];
+extern u16 writeBackLog[WRITEBACKLOGSIZE];
+extern int writeBackLogIdx[WRITEBACKLOGSIZE];
+
+// Predefined labels
+struct pdlabel_t
+{
+	u16 addr;
+	const char* name;
+	const char* description;
+};
+
+extern const pdlabel_t regnames[];
+extern const pdlabel_t pdlabels[];
+extern const u32 pdlabels_size;
+
+const char *pdname(u16 val);
+const char *pdregname(int val);
+const char *pdregnamelong(int val);
+
+void InitInstructionTable();
+void applyWriteBackLog();
+void zeroWriteBackLog();
+void zeroWriteBackLogPreserveAcc(u8 acc);
+
+const DSPOPCTemplate *GetOpTemplate(const UDSPInstruction &inst);
+
+inline void ExecuteInstruction(const UDSPInstruction inst)
+{
+	const DSPOPCTemplate *tinst = GetOpTemplate(inst);
+
+	if (tinst->extended)
+	{
+		if ((inst >> 12) == 0x3)
+			extOpTable[inst & 0x7F]->intFunc(inst);
+		else
+			extOpTable[inst & 0xFF]->intFunc(inst);
+	}
+
+	tinst->intFunc(inst);
+
+	if (tinst->extended)
+	{
+		applyWriteBackLog();
+	}
+}
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp
similarity index 91%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp
index dbb185844e..587d389451 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp
@@ -1,18 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "../DSPIntCCUtil.h"
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "../DSPAnalyzer.h"
-#ifdef _M_X64
-#include "DSPJitUtil.h"
-#endif
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+
 using namespace Gen;
 
 // CLR $acR
@@ -22,7 +19,6 @@ using namespace Gen;
 // flags out: --10 0100
 void DSPEmitter::clr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 reg = (opc >> 11) & 0x1;
 //	dsp_set_long_acc(reg, 0);
 	MOV(64, R(RAX), Imm64(0));
@@ -32,9 +28,6 @@ void DSPEmitter::clr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // CLRL $acR.l
@@ -44,7 +37,6 @@ void DSPEmitter::clr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::clrl(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 reg = (opc >> 8) & 0x1;
 //	s64 acc = dsp_round_long_acc(dsp_get_long_acc(reg));
 	get_long_acc(reg);
@@ -56,9 +48,6 @@ void DSPEmitter::clrl(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -72,7 +61,6 @@ void DSPEmitter::clrl(const UDSPInstruction opc)
 // flags out: -x-- ----
 void DSPEmitter::andcf(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 reg  = (opc >> 8) & 0x1;
@@ -81,7 +69,7 @@ void DSPEmitter::andcf(const UDSPInstruction opc)
 //		u16 val = dsp_get_acc_m(reg);
 		get_acc_m(reg);
 //		Update_SR_LZ(((val & imm) == imm) ? true : false);
-//		if ((val & imm) == imm) 
+//		if ((val & imm) == imm)
 //			g_dsp.r.sr |= SR_LOGIC_ZERO;
 //		else
 //			g_dsp.r.sr &= ~SR_LOGIC_ZERO;
@@ -97,9 +85,6 @@ void DSPEmitter::andcf(const UDSPInstruction opc)
 		SetJumpTarget(exit);
 		gpr.putReg(DSP_REG_SR);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ANDF $acD.m, #I
@@ -112,7 +97,6 @@ void DSPEmitter::andcf(const UDSPInstruction opc)
 // flags out: -x-- ----
 void DSPEmitter::andf(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 reg  = (opc >> 8) & 0x1;
@@ -121,7 +105,7 @@ void DSPEmitter::andf(const UDSPInstruction opc)
 //		u16 val = dsp_get_acc_m(reg);
 		get_acc_m(reg);
 //		Update_SR_LZ(((val & imm) == 0) ? true : false);
-//		if ((val & imm) == 0) 
+//		if ((val & imm) == 0)
 //			g_dsp.r.sr |= SR_LOGIC_ZERO;
 //		else
 //			g_dsp.r.sr &= ~SR_LOGIC_ZERO;
@@ -136,9 +120,6 @@ void DSPEmitter::andf(const UDSPInstruction opc)
 		SetJumpTarget(exit);
 		gpr.putReg(DSP_REG_SR);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -150,7 +131,6 @@ void DSPEmitter::andf(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::tst(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 reg = (opc >> 11) & 0x1;
@@ -159,9 +139,6 @@ void DSPEmitter::tst(const UDSPInstruction opc)
 //		Update_SR_Register64(acc);
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // TSTAXH $axR.h
@@ -171,7 +148,6 @@ void DSPEmitter::tst(const UDSPInstruction opc)
 // flags out: --x0 xx00
 void DSPEmitter::tstaxh(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 reg  = (opc >> 8) & 0x1;
@@ -180,9 +156,6 @@ void DSPEmitter::tstaxh(const UDSPInstruction opc)
 //		Update_SR_Register16(val);
 		Update_SR_Register16();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -194,7 +167,6 @@ void DSPEmitter::tstaxh(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::cmp(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		X64Reg tmp1;
@@ -208,12 +180,9 @@ void DSPEmitter::cmp(const UDSPInstruction opc)
 		SUB(64, R(RAX), R(RDX));
 //		Update_SR_Register64(res, isCarry2(acc0, res), isOverflow(acc0, -acc1, res)); // CF -> influence on ABS/0xa100
 		NEG(64, R(RDX));
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 		gpr.putXReg(tmp1);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // CMPAR $acS axR.h
@@ -224,7 +193,6 @@ void DSPEmitter::cmp(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::cmpar(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 rreg = ((opc >> 12) & 0x1);
@@ -243,24 +211,20 @@ void DSPEmitter::cmpar(const UDSPInstruction opc)
 		SUB(64, R(RAX), R(RDX));
 //		Update_SR_Register64(res, isCarry2(sr, res), isOverflow(sr, -rr, res));
 		NEG(64, R(RDX));
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 		gpr.putXReg(tmp1);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // CMPI $amD, #I
 // 0000 001r 1000 0000
 // iiii iiii iiii iiii
-// Compares mid accumulator $acD.hm ($amD) with sign extended immediate value I. 
+// Compares mid accumulator $acD.hm ($amD) with sign extended immediate value I.
 // Although flags are being set regarding whole accumulator register.
 //
 // flags out: x-xx xxxx
 void DSPEmitter::cmpi(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 reg  = (opc >> 8) & 0x1;
@@ -276,12 +240,9 @@ void DSPEmitter::cmpi(const UDSPInstruction opc)
 		SUB(64, R(RAX), R(RDX));
 //		Update_SR_Register64(res, isCarry2(val, res), isOverflow(val, -imm, res));
 		NEG(64, R(RDX));
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 		gpr.putXReg(tmp1);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // CMPIS $acD, #I
@@ -293,7 +254,6 @@ void DSPEmitter::cmpi(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::cmpis(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 		u8 areg = (opc >> 8) & 0x1;
@@ -309,12 +269,9 @@ void DSPEmitter::cmpis(const UDSPInstruction opc)
 		SUB(64, R(RAX), R(RDX));
 //		Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -val, res));
 		NEG(64, R(RDX));
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 		gpr.putXReg(tmp1);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -328,7 +285,6 @@ void DSPEmitter::cmpis(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::xorr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 //	u16 accm = g_dsp.r.acm[dreg] ^ g_dsp.r.axh[sreg];
@@ -343,9 +299,6 @@ void DSPEmitter::xorr(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ANDR $acD.m, $axS.h
@@ -357,7 +310,6 @@ void DSPEmitter::xorr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::andr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 	//	u16 accm = g_dsp.r.acm[dreg] & g_dsp.r.axh[sreg];
@@ -372,9 +324,6 @@ void DSPEmitter::andr(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ORR $acD.m, $axS.h
@@ -386,7 +335,6 @@ void DSPEmitter::andr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::orr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 	//	u16 accm = g_dsp.r.acm[dreg] | g_dsp.r.axh[sreg];
@@ -401,9 +349,6 @@ void DSPEmitter::orr(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ANDC $acD.m, $ac(1-D).m
@@ -415,7 +360,6 @@ void DSPEmitter::orr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::andc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 //	u16 accm = g_dsp.r.acm[dreg] & g_dsp.r.acm[1 - dreg];
 	get_acc_m(dreg, RAX);
@@ -429,9 +373,6 @@ void DSPEmitter::andc(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ORC $acD.m, $ac(1-D).m
@@ -443,7 +384,6 @@ void DSPEmitter::andc(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::orc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	//	u16 accm = g_dsp.r.acm[dreg] | g_dsp.r.acm[1 - dreg];
 	get_acc_m(dreg, RAX);
@@ -457,9 +397,6 @@ void DSPEmitter::orc(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // XORC $acD.m
@@ -470,7 +407,6 @@ void DSPEmitter::orc(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::xorc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	//	u16 accm = g_dsp.r.acm[dreg] ^ g_dsp.r.acm[1 - dreg];
 	get_acc_m(dreg, RAX);
@@ -484,9 +420,6 @@ void DSPEmitter::xorc(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // NOT $acD.m
@@ -497,7 +430,6 @@ void DSPEmitter::xorc(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::notc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 //	u16 accm = g_dsp.r.acm[dreg] ^ 0xffff;
 	get_acc_m(dreg, RAX);
@@ -510,9 +442,6 @@ void DSPEmitter::notc(const UDSPInstruction opc)
 		get_long_acc(dreg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // XORI $acD.m, #I
@@ -524,7 +453,6 @@ void DSPEmitter::notc(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::xori(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 reg  = (opc >> 8) & 0x1;
 //	u16 imm = dsp_fetch_code();
 	u16 imm = dsp_imem_read(compilePC+1);
@@ -538,9 +466,6 @@ void DSPEmitter::xori(const UDSPInstruction opc)
 		get_long_acc(reg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ANDI $acD.m, #I
@@ -551,7 +476,6 @@ void DSPEmitter::xori(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::andi(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 reg  = (opc >> 8) & 0x1;
 //	u16 imm = dsp_fetch_code();
 	u16 imm = dsp_imem_read(compilePC+1);
@@ -565,9 +489,6 @@ void DSPEmitter::andi(const UDSPInstruction opc)
 		get_long_acc(reg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ORI $acD.m, #I
@@ -578,7 +499,6 @@ void DSPEmitter::andi(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::ori(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 reg  = (opc >> 8) & 0x1;
 	//	u16 imm = dsp_fetch_code();
 	u16 imm = dsp_imem_read(compilePC+1);
@@ -592,9 +512,6 @@ void DSPEmitter::ori(const UDSPInstruction opc)
 		get_long_acc(reg, RCX);
 		Update_SR_Register16_OverS32();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -606,7 +523,6 @@ void DSPEmitter::ori(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
 
@@ -634,9 +550,6 @@ void DSPEmitter::addr(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // ADDAX $acD, $axS
@@ -646,7 +559,6 @@ void DSPEmitter::addr(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addax(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -673,9 +585,6 @@ void DSPEmitter::addax(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // ADD $acD, $ac(1-D)
@@ -685,7 +594,6 @@ void DSPEmitter::addax(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::add(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg  = (opc >> 8) & 0x1;
 
 	X64Reg tmp1;
@@ -711,9 +619,6 @@ void DSPEmitter::add(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // ADDP $acD
@@ -723,7 +628,6 @@ void DSPEmitter::add(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addp(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 	X64Reg tmp1;
@@ -749,9 +653,6 @@ void DSPEmitter::addp(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // ADDAXL $acD, $axS.l
@@ -762,7 +663,6 @@ void DSPEmitter::addp(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addaxl(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 sreg = (opc >> 9) & 0x1;
 	u8 dreg = (opc >> 8) & 0x1;
 
@@ -790,12 +690,9 @@ void DSPEmitter::addaxl(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
-// ADDI $amR, #I 
+// ADDI $amR, #I
 // 0000 001r 0000 0000
 // iiii iiii iiii iiii
 // Adds immediate (16-bit sign extended) to mid accumulator $acD.hm.
@@ -803,7 +700,6 @@ void DSPEmitter::addaxl(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addi(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 areg = (opc >> 8) & 0x1;
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
@@ -832,9 +728,6 @@ void DSPEmitter::addi(const UDSPInstruction opc)
 		set_long_acc(areg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // ADDIS $acD, #I
@@ -844,7 +737,6 @@ void DSPEmitter::addi(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::addis(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 	X64Reg tmp1;
@@ -873,9 +765,6 @@ void DSPEmitter::addis(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // INCM $acsD
@@ -885,7 +774,6 @@ void DSPEmitter::addis(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::incm(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	s64 subtract = 0x10000;
 	X64Reg tmp1;
@@ -910,9 +798,6 @@ void DSPEmitter::incm(const UDSPInstruction opc)
 		set_long_acc(dreg);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // INC $acD
@@ -922,7 +807,6 @@ void DSPEmitter::incm(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::inc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
@@ -946,9 +830,6 @@ void DSPEmitter::inc(const UDSPInstruction opc)
 		set_long_acc(dreg);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -960,7 +841,6 @@ void DSPEmitter::inc(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::subr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
 
@@ -983,16 +863,13 @@ void DSPEmitter::subr(const UDSPInstruction opc)
 		NEG(64, R(RDX));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // SUBAX $acD, $axS
@@ -1002,7 +879,6 @@ void DSPEmitter::subr(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::subax(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -1023,26 +899,22 @@ void DSPEmitter::subax(const UDSPInstruction opc)
 		NEG(64, R(RDX));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // SUB $acD, $ac(1-D)
 // 0101 110d xxxx xxxx
-// Subtracts accumulator $ac(1-D) from accumulator register $acD. 
+// Subtracts accumulator $ac(1-D) from accumulator register $acD.
 //
 // flags out: x-xx xxxx
 void DSPEmitter::sub(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
@@ -1061,16 +933,13 @@ void DSPEmitter::sub(const UDSPInstruction opc)
 		NEG(64, R(RDX));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // SUBP $acD
@@ -1080,7 +949,6 @@ void DSPEmitter::sub(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::subp(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
@@ -1099,16 +967,13 @@ void DSPEmitter::subp(const UDSPInstruction opc)
 		NEG(64, R(RDX));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // DECM $acsD
@@ -1118,7 +983,6 @@ void DSPEmitter::subp(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::decm(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x01;
 	s64 subtract = 0x10000;
 	X64Reg tmp1;
@@ -1129,23 +993,20 @@ void DSPEmitter::decm(const UDSPInstruction opc)
 //	s64 res = acc - sub;
 	SUB(64, R(RAX), Imm32((u32)subtract));
 //	dsp_set_long_acc(dreg, res);
-//	res = dsp_get_long_acc(dreg);	
+//	res = dsp_get_long_acc(dreg);
 //	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -subtract, res));
 	if (FlagsNeeded())
 	{
 		MOV(64, R(RDX), Imm64(-subtract));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // DEC $acD
@@ -1155,11 +1016,10 @@ void DSPEmitter::decm(const UDSPInstruction opc)
 // flags out: x-xx xxxx
 void DSPEmitter::dec(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x01;
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
-//	s64 acc = dsp_get_long_acc(dreg); 
+//	s64 acc = dsp_get_long_acc(dreg);
 	get_long_acc(dreg, tmp1);
 	MOV(64, R(RAX), R(tmp1));
 //	s64 res = acc - 1;
@@ -1172,16 +1032,13 @@ void DSPEmitter::dec(const UDSPInstruction opc)
 		MOV(64, R(RDX), Imm64(-1));
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1, true);
 	}
 	else
 	{
 		set_long_acc(dreg);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -1193,7 +1050,6 @@ void DSPEmitter::dec(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::neg(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 //	s64 acc = dsp_get_long_acc(dreg);
 	get_long_acc(dreg);
@@ -1206,25 +1062,21 @@ void DSPEmitter::neg(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ABS  $acD
-// 1010 d001 xxxx xxxx 
+// 1010 d001 xxxx xxxx
 // absolute value of $acD
 //
 // flags out: --xx xx00
 void DSPEmitter::abs(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 11) & 0x1;
 
-//	s64 acc = dsp_get_long_acc(dreg); 	
+//	s64 acc = dsp_get_long_acc(dreg);
 	get_long_acc(dreg);
 //	if (acc < 0) acc = 0 - acc;
-	CMP(64, R(RAX), Imm8(0));
+	TEST(64, R(RAX), R(RAX));
 	FixupBranch GreaterThanOrEqual = J_CC(CC_GE);
 	NEG(64, R(RAX));
 	set_long_acc(dreg);
@@ -1234,9 +1086,6 @@ void DSPEmitter::abs(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 //----
 
@@ -1249,7 +1098,6 @@ void DSPEmitter::abs(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::movr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 areg = (opc >> 8) & 0x1;
 	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
 
@@ -1264,19 +1112,15 @@ void DSPEmitter::movr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MOVAX $acD, $axS
 // 0110 10sd xxxx xxxx
-// Moves secondary accumulator $axS to accumulator $axD. 
+// Moves secondary accumulator $axS to accumulator $axD.
 //
 // flags out: --xx xx00
 void DSPEmitter::movax(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -1289,9 +1133,6 @@ void DSPEmitter::movax(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MOV $acD, $ac(1-D)
@@ -1301,7 +1142,6 @@ void DSPEmitter::movax(const UDSPInstruction opc)
 // flags out: --x0 xx00
 void DSPEmitter::mov(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 //	u64 acc = dsp_get_long_acc(1 - dreg);
 	get_long_acc(1 - dreg);
@@ -1312,9 +1152,6 @@ void DSPEmitter::mov(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -1326,7 +1163,6 @@ void DSPEmitter::mov(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsl16(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 areg = (opc >> 8) & 0x1;
 //	s64 acc = dsp_get_long_acc(areg);
 	get_long_acc(areg);
@@ -1339,9 +1175,6 @@ void DSPEmitter::lsl16(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSR16 $acR
@@ -1351,13 +1184,12 @@ void DSPEmitter::lsl16(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsr16(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 areg = (opc >> 8) & 0x1;
 
 //	u64 acc = dsp_get_long_acc(areg);
 	get_long_acc(areg);
 //	acc &= 0x000000FFFFFFFFFFULL; 	// Lop off the extraneous sign extension our 64-bit fake accum causes
-//	acc >>= 16; 
+//	acc >>= 16;
 	SHR(64, R(RAX), Imm8(16));
 	AND(64, R(RAX), Imm32(0xffffff));
 //	dsp_set_long_acc(areg, (s64)acc);
@@ -1367,9 +1199,6 @@ void DSPEmitter::lsr16(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASR16 $acR
@@ -1379,7 +1208,6 @@ void DSPEmitter::lsr16(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asr16(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 areg = (opc >> 11) & 0x1;
 
 //	s64 acc = dsp_get_long_acc(areg);
@@ -1393,9 +1221,6 @@ void DSPEmitter::asr16(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSL $acR, #I
@@ -1403,11 +1228,10 @@ void DSPEmitter::asr16(const UDSPInstruction opc)
 // Logically shifts left accumulator $acR by number specified by value I.
 //
 // flags out: --xx xx00
-void DSPEmitter::lsl(const UDSPInstruction opc) 
+void DSPEmitter::lsl(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x01;
-	u16 shift = opc & 0x3f; 
+	u16 shift = opc & 0x3f;
 //	u64 acc = dsp_get_long_acc(rreg);
 	get_long_acc(rreg);
 
@@ -1421,9 +1245,6 @@ void DSPEmitter::lsl(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSR $acR, #I
@@ -1434,7 +1255,6 @@ void DSPEmitter::lsl(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x01;
 	u16 shift;
 //	u64 acc = dsp_get_long_acc(rreg);
@@ -1452,7 +1272,7 @@ void DSPEmitter::lsr(const UDSPInstruction opc)
 		//	acc >>= shift;
 		SHR(64, R(RAX), Imm8(shift + 24));
 	}
-	
+
 //	dsp_set_long_acc(rreg, (s64)acc);
 	set_long_acc(rreg);
 //	Update_SR_Register64(dsp_get_long_acc(rreg));
@@ -1460,9 +1280,6 @@ void DSPEmitter::lsr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASL $acR, #I
@@ -1472,7 +1289,6 @@ void DSPEmitter::lsr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asl(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x01;
 	u16 shift = opc & 0x3f;
 //	u64 acc = dsp_get_long_acc(rreg);
@@ -1486,9 +1302,6 @@ void DSPEmitter::asl(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASR $acR, #I
@@ -1499,7 +1312,6 @@ void DSPEmitter::asl(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x01;
 	u16 shift;
 
@@ -1521,9 +1333,6 @@ void DSPEmitter::asr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSRN  (fixed parameters)
@@ -1534,8 +1343,7 @@ void DSPEmitter::asr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsrn(const UDSPInstruction opc)
 {
-#ifdef _M_X64
-//	s16 shift; 
+//	s16 shift;
 //	u16 accm = (u16)dsp_get_acc_m(1);
 	get_acc_m(1);
 //	u64 acc = dsp_get_long_acc(0);
@@ -1551,13 +1359,16 @@ void DSPEmitter::lsrn(const UDSPInstruction opc)
 	//	else
 	//		shift = accm & 0x3f;
 
-	//	if (shift > 0) {
+	//	if (shift > 0)
+	//	{
 	//		acc >>= shift;
-	//	} else if (shift < 0) {
+	//	}
+	//	else if (shift < 0)
+	//	{
 	//		acc <<= -shift;
 	//	}
 
-	CMP(64, R(RDX), Imm8(0));//is this actually worth the branch cost?
+	TEST(64, R(RDX), R(RDX));//is this actually worth the branch cost?
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));//is this actually worth the branch cost?
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1584,9 +1395,6 @@ void DSPEmitter::lsrn(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASRN  (fixed parameters)
@@ -1597,7 +1405,6 @@ void DSPEmitter::lsrn(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asrn(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 //	s16 shift;
 //	u16 accm = (u16)dsp_get_acc_m(1);
 	get_acc_m(1);
@@ -1611,13 +1418,16 @@ void DSPEmitter::asrn(const UDSPInstruction opc)
 //	else
 //		shift = accm & 0x3f;
 
-//	if (shift > 0) {
+//	if (shift > 0)
+//	{
 //		acc >>= shift;
-//	} else if (shift < 0) {
+//	}
+//	else if (shift < 0)
+//	{
 //		acc <<= -shift;
 //	}
 
-	CMP(64, R(RDX), Imm8(0));
+	TEST(64, R(RDX), R(RDX));
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1642,9 +1452,6 @@ void DSPEmitter::asrn(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSRNRX $acD, $axS.h
@@ -1655,7 +1462,6 @@ void DSPEmitter::asrn(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsrnrx(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -1675,13 +1481,16 @@ void DSPEmitter::lsrnrx(const UDSPInstruction opc)
 //	else
 //		shift = axh & 0x3f;
 
-//	if (shift > 0) {
+//	if (shift > 0)
+//	{
 //		acc <<= shift;
-//	} else if (shift < 0) {
+//	}
+//	else if (shift < 0)
+//	{
 //		acc >>= -shift;
 //	}
 
-	CMP(64, R(RDX), Imm8(0));
+	TEST(64, R(RDX), R(RDX));
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1706,9 +1515,6 @@ void DSPEmitter::lsrnrx(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASRNRX $acD, $axS.h
@@ -1719,7 +1525,6 @@ void DSPEmitter::lsrnrx(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asrnrx(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -1742,7 +1547,7 @@ void DSPEmitter::asrnrx(const UDSPInstruction opc)
 //		acc >>= -shift;
 //	}
 
-	CMP(64, R(RDX), Imm8(0));
+	TEST(64, R(RDX), R(RDX));
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1767,9 +1572,6 @@ void DSPEmitter::asrnrx(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // LSRNR  $acD
@@ -1780,7 +1582,6 @@ void DSPEmitter::asrnrx(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::lsrnr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 //	s16 shift;
@@ -1804,7 +1605,7 @@ void DSPEmitter::lsrnr(const UDSPInstruction opc)
 //	else if (shift < 0)
 //		acc >>= -shift;
 
-	CMP(64, R(RDX), Imm8(0));
+	TEST(64, R(RDX), R(RDX));
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1829,9 +1630,6 @@ void DSPEmitter::lsrnr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ASRNR  $acD
@@ -1842,7 +1640,6 @@ void DSPEmitter::lsrnr(const UDSPInstruction opc)
 // flags out: --xx xx00
 void DSPEmitter::asrnr(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 //	s16 shift;
@@ -1863,7 +1660,7 @@ void DSPEmitter::asrnr(const UDSPInstruction opc)
 //	else if (shift < 0)
 //		acc >>= -shift;
 
-	CMP(64, R(RDX), Imm8(0));
+	TEST(64, R(RDX), R(RDX));
 	FixupBranch zero = J_CC(CC_E);
 	TEST(16, R(RAX), Imm16(0x3f));
 	FixupBranch noShift = J_CC(CC_Z);
@@ -1888,9 +1685,6 @@ void DSPEmitter::asrnr(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
similarity index 94%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
index 70bb3618e6..2f8bde2689 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
@@ -1,14 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPEmitter.h"
-#include "../DSPStacks.h"
-#include "../DSPAnalyzer.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPStacks.h"
 
 using namespace Gen;
 
@@ -24,7 +21,7 @@ static void ReJitConditional(const UDSPInstruction opc, DSPEmitter& emitter)
 
 	emitter.dsp_op_read_reg(DSP_REG_SR, EAX);
 
-	switch(cond)
+	switch (cond)
 	{
 	case 0x0: // GE - Greater Equal
 	case 0x1: // L - Less
@@ -41,11 +38,11 @@ static void ReJitConditional(const UDSPInstruction opc, DSPEmitter& emitter)
 		emitter.TEST(16, R(EAX), Imm16(0x10));
 		break;
 	case 0x4: // NZ - Not Zero
-	case 0x5: // Z - Zero 
+	case 0x5: // Z - Zero
 		emitter.TEST(16, R(EAX), Imm16(SR_ARITH_ZERO));
 		break;
 	case 0x6: // NC - Not carry
-	case 0x7: // C - Carry 
+	case 0x7: // C - Carry
 		emitter.TEST(16, R(EAX), Imm16(SR_CARRY));
 		break;
 	case 0x8: // ? - Not over s32
@@ -98,7 +95,7 @@ static void WriteBlockLink(DSPEmitter& emitter, u16 dest)
 	// Jump directly to the called block if it has already been compiled.
 	if (!(dest >= emitter.startAddr && dest <= emitter.compilePC))
 	{
-		if (emitter.blockLinks[dest] != 0 )
+		if (emitter.blockLinks[dest] != nullptr )
 		{
 			emitter.gpr.flushRegs();
 			// Check if we have enough cycles to execute the next block
@@ -120,7 +117,7 @@ static void WriteBlockLink(DSPEmitter& emitter, u16 dest)
 	}
 }
 
-void r_jcc(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_jcc(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	u16 dest = dsp_imem_read(emitter.compilePC + 1);
 	const DSPOPCTemplate *opcode = GetOpTemplate(opc);
@@ -144,7 +141,7 @@ void DSPEmitter::jcc(const UDSPInstruction opc)
 	ReJitConditional<r_jcc>(opc, *this);
 }
 
-void r_jmprcc(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_jmprcc(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	u8 reg = (opc >> 5) & 0x7;
 	//reg can only be DSP_REG_ARx and DSP_REG_IXx now,
@@ -164,7 +161,7 @@ void DSPEmitter::jmprcc(const UDSPInstruction opc)
 	ReJitConditional<r_jmprcc>(opc, *this);
 }
 
-void r_call(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_call(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	emitter.MOV(16, R(DX), Imm16(emitter.compilePC + 2));
 	emitter.dsp_reg_store_stack(DSP_STACK_C);
@@ -191,7 +188,7 @@ void DSPEmitter::call(const UDSPInstruction opc)
 	ReJitConditional<r_call>(opc, *this);
 }
 
-void r_callr(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_callr(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	u8 reg = (opc >> 5) & 0x7;
 	emitter.MOV(16, R(DX), Imm16(emitter.compilePC + 1));
@@ -203,8 +200,8 @@ void r_callr(const UDSPInstruction opc, DSPEmitter& emitter)
 // Generic callr implementation
 // CALLRcc $R
 // 0001 0111 rrr1 cccc
-// Call function if condition cc has been met. Push program counter of 
-// instruction following "call" to call stack $st0. Set program counter to 
+// Call function if condition cc has been met. Push program counter of
+// instruction following "call" to call stack $st0. Set program counter to
 // register $R.
 // NOTE: Cannot use Default(opc) here because of the need to write branch exit
 void DSPEmitter::callr(const UDSPInstruction opc)
@@ -213,7 +210,7 @@ void DSPEmitter::callr(const UDSPInstruction opc)
 	ReJitConditional<r_callr>(opc, *this);
 }
 
-void r_ifcc(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_ifcc(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	emitter.MOV(16, M(&g_dsp.pc), Imm16(emitter.compilePC + 1));
 }
@@ -229,7 +226,7 @@ void DSPEmitter::ifcc(const UDSPInstruction opc)
 	WriteBranchExit(*this);
 }
 
-void r_ret(const UDSPInstruction opc, DSPEmitter& emitter)
+static void r_ret(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	emitter.dsp_reg_load_stack(DSP_STACK_C);
 	emitter.MOV(16, M(&g_dsp.pc), R(DX));
@@ -264,7 +261,7 @@ void DSPEmitter::rti(const UDSPInstruction opc)
 }
 
 // HALT
-// 0000 0000 0020 0001 
+// 0000 0000 0020 0001
 // Stops execution of DSP code. Sets bit DSP_CR_HALT in register DREG_CR.
 void DSPEmitter::halt(const UDSPInstruction opc)
 {
@@ -285,7 +282,7 @@ void DSPEmitter::HandleLoop()
 	MOVZX(32, 16, EAX, M(&g_dsp.r.st[2]));
 	MOVZX(32, 16, ECX, M(&g_dsp.r.st[3]));
 
-	CMP(32, R(RCX), Imm32(0));
+	TEST(32, R(RCX), R(RCX));
 	FixupBranch rLoopCntG = J_CC(CC_LE, true);
 	CMP(16, R(RAX), Imm16(compilePC - 1));
 	FixupBranch rLoopAddrG = J_CC(CC_NE, true);
@@ -326,7 +323,7 @@ void DSPEmitter::loop(const UDSPInstruction opc)
 	dsp_op_read_reg_dont_saturate(reg, RDX, ZERO);
 	u16 loop_pc = compilePC + 1;
 
-	CMP(16, R(EDX), Imm16(0));
+	TEST(16, R(EDX), R(EDX));
 	DSPJitRegCache c(gpr);
 	FixupBranch cnt = J_CC(CC_Z, true);
 	dsp_reg_store_stack(3);
@@ -396,7 +393,7 @@ void DSPEmitter::bloop(const UDSPInstruction opc)
 	dsp_op_read_reg_dont_saturate(reg, RDX, ZERO);
 	u16 loop_pc = dsp_imem_read(compilePC + 1);
 
-	CMP(16, R(EDX), Imm16(0));
+	TEST(16, R(EDX), R(EDX));
 	DSPJitRegCache c(gpr);
 	FixupBranch cnt = J_CC(CC_Z, true);
 	dsp_reg_store_stack(3);
@@ -432,7 +429,7 @@ void DSPEmitter::bloopi(const UDSPInstruction opc)
 //	u16 loop_pc = dsp_fetch_code();
 	u16 loop_pc = dsp_imem_read(compilePC + 1);
 
-	if (cnt) 
+	if (cnt)
 	{
 		MOV(16, R(RDX), Imm16(compilePC + 2));
 		dsp_reg_store_stack(0);
diff --git a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp
new file mode 100644
index 0000000000..a7fa3b7d4a
--- /dev/null
+++ b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp
@@ -0,0 +1,166 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntUtil.h" // Helper functions
+
+using namespace Gen;
+
+// In: RAX: s64 _Value
+// Clobbers RDX
+void DSPEmitter::Update_SR_Register(Gen::X64Reg val)
+{
+	OpArg sr_reg;
+	gpr.getReg(DSP_REG_SR,sr_reg);
+	//	// 0x04
+	//	if (_Value == 0) g_dsp.r[DSP_REG_SR] |= SR_ARITH_ZERO;
+	TEST(64, R(val), R(val));
+	FixupBranch notZero = J_CC(CC_NZ);
+	OR(16, sr_reg, Imm16(SR_ARITH_ZERO | SR_TOP2BITS));
+	FixupBranch end = J();
+	SetJumpTarget(notZero);
+
+	//	// 0x08
+	//	if (_Value < 0) g_dsp.r[DSP_REG_SR] |= SR_SIGN;
+	FixupBranch greaterThanEqual = J_CC(CC_GE);
+	OR(16, sr_reg, Imm16(SR_SIGN));
+	SetJumpTarget(greaterThanEqual);
+
+	//	// 0x10
+	//	if (_Value != (s32)_Value) g_dsp.r[DSP_REG_SR] |= SR_OVER_S32;
+	MOVSX(64, 32, RDX, R(val));
+	CMP(64, R(RDX), R(val));
+	FixupBranch noOverS32 = J_CC(CC_E);
+	OR(16, sr_reg, Imm16(SR_OVER_S32));
+	SetJumpTarget(noOverS32);
+
+	//	// 0x20 - Checks if top bits of m are equal
+	//	if (((_Value & 0xc0000000) == 0) || ((_Value & 0xc0000000) == 0xc0000000))
+	MOV(32, R(RDX), Imm32(0xc0000000));
+	AND(32, R(val), R(RDX));
+	FixupBranch zeroC = J_CC(CC_Z);
+	CMP(32, R(val), R(RDX));
+	FixupBranch cC = J_CC(CC_NE);
+	SetJumpTarget(zeroC);
+	//		g_dsp.r[DSP_REG_SR] |= SR_TOP2BITS;
+	OR(16, sr_reg, Imm16(SR_TOP2BITS));
+	SetJumpTarget(cC);
+	SetJumpTarget(end);
+	gpr.putReg(DSP_REG_SR);
+}
+
+// In: RAX: s64 _Value
+// Clobbers RDX
+void DSPEmitter::Update_SR_Register64(Gen::X64Reg val)
+{
+//	g_dsp.r[DSP_REG_SR] &= ~SR_CMP_MASK;
+	OpArg sr_reg;
+	gpr.getReg(DSP_REG_SR,sr_reg);
+	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
+	gpr.putReg(DSP_REG_SR);
+	Update_SR_Register(val);
+}
+
+// In: (val): s64 _Value
+// In: (carry_ovfl): 1 = carry, 2 = overflow
+// Clobbers RDX
+void DSPEmitter::Update_SR_Register64_Carry(X64Reg val, X64Reg carry_ovfl, bool carry_eq)
+{
+	OpArg sr_reg;
+	gpr.getReg(DSP_REG_SR,sr_reg);
+	//	g_dsp.r[DSP_REG_SR] &= ~SR_CMP_MASK;
+	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
+
+	CMP(64, R(carry_ovfl), R(val));
+
+	// 0x01
+	//	g_dsp.r[DSP_REG_SR] |= SR_CARRY;
+	// Carry = (acc>res)
+	// Carry2 = (acc>=res)
+	FixupBranch noCarry = J_CC(carry_eq ? CC_B : CC_BE);
+	OR(16, sr_reg, Imm16(SR_CARRY));
+	SetJumpTarget(noCarry);
+
+	// 0x02 and 0x80
+	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW;
+	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW_STICKY;
+	// Overflow = ((acc ^ res) & (ax ^ res)) < 0
+	XOR(64, R(carry_ovfl), R(val));
+	XOR(64, R(RDX), R(val));
+	TEST(64, R(carry_ovfl), R(RDX));
+	FixupBranch noOverflow = J_CC(CC_GE);
+	OR(16, sr_reg, Imm16(SR_OVERFLOW | SR_OVERFLOW_STICKY));
+	SetJumpTarget(noOverflow);
+
+	gpr.putReg(DSP_REG_SR);
+	if (carry_eq)
+	{
+		Update_SR_Register();
+	}
+	else
+	{
+		Update_SR_Register(val);
+	}
+}
+
+// In: RAX: s64 _Value
+void DSPEmitter::Update_SR_Register16(X64Reg val)
+{
+	OpArg sr_reg;
+	gpr.getReg(DSP_REG_SR,sr_reg);
+	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
+
+	//	// 0x04
+	//	if (_Value == 0) g_dsp.r[DSP_REG_SR] |= SR_ARITH_ZERO;
+	TEST(64, R(val), R(val));
+	FixupBranch notZero = J_CC(CC_NZ);
+	OR(16, sr_reg, Imm16(SR_ARITH_ZERO | SR_TOP2BITS));
+	FixupBranch end = J();
+	SetJumpTarget(notZero);
+
+	//	// 0x08
+	//	if (_Value < 0) g_dsp.r[DSP_REG_SR] |= SR_SIGN;
+	FixupBranch greaterThanEqual = J_CC(CC_GE);
+	OR(16, sr_reg, Imm16(SR_SIGN));
+	SetJumpTarget(greaterThanEqual);
+
+	//	// 0x20 - Checks if top bits of m are equal
+	//	if ((((u16)_Value >> 14) == 0) || (((u16)_Value >> 14) == 3))
+	SHR(16, R(val), Imm8(14));
+	TEST(16, R(val), R(val));
+	FixupBranch isZero = J_CC(CC_Z);
+	CMP(16, R(val), Imm16(3));
+	FixupBranch notThree = J_CC(CC_NE);
+	SetJumpTarget(isZero);
+	//		g_dsp.r[DSP_REG_SR] |= SR_TOP2BITS;
+	OR(16, sr_reg, Imm16(SR_TOP2BITS));
+	SetJumpTarget(notThree);
+	SetJumpTarget(end);
+	gpr.putReg(DSP_REG_SR);
+}
+
+// In: RAX: s64 _Value
+// Clobbers RCX
+void DSPEmitter::Update_SR_Register16_OverS32(Gen::X64Reg val)
+{
+	OpArg sr_reg;
+	gpr.getReg(DSP_REG_SR,sr_reg);
+	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
+
+	//	// 0x10
+	//	if (_Value != (s32)_Value) g_dsp.r[DSP_REG_SR] |= SR_OVER_S32;
+	MOVSX(64, 32, RCX, R(val));
+	CMP(64, R(RCX), R(val));
+	FixupBranch noOverS32 = J_CC(CC_E);
+	OR(16, sr_reg, Imm16(SR_OVER_S32));
+	SetJumpTarget(noOverS32);
+
+	gpr.putReg(DSP_REG_SR);
+	//	// 0x20 - Checks if top bits of m are equal
+	//	if ((((u16)_Value >> 14) == 0) || (((u16)_Value >> 14) == 3))
+	//AND(32, R(val), Imm32(0xc0000000));
+	Update_SR_Register16(val);
+}
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp
similarity index 98%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp
index 149387db6d..f11da46a2d 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp
@@ -1,12 +1,9 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 using namespace Gen;
 
@@ -47,8 +44,8 @@ void DSPEmitter::ir(const UDSPInstruction opc)
 // Add corresponding indexing register $ixR to addressing register $arR.
 void DSPEmitter::nr(const UDSPInstruction opc)
 {
-	u8 reg = opc & 0x3;	
-	
+	u8 reg = opc & 0x3;
+
 	increase_addr_reg(reg, reg);
 }
 
@@ -109,7 +106,7 @@ void DSPEmitter::sn(const UDSPInstruction opc)
 
 // L $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Load $axD.D/$acD.D with value from memory pointed by register $arS.
 // Post increment register $arS.
 void DSPEmitter::l(const UDSPInstruction opc)
 {
@@ -118,7 +115,8 @@ void DSPEmitter::l(const UDSPInstruction opc)
 
 	pushExtValueFromMem(dreg, sreg);
 
-	if (dreg  >= DSP_REG_ACM0) {
+	if (dreg  >= DSP_REG_ACM0)
+	{
 		//save SR too, so we can decide later.
 		//even if only for one bit, can only
 		//store (up to) two registers in EBX,
@@ -133,7 +131,7 @@ void DSPEmitter::l(const UDSPInstruction opc)
 
 // LN $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Load $axD.D/$acD.D with value from memory pointed by register $arS.
 // Add indexing register $ixS to register $arS.
 void DSPEmitter::ln(const UDSPInstruction opc)
 {
@@ -142,7 +140,8 @@ void DSPEmitter::ln(const UDSPInstruction opc)
 
 	pushExtValueFromMem(dreg, sreg);
 
-	if (dreg  >= DSP_REG_ACM0) {
+	if (dreg  >= DSP_REG_ACM0)
+	{
 		//save SR too, so we can decide later.
 		//even if only for one bit, can only
 		//store (up to) two registers in EBX,
@@ -177,7 +176,7 @@ void DSPEmitter::ls(const UDSPInstruction opc)
 	pushExtValueFromMem(dreg, DSP_REG_AR0);
 
 	increment_addr_reg(DSP_REG_AR3);
-	increment_addr_reg(DSP_REG_AR0); 
+	increment_addr_reg(DSP_REG_AR0);
 }
 
 
@@ -202,7 +201,7 @@ void DSPEmitter::lsn(const UDSPInstruction opc)
 	gpr.putXReg(tmp1);
 
 	pushExtValueFromMem(dreg, DSP_REG_AR0);
-	
+
 	increment_addr_reg(DSP_REG_AR3);
 	increase_addr_reg(DSP_REG_AR0, DSP_REG_AR0);
 }
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp
similarity index 94%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp
index 9197659aaf..0ce95d6ef2 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp
@@ -1,22 +1,22 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "../DSPIntCCUtil.h"
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+
 using namespace Gen;
 
 // SRS @M, $(0x18+S)
 // 0010 1sss mmmm mmmm
-// Move value from register $(0x18+D) to data memory pointed by address 
-// CR[0-7] | M. That is, the upper 8 bits of the address are the 
-// bottom 8 bits from CR, and the lower 8 bits are from the 8-bit immediate.  
+// Move value from register $(0x18+D) to data memory pointed by address
+// CR[0-7] | M. That is, the upper 8 bits of the address are the
+// bottom 8 bits from CR, and the lower 8 bits are from the 8-bit immediate.
 // Note: pc+=2 in duddie's doc seems wrong
 void DSPEmitter::srs(const UDSPInstruction opc)
 {
@@ -132,7 +132,7 @@ void DSPEmitter::lrr(const UDSPInstruction opc)
 // LRRD $D, @$S
 // 0001 1000 1ssd dddd
 // Move value from data memory pointed by addressing register $S toregister $D.
-// Decrement register $S. 
+// Decrement register $S.
 void DSPEmitter::lrrd(const UDSPInstruction opc)
 {
 	u8 sreg = (opc >> 5) & 0x3;
@@ -154,7 +154,7 @@ void DSPEmitter::lrrd(const UDSPInstruction opc)
 // LRRI $D, @$S
 // 0001 1001 0ssd dddd
 // Move value from data memory pointed by addressing register $S to register $D.
-// Increment register $S. 
+// Increment register $S.
 void DSPEmitter::lrri(const UDSPInstruction opc)
 {
 	u8 sreg = (opc >> 5) & 0x3;
@@ -176,7 +176,7 @@ void DSPEmitter::lrri(const UDSPInstruction opc)
 // LRRN $D, @$S
 // 0001 1001 1ssd dddd
 // Move value from data memory pointed by addressing register $S to register $D.
-// Add indexing register $(0x4+S) to register $S. 
+// Add indexing register $(0x4+S) to register $S.
 void DSPEmitter::lrrn(const UDSPInstruction opc)
 {
 	u8 sreg = (opc >> 5) & 0x3;
@@ -197,8 +197,8 @@ void DSPEmitter::lrrn(const UDSPInstruction opc)
 
 // SRR @$D, $S
 // 0001 1010 0dds ssss
-// Store value from source register $S to a memory location pointed by 
-// addressing register $D. 
+// Store value from source register $S to a memory location pointed by
+// addressing register $D.
 void DSPEmitter::srr(const UDSPInstruction opc)
 {
 	u8 dreg = (opc >> 5) & 0x3;
@@ -217,7 +217,7 @@ void DSPEmitter::srr(const UDSPInstruction opc)
 // SRRD @$D, $S
 // 0001 1010 1dds ssss
 // Store value from source register $S to a memory location pointed by
-// addressing register $D. Decrement register $D. 
+// addressing register $D. Decrement register $D.
 void DSPEmitter::srrd(const UDSPInstruction opc)
 {
 	u8 dreg = (opc >> 5) & 0x3;
@@ -238,7 +238,7 @@ void DSPEmitter::srrd(const UDSPInstruction opc)
 // SRRI @$D, $S
 // 0001 1011 0dds ssss
 // Store value from source register $S to a memory location pointed by
-// addressing register $D. Increment register $D. 
+// addressing register $D. Increment register $D.
 void DSPEmitter::srri(const UDSPInstruction opc)
 {
 	u8 dreg = (opc >> 5) & 0x3;
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp
similarity index 95%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitMisc.cpp
index 09b87be54a..72b2801615 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp
@@ -1,12 +1,12 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+
 using namespace Gen;
 
 // MRR $D, $S
@@ -82,7 +82,7 @@ void DSPEmitter::iar(const UDSPInstruction opc)
 	increment_addr_reg(opc & 0x3);
 }
 
-// SUBARN $arD  
+// SUBARN $arD
 // 0000 0000 0000 11dd
 // Subtract indexing register $ixD from an addressing register $arD.
 // used only in IPL-NTSC ucode
@@ -112,7 +112,7 @@ void DSPEmitter::addarn(const UDSPInstruction opc)
 
 void DSPEmitter::setCompileSR(u16 bit)
 {
-	
+
 	//	g_dsp.r[DSP_REG_SR] |= bit
 	OpArg sr_reg;
 	gpr.getReg(DSP_REG_SR,sr_reg);
@@ -124,7 +124,7 @@ void DSPEmitter::setCompileSR(u16 bit)
 
 void DSPEmitter::clrCompileSR(u16 bit)
 {
-	
+
 	//	g_dsp.r[DSP_REG_SR] &= bit
 	OpArg sr_reg;
 	gpr.getReg(DSP_REG_SR,sr_reg);
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp
similarity index 93%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp
index bfdba2ed7e..efa46ae080 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
@@ -7,21 +7,16 @@
 
 // Multiplier and product register control
 
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "../DSPAnalyzer.h"
-#ifdef _M_X64
-#include "DSPJitUtil.h"
-#endif
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntUtil.h"
+
 using namespace Gen;
 
 // Returns s64 in RAX
 // In: RCX = s16 a, RAX = s16 b
 void DSPEmitter::multiply()
 {
-#ifdef _M_X64
 //	prod = (s16)a * (s16)b; //signed
 	IMUL(64, R(ECX));
 
@@ -36,35 +31,30 @@ void DSPEmitter::multiply()
 	SetJumpTarget(noMult2);
 	gpr.putReg(DSP_REG_SR, false);
 //	return prod;
-#endif
 }
 
 // Returns s64 in RAX
 // Clobbers RDX
 void DSPEmitter::multiply_add()
 {
-#ifdef _M_X64
 //	s64 prod = dsp_get_long_prod() + dsp_get_multiply_prod(a, b, sign);
 	multiply();
 	MOV(64, R(RDX), R(RAX));
 	get_long_prod();
 	ADD(64, R(RAX), R(RDX));
 //	return prod;
-#endif
 }
 
 // Returns s64 in RAX
 // Clobbers RDX
 void DSPEmitter::multiply_sub()
 {
-#ifdef _M_X64
 //	s64 prod = dsp_get_long_prod() - dsp_get_multiply_prod(a, b, sign);
 	multiply();
 	MOV(64, R(RDX), R(RAX));
 	get_long_prod();
 	SUB(64, R(RAX), R(RDX));
 //	return prod;
-#endif
 }
 
 // Only MULX family instructions have unsigned/mixed support.
@@ -73,7 +63,6 @@ void DSPEmitter::multiply_sub()
 // Returns s64 in RAX
 void DSPEmitter::multiply_mulx(u8 axh0, u8 axh1)
 {
-#ifdef _M_X64
 //	s64 result;
 
 //	if ((axh0==0) && (axh1==0))
@@ -145,7 +134,6 @@ void DSPEmitter::multiply_mulx(u8 axh0, u8 axh1)
 	SetJumpTarget(noMult2);
 	gpr.putReg(DSP_REG_SR, false);
 //	return prod;
-#endif
 }
 
 //----
@@ -173,7 +161,6 @@ void DSPEmitter::clrp(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::tstprod(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	if (FlagsNeeded())
 	{
 //		s64 prod = dsp_get_long_prod();
@@ -181,9 +168,6 @@ void DSPEmitter::tstprod(const UDSPInstruction opc)
 //		Update_SR_Register64(prod);
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -195,7 +179,6 @@ void DSPEmitter::tstprod(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::movp(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 //	s64 acc = dsp_get_long_prod();
@@ -207,20 +190,16 @@ void DSPEmitter::movp(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MOVNP $acD
-// 0111 111d xxxx xxxx 
+// 0111 111d xxxx xxxx
 // Moves negative of multiply product from $prod register to accumulator
 // $acD register.
 
 // flags out: --xx xx0x
 void DSPEmitter::movnp(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 
 //	s64 acc = -dsp_get_long_prod();
@@ -233,9 +212,6 @@ void DSPEmitter::movnp(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MOVPZ $acD
@@ -246,7 +222,6 @@ void DSPEmitter::movnp(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::movpz(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x01;
 
 //	s64 acc = dsp_get_long_prod_round_prodl();
@@ -258,9 +233,6 @@ void DSPEmitter::movpz(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // ADDPAXZ $acD, $axS
@@ -271,7 +243,6 @@ void DSPEmitter::movpz(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::addpaxz(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 dreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -290,7 +261,7 @@ void DSPEmitter::addpaxz(const UDSPInstruction opc)
 //	s64 oldprod = dsp_get_long_prod();
 //	dsp_set_long_acc(dreg, res);
 //	res = dsp_get_long_acc(dreg);
-//	Update_SR_Register64(res, isCarry(oldprod, res), false); 
+//	Update_SR_Register64(res, isCarry(oldprod, res), false);
 	if (FlagsNeeded())
 	{
 		get_long_prod(RDX);
@@ -303,28 +274,21 @@ void DSPEmitter::addpaxz(const UDSPInstruction opc)
 		set_long_acc(dreg, RAX);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 //----
 
 // MULAXH
 // 1000 0011 xxxx xxxx
-// Multiply $ax0.h by $ax0.h 
+// Multiply $ax0.h by $ax0.h
 void DSPEmitter::mulaxh(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 //	s64 prod = dsp_multiply(dsp_get_ax_h(0), dsp_get_ax_h(0));
 	dsp_op_read_reg(DSP_REG_AXH0, RCX, SIGN);
 	MOV(64, R(RAX), R(RCX));
 	multiply();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -335,7 +299,6 @@ void DSPEmitter::mulaxh(const UDSPInstruction opc)
 // $axS.h of secondary accumulator $axS (treat them both as signed).
 void DSPEmitter::mul(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 sreg  = (opc >> 11) & 0x1;
 
 //	u16 axl = dsp_get_ax_l(sreg);
@@ -346,9 +309,6 @@ void DSPEmitter::mul(const UDSPInstruction opc)
 	multiply();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MULAC $axS.l, $axS.h, $acR
@@ -360,7 +320,6 @@ void DSPEmitter::mul(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulac(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 11) & 0x1;
 
@@ -386,9 +345,6 @@ void DSPEmitter::mulac(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MULMV $axS.l, $axS.h, $acR
@@ -400,7 +356,6 @@ void DSPEmitter::mulac(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulmv(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg  = (opc >> 8) & 0x1;
 
 //	s64 acc = dsp_get_long_prod();
@@ -415,9 +370,6 @@ void DSPEmitter::mulmv(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MULMVZ $axS.l, $axS.h, $acR
@@ -430,7 +382,6 @@ void DSPEmitter::mulmv(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulmvz(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 
 //	s64 acc = dsp_get_long_prod_round_prodl();
@@ -443,9 +394,6 @@ void DSPEmitter::mulmvz(const UDSPInstruction opc)
 	{
 		Update_SR_Register64(RDX);
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -456,7 +404,6 @@ void DSPEmitter::mulmvz(const UDSPInstruction opc)
 // Part is selected by S and T bits. Zero selects low part, one selects high part.
 void DSPEmitter::mulx(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = ((opc >> 11) & 0x1);
 	u8 sreg = ((opc >> 12) & 0x1);
 
@@ -468,9 +415,6 @@ void DSPEmitter::mulx(const UDSPInstruction opc)
 	multiply_mulx(sreg, treg);
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MULXAC $ax0.S, $ax1.T, $acR
@@ -482,7 +426,6 @@ void DSPEmitter::mulx(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulxac(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 	u8 treg = (opc >> 11) & 0x1;
 	u8 sreg = (opc >> 12) & 0x1;
@@ -510,9 +453,6 @@ void DSPEmitter::mulxac(const UDSPInstruction opc)
 		Update_SR_Register64(tmp1);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // MULXMV $ax0.S, $ax1.T, $acR
@@ -524,7 +464,6 @@ void DSPEmitter::mulxac(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulxmv(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = ((opc >> 8) & 0x1);
 	u8 treg = (opc >> 11) & 0x1;
 	u8 sreg = (opc >> 12) & 0x1;
@@ -550,9 +489,6 @@ void DSPEmitter::mulxmv(const UDSPInstruction opc)
 		Update_SR_Register64(tmp1);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 // MULXMV $ax0.S, $ax1.T, $acR
@@ -565,7 +501,6 @@ void DSPEmitter::mulxmv(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulxmvz(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg  = (opc >> 8) & 0x1;
 	u8 treg = (opc >> 11) & 0x1;
 	u8 sreg = (opc >> 12) & 0x1;
@@ -591,9 +526,6 @@ void DSPEmitter::mulxmvz(const UDSPInstruction opc)
 		Update_SR_Register64(tmp1);
 	}
 	gpr.putXReg(tmp1);
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -604,7 +536,6 @@ void DSPEmitter::mulxmvz(const UDSPInstruction opc)
 // secondary accumulator $axS (treat them both as signed).
 void DSPEmitter::mulc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = (opc >> 11) & 0x1;
 	u8 sreg = (opc >> 12) & 0x1;
 
@@ -616,9 +547,6 @@ void DSPEmitter::mulc(const UDSPInstruction opc)
 	multiply();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MULCAC $acS.m, $axT.h, $acR
@@ -630,7 +558,6 @@ void DSPEmitter::mulc(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulcac(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 	u8 treg  = (opc >> 11) & 0x1;
 	u8 sreg  = (opc >> 12) & 0x1;
@@ -657,9 +584,6 @@ void DSPEmitter::mulcac(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MULCMV $acS.m, $axT.h, $acR
@@ -672,7 +596,6 @@ void DSPEmitter::mulcac(const UDSPInstruction opc)
 // flags out: --xx xx0x
 void DSPEmitter::mulcmv(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 	u8 treg  = (opc >> 11) & 0x1;
 	u8 sreg  = (opc >> 12) & 0x1;
@@ -696,9 +619,6 @@ void DSPEmitter::mulcmv(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 // MULCMVZ $acS.m, $axT.h, $acR
@@ -706,13 +626,12 @@ void DSPEmitter::mulcmv(const UDSPInstruction opc)
 // (fixed possible bug in duddie's description, s->t)
 // Multiply mid part of accumulator register $acS.m by high part $axT.h of
 // secondary accumulator $axT  (treat them both as signed). Move product
-// register before multiplication to accumulator $acR, set (round) low part of 
+// register before multiplication to accumulator $acR, set (round) low part of
 // accumulator $acR.l to zero.
 
 // flags out: --xx xx0x
 void DSPEmitter::mulcmvz(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 rreg = (opc >> 8) & 0x1;
 	u8 treg  = (opc >> 11) & 0x1;
 	u8 sreg  = (opc >> 12) & 0x1;
@@ -736,9 +655,6 @@ void DSPEmitter::mulcmvz(const UDSPInstruction opc)
 	{
 		Update_SR_Register64();
 	}
-#else
-	Default(opc);
-#endif
 }
 
 //----
@@ -750,7 +666,6 @@ void DSPEmitter::mulcmvz(const UDSPInstruction opc)
 // signed) and add result to product register.
 void DSPEmitter::maddx(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -762,9 +677,6 @@ void DSPEmitter::maddx(const UDSPInstruction opc)
 	multiply_add();
 	//	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MSUBX $(0x18+S*2), $(0x19+T*2)
@@ -774,7 +686,6 @@ void DSPEmitter::maddx(const UDSPInstruction opc)
 // signed) and subtract result from product register.
 void DSPEmitter::msubx(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -786,9 +697,6 @@ void DSPEmitter::msubx(const UDSPInstruction opc)
 	multiply_sub();
 	//	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MADDC $acS.m, $axT.h
@@ -798,7 +706,6 @@ void DSPEmitter::msubx(const UDSPInstruction opc)
 // register.
 void DSPEmitter::maddc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -810,9 +717,6 @@ void DSPEmitter::maddc(const UDSPInstruction opc)
 	multiply_add();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MSUBC $acS.m, $axT.h
@@ -822,7 +726,6 @@ void DSPEmitter::maddc(const UDSPInstruction opc)
 // product register.
 void DSPEmitter::msubc(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 treg = (opc >> 8) & 0x1;
 	u8 sreg = (opc >> 9) & 0x1;
 
@@ -834,9 +737,6 @@ void DSPEmitter::msubc(const UDSPInstruction opc)
 	multiply_sub();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MADD $axS.l, $axS.h
@@ -846,7 +746,6 @@ void DSPEmitter::msubc(const UDSPInstruction opc)
 // result to product register.
 void DSPEmitter::madd(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 sreg = (opc >> 8) & 0x1;
 
 //	u16 axl = dsp_get_ax_l(sreg);
@@ -857,9 +756,6 @@ void DSPEmitter::madd(const UDSPInstruction opc)
 	multiply_add();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
 
 // MSUB $axS.l, $axS.h
@@ -869,7 +765,6 @@ void DSPEmitter::madd(const UDSPInstruction opc)
 // subtract result from product register.
 void DSPEmitter::msub(const UDSPInstruction opc)
 {
-#ifdef _M_X64
 	u8 sreg = (opc >> 8) & 0x1;
 
 //	u16 axl = dsp_get_ax_l(sreg);
@@ -880,7 +775,4 @@ void DSPEmitter::msub(const UDSPInstruction opc)
 	multiply_sub();
 //	dsp_set_long_prod(prod);
 	set_long_prod();
-#else
-	Default(opc);
-#endif
 }
diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
new file mode 100644
index 0000000000..e579d4da8b
--- /dev/null
+++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
@@ -0,0 +1,1071 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/Jit/DSPJitRegCache.h"
+
+using namespace Gen;
+
+static void* reg_ptr(size_t reg)
+{
+	switch (reg)
+	{
+	case DSP_REG_AR0:
+	case DSP_REG_AR1:
+	case DSP_REG_AR2:
+	case DSP_REG_AR3:
+		return &g_dsp.r.ar[reg - DSP_REG_AR0];
+	case DSP_REG_IX0:
+	case DSP_REG_IX1:
+	case DSP_REG_IX2:
+	case DSP_REG_IX3:
+		return &g_dsp.r.ix[reg - DSP_REG_IX0];
+	case DSP_REG_WR0:
+	case DSP_REG_WR1:
+	case DSP_REG_WR2:
+	case DSP_REG_WR3:
+		return &g_dsp.r.wr[reg - DSP_REG_WR0];
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		return &g_dsp.r.st[reg - DSP_REG_ST0];
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		return &g_dsp.r.ac[reg - DSP_REG_ACH0].h;
+	case DSP_REG_CR:
+		return &g_dsp.r.cr;
+	case DSP_REG_SR:
+		return &g_dsp.r.sr;
+	case DSP_REG_PRODL:
+		return &g_dsp.r.prod.l;
+	case DSP_REG_PRODM:
+		return &g_dsp.r.prod.m;
+	case DSP_REG_PRODH:
+		return &g_dsp.r.prod.h;
+	case DSP_REG_PRODM2:
+		return &g_dsp.r.prod.m2;
+	case DSP_REG_AXL0:
+	case DSP_REG_AXL1:
+		return &g_dsp.r.ax[reg - DSP_REG_AXL0].l;
+	case DSP_REG_AXH0:
+	case DSP_REG_AXH1:
+		return &g_dsp.r.ax[reg - DSP_REG_AXH0].h;
+	case DSP_REG_ACL0:
+	case DSP_REG_ACL1:
+		return &g_dsp.r.ac[reg - DSP_REG_ACL0].l;
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+		return &g_dsp.r.ac[reg - DSP_REG_ACM0].m;
+	case DSP_REG_AX0_32:
+	case DSP_REG_AX1_32:
+		return &g_dsp.r.ax[reg - DSP_REG_AX0_32].val;
+	case DSP_REG_ACC0_64:
+	case DSP_REG_ACC1_64:
+		return &g_dsp.r.ac[reg - DSP_REG_ACC0_64].val;
+	case DSP_REG_PROD_64:
+		return &g_dsp.r.prod.val;
+	default:
+		_assert_msg_(DSPLLE, 0, "cannot happen");
+		return nullptr;
+	}
+}
+
+#define STATIC_REG_ACCS
+//#undef STATIC_REG_ACCS
+
+DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
+	: emitter(_emitter), temporary(false), merged(false)
+{
+	for (X64CachedReg& xreg : xregs)
+	{
+		xreg.guest_reg = DSP_REG_STATIC;
+		xreg.pushed = false;
+	}
+
+	xregs[RAX].guest_reg = DSP_REG_STATIC; // reserved for MUL/DIV
+	xregs[RDX].guest_reg = DSP_REG_STATIC; // reserved for MUL/DIV
+	xregs[RCX].guest_reg = DSP_REG_STATIC; // reserved for shifts
+
+	xregs[RBX].guest_reg = DSP_REG_STATIC; // extended op backing store
+
+	xregs[RSP].guest_reg = DSP_REG_STATIC; // stack pointer
+
+	xregs[RBP].guest_reg = DSP_REG_NONE; // definitely usable in dsplle because
+	                                     // all external calls are protected
+
+	xregs[RSI].guest_reg = DSP_REG_NONE;
+	xregs[RDI].guest_reg = DSP_REG_NONE;
+
+#ifdef STATIC_REG_ACCS
+	xregs[R8].guest_reg = DSP_REG_STATIC; //acc0
+	xregs[R9].guest_reg = DSP_REG_STATIC; //acc1
+#else
+	xregs[R8].guest_reg = DSP_REG_NONE;
+	xregs[R9].guest_reg = DSP_REG_NONE;
+#endif
+	xregs[R10].guest_reg = DSP_REG_NONE;
+	xregs[R11].guest_reg = DSP_REG_NONE;
+	xregs[R12].guest_reg = DSP_REG_NONE;
+	xregs[R13].guest_reg = DSP_REG_NONE;
+	xregs[R14].guest_reg = DSP_REG_NONE;
+	xregs[R15].guest_reg = DSP_REG_NONE;
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		regs[i].mem = reg_ptr(i);
+		regs[i].size = 0;
+		regs[i].dirty = false;
+		regs[i].used = false;
+		regs[i].last_use_ctr = -1;
+		regs[i].parentReg = DSP_REG_NONE;
+		regs[i].shift = 0;
+		regs[i].host_reg = INVALID_REG;
+		regs[i].loc = M(regs[i].mem);
+	}
+
+	for (unsigned int i = 0; i < 32; i++)
+	{
+		regs[i].size = 2;
+	}
+	//special composite registers
+#ifdef STATIC_REG_ACCS
+	regs[DSP_REG_ACC0_64].host_reg = R8;
+	regs[DSP_REG_ACC1_64].host_reg = R9;
+#endif
+	for (unsigned int i = 0; i < 2; i++)
+	{
+		regs[i+DSP_REG_ACC0_64].size = 8;
+		regs[i+DSP_REG_ACL0].parentReg = i+DSP_REG_ACC0_64;
+		regs[i+DSP_REG_ACM0].parentReg = i+DSP_REG_ACC0_64;
+		regs[i+DSP_REG_ACH0].parentReg = i+DSP_REG_ACC0_64;
+		regs[i+DSP_REG_ACL0].shift = 0;
+		regs[i+DSP_REG_ACM0].shift = 16;
+		regs[i+DSP_REG_ACH0].shift = 32;
+	}
+
+	regs[DSP_REG_PROD_64].size = 8;
+	regs[DSP_REG_PRODL].parentReg = DSP_REG_PROD_64;
+	regs[DSP_REG_PRODM].parentReg = DSP_REG_PROD_64;
+	regs[DSP_REG_PRODH].parentReg = DSP_REG_PROD_64;
+	regs[DSP_REG_PRODM2].parentReg = DSP_REG_PROD_64;
+	regs[DSP_REG_PRODL].shift = 0;
+	regs[DSP_REG_PRODM].shift = 16;
+	regs[DSP_REG_PRODH].shift = 32;
+	regs[DSP_REG_PRODM2].shift = 48;
+
+	for (unsigned int i = 0; i < 2; i++)
+	{
+		regs[i+DSP_REG_AX0_32].size = 4;
+		regs[i+DSP_REG_AXL0].parentReg = i+DSP_REG_AX0_32;
+		regs[i+DSP_REG_AXH0].parentReg = i+DSP_REG_AX0_32;
+		regs[i+DSP_REG_AXL0].shift = 0;
+		regs[i+DSP_REG_AXH0].shift = 16;
+	}
+
+	use_ctr = 0;
+}
+
+DSPJitRegCache::DSPJitRegCache(const DSPJitRegCache &cache)
+	: regs(cache.regs), xregs(cache.xregs), emitter(cache.emitter), temporary(true), merged(false)
+{
+}
+
+DSPJitRegCache& DSPJitRegCache::operator=(const DSPJitRegCache &cache)
+{
+	_assert_msg_(DSPLLE, &emitter == &cache.emitter, "emitter does not match");
+	_assert_msg_(DSPLLE, temporary, "register cache not temporary??");
+	merged = false;
+
+	xregs = cache.xregs;
+	regs = cache.regs;
+
+	return *this;
+}
+
+DSPJitRegCache::~DSPJitRegCache()
+{
+	_assert_msg_(DSPLLE, !temporary || merged, "temporary cache not merged");
+}
+
+void DSPJitRegCache::drop()
+{
+	merged = true;
+}
+
+void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit)
+{
+	cache.merged = true;
+
+	// drop all guest register not used by cache
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		regs[i].used = false; //used is restored later
+		if (regs[i].loc.IsSimpleReg() &&
+		    !cache.regs[i].loc.IsSimpleReg())
+		{
+			movToMemory(i);
+		}
+	}
+
+	// try to move guest regs in the wrong host reg to the correct one
+	int movcnt;
+	do
+	{
+		movcnt = 0;
+		for (size_t i = 0; i < regs.size(); i++)
+		{
+			X64Reg simple = regs[i].loc.GetSimpleReg();
+			X64Reg simple_cache = cache.regs[i].loc.GetSimpleReg();
+
+			if (simple_cache != simple && xregs[simple_cache].guest_reg == DSP_REG_NONE)
+			{
+				movToHostReg(i, simple_cache, true);
+				movcnt++;
+			}
+		}
+	} while (movcnt != 0);
+
+	// free all host regs that are not used for the same guest reg
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (cache.regs[i].loc.GetSimpleReg() !=
+		    regs[i].loc.GetSimpleReg() &&
+		    regs[i].loc.IsSimpleReg())
+		{
+			movToMemory(i);
+		}
+	}
+
+	// load all guest regs that are in memory and should be in host reg
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (cache.regs[i].loc.IsSimpleReg())
+		{
+			movToHostReg(i, cache.regs[i].loc.GetSimpleReg(), true);
+			rotateHostReg(i, cache.regs[i].shift, true);
+		}
+		else if (cache.regs[i].loc.IsImm())
+		{
+			// TODO: Immediates?
+		}
+
+		regs[i].used = cache.regs[i].used;
+		regs[i].dirty |= cache.regs[i].dirty;
+		regs[i].last_use_ctr = cache.regs[i].last_use_ctr;
+	}
+
+	// sync the freely used xregs
+	if (!emit)
+	{
+		for (size_t i = 0; i < xregs.size(); i++)
+		{
+			if (cache.xregs[i].guest_reg == DSP_REG_USED &&
+			    xregs[i].guest_reg == DSP_REG_NONE)
+			{
+				xregs[i].guest_reg = DSP_REG_USED;
+			}
+			if (cache.xregs[i].guest_reg == DSP_REG_NONE &&
+			    xregs[i].guest_reg == DSP_REG_USED)
+			{
+				xregs[i].guest_reg = DSP_REG_NONE;
+			}
+		}
+	}
+
+	// consistency checks
+	for (size_t i = 0; i < xregs.size(); i++)
+	{
+		_assert_msg_(DSPLLE,
+			     xregs[i].guest_reg == cache.xregs[i].guest_reg,
+			     "cache and current xreg guest_reg mismatch for %u", static_cast<u32>(i));
+	}
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		_assert_msg_(DSPLLE,
+			     regs[i].loc.IsImm() == cache.regs[i].loc.IsImm(),
+			     "cache and current reg loc mismatch for %i", static_cast<u32>(i));
+		_assert_msg_(DSPLLE,
+			     regs[i].loc.GetSimpleReg() == cache.regs[i].loc.GetSimpleReg(),
+			     "cache and current reg loc mismatch for %i", static_cast<u32>(i));
+		_assert_msg_(DSPLLE,
+			     regs[i].dirty || !cache.regs[i].dirty,
+			     "cache and current reg dirty mismatch for %i", static_cast<u32>(i));
+		_assert_msg_(DSPLLE,
+			     regs[i].used == cache.regs[i].used,
+			     "cache and current reg used mismatch for %i", static_cast<u32>(i));
+		_assert_msg_(DSPLLE,
+			     regs[i].shift == cache.regs[i].shift,
+			     "cache and current reg shift mismatch for %i", static_cast<u32>(i));
+	}
+
+	use_ctr = cache.use_ctr;
+}
+
+void DSPJitRegCache::flushMemBackedRegs()
+{
+	// also needs to undo any dynamic changes to static allocated regs
+	// this should have the same effect as
+	// merge(DSPJitRegCache(emitter));
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		_assert_msg_(DSPLLE, !regs[i].used,
+			     "register %u still in use", static_cast<u32>(i));
+
+		if (regs[i].used)
+		{
+			emitter.INT3();
+		}
+
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToHostReg(i, regs[i].host_reg, true);
+			rotateHostReg(i, 0, true);
+		}
+		else if (regs[i].parentReg == DSP_REG_NONE)
+		{
+			movToMemory(i);
+		}
+	}
+}
+
+void DSPJitRegCache::flushRegs()
+{
+	flushMemBackedRegs();
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToMemory(i);
+		}
+
+		_assert_msg_(DSPLLE,
+		             !regs[i].loc.IsSimpleReg(),
+		             "register %u is still a simple reg", static_cast<u32>(i));
+	}
+
+	_assert_msg_(DSPLLE,
+	             xregs[RSP].guest_reg == DSP_REG_STATIC,
+	             "wrong xreg state for %d", RSP);
+	_assert_msg_(DSPLLE,
+	             xregs[RBX].guest_reg == DSP_REG_STATIC,
+	             "wrong xreg state for %d", RBX);
+	_assert_msg_(DSPLLE,
+	             xregs[RBP].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", RBP);
+	_assert_msg_(DSPLLE,
+	             xregs[RSI].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", RSI);
+	_assert_msg_(DSPLLE,
+	             xregs[RDI].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", RDI);
+#ifdef STATIC_REG_ACCS
+	_assert_msg_(DSPLLE,
+	             xregs[R8].guest_reg == DSP_REG_STATIC,
+	             "wrong xreg state for %d", R8);
+	_assert_msg_(DSPLLE,
+	             xregs[R9].guest_reg == DSP_REG_STATIC,
+	             "wrong xreg state for %d", R9);
+#else
+	_assert_msg_(DSPLLE,
+	             xregs[R8].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R8);
+	_assert_msg_(DSPLLE,
+	             xregs[R9].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R9);
+#endif
+	_assert_msg_(DSPLLE,
+	             xregs[R10].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R10);
+	_assert_msg_(DSPLLE,
+	             xregs[R11].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R11);
+	_assert_msg_(DSPLLE,
+	             xregs[R12].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R12);
+	_assert_msg_(DSPLLE,
+	             xregs[R13].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R13);
+	_assert_msg_(DSPLLE,
+	             xregs[R14].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R14);
+	_assert_msg_(DSPLLE,
+	             xregs[R15].guest_reg == DSP_REG_NONE,
+	             "wrong xreg state for %d", R15);
+
+	use_ctr = 0;
+}
+
+static u64 ebp_store;
+
+void DSPJitRegCache::loadRegs(bool emit)
+{
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToHostReg(i, regs[i].host_reg, emit);
+		}
+	}
+
+	if (emit)
+	{
+		emitter.MOV(64, M(&ebp_store), R(RBP));
+	}
+}
+
+void DSPJitRegCache::saveRegs()
+{
+	flushRegs();
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToMemory(i);
+		}
+
+		_assert_msg_(DSPLLE,
+		             !regs[i].loc.IsSimpleReg(),
+		             "register %u is still a simple reg", static_cast<u32>(i));
+	}
+
+	emitter.MOV(64, R(RBP), M(&ebp_store));
+}
+
+void DSPJitRegCache::pushRegs()
+{
+	flushMemBackedRegs();
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToMemory(i);
+		}
+
+		_assert_msg_(DSPLLE,
+		             !regs[i].loc.IsSimpleReg(),
+		             "register %u is still a simple reg", static_cast<u32>(i));
+	}
+
+	int push_count = 0;
+	for (X64CachedReg& xreg : xregs)
+	{
+		if (xreg.guest_reg == DSP_REG_USED)
+			push_count++;
+	}
+
+	// hardcoding alignment to 16 bytes
+	if (push_count & 1)
+	{
+		emitter.SUB(64, R(RSP), Imm32(8));
+	}
+
+	for (size_t i = 0; i < xregs.size(); i++)
+	{
+		if (xregs[i].guest_reg == DSP_REG_USED)
+		{
+			emitter.PUSH(static_cast<X64Reg>(i));
+			xregs[i].pushed = true;
+			xregs[i].guest_reg = DSP_REG_NONE;
+		}
+
+		_assert_msg_(DSPLLE,
+		             xregs[i].guest_reg == DSP_REG_NONE ||
+		             xregs[i].guest_reg == DSP_REG_STATIC,
+		             "register %u is still used", static_cast<u32>(i));
+	}
+
+	emitter.MOV(64, R(RBP), M(&ebp_store));
+}
+
+void DSPJitRegCache::popRegs()
+{
+	emitter.MOV(64, M(&ebp_store), R(RBP));
+
+	int push_count = 0;
+	for (int i = static_cast<int>(xregs.size() - 1); i >= 0; i--)
+	{
+		if (xregs[i].pushed)
+		{
+			push_count++;
+
+			emitter.POP(static_cast<X64Reg>(i));
+			xregs[i].pushed = false;
+			xregs[i].guest_reg = DSP_REG_USED;
+		}
+	}
+
+	// hardcoding alignment to 16 bytes
+	if (push_count & 1)
+	{
+		emitter.ADD(64, R(RSP), Imm32(8));
+	}
+
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].host_reg != INVALID_REG)
+		{
+			movToHostReg(i, regs[i].host_reg, true);
+		}
+	}
+}
+
+X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg)
+{
+	if (reg != RBP)
+	{
+		return reg;
+	}
+
+	size_t rbp_guest = xregs[RBP].guest_reg;
+	xregs[RBP].guest_reg = DSP_REG_USED;
+	X64Reg safe = findSpillFreeXReg();
+	_assert_msg_(DSPLLE, safe != INVALID_REG, "could not find register");
+	if (safe == INVALID_REG)
+	{
+		emitter.INT3();
+	}
+	xregs[RBP].guest_reg = rbp_guest;
+	emitter.MOV(64,R(safe),R(reg));
+	return safe;
+}
+
+void DSPJitRegCache::movToHostReg(size_t reg, X64Reg host_reg, bool load)
+{
+	_assert_msg_(DSPLLE, reg < regs.size(),
+	             "bad register name %u", static_cast<u32>(reg));
+	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
+	             "register %u is proxy for %d", static_cast<u32>(reg), regs[reg].parentReg);
+	_assert_msg_(DSPLLE, !regs[reg].used,
+	             "moving to host reg in use guest reg %u", static_cast<u32>(reg));
+	X64Reg old_reg = regs[reg].loc.GetSimpleReg();
+	if (old_reg == host_reg)
+	{
+		return;
+	}
+
+	if (xregs[host_reg].guest_reg != DSP_REG_STATIC)
+	{
+		xregs[host_reg].guest_reg = reg;
+	}
+
+	if (load)
+	{
+		switch (regs[reg].size)
+		{
+		case 2:
+			emitter.MOV(16, R(host_reg), regs[reg].loc);
+			break;
+		case 4:
+			emitter.MOV(32, R(host_reg), regs[reg].loc);
+			break;
+		case 8:
+			emitter.MOV(64, R(host_reg), regs[reg].loc);
+			break;
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
+	}
+
+	regs[reg].loc = R(host_reg);
+	if (old_reg != INVALID_REG &&
+	    xregs[old_reg].guest_reg != DSP_REG_STATIC)
+	{
+		xregs[old_reg].guest_reg = DSP_REG_NONE;
+	}
+}
+
+void DSPJitRegCache::movToHostReg(size_t reg, bool load)
+{
+	_assert_msg_(DSPLLE, reg < regs.size(),
+	             "bad register name %u", static_cast<u32>(reg));
+	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
+	             "register %u is proxy for %d", static_cast<u32>(reg), regs[reg].parentReg);
+	_assert_msg_(DSPLLE, !regs[reg].used,
+	             "moving to host reg in use guest reg %u", static_cast<u32>(reg));
+
+	if (regs[reg].loc.IsSimpleReg())
+	{
+		return;
+	}
+
+	X64Reg tmp;
+	if (regs[reg].host_reg != INVALID_REG)
+	{
+		tmp = regs[reg].host_reg;
+	}
+	else
+	{
+		tmp = findSpillFreeXReg();
+	}
+
+	if (tmp == INVALID_REG)
+	{
+		return;
+	}
+
+	movToHostReg(reg, tmp, load);
+}
+
+void DSPJitRegCache::rotateHostReg(size_t reg, int shift, bool emit)
+{
+	_assert_msg_(DSPLLE, reg < regs.size(),
+	             "bad register name %u", static_cast<u32>(reg));
+	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
+	             "register %u is proxy for %d", static_cast<u32>(reg), regs[reg].parentReg);
+	_assert_msg_(DSPLLE, regs[reg].loc.IsSimpleReg(),
+	             "register %u is not a simple reg", static_cast<u32>(reg));
+	_assert_msg_(DSPLLE, !regs[reg].used,
+	             "rotating in use guest reg %u", static_cast<u32>(reg));
+
+	if (shift > regs[reg].shift && emit)
+	{
+		switch (regs[reg].size)
+		{
+		case 2:
+			emitter.ROR(16, regs[reg].loc, Imm8(shift - regs[reg].shift));
+			break;
+		case 4:
+			emitter.ROR(32, regs[reg].loc, Imm8(shift - regs[reg].shift));
+			break;
+		case 8:
+			emitter.ROR(64, regs[reg].loc, Imm8(shift - regs[reg].shift));
+			break;
+		}
+	}
+	else if (shift < regs[reg].shift && emit)
+	{
+		switch (regs[reg].size)
+		{
+		case 2:
+			emitter.ROL(16, regs[reg].loc, Imm8(regs[reg].shift - shift));
+			break;
+		case 4:
+			emitter.ROL(32, regs[reg].loc, Imm8(regs[reg].shift - shift));
+			break;
+		case 8:
+			emitter.ROL(64, regs[reg].loc, Imm8(regs[reg].shift - shift));
+			break;
+		}
+	}
+	regs[reg].shift = shift;
+}
+
+void DSPJitRegCache::movToMemory(size_t reg)
+{
+	_assert_msg_(DSPLLE, reg < regs.size(),
+		     "bad register name %u", static_cast<u32>(reg));
+	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
+		     "register %u is proxy for %d", static_cast<u32>(reg), regs[reg].parentReg);
+	_assert_msg_(DSPLLE, !regs[reg].used,
+		     "moving to memory in use guest reg %u", static_cast<u32>(reg));
+
+	if (regs[reg].used)
+	{
+		emitter.INT3();
+	}
+
+	if (!regs[reg].loc.IsSimpleReg() &&
+	    !regs[reg].loc.IsImm())
+	{
+		return;
+	}
+
+	//but first, check for any needed rotations
+	if (regs[reg].loc.IsSimpleReg())
+	{
+		rotateHostReg(reg, 0, true);
+	}
+	else
+	{
+		// TODO: Immediates?
+	}
+
+	_assert_msg_(DSPLLE, regs[reg].shift == 0, "still shifted??");
+
+	//move to mem
+	OpArg tmp = M(regs[reg].mem);
+
+	if (regs[reg].dirty)
+	{
+		switch (regs[reg].size)
+		{
+		case 2:
+			emitter.MOV(16, tmp, regs[reg].loc);
+			break;
+		case 4:
+			emitter.MOV(32, tmp, regs[reg].loc);
+			break;
+		case 8:
+			emitter.MOV(64, tmp, regs[reg].loc);
+			break;
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
+		regs[reg].dirty = false;
+	}
+
+	if (regs[reg].loc.IsSimpleReg())
+	{
+		X64Reg hostreg = regs[reg].loc.GetSimpleReg();
+		if (xregs[hostreg].guest_reg != DSP_REG_STATIC)
+		{
+			xregs[hostreg].guest_reg = DSP_REG_NONE;
+		}
+	}
+
+	regs[reg].last_use_ctr = -1;
+	regs[reg].loc = tmp;
+}
+
+void DSPJitRegCache::getReg(int reg, OpArg &oparg, bool load)
+{
+	int real_reg;
+	int shift;
+	if (regs[reg].parentReg != DSP_REG_NONE)
+	{
+		real_reg = regs[reg].parentReg;
+
+		// always load and rotate since we need the other
+		// parts of the register
+		load = true;
+
+		shift = regs[reg].shift;
+	}
+	else
+	{
+		real_reg = reg;
+		shift = 0;
+	}
+
+	_assert_msg_(DSPLLE, !regs[real_reg].used,
+	             "register %d already in use", real_reg);
+
+	if (regs[real_reg].used)
+	{
+		emitter.INT3();
+	}
+	// no need to actually emit code for load or rotate if caller doesn't
+	// use the contents, but see above for a reason to force the load
+	movToHostReg(real_reg, load);
+
+	// TODO: actually handle INVALID_REG
+	_assert_msg_(DSPLLE, regs[real_reg].loc.IsSimpleReg(),
+	             "did not get host reg for %d", reg);
+
+	rotateHostReg(real_reg, shift, load);
+	oparg = regs[real_reg].loc;
+	regs[real_reg].used = true;
+
+	//do some register specific fixup
+	switch (reg)
+	{
+	case DSP_REG_ACC0_64:
+	case DSP_REG_ACC1_64:
+		if (load)
+		{
+			// need to do this because interpreter only does 48 bits
+			// (and putReg does the same)
+			emitter.SHL(64, oparg, Imm8(64-40)); // sign extend
+			emitter.SAR(64, oparg, Imm8(64-40));
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void DSPJitRegCache::putReg(int reg, bool dirty)
+{
+	int real_reg = reg;
+	if (regs[reg].parentReg != DSP_REG_NONE)
+		real_reg = regs[reg].parentReg;
+
+	OpArg oparg = regs[real_reg].loc;
+
+	switch (reg)
+	{
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		if (dirty)
+		{
+			// no need to extend to full 64bit here until interpreter
+			// uses that
+			if (oparg.IsSimpleReg())
+			{
+				// register is already shifted correctly
+				// (if at all)
+
+				// sign extend from the bottom 8 bits.
+				emitter.MOVSX(16, 8, oparg.GetSimpleReg(), oparg);
+			}
+			else if (oparg.IsImm())
+			{
+				// TODO: Immediates?
+			}
+			else
+			{
+				// this works on the memory, so use reg instead
+				// of real_reg, since it has the right loc
+				X64Reg tmp;
+				getFreeXReg(tmp);
+				// sign extend from the bottom 8 bits.
+				emitter.MOVSX(16, 8, tmp, regs[reg].loc);
+				emitter.MOV(16, regs[reg].loc, R(tmp));
+				putXReg(tmp);
+			}
+		}
+		break;
+	case DSP_REG_ACC0_64:
+	case DSP_REG_ACC1_64:
+		if (dirty)
+		{
+			emitter.SHL(64, oparg, Imm8(64-40)); // sign extend
+			emitter.SAR(64, oparg, Imm8(64-40));
+		}
+		break;
+	default:
+		break;
+	}
+
+	regs[real_reg].used = false;
+
+	if (regs[real_reg].loc.IsSimpleReg())
+	{
+		regs[real_reg].dirty |= dirty;
+		regs[real_reg].last_use_ctr = use_ctr;
+		use_ctr++;
+	}
+}
+
+void DSPJitRegCache::readReg(int sreg, X64Reg host_dreg, DSPJitSignExtend extend)
+{
+	OpArg reg;
+	getReg(sreg, reg);
+
+	switch (regs[sreg].size)
+	{
+	case 2:
+		switch (extend)
+		{
+		case SIGN:
+			emitter.MOVSX(64, 16, host_dreg, reg);
+			break;
+		case ZERO:
+			emitter.MOVZX(64, 16, host_dreg, reg);
+			break;
+		case NONE:
+			emitter.MOV(16, R(host_dreg), reg);
+			break;
+		}
+		break;
+	case 4:
+		switch (extend)
+		{
+		case SIGN:
+			emitter.MOVSX(64, 32, host_dreg, reg);
+			break;
+		case ZERO:
+			emitter.MOVZX(64, 32, host_dreg, reg);
+			break;
+		case NONE:
+			emitter.MOV(32, R(host_dreg), reg);
+			break;
+		}
+		break;
+	case 8:
+		emitter.MOV(64, R(host_dreg), reg);
+		break;
+	default:
+		_assert_msg_(DSPLLE, 0, "unsupported memory size");
+		break;
+	}
+	putReg(sreg, false);
+}
+
+void DSPJitRegCache::writeReg(int dreg, OpArg arg)
+{
+	OpArg reg;
+	getReg(dreg, reg, false);
+	if (arg.IsImm())
+	{
+		switch (regs[dreg].size)
+		{
+		case 2:
+			emitter.MOV(16, reg, Imm16(arg.Imm16()));
+			break;
+		case 4:
+			emitter.MOV(32, reg, Imm32(arg.Imm32()));
+			break;
+		case 8:
+			if ((u32)arg.Imm64() == arg.Imm64())
+			{
+				emitter.MOV(64, reg, Imm32((u32) arg.Imm64()));
+			}
+			else
+			{
+				emitter.MOV(64, reg, Imm64(arg.Imm64()));
+			}
+			break;
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
+	}
+	else
+	{
+		switch (regs[dreg].size)
+		{
+		case 2:
+			emitter.MOV(16, reg, arg);
+			break;
+		case 4:
+			emitter.MOV(32, reg, arg);
+			break;
+		case 8:
+			emitter.MOV(64, reg, arg);
+			break;
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
+	}
+	putReg(dreg, true);
+}
+
+//ordered in order of prefered use
+//not all of these are actually available
+static X64Reg alloc_order[] = {
+	R8,R9,R10,R11,R12,R13,R14,R15,RSI,RDI,RBX,RCX,RDX,RAX,RBP
+};
+
+X64Reg DSPJitRegCache::spillXReg()
+{
+	int max_use_ctr_diff = 0;
+	X64Reg least_recent_use_reg = INVALID_REG;
+	for (X64Reg reg : alloc_order)
+	{
+		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
+		    !regs[xregs[reg].guest_reg].used)
+		{
+			int use_ctr_diff = use_ctr - regs[xregs[reg].guest_reg].last_use_ctr;
+			if (use_ctr_diff >= max_use_ctr_diff)
+			{
+				max_use_ctr_diff = use_ctr_diff;
+				least_recent_use_reg = reg;
+			}
+		}
+	}
+
+	if (least_recent_use_reg != INVALID_REG)
+	{
+		movToMemory(xregs[least_recent_use_reg].guest_reg);
+		return least_recent_use_reg;
+	}
+
+	//just choose one.
+	for (X64Reg reg : alloc_order)
+	{
+		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
+		    !regs[xregs[reg].guest_reg].used)
+		{
+			movToMemory(xregs[reg].guest_reg);
+			return reg;
+		}
+	}
+
+	return INVALID_REG;
+}
+
+void DSPJitRegCache::spillXReg(X64Reg reg)
+{
+	if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED)
+	{
+		_assert_msg_(DSPLLE, !regs[xregs[reg].guest_reg].used,
+		             "to be spilled host reg %x(guest reg %zx) still in use!",
+		             reg, xregs[reg].guest_reg);
+
+		movToMemory(xregs[reg].guest_reg);
+	}
+	else
+	{
+		_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE,
+		             "to be spilled host reg %x still in use!",
+		             reg);
+	}
+}
+
+X64Reg DSPJitRegCache::findFreeXReg()
+{
+	for (X64Reg x : alloc_order)
+	{
+		if (xregs[x].guest_reg == DSP_REG_NONE)
+		{
+			return x;
+		}
+	}
+	return INVALID_REG;
+}
+
+X64Reg DSPJitRegCache::findSpillFreeXReg()
+{
+	X64Reg reg = findFreeXReg();
+	if (reg == INVALID_REG)
+	{
+		reg = spillXReg();
+	}
+	return reg;
+}
+
+void DSPJitRegCache::getFreeXReg(X64Reg &reg)
+{
+	reg = findSpillFreeXReg();
+
+	_assert_msg_(DSPLLE, reg != INVALID_REG, "could not find register");
+	if (reg == INVALID_REG)
+	{
+		emitter.INT3();
+	}
+	xregs[reg].guest_reg = DSP_REG_USED;
+}
+
+void DSPJitRegCache::getXReg(X64Reg reg)
+{
+	if (xregs[reg].guest_reg == DSP_REG_STATIC)
+	{
+		ERROR_LOG(DSPLLE, "Trying to get statically used XReg %d", reg);
+		return;
+	}
+
+	if (xregs[reg].guest_reg != DSP_REG_NONE)
+	{
+		spillXReg(reg);
+	}
+	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE, "register already in use");
+	xregs[reg].guest_reg = DSP_REG_USED;
+}
+
+void DSPJitRegCache::putXReg(X64Reg reg)
+{
+	if (xregs[reg].guest_reg == DSP_REG_STATIC)
+	{
+		ERROR_LOG(DSPLLE, "Trying to put statically used XReg %d", reg);
+		return;
+	}
+
+	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_USED,
+	             "putXReg without get(Free)XReg");
+
+	xregs[reg].guest_reg = DSP_REG_NONE;
+}
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h
similarity index 87%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
rename to Source/Core/Core/DSP/Jit/DSPJitRegCache.h
index 77cc7ace1e..a4892e50b5 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
+++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h
@@ -1,11 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _DSPJITREGCACHE_H
-#define _DSPJITREGCACHE_H
+#pragma once
 
-#include "x64Emitter.h"
+#include <array>
+#include "Common/x64Emitter.h"
 
 class DSPEmitter;
 
@@ -13,14 +13,10 @@ enum DSPJitRegSpecial
 {
 	DSP_REG_AX0_32   =32,
 	DSP_REG_AX1_32   =33,
-#ifdef _M_X64
 	DSP_REG_ACC0_64  =34,
 	DSP_REG_ACC1_64  =35,
 	DSP_REG_PROD_64  =36,
 	DSP_REG_MAX_MEM_BACKED = 36,
-#else
-	DSP_REG_MAX_MEM_BACKED = 33,
-#endif
 
 	DSP_REG_USED     =253,
 	DSP_REG_STATIC   =254,
@@ -34,21 +30,15 @@ enum DSPJitSignExtend
 	NONE
 };
 
-#ifdef _M_X64
-#define NUMXREGS 16
-#elif _M_IX86
-#define NUMXREGS 8
-#endif
-
 class DSPJitRegCache
 {
 private:
 	struct X64CachedReg
 	{
-		int guest_reg; //including DSPJitRegSpecial
+		size_t guest_reg; //including DSPJitRegSpecial
 		bool pushed;
 	};
-	
+
 	struct DynamicReg
 	{
 		Gen::OpArg loc;
@@ -71,8 +61,8 @@ private:
  */
 	};
 
-	DynamicReg regs[DSP_REG_MAX_MEM_BACKED+1];
-	X64CachedReg xregs[NUMXREGS];
+	std::array<DynamicReg, 37> regs;
+	std::array<X64CachedReg, 16> xregs;
 
 	DSPEmitter &emitter;
 	bool temporary;
@@ -86,10 +76,10 @@ private:
 	Gen::X64Reg findSpillFreeXReg();
 	void spillXReg(Gen::X64Reg reg);
 
-	void movToHostReg(int reg, Gen::X64Reg host_reg, bool load);
-	void movToHostReg(int reg, bool load);
-	void rotateHostReg(int reg, int shift, bool emit);
-	void movToMemory(int reg);
+	void movToHostReg(size_t reg, Gen::X64Reg host_reg, bool load);
+	void movToHostReg(size_t reg, bool load);
+	void rotateHostReg(size_t reg, int shift, bool emit);
+	void movToMemory(size_t reg);
 	void flushMemBackedRegs();
 
 public:
@@ -186,5 +176,3 @@ public:
 	//unreserve the given host reg
 	void putXReg(Gen::X64Reg reg);
 };
-
-#endif /*_DSPJITREGCACHE_H*/
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
similarity index 87%
rename from Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
rename to Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
index e313920361..64761455e3 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
@@ -1,13 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPHWInterface.h"
-#include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 using namespace Gen;
 
@@ -23,18 +20,16 @@ void DSPEmitter::dsp_reg_stack_push(int stack_reg)
 	AND(8, R(AL), Imm8(DSP_STACK_MASK));
 	MOV(8, M(&g_dsp.reg_stack_ptr[stack_reg]), R(AL));
 
-	X64Reg tmp1;
+	X64Reg tmp1, tmp2;
 	gpr.getFreeXReg(tmp1);
+	gpr.getFreeXReg(tmp2);
 	//g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]] = g_dsp.r[DSP_REG_ST0 + stack_reg];
 	MOV(16, R(tmp1), M(&g_dsp.r.st[stack_reg]));
-#ifdef _M_IX86 // All32
-	MOVZX(32, 8, EAX, R(AL));
-#else
 	MOVZX(64, 8, RAX, R(AL));
-#endif
-	MOV(16, MComplex(EAX, EAX, 1,
-			 PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)), R(tmp1));
+	MOV(64, R(tmp2), ImmPtr(g_dsp.reg_stack[stack_reg]));
+	MOV(16, MComplex(tmp2, EAX, SCALE_2, 0), R(tmp1));
 	gpr.putXReg(tmp1);
+	gpr.putXReg(tmp2);
 }
 
 //clobbers:
@@ -44,17 +39,15 @@ void DSPEmitter::dsp_reg_stack_pop(int stack_reg)
 {
 	//g_dsp.r[DSP_REG_ST0 + stack_reg] = g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]];
 	MOV(8, R(AL), M(&g_dsp.reg_stack_ptr[stack_reg]));
-	X64Reg tmp1;
+	X64Reg tmp1, tmp2;
 	gpr.getFreeXReg(tmp1);
-#ifdef _M_IX86 // All32
-	MOVZX(32, 8, EAX, R(AL));
-#else
+	gpr.getFreeXReg(tmp2);
 	MOVZX(64, 8, RAX, R(AL));
-#endif
-	MOV(16, R(tmp1), MComplex(EAX, EAX, 1,
-				  PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)));
+	MOV(64, R(tmp2), ImmPtr(g_dsp.reg_stack[stack_reg]));
+	MOV(16, R(tmp1), MComplex(tmp2, EAX, SCALE_2, 0));
 	MOV(16, M(&g_dsp.r.st[stack_reg]), R(tmp1));
 	gpr.putXReg(tmp1);
+	gpr.putXReg(tmp2);
 
 	//g_dsp.reg_stack_ptr[stack_reg]--;
 	//g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
@@ -206,21 +199,13 @@ void DSPEmitter::dsp_op_read_reg_dont_saturate(int reg, Gen::X64Reg host_dreg, D
 	case DSP_REG_ST2:
 	case DSP_REG_ST3:
 		dsp_reg_load_stack(reg - DSP_REG_ST0, host_dreg);
-		switch(extend)
+		switch (extend)
 		{
 		case SIGN:
-#ifdef _M_IX86 // All32
-			MOVSX(32, 16, host_dreg, R(host_dreg));
-#else
 			MOVSX(64, 16, host_dreg, R(host_dreg));
-#endif
 			break;
 		case ZERO:
-#ifdef _M_IX86 // All32
-			MOVZX(32, 16, host_dreg, R(host_dreg));
-#else
 			MOVZX(64, 16, host_dreg, R(host_dreg));
-#endif
 			break;
 		case NONE:
 		default:
@@ -242,21 +227,13 @@ void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExten
 	case DSP_REG_ST2:
 	case DSP_REG_ST3:
 		dsp_reg_load_stack(reg - DSP_REG_ST0, host_dreg);
-		switch(extend)
+		switch (extend)
 		{
 		case SIGN:
-#ifdef _M_IX86 // All32
-			MOVSX(32, 16, host_dreg, R(host_dreg));
-#else
 			MOVSX(64, 16, host_dreg, R(host_dreg));
-#endif
 			break;
 		case ZERO:
-#ifdef _M_IX86 // All32
-			MOVZX(32, 16, host_dreg, R(host_dreg));
-#else
 			MOVZX(64, 16, host_dreg, R(host_dreg));
-#endif
 			break;
 		case NONE:
 		default:
@@ -267,12 +244,8 @@ void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExten
 	case DSP_REG_ACM1:
 	{
 		//we already know this is ACCM0 or ACCM1
-#ifdef _M_IX86 // All32
-		gpr.readReg(reg, host_dreg, extend);
-#else
 		OpArg acc_reg;
 		gpr.getReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, acc_reg);
-#endif
 		OpArg sr_reg;
 		gpr.getReg(DSP_REG_SR,sr_reg);
 
@@ -280,43 +253,6 @@ void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExten
 		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
 		FixupBranch not_40bit = J_CC(CC_Z, true);
 
-#ifdef _M_IX86 // All32
-		DSPJitRegCache c2(gpr);
-		gpr.putReg(DSP_REG_SR, false);
-		X64Reg tmp1;
-		gpr.getFreeXReg(tmp1);
-		gpr.readReg(reg-DSP_REG_ACM0+DSP_REG_ACH0, tmp1, NONE);
-		MOVSX(32,16,host_dreg,R(host_dreg));
-		SHL(32, R(tmp1), Imm8(16));
-		MOV(16,R(tmp1),R(host_dreg));
-		CMP(32,R(host_dreg), R(tmp1));
-
-		FixupBranch no_saturate = J_CC(CC_Z);
-
-		CMP(32,R(tmp1),Imm32(0));
-		FixupBranch negative = J_CC(CC_LE);
-
-		MOV(32,R(host_dreg),Imm32(0x7fff));//this works for all extend modes
-		FixupBranch done_positive = J();
-
-		SetJumpTarget(negative);
-		if (extend == NONE || extend == ZERO)
-			MOV(32,R(host_dreg),Imm32(0x00008000));
-		else
-			MOV(32,R(host_dreg),Imm32(0xffff8000));
-		FixupBranch done_negative = J();
-
-		SetJumpTarget(no_saturate);
-		if (extend == ZERO)
-			MOVZX(32,16,host_dreg,R(host_dreg));
-		SetJumpTarget(done_positive);
-		SetJumpTarget(done_negative);
-		gpr.putXReg(tmp1);
-		gpr.flushRegs(c2);
-		SetJumpTarget(not_40bit);
-		gpr.flushRegs(c);
-#else
-
 		MOVSX(64,32,host_dreg,acc_reg);
 		CMP(64,R(host_dreg),acc_reg);
 		FixupBranch no_saturate = J_CC(CC_Z);
@@ -346,7 +282,6 @@ void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExten
 		SetJumpTarget(done_negative);
 		gpr.flushRegs(c);
 		gpr.putReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, false);
-#endif
 
 		gpr.putReg(DSP_REG_SR, false);
 	}
@@ -578,7 +513,7 @@ void DSPEmitter::decrease_addr_reg(int reg)
 
 
 // EAX - destination address
-// ECX - Base of dram
+// ECX - Base of DRAM
 void DSPEmitter::dmem_write(X64Reg value)
 {
 	//	if (saddr == 0)
@@ -587,11 +522,7 @@ void DSPEmitter::dmem_write(X64Reg value)
 
 	//  g_dsp.dram[addr & DSP_DRAM_MASK] = val;
 	AND(16, R(EAX), Imm16(DSP_DRAM_MASK));
-#ifdef _M_X64
 	MOV(64, R(ECX), ImmPtr(g_dsp.dram));
-#else
-	MOV(32, R(ECX), ImmPtr(g_dsp.dram));
-#endif
 	MOV(16, MComplex(ECX, EAX, 2, 0), R(value));
 
 	FixupBranch end = J(true);
@@ -612,12 +543,8 @@ void DSPEmitter::dmem_write_imm(u16 address, X64Reg value)
 	switch (address >> 12)
 	{
 	case 0x0: // 0xxx DRAM
-#ifdef _M_IX86 // All32
-		MOV(16, M(&g_dsp.dram[address & DSP_DRAM_MASK]), R(value));
-#else
 		MOV(64, R(RDX), ImmPtr(g_dsp.dram));
 		MOV(16, MDisp(RDX, (address & DSP_DRAM_MASK)*2), R(value));
-#endif
 		break;
 
 	case 0xf: // Fxxx HW regs
@@ -646,11 +573,7 @@ void DSPEmitter::imem_read(X64Reg address)
 	FixupBranch irom = J_CC(CC_A);
 	//	return g_dsp.iram[addr & DSP_IRAM_MASK];
 	AND(16, R(address), Imm16(DSP_IRAM_MASK));
-#ifdef _M_X64
 	MOV(64, R(ECX), ImmPtr(g_dsp.iram));
-#else
-	MOV(32, R(ECX), ImmPtr(g_dsp.iram));
-#endif
 	MOV(16, R(EAX), MComplex(ECX, address, 2, 0));
 
 	FixupBranch end = J();
@@ -658,11 +581,7 @@ void DSPEmitter::imem_read(X64Reg address)
 	//	else if (addr == 0x8)
 	//		return g_dsp.irom[addr & DSP_IROM_MASK];
 	AND(16, R(address), Imm16(DSP_IROM_MASK));
-#ifdef _M_X64
 	MOV(64, R(ECX), ImmPtr(g_dsp.irom));
-#else
-	MOV(32, R(ECX), ImmPtr(g_dsp.irom));
-#endif
 	MOV(16, R(EAX), MComplex(ECX, address, 2, 0));
 
 	SetJumpTarget(end);
@@ -678,12 +597,8 @@ void DSPEmitter::dmem_read(X64Reg address)
 	FixupBranch dram = J_CC(CC_A);
 	//	return g_dsp.dram[addr & DSP_DRAM_MASK];
 	AND(32, R(address), Imm32(DSP_DRAM_MASK));
-#ifdef _M_X64
 	MOVZX(64, 16, address, R(address));
 	MOV(64, R(ECX), ImmPtr(g_dsp.dram));
-#else
-	MOV(32, R(ECX), ImmPtr(g_dsp.dram));
-#endif
 	MOV(16, R(EAX), MComplex(ECX, address, 2, 0));
 
 	FixupBranch end = J(true);
@@ -693,12 +608,8 @@ void DSPEmitter::dmem_read(X64Reg address)
 	FixupBranch ifx = J_CC(CC_A);
 	//		return g_dsp.coef[addr & DSP_COEF_MASK];
 	AND(32, R(address), Imm32(DSP_COEF_MASK));
-#ifdef _M_X64
 	MOVZX(64, 16, address, R(address));
 	MOV(64, R(ECX), ImmPtr(g_dsp.coef));
-#else
-	MOV(32, R(ECX), ImmPtr(g_dsp.coef));
-#endif
 	MOV(16, R(EAX), MComplex(ECX, address, 2, 0));
 
 	FixupBranch end2 = J(true);
@@ -720,21 +631,13 @@ void DSPEmitter::dmem_read_imm(u16 address)
 	switch (address >> 12)
 	{
 	case 0x0:  // 0xxx DRAM
-#ifdef _M_IX86 // All32
-		MOV(16, R(EAX), M(&g_dsp.dram[address & DSP_DRAM_MASK]));
-#else
 		MOV(64, R(RDX), ImmPtr(g_dsp.dram));
 		MOV(16, R(EAX), MDisp(RDX, (address & DSP_DRAM_MASK)*2));
-#endif
 		break;
 
 	case 0x1:  // 1xxx COEF
-#ifdef _M_IX86 // All32
-		MOV(16, R(EAX), Imm16(g_dsp.coef[address & DSP_COEF_MASK]));
-#else
 		MOV(64, R(RDX), ImmPtr(g_dsp.coef));
 		MOV(16, R(EAX), MDisp(RDX, (address & DSP_COEF_MASK)*2));
-#endif
 		break;
 
 	case 0xf:  // Fxxx HW regs
@@ -753,7 +656,6 @@ void DSPEmitter::dmem_read_imm(u16 address)
 // Returns s64 in RAX
 void DSPEmitter::get_long_prod(X64Reg long_prod)
 {
-#ifdef _M_X64
 	//s64 val   = (s8)(u8)g_dsp.r[DSP_REG_PRODH];
 	OpArg prod_reg;
 	gpr.getReg(DSP_REG_PROD_64, prod_reg);
@@ -769,15 +671,12 @@ void DSPEmitter::get_long_prod(X64Reg long_prod)
 	SHL(64, R(tmp), Imm8(16));
 	ADD(64, R(long_prod), R(tmp));
 	gpr.putXReg(tmp);
-
-#endif
 }
 
 // Returns s64 in RAX
 // Clobbers RCX
 void DSPEmitter::get_long_prod_round_prodl(X64Reg long_prod)
 {
-#ifdef _M_X64
 	//s64 prod = dsp_get_long_prod();
 	get_long_prod(long_prod);
 
@@ -798,7 +697,6 @@ void DSPEmitter::get_long_prod_round_prodl(X64Reg long_prod)
 	SetJumpTarget(_ret);
 	//return prod;
 	gpr.putXReg(tmp);
-#endif
 }
 
 // For accurate emulation, this is wrong - but the real prod registers behave
@@ -806,7 +704,6 @@ void DSPEmitter::get_long_prod_round_prodl(X64Reg long_prod)
 // In: RAX = s64 val
 void DSPEmitter::set_long_prod()
 {
-#ifdef _M_X64
 	X64Reg tmp;
 	gpr.getFreeXReg(tmp);
 
@@ -819,14 +716,12 @@ void DSPEmitter::set_long_prod()
 	MOV(64, prod_reg, R(RAX));
 
 	gpr.putReg(DSP_REG_PROD_64, true);
-#endif
 }
 
 // Returns s64 in RAX
 // Clobbers RCX
 void DSPEmitter::round_long_acc(X64Reg long_acc)
 {
-#ifdef _M_X64
 	//if (prod & 0x10000) prod = (prod + 0x8000) & ~0xffff;
 	TEST(32, R(long_acc), Imm32(0x10000));
 	FixupBranch jump = J_CC(CC_Z);
@@ -841,29 +736,24 @@ void DSPEmitter::round_long_acc(X64Reg long_acc)
 	AND(64, R(long_acc), R(RCX));
 	SetJumpTarget(_ret);
 	//return prod;
-#endif
 }
 
 // Returns s64 in acc
 void DSPEmitter::get_long_acc(int _reg, X64Reg acc)
 {
-#ifdef _M_X64
 	OpArg reg;
 	gpr.getReg(DSP_REG_ACC0_64+_reg, reg);
 	MOV(64, R(acc), reg);
 	gpr.putReg(DSP_REG_ACC0_64+_reg, false);
-#endif
 }
 
 // In: acc = s64 val
 void DSPEmitter::set_long_acc(int _reg, X64Reg acc)
 {
-#ifdef _M_X64
 	OpArg reg;
 	gpr.getReg(DSP_REG_ACC0_64+_reg, reg, false);
 	MOV(64, reg, R(acc));
 	gpr.putReg(DSP_REG_ACC0_64+_reg);
-#endif
 }
 
 // Returns s16 in AX
@@ -873,7 +763,7 @@ void DSPEmitter::get_acc_l(int _reg, X64Reg acl, bool sign)
 	gpr.readReg(_reg+DSP_REG_ACL0, acl, sign?SIGN:ZERO);
 }
 
-void DSPEmitter::set_acc_l(int _reg, OpArg arg)
+void DSPEmitter::set_acc_l(int _reg, const OpArg& arg)
 {
 	//	return g_dsp.r[DSP_REG_ACM0 + _reg];
 	gpr.writeReg(_reg+DSP_REG_ACL0,arg);
@@ -887,7 +777,7 @@ void DSPEmitter::get_acc_m(int _reg, X64Reg acm, bool sign)
 }
 
 // In: s16 in AX
-void DSPEmitter::set_acc_m(int _reg, OpArg arg)
+void DSPEmitter::set_acc_m(int _reg, const OpArg& arg)
 {
 	//	return g_dsp.r.ac[_reg].m;
 	gpr.writeReg(_reg+DSP_REG_ACM0,arg);
@@ -901,7 +791,7 @@ void DSPEmitter::get_acc_h(int _reg, X64Reg ach, bool sign)
 }
 
 // In: s16 in AX
-void DSPEmitter::set_acc_h(int _reg, OpArg arg)
+void DSPEmitter::set_acc_h(int _reg, const OpArg& arg)
 {
 	//	return g_dsp.r[DSP_REG_ACM0 + _reg];
 	gpr.writeReg(_reg+DSP_REG_ACH0,arg);
diff --git a/Source/Core/Core/DSP/LabelMap.cpp b/Source/Core/Core/DSP/LabelMap.cpp
new file mode 100644
index 0000000000..31ca4b614c
--- /dev/null
+++ b/Source/Core/Core/DSP/LabelMap.cpp
@@ -0,0 +1,75 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
+
+LabelMap::LabelMap()
+{
+
+}
+
+void LabelMap::RegisterDefaults()
+{
+	for (int i = 0; i < 0x24; i++)
+	{
+		if (regnames[i].name)
+			RegisterLabel(regnames[i].name, regnames[i].addr);
+	}
+	for (int i = 0; i < (int)pdlabels_size; i++)
+	{
+		if (pdlabels[i].name)
+			RegisterLabel(pdlabels[i].name, pdlabels[i].addr);
+	}
+}
+
+void LabelMap::RegisterLabel(const std::string &label, u16 lval, LabelType type)
+{
+	u16 old_value;
+	if (GetLabelValue(label, &old_value) && old_value != lval)
+	{
+		printf("WARNING: Redefined label %s to %04x - old value %04x\n",
+			   label.c_str(), lval, old_value);
+		DeleteLabel(label);
+	}
+	labels.emplace_back(label, lval, type);
+}
+
+void LabelMap::DeleteLabel(const std::string &label)
+{
+	for (std::vector<label_t>::iterator iter = labels.begin();
+		iter != labels.end(); ++iter)
+	{
+		if (!label.compare(iter->name))
+		{
+			labels.erase(iter);
+			return;
+		}
+	}
+}
+
+bool LabelMap::GetLabelValue(const std::string &name, u16 *value, LabelType type) const
+{
+	for (auto& label : labels)
+	{
+		if (!name.compare(label.name))
+		{
+			if (type & label.type)
+			{
+				*value = label.addr;
+				return true;
+			}
+			else
+			{
+				printf("WARNING: Wrong label type requested. %s\n", name.c_str());
+			}
+		}
+	}
+	return false;
+}
+
+void LabelMap::Clear()
+{
+	labels.clear();
+}
diff --git a/Source/Core/Core/Src/DSP/LabelMap.h b/Source/Core/Core/DSP/LabelMap.h
similarity index 82%
rename from Source/Core/Core/Src/DSP/LabelMap.h
rename to Source/Core/Core/DSP/LabelMap.h
index 908b3bd7c9..6938379fd4 100644
--- a/Source/Core/Core/Src/DSP/LabelMap.h
+++ b/Source/Core/Core/DSP/LabelMap.h
@@ -1,14 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _LABELMAP_H
-#define _LABELMAP_H
+#pragma once
 
 #include <string>
 #include <vector>
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 enum LabelType
 {
@@ -24,7 +23,7 @@ class LabelMap
 	{
 		label_t(const std::string &lbl, s32 address, LabelType ltype) : name(lbl), addr(address), type(ltype) {}
 		std::string name;
-		s32	addr;
+		s32 addr;
 		LabelType type;
 	};
 	std::vector<label_t> labels;
@@ -38,5 +37,3 @@ public:
 	bool GetLabelValue(const std::string &label, u16 *value, LabelType type = LABEL_ANY) const;
 	void Clear();
 };
-
-#endif  // _LABELMAP_H
diff --git a/Source/Core/Core/DSPEmulator.cpp b/Source/Core/Core/DSPEmulator.cpp
new file mode 100644
index 0000000000..5aaf8a602c
--- /dev/null
+++ b/Source/Core/Core/DSPEmulator.cpp
@@ -0,0 +1,16 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/DSPEmulator.h"
+
+#include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPLLE/DSPLLE.h"
+
+DSPEmulator *CreateDSPEmulator(bool HLE)
+{
+	if (HLE)
+		return new DSPHLE();
+	else
+		return new DSPLLE();
+}
diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h
new file mode 100644
index 0000000000..b05e56ee1f
--- /dev/null
+++ b/Source/Core/Core/DSPEmulator.h
@@ -0,0 +1,35 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+class DSPEmulator
+{
+public:
+	virtual ~DSPEmulator() {}
+
+	virtual bool IsLLE() = 0;
+
+	virtual bool Initialize(bool bWii, bool bDSPThread) = 0;
+	virtual void Shutdown() = 0;
+
+	virtual void DoState(PointerWrap &p) = 0;
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) = 0;
+
+	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) = 0;
+	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) = 0;
+	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) = 0;
+	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) = 0;
+	virtual unsigned short DSP_ReadControlRegister() = 0;
+	virtual unsigned short DSP_WriteControlRegister(unsigned short) = 0;
+	virtual void DSP_Update(int cycles) = 0;
+	virtual void DSP_StopSoundStream() = 0;
+	virtual u32 DSP_UpdateRate() = 0;
+};
+
+DSPEmulator *CreateDSPEmulator(bool HLE);
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
new file mode 100644
index 0000000000..d9cb4af564
--- /dev/null
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
@@ -0,0 +1,165 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <functional>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+
+namespace Dolphin_Debugger
+{
+
+void AddAutoBreakpoints()
+{
+#if defined(_DEBUG) || defined(DEBUGFAST)
+#if 1
+	const char *bps[] = {
+		"PPCHalt",
+	};
+
+	for (const char* bp : bps)
+	{
+		Symbol *symbol = g_symbolDB.GetSymbolFromName(bp);
+		if (symbol)
+			PowerPC::breakpoints.Add(symbol->address, false);
+	}
+#endif
+#endif
+}
+
+// Returns true if the address is not a valid RAM address or NULL.
+static bool IsStackBottom(u32 addr)
+{
+	return !addr || !PowerPC::HostIsRAMAddress(addr);
+}
+
+static void WalkTheStack(const std::function<void(u32)>& stack_step)
+{
+	if (!IsStackBottom(PowerPC::ppcState.gpr[1]))
+	{
+		u32 addr = PowerPC::HostRead_U32(PowerPC::ppcState.gpr[1]);  // SP
+
+		// Walk the stack chain
+		for (int count = 0;
+		     !IsStackBottom(addr + 4) && (count++ < 20);
+		     ++count)
+		{
+			u32 func_addr = PowerPC::HostRead_U32(addr + 4);
+			stack_step(func_addr);
+
+			if (IsStackBottom(addr))
+				break;
+
+			addr = PowerPC::HostRead_U32(addr);
+		}
+	}
+}
+
+// Returns callstack "formatted for debugging" - meaning that it
+// includes LR as the last item, and all items are the last step,
+// instead of "pointing ahead"
+bool GetCallstack(std::vector<CallstackEntry> &output)
+{
+	if (!Core::IsRunning() || !PowerPC::HostIsRAMAddress(PowerPC::ppcState.gpr[1]))
+		return false;
+
+	if (LR == 0)
+	{
+		CallstackEntry entry;
+		entry.Name = "(error: LR=0)";
+		entry.vAddress = 0x0;
+		output.push_back(entry);
+		return false;
+	}
+
+	CallstackEntry entry;
+	entry.Name = StringFromFormat(" * %s [ LR = %08x ]\n", g_symbolDB.GetDescription(LR).c_str(), LR - 4);
+	entry.vAddress = LR - 4;
+	output.push_back(entry);
+
+	WalkTheStack([&entry, &output](u32 func_addr) {
+		std::string func_desc = g_symbolDB.GetDescription(func_addr);
+		if (func_desc.empty() || func_desc == "Invalid")
+			func_desc = "(unknown)";
+		entry.Name = StringFromFormat(" * %s [ addr = %08x ]\n",
+		                              func_desc.c_str(), func_addr - 4);
+		entry.vAddress = func_addr - 4;
+		output.push_back(entry);
+	});
+
+	return true;
+}
+
+void PrintCallstack()
+{
+	printf("== STACK TRACE - SP = %08x ==", PowerPC::ppcState.gpr[1]);
+
+	if (LR == 0)
+	{
+		printf(" LR = 0 - this is bad");
+	}
+
+	if (g_symbolDB.GetDescription(PC) != g_symbolDB.GetDescription(LR))
+	{
+		printf(" * %s  [ LR = %08x ]", g_symbolDB.GetDescription(LR).c_str(), LR);
+	}
+
+	WalkTheStack([](u32 func_addr) {
+		std::string func_desc = g_symbolDB.GetDescription(func_addr);
+		if (func_desc.empty() || func_desc == "Invalid")
+			func_desc = "(unknown)";
+		printf(" * %s [ addr = %08x ]", func_desc.c_str(), func_addr);
+	});
+}
+
+void PrintCallstack(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
+{
+	GENERIC_LOG(type, level, "== STACK TRACE - SP = %08x ==",
+				PowerPC::ppcState.gpr[1]);
+
+	if (LR == 0)
+	{
+		GENERIC_LOG(type, level, " LR = 0 - this is bad");
+	}
+
+	if (g_symbolDB.GetDescription(PC) != g_symbolDB.GetDescription(LR))
+	{
+		GENERIC_LOG(type, level, " * %s  [ LR = %08x ]",
+					g_symbolDB.GetDescription(LR).c_str(), LR);
+	}
+
+	WalkTheStack([type, level](u32 func_addr) {
+		std::string func_desc = g_symbolDB.GetDescription(func_addr);
+		if (func_desc.empty() || func_desc == "Invalid")
+			func_desc = "(unknown)";
+		GENERIC_LOG(type, level, " * %s [ addr = %08x ]", func_desc.c_str(), func_addr);
+	});
+}
+
+void PrintDataBuffer(LogTypes::LOG_TYPE type, u8* _pData, size_t _Size, const std::string& _title)
+{
+	GENERIC_LOG(type, LogTypes::LDEBUG, "%s", _title.c_str());
+	for (u32 j = 0; j < _Size;)
+	{
+		std::string hex_line = "";
+		for (int i = 0; i < 16; i++)
+		{
+			hex_line += StringFromFormat("%02x ", _pData[j++]);
+
+			if (j >= _Size)
+				break;
+		}
+		GENERIC_LOG(type, LogTypes::LDEBUG, "   Data: %s", hex_line.c_str());
+	}
+}
+
+}  // end of namespace Debugger
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
new file mode 100644
index 0000000000..2f91a76d46
--- /dev/null
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
@@ -0,0 +1,29 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+
+namespace Dolphin_Debugger
+{
+
+struct CallstackEntry
+{
+	std::string Name;
+	u32 vAddress;
+};
+
+bool GetCallstack(std::vector<CallstackEntry> &output);
+void PrintCallstack();
+void PrintCallstack(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level);
+void PrintDataBuffer(LogTypes::LOG_TYPE _Log, u8* _pData, size_t _Size, const std::string& _title);
+void AddAutoBreakpoints();
+
+
+} // end of namespace Debugger
diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp
new file mode 100644
index 0000000000..89d593e7fa
--- /dev/null
+++ b/Source/Core/Core/Debugger/Dump.cpp
@@ -0,0 +1,69 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#include "Core/Debugger/Dump.h"
+
+CDump::CDump(const std::string& filename) :
+	m_pData(nullptr)
+{
+	File::IOFile pStream(filename, "rb");
+	if (pStream)
+	{
+		m_size = (size_t)pStream.GetSize();
+
+		m_pData = new u8[m_size];
+
+		pStream.ReadArray(m_pData, m_size);
+	}
+}
+
+CDump::~CDump()
+{
+	if (m_pData != nullptr)
+	{
+		delete[] m_pData;
+		m_pData = nullptr;
+	}
+}
+
+int CDump::GetNumberOfSteps()
+{
+	return (int)(m_size / STRUCTUR_SIZE);
+}
+
+u32 CDump::GetGPR(int _step, int _gpr)
+{
+	u32 offset = _step * STRUCTUR_SIZE;
+
+	if (offset >= m_size)
+		return -1;
+
+	return Read32(offset + OFFSET_GPR + (_gpr * 4));
+}
+
+u32 CDump::GetPC(int _step)
+{
+	u32 offset = _step * STRUCTUR_SIZE;
+
+	if (offset >= m_size)
+		return -1;
+
+	return Read32(offset + OFFSET_PC);
+}
+
+u32 CDump::Read32(u32 _pos)
+{
+	u32 result = (m_pData[_pos+0] << 24) |
+	             (m_pData[_pos+1] << 16) |
+	             (m_pData[_pos+2] << 8)  |
+	             (m_pData[_pos+3] << 0);
+
+	return result;
+}
diff --git a/Source/Core/Core/Debugger/Dump.h b/Source/Core/Core/Debugger/Dump.h
new file mode 100644
index 0000000000..9a86ccb6dd
--- /dev/null
+++ b/Source/Core/Core/Debugger/Dump.h
@@ -0,0 +1,38 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Purpose: uncompress the dumps from costis GC-Debugger tool
+//
+//
+#pragma once
+
+#include <string>
+#include "Common/CommonTypes.h"
+
+class CDump
+{
+public:
+
+	CDump(const std::string& filename);
+	~CDump();
+
+	int GetNumberOfSteps();
+	u32 GetGPR(int _step, int _gpr);
+	u32 GetPC(int _step);
+
+private:
+	enum
+	{
+		OFFSET_GPR    = 0x4,
+		OFFSET_PC     = 0x194,
+		STRUCTUR_SIZE = 0x2BC
+	};
+
+	u8 *m_pData;
+
+	size_t m_size;
+
+	u32 Read32(u32 _pos);
+};
diff --git a/Source/Core/Core/Debugger/GCELF.h b/Source/Core/Core/Debugger/GCELF.h
new file mode 100644
index 0000000000..10ff582757
--- /dev/null
+++ b/Source/Core/Core/Debugger/GCELF.h
@@ -0,0 +1,112 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// ELF File Types
+#define ET_NONE         0 // No file type
+#define ET_REL          1 // Relocatable file
+#define ET_EXEC         2 // Executable file
+#define ET_DYN          3 // Shared object file
+#define ET_CORE         4 // Core file
+#define ET_LOPROC       0xFF00 // Processor specific
+#define ET_HIPROC       0xFFFF // Processor specific
+
+// ELF Machine Types
+#define EM_NONE         0 // No machine
+#define EM_M32          1 // AT&T WE 32100
+#define EM_SPARC        2 // SPARC
+#define EM_386          3 // Intel Architecture
+#define EM_68K          4 // Motorola 68000
+#define EM_88K          5 // Motorola 88000
+#define EM_860          6 // Intel 80860
+#define EM_MIPS         7 // MIPS RS3000 Big-Endian
+#define EM_MIPS_RS4_BE  8 // MIPS RS4000 Big-Endian
+#define EM_ARM         40 // ARM/Thumb Architecture
+
+// ELF Version Types
+#define EV_NONE         0 // Invalid version
+#define EV_CURRENT      1 // Current version
+
+// ELF Section Header Types
+#define SHT_NULL        0
+#define SHT_PROGBITS    1
+#define SHT_SYMTAB      2
+#define SHT_STRTAB      3
+#define SHT_RELA        4
+#define SHT_HASH        5
+#define SHT_DYNAMIC     6
+#define SHT_NOTE        7
+#define SHT_NOBITS      8
+#define SHT_REL         9
+#define SHT_SHLIB       10
+#define SHT_DYNSYM      11
+
+
+struct ELF_Header
+{
+	unsigned char ID[4];
+	unsigned char clazz;
+	unsigned char data;
+	unsigned char version;
+	unsigned char pad[9];
+	unsigned short e_type; // ELF file type
+	unsigned short e_machine; // ELF target machine
+	unsigned int e_version; // ELF file version number
+	unsigned int e_entry;
+	unsigned int e_phoff;
+	unsigned int e_shoff;
+	unsigned int e_flags;
+	unsigned short e_ehsize;
+	unsigned short e_phentsize;
+	unsigned short e_phnum;
+	unsigned short e_shentsize;
+	unsigned short e_shnum;
+	unsigned short e_shtrndx;
+};
+
+struct Program_Header
+{
+	unsigned int type;
+	unsigned int offset;
+	unsigned int vaddr;
+	unsigned int paddr;
+	unsigned int filesz;
+	unsigned int memsz;
+	unsigned int flags;
+	unsigned int align;
+};
+
+struct Section_Header
+{
+	unsigned int name;
+	unsigned int type;
+	unsigned int flags;
+	unsigned int addr;
+	unsigned int offset;
+	unsigned int size;
+	unsigned int link;
+	unsigned int info;
+	unsigned int addralign;
+	unsigned int entsize;
+};
+
+struct Symbol_Header
+{
+	unsigned int name;
+	unsigned int value;
+	unsigned int size;
+	unsigned char info;
+	unsigned char other;
+	unsigned short shndx;
+};
+
+struct Rela_Header
+{
+	unsigned int offset;
+	unsigned int info;
+	signed int addend;
+};
+
+const char ELFID[4] = {0x7F, 'E', 'L', 'F'};
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
new file mode 100644
index 0000000000..0f61bff49f
--- /dev/null
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
@@ -0,0 +1,219 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/GekkoDisassembler.h"
+
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+std::string PPCDebugInterface::Disassemble(unsigned int address)
+{
+	// PowerPC::HostRead_U32 seemed to crash on shutdown
+	if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
+		return "";
+
+	if (Core::GetState() == Core::CORE_PAUSE)
+	{
+		if (!PowerPC::HostIsRAMAddress(address))
+		{
+			return "(No RAM here)";
+		}
+
+		u32 op = PowerPC::HostRead_Instruction(address);
+		std::string disasm = GekkoDisassembler::Disassemble(op, address);
+
+		UGeckoInstruction inst;
+		inst.hex = PowerPC::HostRead_U32(address);
+
+		if (inst.OPCD == 1)
+		{
+			disasm += " (hle)";
+		}
+
+		return disasm;
+	}
+	else
+	{
+		return "<unknown>";
+	}
+}
+
+void PPCDebugInterface::GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
+{
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		if (memory || PowerPC::HostIsRAMAddress(address))
+		{
+			snprintf(dest, max_size, "%08X%s", ReadExtraMemory(memory, address), memory ? " (ARAM)" : "");
+		}
+		else
+		{
+			strcpy(dest, memory ? "--ARAM--" : "--------");
+		}
+	}
+	else
+	{
+		strcpy(dest, "<unknwn>");  // bad spelling - 8 chars
+	}
+}
+
+unsigned int PPCDebugInterface::ReadMemory(unsigned int address)
+{
+	return PowerPC::HostRead_U32(address);
+}
+
+unsigned int PPCDebugInterface::ReadExtraMemory(int memory, unsigned int address)
+{
+	switch (memory)
+	{
+	case 0:
+		return PowerPC::HostRead_U32(address);
+	case 1:
+		return (DSP::ReadARAM(address)     << 24) |
+		       (DSP::ReadARAM(address + 1) << 16) |
+		       (DSP::ReadARAM(address + 2) << 8) |
+		       (DSP::ReadARAM(address + 3));
+	default:
+		return 0;
+	}
+}
+
+unsigned int PPCDebugInterface::ReadInstruction(unsigned int address)
+{
+	return PowerPC::HostRead_Instruction(address);
+}
+
+bool PPCDebugInterface::IsAlive()
+{
+	return Core::GetState() != Core::CORE_UNINITIALIZED;
+}
+
+bool PPCDebugInterface::IsBreakpoint(unsigned int address)
+{
+	return PowerPC::breakpoints.IsAddressBreakPoint(address);
+}
+
+void PPCDebugInterface::SetBreakpoint(unsigned int address)
+{
+	PowerPC::breakpoints.Add(address);
+}
+
+void PPCDebugInterface::ClearBreakpoint(unsigned int address)
+{
+	PowerPC::breakpoints.Remove(address);
+}
+
+void PPCDebugInterface::ClearAllBreakpoints()
+{
+	PowerPC::breakpoints.Clear();
+}
+
+void PPCDebugInterface::ToggleBreakpoint(unsigned int address)
+{
+	if (PowerPC::breakpoints.IsAddressBreakPoint(address))
+		PowerPC::breakpoints.Remove(address);
+	else
+		PowerPC::breakpoints.Add(address);
+}
+
+void PPCDebugInterface::AddWatch(unsigned int address)
+{
+	PowerPC::watches.Add(address);
+}
+
+void PPCDebugInterface::ClearAllMemChecks()
+{
+	PowerPC::memchecks.Clear();
+}
+
+bool PPCDebugInterface::IsMemCheck(unsigned int address)
+{
+	return (Memory::AreMemoryBreakpointsActivated() &&
+	        PowerPC::memchecks.GetMemCheck(address));
+}
+
+void PPCDebugInterface::ToggleMemCheck(unsigned int address)
+{
+	if (Memory::AreMemoryBreakpointsActivated() &&
+	    !PowerPC::memchecks.GetMemCheck(address))
+	{
+		// Add Memory Check
+		TMemCheck MemCheck;
+		MemCheck.StartAddress = address;
+		MemCheck.EndAddress = address;
+		MemCheck.OnRead = true;
+		MemCheck.OnWrite = true;
+
+		MemCheck.Log = true;
+		MemCheck.Break = true;
+
+		PowerPC::memchecks.Add(MemCheck);
+	}
+	else
+		PowerPC::memchecks.Remove(address);
+}
+
+void PPCDebugInterface::InsertBLR(unsigned int address, unsigned int value)
+{
+	PowerPC::HostWrite_U32(value, address);
+}
+
+
+// =======================================================
+// Separate the blocks with colors.
+// -------------
+int PPCDebugInterface::GetColor(unsigned int address)
+{
+	if (!IsAlive())
+		return 0xFFFFFF;
+	if (!PowerPC::HostIsRAMAddress(address))
+		return 0xeeeeee;
+	static const int colors[6] =
+	{
+		0xd0FFFF,  // light cyan
+		0xFFd0d0,  // light red
+		0xd8d8FF,  // light blue
+		0xFFd0FF,  // light purple
+		0xd0FFd0,  // light green
+		0xFFFFd0,  // light yellow
+	};
+	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(address);
+	if (!symbol)
+		return 0xFFFFFF;
+	if (symbol->type != Symbol::SYMBOL_FUNCTION)
+		return 0xEEEEFF;
+	return colors[symbol->index % 6];
+}
+// =============
+
+
+std::string PPCDebugInterface::GetDescription(unsigned int address)
+{
+	return g_symbolDB.GetDescription(address);
+}
+
+unsigned int PPCDebugInterface::GetPC()
+{
+	return PowerPC::ppcState.pc;
+}
+
+void PPCDebugInterface::SetPC(unsigned int address)
+{
+	PowerPC::ppcState.pc = address;
+}
+
+void PPCDebugInterface::RunToBreakpoint()
+{
+
+}
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
new file mode 100644
index 0000000000..62575a7015
--- /dev/null
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -0,0 +1,46 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/DebugInterface.h"
+
+//wrapper between disasm control and Dolphin debugger
+
+class PPCDebugInterface final : public DebugInterface
+{
+public:
+	PPCDebugInterface(){}
+	virtual std::string Disassemble(unsigned int address) override;
+	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
+	virtual int GetInstructionSize(int /*instruction*/) override {return 4;}
+	virtual bool IsAlive() override;
+	virtual bool IsBreakpoint(unsigned int address) override;
+	virtual void SetBreakpoint(unsigned int address) override;
+	virtual void ClearBreakpoint(unsigned int address) override;
+	virtual void ClearAllBreakpoints() override;
+	virtual void AddWatch(unsigned int address) override;
+	virtual void ToggleBreakpoint(unsigned int address) override;
+	virtual void ClearAllMemChecks() override;
+	virtual bool IsMemCheck(unsigned int address) override;
+	virtual void ToggleMemCheck(unsigned int address) override;
+	virtual unsigned int ReadMemory(unsigned int address) override;
+
+	enum
+	{
+		EXTRAMEM_ARAM = 1,
+	};
+
+	virtual unsigned int ReadExtraMemory(int memory, unsigned int address) override;
+	virtual unsigned int ReadInstruction(unsigned int address) override;
+	virtual unsigned int GetPC() override;
+	virtual void SetPC(unsigned int address) override;
+	virtual void Step() override {}
+	virtual void RunToBreakpoint() override;
+	virtual void InsertBLR(unsigned int address, unsigned int value) override;
+	virtual int GetColor(unsigned int address) override;
+	virtual std::string GetDescription(unsigned int address) override;
+};
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
similarity index 83%
rename from Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp
rename to Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
index 233dbbbb4a..6b5df3b156 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
@@ -1,15 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 
-#include "Core.h"
-
-#include "VertexLoader.h"
-#include "VertexLoader_Position.h"
-#include "VertexLoader_Normal.h"
-#include "VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoader_Position.h"
+#include "VideoCommon/VertexLoader_TextCoord.h"
 
 namespace FifoAnalyzer
 {
@@ -17,8 +17,6 @@ namespace FifoAnalyzer
 void Init()
 {
 	VertexLoader_Normal::Init();
-	VertexLoader_Position::Init();
-	VertexLoader_TextCoord::Init();
 }
 
 u8 ReadFifo8(u8 *&data)
@@ -76,7 +74,7 @@ void GetTlutLoadData(u32 &tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory &
 	tlutXferCount = (bpMem.tmem_config.tlut_dest & 0x1FFC00) >> 5;
 
 	// TODO - figure out a cleaner way.
-	if (Core::g_CoreStartupParameter.bWii)
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 		memAddr = bpMem.tmem_config.tlut_src << 5;
 	else
 		memAddr = (bpMem.tmem_config.tlut_src & 0xFFFFF) << 5;
@@ -124,12 +122,12 @@ void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem)
 u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem)
 {
 	u32 vertexSize = 0;
-	
+
 	int sizes[21];
 	CalculateVertexElementSizes(sizes, vatIndex, cpMem);
 
-	for (int i = 0; i < 21; ++i)
-		vertexSize += sizes[i];
+	for (auto& size : sizes)
+		vertexSize += size;
 
 	return vertexSize;
 }
@@ -140,19 +138,19 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 	const VAT &vtxAttr = cpMem.vtxAttr[vatIndex];
 
 	// Colors
-	const u32 colDesc[2] = {vtxDesc.Color0, vtxDesc.Color1};
+	const u64 colDesc[2] = {vtxDesc.Color0, vtxDesc.Color1};
 	const u32 colComp[2] = {vtxAttr.g0.Color0Comp, vtxAttr.g0.Color1Comp};
 
 	const u32 tcElements[8] =
 	{
-		vtxAttr.g0.Tex0CoordElements, vtxAttr.g1.Tex1CoordElements, vtxAttr.g1.Tex2CoordElements, 
+		vtxAttr.g0.Tex0CoordElements, vtxAttr.g1.Tex1CoordElements, vtxAttr.g1.Tex2CoordElements,
 		vtxAttr.g1.Tex3CoordElements, vtxAttr.g1.Tex4CoordElements, vtxAttr.g2.Tex5CoordElements,
 		vtxAttr.g2.Tex6CoordElements, vtxAttr.g2.Tex7CoordElements
 	};
 
 	const u32 tcFormat[8] =
 	{
-		vtxAttr.g0.Tex0CoordFormat, vtxAttr.g1.Tex1CoordFormat, vtxAttr.g1.Tex2CoordFormat, 
+		vtxAttr.g0.Tex0CoordFormat, vtxAttr.g1.Tex1CoordFormat, vtxAttr.g1.Tex2CoordFormat,
 		vtxAttr.g1.Tex3CoordFormat, vtxAttr.g1.Tex4CoordFormat, vtxAttr.g2.Tex5CoordFormat,
 		vtxAttr.g2.Tex6CoordFormat, vtxAttr.g2.Tex7CoordFormat
 	};
@@ -171,7 +169,7 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 	// Normals
 	if (vtxDesc.Normal != NOT_PRESENT)
 	{
-		sizes[10] = VertexLoader_Normal::GetSize(vtxDesc.Normal, vtxAttr.g0.NormalFormat, vtxAttr.g0.NormalElements, vtxAttr.g0.NormalIndex3);		
+		sizes[10] = VertexLoader_Normal::GetSize(vtxDesc.Normal, vtxAttr.g0.NormalFormat, vtxAttr.g0.NormalElements, vtxAttr.g0.NormalIndex3);
 	}
 	else
 	{
@@ -190,12 +188,12 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 		case DIRECT:
 			switch (colComp[i])
 			{
-			case FORMAT_16B_565:	size = 2; break;
-			case FORMAT_24B_888:	size = 3; break;
-			case FORMAT_32B_888x:	size = 4; break;
-			case FORMAT_16B_4444:	size = 2; break;
-			case FORMAT_24B_6666:	size = 3; break;
-			case FORMAT_32B_8888:	size = 4; break;
+			case FORMAT_16B_565:  size = 2; break;
+			case FORMAT_24B_888:  size = 3; break;
+			case FORMAT_32B_888x: size = 4; break;
+			case FORMAT_16B_4444: size = 2; break;
+			case FORMAT_24B_6666: size = 3; break;
+			case FORMAT_32B_8888: size = 4; break;
 			default: _assert_(0); break;
 			}
 			break;
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
similarity index 80%
rename from Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h
rename to Source/Core/Core/FifoPlayer/FifoAnalyzer.h
index fea45007b8..98234d00d3 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h
+++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
@@ -1,14 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFOANALYZER_H
-#define _FIFOANALYZER_H
+#pragma once
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
-#include "BPMemory.h"
-#include "CPMemory.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CPMemory.h"
 
 namespace FifoAnalyzer
 {
@@ -37,5 +36,3 @@ namespace FifoAnalyzer
 	u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem);
 	void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem);
 }
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp
similarity index 85%
rename from Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp
rename to Source/Core/Core/FifoPlayer/FifoDataFile.cpp
index ebf19a07f8..7281018d3e 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp
@@ -1,14 +1,16 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FifoDataFile.h"
-#include "FifoFileStruct.h"
+#include <algorithm>
+#include <string>
 
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoFileStruct.h"
 
 using namespace FifoFileStruct;
-using namespace std;
 
 FifoDataFile::FifoDataFile() :
 	m_Flags(0)
@@ -17,12 +19,10 @@ FifoDataFile::FifoDataFile() :
 
 FifoDataFile::~FifoDataFile()
 {
-	for (unsigned int frameIdx = 0; frameIdx < m_Frames.size(); ++frameIdx)
+	for (auto& frame : m_Frames)
 	{
-		FifoFrameInfo &frame = m_Frames[frameIdx];
-
-		for (unsigned int i = 0; i < frame.memoryUpdates.size(); ++i)
-			delete []frame.memoryUpdates[i].data;
+		for (auto& update : frame.memoryUpdates)
+			delete []update.data;
 
 		delete []frame.fifoData;
 	}
@@ -43,7 +43,7 @@ void FifoDataFile::AddFrame(const FifoFrameInfo &frameInfo)
 	m_Frames.push_back(frameInfo);
 }
 
-bool FifoDataFile::Save(const char *filename)
+bool FifoDataFile::Save(const std::string& filename)
 {
 	File::IOFile file;
 	if (!file.Open(filename, "wb"))
@@ -54,8 +54,7 @@ bool FifoDataFile::Save(const char *filename)
 
 	// Add space for frame list
 	u64 frameListOffset = file.Tell();
-	for (unsigned int i = 0; i < m_Frames.size(); ++i)
-		PadFile(sizeof(FileFrameInfo), file);
+	PadFile(m_Frames.size() * sizeof(FileFrameInfo), file);
 
 	u64 bpMemOffset = file.Tell();
 	file.WriteArray(m_BPMem, BP_MEM_SIZE);
@@ -88,7 +87,7 @@ bool FifoDataFile::Save(const char *filename)
 	header.xfRegsSize = XF_REGS_SIZE;
 
 	header.frameListOffset = frameListOffset;
-	header.frameCount = m_Frames.size();
+	header.frameCount = (u32)m_Frames.size();
 
 	header.flags = m_Flags;
 
@@ -101,7 +100,7 @@ bool FifoDataFile::Save(const char *filename)
 		const FifoFrameInfo &srcFrame = m_Frames[i];
 
 		// Write FIFO data
-		file.Seek(0, SEEK_END);		
+		file.Seek(0, SEEK_END);
 		u64 dataOffset = file.Tell();
 		file.WriteBytes(srcFrame.fifoData, srcFrame.fifoDataSize);
 
@@ -113,12 +112,12 @@ bool FifoDataFile::Save(const char *filename)
 		dstFrame.fifoStart = srcFrame.fifoStart;
 		dstFrame.fifoEnd = srcFrame.fifoEnd;
 		dstFrame.memoryUpdatesOffset = memoryUpdatesOffset;
-		dstFrame.numMemoryUpdates = srcFrame.memoryUpdates.size();
+		dstFrame.numMemoryUpdates = (u32)srcFrame.memoryUpdates.size();
 
 		// Write frame info
 		u64 frameOffset = frameListOffset + (i * sizeof(FileFrameInfo));
 		file.Seek(frameOffset, SEEK_SET);
-		file.WriteBytes(&dstFrame, sizeof(FileFrameInfo));		
+		file.WriteBytes(&dstFrame, sizeof(FileFrameInfo));
 	}
 
 	if (!file.Close())
@@ -132,7 +131,7 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
 	File::IOFile file;
 	file.Open(filename, "rb");
 	if (!file)
-		return NULL;
+		return nullptr;
 
 	FileHeader header;
 	file.ReadBytes(&header, sizeof(header));
@@ -140,7 +139,7 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
 	if (header.fileId != FILE_ID || header.min_loader_version > VERSION_NUMBER)
 	{
 		file.Close();
-		return NULL;
+		return nullptr;
 	}
 
 	FifoDataFile* dataFile = new FifoDataFile;
@@ -152,7 +151,7 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
 		file.Close();
 		return dataFile;
 	}
-	
+
 	u32 size = std::min((u32)BP_MEM_SIZE, header.bpMemSize);
 	file.Seek(header.bpMemOffset, SEEK_SET);
 	file.ReadArray(dataFile->m_BPMem, size);
@@ -196,12 +195,10 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
 	return dataFile;
 }
 
-void FifoDataFile::PadFile(u32 numBytes, File::IOFile &file)
+void FifoDataFile::PadFile(size_t numBytes, File::IOFile& file)
 {
-	FILE *handle = file.GetHandle();
-
-	for (u32 i = 0; i < numBytes; ++i)
-		fputc(0, handle);
+	const u8 zero = 0;
+	fwrite(&zero, sizeof(zero), numBytes, file.GetHandle());
 }
 
 void FifoDataFile::SetFlag(u32 flag, bool set)
@@ -221,8 +218,7 @@ u64 FifoDataFile::WriteMemoryUpdates(const std::vector<MemoryUpdate> &memUpdates
 {
 	// Add space for memory update list
 	u64 updateListOffset = file.Tell();
-	for (unsigned int i = 0; i < memUpdates.size(); ++i)
-		PadFile(sizeof(FileMemoryUpdate), file);
+	PadFile(memUpdates.size() * sizeof(FileMemoryUpdate), file);
 
 	for (unsigned int i = 0; i < memUpdates.size(); ++i)
 	{
@@ -232,7 +228,7 @@ u64 FifoDataFile::WriteMemoryUpdates(const std::vector<MemoryUpdate> &memUpdates
 		file.Seek(0, SEEK_END);
 		u64 dataOffset = file.Tell();
 		file.WriteBytes(srcUpdate.data, srcUpdate.size);
-		
+
 		FileMemoryUpdate dstUpdate;
 		dstUpdate.address = srcUpdate.address;
 		dstUpdate.dataOffset = dataOffset;
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h
similarity index 75%
rename from Source/Core/Core/Src/FifoPlayer/FifoDataFile.h
rename to Source/Core/Core/FifoPlayer/FifoDataFile.h
index d13568a21b..607168f2dc 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h
+++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h
@@ -1,13 +1,14 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFODATAFILE_H_
-#define _FIFODATAFILE_H_
+#pragma once
 
-#include "Common.h"
+#include <string>
 #include <vector>
 
+#include "Common/CommonTypes.h"
+
 namespace File
 {
 	class IOFile;
@@ -17,10 +18,10 @@ struct MemoryUpdate
 {
 	enum Type
 	{
-		TEXTURE_MAP = 0x01,
-		XF_DATA = 0x02,
+		TEXTURE_MAP   = 0x01,
+		XF_DATA       = 0x02,
 		VERTEX_STREAM = 0x04,
-		TMEM = 0x08,
+		TMEM          = 0x08,
 	};
 
 	u32 fifoPosition;
@@ -54,7 +55,7 @@ public:
 	};
 
 	FifoDataFile();
-	~FifoDataFile();	
+	~FifoDataFile();
 
 	void SetIsWii(bool isWii);
 	bool GetIsWii() const;
@@ -65,10 +66,10 @@ public:
 	u32 *GetXFRegs() { return m_XFRegs; }
 
 	void AddFrame(const FifoFrameInfo &frameInfo);
-	const FifoFrameInfo &GetFrame(int frame) const { return m_Frames[frame]; }
-	int GetFrameCount() { return (int)m_Frames.size(); }
+	const FifoFrameInfo &GetFrame(u32 frame) const { return m_Frames[frame]; }
+	u32 GetFrameCount() const { return static_cast<u32>(m_Frames.size()); }
 
-	bool Save(const char *filename);
+	bool Save(const std::string& filename);
 
 	static FifoDataFile *Load(const std::string &filename, bool flagsOnly);
 
@@ -77,8 +78,8 @@ private:
 	{
 		FLAG_IS_WII = 1
 	};
-	
-	void PadFile(u32 numBytes, File::IOFile &file);
+
+	void PadFile(size_t numBytes, File::IOFile &file);
 
 	void SetFlag(u32 flag, bool set);
 	bool GetFlag(u32 flag) const;
@@ -95,5 +96,3 @@ private:
 
 	std::vector<FifoFrameInfo> m_Frames;
 };
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/FifoPlayer/FifoFileStruct.h
similarity index 78%
rename from Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h
rename to Source/Core/Core/FifoPlayer/FifoFileStruct.h
index 0e606cc465..9ca2ade332 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h
+++ b/Source/Core/Core/FifoPlayer/FifoFileStruct.h
@@ -1,19 +1,18 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFOFILESTRUCT_H_
-#define _FIFOFILESTRUCT_H_
+#pragma once
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 namespace FifoFileStruct
 {
 
 enum
 {
-	FILE_ID = 0x0d01f1f0,
-	VERSION_NUMBER = 1,
+	FILE_ID            = 0x0d01f1f0,
+	VERSION_NUMBER     = 1,
 	MIN_LOADER_VERSION = 1,
 };
 
@@ -21,7 +20,7 @@ enum
 
 union FileHeader
 {
-	struct 
+	struct
 	{
 		u32 fileId;
 		u32 file_version;
@@ -68,5 +67,3 @@ struct FileMemoryUpdate
 #pragma pack(pop)
 
 }
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp
similarity index 89%
rename from Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
rename to Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp
index 1ea80c8699..910e9bdae0 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp
@@ -1,18 +1,17 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
-#include "FifoDataFile.h"
-#include "FifoPlaybackAnalyzer.h"
+#include "Common/CommonTypes.h"
 
-#include "Common.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
 
-#include "OpcodeDecoding.h"
-#include "TextureDecoder.h"
-#include "VertexLoader.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VertexLoader.h"
 
-using namespace std;
 using namespace FifoAnalyzer;
 
 // For debugging
@@ -45,11 +44,11 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 		FifoAnalyzer::LoadCPReg(0x80 + i, cpMem[0x80 + i], m_CpMem);
 		FifoAnalyzer::LoadCPReg(0x90 + i, cpMem[0x90 + i], m_CpMem);
 	}
-	
+
 	frameInfo.clear();
 	frameInfo.resize(file->GetFrameCount());
 
-	for (int frameIdx = 0; frameIdx < file->GetFrameCount(); ++frameIdx)
+	for (u32 frameIdx = 0; frameIdx < file->GetFrameCount(); ++frameIdx)
 	{
 		const FifoFrameInfo& frame = file->GetFrame(frameIdx);
 		AnalyzedFrameInfo& analyzed = frameInfo[frameIdx];
@@ -59,8 +58,10 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 		u32 cmdStart = 0;
 		u32 nextMemUpdate = 0;
 
+#if LOG_FIFO_CMDS
 		// Debugging
 		vector<CmdData> prevCmds;
+#endif
 
 		while (cmdStart < frame.fifoDataSize)
 		{
@@ -75,7 +76,7 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 
 			u32 cmdSize = DecodeCommand(&frame.fifoData[cmdStart]);
 
-#if (LOG_FIFO_CMDS)
+#if LOG_FIFO_CMDS
 			CmdData cmdData;
 			cmdData.offset = cmdStart;
 			cmdData.ptr = &frame.fifoData[cmdStart];
@@ -115,12 +116,10 @@ void FifoPlaybackAnalyzer::AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrame
 	u32 end = memUpdate.address + memUpdate.size;
 
 	// Remove portions of memUpdate that overlap with memory ranges that have been written by the GP
-	for (unsigned int i = 0; i < m_WrittenMemory.size(); ++i)
+	for (const auto& range : m_WrittenMemory)
 	{
-		const MemoryRange &range = m_WrittenMemory[i];
-		
 		if (range.begin < end &&
-			range.end > begin)
+		    range.end > begin)
 		{
 			s32 preSize = range.begin - begin;
 			s32 postSize = end - range.end;
@@ -159,7 +158,7 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 
 	int cmd = ReadFifo8(data);
 
-	switch(cmd)
+	switch (cmd)
 	{
 	case GX_NOP:
 	case 0x44:
@@ -210,9 +209,11 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 			BPCmd bp = FifoAnalyzer::DecodeBPCmd(cmd2, m_BpMem);
 
 			FifoAnalyzer::LoadBPReg(bp, m_BpMem);
-			
+
 			if (bp.address == BPMEM_TRIGGER_EFB_COPY)
+			{
 				StoreEfbCopyRegion();
+			}
 		}
 		break;
 
@@ -236,7 +237,7 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 		break;
 	}
 
-	return data - dataStart;
+	return (u32)(data - dataStart);
 }
 
 void FifoPlaybackAnalyzer::StoreEfbCopyRegion()
@@ -244,7 +245,7 @@ void FifoPlaybackAnalyzer::StoreEfbCopyRegion()
 	UPE_Copy peCopy = m_BpMem.triggerEFBCopy;
 
 	u32 copyfmt = peCopy.tp_realFormat();
-	bool bFromZBuffer = m_BpMem.zcontrol.pixel_format == PIXELFMT_Z24;
+	bool bFromZBuffer = m_BpMem.zcontrol.pixel_format == PEControl::Z24;
 	u32 address = bpmem.copyTexDest << 5;
 
 	u32 format = copyfmt;
@@ -258,9 +259,13 @@ void FifoPlaybackAnalyzer::StoreEfbCopyRegion()
 	{
 		format |= _GX_TF_ZTF;
 		if (copyfmt == 11)
+		{
 			format = GX_TF_Z16;
+		}
 		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
+		{
 			format |= _GX_TF_CTF;
+		}
 	}
 	else
 	{
@@ -285,17 +290,17 @@ void FifoPlaybackAnalyzer::StoreEfbCopyRegion()
 void FifoPlaybackAnalyzer::StoreWrittenRegion(u32 address, u32 size)
 {
 	u32 end = address + size;
-	vector<MemoryRange>::iterator newRangeIter = m_WrittenMemory.end();
-	
+	auto newRangeIter = m_WrittenMemory.end();
+
 	// Search for overlapping memory regions and expand them to include the new region
-	for (vector<MemoryRange>::iterator iter = m_WrittenMemory.begin(); iter != m_WrittenMemory.end();)
+	for (auto iter = m_WrittenMemory.begin(); iter != m_WrittenMemory.end();)
 	{
 		MemoryRange &range = *iter;
 
 		if (range.begin < end && range.end > address)
 		{
 			// range at iterator and new range overlap
-			
+
 			if (newRangeIter == m_WrittenMemory.end())
 			{
 				// Expand range to include the written region
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h
similarity index 79%
rename from Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h
rename to Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h
index f6df506947..67244c507e 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h
+++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h
@@ -1,16 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFOPLAYBACKANALYZER_H_
-#define _FIFOPLAYBACKANALYZER_H_
-
-#include "FifoAnalyzer.h"
-#include "FifoDataFile.h"
+#pragma once
 
 #include <string>
 #include <vector>
 
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+
 struct AnalyzedFrameInfo
 {
 	std::vector<u32> objectStarts;
@@ -33,7 +32,7 @@ private:
 	};
 
 	void AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrameInfo &frameInfo);
-	
+
 	u32 DecodeCommand(u8 *data);
 	void LoadBP(u32 value0);
 
@@ -47,5 +46,3 @@ private:
 	BPMemory m_BpMem;
 	FifoAnalyzer::CPMemory m_CpMem;
 };
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
similarity index 78%
rename from Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp
rename to Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index f660b41f9e..668748b5d9 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -1,22 +1,22 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FifoDataFile.h"
-#include "FifoPlayer.h"
+#include <algorithm>
+#include <mutex>
 
-#include "Common.h"
-#include "ConfigManager.h"
-#include "Core.h"
-#include "CoreTiming.h"
-#include "Host.h"
-
-#include "HW/GPFifo.h"
-#include "HW/Memmap.h"
-#include "HW/SystemTimers.h"
-#include "PowerPC/PowerPC.h"
-
-#include "BPMemory.h"
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Host.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "VideoCommon/BPMemory.h"
 
 FifoPlayer::~FifoPlayer()
 {
@@ -40,13 +40,13 @@ bool FifoPlayer::Open(const std::string& filename)
 	if (m_FileLoadedCb)
 		m_FileLoadedCb();
 
-	return (m_File != NULL);
+	return (m_File != nullptr);
 }
 
 void FifoPlayer::Close()
 {
 	delete m_File;
-	m_File = NULL;
+	m_File = nullptr;
 
 	m_FrameRangeStart = 0;
 	m_FrameRangeEnd = 0;
@@ -75,7 +75,7 @@ bool FifoPlayer::Play()
 				{
 					m_CurrentFrame = m_FrameRangeStart;
 
-					CoreTiming::downcount = 0;
+					PowerPC::ppcState.downcount = 0;
 					CoreTiming::Advance();
 				}
 				else
@@ -92,7 +92,7 @@ bool FifoPlayer::Play()
 				if (m_EarlyMemoryUpdates && m_CurrentFrame == m_FrameRangeStart)
 					WriteAllMemoryUpdates();
 
-				WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]);		
+				WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]);
 
 				++m_CurrentFrame;
 			}
@@ -105,7 +105,9 @@ bool FifoPlayer::Play()
 u32 FifoPlayer::GetFrameObjectCount()
 {
 	if (m_CurrentFrame < m_FrameInfo.size())
-		return m_FrameInfo[m_CurrentFrame].objectStarts.size();
+	{
+		return (u32)(m_FrameInfo[m_CurrentFrame].objectStarts.size());
+	}
 
 	return 0;
 }
@@ -157,9 +159,9 @@ FifoPlayer::FifoPlayer() :
 	m_ObjectRangeStart(0),
 	m_ObjectRangeEnd(10000),
 	m_EarlyMemoryUpdates(false),
-	m_FileLoadedCb(NULL),
-	m_FrameWrittenCb(NULL),
-	m_File(NULL)
+	m_FileLoadedCb(nullptr),
+	m_FrameWrittenCb(nullptr),
+	m_File(nullptr)
 {
 	m_Loop = SConfig::GetInstance().m_LocalCoreStartupParameter.bLoopFifoReplay;
 }
@@ -172,7 +174,7 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo
 	m_FrameFifoSize = frame.fifoDataSize;
 
 	// Determine start and end objects
-	u32 numObjects = info.objectStarts.size();
+	u32 numObjects = (u32)(info.objectStarts.size());
 	u32 drawStart = std::min(numObjects, m_ObjectRangeStart);
 	u32 drawEnd = std::min(numObjects - 1, m_ObjectRangeEnd);
 
@@ -181,7 +183,9 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo
 
 	// Skip memory updates during frame if true
 	if (m_EarlyMemoryUpdates)
-		memoryUpdate = frame.memoryUpdates.size();
+	{
+		memoryUpdate = (u32)(frame.memoryUpdates.size());
+	}
 
 	if (numObjects > 0)
 	{
@@ -256,19 +260,19 @@ void FifoPlayer::WriteAllMemoryUpdates()
 {
 	_assert_(m_File);
 
-	for (int frameNum = 0; frameNum < m_File->GetFrameCount(); ++frameNum)
+	for (u32 frameNum = 0; frameNum < m_File->GetFrameCount(); ++frameNum)
 	{
 		const FifoFrameInfo &frame = m_File->GetFrame(frameNum);
-		for (unsigned int i = 0; i < frame.memoryUpdates.size(); ++i)
+		for (auto& update : frame.memoryUpdates)
 		{
-			WriteMemory(frame.memoryUpdates[i]);
+			WriteMemory(update);
 		}
 	}
 }
 
 void FifoPlayer::WriteMemory(const MemoryUpdate& memUpdate)
 {
-	u8 *mem = NULL;
+	u8 *mem = nullptr;
 
 	if (memUpdate.address & 0x10000000)
 		mem = &Memory::m_pEXRAM[memUpdate.address & Memory::EXRAM_MASK];
@@ -291,26 +295,26 @@ void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end)
 		while (written < burstEnd)
 			GPFifo::FastWrite8(data[written++]);
 
-		GPFifo::Write8(data[written++], 0);
+		GPFifo::Write8(data[written++]);
 
 		// Advance core timing
 		u32 elapsedCycles = u32(((u64)written * m_CyclesPerFrame) / m_FrameFifoSize);
 		u32 cyclesUsed = elapsedCycles - m_ElapsedCycles;
 		m_ElapsedCycles = elapsedCycles;
 
-		CoreTiming::downcount -= cyclesUsed;
+		PowerPC::ppcState.downcount -= cyclesUsed;
 		CoreTiming::Advance();
 	}
 }
 
 void FifoPlayer::SetupFifo()
 {
-	WriteCP(0x02, 0);	// disable read, BP, interrupts
-	WriteCP(0x04, 7);	// clear overflow, underflow, metrics
+	WriteCP(0x02, 0); // disable read, BP, interrupts
+	WriteCP(0x04, 7); // clear overflow, underflow, metrics
 
 	const FifoFrameInfo& frame = m_File->GetFrame(m_CurrentFrame);
 
-	// Set fifo bounds	
+	// Set fifo bounds
 	WriteCP(0x20, frame.fifoStart);
 	WriteCP(0x22, frame.fifoStart >> 16);
 	WriteCP(0x24, frame.fifoEnd);
@@ -340,11 +344,22 @@ void FifoPlayer::SetupFifo()
 	FlushWGP();
 	WritePI(20, frame.fifoStart);
 
-	WriteCP(0x02, 17);	// enable read & GP link
+	WriteCP(0x02, 17); // enable read & GP link
 }
 
 void FifoPlayer::LoadMemory()
 {
+	UReg_MSR newMSR;
+	newMSR.DR = 1;
+	newMSR.IR = 1;
+	MSR = newMSR.Hex;
+	PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
+	PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
+	PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
+	PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
+
 	Memory::Clear();
 
 	SetupFifo();
@@ -368,7 +383,7 @@ void FifoPlayer::LoadMemory()
 		LoadCPReg(0x80 + i, regs[0x80 + i]);
 		LoadCPReg(0x90 + i, regs[0x90 + i]);
 	}
-	
+
 	for (int i = 0; i < 16; ++i)
 	{
 		LoadCPReg(0xa0 + i, regs[0xa0 + i]);
@@ -388,55 +403,55 @@ void FifoPlayer::LoadMemory()
 
 void FifoPlayer::WriteCP(u32 address, u16 value)
 {
-	Memory::Write_U16(value, 0xCC000000 | address);
+	PowerPC::Write_U16(value, 0xCC000000 | address);
 }
 
 void FifoPlayer::WritePI(u32 address, u32 value)
 {
-	Memory::Write_U32(value, 0xCC003000 | address);
+	PowerPC::Write_U32(value, 0xCC003000 | address);
 }
 
 void FifoPlayer::FlushWGP()
 {
 	// Send 31 0s through the WGP
 	for (int i = 0; i < 7; ++i)
-		GPFifo::Write32(0, 0);
-	GPFifo::Write16(0, 0);
-	GPFifo::Write8(0, 0);
+		GPFifo::Write32(0);
+	GPFifo::Write16(0);
+	GPFifo::Write8(0);
 
 	GPFifo::ResetGatherPipe();
 }
 
 void FifoPlayer::LoadBPReg(u8 reg, u32 value)
 {
-	GPFifo::Write8(0x61, 0); // load BP reg
+	GPFifo::Write8(0x61); // load BP reg
 
 	u32 cmd = (reg << 24) & 0xff000000;
 	cmd |= (value & 0x00ffffff);
-	GPFifo::Write32(cmd, 0);
+	GPFifo::Write32(cmd);
 }
 
 void FifoPlayer::LoadCPReg(u8 reg, u32 value)
 {
-	GPFifo::Write8(0x08, 0); // load CP reg
-	GPFifo::Write8(reg, 0);
-	GPFifo::Write32(value, 0);
+	GPFifo::Write8(0x08); // load CP reg
+	GPFifo::Write8(reg);
+	GPFifo::Write32(value);
 }
 
 void FifoPlayer::LoadXFReg(u16 reg, u32 value)
 {
-	GPFifo::Write8(0x10, 0); // load XF reg
-	GPFifo::Write32((reg & 0x0fff) | 0x1000, 0); // load 4 bytes into reg
-	GPFifo::Write32(value, 0);
+	GPFifo::Write8(0x10); // load XF reg
+	GPFifo::Write32((reg & 0x0fff) | 0x1000); // load 4 bytes into reg
+	GPFifo::Write32(value);
 }
 
 void FifoPlayer::LoadXFMem16(u16 address, u32 *data)
 {
 	// Loads 16 * 4 bytes in xf memory starting at address
-	GPFifo::Write8(0x10, 0); // load XF reg
-	GPFifo::Write32(0x000f0000 | (address & 0xffff), 0); // load 16 * 4 bytes into address
+	GPFifo::Write8(0x10); // load XF reg
+	GPFifo::Write32(0x000f0000 | (address & 0xffff)); // load 16 * 4 bytes into address
 	for (int i = 0; i < 16; ++i)
-		GPFifo::Write32(data[i], 0);
+		GPFifo::Write32(data[i]);
 }
 
 bool FifoPlayer::ShouldLoadBP(u8 address)
@@ -450,7 +465,7 @@ bool FifoPlayer::ShouldLoadBP(u8 address)
 	case BPMEM_LOADTLUT1:
 	case BPMEM_PERF1:
 		return false;
+	default:
+		return true;
 	}
-
-	return true;
 }
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h
similarity index 79%
rename from Source/Core/Core/Src/FifoPlayer/FifoPlayer.h
rename to Source/Core/Core/FifoPlayer/FifoPlayer.h
index bad936cca9..9a5eb2227c 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h
@@ -1,14 +1,14 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFOPLAYER_H_
-#define _FIFOPLAYER_H_
+#pragma once
 
-#include "FifoPlaybackAnalyzer.h"
 #include <string>
 #include <vector>
 
+#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
+
 class FifoDataFile;
 struct MemoryUpdate;
 struct AnalyzedFrameInfo;
@@ -29,22 +29,22 @@ public:
 	FifoDataFile *GetFile() { return m_File; }
 
 	u32 GetFrameObjectCount();
-	u32 GetCurrentFrameNum() { return m_CurrentFrame; }
+	u32 GetCurrentFrameNum() const { return m_CurrentFrame; }
 
-	const AnalyzedFrameInfo& GetAnalyzedFrameInfo(u32 frame) { return m_FrameInfo[frame]; }
+	const AnalyzedFrameInfo& GetAnalyzedFrameInfo(u32 frame) const { return m_FrameInfo[frame]; }
 
 	// Frame range
-	u32 GetFrameRangeStart() { return m_FrameRangeStart; }
+	u32 GetFrameRangeStart() const { return m_FrameRangeStart; }
 	void SetFrameRangeStart(u32 start);
 
-	u32 GetFrameRangeEnd() { return m_FrameRangeEnd; }
+	u32 GetFrameRangeEnd() const { return m_FrameRangeEnd; }
 	void SetFrameRangeEnd(u32 end);
 
 	// Object range
-	u32 GetObjectRangeStart() { return m_ObjectRangeStart; }
+	u32 GetObjectRangeStart() const { return m_ObjectRangeStart; }
 	void SetObjectRangeStart(u32 start) { m_ObjectRangeStart = start; }
 
-	u32 GetObjectRangeEnd() { return m_ObjectRangeEnd; }
+	u32 GetObjectRangeEnd() const { return m_ObjectRangeEnd; }
 	void SetObjectRangeEnd(u32 end)  { m_ObjectRangeEnd = end; }
 
 	// If enabled then all memory updates happen at once before the first frame
@@ -106,7 +106,5 @@ private:
 
 	FifoDataFile *m_File;
 
-	std::vector<AnalyzedFrameInfo> m_FrameInfo;	
+	std::vector<AnalyzedFrameInfo> m_FrameInfo;
 };
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
similarity index 93%
rename from Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp
rename to Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
index 293e062b2c..cb8f82350e 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
@@ -1,23 +1,24 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
-#include "FifoRecordAnalyzer.h"
-#include "FifoRecorder.h"
+#include <algorithm>
 
-#include "Core.h"
-#include "HW/Memmap.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/HW/Memmap.h"
 
-#include "OpcodeDecoding.h"
-#include "TextureDecoder.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/TextureDecoder.h"
 
 using namespace FifoAnalyzer;
 
 
 FifoRecordAnalyzer::FifoRecordAnalyzer() :
 	m_DrawingObject(false),
-	m_BpMem(NULL)
+	m_BpMem(nullptr)
 {
 }
 
@@ -60,7 +61,7 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 			u32 value = ReadFifo32(data);
 			FifoAnalyzer::LoadCPReg(cmd2, value, m_CpMem);
 		}
-		
+
 		break;
 
 	case GX_LOAD_XF_REG:
@@ -98,7 +99,7 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 
 			u32 cmd2 = ReadFifo32(data);
 			BPCmd bp = FifoAnalyzer::DecodeBPCmd(cmd2, *m_BpMem);
-			
+
 			if (bp.address == BPMEM_LOADTLUT1)
 				ProcessLoadTlut1();
 			if (bp.address == BPMEM_PRELOAD_MODE)
@@ -290,8 +291,8 @@ void FifoRecordAnalyzer::WriteTexMapMemory(int texMap, u32 &writtenTexMaps)
 		width >>= 1;
 		height >>= 1;
 
-		width = max(width, fmtWidth);
-		height = max(height, fmtHeight);
+		width = std::max(width, fmtWidth);
+		height = std::max(height, fmtHeight);
 		u32 size = (width * height * fmtDepth) >> 1;
 
 		textureSize += size;
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h
similarity index 75%
rename from Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h
rename to Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h
index 94e53b17ed..cc0268acdc 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h
+++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h
@@ -1,15 +1,14 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFORECORDANALYZER_H_
-#define _FIFORECORDANALYZER_H_
+#pragma once
 
-#include "FifoAnalyzer.h"
+#include "Common/CommonTypes.h"
 
-#include "Common.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 
-#include "BPMemory.h"
+#include "VideoCommon/BPMemory.h"
 
 class FifoRecordAnalyzer
 {
@@ -38,7 +37,5 @@ private:
 	bool m_DrawingObject;
 
 	BPMemory *m_BpMem;
-	FifoAnalyzer::CPMemory m_CpMem;	
+	FifoAnalyzer::CPMemory m_CpMem;
 };
-
-#endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
similarity index 85%
rename from Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp
rename to Source/Core/Core/FifoPlayer/FifoRecorder.cpp
index 26fb661162..17d8e94e08 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
@@ -1,30 +1,31 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "ConfigManager.h"
-#include "Core.h"
-#include "FifoRecorder.h"
-#include "Thread.h"
-#include "HW/Memmap.h"
+#include <algorithm>
+#include <mutex>
+
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/HW/Memmap.h"
 
 static FifoRecorder instance;
 static std::recursive_mutex sMutex;
 
-using namespace std;
-
 FifoRecorder::FifoRecorder() :
 	m_IsRecording(false),
 	m_WasRecording(false),
 	m_RequestedRecordingEnd(false),
 	m_RecordFramesRemaining(0),
-	m_FinishedCb(NULL),
-	m_File(NULL),
+	m_FinishedCb(nullptr),
+	m_File(nullptr),
 	m_SkipNextData(true),
 	m_SkipFutureData(true),
-	m_FrameEnded(false),	
-	m_Ram(NULL),
-	m_ExRam(NULL)
+	m_FrameEnded(false),
+	m_Ram(Memory::RAM_SIZE),
+	m_ExRam(Memory::EXRAM_SIZE)
 {
 }
 
@@ -38,22 +39,17 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
 	sMutex.lock();
 
 	delete m_File;
-	delete []m_Ram;
-	delete []m_ExRam;
 
 	m_File = new FifoDataFile;
-
-	m_Ram = new u8[Memory::RAM_SIZE];
-	m_ExRam = new u8[Memory::EXRAM_SIZE];
-	memset(m_Ram, 0, Memory::RAM_SIZE);
-	memset(m_ExRam, 0, Memory::EXRAM_SIZE);
+	std::fill(m_Ram.begin(), m_Ram.end(), 0);
+	std::fill(m_ExRam.begin(), m_ExRam.end(), 0);
 
 	m_File->SetIsWii(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii);
 
 	if (!m_IsRecording)
 	{
 		m_WasRecording = false;
-		m_IsRecording = true;		
+		m_IsRecording = true;
 		m_RecordFramesRemaining = numFrames;
 	}
 
@@ -83,12 +79,12 @@ void FifoRecorder::WriteGPCommand(u8 *data, u32 size)
 	if (m_FrameEnded && m_FifoData.size() > 0)
 	{
 		size_t dataSize = m_FifoData.size();
-		m_CurrentFrame.fifoDataSize = dataSize;
+		m_CurrentFrame.fifoDataSize = (u32)dataSize;
 		m_CurrentFrame.fifoData = new u8[dataSize];
-		memcpy(m_CurrentFrame.fifoData, &m_FifoData[0], dataSize);
+		memcpy(m_CurrentFrame.fifoData, m_FifoData.data(), dataSize);
 
 		sMutex.lock();
-		
+
 		// Copy frame to file
 		// The file will be responsible for freeing the memory allocated for each frame's fifoData
 		m_File->AddFrame(m_CurrentFrame);
@@ -129,14 +125,14 @@ void FifoRecorder::WriteMemory(u32 address, u32 size, MemoryUpdate::Type type)
 		// Record memory update
 		MemoryUpdate memUpdate;
 		memUpdate.address = address;
-		memUpdate.fifoPosition = m_FifoData.size();
+		memUpdate.fifoPosition = (u32)(m_FifoData.size());
 		memUpdate.size = size;
 		memUpdate.type = type;
-		memUpdate.data = new u8[size];		
+		memUpdate.data = new u8[size];
 		memcpy(memUpdate.data, newData, size);
 
 		m_CurrentFrame.memoryUpdates.push_back(memUpdate);
-	}	
+	}
 }
 
 void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
@@ -149,7 +145,7 @@ void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
 
 	m_CurrentFrame.fifoStart = fifoStart;
 	m_CurrentFrame.fifoEnd = fifoEnd;
-		
+
 	if (m_WasRecording)
 	{
 		// If recording a fixed number of frames then check if the end of the recording was reached
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h
similarity index 83%
rename from Source/Core/Core/Src/FifoPlayer/FifoRecorder.h
rename to Source/Core/Core/FifoPlayer/FifoRecorder.h
index 7641a9d7f1..f39c92bf03 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h
@@ -1,12 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _FIFORECORDER_H_
-#define _FIFORECORDER_H_
+#pragma once
 
-#include "FifoDataFile.h"
-#include "FifoRecordAnalyzer.h"
+#include <vector>
+
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 
 class FifoRecorder
 {
@@ -27,7 +28,7 @@ public:
 	void WriteGPCommand(u8 *data, u32 size);
 
 	void WriteMemory(u32 address, u32 size, MemoryUpdate::Type type);
-	
+
 	void EndFrame(u32 fifoStart, u32 fifoEnd);
 
 	// This function must be called before writing GP commands
@@ -35,7 +36,7 @@ public:
 	void SetVideoMemory(u32 *bpMem, u32 *cpMem, u32 *xfMem, u32 *xfRegs, u32 xfRegsSize);
 
 	// Checked once per frame prior to callng EndFrame()
-	bool IsRecording() { return m_IsRecording; }
+	bool IsRecording() const { return m_IsRecording; }
 
 	static FifoRecorder &GetInstance();
 
@@ -59,9 +60,7 @@ private:
 	bool m_FrameEnded;
 	FifoFrameInfo m_CurrentFrame;
 	std::vector<u8> m_FifoData;
-	u8 *m_Ram;
-	u8 *m_ExRam;
+	std::vector<u8> m_Ram;
+	std::vector<u8> m_ExRam;
 	FifoRecordAnalyzer m_RecordAnalyzer;
 };
-
-#endif
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
new file mode 100644
index 0000000000..77d9de7129
--- /dev/null
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -0,0 +1,191 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/GeckoCode.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace Gecko
+{
+
+static const u32 INSTALLER_BASE_ADDRESS = 0x80001800;
+static const u32 INSTALLER_END_ADDRESS = 0x80003000;
+
+// return true if a code exists
+bool GeckoCode::Exist(u32 address, u32 data) const
+{
+	for (const GeckoCode::Code& code : codes)
+	{
+		if (code.address == address && code.data == data)
+			return true;
+	}
+
+	return false;
+}
+
+// return true if the code is identical
+bool GeckoCode::Compare(const GeckoCode& compare) const
+{
+	if (codes.size() != compare.codes.size())
+		return false;
+
+	unsigned int exist = 0;
+
+	for (const GeckoCode::Code& code : codes)
+	{
+		if (compare.Exist(code.address, code.data))
+			exist++;
+	}
+
+	return exist == codes.size();
+}
+
+static bool code_handler_installed = false;
+// the currently active codes
+static std::vector<GeckoCode> active_codes;
+static std::mutex active_codes_lock;
+
+void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
+{
+	std::lock_guard<std::mutex> lk(active_codes_lock);
+
+	active_codes.clear();
+
+	// add enabled codes
+	for (const GeckoCode& gecko_code : gcodes)
+	{
+		if (gecko_code.enabled)
+		{
+			// TODO: apply modifiers
+			// TODO: don't need description or creator string, just takin up memory
+			active_codes.push_back(gecko_code);
+		}
+	}
+
+	code_handler_installed = false;
+}
+
+static bool InstallCodeHandler()
+{
+	std::string data;
+	std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER;
+	if (!File::ReadFileToString(_rCodeHandlerFilename, data))
+	{
+		NOTICE_LOG(ACTIONREPLAY, "Could not enable cheats because codehandler.bin was missing.");
+		return false;
+	}
+
+	u8 mmioAddr = 0xCC;
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		mmioAddr = 0xCD;
+	}
+
+	// Install code handler
+	for (size_t i = 0, e = data.length(); i < e; ++i)
+		PowerPC::HostWrite_U8(data[i], (u32)(INSTALLER_BASE_ADDRESS + i));
+
+	// Patch the code handler to the system starting up
+	for (unsigned int h = 0; h < data.length(); h += 4)
+	{
+		// Patch MMIO address
+		if (PowerPC::HostRead_U32(INSTALLER_BASE_ADDRESS + h) == (0x3f000000u | ((mmioAddr ^ 1) << 8)))
+		{
+			NOTICE_LOG(ACTIONREPLAY, "Patching MMIO access at %08x", INSTALLER_BASE_ADDRESS + h);
+			PowerPC::HostWrite_U32(0x3f000000u | mmioAddr << 8, INSTALLER_BASE_ADDRESS + h);
+		}
+	}
+
+	u32 codelist_base_address = INSTALLER_BASE_ADDRESS + (u32)data.length() - 8;
+	u32 codelist_end_address = INSTALLER_END_ADDRESS;
+
+	// Write a magic value to 'gameid' (codehandleronly does not actually read this).
+	PowerPC::HostWrite_U32(0xd01f1bad, INSTALLER_BASE_ADDRESS);
+
+	// Create GCT in memory
+	PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address);
+	PowerPC::HostWrite_U32(0x00d0c0de, codelist_base_address + 4);
+
+	std::lock_guard<std::mutex> lk(active_codes_lock);
+
+	int i = 0;
+
+	for (const GeckoCode& active_code : active_codes)
+	{
+		if (active_code.enabled)
+		{
+			for (const GeckoCode::Code& code : active_code.codes)
+			{
+				// Make sure we have enough memory to hold the code list
+				if ((codelist_base_address + 24 + i) < codelist_end_address)
+				{
+					PowerPC::HostWrite_U32(code.address, codelist_base_address + 8 + i);
+					PowerPC::HostWrite_U32(code.data, codelist_base_address + 12 + i);
+					i += 8;
+				}
+			}
+		}
+	}
+
+	PowerPC::HostWrite_U32(0xff000000, codelist_base_address + 8 + i);
+	PowerPC::HostWrite_U32(0x00000000, codelist_base_address + 12 + i);
+
+	// Turn on codes
+	PowerPC::HostWrite_U8(1, INSTALLER_BASE_ADDRESS + 7);
+
+	// Invalidate the icache and any asm codes
+	for (unsigned int j = 0; j < (INSTALLER_END_ADDRESS - INSTALLER_BASE_ADDRESS); j += 32)
+	{
+		PowerPC::ppcState.iCache.Invalidate(INSTALLER_BASE_ADDRESS + j);
+	}
+	for (unsigned int k = codelist_base_address; k < codelist_end_address; k += 32)
+	{
+		PowerPC::ppcState.iCache.Invalidate(k);
+	}
+	return true;
+}
+
+void RunCodeHandler()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats && active_codes.size() > 0)
+	{
+		if (!code_handler_installed || PowerPC::HostRead_U32(INSTALLER_BASE_ADDRESS) - 0xd01f1bad > 5)
+			code_handler_installed = InstallCodeHandler();
+
+		if (!code_handler_installed)
+		{
+			// A warning was already issued.
+			return;
+		}
+
+		if (PC == LR)
+		{
+			u32 oldLR = LR;
+			PowerPC::CoreMode oldMode = PowerPC::GetMode();
+
+			PC = INSTALLER_BASE_ADDRESS + 0xA8;
+			LR = 0;
+
+			// Execute the code handler in interpreter mode to track when it exits
+			PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
+
+			while (PC != 0)
+				PowerPC::SingleStep();
+
+			PowerPC::SetMode(oldMode);
+			PC = LR = oldLR;
+		}
+	}
+}
+
+} // namespace Gecko
diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h
new file mode 100644
index 0000000000..cf3c34b61a
--- /dev/null
+++ b/Source/Core/Core/GeckoCode.h
@@ -0,0 +1,47 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+namespace Gecko
+{
+
+	class GeckoCode
+	{
+	public:
+
+		GeckoCode() : enabled(false) {}
+
+		struct Code
+		{
+			Code() : address(0), data(0) {}
+
+			u32 address, data;
+
+			std::string original_line;
+
+			u32 GetAddress() const;
+		};
+
+		std::vector<Code> codes;
+		std::string name, creator;
+		std::vector<std::string> notes;
+
+		bool enabled;
+		bool user_defined;
+
+		bool Compare(const GeckoCode& compare) const;
+		bool Exist(u32 address, u32 data) const;
+	};
+
+	void SetActiveCodes(const std::vector<GeckoCode>& gcodes);
+	bool RunActiveCodes();
+	void RunCodeHandler();
+
+} // namespace Gecko
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
new file mode 100644
index 0000000000..6ea75cf64d
--- /dev/null
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -0,0 +1,152 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Core/GeckoCodeConfig.h"
+
+namespace Gecko
+{
+
+void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<GeckoCode>& gcodes)
+{
+	const IniFile* inis[2] = { &globalIni, &localIni };
+
+	for (const IniFile* ini : inis)
+	{
+		std::vector<std::string> lines;
+		ini->GetLines("Gecko", &lines, false);
+
+		GeckoCode gcode;
+
+		for (auto& line : lines)
+		{
+			if (line.empty())
+				continue;
+
+			std::istringstream ss(line);
+
+			switch ((line)[0])
+			{
+
+				// enabled or disabled code
+			case '+' :
+				ss.seekg(1);
+			case '$' :
+				if (gcode.name.size())
+					gcodes.push_back(gcode);
+				gcode = GeckoCode();
+				gcode.enabled = (1 == ss.tellg());  // silly
+				gcode.user_defined = (ini == &localIni);
+				ss.seekg(1, std::ios_base::cur);
+				// read the code name
+				std::getline(ss, gcode.name, '[');  // stop at [ character (beginning of contributor name)
+				gcode.name = StripSpaces(gcode.name);
+				// read the code creator name
+				std::getline(ss, gcode.creator, ']');
+				break;
+
+				// notes
+			case '*':
+				gcode.notes.push_back(std::string(++line.begin(), line.end()));
+				break;
+
+				// either part of the code, or an option choice
+			default :
+			{
+				GeckoCode::Code new_code;
+				// TODO: support options
+				new_code.original_line = line;
+				ss >> std::hex >> new_code.address >> new_code.data;
+				gcode.codes.push_back(new_code);
+			}
+				break;
+			}
+
+		}
+
+		// add the last code
+		if (gcode.name.size())
+		{
+			gcodes.push_back(gcode);
+		}
+
+		ini->GetLines("Gecko_Enabled", &lines, false);
+
+		for (const std::string& line : lines)
+		{
+			if (line.size() == 0 || line[0] != '$')
+			{
+				continue;
+			}
+			std::string name = line.substr(1);
+			for (GeckoCode& ogcode : gcodes)
+			{
+				if (ogcode.name == name)
+				{
+					ogcode.enabled = true;
+				}
+			}
+		}
+	}
+}
+
+// used by the SaveGeckoCodes function
+static void SaveGeckoCode(std::vector<std::string>& lines, std::vector<std::string>& enabledLines, const GeckoCode& gcode)
+{
+	if (gcode.enabled)
+		enabledLines.push_back("$" + gcode.name);
+
+	if (!gcode.user_defined)
+		return;
+
+	std::string name;
+
+	// save the name
+	name += '$';
+	name += gcode.name;
+
+	// save the creator name
+	if (gcode.creator.size())
+	{
+		name += " [";
+		name += gcode.creator;
+		name += ']';
+	}
+
+	lines.push_back(name);
+
+	// save all the code lines
+	for (const GeckoCode::Code& code : gcode.codes)
+	{
+		//ss << std::hex << codes_iter->address << ' ' << codes_iter->data;
+		//lines.push_back(StringFromFormat("%08X %08X", codes_iter->address, codes_iter->data));
+		lines.push_back(code.original_line);
+		//ss.clear();
+	}
+
+	// save the notes
+	for (const std::string& note : gcode.notes)
+		lines.push_back(std::string("*") + note);
+}
+
+void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
+{
+	std::vector<std::string> lines;
+	std::vector<std::string> enabledLines;
+
+	for (const GeckoCode& geckoCode : gcodes)
+	{
+		SaveGeckoCode(lines, enabledLines, geckoCode);
+	}
+
+	inifile.SetLines("Gecko", lines);
+	inifile.SetLines("Gecko_Enabled", enabledLines);
+}
+
+}
diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
new file mode 100644
index 0000000000..52ebbd8413
--- /dev/null
+++ b/Source/Core/Core/GeckoCodeConfig.h
@@ -0,0 +1,18 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include "Core/GeckoCode.h"
+
+class IniFile;
+
+namespace Gecko
+{
+
+void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<GeckoCode>& gcodes);
+void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes);
+
+}
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
new file mode 100644
index 0000000000..de205300ba
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -0,0 +1,169 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/HLE_Misc.h"
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+
+
+namespace HLE
+{
+
+using namespace PowerPC;
+
+typedef void (*TPatchFunction)();
+
+enum
+{
+	HLE_RETURNTYPE_BLR = 0,
+	HLE_RETURNTYPE_RFI = 1,
+};
+
+struct SPatch
+{
+	char m_szPatchName[128];
+	TPatchFunction PatchFunction;
+	int type;
+	int flags;
+};
+
+static const SPatch OSPatches[] =
+{
+	{ "FAKE_TO_SKIP_0",       HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
+
+	{ "PanicAlert",           HLE_Misc::HLEPanicAlert,         HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+
+	// Name doesn't matter, installed in CBoot::BootUp()
+	{ "HBReload",             HLE_Misc::HBReload,              HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
+
+	// Debug/OS Support
+	{ "OSPanic",              HLE_OS::HLE_OSPanic,             HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+
+	{ "OSReport",             HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "DEBUGPrint",           HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "WUD_DEBUGPrint",       HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "vprintf",              HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "printf",               HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "puts",                 HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf?
+	{ "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally)
+	{ "___blank",             HLE_OS::HLE_GeneralDebugPrint,   HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
+	{ "__write_console",      HLE_OS::HLE_write_console,       HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?)
+	{ "GeckoCodehandler",     HLE_Misc::HLEGeckoCodehandler,   HLE_HOOK_START,   HLE_TYPE_GENERIC },
+};
+
+static const SPatch OSBreakPoints[] =
+{
+	{ "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction },
+};
+
+void Patch(u32 addr, const char *hle_func_name)
+{
+	for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++)
+	{
+		if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name))
+		{
+			orig_instruction[addr] = i;
+			return;
+		}
+	}
+}
+
+void PatchFunctions()
+{
+	orig_instruction.clear();
+	for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++)
+	{
+		Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
+		if (symbol)
+		{
+			for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
+			{
+				orig_instruction[addr] = i;
+			}
+			INFO_LOG(OSHLE, "Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address);
+		}
+	}
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+	{
+		for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++)
+		{
+			Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
+			if (symbol)
+			{
+				PowerPC::breakpoints.Add(symbol->address, false);
+				INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address);
+			}
+		}
+	}
+
+	// CBreakPoints::AddBreakPoint(0x8000D3D0, false);
+}
+
+void Execute(u32 _CurrentPC, u32 _Instruction)
+{
+	unsigned int FunctionIndex = _Instruction & 0xFFFFF;
+	if ((FunctionIndex > 0) && (FunctionIndex < (sizeof(OSPatches) / sizeof(SPatch))))
+	{
+		OSPatches[FunctionIndex].PatchFunction();
+	}
+	else
+	{
+		PanicAlert("HLE system tried to call an undefined HLE function %i.", FunctionIndex);
+	}
+
+	// _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName);
+}
+
+u32 GetFunctionIndex(u32 addr)
+{
+	std::map<u32, u32>::const_iterator iter = orig_instruction.find(addr);
+	return (iter != orig_instruction.end()) ?  iter->second : 0;
+}
+
+int GetFunctionTypeByIndex(u32 index)
+{
+	return OSPatches[index].type;
+}
+
+int GetFunctionFlagsByIndex(u32 index)
+{
+	return OSPatches[index].flags;
+}
+
+bool IsEnabled(int flags)
+{
+	if (flags == HLE::HLE_TYPE_DEBUG && !SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging && PowerPC::GetMode() != MODE_INTERPRETER)
+		return false;
+
+	return true;
+}
+
+u32 UnPatch(const std::string& patchName)
+{
+	Symbol* symbol = g_symbolDB.GetSymbolFromName(patchName);
+
+	if (symbol)
+	{
+		for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
+		{
+			orig_instruction[addr] = 0;
+			PowerPC::ppcState.iCache.Invalidate(addr);
+		}
+		return symbol->address;
+	}
+
+	return 0;
+}
+
+}  // end of namespace HLE
diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h
new file mode 100644
index 0000000000..67568f5208
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+namespace HLE
+{
+	enum
+	{
+		HLE_HOOK_START   = 0,    // Hook the beginning of the function and execute the function afterwards
+		HLE_HOOK_REPLACE = 1,    // Replace the function with the HLE version
+		HLE_HOOK_NONE    = 2,    // Do not hook the function
+	};
+
+	enum
+	{
+		HLE_TYPE_GENERIC = 0,    // Miscellaneous function
+		HLE_TYPE_DEBUG   = 1,    // Debug output function
+	};
+
+	void PatchFunctions();
+
+	void Patch(u32 pc, const char *func_name);
+	u32 UnPatch(const std::string& patchName);
+	void Execute(u32 _CurrentPC, u32 _Instruction);
+
+	u32 GetFunctionIndex(u32 em_address);
+	int GetFunctionTypeByIndex(u32 index);
+	int GetFunctionFlagsByIndex(u32 index);
+
+	bool IsEnabled(int flags);
+
+	static std::map<u32, u32> orig_instruction;
+}
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
new file mode 100644
index 0000000000..6437ecf16c
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -0,0 +1,79 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/HLE_Misc.h"
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCCache.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
+
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/VolumeCreator.h"
+
+#include "VideoCommon/TextureCacheBase.h"
+
+namespace HLE_Misc
+{
+
+static std::string args;
+
+// If you just want to kill a function, one of the three following are usually appropriate.
+// According to the PPC ABI, the return value is always in r3.
+void UnimplementedFunction()
+{
+	NPC = LR;
+}
+
+// If you want a function to panic, you can rename it PanicAlert :p
+// Don't know if this is worth keeping.
+void HLEPanicAlert()
+{
+	::PanicAlert("HLE: PanicAlert %08x", LR);
+	NPC = LR;
+}
+
+void HBReload()
+{
+	// There isn't much we can do. Just stop cleanly.
+	PowerPC::Pause();
+	Host_Message(WM_USER_STOP);
+}
+
+void HLEGeckoCodehandler()
+{
+	// Work around the codehandler not properly invalidating the icache, but
+	// only the first few frames.
+	// (Project M uses a conditional to only apply patches after something has
+	// been read into memory, or such, so we do the first 5 frames.  More
+	// robust alternative would be to actually detect memory writes, but that
+	// would be even uglier.)
+	u32 magic = 0xd01f1bad;
+	u32 existing = PowerPC::HostRead_U32(0x80001800);
+	if (existing - magic == 5)
+	{
+		return;
+	}
+	else if (existing - magic > 5)
+	{
+		existing = magic;
+	}
+	PowerPC::HostWrite_U32(existing + 1, 0x80001800);
+	PowerPC::ppcState.iCache.Reset();
+}
+
+}
diff --git a/Source/Core/Core/HLE/HLE_Misc.h b/Source/Core/Core/HLE/HLE_Misc.h
new file mode 100644
index 0000000000..70565c2324
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE_Misc.h
@@ -0,0 +1,13 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace HLE_Misc
+{
+	void HLEPanicAlert();
+	void UnimplementedFunction();
+	void HBReload();
+	void HLEGeckoCodehandler();
+}
diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp
new file mode 100644
index 0000000000..03211444c1
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE_OS.cpp
@@ -0,0 +1,142 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace HLE_OS
+{
+
+void GetStringVA(std::string& _rOutBuffer, u32 strReg = 3);
+
+void HLE_OSPanic()
+{
+	std::string Error, Msg;
+	GetStringVA(Error);
+	GetStringVA(Msg, 5);
+
+	PanicAlert("OSPanic: %s: %s", Error.c_str(), Msg.c_str());
+	ERROR_LOG(OSREPORT, "%08x->%08x| OSPanic: %s: %s", LR, PC, Error.c_str(), Msg.c_str());
+
+	NPC = LR;
+}
+
+// Generalized func for just printing string pointed to by r3.
+void HLE_GeneralDebugPrint()
+{
+	std::string ReportMessage;
+	if (PowerPC::HostRead_U32(GPR(3)) > 0x80000000)
+	{
+		GetStringVA(ReportMessage, 4);
+	}
+	else
+	{
+		GetStringVA(ReportMessage);
+	}
+	NPC = LR;
+
+	//PanicAlert("(%08x->%08x) %s", LR, PC, ReportMessage.c_str());
+	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
+}
+
+// __write_console is slightly abnormal
+void HLE_write_console()
+{
+	std::string ReportMessage;
+	GetStringVA(ReportMessage, 4);
+	NPC = LR;
+
+	//PanicAlert("(%08x->%08x) %s", LR, PC, ReportMessage.c_str());
+	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
+}
+
+void GetStringVA(std::string& _rOutBuffer, u32 strReg)
+{
+	_rOutBuffer = "";
+	std::string ArgumentBuffer = "";
+	u32 ParameterCounter = strReg+1;
+	u32 FloatingParameterCounter = 1;
+	std::string string = PowerPC::HostGetString(GPR(strReg));
+
+	for(u32 i = 0; i < string.size(); i++)
+	{
+		if (string[i] == '%')
+		{
+			ArgumentBuffer = "%";
+			i++;
+			if (string[i] == '%')
+			{
+				_rOutBuffer += "%";
+				continue;
+			}
+			while (string[i] < 'A' || string[i] > 'z' || string[i] == 'l' || string[i] == '-')
+				ArgumentBuffer += string[i++];
+
+			ArgumentBuffer += string[i];
+
+			u64 Parameter;
+			if (ParameterCounter > 10)
+			{
+				Parameter = PowerPC::HostRead_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4));
+			}
+			else
+			{
+				if (string[i-1] == 'l' && string[i-2] == 'l') // hax, just seen this on sysmenu osreport
+				{
+					Parameter = GPR(++ParameterCounter);
+					Parameter = (Parameter<<32)|GPR(++ParameterCounter);
+				}
+				else // normal, 32bit
+					Parameter = GPR(ParameterCounter);
+			}
+			ParameterCounter++;
+
+			switch (string[i])
+			{
+			case 's':
+				_rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(), PowerPC::HostGetString((u32)Parameter).c_str());
+				break;
+
+			case 'd':
+			case 'i':
+			{
+				_rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(), Parameter);
+				break;
+			}
+
+			case 'f':
+			{
+				_rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(),
+												rPS0(FloatingParameterCounter));
+				FloatingParameterCounter++;
+				ParameterCounter--;
+				break;
+			}
+
+			case 'p':
+				// Override, so 64bit Dolphin prints 32bit pointers, since the ppc is 32bit :)
+				_rOutBuffer += StringFromFormat("%x", (u32)Parameter);
+				break;
+
+			default:
+				_rOutBuffer += StringFromFormat(ArgumentBuffer.c_str(), Parameter);
+				break;
+			}
+		}
+		else
+		{
+			_rOutBuffer += string[i];
+		}
+	}
+	if (!_rOutBuffer.empty() && _rOutBuffer[_rOutBuffer.length() - 1] == '\n')
+		_rOutBuffer.resize(_rOutBuffer.length() - 1);
+}
+
+}  // end of namespace HLE_OS
diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h
new file mode 100644
index 0000000000..0bf4f5c2ea
--- /dev/null
+++ b/Source/Core/Core/HLE/HLE_OS.h
@@ -0,0 +1,12 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace HLE_OS
+{
+	void HLE_GeneralDebugPrint();
+	void HLE_write_console();
+	void HLE_OSPanic();
+}
diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp
new file mode 100644
index 0000000000..9849127e54
--- /dev/null
+++ b/Source/Core/Core/HW/AudioInterface.cpp
@@ -0,0 +1,323 @@
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/*
+Here is a nice ascii overview of audio flow affected by this file:
+
+(RAM)---->[AI FIFO]---->[SRC]---->[Mixer]---->[DAC]---->(Speakers)
+                          ^
+                          |
+                      [L/R Volume]
+                           \
+(DVD)---->[Drive I/F]---->[SRC]---->[Counter]
+
+Notes:
+Output at "48KHz" is actually 48043Hz.
+Sample counter counts streaming stereo samples after upsampling.
+[DAC] causes [AI I/F] to read from RAM at rate selected by AIDFR.
+Each [SRC] will upsample a 32KHz source, or pass through the 48KHz
+  source. The [Mixer]/[DAC] only operate at 48KHz.
+
+AIS == disc streaming == DTK(Disk Track Player) == streaming audio, etc.
+
+Supposedly, the retail hardware only supports 48KHz streaming from
+  [Drive I/F]. However it's more likely that the hardware supports
+  32KHz streaming, and the upsampling is transparent to the user.
+  TODO check if anything tries to stream at 32KHz.
+
+The [Drive I/F] actually supports simultaneous requests for audio and
+  normal data. For this reason, we can't really get rid of the crit section.
+
+IMPORTANT:
+This file mainly deals with the [Drive I/F], however [AIDFR] controls
+  the rate at which the audio data is DMA'd from RAM into the [AI FIFO]
+  (and the speed at which the FIFO is read by its SRC). Everything else
+  relating to AID happens in DSP.cpp. It's kinda just bad hardware design.
+  TODO maybe the files should be merged?
+*/
+
+#include "AudioCommon/AudioCommon.h"
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+#include "Core/CoreTiming.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace AudioInterface
+{
+
+// Internal hardware addresses
+enum
+{
+	AI_CONTROL_REGISTER = 0x6C00,
+	AI_VOLUME_REGISTER  = 0x6C04,
+	AI_SAMPLE_COUNTER   = 0x6C08,
+	AI_INTERRUPT_TIMING = 0x6C0C,
+};
+
+enum
+{
+	AIS_32KHz = 0,
+	AIS_48KHz = 1,
+
+	AID_32KHz = 1,
+	AID_48KHz = 0
+};
+
+// AI Control Register
+union AICR
+{
+	AICR() { hex = 0;}
+	AICR(u32 _hex) { hex = _hex;}
+	struct
+	{
+		u32 PSTAT    : 1;  // sample counter/playback enable
+		u32 AISFR    : 1;  // AIS Frequency (0=32khz 1=48khz)
+		u32 AIINTMSK : 1;  // 0=interrupt masked 1=interrupt enabled
+		u32 AIINT    : 1;  // audio interrupt status
+		u32 AIINTVLD : 1;  // This bit controls whether AIINT is affected by the Interrupt Timing register
+		                      // matching the sample counter. Once set, AIINT will hold its last value
+		u32 SCRESET  : 1;  // write to reset counter
+		u32 AIDFR    : 1;  // AID Frequency (0=48khz 1=32khz)
+		u32          :25;
+	};
+	u32 hex;
+};
+
+// AI Volume Register
+union AIVR
+{
+	AIVR() { hex = 0;}
+	struct
+	{
+		u32 left  : 8;
+		u32 right : 8;
+		u32       :16;
+	};
+	u32 hex;
+};
+
+// STATE_TO_SAVE
+// Registers
+static AICR m_Control;
+static AIVR m_Volume;
+static u32 m_SampleCounter = 0;
+static u32 m_InterruptTiming = 0;
+
+static u64 g_LastCPUTime = 0;
+static u64 g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
+
+static unsigned int g_AISSampleRate = 48000;
+static unsigned int g_AIDSampleRate = 32000;
+
+void DoState(PointerWrap &p)
+{
+	p.DoPOD(m_Control);
+	p.DoPOD(m_Volume);
+	p.Do(m_SampleCounter);
+	p.Do(m_InterruptTiming);
+	p.Do(g_LastCPUTime);
+	p.Do(g_AISSampleRate);
+	p.Do(g_AIDSampleRate);
+	p.Do(g_CPUCyclesPerSample);
+}
+
+static void GenerateAudioInterrupt();
+static void UpdateInterrupts();
+static void IncreaseSampleCount(const u32 _uAmount);
+static u64 GetAIPeriod();
+static int et_AI;
+
+void Init()
+{
+	m_Control.hex = 0;
+	m_Control.AISFR = AIS_48KHz;
+	m_Volume.hex = 0;
+	m_SampleCounter = 0;
+	m_InterruptTiming = 0;
+
+	g_LastCPUTime = 0;
+	g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
+
+	g_AISSampleRate = 48000;
+	g_AIDSampleRate = 32000;
+
+	et_AI = CoreTiming::RegisterEvent("AICallback", Update);
+}
+
+void Shutdown()
+{
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	mmio->Register(base | AI_CONTROL_REGISTER,
+		MMIO::DirectRead<u32>(&m_Control.hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			AICR tmpAICtrl(val);
+
+
+			if (m_Control.AIINTMSK != tmpAICtrl.AIINTMSK)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTMSK to %d", tmpAICtrl.AIINTMSK);
+				m_Control.AIINTMSK = tmpAICtrl.AIINTMSK;
+			}
+
+			if (m_Control.AIINTVLD != tmpAICtrl.AIINTVLD)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTVLD to %d", tmpAICtrl.AIINTVLD);
+				m_Control.AIINTVLD = tmpAICtrl.AIINTVLD;
+			}
+
+			// Set frequency of streaming audio
+			if (tmpAICtrl.AISFR != m_Control.AISFR)
+			{
+				// AISFR rates below are intentionally inverted wrt yagcd
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmpAICtrl.AISFR ? "48khz":"32khz");
+				m_Control.AISFR = tmpAICtrl.AISFR;
+				g_AISSampleRate = tmpAICtrl.AISFR ? 48000 : 32000;
+				g_sound_stream->GetMixer()->SetStreamInputSampleRate(g_AISSampleRate);
+				g_CPUCyclesPerSample = SystemTimers::GetTicksPerSecond() / g_AISSampleRate;
+			}
+			// Set frequency of DMA
+			if (tmpAICtrl.AIDFR != m_Control.AIDFR)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmpAICtrl.AIDFR ? "32khz":"48khz");
+				m_Control.AIDFR = tmpAICtrl.AIDFR;
+				g_AIDSampleRate = tmpAICtrl.AIDFR ? 32000 : 48000;
+				g_sound_stream->GetMixer()->SetDMAInputSampleRate(g_AIDSampleRate);
+			}
+
+
+			// Streaming counter
+			if (tmpAICtrl.PSTAT != m_Control.PSTAT)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmpAICtrl.PSTAT ? "start":"stop");
+				m_Control.PSTAT = tmpAICtrl.PSTAT;
+				g_LastCPUTime = CoreTiming::GetTicks();
+
+				CoreTiming::RemoveEvent(et_AI);
+				CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
+			}
+
+			// AI Interrupt
+			if (tmpAICtrl.AIINT)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Clear AIS Interrupt");
+				m_Control.AIINT = 0;
+			}
+
+			// Sample Count Reset
+			if (tmpAICtrl.SCRESET)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Reset AIS sample counter");
+				m_SampleCounter = 0;
+
+				g_LastCPUTime = CoreTiming::GetTicks();
+			}
+
+			UpdateInterrupts();
+		})
+	);
+
+	mmio->Register(base | AI_VOLUME_REGISTER,
+		MMIO::DirectRead<u32>(&m_Volume.hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			m_Volume.hex = val;
+			g_sound_stream->GetMixer()->SetStreamingVolume(m_Volume.left, m_Volume.right);
+		})
+	);
+
+	mmio->Register(base | AI_SAMPLE_COUNTER,
+		MMIO::ComplexRead<u32>([](u32) {
+			Update(0, 0);
+			return m_SampleCounter;
+		}),
+		MMIO::DirectWrite<u32>(&m_SampleCounter)
+	);
+
+	mmio->Register(base | AI_INTERRUPT_TIMING,
+		MMIO::DirectRead<u32>(&m_InterruptTiming),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			DEBUG_LOG(AUDIO_INTERFACE, "AI_INTERRUPT_TIMING=%08x@%08x", val, PowerPC::ppcState.pc);
+			m_InterruptTiming = val;
+			CoreTiming::RemoveEvent(et_AI);
+			CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
+		})
+	);
+}
+
+static void UpdateInterrupts()
+{
+	ProcessorInterface::SetInterrupt(
+		ProcessorInterface::INT_CAUSE_AI, m_Control.AIINT & m_Control.AIINTMSK);
+}
+
+static void GenerateAudioInterrupt()
+{
+	m_Control.AIINT = 1;
+	UpdateInterrupts();
+}
+
+void GenerateAISInterrupt()
+{
+	GenerateAudioInterrupt();
+}
+
+static void IncreaseSampleCount(const u32 _iAmount)
+{
+	if (m_Control.PSTAT)
+	{
+		u32 old_SampleCounter = m_SampleCounter + 1;
+		m_SampleCounter += _iAmount;
+
+		if ((m_InterruptTiming - old_SampleCounter) <= (m_SampleCounter - old_SampleCounter))
+		{
+			DEBUG_LOG(AUDIO_INTERFACE, "GenerateAudioInterrupt %08x:%08x @ %08x m_Control.AIINTVLD=%d", m_SampleCounter, m_InterruptTiming, PowerPC::ppcState.pc, m_Control.AIINTVLD);
+			GenerateAudioInterrupt();
+		}
+	}
+}
+
+bool IsPlaying()
+{
+	return (m_Control.PSTAT == 1);
+}
+
+unsigned int GetAIDSampleRate()
+{
+	return g_AIDSampleRate;
+}
+
+void Update(u64 userdata, int cyclesLate)
+{
+	if (m_Control.PSTAT)
+	{
+		const u64 Diff = CoreTiming::GetTicks() - g_LastCPUTime;
+		if (Diff > g_CPUCyclesPerSample)
+		{
+			const u32 Samples = static_cast<u32>(Diff / g_CPUCyclesPerSample);
+			g_LastCPUTime += Samples * g_CPUCyclesPerSample;
+			IncreaseSampleCount(Samples);
+		}
+		CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2) - cyclesLate, et_AI);
+	}
+}
+
+u64 GetAIPeriod()
+{
+	u64 period = g_CPUCyclesPerSample * m_InterruptTiming;
+	if (period == 0)
+		period = 32000 * g_CPUCyclesPerSample;
+	return period;
+}
+
+} // end of namespace AudioInterface
diff --git a/Source/Core/Core/HW/AudioInterface.h b/Source/Core/Core/HW/AudioInterface.h
new file mode 100644
index 0000000000..ce7026599a
--- /dev/null
+++ b/Source/Core/Core/HW/AudioInterface.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// See CPP file for comments.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+namespace AudioInterface
+{
+
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+bool IsPlaying();
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+void Update(u64 userdata, int cyclesLate);
+
+// Get the audio rates (48000 or 32000 only)
+unsigned int GetAIDSampleRate();
+
+void GenerateAISInterrupt();
+
+}  // namespace
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp
new file mode 100644
index 0000000000..a990e985bc
--- /dev/null
+++ b/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp
@@ -0,0 +1,113 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <fcntl.h>
+
+#include "Common/StringUtil.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceEthernet.h"
+
+bool CEXIETHERNET::Activate()
+{
+	if (IsActivated())
+		return true;
+
+	// Assumes TunTap OS X is installed, and /dev/tun0 is not in use
+	// and readable / writable by the logged-in user
+
+	if ((fd = open("/dev/tap0", O_RDWR)) < 0)
+	{
+		ERROR_LOG(SP1, "Couldn't open /dev/tap0, unable to init BBA");
+		return false;
+	}
+
+	readEnabled.store(false);
+
+	INFO_LOG(SP1, "BBA initialized.");
+	return true;
+}
+
+void CEXIETHERNET::Deactivate()
+{
+	close(fd);
+	fd = -1;
+
+	readEnabled.store(false);
+	if (readThread.joinable())
+		readThread.join();
+}
+
+bool CEXIETHERNET::IsActivated()
+{
+	return fd != -1;
+}
+
+bool CEXIETHERNET::SendFrame(u8* frame, u32 size)
+{
+	INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
+
+	int writtenBytes = write(fd, frame, size);
+	if ((u32)writtenBytes != size)
+	{
+		ERROR_LOG(SP1, "SendFrame(): expected to write %d bytes, instead wrote %d",
+		          size, writtenBytes);
+		return false;
+	}
+	else
+	{
+		SendComplete();
+		return true;
+	}
+}
+
+static void ReadThreadHandler(CEXIETHERNET* self)
+{
+	while (true)
+	{
+		if (self->fd < 0)
+			return;
+
+		fd_set rfds;
+		FD_ZERO(&rfds);
+		FD_SET(self->fd, &rfds);
+
+		struct timeval timeout;
+		timeout.tv_sec = 0;
+		timeout.tv_usec = 50000;
+		if (select(self->fd + 1, &rfds, nullptr, nullptr, &timeout) <= 0)
+			continue;
+
+		int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE);
+		if (readBytes < 0)
+		{
+			ERROR_LOG(SP1, "Failed to read from BBA, err=%d", readBytes);
+		}
+		else if (self->readEnabled.load())
+		{
+			INFO_LOG(SP1, "Read data: %s", ArrayToString(self->mRecvBuffer, readBytes, 0x10).c_str());
+			self->mRecvBufferLength = readBytes;
+			self->RecvHandlePacket();
+		}
+	}
+}
+
+bool CEXIETHERNET::RecvInit()
+{
+	readThread = std::thread(ReadThreadHandler, this);
+	return true;
+}
+
+bool CEXIETHERNET::RecvStart()
+{
+	if (!readThread.joinable())
+		RecvInit();
+
+	readEnabled.store(true);
+	return true;
+}
+
+void CEXIETHERNET::RecvStop()
+{
+	readEnabled.store(false);
+}
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp
new file mode 100644
index 0000000000..be16f437eb
--- /dev/null
+++ b/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp
@@ -0,0 +1,172 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/StringUtil.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceEthernet.h"
+
+#ifdef __linux__
+#include <fcntl.h>
+#include <linux/if_tun.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#endif
+
+#define NOTIMPLEMENTED(Name) \
+	NOTICE_LOG(SP1, "CEXIETHERNET::%s not implemented for your UNIX", Name);
+
+bool CEXIETHERNET::Activate()
+{
+#ifdef __linux__
+	if (IsActivated())
+		return true;
+
+	// Assumes that there is a TAP device named "Dolphin" preconfigured for
+	// bridge/NAT/whatever the user wants it configured.
+
+	if ((fd = open("/dev/net/tun", O_RDWR)) < 0)
+	{
+		ERROR_LOG(SP1, "Couldn't open /dev/net/tun, unable to init BBA");
+		return false;
+	}
+
+	struct ifreq ifr;
+	memset(&ifr, 0, sizeof(ifr));
+	ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE;
+
+	strncpy(ifr.ifr_name, "Dolphin", IFNAMSIZ);
+
+	int err;
+	if ((err = ioctl(fd, TUNSETIFF, (void*)&ifr)) < 0)
+	{
+		close(fd);
+		fd = -1;
+		ERROR_LOG(SP1, "TUNSETIFF failed: err=%d", err);
+		return false;
+	}
+	ioctl(fd, TUNSETNOCSUM, 1);
+
+	readEnabled.store(false);
+
+	INFO_LOG(SP1, "BBA initialized with associated tap %s", ifr.ifr_name);
+	return true;
+#else
+	NOTIMPLEMENTED("Activate");
+	return false;
+#endif
+}
+
+void CEXIETHERNET::Deactivate()
+{
+#ifdef __linux__
+	close(fd);
+	fd = -1;
+
+	readEnabled.store(false);
+	if (readThread.joinable())
+		readThread.join();
+#else
+	NOTIMPLEMENTED("Deactivate");
+#endif
+}
+
+bool CEXIETHERNET::IsActivated()
+{
+#ifdef __linux__
+	return fd != -1 ? true : false;
+#else
+	return false;
+#endif
+}
+
+bool CEXIETHERNET::SendFrame(u8* frame, u32 size)
+{
+#ifdef __linux__
+	INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
+
+	int writtenBytes = write(fd, frame, size);
+	if ((u32)writtenBytes != size)
+	{
+		ERROR_LOG(SP1, "SendFrame(): expected to write %d bytes, instead wrote %d",
+		          size, writtenBytes);
+		return false;
+	}
+	else
+	{
+		SendComplete();
+		return true;
+	}
+#else
+	NOTIMPLEMENTED("SendFrame");
+	return false;
+#endif
+}
+
+static void ReadThreadHandler(CEXIETHERNET* self)
+{
+	while (true)
+	{
+		if (self->fd < 0)
+			return;
+
+		fd_set rfds;
+		FD_ZERO(&rfds);
+		FD_SET(self->fd, &rfds);
+
+		struct timeval timeout;
+		timeout.tv_sec = 0;
+		timeout.tv_usec = 50000;
+		if (select(self->fd + 1, &rfds, nullptr, nullptr, &timeout) <= 0)
+			continue;
+
+		int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE);
+		if (readBytes < 0)
+		{
+			ERROR_LOG(SP1, "Failed to read from BBA, err=%d", readBytes);
+		}
+		else if (self->readEnabled.load())
+		{
+			INFO_LOG(SP1, "Read data: %s", ArrayToString(self->mRecvBuffer, readBytes, 0x10).c_str());
+			self->mRecvBufferLength = readBytes;
+			self->RecvHandlePacket();
+		}
+	}
+}
+
+bool CEXIETHERNET::RecvInit()
+{
+#ifdef __linux__
+	readThread = std::thread(ReadThreadHandler, this);
+	return true;
+#else
+	NOTIMPLEMENTED("RecvInit");
+	return false;
+#endif
+}
+
+bool CEXIETHERNET::RecvStart()
+{
+#ifdef __linux__
+	if (!readThread.joinable())
+		RecvInit();
+
+	readEnabled.store(true);
+	return true;
+#else
+	NOTIMPLEMENTED("RecvStart");
+	return false;
+#endif
+}
+
+void CEXIETHERNET::RecvStop()
+{
+#ifdef __linux__
+	readEnabled.store(false);
+#else
+	NOTIMPLEMENTED("RecvStop");
+#endif
+}
diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
similarity index 90%
rename from Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
rename to Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
index a444ca63cb..696cf8b2e5 100644
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
+++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
@@ -1,13 +1,12 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "StringUtil.h"
-#include "../Memmap.h"
-// GROSS CODE ALERT: headers need to be included in the following order
-#include "TAP_Win32.h"
-#include "../EXI_Device.h"
-#include "../EXI_DeviceEthernet.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/BBA-TAP/TAP_Win32.h"
 
 namespace Win32TAPHelper
 {
@@ -36,7 +35,7 @@ bool IsTAPDevice(const TCHAR *guid)
 		DWORD data_type;
 
 		len = sizeof(enum_name);
-		status = RegEnumKeyEx(netcard_key, i, enum_name, &len, NULL, NULL, NULL, NULL);
+		status = RegEnumKeyEx(netcard_key, i, enum_name, &len, nullptr, nullptr, nullptr, nullptr);
 
 		if (status == ERROR_NO_MORE_ITEMS)
 			break;
@@ -54,13 +53,13 @@ bool IsTAPDevice(const TCHAR *guid)
 		else
 		{
 			len = sizeof(component_id);
-			status = RegQueryValueEx(unit_key, component_id_string, NULL,
+			status = RegQueryValueEx(unit_key, component_id_string, nullptr,
 				&data_type, (LPBYTE)component_id, &len);
 
 			if (!(status != ERROR_SUCCESS || data_type != REG_SZ))
 			{
 				len = sizeof(net_cfg_instance_id);
-				status = RegQueryValueEx(unit_key, net_cfg_instance_id_string, NULL,
+				status = RegQueryValueEx(unit_key, net_cfg_instance_id_string, nullptr,
 					&data_type, (LPBYTE)net_cfg_instance_id, &len);
 
 				if (status == ERROR_SUCCESS && data_type == REG_SZ)
@@ -95,7 +94,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
 
 	if (status != ERROR_SUCCESS)
 		return false;
-	
+
 	while (!found_all)
 	{
 		TCHAR enum_name[256];
@@ -107,7 +106,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
 
 		len = sizeof(enum_name);
 		status = RegEnumKeyEx(control_net_key, i, enum_name,
-			&len, NULL, NULL, NULL, NULL);
+			&len, nullptr, nullptr, nullptr, nullptr);
 
 		if (status == ERROR_NO_MORE_ITEMS)
 			break;
@@ -123,7 +122,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
 		if (status == ERROR_SUCCESS)
 		{
 			len = sizeof(name_data);
-			status = RegQueryValueEx(connection_key, name_string, NULL,
+			status = RegQueryValueEx(connection_key, name_string, nullptr,
 				&name_type, (LPBYTE)name_data, &len);
 
 			if (status != ERROR_SUCCESS || name_type != REG_SZ)
@@ -200,7 +199,7 @@ bool CEXIETHERNET::Activate()
 	/* get driver version info */
 	ULONG info[3];
 	if (DeviceIoControl(mHAdapter, TAP_IOCTL_GET_VERSION,
-		&info, sizeof(info), &info, sizeof(info), &len, NULL))
+		&info, sizeof(info), &info, sizeof(info), &len, nullptr))
 	{
 		INFO_LOG(SP1, "TAP-Win32 Driver Version %d.%d %s",
 			info[0], info[1], info[2] ? "(DEBUG)" : "");
@@ -218,7 +217,7 @@ bool CEXIETHERNET::Activate()
 	/* set driver media status to 'connected' */
 	ULONG status = TRUE;
 	if (!DeviceIoControl(mHAdapter, TAP_IOCTL_SET_MEDIA_STATUS,
-		&status, sizeof(status), &status, sizeof(status), &len, NULL))
+		&status, sizeof(status), &status, sizeof(status), &len, nullptr))
 	{
 		ERROR_LOG(SP1, "WARNING: The TAP-Win32 driver rejected a"
 			"TAP_IOCTL_SET_MEDIA_STATUS DeviceIoControl call.");
@@ -240,7 +239,7 @@ void CEXIETHERNET::Deactivate()
 }
 
 bool CEXIETHERNET::IsActivated()
-{ 
+{
 	return mHAdapter != INVALID_HANDLE_VALUE;
 }
 
@@ -266,14 +265,14 @@ bool CEXIETHERNET::SendFrame(u8 *frame, u32 size)
 
 	// Always report the packet as being sent successfully, even though it might be a lie
 	SendComplete();
-	
+
 	return true;
 }
 
 VOID CALLBACK CEXIETHERNET::ReadWaitCallback(PVOID lpParameter, BOOLEAN TimerFired)
 {
 	CEXIETHERNET* self = (CEXIETHERNET*)lpParameter;
-	
+
 	GetOverlappedResult(self->mHAdapter, &self->mReadOverlapped,
 		(LPDWORD)&self->mRecvBufferLength, false);
 
@@ -284,7 +283,7 @@ bool CEXIETHERNET::RecvInit()
 {
 	// Set up recv event
 
-	if ((mHRecvEvent = CreateEvent(NULL, false, false, NULL)) == NULL)
+	if ((mHRecvEvent = CreateEvent(nullptr, false, false, nullptr)) == nullptr)
 	{
 		ERROR_LOG(SP1, "Failed to create recv event:%x", GetLastError());
 		return false;
@@ -332,7 +331,7 @@ void CEXIETHERNET::RecvStop()
 		return;
 
 	UnregisterWaitEx(mHReadWait, INVALID_HANDLE_VALUE);
-	
+
 	CloseHandle(mHRecvEvent);
 	mHRecvEvent = INVALID_HANDLE_VALUE;
 }
diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.h b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
similarity index 100%
rename from Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.h
rename to Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
index 2a5bc52ffa..21cfcc71b8 100644
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.h
+++ b/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
@@ -31,8 +31,8 @@
 // the TAP-Win32 driver and contains definitions
 // common to both.
 //===============================================
-#include <windows.h>
 #include <stdlib.h>
+#include <windows.h>
 #include <winioctl.h>
 #define TAP_WIN32_MIN_MAJOR 9
 #define TAP_WIN32_MIN_MINOR 0
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
new file mode 100644
index 0000000000..b09e071d98
--- /dev/null
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -0,0 +1,169 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+
+#include "AudioCommon/AudioCommon.h"
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Core/Core.h"
+#include "Core/DSPEmulator.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace
+{
+	static Common::Event m_StepEvent;
+	static Common::Event *m_SyncEvent = nullptr;
+	static std::mutex m_csCpuOccupied;
+}
+
+void CCPU::Init(int cpu_core)
+{
+	PowerPC::Init(cpu_core);
+	m_SyncEvent = nullptr;
+}
+
+void CCPU::Shutdown()
+{
+	PowerPC::Shutdown();
+	m_SyncEvent = nullptr;
+}
+
+void CCPU::Run()
+{
+	std::lock_guard<std::mutex> lk(m_csCpuOccupied);
+	Host_UpdateDisasmDialog();
+
+	while (true)
+	{
+		switch (PowerPC::GetState())
+		{
+		case PowerPC::CPU_RUNNING:
+			//1: enter a fast runloop
+			PowerPC::RunLoop();
+			break;
+
+		case PowerPC::CPU_STEPPING:
+			m_csCpuOccupied.unlock();
+
+			//1: wait for step command..
+			m_StepEvent.Wait();
+
+			m_csCpuOccupied.lock();
+			if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
+				return;
+			if (PowerPC::GetState() != PowerPC::CPU_STEPPING)
+				continue;
+
+			//3: do a step
+			PowerPC::SingleStep();
+
+			//4: update disasm dialog
+			if (m_SyncEvent)
+			{
+				m_SyncEvent->Set();
+				m_SyncEvent = nullptr;
+			}
+			Host_UpdateDisasmDialog();
+			break;
+
+		case PowerPC::CPU_POWERDOWN:
+			//1: Exit loop!!
+			return;
+		}
+	}
+}
+
+void CCPU::Stop()
+{
+	PowerPC::Stop();
+	m_StepEvent.Set();
+}
+
+bool CCPU::IsStepping()
+{
+	return PowerPC::GetState() == PowerPC::CPU_STEPPING;
+}
+
+void CCPU::Reset()
+{
+}
+
+void CCPU::StepOpcode(Common::Event *event)
+{
+	m_StepEvent.Set();
+	if (PowerPC::GetState() == PowerPC::CPU_STEPPING)
+	{
+		m_SyncEvent = event;
+	}
+}
+
+void CCPU::EnableStepping(const bool _bStepping)
+{
+	if (_bStepping)
+	{
+		PowerPC::Pause();
+		m_StepEvent.Reset();
+		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE);
+		AudioCommon::ClearAudioBuffer(true);
+	}
+	else
+	{
+		// SingleStep so that the "continue", "step over" and "step out" debugger functions
+		// work when the PC is at a breakpoint at the beginning of the block
+		// If watchpoints are enabled, any instruction could be a breakpoint.
+		bool could_be_bp;
+#ifdef ENABLE_MEM_CHECK
+		could_be_bp = true;
+#else
+		could_be_bp = PowerPC::breakpoints.IsAddressBreakPoint(PC);
+#endif
+		if (could_be_bp && PowerPC::GetMode() != PowerPC::MODE_INTERPRETER)
+		{
+			PowerPC::CoreMode oldMode = PowerPC::GetMode();
+			PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
+			PowerPC::SingleStep();
+			PowerPC::SetMode(oldMode);
+		}
+		PowerPC::Start();
+		m_StepEvent.Set();
+		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PLAY);
+		AudioCommon::ClearAudioBuffer(false);
+	}
+}
+
+void CCPU::Break()
+{
+	EnableStepping(true);
+}
+
+bool CCPU::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	bool wasUnpaused = !IsStepping();
+	if (doLock)
+	{
+		// we can't use EnableStepping, that would causes deadlocks with both audio and video
+		PowerPC::Pause();
+		if (!Core::IsCPUThread())
+			m_csCpuOccupied.lock();
+	}
+	else
+	{
+		if (unpauseOnUnlock)
+		{
+			PowerPC::Start();
+			m_StepEvent.Set();
+		}
+
+		if (!Core::IsCPUThread())
+			m_csCpuOccupied.unlock();
+	}
+	return wasUnpaused;
+}
diff --git a/Source/Core/Core/Src/HW/CPU.h b/Source/Core/Core/HW/CPU.h
similarity index 76%
rename from Source/Core/Core/Src/HW/CPU.h
rename to Source/Core/Core/HW/CPU.h
index 0b5508a94a..9475d93d6c 100644
--- a/Source/Core/Core/Src/HW/CPU.h
+++ b/Source/Core/Core/HW/CPU.h
@@ -1,11 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _CPU_H
-#define _CPU_H
+#pragma once
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 namespace Common {
 	class Event;
@@ -14,7 +13,7 @@ namespace Common {
 class CCPU
 {
 public:
-	// init 
+	// init
 	static void Init(int cpu_core);
 
 	// shutdown
@@ -24,18 +23,18 @@ public:
 	static void Run();
 
 	// causes shutdown
-	static void Stop(); 
+	static void Stop();
 	// Reset
 	static void Reset();
 
 	// StepOpcode (Steps one Opcode)
-	static void StepOpcode(Common::Event *event = 0);
+	static void StepOpcode(Common::Event *event = nullptr);
 
 	// one step only
 	static void SingleStep();
 
 	// Enable or Disable Stepping
-	static void EnableStepping(const bool _bStepping);	
+	static void EnableStepping(const bool _bStepping);
 
 	// break, same as EnableStepping(true).
 	static void Break();
@@ -48,9 +47,6 @@ public:
 	// calls must be balanced and non-recursive (once with doLock true, then once with doLock false).
 	// intended (but not required) to be called from another thread,
 	// e.g. when the GUI thread wants to make sure everything is paused so that it can create a savestate.
-	// the return value is whether the cpu was unpaused before the call.
+	// the return value is whether the CPU was unpaused before the call.
 	static bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
 };
-
-#endif
-
diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
new file mode 100644
index 0000000000..dfe2033f60
--- /dev/null
+++ b/Source/Core/Core/HW/DSP.cpp
@@ -0,0 +1,679 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// AID / AUDIO_DMA controls pushing audio out to the SRC and then the speakers.
+// The audio DMA pushes audio through a small FIFO 32 bytes at a time, as
+// needed.
+
+// The SRC behind the fifo eats stereo 16-bit data at a sample rate of 32khz,
+// that is, 4 bytes at 32 khz, which is 32 bytes at 4 khz. We thereforce
+// schedule an event that runs at 4khz, that eats audio from the fifo. Thus, we
+// have homebrew audio.
+
+// The AID interrupt is set when the fifo STARTS a transfer. It latches address
+// and count into internal registers and starts copying. This means that the
+// interrupt handler can simply set the registers to where the next buffer is,
+// and start filling it. When the DMA is complete, it will automatically
+// relatch and fire a new interrupt.
+
+// Then there's the DSP... what likely happens is that the
+// fifo-latched-interrupt handler kicks off the DSP, requesting it to fill up
+// the just used buffer through the AXList (or whatever it might be called in
+// Nintendo games).
+
+#include "AudioCommon/AudioCommon.h"
+
+#include "Common/MemoryUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/DSPEmulator.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace DSP
+{
+
+// register offsets
+enum
+{
+	DSP_MAIL_TO_DSP_HI      = 0x5000,
+	DSP_MAIL_TO_DSP_LO      = 0x5002,
+	DSP_MAIL_FROM_DSP_HI    = 0x5004,
+	DSP_MAIL_FROM_DSP_LO    = 0x5006,
+	DSP_CONTROL             = 0x500A,
+	DSP_INTERRUPT_CONTROL   = 0x5010,
+	AR_INFO                 = 0x5012,  // These names are a good guess at best
+	AR_MODE                 = 0x5016,  //
+	AR_REFRESH              = 0x501a,
+	AR_DMA_MMADDR_H         = 0x5020,
+	AR_DMA_MMADDR_L         = 0x5022,
+	AR_DMA_ARADDR_H         = 0x5024,
+	AR_DMA_ARADDR_L         = 0x5026,
+	AR_DMA_CNT_H            = 0x5028,
+	AR_DMA_CNT_L            = 0x502A,
+	AUDIO_DMA_START_HI      = 0x5030,
+	AUDIO_DMA_START_LO      = 0x5032,
+	AUDIO_DMA_BLOCKS_LENGTH = 0x5034,  // Ever used?
+	AUDIO_DMA_CONTROL_LEN   = 0x5036,
+	AUDIO_DMA_BLOCKS_LEFT   = 0x503A,
+};
+
+// UARAMCount
+union UARAMCount
+{
+	u32 Hex;
+	struct
+	{
+		u32 count : 31;
+		u32 dir   : 1; // 0: MRAM -> ARAM 1: ARAM -> MRAM
+	};
+};
+
+// Blocks are 32 bytes.
+union UAudioDMAControl
+{
+	u16 Hex;
+	struct
+	{
+		u16 NumBlocks  : 15;
+		u16 Enable     : 1;
+	};
+
+	UAudioDMAControl(u16 _Hex = 0) : Hex(_Hex)
+	{}
+};
+
+// AudioDMA
+struct AudioDMA
+{
+	u32 current_source_address;
+	u16 remaining_blocks_count;
+	u32 SourceAddress;
+	UAudioDMAControl AudioDMAControl;
+
+	AudioDMA():
+		current_source_address(0),
+		remaining_blocks_count(0),
+		SourceAddress(0),
+		AudioDMAControl(0)
+	{
+	}
+};
+
+// ARAM_DMA
+struct ARAM_DMA
+{
+	u32 MMAddr;
+	u32 ARAddr;
+	UARAMCount Cnt;
+
+	ARAM_DMA()
+	{
+		MMAddr = 0;
+		ARAddr = 0;
+		Cnt.Hex = 0;
+	}
+};
+
+// So we may abstract GC/Wii differences a little
+struct ARAMInfo
+{
+	bool wii_mode; // Wii EXRAM is managed in Memory:: so we need to skip statesaving, etc
+	u32 size;
+	u32 mask;
+	u8* ptr; // aka audio ram, auxiliary ram, MEM2, EXRAM, etc...
+
+	// Default to GC mode
+	ARAMInfo()
+	{
+		wii_mode = false;
+		size = ARAM_SIZE;
+		mask = ARAM_MASK;
+		ptr = nullptr;
+	}
+};
+
+// STATE_TO_SAVE
+static ARAMInfo g_ARAM;
+static UDSPControl g_dspState;
+static AudioDMA g_audioDMA;
+static ARAM_DMA g_arDMA;
+static u32 last_mmaddr;
+static u32 last_aram_dma_count;
+static bool instant_dma;
+
+union ARAM_Info
+{
+	u16 Hex;
+	struct
+	{
+		u16 size : 6;
+		u16 unk  : 1;
+		u16      : 9;
+	};
+};
+static ARAM_Info g_ARAM_Info;
+// Contains bitfields for some stuff we don't care about (and nothing ever reads):
+//  CAS latency/burst length/addressing mode/write mode
+// We care about the LSB tho. It indicates that the ARAM controller has finished initializing
+static u16 g_AR_MODE;
+static u16 g_AR_REFRESH;
+
+static DSPEmulator *dsp_emulator;
+
+static int dsp_slice = 0;
+static bool dsp_is_lle = false;
+
+// time given to LLE DSP on every read of the high bits in a mailbox
+static const int DSP_MAIL_SLICE=72;
+
+void DoState(PointerWrap &p)
+{
+	if (!g_ARAM.wii_mode)
+		p.DoArray(g_ARAM.ptr, g_ARAM.size);
+	p.DoPOD(g_dspState);
+	p.DoPOD(g_audioDMA);
+	p.DoPOD(g_arDMA);
+	p.Do(g_ARAM_Info);
+	p.Do(g_AR_MODE);
+	p.Do(g_AR_REFRESH);
+	p.Do(dsp_slice);
+	p.Do(last_mmaddr);
+	p.Do(last_aram_dma_count);
+	p.Do(instant_dma);
+
+	dsp_emulator->DoState(p);
+}
+
+
+static void UpdateInterrupts();
+static void Do_ARAM_DMA();
+static void GenerateDSPInterrupt(u64 DSPIntType, int cyclesLate = 0);
+
+static int et_GenerateDSPInterrupt;
+static int et_CompleteARAM;
+
+static void CompleteARAM(u64 userdata, int cyclesLate)
+{
+	g_dspState.DMAState = 0;
+	GenerateDSPInterrupt(INT_ARAM);
+}
+
+void EnableInstantDMA()
+{
+	CoreTiming::RemoveEvent(et_CompleteARAM);
+	CompleteARAM(0, 0);
+	instant_dma = true;
+}
+
+DSPEmulator *GetDSPEmulator()
+{
+	return dsp_emulator;
+}
+
+void Init(bool hle)
+{
+	dsp_emulator = CreateDSPEmulator(hle);
+	dsp_is_lle = dsp_emulator->IsLLE();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		g_ARAM.wii_mode = true;
+		g_ARAM.size = Memory::EXRAM_SIZE;
+		g_ARAM.mask = Memory::EXRAM_MASK;
+		g_ARAM.ptr = Memory::m_pEXRAM;
+	}
+	else
+	{
+		// On the GameCube, ARAM is accessible only through this interface.
+		g_ARAM.wii_mode = false;
+		g_ARAM.size = ARAM_SIZE;
+		g_ARAM.mask = ARAM_MASK;
+		g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size);
+	}
+
+	memset(&g_audioDMA, 0, sizeof(g_audioDMA));
+	memset(&g_arDMA, 0, sizeof(g_arDMA));
+
+	g_dspState.Hex = 0;
+	g_dspState.DSPHalt = 1;
+
+	g_ARAM_Info.Hex = 0;
+	g_AR_MODE = 1; // ARAM Controller has init'd
+	g_AR_REFRESH = 156; // 156MHz
+
+	instant_dma = false;
+
+	last_aram_dma_count = 0;
+	last_mmaddr = 0;
+
+	et_GenerateDSPInterrupt = CoreTiming::RegisterEvent("DSPint", GenerateDSPInterrupt);
+	et_CompleteARAM = CoreTiming::RegisterEvent("ARAMint", CompleteARAM);
+}
+
+void Shutdown()
+{
+	if (!g_ARAM.wii_mode)
+	{
+		FreeMemoryPages(g_ARAM.ptr, g_ARAM.size);
+		g_ARAM.ptr = nullptr;
+	}
+
+	dsp_emulator->Shutdown();
+	delete dsp_emulator;
+	dsp_emulator = nullptr;
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	// Declare all the boilerplate direct MMIOs.
+	struct
+	{
+		u32 addr;
+		u16* ptr;
+		bool align_writes_on_32_bytes;
+	} directly_mapped_vars[] = {
+		{ AR_INFO, &g_ARAM_Info.Hex },
+		{ AR_MODE, &g_AR_MODE },
+		{ AR_REFRESH, &g_AR_REFRESH },
+		{ AR_DMA_MMADDR_H, MMIO::Utils::HighPart(&g_arDMA.MMAddr) },
+		{ AR_DMA_MMADDR_L, MMIO::Utils::LowPart(&g_arDMA.MMAddr), true },
+		{ AR_DMA_ARADDR_H, MMIO::Utils::HighPart(&g_arDMA.ARAddr) },
+		{ AR_DMA_ARADDR_L, MMIO::Utils::LowPart(&g_arDMA.ARAddr), true },
+		{ AR_DMA_CNT_H, MMIO::Utils::HighPart(&g_arDMA.Cnt.Hex) },
+		// AR_DMA_CNT_L triggers DMA
+		{ AUDIO_DMA_START_HI, MMIO::Utils::HighPart(&g_audioDMA.SourceAddress) },
+		{ AUDIO_DMA_START_LO, MMIO::Utils::LowPart(&g_audioDMA.SourceAddress) },
+	};
+	for (auto& mapped_var : directly_mapped_vars)
+	{
+		u16 write_mask = mapped_var.align_writes_on_32_bytes ? 0xFFE0 : 0xFFFF;
+		mmio->Register(base | mapped_var.addr,
+			MMIO::DirectRead<u16>(mapped_var.ptr),
+			MMIO::DirectWrite<u16>(mapped_var.ptr, write_mask)
+		);
+	}
+
+	// DSP mail MMIOs call DSP emulator functions to get results or write data.
+	mmio->Register(base | DSP_MAIL_TO_DSP_HI,
+		MMIO::ComplexRead<u16>([](u32) {
+			if (dsp_slice > DSP_MAIL_SLICE && dsp_is_lle)
+			{
+				dsp_emulator->DSP_Update(DSP_MAIL_SLICE);
+				dsp_slice -= DSP_MAIL_SLICE;
+			}
+			return dsp_emulator->DSP_ReadMailBoxHigh(true);
+		}),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			dsp_emulator->DSP_WriteMailBoxHigh(true, val);
+		})
+	);
+	mmio->Register(base | DSP_MAIL_TO_DSP_LO,
+		MMIO::ComplexRead<u16>([](u32) {
+			return dsp_emulator->DSP_ReadMailBoxLow(true);
+		}),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			dsp_emulator->DSP_WriteMailBoxLow(true, val);
+		})
+	);
+	mmio->Register(base | DSP_MAIL_FROM_DSP_HI,
+		MMIO::ComplexRead<u16>([](u32) {
+			if (dsp_slice > DSP_MAIL_SLICE && dsp_is_lle)
+			{
+				dsp_emulator->DSP_Update(DSP_MAIL_SLICE);
+				dsp_slice -= DSP_MAIL_SLICE;
+			}
+			return dsp_emulator->DSP_ReadMailBoxHigh(false);
+		}),
+		MMIO::InvalidWrite<u16>()
+	);
+	mmio->Register(base | DSP_MAIL_FROM_DSP_LO,
+		MMIO::ComplexRead<u16>([](u32) {
+			return dsp_emulator->DSP_ReadMailBoxLow(false);
+		}),
+		MMIO::InvalidWrite<u16>()
+	);
+
+	mmio->Register(base | DSP_CONTROL,
+		MMIO::ComplexRead<u16>([](u32) {
+			return (g_dspState.Hex & ~DSP_CONTROL_MASK) |
+			       (dsp_emulator->DSP_ReadControlRegister() & DSP_CONTROL_MASK);
+		}),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UDSPControl tmpControl;
+			tmpControl.Hex = (val & ~DSP_CONTROL_MASK) |
+				(dsp_emulator->DSP_WriteControlRegister(val) & DSP_CONTROL_MASK);
+
+			// Not really sure if this is correct, but it works...
+			// Kind of a hack because DSP_CONTROL_MASK should make this bit
+			// only viewable to DSP emulator
+			if (val & 1 /*DSPReset*/)
+			{
+				g_audioDMA.AudioDMAControl.Hex = 0;
+			}
+
+			// Update DSP related flags
+			g_dspState.DSPReset     = tmpControl.DSPReset;
+			g_dspState.DSPAssertInt = tmpControl.DSPAssertInt;
+			g_dspState.DSPHalt      = tmpControl.DSPHalt;
+			g_dspState.DSPInit      = tmpControl.DSPInit;
+
+			// Interrupt (mask)
+			g_dspState.AID_mask  = tmpControl.AID_mask;
+			g_dspState.ARAM_mask = tmpControl.ARAM_mask;
+			g_dspState.DSP_mask  = tmpControl.DSP_mask;
+
+			// Interrupt
+			if (tmpControl.AID)  g_dspState.AID  = 0;
+			if (tmpControl.ARAM) g_dspState.ARAM = 0;
+			if (tmpControl.DSP)  g_dspState.DSP  = 0;
+
+			// unknown
+			g_dspState.DSPInitCode = tmpControl.DSPInitCode;
+			g_dspState.pad  = tmpControl.pad;
+			if (g_dspState.pad != 0)
+			{
+				PanicAlert("DSPInterface (w) g_dspState (CC00500A) gets a value with junk in the padding %08x", val);
+			}
+
+			UpdateInterrupts();
+		})
+	);
+
+	// ARAM MMIO controlling the DMA start.
+	mmio->Register(base | AR_DMA_CNT_L,
+		MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&g_arDMA.Cnt.Hex)),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			g_arDMA.Cnt.Hex = (g_arDMA.Cnt.Hex & 0xFFFF0000) | (val & ~31);
+			Do_ARAM_DMA();
+		})
+	);
+
+	// Audio DMA MMIO controlling the DMA start.
+	mmio->Register(base | AUDIO_DMA_CONTROL_LEN,
+		MMIO::DirectRead<u16>(&g_audioDMA.AudioDMAControl.Hex),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			bool already_enabled = g_audioDMA.AudioDMAControl.Enable;
+			g_audioDMA.AudioDMAControl.Hex = val;
+
+			// Only load new values if were not already doing a DMA transfer,
+			// otherwise just let the new values be autoloaded in when the
+			// current transfer ends.
+			if (!already_enabled && g_audioDMA.AudioDMAControl.Enable)
+			{
+				g_audioDMA.current_source_address = g_audioDMA.SourceAddress;
+				g_audioDMA.remaining_blocks_count = g_audioDMA.AudioDMAControl.NumBlocks;
+
+				// We make the samples ready as soon as possible
+				void *address = Memory::GetPointer(g_audioDMA.SourceAddress);
+				AudioCommon::SendAIBuffer((short*)address, g_audioDMA.AudioDMAControl.NumBlocks * 8);
+				CoreTiming::ScheduleEvent(80, et_GenerateDSPInterrupt, INT_AID);
+			}
+		})
+	);
+
+	// Audio DMA blocks remaining is invalid to write to, and requires logic on
+	// the read side.
+	mmio->Register(base | AUDIO_DMA_BLOCKS_LEFT,
+		MMIO::ComplexRead<u16>([](u32) {
+			// remaining_blocks_count is zero-based.  DreamMix World Fighters will hang if it never reaches zero.
+			return (g_audioDMA.remaining_blocks_count > 0 ? g_audioDMA.remaining_blocks_count - 1 : 0);
+		}),
+		MMIO::InvalidWrite<u16>()
+	);
+
+	// 32 bit reads/writes are a combination of two 16 bit accesses.
+	for (int i = 0; i < 0x1000; i += 4)
+	{
+		mmio->Register(base | i,
+			MMIO::ReadToSmaller<u32>(mmio, base | i, base | (i + 2)),
+			MMIO::WriteToSmaller<u32>(mmio, base | i, base | (i + 2))
+		);
+	}
+}
+
+// UpdateInterrupts
+static void UpdateInterrupts()
+{
+	// For each interrupt bit in DSP_CONTROL, the interrupt enablemask is the bit directly
+	// to the left of it. By doing:
+	// (DSP_CONTROL>>1) & DSP_CONTROL & MASK_OF_ALL_INTERRUPT_BITS
+	// We can check if any of the interrupts are enabled and active, all at once.
+	bool ints_set = (((g_dspState.Hex >> 1) & g_dspState.Hex & (INT_DSP | INT_ARAM | INT_AID)) != 0);
+
+	ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DSP, ints_set);
+}
+
+static void GenerateDSPInterrupt(u64 DSPIntType, int cyclesLate)
+{
+	// The INT_* enumeration members have values that reflect their bit positions in
+	// DSP_CONTROL - we mask by (INT_DSP | INT_ARAM | INT_AID) just to ensure people
+	// don't call this with bogus values.
+	g_dspState.Hex |= (DSPIntType & (INT_DSP | INT_ARAM | INT_AID));
+
+	UpdateInterrupts();
+}
+
+// CALLED FROM DSP EMULATOR, POSSIBLY THREADED
+void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type)
+{
+	// TODO: Maybe rethink this? ScheduleEvent_Threadsafe has unpredictable timing.
+	CoreTiming::ScheduleEvent_Threadsafe_Immediate(et_GenerateDSPInterrupt, type);
+}
+
+// called whenever SystemTimers thinks the DSP deserves a few more cycles
+void UpdateDSPSlice(int cycles)
+{
+	if (dsp_is_lle)
+	{
+		// use up the rest of the slice(if any)
+		dsp_emulator->DSP_Update(dsp_slice);
+		dsp_slice %= 6;
+		// note the new budget
+		dsp_slice += cycles;
+	}
+	else
+	{
+		dsp_emulator->DSP_Update(cycles);
+	}
+}
+
+// This happens at 4 khz, since 32 bytes at 4khz = 4 bytes at 32 khz (16bit stereo pcm)
+void UpdateAudioDMA()
+{
+	static short zero_samples[8*2] = { 0 };
+	if (g_audioDMA.AudioDMAControl.Enable)
+	{
+		// Read audio at g_audioDMA.current_source_address in RAM and push onto an
+		// external audio fifo in the emulator, to be mixed with the disc
+		// streaming output.
+
+		if (g_audioDMA.remaining_blocks_count != 0)
+		{
+			g_audioDMA.remaining_blocks_count--;
+			g_audioDMA.current_source_address += 32;
+		}
+
+		if (g_audioDMA.remaining_blocks_count == 0)
+		{
+			g_audioDMA.current_source_address = g_audioDMA.SourceAddress;
+			g_audioDMA.remaining_blocks_count = g_audioDMA.AudioDMAControl.NumBlocks;
+
+			if (g_audioDMA.remaining_blocks_count != 0)
+			{
+				// We make the samples ready as soon as possible
+				void *address = Memory::GetPointer(g_audioDMA.SourceAddress);
+				AudioCommon::SendAIBuffer((short*)address, g_audioDMA.AudioDMAControl.NumBlocks * 8);
+			}
+			GenerateDSPInterrupt(DSP::INT_AID);
+		}
+	}
+	else
+	{
+		AudioCommon::SendAIBuffer(&zero_samples[0], 8);
+	}
+}
+
+static void Do_ARAM_DMA()
+{
+	g_dspState.DMAState = 1;
+
+	// ARAM DMA transfer rate has been measured on real hw
+	int ticksToTransfer = (g_arDMA.Cnt.count / 32) * 246;
+
+	if (instant_dma)
+		ticksToTransfer = 0;
+
+	CoreTiming::ScheduleEvent(ticksToTransfer, et_CompleteARAM);
+
+	if (instant_dma)
+		CoreTiming::ForceExceptionCheck(100);
+
+	last_mmaddr = g_arDMA.MMAddr;
+	last_aram_dma_count = g_arDMA.Cnt.count;
+
+	// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
+	if (g_arDMA.Cnt.dir)
+	{
+		// ARAM -> MRAM
+		INFO_LOG(DSPINTERFACE, "DMA %08x bytes from ARAM %08x to MRAM %08x PC: %08x",
+			g_arDMA.Cnt.count, g_arDMA.ARAddr, g_arDMA.MMAddr, PC);
+
+		// Outgoing data from ARAM is mirrored every 64MB (verified on real HW)
+		g_arDMA.ARAddr &= 0x3ffffff;
+		g_arDMA.MMAddr &= 0x3ffffff;
+
+		if (g_arDMA.ARAddr < g_ARAM.size)
+		{
+			while (g_arDMA.Cnt.count)
+			{
+				// These are logically separated in code to show that a memory map has been set up
+				// See below in the write section for more information
+				if ((g_ARAM_Info.Hex & 0xf) == 3)
+				{
+					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
+				}
+				else if ((g_ARAM_Info.Hex & 0xf) == 4)
+				{
+					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
+				}
+				else
+				{
+					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
+				}
+
+				g_arDMA.MMAddr += 8;
+				g_arDMA.ARAddr += 8;
+				g_arDMA.Cnt.count -= 8;
+			}
+		}
+		else
+		{
+			// Assuming no external ARAM installed; returns zeros on out of bounds reads (verified on real HW)
+			while (g_arDMA.Cnt.count)
+			{
+				Memory::Write_U64(0, g_arDMA.MMAddr);
+				g_arDMA.MMAddr += 8;
+				g_arDMA.ARAddr += 8;
+				g_arDMA.Cnt.count -= 8;
+			}
+		}
+	}
+	else
+	{
+		// MRAM -> ARAM
+		INFO_LOG(DSPINTERFACE, "DMA %08x bytes from MRAM %08x to ARAM %08x PC: %08x",
+			g_arDMA.Cnt.count, g_arDMA.MMAddr, g_arDMA.ARAddr, PC);
+
+		// Incoming data into ARAM is mirrored every 64MB (verified on real HW)
+		g_arDMA.ARAddr &= 0x3ffffff;
+		g_arDMA.MMAddr &= 0x3ffffff;
+
+		if (g_arDMA.ARAddr < g_ARAM.size)
+		{
+			while (g_arDMA.Cnt.count)
+			{
+				if ((g_ARAM_Info.Hex & 0xf) == 3)
+				{
+					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
+				}
+				else if ((g_ARAM_Info.Hex & 0xf) == 4)
+				{
+					if (g_arDMA.ARAddr < 0x400000)
+					{
+						*(u64*)&g_ARAM.ptr[(g_arDMA.ARAddr + 0x400000) & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
+					}
+					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
+				}
+				else
+				{
+					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
+				}
+
+				g_arDMA.MMAddr += 8;
+				g_arDMA.ARAddr += 8;
+				g_arDMA.Cnt.count -= 8;
+			}
+		}
+		else
+		{
+			// Assuming no external ARAM installed; writes nothing to ARAM when out of bounds (verified on real HW)
+			g_arDMA.MMAddr += g_arDMA.Cnt.count;
+			g_arDMA.ARAddr += g_arDMA.Cnt.count;
+			g_arDMA.Cnt.count = 0;
+		}
+	}
+}
+
+// (shuffle2) I still don't believe that this hack is actually needed... :(
+// Maybe the Wii Sports ucode is processed incorrectly?
+// (LM) It just means that DSP reads via '0xffdd' on Wii can end up in EXRAM or main RAM
+u8 ReadARAM(u32 _iAddress)
+{
+	//NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x", _iAddress);
+	if (g_ARAM.wii_mode)
+	{
+		if (_iAddress & 0x10000000)
+			return g_ARAM.ptr[_iAddress & g_ARAM.mask];
+		else
+			return Memory::Read_U8(_iAddress & Memory::RAM_MASK);
+	}
+	else
+	{
+		return g_ARAM.ptr[_iAddress & g_ARAM.mask];
+	}
+}
+
+void WriteARAM(u8 value, u32 _uAddress)
+{
+	// NOTICE_LOG(DSPINTERFACE, "WriteARAM 0x%08x", _uAddress);
+	// TODO: verify this on Wii
+	g_ARAM.ptr[_uAddress & g_ARAM.mask] = value;
+}
+
+u8 *GetARAMPtr()
+{
+	return g_ARAM.ptr;
+}
+
+u64 DMAInProgress()
+{
+	if (g_dspState.DMAState == 1)
+	{
+		return ((u64)last_mmaddr << 32 | (last_mmaddr + last_aram_dma_count));
+	}
+	return 0;
+}
+
+} // end of namespace DSP
+
diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h
new file mode 100644
index 0000000000..6245c435e0
--- /dev/null
+++ b/Source/Core/Core/HW/DSP.h
@@ -0,0 +1,82 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+class DSPEmulator;
+namespace MMIO { class Mapping; }
+
+namespace DSP
+{
+
+enum DSPInterruptType
+{
+	INT_DSP  = 0x80,
+	INT_ARAM = 0x20,
+	INT_AID  = 0x08,
+};
+
+// aram size and mask
+enum
+{
+	ARAM_SIZE = 0x01000000, // 16 MB
+	ARAM_MASK = 0x00FFFFFF,
+};
+
+// UDSPControl
+#define DSP_CONTROL_MASK 0x0C07
+union UDSPControl
+{
+	u16 Hex;
+	struct
+	{
+		// DSP Control
+		u16 DSPReset : 1; // Write 1 to reset and waits for 0
+		u16 DSPAssertInt : 1;
+		u16 DSPHalt : 1;
+		// Interrupt for DMA to the AI/speakers
+		u16 AID : 1;
+		u16 AID_mask : 1;
+		// ARAM DMA interrupt
+		u16 ARAM : 1;
+		u16 ARAM_mask : 1;
+		// DSP DMA interrupt
+		u16 DSP : 1;
+		u16 DSP_mask : 1;
+		// Other ???
+		u16 DMAState : 1; // DSPGetDMAStatus() uses this flag. __ARWaitForDMA() uses it too...maybe it's just general DMA flag
+		u16 DSPInitCode : 1; // Indicator that the DSP was initialized?
+		u16 DSPInit : 1; // DSPInit() writes to this flag
+		u16 pad : 4;
+	};
+	UDSPControl(u16 _Hex = 0) : Hex(_Hex) {}
+};
+
+void Init(bool hle);
+void Shutdown();
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+DSPEmulator* GetDSPEmulator();
+
+void DoState(PointerWrap &p);
+
+void GenerateDSPInterruptFromDSPEmu(DSPInterruptType _DSPInterruptType);
+
+// Audio/DSP Helper
+u8 ReadARAM(const u32 _uAddress);
+void WriteARAM(u8 value, u32 _uAddress);
+
+// Debugger Helper
+u8* GetARAMPtr();
+
+void UpdateAudioDMA();
+void UpdateDSPSlice(int cycles);
+u64 DMAInProgress();
+void EnableInstantDMA();
+
+}// end of namespace DSP
diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
new file mode 100644
index 0000000000..089f236cf6
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
@@ -0,0 +1,269 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <iostream>
+
+#include "Common/ChunkFile.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+DSPHLE::DSPHLE()
+{
+}
+
+// Mailbox utility
+struct DSPState
+{
+	u32 CPUMailbox;
+	u32 DSPMailbox;
+
+	void Reset()
+	{
+		CPUMailbox = 0x00000000;
+		DSPMailbox = 0x00000000;
+	}
+
+	DSPState()
+	{
+		Reset();
+	}
+};
+
+bool DSPHLE::Initialize(bool bWii, bool bDSPThread)
+{
+	m_bWii = bWii;
+	m_pUCode = nullptr;
+	m_lastUCode = nullptr;
+	m_bHalt = false;
+	m_bAssertInt = false;
+
+	SetUCode(UCODE_ROM);
+	m_DSPControl.DSPHalt = 1;
+	m_DSPControl.DSPInit = 1;
+
+	m_dspState.Reset();
+
+	return true;
+}
+
+void DSPHLE::DSP_StopSoundStream()
+{
+}
+
+void DSPHLE::Shutdown()
+{
+	delete m_pUCode;
+	m_pUCode = nullptr;
+}
+
+void DSPHLE::DSP_Update(int cycles)
+{
+	if (m_pUCode != nullptr)
+		m_pUCode->Update();
+}
+
+u32 DSPHLE::DSP_UpdateRate()
+{
+	// AX HLE uses 3ms (Wii) or 5ms (GC) timing period
+	if (m_pUCode != nullptr)
+		return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs();
+	else
+		return SystemTimers::GetTicksPerSecond() / 1000;
+}
+
+void DSPHLE::SendMailToDSP(u32 _uMail)
+{
+	if (m_pUCode != nullptr)
+	{
+		DEBUG_LOG(DSP_MAIL, "CPU writes 0x%08x", _uMail);
+		m_pUCode->HandleMail(_uMail);
+	}
+}
+
+UCodeInterface* DSPHLE::GetUCode()
+{
+	return m_pUCode;
+}
+
+void DSPHLE::SetUCode(u32 _crc)
+{
+	delete m_pUCode;
+
+	m_pUCode = nullptr;
+	m_MailHandler.Clear();
+	m_pUCode = UCodeFactory(_crc, this, m_bWii);
+}
+
+// TODO do it better?
+// Assumes that every odd call to this func is by the persistent ucode.
+// Even callers are deleted.
+void DSPHLE::SwapUCode(u32 _crc)
+{
+	m_MailHandler.Clear();
+
+	if (m_lastUCode == nullptr)
+	{
+		m_lastUCode = m_pUCode;
+		m_pUCode = UCodeFactory(_crc, this, m_bWii);
+	}
+	else
+	{
+		delete m_pUCode;
+		m_pUCode = m_lastUCode;
+		m_lastUCode = nullptr;
+	}
+}
+
+void DSPHLE::DoState(PointerWrap &p)
+{
+	bool isHLE = true;
+	p.Do(isHLE);
+	if (isHLE != true && p.GetMode() == PointerWrap::MODE_READ)
+	{
+		Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000);
+		p.SetMode(PointerWrap::MODE_VERIFY);
+		return;
+	}
+
+	p.DoPOD(m_DSPControl);
+	p.DoPOD(m_dspState);
+
+	int ucode_crc = UCodeInterface::GetCRC(m_pUCode);
+	int ucode_crc_beforeLoad = ucode_crc;
+	int lastucode_crc = UCodeInterface::GetCRC(m_lastUCode);
+	int lastucode_crc_beforeLoad = lastucode_crc;
+
+	p.Do(ucode_crc);
+	p.Do(lastucode_crc);
+
+	// if a different type of ucode was being used when the savestate was created,
+	// we have to reconstruct the old type of ucode so that we have a valid thing to call DoState on.
+	UCodeInterface*     ucode =     (ucode_crc ==     ucode_crc_beforeLoad) ?    m_pUCode : UCodeFactory(    ucode_crc, this, m_bWii);
+	UCodeInterface* lastucode = (lastucode_crc != lastucode_crc_beforeLoad) ? m_lastUCode : UCodeFactory(lastucode_crc, this, m_bWii);
+
+	if (ucode)
+		ucode->DoState(p);
+	if (lastucode)
+		lastucode->DoState(p);
+
+	// if a different type of ucode was being used when the savestate was created,
+	// discard it if we're not loading, otherwise discard the old one and keep the new one.
+	if (ucode != m_pUCode)
+	{
+		if (p.GetMode() != PointerWrap::MODE_READ)
+		{
+			delete ucode;
+		}
+		else
+		{
+			delete m_pUCode;
+			m_pUCode = ucode;
+		}
+	}
+	if (lastucode != m_lastUCode)
+	{
+		if (p.GetMode() != PointerWrap::MODE_READ)
+		{
+			delete lastucode;
+		}
+		else
+		{
+			delete m_lastUCode;
+			m_lastUCode = lastucode;
+		}
+	}
+
+	m_MailHandler.DoState(p);
+}
+
+// Mailbox functions
+unsigned short DSPHLE::DSP_ReadMailBoxHigh(bool _CPUMailbox)
+{
+	if (_CPUMailbox)
+	{
+		return (m_dspState.CPUMailbox >> 16) & 0xFFFF;
+	}
+	else
+	{
+		return AccessMailHandler().ReadDSPMailboxHigh();
+	}
+}
+
+unsigned short DSPHLE::DSP_ReadMailBoxLow(bool _CPUMailbox)
+{
+	if (_CPUMailbox)
+	{
+		return m_dspState.CPUMailbox & 0xFFFF;
+	}
+	else
+	{
+		return AccessMailHandler().ReadDSPMailboxLow();
+	}
+}
+
+void DSPHLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short _Value)
+{
+	if (_CPUMailbox)
+	{
+		m_dspState.CPUMailbox = (m_dspState.CPUMailbox & 0xFFFF) | (_Value << 16);
+	}
+	else
+	{
+		PanicAlert("CPU can't write %08x to DSP mailbox", _Value);
+	}
+}
+
+void DSPHLE::DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short _Value)
+{
+	if (_CPUMailbox)
+	{
+		m_dspState.CPUMailbox = (m_dspState.CPUMailbox & 0xFFFF0000) | _Value;
+		SendMailToDSP(m_dspState.CPUMailbox);
+		// Mail sent so clear MSB to show that it is progressed
+		m_dspState.CPUMailbox &= 0x7FFFFFFF;
+	}
+	else
+	{
+		PanicAlert("CPU can't write %08x to DSP mailbox", _Value);
+	}
+}
+
+// Other DSP functions
+u16 DSPHLE::DSP_WriteControlRegister(unsigned short _Value)
+{
+	DSP::UDSPControl Temp(_Value);
+
+	if (Temp.DSPReset)
+	{
+		SetUCode(UCODE_ROM);
+		Temp.DSPReset = 0;
+	}
+	if (Temp.DSPInit == 0)
+	{
+		// copy 128 byte from ARAM 0x000000 to IMEM
+		SetUCode(UCODE_INIT_AUDIO_SYSTEM);
+		Temp.DSPInitCode = 0;
+	}
+
+	m_DSPControl.Hex = Temp.Hex;
+	return m_DSPControl.Hex;
+}
+
+u16 DSPHLE::DSP_ReadControlRegister()
+{
+	return m_DSPControl.Hex;
+}
+
+void DSPHLE::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+}
diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h
new file mode 100644
index 0000000000..b5ff933c84
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h
@@ -0,0 +1,75 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/DSPEmulator.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPHLE/MailHandler.h"
+
+class PointerWrap;
+class UCodeInterface;
+
+class DSPHLE : public DSPEmulator {
+public:
+	DSPHLE();
+
+	virtual bool Initialize(bool bWii, bool bDSPThread) override;
+	virtual void Shutdown() override;
+	virtual bool IsLLE() override { return false ; }
+
+	virtual void DoState(PointerWrap &p) override;
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+
+	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
+	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
+	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
+	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
+	virtual unsigned short DSP_ReadControlRegister() override;
+	virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
+	virtual void DSP_Update(int cycles) override;
+	virtual void DSP_StopSoundStream() override;
+	virtual u32 DSP_UpdateRate() override;
+
+	CMailHandler& AccessMailHandler() { return m_MailHandler; }
+
+	// Formerly DSPHandler
+	UCodeInterface *GetUCode();
+	void SetUCode(u32 _crc);
+	void SwapUCode(u32 _crc);
+
+private:
+	void SendMailToDSP(u32 _uMail);
+
+	// Declarations and definitions
+	bool m_bWii;
+
+	// Fake mailbox utility
+	struct DSPState
+	{
+		u32 CPUMailbox;
+		u32 DSPMailbox;
+
+		void Reset()
+		{
+			CPUMailbox = 0x00000000;
+			DSPMailbox = 0x00000000;
+		}
+
+		DSPState()
+		{
+			Reset();
+		}
+	};
+	DSPState m_dspState;
+
+	UCodeInterface* m_pUCode;
+	UCodeInterface* m_lastUCode;
+
+	DSP::UDSPControl m_DSPControl;
+	CMailHandler m_MailHandler;
+
+	bool m_bHalt;
+	bool m_bAssertInt;
+};
diff --git a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp
similarity index 89%
rename from Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp
rename to Source/Core/Core/HW/DSPHLE/MailHandler.cpp
index bcbc696186..3334626ac0 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp
+++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp
@@ -1,8 +1,9 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "MailHandler.h"
+#include "Common/ChunkFile.h"
+#include "Core/HW/DSPHLE/MailHandler.h"
 
 CMailHandler::CMailHandler()
 {
@@ -48,7 +49,7 @@ void CMailHandler::Clear()
 		m_Mails.pop();
 }
 
-bool CMailHandler::IsEmpty()
+bool CMailHandler::IsEmpty() const
 {
 	return m_Mails.empty();
 }
diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.h b/Source/Core/Core/HW/DSPHLE/MailHandler.h
new file mode 100644
index 0000000000..40ecaec953
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/MailHandler.h
@@ -0,0 +1,43 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <queue>
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+class CMailHandler
+{
+public:
+	CMailHandler();
+	~CMailHandler();
+
+	void PushMail(u32 _Mail);
+	void Clear();
+	void Halt(bool _Halt);
+	void DoState(PointerWrap &p);
+	bool IsEmpty() const;
+
+	u16 ReadDSPMailboxHigh();
+	u16 ReadDSPMailboxLow();
+
+	u32 GetNextMail() const
+	{
+		if (!m_Mails.empty())
+		{
+			return m_Mails.front();
+		}
+		else
+		{
+			// WARN_LOG(DSPHLE, "GetNextMail: No mails");
+			return 0;
+		}
+	}
+
+private:
+	// mail handler
+	std::queue<u32> m_Mails;
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
new file mode 100644
index 0000000000..8c9c65fea1
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
@@ -0,0 +1,705 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+
+#define AX_GC
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
+
+AXUCode::AXUCode(DSPHLE* dsphle, u32 crc)
+	: UCodeInterface(dsphle, crc)
+	, m_work_available(false)
+	, m_cmdlist_size(0)
+{
+	WARN_LOG(DSPHLE, "Instantiating AXUCode: crc=%08x", crc);
+	m_mail_handler.PushMail(DSP_INIT);
+	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+
+	LoadResamplingCoefficients();
+}
+
+AXUCode::~AXUCode()
+{
+	m_mail_handler.Clear();
+}
+
+void AXUCode::LoadResamplingCoefficients()
+{
+	m_coeffs_available = false;
+
+	std::string filenames[] = {
+		File::GetUserPath(D_GCUSER_IDX) + "dsp_coef.bin",
+		File::GetSysDirectory() + "/GC/dsp_coef.bin"
+	};
+
+	size_t fidx;
+	std::string filename;
+	for (fidx = 0; fidx < sizeof (filenames) / sizeof (filenames[0]); ++fidx)
+	{
+		filename = filenames[fidx];
+		if (!File::Exists(filename))
+			continue;
+
+		if (File::GetSize(filename) != 0x1000)
+			continue;
+
+		break;
+	}
+
+	if (fidx >= sizeof (filenames) / sizeof (filenames[0]))
+		return;
+
+	WARN_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
+
+	File::IOFile fp(filename, "rb");
+	fp.ReadBytes(m_coeffs, 0x1000);
+
+	for (auto& coef : m_coeffs)
+		coef = Common::swap16(coef);
+
+	m_coeffs_available = true;
+}
+
+void AXUCode::SignalWorkEnd()
+{
+	// Signal end of processing
+	m_mail_handler.PushMail(DSP_YIELD);
+	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+}
+
+void AXUCode::HandleCommandList()
+{
+	// Temp variables for addresses computation
+	u16 addr_hi, addr_lo;
+	u16 addr2_hi, addr2_lo;
+	u16 size;
+
+	u32 pb_addr = 0;
+
+#if 0
+	WARN_LOG(DSPHLE, "Command list:");
+	for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
+		WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
+	WARN_LOG(DSPHLE, "-------------");
+#endif
+
+	u32 curr_idx = 0;
+	bool end = false;
+	while (!end)
+	{
+		u16 cmd = m_cmdlist[curr_idx++];
+
+		switch (cmd)
+		{
+			// Some of these commands are unknown, or unused in this AX HLE.
+			// We still need to skip their arguments using "curr_idx += N".
+
+			case CMD_SETUP:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				SetupProcessing(HILO_TO_32(addr));
+				break;
+
+			case CMD_DL_AND_VOL_MIX:
+			{
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				u16 vol_main = m_cmdlist[curr_idx++];
+				u16 vol_auxa = m_cmdlist[curr_idx++];
+				u16 vol_auxb = m_cmdlist[curr_idx++];
+				DownloadAndMixWithVolume(HILO_TO_32(addr), vol_main, vol_auxa, vol_auxb);
+				break;
+			}
+
+			case CMD_PB_ADDR:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				pb_addr = HILO_TO_32(addr);
+				break;
+
+			case CMD_PROCESS:
+				ProcessPBList(pb_addr);
+				break;
+
+			case CMD_MIX_AUXA:
+			case CMD_MIX_AUXB:
+				// These two commands are handled almost the same internally.
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				addr2_hi = m_cmdlist[curr_idx++];
+				addr2_lo = m_cmdlist[curr_idx++];
+				MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2));
+				break;
+
+			case CMD_UPLOAD_LRS:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				UploadLRS(HILO_TO_32(addr));
+				break;
+
+			case CMD_SET_LR:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				SetMainLR(HILO_TO_32(addr));
+				break;
+
+			case CMD_UNK_08: curr_idx += 10; break; // TODO: check
+
+			case CMD_MIX_AUXB_NOWRITE:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				MixAUXSamples(1, 0, HILO_TO_32(addr));
+				break;
+
+			case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break;
+			case CMD_UNK_0B: break; // TODO: check other versions
+			case CMD_UNK_0C: break; // TODO: check other versions
+
+			case CMD_MORE:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				size = m_cmdlist[curr_idx++];
+
+				CopyCmdList(HILO_TO_32(addr), size);
+				curr_idx = 0;
+				break;
+
+			case CMD_OUTPUT:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				addr2_hi = m_cmdlist[curr_idx++];
+				addr2_lo = m_cmdlist[curr_idx++];
+				OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr));
+				break;
+
+			case CMD_END:
+				end = true;
+				break;
+
+			case CMD_MIX_AUXB_LR:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				addr2_hi = m_cmdlist[curr_idx++];
+				addr2_lo = m_cmdlist[curr_idx++];
+				MixAUXBLR(HILO_TO_32(addr), HILO_TO_32(addr2));
+				break;
+
+			case CMD_SET_OPPOSITE_LR:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				SetOppositeLR(HILO_TO_32(addr));
+				break;
+
+			case CMD_UNK_12:
+			{
+				u16 samp_val = m_cmdlist[curr_idx++];
+				u16 idx = m_cmdlist[curr_idx++];
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				// TODO
+				// suppress warnings:
+				(void)samp_val; (void)idx;
+				break;
+			}
+
+			// Send the contents of MAIN LRS, AUXA LRS and AUXB S to RAM, and
+			// mix data to MAIN LR and AUXB LR.
+			case CMD_SEND_AUX_AND_MIX:
+			{
+				// Address for Main + AUXA LRS upload
+				u16 main_auxa_up_hi = m_cmdlist[curr_idx++];
+				u16 main_auxa_up_lo = m_cmdlist[curr_idx++];
+
+				// Address for AUXB S upload
+				u16 auxb_s_up_hi = m_cmdlist[curr_idx++];
+				u16 auxb_s_up_lo = m_cmdlist[curr_idx++];
+
+				// Address to read data for Main L
+				u16 main_l_dl_hi = m_cmdlist[curr_idx++];
+				u16 main_l_dl_lo = m_cmdlist[curr_idx++];
+
+				// Address to read data for Main R
+				u16 main_r_dl_hi = m_cmdlist[curr_idx++];
+				u16 main_r_dl_lo = m_cmdlist[curr_idx++];
+
+				// Address to read data for AUXB L
+				u16 auxb_l_dl_hi = m_cmdlist[curr_idx++];
+				u16 auxb_l_dl_lo = m_cmdlist[curr_idx++];
+
+				// Address to read data for AUXB R
+				u16 auxb_r_dl_hi = m_cmdlist[curr_idx++];
+				u16 auxb_r_dl_lo = m_cmdlist[curr_idx++];
+
+				SendAUXAndMix(HILO_TO_32(main_auxa_up), HILO_TO_32(auxb_s_up),
+				              HILO_TO_32(main_l_dl), HILO_TO_32(main_r_dl),
+				              HILO_TO_32(auxb_l_dl), HILO_TO_32(auxb_r_dl));
+				break;
+			}
+
+			default:
+				ERROR_LOG(DSPHLE, "Unknown command in AX command list: %04x", cmd);
+				end = true;
+				break;
+		}
+	}
+}
+
+void AXUCode::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates)
+{
+	u32 start_idx = 0;
+	for (int i = 0; i < curr_ms; ++i)
+		start_idx += num_updates[i];
+
+	for (u32 i = start_idx; i < start_idx + num_updates[curr_ms]; ++i)
+	{
+		u16 update_off = Common::swap16(updates[2 * i]);
+		u16 update_val = Common::swap16(updates[2 * i + 1]);
+
+		pb[update_off] = update_val;
+	}
+}
+
+AXMixControl AXUCode::ConvertMixerControl(u32 mixer_control)
+{
+	u32 ret = 0;
+
+	// TODO: find other UCode versions with different mixer_control values
+	if (m_crc == 0x4e8a8b21)
+	{
+		ret |= MIX_L | MIX_R;
+		if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R;
+		if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R;
+		if (mixer_control & 0x0004)
+		{
+			ret |= MIX_S;
+			if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S;
+			if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S;
+		}
+		if (mixer_control & 0x0008)
+		{
+			ret |= MIX_L_RAMP | MIX_R_RAMP;
+			if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
+			if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
+			if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP;
+			if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP;
+		}
+	}
+	else
+	{
+		if (mixer_control & 0x0001) ret |= MIX_L;
+		if (mixer_control & 0x0002) ret |= MIX_R;
+		if (mixer_control & 0x0004) ret |= MIX_S;
+		if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP;
+		if (mixer_control & 0x0010) ret |= MIX_AUXA_L;
+		if (mixer_control & 0x0020) ret |= MIX_AUXA_R;
+		if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
+		if (mixer_control & 0x0080) ret |= MIX_AUXA_S;
+		if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP;
+		if (mixer_control & 0x0200) ret |= MIX_AUXB_L;
+		if (mixer_control & 0x0400) ret |= MIX_AUXB_R;
+		if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
+		if (mixer_control & 0x1000) ret |= MIX_AUXB_S;
+		if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP;
+
+		// TODO: 0x4000 is used for Dolby Pro 2 sound mixing
+	}
+
+	return (AXMixControl)ret;
+}
+
+void AXUCode::SetupProcessing(u32 init_addr)
+{
+	u16 init_data[0x20];
+
+	for (u32 i = 0; i < 0x20; ++i)
+		init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
+
+	// List of all buffers we have to initialize
+	int* buffers[] = {
+		m_samples_left,
+		m_samples_right,
+		m_samples_surround,
+		m_samples_auxA_left,
+		m_samples_auxA_right,
+		m_samples_auxA_surround,
+		m_samples_auxB_left,
+		m_samples_auxB_right,
+		m_samples_auxB_surround
+	};
+
+	u32 init_idx = 0;
+	for (auto& buffer : buffers)
+	{
+		s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
+		s16 delta = (s16)init_data[init_idx + 2];
+
+		init_idx += 3;
+
+		if (!init_val)
+		{
+			memset(buffer, 0, 5 * 32 * sizeof (int));
+		}
+		else
+		{
+			for (u32 j = 0; j < 32 * 5; ++j)
+			{
+				buffer[j] = init_val;
+				init_val += delta;
+			}
+		}
+	}
+}
+
+void AXUCode::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb)
+{
+	int* buffers_main[3] = { m_samples_left, m_samples_right, m_samples_surround };
+	int* buffers_auxa[3] = { m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround };
+	int* buffers_auxb[3] = { m_samples_auxB_left, m_samples_auxB_right, m_samples_auxB_surround };
+	int** buffers[3] = { buffers_main, buffers_auxa, buffers_auxb };
+	u16 volumes[3] = { vol_main, vol_auxa, vol_auxb };
+
+	for (u32 i = 0; i < 3; ++i)
+	{
+		int* ptr = (int*)HLEMemory_Get_Pointer(addr);
+		u16 volume = volumes[i];
+		for (u32 j = 0; j < 3; ++j)
+		{
+			int* buffer = buffers[i][j];
+			for (u32 k = 0; k < 5 * 32; ++k)
+			{
+				s64 sample = (s64)(s32)Common::swap32(*ptr++);
+				sample *= volume;
+				buffer[k] += (s32)(sample >> 15);
+			}
+		}
+	}
+}
+
+void AXUCode::ProcessPBList(u32 pb_addr)
+{
+	// Samples per millisecond. In theory DSP sampling rate can be changed from
+	// 32KHz to 48KHz, but AX always process at 32KHz.
+	const u32 spms = 32;
+
+	AXPB pb;
+
+	while (pb_addr)
+	{
+		AXBuffers buffers = {{
+			m_samples_left,
+			m_samples_right,
+			m_samples_surround,
+			m_samples_auxA_left,
+			m_samples_auxA_right,
+			m_samples_auxA_surround,
+			m_samples_auxB_left,
+			m_samples_auxB_right,
+			m_samples_auxB_surround
+		}};
+
+		if (!ReadPB(pb_addr, pb))
+			break;
+
+		u32 updates_addr = HILO_TO_32(pb.updates.data);
+		u16* updates = (u16*)HLEMemory_Get_Pointer(updates_addr);
+
+		for (int curr_ms = 0; curr_ms < 5; ++curr_ms)
+		{
+			ApplyUpdatesForMs(curr_ms, (u16*)&pb, pb.updates.num_updates, updates);
+
+			ProcessVoice(pb, buffers, spms, ConvertMixerControl(pb.mixer_control),
+			             m_coeffs_available ? m_coeffs : nullptr);
+
+			// Forward the buffers
+			for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
+				buffers.ptrs[i] += spms;
+		}
+
+		WritePB(pb_addr, pb);
+		pb_addr = HILO_TO_32(pb.next_pb);
+	}
+}
+
+void AXUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
+{
+	int* buffers[3] = { nullptr };
+
+	switch (aux_id)
+	{
+	case 0:
+		buffers[0] = m_samples_auxA_left;
+		buffers[1] = m_samples_auxA_right;
+		buffers[2] = m_samples_auxA_surround;
+		break;
+
+	case 1:
+		buffers[0] = m_samples_auxB_left;
+		buffers[1] = m_samples_auxB_right;
+		buffers[2] = m_samples_auxB_surround;
+		break;
+	}
+
+	// First, we need to send the contents of our AUX buffers to the CPU.
+	if (write_addr)
+	{
+		int* ptr = (int*)HLEMemory_Get_Pointer(write_addr);
+		for (auto& buffer : buffers)
+			for (u32 j = 0; j < 5 * 32; ++j)
+				*ptr++ = Common::swap32(buffer[j]);
+	}
+
+	// Then, we read the new temp from the CPU and add to our current
+	// temp.
+	int* ptr = (int*)HLEMemory_Get_Pointer(read_addr);
+	for (auto& sample : m_samples_left)
+		sample += (int)Common::swap32(*ptr++);
+	for (auto& sample : m_samples_right)
+		sample += (int)Common::swap32(*ptr++);
+	for (auto& sample : m_samples_surround)
+		sample += (int)Common::swap32(*ptr++);
+}
+
+void AXUCode::UploadLRS(u32 dst_addr)
+{
+	int buffers[3][5 * 32];
+
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		buffers[0][i] = Common::swap32(m_samples_left[i]);
+		buffers[1][i] = Common::swap32(m_samples_right[i]);
+		buffers[2][i] = Common::swap32(m_samples_surround[i]);
+	}
+	memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers));
+}
+
+void AXUCode::SetMainLR(u32 src_addr)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int samp = (int)Common::swap32(*ptr++);
+		m_samples_left[i] = samp;
+		m_samples_right[i] = samp;
+		m_samples_surround[i] = 0;
+	}
+}
+
+void AXUCode::OutputSamples(u32 lr_addr, u32 surround_addr)
+{
+	int surround_buffer[5 * 32];
+
+	for (u32 i = 0; i < 5 * 32; ++i)
+		surround_buffer[i] = Common::swap32(m_samples_surround[i]);
+	memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer));
+
+	// 32 samples per ms, 5 ms, 2 channels
+	short buffer[5 * 32 * 2];
+
+	// Output samples clamped to 16 bits and interlaced RLRLRLRLRL...
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int left  = m_samples_left[i];
+		int right = m_samples_right[i];
+
+		MathUtil::Clamp(&left, -32767, 32767);
+		MathUtil::Clamp(&right, -32767, 32767);
+
+		buffer[2 * i + 0] = Common::swap16(right);
+		buffer[2 * i + 1] = Common::swap16(left);
+	}
+
+	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
+}
+
+void AXUCode::MixAUXBLR(u32 ul_addr, u32 dl_addr)
+{
+	// Upload AUXB L/R
+	int* ptr = (int*)HLEMemory_Get_Pointer(ul_addr);
+	for (auto& sample : m_samples_auxB_left)
+		*ptr++ = Common::swap32(sample);
+	for (auto& sample : m_samples_auxB_right)
+		*ptr++ = Common::swap32(sample);
+
+	// Mix AUXB L/R to MAIN L/R, and replace AUXB L/R
+	ptr = (int*)HLEMemory_Get_Pointer(dl_addr);
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int samp = Common::swap32(*ptr++);
+		m_samples_auxB_left[i] = samp;
+		m_samples_left[i] += samp;
+	}
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int samp = Common::swap32(*ptr++);
+		m_samples_auxB_right[i] = samp;
+		m_samples_right[i] += samp;
+	}
+}
+
+void AXUCode::SetOppositeLR(u32 src_addr)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int inp = Common::swap32(*ptr++);
+		m_samples_left[i] = -inp;
+		m_samples_right[i] = inp;
+		m_samples_surround[i] = 0;
+	}
+}
+
+void AXUCode::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
+                              u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl)
+{
+	// Buffers to upload first
+	int* up_buffers[] = {
+		m_samples_auxA_left,
+		m_samples_auxA_right,
+		m_samples_auxA_surround
+	};
+
+	// Upload AUXA LRS
+	int* ptr = (int*)HLEMemory_Get_Pointer(main_auxa_up);
+	for (auto& up_buffer : up_buffers)
+		for (u32 j = 0; j < 32 * 5; ++j)
+			*ptr++ = Common::swap32(up_buffer[j]);
+
+	// Upload AUXB S
+	ptr = (int*)HLEMemory_Get_Pointer(auxb_s_up);
+	for (auto& sample : m_samples_auxB_surround)
+		*ptr++ = Common::swap32(sample);
+
+	// Download buffers and addresses
+	int* dl_buffers[] = {
+		m_samples_left,
+		m_samples_right,
+		m_samples_auxB_left,
+		m_samples_auxB_right
+	};
+	u32 dl_addrs[] = {
+		main_l_dl,
+		main_r_dl,
+		auxb_l_dl,
+		auxb_r_dl
+	};
+
+	// Download and mix
+	for (u32 i = 0; i < sizeof (dl_buffers) / sizeof (dl_buffers[0]); ++i)
+	{
+		int* dl_src = (int*)HLEMemory_Get_Pointer(dl_addrs[i]);
+		for (u32 j = 0; j < 32 * 5; ++j)
+			dl_buffers[i][j] += (int)Common::swap32(*dl_src++);
+	}
+}
+
+void AXUCode::HandleMail(u32 mail)
+{
+	// Indicates if the next message is a command list address.
+	static bool next_is_cmdlist = false;
+	static u16 cmdlist_size = 0;
+
+	bool set_next_is_cmdlist = false;
+
+	if (next_is_cmdlist)
+	{
+		CopyCmdList(mail, cmdlist_size);
+		m_work_available = true;
+	}
+	else if (m_upload_setup_in_progress)
+	{
+		PrepareBootUCode(mail);
+	}
+	else if (mail == MAIL_RESUME)
+	{
+		// Acknowledge the resume request
+		m_mail_handler.PushMail(DSP_RESUME);
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+	else if (mail == MAIL_NEW_UCODE)
+	{
+		m_upload_setup_in_progress = true;
+	}
+	else if (mail == MAIL_RESET)
+	{
+		m_dsphle->SetUCode(UCODE_ROM);
+	}
+	else if (mail == MAIL_CONTINUE)
+	{
+		// We don't have to do anything here - the CPU does not wait for a ACK
+		// and sends a cmdlist mail just after.
+	}
+	else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST)
+	{
+		// A command list address is going to be sent next.
+		set_next_is_cmdlist = true;
+		cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK);
+	}
+	else
+	{
+		ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail);
+	}
+
+	next_is_cmdlist = set_next_is_cmdlist;
+}
+
+void AXUCode::CopyCmdList(u32 addr, u16 size)
+{
+	if (size >= (sizeof (m_cmdlist) / sizeof (u16)))
+	{
+		ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size);
+		return;
+	}
+
+	for (u32 i = 0; i < size; ++i, addr += 2)
+		m_cmdlist[i] = HLEMemory_Read_U16(addr);
+	m_cmdlist_size = size;
+}
+
+void AXUCode::Update()
+{
+	// Used for UCode switching.
+	if (NeedsResumeMail())
+	{
+		m_mail_handler.PushMail(DSP_RESUME);
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+	else if (m_work_available)
+	{
+		HandleCommandList();
+		m_cmdlist_size = 0;
+		SignalWorkEnd();
+	}
+}
+
+u32 AXUCode::GetUpdateMs()
+{
+	return 5;
+}
+
+void AXUCode::DoAXState(PointerWrap& p)
+{
+	p.Do(m_cmdlist);
+	p.Do(m_cmdlist_size);
+
+	p.Do(m_samples_left);
+	p.Do(m_samples_right);
+	p.Do(m_samples_surround);
+	p.Do(m_samples_auxA_left);
+	p.Do(m_samples_auxA_right);
+	p.Do(m_samples_auxA_surround);
+	p.Do(m_samples_auxB_left);
+	p.Do(m_samples_auxB_right);
+	p.Do(m_samples_auxB_surround);
+}
+
+void AXUCode::DoState(PointerWrap& p)
+{
+	DoStateShared(p);
+	DoAXState(p);
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
new file mode 100644
index 0000000000..329e06084d
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
@@ -0,0 +1,154 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// High-level emulation for the AX GameCube UCode.
+//
+// TODO:
+//  * Depop support
+//  * ITD support
+//  * Polyphase sample interpolation support (not very useful)
+//  * Dolby Pro 2 mixing with recent AX versions
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+// We can't directly use the mixer_control field from the PB because it does
+// not mean the same in all AX versions. The AX UCode converts the
+// mixer_control value to an AXMixControl bitfield.
+enum AXMixControl
+{
+	MIX_L           = 0x000001,
+	MIX_L_RAMP      = 0x000002,
+	MIX_R           = 0x000004,
+	MIX_R_RAMP      = 0x000008,
+	MIX_S           = 0x000010,
+	MIX_S_RAMP      = 0x000020,
+
+	MIX_AUXA_L      = 0x000040,
+	MIX_AUXA_L_RAMP = 0x000080,
+	MIX_AUXA_R      = 0x000100,
+	MIX_AUXA_R_RAMP = 0x000200,
+	MIX_AUXA_S      = 0x000400,
+	MIX_AUXA_S_RAMP = 0x000800,
+
+	MIX_AUXB_L      = 0x001000,
+	MIX_AUXB_L_RAMP = 0x002000,
+	MIX_AUXB_R      = 0x004000,
+	MIX_AUXB_R_RAMP = 0x008000,
+	MIX_AUXB_S      = 0x010000,
+	MIX_AUXB_S_RAMP = 0x020000,
+
+	MIX_AUXC_L      = 0x040000,
+	MIX_AUXC_L_RAMP = 0x080000,
+	MIX_AUXC_R      = 0x100000,
+	MIX_AUXC_R_RAMP = 0x200000,
+	MIX_AUXC_S      = 0x400000,
+	MIX_AUXC_S_RAMP = 0x800000
+};
+
+class AXUCode : public UCodeInterface
+{
+public:
+	AXUCode(DSPHLE* dsphle, u32 crc);
+	virtual ~AXUCode();
+
+	virtual void HandleMail(u32 mail) override;
+	virtual void Update() override;
+	virtual void DoState(PointerWrap& p) override;
+	u32 GetUpdateMs() override;
+
+protected:
+	enum MailType
+	{
+		MAIL_RESUME       = 0xCDD10000,
+		MAIL_NEW_UCODE    = 0xCDD10001,
+		MAIL_RESET        = 0xCDD10002,
+		MAIL_CONTINUE     = 0xCDD10003,
+
+		// CPU sends 0xBABE0000 | cmdlist_size to the DSP
+		MAIL_CMDLIST      = 0xBABE0000,
+		MAIL_CMDLIST_MASK = 0xFFFF0000
+	};
+
+	// 32 * 5 because 32 samples per millisecond, for max 5 milliseconds.
+	int m_samples_left[32 * 5];
+	int m_samples_right[32 * 5];
+	int m_samples_surround[32 * 5];
+	int m_samples_auxA_left[32 * 5];
+	int m_samples_auxA_right[32 * 5];
+	int m_samples_auxA_surround[32 * 5];
+	int m_samples_auxB_left[32 * 5];
+	int m_samples_auxB_right[32 * 5];
+	int m_samples_auxB_surround[32 * 5];
+
+	// This flag is set if there is anything to process.
+	bool m_work_available;
+
+	u16 m_cmdlist[512];
+	u32 m_cmdlist_size;
+
+	// Table of coefficients for polyphase sample rate conversion.
+	// The coefficients aren't always available (they are part of the DSP DROM)
+	// so we also need to know if they are valid or not.
+	bool m_coeffs_available;
+	s16 m_coeffs[0x800];
+
+	void LoadResamplingCoefficients();
+
+	// Copy a command list from memory to our temp buffer
+	void CopyCmdList(u32 addr, u16 size);
+
+	// Convert a mixer_control bitfield to our internal representation for that
+	// value. Required because that bitfield has a different meaning in some
+	// versions of AX.
+	AXMixControl ConvertMixerControl(u32 mixer_control);
+
+	// Apply updates to a PB. Generic, used in AX GC and AX Wii.
+	void ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates);
+
+	virtual void HandleCommandList();
+	void SignalWorkEnd();
+
+	void SetupProcessing(u32 init_addr);
+	void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb);
+	void ProcessPBList(u32 pb_addr);
+	void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr);
+	void UploadLRS(u32 dst_addr);
+	void SetMainLR(u32 src_addr);
+	void OutputSamples(u32 out_addr, u32 surround_addr);
+	void MixAUXBLR(u32 ul_addr, u32 dl_addr);
+	void SetOppositeLR(u32 src_addr);
+	void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
+	                   u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl);
+
+	// Handle save states for main AX.
+	void DoAXState(PointerWrap& p);
+
+private:
+	enum CmdType
+	{
+		CMD_SETUP                 = 0x00,
+		CMD_DL_AND_VOL_MIX        = 0x01,
+		CMD_PB_ADDR               = 0x02,
+		CMD_PROCESS               = 0x03,
+		CMD_MIX_AUXA              = 0x04,
+		CMD_MIX_AUXB              = 0x05,
+		CMD_UPLOAD_LRS            = 0x06,
+		CMD_SET_LR                = 0x07,
+		CMD_UNK_08                = 0x08,
+		CMD_MIX_AUXB_NOWRITE      = 0x09,
+		CMD_COMPRESSOR_TABLE_ADDR = 0x0A,
+		CMD_UNK_0B                = 0x0B,
+		CMD_UNK_0C                = 0x0C,
+		CMD_MORE                  = 0x0D,
+		CMD_OUTPUT                = 0x0E,
+		CMD_END                   = 0x0F,
+		CMD_MIX_AUXB_LR           = 0x10,
+		CMD_SET_OPPOSITE_LR       = 0x11,
+		CMD_UNK_12                = 0x12,
+		CMD_SEND_AUX_AND_MIX      = 0x13,
+	};
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
new file mode 100644
index 0000000000..e6ab2c1d88
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
@@ -0,0 +1,335 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+struct PBMixer
+{
+	u16 left;
+	u16 left_delta;
+	u16 right;
+	u16 right_delta;
+
+	u16 auxA_left;
+	u16 auxA_left_delta;
+	u16 auxA_right;
+	u16 auxA_right_delta;
+
+	u16 auxB_left;
+	u16 auxB_left_delta;
+	u16 auxB_right;
+	u16 auxB_right_delta;
+
+	u16 auxB_surround;
+	u16 auxB_surround_delta;
+	u16 surround;
+	u16 surround_delta;
+	u16 auxA_surround;
+	u16 auxA_surround_delta;
+};
+
+struct PBMixerWii
+{
+	// volume mixing values in .15, 0x8000 = ca. 1.0
+	u16 left;
+	u16 left_delta;
+	u16 right;
+	u16 right_delta;
+
+	u16 auxA_left;
+	u16 auxA_left_delta;
+	u16 auxA_right;
+	u16 auxA_right_delta;
+
+	u16 auxB_left;
+	u16 auxB_left_delta;
+	u16 auxB_right;
+	u16 auxB_right_delta;
+
+	// Note: the following elements usage changes a little in DPL2 mode
+	// TODO: implement and comment it in the mixer
+	u16 auxC_left;
+	u16 auxC_left_delta;
+	u16 auxC_right;
+	u16 auxC_right_delta;
+
+	u16 surround;
+	u16 surround_delta;
+	u16 auxA_surround;
+	u16 auxA_surround_delta;
+	u16 auxB_surround;
+	u16 auxB_surround_delta;
+	u16 auxC_surround;
+	u16 auxC_surround_delta;
+};
+
+struct PBMixerWM
+{
+	u16 main0;
+	u16 main0_delta;
+	u16 aux0;
+	u16 aux0_delta;
+
+	u16 main1;
+	u16 main1_delta;
+	u16 aux1;
+	u16 aux1_delta;
+
+	u16 main2;
+	u16 main2_delta;
+	u16 aux2;
+	u16 aux2_delta;
+
+	u16 main3;
+	u16 main3_delta;
+	u16 aux3;
+	u16 aux3_delta;
+};
+
+struct PBInitialTimeDelay
+{
+	u16 on;
+	u16 addrMemHigh;
+	u16 addrMemLow;
+	u16 offsetLeft;
+	u16 offsetRight;
+	u16 targetLeft;
+	u16 targetRight;
+};
+
+// Update data - read these each 1ms subframe and use them!
+// It seems that to provide higher time precisions for MIDI events, some games
+// use this thing to update the parameter blocks per 1ms sub-block (a block is 5ms).
+// Using this data should fix games that are missing MIDI notes.
+struct PBUpdates
+{
+	u16 num_updates[5];
+	u16 data_hi;  // These point to main RAM. Not sure about the structure of the data.
+	u16 data_lo;
+};
+
+// The DSP stores the final sample values for each voice after every frame of processing.
+// The values are then accumulated for all dropped voices, added to the next frame of audio,
+// and ramped down on a per-sample basis to provide a gentle "roll off."
+struct PBDpop
+{
+	s16 left;
+	s16 auxA_left;
+	s16 auxB_left;
+
+	s16 right;
+	s16 auxA_right;
+	s16 auxB_right;
+
+	s16 surround;
+	s16 auxA_surround;
+	s16 auxB_surround;
+};
+
+struct PBDpopWii
+{
+	s16 left;
+	s16 auxA_left;
+	s16 auxB_left;
+	s16 auxC_left;
+
+	s16 right;
+	s16 auxA_right;
+	s16 auxB_right;
+	s16 auxC_right;
+
+	s16 surround;
+	s16 auxA_surround;
+	s16 auxB_surround;
+	s16 auxC_surround;
+};
+
+struct PBDpopWM
+{
+	s16 main0;
+	s16 main1;
+	s16 main2;
+	s16 main3;
+
+	s16 aux0;
+	s16 aux1;
+	s16 aux2;
+	s16 aux3;
+};
+
+struct PBVolumeEnvelope
+{
+	u16 cur_volume;       // Volume at start of frame
+	s16 cur_volume_delta; // Signed per sample delta (96 samples per frame)
+};
+
+struct PBUnknown2
+{
+	u16 unknown_reserved[3];
+};
+
+struct PBAudioAddr
+{
+	u16 looping;
+	u16 sample_format;
+	u16 loop_addr_hi;  // Start of loop (this will point to a shared "zero" buffer if one-shot mode is active)
+	u16 loop_addr_lo;
+	u16 end_addr_hi;   // End of sample (and loop), inclusive
+	u16 end_addr_lo;
+	u16 cur_addr_hi;
+	u16 cur_addr_lo;
+};
+
+struct PBADPCMInfo
+{
+	s16 coefs[16];
+	u16 gain;
+	u16 pred_scale;
+	s16 yn1;
+	s16 yn2;
+};
+
+struct PBSampleRateConverter
+{
+	// ratio = (f32)ratio * 0x10000;
+	// valid range is 1/512 to 4.0000
+	u16 ratio_hi; // integer part of sampling ratio
+	u16 ratio_lo; // fraction part of sampling ratio
+	u16 cur_addr_frac;
+	s16 last_samples[4];
+};
+
+struct PBSampleRateConverterWM
+{
+	u16 cur_addr_frac;
+	s16 last_samples[4];
+};
+
+struct PBADPCMLoopInfo
+{
+	u16 pred_scale;
+	u16 yn1;
+	u16 yn2;
+};
+
+struct PBLowPassFilter
+{
+	u16 enabled;
+	s16 yn1;
+	u16 a0;
+	u16 b0;
+};
+
+struct AXPB
+{
+	u16 next_pb_hi;
+	u16 next_pb_lo;
+	u16 this_pb_hi;
+	u16 this_pb_lo;
+
+	u16 src_type;     // Type of sample rate converter (none, ?, linear)
+	u16 coef_select;
+	u16 mixer_control;
+
+	u16 running;       // 1=RUN 0=STOP
+	u16 is_stream;     // 1 = stream, 0 = one shot
+
+	PBMixer mixer;
+	PBInitialTimeDelay initial_time_delay;
+	PBUpdates updates;
+	PBDpop dpop;
+	PBVolumeEnvelope vol_env;
+	PBUnknown2 unknown3;
+	PBAudioAddr audio_addr;
+	PBADPCMInfo adpcm;
+	PBSampleRateConverter src;
+	PBADPCMLoopInfo adpcm_loop_info;
+	PBLowPassFilter lpf;
+
+	u16 padding[25];
+};
+
+struct PBBiquadFilter
+{
+
+	u16 on;  // on = 2, off = 0
+	u16 xn1; // History data
+	u16 xn2;
+	u16 yn1;
+	u16 yn2;
+	u16 b0;  // Filter coefficients
+	u16 b1;
+	u16 b2;
+	u16 a1;
+	u16 a2;
+
+};
+
+union PBInfImpulseResponseWM
+{
+	PBLowPassFilter lpf;
+	PBBiquadFilter biquad;
+};
+
+struct AXPBWii
+{
+	u16 next_pb_hi;
+	u16 next_pb_lo;
+	u16 this_pb_hi;
+	u16 this_pb_lo;
+
+	u16 src_type;       // Type of sample rate converter (none, 4-tap, linear)
+	u16 coef_select;    // coef for the 4-tap src
+	u16 mixer_control_hi;
+	u16 mixer_control_lo;
+
+	u16 running;        // 1=RUN   0=STOP
+	u16 is_stream;      // 1 = stream, 0 = one shot
+
+	PBMixerWii mixer;
+	PBInitialTimeDelay initial_time_delay;
+	PBDpopWii dpop;
+	PBVolumeEnvelope vol_env;
+	PBAudioAddr audio_addr;
+	PBADPCMInfo adpcm;
+	PBSampleRateConverter src;
+	PBADPCMLoopInfo adpcm_loop_info;
+	PBLowPassFilter lpf;
+	PBBiquadFilter biquad;
+
+	// WIIMOTE :D
+	u16 remote;
+	u16 remote_mixer_control;
+
+	PBMixerWM remote_mixer;
+	PBDpopWM remote_dpop;
+	PBSampleRateConverterWM remote_src;
+	PBInfImpulseResponseWM remote_iir;
+
+	u16 pad[12]; // align us, captain! (32B)
+};
+
+// TODO: All these enums have changed a lot for Wii
+enum
+{
+	AUDIOFORMAT_ADPCM = 0,
+	AUDIOFORMAT_PCM8  = 0x19,
+	AUDIOFORMAT_PCM16 = 0xA,
+};
+
+enum
+{
+	SRCTYPE_POLYPHASE = 0,
+	SRCTYPE_LINEAR  = 1,
+	SRCTYPE_NEAREST = 2,
+};
+
+// Both may be used at once
+enum
+{
+	FILTER_LOWPASS = 1,
+	FILTER_BIQUAD = 2,
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
new file mode 100644
index 0000000000..706c94de80
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
@@ -0,0 +1,567 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This file is UGLY (full of #ifdef) so that it can be used with both GC and
+// Wii version of AX. Maybe it would be better to abstract away the parts that
+// can be made common.
+
+#pragma once
+
+#if !defined(AX_GC) && !defined(AX_WII)
+#error AXVoice.h included without specifying version
+#endif
+
+#include <functional>
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+
+#ifdef AX_GC
+# define PB_TYPE AXPB
+# define MAX_SAMPLES_PER_FRAME 32
+#else
+# define PB_TYPE AXPBWii
+# define MAX_SAMPLES_PER_FRAME 96
+#endif
+
+// Put all of that in an anonymous namespace to avoid stupid compilers merging
+// functions from AX GC and AX Wii.
+namespace {
+
+// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits.
+#define HILO_TO_32(name) \
+	((name##_hi << 16) | name##_lo)
+
+// Used to pass a large amount of buffers to the mixing function.
+union AXBuffers
+{
+	struct
+	{
+		int* left;
+		int* right;
+		int* surround;
+
+		int* auxA_left;
+		int* auxA_right;
+		int* auxA_surround;
+
+		int* auxB_left;
+		int* auxB_right;
+		int* auxB_surround;
+
+#ifdef AX_WII
+		int* auxC_left;
+		int* auxC_right;
+		int* auxC_surround;
+
+		int* wm_main0;
+		int* wm_aux0;
+		int* wm_main1;
+		int* wm_aux1;
+		int* wm_main2;
+		int* wm_aux2;
+		int* wm_main3;
+		int* wm_aux3;
+#endif
+	};
+
+#ifdef AX_GC
+	int* ptrs[9];
+#else
+	int* ptrs[20];
+#endif
+};
+
+// Read a PB from MRAM/ARAM
+bool ReadPB(u32 addr, PB_TYPE& pb)
+{
+	u16* dst = (u16*)&pb;
+	const u16* src = (const u16*)Memory::GetPointer(addr);
+	if (!src)
+		return false;
+
+	for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
+		dst[i] = Common::swap16(src[i]);
+
+	return true;
+}
+
+// Write a PB back to MRAM/ARAM
+bool WritePB(u32 addr, const PB_TYPE& pb)
+{
+	const u16* src = (const u16*)&pb;
+	u16* dst = (u16*)Memory::GetPointer(addr);
+	if (!dst)
+		return false;
+
+	for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
+		dst[i] = Common::swap16(src[i]);
+
+	return true;
+}
+
+#if 0
+// Dump the value of a PB for debugging
+#define DUMP_U16(field) WARN_LOG(DSPHLE, "    %04x (%s)", pb.field, #field)
+#define DUMP_U32(field) WARN_LOG(DSPHLE, "    %08x (%s)", HILO_TO_32(pb.field), #field)
+void DumpPB(const PB_TYPE& pb)
+{
+	DUMP_U32(next_pb);
+	DUMP_U32(this_pb);
+	DUMP_U16(src_type);
+	DUMP_U16(coef_select);
+#ifdef AX_GC
+	DUMP_U16(mixer_control);
+#else
+	DUMP_U32(mixer_control);
+#endif
+	DUMP_U16(running);
+	DUMP_U16(is_stream);
+
+	// TODO: complete as needed
+}
+#endif
+
+// Simulated accelerator state.
+static u32 acc_loop_addr, acc_end_addr;
+static u32* acc_cur_addr;
+static PB_TYPE* acc_pb;
+static bool acc_end_reached;
+
+// Sets up the simulated accelerator.
+void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
+{
+	acc_pb = pb;
+	acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr);
+	acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr);
+	acc_cur_addr = cur_addr;
+	acc_end_reached = false;
+}
+
+// Reads a sample from the simulated accelerator. Also handles looping and
+// disabling streams that reached the end (this is done by an exception raised
+// by the accelerator on real hardware).
+u16 AcceleratorGetSample()
+{
+	u16 ret;
+	u8 step_size_bytes = 0;
+
+	// See below for explanations about acc_end_reached.
+	if (acc_end_reached)
+		return 0;
+
+	switch (acc_pb->audio_addr.sample_format)
+	{
+		case 0x00: // ADPCM
+		{
+			// ADPCM decoding, not much to explain here.
+			if ((*acc_cur_addr & 15) == 0)
+			{
+				acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1);
+				*acc_cur_addr += 2;
+			}
+
+			if ((acc_end_addr & 15) == 0)
+				step_size_bytes = 1;
+			else
+				step_size_bytes = 2;
+
+			int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF);
+			int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7;
+
+			s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0];
+			s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1];
+
+			int temp = (*acc_cur_addr & 1) ?
+					(DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) :
+					(DSP::ReadARAM(*acc_cur_addr >> 1) >> 4);
+
+			if (temp >= 8)
+				temp -= 16;
+
+			int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11);
+			MathUtil::Clamp(&val, -0x7FFF, 0x7FFF);
+
+			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
+			acc_pb->adpcm.yn1 = val;
+			*acc_cur_addr += 1;
+			ret = val;
+			break;
+		}
+
+		case 0x0A: // 16-bit PCM audio
+			ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1);
+			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
+			acc_pb->adpcm.yn1 = ret;
+			step_size_bytes = 2;
+			*acc_cur_addr += 1;
+			break;
+
+		case 0x19: // 8-bit PCM audio
+			ret = DSP::ReadARAM(*acc_cur_addr) << 8;
+			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
+			acc_pb->adpcm.yn1 = ret;
+			step_size_bytes = 2;
+			*acc_cur_addr += 1;
+			break;
+
+		default:
+			ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format);
+			return 0;
+	}
+
+	// Have we reached the end address?
+	//
+	// On real hardware, this would raise an interrupt that is handled by the
+	// UCode. We simulate what this interrupt does here.
+	if (*acc_cur_addr == (acc_end_addr + step_size_bytes - 1))
+	{
+		// loop back to loop_addr.
+		*acc_cur_addr = acc_loop_addr;
+
+		if (acc_pb->audio_addr.looping)
+		{
+			// Set the ADPCM infos to continue processing at loop_addr.
+			//
+			// For some reason, yn1 and yn2 aren't set if the voice is not of
+			// stream type. This is what the AX UCode does and I don't really
+			// know why.
+			acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale;
+			if (!acc_pb->is_stream)
+			{
+				acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1;
+				acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2;
+			}
+		}
+		else
+		{
+			// Non looping voice reached the end -> running = 0.
+			acc_pb->running = 0;
+
+#ifdef AX_WII
+			// One of the few meaningful differences between AXGC and AXWii:
+			// while AXGC handles non looping voices ending by having 0000
+			// samples at the loop address, AXWii has the 0000 samples
+			// internally in DRAM and use an internal pointer to it (loop addr
+			// does not contain 0000 samples on AXWii!).
+			acc_end_reached = true;
+#endif
+		}
+	}
+
+	return ret;
+}
+
+// Reads samples from the input callback, resamples them to <count> samples at
+// the wanted sample rate (computed from the ratio, see below).
+//
+// If srctype is SRCTYPE_POLYPHASE, coefficients need to be provided as well
+// (or the srctype will automatically be changed to LINEAR).
+//
+// Returns the current position after resampling (including fractional part).
+//
+// The input to output ratio is set in <ratio>, which is a floating point num
+// stored as a 32b integer:
+//  * Upper 16 bits of the ratio are the integer part
+//  * Lower 16 bits are the decimal part
+//
+// <curr_pos> is a 32b integer structured in the same way as the ratio: the
+// upper 16 bits are the integer part of the current position in the input
+// stream, and the lower 16 bits are the decimal part.
+//
+// We start getting samples not from sample 0, but 0.<curr_pos_frac>. This
+// avoids discontinuities in the audio stream, especially with very low ratios
+// which interpolate a lot of values between two "real" samples.
+u32 ResampleAudio(std::function<s16(u32)> input_callback, s16* output, u32 count,
+                  s16* last_samples, u32 curr_pos, u32 ratio, int srctype,
+                  const s16* coeffs)
+{
+	int read_samples_count = 0;
+
+	// TODO(delroth): find out why the polyphase resampling algorithm causes
+	// audio glitches in Wii games with non integral ratios.
+
+	// If DSP DROM coefficients are available, support polyphase resampling.
+	if (0) // if (coeffs && srctype == SRCTYPE_POLYPHASE)
+	{
+		s16 temp[4];
+		u32 idx = 0;
+
+		temp[idx++ & 3] = last_samples[0];
+		temp[idx++ & 3] = last_samples[1];
+		temp[idx++ & 3] = last_samples[2];
+		temp[idx++ & 3] = last_samples[3];
+
+		for (u32 i = 0; i < count; ++i)
+		{
+			curr_pos += ratio;
+			while (curr_pos >= 0x10000)
+			{
+				temp[idx++ & 3] = input_callback(read_samples_count++);
+				curr_pos -= 0x10000;
+			}
+
+			u16 curr_pos_frac = ((curr_pos & 0xFFFF) >> 9) << 2;
+			const s16* c = &coeffs[curr_pos_frac];
+
+			s64 t0 = temp[idx++ & 3];
+			s64 t1 = temp[idx++ & 3];
+			s64 t2 = temp[idx++ & 3];
+			s64 t3 = temp[idx++ & 3];
+
+			s64 samp = (t0 * c[0] + t1 * c[1] + t2 * c[2] + t3 * c[3]) >> 15;
+
+			output[i] = (s16)samp;
+		}
+
+		last_samples[3] = temp[--idx & 3];
+		last_samples[2] = temp[--idx & 3];
+		last_samples[1] = temp[--idx & 3];
+		last_samples[0] = temp[--idx & 3];
+	}
+	else if (srctype == SRCTYPE_LINEAR || srctype == SRCTYPE_POLYPHASE)
+	{
+		// This is the circular buffer containing samples to use for the
+		// interpolation. It is initialized with the values from the PB, and it
+		// will be stored back to the PB at the end.
+		s16 temp[4];
+		u32 idx = 0;
+
+		temp[idx++ & 3] = last_samples[0];
+		temp[idx++ & 3] = last_samples[1];
+		temp[idx++ & 3] = last_samples[2];
+		temp[idx++ & 3] = last_samples[3];
+
+		for (u32 i = 0; i < count; ++i)
+		{
+			curr_pos += ratio;
+
+			// While our current position is >= 1.0, push new samples to the
+			// circular buffer.
+			while (curr_pos >= 0x10000)
+			{
+				temp[idx++ & 3] = input_callback(read_samples_count++);
+				curr_pos -= 0x10000;
+			}
+
+			// Get our current fractional position, used to know how much of
+			// curr0 and how much of curr1 the output sample should be.
+			u16 curr_frac = curr_pos & 0xFFFF;
+			u16 inv_curr_frac = -curr_frac;
+
+			// Interpolate! If curr_frac is 0, we can simply take the last
+			// sample without any multiplying.
+			s16 sample;
+			if (curr_frac)
+			{
+				s32 s0 = temp[idx++ & 3];
+				s32 s1 = temp[idx++ & 3];
+
+				sample = ((s0 * inv_curr_frac) + (s1 * curr_frac)) >> 16;
+				idx += 2;
+			}
+			else
+			{
+				sample = temp[idx++ & 3];
+				idx += 3;
+			}
+
+			output[i] = sample;
+		}
+
+		// Update the four last_samples values.
+		last_samples[3] = temp[--idx & 3];
+		last_samples[2] = temp[--idx & 3];
+		last_samples[1] = temp[--idx & 3];
+		last_samples[0] = temp[--idx & 3];
+	}
+	else // SRCTYPE_NEAREST
+	{
+		// No sample rate conversion here: simply read samples from the
+		// accelerator to the output buffer.
+		for (u32 i = 0; i < count; ++i)
+			output[i] = input_callback(i);
+
+		memcpy(last_samples, output + count - 4, 4 * sizeof (u16));
+	}
+
+	return curr_pos;
+}
+
+// Read <count> input samples from ARAM, decoding and converting rate
+// if required.
+void GetInputSamples(PB_TYPE& pb, s16* samples, u16 count, const s16* coeffs)
+{
+	u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr);
+	AcceleratorSetup(&pb, &cur_addr);
+
+	if (coeffs)
+		coeffs += pb.coef_select * 0x200;
+	u32 curr_pos = ResampleAudio([](u32) { return AcceleratorGetSample(); },
+	                             samples, count, pb.src.last_samples,
+	                             pb.src.cur_addr_frac, HILO_TO_32(pb.src.ratio),
+	                             pb.src_type, coeffs);
+	pb.src.cur_addr_frac = (curr_pos & 0xFFFF);
+
+	// Update current position in the PB.
+	pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16);
+	pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF);
+}
+
+// Add samples to an output buffer, with optional volume ramping.
+void MixAdd(int* out, const s16* input, u32 count, u16* pvol, s16* dpop, bool ramp)
+{
+	u16& volume = pvol[0];
+	u16 volume_delta = pvol[1];
+
+	// If volume ramping is disabled, set volume_delta to 0. That way, the
+	// mixing loop can avoid testing if volume ramping is enabled at each step,
+	// and just add volume_delta.
+	if (!ramp)
+		volume_delta = 0;
+
+	for (u32 i = 0; i < count; ++i)
+	{
+		s64 sample = input[i];
+		sample *= volume;
+		sample >>= 15;
+		sample = MathUtil::Clamp((s32)sample, -32767, 32767);	// -32768 ?
+
+		out[i] += (s16)sample;
+		volume += volume_delta;
+
+		*dpop = (s16)sample;
+	}
+}
+
+// Execute a low pass filter on the samples using one history value. Returns
+// the new history value.
+s16 LowPassFilter(s16* samples, u32 count, s16 yn1, u16 a0, u16 b0)
+{
+	for (u32 i = 0; i < count; ++i)
+		yn1 = samples[i] = (a0 * (s32)samples[i] + b0 * (s32)yn1) >> 15;
+	return yn1;
+}
+
+// Process 1ms of audio (for AX GC) or 3ms of audio (for AX Wii) from a PB and
+// mix it to the output buffers.
+void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl mctrl, const s16* coeffs)
+{
+	// If the voice is not running, nothing to do.
+	if (!pb.running)
+		return;
+
+	// Read input samples, performing sample rate conversion if needed.
+	s16 samples[MAX_SAMPLES_PER_FRAME];
+	GetInputSamples(pb, samples, count, coeffs);
+
+	// Apply a global volume ramp using the volume envelope parameters.
+	for (u32 i = 0; i < count; ++i)
+	{
+		samples[i] = MathUtil::Clamp(((s32)samples[i] * pb.vol_env.cur_volume) >> 15, -32767, 32767);	// -32768 ?
+		pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta;
+	}
+
+	// Optionally, execute a low pass filter
+	// TODO: LPF code is currently broken, causing Super Monkey Ball sound
+	// corruption. Disabled until someone figures out what is wrong with it.
+	if (0 && pb.lpf.enabled)
+	{
+		pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
+	}
+
+	// Mix LRS, AUXA and AUXB depending on mixer_control
+	// TODO: Handle DPL2 on AUXB.
+
+#define MIX_ON(C) (0 != (mctrl & MIX_##C))
+#define RAMP_ON(C) (0 != (mctrl & MIX_##C##_RAMP))
+
+	if (MIX_ON(L))
+		MixAdd(buffers.left, samples, count, &pb.mixer.left, &pb.dpop.left, RAMP_ON(L));
+	if (MIX_ON(R))
+		MixAdd(buffers.right, samples, count, &pb.mixer.right, &pb.dpop.right, RAMP_ON(R));
+	if (MIX_ON(S))
+		MixAdd(buffers.surround, samples, count, &pb.mixer.surround, &pb.dpop.surround, RAMP_ON(S));
+
+	if (MIX_ON(AUXA_L))
+		MixAdd(buffers.auxA_left, samples, count, &pb.mixer.auxA_left, &pb.dpop.auxA_left, RAMP_ON(AUXA_L));
+	if (MIX_ON(AUXA_R))
+		MixAdd(buffers.auxA_right, samples, count, &pb.mixer.auxA_right, &pb.dpop.auxA_right, RAMP_ON(AUXA_R));
+	if (MIX_ON(AUXA_S))
+		MixAdd(buffers.auxA_surround, samples, count, &pb.mixer.auxA_surround, &pb.dpop.auxA_surround, RAMP_ON(AUXA_S));
+
+	if (MIX_ON(AUXB_L))
+		MixAdd(buffers.auxB_left, samples, count, &pb.mixer.auxB_left, &pb.dpop.auxB_left, RAMP_ON(AUXB_L));
+	if (MIX_ON(AUXB_R))
+		MixAdd(buffers.auxB_right, samples, count, &pb.mixer.auxB_right, &pb.dpop.auxB_right, RAMP_ON(AUXB_R));
+	if (MIX_ON(AUXB_S))
+		MixAdd(buffers.auxB_surround, samples, count, &pb.mixer.auxB_surround, &pb.dpop.auxB_surround, RAMP_ON(AUXB_S));
+
+#ifdef AX_WII
+	if (MIX_ON(AUXC_L))
+		MixAdd(buffers.auxC_left, samples, count, &pb.mixer.auxC_left, &pb.dpop.auxC_left, RAMP_ON(AUXC_L));
+	if (MIX_ON(AUXC_R))
+		MixAdd(buffers.auxC_right, samples, count, &pb.mixer.auxC_right, &pb.dpop.auxC_right, RAMP_ON(AUXC_R));
+	if (MIX_ON(AUXC_S))
+		MixAdd(buffers.auxC_surround, samples, count, &pb.mixer.auxC_surround, &pb.dpop.auxC_surround, RAMP_ON(AUXC_S));
+#endif
+
+#undef MIX_ON
+#undef RAMP_ON
+
+	// Optionally, phase shift left or right channel to simulate 3D sound.
+	if (pb.initial_time_delay.on)
+	{
+		// TODO
+	}
+
+#ifdef AX_WII
+	// Wiimote mixing.
+	if (pb.remote)
+	{
+		// Old AXWii versions process ms per ms.
+		u16 wm_count = count == 96 ? 18 : 6;
+
+		// Interpolate at most 18 samples from the 96 samples we read before.
+		s16 wm_samples[18];
+
+		// We use ratio 0x55555 == (5 * 65536 + 21845) / 65536 == 5.3333 which
+		// is the nearest we can get to 96/18
+		u32 curr_pos = ResampleAudio([&samples](u32 i) { return samples[i]; },
+		                             wm_samples, wm_count, pb.remote_src.last_samples,
+		                             pb.remote_src.cur_addr_frac, 0x55555,
+		                             SRCTYPE_POLYPHASE, coeffs);
+		pb.remote_src.cur_addr_frac = curr_pos & 0xFFFF;
+
+		// Mix to main[0-3] and aux[0-3]
+#define WMCHAN_MIX_ON(n) (0 != ((pb.remote_mixer_control >> (2 * n)) & 3))
+#define WMCHAN_MIX_RAMP(n) (0 != ((pb.remote_mixer_control >> (2 * n)) & 2))
+
+		if (WMCHAN_MIX_ON(0))
+			MixAdd(buffers.wm_main0, wm_samples, wm_count, &pb.remote_mixer.main0, &pb.remote_dpop.main0, WMCHAN_MIX_RAMP(0));
+		if (WMCHAN_MIX_ON(1))
+			MixAdd(buffers.wm_aux0, wm_samples, wm_count, &pb.remote_mixer.aux0, &pb.remote_dpop.aux0, WMCHAN_MIX_RAMP(1));
+		if (WMCHAN_MIX_ON(2))
+			MixAdd(buffers.wm_main1, wm_samples, wm_count, &pb.remote_mixer.main1, &pb.remote_dpop.main1, WMCHAN_MIX_RAMP(2));
+		if (WMCHAN_MIX_ON(3))
+			MixAdd(buffers.wm_aux1, wm_samples, wm_count, &pb.remote_mixer.aux1, &pb.remote_dpop.aux1, WMCHAN_MIX_RAMP(3));
+		if (WMCHAN_MIX_ON(4))
+			MixAdd(buffers.wm_main2, wm_samples, wm_count, &pb.remote_mixer.main2, &pb.remote_dpop.main2, WMCHAN_MIX_RAMP(4));
+		if (WMCHAN_MIX_ON(5))
+			MixAdd(buffers.wm_aux2, wm_samples, wm_count, &pb.remote_mixer.aux2, &pb.remote_dpop.aux2, WMCHAN_MIX_RAMP(5));
+		if (WMCHAN_MIX_ON(6))
+			MixAdd(buffers.wm_main3, wm_samples, wm_count, &pb.remote_mixer.main3, &pb.remote_dpop.main3, WMCHAN_MIX_RAMP(6));
+		if (WMCHAN_MIX_ON(7))
+			MixAdd(buffers.wm_aux3, wm_samples, wm_count, &pb.remote_mixer.aux3, &pb.remote_dpop.aux3, WMCHAN_MIX_RAMP(7));
+	}
+#undef WMCHAN_MIX_RAMP
+#undef WMCHAN_MIX_ON
+#endif
+}
+
+} // namespace
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
new file mode 100644
index 0000000000..706f8012db
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
@@ -0,0 +1,689 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+#define AX_WII // Used in AXVoice.
+
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/DSPHLE/MailHandler.h"
+
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
+#include "Core/HW/DSPHLE/UCodes/AXWii.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+
+AXWiiUCode::AXWiiUCode(DSPHLE *dsphle, u32 crc)
+	: AXUCode(dsphle, crc),
+	  m_last_main_volume(0x8000)
+{
+	for (u16& volume : m_last_aux_volumes)
+		volume = 0x8000;
+
+	WARN_LOG(DSPHLE, "Instantiating AXWiiUCode");
+
+	m_old_axwii = (crc == 0xfa450138);
+}
+
+AXWiiUCode::~AXWiiUCode()
+{
+}
+
+void AXWiiUCode::HandleCommandList()
+{
+	// Temp variables for addresses computation
+	u16 addr_hi, addr_lo;
+	u16 addr2_hi, addr2_lo;
+	u16 volume;
+
+	u32 pb_addr = 0;
+
+	// WARN_LOG(DSPHLE, "Command list:");
+	// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
+	//     WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
+	// WARN_LOG(DSPHLE, "-------------");
+
+	u32 curr_idx = 0;
+	bool end = false;
+	while (!end)
+	{
+		u16 cmd = m_cmdlist[curr_idx++];
+
+		if (m_old_axwii)
+		{
+			switch (cmd)
+			{
+				// Some of these commands are unknown, or unused in this AX HLE.
+				// We still need to skip their arguments using "curr_idx += N".
+
+				case CMD_SETUP_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					SetupProcessing(HILO_TO_32(addr));
+					break;
+
+				case CMD_ADD_TO_LR_OLD:
+				case CMD_SUB_TO_LR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR_OLD);
+					break;
+
+				case CMD_ADD_SUB_TO_LR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddSubToLR(HILO_TO_32(addr));
+					break;
+
+				case CMD_PB_ADDR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					pb_addr = HILO_TO_32(addr);
+					break;
+
+				case CMD_PROCESS_OLD:
+					ProcessPBList(pb_addr);
+					break;
+
+				case CMD_MIX_AUXA_OLD:
+				case CMD_MIX_AUXB_OLD:
+				case CMD_MIX_AUXC_OLD:
+					volume = m_cmdlist[curr_idx++];
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					addr2_hi = m_cmdlist[curr_idx++];
+					addr2_lo = m_cmdlist[curr_idx++];
+					MixAUXSamples(cmd - CMD_MIX_AUXA_OLD, HILO_TO_32(addr), HILO_TO_32(addr2), volume);
+					break;
+
+				case CMD_UPL_AUXA_MIX_LRSC_OLD:
+				case CMD_UPL_AUXB_MIX_LRSC_OLD:
+				{
+					volume = m_cmdlist[curr_idx++];
+					u32 addresses[6] = {
+						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
+						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
+						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
+						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
+						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
+						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
+					};
+					curr_idx += 12;
+					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC_OLD, addresses, volume);
+					break;
+				}
+
+				// TODO(delroth): figure this one out, it's used by almost every
+				// game I've tested so far.
+				case CMD_UNK_0B_OLD: curr_idx += 4; break;
+
+				case CMD_OUTPUT_OLD:
+				case CMD_OUTPUT_DPL2_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					addr2_hi = m_cmdlist[curr_idx++];
+					addr2_lo = m_cmdlist[curr_idx++];
+					OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), 0x8000,
+					             cmd == CMD_OUTPUT_DPL2_OLD);
+					break;
+
+				case CMD_WM_OUTPUT_OLD:
+				{
+					u32 addresses[4] = {
+						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
+						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
+						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
+						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
+					};
+					curr_idx += 8;
+					OutputWMSamples(addresses);
+					break;
+				}
+
+				case CMD_END_OLD:
+					end = true;
+					break;
+			}
+		}
+		else
+		{
+			switch (cmd)
+			{
+				// Some of these commands are unknown, or unused in this AX HLE.
+				// We still need to skip their arguments using "curr_idx += N".
+
+				case CMD_SETUP:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					SetupProcessing(HILO_TO_32(addr));
+					break;
+
+				case CMD_ADD_TO_LR:
+				case CMD_SUB_TO_LR:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR);
+					break;
+
+				case CMD_ADD_SUB_TO_LR:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddSubToLR(HILO_TO_32(addr));
+					break;
+
+				case CMD_PROCESS:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					ProcessPBList(HILO_TO_32(addr));
+					break;
+
+				case CMD_MIX_AUXA:
+				case CMD_MIX_AUXB:
+				case CMD_MIX_AUXC:
+					volume = m_cmdlist[curr_idx++];
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					addr2_hi = m_cmdlist[curr_idx++];
+					addr2_lo = m_cmdlist[curr_idx++];
+					MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume);
+					break;
+
+				case CMD_UPL_AUXA_MIX_LRSC:
+				case CMD_UPL_AUXB_MIX_LRSC:
+				{
+					volume = m_cmdlist[curr_idx++];
+					u32 addresses[6] = {
+						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
+						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
+						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
+						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
+						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
+						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
+					};
+					curr_idx += 12;
+					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC, addresses, volume);
+					break;
+				}
+
+				// TODO(delroth): figure this one out, it's used by almost every
+				// game I've tested so far.
+				case CMD_UNK_0A: curr_idx += 4; break;
+
+				case CMD_OUTPUT:
+				case CMD_OUTPUT_DPL2:
+					volume = m_cmdlist[curr_idx++];
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					addr2_hi = m_cmdlist[curr_idx++];
+					addr2_lo = m_cmdlist[curr_idx++];
+					OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume,
+					              cmd == CMD_OUTPUT_DPL2);
+					break;
+
+				case CMD_WM_OUTPUT:
+				{
+					u32 addresses[4] = {
+						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
+						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
+						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
+						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
+					};
+					curr_idx += 8;
+					OutputWMSamples(addresses);
+					break;
+				}
+
+				case CMD_END:
+					end = true;
+					break;
+			}
+		}
+	}
+}
+
+void AXWiiUCode::SetupProcessing(u32 init_addr)
+{
+	// TODO: should be easily factorizable with AX
+	s16 init_data[60];
+
+	for (u32 i = 0; i < 60; ++i)
+		init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
+
+	// List of all buffers we have to initialize
+	struct
+	{
+		int* ptr;
+		u32 samples;
+	} buffers[] = {
+		{ m_samples_left, 32 },
+		{ m_samples_right, 32 },
+		{ m_samples_surround, 32 },
+		{ m_samples_auxA_left, 32 },
+		{ m_samples_auxA_right, 32 },
+		{ m_samples_auxA_surround, 32 },
+		{ m_samples_auxB_left, 32 },
+		{ m_samples_auxB_right, 32 },
+		{ m_samples_auxB_surround, 32 },
+		{ m_samples_auxC_left, 32 },
+		{ m_samples_auxC_right, 32 },
+		{ m_samples_auxC_surround, 32 },
+
+		{ m_samples_wm0, 6 },
+		{ m_samples_aux0, 6 },
+		{ m_samples_wm1, 6 },
+		{ m_samples_aux1, 6 },
+		{ m_samples_wm2, 6 },
+		{ m_samples_aux2, 6 },
+		{ m_samples_wm3, 6 },
+		{ m_samples_aux3, 6 }
+	};
+
+	u32 init_idx = 0;
+	for (auto& buffer : buffers)
+	{
+		s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
+		s16 delta = (s16)init_data[init_idx + 2];
+
+		init_idx += 3;
+
+		if (!init_val)
+		{
+			memset(buffer.ptr, 0, 3 * buffer.samples * sizeof (int));
+		}
+		else
+		{
+			for (u32 j = 0; j < 3 * buffer.samples; ++j)
+			{
+				buffer.ptr[j] = init_val;
+				init_val += delta;
+			}
+		}
+	}
+}
+
+void AXWiiUCode::AddToLR(u32 val_addr, bool neg)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
+	for (int i = 0; i < 32 * 3; ++i)
+	{
+		int val = (int)Common::swap32(*ptr++);
+		if (neg)
+			val = -val;
+
+		m_samples_left[i] += val;
+		m_samples_right[i] += val;
+	}
+}
+
+void AXWiiUCode::AddSubToLR(u32 val_addr)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
+	for (int i = 0; i < 32 * 3; ++i)
+	{
+		int val = (int)Common::swap32(*ptr++);
+		m_samples_left[i] += val;
+	}
+	for (int i = 0; i < 32 * 3; ++i)
+	{
+		int val = (int)Common::swap32(*ptr++);
+		m_samples_right[i] -= val;
+	}
+}
+
+AXMixControl AXWiiUCode::ConvertMixerControl(u32 mixer_control)
+{
+	u32 ret = 0;
+
+	if (mixer_control & 0x00000001) ret |= MIX_L;
+	if (mixer_control & 0x00000002) ret |= MIX_R;
+	if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP;
+	if (mixer_control & 0x00000008) ret |= MIX_S;
+	if (mixer_control & 0x00000010) ret |= MIX_S_RAMP;
+	if (mixer_control & 0x00010000) ret |= MIX_AUXA_L;
+	if (mixer_control & 0x00020000) ret |= MIX_AUXA_R;
+	if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
+	if (mixer_control & 0x00080000) ret |= MIX_AUXA_S;
+	if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP;
+	if (mixer_control & 0x00200000) ret |= MIX_AUXB_L;
+	if (mixer_control & 0x00400000) ret |= MIX_AUXB_R;
+	if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
+	if (mixer_control & 0x01000000) ret |= MIX_AUXB_S;
+	if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP;
+	if (mixer_control & 0x04000000) ret |= MIX_AUXC_L;
+	if (mixer_control & 0x08000000) ret |= MIX_AUXC_R;
+	if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP;
+	if (mixer_control & 0x20000000) ret |= MIX_AUXC_S;
+	if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP;
+
+	return (AXMixControl)ret;
+}
+
+void AXWiiUCode::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals)
+{
+	float curr = vol1;
+	for (size_t i = 0; i < nvals; ++i)
+	{
+		curr += (vol2 - vol1) / (float)nvals;
+		output[i] = (u16) curr;
+	}
+}
+
+bool AXWiiUCode::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
+                                        u32* updates_addr)
+{
+	u16* pb_mem = (u16*)&pb;
+
+	if (!m_old_axwii)
+		return false;
+
+	// Copy the num_updates field.
+	memcpy(num_updates, pb_mem + 41, 6);
+
+	// Get the address of the updates data
+	u16 addr_hi = pb_mem[44];
+	u16 addr_lo = pb_mem[45];
+	u32 addr = HILO_TO_32(addr);
+	u16* ptr = (u16*)HLEMemory_Get_Pointer(addr);
+
+	*updates_addr = addr;
+
+	// Copy the updates data and change the offset to match a PB without
+	// updates data.
+	u32 updates_count = num_updates[0] + num_updates[1] + num_updates[2];
+	for (u32 i = 0; i < updates_count; ++i)
+	{
+		u16 update_off = Common::swap16(ptr[2 * i]);
+		u16 update_val = Common::swap16(ptr[2 * i + 1]);
+
+		if (update_off > 45)
+			update_off -= 5;
+
+		updates[2 * i] = update_off;
+		updates[2 * i + 1] = update_val;
+	}
+
+	// Remove the updates data from the PB
+	memmove(pb_mem + 41, pb_mem + 46, sizeof (pb) - 2 * 46);
+
+	return true;
+}
+
+void AXWiiUCode::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr)
+{
+	u16* pb_mem = (u16*)&pb;
+
+	// Make some space
+	memmove(pb_mem + 46, pb_mem + 41, sizeof (pb) - 2 * 46);
+
+	// Reinsert previous values
+	pb_mem[41] = num_updates[0];
+	pb_mem[42] = num_updates[1];
+	pb_mem[43] = num_updates[2];
+	pb_mem[44] = updates_addr >> 16;
+	pb_mem[45] = updates_addr & 0xFFFF;
+}
+
+void AXWiiUCode::ProcessPBList(u32 pb_addr)
+{
+	AXPBWii pb;
+
+	while (pb_addr)
+	{
+		AXBuffers buffers = {{
+			m_samples_left,
+			m_samples_right,
+			m_samples_surround,
+			m_samples_auxA_left,
+			m_samples_auxA_right,
+			m_samples_auxA_surround,
+			m_samples_auxB_left,
+			m_samples_auxB_right,
+			m_samples_auxB_surround,
+			m_samples_auxC_left,
+			m_samples_auxC_right,
+			m_samples_auxC_surround,
+			m_samples_wm0,
+			m_samples_aux0,
+			m_samples_wm1,
+			m_samples_aux1,
+			m_samples_wm2,
+			m_samples_aux2,
+			m_samples_wm3,
+			m_samples_aux3
+		}};
+
+		if (!ReadPB(pb_addr, pb))
+			break;
+
+		u16 num_updates[3];
+		u16 updates[1024];
+		u32 updates_addr;
+		if (ExtractUpdatesFields(pb, num_updates, updates, &updates_addr))
+		{
+			for (int curr_ms = 0; curr_ms < 3; ++curr_ms)
+			{
+				ApplyUpdatesForMs(curr_ms, (u16*)&pb, num_updates, updates);
+				ProcessVoice(pb, buffers, 32,
+				             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
+				             m_coeffs_available ? m_coeffs : nullptr);
+
+				// Forward the buffers
+				for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
+					buffers.ptrs[i] += 32;
+			}
+			ReinjectUpdatesFields(pb, num_updates, updates_addr);
+		}
+		else
+		{
+			ProcessVoice(pb, buffers, 96,
+			             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
+			             m_coeffs_available ? m_coeffs : nullptr);
+		}
+
+		WritePB(pb_addr, pb);
+		pb_addr = HILO_TO_32(pb.next_pb);
+	}
+}
+
+void AXWiiUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume)
+{
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
+	m_last_aux_volumes[aux_id] = volume;
+
+	int* buffers[3] = { nullptr };
+	int* main_buffers[3] = {
+		m_samples_left,
+		m_samples_right,
+		m_samples_surround
+	};
+
+	switch (aux_id)
+	{
+	case 0:
+		buffers[0] = m_samples_auxA_left;
+		buffers[1] = m_samples_auxA_right;
+		buffers[2] = m_samples_auxA_surround;
+		break;
+
+	case 1:
+		buffers[0] = m_samples_auxB_left;
+		buffers[1] = m_samples_auxB_right;
+		buffers[2] = m_samples_auxB_surround;
+		break;
+
+	case 2:
+		buffers[0] = m_samples_auxC_left;
+		buffers[1] = m_samples_auxC_right;
+		buffers[2] = m_samples_auxC_surround;
+		break;
+	}
+
+	// Send the content of AUX buffers to the CPU
+	if (write_addr)
+	{
+		int* ptr = (int*)HLEMemory_Get_Pointer(write_addr);
+		for (auto& buffer : buffers)
+			for (u32 j = 0; j < 3 * 32; ++j)
+				*ptr++ = Common::swap32(buffer[j]);
+	}
+
+	// Then read the buffers from the CPU and add to our main buffers.
+	int* ptr = (int*)HLEMemory_Get_Pointer(read_addr);
+	for (auto& main_buffer : main_buffers)
+		for (u32 j = 0; j < 3 * 32; ++j)
+		{
+			s64 sample = (s64)(s32)Common::swap32(*ptr++);
+			sample *= volume_ramp[j];
+			main_buffer[j] += (s32)(sample >> 15);
+		}
+}
+
+void AXWiiUCode::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
+{
+	int* aux_left = aux_id ? m_samples_auxB_left : m_samples_auxA_left;
+	int* aux_right = aux_id ? m_samples_auxB_right : m_samples_auxA_right;
+	int* aux_surround = aux_id ? m_samples_auxB_surround : m_samples_auxA_surround;
+	int* auxc_buffer = aux_id ? m_samples_auxC_surround : m_samples_auxC_right;
+
+	int* upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[0]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_left[i]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_right[i]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_surround[i]);
+
+	upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[1]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(auxc_buffer[i]);
+
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
+	m_last_aux_volumes[aux_id] = volume;
+
+	int* mix_dest[4] = {
+		m_samples_left,
+		m_samples_right,
+		m_samples_surround,
+		m_samples_auxC_left
+	};
+	for (u32 mix_i = 0; mix_i < 4; ++mix_i)
+	{
+		int* dl_ptr = (int*)HLEMemory_Get_Pointer(addresses[2 + mix_i]);
+		for (u32 i = 0; i < 96; ++i)
+			aux_left[i] = Common::swap32(dl_ptr[i]);
+
+		for (u32 i = 0; i < 96; ++i)
+		{
+			s64 sample = (s64)(s32)aux_left[i];
+			sample *= volume_ramp[i];
+			mix_dest[mix_i][i] += (s32)(sample >> 15);
+		}
+	}
+}
+
+void AXWiiUCode::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
+                                 bool upload_auxc)
+{
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_main_volume, volume, 96);
+	m_last_main_volume = volume;
+
+	int upload_buffer[3 * 32] = { 0 };
+
+	for (u32 i = 0; i < 3 * 32; ++i)
+		upload_buffer[i] = Common::swap32(m_samples_surround[i]);
+	memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_buffer));
+
+	if (upload_auxc)
+	{
+		surround_addr += sizeof (upload_buffer);
+		for (u32 i = 0; i < 3 * 32; ++i)
+			upload_buffer[i] = Common::swap32(m_samples_auxC_left[i]);
+		memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_buffer));
+	}
+
+	short buffer[3 * 32 * 2];
+
+	// Clamp internal buffers to 16 bits.
+	for (u32 i = 0; i < 3 * 32; ++i)
+	{
+		int left  = m_samples_left[i];
+		int right = m_samples_right[i];
+
+		// Apply global volume. Cast to s64 to avoid overflow.
+		left = ((s64)left * volume_ramp[i]) >> 15;
+		right = ((s64)right * volume_ramp[i]) >> 15;
+
+		MathUtil::Clamp(&left, -32767, 32767);
+		MathUtil::Clamp(&right, -32767, 32767);
+
+		m_samples_left[i] = left;
+		m_samples_right[i] = right;
+	}
+
+	for (u32 i = 0; i < 3 * 32; ++i)
+	{
+		buffer[2 * i] = Common::swap16(m_samples_right[i]);
+		buffer[2 * i + 1] = Common::swap16(m_samples_left[i]);
+	}
+
+	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
+
+	// There should be a DSP_SYNC message sent here. However, it looks like not
+	// sending it does not cause any issue, and sending it actually causes some
+	// sounds to go at half speed. I have no idea why.
+}
+
+void AXWiiUCode::OutputWMSamples(u32* addresses)
+{
+	int* buffers[] = {
+		m_samples_wm0,
+		m_samples_wm1,
+		m_samples_wm2,
+		m_samples_wm3
+	};
+
+	for (u32 i = 0; i < 4; ++i)
+	{
+		int* in = buffers[i];
+		u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]);
+		for (u32 j = 0; j < 3 * 6; ++j)
+		{
+			int sample = in[j];
+			MathUtil::Clamp(&sample, -32767, 32767);
+			out[j] = Common::swap16((u16)sample);
+		}
+	}
+}
+
+u32 AXWiiUCode::GetUpdateMs()
+{
+	return 3;
+}
+
+void AXWiiUCode::DoState(PointerWrap &p)
+{
+	DoStateShared(p);
+	DoAXState(p);
+
+	p.Do(m_samples_auxC_left);
+	p.Do(m_samples_auxC_right);
+	p.Do(m_samples_auxC_surround);
+
+	p.Do(m_samples_wm0);
+	p.Do(m_samples_wm1);
+	p.Do(m_samples_wm2);
+	p.Do(m_samples_wm3);
+
+	p.Do(m_samples_aux0);
+	p.Do(m_samples_aux1);
+	p.Do(m_samples_aux2);
+	p.Do(m_samples_aux3);
+
+	p.Do(m_last_main_volume);
+	p.Do(m_last_aux_volumes);
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
new file mode 100644
index 0000000000..3cdba24d7e
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
@@ -0,0 +1,112 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+
+class AXWiiUCode : public AXUCode
+{
+public:
+	AXWiiUCode(DSPHLE *dsphle, u32 crc);
+	virtual ~AXWiiUCode();
+	u32 GetUpdateMs() override;
+
+	virtual void DoState(PointerWrap &p) override;
+
+protected:
+	// Additional AUX buffers
+	int m_samples_auxC_left[32 * 3];
+	int m_samples_auxC_right[32 * 3];
+	int m_samples_auxC_surround[32 * 3];
+
+	// Wiimote buffers
+	int m_samples_wm0[6 * 3];
+	int m_samples_aux0[6 * 3];
+	int m_samples_wm1[6 * 3];
+	int m_samples_aux1[6 * 3];
+	int m_samples_wm2[6 * 3];
+	int m_samples_aux2[6 * 3];
+	int m_samples_wm3[6 * 3];
+	int m_samples_aux3[6 * 3];
+
+	// Are we implementing an old version of AXWii which still has updates?
+	bool m_old_axwii;
+
+	// Last volume values for MAIN and AUX. Used to generate volume ramps to
+	// interpolate nicely between old and new volume values.
+	u16 m_last_main_volume;
+	u16 m_last_aux_volumes[3];
+
+	// If needed, extract the updates related fields from a PB. We need to
+	// reinject them afterwards so that the correct PB typs is written to RAM.
+	bool ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
+	                          u32* updates_addr);
+	void ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr);
+
+	// Convert a mixer_control bitfield to our internal representation for that
+	// value. Required because that bitfield has a different meaning in some
+	// versions of AX.
+	AXMixControl ConvertMixerControl(u32 mixer_control);
+
+	// Generate a volume ramp from vol1 to vol2, interpolating n volume values.
+	// Uses floating point arithmetic, which isn't exactly what the UCode does,
+	// but this gives better precision and nicer code.
+	void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
+
+	virtual void HandleCommandList() override;
+
+	void SetupProcessing(u32 init_addr);
+	void AddToLR(u32 val_addr, bool neg);
+	void AddSubToLR(u32 val_addr);
+	void ProcessPBList(u32 pb_addr);
+	void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume);
+	void UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume);
+	void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
+	                   bool upload_auxc);
+	void OutputWMSamples(u32* addresses); // 4 addresses
+
+private:
+	enum CmdType
+	{
+		CMD_SETUP             = 0x00,
+		CMD_ADD_TO_LR         = 0x01,
+		CMD_SUB_TO_LR         = 0x02,
+		CMD_ADD_SUB_TO_LR     = 0x03,
+		CMD_PROCESS           = 0x04,
+		CMD_MIX_AUXA          = 0x05,
+		CMD_MIX_AUXB          = 0x06,
+		CMD_MIX_AUXC          = 0x07,
+		CMD_UPL_AUXA_MIX_LRSC = 0x08,
+		CMD_UPL_AUXB_MIX_LRSC = 0x09,
+		CMD_UNK_0A            = 0x0A,
+		CMD_OUTPUT            = 0x0B,
+		CMD_OUTPUT_DPL2       = 0x0C,
+		CMD_WM_OUTPUT         = 0x0D,
+		CMD_END               = 0x0E,
+	};
+
+	// A lot of these are similar to the new version, but there is an offset in
+	// the command ids due to the PB_ADDR command (which was removed from the
+	// new AXWii).
+	enum CmdTypeOld
+	{
+		CMD_SETUP_OLD             = 0x00,
+		CMD_ADD_TO_LR_OLD         = 0x01,
+		CMD_SUB_TO_LR_OLD         = 0x02,
+		CMD_ADD_SUB_TO_LR_OLD     = 0x03,
+		CMD_PB_ADDR_OLD           = 0x04,
+		CMD_PROCESS_OLD           = 0x05,
+		CMD_MIX_AUXA_OLD          = 0x06,
+		CMD_MIX_AUXB_OLD          = 0x07,
+		CMD_MIX_AUXC_OLD          = 0x08,
+		CMD_UPL_AUXA_MIX_LRSC_OLD = 0x09,
+		CMD_UPL_AUXB_MIX_LRSC_OLD = 0x0a,
+		CMD_UNK_0B_OLD            = 0x0B,
+		CMD_OUTPUT_OLD            = 0x0C, // no volume!
+		CMD_OUTPUT_DPL2_OLD       = 0x0D,
+		CMD_WM_OUTPUT_OLD         = 0x0E,
+		CMD_END_OLD               = 0x0F
+	};
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp
new file mode 100644
index 0000000000..478e4ed463
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp
@@ -0,0 +1,55 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPHLE/UCodes/CARD.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+
+CARDUCode::CARDUCode(DSPHLE *dsphle, u32 crc)
+	: UCodeInterface(dsphle, crc)
+{
+	DEBUG_LOG(DSPHLE, "CARDUCode - initialized");
+	m_mail_handler.PushMail(DSP_INIT);
+}
+
+
+CARDUCode::~CARDUCode()
+{
+	m_mail_handler.Clear();
+}
+
+
+void CARDUCode::Update()
+{
+	// check if we have to sent something
+	if (!m_mail_handler.IsEmpty())
+	{
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+}
+
+u32 CARDUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void CARDUCode::HandleMail(u32 mail)
+{
+	if (mail == 0xFF000000) // unlock card
+	{
+		//	m_Mails.push(0x00000001); // ACK (actually anything != 0)
+	}
+	else
+	{
+		DEBUG_LOG(DSPHLE, "CARDUCode - unknown command: %x", mail);
+	}
+
+	m_mail_handler.PushMail(DSP_DONE);
+	m_dsphle->SetUCode(UCODE_ROM);
+}
+
+
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/CARD.h b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.h
new file mode 100644
index 0000000000..3290af55e2
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.h
@@ -0,0 +1,19 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+class CARDUCode : public UCodeInterface
+{
+public:
+	CARDUCode(DSPHLE *dsphle, u32 crc);
+	virtual ~CARDUCode();
+	u32 GetUpdateMs() override;
+
+	void HandleMail(u32 mail) override;
+	void Update() override;
+};
+
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
new file mode 100644
index 0000000000..4d49081466
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
@@ -0,0 +1,147 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPHLE/UCodes/GBA.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+GBAUCode::GBAUCode(DSPHLE *dsphle, u32 crc)
+: UCodeInterface(dsphle, crc)
+{
+	m_mail_handler.PushMail(DSP_INIT);
+}
+
+GBAUCode::~GBAUCode()
+{
+	m_mail_handler.Clear();
+}
+
+void GBAUCode::Update()
+{
+	// check if we have to send something
+	if (!m_mail_handler.IsEmpty())
+	{
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+}
+
+u32 GBAUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void GBAUCode::HandleMail(u32 mail)
+{
+	static bool nextmail_is_mramaddr = false;
+	static bool calc_done = false;
+
+	if (m_upload_setup_in_progress)
+	{
+		PrepareBootUCode(mail);
+	}
+	else if ((mail >> 16 == 0xabba) && !nextmail_is_mramaddr)
+	{
+		nextmail_is_mramaddr = true;
+	}
+	else if (nextmail_is_mramaddr)
+	{
+		nextmail_is_mramaddr = false;
+		u32 mramaddr = mail;
+
+		struct sec_params_t
+		{
+			u16 key[2];
+			u16 unk1[2];
+			u16 unk2[2];
+			u32 length;
+			u32 dest_addr;
+			u32 pad[3];
+		} sec_params;
+
+		// 32 bytes from mram addr to DRAM @ 0
+		for (int i = 0; i < 8; i++, mramaddr += 4)
+			((u32*)&sec_params)[i] = HLEMemory_Read_U32(mramaddr);
+
+		// This is the main decrypt routine
+		u16 x11 = 0, x12 = 0,
+			x20 = 0, x21 = 0, x22 = 0, x23 = 0;
+
+		x20 = Common::swap16(sec_params.key[0]) ^ 0x6f64;
+		x21 = Common::swap16(sec_params.key[1]) ^ 0x6573;
+
+		s16 unk2 = (s8)sec_params.unk2[0];
+		if (unk2 < 0)
+		{
+			x11 = ((~unk2 + 3) << 1) | (sec_params.unk1[0] << 4);
+		}
+		else if (unk2 == 0)
+		{
+			x11 = (sec_params.unk1[0] << 1) | 0x70;
+		}
+		else // unk2 > 0
+		{
+			x11 = ((unk2 - 1) << 1) | (sec_params.unk1[0] << 4);
+		}
+
+		s32 rounded_sub = ((sec_params.length + 7) & ~7) - 0x200;
+		u16 size = (rounded_sub < 0) ? 0 : rounded_sub >> 3;
+
+		u32 t = (((size << 16) | 0x3f80) & 0x3f80ffff) << 1;
+		s16 t_low = (s8)(t >> 8);
+		t += (t_low & size) << 16;
+		x12 = t >> 16;
+		x11 |= (size & 0x4000) >> 14; // this would be stored in ac0.h if we weren't constrained to 32bit :)
+		t = ((x11 & 0xff) << 16) + ((x12 & 0xff) << 16) + (x12 << 8);
+
+		u16 final11 = 0, final12 = 0;
+		final11 = x11 | ((t >> 8) & 0xff00) | 0x8080;
+		final12 = x12 | 0x8080;
+
+		if ((final12 & 0x200) != 0)
+		{
+			x22 = final11 ^ 0x6f64;
+			x23 = final12 ^ 0x6573;
+		}
+		else
+		{
+			x22 = final11 ^ 0x6177;
+			x23 = final12 ^ 0x614b;
+		}
+
+		// Send the result back to mram
+		*(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr) = Common::swap32((x20 << 16) | x21);
+		*(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr+4) = Common::swap32((x22 << 16) | x23);
+
+		// Done!
+		DEBUG_LOG(DSPHLE, "\n%08x -> key: %08x, len: %08x, dest_addr: %08x, unk1: %08x, unk2: %08x"
+			" 22: %04x, 23: %04x",
+			mramaddr,
+			*(u32*)sec_params.key, sec_params.length, sec_params.dest_addr,
+			*(u32*)sec_params.unk1, *(u32*)sec_params.unk2,
+			x22, x23);
+
+		calc_done = true;
+		m_mail_handler.PushMail(DSP_DONE);
+	}
+	else if ((mail >> 16 == 0xcdd1) && calc_done)
+	{
+		switch (mail & 0xffff)
+		{
+		case 1:
+			m_upload_setup_in_progress = true;
+			break;
+		case 2:
+			m_dsphle->SetUCode(UCODE_ROM);
+			break;
+		default:
+			DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", mail);
+			break;
+		}
+	}
+	else
+	{
+		DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", mail);
+	}
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
new file mode 100644
index 0000000000..50530134bf
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+struct GBAUCode : public UCodeInterface
+{
+	GBAUCode(DSPHLE *dsphle, u32 crc);
+	virtual ~GBAUCode();
+	u32 GetUpdateMs() override;
+
+	void HandleMail(u32 mail) override;
+	void Update() override;
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
new file mode 100644
index 0000000000..01b465641c
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
@@ -0,0 +1,41 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSPHLE/UCodes/INIT.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+INITUCode::INITUCode(DSPHLE *dsphle, u32 crc)
+	: UCodeInterface(dsphle, crc)
+{
+	DEBUG_LOG(DSPHLE, "INITUCode - initialized");
+}
+
+INITUCode::~INITUCode()
+{
+}
+
+void INITUCode::Init()
+{
+}
+
+void INITUCode::Update()
+{
+	if (m_mail_handler.IsEmpty())
+	{
+		m_mail_handler.PushMail(0x80544348);
+		// HALT
+	}
+}
+
+u32 INITUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void INITUCode::HandleMail(u32 mail)
+{
+}
+
+
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h
new file mode 100644
index 0000000000..a0ce30c9f3
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h
@@ -0,0 +1,19 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+class INITUCode : public UCodeInterface
+{
+public:
+	INITUCode(DSPHLE *dsphle, u32 crc);
+	virtual ~INITUCode();
+	u32 GetUpdateMs() override;
+
+	void HandleMail(u32 mail) override;
+	void Update() override;
+	void Init();
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
new file mode 100644
index 0000000000..1ac72bbb8c
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
@@ -0,0 +1,131 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
+#include "Common/Hash.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DSPHLE/UCodes/ROM.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+ROMUCode::ROMUCode(DSPHLE *dsphle, u32 crc)
+	: UCodeInterface(dsphle, crc)
+	, m_current_ucode()
+	, m_boot_task_num_steps(0)
+	, m_next_parameter(0)
+{
+	DEBUG_LOG(DSPHLE, "UCode_Rom - initialized");
+	m_mail_handler.Clear();
+	m_mail_handler.PushMail(0x8071FEED);
+}
+
+ROMUCode::~ROMUCode()
+{
+}
+
+void ROMUCode::Update()
+{
+}
+
+void ROMUCode::HandleMail(u32 mail)
+{
+	if (m_next_parameter == 0)
+	{
+		// wait for beginning of UCode
+		if ((mail & 0xFFFF0000) != 0x80F30000)
+		{
+			u32 Message = 0xFEEE0000 | (mail & 0xFFFF);
+			m_mail_handler.PushMail(Message);
+		}
+		else
+		{
+			m_next_parameter = mail;
+		}
+	}
+	else
+	{
+		switch (m_next_parameter)
+		{
+		case 0x80F3A001:
+			m_current_ucode.m_ram_address = mail;
+			break;
+
+		case 0x80F3A002:
+			m_current_ucode.m_length = mail & 0xffff;
+			break;
+
+		case 0x80F3B002:
+			m_current_ucode.m_dmem_length = mail & 0xffff;
+			if (m_current_ucode.m_dmem_length)
+			{
+				NOTICE_LOG(DSPHLE, "m_current_ucode.m_dmem_length = 0x%04x.", m_current_ucode.m_dmem_length);
+			}
+			break;
+
+		case 0x80F3C002:
+			m_current_ucode.m_imem_address = mail & 0xffff;
+			break;
+
+		case 0x80F3D001:
+			m_current_ucode.m_start_pc = mail & 0xffff;
+			BootUCode();
+			return;  // Important! BootUCode indirectly does "delete this;". Must exit immediately.
+
+		default:
+			break;
+		}
+
+		// THE GODDAMN OVERWRITE WAS HERE. Without the return above, since BootUCode may delete "this", well ...
+		m_next_parameter = 0;
+	}
+}
+
+void ROMUCode::BootUCode()
+{
+	u32 ector_crc = HashEctor(
+		(u8*)HLEMemory_Get_Pointer(m_current_ucode.m_ram_address),
+		m_current_ucode.m_length);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	std::string ucode_dump_path = StringFromFormat(
+		"%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), ector_crc);
+
+	File::IOFile fp(ucode_dump_path, "wb");
+	if (fp)
+	{
+		fp.WriteArray((u8*)HLEMemory_Get_Pointer(m_current_ucode.m_ram_address),
+		              m_current_ucode.m_length);
+	}
+#endif
+
+	DEBUG_LOG(DSPHLE, "CurrentUCode SOURCE Addr: 0x%08x", m_current_ucode.m_ram_address);
+	DEBUG_LOG(DSPHLE, "CurrentUCode Length:      0x%08x", m_current_ucode.m_length);
+	DEBUG_LOG(DSPHLE, "CurrentUCode DEST Addr:   0x%08x", m_current_ucode.m_imem_address);
+	DEBUG_LOG(DSPHLE, "CurrentUCode DMEM Length: 0x%08x", m_current_ucode.m_dmem_length);
+	DEBUG_LOG(DSPHLE, "CurrentUCode init_vector: 0x%08x", m_current_ucode.m_start_pc);
+	DEBUG_LOG(DSPHLE, "CurrentUCode CRC:         0x%08x", ector_crc);
+	DEBUG_LOG(DSPHLE, "BootTask - done");
+
+	m_dsphle->SetUCode(ector_crc);
+}
+
+u32 ROMUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void ROMUCode::DoState(PointerWrap &p)
+{
+	p.Do(m_current_ucode);
+	p.Do(m_boot_task_num_steps);
+	p.Do(m_next_parameter);
+
+	DoStateShared(p);
+}
+
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.h b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.h
new file mode 100644
index 0000000000..9a27933da2
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.h
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+class ROMUCode : public UCodeInterface
+{
+public:
+	ROMUCode(DSPHLE* dsphle, u32 crc);
+	virtual ~ROMUCode();
+	u32 GetUpdateMs() override;
+
+	void HandleMail(u32 mail) override;
+	void Update() override;
+
+	void DoState(PointerWrap &p) override;
+
+private:
+	struct UCodeBootInfo
+	{
+		u32 m_ram_address;
+		u32 m_length;
+		u32 m_imem_address;
+		u32 m_dmem_length;
+		u32 m_start_pc;
+	};
+	UCodeBootInfo m_current_ucode;
+	int m_boot_task_num_steps;
+
+	u32 m_next_parameter;
+
+	void BootUCode();
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
new file mode 100644
index 0000000000..f3c17a69e2
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
@@ -0,0 +1,189 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
+#include "Common/Hash.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+#include "Core/HW/DSPHLE/UCodes/AXWii.h"
+#include "Core/HW/DSPHLE/UCodes/CARD.h"
+#include "Core/HW/DSPHLE/UCodes/GBA.h"
+#include "Core/HW/DSPHLE/UCodes/INIT.h"
+#include "Core/HW/DSPHLE/UCodes/ROM.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
+
+UCodeInterface* UCodeFactory(u32 crc, DSPHLE* dsphle, bool wii)
+{
+	switch (crc)
+	{
+	case UCODE_ROM:
+		INFO_LOG(DSPHLE, "Switching to ROM ucode");
+		return new ROMUCode(dsphle, crc);
+
+	case UCODE_INIT_AUDIO_SYSTEM:
+		INFO_LOG(DSPHLE, "Switching to INIT ucode");
+		return new INITUCode(dsphle, crc);
+
+	case 0x65d6cc6f: // CARD
+		INFO_LOG(DSPHLE, "Switching to CARD ucode");
+		return new CARDUCode(dsphle, crc);
+
+	case 0xdd7e72d5:
+		INFO_LOG(DSPHLE, "Switching to GBA ucode");
+		return new GBAUCode(dsphle, crc);
+
+	case 0x3ad3b7ac: // Naruto 3, Paper Mario - The Thousand Year Door
+	case 0x3daf59b9: // Alien Hominid
+	case 0x4e8a8b21: // spdemo, Crazy Taxi, 18 Wheeler, Disney, Monkeyball 1/2, Cubivore, Nintendo Puzzle Collection, Wario,
+	                 // Capcom vs. SNK 2, Naruto 2, Lost Kingdoms, Star Fox, Mario Party 4, Mortal Kombat,
+	                 // Smugglers Run Warzone, Smash Brothers, Sonic Mega Collection, ZooCube
+	                 // nddemo, Star Fox
+	case 0x07f88145: // bustamove, Ikaruga, F-Zero GX, Robotech Battle Cry, Star Soldier, Soul Calibur 2,
+		// Zelda:OOT, Tony Hawk, Viewtiful Joe
+	case 0xe2136399: // Billy Hatcher, Dragon Ball Z, Mario Party 5, TMNT, 1080° Avalanche
+	case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy)
+		INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", crc);
+		return new AXUCode(dsphle, crc);
+
+	case 0x6ba3b3ea: // IPL - PAL
+	case 0x24b22038: // IPL - NTSC/NTSC-JAP
+	case 0x42f64ac4: // Luigi's Mansion
+	case 0x4be6a5cb: // AC, Pikmin
+		INFO_LOG(DSPHLE, "CRC %08x: JAC (early Zelda) ucode chosen", crc);
+		return new ZeldaUCode(dsphle, crc);
+
+	case 0x6CA33A6D: // DK Jungle Beat
+	case 0x86840740: // Zelda WW - US
+	case 0x56d36052: // Mario Sunshine
+	case 0x2fcdf1ec: // Mario Kart, Zelda 4 Swords
+	case 0x267fd05a: // Pikmin PAL
+		INFO_LOG(DSPHLE, "CRC %08x: Zelda ucode chosen", crc);
+		return new ZeldaUCode(dsphle, crc);
+
+	// Wii CRCs
+	case 0xb7eb9a9c: // Wii Pikmin - PAL
+	case 0xeaeb38cc: // Wii Pikmin 2 - PAL
+	case 0x6c3f6f94: // Zelda TP - PAL
+	case 0xd643001f: // Mario Galaxy - PAL / Wii DK Jungle Beat - PAL
+		INFO_LOG(DSPHLE, "CRC %08x: Zelda Wii ucode chosen\n", crc);
+		return new ZeldaUCode(dsphle, crc);
+
+	case 0x2ea36ce6: // Some Wii demos
+	case 0x5ef56da3: // AX demo
+	case 0x347112ba: // Raving Rabbids
+	case 0xfa450138: // Wii Sports - PAL
+	case 0xadbc06bd: // Elebits
+	case 0x4cc52064: // Bleach: Versus Crusade
+	case 0xd9c4bf34: // WiiMenu
+		INFO_LOG(DSPHLE, "CRC %08x: Wii - AXWii chosen", crc);
+		return new AXWiiUCode(dsphle, crc);
+
+	default:
+		if (wii)
+		{
+			PanicAlertT("This title might be incompatible with DSP HLE emulation. Try using LLE if this is homebrew.\n\n"
+			            "Unknown ucode (CRC = %08x) - forcing AXWii.", crc);
+			return new AXWiiUCode(dsphle, crc);
+		}
+		else
+		{
+			PanicAlertT("This title might be incompatible with DSP HLE emulation. Try using LLE if this is homebrew.\n\n"
+			            "DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.", crc);
+			return new AXUCode(dsphle, crc);
+		}
+
+	case UCODE_NULL:
+		break;
+	}
+
+	return nullptr;
+}
+
+bool UCodeInterface::NeedsResumeMail()
+{
+	if (m_needs_resume_mail)
+	{
+		m_needs_resume_mail = false;
+		return true;
+	}
+	return false;
+}
+
+void UCodeInterface::PrepareBootUCode(u32 mail)
+{
+	switch (m_next_ucode_steps)
+	{
+	case 0: m_next_ucode.mram_dest_addr = mail;          break;
+	case 1: m_next_ucode.mram_size      = mail & 0xffff; break;
+	case 2: m_next_ucode.mram_dram_addr = mail & 0xffff; break;
+	case 3: m_next_ucode.iram_mram_addr = mail;          break;
+	case 4: m_next_ucode.iram_size      = mail & 0xffff; break;
+	case 5: m_next_ucode.iram_dest      = mail & 0xffff; break;
+	case 6: m_next_ucode.iram_startpc   = mail & 0xffff; break;
+	case 7: m_next_ucode.dram_mram_addr = mail;          break;
+	case 8: m_next_ucode.dram_size      = mail & 0xffff; break;
+	case 9: m_next_ucode.dram_dest      = mail & 0xffff; break;
+	}
+	m_next_ucode_steps++;
+
+	if (m_next_ucode_steps == 10)
+	{
+		m_next_ucode_steps = 0;
+		m_needs_resume_mail = true;
+		m_upload_setup_in_progress = false;
+
+		u32 ector_crc = HashEctor(
+			(u8*)HLEMemory_Get_Pointer(m_next_ucode.iram_mram_addr),
+			m_next_ucode.iram_size);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+		std::string ucode_dump_path = StringFromFormat(
+			"%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), ector_crc);
+
+		File::IOFile fp(ucode_dump_path, "wb");
+		if (fp)
+		{
+			fp.WriteArray((u8*)Memory::GetPointer(m_next_ucode.iram_mram_addr),
+			              m_next_ucode.iram_size);
+		}
+#endif
+
+		DEBUG_LOG(DSPHLE, "PrepareBootUCode 0x%08x", ector_crc);
+		DEBUG_LOG(DSPHLE, "DRAM -> MRAM: src %04x dst %08x size %04x",
+			m_next_ucode.mram_dram_addr, m_next_ucode.mram_dest_addr,
+			m_next_ucode.mram_size);
+		DEBUG_LOG(DSPHLE, "MRAM -> IRAM: src %08x dst %04x size %04x startpc %04x",
+			m_next_ucode.iram_mram_addr, m_next_ucode.iram_dest,
+			m_next_ucode.iram_size, m_next_ucode.iram_startpc);
+		DEBUG_LOG(DSPHLE, "MRAM -> DRAM: src %08x dst %04x size %04x",
+			m_next_ucode.dram_mram_addr, m_next_ucode.dram_dest,
+			m_next_ucode.dram_size);
+
+		if (m_next_ucode.mram_size)
+		{
+			WARN_LOG(DSPHLE,
+				"Trying to boot new ucode with DRAM download - not implemented");
+		}
+		if (m_next_ucode.dram_size)
+		{
+			WARN_LOG(DSPHLE,
+				"Trying to boot new ucode with DRAM upload - not implemented");
+		}
+
+		m_dsphle->SwapUCode(ector_crc);
+	}
+}
+
+void UCodeInterface::DoStateShared(PointerWrap &p)
+{
+	p.Do(m_upload_setup_in_progress);
+	p.Do(m_next_ucode);
+	p.Do(m_next_ucode_steps);
+	p.Do(m_needs_resume_mail);
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
new file mode 100644
index 0000000000..aabb891a39
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
@@ -0,0 +1,145 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DSPHLE/DSPHLE.h"
+
+#define UCODE_ROM                   0x00000000
+#define UCODE_INIT_AUDIO_SYSTEM     0x00000001
+#define UCODE_NULL                  0xFFFFFFFF
+
+class CMailHandler;
+
+inline bool ExramRead(u32 address)
+{
+	if (address & 0x10000000)
+		return true;
+	else
+		return false;
+}
+
+inline u8 HLEMemory_Read_U8(u32 address)
+{
+	if (ExramRead(address))
+		return Memory::m_pEXRAM[address & Memory::EXRAM_MASK];
+	else
+		return Memory::m_pRAM[address & Memory::RAM_MASK];
+}
+
+inline u16 HLEMemory_Read_U16(u32 address)
+{
+	if (ExramRead(address))
+		return Common::swap16(*(u16*)&Memory::m_pEXRAM[address & Memory::EXRAM_MASK]);
+	else
+		return Common::swap16(*(u16*)&Memory::m_pRAM[address & Memory::RAM_MASK]);
+}
+
+inline u32 HLEMemory_Read_U32(u32 address)
+{
+	if (ExramRead(address))
+		return Common::swap32(*(u32*)&Memory::m_pEXRAM[address & Memory::EXRAM_MASK]);
+	else
+		return Common::swap32(*(u32*)&Memory::m_pRAM[address & Memory::RAM_MASK]);
+}
+
+inline void* HLEMemory_Get_Pointer(u32 address)
+{
+	if (ExramRead(address))
+		return &Memory::m_pEXRAM[address & Memory::EXRAM_MASK];
+	else
+		return &Memory::m_pRAM[address & Memory::RAM_MASK];
+}
+
+class UCodeInterface
+{
+public:
+	UCodeInterface(DSPHLE *dsphle, u32 crc)
+		: m_mail_handler(dsphle->AccessMailHandler())
+		, m_upload_setup_in_progress(false)
+		, m_dsphle(dsphle)
+		, m_crc(crc)
+		, m_next_ucode()
+		, m_next_ucode_steps(0)
+		, m_needs_resume_mail(false)
+	{
+	}
+
+	virtual ~UCodeInterface()
+	{
+	}
+
+	virtual void HandleMail(u32 mail) = 0;
+	virtual void Update() = 0;
+	virtual u32 GetUpdateMs() = 0;
+
+	virtual void DoState(PointerWrap &p)
+	{
+		DoStateShared(p);
+	}
+
+	static u32 GetCRC(UCodeInterface* ucode)
+	{
+		return ucode ? ucode->m_crc : UCODE_NULL;
+	}
+
+protected:
+	void PrepareBootUCode(u32 mail);
+
+	// Some ucodes (notably zelda) require a resume mail to be
+	// sent if they are be started via PrepareBootUCode.
+	// The HLE can use this to
+	bool NeedsResumeMail();
+
+	void DoStateShared(PointerWrap &p);
+
+	CMailHandler& m_mail_handler;
+
+	enum EDSP_Codes
+	{
+		DSP_INIT      = 0xDCD10000,
+		DSP_RESUME    = 0xDCD10001,
+		DSP_YIELD     = 0xDCD10002,
+		DSP_DONE      = 0xDCD10003,
+		DSP_SYNC      = 0xDCD10004,
+		DSP_FRAME_END = 0xDCD10005,
+	};
+
+	// UCode is forwarding mails to PrepareBootUCode
+	// UCode only needs to set this to true, UCodeInterface will set to false when done!
+	bool m_upload_setup_in_progress;
+
+	// Need a pointer back to DSPHLE to switch ucodes.
+	DSPHLE *m_dsphle;
+
+	// used for reconstruction when loading saves,
+	// and for variations within certain ucodes.
+	u32 m_crc;
+
+private:
+	struct NextUCodeInfo
+	{
+		u32 mram_dest_addr;
+		u16 mram_size;
+		u16 mram_dram_addr;
+		u32 iram_mram_addr;
+		u16 iram_size;
+		u16 iram_dest;
+		u16 iram_startpc;
+		u32 dram_mram_addr;
+		u16 dram_size;
+		u16 dram_dest;
+	};
+	NextUCodeInfo m_next_ucode;
+	int m_next_ucode_steps;
+
+	bool m_needs_resume_mail;
+};
+
+UCodeInterface* UCodeFactory(u32 crc, DSPHLE *dsphle, bool wii);
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
new file mode 100644
index 0000000000..77e30e8534
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
@@ -0,0 +1,566 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Games that uses this UCode:
+// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
+// Super Mario Galaxy
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPHLE/MailHandler.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
+
+
+ZeldaUCode::ZeldaUCode(DSPHLE *dsphle, u32 crc)
+	: UCodeInterface(dsphle, crc),
+	  m_sync_in_progress(false),
+	  m_max_voice(0),
+	  m_num_sync_mail(0),
+	  m_num_voices(0),
+	  m_sync_cmd_pending(false),
+	  m_current_voice(0),
+	  m_current_buffer(0),
+	  m_num_buffers(0),
+	  m_voice_pbs_addr(0),
+	  m_unk_table_addr(0),
+	  m_reverb_pbs_addr(0),
+	  m_right_buffers_addr(0),
+	  m_left_buffers_addr(0),
+	  m_pos(0),
+	  m_dma_base_addr(0),
+	  m_num_steps(0),
+	  m_list_in_progress(false),
+	  m_step(0),
+	  m_read_offset(0),
+	  m_mail_state(WaitForMail),
+	  m_num_pbs(0),
+	  m_pb_address(0),
+	  m_pb_address2(0)
+{
+	DEBUG_LOG(DSPHLE, "UCode_Zelda - add boot mails for handshake");
+
+	if (IsLightVersion())
+	{
+		DEBUG_LOG(DSPHLE, "Luigi Stylee!");
+		m_mail_handler.PushMail(0x88881111);
+	}
+	else
+	{
+		m_mail_handler.PushMail(DSP_INIT);
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+		m_mail_handler.PushMail(0xF3551111); // handshake
+	}
+
+	m_voice_buffer = new s32[256 * 1024];
+	m_resample_buffer = new s16[256 * 1024];
+	m_left_buffer = new s32[256 * 1024];
+	m_right_buffer = new s32[256 * 1024];
+
+	memset(m_buffer, 0, sizeof(m_buffer));
+	memset(m_sync_flags, 0, sizeof(m_sync_flags));
+	memset(m_afc_coef_table, 0, sizeof(m_afc_coef_table));
+	memset(m_pb_mask, 0, sizeof(m_pb_mask));
+}
+
+ZeldaUCode::~ZeldaUCode()
+{
+	m_mail_handler.Clear();
+
+	delete [] m_voice_buffer;
+	delete [] m_resample_buffer;
+	delete [] m_left_buffer;
+	delete [] m_right_buffer;
+}
+
+u8 *ZeldaUCode::GetARAMPointer(u32 address)
+{
+	if (IsDMAVersion())
+		return Memory::GetPointer(m_dma_base_addr) + address;
+	else
+		return DSP::GetARAMPtr() + address;
+}
+
+void ZeldaUCode::Update()
+{
+	if (!IsLightVersion())
+	{
+		if (m_mail_handler.GetNextMail() == DSP_FRAME_END)
+			DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+
+	if (NeedsResumeMail())
+	{
+		m_mail_handler.PushMail(DSP_RESUME);
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+	}
+}
+
+void ZeldaUCode::HandleMail(u32 mail)
+{
+	if (IsLightVersion())
+		HandleMail_LightVersion(mail);
+	else if (IsSMSVersion())
+		HandleMail_SMSVersion(mail);
+	else
+		HandleMail_NormalVersion(mail);
+}
+
+void ZeldaUCode::HandleMail_LightVersion(u32 mail)
+{
+	//ERROR_LOG(DSPHLE, "Light version mail %08X, list in progress: %s, step: %i/%i",
+	// mail, m_list_in_progress ? "yes":"no", m_step, m_num_steps);
+
+	if (m_sync_cmd_pending)
+	{
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+
+		MixAudio();
+
+		m_current_buffer++;
+
+		if (m_current_buffer == m_num_buffers)
+		{
+			m_sync_cmd_pending = false;
+			DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
+		}
+		return;
+	}
+
+	if (!m_list_in_progress)
+	{
+		switch ((mail >> 24) & 0x7F)
+		{
+		case 0x00: m_num_steps = 1; break; // dummy
+		case 0x01: m_num_steps = 5; break; // DsetupTable
+		case 0x02: m_num_steps = 3; break; // DsyncFrame
+
+		default:
+			{
+				m_num_steps = 0;
+				PanicAlert("Zelda uCode (light version): unknown/unsupported command %02X", (mail >> 24) & 0x7F);
+			}
+			return;
+		}
+
+		m_list_in_progress = true;
+		m_step = 0;
+	}
+
+	if (m_step >= sizeof(m_buffer) / 4)
+		PanicAlert("m_step out of range");
+
+	((u32*)m_buffer)[m_step] = mail;
+	m_step++;
+
+	if (m_step >= m_num_steps)
+	{
+		ExecuteList();
+		m_list_in_progress = false;
+	}
+}
+
+void ZeldaUCode::HandleMail_SMSVersion(u32 mail)
+{
+	if (m_sync_in_progress)
+	{
+		if (m_sync_cmd_pending)
+		{
+			m_sync_flags[(m_num_sync_mail << 1)    ] = mail >> 16;
+			m_sync_flags[(m_num_sync_mail << 1) + 1] = mail & 0xFFFF;
+
+			m_num_sync_mail++;
+			if (m_num_sync_mail == 2)
+			{
+				m_num_sync_mail = 0;
+				m_sync_in_progress = false;
+
+				MixAudio();
+
+				m_current_buffer++;
+
+				m_mail_handler.PushMail(DSP_SYNC);
+				DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+				m_mail_handler.PushMail(0xF355FF00 | m_current_buffer);
+
+				if (m_current_buffer == m_num_buffers)
+				{
+					m_mail_handler.PushMail(DSP_FRAME_END);
+					// DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+
+					m_sync_cmd_pending = false;
+				}
+			}
+		}
+		else
+		{
+			m_sync_in_progress = false;
+		}
+
+		return;
+	}
+
+	if (m_list_in_progress)
+	{
+		if (m_step >= sizeof(m_buffer) / 4)
+			PanicAlert("m_step out of range");
+
+		((u32*)m_buffer)[m_step] = mail;
+		m_step++;
+
+		if (m_step >= m_num_steps)
+		{
+			ExecuteList();
+			m_list_in_progress = false;
+		}
+
+		return;
+	}
+
+	// Here holds: m_sync_in_progress == false && m_list_in_progress == false
+
+	if (mail == 0)
+	{
+		m_sync_in_progress = true;
+		m_num_sync_mail = 0;
+	}
+	else if ((mail >> 16) == 0)
+	{
+		m_list_in_progress = true;
+		m_num_steps = mail;
+		m_step = 0;
+	}
+	else if ((mail >> 16) == 0xCDD1) // A 0xCDD1000X mail should come right after we send a DSP_SYNCEND mail
+	{
+		// The low part of the mail tells the operation to perform
+		// Seeing as every possible operation number halts the uCode,
+		// except 3, that thing seems to be intended for debugging
+		switch (mail & 0xFFFF)
+		{
+		case 0x0003: // Do nothing
+			return;
+
+		case 0x0000: // Halt
+		case 0x0001: // Dump memory? and halt
+		case 0x0002: // Do something and halt
+			WARN_LOG(DSPHLE, "Zelda uCode(SMS version): received halting operation %04X", mail & 0xFFFF);
+			return;
+
+		default:     // Invalid (the real ucode would likely crash)
+			WARN_LOG(DSPHLE, "Zelda uCode(SMS version): received invalid operation %04X", mail & 0xFFFF);
+			return;
+		}
+	}
+	else
+	{
+		WARN_LOG(DSPHLE, "Zelda uCode (SMS version): unknown mail %08X", mail);
+	}
+}
+
+void ZeldaUCode::HandleMail_NormalVersion(u32 mail)
+{
+	// WARN_LOG(DSPHLE, "Zelda uCode: Handle mail %08X", mail);
+
+	if (m_upload_setup_in_progress) // evaluated first!
+	{
+		PrepareBootUCode(mail);
+		return;
+	}
+
+	if (m_sync_in_progress)
+	{
+		if (m_sync_cmd_pending)
+		{
+			u32 n = (mail >> 16) & 0xF;
+			m_max_voice = (n + 1) << 4;
+			m_sync_flags[n] = mail & 0xFFFF;
+			m_sync_in_progress = false;
+
+			m_current_voice = m_max_voice;
+
+			if (m_current_voice >= m_num_voices)
+			{
+				MixAudio();
+
+				m_current_buffer++;
+
+				m_mail_handler.PushMail(DSP_SYNC);
+				DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+				m_mail_handler.PushMail(0xF355FF00 | m_current_buffer);
+
+				m_current_voice = 0;
+
+				if (m_current_buffer == m_num_buffers)
+				{
+					if (!IsDMAVersion()) // this is a hack... without it Pikmin 1 Wii/ Zelda TP Wii mail-s stopped
+						m_mail_handler.PushMail(DSP_FRAME_END);
+					//g_dspInitialize.pGenerateDSPInterrupt();
+
+					m_sync_cmd_pending = false;
+				}
+			}
+		}
+		else
+		{
+			m_sync_in_progress = false;
+		}
+
+		return;
+	}
+
+	if (m_list_in_progress)
+	{
+		if (m_step >= sizeof(m_buffer) / 4)
+			PanicAlert("m_step out of range");
+
+		((u32*)m_buffer)[m_step] = mail;
+		m_step++;
+
+		if (m_step >= m_num_steps)
+		{
+			ExecuteList();
+			m_list_in_progress = false;
+		}
+
+		return;
+	}
+
+	// Here holds: m_sync_in_progress == false && m_list_in_progress == false
+
+	// Zelda-only mails:
+	// - 0000XXXX - Begin list
+	// - 00000000, 000X0000 - Sync mails
+	// - CDD1XXXX - comes after DsyncFrame completed, seems to be debugging stuff
+
+	if (mail == 0)
+	{
+		m_sync_in_progress = true;
+	}
+	else if ((mail >> 16) == 0)
+	{
+		m_list_in_progress = true;
+		m_num_steps = mail;
+		m_step = 0;
+	}
+	else if ((mail >> 16) == 0xCDD1) // A 0xCDD1000X mail should come right after we send a DSP_FRAME_END mail
+	{
+		// The low part of the mail tells the operation to perform
+		// Seeing as every possible operation number halts the uCode,
+		// except 3, that thing seems to be intended for debugging
+		switch (mail & 0xFFFF)
+		{
+		case 0x0003: // Do nothing - continue normally
+			return;
+
+		case 0x0001: // accepts params to either DMA to iram and/or DRAM (used for hotbooting a new ucode)
+			// TODO find a better way to protect from HLEMixer?
+			m_upload_setup_in_progress = true;
+			return;
+
+		case 0x0002: // Let IROM play us off
+			m_dsphle->SetUCode(UCODE_ROM);
+			return;
+
+		case 0x0000: // Halt
+			WARN_LOG(DSPHLE, "Zelda uCode: received halting operation %04X", mail & 0xFFFF);
+			return;
+
+		default:     // Invalid (the real ucode would likely crash)
+			WARN_LOG(DSPHLE, "Zelda uCode: received invalid operation %04X", mail & 0xFFFF);
+			return;
+		}
+	}
+	else
+	{
+		WARN_LOG(DSPHLE, "Zelda uCode: unknown mail %08X", mail);
+	}
+}
+
+// zelda debug ..803F6418
+void ZeldaUCode::ExecuteList()
+{
+	// begin with the list
+	m_read_offset = 0;
+
+	u32 cmd_mail = Read32();
+	u32 command = (cmd_mail >> 24) & 0x7f;
+	u32 sync;
+	u32 extra_data = cmd_mail & 0xFFFF;
+
+	if (IsLightVersion())
+		sync = 0x62 + (command << 1); // seen in DSP_UC_Luigi.txt
+	else
+		sync = cmd_mail >> 16;
+
+	DEBUG_LOG(DSPHLE, "==============================================================================");
+	DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (command: 0x%04x : sync: 0x%04x)", command, sync);
+
+	switch (command)
+	{
+		// dummy
+		case 0x00: break;
+
+		// DsetupTable ... zelda ww jumps to 0x0095
+		case 0x01:
+		{
+			m_num_voices = extra_data;
+			m_voice_pbs_addr = Read32() & 0x7FFFFFFF;
+			m_unk_table_addr = Read32() & 0x7FFFFFFF;
+			m_afc_coef_table_addr = Read32() & 0x7FFFFFFF;
+			m_reverb_pbs_addr = Read32() & 0x7FFFFFFF;  // WARNING: reverb PBs are very different from voice PBs!
+
+			// Read the other table
+			u16 *tmp_ptr = (u16*)Memory::GetPointer(m_unk_table_addr);
+			for (int i = 0; i < 0x280; i++)
+				m_misc_table[i] = (s16)Common::swap16(tmp_ptr[i]);
+
+			// Read AFC coef table
+			tmp_ptr = (u16*)Memory::GetPointer(m_afc_coef_table_addr);
+			for (int i = 0; i < 32; i++)
+				m_afc_coef_table[i] = (s16)Common::swap16(tmp_ptr[i]);
+
+			DEBUG_LOG(DSPHLE, "DsetupTable");
+			DEBUG_LOG(DSPHLE, "Num voice param blocks:             %i", m_num_voices);
+			DEBUG_LOG(DSPHLE, "Voice param blocks address:         0x%08x", m_voice_pbs_addr);
+
+			// This points to some strange data table. Don't know yet what it's for. Reverb coefs?
+			DEBUG_LOG(DSPHLE, "DSPRES_FILTER   (size: 0x40):       0x%08x", m_unk_table_addr);
+
+			// Zelda WW: This points to a 64-byte array of coefficients, which are EXACTLY the same
+			// as the AFC ADPCM coef array in decode.c of the in_cube winamp plugin,
+			// which can play Zelda audio. So, these should definitely be used when decoding AFC.
+			DEBUG_LOG(DSPHLE, "DSPADPCM_FILTER (size: 0x500):      0x%08x", m_afc_coef_table_addr);
+			DEBUG_LOG(DSPHLE, "Reverb param blocks address:        0x%08x", m_reverb_pbs_addr);
+		}
+			break;
+
+			// SyncFrame ... zelda ww jumps to 0x0243
+		case 0x02:
+		{
+			m_sync_cmd_pending = true;
+
+			m_current_buffer = 0;
+			m_num_buffers = (cmd_mail >> 16) & 0xFF;
+
+			// Addresses for right & left buffers in main memory
+			// Each buffer is 160 bytes long. The number of (both left & right) buffers
+			// is set by the first mail of the list.
+			m_left_buffers_addr = Read32() & 0x7FFFFFFF;
+			m_right_buffers_addr = Read32() & 0x7FFFFFFF;
+
+			DEBUG_LOG(DSPHLE, "DsyncFrame");
+			// These alternate between three sets of mixing buffers. They are all three fairly near,
+			// but not at, the ADMA read addresses.
+			DEBUG_LOG(DSPHLE, "Right buffer address:               0x%08x", m_right_buffers_addr);
+			DEBUG_LOG(DSPHLE, "Left buffer address:                0x%08x", m_left_buffers_addr);
+
+			if (IsLightVersion())
+				break;
+			else
+				return;
+		}
+
+
+		// Simply sends the sync messages
+		case 0x03: break;
+
+/*		case 0x04: break;   // dunno ... zelda ww jmps to 0x0580
+		case 0x05: break;   // dunno ... zelda ww jmps to 0x0592
+		case 0x06: break;   // dunno ... zelda ww jmps to 0x0469
+		case 0x07: break;   // dunno ... zelda ww jmps to 0x044d
+		case 0x08: break;   // Mixer ... zelda ww jmps to 0x0485
+		case 0x09: break;   // dunno ... zelda ww jmps to 0x044d
+ */
+
+		// DsetDolbyDelay ... zelda ww jumps to 0x00b2
+		case 0x0d:
+		{
+			u32 tmp = Read32();
+			DEBUG_LOG(DSPHLE, "DSetDolbyDelay");
+			DEBUG_LOG(DSPHLE, "DOLBY2_DELAY_BUF (size 0x960):      0x%08x", tmp);
+		}
+			break;
+
+			// This opcode, in the SMG ucode, sets the base address for audio data transfers from main memory (using DMA).
+			// In the Zelda ucode, it is dummy, because this ucode uses accelerator for audio data transfers.
+		case 0x0e:
+			{
+				m_dma_base_addr = Read32() & 0x7FFFFFFF;
+				DEBUG_LOG(DSPHLE, "DsetDMABaseAddr");
+				DEBUG_LOG(DSPHLE, "DMA base address:                   0x%08x", m_dma_base_addr);
+			}
+			break;
+
+		// default ... zelda ww jumps to 0x0043
+		default:
+			PanicAlert("Zelda UCode - unknown command: %x (size %i)", command, m_num_steps);
+			break;
+	}
+
+	// sync, we are ready
+	if (IsLightVersion())
+	{
+		if (m_sync_cmd_pending)
+			m_mail_handler.PushMail(0x80000000 | m_num_buffers); // after CMD_2
+		else
+			m_mail_handler.PushMail(0x80000000 | sync); // after CMD_0, CMD_1
+	}
+	else
+	{
+		m_mail_handler.PushMail(DSP_SYNC);
+		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+		m_mail_handler.PushMail(0xF3550000 | sync);
+	}
+}
+
+u32 ZeldaUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void ZeldaUCode::DoState(PointerWrap &p)
+{
+	p.Do(m_afc_coef_table);
+	p.Do(m_misc_table);
+
+	p.Do(m_sync_in_progress);
+	p.Do(m_max_voice);
+	p.Do(m_sync_flags);
+
+	p.Do(m_num_sync_mail);
+
+	p.Do(m_num_voices);
+
+	p.Do(m_sync_cmd_pending);
+	p.Do(m_current_voice);
+	p.Do(m_current_buffer);
+	p.Do(m_num_buffers);
+
+	p.Do(m_voice_pbs_addr);
+	p.Do(m_unk_table_addr);
+	p.Do(m_afc_coef_table_addr);
+	p.Do(m_reverb_pbs_addr);
+
+	p.Do(m_right_buffers_addr);
+	p.Do(m_left_buffers_addr);
+	p.Do(m_pos);
+
+	p.Do(m_dma_base_addr);
+
+	p.Do(m_num_steps);
+	p.Do(m_list_in_progress);
+	p.Do(m_step);
+	p.Do(m_buffer);
+
+	p.Do(m_read_offset);
+
+	p.Do(m_mail_state);
+	p.Do(m_pb_mask);
+
+	p.Do(m_num_pbs);
+	p.Do(m_pb_address);
+	p.Do(m_pb_address2);
+
+	DoStateShared(p);
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
new file mode 100644
index 0000000000..6785f52b70
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
@@ -0,0 +1,294 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+// Obviously missing things that must be in here, somewhere among the "unknown":
+//   * Volume
+//   * L/R Pan
+//   * (probably) choice of resampling algorithm (point, linear, cubic)
+
+union ZeldaVoicePB
+{
+	struct
+	{
+		// Read-Write part
+		u16 Status;                     // 0x00 | 1 = play, 0 = stop
+		u16 KeyOff;                     // 0x01 | writing 1 stops voice?
+		u16 RatioInt;                   // 0x02 | Position delta (playback speed)
+		u16 Unk03;                      // 0x03 | unknown
+		u16 NeedsReset;                 // 0x04 | indicates if some values in PB need to be reset
+		u16 ReachedEnd;                 // 0x05 | set to 1 when end reached
+		u16 IsBlank;                    // 0x06 | 0 = normal sound, 1 = samples are always the same
+		u16 Unk07;                      // 0x07 | unknown, in zelda always 0x0010. Something to do with number of saved samples (0x68)?
+
+		u16 SoundType;                  // 0x08 | "Sound type": so far in zww: 0x0d00 for music (volume mode 0), 0x4861 for sfx (volume mode 1)
+		u16 volumeLeft1;                // 0x09 | Left Volume 1   // There's probably two of each because they should be ramped within each frame.
+		u16 volumeLeft2;                // 0x0A | Left Volume 2
+		u16 Unk0B;                      // 0x0B | unknown
+
+		u16 SoundType2;                 // 0x0C | "Sound type" 2   (not really sound type)
+		u16 volumeRight1;               // 0x0D | Right Volume 1
+		u16 volumeRight2;               // 0x0E | Right Volume 2
+		u16 Unk0F;                      // 0x0F | unknown
+
+		u16 SoundType3;                 // 0x10 | "Sound type" 3   (not really sound type)
+		u16 volumeUnknown1_1;           // 0x11 | Unknown Volume 1
+		u16 volumeUnknown1_2;           // 0x12 | Unknown Volume 1
+		u16 Unk13;                      // 0x13 | unknown
+
+		u16 SoundType4;                 // 0x14 | "Sound type" 4   (not really sound type)
+		u16 volumeUnknown2_1;           // 0x15 | Unknown Volume 2
+		u16 volumeUnknown2_2;           // 0x16 | Unknown Volume 2
+		u16 Unk17;                      // 0x17 | unknown
+
+		u16 Unk18[0x10];                // 0x18 | unknown
+		u16 Unk28;                      // 0x28 | unknown
+		u16 Unk29;                      // 0x29 | unknown  // multiplied by 0x2a @ 0d21/ZWW
+		u16 Unk2a;                      // 0x2A | unknown  // loaded at 0d2e/ZWW
+		u16 Unk2b;                      // 0x2B | unknown
+		u16 VolumeMode;                 // 0x2C | unknown  // See 0337/ZWW
+		u16 Unk2D;                      // 0x2D | unknown
+		u16 Unk2E;                      // 0x2E | unknown
+		u16 Unk2F;                      // 0x2F | unknown
+		u16 CurSampleFrac;              // 0x30 | Fractional part of the current sample position
+		u16 Unk31;                      // 0x31 | unknown / unused
+		u16 CurBlock;                   // 0x32 | current block? used by zelda's AFC decoder. we don't need it.
+		u16 FixedSample;                // 0x33 | sample value for "blank" voices
+		u32 RestartPos;                 // 0x34 | restart pos  / "loop start offset"
+		u16 Unk36[2];                   // 0x36 | unknown   // loaded at 0adc/ZWW in 0x21 decoder
+		u32 CurAddr;                    // 0x38 | current address
+		u32 RemLength;                  // 0x3A | remaining length
+		u16 ResamplerOldData[4];        // 0x3C | The resampler stores the last 4 decoded samples here from the previous frame, so that the filter kernel has something to read before the start of the buffer.
+		u16 Unk40[0x10];                // 0x40 | Used as some sort of buffer by IIR
+		u16 Unk50[0x8];                 // 0x50 | Used as some sort of buffer by 06ff/ZWW
+		u16 Unk58[0x8];                 // 0x58 |
+		u16 Unk60[0x6];                 // 0x60 |
+		u16 YN2;                        // 0x66 | YN2
+		u16 YN1;                        // 0x67 | YN1
+		u16 Unk68[0x10];                // 0x68 | Saved samples from last decode?
+		u16 FilterState1;               // 0x78 | unknown  // ZWW: 0c84_FilterBufferInPlace loads and stores. Simply, the filter state.
+		u16 FilterState2;               // 0x79 | unknown  // ZWW: same as above.  these two are active if 0x04a8 != 0.
+		u16 Unk7A;                      // 0x7A | unknown
+		u16 Unk7B;                      // 0x7B | unknown
+		u16 Unk7C;                      // 0x7C | unknown
+		u16 Unk7D;                      // 0x7D | unknown
+		u16 Unk7E;                      // 0x7E | unknown
+		u16 Unk7F;                      // 0x7F | unknown
+
+		// Read-only part
+		u16 Format;                     // 0x80 | audio format
+		u16 RepeatMode;                 // 0x81 | 0 = one-shot, non zero = loop
+		u16 LoopYN1;                    // 0x82 | YN1 reload (when AFC loops)
+		u16 LoopYN2;                    // 0x83 | YN2 reload (when AFC loops)
+		u16 Unk84;                      // 0x84 | IIR Filter # coefs?
+		u16 StopOnSilence;              // 0x85 | Stop on silence? (Flag for something volume related. Decides the weird stuff at 035a/ZWW, alco 0cd3)
+		u16 Unk86;                      // 0x86 | unknown
+		u16 Unk87;                      // 0x87 | unknown
+		u32 LoopStartPos;               // 0x88 | loopstart pos
+		u32 Length;                     // 0x8A | sound length
+		u32 StartAddr;                  // 0x8C | sound start address
+		u32 UnkAddr;                    // 0x8E | ???
+		u16 Padding[0x10];              // 0x90 | padding
+		u16 Padding2[0x8];              // 0xa0 | FIR filter coefs of some sort (0xa4 controls the appearance of 0xa5-0xa7 and is almost always 0x7FFF)
+		u16 FilterEnable;               // 0xa8 | FilterBufferInPlace enable
+		u16 Padding3[0x7];              // 0xa9 | padding
+		u16 Padding4[0x10];             // 0xb0 | padding
+	};
+	u16 raw[0xc0]; // WARNING-do not use on parts of the 32-bit values - they are swapped!
+};
+
+union ZeldaUnkPB
+{
+	struct
+	{
+		u16 Control;                    // 0x00 | control
+		u16 Unk01;                      // 0x01 | unknown
+		u32 SrcAddr;                    // 0x02 | some address
+		u16 Unk04[0xC];                 // 0x04 | unknown
+	};
+	u16 raw[16];
+};
+
+class ZeldaUCode : public UCodeInterface
+{
+public:
+	ZeldaUCode(DSPHLE *dsphle, u32 crc);
+	virtual ~ZeldaUCode();
+	u32 GetUpdateMs() override;
+
+	void HandleMail(u32 mail) override;
+	void HandleMail_LightVersion(u32 mail);
+	void HandleMail_SMSVersion(u32 mail);
+	void HandleMail_NormalVersion(u32 mail);
+	void Update() override;
+
+	void CopyPBsFromRAM();
+	void CopyPBsToRAM();
+
+	void DoState(PointerWrap &p) override;
+
+	int *templbuffer;
+	int *temprbuffer;
+
+	// Simple dump ...
+	int DumpAFC(u8* pIn, const int size, const int srate);
+
+	u32 Read32()
+	{
+		u32 res = *(u32*)&m_buffer[m_read_offset];
+		m_read_offset += 4;
+		return res;
+	}
+
+private:
+	// These map CRC to behavior.
+
+	// DMA version
+	// - sound data transferred using DMA instead of accelerator
+	bool IsDMAVersion() const
+	{
+		switch (m_crc)
+		{
+		case 0xb7eb9a9c: // Wii Pikmin - PAL
+		case 0xeaeb38cc: // Wii Pikmin 2 - PAL
+		case 0x6c3f6f94: // Wii Zelda TP - PAL
+		case 0xD643001F: // Super Mario Galaxy
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	// Light version
+	// - slightly different communication protocol (no list begin mail)
+	// - exceptions and interrupts not used
+	bool IsLightVersion() const
+	{
+		switch (m_crc)
+		{
+		case 0x6ba3b3ea: // IPL - PAL
+		case 0x24b22038: // IPL - NTSC/NTSC-JAP
+		case 0x42f64ac4: // Luigi's Mansion
+		case 0x4be6a5cb: // AC, Pikmin NTSC
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	// SMS version
+	// - sync mails are sent every frame, not every 16 PBs
+	// (named SMS because it's used by Super Mario Sunshine
+	// and I couldn't find a better name)
+	bool IsSMSVersion() const
+	{
+		switch (m_crc)
+		{
+		case 0x56d36052: // Super Mario Sunshine
+		case 0x267fd05a: // Pikmin PAL
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	// These are the only dynamically allocated things allowed in the ucode.
+	s32* m_voice_buffer;
+	s16* m_resample_buffer;
+	s32* m_left_buffer;
+	s32* m_right_buffer;
+
+	// If you add variables, remember to keep DoState() and the constructor up to date.
+
+	s16 m_afc_coef_table[32];
+	s16 m_misc_table[0x280];
+
+	bool m_sync_in_progress;
+	u32 m_max_voice;
+	u32 m_sync_flags[16];
+
+	// Used by SMS version
+	u32 m_num_sync_mail;
+
+	u32 m_num_voices;
+
+	bool m_sync_cmd_pending;
+	u32 m_current_voice;
+	u32 m_current_buffer;
+	u32 m_num_buffers;
+
+	// Those are set by command 0x1 (DsetupTable)
+	u32 m_voice_pbs_addr;
+	u32 m_unk_table_addr;
+	u32 m_afc_coef_table_addr;
+	u32 m_reverb_pbs_addr;
+
+	u32 m_right_buffers_addr;
+	u32 m_left_buffers_addr;
+	//u32 m_unkAddr;
+	u32 m_pos;
+
+	// Only in SMG ucode
+	// Set by command 0xE (DsetDMABaseAddr)
+	u32 m_dma_base_addr;
+
+	// List, buffer management =====================
+	u32 m_num_steps;
+	bool m_list_in_progress;
+	u32 m_step;
+	u8 m_buffer[1024];
+
+	u32 m_read_offset;
+
+	enum EMailState
+	{
+		WaitForMail,
+		ReadingFrameSync,
+		ReadingMessage,
+		ReadingSystemMsg
+	};
+
+	EMailState m_mail_state;
+	u16 m_pb_mask[0x10];
+
+	u32 m_num_pbs;
+	u32 m_pb_address;   // The main param block array
+	u32 m_pb_address2;  // 4 smaller param blocks
+
+	void ExecuteList();
+
+	u8 *GetARAMPointer(u32 address);
+
+	// AFC decoder
+	static void AFCdecodebuffer(const s16 *coef, const char *input, signed short *out, short *histp, short *hist2p, int type);
+
+	void ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB);
+	void WritebackVoicePB(u32 _Addr, ZeldaVoicePB& PB);
+
+	// Voice formats
+	void RenderSynth_Constant(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
+	void RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
+	void RenderSynth_SawWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
+	void RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
+
+	void RenderVoice_PCM8(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
+	void RenderVoice_PCM16(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
+
+	void RenderVoice_AFC(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
+	void RenderVoice_Raw(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
+
+	void Resample(ZeldaVoicePB &PB, int size, s16 *in, s32 *out, bool do_resample = false);
+
+	int ConvertRatio(int pb_ratio);
+	int SizeForResampling(ZeldaVoicePB &PB, int size);
+
+	// Renders a voice and mixes it into LeftBuffer, RightBuffer
+	void RenderAddVoice(ZeldaVoicePB& PB, s32* _LeftBuffer, s32* _RightBuffer, int _Size);
+
+	void MixAudio();
+};
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp
new file mode 100644
index 0000000000..52e7ae44bb
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp
@@ -0,0 +1,68 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
+
+void ZeldaUCode::AFCdecodebuffer(const s16 *coef, const char *src, signed short *out, short *histp, short *hist2p, int type)
+{
+	// First 2 nibbles are ADPCM scale etc.
+	short delta = 1 << (((*src) >> 4) & 0xf);
+	short idx = (*src) & 0xf;
+	src++;
+
+	short nibbles[16];
+	if (type == 9)
+	{
+		for (int i = 0; i < 16; i += 2)
+		{
+			nibbles[i + 0] = *src >> 4;
+			nibbles[i + 1] = *src & 15;
+			src++;
+		}
+
+		for (auto& nibble : nibbles)
+		{
+			if (nibble >= 8)
+				nibble = nibble - 16;
+			nibble <<= 11;
+		}
+	}
+	else
+	{
+		// In Pikmin, Dolphin's engine sound is using AFC type 5, even though such a sound is hard
+		// to compare, it seems like to sound exactly like a real GC
+		// In Super Mario Sunshine, you can get such a sound by talking to/jumping on anyone
+		for (int i = 0; i < 16; i += 4)
+		{
+			nibbles[i + 0] = (*src >> 6) & 0x03;
+			nibbles[i + 1] = (*src >> 4) & 0x03;
+			nibbles[i + 2] = (*src >> 2) & 0x03;
+			nibbles[i + 3] = (*src >> 0) & 0x03;
+			src++;
+		}
+
+		for (auto& nibble : nibbles)
+		{
+			if (nibble >= 2)
+				nibble = nibble - 4;
+			nibble <<= 13;
+		}
+	}
+
+	short hist = *histp;
+	short hist2 = *hist2p;
+	for (int i = 0; i < 16; i++)
+	{
+		int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
+		sample >>= 11;
+		MathUtil::Clamp(&sample, -32768, 32767);
+		out[i] = sample;
+		hist2 = hist;
+		hist = (short)sample;
+	}
+	*histp = hist;
+	*hist2p = hist2;
+}
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp
new file mode 100644
index 0000000000..054efeaddd
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp
@@ -0,0 +1,173 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
+
+void ZeldaUCode::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
+{
+	s64 ratio = ((s64)PB.RatioInt << 16) * 16;
+	s64 TrueSamplePosition = PB.CurSampleFrac;
+
+	// PB.Format == 0x3 -> Rectangular Wave, 0x0 -> Square Wave
+	unsigned int mask = PB.Format ? 3 : 1;
+	// int shift = PB.Format ? 2 : 1; // Unused?
+
+	u32 pos[2] = {0, 0};
+	int i = 0;
+
+	if (PB.KeyOff != 0)
+		return;
+
+	if (PB.NeedsReset)
+	{
+		PB.RemLength = PB.Length - PB.RestartPos;
+		PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1);
+		PB.ReachedEnd = 0;
+	}
+
+_lRestart:
+	if (PB.ReachedEnd)
+	{
+		PB.ReachedEnd = 0;
+
+		if (PB.RepeatMode == 0)
+		{
+			PB.KeyOff = 1;
+			PB.RemLength = 0;
+			PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1) + PB.Length;
+			return;
+		}
+		else
+		{
+			PB.RestartPos = PB.LoopStartPos;
+			PB.RemLength = PB.Length - PB.RestartPos;
+			PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1);
+			pos[1] = 0; pos[0] = 0;
+		}
+	}
+
+	while (i < _Size)
+	{
+		s16 sample = ((pos[1] & mask) == mask) ? 0xc000 : 0x4000;
+
+		TrueSamplePosition += (ratio >> 16);
+
+		_Buffer[i++] = (s32)sample;
+
+		(*(u64*)&pos) += ratio;
+		if ((pos[1] + ((PB.CurAddr - PB.StartAddr) >> 1)) >= PB.Length)
+		{
+			PB.ReachedEnd = 1;
+			goto _lRestart;
+		}
+	}
+
+	if (PB.RemLength < pos[1])
+	{
+		PB.RemLength = 0;
+		PB.ReachedEnd = 1;
+	}
+	else
+	{
+		PB.RemLength -= pos[1];
+	}
+
+	PB.CurSampleFrac = TrueSamplePosition & 0xFFFF;
+}
+
+void ZeldaUCode::RenderSynth_SawWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
+{
+	s32 ratio = (s32)ceil((float)PB.RatioInt / 3);
+	s64 pos = PB.CurSampleFrac;
+
+	for (int i = 0; i < _Size; i++)
+	{
+		pos += ratio;
+		_Buffer[i] = pos & 0xFFFF;
+	}
+
+	PB.CurSampleFrac = pos & 0xFFFF;
+}
+
+void ZeldaUCode::RenderSynth_Constant(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
+{
+	// TODO: Header, footer
+	for (int i = 0; i < _Size; i++)
+		_Buffer[i] = (s32)PB.RatioInt;
+}
+
+// A piece of code from LLE so we can see how the wrap register affects the sound
+
+inline u16 AddValueToReg(u32 ar, s32 ix)
+{
+	u32 wr = 0x3f;
+	u32 mx = (wr | 1) << 1;
+	u32 nar = ar + ix;
+	u32 dar = (nar ^ ar ^ ix) & mx;
+
+	if (ix >= 0)
+	{
+		if (dar > wr) //overflow
+			nar -= wr + 1;
+	}
+	else
+	{
+		if ((((nar + wr + 1) ^ nar) & dar) <= wr) //underflow or below min for mask
+			nar += wr + 1;
+	}
+	return nar;
+}
+
+void ZeldaUCode::RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
+{
+	u16 address;
+
+	switch (PB.Format)
+	{
+	default:
+	case 0x0004:
+		address = 0x140;
+		break;
+
+	case 0x0007:
+		address = 0x100;
+		break;
+
+	case 0x000b:
+		address = 0x180;
+		break;
+
+	case 0x000c:
+		address = 0x1c0;
+		break;
+	}
+
+	// TODO: Resample this!
+	INFO_LOG(DSPHLE, "Synthesizing the incomplete format 0x%04x", PB.Format);
+
+	u64 ACC0 = PB.CurSampleFrac << 6;
+
+	ACC0 &= 0xffff003fffffULL;
+
+	address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
+	ACC0 &= 0xffff0000ffffULL;
+
+	for (int i = 0; i < 0x50; i++)
+	{
+		_Buffer[i] = m_misc_table[address];
+
+		ACC0 += PB.RatioInt << 5;
+		address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
+
+		ACC0 &= 0xffff0000ffffULL;
+	}
+
+	ACC0 += address << 16;
+	PB.CurSampleFrac = (ACC0 >> 6) & 0xffff;
+}
+
+
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
new file mode 100644
index 0000000000..e6db1b0d85
--- /dev/null
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
@@ -0,0 +1,790 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+
+#include "Common/CommonFuncs.h"
+#include "Common/MathUtil.h"
+
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
+
+void ZeldaUCode::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB)
+{
+	u16 *memory = (u16*)Memory::GetPointer(_Addr);
+
+	// Perform byteswap
+	for (int i = 0; i < (0x180 / 2); i++)
+		((u16*)&PB)[i] = Common::swap16(memory[i]);
+
+	// Word swap all 32-bit variables.
+	PB.RestartPos = (PB.RestartPos << 16) | (PB.RestartPos >> 16);
+	PB.CurAddr = (PB.CurAddr << 16) | (PB.CurAddr >> 16);
+	PB.RemLength = (PB.RemLength << 16) | (PB.RemLength >> 16);
+	// Read only part
+	PB.LoopStartPos = (PB.LoopStartPos << 16) | (PB.LoopStartPos >> 16);
+	PB.Length = (PB.Length << 16) | (PB.Length >> 16);
+	PB.StartAddr = (PB.StartAddr << 16) | (PB.StartAddr >> 16);
+	PB.UnkAddr = (PB.UnkAddr << 16) | (PB.UnkAddr >> 16);
+}
+
+void ZeldaUCode::WritebackVoicePB(u32 _Addr, ZeldaVoicePB& PB)
+{
+	u16 *memory = (u16*)Memory::GetPointer(_Addr);
+
+	// Word swap all 32-bit variables.
+	PB.RestartPos = (PB.RestartPos << 16) | (PB.RestartPos >> 16);
+	PB.CurAddr = (PB.CurAddr << 16) | (PB.CurAddr >> 16);
+	PB.RemLength = (PB.RemLength << 16) | (PB.RemLength >> 16);
+
+	// Perform byteswap
+	// Only the first 0x100 bytes are written back
+	for (int i = 0; i < (0x100 / 2); i++)
+		memory[i] = Common::swap16(((u16*)&PB)[i]);
+}
+
+int ZeldaUCode::ConvertRatio(int pb_ratio)
+{
+	return pb_ratio * 16;
+}
+
+int ZeldaUCode::SizeForResampling(ZeldaVoicePB &PB, int size)
+{
+	// This is the little calculation at the start of every sample decoder
+	// in the ucode.
+	return (PB.CurSampleFrac + size * ConvertRatio(PB.RatioInt)) >> 16;
+}
+
+// Simple resampler, linear interpolation.
+// Any future state should be stored in PB.raw[0x3c to 0x3f].
+// In must point 4 samples into a buffer.
+void ZeldaUCode::Resample(ZeldaVoicePB &PB, int size, s16 *in, s32 *out, bool do_resample)
+{
+	if (!do_resample)
+	{
+		memcpy(out, in, size * sizeof(int));
+		return;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		in[i - 4] = (s16)PB.ResamplerOldData[i];
+	}
+
+	int ratio = ConvertRatio(PB.RatioInt);
+	int in_size = SizeForResampling(PB, size);
+
+	int position = PB.CurSampleFrac;
+	for (int i = 0; i < size; i++)
+	{
+		int int_pos = (position >> 16);
+		int frac = ((position & 0xFFFF) >> 1);
+		out[i] = (in[int_pos - 3] * (frac ^ 0x7FFF) + in[int_pos - 2] * frac) >> 15;
+		position += ratio;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		PB.ResamplerOldData[i] = (u16)(s16)in[in_size - 4 + i];
+	}
+	PB.CurSampleFrac = position & 0xFFFF;
+}
+
+static void UpdateSampleCounters10(ZeldaVoicePB &PB)
+{
+	PB.RemLength = PB.Length - PB.RestartPos;
+	PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1);
+	PB.ReachedEnd = 0;
+}
+
+void ZeldaUCode::RenderVoice_PCM16(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
+{
+	int _RealSize = SizeForResampling(PB, _Size);
+	u32 rem_samples = _RealSize;
+	if (PB.KeyOff)
+		goto clear_buffer;
+	if (PB.NeedsReset)
+	{
+		UpdateSampleCounters10(PB);
+		for (int i = 0; i < 4; i++)
+			PB.ResamplerOldData[i] = 0;  // Doesn't belong here, but dunno where to do it.
+	}
+	if (PB.ReachedEnd)
+	{
+		PB.ReachedEnd = 0;
+reached_end:
+		if (!PB.RepeatMode)
+		{
+			// One shot - play zeros the rest of the buffer.
+clear_buffer:
+			for (u32 i = 0; i < rem_samples; i++)
+				*_Buffer++ = 0;
+			PB.KeyOff = 1;
+			return;
+		}
+		else
+		{
+			PB.RestartPos = PB.LoopStartPos;
+			UpdateSampleCounters10(PB);
+		}
+	}
+	// SetupAccelerator
+	const s16 *read_ptr = (s16*)GetARAMPointer(PB.CurAddr);
+	if (PB.RemLength < (u32)rem_samples)
+	{
+		// finish-up loop
+		for (u32 i = 0; i < PB.RemLength; i++)
+			*_Buffer++ = Common::swap16(*read_ptr++);
+		rem_samples -= PB.RemLength;
+		goto reached_end;
+	}
+	// main render loop
+	for (u32 i = 0; i < rem_samples; i++)
+		*_Buffer++ = Common::swap16(*read_ptr++);
+
+	PB.RemLength -= rem_samples;
+	if (PB.RemLength == 0)
+		PB.ReachedEnd = 1;
+	PB.CurAddr += rem_samples << 1;
+}
+
+static void UpdateSampleCounters8(ZeldaVoicePB &PB)
+{
+	PB.RemLength = PB.Length - PB.RestartPos;
+	PB.CurAddr = PB.StartAddr + PB.RestartPos;
+	PB.ReachedEnd = 0;
+}
+
+void ZeldaUCode::RenderVoice_PCM8(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
+{
+	int _RealSize = SizeForResampling(PB, _Size);
+	u32 rem_samples = _RealSize;
+	if (PB.KeyOff)
+		goto clear_buffer;
+	if (PB.NeedsReset)
+	{
+		UpdateSampleCounters8(PB);
+		for (int i = 0; i < 4; i++)
+			PB.ResamplerOldData[i] = 0;  // Doesn't belong here, but dunno where to do it.
+	}
+	if (PB.ReachedEnd)
+	{
+reached_end:
+		PB.ReachedEnd = 0;
+		if (!PB.RepeatMode)
+		{
+			// One shot - play zeros the rest of the buffer.
+clear_buffer:
+			for (u32 i = 0; i < rem_samples; i++)
+				*_Buffer++ = 0;
+			PB.KeyOff = 1;
+			return;
+		}
+		else
+		{
+			PB.RestartPos = PB.LoopStartPos;
+			UpdateSampleCounters8(PB);
+		}
+	}
+
+	// SetupAccelerator
+	const s8 *read_ptr = (s8*)GetARAMPointer(PB.CurAddr);
+	if (PB.RemLength < (u32)rem_samples)
+	{
+		// finish-up loop
+		for (u32 i = 0; i < PB.RemLength; i++)
+			*_Buffer++ = (s8)(*read_ptr++) << 8;
+		rem_samples -= PB.RemLength;
+		goto reached_end;
+	}
+	// main render loop
+	for (u32 i = 0; i < rem_samples; i++)
+		*_Buffer++ = (s8)(*read_ptr++) << 8;
+
+	PB.RemLength -= rem_samples;
+	if (PB.RemLength == 0)
+		PB.ReachedEnd = 1;
+	PB.CurAddr += rem_samples;
+}
+
+template <typename T>
+void PrintObject(const T &Obj)
+{
+	std::stringstream ss;
+	u8 *o = (u8 *)&Obj;
+
+	// If this miscompiles, adjust the size of
+	// ZeldaVoicePB to 0x180 bytes (0xc0 shorts).
+	static_assert(sizeof(ZeldaVoicePB) == 0x180, "ZeldaVoicePB incorrectly defined.");
+
+	ss << std::hex;
+	for (size_t i = 0; i < sizeof(T); i++)
+	{
+		if ((i & 1) == 0)
+			ss << ' ';
+		ss.width(2);
+		ss.fill('0');
+		ss << Common::swap16(o[i]);
+	}
+
+	DEBUG_LOG(DSPHLE, "AFC PB:%s", ss.str().c_str());
+}
+
+void ZeldaUCode::RenderVoice_AFC(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
+{
+	// TODO: Compare mono, stereo and surround samples
+#if defined DEBUG || defined DEBUGFAST
+	PrintObject(PB);
+#endif
+
+	int _RealSize = SizeForResampling(PB, _Size);
+
+	// initialize "decoder" if the sample is played the first time
+	if (PB.NeedsReset != 0)
+	{
+		// This is 0717_ReadOutPBStuff
+		// increment 4fb
+		// zelda:
+		// perhaps init or "has played before"
+		PB.CurBlock = 0x00;
+		PB.YN2 = 0x00;     // history1
+		PB.YN1 = 0x00;     // history2
+
+		// Length in samples.
+		PB.RemLength = PB.Length;
+		// Copy ARAM addr from r to rw area.
+		PB.CurAddr = PB.StartAddr;
+		PB.ReachedEnd = 0;
+		PB.CurSampleFrac = 0;
+
+		for (int i = 0; i < 4; i++)
+			PB.ResamplerOldData[i] = 0;
+	}
+
+	if (PB.KeyOff != 0)  // 0747 early out... i dunno if this can happen because we filter it above
+	{
+		for (int i = 0; i < _RealSize; i++)
+			*_Buffer++ = 0;
+		return;
+	}
+
+	// Round upwards how many samples we need to copy, 0759
+	// u32 frac = NumberOfSamples & 0xF;
+	// NumberOfSamples = (NumberOfSamples + 0xf) >> 4;   // i think the lower 4 are the fraction
+
+	const u8 *source;
+	u32 ram_mask = 1024 * 1024 * 16 - 1;
+	if (IsDMAVersion())
+	{
+		source = Memory::GetPointer(m_dma_base_addr);
+		ram_mask = 1024 * 1024 * 64 - 1;
+	}
+	else
+	{
+		source = DSP::GetARAMPtr();
+	}
+
+	int sampleCount = 0;  // must be above restart.
+
+restart:
+	if (PB.ReachedEnd)
+	{
+		PB.ReachedEnd = 0;
+
+		if ((PB.RepeatMode == 0) || (PB.StopOnSilence != 0))
+		{
+			PB.KeyOff = 1;
+			PB.RemLength = 0;
+			PB.CurAddr = PB.StartAddr + PB.RestartPos + PB.Length;
+
+			while (sampleCount < _RealSize)
+				_Buffer[sampleCount++] = 0;
+			return;
+		}
+		else
+		{
+			//AFC looping
+			// The loop start pos is incorrect? (Fixed?), so samples will loop a bit wrong.
+			// this fixes the intro music in ZTP.
+			PB.RestartPos = PB.LoopStartPos;
+			PB.RemLength = PB.Length - PB.RestartPos;
+			// see DSP_UC_Zelda.txt line 2817
+			PB.CurAddr = ((((((PB.LoopStartPos >> 4) & 0xffff0000)*PB.Format)<<16)+
+				(((PB.LoopStartPos >> 4) & 0xffff)*PB.Format))+PB.StartAddr) & 0xffffffff;
+
+			// Hmm, this shouldn't be reversed .. or should it? Is it different between versions of the ucode?
+			// -> it has to be reversed in ZTP, otherwise intro music is broken...
+			PB.YN1 = PB.LoopYN2;
+			PB.YN2 = PB.LoopYN1;
+		}
+	}
+
+	short outbuf[16] = {0};
+	u16 prev_yn1 = PB.YN1;
+	u16 prev_yn2 = PB.YN2;
+	u32 prev_addr = PB.CurAddr;
+
+	// Prefill the decode buffer.
+	AFCdecodebuffer(m_afc_coef_table, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
+	PB.CurAddr += PB.Format;  // 9 or 5
+
+	u32 SamplePosition = PB.Length - PB.RemLength;
+	while (sampleCount < _RealSize)
+	{
+		_Buffer[sampleCount] = outbuf[SamplePosition & 15];
+		sampleCount++;
+
+		SamplePosition++;
+		PB.RemLength--;
+		if (PB.RemLength == 0)
+		{
+			PB.ReachedEnd = 1;
+			goto restart;
+		}
+
+		// Need new samples!
+		if ((SamplePosition & 15) == 0)
+		{
+			prev_yn1 = PB.YN1;
+			prev_yn2 = PB.YN2;
+			prev_addr = PB.CurAddr;
+
+			AFCdecodebuffer(m_afc_coef_table, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
+			PB.CurAddr += PB.Format;  // 9 or 5
+		}
+	}
+
+	// Here we should back off to the previous addr/yn1/yn2, since we didn't consume the full last block.
+	// We'll re-decode it the next time around.
+	PB.YN2 = prev_yn2;
+	PB.YN1 = prev_yn1;
+	PB.CurAddr = prev_addr;
+
+	PB.NeedsReset = 0;
+	// PB.CurBlock = 0x10 - (PB.LoopStartPos & 0xf);
+	// write back
+	// NumberOfSamples = (NumberOfSamples << 4) | frac;    // missing fraction
+
+	// i think  pTest[0x3a] and pTest[0x3b] got an update after you have decoded some samples...
+	// just decrement them with the number of samples you have played
+	// and increase the ARAM Offset in pTest[0x38], pTest[0x39]
+
+	// end of block (Zelda 03b2)
+}
+
+void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer);
+
+// Researching what's actually inside the mysterious 0x21 case
+// 0x21 seems to really just be reading raw 16-bit audio from RAM (not ARAM).
+// The rules seem to be quite different, though.
+// It's used for streaming, not for one-shot or looped sample playback.
+void ZeldaUCode::RenderVoice_Raw(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
+{
+	// Decoder0x21 starts here.
+	u32 _RealSize = SizeForResampling(PB, _Size);
+
+	// Decoder0x21Core starts here.
+	u32 AX0 = _RealSize;
+
+	// ERROR_LOG(DSPHLE, "0x21 volume mode: %i , stop: %i ", PB.VolumeMode, PB.StopOnSilence);
+
+	// The PB.StopOnSilence check is a hack, we should check the buffers and enter this
+	// only when the buffer is completely 0 (i.e. when the music has finished fading out)
+	if (PB.StopOnSilence || PB.RemLength < (u32)_RealSize)
+	{
+		WARN_LOG(DSPHLE, "Raw: END");
+		// Let's ignore this entire case since it doesn't seem to happen
+		// in Zelda, since Length is set to 0xF0000000
+		// blah
+		// blah
+		// readaudio
+		// blah
+		PB.RemLength = 0;
+		PB.KeyOff = 1;
+	}
+
+	PB.RemLength -= _RealSize;
+
+	u64 ACC0 = (u32)(PB.raw[0x8a ^ 1] << 16);  // 0x8a    0ad5, yes it loads a, not b
+	u64 ACC1 = (u32)(PB.raw[0x34 ^ 1] << 16);  // 0x34
+
+	// ERROR_LOG(DSPHLE, "%08x %08x", (u32)ACC0, (u32)ACC1);
+
+	ACC0 -= ACC1;
+
+	PB.Unk36[0] = (u16)(ACC0 >> 16);
+
+	ACC0 -= AX0 << 16;
+
+	if ((s64)ACC0 < 0)
+	{
+		// ERROR_LOG(DSPHLE, "Raw loop: ReadAudio size = %04x 34:%04x %08x", PB.Unk36[0], PB.raw[0x34 ^ 1], (int)ACC0);
+		Decoder21_ReadAudio(PB, PB.Unk36[0], _Buffer);
+
+		ACC0 = -(s64)ACC0;
+		_Buffer += PB.Unk36[0];
+
+		PB.raw[0x34 ^ 1] = 0;
+
+		PB.StartAddr = PB.LoopStartPos;
+
+		Decoder21_ReadAudio(PB, (int)(ACC0 >> 16), _Buffer);
+		return;
+	}
+
+	Decoder21_ReadAudio(PB, _RealSize, _Buffer);
+}
+
+void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16* _Buffer)
+{
+	// 0af6
+	if (!size)
+		return;
+
+#if 0
+	// 0afa
+	u32 AX1 = (PB.RestartPos >> 16) & 1;  // PB.raw[0x34], except that it's part of a dword
+	// 0b00 - Eh, WTF.
+	u32 ACC0 = PB.StartAddr + ((PB.RestartPos >> 16) << 1) - 2*AX1;
+	u32 ACC1 = (size << 16) + 0x20000;
+	// All this trickery, and more, seems to be to align the DMA, which
+	// we really don't care about. So let's skip it. See the #else.
+
+#else
+	// ERROR_LOG(DSPHLE, "ReadAudio: %08x %08x", PB.StartAddr, PB.raw[0x34 ^ 1]);
+	u32 ACC0 = PB.StartAddr + (PB.raw[0x34 ^ 1] << 1);
+	u32 ACC1 = (size << 16);
+#endif
+	// ACC0 is the address
+	// ACC1 is the read size
+
+	const u16* src = (u16*)Memory::GetPointer(ACC0 & Memory::RAM_MASK);
+
+	for (u32 i = 0; i < (ACC1 >> 16); i++)
+	{
+		_Buffer[i] = Common::swap16(src[i]);
+	}
+
+	PB.raw[0x34 ^ 1] += size;
+}
+
+
+void ZeldaUCode::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _RightBuffer, int _Size)
+{
+	if (PB.IsBlank)
+	{
+		s32 sample = (s32)(s16)PB.FixedSample;
+		for (int i = 0; i < _Size; i++)
+			m_voice_buffer[i] = sample;
+
+		goto ContinueWithBlock;  // Yes, a goto. Yes, it's evil, but it makes the flow look much more like the DSP code.
+	}
+
+	// XK: Use this to disable MIDI music (GREAT for testing). Also kills some sound FX.
+	//if (PB.SoundType == 0x0d00)
+	//{
+	//    PB.NeedsReset = 0;
+	//    return;
+	//}
+
+	// The Resample calls actually don't resample yet.
+
+	// ResampleBuffer corresponds to 0x0580 in ZWW ucode.
+	// VoiceBuffer corresponds to 0x0520.
+
+	// First jump table at ZWW: 2a6
+	switch (PB.Format)
+	{
+	case 0x0005: // AFC with extra low bitrate (32:5 compression).
+	case 0x0009: // AFC with normal bitrate (32:9 compression).
+		RenderVoice_AFC(PB, m_resample_buffer + 4, _Size);
+		Resample(PB, _Size, m_resample_buffer + 4, m_voice_buffer, true);
+		break;
+
+	case 0x0008: // PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW.
+		RenderVoice_PCM8(PB, m_resample_buffer + 4, _Size);
+		Resample(PB, _Size, m_resample_buffer + 4, m_voice_buffer, true);
+		break;
+
+	case 0x0010: // PCM16 - normal PCM 16-bit audio.
+		RenderVoice_PCM16(PB, m_resample_buffer + 4, _Size);
+		Resample(PB, _Size, m_resample_buffer + 4, m_voice_buffer, true);
+		break;
+
+	case 0x0020:
+		// Normally, this shouldn't resample, it should just decode directly
+		// to the output buffer. However, (if we ever see this sound type), we'll
+		// have to resample anyway since we're running at a different sample rate.
+
+		RenderVoice_Raw(PB, m_resample_buffer + 4, _Size);
+		Resample(PB, _Size, m_resample_buffer + 4, m_voice_buffer, true);
+		break;
+
+	case 0x0021:
+		// Raw sound from RAM. Important for Zelda WW. Cutscenes use the music
+		// to let the game know they ended
+		RenderVoice_Raw(PB, m_resample_buffer + 4, _Size);
+		Resample(PB, _Size, m_resample_buffer + 4, m_voice_buffer, true);
+		break;
+
+	default:
+		// Second jump table
+		// TODO: Cases to find examples of:
+		//       -0x0002
+		//       -0x0003
+		//       -0x0006
+		//       -0x000a
+		switch (PB.Format)
+		{
+		// Synthesized sounds
+		case 0x0003: WARN_LOG(DSPHLE, "PB Format 0x03 used!");
+		case 0x0000: // Example: Magic meter filling up in ZWW
+			RenderSynth_RectWave(PB, m_voice_buffer, _Size);
+			break;
+
+		case 0x0001: // Example: "Denied" sound when trying to pull out a sword indoors in ZWW
+			RenderSynth_SawWave(PB, m_voice_buffer, _Size);
+			break;
+
+		case 0x0006:
+			WARN_LOG(DSPHLE, "Synthesizing 0x0006 (constant sound)");
+			RenderSynth_Constant(PB, m_voice_buffer, _Size);
+			break;
+
+		// These are more "synth" formats - square wave, saw wave etc.
+		case 0x0002:
+			WARN_LOG(DSPHLE, "PB Format 0x02 used!");
+			break;
+
+		case 0x0004: // Example: Big Pikmin onion mothership landing/building a bridge in Pikmin
+		case 0x0007: // Example: "success" SFX in Pikmin 1, Pikmin 2 in a cave, not sure what sound it is.
+		case 0x000b: // Example: SFX in area selection menu in Pikmin
+		case 0x000c: // Example: beam of death/yellow force-field in Temple of the Gods, ZWW
+			RenderSynth_WaveTable(PB, m_voice_buffer, _Size);
+			break;
+
+		default:
+			// TODO: Implement general decoder here
+			memset(m_voice_buffer, 0, _Size * sizeof(s32));
+			ERROR_LOG(DSPHLE, "Unknown MixAddVoice format in zelda %04x", PB.Format);
+			break;
+		}
+	}
+
+ContinueWithBlock:
+
+	if (PB.FilterEnable)
+	{  // 0x04a8
+		for (int i = 0; i < _Size; i++)
+		{
+			// TODO: Apply filter from ZWW: 0c84_FilterBufferInPlace
+		}
+	}
+
+	for (int i = 0; i < _Size; i++)
+	{
+		// TODO?
+	}
+
+	// Apply volume. There are two different modes.
+	if (PB.VolumeMode != 0)
+	{
+		// Complex volume mode. Let's see what we can do.
+		if (PB.StopOnSilence)
+		{
+			PB.raw[0x2b] = PB.raw[0x2a] >> 1;
+			if (PB.raw[0x2b] == 0)
+			{
+				PB.KeyOff = 1;
+			}
+		}
+
+		short AX0L = PB.raw[0x28] >> 8;
+		short AX0H = PB.raw[0x28] & 0x7F;
+		short AX1L = AX0L ^ 0x7F;
+		short AX1H = AX0H ^ 0x7F;
+		AX0L = m_misc_table[0x200 + AX0L];
+		AX0H = m_misc_table[0x200 + AX0H];
+		AX1L = m_misc_table[0x200 + AX1L];
+		AX1H = m_misc_table[0x200 + AX1H];
+
+		short b00[20];
+		b00[0] = AX1L * AX1H >> 16;
+		b00[1] = AX0L * AX1H >> 16;
+		b00[2] = AX0H * AX1L >> 16;
+		b00[3] = AX0L * AX0H >> 16;
+
+		for (int i = 0; i < 4; i++)
+		{
+			b00[i + 4] = (s16)b00[i] * (s16)PB.raw[0x2a] >> 16;
+		}
+
+		int prod = ((s16)PB.raw[0x2a] * (s16)PB.raw[0x29] * 2) >> 16;
+		for (int i = 0; i < 4; i++)
+		{
+			b00[i + 8] = (s16)b00[i + 4] * prod;
+		}
+
+		// ZWW 0d34
+
+		int diff = (s16)PB.raw[0x2b] - (s16)PB.raw[0x2a];
+		PB.raw[0x2a] = PB.raw[0x2b];
+
+		for (int i = 0; i < 4; i++)
+		{
+			b00[i + 0xc] = (unsigned short)b00[i] * diff >> 16;
+		}
+
+		for (int i = 0; i < 4; i++)
+		{
+			b00[i + 0x10] = (s16)b00[i + 0xc] * PB.raw[0x29];
+		}
+
+		for (int count = 0; count < 8; count++)
+		{
+			// The 8 buffers to mix to: 0d00, 0d60, 0f40 0ca0 0e80 0ee0 0c00 0c50
+			// We just mix to the first two and call it stereo :p
+			int value = b00[0x4 + count];
+			//int delta = b00[0xC + count] << 11; // Unused?
+
+			int ramp = value << 16;
+			for (int i = 0; i < _Size; i++)
+			{
+				int unmixed_audio = m_voice_buffer[i];
+				switch (count)
+				{
+				case 0: _LeftBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
+				case 1: _RightBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
+				}
+			}
+		}
+	}
+	else
+	{
+		// ZWW 0355
+		if (PB.StopOnSilence)
+		{
+			int sum = 0;
+			int addr = 0x0a;
+			for (int i = 0; i < 6; i++)
+			{
+				u16 value = PB.raw[addr];
+				addr--;
+				value >>= 1;
+				PB.raw[addr] = value;
+				sum += value;
+				addr += 5;
+			}
+
+			if (sum == 0)
+			{
+				PB.KeyOff = 1;
+			}
+		}
+
+		// Seems there are 6 temporary output buffers.
+		for (int count = 0; count < 6; count++)
+		{
+			int addr = 0x08;
+
+			// we'll have to keep a map of buffers I guess...
+			u16 dest_buffer_address = PB.raw[addr++];
+
+			bool mix = dest_buffer_address ? true : false;
+
+			u16 vol2 = PB.raw[addr++];
+			u16 vol1 = PB.raw[addr++];
+
+			int delta = (vol2 - vol1) << 11;
+
+			addr--;
+
+			u32 ramp = vol1 << 16;
+			if (mix)
+			{
+				// 0ca9_RampedMultiplyAddBuffer
+				for (int i = 0; i < _Size; i++)
+				{
+					int value = m_voice_buffer[i];
+
+					// TODO - add to buffer specified by dest_buffer_address
+					switch (count)
+					{
+						// These really should be 32.
+						case 0: _LeftBuffer[i] += (u64)value * ramp >> 29; break;
+						case 1: _RightBuffer[i] += (u64)value * ramp >> 29; break;
+					}
+
+					if (((i & 1) == 0) && i < 64)
+					{
+						ramp += delta;
+					}
+				}
+				if (_Size < 32)
+				{
+					ramp += delta * (_Size - 32);
+				}
+			}
+			// Update the PB with the volume actually reached.
+			PB.raw[addr++] = ramp >> 16;
+
+			addr++;
+		}
+	}
+	// 03b2, this is the reason of using PB.NeedsReset. Seems to be necessary for SMG, and maybe other games.
+	if (PB.IsBlank == 0)
+	{
+		PB.NeedsReset = 0;
+	}
+}
+
+void ZeldaUCode::MixAudio()
+{
+	const int BufferSamples = 5 * 16;
+
+	// Final mix buffers
+	memset(m_left_buffer, 0, BufferSamples * sizeof(s32));
+	memset(m_right_buffer, 0, BufferSamples * sizeof(s32));
+
+	// For each PB...
+	for (u32 i = 0; i < m_num_voices; i++)
+	{
+		if (!IsLightVersion())
+		{
+			u32 flags = m_sync_flags[(i >> 4) & 0xF];
+			if (!(flags & 1 << (15 - (i & 0xF))))
+				continue;
+		}
+
+		ZeldaVoicePB pb;
+		ReadVoicePB(m_voice_pbs_addr + (i * 0x180), pb);
+
+		if (pb.Status == 0)
+			continue;
+		if (pb.KeyOff != 0)
+			continue;
+
+		RenderAddVoice(pb, m_left_buffer, m_right_buffer, BufferSamples);
+		WritebackVoicePB(m_voice_pbs_addr + (i * 0x180), pb);
+	}
+
+	// Post processing, final conversion.
+	s16* left_buffer = (s16*)HLEMemory_Get_Pointer(m_left_buffers_addr);
+	s16* right_buffer = (s16*)HLEMemory_Get_Pointer(m_right_buffers_addr);
+	left_buffer += m_current_buffer * BufferSamples;
+	right_buffer += m_current_buffer * BufferSamples;
+	for (int i = 0; i < BufferSamples; i++)
+	{
+		s32 left = m_left_buffer[i];
+		s32 right = m_right_buffer[i];
+
+		MathUtil::Clamp(&left, -32768, 32767);
+		left_buffer[i] = Common::swap16((short)left);
+
+		MathUtil::Clamp(&right, -32768, 32767);
+		right_buffer[i] = Common::swap16((short)right);
+	}
+}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
new file mode 100644
index 0000000000..d22a7d20e4
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
@@ -0,0 +1,202 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/HW/DSPLLE/DSPDebugInterface.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
+
+std::string DSPDebugInterface::Disassemble(unsigned int address)
+{
+	// we'll treat addresses as line numbers.
+	return DSPSymbols::GetLineText(address);
+}
+
+void DSPDebugInterface::GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
+{
+	if (DSPCore_GetState() == DSPCORE_STOP)
+	{
+		dest[0] = 0;
+		return;
+	}
+
+	switch (memory)
+	{
+	case 0:  // IMEM
+		switch (address >> 12)
+		{
+		case 0:
+		case 0x8:
+			sprintf(dest, "%04x", dsp_imem_read(address));
+			break;
+		default:
+			sprintf(dest, "--IMEM--");
+			break;
+		}
+		break;
+	case 1:  // DMEM
+		switch (address >> 12)
+		{
+		case 0:
+		case 1:
+			sprintf(dest, "%04x (DMEM)", dsp_dmem_read(address));
+			break;
+		case 0xf:
+			sprintf(dest, "%04x (MMIO)", g_dsp.ifx_regs[address & 0xFF]);
+			break;
+		default:
+			sprintf(dest, "--DMEM--");
+			break;
+		}
+		break;
+	}
+}
+
+unsigned int DSPDebugInterface::ReadMemory(unsigned int address)
+{
+	return 0;
+}
+
+unsigned int DSPDebugInterface::ReadInstruction(unsigned int address)
+{
+	return 0;
+}
+
+bool DSPDebugInterface::IsAlive()
+{
+	return true; //Core::GetState() != Core::CORE_UNINITIALIZED;
+}
+
+bool DSPDebugInterface::IsBreakpoint(unsigned int address)
+{
+	int real_addr = DSPSymbols::Line2Addr(address);
+	if (real_addr >= 0)
+		return dsp_breakpoints.IsAddressBreakPoint(real_addr);
+	else
+		return false;
+}
+
+void DSPDebugInterface::SetBreakpoint(unsigned int address)
+{
+	int real_addr = DSPSymbols::Line2Addr(address);
+
+	if (real_addr >= 0)
+	{
+		if (dsp_breakpoints.Add(real_addr))
+		{
+
+		}
+	}
+}
+
+void DSPDebugInterface::ClearBreakpoint(unsigned int address)
+{
+	int real_addr = DSPSymbols::Line2Addr(address);
+
+	if (real_addr >= 0)
+	{
+		if (dsp_breakpoints.Remove(real_addr))
+		{
+
+		}
+	}
+}
+
+void DSPDebugInterface::ClearAllBreakpoints()
+{
+	dsp_breakpoints.Clear();
+}
+
+void DSPDebugInterface::ToggleBreakpoint(unsigned int address)
+{
+	int real_addr = DSPSymbols::Line2Addr(address);
+	if (real_addr >= 0)
+	{
+		if (dsp_breakpoints.IsAddressBreakPoint(real_addr))
+			dsp_breakpoints.Remove(real_addr);
+		else
+			dsp_breakpoints.Add(real_addr);
+	}
+}
+
+bool DSPDebugInterface::IsMemCheck(unsigned int address)
+{
+	return false;
+}
+
+void DSPDebugInterface::ClearAllMemChecks()
+{
+	PanicAlert("MemCheck functionality not supported in DSP module.");
+}
+
+void DSPDebugInterface::ToggleMemCheck(unsigned int address)
+{
+	PanicAlert("MemCheck functionality not supported in DSP module.");
+}
+
+void DSPDebugInterface::InsertBLR(unsigned int address, unsigned int value)
+{
+	PanicAlert("insertBLR functionality not supported in DSP module.");
+}
+
+// =======================================================
+// Separate the blocks with colors.
+// -------------
+int DSPDebugInterface::GetColor(unsigned int address)
+{
+	static const int colors[6] =
+	{
+		0xd0FFFF,  // light cyan
+		0xFFd0d0,  // light red
+		0xd8d8FF,  // light blue
+		0xFFd0FF,  // light purple
+		0xd0FFd0,  // light green
+		0xFFFFd0,  // light yellow
+	};
+
+	// Scan backwards so we don't miss it. Hm, actually, let's not - it looks pretty good.
+	int addr = -1;
+	for (int i = 0; i < 1; i++)
+	{
+		addr = DSPSymbols::Line2Addr(address - i);
+		if (addr >= 0)
+			break;
+	}
+	if (addr == -1)
+		return 0xFFFFFF;
+
+	Symbol *symbol = DSPSymbols::g_dsp_symbol_db.GetSymbolFromAddr(addr);
+	if (!symbol)
+		return 0xFFFFFF;
+	if (symbol->type != Symbol::SYMBOL_FUNCTION)
+		return 0xEEEEFF;
+	return colors[symbol->index % 6];
+}
+// =============
+
+
+std::string DSPDebugInterface::GetDescription(unsigned int address)
+{
+	return "";  // g_symbolDB.GetDescription(address);
+}
+
+unsigned int DSPDebugInterface::GetPC()
+{
+	return DSPSymbols::Addr2Line(g_dsp.pc);
+}
+
+void DSPDebugInterface::SetPC(unsigned int address)
+{
+	int new_pc = DSPSymbols::Line2Addr(address);
+	if (new_pc > 0)
+		g_dsp.pc = new_pc;
+}
+
+void DSPDebugInterface::RunToBreakpoint()
+{
+
+}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
new file mode 100644
index 0000000000..69d8209d91
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
@@ -0,0 +1,37 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/DebugInterface.h"
+
+class DSPDebugInterface final : public DebugInterface
+{
+public:
+	DSPDebugInterface(){}
+	virtual std::string Disassemble(unsigned int address) override;
+	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
+	virtual int GetInstructionSize(int instruction) override { return 1; }
+	virtual bool IsAlive() override;
+	virtual bool IsBreakpoint(unsigned int address) override;
+	virtual void SetBreakpoint(unsigned int address) override;
+	virtual void ClearBreakpoint(unsigned int address) override;
+	virtual void ClearAllBreakpoints() override;
+	virtual void ToggleBreakpoint(unsigned int address) override;
+	virtual void ClearAllMemChecks() override;
+	virtual bool IsMemCheck(unsigned int address) override;
+	virtual void ToggleMemCheck(unsigned int address) override;
+	virtual unsigned int ReadMemory(unsigned int address) override;
+	virtual unsigned int ReadInstruction(unsigned int address) override;
+	virtual unsigned int GetPC() override;
+	virtual void SetPC(unsigned int address) override;
+	virtual void Step() override {}
+	virtual void RunToBreakpoint() override;
+	virtual void InsertBLR(unsigned int address, unsigned int value) override;
+	virtual int GetColor(unsigned int address) override;
+	virtual std::string GetDescription(unsigned int address) override;
+};
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
similarity index 76%
rename from Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
rename to Source/Core/Core/HW/DSPLLE/DSPHost.cpp
index 26e7110d6e..c8033cf3bf 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
@@ -1,53 +1,63 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "Hash.h"
-#include "DSP/DSPAnalyzer.h"
-#include "DSP/DSPCore.h"
-#include "DSP/DSPHost.h"
-#include "DSPSymbols.h"
-#include "DSPLLETools.h"
-#include "../DSP.h"
-#include "../../ConfigManager.h"
-#include "../../PowerPC/PowerPC.h"
-#include "Host.h"
+#include "Common/CommonTypes.h"
+#include "Common/Hash.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DSPLLE/DSPLLETools.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "VideoCommon/OnScreenDisplay.h"
 
 // The user of the DSPCore library must supply a few functions so that the
 // emulation core can access the environment it runs in. If the emulation
 // core isn't used, for example in an asm/disasm tool, then most of these
 // can be stubbed out.
 
-u8 DSPHost_ReadHostMemory(u32 addr)
+namespace DSPHost
+{
+
+u8 ReadHostMemory(u32 addr)
 {
 	return DSP::ReadARAM(addr);
 }
 
-void DSPHost_WriteHostMemory(u8 value, u32 addr)
+void WriteHostMemory(u8 value, u32 addr)
 {
 	DSP::WriteARAM(value, addr);
 }
 
-bool DSPHost_OnThread()
+void OSD_AddMessage(const std::string& str, u32 ms)
+{
+	OSD::AddMessage(str, ms);
+}
+
+bool OnThread()
 {
 	const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
 	return  _CoreParameter.bDSPThread;
 }
 
-bool DSPHost_Wii()
+bool IsWiiHost()
 {
 	const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
 	return  _CoreParameter.bWii;
 }
 
-void DSPHost_InterruptRequest()
+void InterruptRequest()
 {
 	// Fire an interrupt on the PPC ASAP.
 	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 }
 
-void DSPHost_CodeLoaded(const u8 *ptr, int size)
+void CodeLoaded(const u8 *ptr, int size)
 {
 	g_dsp.iram_crc = HashEctor(ptr, size);
 
@@ -58,7 +68,7 @@ void DSPHost_CodeLoaded(const u8 *ptr, int size)
 	DSPSymbols::Clear();
 
 	// Auto load text file - if none just disassemble.
-	
+
 	NOTICE_LOG(DSPLLE, "g_dsp.iram_crc: %08x", g_dsp.iram_crc);
 
 	DSPSymbols::Clear();
@@ -86,7 +96,7 @@ void DSPHost_CodeLoaded(const u8 *ptr, int size)
 	// Always add the ROM.
 	DSPSymbols::AutoDisassembly(0x8000, 0x9000);
 
-	DSPHost_UpdateDebugger();
+	UpdateDebugger();
 
 	if (dspjit)
 		dspjit->ClearIRAM();
@@ -94,7 +104,9 @@ void DSPHost_CodeLoaded(const u8 *ptr, int size)
 	DSPAnalyzer::Analyze();
 }
 
-void DSPHost_UpdateDebugger()
+void UpdateDebugger()
 {
 	Host_RefreshDSPDebuggerWindow();
 }
+
+}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
new file mode 100644
index 0000000000..4fff742d57
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -0,0 +1,357 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+#include <thread>
+
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/Event.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/DSP/DSPCaptureLogger.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPTables.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/Memmap.h"
+
+#include "Core/HW/DSPLLE/DSPLLE.h"
+#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
+
+DSPLLE::DSPLLE()
+	: m_hDSPThread()
+	, m_csDSPThreadActive()
+	, m_bWii(false)
+	, m_bDSPThread(false)
+	, m_bIsRunning(false)
+	, m_cycle_count(0)
+{
+}
+
+static Common::Event dspEvent;
+static Common::Event ppcEvent;
+static bool requestDisableThread;
+
+void DSPLLE::DoState(PointerWrap &p)
+{
+	bool is_hle = false;
+	p.Do(is_hle);
+	if (is_hle && p.GetMode() == PointerWrap::MODE_READ)
+	{
+		Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000);
+		p.SetMode(PointerWrap::MODE_VERIFY);
+		return;
+	}
+	p.Do(g_dsp.r);
+	p.Do(g_dsp.pc);
+#if PROFILE
+	p.Do(g_dsp.err_pc);
+#endif
+	p.Do(g_dsp.cr);
+	p.Do(g_dsp.reg_stack_ptr);
+	p.Do(g_dsp.exceptions);
+	p.Do(g_dsp.external_interrupt_waiting);
+
+	for (int i = 0; i < 4; i++)
+	{
+		p.Do(g_dsp.reg_stack[i]);
+	}
+
+	p.Do(g_dsp.step_counter);
+	p.Do(g_dsp.ifx_regs);
+	p.Do(g_dsp.mbox[0]);
+	p.Do(g_dsp.mbox[1]);
+	UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+	p.DoArray(g_dsp.iram, DSP_IRAM_SIZE);
+	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+	if (p.GetMode() == PointerWrap::MODE_READ)
+		DSPHost::CodeLoaded((const u8*)g_dsp.iram, DSP_IRAM_BYTE_SIZE);
+	p.DoArray(g_dsp.dram, DSP_DRAM_SIZE);
+	p.Do(cyclesLeft);
+	p.Do(init_hax);
+	p.Do(m_cycle_count);
+}
+
+// Regular thread
+void DSPLLE::DSPThread(DSPLLE* dsp_lle)
+{
+	Common::SetCurrentThreadName("DSP thread");
+
+	while (dsp_lle->m_bIsRunning.IsSet())
+	{
+		const int cycles = static_cast<int>(dsp_lle->m_cycle_count.load());
+		if (cycles > 0)
+		{
+			std::lock_guard<std::mutex> dsp_thread_lock(dsp_lle->m_csDSPThreadActive);
+			if (dspjit)
+			{
+				DSPCore_RunCycles(cycles);
+			}
+			else
+			{
+				DSPInterpreter::RunCyclesThread(cycles);
+			}
+			dsp_lle->m_cycle_count.store(0);
+		}
+		else
+		{
+			ppcEvent.Set();
+			dspEvent.Wait();
+		}
+	}
+}
+
+static bool LoadDSPRom(u16* rom, const std::string& filename, u32 size_in_bytes)
+{
+	std::string bytes;
+	if (!File::ReadFileToString(filename, bytes))
+		return false;
+
+	if (bytes.size() != size_in_bytes)
+	{
+		ERROR_LOG(DSPLLE, "%s has a wrong size (%u, expected %u)",
+		          filename.c_str(), (u32)bytes.size(), size_in_bytes);
+		return false;
+	}
+
+	const u16* words = reinterpret_cast<const u16*>(bytes.c_str());
+	for (u32 i = 0; i < size_in_bytes / 2; ++i)
+		rom[i] = Common::swap16(words[i]);
+
+	return true;
+}
+
+static bool FillDSPInitOptions(DSPInitOptions* opts)
+{
+	std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM;
+	std::string coef_file = File::GetUserPath(D_GCUSER_IDX) + DSP_COEF;
+
+	if (!File::Exists(irom_file))
+		irom_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_IROM;
+	if (!File::Exists(coef_file))
+		coef_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_COEF;
+
+	if (!LoadDSPRom(opts->irom_contents.data(), irom_file, DSP_IROM_BYTE_SIZE))
+		return false;
+	if (!LoadDSPRom(opts->coef_contents.data(), coef_file, DSP_COEF_BYTE_SIZE))
+		return false;
+
+	opts->core_type = SConfig::GetInstance().m_DSPEnableJIT ?
+		DSPInitOptions::CORE_JIT : DSPInitOptions::CORE_INTERPRETER;
+
+	if (SConfig::GetInstance().m_DSPCaptureLog)
+	{
+		const std::string pcap_path = File::GetUserPath(D_DUMPDSP_IDX) + "dsp.pcap";
+		opts->capture_logger = new PCAPDSPCaptureLogger(pcap_path);
+	}
+
+	return true;
+}
+
+bool DSPLLE::Initialize(bool bWii, bool bDSPThread)
+{
+	requestDisableThread = false;
+
+	DSPInitOptions opts;
+	if (!FillDSPInitOptions(&opts))
+		return false;
+	if (!DSPCore_Init(opts))
+		return false;
+
+	// needs to be after DSPCore_Init for the dspjit ptr
+	if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() ||
+	    Core::g_want_determinism    || !dspjit)
+	{
+		bDSPThread = false;
+	}
+	m_bWii = bWii;
+	m_bDSPThread = bDSPThread;
+
+	// DSPLLE directly accesses the fastmem arena.
+	// TODO: The fastmem arena is only supposed to be used by the JIT:
+	// among other issues, its size is only 1GB on 32-bit targets.
+	g_dsp.cpu_ram = Memory::physical_base;
+	DSPCore_Reset();
+
+	InitInstructionTable();
+
+	if (bDSPThread)
+	{
+		m_bIsRunning.Set(true);
+		m_hDSPThread = std::thread(DSPThread, this);
+	}
+
+	Host_RefreshDSPDebuggerWindow();
+	return true;
+}
+
+void DSPLLE::DSP_StopSoundStream()
+{
+	if (m_bDSPThread)
+	{
+		m_bIsRunning.Clear();
+		ppcEvent.Set();
+		dspEvent.Set();
+		m_hDSPThread.join();
+	}
+}
+
+void DSPLLE::Shutdown()
+{
+	DSPCore_Shutdown();
+}
+
+u16 DSPLLE::DSP_WriteControlRegister(u16 _uFlag)
+{
+	DSPInterpreter::WriteCR(_uFlag);
+
+	if (_uFlag & 2)
+	{
+		if (!m_bDSPThread)
+		{
+			DSPCore_CheckExternalInterrupt();
+			DSPCore_CheckExceptions();
+		}
+		else
+		{
+			// External interrupt pending: this is the zelda ucode.
+			// Disable the DSP thread because there is no performance gain.
+			requestDisableThread = true;
+
+			DSPCore_SetExternalInterrupt(true);
+		}
+
+	}
+
+	return DSPInterpreter::ReadCR();
+}
+
+u16 DSPLLE::DSP_ReadControlRegister()
+{
+	return DSPInterpreter::ReadCR();
+}
+
+u16 DSPLLE::DSP_ReadMailBoxHigh(bool _CPUMailbox)
+{
+	return gdsp_mbox_read_h(_CPUMailbox ? GDSP_MBOX_CPU : GDSP_MBOX_DSP);
+}
+
+u16 DSPLLE::DSP_ReadMailBoxLow(bool _CPUMailbox)
+{
+	return gdsp_mbox_read_l(_CPUMailbox ? GDSP_MBOX_CPU : GDSP_MBOX_DSP);
+}
+
+void DSPLLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, u16 _uHighMail)
+{
+	if (_CPUMailbox)
+	{
+		if (gdsp_mbox_peek(GDSP_MBOX_CPU) & 0x80000000)
+		{
+			ERROR_LOG(DSPLLE, "Mailbox isnt empty ... strange");
+		}
+
+#if PROFILE
+		if ((_uHighMail) == 0xBABE)
+		{
+			ProfilerStart();
+		}
+#endif
+
+		gdsp_mbox_write_h(GDSP_MBOX_CPU, _uHighMail);
+	}
+	else
+	{
+		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
+	}
+}
+
+void DSPLLE::DSP_WriteMailBoxLow(bool _CPUMailbox, u16 _uLowMail)
+{
+	if (_CPUMailbox)
+	{
+		gdsp_mbox_write_l(GDSP_MBOX_CPU, _uLowMail);
+	}
+	else
+	{
+		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
+	}
+}
+
+void DSPLLE::DSP_Update(int cycles)
+{
+	int dsp_cycles = cycles / 6;
+
+	if (dsp_cycles <= 0)
+		return;
+// Sound stream update job has been handled by AudioDMA routine, which is more efficient
+/*
+	// This gets called VERY OFTEN. The soundstream update might be expensive so only do it 200 times per second or something.
+	int cycles_between_ss_update;
+
+	if (g_dspInitialize.bWii)
+		cycles_between_ss_update = 121500000 / 200;
+	else
+		cycles_between_ss_update = 81000000 / 200;
+
+	m_cycle_count += cycles;
+	if (m_cycle_count > cycles_between_ss_update)
+	{
+		while (m_cycle_count > cycles_between_ss_update)
+			m_cycle_count -= cycles_between_ss_update;
+		soundStream->Update();
+	}
+*/
+	if (m_bDSPThread)
+	{
+		if (requestDisableThread || NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || Core::g_want_determinism)
+		{
+			DSP_StopSoundStream();
+			m_bDSPThread = false;
+			requestDisableThread = false;
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = false;
+		}
+	}
+
+	// If we're not on a thread, run cycles here.
+	if (!m_bDSPThread)
+	{
+		// ~1/6th as many cycles as the period PPC-side.
+		DSPCore_RunCycles(dsp_cycles);
+	}
+	else
+	{
+		// Wait for DSP thread to complete its cycle. Note: this logic should be thought through.
+		ppcEvent.Wait();
+		m_cycle_count.fetch_add(dsp_cycles);
+		dspEvent.Set();
+	}
+}
+
+u32 DSPLLE::DSP_UpdateRate()
+{
+	return 12600; // TO BE TWEAKED
+}
+
+void DSPLLE::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	if (doLock)
+		m_csDSPThreadActive.lock();
+	else
+		m_csDSPThreadActive.unlock();
+}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h
new file mode 100644
index 0000000000..b8e92e1c06
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h
@@ -0,0 +1,47 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+#include "Common/Flag.h"
+#include "Core/DSPEmulator.h"
+
+class PointerWrap;
+
+class DSPLLE : public DSPEmulator
+{
+public:
+	DSPLLE();
+
+	virtual bool Initialize(bool bWii, bool bDSPThread) override;
+	virtual void Shutdown() override;
+	virtual bool IsLLE() override { return true; }
+
+	virtual void DoState(PointerWrap &p) override;
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+
+	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
+	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
+	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
+	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
+	virtual unsigned short DSP_ReadControlRegister() override;
+	virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
+	virtual void DSP_Update(int cycles) override;
+	virtual void DSP_StopSoundStream() override;
+	virtual u32 DSP_UpdateRate() override;
+
+private:
+	static void DSPThread(DSPLLE* lpParameter);
+
+	std::thread m_hDSPThread;
+	std::mutex m_csDSPThreadActive;
+	bool m_bWii;
+	bool m_bDSPThread;
+	Common::Flag m_bIsRunning;
+	std::atomic<u32> m_cycle_count;
+};
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp
new file mode 100644
index 0000000000..6fd28b45c5
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp
@@ -0,0 +1,58 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
+
+#if PROFILE
+
+#define PROFILE_MAP_SIZE 0x10000
+
+u64 g_profileMap[PROFILE_MAP_SIZE];
+bool g_profile = false;
+
+void ProfilerStart()
+{
+	g_profile = true;
+}
+
+void ProfilerAddDelta(int _addr, int _delta)
+{
+	if (g_profile)
+	{
+		g_profileMap[_addr] += _delta;
+	}
+}
+
+void ProfilerInit()
+{
+	memset(g_profileMap, 0, sizeof(g_profileMap));
+}
+
+void ProfilerDump(u64 count)
+{
+	File::IOFile pFile("DSP_Prof.txt", "wt");
+	if (pFile)
+	{
+		fprintf(pFile.GetHandle(), "Number of DSP steps: %" PRIu64 "\n\n", count);
+		for (int i=0; i<PROFILE_MAP_SIZE;i++)
+		{
+			if (g_profileMap[i] > 0)
+			{
+				fprintf(pFile.GetHandle(), "0x%04X: %" PRIu64 "\n", i, g_profileMap[i]);
+			}
+		}
+	}
+}
+
+#elif defined(_MSC_VER)
+
+namespace { char SilenceLNK4221; };
+
+#endif
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h
new file mode 100644
index 0000000000..1fd3e0aaad
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h
@@ -0,0 +1,18 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// TODO: Get rid of this file.
+
+#define PROFILE   0
+
+#if PROFILE
+	void ProfilerDump(u64 _count);
+	void ProfilerInit();
+	void ProfilerAddDelta(int _addr, int _delta);
+	void ProfilerStart();
+#endif
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp
new file mode 100644
index 0000000000..99a6bab74f
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp
@@ -0,0 +1,78 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/DSP/DSPCodeUtil.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
+#include "Core/HW/DSPLLE/DSPLLETools.h"
+
+bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc)
+{
+	const std::string binFile = StringFromFormat("%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), crc);
+	const std::string txtFile = StringFromFormat("%sDSP_UC_%08X.txt", File::GetUserPath(D_DUMPDSP_IDX).c_str(), crc);
+
+	File::IOFile pFile(binFile, "wb");
+	if (pFile)
+	{
+		pFile.WriteBytes(code_be, size_in_bytes);
+		pFile.Close();
+	}
+	else
+	{
+		PanicAlert("Can't open file (%s) to dump UCode!!", binFile.c_str());
+		return false;
+	}
+
+	// Load the binary back in.
+	std::vector<u16> code;
+	LoadBinary(binFile, code);
+
+	AssemblerSettings settings;
+	settings.show_hex = true;
+	settings.show_pc = true;
+	settings.ext_separator = '\'';
+	settings.decode_names = true;
+	settings.decode_registers = true;
+
+	std::string text;
+	DSPDisassembler disasm(settings);
+
+	if (!disasm.Disassemble(0, code, 0x0000, text))
+		return false;
+
+	return File::WriteStringToFile(text, txtFile);
+}
+
+// TODO make this useful :p
+bool DumpCWCode(u32 _Address, u32 _Length)
+{
+	std::string filename = File::GetUserPath(D_DUMPDSP_IDX) + "DSP_UCode.bin";
+	File::IOFile pFile(filename, "wb");
+
+	if (pFile)
+	{
+		for (size_t i = _Address; i != _Address + _Length; ++i)
+		{
+			u16 val = g_dsp.iram[i];
+			fprintf(pFile.GetHandle(), "    cw 0x%04x \n", val);
+		}
+		return true;
+	}
+
+	return false;
+}
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.h b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h
new file mode 100644
index 0000000000..bdd688476d
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h
@@ -0,0 +1,10 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc);
+bool DumpCWCode(u32 _Address, u32 _Length);
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
similarity index 77%
rename from Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
rename to Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
index a813d3c019..ab5ed8efef 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
@@ -1,30 +1,30 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <stdarg.h>
-
+#include <cctype>
 #include <list>
 #include <map>
 #include <string>
 
-#include "Common.h"
-#include "StringUtil.h"
-#include "FileUtil.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
 
-#include "DSP/DSPCore.h"
-#include "DSPSymbols.h"
-#include "DSP/disassemble.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPDisassembler.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
 
-namespace DSPSymbols {
+namespace DSPSymbols
+{
 
 DSPSymbolDB g_dsp_symbol_db;
 
-std::map<u16, int> addr_to_line;
-std::map<int, u16> line_to_addr;
-std::map<int, const char *> line_to_symbol;
-std::vector<std::string> lines;
-int line_counter = 0;
+static std::map<u16, int> addr_to_line;
+static std::map<int, u16> line_to_addr;
+static std::map<int, const char *> line_to_symbol;
+static std::vector<std::string> lines;
+static int line_counter = 0;
 
 int Addr2Line(u16 address)  // -1 for not found
 {
@@ -66,65 +66,27 @@ Symbol *DSPSymbolDB::GetSymbolFromAddr(u32 addr)
 	}
 	else
 	{
-		for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
+		for (auto& func : functions)
 		{
-			if (addr >= iter->second.address && addr < iter->second.address + iter->second.size)
-				return &iter->second;
+			if (addr >= func.second.address && addr < func.second.address + func.second.size)
+				return &func.second;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
-// lower case only
-bool IsHexDigit(char c)
-{
-	switch (c)
-	{
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-			return true;
-		default:
-			return false;
-	}
-}
-
-bool IsAlpha(char c)
-{
-	return (c >= 'A' && c <= 'Z') ||
-		   (c >= 'a' && c <= 'z');
-}
-
-void DisasssembleRange(u16 start, u16 end)
-{
-	
-}
-
-bool ReadAnnotatedAssembly(const char *filename)
+bool ReadAnnotatedAssembly(const std::string& filename)
 {
 	File::IOFile f(filename, "r");
 	if (!f)
 	{
-		ERROR_LOG(DSPLLE, "Bah! ReadAnnotatedAssembly couldn't find the file %s", filename);
+		ERROR_LOG(DSPLLE, "Bah! ReadAnnotatedAssembly couldn't find the file %s", filename.c_str());
 		return false;
 	}
 	char line[512];
-	
+
 	int last_addr = 0;
-	
+
 	lines.reserve(3000);
 
 	// Symbol generation
@@ -143,7 +105,7 @@ bool ReadAnnotatedAssembly(const char *filename)
 		for (unsigned int i = 0; i < strlen(line); i++)
 		{
 			const char c = line[i];
-			if (IsHexDigit(c))
+			if (isxdigit(c))
 			{
 				if (first_hex == -1)
 				{
@@ -167,7 +129,7 @@ bool ReadAnnotatedAssembly(const char *filename)
 				{
 					first_hex = -1;
 				}
-				if (IsAlpha(c))
+				if (isalpha(c))
 					break;
 			}
 		}
@@ -231,7 +193,7 @@ bool ReadAnnotatedAssembly(const char *filename)
 					return false;
 				}
 			}
-			else 
+			else
 			{
 				// if (line_counter >= 200 && line_counter <= 220)
 				// 	NOTICE_LOG(DSPLLE, "Got Hex Digit %04x from %s, line %i", hex, line, line_counter);
@@ -266,7 +228,7 @@ void AutoDisassembly(u16 start_addr, u16 end_addr)
 		addr_to_line[addr] = line_counter;
 
 		std::string buf;
-		if (!disasm.DisOpcode(ptr, 0, 2, &addr, buf))
+		if (!disasm.DisassembleOpcode(ptr, 0, 2, &addr, buf))
 		{
 			ERROR_LOG(DSPLLE, "disasm failed at %04x", addr);
 			break;
diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h
new file mode 100644
index 0000000000..ab64d8d3a9
--- /dev/null
+++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h
@@ -0,0 +1,37 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/SymbolDB.h"
+
+namespace DSPSymbols
+{
+
+class DSPSymbolDB : public SymbolDB
+{
+public:
+	DSPSymbolDB() {}
+	~DSPSymbolDB() {}
+
+	Symbol *GetSymbolFromAddr(u32 addr) override;
+
+};
+
+extern DSPSymbolDB g_dsp_symbol_db;
+
+bool ReadAnnotatedAssembly(const std::string& filename);
+void AutoDisassembly(u16 start_addr, u16 end_addr);
+
+void Clear();
+
+int Addr2Line(u16 address);
+int Line2Addr(int line);   // -1 for not found
+
+const char *GetLineText(int line);
+
+}  // namespace DSPSymbols
diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp
new file mode 100644
index 0000000000..1b1900708d
--- /dev/null
+++ b/Source/Core/Core/HW/DVDInterface.cpp
@@ -0,0 +1,1452 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <cmath>
+#include <memory>
+#include <string>
+
+#include "AudioCommon/AudioCommon.h"
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/StreamADPCM.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+
+static const double PI = 3.14159265358979323846264338328;
+
+// Rate the drive can transfer data to main memory, given the data
+// is already buffered. Measured in bytes per second.
+static const u32 BUFFER_TRANSFER_RATE = 1024 * 1024 * 16;
+
+// Disc access time measured in milliseconds
+static const u32 DISC_ACCESS_TIME_MS = 50;
+
+// The size of a Wii disc layer in bytes (is this correct?)
+static const u64 WII_DISC_LAYER_SIZE = 4699979776;
+
+// By knowing the disc read speed at two locations defined here,
+// the program can calulate the speed at arbitrary locations.
+// Offsets are in bytes, and speeds are in bytes per second.
+//
+// These speeds are approximations of speeds measured on real Wiis.
+
+static const u32 GC_DISC_LOCATION_1_OFFSET = 0;             // The beginning of a GC disc - 48 mm
+static const u32 GC_DISC_LOCATION_1_READ_SPEED = (u32)(1024 * 1024 * 2.1);
+static const u32 GC_DISC_LOCATION_2_OFFSET = 1459978239;    // The end of a GC disc - 76 mm
+static const u32 GC_DISC_LOCATION_2_READ_SPEED = (u32)(1024 * 1024 * 3.325);
+
+static const u32 WII_DISC_LOCATION_1_OFFSET = 0;                    // The beginning of a Wii disc - 48 mm
+static const u32 WII_DISC_LOCATION_1_READ_SPEED = (u32)(1024 * 1024 * 3.5);
+static const u64 WII_DISC_LOCATION_2_OFFSET = WII_DISC_LAYER_SIZE;  // The end of a Wii disc - 116 mm
+static const u32 WII_DISC_LOCATION_2_READ_SPEED = (u32)(1024 * 1024 * 8.45);
+
+// These values are used for disc read speed calculations. Calculations
+// are done using an arbitrary length unit where the radius of a disc track
+// is the same as the read speed at that track in bytes per second.
+
+static const double GC_DISC_AREA_UP_TO_LOCATION_1 =
+	PI * GC_DISC_LOCATION_1_READ_SPEED * GC_DISC_LOCATION_1_READ_SPEED;
+static const double GC_DISC_AREA_UP_TO_LOCATION_2 =
+	PI * GC_DISC_LOCATION_2_READ_SPEED * GC_DISC_LOCATION_2_READ_SPEED;
+static const double GC_BYTES_PER_AREA_UNIT =
+	(GC_DISC_LOCATION_2_OFFSET - GC_DISC_LOCATION_1_OFFSET) /
+	(GC_DISC_AREA_UP_TO_LOCATION_2 - GC_DISC_AREA_UP_TO_LOCATION_1);
+
+static const double WII_DISC_AREA_UP_TO_LOCATION_1 =
+	PI * WII_DISC_LOCATION_1_READ_SPEED * WII_DISC_LOCATION_1_READ_SPEED;
+static const double WII_DISC_AREA_UP_TO_LOCATION_2 =
+	PI * WII_DISC_LOCATION_2_READ_SPEED * WII_DISC_LOCATION_2_READ_SPEED;
+static const double WII_BYTES_PER_AREA_UNIT =
+	(WII_DISC_LOCATION_2_OFFSET - WII_DISC_LOCATION_1_OFFSET) /
+	(WII_DISC_AREA_UP_TO_LOCATION_2 - WII_DISC_AREA_UP_TO_LOCATION_1);
+
+namespace DVDInterface
+{
+
+// internal hardware addresses
+enum
+{
+	DI_STATUS_REGISTER       = 0x00,
+	DI_COVER_REGISTER        = 0x04,
+	DI_COMMAND_0             = 0x08,
+	DI_COMMAND_1             = 0x0C,
+	DI_COMMAND_2             = 0x10,
+	DI_DMA_ADDRESS_REGISTER  = 0x14,
+	DI_DMA_LENGTH_REGISTER   = 0x18,
+	DI_DMA_CONTROL_REGISTER  = 0x1C,
+	DI_IMMEDIATE_DATA_BUFFER = 0x20,
+	DI_CONFIG_REGISTER       = 0x24
+};
+
+// debug commands which may be ORd
+enum
+{
+	STOP_DRIVE  = 0,
+	START_DRIVE = 0x100,
+	ACCEPT_COPY = 0x4000,
+	DISC_CHECK  = 0x8000,
+};
+
+// DI Status Register
+union UDISR
+{
+	u32 Hex;
+	struct
+	{
+		u32 BREAK      :  1; // Stop the Device + Interrupt
+		u32 DEINITMASK :  1; // Access Device Error Int Mask
+		u32 DEINT      :  1; // Access Device Error Int
+		u32 TCINTMASK  :  1; // Transfer Complete Int Mask
+		u32 TCINT      :  1; // Transfer Complete Int
+		u32 BRKINTMASK :  1;
+		u32 BRKINT     :  1; // w 1: clear brkint
+		u32            : 25;
+	};
+	UDISR() {Hex = 0;}
+	UDISR(u32 _hex) {Hex = _hex;}
+};
+
+// DI Cover Register
+union UDICVR
+{
+	u32 Hex;
+	struct
+	{
+		u32 CVR        :  1; // 0: Cover closed  1: Cover open
+		u32 CVRINTMASK :  1; // 1: Interrupt enabled
+		u32 CVRINT     :  1; // r 1: Interrupt requested w 1: Interrupt clear
+		u32            : 29;
+	};
+	UDICVR() {Hex = 0;}
+	UDICVR(u32 _hex) {Hex = _hex;}
+};
+
+union UDICMDBUF
+{
+	u32 Hex;
+	struct
+	{
+		u8 CMDBYTE3;
+		u8 CMDBYTE2;
+		u8 CMDBYTE1;
+		u8 CMDBYTE0;
+	};
+};
+
+// DI DMA Address Register
+union UDIMAR
+{
+	u32 Hex;
+	struct
+	{
+		u32 Zerobits : 5; // Must be zero (32byte aligned)
+		u32          : 27;
+	};
+	struct
+	{
+		u32 Address : 26;
+		u32         : 6;
+	};
+};
+
+// DI DMA Address Length Register
+union UDILENGTH
+{
+	u32 Hex;
+	struct
+	{
+		u32 Zerobits : 5; // Must be zero (32byte aligned)
+		u32          : 27;
+	};
+	struct
+	{
+		u32 Length : 26;
+		u32        : 6;
+	};
+};
+
+// DI DMA Control Register
+union UDICR
+{
+	u32 Hex;
+	struct
+	{
+		u32 TSTART : 1; // w:1 start   r:0 ready
+		u32 DMA    : 1; // 1: DMA Mode    0: Immediate Mode (can only do Access Register Command)
+		u32 RW     : 1; // 0: Read Command (DVD to Memory)  1: Write Command (Memory to DVD)
+		u32        : 29;
+	};
+};
+
+union UDIIMMBUF
+{
+	u32 Hex;
+	struct
+	{
+		u8 REGVAL3;
+		u8 REGVAL2;
+		u8 REGVAL1;
+		u8 REGVAL0;
+	};
+};
+
+// DI Config Register
+union UDICFG
+{
+	u32 Hex;
+	struct
+	{
+		u32 CONFIG : 8;
+		u32        : 24;
+	};
+	UDICFG() {Hex = 0;}
+	UDICFG(u32 _hex) {Hex = _hex;}
+};
+
+struct DVDReadCommand
+{
+	bool is_valid;
+
+	u64 DVD_offset;
+	u32 output_address;
+	u32 length;
+	bool decrypt;
+
+	DIInterruptType interrupt_type;
+
+	// Used to notify emulated software after executing command.
+	// Pointers don't work with savestates, so CoreTiming events are used instead
+	int callback_event_type;
+};
+
+static std::unique_ptr<DiscIO::IVolume> s_inserted_volume;
+
+// STATE_TO_SAVE
+// hardware registers
+static UDISR     m_DISR;
+static UDICVR    m_DICVR;
+static UDICMDBUF m_DICMDBUF[3];
+static UDIMAR    m_DIMAR;
+static UDILENGTH m_DILENGTH;
+static UDICR     m_DICR;
+static UDIIMMBUF m_DIIMMBUF;
+static UDICFG    m_DICFG;
+
+static DVDReadCommand current_read_command;
+
+static u32 AudioPos;
+static u32 CurrentStart;
+static u32 CurrentLength;
+static u32 NextStart;
+static u32 NextLength;
+
+
+static u32  g_ErrorCode = 0;
+static bool g_bDiscInside = false;
+bool g_bStream = false;
+static bool g_bStopAtTrackEnd = false;
+static int  finish_execute_command = 0;
+static int  finish_execute_read_command = 0;
+static int  dtk = 0;
+
+static u64 g_last_read_offset;
+static u64 g_last_read_time;
+
+// GC-AM only
+static unsigned char media_buffer[0x40];
+
+static int ejectDisc;
+static int insertDisc;
+
+void EjectDiscCallback(u64 userdata, int cyclesLate);
+void InsertDiscCallback(u64 userdata, int cyclesLate);
+
+void SetLidOpen(bool _bOpen);
+
+void UpdateInterrupts();
+void GenerateDIInterrupt(DIInterruptType _DVDInterrupt);
+
+void WriteImmediate(u32 value, u32 output_address, bool write_to_DIIMMBUF);
+DVDReadCommand ExecuteReadCommand(u64 DVD_offset, u32 output_address, u32 DVD_length, u32 output_length,
+                                  bool decrypt, DIInterruptType* interrupt_type, u64* ticks_until_completion);
+
+u64 SimulateDiscReadTime(u64 offset, u32 length);
+s64 CalculateRawDiscReadTime(u64 offset, s64 length);
+
+void DoState(PointerWrap &p)
+{
+	p.DoPOD(m_DISR);
+	p.DoPOD(m_DICVR);
+	p.DoArray(m_DICMDBUF, 3);
+	p.Do(m_DIMAR);
+	p.Do(m_DILENGTH);
+	p.Do(m_DICR);
+	p.Do(m_DIIMMBUF);
+	p.DoPOD(m_DICFG);
+
+	p.Do(current_read_command);
+
+	p.Do(NextStart);
+	p.Do(AudioPos);
+	p.Do(NextLength);
+
+	p.Do(g_ErrorCode);
+	p.Do(g_bDiscInside);
+	p.Do(g_bStream);
+
+	p.Do(CurrentStart);
+	p.Do(CurrentLength);
+
+	p.Do(g_last_read_offset);
+	p.Do(g_last_read_time);
+
+	p.Do(g_bStopAtTrackEnd);
+}
+
+static void FinishExecuteCommand(u64 userdata, int cyclesLate)
+{
+	if (m_DICR.TSTART)
+	{
+		m_DICR.TSTART = 0;
+		m_DILENGTH.Length = 0;
+		GenerateDIInterrupt((DIInterruptType)userdata);
+	}
+}
+
+static void FinishExecuteReadCommand(u64 userdata, int cyclesLate)
+{
+	if (!current_read_command.is_valid)
+	{
+		PanicAlert("DVDInterface: There is no command to execute!");
+	}
+	else
+	{
+		// Here is the actual disc reading
+		if (!DVDRead(current_read_command.DVD_offset, current_read_command.output_address,
+		             current_read_command.length, current_read_command.decrypt))
+		{
+			PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
+		}
+	}
+
+	// The command is marked as invalid because it shouldn't be used again
+	current_read_command.is_valid = false;
+
+	// The final step is to notify the emulated software that the command has been executed
+	CoreTiming::ScheduleEvent_Immediate(current_read_command.callback_event_type,
+	                                    current_read_command.interrupt_type);
+}
+
+static u32 ProcessDTKSamples(short *tempPCM, u32 num_samples)
+{
+	u32 samples_processed = 0;
+	do
+	{
+		if (AudioPos >= CurrentStart + CurrentLength)
+		{
+			DEBUG_LOG(DVDINTERFACE,
+			          "ProcessDTKSamples: NextStart=%08x,NextLength=%08x,CurrentStart=%08x,CurrentLength=%08x,AudioPos=%08x",
+			          NextStart, NextLength, CurrentStart, CurrentLength, AudioPos);
+
+			AudioPos = NextStart;
+			CurrentStart = NextStart;
+			CurrentLength = NextLength;
+
+			if (g_bStopAtTrackEnd)
+			{
+				g_bStopAtTrackEnd = false;
+				g_bStream = false;
+				break;
+			}
+
+			NGCADPCM::InitFilter();
+		}
+
+		u8 tempADPCM[NGCADPCM::ONE_BLOCK_SIZE];
+		// TODO: What if we can't read from AudioPos?
+		s_inserted_volume->Read(AudioPos, sizeof(tempADPCM), tempADPCM, false);
+		AudioPos += sizeof(tempADPCM);
+		NGCADPCM::DecodeBlock(tempPCM + samples_processed * 2, tempADPCM);
+		samples_processed += NGCADPCM::SAMPLES_PER_BLOCK;
+	} while (samples_processed < num_samples);
+	for (unsigned i = 0; i < samples_processed * 2; ++i)
+	{
+		// TODO: Fix the mixer so it can accept non-byte-swapped samples.
+		tempPCM[i] = Common::swap16(tempPCM[i]);
+	}
+	return samples_processed;
+}
+
+static void DTKStreamingCallback(u64 userdata, int cyclesLate)
+{
+	// Send audio to the mixer.
+	static const int NUM_SAMPLES = 48000 / 2000 * 7;  // 3.5ms of 48kHz samples
+	short tempPCM[NUM_SAMPLES * 2];
+	unsigned samples_processed;
+	if (g_bStream && AudioInterface::IsPlaying())
+	{
+		samples_processed = ProcessDTKSamples(tempPCM, NUM_SAMPLES);
+	}
+	else
+	{
+		memset(tempPCM, 0, sizeof(tempPCM));
+		samples_processed = NUM_SAMPLES;
+	}
+	g_sound_stream->GetMixer()->PushStreamingSamples(tempPCM, samples_processed);
+
+	int ticks_to_dtk = int(SystemTimers::GetTicksPerSecond() * u64(samples_processed) / 48000);
+	CoreTiming::ScheduleEvent(ticks_to_dtk - cyclesLate, dtk);
+}
+
+void Init()
+{
+	m_DISR.Hex        = 0;
+	m_DICVR.Hex       = 1; // Disc Channel relies on cover being open when no disc is inserted
+	m_DICMDBUF[0].Hex = 0;
+	m_DICMDBUF[1].Hex = 0;
+	m_DICMDBUF[2].Hex = 0;
+	m_DIMAR.Hex       = 0;
+	m_DILENGTH.Hex    = 0;
+	m_DICR.Hex        = 0;
+	m_DIIMMBUF.Hex    = 0;
+	m_DICFG.Hex       = 0;
+	m_DICFG.CONFIG    = 1; // Disable bootrom descrambler
+
+	current_read_command.is_valid = false;
+
+	AudioPos = 0;
+	NextStart = 0;
+	NextLength = 0;
+	CurrentStart = 0;
+	CurrentLength = 0;
+
+	g_ErrorCode = 0;
+	g_bDiscInside = false;
+	g_bStream = false;
+	g_bStopAtTrackEnd = false;
+
+	g_last_read_offset = 0;
+	g_last_read_time = 0;
+
+	ejectDisc = CoreTiming::RegisterEvent("EjectDisc", EjectDiscCallback);
+	insertDisc = CoreTiming::RegisterEvent("InsertDisc", InsertDiscCallback);
+
+	finish_execute_command = CoreTiming::RegisterEvent("FinishExecuteCommand", FinishExecuteCommand);
+	finish_execute_read_command = CoreTiming::RegisterEvent("FinishExecuteReadCommand", FinishExecuteReadCommand);
+	dtk = CoreTiming::RegisterEvent("StreamingTimer", DTKStreamingCallback);
+
+	CoreTiming::ScheduleEvent(0, dtk);
+}
+
+void Shutdown()
+{
+	s_inserted_volume.reset();
+}
+
+const DiscIO::IVolume& GetVolume()
+{
+	return *s_inserted_volume;
+}
+
+bool SetVolumeName(const std::string& disc_path)
+{
+	s_inserted_volume = std::unique_ptr<DiscIO::IVolume>(DiscIO::CreateVolumeFromFilename(disc_path));
+	return VolumeIsValid();
+}
+
+bool SetVolumeDirectory(const std::string& full_path, bool is_wii, const std::string& apploader_path, const std::string& DOL_path)
+{
+	s_inserted_volume = std::unique_ptr<DiscIO::IVolume>(DiscIO::CreateVolumeFromDirectory(full_path, is_wii, apploader_path, DOL_path));
+	return VolumeIsValid();
+}
+
+bool VolumeIsValid()
+{
+	return s_inserted_volume != nullptr;
+}
+
+void SetDiscInside(bool _DiscInside)
+{
+	if (g_bDiscInside != _DiscInside)
+		SetLidOpen(!_DiscInside);
+
+	g_bDiscInside = _DiscInside;
+}
+
+bool IsDiscInside()
+{
+	return g_bDiscInside;
+}
+
+// Take care of all logic of "swapping discs"
+// We want this in the "backend", NOT the gui
+// any !empty string will be deleted to ensure
+// that the userdata string exists when called
+void EjectDiscCallback(u64 userdata, int cyclesLate)
+{
+	// Empty the drive
+	SetDiscInside(false);
+	s_inserted_volume.reset();
+}
+
+void InsertDiscCallback(u64 userdata, int cyclesLate)
+{
+	std::string& SavedFileName = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename;
+	std::string *_FileName = (std::string *)userdata;
+
+	if (!SetVolumeName(*_FileName))
+	{
+		// Put back the old one
+		SetVolumeName(SavedFileName);
+		PanicAlertT("Invalid file");
+	}
+	SetDiscInside(VolumeIsValid());
+	delete _FileName;
+}
+
+void ChangeDisc(const std::string& newFileName)
+{
+	std::string* _FileName = new std::string(newFileName);
+	CoreTiming::ScheduleEvent_Threadsafe(0, ejectDisc);
+	CoreTiming::ScheduleEvent_Threadsafe(500000000, insertDisc, (u64)_FileName);
+	// TODO: We shouldn't be modifying movie state from the GUI thread.
+	if (Movie::IsRecordingInput())
+	{
+		Movie::g_bDiscChange = true;
+		std::string fileName = newFileName;
+		auto sizeofpath = fileName.find_last_of("/\\") + 1;
+		if (fileName.substr(sizeofpath).length() > 40)
+		{
+			PanicAlertT("The disc change to \"%s\" could not be saved in the .dtm file.\n"
+			            "The filename of the disc image must not be longer than 40 characters.", newFileName.c_str());
+		}
+		Movie::g_discChange = fileName.substr(sizeofpath);
+	}
+}
+
+void SetLidOpen(bool _bOpen)
+{
+	m_DICVR.CVR = _bOpen ? 1 : 0;
+
+	GenerateDIInterrupt(INT_CVRINT);
+}
+
+bool DVDRead(u64 _iDVDOffset, u32 _iRamAddress, u32 _iLength, bool decrypt)
+{
+	return s_inserted_volume->Read(_iDVDOffset, _iLength, Memory::GetPointer(_iRamAddress), decrypt);
+}
+
+bool ChangePartition(u64 offset)
+{
+	return s_inserted_volume->ChangePartition(offset);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	mmio->Register(base | DI_STATUS_REGISTER,
+		MMIO::DirectRead<u32>(&m_DISR.Hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			UDISR tmpStatusReg(val);
+
+			m_DISR.DEINITMASK = tmpStatusReg.DEINITMASK;
+			m_DISR.TCINTMASK  = tmpStatusReg.TCINTMASK;
+			m_DISR.BRKINTMASK = tmpStatusReg.BRKINTMASK;
+			m_DISR.BREAK      = tmpStatusReg.BREAK;
+
+			if (tmpStatusReg.DEINT)
+				m_DISR.DEINT = 0;
+
+			if (tmpStatusReg.TCINT)
+				m_DISR.TCINT = 0;
+
+			if (tmpStatusReg.BRKINT)
+				m_DISR.BRKINT = 0;
+
+			if (m_DISR.BREAK)
+			{
+				_dbg_assert_(DVDINTERFACE, 0);
+			}
+
+			UpdateInterrupts();
+		})
+	);
+
+	mmio->Register(base | DI_COVER_REGISTER,
+		MMIO::DirectRead<u32>(&m_DICVR.Hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			UDICVR tmpCoverReg(val);
+
+			m_DICVR.CVRINTMASK = tmpCoverReg.CVRINTMASK;
+
+			if (tmpCoverReg.CVRINT)
+				m_DICVR.CVRINT = 0;
+
+			UpdateInterrupts();
+		})
+	);
+
+	// Command registers are very similar and we can register them with a
+	// simple loop.
+	for (int i = 0; i < 3; ++i)
+		mmio->Register(base | (DI_COMMAND_0 + 4 * i),
+			MMIO::DirectRead<u32>(&m_DICMDBUF[i].Hex),
+			MMIO::DirectWrite<u32>(&m_DICMDBUF[i].Hex)
+		);
+
+	// DMA related registers. Mostly direct accesses (+ masking for writes to
+	// handle things like address alignment) and complex write on the DMA
+	// control register that will trigger the DMA.
+	mmio->Register(base | DI_DMA_ADDRESS_REGISTER,
+		MMIO::DirectRead<u32>(&m_DIMAR.Hex),
+		MMIO::DirectWrite<u32>(&m_DIMAR.Hex, ~0xFC00001F)
+	);
+	mmio->Register(base | DI_DMA_LENGTH_REGISTER,
+		MMIO::DirectRead<u32>(&m_DILENGTH.Hex),
+		MMIO::DirectWrite<u32>(&m_DILENGTH.Hex, ~0x1F)
+	);
+	mmio->Register(base | DI_DMA_CONTROL_REGISTER,
+		MMIO::DirectRead<u32>(&m_DICR.Hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			m_DICR.Hex = val & 7;
+			if (m_DICR.TSTART)
+			{
+				ExecuteCommand(m_DICMDBUF[0].Hex, m_DICMDBUF[1].Hex, m_DICMDBUF[2].Hex,
+				               m_DIMAR.Hex, m_DILENGTH.Hex, true, finish_execute_command);
+			}
+		})
+	);
+
+	mmio->Register(base | DI_IMMEDIATE_DATA_BUFFER,
+		MMIO::DirectRead<u32>(&m_DIIMMBUF.Hex),
+		MMIO::DirectWrite<u32>(&m_DIIMMBUF.Hex)
+	);
+
+	// DI config register is read only.
+	mmio->Register(base | DI_CONFIG_REGISTER,
+		MMIO::DirectRead<u32>(&m_DICFG.Hex),
+		MMIO::InvalidWrite<u32>()
+	);
+}
+
+void UpdateInterrupts()
+{
+	if ((m_DISR.DEINT   & m_DISR.DEINITMASK) ||
+	    (m_DISR.TCINT   & m_DISR.TCINTMASK)  ||
+	    (m_DISR.BRKINT  & m_DISR.BRKINTMASK) ||
+	    (m_DICVR.CVRINT & m_DICVR.CVRINTMASK))
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, true);
+	}
+	else
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, false);
+	}
+
+	// Required for Summoner: A Goddess Reborn
+	CoreTiming::ForceExceptionCheck(50);
+}
+
+void GenerateDIInterrupt(DIInterruptType _DVDInterrupt)
+{
+	switch (_DVDInterrupt)
+	{
+	case INT_DEINT:  m_DISR.DEINT   = 1; break;
+	case INT_TCINT:  m_DISR.TCINT   = 1; break;
+	case INT_BRKINT: m_DISR.BRKINT  = 1; break;
+	case INT_CVRINT: m_DICVR.CVRINT = 1; break;
+	}
+
+	UpdateInterrupts();
+}
+
+void WriteImmediate(u32 value, u32 output_address, bool write_to_DIIMMBUF)
+{
+	if (write_to_DIIMMBUF)
+		m_DIIMMBUF.Hex = value;
+	else
+		Memory::Write_U32(value, output_address);
+}
+
+// If the returned DVDReadCommand has is_valid set to true,
+// FinishExecuteReadCommand must be used to finish executing it
+DVDReadCommand ExecuteReadCommand(u64 DVD_offset, u32 output_address, u32 DVD_length, u32 output_length,
+                                  bool decrypt, DIInterruptType* interrupt_type, u64* ticks_until_completion)
+{
+	DVDReadCommand command;
+
+	if (!g_bDiscInside)
+	{
+		g_ErrorCode = ERROR_NO_DISK | ERROR_COVER_H;
+		*interrupt_type = INT_DEINT;
+		command.is_valid = false;
+		return command;
+	}
+
+	if (DVD_length > output_length)
+	{
+		WARN_LOG(DVDINTERFACE, "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp.");
+		DVD_length = output_length;
+	}
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed)
+		// An optional hack to speed up loading times
+		*ticks_until_completion = output_length * (SystemTimers::GetTicksPerSecond() / BUFFER_TRANSFER_RATE);
+	else
+		*ticks_until_completion = SimulateDiscReadTime(DVD_offset, DVD_length);
+
+	*interrupt_type = INT_TCINT;
+	command.is_valid = true;
+	command.DVD_offset = DVD_offset;
+	command.output_address = output_address;
+	command.length = DVD_length;
+	command.decrypt = decrypt;
+	return command;
+}
+
+// When the command has finished executing, callback_event_type
+// will be called using CoreTiming::ScheduleEvent,
+// with the userdata set to the interrupt type.
+void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_address, u32 output_length,
+                    bool write_to_DIIMMBUF, int callback_event_type)
+{
+	DIInterruptType interrupt_type = INT_TCINT;
+	u64 ticks_until_completion = SystemTimers::GetTicksPerSecond() / 15000;
+	DVDReadCommand read_command;
+	read_command.is_valid = false;
+
+	bool GCAM = (SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD) &&
+	            (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD);
+
+	// DVDLowRequestError needs access to the error code set by the previous command
+	if (command_0 >> 24 != DVDLowRequestError)
+		g_ErrorCode = 0;
+
+	if (GCAM)
+	{
+		ERROR_LOG(DVDINTERFACE, "DVD: %08x, %08x, %08x, DMA=addr:%08x,len:%08x,ctrl:%08x",
+		          command_0, command_1, command_2, output_address, output_length, m_DICR.Hex);
+		// decrypt command. But we have a zero key, that simplifies things a lot.
+		// If you get crazy dvd command errors, make sure 0x80000000 - 0x8000000c is zero'd
+		command_0 <<= 24;
+	}
+
+	switch (command_0 >> 24)
+	{
+	// Seems to be used by both GC and Wii
+	case DVDLowInquiry:
+		if (GCAM)
+		{
+			// 0x29484100...
+			// was 21 i'm not entirely sure about this, but it works well.
+			WriteImmediate(0x21000000, output_address, write_to_DIIMMBUF);
+		}
+		else
+		{
+			// (shuffle2) Taken from my Wii
+			Memory::Write_U32(0x00000002, output_address);
+			Memory::Write_U32(0x20060526, output_address + 4);
+			// This was in the oubuf even though this cmd is only supposed to reply with 64bits
+			// However, this and other tests strongly suggest that the buffer is static, and it's never - or rarely cleared.
+			Memory::Write_U32(0x41000000, output_address + 8);
+
+			INFO_LOG(DVDINTERFACE, "DVDLowInquiry (Buffer 0x%08x, 0x%x)",
+			         output_address, output_length);
+		}
+		break;
+
+	// Only seems to be used from WII_IPC, not through direct access
+	case DVDLowReadDiskID:
+		INFO_LOG(DVDINTERFACE, "DVDLowReadDiskID");
+		read_command = ExecuteReadCommand(0, output_address, 0x20, output_length,
+		                                  false, &interrupt_type, &ticks_until_completion);
+		break;
+
+	// Only used from WII_IPC. This is the only read command that decrypts data
+	case DVDLowRead:
+		INFO_LOG(DVDINTERFACE, "DVDLowRead: DVDAddr: 0x%09" PRIx64 ", Size: 0x%x", (u64)command_2 << 2, command_1);
+		read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length,
+		                                  true, &interrupt_type, &ticks_until_completion);
+		break;
+
+	// Probably only used by Wii
+	case DVDLowWaitForCoverClose:
+		INFO_LOG(DVDINTERFACE, "DVDLowWaitForCoverClose");
+		interrupt_type = (DIInterruptType)4; // ???
+		break;
+
+	// "Set Extension"...not sure what it does. GC only?
+	case 0x55:
+		INFO_LOG(DVDINTERFACE, "SetExtension");
+		break;
+
+	// Probably only used though WII_IPC
+	case DVDLowGetCoverReg:
+		WriteImmediate(m_DICVR.Hex, output_address, write_to_DIIMMBUF);
+		INFO_LOG(DVDINTERFACE, "DVDLowGetCoverReg 0x%08x", m_DICVR.Hex);
+		break;
+
+	// Probably only used by Wii
+	case DVDLowNotifyReset:
+		ERROR_LOG(DVDINTERFACE, "DVDLowNotifyReset");
+		PanicAlert("DVDLowNotifyReset");
+		break;
+	// Probably only used by Wii
+	case DVDLowReadDvdPhysical:
+		ERROR_LOG(DVDINTERFACE, "DVDLowReadDvdPhysical");
+		PanicAlert("DVDLowReadDvdPhysical");
+		break;
+	// Probably only used by Wii
+	case DVDLowReadDvdCopyright:
+		ERROR_LOG(DVDINTERFACE, "DVDLowReadDvdCopyright");
+		PanicAlert("DVDLowReadDvdCopyright");
+		break;
+	// Probably only used by Wii
+	case DVDLowReadDvdDiscKey:
+		ERROR_LOG(DVDINTERFACE, "DVDLowReadDvdDiscKey");
+		PanicAlert("DVDLowReadDvdDiscKey");
+		break;
+
+	// Probably only used by Wii
+	case DVDLowClearCoverInterrupt:
+		INFO_LOG(DVDINTERFACE, "DVDLowClearCoverInterrupt");
+		m_DICVR.CVRINT = 0;
+		break;
+
+	// Probably only used by Wii
+	case DVDLowGetCoverStatus:
+		WriteImmediate(g_bDiscInside ? 2 : 1, output_address, write_to_DIIMMBUF);
+		INFO_LOG(DVDINTERFACE, "DVDLowGetCoverStatus: Disc %sInserted", g_bDiscInside ? "" : "Not ");
+		break;
+
+	// Probably only used by Wii
+	case DVDLowReset:
+		INFO_LOG(DVDINTERFACE, "DVDLowReset");
+		break;
+
+	// Probably only used by Wii
+	case DVDLowClosePartition:
+		INFO_LOG(DVDINTERFACE, "DVDLowClosePartition");
+		break;
+
+	// Probably only used by Wii
+	case DVDLowUnencryptedRead:
+		INFO_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: DVDAddr: 0x%09" PRIx64 ", Size: 0x%x", (u64)command_2 << 2, command_1);
+
+		// We must make sure it is in a valid area! (#001 check)
+		// Are these checks correct? They seem to mix 32-bit offsets and 8-bit lengths
+		// * 0x00000000 - 0x00014000 (limit of older IOS versions)
+		// * 0x460a0000 - 0x460a0008
+		// * 0x7ed40000 - 0x7ed40008
+		if (((command_2 > 0x00000000 && command_2 < 0x00014000) ||
+			(((command_2 + command_1) > 0x00000000) && (command_2 + command_1) < 0x00014000) ||
+			(command_2 > 0x460a0000 && command_2 < 0x460a0008) ||
+			(((command_2 + command_1) > 0x460a0000) && (command_2 + command_1) < 0x460a0008) ||
+			(command_2 > 0x7ed40000 && command_2 < 0x7ed40008) ||
+			(((command_2 + command_1) > 0x7ed40000) && (command_2 + command_1) < 0x7ed40008)))
+		{
+			read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length,
+			                                  false, &interrupt_type, &ticks_until_completion);
+		}
+		else
+		{
+			WARN_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: trying to read out of bounds @ %09" PRIx64, (u64)command_2 << 2);
+			g_ErrorCode = ERROR_READY | ERROR_BLOCK_OOB;
+			// Should cause software to call DVDLowRequestError
+			interrupt_type = INT_BRKINT;
+		}
+
+		break;
+
+	// Probably only used by Wii
+	case DVDLowEnableDvdVideo:
+		ERROR_LOG(DVDINTERFACE, "DVDLowEnableDvdVideo");
+		break;
+
+	// New Super Mario Bros. Wii sends these commands,
+	// but it seems we don't need to implement anything.
+	// Probably only used by Wii
+	case 0x95:
+	case 0x96:
+		ERROR_LOG(DVDINTERFACE, "Unimplemented BCA command 0x%08x (Buffer 0x%08x, 0x%x)",
+		          command_0, output_address, output_length);
+		break;
+
+	// Probably only used by Wii
+	case DVDLowReportKey:
+		INFO_LOG(DVDINTERFACE, "DVDLowReportKey");
+		// Does not work on retail discs/drives
+		// Retail games send this command to see if they are running on real retail hw
+		g_ErrorCode = ERROR_READY | ERROR_INV_CMD;
+		interrupt_type = INT_BRKINT;
+		break;
+
+	// DMA Read from Disc. Only seems to be used through direct access, not WII_IPC
+	case 0xA8:
+		switch (command_0 & 0xFF)
+		{
+		case 0x00: // Read Sector
+			{
+				u64 iDVDOffset = (u64)command_1 << 2;
+
+				INFO_LOG(DVDINTERFACE, "Read: DVDOffset=%08" PRIx64 ", DMABuffer = %08x, SrcLength = %08x, DMALength = %08x",
+					        iDVDOffset, output_address, command_2, output_length);
+
+				if (GCAM)
+				{
+					if (iDVDOffset & 0x80000000) // read request to hardware buffer
+					{
+						switch (iDVDOffset)
+						{
+						case 0x80000000:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (80000000)");
+							for (u32 i = 0; i < output_length; i += 4)
+								Memory::Write_U32(0, output_address + i);
+							break;
+						case 0x80000040:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (2) (80000040)");
+							for (u32 i = 0; i < output_length; i += 4)
+								Memory::Write_U32(~0, output_address + i);
+							Memory::Write_U32(0x00000020, output_address); // DIMM SIZE, LE
+							Memory::Write_U32(0x4743414D, output_address + 4); // GCAM signature
+							break;
+						case 0x80000120:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000120)");
+							for (u32 i = 0; i < output_length; i += 4)
+								Memory::Write_U32(0x01010101, output_address + i);
+							break;
+						case 0x80000140:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000140)");
+							for (u32 i = 0; i < output_length; i += 4)
+								Memory::Write_U32(0x01010101, output_address + i);
+							break;
+						case 0x84000020:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (1) (84000020)");
+							for (u32 i = 0; i < output_length; i += 4)
+								Memory::Write_U32(0x00000000, output_address + i);
+							break;
+						default:
+							ERROR_LOG(DVDINTERFACE, "GC-AM: UNKNOWN MEDIA BOARD LOCATION %" PRIx64, iDVDOffset);
+							break;
+						}
+						break;
+					}
+					else if ((iDVDOffset == 0x1f900000) || (iDVDOffset == 0x1f900020))
+					{
+						ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD COMM AREA (1f900020)");
+						u8* source = media_buffer + iDVDOffset - 0x1f900000;
+						Memory::CopyToEmu(output_address, source, output_length);
+						for (u32 i = 0; i < output_length; i += 4)
+							ERROR_LOG(DVDINTERFACE, "GC-AM: %08x", Memory::Read_U32(output_address + i));
+						break;
+					}
+				}
+
+				read_command = ExecuteReadCommand(iDVDOffset, output_address, command_2, output_length,
+				                                  false, &interrupt_type, &ticks_until_completion);
+			}
+			break;
+
+		case 0x40: // Read DiscID
+			INFO_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(output_address));
+			read_command = ExecuteReadCommand(0, output_address, 0x20, output_length,
+			                                  false, &interrupt_type, &ticks_until_completion);
+			break;
+
+		default:
+			ERROR_LOG(DVDINTERFACE, "Unknown read subcommand: %08x", command_0);
+			break;
+		}
+		break;
+
+	// GC-AM only
+	case 0xAA:
+		if (GCAM)
+		{
+			ERROR_LOG(DVDINTERFACE, "GC-AM: 0xAA, DMABuffer=%08x, DMALength=%08x", output_address, output_length);
+			u64 iDVDOffset = (u64)command_1 << 2;
+			u32 len = output_length;
+			s64 offset = iDVDOffset - 0x1F900000;
+			/*
+			if (iDVDOffset == 0x84800000)
+			{
+				ERROR_LOG(DVDINTERFACE, "Firmware upload");
+			}
+			else*/
+			if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)
+			{
+				u32 addr = output_address;
+				if (iDVDOffset == 0x84800000)
+				{
+					ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD");
+				}
+				else
+				{
+					ERROR_LOG(DVDINTERFACE, "ILLEGAL MEDIA WRITE");
+				}
+
+				while (len >= 4)
+				{
+					ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08" PRIx64 ": %08x", iDVDOffset, Memory::Read_U32(addr));
+					addr += 4;
+					len -= 4;
+					iDVDOffset += 4;
+				}
+			}
+			else
+			{
+				u32 addr = m_DIMAR.Address;
+				Memory::CopyFromEmu(media_buffer + offset, addr, len);
+				while (len >= 4)
+				{
+					ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08" PRIx64 ": %08x", iDVDOffset, Memory::Read_U32(addr));
+					addr += 4;
+					len -= 4;
+					iDVDOffset += 4;
+				}
+			}
+		}
+		break;
+
+	// Seems to be used by both GC and Wii
+	case DVDLowSeek:
+		if (!GCAM)
+		{
+			// Currently unimplemented
+			INFO_LOG(DVDINTERFACE, "Seek: offset=%09" PRIx64 " (ignoring)", (u64)command_1 << 2);
+		}
+		else
+		{
+			memset(media_buffer, 0, 0x20);
+			media_buffer[0] = media_buffer[0x20]; // ID
+			media_buffer[2] = media_buffer[0x22];
+			media_buffer[3] = media_buffer[0x23] | 0x80;
+			int cmd = (media_buffer[0x23]<<8)|media_buffer[0x22];
+			ERROR_LOG(DVDINTERFACE, "GC-AM: execute buffer, cmd=%04x", cmd);
+			switch (cmd)
+			{
+			case 0x00:
+				media_buffer[4] = 1;
+				break;
+			case 0x1:
+				media_buffer[7] = 0x20; // DIMM Size
+				break;
+			case 0x100:
+				{
+					// urgh
+					static int percentage = 0;
+					static int status = 0;
+					percentage++;
+					if (percentage > 100)
+					{
+						status++;
+						percentage = 0;
+					}
+					media_buffer[4] = status;
+					/* status:
+					0 - "Initializing media board. Please wait.."
+					1 - "Checking network. Please wait..."
+					2 - "Found a system disc. Insert a game disc"
+					3 - "Testing a game program. %d%%"
+					4 - "Loading a game program. %d%%"
+					5  - go
+					6  - error xx
+					*/
+					media_buffer[8] = percentage;
+					media_buffer[4] = 0x05;
+					media_buffer[8] = 0x64;
+					break;
+				}
+			case 0x101:
+				media_buffer[4] = 3; // version
+				media_buffer[5] = 3;
+				media_buffer[6] = 1; // xxx
+				media_buffer[8] = 1;
+				media_buffer[16] = 0xFF;
+				media_buffer[17] = 0xFF;
+				media_buffer[18] = 0xFF;
+				media_buffer[19] = 0xFF;
+				break;
+			case 0x102:  // get error code
+				media_buffer[4] = 1; // 0: download incomplete (31), 1: corrupted, other error 1
+				media_buffer[5] = 0;
+				break;
+			case 0x103:
+				memcpy(media_buffer + 4, "A89E27A50364511", 15);  // serial
+				break;
+#if 0
+			case 0x301: // unknown
+				memcpy(media_buffer + 4, media_buffer + 0x24, 0x1c);
+				break;
+			case 0x302:
+				break;
+#endif
+			default:
+				ERROR_LOG(DVDINTERFACE, "GC-AM: execute buffer (unknown)");
+				break;
+			}
+			memset(media_buffer + 0x20, 0, 0x20);
+			WriteImmediate(0x66556677, output_address, write_to_DIIMMBUF); // just a random value that works.
+		}
+		break;
+
+	// Probably only used by Wii
+	case DVDLowReadDvd:
+		ERROR_LOG(DVDINTERFACE, "DVDLowReadDvd");
+		break;
+	// Probably only used by Wii
+	case DVDLowReadDvdConfig:
+		ERROR_LOG(DVDINTERFACE, "DVDLowReadDvdConfig");
+		break;
+	// Probably only used by Wii
+	case DVDLowStopLaser:
+		ERROR_LOG(DVDINTERFACE, "DVDLowStopLaser");
+		break;
+	// Probably only used by Wii
+	case DVDLowOffset:
+		ERROR_LOG(DVDINTERFACE, "DVDLowOffset");
+		break;
+	// Probably only used by Wii
+	case DVDLowReadDiskBca:
+		WARN_LOG(DVDINTERFACE, "DVDLowReadDiskBca");
+		Memory::Write_U32(1, output_address + 0x30);
+		break;
+	// Probably only used by Wii
+	case DVDLowRequestDiscStatus:
+		ERROR_LOG(DVDINTERFACE, "DVDLowRequestDiscStatus");
+		break;
+	// Probably only used by Wii
+	case DVDLowRequestRetryNumber:
+		ERROR_LOG(DVDINTERFACE, "DVDLowRequestRetryNumber");
+		break;
+	// Probably only used by Wii
+	case DVDLowSetMaximumRotation:
+		ERROR_LOG(DVDINTERFACE, "DVDLowSetMaximumRotation");
+		break;
+	// Probably only used by Wii
+	case DVDLowSerMeasControl:
+		ERROR_LOG(DVDINTERFACE, "DVDLowSerMeasControl");
+		break;
+
+	// Used by both GC and Wii
+	case DVDLowRequestError:
+		INFO_LOG(DVDINTERFACE, "Requesting error... (0x%08x)", g_ErrorCode);
+		WriteImmediate(g_ErrorCode, output_address, write_to_DIIMMBUF);
+		g_ErrorCode = 0;
+		break;
+
+	// Audio Stream (Immediate). Only seems to be used by some GC games
+	// (command_0 >> 16) & 0xFF = Subcommand
+	// command_1 << 2           = Offset on disc
+	// command_2                = Length of the stream
+	case 0xE1:
+		{
+			u8 cancel_stream = (command_0 >> 16) & 0xFF;
+			if (cancel_stream)
+			{
+				g_bStopAtTrackEnd = false;
+				g_bStream = false;
+				AudioPos = 0;
+				NextStart = 0;
+				NextLength = 0;
+				CurrentStart = 0;
+				CurrentLength = 0;
+			}
+			else
+			{
+				if ((command_1 == 0) && (command_2 == 0))
+				{
+					g_bStopAtTrackEnd = true;
+				}
+				else if (!g_bStopAtTrackEnd)
+				{
+					// Setting NextStart (a u32) like this discards two bits,
+					// but GC games can't be 4 GiB big, so it shouldn't matter
+					NextStart = command_1 << 2;
+					NextLength = command_2;
+					if (!g_bStream)
+					{
+						CurrentStart = NextStart;
+						CurrentLength = NextLength;
+						AudioPos = CurrentStart;
+						NGCADPCM::InitFilter();
+						g_bStream = true;
+					}
+				}
+			}
+
+			INFO_LOG(DVDINTERFACE, "(Audio) Stream cmd: %08x offset: %08" PRIx64 " length: %08x",
+			         command_0, (u64)command_1 << 2, command_2);
+		}
+		break;
+
+	// Request Audio Status (Immediate). Only seems to be used by some GC games
+	case 0xE2:
+		{
+			switch (command_0 >> 16 & 0xFF)
+			{
+			case 0x00: // Returns streaming status
+				INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status AudioPos:%08x/%08x CurrentStart:%08x CurrentLength:%08x", AudioPos, CurrentStart + CurrentLength, CurrentStart, CurrentLength);
+				WriteImmediate((g_bStream) ? 1 : 0, output_address, write_to_DIIMMBUF);
+				break;
+			case 0x01: // Returns the current offset
+				INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status AudioPos:%08x", AudioPos);
+				WriteImmediate(AudioPos >> 2, output_address, write_to_DIIMMBUF);
+				break;
+			case 0x02: // Returns the start offset
+				INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentStart:%08x", CurrentStart);
+				WriteImmediate(CurrentStart >> 2, output_address, write_to_DIIMMBUF);
+				break;
+			case 0x03: // Returns the total length
+				INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentLength:%08x", CurrentLength);
+				WriteImmediate(CurrentLength >> 2, output_address, write_to_DIIMMBUF);
+				break;
+			default:
+				WARN_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x  Request Audio status %s", command_0 >> 16 & 0xFF, g_bStream ? "on" : "off");
+				break;
+			}
+		}
+		break;
+
+	case DVDLowStopMotor:
+		INFO_LOG(DVDINTERFACE, "DVDLowStopMotor %s %s",
+		         command_1 ? "eject" : "", command_2 ? "kill!" : "");
+
+		if (command_1 && !command_2)
+			EjectDiscCallback(0, 0);
+		break;
+
+	// DVD Audio Enable/Disable (Immediate). GC uses this, and apparently Wii also does...?
+	case DVDLowAudioBufferConfig:
+		// For more information: http://www.crazynation.org/GC/GC_DD_TECH/GCTech.htm (dead link?)
+		//
+		// Upon Power up or reset , 2 commands must be issued for proper use of audio streaming:
+		// DVDReadDiskID A8000040,00000000,00000020
+		// DVDLowAudioBufferConfig E4xx00yy,00000000,00000020
+		//
+		// xx=byte 8 [0 or 1] from the disk header retrieved from DVDReadDiskID
+		// yy=0 (if xx=0) or 0xA (if xx=1)
+
+		if ((command_0 >> 16) & 0xFF)
+		{
+			// TODO: What is this actually supposed to do?
+			g_bStream = true;
+			WARN_LOG(DVDINTERFACE, "(Audio): Audio enabled");
+		}
+		else
+		{
+			// TODO: What is this actually supposed to do?
+			g_bStream = false;
+			WARN_LOG(DVDINTERFACE, "(Audio): Audio disabled");
+		}
+		break;
+
+	// yet another (GC?) command we prolly don't care about
+	case 0xEE:
+		INFO_LOG(DVDINTERFACE, "SetStatus");
+		break;
+
+	// Debug commands; see yagcd. We don't really care
+	// NOTE: commands to stream data will send...a raw data stream
+	// This will appear as unknown commands, unless the check is re-instated to catch such data.
+	// Can probably only be used through direct access
+	case 0xFE:
+		ERROR_LOG(DVDINTERFACE, "Unsupported DVD Drive debug command 0x%08x", command_0);
+		break;
+
+	// Unlock Commands. 1: "MATSHITA" 2: "DVD-GAME"
+	// Just for fun
+	// Can probably only be used through direct access
+	case 0xFF:
+		{
+			if (command_0 == 0xFF014D41 &&
+			    command_1 == 0x54534849 &&
+			    command_2 == 0x54410200)
+			{
+				INFO_LOG(DVDINTERFACE, "Unlock test 1 passed");
+			}
+			else if (command_0 == 0xFF004456 &&
+			         command_1 == 0x442D4741 &&
+			         command_2 == 0x4D450300)
+			{
+				INFO_LOG(DVDINTERFACE, "Unlock test 2 passed");
+			}
+			else
+			{
+				INFO_LOG(DVDINTERFACE, "Unlock test failed");
+			}
+		}
+		break;
+
+	default:
+		ERROR_LOG(DVDINTERFACE, "Unknown command 0x%08x (Buffer 0x%08x, 0x%x)",
+		          command_0, output_address, output_length);
+		PanicAlertT("Unknown DVD command %08x - fatal error", command_0);
+		break;
+	}
+
+	// The command will finish executing after a delay,
+	// to simulate the speed of a real disc drive
+	if (read_command.is_valid)
+	{
+		// We schedule a FinishExecuteReadCommand (which will call the actual callback
+		// once it's done) so that the data transfer isn't completed too early.
+		// Most games don't care about it, but if it's done wrong, Resident Evil 3
+		// plays some extra noise when playing the menu selection sound effect.
+		read_command.callback_event_type = callback_event_type;
+		read_command.interrupt_type = interrupt_type;
+		current_read_command = read_command;
+		CoreTiming::ScheduleEvent((int)ticks_until_completion, finish_execute_read_command);
+	}
+	else
+	{
+		CoreTiming::ScheduleEvent((int)ticks_until_completion, callback_event_type, interrupt_type);
+	}
+}
+
+// Simulates the timing aspects of reading data from a disc.
+// Returns the amount of ticks needed to finish executing the command,
+// and sets some state that is used the next time this function runs.
+u64 SimulateDiscReadTime(u64 offset, u32 length)
+{
+	// The drive buffers 1 MiB (?) of data after every read request;
+	// if a read request is covered by this buffer (or if it's
+	// faster to wait for the data to be buffered), the drive
+	// doesn't seek; it returns buffered data.  Data can be
+	// transferred from the buffer at up to 16 MiB/s.
+	//
+	// If the drive has to seek, the time this takes varies a lot.
+	// A short seek is around 50 ms; a long seek is around 150 ms.
+	// However, the time isn't purely dependent on the distance; the
+	// pattern of previous seeks seems to matter in a way I'm
+	// not sure how to explain.
+	//
+	// Metroid Prime is a good example of a game that's sensitive to
+	// all of these details; if there isn't enough latency in the
+	// right places, doors open too quickly, and if there's too
+	// much latency in the wrong places, the video before the
+	// save-file select screen lags.
+	//
+	// For now, just use a very rough approximation: 50 ms seek
+	// for reads outside 1 MiB, accelerated reads within 1 MiB.
+	// We can refine this if someone comes up with a more complete
+	// model for seek times.
+
+	u64 current_time = CoreTiming::GetTicks();
+	u64 ticks_until_completion;
+
+	// Number of ticks it takes to seek and read directly from the disk.
+	u64 disk_read_duration = CalculateRawDiscReadTime(offset, length) +
+		SystemTimers::GetTicksPerSecond() / 1000 * DISC_ACCESS_TIME_MS;
+
+	if (offset + length - g_last_read_offset > 1024 * 1024)
+	{
+		// No buffer; just use the simple seek time + read time.
+		DEBUG_LOG(DVDINTERFACE, "Seeking %" PRId64 " bytes",
+		          s64(g_last_read_offset) - s64(offset));
+		ticks_until_completion = disk_read_duration;
+		g_last_read_time = current_time + ticks_until_completion;
+	}
+	else
+	{
+		// Possibly buffered; use the buffer if it saves time.
+		// It's not proven that the buffer actually behaves like this, but
+		// it appears to be a decent approximation.
+
+		// Time at which the buffer will contain the data we need.
+		u64 buffer_fill_time = g_last_read_time +
+		                       CalculateRawDiscReadTime(g_last_read_offset,
+		                       offset + length - g_last_read_offset);
+		// Number of ticks it takes to transfer the data from the buffer to memory.
+		u64 buffer_read_duration = length *
+			(SystemTimers::GetTicksPerSecond() / BUFFER_TRANSFER_RATE);
+
+		if (current_time > buffer_fill_time)
+		{
+			DEBUG_LOG(DVDINTERFACE, "Fast buffer read at %" PRIx64, offset);
+			ticks_until_completion = buffer_read_duration;
+			g_last_read_time = buffer_fill_time;
+		}
+		else if (current_time + disk_read_duration > buffer_fill_time)
+		{
+			DEBUG_LOG(DVDINTERFACE, "Slow buffer read at %" PRIx64, offset);
+			ticks_until_completion = std::max(buffer_fill_time - current_time,
+			                                  buffer_read_duration);
+			g_last_read_time = buffer_fill_time;
+		}
+		else
+		{
+			DEBUG_LOG(DVDINTERFACE, "Short seek %" PRId64 " bytes",
+			          s64(g_last_read_offset) - s64(offset));
+			ticks_until_completion = disk_read_duration;
+			g_last_read_time = current_time + ticks_until_completion;
+		}
+	}
+
+	g_last_read_offset = (offset + length - 2048) & ~2047;
+
+	return ticks_until_completion;
+}
+
+// Returns the number of ticks it takes to read an amount of
+// data from a disc, ignoring factors such as seek times.
+// The result will be negative if the length is negative.
+s64 CalculateRawDiscReadTime(u64 offset, s64 length)
+{
+	// The speed will be calculated using the average offset. This is a bit
+	// inaccurate since the speed doesn't increase linearly with the offset,
+	// but since reads only span a small part of the disc, it's insignificant.
+	u64 average_offset = offset + (length / 2);
+
+	// Here, addresses on the second layer of Wii discs are replaced with equivalent
+	// addresses on the first layer so that the speed calculation works correctly.
+	// This is wrong for reads spanning two layers, but those should be rare.
+	average_offset %= WII_DISC_LAYER_SIZE;
+
+	// The area on the disc between position 1 and the arbitrary position X is:
+	// LOCATION_X_SPEED * LOCATION_X_SPEED * pi - AREA_UP_TO_LOCATION_1
+	//
+	// The number of bytes between position 1 and position X is:
+	// LOCATION_X_OFFSET - LOCATION_1_OFFSET
+	//
+	// This means that the following equation is true:
+	// (LOCATION_X_SPEED * LOCATION_X_SPEED * pi - AREA_UP_TO_LOCATION_1) *
+	// BYTES_PER_AREA_UNIT = LOCATION_X_OFFSET - LOCATION_1_OFFSET
+	//
+	// Solving this equation for LOCATION_X_SPEED results in this:
+	// LOCATION_X_SPEED = sqrt(((LOCATION_X_OFFSET - LOCATION_1_OFFSET) /
+	// BYTES_PER_AREA_UNIT + AREA_UP_TO_LOCATION_1) / pi)
+	//
+	// Note that the speed at a track (in bytes per second) is the same as
+	// the radius of that track because of the length unit used.
+	double speed;
+	if (s_inserted_volume->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+	{
+		speed = std::sqrt(((average_offset - WII_DISC_LOCATION_1_OFFSET) /
+			WII_BYTES_PER_AREA_UNIT + WII_DISC_AREA_UP_TO_LOCATION_1) / PI);
+	}
+	else
+	{
+		speed = std::sqrt(((average_offset - GC_DISC_LOCATION_1_OFFSET) /
+			GC_BYTES_PER_AREA_UNIT + GC_DISC_AREA_UP_TO_LOCATION_1) / PI);
+	}
+	DEBUG_LOG(DVDINTERFACE, "Disc speed: %f MiB/s", speed / 1024 / 1024);
+
+	return (s64)(SystemTimers::GetTicksPerSecond() / speed * length);
+}
+
+}  // namespace
diff --git a/Source/Core/Core/HW/DVDInterface.h b/Source/Core/Core/HW/DVDInterface.h
new file mode 100644
index 0000000000..583f3074f5
--- /dev/null
+++ b/Source/Core/Core/HW/DVDInterface.h
@@ -0,0 +1,114 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+namespace DiscIO { class IVolume; }
+namespace MMIO { class Mapping; }
+
+namespace DVDInterface
+{
+
+// Not sure about endianness here. I'll just name them like this...
+enum DIErrorLow
+{
+	ERROR_READY        = 0x00000000, // Ready.
+	ERROR_COVER_L      = 0x01000000, // Cover is opened.
+	ERROR_CHANGE_DISK  = 0x02000000, // Disk change.
+	ERROR_NO_DISK      = 0x03000000, // No disk.
+	ERROR_MOTOR_STOP_L = 0x04000000, // Motor stop.
+	ERROR_NO_DISKID_L  = 0x05000000  // Disk ID not read.
+};
+enum DIErrorHigh
+{
+	ERROR_NONE         = 0x000000, // No error.
+	ERROR_MOTOR_STOP_H = 0x020400, // Motor stopped.
+	ERROR_NO_DISKID_H  = 0x020401, // Disk ID not read.
+	ERROR_COVER_H      = 0x023a00, // Medium not present / Cover opened.
+	ERROR_SEEK_NDONE   = 0x030200, // No seek complete.
+	ERROR_READ         = 0x031100, // Unrecovered read error.
+	ERROR_PROTOCOL     = 0x040800, // Transfer protocol error.
+	ERROR_INV_CMD      = 0x052000, // Invalid command operation code.
+	ERROR_AUDIO_BUF    = 0x052001, // Audio Buffer not set.
+	ERROR_BLOCK_OOB    = 0x052100, // Logical block address out of bounds.
+	ERROR_INV_FIELD    = 0x052400, // Invalid field in command packet.
+	ERROR_INV_AUDIO    = 0x052401, // Invalid audio command.
+	ERROR_INV_PERIOD   = 0x052402, // Configuration out of permitted period.
+	ERROR_END_USR_AREA = 0x056300, // End of user area encountered on this track.
+	ERROR_MEDIUM       = 0x062800, // Medium may have changed.
+	ERROR_MEDIUM_REQ   = 0x0b5a01  // Operator medium removal request.
+};
+
+enum DICommand
+{
+	DVDLowInquiry = 0x12,
+	DVDLowReadDiskID = 0x70,
+	DVDLowRead = 0x71,
+	DVDLowWaitForCoverClose = 0x79,
+	DVDLowGetCoverReg = 0x7a, // DVDLowPrepareCoverRegister?
+	DVDLowNotifyReset = 0x7e,
+	DVDLowReadDvdPhysical = 0x80,
+	DVDLowReadDvdCopyright = 0x81,
+	DVDLowReadDvdDiscKey = 0x82,
+	DVDLowClearCoverInterrupt = 0x86,
+	DVDLowGetCoverStatus = 0x88,
+	DVDLowReset = 0x8a,
+	DVDLowOpenPartition = 0x8b,
+	DVDLowClosePartition = 0x8c,
+	DVDLowUnencryptedRead = 0x8d,
+	DVDLowEnableDvdVideo = 0x8e,
+	DVDLowReportKey = 0xa4,
+	DVDLowSeek = 0xab,
+	DVDLowReadDvd = 0xd0,
+	DVDLowReadDvdConfig = 0xd1,
+	DVDLowStopLaser = 0xd2,
+	DVDLowOffset = 0xd9,
+	DVDLowReadDiskBca = 0xda,
+	DVDLowRequestDiscStatus = 0xdb,
+	DVDLowRequestRetryNumber = 0xdc,
+	DVDLowSetMaximumRotation = 0xdd,
+	DVDLowSerMeasControl = 0xdf,
+	DVDLowRequestError = 0xe0,
+	DVDLowStopMotor = 0xe3,
+	DVDLowAudioBufferConfig = 0xe4
+};
+
+enum DIInterruptType : int
+{
+	INT_DEINT = 0,
+	INT_TCINT = 1,
+	INT_BRKINT = 2,
+	INT_CVRINT = 3,
+};
+
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+// Direct disc access
+const DiscIO::IVolume& GetVolume();
+bool SetVolumeName(const std::string& disc_path);
+bool SetVolumeDirectory(const std::string& disc_path, bool is_wii, const std::string& apploader_path = "", const std::string& DOL_path = "");
+bool VolumeIsValid();
+
+// Disc detection and swapping
+void SetDiscInside(bool _DiscInside);
+bool IsDiscInside();
+void ChangeDisc(const std::string& fileName);
+
+// DVD Access Functions
+bool DVDRead(u64 _iDVDOffset, u32 _iRamAddress, u32 _iLength, bool decrypt);
+extern bool g_bStream;
+bool ChangePartition(u64 offset);
+void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_address, u32 output_length,
+                    bool write_to_DIIMMBUF, int callback_event_type);
+
+} // end of namespace DVDInterface
diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp
new file mode 100644
index 0000000000..64854b3fc0
--- /dev/null
+++ b/Source/Core/Core/HW/EXI.cpp
@@ -0,0 +1,153 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Channel.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/Sram.h"
+#include "Core/PowerPC/PowerPC.h"
+
+SRAM g_SRAM;
+
+namespace ExpansionInterface
+{
+
+static int changeDevice;
+static int updateInterrupts;
+
+static CEXIChannel *g_Channels[MAX_EXI_CHANNELS];
+
+static void ChangeDeviceCallback(u64 userdata, int cyclesLate);
+static void UpdateInterruptsCallback(u64 userdata, int cycles_late);
+
+void Init()
+{
+	InitSRAM();
+	for (u32 i = 0; i < MAX_EXI_CHANNELS; i++)
+		g_Channels[i] = new CEXIChannel(i);
+
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
+	{
+		g_Channels[0]->AddDevice(Movie::IsUsingMemcard(0) ? EXIDEVICE_MEMORYCARD : EXIDEVICE_NONE, 0); // SlotA
+		g_Channels[1]->AddDevice(Movie::IsUsingMemcard(1) ? EXIDEVICE_MEMORYCARD : EXIDEVICE_NONE, 0); // SlotB
+	}
+	else
+	{
+		g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA
+		g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1], 0); // SlotB
+	}
+	g_Channels[0]->AddDevice(EXIDEVICE_MASKROM,                         1);
+	g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2],     2); // Serial Port 1
+	g_Channels[2]->AddDevice(EXIDEVICE_AD16,                            0);
+
+	changeDevice = CoreTiming::RegisterEvent("ChangeEXIDevice", ChangeDeviceCallback);
+	updateInterrupts = CoreTiming::RegisterEvent("EXIUpdateInterrupts", UpdateInterruptsCallback);
+}
+
+void Shutdown()
+{
+	for (auto& channel : g_Channels)
+	{
+		delete channel;
+		channel = nullptr;
+	}
+}
+
+void DoState(PointerWrap &p)
+{
+	for (auto& channel : g_Channels)
+		channel->DoState(p);
+}
+
+void PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	for (auto& channel : g_Channels)
+		channel->PauseAndLock(doLock, unpauseOnUnlock);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	for (int i = 0; i < MAX_EXI_CHANNELS; ++i)
+	{
+		_dbg_assert_(EXPANSIONINTERFACE, g_Channels[i] != nullptr);
+		// Each channel has 5 32 bit registers assigned to it. We offset the
+		// base that we give to each channel for registration.
+		//
+		// Be careful: this means the base is no longer aligned on a page
+		// boundary and using "base | FOO" is not valid!
+		g_Channels[i]->RegisterMMIO(mmio, base + 5 * 4 * i);
+	}
+}
+
+static void ChangeDeviceCallback(u64 userdata, int cyclesLate)
+{
+	u8 channel = (u8)(userdata >> 32);
+	u8 type = (u8)(userdata >> 16);
+	u8 num = (u8)userdata;
+
+	g_Channels[channel]->AddDevice((TEXIDevices)type, num);
+}
+
+void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num)
+{
+	// Called from GUI, so we need to make it thread safe.
+	// Let the hardware see no device for .5b cycles
+	CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | ((u64)EXIDEVICE_NONE << 16) | device_num);
+	CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | ((u64)device_type << 16) | device_num);
+}
+
+CEXIChannel* GetChannel(u32 index)
+{
+	return g_Channels[index];
+}
+
+IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex)
+{
+	for (auto& channel : g_Channels)
+	{
+		IEXIDevice* device = channel->FindDevice(device_type, customIndex);
+		if (device)
+			return device;
+	}
+	return nullptr;
+}
+
+void UpdateInterrupts()
+{
+	// Interrupts are mapped a bit strangely:
+	// Channel 0 Device 0 generates interrupt on channel 0
+	// Channel 0 Device 2 generates interrupt on channel 2
+	// Channel 1 Device 0 generates interrupt on channel 1
+	g_Channels[2]->SetEXIINT(g_Channels[0]->GetDevice(4)->IsInterruptSet());
+
+	bool causeInt = false;
+	for (auto& channel : g_Channels)
+		causeInt |= channel->IsCausingInterrupt();
+
+	ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_EXI, causeInt);
+}
+
+static void UpdateInterruptsCallback(u64 userdata, int cycles_late)
+{
+	UpdateInterrupts();
+}
+
+void ScheduleUpdateInterrupts_Threadsafe(int cycles_late)
+{
+	CoreTiming::ScheduleEvent_Threadsafe(cycles_late, updateInterrupts, 0);
+}
+
+void ScheduleUpdateInterrupts(int cycles_late)
+{
+	CoreTiming::ScheduleEvent(cycles_late, updateInterrupts, 0);
+}
+
+} // end of namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI.h
new file mode 100644
index 0000000000..9787930105
--- /dev/null
+++ b/Source/Core/Core/HW/EXI.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class CEXIChannel;
+class IEXIDevice;
+class PointerWrap;
+enum TEXIDevices : int;
+namespace MMIO { class Mapping; }
+
+enum
+{
+	MAX_EXI_CHANNELS = 3
+};
+
+namespace ExpansionInterface
+{
+
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+void PauseAndLock(bool doLock, bool unpauseOnUnlock);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+void UpdateInterrupts();
+void ScheduleUpdateInterrupts_Threadsafe(int cycles_late);
+void ScheduleUpdateInterrupts(int cycles_late);
+
+void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num);
+
+CEXIChannel* GetChannel(u32 index);
+
+IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
+
+} // end of namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI_Channel.cpp b/Source/Core/Core/HW/EXI_Channel.cpp
new file mode 100644
index 0000000000..1af7476566
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_Channel.cpp
@@ -0,0 +1,271 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Channel.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+enum
+{
+	EXI_READ,
+	EXI_WRITE,
+	EXI_READWRITE
+};
+
+CEXIChannel::CEXIChannel(u32 ChannelId) :
+	m_DMAMemoryAddress(0),
+	m_DMALength(0),
+	m_ImmData(0),
+	m_ChannelId(ChannelId)
+{
+	m_Control.Hex = 0;
+	m_Status.Hex = 0;
+
+	if (m_ChannelId == 0 || m_ChannelId == 1)
+		m_Status.EXTINT = 1;
+	if (m_ChannelId == 1)
+		m_Status.CHIP_SELECT = 1;
+
+	for (auto& device : m_pDevices)
+		device.reset(EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId));
+}
+
+CEXIChannel::~CEXIChannel()
+{
+	RemoveDevices();
+}
+
+void CEXIChannel::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	// Warning: the base is not aligned on a page boundary here. We can't use |
+	// to select a register address, instead we need to use +.
+
+	mmio->Register(base + EXI_STATUS,
+		MMIO::ComplexRead<u32>([this](u32) {
+			// check if external device is present
+			// pretty sure it is memcard only, not entirely sure
+			if (m_ChannelId == 2)
+			{
+				m_Status.EXT = 0;
+			}
+			else
+			{
+				m_Status.EXT = GetDevice(1)->IsPresent() ? 1 : 0;
+			}
+
+			return m_Status.Hex;
+		}),
+		MMIO::ComplexWrite<u32>([this](u32, u32 val) {
+			UEXI_STATUS newStatus(val);
+
+			m_Status.EXIINTMASK = newStatus.EXIINTMASK;
+			if (newStatus.EXIINT)
+				m_Status.EXIINT = 0;
+
+			m_Status.TCINTMASK = newStatus.TCINTMASK;
+			if (newStatus.TCINT)
+				m_Status.TCINT = 0;
+
+			m_Status.CLK = newStatus.CLK;
+
+			if (m_ChannelId == 0 || m_ChannelId == 1)
+			{
+				m_Status.EXTINTMASK = newStatus.EXTINTMASK;
+
+				if (newStatus.EXTINT)
+					m_Status.EXTINT = 0;
+			}
+
+			if (m_ChannelId == 0)
+				m_Status.ROMDIS = newStatus.ROMDIS;
+
+			IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT ^ newStatus.CHIP_SELECT);
+			m_Status.CHIP_SELECT = newStatus.CHIP_SELECT;
+			if (pDevice != nullptr)
+				pDevice->SetCS(m_Status.CHIP_SELECT);
+
+			ExpansionInterface::UpdateInterrupts();
+		})
+	);
+
+	mmio->Register(base + EXI_DMAADDR,
+		MMIO::DirectRead<u32>(&m_DMAMemoryAddress),
+		MMIO::DirectWrite<u32>(&m_DMAMemoryAddress)
+	);
+	mmio->Register(base + EXI_DMALENGTH,
+		MMIO::DirectRead<u32>(&m_DMALength),
+		MMIO::DirectWrite<u32>(&m_DMALength)
+	);
+	mmio->Register(base + EXI_DMACONTROL,
+		MMIO::DirectRead<u32>(&m_Control.Hex),
+		MMIO::ComplexWrite<u32>([this](u32, u32 val) {
+			m_Control.Hex = val;
+
+			if (m_Control.TSTART)
+			{
+				IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT);
+				if (pDevice == nullptr)
+					return;
+
+				if (m_Control.DMA == 0)
+				{
+					// immediate data
+					switch (m_Control.RW)
+					{
+						case EXI_READ: m_ImmData = pDevice->ImmRead(m_Control.TLEN + 1); break;
+						case EXI_WRITE: pDevice->ImmWrite(m_ImmData, m_Control.TLEN + 1); break;
+						case EXI_READWRITE: pDevice->ImmReadWrite(m_ImmData, m_Control.TLEN + 1); break;
+						default: _dbg_assert_msg_(EXPANSIONINTERFACE,0,"EXI Imm: Unknown transfer type %i", m_Control.RW);
+					}
+				}
+				else
+				{
+					// DMA
+					switch (m_Control.RW)
+					{
+						case EXI_READ: pDevice->DMARead (m_DMAMemoryAddress, m_DMALength); break;
+						case EXI_WRITE: pDevice->DMAWrite(m_DMAMemoryAddress, m_DMALength); break;
+						default: _dbg_assert_msg_(EXPANSIONINTERFACE,0,"EXI DMA: Unknown transfer type %i", m_Control.RW);
+					}
+				}
+
+				m_Control.TSTART = 0;
+
+				// Check if device needs specific timing, otherwise just complete transfer immediately
+				if (!pDevice->UseDelayedTransferCompletion())
+					SendTransferComplete();
+			}
+		})
+	);
+
+	mmio->Register(base + EXI_IMMDATA,
+		MMIO::DirectRead<u32>(&m_ImmData),
+		MMIO::DirectWrite<u32>(&m_ImmData)
+	);
+}
+
+void CEXIChannel::SendTransferComplete()
+{
+	m_Status.TCINT = 1;
+	ExpansionInterface::UpdateInterrupts();
+}
+
+void CEXIChannel::RemoveDevices()
+{
+	for (auto& device : m_pDevices)
+		device.reset(nullptr);
+}
+
+void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num)
+{
+	IEXIDevice* pNewDevice = EXIDevice_Create(device_type, m_ChannelId);
+	AddDevice(pNewDevice, device_num);
+}
+
+void CEXIChannel::AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged)
+{
+	_dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES);
+
+	// replace it with the new one
+	m_pDevices[device_num].reset(pDevice);
+
+	if (notifyPresenceChanged)
+	{
+		// This means "device presence changed", software has to check
+		// m_Status.EXT to see if it is now present or not
+		if (m_ChannelId != 2)
+		{
+			m_Status.EXTINT = 1;
+			ExpansionInterface::UpdateInterrupts();
+		}
+	}
+}
+
+bool CEXIChannel::IsCausingInterrupt()
+{
+	if (m_ChannelId != 2 && GetDevice(1)->IsInterruptSet())
+		m_Status.EXIINT = 1; // Always check memcard slots
+	else if (GetDevice(m_Status.CHIP_SELECT))
+		if (GetDevice(m_Status.CHIP_SELECT)->IsInterruptSet())
+			m_Status.EXIINT = 1;
+
+	if ((m_Status.EXIINT & m_Status.EXIINTMASK) ||
+		(m_Status.TCINT  & m_Status.TCINTMASK) ||
+		(m_Status.EXTINT & m_Status.EXTINTMASK))
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
+{
+	switch (chip_select)
+	{
+	case 1: return m_pDevices[0].get();
+	case 2: return m_pDevices[1].get();
+	case 4: return m_pDevices[2].get();
+	}
+	return nullptr;
+}
+
+void CEXIChannel::DoState(PointerWrap &p)
+{
+	p.DoPOD(m_Status);
+	p.Do(m_DMAMemoryAddress);
+	p.Do(m_DMALength);
+	p.Do(m_Control);
+	p.Do(m_ImmData);
+
+	for (int d = 0; d < NUM_DEVICES; ++d)
+	{
+		IEXIDevice* pDevice = m_pDevices[d].get();
+		TEXIDevices type = pDevice->m_deviceType;
+		p.Do(type);
+		IEXIDevice* pSaveDevice = (type == pDevice->m_deviceType) ? pDevice : EXIDevice_Create(type, m_ChannelId);
+		pSaveDevice->DoState(p);
+		if (pSaveDevice != pDevice)
+		{
+			// if we had to create a temporary device, discard it if we're not loading.
+			// also, if no movie is active, we'll assume the user wants to keep their current devices
+			// instead of the ones they had when the savestate was created,
+			// unless the device is NONE (since ChangeDevice sets that temporarily).
+			if (p.GetMode() != PointerWrap::MODE_READ)
+			{
+				delete pSaveDevice;
+			}
+			else
+			{
+				AddDevice(pSaveDevice, d, false);
+			}
+		}
+	}
+}
+
+void CEXIChannel::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	for (auto& device : m_pDevices)
+		device->PauseAndLock(doLock, unpauseOnUnlock);
+}
+
+IEXIDevice* CEXIChannel::FindDevice(TEXIDevices device_type, int customIndex)
+{
+	for (auto& sup : m_pDevices)
+	{
+		IEXIDevice* device = sup->FindDevice(device_type, customIndex);
+		if (device)
+			return device;
+	}
+	return nullptr;
+}
diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h
new file mode 100644
index 0000000000..0a41053eaf
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_Channel.h
@@ -0,0 +1,111 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include "Common/CommonTypes.h"
+
+class IEXIDevice;
+class PointerWrap;
+enum TEXIDevices : int;
+namespace MMIO { class Mapping; }
+
+class CEXIChannel
+{
+private:
+
+	enum
+	{
+		EXI_STATUS      = 0x00,
+		EXI_DMAADDR     = 0x04,
+		EXI_DMALENGTH   = 0x08,
+		EXI_DMACONTROL  = 0x0C,
+		EXI_IMMDATA     = 0x10
+	};
+
+	// EXI Status Register - "Channel Parameter Register"
+	union UEXI_STATUS
+	{
+		u32 Hex;
+		// DO NOT obey the warning and give this struct a name. Things will fail.
+		struct
+		{
+			// Indentation Meaning:
+			// Channels 0, 1, 2
+			//  Channels 0, 1 only
+			//      Channel 0 only
+			u32 EXIINTMASK      : 1;
+			u32 EXIINT          : 1;
+			u32 TCINTMASK       : 1;
+			u32 TCINT           : 1;
+			u32 CLK             : 3;
+			u32 CHIP_SELECT     : 3; // CS1 and CS2 are Channel 0 only
+			    u32 EXTINTMASK  : 1;
+			    u32 EXTINT      : 1;
+			    u32 EXT         : 1; // External Insertion Status (1: External EXI device present)
+			        u32 ROMDIS  : 1; // ROM Disable
+			u32                 :18;
+		};
+		UEXI_STATUS() { Hex = 0; }
+		UEXI_STATUS(u32 _hex) { Hex = _hex; }
+	};
+
+	// EXI Control Register
+	union UEXI_CONTROL
+	{
+		u32 Hex;
+		struct
+		{
+			u32 TSTART : 1;
+			u32 DMA    : 1;
+			u32 RW     : 2;
+			u32 TLEN   : 2;
+			u32        :26;
+		};
+	};
+
+	// STATE_TO_SAVE
+	UEXI_STATUS  m_Status;
+	u32          m_DMAMemoryAddress;
+	u32          m_DMALength;
+	UEXI_CONTROL m_Control;
+	u32          m_ImmData;
+
+	// Devices
+	enum
+	{
+		NUM_DEVICES = 3
+	};
+
+	std::unique_ptr<IEXIDevice> m_pDevices[NUM_DEVICES];
+
+	// Since channels operate a bit differently from each other
+	u32 m_ChannelId;
+
+public:
+	// get device
+	IEXIDevice* GetDevice(const u8 _CHIP_SELECT);
+	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex = -1);
+
+	CEXIChannel(u32 ChannelId);
+	~CEXIChannel();
+
+	void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+	void SendTransferComplete();
+
+	void AddDevice(const TEXIDevices device_type, const int device_num);
+	void AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged = true);
+
+	// Remove all devices
+	void RemoveDevices();
+
+	bool IsCausingInterrupt();
+	void DoState(PointerWrap &p);
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock);
+
+	// This should only be used to transition interrupts from SP1 to Channel 2
+	void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; }
+};
diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp
new file mode 100644
index 0000000000..80fd585f36
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_Device.cpp
@@ -0,0 +1,147 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceAD16.h"
+#include "Core/HW/EXI_DeviceAGP.h"
+#include "Core/HW/EXI_DeviceAMBaseboard.h"
+#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI_DeviceGecko.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI_DeviceMemoryCard.h"
+#include "Core/HW/EXI_DeviceMic.h"
+#include "Core/HW/Memmap.h"
+
+// --- interface IEXIDevice ---
+void IEXIDevice::ImmWrite(u32 _uData, u32 _uSize)
+{
+	while (_uSize--)
+	{
+		u8 uByte = _uData >> 24;
+		TransferByte(uByte);
+		_uData <<= 8;
+	}
+}
+
+u32 IEXIDevice::ImmRead(u32 _uSize)
+{
+	u32 uResult = 0;
+	u32 uPosition = 0;
+	while (_uSize--)
+	{
+		u8 uByte = 0;
+		TransferByte(uByte);
+		uResult |= uByte << (24 - (uPosition++ * 8));
+	}
+	return uResult;
+}
+
+void IEXIDevice::DMAWrite(u32 _uAddr, u32 _uSize)
+{
+	// _dbg_assert_(EXPANSIONINTERFACE, 0);
+	while (_uSize--)
+	{
+		u8 uByte = Memory::Read_U8(_uAddr++);
+		TransferByte(uByte);
+	}
+}
+
+void IEXIDevice::DMARead(u32 _uAddr, u32 _uSize)
+{
+	// _dbg_assert_(EXPANSIONINTERFACE, 0);
+	while (_uSize--)
+	{
+		u8 uByte = 0;
+		TransferByte(uByte);
+		Memory::Write_U8(uByte, _uAddr++);
+	}
+}
+
+
+// --- class CEXIDummy ---
+// Just a dummy that logs reads and writes
+// to be used for EXI devices we haven't emulated
+// DOES NOT FUNCTION AS "NO DEVICE INSERTED" -> Appears as unknown device
+class CEXIDummy : public IEXIDevice
+{
+	std::string m_strName;
+
+	void TransferByte(u8& _byte) override {}
+
+public:
+	CEXIDummy(const std::string& _strName) :
+	  m_strName(_strName)
+	{
+	}
+
+	virtual ~CEXIDummy(){}
+
+	void ImmWrite(u32 data, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
+	u32  ImmRead (u32 size) override           {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
+	void DMAWrite(u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
+	void DMARead (u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead:  %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
+	bool IsPresent() const override { return true; }
+};
+
+
+// F A C T O R Y
+IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
+{
+	IEXIDevice* result = nullptr;
+
+	switch (device_type)
+	{
+	case EXIDEVICE_DUMMY:
+		result = new CEXIDummy("Dummy");
+		break;
+
+	case EXIDEVICE_MEMORYCARD:
+	case EXIDEVICE_MEMORYCARDFOLDER:
+	{
+		bool gci_folder = (device_type == EXIDEVICE_MEMORYCARDFOLDER);
+		result = new CEXIMemoryCard(channel_num, gci_folder);
+		break;
+	}
+	case EXIDEVICE_MASKROM:
+		result = new CEXIIPL();
+		break;
+
+	case EXIDEVICE_AD16:
+		result = new CEXIAD16();
+		break;
+
+	case EXIDEVICE_MIC:
+		result = new CEXIMic(channel_num);
+		break;
+
+	case EXIDEVICE_ETH:
+		result = new CEXIETHERNET();
+		break;
+
+	case EXIDEVICE_AM_BASEBOARD:
+		result = new CEXIAMBaseboard();
+		break;
+
+	case EXIDEVICE_GECKO:
+		result = new CEXIGecko();
+		break;
+
+	case EXIDEVICE_AGP:
+		result = new CEXIAgp(channel_num);
+		break;
+
+	case EXIDEVICE_NONE:
+	default:
+		result = new IEXIDevice();
+		break;
+	}
+
+	if (result != nullptr)
+		result->m_deviceType = device_type;
+
+	return result;
+}
diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI_Device.h
new file mode 100644
index 0000000000..4cc547f27f
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_Device.h
@@ -0,0 +1,60 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+enum TEXIDevices : int
+{
+	EXIDEVICE_DUMMY,
+	EXIDEVICE_MEMORYCARD,
+	EXIDEVICE_MASKROM,
+	EXIDEVICE_AD16,
+	EXIDEVICE_MIC,
+	EXIDEVICE_ETH,
+	EXIDEVICE_AM_BASEBOARD,
+	EXIDEVICE_GECKO,
+	EXIDEVICE_MEMORYCARDFOLDER, // Only used when creating a device by EXIDevice_Create
+	                            // Converted to EXIDEVICE_MEMORYCARD internally
+	EXIDEVICE_AGP,
+	EXIDEVICE_NONE = (u8)-1
+};
+
+class IEXIDevice
+{
+private:
+	// Byte transfer function for this device
+	virtual void TransferByte(u8&) {}
+
+public:
+	// Immediate copy functions
+	virtual void ImmWrite(u32 _uData,  u32 _uSize);
+	virtual u32  ImmRead(u32 _uSize);
+	virtual void ImmReadWrite(u32 &/*_uData*/, u32 /*_uSize*/) {}
+
+	// DMA copy functions
+	virtual void DMAWrite(u32 _uAddr, u32 _uSize);
+	virtual void DMARead (u32 _uAddr, u32 _uSize);
+
+	virtual bool UseDelayedTransferCompletion() const { return false; }
+
+	virtual bool IsPresent() const { return false; }
+	virtual void SetCS(int) {}
+	virtual void DoState(PointerWrap&) {}
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {}
+	virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : nullptr; }
+
+	// Is generating interrupt ?
+	virtual bool IsInterruptSet() {return false;}
+	virtual ~IEXIDevice() {}
+
+	// for savestates. storing it here seemed cleaner than requiring each implementation to report its type.
+	// I know this class is set up like an interface, but no code requires it to be strictly such.
+	TEXIDevices m_deviceType;
+};
+
+IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num);
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/HW/EXI_DeviceAD16.cpp
similarity index 78%
rename from Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp
rename to Source/Core/Core/HW/EXI_DeviceAD16.cpp
index f0e0f96724..a6bbc5a03e 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceAD16.cpp
@@ -1,15 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../Core.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceAD16.h"
+#include "Common/ChunkFile.h"
+#include "Core/Core.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceAD16.h"
 
 CEXIAD16::CEXIAD16() :
 	m_uPosition(0),
-	m_uCommand(0)		
+	m_uCommand(0)
 {
 	m_uAD16Register.U32 = 0x00;
 }
@@ -20,7 +20,7 @@ void CEXIAD16::SetCS(int cs)
 		m_uPosition = 0;
 }
 
-bool CEXIAD16::IsPresent()
+bool CEXIAD16::IsPresent() const
 {
 	return true;
 }
@@ -33,14 +33,14 @@ void CEXIAD16::TransferByte(u8& _byte)
 	}
 	else
 	{
-		switch(m_uCommand)
+		switch (m_uCommand)
 		{
 		case init:
 			{
 				m_uAD16Register.U32 = 0x04120000;
-				switch(m_uPosition)
+				switch (m_uPosition)
 				{
-				case 1: _dbg_assert_(EXPANSIONINTERFACE, (_byte == 0x00)); break; // just skip 
+				case 1: _dbg_assert_(EXPANSIONINTERFACE, (_byte == 0x00)); break; // just skip
 				case 2: _byte = m_uAD16Register.U8[0]; break;
 				case 3: _byte = m_uAD16Register.U8[1]; break;
 				case 4: _byte = m_uAD16Register.U8[2]; break;
@@ -51,7 +51,7 @@ void CEXIAD16::TransferByte(u8& _byte)
 
 		case write:
 			{
-				switch(m_uPosition)
+				switch (m_uPosition)
 				{
 				case 1: m_uAD16Register.U8[0] = _byte; break;
 				case 2: m_uAD16Register.U8[1] = _byte; break;
@@ -63,7 +63,7 @@ void CEXIAD16::TransferByte(u8& _byte)
 
 		case read:
 			{
-				switch(m_uPosition)
+				switch (m_uPosition)
 				{
 				case 1: _byte = m_uAD16Register.U8[0]; break;
 				case 2: _byte = m_uAD16Register.U8[1]; break;
diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI_DeviceAD16.h
new file mode 100644
index 0000000000..b9ce260fc6
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceAD16.h
@@ -0,0 +1,39 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/EXI_Device.h"
+
+class PointerWrap;
+
+class CEXIAD16 : public IEXIDevice
+{
+public:
+	CEXIAD16();
+	virtual void SetCS(int _iCS) override;
+	virtual bool IsPresent() const override;
+	virtual void DoState(PointerWrap &p) override;
+
+private:
+	enum
+	{
+		init  = 0x00,
+		write = 0xa0,
+		read  = 0xa2
+	};
+
+	union UAD16Reg
+	{
+		u32 U32;
+		u32 U8[4];
+	};
+
+	// STATE_TO_SAVE
+	u32 m_uPosition;
+	u32 m_uCommand;
+	UAD16Reg m_uAD16Register;
+
+	virtual void TransferByte(u8& _uByte) override;
+};
diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI_DeviceAGP.cpp
new file mode 100644
index 0000000000..c166ce4aca
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceAGP.cpp
@@ -0,0 +1,364 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/FileUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StdMakeUnique.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceAGP.h"
+#include "Core/HW/Memmap.h"
+
+CEXIAgp::CEXIAgp(int index)
+{
+	m_slot = index;
+
+	// Create the ROM
+	m_rom_size = 0;
+
+	LoadRom();
+
+	m_address = 0;
+}
+
+CEXIAgp::~CEXIAgp()
+{
+	std::string path;
+	std::string filename;
+	std::string ext;
+	std::string gbapath;
+	SplitPath(m_slot == 0 ? SConfig::GetInstance().m_strGbaCartA : SConfig::GetInstance().m_strGbaCartB, &path, &filename, &ext);
+	gbapath = path + filename;
+
+	SaveFileFromEEPROM(gbapath + ".sav");
+}
+
+void CEXIAgp::CRC8(u8* data, u32 size)
+{
+	for (u32 it = 0; it < size; it++)
+	{
+		u8 crc = 0;
+		m_hash = m_hash ^ data[it];
+		if (m_hash & 1)     crc ^= 0x5e;
+		if (m_hash & 2)     crc ^= 0xbc;
+		if (m_hash & 4)     crc ^= 0x61;
+		if (m_hash & 8)     crc ^= 0xc2;
+		if (m_hash & 0x10)  crc ^= 0x9d;
+		if (m_hash & 0x20)  crc ^= 0x23;
+		if (m_hash & 0x40)  crc ^= 0x46;
+		if (m_hash & 0x80)  crc ^= 0x8c;
+		m_hash = crc;
+	}
+}
+
+void CEXIAgp::LoadRom()
+{
+	// Load whole ROM dump
+	std::string path;
+	std::string filename;
+	std::string ext;
+	std::string gbapath;
+	SplitPath(m_slot == 0 ? SConfig::GetInstance().m_strGbaCartA : SConfig::GetInstance().m_strGbaCartB, &path, &filename, &ext);
+	gbapath = path + filename;
+	LoadFileToROM(gbapath + ext);
+	INFO_LOG(EXPANSIONINTERFACE, "Loaded GBA rom: %s card: %d", gbapath.c_str(), m_slot);
+	LoadFileToEEPROM(gbapath + ".sav");
+	INFO_LOG(EXPANSIONINTERFACE, "Loaded GBA sav: %s card: %d", gbapath.c_str(), m_slot);
+}
+
+void CEXIAgp::LoadFileToROM(const std::string& filename)
+{
+	File::IOFile pStream(filename, "rb");
+	if (pStream)
+	{
+		u64 filesize = pStream.GetSize();
+		m_rom_size = filesize & 0xFFFFFFFF;
+		m_rom_mask = (m_rom_size - 1);
+
+		m_rom.resize(m_rom_size);
+
+		pStream.ReadBytes(m_rom.data(), filesize);
+	}
+	else
+	{
+		// dummy rom data
+		m_rom.resize(0x2000);
+	}
+}
+
+void CEXIAgp::LoadFileToEEPROM(const std::string& filename)
+{
+	// Technically one of EEPROM, Flash, SRAM, FRAM
+	File::IOFile pStream(filename, "rb");
+	if (pStream)
+	{
+		u64 filesize = pStream.GetSize();
+		m_eeprom_size = filesize & 0xFFFFFFFF;
+		m_eeprom_mask = (m_eeprom_size - 1);
+
+		m_eeprom.resize(m_eeprom_size);
+		pStream.ReadBytes(m_eeprom.data(), filesize);
+		if ((m_eeprom_size == 512) || (m_eeprom_size == 8192))
+		{
+			// Handle endian read - could be done with byte access in 0xAE commands instead
+			for (u32 index = 0; index < (m_eeprom_size / 8); index++)
+			{
+				u64 NewVal = 0;
+				for (u32 indexb = 0; indexb < 8; indexb++)
+					NewVal = (NewVal << 0x8) | m_eeprom[index * 8 + indexb];
+				((u64*)(m_eeprom.data()))[index] = NewVal;
+			}
+			m_eeprom_add_end = (m_eeprom_size == 512 ? (2 + 6) : (2 + 14));
+			m_eeprom_add_mask = (m_eeprom_size == 512 ? 0x3F : 0x3FF);
+			m_eeprom_read_mask = (m_eeprom_size == 512 ? 0x80 : 0x8000);
+			m_eeprom_status_mask = (m_rom_size == 0x2000000 ? 0x1FFFF00 : 0x1000000);
+		}
+		else
+			m_eeprom_status_mask = 0;
+	}
+	else
+	{
+		m_eeprom_size = 0;
+		m_eeprom.clear();
+	}
+}
+
+void CEXIAgp::SaveFileFromEEPROM(const std::string& filename)
+{
+	File::IOFile pStream(filename, "wb");
+	if (pStream)
+	{
+		if ((m_eeprom_size == 512) || (m_eeprom_size == 8192))
+		{
+			// Handle endian write - could be done with byte access in 0xAE commands instead
+			std::vector<u8> temp_eeprom(m_eeprom_size);
+			for (u32 index = 0; index < (m_eeprom_size / 8); index++)
+			{
+				u64 NewVal = ((u64*)(m_eeprom.data()))[index];
+				for (u32 indexb = 0; indexb < 8; indexb++)
+					temp_eeprom[index * 8 + (7 - indexb)] = (NewVal >> (indexb * 8)) & 0xFF;
+			}
+			pStream.WriteBytes(temp_eeprom.data(), m_eeprom_size);
+		}
+		else
+		{
+			pStream.WriteBytes(m_eeprom.data(), m_eeprom_size);
+		}
+	}
+}
+
+u32 CEXIAgp::ImmRead(u32 _uSize)
+{
+	u32 uData = 0;
+	u8 RomVal1, RomVal2, RomVal3, RomVal4;
+
+	switch (m_current_cmd)
+	{
+	case 0xAE000000: // Clock handshake?
+		uData = 0x5AAA5517; // 17 is precalculated hash
+		m_current_cmd = 0;
+		break;
+	case 0xAE010000: // Init?
+		uData = (m_return_pos == 0) ? 0x01020304 : 0xF0020304; // F0 is precalculated hash, 020304 is left over
+		if (m_return_pos == 1)
+			m_current_cmd = 0;
+		else
+			m_return_pos = 1;
+		break;
+	case 0xAE020000: // Read 2 bytes with 24 bit address
+		if (m_eeprom_write_status && ((m_rw_offset & m_eeprom_status_mask) == m_eeprom_status_mask) && (m_eeprom_status_mask != 0))
+		{
+			RomVal1 = 0x1;
+			RomVal2 = 0x0;
+		}
+		else
+		{
+			RomVal1 = m_rom[(m_rw_offset++) & m_rom_mask];
+			RomVal2 = m_rom[(m_rw_offset++) & m_rom_mask];
+		}
+		CRC8(&RomVal2, 1);
+		CRC8(&RomVal1, 1);
+		uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8);
+		m_current_cmd = 0;
+		break;
+	case 0xAE030000: // read the next 4 bytes out of 0x10000 group
+		if (_uSize == 1)
+		{
+			uData = 0xFF000000;
+			m_current_cmd = 0;
+		}
+		else
+		{
+			RomVal1 = m_rom[(m_rw_offset++) & m_rom_mask];
+			RomVal2 = m_rom[(m_rw_offset++) & m_rom_mask];
+			RomVal3 = m_rom[(m_rw_offset++) & m_rom_mask];
+			RomVal4 = m_rom[(m_rw_offset++) & m_rom_mask];
+			CRC8(&RomVal2, 1);
+			CRC8(&RomVal1, 1);
+			CRC8(&RomVal4, 1);
+			CRC8(&RomVal3, 1);
+			uData = (RomVal2 << 24) | (RomVal1 << 16) | (RomVal4 << 8) | (RomVal3);
+		}
+		break;
+	case 0xAE040000: // read 1 byte from 16 bit address
+		// ToDo: Flash special handling
+		if (m_eeprom_size == 0)
+			RomVal1 = 0xFF;
+		else
+			RomVal1 = (m_eeprom.data())[m_eeprom_pos];
+		CRC8(&RomVal1, 1);
+		uData = (RomVal1 << 24) | (m_hash << 16);
+		m_current_cmd = 0;
+		break;
+	case 0xAE0B0000: // read 1 bit from DMA with 6 or 14 bit address
+		// Change to byte access instead of endian file access?
+		RomVal1 = EE_READ_FALSE;
+		if ((m_eeprom_size != 0)
+			&& (m_eeprom_pos >= EE_IGNORE_BITS)
+			&& ((((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & m_eeprom_add_mask]) >> ((EE_DATA_BITS - 1) - (m_eeprom_pos - EE_IGNORE_BITS))) & 0x1)
+		{
+			RomVal1 = EE_READ_TRUE;
+		}
+		RomVal2 = 0;
+		CRC8(&RomVal2, 1);
+		CRC8(&RomVal1, 1);
+		uData = (RomVal2 << 24) | (RomVal1 << 16) | (m_hash << 8);
+		m_eeprom_pos++;
+		m_current_cmd = 0;
+		break;
+	case 0xAE070000: // complete write 1 byte from 16 bit address
+	case 0xAE0C0000: // complete write 1 bit from dma with 6 or 14 bit address
+		uData = m_hash << 24;
+		m_current_cmd = 0;
+		break;
+	default:
+		uData = 0x0;
+		m_current_cmd = 0;
+		break;
+	}
+	INFO_LOG(EXPANSIONINTERFACE, "AGP read %x", uData);
+	return uData;
+}
+
+void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize)
+{
+	// 0x00 = Execute current command?
+	if ((_uSize == 1) && ((_uData & 0xFF000000) == 0))
+		return;
+
+	u8 HashCmd;
+	u64 Mask;
+	INFO_LOG(EXPANSIONINTERFACE, "AGP command %x", _uData);
+	switch (m_current_cmd)
+	{
+	case 0xAE020000: // set up 24 bit address for read 2 bytes
+	case 0xAE030000: // set up 24 bit address for read (0x10000 byte group)
+		// 25 bit address shifted one bit right = 24 bits
+		m_rw_offset = ((_uData & 0xFFFFFF00) >> (8 - 1));
+		m_return_pos = 0;
+		HashCmd = (_uData & 0xFF000000) >> 24;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x00FF0000) >> 16;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x0000FF00) >> 8;
+		CRC8(&HashCmd, 1);
+		break;
+	case 0xAE040000: // set up 16 bit address for read 1 byte
+		// ToDo: Flash special handling
+		m_eeprom_pos = ((_uData & 0xFFFF0000) >> 0x10) & m_eeprom_mask;
+		HashCmd = (_uData & 0xFF000000) >> 24;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x00FF0000) >> 16;
+		CRC8(&HashCmd, 1);
+		break;
+	case 0xAE070000: // write 1 byte from 16 bit address
+		// ToDo: Flash special handling
+		m_eeprom_pos = ((_uData & 0xFFFF0000) >> 0x10) & m_eeprom_mask;
+		if (m_eeprom_size != 0)
+			((m_eeprom.data()))[(m_eeprom_pos)] = (_uData & 0x0000FF00) >> 0x8;
+		HashCmd = (_uData & 0xFF000000) >> 24;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x00FF0000) >> 16;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x0000FF00) >> 8;
+		CRC8(&HashCmd, 1);
+		break;
+	case 0xAE0C0000: // write 1 bit from dma with 6 or 14 bit address
+		if ((m_eeprom_pos < m_eeprom_add_end) || (m_eeprom_pos == ((m_eeprom_cmd & m_eeprom_read_mask) ? m_eeprom_add_end : m_eeprom_add_end + EE_DATA_BITS)))
+		{
+			Mask = (1ULL << (m_eeprom_add_end - std::min(m_eeprom_pos, m_eeprom_add_end)));
+			if ((_uData >> 16) & 0x1)
+				m_eeprom_cmd |= Mask;
+			else
+				m_eeprom_cmd &= ~Mask;
+			if (m_eeprom_pos == m_eeprom_add_end + EE_DATA_BITS)
+			{
+				// Change to byte access instead of endian file access?
+				if (m_eeprom_size != 0)
+					((u64*)(m_eeprom.data()))[(m_eeprom_cmd >> 1) & m_eeprom_add_mask] = m_eeprom_data;
+				m_eeprom_write_status = true;
+			}
+		}
+		else
+		{
+			Mask = (1ULL << (m_eeprom_add_end + EE_DATA_BITS - 1 - m_eeprom_pos));
+			if ((_uData >> 16) & 0x1)
+				m_eeprom_data |= Mask;
+			else
+				m_eeprom_data &= ~Mask;
+		}
+		m_eeprom_pos++;
+		m_return_pos = 0;
+		HashCmd = (_uData & 0xFF000000) >> 24;
+		CRC8(&HashCmd, 1);
+		HashCmd = (_uData & 0x00FF0000) >> 16;
+		CRC8(&HashCmd, 1);
+		break;
+	case 0xAE0B0000:
+		m_eeprom_write_status = false;
+		break;
+	case 0xAE000000:
+	case 0xAE010000:
+	case 0xAE090000: // start DMA
+		m_eeprom_write_status = false;  //ToDo: Verify with hardware which commands disable EEPROM CS
+		// Fall-through intentional
+	case 0xAE0A0000: // end DMA
+		m_eeprom_pos = 0;
+		// Fall-through intentional
+	default:
+		m_current_cmd = _uData;
+		m_return_pos = 0;
+		m_hash = 0xFF;
+		HashCmd = (_uData & 0x00FF0000) >> 16;
+		CRC8(&HashCmd, 1);
+		break;
+	}
+}
+
+void CEXIAgp::DoState(PointerWrap &p)
+{
+	p.Do(m_slot);
+	p.Do(m_address);
+	p.Do(m_current_cmd);
+	p.Do(m_eeprom);
+	p.Do(m_eeprom_cmd);
+	p.Do(m_eeprom_data);
+	p.Do(m_eeprom_mask);
+	p.Do(m_eeprom_pos);
+	p.Do(m_eeprom_size);
+	p.Do(m_eeprom_add_end);
+	p.Do(m_eeprom_add_mask);
+	p.Do(m_eeprom_read_mask);
+	p.Do(m_eeprom_status_mask);
+	p.Do(m_eeprom_write_status);
+	p.Do(m_hash);
+	p.Do(m_position);
+	p.Do(m_return_pos);
+	p.Do(m_rom);
+	p.Do(m_rom_mask);
+	p.Do(m_rom_size);
+	p.Do(m_rw_offset);
+}
diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.h b/Source/Core/Core/HW/EXI_DeviceAGP.h
new file mode 100644
index 0000000000..b5cc29ed70
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceAGP.h
@@ -0,0 +1,68 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <deque>
+#include <queue>
+#include <string>
+#include <vector>
+
+#include "Core/HW/EXI_Device.h"
+
+class PointerWrap;
+
+class CEXIAgp
+	: public IEXIDevice
+{
+public:
+	CEXIAgp(const int index);
+	virtual ~CEXIAgp() override;
+	bool IsPresent() const override { return true; }
+	void ImmWrite(u32 _uData, u32 _uSize) override;
+	u32  ImmRead(u32 _uSize) override;
+	void DoState(PointerWrap &p) override;
+
+private:
+	enum
+	{
+		EE_IGNORE_BITS = 0x4,
+		EE_DATA_BITS   = 0x40,
+		EE_READ_FALSE  = 0xA,
+		EE_READ_TRUE   = 0xB,
+	};
+
+	int m_slot;
+
+	//! ROM
+	u32 m_rom_size = 0;
+	u32 m_rom_mask = 0;
+	u32 m_eeprom_size = 0;
+	u32 m_eeprom_mask = 0;
+	std::vector<u8> m_rom;
+	std::vector<u8> m_eeprom;
+
+	//! Helper
+	u32 m_position = 0;
+	u32 m_address = 0;
+	u32 m_rw_offset = 0;
+	u64 m_eeprom_data = 0;
+	u16 m_eeprom_pos = 0;
+	u32 m_eeprom_cmd = 0;
+	u16 m_eeprom_add_end = 0;
+	u16 m_eeprom_add_mask = 0;
+	u16 m_eeprom_read_mask = 0;
+	u32 m_eeprom_status_mask = 0;
+	bool m_eeprom_write_status = false;
+
+	void LoadFileToROM(const std::string& filename);
+	void LoadFileToEEPROM(const std::string& filename);
+	void SaveFileFromEEPROM(const std::string& filename);
+	void LoadRom();
+	void CRC8(u8* data, u32 size);
+
+	u8 m_hash = 0;
+	u32 m_current_cmd = 0;
+	u32 m_return_pos = 0;
+};
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp
similarity index 84%
rename from Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp
rename to Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp
index 756fa85f62..d653401e1f 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp
@@ -1,11 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../Core.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceAMBaseboard.h"
+#include "Common/ChunkFile.h"
+#include "Common/Logging/Log.h"
+#include "Core/Core.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceAMBaseboard.h"
 
 CEXIAMBaseboard::CEXIAMBaseboard()
 	: m_position(0)
@@ -20,7 +22,7 @@ void CEXIAMBaseboard::SetCS(int cs)
 		m_position = 0;
 }
 
-bool CEXIAMBaseboard::IsPresent()
+bool CEXIAMBaseboard::IsPresent() const
 {
 	return true;
 }
@@ -45,7 +47,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 		xx xx xx xx 04
 
 	exi_isr_read:
-		82 .. .. .. xx xx xx 
+		82 .. .. .. xx xx xx
 		xx xx xx xx 04 rr rr
 		3 byte command, 1 byte checksum
 	*/
@@ -58,7 +60,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 
 	if ((m_position >= 2) && (m_command[0] == 0 && m_command[1] == 0))
 	{
-		_byte = "\x06\x04\x10\x00"[(m_position-2)&3];
+		_byte = "\x06\x04\x10\x00"[(m_position - 2) & 3];
 	}
 	else if (m_position == 3)
 	{
@@ -87,6 +89,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 				m_have_irq = true;
 			else if (m_command[0] == 0x82)
 				m_have_irq = false;
+			ExpansionInterface::UpdateInterrupts();
 		}
 		else if (m_position > 4)
 		{
diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
new file mode 100644
index 0000000000..24a1e3c579
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/EXI_Device.h"
+
+class PointerWrap;
+
+class CEXIAMBaseboard : public IEXIDevice
+{
+public:
+	CEXIAMBaseboard();
+
+	virtual void SetCS(int _iCS) override;
+	virtual bool IsPresent() const override;
+	virtual bool IsInterruptSet() override;
+	virtual void DoState(PointerWrap &p) override;
+
+private:
+	virtual void TransferByte(u8& _uByte) override;
+	int m_position;
+	bool m_have_irq;
+	unsigned char m_command[4];
+};
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
similarity index 85%
rename from Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
rename to Source/Core/Core/HW/EXI_DeviceEthernet.cpp
index cfb8f37188..3468bad8d8 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
@@ -1,110 +1,44 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Memmap.h"
-#include "EXI_Device.h"
-#include "EXI_DeviceEthernet.h"
-#include "StringUtil.h"
-#include "../ConfigManager.h"
+#include "Common/ChunkFile.h"
+#include "Common/Network.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/Memmap.h"
 
 // XXX: The BBA stores multi-byte elements as little endian.
-// Multiple parts of this implementation depend on dolphin
+// Multiple parts of this implementation depend on Dolphin
 // being compiled for a little endian host.
 
 
-// TODO move this code into Common or something, for IOS to use
-
-enum MACConsumer
-{
-	BBA,
-	IOS
-};
-
-void GenerateMAC(MACConsumer type, u8 (&mac)[6])
-{
-	memset(mac, 0, 6);
-
-	u8 const oui_bba[] = { 0x00, 0x09, 0xbf };
-	u8 const oui_ios[] = { 0x00, 0x17, 0xab };
-
-	switch (type)
-	{
-	case BBA:
-		memcpy(mac, oui_bba, 3);
-		break;
-	case IOS:
-		memcpy(mac, oui_ios, 3);
-		break;
-	}
-
-	srand((unsigned int)time(nullptr));
-
-	u8 id[3] =
-	{
-		(u8)rand(),
-		(u8)rand(),
-		(u8)rand()
-	};
-
-	memcpy(&mac[3], id, 3);
-}
-
 CEXIETHERNET::CEXIETHERNET()
 {
 	tx_fifo = new u8[1518];
 	mBbaMem = new u8[BBA_MEM_SIZE];
 
-	mRecvBuffer = new u8 [BBA_RECV_SIZE];
+	mRecvBuffer = new u8[BBA_RECV_SIZE];
 	mRecvBufferLength = 0;
 
 	MXHardReset();
 
 	// Parse MAC address from config, and generate a new one if it doesn't
 	// exist or can't be parsed.
+	std::string &mac_addr_setting = SConfig::GetInstance().m_bba_mac;
+	u8 mac_addr[MAC_ADDRESS_SIZE] = { 0 };
 
-	auto &mac_addr_setting = SConfig::GetInstance().m_bba_mac;	
-	bool mac_addr_valid = false;
-	u8 mac_addr[6] = { 0 };
-
-	if (!mac_addr_setting.empty())
+	if (!StringToMacAddress(mac_addr_setting, mac_addr))
 	{
-		int x = 0;
-
-		for (size_t i = 0; i < mac_addr_setting.size() && x < 12; i++)
-		{
-			char c = mac_addr_setting.at(i);
-			if (c >= '0' && c <= '9')
-			{
-				mac_addr[x / 2] |= (c - '0') << ((x & 1) ? 0 : 4); x++;
-			}
-			else if (c >= 'A' && c <= 'F')
-			{
-				mac_addr[x / 2] |= (c - 'A' + 10) << ((x & 1) ? 0 : 4); x++;
-			}
-			else if (c >= 'a' && c <= 'f')
-			{
-				mac_addr[x / 2] |= (c - 'a' + 10) << ((x & 1) ? 0 : 4); x++;
-			}
-		}
-	
-		if (x / 2 == 6)
-		{
-			memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
-			mac_addr_valid = true;
-		}
-	}
-
-	if (!mac_addr_valid)
-	{
-		GenerateMAC(BBA, mac_addr);
-
-		mac_addr_setting = ArrayToString(mac_addr, 6, 10, false);
+		GenerateMacAddress(BBA, mac_addr);
+		mac_addr_setting = MacAddressToString(mac_addr);
 		SConfig::GetInstance().SaveSettings();
-
-		memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
 	}
 
+	memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, MAC_ADDRESS_SIZE);
+
 	// HACK: .. fully established 100BASE-T link
 	mBbaMem[BBA_NWAYS] = NWAYS_LS100 | NWAYS_LPNWAY | NWAYS_100TXF | NWAYS_ANCLPT;
 
@@ -112,7 +46,7 @@ CEXIETHERNET::CEXIETHERNET()
 	mHAdapter = INVALID_HANDLE_VALUE;
 	mHRecvEvent = INVALID_HANDLE_VALUE;
 	mHReadWait = INVALID_HANDLE_VALUE;
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
 	fd = -1;
 #endif
 }
@@ -121,9 +55,9 @@ CEXIETHERNET::~CEXIETHERNET()
 {
 	Deactivate();
 
-	delete tx_fifo;
-	delete mBbaMem;
-	delete mRecvBuffer;
+	delete[] tx_fifo;
+	delete[] mBbaMem;
+	delete[] mRecvBuffer;
 }
 
 void CEXIETHERNET::SetCS(int cs)
@@ -135,7 +69,7 @@ void CEXIETHERNET::SetCS(int cs)
 	}
 }
 
-bool CEXIETHERNET::IsPresent()
+bool CEXIETHERNET::IsPresent() const
 {
 	return true;
 }
@@ -145,7 +79,7 @@ bool CEXIETHERNET::IsInterruptSet()
 	return !!(exi_status.interrupt & exi_status.interrupt_mask);
 }
 
-void CEXIETHERNET::ImmWrite(u32 data,  u32 size)
+void CEXIETHERNET::ImmWrite(u32 data, u32 size)
 {
 	data >>= (4 - size) * 8;
 
@@ -191,6 +125,7 @@ void CEXIETHERNET::ImmWrite(u32 data,  u32 size)
 			exi_status.interrupt_mask = data;
 			break;
 		}
+		ExpansionInterface::UpdateInterrupts();
 	}
 	else
 	{
@@ -259,8 +194,8 @@ void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
 void CEXIETHERNET::DMARead(u32 addr, u32 size)
 {
 	DEBUG_LOG(SP1, "DMA read: %08x %x", addr, size);
-	
-	memcpy(Memory::GetPointer(addr), &mBbaMem[transfer.address], size);
+
+	Memory::CopyToEmu(addr, &mBbaMem[transfer.address], size);
 
 	transfer.address += size;
 }
@@ -469,6 +404,7 @@ void CEXIETHERNET::SendComplete()
 		mBbaMem[BBA_IR] |= INT_T;
 
 		exi_status.interrupt |= exi_status.TRANSFER;
+		ExpansionInterface::ScheduleUpdateInterrupts(0);
 	}
 
 	mBbaMem[BBA_LTPS] = 0;
@@ -550,7 +486,7 @@ bool CEXIETHERNET::RecvHandlePacket()
 
 	if (!RecvMACFilter())
 		goto wait_for_next;
-	
+
 #ifdef BBA_TRACK_PAGE_PTRS
 	WARN_LOG(SP1, "RecvHandlePacket %x\n%s", mRecvBufferLength,
 		ArrayToString(mRecvBuffer, mRecvBufferLength, 0x100).c_str());
@@ -562,9 +498,9 @@ bool CEXIETHERNET::RecvHandlePacket()
 		page_ptr(BBA_RHBP));
 #endif
 
-	write_ptr	= ptr_from_page_ptr(BBA_RWP);
-	end_ptr		= ptr_from_page_ptr(BBA_RHBP);
-	read_ptr	= ptr_from_page_ptr(BBA_RRP);
+	write_ptr = ptr_from_page_ptr(BBA_RWP);
+	end_ptr   = ptr_from_page_ptr(BBA_RHBP);
+	read_ptr  = ptr_from_page_ptr(BBA_RRP);
 
 	descriptor = (Descriptor *)write_ptr;
 	write_ptr += 4;
@@ -639,6 +575,7 @@ bool CEXIETHERNET::RecvHandlePacket()
 		mBbaMem[BBA_IR] |= INT_R;
 
 		exi_status.interrupt |= exi_status.TRANSFER;
+		ExpansionInterface::ScheduleUpdateInterrupts_Threadsafe(0);
 	}
 	else
 	{
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h
new file mode 100644
index 0000000000..db5e92bc43
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h
@@ -0,0 +1,336 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
+#include "Common/Thread.h"
+#include "Core/HW/EXI_Device.h"
+
+class PointerWrap;
+
+// Network Control Register A
+enum NCRA
+{
+	NCRA_RESET = 0x01, // RESET
+	NCRA_ST0   = 0x02, // Start transmit command/status
+	NCRA_ST1   = 0x04, // "
+	NCRA_SR    = 0x08  // Start Receive
+};
+
+// Network Control Register B
+enum NCRB
+{
+	NCRB_PR     = 0x01, // Promiscuous Mode
+	NCRB_CA     = 0x02, // Capture Effect Mode
+	NCRB_PM     = 0x04, // Pass Multicast
+	NCRB_PB     = 0x08, // Pass Bad Frame
+	NCRB_AB     = 0x10, // Accept Broadcast
+	NCRB_HBD    = 0x20, // reserved
+	NCRB_RXINTC = 0xC0  // Receive Interrupt Counter (mask)
+};
+
+// Interrupt Mask Register
+// Interrupt Register
+enum Interrupts
+{
+	INT_FRAG     = 0x01, // Fragment Counter
+	INT_R        = 0x02, // Receive
+	INT_T        = 0x04, // Transmit
+	INT_R_ERR    = 0x08, // Receive Error
+	INT_T_ERR    = 0x10, // Transmit Error
+	INT_FIFO_ERR = 0x20, // FIFO Error
+	INT_BUS_ERR  = 0x40, // BUS Error
+	INT_RBF      = 0x80  // RX Buffer Full
+};
+
+// NWAY Configuration Register
+enum NWAYC
+{
+	NWAYC_FD       = 0x01, // Full Duplex Mode
+	NWAYC_PS100_10 = 0x02, // Port Select 100/10
+	NWAYC_ANE      = 0x04, // Autonegotiate enable
+
+	// Autonegotiation status bits...
+
+	NWAYC_NTTEST    = 0x40, // Reserved
+	NWAYC_LTE       = 0x80  // Link Test Enable
+};
+
+enum NWAYS
+{
+	NWAYS_LS10   = 0x01,
+	NWAYS_LS100  = 0x02,
+	NWAYS_LPNWAY = 0x04,
+	NWAYS_ANCLPT = 0x08,
+	NWAYS_100TXF = 0x10,
+	NWAYS_100TXH = 0x20,
+	NWAYS_10TXF  = 0x40,
+	NWAYS_10TXH  = 0x80
+};
+
+enum MISC1
+{
+	MISC1_BURSTDMA  = 0x01,
+	MISC1_DISLDMA   = 0x02,
+	MISC1_TPF       = 0x04,
+	MISC1_TPH       = 0x08,
+	MISC1_TXF       = 0x10,
+	MISC1_TXH       = 0x20,
+	MISC1_TXFIFORST = 0x40,
+	MISC1_RXFIFORST = 0x80
+};
+
+enum MISC2
+{
+	MISC2_HBRLEN0   = 0x01,
+	MISC2_HBRLEN1   = 0x02,
+	MISC2_RUNTSIZE  = 0x04,
+	MISC2_DREQBCTRL = 0x08,
+	MISC2_RINTSEL   = 0x10,
+	MISC2_ITPSEL    = 0x20,
+	MISC2_A11A8EN   = 0x40,
+	MISC2_AUTORCVR  = 0x80
+};
+
+enum
+{
+	BBA_NCRA      = 0x00,
+	BBA_NCRB      = 0x01,
+
+	BBA_LTPS      = 0x04,
+	BBA_LRPS      = 0x05,
+
+	BBA_IMR       = 0x08,
+	BBA_IR        = 0x09,
+
+	BBA_BP        = 0x0a,
+	BBA_TLBP      = 0x0c,
+	BBA_TWP       = 0x0e,
+	BBA_IOB       = 0x10,
+	BBA_TRP       = 0x12,
+	BBA_RWP       = 0x16,
+	BBA_RRP       = 0x18,
+	BBA_RHBP      = 0x1a,
+
+	BBA_RXINTT    = 0x14,
+
+	BBA_NAFR_PAR0 = 0x20,
+	BBA_NAFR_PAR1 = 0x21,
+	BBA_NAFR_PAR2 = 0x22,
+	BBA_NAFR_PAR3 = 0x23,
+	BBA_NAFR_PAR4 = 0x24,
+	BBA_NAFR_PAR5 = 0x25,
+	BBA_NAFR_MAR0 = 0x26,
+	BBA_NAFR_MAR1 = 0x27,
+	BBA_NAFR_MAR2 = 0x28,
+	BBA_NAFR_MAR3 = 0x29,
+	BBA_NAFR_MAR4 = 0x2a,
+	BBA_NAFR_MAR5 = 0x2b,
+	BBA_NAFR_MAR6 = 0x2c,
+	BBA_NAFR_MAR7 = 0x2d,
+
+	BBA_NWAYC     = 0x30,
+	BBA_NWAYS     = 0x31,
+
+	BBA_GCA       = 0x32,
+
+	BBA_MISC      = 0x3d,
+
+	BBA_TXFIFOCNT = 0x3e,
+	BBA_WRTXFIFOD = 0x48,
+
+	BBA_MISC2     = 0x50,
+
+	BBA_SI_ACTRL  = 0x5c,
+	BBA_SI_STATUS = 0x5d,
+	BBA_SI_ACTRL2 = 0x60
+};
+
+enum
+{
+	BBA_NUM_PAGES = 0x10,
+	BBA_PAGE_SIZE = 0x100,
+	BBA_MEM_SIZE  = BBA_NUM_PAGES * BBA_PAGE_SIZE
+};
+
+enum
+{
+	EXI_DEVTYPE_ETHER = 0x04020200
+};
+
+enum SendStatus
+{
+	DESC_CC0     = 0x01,
+	DESC_CC1     = 0x02,
+	DESC_CC2     = 0x04,
+	DESC_CC3     = 0x08,
+	DESC_CRSLOST = 0x10,
+	DESC_UF      = 0x20,
+	DESC_OWC     = 0x40,
+	DESC_OWN     = 0x80
+};
+
+enum RecvStatus
+{
+	DESC_BF   = 0x01,
+	DESC_CRC  = 0x02,
+	DESC_FAE  = 0x04,
+	DESC_FO   = 0x08,
+	DESC_RW   = 0x10,
+	DESC_MF   = 0x20,
+	DESC_RF   = 0x40,
+	DESC_RERR = 0x80
+};
+
+#define BBA_RECV_SIZE 0x800
+
+class CEXIETHERNET : public IEXIDevice
+{
+public:
+	CEXIETHERNET();
+	virtual ~CEXIETHERNET();
+	void SetCS(int cs) override;
+	bool IsPresent() const override;
+	bool IsInterruptSet() override;
+	void ImmWrite(u32 data,  u32 size) override;
+	u32  ImmRead(u32 size) override;
+	void DMAWrite(u32 addr, u32 size) override;
+	void DMARead(u32 addr, u32 size) override;
+	void DoState(PointerWrap &p) override;
+
+//private:
+	struct
+	{
+		enum
+		{
+			READ,
+			WRITE
+		} direction;
+
+		enum
+		{
+			EXI,
+			MX
+		} region;
+
+		u16 address;
+		bool valid;
+	} transfer;
+
+	enum
+	{
+		EXI_ID,
+		REVISION_ID,
+		INTERRUPT_MASK,
+		INTERRUPT,
+		DEVICE_ID,
+		ACSTART,
+		HASH_READ = 8,
+		HASH_WRITE,
+		HASH_STATUS = 0xb,
+		RESET = 0xf
+	};
+
+	// exi regs
+	struct EXIStatus
+	{
+		enum
+		{
+			TRANSFER = 0x80
+		};
+
+		u8 revision_id;
+		u8 interrupt_mask;
+		u8 interrupt;
+		u16 device_id;
+		u8 acstart;
+		u32 hash_challenge;
+		u32 hash_response;
+		u8 hash_status;
+
+		EXIStatus()
+		{
+			device_id = 0xd107;
+			revision_id = 0;//0xf0;
+			acstart = 0x4e;
+
+			interrupt_mask = 0;
+			interrupt = 0;
+			hash_challenge = 0;
+			hash_response = 0;
+			hash_status = 0;
+		}
+
+	} exi_status;
+
+	struct Descriptor
+	{
+		u32 word;
+
+		inline void set(u32 const next_page, u32 const packet_length, u32 const status)
+		{
+			word = 0;
+			word |= (status & 0xff) << 24;
+			word |= (packet_length & 0xfff) << 12;
+			word |= next_page & 0xfff;
+		}
+	};
+
+	inline u16 page_ptr(int const index) const
+	{
+		return ((u16)mBbaMem[index + 1] << 8) | mBbaMem[index];
+	}
+
+	inline u8 *ptr_from_page_ptr(int const index) const
+	{
+		return &mBbaMem[page_ptr(index) << 8];
+	}
+
+	bool IsMXCommand(u32 const data);
+	bool IsWriteCommand(u32 const data);
+	const char* GetRegisterName() const;
+	void MXHardReset();
+	void MXCommandHandler(u32 data, u32 size);
+	void DirectFIFOWrite(u8 *data, u32 size);
+	void SendFromDirectFIFO();
+	void SendFromPacketBuffer();
+	void SendComplete();
+	u8 HashIndex(u8 *dest_eth_addr);
+	bool RecvMACFilter();
+	void inc_rwp();
+	bool RecvHandlePacket();
+
+	u8 *tx_fifo;
+	u8 *mBbaMem;
+
+	// TAP interface
+	bool Activate();
+	void Deactivate();
+	bool IsActivated();
+	bool SendFrame(u8 *frame, u32 size);
+	bool RecvInit();
+	bool RecvStart();
+	void RecvStop();
+
+	u8 *mRecvBuffer;
+	u32 mRecvBufferLength;
+
+#if defined(_WIN32)
+	HANDLE mHAdapter, mHRecvEvent, mHReadWait;
+	DWORD mMtu;
+	OVERLAPPED mReadOverlapped;
+	static VOID CALLBACK ReadWaitCallback(PVOID lpParameter, BOOLEAN TimerFired);
+#elif defined(__linux__) || defined(__APPLE__)
+	int fd;
+	std::thread readThread;
+	std::atomic<bool> readEnabled;
+#endif
+
+};
diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp
new file mode 100644
index 0000000000..f364e7b78b
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp
@@ -0,0 +1,222 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonFuncs.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Core/Core.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceGecko.h"
+
+u16                       GeckoSockServer::server_port;
+int                       GeckoSockServer::client_count;
+std::thread               GeckoSockServer::connectionThread;
+std::atomic<bool>         GeckoSockServer::server_running;
+std::mutex                GeckoSockServer::connection_lock;
+std::queue<std::unique_ptr<sf::TcpSocket>> GeckoSockServer::waiting_socks;
+
+GeckoSockServer::GeckoSockServer()
+	: client_running(false)
+{
+	if (!connectionThread.joinable())
+		connectionThread = std::thread(GeckoConnectionWaiter);
+}
+
+GeckoSockServer::~GeckoSockServer()
+{
+	if (clientThread.joinable())
+	{
+		--client_count;
+
+		client_running.store(false);
+		clientThread.join();
+	}
+
+	if (client_count <= 0)
+	{
+		server_running.store(false);
+		connectionThread.join();
+	}
+}
+
+void GeckoSockServer::GeckoConnectionWaiter()
+{
+	Common::SetCurrentThreadName("Gecko Connection Waiter");
+
+	sf::TcpListener server;
+	server_port = 0xd6ec; // "dolphin gecko"
+	for (int bind_tries = 0; bind_tries <= 10 && !server_running.load(); bind_tries++)
+	{
+		server_running.store(server.listen(server_port) == sf::Socket::Done);
+		if (!server_running.load())
+			server_port++;
+	}
+
+	if (!server_running.load())
+		return;
+
+	Core::DisplayMessage(
+		StringFromFormat("USBGecko: Listening on TCP port %u", server_port),
+		5000);
+
+	server.setBlocking(false);
+
+	auto new_client = std::make_unique<sf::TcpSocket>();
+	while (server_running.load())
+	{
+		if (server.accept(*new_client) == sf::Socket::Done)
+		{
+			std::lock_guard<std::mutex> lk(connection_lock);
+			waiting_socks.push(std::move(new_client));
+
+			new_client = std::make_unique<sf::TcpSocket>();
+		}
+		SLEEP(1);
+	}
+}
+
+bool GeckoSockServer::GetAvailableSock()
+{
+	bool sock_filled = false;
+
+	std::lock_guard<std::mutex> lk(connection_lock);
+
+	if (!waiting_socks.empty())
+	{
+		client = std::move(waiting_socks.front());
+		if (clientThread.joinable())
+		{
+			client_running.store(false);
+			clientThread.join();
+
+			recv_fifo = std::deque<u8>();
+			send_fifo = std::deque<u8>();
+		}
+		clientThread = std::thread(&GeckoSockServer::ClientThread, this);
+		client_count++;
+		waiting_socks.pop();
+		sock_filled = true;
+	}
+
+	return sock_filled;
+}
+
+void GeckoSockServer::ClientThread()
+{
+	client_running.store(true);
+
+	Common::SetCurrentThreadName("Gecko Client");
+
+	client->setBlocking(false);
+
+	while (client_running.load())
+	{
+		bool did_nothing = true;
+
+		{
+		std::lock_guard<std::mutex> lk(transfer_lock);
+
+		// what's an ideal buffer size?
+		char data[128];
+		std::size_t got = 0;
+
+		if (client->receive(&data[0], ArraySize(data), got) == sf::Socket::Disconnected)
+			client_running.store(false);
+
+		if (got != 0)
+		{
+			did_nothing = false;
+
+			recv_fifo.insert(recv_fifo.end(), &data[0], &data[got]);
+		}
+
+		if (!send_fifo.empty())
+		{
+			did_nothing = false;
+
+			std::vector<char> packet(send_fifo.begin(), send_fifo.end());
+			send_fifo.clear();
+
+			if (client->send(&packet[0], packet.size()) == sf::Socket::Disconnected)
+				client_running.store(false);
+		}
+		} // unlock transfer
+
+		if (did_nothing)
+			Common::YieldCPU();
+	}
+
+	client->disconnect();
+}
+
+void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize)
+{
+	// We don't really care about _uSize
+	(void)_uSize;
+
+	if (!client || client->getLocalPort() == 0)
+		GetAvailableSock();
+
+	switch (_uData >> 28)
+	{
+	case CMD_LED_OFF:
+		Core::DisplayMessage(StringFromFormat(
+			"USBGecko: No LEDs for you!"),
+			3000);
+		break;
+	case CMD_LED_ON:
+		Core::DisplayMessage(StringFromFormat(
+			"USBGecko: A piercing blue light is now shining in your general direction"),
+			3000);
+		break;
+
+	case CMD_INIT:
+		_uData = ident;
+		break;
+
+		// PC -> Gecko
+		// |= 0x08000000 if successful
+	case CMD_RECV:
+		{
+		std::lock_guard<std::mutex> lk(transfer_lock);
+		if (!recv_fifo.empty())
+		{
+			_uData = 0x08000000 | (recv_fifo.front() << 16);
+			recv_fifo.pop_front();
+		}
+		break;
+		}
+
+		// Gecko -> PC
+		// |= 0x04000000 if successful
+	case CMD_SEND:
+		{
+		std::lock_guard<std::mutex> lk(transfer_lock);
+		send_fifo.push_back(_uData >> 20);
+		_uData = 0x04000000;
+		break;
+		}
+
+		// Check if ok for Gecko -> PC, or FIFO full
+		// |= 0x04000000 if FIFO is not full
+	case CMD_CHK_TX:
+		_uData = 0x04000000;
+		break;
+
+		// Check if data in FIFO for PC -> Gecko, or FIFO empty
+		// |= 0x04000000 if data in recv FIFO
+	case CMD_CHK_RX:
+		{
+		std::lock_guard<std::mutex> lk(transfer_lock);
+		_uData = recv_fifo.empty() ? 0 : 0x04000000;
+		break;
+		}
+
+	default:
+		ERROR_LOG(EXPANSIONINTERFACE, "Unknown USBGecko command %x", _uData);
+		break;
+	}
+}
diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI_DeviceGecko.h
new file mode 100644
index 0000000000..3b60406e82
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceGecko.h
@@ -0,0 +1,70 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <deque>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <thread>
+#include <SFML/Network.hpp>
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/EXI_Device.h"
+
+class GeckoSockServer
+{
+public:
+	GeckoSockServer();
+	~GeckoSockServer();
+	bool GetAvailableSock();
+
+	// Client for this server object
+	std::unique_ptr<sf::TcpSocket> client;
+	void ClientThread();
+	std::thread clientThread;
+	std::mutex transfer_lock;
+
+	std::deque<u8> send_fifo;
+	std::deque<u8> recv_fifo;
+
+private:
+	static int        client_count;
+	std::atomic<bool> client_running;
+
+	// Only ever one server thread
+	static void GeckoConnectionWaiter();
+
+	static u16                       server_port;
+	static std::atomic<bool>         server_running;
+	static std::thread               connectionThread;
+	static std::mutex                connection_lock;
+	static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_socks;
+};
+
+class CEXIGecko
+	: public IEXIDevice
+	, private GeckoSockServer
+{
+public:
+	CEXIGecko() {}
+	bool IsPresent() const override { return true; }
+	void ImmReadWrite(u32 &_uData, u32 _uSize) override;
+
+private:
+	enum
+	{
+		CMD_LED_OFF = 0x7,
+		CMD_LED_ON  = 0x8,
+		CMD_INIT    = 0x9,
+		CMD_RECV    = 0xa,
+		CMD_SEND    = 0xb,
+		CMD_CHK_TX  = 0xc,
+		CMD_CHK_RX  = 0xd,
+	};
+
+	static const u32 ident = 0x04700000;
+};
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp
similarity index 81%
rename from Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
rename to Source/Core/Core/HW/EXI_DeviceIPL.cpp
index 9402b7bbab..fe6e00ccba 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp
@@ -1,29 +1,32 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Timer.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/Timer.h"
 
-#include "EXI_DeviceIPL.h"
-#include "../Core.h"
-#include "../ConfigManager.h"
-#include "MemoryUtil.h"
-#include "FileUtil.h"
-#include "../Movie.h"
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Sram.h"
+#include "Core/HW/SystemTimers.h"
 
 // We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong)
 // so that people can change default language.
 
-static const char iplverPAL[0x100] = "(C) 1999-2001 Nintendo.  All rights reserved."
-									 "(C) 1999 ArtX Inc.  All rights reserved."
-									 "PAL  Revision 1.0  ";
+static const char iplverPAL[0x100]  = "(C) 1999-2001 Nintendo.  All rights reserved."
+                                      "(C) 1999 ArtX Inc.  All rights reserved."
+                                      "PAL  Revision 1.0  ";
 
-static const char iplverNTSC[0x100]= "(C) 1999-2001 Nintendo.  All rights reserved."
-									 "(C) 1999 ArtX Inc.  All rights reserved.";
+static const char iplverNTSC[0x100] = "(C) 1999-2001 Nintendo.  All rights reserved."
+                                      "(C) 1999 ArtX Inc.  All rights reserved.";
 
 // bootrom descrambler reversed by segher
 // Copyright 2008 Segher Boessenkool <segher@kernel.crashing.org>
@@ -82,17 +85,14 @@ CEXIIPL::CEXIIPL() :
 	m_uPosition(0),
 	m_uAddress(0),
 	m_uRWOffset(0),
-	m_count(0),
 	m_FontsLoaded(false)
 {
-	memset(m_szBuffer,0,sizeof(m_szBuffer));
-
 	// Determine region
 	m_bNTSC = SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC;
 
 	// Create the IPL
 	m_pIPL = (u8*)AllocateMemoryPages(ROM_SIZE);
-	
+
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2)
 	{
 		// Copy header
@@ -114,26 +114,18 @@ CEXIIPL::CEXIIPL() :
 	// Clear RTC
 	memset(m_RTC, 0, sizeof(m_RTC));
 
-
 	// We Overwrite language selection here since it's possible on the GC to change the language as you please
 	g_SRAM.lang = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
+	FixSRAMChecksums();
 
 	WriteProtectMemory(m_pIPL, ROM_SIZE);
-	m_uAddress = 0;		
+	m_uAddress = 0;
 }
 
 CEXIIPL::~CEXIIPL()
 {
-	if (m_count > 0)
-	{
-		m_szBuffer[m_count] = 0x00;
-	}
-
-	if (m_pIPL != NULL)
-	{
-		FreeMemoryPages(m_pIPL, ROM_SIZE);
-		m_pIPL = NULL;
-	}
+	FreeMemoryPages(m_pIPL, ROM_SIZE);
+	m_pIPL = nullptr;
 
 	// SRAM
 	File::IOFile file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strSRAM, "wb");
@@ -145,12 +137,11 @@ void CEXIIPL::DoState(PointerWrap &p)
 	p.Do(m_uPosition);
 	p.Do(m_uAddress);
 	p.Do(m_uRWOffset);
-	p.Do(m_szBuffer);
-	p.Do(m_count);
+	p.Do(m_buffer);
 	p.Do(m_FontsLoaded);
 }
 
-void CEXIIPL::LoadFileToIPL(std::string filename, u32 offset)
+void CEXIIPL::LoadFileToIPL(const std::string& filename, u32 offset)
 {
 	File::IOFile pStream(filename, "rb");
 	if (pStream)
@@ -172,7 +163,7 @@ void CEXIIPL::SetCS(int _iCS)
 	}
 }
 
-bool CEXIIPL::IsPresent()
+bool CEXIIPL::IsPresent() const
 {
 	return true;
 }
@@ -252,7 +243,7 @@ void CEXIIPL::TransferByte(u8& _uByte)
 			DEBUG_LOG(EXPANSIONINTERFACE, "%s %s %08x", device_name.c_str(),
 				IsWriteCommand() ? "write" : "read", m_uAddress);
 		}
-	} 
+	}
 	else
 	{
 		// Actually read or write a byte
@@ -277,13 +268,12 @@ void CEXIIPL::TransferByte(u8& _uByte)
 			if (IsWriteCommand())
 			{
 				if (_uByte != '\0')
-					m_szBuffer[m_count++] = _uByte;
-				if ((m_count >= 256) || (_uByte == 0xD))
-				{					
-					m_szBuffer[m_count] = 0x00;
-					NOTICE_LOG(OSREPORT, "%s", m_szBuffer);
-					memset(m_szBuffer, 0, sizeof(m_szBuffer));
-					m_count = 0;
+					m_buffer += _uByte;
+
+				if (_uByte == '\r')
+				{
+					NOTICE_LOG(OSREPORT, "%s", m_buffer.c_str());
+					m_buffer.clear();
 				}
 			}
 			else
@@ -310,7 +300,7 @@ void CEXIIPL::TransferByte(u8& _uByte)
 		case REGION_WRTC0:
 		case REGION_WRTC1:
 		case REGION_WRTC2:
-			// WII only RTC flags... afaik just the wii menu initialize it
+			// Wii only RTC flags... afaik just the Wii Menu initialize it
 		default:
 			if ((m_uAddress >> 6) < ROM_SIZE)
 			{
@@ -352,20 +342,23 @@ u32 CEXIIPL::GetGCTime()
 	u64 ltime = 0;
 	static const u32 cJanuary2000 = 0x386D4380;  // Seconds between 1.1.1970 and 1.1.2000
 
-	if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
+	if (Movie::IsMovieActive())
 	{
 		ltime = Movie::GetRecordingStartTime();
 
 		// let's keep time moving forward, regardless of what it starts at
 		ltime += CoreTiming::GetTicks() / SystemTimers::GetTicksPerSecond();
 	}
-	else
+	else if (NetPlay::IsNetPlayRunning())
 	{
-		// hack in some netplay stuff
 		ltime = NetPlay_GetGCTime();
 
-		if (0 == ltime)
-			ltime = Common::Timer::GetLocalTimeSinceJan1970();
+		// let's keep time moving forward, regardless of what it starts at
+		ltime += CoreTiming::GetTicks() / SystemTimers::GetTicksPerSecond();
+	}
+	else
+	{
+		ltime = Common::Timer::GetLocalTimeSinceJan1970();
 	}
 
 	return ((u32)ltime - cJanuary2000);
@@ -377,7 +370,7 @@ u32 CEXIIPL::GetGCTime()
 	// Get SRAM bias
 	u32 Bias;
 
-	for (int i=0; i<4; i++)
+	for (int i = 0; i < 4; i++)
 	{
 		((u8*)&Bias)[i] = sram_dump[0xc + (i^3)];
 	}
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h
new file mode 100644
index 0000000000..b7b80b3a69
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceIPL.h
@@ -0,0 +1,72 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Core/HW/EXI_Device.h"
+
+class PointerWrap;
+
+class CEXIIPL : public IEXIDevice
+{
+public:
+	CEXIIPL();
+	virtual ~CEXIIPL();
+
+	virtual void SetCS(int _iCS) override;
+	bool IsPresent() const override;
+	void DoState(PointerWrap &p) override;
+
+	static u32 GetGCTime();
+	static u64 NetPlay_GetGCTime();
+
+	static void Descrambler(u8* data, u32 size);
+
+private:
+	enum
+	{
+		ROM_SIZE = 1024*1024*2,
+		ROM_MASK = (ROM_SIZE - 1)
+	};
+
+	enum
+	{
+		REGION_RTC       = 0x200000,
+		REGION_SRAM      = 0x200001,
+		REGION_UART      = 0x200100,
+		REGION_UART_UNK  = 0x200103,
+		REGION_BARNACLE  = 0x200113,
+		REGION_WRTC0     = 0x210000,
+		REGION_WRTC1     = 0x210001,
+		REGION_WRTC2     = 0x210008,
+		REGION_EUART_UNK = 0x300000,
+		REGION_EUART     = 0x300001
+	};
+
+	// Region
+	bool m_bNTSC;
+
+	//! IPL
+	u8* m_pIPL;
+
+	// STATE_TO_SAVE
+	//! RealTimeClock
+	u8 m_RTC[4];
+
+	//! Helper
+	u32 m_uPosition;
+	u32 m_uAddress;
+	u32 m_uRWOffset;
+
+	std::string m_buffer;
+	bool m_FontsLoaded;
+
+	virtual void TransferByte(u8 &_uByte) override;
+	bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
+	u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }
+
+	void LoadFileToIPL(const std::string& filename, u32 offset);
+};
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
new file mode 100644
index 0000000000..f60631de79
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
@@ -0,0 +1,565 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Channel.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceMemoryCard.h"
+#include "Core/HW/GCMemcard.h"
+#include "Core/HW/GCMemcardDirectory.h"
+#include "Core/HW/GCMemcardRaw.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/Sram.h"
+#include "Core/HW/SystemTimers.h"
+#include "DiscIO/NANDContentLoader.h"
+
+#define MC_STATUS_BUSY              0x80
+#define MC_STATUS_UNLOCKED          0x40
+#define MC_STATUS_SLEEP             0x20
+#define MC_STATUS_ERASEERROR        0x10
+#define MC_STATUS_PROGRAMEERROR     0x08
+#define MC_STATUS_READY             0x01
+#define SIZE_TO_Mb (1024 * 8 * 16)
+
+static const u32 MC_TRANSFER_RATE_READ = 512 * 1024;
+static const u32 MC_TRANSFER_RATE_WRITE = (u32)(96.125f * 1024.0f);
+
+// Takes care of the nasty recovery of the 'this' pointer from card_index,
+// stored in the userdata parameter of the CoreTiming event.
+void CEXIMemoryCard::EventCompleteFindInstance(u64 userdata, std::function<void(CEXIMemoryCard*)> callback)
+{
+	int card_index = (int)userdata;
+	CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(
+		EXIDEVICE_MEMORYCARD, card_index);
+	if (pThis == nullptr)
+	{
+		pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(
+			EXIDEVICE_MEMORYCARDFOLDER, card_index);
+	}
+	if (pThis)
+	{
+		callback(pThis);
+	}
+}
+
+void CEXIMemoryCard::CmdDoneCallback(u64 userdata, int cyclesLate)
+{
+	EventCompleteFindInstance(userdata, [](CEXIMemoryCard* instance)
+	{
+		instance->CmdDone();
+	});
+}
+
+void CEXIMemoryCard::TransferCompleteCallback(u64 userdata, int cyclesLate)
+{
+	EventCompleteFindInstance(userdata, [](CEXIMemoryCard* instance)
+	{
+		instance->TransferComplete();
+	});
+}
+
+CEXIMemoryCard::CEXIMemoryCard(const int index, bool gciFolder)
+	: card_index(index)
+{
+	struct
+	{
+		const char *done;
+		const char *transfer_complete;
+	} const event_names[] = {
+		{ "memcardDoneA", "memcardTransferCompleteA" },
+		{ "memcardDoneB", "memcardTransferCompleteB" },
+	};
+
+	if ((size_t)index >= ArraySize(event_names))
+	{
+		PanicAlertT("Trying to create invalid memory card index.");
+	}
+	// we're potentially leaking events here, since there's no RemoveEvent
+	// until emu shutdown, but I guess it's inconsequential
+	et_cmd_done = CoreTiming::RegisterEvent(event_names[index].done,
+		CmdDoneCallback);
+	et_transfer_complete = CoreTiming::RegisterEvent(
+		event_names[index].transfer_complete, TransferCompleteCallback);
+
+	interruptSwitch = 0;
+	m_bInterruptSet = 0;
+	command = 0;
+	status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY;
+	m_uPosition = 0;
+	memset(programming_buffer, 0, sizeof(programming_buffer));
+	//Nintendo Memory Card EXI IDs
+	//0x00000004 Memory Card 59     4Mbit
+	//0x00000008 Memory Card 123    8Mb
+	//0x00000010 Memory Card 251    16Mb
+	//0x00000020 Memory Card 507    32Mb
+	//0x00000040 Memory Card 1019   64Mb
+	//0x00000080 Memory Card 2043   128Mb
+
+	//0x00000510 16Mb "bigben" card
+	//card_id = 0xc243;
+	card_id = 0xc221; // It's a Nintendo brand memcard
+
+	// The following games have issues with memory cards bigger than 16Mb
+	// Darkened Skye GDQE6S GDQP6S
+	// WTA Tour Tennis GWTEA4 GWTJA4 GWTPA4
+	// Disney Sports : Skate Boarding GDXEA4 GDXPA4 GDXJA4
+	// Disney Sports : Soccer GDKEA4
+	// Use a 16Mb (251 block) memory card for these games
+	bool useMC251;
+	IniFile gameIni = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
+	gameIni.GetOrCreateSection("Core")->Get("MemoryCard251", &useMC251, false);
+	u16 sizeMb = useMC251 ? MemCard251Mb : MemCard2043Mb;
+
+	if (gciFolder)
+	{
+		SetupGciFolder(sizeMb);
+	}
+	else
+	{
+		SetupRawMemcard(sizeMb);
+	}
+
+	memory_card_size = memorycard->GetCardId() * SIZE_TO_Mb;
+	u8 header[20] = {0};
+	memorycard->Read(0, ArraySize(header), header);
+	SetCardFlashID(header, card_index);
+}
+
+void CEXIMemoryCard::SetupGciFolder(u16 sizeMb)
+{
+	DiscIO::IVolume::ECountry country_code = DiscIO::IVolume::COUNTRY_UNKNOWN;
+	auto strUniqueID = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
+
+	u32 CurrentGameId = 0;
+	if (strUniqueID == TITLEID_SYSMENU_STRING)
+	{
+		const DiscIO::INANDContentLoader & SysMenu_Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU, false);
+		if (SysMenu_Loader.IsValid())
+		{
+			country_code = DiscIO::CountrySwitch(SysMenu_Loader.GetCountryChar());
+		}
+	}
+	else if (strUniqueID.length() >= 4)
+	{
+		country_code = DiscIO::CountrySwitch(strUniqueID.at(3));
+		CurrentGameId = BE32((u8*)strUniqueID.c_str());
+	}
+	bool ascii = true;
+	std::string strDirectoryName = File::GetUserPath(D_GCUSER_IDX);
+	switch (country_code)
+	{
+	case DiscIO::IVolume::COUNTRY_JAPAN:
+		ascii = false;
+		strDirectoryName += JAP_DIR DIR_SEP;
+		break;
+	case DiscIO::IVolume::COUNTRY_USA:
+		strDirectoryName += USA_DIR DIR_SEP;
+		break;
+	case DiscIO::IVolume::COUNTRY_UNKNOWN:
+	{
+		// The current game's region is not passed down to the EXI device level.
+		// Usually, we can retrieve the region from SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueId.
+		// The Wii System Menu requires a lookup based on the version number.
+		// This is not possible in some cases ( e.g. FIFO logs, homebrew elf/dol files).
+		// Instead, we then lookup the region from the memory card name
+		// Earlier in the boot process the region is added to the memory card name (This is done by the function checkMemcardPath)
+		// For now take advantage of this.
+		// Future options:
+		// 			Set memory card directory path in the checkMemcardPath function.
+		// 	or		Add region to SConfig::GetInstance().m_LocalCoreStartupParameter.
+		// 	or		Pass region down to the EXI device creation.
+
+		std::string memcardFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
+		std::string region = memcardFilename.substr(memcardFilename.size() - 7, 3);
+		if (region == JAP_DIR)
+		{
+			country_code = DiscIO::IVolume::COUNTRY_JAPAN;
+			ascii = false;
+			strDirectoryName += JAP_DIR DIR_SEP;
+			break;
+		}
+		else if (region == USA_DIR)
+		{
+			country_code = DiscIO::IVolume::COUNTRY_USA;
+			strDirectoryName += USA_DIR DIR_SEP;
+			break;
+		}
+	}
+	default:
+		country_code = DiscIO::IVolume::COUNTRY_EUROPE;
+		strDirectoryName += EUR_DIR DIR_SEP;
+	}
+	strDirectoryName += StringFromFormat("Card %c", 'A' + card_index);
+
+	if (!File::Exists(strDirectoryName)) // first use of memcard folder, migrate automatically
+	{
+		MigrateFromMemcardFile(strDirectoryName + DIR_SEP, card_index);
+	}
+	else if (!File::IsDirectory(strDirectoryName))
+	{
+		if (File::Rename(strDirectoryName, strDirectoryName + ".original"))
+		{
+			PanicAlertT("%s was not a directory, moved to *.original", strDirectoryName.c_str());
+			MigrateFromMemcardFile(strDirectoryName + DIR_SEP, card_index);
+		}
+		else // we tried but the user wants to crash
+		{
+			// TODO more user friendly abort
+			PanicAlertT("%s is not a directory, failed to move to *.original.\n Verify your write permissions or move "
+						"the file outside of Dolphin",
+						strDirectoryName.c_str());
+			exit(0);
+		}
+	}
+
+	memorycard = std::make_unique<GCMemcardDirectory>(strDirectoryName + DIR_SEP, card_index, sizeMb, ascii,
+													  country_code, CurrentGameId);
+}
+
+void CEXIMemoryCard::SetupRawMemcard(u16 sizeMb)
+{
+	std::string filename =
+		(card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard(card_index) &&
+		Movie::IsStartingFromClearSave())
+		filename = File::GetUserPath(D_GCUSER_IDX) + StringFromFormat("Movie%s.raw", (card_index == 0) ? "A" : "B");
+
+	if (sizeMb == MemCard251Mb)
+	{
+		filename.insert(filename.find_last_of("."), ".251");
+	}
+	memorycard = std::make_unique<MemoryCard>(filename, card_index, sizeMb);
+}
+
+CEXIMemoryCard::~CEXIMemoryCard()
+{
+	CoreTiming::RemoveEvent(et_cmd_done);
+	CoreTiming::RemoveEvent(et_transfer_complete);
+}
+
+bool CEXIMemoryCard::UseDelayedTransferCompletion() const
+{
+	return true;
+}
+
+bool CEXIMemoryCard::IsPresent() const
+{
+	return true;
+}
+
+void CEXIMemoryCard::CmdDone()
+{
+	status |= MC_STATUS_READY;
+	status &= ~MC_STATUS_BUSY;
+
+	m_bInterruptSet = 1;
+	ExpansionInterface::UpdateInterrupts();
+}
+
+void CEXIMemoryCard::TransferComplete()
+{
+	// Transfer complete, send interrupt
+	ExpansionInterface::GetChannel(card_index)->SendTransferComplete();
+}
+
+void CEXIMemoryCard::CmdDoneLater(u64 cycles)
+{
+	CoreTiming::RemoveEvent(et_cmd_done);
+	CoreTiming::ScheduleEvent((int)cycles, et_cmd_done, (u64)card_index);
+}
+
+void CEXIMemoryCard::SetCS(int cs)
+{
+	if (cs)  // not-selected to selected
+	{
+		m_uPosition = 0;
+	}
+	else
+	{
+		switch (command)
+		{
+		case cmdSectorErase:
+			if (m_uPosition > 2)
+			{
+				memorycard->ClearBlock(address & (memory_card_size - 1));
+				status |= MC_STATUS_BUSY;
+				status &= ~MC_STATUS_READY;
+
+				//???
+
+				CmdDoneLater(5000);
+			}
+			break;
+
+		case cmdChipErase:
+			if (m_uPosition > 2)
+			{
+				// TODO: Investigate on HW, I (LPFaint99) believe that this only
+				// erases the system area (Blocks 0-4)
+				memorycard->ClearAll();
+				status &= ~MC_STATUS_BUSY;
+			}
+			break;
+
+		case cmdPageProgram:
+			if (m_uPosition >= 5)
+			{
+				int count = m_uPosition - 5;
+				int i = 0;
+				status &= ~0x80;
+
+				while (count--)
+				{
+					memorycard->Write(address, 1, &(programming_buffer[i++]));
+					i &= 127;
+					address = (address & ~0x1FF) | ((address + 1) & 0x1FF);
+				}
+
+				CmdDoneLater(5000);
+			}
+			break;
+		}
+	}
+}
+
+bool CEXIMemoryCard::IsInterruptSet()
+{
+	if (interruptSwitch)
+		return m_bInterruptSet;
+	return false;
+}
+
+void CEXIMemoryCard::TransferByte(u8 &byte)
+{
+	DEBUG_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: > %02x", byte);
+	if (m_uPosition == 0)
+	{
+		command = byte;  // first byte is command
+		byte = 0xFF; // would be tristate, but we don't care.
+
+		switch (command) // This seems silly, do we really need it?
+		{
+		case cmdNintendoID:
+		case cmdReadArray:
+		case cmdArrayToBuffer:
+		case cmdSetInterrupt:
+		case cmdWriteBuffer:
+		case cmdReadStatus:
+		case cmdReadID:
+		case cmdReadErrorBuffer:
+		case cmdWakeUp:
+		case cmdSleep:
+		case cmdClearStatus:
+		case cmdSectorErase:
+		case cmdPageProgram:
+		case cmdExtraByteProgram:
+		case cmdChipErase:
+			INFO_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: command %02x at position 0. seems normal.", command);
+			break;
+		default:
+			WARN_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: command %02x at position 0", command);
+			break;
+		}
+		if (command == cmdClearStatus)
+		{
+			status &= ~MC_STATUS_PROGRAMEERROR;
+			status &= ~MC_STATUS_ERASEERROR;
+
+			status |= MC_STATUS_READY;
+
+			m_bInterruptSet = 0;
+
+			byte = 0xFF;
+			m_uPosition = 0;
+		}
+	}
+	else
+	{
+		switch (command)
+		{
+		case cmdNintendoID:
+			//
+			// Nintendo card:
+			// 00 | 80 00 00 00 10 00 00 00
+			// "bigben" card:
+			// 00 | ff 00 00 05 10 00 00 00 00 00 00 00 00 00 00
+			// we do it the Nintendo way.
+			if (m_uPosition == 1)
+				byte = 0x80; // dummy cycle
+			else
+				byte = (u8)(memorycard->GetCardId() >> (24 - (((m_uPosition - 2) & 3) * 8)));
+			break;
+
+		case cmdReadArray:
+			switch (m_uPosition)
+			{
+			case 1: // AD1
+				address = byte << 17;
+				byte = 0xFF;
+				break;
+			case 2: // AD2
+				address |= byte << 9;
+				break;
+			case 3: // AD3
+				address |= (byte & 3) << 7;
+				break;
+			case 4: // BA
+				address |= (byte & 0x7F);
+				break;
+			}
+			if (m_uPosition > 1) // not specified for 1..8, anyway
+			{
+				memorycard->Read(address & (memory_card_size - 1), 1, &byte);
+				// after 9 bytes, we start incrementing the address,
+				// but only the sector offset - the pointer wraps around
+				if (m_uPosition >= 9)
+					address = (address & ~0x1FF) | ((address + 1) & 0x1FF);
+			}
+			break;
+
+		case cmdReadStatus:
+			// (unspecified for byte 1)
+			byte = status;
+			break;
+
+		case cmdReadID:
+			if (m_uPosition == 1) // (unspecified)
+				byte = (u8)(card_id >> 8);
+			else
+				byte = (u8)((m_uPosition & 1) ? (card_id) : (card_id >> 8));
+			break;
+
+		case cmdSectorErase:
+			switch (m_uPosition)
+			{
+			case 1: // AD1
+				address = byte << 17;
+				break;
+			case 2: // AD2
+				address |= byte << 9;
+				break;
+			}
+			byte = 0xFF;
+			break;
+
+		case cmdSetInterrupt:
+			if (m_uPosition == 1)
+			{
+				interruptSwitch = byte;
+			}
+			byte = 0xFF;
+			break;
+
+		case cmdChipErase:
+			byte = 0xFF;
+			break;
+
+		case cmdPageProgram:
+			switch (m_uPosition)
+			{
+			case 1: // AD1
+				address = byte << 17;
+				break;
+			case 2: // AD2
+				address |= byte << 9;
+				break;
+			case 3: // AD3
+				address |= (byte & 3) << 7;
+				break;
+			case 4: // BA
+				address |= (byte & 0x7F);
+				break;
+			}
+
+			if (m_uPosition >= 5)
+				programming_buffer[((m_uPosition - 5) & 0x7F)] = byte; // wrap around after 128 bytes
+
+			byte = 0xFF;
+			break;
+
+		default:
+			WARN_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: unknown command byte %02x\n", byte);
+			byte = 0xFF;
+		}
+	}
+	m_uPosition++;
+	DEBUG_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: < %02x", byte);
+}
+
+void CEXIMemoryCard::DoState(PointerWrap &p)
+{
+	// for movie sync, we need to save/load memory card contents (and other data) in savestates.
+	// otherwise, we'll assume the user wants to keep their memcards and saves separate,
+	// unless we're loading (in which case we let the savestate contents decide, in order to stay aligned with them).
+	bool storeContents = (Movie::IsMovieActive());
+	p.Do(storeContents);
+
+	if (storeContents)
+	{
+		p.Do(interruptSwitch);
+		p.Do(m_bInterruptSet);
+		p.Do(command);
+		p.Do(status);
+		p.Do(m_uPosition);
+		p.Do(programming_buffer);
+		p.Do(address);
+		memorycard->DoState(p);
+		p.Do(card_index);
+	}
+}
+
+IEXIDevice* CEXIMemoryCard::FindDevice(TEXIDevices device_type, int customIndex)
+{
+	if (device_type != m_deviceType)
+		return nullptr;
+	if (customIndex != card_index)
+		return nullptr;
+	return this;
+}
+
+// DMA reads are preceded by all of the necessary setup via IMMRead
+// read all at once instead of single byte at a time as done by IEXIDevice::DMARead
+void CEXIMemoryCard::DMARead(u32 _uAddr, u32 _uSize)
+{
+	memorycard->Read(address, _uSize, Memory::GetPointer(_uAddr));
+
+	if ((address + _uSize) % BLOCK_SIZE == 0)
+	{
+		DEBUG_LOG(EXPANSIONINTERFACE, "reading from block: %x",
+			address / BLOCK_SIZE);
+	}
+
+	// Schedule transfer complete later based on read speed
+	CoreTiming::ScheduleEvent(
+		_uSize * (SystemTimers::GetTicksPerSecond() / MC_TRANSFER_RATE_READ),
+		et_transfer_complete, (u64)card_index);
+}
+
+// DMA write are preceded by all of the necessary setup via IMMWrite
+// write all at once instead of single byte at a time as done by IEXIDevice::DMAWrite
+void CEXIMemoryCard::DMAWrite(u32 _uAddr, u32 _uSize)
+{
+	memorycard->Write(address, _uSize, Memory::GetPointer(_uAddr));
+
+	if (((address + _uSize) % BLOCK_SIZE) == 0)
+	{
+		DEBUG_LOG(EXPANSIONINTERFACE, "writing to block: %x",
+			address / BLOCK_SIZE);
+	}
+
+	// Schedule transfer complete later based on write speed
+	CoreTiming::ScheduleEvent(
+		_uSize * (SystemTimers::GetTicksPerSecond() / MC_TRANSFER_RATE_WRITE),
+		et_transfer_complete, (u64)card_index);
+}
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
new file mode 100644
index 0000000000..87932e45da
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
@@ -0,0 +1,87 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include "Core/HW/EXI_Device.h"
+
+class MemoryCardBase;
+class PointerWrap;
+
+class CEXIMemoryCard : public IEXIDevice
+{
+public:
+	CEXIMemoryCard(const int index, bool gciFolder);
+	virtual ~CEXIMemoryCard();
+	void SetCS(int cs) override;
+	bool IsInterruptSet() override;
+	bool UseDelayedTransferCompletion() const override;
+	bool IsPresent() const override;
+	void DoState(PointerWrap &p) override;
+	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex = -1) override;
+	void DMARead(u32 _uAddr, u32 _uSize) override;
+	void DMAWrite(u32 _uAddr, u32 _uSize) override;
+
+private:
+	void SetupGciFolder(u16 sizeMb);
+	void SetupRawMemcard(u16 sizeMb);
+	static void EventCompleteFindInstance(u64 userdata, std::function<void(CEXIMemoryCard*)> callback);
+
+	// Scheduled when a command that required delayed end signaling is done.
+	static void CmdDoneCallback(u64 userdata, int cyclesLate);
+
+	// Scheduled when memory card is done transferring data
+	static void TransferCompleteCallback(u64 userdata, int cyclesLate);
+
+	// Signals that the command that was previously executed is now done.
+	void CmdDone();
+
+	// Signals that the transfer that was previously executed is now done.
+	void TransferComplete();
+
+	// Variant of CmdDone which schedules an event later in the future to complete the command.
+	void CmdDoneLater(u64 cycles);
+
+	enum
+	{
+		cmdNintendoID       = 0x00,
+		cmdReadArray        = 0x52,
+		cmdArrayToBuffer    = 0x53,
+		cmdSetInterrupt     = 0x81,
+		cmdWriteBuffer      = 0x82,
+		cmdReadStatus       = 0x83,
+		cmdReadID           = 0x85,
+		cmdReadErrorBuffer  = 0x86,
+		cmdWakeUp           = 0x87,
+		cmdSleep            = 0x88,
+		cmdClearStatus      = 0x89,
+		cmdSectorErase      = 0xF1,
+		cmdPageProgram      = 0xF2,
+		cmdExtraByteProgram = 0xF3,
+		cmdChipErase        = 0xF4,
+	};
+
+	int card_index;
+	int et_cmd_done, et_transfer_complete;
+	//! memory card state
+
+	// STATE_TO_SAVE
+	int interruptSwitch;
+	bool m_bInterruptSet;
+	int command;
+	int status;
+	u32 m_uPosition;
+	u8 programming_buffer[128];
+	//! memory card parameters
+	unsigned int card_id;
+	unsigned int address;
+	u32 memory_card_size;
+	std::unique_ptr<MemoryCardBase> memorycard;
+
+protected:
+	virtual void TransferByte(u8 &byte) override;
+};
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp
similarity index 89%
rename from Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
rename to Source/Core/Core/HW/EXI_DeviceMic.cpp
index 4a5b3cc0ae..c12e4f6ddf 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp
@@ -1,21 +1,20 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 #if HAVE_PORTAUDIO
 
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceMic.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceMic.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/SystemTimers.h"
 
 #include <portaudio.h>
 
-#include "GCPad.h"
-
 void CEXIMic::StreamLog(const char *msg)
 {
 	DEBUG_LOG(EXPANSIONINTERFACE, "%s: %s",
@@ -117,7 +116,7 @@ void CEXIMic::StreamStop()
 void CEXIMic::StreamReadOne()
 {
 	std::lock_guard<std::mutex> lk(ring_lock);
-	
+
 	if (samples_avail >= buff_size_samples)
 	{
 		s16 *last_buffer = &stream_buffer[stream_rpos];
@@ -149,10 +148,10 @@ CEXIMic::CEXIMic(int index)
 	sample_rate = rate_base;
 	buff_size = ring_base;
 	buff_size_samples = buff_size / sample_size;
-	
+
 	ring_pos = 0;
 	memset(ring_buffer, 0, sizeof(ring_buffer));
-	
+
 	next_int_ticks = 0;
 
 	StreamInit();
@@ -163,7 +162,7 @@ CEXIMic::~CEXIMic()
 	StreamTerminate();
 }
 
-bool CEXIMic::IsPresent()
+bool CEXIMic::IsPresent() const
 {
 	return true;
 }
@@ -178,8 +177,9 @@ void CEXIMic::SetCS(int cs)
 
 void CEXIMic::UpdateNextInterruptTicks()
 {
-	next_int_ticks = CoreTiming::GetTicks() +
-		(SystemTimers::GetTicksPerSecond() / sample_rate) *	buff_size_samples;
+	int diff = (SystemTimers::GetTicksPerSecond() / sample_rate) * buff_size_samples;
+	next_int_ticks = CoreTiming::GetTicks() + diff;
+	ExpansionInterface::ScheduleUpdateInterrupts(diff);
 }
 
 bool CEXIMic::IsInterruptSet()
@@ -203,8 +203,8 @@ void CEXIMic::TransferByte(u8 &byte)
 {
 	if (m_position == 0)
 	{
-		command = byte;	// first byte is command
-		byte = 0xFF;	// would be tristate, but we don't care.
+		command = byte; // first byte is command
+		byte = 0xFF;    // would be tristate, but we don't care.
 		m_position++;
 		return;
 	}
@@ -222,7 +222,7 @@ void CEXIMic::TransferByte(u8 &byte)
 			status.button = Pad::GetMicButton(slot);
 
 		byte = status.U8[pos ^ 1];
-		
+
 		if (pos == 1)
 			status.buff_ovrflw = 0;
 		break;
@@ -240,7 +240,7 @@ void CEXIMic::TransferByte(u8 &byte)
 			buff_size_samples = buff_size / sample_size;
 
 			UpdateNextInterruptTicks();
-			
+
 			StreamStart();
 		}
 		else if (wasactive && !status.is_active)
@@ -254,7 +254,7 @@ void CEXIMic::TransferByte(u8 &byte)
 		{
 		if (ring_pos == 0)
 			StreamReadOne();
-		
+
 		byte = ring_buffer[ring_pos ^ 1];
 		ring_pos = (ring_pos + 1) % buff_size;
 		}
diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h
new file mode 100644
index 0000000000..e61d1965eb
--- /dev/null
+++ b/Source/Core/Core/HW/EXI_DeviceMic.h
@@ -0,0 +1,109 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/EXI_Device.h"
+
+#if HAVE_PORTAUDIO
+
+#include <mutex>
+
+class CEXIMic : public IEXIDevice
+{
+public:
+	CEXIMic(const int index);
+	virtual ~CEXIMic();
+	void SetCS(int cs) override;
+	bool IsInterruptSet() override;
+	bool IsPresent() const override;
+
+private:
+	static u8 const exi_id[];
+	static int const sample_size = sizeof(s16);
+	static int const rate_base = 11025;
+	static int const ring_base = 32;
+
+	enum
+	{
+		cmdID        = 0x00,
+		cmdGetStatus = 0x40,
+		cmdSetStatus = 0x80,
+		cmdGetBuffer = 0x20,
+		cmdReset     = 0xFF,
+	};
+
+	int slot;
+
+	u32 m_position;
+	int command;
+	union UStatus
+	{
+		u16 U16;
+		u8 U8[2];
+		struct
+		{
+			u16 out         : 4; // MICSet/GetOut...???
+			u16 id          : 1; // Used for MICGetDeviceID (always 0)
+			u16 button_unk  : 3; // Button bits which appear unused
+			u16 button      : 1; // The actual button on the mic
+			u16 buff_ovrflw : 1; // Ring buffer wrote over bytes which weren't read by console
+			u16 gain        : 1; // Gain: 0dB or 15dB
+			u16 sample_rate : 2; // Sample rate, 00-11025, 01-22050, 10-44100, 11-??
+			u16 buff_size   : 2; // Ring buffer size in bytes, 00-32, 01-64, 10-128, 11-???
+			u16 is_active   : 1; // If we are sampling or not
+		};
+	};
+
+	// 64 is the max size, can be 16 or 32 as well
+	int ring_pos;
+	u8 ring_buffer[64 * sample_size];
+
+	// 0 to disable interrupts, else it will be checked against current CPU ticks
+	// to determine if interrupt should be raised
+	u64 next_int_ticks;
+	void UpdateNextInterruptTicks();
+
+	// Streaming input interface
+	int pa_error; // PaError
+	void *pa_stream; // PaStream
+
+	void StreamLog(const char *msg);
+	void StreamInit();
+	void StreamTerminate();
+	void StreamStart();
+	void StreamStop();
+	void StreamReadOne();
+
+public:
+	UStatus status;
+
+	std::mutex ring_lock;
+
+	// status bits converted to nice numbers
+	int sample_rate;
+	int buff_size;
+	int buff_size_samples;
+
+	// Arbitrarily small ringbuffer used by audio input backend in order to
+	// keep delay tolerable
+	s16 *stream_buffer;
+	int stream_size;
+	int stream_wpos;
+	int stream_rpos;
+	int samples_avail;
+
+protected:
+	virtual void TransferByte(u8 &byte) override;
+};
+
+#else // HAVE_PORTAUDIO
+
+class CEXIMic : public IEXIDevice
+{
+public:
+	CEXIMic(const int) {}
+};
+
+#endif
diff --git a/Source/Core/Core/HW/GCKeyboard.cpp b/Source/Core/Core/HW/GCKeyboard.cpp
new file mode 100644
index 0000000000..34cb18107e
--- /dev/null
+++ b/Source/Core/Core/HW/GCKeyboard.cpp
@@ -0,0 +1,61 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCKeyboardEmu.h"
+#include "InputCommon/InputConfig.h"
+#include "InputCommon/KeyboardStatus.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+namespace Keyboard
+{
+
+static InputConfig s_config("GCKeyNew", _trans("Keyboard"), "GCKey");
+InputConfig* GetConfig()
+{
+	return &s_config;
+}
+
+void Shutdown()
+{
+	std::vector<ControllerEmu*>::const_iterator
+		i = s_config.controllers.begin(),
+		e = s_config.controllers.end();
+	for ( ; i!=e; ++i )
+		delete *i;
+	s_config.controllers.clear();
+
+	g_controller_interface.Shutdown();
+}
+
+// if plugin isn't initialized, init and load config
+void Initialize(void* const hwnd)
+{
+	if (s_config.controllers.empty())
+		for (unsigned int i = 0; i < 4; ++i)
+			s_config.controllers.push_back(new GCKeyboard(i));
+
+	g_controller_interface.Initialize(hwnd);
+
+	// load the saved controller config
+	s_config.LoadConfig(true);
+}
+
+void LoadConfig()
+{
+	s_config.LoadConfig(true);
+}
+
+void GetStatus(u8 _port, KeyboardStatus* _pKeyboardStatus)
+{
+	memset(_pKeyboardStatus, 0, sizeof(*_pKeyboardStatus));
+	_pKeyboardStatus->err = PAD_ERR_NONE;
+
+	// get input
+	((GCKeyboard*)s_config.controllers[_port])->GetInput(_pKeyboardStatus);
+}
+
+}
diff --git a/Source/Core/Core/HW/GCKeyboard.h b/Source/Core/Core/HW/GCKeyboard.h
new file mode 100644
index 0000000000..faef2adf75
--- /dev/null
+++ b/Source/Core/Core/HW/GCKeyboard.h
@@ -0,0 +1,23 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class InputConfig;
+struct KeyboardStatus;
+
+namespace Keyboard
+{
+
+void Shutdown();
+void Initialize(void* const hwnd);
+void LoadConfig();
+
+InputConfig* GetConfig();
+
+void GetStatus(u8 _port, KeyboardStatus* _pKeyboardStatus);
+
+}
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp
new file mode 100644
index 0000000000..94842b8c6b
--- /dev/null
+++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp
@@ -0,0 +1,448 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/GCKeyboardEmu.h"
+#include "InputCommon/KeyboardStatus.h"
+
+static const u16 keys0_bitmasks[] =
+{
+	KEYMASK_HOME,
+	KEYMASK_END,
+	KEYMASK_PGUP,
+	KEYMASK_PGDN,
+	KEYMASK_SCROLLLOCK,
+	KEYMASK_A,
+	KEYMASK_B,
+	KEYMASK_C,
+	KEYMASK_D,
+	KEYMASK_E,
+	KEYMASK_F,
+	KEYMASK_G,
+	KEYMASK_H,
+	KEYMASK_I,
+	KEYMASK_J,
+	KEYMASK_K
+};
+static const u16 keys1_bitmasks[] =
+{
+	KEYMASK_L,
+	KEYMASK_M,
+	KEYMASK_N,
+	KEYMASK_O,
+	KEYMASK_P,
+	KEYMASK_Q,
+	KEYMASK_R,
+	KEYMASK_S,
+	KEYMASK_T,
+	KEYMASK_U,
+	KEYMASK_V,
+	KEYMASK_W,
+	KEYMASK_X,
+	KEYMASK_Y,
+	KEYMASK_Z,
+	KEYMASK_1
+};
+static const u16 keys2_bitmasks[] =
+{
+	KEYMASK_2,
+	KEYMASK_3,
+	KEYMASK_4,
+	KEYMASK_5,
+	KEYMASK_6,
+	KEYMASK_7,
+	KEYMASK_8,
+	KEYMASK_9,
+	KEYMASK_0,
+	KEYMASK_MINUS,
+	KEYMASK_PLUS,
+	KEYMASK_PRINTSCR,
+	KEYMASK_BRACE_OPEN,
+	KEYMASK_BRACE_CLOSE,
+	KEYMASK_COLON,
+	KEYMASK_QUOTE
+};
+static const u16 keys3_bitmasks[] =
+{
+	KEYMASK_HASH,
+	KEYMASK_COMMA,
+	KEYMASK_PERIOD,
+	KEYMASK_QUESTIONMARK,
+	KEYMASK_INTERNATIONAL1,
+	KEYMASK_F1,
+	KEYMASK_F2,
+	KEYMASK_F3,
+	KEYMASK_F4,
+	KEYMASK_F5,
+	KEYMASK_F6,
+	KEYMASK_F7,
+	KEYMASK_F8,
+	KEYMASK_F9,
+	KEYMASK_F10,
+	KEYMASK_F11
+};
+static const u16 keys4_bitmasks[] =
+{
+	KEYMASK_F12,
+	KEYMASK_ESC,
+	KEYMASK_INSERT,
+	KEYMASK_DELETE,
+	KEYMASK_TILDE,
+	KEYMASK_BACKSPACE,
+	KEYMASK_TAB,
+	KEYMASK_CAPSLOCK,
+	KEYMASK_LEFTSHIFT,
+	KEYMASK_RIGHTSHIFT,
+	KEYMASK_LEFTCONTROL,
+	KEYMASK_RIGHTALT,
+	KEYMASK_LEFTWINDOWS,
+	KEYMASK_SPACE,
+	KEYMASK_RIGHTWINDOWS,
+	KEYMASK_MENU
+};
+static const u16 keys5_bitmasks[] =
+{
+	KEYMASK_LEFTARROW,
+	KEYMASK_DOWNARROW,
+	KEYMASK_UPARROW,
+	KEYMASK_RIGHTARROW,
+	KEYMASK_ENTER
+};
+
+static const char* const named_keys0[] =
+{
+	"HOME",
+	"END",
+	"PGUP",
+	"PGDN",
+	"SCR LK",
+	"A",
+	"B",
+	"C",
+	"D",
+	"E",
+	"F",
+	"G",
+	"H",
+	"I",
+	"J",
+	"K"
+};
+static const char* const named_keys1[] =
+{
+	"L",
+	"M",
+	"N",
+	"O",
+	"P",
+	"Q",
+	"R",
+	"S",
+	"T",
+	"U",
+	"V",
+	"W",
+	"X",
+	"Y",
+	"Z",
+	"1"
+};
+static const char* const named_keys2[] =
+{
+	"2",
+	"3",
+	"4",
+	"5",
+	"6",
+	"7",
+	"8",
+	"9",
+	"0",
+	"-",
+	"`",
+	"PRT SC",
+	"'",
+	"[",
+	"EQUALS",
+	"*"
+};
+static const char* const named_keys3[] =
+{
+	"]",
+	",",
+	".",
+	"/",
+	"\\",
+	"F1",
+	"F2",
+	"F3",
+	"F4",
+	"F5",
+	"F6",
+	"F7",
+	"F8",
+	"F9",
+	"F10",
+	"F11"
+};
+static const char* const named_keys4[] =
+{
+	"F12",
+	"ESC",
+	"INSERT",
+	"DELETE",
+	";",
+	"BACKSPACE",
+	"TAB",
+	"CAPS LOCK",
+	"L SHIFT",
+	"R SHIFT",
+	"L CTRL",
+	"R ALT",
+	"L WIN",
+	"SPACE",
+	"R WIN",
+	"MENU"
+};
+static const char* const named_keys5[] =
+{
+	"LEFT",
+	"DOWN",
+	"UP",
+	"RIGHT",
+	"ENTER"
+};
+
+GCKeyboard::GCKeyboard(const unsigned int index) : m_index(index)
+{
+	// buttons
+	groups.emplace_back(m_keys0x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys0)
+		m_keys0x->controls.emplace_back(new ControlGroup::Input(key));
+
+	groups.emplace_back(m_keys1x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys1)
+		m_keys1x->controls.emplace_back(new ControlGroup::Input(key));
+
+	groups.emplace_back(m_keys2x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys2)
+		m_keys2x->controls.emplace_back(new ControlGroup::Input(key));
+
+	groups.emplace_back(m_keys3x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys3)
+		m_keys3x->controls.emplace_back(new ControlGroup::Input(key));
+
+	groups.emplace_back(m_keys4x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys4)
+		m_keys4x->controls.emplace_back(new ControlGroup::Input(key));
+
+	groups.emplace_back(m_keys5x = new Buttons(_trans("Keys")));
+	for (const char* key : named_keys5)
+		m_keys5x->controls.emplace_back(new ControlGroup::Input(key));
+
+
+	// options
+	groups.emplace_back(m_options = new ControlGroup(_trans("Options")));
+	m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
+	m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input")));
+}
+
+std::string GCKeyboard::GetName() const
+{
+	return std::string("GCKeyboard") + char('1' + m_index);
+}
+
+void GCKeyboard::GetInput(KeyboardStatus* const kb)
+{
+	m_keys0x->GetState(&kb->key0x, keys0_bitmasks);
+	m_keys1x->GetState(&kb->key1x, keys1_bitmasks);
+	m_keys2x->GetState(&kb->key2x, keys2_bitmasks);
+	m_keys3x->GetState(&kb->key3x, keys3_bitmasks);
+	m_keys4x->GetState(&kb->key4x, keys4_bitmasks);
+	m_keys5x->GetState(&kb->key5x, keys5_bitmasks);
+}
+
+void GCKeyboard::LoadDefaults(const ControllerInterface& ciface)
+{
+	#define set_control(group, num, str)  (group)->controls[num]->control_ref->expression = (str)
+
+	ControllerEmu::LoadDefaults(ciface);
+
+	// Buttons
+	set_control(m_keys0x, 5, "A");
+	set_control(m_keys0x, 6, "B");
+	set_control(m_keys0x, 7, "C");
+	set_control(m_keys0x, 8, "D");
+	set_control(m_keys0x, 9, "E");
+	set_control(m_keys0x, 10, "F");
+	set_control(m_keys0x, 11, "G");
+	set_control(m_keys0x, 12, "H");
+	set_control(m_keys0x, 13, "I");
+	set_control(m_keys0x, 14, "J");
+	set_control(m_keys0x, 15, "K");
+	set_control(m_keys1x, 0, "L");
+	set_control(m_keys1x, 1, "M");
+	set_control(m_keys1x, 2, "N");
+	set_control(m_keys1x, 3, "O");
+	set_control(m_keys1x, 4, "P");
+	set_control(m_keys1x, 5, "Q");
+	set_control(m_keys1x, 6, "R");
+	set_control(m_keys1x, 7, "S");
+	set_control(m_keys1x, 8, "T");
+	set_control(m_keys1x, 9, "U");
+	set_control(m_keys1x, 10, "V");
+	set_control(m_keys1x, 11, "W");
+	set_control(m_keys1x, 12, "X");
+	set_control(m_keys1x, 13, "Y");
+	set_control(m_keys1x, 14, "Z");
+
+	set_control(m_keys1x, 15, "1");
+	set_control(m_keys2x, 0, "2");
+	set_control(m_keys2x, 1, "3");
+	set_control(m_keys2x, 2, "4");
+	set_control(m_keys2x, 3, "5");
+	set_control(m_keys2x, 4, "6");
+	set_control(m_keys2x, 5, "7");
+	set_control(m_keys2x, 6, "8");
+	set_control(m_keys2x, 7, "9");
+	set_control(m_keys2x, 8, "0");
+
+	set_control(m_keys3x, 5, "F1");
+	set_control(m_keys3x, 6, "F2");
+	set_control(m_keys3x, 7, "F3");
+	set_control(m_keys3x, 8, "F4");
+	set_control(m_keys3x, 9, "F5");
+	set_control(m_keys3x, 10, "F6");
+	set_control(m_keys3x, 11, "F7");
+	set_control(m_keys3x, 12, "F8");
+	set_control(m_keys3x, 13, "F9");
+	set_control(m_keys3x, 14, "F10");
+	set_control(m_keys3x, 15, "F11");
+	set_control(m_keys4x, 0, "F12");
+
+#ifdef _WIN32
+	set_control(m_keys0x, 0, "HOME");
+	set_control(m_keys0x, 1, "END");
+	set_control(m_keys0x, 2, "PRIOR");
+	set_control(m_keys0x, 3, "NEXT");
+	set_control(m_keys0x, 4, "SCROLL");
+
+	set_control(m_keys2x, 9, "MINUS");
+	set_control(m_keys2x, 10, "GRAVE");
+	set_control(m_keys2x, 11, "SYSRQ");
+	set_control(m_keys2x, 12, "APOSTROPHE");
+	set_control(m_keys2x, 13, "LBRACKET");
+	set_control(m_keys2x, 14, "EQUALS");
+	set_control(m_keys2x, 15, "MULTIPLY");
+	set_control(m_keys3x, 0, "RBRACKET");
+	set_control(m_keys3x, 1, "COMMA");
+	set_control(m_keys3x, 2, "PERIOD");
+	set_control(m_keys3x, 3, "SLASH");
+	set_control(m_keys3x, 4, "BACKSLASH");
+
+	set_control(m_keys4x, 1, "ESCAPE");
+	set_control(m_keys4x, 2, "INSERT");
+	set_control(m_keys4x, 3, "DELETE");
+	set_control(m_keys4x, 4, "SEMICOLON");
+	set_control(m_keys4x, 5, "BACK");
+	set_control(m_keys4x, 6, "TAB");
+	set_control(m_keys4x, 7, "CAPITAL");
+	set_control(m_keys4x, 8, "LSHIFT");
+	set_control(m_keys4x, 9, "RSHIFT");
+	set_control(m_keys4x, 10, "LCONTROL");
+	set_control(m_keys4x, 11, "RMENU");
+	set_control(m_keys4x, 12, "LWIN");
+	set_control(m_keys4x, 13, "SPACE");
+	set_control(m_keys4x, 14, "RWIN");
+	set_control(m_keys4x, 15, "MENU");
+
+	set_control(m_keys5x, 0, "LEFT");
+	set_control(m_keys5x, 1, "DOWN");
+	set_control(m_keys5x, 2, "UP");
+	set_control(m_keys5x, 3, "RIGHT");
+	set_control(m_keys5x, 4, "RETURN");
+#elif __APPLE__
+	set_control(m_keys0x, 0, "Home");
+	set_control(m_keys0x, 1, "End");
+	set_control(m_keys0x, 2, "Page Up");
+	set_control(m_keys0x, 3, "Page Down");
+	set_control(m_keys0x, 4, ""); // Scroll lock
+
+	set_control(m_keys2x, 9, "-");
+	set_control(m_keys2x, 10, "Paragraph");
+	set_control(m_keys2x, 11, ""); // Print Scr
+	set_control(m_keys2x, 12, "'");
+	set_control(m_keys2x, 13, "[");
+	set_control(m_keys2x, 14, "=");
+	set_control(m_keys2x, 15, "Keypad *");
+	set_control(m_keys3x, 0, "]");
+	set_control(m_keys3x, 1, ",");
+	set_control(m_keys3x, 2, ".");
+	set_control(m_keys3x, 3, "/");
+	set_control(m_keys3x, 4, "\\");
+
+	set_control(m_keys4x, 1, "Escape");
+	set_control(m_keys4x, 2, "Insert");
+	set_control(m_keys4x, 3, "Delete");
+	set_control(m_keys4x, 4, ";");
+	set_control(m_keys4x, 5, "Backspace");
+	set_control(m_keys4x, 6, "Tab");
+	set_control(m_keys4x, 7, "Caps Lock");
+	set_control(m_keys4x, 8, "Left Shift");
+	set_control(m_keys4x, 9, "Right Shift");
+	set_control(m_keys4x, 10, "Left Control");
+	set_control(m_keys4x, 11, "Right Alt");
+	set_control(m_keys4x, 12, "Left Command");
+	set_control(m_keys4x, 13, "Space");
+	set_control(m_keys4x, 14, "Right Command");
+	set_control(m_keys4x, 15, ""); // Menu
+
+	set_control(m_keys5x, 0, "Left Arrow");
+	set_control(m_keys5x, 1, "Down Arrow");
+	set_control(m_keys5x, 2, "Up Arrow");
+	set_control(m_keys5x, 3, "Right Arrow");
+	set_control(m_keys5x, 4, "Return");
+#else // linux
+	set_control(m_keys0x, 0, "Home");
+	set_control(m_keys0x, 1, "End");
+	set_control(m_keys0x, 2, "Prior");
+	set_control(m_keys0x, 3, "Next");
+	set_control(m_keys0x, 4, "Scroll_Lock");
+
+	set_control(m_keys2x, 9, "minus");
+	set_control(m_keys2x, 10, "grave");
+	set_control(m_keys2x, 11, "Print");
+	set_control(m_keys2x, 12, "apostrophe");
+	set_control(m_keys2x, 13, "bracketleft");
+	set_control(m_keys2x, 14, "equal");
+	set_control(m_keys2x, 15, "KP_Multiply");
+	set_control(m_keys3x, 0, "bracketright");
+	set_control(m_keys3x, 1, "comma");
+	set_control(m_keys3x, 2, "period");
+	set_control(m_keys3x, 3, "slash");
+	set_control(m_keys3x, 4, "backslash");
+
+	set_control(m_keys4x, 1, "Escape");
+	set_control(m_keys4x, 2, "Insert");
+	set_control(m_keys4x, 3, "Delete");
+	set_control(m_keys4x, 4, "semicolon");
+	set_control(m_keys4x, 5, "BackSpace");
+	set_control(m_keys4x, 6, "Tab");
+	set_control(m_keys4x, 7, "Caps_Lock");
+	set_control(m_keys4x, 8, "Shift_L");
+	set_control(m_keys4x, 9, "Shift_R");
+	set_control(m_keys4x, 10, "Control_L");
+	set_control(m_keys4x, 11, "Alt_R");
+	set_control(m_keys4x, 12, "Super_L");
+	set_control(m_keys4x, 13, "space");
+	set_control(m_keys4x, 14, "Super_R");
+	set_control(m_keys4x, 15, "Menu");
+
+	set_control(m_keys5x, 0, "Left");
+	set_control(m_keys5x, 1, "Down");
+	set_control(m_keys5x, 2, "Up");
+	set_control(m_keys5x, 3, "Right");
+	set_control(m_keys5x, 4, "Return");
+#endif
+
+}
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.h b/Source/Core/Core/HW/GCKeyboardEmu.h
new file mode 100644
index 0000000000..4c8c85194b
--- /dev/null
+++ b/Source/Core/Core/HW/GCKeyboardEmu.h
@@ -0,0 +1,33 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "InputCommon/ControllerEmu.h"
+
+struct KeyboardStatus;
+
+class GCKeyboard : public ControllerEmu
+{
+public:
+
+	GCKeyboard(const unsigned int index);
+	void GetInput(KeyboardStatus* const pad);
+	std::string GetName() const override;
+	void LoadDefaults(const ControllerInterface& ciface) override;
+
+private:
+
+	Buttons*       m_keys0x;
+	Buttons*       m_keys1x;
+	Buttons*       m_keys2x;
+	Buttons*       m_keys3x;
+	Buttons*       m_keys4x;
+	Buttons*       m_keys5x;
+	ControlGroup*  m_options;
+
+	const unsigned int m_index;
+};
diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp
similarity index 79%
rename from Source/Core/Core/Src/HW/GCMemcard.cpp
rename to Source/Core/Core/HW/GCMemcard.cpp
index b4aa9993de..0a95da67e1 100644
--- a/Source/Core/Core/Src/HW/GCMemcard.cpp
+++ b/Source/Core/Core/HW/GCMemcard.cpp
@@ -1,9 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "GCMemcard.h"
-#include "ColorUtil.h"
+#include <algorithm>
+#include <cinttypes>
+#include <string>
+
+#include "Common/ColorUtil.h"
+#include "Common/FileUtil.h"
+#include "Core/HW/GCMemcard.h"
+
 static void ByteSwap(u8 *valueA, u8 *valueB)
 {
 	u8 tmp = *valueA;
@@ -11,44 +17,7 @@ static void ByteSwap(u8 *valueA, u8 *valueB)
 	*valueB = tmp;
 }
 
-void decode5A3image(u32* dst, u16* src, int width, int height)
-{
-	for (int y = 0; y < height; y += 4)
-	{
-		for (int x = 0; x < width; x += 4)
-		{
-			for (int iy = 0; iy < 4; iy++, src += 4)
-			{
-				for (int ix = 0; ix < 4; ix++)
-				{
-					u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
-					dst[(y + iy) * width + (x + ix)] = RGBA;
-				}
-			}
-		}
-	}
-}
-
-void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height)
-{
-	for (int y = 0; y < height; y += 4)
-	{
-		for (int x = 0; x < width; x += 8)
-		{
-			for (int iy = 0; iy < 4; iy++, src += 8)
-			{
-				u32 *tdst = dst+(y+iy)*width+x;
-				for (int ix = 0; ix < 8; ix++)
-				{
-					// huh, this seems wrong. CI8, not 5A3, no?
-					tdst[ix] = ColorUtil::Decode5A3(Common::swap16(pal[src[ix]]));
-				}
-			}
-		}
-	}
-}
-
-GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
+GCMemcard::GCMemcard(const std::string &filename, bool forceCreation, bool ascii)
 	: m_valid(false)
 	, m_fileName(filename)
 {
@@ -57,36 +26,38 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 	File::IOFile mcdFile(m_fileName, "rb");
 	if (!mcdFile.IsOpen())
 	{
-		if (!forceCreation && !AskYesNoT("\"%s\" does not exist.\n Create a new 16MB Memcard?", filename))
+		if (!forceCreation)
 		{
-			return;
+			if (!AskYesNoT("\"%s\" does not exist.\n Create a new 16MB Memcard?", filename.c_str()))
+				return;
+			ascii = AskYesNoT("Format as ascii (NTSC\\PAL)?\nChoose no for sjis (NTSC-J)");
 		}
-		Format(forceCreation ? sjis : !AskYesNoT("Format as ascii (NTSC\\PAL)?\nChoose no for sjis (NTSC-J)"));
+		Format(ascii);
 		return;
 	}
 	else
 	{
 		//This function can be removed once more about hdr is known and we can check for a valid header
 		std::string fileType;
-		SplitPath(filename, NULL, NULL, &fileType);
+		SplitPath(filename, nullptr, nullptr, &fileType);
 		if (strcasecmp(fileType.c_str(), ".raw") && strcasecmp(fileType.c_str(), ".gcp"))
 		{
 			PanicAlertT("File has the extension \"%s\"\nvalid extensions are (.raw/.gcp)", fileType.c_str());
 			return;
 		}
-		u32 size = mcdFile.GetSize();
+		auto size = mcdFile.GetSize();
 		if (size < MC_FST_BLOCKS*BLOCK_SIZE)
 		{
-			PanicAlertT("%s failed to load as a memorycard \nfile is not large enough to be a valid memory card file (0x%x bytes)", filename, size);
+			PanicAlertT("%s failed to load as a memorycard \nfile is not large enough to be a valid memory card file (0x%x bytes)", filename.c_str(), (unsigned) size);
 			return;
 		}
 		if (size % BLOCK_SIZE)
 		{
-			PanicAlertT("%s failed to load as a memorycard \n Card file size is invalid (0x%x bytes)", filename, size);
+			PanicAlertT("%s failed to load as a memorycard \n Card file size is invalid (0x%x bytes)", filename.c_str(), (unsigned) size);
 				return;
 		}
 
-		m_sizeMb = (size/BLOCK_SIZE) / MBIT_TO_BLOCKS;
+		m_sizeMb = (u16)((size/BLOCK_SIZE) / MBIT_TO_BLOCKS);
 		switch (m_sizeMb)
 		{
 			case MemCard59Mb:
@@ -97,12 +68,12 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 			case MemCard2043Mb:
 				break;
 			default:
-				PanicAlertT("%s failed to load as a memorycard \n Card size is invalid (0x%x bytes)", filename, size);
+				PanicAlertT("%s failed to load as a memorycard \n Card size is invalid (0x%x bytes)", filename.c_str(), (unsigned) size);
 				return;
 		}
 	}
-	
-	
+
+
 	mcdFile.Seek(0, SEEK_SET);
 	if (!mcdFile.ReadBytes(&hdr, BLOCK_SIZE))
 	{
@@ -140,7 +111,7 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 	}
 
 	u32 csums = TestChecksums();
-	
+
 	if (csums & 0x1)
 	{
 		// header checksum error!
@@ -189,14 +160,14 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 // the backup should be copied?
 //	}
 //
-//	if(BE16(dir_backup.UpdateCounter) > BE16(dir.UpdateCounter)) //check if the backup is newer
+//	if (BE16(dir_backup.UpdateCounter) > BE16(dir.UpdateCounter)) //check if the backup is newer
 //	{
 //		dir = dir_backup;
 //		bat = bat_backup; // needed?
 	}
 
 	mcdFile.Seek(0xa000, SEEK_SET);
-	
+
 	maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS;
 	mc_data_blocks.reserve(maxBlock - MC_FST_BLOCKS);
 
@@ -210,18 +181,18 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 		}
 		else
 		{
-			PanicAlertT("Failed to read block %d of the save data\nMemcard may be truncated\nFilePosition:%llx", i, mcdFile.Tell());
+			PanicAlertT("Failed to read block %d of the save data\nMemcard may be truncated\nFilePosition:%" PRIx64, i, mcdFile.Tell());
 			m_valid = false;
 			break;
 		}
 	}
 
 	mcdFile.Close();
-	
-	initDirBatPointers();
+
+	InitDirBatPointers();
 }
 
-void GCMemcard::initDirBatPointers() 
+void GCMemcard::InitDirBatPointers()
 {
 	if (BE16(dir.UpdateCounter) > (BE16(dir_backup.UpdateCounter)))
 	{
@@ -268,7 +239,7 @@ bool GCMemcard::Save()
 	return mcdFile.Close();
 }
 
-void GCMemcard::calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum)
+void calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum)
 {
 	*csum = *inv_csum = 0;
 
@@ -324,7 +295,7 @@ bool GCMemcard::FixChecksums()
 {
 	if (!m_valid)
 		return false;
-	
+
 	calc_checksumsBE((u16*)&hdr, 0xFE, &hdr.Checksum, &hdr.Checksum_Inv);
 	calc_checksumsBE((u16*)&dir, 0xFFE, &dir.Checksum, &dir.Checksum_Inv);
 	calc_checksumsBE((u16*)&dir_backup, 0xFFE, &dir_backup.Checksum, &dir_backup.Checksum_Inv);
@@ -376,13 +347,13 @@ u16 GCMemcard::GetFreeBlocks() const
 	return BE16(CurrentBat->FreeBlocks);
 }
 
-u8 GCMemcard::TitlePresent(DEntry d) const
+u8 GCMemcard::TitlePresent(const DEntry& d) const
 {
 	if (!m_valid)
 		return DIRLEN;
 
 	u8 i = 0;
-	while(i < DIRLEN)
+	while (i < DIRLEN)
 	{
 		if ((BE32(CurrentDir->Dir[i].Gamecode) == BE32(d.Gamecode)) &&
 			(!memcmp(CurrentDir->Dir[i].Filename, d.Filename, 32)))
@@ -396,10 +367,10 @@ u8 GCMemcard::TitlePresent(DEntry d) const
 
 bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const
 {
-	if (!m_valid || index > DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF))
+	if (!m_valid || index >= DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF))
 		return false;
 
-	filename = std::string((char*)CurrentDir->Dir[index].Gamecode, 4) + '_' + (char*)CurrentDir->Dir[index].Filename + ".gci";
+	filename = CurrentDir->Dir[index].GCI_FileName();
 	return true;
 }
 
@@ -408,7 +379,7 @@ bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const
 
 std::string GCMemcard::DEntry_GameCode(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4);
@@ -416,14 +387,15 @@ std::string GCMemcard::DEntry_GameCode(u8 index) const
 
 std::string GCMemcard::DEntry_Makercode(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
+
 	return std::string((const char*)CurrentDir->Dir[index].Makercode, 2);
 }
 
 std::string GCMemcard::DEntry_BIFlags(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	std::string flags;
@@ -438,7 +410,7 @@ std::string GCMemcard::DEntry_BIFlags(u8 index) const
 
 std::string GCMemcard::DEntry_FileName(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN);
@@ -446,7 +418,7 @@ std::string GCMemcard::DEntry_FileName(u8 index) const
 
 u32 GCMemcard::DEntry_ModTime(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFFFFFFFF;
 
 	return BE32(CurrentDir->Dir[index].ModTime);
@@ -454,7 +426,7 @@ u32 GCMemcard::DEntry_ModTime(u8 index) const
 
 u32 GCMemcard::DEntry_ImageOffset(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFFFFFFFF;
 
 	return BE32(CurrentDir->Dir[index].ImageOffset);
@@ -462,12 +434,12 @@ u32 GCMemcard::DEntry_ImageOffset(u8 index) const
 
 std::string GCMemcard::DEntry_IconFmt(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	int x = CurrentDir->Dir[index].IconFmt[0];
 	std::string format;
-	for(int i = 0; i < 16; i++)
+	for (int i = 0; i < 16; i++)
 	{
 		if (i == 8) x = CurrentDir->Dir[index].IconFmt[1];
 		format.push_back((x & 0x80) ? '1' : '0');
@@ -478,12 +450,12 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const
 
 std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	int x = CurrentDir->Dir[index].AnimSpeed[0];
 	std::string speed;
-	for(int i = 0; i < 16; i++)
+	for (int i = 0; i < 16; i++)
 	{
 		if (i == 8) x = CurrentDir->Dir[index].AnimSpeed[1];
 		speed.push_back((x & 0x80) ? '1' : '0');
@@ -494,7 +466,7 @@ std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
 
 std::string GCMemcard::DEntry_Permissions(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	u8 Permissions = CurrentDir->Dir[index].Permissions;
@@ -507,7 +479,7 @@ std::string GCMemcard::DEntry_Permissions(u8 index) const
 
 u8 GCMemcard::DEntry_CopyCounter(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFF;
 
 	return CurrentDir->Dir[index].CopyCounter;
@@ -515,7 +487,7 @@ u8 GCMemcard::DEntry_CopyCounter(u8 index) const
 
 u16 GCMemcard::DEntry_FirstBlock(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFFFF;
 
 	u16 block = BE16(CurrentDir->Dir[index].FirstBlock);
@@ -525,7 +497,7 @@ u16 GCMemcard::DEntry_FirstBlock(u8 index) const
 
 u16 GCMemcard::DEntry_BlockCount(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFFFF;
 
 	u16 blocks = BE16(CurrentDir->Dir[index].BlockCount);
@@ -535,7 +507,7 @@ u16 GCMemcard::DEntry_BlockCount(u8 index) const
 
 u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return 0xFFFF;
 
 	return BE32(CurrentDir->Dir[index].CommentsAddr);
@@ -543,7 +515,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
 
 std::string GCMemcard::GetSaveComment1(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr);
@@ -557,7 +529,7 @@ std::string GCMemcard::GetSaveComment1(u8 index) const
 
 std::string GCMemcard::GetSaveComment2(u8 index) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return "";
 
 	u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr);
@@ -572,14 +544,14 @@ std::string GCMemcard::GetSaveComment2(u8 index) const
 
 bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const
 {
-	if (!m_valid || index > DIRLEN)
+	if (!m_valid || index >= DIRLEN)
 		return false;
 
 	dest = CurrentDir->Dir[index];
 	return true;
 }
 
-u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const
+u16 BlockAlloc::GetNextBlock(u16 Block) const
 {
 	if ((Block < MC_FST_BLOCKS) || (Block > 4091))
 		return 0;
@@ -587,11 +559,12 @@ u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const
 	return Common::swap16(Map[Block-MC_FST_BLOCKS]);
 }
 
-u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const
+u16 BlockAlloc::NextFreeBlock(u16 MaxBlock, u16 StartingBlock) const
 {
 	if (FreeBlocks)
 	{
-		for (u16 i = StartingBlock; i < BAT_SIZE; ++i)
+		MaxBlock = std::min<u16>(MaxBlock, BAT_SIZE);
+		for (u16 i = StartingBlock; i < MaxBlock; ++i)
 			if (Map[i-MC_FST_BLOCKS] == 0)
 				return i;
 
@@ -602,7 +575,7 @@ u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const
 	return 0xFFFF;
 }
 
-bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount)
+bool BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount)
 {
 	std::vector<u16> blocks;
 	while (FirstBlock != 0xFFFF && FirstBlock != 0)
@@ -671,11 +644,11 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector<GCMBlock> &saveBlocks)
 	}
 
 	// find first free data block
-	u16 firstBlock = CurrentBat->NextFreeBlock(BE16(CurrentBat->LastAllocated));
+	u16 firstBlock = CurrentBat->NextFreeBlock(maxBlock - MC_FST_BLOCKS, BE16(CurrentBat->LastAllocated));
 	if (firstBlock == 0xFFFF)
 		return OUTOFBLOCKS;
 	Directory UpdatedDir = *CurrentDir;
-	
+
 	// find first free dir entry
 	for (int i=0; i < DIRLEN; i++)
 	{
@@ -702,26 +675,26 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector<GCMBlock> &saveBlocks)
 
 	int fileBlocks = BE16(direntry.BlockCount);
 
-	FZEROGX_MakeSaveGameValid(direntry, saveBlocks);
-	PSO_MakeSaveGameValid(direntry, saveBlocks);
+	FZEROGX_MakeSaveGameValid(hdr, direntry, saveBlocks);
+	PSO_MakeSaveGameValid(hdr, direntry, saveBlocks);
 
 	BlockAlloc UpdatedBat = *CurrentBat;
 	u16 nextBlock;
 	// keep assuming no freespace fragmentation, and copy over all the data
 	for (int i = 0; i < fileBlocks; ++i)
-	{ 
+	{
 		if (firstBlock == 0xFFFF)
 			PanicAlert("Fatal Error");
 		mc_data_blocks[firstBlock - MC_FST_BLOCKS] = saveBlocks[i];
 		if (i == fileBlocks-1)
 			nextBlock = 0xFFFF;
 		else
-			nextBlock = UpdatedBat.NextFreeBlock(firstBlock+1);		
+			nextBlock = UpdatedBat.NextFreeBlock(maxBlock - MC_FST_BLOCKS, firstBlock + 1);
 		UpdatedBat.Map[firstBlock - MC_FST_BLOCKS] = BE16(nextBlock);
 		UpdatedBat.LastAllocated = BE16(firstBlock);
 		firstBlock = nextBlock;
 	}
-	
+
 	UpdatedBat.FreeBlocks = BE16(BE16(UpdatedBat.FreeBlocks)  - fileBlocks);
 	UpdatedBat.UpdateCounter = BE16(BE16(UpdatedBat.UpdateCounter) + 1);
 	*PreviousBat = UpdatedBat;
@@ -812,7 +785,7 @@ u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index)
 	DEntry tempDEntry;
 	if (!source.GetDEntry(index, tempDEntry))
 		return NOMEMCARD;
-	
+
 	u32 size = source.DEntry_BlockCount(index);
 	if (size == 0xFFFF) return INVALIDFILESIZE;
 
@@ -829,7 +802,7 @@ u32 GCMemcard::CopyFrom(const GCMemcard& source, u8 index)
 	}
 }
 
-u32 GCMemcard::ImportGci(const char *inputFile, const std::string &outputFile)
+u32 GCMemcard::ImportGci(const std::string& inputFile, const std::string &outputFile)
 {
 	if (outputFile.empty() && !m_valid)
 		return OPENFAIL;
@@ -843,22 +816,22 @@ u32 GCMemcard::ImportGci(const char *inputFile, const std::string &outputFile)
 	return result;
 }
 
-u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile)
+u32 GCMemcard::ImportGciInternal(FILE* gcih, const std::string& inputFile, const std::string &outputFile)
 {
 	File::IOFile gci(gcih);
 	unsigned int offset;
-	char tmp[0xD];
 	std::string fileType;
-	SplitPath(inputFile, NULL, NULL, &fileType);
+	SplitPath(inputFile, nullptr, nullptr, &fileType);
 
 	if (!strcasecmp(fileType.c_str(), ".gci"))
 		offset = GCI;
 	else
 	{
-		gci.ReadBytes(tmp, 0xD);
+		char tmp[0xD];
+		gci.ReadBytes(tmp, sizeof(tmp));
 		if (!strcasecmp(fileType.c_str(), ".gcs"))
 		{
-			if (!memcmp(tmp, "GCSAVE", 6))	// Header must be uppercase
+			if (!memcmp(tmp, "GCSAVE", 6)) // Header must be uppercase
 				offset = GCS;
 			else
 				return GCSFAIL;
@@ -888,7 +861,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s
 		return LENGTHFAIL;
 	if (gci.Tell() != offset + DENTRY_SIZE) // Verify correct file position
 		return OPENFAIL;
-	
+
 	u32 size = BE16((tempDEntry.BlockCount));
 	std::vector<GCMBlock> saveData;
 	saveData.reserve(size);
@@ -910,7 +883,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s
 		}
 		gci2.Seek(0, SEEK_SET);
 
-		if (!gci2.WriteBytes(&tempDEntry, DENTRY_SIZE)) 
+		if (!gci2.WriteBytes(&tempDEntry, DENTRY_SIZE))
 			completeWrite = false;
 		int fileBlocks = BE16(tempDEntry.BlockCount);
 		gci2.Seek(DENTRY_SIZE, SEEK_SET);
@@ -926,28 +899,29 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s
 		else
 			ret = WRITEFAIL;
 	}
-	else 
+	else
 		ret = ImportFile(tempDEntry, saveData);
 
 	return ret;
 }
 
-u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &directory) const
+u32 GCMemcard::ExportGci(u8 index, const std::string& fileName, const std::string &directory) const
 {
 	File::IOFile gci;
 	int offset = GCI;
-	if (!fileName)
+
+	if (!fileName.length())
 	{
 		std::string gciFilename;
+		// GCI_FileName should only fail if the gamecode is 0xFFFFFFFF
 		if (!GCI_FileName(index, gciFilename)) return SUCCESS;
 		gci.Open(directory + DIR_SEP + gciFilename, "wb");
 	}
 	else
 	{
-		gci.Open(fileName, "wb");
-
 		std::string fileType;
-		SplitPath(fileName, NULL, NULL, &fileType);
+		gci.Open(fileName, "wb");
+		SplitPath(fileName, nullptr, nullptr, &fileType);
 		if (!strcasecmp(fileType.c_str(), ".gcs"))
 		{
 			offset = GCS;
@@ -962,8 +936,8 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire
 		return OPENFAIL;
 
 	gci.Seek(0, SEEK_SET);
-	
-	switch(offset)
+
+	switch (offset)
 	{
 	case GCS:
 		u8 gcsHDR[GCS];
@@ -998,7 +972,7 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire
 	std::vector<GCMBlock> saveData;
 	saveData.reserve(size);
 
-	switch(GetSaveData(index, saveData))
+	switch (GetSaveData(index, saveData))
 	{
 	case FAIL:
 		return FAIL;
@@ -1019,10 +993,11 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire
 
 void GCMemcard::Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length)
 {
-	switch(saveType)
+	switch (saveType)
 	{
 	case GCS:
-	{	// field containing the Block count as displayed within
+	{
+		// field containing the Block count as displayed within
 		// the GameSaves software is not stored in the GCS file.
 		// It is stored only within the corresponding GSV file.
 		// If the GCS file is added without using the GameSaves software,
@@ -1055,7 +1030,7 @@ void GCMemcard::Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length)
 
 bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
 {
-	if (!m_valid)
+	if (!m_valid || index >= DIRLEN)
 		return false;
 
 	int flags = CurrentDir->Dir[index].BIFlags;
@@ -1083,25 +1058,25 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
 		u8  *pxdata  = (u8* )(mc_data_blocks[DataBlock].block + DataOffset);
 		u16 *paldata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset + pixels);
 
-		decodeCI8image(buffer, pxdata, paldata, 96, 32);
+		ColorUtil::decodeCI8image(buffer, pxdata, paldata, 96, 32);
 	}
 	else
 	{
 		u16 *pxdata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset);
 
-		decode5A3image(buffer, pxdata, 96, 32);
+		ColorUtil::decode5A3image(buffer, pxdata, 96, 32);
 	}
 	return true;
 }
 
 u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
 {
-	if (!m_valid)
+	if (!m_valid || index >= DIRLEN)
 		return 0;
 
 	// To ensure only one type of icon is used
 	// Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon
-	//int fmtCheck = 0; 
+	//int fmtCheck = 0;
 
 	int formats = BE16(CurrentDir->Dir[index].IconFmt);
 	int fdelays  = BE16(CurrentDir->Dir[index].AnimSpeed);
@@ -1185,16 +1160,16 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
 			switch (fmts[i])
 			{
 			case CI8SHARED: // CI8 with shared palette
-				decodeCI8image(buffer,data[i],sharedPal,32,32);
+				ColorUtil::decodeCI8image(buffer,data[i],sharedPal,32,32);
 				buffer += 32*32;
 				break;
 			case RGB5A3: // RGB5A3
-				decode5A3image(buffer, (u16*)(data[i]), 32, 32);
+				ColorUtil::decode5A3image(buffer, (u16*)(data[i]), 32, 32);
 				buffer += 32*32;
 				break;
 			case CI8: // CI8 with own palette
 				u16 *paldata = (u16*)(data[i] + 32*32);
-				decodeCI8image(buffer, data[i], paldata, 32, 32);
+				ColorUtil::decodeCI8image(buffer, data[i], paldata, 32, 32);
 				buffer += 32*32;
 				break;
 			}
@@ -1204,22 +1179,22 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
 			//Speed is set but there's no actual icon
 			//This is used to reduce animation speed in Pikmin and Luigi's Mansion for example
 			//These "blank frames" show the next icon
-			for(j=i; j<8;++j)
+			for (j=i; j<8;++j)
 			{
 				if (fmts[j] != 0)
 				{
 					switch (fmts[j])
 					{
 					case CI8SHARED: // CI8 with shared palette
-						decodeCI8image(buffer,data[j],sharedPal,32,32);
+						ColorUtil::decodeCI8image(buffer,data[j],sharedPal,32,32);
 						break;
 					case RGB5A3: // RGB5A3
-						decode5A3image(buffer, (u16*)(data[j]), 32, 32);
+						ColorUtil::decode5A3image(buffer, (u16*)(data[j]), 32, 32);
 						buffer += 32*32;
 						break;
 					case CI8: // CI8 with own palette
 						u16 *paldata = (u16*)(data[j] + 32*32);
-						decodeCI8image(buffer, data[j], paldata, 32, 32);
+						ColorUtil::decodeCI8image(buffer, data[j], paldata, 32, 32);
 						buffer += 32*32;
 						break;
 					}
@@ -1231,29 +1206,23 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
 	return frames;
 }
 
-
-bool GCMemcard::Format(u8 * card_data, bool sjis, u16 SizeMb)
+bool GCMemcard::Format(u8 *card_data, bool ascii, u16 SizeMb)
 {
 	if (!card_data)
 		return false;
 	memset(card_data, 0xFF, BLOCK_SIZE*3);
 	memset(card_data + BLOCK_SIZE*3, 0, BLOCK_SIZE*2);
 
-	GCMC_Header gcp;
-	gcp.hdr = (Header*)card_data;
-	gcp.dir = (Directory *)(card_data + BLOCK_SIZE);
-	gcp.dir_backup = (Directory *)(card_data + BLOCK_SIZE*2);
-	gcp.bat = (BlockAlloc *)(card_data + BLOCK_SIZE*3);
-	gcp.bat_backup = (BlockAlloc *)(card_data + BLOCK_SIZE*4);
+	*((Header *)card_data) = Header(SLOT_A, SizeMb, ascii);
 
-	*(u16*)gcp.hdr->SizeMb = BE16(SizeMb);
-	gcp.hdr->Encoding = BE16(sjis ? 1 : 0);
-
-	FormatInternal(gcp);
+	*((Directory *)(card_data + BLOCK_SIZE)) = Directory();
+	*((Directory *)(card_data + BLOCK_SIZE * 2)) = Directory();
+	*((BlockAlloc *)(card_data + BLOCK_SIZE * 3)) = BlockAlloc(SizeMb);
+	*((BlockAlloc *)(card_data + BLOCK_SIZE * 4)) = BlockAlloc(SizeMb);
 	return true;
 }
 
-bool GCMemcard::Format(bool sjis, u16 SizeMb)
+bool GCMemcard::Format(bool ascii, u16 SizeMb)
 {
 	memset(&hdr, 0xFF, BLOCK_SIZE);
 	memset(&dir, 0xFF, BLOCK_SIZE);
@@ -1261,82 +1230,21 @@ bool GCMemcard::Format(bool sjis, u16 SizeMb)
 	memset(&bat, 0, BLOCK_SIZE);
 	memset(&bat_backup, 0, BLOCK_SIZE);
 
-	GCMC_Header gcp;
-	gcp.hdr = &hdr;
-	gcp.dir = &dir;
-	gcp.dir_backup = &dir_backup;
-	gcp.bat = &bat;
-	gcp.bat_backup = &bat_backup;
-	
-	*(u16*)hdr.SizeMb = BE16(SizeMb);
-	hdr.Encoding = BE16(sjis ? 1 : 0);
-	FormatInternal(gcp);
+	hdr = Header(SLOT_A, SizeMb, ascii);
+	dir = dir_backup = Directory();
+	bat = bat_backup = BlockAlloc(SizeMb);
 
 	m_sizeMb = SizeMb;
 	maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS;
-	mc_data_blocks.reserve(maxBlock - MC_FST_BLOCKS);
-	for (u32 i = 0; i < (maxBlock - MC_FST_BLOCKS); ++i)
-	{
-		GCMBlock b;
-		mc_data_blocks.push_back(b);
-	}
-	
-	initDirBatPointers();
+	mc_data_blocks.clear();
+	mc_data_blocks.resize(maxBlock - MC_FST_BLOCKS);
+
+	InitDirBatPointers();
 	m_valid = true;
 
 	return Save();
 }
 
-void GCMemcard::FormatInternal(GCMC_Header &GCP)
-{
-	Header *p_hdr = GCP.hdr;
-	u64 rand = CEXIIPL::GetGCTime();
-	p_hdr->formatTime = Common::swap64(rand);
-
-	for(int i = 0; i < 12; i++)
-	{
-		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
-		p_hdr->serial[i] = (u8)(g_SRAM.flash_id[0][i] + (u32)rand);
-		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);	
-		rand &= (u64)0x0000000000007fffULL;
-	}
-	p_hdr->SramBias = g_SRAM.counter_bias;
-	p_hdr->SramLang = g_SRAM.lang;
-	// TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B
-	*(u32*)&p_hdr->Unk2 = 0;		// = _viReg[55];  static vu16* const _viReg = (u16*)0xCC002000;
-	*(u16*)&p_hdr->deviceID = 0;
-	calc_checksumsBE((u16*)p_hdr, 0xFE, &p_hdr->Checksum, &p_hdr->Checksum_Inv);
-
-	Directory *p_dir = GCP.dir,
-		*p_dir_backup = GCP.dir_backup;
-	*(u16*)&p_dir->UpdateCounter = 0;
-	p_dir_backup->UpdateCounter = BE16(1);
-	calc_checksumsBE((u16*)p_dir, 0xFFE, &p_dir->Checksum, &p_dir->Checksum_Inv);
-	calc_checksumsBE((u16*)p_dir_backup, 0xFFE, &p_dir_backup->Checksum, &p_dir_backup->Checksum_Inv);
-	
-	BlockAlloc *p_bat = GCP.bat,
-		*p_bat_backup = GCP.bat_backup;
-	p_bat_backup->UpdateCounter = BE16(1);
-	p_bat->FreeBlocks = *(u16*)&p_bat_backup->FreeBlocks = BE16(( BE16(p_hdr->SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS);
-	p_bat->LastAllocated = p_bat_backup->LastAllocated = BE16(4);
-	calc_checksumsBE((u16*)p_bat+2, 0xFFE, &p_bat->Checksum, &p_bat->Checksum_Inv);
-	calc_checksumsBE((u16*)p_bat_backup+2, 0xFFE, &p_bat_backup->Checksum, &p_bat_backup->Checksum_Inv);
-}
-
-void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2)
-{
-	u32 serial[8];
-
-	for (int i = 0; i < 8; i++)
-	{
-		memcpy(&serial[i], (u8 *) &hdr+(i*4), 4);
-	}
-
-	*serial1 = serial[0]^serial[2]^serial[4]^serial[6];
-	*serial2 = serial[1]^serial[3]^serial[5]^serial[7];
-}
-
-
 /*************************************************************/
 /* FZEROGX_MakeSaveGameValid                                 */
 /* (use just before writing a F-Zero GX system .gci file)    */
@@ -1348,7 +1256,7 @@ void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2)
 /* Returns: Error code                                       */
 /*************************************************************/
 
-s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer)
+s32 GCMemcard::FZEROGX_MakeSaveGameValid(Header &cardheader, DEntry &direntry, std::vector<GCMBlock> &FileBuffer)
 {
 	u32 i,j;
 	u32 serial1,serial2;
@@ -1359,7 +1267,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock>
 	if (strcmp((char*)direntry.Filename,"f_zero.dat")!=0) return 0;
 
 	// get encrypted destination memory card serial numbers
-	CARD_GetSerialNo(&serial1,&serial2);
+	cardheader.CARD_GetSerialNo(&serial1, &serial2);
 
 	// set new serial numbers
 	*(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16);
@@ -1369,7 +1277,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock>
 
 	// calc 16-bit checksum
 	for (i=0x02;i<0x8000;i++)
-	{				
+	{
 		chksum ^= (FileBuffer[block].block[i-(block*0x2000)]&0xFF);
 		for (j=8; j > 0; j--)
 		{
@@ -1396,7 +1304,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock>
 /* Returns: Error code                                     */
 /***********************************************************/
 
-s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer)
+s32 GCMemcard::PSO_MakeSaveGameValid(Header &cardheader, DEntry &direntry, std::vector<GCMBlock> &FileBuffer)
 {
 	u32 i,j;
 	u32 chksum;
@@ -1421,7 +1329,7 @@ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &Fi
 	}
 
 	// get encrypted destination memory card serial numbers
-	CARD_GetSerialNo(&serial1,&serial2);
+	cardheader.CARD_GetSerialNo(&serial1, &serial2);
 
 	// set new serial numbers
 	*(u32*)&FileBuffer[1].block[0x0158] = serial1;
diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h
new file mode 100644
index 0000000000..0b3fa41391
--- /dev/null
+++ b/Source/Core/Core/HW/GCMemcard.h
@@ -0,0 +1,413 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <string>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Sram.h"
+
+#define BE64(x) (Common::swap64(x))
+#define BE32(x) (Common::swap32(x))
+#define BE16(x) (Common::swap16(x))
+#define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8)));
+
+enum
+{
+	SLOT_A = 0,
+	SLOT_B = 1,
+	GCI = 0,
+	SUCCESS,
+	NOMEMCARD,
+	OPENFAIL,
+	OUTOFBLOCKS,
+	OUTOFDIRENTRIES,
+	LENGTHFAIL,
+	INVALIDFILESIZE,
+	TITLEPRESENT,
+	DIRLEN = 0x7F,
+	SAV = 0x80,
+	SAVFAIL,
+	GCS = 0x110,
+	GCSFAIL,
+	FAIL,
+	WRITEFAIL,
+	DELETE_FAIL,
+
+	MC_FST_BLOCKS  = 0x05,
+	MBIT_TO_BLOCKS = 0x10,
+	DENTRY_STRLEN  = 0x20,
+	DENTRY_SIZE    = 0x40,
+	BLOCK_SIZE     = 0x2000,
+	BAT_SIZE       = 0xFFB,
+
+	MemCard59Mb   = 0x04,
+	MemCard123Mb  = 0x08,
+	MemCard251Mb  = 0x10,
+	Memcard507Mb  = 0x20,
+	MemCard1019Mb = 0x40,
+	MemCard2043Mb = 0x80,
+
+	CI8SHARED = 1,
+	RGB5A3,
+	CI8,
+};
+
+class MemoryCardBase
+{
+public:
+	MemoryCardBase(int _card_index = 0, int sizeMb = MemCard2043Mb)
+		: card_index(_card_index)
+		, nintendo_card_id(sizeMb)
+	{
+	}
+	virtual ~MemoryCardBase() {}
+	virtual s32 Read(u32 address, s32 length, u8 *destaddress) = 0;
+	virtual s32 Write(u32 destaddress, s32 length, u8 *srcaddress) = 0;
+	virtual void ClearBlock(u32 address) = 0;
+	virtual void ClearAll() = 0;
+	virtual void DoState(PointerWrap &p) = 0;
+	u32 GetCardId() const { return nintendo_card_id; }
+	bool IsAddressInBounds(u32 address) const
+	{
+		return address <= (memory_card_size - 1);
+	}
+
+protected:
+	int card_index;
+	u16 nintendo_card_id;
+	u32 memory_card_size;
+};
+
+struct GCMBlock
+{
+	GCMBlock()
+	{
+		Erase();
+	}
+
+	void Erase()
+	{
+		memset(block, 0xFF, BLOCK_SIZE);
+	}
+
+	u8 block[BLOCK_SIZE];
+};
+
+void calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum);
+
+#pragma pack(push,1)
+struct Header           //Offset    Size    Description
+{
+	// Serial in libogc
+	u8 serial[12];      //0x0000    12      ?
+	u64 formatTime;     //0x000c    8       Time of format (OSTime value)
+	u32 SramBias;       //0x0014    4       SRAM bias at time of format
+	u32 SramLang;       //0x0018    4       SRAM language
+	u8 Unk2[4];         //0x001c    4       ? almost always 0
+	// end Serial in libogc
+	u8 deviceID[2];     //0x0020    2       0 if formated in slot A 1 if formated in slot B
+	u8 SizeMb[2];       //0x0022    2       Size of memcard in Mbits
+	u16 Encoding;       //0x0024    2       Encoding (ASCII or japanese)
+	u8 Unused1[468];    //0x0026    468     Unused (0xff)
+	u16 UpdateCounter;  //0x01fa    2       Update Counter (?, probably unused)
+	u16 Checksum;       //0x01fc    2       Additive Checksum
+	u16 Checksum_Inv;   //0x01fe    2       Inverse Checksum
+	u8 Unused2[7680];   //0x0200    0x1e00  Unused (0xff)
+
+
+	void CARD_GetSerialNo(u32 *serial1, u32 *serial2) const
+	{
+		u32 _serial[8];
+
+		for (int i = 0; i < 8; i++)
+		{
+			memcpy(&_serial[i], (u8 *)this + (i * 4), 4);
+		}
+
+		*serial1 = _serial[0] ^ _serial[2] ^ _serial[4] ^ _serial[6];
+		*serial2 = _serial[1] ^ _serial[3] ^ _serial[5] ^ _serial[7];
+	}
+
+	// Nintendo format algorithm.
+	// Constants are fixed by the GC SDK
+	// Changing the constants will break memorycard support
+	Header(int slot = 0, u16 sizeMb = MemCard2043Mb, bool ascii = true)
+	{
+		memset(this, 0xFF, BLOCK_SIZE);
+		*(u16 *)SizeMb = BE16(sizeMb);
+		Encoding = BE16(ascii ? 0 : 1);
+		u64 rand = CEXIIPL::GetGCTime();
+		formatTime = Common::swap64(rand);
+		for (int i = 0; i < 12; i++)
+		{
+			rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
+			serial[i] = (u8)(g_SRAM.flash_id[slot][i] + (u32)rand);
+			rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
+			rand &= (u64)0x0000000000007fffULL;
+		}
+		SramBias = g_SRAM.counter_bias;
+		SramLang = BE32(g_SRAM.lang);
+		// TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B
+		*(u32 *)&Unk2 = 0; // = _viReg[55];  static vu16* const _viReg = (u16*)0xCC002000;
+		*(u16 *)&deviceID = 0;
+		calc_checksumsBE((u16 *)this, 0xFE, &Checksum, &Checksum_Inv);
+	}
+};
+
+struct DEntry
+{
+	static const u8 DENTRY_SIZE = 0x40;
+	DEntry() { memset(this, 0xFF, DENTRY_SIZE); }
+	std::string GCI_FileName() const
+	{
+		std::string filename = std::string((char *)Makercode, 2) + '-' + std::string((char *)Gamecode, 4) + '-' + (char *)Filename +
+			".gci";
+		static Common::replace_v replacements;
+		if (replacements.size() == 0)
+		{
+			Common::ReadReplacements(replacements);
+			// Cannot add \r to replacements file due to it being a line ending char
+			// / might be ok, but we need to verify that this is only used on filenames
+			// as it is a dir_sep
+			replacements.push_back(std::make_pair('\r', std::string("__0d__")));
+			replacements.push_back(std::make_pair('/', std::string("__2f__")));
+
+		}
+
+		// Replaces chars that FAT32 can't support with strings defined in /sys/replace
+		for (auto& replacement : replacements)
+		{
+			for (size_t j = 0; (j = filename.find(replacement.first, j)) != filename.npos; ++j)
+				filename.replace(j, 1, replacement.second);
+		}
+		return filename;
+	}
+
+	u8 Gamecode[4];     //0x00       0x04    Gamecode
+	u8 Makercode[2];    //0x04      0x02    Makercode
+	u8 Unused1;         //0x06      0x01    reserved/unused (always 0xff, has no effect)
+	u8 BIFlags;         //0x07      0x01    banner gfx format and icon animation (Image Key)
+	                    //      Bit(s)  Description
+	                    //      2       Icon Animation 0: forward 1: ping-pong
+	                    //      1       [--0: No Banner 1: Banner present--] WRONG! YAGCD LIES!
+	                    //      0       [--Banner Color 0: RGB5A3 1: CI8--]  WRONG! YAGCD LIES!
+	                    //      bits 0 and 1: image format
+	                    //      00 no banner
+	                    //      01 CI8 banner
+	                    //      10 RGB5A3 banner
+	                    //      11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner
+	                    //
+	u8 Filename[DENTRY_STRLEN]; //0x08      0x20     Filename
+	u8 ModTime[4];      //0x28      0x04    Time of file's last modification in seconds since 12am, January 1st, 2000
+	u8 ImageOffset[4];  //0x2c      0x04    image data offset
+	u8 IconFmt[2];      //0x30      0x02    icon gfx format (2bits per icon)
+	                    //      Bits    Description
+	                    //      00      No icon
+	                    //      01      CI8 with a shared color palette after the last frame
+	                    //      10      RGB5A3
+	                    //      11      CI8 with a unique color palette after itself
+	                    //
+	u8 AnimSpeed[2];    //0x32      0x02    Animation speed (2bits per icon) (*1)
+	                    //      Bits    Description
+	                    //      00      No icon
+	                    //      01      Icon lasts for 4 frames
+	                    //      10      Icon lasts for 8 frames
+	                    //      11      Icon lasts for 12 frames
+	                    //
+	u8 Permissions;     //0x34      0x01    File-permissions
+	                    //      Bit Permission  Description
+	                    //      4   no move     File cannot be moved by the IPL
+	                    //      3   no copy     File cannot be copied by the IPL
+	                    //      2   public      Can be read by any game
+	                    //
+	u8 CopyCounter;     //0x35      0x01    Copy counter (*2)
+	u8 FirstBlock[2];   //0x36      0x02    Block no of first block of file (0 == offset 0)
+	u8 BlockCount[2];   //0x38      0x02    File-length (number of blocks in file)
+	u8 Unused2[2];      //0x3a      0x02    Reserved/unused (always 0xffff, has no effect)
+	u8 CommentsAddr[4]; //0x3c      0x04    Address of the two comments within the file data (*3)
+};
+
+struct Directory
+{
+	DEntry Dir[DIRLEN]; //0x0000            Directory Entries (max 127)
+	u8 Padding[0x3a];
+	u16 UpdateCounter;  //0x1ffa    2       Update Counter
+	u16 Checksum;       //0x1ffc    2       Additive Checksum
+	u16 Checksum_Inv;   //0x1ffe    2       Inverse Checksum
+	Directory()
+	{
+		memset(this, 0xFF, BLOCK_SIZE);
+		UpdateCounter = 0;
+		Checksum = BE16(0xF003);
+		Checksum_Inv = 0;
+	}
+	void Replace(DEntry d, int idx)
+	{
+		Dir[idx] = d;
+		fixChecksums();
+	}
+	void fixChecksums() { calc_checksumsBE((u16 *)this, 0xFFE, &Checksum, &Checksum_Inv); }
+};
+
+struct BlockAlloc
+{
+	u16 Checksum;       //0x0000    2       Additive Checksum
+	u16 Checksum_Inv;   //0x0002    2       Inverse Checksum
+	u16 UpdateCounter;  //0x0004    2       Update Counter
+	u16 FreeBlocks;     //0x0006    2       Free Blocks
+	u16 LastAllocated;  //0x0008    2       Last allocated Block
+	u16 Map[BAT_SIZE];  //0x000a    0x1ff8  Map of allocated Blocks
+	u16 GetNextBlock(u16 Block) const;
+	u16 NextFreeBlock(u16 MaxBlock, u16 StartingBlock = MC_FST_BLOCKS) const;
+	bool ClearBlocks(u16 StartingBlock, u16 Length);
+	void fixChecksums() { calc_checksumsBE((u16 *)&UpdateCounter, 0xFFE, &Checksum, &Checksum_Inv); }
+	BlockAlloc(u16 sizeMb = MemCard2043Mb)
+	{
+		memset(this, 0, BLOCK_SIZE);
+		// UpdateCounter = 0;
+		FreeBlocks = BE16((sizeMb * MBIT_TO_BLOCKS) - MC_FST_BLOCKS);
+		LastAllocated = BE16(4);
+		fixChecksums();
+	}
+	u16 AssignBlocksContiguous(u16 length)
+	{
+		u16 starting = BE16(LastAllocated) + 1;
+		if (length > BE16(FreeBlocks))
+			return 0xFFFF;
+		u16 current = starting;
+		while ((current - starting + 1) < length)
+		{
+			Map[current - 5] = BE16(current + 1);
+			current++;
+		}
+		Map[current - 5] = 0xFFFF;
+		LastAllocated = BE16(current);
+		FreeBlocks = BE16(BE16(FreeBlocks) - length);
+		fixChecksums();
+		return BE16(starting);
+	}
+};
+#pragma pack(pop)
+
+class GCIFile
+{
+public:
+	bool LoadSaveBlocks();
+	bool HasCopyProtection() const
+	{
+		if ((strcmp((char*)m_gci_header.Filename, "PSO_SYSTEM") == 0) ||
+			(strcmp((char*)m_gci_header.Filename, "PSO3_SYSTEM") == 0) ||
+			(strcmp((char*)m_gci_header.Filename, "f_zero.dat") == 0))
+			return true;
+		return false;
+	}
+
+	void DoState(PointerWrap &p);
+	DEntry m_gci_header;
+	std::vector<GCMBlock> m_save_data;
+	std::vector<u16> m_used_blocks;
+	int UsesBlock(u16 blocknum);
+	bool m_dirty;
+	std::string m_filename;
+};
+
+class GCMemcard : NonCopyable
+{
+private:
+	bool m_valid;
+	std::string m_fileName;
+
+	u32 maxBlock;
+	u16 m_sizeMb;
+
+	Header hdr;
+	Directory dir, dir_backup, *CurrentDir, *PreviousDir;
+	BlockAlloc bat, bat_backup, *CurrentBat, *PreviousBat;
+
+	std::vector<GCMBlock> mc_data_blocks;
+
+	u32 ImportGciInternal(FILE* gcih, const std::string& inputFile, const std::string &outputFile);
+	void InitDirBatPointers();
+
+public:
+
+	GCMemcard(const std::string& fileName, bool forceCreation=false, bool sjis=false);
+	bool IsValid() const { return m_valid; }
+	bool IsAsciiEncoding() const;
+	bool Save();
+	bool Format(bool ascii = true, u16 SizeMb = MemCard2043Mb);
+	static bool Format(u8 *card_data, bool ascii = true, u16 SizeMb = MemCard2043Mb);
+	static s32 FZEROGX_MakeSaveGameValid(Header &cardheader, DEntry &direntry, std::vector<GCMBlock> &FileBuffer);
+	static s32 PSO_MakeSaveGameValid(Header &cardheader, DEntry &direntry, std::vector<GCMBlock> &FileBuffer);
+
+	u32 TestChecksums() const;
+	bool FixChecksums();
+
+	// get number of file entries in the directory
+	u8 GetNumFiles() const;
+	u8 GetFileIndex(u8 fileNumber) const;
+
+	// get the free blocks from bat
+	u16 GetFreeBlocks() const;
+
+	// If title already on memcard returns index, otherwise returns -1
+	u8 TitlePresent(const DEntry& d) const;
+
+	bool GCI_FileName(u8 index, std::string &filename) const;
+	// DEntry functions, all take u8 index < DIRLEN (127)
+	std::string DEntry_GameCode(u8 index) const;
+	std::string DEntry_Makercode(u8 index) const;
+	std::string DEntry_BIFlags(u8 index) const;
+	std::string DEntry_FileName(u8 index) const;
+	u32 DEntry_ModTime(u8 index) const;
+	u32 DEntry_ImageOffset(u8 index) const;
+	std::string DEntry_IconFmt(u8 index) const;
+	std::string DEntry_AnimSpeed(u8 index) const;
+	std::string DEntry_Permissions(u8 index) const;
+	u8 DEntry_CopyCounter(u8 index) const;
+	// get first block for file
+	u16 DEntry_FirstBlock(u8 index) const;
+	// get file length in blocks
+	u16 DEntry_BlockCount(u8 index) const;
+	u32 DEntry_CommentsAddress(u8 index) const;
+	std::string GetSaveComment1(u8 index) const;
+	std::string GetSaveComment2(u8 index) const;
+	// Copies a DEntry from u8 index to DEntry& data
+	bool GetDEntry(u8 index, DEntry &dest) const;
+
+	u32 GetSaveData(u8 index, std::vector<GCMBlock> &saveBlocks) const;
+
+	// adds the file to the directory and copies its contents
+	u32 ImportFile(DEntry& direntry, std::vector<GCMBlock> &saveBlocks);
+
+	// delete a file from the directory
+	u32 RemoveFile(u8 index);
+
+	// reads a save from another memcard, and imports the data into this memcard
+	u32 CopyFrom(const GCMemcard& source, u8 index);
+
+	// reads a .gci/.gcs/.sav file and calls ImportFile or saves out a gci file
+	u32 ImportGci(const std::string& inputFile,const std::string &outputFile);
+
+	// writes a .gci file to disk containing index
+	u32 ExportGci(u8 index, const std::string& fileName, const std::string &directory) const;
+
+	// GCI files are untouched, SAV files are byteswapped
+	// GCS files have the block count set, default is 1 (For export as GCS)
+	static void Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length = BLOCK_SIZE);
+
+	// reads the banner image
+	bool ReadBannerRGBA8(u8 index, u32* buffer) const;
+
+	// reads the animation frames
+	u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const;
+};
diff --git a/Source/Core/Core/HW/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcardDirectory.cpp
new file mode 100644
index 0000000000..f87fd3eede
--- /dev/null
+++ b/Source/Core/Core/HW/GCMemcardDirectory.cpp
@@ -0,0 +1,712 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+#include <cinttypes>
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/GCMemcardDirectory.h"
+#include "DiscIO/Volume.h"
+
+const int NO_INDEX = -1;
+static const char *MC_HDR = "MC_SYSTEM_AREA";
+
+int GCMemcardDirectory::LoadGCI(const std::string& fileName, DiscIO::IVolume::ECountry card_region, bool currentGameOnly)
+{
+	File::IOFile gcifile(fileName, "rb");
+	if (gcifile)
+	{
+		GCIFile gci;
+		gci.m_filename = fileName;
+		gci.m_dirty = false;
+		if (!gcifile.ReadBytes(&(gci.m_gci_header), DENTRY_SIZE))
+		{
+			ERROR_LOG(EXPANSIONINTERFACE, "%s failed to read header", fileName.c_str());
+			return NO_INDEX;
+		}
+
+		DiscIO::IVolume::ECountry gci_region;
+		// check region
+		switch (gci.m_gci_header.Gamecode[3])
+		{
+		case 'J':
+			gci_region = DiscIO::IVolume::COUNTRY_JAPAN;
+			break;
+		case 'E':
+			gci_region = DiscIO::IVolume::COUNTRY_USA;
+			break;
+		case 'C':
+			// Used by Datel Action Replay Save
+			// can be on any regions card
+			gci_region = card_region;
+			break;
+		default:
+			gci_region = DiscIO::IVolume::COUNTRY_EUROPE;
+			break;
+		}
+
+		if (gci_region != card_region)
+		{
+			PanicAlertT("GCI save file was not loaded because it is the wrong region for this memory card:\n%s",
+				fileName.c_str());
+			return NO_INDEX;
+		}
+
+		std::string gci_filename = gci.m_gci_header.GCI_FileName();
+		for (u16 i = 0; i < m_loaded_saves.size(); ++i)
+		{
+			if (m_loaded_saves[i] == gci_filename)
+			{
+				PanicAlertT(
+					"%s\nwas not loaded because it has the same internal filename as previously loaded save\n%s",
+					gci.m_filename.c_str(), m_saves[i].m_filename.c_str());
+				return NO_INDEX;
+			}
+		}
+
+		u16 numBlocks = BE16(gci.m_gci_header.BlockCount);
+		// largest number of free blocks on a memory card
+		// in reality, there are not likely any valid gci files > 251 blocks
+		if (numBlocks > 2043)
+		{
+			PanicAlertT("%s\nwas not loaded because it is an invalid gci.\n Number of blocks claimed to be %d",
+						gci.m_filename.c_str(), numBlocks);
+			return NO_INDEX;
+		}
+
+		u32 size = numBlocks * BLOCK_SIZE;
+		u64 file_size = gcifile.GetSize();
+		if (file_size != size + DENTRY_SIZE)
+		{
+			PanicAlertT("%s\nwas not loaded because it is an invalid gci.\n File size (%" PRIx64
+						") does not match the size recorded in the header (%d)",
+						gci.m_filename.c_str(), file_size, size + DENTRY_SIZE);
+			return NO_INDEX;
+		}
+
+		if (m_GameId == BE32(gci.m_gci_header.Gamecode))
+		{
+			gci.LoadSaveBlocks();
+		}
+		else
+		{
+			if (currentGameOnly)
+			{
+				return NO_INDEX;
+			}
+			int totalBlocks = BE16(m_hdr.SizeMb)*MBIT_TO_BLOCKS - MC_FST_BLOCKS;
+			int freeBlocks = BE16(m_bat1.FreeBlocks);
+			if (totalBlocks > freeBlocks * 10)
+			{
+
+				PanicAlertT("%s\nwas not loaded because there is less than 10%% free space on the memorycard\n"\
+					"Total Blocks: %d; Free Blocks: %d",
+					gci.m_filename.c_str(), totalBlocks, freeBlocks);
+				return NO_INDEX;
+			}
+		}
+		u16 first_block = m_bat1.AssignBlocksContiguous(numBlocks);
+		if (first_block == 0xFFFF)
+		{
+			PanicAlertT("%s\nwas not loaded because there are not enough free blocks on virtual memorycard",
+						fileName.c_str());
+			return NO_INDEX;
+		}
+		*(u16 *)&gci.m_gci_header.FirstBlock = first_block;
+		if (gci.HasCopyProtection() && gci.LoadSaveBlocks())
+		{
+
+			GCMemcard::PSO_MakeSaveGameValid(m_hdr, gci.m_gci_header, gci.m_save_data);
+			GCMemcard::FZEROGX_MakeSaveGameValid(m_hdr, gci.m_gci_header, gci.m_save_data);
+		}
+		int idx = (int)m_saves.size();
+		m_dir1.Replace(gci.m_gci_header, idx);
+		m_saves.push_back(std::move(gci));
+		SetUsedBlocks(idx);
+
+		return idx;
+	}
+	return NO_INDEX;
+}
+
+GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, int slot, u16 sizeMb, bool ascii, DiscIO::IVolume::ECountry card_region, int gameId)
+	: MemoryCardBase(slot, sizeMb)
+	, m_GameId(gameId)
+	, m_LastBlock(-1)
+	, m_hdr(slot, sizeMb, ascii)
+	, m_bat1(sizeMb)
+	, m_saves(0)
+	, m_SaveDirectory(directory)
+	, m_exiting(false)
+{
+	// Use existing header data if available
+	if (File::Exists(m_SaveDirectory + MC_HDR))
+	{
+		File::IOFile hdrfile((m_SaveDirectory + MC_HDR), "rb");
+		hdrfile.ReadBytes(&m_hdr, BLOCK_SIZE);
+	}
+
+	std::vector<std::string> rFilenames = DoFileSearch({"*.gci"}, {m_SaveDirectory});
+
+	if (rFilenames.size() > 112)
+	{
+		Core::DisplayMessage(
+		StringFromFormat("WARNING: There are more than 112 save files on this memorycards"\
+		"\n Only loading the first 112 in the folder, unless the gameid is the current games id"),
+		4000);
+	}
+
+	for (const std::string& gciFile : rFilenames)
+	{
+		if (m_saves.size() == DIRLEN)
+		{
+			PanicAlertT("There are too many gci files in the folder\n%s\nOnly the first 127 will be available",
+				m_SaveDirectory.c_str());
+			break;
+		}
+		int index = LoadGCI(gciFile, card_region, m_saves.size() > 112 );
+		if (index != NO_INDEX)
+		{
+			m_loaded_saves.push_back(m_saves.at(index).m_gci_header.GCI_FileName());
+		}
+
+	}
+
+	m_loaded_saves.clear();
+	m_dir1.fixChecksums();
+	m_dir2 = m_dir1;
+	m_bat2 = m_bat1;
+
+	m_flush_thread = std::thread(&GCMemcardDirectory::FlushThread, this);
+}
+
+void GCMemcardDirectory::FlushThread()
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableMemcardSaving)
+	{
+		return;
+	}
+
+
+	Common::SetCurrentThreadName(
+		StringFromFormat("Memcard%x-Flush", card_index).c_str());
+
+	while (true)
+	{
+		// no-op until signalled
+		m_flush_trigger.Wait();
+
+		if (m_exiting)
+		{
+			m_exiting = false;
+			return;
+		}
+		// no-op as long as signalled within flush_interval
+		while (m_flush_trigger.WaitFor(flush_interval))
+		{
+			if (m_exiting)
+			{
+				m_exiting = false;
+				return;
+			}
+		}
+
+		FlushToFile();
+	}
+}
+
+GCMemcardDirectory::~GCMemcardDirectory()
+{
+	m_exiting = true;
+	m_flush_trigger.Set();
+	m_flush_thread.join();
+
+	FlushToFile();
+}
+
+s32 GCMemcardDirectory::Read(u32 address, s32 length, u8 *destaddress)
+{
+
+	s32 block = address / BLOCK_SIZE;
+	u32 offset = address % BLOCK_SIZE;
+	s32 extra = 0; // used for read calls that are across multiple blocks
+
+	if (offset + length > BLOCK_SIZE)
+	{
+		extra = length + offset - BLOCK_SIZE;
+		length -= extra;
+
+		// verify that we haven't calculated a length beyond BLOCK_SIZE
+		_dbg_assert_msg_(EXPANSIONINTERFACE, (address + length) % BLOCK_SIZE == 0,
+						 "Memcard directory Read Logic Error");
+	}
+
+	if (m_LastBlock != block)
+	{
+		switch (block)
+		{
+		case 0:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_hdr;
+			break;
+		case 1:
+			m_LastBlock = -1;
+			m_LastBlockAddress = (u8 *)&m_dir1;
+			break;
+		case 2:
+			m_LastBlock = -1;
+			m_LastBlockAddress = (u8 *)&m_dir2;
+			break;
+		case 3:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_bat1;
+			break;
+		case 4:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_bat2;
+			break;
+		default:
+			m_LastBlock = SaveAreaRW(block);
+
+			if (m_LastBlock == -1)
+			{
+				memset(destaddress, 0xFF, length);
+				return 0;
+			}
+		}
+	}
+
+	memcpy(destaddress, m_LastBlockAddress + offset, length);
+	if (extra)
+		extra = Read(address + length, extra, destaddress + length);
+	return length + extra;
+}
+
+s32 GCMemcardDirectory::Write(u32 destaddress, s32 length, u8 *srcaddress)
+{
+	std::unique_lock<std::mutex> l(m_write_mutex);
+	if (length != 0x80)
+		INFO_LOG(EXPANSIONINTERFACE, "WRITING TO %x, len %x", destaddress, length);
+	s32 block = destaddress / BLOCK_SIZE;
+	u32 offset = destaddress % BLOCK_SIZE;
+	s32 extra = 0; // used for write calls that are across multiple blocks
+
+	if (offset + length > BLOCK_SIZE)
+	{
+		extra = length + offset - BLOCK_SIZE;
+		length -= extra;
+
+		// verify that we haven't calculated a length beyond BLOCK_SIZE
+		_dbg_assert_msg_(EXPANSIONINTERFACE, (destaddress + length) % BLOCK_SIZE == 0,
+		                "Memcard directory Write Logic Error");
+	}
+	if (m_LastBlock != block)
+	{
+		switch (block)
+		{
+		case 0:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_hdr;
+			break;
+		case 1:
+		case 2:
+		{
+			m_LastBlock = -1;
+			s32 bytes_written = 0;
+			while (length > 0)
+			{
+				s32 to_write = std::min<s32>(DENTRY_SIZE, length);
+				bytes_written += DirectoryWrite(destaddress + bytes_written, to_write, srcaddress + bytes_written);
+				length -= to_write;
+			}
+			return bytes_written;
+		}
+		case 3:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_bat1;
+			break;
+		case 4:
+			m_LastBlock = block;
+			m_LastBlockAddress = (u8 *)&m_bat2;
+			break;
+		default:
+			m_LastBlock = SaveAreaRW(block, true);
+			if (m_LastBlock == -1)
+			{
+				PanicAlertT("Report: GCIFolder Writing to unallocated block %x", block);
+				exit(0);
+			}
+		}
+	}
+
+	memcpy(m_LastBlockAddress + offset, srcaddress, length);
+
+	l.unlock();
+	if (extra)
+		extra = Write(destaddress + length, extra, srcaddress + length);
+	if (offset + length == BLOCK_SIZE)
+		m_flush_trigger.Set();
+	return length + extra;
+}
+
+void GCMemcardDirectory::ClearBlock(u32 address)
+{
+	if (address % BLOCK_SIZE)
+	{
+		PanicAlertT("GCMemcardDirectory: ClearBlock called with invalid block address");
+		return;
+	}
+
+	u32 block = address / BLOCK_SIZE;
+	INFO_LOG(EXPANSIONINTERFACE, "clearing block %d", block);
+	switch (block)
+	{
+	case 0:
+		m_LastBlock = block;
+		m_LastBlockAddress = (u8 *)&m_hdr;
+		break;
+	case 1:
+		m_LastBlock = -1;
+		m_LastBlockAddress = (u8 *)&m_dir1;
+		break;
+	case 2:
+		m_LastBlock = -1;
+		m_LastBlockAddress = (u8 *)&m_dir2;
+		break;
+	case 3:
+		m_LastBlock = block;
+		m_LastBlockAddress = (u8 *)&m_bat1;
+		break;
+	case 4:
+		m_LastBlock = block;
+		m_LastBlockAddress = (u8 *)&m_bat2;
+		break;
+	default:
+		m_LastBlock = SaveAreaRW(block, true);
+		if (m_LastBlock == -1)
+			return;
+	}
+	((GCMBlock *)m_LastBlockAddress)->Erase();
+}
+
+inline void GCMemcardDirectory::SyncSaves()
+{
+	Directory *current = &m_dir2;
+
+	if (BE16(m_dir1.UpdateCounter) > BE16(m_dir2.UpdateCounter))
+	{
+		current = &m_dir1;
+	}
+
+	for (u32 i = 0; i < DIRLEN; ++i)
+	{
+		if (BE32(current->Dir[i].Gamecode) != 0xFFFFFFFF)
+		{
+			INFO_LOG(EXPANSIONINTERFACE, "Syncing Save %x", *(u32 *)&(current->Dir[i].Gamecode));
+			bool added = false;
+			while (i >= m_saves.size())
+			{
+				GCIFile temp;
+				m_saves.push_back(temp);
+				added = true;
+			}
+
+			if (added || memcmp((u8 *)&(m_saves[i].m_gci_header), (u8 *)&(current->Dir[i]), DENTRY_SIZE))
+			{
+				m_saves[i].m_dirty = true;
+				u32 gamecode = BE32(m_saves[i].m_gci_header.Gamecode);
+				u32 newGameCode = BE32(current->Dir[i].Gamecode);
+				u32 old_start = BE16(m_saves[i].m_gci_header.FirstBlock);
+				u32 new_start = BE16(current->Dir[i].FirstBlock);
+
+				if ((gamecode != 0xFFFFFFFF)
+					&& (gamecode != newGameCode))
+				{
+					PanicAlertT("Game overwrote with another games save, data corruption ahead %x, %x ",
+						BE32(m_saves[i].m_gci_header.Gamecode), BE32(current->Dir[i].Gamecode));
+				}
+				memcpy((u8 *)&(m_saves[i].m_gci_header), (u8 *)&(current->Dir[i]), DENTRY_SIZE);
+				if (old_start != new_start)
+				{
+					INFO_LOG(EXPANSIONINTERFACE, "Save moved from %x to %x", old_start, new_start);
+					m_saves[i].m_used_blocks.clear();
+					m_saves[i].m_save_data.clear();
+				}
+				if (m_saves[i].m_used_blocks.size() == 0)
+				{
+					SetUsedBlocks(i);
+				}
+			}
+		}
+		else if ((i < m_saves.size()) && (*(u32 *)&(m_saves[i].m_gci_header) != 0xFFFFFFFF))
+		{
+			INFO_LOG(EXPANSIONINTERFACE, "Clearing and/or Deleting Save %x", BE32(m_saves[i].m_gci_header.Gamecode));
+			*(u32 *)&(m_saves[i].m_gci_header.Gamecode) = 0xFFFFFFFF;
+			m_saves[i].m_save_data.clear();
+			m_saves[i].m_used_blocks.clear();
+			m_saves[i].m_dirty = true;
+
+		}
+	}
+}
+inline s32 GCMemcardDirectory::SaveAreaRW(u32 block, bool writing)
+{
+	for (u16 i = 0; i < m_saves.size(); ++i)
+	{
+		if (BE32(m_saves[i].m_gci_header.Gamecode) != 0xFFFFFFFF)
+		{
+			if (m_saves[i].m_used_blocks.size() == 0)
+			{
+				SetUsedBlocks(i);
+			}
+
+			int idx = m_saves[i].UsesBlock(block);
+			if (idx != -1)
+			{
+				if (!m_saves[i].LoadSaveBlocks())
+				{
+					int num_blocks = BE16(m_saves[i].m_gci_header.BlockCount);
+					while (num_blocks)
+					{
+						m_saves[i].m_save_data.emplace_back();
+						num_blocks--;
+					}
+				}
+
+				if (writing)
+				{
+					m_saves[i].m_dirty = true;
+				}
+
+				m_LastBlock = block;
+				m_LastBlockAddress = m_saves[i].m_save_data[idx].block;
+				return m_LastBlock;
+			}
+		}
+	}
+	return -1;
+}
+
+s32 GCMemcardDirectory::DirectoryWrite(u32 destaddress, u32 length, u8 *srcaddress)
+{
+	u32 block = destaddress / BLOCK_SIZE;
+	u32 offset = destaddress % BLOCK_SIZE;
+	Directory *dest = (block == 1) ? &m_dir1 : &m_dir2;
+	u16 Dnum = offset / DENTRY_SIZE;
+
+	if (Dnum == DIRLEN)
+	{
+		// first 58 bytes should always be 0xff
+		// needed to update the update ctr, checksums
+		// could check for writes to the 6 important bytes but doubtful that it improves performance noticably
+		memcpy((u8 *)(dest)+offset, srcaddress, length);
+		SyncSaves();
+	}
+	else
+		memcpy((u8 *)(dest)+offset, srcaddress, length);
+	return length;
+}
+
+bool GCMemcardDirectory::SetUsedBlocks(int saveIndex)
+{
+	BlockAlloc *currentBat;
+	if (BE16(m_bat2.UpdateCounter) > BE16(m_bat1.UpdateCounter))
+		currentBat = &m_bat2;
+	else
+		currentBat = &m_bat1;
+
+	u16 block = BE16(m_saves[saveIndex].m_gci_header.FirstBlock);
+	while (block != 0xFFFF)
+	{
+		m_saves[saveIndex].m_used_blocks.push_back(block);
+		block = currentBat->GetNextBlock(block);
+		if (block == 0)
+		{
+			PanicAlertT("BAT Incorrect, Dolphin will now exit");
+			exit(0);
+		}
+	}
+
+	u16 num_blocks = BE16(m_saves[saveIndex].m_gci_header.BlockCount);
+	u16 blocksFromBat = (u16)m_saves[saveIndex].m_used_blocks.size();
+	if (blocksFromBat != num_blocks)
+	{
+		PanicAlertT("Warning BAT number of blocks %d does not match file header loaded %d", blocksFromBat, num_blocks);
+		return false;
+	}
+
+	return true;
+}
+
+void GCMemcardDirectory::FlushToFile()
+{
+	std::unique_lock<std::mutex> l(m_write_mutex);
+	int errors = 0;
+	DEntry invalid;
+	for (u16 i = 0; i < m_saves.size(); ++i)
+	{
+		if (m_saves[i].m_dirty)
+		{
+			if (BE32(m_saves[i].m_gci_header.Gamecode) != 0xFFFFFFFF)
+			{
+				m_saves[i].m_dirty = false;
+				if (m_saves[i].m_filename.empty())
+				{
+					std::string defaultSaveName = m_SaveDirectory + m_saves[i].m_gci_header.GCI_FileName();
+
+					// Check to see if another file is using the same name
+					// This seems unlikely except in the case of file corruption
+					// otherwise what user would name another file this way?
+					for (int j = 0; File::Exists(defaultSaveName) && j < 10; ++j)
+					{
+						defaultSaveName.insert(defaultSaveName.end() - 4, '0');
+					}
+					if (File::Exists(defaultSaveName))
+						PanicAlertT("Failed to find new filename\n %s\n will be overwritten", defaultSaveName.c_str());
+					m_saves[i].m_filename = defaultSaveName;
+				}
+				File::IOFile GCI(m_saves[i].m_filename, "wb");
+				if (GCI)
+				{
+					GCI.WriteBytes(&m_saves[i].m_gci_header, DENTRY_SIZE);
+					GCI.WriteBytes(m_saves[i].m_save_data.data(), BLOCK_SIZE * m_saves[i].m_save_data.size());
+
+					if (GCI.IsGood())
+					{
+						Core::DisplayMessage(
+							StringFromFormat("Wrote save contents to %s", m_saves[i].m_filename.c_str()), 4000);
+					}
+					else
+					{
+						++errors;
+						Core::DisplayMessage(
+							StringFromFormat("Failed to write save contents to %s", m_saves[i].m_filename.c_str()),
+							4000);
+						ERROR_LOG(EXPANSIONINTERFACE, "Failed to save data to %s", m_saves[i].m_filename.c_str());
+					}
+				}
+			}
+			else if (m_saves[i].m_filename.length() != 0)
+			{
+				m_saves[i].m_dirty = false;
+				std::string &oldname = m_saves[i].m_filename;
+				std::string deletedname = oldname + ".deleted";
+				if (File::Exists(deletedname))
+					File::Delete(deletedname);
+				File::Rename(oldname, deletedname);
+				m_saves[i].m_filename.clear();
+				m_saves[i].m_save_data.clear();
+				m_saves[i].m_used_blocks.clear();
+			}
+		}
+
+		// Unload the save data for any game that is not running
+		// we could use !m_dirty, but some games have multiple gci files and may not write to them simultaneously
+		// this ensures that the save data for all of the current games gci files are stored in the savestate
+		u32 gamecode = BE32(m_saves[i].m_gci_header.Gamecode);
+		if (gamecode != m_GameId && gamecode != 0xFFFFFFFF && m_saves[i].m_save_data.size())
+		{
+			INFO_LOG(EXPANSIONINTERFACE, "Flushing savedata to disk for %s", m_saves[i].m_filename.c_str());
+			m_saves[i].m_save_data.clear();
+		}
+	}
+#if _WRITE_MC_HEADER
+	u8 mc[BLOCK_SIZE * MC_FST_BLOCKS];
+	Read(0, BLOCK_SIZE * MC_FST_BLOCKS, mc);
+	File::IOFile hdrfile(m_SaveDirectory + MC_HDR, "wb");
+	hdrfile.WriteBytes(mc, BLOCK_SIZE * MC_FST_BLOCKS);
+#endif
+}
+
+void GCMemcardDirectory::DoState(PointerWrap &p)
+{
+	std::unique_lock<std::mutex> l(m_write_mutex);
+	m_LastBlock = -1;
+	m_LastBlockAddress = nullptr;
+	p.Do(m_SaveDirectory);
+	p.DoPOD<Header>(m_hdr);
+	p.DoPOD<Directory>(m_dir1);
+	p.DoPOD<Directory>(m_dir2);
+	p.DoPOD<BlockAlloc>(m_bat1);
+	p.DoPOD<BlockAlloc>(m_bat2);
+	int numSaves = (int)m_saves.size();
+	p.Do(numSaves);
+	m_saves.resize(numSaves);
+	for (auto itr = m_saves.begin(); itr != m_saves.end(); ++itr)
+	{
+		itr->DoState(p);
+	}
+}
+
+bool GCIFile::LoadSaveBlocks()
+{
+	if (m_save_data.size() == 0)
+	{
+		if (m_filename.empty())
+			return false;
+
+		File::IOFile savefile(m_filename, "rb");
+		if (!savefile)
+			return false;
+
+		INFO_LOG(EXPANSIONINTERFACE, "Reading savedata from disk for %s", m_filename.c_str());
+		savefile.Seek(DENTRY_SIZE, SEEK_SET);
+		u16 num_blocks = BE16(m_gci_header.BlockCount);
+		m_save_data.resize(num_blocks);
+		if (!savefile.ReadBytes(m_save_data.data(), num_blocks * BLOCK_SIZE))
+		{
+			PanicAlertT("Failed to read data from gci file %s", m_filename.c_str());
+			m_save_data.clear();
+			return false;
+		}
+	}
+	return true;
+}
+
+int GCIFile::UsesBlock(u16 blocknum)
+{
+	for (u16 i = 0; i < m_used_blocks.size(); ++i)
+	{
+		if (m_used_blocks[i] == blocknum)
+			return i;
+	}
+	return -1;
+}
+
+void GCIFile::DoState(PointerWrap &p)
+{
+	p.DoPOD<DEntry>(m_gci_header);
+	p.Do(m_dirty);
+	p.Do(m_filename);
+	int numBlocks = (int)m_save_data.size();
+	p.Do(numBlocks);
+	m_save_data.resize(numBlocks);
+	for (auto itr = m_save_data.begin(); itr != m_save_data.end(); ++itr)
+	{
+		p.DoPOD<GCMBlock>(*itr);
+	}
+	p.Do(m_used_blocks);
+}
+
+void MigrateFromMemcardFile(const std::string& strDirectoryName, int card_index)
+{
+	File::CreateFullPath(strDirectoryName);
+	std::string ini_memcard =
+		(card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
+	if (File::Exists(ini_memcard))
+	{
+		GCMemcard memcard(ini_memcard.c_str());
+		if (memcard.IsValid())
+		{
+			for (u8 i = 0; i < DIRLEN; i++)
+			{
+				memcard.ExportGci(i, "", strDirectoryName);
+			}
+		}
+	}
+}
diff --git a/Source/Core/Core/HW/GCMemcardDirectory.h b/Source/Core/Core/HW/GCMemcardDirectory.h
new file mode 100644
index 0000000000..2ddbfa4a1b
--- /dev/null
+++ b/Source/Core/Core/HW/GCMemcardDirectory.h
@@ -0,0 +1,60 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <chrono>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "Common/Event.h"
+#include "Core/HW/GCMemcard.h"
+#include "DiscIO/Volume.h"
+
+// Uncomment this to write the system data of the memorycard from directory to disc
+//#define _WRITE_MC_HEADER 1
+void MigrateFromMemcardFile(const std::string& strDirectoryName, int card_index);
+
+class GCMemcardDirectory : public MemoryCardBase, NonCopyable
+{
+public:
+	GCMemcardDirectory(const std::string& directory, int slot = 0, u16 sizeMb = MemCard2043Mb, bool ascii = true,
+		DiscIO::IVolume::ECountry  card_region = DiscIO::IVolume::COUNTRY_EUROPE, int gameId = 0);
+	~GCMemcardDirectory();
+	void FlushToFile();
+	void FlushThread();
+	s32 Read(u32 address, s32 length, u8 *destaddress) override;
+	s32 Write(u32 destaddress, s32 length, u8 *srcaddress) override;
+	void ClearBlock(u32 address) override;
+	void ClearAll() override {}
+	void DoState(PointerWrap &p) override;
+
+private:
+	int LoadGCI(const std::string& fileName, DiscIO::IVolume::ECountry card_region, bool currentGameOnly);
+	inline s32 SaveAreaRW(u32 block, bool writing = false);
+	// s32 DirectoryRead(u32 offset, u32 length, u8* destaddress);
+	s32 DirectoryWrite(u32 destaddress, u32 length, u8 *srcaddress);
+	inline void SyncSaves();
+	bool SetUsedBlocks(int saveIndex);
+
+	u32 m_GameId;
+	s32 m_LastBlock;
+	u8 *m_LastBlockAddress;
+
+	Header m_hdr;
+	Directory m_dir1, m_dir2;
+	BlockAlloc m_bat1, m_bat2;
+	std::vector<GCIFile> m_saves;
+
+	std::vector<std::string> m_loaded_saves;
+	std::string m_SaveDirectory;
+	const std::chrono::seconds flush_interval = std::chrono::seconds(1);
+	Common::Event m_flush_trigger;
+	std::mutex m_write_mutex;
+	std::atomic<bool> m_exiting;
+	std::thread m_flush_thread;
+};
diff --git a/Source/Core/Core/HW/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcardRaw.cpp
new file mode 100644
index 0000000000..a5dd50e03f
--- /dev/null
+++ b/Source/Core/Core/HW/GCMemcardRaw.cpp
@@ -0,0 +1,205 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <chrono>
+#include "Common/ChunkFile.h"
+#include "Common/FileUtil.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/GCMemcard.h"
+#include "Core/HW/GCMemcardRaw.h"
+
+#define SIZE_TO_Mb (1024 * 8 * 16)
+#define MC_HDR_SIZE 0xA000
+
+MemoryCard::MemoryCard(const std::string& filename, int _card_index, u16 sizeMb)
+	: MemoryCardBase(_card_index, sizeMb)
+	, m_filename(filename)
+{
+	File::IOFile pFile(m_filename, "rb");
+	if (pFile)
+	{
+		// Measure size of the existing memcard file.
+		memory_card_size = (u32)pFile.GetSize();
+		nintendo_card_id = memory_card_size / SIZE_TO_Mb;
+		m_memcard_data = std::make_unique<u8[]>(memory_card_size);
+		memset(&m_memcard_data[0], 0xFF, memory_card_size);
+
+		INFO_LOG(EXPANSIONINTERFACE, "Reading memory card %s", m_filename.c_str());
+		pFile.ReadBytes(&m_memcard_data[0], memory_card_size);
+	}
+	else
+	{
+		// Create a new 128Mb memcard
+		nintendo_card_id = sizeMb;
+		memory_card_size = sizeMb * SIZE_TO_Mb;
+
+		m_memcard_data = std::make_unique<u8[]>(memory_card_size);
+		// Fills in MC_HDR_SIZE bytes
+		GCMemcard::Format(&m_memcard_data[0], m_filename.find(".JAP.raw") != std::string::npos, sizeMb);
+		memset(&m_memcard_data[MC_HDR_SIZE], 0xFF, memory_card_size - MC_HDR_SIZE);
+
+		INFO_LOG(EXPANSIONINTERFACE, "No memory card found - a new one was created.");
+	}
+
+	// Class members (including inherited ones) have now been initialized, so
+	// it's safe to startup the flush thread (which reads them).
+	m_flush_buffer = std::make_unique<u8[]>(memory_card_size);
+	m_flush_thread = std::thread(&MemoryCard::FlushThread, this);
+}
+
+MemoryCard::~MemoryCard()
+{
+	if (m_flush_thread.joinable())
+	{
+		m_flush_trigger.Set();
+
+		m_flush_thread.join();
+	}
+}
+
+void MemoryCard::FlushThread()
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableMemcardSaving)
+	{
+		return;
+	}
+
+	Common::SetCurrentThreadName(
+		StringFromFormat("Memcard%x-Flush", card_index).c_str());
+
+	const auto flush_interval = std::chrono::seconds(15);
+
+	while (true)
+	{
+		// If triggered, we're exiting.
+		// If timed out, check if we need to flush.
+		bool do_exit = m_flush_trigger.WaitFor(flush_interval);
+		if (!do_exit)
+		{
+			bool is_dirty = m_dirty.TestAndClear();
+			if (!is_dirty)
+			{
+				continue;
+			}
+		}
+
+		// Opening the file is purposefully done each iteration to ensure the
+		// file doesn't disappear out from under us after the first check.
+		File::IOFile pFile(m_filename, "r+b");
+
+		if (!pFile)
+		{
+			std::string dir;
+			SplitPath(m_filename, &dir, nullptr, nullptr);
+			if (!File::IsDirectory(dir))
+			{
+				File::CreateFullPath(dir);
+			}
+			pFile.Open(m_filename, "wb");
+		}
+
+		// Note - pFile may have changed above, after ctor
+		if (!pFile)
+		{
+			PanicAlertT(
+				"Could not write memory card file %s.\n\n"
+				"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?\n\n"
+				"Are you receiving this after moving the emulator directory?\nIf so, then you may "
+				"need to re-specify your memory card location in the options.",
+				m_filename.c_str());
+
+			// Exit the flushing thread - further flushes will be ignored unless
+			// the thread is recreated.
+			return;
+		}
+
+		{
+			std::unique_lock<std::mutex> l(m_flush_mutex);
+			memcpy(&m_flush_buffer[0], &m_memcard_data[0], memory_card_size);
+		}
+		pFile.WriteBytes(&m_flush_buffer[0], memory_card_size);
+
+		if (!do_exit)
+		{
+			Core::DisplayMessage(
+				StringFromFormat("Wrote memory card %c contents to %s",
+				card_index ? 'B' : 'A', m_filename.c_str()).c_str(),
+				4000);
+		}
+		else
+		{
+			return;
+		}
+	}
+}
+
+void MemoryCard::MakeDirty()
+{
+	m_dirty.Set();
+}
+
+s32 MemoryCard::Read(u32 srcaddress, s32 length, u8 *destaddress)
+{
+	if (!IsAddressInBounds(srcaddress))
+	{
+		PanicAlertT("MemoryCard: Read called with invalid source address, %x",
+					srcaddress);
+		return -1;
+	}
+
+	memcpy(destaddress, &m_memcard_data[srcaddress], length);
+	return length;
+}
+
+s32 MemoryCard::Write(u32 destaddress, s32 length, u8 *srcaddress)
+{
+	if (!IsAddressInBounds(destaddress))
+	{
+		PanicAlertT("MemoryCard: Write called with invalid destination address, %x",
+					destaddress);
+		return -1;
+	}
+
+	{
+		std::unique_lock<std::mutex> l(m_flush_mutex);
+		memcpy(&m_memcard_data[destaddress], srcaddress, length);
+	}
+	MakeDirty();
+	return length;
+}
+
+void MemoryCard::ClearBlock(u32 address)
+{
+	if (address & (BLOCK_SIZE - 1) || !IsAddressInBounds(address))
+	{
+		PanicAlertT("MemoryCard: ClearBlock called on invalid address %x",
+			address);
+		return;
+	}
+	else
+	{
+		std::unique_lock<std::mutex> l(m_flush_mutex);
+		memset(&m_memcard_data[address], 0xFF, BLOCK_SIZE);
+	}
+	MakeDirty();
+}
+
+void MemoryCard::ClearAll()
+{
+	{
+		std::unique_lock<std::mutex> l(m_flush_mutex);
+		memset(&m_memcard_data[0], 0xFF, memory_card_size);
+	}
+	MakeDirty();
+}
+
+void MemoryCard::DoState(PointerWrap &p)
+{
+	p.Do(card_index);
+	p.Do(memory_card_size);
+	p.DoArray(&m_memcard_data[0], memory_card_size);
+}
diff --git a/Source/Core/Core/HW/GCMemcardRaw.h b/Source/Core/Core/HW/GCMemcardRaw.h
new file mode 100644
index 0000000000..3fb90a8602
--- /dev/null
+++ b/Source/Core/Core/HW/GCMemcardRaw.h
@@ -0,0 +1,39 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include "Common/Event.h"
+#include "Common/Flag.h"
+#include "Core/HW/GCMemcard.h"
+
+class PointerWrap;
+
+class MemoryCard : public MemoryCardBase
+{
+public:
+	MemoryCard(const std::string& filename, int _card_index, u16 sizeMb = MemCard2043Mb);
+	~MemoryCard();
+	void FlushThread();
+	void MakeDirty();
+
+	s32 Read(u32 address, s32 length, u8 *destaddress) override;
+	s32 Write(u32 destaddress, s32 length, u8 *srcaddress) override;
+	void ClearBlock(u32 address) override;
+	void ClearAll() override;
+	void DoState(PointerWrap &p) override;
+
+private:
+	std::string m_filename;
+	std::unique_ptr<u8[]> m_memcard_data;
+	std::unique_ptr<u8[]> m_flush_buffer;
+	std::thread m_flush_thread;
+	std::mutex m_flush_mutex;
+	Common::Event m_flush_trigger;
+	Common::Flag m_dirty;
+};
diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp
new file mode 100644
index 0000000000..d2dc106c24
--- /dev/null
+++ b/Source/Core/Core/HW/GCPad.cpp
@@ -0,0 +1,82 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/GCPadEmu.h"
+#include "InputCommon/GCPadStatus.h"
+#include "InputCommon/InputConfig.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+namespace Pad
+{
+
+static InputConfig s_config("GCPadNew", _trans("Pad"), "GCPad");
+InputConfig* GetConfig()
+{
+	return &s_config;
+}
+
+void Shutdown()
+{
+	std::vector<ControllerEmu*>::const_iterator
+		i = s_config.controllers.begin(),
+		e = s_config.controllers.end();
+	for ( ; i!=e; ++i )
+		delete *i;
+	s_config.controllers.clear();
+
+	g_controller_interface.Shutdown();
+}
+
+// if plugin isn't initialized, init and load config
+void Initialize(void* const hwnd)
+{
+	// add 4 gcpads
+	if (s_config.controllers.empty())
+		for (unsigned int i = 0; i < 4; ++i)
+			s_config.controllers.push_back(new GCPad(i));
+
+	g_controller_interface.Initialize(hwnd);
+
+	// load the saved controller config
+	s_config.LoadConfig(true);
+}
+
+void LoadConfig()
+{
+	s_config.LoadConfig(true);
+}
+
+
+void GetStatus(u8 _numPAD, GCPadStatus* _pPADStatus)
+{
+	memset(_pPADStatus, 0, sizeof(*_pPADStatus));
+	_pPADStatus->err = PAD_ERR_NONE;
+
+	// if we are on the next input cycle, update output and input
+	static int _last_numPAD = 4;
+	if (_numPAD <= _last_numPAD)
+	{
+		g_controller_interface.UpdateInput();
+	}
+	_last_numPAD = _numPAD;
+
+	// get input
+	((GCPad*)s_config.controllers[_numPAD])->GetInput(_pPADStatus);
+}
+
+void Rumble(u8 _numPAD, const ControlState strength)
+{
+	((GCPad*)s_config.controllers[ _numPAD ])->SetOutput(strength);
+}
+
+bool GetMicButton(u8 pad)
+{
+	return ((GCPad*)s_config.controllers[pad])->GetMicButton();
+}
+
+}
diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h
new file mode 100644
index 0000000000..e6b910ad70
--- /dev/null
+++ b/Source/Core/Core/HW/GCPad.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+class InputConfig;
+struct GCPadStatus;
+
+namespace Pad
+{
+
+void Shutdown();
+void Initialize(void* const hwnd);
+void LoadConfig();
+
+InputConfig* GetConfig();
+
+void GetStatus(u8 _numPAD, GCPadStatus* _pPADStatus);
+void Rumble(u8 _numPAD, const ControlState strength);
+
+bool GetMicButton(u8 pad);
+}
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
new file mode 100644
index 0000000000..0190a38d09
--- /dev/null
+++ b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -0,0 +1,202 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/Host.h"
+#include "Core/HW/GCPadEmu.h"
+
+// TODO: Move to header file when VS supports constexpr.
+const ControlState GCPad::DEFAULT_PAD_STICK_RADIUS = 1.0;
+
+static const u16 button_bitmasks[] =
+{
+	PAD_BUTTON_A,
+	PAD_BUTTON_B,
+	PAD_BUTTON_X,
+	PAD_BUTTON_Y,
+	PAD_TRIGGER_Z,
+	PAD_BUTTON_START,
+	0 // MIC HAX
+};
+
+static const u16 trigger_bitmasks[] =
+{
+	PAD_TRIGGER_L,
+	PAD_TRIGGER_R,
+};
+
+static const u16 dpad_bitmasks[] =
+{
+	PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT
+};
+
+static const char* const named_buttons[] =
+{
+	"A",
+	"B",
+	"X",
+	"Y",
+	"Z",
+	_trans("Start"),
+	"Mic"
+};
+
+static const char* const named_triggers[] =
+{
+	// i18n:  Left
+	_trans("L"),
+	// i18n:  Right
+	_trans("R"),
+	// i18n:  Left-Analog
+	_trans("L-Analog"),
+	// i18n:  Right-Analog
+	_trans("R-Analog")
+};
+
+GCPad::GCPad(const unsigned int index) : m_index(index)
+{
+	int const mic_hax = index > 1;
+
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons(_trans("Buttons")));
+	for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons) - mic_hax; ++i)
+		m_buttons->controls.emplace_back(new ControlGroup::Input(named_buttons[i]));
+
+	// sticks
+	groups.emplace_back(m_main_stick = new AnalogStick(_trans("Main Stick"), DEFAULT_PAD_STICK_RADIUS));
+	groups.emplace_back(m_c_stick = new AnalogStick(_trans("C-Stick"), DEFAULT_PAD_STICK_RADIUS));
+
+	// triggers
+	groups.emplace_back(m_triggers = new MixedTriggers(_trans("Triggers")));
+	for (auto& named_trigger : named_triggers)
+		m_triggers->controls.emplace_back(new ControlGroup::Input(named_trigger));
+
+	// rumble
+	groups.emplace_back(m_rumble = new ControlGroup(_trans("Rumble")));
+	m_rumble->controls.emplace_back(new ControlGroup::Output(_trans("Motor")));
+
+	// dpad
+	groups.emplace_back(m_dpad = new Buttons(_trans("D-Pad")));
+	for (auto& named_direction : named_directions)
+		m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction));
+
+	// options
+	groups.emplace_back(m_options = new ControlGroup(_trans("Options")));
+	m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
+	m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input")));
+}
+
+std::string GCPad::GetName() const
+{
+	return std::string("GCPad") + char('1'+m_index);
+}
+
+void GCPad::GetInput(GCPadStatus* const pad)
+{
+	ControlState x, y, triggers[2];
+
+	// buttons
+	m_buttons->GetState(&pad->button, button_bitmasks);
+
+	// set analog A/B analog to full or w/e, prolly not needed
+	if (pad->button & PAD_BUTTON_A) pad->analogA = 0xFF;
+	if (pad->button & PAD_BUTTON_B) pad->analogB = 0xFF;
+
+	// dpad
+	m_dpad->GetState(&pad->button, dpad_bitmasks);
+
+	// sticks
+	m_main_stick->GetState(&x, &y);
+	pad->stickX = static_cast<u8>(GCPadStatus::MAIN_STICK_CENTER_X + (x * GCPadStatus::MAIN_STICK_RADIUS));
+	pad->stickY = static_cast<u8>(GCPadStatus::MAIN_STICK_CENTER_Y + (y * GCPadStatus::MAIN_STICK_RADIUS));
+
+	m_c_stick->GetState(&x, &y);
+	pad->substickX = static_cast<u8>(GCPadStatus::C_STICK_CENTER_X + (x * GCPadStatus::C_STICK_RADIUS));
+	pad->substickY = static_cast<u8>(GCPadStatus::C_STICK_CENTER_Y + (y * GCPadStatus::C_STICK_RADIUS));
+
+	// triggers
+	m_triggers->GetState(&pad->button, trigger_bitmasks, triggers);
+	pad->triggerLeft = static_cast<u8>(triggers[0] * 0xFF);
+	pad->triggerRight = static_cast<u8>(triggers[1] * 0xFF);
+}
+
+void GCPad::SetOutput(const ControlState strength)
+{
+	m_rumble->controls[0]->control_ref->State(strength);
+}
+
+void GCPad::LoadDefaults(const ControllerInterface& ciface)
+{
+	#define set_control(group, num, str)  (group)->controls[num]->control_ref->expression = (str)
+
+	ControllerEmu::LoadDefaults(ciface);
+
+	// Buttons
+	set_control(m_buttons, 0, "X"); // A
+	set_control(m_buttons, 1, "Z"); // B
+	set_control(m_buttons, 2, "C"); // X
+	set_control(m_buttons, 3, "S"); // Y
+	set_control(m_buttons, 4, "D"); // Z
+#ifdef _WIN32
+	set_control(m_buttons, 5, "!LMENU & RETURN"); // Start
+#else
+	// OS X/Linux
+	set_control(m_buttons, 5, "!`Alt_L` & Return"); // Start
+#endif
+
+	// stick modifiers to 50 %
+	m_main_stick->controls[4]->control_ref->range = 0.5f;
+	m_c_stick->controls[4]->control_ref->range = 0.5f;
+
+	// D-Pad
+	set_control(m_dpad, 0, "T"); // Up
+	set_control(m_dpad, 1, "G"); // Down
+	set_control(m_dpad, 2, "F"); // Left
+	set_control(m_dpad, 3, "H"); // Right
+
+	// C-Stick
+	set_control(m_c_stick, 0, "I"); // Up
+	set_control(m_c_stick, 1, "K"); // Down
+	set_control(m_c_stick, 2, "J"); // Left
+	set_control(m_c_stick, 3, "L"); // Right
+#ifdef _WIN32
+	set_control(m_c_stick, 4, "LCONTROL"); // Modifier
+
+	// Main Stick
+	set_control(m_main_stick, 0, "UP");     // Up
+	set_control(m_main_stick, 1, "DOWN");   // Down
+	set_control(m_main_stick, 2, "LEFT");   // Left
+	set_control(m_main_stick, 3, "RIGHT");  // Right
+	set_control(m_main_stick, 4, "LSHIFT"); // Modifier
+
+#elif __APPLE__
+	set_control(m_c_stick, 4, "Left Control"); // Modifier
+
+	// Main Stick
+	set_control(m_main_stick, 0, "Up Arrow");    // Up
+	set_control(m_main_stick, 1, "Down Arrow");  // Down
+	set_control(m_main_stick, 2, "Left Arrow");  // Left
+	set_control(m_main_stick, 3, "Right Arrow"); // Right
+	set_control(m_main_stick, 4, "Left Shift");  // Modifier
+#else
+	// not sure if these are right
+
+	set_control(m_c_stick, 4, "Control_L"); // Modifier
+
+	// Main Stick
+	set_control(m_main_stick, 0, "Up");      // Up
+	set_control(m_main_stick, 1, "Down");    // Down
+	set_control(m_main_stick, 2, "Left");    // Left
+	set_control(m_main_stick, 3, "Right");   // Right
+	set_control(m_main_stick, 4, "Shift_L"); // Modifier
+#endif
+
+	// Triggers
+	set_control(m_triggers, 0, "Q"); // L
+	set_control(m_triggers, 1, "W"); // R
+}
+
+bool GCPad::GetMicButton() const
+{
+	return (0.0f != m_buttons->controls.back()->control_ref->State());
+}
diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h
new file mode 100644
index 0000000000..a8ec2e8e91
--- /dev/null
+++ b/Source/Core/Core/HW/GCPadEmu.h
@@ -0,0 +1,41 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "InputCommon/ControllerEmu.h"
+
+class GCPad : public ControllerEmu
+{
+public:
+
+	GCPad(const unsigned int index);
+	void GetInput(GCPadStatus* const pad);
+	void SetOutput(const ControlState strength);
+
+	bool GetMicButton() const;
+
+	std::string GetName() const override;
+
+	void LoadDefaults(const ControllerInterface& ciface) override;
+
+private:
+
+	Buttons*       m_buttons;
+	AnalogStick*   m_main_stick;
+	AnalogStick*   m_c_stick;
+	Buttons*       m_dpad;
+	MixedTriggers* m_triggers;
+	ControlGroup*  m_rumble;
+	ControlGroup*  m_options;
+
+	const unsigned int m_index;
+
+	// TODO: Make constexpr when VS supports it.
+	//
+	// Default analog stick radius for GameCube controllers.
+	static const ControlState DEFAULT_PAD_STICK_RADIUS;
+};
diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp
new file mode 100644
index 0000000000..432cff18e2
--- /dev/null
+++ b/Source/Core/Core/HW/GPFifo.cpp
@@ -0,0 +1,161 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace GPFifo
+{
+
+// 32 Byte gather pipe with extra space
+// Overfilling is no problem (up to the real limit), CheckGatherPipe will blast the
+// contents in nicely sized chunks
+
+// Other optimizations to think about:
+
+// If the gp is NOT linked to the fifo, just blast to memory byte by word
+// If the gp IS linked to the fifo, use a fast wrapping buffer and skip writing to memory
+
+// Both of these should actually work! Only problem is that we have to decide at run time,
+// the same function could use both methods. Compile 2 different versions of each such block?
+
+u8 GC_ALIGNED32(m_gatherPipe[GATHER_PIPE_SIZE*16]); //more room, for the fastmodes
+
+// pipe counter
+u32 m_gatherPipeCount = 0;
+
+void DoState(PointerWrap &p)
+{
+	p.Do(m_gatherPipe);
+	p.Do(m_gatherPipeCount);
+}
+
+void Init()
+{
+	ResetGatherPipe();
+	memset(m_gatherPipe, 0, sizeof(m_gatherPipe));
+}
+
+bool IsEmpty()
+{
+	return m_gatherPipeCount == 0;
+}
+
+void ResetGatherPipe()
+{
+	m_gatherPipeCount = 0;
+}
+
+static void UpdateGatherPipe()
+{
+	u32 cnt;
+	u8* curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
+	for (cnt = 0; m_gatherPipeCount >= GATHER_PIPE_SIZE; cnt += GATHER_PIPE_SIZE)
+	{
+		// copy the GatherPipe
+		memcpy(curMem, m_gatherPipe + cnt, GATHER_PIPE_SIZE);
+		m_gatherPipeCount -= GATHER_PIPE_SIZE;
+
+		// increase the CPUWritePointer
+		if (ProcessorInterface::Fifo_CPUWritePointer == ProcessorInterface::Fifo_CPUEnd)
+		{
+			ProcessorInterface::Fifo_CPUWritePointer = ProcessorInterface::Fifo_CPUBase;
+			curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
+		}
+		else
+		{
+			curMem += GATHER_PIPE_SIZE;
+			ProcessorInterface::Fifo_CPUWritePointer += GATHER_PIPE_SIZE;
+		}
+
+		g_video_backend->Video_GatherPipeBursted();
+	}
+
+	// move back the spill bytes
+	memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount);
+}
+
+void FastCheckGatherPipe()
+{
+	if (m_gatherPipeCount >= GATHER_PIPE_SIZE)
+	{
+		UpdateGatherPipe();
+	}
+}
+
+void CheckGatherPipe()
+{
+	if (m_gatherPipeCount >= GATHER_PIPE_SIZE)
+	{
+		UpdateGatherPipe();
+
+		// Profile where slow FIFO writes are occurring.
+		JitInterface::CompileExceptionCheck(JitInterface::ExceptionType::EXCEPTIONS_FIFO_WRITE);
+	}
+}
+
+void Write8(const u8 _iValue)
+{
+//	LOG(GPFIFO, "GPFIFO #%x: 0x%02x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
+	FastWrite8(_iValue);
+	CheckGatherPipe();
+}
+
+void Write16(const u16 _iValue)
+{
+//	LOG(GPFIFO, "GPFIFO #%x: 0x%04x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
+	FastWrite16(_iValue);
+	CheckGatherPipe();
+}
+
+void Write32(const u32 _iValue)
+{
+//#ifdef _DEBUG
+//	float floatvalue = *(float*)&_iValue;
+//	LOG(GPFIFO, "GPFIFO #%x: 0x%08x / %f",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue, floatvalue);
+//#endif
+	FastWrite32(_iValue);
+	CheckGatherPipe();
+}
+
+void Write64(const u64 _iValue)
+{
+	FastWrite64(_iValue);
+	CheckGatherPipe();
+}
+
+void FastWrite8(const u8 _iValue)
+{
+	m_gatherPipe[m_gatherPipeCount] = _iValue;
+	++m_gatherPipeCount;
+}
+
+void FastWrite16(const u16 _iValue)
+{
+	*(u16*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap16(_iValue);
+	m_gatherPipeCount += 2;
+}
+
+void FastWrite32(const u32 _iValue)
+{
+	*(u32*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap32(_iValue);
+	m_gatherPipeCount += 4;
+}
+
+void FastWrite64(const u64 _iValue)
+{
+	*(u64*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap64(_iValue);
+	m_gatherPipeCount += 8;
+}
+
+} // end of namespace GPFifo
diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h
new file mode 100644
index 0000000000..d455edcee4
--- /dev/null
+++ b/Source/Core/Core/HW/GPFifo.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+namespace GPFifo
+{
+
+enum
+{
+	GATHER_PIPE_SIZE = 32
+};
+
+extern u8 GC_ALIGNED32(m_gatherPipe[GATHER_PIPE_SIZE*16]); //more room, for the fastmodes
+
+// pipe counter
+extern u32 m_gatherPipeCount;
+
+// Init
+void Init();
+void DoState(PointerWrap &p);
+
+// ResetGatherPipe
+void ResetGatherPipe();
+void CheckGatherPipe();
+void FastCheckGatherPipe();
+
+bool IsEmpty();
+
+// Write
+void Write8(const u8 _iValue);
+void Write16(const u16 _iValue);
+void Write32(const u32 _iValue);
+void Write64(const u64 _iValue);
+
+// These expect pre-byteswapped values
+// Also there's an upper limit of about 512 per batch
+// Most likely these should be inlined into JIT instead
+void FastWrite8(const u8 _iValue);
+void FastWrite16(const u16 _iValue);
+void FastWrite32(const u32 _iValue);
+void FastWrite64(const u64 _iValue);
+}
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
new file mode 100644
index 0000000000..533c392cf5
--- /dev/null
+++ b/Source/Core/Core/HW/HW.cpp
@@ -0,0 +1,116 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/NandPaths.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/State.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/HW.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/WII_IPC.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "DiscIO/NANDContentLoader.h"
+
+namespace HW
+{
+	void Init()
+	{
+		CoreTiming::Init();
+		SystemTimers::PreInit();
+
+		State::Init();
+
+		// Init the whole Hardware
+		AudioInterface::Init();
+		VideoInterface::Init();
+		SerialInterface::Init();
+		ProcessorInterface::Init();
+		ExpansionInterface::Init(); // Needs to be initialized before Memory
+		Memory::Init();
+		DSP::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE);
+		DVDInterface::Init();
+		GPFifo::Init();
+		CCPU::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore);
+		SystemTimers::Init();
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		{
+			Common::InitializeWiiRoot(Core::g_want_determinism);
+			DiscIO::cUIDsys::AccessInstance().UpdateLocation();
+			DiscIO::CSharedContent::AccessInstance().UpdateLocation();
+			WII_IPCInterface::Init();
+			WII_IPC_HLE_Interface::Init();
+		}
+	}
+
+	void Shutdown()
+	{
+		SystemTimers::Shutdown();
+		CCPU::Shutdown();
+		ExpansionInterface::Shutdown();
+		DVDInterface::Shutdown();
+		DSP::Shutdown();
+		Memory::Shutdown();
+		SerialInterface::Shutdown();
+		AudioInterface::Shutdown();
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		{
+			WII_IPCInterface::Shutdown();
+			WII_IPC_HLE_Interface::Shutdown();
+			Common::ShutdownWiiRoot();
+		}
+
+		State::Shutdown();
+		CoreTiming::Shutdown();
+	}
+
+	void DoState(PointerWrap &p)
+	{
+		Memory::DoState(p);
+		p.DoMarker("Memory");
+		VideoInterface::DoState(p);
+		p.DoMarker("VideoInterface");
+		SerialInterface::DoState(p);
+		p.DoMarker("SerialInterface");
+		ProcessorInterface::DoState(p);
+		p.DoMarker("ProcessorInterface");
+		DSP::DoState(p);
+		p.DoMarker("DSP");
+		DVDInterface::DoState(p);
+		p.DoMarker("DVDInterface");
+		GPFifo::DoState(p);
+		p.DoMarker("GPFifo");
+		ExpansionInterface::DoState(p);
+		p.DoMarker("ExpansionInterface");
+		AudioInterface::DoState(p);
+		p.DoMarker("AudioInterface");
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		{
+			WII_IPCInterface::DoState(p);
+			p.DoMarker("WII_IPCInterface");
+			WII_IPC_HLE_Interface::DoState(p);
+			p.DoMarker("WII_IPC_HLE_Interface");
+		}
+
+		p.DoMarker("WIIHW");
+	}
+}
diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h
new file mode 100644
index 0000000000..2dde0d58f4
--- /dev/null
+++ b/Source/Core/Core/HW/HW.h
@@ -0,0 +1,14 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+class PointerWrap;
+
+namespace HW
+{
+	void Init();
+	void Shutdown();
+	void DoState(PointerWrap &p);
+}
diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp
new file mode 100644
index 0000000000..2e82db2656
--- /dev/null
+++ b/Source/Core/Core/HW/MMIO.cpp
@@ -0,0 +1,385 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <functional>
+
+#include "Core/HW/MMIO.h"
+#include "Core/HW/MMIOHandlers.h"
+
+namespace MMIO
+{
+
+// Base classes for the two handling method hierarchies. Note that a single
+// class can inherit from both.
+//
+// At the moment the only common element between all the handling method is
+// that they should be able to accept a visitor of the appropriate type.
+template <typename T>
+class ReadHandlingMethod
+{
+public:
+	virtual ~ReadHandlingMethod() {}
+	virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const = 0;
+};
+template <typename T>
+class WriteHandlingMethod
+{
+public:
+	virtual ~WriteHandlingMethod() {}
+	virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const = 0;
+};
+
+// Constant: handling method holds a single integer and passes it to the
+// visitor. This is a read only handling method: storing to a constant does not
+// mean anything.
+template <typename T>
+class ConstantHandlingMethod : public ReadHandlingMethod<T>
+{
+public:
+	explicit ConstantHandlingMethod(T value) : value_(value)
+	{
+	}
+
+	virtual ~ConstantHandlingMethod() {}
+
+	virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitConstant(value_);
+	}
+
+private:
+	T value_;
+};
+template <typename T>
+ReadHandlingMethod<T>* Constant(T value)
+{
+	return new ConstantHandlingMethod<T>(value);
+}
+
+// Nop: extremely simple write handling method that does nothing at all, only
+// respond to visitors and dispatch to the correct method. This is write only
+// since reads should always at least return a value.
+template <typename T>
+class NopHandlingMethod : public WriteHandlingMethod<T>
+{
+public:
+	NopHandlingMethod() {}
+	virtual ~NopHandlingMethod() {}
+	virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitNop();
+	}
+};
+template <typename T>
+WriteHandlingMethod<T>* Nop()
+{
+	return new NopHandlingMethod<T>();
+}
+
+// Direct: handling method holds a pointer to the value where to read/write the
+// data from, as well as a mask that is used to restrict reading/writing only
+// to a given set of bits.
+template <typename T>
+class DirectHandlingMethod : public ReadHandlingMethod<T>,
+                             public WriteHandlingMethod<T>
+{
+public:
+	DirectHandlingMethod(T* addr, u32 mask) : addr_(addr), mask_(mask)
+	{
+	}
+
+	virtual ~DirectHandlingMethod() {}
+
+	virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitDirect(addr_, mask_);
+	}
+
+	virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitDirect(addr_, mask_);
+	}
+
+private:
+	T* addr_;
+	u32 mask_;
+};
+template <typename T>
+ReadHandlingMethod<T>* DirectRead(const T* addr, u32 mask)
+{
+	return new DirectHandlingMethod<T>(const_cast<T*>(addr), mask);
+}
+template <typename T>
+ReadHandlingMethod<T>* DirectRead(volatile const T* addr, u32 mask)
+{
+	return new DirectHandlingMethod<T>((T*)addr, mask);
+}
+template <typename T>
+WriteHandlingMethod<T>* DirectWrite(T* addr, u32 mask)
+{
+	return new DirectHandlingMethod<T>(addr, mask);
+}
+template <typename T>
+WriteHandlingMethod<T>* DirectWrite(volatile T* addr, u32 mask)
+{
+	return new DirectHandlingMethod<T>((T*)addr, mask);
+}
+
+// Complex: holds a lambda that is called when a read or a write is executed.
+// This gives complete control to the user as to what is going to happen during
+// that read or write, but reduces the optimization potential.
+template <typename T>
+class ComplexHandlingMethod : public ReadHandlingMethod<T>,
+                              public WriteHandlingMethod<T>
+{
+public:
+	explicit ComplexHandlingMethod(std::function<T(u32)> read_lambda)
+		: read_lambda_(read_lambda), write_lambda_(InvalidWriteLambda())
+	{
+	}
+
+	explicit ComplexHandlingMethod(std::function<void(u32, T)> write_lambda)
+		: read_lambda_(InvalidReadLambda()), write_lambda_(write_lambda)
+	{
+	}
+
+	virtual ~ComplexHandlingMethod() {}
+
+	virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitComplex(&read_lambda_);
+	}
+
+	virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const
+	{
+		v.VisitComplex(&write_lambda_);
+	}
+
+private:
+	std::function<T(u32)> InvalidReadLambda() const
+	{
+		return [](u32) {
+			_dbg_assert_msg_(MEMMAP, 0, "Called the read lambda on a write "
+			                            "complex handler.");
+			return 0;
+		};
+	}
+
+	std::function<void(u32, T)> InvalidWriteLambda() const
+	{
+		return [](u32, T) {
+			_dbg_assert_msg_(MEMMAP, 0, "Called the write lambda on a read "
+			                            "complex handler.");
+		};
+	}
+
+	std::function<T(u32)> read_lambda_;
+	std::function<void(u32, T)> write_lambda_;
+};
+template <typename T>
+ReadHandlingMethod<T>* ComplexRead(std::function<T(u32)> lambda)
+{
+	return new ComplexHandlingMethod<T>(lambda);
+}
+template <typename T>
+WriteHandlingMethod<T>* ComplexWrite(std::function<void(u32, T)> lambda)
+{
+	return new ComplexHandlingMethod<T>(lambda);
+}
+
+// Invalid: specialization of the complex handling type with lambdas that
+// display error messages.
+template <typename T>
+ReadHandlingMethod<T>* InvalidRead()
+{
+	return ComplexRead<T>([](u32 addr) {
+		ERROR_LOG(MEMMAP, "Trying to read%d from an invalid MMIO (addr=%08x)",
+			8 * (int)(sizeof (T)), addr);
+		return -1;
+	});
+}
+template <typename T>
+WriteHandlingMethod<T>* InvalidWrite()
+{
+	return ComplexWrite<T>([](u32 addr, T val) {
+		ERROR_LOG(MEMMAP, "Trying to write%d to an invalid MMIO (addr=%08x, val=%08x)",
+			8 * (int)(sizeof (T)), addr, (u32)val);
+	});
+}
+
+// Converters to larger and smaller size. Probably the most complex of these
+// handlers to implement. They do not define new handling method types but
+// instead will internally use the types defined above.
+template <typename T> struct SmallerAccessSize {};
+template <> struct SmallerAccessSize<u16> { typedef u8 value; };
+template <> struct SmallerAccessSize<u32> { typedef u16 value; };
+
+template <typename T> struct LargerAccessSize {};
+template <> struct LargerAccessSize<u8> { typedef u16 value; };
+template <> struct LargerAccessSize<u16> { typedef u32 value; };
+
+template <typename T>
+ReadHandlingMethod<T>* ReadToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr)
+{
+	typedef typename SmallerAccessSize<T>::value ST;
+
+	ReadHandler<ST>* high_part = &mmio->GetHandlerForRead<ST>(high_part_addr);
+	ReadHandler<ST>* low_part = &mmio->GetHandlerForRead<ST>(low_part_addr);
+
+	// TODO(delroth): optimize
+	return ComplexRead<T>([=](u32 addr) {
+		return ((T)high_part->Read(high_part_addr) << (8 * sizeof (ST)))
+			| low_part->Read(low_part_addr);
+	});
+}
+
+template <typename T>
+WriteHandlingMethod<T>* WriteToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr)
+{
+	typedef typename SmallerAccessSize<T>::value ST;
+
+	WriteHandler<ST>* high_part = &mmio->GetHandlerForWrite<ST>(high_part_addr);
+	WriteHandler<ST>* low_part = &mmio->GetHandlerForWrite<ST>(low_part_addr);
+
+	// TODO(delroth): optimize
+	return ComplexWrite<T>([=](u32 addr, T val) {
+		high_part->Write(high_part_addr, val >> (8 * sizeof (ST)));
+		low_part->Write(low_part_addr, (ST)val);
+	});
+}
+
+template <typename T>
+ReadHandlingMethod<T>* ReadToLarger(Mapping* mmio, u32 larger_addr, u32 shift)
+{
+	typedef typename LargerAccessSize<T>::value LT;
+
+	ReadHandler<LT>* large = &mmio->GetHandlerForRead<LT>(larger_addr);
+
+	// TODO(delroth): optimize
+	return ComplexRead<T>([large, shift](u32 addr) {
+		return large->Read(addr & ~(sizeof (LT) - 1)) >> shift;
+	});
+}
+
+// Inplementation of the ReadHandler and WriteHandler class. There is a lot of
+// redundant code between these two classes but trying to abstract it away
+// brings more trouble than it fixes.
+template <typename T>
+ReadHandler<T>::ReadHandler()
+{
+}
+
+template <typename T>
+ReadHandler<T>::ReadHandler(ReadHandlingMethod<T>* method)
+	: m_Method(nullptr)
+{
+	ResetMethod(method);
+}
+
+template <typename T>
+ReadHandler<T>::~ReadHandler()
+{
+}
+
+template <typename T>
+void ReadHandler<T>::Visit(ReadHandlingMethodVisitor<T>& visitor)
+{
+	if (!m_Method)
+		InitializeInvalid();
+
+	m_Method->AcceptReadVisitor(visitor);
+}
+
+template <typename T>
+void ReadHandler<T>::ResetMethod(ReadHandlingMethod<T>* method)
+{
+	m_Method.reset(method);
+
+	struct FuncCreatorVisitor : public ReadHandlingMethodVisitor<T>
+	{
+		std::function<T(u32)> ret;
+
+		virtual void VisitConstant(T value)
+		{
+			ret = [value](u32) { return value; };
+		}
+
+		virtual void VisitDirect(const T* addr, u32 mask)
+		{
+			ret = [addr, mask](u32) { return *addr & mask; };
+		}
+
+		virtual void VisitComplex(const std::function<T(u32)>* lambda)
+		{
+			ret = *lambda;
+		}
+	};
+
+	FuncCreatorVisitor v;
+	Visit(v);
+	m_ReadFunc = v.ret;
+}
+
+template <typename T>
+WriteHandler<T>::WriteHandler()
+{
+}
+
+template <typename T>
+WriteHandler<T>::WriteHandler(WriteHandlingMethod<T>* method)
+	: m_Method(nullptr)
+{
+	ResetMethod(method);
+}
+
+template <typename T>
+WriteHandler<T>::~WriteHandler()
+{
+}
+
+template <typename T>
+void WriteHandler<T>::Visit(WriteHandlingMethodVisitor<T>& visitor)
+{
+	if (!m_Method)
+		InitializeInvalid();
+
+	m_Method->AcceptWriteVisitor(visitor);
+}
+
+template <typename T>
+void WriteHandler<T>::ResetMethod(WriteHandlingMethod<T>* method)
+{
+	m_Method.reset(method);
+
+	struct FuncCreatorVisitor : public WriteHandlingMethodVisitor<T>
+	{
+		std::function<void(u32, T)> ret;
+
+		virtual void VisitNop()
+		{
+			ret = [](u32, T) {};
+		}
+
+		virtual void VisitDirect(T* ptr, u32 mask)
+		{
+			ret = [ptr, mask](u32, T val) { *ptr = val & mask; };
+		}
+
+		virtual void VisitComplex(const std::function<void(u32, T)>* lambda)
+		{
+			ret = *lambda;
+		}
+	};
+
+	FuncCreatorVisitor v;
+	Visit(v);
+	m_WriteFunc = v.ret;
+}
+
+// Define all the public specializations that are exported in MMIOHandlers.h.
+#define MaybeExtern
+MMIO_PUBLIC_SPECIALIZATIONS()
+#undef MaybeExtern
+
+}
diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h
new file mode 100644
index 0000000000..b36b82f6bb
--- /dev/null
+++ b/Source/Core/Core/HW/MMIO.h
@@ -0,0 +1,219 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <string>
+#include <type_traits>
+
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/MMIOHandlers.h"
+
+namespace MMIO
+{
+
+// There are three main MMIO blocks on the Wii (only one on the GameCube):
+//  - 0x0C00xxxx: GameCube MMIOs (CP, PE, VI, PI, MI, DSP, DVD, SI, EI, AI, GP)
+//  - 0x0D00xxxx: Wii MMIOs and GC mirrors (IPC, DVD, SI, EI, AI)
+//  - 0x0D80xxxx: Mirror of 0x0D00xxxx.
+//
+// In practice, since the third block is a mirror of the second one, we can
+// assume internally that there are only two blocks: one for GC, one for Wii.
+enum Block
+{
+	GC_BLOCK = 0,
+	WII_BLOCK = 1,
+
+	NUM_BLOCKS
+};
+const u32 BLOCK_SIZE = 0x10000;
+const u32 NUM_MMIOS = NUM_BLOCKS * BLOCK_SIZE;
+
+// Checks if a given physical memory address refers to the MMIO address range.
+// In practice, most games use a virtual memory mapping (via BATs set in the
+// IPL) that matches the physical memory mapping for MMIOs.
+//
+// We have a special exception here for FIFO writes: these are handled via a
+// different mechanism and should not go through the normal MMIO access
+// interface.
+inline bool IsMMIOAddress(u32 address)
+{
+	if (address == 0x0C008000)
+		return false; // WG Pipe
+	if ((address & 0xFFFF0000) == 0x0C000000)
+		return true; // GameCube MMIOs
+
+	if(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		return ((address & 0xFFFF0000) == 0x0D000000) || // Wii MMIOs
+		       ((address & 0xFFFF0000) == 0x0D800000);   // Mirror of Wii MMIOs
+	}
+
+	return false;
+}
+
+// Compute the internal unique ID for a given MMIO address. This ID is computed
+// from a very simple formula: (block_id << 16) | lower_16_bits(address).
+//
+// The block ID can easily be computed by simply checking bit 24 (CC vs. CD).
+inline u32 UniqueID(u32 address)
+{
+	_dbg_assert_msg_(MEMMAP, ((address & 0xFFFF0000) == 0x0C000000) ||
+	                         ((address & 0xFFFF0000) == 0x0D000000) ||
+	                         ((address & 0xFFFF0000) == 0x0D800000),
+	                 "Trying to get the ID of a non-existing MMIO address.");
+
+	return (((address >> 24) & 1) << 16) | (address & 0xFFFF);
+}
+
+// Some utilities functions to define MMIO mappings.
+namespace Utils
+{
+// Allow grabbing pointers to the high and low part of a 32 bits pointer.
+inline u16* LowPart(u32* ptr) { return (u16*)ptr; }
+inline u16* LowPart(volatile u32* ptr) { return (u16*)ptr; }
+inline u16* HighPart(u32* ptr) { return LowPart(ptr) + 1; }
+inline u16* HighPart(volatile u32* ptr) { return LowPart(ptr) + 1; }
+}
+
+class Mapping
+{
+public:
+	// MMIO registration interface. Use this to register new MMIO handlers.
+	//
+	// Example usages can be found in just about any HW/ module in Dolphin's
+	// codebase.
+	template<typename Unit>
+	void RegisterRead(u32 addr, ReadHandlingMethod<Unit>* read)
+	{
+		GetHandlerForRead<Unit>(addr).ResetMethod(read);
+	}
+
+	template<typename Unit>
+	void RegisterWrite(u32 addr, WriteHandlingMethod<Unit>* write)
+	{
+		GetHandlerForWrite<Unit>(addr).ResetMethod(write);
+	}
+
+	template<typename Unit>
+	void Register(u32 addr, ReadHandlingMethod<Unit>* read, WriteHandlingMethod<Unit>* write)
+	{
+		RegisterRead(addr, read);
+		RegisterWrite(addr, write);
+	}
+
+	// Direct read/write interface.
+	//
+	// These functions allow reading/writing an MMIO register at a given
+	// address. They are used by the Memory:: access functions, which are
+	// called in interpreter mode, from Dolphin's own code, or from JIT'd code
+	// where the access address could not be predicted.
+	template<typename Unit>
+	Unit Read(u32 addr)
+	{
+		return GetHandlerForRead<Unit>(addr).Read(addr);
+	}
+
+	template<typename Unit>
+	void Write(u32 addr, Unit val)
+	{
+		GetHandlerForWrite<Unit>(addr).Write(addr, val);
+	}
+
+	// Handlers access interface.
+	//
+	// Use when you care more about how to access the MMIO register for an
+	// address than the current value of that register. For example, this is
+	// what could be used to implement fast MMIO accesses in Dolphin's JIT.
+	template<typename Unit>
+	ReadHandler<Unit>& GetHandlerForRead(u32 addr)
+	{
+		return GetReadHandler<Unit>(UniqueID(addr) / sizeof(Unit));
+	}
+
+	template<typename Unit>
+	WriteHandler<Unit>& GetHandlerForWrite(u32 addr)
+	{
+		return GetWriteHandler<Unit>(UniqueID(addr) / sizeof(Unit));
+	}
+
+private:
+	// These arrays contain the handlers for each MMIO access type: read/write
+	// to 8/16/32 bits. They are indexed using the UniqueID(addr) function
+	// defined earlier, which maps an MMIO address to a unique ID by using the
+	// MMIO block ID.
+	//
+	// Each array contains NUM_MMIOS / sizeof (AccessType) because larger
+	// access types mean less possible adresses (assuming aligned only
+	// accesses).
+	template<typename Unit>
+	struct HandlerArray
+	{
+		using Read = std::array<ReadHandler<Unit>, NUM_MMIOS / sizeof(Unit)>;
+		using Write = std::array<WriteHandler<Unit>, NUM_MMIOS / sizeof(Unit)>;
+	};
+
+	HandlerArray<u8>::Read m_read_handlers8;
+	HandlerArray<u16>::Read m_read_handlers16;
+	HandlerArray<u32>::Read m_read_handlers32;
+
+	HandlerArray<u8>::Write m_write_handlers8;
+	HandlerArray<u16>::Write m_write_handlers16;
+	HandlerArray<u32>::Write m_write_handlers32;
+
+	// Getter functions for the handler arrays.
+	//
+	// TODO:
+	// It would be desirable to clean these methods up using tuples, i.e. doing something like
+	//
+	//     auto handlers = std::tie(m_read_handlers8, m_read_handlers16, m_read_handlers32);
+	//     return std::get<Unit>(handlers)[index];
+	//
+	// However, we cannot use this currently because of a compiler bug in clang, presumably related
+	// to http://llvm.org/bugs/show_bug.cgi?id=18345, due to which the above code makes the compiler
+	// exceed the template recursion depth.
+	// As a workaround, we cast all handlers to the requested one's type. This cast will
+	// compile to a NOP for the returned member variable, but it's necessary to get this
+	// code to compile at all.
+	template<typename Unit>
+	ReadHandler<Unit>& GetReadHandler(size_t index)
+	{
+		static_assert(std::is_same<Unit, u8>::value || std::is_same<Unit, u16>::value || std::is_same<Unit, u32>::value, "Invalid unit used");
+		using ArrayType = typename HandlerArray<Unit>::Read;
+		ArrayType& handler = *(std::is_same<Unit,u8>::value ? (ArrayType*)&m_read_handlers8
+		                                                    : std::is_same<Unit,u16>::value ? (ArrayType*)&m_read_handlers16
+		                                                                                    : (ArrayType*)&m_read_handlers32);
+		return handler[index];
+	}
+
+	template<typename Unit>
+	WriteHandler<Unit>& GetWriteHandler(size_t index)
+	{
+		static_assert(std::is_same<Unit, u8>::value || std::is_same<Unit, u16>::value || std::is_same<Unit, u32>::value, "Invalid unit used");
+		using ArrayType = typename HandlerArray<Unit>::Write;
+		ArrayType& handler = *(std::is_same<Unit,u8>::value ? (ArrayType*)&m_write_handlers8
+		                                                    : std::is_same<Unit,u16>::value ? (ArrayType*)&m_write_handlers16
+		                                                                                    : (ArrayType*)&m_write_handlers32);
+		return handler[index];
+	}
+};
+
+// Dummy 64 bits variants of these functions. While 64 bits MMIO access is
+// not supported, we need these in order to make the code compile.
+template<>
+inline u64 Mapping::Read<u64>(u32 addr)
+{
+    _dbg_assert_(MEMMAP, 0);
+    return 0;
+}
+
+template<>
+inline void Mapping::Write(u32 addr, u64 val)
+{
+    _dbg_assert_(MEMMAP, 0);
+}
+
+}
diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h
new file mode 100644
index 0000000000..54cadf11cd
--- /dev/null
+++ b/Source/Core/Core/HW/MMIOHandlers.h
@@ -0,0 +1,229 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include "Common/CommonTypes.h"
+
+// All the templated and very repetitive MMIO-related code is isolated in this
+// file for easier reading. It mostly contains code related to handling methods
+// (including the declaration of the public functions for creating handling
+// method objects), visitors for these handling methods, and interface of the
+// handler classes.
+//
+// This code is very genericized (aka. lots of templates) in order to handle
+// u8/u16/u32 with the same code while providing type safety: it is impossible
+// to mix code from these types, and the type system enforces it.
+
+namespace MMIO
+{
+
+class Mapping;
+
+// Read and write handling methods are separated for type safety. On top of
+// that, some handling methods require different arguments for reads and writes
+// (Complex, for example).
+template <typename T> class ReadHandlingMethod;
+template <typename T> class WriteHandlingMethod;
+
+// Constant: use when the value read on this MMIO is always the same. This is
+// only for reads.
+template <typename T> ReadHandlingMethod<T>* Constant(T value);
+
+// Nop: use for writes that shouldn't have any effect and shouldn't log an
+// error either.
+template <typename T> WriteHandlingMethod<T>* Nop();
+
+// Direct: use when all the MMIO does is read/write the given value to/from a
+// global variable, with an optional mask applied on the read/written value.
+template <typename T> ReadHandlingMethod<T>* DirectRead(const T* addr, u32 mask = 0xFFFFFFFF);
+template <typename T> ReadHandlingMethod<T>* DirectRead(volatile const T* addr, u32 mask = 0xFFFFFFFF);
+template <typename T> WriteHandlingMethod<T>* DirectWrite(T* addr, u32 mask = 0xFFFFFFFF);
+template <typename T> WriteHandlingMethod<T>* DirectWrite(volatile T* addr, u32 mask = 0xFFFFFFFF);
+
+// Complex: use when no other handling method fits your needs. These allow you
+// to directly provide a function that will be called when a read/write needs
+// to be done.
+template <typename T> ReadHandlingMethod<T>* ComplexRead(std::function<T(u32)>);
+template <typename T> WriteHandlingMethod<T>* ComplexWrite(std::function<void(u32, T)>);
+
+// Invalid: log an error and return -1 in case of a read. These are the default
+// handlers set for all MMIO types.
+template <typename T> ReadHandlingMethod<T>* InvalidRead();
+template <typename T> WriteHandlingMethod<T>* InvalidWrite();
+
+// {Read,Write}To{Smaller,Larger}: these functions are not themselves handling
+// methods but will try to combine accesses to two handlers into one new
+// handler object.
+//
+// This is used for example when 32 bit reads have the exact same handling as
+// 16 bit. Handlers need to be registered for both 32 and 16, and it would be
+// repetitive and unoptimal to require users to write the same handling code in
+// both cases. Instead, an MMIO module can simply define all handlers in terms
+// of 16 bit reads, then use ReadToSmaller<u32> to convert u32 reads to u16
+// reads.
+//
+// Internally, these size conversion functions have some magic to make the
+// combined handlers as fast as possible. For example, if the two underlying
+// u16 handlers for a u32 reads are Direct to consecutive memory addresses,
+// they can be transformed into a Direct u32 access.
+//
+// Warning: unlike the other handling methods, *ToSmaller are obviously not
+// available for u8, and *ToLarger are not available for u32.
+template <typename T> ReadHandlingMethod<T>* ReadToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr);
+template <typename T> WriteHandlingMethod<T>* WriteToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr);
+template <typename T> ReadHandlingMethod<T>* ReadToLarger(Mapping* mmio, u32 larger_addr, u32 shift);
+
+// Use these visitors interfaces if you need to write code that performs
+// different actions based on the handling method used by a handler. Write your
+// visitor implementing that interface, then use handler->VisitHandlingMethod
+// to run the proper function.
+template <typename T>
+class ReadHandlingMethodVisitor
+{
+public:
+	virtual void VisitConstant(T value) = 0;
+	virtual void VisitDirect(const T* addr, u32 mask) = 0;
+	virtual void VisitComplex(const std::function<T(u32)>* lambda) = 0;
+};
+template <typename T>
+class WriteHandlingMethodVisitor
+{
+public:
+	virtual void VisitNop() = 0;
+	virtual void VisitDirect(T* addr, u32 mask) = 0;
+	virtual void VisitComplex(const std::function<void(u32, T)>* lambda) = 0;
+};
+
+// These classes are INTERNAL. Do not use outside of the MMIO implementation
+// code. Unfortunately, because we want to make Read() and Write() fast and
+// inlinable, we need to provide some of the implementation of these two
+// classes here and can't just use a forward declaration.
+template <typename T>
+class ReadHandler : public NonCopyable
+{
+public:
+	ReadHandler();
+
+	// Takes ownership of "method".
+	ReadHandler(ReadHandlingMethod<T>* method);
+
+	~ReadHandler();
+
+	// Entry point for read handling method visitors.
+	void Visit(ReadHandlingMethodVisitor<T>& visitor);
+
+	T Read(u32 addr)
+	{
+		// Check if the handler has already been initialized. For real
+		// handlers, this will always be the case, so this branch should be
+		// easily predictable.
+		if (!m_Method)
+			InitializeInvalid();
+
+		return m_ReadFunc(addr);
+	}
+
+	// Internal method called when changing the internal method object. Its
+	// main role is to make sure the read function is updated at the same time.
+	void ResetMethod(ReadHandlingMethod<T>* method);
+
+private:
+	// Initialize this handler to an invalid handler. Done lazily to avoid
+	// useless initialization of thousands of unused handler objects.
+	void InitializeInvalid()
+	{
+		ResetMethod(InvalidRead<T>());
+	}
+
+	std::unique_ptr<ReadHandlingMethod<T>> m_Method;
+	std::function<T(u32)> m_ReadFunc;
+};
+template <typename T>
+class WriteHandler : public NonCopyable
+{
+public:
+	WriteHandler();
+
+	// Takes ownership of "method".
+	WriteHandler(WriteHandlingMethod<T>* method);
+
+	~WriteHandler();
+
+	// Entry point for write handling method visitors.
+	void Visit(WriteHandlingMethodVisitor<T>& visitor);
+
+	void Write(u32 addr, T val)
+	{
+		// Check if the handler has already been initialized. For real
+		// handlers, this will always be the case, so this branch should be
+		// easily predictable.
+		if (!m_Method)
+			InitializeInvalid();
+
+		m_WriteFunc(addr, val);
+	}
+
+	// Internal method called when changing the internal method object. Its
+	// main role is to make sure the write function is updated at the same
+	// time.
+	void ResetMethod(WriteHandlingMethod<T>* method);
+
+private:
+	// Initialize this handler to an invalid handler. Done lazily to avoid
+	// useless initialization of thousands of unused handler objects.
+	void InitializeInvalid()
+	{
+		ResetMethod(InvalidWrite<T>());
+	}
+
+	std::unique_ptr<WriteHandlingMethod<T>> m_Method;
+	std::function<void(u32, T)> m_WriteFunc;
+};
+
+// Boilerplate boilerplate boilerplate.
+//
+// This is used to be able to avoid putting the templates implementation in the
+// header files and slow down compilation times. Instead, we declare 3
+// specializations in the header file as already implemented in another
+// compilation unit: u8, u16, u32.
+//
+// The "MaybeExtern" is there because that same macro is used for declaration
+// (where MaybeExtern = "extern") and definition (MaybeExtern = "").
+#define MMIO_GENERIC_PUBLIC_SPECIALIZATIONS(MaybeExtern, T) \
+	MaybeExtern template ReadHandlingMethod<T>* Constant<T>(T value); \
+	MaybeExtern template WriteHandlingMethod<T>* Nop<T>(); \
+	MaybeExtern template ReadHandlingMethod<T>* DirectRead(const T* addr, u32 mask); \
+	MaybeExtern template ReadHandlingMethod<T>* DirectRead(volatile const T* addr, u32 mask); \
+	MaybeExtern template WriteHandlingMethod<T>* DirectWrite(T* addr, u32 mask); \
+	MaybeExtern template WriteHandlingMethod<T>* DirectWrite(volatile T* addr, u32 mask); \
+	MaybeExtern template ReadHandlingMethod<T>* ComplexRead<T>(std::function<T(u32)>); \
+	MaybeExtern template WriteHandlingMethod<T>* ComplexWrite<T>(std::function<void(u32, T)>); \
+	MaybeExtern template ReadHandlingMethod<T>* InvalidRead<T>(); \
+	MaybeExtern template WriteHandlingMethod<T>* InvalidWrite<T>(); \
+	MaybeExtern template class ReadHandler<T>; \
+	MaybeExtern template class WriteHandler<T>
+
+#define MMIO_SPECIAL_PUBLIC_SPECIALIZATIONS(MaybeExtern) \
+	MaybeExtern template ReadHandlingMethod<u16>* ReadToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr); \
+	MaybeExtern template ReadHandlingMethod<u32>* ReadToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr); \
+	MaybeExtern template WriteHandlingMethod<u16>* WriteToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr); \
+	MaybeExtern template WriteHandlingMethod<u32>* WriteToSmaller(Mapping* mmio, u32 high_part_addr, u32 low_part_addr); \
+	MaybeExtern template ReadHandlingMethod<u8>* ReadToLarger(Mapping* mmio, u32 larger_addr, u32 shift); \
+	MaybeExtern template ReadHandlingMethod<u16>* ReadToLarger(Mapping* mmio, u32 larger_addr, u32 shift)
+
+#define MMIO_PUBLIC_SPECIALIZATIONS() \
+	MMIO_GENERIC_PUBLIC_SPECIALIZATIONS(MaybeExtern, u8); \
+	MMIO_GENERIC_PUBLIC_SPECIALIZATIONS(MaybeExtern, u16); \
+	MMIO_GENERIC_PUBLIC_SPECIALIZATIONS(MaybeExtern, u32); \
+	MMIO_SPECIAL_PUBLIC_SPECIALIZATIONS(MaybeExtern);
+
+#define MaybeExtern extern
+MMIO_PUBLIC_SPECIALIZATIONS()
+#undef MaybeExtern
+
+}
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
new file mode 100644
index 0000000000..ea42b7a94f
--- /dev/null
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -0,0 +1,367 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// NOTE:
+// These functions are primarily used by the interpreter versions of the LoadStore instructions.
+// However, if a JITed instruction (for example lwz) wants to access a bad memory area that call
+// may be redirected here (for example to Read_U32()).
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/MemArena.h"
+#include "Common/MemoryUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MemoryInterface.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/WII_IPC.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace Memory
+{
+// (See comment below describing memory map.)
+bool bFakeVMEM = false;
+
+// =================================
+// Init() declarations
+// ----------------
+// Store the MemArena here
+u8* physical_base = nullptr;
+u8* logical_base = nullptr;
+
+// The MemArena class
+static MemArena g_arena;
+// ==============
+
+// STATE_TO_SAVE
+static bool m_IsInitialized = false; // Save the Init(), Shutdown() state
+// END STATE_TO_SAVE
+
+u8* m_pRAM;
+u8* m_pL1Cache;
+u8* m_pEXRAM;
+u8* m_pFakeVMEM;
+
+// MMIO mapping object.
+MMIO::Mapping* mmio_mapping;
+
+static void InitMMIO(MMIO::Mapping* mmio)
+{
+	g_video_backend->RegisterCPMMIO(mmio, 0x0C000000);
+	PixelEngine::RegisterMMIO(mmio, 0x0C001000);
+	VideoInterface::RegisterMMIO(mmio, 0x0C002000);
+	ProcessorInterface::RegisterMMIO(mmio, 0x0C003000);
+	MemoryInterface::RegisterMMIO(mmio, 0x0C004000);
+	DSP::RegisterMMIO(mmio, 0x0C005000);
+	DVDInterface::RegisterMMIO(mmio, 0x0C006000);
+	SerialInterface::RegisterMMIO(mmio, 0x0C006400);
+	ExpansionInterface::RegisterMMIO(mmio, 0x0C006800);
+	AudioInterface::RegisterMMIO(mmio, 0x0C006C00);
+}
+
+static void InitMMIOWii(MMIO::Mapping* mmio)
+{
+	InitMMIO(mmio);
+
+	WII_IPCInterface::RegisterMMIO(mmio, 0x0D000000);
+	DVDInterface::RegisterMMIO(mmio, 0x0D006000);
+	SerialInterface::RegisterMMIO(mmio, 0x0D006400);
+	ExpansionInterface::RegisterMMIO(mmio, 0x0D006800);
+	AudioInterface::RegisterMMIO(mmio, 0x0D006C00);
+}
+
+bool IsInitialized()
+{
+	return m_IsInitialized;
+}
+
+
+// Dolphin allocates memory to represent four regions:
+// - 32MB RAM (actually 24MB on hardware), available on Gamecube and Wii
+// - 64MB "EXRAM", RAM only available on Wii
+// - 32MB FakeVMem, allocated in GameCube mode when MMU support is turned off.
+//   This is used to approximate the behavior of a common library which pages
+//   memory to and from the DSP's dedicated RAM. The DSP's RAM (ARAM) isn't
+//   directly addressable on GameCube.
+// - 256KB Locked L1, to represent cache lines allocated out of the L1 data
+//   cache in Locked L1 mode.  Dolphin does not emulate this hardware feature
+//   accurately; it just pretends there is extra memory at 0xE0000000.
+//
+// The 4GB starting at physical_base represents access from the CPU
+// with address translation turned off. (This is only used by the CPU;
+// other devices, like the GPU, use other rules, approximated by
+// Memory::GetPointer.) This memory is laid out as follows:
+// [0x00000000, 0x02000000) - 32MB RAM
+// [0x02000000, 0x08000000) - Mirrors of 32MB RAM
+// [0x08000000, 0x0C000000) - EFB "mapping" (not handled here)
+// [0x0C000000, 0x0E000000) - MMIO etc. (not handled here)
+// [0x10000000, 0x14000000) - 64MB RAM (Wii-only; slightly slower)
+//
+// The 4GB starting at logical_base represents access from the CPU
+// with address translation turned on.  Instead of changing the mapping
+// based on the BAT registers, we approximate the common BAT configuration
+// used by games:
+// [0x00000000, 0x02000000) - 32MB RAM, cached access, normally only mapped
+//                            during startup by Wii WADs
+// [0x02000000, 0x08000000) - Mirrors of 32MB RAM (not implemented here)
+// [0x40000000, 0x50000000) - FakeVMEM
+// [0x70000000, 0x80000000) - FakeVMEM
+// [0x80000000, 0x82000000) - 32MB RAM, cached access
+// [0x82000000, 0x88000000) - Mirrors of 32MB RAM (not implemented here)
+// [0x90000000, 0x94000000) - 64MB RAM, Wii-only, cached access
+// [0xC0000000, 0xC2000000) - 32MB RAM, uncached access
+// [0xC2000000, 0xC8000000) - Mirrors of 32MB RAM (not implemented here)
+// [0xC8000000, 0xCC000000) - EFB "mapping" (not handled here)
+// [0xCC000000, 0xCE000000) - MMIO etc. (not handled here)
+// [0xD0000000, 0xD4000000) - 64MB RAM, Wii-only, uncached access
+// [0xE0000000, 0xE0040000) - 256KB locked L1
+//
+// TODO: We shouldn't hardcode this mapping; we can generate it dynamically
+// based on the BAT registers.
+//
+// Each of these 4GB regions is followed by 4GB of empty space so overflows
+// in address computation in the JIT don't access the wrong memory.
+//
+// The neighboring mirrors of RAM ([0x02000000, 0x08000000), etc.) exist because
+// the bus masks off the bits in question for RAM accesses; using them is a
+// terrible idea because the CPU cache won't handle them correctly, but a
+// few buggy games (notably Rogue Squadron 2) use them by accident. They
+// aren't backed by memory mappings because they are used very rarely.
+//
+// Dolphin doesn't emulate the difference between cached and uncached access.
+//
+// TODO: The actual size of RAM is REALRAM_SIZE (24MB); the other 8MB shouldn't
+// be backed by actual memory.
+static MemoryView views[] =
+{
+	{&m_pRAM,      0x00000000, RAM_SIZE,      0},
+	{nullptr,      0x200000000, RAM_SIZE,     MV_MIRROR_PREVIOUS},
+	{nullptr,      0x280000000, RAM_SIZE,     MV_MIRROR_PREVIOUS},
+	{nullptr,      0x2C0000000, RAM_SIZE,     MV_MIRROR_PREVIOUS},
+	{&m_pL1Cache,  0x2E0000000, L1_CACHE_SIZE, 0},
+	{&m_pFakeVMEM, 0x27E000000, FAKEVMEM_SIZE, MV_FAKE_VMEM},
+	{&m_pEXRAM,    0x10000000, EXRAM_SIZE,    MV_WII_ONLY},
+	{nullptr,      0x290000000, EXRAM_SIZE,   MV_WII_ONLY | MV_MIRROR_PREVIOUS},
+	{nullptr,      0x2D0000000, EXRAM_SIZE,   MV_WII_ONLY | MV_MIRROR_PREVIOUS},
+};
+static const int num_views = sizeof(views) / sizeof(MemoryView);
+
+void Init()
+{
+	bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
+	bool bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
+#ifndef _ARCH_32
+	// If MMU is turned off in GameCube mode, turn on fake VMEM hack.
+	// The fake VMEM hack's address space is above the memory space that we
+	// allocate on 32bit targets, so disable it there.
+	bFakeVMEM = !wii && !bMMU;
+#endif
+
+	u32 flags = 0;
+	if (wii) flags |= MV_WII_ONLY;
+	if (bFakeVMEM) flags |= MV_FAKE_VMEM;
+	physical_base = MemoryMap_Setup(views, num_views, flags, &g_arena);
+#ifndef _ARCH_32
+	logical_base = physical_base + 0x200000000;
+#endif
+
+	mmio_mapping = new MMIO::Mapping();
+
+	if (wii)
+		InitMMIOWii(mmio_mapping);
+	else
+		InitMMIO(mmio_mapping);
+
+	INFO_LOG(MEMMAP, "Memory system initialized. RAM at %p", m_pRAM);
+	m_IsInitialized = true;
+}
+
+void DoState(PointerWrap &p)
+{
+	bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
+	p.DoArray(m_pRAM, RAM_SIZE);
+	p.DoArray(m_pL1Cache, L1_CACHE_SIZE);
+	p.DoMarker("Memory RAM");
+	if (bFakeVMEM)
+		p.DoArray(m_pFakeVMEM, FAKEVMEM_SIZE);
+	p.DoMarker("Memory FakeVMEM");
+	if (wii)
+		p.DoArray(m_pEXRAM, EXRAM_SIZE);
+	p.DoMarker("Memory EXRAM");
+}
+
+void Shutdown()
+{
+	m_IsInitialized = false;
+	u32 flags = 0;
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) flags |= MV_WII_ONLY;
+	if (bFakeVMEM) flags |= MV_FAKE_VMEM;
+	MemoryMap_Shutdown(views, num_views, flags, &g_arena);
+	g_arena.ReleaseSHMSegment();
+	physical_base = nullptr;
+	logical_base = nullptr;
+	delete mmio_mapping;
+	INFO_LOG(MEMMAP, "Memory system shut down.");
+}
+
+void Clear()
+{
+	if (m_pRAM)
+		memset(m_pRAM, 0, RAM_SIZE);
+	if (m_pL1Cache)
+		memset(m_pL1Cache, 0, L1_CACHE_SIZE);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && m_pEXRAM)
+		memset(m_pEXRAM, 0, EXRAM_SIZE);
+}
+
+bool AreMemoryBreakpointsActivated()
+{
+#ifdef ENABLE_MEM_CHECK
+	return true;
+#else
+	return false;
+#endif
+}
+
+static inline bool ValidCopyRange(u32 address, size_t size)
+{
+	return (GetPointer(address) != nullptr &&
+	        GetPointer(address + u32(size)) != nullptr &&
+	        size < EXRAM_SIZE); // Make sure we don't have a range spanning seperate 2 banks
+}
+
+void CopyFromEmu(void* data, u32 address, size_t size)
+{
+	if (!ValidCopyRange(address, size))
+	{
+		PanicAlert("Invalid range in CopyFromEmu. %lx bytes from 0x%08x", (unsigned long)size, address);
+		return;
+	}
+	memcpy(data, GetPointer(address), size);
+}
+
+void CopyToEmu(u32 address, const void* data, size_t size)
+{
+	if (!ValidCopyRange(address, size))
+	{
+		PanicAlert("Invalid range in CopyToEmu. %lx bytes to 0x%08x", (unsigned long)size, address);
+		return;
+	}
+	memcpy(GetPointer(address), data, size);
+}
+
+void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
+{
+	u8* ptr = GetPointer(_Address);
+	if (ptr != nullptr)
+	{
+		memset(ptr,_iValue,_iLength);
+	}
+}
+
+std::string GetString(u32 em_address, size_t size)
+{
+	const char* ptr = reinterpret_cast<const char*>(GetPointer(em_address));
+	if (ptr == nullptr)
+		return "";
+
+	if (size == 0) // Null terminated string.
+	{
+		return std::string(ptr);
+	}
+	else // Fixed size string, potentially null terminated or null padded.
+	{
+		size_t length = strnlen(ptr, size);
+		return std::string(ptr, length);
+	}
+}
+
+u8* GetPointer(u32 address)
+{
+	// TODO: Should we be masking off more bits here?  Can all devices access
+	// EXRAM?
+	address &= 0x3FFFFFFF;
+	if (address < REALRAM_SIZE)
+		return m_pRAM + address;
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		if ((address >> 28) == 0x1 && (address & 0x0fffffff) < EXRAM_SIZE)
+			return m_pEXRAM + (address & EXRAM_MASK);
+	}
+
+	PanicAlert("Unknown Pointer 0x%08x PC 0x%08x LR 0x%08x", address, PC, LR);
+
+	return nullptr;
+}
+
+u8 Read_U8(u32 address)
+{
+	return *GetPointer(address);
+}
+
+u16 Read_U16(u32 address)
+{
+	return Common::swap16(GetPointer(address));
+}
+
+u32 Read_U32(u32 address)
+{
+	return Common::swap32(GetPointer(address));
+}
+
+u64 Read_U64(u32 address)
+{
+	return Common::swap64(GetPointer(address));
+}
+
+void Write_U8(u8 value, u32 address)
+{
+	*GetPointer(address) = value;
+}
+
+void Write_U16(u16 value, u32 address)
+{
+	*(u16*)GetPointer(address) = Common::swap16(value);
+}
+
+void Write_U32(u32 value, u32 address)
+{
+	*(u32*)GetPointer(address) = Common::swap32(value);
+}
+
+void Write_U64(u64 value, u32 address)
+{
+	*(u64*)GetPointer(address) = Common::swap64(value);
+}
+
+void Write_U32_Swap(u32 value, u32 address)
+{
+	*(u32*)GetPointer(address) = value;
+}
+
+void Write_U64_Swap(u64 value, u32 address)
+{
+	*(u64*)GetPointer(address) = value;
+}
+
+}  // namespace
diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h
new file mode 100644
index 0000000000..065903a69e
--- /dev/null
+++ b/Source/Core/Core/HW/Memmap.h
@@ -0,0 +1,95 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+
+// Enable memory checks in the Debug/DebugFast builds, but NOT in release
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	#define ENABLE_MEM_CHECK
+#endif
+
+// Global declarations
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+namespace Memory
+{
+// Base is a pointer to the base of the memory map. Yes, some MMU tricks
+// are used to set up a full GC or Wii memory map in process memory.  on
+// 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that
+// some things are mirrored too many times, but eh... it works.
+
+// In 64-bit, this might point to "high memory" (above the 32-bit limit),
+// so be sure to load it into a 64-bit register.
+extern u8* physical_base;
+extern u8* logical_base;
+
+// These are guaranteed to point to "low memory" addresses (sub-32-bit).
+extern u8* m_pRAM;
+extern u8* m_pEXRAM;
+extern u8* m_pL1Cache;
+extern u8* m_pFakeVMEM;
+extern bool bFakeVMEM;
+
+enum
+{
+	// RAM_SIZE is the amount allocated by the emulator, whereas REALRAM_SIZE is
+	// what will be reported in lowmem, and thus used by emulated software.
+	// Note: Writing to lowmem is done by IPL. If using retail IPL, it will
+	// always be set to 24MB.
+	REALRAM_SIZE  = 0x01800000,
+	RAM_SIZE      = ROUND_UP_POW2(REALRAM_SIZE),
+	RAM_MASK      = RAM_SIZE - 1,
+	FAKEVMEM_SIZE = 0x02000000,
+	FAKEVMEM_MASK = FAKEVMEM_SIZE - 1,
+	L1_CACHE_SIZE = 0x00040000,
+	L1_CACHE_MASK = L1_CACHE_SIZE - 1,
+	IO_SIZE       = 0x00010000,
+	EXRAM_SIZE    = 0x04000000,
+	EXRAM_MASK    = EXRAM_SIZE - 1,
+
+	ADDR_MASK_HW_ACCESS = 0x0c000000,
+	ADDR_MASK_MEM1      = 0x20000000,
+
+#if _ARCH_32
+	MEMVIEW32_MASK  = 0x3FFFFFFF,
+#endif
+};
+
+// MMIO mapping object.
+extern MMIO::Mapping* mmio_mapping;
+
+// Init and Shutdown
+bool IsInitialized();
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+
+void Clear();
+bool AreMemoryBreakpointsActivated();
+
+// Routines to access physically addressed memory, designed for use by
+// emulated hardware outside the CPU. Use "Device_" prefix.
+std::string GetString(u32 em_address, size_t size = 0);
+u8* GetPointer(const u32 address);
+void CopyFromEmu(void* data, u32 address, size_t size);
+void CopyToEmu(u32 address, const void* data, size_t size);
+void Memset(const u32 address, const u8 var, const u32 length);
+u8  Read_U8(const u32 address);
+u16 Read_U16(const u32 address);
+u32 Read_U32(const u32 address);
+u64 Read_U64(const u32 address);
+void Write_U8(const u8 var, const u32 address);
+void Write_U16(const u16 var, const u32 address);
+void Write_U32(const u32 var, const u32 address);
+void Write_U64(const u64 var, const u32 address);
+void Write_U32_Swap(const u32 var, const u32 address);
+void Write_U64_Swap(const u64 var, const u32 address);
+
+}
diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp
new file mode 100644
index 0000000000..f75b8fb4a0
--- /dev/null
+++ b/Source/Core/Core/HW/MemoryInterface.cpp
@@ -0,0 +1,215 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/HW/MemoryInterface.h"
+#include "Core/HW/MMIO.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace MemoryInterface
+{
+
+// internal hardware addresses
+enum
+{
+	MI_REGION0_FIRST    = 0x000,
+	MI_REGION0_LAST     = 0x002,
+	MI_REGION1_FIRST    = 0x004,
+	MI_REGION1_LAST     = 0x006,
+	MI_REGION2_FIRST    = 0x008,
+	MI_REGION2_LAST     = 0x00A,
+	MI_REGION3_FIRST    = 0x00C,
+	MI_REGION3_LAST     = 0x00E,
+	MI_PROT_TYPE        = 0x010,
+	MI_IRQMASK          = 0x01C,
+	MI_IRQFLAG          = 0x01E,
+	MI_UNKNOWN1         = 0x020,
+	MI_PROT_ADDR_LO     = 0x022,
+	MI_PROT_ADDR_HI     = 0x024,
+	MI_TIMER0_HI        = 0x032,
+	MI_TIMER0_LO        = 0x034,
+	MI_TIMER1_HI        = 0x036,
+	MI_TIMER1_LO        = 0x038,
+	MI_TIMER2_HI        = 0x03A,
+	MI_TIMER2_LO        = 0x03C,
+	MI_TIMER3_HI        = 0x03E,
+	MI_TIMER3_LO        = 0x040,
+	MI_TIMER4_HI        = 0x042,
+	MI_TIMER4_LO        = 0x044,
+	MI_TIMER5_HI        = 0x046,
+	MI_TIMER5_LO        = 0x048,
+	MI_TIMER6_HI        = 0x04A,
+	MI_TIMER6_LO        = 0x04C,
+	MI_TIMER7_HI        = 0x04E,
+	MI_TIMER7_LO        = 0x050,
+	MI_TIMER8_HI        = 0x052,
+	MI_TIMER8_LO        = 0x054,
+	MI_TIMER9_HI        = 0x056,
+	MI_TIMER9_LO        = 0x058,
+	MI_UNKNOWN2         = 0x05A,
+};
+
+union MIRegion
+{
+	u32 hex;
+	struct { u16 first_page; u16 last_page; };
+};
+
+union MIProtType
+{
+	u16 hex;
+	struct
+	{
+		u16 reg0 : 2;
+		u16 reg1 : 2;
+		u16 reg2 : 2;
+		u16 reg3 : 2;
+		u16 : 8;
+	};
+};
+
+union MIIRQMask
+{
+	u16 hex;
+	struct
+	{
+		u16 reg0 : 1;
+		u16 reg1 : 1;
+		u16 reg2 : 1;
+		u16 reg3 : 1;
+		u16 all_regs : 1;
+		u16 : 11;
+	};
+};
+
+union MIIRQFlag
+{
+	u16 hex;
+	struct
+	{
+		u16 reg0 : 1;
+		u16 reg1 : 1;
+		u16 reg2 : 1;
+		u16 reg3 : 1;
+		u16 all_regs : 1;
+		u16 : 11;
+	};
+};
+
+union MIProtAddr
+{
+	u32 hex;
+	struct { u16 lo; u16 hi; };
+	struct
+	{
+		u32 : 5;
+		u32 addr : 25;
+		u32 : 2;
+	};
+};
+
+union MITimer
+{
+	u32 hex;
+	struct { u16 lo; u16 hi; };
+};
+
+struct MIMemStruct
+{
+	MIRegion regions[4];
+	MIProtType prot_type;
+	MIIRQMask irq_mask;
+	MIIRQFlag irq_flag;
+	u16 unknown1;
+	MIProtAddr prot_addr;
+	MITimer timers[10];
+	u16 unknown2;
+};
+
+// STATE_TO_SAVE
+static MIMemStruct g_mi_mem;
+
+void DoState(PointerWrap &p)
+{
+	p.Do(g_mi_mem);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	for (int i = MI_REGION0_FIRST; i <= MI_REGION3_LAST; i += 4)
+	{
+		auto& region = g_mi_mem.regions[i / 4];
+		mmio->Register(base | i,
+			MMIO::DirectRead<u16>(&region.first_page),
+			MMIO::DirectWrite<u16>(&region.first_page)
+		);
+		mmio->Register(base | (i + 2),
+			MMIO::DirectRead<u16>(&region.last_page),
+			MMIO::DirectWrite<u16>(&region.last_page)
+		);
+	}
+
+	mmio->Register(base | MI_PROT_TYPE,
+		MMIO::DirectRead<u16>(&g_mi_mem.prot_type.hex),
+		MMIO::DirectWrite<u16>(&g_mi_mem.prot_type.hex)
+	);
+
+	mmio->Register(base | MI_IRQMASK,
+		MMIO::DirectRead<u16>(&g_mi_mem.irq_mask.hex),
+		MMIO::DirectWrite<u16>(&g_mi_mem.irq_mask.hex)
+	);
+
+	mmio->Register(base | MI_IRQFLAG,
+		MMIO::DirectRead<u16>(&g_mi_mem.irq_flag.hex),
+		MMIO::DirectWrite<u16>(&g_mi_mem.irq_flag.hex)
+	);
+
+	mmio->Register(base | MI_UNKNOWN1,
+		MMIO::DirectRead<u16>(&g_mi_mem.unknown1),
+		MMIO::DirectWrite<u16>(&g_mi_mem.unknown1)
+	);
+
+	// The naming is confusing here: the registed contains the lower part of
+	// the address (hence MI_..._LO but this is still the high part of the
+	// overall register.
+	mmio->Register(base | MI_PROT_ADDR_LO,
+		MMIO::DirectRead<u16>(&g_mi_mem.prot_addr.hi),
+		MMIO::DirectWrite<u16>(&g_mi_mem.prot_addr.hi)
+	);
+	mmio->Register(base | MI_PROT_ADDR_HI,
+		MMIO::DirectRead<u16>(&g_mi_mem.prot_addr.lo),
+		MMIO::DirectWrite<u16>(&g_mi_mem.prot_addr.lo)
+	);
+
+	for (int i = 0; i < 10; ++i)
+	{
+		auto& timer = g_mi_mem.timers[i];
+		mmio->Register(base | (MI_TIMER0_HI + 4 * i),
+			MMIO::DirectRead<u16>(&timer.hi),
+			MMIO::DirectWrite<u16>(&timer.hi)
+		);
+		mmio->Register(base | (MI_TIMER0_LO + 4 * i),
+			MMIO::DirectRead<u16>(&timer.lo),
+			MMIO::DirectWrite<u16>(&timer.lo)
+		);
+	}
+
+	mmio->Register(base | MI_UNKNOWN2,
+		MMIO::DirectRead<u16>(&g_mi_mem.unknown2),
+		MMIO::DirectWrite<u16>(&g_mi_mem.unknown2)
+	);
+
+	for (int i = 0; i < 0x1000; i += 4)
+	{
+		mmio->Register(base | i,
+			MMIO::ReadToSmaller<u32>(mmio, base | i, base | (i + 2)),
+			MMIO::WriteToSmaller<u32>(mmio, base | i, base | (i + 2))
+		);
+	}
+}
+
+} // end of namespace MemoryInterface
+
diff --git a/Source/Core/Core/HW/MemoryInterface.h b/Source/Core/Core/HW/MemoryInterface.h
new file mode 100644
index 0000000000..0a1b553e1d
--- /dev/null
+++ b/Source/Core/Core/HW/MemoryInterface.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace MMIO { class Mapping; }
+class PointerWrap;
+
+namespace MemoryInterface
+{
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+} // end of namespace MemoryInterface
diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp
new file mode 100644
index 0000000000..ef8b1860b2
--- /dev/null
+++ b/Source/Core/Core/HW/ProcessorInterface.cpp
@@ -0,0 +1,230 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace ProcessorInterface
+{
+
+// Internal hardware addresses
+enum
+{
+	PI_INTERRUPT_CAUSE = 0x00,
+	PI_INTERRUPT_MASK  = 0x04,
+	PI_FIFO_BASE       = 0x0C,
+	PI_FIFO_END        = 0x10,
+	PI_FIFO_WPTR       = 0x14,
+	PI_FIFO_RESET      = 0x18, // ??? - GXAbortFrame writes to it
+	PI_RESET_CODE      = 0x24,
+	PI_FLIPPER_REV     = 0x2C,
+	PI_FLIPPER_UNK     = 0x30 // BS1 writes 0x0245248A to it - prolly some bootstrap thing
+};
+
+
+// STATE_TO_SAVE
+u32 m_InterruptCause;
+u32 m_InterruptMask;
+// addresses for CPU fifo accesses
+u32 Fifo_CPUBase;
+u32 Fifo_CPUEnd;
+u32 Fifo_CPUWritePointer;
+
+static u32 m_Fifo_Reset;
+static u32 m_ResetCode;
+static u32 m_FlipperRev;
+static u32 m_Unknown;
+
+
+// ID and callback for scheduling reset button presses/releases
+static int toggleResetButton;
+void ToggleResetButtonCallback(u64 userdata, int cyclesLate);
+
+// Let the PPC know that an external exception is set/cleared
+void UpdateException();
+
+
+void DoState(PointerWrap &p)
+{
+	p.Do(m_InterruptMask);
+	p.Do(m_InterruptCause);
+	p.Do(Fifo_CPUBase);
+	p.Do(Fifo_CPUEnd);
+	p.Do(Fifo_CPUWritePointer);
+	p.Do(m_Fifo_Reset);
+	p.Do(m_ResetCode);
+	p.Do(m_FlipperRev);
+	p.Do(m_Unknown);
+}
+
+void Init()
+{
+	m_InterruptMask = 0;
+	m_InterruptCause = 0;
+
+	Fifo_CPUBase = 0;
+	Fifo_CPUEnd = 0;
+	Fifo_CPUWritePointer = 0;
+	/*
+	Previous Flipper IDs:
+	0x046500B0 = A
+	0x146500B1 = B
+	*/
+	m_FlipperRev = 0x246500B1; // revision C
+	m_Unknown = 0;
+
+	m_ResetCode = 0x80000000; // Cold reset
+	m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI;
+
+	toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", ToggleResetButtonCallback);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	mmio->Register(base | PI_INTERRUPT_CAUSE,
+		MMIO::DirectRead<u32>(&m_InterruptCause),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			m_InterruptCause &= ~val;
+			UpdateException();
+		})
+	);
+
+	mmio->Register(base | PI_INTERRUPT_MASK,
+		MMIO::DirectRead<u32>(&m_InterruptMask),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			m_InterruptMask = val;
+			UpdateException();
+		})
+	);
+
+	mmio->Register(base | PI_FIFO_BASE,
+		MMIO::DirectRead<u32>(&Fifo_CPUBase),
+		MMIO::DirectWrite<u32>(&Fifo_CPUBase, 0xFFFFFFE0)
+	);
+
+	mmio->Register(base | PI_FIFO_END,
+		MMIO::DirectRead<u32>(&Fifo_CPUEnd),
+		MMIO::DirectWrite<u32>(&Fifo_CPUEnd, 0xFFFFFFE0)
+	);
+
+	mmio->Register(base | PI_FIFO_WPTR,
+		MMIO::DirectRead<u32>(&Fifo_CPUWritePointer),
+		MMIO::DirectWrite<u32>(&Fifo_CPUWritePointer, 0xFFFFFFE0)
+	);
+
+	mmio->Register(base | PI_FIFO_RESET,
+		MMIO::InvalidRead<u32>(),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			WARN_LOG(PROCESSORINTERFACE, "Fifo reset (%08x)", val);
+		})
+	);
+
+	mmio->Register(base | PI_RESET_CODE,
+		MMIO::DirectRead<u32>(&m_ResetCode),
+		MMIO::DirectWrite<u32>(&m_ResetCode)
+	);
+
+	mmio->Register(base | PI_FLIPPER_REV,
+		MMIO::DirectRead<u32>(&m_FlipperRev),
+		MMIO::InvalidWrite<u32>()
+	);
+
+	// 16 bit reads are based on 32 bit reads.
+	for (int i = 0; i < 0x1000; i += 4)
+	{
+		mmio->Register(base | i,
+			MMIO::ReadToLarger<u16>(mmio, base | i, 16),
+			MMIO::InvalidWrite<u16>()
+		);
+		mmio->Register(base | (i + 2),
+			MMIO::ReadToLarger<u16>(mmio, base | i, 0),
+			MMIO::InvalidWrite<u16>()
+		);
+	}
+}
+
+void UpdateException()
+{
+	if ((m_InterruptCause & m_InterruptMask) != 0)
+		PowerPC::ppcState.Exceptions |= EXCEPTION_EXTERNAL_INT;
+	else
+		PowerPC::ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
+}
+
+static const char *Debug_GetInterruptName(u32 _causemask)
+{
+	switch (_causemask)
+	{
+	case INT_CAUSE_PI:         return "INT_CAUSE_PI";
+	case INT_CAUSE_DI:         return "INT_CAUSE_DI";
+	case INT_CAUSE_RSW:        return "INT_CAUSE_RSW";
+	case INT_CAUSE_SI:         return "INT_CAUSE_SI";
+	case INT_CAUSE_EXI:        return "INT_CAUSE_EXI";
+	case INT_CAUSE_AI:         return "INT_CAUSE_AI";
+	case INT_CAUSE_DSP:        return "INT_CAUSE_DSP";
+	case INT_CAUSE_MEMORY:     return "INT_CAUSE_MEMORY";
+	case INT_CAUSE_VI:         return "INT_CAUSE_VI";
+	case INT_CAUSE_PE_TOKEN:   return "INT_CAUSE_PE_TOKEN";
+	case INT_CAUSE_PE_FINISH:  return "INT_CAUSE_PE_FINISH";
+	case INT_CAUSE_CP:         return "INT_CAUSE_CP";
+	case INT_CAUSE_DEBUG:      return "INT_CAUSE_DEBUG";
+	case INT_CAUSE_WII_IPC:    return "INT_CAUSE_WII_IPC";
+	case INT_CAUSE_HSP:        return "INT_CAUSE_HSP";
+	case INT_CAUSE_RST_BUTTON: return "INT_CAUSE_RST_BUTTON";
+	default:                   return "!!! ERROR-unknown Interrupt !!!";
+	}
+}
+
+void SetInterrupt(u32 _causemask, bool _bSet)
+{
+	_dbg_assert_msg_(POWERPC, Core::IsCPUThread(), "SetInterrupt from wrong thread");
+
+	if (_bSet && !(m_InterruptCause & _causemask))
+	{
+		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (set)", Debug_GetInterruptName(_causemask));
+	}
+
+	if (!_bSet && (m_InterruptCause & _causemask))
+	{
+		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (clear)", Debug_GetInterruptName(_causemask));
+	}
+
+	if (_bSet)
+		m_InterruptCause |= _causemask;
+	else
+		m_InterruptCause &= ~_causemask;// is there any reason to have this possibility?
+		                                // F|RES: i think the hw devices reset the interrupt in the PI to 0
+		                                // if the interrupt cause is eliminated. that isnt done by software (afaik)
+	UpdateException();
+}
+
+static void SetResetButton(bool _bSet)
+{
+	SetInterrupt(INT_CAUSE_RST_BUTTON, !_bSet);
+}
+
+void ToggleResetButtonCallback(u64 userdata, int cyclesLate)
+{
+	SetResetButton(!!userdata);
+}
+
+void ResetButton_Tap()
+{
+	CoreTiming::ScheduleEvent_Threadsafe(0, toggleResetButton, true);
+	CoreTiming::ScheduleEvent_Threadsafe(243000000, toggleResetButton, false);
+}
+
+} // namespace ProcessorInterface
diff --git a/Source/Core/Core/HW/ProcessorInterface.h b/Source/Core/Core/HW/ProcessorInterface.h
new file mode 100644
index 0000000000..c8b8448175
--- /dev/null
+++ b/Source/Core/Core/HW/ProcessorInterface.h
@@ -0,0 +1,58 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+class PointerWrap;
+
+namespace MMIO { class Mapping; }
+
+// Holds statuses of things like the write gatherer used for fifos, and interrupts from various sources
+
+namespace ProcessorInterface
+{
+
+enum InterruptCause
+{
+	INT_CAUSE_PI          =    0x1, // YAGCD says: GP runtime error
+	INT_CAUSE_RSW         =    0x2, // Reset Switch
+	INT_CAUSE_DI          =    0x4, // DVD interrupt
+	INT_CAUSE_SI          =    0x8, // Serial interface
+	INT_CAUSE_EXI         =   0x10, // Expansion interface
+	INT_CAUSE_AI          =   0x20, // Audio Interface Streaming
+	INT_CAUSE_DSP         =   0x40, // DSP interface
+	INT_CAUSE_MEMORY      =   0x80, // Memory interface
+	INT_CAUSE_VI          =  0x100, // Video interface
+	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
+	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
+	INT_CAUSE_CP          =  0x800, // Command Fifo
+	INT_CAUSE_DEBUG       = 0x1000, // Debugger (from devkit)
+	INT_CAUSE_HSP         = 0x2000, // High Speed Port (from sdram controller)
+	INT_CAUSE_WII_IPC     = 0x4000, // Wii IPC
+	INT_CAUSE_RST_BUTTON  = 0x10000 // ResetButtonState (1 = unpressed, 0 = pressed) it's a state, not maskable
+};
+
+
+extern u32 m_InterruptCause;
+extern u32 m_InterruptMask;
+extern u32 Fifo_CPUBase;
+extern u32 Fifo_CPUEnd;
+extern u32 Fifo_CPUWritePointer;
+
+
+void Init();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+inline u32 GetMask() { return m_InterruptMask; }
+inline u32 GetCause() { return m_InterruptCause; }
+
+void SetInterrupt(u32 _causemask, bool _bSet=true);
+
+// Thread-safe func which sets and clears reset button state automagically
+void ResetButton_Tap();
+
+} // namespace ProcessorInterface
diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp
new file mode 100644
index 0000000000..35cab150ef
--- /dev/null
+++ b/Source/Core/Core/HW/SI.cpp
@@ -0,0 +1,591 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SI_DeviceGBA.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+
+
+namespace SerialInterface
+{
+
+static int changeDevice;
+static int et_transfer_pending;
+
+void RunSIBuffer(u64 userdata, int cyclesLate);
+void UpdateInterrupts();
+
+// SI Interrupt Types
+enum SIInterruptType
+{
+	INT_RDSTINT = 0,
+	INT_TCINT   = 1,
+};
+static void GenerateSIInterrupt(SIInterruptType _SIInterrupt);
+
+// SI Internal Hardware Addresses
+enum
+{
+	SI_CHANNEL_0_OUT   = 0x00,
+	SI_CHANNEL_0_IN_HI = 0x04,
+	SI_CHANNEL_0_IN_LO = 0x08,
+	SI_CHANNEL_1_OUT   = 0x0C,
+	SI_CHANNEL_1_IN_HI = 0x10,
+	SI_CHANNEL_1_IN_LO = 0x14,
+	SI_CHANNEL_2_OUT   = 0x18,
+	SI_CHANNEL_2_IN_HI = 0x1C,
+	SI_CHANNEL_2_IN_LO = 0x20,
+	SI_CHANNEL_3_OUT   = 0x24,
+	SI_CHANNEL_3_IN_HI = 0x28,
+	SI_CHANNEL_3_IN_LO = 0x2C,
+	SI_POLL            = 0x30,
+	SI_COM_CSR         = 0x34,
+	SI_STATUS_REG      = 0x38,
+	SI_EXI_CLOCK_COUNT = 0x3C,
+};
+
+// SI Channel Output
+union USIChannelOut
+{
+	u32 Hex;
+	struct
+	{
+		u32 OUTPUT1 : 8;
+		u32 OUTPUT0 : 8;
+		u32 CMD     : 8;
+		u32         : 8;
+	};
+};
+
+// SI Channel Input High u32
+union USIChannelIn_Hi
+{
+	u32 Hex;
+	struct
+	{
+		u32 INPUT3   : 8;
+		u32 INPUT2   : 8;
+		u32 INPUT1   : 8;
+		u32 INPUT0   : 6;
+		u32 ERRLATCH : 1; // 0: no error  1: Error latched. Check SISR.
+		u32 ERRSTAT  : 1; // 0: no error  1: error on last transfer
+	};
+};
+
+// SI Channel Input Low u32
+union USIChannelIn_Lo
+{
+	u32 Hex;
+	struct
+	{
+		u32 INPUT7 : 8;
+		u32 INPUT6 : 8;
+		u32 INPUT5 : 8;
+		u32 INPUT4 : 8;
+	};
+};
+
+// SI Channel
+struct SSIChannel
+{
+	USIChannelOut   m_Out;
+	USIChannelIn_Hi m_InHi;
+	USIChannelIn_Lo m_InLo;
+	ISIDevice*      m_pDevice;
+};
+
+// SI Poll: Controls how often a device is polled
+union USIPoll
+{
+	u32 Hex;
+	struct
+	{
+		u32 VBCPY3  : 1;  // 1: write to output buffer only on vblank
+		u32 VBCPY2  : 1;
+		u32 VBCPY1  : 1;
+		u32 VBCPY0  : 1;
+		u32 EN3     : 1;  // Enable polling of channel
+		u32 EN2     : 1;  //  does not affect communication RAM transfers
+		u32 EN1     : 1;
+		u32 EN0     : 1;
+		u32 Y       : 8;  // Polls per frame
+		u32 X       : 10; // Polls per X lines. begins at vsync, min 7, max depends on video mode
+		u32         : 6;
+	};
+};
+
+// SI Communication Control Status Register
+union USIComCSR
+{
+	u32 Hex;
+	struct
+	{
+		u32 TSTART     : 1; // write: start transfer  read: transfer status
+		u32 CHANNEL    : 2; // determines which SI channel will be used on the communication interface.
+		u32            : 3;
+		u32 CALLBEN    : 1; // Callback enable
+		u32 CMDEN      : 1; // Command enable?
+		u32 INLNGTH    : 7;
+		u32            : 1;
+		u32 OUTLNGTH   : 7; // Communication Channel Output Length in bytes
+		u32            : 1;
+		u32 CHANEN     : 1; // Channel enable?
+		u32 CHANNUM    : 2; // Channel number?
+		u32 RDSTINTMSK : 1; // Read Status Interrupt Status Mask
+		u32 RDSTINT    : 1; // Read Status Interrupt Status
+		u32 COMERR     : 1; // Communication Error (set 0)
+		u32 TCINTMSK   : 1; // Transfer Complete Interrupt Mask
+		u32 TCINT      : 1; // Transfer Complete Interrupt
+	};
+	USIComCSR() {Hex = 0;}
+	USIComCSR(u32 _hex) {Hex = _hex;}
+};
+
+// SI Status Register
+union USIStatusReg
+{
+	u32 Hex;
+	struct
+	{
+		u32 UNRUN3  : 1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
+		u32 OVRUN3  : 1; // (RWC) write 1: bit cleared  read 1: overrun error
+		u32 COLL3   : 1; // (RWC) write 1: bit cleared  read 1: collision error
+		u32 NOREP3  : 1; // (RWC) write 1: bit cleared  read 1: response error
+		u32 WRST3   : 1; // (R) 1: buffer channel0 not copied
+		u32 RDST3   : 1; // (R) 1: new Data available
+		u32         : 2; // 7:6
+		u32 UNRUN2  : 1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
+		u32 OVRUN2  : 1; // (RWC) write 1: bit cleared  read 1: overrun error
+		u32 COLL2   : 1; // (RWC) write 1: bit cleared  read 1: collision error
+		u32 NOREP2  : 1; // (RWC) write 1: bit cleared  read 1: response error
+		u32 WRST2   : 1; // (R) 1: buffer channel0 not copied
+		u32 RDST2   : 1; // (R) 1: new Data available
+		u32         : 2; // 15:14
+		u32 UNRUN1  : 1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
+		u32 OVRUN1  : 1; // (RWC) write 1: bit cleared  read 1: overrun error
+		u32 COLL1   : 1; // (RWC) write 1: bit cleared  read 1: collision error
+		u32 NOREP1  : 1; // (RWC) write 1: bit cleared  read 1: response error
+		u32 WRST1   : 1; // (R) 1: buffer channel0 not copied
+		u32 RDST1   : 1; // (R) 1: new Data available
+		u32         : 2; // 23:22
+		u32 UNRUN0  : 1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
+		u32 OVRUN0  : 1; // (RWC) write 1: bit cleared  read 1: overrun error
+		u32 COLL0   : 1; // (RWC) write 1: bit cleared  read 1: collision error
+		u32 NOREP0  : 1; // (RWC) write 1: bit cleared  read 1: response error
+		u32 WRST0   : 1; // (R) 1: buffer channel0 not copied
+		u32 RDST0   : 1; // (R) 1: new Data available
+		u32         : 1;
+		u32 WR      : 1; // (RW) write 1 start copy, read 0 copy done
+	};
+	USIStatusReg() {Hex = 0;}
+	USIStatusReg(u32 _hex) {Hex = _hex;}
+};
+
+// SI EXI Clock Count
+union USIEXIClockCount
+{
+	u32 Hex;
+	struct
+	{
+		u32 LOCK : 1; // 1: prevents CPU from setting EXI clock to 32MHz
+		u32      : 0;
+	};
+};
+
+// STATE_TO_SAVE
+static SSIChannel       g_Channel[MAX_SI_CHANNELS];
+static USIPoll          g_Poll;
+static USIComCSR        g_ComCSR;
+static USIStatusReg     g_StatusReg;
+static USIEXIClockCount g_EXIClockCount;
+static u8               g_SIBuffer[128];
+
+void DoState(PointerWrap &p)
+{
+	for (int i = 0; i < MAX_SI_CHANNELS; i++)
+	{
+		p.Do(g_Channel[i].m_InHi.Hex);
+		p.Do(g_Channel[i].m_InLo.Hex);
+		p.Do(g_Channel[i].m_Out.Hex);
+
+		ISIDevice* pDevice = g_Channel[i].m_pDevice;
+		SIDevices type = pDevice->GetDeviceType();
+		p.Do(type);
+		ISIDevice* pSaveDevice = (type == pDevice->GetDeviceType()) ? pDevice : SIDevice_Create(type, i);
+		pSaveDevice->DoState(p);
+		if (pSaveDevice != pDevice)
+		{
+			// if we had to create a temporary device, discard it if we're not loading.
+			// also, if no movie is active, we'll assume the user wants to keep their current devices
+			// instead of the ones they had when the savestate was created.
+			if (p.GetMode() != PointerWrap::MODE_READ || !Movie::IsMovieActive())
+			{
+				delete pSaveDevice;
+			}
+			else
+			{
+				AddDevice(pSaveDevice);
+			}
+		}
+	}
+	p.Do(g_Poll);
+	p.DoPOD(g_ComCSR);
+	p.DoPOD(g_StatusReg);
+	p.Do(g_EXIClockCount);
+	p.Do(g_SIBuffer);
+}
+
+
+void Init()
+{
+	for (int i = 0; i < MAX_SI_CHANNELS; i++)
+	{
+		g_Channel[i].m_Out.Hex = 0;
+		g_Channel[i].m_InHi.Hex = 0;
+		g_Channel[i].m_InLo.Hex = 0;
+
+		if (Movie::IsMovieActive())
+			AddDevice(Movie::IsUsingPad(i) ?  (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
+		else if (!NetPlay::IsNetPlayRunning())
+			AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
+	}
+
+	g_Poll.Hex = 0;
+	g_Poll.X = 7;
+
+	g_ComCSR.Hex = 0;
+
+	g_StatusReg.Hex = 0;
+
+	g_EXIClockCount.Hex = 0;
+	//g_EXIClockCount.LOCK = 1; // Supposedly set on reset, but logs from real Wii don't look like it is...
+	memset(g_SIBuffer, 0, 128);
+
+	changeDevice = CoreTiming::RegisterEvent("ChangeSIDevice", ChangeDeviceCallback);
+	et_transfer_pending = CoreTiming::RegisterEvent("SITransferPending", RunSIBuffer);
+}
+
+void Shutdown()
+{
+	for (int i = 0; i < MAX_SI_CHANNELS; i++)
+		RemoveDevice(i);
+	GBAConnectionWaiter_Shutdown();
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	// Register SI buffer direct accesses.
+	for (int i = 0; i < 0x80; i += 4)
+		mmio->Register(base | (0x80 + i),
+			MMIO::DirectRead<u32>((u32*)&g_SIBuffer[i]),
+			MMIO::DirectWrite<u32>((u32*)&g_SIBuffer[i])
+		);
+
+	// In and out for the 4 SI channels.
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+	{
+		// We need to clear the RDST bit for the SI channel when reading.
+		// CH0 -> Bit 24 + 5
+		// CH1 -> Bit 16 + 5
+		// CH2 -> Bit 8 + 5
+		// CH3 -> Bit 0 + 5
+		int rdst_bit = 8 * (3 - i) + 5;
+
+		mmio->Register(base | (SI_CHANNEL_0_OUT + 0xC * i),
+			MMIO::DirectRead<u32>(&g_Channel[i].m_Out.Hex),
+			MMIO::DirectWrite<u32>(&g_Channel[i].m_Out.Hex)
+		);
+		mmio->Register(base | (SI_CHANNEL_0_IN_HI + 0xC * i),
+			MMIO::ComplexRead<u32>([i, rdst_bit](u32) {
+				g_StatusReg.Hex &= ~(1 << rdst_bit);
+				UpdateInterrupts();
+				return g_Channel[i].m_InHi.Hex;
+			}),
+			MMIO::DirectWrite<u32>(&g_Channel[i].m_InHi.Hex)
+		);
+		mmio->Register(base | (SI_CHANNEL_0_IN_LO + 0xC * i),
+			MMIO::ComplexRead<u32>([i, rdst_bit](u32) {
+				g_StatusReg.Hex &= ~(1 << rdst_bit);
+				UpdateInterrupts();
+				return g_Channel[i].m_InLo.Hex;
+			}),
+			MMIO::DirectWrite<u32>(&g_Channel[i].m_InLo.Hex)
+		);
+	}
+
+	mmio->Register(base | SI_POLL,
+		MMIO::DirectRead<u32>(&g_Poll.Hex),
+		MMIO::DirectWrite<u32>(&g_Poll.Hex)
+	);
+
+	mmio->Register(base | SI_COM_CSR,
+		MMIO::DirectRead<u32>(&g_ComCSR.Hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			USIComCSR tmpComCSR(val);
+
+			g_ComCSR.CHANNEL    = tmpComCSR.CHANNEL;
+			g_ComCSR.INLNGTH    = tmpComCSR.INLNGTH;
+			g_ComCSR.OUTLNGTH   = tmpComCSR.OUTLNGTH;
+			g_ComCSR.RDSTINTMSK = tmpComCSR.RDSTINTMSK;
+			g_ComCSR.TCINTMSK   = tmpComCSR.TCINTMSK;
+
+			g_ComCSR.COMERR     = 0;
+
+			if (tmpComCSR.RDSTINT) g_ComCSR.RDSTINT = 0;
+			if (tmpComCSR.TCINT)   g_ComCSR.TCINT = 0;
+
+			// be careful: run si-buffer after updating the INT flags
+			if (tmpComCSR.TSTART)
+			{
+				g_ComCSR.TSTART = 1;
+				RunSIBuffer(0, 0);
+			}
+			else if (g_ComCSR.TSTART)
+			{
+				CoreTiming::RemoveEvent(et_transfer_pending);
+			}
+
+			if (!g_ComCSR.TSTART)
+				UpdateInterrupts();
+		})
+	);
+
+	mmio->Register(base | SI_STATUS_REG,
+		MMIO::DirectRead<u32>(&g_StatusReg.Hex),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			USIStatusReg tmpStatus(val);
+
+			// clear bits ( if (tmp.bit) SISR.bit=0 )
+			if (tmpStatus.NOREP0) g_StatusReg.NOREP0 = 0;
+			if (tmpStatus.COLL0)  g_StatusReg.COLL0 = 0;
+			if (tmpStatus.OVRUN0) g_StatusReg.OVRUN0 = 0;
+			if (tmpStatus.UNRUN0) g_StatusReg.UNRUN0 = 0;
+
+			if (tmpStatus.NOREP1) g_StatusReg.NOREP1 = 0;
+			if (tmpStatus.COLL1)  g_StatusReg.COLL1 = 0;
+			if (tmpStatus.OVRUN1) g_StatusReg.OVRUN1 = 0;
+			if (tmpStatus.UNRUN1) g_StatusReg.UNRUN1 = 0;
+
+			if (tmpStatus.NOREP2) g_StatusReg.NOREP2 = 0;
+			if (tmpStatus.COLL2)  g_StatusReg.COLL2 = 0;
+			if (tmpStatus.OVRUN2) g_StatusReg.OVRUN2 = 0;
+			if (tmpStatus.UNRUN2) g_StatusReg.UNRUN2 = 0;
+
+			if (tmpStatus.NOREP3) g_StatusReg.NOREP3 = 0;
+			if (tmpStatus.COLL3)  g_StatusReg.COLL3 = 0;
+			if (tmpStatus.OVRUN3) g_StatusReg.OVRUN3 = 0;
+			if (tmpStatus.UNRUN3) g_StatusReg.UNRUN3 = 0;
+
+			// send command to devices
+			if (tmpStatus.WR)
+			{
+				g_Channel[0].m_pDevice->SendCommand(g_Channel[0].m_Out.Hex, g_Poll.EN0);
+				g_Channel[1].m_pDevice->SendCommand(g_Channel[1].m_Out.Hex, g_Poll.EN1);
+				g_Channel[2].m_pDevice->SendCommand(g_Channel[2].m_Out.Hex, g_Poll.EN2);
+				g_Channel[3].m_pDevice->SendCommand(g_Channel[3].m_Out.Hex, g_Poll.EN3);
+
+				g_StatusReg.WR = 0;
+				g_StatusReg.WRST0 = 0;
+				g_StatusReg.WRST1 = 0;
+				g_StatusReg.WRST2 = 0;
+				g_StatusReg.WRST3 = 0;
+			}
+		})
+	);
+
+	mmio->Register(base | SI_EXI_CLOCK_COUNT,
+		MMIO::DirectRead<u32>(&g_EXIClockCount.Hex),
+		MMIO::DirectWrite<u32>(&g_EXIClockCount.Hex)
+	);
+}
+
+void UpdateInterrupts()
+{
+	// check if we have to update the RDSTINT flag
+	if (g_StatusReg.RDST0 || g_StatusReg.RDST1 ||
+		g_StatusReg.RDST2 || g_StatusReg.RDST3)
+		g_ComCSR.RDSTINT = 1;
+	else
+		g_ComCSR.RDSTINT = 0;
+
+	// check if we have to generate an interrupt
+	if ((g_ComCSR.RDSTINT & g_ComCSR.RDSTINTMSK) ||
+		(g_ComCSR.TCINT   & g_ComCSR.TCINTMSK))
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_SI, true);
+	}
+	else
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_SI, false);
+	}
+}
+
+void GenerateSIInterrupt(SIInterruptType _SIInterrupt)
+{
+	switch (_SIInterrupt)
+	{
+	case INT_RDSTINT: g_ComCSR.RDSTINT = 1; break;
+	case INT_TCINT:   g_ComCSR.TCINT = 1; break;
+	}
+
+	UpdateInterrupts();
+}
+
+void RemoveDevice(int _iDeviceNumber)
+{
+	delete g_Channel[_iDeviceNumber].m_pDevice;
+	g_Channel[_iDeviceNumber].m_pDevice = nullptr;
+}
+
+void AddDevice(ISIDevice* pDevice)
+{
+	int _iDeviceNumber = pDevice->GetDeviceNumber();
+
+	//_dbg_assert_(SERIALINTERFACE, _iDeviceNumber < MAX_SI_CHANNELS);
+
+	// delete the old device
+	RemoveDevice(_iDeviceNumber);
+
+	// create the new one
+	g_Channel[_iDeviceNumber].m_pDevice = pDevice;
+}
+
+void AddDevice(const SIDevices _device, int _iDeviceNumber)
+{
+	ISIDevice *pDevice = SIDevice_Create(_device, _iDeviceNumber);
+	AddDevice(pDevice);
+}
+
+static void SetNoResponse(u32 channel)
+{
+	// raise the NO RESPONSE error
+	switch (channel)
+	{
+	case 0: g_StatusReg.NOREP0 = 1; break;
+	case 1: g_StatusReg.NOREP1 = 1; break;
+	case 2: g_StatusReg.NOREP2 = 1; break;
+	case 3: g_StatusReg.NOREP3 = 1; break;
+	}
+	g_ComCSR.COMERR = 1;
+}
+
+void ChangeDeviceCallback(u64 userdata, int cyclesLate)
+{
+	u8 channel = (u8)(userdata >> 32);
+	SIDevices device = (SIDevices)(u32)userdata;
+
+	// Skip redundant (spammed) device changes
+	if (GetDeviceType(channel) != device)
+	{
+		g_Channel[channel].m_Out.Hex = 0;
+		g_Channel[channel].m_InHi.Hex = 0;
+		g_Channel[channel].m_InLo.Hex = 0;
+
+		SetNoResponse(channel);
+
+		AddDevice(device, channel);
+	}
+}
+
+void ChangeDevice(SIDevices device, int channel)
+{
+	// Called from GUI, so we need to make it thread safe.
+	// Let the hardware see no device for .5b cycles
+	// TODO: Calling GetDeviceType here isn't threadsafe.
+	if (GetDeviceType(channel) != device)
+	{
+		CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | SIDEVICE_NONE);
+		CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | device);
+	}
+}
+
+void UpdateDevices()
+{
+	// Update channels and set the status bit if there's new data
+	g_StatusReg.RDST0 = !!g_Channel[0].m_pDevice->GetData(g_Channel[0].m_InHi.Hex, g_Channel[0].m_InLo.Hex);
+	g_StatusReg.RDST1 = !!g_Channel[1].m_pDevice->GetData(g_Channel[1].m_InHi.Hex, g_Channel[1].m_InLo.Hex);
+	g_StatusReg.RDST2 = !!g_Channel[2].m_pDevice->GetData(g_Channel[2].m_InHi.Hex, g_Channel[2].m_InLo.Hex);
+	g_StatusReg.RDST3 = !!g_Channel[3].m_pDevice->GetData(g_Channel[3].m_InHi.Hex, g_Channel[3].m_InLo.Hex);
+
+	UpdateInterrupts();
+}
+
+SIDevices GetDeviceType(int channel)
+{
+	if (channel < 0 || channel > 3)
+		return SIDEVICE_NONE;
+	else
+		return g_Channel[channel].m_pDevice->GetDeviceType();
+}
+
+void RunSIBuffer(u64 userdata, int cyclesLate)
+{
+	if (g_ComCSR.TSTART)
+	{
+		// Math inLength
+		int inLength = g_ComCSR.INLNGTH;
+		if (inLength == 0)
+			inLength = 128;
+		else
+			inLength++;
+
+		// Math outLength
+		int outLength = g_ComCSR.OUTLNGTH;
+		if (outLength == 0)
+			outLength = 128;
+		else
+			outLength++;
+
+		int numOutput = 0;
+
+		numOutput = g_Channel[g_ComCSR.CHANNEL].m_pDevice->RunBuffer(g_SIBuffer, inLength);
+
+		DEBUG_LOG(SERIALINTERFACE, "RunSIBuffer  chan: %d  inLen: %i  outLen: %i  processed: %i", g_ComCSR.CHANNEL, inLength, outLength, numOutput);
+
+		if (numOutput != 0)
+		{
+			g_ComCSR.TSTART = 0;
+			GenerateSIInterrupt(INT_TCINT);
+		}
+		else
+		{
+			CoreTiming::ScheduleEvent(g_Channel[g_ComCSR.CHANNEL].m_pDevice->TransferInterval() - cyclesLate, et_transfer_pending);
+		}
+	}
+}
+
+int GetTicksToNextSIPoll()
+{
+	// Poll for input at regular intervals (once per frame) when playing or recording a movie
+	if (Movie::IsMovieActive())
+	{
+		if (Movie::IsNetPlayRecording())
+			return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2;
+		else
+			return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
+	}
+	if (NetPlay::IsNetPlayRunning())
+		return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2;
+
+	if (!g_Poll.Y && g_Poll.X)
+		return VideoInterface::GetTicksPerLine() * g_Poll.X;
+	else if (!g_Poll.Y)
+		return SystemTimers::GetTicksPerSecond() / 60;
+
+	return std::min(VideoInterface::GetTicksPerFrame() / g_Poll.Y, VideoInterface::GetTicksPerLine() * g_Poll.X);
+}
+
+} // end of namespace SerialInterface
diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h
new file mode 100644
index 0000000000..3601fc5714
--- /dev/null
+++ b/Source/Core/Core/HW/SI.h
@@ -0,0 +1,42 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+class ISIDevice;
+enum SIDevices : int;
+namespace MMIO { class Mapping; }
+
+// SI number of channels
+enum
+{
+	MAX_SI_CHANNELS = 0x04
+};
+
+namespace SerialInterface
+{
+
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+void UpdateDevices();
+
+void RemoveDevice(int _iDeviceNumber);
+void AddDevice(const SIDevices _device, int _iDeviceNumber);
+void AddDevice(ISIDevice* pDevice);
+
+void ChangeDeviceCallback(u64 userdata, int cyclesLate);
+void ChangeDevice(SIDevices device, int channel);
+
+SIDevices GetDeviceType(int channel);
+
+int GetTicksToNextSIPoll();
+
+} // end of namespace SerialInterface
diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI_Device.cpp
new file mode 100644
index 0000000000..842ec23bf4
--- /dev/null
+++ b/Source/Core/Core/HW/SI_Device.cpp
@@ -0,0 +1,104 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/StringUtil.h"
+#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI_DeviceAMBaseboard.h"
+#include "Core/HW/SI_DeviceDanceMat.h"
+#include "Core/HW/SI_DeviceGBA.h"
+#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI_DeviceGCSteeringWheel.h"
+#include "Core/HW/SI_DeviceKeyboard.h"
+
+// --- interface ISIDevice ---
+int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength)
+{
+#ifdef _DEBUG
+	DEBUG_LOG(SERIALINTERFACE, "Send Data Device(%i) - Length(%i)   ", ISIDevice::m_iDeviceNumber, _iLength);
+
+	std::string temp;
+	int num = 0;
+
+	while (num < _iLength)
+	{
+		temp += StringFromFormat("0x%02x ", _pBuffer[num^3]);
+		num++;
+
+		if ((num % 8) == 0)
+		{
+			DEBUG_LOG(SERIALINTERFACE, "%s", temp.c_str());
+			temp.clear();
+		}
+	}
+
+	DEBUG_LOG(SERIALINTERFACE, "%s", temp.c_str());
+#endif
+	return 0;
+}
+
+int ISIDevice::TransferInterval()
+{
+	return 0;
+}
+
+// Stub class for saying nothing is attached, and not having to deal with null pointers :)
+class CSIDevice_Null : public ISIDevice
+{
+public:
+	CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {}
+	virtual ~CSIDevice_Null() {}
+
+	int RunBuffer(u8* _pBuffer, int _iLength) override {
+		reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE;
+		return 4;
+	}
+	bool GetData(u32& _Hi, u32& _Low) override {
+		_Hi = 0x80000000;
+		return true;
+	}
+	void SendCommand(u32 _Cmd, u8 _Poll) override {}
+};
+
+
+// F A C T O R Y
+ISIDevice* SIDevice_Create(const SIDevices device, const int port_number)
+{
+	switch (device)
+	{
+	case SIDEVICE_GC_CONTROLLER:
+		return new CSIDevice_GCController(device, port_number);
+		break;
+
+	case SIDEVICE_DANCEMAT:
+		return new CSIDevice_DanceMat(device, port_number);
+		break;
+
+	case SIDEVICE_GC_STEERING:
+		return new CSIDevice_GCSteeringWheel(device, port_number);
+		break;
+
+	case SIDEVICE_GC_TARUKONGA:
+		return new CSIDevice_TaruKonga(device, port_number);
+		break;
+
+	case SIDEVICE_GC_GBA:
+		return new CSIDevice_GBA(device, port_number);
+		break;
+
+	case SIDEVICE_GC_KEYBOARD:
+		return new CSIDevice_Keyboard(device, port_number);
+		break;
+
+	case SIDEVICE_AM_BASEBOARD:
+		return new CSIDevice_AMBaseboard(device, port_number);
+		break;
+
+	case SIDEVICE_NONE:
+	default:
+		return new CSIDevice_Null(device, port_number);
+		break;
+	}
+}
diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h
new file mode 100644
index 0000000000..1aa0bd125f
--- /dev/null
+++ b/Source/Core/Core/HW/SI_Device.h
@@ -0,0 +1,99 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+// Devices can reply with these
+#define SI_ERROR_NO_RESPONSE    0x0008 // Nothing is attached
+#define SI_ERROR_UNKNOWN        0x0040 // Unknown device is attached
+#define SI_ERROR_BUSY           0x0080 // Still detecting
+
+// Device types
+#define SI_TYPE_MASK            0x18000000u // ???
+#define SI_TYPE_GC              0x08000000u
+
+// GC Controller types
+#define SI_GC_NOMOTOR           0x20000000u // No rumble motor
+#define SI_GC_STANDARD          0x01000000u
+
+// SI Device IDs for emulator use
+enum TSIDevices
+{
+	SI_NONE           = SI_ERROR_NO_RESPONSE,
+	SI_N64_MIC        = 0x00010000,
+	SI_N64_KEYBOARD   = 0x00020000,
+	SI_N64_MOUSE      = 0x02000000,
+	SI_N64_CONTROLLER = 0x05000000,
+	SI_GBA            = 0x00040000,
+	SI_GC_CONTROLLER  = (SI_TYPE_GC | SI_GC_STANDARD),
+	SI_GC_KEYBOARD    = (SI_TYPE_GC | 0x00200000),
+	SI_GC_STEERING    = SI_TYPE_GC, // (shuffle2)I think the "chainsaw" is the same (Or else it's just standard)
+	SI_DANCEMAT       = (SI_TYPE_GC | SI_GC_STANDARD | 0x00000300),
+	SI_AM_BASEBOARD   = 0x10110800 // gets ORd with dipswitch state
+};
+
+// For configuration use, since some devices can have the same SI Device ID
+enum SIDevices : int
+{
+	SIDEVICE_NONE,
+	SIDEVICE_N64_MIC,
+	SIDEVICE_N64_KEYBOARD,
+	SIDEVICE_N64_MOUSE,
+	SIDEVICE_N64_CONTROLLER,
+	SIDEVICE_GC_GBA,
+	SIDEVICE_GC_CONTROLLER,
+	SIDEVICE_GC_KEYBOARD,
+	SIDEVICE_GC_STEERING,
+	SIDEVICE_DANCEMAT,
+	SIDEVICE_GC_TARUKONGA,
+	SIDEVICE_AM_BASEBOARD
+};
+
+
+class ISIDevice
+{
+protected:
+	int m_iDeviceNumber;
+	SIDevices m_deviceType;
+
+public:
+	// Constructor
+	ISIDevice(SIDevices deviceType, int _iDeviceNumber)
+		: m_iDeviceNumber(_iDeviceNumber)
+		, m_deviceType(deviceType)
+	{}
+
+	// Destructor
+	virtual ~ISIDevice() {}
+
+	// Run the SI Buffer
+	virtual int RunBuffer(u8* _pBuffer, int _iLength);
+	virtual int TransferInterval();
+
+	// Return true on new data
+	virtual bool GetData(u32& _Hi, u32& _Low) = 0;
+
+	// Send a command directly (no detour per buffer)
+	virtual void SendCommand(u32 _Cmd, u8 _Poll) = 0;
+
+	// Savestate support
+	virtual void DoState(PointerWrap& p) {}
+
+
+	int GetDeviceNumber() const
+	{
+		return m_iDeviceNumber;
+	}
+
+	SIDevices GetDeviceType() const
+	{
+		return m_deviceType;
+	}
+};
+
+ISIDevice* SIDevice_Create(const SIDevices device, const int port_number);
diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
similarity index 84%
rename from Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
rename to Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
index 83af23b7a7..835e763b3e 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp
@@ -1,14 +1,18 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <cstring>
 
-#include "SI.h"
-#include "SI_Device.h"
-#include "SI_DeviceAMBaseboard.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
 
-#include "GCPadStatus.h"
-#include "GCPad.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI_DeviceAMBaseboard.h"
+
+#include "InputCommon/GCPadStatus.h"
 
 // where to put baseboard debug
 #define AMBASEBOARDDEBUG OSREPORT
@@ -26,35 +30,35 @@ public:
 		m_last_start = 0;
 	}
 
-	void start(int node)
+	void Start(int node)
 	{
 		m_last_start = m_ptr;
 		unsigned char hdr[3] = {0xe0, (unsigned char)node, 0};
 		m_csum = 0;
-		addData(hdr, 3, 1);
+		AddData(hdr, 3, 1);
 	}
-	void addData(const void *data, size_t len)
+	void AddData(const void *data, size_t len)
 	{
-		addData((const unsigned char*)data, len);
+		AddData((const unsigned char*)data, len);
 	}
-	void addData(const char *data)
+	void AddData(const char *data)
 	{
-		addData(data, strlen(data));
+		AddData(data, strlen(data));
 	}
-	void addData(int n)
+	void AddData(int n)
 	{
 		unsigned char cs = n;
-		addData(&cs, 1);
+		AddData(&cs, 1);
 	}
 
-	void end()
+	void End()
 	{
 		int len = m_ptr - m_last_start;
 		m_msg[m_last_start + 2] = len - 2; // assuming len <0xD0
-		addData(m_csum + len - 2);
+		AddData(m_csum + len - 2);
 	}
 
-	void addData(const unsigned char *dst, size_t len, int sync = 0)
+	void AddData(const unsigned char *dst, size_t len, int sync = 0)
 	{
 		while (len--)
 		{
@@ -91,14 +95,14 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 	ISIDevice::RunBuffer(_pBuffer, _iLength);
 
 	int iPosition = 0;
-	while(iPosition < _iLength)
-	{	
+	while (iPosition < _iLength)
+	{
 		// read the command
 		EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[iPosition ^ 3]);
 		iPosition++;
 
 		// handle it
-		switch(command)
+		switch (command)
 		{
 		case CMD_RESET: // returns ID and dip switches
 			{
@@ -106,7 +110,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 				iPosition = _iLength; // break the while loop
 			}
 			break;
-		case CMD_GCAM: 
+		case CMD_GCAM:
 			{
 				int i;
 
@@ -135,7 +139,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					case 0x10:
 						{
 							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 10, %02x (READ STATUS&SWITCHES)", ptr(1));
-							SPADStatus PadStatus;
+							GCPadStatus PadStatus;
 							memset(&PadStatus, 0 ,sizeof(PadStatus));
 							Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
 							res[resp++] = 0x10;
@@ -188,7 +192,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					case 0x1f:
 						{
 							ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 1f, %02x %02x %02x %02x %02x (REGION)", ptr(1), ptr(2), ptr(3), ptr(4), ptr(5));
-							unsigned char string[] =  
+							unsigned char string[] =
 								"\x00\x00\x30\x00"
 								//"\x01\xfe\x00\x00" // JAPAN
 								"\x02\xfd\x00\x00" // USA
@@ -232,13 +236,13 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					case 0x4e:
 					case 0x4f:
 						{
-							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)", 
+							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)",
 								ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5), ptr(6), ptr(7));
 							int pptr = 2;
 							JVSIOMessage msg;
 
-							msg.start(0);
-							msg.addData(1);
+							msg.Start(0);
+							msg.AddData(1);
 
 							unsigned char jvs_io_buffer[0x80];
 							int nr_bytes = ptr(pptr + 2); // byte after e0 xx
@@ -258,49 +262,49 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 								switch (cmd)
 								{
 								case 0x10: // get ID
-									msg.addData(1);
+									msg.AddData(1);
 									{
 										char buffer[12];
 										sprintf(buffer, "JVS-node %02x", node);
 										//msg.addData(buffer);
-										msg.addData("JAMMA I/O CONTROLLER");
+										msg.AddData("JAMMA I/O CONTROLLER");
 									}
-									msg.addData(0);
+									msg.AddData(0);
 									break;
 								case 0x11: // cmd revision
-									msg.addData(1);
-									msg.addData(0x11);
+									msg.AddData(1);
+									msg.AddData(0x11);
 									break;
 								case 0x12: // jvs revision
-									msg.addData(1);
-									msg.addData(0x12);
+									msg.AddData(1);
+									msg.AddData(0x12);
 									break;
 								case 0x13: // com revision
-									msg.addData(1);
-									msg.addData(0x13);
+									msg.AddData(1);
+									msg.AddData(0x13);
 									break;
 								case 0x14: // get features
-									msg.addData(1);
-									msg.addData((void *)"\x01\x02\x0a\x00", 4);  // 2 player, 10 bit
-									msg.addData((void *)"\x02\x02\x00\x00", 4);  // 2 coin slots
-									//msg.addData((void *)"\x03\x02\x08\x00", 4); 
-									msg.addData((void *)"\x00\x00\x00\x00", 4); 
+									msg.AddData(1);
+									msg.AddData((void *)"\x01\x02\x0a\x00", 4);  // 2 player, 10 bit
+									msg.AddData((void *)"\x02\x02\x00\x00", 4);  // 2 coin slots
+									//msg.addData((void *)"\x03\x02\x08\x00", 4);
+									msg.AddData((void *)"\x00\x00\x00\x00", 4);
 									break;
 								case 0x15:
 									while (*jvs_io++) {};
-									msg.addData(1);
+									msg.AddData(1);
 									break;
 								case 0x20:
 									{
 										int nr_players = *jvs_io++;
 										int bytes_per_player = *jvs_io++; /* ??? */
 										int j;
-										msg.addData(1);
+										msg.AddData(1);
 
-										msg.addData(0); // tilt
+										msg.AddData(0); // tilt
 										for (i=0; i<nr_players; ++i)
 										{
-											SPADStatus PadStatus;
+											GCPadStatus PadStatus;
 											Pad::GetStatus(i, &PadStatus);
 											unsigned char player_data[2] = {0,0};
 											if (PadStatus.button & PAD_BUTTON_START)
@@ -329,20 +333,20 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 												player_data[1] |= 0x10;
 
 											for (j=0; j<bytes_per_player; ++j)
-												msg.addData(player_data[j&1]);
+												msg.AddData(player_data[j&1]);
 										}
 										break;
 									}
 								case 0x21: // coin
 									{
 										int slots = *jvs_io++;
-										msg.addData(1);
-										SPADStatus PadStatus;
+										msg.AddData(1);
+										GCPadStatus PadStatus;
 										Pad::GetStatus(0, &PadStatus);
 										while (slots--)
 										{
-											msg.addData(0);
-											msg.addData((PadStatus.button & PAD_BUTTON_START) ? 1 : 0);
+											msg.AddData(0);
+											msg.AddData((PadStatus.button & PAD_BUTTON_START) ? 1 : 0);
 										}
 										break;
 									}
@@ -353,14 +357,14 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 								case 0xf0:
 									if (*jvs_io++ == 0xD9)
 										ERROR_LOG(AMBASEBOARDDEBUG, "JVS RESET");
-									msg.addData(1);
+									msg.AddData(1);
 
 									d10_1 |= 1;
 									break;
 								case 0xf1:
 									node = *jvs_io++;
 									ERROR_LOG(AMBASEBOARDDEBUG, "JVS SET ADDRESS, node=%d", node);
-									msg.addData(node == 1);
+									msg.AddData(node == 1);
 									break;
 								default:
 									break;
@@ -370,7 +374,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 
 							}
 
-							msg.end();
+							msg.End();
 
 							res[resp++] = ptr(0);
 
diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
new file mode 100644
index 0000000000..4dbeeb1132
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/SI_Device.h"
+
+// triforce (GC-AM) baseboard
+class CSIDevice_AMBaseboard : public ISIDevice
+{
+private:
+	enum EBufferCommands
+	{
+		CMD_RESET = 0x00,
+		CMD_GCAM  = 0x70,
+	};
+
+public:
+	// constructor
+	CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
+
+	// run the SI Buffer
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
+
+	// return true on new data
+	virtual bool GetData(u32& _Hi, u32& _Low) override;
+
+	// send a command directly
+	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
+};
diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp
new file mode 100644
index 0000000000..9210254686
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceDanceMat.cpp
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/SI_DeviceDanceMat.h"
+#include "InputCommon/GCPadStatus.h"
+
+CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber)
+	: CSIDevice_GCController(device, _iDeviceNumber) {}
+
+int CSIDevice_DanceMat::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	// Read the command
+	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
+
+	if (command == CMD_RESET)
+	{
+		ISIDevice::RunBuffer(_pBuffer, _iLength);
+		*(u32*)&_pBuffer[0] = SI_DANCEMAT;
+	}
+	else
+	{
+		return CSIDevice_GCController::RunBuffer(_pBuffer, _iLength);
+	}
+
+	return _iLength;
+}
+
+u32 CSIDevice_DanceMat::MapPadStatus(const GCPadStatus& pad_status)
+{
+	// Map the dpad to the blue arrows, the buttons to the orange arrows
+	// Z = + button, Start = - button
+	u16 map = 0;
+	if (pad_status.button & PAD_BUTTON_UP)
+		map |= 0x1000;
+	if (pad_status.button & PAD_BUTTON_DOWN)
+		map |= 0x2;
+	if (pad_status.button & PAD_BUTTON_LEFT)
+		map |= 0x8;
+	if (pad_status.button & PAD_BUTTON_RIGHT)
+		map |= 0x4;
+	if (pad_status.button & PAD_BUTTON_Y)
+		map |= 0x200;
+	if (pad_status.button & PAD_BUTTON_A)
+		map |= 0x10;
+	if (pad_status.button & PAD_BUTTON_B)
+		map |= 0x100;
+	if (pad_status.button & PAD_BUTTON_X)
+		map |= 0x800;
+	if (pad_status.button & PAD_TRIGGER_Z)
+		map |= 0x400;
+	if (pad_status.button & PAD_BUTTON_START)
+		map |= 0x1;
+
+	return (u32)(map << 16) | 0x8080;
+}
+
+bool CSIDevice_DanceMat::GetData(u32& _Hi, u32& _Low)
+{
+	CSIDevice_GCController::GetData(_Hi, _Low);
+
+	// Identifies the dance mat
+	_Low = 0x8080ffff;
+
+	return true;
+}
diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h
new file mode 100644
index 0000000000..c015cca6e5
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h
@@ -0,0 +1,18 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/SI_DeviceGCController.h"
+
+struct GCPadStatus;
+
+class CSIDevice_DanceMat : public CSIDevice_GCController
+{
+public:
+	CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
+	virtual u32 MapPadStatus(const GCPadStatus& pad_status) override;
+	virtual bool GetData(u32& _Hi, u32& _Low) override;
+};
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI_DeviceGBA.cpp
new file mode 100644
index 0000000000..9850f2d0ed
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGBA.cpp
@@ -0,0 +1,374 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+#include <queue>
+
+#include "Common/CommonFuncs.h"
+#include "Common/Flag.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/Thread.h"
+#include "Common/Logging/Log.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI_DeviceGBA.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+
+#include "SFML/Network.hpp"
+
+static std::thread connectionThread;
+static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_socks;
+static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_clocks;
+static std::mutex cs_gba;
+static std::mutex cs_gba_clk;
+static u8 num_connected;
+
+namespace { Common::Flag server_running; }
+
+enum EJoybusCmds
+{
+	CMD_RESET  = 0xff,
+	CMD_STATUS = 0x00,
+	CMD_READ   = 0x14,
+	CMD_WRITE  = 0x15
+};
+
+const u64 BITS_PER_SECOND = 115200;
+const u64 BYTES_PER_SECOND = BITS_PER_SECOND / 8;
+
+u8 GetNumConnected()
+{
+	int num_ports_connected = num_connected;
+	if (num_ports_connected == 0)
+		num_ports_connected = 1;
+
+	return num_ports_connected;
+}
+
+// --- GameBoy Advance "Link Cable" ---
+
+int GetTransferTime(u8 cmd)
+{
+	u64 bytes_transferred = 0;
+
+	switch (cmd)
+	{
+	case CMD_RESET:
+	case CMD_STATUS:
+	{
+		bytes_transferred = 4;
+		break;
+	}
+	case CMD_READ:
+	{
+		bytes_transferred = 6;
+		break;
+	}
+	case CMD_WRITE:
+	{
+		bytes_transferred = 1;
+		break;
+	}
+	default:
+	{
+		bytes_transferred = 1;
+		break;
+	}
+	}
+	return (int)(bytes_transferred * SystemTimers::GetTicksPerSecond() / (GetNumConnected() * BYTES_PER_SECOND));
+}
+
+static void GBAConnectionWaiter()
+{
+	server_running.Set();
+
+	Common::SetCurrentThreadName("GBA Connection Waiter");
+
+	sf::TcpListener server;
+	sf::TcpListener clock_server;
+
+	// "dolphin gba"
+	if (server.listen(0xd6ba) != sf::Socket::Done)
+		return;
+
+	// "clock"
+	if (clock_server.listen(0xc10c) != sf::Socket::Done)
+		return;
+
+	server.setBlocking(false);
+	clock_server.setBlocking(false);
+
+	auto new_client = std::make_unique<sf::TcpSocket>();
+	while (server_running.IsSet())
+	{
+		if (server.accept(*new_client) == sf::Socket::Done)
+		{
+			std::lock_guard<std::mutex> lk(cs_gba);
+			waiting_socks.push(std::move(new_client));
+
+			new_client = std::make_unique<sf::TcpSocket>();
+		}
+		if (clock_server.accept(*new_client) == sf::Socket::Done)
+		{
+			std::lock_guard<std::mutex> lk(cs_gba_clk);
+			waiting_clocks.push(std::move(new_client));
+
+			new_client = std::make_unique<sf::TcpSocket>();
+		}
+
+		Common::SleepCurrentThread(1);
+	}
+}
+
+void GBAConnectionWaiter_Shutdown()
+{
+	server_running.Clear();
+	if (connectionThread.joinable())
+		connectionThread.join();
+}
+
+static bool GetAvailableSock(std::unique_ptr<sf::TcpSocket>& sock_to_fill)
+{
+	bool sock_filled = false;
+
+	std::lock_guard<std::mutex> lk(cs_gba);
+
+	if (!waiting_socks.empty())
+	{
+		sock_to_fill = std::move(waiting_socks.front());
+		waiting_socks.pop();
+		sock_filled = true;
+	}
+
+	return sock_filled;
+}
+
+static bool GetNextClock(std::unique_ptr<sf::TcpSocket>& sock_to_fill)
+{
+	bool sock_filled = false;
+
+	std::lock_guard<std::mutex> lk(cs_gba_clk);
+
+	if (!waiting_clocks.empty())
+	{
+		sock_to_fill = std::move(waiting_clocks.front());
+		waiting_clocks.pop();
+		sock_filled = true;
+	}
+
+	return sock_filled;
+}
+
+GBASockServer::GBASockServer(int _iDeviceNumber)
+{
+	if (!connectionThread.joinable())
+		connectionThread = std::thread(GBAConnectionWaiter);
+
+	cmd = 0;
+	num_connected = 0;
+	last_time_slice = 0;
+	booted = false;
+	device_number = _iDeviceNumber;
+}
+
+GBASockServer::~GBASockServer()
+{
+	Disconnect();
+}
+
+void GBASockServer::Disconnect()
+{
+	if (client)
+	{
+		num_connected--;
+		client->disconnect();
+		client = nullptr;
+	}
+	if (clock_sync)
+	{
+		clock_sync->disconnect();
+		clock_sync = nullptr;
+	}
+	last_time_slice = 0;
+	booted = false;
+}
+
+void GBASockServer::ClockSync()
+{
+	if (!clock_sync)
+		if (!GetNextClock(clock_sync))
+			return;
+
+	u32 time_slice = 0;
+
+	if (last_time_slice == 0)
+	{
+		num_connected++;
+		last_time_slice = CoreTiming::GetTicks();
+		time_slice = (u32)(SystemTimers::GetTicksPerSecond() / 60);
+	}
+	else
+	{
+		time_slice = (u32)(CoreTiming::GetTicks() - last_time_slice);
+	}
+
+	time_slice = (u32)((u64)time_slice * 16777216 / SystemTimers::GetTicksPerSecond());
+	last_time_slice = CoreTiming::GetTicks();
+	char bytes[4] = { 0, 0, 0, 0 };
+	bytes[0] = (time_slice >> 24) & 0xff;
+	bytes[1] = (time_slice >> 16) & 0xff;
+	bytes[2] = (time_slice >> 8) & 0xff;
+	bytes[3] = time_slice & 0xff;
+
+	sf::Socket::Status status = clock_sync->send(bytes, 4);
+	if (status == sf::Socket::Disconnected)
+	{
+		clock_sync->disconnect();
+		clock_sync = nullptr;
+	}
+}
+
+void GBASockServer::Send(u8* si_buffer)
+{
+	if (!client)
+		if (!GetAvailableSock(client))
+			return;
+
+	for (int i = 0; i < 5; i++)
+		send_data[i] = si_buffer[i ^ 3];
+
+	cmd = (u8)send_data[0];
+
+#ifdef _DEBUG
+	NOTICE_LOG(SERIALINTERFACE, "%01d cmd %02x [> %02x%02x%02x%02x]",
+		device_number,
+		(u8)send_data[0], (u8)send_data[1], (u8)send_data[2],
+		(u8)send_data[3], (u8)send_data[4]);
+#endif
+
+	client->setBlocking(false);
+	sf::Socket::Status status;
+	if (cmd == CMD_WRITE)
+		status = client->send(send_data, sizeof(send_data));
+	else
+		status = client->send(send_data, 1);
+
+	if (cmd != CMD_STATUS)
+		booted = true;
+
+	if (status == sf::Socket::Disconnected)
+		Disconnect();
+
+	time_cmd_sent = CoreTiming::GetTicks();
+}
+
+int GBASockServer::Receive(u8* si_buffer)
+{
+	if (!client)
+		if (!GetAvailableSock(client))
+			return 5;
+
+	size_t num_received = 0;
+	u64 transferTime = GetTransferTime((u8)send_data[0]);
+	bool block = (CoreTiming::GetTicks() - time_cmd_sent) > transferTime;
+	if (cmd == CMD_STATUS && !booted)
+		block = false;
+
+	if (block)
+	{
+		sf::SocketSelector Selector;
+		Selector.add(*client);
+		Selector.wait(sf::milliseconds(1000));
+	}
+
+	sf::Socket::Status recv_stat = client->receive(recv_data, sizeof(recv_data), num_received);
+	if (recv_stat == sf::Socket::Disconnected)
+	{
+		Disconnect();
+		return 5;
+	}
+
+	if (recv_stat == sf::Socket::NotReady)
+		num_received = 0;
+
+	if (num_received > sizeof(recv_data))
+		num_received = sizeof(recv_data);
+
+	if (num_received > 0)
+	{
+#ifdef _DEBUG
+		if ((u8)send_data[0] == 0x00 || (u8)send_data[0] == 0xff)
+		{
+			WARN_LOG(SERIALINTERFACE, "%01d                              [< %02x%02x%02x%02x%02x] (%lu)",
+				device_number,
+				(u8)recv_data[0], (u8)recv_data[1], (u8)recv_data[2],
+				(u8)recv_data[3], (u8)recv_data[4],
+				num_received);
+		}
+		else
+		{
+			ERROR_LOG(SERIALINTERFACE, "%01d                              [< %02x%02x%02x%02x%02x] (%lu)",
+				device_number,
+				(u8)recv_data[0], (u8)recv_data[1], (u8)recv_data[2],
+				(u8)recv_data[3], (u8)recv_data[4],
+				num_received);
+		}
+#endif
+
+		for (int i = 0; i < 5; i++)
+			si_buffer[i ^ 3] = recv_data[i];
+	}
+
+	 return (int)num_received;
+}
+
+CSIDevice_GBA::CSIDevice_GBA(SIDevices _device, int _iDeviceNumber)
+	: ISIDevice(_device, _iDeviceNumber)
+	, GBASockServer(_iDeviceNumber)
+{
+	waiting_for_response = false;
+}
+
+CSIDevice_GBA::~CSIDevice_GBA()
+{
+	GBASockServer::Disconnect();
+}
+
+int CSIDevice_GBA::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	if (!waiting_for_response)
+	{
+		for (int i = 0; i < 5; i++)
+			send_data[i] = _pBuffer[i ^ 3];
+
+		num_data_received = 0;
+		ClockSync();
+		Send(_pBuffer);
+		timestamp_sent = CoreTiming::GetTicks();
+		waiting_for_response = true;
+	}
+
+	if (waiting_for_response && num_data_received == 0)
+	{
+		num_data_received = Receive(_pBuffer);
+	}
+
+	if ((GetTransferTime(send_data[0])) > (int)(CoreTiming::GetTicks() - timestamp_sent))
+	{
+		return 0;
+	}
+	else
+	{
+		if (num_data_received != 0)
+			waiting_for_response = false;
+		return num_data_received;
+	}
+}
+
+int CSIDevice_GBA::TransferInterval()
+{
+	return GetTransferTime(send_data[0]);
+}
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI_DeviceGBA.h
new file mode 100644
index 0000000000..9faed5a026
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGBA.h
@@ -0,0 +1,62 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include "Core/HW/SI_Device.h"
+
+#include "SFML/Network.hpp"
+
+// GameBoy Advance "Link Cable"
+
+u8 GetNumConnected();
+int GetTransferTime(u8 cmd);
+void GBAConnectionWaiter_Shutdown();
+
+class GBASockServer
+{
+public:
+	GBASockServer(int _iDeviceNumber);
+	~GBASockServer();
+
+	void Disconnect();
+
+	void ClockSync();
+
+	void Send(u8* si_buffer);
+	int Receive(u8* si_buffer);
+
+private:
+	std::unique_ptr<sf::TcpSocket> client;
+	std::unique_ptr<sf::TcpSocket> clock_sync;
+	char send_data[5];
+	char recv_data[5];
+
+	u64 time_cmd_sent;
+	u64 last_time_slice;
+	u8 device_number;
+	u8 cmd;
+	bool booted;
+};
+
+class CSIDevice_GBA : public ISIDevice, private GBASockServer
+{
+public:
+	CSIDevice_GBA(SIDevices device, int _iDeviceNumber);
+	~CSIDevice_GBA();
+
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
+	virtual int TransferInterval() override;
+
+	virtual bool GetData(u32& _Hi, u32& _Low) override { return false; }
+	virtual void SendCommand(u32 _Cmd, u8 _Poll) override {}
+
+private:
+	u8 send_data[5];
+	int num_data_received;
+	u64 timestamp_sent;
+	bool waiting_for_response;
+};
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI_DeviceGCController.cpp
new file mode 100644
index 0000000000..ccf27baac4
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGCController.cpp
@@ -0,0 +1,327 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI_DeviceMic.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI_DeviceGCController.h"
+#if defined(__LIBUSB__) || defined (_WIN32)
+#include "Core/HW/SI_GCAdapter.h"
+#endif
+#include "Core/HW/SystemTimers.h"
+#include "InputCommon/GCPadStatus.h"
+
+// --- standard GameCube controller ---
+CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber)
+	: ISIDevice(device, _iDeviceNumber)
+	, m_TButtonComboStart(0)
+	, m_TButtonCombo(0)
+	, m_LastButtonCombo(COMBO_NONE)
+{
+	// Dunno if we need to do this, game/lib should set it?
+	m_Mode                   = 0x03;
+
+	m_Calibrated = false;
+}
+
+void CSIDevice_GCController::Calibrate()
+{
+	GCPadStatus pad_origin = GetPadStatus();
+	memset(&m_Origin, 0, sizeof(SOrigin));
+	m_Origin.uButton = pad_origin.button;
+	m_Origin.uOriginStickX = pad_origin.stickX;
+	m_Origin.uOriginStickY = pad_origin.stickY;
+	m_Origin.uSubStickStickX = pad_origin.substickX;
+	m_Origin.uSubStickStickY = pad_origin.substickY;
+	m_Origin.uTrigger_L = pad_origin.triggerLeft;
+	m_Origin.uTrigger_R = pad_origin.triggerRight;
+
+	m_Calibrated = true;
+}
+
+int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	// For debug logging only
+	ISIDevice::RunBuffer(_pBuffer, _iLength);
+
+	// Read the command
+	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
+
+	// Handle it
+	switch (command)
+	{
+	case CMD_RESET:
+	case CMD_ID:
+		*(u32*)&_pBuffer[0] = SI_GC_CONTROLLER;
+		break;
+
+	case CMD_DIRECT:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", _iLength);
+			u32 high, low;
+			GetData(high, low);
+			for (int i = 0; i < (_iLength - 1) / 2; i++)
+			{
+				_pBuffer[i + 0] = (high >> (i * 8)) & 0xff;
+				_pBuffer[i + 4] = (low >> (i * 8)) & 0xff;
+			}
+		}
+		break;
+
+	case CMD_ORIGIN:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
+
+			if (!m_Calibrated)
+				Calibrate();
+
+			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
+			for (int i = 0; i < (int)sizeof(SOrigin); i++)
+			{
+				_pBuffer[i ^ 3] = *pCalibration++;
+			}
+		}
+		break;
+
+	// Recalibrate (FiRES: i am not 100 percent sure about this)
+	case CMD_RECALIBRATE:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
+
+			if (!m_Calibrated)
+				Calibrate();
+
+			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
+			for (int i = 0; i < (int)sizeof(SOrigin); i++)
+			{
+				_pBuffer[i ^ 3] = *pCalibration++;
+			}
+		}
+		break;
+
+	// DEFAULT
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
+			PanicAlert("SI: Unknown command (0x%x)", command);
+		}
+		break;
+	}
+
+	return _iLength;
+}
+
+GCPadStatus CSIDevice_GCController::GetPadStatus()
+{
+	GCPadStatus PadStatus;
+	memset(&PadStatus, 0, sizeof(PadStatus));
+
+	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
+
+#if defined(__LIBUSB__) || defined (_WIN32)
+	SI_GCAdapter::Input(ISIDevice::m_iDeviceNumber, &PadStatus);
+#endif
+
+	Movie::CallGCInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
+
+	Movie::SetPolledDevice();
+	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, &PadStatus))
+	{
+	}
+	else if (Movie::IsPlayingInput())
+	{
+		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
+		Movie::InputUpdate();
+	}
+	else if (Movie::IsRecordingInput())
+	{
+		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
+		Movie::InputUpdate();
+	}
+	else
+	{
+		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
+	}
+
+	return PadStatus;
+}
+
+// GetData
+
+// Return true on new data (max 7 Bytes and 6 bits ;)
+// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
+//  |\_ ERR_LATCH (error latched - check SISR)
+//  |_ ERR_STATUS (error on last GetData or SendCmd?)
+bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
+{
+	GCPadStatus PadStatus = GetPadStatus();
+
+	_Hi = MapPadStatus(PadStatus);
+
+	// Low bits are packed differently per mode
+	if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7)
+	{
+		_Low  = (u8)(PadStatus.analogB >> 4);                   // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);       // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8);  // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12);  // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.substickY) << 16);         // All 8 bits
+		_Low |= (u32)((u8)(PadStatus.substickX) << 24);         // All 8 bits
+	}
+	else if (m_Mode == 1)
+	{
+		_Low  = (u8)(PadStatus.analogB >> 4);                   // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);       // Top 4 bits
+		_Low |= (u32)((u8)PadStatus.triggerRight << 8);         // All 8 bits
+		_Low |= (u32)((u8)PadStatus.triggerLeft << 16);         // All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickY << 24);           // Top 4 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 28);           // Top 4 bits
+	}
+	else if (m_Mode == 2)
+	{
+		_Low  = (u8)(PadStatus.analogB);                        // All 8 bits
+		_Low |= (u32)((u8)(PadStatus.analogA) << 8);            // All 8 bits
+		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16); // Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20);  // Top 4 bits
+		_Low |= (u32)((u8)PadStatus.substickY << 24);           // Top 4 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 28);           // Top 4 bits
+	}
+	else if (m_Mode == 3)
+	{
+		// Analog A/B are always 0
+		_Low  = (u8)PadStatus.triggerRight;                     // All 8 bits
+		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);          // All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickY << 16);           // All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 24);           // All 8 bits
+	}
+	else if (m_Mode == 4)
+	{
+		_Low  = (u8)(PadStatus.analogB);                        // All 8 bits
+		_Low |= (u32)((u8)(PadStatus.analogA) << 8);            // All 8 bits
+		// triggerLeft/Right are always 0
+		_Low |= (u32)((u8)PadStatus.substickY << 16);           // All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 24);           // All 8 bits
+	}
+
+	HandleButtonCombos(PadStatus);
+	return true;
+}
+
+u32 CSIDevice_GCController::MapPadStatus(const GCPadStatus& pad_status)
+{
+	// Thankfully changing mode does not change the high bits ;)
+	u32 _Hi = 0;
+	_Hi  = (u32)((u8)pad_status.stickY);
+	_Hi |= (u32)((u8)pad_status.stickX << 8);
+	_Hi |= (u32)((u16)(pad_status.button | PAD_USE_ORIGIN) << 16);
+	return _Hi;
+}
+
+void CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status)
+{
+	// Keep track of the special button combos (embedded in controller hardware... :( )
+	EButtonCombo tempCombo;
+	if ((pad_status.button & 0xff00) == (PAD_BUTTON_Y|PAD_BUTTON_X|PAD_BUTTON_START))
+		tempCombo = COMBO_ORIGIN;
+	else if ((pad_status.button & 0xff00) == (PAD_BUTTON_B|PAD_BUTTON_X|PAD_BUTTON_START))
+		tempCombo = COMBO_RESET;
+	else
+		tempCombo = COMBO_NONE;
+	if (tempCombo != m_LastButtonCombo)
+	{
+		m_LastButtonCombo = tempCombo;
+		if (m_LastButtonCombo != COMBO_NONE)
+			m_TButtonComboStart = CoreTiming::GetTicks();
+	}
+	if (m_LastButtonCombo != COMBO_NONE)
+	{
+		m_TButtonCombo = CoreTiming::GetTicks();
+		if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3)
+		{
+			if (m_LastButtonCombo == COMBO_RESET)
+				ProcessorInterface::ResetButton_Tap();
+			else if (m_LastButtonCombo == COMBO_ORIGIN)
+			{
+				m_Origin.uOriginStickX   = pad_status.stickX;
+				m_Origin.uOriginStickY   = pad_status.stickY;
+				m_Origin.uSubStickStickX = pad_status.substickX;
+				m_Origin.uSubStickStickY = pad_status.substickY;
+				m_Origin.uTrigger_L      = pad_status.triggerLeft;
+				m_Origin.uTrigger_R      = pad_status.triggerRight;
+			}
+			m_LastButtonCombo = COMBO_NONE;
+		}
+	}
+}
+
+// SendCommand
+void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
+{
+	UCommand command(_Cmd);
+
+	switch (command.Command)
+	{
+	// Costis sent it in some demos :)
+	case 0x00:
+		break;
+
+	case CMD_WRITE:
+		{
+			unsigned int uType = command.Parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
+			unsigned int uStrength = command.Parameter2;
+
+			// get the correct pad number that should rumble locally when using netplay
+			const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
+
+#if defined(__LIBUSB__) || defined (_WIN32)
+			if (numPAD < 4)
+			{
+				if (uType == 1 && uStrength > 2)
+					SI_GCAdapter::Output(numPAD, 1);
+				else
+					SI_GCAdapter::Output(numPAD, 0);
+			}
+#endif
+			if (numPAD < 4)
+			{
+				if (uType == 1 && uStrength > 2)
+					Pad::Rumble(numPAD, 1.0);
+				else
+					Pad::Rumble(numPAD, 0.0);
+			}
+
+			if (!_Poll)
+			{
+				m_Mode = command.Parameter2;
+				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
+			}
+		}
+		break;
+
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
+			PanicAlert("SI: Unknown direct command");
+		}
+		break;
+	}
+}
+
+// Savestate support
+void CSIDevice_GCController::DoState(PointerWrap& p)
+{
+	p.Do(m_Calibrated);
+	p.Do(m_Origin);
+	p.Do(m_Mode);
+	p.Do(m_TButtonComboStart);
+	p.Do(m_TButtonCombo);
+	p.Do(m_LastButtonCombo);
+}
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI_DeviceGCController.h
new file mode 100644
index 0000000000..f738ad16fd
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGCController.h
@@ -0,0 +1,124 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/SI_Device.h"
+#include "InputCommon/GCPadStatus.h"
+
+class CSIDevice_GCController : public ISIDevice
+{
+protected:
+
+	// Commands
+	enum EBufferCommands
+	{
+		CMD_RESET       = 0x00,
+		CMD_DIRECT      = 0x40,
+		CMD_ORIGIN      = 0x41,
+		CMD_RECALIBRATE = 0x42,
+		CMD_ID          = 0xff,
+	};
+
+	struct SOrigin
+	{
+		u16 uButton;
+		u8 uOriginStickX;
+		u8 uOriginStickY;
+		u8 uSubStickStickX;
+		u8 uSubStickStickY;
+		u8 uTrigger_L;
+		u8 uTrigger_R;
+		u8 unk_4;
+		u8 unk_5;
+		u8 unk_6;
+		u8 unk_7;
+	};
+
+	enum EDirectCommands
+	{
+		CMD_WRITE = 0x40
+	};
+
+	union UCommand
+	{
+		u32 Hex;
+		struct
+		{
+			u32 Parameter1 : 8;
+			u32 Parameter2 : 8;
+			u32 Command    : 8;
+			u32            : 8;
+		};
+		UCommand()            {Hex = 0;}
+		UCommand(u32 _iValue) {Hex = _iValue;}
+	};
+
+	enum EButtonCombo
+	{
+		COMBO_NONE = 0,
+		COMBO_ORIGIN,
+		COMBO_RESET
+	};
+
+	// struct to compare input against
+	// Set on connection and (standard pad only) on button combo
+	SOrigin m_Origin;
+
+	bool m_Calibrated;
+
+	// PADAnalogMode
+	u8 m_Mode;
+
+	// Timer to track special button combos:
+	// y, X, start for 3 seconds updates origin with current status
+	//   Technically, the above is only on standard pad, wavebird does not support it for example
+	// b, x, start for 3 seconds triggers reset (PI reset button interrupt)
+	u64 m_TButtonComboStart, m_TButtonCombo;
+	// Type of button combo from the last/current poll
+	EButtonCombo m_LastButtonCombo;
+
+public:
+
+	// Constructor
+	CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
+
+	// Run the SI Buffer
+	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
+
+	// Send and Receive pad input from network
+	static bool NetPlay_GetInput(u8 numPAD, GCPadStatus* status);
+	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
+
+	// Return true on new data
+	virtual bool GetData(u32& _Hi, u32& _Low) override;
+
+	virtual GCPadStatus GetPadStatus();
+	virtual u32 MapPadStatus(const GCPadStatus& pad_status);
+	virtual void HandleButtonCombos(const GCPadStatus& pad_status);
+
+	// Send a command directly
+	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
+
+	// Savestate support
+	virtual void DoState(PointerWrap& p) override;
+
+private:
+	void Calibrate();
+};
+
+
+// "TaruKonga", the DK Bongo controller
+class CSIDevice_TaruKonga : public CSIDevice_GCController
+{
+public:
+	CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { }
+
+	virtual bool GetData(u32& _Hi, u32& _Low) override
+	{
+		CSIDevice_GCController::GetData(_Hi, _Low);
+		_Hi &= ~PAD_USE_ORIGIN << 16;
+		return true;
+	}
+};
diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp
new file mode 100644
index 0000000000..a97db6ac3d
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp
@@ -0,0 +1,109 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
+
+#include "Core/HW/GCPad.h"
+#include "Core/HW/SI_DeviceGCSteeringWheel.h"
+
+CSIDevice_GCSteeringWheel::CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber)
+	: CSIDevice_GCController(device, _iDeviceNumber)
+{}
+
+int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	// For debug logging only
+	ISIDevice::RunBuffer(_pBuffer, _iLength);
+
+	// Read the command
+	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
+
+	// Handle it
+	switch (command)
+	{
+	case CMD_RESET:
+	case CMD_ID:
+		*(u32*)&_pBuffer[0] = SI_GC_STEERING;
+		break;
+
+	// DEFAULT
+	default:
+	{
+		return CSIDevice_GCController::RunBuffer(_pBuffer, _iLength);
+	}
+	break;
+	}
+
+	return _iLength;
+}
+
+bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low)
+{
+	if (m_Mode == 6)
+	{
+		GCPadStatus PadStatus = GetPadStatus();
+
+		_Hi = (u32)((u8)PadStatus.stickX); // Steering
+		_Hi |= 0x800; // Pedal connected flag
+		_Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16);
+
+		_Low = (u8)PadStatus.triggerRight;                     // All 8 bits
+		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);          // All 8 bits
+
+		// The GC Steering Wheel appears to have combined pedals
+		// (both the Accelerate and Brake pedals are mapped to a single axis)
+		// We use the stickY axis for the pedals.
+		if (PadStatus.stickY < 128)
+			_Low |= (u32)((u8)(255 - ((PadStatus.stickY & 0x7f) * 2)) << 16); // All 8 bits (Brake)
+		if (PadStatus.stickY >= 128)
+			_Low |= (u32)((u8)((PadStatus.stickY & 0x7f) * 2) << 24); // All 8 bits (Accelerate)
+
+		HandleButtonCombos(PadStatus);
+	}
+	else
+	{
+		return CSIDevice_GCController::GetData(_Hi, _Low);
+	}
+
+	return true;
+}
+
+void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
+{
+	UCommand command(_Cmd);
+
+	if (command.Command == CMD_FORCE)
+	{
+		unsigned int uStrength = command.Parameter1; // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong
+		unsigned int uType = command.Parameter2;  // 06 = motor on, 04 = motor off
+
+		// get the correct pad number that should rumble locally when using netplay
+		const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
+
+		if (numPAD < 4)
+		{
+			if (uType == 0x06)
+			{
+				// map 0..255 to -1.0..1.0
+				ControlState strength = uStrength / 127.5 - 1;
+				Pad::Rumble(numPAD, strength);
+			}
+			else
+			{
+				Pad::Rumble(numPAD, 0);
+			}
+		}
+
+		if (!_Poll)
+		{
+			m_Mode = command.Parameter2;
+			INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
+		}
+	}
+	else
+	{
+		return CSIDevice_GCController::SendCommand(_Cmd, _Poll);
+	}
+}
diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
new file mode 100644
index 0000000000..b468466e2c
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
@@ -0,0 +1,32 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/SI_DeviceGCController.h"
+
+class CSIDevice_GCSteeringWheel : public CSIDevice_GCController
+{
+private:
+	// Commands
+	enum EBufferCommands
+	{
+		CMD_RESET       = 0x00,
+		CMD_ORIGIN      = 0x41,
+		CMD_RECALIBRATE = 0x42,
+		CMD_ID          = 0xff,
+	};
+
+	enum EDirectCommands
+	{
+		CMD_FORCE = 0x30,
+		CMD_WRITE = 0x40
+	};
+
+public:
+	CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
+	virtual int RunBuffer(u8* _pBuffer, int _iLength);
+	virtual bool GetData(u32& _Hi, u32& _Low);
+	virtual void SendCommand(u32 _Cmd, u8 _Poll);
+};
diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp
new file mode 100644
index 0000000000..94447bfce1
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceKeyboard.cpp
@@ -0,0 +1,192 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/SI_DeviceKeyboard.h"
+#include "InputCommon/KeyboardStatus.h"
+
+// --- GameCube keyboard ---
+CSIDevice_Keyboard::CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber)
+	: ISIDevice(device, _iDeviceNumber)
+{}
+
+int CSIDevice_Keyboard::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	// For debug logging only
+	ISIDevice::RunBuffer(_pBuffer, _iLength);
+
+	// Read the command
+	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
+
+	// Handle it
+	switch (command)
+	{
+	case CMD_RESET:
+	case CMD_ID:
+		*(u32*)&_pBuffer[0] = SI_GC_KEYBOARD;
+		break;
+
+	case CMD_DIRECT:
+		{
+			INFO_LOG(SERIALINTERFACE, "Keyboard - Direct (Length: %d)", _iLength);
+			u32 high, low;
+			GetData(high, low);
+			for (int i = 0; i < (_iLength - 1) / 2; i++)
+			{
+				_pBuffer[i + 0] = (high >> (i * 8)) & 0xff;
+				_pBuffer[i + 4] = (low >> (i * 8)) & 0xff;
+			}
+		}
+		break;
+
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
+		}
+		break;
+	}
+
+	return _iLength;
+}
+
+KeyboardStatus CSIDevice_Keyboard::GetKeyboardStatus()
+{
+	KeyboardStatus KeyStatus = {};
+	Keyboard::GetStatus(ISIDevice::m_iDeviceNumber, &KeyStatus);
+	return KeyStatus;
+}
+
+bool CSIDevice_Keyboard::GetData(u32& _Hi, u32& _Low)
+{
+	KeyboardStatus KeyStatus = GetKeyboardStatus();
+	u8 key[3] = { 0x00, 0x00, 0x00 };
+	MapKeys(KeyStatus, key);
+	u8 checksum = key[0] ^ key[1] ^ key[2] ^ m_Counter;
+
+	_Hi = m_Counter << 24;
+	_Low = key[0] << 24 | key[1] << 16 | key[2] << 8 | checksum;
+
+	return true;
+}
+
+void CSIDevice_Keyboard::SendCommand(u32 _Cmd, u8 _Poll)
+{
+	UCommand command(_Cmd);
+
+	switch (command.Command)
+	{
+	case 0x00:
+		break;
+
+	case CMD_POLL:
+		{
+			m_Counter++;
+			m_Counter &= 15;
+		}
+		break;
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
+		}
+		break;
+	}
+}
+
+void CSIDevice_Keyboard::DoState(PointerWrap& p)
+{
+	p.Do(m_Counter);
+}
+
+void CSIDevice_Keyboard::MapKeys(KeyboardStatus& KeyStatus, u8* key)
+{
+	u8 keys_held = 0;
+	const u8 MAX_KEYS_HELD = 3;
+
+	if (KeyStatus.key0x & KEYMASK_HOME) { key[keys_held++] = KEY_HOME; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_END) { key[keys_held++] = KEY_END; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_PGUP) { key[keys_held++] = KEY_PGUP; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_PGDN) { key[keys_held++] = KEY_PGDN; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_SCROLLLOCK) { key[keys_held++] = KEY_SCROLLLOCK; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_A) { key[keys_held++] = KEY_A; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_B) { key[keys_held++] = KEY_B; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_C) { key[keys_held++] = KEY_C; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_D) { key[keys_held++] = KEY_D; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_E) { key[keys_held++] = KEY_E; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_F) { key[keys_held++] = KEY_F; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_G) { key[keys_held++] = KEY_G; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_H) { key[keys_held++] = KEY_H; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_I) { key[keys_held++] = KEY_I; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_J) { key[keys_held++] = KEY_J; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key0x & KEYMASK_K) { key[keys_held++] = KEY_K; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_L) { key[keys_held++] = KEY_L; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_M) { key[keys_held++] = KEY_M; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_N) { key[keys_held++] = KEY_N; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_O) { key[keys_held++] = KEY_O; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_P) { key[keys_held++] = KEY_P; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_Q) { key[keys_held++] = KEY_Q; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_R) { key[keys_held++] = KEY_R; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_S) { key[keys_held++] = KEY_S; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_T) { key[keys_held++] = KEY_T; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_U) { key[keys_held++] = KEY_U; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_V) { key[keys_held++] = KEY_V; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_W) { key[keys_held++] = KEY_W; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_X) { key[keys_held++] = KEY_X; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_Y) { key[keys_held++] = KEY_Y; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_Z) { key[keys_held++] = KEY_Z; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key1x & KEYMASK_1) { key[keys_held++] = KEY_1; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_2) { key[keys_held++] = KEY_2; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_3) { key[keys_held++] = KEY_3; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_4) { key[keys_held++] = KEY_4; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_5) { key[keys_held++] = KEY_5; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_6) { key[keys_held++] = KEY_6; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_7) { key[keys_held++] = KEY_7; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_8) { key[keys_held++] = KEY_8; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_9) { key[keys_held++] = KEY_9; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_0) { key[keys_held++] = KEY_0; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_MINUS) { key[keys_held++] = KEY_MINUS; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_PLUS) { key[keys_held++] = KEY_PLUS; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_PRINTSCR) { key[keys_held++] = KEY_PRINTSCR; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_BRACE_OPEN) { key[keys_held++] = KEY_BRACE_OPEN; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_BRACE_CLOSE) { key[keys_held++] = KEY_BRACE_CLOSE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_COLON) { key[keys_held++] = KEY_COLON; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key2x & KEYMASK_QUOTE) { key[keys_held++] = KEY_QUOTE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_HASH) { key[keys_held++] = KEY_HASH; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_COMMA) { key[keys_held++] = KEY_COMMA; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_PERIOD) { key[keys_held++] = KEY_PERIOD; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_QUESTIONMARK) { key[keys_held++] = KEY_QUESTIONMARK; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_INTERNATIONAL1) { key[keys_held++] = KEY_INTERNATIONAL1; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F1) { key[keys_held++] = KEY_F1; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F2) { key[keys_held++] = KEY_F2; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F3) { key[keys_held++] = KEY_F3; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F4) { key[keys_held++] = KEY_F4; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F5) { key[keys_held++] = KEY_F5; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F6) { key[keys_held++] = KEY_F6; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F7) { key[keys_held++] = KEY_F7; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F8) { key[keys_held++] = KEY_F8; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F9) { key[keys_held++] = KEY_F9; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F10) { key[keys_held++] = KEY_F10; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key3x & KEYMASK_F11) { key[keys_held++] = KEY_F11; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_F12) { key[keys_held++] = KEY_F12; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_ESC) { key[keys_held++] = KEY_ESC; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_INSERT) { key[keys_held++] = KEY_INSERT; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_DELETE) { key[keys_held++] = KEY_DELETE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_TILDE) { key[keys_held++] = KEY_TILDE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_BACKSPACE) { key[keys_held++] = KEY_BACKSPACE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_TAB) { key[keys_held++] = KEY_TAB; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_CAPSLOCK) { key[keys_held++] = KEY_CAPSLOCK; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_LEFTSHIFT) { key[keys_held++] = KEY_LEFTSHIFT; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_RIGHTSHIFT) { key[keys_held++] = KEY_RIGHTSHIFT; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_LEFTCONTROL) { key[keys_held++] = KEY_LEFTCONTROL; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_RIGHTALT) { key[keys_held++] = KEY_RIGHTALT; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_LEFTWINDOWS) { key[keys_held++] = KEY_LEFTWINDOWS; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_SPACE) { key[keys_held++] = KEY_SPACE; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_RIGHTWINDOWS) { key[keys_held++] = KEY_RIGHTWINDOWS; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key4x & KEYMASK_MENU) { key[keys_held++] = KEY_MENU; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key5x & KEYMASK_LEFTARROW) { key[keys_held++] = KEY_LEFTARROW; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key5x & KEYMASK_DOWNARROW) { key[keys_held++] = KEY_DOWNARROW; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key5x & KEYMASK_UPARROW) { key[keys_held++] = KEY_UPARROW; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key5x & KEYMASK_RIGHTARROW) { key[keys_held++] = KEY_RIGHTARROW; if (keys_held >= MAX_KEYS_HELD) return; }
+	if (KeyStatus.key5x & KEYMASK_ENTER) { key[keys_held++] = KEY_ENTER; if (keys_held >= MAX_KEYS_HELD) return; }
+}
diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI_DeviceKeyboard.h
new file mode 100644
index 0000000000..79d8f6252c
--- /dev/null
+++ b/Source/Core/Core/HW/SI_DeviceKeyboard.h
@@ -0,0 +1,69 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/SI_Device.h"
+
+class PointerWrap;
+struct KeyboardStatus;
+
+class CSIDevice_Keyboard : public ISIDevice
+{
+protected:
+
+	// Commands
+	enum EBufferCommands
+	{
+		CMD_RESET       = 0x00,
+		CMD_DIRECT      = 0x54,
+		CMD_ID          = 0xff,
+	};
+
+	enum EDirectCommands
+	{
+		CMD_WRITE = 0x40,
+		CMD_POLL  = 0x54
+	};
+
+	union UCommand
+	{
+		u32 Hex;
+		struct
+		{
+			u32 Parameter1 : 8;
+			u32 Parameter2 : 8;
+			u32 Command    : 8;
+			u32            : 8;
+		};
+		UCommand()            {Hex = 0;}
+		UCommand(u32 _iValue) {Hex = _iValue;}
+	};
+
+	// PADAnalogMode
+	u8 m_Mode;
+
+	// Internal counter synchonizing GC and keyboard
+	u8 m_Counter;
+
+public:
+
+	// Constructor
+	CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber);
+
+	// Run the SI Buffer
+	int RunBuffer(u8* _pBuffer, int _iLength) override;
+
+	// Return true on new data
+	bool GetData(u32& _Hi, u32& _Low) override;
+
+	KeyboardStatus GetKeyboardStatus();
+	void MapKeys(KeyboardStatus& KeyStatus, u8* key);
+
+	// Send a command directly
+	void SendCommand(u32 _Cmd, u8 _Poll) override;
+
+	// Savestate support
+	void DoState(PointerWrap& p) override;
+};
diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp
new file mode 100644
index 0000000000..7115dc3e40
--- /dev/null
+++ b/Source/Core/Core/HW/SI_GCAdapter.cpp
@@ -0,0 +1,431 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <libusb.h>
+#include <mutex>
+
+#include "Common/Flag.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SI_GCAdapter.h"
+#include "Core/HW/SystemTimers.h"
+#include "InputCommon/GCPadStatus.h"
+
+namespace SI_GCAdapter
+{
+enum ControllerTypes
+{
+	CONTROLLER_NONE = 0,
+	CONTROLLER_WIRED = 1,
+	CONTROLLER_WIRELESS = 2
+};
+
+static bool CheckDeviceAccess(libusb_device* device);
+static void AddGCAdapter(libusb_device* device);
+
+static bool s_detected = false;
+static libusb_device_handle* s_handle = nullptr;
+static u8 s_controller_type[MAX_SI_CHANNELS] = { CONTROLLER_NONE, CONTROLLER_NONE, CONTROLLER_NONE, CONTROLLER_NONE };
+static u8 s_controller_rumble[4];
+
+static std::mutex s_mutex;
+static u8 s_controller_payload[37];
+static u8 s_controller_payload_swap[37];
+
+static int s_controller_payload_size = 0;
+
+static std::thread s_adapter_thread;
+static Common::Flag s_adapter_thread_running;
+
+static std::thread s_adapter_detect_thread;
+static Common::Flag s_adapter_detect_thread_running;
+
+static std::function<void(void)> s_detect_callback;
+
+static bool s_libusb_driver_not_supported = false;
+static libusb_context* s_libusb_context = nullptr;
+static bool s_libusb_hotplug_enabled = false;
+static libusb_hotplug_callback_handle s_hotplug_handle;
+
+static u8 s_endpoint_in = 0;
+static u8 s_endpoint_out = 0;
+
+static u64 s_last_init = 0;
+
+static void Read()
+{
+	while (s_adapter_thread_running.IsSet())
+	{
+		libusb_interrupt_transfer(s_handle, s_endpoint_in, s_controller_payload_swap, sizeof(s_controller_payload_swap), &s_controller_payload_size, 16);
+
+		{
+		std::lock_guard<std::mutex> lk(s_mutex);
+		std::swap(s_controller_payload_swap, s_controller_payload);
+		}
+
+		Common::YieldCPU();
+	}
+}
+
+static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotplug_event event, void* user_data)
+{
+	if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED)
+	{
+		if (s_handle == nullptr && CheckDeviceAccess(dev))
+			AddGCAdapter(dev);
+	}
+	else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT)
+	{
+		if (s_handle != nullptr && libusb_get_device(s_handle) == dev)
+			Reset();
+	}
+	return 0;
+}
+
+static void ScanThreadFunc()
+{
+	Common::SetCurrentThreadName("GC Adapter Scanning Thread");
+	NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started");
+
+	s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0;
+	if (s_libusb_hotplug_enabled)
+	{
+		if (libusb_hotplug_register_callback(s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback, NULL, &s_hotplug_handle) != LIBUSB_SUCCESS)
+			s_libusb_hotplug_enabled = false;
+		if (s_libusb_hotplug_enabled)
+			NOTICE_LOG(SERIALINTERFACE, "Using libUSB hotplug detection");
+	}
+
+	while (s_adapter_detect_thread_running.IsSet())
+	{
+		if (s_libusb_hotplug_enabled)
+		{
+			static timeval tv = {0, 500000};
+			libusb_handle_events_timeout(s_libusb_context, &tv);
+		}
+		else
+		{
+			if (s_handle == nullptr)
+			{
+				Setup();
+				if (s_detected && s_detect_callback != nullptr)
+					s_detect_callback();
+			}
+			Common::SleepCurrentThread(500);
+		}
+	}
+	NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread stopped");
+}
+
+void SetAdapterCallback(std::function<void(void)> func)
+{
+	s_detect_callback = func;
+}
+
+void Init()
+{
+	if (s_handle != nullptr)
+		return;
+
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		if ((CoreTiming::GetTicks() - s_last_init) < SystemTimers::GetTicksPerSecond())
+			return;
+
+		s_last_init = CoreTiming::GetTicks();
+	}
+
+	s_libusb_driver_not_supported = false;
+
+	int ret = libusb_init(&s_libusb_context);
+
+	if (ret)
+	{
+		ERROR_LOG(SERIALINTERFACE, "libusb_init failed with error: %d", ret);
+		Shutdown();
+	}
+	else
+	{
+		StartScanThread();
+	}
+}
+
+void StartScanThread()
+{
+	s_adapter_detect_thread_running.Set(true);
+	s_adapter_detect_thread = std::thread(ScanThreadFunc);
+}
+
+void StopScanThread()
+{
+	if (s_adapter_detect_thread_running.TestAndClear())
+	{
+		s_adapter_detect_thread.join();
+	}
+}
+
+void Setup()
+{
+	libusb_device** list;
+	ssize_t cnt = libusb_get_device_list(s_libusb_context, &list);
+
+	for (int i = 0; i < MAX_SI_CHANNELS; i++)
+	{
+		s_controller_type[i] = CONTROLLER_NONE;
+		s_controller_rumble[i] = 0;
+	}
+
+	for (int d = 0; d < cnt; d++)
+	{
+		libusb_device* device = list[d];
+		if (CheckDeviceAccess(device))
+			AddGCAdapter(device);
+	}
+
+	libusb_free_device_list(list, 1);
+}
+
+static bool CheckDeviceAccess(libusb_device* device)
+{
+	int ret;
+	libusb_device_descriptor desc;
+	int dRet = libusb_get_device_descriptor(device, &desc);
+	if (dRet)
+	{
+		// could not acquire the descriptor, no point in trying to use it.
+		ERROR_LOG(SERIALINTERFACE, "libusb_get_device_descriptor failed with error: %d", dRet);
+		return false;
+	}
+
+	if (desc.idVendor == 0x057e && desc.idProduct == 0x0337)
+	{
+		NOTICE_LOG(SERIALINTERFACE, "Found GC Adapter with Vendor: %X Product: %X Devnum: %d", desc.idVendor, desc.idProduct, 1);
+
+		u8 bus = libusb_get_bus_number(device);
+		u8 port = libusb_get_device_address(device);
+		ret = libusb_open(device, &s_handle);
+		if (ret)
+		{
+			if (ret == LIBUSB_ERROR_ACCESS)
+			{
+				if (dRet)
+				{
+					ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID ????:???? (couldn't get id).",
+						bus,
+						port
+						);
+				}
+				else
+				{
+					ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device %03d: ID %04X:%04X.",
+						bus,
+						port,
+						desc.idVendor,
+						desc.idProduct
+						);
+				}
+			}
+			else
+			{
+				ERROR_LOG(SERIALINTERFACE, "libusb_open failed to open device with error = %d", ret);
+				if (ret == LIBUSB_ERROR_NOT_SUPPORTED)
+					s_libusb_driver_not_supported = true;
+			}
+		}
+		else if ((ret = libusb_kernel_driver_active(s_handle, 0)) == 1)
+		{
+			if ((ret = libusb_detach_kernel_driver(s_handle, 0)) && ret != LIBUSB_ERROR_NOT_SUPPORTED)
+			{
+				ERROR_LOG(SERIALINTERFACE, "libusb_detach_kernel_driver failed with error: %d", ret);
+			}
+		}
+		// this split is needed so that we don't avoid claiming the interface when
+		// detaching the kernel driver is successful
+		if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED)
+		{
+			return false;
+		}
+		else if ((ret = libusb_claim_interface(s_handle, 0)))
+		{
+			ERROR_LOG(SERIALINTERFACE, "libusb_claim_interface failed with error: %d", ret);
+		}
+		else
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+static void AddGCAdapter(libusb_device* device)
+{
+	libusb_config_descriptor *config = nullptr;
+	libusb_get_config_descriptor(device, 0, &config);
+	for (u8 ic = 0; ic < config->bNumInterfaces; ic++)
+	{
+		const libusb_interface *interfaceContainer = &config->interface[ic];
+		for (int i = 0; i < interfaceContainer->num_altsetting; i++)
+		{
+			const libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i];
+			for (u8 e = 0; e < interface->bNumEndpoints; e++)
+			{
+				const libusb_endpoint_descriptor *endpoint = &interface->endpoint[e];
+				if (endpoint->bEndpointAddress & LIBUSB_ENDPOINT_IN)
+					s_endpoint_in = endpoint->bEndpointAddress;
+				else
+					s_endpoint_out = endpoint->bEndpointAddress;
+			}
+		}
+	}
+
+	int tmp = 0;
+	unsigned char payload = 0x13;
+	libusb_interrupt_transfer(s_handle, s_endpoint_out, &payload, sizeof(payload), &tmp, 16);
+
+	s_adapter_thread_running.Set(true);
+	s_adapter_thread = std::thread(Read);
+
+	s_detected = true;
+	if (s_detect_callback != nullptr)
+		s_detect_callback();
+}
+
+void Shutdown()
+{
+	StopScanThread();
+	if (s_libusb_hotplug_enabled)
+		libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle);
+	Reset();
+
+	if (s_libusb_context)
+	{
+		libusb_exit(s_libusb_context);
+		s_libusb_context = nullptr;
+	}
+
+	s_libusb_driver_not_supported = false;
+}
+
+void Reset()
+{
+	if (!s_detected)
+		return;
+
+	if (s_adapter_thread_running.TestAndClear())
+	{
+		s_adapter_thread.join();
+	}
+
+	for (int i = 0; i < MAX_SI_CHANNELS; i++)
+		s_controller_type[i] = CONTROLLER_NONE;
+
+	s_detected = false;
+
+	if (s_handle)
+	{
+		libusb_release_interface(s_handle, 0);
+		libusb_close(s_handle);
+		s_handle = nullptr;
+	}
+	if (s_detect_callback != nullptr)
+		s_detect_callback();
+	NOTICE_LOG(SERIALINTERFACE, "GC Adapter detached");
+}
+
+void Input(int chan, GCPadStatus* pad)
+{
+	if (!SConfig::GetInstance().m_GameCubeAdapter)
+		return;
+
+	if (s_handle == nullptr || !s_detected)
+		return;
+
+	u8 controller_payload_copy[37];
+
+	{
+	std::lock_guard<std::mutex> lk(s_mutex);
+	std::copy(std::begin(s_controller_payload), std::end(s_controller_payload), std::begin(controller_payload_copy));
+	}
+
+	if (s_controller_payload_size != sizeof(controller_payload_copy) || controller_payload_copy[0] != LIBUSB_DT_HID)
+	{
+		INFO_LOG(SERIALINTERFACE, "error reading payload (size: %d, type: %02x)", s_controller_payload_size, controller_payload_copy[0]);
+		Reset();
+	}
+	else
+	{
+		u8 type = controller_payload_copy[1 + (9 * chan)] >> 4;
+		if (type != CONTROLLER_NONE && s_controller_type[chan] == CONTROLLER_NONE)
+			NOTICE_LOG(SERIALINTERFACE, "New device connected to Port %d of Type: %02x", chan + 1, controller_payload_copy[1 + (9 * chan)]);
+
+		s_controller_type[chan] = type;
+
+		if (s_controller_type[chan] != CONTROLLER_NONE)
+		{
+			memset(pad, 0, sizeof(*pad));
+			u8 b1 = controller_payload_copy[1 + (9 * chan) + 1];
+			u8 b2 = controller_payload_copy[1 + (9 * chan) + 2];
+
+			if (b1 & (1 << 0)) pad->button |= PAD_BUTTON_A;
+			if (b1 & (1 << 1)) pad->button |= PAD_BUTTON_B;
+			if (b1 & (1 << 2)) pad->button |= PAD_BUTTON_X;
+			if (b1 & (1 << 3)) pad->button |= PAD_BUTTON_Y;
+
+			if (b1 & (1 << 4)) pad->button |= PAD_BUTTON_LEFT;
+			if (b1 & (1 << 5)) pad->button |= PAD_BUTTON_RIGHT;
+			if (b1 & (1 << 6)) pad->button |= PAD_BUTTON_DOWN;
+			if (b1 & (1 << 7)) pad->button |= PAD_BUTTON_UP;
+
+			if (b2 & (1 << 0)) pad->button |= PAD_BUTTON_START;
+			if (b2 & (1 << 1)) pad->button |= PAD_TRIGGER_Z;
+			if (b2 & (1 << 2)) pad->button |= PAD_TRIGGER_R;
+			if (b2 & (1 << 3)) pad->button |= PAD_TRIGGER_L;
+
+			pad->stickX = controller_payload_copy[1 + (9 * chan) + 3];
+			pad->stickY = controller_payload_copy[1 + (9 * chan) + 4];
+			pad->substickX = controller_payload_copy[1 + (9 * chan) + 5];
+			pad->substickY = controller_payload_copy[1 + (9 * chan) + 6];
+			pad->triggerLeft = controller_payload_copy[1 + (9 * chan) + 7];
+			pad->triggerRight = controller_payload_copy[1 + (9 * chan) + 8];
+		}
+	}
+}
+
+void Output(int chan, u8 rumble_command)
+{
+	if (s_handle == nullptr || !SConfig::GetInstance().m_GameCubeAdapter || !SConfig::GetInstance().m_AdapterRumble)
+		return;
+
+	// Skip over rumble commands if it has not changed or the controller is wireless
+	if (rumble_command != s_controller_rumble[chan] && s_controller_type[chan] != CONTROLLER_WIRELESS)
+	{
+		s_controller_rumble[chan] = rumble_command;
+
+		unsigned char rumble[5] = { 0x11, s_controller_rumble[0], s_controller_rumble[1], s_controller_rumble[2], s_controller_rumble[3] };
+		int size = 0;
+
+		libusb_interrupt_transfer(s_handle, s_endpoint_out, rumble, sizeof(rumble), &size, 16);
+		// Netplay sends invalid data which results in size = 0x00.  Ignore it.
+		if (size != 0x05 && size != 0x00)
+		{
+			INFO_LOG(SERIALINTERFACE, "error writing rumble (size: %d)", size);
+			Reset();
+		}
+	}
+}
+
+bool IsDetected()
+{
+	return s_detected;
+}
+
+bool IsDriverDetected()
+{
+	return !s_libusb_driver_not_supported;
+}
+
+} // end of namespace SI_GCAdapter
diff --git a/Source/Core/Core/HW/SI_GCAdapter.h b/Source/Core/Core/HW/SI_GCAdapter.h
new file mode 100644
index 0000000000..bfef21bdf6
--- /dev/null
+++ b/Source/Core/Core/HW/SI_GCAdapter.h
@@ -0,0 +1,26 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+
+struct GCPadStatus;
+
+namespace SI_GCAdapter
+{
+
+void Init();
+void Reset();
+void Setup();
+void Shutdown();
+void SetAdapterCallback(std::function<void(void)> func);
+void StartScanThread();
+void StopScanThread();
+void Input(int chan, GCPadStatus* pad);
+void Output(int chan, u8 rumble_command);
+bool IsDetected();
+bool IsDriverDetected();
+
+} // end of namespace SI_GCAdapter
diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp
new file mode 100644
index 0000000000..4cfb1d0282
--- /dev/null
+++ b/Source/Core/Core/HW/Sram.cpp
@@ -0,0 +1,104 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/Sram.h"
+
+// english
+SRAM sram_dump = {{
+	0xFF, 0x6B,
+	0x00, 0x91,
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0x40,
+	0x00,
+	0x00,
+	0x00,
+	0x2C,
+	0x44, 0x4F, 0x4C, 0x50, 0x48, 0x49, 0x4E, 0x53, 0x4C, 0x4F, 0x54, 0x41,
+	0x44, 0x4F, 0x4C, 0x50, 0x48, 0x49, 0x4E, 0x53, 0x4C, 0x4F, 0x54, 0x42,
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00,
+	0x00,
+	0x6E, 0x6D,
+	0x00, 0x00,
+	0x00, 0x00
+}};
+
+#if 0
+// german
+SRAM sram_dump_german = {{
+	0x1F, 0x66,
+	0xE0, 0x96,
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0x04, 0xEA, 0x19, 0x40,
+	0x00,
+	0x00,
+	0x01,
+	0x3C,
+	0x12, 0xD5, 0xEA, 0xD3, 0x00, 0xFA, 0x2D, 0x33, 0x13, 0x41, 0x26, 0x03,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00,
+	0x00,
+	0x84, 0xFF,
+	0x00, 0x00,
+	0x00, 0x00
+}};
+#endif
+
+void InitSRAM()
+{
+	File::IOFile file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strSRAM, "rb");
+	if (file)
+	{
+		if (!file.ReadArray(&g_SRAM, 1))
+		{
+			ERROR_LOG(EXPANSIONINTERFACE,  "EXI IPL-DEV: Could not read all of SRAM");
+			g_SRAM = sram_dump;
+		}
+	}
+	else
+	{
+		g_SRAM = sram_dump;
+	}
+}
+
+void SetCardFlashID(u8* buffer, u8 card_index)
+{
+	u64 rand = Common::swap64( *(u64*)&(buffer[12]));
+	u8 csum=0;
+	for (int i = 0; i < 12; i++)
+	{
+		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
+		csum += g_SRAM.flash_id[card_index][i] = buffer[i] - ((u8)rand&0xff);
+		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
+		rand &= (u64)0x0000000000007fffULL;
+	}
+	g_SRAM.flashID_chksum[card_index] = csum^0xFF;
+}
+
+void FixSRAMChecksums()
+{
+	u16 checksum = 0;
+	u16 checksum_inv = 0;
+	for (int i = 0x0C; i < 0x14; i += 2)
+	{
+		int value = (g_SRAM.p_SRAM[i] << 8) + g_SRAM.p_SRAM[i+1];
+		checksum += value;
+		checksum_inv += value ^ 0xFFFF;
+	}
+	g_SRAM.checksum = Common::swap16(checksum);
+	g_SRAM.checksum_inv = Common::swap16(checksum_inv);
+}
diff --git a/Source/Core/Core/HW/Sram.h b/Source/Core/Core/HW/Sram.h
new file mode 100644
index 0000000000..d8328d4884
--- /dev/null
+++ b/Source/Core/Core/HW/Sram.h
@@ -0,0 +1,86 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Modified code taken from libogc
+/*-------------------------------------------------------------
+
+system.h -- OS functions and initialization
+
+Copyright (C) 2004
+Michael Wiedenbauer (shagkur)
+Dave Murphy (WinterMute)
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+must not claim that you wrote the original software. If you use
+this software in a product, an acknowledgment in the product
+documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+
+-------------------------------------------------------------*/
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#pragma pack(push,1)
+union SRAMFlags
+{
+	u8 Hex;
+	struct
+	{
+		u8             : 2;
+		u8 sound       : 1; // Audio settings; 0 = Mono, 1 = Stereo
+		u8 initialized : 1; // if 0, displays prompt to set language on boot and asks user to set options and time/date
+		u8             : 2;
+		u8 boot_menu   : 1; // if 1, skips logo animation and boots into the system menu regardless of if there is a disc inserted
+		u8 progressive : 1; // if 1, automatically displays Progressive Scan prompt in games that support it
+	};
+};
+
+union SRAM
+{
+	u8 p_SRAM[64];
+	struct                      // Stored configuration value from the system SRAM area
+	{
+		u16 checksum;           // Holds the block checksum.
+		u16 checksum_inv;       // Holds the inverse block checksum
+		u32 ead0;               // Unknown attribute
+		u32 ead1;               // Unknown attribute
+		u32 counter_bias;       // Bias value for the realtime clock
+		s8 display_offsetH;     // Pixel offset for the VI
+		u8 ntd;                 // Unknown attribute
+		u8 lang;                // Language of system
+		SRAMFlags flags;        // Device and operations flag
+
+		                        // Stored configuration value from the extended SRAM area
+		u8 flash_id[2][12];     // flash_id[2][12] 96bit memorycard unlock flash ID
+		u32 wirelessKbd_id;     // Device ID of last connected wireless keyboard
+		u16 wirelessPad_id[4];  // 16-bit device ID of last connected pad.
+		u8 dvderr_code;         // last non-recoverable error from DVD interface
+		u8 __padding0;          // reserved
+		u8 flashID_chksum[2];   // 8-bit checksum of unlock flash ID
+		u32 __padding1;         // padding
+	};
+};
+#pragma pack(pop)
+void InitSRAM();
+void SetCardFlashID(u8* buffer, u8 card_index);
+void FixSRAMChecksums();
+
+extern SRAM sram_dump;
+extern SRAM g_SRAM;
diff --git a/Source/Core/Core/Src/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp
similarity index 76%
rename from Source/Core/Core/Src/HW/StreamADPCM.cpp
rename to Source/Core/Core/HW/StreamADPCM.cpp
index 91e4763ed2..aeb201bde8 100644
--- a/Source/Core/Core/Src/HW/StreamADPCM.cpp
+++ b/Source/Core/Core/HW/StreamADPCM.cpp
@@ -1,10 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Adapted from in_cube by hcs & destop
 
-#include "StreamADPCM.h"
+#include "Common/MathUtil.h"
+#include "Core/HW/StreamADPCM.h"
 
 // STATE_TO_SAVE (not saved yet!)
 static s32 histl1;
@@ -12,7 +13,7 @@ static s32 histl2;
 static s32 histr1;
 static s32 histr2;
 
-s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
+static s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
 {
 	s32 hist = 0;
 	switch (q >> 4)
@@ -31,18 +32,15 @@ s16 ADPDecodeSample(s32 bits, s32 q, s32& hist1, s32& hist2)
 		break;
 	}
 	hist = (hist + 0x20) >> 6;
-	if (hist >  0x1fffff) hist =  0x1fffff;
-	if (hist < -0x200000) hist = -0x200000;
+	MathUtil::Clamp(&hist, -0x200000, 0x1fffff);
 
 	s32 cur = (((s16)(bits << 12) >> (q & 0xf)) << 6) + hist;
-	
+
 	hist2 = hist1;
 	hist1 = cur;
 
 	cur >>= 6;
-
-	if (cur < -0x8000) return -0x8000;
-	if (cur >  0x7fff) return  0x7fff;
+	MathUtil::Clamp(&cur, -0x8000, 0x7fff);
 
 	return (s16)cur;
 }
diff --git a/Source/Core/Core/HW/StreamADPCM.h b/Source/Core/Core/HW/StreamADPCM.h
new file mode 100644
index 0000000000..b938c0dd95
--- /dev/null
+++ b/Source/Core/Core/HW/StreamADPCM.h
@@ -0,0 +1,22 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Adapted from in_cube by hcs & destop
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class NGCADPCM
+{
+public:
+	enum
+	{
+		ONE_BLOCK_SIZE = 32,
+		SAMPLES_PER_BLOCK = 28
+	};
+
+	static void InitFilter();
+	static void DecodeBlock(s16 *pcm, const u8 *adpcm);
+};
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
new file mode 100644
index 0000000000..317a96a39c
--- /dev/null
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -0,0 +1,282 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This file controls all system timers
+
+/* (shuffle2) I don't know who wrote this, but take it with salt. For starters, "time" is contextual...
+"Time" is measured in frames, not time: These update frequencies are determined by the passage
+of frames. So if a game runs slow, on a slow computer for example, these updates will occur
+less frequently. This makes sense because almost all console games are controlled by frames
+rather than time, so if a game can't keep up with the normal framerate all animations and
+actions slows down and the game runs to slow. This is different from PC games that are
+often controlled by time instead and may not have maximum framerates.
+
+However, I'm not sure if the Bluetooth communication for the Wiimote is entirely frame
+dependent, the timing problems with the ack command in Zelda - TP may be related to
+time rather than frames? For now the IPC_HLE_PERIOD is frame dependent, but because of
+different conditions on the way to PluginWiimote::Wiimote_Update() the updates may actually
+be time related after all, or not?
+
+I'm not sure about this but the text below seems to assume that 60 fps means that the game
+runs in the normal intended speed. In that case an update time of [GetTicksPerSecond() / 60]
+would mean one update per frame and [GetTicksPerSecond() / 250] would mean four updates per
+frame.
+
+
+IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
+	IPC_HLE_UpdateCallback() // In this file
+
+		// This function seems to call all devices' Update() function four times per frame
+		WII_IPC_HLE_Interface::Update()
+
+			// If the AclFrameQue is empty this will call Wiimote_Update() and make it send
+			the current input status to the game. I'm not sure if this occurs approximately
+			once every frame or if the frequency is not exactly tied to rendered frames
+			CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
+			PluginWiimote::Wiimote_Update()
+
+			// This is also a device updated by WII_IPC_HLE_Interface::Update() but it doesn't
+			seem to ultimately call PluginWiimote::Wiimote_Update(). However it can be called
+			by the /dev/usb/oh1 device if the AclFrameQue is empty.
+			CWII_IPC_HLE_WiiMote::Update()
+*/
+
+#include "Common/Atomic.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/DSPEmulator.h"
+#include "Core/PatchEngine.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace SystemTimers
+{
+
+static u32 CPU_CORE_CLOCK  = 486000000u;             // 486 mhz (its not 485, stop bugging me!)
+
+static int et_Dec;
+static int et_VI;
+static int et_SI;
+static int et_CP;
+static int et_AudioDMA;
+static int et_DSP;
+static int et_IPC_HLE;
+static int et_PatchEngine; // PatchEngine updates every 1/60th of a second by default
+static int et_Throttle;
+
+static u64 s_last_sync_gpu_tick;
+
+// These are badly educated guesses
+// Feel free to experiment. Set these in Init below.
+static int
+	// This is a fixed value, don't change it
+	AUDIO_DMA_PERIOD,
+
+	// This is completely arbitrary. If we find that we need lower latency, we can just
+	// increase this number.
+	IPC_HLE_PERIOD;
+
+
+
+u32 GetTicksPerSecond()
+{
+	return CPU_CORE_CLOCK;
+}
+
+// DSP/CPU timeslicing.
+static void DSPCallback(u64 userdata, int cyclesLate)
+{
+	//splits up the cycle budget in case lle is used
+	//for hle, just gives all of the slice to hle
+	DSP::UpdateDSPSlice(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate);
+	CoreTiming::ScheduleEvent(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate, et_DSP);
+}
+
+static void AudioDMACallback(u64 userdata, int cyclesLate)
+{
+	int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32);
+	DSP::UpdateAudioDMA();  // Push audio to speakers.
+	CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA);
+}
+
+static void IPC_HLE_UpdateCallback(u64 userdata, int cyclesLate)
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		WII_IPC_HLE_Interface::UpdateDevices();
+		CoreTiming::ScheduleEvent(IPC_HLE_PERIOD - cyclesLate, et_IPC_HLE);
+	}
+}
+
+static void VICallback(u64 userdata, int cyclesLate)
+{
+	VideoInterface::Update();
+	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerLine() - cyclesLate, et_VI);
+}
+
+static void SICallback(u64 userdata, int cyclesLate)
+{
+	SerialInterface::UpdateDevices();
+	CoreTiming::ScheduleEvent(SerialInterface::GetTicksToNextSIPoll() - cyclesLate, et_SI);
+}
+
+static void CPCallback(u64 userdata, int cyclesLate)
+{
+	u64 now = CoreTiming::GetTicks();
+	int next = g_video_backend->Video_Sync((int)(now - s_last_sync_gpu_tick));
+	s_last_sync_gpu_tick = now;
+
+	if (next > 0)
+		CoreTiming::ScheduleEvent(next, et_CP);
+}
+
+static void DecrementerCallback(u64 userdata, int cyclesLate)
+{
+	PowerPC::ppcState.spr[SPR_DEC] = 0xFFFFFFFF;
+	PowerPC::ppcState.Exceptions |= EXCEPTION_DECREMENTER;
+}
+
+void DecrementerSet()
+{
+	u32 decValue = PowerPC::ppcState.spr[SPR_DEC];
+
+	CoreTiming::RemoveEvent(et_Dec);
+	if ((decValue & 0x80000000) == 0)
+	{
+		CoreTiming::SetFakeDecStartTicks(CoreTiming::GetTicks());
+		CoreTiming::SetFakeDecStartValue(decValue);
+
+		CoreTiming::ScheduleEvent(decValue * TIMER_RATIO, et_Dec);
+	}
+}
+
+u32 GetFakeDecrementer()
+{
+	return (CoreTiming::GetFakeDecStartValue() - (u32)((CoreTiming::GetTicks() - CoreTiming::GetFakeDecStartTicks()) / TIMER_RATIO));
+}
+
+void TimeBaseSet()
+{
+	CoreTiming::SetFakeTBStartTicks(CoreTiming::GetTicks());
+	CoreTiming::SetFakeTBStartValue(*((u64 *)&TL));
+}
+
+u64 GetFakeTimeBase()
+{
+	return CoreTiming::GetFakeTBStartValue() + ((CoreTiming::GetTicks() - CoreTiming::GetFakeTBStartTicks()) / TIMER_RATIO);
+}
+
+static void PatchEngineCallback(u64 userdata, int cyclesLate)
+{
+	// Patch mem and run the Action Replay
+	PatchEngine::ApplyFramePatches();
+	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame() - cyclesLate, et_PatchEngine);
+}
+
+static void ThrottleCallback(u64 last_time, int cyclesLate)
+{
+	// Allow the GPU thread to sleep. Setting this flag here limits the wakeups to 1 kHz.
+	GpuMaySleep();
+
+	u32 time = Common::Timer::GetTimeMs();
+
+	int diff = (u32)last_time - time;
+	const SConfig& config = SConfig::GetInstance();
+	bool frame_limiter = config.m_Framelimit && !Core::GetIsFramelimiterTempDisabled();
+	u32 next_event = GetTicksPerSecond()/1000;
+	if (SConfig::GetInstance().m_Framelimit > 1)
+	{
+		next_event = next_event * (SConfig::GetInstance().m_Framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;
+	}
+
+	const int max_fallback = 40; // 40 ms for one frame on 25 fps games
+	if (frame_limiter && abs(diff) > max_fallback)
+	{
+		DEBUG_LOG(COMMON, "system too %s, %d ms skipped", diff<0 ? "slow" : "fast", abs(diff) - max_fallback);
+		last_time = time - max_fallback;
+	}
+	else if (frame_limiter && diff > 0)
+		Common::SleepCurrentThread(diff);
+	CoreTiming::ScheduleEvent(next_event - cyclesLate, et_Throttle, last_time + 1);
+}
+
+// split from Init to break a circular dependency between VideoInterface::Init and SystemTimers::Init
+void PreInit()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		CPU_CORE_CLOCK = 729000000u;
+	else
+		CPU_CORE_CLOCK = 486000000u;
+}
+
+void Init()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		// AyuanX: TO BE TWEAKED
+		// Now the 1500 is a pure assumption
+		// We need to figure out the real frequency though
+
+		// FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32
+		const int freq = 1500;
+		IPC_HLE_PERIOD = GetTicksPerSecond() / freq;
+	}
+
+	// System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA
+	AUDIO_DMA_PERIOD = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32);
+
+	Common::Timer::IncreaseResolution();
+	// store and convert localtime at boot to timebase ticks
+	CoreTiming::SetFakeTBStartValue((u64)(CPU_CORE_CLOCK / TIMER_RATIO) * (u64)CEXIIPL::GetGCTime());
+	CoreTiming::SetFakeTBStartTicks(CoreTiming::GetTicks());
+
+	CoreTiming::SetFakeDecStartValue(0xFFFFFFFF);
+	CoreTiming::SetFakeDecStartTicks(CoreTiming::GetTicks());
+
+	et_Dec = CoreTiming::RegisterEvent("DecCallback", DecrementerCallback);
+	et_VI = CoreTiming::RegisterEvent("VICallback", VICallback);
+	et_SI = CoreTiming::RegisterEvent("SICallback", SICallback);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread && SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
+		et_CP = CoreTiming::RegisterEvent("CPCallback", CPCallback);
+	et_DSP = CoreTiming::RegisterEvent("DSPCallback", DSPCallback);
+	et_AudioDMA = CoreTiming::RegisterEvent("AudioDMACallback", AudioDMACallback);
+	et_IPC_HLE = CoreTiming::RegisterEvent("IPC_HLE_UpdateCallback", IPC_HLE_UpdateCallback);
+	et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
+	et_Throttle = CoreTiming::RegisterEvent("Throttle", ThrottleCallback);
+
+	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerLine(), et_VI);
+	CoreTiming::ScheduleEvent(0, et_DSP);
+	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_SI);
+	CoreTiming::ScheduleEvent(AUDIO_DMA_PERIOD, et_AudioDMA);
+	CoreTiming::ScheduleEvent(0, et_Throttle, Common::Timer::GetTimeMs());
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread && SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
+		CoreTiming::ScheduleEvent(0, et_CP);
+	s_last_sync_gpu_tick = CoreTiming::GetTicks();
+
+	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_PatchEngine);
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		CoreTiming::ScheduleEvent(IPC_HLE_PERIOD, et_IPC_HLE);
+}
+
+void Shutdown()
+{
+	Common::Timer::RestoreResolution();
+}
+
+}  // namespace
diff --git a/Source/Core/Core/HW/SystemTimers.h b/Source/Core/Core/HW/SystemTimers.h
new file mode 100644
index 0000000000..d8f3ef8519
--- /dev/null
+++ b/Source/Core/Core/HW/SystemTimers.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace SystemTimers
+{
+
+/*
+GameCube                   MHz
+flipper <-> ARAM bus:      81 (DSP)
+gekko <-> flipper bus:     162
+flipper <-> 1T-SRAM bus:   324
+gekko:                     486
+
+These contain some guesses:
+Wii                             MHz
+hollywood <-> GDDR3 RAM bus:    ??? no idea really
+broadway <-> hollywood bus:     243
+hollywood <-> 1T-SRAM bus:      486
+broadway:                       729
+*/
+// Ratio of TB and Decrementer to clock cycles.
+// TB clk is 1/4 of BUS clk. And it seems BUS clk is really 1/3 of CPU clk.
+// So, ratio is 1 / (1/4 * 1/3 = 1/12) = 12.
+// note: ZWW is ok and faster with TIMER_RATIO=8 though.
+// !!! POSSIBLE STABLE PERF BOOST HACK THERE !!!
+
+enum
+{
+	TIMER_RATIO = 12
+};
+
+u32 GetTicksPerSecond();
+void PreInit();
+void Init();
+void Shutdown();
+
+// Notify timing system that somebody wrote to the decrementer
+void DecrementerSet();
+u32 GetFakeDecrementer();
+
+void TimeBaseSet();
+u64 GetFakeTimeBase();
+
+}
diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp
new file mode 100644
index 0000000000..1e49cc2a25
--- /dev/null
+++ b/Source/Core/Core/HW/VideoInterface.cpp
@@ -0,0 +1,597 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/State.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace VideoInterface
+{
+
+// STATE_TO_SAVE
+// Registers listed in order:
+static UVIVerticalTimingRegister m_VerticalTimingRegister;
+static UVIDisplayControlRegister m_DisplayControlRegister;
+static UVIHorizontalTiming0      m_HTiming0;
+static UVIHorizontalTiming1      m_HTiming1;
+static UVIVBlankTimingRegister   m_VBlankTimingOdd;
+static UVIVBlankTimingRegister   m_VBlankTimingEven;
+static UVIBurstBlankingRegister  m_BurstBlankingOdd;
+static UVIBurstBlankingRegister  m_BurstBlankingEven;
+static UVIFBInfoRegister         m_XFBInfoTop;
+static UVIFBInfoRegister         m_XFBInfoBottom;
+static UVIFBInfoRegister         m_3DFBInfoTop;     // Start making your stereoscopic demos! :p
+static UVIFBInfoRegister         m_3DFBInfoBottom;
+static u16                       m_VBeamPos = 0;    // 0: Inactive
+static u16                       m_HBeamPos = 0;    // 0: Inactive
+static UVIInterruptRegister      m_InterruptRegister[4];
+static UVILatchRegister          m_LatchRegister[2];
+static PictureConfigurationRegister  m_PictureConfiguration;
+static UVIHorizontalScaling      m_HorizontalScaling;
+static SVIFilterCoefTables       m_FilterCoefTables;
+static u32                       m_UnkAARegister = 0;// ??? 0x00FF0000
+static u16                       m_Clock = 0;       // 0: 27MHz, 1: 54MHz
+static UVIDTVStatus              m_DTVStatus;
+static UVIHorizontalStepping     m_FBWidth;         // Only correct when scaling is enabled?
+static UVIBorderBlankRegister    m_BorderHBlank;
+// 0xcc002076 - 0xcc00207f is full of 0x00FF: unknown
+// 0xcc002080 - 0xcc002100 even more unknown
+
+u32 TargetRefreshRate = 0;
+
+static u32 TicksPerFrame = 0;
+static u32 s_lineCount = 0;
+static u32 s_upperFieldBegin = 0;
+static u32 s_lowerFieldBegin = 0;
+static int fields = 1;
+
+void DoState(PointerWrap &p)
+{
+	p.DoPOD(m_VerticalTimingRegister);
+	p.DoPOD(m_DisplayControlRegister);
+	p.Do(m_HTiming0);
+	p.Do(m_HTiming1);
+	p.Do(m_VBlankTimingOdd);
+	p.Do(m_VBlankTimingEven);
+	p.Do(m_BurstBlankingOdd);
+	p.Do(m_BurstBlankingEven);
+	p.Do(m_XFBInfoTop);
+	p.Do(m_XFBInfoBottom);
+	p.Do(m_3DFBInfoTop);
+	p.Do(m_3DFBInfoBottom);
+	p.Do(m_VBeamPos);
+	p.Do(m_HBeamPos);
+	p.DoArray(m_InterruptRegister, 4);
+	p.DoArray(m_LatchRegister, 2);
+	p.Do(m_PictureConfiguration);
+	p.DoPOD(m_HorizontalScaling);
+	p.Do(m_FilterCoefTables);
+	p.Do(m_UnkAARegister);
+	p.Do(m_Clock);
+	p.Do(m_DTVStatus);
+	p.Do(m_FBWidth);
+	p.Do(m_BorderHBlank);
+	p.Do(TargetRefreshRate);
+	p.Do(TicksPerFrame);
+	p.Do(s_lineCount);
+	p.Do(s_upperFieldBegin);
+	p.Do(s_lowerFieldBegin);
+}
+
+// Executed after Init, before game boot
+void Preset(bool _bNTSC)
+{
+	m_VerticalTimingRegister.EQU = 6;
+
+	m_DisplayControlRegister.ENB = 1;
+	m_DisplayControlRegister.FMT = _bNTSC ? 0 : 1;
+
+	m_HTiming0.HLW = 429;
+	m_HTiming0.HCE = 105;
+	m_HTiming0.HCS = 71;
+	m_HTiming1.HSY = 64;
+	m_HTiming1.HBE640 = 162;
+	m_HTiming1.HBS640 = 373;
+
+	m_VBlankTimingOdd.PRB = 502;
+	m_VBlankTimingOdd.PSB = 5;
+	m_VBlankTimingEven.PRB = 503;
+	m_VBlankTimingEven.PSB = 4;
+
+	m_BurstBlankingOdd.BS0 = 12;
+	m_BurstBlankingOdd.BE0 = 520;
+	m_BurstBlankingOdd.BS2 = 12;
+	m_BurstBlankingOdd.BE2 = 520;
+	m_BurstBlankingEven.BS0 = 13;
+	m_BurstBlankingEven.BE0 = 519;
+	m_BurstBlankingEven.BS2 = 13;
+	m_BurstBlankingEven.BE2 = 519;
+
+	m_InterruptRegister[0].HCT = 430;
+	m_InterruptRegister[0].VCT = 263;
+	m_InterruptRegister[0].IR_MASK = 1;
+	m_InterruptRegister[0].IR_INT = 0;
+	m_InterruptRegister[1].HCT = 1;
+	m_InterruptRegister[1].VCT = 1;
+	m_InterruptRegister[1].IR_MASK = 1;
+	m_InterruptRegister[1].IR_INT = 0;
+
+	m_PictureConfiguration.STD = 40;
+	m_PictureConfiguration.WPL = 40;
+
+	m_HBeamPos = -1; // NTSC-U N64 VC games check for a non-zero HBeamPos
+	m_VBeamPos = 0; // RG4JC0 checks for a zero VBeamPos
+
+	// 54MHz, capable of progressive scan
+	m_Clock = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;
+
+	// Say component cable is plugged
+	m_DTVStatus.component_plugged = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;
+
+	UpdateParameters();
+}
+
+void Init()
+{
+	m_VerticalTimingRegister.Hex = 0;
+	m_DisplayControlRegister.Hex = 0;
+	m_HTiming0.Hex = 0;
+	m_HTiming1.Hex = 0;
+	m_VBlankTimingOdd.Hex = 0;
+	m_VBlankTimingEven.Hex = 0;
+	m_BurstBlankingOdd.Hex = 0;
+	m_BurstBlankingEven.Hex = 0;
+	m_XFBInfoTop.Hex = 0;
+	m_XFBInfoBottom.Hex = 0;
+	m_3DFBInfoTop.Hex = 0;
+	m_3DFBInfoBottom.Hex = 0;
+	m_VBeamPos = 0;
+	m_HBeamPos = 0;
+	m_PictureConfiguration.Hex = 0;
+	m_HorizontalScaling.Hex = 0;
+	m_UnkAARegister = 0;
+	m_Clock = 0;
+	m_DTVStatus.Hex = 0;
+	m_FBWidth.Hex = 0;
+	m_BorderHBlank.Hex = 0;
+	memset(&m_FilterCoefTables, 0, sizeof(m_FilterCoefTables));
+
+	fields = 1;
+
+	m_DTVStatus.ntsc_j = SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ;
+
+	for (UVIInterruptRegister& reg : m_InterruptRegister)
+	{
+		reg.Hex = 0;
+	}
+
+	for (UVILatchRegister& reg : m_LatchRegister)
+	{
+		reg.Hex = 0;
+	}
+
+	m_DisplayControlRegister.Hex = 0;
+	UpdateParameters();
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	struct {
+		u32 addr;
+		u16* ptr;
+	} directly_mapped_vars[] = {
+		{ VI_VERTICAL_TIMING, &m_VerticalTimingRegister.Hex },
+		{ VI_HORIZONTAL_TIMING_0_HI, &m_HTiming0.Hi },
+		{ VI_HORIZONTAL_TIMING_0_LO, &m_HTiming0.Lo },
+		{ VI_HORIZONTAL_TIMING_1_HI, &m_HTiming1.Hi },
+		{ VI_HORIZONTAL_TIMING_1_LO, &m_HTiming1.Lo },
+		{ VI_VBLANK_TIMING_ODD_HI, &m_VBlankTimingOdd.Hi },
+		{ VI_VBLANK_TIMING_ODD_LO, &m_VBlankTimingOdd.Lo },
+		{ VI_VBLANK_TIMING_EVEN_HI, &m_VBlankTimingEven.Hi },
+		{ VI_VBLANK_TIMING_EVEN_LO, &m_VBlankTimingEven.Lo },
+		{ VI_BURST_BLANKING_ODD_HI, &m_BurstBlankingOdd.Hi },
+		{ VI_BURST_BLANKING_ODD_LO, &m_BurstBlankingOdd.Lo },
+		{ VI_BURST_BLANKING_EVEN_HI, &m_BurstBlankingEven.Hi },
+		{ VI_BURST_BLANKING_EVEN_LO, &m_BurstBlankingEven.Lo },
+		{ VI_FB_LEFT_TOP_LO, &m_XFBInfoTop.Lo },
+		{ VI_FB_RIGHT_TOP_LO, &m_3DFBInfoTop.Lo },
+		{ VI_FB_LEFT_BOTTOM_LO, &m_XFBInfoBottom.Lo },
+		{ VI_FB_RIGHT_BOTTOM_LO, &m_3DFBInfoBottom.Lo },
+		{ VI_PRERETRACE_LO, &m_InterruptRegister[0].Lo },
+		{ VI_POSTRETRACE_LO, &m_InterruptRegister[1].Lo },
+		{ VI_DISPLAY_INTERRUPT_2_LO, &m_InterruptRegister[2].Lo },
+		{ VI_DISPLAY_INTERRUPT_3_LO, &m_InterruptRegister[3].Lo },
+		{ VI_DISPLAY_LATCH_0_HI, &m_LatchRegister[0].Hi },
+		{ VI_DISPLAY_LATCH_0_LO, &m_LatchRegister[0].Lo },
+		{ VI_DISPLAY_LATCH_1_HI, &m_LatchRegister[1].Hi },
+		{ VI_DISPLAY_LATCH_1_LO, &m_LatchRegister[1].Lo },
+		{ VI_HSCALEW, &m_PictureConfiguration.Hex },
+		{ VI_HSCALER, &m_HorizontalScaling.Hex },
+		{ VI_FILTER_COEF_0_HI, &m_FilterCoefTables.Tables02[0].Hi },
+		{ VI_FILTER_COEF_0_LO, &m_FilterCoefTables.Tables02[0].Lo },
+		{ VI_FILTER_COEF_1_HI, &m_FilterCoefTables.Tables02[1].Hi },
+		{ VI_FILTER_COEF_1_LO, &m_FilterCoefTables.Tables02[1].Lo },
+		{ VI_FILTER_COEF_2_HI, &m_FilterCoefTables.Tables02[2].Hi },
+		{ VI_FILTER_COEF_2_LO, &m_FilterCoefTables.Tables02[2].Lo },
+		{ VI_FILTER_COEF_3_HI, &m_FilterCoefTables.Tables36[0].Hi },
+		{ VI_FILTER_COEF_3_LO, &m_FilterCoefTables.Tables36[0].Lo },
+		{ VI_FILTER_COEF_4_HI, &m_FilterCoefTables.Tables36[1].Hi },
+		{ VI_FILTER_COEF_4_LO, &m_FilterCoefTables.Tables36[1].Lo },
+		{ VI_FILTER_COEF_5_HI, &m_FilterCoefTables.Tables36[2].Hi },
+		{ VI_FILTER_COEF_5_LO, &m_FilterCoefTables.Tables36[2].Lo },
+		{ VI_FILTER_COEF_6_HI, &m_FilterCoefTables.Tables36[3].Hi },
+		{ VI_FILTER_COEF_6_LO, &m_FilterCoefTables.Tables36[3].Lo },
+		{ VI_CLOCK, &m_Clock },
+		{ VI_DTV_STATUS, &m_DTVStatus.Hex },
+		{ VI_FBWIDTH, &m_FBWidth.Hex },
+		{ VI_BORDER_BLANK_END, &m_BorderHBlank.Lo },
+		{ VI_BORDER_BLANK_START, &m_BorderHBlank.Hi },
+	};
+
+	// Declare all the boilerplate direct MMIOs.
+	for (auto& mapped_var : directly_mapped_vars)
+	{
+		mmio->Register(base | mapped_var.addr,
+			MMIO::DirectRead<u16>(mapped_var.ptr),
+			MMIO::DirectWrite<u16>(mapped_var.ptr)
+		);
+	}
+
+	// XFB related MMIOs that require special handling on writes.
+	mmio->Register(base | VI_FB_LEFT_TOP_HI,
+		MMIO::DirectRead<u16>(&m_XFBInfoTop.Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_XFBInfoTop.Hi = val;
+			if (m_XFBInfoTop.CLRPOFF) m_XFBInfoTop.POFF = 0;
+		})
+	);
+	mmio->Register(base | VI_FB_LEFT_BOTTOM_HI,
+		MMIO::DirectRead<u16>(&m_XFBInfoBottom.Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_XFBInfoBottom.Hi = val;
+			if (m_XFBInfoBottom.CLRPOFF) m_XFBInfoBottom.POFF = 0;
+		})
+	);
+	mmio->Register(base | VI_FB_RIGHT_TOP_HI,
+		MMIO::DirectRead<u16>(&m_3DFBInfoTop.Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_3DFBInfoTop.Hi = val;
+			if (m_3DFBInfoTop.CLRPOFF) m_3DFBInfoTop.POFF = 0;
+		})
+	);
+	mmio->Register(base | VI_FB_RIGHT_BOTTOM_HI,
+		MMIO::DirectRead<u16>(&m_3DFBInfoBottom.Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_3DFBInfoBottom.Hi = val;
+			if (m_3DFBInfoBottom.CLRPOFF) m_3DFBInfoBottom.POFF = 0;
+		})
+	);
+
+	// MMIOs with unimplemented writes that trigger warnings.
+	mmio->Register(base | VI_VERTICAL_BEAM_POSITION,
+		MMIO::DirectRead<u16>(&m_VBeamPos),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			WARN_LOG(VIDEOINTERFACE, "Changing vertical beam position to 0x%04x - not documented or implemented yet", val);
+		})
+	);
+	mmio->Register(base | VI_HORIZONTAL_BEAM_POSITION,
+		MMIO::DirectRead<u16>(&m_HBeamPos),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			WARN_LOG(VIDEOINTERFACE, "Changing horizontal beam position to 0x%04x - not documented or implemented yet", val);
+		})
+	);
+
+	// The following MMIOs are interrupts related and update interrupt status
+	// on writes.
+	mmio->Register(base | VI_PRERETRACE_HI,
+		MMIO::DirectRead<u16>(&m_InterruptRegister[0].Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_InterruptRegister[0].Hi = val;
+			UpdateInterrupts();
+		})
+	);
+	mmio->Register(base | VI_POSTRETRACE_HI,
+		MMIO::DirectRead<u16>(&m_InterruptRegister[1].Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_InterruptRegister[1].Hi = val;
+			UpdateInterrupts();
+		})
+	);
+	mmio->Register(base | VI_DISPLAY_INTERRUPT_2_HI,
+		MMIO::DirectRead<u16>(&m_InterruptRegister[2].Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_InterruptRegister[2].Hi = val;
+			UpdateInterrupts();
+		})
+	);
+	mmio->Register(base | VI_DISPLAY_INTERRUPT_3_HI,
+		MMIO::DirectRead<u16>(&m_InterruptRegister[3].Hi),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_InterruptRegister[3].Hi = val;
+			UpdateInterrupts();
+		})
+	);
+
+	// Unknown anti-aliasing related MMIO register: puts a warning on log and
+	// needs to shift/mask when reading/writing.
+	mmio->Register(base | VI_UNK_AA_REG_HI,
+		MMIO::ComplexRead<u16>([](u32) {
+			return m_UnkAARegister >> 16;
+		}),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_UnkAARegister = (m_UnkAARegister & 0x0000FFFF) | ((u32)val << 16);
+			WARN_LOG(VIDEOINTERFACE, "Writing to the unknown AA register (hi)");
+		})
+	);
+	mmio->Register(base | VI_UNK_AA_REG_LO,
+		MMIO::ComplexRead<u16>([](u32) {
+			return m_UnkAARegister & 0xFFFF;
+		}),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			m_UnkAARegister = (m_UnkAARegister & 0xFFFF0000) | val;
+			WARN_LOG(VIDEOINTERFACE, "Writing to the unknown AA register (lo)");
+		})
+	);
+
+	// Control register writes only updates some select bits, and additional
+	// processing needs to be done if a reset is requested.
+	mmio->Register(base | VI_CONTROL_REGISTER,
+		MMIO::DirectRead<u16>(&m_DisplayControlRegister.Hex),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UVIDisplayControlRegister tmpConfig(val);
+			m_DisplayControlRegister.ENB = tmpConfig.ENB;
+			m_DisplayControlRegister.NIN = tmpConfig.NIN;
+			m_DisplayControlRegister.DLR = tmpConfig.DLR;
+			m_DisplayControlRegister.LE0 = tmpConfig.LE0;
+			m_DisplayControlRegister.LE1 = tmpConfig.LE1;
+			m_DisplayControlRegister.FMT = tmpConfig.FMT;
+
+			if (tmpConfig.RST)
+			{
+				// shuffle2 clear all data, reset to default vals, and enter idle mode
+				m_DisplayControlRegister.RST = 0;
+				for (UVIInterruptRegister& reg : m_InterruptRegister)
+				{
+					reg.Hex = 0;
+				}
+				UpdateInterrupts();
+			}
+
+			UpdateParameters();
+		})
+	);
+
+	// Map 8 bit reads (not writes) to 16 bit reads.
+	for (int i = 0; i < 0x1000; i += 2)
+	{
+		mmio->Register(base | i,
+			MMIO::ReadToLarger<u8>(mmio, base | i, 8),
+			MMIO::InvalidWrite<u8>()
+		);
+		mmio->Register(base | (i + 1),
+			MMIO::ReadToLarger<u8>(mmio, base | i, 0),
+			MMIO::InvalidWrite<u8>()
+		);
+	}
+
+	// Map 32 bit reads and writes to 16 bit reads and writes.
+	for (int i = 0; i < 0x1000; i += 4)
+	{
+		mmio->Register(base | i,
+			MMIO::ReadToSmaller<u32>(mmio, base | i, base | (i + 2)),
+			MMIO::WriteToSmaller<u32>(mmio, base | i, base | (i + 2))
+		);
+	}
+}
+
+void SetRegionReg(char region)
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ)
+		m_DTVStatus.ntsc_j = region == 'J';
+}
+
+void UpdateInterrupts()
+{
+	if ((m_InterruptRegister[0].IR_INT && m_InterruptRegister[0].IR_MASK) ||
+		(m_InterruptRegister[1].IR_INT && m_InterruptRegister[1].IR_MASK) ||
+		(m_InterruptRegister[2].IR_INT && m_InterruptRegister[2].IR_MASK) ||
+		(m_InterruptRegister[3].IR_INT && m_InterruptRegister[3].IR_MASK))
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_VI, true);
+	}
+	else
+	{
+		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_VI, false);
+	}
+}
+
+u32 GetXFBAddressTop()
+{
+	if (m_XFBInfoTop.POFF)
+		return m_XFBInfoTop.FBB << 5;
+	else
+		return m_XFBInfoTop.FBB;
+}
+
+u32 GetXFBAddressBottom()
+{
+	// POFF for XFB bottom is connected to POFF for XFB top
+	if (m_XFBInfoTop.POFF)
+		return m_XFBInfoBottom.FBB << 5;
+	else
+		return m_XFBInfoBottom.FBB;
+}
+
+void UpdateParameters()
+{
+	fields = m_DisplayControlRegister.NIN ? 2 : 1;
+
+	switch (m_DisplayControlRegister.FMT)
+	{
+	case 0: // NTSC
+		TargetRefreshRate = NTSC_FIELD_RATE;
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
+		s_lineCount = NTSC_LINE_COUNT;
+		s_upperFieldBegin = NTSC_UPPER_BEGIN;
+		s_lowerFieldBegin = NTSC_LOWER_BEGIN;
+		break;
+
+	case 2: // PAL-M
+		TargetRefreshRate = NTSC_FIELD_RATE;
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
+		s_lineCount = PAL_LINE_COUNT;
+		s_upperFieldBegin = PAL_UPPER_BEGIN;
+		s_lowerFieldBegin = PAL_LOWER_BEGIN;
+		break;
+
+	case 1: // PAL
+		TargetRefreshRate = PAL_FIELD_RATE;
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / PAL_FIELD_RATE;
+		s_lineCount = PAL_LINE_COUNT;
+		s_upperFieldBegin = PAL_UPPER_BEGIN;
+		s_lowerFieldBegin = PAL_LOWER_BEGIN;
+		break;
+
+	case 3: // Debug
+		PanicAlert("Debug video mode not implemented");
+		break;
+
+	default:
+		PanicAlert("Unknown Video Format - CVideoInterface");
+		break;
+	}
+}
+
+unsigned int GetTicksPerLine()
+{
+	if (s_lineCount == 0)
+	{
+		return 1;
+	}
+	else
+	{
+		return TicksPerFrame / (s_lineCount / (2 / fields)) ;
+	}
+}
+
+unsigned int GetTicksPerFrame()
+{
+	return TicksPerFrame;
+}
+
+static void BeginField(FieldType field)
+{
+	// TODO: the stride and height shouldn't depend on whether the FieldType is
+	// "progressive".  We're actually telling the video backend to draw unspecified
+	// junk.  Due to the way XFB copies work, the unspecified junk is usually
+	// the contents of the other field, so it looks okay in most cases, but we
+	// shouldn't depend on that; a good example of where our output is wrong is
+	// the title screen teaser videos in Metroid Prime.
+	//
+	// What should actually happen is that we should pass on the correct width,
+	// stride, and height to the video backend, and it should deinterlace the
+	// output when appropriate.
+	u32 fbStride = m_PictureConfiguration.STD * (field == FIELD_PROGRESSIVE ? 16 : 8);
+	u32 fbWidth = m_PictureConfiguration.WPL * 16;
+	u32 fbHeight = m_VerticalTimingRegister.ACV * (field == FIELD_PROGRESSIVE ? 1 : 2);
+	u32 xfbAddr;
+
+	// Only the top field is valid in progressive mode.
+	if (field == FieldType::FIELD_PROGRESSIVE)
+	{
+		xfbAddr = GetXFBAddressTop();
+	}
+	else
+	{
+		// If we are displaying an interlaced field, we convert it to a progressive field
+		// by simply using the whole XFB, which 99% of the time contains a whole progressive
+		// frame.
+
+		// All known NTSC games use the top/odd field as the upper field but
+		// PAL games are known to whimsically arrange the fields in either order.
+		// So to work out which field is pointing to the top of the progressive XFB we check
+		// which field has the lower PRB value in the VBlank Timing Registers.
+
+		if(m_VBlankTimingOdd.PRB < m_VBlankTimingEven.PRB)
+			xfbAddr = GetXFBAddressTop();
+		else
+			xfbAddr = GetXFBAddressBottom();
+	}
+
+	static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
+
+	DEBUG_LOG(VIDEOINTERFACE,
+			  "(VI->BeginField): Address: %.08X | WPL %u | STD %u | ACV %u | Field %s",
+			  xfbAddr, m_PictureConfiguration.WPL, m_PictureConfiguration.STD,
+			  m_VerticalTimingRegister.ACV, fieldTypeNames[field]);
+
+	if (xfbAddr)
+		g_video_backend->Video_BeginField(xfbAddr, fbWidth, fbStride, fbHeight);
+}
+
+static void EndField()
+{
+	g_video_backend->Video_EndField();
+	Core::VideoThrottle();
+}
+
+// Purpose: Send VI interrupt when triggered
+// Run when: When a frame is scanned (progressive/interlace)
+void Update()
+{
+	if (m_DisplayControlRegister.NIN)
+	{
+		// Progressive
+		if (m_VBeamPos == 1)
+			BeginField(FIELD_PROGRESSIVE);
+	}
+	else if (m_VBeamPos == s_upperFieldBegin)
+	{
+		// Interlace Upper
+		BeginField(FIELD_UPPER);
+	}
+	else if (m_VBeamPos == s_lowerFieldBegin)
+	{
+		// Interlace Lower
+		BeginField(FIELD_LOWER);
+	}
+
+	if (m_VBeamPos == s_upperFieldBegin + m_VerticalTimingRegister.ACV)
+	{
+		// Interlace Upper.
+		EndField();
+	}
+	else if (m_VBeamPos == s_lowerFieldBegin + m_VerticalTimingRegister.ACV)
+	{
+		// Interlace Lower
+		EndField();
+	}
+
+	if (++m_VBeamPos > s_lineCount * fields)
+		m_VBeamPos = 1;
+
+	for (UVIInterruptRegister& reg : m_InterruptRegister)
+	{
+		if (m_VBeamPos == reg.VCT)
+		{
+			reg.IR_INT = 1;
+		}
+	}
+	UpdateInterrupts();
+}
+
+} // namespace
diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h
new file mode 100644
index 0000000000..0eab6a9254
--- /dev/null
+++ b/Source/Core/Core/HW/VideoInterface.h
@@ -0,0 +1,356 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+namespace VideoInterface
+{
+// NTSC is 60 FPS, right?
+// Wrong, it's about 59.94 FPS. The NTSC engineers had to slightly lower
+// the field rate from 60 FPS when they added color to the standard.
+// This was done to prevent analog interference between the video and
+// audio signals. PAL has no similar reduction; it is exactly 50 FPS.
+//#define NTSC_FIELD_RATE  (60.0f / 1.001f)
+#define NTSC_FIELD_RATE    60
+#define NTSC_LINE_COUNT    525
+// These line numbers indicate the beginning of the "active video" in a frame.
+// An NTSC frame has the lower field first followed by the upper field.
+// TODO: Is this true for PAL-M? Is this true for PAL60?
+#define NTSC_LOWER_BEGIN    21
+#define NTSC_UPPER_BEGIN    283
+
+//#define PAL_FIELD_RATE      50.0f
+#define PAL_FIELD_RATE      50
+#define PAL_LINE_COUNT      625
+// These line numbers indicate the beginning of the "active video" in a frame.
+// A PAL frame has the upper field first followed by the lower field.
+#define PAL_UPPER_BEGIN     23
+#define PAL_LOWER_BEGIN     336
+
+// VI Internal Hardware Addresses
+enum
+{
+	VI_VERTICAL_TIMING                  = 0x00,
+	VI_CONTROL_REGISTER                 = 0x02,
+	VI_HORIZONTAL_TIMING_0_HI           = 0x04,
+	VI_HORIZONTAL_TIMING_0_LO           = 0x06,
+	VI_HORIZONTAL_TIMING_1_HI           = 0x08,
+	VI_HORIZONTAL_TIMING_1_LO           = 0x0a,
+	VI_VBLANK_TIMING_ODD_HI             = 0x0c,
+	VI_VBLANK_TIMING_ODD_LO             = 0x0e,
+	VI_VBLANK_TIMING_EVEN_HI            = 0x10,
+	VI_VBLANK_TIMING_EVEN_LO            = 0x12,
+	VI_BURST_BLANKING_ODD_HI            = 0x14,
+	VI_BURST_BLANKING_ODD_LO            = 0x16,
+	VI_BURST_BLANKING_EVEN_HI           = 0x18,
+	VI_BURST_BLANKING_EVEN_LO           = 0x1a,
+	VI_FB_LEFT_TOP_HI                   = 0x1c, // FB_LEFT_TOP is first half of XFB info
+	VI_FB_LEFT_TOP_LO                   = 0x1e,
+	VI_FB_RIGHT_TOP_HI                  = 0x20, // FB_RIGHT_TOP is only used in 3D mode
+	VI_FB_RIGHT_TOP_LO                  = 0x22,
+	VI_FB_LEFT_BOTTOM_HI                = 0x24, // FB_LEFT_BOTTOM is second half of XFB info
+	VI_FB_LEFT_BOTTOM_LO                = 0x26,
+	VI_FB_RIGHT_BOTTOM_HI               = 0x28, // FB_RIGHT_BOTTOM is only used in 3D mode
+	VI_FB_RIGHT_BOTTOM_LO               = 0x2a,
+	VI_VERTICAL_BEAM_POSITION           = 0x2c,
+	VI_HORIZONTAL_BEAM_POSITION         = 0x2e,
+	VI_PRERETRACE_HI                    = 0x30,
+	VI_PRERETRACE_LO                    = 0x32,
+	VI_POSTRETRACE_HI                   = 0x34,
+	VI_POSTRETRACE_LO                   = 0x36,
+	VI_DISPLAY_INTERRUPT_2_HI           = 0x38,
+	VI_DISPLAY_INTERRUPT_2_LO           = 0x3a,
+	VI_DISPLAY_INTERRUPT_3_HI           = 0x3c,
+	VI_DISPLAY_INTERRUPT_3_LO           = 0x3e,
+	VI_DISPLAY_LATCH_0_HI               = 0x40,
+	VI_DISPLAY_LATCH_0_LO               = 0x42,
+	VI_DISPLAY_LATCH_1_HI               = 0x44,
+	VI_DISPLAY_LATCH_1_LO               = 0x46,
+	VI_HSCALEW                          = 0x48,
+	VI_HSCALER                          = 0x4a,
+	VI_FILTER_COEF_0_HI                 = 0x4c,
+	VI_FILTER_COEF_0_LO                 = 0x4e,
+	VI_FILTER_COEF_1_HI                 = 0x50,
+	VI_FILTER_COEF_1_LO                 = 0x52,
+	VI_FILTER_COEF_2_HI                 = 0x54,
+	VI_FILTER_COEF_2_LO                 = 0x56,
+	VI_FILTER_COEF_3_HI                 = 0x58,
+	VI_FILTER_COEF_3_LO                 = 0x5a,
+	VI_FILTER_COEF_4_HI                 = 0x5c,
+	VI_FILTER_COEF_4_LO                 = 0x5e,
+	VI_FILTER_COEF_5_HI                 = 0x60,
+	VI_FILTER_COEF_5_LO                 = 0x62,
+	VI_FILTER_COEF_6_HI                 = 0x64,
+	VI_FILTER_COEF_6_LO                 = 0x66,
+	VI_UNK_AA_REG_HI                    = 0x68,
+	VI_UNK_AA_REG_LO                    = 0x6a,
+	VI_CLOCK                            = 0x6c,
+	VI_DTV_STATUS                       = 0x6e,
+	VI_FBWIDTH                          = 0x70,
+	VI_BORDER_BLANK_END                 = 0x72, // Only used in debug video mode
+	VI_BORDER_BLANK_START               = 0x74, // Only used in debug video mode
+	//VI_INTERLACE                      = 0x850, // ??? MYSTERY OLD CODE
+};
+
+union UVIVerticalTimingRegister
+{
+	u16 Hex;
+	struct
+	{
+		u16 EQU : 4; // Equalization pulse in half lines
+		u16 ACV : 10; // Active video in lines per field (seems always zero)
+		u16     : 2;
+	};
+	UVIVerticalTimingRegister(u16 _hex) { Hex = _hex;}
+	UVIVerticalTimingRegister() { Hex = 0;}
+};
+
+union UVIDisplayControlRegister
+{
+	u16 Hex;
+	struct
+	{
+		u16 ENB : 1; // Enables video timing generation and data request
+		u16 RST : 1; // Clears all data requests and puts VI into its idle state
+		u16 NIN : 1; // 0: Interlaced, 1: Non-Interlaced: top field drawn at field rate and bottom field is not displayed
+		u16 DLR : 1; // Selects 3D Display Mode
+		u16 LE0 : 2; // Display Latch; 0: Off, 1: On for 1 field, 2: On for 2 fields, 3: Always on
+		u16 LE1 : 2;
+		u16 FMT : 2; // 0: NTSC, 1: PAL, 2: MPAL, 3: Debug
+		u16     : 6;
+	};
+	UVIDisplayControlRegister(u16 _hex) { Hex = _hex;}
+	UVIDisplayControlRegister() { Hex = 0;}
+};
+
+union UVIHorizontalTiming0
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 HLW : 10; // Halfline Width (W*16 = Width (720))
+		u32     : 6;
+		u32 HCE : 7; // Horizontal Sync Start to Color Burst End
+		u32     : 1;
+		u32 HCS : 7; // Horizontal Sync Start to Color Burst Start
+		u32     : 1;
+	};
+};
+
+union UVIHorizontalTiming1
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 HSY    : 7; // Horizontal Sync Width
+		u32 HBE640 : 10; // Horizontal Sync Start to horizontal blank end
+		u32 HBS640 : 10; // Half line to horizontal blanking start
+		u32        : 5;
+	};
+};
+
+// Exists for both odd and even fields
+union UVIVBlankTimingRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 PRB : 10; // Pre-blanking in half lines
+		u32     : 6;
+		u32 PSB : 10; // Post blanking in half lines
+		u32     : 6;
+	};
+};
+
+// Exists for both odd and even fields
+union UVIBurstBlankingRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 BS0 : 5;  // Field x start to burst blanking start in halflines
+		u32 BE0 : 11; // Field x start to burst blanking end in halflines
+		u32 BS2 : 5;  // Field x+2 start to burst blanking start in halflines
+		u32 BE2 : 11; // Field x+2 start to burst blanking end in halflines
+	};
+};
+
+union UVIFBInfoRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		// TODO: mask out lower 9bits/align to 9bits???
+		u32 FBB     : 24; // Base address of the framebuffer in external mem
+		// POFF only seems to exist in the top reg. XOFF, unknown.
+		u32 XOFF    : 4; // Horizontal Offset of the left-most pixel within the first word of the fetched picture
+		u32 POFF    : 1; // Page offest: 1: fb address is (address>>5)
+		u32 CLRPOFF : 3; // ? setting bit 31 clears POFF
+	};
+};
+
+// VI Interrupt Register
+union UVIInterruptRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 HCT     : 11; // Horizontal Position
+		u32         : 5;
+		u32 VCT     : 11; // Vertical Position
+		u32         : 1;
+		u32 IR_MASK : 1;  // Interrupt Mask Bit
+		u32         : 2;
+		u32 IR_INT  : 1;  // Interrupt Status (1=Active, 0=Clear)
+	};
+};
+
+union UVILatchRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 HCT : 11; // Horizontal Count
+		u32     : 5;
+		u32 VCT : 11; // Vertical Count
+		u32     : 4;
+		u32 TRG : 1;  // Trigger Flag
+	};
+};
+
+union PictureConfigurationRegister
+{
+	u16 Hex;
+	struct
+	{
+		u16 STD  : 8;
+		u16 WPL  : 7;
+		u16      : 1;
+	};
+};
+
+union UVIHorizontalScaling
+{
+	u16 Hex;
+	struct
+	{
+		u16 STP   : 9; // Horizontal stepping size (U1.8 Scaler Value) (0x160 Works for 320)
+		u16       : 3;
+		u16 HS_EN : 1; // Enable Horizontal Scaling
+		u16       : 3;
+	};
+	UVIHorizontalScaling(u16 _hex) { Hex = _hex;}
+	UVIHorizontalScaling() { Hex = 0;}
+};
+
+// Used for tables 0-2
+union UVIFilterCoefTable3
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 Tap0 : 10;
+		u32 Tap1 : 10;
+		u32 Tap2 : 10;
+		u32      : 2;
+	};
+};
+
+// Used for tables 3-6
+union UVIFilterCoefTable4
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 Tap0 : 8;
+		u32 Tap1 : 8;
+		u32 Tap2 : 8;
+		u32 Tap3 : 8;
+	};
+};
+
+struct SVIFilterCoefTables
+{
+	UVIFilterCoefTable3 Tables02[3];
+	UVIFilterCoefTable4 Tables36[4];
+};
+
+// Debug video mode only, probably never used in Dolphin...
+union UVIBorderBlankRegister
+{
+	u32 Hex;
+	struct { u16 Lo, Hi; };
+	struct
+	{
+		u32 HBE656  : 10; // Border Horizontal Blank End
+		u32         : 11;
+		u32 HBS656  : 10; // Border Horizontal Blank start
+		u32 BRDR_EN : 1; // Border Enable
+	};
+};
+
+// ntsc-j and component cable bits
+union UVIDTVStatus
+{
+	u16 Hex;
+	struct
+	{
+		u16 component_plugged : 1;
+		u16 ntsc_j            : 1;
+		u16                   :14;
+	};
+};
+
+union UVIHorizontalStepping
+{
+	u16 Hex;
+	struct
+	{
+		u16 srcwidth : 10;
+		u16          :  6;
+	};
+};
+
+	// urgh, ugly externs.
+	extern u32 TargetRefreshRate;
+
+	// For BS2 HLE
+	void Preset(bool _bNTSC);
+
+	void Init();
+	void SetRegionReg(char region);
+	void DoState(PointerWrap &p);
+
+	void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+	// returns a pointer to the current visible xfb
+	u32 GetXFBAddressTop();
+	u32 GetXFBAddressBottom();
+
+	// Update and draw framebuffer
+	void Update();
+
+	// UpdateInterrupts: check if we have to generate a new VI Interrupt
+	void UpdateInterrupts();
+
+	// Change values pertaining to video mode
+	void UpdateParameters();
+
+	unsigned int GetTicksPerLine();
+	unsigned int GetTicksPerFrame();
+}
diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp
new file mode 100644
index 0000000000..f848ff1e65
--- /dev/null
+++ b/Source/Core/Core/HW/WII_IPC.cpp
@@ -0,0 +1,248 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <map>
+#include <queue>
+#include <vector>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/CoreTiming.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/WII_IPC.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+
+
+// This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because of the IOS HLE
+// How IOS uses IPC:
+// X1 Execute command: a new pointer is available in HW_IPC_PPCCTRL
+// X2 Reload (a new IOS is being loaded, old one doesn't need to reply anymore)
+// Y1 Command executed and reply available in HW_IPC_ARMMSG
+// Y2 Command acknowledge
+// ppc_msg is a pointer to 0x40byte command structure
+// arm_msg is, similarly, starlet's response buffer*
+
+namespace WII_IPCInterface
+{
+
+enum
+{
+	IPC_PPCMSG  = 0x00,
+	IPC_PPCCTRL = 0x04,
+	IPC_ARMMSG  = 0x08,
+	IPC_ARMCTRL = 0x0c,
+
+	PPCSPEED    = 0x18,
+	VISOLID     = 0x24,
+
+	PPC_IRQFLAG = 0x30,
+	PPC_IRQMASK = 0x34,
+	ARM_IRQFLAG = 0x38,
+	ARM_IRQMASK = 0x3c,
+
+	GPIOB_OUT   = 0xc0,
+	GPIOB_DIR   = 0xc4,
+	GPIOB_IN    = 0xc8,
+
+	UNK_180     = 0x180,
+	UNK_1CC     = 0x1cc,
+	UNK_1D0     = 0x1d0,
+};
+
+struct CtrlRegister
+{
+	u8 X1  : 1;
+	u8 X2  : 1;
+	u8 Y1  : 1;
+	u8 Y2  : 1;
+	u8 IX1 : 1;
+	u8 IX2 : 1;
+	u8 IY1 : 1;
+	u8 IY2 : 1;
+
+	CtrlRegister() { X1 = X2 = Y1 = Y2 = IX1 = IX2 = IY1 = IY2 = 0; }
+
+	inline u8 ppc() { return (IY2<<5)|(IY1<<4)|(X2<<3)|(Y1<<2)|(Y2<<1)|X1; }
+	inline u8 arm() { return (IX2<<5)|(IX1<<4)|(Y2<<3)|(X1<<2)|(X2<<1)|Y1; }
+
+	inline void ppc(u32 v)
+	{
+		X1 = v & 1;
+		X2 = (v >> 3) & 1;
+		if ((v >> 2) & 1) Y1 = 0;
+		if ((v >> 1) & 1) Y2 = 0;
+		IY1 = (v >> 4) & 1;
+		IY2 = (v >> 5) & 1;
+	}
+
+	inline void arm(u32 v)
+	{
+		Y1 = v & 1;
+		Y2 = (v >> 3) & 1;
+		if ((v >> 2) & 1) X1 = 0;
+		if ((v >> 1) & 1) X2 = 0;
+		IX1 = (v >> 4) & 1;
+		IX2 = (v >> 5) & 1;
+	}
+};
+
+// STATE_TO_SAVE
+static u32 ppc_msg;
+static u32 arm_msg;
+static CtrlRegister ctrl;
+
+static u32 ppc_irq_flags;
+static u32 ppc_irq_masks;
+static u32 arm_irq_flags;
+static u32 arm_irq_masks;
+
+static u32 sensorbar_power; // do we need to care about this?
+
+static int updateInterrupts;
+
+void DoState(PointerWrap &p)
+{
+	p.Do(ppc_msg);
+	p.Do(arm_msg);
+	p.DoPOD(ctrl);
+	p.Do(ppc_irq_flags);
+	p.Do(ppc_irq_masks);
+	p.Do(arm_irq_flags);
+	p.Do(arm_irq_masks);
+	p.Do(sensorbar_power);
+}
+
+void Init()
+{
+	ctrl = CtrlRegister();
+	ppc_msg = 0;
+	arm_msg = 0;
+
+	ppc_irq_flags = 0;
+	ppc_irq_masks = 0;
+	arm_irq_flags = 0;
+	arm_irq_masks = 0;
+
+	sensorbar_power = 0;
+
+	ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY;
+
+	updateInterrupts = CoreTiming::RegisterEvent("IPCInterrupt", UpdateInterrupts);
+}
+
+void Reset()
+{
+	INFO_LOG(WII_IPC, "Resetting ...");
+	Init();
+	WII_IPC_HLE_Interface::Reset();
+}
+
+void Shutdown()
+{
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	mmio->Register(base | IPC_PPCMSG,
+		MMIO::InvalidRead<u32>(),
+		MMIO::DirectWrite<u32>(&ppc_msg)
+	);
+
+	mmio->Register(base | IPC_PPCCTRL,
+		MMIO::ComplexRead<u32>([](u32) {
+			return ctrl.ppc();
+		}),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			ctrl.ppc(val);
+			if (ctrl.X1)
+				WII_IPC_HLE_Interface::EnqueueRequest(ppc_msg);
+			WII_IPC_HLE_Interface::Update();
+			CoreTiming::ScheduleEvent(0, updateInterrupts, 0);
+		})
+	);
+
+	mmio->Register(base | IPC_ARMMSG,
+		MMIO::DirectRead<u32>(&arm_msg),
+		MMIO::InvalidWrite<u32>()
+	);
+
+	mmio->Register(base | PPC_IRQFLAG,
+		MMIO::InvalidRead<u32>(),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			ppc_irq_flags &= ~val;
+			WII_IPC_HLE_Interface::Update();
+			CoreTiming::ScheduleEvent(0, updateInterrupts, 0);
+		})
+	);
+
+	mmio->Register(base | PPC_IRQMASK,
+		MMIO::InvalidRead<u32>(),
+		MMIO::ComplexWrite<u32>([](u32, u32 val) {
+			ppc_irq_masks = val;
+			if (ppc_irq_masks & INT_CAUSE_IPC_BROADWAY) // wtf?
+				Reset();
+			WII_IPC_HLE_Interface::Update();
+			CoreTiming::ScheduleEvent(0, updateInterrupts, 0);
+		})
+	);
+
+	mmio->Register(base | GPIOB_OUT,
+		MMIO::Constant<u32>(0),
+		MMIO::DirectWrite<u32>(&sensorbar_power)
+	);
+
+	// Register some stubbed/unknown MMIOs required to make Wii games work.
+	mmio->Register(base | PPCSPEED, MMIO::InvalidRead<u32>(), MMIO::Nop<u32>());
+	mmio->Register(base | VISOLID, MMIO::InvalidRead<u32>(), MMIO::Nop<u32>());
+	mmio->Register(base | GPIOB_DIR, MMIO::Constant<u32>(0), MMIO::Nop<u32>());
+	mmio->Register(base | GPIOB_IN, MMIO::Constant<u32>(0), MMIO::Nop<u32>());
+	mmio->Register(base | UNK_180, MMIO::Constant<u32>(0), MMIO::Nop<u32>());
+	mmio->Register(base | UNK_1CC, MMIO::Constant<u32>(0), MMIO::Nop<u32>());
+	mmio->Register(base | UNK_1D0, MMIO::Constant<u32>(0), MMIO::Nop<u32>());
+}
+
+void UpdateInterrupts(u64 userdata, int cyclesLate)
+{
+	if ((ctrl.Y1 & ctrl.IY1) || (ctrl.Y2 & ctrl.IY2))
+	{
+		ppc_irq_flags |= INT_CAUSE_IPC_BROADWAY;
+	}
+
+	if ((ctrl.X1 & ctrl.IX1) || (ctrl.X2 & ctrl.IX2))
+	{
+		ppc_irq_flags |= INT_CAUSE_IPC_STARLET;
+	}
+
+	// Generate interrupt on PI if any of the devices behind starlet have an interrupt and mask is set
+	ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_WII_IPC, !!(ppc_irq_flags & ppc_irq_masks));
+}
+
+void GenerateAck(u32 _Address)
+{
+	arm_msg = _Address; // dunno if it's really set here, but HLE needs to stay in context
+	ctrl.Y2 = 1;
+	INFO_LOG(WII_IPC, "GenerateAck: %08x | %08x [R:%i A:%i E:%i]",
+		ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1);
+	CoreTiming::ScheduleEvent(0, updateInterrupts, 0);
+}
+
+void GenerateReply(u32 _Address)
+{
+	arm_msg = _Address;
+	ctrl.Y1 = 1;
+	INFO_LOG(WII_IPC, "GenerateReply: %08x | %08x [R:%i A:%i E:%i]",
+		ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1);
+	UpdateInterrupts();
+}
+
+bool IsReady()
+{
+	return ((ctrl.Y1 == 0) && (ctrl.Y2 == 0) && ((ppc_irq_flags & INT_CAUSE_IPC_BROADWAY) == 0));
+}
+
+}
diff --git a/Source/Core/Core/HW/WII_IPC.h b/Source/Core/Core/HW/WII_IPC.h
new file mode 100644
index 0000000000..463ee8960c
--- /dev/null
+++ b/Source/Core/Core/HW/WII_IPC.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+namespace WII_IPCInterface
+{
+
+enum StarletInterruptCause
+{
+	INT_CAUSE_TIMER         =    0x1,
+	INT_CAUSE_NAND          =    0x2,
+	INT_CAUSE_AES           =    0x4,
+	INT_CAUSE_SHA1          =    0x8,
+	INT_CAUSE_EHCI          =   0x10,
+	INT_CAUSE_OHCI0         =   0x20,
+	INT_CAUSE_OHCI1         =   0x40,
+	INT_CAUSE_SD            =   0x80,
+	INT_CAUSE_WIFI          =  0x100,
+
+	INT_CAUSE_GPIO_BROADWAY =  0x400,
+	INT_CAUSE_GPIO_STARLET  =  0x800,
+
+	INT_CAUSE_RST_BUTTON    = 0x40000,
+
+	INT_CAUSE_IPC_BROADWAY  = 0x40000000,
+	INT_CAUSE_IPC_STARLET   = 0x80000000
+};
+
+void Init();
+void Reset();
+void Shutdown();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+void UpdateInterrupts(u64 userdata = 0, int cyclesLate = 0);
+void GenerateAck(u32 _Address);
+void GenerateReply(u32 _Address);
+
+bool IsReady();
+
+}
diff --git a/Source/Core/Core/HW/WiiSaveCrypted.cpp b/Source/Core/Core/HW/WiiSaveCrypted.cpp
new file mode 100644
index 0000000000..beae07402d
--- /dev/null
+++ b/Source/Core/Core/HW/WiiSaveCrypted.cpp
@@ -0,0 +1,661 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Based off of tachtig/twintig http://git.infradead.org/?p=users/segher/wii.git
+// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
+// Licensed under the terms of the GNU GPL, version 2
+// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+#include <polarssl/aes.h>
+#include <polarssl/md5.h>
+#include <polarssl/sha1.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Common/Crypto/ec.h"
+
+#include "Core/HW/WiiSaveCrypted.h"
+
+static Common::replace_v replacements;
+
+const u8 CWiiSaveCrypted::s_sd_key[16] = {
+	0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08,
+	0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D
+};
+const u8 CWiiSaveCrypted::s_md5_blanker[16] = {
+	0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17,
+	0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93
+};
+const u32 CWiiSaveCrypted::s_ng_id = 0x0403AC68;
+
+bool CWiiSaveCrypted::ImportWiiSave(const std::string& filename)
+{
+	CWiiSaveCrypted save_file(filename);
+	return save_file.m_valid;
+}
+
+bool CWiiSaveCrypted::ExportWiiSave(u64 title_id)
+{
+	CWiiSaveCrypted export_save("", title_id);
+	if (export_save.m_valid)
+	{
+		SuccessAlertT("Successfully exported file to %s",
+			export_save.m_encrypted_save_path.c_str());
+	}
+	else
+	{
+		PanicAlertT("Export failed");
+	}
+	return export_save.m_valid;
+}
+
+void CWiiSaveCrypted::ExportAllSaves()
+{
+	std::string title_folder = File::GetUserPath(D_WIIROOT_IDX) + "/title";
+	std::vector<u64> titles;
+	const u32 path_mask = 0x00010000;
+	for (int i = 0; i < 8; ++i)
+	{
+		std::string folder = StringFromFormat("%s/%08x/", title_folder.c_str(), path_mask | i);
+		File::FSTEntry fst_tmp = File::ScanDirectoryTree(folder, false);
+
+		for (const File::FSTEntry& entry : fst_tmp.children)
+		{
+			if (entry.isDirectory)
+			{
+				u32 game_id;
+				if (AsciiToHex(entry.virtualName, game_id))
+				{
+					std::string banner_path =
+						StringFromFormat("%s%08x/data/banner.bin", folder.c_str(), game_id);
+					if (File::Exists(banner_path))
+					{
+						u64 title_id = (((u64)path_mask | i) << 32) | game_id;
+						titles.push_back(title_id);
+					}
+				}
+			}
+		}
+	}
+	SuccessAlertT("Found %u save files", (unsigned int)titles.size());
+	u32 success = 0;
+	for (const u64& title : titles)
+	{
+		CWiiSaveCrypted* export_save = new CWiiSaveCrypted("", title);
+		if (export_save->m_valid)
+			success++;
+		delete export_save;
+	}
+	SuccessAlertT("Sucessfully exported %u saves to %s", success,
+		(File::GetUserPath(D_USER_IDX) + "private/wii/title/").c_str());
+}
+
+CWiiSaveCrypted::CWiiSaveCrypted(const std::string& filename, u64 title_id)
+	: m_encrypted_save_path(filename), m_title_id(title_id)
+{
+	Common::ReadReplacements(replacements);
+	memcpy(m_sd_iv, "\x21\x67\x12\xE6\xAA\x1F\x68\x9F\x95\xC5\xA2\x23\x24\xDC\x6A\x98", 0x10);
+
+	if (!title_id) // Import
+	{
+		aes_setkey_dec(&m_aes_ctx, s_sd_key, 128);
+		m_valid = true;
+		ReadHDR();
+		ReadBKHDR();
+		ImportWiiSaveFiles();
+		// TODO: check_sig()
+		if (m_valid)
+		{
+			SuccessAlertT("Successfully imported save files");
+		}
+		else
+		{
+			PanicAlertT("Import failed");
+		}
+	}
+	else
+	{
+		aes_setkey_enc(&m_aes_ctx, s_sd_key, 128);
+
+		if (getPaths(true))
+		{
+			m_valid = true;
+			WriteHDR();
+			WriteBKHDR();
+			ExportWiiSaveFiles();
+			do_sig();
+		}
+	}
+}
+
+void CWiiSaveCrypted::ReadHDR()
+{
+	File::IOFile data_file(m_encrypted_save_path, "rb");
+	if (!data_file)
+	{
+		ERROR_LOG(CONSOLE, "Cannot open %s", m_encrypted_save_path.c_str());
+		m_valid = false;
+		return;
+	}
+	if (!data_file.ReadBytes(&m_encrypted_header, HEADER_SZ))
+	{
+		ERROR_LOG(CONSOLE, "Failed to read header");
+		m_valid = false;
+		return;
+	}
+	data_file.Close();
+
+	aes_crypt_cbc(&m_aes_ctx, AES_DECRYPT, HEADER_SZ, m_sd_iv, (const u8*)&m_encrypted_header,
+		(u8*)&m_header);
+	u32 banner_size = Common::swap32(m_header.hdr.BannerSize);
+	if ((banner_size < FULL_BNR_MIN) || (banner_size > FULL_BNR_MAX) ||
+		(((banner_size - BNR_SZ) % ICON_SZ) != 0))
+	{
+		ERROR_LOG(CONSOLE, "Not a Wii save or read failure for file header size %x", banner_size);
+		m_valid = false;
+		return;
+	}
+	m_title_id = Common::swap64(m_header.hdr.SaveGameTitle);
+
+
+	u8 md5_file[16];
+	u8 md5_calc[16];
+	memcpy(md5_file, m_header.hdr.Md5, 0x10);
+	memcpy(m_header.hdr.Md5, s_md5_blanker, 0x10);
+	md5((u8*)&m_header, HEADER_SZ, md5_calc);
+	if (memcmp(md5_file, md5_calc, 0x10))
+	{
+		ERROR_LOG(CONSOLE, "MD5 mismatch\n %016" PRIx64 "%016" PRIx64 " != %016" PRIx64 "%016" PRIx64,
+			Common::swap64(md5_file),Common::swap64(md5_file + 8), Common::swap64(md5_calc),
+			Common::swap64(md5_calc + 8));
+		m_valid= false;
+	}
+
+	if (!getPaths())
+	{
+		m_valid = false;
+		return;
+	}
+	std::string banner_file_path = m_wii_title_path + "banner.bin";
+	if (!File::Exists(banner_file_path) ||
+		AskYesNoT("%s already exists, overwrite?", banner_file_path.c_str()))
+	{
+		INFO_LOG(CONSOLE, "Creating file %s", banner_file_path.c_str());
+		File::IOFile banner_file(banner_file_path, "wb");
+		banner_file.WriteBytes(m_header.BNR, banner_size);
+	}
+}
+
+void CWiiSaveCrypted::WriteHDR()
+{
+	if (!m_valid) return;
+	memset(&m_header, 0, HEADER_SZ);
+
+	std::string banner_file_path = m_wii_title_path + "banner.bin";
+	u32 banner_size = static_cast<u32>(File::GetSize(banner_file_path));
+	m_header.hdr.BannerSize = Common::swap32(banner_size);
+
+	m_header.hdr.SaveGameTitle = Common::swap64(m_title_id);
+	memcpy(m_header.hdr.Md5, s_md5_blanker, 0x10);
+	m_header.hdr.Permissions = 0x3C;
+
+	File::IOFile banner_file(banner_file_path, "rb");
+	if (!banner_file.ReadBytes(m_header.BNR, banner_size))
+	{
+		ERROR_LOG(CONSOLE, "Failed to read banner.bin");
+		m_valid = false;
+		return;
+	}
+	// remove nocopy flag
+	m_header.BNR[7] &= ~1;
+
+	u8 md5_calc[16];
+	md5((u8*)&m_header, HEADER_SZ, md5_calc);
+	memcpy(m_header.hdr.Md5, md5_calc, 0x10);
+
+	aes_crypt_cbc(&m_aes_ctx, AES_ENCRYPT, HEADER_SZ, m_sd_iv, (const u8*)&m_header,
+		(u8*)&m_encrypted_header);
+
+	File::IOFile data_file(m_encrypted_save_path, "wb");
+	if (!data_file.WriteBytes(&m_encrypted_header, HEADER_SZ))
+	{
+		ERROR_LOG(CONSOLE, "Failed to write header for %s", m_encrypted_save_path.c_str());
+		m_valid = false;
+	}
+}
+
+
+
+void CWiiSaveCrypted::ReadBKHDR()
+{
+	if (!m_valid) return;
+
+	File::IOFile fpData_bin(m_encrypted_save_path, "rb");
+	if (!fpData_bin)
+	{
+		ERROR_LOG(CONSOLE, "Cannot open %s", m_encrypted_save_path.c_str());
+		m_valid = false;
+		return;
+	}
+	fpData_bin.Seek(HEADER_SZ, SEEK_SET);
+	if (!fpData_bin.ReadBytes(&m_bk_hdr, BK_SZ))
+	{
+		ERROR_LOG(CONSOLE, "Failed to read bk header");
+		m_valid = false;
+		return;
+	}
+	fpData_bin.Close();
+
+	if (m_bk_hdr.size  != Common::swap32(BK_LISTED_SZ) ||
+		m_bk_hdr.magic != Common::swap32(BK_HDR_MAGIC))
+	{
+		ERROR_LOG(CONSOLE, "Invalid Size(%x) or Magic word (%x)", m_bk_hdr.size, m_bk_hdr.magic);
+		m_valid = false;
+		return;
+	}
+
+	m_files_list_size = Common::swap32(m_bk_hdr.numberOfFiles);
+	m_size_of_files = Common::swap32(m_bk_hdr.sizeOfFiles);
+	m_total_size = Common::swap32(m_bk_hdr.totalSize);
+
+	if (m_size_of_files + FULL_CERT_SZ != m_total_size)
+	{
+		WARN_LOG(CONSOLE, "Size(%x) + cert(%x) does not equal totalsize(%x)", m_size_of_files,
+			FULL_CERT_SZ, m_total_size);
+	}
+	if (m_title_id != Common::swap64(m_bk_hdr.SaveGameTitle))
+	{
+		WARN_LOG(CONSOLE, "Encrypted title (%" PRIx64 ") does not match unencrypted title (%" PRIx64 ")",
+			m_title_id, Common::swap64(m_bk_hdr.SaveGameTitle));
+	}
+}
+
+void CWiiSaveCrypted::WriteBKHDR()
+{
+	if (!m_valid) return;
+	m_files_list_size = 0;
+	m_size_of_files = 0;
+
+	ScanForFiles(m_wii_title_path, m_files_list, &m_files_list_size, &m_size_of_files);
+	memset(&m_bk_hdr, 0, BK_SZ);
+	m_bk_hdr.size = Common::swap32(BK_LISTED_SZ);
+	m_bk_hdr.magic = Common::swap32(BK_HDR_MAGIC);
+	m_bk_hdr.NGid = s_ng_id;
+	m_bk_hdr.numberOfFiles = Common::swap32(m_files_list_size);
+	m_bk_hdr.sizeOfFiles = Common::swap32(m_size_of_files);
+	m_bk_hdr.totalSize = Common::swap32(m_size_of_files + FULL_CERT_SZ);
+	m_bk_hdr.SaveGameTitle = Common::swap64(m_title_id);
+
+	File::IOFile data_file(m_encrypted_save_path, "ab");
+	if (!data_file.WriteBytes(&m_bk_hdr, BK_SZ))
+	{
+		ERROR_LOG(CONSOLE, "Failed to write bkhdr");
+		m_valid = false;
+	}
+}
+
+void CWiiSaveCrypted::ImportWiiSaveFiles()
+{
+	if (!m_valid) return;
+
+	File::IOFile data_file(m_encrypted_save_path, "rb");
+	if (!data_file)
+	{
+		ERROR_LOG(CONSOLE, "Cannot open %s", m_encrypted_save_path.c_str());
+		m_valid = false;
+		return;
+	}
+
+	data_file.Seek(HEADER_SZ + BK_SZ, SEEK_SET);
+
+	FileHDR file_hdr_tmp;
+
+	for (u32 i = 0; i < m_files_list_size; ++i)
+	{
+		memset(&file_hdr_tmp, 0, FILE_HDR_SZ);
+		memset(m_iv, 0, 0x10);
+		u32 file_size = 0;
+
+		if (!data_file.ReadBytes(&file_hdr_tmp, FILE_HDR_SZ))
+		{
+			ERROR_LOG(CONSOLE, "Failed to read header for file %d", i);
+			m_valid = false;
+		}
+
+		if (Common::swap32(file_hdr_tmp.magic) != FILE_HDR_MAGIC)
+		{
+			ERROR_LOG(CONSOLE, "Bad File Header");
+			break;
+		}
+		else
+		{
+			std::string filename((char*)file_hdr_tmp.name);
+			for (const Common::replace_t& replacement : replacements)
+			{
+				for (size_t j = 0; (j = filename.find(replacement.first, j)) != filename.npos; ++j)
+					filename.replace(j, 1, replacement.second);
+			}
+
+			std::string file_path_full = m_wii_title_path + filename;
+			File::CreateFullPath(file_path_full);
+			if (file_hdr_tmp.type == 1)
+			{
+				file_size = Common::swap32(file_hdr_tmp.size);
+				u32 file_size_rounded = ROUND_UP(file_size, BLOCK_SZ);
+				std::vector<u8> file_data(file_size_rounded);
+				std::vector<u8> file_data_enc(file_size_rounded);
+
+				if (!data_file.ReadBytes(&file_data_enc[0], file_size_rounded))
+				{
+					ERROR_LOG(CONSOLE, "Failed to read data from file %d", i);
+					m_valid = false;
+					break;
+				}
+
+				memcpy(m_iv, file_hdr_tmp.IV, 0x10);
+				aes_crypt_cbc(&m_aes_ctx, AES_DECRYPT, file_size_rounded, m_iv,
+					(const u8*)&file_data_enc[0], &file_data[0]);
+
+				if (!File::Exists(file_path_full) ||
+					AskYesNoT("%s already exists, overwrite?", file_path_full.c_str()))
+				{
+					INFO_LOG(CONSOLE, "Creating file %s", file_path_full.c_str());
+
+					File::IOFile raw_save_file(file_path_full, "wb");
+					raw_save_file.WriteBytes(&file_data[0], file_size);
+				}
+			}
+		}
+	}
+}
+
+void CWiiSaveCrypted::ExportWiiSaveFiles()
+{
+	if (!m_valid) return;
+
+	for (u32 i = 0; i < m_files_list_size; i++)
+	{
+		FileHDR file_hdr_tmp;
+		std::string name;
+		memset(&file_hdr_tmp, 0, FILE_HDR_SZ);
+
+		u32 file_size = 0;
+		if (File::IsDirectory(m_files_list[i]))
+		{
+			file_hdr_tmp.type = 2;
+		}
+		else
+		{
+			file_size = static_cast<u32>(File::GetSize(m_files_list[i]));
+			file_hdr_tmp.type = 1;
+		}
+
+		u32 file_size_rounded = ROUND_UP(file_size, BLOCK_SZ);
+		file_hdr_tmp.magic = Common::swap32(FILE_HDR_MAGIC);
+		file_hdr_tmp.size = Common::swap32(file_size);
+		file_hdr_tmp.Permissions = 0x3c;
+
+		name = m_files_list[i].substr(m_wii_title_path.length() + 1);
+
+		for (const Common::replace_t& repl : replacements)
+		{
+			for (size_t j = 0; (j = name.find(repl.second, j)) != name.npos; ++j)
+			{
+				name.replace(j, repl.second.length(), 1, repl.first);
+			}
+		}
+
+		if (name.length() > 0x44)
+		{
+			ERROR_LOG(CONSOLE, "\"%s\" is too long for the filename, max length is 0x44 + \\0", name.c_str());
+			m_valid = false;
+			return;
+		}
+		strncpy((char *)file_hdr_tmp.name, name.c_str(), sizeof(file_hdr_tmp.name));
+
+		{
+		File::IOFile fpData_bin(m_encrypted_save_path, "ab");
+		fpData_bin.WriteBytes(&file_hdr_tmp, FILE_HDR_SZ);
+		}
+
+		if (file_hdr_tmp.type == 1)
+		{
+			if (file_size == 0)
+			{
+				ERROR_LOG(CONSOLE, "%s is a 0 byte file", m_files_list[i].c_str());
+				m_valid = false;
+				return;
+			}
+			File::IOFile raw_save_file(m_files_list[i], "rb");
+			if (!raw_save_file)
+			{
+				ERROR_LOG(CONSOLE, "%s failed to open", m_files_list[i].c_str());
+				m_valid = false;
+			}
+
+			std::vector<u8> file_data(file_size_rounded);
+			std::vector<u8> file_data_enc(file_size_rounded);
+
+			if (!raw_save_file.ReadBytes(&file_data[0], file_size))
+			{
+				ERROR_LOG(CONSOLE, "Failed to read data from file: %s",
+					m_files_list[i].c_str());
+				m_valid = false;
+			}
+
+			aes_crypt_cbc(&m_aes_ctx, AES_ENCRYPT, file_size_rounded,
+				file_hdr_tmp.IV, (const u8*)&file_data[0], &file_data_enc[0]);
+
+			File::IOFile fpData_bin(m_encrypted_save_path, "ab");
+			if (!fpData_bin.WriteBytes(&file_data_enc[0], file_size_rounded))
+			{
+				ERROR_LOG(CONSOLE, "Failed to write data to file: %s",
+					m_encrypted_save_path.c_str());
+			}
+		}
+	}
+}
+
+void CWiiSaveCrypted::do_sig()
+{
+	if (!m_valid) return;
+	u8 sig[0x40];
+	u8 ng_cert[0x180];
+	u8 ap_cert[0x180];
+	u8 hash[0x14];
+	u8 ap_priv[30];
+	u8 ap_sig[60];
+	char signer[64];
+	char name[64];
+	u32 data_size;
+
+	const u32 ng_key_id = 0x6AAB8C59;
+
+	const u8 ng_priv[30] = {
+		0, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70,
+		0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2
+	};
+
+	const u8 ng_sig[0x3C] = {
+		0, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00,
+		0x71, 0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37,
+		0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC,
+		0x05, 0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8
+	};
+
+	sprintf(signer, "Root-CA00000001-MS00000002");
+	sprintf(name, "NG%08x", s_ng_id);
+	make_ec_cert(ng_cert, ng_sig, signer, name, ng_priv, ng_key_id);
+
+
+	memset(ap_priv, 0, sizeof ap_priv);
+	ap_priv[10] = 1;
+
+	memset(ap_sig, 81, sizeof ap_sig); // temp
+
+	sprintf(signer, "Root-CA00000001-MS00000002-NG%08x", s_ng_id);
+	sprintf(name, "AP%08x%08x", 1, 2);
+	make_ec_cert(ap_cert, ap_sig, signer, name, ap_priv, 0);
+
+	sha1(ap_cert + 0x80, 0x100, hash);
+	generate_ecdsa(ap_sig, ap_sig + 30, ng_priv, hash);
+	make_ec_cert(ap_cert, ap_sig, signer, name, ap_priv, 0);
+
+	data_size = Common::swap32(m_bk_hdr.sizeOfFiles) + 0x80;
+
+	File::IOFile data_file(m_encrypted_save_path, "rb");
+	if (!data_file)
+	{
+		m_valid = false;
+		return;
+	}
+	auto data = std::make_unique<u8[]>(data_size);
+
+	data_file.Seek(0xf0c0, SEEK_SET);
+	if (!data_file.ReadBytes(data.get(), data_size))
+	{
+		m_valid = false;
+		return;
+	}
+
+	sha1(data.get(), data_size, hash);
+	sha1(hash, 20, hash);
+
+	data_file.Open(m_encrypted_save_path, "ab");
+	if (!data_file)
+	{
+		m_valid = false;
+		return;
+	}
+	generate_ecdsa(sig, sig + 30, ap_priv, hash);
+	*(u32*)(sig + 60) = Common::swap32(0x2f536969);
+
+	data_file.WriteArray(sig, sizeof(sig));
+	data_file.WriteArray(ng_cert, sizeof(ng_cert));
+	data_file.WriteArray(ap_cert, sizeof(ap_cert));
+
+	m_valid = data_file.IsGood();
+}
+
+void CWiiSaveCrypted::make_ec_cert(u8 *cert, const u8 *sig, const char *signer, const char *name,
+	const u8 *priv, const u32 key_id)
+{
+	memset(cert, 0, 0x180);
+	*(u32*)cert = Common::swap32(0x10002);
+
+	memcpy(cert + 4, sig, 60);
+	strcpy((char*)cert + 0x80, signer);
+	*(u32*)(cert + 0xc0) = Common::swap32(2);
+	strcpy((char*)cert + 0xc4, name);
+	*(u32*)(cert + 0x104) = Common::swap32(key_id);
+	ec_priv_to_pub(priv, cert + 0x108);
+}
+
+bool CWiiSaveCrypted::getPaths(bool for_export)
+{
+	if (m_title_id)
+	{
+		m_wii_title_path = Common::GetTitleDataPath(m_title_id);
+	}
+
+	if (for_export)
+	{
+		char game_id[5];
+		sprintf(game_id, "%c%c%c%c",
+			(u8)(m_title_id >> 24) & 0xFF, (u8)(m_title_id >> 16) & 0xFF,
+			(u8)(m_title_id >> 8) & 0xFF, (u8)m_title_id & 0xFF);
+
+		if (!File::IsDirectory(m_wii_title_path))
+		{
+			m_valid = false;
+			ERROR_LOG(CONSOLE, "No save folder found for title %s", game_id);
+			return false;
+		}
+
+		if (!File::Exists(m_wii_title_path + "banner.bin"))
+		{
+			m_valid = false;
+			ERROR_LOG(CONSOLE, "No banner file found for title  %s", game_id);
+			return false;
+		}
+		if (m_encrypted_save_path.length() == 0)
+		{
+			// If no path was passed, use User folder
+			m_encrypted_save_path = File::GetUserPath(D_USER_IDX);
+		}
+		m_encrypted_save_path += StringFromFormat("private/wii/title/%s/data.bin", game_id);
+		File::CreateFullPath(m_encrypted_save_path);
+	}
+	else
+	{
+		File::CreateFullPath(m_wii_title_path);
+		if (!AskYesNoT(
+			"Warning! it is advised to backup all files in the folder:\n%s\nDo you wish to continue?",
+			m_wii_title_path.c_str()))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+void CWiiSaveCrypted::ScanForFiles(const std::string& save_directory, std::vector<std::string>& file_list,
+	u32 *num_files, u32 *size_files)
+{
+	std::vector<std::string> directories;
+	directories.push_back(save_directory);
+	u32 num = 0;
+	u32 size = 0;
+
+	for (u32 i = 0; i < directories.size(); ++i)
+	{
+		if (i != 0)
+		{
+			// add dir to fst
+			file_list.push_back(directories[i]);
+		}
+
+		File::FSTEntry fst_tmp = File::ScanDirectoryTree(directories[i], false);
+		for (const File::FSTEntry& elem : fst_tmp.children)
+		{
+			if (elem.virtualName != "banner.bin")
+			{
+				num++;
+				size += FILE_HDR_SZ;
+				if (elem.isDirectory)
+				{
+					if (elem.virtualName == "nocopy" || elem.virtualName == "nomove")
+					{
+						NOTICE_LOG(CONSOLE,
+							"This save will likely require homebrew tools to copy to a real Wii.");
+					}
+
+					directories.push_back(elem.physicalName);
+				}
+				else
+				{
+					file_list.push_back(elem.physicalName);
+					size += ROUND_UP(elem.size, BLOCK_SZ);
+				}
+			}
+		}
+	}
+
+	*num_files = num;
+	*size_files = size;
+}
+
+CWiiSaveCrypted::~CWiiSaveCrypted()
+{
+}
diff --git a/Source/Core/Core/HW/WiiSaveCrypted.h b/Source/Core/Core/HW/WiiSaveCrypted.h
new file mode 100644
index 0000000000..60d038adf4
--- /dev/null
+++ b/Source/Core/Core/HW/WiiSaveCrypted.h
@@ -0,0 +1,133 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <polarssl/aes.h>
+
+#include "Common/CommonTypes.h"
+
+class CWiiSaveCrypted
+{
+public:
+	bool static ImportWiiSave(const std::string& filename);
+	bool static ExportWiiSave(u64 title_id);
+	void static ExportAllSaves();
+
+private:
+	CWiiSaveCrypted(const std::string& filename, u64 title_id = 0);
+	~CWiiSaveCrypted();
+	void ReadHDR();
+	void ReadBKHDR();
+	void WriteHDR();
+	void WriteBKHDR();
+	void Extract(){}
+	void ImportWiiSaveFiles();
+	void ExportWiiSaveFiles();
+	void do_sig();
+	void make_ec_cert(u8 *cert, const u8 *sig, const char *signer, const char *name,
+		const u8 *priv, const u32 key_id);
+	bool getPaths(bool for_export = false);
+	void ScanForFiles(const std::string& save_directory, std::vector<std::string>& file_list,
+		u32 *num_files, u32 *size_files);
+
+	static const u8 s_sd_key[16];
+	static const u8 s_md5_blanker[16];
+	static const u32 s_ng_id;
+
+	aes_context m_aes_ctx;
+	u8 m_sd_iv[0x10];
+	std::vector<std::string> m_files_list;
+
+	std::string m_encrypted_save_path;
+
+	std::string m_wii_title_path;
+
+	u8  m_iv[0x10];
+
+	u32 m_files_list_size;
+	u32 m_size_of_files;
+	u32 m_total_size;
+
+	u64 m_title_id;
+
+	bool m_valid;
+
+	enum
+	{
+		BLOCK_SZ       = 0x40,
+		HDR_SZ         = 0x20,
+		ICON_SZ        = 0x1200,
+		BNR_SZ         = 0x60a0,
+		FULL_BNR_MIN   = 0x72a0, // BNR_SZ + 1*ICON_SZ
+		FULL_BNR_MAX   = 0xF0A0, // BNR_SZ + 8*ICON_SZ
+		HEADER_SZ      = 0xF0C0, // HDR_SZ + FULL_BNR_MAX
+		BK_LISTED_SZ   = 0x70,   // Size before rounding to nearest block
+		BK_SZ          = 0x80,
+		FILE_HDR_SZ    = 0x80,
+
+		SIG_SZ         = 0x40,
+		NG_CERT_SZ     = 0x180,
+		AP_CERT_SZ     = 0x180,
+		FULL_CERT_SZ   = 0x3C0,  // SIG_SZ + NG_CERT_SZ + AP_CERT_SZ + 0x80?
+
+		BK_HDR_MAGIC   = 0x426B0001,
+		FILE_HDR_MAGIC = 0x03adf17e
+	};
+
+#pragma pack(push,1)
+
+	struct Data_Bin_HDR // encrypted
+	{
+		u64 SaveGameTitle;
+		u32 BannerSize; // (0x72A0 or 0xF0A0, also seen 0xBAA0)
+		u8 Permissions;
+		u8 unk1; // maybe permissions is a be16
+		u8 Md5[0x10]; // md5 of plaintext header with md5 blanker applied
+		u16 unk2;
+	};
+
+	struct HEADER
+	{
+		Data_Bin_HDR hdr;
+		u8 BNR[FULL_BNR_MAX];
+	};
+
+	struct BK_Header // Not encrypted
+	{
+		u32 size;   // 0x00000070
+		// u16 magic;  // 'Bk'
+		// u16 magic2; // or version (0x0001)
+		u32 magic;  // 0x426B0001
+		u32 NGid;
+		u32 numberOfFiles;
+		u32 sizeOfFiles;
+		u32 unk1;
+		u32 unk2;
+		u32 totalSize;
+		u8 unk3[64];
+		u64 SaveGameTitle;
+		u8 MACaddress[6];
+		u8 padding[0x12];
+	};
+
+	struct FileHDR // encrypted
+	{
+		u32 magic; //0x03adf17e
+		u32 size;
+		u8 Permissions;
+		u8 attrib;
+		u8 type; // (1=file, 2=directory)
+		u8 name[0x45];
+		u8 IV[0x10];
+		u8 unk[0x20];
+	};
+#pragma pack(pop)
+
+	HEADER m_header;
+	HEADER m_encrypted_header;
+	BK_Header m_bk_hdr;
+};
diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp
new file mode 100644
index 0000000000..378cc6f52f
--- /dev/null
+++ b/Source/Core/Core/HW/Wiimote.cpp
@@ -0,0 +1,177 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Movie.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+#include "InputCommon/InputConfig.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+namespace Wiimote
+{
+
+static InputConfig s_config(WIIMOTE_INI_NAME, _trans("Wiimote"), "Wiimote");
+
+InputConfig* GetConfig()
+{
+	return &s_config;
+}
+
+void Shutdown()
+{
+	for (const ControllerEmu* i : s_config.controllers)
+	{
+		delete i;
+	}
+	s_config.controllers.clear();
+
+	WiimoteReal::Stop();
+
+	g_controller_interface.Shutdown();
+}
+
+// if plugin isn't initialized, init and load config
+void Initialize(void* const hwnd, bool wait)
+{
+	// add 4 Wiimotes
+	if (s_config.controllers.empty())
+		for (unsigned int i = WIIMOTE_CHAN_0; i < MAX_BBMOTES; ++i)
+			s_config.controllers.push_back(new WiimoteEmu::Wiimote(i));
+
+	g_controller_interface.Initialize(hwnd);
+
+	s_config.LoadConfig(false);
+
+	WiimoteReal::Initialize(wait);
+
+	// reload Wiimotes with our settings
+	if (Movie::IsMovieActive())
+		Movie::ChangeWiiPads();
+}
+
+void LoadConfig()
+{
+	s_config.LoadConfig(false);
+}
+
+
+void Resume()
+{
+	WiimoteReal::Resume();
+}
+
+void Pause()
+{
+	WiimoteReal::Pause();
+}
+
+
+// __________________________________________________________________________________________________
+// Function: ControlChannel
+// Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
+//           on the HID CONTROL channel.
+//
+// Inputs:   _number    [Description needed]
+//           _channelID [Description needed]
+//           _pData     [Description needed]
+//           _Size      [Description needed]
+//
+// Output:   none
+//
+void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
+{
+	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
+		((WiimoteEmu::Wiimote*)s_config.controllers[_number])->ControlChannel(_channelID, _pData, _Size);
+}
+
+// __________________________________________________________________________________________________
+// Function: InterruptChannel
+// Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
+//           on the HID INTERRUPT channel.
+//
+// Inputs:   _number    [Description needed]
+//           _channelID [Description needed]
+//           _pData     [Description needed]
+//           _Size      [Description needed]
+//
+// Output:   none
+//
+void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
+{
+	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
+		((WiimoteEmu::Wiimote*)s_config.controllers[_number])->InterruptChannel(_channelID, _pData, _Size);
+}
+
+// __________________________________________________________________________________________________
+// Function: Update
+// Purpose:  This function is called periodically by the Core. // TODO: Explain why.
+// input:    _number: [Description needed]
+// output:   none
+//
+void Update(int _number)
+{
+	//PanicAlert( "Wiimote_Update" );
+
+	// if we are on the next input cycle, update output and input
+	static int _last_number = 4;
+	if (_number <= _last_number)
+	{
+		g_controller_interface.UpdateInput();
+	}
+	_last_number = _number;
+
+	if (WIIMOTE_SRC_EMU & g_wiimote_sources[_number])
+		((WiimoteEmu::Wiimote*)s_config.controllers[_number])->Update();
+	else
+		WiimoteReal::Update(_number);
+}
+
+// __________________________________________________________________________________________________
+// Function: GetAttached
+// Purpose:  Get mask of attached pads (eg: controller 1 & 4 -> 0x9)
+// input:    none
+// output:   The number of attached pads
+//
+unsigned int GetAttached()
+{
+	unsigned int attached = 0;
+	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
+		if (g_wiimote_sources[i])
+			attached |= (1 << i);
+	return attached;
+}
+
+// ___________________________________________________________________________
+// Function: DoState
+// Purpose:  Saves/load state
+// input/output: ptr: [Description Needed]
+// input: mode        [Description needed]
+//
+void DoState(u8 **ptr, PointerWrap::Mode mode)
+{
+	// TODO:
+
+	PointerWrap p(ptr, mode);
+	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
+		((WiimoteEmu::Wiimote*)s_config.controllers[i])->DoState(p);
+}
+
+// ___________________________________________________________________________
+// Function: EmuStateChange
+// Purpose: Notifies the plugin of a change in emulation state
+// input:    newState - The new state for the Wiimote to change to.
+// output:   none
+//
+void EmuStateChange(EMUSTATE_CHANGE newState)
+{
+	// TODO
+	WiimoteReal::StateChange(newState);
+}
+
+}
diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h
new file mode 100644
index 0000000000..4d64f902b3
--- /dev/null
+++ b/Source/Core/Core/HW/Wiimote.h
@@ -0,0 +1,67 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/ChunkFile.h"
+
+class InputConfig;
+
+enum
+{
+	WIIMOTE_CHAN_0 = 0,
+	WIIMOTE_CHAN_1,
+	WIIMOTE_CHAN_2,
+	WIIMOTE_CHAN_3,
+	WIIMOTE_BALANCE_BOARD,
+	MAX_WIIMOTES = WIIMOTE_BALANCE_BOARD,
+	MAX_BBMOTES = 5,
+};
+
+
+#define WIIMOTE_INI_NAME  "WiimoteNew"
+
+enum
+{
+	WIIMOTE_SRC_NONE   = 0,
+	WIIMOTE_SRC_EMU    = 1,
+	WIIMOTE_SRC_REAL   = 2,
+	WIIMOTE_SRC_HYBRID = 3, // emu + real
+};
+
+extern unsigned int g_wiimote_sources[MAX_BBMOTES];
+
+namespace Wiimote
+{
+
+void Shutdown();
+void Initialize(void* const hwnd, bool wait = false);
+void LoadConfig();
+void Resume();
+void Pause();
+
+unsigned int GetAttached();
+void DoState(u8 **ptr, PointerWrap::Mode mode);
+void EmuStateChange(EMUSTATE_CHANGE newState);
+InputConfig* GetConfig();
+
+void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
+void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
+void Update(int _number);
+
+}
+
+namespace WiimoteReal
+{
+
+void Initialize(bool wait = false);
+void Stop();
+void Shutdown();
+void Resume();
+void Pause();
+void Refresh();
+
+void LoadSettings();
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
new file mode 100644
index 0000000000..9049af9603
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
@@ -0,0 +1,52 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+// TODO: Move to header when VS supports constexpr.
+const ControlState Attachment::DEFAULT_ATTACHMENT_STICK_RADIUS = 1.0f;
+
+// Extension device IDs to be written to the last bytes of the extension reg
+// The id for nothing inserted
+static const u8 nothing_id[] = { 0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e };
+// The id for a partially inserted extension (currently unused)
+UNUSED static const u8 partially_id[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff };
+
+Attachment::Attachment(const char* const _name, WiimoteEmu::ExtensionReg& _reg)
+	: name(_name), reg(_reg)
+{
+	memset(id, 0, sizeof(id));
+	memset(calibration, 0, sizeof(calibration));
+}
+
+None::None(WiimoteEmu::ExtensionReg& _reg) : Attachment("None", _reg)
+{
+	// set up register
+	memcpy(&id, nothing_id, sizeof(nothing_id));
+}
+
+std::string Attachment::GetName() const
+{
+	return name;
+}
+
+void Attachment::Reset()
+{
+	// set up register
+	memset(&reg, 0, WIIMOTE_REG_EXT_SIZE);
+	memcpy(&reg.constant_id, id, sizeof(id));
+	memcpy(&reg.calibration, calibration, sizeof(calibration));
+}
+
+}
+
+void ControllerEmu::Extension::GetState(u8* const data)
+{
+	((WiimoteEmu::Attachment*)attachments[active_extension].get())->GetState(data);
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
new file mode 100644
index 0000000000..f5c0afe6cc
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
@@ -0,0 +1,42 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "InputCommon/ControllerEmu.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Attachment : public ControllerEmu
+{
+public:
+	Attachment(const char* const _name, WiimoteEmu::ExtensionReg& _reg);
+
+	virtual void GetState(u8* const data) {}
+	void Reset();
+	std::string GetName() const override;
+
+	const char* const         name;
+	WiimoteEmu::ExtensionReg& reg;
+
+	u8 id[6];
+	u8 calibration[0x10];
+
+protected:
+	// TODO: Make constexpr when VS supports it.
+	//
+	// Default radius for attachment analog sticks.
+	static const ControlState DEFAULT_ATTACHMENT_STICK_RADIUS;
+};
+
+class None : public Attachment
+{
+public:
+	None(WiimoteEmu::ExtensionReg& _reg);
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
new file mode 100644
index 0000000000..2c817366d7
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
@@ -0,0 +1,139 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
+
+namespace WiimoteEmu
+{
+
+static const u8 classic_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x01 };
+/* Classic Controller calibration */
+static const u8 classic_calibration[] =
+{
+	0xff, 0x00, 0x80, 0xff, 0x00, 0x80,
+	0xff, 0x00, 0x80, 0xff, 0x00, 0x80,
+	0x00, 0x00, 0x51, 0xa6
+};
+
+static const u16 classic_button_bitmasks[] =
+{
+	Classic::BUTTON_A,
+	Classic::BUTTON_B,
+	Classic::BUTTON_X,
+	Classic::BUTTON_Y,
+
+	Classic::BUTTON_ZL,
+	Classic::BUTTON_ZR,
+
+	Classic::BUTTON_MINUS,
+	Classic::BUTTON_PLUS,
+
+	Classic::BUTTON_HOME,
+};
+
+static const char* const classic_button_names[] =
+{
+	"A","B","X","Y","ZL","ZR","-","+","Home",
+};
+
+static const u16 classic_trigger_bitmasks[] =
+{
+	Classic::TRIGGER_L, Classic::TRIGGER_R,
+};
+
+static const char* const classic_trigger_names[] =
+{
+	"L", "R", "L-Analog", "R-Analog"
+};
+
+static const u16 classic_dpad_bitmasks[] =
+{
+	Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT
+};
+
+Classic::Classic(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Classic"), _reg)
+{
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	for (auto& classic_button_name : classic_button_names)
+		m_buttons->controls.emplace_back(new ControlGroup::Input(classic_button_name));
+
+	// sticks
+	groups.emplace_back(m_left_stick = new AnalogStick(_trans("Left Stick"), DEFAULT_ATTACHMENT_STICK_RADIUS));
+	groups.emplace_back(m_right_stick = new AnalogStick(_trans("Right Stick"), DEFAULT_ATTACHMENT_STICK_RADIUS));
+
+	// triggers
+	groups.emplace_back(m_triggers = new MixedTriggers("Triggers"));
+	for (auto& classic_trigger_name : classic_trigger_names)
+		m_triggers->controls.emplace_back(new ControlGroup::Input(classic_trigger_name));
+
+	// dpad
+	groups.emplace_back(m_dpad = new Buttons("D-Pad"));
+	for (auto& named_direction : named_directions)
+		m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction));
+
+	// set up register
+	// calibration
+	memcpy(&calibration, classic_calibration, sizeof(classic_calibration));
+	// id
+	memcpy(&id, classic_id, sizeof(classic_id));
+}
+
+void Classic::GetState(u8* const data)
+{
+	wm_classic_extension* const ccdata = (wm_classic_extension*)data;
+	ccdata->bt.hex = 0;
+
+	// not using calibration data, o well
+
+	// left stick
+	{
+	ControlState x, y;
+	m_left_stick->GetState(&x, &y);
+
+	ccdata->regular_data.lx = static_cast<u8>(Classic::LEFT_STICK_CENTER_X + (x * Classic::LEFT_STICK_RADIUS));
+	ccdata->regular_data.ly = static_cast<u8>(Classic::LEFT_STICK_CENTER_Y + (y * Classic::LEFT_STICK_RADIUS));
+	}
+
+	// right stick
+	{
+	ControlState x, y;
+	u8 x_, y_;
+	m_right_stick->GetState(&x, &y);
+
+	x_ = static_cast<u8>(Classic::RIGHT_STICK_CENTER_X + (x * Classic::RIGHT_STICK_RADIUS));
+	y_ = static_cast<u8>(Classic::RIGHT_STICK_CENTER_Y + (y * Classic::RIGHT_STICK_RADIUS));
+
+	ccdata->rx1 = x_;
+	ccdata->rx2 = x_ >> 1;
+	ccdata->rx3 = x_ >> 3;
+	ccdata->ry = y_;
+	}
+
+	//triggers
+	{
+	ControlState trigs[2] = { 0, 0 };
+	u8 lt, rt;
+	m_triggers->GetState(&ccdata->bt.hex, classic_trigger_bitmasks, trigs);
+
+	lt = static_cast<u8>(trigs[0] * Classic::LEFT_TRIGGER_RANGE);
+	rt = static_cast<u8>(trigs[1] * Classic::RIGHT_TRIGGER_RANGE);
+
+	ccdata->lt1 = lt;
+	ccdata->lt2 = lt >> 3;
+	ccdata->rt = rt;
+	}
+
+	// buttons
+	m_buttons->GetState(&ccdata->bt.hex, classic_button_bitmasks);
+	// dpad
+	m_dpad->GetState(&ccdata->bt.hex, classic_dpad_bitmasks);
+
+	// flip button bits
+	ccdata->bt.hex ^= 0xFFFF;
+}
+
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
new file mode 100644
index 0000000000..b812cb7f10
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
@@ -0,0 +1,59 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Classic : public Attachment
+{
+public:
+	Classic(WiimoteEmu::ExtensionReg& _reg);
+	void GetState(u8* const data) override;
+
+	enum
+	{
+		PAD_RIGHT    = 0x80,
+		PAD_DOWN     = 0x40,
+		TRIGGER_L    = 0x20,
+		BUTTON_MINUS = 0x10,
+		BUTTON_HOME  = 0x08,
+		BUTTON_PLUS  = 0x04,
+		TRIGGER_R    = 0x02,
+		NOTHING      = 0x01,
+		BUTTON_ZL    = 0x8000,
+		BUTTON_B     = 0x4000,
+		BUTTON_Y     = 0x2000,
+		BUTTON_A     = 0x1000,
+		BUTTON_X     = 0x0800,
+		BUTTON_ZR    = 0x0400,
+		PAD_LEFT     = 0x0200,
+		PAD_UP       = 0x0100,
+	};
+
+	static const u8 LEFT_STICK_CENTER_X = 0x20;
+	static const u8 LEFT_STICK_CENTER_Y = 0x20;
+	static const u8 LEFT_STICK_RADIUS = 0x1F;
+
+	static const u8 RIGHT_STICK_CENTER_X = 0x10;
+	static const u8 RIGHT_STICK_CENTER_Y = 0x10;
+	static const u8 RIGHT_STICK_RADIUS = 0x0F;
+
+	static const u8 LEFT_TRIGGER_RANGE = 0x1F;
+	static const u8 RIGHT_TRIGGER_RANGE = 0x1F;
+
+private:
+	Buttons*       m_buttons;
+	MixedTriggers* m_triggers;
+	Buttons*       m_dpad;
+	AnalogStick*   m_left_stick;
+	AnalogStick*   m_right_stick;
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
new file mode 100644
index 0000000000..331195cc5b
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
@@ -0,0 +1,84 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Drums.h"
+
+namespace WiimoteEmu
+{
+
+static const u8 drums_id[] = { 0x01, 0x00, 0xa4, 0x20, 0x01, 0x03 };
+
+static const u16 drum_pad_bitmasks[] =
+{
+	Drums::PAD_RED,
+	Drums::PAD_YELLOW,
+	Drums::PAD_BLUE,
+	Drums::PAD_GREEN,
+	Drums::PAD_ORANGE,
+	Drums::PAD_BASS,
+};
+
+static const char* const drum_pad_names[] =
+{
+	_trans("Red"), _trans("Yellow"), _trans("Blue"),
+	_trans("Green"), _trans("Orange"), _trans("Bass")
+};
+
+static const u16 drum_button_bitmasks[] =
+{
+	Drums::BUTTON_MINUS,
+	Drums::BUTTON_PLUS,
+};
+
+Drums::Drums(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Drums"), _reg)
+{
+	// pads
+	groups.emplace_back(m_pads = new Buttons(_trans("Pads")));
+	for (auto& drum_pad_name : drum_pad_names)
+		m_pads->controls.emplace_back(new ControlGroup::Input(drum_pad_name));
+
+	// stick
+	groups.emplace_back(m_stick = new AnalogStick("Stick", DEFAULT_ATTACHMENT_STICK_RADIUS));
+
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("-"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("+"));
+
+	// set up register
+	// id
+	memcpy(&id, drums_id, sizeof(drums_id));
+}
+
+void Drums::GetState(u8* const data)
+{
+	wm_drums_extension* const ddata = (wm_drums_extension*)data;
+	ddata->bt = 0;
+
+	// calibration data not figured out yet?
+
+	// stick
+	{
+	ControlState x, y;
+	m_stick->GetState(&x, &y);
+
+	ddata->sx = static_cast<u8>((x * 0x1F) + 0x20);
+	ddata->sy = static_cast<u8>((y * 0x1F) + 0x20);
+	}
+
+	// TODO: softness maybe
+	data[2] = 0xFF;
+	data[3] = 0xFF;
+
+	// buttons
+	m_buttons->GetState(&ddata->bt, drum_button_bitmasks);
+	// pads
+	m_pads->GetState(&ddata->bt, drum_pad_bitmasks);
+
+	// flip button bits
+	ddata->bt ^= 0xFFFF;
+}
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
new file mode 100644
index 0000000000..f4aefbd0d8
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
@@ -0,0 +1,39 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Drums : public Attachment
+{
+public:
+	Drums(WiimoteEmu::ExtensionReg& _reg);
+	void GetState(u8* const data) override;
+
+	enum
+	{
+		BUTTON_PLUS  = 0x04,
+		BUTTON_MINUS = 0x10,
+
+		PAD_BASS     = 0x0400,
+		PAD_BLUE     = 0x0800,
+		PAD_GREEN    = 0x1000,
+		PAD_YELLOW   = 0x2000,
+		PAD_RED      = 0x4000,
+		PAD_ORANGE   = 0x8000,
+	};
+
+private:
+	Buttons*     m_buttons;
+	Buttons*     m_pads;
+	AnalogStick* m_stick;
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
new file mode 100644
index 0000000000..ab1688d7d9
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
@@ -0,0 +1,103 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Guitar.h"
+
+namespace WiimoteEmu
+{
+
+static const u8 guitar_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x03 };
+
+static const u16 guitar_fret_bitmasks[] =
+{
+	Guitar::FRET_GREEN,
+	Guitar::FRET_RED,
+	Guitar::FRET_YELLOW,
+	Guitar::FRET_BLUE,
+	Guitar::FRET_ORANGE,
+};
+
+static const char* const guitar_fret_names[] =
+{
+	"Green","Red","Yellow","Blue","Orange",
+};
+
+static const u16 guitar_button_bitmasks[] =
+{
+	Guitar::BUTTON_MINUS,
+	Guitar::BUTTON_PLUS,
+};
+
+static const u16 guitar_strum_bitmasks[] =
+{
+	Guitar::BAR_UP,
+	Guitar::BAR_DOWN,
+};
+
+Guitar::Guitar(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Guitar"), _reg)
+{
+	// frets
+	groups.emplace_back(m_frets = new Buttons(_trans("Frets")));
+	for (auto& guitar_fret_name : guitar_fret_names)
+		m_frets->controls.emplace_back(new ControlGroup::Input(guitar_fret_name));
+
+	// strum
+	groups.emplace_back(m_strum = new Buttons(_trans("Strum")));
+	m_strum->controls.emplace_back(new ControlGroup::Input("Up"));
+	m_strum->controls.emplace_back(new ControlGroup::Input("Down"));
+
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("-"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("+"));
+
+	// stick
+	groups.emplace_back(m_stick = new AnalogStick(_trans("Stick"), DEFAULT_ATTACHMENT_STICK_RADIUS));
+
+	// whammy
+	groups.emplace_back(m_whammy = new Triggers(_trans("Whammy")));
+	m_whammy->controls.emplace_back(new ControlGroup::Input(_trans("Bar")));
+
+	// set up register
+	// id
+	memcpy(&id, guitar_id, sizeof(guitar_id));
+}
+
+void Guitar::GetState(u8* const data)
+{
+	wm_guitar_extension* const gdata = (wm_guitar_extension*)data;
+	gdata->bt = 0;
+
+	// calibration data not figured out yet?
+
+	// stick
+	{
+	ControlState x, y;
+	m_stick->GetState(&x, &y);
+
+	gdata->sx = static_cast<u8>((x * 0x1F) + 0x20);
+	gdata->sy = static_cast<u8>((y * 0x1F) + 0x20);
+	}
+
+	// TODO: touch bar, probably not
+	gdata->tb = 0x0F; // not touched
+
+	// whammy bar
+	ControlState whammy;
+	m_whammy->GetState(&whammy);
+	gdata->whammy = static_cast<u8>(whammy * 0x1F);
+
+	// buttons
+	m_buttons->GetState(&gdata->bt, guitar_button_bitmasks);
+	// frets
+	m_frets->GetState(&gdata->bt, guitar_fret_bitmasks);
+	// strum
+	m_strum->GetState(&gdata->bt, guitar_strum_bitmasks);
+
+	// flip button bits
+	gdata->bt ^= 0xFFFF;
+}
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
new file mode 100644
index 0000000000..994b548358
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
@@ -0,0 +1,42 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Guitar : public Attachment
+{
+public:
+	Guitar(WiimoteEmu::ExtensionReg& _reg);
+	void GetState(u8* const data) override;
+
+	enum
+	{
+		BUTTON_PLUS  = 0x04,
+		BUTTON_MINUS = 0x10,
+		BAR_DOWN     = 0x40,
+
+		BAR_UP       = 0x0100,
+		FRET_YELLOW  = 0x0800,
+		FRET_GREEN   = 0x1000,
+		FRET_BLUE    = 0x2000,
+		FRET_RED     = 0x4000,
+		FRET_ORANGE  = 0x8000,
+	};
+
+private:
+	Buttons*     m_buttons;
+	Buttons*     m_frets;
+	Buttons*     m_strum;
+	Triggers*    m_whammy;
+	AnalogStick* m_stick;
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
new file mode 100644
index 0000000000..3af7359897
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -0,0 +1,141 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
+
+namespace WiimoteEmu
+{
+
+static const u8 nunchuk_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x00, 0x00 };
+
+static const u8 nunchuk_button_bitmasks[] =
+{
+	Nunchuk::BUTTON_C,
+	Nunchuk::BUTTON_Z,
+};
+
+Nunchuk::Nunchuk(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Nunchuk"), _reg)
+{
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("C"));
+	m_buttons->controls.emplace_back(new ControlGroup::Input("Z"));
+
+	// stick
+	groups.emplace_back(m_stick = new AnalogStick("Stick", DEFAULT_ATTACHMENT_STICK_RADIUS));
+
+	// swing
+	groups.emplace_back(m_swing = new Force("Swing"));
+
+	// tilt
+	groups.emplace_back(m_tilt = new Tilt("Tilt"));
+
+	// shake
+	groups.emplace_back(m_shake = new Buttons("Shake"));
+	m_shake->controls.emplace_back(new ControlGroup::Input("X"));
+	m_shake->controls.emplace_back(new ControlGroup::Input("Y"));
+	m_shake->controls.emplace_back(new ControlGroup::Input("Z"));
+
+	// id
+	memcpy(&id, nunchuk_id, sizeof(nunchuk_id));
+
+	// this should get set to 0 on disconnect, but it isn't, o well
+	memset(m_shake_step, 0, sizeof(m_shake_step));
+}
+
+void Nunchuk::GetState(u8* const data)
+{
+	wm_nc* const ncdata = (wm_nc*)data;
+	ncdata->bt.hex = 0;
+
+	// stick
+	double jx, jy;
+	m_stick->GetState(&jx, &jy);
+
+	ncdata->jx = u8(STICK_CENTER + jx * STICK_RADIUS);
+	ncdata->jy = u8(STICK_CENTER + jy * STICK_RADIUS);
+
+	// Some terribly coded games check whether to move with a check like
+	//
+	//     if (x != 0 && y != 0)
+	//         do_movement(x, y);
+	//
+	// With keyboard controls, these games break if you simply hit
+	// of the axes. Adjust this if you're hitting one of the axes so that
+	// we slightly tweak the other axis.
+	if (ncdata->jx != STICK_CENTER || ncdata->jy != STICK_CENTER)
+	{
+		if (ncdata->jx == STICK_CENTER)
+			++ncdata->jx;
+		if (ncdata->jy == STICK_CENTER)
+			++ncdata->jy;
+	}
+
+	AccelData accel;
+
+	// tilt
+	EmulateTilt(&accel, m_tilt);
+
+	// swing
+	EmulateSwing(&accel, m_swing);
+	// shake
+	EmulateShake(&accel, m_shake, m_shake_step);
+	// buttons
+	m_buttons->GetState(&ncdata->bt.hex, nunchuk_button_bitmasks);
+
+	// flip the button bits :/
+	ncdata->bt.hex ^= 0x03;
+
+	// We now use 2 bits more precision, so multiply by 4 before converting to int
+	s16 accel_x = (s16)(4 * (accel.x * ACCEL_RANGE + ACCEL_ZERO_G));
+	s16 accel_y = (s16)(4 * (accel.y * ACCEL_RANGE + ACCEL_ZERO_G));
+	s16 accel_z = (s16)(4 * (accel.z * ACCEL_RANGE + ACCEL_ZERO_G));
+
+	if (accel_x > 1024)
+		accel_x = 1024;
+	else if (accel_x < 0)
+		accel_x = 0;
+	if (accel_y > 1024)
+		accel_y = 1024;
+	else if (accel_y < 0)
+		accel_y = 0;
+	if (accel_z > 1024)
+		accel_z = 1024;
+	else if (accel_z < 0)
+		accel_z = 0;
+
+	ncdata->ax = (accel_x >> 2) & 0xFF;
+	ncdata->ay = (accel_y >> 2) & 0xFF;
+	ncdata->az = (accel_z >> 2) & 0xFF;
+	ncdata->bt.acc_x_lsb = accel_x & 0x3;
+	ncdata->bt.acc_y_lsb = accel_y & 0x3;
+	ncdata->bt.acc_z_lsb = accel_z & 0x3;
+}
+
+void Nunchuk::LoadDefaults(const ControllerInterface& ciface)
+{
+	// ugly macroooo
+	#define set_control(group, num, str)  (group)->controls[num]->control_ref->expression = (str)
+
+	// Stick
+	set_control(m_stick, 0, "W"); // up
+	set_control(m_stick, 1, "S"); // down
+	set_control(m_stick, 2, "A"); // left
+	set_control(m_stick, 3, "D"); // right
+
+	// Buttons
+#ifdef _WIN32
+	set_control(m_buttons, 0, "LCONTROL");  // C
+	set_control(m_buttons, 1, "LSHIFT");    // Z
+#elif __APPLE__
+	set_control(m_buttons, 0, "Left Control"); // C
+	set_control(m_buttons, 1, "Left Shift");   // Z
+#else
+	set_control(m_buttons, 0, "Control_L"); // C
+	set_control(m_buttons, 1, "Shift_L");   // Z
+#endif
+}
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
new file mode 100644
index 0000000000..0f1e4d53bb
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
@@ -0,0 +1,54 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Nunchuk : public Attachment
+{
+public:
+	Nunchuk(WiimoteEmu::ExtensionReg& _reg);
+
+	virtual void GetState(u8* const data) override;
+
+	enum
+	{
+		BUTTON_C = 0x02,
+		BUTTON_Z = 0x01,
+	};
+
+	enum
+	{
+		ACCEL_ZERO_G = 0x80,
+		ACCEL_ONE_G = 0xB3,
+		ACCEL_RANGE = (ACCEL_ONE_G - ACCEL_ZERO_G),
+	};
+
+	enum
+	{
+		STICK_CENTER = 0x80,
+		STICK_RADIUS = 0x7F,
+	};
+
+	void LoadDefaults(const ControllerInterface& ciface) override;
+
+private:
+	Tilt*        m_tilt;
+	Force*       m_swing;
+
+	Buttons*     m_shake;
+
+	Buttons*     m_buttons;
+	AnalogStick* m_stick;
+
+	u8 m_shake_step[3];
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
new file mode 100644
index 0000000000..7246601bc3
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
@@ -0,0 +1,131 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Turntable.h"
+
+namespace WiimoteEmu
+{
+
+static const u8 turntable_id[] = {0x03, 0x00, 0xa4, 0x20, 0x01, 0x03};
+
+static const u16 turntable_button_bitmasks[] =
+{
+	Turntable::BUTTON_L_GREEN,
+	Turntable::BUTTON_L_RED,
+	Turntable::BUTTON_L_BLUE,
+	Turntable::BUTTON_R_GREEN,
+	Turntable::BUTTON_R_RED,
+	Turntable::BUTTON_R_BLUE,
+	Turntable::BUTTON_MINUS,
+	Turntable::BUTTON_PLUS,
+	Turntable::BUTTON_EUPHORIA,
+};
+
+static const char* const turntable_button_names[] =
+{
+	_trans("Green Left"), _trans("Red Left"), _trans("Blue Left"),
+	_trans("Green Right"), _trans("Red Right"), _trans("Blue Right"),
+	"-", "+", _trans("Euphoria"),
+};
+
+Turntable::Turntable(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Turntable"), _reg)
+{
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	for (auto& turntable_button_name : turntable_button_names)
+		m_buttons->controls.emplace_back(new ControlGroup::Input(turntable_button_name));
+
+	// turntables
+	groups.emplace_back(m_left_table = new Slider(_trans("Table Left")));
+	groups.emplace_back(m_right_table = new Slider(_trans("Table Right")));
+
+	// stick
+	groups.emplace_back(m_stick = new AnalogStick("Stick", DEFAULT_ATTACHMENT_STICK_RADIUS));
+
+	// effect dial
+	groups.emplace_back(m_effect_dial = new Triggers(_trans("Effect")));
+	m_effect_dial->controls.emplace_back(new ControlGroup::Input(_trans("Dial")));
+
+	// crossfade
+	groups.emplace_back(m_crossfade = new Slider(_trans("Crossfade")));
+
+	// set up register
+	// id
+	memcpy(&id, turntable_id, sizeof(turntable_id));
+}
+
+void Turntable::GetState(u8* const data)
+{
+	wm_turntable_extension* const ttdata = (wm_turntable_extension*)data;
+	ttdata->bt = 0;
+
+	// stick
+	{
+	ControlState x, y;
+	m_stick->GetState(&x, &y);
+
+	ttdata->sx = static_cast<u8>((x * 0x1F) + 0x20);
+	ttdata->sy = static_cast<u8>((y * 0x1F) + 0x20);
+	}
+
+	// left table
+	{
+	ControlState tt;
+	s8 tt_;
+	m_left_table->GetState(&tt);
+
+	tt_ = static_cast<s8>(tt * 0x1F);
+
+	ttdata->ltable1 = tt_;
+	ttdata->ltable2 = tt_ >> 5;
+	}
+
+	// right table
+	{
+	ControlState tt;
+	s8 tt_;
+	m_right_table->GetState(&tt);
+
+	tt_ = static_cast<s8>(tt * 0x1F);
+
+	ttdata->rtable1 = tt_;
+	ttdata->rtable2 = tt_ >> 1;
+	ttdata->rtable3 = tt_ >> 3;
+	ttdata->rtable4 = tt_ >> 5;
+	}
+
+	// effect dial
+	{
+	ControlState dial;
+	u8 dial_;
+	m_effect_dial->GetState(&dial);
+
+	dial_ = static_cast<u8>(dial * 0x0F);
+
+	ttdata->dial1 = dial_;
+	ttdata->dial2 = dial_ >> 3;
+	}
+
+	// crossfade slider
+	{
+	ControlState cfs;
+	m_crossfade->GetState(&cfs);
+
+	ttdata->slider = static_cast<u8>((cfs * 0x07) + 0x08);
+	}
+
+	// buttons
+	m_buttons->GetState(&ttdata->bt, turntable_button_bitmasks);
+
+	// flip button bits :/
+	ttdata->bt ^= (
+		BUTTON_L_GREEN | BUTTON_L_RED | BUTTON_L_BLUE |
+		BUTTON_R_GREEN | BUTTON_R_RED | BUTTON_R_BLUE |
+		BUTTON_MINUS | BUTTON_PLUS | BUTTON_EUPHORIA
+		);
+}
+
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
new file mode 100644
index 0000000000..590dc52b54
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
@@ -0,0 +1,45 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+
+namespace WiimoteEmu
+{
+
+struct ExtensionReg;
+
+class Turntable : public Attachment
+{
+public:
+	Turntable(WiimoteEmu::ExtensionReg& _reg);
+	void GetState(u8* const data) override;
+
+	enum
+	{
+		BUTTON_EUPHORIA = 0x1000,
+
+		BUTTON_L_GREEN  = 0x0800,
+		BUTTON_L_RED    = 0x20,
+		BUTTON_L_BLUE   = 0x8000,
+
+		BUTTON_R_GREEN  = 0x2000,
+		BUTTON_R_RED    = 0x02,
+		BUTTON_R_BLUE   = 0x0400,
+
+		BUTTON_MINUS    = 0x10,
+		BUTTON_PLUS     = 0x04,
+	};
+
+private:
+	Buttons*     m_buttons;
+	AnalogStick* m_stick;
+	Triggers*    m_effect_dial;
+	Slider*      m_left_table;
+	Slider*      m_right_table;
+	Slider*      m_crossfade;
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
new file mode 100644
index 0000000000..d075d8a192
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -0,0 +1,655 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+/* HID reports access guide. */
+
+/* 0x10 - 0x1a   Output   EmuMain.cpp: HidOutputReport()
+       0x10 - 0x14: General
+	   0x15: Status report request from the Wii
+	   0x16 and 0x17: Write and read memory or registers
+       0x19 and 0x1a: General
+   0x20 - 0x22   Input    EmuMain.cpp: HidOutputReport() to the destination
+       0x15 leads to a 0x20 Input report
+       0x17 leads to a 0x21 Input report
+	   0x10 - 0x1a leads to a 0x22 Input report
+   0x30 - 0x3f   Input    This file: Update() */
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+namespace WiimoteEmu
+{
+
+void Wiimote::ReportMode(const wm_report_mode* const dr)
+{
+	//INFO_LOG(WIIMOTE, "Set data report mode");
+	//DEBUG_LOG(WIIMOTE, "  Rumble: %x", dr->rumble);
+	//DEBUG_LOG(WIIMOTE, "  Continuous: %x", dr->continuous);
+	//DEBUG_LOG(WIIMOTE, "  All The Time: %x", dr->all_the_time);
+	//DEBUG_LOG(WIIMOTE, "  Mode: 0x%02x", dr->mode);
+
+	//m_reporting_auto = dr->all_the_time;
+	m_reporting_auto = dr->continuous;	// this right?
+	m_reporting_mode = dr->mode;
+	//m_reporting_channel = _channelID;	// this is set in every Interrupt/Control Channel now
+
+	// reset IR camera
+	//memset(m_reg_ir, 0, sizeof(*m_reg_ir));  //ugly hack
+
+	if (dr->mode > 0x37)
+		PanicAlert("Wiimote: Unsupported Reporting mode.");
+	else if (dr->mode < WM_REPORT_CORE)
+		PanicAlert("Wiimote: Reporting mode < 0x30.");
+}
+
+/* Here we process the Output Reports that the Wii sends. Our response will be
+   an Input Report back to the Wii. Input and Output is from the Wii's
+   perspective, Output means data to the Wiimote (from the Wii), Input means
+   data from the Wiimote.
+
+   The call browser:
+
+   1. Wiimote_InterruptChannel > InterruptChannel > HidOutputReport
+   2. Wiimote_ControlChannel > ControlChannel > HidOutputReport
+
+   The IR enable/disable and speaker enable/disable and mute/unmute values are
+		bit2: 0 = Disable (0x02), 1 = Enable (0x06)
+*/
+void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
+{
+	INFO_LOG(WIIMOTE, "HidOutputReport (page: %i, cid: 0x%02x, wm: 0x%02x)", m_index, m_reporting_channel, sr->wm);
+
+	// WiiBrew:
+	// In every single Output Report, bit 0 (0x01) of the first byte controls the Rumble feature.
+	m_rumble_on = sr->rumble;
+
+	switch (sr->wm)
+	{
+	case WM_RUMBLE : // 0x10
+		// this is handled above
+		return;	// no ack
+		break;
+
+	case WM_LEDS : // 0x11
+		//INFO_LOG(WIIMOTE, "Set LEDs: 0x%02x", sr->data[0]);
+		m_status.leds = sr->data[0] >> 4;
+		break;
+
+	case WM_REPORT_MODE :  // 0x12
+		ReportMode((wm_report_mode*)sr->data);
+		break;
+
+	case WM_IR_PIXEL_CLOCK : // 0x13
+		//INFO_LOG(WIIMOTE, "WM IR Clock: 0x%02x", sr->data[0]);
+		//m_ir_clock = sr->enable;
+		if (false == sr->ack)
+			return;
+		break;
+
+	case WM_SPEAKER_ENABLE : // 0x14
+		//ERROR_LOG(WIIMOTE, "WM Speaker Enable: %02x", sr->enable);
+		//PanicAlert( "WM Speaker Enable: %d", sr->data[0] );
+		m_status.speaker = sr->enable;
+		if (false == sr->ack)
+			return;
+		break;
+
+	case WM_REQUEST_STATUS : // 0x15
+		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
+			RequestStatus((wm_request_status*)sr->data);
+		return;	// sends its own ack
+		break;
+
+	case WM_WRITE_DATA : // 0x16
+		WriteData((wm_write_data*)sr->data);
+		break;
+
+	case WM_READ_DATA : // 0x17
+		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
+			ReadData((wm_read_data*)sr->data);
+		return;	// sends its own ack
+		break;
+
+	case WM_WRITE_SPEAKER_DATA : // 0x18
+		//wm_speaker_data *spkz = (wm_speaker_data*)sr->data;
+		//ERROR_LOG(WIIMOTE, "WM_WRITE_SPEAKER_DATA len:%x %s", spkz->length,
+		//	ArrayToString(spkz->data, spkz->length, 100, false).c_str());
+		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index] && !m_speaker_mute)
+			Wiimote::SpeakerData((wm_speaker_data*) sr->data);
+		return;	// no ack
+		break;
+
+	case WM_SPEAKER_MUTE : // 0x19
+		//ERROR_LOG(WIIMOTE, "WM Speaker Mute: %02x", sr->enable);
+		//PanicAlert( "WM Speaker Mute: %d", sr->data[0] & 0x04 );
+		// testing
+		//if (sr->data[0] & 0x04)
+		//	memset(&m_channel_status, 0, sizeof(m_channel_status));
+		m_speaker_mute = sr->enable;
+		if (false == sr->ack)
+			return;
+		break;
+
+	case WM_IR_LOGIC: // 0x1a
+		// comment from old plugin:
+		// This enables or disables the IR lights, we update the global variable g_IR
+		// so that WmRequestStatus() knows about it
+		//INFO_LOG(WIIMOTE, "WM IR Enable: 0x%02x", sr->data[0]);
+		m_status.ir = sr->enable;
+		if (false == sr->ack)
+			return;
+		break;
+
+	default:
+		PanicAlert("HidOutputReport: Unknown channel 0x%02x", sr->wm);
+		return; // no ack
+		break;
+	}
+
+	// send ack
+	if (send_ack && WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
+		SendAck(sr->wm);
+}
+
+/* This will generate the 0x22 acknowledgement for most Input reports.
+   It has the form of "a1 22 00 00 _reportID 00".
+   The first two bytes are the core buttons data,
+   00 00 means nothing is pressed.
+   The last byte is the success code 00. */
+void Wiimote::SendAck(u8 _reportID)
+{
+	u8 data[6];
+
+	data[0] = 0xA1;
+	data[1] = WM_ACK_DATA;
+
+	wm_acknowledge* const ack = (wm_acknowledge*)(data + 2);
+
+	ack->buttons = m_status.buttons;
+	ack->reportID = _reportID;
+	ack->errorID = 0;
+
+	Core::Callback_WiimoteInterruptChannel( m_index, m_reporting_channel, data, sizeof(data));
+}
+
+void Wiimote::HandleExtensionSwap()
+{
+	// handle switch extension
+	if (m_extension->active_extension != m_extension->switch_extension)
+	{
+		// if an extension is currently connected and we want to switch to a different extension
+		if ((m_extension->active_extension > 0) && m_extension->switch_extension)
+			// detach extension first, wait til next Update() or RequestStatus() call to change to the new extension
+			m_extension->active_extension = 0;
+		else
+			// set the wanted extension
+			m_extension->active_extension = m_extension->switch_extension;
+
+		// reset register
+		((WiimoteEmu::Attachment*)m_extension->attachments[m_extension->active_extension].get())->Reset();
+	}
+}
+
+// old comment
+/* Here we produce a 0x20 status report to send to the Wii. We currently ignore
+   the status request rs and all its eventual instructions it may include (for
+   example turn off rumble or something else) and just send the status
+   report. */
+void Wiimote::RequestStatus(const wm_request_status* const rs)
+{
+	HandleExtensionSwap();
+
+	// update status struct
+	m_status.extension = (m_extension->active_extension || m_motion_plus_active) ? 1 : 0;
+
+	// set up report
+	u8 data[8];
+	data[0] = 0xA1;
+	data[1] = WM_STATUS_REPORT;
+
+	// status values
+	*(wm_status_report*)(data + 2) = m_status;
+
+	// hybrid Wiimote stuff
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
+	{
+		using namespace WiimoteReal;
+
+		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
+
+		if (g_wiimotes[m_index])
+		{
+			wm_request_status rpt = {};
+			g_wiimotes[m_index]->QueueReport(WM_REQUEST_STATUS, &rpt, sizeof(rpt));
+		}
+
+		return;
+	}
+
+	// send report
+	Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
+}
+
+/* Write data to Wiimote and Extensions registers. */
+void Wiimote::WriteData(const wm_write_data* const wd)
+{
+	u32 address = Common::swap24(wd->address);
+
+	// ignore the 0x010000 bit
+	address &= ~0x010000;
+
+	if (wd->size > 16)
+	{
+		PanicAlert("WriteData: size is > 16 bytes");
+		return;
+	}
+
+	switch (wd->space)
+	{
+	case WM_SPACE_EEPROM :
+		{
+			// Write to EEPROM
+
+			if (address + wd->size > WIIMOTE_EEPROM_SIZE)
+			{
+				ERROR_LOG(WIIMOTE, "WriteData: address + size out of bounds!");
+				PanicAlert("WriteData: address + size out of bounds!");
+				return;
+			}
+			memcpy(m_eeprom + address, wd->data, wd->size);
+
+			// write mii data to file
+			// i need to improve this greatly
+			if (address >= 0x0FCA && address < 0x12C0)
+			{
+				// writing the whole mii block each write :/
+				std::ofstream file;
+				OpenFStream(file, File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/mii.bin", std::ios::binary | std::ios::out);
+				file.write((char*)m_eeprom + 0x0FCA, 0x02f0);
+				file.close();
+			}
+		}
+		break;
+
+	case WM_SPACE_REGS1 :
+	case WM_SPACE_REGS2 :
+		{
+			// Write to Control Register
+
+			// ignore second byte for extension area
+			if (0xA4 == (address >> 16))
+				address &= 0xFF00FF;
+
+			const u8 region_offset = (u8)address;
+			void *region_ptr = nullptr;
+			int region_size = 0;
+
+			switch (address >> 16)
+			{
+			// speaker
+			case 0xa2 :
+				region_ptr = &m_reg_speaker;
+				region_size = WIIMOTE_REG_SPEAKER_SIZE;
+				break;
+
+			// extension register
+			case 0xa4 :
+				region_ptr = m_motion_plus_active ? (void*)&m_reg_motion_plus : (void*)&m_reg_ext;
+				region_size = WIIMOTE_REG_EXT_SIZE;
+				break;
+
+			// motion plus
+			case 0xa6 :
+				if (false == m_motion_plus_active)
+				{
+					region_ptr = &m_reg_motion_plus;
+					region_size = WIIMOTE_REG_EXT_SIZE;
+				}
+				break;
+
+			// ir
+			case 0xB0 :
+				region_ptr = &m_reg_ir;
+				region_size = WIIMOTE_REG_IR_SIZE;
+
+				//if (5 == m_reg_ir->mode)
+				//	PanicAlert("IR Full Mode is Unsupported!");
+				break;
+			}
+
+			if (region_ptr && (region_offset + wd->size <= region_size))
+			{
+				memcpy((u8*)region_ptr + region_offset, wd->data, wd->size);
+			}
+			else
+				return;	// TODO: generate a writedata error reply
+
+			/* TODO?
+			if (region_ptr == &m_reg_speaker)
+			{
+				ERROR_LOG(WIIMOTE, "Write to speaker register %x %s", address,
+					ArrayToString(wd->data, wd->size, 100, false).c_str());
+			}
+			*/
+
+			if (&m_reg_ext == region_ptr)
+			{
+				// Run the key generation on all writes in the key area, it doesn't matter
+				// that we send it parts of a key, only the last full key will have an effect
+				if (address >= 0xa40040 && address <= 0xa4004c)
+					WiimoteGenerateKey(&m_ext_key, m_reg_ext.encryption_key);
+			}
+			else if (&m_reg_motion_plus == region_ptr)
+			{
+				// activate/deactivate motion plus
+				if (0x55 == m_reg_motion_plus.activated)
+				{
+					// maybe hacky
+					m_reg_motion_plus.activated = 0;
+					m_motion_plus_active ^= 1;
+
+					RequestStatus();
+				}
+			}
+		}
+		break;
+
+	default:
+		PanicAlert("WriteData: unimplemented parameters!");
+		break;
+	}
+}
+
+/* Read data from Wiimote and Extensions registers. */
+void Wiimote::ReadData(const wm_read_data* const rd)
+{
+	u32 address = Common::swap24(rd->address);
+	u16 size = Common::swap16(rd->size);
+
+	// ignore the 0x010000 bit
+	address &= 0xFEFFFF;
+
+	// hybrid Wiimote stuff
+	// relay the read data request to real-Wiimote
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && ((0xA4 != (address >> 16)) || (m_extension->switch_extension <= 0)))
+	{
+		WiimoteReal::InterruptChannel(m_index, m_reporting_channel, ((u8*)rd) - 2, sizeof(wm_read_data) + 2); // hacky
+
+		// don't want emu-Wiimote to send reply
+		return;
+	}
+
+	ReadRequest rr;
+	u8 *const block = new u8[size];
+
+	switch (rd->space)
+	{
+	case WM_SPACE_EEPROM :
+		{
+			//PanicAlert("ReadData: reading from EEPROM: address: 0x%x size: 0x%x", address, size);
+			// Read from EEPROM
+			if (address + size >= WIIMOTE_EEPROM_FREE_SIZE)
+			{
+				if (address + size > WIIMOTE_EEPROM_SIZE)
+				{
+					PanicAlert("ReadData: address + size out of bounds");
+					delete [] block;
+					return;
+				}
+				// generate a read error
+				size = 0;
+			}
+
+			// read mii data from file
+			// i need to improve this greatly
+			if (address >= 0x0FCA && address < 0x12C0)
+			{
+				// reading the whole mii block :/
+				std::ifstream file;
+				file.open((File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/mii.bin").c_str(), std::ios::binary | std::ios::in);
+				file.read((char*)m_eeprom + 0x0FCA, 0x02f0);
+				file.close();
+			}
+
+			// read memory to be sent to Wii
+			memcpy(block, m_eeprom + address, size);
+		}
+		break;
+
+	case WM_SPACE_REGS1 :
+	case WM_SPACE_REGS2 :
+		{
+			// Read from Control Register
+
+			// ignore second byte for extension area
+			if (0xA4 == (address >> 16))
+				address &= 0xFF00FF;
+
+			const u8 region_offset = (u8)address;
+			void *region_ptr = nullptr;
+			int region_size = 0;
+
+			switch (address >> 16)
+			{
+			// speaker
+			case 0xa2:
+				region_ptr = &m_reg_speaker;
+				region_size = WIIMOTE_REG_SPEAKER_SIZE;
+				break;
+
+			// extension
+			case 0xa4:
+				region_ptr = m_motion_plus_active ? (void*)&m_reg_motion_plus : (void*)&m_reg_ext;
+				region_size = WIIMOTE_REG_EXT_SIZE;
+				break;
+
+			// motion plus
+			case 0xa6:
+				// reading from 0xa6 returns error when mplus is activated
+				if (false == m_motion_plus_active)
+				{
+					region_ptr = &m_reg_motion_plus;
+					region_size = WIIMOTE_REG_EXT_SIZE;
+				}
+				break;
+
+			// ir
+			case 0xb0:
+				region_ptr = &m_reg_ir;
+				region_size = WIIMOTE_REG_IR_SIZE;
+				break;
+			}
+
+			if (region_ptr && (region_offset + size <= region_size))
+			{
+				memcpy(block, (u8*)region_ptr + region_offset, size);
+			}
+			else
+				size = 0;	// generate read error
+
+			if (&m_reg_ext == region_ptr)
+			{
+				// Encrypt data read from extension register
+				// Check if encrypted reads is on
+				if (0xaa == m_reg_ext.encryption)
+					WiimoteEncrypt(&m_ext_key, block, address & 0xffff, (u8)size);
+			}
+		}
+		break;
+
+	default :
+		PanicAlert("WmReadData: unimplemented parameters (size: %i, address: 0x%x)!", size, rd->space);
+		break;
+	}
+
+	// want the requested address, not the above modified one
+	rr.address = Common::swap24(rd->address);
+	rr.size = size;
+	//rr.channel = _channelID;
+	rr.position = 0;
+	rr.data = block;
+
+	// send up to 16 bytes
+	SendReadDataReply(rr);
+
+	// if there is more data to be sent, add it to the queue
+	if (rr.size)
+		m_read_requests.push( rr );
+	else
+		delete[] rr.data;
+}
+
+// old comment
+/* Here we produce the actual 0x21 Input report that we send to the Wii. The
+   message is divided into 16 bytes pieces and sent piece by piece. There will
+   be five formatting bytes at the begging of all reports. A common format is
+   00 00 f0 00 20, the 00 00 means that no buttons are pressed, the f means 16
+   bytes in the message, the 0 means no error, the 00 20 means that the message
+   is at the 00 20 offest in the registry that was read.
+*/
+void Wiimote::SendReadDataReply(ReadRequest& _request)
+{
+	u8 data[23];
+	data[0] = 0xA1;
+	data[1] = WM_READ_DATA_REPLY;
+
+	wm_read_data_reply* const reply = (wm_read_data_reply*)(data + 2);
+	reply->buttons = m_status.buttons;
+	reply->address = Common::swap16(_request.address);
+
+	// generate a read error
+	// Out of bounds. The real Wiimote generate an error for the first
+	// request to 0x1770 if we dont't replicate that the game will never
+	// read the calibration data at the beginning of Eeprom. I think this
+	// error is supposed to occur when we try to read above the freely
+	// usable space that ends at 0x16ff.
+	if (0 == _request.size)
+	{
+		reply->size = 0x0f;
+		reply->error = 0x08;
+
+		memset(reply->data, 0, sizeof(reply->data));
+	}
+	else
+	{
+		// Limit the amt to 16 bytes
+		// AyuanX: the MTU is 640B though... what a waste!
+		const int amt = std::min( (unsigned int)16, _request.size );
+
+		// no error
+		reply->error = 0;
+
+		// 0x1 means two bytes, 0xf means 16 bytes
+		reply->size = amt - 1;
+
+		// Clear the mem first
+		memset(reply->data, 0, sizeof(reply->data));
+
+		// copy piece of mem
+		memcpy(reply->data, _request.data + _request.position, amt);
+
+		// update request struct
+		_request.size -= amt;
+		_request.position += amt;
+		_request.address += amt;
+	}
+
+	// Send a piece
+	Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
+}
+
+void Wiimote::DoState(PointerWrap& p)
+{
+	p.Do(m_extension->active_extension);
+	p.Do(m_extension->switch_extension);
+
+	p.Do(m_accel);
+	p.Do(m_index);
+	p.Do(ir_sin);
+	p.Do(ir_cos);
+	p.Do(m_rumble_on);
+	p.Do(m_speaker_mute);
+	p.Do(m_motion_plus_present);
+	p.Do(m_motion_plus_active);
+	p.Do(m_reporting_auto);
+	p.Do(m_reporting_mode);
+	p.Do(m_reporting_channel);
+	p.Do(m_shake_step);
+	p.Do(m_sensor_bar_on_top);
+	p.Do(m_status);
+	p.Do(m_adpcm_state);
+	p.Do(m_ext_key);
+	p.DoArray(m_eeprom, sizeof(m_eeprom));
+	p.Do(m_reg_motion_plus);
+	p.Do(m_reg_ir);
+	p.Do(m_reg_ext);
+	p.Do(m_reg_speaker);
+
+	//Do 'm_read_requests' queue
+	{
+		u32 size = 0;
+		if (p.mode == PointerWrap::MODE_READ)
+		{
+			//clear
+			while (!m_read_requests.empty())
+				m_read_requests.pop();
+
+			p.Do(size);
+			while (size--)
+			{
+				ReadRequest tmp;
+				p.Do(tmp.address);
+				p.Do(tmp.position);
+				p.Do(tmp.size);
+				tmp.data = new u8[tmp.size];
+				p.DoArray(tmp.data, tmp.size);
+				m_read_requests.push(tmp);
+			}
+		}
+		else
+		{
+			std::queue<ReadRequest> tmp_queue(m_read_requests);
+			size = (u32)(m_read_requests.size());
+			p.Do(size);
+			while (!tmp_queue.empty())
+			{
+				ReadRequest tmp = tmp_queue.front();
+				p.Do(tmp.address);
+				p.Do(tmp.position);
+				p.Do(tmp.size);
+				p.DoArray(tmp.data, tmp.size);
+				tmp_queue.pop();
+			}
+		}
+	}
+	p.DoMarker("Wiimote");
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+		RealState();
+}
+
+// load real Wiimote state
+void Wiimote::RealState()
+{
+	using namespace WiimoteReal;
+
+	if (g_wiimotes[m_index])
+	{
+		g_wiimotes[m_index]->SetChannel(m_reporting_channel);
+		g_wiimotes[m_index]->EnableDataReporting(m_reporting_mode);
+	}
+}
+
+}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
similarity index 92%
rename from Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp
rename to Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
index 70efdf2803..1ffde3d361 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
@@ -1,12 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 //
 // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com)
 
+#include <cstring>
 
-#include "Common.h"
-#include "Encryption.h"
+#include "Common/CommonTypes.h"
+#include "Core/HW/WiimoteEmu/Encryption.h"
 
 
 static const u8 ans_tbl[7][6] = {
@@ -186,30 +187,30 @@ static const u8 sboxes[8][256] = {
 };
 
 
-static inline u8 ror8(const u8 a, const u8 b)
+static inline u8 ROR8(const u8 a, const u8 b)
 {
 	return (a>>b) | ((a<<(8-b))&0xff);
 }
 
 
-void genkey(const u8* const rand, const u8 idx, u8* const key)
+static void GenerateKey(const u8* const rand, const u8 idx, u8* const key)
 {
 	const u8* const ans = ans_tbl[idx];
 	u8 t0[10];
-	
-	for(int i=0; i<10; ++i)
+
+	for (int i=0; i<10; ++i)
 		t0[i] = tsbox[rand[i]];
-	
-	key[0] = ((ror8((ans[0]^t0[5]),(t0[2]%8)) - t0[9]) ^ t0[4]);
-	key[1] = ((ror8((ans[1]^t0[1]),(t0[0]%8)) - t0[5]) ^ t0[7]);
-	key[2] = ((ror8((ans[2]^t0[6]),(t0[8]%8)) - t0[2]) ^ t0[0]);
-	key[3] = ((ror8((ans[3]^t0[4]),(t0[7]%8)) - t0[3]) ^ t0[2]);
-	key[4] = ((ror8((ans[4]^t0[1]),(t0[6]%8)) - t0[3]) ^ t0[4]);
-	key[5] = ((ror8((ans[5]^t0[7]),(t0[8]%8)) - t0[5]) ^ t0[9]);
+
+	key[0] = ((ROR8((ans[0]^t0[5]),(t0[2]%8)) - t0[9]) ^ t0[4]);
+	key[1] = ((ROR8((ans[1]^t0[1]),(t0[0]%8)) - t0[5]) ^ t0[7]);
+	key[2] = ((ROR8((ans[2]^t0[6]),(t0[8]%8)) - t0[2]) ^ t0[0]);
+	key[3] = ((ROR8((ans[3]^t0[4]),(t0[7]%8)) - t0[3]) ^ t0[2]);
+	key[4] = ((ROR8((ans[4]^t0[1]),(t0[6]%8)) - t0[3]) ^ t0[4]);
+	key[5] = ((ROR8((ans[5]^t0[7]),(t0[8]%8)) - t0[5]) ^ t0[9]);
 }
 
 
-void gentabs(const u8* const rand, const u8* const key, const u8 idx, u8* const ft, u8* const sb)
+static void GenerateTables(const u8* const rand, const u8* const key, const u8 idx, u8* const ft, u8* const sb)
 {
 	ft[0] = sboxes[idx][key[4]] ^ sboxes[(idx+1)%8][rand[3]];
 	ft[1] = sboxes[idx][key[2]] ^ sboxes[(idx+1)%8][rand[5]];
@@ -219,7 +220,7 @@ void gentabs(const u8* const rand, const u8* const key, const u8 idx, u8* const
 	ft[5] = sboxes[idx][key[3]] ^ sboxes[(idx+1)%8][rand[9]];
 	ft[6] = sboxes[idx][rand[0]] ^ sboxes[(idx+1)%8][rand[6]];
 	ft[7] = sboxes[idx][rand[1]] ^ sboxes[(idx+1)%8][rand[8]];
-	
+
 	sb[0] = sboxes[idx][key[0]] ^ sboxes[(idx+1)%8][rand[1]];
 	sb[1] = sboxes[idx][key[5]] ^ sboxes[(idx+1)%8][rand[4]];
 	sb[2] = sboxes[idx][key[3]] ^ sboxes[(idx+1)%8][rand[0]];
@@ -234,7 +235,7 @@ void gentabs(const u8* const rand, const u8* const key, const u8 idx, u8* const
 
 
 /* Generate key from the 0x40-0x4c data in g_RegExt */
-void wiimote_gen_key(wiimote_key* const key, const u8* const keydata)
+void WiimoteGenerateKey(wiimote_key* const key, const u8* const keydata)
 {
 	u8 rand[10];
 	u8 skey[6];
@@ -245,38 +246,38 @@ void wiimote_gen_key(wiimote_key* const key, const u8* const keydata)
 		rand[9-i] = keydata[i];
 	for (int i=0; i<6; ++i)
 		skey[5-i] = keydata[i+10];
-	
+
 	//DEBUG_LOG(WIIMOTE, "rand: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", rand[0], rand[1], rand[2], rand[3], rand[4], rand[5], rand[6], rand[7], rand[8], rand[9]);
 	//DEBUG_LOG(WIIMOTE, "key:  %02x %02x %02x %02x %02x %02x", skey[0], skey[1], skey[2], skey[3], skey[4], skey[5]);
-	
-	for(idx = 0; idx < 7; ++idx)
+
+	for (idx = 0; idx < 7; ++idx)
 	{
-		genkey(rand, idx, testkey);
+		GenerateKey(rand, idx, testkey);
 		if (0 == memcmp(testkey, skey, 6))
 			break;
 	}
 	// default case is idx = 7 which is valid (homebrew uses it for the 0x17 case)
 	//DEBUG_LOG(WIIMOTE, "idx:  %d", idx);
-	
-	gentabs(rand, skey, idx, key->ft, key->sb);
-	
+
+	GenerateTables(rand, skey, idx, key->ft, key->sb);
+
 	//DEBUG_LOG(WIIMOTE, "ft:   %02x %02x %02x %02x %02x %02x %02x %02x", key->ft[0], key->ft[1], key->ft[2], key->ft[3], key->ft[4], key->ft[5], key->ft[6], key->ft[7]);
 	//DEBUG_LOG(WIIMOTE, "sb:   %02x %02x %02x %02x %02x %02x %02x %02x", key->sb[0], key->sb[1], key->sb[2], key->sb[3], key->sb[4], key->sb[5], key->sb[6], key->sb[7]);
-	
+
 	// for homebrew, ft and sb are all 0x97 which is equivalent to 0x17
 }
 
 // TODO: is there a reason these can only handle a length of 255?
 /* Encrypt data */
-void wiimote_encrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len)
+void WiimoteEncrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len)
 {
-	for (int i = 0; i < len; ++i, ++addr)	
+	for (int i = 0; i < len; ++i, ++addr)
 		data[i] = (data[i] - key->ft[addr % 8]) ^ key->sb[addr % 8];
 }
 
 
 /* Decrypt data */
-void wiimote_decrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len)
+void WiimoteDecrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len)
 {
 	for (int i = 0; i < len; ++i, ++addr)
 		data[i] = (data[i] ^ key->sb[addr % 8]) + key->ft[addr % 8];
diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.h b/Source/Core/Core/HW/WiimoteEmu/Encryption.h
new file mode 100644
index 0000000000..62302f4e7c
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.h
@@ -0,0 +1,22 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+//
+// Copyright (C) Hector Martin "marcan" (hector@marcansoft.com)
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// The key structure to use with WiimoteGenerateKey()
+struct wiimote_key
+{
+	u8 ft[8];
+	u8 sb[8];
+};
+
+
+void WiimoteEncrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len);
+void WiimoteDecrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len);
+
+void WiimoteGenerateKey(wiimote_key* const key, const u8* const keydata);
diff --git a/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h
new file mode 100644
index 0000000000..3c3218401f
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h
@@ -0,0 +1,91 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cmath>
+
+#ifndef M_PI
+#define M_PI  3.14159265358979323846
+#endif
+
+typedef double Matrix[4][4];
+struct Vertex
+{
+	double x, y, z;
+};
+
+inline void MatrixIdentity(Matrix & m)
+{
+	m[0][0]=1; m[0][1]=0; m[0][2]=0; m[0][3]=0;
+	m[1][0]=0; m[1][1]=1; m[1][2]=0; m[1][3]=0;
+	m[2][0]=0; m[2][1]=0; m[2][2]=1; m[2][3]=0;
+	m[3][0]=0; m[3][1]=0; m[3][2]=0; m[3][3]=1;
+}
+
+inline void MatrixFrustum(Matrix &m, double l, double r, double b, double t, double n, double f)
+{
+	m[0][0]=2*n/(r-l);    m[0][1]=0;            m[0][2]=0;            m[0][3]=0;
+	m[1][0]=0;            m[1][1]=2*n/(t-b);    m[1][2]=0;            m[1][3]=0;
+	m[2][0]=(r+l)/(r-l);  m[2][1]=(t+b)/(t-b);  m[2][2]=(f+n)/(f-n);  m[2][3]=-1;
+	m[3][0]=0;            m[3][1]=0;            m[3][2]=2*f*n/(f-n);  m[3][3]=0;
+}
+
+inline void MatrixPerspective(Matrix & m, double fovy, double aspect, double nplane, double fplane)
+{
+	double xmin, xmax, ymin, ymax;
+
+	ymax = nplane * tan(fovy * M_PI / 360.0);
+	ymin = -ymax;
+	xmin = ymin * aspect;
+	xmax = ymax * aspect;
+
+	MatrixFrustum(m,xmin,xmax,ymin,ymax,nplane,fplane);
+}
+
+inline void MatrixRotationByZ(Matrix &m, double sin, double cos)
+{
+	m[0][0]=cos; m[0][1]=-sin; m[0][2]=0; m[0][3]=0;
+	m[1][0]=sin; m[1][1]=cos;  m[1][2]=0; m[1][3]=0;
+	m[2][0]=0;   m[2][1]=0;    m[2][2]=1; m[2][3]=0;
+	m[3][0]=0;   m[3][1]=0;    m[3][2]=0; m[3][3]=1;
+}
+
+inline void MatrixScale(Matrix &m, double xfact, double yfact, double zfact)
+{
+	m[0][0]=xfact; m[0][1]=0;     m[0][2]=0;     m[0][3]=0;
+	m[1][0]=0;     m[1][1]=yfact; m[1][2]=0;     m[1][3]=0;
+	m[2][0]=0;     m[2][1]=0;     m[2][2]=zfact; m[2][3]=0;
+	m[3][0]=0;     m[3][1]=0;     m[3][2]=0;     m[3][3]=1;
+}
+
+inline void MatrixMultiply(Matrix &r, const Matrix &a, const Matrix &b)
+{
+	for (int i=0; i<16; i++)
+		r[i>>2][i&3]=0.0f;
+
+	for (int i=0; i<4; i++)
+		for (int j=0; j<4; j++)
+			for (int k=0; k<4; k++)
+				r[i][j]+=a[i][k]*b[k][j];
+}
+
+inline void MatrixTransformVertex(Matrix const & m, Vertex & v)
+{
+	Vertex ov;
+	double w;
+	ov.x=v.x;
+	ov.y=v.y;
+	ov.z=v.z;
+	v.x = m[0][0] * ov.x + m[0][1] * ov.y + m[0][2] * ov.z + m[0][3];
+	v.y = m[1][0] * ov.x + m[1][1] * ov.y + m[1][2] * ov.z + m[1][3];
+	v.z = m[2][0] * ov.x + m[2][1] * ov.y + m[2][2] * ov.z + m[2][3];
+	w   = m[3][0] * ov.x + m[3][1] * ov.y + m[3][2] * ov.z + m[3][3];
+	if (w!=0)
+	{
+		v.x/=w;
+		v.y/=w;
+		v.z/=w;
+	}
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp
new file mode 100644
index 0000000000..870b4b06d1
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/Speaker.cpp
@@ -0,0 +1,150 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "AudioCommon/AudioCommon.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+
+//#define WIIMOTE_SPEAKER_DUMP
+#ifdef WIIMOTE_SPEAKER_DUMP
+#include <cstdlib>
+#include <fstream>
+#include "AudioCommon/WaveFile.h"
+#include "Common/FileUtil.h"
+#endif
+
+namespace WiimoteEmu
+{
+
+// Yamaha ADPCM decoder code based on The ffmpeg Project (Copyright (s) 2001-2003)
+
+static const s32 yamaha_difflookup[] = {
+	1, 3, 5, 7, 9, 11, 13, 15,
+	-1, -3, -5, -7, -9, -11, -13, -15
+};
+
+static const s32 yamaha_indexscale[] = {
+	230, 230, 230, 230, 307, 409, 512, 614,
+	230, 230, 230, 230, 307, 409, 512, 614
+};
+
+static s16 av_clip16(s32 a)
+{
+	if ((a+32768) & ~65535) return (a>>31) ^ 32767;
+	else                    return a;
+}
+
+static s32 av_clip(s32 a, s32 amin, s32 amax)
+{
+	if      (a < amin) return amin;
+	else if (a > amax) return amax;
+	else               return a;
+}
+
+static s16 adpcm_yamaha_expand_nibble(ADPCMState& s, u8 nibble)
+{
+	s.predictor += (s.step * yamaha_difflookup[nibble]) / 8;
+	s.predictor = av_clip16(s.predictor);
+	s.step = (s.step * yamaha_indexscale[nibble]) >> 8;
+	s.step = av_clip(s.step, 127, 24576);
+	return s.predictor;
+}
+
+#ifdef WIIMOTE_SPEAKER_DUMP
+std::ofstream ofile;
+WaveFileWriter wav;
+
+void stopdamnwav(){wav.Stop();ofile.close();}
+#endif
+
+void Wiimote::SpeakerData(wm_speaker_data* sd)
+{
+	if (!SConfig::GetInstance().m_WiimoteEnableSpeaker)
+		return;
+	if (m_reg_speaker.volume == 0 || m_reg_speaker.sample_rate == 0 || sd->length == 0)
+		return;
+
+	// TODO consider using static max size instead of new
+	std::unique_ptr<s16[]> samples(new s16[sd->length * 2]);
+
+	unsigned int sample_rate_dividend, sample_length;
+	u8 volume_divisor;
+
+	if (m_reg_speaker.format == 0x40)
+	{
+		// 8 bit PCM
+		for (int i = 0; i < sd->length; ++i)
+		{
+			samples[i] = ((s16)(s8)sd->data[i]) << 8;
+		}
+
+		// Following details from http://wiibrew.org/wiki/Wiimote#Speaker
+		sample_rate_dividend = 12000000;
+		volume_divisor = 0xff;
+		sample_length = (unsigned int)sd->length;
+	}
+	else if (m_reg_speaker.format == 0x00)
+	{
+		// 4 bit Yamaha ADPCM (same as dreamcast)
+		for (int i = 0; i < sd->length; ++i)
+		{
+			samples[i * 2] = adpcm_yamaha_expand_nibble(m_adpcm_state, (sd->data[i] >> 4) & 0xf);
+			samples[i * 2 + 1] = adpcm_yamaha_expand_nibble(m_adpcm_state, sd->data[i] & 0xf);
+		}
+
+		// Following details from http://wiibrew.org/wiki/Wiimote#Speaker
+		sample_rate_dividend = 6000000;
+
+		// 0 - 127
+		// TODO: does it go beyond 127 for format == 0x40?
+		volume_divisor = 0x7F;
+		sample_length = (unsigned int)sd->length * 2;
+	}
+	else
+	{
+		ERROR_LOG(WII_IPC_WIIMOTE, "Unknown speaker format %x\n", m_reg_speaker.format);
+		return;
+	}
+
+	// Speaker Pan
+	unsigned int vol = (unsigned int)(m_options->settings[4]->GetValue() * 100);
+
+	unsigned int sample_rate = sample_rate_dividend / m_reg_speaker.sample_rate;
+	float speaker_volume_ratio = (float)m_reg_speaker.volume / volume_divisor;
+	unsigned int left_volume = (unsigned int)((128 + vol) * speaker_volume_ratio);
+	unsigned int right_volume = (unsigned int)((128 - vol) * speaker_volume_ratio);
+
+	if (left_volume > 255)
+		left_volume = 255;
+	if (right_volume > 255)
+		right_volume = 255;
+
+	g_sound_stream->GetMixer()->SetWiimoteSpeakerVolume(left_volume, right_volume);
+
+	// ADPCM sample rate is thought to be x2.(3000 x2 = 6000).
+	g_sound_stream->GetMixer()->PushWiimoteSpeakerSamples(samples.get(), sample_length, sample_rate * 2);
+
+#ifdef WIIMOTE_SPEAKER_DUMP
+	static int num = 0;
+
+	if (num == 0)
+	{
+		File::Delete("rmtdump.wav");
+		File::Delete("rmtdump.bin");
+		atexit(stopdamnwav);
+		OpenFStream(ofile, "rmtdump.bin", ofile.binary | ofile.out);
+		wav.Start("rmtdump.wav", 6000/*Common::swap16(m_reg_speaker.sample_rate)*/);
+	}
+	wav.AddMonoSamples(samples.get(), sd->length*2);
+	if (ofile.good())
+	{
+		for (int i = 0; i < sd->length; i++)
+		{
+			ofile << sd->data[i];
+		}
+	}
+	num++;
+#endif
+}
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
new file mode 100644
index 0000000000..80a01360bf
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -0,0 +1,939 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/Timer.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayClient.h"
+#include "Core/HW/WiimoteEmu/MatrixMath.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
+#include "Core/HW/WiimoteEmu/Attachment/Drums.h"
+#include "Core/HW/WiimoteEmu/Attachment/Guitar.h"
+#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
+#include "Core/HW/WiimoteEmu/Attachment/Turntable.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+namespace
+{
+// :)
+auto const TAU = 6.28318530717958647692;
+auto const PI = TAU / 2.0;
+}
+
+namespace WiimoteEmu
+{
+
+static const u8 eeprom_data_0[] = {
+	// IR, maybe more
+	// assuming last 2 bytes are checksum
+	0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, // messing up the checksum on purpose
+	0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00,
+	// Accelerometer
+	ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0,
+	ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0,
+};
+
+static const u8 motion_plus_id[] = { 0x00, 0x00, 0xA6, 0x20, 0x00, 0x05 };
+
+static const u8 eeprom_data_16D0[] = {
+	0x00, 0x00, 0x00, 0xFF, 0x11, 0xEE, 0x00, 0x00,
+	0x33, 0xCC, 0x44, 0xBB, 0x00, 0x00, 0x66, 0x99,
+	0x77, 0x88, 0x00, 0x00, 0x2B, 0x01, 0xE8, 0x13
+};
+
+static const ReportFeatures reporting_mode_features[] =
+{
+	//0x30: Core Buttons
+	{ 2, 0, 0, 0, 4 },
+	//0x31: Core Buttons and Accelerometer
+	{ 2, 4, 0, 0, 7 },
+	//0x32: Core Buttons with 8 Extension bytes
+	{ 2, 0, 0, 4, 12 },
+	//0x33: Core Buttons and Accelerometer with 12 IR bytes
+	{ 2, 4, 7, 0, 19 },
+	//0x34: Core Buttons with 19 Extension bytes
+	{ 2, 0, 0, 4, 23 },
+	//0x35: Core Buttons and Accelerometer with 16 Extension Bytes
+	{ 2, 4, 0, 7, 23 },
+	//0x36: Core Buttons with 10 IR bytes and 9 Extension Bytes
+	{ 2, 0, 4, 14, 23 },
+	//0x37: Core Buttons and Accelerometer with 10 IR bytes and 6 Extension Bytes
+	{ 2, 4, 7, 17, 23 },
+
+	// UNSUPPORTED:
+	//0x3d: 21 Extension Bytes
+	{ 0, 0, 0, 2, 23 },
+	//0x3e / 0x3f: Interleaved Core Buttons and Accelerometer with 36 IR bytes
+	{ 0, 0, 0, 0, 23 },
+};
+
+void EmulateShake(AccelData* const accel
+	  , ControllerEmu::Buttons* const buttons_group
+	  , u8* const shake_step )
+{
+	// frame count of one up/down shake
+	// < 9 no shake detection in "Wario Land: Shake It"
+	auto const shake_step_max = 15;
+
+	// peak G-force
+	auto const shake_intensity = 3.0;
+
+	// shake is a bitfield of X,Y,Z shake button states
+	static const unsigned int btns[] = { 0x01, 0x02, 0x04 };
+	unsigned int shake = 0;
+	buttons_group->GetState( &shake, btns );
+
+	for (int i = 0; i != 3; ++i)
+	{
+		if (shake & (1 << i))
+		{
+			(&(accel->x))[i] = std::sin(TAU * shake_step[i] / shake_step_max) * shake_intensity;
+			shake_step[i] = (shake_step[i] + 1) % shake_step_max;
+		}
+		else
+			shake_step[i] = 0;
+	}
+}
+
+void EmulateTilt(AccelData* const accel
+	, ControllerEmu::Tilt* const tilt_group
+	, const bool sideways, const bool upright)
+{
+	ControlState roll, pitch;
+	// 180 degrees
+	tilt_group->GetState(&roll, &pitch);
+
+	roll *= PI;
+	pitch *= PI;
+
+	unsigned int ud = 0, lr = 0, fb = 0;
+
+	// some notes that no one will understand but me :p
+	// left, forward, up
+	// lr/ left == negative for all orientations
+	// ud/ up == negative for upright longways
+	// fb/ forward == positive for (sideways flat)
+
+	// determine which axis is which direction
+	ud = upright ? (sideways ? 0 : 1) : 2;
+	lr = sideways;
+	fb = upright ? 2 : (sideways ? 0 : 1);
+
+	int sgn[3]={-1,1,1}; //sign fix
+
+	if (sideways && !upright)
+		sgn[fb] *= -1;
+	if (!sideways && upright)
+		sgn[ud] *= -1;
+
+	(&accel->x)[ud] = (sin((PI / 2) - std::max(fabs(roll), fabs(pitch))))*sgn[ud];
+	(&accel->x)[lr] = -sin(roll)*sgn[lr];
+	(&accel->x)[fb] = sin(pitch)*sgn[fb];
+}
+
+#define SWING_INTENSITY  2.5//-uncalibrated(aprox) 0x40-calibrated
+
+void EmulateSwing(AccelData* const accel
+	, ControllerEmu::Force* const swing_group
+	, const bool sideways, const bool upright)
+{
+	ControlState swing[3];
+	swing_group->GetState(swing);
+
+	s8 g_dir[3] = {-1, -1, -1};
+	u8 axis_map[3];
+
+	// determine which axis is which direction
+	axis_map[0] = upright ? (sideways ? 0 : 1) : 2; // up/down
+	axis_map[1] = sideways; // left|right
+	axis_map[2] = upright ? 2 : (sideways ? 0 : 1); // forward/backward
+
+	// some orientations have up as positive, some as negative
+	// same with forward
+	if (sideways && !upright)
+		g_dir[axis_map[2]] *= -1;
+	if (!sideways && upright)
+		g_dir[axis_map[0]] *= -1;
+
+	for (unsigned int i = 0; i < 3; ++i)
+		(&accel->x)[axis_map[i]] += swing[i] * g_dir[i] * SWING_INTENSITY;
+}
+
+static const u16 button_bitmasks[] =
+{
+	Wiimote::BUTTON_A,
+	Wiimote::BUTTON_B,
+	Wiimote::BUTTON_ONE,
+	Wiimote::BUTTON_TWO,
+	Wiimote::BUTTON_MINUS,
+	Wiimote::BUTTON_PLUS,
+	Wiimote::BUTTON_HOME
+};
+
+static const u16 dpad_bitmasks[] =
+{
+	Wiimote::PAD_UP, Wiimote::PAD_DOWN, Wiimote::PAD_LEFT, Wiimote::PAD_RIGHT
+};
+static const u16 dpad_sideways_bitmasks[] =
+{
+	Wiimote::PAD_RIGHT, Wiimote::PAD_LEFT, Wiimote::PAD_UP, Wiimote::PAD_DOWN
+};
+
+static const char* const named_buttons[] =
+{
+	"A", "B", "1", "2", "-", "+", "Home",
+};
+
+void Wiimote::Reset()
+{
+	m_reporting_mode = WM_REPORT_CORE;
+	// i think these two are good
+	m_reporting_channel = 0;
+	m_reporting_auto = false;
+
+	m_rumble_on = false;
+	m_speaker_mute = false;
+	m_motion_plus_present = false;
+	m_motion_plus_active = false;
+
+	// will make the first Update() call send a status request
+	// the first call to RequestStatus() will then set up the status struct extension bit
+	m_extension->active_extension = -1;
+
+	// eeprom
+	memset(m_eeprom, 0, sizeof(m_eeprom));
+	// calibration data
+	memcpy(m_eeprom, eeprom_data_0, sizeof(eeprom_data_0));
+	// dunno what this is for, copied from old plugin
+	memcpy(m_eeprom + 0x16D0, eeprom_data_16D0, sizeof(eeprom_data_16D0));
+
+	// set up the register
+	memset(&m_reg_speaker, 0, sizeof(m_reg_speaker));
+	memset(&m_reg_ir, 0, sizeof(m_reg_ir));
+	memset(&m_reg_ext, 0, sizeof(m_reg_ext));
+	memset(&m_reg_motion_plus, 0, sizeof(m_reg_motion_plus));
+
+	memcpy(&m_reg_motion_plus.ext_identifier, motion_plus_id, sizeof(motion_plus_id));
+
+	// status
+	memset(&m_status, 0, sizeof(m_status));
+	// Battery levels in voltage
+	//   0x00 - 0x32: level 1
+	//   0x33 - 0x43: level 2
+	//   0x33 - 0x54: level 3
+	//   0x55 - 0xff: level 4
+	m_status.battery = (u8)(m_options->settings[5]->GetValue() * 100);
+
+	memset(m_shake_step, 0, sizeof(m_shake_step));
+
+	// clear read request queue
+	while (!m_read_requests.empty())
+	{
+		delete[] m_read_requests.front().data;
+		m_read_requests.pop();
+	}
+
+	// Yamaha ADPCM state initialize
+	m_adpcm_state.predictor = 0;
+	m_adpcm_state.step = 127;
+}
+
+Wiimote::Wiimote( const unsigned int index )
+	: m_index(index)
+	, ir_sin(0)
+	, ir_cos(1)
+// , m_sound_stream( nullptr )
+{
+	// ---- set up all the controls ----
+
+	// buttons
+	groups.emplace_back(m_buttons = new Buttons("Buttons"));
+	for (auto& named_button : named_buttons)
+		m_buttons->controls.emplace_back(new ControlGroup::Input( named_button));
+
+	// ir
+	groups.emplace_back(m_ir = new Cursor(_trans("IR")));
+
+	// swing
+	groups.emplace_back(m_swing = new Force(_trans("Swing")));
+
+	// tilt
+	groups.emplace_back(m_tilt = new Tilt(_trans("Tilt")));
+
+	// shake
+	groups.emplace_back(m_shake = new Buttons(_trans("Shake")));
+	m_shake->controls.emplace_back(new ControlGroup::Input("X"));
+	m_shake->controls.emplace_back(new ControlGroup::Input("Y"));
+	m_shake->controls.emplace_back(new ControlGroup::Input("Z"));
+
+	// extension
+	groups.emplace_back(m_extension = new Extension(_trans("Extension")));
+	m_extension->attachments.emplace_back(new WiimoteEmu::None(m_reg_ext));
+	m_extension->attachments.emplace_back(new WiimoteEmu::Nunchuk(m_reg_ext));
+	m_extension->attachments.emplace_back(new WiimoteEmu::Classic(m_reg_ext));
+	m_extension->attachments.emplace_back(new WiimoteEmu::Guitar(m_reg_ext));
+	m_extension->attachments.emplace_back(new WiimoteEmu::Drums(m_reg_ext));
+	m_extension->attachments.emplace_back(new WiimoteEmu::Turntable(m_reg_ext));
+
+	m_extension->settings.emplace_back(new ControlGroup::Setting(_trans("Motion Plus"), 0, 0, 1));
+
+	// rumble
+	groups.emplace_back(m_rumble = new ControlGroup(_trans("Rumble")));
+	m_rumble->controls.emplace_back(new ControlGroup::Output(_trans("Motor")));
+
+	// dpad
+	groups.emplace_back(m_dpad = new Buttons("D-Pad"));
+	for (auto& named_direction : named_directions)
+		m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction));
+
+	// options
+	groups.emplace_back( m_options = new ControlGroup(_trans("Options")));
+	m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
+	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false));
+	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false));
+	m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input")));
+	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Speaker Pan"), 0, -127, 127));
+	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Battery"), 95.0 / 100, 0, 255));
+
+	// TODO: This value should probably be re-read if SYSCONF gets changed
+	m_sensor_bar_on_top = SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR") != 0;
+
+	// --- reset eeprom/register/values to default ---
+	Reset();
+}
+
+std::string Wiimote::GetName() const
+{
+	return std::string("Wiimote") + char('1'+m_index);
+}
+
+bool Wiimote::Step()
+{
+	// TODO: change this a bit
+	m_motion_plus_present = m_extension->settings[0]->value != 0;
+
+	m_rumble->controls[0]->control_ref->State(m_rumble_on);
+
+	// when a movie is active, this button status update is disabled (moved), because movies only record data reports.
+	if (!Core::g_want_determinism)
+	{
+		UpdateButtonsStatus();
+	}
+
+	// check if there is a read data request
+	if (!m_read_requests.empty())
+	{
+		ReadRequest& rr = m_read_requests.front();
+		// send up to 16 bytes to the Wii
+		SendReadDataReply(rr);
+		//SendReadDataReply(rr.channel, rr);
+
+		// if there is no more data, remove from queue
+		if (0 == rr.size)
+		{
+			delete[] rr.data;
+			m_read_requests.pop();
+		}
+
+		// don't send any other reports
+		return true;
+	}
+
+	// check if a status report needs to be sent
+	// this happens on Wiimote sync and when extensions are switched
+	if (m_extension->active_extension != m_extension->switch_extension)
+	{
+		RequestStatus();
+
+		// WiiBrew: Following a connection or disconnection event on the Extension Port,
+		// data reporting is disabled and the Data Reporting Mode must be reset before new data can arrive.
+		// after a game receives an unrequested status report,
+		// it expects data reports to stop until it sets the reporting mode again
+		m_reporting_auto = false;
+
+		return true;
+	}
+
+	return false;
+}
+
+void Wiimote::UpdateButtonsStatus()
+{
+	// update buttons in status struct
+	m_status.buttons.hex = 0;
+	const bool is_sideways = m_options->settings[1]->value != 0;
+	m_buttons->GetState(&m_status.buttons.hex, button_bitmasks);
+	m_dpad->GetState(&m_status.buttons.hex, is_sideways ? dpad_sideways_bitmasks : dpad_bitmasks);
+}
+
+void Wiimote::GetButtonData(u8* const data)
+{
+	// when a movie is active, the button update happens here instead of Wiimote::Step, to avoid potential desync issues.
+	if (Core::g_want_determinism)
+	{
+		UpdateButtonsStatus();
+	}
+
+	((wm_buttons*)data)->hex |= m_status.buttons.hex;
+}
+
+void Wiimote::GetAccelData(u8* const data, const ReportFeatures& rptf)
+{
+	const bool is_sideways = m_options->settings[1]->value != 0;
+	const bool is_upright = m_options->settings[2]->value != 0;
+
+	EmulateTilt(&m_accel, m_tilt, is_sideways, is_upright);
+	EmulateSwing(&m_accel, m_swing, is_sideways, is_upright);
+	EmulateShake(&m_accel, m_shake, m_shake_step);
+
+	wm_accel& accel = *(wm_accel*)(data + rptf.accel);
+	wm_buttons& core = *(wm_buttons*)(data + rptf.core);
+
+	// We now use 2 bits more precision, so multiply by 4 before converting to int
+	s16 x = (s16)(4 * (m_accel.x * ACCEL_RANGE + ACCEL_ZERO_G));
+	s16 y = (s16)(4 * (m_accel.y * ACCEL_RANGE + ACCEL_ZERO_G));
+	s16 z = (s16)(4 * (m_accel.z * ACCEL_RANGE + ACCEL_ZERO_G));
+
+	if (x > 1024)
+		x = 1024;
+	else if (x < 0)
+		x = 0;
+	if (y > 1024)
+		y = 1024;
+	else if (y < 0)
+		y = 0;
+	if (z > 1024)
+		z = 1024;
+	else if (z < 0)
+		z = 0;
+
+	accel.x = (x >> 2) & 0xFF;
+	accel.y = (y >> 2) & 0xFF;
+	accel.z = (z >> 2) & 0xFF;
+
+	core.acc_x_lsb = x & 0x3;
+	core.acc_y_lsb = (y >> 1) & 0x1;
+	core.acc_z_lsb = (z >> 1) & 0x1;
+}
+
+inline void LowPassFilter(double& var, double newval, double period)
+{
+	static const double CUTOFF_FREQUENCY = 5.0;
+
+	double RC = 1.0 / CUTOFF_FREQUENCY;
+	double alpha = period / (period + RC);
+	var = newval * alpha + var * (1.0 - alpha);
+}
+
+void Wiimote::GetIRData(u8* const data, bool use_accel)
+{
+	u16 x[4], y[4];
+	memset(x, 0xFF, sizeof(x));
+
+	ControlState xx = 10000, yy = 0, zz = 0;
+	double nsin,ncos;
+
+	if (use_accel)
+	{
+		double ax,az,len;
+		ax = m_accel.x;
+		az = m_accel.z;
+		len = sqrt(ax*ax+az*az);
+		if (len)
+		{
+			ax/=len;
+			az/=len; //normalizing the vector
+			nsin=ax;
+			ncos=az;
+		}
+		else
+		{
+			nsin=0;
+			ncos=1;
+		}
+		// PanicAlert("%d %d %d\nx:%f\nz:%f\nsin:%f\ncos:%f",accel->x,accel->y,accel->z,ax,az,sin,cos);
+		// PanicAlert("%d %d %d\n%d %d %d\n%d %d %d",accel->x,accel->y,accel->z,calib->zero_g.x,calib->zero_g.y,calib->zero_g.z, calib->one_g.x,calib->one_g.y,calib->one_g.z);
+	}
+	else
+	{
+		nsin=0; //m_tilt stuff here (can't figure it out yet....)
+		ncos=1;
+	}
+
+	LowPassFilter(ir_sin,nsin,1.0/60);
+	LowPassFilter(ir_cos,ncos,1.0/60);
+
+	m_ir->GetState(&xx, &yy, &zz, true);
+
+	Vertex v[4];
+
+	static const int camWidth=1024;
+	static const int camHeight=768;
+	static const double bndup=-0.315447;
+	static const double bnddown=0.85;
+	static const double bndleft=0.443364;
+	static const double bndright=-0.443364;
+	static const double dist1=100.0/camWidth; //this seems the optimal distance for zelda
+	static const double dist2=1.2*dist1;
+
+	for (auto& vtx : v)
+	{
+		vtx.x = xx * (bndright - bndleft) / 2 + (bndleft + bndright) / 2;
+		if (m_sensor_bar_on_top)
+			vtx.y = yy * (bndup - bnddown) / 2 + (bndup + bnddown) / 2;
+		else
+			vtx.y = yy * (bndup - bnddown) / 2 - (bndup + bnddown) / 2;
+		vtx.z=0;
+	}
+
+	v[0].x-=(zz*0.5+1)*dist1;
+	v[1].x+=(zz*0.5+1)*dist1;
+	v[2].x-=(zz*0.5+1)*dist2;
+	v[3].x+=(zz*0.5+1)*dist2;
+
+#define printmatrix(m) PanicAlert("%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n",m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3])
+	Matrix rot,tot;
+	static Matrix scale;
+	MatrixScale(scale,1,camWidth/camHeight,1);
+	//MatrixIdentity(scale);
+	MatrixRotationByZ(rot,ir_sin,ir_cos);
+	//MatrixIdentity(rot);
+	MatrixMultiply(tot,scale,rot);
+
+	for (int i = 0; i < 4; i++)
+	{
+		MatrixTransformVertex(tot,v[i]);
+		if ((v[i].x<-1)||(v[i].x>1)||(v[i].y<-1)||(v[i].y>1))
+			continue;
+		x[i] = (u16)lround((v[i].x+1)/2*(camWidth-1));
+		y[i] = (u16)lround((v[i].y+1)/2*(camHeight-1));
+	}
+	// PanicAlert("%f %f\n%f %f\n%f %f\n%f %f\n%d %d\n%d %d\n%d %d\n%d %d",
+	//      v[0].x,v[0].y,v[1].x,v[1].y,v[2].x,v[2].y,v[3].x,v[3].y,
+	//      x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[38]);
+
+	// Fill report with valid data when full handshake was done
+	if (m_reg_ir.data[0x30])
+	// ir mode
+	switch (m_reg_ir.mode)
+	{
+	// basic
+	case 1 :
+		{
+		memset(data, 0xFF, 10);
+		wm_ir_basic* const irdata = (wm_ir_basic*)data;
+		for (unsigned int i=0; i<2; ++i)
+		{
+			if (x[i*2] < 1024 && y[i*2] < 768)
+			{
+				irdata[i].x1 = static_cast<u8>(x[i*2]);
+				irdata[i].x1hi = x[i*2] >> 8;
+
+				irdata[i].y1 = static_cast<u8>(y[i*2]);
+				irdata[i].y1hi = y[i*2] >> 8;
+			}
+			if (x[i*2+1] < 1024 && y[i*2+1] < 768)
+			{
+				irdata[i].x2 = static_cast<u8>(x[i*2+1]);
+				irdata[i].x2hi = x[i*2+1] >> 8;
+
+				irdata[i].y2 = static_cast<u8>(y[i*2+1]);
+				irdata[i].y2hi = y[i*2+1] >> 8;
+			}
+		}
+		}
+		break;
+	// extended
+	case 3 :
+		{
+		memset(data, 0xFF, 12);
+		wm_ir_extended* const irdata = (wm_ir_extended*)data;
+		for (unsigned int i = 0; i < 4; ++i)
+			if (x[i] < 1024 && y[i] < 768)
+			{
+				irdata[i].x = static_cast<u8>(x[i]);
+				irdata[i].xhi = x[i] >> 8;
+
+				irdata[i].y = static_cast<u8>(y[i]);
+				irdata[i].yhi = y[i] >> 8;
+
+				irdata[i].size = 10;
+			}
+		}
+		break;
+	// full
+	case 5 :
+		PanicAlert("Full IR report");
+		// UNSUPPORTED
+		break;
+	}
+}
+
+void Wiimote::GetExtData(u8* const data)
+{
+	m_extension->GetState(data);
+
+	// i dont think anything accesses the extension data like this, but ill support it. Indeed, commercial games don't do this.
+	// i think it should be unencrpyted in the register, encrypted when read.
+	memcpy(m_reg_ext.controller_data, data, sizeof(wm_nc)); // TODO: Should it be nc specific?
+
+	// motionplus pass-through modes
+	if (m_motion_plus_active)
+	{
+		switch (m_reg_motion_plus.ext_identifier[0x4])
+		{
+		// nunchuk pass-through mode
+		// Bit 7 of byte 5 is moved to bit 6 of byte 5, overwriting it
+		// Bit 0 of byte 4 is moved to bit 7 of byte 5
+		// Bit 3 of byte 5 is moved to bit 4 of byte 5, overwriting it
+		// Bit 1 of byte 5 is moved to bit 3 of byte 5
+		// Bit 0 of byte 5 is moved to bit 2 of byte 5, overwriting it
+		case 0x5:
+			//data[5] & (1 << 7)
+			//data[4] & (1 << 0)
+			//data[5] & (1 << 3)
+			//data[5] & (1 << 1)
+			//data[5] & (1 << 0)
+			break;
+
+		// classic controller/musical instrument pass-through mode
+		// Bit 0 of Byte 4 is overwritten
+		// Bits 0 and 1 of Byte 5 are moved to bit 0 of Bytes 0 and 1, overwriting
+		case 0x7:
+			//data[4] & (1 << 0)
+			//data[5] & (1 << 0)
+			//data[5] & (1 << 1)
+			break;
+
+		// unknown pass-through mode
+		default:
+			break;
+		}
+
+		((wm_motionplus_data*)data)->is_mp_data = 0;
+		((wm_motionplus_data*)data)->extension_connected = m_extension->active_extension;
+	}
+
+	if (0xAA == m_reg_ext.encryption)
+		WiimoteEncrypt(&m_ext_key, data, 0x00, sizeof(wm_nc));
+}
+
+void Wiimote::Update()
+{
+	// no channel == not connected i guess
+	if (0 == m_reporting_channel)
+		return;
+
+	// returns true if a report was sent
+	if (Step())
+		return;
+
+	u8 data[MAX_PAYLOAD];
+	memset(data, 0, sizeof(data));
+
+	Movie::SetPolledDevice();
+
+	m_status.battery = (u8)(m_options->settings[5]->GetValue() * 100);
+
+	const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE];
+	s8 rptf_size = rptf.size;
+	if (Movie::IsPlayingInput() && Movie::PlayWiimote(m_index, data, rptf, m_extension->active_extension, m_ext_key))
+	{
+		if (rptf.core)
+			m_status.buttons = *(wm_buttons*)(data + rptf.core);
+	}
+	else
+	{
+		data[0] = 0xA1;
+		data[1] = m_reporting_mode;
+
+		// core buttons
+		if (rptf.core)
+			GetButtonData(data + rptf.core);
+
+		// acceleration
+		if (rptf.accel)
+			GetAccelData(data, rptf);
+
+		// IR
+		if (rptf.ir)
+			GetIRData(data + rptf.ir, (rptf.accel != 0));
+
+		// extension
+		if (rptf.ext)
+			GetExtData(data + rptf.ext);
+
+		// hybrid Wiimote stuff (for now, it's not supported while recording)
+		if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && !Movie::IsRecordingInput())
+		{
+			using namespace WiimoteReal;
+
+			std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
+			if (g_wiimotes[m_index])
+			{
+				const Report& rpt = g_wiimotes[m_index]->ProcessReadQueue();
+				if (!rpt.empty())
+				{
+					const u8 *real_data = rpt.data();
+					switch (real_data[1])
+					{
+						// use data reports
+					default:
+						if (real_data[1] >= WM_REPORT_CORE)
+						{
+							const ReportFeatures& real_rptf = reporting_mode_features[real_data[1] - WM_REPORT_CORE];
+
+							// force same report type from real-Wiimote
+							if (&real_rptf != &rptf)
+								rptf_size = 0;
+
+							// core
+							// mix real-buttons with emu-buttons in the status struct, and in the report
+							if (real_rptf.core && rptf.core)
+							{
+								m_status.buttons.hex |= ((wm_buttons*)(real_data + real_rptf.core))->hex;
+								*(wm_buttons*)(data + rptf.core) = m_status.buttons;
+							}
+
+							// accel
+							// use real-accel data always i guess
+							if (real_rptf.accel && rptf.accel)
+								memcpy(data + rptf.accel, real_data + real_rptf.accel, sizeof(wm_accel));
+
+							// ir
+							// TODO
+
+							// ext
+							// use real-ext data if an emu-extention isn't chosen
+							if (real_rptf.ext && rptf.ext && (0 == m_extension->switch_extension))
+								memcpy(data + rptf.ext, real_data + real_rptf.ext, sizeof(wm_nc));  // TODO: Why NC specific?
+						}
+						else if (WM_ACK_DATA != real_data[1] || m_extension->active_extension > 0)
+							rptf_size = 0;
+						else
+							// use real-acks if an emu-extension isn't chosen
+							rptf_size = -1;
+						break;
+
+						// use all status reports, after modification of the extension bit
+					case WM_STATUS_REPORT :
+						//if (m_extension->switch_extension)
+							//((wm_status_report*)(real_data + 2))->extension = (m_extension->active_extension > 0);
+						if (m_extension->active_extension)
+							((wm_status_report*)(real_data + 2))->extension = 1;
+						rptf_size = -1;
+						break;
+
+						// use all read-data replies
+					case WM_READ_DATA_REPLY:
+						rptf_size = -1;
+						break;
+
+					}
+
+					// copy over report from real-Wiimote
+					if (-1 == rptf_size)
+					{
+						std::copy(rpt.begin(), rpt.end(), data);
+						rptf_size = (s8)(rpt.size());
+					}
+				}
+			}
+		}
+
+		Movie::CallWiiInputManip(data, rptf, m_index, m_extension->active_extension, m_ext_key);
+	}
+	if (NetPlay::IsNetPlayRunning())
+	{
+		NetPlay_GetWiimoteData(m_index, data, rptf.size);
+		if (rptf.core)
+			m_status.buttons = *(wm_buttons*)(data + rptf.core);
+	}
+
+	Movie::CheckWiimoteStatus(m_index, data, rptf, m_extension->active_extension, m_ext_key);
+
+	// don't send a data report if auto reporting is off
+	if (false == m_reporting_auto && data[2] >= WM_REPORT_CORE)
+		return;
+
+	// send data report
+	if (rptf_size)
+	{
+		Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, rptf_size);
+	}
+}
+
+void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size)
+{
+	// Check for custom communication
+	if (99 == _channelID)
+	{
+		// Wiimote disconnected
+		//PanicAlert( "Wiimote Disconnected" );
+
+		// reset eeprom/register/reporting mode
+		Reset();
+		return;
+	}
+
+	// this all good?
+	m_reporting_channel = _channelID;
+
+	const hid_packet* const hidp = (hid_packet*)_pData;
+
+	INFO_LOG(WIIMOTE, "Emu ControlChannel (page: %i, type: 0x%02x, param: 0x%02x)", m_index, hidp->type, hidp->param);
+
+	switch (hidp->type)
+	{
+	case HID_TYPE_HANDSHAKE :
+		PanicAlert("HID_TYPE_HANDSHAKE - %s", (hidp->param == HID_PARAM_INPUT) ? "INPUT" : "OUPUT");
+		break;
+
+	case HID_TYPE_SET_REPORT :
+		if (HID_PARAM_INPUT == hidp->param)
+		{
+			PanicAlert("HID_TYPE_SET_REPORT - INPUT");
+		}
+		else
+		{
+			// AyuanX: My experiment shows Control Channel is never used
+			// shuffle2: but lwbt uses this, so we'll do what we must :)
+			HidOutputReport((wm_report*)hidp->data);
+
+			u8 handshake = HID_HANDSHAKE_SUCCESS;
+			Core::Callback_WiimoteInterruptChannel(m_index, _channelID, &handshake, 1);
+		}
+		break;
+
+	case HID_TYPE_DATA :
+		PanicAlert("HID_TYPE_DATA - %s", (hidp->param == HID_PARAM_INPUT) ? "INPUT" : "OUTPUT");
+		break;
+
+	default :
+		PanicAlert("HidControlChannel: Unknown type %x and param %x", hidp->type, hidp->param);
+		break;
+	}
+
+}
+
+void Wiimote::InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size)
+{
+	// this all good?
+	m_reporting_channel = _channelID;
+
+	const hid_packet* const hidp = (hid_packet*)_pData;
+
+	switch (hidp->type)
+	{
+	case HID_TYPE_DATA:
+		switch (hidp->param)
+		{
+		case HID_PARAM_OUTPUT :
+			{
+				const wm_report* const sr = (wm_report*)hidp->data;
+
+				if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index])
+				{
+					switch (sr->wm)
+					{
+						// these two types are handled in RequestStatus() & ReadData()
+					case WM_REQUEST_STATUS :
+					case WM_READ_DATA :
+						if (WIIMOTE_SRC_REAL == g_wiimote_sources[m_index])
+							WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
+						break;
+
+					default :
+						WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
+						break;
+					}
+
+					HidOutputReport(sr, m_extension->switch_extension > 0);
+				}
+				else
+					HidOutputReport(sr);
+			}
+			break;
+
+		default :
+			PanicAlert("HidInput: HID_TYPE_DATA - param 0x%02x", hidp->param);
+			break;
+		}
+		break;
+
+	default:
+		PanicAlert("HidInput: Unknown type 0x%02x and param 0x%02x", hidp->type, hidp->param);
+		break;
+	}
+}
+
+void Wiimote::LoadDefaults(const ControllerInterface& ciface)
+{
+	ControllerEmu::LoadDefaults(ciface);
+
+	#define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str)
+
+	// Buttons
+#if defined HAVE_X11 && HAVE_X11
+	set_control(m_buttons, 0, "Click 1"); // A
+	set_control(m_buttons, 1, "Click 3"); // B
+#else
+	set_control(m_buttons, 0, "Click 0"); // A
+	set_control(m_buttons, 1, "Click 1"); // B
+#endif
+	set_control(m_buttons, 2, "1"); // 1
+	set_control(m_buttons, 3, "2"); // 2
+	set_control(m_buttons, 4, "Q"); // -
+	set_control(m_buttons, 5, "E"); // +
+
+#ifdef _WIN32
+	set_control(m_buttons, 6, "!LMENU & RETURN"); // Home
+#else
+	set_control(m_buttons, 6, "!`Alt_L` & Return"); // Home
+#endif
+
+	// Shake
+	for (size_t i = 0; i != 3; ++i)
+		set_control(m_shake, i, "Click 2");
+
+	// IR
+	set_control(m_ir, 0, "Cursor Y-");
+	set_control(m_ir, 1, "Cursor Y+");
+	set_control(m_ir, 2, "Cursor X-");
+	set_control(m_ir, 3, "Cursor X+");
+
+	// DPad
+#ifdef _WIN32
+	set_control(m_dpad, 0, "UP");    // Up
+	set_control(m_dpad, 1, "DOWN");  // Down
+	set_control(m_dpad, 2, "LEFT");  // Left
+	set_control(m_dpad, 3, "RIGHT"); // Right
+#elif __APPLE__
+	set_control(m_dpad, 0, "Up Arrow");    // Up
+	set_control(m_dpad, 1, "Down Arrow");  // Down
+	set_control(m_dpad, 2, "Left Arrow");  // Left
+	set_control(m_dpad, 3, "Right Arrow"); // Right
+#else
+	set_control(m_dpad, 0, "Up");    // Up
+	set_control(m_dpad, 1, "Down");  // Down
+	set_control(m_dpad, 2, "Left");  // Left
+	set_control(m_dpad, 3, "Right"); // Right
+#endif
+
+	// ugly stuff
+	// enable nunchuk
+	m_extension->switch_extension = 1;
+
+	// set nunchuk defaults
+	m_extension->attachments[1]->LoadDefaults(ciface);
+}
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
new file mode 100644
index 0000000000..f0ce9a5e38
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -0,0 +1,245 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <queue>
+#include <string>
+#include <vector>
+
+#include "Core/Core.h"
+#include "Core/HW/WiimoteEmu/Encryption.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "InputCommon/ControllerEmu.h"
+
+// Registry sizes
+#define WIIMOTE_EEPROM_SIZE       (16*1024)
+#define WIIMOTE_EEPROM_FREE_SIZE  0x1700
+#define WIIMOTE_REG_SPEAKER_SIZE  10
+#define WIIMOTE_REG_EXT_SIZE      0x100
+#define WIIMOTE_REG_IR_SIZE       0x34
+
+class PointerWrap;
+
+namespace WiimoteReal
+{
+class Wiimote;
+}
+namespace WiimoteEmu
+{
+#pragma pack(push,1)
+struct ReportFeatures
+{
+	u8 core, accel, ir, ext, size;
+};
+
+struct AccelData
+{
+	double x,y,z;
+};
+
+struct ADPCMState
+{
+	s32 predictor, step;
+};
+
+struct ExtensionReg
+{
+	u8 unknown1[0x08];
+
+	// address 0x08
+	u8 controller_data[0x06];
+	u8 unknown2[0x12];
+
+	// address 0x20
+	u8 calibration[0x10];
+	u8 unknown3[0x10];
+
+	// address 0x40
+	u8 encryption_key[0x10];
+	u8 unknown4[0xA0];
+
+	// address 0xF0
+	u8 encryption;
+	u8 unknown5[0x9];
+
+	// address 0xFA
+	u8 constant_id[6];
+};
+
+void EmulateShake(AccelData* const accel_data
+	  , ControllerEmu::Buttons* const buttons_group
+	  , u8* const shake_step);
+
+void EmulateTilt(AccelData* const accel
+	 , ControllerEmu::Tilt* const tilt_group
+	 , const bool sideways = false, const bool upright = false);
+
+void EmulateSwing(AccelData* const accel
+	 , ControllerEmu::Force* const tilt_group
+	 , const bool sideways = false, const bool upright = false);
+
+inline double trim(double a)
+{
+	if (a<=0) return 0;
+	if (a>=255) return 255;
+	return a;
+}
+
+enum
+{
+	ACCEL_ZERO_G = 0x80,
+	ACCEL_ONE_G = 0x9A,
+	ACCEL_RANGE = (ACCEL_ONE_G - ACCEL_ZERO_G),
+};
+
+class Wiimote : public ControllerEmu
+{
+friend class WiimoteReal::Wiimote;
+public:
+
+	enum
+	{
+		PAD_LEFT     = 0x01,
+		PAD_RIGHT    = 0x02,
+		PAD_DOWN     = 0x04,
+		PAD_UP       = 0x08,
+		BUTTON_PLUS  = 0x10,
+
+		BUTTON_TWO   = 0x0100,
+		BUTTON_ONE   = 0x0200,
+		BUTTON_B     = 0x0400,
+		BUTTON_A     = 0x0800,
+		BUTTON_MINUS = 0x1000,
+		BUTTON_HOME  = 0x8000,
+	};
+
+	Wiimote(const unsigned int index);
+	std::string GetName() const override;
+
+	void Update();
+	void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size);
+	void ControlChannel(const u16 _channelID, const void* _pData, u32 _Size);
+
+	void DoState(PointerWrap& p);
+	void RealState();
+
+	void LoadDefaults(const ControllerInterface& ciface) override;
+
+	int CurrentExtension() const { return m_extension->active_extension; }
+
+protected:
+	bool Step();
+	void HidOutputReport(const wm_report* const sr, const bool send_ack = true);
+	void HandleExtensionSwap();
+	void UpdateButtonsStatus();
+
+	void GetButtonData(u8* const data);
+	void GetAccelData(u8* const data, const ReportFeatures& rptf);
+	void GetIRData(u8* const data, bool use_accel);
+	void GetExtData(u8* const data);
+
+	bool HaveExtension() const { return m_extension->active_extension > 0; }
+	bool WantExtension() const { return m_extension->switch_extension != 0; }
+
+private:
+	struct ReadRequest
+	{
+		//u16 channel;
+		u32 address, size, position;
+		u8* data;
+	};
+
+	void Reset();
+
+	void ReportMode(const wm_report_mode* const dr);
+	void SendAck(const u8 _reportID);
+	void RequestStatus(const wm_request_status* const rs = nullptr);
+	void ReadData(const wm_read_data* const rd);
+	void WriteData(const wm_write_data* const wd);
+	void SendReadDataReply(ReadRequest& _request);
+	void SpeakerData(wm_speaker_data* sd);
+	bool NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size);
+
+	// control groups
+	Buttons *m_buttons, *m_dpad, *m_shake;
+	Cursor*        m_ir;
+	Tilt*          m_tilt;
+	Force*         m_swing;
+	ControlGroup*  m_rumble;
+	Extension*     m_extension;
+	ControlGroup*  m_options;
+
+	// Wiimote accel data
+	AccelData      m_accel;
+
+	// Wiimote index, 0-3
+	const u8       m_index;
+
+	double ir_sin, ir_cos; //for the low pass filter
+
+	bool m_rumble_on;
+	bool m_speaker_mute;
+	bool m_motion_plus_present;
+	bool m_motion_plus_active;
+
+	bool m_reporting_auto;
+	u8   m_reporting_mode;
+	u16  m_reporting_channel;
+
+	u8   m_shake_step[3];
+
+	bool m_sensor_bar_on_top;
+
+	wm_status_report m_status;
+
+	ADPCMState m_adpcm_state;
+
+	// read data request queue
+	// maybe it isn't actually a queue
+	// maybe read requests cancel any current requests
+	std::queue<ReadRequest> m_read_requests;
+
+	wiimote_key m_ext_key;
+
+	u8 m_eeprom[WIIMOTE_EEPROM_SIZE];
+	struct MotionPlusReg
+	{
+		u8 unknown[0xF0];
+
+		// address 0xF0
+		u8 activated;
+
+		u8 unknown2[9];
+
+		// address 0xFA
+		u8 ext_identifier[6];
+	} m_reg_motion_plus;
+
+	struct IrReg
+	{
+		u8 data[0x33];
+		u8 mode;
+	} m_reg_ir;
+
+	ExtensionReg m_reg_ext;
+
+	struct SpeakerReg
+	{
+		u8  unused_0;
+		u8  unk_1;
+		u8  format;
+		// seems to always play at 6khz no matter what this is set to?
+		// or maybe it only applies to pcm input
+		u16 sample_rate;
+		u8  volume;
+		u8  unk_6;
+		u8  unk_7;
+		u8  play;
+		u8  unk_9;
+	} m_reg_speaker;
+#pragma pack(pop)
+};
+
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h
new file mode 100644
index 0000000000..c268fd3597
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h
@@ -0,0 +1,498 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// what is this ?
+#ifdef _MSC_VER
+#pragma warning(disable:4200)
+#endif
+
+#pragma pack(push, 1)
+
+// Source: HID_010_SPC_PFL/1.0 (official HID specification)
+
+struct hid_packet
+{
+	u8 param : 4;
+	u8 type : 4;
+	u8 data[0];
+};
+
+#define HID_TYPE_HANDSHAKE 0
+#define HID_TYPE_SET_REPORT 5
+#define HID_TYPE_DATA 0xA
+
+#define HID_HANDSHAKE_SUCCESS 0
+
+#define HID_PARAM_INPUT 1
+#define HID_PARAM_OUTPUT 2
+
+// Source: http://wiibrew.org/wiki/Wiimote
+
+union wm_buttons // also just called "core data"
+{
+	u16 hex;
+
+	struct
+	{
+		u8 left : 1;
+		u8 right : 1;
+		u8 down : 1;
+		u8 up : 1;
+		u8 plus : 1;
+		u8 acc_x_lsb : 2; // LSB of accelerometer (10 bits in total)
+		u8 unknown : 1;
+
+		u8 two : 1;
+		u8 one : 1;
+		u8 b : 1;
+		u8 a : 1;
+		u8 minus : 1;
+		u8 acc_y_lsb : 1; // LSB of accelerometer (9 bits in total)
+		u8 acc_z_lsb : 1; // LSB of accelerometer (9 bits in total)
+		u8 home : 1;
+	};
+};
+
+struct wm_accel
+{
+	u8 x, y, z;
+};
+
+// Four bytes for two objects. Filled with 0xFF if empty
+struct wm_ir_basic
+{
+	u8 x1;
+	u8 y1;
+	u8 x2hi : 2;
+	u8 y2hi : 2;
+	u8 x1hi : 2;
+	u8 y1hi : 2;
+	u8 x2;
+	u8 y2;
+};
+
+// Three bytes for one object
+struct wm_ir_extended
+{
+	u8 x;
+	u8 y;
+	u8 size : 4;
+	u8 xhi : 2;
+	u8 yhi : 2;
+};
+
+// Nunchuk
+union wm_nc_core
+{
+	u8 hex;
+
+	struct
+	{
+		u8 z : 1;
+		u8 c : 1;
+
+		// LSBs of accelerometer
+		u8 acc_x_lsb : 2;
+		u8 acc_y_lsb : 2;
+		u8 acc_z_lsb : 2;
+	};
+};
+
+union wm_nc
+{
+	struct
+	{
+		// joystick x, y
+		u8 jx;
+		u8 jy;
+
+		// accelerometer
+		u8 ax;
+		u8 ay;
+		u8 az;
+
+		wm_nc_core bt; // buttons + accelerometer LSBs
+	}; // regular data
+
+	struct
+	{
+		u8 reserved[4]; // jx, jy, ax and ay as in regular case
+
+		u8 extension_connected : 1;
+		u8 acc_z : 7; // MSBs of accelerometer data
+
+		u8 unknown : 1; // always 0?
+		u8 report_type : 1; // 1: report contains M+ data, 0: report contains extension data
+
+		u8 z : 1;
+		u8 c : 1;
+
+		// LSBs of accelerometer - starting from bit 1!
+		u8 acc_x_lsb : 1;
+		u8 acc_y_lsb : 1;
+		u8 acc_z_lsb : 2;
+	} passthrough_data;
+};
+
+union wm_classic_extension_buttons
+{
+	u16 hex;
+
+	struct
+	{
+		u8 extension_connected : 1;
+		u8 rt : 1; // right trigger
+		u8 plus : 1;
+		u8 home : 1;
+		u8 minus : 1;
+		u8 lt : 1; // left trigger
+		u8 dpad_down : 1;
+		u8 dpad_right : 1;
+
+		u8 : 2; // cf. extension_data and passthrough_data
+		u8 zr : 1; // right z button
+		u8 x : 1;
+		u8 a : 1;
+		u8 y : 1;
+		u8 b : 1;
+		u8 zl : 1; // left z button
+	}; // common data
+
+	// M+ pass-through mode slightly differs from the regular data.
+	// Refer to the common data for unnamed fields
+	struct
+	{
+		u8 : 8;
+
+		u8 dpad_up : 1;
+		u8 dpad_left : 1;
+		u8 : 6;
+	} regular_data;
+
+	struct
+	{
+		u8 : 8;
+
+		u8 unknown : 1; // always 0?
+		u8 report_type : 1; // 1: report contains M+ data, 0: report contains extension data
+		u8 : 6;
+	} passthrough_data;
+};
+
+union wm_classic_extension
+{
+	// lx/ly/lz; left joystick
+	// rx/ry/rz; right joystick
+	// lt; left trigger
+	// rt; left trigger
+
+	struct
+	{
+		u8 : 6;
+		u8 rx3 : 2;
+
+		u8 : 6;
+		u8 rx2 : 2;
+
+		u8 ry : 5;
+		u8 lt2 : 2;
+		u8 rx1 : 1;
+
+		u8 rt : 5;
+		u8 lt1 : 3;
+
+		wm_classic_extension_buttons bt; // byte 4, 5
+	};
+
+	struct
+	{
+		u8 lx : 6; // byte 0
+		u8 : 2;
+
+		u8 ly : 6; // byte 1
+		u8 : 2;
+
+		unsigned : 32;
+	} regular_data;
+
+	struct
+	{
+		u8 dpad_up : 1;
+		u8 lx : 5; // Bits 1-5
+		u8 : 2;
+
+		u8 dpad_left : 1;
+		u8 ly : 5; // Bits 1-5
+		u8 : 2;
+
+		unsigned : 32;
+	} passthrough_data;
+};
+
+struct wm_guitar_extension
+{
+	u8 sx   : 6;
+	u8 pad1 : 2; // 1 on gh3, 0 on ghwt
+
+	u8 sy   : 6;
+	u8 pad2 : 2; // 1 on gh3, 0 on ghwt
+
+	u8 tb   : 5; // not used in gh3
+	u8 pad3 : 3; // always 0
+
+	u8 whammy : 5;
+	u8 pad4 : 3; // always 0
+
+	u16 bt; // buttons
+};
+
+struct wm_drums_extension
+{
+	u8 sx   : 6;
+	u8 pad1 : 2; // always 0
+
+	u8 sy   : 6;
+	u8 pad2 : 2; // always 0
+
+	u8 pad3 : 1; // unknown
+	u8 which : 5;
+	u8 none : 1;
+	u8 hhp : 1;
+
+	u8 pad4 : 1; // unknown
+	u8 velocity : 4; // unknown
+	u8 softness : 3;
+
+	u16 bt; // buttons
+};
+
+struct wm_turntable_extension
+{
+	u8 sx   : 6;
+	u8 rtable3 : 2;
+
+	u8 sy   : 6;
+	u8 rtable2 : 2;
+
+	u8 rtable4 : 1;
+	u8 slider : 4;
+	u8 dial2 : 2;
+	u8 rtable1 : 1;
+
+	u8 ltable1 : 5;
+	u8 dial1 : 3;
+
+	union
+	{
+		u16 ltable2 : 1;
+		u16 bt; // buttons
+	};
+};
+
+struct wm_motionplus_data
+{
+	// yaw1, roll1, pitch1: Bits 0-7
+	// yaw2, roll2, pitch2: Bits 8-13
+
+	u8 yaw1;
+	u8 roll1;
+	u8 pitch1;
+
+	u8 pitch_slow : 1;
+	u8 yaw_slow : 1;
+	u8 yaw2 : 6;
+
+	u8 extension_connected : 1;
+	u8 roll_slow : 1;
+	u8 roll2 : 6;
+
+	u8 zero : 1;
+	u8 is_mp_data : 1;
+	u8 pitch2 : 6;
+};
+
+struct wm_report
+{
+	u8 wm;
+	union
+	{
+		u8 data[0];
+		struct
+		{
+			u8 rumble : 1; // enable/disable rumble
+			// only valid for certain reports
+			u8 ack    : 1; // respond with an ack
+			u8 enable : 1; // enable/disable certain features
+		};
+	};
+};
+
+#define WM_RUMBLE 0x10
+
+#define WM_LEDS 0x11
+struct wm_leds
+{
+	u8 rumble : 1;
+	// real Wii also sets bit 0x2 (unknown purpose)
+	u8 : 3;
+	u8 leds : 4;
+};
+
+#define WM_REPORT_MODE 0x12
+struct wm_report_mode
+{
+	u8 rumble : 1;
+	// unsure what "all_the_time" actually is, the real Wii does set it (bit 0x2)
+	u8 all_the_time : 1;
+	u8 continuous : 1;
+	u8 : 5;
+	u8 mode;
+};
+
+#define WM_IR_PIXEL_CLOCK 0x13
+#define WM_IR_LOGIC 0x1A
+
+#define WM_REQUEST_STATUS 0x15
+struct wm_request_status
+{
+	u8 rumble : 1;
+	u8 : 7;
+};
+
+#define WM_STATUS_REPORT 0x20
+struct wm_status_report
+{
+	wm_buttons buttons;
+	u8 battery_low : 1;
+	u8 extension : 1;
+	u8 speaker : 1;
+	u8 ir : 1;
+	u8 leds : 4;
+	u8 padding2[2]; // two 00, TODO: this needs more investigation
+	u8 battery;
+};
+
+#define WM_WRITE_DATA 0x16
+struct wm_write_data
+{
+	u8 rumble : 1;
+	u8 space : 2; //see WM_SPACE_*
+	u8 : 5;
+	u8 address[3];
+	u8 size;
+	u8 data[16];
+};
+
+#define WM_ACK_DATA 0x22
+struct wm_acknowledge
+{
+	wm_buttons buttons;
+	u8 reportID;
+	u8 errorID;
+};
+
+#define WM_READ_DATA 0x17
+struct wm_read_data
+{
+	u8 rumble : 1;
+	u8 space : 2; //see WM_SPACE_*
+	u8 : 5;
+	u8 address[3];
+	u16 size;
+};
+
+#define WM_SPACE_EEPROM 0
+#define WM_SPACE_REGS1 1
+#define WM_SPACE_REGS2 2
+#define WM_SPACE_INVALID 3
+
+#define WM_READ_DATA_REPLY 0x21
+struct wm_read_data_reply
+{
+	wm_buttons buttons;
+	u8 error : 4; //see WM_RDERR_*
+	u8 size : 4;
+	u16 address;
+	u8 data[16];
+};
+
+#define WM_RDERR_WOREG 7
+#define WM_RDERR_NOMEM 8
+
+
+// Data reports
+
+#define WM_REPORT_CORE 0x30
+struct wm_report_core
+{
+	wm_buttons c;
+};
+
+#define WM_REPORT_CORE_ACCEL 0x31
+struct wm_report_core_accel
+{
+	wm_buttons c;
+	wm_accel a;
+};
+
+#define WM_REPORT_CORE_EXT8 0x32
+
+#define WM_REPORT_CORE_ACCEL_IR12 0x33
+struct wm_report_core_accel_ir12
+{
+	wm_buttons c;
+	wm_accel a;
+	wm_ir_extended ir[4];
+};
+
+#define WM_REPORT_CORE_EXT19 0x34
+#define WM_REPORT_CORE_ACCEL_EXT16 0x35
+struct wm_report_core_accel_ext16
+{
+	wm_buttons c;
+	wm_accel a;
+	wm_nc ext; // TODO: Does this make any sense? Shouldn't it be just a general "extension" field?
+	//wm_ir_basic ir[2];
+	u8 pad[10];
+
+};
+
+#define WM_REPORT_CORE_IR10_EXT9 0x36
+
+#define WM_REPORT_CORE_ACCEL_IR10_EXT6 0x37
+struct wm_report_core_accel_ir10_ext6
+{
+	wm_buttons c;
+	wm_accel a;
+	wm_ir_basic ir[2];
+	//u8 ext[6];
+	wm_nc ext; // TODO: Does this make any sense? Shouldn't it be just a general "extension" field?
+};
+
+#define WM_REPORT_EXT21 0x3d // never used?
+struct wm_report_ext21
+{
+	u8 ext[21];
+};
+
+#define WM_REPORT_INTERLEAVE1 0x3e
+#define WM_REPORT_INTERLEAVE2 0x3f
+
+#define WM_SPEAKER_ENABLE 0x14
+#define WM_SPEAKER_MUTE 0x19
+#define WM_WRITE_SPEAKER_DATA 0x18
+struct wm_speaker_data
+{
+	u8 unknown : 3;
+	u8 length : 5;
+	u8 data[20];
+};
+
+// Custom structs
+
+#pragma pack(pop)
diff --git a/Source/Core/Core/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp
new file mode 100644
index 0000000000..a36cf17489
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+namespace WiimoteReal
+{
+
+WiimoteScanner::WiimoteScanner()
+{}
+
+WiimoteScanner::~WiimoteScanner()
+{}
+
+void WiimoteScanner::Update()
+{}
+
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
+{
+	found_wiimotes.clear();
+	found_board = nullptr;
+}
+
+bool WiimoteScanner::IsReady() const
+{
+	return false;
+}
+
+};
diff --git a/Source/Core/Core/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/HW/WiimoteReal/IONix.cpp
new file mode 100644
index 0000000000..687a9af3a2
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/IONix.cpp
@@ -0,0 +1,279 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
+#include <bluetooth/l2cap.h>
+
+#include "Common/Common.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+namespace WiimoteReal
+{
+
+class WiimoteLinux final : public Wiimote
+{
+public:
+	WiimoteLinux(bdaddr_t bdaddr);
+	~WiimoteLinux() override;
+
+protected:
+	bool ConnectInternal() override;
+	void DisconnectInternal() override;
+	bool IsConnected() const override;
+	void IOWakeup() override;
+	int IORead(u8* buf) override;
+	int IOWrite(u8 const* buf, size_t len) override;
+
+private:
+	bdaddr_t m_bdaddr;   // Bluetooth address
+	int m_cmd_sock;      // Command socket
+	int m_int_sock;      // Interrupt socket
+	int m_wakeup_pipe_w;
+	int m_wakeup_pipe_r;
+};
+
+WiimoteScanner::WiimoteScanner()
+	: m_want_wiimotes()
+	, device_id(-1)
+	, device_sock(-1)
+{
+	// Get the id of the first Bluetooth device.
+	device_id = hci_get_route(nullptr);
+	if (device_id < 0)
+	{
+		NOTICE_LOG(WIIMOTE, "Bluetooth not found.");
+		return;
+	}
+
+	// Create a socket to the device
+	device_sock = hci_open_dev(device_id);
+	if (device_sock < 0)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to open Bluetooth.");
+		return;
+	}
+}
+
+bool WiimoteScanner::IsReady() const
+{
+	return device_sock > 0;
+}
+
+WiimoteScanner::~WiimoteScanner()
+{
+	if (IsReady())
+		close(device_sock);
+}
+
+void WiimoteScanner::Update()
+{}
+
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
+{
+	// supposedly 1.28 seconds
+	int const wait_len = 1;
+
+	int const max_infos = 255;
+	inquiry_info scan_infos[max_infos] = {};
+	auto* scan_infos_ptr = scan_infos;
+	found_board = nullptr;
+
+	// Scan for Bluetooth devices
+	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, nullptr, &scan_infos_ptr, IREQ_CACHE_FLUSH);
+	if (found_devices < 0)
+	{
+		ERROR_LOG(WIIMOTE, "Error searching for Bluetooth devices.");
+		return;
+	}
+
+	DEBUG_LOG(WIIMOTE, "Found %i Bluetooth device(s).", found_devices);
+
+	// Display discovered devices
+	for (int i = 0; i < found_devices; ++i)
+	{
+		ERROR_LOG(WIIMOTE, "found a device...");
+
+		// BT names are a maximum of 248 bytes apparently
+		char name[255] = {};
+		if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 1000) < 0)
+		{
+			ERROR_LOG(WIIMOTE, "name request failed");
+			continue;
+		}
+
+		ERROR_LOG(WIIMOTE, "device name %s", name);
+		if (IsValidBluetoothName(name))
+		{
+			bool new_wiimote = true;
+
+			// TODO: do this
+
+			// Determine if this Wiimote has already been found.
+			//for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j)
+			//{
+			//	if (wm[j] && bacmp(&scan_infos[i].bdaddr,&wm[j]->bdaddr) == 0)
+			//		new_wiimote = false;
+			//}
+
+			if (new_wiimote)
+			{
+				// Found a new device
+				char bdaddr_str[18] = {};
+				ba2str(&scan_infos[i].bdaddr, bdaddr_str);
+
+				Wiimote* wm = new WiimoteLinux(scan_infos[i].bdaddr);
+				if (IsBalanceBoardName(name))
+				{
+					found_board = wm;
+					NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);
+				}
+				else
+				{
+					found_wiimotes.push_back(wm);
+					NOTICE_LOG(WIIMOTE, "Found Wiimote (%s).", bdaddr_str);
+				}
+			}
+		}
+	}
+
+}
+
+WiimoteLinux::WiimoteLinux(bdaddr_t bdaddr) : Wiimote(), m_bdaddr(bdaddr)
+{
+	m_cmd_sock = -1;
+	m_int_sock = -1;
+
+	int fds[2];
+	if (pipe(fds))
+	{
+		ERROR_LOG(WIIMOTE, "pipe failed");
+		abort();
+	}
+	m_wakeup_pipe_w = fds[1];
+	m_wakeup_pipe_r = fds[0];
+}
+
+WiimoteLinux::~WiimoteLinux()
+{
+	Shutdown();
+	close(m_wakeup_pipe_w);
+	close(m_wakeup_pipe_r);
+}
+
+// Connect to a Wiimote with a known address.
+bool WiimoteLinux::ConnectInternal()
+{
+	sockaddr_l2 addr = {};
+	addr.l2_family = AF_BLUETOOTH;
+	addr.l2_bdaddr = m_bdaddr;
+	addr.l2_cid = 0;
+
+	// Output channel
+	addr.l2_psm = htobs(WM_OUTPUT_CHANNEL);
+	if ((m_cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
+	                  connect(m_cmd_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
+	{
+		WARN_LOG(WIIMOTE, "Unable to open output socket to Wiimote: %s", strerror(errno));
+		close(m_cmd_sock);
+		m_cmd_sock = -1;
+		return false;
+	}
+
+	// Input channel
+	addr.l2_psm = htobs(WM_INPUT_CHANNEL);
+	if ((m_int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
+	                  connect(m_int_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
+	{
+		WARN_LOG(WIIMOTE, "Unable to open input socket from Wiimote: %s", strerror(errno));
+		close(m_int_sock);
+		close(m_cmd_sock);
+		m_int_sock = m_cmd_sock = -1;
+		return false;
+	}
+
+	return true;
+}
+
+void WiimoteLinux::DisconnectInternal()
+{
+	close(m_cmd_sock);
+	close(m_int_sock);
+
+	m_cmd_sock = -1;
+	m_int_sock = -1;
+}
+
+bool WiimoteLinux::IsConnected() const
+{
+	return m_cmd_sock != -1;// && int_sock != -1;
+}
+
+void WiimoteLinux::IOWakeup()
+{
+	char c = 0;
+	if (write(m_wakeup_pipe_w, &c, 1) != 1)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to write to wakeup pipe.");
+	}
+}
+
+// positive = read packet
+// negative = didn't read packet
+// zero = error
+int WiimoteLinux::IORead(u8* buf)
+{
+	// Block select for 1/2000th of a second
+
+	fd_set fds;
+	FD_ZERO(&fds);
+	FD_SET(m_int_sock, &fds);
+	FD_SET(m_wakeup_pipe_r, &fds);
+
+	if (select(m_int_sock + 1, &fds, nullptr, nullptr, nullptr) == -1)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to select Wiimote %i input socket.", m_index + 1);
+		return -1;
+	}
+
+	if (FD_ISSET(m_wakeup_pipe_r, &fds))
+	{
+		char c;
+		if (read(m_wakeup_pipe_r, &c, 1) != 1)
+		{
+			ERROR_LOG(WIIMOTE, "Unable to read from wakeup pipe.");
+		}
+		return -1;
+	}
+
+	if (!FD_ISSET(m_int_sock, &fds))
+		return -1;
+
+	// Read the pending message into the buffer
+	int r = read(m_int_sock, buf, MAX_PAYLOAD);
+	if (r == -1)
+	{
+		// Error reading data
+		ERROR_LOG(WIIMOTE, "Receiving data from Wiimote %i.", m_index + 1);
+
+		if (errno == ENOTCONN)
+		{
+			// This can happen if the Bluetooth dongle is disconnected
+			ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected.  "
+					"Wiimote %i will be disconnected.", m_index + 1);
+		}
+
+		r = 0;
+	}
+
+	return r;
+}
+
+int WiimoteLinux::IOWrite(u8 const* buf, size_t len)
+{
+	return write(m_int_sock, buf, (int)len);
+}
+
+}; // WiimoteReal
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
new file mode 100644
index 0000000000..b41c02ca66
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -0,0 +1,954 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <hidsdi.h>
+#include <unordered_map>
+#include <unordered_set>
+#include <windows.h>
+// The following Windows headers must be included AFTER windows.h.
+#include <BluetoothAPIs.h> //NOLINT
+#include <dbt.h>           //NOLINT
+#include <setupapi.h>      //NOLINT
+
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+//#define AUTHENTICATE_WIIMOTES
+#define SHARE_WRITE_WIIMOTES
+
+// Create func_t function pointer type and declare a nullptr-initialized static variable of that
+// type named "pfunc".
+#define DYN_FUNC_DECLARE(func) \
+	typedef decltype(&func) func ## _t; \
+	static func ## _t p ## func = nullptr;
+
+DYN_FUNC_DECLARE(HidD_GetHidGuid);
+DYN_FUNC_DECLARE(HidD_GetAttributes);
+DYN_FUNC_DECLARE(HidD_SetOutputReport);
+DYN_FUNC_DECLARE(HidD_GetProductString);
+
+DYN_FUNC_DECLARE(BluetoothFindDeviceClose);
+DYN_FUNC_DECLARE(BluetoothFindFirstDevice);
+DYN_FUNC_DECLARE(BluetoothFindFirstRadio);
+DYN_FUNC_DECLARE(BluetoothFindNextDevice);
+DYN_FUNC_DECLARE(BluetoothFindNextRadio);
+DYN_FUNC_DECLARE(BluetoothFindRadioClose);
+DYN_FUNC_DECLARE(BluetoothGetRadioInfo);
+DYN_FUNC_DECLARE(BluetoothRemoveDevice);
+DYN_FUNC_DECLARE(BluetoothSetServiceState);
+DYN_FUNC_DECLARE(BluetoothAuthenticateDeviceEx);
+DYN_FUNC_DECLARE(BluetoothEnumerateInstalledServices);
+
+#undef DYN_FUNC_DECLARE
+
+static HINSTANCE s_hid_lib = nullptr;
+static HINSTANCE s_bthprops_lib = nullptr;
+
+static bool s_loaded_ok = false;
+
+std::unordered_map<BTH_ADDR, std::time_t> g_connect_times;
+
+#ifdef SHARE_WRITE_WIIMOTES
+std::unordered_set<std::basic_string<TCHAR>> g_connected_wiimotes;
+std::mutex g_connected_wiimotes_lock;
+#endif
+
+#define DYN_FUNC_UNLOAD(func) \
+	p ## func = nullptr;
+
+// Attempt to load the function from the given module handle.
+#define DYN_FUNC_LOAD(module, func) \
+	p ## func = ( func ## _t)::GetProcAddress(module, # func ); \
+	if (! p ## func ) \
+	{ \
+		return false; \
+	}
+
+bool load_hid()
+{
+	auto loader = [&]()
+	{
+		s_hid_lib = ::LoadLibrary(_T("hid.dll"));
+		if (!s_hid_lib)
+		{
+			return false;
+		}
+
+		DYN_FUNC_LOAD(s_hid_lib, HidD_GetHidGuid);
+		DYN_FUNC_LOAD(s_hid_lib, HidD_GetAttributes);
+		DYN_FUNC_LOAD(s_hid_lib, HidD_SetOutputReport);
+		DYN_FUNC_LOAD(s_hid_lib, HidD_GetProductString);
+
+		return true;
+	};
+
+	bool loaded_ok = loader();
+
+	if (!loaded_ok)
+	{
+		DYN_FUNC_UNLOAD(HidD_GetHidGuid);
+		DYN_FUNC_UNLOAD(HidD_GetAttributes);
+		DYN_FUNC_UNLOAD(HidD_SetOutputReport);
+		DYN_FUNC_UNLOAD(HidD_GetProductString);
+
+		if (s_hid_lib)
+		{
+			::FreeLibrary(s_hid_lib);
+			s_hid_lib = nullptr;
+		}
+	}
+
+	return loaded_ok;
+}
+
+bool load_bthprops()
+{
+	auto loader = [&]()
+	{
+		s_bthprops_lib = ::LoadLibrary(_T("bthprops.cpl"));
+		if (!s_bthprops_lib)
+		{
+			return false;
+		}
+
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindDeviceClose);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindFirstDevice);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindFirstRadio);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindNextDevice);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindNextRadio);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothFindRadioClose);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothGetRadioInfo);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothRemoveDevice);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothSetServiceState);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothAuthenticateDeviceEx);
+		DYN_FUNC_LOAD(s_bthprops_lib, BluetoothEnumerateInstalledServices);
+
+		return true;
+	};
+
+	bool loaded_ok = loader();
+
+	if (!loaded_ok)
+	{
+		DYN_FUNC_UNLOAD(BluetoothFindDeviceClose);
+		DYN_FUNC_UNLOAD(BluetoothFindFirstDevice);
+		DYN_FUNC_UNLOAD(BluetoothFindFirstRadio);
+		DYN_FUNC_UNLOAD(BluetoothFindNextDevice);
+		DYN_FUNC_UNLOAD(BluetoothFindNextRadio);
+		DYN_FUNC_UNLOAD(BluetoothFindRadioClose);
+		DYN_FUNC_UNLOAD(BluetoothGetRadioInfo);
+		DYN_FUNC_UNLOAD(BluetoothRemoveDevice);
+		DYN_FUNC_UNLOAD(BluetoothSetServiceState);
+		DYN_FUNC_UNLOAD(BluetoothAuthenticateDeviceEx);
+		DYN_FUNC_UNLOAD(BluetoothEnumerateInstalledServices);
+
+		if (s_bthprops_lib)
+		{
+			::FreeLibrary(s_bthprops_lib);
+			s_bthprops_lib = nullptr;
+		}
+	}
+
+	return loaded_ok;
+}
+
+#undef DYN_FUNC_LOAD
+#undef DYN_FUNC_UNLOAD
+
+inline void init_lib()
+{
+	static bool initialized = false;
+
+	if (!initialized)
+	{
+		// Only try once
+		initialized = true;
+
+		// After these calls, we know all dynamically loaded APIs will either all be valid or
+		// all nullptr.
+		if (!load_hid() || !load_bthprops())
+		{
+			NOTICE_LOG(WIIMOTE,
+				"Failed to load Bluetooth support libraries, Wiimotes will not function");
+			return;
+		}
+
+		s_loaded_ok = true;
+	}
+}
+
+namespace WiimoteReal
+{
+
+class WiimoteWindows final : public Wiimote
+{
+public:
+	WiimoteWindows(const std::basic_string<TCHAR>& path);
+	~WiimoteWindows() override;
+
+protected:
+	bool ConnectInternal() override;
+	void DisconnectInternal() override;
+	bool IsConnected() const override;
+	void IOWakeup() override;
+	int IORead(u8* buf) override;
+	int IOWrite(u8 const* buf, size_t len) override;
+
+private:
+	std::basic_string<TCHAR> m_devicepath; // Unique Wiimote reference
+	HANDLE m_dev_handle;                   // HID handle
+	OVERLAPPED m_hid_overlap_read;         // Overlap handles
+	OVERLAPPED m_hid_overlap_write;
+	enum win_bt_stack_t m_stack;           // Type of Bluetooth stack to use
+};
+
+int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, size_t len, DWORD* written);
+int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index);
+
+template <typename T>
+void ProcessWiimotes(bool new_scan, T& callback);
+
+bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT&);
+void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
+bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
+
+WiimoteScanner::WiimoteScanner()
+	: m_run_thread()
+	, m_want_wiimotes()
+{
+	init_lib();
+}
+
+WiimoteScanner::~WiimoteScanner()
+{
+	// TODO: what do we want here?
+#if 0
+	ProcessWiimotes(false, [](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+	{
+		RemoveWiimote(btdi);
+	});
+#endif
+}
+
+void WiimoteScanner::Update()
+{
+	if (!s_loaded_ok)
+		return;
+
+	bool forgot_some = false;
+
+	ProcessWiimotes(false, [&](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+	{
+		forgot_some |= ForgetWiimote(btdi);
+	});
+
+	// Some hacks that allows disconnects to be detected before connections are handled
+	// workaround for Wiimote 1 moving to slot 2 on temporary disconnect
+	if (forgot_some)
+		SLEEP(100);
+}
+
+// Find and connect Wiimotes.
+// Does not replace already found Wiimotes even if they are disconnected.
+// wm is an array of max_wiimotes Wiimotes
+// Returns the total number of found and connected Wiimotes.
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
+{
+	if (!s_loaded_ok)
+		return;
+
+	ProcessWiimotes(true, [](HANDLE hRadio, const BLUETOOTH_RADIO_INFO& rinfo, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+	{
+		ForgetWiimote(btdi);
+		AttachWiimote(hRadio, rinfo, btdi);
+	});
+
+	// Get the device id
+	GUID device_id;
+	pHidD_GetHidGuid(&device_id);
+
+	// Get all hid devices connected
+	HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, nullptr, nullptr, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
+
+	SP_DEVICE_INTERFACE_DATA device_data;
+	device_data.cbSize = sizeof(device_data);
+	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = nullptr;
+
+	for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, nullptr, &device_id, index, &device_data); ++index)
+	{
+		// Get the size of the data block required
+		DWORD len;
+		SetupDiGetDeviceInterfaceDetail(device_info, &device_data, nullptr, 0, &len, nullptr);
+		detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len);
+		detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
+
+		// Query the data for this device
+		if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, nullptr, nullptr))
+		{
+			std::basic_string<TCHAR> device_path(detail_data->DevicePath);
+			Wiimote* wm = new WiimoteWindows(device_path);
+			bool real_wiimote = false, is_bb = false;
+
+			CheckDeviceType(device_path, real_wiimote, is_bb);
+			if (is_bb)
+			{
+				found_board = wm;
+			}
+			else if (real_wiimote)
+			{
+				found_wiimotes.push_back(wm);
+			}
+			else
+			{
+				delete wm;
+			}
+		}
+
+		free(detail_data);
+	}
+
+	SetupDiDestroyDeviceInfoList(device_info);
+
+	// Don't mind me, just a random sleep to fix stuff on Windows
+	//if (!wiimotes.empty())
+	//    SLEEP(2000);
+
+}
+int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, size_t size, int attempts)
+{
+	OVERLAPPED hid_overlap_write = OVERLAPPED();
+	hid_overlap_write.hEvent = CreateEvent(nullptr, true, false, nullptr);
+	enum win_bt_stack_t stack = MSBT_STACK_UNKNOWN;
+
+	DWORD written = 0;
+
+	for (; attempts>0; --attempts)
+	{
+		if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, size, &written))
+			break;
+	}
+
+	CloseHandle(hid_overlap_write.hEvent);
+
+	return written;
+}
+
+int CheckDeviceType_Read(HANDLE &dev_handle, u8* buf, int attempts)
+{
+	OVERLAPPED hid_overlap_read = OVERLAPPED();
+	hid_overlap_read.hEvent = CreateEvent(nullptr, true, false, nullptr);
+	int read = 0;
+	for (; attempts>0; --attempts)
+	{
+		read = _IORead(dev_handle, hid_overlap_read, buf, 1);
+		if (read > 0)
+			break;
+	}
+
+	CloseHandle(hid_overlap_read.hEvent);
+
+	return read;
+}
+
+// A convoluted way of checking if a device is a Wii Balance Board and if it is a connectible Wiimote.
+// Because nothing on Windows should be easy.
+// (We can't seem to easily identify the Bluetooth device an HID device belongs to...)
+void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb)
+{
+	real_wiimote = false;
+	is_bb = false;
+
+#ifdef SHARE_WRITE_WIIMOTES
+	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
+	if (g_connected_wiimotes.count(devicepath) != 0)
+		return;
+#endif
+
+	HANDLE dev_handle = CreateFile(devicepath.c_str(),
+	                               GENERIC_READ | GENERIC_WRITE,
+	                               FILE_SHARE_READ | FILE_SHARE_WRITE,
+	                               nullptr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED,
+	                               nullptr);
+	if (dev_handle == INVALID_HANDLE_VALUE)
+		return;
+	// enable to only check for official nintendo wiimotes/bb's
+	bool check_vidpid = false;
+	HIDD_ATTRIBUTES attrib;
+	attrib.Size = sizeof(attrib);
+	if (!check_vidpid ||
+		(pHidD_GetAttributes(dev_handle, &attrib) &&
+		(attrib.VendorID == 0x057e) &&
+		(attrib.ProductID == 0x0306)))
+	{
+		// max_cycles insures we are never stuck here due to bad coding...
+		int max_cycles = 20;
+		u8 buf[MAX_PAYLOAD] = {0};
+
+		u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
+		// The new way to initialize the extension is by writing 0x55 to 0x(4)A400F0, then writing 0x00 to 0x(4)A400FB
+		// 52 16 04 A4 00 F0 01 55
+		// 52 16 04 A4 00 FB 01 00
+		u8 const disable_enc_pt1_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xf0, 0x01, 0x55};
+		u8 const disable_enc_pt2_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xfb, 0x01, 0x00};
+
+		CheckDeviceType_Write(dev_handle,
+		                      disable_enc_pt1_report,
+		                      sizeof(disable_enc_pt1_report),
+		                      1);
+		CheckDeviceType_Write(dev_handle,
+		                      disable_enc_pt2_report,
+		                      sizeof(disable_enc_pt2_report),
+		                      1);
+
+		int rc = CheckDeviceType_Write(dev_handle,
+		                               req_status_report,
+		                               sizeof(req_status_report),
+		                               1);
+
+		while (rc > 0 && --max_cycles > 0)
+		{
+			if ((rc = CheckDeviceType_Read(dev_handle, buf, 1)) <= 0)
+			{
+				// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Read failed...");
+				break;
+			}
+
+			switch (buf[1])
+			{
+				case WM_STATUS_REPORT:
+				{
+					real_wiimote = true;
+
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report");
+					wm_status_report * wsr = (wm_status_report*)&buf[2];
+					if (wsr->extension)
+					{
+						// Wiimote with extension, we ask it what kind.
+						u8 read_ext[MAX_PAYLOAD] = {0};
+						read_ext[0] = WM_SET_REPORT | WM_BT_OUTPUT;
+						read_ext[1] = WM_READ_DATA;
+						// Extension type register.
+						*(u32*)&read_ext[2] = Common::swap32(0x4a400fa);
+						// Size.
+						*(u16*)&read_ext[6] = Common::swap16(6);
+						rc = CheckDeviceType_Write(dev_handle, read_ext, 8, 1);
+					}
+					else
+					{
+						// Normal Wiimote, exit while and be happy.
+						rc = -1;
+					}
+					break;
+				}
+				case WM_ACK_DATA:
+				{
+					real_wiimote = true;
+					//wm_acknowledge * wm = (wm_acknowledge*)&buf[2];
+					//DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack Error: %X ReportID: %X", wm->errorID, wm->reportID);
+					break;
+				}
+				case WM_READ_DATA_REPLY:
+				{
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Data Reply");
+					wm_read_data_reply * wrdr
+						= (wm_read_data_reply*)&buf[2];
+					// Check if it has returned what we asked.
+					if (Common::swap16(wrdr->address) == 0x00fa)
+					{
+						real_wiimote = true;
+						// 0x020420A40000ULL means balance board.
+						u64 ext_type = (*(u64*)&wrdr->data[0]);
+						// DEBUG_LOG(WIIMOTE,
+						//           "CheckDeviceType: GOT EXT TYPE %llX",
+						//           ext_type);
+						is_bb = (ext_type == 0x020420A40000ULL);
+					}
+					else
+					{
+						ERROR_LOG(WIIMOTE,
+						          "CheckDeviceType: GOT UNREQUESTED ADDRESS %X",
+						          Common::swap16(wrdr->address));
+					}
+					// force end
+					rc = -1;
+
+					break;
+				}
+				default:
+				{
+					// We let read try again incase there is another packet waiting.
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: GOT UNKNOWN REPLY: %X", buf[1]);
+					break;
+				}
+			}
+		}
+	}
+	CloseHandle(dev_handle);
+}
+
+bool WiimoteScanner::IsReady() const
+{
+	if (!s_loaded_ok)
+	{
+		return false;
+	}
+
+	// TODO: don't search for a radio each time
+
+	BLUETOOTH_FIND_RADIO_PARAMS radioParam;
+	radioParam.dwSize = sizeof(radioParam);
+
+	HANDLE hRadio;
+	HBLUETOOTH_RADIO_FIND hFindRadio = pBluetoothFindFirstRadio(&radioParam, &hRadio);
+
+	if (nullptr != hFindRadio)
+	{
+		pBluetoothFindRadioClose(hFindRadio);
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+// Connect to a Wiimote with a known device path.
+bool WiimoteWindows::ConnectInternal()
+{
+	if (IsConnected())
+		return false;
+
+#ifdef SHARE_WRITE_WIIMOTES
+	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
+	if (g_connected_wiimotes.count(m_devicepath) != 0)
+		return false;
+
+	auto const open_flags = FILE_SHARE_READ | FILE_SHARE_WRITE;
+#else
+	// Having no FILE_SHARE_WRITE disallows us from connecting to the same Wiimote twice.
+	// (And disallows using Wiimotes in use by other programs)
+	// This is what "WiiYourself" does.
+	// Apparently this doesn't work for everyone. It might be their fault.
+	auto const open_flags = FILE_SHARE_READ;
+#endif
+
+	m_dev_handle = CreateFile(m_devicepath.c_str(),
+		GENERIC_READ | GENERIC_WRITE, open_flags,
+		nullptr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, nullptr);
+
+	if (m_dev_handle == INVALID_HANDLE_VALUE)
+	{
+		m_dev_handle = 0;
+		return false;
+	}
+
+#if 0
+	TCHAR name[128] = {};
+	pHidD_GetProductString(dev_handle, name, 128);
+
+	//ERROR_LOG(WIIMOTE, "Product string: %s", TStrToUTF8(name).c_str());
+
+	if (!IsValidBluetoothName(TStrToUTF8(name)))
+	{
+		CloseHandle(dev_handle);
+		dev_handle = 0;
+		return false;
+	}
+#endif
+
+#if 0
+	HIDD_ATTRIBUTES attr;
+	attr.Size = sizeof(attr);
+	if (!pHidD_GetAttributes(dev_handle, &attr))
+	{
+		CloseHandle(dev_handle);
+		dev_handle = 0;
+		return false;
+	}
+#endif
+
+	// TODO: thread isn't started here now, do this elsewhere
+	// This isn't as drastic as it sounds, since the process in which the threads
+	// reside is normal priority. Needed for keeping audio reports at a decent rate
+/*
+	if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL))
+	{
+		ERROR_LOG(WIIMOTE, "Failed to set Wiimote thread priority");
+	}
+*/
+#ifdef SHARE_WRITE_WIIMOTES
+	g_connected_wiimotes.insert(m_devicepath);
+#endif
+
+	return true;
+}
+
+void WiimoteWindows::DisconnectInternal()
+{
+	if (!IsConnected())
+		return;
+
+	CloseHandle(m_dev_handle);
+	m_dev_handle = 0;
+
+#ifdef SHARE_WRITE_WIIMOTES
+	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
+	g_connected_wiimotes.erase(m_devicepath);
+#endif
+}
+
+WiimoteWindows::WiimoteWindows(const std::basic_string<TCHAR>& path) : m_devicepath(path)
+{
+	m_dev_handle = 0;
+	m_stack = MSBT_STACK_UNKNOWN;
+
+	m_hid_overlap_read = OVERLAPPED();
+	m_hid_overlap_read.hEvent = CreateEvent(nullptr, true, false, nullptr);
+
+	m_hid_overlap_write = OVERLAPPED();
+	m_hid_overlap_write.hEvent = CreateEvent(nullptr, true, false, nullptr);
+}
+
+WiimoteWindows::~WiimoteWindows()
+{
+	Shutdown();
+	CloseHandle(m_hid_overlap_read.hEvent);
+	CloseHandle(m_hid_overlap_write.hEvent);
+}
+
+bool WiimoteWindows::IsConnected() const
+{
+	return m_dev_handle != 0;
+}
+
+// positive = read packet
+// negative = didn't read packet
+// zero = error
+int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index)
+{
+	// Add data report indicator byte (here, 0xa1)
+	buf[0] = 0xa1;
+	// Used below for a warning
+	buf[1] = 0;
+
+	DWORD bytes = 0;
+	ResetEvent(hid_overlap_read.hEvent);
+	if (!ReadFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read))
+	{
+		auto const read_err = GetLastError();
+
+		if (ERROR_IO_PENDING == read_err)
+		{
+			auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, INFINITE);
+
+			// In case the event was signalled by IOWakeup before the read completed, cancel it.
+			CancelIo(dev_handle);
+
+			if (WAIT_FAILED == wait_result)
+			{
+				WARN_LOG(WIIMOTE, "A wait error occurred on reading from Wiimote %i.", index + 1);
+			}
+
+			if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, FALSE))
+			{
+				auto const overlapped_err = GetLastError();
+
+				if (ERROR_OPERATION_ABORTED == overlapped_err)
+				{
+					// It was.
+					return -1;
+				}
+
+				WARN_LOG(WIIMOTE, "GetOverlappedResult error %d on Wiimote %i.", overlapped_err, index + 1);
+				return 0;
+			}
+		}
+		else
+		{
+			WARN_LOG(WIIMOTE, "ReadFile error %d on Wiimote %i.", read_err, index + 1);
+			return 0;
+		}
+	}
+
+	return bytes + 1;
+}
+
+void WiimoteWindows::IOWakeup()
+{
+	SetEvent(m_hid_overlap_read.hEvent);
+}
+
+
+// positive = read packet
+// negative = didn't read packet
+// zero = error
+int WiimoteWindows::IORead(u8* buf)
+{
+	return _IORead(m_dev_handle, m_hid_overlap_read, buf, m_index);
+}
+
+
+int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, size_t len, DWORD* written)
+{
+	switch (stack)
+	{
+		case MSBT_STACK_UNKNOWN:
+		{
+			// Try to auto-detect the stack type
+			stack = MSBT_STACK_BLUESOLEIL;
+			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len, written))
+				return 1;
+
+			stack = MSBT_STACK_MS;
+			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len, written))
+				return 1;
+
+			stack = MSBT_STACK_UNKNOWN;
+			break;
+		}
+		case MSBT_STACK_MS:
+		{
+			auto result = pHidD_SetOutputReport(dev_handle, const_cast<u8*>(buf) + 1, (ULONG)(len - 1));
+			//FlushFileBuffers(dev_handle);
+
+			if (!result)
+			{
+				auto err = GetLastError();
+				if (err == 121)
+				{
+					// Semaphore timeout
+					NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to the Wiimote");
+				}
+				else if (err != 0x1F)  // Some third-party adapters (DolphinBar) use this
+				                       // error code to signal the absence of a Wiimote
+				                       // linked to the HID device.
+				{
+					WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err);
+				}
+			}
+
+			if (written)
+				*written = (result ? (DWORD)len : 0);
+
+			return result;
+		}
+		case MSBT_STACK_BLUESOLEIL:
+		{
+			u8 big_buf[MAX_PAYLOAD];
+			if (len < MAX_PAYLOAD)
+			{
+				std::copy(buf, buf + len, big_buf);
+				std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0);
+				buf = big_buf;
+			}
+
+			ResetEvent(hid_overlap_write.hEvent);
+			DWORD bytes = 0;
+			if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write))
+			{
+				// If the number of written bytes is requested, block until we can provide
+				// this information to the called.
+				if (written)
+				{
+					auto const wait_result = WaitForSingleObject(hid_overlap_write.hEvent, WIIMOTE_DEFAULT_TIMEOUT);
+					if (WAIT_TIMEOUT == wait_result)
+					{
+						WARN_LOG(WIIMOTE, "_IOWrite: A timeout occurred on writing to Wiimote.");
+						CancelIo(dev_handle);
+						*written = 0;
+					}
+					else if (WAIT_FAILED == wait_result)
+					{
+						WARN_LOG(WIIMOTE, "_IOWrite: A wait error occurred on writing to Wiimote.");
+						CancelIo(dev_handle);
+						*written = 0;
+					}
+					else if (!GetOverlappedResult(dev_handle, &hid_overlap_write, written, TRUE))
+						*written = 0;
+				}
+				return 1;
+			}
+			else
+			{
+				auto const err = GetLastError();
+				if (ERROR_IO_PENDING == err)
+				{
+					CancelIo(dev_handle);
+				}
+				return 0;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int WiimoteWindows::IOWrite(const u8* buf, size_t len)
+{
+	return _IOWrite(m_dev_handle, m_hid_overlap_write, m_stack, buf, len, nullptr);
+}
+
+// invokes callback for each found Wiimote Bluetooth device
+template <typename T>
+void ProcessWiimotes(bool new_scan, T& callback)
+{
+	BLUETOOTH_DEVICE_SEARCH_PARAMS srch;
+	srch.dwSize = sizeof(srch);
+	srch.fReturnAuthenticated = true;
+	srch.fReturnRemembered = true;
+	// Does not filter properly somehow, so we need to do an additional check on
+	// fConnected BT Devices
+	srch.fReturnConnected = true;
+	srch.fReturnUnknown = true;
+	srch.fIssueInquiry = new_scan;
+	// multiple of 1.28 seconds
+	srch.cTimeoutMultiplier = 2;
+
+	BLUETOOTH_FIND_RADIO_PARAMS radioParam;
+	radioParam.dwSize = sizeof(radioParam);
+
+	HANDLE hRadio;
+
+	// TODO: save radio(s) in the WiimoteScanner constructor?
+
+	// Enumerate BT radios
+	HBLUETOOTH_RADIO_FIND hFindRadio = pBluetoothFindFirstRadio(&radioParam, &hRadio);
+	while (hFindRadio)
+	{
+		BLUETOOTH_RADIO_INFO radioInfo;
+		radioInfo.dwSize = sizeof(radioInfo);
+
+		auto const rinfo_result = pBluetoothGetRadioInfo(hRadio, &radioInfo);
+		if (ERROR_SUCCESS == rinfo_result)
+		{
+			srch.hRadio = hRadio;
+
+			BLUETOOTH_DEVICE_INFO btdi;
+			btdi.dwSize = sizeof(btdi);
+
+			// Enumerate BT devices
+			HBLUETOOTH_DEVICE_FIND hFindDevice = pBluetoothFindFirstDevice(&srch, &btdi);
+			while (hFindDevice)
+			{
+				// btdi.szName is sometimes missing it's content - it's a bt feature..
+				DEBUG_LOG(WIIMOTE, "Authenticated %i connected %i remembered %i ",
+				          btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered);
+
+				if (IsValidBluetoothName(UTF16ToUTF8(btdi.szName)))
+				{
+					callback(hRadio, radioInfo, btdi);
+				}
+
+				if (false == pBluetoothFindNextDevice(hFindDevice, &btdi))
+				{
+					pBluetoothFindDeviceClose(hFindDevice);
+					hFindDevice = nullptr;
+				}
+			}
+		}
+
+		if (false == pBluetoothFindNextRadio(hFindRadio, &hRadio))
+		{
+			pBluetoothFindRadioClose(hFindRadio);
+			hFindRadio = nullptr;
+		}
+	}
+}
+
+void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+{
+	//if (btdi.fConnected)
+	{
+		if (SUCCEEDED(pBluetoothRemoveDevice(&btdi.Address)))
+		{
+			NOTICE_LOG(WIIMOTE, "Removed BT Device", GetLastError());
+		}
+	}
+}
+
+bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+{
+	// We don't want "remembered" devices.
+	// SetServiceState will just fail with them..
+	if (!btdi.fConnected && !btdi.fRemembered)
+	{
+		auto const& wm_addr = btdi.Address.rgBytes;
+
+		NOTICE_LOG(WIIMOTE, "Found Wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.",
+		           wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]);
+
+#if defined(AUTHENTICATE_WIIMOTES)
+		// Authenticate
+		auto const& radio_addr = radio_info.address.rgBytes;
+		// FIXME Not sure this usage of OOB_DATA_INFO is correct...
+		BLUETOOTH_OOB_DATA_INFO oob_data_info = { 0 };
+		memcpy(&oob_data_info.C[0], &radio_addr[0], sizeof(WCHAR) * 6);
+		const DWORD auth_result = pBluetoothAuthenticateDeviceEx(nullptr, hRadio, &btdi,
+			&oob_data_info, MITMProtectionNotDefined);
+
+		if (ERROR_SUCCESS != auth_result)
+		{
+			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothAuthenticateDeviceEx returned %08x", auth_result);
+		}
+
+		DWORD pcServices = 16;
+		GUID guids[16];
+		// If this is not done, the Wii device will not remember the pairing
+		const DWORD srv_result = pBluetoothEnumerateInstalledServices(hRadio, &btdi, &pcServices, guids);
+
+		if (ERROR_SUCCESS != srv_result)
+		{
+			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothEnumerateInstalledServices returned %08x", srv_result);
+		}
+#endif
+		// Activate service
+		const DWORD hr = pBluetoothSetServiceState(hRadio, &btdi,
+			&HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE);
+
+		g_connect_times[btdi.Address.ullLong] = std::time(nullptr);
+
+		if (FAILED(hr))
+		{
+			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothSetServiceState returned %08x", hr);
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+// Removes remembered non-connected devices
+bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
+{
+	if (!btdi.fConnected && btdi.fRemembered)
+	{
+		// Time to avoid RemoveDevice after SetServiceState.
+		// Sometimes SetServiceState takes a while..
+		auto const avoid_forget_seconds = 5.0;
+
+		auto pair_time = g_connect_times.find(btdi.Address.ullLong);
+		if (pair_time == g_connect_times.end() ||
+		    std::difftime(time(nullptr), pair_time->second) >= avoid_forget_seconds)
+		{
+			// Make Windows forget about device so it will re-find it if visible.
+			// This is also required to detect a disconnect for some reason..
+			NOTICE_LOG(WIIMOTE, "Removing remembered Wiimote.");
+			pBluetoothRemoveDevice(&btdi.Address);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+};
diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
new file mode 100644
index 0000000000..253c93b5a2
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
@@ -0,0 +1,382 @@
+#define BLUETOOTH_VERSION_USE_CURRENT
+
+#include "Common/Common.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+
+@interface SearchBT: NSObject {
+@public
+	unsigned int maxDevices;
+	bool done;
+}
+@end
+
+@interface ConnectBT: NSObject {}
+@end
+
+namespace WiimoteReal
+{
+
+class WiimoteDarwin final : public Wiimote
+{
+public:
+	WiimoteDarwin(IOBluetoothDevice* device);
+	~WiimoteDarwin() override;
+
+	// These are not protected/private because ConnectBT needs them.
+	void DisconnectInternal() override;
+	IOBluetoothDevice* m_btd;
+	unsigned char* m_input;
+	int m_inputlen;
+
+protected:
+	bool ConnectInternal() override;
+	bool IsConnected() const override;
+	void IOWakeup() override;
+	int IORead(u8* buf) override;
+	int IOWrite(u8 const* buf, size_t len) override;
+	void EnablePowerAssertionInternal() override;
+	void DisablePowerAssertionInternal() override;
+
+private:
+	IOBluetoothL2CAPChannel* m_ichan;
+	IOBluetoothL2CAPChannel* m_cchan;
+	bool m_connected;
+	CFRunLoopRef m_wiimote_thread_run_loop;
+	IOPMAssertionID m_pm_assertion;
+};
+
+WiimoteScanner::WiimoteScanner()
+	: m_run_thread()
+	, m_want_wiimotes()
+{}
+
+WiimoteScanner::~WiimoteScanner()
+{}
+
+void WiimoteScanner::Update()
+{}
+
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
+{
+	// TODO: find the device in the constructor and save it for later
+	IOBluetoothHostController *bth;
+	IOBluetoothDeviceInquiry *bti;
+	SearchBT *sbt;
+	NSEnumerator *en;
+	found_board = nullptr;
+
+	bth = [[IOBluetoothHostController alloc] init];
+	if ([bth addressAsString] == nil)
+	{
+		WARN_LOG(WIIMOTE, "No Bluetooth host controller");
+		[bth release];
+		return;
+	}
+
+	sbt = [[SearchBT alloc] init];
+	sbt->maxDevices = 32;
+	bti = [[IOBluetoothDeviceInquiry alloc] init];
+	[bti setDelegate: sbt];
+	[bti setInquiryLength: 2];
+
+	if ([bti start] != kIOReturnSuccess)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to do Bluetooth discovery");
+		[bth release];
+		[sbt release];
+		return;
+	}
+
+	do
+	{
+		CFRunLoopRun();
+	}
+	while (!sbt->done);
+
+	int found_devices = [[bti foundDevices] count];
+
+	if (found_devices)
+		NOTICE_LOG(WIIMOTE, "Found %i Bluetooth devices", found_devices);
+
+	en = [[bti foundDevices] objectEnumerator];
+	for (int i = 0; i < found_devices; i++)
+	{
+		IOBluetoothDevice *dev = [en nextObject];
+		if (!IsValidBluetoothName([[dev name] UTF8String]))
+			continue;
+
+		Wiimote* wm = new WiimoteDarwin([dev retain]);
+		
+		if (IsBalanceBoardName([[dev name] UTF8String]))
+		{
+			found_board = wm;
+		}
+		else
+		{
+			found_wiimotes.push_back(wm);
+		}
+	}
+
+	[bth release];
+	[bti release];
+	[sbt release];
+}
+
+bool WiimoteScanner::IsReady() const
+{
+	// TODO: only return true when a BT device is present
+	return true;
+}
+
+WiimoteDarwin::WiimoteDarwin(IOBluetoothDevice* device) : m_btd(device)
+{
+	m_inputlen = 0;
+	m_connected = false;
+	m_wiimote_thread_run_loop = nullptr;
+	m_pm_assertion = kIOPMNullAssertionID;
+}
+
+WiimoteDarwin::~WiimoteDarwin()
+{
+	Shutdown();
+	if (m_wiimote_thread_run_loop)
+	{
+		CFRelease(m_wiimote_thread_run_loop);
+		m_wiimote_thread_run_loop = nullptr;
+	}
+	[m_btd release];
+	m_btd = nil;
+	DisablePowerAssertionInternal();
+}
+
+// Connect to a Wiimote with a known address.
+bool WiimoteDarwin::ConnectInternal()
+{
+	if (IsConnected())
+		return false;
+
+	ConnectBT *cbt = [[ConnectBT alloc] init];
+
+	m_cchan = m_ichan = nil;
+
+	IOReturn ret = [m_btd openConnection];
+	if (ret)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to open Bluetooth connection to Wiimote %i: %x",
+		          m_index + 1, ret);
+		[cbt release];
+		return false;
+	}
+
+	ret = [m_btd openL2CAPChannelSync: &m_cchan
+	           withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt];
+	if (ret)
+	{
+		ERROR_LOG(WIIMOTE, "Unable to open control channel for Wiimote %i: %x",
+		          m_index + 1, ret);
+		goto bad;
+	}
+	// Apple docs claim:
+	// "The L2CAP channel object is already retained when this function returns
+	// success; the channel must be released when the caller is done with it."
+	// But without this, the channels get over-autoreleased, even though the
+	// refcounting behavior here is clearly correct.
+	[m_cchan retain];
+
+	ret = [m_btd openL2CAPChannelSync: &m_ichan
+	           withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt];
+	if (ret)
+	{
+		WARN_LOG(WIIMOTE, "Unable to open interrupt channel for Wiimote %i: %x",
+		         m_index + 1, ret);
+		goto bad;
+	}
+	[m_ichan retain];
+
+	NOTICE_LOG(WIIMOTE, "Connected to Wiimote %i at %s",
+	           m_index + 1, [[m_btd addressString] UTF8String]);
+
+	m_connected = true;
+
+	[cbt release];
+
+	m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent());
+
+	return true;
+
+bad:
+	DisconnectInternal();
+	[cbt release];
+	return false;
+}
+
+// Disconnect a Wiimote.
+void WiimoteDarwin::DisconnectInternal()
+{
+	[m_ichan closeChannel];
+	[m_ichan release];
+	m_ichan = nil;
+
+	[m_cchan closeChannel];
+	[m_cchan release];
+	m_cchan = nil;
+
+	[m_btd closeConnection];
+
+	if (!IsConnected())
+		return;
+
+	NOTICE_LOG(WIIMOTE, "Disconnecting Wiimote %i", m_index + 1);
+
+	m_connected = false;
+}
+
+bool WiimoteDarwin::IsConnected() const
+{
+	return m_connected;
+}
+
+void WiimoteDarwin::IOWakeup()
+{
+	if (m_wiimote_thread_run_loop)
+	{
+		CFRunLoopStop(m_wiimote_thread_run_loop);
+	}
+}
+
+int WiimoteDarwin::IORead(unsigned char *buf)
+{
+	m_input = buf;
+	m_inputlen = -1;
+
+	CFRunLoopRun();
+
+	return m_inputlen;
+}
+
+int WiimoteDarwin::IOWrite(const unsigned char *buf, size_t len)
+{
+	IOReturn ret;
+
+	if (!IsConnected())
+		return 0;
+
+	ret = [m_ichan writeAsync: const_cast<void*>((void *)buf) length: (int)len refcon: nil];
+
+	if (ret == kIOReturnSuccess)
+		return len;
+	else
+		return 0;
+}
+
+void WiimoteDarwin::EnablePowerAssertionInternal()
+{
+	if (m_pm_assertion == kIOPMNullAssertionID)
+	{
+		if (IOReturn ret = IOPMAssertionCreateWithName(kIOPMAssertPreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Dolphin Wiimote activity"), &m_pm_assertion))
+			ERROR_LOG(WIIMOTE, "Could not create power management assertion: %08x", ret);
+	}
+}
+
+void WiimoteDarwin::DisablePowerAssertionInternal()
+{
+	if (m_pm_assertion != kIOPMNullAssertionID)
+	{
+		if (IOReturn ret = IOPMAssertionRelease(m_pm_assertion))
+			ERROR_LOG(WIIMOTE, "Could not release power management assertion: %08x", ret);
+	}
+}
+
+} // namespace
+
+@implementation SearchBT
+- (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender
+	error: (IOReturn) error
+	aborted: (BOOL) aborted
+{
+	done = true;
+	CFRunLoopStop(CFRunLoopGetCurrent());
+}
+
+- (void) deviceInquiryDeviceFound: (IOBluetoothDeviceInquiry *) sender
+	device: (IOBluetoothDevice *) device
+{
+	NOTICE_LOG(WIIMOTE, "Discovered Bluetooth device at %s: %s",
+		[[device addressString] UTF8String],
+		[[device name] UTF8String]);
+
+	if ([[sender foundDevices] count] == maxDevices)
+		[sender stop];
+}
+@end
+
+@implementation ConnectBT
+- (void) l2capChannelData: (IOBluetoothL2CAPChannel *) l2capChannel
+	data: (unsigned char *) data
+	length: (NSUInteger) length
+{
+	IOBluetoothDevice *device = [l2capChannel device];
+	WiimoteReal::WiimoteDarwin *wm = nullptr;
+
+	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
+
+	for (int i = 0; i < MAX_WIIMOTES; i++)
+	{
+		wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]);
+		if (!wm)
+			continue;
+		if ([device isEqual: wm->m_btd])
+			break;
+		wm = nullptr;
+	}
+
+	if (wm == nullptr) {
+		ERROR_LOG(WIIMOTE, "Received packet for unknown Wiimote");
+		return;
+	}
+
+	if (length > MAX_PAYLOAD) {
+		WARN_LOG(WIIMOTE, "Dropping packet for Wiimote %i, too large",
+				wm->m_index + 1);
+		return;
+	}
+
+	if (wm->m_inputlen != -1) {
+		WARN_LOG(WIIMOTE, "Dropping packet for Wiimote %i, queue full",
+				wm->m_index + 1);
+		return;
+	}
+
+	memcpy(wm->m_input, data, length);
+	wm->m_inputlen = length;
+
+	CFRunLoopStop(CFRunLoopGetCurrent());
+}
+
+- (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
+{
+	IOBluetoothDevice *device = [l2capChannel device];
+	WiimoteReal::WiimoteDarwin *wm = nullptr;
+
+	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
+
+	for (int i = 0; i < MAX_WIIMOTES; i++)
+	{
+		wm = static_cast<WiimoteReal::WiimoteDarwin*>(WiimoteReal::g_wiimotes[i]);
+		if (!wm)
+			continue;
+		if ([device isEqual: wm->m_btd])
+			break;
+		wm = nullptr;
+	}
+
+	if (wm == nullptr) {
+		ERROR_LOG(WIIMOTE, "Channel for unknown Wiimote was closed");
+		return;
+	}
+
+	WARN_LOG(WIIMOTE, "Lost channel to Wiimote %i", wm->m_index + 1);
+
+	wm->DisconnectInternal();
+}
+@end
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
similarity index 77%
rename from Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
rename to Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index ee6de5f19d..388789076c 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -1,25 +1,25 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <queue>
 #include <algorithm>
-#include <stdlib.h>
+#include <cstdlib>
+#include <queue>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
 
-#include "Common.h"
-#include "IniFile.h"
-#include "StringUtil.h"
-#include "Timer.h"
-#include "Host.h"
-#include "ConfigManager.h"
 #include "SFML/Network.hpp"
- 
 
-#include "WiimoteReal.h"
-
-#include "../WiimoteEmu/WiimoteHid.h"
-
-unsigned int	g_wiimote_sources[MAX_BBMOTES];
+unsigned int g_wiimote_sources[MAX_BBMOTES];
 
 namespace WiimoteReal
 {
@@ -30,7 +30,7 @@ void TryToConnectWiimote(Wiimote*);
 void HandleWiimoteDisconnect(int index);
 void DoneWithWiimote(int index);
 
-bool g_real_wiimotes_initialized = false;
+static bool g_real_wiimotes_initialized = false;
 
 std::recursive_mutex g_refresh_lock;
 
@@ -38,21 +38,18 @@ Wiimote* g_wiimotes[MAX_BBMOTES];
 WiimoteScanner g_wiimote_scanner;
 
 Wiimote::Wiimote()
-	: index()
+	: m_index()
 	, m_last_input_report()
 	, m_channel(0)
 	, m_rumble_state()
 	, m_need_prepare()
-{
-	InitInternal();
-}
+{}
 
-Wiimote::~Wiimote()
+void Wiimote::Shutdown()
 {
 	StopThread();
 	ClearReadQueue();
 	m_write_reports.Clear();
-	TeardownInternal();
 }
 
 // to be called from CPU thread
@@ -61,14 +58,11 @@ void Wiimote::WriteReport(Report rpt)
 	if (rpt.size() >= 3)
 	{
 		bool const new_rumble_state = (rpt[2] & 0x1) != 0;
-		
+
+		// If this is a rumble report and the rumble state didn't change, ignore.
 		if (WM_RUMBLE == rpt[1] && new_rumble_state == m_rumble_state)
-		{
-			// If this is a rumble report and the rumble state didn't change, ignore
-			//ERROR_LOG(WIIMOTE, "Ignoring rumble report.");
 			return;
-		}
-		
+
 		m_rumble_state = new_rumble_state;
 	}
 
@@ -80,7 +74,7 @@ void Wiimote::WriteReport(Report rpt)
 void Wiimote::QueueReport(u8 rpt_id, const void* _data, unsigned int size)
 {
 	auto const data = static_cast<const u8*>(_data);
-	
+
 	Report rpt(size + 2);
 	rpt[0] = WM_SET_REPORT | WM_BT_OUTPUT;
 	rpt[1] = rpt_id;
@@ -91,7 +85,7 @@ void Wiimote::QueueReport(u8 rpt_id, const void* _data, unsigned int size)
 void Wiimote::DisableDataReporting()
 {
 	m_last_input_report.clear();
-	
+
 	// This probably accomplishes nothing.
 	wm_report_mode rpt = {};
 	rpt.mode = WM_REPORT_CORE;
@@ -120,7 +114,7 @@ void Wiimote::SetChannel(u16 channel)
 void Wiimote::ClearReadQueue()
 {
 	Report rpt;
-	
+
 	// The "Clear" function isn't thread-safe :/
 	while (m_read_reports.Pop(rpt))
 	{}
@@ -140,7 +134,7 @@ void Wiimote::ControlChannel(const u16 channel, const void* const data, const u3
 		if (hidp->type == HID_TYPE_SET_REPORT)
 		{
 			u8 handshake_ok = HID_HANDSHAKE_SUCCESS;
-			Core::Callback_WiimoteInterruptChannel(index, channel, &handshake_ok, sizeof(handshake_ok));
+			Core::Callback_WiimoteInterruptChannel(m_index, channel, &handshake_ok, sizeof(handshake_ok));
 		}
 	}
 }
@@ -151,15 +145,15 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 	if (channel != m_channel)
 	{
 		m_channel = channel;
-		
+
 		ClearReadQueue();
 
 		EmuStart();
 	}
-	
+
 	auto const data = static_cast<const u8*>(_data);
 	Report rpt(data, data + size);
-	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
+	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetConfig()->controllers[m_index];
 
 	// Convert output DATA packets to SET_REPORT packets.
 	// Nintendo Wiimotes work without this translation, but 3rd
@@ -168,7 +162,7 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 	{
 		rpt[0] = WM_SET_REPORT | WM_BT_OUTPUT;
 	}
-	
+
 	// Disallow games from turning off all of the LEDs.
 	// It makes Wiimote connection status confusing.
 	if (rpt[1] == WM_LEDS)
@@ -180,9 +174,9 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 			leds_rpt.leds = 0xf;
 		}
 	}
-	else if (rpt[1] == WM_WRITE_SPEAKER_DATA
-		&& (!SConfig::GetInstance().m_WiimoteEnableSpeaker
-		|| (!wm->m_status.speaker || wm->m_speaker_mute)))
+	else if (rpt[1] == WM_WRITE_SPEAKER_DATA &&
+	         (!SConfig::GetInstance().m_WiimoteEnableSpeaker ||
+	         (!wm->m_status.speaker || wm->m_speaker_mute)))
 	{
 		// Translate speaker data reports into rumble reports.
 		rpt[1] = WM_RUMBLE;
@@ -201,10 +195,14 @@ bool Wiimote::Read()
 
 	if (result > 0 && m_channel > 0)
 	{
-		if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD)
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.iBBDumpPort > 0 &&
+		    m_index == WIIMOTE_BALANCE_BOARD)
 		{
-			static sf::SocketUDP Socket;
-			Socket.Send((char*)rpt.data(), rpt.size(), sf::IPAddress::LocalHost, Core::g_CoreStartupParameter.iBBDumpPort);
+			static sf::UdpSocket Socket;
+			Socket.send((char*)rpt.data(),
+			            rpt.size(),
+			            sf::IpAddress::LocalHost,
+		                SConfig::GetInstance().m_LocalCoreStartupParameter.iBBDumpPort);
 		}
 
 		// Add it to queue
@@ -214,7 +212,7 @@ bool Wiimote::Read()
 	}
 	else if (0 == result)
 	{
-		ERROR_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", index + 1);
+		ERROR_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", m_index + 1);
 		DisconnectInternal();
 	}
 
@@ -226,30 +224,32 @@ bool Wiimote::Write()
 	if (!m_write_reports.Empty())
 	{
 		Report const& rpt = m_write_reports.Front();
-		
+
 		bool const is_speaker_data = rpt[1] == WM_WRITE_SPEAKER_DATA;
-		
+
 		if (!is_speaker_data || m_last_audio_report.GetTimeDifference() > 5)
 		{
-			if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD)
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.iBBDumpPort > 0 && m_index == WIIMOTE_BALANCE_BOARD)
 			{
-				static sf::SocketUDP Socket;
-				Socket.Send((char*)rpt.data(), rpt.size(), sf::IPAddress::LocalHost, Core::g_CoreStartupParameter.iBBDumpPort);
+				static sf::UdpSocket Socket;
+				Socket.send((char*)rpt.data(), rpt.size(), sf::IpAddress::LocalHost, SConfig::GetInstance().m_LocalCoreStartupParameter.iBBDumpPort);
 			}
 			IOWrite(rpt.data(), rpt.size());
-			
+
 			if (is_speaker_data)
+			{
 				m_last_audio_report.Update();
-			
+			}
+
 			m_write_reports.Pop();
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
-bool IsDataReport(const Report& rpt)
+static bool IsDataReport(const Report& rpt)
 {
 	return rpt.size() >= 2 && rpt[1] >= WM_REPORT_CORE;
 }
@@ -264,7 +264,7 @@ const Report& Wiimote::ProcessReadQueue()
 		{
 			// A non-data report, use it.
 			return m_last_input_report;
-			
+
 			// Forget the last data report as it may be of the wrong type
 			// or contain outdated button data
 			// or it's not supposed to be sent at this time
@@ -275,7 +275,7 @@ const Report& Wiimote::ProcessReadQueue()
 	// If the last report wasn't a data report it's irrelevant.
 	if (!IsDataReport(m_last_input_report))
 		m_last_input_report.clear();
-	
+
 	// If it was a data report, we repeat that until something else comes in.
 	return m_last_input_report;
 }
@@ -284,7 +284,7 @@ void Wiimote::Update()
 {
 	if (!IsConnected())
 	{
-		HandleWiimoteDisconnect(index);
+		HandleWiimoteDisconnect(m_index);
 		return;
 	}
 
@@ -293,40 +293,43 @@ void Wiimote::Update()
 
 	// Send the report
 	if (!rpt.empty() && m_channel > 0)
-		Core::Callback_WiimoteInterruptChannel(index, m_channel,
-			rpt.data(), rpt.size());
+	{
+		Core::Callback_WiimoteInterruptChannel(m_index, m_channel,
+			rpt.data(), (u32)rpt.size());
+	}
 }
 
 void Wiimote::Prepare(int _index)
 {
-	index = _index;
-	m_need_prepare = true;
+	m_index = _index;
+	m_need_prepare.store(true);
 }
 
 bool Wiimote::PrepareOnThread()
 {
 	// core buttons, no continuous reporting
 	u8 static const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REPORT_MODE, 0, WM_REPORT_CORE};
-	
+
 	// Set the active LEDs and turn on rumble.
-	u8 static const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << (index%WIIMOTE_BALANCE_BOARD) | 0x1)};
+	u8 static const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << (m_index%WIIMOTE_BALANCE_BOARD) | 0x1)};
 
 	// Turn off rumble
 	u8 static const rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_RUMBLE, 0};
-	
+
 	// Request status report
 	u8 static const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
 	// TODO: check for sane response?
 
-	return (IOWrite(mode_report, sizeof(mode_report))
-	        && IOWrite(led_report, sizeof(led_report))
-	        && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))
-	        && IOWrite(req_status_report, sizeof(req_status_report)));
+	return (IOWrite(mode_report, sizeof(mode_report)) &&
+	        IOWrite(led_report, sizeof(led_report)) &&
+	        (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report))) &&
+	        IOWrite(req_status_report, sizeof(req_status_report)));
 }
 
 void Wiimote::EmuStart()
 {
 	DisableDataReporting();
+	EnablePowerAssertionInternal();
 }
 
 void Wiimote::EmuStop()
@@ -336,11 +339,13 @@ void Wiimote::EmuStop()
 	DisableDataReporting();
 
 	NOTICE_LOG(WIIMOTE, "Stopping Wiimote data reporting.");
+
+	DisablePowerAssertionInternal();
 }
 
 void Wiimote::EmuResume()
 {
-	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
+	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetConfig()->controllers[m_index];
 
 	m_last_input_report.clear();
 
@@ -351,6 +356,8 @@ void Wiimote::EmuResume()
 	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
 
 	NOTICE_LOG(WIIMOTE, "Resuming Wiimote data reporting.");
+
+	EnablePowerAssertionInternal();
 }
 
 void Wiimote::EmuPause()
@@ -364,9 +371,11 @@ void Wiimote::EmuPause()
 	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
 
 	NOTICE_LOG(WIIMOTE, "Pausing Wiimote data reporting.");
+
+	DisablePowerAssertionInternal();
 }
 
-unsigned int CalculateConnectedWiimotes()
+static unsigned int CalculateConnectedWiimotes()
 {
 	unsigned int connected_wiimotes = 0;
 	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
@@ -376,7 +385,7 @@ unsigned int CalculateConnectedWiimotes()
 	return connected_wiimotes;
 }
 
-unsigned int CalculateWantedWiimotes()
+static unsigned int CalculateWantedWiimotes()
 {
 	// Figure out how many real Wiimotes are required
 	unsigned int wanted_wiimotes = 0;
@@ -387,7 +396,7 @@ unsigned int CalculateWantedWiimotes()
 	return wanted_wiimotes;
 }
 
-unsigned int CalculateWantedBB()
+static unsigned int CalculateWantedBB()
 {
 	unsigned int wanted_bb = 0;
 	if (WIIMOTE_SRC_REAL & g_wiimote_sources[WIIMOTE_BALANCE_BOARD] && !g_wiimotes[WIIMOTE_BALANCE_BOARD])
@@ -397,34 +406,34 @@ unsigned int CalculateWantedBB()
 
 void WiimoteScanner::WantWiimotes(bool do_want)
 {
-	m_want_wiimotes = do_want;
+	m_want_wiimotes.store(do_want);
 }
 
 
 void WiimoteScanner::WantBB(bool do_want)
 {
-	m_want_bb = do_want;
+	m_want_bb.store(do_want);
 }
 
 void WiimoteScanner::StartScanning()
 {
-	if (!m_run_thread)
+	if (!m_run_thread.load())
 	{
-		m_run_thread = true;
-		m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this);
+		m_run_thread.store(true);
+		m_scan_thread = std::thread(&WiimoteScanner::ThreadFunc, this);
 	}
 }
 
 void WiimoteScanner::StopScanning()
 {
-	m_run_thread = false;
+	m_run_thread.store(false);
 	if (m_scan_thread.joinable())
 	{
 		m_scan_thread.join();
 	}
 }
 
-void CheckForDisconnectedWiimotes()
+static void CheckForDisconnectedWiimotes()
 {
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 
@@ -439,14 +448,14 @@ void WiimoteScanner::ThreadFunc()
 
 	NOTICE_LOG(WIIMOTE, "Wiimote scanning has started.");
 
-	while (m_run_thread)
+	while (m_run_thread.load())
 	{
 		std::vector<Wiimote*> found_wiimotes;
-		Wiimote* found_board = NULL;
+		Wiimote* found_board = nullptr;
 
 		//NOTICE_LOG(WIIMOTE, "In loop");
 
-		if (m_want_wiimotes || m_want_bb)
+		if (m_want_wiimotes.load() || m_want_bb.load())
 		{
 			FindWiimotes(found_wiimotes, found_board);
 		}
@@ -461,21 +470,22 @@ void WiimoteScanner::ThreadFunc()
 		// TODO: this is a fairly lame place for this
 		CheckForDisconnectedWiimotes();
 
-		if(m_want_wiimotes)
+		if (m_want_wiimotes.load())
 			HandleFoundWiimotes(found_wiimotes);
-		if(m_want_bb && found_board)
+
+		if (m_want_bb.load() && found_board)
 			TryToConnectBalanceBoard(found_board);
 
 		//std::this_thread::yield();
 		Common::SleepCurrentThread(500);
 	}
-	
+
 	NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped.");
 }
 
 bool Wiimote::Connect()
 {
-	m_thread_ready = false;
+	m_thread_ready.store(false);
 	StartThread();
 	WaitReady();
 	return IsConnected();
@@ -483,28 +493,23 @@ bool Wiimote::Connect()
 
 void Wiimote::StartThread()
 {
-	m_run_thread = true;
-	m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this);
+	m_run_thread.store(true);
+	m_wiimote_thread = std::thread(&Wiimote::ThreadFunc, this);
 }
 
 void Wiimote::StopThread()
 {
-	m_run_thread = false;
+	m_run_thread.store(false);
 	IOWakeup();
 	if (m_wiimote_thread.joinable())
 		m_wiimote_thread.join();
-#if defined(__APPLE__)
-#endif
 }
 
 void Wiimote::SetReady()
 {
-	if (!m_thread_ready)
+	if (!m_thread_ready.load())
 	{
-		{
-			std::lock_guard<std::mutex> Guard(m_thread_ready_mutex);
-			m_thread_ready = true;
-		}
+		m_thread_ready.store(true);
 		m_thread_ready_cond.notify_all();
 	}
 }
@@ -512,7 +517,7 @@ void Wiimote::SetReady()
 void Wiimote::WaitReady()
 {
 	std::unique_lock<std::mutex> lock(m_thread_ready_mutex);
-	while (!m_thread_ready)
+	while (!m_thread_ready.load())
 	{
 		m_thread_ready_cond.wait(lock);
 	}
@@ -524,6 +529,13 @@ void Wiimote::ThreadFunc()
 
 	bool ok = ConnectInternal();
 
+	if (!ok)
+	{
+		// try again, it might take a moment to settle
+		Common::SleepCurrentThread(100);
+		ok = ConnectInternal();
+	}
+
 	SetReady();
 
 	if (!ok)
@@ -532,14 +544,14 @@ void Wiimote::ThreadFunc()
 	}
 
 	// main loop
-	while (IsConnected() && m_run_thread)
+	while (IsConnected() && m_run_thread.load())
 	{
-		if (m_need_prepare)
+		if (m_need_prepare.load())
 		{
-			m_need_prepare = false;
+			m_need_prepare.store(false);
 			if (!PrepareOnThread())
 			{
-				ERROR_LOG(WIIMOTE, "Wiimote::PrepareOnThread failed.  Disconnecting Wiimote %d.", index + 1);
+				ERROR_LOG(WIIMOTE, "Wiimote::PrepareOnThread failed.  Disconnecting Wiimote %d.", m_index + 1);
 				break;
 			}
 		}
@@ -561,13 +573,13 @@ void LoadSettings()
 	{
 		std::string secname("Wiimote");
 		secname += (char)('1' + i);
-		IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
+		IniFile::Section& sec = *inifile.GetOrCreateSection(secname);
 
 		sec.Get("Source", &g_wiimote_sources[i], i ? WIIMOTE_SRC_NONE : WIIMOTE_SRC_EMU);
 	}
-	
+
 	std::string secname("BalanceBoard");
-	IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
+	IniFile::Section& sec = *inifile.GetOrCreateSection(secname);
 	sec.Get("Source", &g_wiimote_sources[WIIMOTE_BALANCE_BOARD], WIIMOTE_SRC_NONE);
 }
 
@@ -589,11 +601,11 @@ void Initialize(bool wait)
 	{
 		int timeout = 100;
 		std::vector<Wiimote*> found_wiimotes;
-		Wiimote* found_board = NULL;
+		Wiimote* found_board = nullptr;
 		g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
 		if (SConfig::GetInstance().m_WiimoteContinuousScanning)
 		{
-			while(CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() && timeout)
+			while (CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() && timeout)
 			{
 				Common::SleepCurrentThread(100);
 				timeout--;
@@ -610,15 +622,15 @@ void Initialize(bool wait)
 }
 
 // called on emulation shutdown
-void Stop(void)
+void Stop()
 {
-	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
-		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
-			g_wiimotes[i]->EmuStop();
+	for (auto& wiimote : g_wiimotes)
+		if (wiimote && wiimote->IsConnected())
+			wiimote->EmuStop();
 }
 
-// called when the dolphin app exits
-void Shutdown(void)
+// called when the Dolphin app exits
+void Shutdown()
 {
 	g_wiimote_scanner.StopScanning();
 
@@ -637,16 +649,16 @@ void Shutdown(void)
 
 void Resume()
 {
-	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
-		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
-			g_wiimotes[i]->EmuResume();
+	for (auto& wiimote : g_wiimotes)
+		if (wiimote && wiimote->IsConnected())
+			wiimote->EmuResume();
 }
 
 void Pause()
 {
-	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
-		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
-			g_wiimotes[i]->EmuPause();
+	for (auto& wiimote : g_wiimotes)
+		if (wiimote && wiimote->IsConnected())
+			wiimote->EmuPause();
 }
 
 void ChangeWiimoteSource(unsigned int index, int source)
@@ -656,8 +668,6 @@ void ChangeWiimoteSource(unsigned int index, int source)
 		g_wiimote_sources[index] = source;
 		g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
 		g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
-		
-		
 		// kill real connection (or swap to different slot)
 		DoneWithWiimote(index);
 	}
@@ -670,8 +680,7 @@ void ChangeWiimoteSource(unsigned int index, int source)
 
 static bool TryToConnectWiimoteN(Wiimote* wm, unsigned int i)
 {
-	if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
-		&& !g_wiimotes[i])
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i])
 	{
 		if (wm->Connect())
 		{
@@ -693,15 +702,15 @@ void TryToConnectWiimote(Wiimote* wm)
 	{
 		if (TryToConnectWiimoteN(wm, i))
 		{
-			wm = NULL;
+			wm = nullptr;
 			break;
 		}
 	}
 
 	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
-	
+
 	lk.unlock();
-	
+
 	delete wm;
 }
 
@@ -711,13 +720,13 @@ void TryToConnectBalanceBoard(Wiimote* wm)
 
 	if (TryToConnectWiimoteN(wm, WIIMOTE_BALANCE_BOARD))
 	{
-		wm = NULL;
+		wm = nullptr;
 	}
-	
+
 	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
-	
+
 	lk.unlock();
-	
+
 	delete wm;
 }
 
@@ -729,19 +738,19 @@ void DoneWithWiimote(int index)
 
 	if (wm)
 	{
-		g_wiimotes[index] = NULL;
+		g_wiimotes[index] = nullptr;
 		// First see if we can use this real Wiimote in another slot.
 		TryToConnectWiimote(wm);
 	}
-	
+
 	// else, just disconnect the Wiimote
 	HandleWiimoteDisconnect(index);
 }
 
 void HandleWiimoteDisconnect(int index)
 {
-	Wiimote* wm = NULL;
-	
+	Wiimote* wm = nullptr;
+
 	{
 		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 
@@ -766,12 +775,12 @@ void HandleFoundWiimotes(const std::vector<Wiimote*>& wiimotes)
 void Refresh()
 {
 	g_wiimote_scanner.StopScanning();
-	
+
 	{
 		std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
 		std::vector<Wiimote*> found_wiimotes;
-		Wiimote* found_board = NULL;
-		
+		Wiimote* found_board = nullptr;
+
 		if (0 != CalculateWantedWiimotes() || 0 != CalculateWantedBB())
 		{
 			// Don't hang Dolphin when searching
@@ -793,10 +802,10 @@ void Refresh()
 		}
 
 		HandleFoundWiimotes(found_wiimotes);
-		if(found_board)
+		if (found_board)
 			TryToConnectBalanceBoard(found_board);
 	}
-	
+
 	Initialize();
 }
 
@@ -819,7 +828,10 @@ void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32
 // Read the Wiimote once
 void Update(int _WiimoteNumber)
 {
-	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
+	// Try to get a lock and return without doing anything if we fail
+	// This avoids deadlocks when adding a Wiimote during continuous scan
+	if(!g_refresh_lock.try_lock())
+		return;
 
 	if (g_wiimotes[_WiimoteNumber])
 		g_wiimotes[_WiimoteNumber]->Update();
@@ -829,6 +841,7 @@ void Update(int _WiimoteNumber)
 	{
 		Host_ConnectWiimote(_WiimoteNumber, false);
 	}
+	g_refresh_lock.unlock();
 }
 
 void StateChange(EMUSTATE_CHANGE newState)
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
new file mode 100644
index 0000000000..2047314392
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
@@ -0,0 +1,167 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "Common/FifoQueue.h"
+#include "Common/Timer.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteReal/WiimoteRealBase.h"
+#include "InputCommon/InputConfig.h"
+
+class PointerWrap;
+
+typedef std::vector<u8> Report;
+
+namespace WiimoteReal
+{
+
+class Wiimote : NonCopyable
+{
+friend class WiimoteEmu::Wiimote;
+public:
+	virtual ~Wiimote() {}
+	// This needs to be called in derived destructors!
+	void Shutdown();
+
+	void ControlChannel(const u16 channel, const void* const data, const u32 size);
+	void InterruptChannel(const u16 channel, const void* const data, const u32 size);
+	void Update();
+
+	const Report& ProcessReadQueue();
+
+	bool Read();
+	bool Write();
+
+	void StartThread();
+	void StopThread();
+
+	// "handshake" / stop packets
+	void EmuStart();
+	void EmuStop();
+	void EmuResume();
+	void EmuPause();
+
+	virtual void EnablePowerAssertionInternal() {}
+	virtual void DisablePowerAssertionInternal() {}
+
+	// connecting and disconnecting from physical devices
+	// (using address inserted by FindWiimotes)
+	// these are called from the Wiimote's thread.
+	virtual bool ConnectInternal() = 0;
+	virtual void DisconnectInternal() = 0;
+
+	bool Connect();
+
+	// TODO: change to something like IsRelevant
+	virtual bool IsConnected() const = 0;
+
+	void Prepare(int index);
+	bool PrepareOnThread();
+
+	void DisableDataReporting();
+	void EnableDataReporting(u8 mode);
+	void SetChannel(u16 channel);
+
+	void QueueReport(u8 rpt_id, const void* data, unsigned int size);
+
+	int m_index;
+
+protected:
+	Wiimote();
+	Report m_last_input_report;
+	u16 m_channel;
+
+private:
+	void ClearReadQueue();
+	void WriteReport(Report rpt);
+
+	virtual int IORead(u8* buf) = 0;
+	virtual int IOWrite(u8 const* buf, size_t len) = 0;
+	virtual void IOWakeup() = 0;
+
+	void ThreadFunc();
+	void SetReady();
+	void WaitReady();
+
+	bool m_rumble_state;
+
+	std::thread               m_wiimote_thread;
+	// Whether to keep running the thread.
+	std::atomic<bool>         m_run_thread;
+	// Whether to call PrepareOnThread.
+	std::atomic<bool>         m_need_prepare;
+	// Whether the thread has finished ConnectInternal.
+	std::atomic<bool>         m_thread_ready;
+	std::mutex                m_thread_ready_mutex;
+	std::condition_variable   m_thread_ready_cond;
+
+	Common::FifoQueue<Report> m_read_reports;
+	Common::FifoQueue<Report> m_write_reports;
+
+	Common::Timer m_last_audio_report;
+};
+
+class WiimoteScanner
+{
+public:
+	WiimoteScanner();
+	~WiimoteScanner();
+
+	bool IsReady() const;
+
+	void WantWiimotes(bool do_want);
+	void WantBB(bool do_want);
+
+	void StartScanning();
+	void StopScanning();
+
+	void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&);
+
+	// function called when not looking for more Wiimotes
+	void Update();
+
+private:
+	void ThreadFunc();
+
+	std::thread m_scan_thread;
+
+	std::atomic<bool> m_run_thread;
+	std::atomic<bool> m_want_wiimotes;
+	std::atomic<bool> m_want_bb;
+
+#if defined(_WIN32)
+	void CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb);
+#elif defined(__linux__) && HAVE_BLUEZ
+	int device_id;
+	int device_sock;
+#endif
+};
+
+extern std::recursive_mutex g_refresh_lock;
+extern WiimoteScanner g_wiimote_scanner;
+extern Wiimote *g_wiimotes[MAX_BBMOTES];
+
+void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
+void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
+void Update(int _WiimoteNumber);
+
+void DoState(PointerWrap &p);
+void StateChange(EMUSTATE_CHANGE newState);
+
+int FindWiimotes(Wiimote** wm, int max_wiimotes);
+void ChangeWiimoteSource(unsigned int index, int source);
+
+bool IsValidBluetoothName(const std::string& name);
+bool IsBalanceBoardName(const std::string& name);
+
+} // WiimoteReal
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h
new file mode 100644
index 0000000000..232d1f23d5
--- /dev/null
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h
@@ -0,0 +1,62 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+	#include <windows.h>
+#elif defined(__APPLE__)
+	// Work around an Apple bug: for some reason, IOBluetooth.h errors on
+	// inclusion in Mavericks, but only in Objective-C++ C++11 mode.  I filed
+	// this as <rdar://15312520>; in the meantime...
+	#import <Foundation/Foundation.h>
+	#undef NS_ENUM_AVAILABLE
+	#define NS_ENUM_AVAILABLE(...)
+	// end hack
+	#import <IOBluetooth/IOBluetooth.h>
+	#include <IOKit/pwr_mgt/IOPMLib.h>
+#elif defined(__linux__) && HAVE_BLUEZ
+	#include <bluetooth/bluetooth.h>
+#endif
+
+// Wiimote internal codes
+
+// Communication channels
+#define WM_OUTPUT_CHANNEL        0x11
+#define WM_INPUT_CHANNEL         0x13
+
+// The 4 most significant bits of the first byte of an outgoing command must be
+// 0x50 if sending on the command channel and 0xA0 if sending on the interrupt
+// channel. On Mac and Linux we use interrupt channel; on Windows, command.
+#ifdef _WIN32
+#define WM_SET_REPORT            0x50
+#else
+#define WM_SET_REPORT            0xA0
+#endif
+
+#define WM_BT_INPUT              0x01
+#define WM_BT_OUTPUT             0x02
+
+// LED bit masks
+#define WIIMOTE_LED_NONE         0x00
+#define WIIMOTE_LED_1            0x10
+#define WIIMOTE_LED_2            0x20
+#define WIIMOTE_LED_3            0x40
+#define WIIMOTE_LED_4            0x80
+
+// End Wiimote internal codes
+
+// It's 23. NOT 32!
+#define MAX_PAYLOAD              23
+#define WIIMOTE_DEFAULT_TIMEOUT  1000
+
+#ifdef _WIN32
+// Available bluetooth stacks for Windows.
+enum win_bt_stack_t
+{
+	MSBT_STACK_UNKNOWN,
+	MSBT_STACK_MS,
+	MSBT_STACK_BLUESOLEIL
+};
+#endif
diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h
new file mode 100644
index 0000000000..b4a4ade373
--- /dev/null
+++ b/Source/Core/Core/Host.h
@@ -0,0 +1,44 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+// Host - defines an interface for the emulator core to communicate back to the
+// OS-specific layer
+
+// The emulator core is abstracted from the OS using 2 interfaces:
+// Common and Host.
+
+// Common simply provides OS-neutral implementations of things like threads, mutexes,
+// INI file manipulation, memory mapping, etc.
+
+// Host is an abstract interface for communicating things back to the host. The emulator
+// core is treated as a library, not as a main program, because it is far easier to
+// write GUI interfaces that control things than to squash GUI into some model that wasn't
+// designed for it.
+
+// The host can be just a command line app that opens a window, or a full blown debugger
+// interface.
+
+bool Host_UIHasFocus();
+bool Host_RendererHasFocus();
+bool Host_RendererIsFullscreen();
+void Host_ConnectWiimote(int wm_idx, bool connect);
+void Host_Message(int Id);
+void Host_NotifyMapLoaded();
+void Host_RefreshDSPDebuggerWindow();
+void Host_RequestRenderWindowSize(int width, int height);
+void Host_RequestFullscreen(bool enable_fullscreen);
+void Host_SetStartupDebuggingParameters();
+void Host_SetWiiMoteConnectionState(int _State);
+void Host_UpdateDisasmDialog();
+void Host_UpdateMainFrame();
+void Host_UpdateTitle(const std::string& title);
+void Host_ShowVideoConfig(void* parent, const std::string& backend_name,
+                          const std::string& config_name);
+
+// TODO (neobrain): Remove this from host!
+void* Host_GetRenderHandle();
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
new file mode 100644
index 0000000000..77119c3df7
--- /dev/null
+++ b/Source/Core/Core/HotkeyManager.cpp
@@ -0,0 +1,320 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <vector>
+
+#include "Core/ConfigManager.h"
+#include "Core/HotkeyManager.h"
+
+const std::string hotkey_labels[] =
+{
+	_trans("Open"),
+	_trans("Change Disc"),
+	_trans("Refresh List"),
+
+	_trans("Toggle Pause"),
+	_trans("Stop"),
+	_trans("Reset"),
+	_trans("Frame Advance"),
+
+	_trans("Start Recording"),
+	_trans("Play Recording"),
+	_trans("Export Recording"),
+	_trans("Read-only mode"),
+
+	_trans("Toggle Fullscreen"),
+	_trans("Take Screenshot"),
+	_trans("Exit"),
+
+	_trans("Connect Wiimote 1"),
+	_trans("Connect Wiimote 2"),
+	_trans("Connect Wiimote 3"),
+	_trans("Connect Wiimote 4"),
+	_trans("Connect Balance Board"),
+
+	_trans("Volume Down"),
+	_trans("Volume Up"),
+	_trans("Volume Toggle Mute"),
+
+	_trans("Increase IR"),
+	_trans("Decrease IR"),
+
+	_trans("Toggle IR"),
+	_trans("Toggle Aspect Ratio"),
+	_trans("Toggle EFB Copies"),
+	_trans("Toggle Fog"),
+	_trans("Toggle Frame limit"),
+	_trans("Decrease Frame limit"),
+	_trans("Increase Frame limit"),
+
+	_trans("Freelook Decrease Speed"),
+	_trans("Freelook Increase Speed"),
+	_trans("Freelook Reset Speed"),
+	_trans("Freelook Move Up"),
+	_trans("Freelook Move Down"),
+	_trans("Freelook Move Left"),
+	_trans("Freelook Move Right"),
+	_trans("Freelook Zoom In"),
+	_trans("Freelook Zoom Out"),
+	_trans("Freelook Reset"),
+
+	_trans("Decrease Depth"),
+	_trans("Increase Depth"),
+	_trans("Decrease Convergence"),
+	_trans("Increase Convergence"),
+
+	_trans("Load State Slot 1"),
+	_trans("Load State Slot 2"),
+	_trans("Load State Slot 3"),
+	_trans("Load State Slot 4"),
+	_trans("Load State Slot 5"),
+	_trans("Load State Slot 6"),
+	_trans("Load State Slot 7"),
+	_trans("Load State Slot 8"),
+	_trans("Load State Slot 9"),
+	_trans("Load State Slot 10"),
+
+	_trans("Save State Slot 1"),
+	_trans("Save State Slot 2"),
+	_trans("Save State Slot 3"),
+	_trans("Save State Slot 4"),
+	_trans("Save State Slot 5"),
+	_trans("Save State Slot 6"),
+	_trans("Save State Slot 7"),
+	_trans("Save State Slot 8"),
+	_trans("Save State Slot 9"),
+	_trans("Save State Slot 10"),
+
+	_trans("Select State Slot 1"),
+	_trans("Select State Slot 2"),
+	_trans("Select State Slot 3"),
+	_trans("Select State Slot 4"),
+	_trans("Select State Slot 5"),
+	_trans("Select State Slot 6"),
+	_trans("Select State Slot 7"),
+	_trans("Select State Slot 8"),
+	_trans("Select State Slot 9"),
+	_trans("Select State Slot 10"),
+
+	_trans("Save to selected slot"),
+	_trans("Load from selected slot"),
+
+	_trans("Load State Last 1"),
+	_trans("Load State Last 2"),
+	_trans("Load State Last 3"),
+	_trans("Load State Last 4"),
+	_trans("Load State Last 5"),
+	_trans("Load State Last 6"),
+	_trans("Load State Last 7"),
+	_trans("Load State Last 8"),
+
+	_trans("Save Oldest State"),
+	_trans("Undo Load State"),
+	_trans("Undo Save State"),
+	_trans("Save State"),
+	_trans("Load State"),
+};
+
+const int num_hotkeys = (sizeof(hotkey_labels) / sizeof(hotkey_labels[0]));
+
+namespace HotkeyManagerEmu
+{
+
+static u32 s_hotkeyDown[3];
+static HotkeyStatus s_hotkey;
+static bool s_enabled;
+
+static InputConfig s_config("Hotkeys", _trans("Hotkeys"), "Hotkeys");
+
+InputConfig* GetConfig()
+{
+	return &s_config;
+}
+
+void GetStatus()
+{
+	s_hotkey.err = PAD_ERR_NONE;
+
+	// get input
+	((HotkeyManager*)s_config.controllers[0])->GetInput(&s_hotkey);
+}
+
+bool IsEnabled()
+{
+	return s_enabled;
+}
+
+void Enable(bool enable_toggle)
+{
+	s_enabled = enable_toggle;
+}
+
+bool IsPressed(int Id, bool held)
+{
+	unsigned int set = Id / 32;
+	unsigned int setKey = Id % 32;
+	if (s_hotkey.button[set] & (1 << setKey))
+	{
+		s_hotkeyDown[set] |= (1 << setKey);
+		if (held)
+			return true;
+	}
+	else
+	{
+		bool pressed = !!(s_hotkeyDown[set] & (1 << setKey));
+		s_hotkeyDown[set] &= ~(1 << setKey);
+		if (pressed)
+			return true;
+	}
+
+	return false;
+}
+
+void Initialize(void* const hwnd)
+{
+	if (s_config.controllers.empty())
+		s_config.controllers.push_back(new HotkeyManager());
+
+	g_controller_interface.Initialize(hwnd);
+
+	// load the saved controller config
+	s_config.LoadConfig(true);
+
+	for (unsigned int i = 0; i < 3; ++i)
+		s_hotkeyDown[i] = 0;
+
+	s_enabled = true;
+}
+
+void LoadConfig()
+{
+	s_config.LoadConfig(true);
+}
+
+void Shutdown()
+{
+	std::vector<ControllerEmu*>::const_iterator
+		i = s_config.controllers.begin(),
+		e = s_config.controllers.end();
+	for (; i != e; ++i)
+		delete *i;
+	s_config.controllers.clear();
+
+	g_controller_interface.Shutdown();
+}
+
+}
+
+HotkeyManager::HotkeyManager()
+{
+	for (int set = 0; set < 3; set++)
+	{
+		// buttons
+		if ((set * 32) < num_hotkeys)
+			groups.emplace_back(m_keys[set] = new Buttons(_trans("Keys")));
+
+		for (int key = 0; key < 32; key++)
+		{
+			if ((set * 32 + key) < num_hotkeys && hotkey_labels[set * 32 + key].length() != 0)
+			{
+				m_keys[set]->controls.emplace_back(new ControlGroup::Input(hotkey_labels[set * 32 + key]));
+			}
+		}
+	}
+
+	groups.emplace_back(m_options = new ControlGroup(_trans("Options")));
+	m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
+	m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input")));
+}
+
+HotkeyManager::~HotkeyManager()
+{
+}
+
+std::string HotkeyManager::GetName() const
+{
+	return std::string("Hotkeys") + char('1' + 0);
+}
+
+void HotkeyManager::GetInput(HotkeyStatus* const kb)
+{
+	for (int set = 0; set < 3; set++)
+	{
+		std::vector<u32> bitmasks;
+		for (int key = 0; key < 32; key++)
+		{
+			if ((set * 32 + key) < num_hotkeys && hotkey_labels[set * 32 + key].length() != 0)
+				bitmasks.push_back(1 << key);
+		}
+
+		if ((set * 32) < num_hotkeys)
+		{
+			kb->button[set] = 0;
+			m_keys[set]->GetState(&kb->button[set], bitmasks.data());
+		}
+	}
+}
+
+void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
+{
+	ControllerEmu::LoadDefaults(ciface);
+
+#ifdef _WIN32
+	const std::string NON = "(!(LMENU | RMENU) & !(LSHIFT | RSHIFT) & !(LCONTROL | RCONTROL))";
+	const std::string ALT = "((LMENU | RMENU) & !(LSHIFT | RSHIFT) & !(LCONTROL | RCONTROL))";
+	const std::string SHIFT = "(!(LMENU | RMENU) & (LSHIFT | RSHIFT) & !(LCONTROL | RCONTROL))";
+	const std::string CTRL = "(!(LMENU | RMENU) & !(LSHIFT | RSHIFT) & (LCONTROL | RCONTROL))";
+#else
+	const std::string NON = "(!`Alt_L` & !(`Shift_L` | `Shift_R`) & !(`Control_L` | `Control_R` ))";
+	const std::string ALT = "(`Alt_L` & !(`Shift_L` | `Shift_R`) & !(`Control_L` | `Control_R` ))";
+	const std::string SHIFT = "(!`Alt_L` & (`Shift_L` | `Shift_R`) & !(`Control_L` | `Control_R` ))";
+	const std::string CTRL = "(!`Alt_L` & !(`Shift_L` | `Shift_R`) & (`Control_L` | `Control_R` ))";
+#endif
+
+	#define set_control(num, str)  (m_keys[(num) / 32])->controls[(num) % 32]->control_ref->expression = (str)
+
+	// General hotkeys
+	set_control(HK_OPEN, CTRL + " & O");
+	set_control(HK_PLAY_PAUSE, "`F10`");
+#ifdef _WIN32
+	set_control(HK_STOP, "ESCAPE");
+	set_control(HK_FULLSCREEN, ALT + " & RETURN");
+#else
+	set_control(HK_STOP, "Escape");
+	set_control(HK_FULLSCREEN, ALT + " & Return");
+#endif
+	set_control(HK_SCREENSHOT, NON + " & `F9`");
+	set_control(HK_WIIMOTE1_CONNECT, ALT + " & `F5`");
+	set_control(HK_WIIMOTE2_CONNECT, ALT + " & `F6`");
+	set_control(HK_WIIMOTE3_CONNECT, ALT + " & `F7`");
+	set_control(HK_WIIMOTE4_CONNECT, ALT + " & `F8`");
+	set_control(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`");
+#ifdef _WIN32
+	set_control(HK_TOGGLE_THROTTLE, "TAB");
+#else
+	set_control(HK_TOGGLE_THROTTLE, "Tab");
+#endif
+
+	// Freelook
+	set_control(HK_FREELOOK_DECREASE_SPEED, SHIFT + " & `1`");
+	set_control(HK_FREELOOK_INCREASE_SPEED, SHIFT + " & `2`");
+	set_control(HK_FREELOOK_RESET_SPEED, SHIFT + " & F");
+	set_control(HK_FREELOOK_UP, SHIFT + " & E");
+	set_control(HK_FREELOOK_DOWN, SHIFT + " & Q");
+	set_control(HK_FREELOOK_LEFT, SHIFT + " & A");
+	set_control(HK_FREELOOK_RIGHT, SHIFT + " & D");
+	set_control(HK_FREELOOK_ZOOM_IN, SHIFT + " & W");
+	set_control(HK_FREELOOK_ZOOM_OUT, SHIFT + " & S");
+	set_control(HK_FREELOOK_RESET, SHIFT + " & R");
+
+	// Savestates
+	for (int i = 0; i < 8; i++)
+	{
+		set_control(HK_LOAD_STATE_SLOT_1 + i, StringFromFormat((NON + " & `F%d`").c_str(), i + 1));
+		set_control(HK_SAVE_STATE_SLOT_1 + i, StringFromFormat((SHIFT + " & `F%d`").c_str(), i + 1));
+	}
+	set_control(HK_UNDO_LOAD_STATE, NON + " & `F12`");
+	set_control(HK_UNDO_SAVE_STATE, SHIFT + " & `F12`");
+}
diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h
new file mode 100644
index 0000000000..e0fa97d778
--- /dev/null
+++ b/Source/Core/Core/HotkeyManager.h
@@ -0,0 +1,42 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "InputCommon/InputConfig.h"
+
+struct HotkeyStatus
+{
+	u32 button[6];
+	s8  err;
+};
+
+class HotkeyManager : public ControllerEmu
+{
+public:
+	HotkeyManager();
+	~HotkeyManager();
+
+	std::string GetName() const;
+	void GetInput(HotkeyStatus* const hk);
+	void LoadDefaults(const ControllerInterface& ciface);
+
+private:
+	Buttons* m_keys[3];
+	ControlGroup* m_options;
+};
+
+namespace HotkeyManagerEmu
+{
+	void Initialize(void* const hwnd);
+	void Shutdown();
+	void LoadConfig();
+
+	InputConfig* GetConfig();
+	void GetStatus();
+	bool IsEnabled();
+	void Enable(bool enable_toggle);
+	bool IsPressed(int Id, bool held);
+}
diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IPC_HLE/ICMP.h
new file mode 100644
index 0000000000..72e82ea453
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/ICMP.h
@@ -0,0 +1,16 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#include <WinSock2.h>
+#else
+#include <netinet/in.h>
+#endif
+
+#include "Common/CommonTypes.h"
+
+int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length);
+int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 data_length);
diff --git a/Source/Core/Core/Src/IPC_HLE/ICMPLin.cpp b/Source/Core/Core/IPC_HLE/ICMPLin.cpp
similarity index 77%
rename from Source/Core/Core/Src/IPC_HLE/ICMPLin.cpp
rename to Source/Core/Core/IPC_HLE/ICMPLin.cpp
index 5e5430deaa..f3e6aa3092 100644
--- a/Source/Core/Core/Src/IPC_HLE/ICMPLin.cpp
+++ b/Source/Core/Core/IPC_HLE/ICMPLin.cpp
@@ -1,3 +1,7 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 #include "ICMP.h"
 
 // Currently stubbed. AFAIK (delroth) there is no way to send ICMP echo
diff --git a/Source/Core/Core/Src/IPC_HLE/ICMPWin.cpp b/Source/Core/Core/IPC_HLE/ICMPWin.cpp
similarity index 84%
rename from Source/Core/Core/Src/IPC_HLE/ICMPWin.cpp
rename to Source/Core/Core/IPC_HLE/ICMPWin.cpp
index 55ccb9e5c8..f00ae19a77 100644
--- a/Source/Core/Core/Src/IPC_HLE/ICMPWin.cpp
+++ b/Source/Core/Core/IPC_HLE/ICMPWin.cpp
@@ -1,4 +1,8 @@
-#include "ICMP.h"
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/IPC_HLE/ICMP.h"
 
 enum
 {
@@ -53,10 +57,10 @@ u16 cksum(const u16 *buffer, int length)
 int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length)
 {
 	memset(workspace, 0, sizeof(workspace));
-	icmp_hdr *header	= (icmp_hdr *)workspace;
-	header->type		= ICMP_ECHOREQ;
-	header->code		= 0;
-	header->checksum	= 0;
+	icmp_hdr *header  = (icmp_hdr *)workspace;
+	header->type      = ICMP_ECHOREQ;
+	header->code      = 0;
+	header->checksum  = 0;
 	memcpy(&header->id, data, data_length);
 
 	header->checksum = cksum((u16 *)header, ICMP_HDR_LEN + data_length);
@@ -82,7 +86,7 @@ int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 d
 
 	timeval t;
 	t.tv_sec = timeout / 1000;
-	if (select(0, &read_fds, NULL, NULL, &t) > 0)
+	if (select(0, &read_fds, nullptr, nullptr, &t) > 0)
 	{
 		num_bytes = recvfrom((SOCKET)s, (LPSTR)workspace,
 			IP_HDR_LEN + ICMP_HDR_LEN + data_length,
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
new file mode 100644
index 0000000000..d428573442
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
@@ -0,0 +1,633 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/*
+This is the main Wii IPC file that handles all incoming IPC calls and directs them
+to the right function.
+
+IPC basics (IOS' usage):
+
+Return values for file handles: All IPC calls will generate a return value to 0x04,
+in case of success they are
+	Open: DeviceID
+	Close: 0
+	Read: Bytes read
+	Write: Bytes written
+	Seek: Seek position
+	Ioctl: 0 (in addition to that there may be messages to the out buffers)
+	Ioctlv: 0 (in addition to that there may be messages to the out buffers)
+They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp.
+*/
+
+#include <list>
+#include <map>
+#include <string>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/WII_IPC.h"
+
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
+
+#if defined(__LIBUSB__) || defined (_WIN32)
+	#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
+#endif
+
+#include "Core/PowerPC/PowerPC.h"
+
+
+namespace WII_IPC_HLE_Interface
+{
+
+typedef std::map<u32, IWII_IPC_HLE_Device*> TDeviceMap;
+static TDeviceMap g_DeviceMap;
+
+// STATE_TO_SAVE
+typedef std::map<u32, std::string> TFileNameMap;
+
+#define IPC_MAX_FDS 0x18
+#define ES_MAX_COUNT 2
+static IWII_IPC_HLE_Device* g_FdMap[IPC_MAX_FDS];
+static bool es_inuse[ES_MAX_COUNT];
+static IWII_IPC_HLE_Device* es_handles[ES_MAX_COUNT];
+
+
+typedef std::deque<u32> ipc_msg_queue;
+static ipc_msg_queue request_queue; // ppc -> arm
+static ipc_msg_queue reply_queue;   // arm -> ppc
+static ipc_msg_queue ack_queue;   // arm -> ppc
+
+static int event_enqueue;
+
+static u64 last_reply_time;
+
+static const u64 ENQUEUE_REQUEST_FLAG = 0x100000000ULL;
+static const u64 ENQUEUE_ACKNOWLEDGEMENT_FLAG = 0x200000000ULL;
+static void EnqueueEvent(u64 userdata, int cycles_late = 0)
+{
+	if (userdata & ENQUEUE_ACKNOWLEDGEMENT_FLAG)
+	{
+		ack_queue.push_back((u32)userdata);
+	}
+	else if (userdata & ENQUEUE_REQUEST_FLAG)
+	{
+		request_queue.push_back((u32)userdata);
+	}
+	else
+	{
+		reply_queue.push_back((u32)userdata);
+	}
+	Update();
+}
+
+void Init()
+{
+	_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
+	CWII_IPC_HLE_Device_es::m_ContentFile = "";
+
+	for (IWII_IPC_HLE_Device*& dev : g_FdMap)
+	{
+		dev = nullptr;
+	}
+
+	u32 i = 0;
+	// Build hardware devices
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_oh1_57e_305(i, "/dev/usb/oh1/57e/305"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_immediate(i, "/dev/stm/immediate"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_eventhook(i, "/dev/stm/eventhook"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_fs(i, "/dev/fs"); i++;
+
+	// IOS allows two ES devices at a time
+	for (u32 j=0; j<ES_MAX_COUNT; j++)
+	{
+		g_DeviceMap[i] = es_handles[j] = new CWII_IPC_HLE_Device_es(i, "/dev/es"); i++;
+		es_inuse[j] = false;
+	}
+
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_di(i, std::string("/dev/di")); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_kd_request(i, "/dev/net/kd/request"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_kd_time(i, "/dev/net/kd/time"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ncd_manage(i, "/dev/net/ncd/manage"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_wd_command(i, "/dev/net/wd/command"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ip_top(i, "/dev/net/ip/top"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ssl(i, "/dev/net/ssl"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, "/dev/usb/kbd"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, "/dev/sdio/slot0"); i++;
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, "/dev/sdio/slot1"); i++;
+	#if defined(__LIBUSB__) || defined(_WIN32)
+		g_DeviceMap[i] = new CWII_IPC_HLE_Device_hid(i, "/dev/usb/hid"); i++;
+	#else
+		g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, "/dev/usb/hid"); i++;
+	#endif
+	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, "/dev/usb/oh1"); i++;
+	g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, "_Unimplemented_Device_"); i++;
+
+	event_enqueue = CoreTiming::RegisterEvent("IPCEvent", EnqueueEvent);
+}
+
+void Reset(bool _bHard)
+{
+	CoreTiming::RemoveAllEvents(event_enqueue);
+
+	for (IWII_IPC_HLE_Device*& dev : g_FdMap)
+	{
+		if (dev != nullptr && !dev->IsHardware())
+		{
+			// close all files and delete their resources
+			dev->Close(0, true);
+			delete dev;
+		}
+
+		dev = nullptr;
+	}
+
+	for (bool& in_use : es_inuse)
+	{
+		in_use = false;
+	}
+
+	for (const auto& entry : g_DeviceMap)
+	{
+		if (entry.second)
+		{
+			// Force close
+			entry.second->Close(0, true);
+
+			// Hardware should not be deleted unless it is a hard reset
+			if (_bHard)
+				delete entry.second;
+		}
+	}
+
+	if (_bHard)
+	{
+		g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end());
+	}
+	request_queue.clear();
+	reply_queue.clear();
+
+	last_reply_time = 0;
+}
+
+void Shutdown()
+{
+	Reset(true);
+}
+
+void SetDefaultContentFile(const std::string& _rFilename)
+{
+	for (const auto& entry : g_DeviceMap)
+	{
+		if (entry.second && entry.second->GetDeviceName().find("/dev/es") == 0)
+		{
+			((CWII_IPC_HLE_Device_es*)entry.second)->LoadWAD(_rFilename);
+		}
+	}
+}
+
+void ES_DIVerify(u8 *_pTMD, u32 _sz)
+{
+	CWII_IPC_HLE_Device_es::ES_DIVerify(_pTMD, _sz);
+}
+
+void SDIO_EventNotify()
+{
+	CWII_IPC_HLE_Device_sdio_slot0 *pDevice =
+		(CWII_IPC_HLE_Device_sdio_slot0*)GetDeviceByName("/dev/sdio/slot0");
+	if (pDevice)
+		pDevice->EventNotify();
+}
+
+int getFreeDeviceId()
+{
+	for (u32 i=0; i<IPC_MAX_FDS; i++)
+	{
+		if (g_FdMap[i] == nullptr)
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName)
+{
+	for (const auto& entry : g_DeviceMap)
+	{
+		if (entry.second && entry.second->GetDeviceName() == _rDeviceName)
+		{
+			return entry.second;
+		}
+	}
+
+	return nullptr;
+}
+
+IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID)
+{
+	if (g_DeviceMap.find(_ID) != g_DeviceMap.end())
+	{
+		return g_DeviceMap[_ID];
+	}
+
+	return nullptr;
+}
+
+// This is called from ExecuteCommand() COMMAND_OPEN_DEVICE
+IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName)
+{
+	// scan device name and create the right one
+	INFO_LOG(WII_IPC_FILEIO, "IOP: Create FileIO %s", _rDeviceName.c_str());
+	return new CWII_IPC_HLE_Device_FileIO(_DeviceID, _rDeviceName);
+}
+
+
+void DoState(PointerWrap &p)
+{
+	p.Do(request_queue);
+	p.Do(reply_queue);
+	p.Do(last_reply_time);
+
+	for (const auto& entry : g_DeviceMap)
+	{
+		if (entry.second->IsHardware())
+		{
+			entry.second->DoState(p);
+		}
+	}
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		for (u32 i=0; i<IPC_MAX_FDS; i++)
+		{
+			u32 exists = 0;
+			p.Do(exists);
+			if (exists)
+			{
+				u32 isHw = 0;
+				p.Do(isHw);
+				if (isHw)
+				{
+					u32 hwId = 0;
+					p.Do(hwId);
+					g_FdMap[i] = AccessDeviceByID(hwId);
+				}
+				else
+				{
+					g_FdMap[i] = new CWII_IPC_HLE_Device_FileIO(i, "");
+					g_FdMap[i]->DoState(p);
+				}
+			}
+			else
+			{
+				g_FdMap[i] = nullptr;
+			}
+		}
+
+		for (u32 i=0; i<ES_MAX_COUNT; i++)
+		{
+			p.Do(es_inuse[i]);
+			u32 handleID = es_handles[i]->GetDeviceID();
+			p.Do(handleID);
+
+			es_handles[i] = AccessDeviceByID(handleID);
+		}
+	}
+	else
+	{
+		for (IWII_IPC_HLE_Device*& dev : g_FdMap)
+		{
+			u32 exists = dev ? 1 : 0;
+			p.Do(exists);
+			if (exists)
+			{
+				u32 isHw = dev->IsHardware() ? 1 : 0;
+				p.Do(isHw);
+				if (isHw)
+				{
+					u32 hwId = dev->GetDeviceID();
+					p.Do(hwId);
+				}
+				else
+				{
+					dev->DoState(p);
+				}
+			}
+		}
+
+		for (u32 i=0; i<ES_MAX_COUNT; i++)
+		{
+			p.Do(es_inuse[i]);
+			u32 handleID = es_handles[i]->GetDeviceID();
+			p.Do(handleID);
+		}
+	}
+}
+
+void ExecuteCommand(u32 _Address)
+{
+	IPCCommandResult result = IPC_NO_REPLY;
+
+	IPCCommandType Command = static_cast<IPCCommandType>(Memory::Read_U32(_Address));
+	s32 DeviceID = Memory::Read_U32(_Address + 8);
+
+	IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : nullptr;
+
+	INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice);
+
+	switch (Command)
+	{
+	case IPC_CMD_OPEN:
+	{
+		u32 Mode = Memory::Read_U32(_Address + 0x10);
+		DeviceID = getFreeDeviceId();
+
+		std::string DeviceName = Memory::GetString(Memory::Read_U32(_Address + 0xC));
+
+		WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID);
+		if (DeviceID >= 0)
+		{
+			if (DeviceName.find("/dev/es") == 0)
+			{
+				u32 j;
+				for (j=0; j<ES_MAX_COUNT; j++)
+				{
+					if (!es_inuse[j])
+					{
+						es_inuse[j] = true;
+						g_FdMap[DeviceID] = es_handles[j];
+						result = es_handles[j]->Open(_Address, Mode);
+						Memory::Write_U32(DeviceID, _Address+4);
+						break;
+					}
+				}
+
+				if (j == ES_MAX_COUNT)
+				{
+					Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4);
+					result = IPC_DEFAULT_REPLY;
+				}
+			}
+			else if (DeviceName.find("/dev/") == 0)
+			{
+				pDevice = GetDeviceByName(DeviceName);
+				if (pDevice)
+				{
+					g_FdMap[DeviceID] = pDevice;
+					result = pDevice->Open(_Address, Mode);
+					INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)",
+						pDevice->GetDeviceName().c_str(), DeviceID, Mode);
+					Memory::Write_U32(DeviceID, _Address+4);
+				}
+				else
+				{
+					WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str());
+					Memory::Write_U32(FS_ENOENT, _Address+4);
+					result = IPC_DEFAULT_REPLY;
+				}
+			}
+			else
+			{
+				pDevice = CreateFileIO(DeviceID, DeviceName);
+				result = pDevice->Open(_Address, Mode);
+
+				INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)",
+						pDevice->GetDeviceName().c_str(), DeviceID, Mode);
+				if (Memory::Read_U32(_Address + 4) == (u32)DeviceID)
+				{
+					g_FdMap[DeviceID] = pDevice;
+				}
+				else
+				{
+					delete pDevice;
+					pDevice = nullptr;
+				}
+			}
+		}
+		else
+		{
+			Memory::Write_U32(FS_EFDEXHAUSTED, _Address + 4);
+			result = IPC_DEFAULT_REPLY;
+		}
+		break;
+	}
+	case IPC_CMD_CLOSE:
+	{
+		if (pDevice)
+		{
+			result = pDevice->Close(_Address);
+
+			for (u32 j=0; j<ES_MAX_COUNT; j++)
+			{
+				if (es_handles[j] == g_FdMap[DeviceID])
+				{
+					es_inuse[j] = false;
+				}
+			}
+
+			g_FdMap[DeviceID] = nullptr;
+
+			// Don't delete hardware
+			if (!pDevice->IsHardware())
+			{
+				delete pDevice;
+				pDevice = nullptr;
+			}
+		}
+		else
+		{
+			Memory::Write_U32(FS_EINVAL, _Address + 4);
+			result = IPC_DEFAULT_REPLY;
+		}
+		break;
+	}
+	case IPC_CMD_READ:
+	{
+		if (pDevice)
+		{
+			result = pDevice->Read(_Address);
+		}
+		else
+		{
+			Memory::Write_U32(FS_EINVAL, _Address + 4);
+			result = IPC_DEFAULT_REPLY;
+		}
+		break;
+	}
+	case IPC_CMD_WRITE:
+	{
+		if (pDevice)
+		{
+			result = pDevice->Write(_Address);
+		}
+		else
+		{
+			Memory::Write_U32(FS_EINVAL, _Address + 4);
+			result = IPC_DEFAULT_REPLY;
+		}
+		break;
+	}
+	case IPC_CMD_SEEK:
+	{
+		if (pDevice)
+		{
+			result = pDevice->Seek(_Address);
+		}
+		else
+		{
+			Memory::Write_U32(FS_EINVAL, _Address + 4);
+			result = IPC_DEFAULT_REPLY;
+		}
+		break;
+	}
+	case IPC_CMD_IOCTL:
+	{
+		if (pDevice)
+		{
+			result = pDevice->IOCtl(_Address);
+		}
+		break;
+	}
+	case IPC_CMD_IOCTLV:
+	{
+		if (pDevice)
+		{
+			result = pDevice->IOCtlV(_Address);
+		}
+		break;
+	}
+	default:
+	{
+		_dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address);
+		break;
+	}
+	}
+
+	// Ensure replies happen in order
+	const s64 ticks_until_last_reply = last_reply_time - CoreTiming::GetTicks();
+	if (ticks_until_last_reply > 0)
+		result.reply_delay_ticks += ticks_until_last_reply;
+	last_reply_time = CoreTiming::GetTicks() + result.reply_delay_ticks;
+
+	if (result.send_reply)
+	{
+		// The original hardware overwrites the command type with the async reply type.
+		Memory::Write_U32(IPC_REP_ASYNC, _Address);
+		// IOS also seems to write back the command that was responded to in the FD field.
+		Memory::Write_U32(Command, _Address + 8);
+		// Generate a reply to the IPC command
+		EnqueueReply(_Address, (int)result.reply_delay_ticks);
+	}
+}
+
+// Happens AS SOON AS IPC gets a new pointer!
+void EnqueueRequest(u32 address)
+{
+	CoreTiming::ScheduleEvent(1000, event_enqueue, address | ENQUEUE_REQUEST_FLAG);
+}
+
+// Called when IOS module has some reply
+// NOTE: Only call this if you have correctly handled
+//       CommandAddress+0 and CommandAddress+8.
+//       Please search for examples of this being called elsewhere.
+void EnqueueReply(u32 address, int cycles_in_future)
+{
+	CoreTiming::ScheduleEvent(cycles_in_future, event_enqueue, address);
+}
+
+void EnqueueReply_Threadsafe(u32 address, int cycles_in_future)
+{
+	CoreTiming::ScheduleEvent_Threadsafe(cycles_in_future, event_enqueue, address);
+}
+
+void EnqueueReply_Immediate(u32 address)
+{
+	EnqueueEvent(address);
+}
+
+void EnqueueCommandAcknowledgement(u32 address, int cycles_in_future)
+{
+	CoreTiming::ScheduleEvent(cycles_in_future, event_enqueue,
+	                          address | ENQUEUE_ACKNOWLEDGEMENT_FLAG);
+}
+
+// This is called every IPC_HLE_PERIOD from SystemTimers.cpp
+// Takes care of routing ipc <-> ipc HLE
+void Update()
+{
+	if (!WII_IPCInterface::IsReady())
+		return;
+
+	if (request_queue.size())
+	{
+		WII_IPCInterface::GenerateAck(request_queue.front());
+		INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
+		u32 command = request_queue.front();
+		request_queue.pop_front();
+		ExecuteCommand(command);
+		return;
+	}
+
+	if (reply_queue.size())
+	{
+		WII_IPCInterface::GenerateReply(reply_queue.front());
+		INFO_LOG(WII_IPC_HLE, "<<-- Reply to IPC Request @ 0x%08x", reply_queue.front());
+		reply_queue.pop_front();
+		return;
+	}
+
+	if (ack_queue.size())
+	{
+		WII_IPCInterface::GenerateAck(ack_queue.front());
+		WARN_LOG(WII_IPC_HLE, "<<-- Double-ack to IPC Request @ 0x%08x", ack_queue.front());
+		ack_queue.pop_front();
+		return;
+	}
+}
+
+void UpdateDevices()
+{
+	// Check if a hardware device must be updated
+	for (const auto& entry : g_DeviceMap)
+	{
+		if (entry.second->IsOpened())
+		{
+			entry.second->Update();
+		}
+	}
+}
+
+
+} // end of namespace WII_IPC_HLE_Interface
+
+// TODO: create WII_IPC_HLE_Device.cpp ?
+void IWII_IPC_HLE_Device::DoStateShared(PointerWrap& p)
+{
+	p.Do(m_Name);
+	p.Do(m_DeviceID);
+	p.Do(m_Hardware);
+	p.Do(m_Active);
+}
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
new file mode 100644
index 0000000000..31142804b3
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
@@ -0,0 +1,86 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "Core/HW/SystemTimers.h"
+
+class IWII_IPC_HLE_Device;
+class PointerWrap;
+
+struct IPCCommandResult
+{
+	bool send_reply;
+	u64 reply_delay_ticks;
+};
+
+enum IPCCommandType : u32
+{
+	IPC_CMD_OPEN   = 1,
+	IPC_CMD_CLOSE  = 2,
+	IPC_CMD_READ   = 3,
+	IPC_CMD_WRITE  = 4,
+	IPC_CMD_SEEK   = 5,
+	IPC_CMD_IOCTL  = 6,
+	IPC_CMD_IOCTLV = 7,
+	// IPC_REP_ASYNC is used for messages that are automatically
+	// sent to an IOS queue when an asynchronous syscall completes.
+	// Reference: http://wiibrew.org/wiki/IOS
+	IPC_REP_ASYNC  = 8
+};
+
+static const u32 IPC_DEFAULT_DELAY = SystemTimers::GetTicksPerSecond() / 4000;	// 250 us
+static const IPCCommandResult IPC_NO_REPLY = { false, 0 };
+static const IPCCommandResult IPC_DEFAULT_REPLY = { true, IPC_DEFAULT_DELAY };
+
+namespace WII_IPC_HLE_Interface
+{
+
+#define IPC_FIRST_ID  0x00 // First IPC device ID
+#define IPC_MAX_FILES 0x10 // First IPC file ID
+
+// Init
+void Init();
+
+// Shutdown
+void Shutdown();
+
+// Reset
+void Reset(bool _bHard = false);
+
+// Do State
+void DoState(PointerWrap &p);
+
+// Set default content file
+void SetDefaultContentFile(const std::string& _rFilename);
+void ES_DIVerify(u8 *_pTMD, u32 _sz);
+
+void SDIO_EventNotify();
+
+
+IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName);
+
+IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName);
+IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID);
+int getFreeDeviceId();
+
+// Update
+void Update();
+
+// Update Devices
+void UpdateDevices();
+
+void ExecuteCommand(u32 _Address);
+
+void EnqueueRequest(u32 address);
+void EnqueueReply(u32 address, int cycles_in_future = 0);
+void EnqueueReply_Threadsafe(u32 address, int cycles_in_future = 0);
+void EnqueueReply_Immediate(u32 address);
+void EnqueueCommandAcknowledgement(u32 _Address, int cycles_in_future = 0);
+
+} // end of namespace WII_IPC_HLE_Interface
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
new file mode 100644
index 0000000000..4f44696a9b
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
@@ -0,0 +1,254 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <queue>
+#include <string>
+#include <vector>
+
+#include "Common/ChunkFile.h"
+#include "Common/StringUtil.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+
+#define FS_SUCCESS      (u32)0      // Success
+#define FS_EACCES       (u32)-1     // Permission denied
+#define FS_EEXIST       (u32)-2     // File exists
+#define FS_EINVAL       (u32)-4     // Invalid argument Invalid FD
+#define FS_ENOENT       (u32)-6     // File not found
+#define FS_EBUSY        (u32)-8     // Resource busy
+#define FS_EIO          (u32)-12    // Returned on ECC error
+#define FS_ENOMEM       (u32)-22    // Alloc failed during request
+#define FS_EFATAL       (u32)-101   // Fatal error
+#define FS_EACCESS      (u32)-102   // Permission denied
+#define FS_ECORRUPT     (u32)-103   // returned for "corrupted" NAND
+#define FS_EEXIST2      (u32)-105   // File exists
+#define FS_ENOENT2      (u32)-106   // File not found
+#define FS_ENFILE       (u32)-107   // Too many fds open
+#define FS_EFBIG        (u32)-108   // Max block count reached?
+#define FS_EFDEXHAUSTED (u32)-109   // Too many fds open
+#define FS_ENAMELEN     (u32)-110   // Pathname is too long
+#define FS_EFDOPEN      (u32)-111   // FD is already open
+#define FS_EIO2         (u32)-114   // Returned on ECC error
+#define FS_ENOTEMPTY    (u32)-115   // Directory not empty
+#define FS_EDIRDEPTH    (u32)-116   // Max directory depth exceeded
+#define FS_EBUSY2       (u32)-118   // Resource busy
+//#define FS_EFATAL       (u32)-119   // Fatal error not used by IOS as fatal ERROR
+#define FS_EESEXHAUSTED (u32)-1016  // Max of 2 ES handles at a time
+
+// A struct for IOS ioctlv calls
+struct SIOCtlVBuffer
+{
+	SIOCtlVBuffer(u32 _Address) : m_Address(_Address)
+	{
+		// These are the Ioctlv parameters in the IOS communication. The BufferVector
+		// is a memory address offset at where the in and out buffer addresses are
+		// stored.
+		Parameter           = Memory::Read_U32(m_Address + 0x0C); // command 3, arg0
+		NumberInBuffer      = Memory::Read_U32(m_Address + 0x10); // 4, arg1
+		NumberPayloadBuffer = Memory::Read_U32(m_Address + 0x14); // 5, arg2
+		BufferVector        = Memory::Read_U32(m_Address + 0x18); // 6, arg3
+
+		// The start of the out buffer
+		u32 BufferVectorOffset = BufferVector;
+
+		// Write the address and size for all in messages
+		for (u32 i = 0; i < NumberInBuffer; i++)
+		{
+			SBuffer Buffer;
+			Buffer.m_Address = Memory::Read_U32(BufferVectorOffset);
+			BufferVectorOffset += 4;
+			Buffer.m_Size    = Memory::Read_U32(BufferVectorOffset);
+			BufferVectorOffset += 4;
+			InBuffer.push_back(Buffer);
+			DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer in%i: 0x%08x, 0x%x",
+						i, Buffer.m_Address, Buffer.m_Size);
+		}
+
+		// Write the address and size for all out or in-out messages
+		for (u32 i = 0; i < NumberPayloadBuffer; i++)
+		{
+			SBuffer Buffer;
+			Buffer.m_Address = Memory::Read_U32(BufferVectorOffset);
+			BufferVectorOffset += 4;
+			Buffer.m_Size    = Memory::Read_U32(BufferVectorOffset);
+			BufferVectorOffset += 4;
+			PayloadBuffer.push_back(Buffer);
+			DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer io%i: 0x%08x, 0x%x",
+						i, Buffer.m_Address, Buffer.m_Size);
+		}
+	}
+
+	const u32 m_Address;
+
+	u32 Parameter;
+	u32 NumberInBuffer;
+	u32 NumberPayloadBuffer;
+	u32 BufferVector;
+
+	struct SBuffer { u32 m_Address, m_Size; };
+	std::vector<SBuffer> InBuffer;
+	std::vector<SBuffer> PayloadBuffer;
+};
+
+class IWII_IPC_HLE_Device
+{
+public:
+
+	IWII_IPC_HLE_Device(u32 _DeviceID, const std::string& _rName, bool _Hardware = true) :
+		m_Name(_rName),
+		m_DeviceID(_DeviceID),
+		m_Hardware(_Hardware),
+		m_Active(false)
+	{
+	}
+
+	virtual ~IWII_IPC_HLE_Device()
+	{
+	}
+
+	virtual void DoState(PointerWrap& p)
+	{
+		DoStateShared(p);
+		p.Do(m_Active);
+	}
+
+	void DoStateShared(PointerWrap& p);
+
+	const std::string& GetDeviceName() const { return m_Name; }
+	u32 GetDeviceID() const { return m_DeviceID; }
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode)
+	{
+		(void)_Mode;
+		WARN_LOG(WII_IPC_HLE, "%s does not support Open()", m_Name.c_str());
+		Memory::Write_U32(FS_ENOENT, _CommandAddress + 4);
+		m_Active = true;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce = false)
+	{
+		WARN_LOG(WII_IPC_HLE, "%s does not support Close()", m_Name.c_str());
+		if (!_bForce)
+			Memory::Write_U32(FS_EINVAL, _CommandAddress + 4);
+		m_Active = false;
+		return IPC_DEFAULT_REPLY;
+	}
+
+#define UNIMPLEMENTED_CMD(cmd) WARN_LOG(WII_IPC_HLE, "%s does not support "#cmd"()", m_Name.c_str()); return IPC_DEFAULT_REPLY;
+	virtual IPCCommandResult Seek(u32)   { UNIMPLEMENTED_CMD(Seek) }
+	virtual IPCCommandResult Read(u32)   { UNIMPLEMENTED_CMD(Read) }
+	virtual IPCCommandResult Write(u32)  { UNIMPLEMENTED_CMD(Write) }
+	virtual IPCCommandResult IOCtl(u32)  { UNIMPLEMENTED_CMD(IOCtl) }
+	virtual IPCCommandResult IOCtlV(u32) { UNIMPLEMENTED_CMD(IOCtlV) }
+#undef UNIMPLEMENTED_CMD
+
+	virtual u32 Update() { return 0; }
+
+	virtual bool IsHardware() { return m_Hardware; }
+	virtual bool IsOpened() { return m_Active; }
+
+	std::string m_Name;
+protected:
+
+	// STATE_TO_SAVE
+	u32 m_DeviceID;
+	bool m_Hardware;
+	bool m_Active;
+
+	// Write out the IPC struct from _CommandAddress to _NumberOfCommands numbers
+	// of 4 byte commands.
+	void DumpCommands(u32 _CommandAddress, size_t _NumberOfCommands = 8,
+		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
+		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
+	{
+		GENERIC_LOG(LogType, Verbosity, "CommandDump of %s",
+					GetDeviceName().c_str());
+		for (u32 i = 0; i < _NumberOfCommands; i++)
+		{
+			GENERIC_LOG(LogType, Verbosity, "    Command%02i: 0x%08x", i,
+						Memory::Read_U32(_CommandAddress + i*4));
+		}
+	}
+
+	void DumpAsync(u32 BufferVector, u32 NumberInBuffer, u32 NumberOutBuffer,
+		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
+		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
+	{
+		GENERIC_LOG(LogType, Verbosity, "======= DumpAsync ======");
+
+		u32 BufferOffset = BufferVector;
+		for (u32 i = 0; i < NumberInBuffer; i++)
+		{
+			u32 InBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+			u32 InBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+
+			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV InBuffer[%i]:",
+				GetDeviceName().c_str(), i);
+
+			std::string Temp;
+			for (u32 j = 0; j < InBufferSize; j++)
+			{
+				Temp += StringFromFormat("%02x ", Memory::Read_U8(InBuffer+j));
+			}
+
+			GENERIC_LOG(LogType, LogTypes::LDEBUG, "    Buffer: %s", Temp.c_str());
+		}
+
+		for (u32 i = 0; i < NumberOutBuffer; i++)
+		{
+			u32 OutBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+			u32 OutBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+
+			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV OutBuffer[%i]:",
+				GetDeviceName().c_str(), i);
+			GENERIC_LOG(LogType, LogTypes::LINFO, "    OutBuffer: 0x%08x (0x%x):",
+				OutBuffer, OutBufferSize);
+
+			if (Verbosity >= LogTypes::LOG_LEVELS::LINFO)
+				DumpCommands(OutBuffer, OutBufferSize, LogType, Verbosity);
+		}
+	}
+};
+
+class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_stub(u32 DeviceID, const std::string& Name)
+		: IWII_IPC_HLE_Device(DeviceID, Name)
+	{
+	}
+
+	IPCCommandResult Open(u32 CommandAddress, u32 Mode) override
+	{
+		(void)Mode;
+		WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
+		Memory::Write_U32(GetDeviceID(), CommandAddress + 4);
+		m_Active = true;
+		return IPC_DEFAULT_REPLY;
+	}
+	IPCCommandResult Close(u32 CommandAddress, bool bForce = false) override
+	{
+		WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
+		if (!bForce)
+			Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
+		m_Active = false;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	IPCCommandResult IOCtl(u32 CommandAddress) override
+	{
+		WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str());
+		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
+		return IPC_DEFAULT_REPLY;
+	}
+	IPCCommandResult IOCtlV(u32 CommandAddress) override
+	{
+		WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str());
+		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
+		return IPC_DEFAULT_REPLY;
+	}
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
new file mode 100644
index 0000000000..caf28e6342
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
@@ -0,0 +1,185 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <memory>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/LogManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+
+static CWII_IPC_HLE_Device_di* g_di_pointer;
+static int ioctl_callback;
+
+static void IOCtlCallback(u64 userdata, int cycles_late)
+{
+	if (g_di_pointer != nullptr)
+		g_di_pointer->FinishIOCtl((DVDInterface::DIInterruptType)userdata);
+
+	// If g_di_pointer == nullptr, IOS was probably shut down,
+	// so the command shouldn't be completed
+}
+
+CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+	if (g_di_pointer == nullptr)
+		ERROR_LOG(WII_IPC_DVD, "Trying to run two DI devices at once. IOCtl may not behave as expected.");
+
+	g_di_pointer = this;
+	ioctl_callback = CoreTiming::RegisterEvent("IOCtlCallbackDI", IOCtlCallback);
+}
+
+CWII_IPC_HLE_Device_di::~CWII_IPC_HLE_Device_di()
+{
+	g_di_pointer = nullptr;
+}
+
+void CWII_IPC_HLE_Device_di::DoState(PointerWrap& p)
+{
+	DoStateShared(p);
+	p.Do(m_commands_to_execute);
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_di::Open(u32 _CommandAddress, u32 _Mode)
+{
+	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce)
+{
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress)
+{
+	// DI IOCtls are handled in a special way by Dolphin
+	// compared to other WII_IPC_HLE functions.
+	// This is a wrapper around DVDInterface's ExecuteCommand,
+	// which will execute commands more or less asynchronously.
+	// Only one command can be executed at a time, so commands
+	// are queued until DVDInterface is ready to handle them.
+
+	bool ready_to_execute = m_commands_to_execute.empty();
+	m_commands_to_execute.push_back(_CommandAddress);
+	if (ready_to_execute)
+		StartIOCtl(_CommandAddress);
+
+	// DVDInterface handles the timing, and we handle the reply,
+	// so WII_IPC_HLE shouldn't do any of that.
+	return IPC_NO_REPLY;
+}
+
+void CWII_IPC_HLE_Device_di::StartIOCtl(u32 command_address)
+{
+	u32 BufferIn = Memory::Read_U32(command_address + 0x10);
+	u32 BufferInSize = Memory::Read_U32(command_address + 0x14);
+	u32 BufferOut = Memory::Read_U32(command_address + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(command_address + 0x1C);
+
+	u32 command_0 = Memory::Read_U32(BufferIn);
+	u32 command_1 = Memory::Read_U32(BufferIn + 4);
+	u32 command_2 = Memory::Read_U32(BufferIn + 8);
+
+	DEBUG_LOG(WII_IPC_DVD, "IOCtl Command(0x%08x) BufferIn(0x%08x, 0x%x) BufferOut(0x%08x, 0x%x)",
+		command_0, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+	// TATSUNOKO VS CAPCOM: Gets here with BufferOut == 0!!!
+	if (BufferOut != 0)
+	{
+		// Set out buffer to zeroes as a safety precaution
+		// to avoid answering nonsense values
+		Memory::Memset(BufferOut, 0, BufferOutSize);
+	}
+
+	// DVDInterface's ExecuteCommand handles most of the work.
+	// The IOCtl callback is used to generate a reply afterwards.
+	DVDInterface::ExecuteCommand(command_0, command_1, command_2, BufferOut, BufferOutSize,
+	                             false, ioctl_callback);
+}
+
+void CWII_IPC_HLE_Device_di::FinishIOCtl(DVDInterface::DIInterruptType interrupt_type)
+{
+	if (m_commands_to_execute.empty())
+	{
+		PanicAlert("WII_IPC_HLE_Device_DI: There is no command to execute!");
+		return;
+	}
+
+	// This command has been executed, so it's removed from the queue
+	u32 command_address = m_commands_to_execute.front();
+	m_commands_to_execute.pop_front();
+
+	// The DI interrupt type is used as a return value
+	Memory::Write_U32(interrupt_type, command_address + 4);
+
+	// The original hardware overwrites the command type with the async reply type.
+	Memory::Write_U32(IPC_REP_ASYNC, command_address);
+	// IOS also seems to write back the command that was responded to in the FD field.
+	Memory::Write_U32(Memory::Read_U32(command_address), command_address + 8);
+	// Generate a reply to the IPC command
+	WII_IPC_HLE_Interface::EnqueueReply_Immediate(command_address);
+
+	// DVDInterface is now ready to execute another command,
+	// so we start executing a command from the queue if there is one
+	if (!m_commands_to_execute.empty())
+		StartIOCtl(m_commands_to_execute.front());
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress)
+{
+	SIOCtlVBuffer CommandBuffer(_CommandAddress);
+
+	// Prepare the out buffer(s) with zeros as a safety precaution
+	// to avoid returning bad values
+	for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
+	{
+		Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
+			CommandBuffer.PayloadBuffer[i].m_Size);
+	}
+
+	u32 ReturnValue = 0;
+	switch (CommandBuffer.Parameter)
+	{
+	case DVDInterface::DVDLowOpenPartition:
+		{
+			_dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[1].m_Address == 0, "DVDLowOpenPartition with ticket");
+			_dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[2].m_Address == 0, "DVDLowOpenPartition with cert chain");
+
+			u64 const partition_offset = ((u64)Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address + 4) << 2);
+			DVDInterface::ChangePartition(partition_offset);
+
+			INFO_LOG(WII_IPC_DVD, "DVDLowOpenPartition: partition_offset 0x%016" PRIx64, partition_offset);
+
+			// Read TMD to the buffer
+			u32 tmd_size;
+			std::unique_ptr<u8[]> tmd_buf = DVDInterface::GetVolume().GetTMD(&tmd_size);
+			Memory::CopyToEmu(CommandBuffer.PayloadBuffer[0].m_Address, tmd_buf.get(), tmd_size);
+			WII_IPC_HLE_Interface::ES_DIVerify(tmd_buf.get(), tmd_size);
+
+			ReturnValue = 1;
+		}
+		break;
+
+	default:
+		ERROR_LOG(WII_IPC_DVD, "IOCtlV: %i", CommandBuffer.Parameter);
+		_dbg_assert_msg_(WII_IPC_DVD, 0, "IOCtlV: %i", CommandBuffer.Parameter);
+		break;
+	}
+
+	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
new file mode 100644
index 0000000000..7096b655cb
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
@@ -0,0 +1,35 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <deque>
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class PointerWrap;
+namespace DVDInterface { enum DIInterruptType : int; }
+
+class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_di();
+
+	void DoState(PointerWrap& p) override;
+
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+	void FinishIOCtl(DVDInterface::DIInterruptType interrupt_type);
+private:
+
+	void StartIOCtl(u32 command_address);
+
+	std::deque<u32> m_commands_to_execute;
+};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
similarity index 75%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
index 6e2f02e2be..573f698021 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -1,30 +1,34 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "ChunkFile.h"
-
-#include "WII_IPC_HLE_Device_fs.h"
-#include "WII_IPC_HLE_Device_FileIO.h"
-#include "NandPaths.h"
 #include <algorithm>
 
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h"
+
 
 static Common::replace_v replacements;
 
 // This is used by several of the FileIO and /dev/fs functions
-std::string HLE_IPC_BuildFilename(std::string path_wii, int _size)
+std::string HLE_IPC_BuildFilename(std::string path_wii)
 {
-	std::string path_full = File::GetUserPath(D_WIIROOT_IDX);
+	std::string path_full = File::GetUserPath(D_SESSION_WIIROOT_IDX);
 
 	// Replaces chars that FAT32 can't support with strings defined in /sys/replace
-	for (auto i = replacements.begin(); i != replacements.end(); ++i)
+	for (auto& replacement : replacements)
 	{
-		for (size_t j = 0; (j = path_wii.find(i->first, j)) != path_wii.npos; ++j)
-			path_wii.replace(j, 1, i->second);
+		for (size_t j = 0; (j = path_wii.find(replacement.first, j)) != path_wii.npos; ++j)
+			path_wii.replace(j, 1, replacement.second);
 	}
 
 	path_full += path_wii;
@@ -66,7 +70,7 @@ void HLE_IPC_CreateVirtualFATFilesystem()
 }
 
 CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false)	// not a real hardware
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware
 	, m_Mode(0)
 	, m_SeekPos(0)
 {
@@ -77,23 +81,23 @@ CWII_IPC_HLE_Device_FileIO::~CWII_IPC_HLE_Device_FileIO()
 {
 }
 
-bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce)
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce)
 {
-	INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID);	
+	INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID);
 	m_Mode = 0;
 
 	// Close always return 0 for success
 	if (_CommandAddress && !_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
 	m_Active = false;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)  
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
 {
 	m_Mode = _Mode;
 	u32 ReturnValue = 0;
-	
+
 	static const char* const Modes[] =
 	{
 		"Unk Mode",
@@ -101,12 +105,12 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
 		"Write only",
 		"Read and Write"
 	};
-	
-	m_filepath = HLE_IPC_BuildFilename(m_Name, 64);
-	
+
+	m_filepath = HLE_IPC_BuildFilename(m_Name);
+
 	// The file must exist before we can open it
 	// It should be created by ISFS_CreateFile, not here
-	if (File::Exists(m_filepath))
+	if (File::Exists(m_filepath) && !File::IsDirectory(m_filepath))
 	{
 		INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode);
 		ReturnValue = m_DeviceID;
@@ -120,35 +124,35 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
 	if (_CommandAddress)
 		Memory::Write_U32(ReturnValue, _CommandAddress+4);
 	m_Active = true;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile()
 {
 	const char* open_mode = "";
-	
+
 	switch (m_Mode)
 	{
 	case ISFS_OPEN_READ:
 		open_mode = "rb";
 		break;
-	
+
 	case ISFS_OPEN_WRITE:
 	case ISFS_OPEN_RW:
 		open_mode = "r+b";
 		break;
-	
+
 	default:
-		PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode);
+		PanicAlert("FileIO: Unknown open mode : 0x%02x", m_Mode);
 		break;
 	}
-	
+
 	return File::IOFile(m_filepath, open_mode);
 }
 
-bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 {
-	u32 ReturnValue	= FS_RESULT_FATAL;
+	u32 ReturnValue = FS_RESULT_FATAL;
 	const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC);
 	const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10);
 
@@ -161,7 +165,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 
 		switch (Mode)
 		{
-			case 0:
+			case WII_SEEK_SET:
 			{
 				if ((SeekPosition >=0) && (SeekPosition <= fileSize))
 				{
@@ -170,7 +174,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 				}
 				break;
 			}
-			case 1:
+
+			case WII_SEEK_CUR:
 			{
 				s32 wantedPos = SeekPosition+m_SeekPos;
 				if (wantedPos >=0 && wantedPos <= fileSize)
@@ -180,9 +185,10 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 				}
 				break;
 			}
-			case 2:
+
+			case WII_SEEK_END:
 			{
-				s32 wantedPos = fileSize+m_SeekPos;
+				s32 wantedPos = SeekPosition+fileSize;
 				if (wantedPos >=0 && wantedPos <= fileSize)
 				{
 					m_SeekPos = wantedPos;
@@ -190,6 +196,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 				}
 				break;
 			}
+
 			default:
 			{
 				PanicAlert("CWII_IPC_HLE_Device_FileIO Unsupported seek mode %i", Mode);
@@ -204,14 +211,14 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 	}
 	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
 
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) 
-{	
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
+{
 	u32 ReturnValue = FS_EACCESS;
-	const u32 Address	= Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address
-	const u32 Size	= Memory::Read_U32(_CommandAddress + 0x10);
+	const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address
+	const u32 Size    = Memory::Read_U32(_CommandAddress + 0x10);
 
 
 	if (auto file = OpenFile())
@@ -233,25 +240,24 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
 			{
 				m_SeekPos += Size;
 			}
-			
+
 		}
 	}
 	else
 	{
-		ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size);	
+		ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size);
 		ReturnValue = FS_FILE_NOT_EXIST;
 	}
 
 	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) 
-{		
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
+{
 	u32 ReturnValue = FS_EACCESS;
-	const u32 Address	= Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address
-	const u32 Size	= Memory::Read_U32(_CommandAddress + 0x10);
-
+	const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address
+	const u32 Size    = Memory::Read_U32(_CommandAddress + 0x10);
 
 	if (auto file = OpenFile())
 	{
@@ -272,21 +278,21 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
 	}
 	else
 	{
-		ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size);	
+		ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size);
 		ReturnValue = FS_FILE_NOT_EXIST;
 	}
 
 	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) 
+IPCCommandResult CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress)
 {
 	INFO_LOG(WII_IPC_FILEIO, "FileIO: IOCtl (Device=%s)", m_Name.c_str());
 #if defined(_DEBUG) || defined(DEBUGFAST)
 	DumpCommands(_CommandAddress);
 #endif
-	const u32 Parameter =  Memory::Read_U32(_CommandAddress + 0xC);	
+	const u32 Parameter =  Memory::Read_U32(_CommandAddress + 0xC);
 	u32 ReturnValue = 0;
 
 	switch (Parameter)
@@ -320,7 +326,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress)
 
 	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
 
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
@@ -329,6 +335,6 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
 
 	p.Do(m_Mode);
 	p.Do(m_SeekPos);
-	
-	m_filepath = HLE_IPC_BuildFilename(m_Name, 64);
+
+	m_filepath = HLE_IPC_BuildFilename(m_Name);
 }
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
new file mode 100644
index 0000000000..45f7b9ed1b
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
@@ -0,0 +1,78 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class PointerWrap;
+namespace File { class IOFile; }
+
+std::string HLE_IPC_BuildFilename(std::string _pFilename);
+void HLE_IPC_CreateVirtualFATFilesystem();
+
+class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_FileIO();
+
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Seek(u32 _CommandAddress) override;
+	IPCCommandResult Read(u32 _CommandAddress) override;
+	IPCCommandResult Write(u32 _CommandAddress) override;
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	void DoState(PointerWrap &p) override;
+
+	File::IOFile OpenFile();
+
+private:
+	enum
+	{
+		ISFS_OPEN_READ  = 1,
+		ISFS_OPEN_WRITE = 2,
+		ISFS_OPEN_RW    = (ISFS_OPEN_READ | ISFS_OPEN_WRITE)
+	};
+
+	enum
+	{
+		WII_SEEK_SET = 0,
+		WII_SEEK_CUR = 1,
+		WII_SEEK_END = 2,
+	};
+
+	enum
+	{
+		ISFS_FUNCNULL     = 0,
+		ISFS_FUNCGETSTAT  = 1,
+		ISFS_FUNCREADDIR  = 2,
+		ISFS_FUNCGETATTR  = 3,
+		ISFS_FUNCGETUSAGE = 4
+	};
+
+	enum
+	{
+		ISFS_IOCTL_FORMAT         = 1,
+		ISFS_IOCTL_GETSTATS       = 2,
+		ISFS_IOCTL_CREATEDIR      = 3,
+		ISFS_IOCTL_READDIR        = 4,
+		ISFS_IOCTL_SETATTR        = 5,
+		ISFS_IOCTL_GETATTR        = 6,
+		ISFS_IOCTL_DELETE         = 7,
+		ISFS_IOCTL_RENAME         = 8,
+		ISFS_IOCTL_CREATEFILE     = 9,
+		ISFS_IOCTL_SETFILEVERCTRL = 10,
+		ISFS_IOCTL_GETFILESTATS   = 11,
+		ISFS_IOCTL_GETUSAGE       = 12,
+		ISFS_IOCTL_SHUTDOWN       = 13
+	};
+
+	u32 m_Mode;
+	u32 m_SeekPos;
+
+	std::string m_filepath;
+};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
similarity index 81%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
index 98e77c7695..3567b25aba 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 
@@ -13,7 +13,7 @@
 	0x20 GetTitleID (ES_GetTitleID) (Input: none, Output: 8 bytes)
 	0x1d GetDataDir (ES_GetDataDir) (Input: 8 bytes, Output: 30 bytes)
 
-	0x1b DiGetTicketView (Input: none, Output: 216 bytes) 
+	0x1b DiGetTicketView (Input: none, Output: 216 bytes)
 	0x16 GetConsumption (Input: 8 bytes, Output: 0 bytes, 4 bytes) // there are two output buffers
 
 	0x12 GetNumTicketViews (ES_GetNumTicketViews) (Input: 8 bytes, Output: 4 bytes)
@@ -23,7 +23,7 @@
 	but only the first two are correctly supported. For the other four we ignore any potential
 	input and only write zero to the out buffer. However, most games only use first two,
 	but some Nintendo developed games use the other ones to:
-	
+
 	0x1b: Mario Galaxy, Mario Kart, SSBB
 	0x16: Mario Galaxy, Mario Kart, SSBB
 	0x12: Mario Kart
@@ -33,22 +33,27 @@
 */
 // =============
 
-#include "WII_IPC_HLE_Device_es.h"
+// need to include this before polarssl/aes.h,
+// otherwise we may not get __STDC_FORMAT_MACROS
+#include <cinttypes>
+#include <polarssl/aes.h>
 
-#include "../PowerPC/PowerPC.h"
-#include "../VolumeHandler.h"
-#include "FileUtil.h"
-#include "Crypto/aes.h"
-#include "ConfigManager.h"
-
-#include "../Boot/Boot_DOL.h"
-#include "NandPaths.h"
-#include "CommonPaths.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "../Movie.h"
-#include "StringUtil.h"
-
-#include "ec_wii.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/ec_wii.h"
+#include "Core/Movie.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DiscIO/NANDContentLoader.h"
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -56,37 +61,37 @@
 
 std::string CWII_IPC_HLE_Device_es::m_ContentFile;
 
-CWII_IPC_HLE_Device_es::CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName) 
+CWII_IPC_HLE_Device_es::CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName)
 	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-	, m_pContentLoader(NULL)
+	, m_pContentLoader(nullptr)
 	, m_TitleID(-1)
 	, m_AccessIdentID(0x6000000)
 {
 }
 
-static u8 key_sd   [0x10]	= {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
-static u8 key_ecc  [0x1e]	= {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
-static u8 key_empty[0x10]	= {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static u8 key_sd   [0x10] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
+static u8 key_ecc  [0x1e] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+static u8 key_empty[0x10] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 // default key table
 u8* CWII_IPC_HLE_Device_es::keyTable[11] = {
-	key_ecc,	// ECC Private Key
-	key_empty,	// Console ID
-	key_empty,	// NAND AES Key
-	key_empty,	// NAND HMAC
-	key_empty,	// Common Key
-	key_empty,	// PRNG seed
-	key_sd,		// SD Key
-	key_empty,	// Unknown
-	key_empty,	// Unknown
-	key_empty,	// Unknown
-	key_empty,	// Unknown
+	key_ecc,   // ECC Private Key
+	key_empty, // Console ID
+	key_empty, // NAND AES Key
+	key_empty, // NAND HMAC
+	key_empty, // Common Key
+	key_empty, // PRNG seed
+	key_sd,    // SD Key
+	key_empty, // Unknown
+	key_empty, // Unknown
+	key_empty, // Unknown
+	key_empty, // Unknown
 };
 
 CWII_IPC_HLE_Device_es::~CWII_IPC_HLE_Device_es()
 {}
 
-void CWII_IPC_HLE_Device_es::LoadWAD(const std::string& _rContentFile) 
+void CWII_IPC_HLE_Device_es::LoadWAD(const std::string& _rContentFile)
 {
 	m_ContentFile = _rContentFile;
 }
@@ -106,11 +111,11 @@ void CWII_IPC_HLE_Device_es::OpenInternal()
 		// m_TitleIDsOwned.clear();
 		// DiscIO::cUIDsys::AccessInstance().GetTitleIDs(m_TitleIDsOwned, true);
 	}
-	else if (VolumeHandler::IsValid())
+	else if (DVDInterface::VolumeIsValid())
 	{
 		// blindly grab the titleID from the disc - it's unencrypted at:
 		// offset 0x0F8001DC and 0x0F80044C
-		VolumeHandler::GetVolume()->GetTitleID((u8*)&m_TitleID);
+		DVDInterface::GetVolume().GetTitleID((u8*)&m_TitleID);
 		m_TitleID = Common::swap64(m_TitleID);
 	}
 	else
@@ -129,12 +134,13 @@ void CWII_IPC_HLE_Device_es::DoState(PointerWrap& p)
 	p.Do(m_AccessIdentID);
 	p.Do(m_TitleIDs);
 
-	u32 Count = m_ContentAccessMap.size();
+	u32 Count = (u32)(m_ContentAccessMap.size());
 	p.Do(Count);
 
-	u32 CFD, Position;
-	u64 TitleID;
-	u16 Index;
+	u32 CFD = 0;
+	u32 Position = 0;
+	u64 TitleID = 0;
+	u16 Index = 0;
 	if (p.GetMode() == PointerWrap::MODE_READ)
 	{
 		for (u32 i = 0; i < Count; i++)
@@ -152,10 +158,10 @@ void CWII_IPC_HLE_Device_es::DoState(PointerWrap& p)
 	}
 	else
 	{
-		for (auto itr = m_ContentAccessMap.begin(); itr != m_ContentAccessMap.end(); ++itr)
+		for (auto& pair : m_ContentAccessMap)
 		{
-			CFD = itr->first;
-			SContentAccess& Access = itr->second;
+			CFD = pair.first;
+			SContentAccess& Access = pair.second;
 			Position = Access.m_Position;
 			TitleID = Access.m_TitleID;
 			Index = Access.m_pContent->m_Index;
@@ -167,7 +173,7 @@ void CWII_IPC_HLE_Device_es::DoState(PointerWrap& p)
 	}
 }
 
-bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)
+IPCCommandResult CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)
 {
 	OpenInternal();
 
@@ -175,19 +181,19 @@ bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)
 	if (m_Active)
 		INFO_LOG(WII_IPC_ES, "Device was re-opened.");
 	m_Active = true;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
+IPCCommandResult CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
 {
 	// Leave deletion of the INANDContentLoader objects to CNANDContentManager, don't do it here!
 	m_NANDContent.clear();
-	for (auto itr = m_ContentAccessMap.begin(); itr != m_ContentAccessMap.end(); ++itr)
+	for (auto& pair : m_ContentAccessMap)
 	{
-		delete itr->second.m_pFile;
+		delete pair.second.m_pFile;
 	}
 	m_ContentAccessMap.clear();
-	m_pContentLoader = NULL;
+	m_pContentLoader = nullptr;
 	m_TitleIDs.clear();
 	m_TitleID = -1;
 	m_AccessIdentID = 0x6000000;
@@ -196,7 +202,7 @@ bool CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
 	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
 	m_Active = false;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
@@ -205,13 +211,13 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
 
 	if (!Loader.IsValid())
 	{
-		WARN_LOG(WII_IPC_ES, "ES: loader not valid for %llx", TitleID);
+		WARN_LOG(WII_IPC_ES, "ES: loader not valid for %" PRIx64, TitleID);
 		return 0xffffffff;
 	}
 
 	const DiscIO::SNANDContent* pContent = Loader.GetContentByIndex(Index);
 
-	if (pContent == NULL)
+	if (pContent == nullptr)
 	{
 		return 0xffffffff; //TODO: what is the correct error value here?
 	}
@@ -220,7 +226,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
 	Access.m_Position = 0;
 	Access.m_pContent = pContent;
 	Access.m_TitleID = TitleID;
-	Access.m_pFile = NULL;
+	Access.m_pFile = nullptr;
 
 	if (!pContent->m_pData)
 	{
@@ -239,7 +245,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
 	return CFD;
 }
 
-bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) 
+IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 {
 	SIOCtlVBuffer Buffer(_CommandAddress);
 
@@ -271,12 +277,12 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 	case IOCTL_ES_GETDEVICEID:
 		{
 			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETDEVICEID no out buffer");
-			
+
 			EcWii &ec = EcWii::GetInstance();
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETDEVICEID %08X", ec.getNgId());
 			Memory::Write_U32(ec.getNgId(), Buffer.PayloadBuffer[0].m_Address);
 			Memory::Write_U32(0, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -303,10 +309,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			else
 				Memory::Write_U32((u32)rNANDContent.GetContentSize(), _CommandAddress + 0x4);
 
-			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECONTENTSCNT: TitleID: %08x/%08x  content count %i", 
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECONTENTSCNT: TitleID: %08x/%08x  content count %i",
 				(u32)(TitleID>>32), (u32)TitleID, rNANDContent.IsValid() ? NumberOfPrivateContent : (u32)rNANDContent.GetContentSize());
 
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -337,7 +343,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 						GetContentSize());
 			}
 
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -355,7 +361,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENTITLECONTENT: TitleID: %08x/%08x  Index %i -> got CFD %x", (u32)(TitleID>>32), (u32)TitleID, Index, CFD);
 
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -369,7 +375,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U32(CFD, _CommandAddress + 0x4);
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENCONTENT: Index %i -> got CFD %x", Index, CFD);
 
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -386,15 +392,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			if (itr == m_ContentAccessMap.end())
 			{
 				Memory::Write_U32(-1, _CommandAddress + 0x4);
-				return true;
+				return IPC_DEFAULT_REPLY;
 			}
 			SContentAccess& rContent = itr->second;
 
-			_dbg_assert_(WII_IPC_ES, rContent.m_pContent->m_pData != NULL);
-
 			u8* pDest = Memory::GetPointer(Addr);
 
-			if (rContent.m_Position + Size > rContent.m_pContent->m_Size) 
+			if (rContent.m_Position + Size > rContent.m_pContent->m_Size)
 			{
 				Size = rContent.m_pContent->m_Size-rContent.m_Position;
 			}
@@ -423,14 +427,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 					}
 					rContent.m_Position += Size;
 				} else {
-					PanicAlertT("IOCTL_ES_READCONTENT - bad destination");
+					PanicAlert("IOCTL_ES_READCONTENT - bad destination");
 				}
 			}
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_READCONTENT: CFD %x, Address 0x%x, Size %i -> stream pos %i (Index %i)", CFD, Addr, Size, rContent.m_Position, rContent.m_pContent->m_Index);
 
 			Memory::Write_U32(Size, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -447,14 +451,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			if (itr == m_ContentAccessMap.end())
 			{
 				Memory::Write_U32(-1, _CommandAddress + 0x4);
-				return true;
+				return IPC_DEFAULT_REPLY;
 			}
 
 			delete itr->second.m_pFile;
 			m_ContentAccessMap.erase(itr);
 
 			Memory::Write_U32(0, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -471,7 +475,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			if (itr == m_ContentAccessMap.end())
 			{
 				Memory::Write_U32(-1, _CommandAddress + 0x4);
-				return true;
+				return IPC_DEFAULT_REPLY;
 			}
 			SContentAccess& rContent = itr->second;
 
@@ -493,7 +497,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_SEEKCONTENT: CFD %x, Address 0x%x, Mode %i -> Pos %i", CFD, Addr, Mode, rContent.m_Position);
 
 			Memory::Write_U32(rContent.m_Position, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -544,7 +548,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -567,7 +571,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLES: Number of titles returned %i", Count);
 			Memory::Write_U32(0, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -590,7 +594,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 				{
 					u32 FileSize = (u32)File::GetSize(TicketFilename);
 					_dbg_assert_msg_(WII_IPC_ES, (FileSize % DiscIO::INANDContentLoader::TICKET_SIZE) == 0, "IOCTL_ES_GETVIEWCNT ticket file size seems to be wrong");
-					
+
 					ViewCount = FileSize / DiscIO::INANDContentLoader::TICKET_SIZE;
 					_dbg_assert_msg_(WII_IPC_ES, (ViewCount>0) && (ViewCount<=4), "IOCTL_ES_GETVIEWCNT ticket count seems to be wrong");
 				}
@@ -614,7 +618,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 			Memory::Write_U32(ViewCount, Buffer.PayloadBuffer[0].m_Address);
 			Memory::Write_U32(retVal, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -628,7 +632,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			u32 retVal = 0;
 
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
-			
+
 			const u8 *Ticket = Loader.GetTIK();
 			if (Ticket)
 			{
@@ -636,8 +640,8 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 				for (unsigned int View = 0; View != maxViews && View < viewCnt; ++View)
 				{
 					Memory::Write_U32(View, Buffer.PayloadBuffer[0].m_Address + View * 0xD8);
-					Memory::WriteBigEData(Ticket + 0x1D0 + (View * DiscIO::INANDContentLoader::TICKET_SIZE),
-						Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8, 212);
+					Memory::CopyToEmu(Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8,
+						Ticket + 0x1D0 + (View * DiscIO::INANDContentLoader::TICKET_SIZE), 212);
 				}
 			}
 			else
@@ -652,7 +656,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 						for (unsigned int View = 0; View != maxViews && pFile.ReadBytes(FileTicket, DiscIO::INANDContentLoader::TICKET_SIZE); ++View)
 						{
 							Memory::Write_U32(View, Buffer.PayloadBuffer[0].m_Address + View * 0xD8);
-							Memory::WriteBigEData(FileTicket+0x1D0, Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8, 212);
+							Memory::CopyToEmu(Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8, FileTicket+0x1D0, 212);
 						}
 					}
 				}
@@ -663,11 +667,11 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 					// shouldn't matter at all.  Just fill out some fields just
 					// to be on the safe side.
 					u32 Address = Buffer.PayloadBuffer[0].m_Address;
-					memset(Memory::GetPointer(Address), 0, 0xD8);
+					Memory::Memset(Address, 0, 0xD8);
 					Memory::Write_U64(TitleID, Address + 4 + (0x1dc - 0x1d0)); // title ID
 					Memory::Write_U16(0xffff, Address + 4 + (0x1e4 - 0x1d0)); // unnnown
 					Memory::Write_U32(0xff00, Address + 4 + (0x1ec - 0x1d0)); // access mask
-					memset(Memory::GetPointer(Address + 4 + (0x222 - 0x1d0)), 0xff, 0x20); // content permissions
+					Memory::Memset(Address + 4 + (0x222 - 0x1d0), 0xff, 0x20); // content permissions
 				}
 				else
 				{
@@ -678,7 +682,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETVIEWS for titleID: %08x/%08x (MaxViews = %i)", (u32)(TitleID >> 32), (u32)TitleID, maxViews);
 
 			Memory::Write_U32(retVal, _CommandAddress + 0x4);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -694,7 +698,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			u32 TMDViewCnt = 0;
 			if (Loader.IsValid())
 			{
-				TMDViewCnt += DiscIO::INANDContentLoader::TMD_VIEW_SIZE; 
+				TMDViewCnt += DiscIO::INANDContentLoader::TMD_VIEW_SIZE;
 				TMDViewCnt += 2; // title version
 				TMDViewCnt += 2; // num entries
 				TMDViewCnt += (u32)Loader.GetContentSize() * (4+2+2+8); // content id, index, type, size
@@ -704,7 +708,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDViewCnt);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -724,7 +728,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			{
 				u32 Address = Buffer.PayloadBuffer[0].m_Address;
 
-				Memory::WriteBigEData(Loader.GetTMDView(), Address, DiscIO::INANDContentLoader::TMD_VIEW_SIZE);
+				Memory::CopyToEmu(Address, Loader.GetTMDView(), DiscIO::INANDContentLoader::TMD_VIEW_SIZE);
 				Address += DiscIO::INANDContentLoader::TMD_VIEW_SIZE;
 
 				Memory::Write_U16(Loader.GetTitleVersion(), Address); Address += 2;
@@ -744,7 +748,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWS: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
@@ -752,7 +756,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 		Memory::Write_U32(0, Buffer.PayloadBuffer[1].m_Address);
 		Memory::Write_U32(0, _CommandAddress + 0x4);
 		WARN_LOG(WII_IPC_ES, "IOCTL_ES_GETCONSUMPTION:%d", Memory::Read_U32(_CommandAddress+4));
-		return true;
+		return IPC_DEFAULT_REPLY;
 
 	case IOCTL_ES_DELETETICKET:
 		{
@@ -782,8 +786,9 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 				// Presumably return -1017 when title not installed TODO verify
 				Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT, _CommandAddress + 0x4);
 			}
-				
-		} 
+
+		}
+		break;
 	case IOCTL_ES_GETSTOREDTMDSIZE:
 		{
 			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETSTOREDTMDSIZE no in buffer");
@@ -797,15 +802,15 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			if (Loader.IsValid())
 			{
 				TMDCnt += DiscIO::INANDContentLoader::TMD_HEADER_SIZE;
-				TMDCnt += (u32)Loader.GetContentSize() * DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE; 
+				TMDCnt += (u32)Loader.GetContentSize() * DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE;
 			}
-			if(Buffer.NumberPayloadBuffer)
+			if (Buffer.NumberPayloadBuffer)
 				Memory::Write_U32(TMDCnt, Buffer.PayloadBuffer[0].m_Address);
 
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMDSIZE: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDCnt);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 	case IOCTL_ES_GETSTOREDTMD:
@@ -819,7 +824,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			u32 MaxCount = 0;
 			if (Buffer.NumberInBuffer > 1)
 			{
-				// TODO: actually use this param in when writing to the outbuffer :/ 
+				// TODO: actually use this param in when writing to the outbuffer :/
 				MaxCount = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
 			}
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
@@ -831,13 +836,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			{
 				u32 Address = Buffer.PayloadBuffer[0].m_Address;
 
-				Memory::WriteBigEData(Loader.GetTMDHeader(), Address, DiscIO::INANDContentLoader::TMD_HEADER_SIZE);
+				Memory::CopyToEmu(Address, Loader.GetTMDHeader(), DiscIO::INANDContentLoader::TMD_HEADER_SIZE);
 				Address += DiscIO::INANDContentLoader::TMD_HEADER_SIZE;
 
 				const std::vector<DiscIO::SNANDContent>& rContent = Loader.GetContent();
 				for (size_t i=0; i<Loader.GetContentSize(); i++)
 				{
-					Memory::WriteBigEData(rContent[i].m_Header, Address, DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE); 
+					Memory::CopyToEmu(Address, rContent[i].m_Header, DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE);
 					Address += DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE;
 				}
 
@@ -846,23 +851,23 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
 			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
-			return true;
+			return IPC_DEFAULT_REPLY;
 		}
 		break;
 
 	case IOCTL_ES_ENCRYPT:
 		{
-			u32 keyIndex	= Memory::Read_U32(Buffer.InBuffer[0].m_Address);
-			u8* IV			= Memory::GetPointer(Buffer.InBuffer[1].m_Address);
-			u8* source		= Memory::GetPointer(Buffer.InBuffer[2].m_Address);
-			u32 size		= Buffer.InBuffer[2].m_Size;
-			u8* newIV		= Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
-			u8* destination	= Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
+			u32 keyIndex    = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u8* IV          = Memory::GetPointer(Buffer.InBuffer[1].m_Address);
+			u8* source      = Memory::GetPointer(Buffer.InBuffer[2].m_Address);
+			u32 size        = Buffer.InBuffer[2].m_Size;
+			u8* newIV       = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
+			u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
 
-			AES_KEY AESKey;
-			AES_set_encrypt_key(keyTable[keyIndex], 128, &AESKey);
+			aes_context AES_ctx;
+			aes_setkey_enc(&AES_ctx, keyTable[keyIndex], 128);
 			memcpy(newIV, IV, 16);
-			AES_cbc_encrypt(source, destination, size, &AESKey, newIV, AES_ENCRYPT);
+			aes_crypt_cbc(&AES_ctx, AES_ENCRYPT, size, newIV, source, destination);
 
 			_dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_ENCRYPT: Key type is not SD, data will be crap");
 		}
@@ -870,17 +875,17 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 	case IOCTL_ES_DECRYPT:
 		{
-			u32 keyIndex	= Memory::Read_U32(Buffer.InBuffer[0].m_Address);
-			u8* IV			= Memory::GetPointer(Buffer.InBuffer[1].m_Address);
-			u8* source		= Memory::GetPointer(Buffer.InBuffer[2].m_Address);
-			u32 size		= Buffer.InBuffer[2].m_Size;
-			u8* newIV		= Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
-			u8* destination	= Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
+			u32 keyIndex    = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u8* IV          = Memory::GetPointer(Buffer.InBuffer[1].m_Address);
+			u8* source      = Memory::GetPointer(Buffer.InBuffer[2].m_Address);
+			u32 size        = Buffer.InBuffer[2].m_Size;
+			u8* newIV       = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
+			u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
 
-			AES_KEY AESKey;
-			AES_set_decrypt_key(keyTable[keyIndex], 128, &AESKey);
+			aes_context AES_ctx;
+			aes_setkey_dec(&AES_ctx, keyTable[keyIndex], 128);
 			memcpy(newIV, IV, 16);
-			AES_cbc_encrypt(source, destination, size, &AESKey, newIV, AES_DECRYPT);
+			aes_crypt_cbc(&AES_ctx, AES_DECRYPT, size, newIV, source, destination);
 
 			_dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_DECRYPT: Key type is not SD, data will be crap");
 		}
@@ -893,14 +898,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			bool bSuccess = false;
 			u16 IOSv = 0xffff;
 
-			u64 TitleID		= Memory::Read_U64(Buffer.InBuffer[0].m_Address);
-			u32 view		= Memory::Read_U32(Buffer.InBuffer[1].m_Address);
-			u64 ticketid	= Memory::Read_U64(Buffer.InBuffer[1].m_Address+4);
-			u32 devicetype	= Memory::Read_U32(Buffer.InBuffer[1].m_Address+12);
-			u64 titleid		= Memory::Read_U64(Buffer.InBuffer[1].m_Address+16);
-			u16 access		= Memory::Read_U16(Buffer.InBuffer[1].m_Address+24);
-
+			u64 TitleID    = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u32 view       = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
+			u64 ticketid   = Memory::Read_U64(Buffer.InBuffer[1].m_Address+4);
+			u32 devicetype = Memory::Read_U32(Buffer.InBuffer[1].m_Address+12);
+			u64 titleid    = Memory::Read_U64(Buffer.InBuffer[1].m_Address+16);
+			u16 access     = Memory::Read_U16(Buffer.InBuffer[1].m_Address+24);
 
+			std::string tContentFile;
 			if ((u32)(TitleID>>32) != 0x00000001 || TitleID == TITLEID_SYSMENU)
 			{
 				const DiscIO::INANDContentLoader& ContentLoader = AccessContentDevice(TitleID);
@@ -910,20 +915,30 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 					const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(bootInd);
 					if (pContent)
 					{
-						LoadWAD(Common::GetTitleContentPath(TitleID));
+						tContentFile = Common::GetTitleContentPath(TitleID);
 						std::unique_ptr<CDolLoader> pDolLoader;
 						if (pContent->m_pData)
 						{
-							pDolLoader.reset(new CDolLoader(pContent->m_pData, pContent->m_Size));
+							pDolLoader = std::make_unique<CDolLoader>(pContent->m_pData, pContent->m_Size);
 						}
 						else
 						{
-							pDolLoader.reset(new CDolLoader(pContent->m_Filename.c_str()));
+							pDolLoader = std::make_unique<CDolLoader>(pContent->m_Filename);
 						}
-						pDolLoader->Load(); // TODO: Check why sysmenu does not load the DOL correctly
-						PC = pDolLoader->GetEntryPoint() | 0x80000000;
+
+						if (pDolLoader->IsValid())
+						{
+							pDolLoader->Load(); // TODO: Check why sysmenu does not load the DOL correctly
+							PC = pDolLoader->GetEntryPoint();
+							bSuccess = true;
+						}
+						else
+						{
+							PanicAlertT("IOCTL_ES_LAUNCH: The DOL file is invalid!");
+							bSuccess = false;
+						}
+
 						IOSv = ContentLoader.GetIosVersion();
-						bSuccess = true;
 					}
 				}
 			}
@@ -939,7 +954,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			if (!bSuccess)
 			{
 				PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your NAND dump\n"
-					"TitleID %016llx.\n Dolphin will likely hang now.", TitleID);
+					"TitleID %016" PRIx64".\n Dolphin will likely hang now.", TitleID);
 			}
 			else
 			{
@@ -948,9 +963,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 				bool* wiiMoteConnected = new bool[size];
 				for (unsigned int i = 0; i < size; i++)
 					wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected();
-				
-				std::string tContentFile(m_ContentFile.c_str());
-				
+
 				WII_IPC_HLE_Interface::Reset(true);
 				WII_IPC_HLE_Interface::Init();
 				s_Usb = GetUsbPointer();
@@ -966,7 +979,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 						s_Usb->m_WiiMotes[i].Activate(false);
 					}
 				}
-				
+
 				delete[] wiiMoteConnected;
 				WII_IPC_HLE_Interface::SetDefaultContentFile(tContentFile);
 			}
@@ -978,25 +991,24 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U16(IOSv, 0x00003140);
 			Memory::Write_U16(0xFFFF, 0x00003142);
 			Memory::Write_U32(Memory::Read_U32(0x00003140), 0x00003188);
-			
+
 			//TODO: provide correct return code when bSuccess= false
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-			ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016llx %08x %016llx %08x %016llx %04x", TitleID,view,ticketid,devicetype,titleid,access);
-			//					   IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff
+			ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016" PRIx64 " %08x %016" PRIx64 " %08x %016" PRIx64 " %04x", TitleID,view,ticketid,devicetype,titleid,access);
+			//                     IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff
 
 			// This is necessary because Reset(true) above deleted this object.  Ew.
-			
-			// It seems that the original hardware overwrites the command after it has been
-			// executed. We write 8 which is not any valid command, and what IOS does 
-			Memory::Write_U32(8, _CommandAddress);
-			// IOS seems to write back the command that was responded to
-			Memory::Write_U32(7, _CommandAddress + 8);
-			
-			// Generate a reply to the IPC command
-			WII_IPC_HLE_Interface::EnqReply(_CommandAddress, 0);
-			
-			return false;
+
+			// The original hardware overwrites the command type with the async reply type.
+			Memory::Write_U32(IPC_REP_ASYNC, _CommandAddress);
+			// IOS also seems to write back the command that was responded to in the FD field.
+			Memory::Write_U32(IPC_CMD_IOCTLV, _CommandAddress + 8);
+
+			// Generate a "reply" to the IPC command.  ES_LAUNCH is unique because it
+			// involves restarting IOS; IOS generates two acknowledgements in a row.
+			WII_IPC_HLE_Interface::EnqueueCommandAcknowledgement(_CommandAddress, 0);
+			return IPC_NO_REPLY;
 		}
 		break;
 
@@ -1005,13 +1017,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 		//if the IOS didn't find the Korean keys and 0 if it does. 0 leads to a error 003
 		WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title checked for Korean keys.");
 		Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT , _CommandAddress + 0x4);
-		return true;
+		return IPC_DEFAULT_REPLY;
 
 	case IOCTL_ES_GETDEVICECERT: // (Input: none, Output: 384 bytes)
 		{
 			WARN_LOG(WII_IPC_ES, "IOCTL_ES_GETDEVICECERT");
 			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1);
-			u8* destination	= Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
+			u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
 
 			EcWii &ec = EcWii::GetInstance();
 			get_ng_cert(destination, ec.getNgId(), ec.getNgKeyId(), ec.getNgPriv(), ec.getNgSig());
@@ -1061,7 +1073,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 	// Write return value (0 means OK)
 	Memory::Write_U32(0, _CommandAddress + 0x4);
 
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 const DiscIO::INANDContentLoader& CWII_IPC_HLE_Device_es::AccessContentDevice(u64 _TitleID)
@@ -1092,7 +1104,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 {
 	u64 titleID = 0xDEADBEEFDEADBEEFull;
 	u64 tmdTitleID = Common::swap64(*(u64*)(_pTMD+0x18c));
-	VolumeHandler::GetVolume()->GetTitleID((u8*)&titleID);
+	DVDInterface::GetVolume().GetTitleID((u8*)&titleID);
 	if (Common::swap64(titleID) != tmdTitleID)
 	{
 		return -1;
@@ -1107,7 +1119,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 	if (Movie::IsRecordingInput())
 	{
 		// TODO: Check for the actual save data
-		if (File::Exists((savePath + "banner.bin").c_str()))
+		if (File::Exists(savePath + "banner.bin"))
 			Movie::g_bClearSave = false;
 		else
 			Movie::g_bClearSave = true;
@@ -1115,39 +1127,39 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 
 	// TODO: Force the game to save to another location, instead of moving the user's save.
 	if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave())
-	{		
-		if (File::Exists((savePath + "banner.bin").c_str()))
+	{
+		if (File::Exists(savePath + "banner.bin"))
 		{
-			if (File::Exists((savePath + "../backup/").c_str()))
+			if (File::Exists(savePath + "../backup/"))
 			{
-				// The last run of this game must have been to play back a movie, so their save is already backed up. 
-				File::DeleteDirRecursively(savePath.c_str());
+				// The last run of this game must have been to play back a movie, so their save is already backed up.
+				File::DeleteDirRecursively(savePath);
 			}
 			else
 			{
 				#ifdef _WIN32
 					MoveFile(UTF8ToTStr(savePath).c_str(), UTF8ToTStr(savePath + "../backup/").c_str());
 				#else
-					File::CopyDir(savePath.c_str(),(savePath + "../backup/").c_str());
-					File::DeleteDirRecursively(savePath.c_str());
+					File::CopyDir(savePath, savePath + "../backup/");
+					File::DeleteDirRecursively(savePath);
 				#endif
 			}
 		}
 	}
-	else if (File::Exists((savePath + "../backup/").c_str()))
+	else if (File::Exists(savePath + "../backup/"))
 	{
 		// Delete the save made by a previous movie, and copy back the user's save.
-		if (File::Exists((savePath + "banner.bin").c_str()))
+		if (File::Exists(savePath + "banner.bin"))
 			File::DeleteDirRecursively(savePath);
 		#ifdef _WIN32
 			MoveFile(UTF8ToTStr(savePath + "../backup/").c_str(), UTF8ToTStr(savePath).c_str());
 		#else
-			File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str());
-			File::DeleteDirRecursively((savePath + "../backup/").c_str());
+			File::CopyDir(savePath + "../backup/", savePath);
+			File::DeleteDirRecursively(savePath + "../backup/");
 		#endif
 	}
 
-	if(!File::Exists(tmdPath))
+	if (!File::Exists(tmdPath))
 	{
 		File::IOFile _pTMDFile(tmdPath, "wb");
 		if (!_pTMDFile.WriteBytes(_pTMD, _sz))
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
new file mode 100644
index 0000000000..3ad6e7c520
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
@@ -0,0 +1,166 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class PointerWrap;
+namespace DiscIO
+{
+	class INANDContentLoader;
+	struct SNANDContent;
+}
+
+class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_es();
+
+	void LoadWAD(const std::string& _rContentFile);
+
+	void OpenInternal();
+
+	virtual void DoState(PointerWrap& p) override;
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+	static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
+
+	// This should only be cleared on power reset
+	static std::string m_ContentFile;
+
+private:
+	enum
+	{
+		IOCTL_ES_ADDTICKET             = 0x01,
+		IOCTL_ES_ADDTITLESTART         = 0x02,
+		IOCTL_ES_ADDCONTENTSTART       = 0x03,
+		IOCTL_ES_ADDCONTENTDATA        = 0x04,
+		IOCTL_ES_ADDCONTENTFINISH      = 0x05,
+		IOCTL_ES_ADDTITLEFINISH        = 0x06,
+		IOCTL_ES_GETDEVICEID           = 0x07,
+		IOCTL_ES_LAUNCH                = 0x08,
+		IOCTL_ES_OPENCONTENT           = 0x09,
+		IOCTL_ES_READCONTENT           = 0x0A,
+		IOCTL_ES_CLOSECONTENT          = 0x0B,
+		IOCTL_ES_GETOWNEDTITLECNT      = 0x0C,
+		IOCTL_ES_GETOWNEDTITLES        = 0x0D,
+		IOCTL_ES_GETTITLECNT           = 0x0E,
+		IOCTL_ES_GETTITLES             = 0x0F,
+		IOCTL_ES_GETTITLECONTENTSCNT   = 0x10,
+		IOCTL_ES_GETTITLECONTENTS      = 0x11,
+		IOCTL_ES_GETVIEWCNT            = 0x12,
+		IOCTL_ES_GETVIEWS              = 0x13,
+		IOCTL_ES_GETTMDVIEWCNT         = 0x14,
+		IOCTL_ES_GETTMDVIEWS           = 0x15,
+		IOCTL_ES_GETCONSUMPTION        = 0x16,
+		IOCTL_ES_DELETETITLE           = 0x17,
+		IOCTL_ES_DELETETICKET          = 0x18,
+		// IOCTL_ES_DIGETTMDVIEWSIZE   = 0x19,
+		// IOCTL_ES_DIGETTMDVIEW       = 0x1A,
+		IOCTL_ES_DIGETTICKETVIEW       = 0x1B,
+		IOCTL_ES_DIVERIFY              = 0x1C,
+		IOCTL_ES_GETTITLEDIR           = 0x1D,
+		IOCTL_ES_GETDEVICECERT         = 0x1E,
+		IOCTL_ES_IMPORTBOOT            = 0x1F,
+		IOCTL_ES_GETTITLEID            = 0x20,
+		IOCTL_ES_SETUID                = 0x21,
+		IOCTL_ES_DELETETITLECONTENT    = 0x22,
+		IOCTL_ES_SEEKCONTENT           = 0x23,
+		IOCTL_ES_OPENTITLECONTENT      = 0x24,
+		// IOCTL_ES_LAUNCHBC           = 0x25,
+		// IOCTL_ES_EXPORTTITLEINIT    = 0x26,
+		// IOCTL_ES_EXPORTCONTENTBEGIN = 0x27,
+		// IOCTL_ES_EXPORTCONTENTDATA  = 0x28,
+		// IOCTL_ES_EXPORTCONTENTEND   = 0x29,
+		// IOCTL_ES_EXPORTTITLEDONE    = 0x2A,
+		IOCTL_ES_ADDTMD                = 0x2B,
+		IOCTL_ES_ENCRYPT               = 0x2C,
+		IOCTL_ES_DECRYPT               = 0x2D,
+		IOCTL_ES_GETBOOT2VERSION       = 0x2E,
+		IOCTL_ES_ADDTITLECANCEL        = 0x2F,
+		IOCTL_ES_SIGN                  = 0x30,
+		// IOCTL_ES_VERIFYSIGN         = 0x31,
+		IOCTL_ES_GETSTOREDCONTENTCNT   = 0x32,
+		IOCTL_ES_GETSTOREDCONTENTS     = 0x33,
+		IOCTL_ES_GETSTOREDTMDSIZE      = 0x34,
+		IOCTL_ES_GETSTOREDTMD          = 0x35,
+		IOCTL_ES_GETSHAREDCONTENTCNT   = 0x36,
+		IOCTL_ES_GETSHAREDCONTENTS     = 0x37,
+		IOCTL_ES_DELETESHAREDCONTENT   = 0x38,
+		//
+		IOCTL_ES_CHECKKOREAREGION      = 0x45,
+	};
+
+	enum EErrorCodes
+	{
+		ES_INVALID_TMD                       = -106,   // or access denied
+		ES_READ_LESS_DATA_THAN_EXPECTED      = -1009,
+		ES_WRITE_FAILURE                     = -1010,
+		ES_PARAMTER_SIZE_OR_ALIGNMENT        = -1017,
+		ES_HASH_DOESNT_MATCH                 = -1022,
+		ES_MEM_ALLOC_FAILED                  = -1024,
+		ES_INCORRECT_ACCESS_RIGHT            = -1026,
+		ES_NO_TICKET_INSTALLED               = -1028,
+		ES_INSTALLED_TICKET_INVALID          = -1029,
+		ES_INVALID_PARAMETR                  = -2008,
+		ES_SIGNATURE_CHECK_FAILED            = -2011,
+		ES_HASH_SIZE_WRONG                   = -2014, // HASH !=20
+	};
+
+	struct SContentAccess
+	{
+		u32 m_Position;
+		u64 m_TitleID;
+		const DiscIO::SNANDContent* m_pContent;
+		// This is a (raw) pointer to work around a MSVC bug.
+		File::IOFile* m_pFile;
+	};
+
+	typedef std::map<u32, SContentAccess> CContentAccessMap;
+	CContentAccessMap m_ContentAccessMap;
+
+	typedef std::map<u64, const DiscIO::INANDContentLoader*> CTitleToContentMap;
+	CTitleToContentMap m_NANDContent;
+
+	const DiscIO::INANDContentLoader* m_pContentLoader;
+
+	std::vector<u64> m_TitleIDs;
+	u64 m_TitleID;
+	u32 m_AccessIdentID;
+
+	static u8 *keyTable[11];
+
+	u64 GetCurrentTitleID() const;
+
+	const DiscIO::INANDContentLoader& AccessContentDevice(u64 _TitleID);
+	u32 OpenTitleContent(u32 CFD, u64 TitleID, u16 Index);
+
+	bool IsValid(u64 _TitleID) const;
+
+	struct ecc_cert_t
+	{
+		u32 sig_type          ;
+		 u8 sig         [0x3c];
+		 u8 pad         [0x40];
+		 u8 issuer      [0x40];
+		u32 key_type          ;
+		 u8 key_name    [0x40];
+		u32 ng_key_id         ;
+		 u8 ecc_pubkey  [0x3c];
+		 u8 padding     [0x3c];
+	};
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
new file mode 100644
index 0000000000..5424c612e7
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
@@ -0,0 +1,576 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/SystemTimers.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h"
+
+static Common::replace_v replacements;
+
+// ~1/1000th of a second is too short and causes hangs in Wii Party
+// Play it safe at 1/500th
+static const IPCCommandResult IPC_FS_REPLY = { true, SystemTimers::GetTicksPerSecond() / 500 };
+
+CWII_IPC_HLE_Device_fs::CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+	Common::ReadReplacements(replacements);
+}
+
+CWII_IPC_HLE_Device_fs::~CWII_IPC_HLE_Device_fs()
+{}
+
+IPCCommandResult CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
+{
+	// clear tmp folder
+	{
+		std::string Path = HLE_IPC_BuildFilename("/tmp");
+		File::DeleteDirRecursively(Path);
+		File::CreateDir(Path);
+	}
+
+	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
+	m_Active = true;
+	return IPC_FS_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_fs::Close(u32 _CommandAddress, bool _bForce)
+{
+	INFO_LOG(WII_IPC_FILEIO, "Close");
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	m_Active = false;
+	return IPC_FS_REPLY;
+}
+
+// Get total filesize of contents of a directory (recursive)
+// Only used for ES_GetUsage atm, could be useful elsewhere?
+static u64 ComputeTotalFileSize(const File::FSTEntry& parentEntry)
+{
+	u64 sizeOfFiles = 0;
+	for (const File::FSTEntry& entry : parentEntry.children)
+	{
+		if (entry.isDirectory)
+			sizeOfFiles += ComputeTotalFileSize(entry);
+		else
+			sizeOfFiles += entry.size;
+	}
+	return sizeOfFiles;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
+{
+	u32 ReturnValue = FS_RESULT_OK;
+	SIOCtlVBuffer CommandBuffer(_CommandAddress);
+
+	// Prepare the out buffer(s) with zeros as a safety precaution
+	// to avoid returning bad values
+	for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
+	{
+		Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
+			CommandBuffer.PayloadBuffer[i].m_Size);
+	}
+
+	switch (CommandBuffer.Parameter)
+	{
+	case IOCTLV_READ_DIR:
+		{
+			// the Wii uses this function to define the type (dir or file)
+			std::string DirName(HLE_IPC_BuildFilename(Memory::GetString(
+				CommandBuffer.InBuffer[0].m_Address, CommandBuffer.InBuffer[0].m_Size)));
+
+			INFO_LOG(WII_IPC_FILEIO, "FS: IOCTL_READ_DIR %s", DirName.c_str());
+
+			if (!File::Exists(DirName))
+			{
+				WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", DirName.c_str());
+				ReturnValue = FS_FILE_NOT_EXIST;
+				break;
+			}
+			else if (!File::IsDirectory(DirName))
+			{
+				// It's not a directory, so error.
+				// Games don't usually seem to care WHICH error they get, as long as it's <
+				// Well the system menu CARES!
+				WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_RESULT_FATAL");
+				ReturnValue = FS_RESULT_FATAL;
+				break;
+			}
+
+			File::FSTEntry entry = File::ScanDirectoryTree(DirName, false);
+
+			// it is one
+			if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
+			{
+				size_t numFile = entry.children.size();
+				INFO_LOG(WII_IPC_FILEIO, "\t%lu files found", (unsigned long)numFile);
+
+				Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
+			}
+			else
+			{
+				for (File::FSTEntry& child : entry.children)
+				{
+					// Decode entities of invalid file system characters so that
+					// games (such as HP:HBP) will be able to find what they expect.
+					for (const Common::replace_t& r : replacements)
+						child.virtualName = ReplaceAll(child.virtualName, r.second, {r.first});
+				}
+
+				std::sort(entry.children.begin(), entry.children.end(), [](const File::FSTEntry& one, const File::FSTEntry& two) { return one.virtualName < two.virtualName; });
+
+				u32 MaxEntries = Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address);
+
+				memset(Memory::GetPointer(CommandBuffer.PayloadBuffer[0].m_Address), 0, CommandBuffer.PayloadBuffer[0].m_Size);
+
+				size_t numFiles = 0;
+				char* pFilename = (char*)Memory::GetPointer((u32)(CommandBuffer.PayloadBuffer[0].m_Address));
+
+				for (size_t i=0; i < entry.children.size() && i < MaxEntries; i++)
+				{
+					const std::string& FileName = entry.children[i].virtualName;
+
+
+					strcpy(pFilename, FileName.c_str());
+					pFilename += FileName.length();
+					*pFilename++ = 0x00;  // termination
+					numFiles++;
+
+					INFO_LOG(WII_IPC_FILEIO, "\tFound: %s", FileName.c_str());
+				}
+
+				Memory::Write_U32((u32)numFiles, CommandBuffer.PayloadBuffer[1].m_Address);
+			}
+
+			ReturnValue = FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTLV_GETUSAGE:
+		{
+			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer.size() == 2);
+			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer[0].m_Size == 4);
+			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer[1].m_Size == 4);
+
+			// this command sucks because it asks of the number of used
+			// fsBlocks and inodes
+			// It should be correct, but don't count on it...
+			std::string relativepath = Memory::GetString(CommandBuffer.InBuffer[0].m_Address, CommandBuffer.InBuffer[0].m_Size);
+			std::string path(HLE_IPC_BuildFilename(relativepath));
+			u32 fsBlocks = 0;
+			u32 iNodes = 0;
+
+			INFO_LOG(WII_IPC_FILEIO, "IOCTL_GETUSAGE %s", path.c_str());
+			if (File::IsDirectory(path))
+			{
+				// LPFaint99: After I found that setting the number of inodes to the number of children + 1 for the directory itself
+				// I decided to compare with sneek which has the following 2 special cases which are
+				// Copyright (C) 2009-2011  crediar http://code.google.com/p/sneek/
+				if ((relativepath.compare(0, 16, "/title/00010001") == 0 ) ||
+				    (relativepath.compare(0, 16, "/title/00010005") == 0 ))
+				{
+					fsBlocks = 23; // size is size/0x4000
+					iNodes = 42; // empty folders return a FileCount of 1
+				}
+				else
+				{
+					File::FSTEntry parentDir = File::ScanDirectoryTree(path, true);
+					// add one for the folder itself
+					iNodes = 1 + (u32)parentDir.size;
+
+					u64 totalSize = ComputeTotalFileSize(parentDir); // "Real" size, to be converted to nand blocks
+
+					fsBlocks = (u32)(totalSize / (16 * 1024));  // one bock is 16kb
+				}
+				ReturnValue = FS_RESULT_OK;
+
+				INFO_LOG(WII_IPC_FILEIO, "FS: fsBlock: %i, iNodes: %i", fsBlocks, iNodes);
+			}
+			else
+			{
+				fsBlocks = 0;
+				iNodes = 0;
+				ReturnValue = FS_RESULT_OK;
+				WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directory: %s", path.c_str());
+			}
+
+			Memory::Write_U32(fsBlocks, CommandBuffer.PayloadBuffer[0].m_Address);
+			Memory::Write_U32(iNodes, CommandBuffer.PayloadBuffer[1].m_Address);
+		}
+		break;
+
+
+	default:
+		PanicAlert("CWII_IPC_HLE_Device_fs::IOCtlV: %i", CommandBuffer.Parameter);
+		break;
+	}
+
+	Memory::Write_U32(ReturnValue, _CommandAddress+4);
+
+	return IPC_FS_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_fs::IOCtl(u32 _CommandAddress)
+{
+	//u32 DeviceID = Memory::Read_U32(_CommandAddress + 8);
+
+	u32 Parameter =  Memory::Read_U32(_CommandAddress + 0xC);
+	u32 BufferIn =  Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize =  Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+	/* Prepare the out buffer(s) with zeroes as a safety precaution
+	   to avoid returning bad values. */
+	//LOG(WII_IPC_FILEIO, "Cleared %u bytes of the out buffer", _BufferOutSize);
+	Memory::Memset(BufferOut, 0, BufferOutSize);
+
+	u32 ReturnValue = ExecuteCommand(Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
+
+	return IPC_FS_REPLY;
+}
+
+s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize)
+{
+	switch (_Parameter)
+	{
+	case IOCTL_GET_STATS:
+		{
+			if (_BufferOutSize < 0x1c)
+				return -1017;
+
+			WARN_LOG(WII_IPC_FILEIO, "FS: GET STATS - returning static values for now");
+
+			NANDStat fs;
+
+			//TODO: scrape the real amounts from somewhere...
+			fs.BlockSize      = 0x4000;
+			fs.FreeUserBlocks = 0x5DEC;
+			fs.UsedUserBlocks = 0x1DD4;
+			fs.FreeSysBlocks  = 0x10;
+			fs.UsedSysBlocks  = 0x02F0;
+			fs.Free_INodes    = 0x146B;
+			fs.Used_Inodes    = 0x0394;
+
+			*(NANDStat*)Memory::GetPointer(_BufferOut) = fs;
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTL_CREATE_DIR:
+		{
+			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
+			u32 Addr = _BufferIn;
+
+			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
+			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
+			std::string DirName(HLE_IPC_BuildFilename(Memory::GetString(Addr, 64))); Addr += 64;
+			Addr += 9; // owner attribs, permission
+			u8 Attribs = Memory::Read_U8(Addr);
+
+			INFO_LOG(WII_IPC_FILEIO, "FS: CREATE_DIR %s, OwnerID %#x, GroupID %#x, Attributes %#x", DirName.c_str(), OwnerID, GroupID, Attribs);
+
+			DirName += DIR_SEP;
+			File::CreateFullPath(DirName);
+			_dbg_assert_msg_(WII_IPC_FILEIO, File::IsDirectory(DirName), "FS: CREATE_DIR %s failed", DirName.c_str());
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTL_SET_ATTR:
+		{
+			u32 Addr = _BufferIn;
+
+			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
+			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
+			std::string Filename = HLE_IPC_BuildFilename(Memory::GetString(_BufferIn, 64)); Addr += 64;
+			u8 OwnerPerm = Memory::Read_U8(Addr); Addr += 1;
+			u8 GroupPerm = Memory::Read_U8(Addr); Addr += 1;
+			u8 OtherPerm = Memory::Read_U8(Addr); Addr += 1;
+			u8 Attributes = Memory::Read_U8(Addr); Addr += 1;
+
+			INFO_LOG(WII_IPC_FILEIO, "FS: SetAttrib %s", Filename.c_str());
+			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerID: 0x%08x", OwnerID);
+			DEBUG_LOG(WII_IPC_FILEIO, "    GroupID: 0x%04x", GroupID);
+			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerPerm: 0x%02x", OwnerPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    GroupPerm: 0x%02x", GroupPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    OtherPerm: 0x%02x", OtherPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    Attributes: 0x%02x", Attributes);
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTL_GET_ATTR:
+		{
+			_dbg_assert_msg_(WII_IPC_FILEIO, _BufferOutSize == 76,
+				"    GET_ATTR needs an 76 bytes large output buffer but it is %i bytes large",
+				_BufferOutSize);
+
+			u32 OwnerID = 0;
+			u16 GroupID = 0x3031; // this is also known as makercd, 01 (0x3031) for nintendo and 08 (0x3038) for MH3 etc
+			std::string Filename = HLE_IPC_BuildFilename(Memory::GetString(_BufferIn, 64));
+			u8 OwnerPerm = 0x3;   // read/write
+			u8 GroupPerm = 0x3;   // read/write
+			u8 OtherPerm = 0x3;   // read/write
+			u8 Attributes = 0x00; // no attributes
+			if (File::IsDirectory(Filename))
+			{
+				INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR Directory %s - all permission flags are set", Filename.c_str());
+			}
+			else
+			{
+				if (File::Exists(Filename))
+				{
+					INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR %s - all permission flags are set", Filename.c_str());
+				}
+				else
+				{
+					INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR unknown %s", Filename.c_str());
+					return FS_FILE_NOT_EXIST;
+				}
+			}
+
+			// write answer to buffer
+			if (_BufferOutSize == 76)
+			{
+				u32 Addr = _BufferOut;
+				Memory::Write_U32(OwnerID, Addr);                                    Addr += 4;
+				Memory::Write_U16(GroupID, Addr);                                    Addr += 2;
+				memcpy(Memory::GetPointer(Addr), Memory::GetPointer(_BufferIn), 64); Addr += 64;
+				Memory::Write_U8(OwnerPerm, Addr);                                   Addr += 1;
+				Memory::Write_U8(GroupPerm, Addr);                                   Addr += 1;
+				Memory::Write_U8(OtherPerm, Addr);                                   Addr += 1;
+				Memory::Write_U8(Attributes, Addr);                                  Addr += 1;
+			}
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+
+	case IOCTL_DELETE_FILE:
+		{
+			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
+			int Offset = 0;
+
+			std::string Filename = HLE_IPC_BuildFilename(Memory::GetString(_BufferIn+Offset, 64));
+			Offset += 64;
+			if (File::Delete(Filename))
+			{
+				INFO_LOG(WII_IPC_FILEIO, "FS: DeleteFile %s", Filename.c_str());
+			}
+			else if (File::DeleteDir(Filename))
+			{
+				INFO_LOG(WII_IPC_FILEIO, "FS: DeleteDir %s", Filename.c_str());
+			}
+			else
+			{
+				WARN_LOG(WII_IPC_FILEIO, "FS: DeleteFile %s - failed!!!", Filename.c_str());
+			}
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTL_RENAME_FILE:
+		{
+			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
+			int Offset = 0;
+
+			std::string Filename = HLE_IPC_BuildFilename(Memory::GetString(_BufferIn+Offset, 64));
+			Offset += 64;
+
+			std::string FilenameRename = HLE_IPC_BuildFilename(Memory::GetString(_BufferIn+Offset, 64));
+			Offset += 64;
+
+			// try to make the basis directory
+			File::CreateFullPath(FilenameRename);
+
+			// if there is already a file, delete it
+			if (File::Exists(Filename) && File::Exists(FilenameRename))
+			{
+				File::Delete(FilenameRename);
+			}
+
+			// finally try to rename the file
+			if (File::Rename(Filename, FilenameRename))
+			{
+				INFO_LOG(WII_IPC_FILEIO, "FS: Rename %s to %s", Filename.c_str(), FilenameRename.c_str());
+			}
+			else
+			{
+				ERROR_LOG(WII_IPC_FILEIO, "FS: Rename %s to %s - failed", Filename.c_str(), FilenameRename.c_str());
+				return FS_FILE_NOT_EXIST;
+			}
+
+			return FS_RESULT_OK;
+		}
+		break;
+
+	case IOCTL_CREATE_FILE:
+		{
+			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
+
+			u32 Addr = _BufferIn;
+			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
+			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
+			std::string Filename(HLE_IPC_BuildFilename(Memory::GetString(Addr, 64))); Addr += 64;
+			u8 OwnerPerm = Memory::Read_U8(Addr); Addr++;
+			u8 GroupPerm = Memory::Read_U8(Addr); Addr++;
+			u8 OtherPerm = Memory::Read_U8(Addr); Addr++;
+			u8 Attributes = Memory::Read_U8(Addr); Addr++;
+
+			INFO_LOG(WII_IPC_FILEIO, "FS: CreateFile %s", Filename.c_str());
+			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerID: 0x%08x", OwnerID);
+			DEBUG_LOG(WII_IPC_FILEIO, "    GroupID: 0x%04x", GroupID);
+			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerPerm: 0x%02x", OwnerPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    GroupPerm: 0x%02x", GroupPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    OtherPerm: 0x%02x", OtherPerm);
+			DEBUG_LOG(WII_IPC_FILEIO, "    Attributes: 0x%02x", Attributes);
+
+			// check if the file already exist
+			if (File::Exists(Filename))
+			{
+				WARN_LOG(WII_IPC_FILEIO, "\tresult = FS_RESULT_EXISTS");
+				return FS_FILE_EXIST;
+			}
+
+			// create the file
+			File::CreateFullPath(Filename);  // just to be sure
+			bool Result = File::CreateEmptyFile(Filename);
+			if (!Result)
+			{
+				ERROR_LOG(WII_IPC_FILEIO, "CWII_IPC_HLE_Device_fs: couldn't create new file");
+				PanicAlert("CWII_IPC_HLE_Device_fs: couldn't create new file");
+				return FS_RESULT_FATAL;
+			}
+
+			INFO_LOG(WII_IPC_FILEIO, "\tresult = FS_RESULT_OK");
+			return FS_RESULT_OK;
+		}
+		break;
+	case IOCTL_SHUTDOWN:
+		{
+			INFO_LOG(WII_IPC_FILEIO, "Wii called Shutdown()");
+			// TODO: stop emulation
+		}
+		break;
+	default:
+		ERROR_LOG(WII_IPC_FILEIO, "CWII_IPC_HLE_Device_fs::IOCtl: ni  0x%x", _Parameter);
+		PanicAlert("CWII_IPC_HLE_Device_fs::IOCtl: ni  0x%x", _Parameter);
+		break;
+	}
+
+	return FS_RESULT_FATAL;
+}
+
+void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
+{
+	DoStateShared(p);
+
+	// handle /tmp
+
+	std::string Path = File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/tmp";
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		File::DeleteDirRecursively(Path);
+		File::CreateDir(Path);
+
+		//now restore from the stream
+		while (1)
+		{
+			char type = 0;
+			p.Do(type);
+			if (!type)
+				break;
+			std::string filename;
+			p.Do(filename);
+			std::string name = Path + DIR_SEP + filename;
+			switch (type)
+			{
+			case 'd':
+			{
+				File::CreateDir(name);
+				break;
+			}
+			case 'f':
+			{
+				u32 size = 0;
+				p.Do(size);
+
+				File::IOFile handle(name, "wb");
+				char buf[65536];
+				u32 count = size;
+				while (count > 65536)
+				{
+					p.DoArray(&buf[0], 65536);
+					handle.WriteArray(&buf[0], 65536);
+					count -= 65536;
+				}
+				p.DoArray(&buf[0], count);
+				handle.WriteArray(&buf[0], count);
+				break;
+			}
+			}
+		}
+	}
+	else
+	{
+		//recurse through tmp and save dirs and files
+
+		File::FSTEntry parentEntry = File::ScanDirectoryTree(Path, true);
+		std::deque<File::FSTEntry> todo;
+		todo.insert(todo.end(), parentEntry.children.begin(),
+			    parentEntry.children.end());
+
+		while (!todo.empty())
+		{
+			File::FSTEntry &entry = todo.front();
+			std::string name = entry.physicalName;
+			name.erase(0,Path.length()+1);
+			char type = entry.isDirectory?'d':'f';
+			p.Do(type);
+			p.Do(name);
+			if (entry.isDirectory)
+			{
+				todo.insert(todo.end(), entry.children.begin(),
+					    entry.children.end());
+			}
+			else
+			{
+				u32 size = (u32)entry.size;
+				p.Do(size);
+
+				File::IOFile handle(entry.physicalName, "rb");
+				char buf[65536];
+				u32 count = size;
+				while (count > 65536)
+				{
+					handle.ReadArray(&buf[0], 65536);
+					p.DoArray(&buf[0], 65536);
+					count -= 65536;
+				}
+				handle.ReadArray(&buf[0], count);
+				p.DoArray(&buf[0], count);
+			}
+			todo.pop_front();
+		}
+
+		char type = 0;
+		p.Do(type);
+	}
+}
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
new file mode 100644
index 0000000000..d2531ba50f
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class PointerWrap;
+
+struct NANDStat
+{
+	u32 BlockSize;
+	u32 FreeUserBlocks;
+	u32 UsedUserBlocks;
+	u32 FreeSysBlocks;
+	u32 UsedSysBlocks;
+	u32 Free_INodes;
+	u32 Used_Inodes;
+};
+
+enum
+{
+	FS_RESULT_OK         =  0,
+	FS_INVALID           = -4,
+	FS_DIRFILE_NOT_FOUND = -6,
+	FS_RESULT_FATAL      = -101,
+	FS_NO_ACCESS         = -102,
+	FS_FILE_EXIST        = -105,
+	FS_FILE_NOT_EXIST    = -106,
+	FS_NO_HANDLE         = -106,
+};
+
+class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
+	virtual ~CWII_IPC_HLE_Device_fs();
+
+	virtual void DoState(PointerWrap& p) override;
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+private:
+
+	enum
+	{
+		IOCTL_GET_STATS   = 0x02,
+		IOCTL_CREATE_DIR  = 0x03,
+		IOCTLV_READ_DIR   = 0x04,
+		IOCTL_SET_ATTR    = 0x05,
+		IOCTL_GET_ATTR    = 0x06,
+		IOCTL_DELETE_FILE = 0x07,
+		IOCTL_RENAME_FILE = 0x08,
+		IOCTL_CREATE_FILE = 0x09,
+		IOCTLV_GETUSAGE   = 0x0C,
+		IOCTL_SHUTDOWN    = 0x0D
+	};
+
+	s32 ExecuteCommand(u32 Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize);
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
new file mode 100644
index 0000000000..3cd76a9356
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
@@ -0,0 +1,652 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cerrno>
+#include <libusb.h>
+
+#include "Common/Thread.h"
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/WII_IPC.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
+
+#define MAX_DEVICE_DEVNUM 256
+static u64 hidDeviceAliases[MAX_DEVICE_DEVNUM];
+
+// Regular thread
+void CWII_IPC_HLE_Device_hid::checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid)
+{
+	timeval tv;
+	tv.tv_sec = 0;
+	tv.tv_usec = 500;
+	while (hid->usb_thread_running)
+	{
+
+		static u16 timeToFill = 0;
+		if (timeToFill == 0)
+		{
+			std::lock_guard<std::mutex> lk(hid->m_device_list_reply_mutex);
+			if (hid->deviceCommandAddress != 0)
+			{
+				hid->FillOutDevices(Memory::Read_U32(hid->deviceCommandAddress + 0x18), Memory::Read_U32(hid->deviceCommandAddress + 0x1C));
+
+				// The original hardware overwrites the command type with the async reply type.
+				Memory::Write_U32(IPC_REP_ASYNC, hid->deviceCommandAddress);
+				// IOS also seems to write back the command that was responded to in the FD field.
+				Memory::Write_U32(IPC_CMD_IOCTL, hid->deviceCommandAddress + 8);
+
+				// Return value
+				Memory::Write_U32(0, hid->deviceCommandAddress + 4);
+
+				WII_IPC_HLE_Interface::EnqueueReply_Threadsafe(hid->deviceCommandAddress);
+				hid->deviceCommandAddress = 0;
+			}
+		}
+		timeToFill += 8;
+		libusb_handle_events_timeout(nullptr, &tv);
+	}
+
+	return;
+}
+
+void CWII_IPC_HLE_Device_hid::handleUsbUpdates(struct libusb_transfer *transfer)
+{
+	int ret = HIDERR_NO_DEVICE_FOUND;
+	u32 replyAddress = (u32)(size_t)transfer->user_data;
+	if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
+	{
+		ret = transfer->length;
+	}
+
+	// The original hardware overwrites the command type with the async reply type.
+	Memory::Write_U32(IPC_REP_ASYNC, replyAddress);
+	// IOS also seems to write back the command that was responded to in the FD field.
+	Memory::Write_U32(IPC_CMD_IOCTL, replyAddress + 8);
+
+	// Return value
+	Memory::Write_U32(ret, replyAddress + 4);
+
+	WII_IPC_HLE_Interface::EnqueueReply_Threadsafe(replyAddress);
+	//DEBUG_LOG(WII_IPC_HID, "OMG OMG OMG I GOT A CALLBACK, IMMA BE FAMOUS %d %d %d", transfer->actual_length, transfer->length, transfer->status);
+}
+
+
+CWII_IPC_HLE_Device_hid::CWII_IPC_HLE_Device_hid(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+	deviceCommandAddress = 0;
+	memset(hidDeviceAliases, 0, sizeof(hidDeviceAliases));
+	int ret = libusb_init(nullptr);
+	if (ret)
+	{
+		ERROR_LOG(WII_IPC_HID, "libusb_init failed with error: %d", ret);
+	}
+	else
+	{
+		usb_thread_running = true;
+		usb_thread = std::thread(checkUsbUpdates, this);
+	}
+}
+
+CWII_IPC_HLE_Device_hid::~CWII_IPC_HLE_Device_hid()
+{
+	bool deinit_libusb = false;
+	if (usb_thread_running)
+	{
+		usb_thread_running = false;
+		usb_thread.join();
+		deinit_libusb = true;
+	}
+
+	for (const auto& device : m_open_devices)
+	{
+		libusb_close(device.second);
+	}
+	m_open_devices.clear();
+
+	if (deinit_libusb)
+		libusb_exit(nullptr);
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_hid::Open(u32 _CommandAddress, u32 _Mode)
+{
+	DEBUG_LOG(WII_IPC_HID, "HID::Open");
+	m_Active = true;
+	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_hid::Close(u32 _CommandAddress, bool _bForce)
+{
+	DEBUG_LOG(WII_IPC_HID, "HID::Close");
+	m_Active = false;
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress)
+{
+	if (Core::g_want_determinism)
+	{
+		Memory::Write_U32(-1, _CommandAddress + 0x4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+	u32 Parameter     = Memory::Read_U32(_CommandAddress + 0xC);
+	u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+	u32 ReturnValue = 0;
+	switch (Parameter)
+	{
+	case IOCTL_HID_GET_ATTACHED:
+	{
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Get Attached) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		deviceCommandAddress = _CommandAddress;
+		return IPC_NO_REPLY;
+	}
+	case IOCTL_HID_OPEN:
+	{
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Open) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		//hid version, apparently
+		ReturnValue = 0x40001;
+		break;
+	}
+	case IOCTL_HID_SET_SUSPEND:
+	{
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Set Suspend) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		// not actually implemented in IOS
+		ReturnValue = 0;
+		break;
+	}
+	case IOCTL_HID_CANCEL_INTERRUPT:
+	{
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Cancel Interrupt) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		ReturnValue = 0;
+		break;
+	}
+	case IOCTL_HID_CONTROL:
+	{
+		/*
+			ERROR CODES:
+			-4 Can't find device specified
+		*/
+
+		u32 dev_num = Memory::Read_U32(BufferIn + 0x10);
+		u8 bmRequestType = Memory::Read_U8(BufferIn + 0x14);
+		u8 bRequest = Memory::Read_U8(BufferIn + 0x15);
+		u16 wValue = Memory::Read_U16(BufferIn + 0x16);
+		u16 wIndex = Memory::Read_U16(BufferIn + 0x18);
+		u16 wLength = Memory::Read_U16(BufferIn + 0x1A);
+		u32 data = Memory::Read_U32(BufferIn + 0x1C);
+
+		ReturnValue = HIDERR_NO_DEVICE_FOUND;
+
+		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
+
+		if (dev_handle == nullptr)
+		{
+			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
+			break;
+		}
+		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
+		transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER;
+
+		u8 * buffer = (u8*)malloc(wLength + LIBUSB_CONTROL_SETUP_SIZE);
+		libusb_fill_control_setup(buffer, bmRequestType, bRequest, wValue, wIndex, wLength);
+		Memory::CopyFromEmu(buffer + LIBUSB_CONTROL_SETUP_SIZE, data, wLength);
+		libusb_fill_control_transfer(transfer, dev_handle, buffer, handleUsbUpdates, (void*)(size_t)_CommandAddress, /* no timeout */ 0);
+		libusb_submit_transfer(transfer);
+
+		//DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Control)(%02X, %02X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+		//          bmRequestType, bRequest, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		// It's the async way!
+		return IPC_NO_REPLY;
+	}
+	case IOCTL_HID_INTERRUPT_OUT:
+	case IOCTL_HID_INTERRUPT_IN:
+	{
+		u32 dev_num = Memory::Read_U32(BufferIn + 0x10);
+		u32 endpoint = Memory::Read_U32(BufferIn + 0x14);
+		u32 length = Memory::Read_U32(BufferIn + 0x18);
+
+		u32 data = Memory::Read_U32(BufferIn + 0x1C);
+
+		ReturnValue = HIDERR_NO_DEVICE_FOUND;
+
+		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
+
+		if (dev_handle == nullptr)
+		{
+			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
+			break;
+		}
+
+		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
+		transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
+		libusb_fill_interrupt_transfer(transfer, dev_handle, endpoint, Memory::GetPointer(data), length,
+									   handleUsbUpdates, (void*)(size_t)_CommandAddress, 0);
+		libusb_submit_transfer(transfer);
+
+		//DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Interrupt %s)(%d,%d,%X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+		//          Parameter == IOCTL_HID_INTERRUPT_IN ? "In" : "Out", endpoint, length, data, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		// It's the async way!
+		return IPC_NO_REPLY;
+	}
+	case IOCTL_HID_SHUTDOWN:
+	{
+		std::lock_guard<std::mutex> lk(m_device_list_reply_mutex);
+		if (deviceCommandAddress != 0)
+		{
+			Memory::Write_U32(0xFFFFFFFF, Memory::Read_U32(deviceCommandAddress + 0x18));
+
+			// The original hardware overwrites the command type with the async reply type.
+			Memory::Write_U32(IPC_REP_ASYNC, deviceCommandAddress);
+			// IOS also seems to write back the command that was responded to in the FD field.
+			Memory::Write_U32(IPC_CMD_IOCTL, deviceCommandAddress + 8);
+
+			// Return value
+			Memory::Write_U32(-1, deviceCommandAddress + 4);
+			WII_IPC_HLE_Interface::EnqueueReply(deviceCommandAddress);
+			deviceCommandAddress = 0;
+		}
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Shutdown) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+	default:
+	{
+		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(0x%x) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+	}
+
+	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
+
+	return IPC_DEFAULT_REPLY;
+}
+
+
+bool CWII_IPC_HLE_Device_hid::ClaimDevice(libusb_device_handle * dev)
+{
+	int ret = 0;
+	if ((ret = libusb_kernel_driver_active(dev, 0)) == 1)
+	{
+		if ((ret = libusb_detach_kernel_driver(dev, 0)) && ret != LIBUSB_ERROR_NOT_SUPPORTED)
+		{
+			DEBUG_LOG(WII_IPC_HID, "libusb_detach_kernel_driver failed with error: %d", ret);
+			return false;
+		}
+	}
+	else if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED)
+	{
+		DEBUG_LOG(WII_IPC_HID, "libusb_kernel_driver_active error ret = %d", ret);
+		return false;
+	}
+
+	if ((ret = libusb_claim_interface(dev, 0)))
+	{
+		DEBUG_LOG(WII_IPC_HID, "libusb_claim_interface failed with error: %d", ret);
+		return false;
+	}
+
+	return true;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_hid::IOCtlV(u32 _CommandAddress)
+{
+
+	Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HID, LogTypes::LWARNING);
+	u32 ReturnValue = 0;
+	SIOCtlVBuffer CommandBuffer(_CommandAddress);
+
+	DEBUG_LOG(WII_IPC_HID, "%s - IOCtlV:", GetDeviceName().c_str());
+	DEBUG_LOG(WII_IPC_HID, "    Parameter: 0x%x", CommandBuffer.Parameter);
+	DEBUG_LOG(WII_IPC_HID, "    NumberIn: 0x%08x", CommandBuffer.NumberInBuffer);
+	DEBUG_LOG(WII_IPC_HID, "    NumberOut: 0x%08x", CommandBuffer.NumberPayloadBuffer);
+	DEBUG_LOG(WII_IPC_HID, "    BufferVector: 0x%08x", CommandBuffer.BufferVector);
+	DEBUG_LOG(WII_IPC_HID, "    PayloadAddr: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Address);
+	DEBUG_LOG(WII_IPC_HID, "    PayloadSize: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Size);
+	#if defined(_DEBUG) || defined(DEBUGFAST)
+	DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer);
+	#endif
+
+	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+
+
+void CWII_IPC_HLE_Device_hid::ConvertDeviceToWii(WiiHIDDeviceDescriptor *dest, const struct libusb_device_descriptor *src)
+{
+	dest->bLength            = src->bLength;
+	dest->bDescriptorType    = src->bDescriptorType;
+	dest->bcdUSB             = Common::swap16(src->bcdUSB);
+	dest->bDeviceClass       = src->bDeviceClass;
+	dest->bDeviceSubClass    = src->bDeviceSubClass;
+	dest->bDeviceProtocol    = src->bDeviceProtocol;
+	dest->bMaxPacketSize0    = src->bMaxPacketSize0;
+	dest->idVendor           = Common::swap16(src->idVendor);
+	dest->idProduct          = Common::swap16(src->idProduct);
+	dest->bcdDevice          = Common::swap16(src->bcdDevice);
+	dest->iManufacturer      = src->iManufacturer;
+	dest->iProduct           = src->iProduct;
+	dest->iSerialNumber      = src->iSerialNumber;
+	dest->bNumConfigurations = src->bNumConfigurations;
+}
+
+void CWII_IPC_HLE_Device_hid::ConvertConfigToWii(WiiHIDConfigDescriptor *dest, const struct libusb_config_descriptor *src)
+{
+	memcpy(dest,src,sizeof(WiiHIDConfigDescriptor));
+	dest->wTotalLength = Common::swap16(dest->wTotalLength);
+}
+
+void CWII_IPC_HLE_Device_hid::ConvertInterfaceToWii(WiiHIDInterfaceDescriptor *dest, const struct libusb_interface_descriptor *src)
+{
+	memcpy(dest,src,sizeof(WiiHIDInterfaceDescriptor));
+}
+
+void CWII_IPC_HLE_Device_hid::ConvertEndpointToWii(WiiHIDEndpointDescriptor *dest, const struct libusb_endpoint_descriptor *src)
+{
+	memcpy(dest,src,sizeof(WiiHIDEndpointDescriptor));
+	dest->wMaxPacketSize = Common::swap16(dest->wMaxPacketSize);
+}
+
+void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
+{
+	static u16 check = 1;
+	int OffsetBuffer = BufferOut;
+	int OffsetStart = 0;
+	//int OffsetDevice = 0;
+	int d,c,ic,i,e; /* config, interface container, interface, endpoint  */
+
+	libusb_device **list;
+	//libusb_device *found = nullptr;
+	ssize_t cnt = libusb_get_device_list(nullptr, &list);
+	DEBUG_LOG(WII_IPC_HID, "Found %ld viable USB devices.", cnt);
+	for (d = 0; d < cnt; d++)
+	{
+		libusb_device *device = list[d];
+		struct libusb_device_descriptor desc;
+		int dRet = libusb_get_device_descriptor (device, &desc);
+		if (dRet)
+		{
+			// could not aquire the descriptor, no point in trying to use it.
+			DEBUG_LOG(WII_IPC_HID, "libusb_get_device_descriptor failed with error: %d", dRet);
+			continue;
+		}
+		OffsetStart = OffsetBuffer;
+		OffsetBuffer += 4; // skip length for now, fill at end
+
+		OffsetBuffer += 4; // skip devNum for now
+
+		WiiHIDDeviceDescriptor wii_device;
+		ConvertDeviceToWii(&wii_device, &desc);
+		Memory::CopyToEmu(OffsetBuffer, &wii_device, Align(wii_device.bLength, 4));
+		OffsetBuffer += Align(wii_device.bLength, 4);
+		bool deviceValid = true;
+		bool isHID = false;
+
+		for (c = 0; deviceValid && c < desc.bNumConfigurations; c++)
+		{
+			struct libusb_config_descriptor *config = nullptr;
+			int cRet = libusb_get_config_descriptor(device, c, &config);
+			// do not try to use usb devices with more than one interface, games can crash
+			if (cRet == 0 && config->bNumInterfaces <= MAX_HID_INTERFACES)
+			{
+				WiiHIDConfigDescriptor wii_config;
+				ConvertConfigToWii(&wii_config, config);
+				Memory::CopyToEmu(OffsetBuffer, &wii_config, Align(wii_config.bLength, 4));
+				OffsetBuffer += Align(wii_config.bLength, 4);
+
+				for (ic = 0; ic < config->bNumInterfaces; ic++)
+				{
+					const struct libusb_interface *interfaceContainer = &config->interface[ic];
+
+					for (i = 0; i < interfaceContainer->num_altsetting; i++)
+					{
+						const struct libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i];
+
+						if (interface->bInterfaceClass == LIBUSB_CLASS_HID)
+							isHID = true;
+
+						WiiHIDInterfaceDescriptor wii_interface;
+						ConvertInterfaceToWii(&wii_interface, interface);
+						Memory::CopyToEmu(OffsetBuffer, &wii_interface, Align(wii_interface.bLength, 4));
+						OffsetBuffer += Align(wii_interface.bLength, 4);
+
+						for (e = 0; e < interface->bNumEndpoints; e++)
+						{
+							const struct libusb_endpoint_descriptor *endpoint = &interface->endpoint[e];
+
+							WiiHIDEndpointDescriptor wii_endpoint;
+							ConvertEndpointToWii(&wii_endpoint, endpoint);
+							Memory::CopyToEmu(OffsetBuffer, &wii_endpoint, Align(wii_endpoint.bLength, 4));
+							OffsetBuffer += Align(wii_endpoint.bLength, 4);
+
+						} //endpoints
+					} // interfaces
+				} // interface containters
+				libusb_free_config_descriptor(config);
+				config = nullptr;
+			}
+			else
+			{
+				if (cRet)
+					DEBUG_LOG(WII_IPC_HID, "libusb_get_config_descriptor failed with: %d", cRet);
+				deviceValid = false;
+				OffsetBuffer = OffsetStart;
+			}
+		} // configs
+
+		if (!isHID)
+		{
+			deviceValid = false;
+			OffsetBuffer = OffsetStart;
+		}
+
+		if (deviceValid)
+		{
+			Memory::Write_U32(OffsetBuffer-OffsetStart, OffsetStart); // fill in length
+
+			int devNum = GetAvailableDevNum(desc.idVendor,
+											desc.idProduct,
+											libusb_get_bus_number (device),
+											libusb_get_device_address (device),
+											check);
+			if (devNum < 0 )
+			{
+				// too many devices to handle.
+				ERROR_LOG(WII_IPC_HID, "Exhausted device list, you have way too many usb devices plugged in."
+				"Or it might be our fault. Let us know at https://code.google.com/p/dolphin-emu/issues/entry?template=Defect%%20report");
+				OffsetBuffer = OffsetStart;
+				continue;
+			}
+
+			DEBUG_LOG(WII_IPC_HID, "Found device with Vendor: %X Product: %X Devnum: %d", desc.idVendor, desc.idProduct, devNum);
+
+			Memory::Write_U32(devNum , OffsetStart+4); //write device num
+		}
+	}
+
+	// Find devices that no longer exists and free them
+	for (i=0; i<MAX_DEVICE_DEVNUM; i++)
+	{
+		u16 check_cur = (u16)(hidDeviceAliases[i] >> 48);
+		if (hidDeviceAliases[i] != 0 && check_cur != check)
+		{
+			DEBUG_LOG(WII_IPC_HID, "Removing: device %d %hX %hX", i, check, check_cur);
+			std::lock_guard<std::mutex> lk(m_open_devices_mutex);
+			if (m_open_devices.find(i) != m_open_devices.end())
+			{
+				libusb_device_handle *handle = m_open_devices[i];
+				libusb_close(handle);
+				m_open_devices.erase(i);
+			}
+			hidDeviceAliases[i] = 0;
+		}
+	}
+	check++;
+
+
+	libusb_free_device_list(list, 1);
+
+	Memory::Write_U32(0xFFFFFFFF, OffsetBuffer); // no more devices
+
+}
+
+int CWII_IPC_HLE_Device_hid::Align(int num, int alignment)
+{
+	return (num + (alignment-1)) & ~(alignment-1);
+}
+
+
+libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
+{
+	libusb_device **list;
+	libusb_device_handle *handle = nullptr;
+	ssize_t cnt;
+
+	if (devNum >= MAX_DEVICE_DEVNUM)
+		return nullptr;
+
+
+	std::lock_guard<std::mutex> lk(m_open_devices_mutex);
+
+	if (m_open_devices.find(devNum) != m_open_devices.end())
+	{
+		handle = m_open_devices[devNum];
+		if (libusb_kernel_driver_active(handle, 0) != LIBUSB_ERROR_NO_DEVICE)
+		{
+			return handle;
+		}
+		else
+		{
+			libusb_close(handle);
+			m_open_devices.erase(devNum);
+		}
+	}
+
+	cnt = libusb_get_device_list(nullptr, &list);
+
+	if (cnt < 0)
+		return nullptr;
+
+#ifdef _WIN32
+	static bool has_warned_about_drivers = false;
+#endif
+
+	for (ssize_t i = 0; i < cnt; i++)
+	{
+		libusb_device *device = list[i];
+		struct libusb_device_descriptor desc;
+		int dRet = libusb_get_device_descriptor (device, &desc);
+		u8 bus = libusb_get_bus_number (device);
+		u8 port = libusb_get_device_address (device);
+		u64 unique_id = ((u64)desc.idVendor << 32) | ((u64)desc.idProduct << 16) | ((u64)bus << 8) | (u64)port;
+		if ((hidDeviceAliases[devNum] & HID_ID_MASK) == unique_id)
+		{
+			int ret = libusb_open(device, &handle);
+			if (ret)
+			{
+				if (ret == LIBUSB_ERROR_ACCESS)
+				{
+					if (dRet)
+					{
+						ERROR_LOG(WII_IPC_HID, "Dolphin does not have access to this device: Bus %03d Device %03d: ID ????:???? (couldn't get id).",
+								bus,
+								port
+						);
+					}
+					else
+					{
+						ERROR_LOG(WII_IPC_HID, "Dolphin does not have access to this device: Bus %03d Device %03d: ID %04X:%04X.",
+								bus,
+								port,
+								desc.idVendor,
+								desc.idProduct
+						);
+					}
+				}
+#ifdef _WIN32
+				else if (ret == LIBUSB_ERROR_NOT_SUPPORTED)
+				{
+					if (!has_warned_about_drivers)
+					{
+						// Max of one warning.
+						has_warned_about_drivers = true;
+						WARN_LOG(WII_IPC_HID, "Please install the libusb drivers for the device %04X:%04X", desc.idVendor, desc.idProduct);
+					}
+				}
+#endif
+				else
+				{
+					ERROR_LOG(WII_IPC_HID, "libusb_open failed to open device with error = %d", ret);
+				}
+				continue;
+			}
+
+
+			if (!ClaimDevice(handle))
+			{
+				ERROR_LOG(WII_IPC_HID, "Could not claim the device for handle: %X", devNum);
+				libusb_close(handle);
+				continue;
+			}
+
+			m_open_devices[devNum] = handle;
+			break;
+		}
+		else
+		{
+			handle = nullptr;
+		}
+	}
+
+	libusb_free_device_list(list, 1);
+
+
+	return handle;
+}
+
+
+int CWII_IPC_HLE_Device_hid::GetAvailableDevNum(u16 idVendor, u16 idProduct, u8 bus, u8 port, u16 check)
+{
+	int pos = -1;
+	u64 unique_id = ((u64)idVendor << 32) | ((u64)idProduct << 16) | ((u64)bus << 8) | (u64)port;
+
+	for (int i=0; i<MAX_DEVICE_DEVNUM; i++)
+	{
+		u64 id = hidDeviceAliases[i] & HID_ID_MASK;
+		if (id == 0 && pos == -1)
+		{
+			pos = i;
+		}
+		else if (id == unique_id)
+		{
+			hidDeviceAliases[i] = id | ((u64)check << 48);
+			return i;
+		}
+	}
+
+	if (pos != -1)
+	{
+		hidDeviceAliases[pos] = unique_id | ((u64)check << 48);
+		return pos;
+	}
+
+	return -1;
+}
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
new file mode 100644
index 0000000000..e8270138c2
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
@@ -0,0 +1,141 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <list>
+#include <map>
+#include <mutex>
+#include <thread>
+
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+// Forward declare things which we need from libusb header.
+// This prevents users of this file from indirectly pulling in libusb.
+#if defined(_WIN32)
+#define LIBUSB_CALL WINAPI
+#else
+#define LIBUSB_CALL
+#endif
+struct libusb_device_handle;
+struct libusb_device_descriptor;
+struct libusb_config_descriptor;
+struct libusb_interface_descriptor;
+struct libusb_endpoint_descriptor;
+struct libusb_transfer;
+
+#define HID_ID_MASK 0x0000FFFFFFFFFFFF
+#define MAX_HID_INTERFACES 1
+
+#define HIDERR_NO_DEVICE_FOUND -4
+
+class CWII_IPC_HLE_Device_hid : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_hid(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_hid();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+
+private:
+	enum
+	{
+		IOCTL_HID_GET_ATTACHED     = 0x00,
+		IOCTL_HID_SET_SUSPEND      = 0x01,
+		IOCTL_HID_CONTROL          = 0x02,
+		IOCTL_HID_INTERRUPT_IN     = 0x03,
+		IOCTL_HID_INTERRUPT_OUT    = 0x04,
+		IOCTL_HID_GET_US_STRING    = 0x05,
+		IOCTL_HID_OPEN             = 0x06,
+		IOCTL_HID_SHUTDOWN         = 0x07,
+		IOCTL_HID_CANCEL_INTERRUPT = 0x08,
+	};
+
+	struct WiiHIDDeviceDescriptor
+	{
+		u8 bLength;
+		u8 bDescriptorType;
+		u16 bcdUSB;
+		u8 bDeviceClass;
+		u8 bDeviceSubClass;
+		u8 bDeviceProtocol;
+		u8 bMaxPacketSize0;
+		u16 idVendor;
+		u16 idProduct;
+		u16 bcdDevice;
+		u8 iManufacturer;
+		u8 iProduct;
+		u8 iSerialNumber;
+		u8 bNumConfigurations;
+		u8 pad[2];
+	};
+
+	struct WiiHIDConfigDescriptor
+	{
+		u8 bLength;
+		u8 bDescriptorType;
+		u16 wTotalLength;
+		u8 bNumInterfaces;
+		u8 bConfigurationValue;
+		u8 iConfiguration;
+		u8 bmAttributes;
+		u8 MaxPower;
+		u8 pad[3];
+	};
+
+	struct WiiHIDInterfaceDescriptor
+	{
+		u8 bLength;
+		u8 bDescriptorType;
+		u8 bInterfaceNumber;
+		u8 bAlternateSetting;
+		u8 bNumEndpoints;
+		u8 bInterfaceClass;
+		u8 bInterfaceSubClass;
+		u8 bInterfaceProtocol;
+		u8 iInterface;
+		u8 pad[3];
+	};
+
+	struct WiiHIDEndpointDescriptor
+	{
+		u8 bLength;
+		u8 bDescriptorType;
+		u8 bEndpointAddress;
+		u8 bmAttributes;
+		u16 wMaxPacketSize;
+		u8 bInterval;
+		u8 bRefresh;
+		u8 bSynchAddress;
+		u8 pad[1];
+	};
+
+	u32 deviceCommandAddress;
+	void FillOutDevices(u32 BufferOut, u32 BufferOutSize);
+	int GetAvailableDevNum(u16 idVendor, u16 idProduct, u8 bus, u8 port, u16 check);
+	bool ClaimDevice(libusb_device_handle* dev);
+
+	void ConvertDeviceToWii(WiiHIDDeviceDescriptor* dest, const libusb_device_descriptor* src);
+	void ConvertConfigToWii(WiiHIDConfigDescriptor* dest, const libusb_config_descriptor* src);
+	void ConvertInterfaceToWii(WiiHIDInterfaceDescriptor* dest, const libusb_interface_descriptor* src);
+	void ConvertEndpointToWii(WiiHIDEndpointDescriptor* dest, const libusb_endpoint_descriptor* src);
+
+	int Align(int num, int alignment);
+	static void checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid);
+	static void LIBUSB_CALL handleUsbUpdates(libusb_transfer* transfer);
+
+	libusb_device_handle* GetDeviceByDevNum(u32 devNum);
+	std::map<u32, libusb_device_handle*> m_open_devices;
+	std::mutex m_open_devices_mutex;
+	std::mutex m_device_list_reply_mutex;
+
+	std::thread usb_thread;
+	bool usb_thread_running;
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
new file mode 100644
index 0000000000..be61fa5ec4
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -0,0 +1,1541 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/Network.h"
+#include "Common/SettingsHandler.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/ec_wii.h"
+#include "Core/IPC_HLE/ICMP.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
+#include "Core/IPC_HLE/WII_Socket.h"
+
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+
+#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
+#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
+
+#elif defined(__linux__) or defined(__APPLE__)
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <errno.h>
+#include <poll.h>
+#include <string.h>
+
+typedef struct pollfd pollfd_t;
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <errno.h>
+#endif
+
+// **********************************************************************************
+// Handle /dev/net/kd/request requests
+CWII_IPC_HLE_Device_net_kd_request::CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+}
+
+CWII_IPC_HLE_Device_net_kd_request::~CWII_IPC_HLE_Device_net_kd_request()
+{
+	WiiSockMan::GetInstance().Clean();
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_kd_request::Open(u32 _CommandAddress, u32 _Mode)
+{
+	INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: Open");
+	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_kd_request::Close(u32 _CommandAddress, bool _bForce)
+{
+	INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: Close");
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_kd_request::IOCtl(u32 _CommandAddress)
+{
+	u32 Parameter     = Memory::Read_U32(_CommandAddress + 0xC);
+	u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+	u32 ReturnValue = 0;
+	switch (Parameter)
+	{
+	case IOCTL_NWC24_SUSPEND_SCHEDULAR:
+		// NWC24iResumeForCloseLib  from NWC24SuspendScheduler (Input: none, Output: 32 bytes)
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_SUSPEND_SCHEDULAR - NI");
+		Memory::Write_U32(0, BufferOut); // no error
+		break;
+
+	case IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR: // NWC24iResumeForCloseLib
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR - NI");
+		break;
+
+	case IOCTL_NWC24_EXEC_RESUME_SCHEDULAR: // NWC24iResumeForCloseLib
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_EXEC_RESUME_SCHEDULAR - NI");
+		Memory::Write_U32(0, BufferOut); // no error
+		break;
+
+	case IOCTL_NWC24_STARTUP_SOCKET: // NWC24iStartupSocket
+		Memory::Write_U32(0, BufferOut);
+		Memory::Write_U32(0, BufferOut + 4);
+		ReturnValue = 0;
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_STARTUP_SOCKET - NI");
+		break;
+
+	case IOCTL_NWC24_CLEANUP_SOCKET:
+		Memory::Memset(BufferOut, 0, BufferOutSize);
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_CLEANUP_SOCKET - NI");
+		break;
+
+	case IOCTL_NWC24_LOCK_SOCKET: // WiiMenu
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_LOCK_SOCKET - NI");
+		break;
+
+	case IOCTL_NWC24_UNLOCK_SOCKET:
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_UNLOCK_SOCKET - NI");
+		break;
+
+	case IOCTL_NWC24_REQUEST_REGISTER_USER_ID:
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_REGISTER_USER_ID");
+		Memory::Write_U32(0, BufferOut);
+		Memory::Write_U32(0, BufferOut + 4);
+		break;
+
+	case IOCTL_NWC24_REQUEST_GENERATED_USER_ID: // (Input: none, Output: 32 bytes)
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_GENERATED_USER_ID");
+		if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_INITIAL)
+		{
+			std::string settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
+			SettingsHandler gen;
+			std::string area, model;
+			bool _GotSettings = false;
+
+			if (File::Exists(settings_Filename))
+			{
+				File::IOFile settingsFileHandle(settings_Filename, "rb");
+				if (settingsFileHandle.ReadBytes((void*)gen.GetData(), SettingsHandler::SETTINGS_SIZE))
+				{
+					gen.Decrypt();
+					area = gen.GetValue("AREA");
+					model = gen.GetValue("MODEL");
+					_GotSettings = true;
+				}
+			}
+			if (_GotSettings)
+			{
+				u8 area_code = GetAreaCode(area);
+				u8 id_ctr = config.IdGen();
+				u8 hardware_model = GetHardwareModel(model);
+
+				EcWii &ec = EcWii::GetInstance();
+				u32 HollywoodID = ec.getNgId();
+				u64 UserID = 0;
+
+				s32 ret = NWC24MakeUserID(&UserID, HollywoodID, id_ctr, hardware_model, area_code);
+				config.SetId(UserID);
+				config.IncrementIdGen();
+				config.SetCreationStage(nwc24_config_t::NWC24_IDCS_GENERATED);
+				config.WriteConfig();
+
+				Memory::Write_U32(ret, BufferOut);
+			}
+			else
+			{
+				Memory::Write_U32(WC24_ERR_FATAL, BufferOut);
+			}
+		}
+		else if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_GENERATED)
+		{
+			Memory::Write_U32(WC24_ERR_ID_GENERATED, BufferOut);
+		}
+		else if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_REGISTERED)
+		{
+			Memory::Write_U32(WC24_ERR_ID_REGISTERED, BufferOut);
+		}
+		Memory::Write_U64(config.Id(), BufferOut + 4);
+		Memory::Write_U32(config.CreationStage(), BufferOut + 0xC);
+		break;
+
+	case IOCTL_NWC24_GET_SCHEDULAR_STAT:
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_GET_SCHEDULAR_STAT - NI");
+		break;
+
+	case IOCTL_NWC24_SAVE_MAIL_NOW:
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_SAVE_MAIL_NOW - NI");
+		break;
+
+	case IOCTL_NWC24_REQUEST_SHUTDOWN:
+		// if ya set the IOS version to a very high value this happens ...
+		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_SHUTDOWN - NI");
+		break;
+
+	default:
+		INFO_LOG(WII_IPC_WC24, "/dev/net/kd/request::IOCtl request 0x%x (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+
+	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+
+u8 CWII_IPC_HLE_Device_net_kd_request::GetAreaCode(const std::string& area) const
+{
+	static std::map<const std::string, u8> regions = {
+		{ "JPN", 0 }, { "USA", 1 }, { "EUR", 2 },
+		{ "AUS", 2 }, { "BRA", 1 }, { "TWN", 3 },
+		{ "ROC", 3 }, { "KOR", 4 }, { "HKG", 5 },
+		{ "ASI", 5 }, { "LTN", 1 }, { "SAF", 2 },
+		{ "CHN", 6 },
+	};
+
+	auto entryPos = regions.find(area);
+	if (entryPos != regions.end())
+		return entryPos->second;
+	else
+		return 7; // Unknown
+}
+
+u8 CWII_IPC_HLE_Device_net_kd_request::GetHardwareModel(const std::string& model) const
+{
+	static std::map<const std::string, u8> models = {
+		{ "RVL", MODEL_RVL },
+		{ "RVT", MODEL_RVT },
+		{ "RVV", MODEL_RVV },
+		{ "RVD", MODEL_RVD },
+	};
+
+	auto entryPos = models.find(model);
+	if (entryPos != models.end())
+		return entryPos->second;
+	else
+		return MODEL_ELSE;
+}
+
+static inline u8 u64_get_byte(u64 value, u8 shift)
+{
+	return (u8)(value >> (shift*8));
+}
+
+static inline u64 u64_insert_byte(u64 value, u8 shift, u8 byte)
+{
+	u64 mask = 0x00000000000000FFULL << (shift*8);
+	u64 inst = (u64)byte << (shift*8);
+	return (value & ~mask) | inst;
+}
+
+s32 CWII_IPC_HLE_Device_net_kd_request::NWC24MakeUserID(u64* nwc24_id, u32 hollywood_id, u16 id_ctr, u8 hardware_model, u8 area_code)
+{
+	const u8 table2[8]  = {0x1, 0x5, 0x0, 0x4, 0x2, 0x3, 0x6, 0x7};
+	const u8 table1[16] = {0x4, 0xB, 0x7, 0x9, 0xF, 0x1, 0xD, 0x3, 0xC, 0x2, 0x6, 0xE, 0x8, 0x0, 0xA, 0x5};
+
+	u64 mix_id = ((u64)area_code << 50) | ((u64)hardware_model << 47) | ((u64)hollywood_id << 15) | ((u64)id_ctr << 10);
+	u64 mix_id_copy1 = mix_id;
+
+	int ctr = 0;
+	for (ctr = 0; ctr <= 42; ctr++)
+	{
+		u64 value = mix_id >> (52 - ctr);
+		if (value & 1)
+		{
+			value = 0x0000000000000635ULL << (42-ctr);
+			mix_id ^= value;
+		}
+	}
+
+	mix_id = (mix_id_copy1 | (mix_id & 0xFFFFFFFFUL)) ^ 0x0000B3B3B3B3B3B3ULL;
+	mix_id = (mix_id >> 10) | ((mix_id & 0x3FF) << (11 + 32));
+
+	for (ctr = 0; ctr <= 5; ctr++)
+	{
+		u8 ret = u64_get_byte(mix_id, ctr);
+		u8 foobar = ((table1[(ret >> 4) & 0xF]) << 4) | (table1[ret & 0xF]);
+		mix_id = u64_insert_byte(mix_id, ctr, foobar & 0xff);
+	}
+	u64 mix_id_copy2 = mix_id;
+
+	for (ctr = 0; ctr <= 5; ctr++)
+	{
+		u8 ret = u64_get_byte(mix_id_copy2, ctr);
+		mix_id = u64_insert_byte(mix_id, table2[ctr], ret);
+	}
+
+	mix_id &= 0x001FFFFFFFFFFFFFULL;
+	mix_id = (mix_id << 1) | ((mix_id >> 52) & 1);
+
+	mix_id ^= 0x00005E5E5E5E5E5EULL;
+	mix_id &= 0x001FFFFFFFFFFFFFULL;
+
+	*nwc24_id = mix_id;
+
+	if (mix_id > 9999999999999999ULL)
+		return WC24_ERR_FATAL;
+
+	return WC24_OK;
+}
+
+static void SaveMacAddress(u8* mac)
+{
+	SConfig::GetInstance().m_WirelessMac = MacAddressToString(mac);
+	SConfig::GetInstance().SaveSettings();
+}
+
+static void GetMacAddress(u8* mac)
+{
+	// Parse MAC address from config, and generate a new one if it doesn't
+	// exist or can't be parsed.
+	std::string wireless_mac = SConfig::GetInstance().m_WirelessMac;
+
+	if (Core::g_want_determinism)
+		wireless_mac = "12:34:56:78:9a:bc";
+
+	if (!StringToMacAddress(wireless_mac, mac))
+	{
+		GenerateMacAddress(IOS, mac);
+		SaveMacAddress(mac);
+		if (!wireless_mac.empty())
+		{
+			ERROR_LOG(WII_IPC_NET, "The MAC provided (%s) is invalid. We have "\
+			                       "generated another one for you.",
+			                       MacAddressToString(mac).c_str());
+		}
+	}
+	INFO_LOG(WII_IPC_NET, "Using MAC address: %s", MacAddressToString(mac).c_str());
+}
+
+// **********************************************************************************
+// Handle /dev/net/ncd/manage requests
+CWII_IPC_HLE_Device_net_ncd_manage::CWII_IPC_HLE_Device_net_ncd_manage(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+}
+
+CWII_IPC_HLE_Device_net_ncd_manage::~CWII_IPC_HLE_Device_net_ncd_manage()
+{
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ncd_manage::Open(u32 _CommandAddress, u32 _Mode)
+{
+	INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: Open");
+	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ncd_manage::Close(u32 _CommandAddress, bool _bForce)
+{
+	INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: Close");
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress)
+{
+	u32 return_value = 0;
+	u32 common_result = 0;
+	u32 common_vector = 0;
+
+	SIOCtlVBuffer CommandBuffer(_CommandAddress);
+
+	switch (CommandBuffer.Parameter)
+	{
+	case IOCTLV_NCD_LOCKWIRELESSDRIVER:
+		break;
+
+	case IOCTLV_NCD_UNLOCKWIRELESSDRIVER:
+		//Memory::Read_U32(CommandBuffer.InBuffer.at(0).m_Address);
+		break;
+
+	case IOCTLV_NCD_GETCONFIG:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETCONFIG");
+		config.WriteToMem(CommandBuffer.PayloadBuffer.at(0).m_Address);
+		common_vector = 1;
+		break;
+
+	case IOCTLV_NCD_SETCONFIG:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_SETCONFIG");
+		config.ReadFromMem(CommandBuffer.InBuffer.at(0).m_Address);
+		break;
+
+	case IOCTLV_NCD_READCONFIG:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_READCONFIG");
+		config.ReadConfig();
+		config.WriteToMem(CommandBuffer.PayloadBuffer.at(0).m_Address);
+		common_vector = 1;
+		break;
+
+	case IOCTLV_NCD_WRITECONFIG:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_WRITECONFIG");
+		config.ReadFromMem(CommandBuffer.InBuffer.at(0).m_Address);
+		config.WriteConfig();
+		break;
+
+	case IOCTLV_NCD_GETLINKSTATUS:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETLINKSTATUS");
+		// Always connected
+		Memory::Write_U32(netcfg_connection_t::LINK_WIRED, CommandBuffer.PayloadBuffer.at(0).m_Address + 4);
+		break;
+
+	case IOCTLV_NCD_GETWIRELESSMACADDRESS:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS");
+
+		u8 address[MAC_ADDRESS_SIZE];
+		GetMacAddress(address);
+		Memory::CopyToEmu(CommandBuffer.PayloadBuffer.at(1).m_Address, address, sizeof(address));
+		break;
+
+	default:
+		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE IOCtlV: %#x", CommandBuffer.Parameter);
+		break;
+	}
+
+	Memory::Write_U32(common_result, CommandBuffer.PayloadBuffer.at(common_vector).m_Address);
+	if (common_vector == 1)
+	{
+		Memory::Write_U32(common_result, CommandBuffer.PayloadBuffer.at(common_vector).m_Address + 4);
+	}
+	Memory::Write_U32(return_value, _CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+// **********************************************************************************
+// Handle /dev/net/wd/command requests
+CWII_IPC_HLE_Device_net_wd_command::CWII_IPC_HLE_Device_net_wd_command(u32 DeviceID, const std::string& DeviceName)
+	: IWII_IPC_HLE_Device(DeviceID, DeviceName)
+{
+}
+
+CWII_IPC_HLE_Device_net_wd_command::~CWII_IPC_HLE_Device_net_wd_command()
+{
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_wd_command::Open(u32 CommandAddress, u32 Mode)
+{
+	INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND: Open");
+	Memory::Write_U32(GetDeviceID(), CommandAddress + 4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_wd_command::Close(u32 CommandAddress, bool Force)
+{
+	INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND: Close");
+	if (!Force)
+		Memory::Write_U32(0, CommandAddress + 4);
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+// This is just for debugging / playing around.
+// There really is no reason to implement wd unless we can bend it such that
+// we can talk to the DS.
+IPCCommandResult CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
+{
+	u32 return_value = 0;
+
+	SIOCtlVBuffer CommandBuffer(CommandAddress);
+
+	switch (CommandBuffer.Parameter)
+	{
+	case IOCTLV_WD_SCAN:
+		{
+		// Gives parameters detailing type of scan and what to match
+		// XXX - unused
+		// ScanInfo *scan = (ScanInfo *)Memory::GetPointer(CommandBuffer.InBuffer.at(0).m_Address);
+
+		u16* results = (u16*)Memory::GetPointer(CommandBuffer.PayloadBuffer.at(0).m_Address);
+		// first u16 indicates number of BSSInfo following
+		results[0] = Common::swap16(1);
+
+		BSSInfo* bss = (BSSInfo*)&results[1];
+		memset(bss, 0, sizeof(BSSInfo));
+
+		bss->length = Common::swap16(sizeof(BSSInfo));
+		bss->rssi = Common::swap16(0xffff);
+
+		for (int i = 0; i < BSSID_SIZE; ++i)
+			bss->bssid[i] = i;
+
+		const char* ssid = "dolphin-emu";
+		strcpy((char*)bss->ssid, ssid);
+		bss->ssid_length = Common::swap16((u16)strlen(ssid));
+
+		bss->channel = Common::swap16(2);
+		}
+		break;
+
+	case IOCTLV_WD_GET_INFO:
+		{
+		Info* info = (Info*)Memory::GetPointer(CommandBuffer.PayloadBuffer.at(0).m_Address);
+		memset(info, 0, sizeof(Info));
+		// Probably used to disallow certain channels?
+		memcpy(info->country, "US", 2);
+		info->ntr_allowed_channels = Common::swap16(0xfffe);
+
+		u8 address[MAC_ADDRESS_SIZE];
+		GetMacAddress(address);
+		memcpy(info->mac, address, sizeof(info->mac));
+		}
+		break;
+
+	case IOCTLV_WD_GET_MODE:
+	case IOCTLV_WD_SET_LINKSTATE:
+	case IOCTLV_WD_GET_LINKSTATE:
+	case IOCTLV_WD_SET_CONFIG:
+	case IOCTLV_WD_GET_CONFIG:
+	case IOCTLV_WD_CHANGE_BEACON:
+	case IOCTLV_WD_DISASSOC:
+	case IOCTLV_WD_MP_SEND_FRAME:
+	case IOCTLV_WD_SEND_FRAME:
+	case IOCTLV_WD_CALL_WL:
+	case IOCTLV_WD_MEASURE_CHANNEL:
+	case IOCTLV_WD_GET_LASTERROR:
+	case IOCTLV_WD_CHANGE_GAMEINFO:
+	case IOCTLV_WD_CHANGE_VTSF:
+	case IOCTLV_WD_RECV_FRAME:
+	case IOCTLV_WD_RECV_NOTIFICATION:
+	default:
+		INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND IOCtlV %#x in %i out %i",
+			CommandBuffer.Parameter, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer);
+		for (u32 i = 0; i < CommandBuffer.NumberInBuffer; ++i)
+		{
+			INFO_LOG(WII_IPC_NET, "in %i addr %x size %i", i,
+				CommandBuffer.InBuffer.at(i).m_Address, CommandBuffer.InBuffer.at(i).m_Size);
+			INFO_LOG(WII_IPC_NET, "%s",
+				ArrayToString(
+					Memory::GetPointer(CommandBuffer.InBuffer.at(i).m_Address),
+					CommandBuffer.InBuffer.at(i).m_Size).c_str()
+				);
+		}
+		for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; ++i)
+		{
+			INFO_LOG(WII_IPC_NET, "out %i addr %x size %i", i,
+				CommandBuffer.PayloadBuffer.at(i).m_Address, CommandBuffer.PayloadBuffer.at(i).m_Size);
+		}
+		break;
+	}
+
+	Memory::Write_U32(return_value, CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+
+// **********************************************************************************
+// Handle /dev/net/ip/top requests
+CWII_IPC_HLE_Device_net_ip_top::CWII_IPC_HLE_Device_net_ip_top(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+#ifdef _WIN32
+	int ret = WSAStartup(MAKEWORD(2,2), &InitData);
+	INFO_LOG(WII_IPC_NET, "WSAStartup: %d", ret);
+#endif
+}
+
+CWII_IPC_HLE_Device_net_ip_top::~CWII_IPC_HLE_Device_net_ip_top()
+{
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::Open(u32 _CommandAddress, u32 _Mode)
+{
+	INFO_LOG(WII_IPC_NET, "NET_IP_TOP: Open");
+	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::Close(u32 _CommandAddress, bool _bForce)
+{
+	INFO_LOG(WII_IPC_NET, "NET_IP_TOP: Close");
+	if (!_bForce)
+		Memory::Write_U32(0, _CommandAddress + 4);
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+static int inet_pton(const char* src, unsigned char* dst)
+{
+	int saw_digit, octets;
+	char ch;
+	unsigned char tmp[4], *tp;
+
+	saw_digit = 0;
+	octets = 0;
+	*(tp = tmp) = 0;
+	while ((ch = *src++) != '\0')
+	{
+		if (ch >= '0' && ch <= '9')
+		{
+			unsigned int newt = (*tp * 10) + (ch - '0');
+
+			if (newt > 255)
+				return 0;
+			*tp = newt;
+			if (!saw_digit)
+			{
+				if (++octets > 4)
+					return 0;
+				saw_digit = 1;
+			}
+		}
+		else if (ch == '.' && saw_digit)
+		{
+			if (octets == 4)
+				return 0;
+			*++tp = 0;
+			saw_digit = 0;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	if (octets < 4)
+		return 0;
+	memcpy(dst, tmp, 4);
+	return 1;
+}
+
+// Maps SOCKOPT level from native to Wii
+static unsigned int opt_level_mapping[][2] = {
+	{ SOL_SOCKET, 0xFFFF }
+};
+
+// Maps SOCKOPT optname from native to Wii
+static unsigned int opt_name_mapping[][2] = {
+	{ SO_REUSEADDR, 0x4 },
+	{ SO_SNDBUF, 0x1001 },
+	{ SO_RCVBUF, 0x1002 },
+	{ SO_ERROR, 0x1009 }
+};
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
+{
+	if (Core::g_want_determinism)
+	{
+		Memory::Write_U32(-1, _CommandAddress + 4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+
+	u32 Command       = Memory::Read_U32(_CommandAddress + 0x0C);
+	u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+	u32 ReturnValue = 0;
+	switch (Command)
+	{
+	case IOCTL_SO_STARTUP:
+	{
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_STARTUP "
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+	case IOCTL_SO_SOCKET:
+	{
+		u32 af   = Memory::Read_U32(BufferIn);
+		u32 type = Memory::Read_U32(BufferIn + 0x04);
+		u32 prot = Memory::Read_U32(BufferIn + 0x08);
+
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		ReturnValue = sm.NewSocket(af, type, prot);
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SOCKET "
+			"Socket: %08x (%d,%d,%d), BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			ReturnValue, af, type, prot, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+	case IOCTL_SO_ICMPSOCKET:
+	{
+		u32 pf = Memory::Read_U32(BufferIn);
+
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		ReturnValue = sm.NewSocket(pf, SOCK_RAW, IPPROTO_ICMP);
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_ICMPSOCKET(%x) %d", pf, ReturnValue);
+		break;
+	}
+	case IOCTL_SO_CLOSE:
+	case IOCTL_SO_ICMPCLOSE:
+	{
+		u32 fd = Memory::Read_U32(BufferIn);
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		ReturnValue = sm.DeleteSocket(fd);
+		DEBUG_LOG(WII_IPC_NET, "%s(%x) %x",
+			Command == IOCTL_SO_ICMPCLOSE ? "IOCTL_SO_ICMPCLOSE" : "IOCTL_SO_CLOSE",
+			fd, ReturnValue);
+		break;
+	}
+	case IOCTL_SO_ACCEPT:
+	case IOCTL_SO_BIND:
+	case IOCTL_SO_CONNECT:
+	case IOCTL_SO_FCNTL:
+	{
+		u32 fd = Memory::Read_U32(BufferIn);
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		sm.DoSock(fd, _CommandAddress, (NET_IOCTL)Command);
+		return IPC_NO_REPLY;
+	}
+	/////////////////////////////////////////////////////////////
+	//                  TODO: Tidy all below                   //
+	/////////////////////////////////////////////////////////////
+	case IOCTL_SO_SHUTDOWN:
+	{
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SHUTDOWN "
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		u32 fd = Memory::Read_U32(BufferIn);
+		u32 how = Memory::Read_U32(BufferIn+4);
+		int ret = shutdown(fd, how);
+		ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_SHUTDOWN", false);
+		break;
+	}
+	case IOCTL_SO_LISTEN:
+	{
+
+		u32 fd = Memory::Read_U32(BufferIn);
+		u32 BACKLOG = Memory::Read_U32(BufferIn + 0x04);
+		u32 ret = listen(fd, BACKLOG);
+		ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_LISTEN", false);
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_LISTEN = %d "
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			ReturnValue, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+		break;
+	}
+	case IOCTL_SO_GETSOCKOPT:
+	{
+		u32 fd = Memory::Read_U32(BufferOut);
+		u32 level = Memory::Read_U32(BufferOut + 4);
+		u32 optname = Memory::Read_U32(BufferOut + 8);
+
+		INFO_LOG(WII_IPC_NET,"IOCTL_SO_GETSOCKOPT(%08x, %08x, %08x)"
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			fd, level, optname,
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		// Do the level/optname translation
+		int nat_level = -1, nat_optname = -1;
+
+		for (auto& map : opt_level_mapping)
+			if (level == map[1])
+				nat_level = map[0];
+
+		for (auto& map : opt_name_mapping)
+			if (optname == map[1])
+				nat_optname = map[0];
+
+		u8 optval[20];
+		u32 optlen = 4;
+
+		int ret = getsockopt(fd, nat_level, nat_optname, (char*)&optval, (socklen_t*)&optlen);
+		ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_GETSOCKOPT", false);
+
+
+		Memory::Write_U32(optlen, BufferOut + 0xC);
+		Memory::CopyToEmu(BufferOut + 0x10, optval, optlen);
+
+		if (optname == SO_ERROR)
+		{
+			s32 last_error = WiiSockMan::GetInstance().GetLastNetError();
+
+			Memory::Write_U32(sizeof(s32), BufferOut + 0xC);
+			Memory::Write_U32(last_error, BufferOut + 0x10);
+		}
+		break;
+	}
+
+	case IOCTL_SO_SETSOCKOPT:
+	{
+		u32 fd = Memory::Read_U32(BufferIn);
+		u32 level = Memory::Read_U32(BufferIn + 4);
+		u32 optname = Memory::Read_U32(BufferIn + 8);
+		u32 optlen = Memory::Read_U32(BufferIn + 0xc);
+		u8 optval[20];
+		optlen = std::min(optlen, (u32)sizeof(optval));
+		Memory::CopyFromEmu(optval, BufferIn + 0x10, optlen);
+
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SETSOCKOPT(%08x, %08x, %08x, %08x) "
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)"
+			"%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx",
+			fd, level, optname, optlen, BufferIn, BufferInSize, BufferOut, BufferOutSize, optval[0], optval[1], optval[2], optval[3],
+			optval[4], optval[5], optval[6], optval[7], optval[8], optval[9], optval[10], optval[11], optval[12], optval[13], optval[14],
+			optval[15], optval[16], optval[17], optval[18], optval[19]);
+
+		//TODO: bug booto about this, 0x2005 most likely timeout related, default value on Wii is , 0x2001 is most likely tcpnodelay
+		if (level == 6 && (optname == 0x2005 || optname == 0x2001))
+		{
+			ReturnValue = 0;
+			break;
+		}
+
+		// Do the level/optname translation
+		int nat_level = -1, nat_optname = -1;
+
+		for (auto& map : opt_level_mapping)
+			if (level == map[1])
+				nat_level = map[0];
+
+		for (auto& map : opt_name_mapping)
+			if (optname == map[1])
+				nat_optname = map[0];
+
+		if (nat_level == -1 || nat_optname == -1)
+		{
+			INFO_LOG(WII_IPC_NET, "SO_SETSOCKOPT: unknown level %d or optname %d", level, optname);
+
+			// Default to the given level/optname. They match on Windows...
+			nat_level = level;
+			nat_optname = optname;
+		}
+
+		int ret = setsockopt(fd, nat_level, nat_optname, (char*)optval, optlen);
+		ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_SETSOCKOPT", false);
+		break;
+	}
+	case IOCTL_SO_GETSOCKNAME:
+	{
+		u32 fd = Memory::Read_U32(BufferIn);
+
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETSOCKNAME "
+			"Socket: %08X, BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			fd, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+		sockaddr sa;
+		socklen_t sa_len;
+		sa_len = sizeof(sa);
+		int ret = getsockname(fd, &sa, &sa_len);
+
+		Memory::Write_U8(BufferOutSize, BufferOut);
+		Memory::Write_U8(sa.sa_family & 0xFF, BufferOut + 1);
+		Memory::CopyToEmu(BufferOut + 2, &sa.sa_data, BufferOutSize - 2);
+		ReturnValue = ret;
+		break;
+	}
+	case IOCTL_SO_GETPEERNAME:
+	{
+		u32 fd = Memory::Read_U32(BufferIn);
+
+		sockaddr sa;
+		socklen_t sa_len;
+		sa_len = sizeof(sa);
+
+		int ret = getpeername(fd, &sa, &sa_len);
+
+		Memory::Write_U8(BufferOutSize, BufferOut);
+		Memory::Write_U8(AF_INET, BufferOut + 1);
+		Memory::CopyToEmu(BufferOut + 2, &sa.sa_data, BufferOutSize - 2);
+
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETPEERNAME(%x)", fd);
+
+		ReturnValue = ret;
+		break;
+	}
+
+	case IOCTL_SO_GETHOSTID:
+	{
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETHOSTID "
+			"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+#ifdef _WIN32
+		DWORD forwardTableSize, ipTableSize, result;
+		DWORD ifIndex = -1;
+		std::unique_ptr<MIB_IPFORWARDTABLE> forwardTable;
+		std::unique_ptr<MIB_IPADDRTABLE> ipTable;
+
+		forwardTableSize = 0;
+		if (GetIpForwardTable(nullptr, &forwardTableSize, FALSE) == ERROR_INSUFFICIENT_BUFFER)
+		{
+			forwardTable = std::unique_ptr<MIB_IPFORWARDTABLE>((PMIB_IPFORWARDTABLE)operator new(forwardTableSize));
+		}
+
+		ipTableSize = 0;
+		if (GetIpAddrTable(nullptr, &ipTableSize, FALSE) == ERROR_INSUFFICIENT_BUFFER)
+		{
+			ipTable = std::unique_ptr<MIB_IPADDRTABLE>((PMIB_IPADDRTABLE)operator new(ipTableSize));
+		}
+
+		// find the interface IP used for the default route and use that
+		result = GetIpForwardTable(forwardTable.get(), &forwardTableSize, FALSE);
+		while (result == NO_ERROR || result == ERROR_MORE_DATA) // can return ERROR_MORE_DATA on XP even after the first call
+		{
+			for (DWORD i = 0; i < forwardTable->dwNumEntries; ++i)
+			{
+				if (forwardTable->table[i].dwForwardDest == 0)
+				{
+					ifIndex = forwardTable->table[i].dwForwardIfIndex;
+					break;
+				}
+			}
+
+			if (result == NO_ERROR || ifIndex != -1)
+				break;
+
+			result = GetIpForwardTable(forwardTable.get(), &forwardTableSize, FALSE);
+		}
+
+		if (ifIndex != -1 && GetIpAddrTable(ipTable.get(), &ipTableSize, FALSE) == NO_ERROR)
+		{
+			for (DWORD i = 0; i < ipTable->dwNumEntries; ++i)
+			{
+				if (ipTable->table[i].dwIndex == ifIndex)
+				{
+					ReturnValue = Common::swap32(ipTable->table[i].dwAddr);
+					break;
+				}
+			}
+		}
+#endif
+
+		// default placeholder, in case of failure
+		if (ReturnValue == 0)
+			ReturnValue = 192 << 24 | 168 << 16 | 1 << 8 | 150;
+		break;
+	}
+
+	case IOCTL_SO_INETATON:
+	{
+		std::string hostname = Memory::GetString(BufferIn);
+		struct hostent* remoteHost = gethostbyname(hostname.c_str());
+
+		if (remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr)
+		{
+			INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = -1 "
+				"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: None",
+				hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize);
+			ReturnValue = 0;
+		}
+		else
+		{
+			Memory::Write_U32(Common::swap32(*(u32*)remoteHost->h_addr_list[0]), BufferOut);
+			INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = 0 "
+				"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X",
+				hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize,
+				Common::swap32(*(u32*)remoteHost->h_addr_list[0]));
+			ReturnValue = 1;
+		}
+		break;
+	}
+
+	case IOCTL_SO_INETPTON:
+	{
+		std::string address = Memory::GetString(BufferIn);
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETPTON "
+			"(Translating: %s)", address.c_str());
+		ReturnValue = inet_pton(address.c_str(), Memory::GetPointer(BufferOut + 4));
+		break;
+	}
+
+	case IOCTL_SO_INETNTOP:
+	{
+		//u32 af = Memory::Read_U32(BufferIn);
+		//u32 validAddress = Memory::Read_U32(BufferIn + 4);
+		//u32 src = Memory::Read_U32(BufferIn + 8);
+		char ip_s[16];
+		sprintf(ip_s, "%i.%i.%i.%i",
+			Memory::Read_U8(BufferIn + 8),
+			Memory::Read_U8(BufferIn + 8 + 1),
+			Memory::Read_U8(BufferIn + 8 + 2),
+			Memory::Read_U8(BufferIn + 8 + 3)
+			);
+		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETNTOP %s", ip_s);
+		Memory::Memset(BufferOut, 0, BufferOutSize);
+		Memory::CopyToEmu(BufferOut, (u8*)ip_s, strlen(ip_s));
+		break;
+	}
+
+	case IOCTL_SO_POLL:
+		{
+			// Map Wii/native poll events types
+			unsigned int mapping[][2] = {
+				{ POLLIN, 0x0001 },
+				{ POLLOUT, 0x0008 },
+				{ POLLHUP, 0x0040 },
+			};
+
+			u32 unknown = Memory::Read_U32(BufferIn);
+			u32 timeout = Memory::Read_U32(BufferIn + 4);
+
+			int nfds = BufferOutSize / 0xc;
+			if (nfds == 0)
+				ERROR_LOG(WII_IPC_NET, "Hidden POLL");
+
+			pollfd_t* ufds = (pollfd_t*)malloc(sizeof(pollfd_t) * nfds);
+			if (ufds == nullptr)
+			{
+				ReturnValue = -1;
+				break;
+			}
+
+			for (int i = 0; i < nfds; ++i)
+			{
+				ufds[i].fd = Memory::Read_U32(BufferOut + 0xc*i);          //fd
+				int events = Memory::Read_U32(BufferOut + 0xc*i + 4);      //events
+				ufds[i].revents = Memory::Read_U32(BufferOut + 0xc*i + 8); //revents
+
+				// Translate Wii to native events
+				int unhandled_events = events;
+				ufds[i].events = 0;
+				for (auto& map : mapping)
+				{
+					if (events & map[1])
+						ufds[i].events |= map[0];
+					unhandled_events &= ~map[1];
+				}
+
+				DEBUG_LOG(WII_IPC_NET, "IOCTL_SO_POLL(%d) "
+					"Sock: %08x, Unknown: %08x, Events: %08x, "
+					"NativeEvents: %08x",
+					i, ufds[i].fd, unknown, events, ufds[i].events
+				);
+
+				if (unhandled_events)
+					ERROR_LOG(WII_IPC_NET, "SO_POLL: unhandled Wii event types: %04x", unhandled_events);
+			}
+
+			int ret = poll(ufds, nfds, timeout);
+			ret = WiiSockMan::GetNetErrorCode(ret, "SO_POLL", false);
+
+			for (int i = 0; i < nfds; ++i)
+			{
+
+				// Translate native to Wii events
+				int revents = 0;
+				for (auto& map : mapping)
+				{
+					if (ufds[i].revents & map[0])
+						revents |= map[1];
+				}
+
+				// No need to change fd or events as they are input only.
+				//Memory::Write_U32(ufds[i].fd, BufferOut + 0xc*i); //fd
+				//Memory::Write_U32(events, BufferOut + 0xc*i + 4); //events
+				Memory::Write_U32(revents, BufferOut + 0xc*i + 8);  //revents
+
+				DEBUG_LOG(WII_IPC_NET, "IOCTL_SO_POLL socket %d revents %08X events %08X", i, revents, ufds[i].events);
+			}
+			free(ufds);
+
+			ReturnValue = ret;
+			break;
+		}
+
+	case IOCTL_SO_GETHOSTBYNAME:
+		{
+			if (BufferOutSize != 0x460)
+			{
+				ERROR_LOG(WII_IPC_NET, "Bad buffer size for IOCTL_SO_GETHOSTBYNAME");
+				ReturnValue = -1;
+				break;
+			}
+
+			std::string hostname = Memory::GetString(BufferIn);
+			hostent* remoteHost = gethostbyname(hostname.c_str());
+
+			INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETHOSTBYNAME "
+				"Address: %s, BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+				hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+			if (remoteHost)
+			{
+				for (int i = 0; remoteHost->h_aliases[i]; ++i)
+				{
+					INFO_LOG(WII_IPC_NET, "alias%i:%s", i, remoteHost->h_aliases[i]);
+				}
+
+				for (int i = 0; remoteHost->h_addr_list[i]; ++i)
+				{
+					u32 ip = Common::swap32(*(u32*)(remoteHost->h_addr_list[i]));
+					std::string ip_s = StringFromFormat("%i.%i.%i.%i", ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
+					DEBUG_LOG(WII_IPC_NET, "addr%i:%s", i, ip_s.c_str());
+				}
+
+				Memory::Memset(BufferOut, 0, BufferOutSize);
+
+				// Host name; located immediately after struct
+				static const u32 GETHOSTBYNAME_STRUCT_SIZE = 0x10;
+				static const u32 GETHOSTBYNAME_IP_LIST_OFFSET = 0x110;
+				// Limit host name length to avoid buffer overflow.
+				u32 name_length = (u32)strlen(remoteHost->h_name) + 1;
+				if (name_length > (GETHOSTBYNAME_IP_LIST_OFFSET - GETHOSTBYNAME_STRUCT_SIZE))
+				{
+					ERROR_LOG(WII_IPC_NET, "Hostname too long in IOCTL_SO_GETHOSTBYNAME");
+					ReturnValue = -1;
+					break;
+				}
+				Memory::CopyToEmu(BufferOut + GETHOSTBYNAME_STRUCT_SIZE, remoteHost->h_name, name_length);
+				Memory::Write_U32(BufferOut + GETHOSTBYNAME_STRUCT_SIZE, BufferOut);
+
+				// IP address list; located at offset 0x110.
+				u32 num_ip_addr = 0;
+				while (remoteHost->h_addr_list[num_ip_addr])
+					num_ip_addr++;
+				// Limit number of IP addresses to avoid buffer overflow.
+				// (0x460 - 0x340) / sizeof(pointer) == 72
+				static const u32 GETHOSTBYNAME_MAX_ADDRESSES = 71;
+				num_ip_addr = std::min(num_ip_addr, GETHOSTBYNAME_MAX_ADDRESSES);
+				for (u32 i = 0; i < num_ip_addr; ++i)
+				{
+					u32 addr = BufferOut + GETHOSTBYNAME_IP_LIST_OFFSET + i * 4;
+					Memory::Write_U32_Swap(*(u32*)(remoteHost->h_addr_list[i]), addr);
+				}
+
+				// List of pointers to IP addresses; located at offset 0x340.
+				// This must be exact: PPC code to convert the struct hardcodes
+				// this offset.
+				static const u32 GETHOSTBYNAME_IP_PTR_LIST_OFFSET = 0x340;
+				Memory::Write_U32(BufferOut + GETHOSTBYNAME_IP_PTR_LIST_OFFSET, BufferOut + 12);
+				for (u32 i = 0; i < num_ip_addr; ++i)
+				{
+					u32 addr = BufferOut + GETHOSTBYNAME_IP_PTR_LIST_OFFSET + i * 4;
+					Memory::Write_U32(BufferOut + GETHOSTBYNAME_IP_LIST_OFFSET + i * 4, addr);
+				}
+				Memory::Write_U32(0, BufferOut + GETHOSTBYNAME_IP_PTR_LIST_OFFSET + num_ip_addr * 4);
+
+				// Aliases - empty. (Hardware doesn't return anything.)
+				Memory::Write_U32(BufferOut + GETHOSTBYNAME_IP_PTR_LIST_OFFSET + num_ip_addr * 4, BufferOut + 4);
+
+				// Returned struct must be ipv4.
+				_assert_msg_(WII_IPC_NET,
+					remoteHost->h_addrtype == AF_INET && remoteHost->h_length == sizeof(u32),
+					"returned host info is not IPv4");
+				Memory::Write_U16(AF_INET, BufferOut + 8);
+				Memory::Write_U16(sizeof(u32), BufferOut + 10);
+
+				ReturnValue = 0;
+			}
+			else
+			{
+				ReturnValue = -1;
+			}
+
+			break;
+		}
+
+	case IOCTL_SO_ICMPCANCEL:
+		ERROR_LOG(WII_IPC_NET, "IOCTL_SO_ICMPCANCEL");
+		goto default_;
+
+	default:
+		INFO_LOG(WII_IPC_NET, "0x%x "
+			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			Command, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+	default_:
+		if (BufferInSize)
+		{
+			ERROR_LOG(WII_IPC_NET, "in addr %x size %x", BufferIn, BufferInSize);
+			ERROR_LOG(WII_IPC_NET, "\n%s", ArrayToString(Memory::GetPointer(BufferIn), BufferInSize, 4).c_str());
+		}
+
+		if (BufferOutSize)
+		{
+			ERROR_LOG(WII_IPC_NET, "out addr %x size %x", BufferOut, BufferOutSize);
+		}
+		break;
+	}
+
+	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+
+	return IPC_DEFAULT_REPLY;
+}
+
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
+{
+	SIOCtlVBuffer CommandBuffer(CommandAddress);
+
+	s32 ReturnValue = 0;
+
+
+	u32 _BufferIn = 0, _BufferIn2 = 0, _BufferIn3 = 0;
+	u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0;
+
+	u32 _BufferOut = 0, _BufferOut2 = 0;
+	u32 BufferOutSize = 0;
+
+	if (CommandBuffer.InBuffer.size() > 0)
+	{
+		_BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
+		BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
+	}
+	if (CommandBuffer.InBuffer.size() > 1)
+	{
+		_BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
+		BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
+	}
+	if (CommandBuffer.InBuffer.size() > 2)
+	{
+		_BufferIn3 = CommandBuffer.InBuffer.at(2).m_Address;
+		BufferInSize3 = CommandBuffer.InBuffer.at(2).m_Size;
+	}
+
+	if (CommandBuffer.PayloadBuffer.size() > 0)
+	{
+		_BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
+		BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
+	}
+	if (CommandBuffer.PayloadBuffer.size() > 1)
+	{
+		_BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
+	}
+
+	u32 param = 0, param2 = 0, param3, param4, param5 = 0;
+
+	switch (CommandBuffer.Parameter)
+	{
+	case IOCTLV_SO_GETINTERFACEOPT:
+	{
+		param = Memory::Read_U32(_BufferIn);
+		param2 = Memory::Read_U32(_BufferIn + 4);
+		param3 = Memory::Read_U32(_BufferOut);
+		param4 = Memory::Read_U32(_BufferOut2);
+		if (BufferOutSize >= 8)
+		{
+			param5 = Memory::Read_U32(_BufferOut + 4);
+		}
+
+		INFO_LOG(WII_IPC_NET, "IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ",
+			param, param2, param3, param4, param5,
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2);
+
+		switch (param2)
+		{
+		case 0xb003: // dns server table
+		{
+			u32 address = 0;
+#ifdef _WIN32
+			if (!Core::g_want_determinism)
+			{
+				PIP_ADAPTER_ADDRESSES AdapterAddresses = nullptr;
+				ULONG OutBufferLength = 0;
+				ULONG RetVal = 0, i;
+				for (i = 0; i < 5; ++i)
+				{
+					RetVal = GetAdaptersAddresses(
+						AF_INET,
+						0,
+						nullptr,
+						AdapterAddresses,
+						&OutBufferLength);
+
+					if (RetVal != ERROR_BUFFER_OVERFLOW)
+					{
+						break;
+					}
+
+					if (AdapterAddresses != nullptr)
+					{
+						FREE(AdapterAddresses);
+					}
+
+					AdapterAddresses = (PIP_ADAPTER_ADDRESSES)MALLOC(OutBufferLength);
+					if (AdapterAddresses == nullptr)
+					{
+						RetVal = GetLastError();
+						break;
+					}
+				}
+				if (RetVal == NO_ERROR)
+				{
+					unsigned long dwBestIfIndex = 0;
+					IPAddr dwDestAddr = (IPAddr)0x08080808;
+					// If successful, output some information from the data we received
+					PIP_ADAPTER_ADDRESSES AdapterList = AdapterAddresses;
+					if (GetBestInterface(dwDestAddr, &dwBestIfIndex) == NO_ERROR)
+					{
+						while (AdapterList)
+						{
+							if (AdapterList->IfIndex == dwBestIfIndex &&
+								AdapterList->FirstDnsServerAddress &&
+								AdapterList->OperStatus == IfOperStatusUp)
+							{
+								INFO_LOG(WII_IPC_NET, "Name of valid interface: %S", AdapterList->FriendlyName);
+								INFO_LOG(WII_IPC_NET, "DNS: %u.%u.%u.%u",
+									(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[2],
+									(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[3],
+									(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[4],
+									(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[5]);
+								address = Common::swap32(*(u32*)(&AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[2]));
+								break;
+							}
+							AdapterList = AdapterList->Next;
+						}
+					}
+				}
+				if (AdapterAddresses != nullptr)
+				{
+					FREE(AdapterAddresses);
+				}
+			}
+#endif
+			if (address == 0)
+				address = 0x08080808;
+
+			Memory::Write_U32(address, _BufferOut);
+			Memory::Write_U32(0x08080404, _BufferOut + 4);
+			break;
+		}
+		case 0x1003: // error
+			Memory::Write_U32(0, _BufferOut);
+			break;
+
+		case 0x1004: // mac address
+			u8 address[MAC_ADDRESS_SIZE];
+			GetMacAddress(address);
+			Memory::CopyToEmu(_BufferOut, address, sizeof(address));
+			break;
+
+		case 0x1005: // link state
+			Memory::Write_U32(1, _BufferOut);
+			break;
+
+		case 0x4002: // ip addr number
+			Memory::Write_U32(1, _BufferOut);
+			break;
+
+		case 0x4003: // ip addr table
+			Memory::Write_U32(0xC, _BufferOut2);
+			Memory::Write_U32(10 << 24 | 1 << 8 | 30, _BufferOut);
+			Memory::Write_U32(255 << 24 | 255 << 16 | 255 << 8 | 0, _BufferOut + 4);
+			Memory::Write_U32(10 << 24 | 0 << 16 | 255 << 8 | 255, _BufferOut + 8);
+			break;
+
+		default:
+			ERROR_LOG(WII_IPC_NET, "Unknown param2: %08X", param2);
+			break;
+		}
+		break;
+	}
+	case IOCTLV_SO_SENDTO:
+	{
+		u32 fd = Memory::Read_U32(_BufferIn2);
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		sm.DoSock(fd, CommandAddress, IOCTLV_SO_SENDTO);
+		return IPC_NO_REPLY;
+		break;
+	}
+	case IOCTLV_SO_RECVFROM:
+	{
+		u32 fd = Memory::Read_U32(_BufferIn);
+		WiiSockMan &sm = WiiSockMan::GetInstance();
+		sm.DoSock(fd, CommandAddress, IOCTLV_SO_RECVFROM);
+		return IPC_NO_REPLY;
+		break;
+	}
+	case IOCTLV_SO_GETADDRINFO:
+	{
+		addrinfo hints;
+
+		if (BufferInSize3)
+		{
+			hints.ai_flags     = Memory::Read_U32(_BufferIn3);
+			hints.ai_family    = Memory::Read_U32(_BufferIn3 + 0x4);
+			hints.ai_socktype  = Memory::Read_U32(_BufferIn3 + 0x8);
+			hints.ai_protocol  = Memory::Read_U32(_BufferIn3 + 0xC);
+			hints.ai_addrlen   = Memory::Read_U32(_BufferIn3 + 0x10);
+			hints.ai_canonname = nullptr;
+			hints.ai_addr      = nullptr;
+			hints.ai_next      = nullptr;
+		}
+
+		// getaddrinfo allows a null pointer for the nodeName or serviceName strings
+		// So we have to do a bit of juggling here.
+		std::string nodeNameStr;
+		const char* pNodeName = nullptr;
+		if (BufferInSize > 0)
+		{
+			nodeNameStr = Memory::GetString(_BufferIn, BufferInSize);
+			pNodeName = nodeNameStr.c_str();
+		}
+
+		std::string serviceNameStr;
+		const char* pServiceName = nullptr;
+		if (BufferInSize2 > 0)
+		{
+			serviceNameStr = Memory::GetString(_BufferIn2, BufferInSize2);
+			pServiceName = serviceNameStr.c_str();
+		}
+
+		addrinfo* result = nullptr;
+		int ret = getaddrinfo(pNodeName, pServiceName, BufferInSize3 ? &hints : nullptr, &result);
+		u32 addr = _BufferOut;
+		u32 sockoffset = addr + 0x460;
+		if (ret == 0)
+		{
+			for (addrinfo* result_iter = result; result_iter != nullptr; result_iter = result_iter->ai_next)
+			{
+				Memory::Write_U32(result_iter->ai_flags, addr);
+				Memory::Write_U32(result_iter->ai_family, addr + 0x04);
+				Memory::Write_U32(result_iter->ai_socktype, addr + 0x08);
+				Memory::Write_U32(result_iter->ai_protocol, addr + 0x0C);
+				Memory::Write_U32((u32)result_iter->ai_addrlen, addr + 0x10);
+				// what to do? where to put? the buffer of 0x834 doesn't allow space for this
+				Memory::Write_U32(/*result->ai_cannonname*/ 0, addr + 0x14);
+
+				if (result_iter->ai_addr)
+				{
+					Memory::Write_U32(sockoffset, addr + 0x18);
+					Memory::Write_U16(((result_iter->ai_addr->sa_family & 0xFF) << 8) | (result_iter->ai_addrlen & 0xFF), sockoffset);
+					Memory::CopyToEmu(sockoffset + 0x2, result_iter->ai_addr->sa_data, sizeof(result_iter->ai_addr->sa_data));
+					sockoffset += 0x1C;
+				}
+				else
+				{
+					Memory::Write_U32(0, addr + 0x18);
+				}
+
+				if (result_iter->ai_next)
+				{
+					Memory::Write_U32(addr + sizeof(addrinfo), addr + 0x1C);
+				}
+				else
+				{
+					Memory::Write_U32(0, addr + 0x1C);
+				}
+
+				addr += sizeof(addrinfo);
+			}
+
+			freeaddrinfo(result);
+		}
+		else
+		{
+			// Host not found
+			ret = -305;
+		}
+
+		INFO_LOG(WII_IPC_NET, "IOCTLV_SO_GETADDRINFO "
+			"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferOut, BufferOutSize);
+		INFO_LOG(WII_IPC_NET, "IOCTLV_SO_GETADDRINFO: %s", Memory::GetString(_BufferIn).c_str());
+		ReturnValue = ret;
+		break;
+	}
+	case IOCTLV_SO_ICMPPING:
+	{
+		struct
+		{
+			u8 length;
+			u8 addr_family;
+			u16 icmp_id;
+			u32 ip;
+		} ip_info;
+
+		u32 fd = Memory::Read_U32(_BufferIn);
+		u32 num_ip = Memory::Read_U32(_BufferIn + 4);
+		u64 timeout = Memory::Read_U64(_BufferIn + 8);
+
+		if (num_ip != 1)
+		{
+			INFO_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING %i IPs", num_ip);
+		}
+
+		ip_info.length      = Memory::Read_U8(_BufferIn + 16);
+		ip_info.addr_family = Memory::Read_U8(_BufferIn + 17);
+		ip_info.icmp_id     = Memory::Read_U16(_BufferIn + 18);
+		ip_info.ip          = Memory::Read_U32(_BufferIn + 20);
+
+		if (ip_info.length != 8 || ip_info.addr_family != AF_INET)
+		{
+			INFO_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING strange IPInfo:\n"
+				"length %x addr_family %x",
+				ip_info.length, ip_info.addr_family);
+		}
+
+		DEBUG_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING %x", ip_info.ip);
+
+		sockaddr_in addr;
+		addr.sin_family = AF_INET;
+		addr.sin_addr.s_addr = Common::swap32(ip_info.ip);
+		memset(addr.sin_zero, 0, 8);
+
+		u8 data[0x20];
+		memset(data, 0, sizeof(data));
+		s32 icmp_length = sizeof(data);
+
+		if (BufferInSize2 == sizeof(data))
+			Memory::CopyFromEmu(data, _BufferIn2, BufferInSize2);
+		else
+		{
+			// TODO sequence number is incremented either statically, by
+			// port, or by socket. Doesn't seem to matter, so we just leave
+			// it 0
+			((u16*)data)[0] = Common::swap16(ip_info.icmp_id);
+			icmp_length = 22;
+		}
+
+		int ret = icmp_echo_req(fd, &addr, data, icmp_length);
+		if (ret == icmp_length)
+		{
+			ret = icmp_echo_rep(fd, &addr, (u32)timeout, icmp_length);
+		}
+
+		// TODO proper error codes
+		ReturnValue = 0;
+		break;
+	}
+	default:
+		INFO_LOG(WII_IPC_NET,"0x%x (BufferIn: (%08x, %i), BufferIn2: (%08x, %i)",
+			CommandBuffer.Parameter, _BufferIn, BufferInSize, _BufferIn2, BufferInSize2);
+		for (u32 i = 0; i < CommandBuffer.NumberInBuffer; ++i)
+		{
+			ERROR_LOG(WII_IPC_NET, "in %i addr %x size %x", i,
+				CommandBuffer.InBuffer.at(i).m_Address, CommandBuffer.InBuffer.at(i).m_Size);
+			ERROR_LOG(WII_IPC_NET, "\n%s",
+				ArrayToString(
+				Memory::GetPointer(CommandBuffer.InBuffer.at(i).m_Address),
+				CommandBuffer.InBuffer.at(i).m_Size, 4).c_str()
+				);
+		}
+		for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; ++i)
+		{
+			ERROR_LOG(WII_IPC_NET, "out %i addr %x size %x", i,
+				CommandBuffer.PayloadBuffer.at(i).m_Address, CommandBuffer.PayloadBuffer.at(i).m_Size);
+		}
+		break;
+	}
+
+	Memory::Write_U32(ReturnValue, CommandAddress + 4);
+	return IPC_DEFAULT_REPLY;
+}
+u32 CWII_IPC_HLE_Device_net_ip_top::Update()
+{
+	WiiSockMan::GetInstance().Update();
+	return 0;
+}
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
new file mode 100644
index 0000000000..c1cecee67e
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -0,0 +1,740 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/Timer.h"
+
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#endif
+
+// data layout of the network configuration file (/shared2/sys/net/02/config.dat)
+// needed for /dev/net/ncd/manage
+#pragma pack(push, 1)
+struct netcfg_proxy_t
+{
+	u8 use_proxy;
+	u8 use_proxy_userandpass;
+	u8 padding_1[2];
+	u8 proxy_name[255];
+	u8 padding_2;
+	u16 proxy_port;        // 0-34463
+	u8 proxy_username[32];
+	u8 padding_3;
+	u8 proxy_password[32];
+};
+
+struct netcfg_connection_t
+{
+	enum
+	{
+		WIRED_IF            =   1, // 0: wifi 1: wired
+		DNS_DHCP            =   2, // 0: manual 1: DHCP
+		IP_DHCP             =   4, // 0: manual 1: DHCP
+		USE_PROXY           =  16,
+		CONNECTION_TEST_OK  =  32,
+		CONNECTION_SELECTED = 128
+	};
+
+	enum
+	{
+		OPEN     = 0,
+		WEP64    = 1,
+		WEP128   = 2,
+		WPA_TKIP = 4,
+		WPA2_AES = 5,
+		WPA_AES  = 6
+	};
+
+	enum status
+	{
+		LINK_BUSY      = 1,
+		LINK_NONE      = 2,
+		LINK_WIRED     = 3,
+		LINK_WIFI_DOWN = 4,
+		LINK_WIFI_UP   = 5
+	};
+
+	enum
+	{
+		PERM_NONE      = 0,
+		PERM_SEND_MAIL = 1,
+		PERM_RECV_MAIL = 2,
+		PERM_DOWNLOAD  = 4,
+		PERM_ALL       = PERM_SEND_MAIL | PERM_RECV_MAIL | PERM_DOWNLOAD
+	};
+
+	// settings common to both wired and wireless connections
+	u8 flags;
+	u8 padding_1[3];
+	u8 ip[4];
+	u8 netmask[4];
+	u8 gateway[4];
+	u8 dns1[4];
+	u8 dns2[4];
+	u8 padding_2[2];
+	u16 mtu;
+	u8 padding_3[8];
+	netcfg_proxy_t proxy_settings;
+	u8 padding_4;
+	netcfg_proxy_t proxy_settings_copy;
+	u8 padding_5[1297];
+
+	// wireless specific settings
+	u8 ssid[32];
+	u8 padding_6;
+	u8 ssid_length;     // length of ssid in bytes.
+	u8 padding_7[3];
+	u8 encryption;
+	u8 padding_8[3];
+	u8 key_length;      // length of key in bytes.  0x00 for WEP64 and WEP128.
+	u8 unknown;         // 0x00 or 0x01 toggled with a WPA-PSK (TKIP) and with a WEP entered with hex instead of ascii.
+	u8 padding_9;
+	u8 key[64];         // encryption key; for WEP, key is stored 4 times (20 bytes for WEP64 and 52 bytes for WEP128) then padded with 0x00
+	u8 padding_10[236];
+};
+
+struct network_config_t
+{
+	enum
+	{
+		IF_NONE,
+		IF_WIFI,
+		IF_WIRED
+	};
+
+	u32 version;
+	u8 connType;
+	u8 linkTimeout;
+	u8 nwc24Permission;
+	u8 padding;
+
+	netcfg_connection_t connection[3];
+};
+
+enum nwc24_err_t
+{
+	WC24_OK                    =   0,
+	WC24_ERR_FATAL             =  -1,
+	WC24_ERR_ID_NONEXISTANCE   = -34,
+	WC24_ERR_ID_GENERATED      = -35,
+	WC24_ERR_ID_REGISTERED     = -36,
+	WC24_ERR_ID_NOT_REGISTERED = -44,
+};
+
+struct nwc24_config_t
+{
+	enum
+	{
+		NWC24_IDCS_INITIAL    = 0,
+		NWC24_IDCS_GENERATED  = 1,
+		NWC24_IDCS_REGISTERED = 2
+	};
+
+	enum
+	{
+		URL_COUNT           = 0x05,
+		MAX_URL_LENGTH      = 0x80,
+		MAX_EMAIL_LENGTH    = 0x40,
+		MAX_PASSWORD_LENGTH = 0x20,
+	};
+
+	u32 magic;      /* 'WcCf' 0x57634366 */
+	u32 _unk_04;    /* must be 8 */
+	u64 nwc24_id;
+	u32 id_generation;
+	u32 creation_stage; /* 0==not_generated;1==generated;2==registered; */
+	char email[MAX_EMAIL_LENGTH];
+	char paswd[MAX_PASSWORD_LENGTH];
+	char mlchkid[0x24];
+	char http_urls[URL_COUNT][MAX_URL_LENGTH];
+	u8 reserved[0xDC];
+	u32 enable_booting;
+	u32 checksum;
+};
+
+#pragma pack(pop)
+
+
+
+class NWC24Config
+{
+private:
+	std::string path;
+	nwc24_config_t config;
+
+public:
+	NWC24Config()
+	{
+		path = File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/" WII_WC24CONF_DIR "/nwc24msg.cfg";
+		ReadConfig();
+	}
+
+	void ResetConfig()
+	{
+		if (File::Exists(path))
+			File::Delete(path);
+
+		const char* urls[5] = {
+			"https://amw.wc24.wii.com/cgi-bin/account.cgi",
+			"http://rcw.wc24.wii.com/cgi-bin/check.cgi",
+			"http://mtw.wc24.wii.com/cgi-bin/receive.cgi",
+			"http://mtw.wc24.wii.com/cgi-bin/delete.cgi",
+			"http://mtw.wc24.wii.com/cgi-bin/send.cgi",
+		};
+
+		memset(&config, 0, sizeof(config));
+
+		SetMagic(0x57634366);
+		SetUnk(8);
+		SetCreationStage(nwc24_config_t::NWC24_IDCS_INITIAL);
+		SetEnableBooting(0);
+		SetEmail("@wii.com");
+
+		for (int i = 0; i < nwc24_config_t::URL_COUNT; ++i)
+		{
+			strncpy(config.http_urls[i], urls[i], nwc24_config_t::MAX_URL_LENGTH);
+		}
+
+		SetChecksum(CalculateNwc24ConfigChecksum());
+
+		WriteConfig();
+	}
+
+	void WriteConfig()
+	{
+		if (!File::Exists(path))
+		{
+			if (!File::CreateFullPath(File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/" WII_WC24CONF_DIR))
+			{
+				ERROR_LOG(WII_IPC_WC24, "Failed to create directory for WC24");
+			}
+		}
+
+		File::IOFile(path, "wb").WriteBytes((void*)&config, sizeof(config));
+	}
+
+
+	void ReadConfig()
+	{
+		if (File::Exists(path))
+		{
+			if (!File::IOFile(path, "rb").ReadBytes((void*)&config, sizeof(config)))
+				ResetConfig();
+			else
+			{
+				s32 config_error = CheckNwc24Config();
+				if (config_error)
+					ERROR_LOG(WII_IPC_WC24, "There is an error in the config for for WC24: %d", config_error);
+			}
+		}
+		else
+		{
+			ResetConfig();
+		}
+	}
+
+	u32 CalculateNwc24ConfigChecksum()
+	{
+		u32* ptr = (u32*)&config;
+		u32 sum = 0;
+		for (int i = 0; i < 0xFF; ++i)
+		{
+			sum += Common::swap32(*ptr++);
+		}
+		return sum;
+	}
+
+	s32 CheckNwc24Config()
+	{
+		if (Magic() != 0x57634366) /* 'WcCf' magic */
+		{
+			ERROR_LOG(WII_IPC_WC24, "Magic mismatch");
+			return -14;
+		}
+		u32 checksum = CalculateNwc24ConfigChecksum();
+		DEBUG_LOG(WII_IPC_WC24, "Checksum: %X", checksum);
+		if (Checksum() != checksum)
+		{
+			ERROR_LOG(WII_IPC_WC24, "Checksum mismatch expected %X and got %X", checksum, Checksum());
+			return -14;
+		}
+		if (IdGen() > 0x1F)
+		{
+			ERROR_LOG(WII_IPC_WC24, "Id gen error");
+			return -14;
+		}
+		if (Unk() != 8)
+			return -27;
+
+		return 0;
+	}
+
+	u32 Magic() const { return Common::swap32(config.magic); }
+	void SetMagic(u32 magic) { config.magic = Common::swap32(magic); }
+
+	u32 Unk() const { return Common::swap32(config._unk_04); }
+	void SetUnk(u32 _unk_04) { config._unk_04 = Common::swap32(_unk_04); }
+
+	u32 IdGen() const { return Common::swap32(config.id_generation); }
+	void SetIdGen(u32 id_generation) { config.id_generation = Common::swap32(id_generation); }
+
+	void IncrementIdGen()
+	{
+		u32 id_ctr = IdGen();
+		id_ctr++;
+		id_ctr &= 0x1F;
+		SetIdGen(id_ctr);
+	}
+
+	u32 Checksum() const { return Common::swap32(config.checksum); }
+	void SetChecksum(u32 checksum) { config.checksum = Common::swap32(checksum); }
+
+	u32 CreationStage() const { return Common::swap32(config.creation_stage); }
+	void SetCreationStage(u32 creation_stage) { config.creation_stage = Common::swap32(creation_stage); }
+
+	u32 EnableBooting() const { return Common::swap32(config.enable_booting); }
+	void SetEnableBooting(u32 enable_booting) { config.enable_booting = Common::swap32(enable_booting); }
+
+	u64 Id() const { return Common::swap64(config.nwc24_id); }
+	void SetId(u64 nwc24_id) { config.nwc24_id = Common::swap64(nwc24_id); }
+
+	const char* Email() const { return config.email; }
+	void SetEmail(const char* email)
+	{
+		strncpy(config.email, email, nwc24_config_t::MAX_EMAIL_LENGTH);
+		config.email[nwc24_config_t::MAX_EMAIL_LENGTH-1] = '\0';
+	}
+
+};
+
+class WiiNetConfig
+{
+	std::string path;
+	network_config_t config;
+
+public:
+	WiiNetConfig()
+	{
+		path = File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/" WII_SYSCONF_DIR "/net/02/config.dat";
+		ReadConfig();
+	}
+
+	void ResetConfig()
+	{
+		if (File::Exists(path))
+			File::Delete(path);
+
+		memset(&config, 0, sizeof(config));
+		config.connType = network_config_t::IF_WIRED;
+		config.connection[0].flags =
+			netcfg_connection_t::WIRED_IF |
+			netcfg_connection_t::DNS_DHCP |
+			netcfg_connection_t::IP_DHCP |
+			netcfg_connection_t::CONNECTION_TEST_OK |
+			netcfg_connection_t::CONNECTION_SELECTED;
+
+		WriteConfig();
+	}
+
+	void WriteConfig()
+	{
+		if (!File::Exists(path))
+		{
+			if (!File::CreateFullPath(std::string(File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/" WII_SYSCONF_DIR "/net/02/")))
+			{
+				ERROR_LOG(WII_IPC_NET, "Failed to create directory for network config file");
+			}
+		}
+
+		File::IOFile(path, "wb").WriteBytes((void*)&config, sizeof(config));
+	}
+
+	void WriteToMem(const u32 address)
+	{
+		Memory::CopyToEmu(address, &config, sizeof(config));
+	}
+
+	void ReadFromMem(const u32 address)
+	{
+		Memory::CopyFromEmu(&config, address, sizeof(config));
+	}
+
+	void ReadConfig()
+	{
+		if (File::Exists(path))
+		{
+			if (!File::IOFile(path, "rb").ReadBytes((void*)&config, sizeof(config)))
+				ResetConfig();
+		}
+		else
+		{
+			ResetConfig();
+		}
+	}
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+// KD is the IOS module responsible for implementing WiiConnect24 functionality.
+// It can perform HTTPS downloads, send and receive mail via SMTP, and execute a
+// JavaScript-like language while the Wii is in standby mode.
+class CWII_IPC_HLE_Device_net_kd_request : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_net_kd_request();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+
+private:
+	enum
+	{
+		IOCTL_NWC24_SUSPEND_SCHEDULAR               = 0x01,
+		IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR      = 0x02,
+		IOCTL_NWC24_EXEC_RESUME_SCHEDULAR           = 0x03,
+		IOCTL_NWC24_KD_GET_TIME_TRIGGERS            = 0x04,
+		IOCTL_NWC24_SET_SCHEDULE_SPAN               = 0x05,
+		IOCTL_NWC24_STARTUP_SOCKET                  = 0x06,
+		IOCTL_NWC24_CLEANUP_SOCKET                  = 0x07,
+		IOCTL_NWC24_LOCK_SOCKET                     = 0x08,
+		IOCTL_NWC24_UNLOCK_SOCKET                   = 0x09,
+		IOCTL_NWC24_CHECK_MAIL_NOW                  = 0x0A,
+		IOCTL_NWC24_SEND_MAIL_NOW                   = 0x0B,
+		IOCTL_NWC24_RECEIVE_MAIL_NOW                = 0x0C,
+		IOCTL_NWC24_SAVE_MAIL_NOW                   = 0x0D,
+		IOCTL_NWC24_DOWNLOAD_NOW_EX                 = 0x0E,
+		IOCTL_NWC24_REQUEST_GENERATED_USER_ID       = 0x0F,
+		IOCTL_NWC24_REQUEST_REGISTER_USER_ID        = 0x10,
+		IOCTL_NWC24_GET_SCHEDULAR_STAT              = 0x1E,
+		IOCTL_NWC24_SET_FILTER_MODE                 = 0x1F,
+		IOCTL_NWC24_SET_DEBUG_MODE                  = 0x20,
+		IOCTL_NWC24_KD_SET_NEXT_WAKEUP              = 0x21,
+		IOCTL_NWC24_SET_SCRIPT_MODE                 = 0x22,
+		IOCTL_NWC24_REQUEST_SHUTDOWN                = 0x28,
+	};
+
+	enum
+	{
+		MODEL_RVT = 0,
+		MODEL_RVV = 0,
+		MODEL_RVL = 1,
+		MODEL_RVD = 2,
+		MODEL_ELSE = 7
+	};
+
+	u8 GetAreaCode(const std::string& area) const;
+	u8 GetHardwareModel(const std::string& model) const;
+
+	s32 NWC24MakeUserID(u64* nwc24_id, u32 hollywood_id, u16 id_ctr, u8 hardware_model, u8 area_code);
+
+	NWC24Config config;
+};
+
+
+//////////////////////////////////////////////////////////////////////////
+class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_net_kd_time(u32 _DeviceID, const std::string& _rDeviceName)
+		: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+		, rtc()
+		, utcdiff()
+	{
+	}
+
+	virtual ~CWII_IPC_HLE_Device_net_kd_time()
+	{}
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	{
+		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
+		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	{
+		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
+		if (!_bForce)
+			Memory::Write_U32(0, _CommandAddress + 4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	{
+		u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
+		u32 BufferIn  = Memory::Read_U32(_CommandAddress + 0x10);
+		u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
+
+		u32 result = 0;
+		u32 common_result = 0;
+		// TODO Writes stuff to /shared2/nwc24/misc.bin
+		//u32 update_misc = 0;
+
+		switch (Parameter)
+		{
+		case IOCTL_NW24_GET_UNIVERSAL_TIME:
+			Memory::Write_U64(GetAdjustedUTC(), BufferOut + 4);
+			break;
+
+		case IOCTL_NW24_SET_UNIVERSAL_TIME:
+			SetAdjustedUTC(Memory::Read_U64(BufferIn));
+			//update_misc = Memory::Read_U32(BufferIn + 8);
+			break;
+
+		case IOCTL_NW24_SET_RTC_COUNTER:
+			rtc = Memory::Read_U32(BufferIn);
+			//update_misc = Memory::Read_U32(BufferIn + 4);
+			break;
+
+		case IOCTL_NW24_GET_TIME_DIFF:
+			Memory::Write_U64(GetAdjustedUTC() - rtc, BufferOut + 4);
+			break;
+
+		case IOCTL_NW24_UNIMPLEMENTED:
+			result = -9;
+			break;
+
+		default:
+			ERROR_LOG(WII_IPC_NET, "%s - unknown IOCtl: %x\n", GetDeviceName().c_str(), Parameter);
+			break;
+		}
+
+		// write return values
+		Memory::Write_U32(common_result, BufferOut);
+		Memory::Write_U32(result, _CommandAddress + 4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+private:
+	enum
+	{
+		IOCTL_NW24_GET_UNIVERSAL_TIME = 0x14,
+		IOCTL_NW24_SET_UNIVERSAL_TIME = 0x15,
+		IOCTL_NW24_UNIMPLEMENTED      = 0x16,
+		IOCTL_NW24_SET_RTC_COUNTER    = 0x17,
+		IOCTL_NW24_GET_TIME_DIFF      = 0x18,
+	};
+
+	u64 rtc;
+	s64 utcdiff;
+
+	// TODO: depending on CEXIIPL is a hack which I don't feel like removing
+	// because the function itself is pretty hackish; wait until I re-port my
+	// netplay rewrite; also, is that random 16:00:38 actually meaningful?
+	// seems very very doubtful since Wii was released in 2006
+
+	// Seconds between 1.1.2000 and 4.1.2008 16:00:38
+	static const u64 wii_bias = 0x477E5826 - 0x386D4380;
+
+	// Returns seconds since Wii epoch
+	// +/- any bias set from IOCTL_NW24_SET_UNIVERSAL_TIME
+	u64 GetAdjustedUTC() const
+	{
+		return CEXIIPL::GetGCTime() - wii_bias + utcdiff;
+	}
+
+	// Store the difference between what the Wii thinks is UTC and
+	// what the host OS thinks
+	void SetAdjustedUTC(u64 wii_utc)
+	{
+		utcdiff = CEXIIPL::GetGCTime() - wii_bias - wii_utc;
+	}
+};
+
+enum NET_IOCTL
+{
+	IOCTL_SO_ACCEPT = 1,
+	IOCTL_SO_BIND,
+	IOCTL_SO_CLOSE,
+	IOCTL_SO_CONNECT,
+	IOCTL_SO_FCNTL,
+	IOCTL_SO_GETPEERNAME,
+	IOCTL_SO_GETSOCKNAME,
+	IOCTL_SO_GETSOCKOPT,
+	IOCTL_SO_SETSOCKOPT,
+	IOCTL_SO_LISTEN,
+	IOCTL_SO_POLL,
+	IOCTLV_SO_RECVFROM,
+	IOCTLV_SO_SENDTO,
+	IOCTL_SO_SHUTDOWN,
+	IOCTL_SO_SOCKET,
+	IOCTL_SO_GETHOSTID,
+	IOCTL_SO_GETHOSTBYNAME,
+	IOCTL_SO_GETHOSTBYADDR,
+	IOCTLV_SO_GETNAMEINFO,
+	IOCTL_SO_UNK14,
+	IOCTL_SO_INETATON,
+	IOCTL_SO_INETPTON,
+	IOCTL_SO_INETNTOP,
+	IOCTLV_SO_GETADDRINFO,
+	IOCTL_SO_SOCKATMARK,
+	IOCTLV_SO_UNK1A,
+	IOCTLV_SO_UNK1B,
+	IOCTLV_SO_GETINTERFACEOPT,
+	IOCTLV_SO_SETINTERFACEOPT,
+	IOCTL_SO_SETINTERFACE,
+	IOCTL_SO_STARTUP,
+	IOCTL_SO_ICMPSOCKET = 0x30,
+	IOCTLV_SO_ICMPPING,
+	IOCTL_SO_ICMPCANCEL,
+	IOCTL_SO_ICMPCLOSE
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CWII_IPC_HLE_Device_net_ip_top : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_net_ip_top(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_net_ip_top();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+	virtual u32 Update() override;
+
+private:
+#ifdef _WIN32
+	WSADATA InitData;
+#endif
+	u32 ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize);
+	u32 ExecuteCommandV(SIOCtlVBuffer& CommandBuffer);
+};
+
+// **********************************************************************************
+// Interface for reading and changing network configuration (probably some other stuff as well)
+class CWII_IPC_HLE_Device_net_ncd_manage : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_net_ncd_manage(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_net_ncd_manage();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+private:
+	enum
+	{
+		IOCTLV_NCD_LOCKWIRELESSDRIVER    = 0x1,  // NCDLockWirelessDriver
+		IOCTLV_NCD_UNLOCKWIRELESSDRIVER  = 0x2,  // NCDUnlockWirelessDriver
+		IOCTLV_NCD_GETCONFIG             = 0x3,  // NCDiGetConfig
+		IOCTLV_NCD_SETCONFIG             = 0x4,  // NCDiSetConfig
+		IOCTLV_NCD_READCONFIG            = 0x5,
+		IOCTLV_NCD_WRITECONFIG           = 0x6,
+		IOCTLV_NCD_GETLINKSTATUS         = 0x7,  // NCDGetLinkStatus
+		IOCTLV_NCD_GETWIRELESSMACADDRESS = 0x8,  // NCDGetWirelessMacAddress
+	};
+
+	WiiNetConfig config;
+};
+
+//////////////////////////////////////////////////////////////////////////
+class CWII_IPC_HLE_Device_net_wd_command : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_net_wd_command(u32 DeviceID, const std::string& DeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_net_wd_command();
+
+	virtual IPCCommandResult Open(u32 CommandAddress, u32 Mode) override;
+	virtual IPCCommandResult Close(u32 CommandAddress, bool Force) override;
+	virtual IPCCommandResult IOCtlV(u32 CommandAddress) override;
+
+private:
+	enum
+	{
+		IOCTLV_WD_GET_MODE          = 0x1001, // WD_GetMode
+		IOCTLV_WD_SET_LINKSTATE     = 0x1002, // WD_SetLinkState
+		IOCTLV_WD_GET_LINKSTATE     = 0x1003, // WD_GetLinkState
+		IOCTLV_WD_SET_CONFIG        = 0x1004, // WD_SetConfig
+		IOCTLV_WD_GET_CONFIG        = 0x1005, // WD_GetConfig
+		IOCTLV_WD_CHANGE_BEACON     = 0x1006, // WD_ChangeBeacon
+		IOCTLV_WD_DISASSOC          = 0x1007, // WD_DisAssoc
+		IOCTLV_WD_MP_SEND_FRAME     = 0x1008, // WD_MpSendFrame
+		IOCTLV_WD_SEND_FRAME        = 0x1009, // WD_SendFrame
+		IOCTLV_WD_SCAN              = 0x100a, // WD_Scan
+		IOCTLV_WD_CALL_WL           = 0x100c, // WD_CallWL
+		IOCTLV_WD_MEASURE_CHANNEL   = 0x100b, // WD_MeasureChannel
+		IOCTLV_WD_GET_LASTERROR     = 0x100d, // WD_GetLastError
+		IOCTLV_WD_GET_INFO          = 0x100e, // WD_GetInfo
+		IOCTLV_WD_CHANGE_GAMEINFO   = 0x100f, // WD_ChangeGameInfo
+		IOCTLV_WD_CHANGE_VTSF       = 0x1010, // WD_ChangeVTSF
+		IOCTLV_WD_RECV_FRAME        = 0x8000, // WD_ReceiveFrame
+		IOCTLV_WD_RECV_NOTIFICATION = 0x8001  // WD_ReceiveNotification
+	};
+
+	enum
+	{
+		BSSID_SIZE = 6,
+		SSID_SIZE = 32
+	};
+
+	enum
+	{
+		SCAN_ACTIVE,
+		SCAN_PASSIVE
+	};
+
+#pragma pack(push, 1)
+	struct ScanInfo
+	{
+		u16 channel_bitmap;
+		u16 max_channel_time;
+		u8 bssid[BSSID_SIZE];
+		u16 scan_type;
+		u16 ssid_length;
+		u8 ssid[SSID_SIZE];
+		u8 ssid_match_mask[SSID_SIZE];
+	};
+
+	struct BSSInfo
+	{
+		u16 length;
+		u16 rssi;
+		u8 bssid[BSSID_SIZE];
+		u16 ssid_length;
+		u8 ssid[SSID_SIZE];
+		u16 capabilities;
+		struct rate
+		{
+			u16 basic;
+			u16 support;
+		};
+		u16 beacon_period;
+		u16 DTIM_period;
+		u16 channel;
+		u16 CF_period;
+		u16 CF_max_duration;
+		u16 element_info_length;
+		u16 element_info[1];
+	};
+
+	struct Info
+	{
+		u8 mac[6];
+		u16 ntr_allowed_channels;
+		u16 unk8;
+		char country[2];
+		u32 unkc;
+		char wlversion[0x50];
+		u8 unk[0x30];
+	};
+#pragma pack(pop)
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
new file mode 100644
index 0000000000..03c50a97ce
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
@@ -0,0 +1,520 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Core/Core.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
+#include "Core/IPC_HLE/WII_Socket.h"
+
+WII_SSL CWII_IPC_HLE_Device_net_ssl::_SSL[NET_SSL_MAXINSTANCES];
+
+CWII_IPC_HLE_Device_net_ssl::CWII_IPC_HLE_Device_net_ssl(u32 _DeviceID, const std::string& _rDeviceName)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+{
+	for (WII_SSL& ssl : _SSL)
+	{
+		ssl.active = false;
+	}
+}
+
+CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_HLE_Device_net_ssl()
+{
+	// Cleanup sessions
+	for (WII_SSL& ssl : _SSL)
+	{
+		if (ssl.active)
+		{
+			ssl_close_notify(&ssl.ctx);
+			ssl_session_free(&ssl.session);
+			ssl_free(&ssl.ctx);
+
+			x509_crt_free(&ssl.cacert);
+			x509_crt_free(&ssl.clicert);
+
+			ssl.hostname.clear();
+
+			ssl.active = false;
+		}
+	}
+}
+
+int CWII_IPC_HLE_Device_net_ssl::GetSSLFreeID() const
+{
+	for (int i = 0; i < NET_SSL_MAXINSTANCES; i++)
+	{
+		if (!_SSL[i].active)
+		{
+			return i + 1;
+		}
+	}
+	return 0;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ssl::Open(u32 _CommandAddress, u32 _Mode)
+{
+	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
+	m_Active = true;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ssl::Close(u32 _CommandAddress, bool _bForce)
+{
+	if (!_bForce)
+	{
+		Memory::Write_U32(0, _CommandAddress + 4);
+	}
+	m_Active = false;
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ssl::IOCtl(u32 _CommandAddress)
+{
+	u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+	u32 Command       = Memory::Read_U32(_CommandAddress + 0x0C);
+
+	INFO_LOG(WII_IPC_SSL, "%s unknown %i "
+	         "(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+	         GetDeviceName().c_str(), Command,
+	         BufferIn, BufferInSize, BufferOut, BufferOutSize);
+	Memory::Write_U32(0, _CommandAddress + 0x4);
+	return IPC_DEFAULT_REPLY;
+}
+
+IPCCommandResult CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
+{
+	SIOCtlVBuffer CommandBuffer(_CommandAddress);
+
+	u32 _BufferIn = 0, _BufferIn2 = 0, _BufferIn3 = 0;
+	u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0;
+
+	u32 BufferOut = 0, BufferOut2 = 0, BufferOut3 = 0;
+	u32 BufferOutSize = 0, BufferOutSize2 = 0, BufferOutSize3 = 0;
+
+	if (CommandBuffer.InBuffer.size() > 0)
+	{
+		_BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
+		BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
+	}
+	if (CommandBuffer.InBuffer.size() > 1)
+	{
+		_BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
+		BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
+	}
+	if (CommandBuffer.InBuffer.size() > 2)
+	{
+		_BufferIn3 = CommandBuffer.InBuffer.at(2).m_Address;
+		BufferInSize3 = CommandBuffer.InBuffer.at(2).m_Size;
+	}
+
+	if (CommandBuffer.PayloadBuffer.size() > 0)
+	{
+		BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
+		BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
+	}
+	if (CommandBuffer.PayloadBuffer.size() > 1)
+	{
+		BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
+		BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size;
+	}
+	if (CommandBuffer.PayloadBuffer.size() > 2)
+	{
+		BufferOut3 = CommandBuffer.PayloadBuffer.at(2).m_Address;
+		BufferOutSize3 = CommandBuffer.PayloadBuffer.at(2).m_Size;
+	}
+
+	// I don't trust SSL to be deterministic, and this is never going to sync
+	// as such (as opposed to forwarding IPC results or whatever), so -
+	if (Core::g_want_determinism)
+	{
+		Memory::Write_U32(-1, _CommandAddress + 0x4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+	switch (CommandBuffer.Parameter)
+	{
+	case IOCTLV_NET_SSL_NEW:
+	{
+		int verifyOption = Memory::Read_U32(BufferOut);
+		std::string hostname = Memory::GetString(BufferOut2, BufferOutSize2);
+
+		int freeSSL = GetSSLFreeID();
+		if (freeSSL)
+		{
+			int sslID = freeSSL - 1;
+			WII_SSL* ssl = &_SSL[sslID];
+			int ret = ssl_init(&ssl->ctx);
+			if (ret)
+			{
+				goto _SSL_NEW_ERROR;
+			}
+
+			entropy_init(&ssl->entropy);
+			const char* pers = "dolphin-emu";
+			ret = ctr_drbg_init(&ssl->ctr_drbg, entropy_func,
+			                    &ssl->entropy,
+			                    (const unsigned char*)pers,
+			                    strlen(pers));
+			if (ret)
+			{
+				ssl_free(&ssl->ctx);
+				entropy_free(&ssl->entropy);
+				goto _SSL_NEW_ERROR;
+			}
+
+			ssl_set_rng(&ssl->ctx, ctr_drbg_random, &ssl->ctr_drbg);
+
+			// For some reason we can't use TLSv1.2, v1.1 and below are fine!
+			ssl_set_max_version(&ssl->ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
+
+			ssl_set_session(&ssl->ctx, &ssl->session);
+
+			ssl_set_endpoint(&ssl->ctx, SSL_IS_CLIENT);
+			ssl_set_authmode(&ssl->ctx, SSL_VERIFY_NONE);
+			ssl_set_renegotiation(&ssl->ctx, SSL_RENEGOTIATION_ENABLED);
+
+			ssl->hostname = hostname;
+			ssl_set_hostname(&ssl->ctx, ssl->hostname.c_str());
+
+			ssl->active = true;
+			Memory::Write_U32(freeSSL, _BufferIn);
+		}
+		else
+		{
+_SSL_NEW_ERROR:
+			Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
+		}
+
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_NEW (%d, %s) "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			verifyOption, hostname.c_str(),
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_SHUTDOWN:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+			ssl_close_notify(&ssl->ctx);
+			ssl_session_free(&ssl->session);
+			ssl_free(&ssl->ctx);
+
+			entropy_free(&ssl->entropy);
+
+			x509_crt_free(&ssl->cacert);
+			x509_crt_free(&ssl->clicert);
+
+			ssl->hostname.clear();
+
+			ssl->active = false;
+
+			Memory::Write_U32(SSL_OK, _BufferIn);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SHUTDOWN "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_SETROOTCA:
+	{
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCA "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+
+
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+			int ret = x509_crt_parse_der(
+				&ssl->cacert,
+				Memory::GetPointer(BufferOut2),
+				BufferOutSize2);
+
+			if (ret)
+			{
+				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
+			}
+			else
+			{
+				ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname.c_str());
+				Memory::Write_U32(SSL_OK, _BufferIn);
+			}
+
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCA = %d", ret);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		break;
+	}
+	case IOCTLV_NET_SSL_SETBUILTINCLIENTCERT:
+	{
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+			std::string cert_base_path = File::GetUserPath(D_SESSION_WIIROOT_IDX);
+			int ret = x509_crt_parse_file(&ssl->clicert, (cert_base_path + "clientca.pem").c_str());
+			int pk_ret = pk_parse_keyfile(&ssl->pk, (cert_base_path + "clientcakey.pem").c_str(), nullptr);
+			if (ret || pk_ret)
+			{
+				x509_crt_free(&ssl->clicert);
+				pk_free(&ssl->pk);
+				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
+			}
+			else
+			{
+				ssl_set_own_cert(&ssl->ctx, &ssl->clicert, &ssl->pk);
+				Memory::Write_U32(SSL_OK, _BufferIn);
+			}
+
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, pk_ret);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT invalid sslID = %d", sslID);
+		}
+		break;
+	}
+	case IOCTLV_NET_SSL_REMOVECLIENTCERT:
+	{
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_REMOVECLIENTCERT "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+			x509_crt_free(&ssl->clicert);
+			pk_free(&ssl->pk);
+
+			ssl_set_own_cert(&ssl->ctx, nullptr, nullptr);
+			Memory::Write_U32(SSL_OK, _BufferIn);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT invalid sslID = %d", sslID);
+		}
+		break;
+	}
+	case IOCTLV_NET_SSL_SETBUILTINROOTCA:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+
+			int ret = x509_crt_parse_file(&ssl->cacert, (File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/rootca.pem").c_str());
+			if (ret)
+			{
+				x509_crt_free(&ssl->clicert);
+				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
+			}
+			else
+			{
+				ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname.c_str());
+				Memory::Write_U32(SSL_OK, _BufferIn);
+			}
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA = %d", ret);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_CONNECT:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WII_SSL* ssl = &_SSL[sslID];
+			ssl->sockfd = Memory::Read_U32(BufferOut2);
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT socket = %d", ssl->sockfd);
+			ssl_set_bio(&ssl->ctx, net_recv, &ssl->sockfd, net_send, &ssl->sockfd);
+			Memory::Write_U32(SSL_OK, _BufferIn);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_DOHANDSHAKE:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WiiSockMan &sm = WiiSockMan::GetInstance();
+			sm.DoSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_DOHANDSHAKE);
+			return IPC_NO_REPLY;
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		break;
+	}
+	case IOCTLV_NET_SSL_WRITE:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WiiSockMan &sm = WiiSockMan::GetInstance();
+			sm.DoSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_WRITE);
+			return IPC_NO_REPLY;
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_WRITE "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		INFO_LOG(WII_IPC_SSL, "%s", Memory::GetString(BufferOut2).c_str());
+		break;
+	}
+	case IOCTLV_NET_SSL_READ:
+	{
+
+		int ret = 0;
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			WiiSockMan &sm = WiiSockMan::GetInstance();
+			sm.DoSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_READ);
+			return IPC_NO_REPLY;
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_READ(%d)"
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			ret,
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_SETROOTCADEFAULT:
+	{
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			Memory::Write_U32(SSL_OK, _BufferIn);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCADEFAULT "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+	case IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT:
+	{
+		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+
+		int sslID = Memory::Read_U32(BufferOut) - 1;
+		if (SSLID_VALID(sslID))
+		{
+			Memory::Write_U32(SSL_OK, _BufferIn);
+		}
+		else
+		{
+			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
+		}
+		break;
+	}
+	default:
+		ERROR_LOG(WII_IPC_SSL, "%i "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
+			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
+			CommandBuffer.Parameter,
+			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
+			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
+			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
+		break;
+	}
+
+	// SSL return codes are written to BufferIn
+	Memory::Write_U32(0, _CommandAddress+4);
+
+	return IPC_DEFAULT_REPLY;
+}
+
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
new file mode 100644
index 0000000000..b6ab53c960
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
@@ -0,0 +1,88 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/entropy.h>
+#include <polarssl/net.h>
+#include <polarssl/ssl.h>
+
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+#define NET_SSL_MAXINSTANCES 4
+
+#define SSLID_VALID(x) (x >= 0 && x < NET_SSL_MAXINSTANCES && CWII_IPC_HLE_Device_net_ssl::_SSL[x].active)
+
+enum ssl_err_t
+{
+	SSL_OK              =   0,
+	SSL_ERR_FAILED      =  -1,
+	SSL_ERR_RAGAIN      =  -2,
+	SSL_ERR_WAGAIN      =  -3,
+	SSL_ERR_SYSCALL     =  -5,
+	SSL_ERR_ZERO        =  -6,  // read or write returned 0
+	SSL_ERR_CAGAIN      =  -7,  // BIO not connected
+	SSL_ERR_ID          =  -8,  // invalid SSL id
+	SSL_ERR_VCOMMONNAME =  -9,  // verify failed: common name
+	SSL_ERR_VROOTCA     =  -10, // verify failed: root ca
+	SSL_ERR_VCHAIN      =  -11, // verify failed: certificate chain
+	SSL_ERR_VDATE       =  -12, // verify failed: date invalid
+	SSL_ERR_SERVER_CERT =  -13, // certificate cert invalid
+};
+
+enum SSL_IOCTL
+{
+	IOCTLV_NET_SSL_NEW                         = 0x01,
+	IOCTLV_NET_SSL_CONNECT                     = 0x02,
+	IOCTLV_NET_SSL_DOHANDSHAKE                 = 0x03,
+	IOCTLV_NET_SSL_READ                        = 0x04,
+	IOCTLV_NET_SSL_WRITE                       = 0x05,
+	IOCTLV_NET_SSL_SHUTDOWN                    = 0x06,
+	IOCTLV_NET_SSL_SETCLIENTCERT               = 0x07,
+	IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT        = 0x08,
+	IOCTLV_NET_SSL_REMOVECLIENTCERT            = 0x09,
+	IOCTLV_NET_SSL_SETROOTCA                   = 0x0A,
+	IOCTLV_NET_SSL_SETROOTCADEFAULT            = 0x0B,
+	IOCTLV_NET_SSL_DOHANDSHAKEEX               = 0x0C,
+	IOCTLV_NET_SSL_SETBUILTINROOTCA            = 0x0D,
+	IOCTLV_NET_SSL_SETBUILTINCLIENTCERT        = 0x0E,
+	IOCTLV_NET_SSL_DISABLEVERIFYOPTIONFORDEBUG = 0x0F,
+	IOCTLV_NET_SSL_DEBUGGETVERSION             = 0x14,
+	IOCTLV_NET_SSL_DEBUGGETTIME                = 0x15,
+};
+
+struct WII_SSL
+{
+	ssl_context ctx;
+	ssl_session session;
+	entropy_context entropy;
+	ctr_drbg_context ctr_drbg;
+	x509_crt cacert;
+	x509_crt clicert;
+	pk_context pk;
+	int sockfd;
+	std::string hostname;
+	bool active;
+};
+
+class CWII_IPC_HLE_Device_net_ssl : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_net_ssl(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual ~CWII_IPC_HLE_Device_net_ssl();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+	int GetSSLFreeID() const;
+
+	static WII_SSL _SSL[NET_SSL_MAXINSTANCES];
+};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
similarity index 77%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
index c422bd7960..b4e3f149db 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
@@ -1,25 +1,38 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "../ConfigManager.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/SDCardUtil.h"
 
-#include "SDCardUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h"
 
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device_sdio_slot0.h"
+void CWII_IPC_HLE_Device_sdio_slot0::EnqueueReply(u32 CommandAddress, u32 ReturnValue)
+{
+	// IOS seems to write back the command that was responded to, this class does not
+	// overwrite the command so it is safe to read.
+	Memory::Write_U32(Memory::Read_U32(CommandAddress), CommandAddress + 8);
+	// The original hardware overwrites the command type with the async reply type.
+	Memory::Write_U32(IPC_REP_ASYNC, CommandAddress);
 
-#include "../HW/CPU.h"
-#include "../HW/Memmap.h"
-#include "../Core.h"
+	Memory::Write_U32(ReturnValue, CommandAddress + 4);
+
+	WII_IPC_HLE_Interface::EnqueueReply(CommandAddress);
+}
 
 CWII_IPC_HLE_Device_sdio_slot0::CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName)
 	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
 	, m_Status(CARD_NOT_EXIST)
 	, m_BlockLength(0)
 	, m_BusWidth(0)
-	, m_Card(NULL)
+	, m_Card(nullptr)
 {}
 
 void CWII_IPC_HLE_Device_sdio_slot0::DoState(PointerWrap& p)
@@ -40,8 +53,7 @@ void CWII_IPC_HLE_Device_sdio_slot0::EventNotify()
 	if ((SConfig::GetInstance().m_WiiSDCard && m_event.type == EVENT_INSERT) ||
 		(!SConfig::GetInstance().m_WiiSDCard && m_event.type == EVENT_REMOVE))
 	{
-		Memory::Write_U32(m_event.type, m_event.addr + 4);
-		WII_IPC_HLE_Interface::EnqReply(m_event.addr);
+		EnqueueReply(m_event.addr, m_event.type);
 		m_event.addr = 0;
 		m_event.type = EVENT_NONE;
 	}
@@ -49,12 +61,12 @@ void CWII_IPC_HLE_Device_sdio_slot0::EventNotify()
 
 void CWII_IPC_HLE_Device_sdio_slot0::OpenInternal()
 {
-	const std::string filename = File::GetUserPath(D_WIIUSER_IDX) + "sd.raw";
+	const std::string filename = File::GetUserPath(D_WIIROOT_IDX) + "/sd.raw";
 	m_Card.Open(filename, "r+b");
 	if (!m_Card)
 	{
 		WARN_LOG(WII_IPC_SD, "Failed to open SD Card image, trying to create a new 128MB image...");
-		if (SDCardCreate(128, filename.c_str()))
+		if (SDCardCreate(128, filename))
 		{
 			WARN_LOG(WII_IPC_SD, "Successfully created %s", filename.c_str());
 			m_Card.Open(filename, "r+b");
@@ -66,7 +78,7 @@ void CWII_IPC_HLE_Device_sdio_slot0::OpenInternal()
 	}
 }
 
-bool CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode)
+IPCCommandResult CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode)
 {
 	INFO_LOG(WII_IPC_SD, "Open");
 
@@ -75,10 +87,10 @@ bool CWII_IPC_HLE_Device_sdio_slot0::Open(u32 _CommandAddress, u32 _Mode)
 	Memory::Write_U32(GetDeviceID(), _CommandAddress + 0x4);
 	memset(m_Registers, 0, sizeof(m_Registers));
 	m_Active = true;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_sdio_slot0::Close(u32 _CommandAddress, bool _bForce)
+IPCCommandResult CWII_IPC_HLE_Device_sdio_slot0::Close(u32 _CommandAddress, bool _bForce)
 {
 	INFO_LOG(WII_IPC_SD, "Close");
 
@@ -89,25 +101,26 @@ bool CWII_IPC_HLE_Device_sdio_slot0::Close(u32 _CommandAddress, bool _bForce)
 	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 0x4);
 	m_Active = false;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 // The front SD slot
-bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress) 
+IPCCommandResult CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
 {
 	u32 Cmd = Memory::Read_U32(_CommandAddress + 0xC);
 
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-	
+	u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+	u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+	u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
 	// As a safety precaution we fill the out buffer with zeros to avoid
 	// returning nonsense values
 	Memory::Memset(BufferOut, 0, BufferOutSize);
-	
+
 	u32 ReturnValue = 0;
-	switch (Cmd) {
+	switch (Cmd)
+	{
 	case IOCTL_WRITEHCR:
 		{
 		u32 reg = Memory::Read_U32(BufferIn);
@@ -203,10 +216,10 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
 		break;
 	}
 
-// 	INFO_LOG(WII_IPC_SD, "InBuffer");
-// 	DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_SD);
-// 	INFO_LOG(WII_IPC_SD, "OutBuffer");
-// 	DumpCommands(BufferOut, BufferOutSize/4, LogTypes::WII_IPC_SD);
+	// INFO_LOG(WII_IPC_SD, "InBuffer");
+	// DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_SD);
+	// INFO_LOG(WII_IPC_SD, "OutBuffer");
+	// DumpCommands(BufferOut, BufferOutSize/4, LogTypes::WII_IPC_SD);
 
 	if (ReturnValue == RET_EVENT_REGISTER)
 	{
@@ -215,28 +228,27 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
 		Memory::Write_U32(0, _CommandAddress + 0x4);
 		// Check if the condition is already true
 		EventNotify();
-		return false;
+		return IPC_NO_REPLY;
 	}
 	else if (ReturnValue == RET_EVENT_UNREGISTER)
 	{
 		// release returns 0
 		// unknown sd int
 		// technically we do it out of order, oh well
-		Memory::Write_U32(EVENT_INVALID, m_event.addr + 4);
-		WII_IPC_HLE_Interface::EnqReply(m_event.addr);
+		EnqueueReply(m_event.addr, EVENT_INVALID);
 		m_event.addr = 0;
 		m_event.type = EVENT_NONE;
 		Memory::Write_U32(0, _CommandAddress + 0x4);
-		return true;
+		return IPC_DEFAULT_REPLY;
 	}
 	else
 	{
 		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-		return true;
+		return IPC_DEFAULT_REPLY;
 	}
 }
 
-bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
 {
 	// PPC sending commands
 
@@ -244,14 +256,15 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
 
 	// Prepare the out buffer(s) with zeros as a safety precaution
 	// to avoid returning bad values
-	for(u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
+	for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
 	{
 		Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
 			CommandBuffer.PayloadBuffer[i].m_Size);
 	}
 
 	u32 ReturnValue = 0;
-	switch(CommandBuffer.Parameter) {
+	switch (CommandBuffer.Parameter)
+	{
 	case IOCTLV_SENDCMD:
 		INFO_LOG(WII_IPC_SD, "IOCTLV_SENDCMD 0x%08x", Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address));
 		ReturnValue = ExecuteCommand(
@@ -269,16 +282,17 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
 
 	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
 
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize,
-												   u32 _rwBuffer, u32 _rwBufferSize,
-												   u32 _BufferOut, u32 _BufferOutSize)
+                                                   u32 _rwBuffer, u32 _rwBufferSize,
+                                                   u32 _BufferOut, u32 _BufferOutSize)
 {
 	// The game will send us a SendCMD with this information. To be able to read and write
 	// to a file we need to prepare a 0x10 byte output buffer as response.
-	struct Request {
+	struct Request
+	{
 		u32 command;
 		u32 type;
 		u32 resp;
@@ -291,14 +305,14 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 	} req;
 
 	req.command = Memory::Read_U32(_BufferIn + 0);
-	req.type	= Memory::Read_U32(_BufferIn + 4);
-	req.resp	= Memory::Read_U32(_BufferIn + 8);
-	req.arg		= Memory::Read_U32(_BufferIn + 12);
-	req.blocks	= Memory::Read_U32(_BufferIn + 16);
-	req.bsize	= Memory::Read_U32(_BufferIn + 20);
-	req.addr	= Memory::Read_U32(_BufferIn + 24);
-	req.isDMA	= Memory::Read_U32(_BufferIn + 28);
-	req.pad0	= Memory::Read_U32(_BufferIn + 32);
+	req.type    = Memory::Read_U32(_BufferIn + 4);
+	req.resp    = Memory::Read_U32(_BufferIn + 8);
+	req.arg     = Memory::Read_U32(_BufferIn + 12);
+	req.blocks  = Memory::Read_U32(_BufferIn + 16);
+	req.bsize   = Memory::Read_U32(_BufferIn + 20);
+	req.addr    = Memory::Read_U32(_BufferIn + 24);
+	req.isDMA   = Memory::Read_U32(_BufferIn + 28);
+	req.pad0    = Memory::Read_U32(_BufferIn + 32);
 
 	// Note: req.addr is the virtual address of _rwBuffer
 
@@ -332,7 +346,7 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 	case SEND_CSD:
 		DEBUG_LOG(WII_IPC_SD, "SEND_CSD");
 		// <WntrMute> shuffle2_, OCR: 0x80ff8000 CID: 0x38a00000 0x480032d5 0x3c608030 0x8803d420
-		//	CSD: 0xff928040 0xc93efbcf 0x325f5a83 0x00002600
+		// CSD: 0xff928040 0xc93efbcf 0x325f5a83 0x00002600
 
 		// Values used currently are from lpfaint99
 		Memory::Write_U32(0x80168000, _BufferOut);
@@ -386,16 +400,10 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 			if (!m_Card.Seek(req.arg, SEEK_SET))
 				ERROR_LOG(WII_IPC_SD, "Seek failed WTF");
 
-			u8* const buffer = new u8[size];
 
-			if (m_Card.ReadBytes(buffer, req.bsize * req.blocks))
+			if (m_Card.ReadBytes(Memory::GetPointer(req.addr), size))
 			{
-				u32 i;
-				for (i = 0; i < size; ++i)
-				{
-					Memory::Write_U8((u8)buffer[i], req.addr++);
-				}
-				DEBUG_LOG(WII_IPC_SD, "Outbuffer size %i got %i", _rwBufferSize, i);
+				DEBUG_LOG(WII_IPC_SD, "Outbuffer size %i got %i", _rwBufferSize, size);
 			}
 			else
 			{
@@ -403,8 +411,6 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 					ferror(m_Card.GetHandle()), feof(m_Card.GetHandle()));
 				ret = RET_FAIL;
 			}
-
-			delete[] buffer;
 		}
 		}
 		Memory::Write_U32(0x900, _BufferOut);
@@ -424,21 +430,12 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 			if (!m_Card.Seek(req.arg, SEEK_SET))
 				ERROR_LOG(WII_IPC_SD, "fseeko failed WTF");
 
-			u8* buffer = new u8[size];
-
-			for (u32 i = 0; i < size; ++i)
-			{
-				buffer[i] = Memory::Read_U8(req.addr++);
-			}
-
-			if (!m_Card.WriteBytes(buffer, req.bsize * req.blocks))
+			if (!m_Card.WriteBytes(Memory::GetPointer(req.addr), size))
 			{
 				ERROR_LOG(WII_IPC_SD, "Write Failed - error: %i, eof: %i",
 					ferror(m_Card.GetHandle()), feof(m_Card.GetHandle()));
 				ret = RET_FAIL;
 			}
-
-			delete[] buffer;
 		}
 		}
 		Memory::Write_U32(0x900, _BufferOut);
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
new file mode 100644
index 0000000000..7161e4c264
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
@@ -0,0 +1,132 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// PRELIMINARY - seems to fully work with libogc, writing has yet to be tested
+
+#pragma once
+
+#include <string>
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class PointerWrap;
+namespace File { class IOFile; }
+
+class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
+
+	virtual void DoState(PointerWrap& p) override;
+
+	IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+
+	IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+
+	static void EnqueueReply(u32 CommandAddress, u32 ReturnValue);
+	void EventNotify();
+
+private:
+
+	// SD Host Controller Registers
+	enum
+	{
+		HCR_CLOCKCONTROL  = 0x2C,
+		HCR_SOFTWARERESET = 0x2F,
+	};
+
+	// IOCtl
+	enum
+	{
+		IOCTL_WRITEHCR  = 0x01,
+		IOCTL_READHCR   = 0x02,
+		IOCTL_RESETCARD = 0x04,
+		IOCTL_SETCLK    = 0x06,
+		IOCTL_SENDCMD   = 0x07,
+		IOCTL_GETSTATUS = 0x0B,
+		IOCTL_GETOCR    = 0x0C,
+	};
+
+	// IOCtlV
+	enum
+	{
+		IOCTLV_SENDCMD = 0x07,
+	};
+
+	// ExecuteCommand
+	enum
+	{
+		RET_OK,
+		RET_FAIL,
+		RET_EVENT_REGISTER, // internal state only - not actually returned
+		RET_EVENT_UNREGISTER
+	};
+
+	// Status
+	enum
+	{
+		CARD_NOT_EXIST   = 0,
+		CARD_INSERTED    = 1,
+		CARD_INITIALIZED = 0x10000,
+	};
+
+	// Commands
+	enum
+	{
+		GO_IDLE_STATE        = 0x00,
+		ALL_SEND_CID         = 0x02,
+		SEND_RELATIVE_ADDR   = 0x03,
+		SELECT_CARD          = 0x07,
+		SEND_IF_COND         = 0x08,
+		SEND_CSD             = 0x09,
+		SEND_CID             = 0x0A,
+		SEND_STATUS          = 0x0D,
+		SET_BLOCKLEN         = 0x10,
+		READ_MULTIPLE_BLOCK  = 0x12,
+		WRITE_MULTIPLE_BLOCK = 0x19,
+		APP_CMD_NEXT         = 0x37,
+
+		ACMD_SETBUSWIDTH     = 0x06,
+		ACMD_SENDOPCOND      = 0x29,
+		ACMD_SENDSCR         = 0x33,
+
+		EVENT_REGISTER       = 0x40,
+		EVENT_UNREGISTER     = 0x41,
+	};
+
+	enum EventType
+	{
+		EVENT_NONE = 0,
+		EVENT_INSERT,
+		EVENT_REMOVE,
+		// from unregister, i think it is just meant to be invalid
+		EVENT_INVALID = 0xc210000
+	};
+
+	// TODO do we need more than one?
+	struct Event
+	{
+		EventType type;
+		u32 addr;
+		Event()
+			: type(EVENT_NONE)
+			, addr()
+		{}
+	} m_event;
+
+	u32 m_Status;
+	u32 m_BlockLength;
+	u32 m_BusWidth;
+
+	u32 m_Registers[0x200/4];
+
+	File::IOFile m_Card;
+
+	u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize,
+		u32 BufferIn2, u32 BufferInSize2,
+		u32 _BufferOut, u32 BufferOutSize);
+	void OpenInternal();
+};
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
new file mode 100644
index 0000000000..01aa4d6e8a
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
@@ -0,0 +1,191 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+enum
+{
+	IOCTL_STM_EVENTHOOK       = 0x1000,
+	IOCTL_STM_GET_IDLEMODE    = 0x3001,
+	IOCTL_STM_RELEASE_EH      = 0x3002,
+	IOCTL_STM_HOTRESET        = 0x2001,
+	IOCTL_STM_HOTRESET_FOR_PD = 0x2002,
+	IOCTL_STM_SHUTDOWN        = 0x2003,
+	IOCTL_STM_IDLE            = 0x2004,
+	IOCTL_STM_WAKEUP          = 0x2005,
+	IOCTL_STM_VIDIMMING       = 0x5001,
+	IOCTL_STM_LEDFLASH        = 0x6001,
+	IOCTL_STM_LEDMODE         = 0x6002,
+	IOCTL_STM_READVER         = 0x7001,
+	IOCTL_STM_READDDRREG      = 0x4001,
+	IOCTL_STM_READDDRREG2     = 0x4002,
+};
+
+// The /dev/stm/immediate
+class CWII_IPC_HLE_Device_stm_immediate : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_stm_immediate(u32 _DeviceID, const std::string& _rDeviceName) :
+		IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+	{}
+
+	virtual ~CWII_IPC_HLE_Device_stm_immediate()
+	{}
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	{
+		INFO_LOG(WII_IPC_STM, "STM immediate: Open");
+		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
+		m_Active = true;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	{
+		INFO_LOG(WII_IPC_STM, "STM immediate: Close");
+		if (!_bForce)
+			Memory::Write_U32(0, _CommandAddress+4);
+		m_Active = false;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	{
+		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
+		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+		u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+		u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+		u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+		// Prepare the out buffer(s) with zeroes as a safety precaution
+		// to avoid returning bad values
+		Memory::Memset(BufferOut, 0, BufferOutSize);
+		u32 ReturnValue = 0;
+
+		switch (Parameter)
+		{
+		case IOCTL_STM_RELEASE_EH:
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_RELEASE_EH");
+			break;
+
+		case IOCTL_STM_HOTRESET:
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_HOTRESET");
+			break;
+
+		case IOCTL_STM_VIDIMMING: // (Input: 20 bytes, Output: 20 bytes)
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_VIDIMMING");
+			//DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_STM);
+			//Memory::Write_U32(1, BufferOut);
+			//ReturnValue = 1;
+			break;
+
+		case IOCTL_STM_LEDMODE:  // (Input: 20 bytes, Output: 20 bytes)
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_LEDMODE");
+			break;
+
+		default:
+			{
+				_dbg_assert_msg_(WII_IPC_STM, 0, "CWII_IPC_HLE_Device_stm_immediate: 0x%x", Parameter);
+
+				INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+				DEBUG_LOG(WII_IPC_STM, "    Parameter: 0x%x", Parameter);
+				DEBUG_LOG(WII_IPC_STM, "    InBuffer: 0x%08x", BufferIn);
+				DEBUG_LOG(WII_IPC_STM, "    InBufferSize: 0x%08x", BufferInSize);
+				DEBUG_LOG(WII_IPC_STM, "    OutBuffer: 0x%08x", BufferOut);
+				DEBUG_LOG(WII_IPC_STM, "    OutBufferSize: 0x%08x", BufferOutSize);
+			}
+			break;
+		}
+
+		// Write return value to the IPC call
+		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+		return IPC_DEFAULT_REPLY;
+	}
+};
+
+// The /dev/stm/eventhook
+class CWII_IPC_HLE_Device_stm_eventhook : public IWII_IPC_HLE_Device
+{
+public:
+
+	CWII_IPC_HLE_Device_stm_eventhook(u32 _DeviceID, const std::string& _rDeviceName)
+		: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+		, m_EventHookAddress(0)
+	{}
+
+	virtual ~CWII_IPC_HLE_Device_stm_eventhook()
+	{
+	}
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override
+	{
+		Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+		m_Active = true;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override
+	{
+		m_EventHookAddress = 0;
+
+		INFO_LOG(WII_IPC_STM, "STM eventhook: Close");
+		if (!_bForce)
+			Memory::Write_U32(0, _CommandAddress+4);
+		m_Active = false;
+		return IPC_DEFAULT_REPLY;
+	}
+
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override
+	{
+		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
+		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
+		u32 BufferInSize  = Memory::Read_U32(_CommandAddress + 0x14);
+		u32 BufferOut     = Memory::Read_U32(_CommandAddress + 0x18);
+		u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
+
+		// Prepare the out buffer(s) with zeros as a safety precaution
+		// to avoid returning bad values
+		Memory::Memset(BufferOut, 0, BufferOutSize);
+		u32 ReturnValue = 0;
+
+		// write return value
+		switch (Parameter)
+		{
+		case IOCTL_STM_EVENTHOOK:
+			{
+				m_EventHookAddress = _CommandAddress;
+
+				INFO_LOG(WII_IPC_STM, "%s registers event hook:", GetDeviceName().c_str());
+				DEBUG_LOG(WII_IPC_STM, "%x - IOCTL_STM_EVENTHOOK", Parameter);
+				DEBUG_LOG(WII_IPC_STM, "BufferIn: 0x%08x", BufferIn);
+				DEBUG_LOG(WII_IPC_STM, "BufferInSize: 0x%08x", BufferInSize);
+				DEBUG_LOG(WII_IPC_STM, "BufferOut: 0x%08x", BufferOut);
+				DEBUG_LOG(WII_IPC_STM, "BufferOutSize: 0x%08x", BufferOutSize);
+
+				DumpCommands(BufferIn, BufferInSize/4, LogTypes::WII_IPC_STM);
+			}
+			break;
+
+		default:
+			_dbg_assert_msg_(WII_IPC_STM, 0, "unknown %s ioctl %x",
+				GetDeviceName().c_str(), Parameter);
+			break;
+		}
+
+		// Write return value to the IPC call, 0 means success
+		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+		return IPC_DEFAULT_REPLY;
+	}
+
+	// STATE_TO_SAVE
+	u32 m_EventHookAddress;
+};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
similarity index 92%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 13ae6bd1b2..bfd90e4652 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -1,18 +1,32 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../Core.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "../Host.h"
-#include "../HW/SystemTimers.h"
-#include "../HW/Wiimote.h"
-#include "../HW/WII_IPC.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device_usb.h"
-#include "../ConfigManager.h"
-#include "../Movie.h"
-#include "CoreTiming.h"
+#include "Common/CommonPaths.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/WII_IPC.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+
+
+void CWII_IPC_HLE_Device_usb_oh1_57e_305::EnqueueReply(u32 CommandAddress)
+{
+	// IOS seems to write back the command that was responded to in the FD field, this
+	// class does not overwrite the command so it is safe to read back.
+	Memory::Write_U32(Memory::Read_U32(CommandAddress), CommandAddress + 8);
+	// The original hardware overwrites the command type with the async reply type.
+	Memory::Write_U32(IPC_REP_ASYNC, CommandAddress);
+
+	WII_IPC_HLE_Interface::EnqueueReply(CommandAddress);
+}
 
 // The device class
 CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _DeviceID, const std::string& _rDeviceName)
@@ -22,11 +36,25 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
 	, m_ACLEndpoint(0)
 	, m_last_ticks(0)
 {
+	SysConf* sysconf;
+	std::unique_ptr<SysConf> owned_sysconf;
+	if (Core::g_want_determinism)
+	{
+		// See SysConf::UpdateLocation for comment about the Future.
+		owned_sysconf.reset(new SysConf());
+		sysconf = owned_sysconf.get();
+		sysconf->LoadFromFile(File::GetUserPath(D_SESSION_WIIROOT_IDX) + DIR_SEP WII_SYSCONF_DIR DIR_SEP WII_SYSCONF);
+	}
+	else
+	{
+		sysconf = SConfig::GetInstance().m_SYSCONF;
+	}
+
 	// Activate only first Wiimote by default
 
 	_conf_pads BT_DINF;
 	SetUsbPointer(this);
-	if (!SConfig::GetInstance().m_SYSCONF->GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)))
+	if (!sysconf->GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)))
 	{
 		PanicAlertT("Trying to read from invalid SYSCONF\nWiimote bt ids are not available");
 	}
@@ -68,9 +96,9 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
 			i++;
 		}
 
-		// save now so that when games load sysconf file it includes the new wiimotes
-		// and the correct order for connected wiimotes
-		if (!SConfig::GetInstance().m_SYSCONF->SetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)) || !SConfig::GetInstance().m_SYSCONF->Save())
+		// save now so that when games load sysconf file it includes the new Wiimotes
+		// and the correct order for connected Wiimotes
+		if (!sysconf->SetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)) || !sysconf->Save())
 			PanicAlertT("Failed to write BT.DINF to SYSCONF");
 	}
 
@@ -90,7 +118,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
 CWII_IPC_HLE_Device_usb_oh1_57e_305::~CWII_IPC_HLE_Device_usb_oh1_57e_305()
 {
 	m_WiiMotes.clear();
-	SetUsbPointer(NULL);
+	SetUsbPointer(nullptr);
 }
 
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
@@ -116,7 +144,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::RemoteDisconnect(u16 _connectionHandle
 	return SendEventDisconnect(_connectionHandle, 0x13);
 }
 
-bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Open(u32 _CommandAddress, u32 _Mode)
+IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305::Open(u32 _CommandAddress, u32 _Mode)
 {
 	m_ScanEnable = 0;
 
@@ -128,10 +156,10 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Open(u32 _CommandAddress, u32 _Mode)
 
 	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
 	m_Active = true;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForce)
+IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForce)
 {
 	m_ScanEnable = 0;
 
@@ -144,16 +172,16 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForc
 	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
 	m_Active = false;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress)
 {
 	//ERROR_LOG(WII_IPC_WIIMOTE, "Passing ioctl to ioctlv");
-	return IOCtlV(_CommandAddress);	//hack
+	return IOCtlV(_CommandAddress); // FIXME: Hack
 }
 
-bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
 {
 /*
 	Memory::Write_U8(255, 0x80149950);  // BTM LOG  // 3 logs L2Cap  // 4 logs l2_csm$
@@ -177,14 +205,14 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
 	case USBV0_IOCTL_CTRLMSG: // HCI command is received from the stack
 		{
 			// This is the HCI datapath from CPU to Wiimote, the USB stuff is little endian..
-			m_CtrlSetup.bRequestType	= *( u8*)Memory::GetPointer(CommandBuffer.InBuffer[0].m_Address);
-			m_CtrlSetup.bRequest		= *( u8*)Memory::GetPointer(CommandBuffer.InBuffer[1].m_Address);
-			m_CtrlSetup.wValue			= *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[2].m_Address);
-			m_CtrlSetup.wIndex			= *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[3].m_Address);
-			m_CtrlSetup.wLength			= *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[4].m_Address);
-			m_CtrlSetup.m_PayLoadAddr	= CommandBuffer.PayloadBuffer[0].m_Address;
-			m_CtrlSetup.m_PayLoadSize	= CommandBuffer.PayloadBuffer[0].m_Size;
-			m_CtrlSetup.m_Address		= CommandBuffer.m_Address;
+			m_CtrlSetup.bRequestType  = *( u8*)Memory::GetPointer(CommandBuffer.InBuffer[0].m_Address);
+			m_CtrlSetup.bRequest      = *( u8*)Memory::GetPointer(CommandBuffer.InBuffer[1].m_Address);
+			m_CtrlSetup.wValue        = *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[2].m_Address);
+			m_CtrlSetup.wIndex        = *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[3].m_Address);
+			m_CtrlSetup.wLength       = *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[4].m_Address);
+			m_CtrlSetup.m_PayLoadAddr = CommandBuffer.PayloadBuffer[0].m_Address;
+			m_CtrlSetup.m_PayLoadSize = CommandBuffer.PayloadBuffer[0].m_Size;
+			m_CtrlSetup.m_Address     = CommandBuffer.m_Address;
 
 			// check termination
 			_dbg_assert_msg_(WII_IPC_WIIMOTE, *(u8*)Memory::GetPointer(CommandBuffer.InBuffer[5].m_Address) == 0,
@@ -291,7 +319,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
 
 	// write return value
 	Memory::Write_U32(0, _CommandAddress + 4);
-	return _SendReply;
+	return { _SendReply, IPC_DEFAULT_DELAY };
 }
 
 
@@ -299,7 +327,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendToDevice(u16 _ConnectionHandle, u8* _pData, u32 _Size)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_ConnectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return;
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Send ACL Packet to ConnectionHandle 0x%04x", _ConnectionHandle);
@@ -333,14 +361,14 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u
 		DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint valid, sending packet to %08x", m_ACLEndpoint.m_address);
 
 		hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(m_ACLEndpoint.m_buffer);
-		pHeader->con_handle	= HCI_MK_CON_HANDLE(_ConnectionHandle, HCI_PACKET_START, HCI_POINT2POINT);
-		pHeader->length		= _Size;
+		pHeader->con_handle = HCI_MK_CON_HANDLE(_ConnectionHandle, HCI_PACKET_START, HCI_POINT2POINT);
+		pHeader->length     = _Size;
 
 		// Write the packet to the buffer
 		memcpy((u8*)pHeader + sizeof(hci_acldata_hdr_t), _pData, pHeader->length);
 
 		m_ACLEndpoint.SetRetVal(sizeof(hci_acldata_hdr_t) + _Size);
-		WII_IPC_HLE_Interface::EnqReply(m_ACLEndpoint.m_address);
+		EnqueueReply(m_ACLEndpoint.m_address);
 		m_ACLEndpoint.Invalidate();
 	}
 	else
@@ -367,7 +395,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
 			m_HCIEndpoint.FillBuffer(_event.m_buffer, _event.m_size);
 			m_HCIEndpoint.SetRetVal(_event.m_size);
 			// Send a reply to indicate HCI buffer is filled
-			WII_IPC_HLE_Interface::EnqReply(m_HCIEndpoint.m_address);
+			EnqueueReply(m_HCIEndpoint.m_address);
 			m_HCIEndpoint.Invalidate();
 		}
 		else // push new one, pop oldest
@@ -385,7 +413,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
 			m_HCIEndpoint.FillBuffer(event.m_buffer, event.m_size);
 			m_HCIEndpoint.SetRetVal(event.m_size);
 			// Send a reply to indicate HCI buffer is filled
-			WII_IPC_HLE_Interface::EnqReply(m_HCIEndpoint.m_address);
+			EnqueueReply(m_HCIEndpoint.m_address);
 			m_HCIEndpoint.Invalidate();
 			m_EventQueue.pop_front();
 		}
@@ -415,7 +443,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 		m_HCIEndpoint.FillBuffer(event.m_buffer, event.m_size);
 		m_HCIEndpoint.SetRetVal(event.m_size);
 		// Send a reply to indicate HCI buffer is filled
-		WII_IPC_HLE_Interface::EnqReply(m_HCIEndpoint.m_address);
+		EnqueueReply(m_HCIEndpoint.m_address);
 		m_HCIEndpoint.Invalidate();
 		m_EventQueue.pop_front();
 		packet_transferred = true;
@@ -428,7 +456,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 		packet_transferred = true;
 	}
 
-	// We wait for ScanEnable to be sent from the bt stack through HCI_CMD_WRITE_SCAN_ENABLE
+	// We wait for ScanEnable to be sent from the Bluetooth stack through HCI_CMD_WRITE_SCAN_ENABLE
 	// before we initiate the connection.
 	//
 	// FiRES: TODO find a better way to do this
@@ -436,12 +464,12 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 	// Create ACL connection
 	if (m_HCIEndpoint.IsValid() && (m_ScanEnable & HCI_PAGE_SCAN_ENABLE))
 	{
-		for (unsigned int i = 0; i < m_WiiMotes.size(); i++)
+		for (auto& wiimote : m_WiiMotes)
 		{
-			if (m_WiiMotes[i].EventPagingChanged(m_ScanEnable))
+			if (wiimote.EventPagingChanged(m_ScanEnable))
 			{
 				Host_SetWiiMoteConnectionState(1);
-				SendEventRequestConnection(m_WiiMotes[i]);
+				SendEventRequestConnection(wiimote);
 			}
 		}
 	}
@@ -449,9 +477,9 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 	// Link channels when connected
 	if (m_ACLEndpoint.IsValid())
 	{
-		for (unsigned int i = 0; i < m_WiiMotes.size(); i++)
+		for (auto& wiimote : m_WiiMotes)
 		{
-			if (m_WiiMotes[i].LinkChannel())
+			if (wiimote.LinkChannel())
 				break;
 		}
 	}
@@ -465,13 +493,12 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 		for (unsigned int i = 0; i < m_WiiMotes.size(); i++)
 			if (m_WiiMotes[i].IsConnected())
 			{
-				NetPlay_WiimoteUpdate(i);
 				Wiimote::Update(i);
 			}
 		m_last_ticks = now;
 	}
 
- 	SendEventNumberOfCompletedPackets();
+	SendEventNumberOfCompletedPackets();
 
 	return packet_transferred;
 }
@@ -484,13 +511,13 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u
 		ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be dropped!");
 		return;
 	}
-	
+
 	_dbg_assert_msg_(WII_IPC_WIIMOTE,
 		size < m_acl_pkt_size, "ACL packet too large for pool");
-	
+
 	m_queue.push_back(Packet());
 	auto& packet = m_queue.back();
-	
+
 	std::copy(data, data + size, packet.data);
 	packet.size = size;
 	packet.conn_handle = conn_handle;
@@ -499,7 +526,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& endpoint)
 {
 	auto& packet = m_queue.front();
-	
+
 	const u8* const data = packet.data;
 	const u16 size = packet.size;
 	const u16 conn_handle = packet.conn_handle;
@@ -508,8 +535,8 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& e
 		"queue to %08x", endpoint.m_address);
 
 	hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.m_buffer);
-	pHeader->con_handle	= HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT);
-	pHeader->length		= size;
+	pHeader->con_handle = HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT);
+	pHeader->length = size;
 
 	// Write the packet to the buffer
 	std::copy(data, data + size, (u8*)pHeader + sizeof(hci_acldata_hdr_t));
@@ -518,7 +545,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& e
 
 	m_queue.pop_front();
 
-	WII_IPC_HLE_Interface::EnqReply(endpoint.m_address);
+	EnqueueReply(endpoint.m_address);
 	endpoint.Invalidate();
 }
 
@@ -547,7 +574,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
 
 	SQueuedEvent Event(static_cast<u32>(sizeof(SHCIEventInquiryResult) + m_WiiMotes.size()*sizeof(hci_inquiry_response)), 0);
 
-	SHCIEventInquiryResult* pInquiryResult = (SHCIEventInquiryResult*)Event.m_buffer;  
+	SHCIEventInquiryResult* pInquiryResult = (SHCIEventInquiryResult*)Event.m_buffer;
 
 	pInquiryResult->EventType = HCI_EVENT_INQUIRY_RESULT;
 	pInquiryResult->PayloadLength = (u8)(sizeof(SHCIEventInquiryResult) - 2 + (m_WiiMotes.size() * sizeof(hci_inquiry_response)));
@@ -559,7 +586,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
 			continue;
 
 		u8* pBuffer = Event.m_buffer + sizeof(SHCIEventInquiryResult) + i*sizeof(hci_inquiry_response);
-		hci_inquiry_response* pResponse = (hci_inquiry_response*)pBuffer;   
+		hci_inquiry_response* pResponse = (hci_inquiry_response*)pBuffer;
 
 		pResponse->bdaddr = m_WiiMotes[i].GetBD();
 		pResponse->uclass[0]= m_WiiMotes[i].GetClass()[0];
@@ -585,7 +612,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConnectionComplete(const bdaddr_t& _bd)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventConnectionComplete), 0);
@@ -608,9 +635,9 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConnectionComplete(const bdad
 
 	static char s_szLinkType[][128] =
 	{
-		{ "HCI_LINK_SCO		0x00 - Voice"},
-		{ "HCI_LINK_ACL		0x01 - Data"},
-		{ "HCI_LINK_eSCO	0x02 - eSCO"},
+		{ "HCI_LINK_SCO     0x00 - Voice"},
+		{ "HCI_LINK_ACL     0x01 - Data"},
+		{ "HCI_LINK_eSCO    0x02 - eSCO"},
 	};
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventConnectionComplete");
@@ -643,9 +670,9 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HL
 
 	static char LinkType[][128] =
 	{
-		{ "HCI_LINK_SCO		0x00 - Voice"},
-		{ "HCI_LINK_ACL		0x01 - Data" },
-		{ "HCI_LINK_eSCO	0x02 - eSCO" },
+		{ "HCI_LINK_SCO     0x00 - Voice"},
+		{ "HCI_LINK_ACL     0x01 - Data" },
+		{ "HCI_LINK_eSCO    0x02 - eSCO" },
 	};
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventRequestConnection");
@@ -663,7 +690,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HL
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventDisconnect(u16 _connectionHandle, u8 _Reason)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventDisconnectCompleted), _connectionHandle);
@@ -687,7 +714,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventDisconnect(u16 _connectionHan
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventAuthenticationCompleted(u16 _connectionHandle)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventAuthenticationCompleted), _connectionHandle);
@@ -709,7 +736,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventAuthenticationCompleted(u16 _
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(const bdaddr_t& _bd)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventRemoteNameReq), 0);
@@ -736,7 +763,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(const bdaddr_t&
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteFeatures(u16 _connectionHandle)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventReadRemoteFeatures), _connectionHandle);
@@ -758,7 +785,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteFeatures(u16 _conne
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventReadRemoteFeatures");
 	DEBUG_LOG(WII_IPC_WIIMOTE, "  Connection_Handle: 0x%04x", pReadRemoteFeatures->ConnectionHandle);
-	DEBUG_LOG(WII_IPC_WIIMOTE, "  features: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",   
+	DEBUG_LOG(WII_IPC_WIIMOTE, "  features: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
 		pReadRemoteFeatures->features[0], pReadRemoteFeatures->features[1], pReadRemoteFeatures->features[2],
 		pReadRemoteFeatures->features[3], pReadRemoteFeatures->features[4], pReadRemoteFeatures->features[5],
 		pReadRemoteFeatures->features[6], pReadRemoteFeatures->features[7]);
@@ -771,7 +798,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteFeatures(u16 _conne
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteVerInfo(u16 _connectionHandle)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventReadRemoteVerInfo), _connectionHandle);
@@ -809,7 +836,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandComplete(u16 _OpCode,
 	pHCIEvent->Opcode = _OpCode;
 
 	// add the payload
-	if ((_pData != NULL) && (_DataSize > 0))
+	if ((_pData != nullptr) && (_DataSize > 0))
 	{
 		u8* pPayload = Event.m_buffer + sizeof(SHCIEventCommand);
 		memcpy(pPayload, _pData, _DataSize);
@@ -831,7 +858,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
 	pHCIEvent->PacketIndicator = 0x01;
 	pHCIEvent->Opcode = _Opcode;
 
-	INFO_LOG(WII_IPC_WIIMOTE, "Event: Command Status (Opcode: 0x%04x)", pHCIEvent->Opcode); 
+	INFO_LOG(WII_IPC_WIIMOTE, "Event: Command Status (Opcode: 0x%04x)", pHCIEvent->Opcode);
 
 	AddEventToQueue(Event);
 
@@ -841,7 +868,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRoleChange(bdaddr_t _bd, bool _master)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventRoleChange), 0);
@@ -867,16 +894,16 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRoleChange(bdaddr_t _bd, bool
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventNumberOfCompletedPackets()
 {
-	SQueuedEvent Event(sizeof(hci_event_hdr_t) + sizeof(hci_num_compl_pkts_ep) + sizeof(hci_num_compl_pkts_info) * m_WiiMotes.size(), 0);
+	SQueuedEvent Event((u32)(sizeof(hci_event_hdr_t) + sizeof(hci_num_compl_pkts_ep) + (sizeof(hci_num_compl_pkts_info) * m_WiiMotes.size())), 0);
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventNumberOfCompletedPackets");
 
-	hci_event_hdr_t* event_hdr		= (hci_event_hdr_t*)Event.m_buffer;
-	hci_num_compl_pkts_ep* event	= (hci_num_compl_pkts_ep*)((u8*)event_hdr + sizeof(hci_event_hdr_t));
-	hci_num_compl_pkts_info* info	= (hci_num_compl_pkts_info*)((u8*)event + sizeof(hci_num_compl_pkts_ep));
+	hci_event_hdr_t* event_hdr    = (hci_event_hdr_t*)Event.m_buffer;
+	hci_num_compl_pkts_ep* event  = (hci_num_compl_pkts_ep*)((u8*)event_hdr + sizeof(hci_event_hdr_t));
+	hci_num_compl_pkts_info* info = (hci_num_compl_pkts_info*)((u8*)event + sizeof(hci_num_compl_pkts_ep));
 
-	event_hdr->event	= HCI_EVENT_NUM_COMPL_PKTS;
-	event_hdr->length	= sizeof(hci_num_compl_pkts_ep);
+	event_hdr->event  = HCI_EVENT_NUM_COMPL_PKTS;
+	event_hdr->length = sizeof(hci_num_compl_pkts_ep);
 	event->num_con_handles = 0;
 
 	u32 acc = 0;
@@ -887,7 +914,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventNumberOfCompletedPackets()
 		event->num_con_handles++;
 		info->compl_pkts = m_PacketCount[i];
 		info->con_handle = m_WiiMotes[i].GetConnectionHandle();
-		
+
 		DEBUG_LOG(WII_IPC_WIIMOTE, "  Connection_Handle: 0x%04x", info->con_handle);
 		DEBUG_LOG(WII_IPC_WIIMOTE, "  Number_Of_Completed_Packets: %i", info->compl_pkts);
 
@@ -911,7 +938,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventNumberOfCompletedPackets()
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventModeChange(u16 _connectionHandle, u8 _mode, u16 _value)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventModeChange), _connectionHandle);
@@ -942,10 +969,10 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventLinkKeyNotification(const u8
 	INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventLinkKeyNotification");
 
 	// event header
-	pEventLinkKey->EventType		= HCI_EVENT_RETURN_LINK_KEYS;
-	pEventLinkKey->PayloadLength	= payload_length;
+	pEventLinkKey->EventType     = HCI_EVENT_RETURN_LINK_KEYS;
+	pEventLinkKey->PayloadLength = payload_length;
 	// this is really hci_return_link_keys_ep.num_keys
-	pEventLinkKey->numKeys			= num_to_send;
+	pEventLinkKey->numKeys = num_to_send;
 
 	// copy infos - this only works correctly if we're meant to start at first device and read all keys
 	for (int i = 0; i < num_to_send; i++)
@@ -989,7 +1016,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestLinkKey(const bdaddr_t
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadClockOffsetComplete(u16 _connectionHandle)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventReadClockOffsetComplete), _connectionHandle);
@@ -1013,7 +1040,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadClockOffsetComplete(u16 _
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConPacketTypeChange(u16 _connectionHandle, u16 _packetType)
 {
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventConPacketTypeChange), _connectionHandle);
@@ -1196,7 +1223,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 
 	default:
 		// send fake okay msg...
-		SendEventCommandComplete(pMsg->Opcode, NULL, 0);
+		SendEventCommandComplete(pMsg->Opcode, nullptr, 0);
 
 		if (ogf == HCI_OGF_VENDOR)
 		{
@@ -1215,7 +1242,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 	}
 
 	// HCI command is finished, send a reply to command
-	WII_IPC_HLE_Interface::EnqReply(_rHCICommandMessage.m_Address);
+	EnqueueReply(_rHCICommandMessage.m_Address);
 }
 
 
@@ -1500,6 +1527,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadStoredLinkKey(u8* _Input)
 
 	hci_read_stored_link_key_rp Reply;
 	Reply.status = 0x00;
+	Reply.num_keys_read = 0;
 	Reply.max_num_keys = 255;
 
 	if (ReadStoredLinkKey->read_all == 1)
@@ -1537,7 +1565,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandDeleteStoredLinkKey(u8* _Input)
 
 
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(pDeleteStoredLinkKey->bdaddr);
-	if (pWiiMote == NULL)
+	if (pWiiMote == nullptr)
 		return;
 
 	hci_delete_stored_link_key_rp Reply;
@@ -1734,7 +1762,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadLocalFeatures(u8* _Input)
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Command: HCI_CMD_READ_LOCAL_FEATURES:");
 	DEBUG_LOG(WII_IPC_WIIMOTE, "return:");
-	DEBUG_LOG(WII_IPC_WIIMOTE, "  features: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",   
+	DEBUG_LOG(WII_IPC_WIIMOTE, "  features: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
 		Reply.features[0], Reply.features[1], Reply.features[2],
 		Reply.features[3], Reply.features[4], Reply.features[5],
 		Reply.features[6], Reply.features[7]);
@@ -1819,34 +1847,34 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4C(u8* _Input,
 //
 CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(const bdaddr_t& _rAddr)
 {
-	for (size_t i=0; i<m_WiiMotes.size(); i++)
+	for (auto& wiimote : m_WiiMotes)
 	{
-		const bdaddr_t& BD = m_WiiMotes[i].GetBD();
+		const bdaddr_t& BD = wiimote.GetBD();
 		if ((_rAddr.b[0] == BD.b[0]) &&
 			(_rAddr.b[1] == BD.b[1]) &&
 			(_rAddr.b[2] == BD.b[2]) &&
 			(_rAddr.b[3] == BD.b[3]) &&
 			(_rAddr.b[4] == BD.b[4]) &&
 			(_rAddr.b[5] == BD.b[5]))
-			return &m_WiiMotes[i];
+			return &wiimote;
 	}
 
 	ERROR_LOG(WII_IPC_WIIMOTE,"Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
 		_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]);
-	return NULL;
+	return nullptr;
 }
 
 CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _ConnectionHandle)
 {
-	for (size_t i=0; i<m_WiiMotes.size(); i++)
+	for (auto& wiimote : m_WiiMotes)
 	{
-		if (m_WiiMotes[i].GetConnectionHandle() == _ConnectionHandle)
-			return &m_WiiMotes[i];
+		if (wiimote.GetConnectionHandle() == _ConnectionHandle)
+			return &wiimote;
 	}
 
-	ERROR_LOG(WII_IPC_WIIMOTE, "Can't find WiiMote by connection handle %02x", _ConnectionHandle);
-	PanicAlertT("Can't find WiiMote by connection handle %02x", _ConnectionHandle);
-	return NULL;
+	ERROR_LOG(WII_IPC_WIIMOTE, "Can't find Wiimote by connection handle %02x", _ConnectionHandle);
+	PanicAlertT("Can't find Wiimote by connection handle %02x", _ConnectionHandle);
+	return nullptr;
 }
 
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::LOG_LinkKey(const u8* _pLinkKey)
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
similarity index 79%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
index 253f2d08de..03676c5f76 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
@@ -1,18 +1,20 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #pragma once
 
 #include <algorithm>
-#include <vector>
+#include <deque>
 #include <queue>
+#include <vector>
 
-#include "hci.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device.h"
-#include "WII_IPC_HLE_WiiMote.h"
-#include "../HW/Wiimote.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/hci.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class CWII_IPC_HLE_WiiMote;
 
 struct SQueuedEvent
 {
@@ -39,17 +41,10 @@ struct SQueuedEvent
 	}
 };
 
-// Hacks for ChunkFile to accept SQueuedEvent as POD
-namespace std
-{
-template <>
-struct is_pod<SQueuedEvent> : std::true_type {};
-}
-
 // Important to remember that this class is for /dev/usb/oh1/57e/305 ONLY
 // /dev/usb/oh1 -> internal usb bus
 // 57e/305 -> VendorID/ProductID of device on usb bus
-// This device is ONLY the internal bluetooth module (based on BCM2045 chip)
+// This device is ONLY the internal Bluetooth module (based on BCM2045 chip)
 class CWII_IPC_HLE_Device_usb_oh1_57e_305 : public IWII_IPC_HLE_Device
 {
 public:
@@ -57,43 +52,45 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305();
 
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
 
-	virtual bool IOCtlV(u32 _CommandAddress);
-	virtual bool IOCtl(u32 _CommandAddress);
+	virtual IPCCommandResult IOCtlV(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
 
-	virtual u32 Update();
+	virtual u32 Update() override;
 
-	// Send ACL data back to bt stack
+	static void EnqueueReply(u32 CommandAddress);
+
+	// Send ACL data back to Bluetooth stack
 	void SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size);
 
 	bool RemoteDisconnect(u16 _connectionHandle);
 
-// hack for wiimote plugin
+// hack for Wiimote plugin
 public:
 	std::vector<CWII_IPC_HLE_WiiMote> m_WiiMotes;
 	CWII_IPC_HLE_WiiMote* AccessWiiMote(const bdaddr_t& _rAddr);
 	CWII_IPC_HLE_WiiMote* AccessWiiMote(u16 _ConnectionHandle);
 
-	void DoState(PointerWrap &p);
+	void DoState(PointerWrap &p) override;
 
 	void NetPlay_WiimoteUpdate(int _number);
 
 private:
 	enum USBIOCtl
 	{
-		USBV0_IOCTL_CTRLMSG		= 0,
-		USBV0_IOCTL_BLKMSG		= 1,
-		USBV0_IOCTL_INTRMSG		= 2,
+		USBV0_IOCTL_CTRLMSG = 0,
+		USBV0_IOCTL_BLKMSG  = 1,
+		USBV0_IOCTL_INTRMSG = 2,
 	};
 
 	enum USBEndpoint
 	{
-		HCI_CTRL		= 0x00,
-		HCI_EVENT		= 0x81,
-		ACL_DATA_IN		= 0x82,
-		ACL_DATA_OUT	= 0x02
+		HCI_CTRL     = 0x00,
+		HCI_EVENT    = 0x81,
+		ACL_DATA_IN  = 0x82,
+		ACL_DATA_OUT = 0x02
 	};
 
 	struct SHCICommandMessage
@@ -119,8 +116,8 @@ private:
 		{
 			if (m_address)
 			{
-				u32 InBufferNum		= Memory::Read_U32(m_address + 0x10);
-				u32 BufferVector	= Memory::Read_U32(m_address + 0x18);
+				u32 InBufferNum  = Memory::Read_U32(m_address + 0x10);
+				u32 BufferVector = Memory::Read_U32(m_address + 0x18);
 				m_buffer = Memory::Read_U32(
 					BufferVector + InBufferNum * sizeof(SIOCtlVBuffer::SBuffer));
 			}
@@ -128,7 +125,7 @@ private:
 
 		inline void FillBuffer(const void* src, const size_t size) const
 		{
-			memcpy(Memory::GetPointer(m_buffer), src, size);
+			Memory::CopyToEmu(m_buffer, (u8*)src, size);
 		}
 
 		inline void SetRetVal(const u32 retval) const
@@ -155,7 +152,7 @@ private:
 	SHCICommandMessage m_CtrlSetup;
 	CtrlBuffer m_HCIEndpoint;
 	std::deque<SQueuedEvent> m_EventQueue;
-	
+
 	u32 m_ACLSetup;
 	CtrlBuffer m_ACLEndpoint;
 
@@ -170,7 +167,7 @@ private:
 			u16 size;
 			u16 conn_handle;
 		};
-		
+
 		std::deque<Packet> m_queue;
 
 	public:
@@ -216,7 +213,7 @@ private:
 	bool SendEventReadRemoteFeatures(u16 _connectionHandle);
 	bool SendEventRoleChange(bdaddr_t _bd, bool _master);
 	bool SendEventNumberOfCompletedPackets();
-	bool SendEventAuthenticationCompleted(u16 _connectionHandle);	
+	bool SendEventAuthenticationCompleted(u16 _connectionHandle);
 	bool SendEventModeChange(u16 _connectionHandle, u8 _mode, u16 _value);
 	bool SendEventDisconnect(u16 _connectionHandle, u8 _Reason);
 	bool SendEventRequestLinkKey(const bdaddr_t& _bd);
@@ -225,7 +222,7 @@ private:
 	// Execute HCI Message
 	void ExecuteHCICommandMessage(const SHCICommandMessage& _rCtrlMessage);
 
-	// OGF 0x01	Link control commands and return parameters
+	// OGF 0x01 - Link control commands and return parameters
 	void CommandWriteInquiryMode(u8* _Input);
 	void CommandWritePageScanType(u8* _Input);
 	void CommandHostBufferSize(u8* _Input);
@@ -244,11 +241,11 @@ private:
 	void CommandDeleteStoredLinkKey(u8* _Input);
 	void CommandChangeConPacketType(u8* _Input);
 
-	// OGF 0x02	Link policy commands and return parameters
+	// OGF 0x02 - Link policy commands and return parameters
 	void CommandWriteLinkPolicy(u8* _Input);
 	void CommandSniffMode(u8* _Input);
 
-	// OGF 0x03	Host Controller and Baseband commands and return parameters
+	// OGF 0x03 - Host Controller and Baseband commands and return parameters
 	void CommandReset(u8* _Input);
 	void CommandWriteLocalName(u8* _Input);
 	void CommandWritePageTimeOut(u8* _Input);
@@ -260,22 +257,22 @@ private:
 	void CommandWriteInquiryScanType(u8* _Input);
 	void CommandWriteLinkSupervisionTimeout(u8* _Input);
 
-	// OGF 0x04	Informational commands and return parameters 
+	// OGF 0x04 - Informational commands and return parameters
 	void CommandReadBufferSize(u8* _Input);
 	void CommandReadLocalVer(u8* _Input);
 	void CommandReadLocalFeatures(u8* _Input);
 	void CommandReadBDAdrr(u8* _Input);
 
-	// OGF 0x3F Vendor specific
+	// OGF 0x3F - Vendor specific
 	void CommandVendorSpecific_FC4C(u8* _Input, u32 _Size);
-	void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size);	
+	void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size);
 
 	// Debugging
 	void LOG_LinkKey(const u8* _pLinkKey);
 
 #pragma pack(push,1)
 #define CONF_PAD_MAX_REGISTERED 10
-	
+
 	struct _conf_pad_device
 	{
 		u8 bdaddr[6];
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
similarity index 80%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
index bfe0df8743..de029d33bd 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
@@ -1,17 +1,20 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "../ConfigManager.h"
-#include "../Core.h" // Local core functions
-#include "WII_IPC_HLE_Device_usb.h"
-#include "WII_IPC_HLE_Device_usb_kbd.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h" // Local core functions
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+// TODO: support in netplay/movies.
+
 CWII_IPC_HLE_Device_usb_kbd::CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName)
 : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
 {}
@@ -19,24 +22,27 @@ CWII_IPC_HLE_Device_usb_kbd::CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const st
 CWII_IPC_HLE_Device_usb_kbd::~CWII_IPC_HLE_Device_usb_kbd()
 {}
 
-bool CWII_IPC_HLE_Device_usb_kbd::Open(u32 _CommandAddress, u32 _Mode)
+IPCCommandResult CWII_IPC_HLE_Device_usb_kbd::Open(u32 _CommandAddress, u32 _Mode)
 {
 	INFO_LOG(WII_IPC_STM, "CWII_IPC_HLE_Device_usb_kbd: Open");
 	IniFile ini;
 	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-	ini.Get("USB Keyboard", "Layout", &m_KeyboardLayout, KBD_LAYOUT_QWERTY);
+	ini.GetOrCreateSection("USB Keyboard")->Get("Layout", &m_KeyboardLayout, KBD_LAYOUT_QWERTY);
+
+	for (bool& pressed : m_OldKeyBuffer)
+	{
+		pressed = false;
+	}
 
-	for(int i = 0; i < 256; i++)
-		m_OldKeyBuffer[i] = false;
 	m_OldModifiers = 0x00;
 
-	//m_MessageQueue.push(SMessageData(MSG_KBD_CONNECT, 0, NULL));
+	//m_MessageQueue.push(SMessageData(MSG_KBD_CONNECT, 0, nullptr));
 	Memory::Write_U32(m_DeviceID, _CommandAddress+4);
 	m_Active = true;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_usb_kbd::Close(u32 _CommandAddress, bool _bForce)
+IPCCommandResult CWII_IPC_HLE_Device_usb_kbd::Close(u32 _CommandAddress, bool _bForce)
 {
 	INFO_LOG(WII_IPC_STM, "CWII_IPC_HLE_Device_usb_kbd: Close");
 	while (!m_MessageQueue.empty())
@@ -44,30 +50,30 @@ bool CWII_IPC_HLE_Device_usb_kbd::Close(u32 _CommandAddress, bool _bForce)
 	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
 	m_Active = false;
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_usb_kbd::Write(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_usb_kbd::Write(u32 _CommandAddress)
 {
 	INFO_LOG(WII_IPC_STM, "Ignoring write to CWII_IPC_HLE_Device_usb_kbd");
 #if defined(_DEBUG) || defined(DEBUGFAST)
 	DumpCommands(_CommandAddress, 10, LogTypes::WII_IPC_STM, LogTypes::LDEBUG);
 #endif
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
-bool CWII_IPC_HLE_Device_usb_kbd::IOCtl(u32 _CommandAddress)
+IPCCommandResult CWII_IPC_HLE_Device_usb_kbd::IOCtl(u32 _CommandAddress)
 {
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
 
-	if (SConfig::GetInstance().m_WiiKeyboard && !m_MessageQueue.empty())
+	if (SConfig::GetInstance().m_WiiKeyboard && !Core::g_want_determinism && !m_MessageQueue.empty())
 	{
-		*(SMessageData*)Memory::GetPointer(BufferOut) = m_MessageQueue.front();
+		Memory::CopyToEmu(BufferOut, &m_MessageQueue.front(), sizeof(SMessageData));
 		m_MessageQueue.pop();
 	}
 
 	Memory::Write_U32(0, _CommandAddress + 0x4);
-	return true;
+	return IPC_DEFAULT_REPLY;
 }
 
 bool CWII_IPC_HLE_Device_usb_kbd::IsKeyPressed(int _Key)
@@ -85,8 +91,8 @@ bool CWII_IPC_HLE_Device_usb_kbd::IsKeyPressed(int _Key)
 
 u32 CWII_IPC_HLE_Device_usb_kbd::Update()
 {
-	if (!SConfig::GetInstance().m_WiiKeyboard || !m_Active)
-		return false;
+	if (!SConfig::GetInstance().m_WiiKeyboard || Core::g_want_determinism || !m_Active)
+		return 0;
 
 	u8 Modifiers = 0x00;
 	u8 PressedKeys[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -170,7 +176,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x2A, // Backspace
 	0x2B, // Tab
-	0x00, 0x00, 
+	0x00, 0x00,
 	0x00, // Clear
 	0x28, // Return
 	0x00, 0x00,
@@ -191,18 +197,18 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
 	0x52, // Up
 	0x4F, // Right
 	0x51, // Down
-	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00,
 	0x46, // Print screen
 	0x49, // Insert
 	0x4C, // Delete
 	0x00,
 	// 0 -> 9
-	0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 
+	0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24,
 	0x25, 0x26,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00,
 	// A -> Z
-	0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 
+	0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
 	0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13,
 	0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
 	0x1C, 0x1D,
@@ -219,7 +225,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
 	0x54, // Divide
 	// F1 -> F12
 	0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41,
-	0x42, 0x43, 0x44, 0x45, 
+	0x42, 0x43, 0x44, 0x45,
 	// F13 -> F24
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00,
@@ -258,7 +264,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesAZERTY[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x2A, // Backspace
 	0x2B, // Tab
-	0x00, 0x00, 
+	0x00, 0x00,
 	0x00, // Clear
 	0x28, // Return
 	0x00, 0x00,
@@ -279,18 +285,18 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesAZERTY[256] = {
 	0x52, // Up
 	0x4F, // Right
 	0x51, // Down
-	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00,
 	0x46, // Print screen
 	0x49, // Insert
 	0x4C, // Delete
 	0x00,
 	// 0 -> 9
-	0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 
+	0x27, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24,
 	0x25, 0x26,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00,
 	// A -> Z
-	0x14, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 
+	0x14, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
 	0x0C, 0x0D, 0x0E, 0x0F, 0x33, 0x11, 0x12, 0x13,
 	0x04, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1D, 0x1B,
 	0x1C, 0x1A,
@@ -307,7 +313,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesAZERTY[256] = {
 	0x54, // Divide
 	// F1 -> F12
 	0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41,
-	0x42, 0x43, 0x44, 0x45, 
+	0x42, 0x43, 0x44, 0x45,
 	// F13 -> F24
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00,
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
new file mode 100644
index 0000000000..4d075eed21
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
@@ -0,0 +1,71 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <queue>
+#include <string>
+
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
+class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device
+{
+public:
+	CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
+	virtual ~CWII_IPC_HLE_Device_usb_kbd();
+
+	virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
+	virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
+	virtual IPCCommandResult Write(u32 _CommandAddress) override;
+	virtual IPCCommandResult IOCtl(u32 _CommandAddress) override;
+	virtual u32 Update() override;
+
+private:
+	enum
+	{
+		MSG_KBD_CONNECT    = 0,
+		MSG_KBD_DISCONNECT = 1,
+		MSG_EVENT          = 2
+	};
+
+	#pragma pack(push, 1)
+	struct SMessageData
+	{
+		u32 MsgType;
+		u32 Unk1;
+		u8 Modifiers;
+		u8 Unk2;
+		u8 PressedKeys[6];
+
+		SMessageData(u32 _MsgType, u8 _Modifiers, u8 *_PressedKeys)
+		{
+			MsgType = Common::swap32(_MsgType);
+			Unk1 = 0; // swapped
+			Modifiers = _Modifiers;
+			Unk2 = 0;
+
+			if (_PressedKeys) // Doesn't need to be in a specific order
+				memcpy(PressedKeys, _PressedKeys, sizeof(PressedKeys));
+			else
+				memset(PressedKeys, 0, sizeof(PressedKeys));
+		}
+	};
+	#pragma pack(pop)
+	std::queue<SMessageData> m_MessageQueue;
+
+	bool m_OldKeyBuffer[256];
+	u8 m_OldModifiers;
+
+	virtual bool IsKeyPressed(int _Key);
+
+	// This stuff should probably die
+	enum
+	{
+		KBD_LAYOUT_QWERTY = 0,
+		KBD_LAYOUT_AZERTY = 1
+	};
+	int m_KeyboardLayout;
+	static u8 m_KeyCodesQWERTY[256];
+	static u8 m_KeyCodesAZERTY[256];
+};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
similarity index 86%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index 9386682106..1914f691b0 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -1,20 +1,21 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h" // Common
-#include "StringUtil.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
 
-#include "WII_IPC_HLE_WiiMote.h" // Core
-#include "WII_IPC_HLE_Device_usb.h"
-#include "../ConfigManager.h"
-#include "../Host.h"
-#include "../Core.h"
-#include "../HW/Wiimote.h"
-#include "l2cap.h" // Local
-#include "WiiMote_HID_Attr.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/l2cap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IPC_HLE/WiiMote_HID_Attr.h"
 
-static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL;
+static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = nullptr;
 
 CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer()
 {
@@ -198,7 +199,7 @@ void CWII_IPC_HLE_WiiMote::EventConnectionAccepted()
 void CWII_IPC_HLE_WiiMote::EventDisconnect()
 {
 	// Send disconnect message to plugin
-	Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, NULL, 0);
+	Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, nullptr, 0);
 
 	m_ConnectionState = CONN_INACTIVE;
 	// Clear channel flags
@@ -248,7 +249,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
 	u32 DataSize = _Size - sizeof(l2cap_hdr_t);
 	INFO_LOG(WII_IPC_WIIMOTE, "  CID 0x%04x, Len 0x%x, DataSize 0x%x", pHeader->dcid, pHeader->length, DataSize);
 
-	if(pHeader->length != DataSize)
+	if (pHeader->length != DataSize)
 	{
 		INFO_LOG(WII_IPC_WIIMOTE, "Faulty packet. It is dropped.");
 		return;
@@ -265,7 +266,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
 			_dbg_assert_msg_(WII_IPC_WIIMOTE, DoesChannelExist(pHeader->dcid), "L2CAP: SendACLPacket to unknown channel %i", pHeader->dcid);
 			CChannelMap::iterator  itr= m_Channel.find(pHeader->dcid);
 
-			const int number = NetPlay_GetWiimoteNum(m_ConnectionHandle & 0xFF);
+			const int number = m_ConnectionHandle & 0xFF;
 
 			if (itr != m_Channel.end())
 			{
@@ -385,7 +386,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveConnectionReq(u8 _Ident, u8* _pData, u32 _Size
 
 	INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] SendConnectionResponse");
 	SendCommandToACL(_Ident, L2CAP_CONNECT_RSP, sizeof(l2cap_con_rsp_cp), (u8*)&Rsp);
-	
+
 	// update state machine
 	/*
 	if (rChannel.PSM == L2CAP_PSM_HID_CNTL)
@@ -404,7 +405,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveConnectionResponse(u8 _Ident, u8* _pData, u32
 	INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] ReceiveConnectionResponse");
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    DCID: 0x%04x", rsp->dcid);
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    SCID: 0x%04x", rsp->scid);
- 	DEBUG_LOG(WII_IPC_WIIMOTE, "    Result: 0x%04x", rsp->result);
+	DEBUG_LOG(WII_IPC_WIIMOTE, "    Result: 0x%04x", rsp->result);
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    Status: 0x%04x", rsp->status);
 
 	_dbg_assert_(WII_IPC_WIIMOTE, rsp->result == L2CAP_SUCCESS);
@@ -503,7 +504,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveConfigurationResponse(u8 _Ident, u8* _pData, u
 	INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] ReceiveConfigurationResponse");
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    SCID: 0x%04x", rsp->scid);
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    Flags: 0x%04x", rsp->flags);
- 	DEBUG_LOG(WII_IPC_WIIMOTE, "    Result: 0x%04x", rsp->result);
+	DEBUG_LOG(WII_IPC_WIIMOTE, "    Result: 0x%04x", rsp->result);
 
 	_dbg_assert_(WII_IPC_WIIMOTE, rsp->result == L2CAP_SUCCESS);
 
@@ -545,7 +546,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveDisconnectionReq(u8 _Ident, u8* _pData, u32 _S
 //
 //
 
-// We assume WiiMote is always connected
+// We assume Wiimote is always connected
 void CWII_IPC_HLE_WiiMote::SendConnectionRequest(u16 scid, u16 psm)
 {
 	// create the channel
@@ -591,7 +592,8 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush
 
 	l2cap_cfg_req_cp* cr = (l2cap_cfg_req_cp*)&Buffer[Offset];
 	cr->dcid = rChannel.DCID;
-	cr->flags = 0;									Offset += sizeof(l2cap_cfg_req_cp);
+	cr->flags = 0;
+	Offset += sizeof(l2cap_cfg_req_cp);
 
 	INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] SendConfigurationRequest");
 	DEBUG_LOG(WII_IPC_WIIMOTE, "    Dcid: 0x%04x", cr->dcid);
@@ -602,26 +604,26 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush
 	// (shuffle2) currently we end up not appending options. this is because we don't
 	// negotiate after trying to set MTU = 0 fails (stack will respond with
 	// "configuration failed" msg...). This is still fine, we'll just use whatever the
-	// bt stack defaults to.
+	// Bluetooth stack defaults to.
 	if (MTU || rChannel.MTU)
 	{
 		if (MTU == 0)
 			MTU = rChannel.MTU;
-		pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset];	Offset += sizeof(l2cap_cfg_opt_t);
-		pOptions->type		= L2CAP_OPT_MTU;
-		pOptions->length	= L2CAP_OPT_MTU_SIZE;
-		*(u16*)&Buffer[Offset] = MTU;					Offset += L2CAP_OPT_MTU_SIZE;
+		pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset]; Offset += sizeof(l2cap_cfg_opt_t);
+		pOptions->type   = L2CAP_OPT_MTU;
+		pOptions->length = L2CAP_OPT_MTU_SIZE;
+		*(u16*)&Buffer[Offset] = MTU;                 Offset += L2CAP_OPT_MTU_SIZE;
 		DEBUG_LOG(WII_IPC_WIIMOTE, "    MTU: 0x%04x", MTU);
 	}
-	
+
 	if (FlushTimeOut || rChannel.FlushTimeOut)
 	{
 		if (FlushTimeOut == 0)
 			FlushTimeOut = rChannel.FlushTimeOut;
-		pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset];	Offset += sizeof(l2cap_cfg_opt_t);
-		pOptions->type		= L2CAP_OPT_FLUSH_TIMO;
-		pOptions->length	= L2CAP_OPT_FLUSH_TIMO_SIZE;
-		*(u16*)&Buffer[Offset] = FlushTimeOut;			Offset += L2CAP_OPT_FLUSH_TIMO_SIZE;
+		pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset]; Offset += sizeof(l2cap_cfg_opt_t);
+		pOptions->type   = L2CAP_OPT_FLUSH_TIMO;
+		pOptions->length = L2CAP_OPT_FLUSH_TIMO_SIZE;
+		*(u16*)&Buffer[Offset] = FlushTimeOut;        Offset += L2CAP_OPT_FLUSH_TIMO_SIZE;
 		DEBUG_LOG(WII_IPC_WIIMOTE, "    FlushTimeOut: 0x%04x", FlushTimeOut);
 	}
 
@@ -640,17 +642,17 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush
 //
 //
 
-#define SDP_UINT8  		0x08
-#define SDP_UINT16		0x09
-#define SDP_UINT32		0x0A
-#define SDP_SEQ8		0x35
-#define SDP_SEQ16		0x36
+#define SDP_UINT8   0x08
+#define SDP_UINT16  0x09
+#define SDP_UINT32  0x0A
+#define SDP_SEQ8    0x35
+#define SDP_SEQ16   0x36
 
 void CWII_IPC_HLE_WiiMote::SDPSendServiceSearchResponse(u16 cid, u16 TransactionID, u8* pServiceSearchPattern, u16 MaximumServiceRecordCount)
 {
 	// verify block... we handle search pattern for HID service only
 	{
-		CBigEndianBuffer buffer(pServiceSearchPattern);		
+		CBigEndianBuffer buffer(pServiceSearchPattern);
 		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(0) == SDP_SEQ8);   // data sequence
 		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(1) == 0x03);       // sequence size
 
@@ -666,13 +668,13 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceSearchResponse(u16 cid, u16 Transaction
 	l2cap_hdr_t* pHeader = (l2cap_hdr_t*)&DataFrame[Offset]; Offset += sizeof(l2cap_hdr_t);
 	pHeader->dcid = cid;
 
-	buffer.Write8 (Offset, 0x03);				Offset++;
-	buffer.Write16(Offset, TransactionID);		Offset += 2;		// transaction ID
-	buffer.Write16(Offset, 0x0009);				Offset += 2;		// param length
-	buffer.Write16(Offset, 0x0001);				Offset += 2;		// TotalServiceRecordCount
-	buffer.Write16(Offset, 0x0001);				Offset += 2;		// CurrentServiceRecordCount
-	buffer.Write32(Offset, 0x10000);			Offset += 4;		// ServiceRecordHandleList[4]
-	buffer.Write8(Offset, 0x00);				Offset++;			// no continuation state;
+	buffer.Write8 (Offset, 0x03);          Offset++;
+	buffer.Write16(Offset, TransactionID); Offset += 2; // Transaction ID
+	buffer.Write16(Offset, 0x0009);        Offset += 2; // Param length
+	buffer.Write16(Offset, 0x0001);        Offset += 2; // TotalServiceRecordCount
+	buffer.Write16(Offset, 0x0001);        Offset += 2; // CurrentServiceRecordCount
+	buffer.Write32(Offset, 0x10000);       Offset += 4; // ServiceRecordHandleList[4]
+	buffer.Write8(Offset, 0x00);           Offset++;    // No continuation state;
 
 
 	pHeader->length = (u16)(Offset - sizeof(l2cap_hdr_t));
@@ -683,7 +685,7 @@ static u32 ParseCont(u8* pCont)
 {
 	u32 attribOffset = 0;
 	CBigEndianBuffer attribList(pCont);
-	u8 typeID		= attribList.Read8(attribOffset);		attribOffset++;
+	u8 typeID = attribList.Read8(attribOffset); attribOffset++;
 
 	if (typeID == 0x02)
 	{
@@ -699,30 +701,29 @@ static u32 ParseCont(u8* pCont)
 }
 
 
-int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID)
+static int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID)
 {
 	u32 attribOffset = 0;
 	CBigEndianBuffer attribList(pAttribIDList);
 
-	u8 sequence		= attribList.Read8(attribOffset);		attribOffset++;
-	u8 seqSize		= attribList.Read8(attribOffset);		attribOffset++;
-	u8 typeID		= attribList.Read8(attribOffset);		attribOffset++;
+	u8 sequence = attribList.Read8(attribOffset); attribOffset++;
+	u8 seqSize  = attribList.Read8(attribOffset); attribOffset++;
+	u8 typeID   = attribList.Read8(attribOffset); attribOffset++;
 
-#if MAX_LOGLEVEL >= DEBUG_LEVEL
-	_dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8);
-	(void)seqSize;
-#else
-	(void)sequence, (void)seqSize;
-#endif
+	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG)
+	{
+		_dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8);
+		(void)seqSize;
+	}
 
 	if (typeID == SDP_UINT32)
 	{
-		_startID = attribList.Read16(attribOffset);			attribOffset += 2;
-		_endID = attribList.Read16(attribOffset);			attribOffset += 2;
+		_startID = attribList.Read16(attribOffset); attribOffset += 2;
+		_endID = attribList.Read16(attribOffset);   attribOffset += 2;
 	}
 	else
 	{
-		_startID = attribList.Read16(attribOffset);		attribOffset += 2;
+		_startID = attribList.Read16(attribOffset); attribOffset += 2;
 		_endID = _startID;
 		DEBUG_LOG(WII_IPC_WIIMOTE, "Read just a single attrib - not tested");
 		PanicAlert("Read just a single attrib - not tested");
@@ -733,8 +734,8 @@ int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID)
 
 
 void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 TransactionID, u32 ServiceHandle,
-														   u16 startAttrID, u16 endAttrID,
-														   u16 MaximumAttributeByteCount, u8* pContinuationState)
+                                                           u16 startAttrID, u16 endAttrID,
+                                                           u16 MaximumAttributeByteCount, u8* pContinuationState)
 {
 	if (ServiceHandle != 0x10000)
 	{
@@ -743,7 +744,7 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact
 	}
 
 
-//	_dbg_assert_(WII_IPC_WIIMOTE, ServiceHandle == 0x10000);
+	// _dbg_assert_(WII_IPC_WIIMOTE, ServiceHandle == 0x10000);
 
 	u32 contState = ParseCont(pContinuationState);
 
@@ -755,27 +756,27 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact
 	CBigEndianBuffer buffer(DataFrame);
 
 	int Offset = 0;
-	l2cap_hdr_t* pHeader = (l2cap_hdr_t*)&DataFrame[Offset];			Offset += sizeof(l2cap_hdr_t);
+	l2cap_hdr_t* pHeader = (l2cap_hdr_t*)&DataFrame[Offset]; Offset += sizeof(l2cap_hdr_t);
 	pHeader->dcid = cid;
-		
-	buffer.Write8 (Offset, 0x05);										Offset++;
-	buffer.Write16(Offset, TransactionID);								Offset += 2;			// transaction ID
 
-	memcpy(buffer.GetPointer(Offset), pPacket, packetSize);				Offset += packetSize;
+	buffer.Write8 (Offset, 0x05);          Offset++;
+	buffer.Write16(Offset, TransactionID); Offset += 2; // Transaction ID
+
+	memcpy(buffer.GetPointer(Offset), pPacket, packetSize); Offset += packetSize;
 
 	pHeader->length = (u16)(Offset - sizeof(l2cap_hdr_t));
 	m_pHost->SendACLPacket(GetConnectionHandle(), DataFrame, pHeader->length + sizeof(l2cap_hdr_t));
 
-	//	Debugger::PrintDataBuffer(LogTypes::WIIMOTE, DataFrame, pHeader->length + sizeof(l2cap_hdr_t), "test response: ");
+	// Debugger::PrintDataBuffer(LogTypes::WIIMOTE, DataFrame, pHeader->length + sizeof(l2cap_hdr_t), "test response: ");
 }
 
 void CWII_IPC_HLE_WiiMote::HandleSDP(u16 cid, u8* _pData, u32 _Size)
 {
-	//	Debugger::PrintDataBuffer(LogTypes::WIIMOTE, _pData, _Size, "HandleSDP: ");
+	// Debugger::PrintDataBuffer(LogTypes::WIIMOTE, _pData, _Size, "HandleSDP: ");
 
 	CBigEndianBuffer buffer(_pData);
 
-	switch(buffer.Read8(0))
+	switch (buffer.Read8(0))
 	{
 	// SDP_ServiceSearchRequest
 	case 0x02:
@@ -862,8 +863,6 @@ void CWII_IPC_HLE_WiiMote::SendCommandToACL(u8 _Ident, u8 _Code, u8 _CommandLeng
 
 void CWII_IPC_HLE_WiiMote::ReceiveL2capData(u16 scid, const void* _pData, u32 _Size)
 {
-	if (NetPlay_WiimoteInput(m_ConnectionHandle & 0xFF, scid, _pData, _Size))
-		return;
 
 	// Allocate DataFrame
 	u8 DataFrame[1024];
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
similarity index 77%
rename from Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
rename to Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
index 691fc84011..bb858ac07d 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
@@ -1,16 +1,18 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _WII_IPC_HLE_WII_MOTE_
-#define _WII_IPC_HLE_WII_MOTE_
+#pragma once
 
 #include <map>
 #include <string>
-#include "hci.h"
-#include "ChunkFile.h"
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Core/IPC_HLE/hci.h"
 
 class CWII_IPC_HLE_Device_usb_oh1_57e_305;
+class PointerWrap;
 
 CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer();
 void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr);
@@ -20,15 +22,15 @@ class CBigEndianBuffer
 public:
 	CBigEndianBuffer(u8* pBuffer) : m_pBuffer(pBuffer) {}
 
-	u8		Read8(u32 offset)				{ return m_pBuffer[offset]; }
-	u16		Read16(u32 offset)				{ return Common::swap16(*(u16*)&m_pBuffer[offset]); }
-	u32		Read32(u32 offset)				{ return Common::swap32(*(u32*)&m_pBuffer[offset]); }
+	u8   Read8(u32 offset)  const       { return m_pBuffer[offset]; }
+	u16  Read16(u32 offset) const       { return Common::swap16(*(u16*)&m_pBuffer[offset]); }
+	u32  Read32(u32 offset) const       { return Common::swap32(*(u32*)&m_pBuffer[offset]); }
 
-	void	Write8(u32 offset, u8 data)		{ m_pBuffer[offset] = data; }
-	void	Write16(u32 offset, u16 data)	{ *(u16*)&m_pBuffer[offset] = Common::swap16(data); }
-	void	Write32(u32 offset, u32 data)	{ *(u32*)&m_pBuffer[offset] = Common::swap32(data); }
+	void Write8(u32 offset, u8 data)    { m_pBuffer[offset] = data; }
+	void Write16(u32 offset, u16 data)  { *(u16*)&m_pBuffer[offset] = Common::swap16(data); }
+	void Write32(u32 offset, u32 data)  { *(u32*)&m_pBuffer[offset] = Common::swap32(data); }
 
-	u8*		GetPointer(u32 offset)			{ return &m_pBuffer[offset]; }
+	u8*  GetPointer(u32 offset)         { return &m_pBuffer[offset]; }
 
 private:
 	u8* m_pBuffer;
@@ -52,11 +54,10 @@ public:
 	bool LinkChannel();
 	void ResetChannels();
 	void Activate(bool ready);
-	void ExecuteL2capCmd(u8* _pData, u32 _Size);	// From CPU
-	void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size);	// From wiimote
+	void ExecuteL2capCmd(u8* _pData, u32 _Size); // From CPU
+	void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From Wiimote
 
 	int NetPlay_GetWiimoteNum(int _number);
-	bool NetPlay_WiimoteInput(int _number, u16 _channelID, const void* _pData, u32& _Size);
 
 	void EventConnectionAccepted();
 	void EventDisconnect();
@@ -75,7 +76,7 @@ public:
 private:
 	enum ConnectionState
 	{
-		CONN_INACTIVE	= -1,
+		CONN_INACTIVE = -1,
 		CONN_READY,
 		CONN_LINKING,
 		CONN_COMPLETE
@@ -102,7 +103,7 @@ private:
 	std::string m_Name;
 	CWII_IPC_HLE_Device_usb_oh1_57e_305* m_pHost;
 
-	struct SChannel 
+	struct SChannel
 	{
 		u16 SCID;
 		u16 DCID;
@@ -133,18 +134,15 @@ private:
 	void ReceiveDisconnectionReq(u8 _Ident, u8* _pData, u32 _Size);
 	void ReceiveConfigurationReq(u8 _Ident, u8* _pData, u32 _Size);
 	void ReceiveConfigurationResponse(u8 _Ident, u8* _pData, u32 _Size);
-	
+
 	// some new ugly stuff
-	// should be inside the plugin 
+	// should be inside the plugin
 	void HandleSDP(u16 _SCID, u8* _pData, u32 _Size);
 	void SDPSendServiceSearchResponse(u16 _SCID, u16 _TransactionID, u8* _pServiceSearchPattern, u16 _MaximumServiceRecordCount);
 
-	void SDPSendServiceAttributeResponse(u16 _SCID, u16 TransactionID, u32 _ServiceHandle, 
-											u16 _StartAttrID, u16 _EndAttrID, 
+	void SDPSendServiceAttributeResponse(u16 _SCID, u16 TransactionID, u32 _ServiceHandle,
+											u16 _StartAttrID, u16 _EndAttrID,
 											u16 _MaximumAttributeByteCount, u8* _pContinuationState);
 
 	u16 AddAttribToList(int _AttribID, u8* _pBuffer);
 };
-
-#endif
-
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp
new file mode 100644
index 0000000000..07fddb24cc
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_Socket.cpp
@@ -0,0 +1,671 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/FileUtil.h"
+#include "Core/Core.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IPC_HLE/WII_Socket.h" // No Wii socket support while using NetPlay or TAS
+
+#ifdef _WIN32
+#define ERRORCODE(name) WSA ## name
+#define EITHER(win32, posix) win32
+#else
+#define ERRORCODE(name) name
+#define EITHER(win32, posix) posix
+#endif
+
+char* WiiSockMan::DecodeError(s32 ErrorCode)
+{
+#ifdef _WIN32
+	static char Message[1024];
+	// If this program was multi-threaded, we'd want to use FORMAT_MESSAGE_ALLOCATE_BUFFER
+	// instead of a static buffer here.
+	// (And of course, free the buffer when we were done with it)
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, nullptr, ErrorCode,
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, nullptr);
+	return Message;
+#else
+	return strerror(ErrorCode);
+#endif
+}
+
+static s32 TranslateErrorCode(s32 native_error, bool isRW)
+{
+	switch (native_error)
+	{
+	case ERRORCODE(EMSGSIZE):
+		ERROR_LOG(WII_IPC_NET, "Find out why this happened, looks like PEEK failure?");
+		return -1; // Should be -SO_EMSGSIZE
+	case EITHER(WSAENOTSOCK, EBADF):
+		return -SO_EBADF;
+	case ERRORCODE(EADDRINUSE):
+		return -SO_EADDRINUSE;
+	case ERRORCODE(ECONNRESET):
+		return -SO_ECONNRESET;
+	case ERRORCODE(EISCONN):
+		return -SO_EISCONN;
+	case ERRORCODE(ENOTCONN):
+		return -SO_EAGAIN; // After proper blocking SO_EAGAIN shouldn't be needed...
+	case ERRORCODE(EINPROGRESS):
+		return -SO_EINPROGRESS;
+	case ERRORCODE(EALREADY):
+		return -SO_EALREADY;
+	case ERRORCODE(EACCES):
+		return -SO_EACCES;
+	case ERRORCODE(ECONNREFUSED):
+		return -SO_ECONNREFUSED;
+	case ERRORCODE(ENETUNREACH):
+		return -SO_ENETUNREACH;
+	case ERRORCODE(EHOSTUNREACH):
+		return -SO_EHOSTUNREACH;
+	case EITHER(WSAEWOULDBLOCK, EAGAIN):
+		if (isRW)
+		{
+			return -SO_EAGAIN;  // EAGAIN
+		}
+		else
+		{
+			return -SO_EINPROGRESS; // EINPROGRESS
+		}
+	default:
+		return -1;
+	}
+}
+
+s32 WiiSockMan::GetNetErrorCode(s32 ret, const std::string& caller, bool isRW)
+{
+#ifdef _WIN32
+	s32 errorCode = WSAGetLastError();
+#else
+	s32 errorCode = errno;
+#endif
+
+	if (ret >= 0)
+	{
+		WiiSockMan::GetInstance().SetLastNetError(ret);
+		return ret;
+	}
+
+	INFO_LOG(WII_IPC_NET, "%s failed with error %d: %s, ret= %d",
+		caller.c_str(), errorCode, DecodeError(errorCode), ret);
+
+	s32 ReturnValue = TranslateErrorCode(errorCode, isRW);
+	WiiSockMan::GetInstance().SetLastNetError(ReturnValue);
+
+	return ReturnValue;
+}
+
+WiiSocket::~WiiSocket()
+{
+	if (fd >= 0)
+	{
+		(void)CloseFd();
+	}
+}
+
+void WiiSocket::SetFd(s32 s)
+{
+	if (fd >= 0)
+		(void)CloseFd();
+
+	nonBlock = false;
+	fd = s;
+
+	// Set socket to NON-BLOCK
+#ifdef _WIN32
+	u_long iMode = 1;
+	ioctlsocket(fd, FIONBIO, &iMode);
+#else
+	int flags;
+	if (-1 == (flags = fcntl(fd, F_GETFL, 0)))
+		flags = 0;
+	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#endif
+}
+
+s32 WiiSocket::CloseFd()
+{
+	s32 ReturnValue = 0;
+	if (fd >= 0)
+	{
+#ifdef _WIN32
+		s32 ret = closesocket(fd);
+#else
+		s32 ret = close(fd);
+#endif
+		ReturnValue = WiiSockMan::GetNetErrorCode(ret, "CloseFd", false);
+	}
+	else
+	{
+		ReturnValue = WiiSockMan::GetNetErrorCode(EITHER(WSAENOTSOCK, EBADF), "CloseFd", false);
+	}
+	fd = -1;
+	return ReturnValue;
+}
+
+s32 WiiSocket::FCntl(u32 cmd, u32 arg)
+{
+#define F_GETFL     3
+#define F_SETFL     4
+#define F_NONBLOCK  4
+	s32 ret = 0;
+	if (cmd == F_GETFL)
+	{
+		ret = nonBlock ? F_NONBLOCK : 0;
+	}
+	else if (cmd == F_SETFL)
+	{
+		nonBlock = (arg & F_NONBLOCK) == F_NONBLOCK;
+	}
+	else
+	{
+		ERROR_LOG(WII_IPC_NET, "SO_FCNTL unknown command");
+	}
+
+	INFO_LOG(WII_IPC_NET, "IOCTL_SO_FCNTL(%08x, %08X, %08X)",
+		fd, cmd, arg);
+
+	return ret;
+}
+
+void WiiSocket::Update(bool read, bool write, bool except)
+{
+	auto it = pending_sockops.begin();
+	while (it != pending_sockops.end())
+	{
+		s32 ReturnValue = 0;
+		bool forceNonBlock = false;
+		IPCCommandType ct = static_cast<IPCCommandType>(Memory::Read_U32(it->_CommandAddress));
+		if (!it->is_ssl && ct == IPC_CMD_IOCTL)
+		{
+			u32 BufferIn = Memory::Read_U32(it->_CommandAddress + 0x10);
+			u32 BufferInSize = Memory::Read_U32(it->_CommandAddress + 0x14);
+			u32 BufferOut = Memory::Read_U32(it->_CommandAddress + 0x18);
+			u32 BufferOutSize = Memory::Read_U32(it->_CommandAddress + 0x1C);
+
+			switch (it->net_type)
+			{
+			case IOCTL_SO_FCNTL:
+			{
+				u32 cmd = Memory::Read_U32(BufferIn + 4);
+				u32 arg = Memory::Read_U32(BufferIn + 8);
+				ReturnValue = FCntl(cmd, arg);
+				break;
+			}
+			case IOCTL_SO_BIND:
+			{
+				//u32 has_addr = Memory::Read_U32(BufferIn + 0x04);
+				sockaddr_in local_name;
+				WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn + 0x08);
+				WiiSockMan::Convert(*wii_name, local_name);
+
+				int ret = bind(fd, (sockaddr*)&local_name, sizeof(local_name));
+				ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_BIND", false);
+
+				INFO_LOG(WII_IPC_NET, "IOCTL_SO_BIND (%08X %s:%d) = %d ", fd,
+					inet_ntoa(local_name.sin_addr), Common::swap16(local_name.sin_port), ret);
+				break;
+			}
+			case IOCTL_SO_CONNECT:
+			{
+				//u32 has_addr = Memory::Read_U32(BufferIn + 0x04);
+				sockaddr_in local_name;
+				WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn + 0x08);
+				WiiSockMan::Convert(*wii_name, local_name);
+
+				int ret = connect(fd, (sockaddr*)&local_name, sizeof(local_name));
+				ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_CONNECT", false);
+
+				INFO_LOG(WII_IPC_NET,"IOCTL_SO_CONNECT (%08x, %s:%d)",
+					fd, inet_ntoa(local_name.sin_addr), Common::swap16(local_name.sin_port));
+				break;
+			}
+			case IOCTL_SO_ACCEPT:
+			{
+				if (BufferOutSize > 0)
+				{
+					sockaddr_in local_name;
+					WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut);
+					WiiSockMan::Convert(*wii_name, local_name);
+
+					socklen_t addrlen = sizeof(sockaddr_in);
+					int ret = (s32)accept(fd, (sockaddr*)&local_name, &addrlen);
+					ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_ACCEPT", true);
+
+					WiiSockMan::Convert(local_name, *wii_name, addrlen);
+				}
+				else
+				{
+					int ret = (s32)accept(fd, nullptr, 0);
+					ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_ACCEPT", true);
+				}
+
+				WiiSockMan::GetInstance().AddSocket(ReturnValue);
+
+				INFO_LOG(WII_IPC_NET, "IOCTL_SO_ACCEPT "
+					"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
+					BufferIn, BufferInSize, BufferOut, BufferOutSize);
+
+				break;
+			}
+			default:
+				break;
+			}
+
+			// Fix blocking error codes
+			if (!nonBlock)
+			{
+				if (it->net_type == IOCTL_SO_CONNECT &&
+				    ReturnValue == -SO_EISCONN)
+				{
+					ReturnValue = SO_SUCCESS;
+				}
+			}
+		}
+		else if (ct == IPC_CMD_IOCTLV)
+		{
+			SIOCtlVBuffer CommandBuffer(it->_CommandAddress);
+			u32 BufferIn = 0, BufferIn2 = 0;
+			u32 BufferInSize = 0, BufferInSize2 = 0;
+			u32 BufferOut = 0, BufferOut2 = 0;
+			u32 BufferOutSize = 0, BufferOutSize2 = 0;
+
+			if (CommandBuffer.InBuffer.size() > 0)
+			{
+				BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
+				BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
+			}
+
+			if (CommandBuffer.PayloadBuffer.size() > 0)
+			{
+				BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
+				BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
+			}
+
+			if (CommandBuffer.PayloadBuffer.size() > 1)
+			{
+				BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
+				BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size;
+			}
+
+			if (CommandBuffer.InBuffer.size() > 1)
+			{
+				BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
+				BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
+			}
+
+			if (it->is_ssl)
+			{
+				int sslID = Memory::Read_U32(BufferOut) - 1;
+				if (SSLID_VALID(sslID))
+				{
+					switch (it->ssl_type)
+					{
+					case IOCTLV_NET_SSL_DOHANDSHAKE:
+					{
+
+						int ret = ssl_handshake(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx);
+						switch (ret)
+						{
+						case 0:
+							Memory::Write_U32(SSL_OK, BufferIn);
+							break;
+						case POLARSSL_ERR_NET_WANT_READ:
+							Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
+							if (!nonBlock)
+								ReturnValue = SSL_ERR_RAGAIN;
+							break;
+						case POLARSSL_ERR_NET_WANT_WRITE:
+							Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
+							if (!nonBlock)
+								ReturnValue = SSL_ERR_WAGAIN;
+							break;
+						default:
+							Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
+							break;
+						}
+
+						INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_DOHANDSHAKE = (%d) "
+							"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+							"BufferOut: (%08x, %i), BufferOut2: (%08x, %i)",
+							ret,
+							BufferIn, BufferInSize, BufferIn2, BufferInSize2,
+							BufferOut, BufferOutSize, BufferOut2, BufferOutSize2);
+						break;
+					}
+					case IOCTLV_NET_SSL_WRITE:
+					{
+						int ret = ssl_write(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx, Memory::GetPointer(BufferOut2), BufferOutSize2);
+
+#ifdef DEBUG_SSL
+						File::IOFile("ssl_write.bin", "ab").WriteBytes(Memory::GetPointer(BufferOut2), BufferOutSize2);
+#endif
+						if (ret >= 0)
+						{
+							// Return bytes written or SSL_ERR_ZERO if none
+							Memory::Write_U32((ret == 0) ? SSL_ERR_ZERO : ret, BufferIn);
+						}
+						else
+						{
+							switch (ret)
+							{
+							case POLARSSL_ERR_NET_WANT_READ:
+								Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
+								if (!nonBlock)
+									ReturnValue = SSL_ERR_RAGAIN;
+								break;
+							case POLARSSL_ERR_NET_WANT_WRITE:
+								Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
+								if (!nonBlock)
+									ReturnValue = SSL_ERR_WAGAIN;
+								break;
+							default:
+								Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
+								break;
+							}
+						}
+						break;
+					}
+					case IOCTLV_NET_SSL_READ:
+					{
+						int ret = ssl_read(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx, Memory::GetPointer(BufferIn2), BufferInSize2);
+#ifdef DEBUG_SSL
+						if (ret > 0)
+						{
+							File::IOFile("ssl_read.bin", "ab").WriteBytes(Memory::GetPointer(BufferIn2), ret);
+						}
+#endif
+						if (ret >= 0)
+						{
+							// Return bytes read or SSL_ERR_ZERO if none
+							Memory::Write_U32((ret == 0) ? SSL_ERR_ZERO : ret, BufferIn);
+						}
+						else
+						{
+							switch (ret)
+							{
+							case POLARSSL_ERR_NET_WANT_READ:
+								Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
+								if (!nonBlock)
+									ReturnValue = SSL_ERR_RAGAIN;
+								break;
+							case POLARSSL_ERR_NET_WANT_WRITE:
+								Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
+								if (!nonBlock)
+									ReturnValue = SSL_ERR_WAGAIN;
+								break;
+							default:
+								Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
+								break;
+							}
+						}
+						break;
+					}
+					default:
+						break;
+					}
+				}
+				else
+				{
+					Memory::Write_U32(SSL_ERR_ID, BufferIn);
+				}
+			}
+			else
+			{
+				switch (it->net_type)
+				{
+				case IOCTLV_SO_SENDTO:
+				{
+
+					u32 flags = Memory::Read_U32(BufferIn2 + 0x04);
+					u32 has_destaddr = Memory::Read_U32(BufferIn2 + 0x08);
+
+                                        // Not a string, Windows requires a const char* for sendto
+					const char* data = (const char*)Memory::GetPointer(BufferIn);
+
+					// Act as non blocking when SO_MSG_NONBLOCK is specified
+					forceNonBlock = ((flags & SO_MSG_NONBLOCK) == SO_MSG_NONBLOCK);
+					// send/sendto only handles MSG_OOB
+					flags &= SO_MSG_OOB;
+
+					sockaddr_in local_name = {0};
+					if (has_destaddr)
+					{
+						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn2 + 0x0C);
+						WiiSockMan::Convert(*wii_name, local_name);
+					}
+
+					int ret = sendto(fd, data, BufferInSize, flags,
+						has_destaddr ? (struct sockaddr*)&local_name : nullptr,
+						has_destaddr ? sizeof(sockaddr) :  0);
+					ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_SENDTO", true);
+
+					INFO_LOG(WII_IPC_NET,
+						"%s = %d Socket: %08x, BufferIn: (%08x, %i), BufferIn2: (%08x, %i), %u.%u.%u.%u",
+						has_destaddr ? "IOCTLV_SO_SENDTO " : "IOCTLV_SO_SEND ",
+						ReturnValue, fd, BufferIn, BufferInSize,
+						BufferIn2, BufferInSize2,
+						local_name.sin_addr.s_addr & 0xFF,
+						(local_name.sin_addr.s_addr >> 8) & 0xFF,
+						(local_name.sin_addr.s_addr >> 16) & 0xFF,
+						(local_name.sin_addr.s_addr >> 24) & 0xFF
+						);
+					break;
+				}
+				case IOCTLV_SO_RECVFROM:
+				{
+					u32 flags = Memory::Read_U32(BufferIn + 0x04);
+					// Not a string, Windows requires a char* for recvfrom
+					char* data = (char*)Memory::GetPointer(BufferOut);
+					int data_len = BufferOutSize;
+
+					sockaddr_in local_name;
+					memset(&local_name, 0, sizeof(sockaddr_in));
+
+					if (BufferOutSize2 != 0)
+					{
+						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut2);
+						WiiSockMan::Convert(*wii_name, local_name);
+					}
+
+					// Act as non blocking when SO_MSG_NONBLOCK is specified
+					forceNonBlock = ((flags & SO_MSG_NONBLOCK) == SO_MSG_NONBLOCK);
+
+					// recv/recvfrom only handles PEEK/OOB
+					flags &= SO_MSG_PEEK | SO_MSG_OOB;
+#ifdef _WIN32
+					if (flags & SO_MSG_PEEK)
+					{
+						unsigned long totallen = 0;
+						ioctlsocket(fd, FIONREAD, &totallen);
+						ReturnValue = totallen;
+						break;
+					}
+#endif
+					socklen_t addrlen = sizeof(sockaddr_in);
+					int ret = recvfrom(fd, data, data_len, flags,
+									BufferOutSize2 ? (struct sockaddr*) &local_name : nullptr,
+									BufferOutSize2 ? &addrlen : nullptr);
+					ReturnValue = WiiSockMan::GetNetErrorCode(ret, BufferOutSize2 ? "SO_RECVFROM" : "SO_RECV", true);
+
+					INFO_LOG(WII_IPC_NET, "%s(%d, %p) Socket: %08X, Flags: %08X, "
+					"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
+					"BufferOut: (%08x, %i), BufferOut2: (%08x, %i)",
+					BufferOutSize2 ? "IOCTLV_SO_RECVFROM " : "IOCTLV_SO_RECV ",
+					ReturnValue, data, fd, flags,
+					BufferIn, BufferInSize, BufferIn2, BufferInSize2,
+					BufferOut, BufferOutSize, BufferOut2, BufferOutSize2);
+
+					if (BufferOutSize2 != 0)
+					{
+						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut2);
+						WiiSockMan::Convert(local_name, *wii_name, addrlen);
+					}
+					break;
+				}
+				default:
+					break;
+				}
+			}
+		}
+
+		if (nonBlock ||
+			forceNonBlock ||
+		    (!it->is_ssl &&
+		     ReturnValue != -SO_EAGAIN &&
+		     ReturnValue != -SO_EINPROGRESS &&
+		     ReturnValue != -SO_EALREADY) ||
+		    (it->is_ssl &&
+		     ReturnValue != SSL_ERR_WAGAIN &&
+		     ReturnValue != SSL_ERR_RAGAIN))
+		{
+			DEBUG_LOG(WII_IPC_NET,
+			          "IOCTL(V) Sock: %08x ioctl/v: %d returned: %d nonBlock: %d forceNonBlock: %d",
+			          fd, it->is_ssl ? (int) it->ssl_type : (int) it->net_type, ReturnValue, nonBlock, forceNonBlock);
+			WiiSockMan::EnqueueReply(it->_CommandAddress, ReturnValue, ct);
+			it = pending_sockops.erase(it);
+		}
+		else
+		{
+			++it;
+		}
+	}
+}
+
+void WiiSocket::DoSock(u32 _CommandAddress, NET_IOCTL type)
+{
+	sockop so = {_CommandAddress, false};
+	so.net_type = type;
+	pending_sockops.push_back(so);
+}
+
+void WiiSocket::DoSock(u32 _CommandAddress, SSL_IOCTL type)
+{
+	sockop so = {_CommandAddress, true};
+	so.ssl_type = type;
+	pending_sockops.push_back(so);
+}
+
+void WiiSockMan::AddSocket(s32 fd)
+{
+	if (fd >= 0)
+	{
+		WiiSocket& sock = WiiSockets[fd];
+		sock.SetFd(fd);
+	}
+}
+
+s32 WiiSockMan::NewSocket(s32 af, s32 type, s32 protocol)
+{
+	s32 fd = (s32)socket(af, type, protocol);
+	s32 ret = GetNetErrorCode(fd, "NewSocket", false);
+	AddSocket(ret);
+	return ret;
+}
+
+s32 WiiSockMan::DeleteSocket(s32 s)
+{
+	auto socket_entry = WiiSockets.find(s);
+	s32 ReturnValue = socket_entry->second.CloseFd();
+	WiiSockets.erase(socket_entry);
+	return ReturnValue;
+}
+
+void WiiSockMan::Update()
+{
+	s32 nfds = 0;
+	fd_set read_fds, write_fds, except_fds;
+	struct timeval t = {0,0};
+	FD_ZERO(&read_fds);
+	FD_ZERO(&write_fds);
+	FD_ZERO(&except_fds);
+
+	auto socket_iter = WiiSockets.begin();
+	auto end_socks = WiiSockets.end();
+
+	while (socket_iter != end_socks)
+	{
+		WiiSocket& sock = socket_iter->second;
+		if (sock.IsValid())
+		{
+			FD_SET(sock.fd, &read_fds);
+			FD_SET(sock.fd, &write_fds);
+			FD_SET(sock.fd, &except_fds);
+			nfds = std::max(nfds, sock.fd+1);
+			++socket_iter;
+		}
+		else
+		{
+			// Good time to clean up invalid sockets.
+			socket_iter = WiiSockets.erase(socket_iter);
+		}
+	}
+	s32 ret = select(nfds, &read_fds, &write_fds, &except_fds, &t);
+
+	if (ret >= 0)
+	{
+		for (auto& pair : WiiSockets)
+		{
+			WiiSocket& sock = pair.second;
+			sock.Update(
+				FD_ISSET(sock.fd, &read_fds) != 0,
+				FD_ISSET(sock.fd, &write_fds) != 0,
+				FD_ISSET(sock.fd, &except_fds) != 0
+			);
+		}
+	}
+	else
+	{
+		for (auto& elem : WiiSockets)
+		{
+			elem.second.Update(false, false, false);
+		}
+	}
+}
+
+void WiiSockMan::EnqueueReply(u32 CommandAddress, s32 ReturnValue, IPCCommandType CommandType)
+{
+	// The original hardware overwrites the command type with the async reply type.
+	Memory::Write_U32(IPC_REP_ASYNC, CommandAddress);
+	// IOS also seems to write back the command that was responded to in the FD field.
+	Memory::Write_U32(CommandType, CommandAddress + 8);
+
+	// Return value
+	Memory::Write_U32(ReturnValue, CommandAddress + 4);
+
+	WII_IPC_HLE_Interface::EnqueueReply(CommandAddress);
+}
+
+
+void WiiSockMan::Convert(WiiSockAddrIn const & from, sockaddr_in& to)
+{
+	to.sin_addr.s_addr = from.addr.addr;
+	to.sin_family = from.family;
+	to.sin_port = from.port;
+}
+
+void WiiSockMan::Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrlen)
+{
+	to.addr.addr = from.sin_addr.s_addr;
+	to.family = from.sin_family & 0xFF;
+	to.port = from.sin_port;
+	if (addrlen < 0 || addrlen > (s32) sizeof(WiiSockAddrIn))
+		to.len = sizeof(WiiSockAddrIn);
+	else
+		to.len = addrlen;
+}
+
+void WiiSockMan::UpdateWantDeterminism(bool want)
+{
+	// If we switched into movie recording, kill existing sockets.
+	if (want)
+		Clean();
+}
+
+#undef ERRORCODE
+#undef EITHER
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h
new file mode 100644
index 0000000000..a38d1bb60d
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WII_Socket.h
@@ -0,0 +1,251 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+#include <WinSock2.h>
+
+typedef pollfd pollfd_t;
+
+#define poll WSAPoll
+#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
+#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
+
+#elif defined(__linux__) or defined(__APPLE__)
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#if defined(ANDROID)
+#include <fcntl.h>
+#else
+#include <sys/fcntl.h>
+#endif
+#include <netinet/in.h>
+#include <net/if.h>
+#include <errno.h>
+#include <poll.h>
+#include <string.h>
+
+typedef struct pollfd pollfd_t;
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <errno.h>
+#endif
+
+#include <algorithm>
+#include <cstdio>
+#include <list>
+#include <string>
+#include <unordered_map>
+
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
+
+enum
+{
+	SO_MSG_OOB      = 0x01,
+	SO_MSG_PEEK     = 0x02,
+	SO_MSG_NONBLOCK = 0x04,
+};
+
+enum
+{
+	SO_SUCCESS,
+	SO_E2BIG = 1,
+	SO_EACCES,
+	SO_EADDRINUSE,
+	SO_EADDRNOTAVAIL,
+	SO_EAFNOSUPPORT,
+	SO_EAGAIN,
+	SO_EALREADY,
+	SO_EBADF,
+	SO_EBADMSG,
+	SO_EBUSY,
+	SO_ECANCELED,
+	SO_ECHILD,
+	SO_ECONNABORTED,
+	SO_ECONNREFUSED,
+	SO_ECONNRESET,
+	SO_EDEADLK,
+	SO_EDESTADDRREQ,
+	SO_EDOM,
+	SO_EDQUOT,
+	SO_EEXIST,
+	SO_EFAULT,
+	SO_EFBIG,
+	SO_EHOSTUNREACH,
+	SO_EIDRM,
+	SO_EILSEQ,
+	SO_EINPROGRESS,
+	SO_EINTR,
+	SO_EINVAL,
+	SO_EIO,
+	SO_EISCONN,
+	SO_EISDIR,
+	SO_ELOOP,
+	SO_EMFILE,
+	SO_EMLINK,
+	SO_EMSGSIZE,
+	SO_EMULTIHOP,
+	SO_ENAMETOOLONG,
+	SO_ENETDOWN,
+	SO_ENETRESET,
+	SO_ENETUNREACH,
+	SO_ENFILE,
+	SO_ENOBUFS,
+	SO_ENODATA,
+	SO_ENODEV,
+	SO_ENOENT,
+	SO_ENOEXEC,
+	SO_ENOLCK,
+	SO_ENOLINK,
+	SO_ENOMEM,
+	SO_ENOMSG,
+	SO_ENOPROTOOPT,
+	SO_ENOSPC,
+	SO_ENOSR,
+	SO_ENOSTR,
+	SO_ENOSYS,
+	SO_ENOTCONN,
+	SO_ENOTDIR,
+	SO_ENOTEMPTY,
+	SO_ENOTSOCK,
+	SO_ENOTSUP,
+	SO_ENOTTY,
+	SO_ENXIO,
+	SO_EOPNOTSUPP,
+	SO_EOVERFLOW,
+	SO_EPERM,
+	SO_EPIPE,
+	SO_EPROTO,
+	SO_EPROTONOSUPPORT,
+	SO_EPROTOTYPE,
+	SO_ERANGE,
+	SO_EROFS,
+	SO_ESPIPE,
+	SO_ESRCH,
+	SO_ESTALE,
+	SO_ETIME,
+	SO_ETIMEDOUT,
+	SO_ETXTBSY,
+	SO_EXDEV
+};
+
+#pragma pack(push, 1)
+struct WiiInAddr
+{
+	u32 addr;
+};
+
+struct WiiSockAddr
+{
+	u8 len;
+	u8 family;
+	u8 data[6];
+};
+
+struct WiiSockAddrIn
+{
+	u8 len;
+	u8 family;
+	u16 port;
+	WiiInAddr addr;
+};
+#pragma pack(pop)
+
+class WiiSocket
+{
+	struct sockop
+	{
+		u32 _CommandAddress;
+		bool is_ssl;
+		union
+		{
+			NET_IOCTL net_type;
+			SSL_IOCTL ssl_type;
+		};
+	};
+private:
+	s32 fd;
+	bool nonBlock;
+	std::list<sockop> pending_sockops;
+
+	friend class WiiSockMan;
+	void SetFd(s32 s);
+	s32 CloseFd();
+	s32 FCntl(u32 cmd, u32 arg);
+
+	void DoSock(u32 _CommandAddress, NET_IOCTL type);
+	void DoSock(u32 _CommandAddress, SSL_IOCTL type);
+	void Update(bool read, bool write, bool except);
+	bool IsValid() const { return fd >= 0; }
+public:
+	WiiSocket() : fd(-1), nonBlock(false) {}
+	~WiiSocket();
+	void operator=(WiiSocket const&); // Don't implement
+
+};
+
+class WiiSockMan : public ::NonCopyable
+{
+public:
+	static s32 GetNetErrorCode(s32 ret, const std::string& caller, bool isRW);
+	static char* DecodeError(s32 ErrorCode);
+
+	static WiiSockMan& GetInstance()
+	{
+		static WiiSockMan instance; // Guaranteed to be destroyed.
+		return instance;            // Instantiated on first use.
+	}
+	void Update();
+	static void EnqueueReply(u32 CommandAddress, s32 ReturnValue, IPCCommandType CommandType);
+	static void Convert(WiiSockAddrIn const & from, sockaddr_in& to);
+	static void Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrlen = -1);
+	// NON-BLOCKING FUNCTIONS
+	s32 NewSocket(s32 af, s32 type, s32 protocol);
+	void AddSocket(s32 fd);
+	s32 DeleteSocket(s32 s);
+	s32 GetLastNetError() const { return errno_last; }
+	void SetLastNetError(s32 error) { errno_last = error; }
+
+	void Clean()
+	{
+		WiiSockets.clear();
+	}
+
+	template <typename T>
+	void DoSock(s32 sock, u32 CommandAddress, T type)
+	{
+		auto socket_entry = WiiSockets.find(sock);
+		if (socket_entry == WiiSockets.end())
+		{
+			IPCCommandType ct = static_cast<IPCCommandType>(Memory::Read_U32(CommandAddress));
+			ERROR_LOG(WII_IPC_NET,
+				"DoSock: Error, fd not found (%08x, %08X, %08X)",
+				sock, CommandAddress, type);
+			EnqueueReply(CommandAddress, -SO_EBADF, ct);
+		}
+		else
+		{
+			socket_entry->second.DoSock(CommandAddress, type);
+		}
+	}
+
+	void UpdateWantDeterminism(bool want);
+
+private:
+	WiiSockMan() = default;
+
+	std::unordered_map<s32, WiiSocket> WiiSockets;
+	s32 errno_last;
+};
diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp
new file mode 100644
index 0000000000..1803fb1933
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp
@@ -0,0 +1,287 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <vector>
+
+#include "Common/Common.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
+#include "Core/IPC_HLE/WiiMote_HID_Attr.h"
+
+#if 0
+// 0x00 (checked)
+u8 ServiceRecordHandle[] = { 0x0a, 0x00, 0x01, 0x00, 0x00 };
+
+// 0x01 (checked)
+u8 SrvClassIDList[] = {
+	0x35, 0x03,
+	0x19, 0x11, 0x24
+};
+
+// 0x04 (checked)
+u8 ProtocolDescriptorList[] = {
+	0x35, 0x0D,
+	0x35, 0x06,
+	0x19, 0x01, 0x00, // Element 0
+	0x09, 0x00, 0x11, // Element 1
+	0x35, 0x03,
+	0x19, 0x00, 0x11  // Element 0
+};
+
+// 0x5 (checked)
+u8 BrowseGroupList[] = {
+	0x35, 0x03,
+	0x19, 0x10, 0x02
+};
+
+// 0x6 (checked)
+u8 LanguageBaseAttributeIDList[] = {
+	0x35, 0x09,
+	0x09, 0x65, 0x6e,
+	0x09, 0x00, 0x6a,
+	0x09, 0x01, 0x00
+};
+
+// 0x09 (checked)
+u8 BluetoothProfileDescriptorList[] = {
+	0x35, 0x08,
+	0x35, 0x06,
+	0x19, 0x11, 0x24,
+	0x09, 0x01, 0x00
+};
+
+// 0x0D (checked)
+u8 AdditionalProtocolDescriptorLists[] = {
+	0x35, 0x0F,
+	0x35, 0x0D,
+	0x35, 0x06,
+	0x19, 0x01, 0x00,
+	0x09, 0x00, 0x13,
+	0x35, 0x03,
+	0x19, 0x00, 0x11
+};
+
+// 0x100
+u8 ServiceName[] = { 0x25, 0x13, 'N','i','n','t','e','n','d','o',' ','R','V','L','-','C','N','T','-','0','1' };
+// 0x101
+u8 ServiceDescription[] = { 0x25, 0x13, 'N','i','n','t','e','n','d','o',' ','R','V','L','-','C','N','T','-','0','1' };
+// 0x102
+u8 ProviderName [] = { 0x25, 0x8, 'N','i','n','t','e','n','d','o'};
+
+// 0x200
+u8 HIDDeviceReleaseNumber[] = { 0x09, 0x01, 0x00 };
+// 0x201
+u8 HIDParserVersion[] = { 0x09, 0x01, 0x11 };
+// 0x202
+u8 HIDDeviceSubclass[] = { 0x09, 0x00, 0x04 };
+// 0x203
+u8 HIDCountryCode[] = { 0x09, 0x00, 0x33 };
+// 0x204
+u8 HIDVirtualCable[] = { 0x09, 0x00, 0x00 };
+// 0x205
+u8 HIDReconnectInitiate[] = { 0x09, 0x00, 0x01 };
+
+// 0x206
+u8 HIDDescriptorList[] = {
+	0x35, 0xDF,
+	0x35, 0xDD,
+	0x08, 0x22,  // Element 0
+	0x25, 0xD9,  // hmm... <- 0x25 is a string but there is Data
+
+	// 0xD9 Bytes - Element 1
+	0x05, 0x01, 0x09, 0x05, 0xa1, 0x01, 0x85, 0x10,
+	0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95,
+	0x01, 0x06, 0x00, 0xff, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x11, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x12, 0x95, 0x02, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x13, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x14, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x15, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x16, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x17, 0x95, 0x06, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x18, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x19, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x1a, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00,
+	0x85, 0x20, 0x95, 0x06, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x21, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x22, 0x95, 0x04, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x30, 0x95, 0x02, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x31, 0x95, 0x05, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x32, 0x95, 0x0a, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x33, 0x95, 0x11, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x34, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x35, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x36, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x37, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x3d, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x3e, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0x85, 0x3f, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00,
+	0xc0 // end tag
+};
+
+// 0x207
+u8 HIDLANGIDBaseList[] = {
+	0x35, 0x08,
+	0x35, 0x06,
+	0x09, 0x04, 0x09,
+	0x09, 0x01, 0x00
+};
+
+// 0x208
+u8 HIDSDPDisable[] = { 0x28, 0x00 };
+// 0x209
+u8 HIDBatteryPower[] = { 0x28, 0x01 };
+// 0x20a
+u8 HIDRemoteWake[] = { 0x28, 0x01 };
+// 0x20b
+u8 HIDUnk_020B[] = { 0x09, 0x01, 0x00 };
+// 0x20c
+u8 HIDUnk_020C[] = { 0x09, 0x0c, 0x80 };
+// 0x20d
+u8 HIDUnk_020D[] = { 0x28, 0x00 };
+// 0x20e
+u8 HIDBootDevice[] = { 0x28, 0x00 };
+#endif
+
+
+static u8 packet1[] = {
+	0x00, 0x7b, 0x00, 0x76, 0x36, 0x01, 0xcc, 0x09, 0x00, 0x00, 0x0a, 0x00, 0x01,
+	0x00, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x11, 0x24, 0x09, 0x00, 0x04, 0x35, 0x0d, 0x35,
+	0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x11, 0x35, 0x03, 0x19, 0x00, 0x11, 0x09, 0x00, 0x05, 0x35,
+	0x03, 0x19, 0x10, 0x02, 0x09, 0x00, 0x06, 0x35, 0x09, 0x09, 0x65, 0x6e, 0x09, 0x00, 0x6a, 0x09,
+	0x01, 0x00, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x24, 0x09, 0x01, 0x00, 0x09,
+	0x00, 0x0d, 0x35, 0x0f, 0x35, 0x0d, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x13, 0x35, 0x03,
+	0x19, 0x00, 0x11, 0x09, 0x01, 0x00, 0x25, 0x13, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x6f,
+	0x20, 0x52, 0x56, 0x4c, 0x2d, 0x43, 0x4e, 0x54, 0x2d, 0x30, 0x31, 0x09, 0x01, 0x02, 0x00, 0x76,
+};
+
+static u8 packet2[] = {
+	0x00, 0x7b, 0x00, 0x76, 0x01, 0x25, 0x13, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e,
+	0x64, 0x6f, 0x20, 0x52, 0x56, 0x4c, 0x2d, 0x43, 0x4e, 0x54, 0x2d, 0x30, 0x31, 0x09, 0x01, 0x02,
+	0x25, 0x08, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x6f, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00,
+	0x09, 0x02, 0x01, 0x09, 0x01, 0x11, 0x09, 0x02, 0x02, 0x08, 0x04, 0x09, 0x02, 0x03, 0x08, 0x33,
+	0x09, 0x02, 0x04, 0x28, 0x00, 0x09, 0x02, 0x05, 0x28, 0x01, 0x09, 0x02, 0x06, 0x35, 0xdf, 0x35,
+	0xdd, 0x08, 0x22, 0x25, 0xd9, 0x05, 0x01, 0x09, 0x05, 0xa1, 0x01, 0x85, 0x10, 0x15, 0x00, 0x26,
+	0xff, 0x00, 0x75, 0x08, 0x95, 0x01, 0x06, 0x00, 0xff, 0x09, 0x01, 0x91, 0x00, 0x85, 0x11, 0x95,
+	0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x12, 0x95, 0x02, 0x09, 0x01, 0x91, 0x00, 0x02, 0x00, 0xec,
+};
+
+static u8 packet3[] = {
+	0x00, 0x7b, 0x00, 0x76, 0x85, 0x13, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85,
+	0x14, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x15, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85,
+	0x16, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 0x85, 0x17, 0x95, 0x06, 0x09, 0x01, 0x91, 0x00, 0x85,
+	0x18, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 0x85, 0x19, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85,
+	0x1a, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x20, 0x95, 0x06, 0x09, 0x01, 0x81, 0x00, 0x85,
+	0x21, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x22, 0x95, 0x04, 0x09, 0x01, 0x81, 0x00, 0x85,
+	0x30, 0x95, 0x02, 0x09, 0x01, 0x81, 0x00, 0x85, 0x31, 0x95, 0x05, 0x09, 0x01, 0x81, 0x00, 0x85,
+	0x32, 0x95, 0x0a, 0x09, 0x01, 0x81, 0x00, 0x85, 0x33, 0x95, 0x11, 0x09, 0x01, 0x02, 0x01, 0x62,
+};
+
+static u8 packet4[] = {
+	0x00, 0x70, 0x00, 0x6d, 0x81, 0x00, 0x85, 0x34, 0x95, 0x15, 0x09, 0x01, 0x81,
+	0x00, 0x85, 0x35, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x36, 0x95, 0x15, 0x09, 0x01, 0x81,
+	0x00, 0x85, 0x37, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x3d, 0x95, 0x15, 0x09, 0x01, 0x81,
+	0x00, 0x85, 0x3e, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x3f, 0x95, 0x15, 0x09, 0x01, 0x81,
+	0x00, 0xc0, 0x09, 0x02, 0x07, 0x35, 0x08, 0x35, 0x06, 0x09, 0x04, 0x09, 0x09, 0x01, 0x00, 0x09,
+	0x02, 0x08, 0x28, 0x00, 0x09, 0x02, 0x09, 0x28, 0x01, 0x09, 0x02, 0x0a, 0x28, 0x01, 0x09, 0x02,
+	0x0b, 0x09, 0x01, 0x00, 0x09, 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28, 0x00, 0x09,
+	0x02, 0x0e, 0x28, 0x00, 0x00,
+
+};
+
+
+static u8 packet4_0x10001[] = {
+	0x00, 0x60, 0x00, 0x5d, 0x36, 0x00, 0x5a, 0x09, 0x00, 0x00, 0x0a, 0x00, 0x01,
+	0x00, 0x01, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x12, 0x00, 0x09, 0x00, 0x04, 0x35, 0x0d, 0x35,
+	0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x00, 0x01, 0x09, 0x00, 0x05, 0x35,
+	0x03, 0x19, 0x10, 0x02, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x12, 0x00, 0x09, 0x01,
+	0x00, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00, 0x09, 0x02, 0x01, 0x09, 0x05, 0x7e, 0x09, 0x02, 0x02,
+	0x09, 0x03, 0x06, 0x09, 0x02, 0x03, 0x09, 0x06, 0x00, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
+	0x05, 0x09, 0x00, 0x02, 0x00,
+};
+
+
+
+const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size)
+{
+	if (serviceHandle == 0x10000)
+	{
+		if (cont == 0)
+		{
+			_size = sizeof(packet1);
+			return packet1;
+		}
+		else if (cont == 0x76)
+		{
+			_size = sizeof(packet2);
+			return packet2;
+		}
+		else if (cont == 0xec)
+		{
+			_size = sizeof(packet3);
+			return packet3;
+		}
+		else if (cont == 0x162)
+		{
+			_size = sizeof(packet4);
+			return packet4;
+		}
+	}
+
+	if (serviceHandle == 0x10001)
+	{
+		_dbg_assert_(WII_IPC_WIIMOTE, cont == 0x00);
+		_size = sizeof(packet4_0x10001);
+		return packet4_0x10001;
+	}
+
+	return nullptr;
+}
+
+// XXX keep these?
+#if 0
+CAttribTable m_AttribTable;
+
+void InitAttribTable()
+{
+	m_AttribTable.push_back(SAttrib(0x00, ServiceRecordHandle, sizeof(ServiceRecordHandle)));
+	m_AttribTable.push_back(SAttrib(0x01, SrvClassIDList, sizeof(SrvClassIDList)));
+	m_AttribTable.push_back(SAttrib(0x04, ProtocolDescriptorList, sizeof(ProtocolDescriptorList)));
+	m_AttribTable.push_back(SAttrib(0x05, BrowseGroupList, sizeof(BrowseGroupList)));
+	m_AttribTable.push_back(SAttrib(0x06, LanguageBaseAttributeIDList, sizeof(LanguageBaseAttributeIDList)));
+	m_AttribTable.push_back(SAttrib(0x09, BluetoothProfileDescriptorList, sizeof(BluetoothProfileDescriptorList)));
+	m_AttribTable.push_back(SAttrib(0x0D, AdditionalProtocolDescriptorLists, sizeof(AdditionalProtocolDescriptorLists)));
+
+
+	m_AttribTable.push_back(SAttrib(0x100, ServiceName, sizeof(ServiceName)));
+	m_AttribTable.push_back(SAttrib(0x101, ServiceDescription, sizeof(ServiceDescription)));
+	m_AttribTable.push_back(SAttrib(0x102, ProviderName, sizeof(ProviderName)));
+
+	m_AttribTable.push_back(SAttrib(0x200, HIDDeviceReleaseNumber, sizeof(HIDDeviceReleaseNumber)));
+	m_AttribTable.push_back(SAttrib(0x201, HIDParserVersion, sizeof(HIDParserVersion)));
+	m_AttribTable.push_back(SAttrib(0x202, HIDDeviceSubclass, sizeof(HIDDeviceSubclass)));
+	m_AttribTable.push_back(SAttrib(0x203, HIDCountryCode, sizeof(HIDCountryCode)));
+	m_AttribTable.push_back(SAttrib(0x204, HIDVirtualCable, sizeof(HIDVirtualCable)));
+	m_AttribTable.push_back(SAttrib(0x205, HIDReconnectInitiate, sizeof(HIDReconnectInitiate)));
+	m_AttribTable.push_back(SAttrib(0x206, HIDDescriptorList, sizeof(HIDDescriptorList)));
+	m_AttribTable.push_back(SAttrib(0x207, HIDLANGIDBaseList, sizeof(HIDLANGIDBaseList)));
+	m_AttribTable.push_back(SAttrib(0x208, HIDSDPDisable, sizeof(HIDSDPDisable)));
+	m_AttribTable.push_back(SAttrib(0x209, HIDBatteryPower, sizeof(HIDBatteryPower)));
+	m_AttribTable.push_back(SAttrib(0x20a, HIDRemoteWake, sizeof(HIDRemoteWake)));
+	m_AttribTable.push_back(SAttrib(0x20b, HIDUnk_020B, sizeof(HIDUnk_020B)));
+	m_AttribTable.push_back(SAttrib(0x20c, HIDUnk_020C, sizeof(HIDUnk_020C)));
+	m_AttribTable.push_back(SAttrib(0x20d, HIDUnk_020D, sizeof(HIDUnk_020D)));
+	m_AttribTable.push_back(SAttrib(0x20e, HIDBootDevice, sizeof(HIDBootDevice)));
+}
+
+const CAttribTable& GetAttribTable()
+{
+	if (m_AttribTable.empty())
+	{
+		InitAttribTable();
+	}
+
+	return m_AttribTable;
+}
+#endif
diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
new file mode 100644
index 0000000000..a48b261caa
--- /dev/null
+++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
@@ -0,0 +1,28 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#if 0
+struct SAttrib
+{
+	u16 ID;
+	u8* pData;
+	u16 size;
+
+	SAttrib(u16 _ID, u8* _Data, u16 _size)
+		: ID(_ID)
+		, pData(_Data)
+		, size(_size)
+	{ }
+};
+
+typedef std::vector<SAttrib> CAttribTable;
+
+const CAttribTable& GetAttribTable();
+#endif
+
+const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size);
diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/IPC_HLE/hci.h
similarity index 99%
rename from Source/Core/Core/Src/IPC_HLE/hci.h
rename to Source/Core/Core/IPC_HLE/hci.h
index 1c59d4036b..0172366d17 100644
--- a/Source/Core/Core/Src/IPC_HLE/hci.h
+++ b/Source/Core/Core/IPC_HLE/hci.h
@@ -1,8 +1,12 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 // Dolphin notes:
 //  Added some info from bluetooth.h
 //  All packet headers have had the packet type field removed. This is because
 //   IOS adds the packet type to the header, and strips it before returning the
-//   packet to the overlying bt stack.
+//   packet to the overlying Bluetooth stack.
 
 /*	$NetBSD: hci.h,v 1.33 2009/09/11 18:35:50 plunky Exp $	*/
 
@@ -84,25 +88,18 @@
 // All structs in this file are packed
 #pragma pack(push, 1)
 
-/*
- * Bluetooth Address Family Protocol Numbers
- */
-#define BTPROTO_HCI	1
-#define BTPROTO_L2CAP	2
-#define BTPROTO_RFCOMM	3
-#define BTPROTO_SCO	4
-
 /* All sizes are in bytes */
 #define BLUETOOTH_BDADDR_SIZE	6
 
 /*
  * Bluetooth device address
  */
+#ifndef __BLUETOOTH_H
 typedef struct {
 	uint8_t	b[BLUETOOTH_BDADDR_SIZE];
 } bdaddr_t;
-
 #define	BDADDR_ANY	{ { 0, 0, 0, 0, 0, 0 } }
+#endif
 
 /**************************************************************************
  **************************************************************************
@@ -2395,6 +2392,7 @@ struct btreq {
 //////////////////////////////////////////////////////////////////////////
 // Dolphin-custom structs (to kill)
 //////////////////////////////////////////////////////////////////////////
+#include "Common/CommonTypes.h"
 struct SCommandMessage
 {
 	u16 Opcode;
@@ -2414,7 +2412,7 @@ struct SHCIEventStatus
 	u8 EventType;
 	u8 PayloadLength;
 	u8 EventStatus;
-	u8 PacketIndicator;	
+	u8 PacketIndicator;
 	u16 Opcode;
 };
 
diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/IPC_HLE/l2cap.h
similarity index 99%
rename from Source/Core/Core/Src/IPC_HLE/l2cap.h
rename to Source/Core/Core/IPC_HLE/l2cap.h
index e240dafd8d..e5f9387b49 100644
--- a/Source/Core/Core/Src/IPC_HLE/l2cap.h
+++ b/Source/Core/Core/IPC_HLE/l2cap.h
@@ -1,3 +1,7 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 /*      $NetBSD: l2cap.h,v 1.9 2009/09/13 18:45:11 pooka Exp $  */
 
 /*-
diff --git a/Source/Core/Core/MachineContext.h b/Source/Core/Core/MachineContext.h
new file mode 100644
index 0000000000..75305f97e8
--- /dev/null
+++ b/Source/Core/Core/MachineContext.h
@@ -0,0 +1,195 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// meh.
+#if defined(_M_GENERIC)
+	// JitBase uses SContext; it should have no concrete implementations in a
+	// generic build.
+	struct FakeGenericContext;
+	typedef FakeGenericContext SContext;
+#elif defined(_WIN32)
+	#include <windows.h>
+	typedef CONTEXT SContext;
+	#if _M_X86_64
+		#define CTX_RAX Rax
+		#define CTX_RBX Rbx
+		#define CTX_RCX Rcx
+		#define CTX_RDX Rdx
+		#define CTX_RDI Rdi
+		#define CTX_RSI Rsi
+		#define CTX_RBP Rbp
+		#define CTX_RSP Rsp
+		#define CTX_R8  R8
+		#define CTX_R9  R9
+		#define CTX_R10 R10
+		#define CTX_R11 R11
+		#define CTX_R12 R12
+		#define CTX_R13 R13
+		#define CTX_R14 R14
+		#define CTX_R15 R15
+		#define CTX_RIP Rip
+	#else
+		#error No context definition for OS
+	#endif
+#elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
+	// for modules:
+	#define _XOPEN_SOURCE
+	#include <ucontext.h>
+
+	#include <mach/mach.h>
+	#include <mach/message.h>
+	#if _M_X86_64
+		typedef x86_thread_state64_t SContext;
+		#define CTX_RAX __rax
+		#define CTX_RBX __rbx
+		#define CTX_RCX __rcx
+		#define CTX_RDX __rdx
+		#define CTX_RDI __rdi
+		#define CTX_RSI __rsi
+		#define CTX_RBP __rbp
+		#define CTX_RSP __rsp
+		#define CTX_R8  __r8
+		#define CTX_R9  __r9
+		#define CTX_R10 __r10
+		#define CTX_R11 __r11
+		#define CTX_R12 __r12
+		#define CTX_R13 __r13
+		#define CTX_R14 __r14
+		#define CTX_R15 __r15
+		#define CTX_RIP __rip
+	#else
+		#error No context definition for OS
+	#endif
+#elif defined(__APPLE__)
+	#include <signal.h>
+	typedef _STRUCT_MCONTEXT64 SContext;
+	#define CTX_RAX __ss.__rax
+	#define CTX_RBX __ss.__rbx
+	#define CTX_RCX __ss.__rcx
+	#define CTX_RDX __ss.__rdx
+	#define CTX_RDI __ss.__rdi
+	#define CTX_RSI __ss.__rsi
+	#define CTX_RBP __ss.__rbp
+	#define CTX_RSP __ss.__rsp
+	#define CTX_R8  __ss.__r8
+	#define CTX_R9  __ss.__r9
+	#define CTX_R10 __ss.__r10
+	#define CTX_R11 __ss.__r11
+	#define CTX_R12 __ss.__r12
+	#define CTX_R13 __ss.__r13
+	#define CTX_R14 __ss.__r14
+	#define CTX_R15 __ss.__r15
+	#define CTX_RIP __ss.__rip
+#elif defined(__linux__)
+	#include <signal.h>
+
+	#include <ucontext.h>
+	typedef mcontext_t SContext;
+
+	#if _M_X86_64
+		#define CTX_RAX gregs[REG_RAX]
+		#define CTX_RBX gregs[REG_RBX]
+		#define CTX_RCX gregs[REG_RCX]
+		#define CTX_RDX gregs[REG_RDX]
+		#define CTX_RDI gregs[REG_RDI]
+		#define CTX_RSI gregs[REG_RSI]
+		#define CTX_RBP gregs[REG_RBP]
+		#define CTX_RSP gregs[REG_RSP]
+		#define CTX_R8  gregs[REG_R8]
+		#define CTX_R9  gregs[REG_R9]
+		#define CTX_R10 gregs[REG_R10]
+		#define CTX_R11 gregs[REG_R11]
+		#define CTX_R12 gregs[REG_R12]
+		#define CTX_R13 gregs[REG_R13]
+		#define CTX_R14 gregs[REG_R14]
+		#define CTX_R15 gregs[REG_R15]
+		#define CTX_RIP gregs[REG_RIP]
+	#elif _M_ARM_64
+		#define CTX_REG(x) regs[x]
+		#define CTX_SP sp
+		#define CTX_PC pc
+	#else
+		#warning No context definition for OS
+	#endif
+#elif defined(__NetBSD__)
+	#include <ucontext.h>
+	typedef mcontext_t SContext;
+	#if _M_X86_64
+		#define CTX_RAX __gregs[_REG_RAX]
+		#define CTX_RBX __gregs[_REG_RBX]
+		#define CTX_RCX __gregs[_REG_RCX]
+		#define CTX_RDX __gregs[_REG_RDX]
+		#define CTX_RDI __gregs[_REG_RDI]
+		#define CTX_RSI __gregs[_REG_RSI]
+		#define CTX_RBP __gregs[_REG_RBP]
+		#define CTX_RSP __gregs[_REG_RSP]
+		#define CTX_R8  __gregs[_REG_R8]
+		#define CTX_R9  __gregs[_REG_R9]
+		#define CTX_R10 __gregs[_REG_R10]
+		#define CTX_R11 __gregs[_REG_R11]
+		#define CTX_R12 __gregs[_REG_R12]
+		#define CTX_R13 __gregs[_REG_R13]
+		#define CTX_R14 __gregs[_REG_R14]
+		#define CTX_R15 __gregs[_REG_R15]
+		#define CTX_RIP __gregs[_REG_RIP]
+	#else
+		#error No context definition for OS
+	#endif
+#elif defined(__FreeBSD__)
+	#include <ucontext.h>
+	typedef mcontext_t SContext;
+	#if _M_X86_64
+		#define CTX_RAX mc_rax
+		#define CTX_RBX mc_rbx
+		#define CTX_RCX mc_rcx
+		#define CTX_RDX mc_rdx
+		#define CTX_RDI mc_rdi
+		#define CTX_RSI mc_rsi
+		#define CTX_RBP mc_rbp
+		#define CTX_RSP mc_rsp
+		#define CTX_R8  mc_r8
+		#define CTX_R9  mc_r9
+		#define CTX_R10 mc_r10
+		#define CTX_R11 mc_r11
+		#define CTX_R12 mc_r12
+		#define CTX_R13 mc_r13
+		#define CTX_R14 mc_r14
+		#define CTX_R15 mc_r15
+		#define CTX_RIP mc_rip
+	#else
+		#error No context definition for OS
+	#endif
+#endif
+
+#if _M_X86_64
+#include <stddef.h>
+#define CTX_PC CTX_RIP
+static inline u64 *ContextRN(SContext* ctx, int n)
+{
+	static const u8 offsets[] =
+	{
+		offsetof(SContext, CTX_RAX),
+		offsetof(SContext, CTX_RCX),
+		offsetof(SContext, CTX_RDX),
+		offsetof(SContext, CTX_RBX),
+		offsetof(SContext, CTX_RSP),
+		offsetof(SContext, CTX_RBP),
+		offsetof(SContext, CTX_RSI),
+		offsetof(SContext, CTX_RDI),
+		offsetof(SContext, CTX_R8),
+		offsetof(SContext, CTX_R9),
+		offsetof(SContext, CTX_R10),
+		offsetof(SContext, CTX_R11),
+		offsetof(SContext, CTX_R12),
+		offsetof(SContext, CTX_R13),
+		offsetof(SContext, CTX_R14),
+		offsetof(SContext, CTX_R15)
+	};
+	return (u64 *) ((char *) ctx + offsets[n]);
+}
+#endif
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
new file mode 100644
index 0000000000..e028b40faa
--- /dev/null
+++ b/Source/Core/Core/MemTools.cpp
@@ -0,0 +1,293 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <vector>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "Common/x64Analyzer.h"
+
+#include "Core/MachineContext.h"
+#include "Core/MemTools.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#ifndef _M_GENERIC
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#endif
+
+namespace EMM
+{
+
+#ifdef _WIN32
+
+const bool g_exception_handlers_supported = true;
+
+LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
+{
+	switch (pPtrs->ExceptionRecord->ExceptionCode)
+	{
+	case EXCEPTION_ACCESS_VIOLATION:
+		{
+			int accessType = (int)pPtrs->ExceptionRecord->ExceptionInformation[0];
+			if (accessType == 8) //Rule out DEP
+			{
+				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
+			}
+
+			// virtual address of the inaccessible data
+			uintptr_t badAddress = (uintptr_t)pPtrs->ExceptionRecord->ExceptionInformation[1];
+			CONTEXT *ctx = pPtrs->ContextRecord;
+
+			if (JitInterface::HandleFault(badAddress, ctx))
+			{
+				return (DWORD)EXCEPTION_CONTINUE_EXECUTION;
+			}
+			else
+			{
+				// Let's not prevent debugging.
+				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
+			}
+		}
+
+	case EXCEPTION_STACK_OVERFLOW:
+		MessageBox(0, _T("Stack overflow!"), 0,0);
+		return EXCEPTION_CONTINUE_SEARCH;
+
+	case EXCEPTION_ILLEGAL_INSTRUCTION:
+		//No SSE support? Or simply bad codegen?
+		return EXCEPTION_CONTINUE_SEARCH;
+
+	case EXCEPTION_PRIV_INSTRUCTION:
+		//okay, dynarec codegen is obviously broken.
+		return EXCEPTION_CONTINUE_SEARCH;
+
+	case EXCEPTION_IN_PAGE_ERROR:
+		//okay, something went seriously wrong, out of memory?
+		return EXCEPTION_CONTINUE_SEARCH;
+
+	case EXCEPTION_BREAKPOINT:
+		//might want to do something fun with this one day?
+		return EXCEPTION_CONTINUE_SEARCH;
+
+	default:
+		return EXCEPTION_CONTINUE_SEARCH;
+	}
+}
+
+void InstallExceptionHandler()
+{
+	// Make sure this is only called once per process execution
+	// Instead, could make a Uninstall function, but whatever..
+	static bool handlerInstalled = false;
+	if (handlerInstalled)
+		return;
+
+	AddVectoredExceptionHandler(TRUE, Handler);
+	handlerInstalled = true;
+}
+
+void UninstallExceptionHandler() {}
+
+#elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
+
+const bool g_exception_handlers_supported = true;
+
+static void CheckKR(const char* name, kern_return_t kr)
+{
+	if (kr)
+	{
+		PanicAlert("%s failed: kr=%x", name, kr);
+	}
+}
+
+static void ExceptionThread(mach_port_t port)
+{
+	Common::SetCurrentThreadName("Mach exception thread");
+	#pragma pack(4)
+	struct
+	{
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_type_t exception;
+		mach_msg_type_number_t codeCnt;
+		int64_t code[2];
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[x86_THREAD_STATE64_COUNT];
+		mach_msg_trailer_t trailer;
+	} msg_in;
+
+	struct
+	{
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[x86_THREAD_STATE64_COUNT];
+	} msg_out;
+	#pragma pack()
+	memset(&msg_in, 0xee, sizeof(msg_in));
+	memset(&msg_out, 0xee, sizeof(msg_out));
+	mach_msg_header_t *send_msg = nullptr;
+	mach_msg_size_t send_size = 0;
+	mach_msg_option_t option = MACH_RCV_MSG;
+	while (true)
+	{
+		// If this isn't the first run, send the reply message.  Then, receive
+		// a message: either a mach_exception_raise_state RPC due to
+		// thread_set_exception_ports, or MACH_NOTIFY_NO_SENDERS due to
+		// mach_port_request_notification.
+		CheckKR("mach_msg_overwrite", mach_msg_overwrite(send_msg, option, send_size, sizeof(msg_in), port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL, &msg_in.Head, 0));
+
+		if (msg_in.Head.msgh_id == MACH_NOTIFY_NO_SENDERS)
+		{
+			// the other thread exited
+			mach_port_destroy(mach_task_self(), port);
+			return;
+		}
+
+		if (msg_in.Head.msgh_id != 2406)
+		{
+			PanicAlert("unknown message received");
+			return;
+		}
+
+		if (msg_in.flavor != x86_THREAD_STATE64)
+		{
+			PanicAlert("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64);
+			return;
+		}
+
+		x86_thread_state64_t *state = (x86_thread_state64_t *) msg_in.old_state;
+
+		bool ok = JitInterface::HandleFault((uintptr_t) msg_in.code[1], state);
+
+		// Set up the reply.
+		msg_out.Head.msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(msg_in.Head.msgh_bits), 0);
+		msg_out.Head.msgh_remote_port = msg_in.Head.msgh_remote_port;
+		msg_out.Head.msgh_local_port = MACH_PORT_NULL;
+		msg_out.Head.msgh_id = msg_in.Head.msgh_id + 100;
+		msg_out.NDR = msg_in.NDR;
+		if (ok)
+		{
+			msg_out.RetCode = KERN_SUCCESS;
+			msg_out.flavor = x86_THREAD_STATE64;
+			msg_out.new_stateCnt = x86_THREAD_STATE64_COUNT;
+			memcpy(msg_out.new_state, msg_in.old_state, x86_THREAD_STATE64_COUNT * sizeof(natural_t));
+		}
+		else
+		{
+			// Pass the exception to the next handler (debugger or crash).
+			msg_out.RetCode = KERN_FAILURE;
+			msg_out.flavor = 0;
+			msg_out.new_stateCnt = 0;
+		}
+		msg_out.Head.msgh_size = offsetof(typeof(msg_out), new_state) + msg_out.new_stateCnt * sizeof(natural_t);
+
+		send_msg = &msg_out.Head;
+		send_size = msg_out.Head.msgh_size;
+		option |= MACH_SEND_MSG;
+	}
+}
+
+void InstallExceptionHandler()
+{
+	mach_port_t port;
+	CheckKR("mach_port_allocate", mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &port));
+	std::thread exc_thread(ExceptionThread, port);
+	exc_thread.detach();
+	// Obtain a send right for thread_set_exception_ports to copy...
+	CheckKR("mach_port_insert_right", mach_port_insert_right(mach_task_self(), port, port, MACH_MSG_TYPE_MAKE_SEND));
+	// Mach tries the following exception ports in order: thread, task, host.
+	// Debuggers set the task port, so we grab the thread port.
+	CheckKR("thread_set_exception_ports", thread_set_exception_ports(mach_thread_self(), EXC_MASK_BAD_ACCESS, port, EXCEPTION_STATE | MACH_EXCEPTION_CODES, x86_THREAD_STATE64));
+	// ...and get rid of our copy so that MACH_NOTIFY_NO_SENDERS works.
+	CheckKR("mach_port_mod_refs", mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, -1));
+	mach_port_t previous;
+	CheckKR("mach_port_request_notification", mach_port_request_notification(mach_task_self(), port, MACH_NOTIFY_NO_SENDERS, 0, port, MACH_MSG_TYPE_MAKE_SEND_ONCE, &previous));
+}
+
+void UninstallExceptionHandler() {}
+
+#elif defined(_POSIX_VERSION) && !defined(_M_GENERIC)
+
+const bool g_exception_handlers_supported = true;
+
+static void sigsegv_handler(int sig, siginfo_t *info, void *raw_context)
+{
+	if (sig != SIGSEGV && sig != SIGBUS)
+	{
+		// We are not interested in other signals - handle it as usual.
+		return;
+	}
+	ucontext_t *context = (ucontext_t *)raw_context;
+	int sicode = info->si_code;
+	if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR)
+	{
+		// Huh? Return.
+		return;
+	}
+	uintptr_t bad_address = (uintptr_t)info->si_addr;
+
+	// Get all the information we can out of the context.
+	mcontext_t *ctx = &context->uc_mcontext;
+	// assume it's not a write
+	if (!JitInterface::HandleFault(bad_address,
+#ifdef __APPLE__
+		*ctx
+#else
+		ctx
+#endif
+	))
+	{
+		// retry and crash
+		signal(SIGSEGV, SIG_DFL);
+#ifdef __APPLE__
+		signal(SIGBUS, SIG_DFL);
+#endif
+	}
+}
+
+void InstallExceptionHandler()
+{
+	stack_t signal_stack;
+	signal_stack.ss_sp = malloc(SIGSTKSZ);
+	signal_stack.ss_size = SIGSTKSZ;
+	signal_stack.ss_flags = 0;
+	if (sigaltstack(&signal_stack, nullptr))
+		PanicAlert("sigaltstack failed");
+	struct sigaction sa;
+	sa.sa_handler = nullptr;
+	sa.sa_sigaction = &sigsegv_handler;
+	sa.sa_flags = SA_SIGINFO;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGSEGV, &sa, nullptr);
+#ifdef __APPLE__
+	sigaction(SIGBUS, &sa, nullptr);
+#endif
+}
+
+void UninstallExceptionHandler()
+{
+	stack_t signal_stack, old_stack;
+	signal_stack.ss_flags = SS_DISABLE;
+	if (!sigaltstack(&signal_stack, &old_stack) &&
+	    !(old_stack.ss_flags & SS_DISABLE))
+	{
+		free(old_stack.ss_sp);
+	}
+}
+#else // _M_GENERIC or unsupported platform
+
+const bool g_exception_handlers_supported = false;
+void InstallExceptionHandler() {}
+void UninstallExceptionHandler() {}
+
+#endif
+
+}  // namespace
diff --git a/Source/Core/Core/MemTools.h b/Source/Core/Core/MemTools.h
new file mode 100644
index 0000000000..780541ea58
--- /dev/null
+++ b/Source/Core/Core/MemTools.h
@@ -0,0 +1,15 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+
+namespace EMM
+{
+	extern const bool g_exception_handlers_supported;
+	void InstallExceptionHandler();
+	void UninstallExceptionHandler();
+}
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
new file mode 100644
index 0000000000..de457e7b16
--- /dev/null
+++ b/Source/Core/Core/Movie.cpp
@@ -0,0 +1,1379 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+#include <polarssl/md5.h>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayProto.h"
+#include "Core/State.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/WiimoteHid.h"
+#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
+#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "InputCommon/GCPadStatus.h"
+#include "VideoCommon/VideoConfig.h"
+
+// The chunk to allocate movie data in multiples of.
+#define DTM_BASE_LENGTH (1024)
+
+static std::mutex cs_frameSkip;
+
+namespace Movie {
+
+static bool s_bFrameStep = false;
+static bool s_bFrameStop = false;
+static bool s_bReadOnly = true;
+static u32 s_rerecords = 0;
+static PlayMode s_playMode = MODE_NONE;
+
+static u32 s_framesToSkip = 0, s_frameSkipCounter = 0;
+
+static u8 s_numPads = 0;
+static ControllerState s_padState;
+static DTMHeader tmpHeader;
+static u8* tmpInput = nullptr;
+static size_t tmpInputAllocated = 0;
+static u64 s_currentByte = 0, s_totalBytes = 0;
+u64 g_currentFrame = 0, g_totalFrames = 0; // VI
+u64 g_currentLagCount = 0;
+static u64 s_totalLagCount = 0; // just stats
+u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
+static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats
+static u64 s_recordingStartTime; // seconds since 1970 that recording started
+static bool s_bSaveConfig = false, s_bSkipIdle = false, s_bDualCore = false, s_bProgressive = false, s_bDSPHLE = false, s_bFastDiscSpeed = false;
+static bool s_bSyncGPU = false, s_bNetPlay = false;
+static std::string s_videoBackend = "unknown";
+static int s_iCPUCore = 1;
+bool g_bClearSave = false;
+bool g_bDiscChange = false;
+bool g_bReset = false;
+static std::string s_author = "";
+std::string g_discChange = "";
+u64 g_titleID = 0;
+static u8 s_MD5[16];
+static u8 s_bongos, s_memcards;
+static u8 s_revision[20];
+static u32 s_DSPiromHash = 0;
+static u32 s_DSPcoefHash = 0;
+
+static bool s_bRecordingFromSaveState = false;
+static bool s_bPolled = false;
+
+static std::string s_InputDisplay[8];
+
+static GCManipFunction gcmfunc = nullptr;
+static WiiManipFunction wiimfunc = nullptr;
+
+static void EnsureTmpInputSize(size_t bound)
+{
+	if (tmpInputAllocated >= bound)
+		return;
+	// The buffer expands in powers of two of DTM_BASE_LENGTH
+	// (standard exponential buffer growth).
+	size_t newAlloc = DTM_BASE_LENGTH;
+	while (newAlloc < bound)
+		newAlloc *= 2;
+
+	u8* newTmpInput = new u8[newAlloc];
+	tmpInputAllocated = newAlloc;
+	if (tmpInput != nullptr)
+	{
+		if (s_totalBytes > 0)
+			memcpy(newTmpInput, tmpInput, (size_t)s_totalBytes);
+		delete[] tmpInput;
+	}
+	tmpInput = newTmpInput;
+}
+
+static bool IsMovieHeader(u8 magic[4])
+{
+	return magic[0] == 'D' &&
+	       magic[1] == 'T' &&
+	       magic[2] == 'M' &&
+	       magic[3] == 0x1A;
+}
+
+std::string GetInputDisplay()
+{
+	if (!IsMovieActive())
+	{
+		s_numPads = 0;
+		for (int i = 0; i < 4; ++i)
+		{
+			if (SerialInterface::GetDeviceType(i) != SIDEVICE_NONE)
+				s_numPads |= (1 << i);
+			if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
+				s_numPads |= (1 << (i + 4));
+		}
+	}
+
+	std::string inputDisplay = "";
+	for (int i = 0; i < 8; ++i)
+		if ((s_numPads & (1 << i)) != 0)
+			inputDisplay.append(s_InputDisplay[i]);
+
+	return inputDisplay;
+}
+
+void FrameUpdate()
+{
+	// TODO[comex]: This runs on the GPU thread, yet it messes with the CPU
+	// state directly.  That's super sketchy.
+	g_currentFrame++;
+	if (!s_bPolled)
+		g_currentLagCount++;
+
+	if (IsRecordingInput())
+	{
+		g_totalFrames = g_currentFrame;
+		s_totalLagCount = g_currentLagCount;
+	}
+	if (s_bFrameStep)
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		s_bFrameStep = false;
+	}
+
+	// ("framestop") the only purpose of this is to cause interpreter/jit Run() to return temporarily.
+	// after that we set it back to CPU_RUNNING and continue as normal.
+	if (s_bFrameStop)
+		*PowerPC::GetStatePtr() = PowerPC::CPU_STEPPING;
+
+	if (s_framesToSkip)
+		FrameSkipping();
+
+	s_bPolled = false;
+}
+
+// called when game is booting up, even if no movie is active,
+// but potentially after BeginRecordingInput or PlayInput has been called.
+void Init()
+{
+	s_bPolled = false;
+	s_bFrameStep = false;
+	s_bFrameStop = false;
+	s_bSaveConfig = false;
+	s_iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
+	if (IsPlayingInput())
+	{
+		ReadHeader();
+		std::thread md5thread(CheckMD5);
+		md5thread.detach();
+		if (strncmp((char *)tmpHeader.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), 6))
+		{
+			PanicAlertT("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str());
+			EndPlayInput(false);
+		}
+	}
+
+	if (IsRecordingInput())
+	{
+		GetSettings();
+		std::thread md5thread(GetMD5);
+		md5thread.detach();
+		s_tickCountAtLastInput = 0;
+	}
+
+	s_frameSkipCounter = s_framesToSkip;
+	memset(&s_padState, 0, sizeof(s_padState));
+	if (!tmpHeader.bFromSaveState || !IsPlayingInput())
+		Core::SetStateFileName("");
+
+	for (auto& disp : s_InputDisplay)
+		disp.clear();
+
+	if (!IsMovieActive())
+	{
+		s_bRecordingFromSaveState = false;
+		s_rerecords = 0;
+		s_currentByte = 0;
+		g_currentFrame = 0;
+		g_currentLagCount = 0;
+		g_currentInputCount = 0;
+	}
+}
+
+void InputUpdate()
+{
+	g_currentInputCount++;
+	if (IsRecordingInput())
+	{
+		g_totalInputCount = g_currentInputCount;
+		s_totalTickCount += CoreTiming::GetTicks() - s_tickCountAtLastInput;
+		s_tickCountAtLastInput = CoreTiming::GetTicks();
+	}
+
+	if (IsPlayingInput() && g_currentInputCount == (g_totalInputCount - 1) && SConfig::GetInstance().m_PauseMovie)
+		Core::SetState(Core::CORE_PAUSE);
+}
+
+void SetFrameSkipping(unsigned int framesToSkip)
+{
+	std::lock_guard<std::mutex> lk(cs_frameSkip);
+
+	s_framesToSkip = framesToSkip;
+	s_frameSkipCounter = 0;
+
+	// Don't forget to re-enable rendering in case it wasn't...
+	// as this won't be changed anymore when frameskip is turned off
+	if (framesToSkip == 0)
+		g_video_backend->Video_SetRendering(true);
+}
+
+void SetPolledDevice()
+{
+	s_bPolled = true;
+}
+
+void DoFrameStep()
+{
+	if (Core::GetState() == Core::CORE_PAUSE)
+	{
+		// if already paused, frame advance for 1 frame
+		Core::SetState(Core::CORE_RUN);
+		Core::RequestRefreshInfo();
+		s_bFrameStep = true;
+	}
+	else if (!s_bFrameStep)
+	{
+		// if not paused yet, pause immediately instead
+		Core::SetState(Core::CORE_PAUSE);
+	}
+}
+
+void SetFrameStopping(bool bEnabled)
+{
+	s_bFrameStop = bEnabled;
+}
+
+void SetReadOnly(bool bEnabled)
+{
+	if (s_bReadOnly != bEnabled)
+		Core::DisplayMessage(bEnabled ? "Read-only mode." :  "Read+Write mode.", 1000);
+
+	s_bReadOnly = bEnabled;
+}
+
+void FrameSkipping()
+{
+	// Frameskipping will desync movie playback
+	if (!IsMovieActive() || NetPlay::IsNetPlayRunning())
+	{
+		std::lock_guard<std::mutex> lk(cs_frameSkip);
+
+		s_frameSkipCounter++;
+		if (s_frameSkipCounter > s_framesToSkip || Core::ShouldSkipFrame(s_frameSkipCounter) == false)
+			s_frameSkipCounter = 0;
+
+		g_video_backend->Video_SetRendering(!s_frameSkipCounter);
+	}
+}
+
+bool IsRecordingInput()
+{
+	return (s_playMode == MODE_RECORDING);
+}
+
+bool IsRecordingInputFromSaveState()
+{
+	return s_bRecordingFromSaveState;
+}
+
+bool IsJustStartingRecordingInputFromSaveState()
+{
+	return IsRecordingInputFromSaveState() && g_currentFrame == 0;
+}
+
+bool IsJustStartingPlayingInputFromSaveState()
+{
+	return IsRecordingInputFromSaveState() && g_currentFrame == 1 && IsPlayingInput();
+}
+
+bool IsPlayingInput()
+{
+	return (s_playMode == MODE_PLAYING);
+}
+
+bool IsMovieActive()
+{
+	return s_playMode != MODE_NONE;
+}
+
+bool IsReadOnly()
+{
+	return s_bReadOnly;
+}
+
+u64 GetRecordingStartTime()
+{
+	return s_recordingStartTime;
+}
+
+bool IsUsingPad(int controller)
+{
+	return ((s_numPads & (1 << controller)) != 0);
+}
+
+bool IsUsingBongo(int controller)
+{
+	return ((s_bongos & (1 << controller)) != 0);
+}
+
+bool IsUsingWiimote(int wiimote)
+{
+	return ((s_numPads & (1 << (wiimote + 4))) != 0);
+}
+
+bool IsConfigSaved()
+{
+	return s_bSaveConfig;
+}
+bool IsDualCore()
+{
+	return s_bDualCore;
+}
+
+bool IsProgressive()
+{
+	return s_bProgressive;
+}
+
+bool IsSkipIdle()
+{
+	return s_bSkipIdle;
+}
+
+bool IsDSPHLE()
+{
+	return s_bDSPHLE;
+}
+
+bool IsFastDiscSpeed()
+{
+	return s_bFastDiscSpeed;
+}
+
+int GetCPUMode()
+{
+	return s_iCPUCore;
+}
+
+bool IsStartingFromClearSave()
+{
+	return g_bClearSave;
+}
+
+bool IsUsingMemcard(int memcard)
+{
+	return (s_memcards & (1 << memcard)) != 0;
+}
+bool IsSyncGPU()
+{
+	return s_bSyncGPU;
+}
+
+bool IsNetPlayRecording()
+{
+	return s_bNetPlay;
+}
+
+void ChangePads(bool instantly)
+{
+	if (!Core::IsRunning())
+		return;
+
+	int controllers = 0;
+
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
+			controllers |= (1 << i);
+
+	if (instantly && (s_numPads & 0x0F) == controllers)
+		return;
+
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+		if (instantly) // Changes from savestates need to be instantaneous
+			SerialInterface::AddDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
+		else
+			SerialInterface::ChangeDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
+}
+
+void ChangeWiiPads(bool instantly)
+{
+	int controllers = 0;
+
+	for (int i = 0; i < MAX_WIIMOTES; ++i)
+		if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
+			controllers |= (1 << i);
+
+	// This is important for Wiimotes, because they can desync easily if they get re-activated
+	if (instantly && (s_numPads >> 4) == controllers)
+		return;
+
+	for (int i = 0; i < MAX_WIIMOTES; ++i)
+	{
+		g_wiimote_sources[i] = IsUsingWiimote(i) ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE;
+		GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(IsUsingWiimote(i));
+	}
+}
+
+bool BeginRecordingInput(int controllers)
+{
+	if (s_playMode != MODE_NONE || controllers == 0)
+		return false;
+
+	bool was_unpaused = Core::PauseAndLock(true);
+
+	s_numPads = controllers;
+	g_currentFrame = g_totalFrames = 0;
+	g_currentLagCount = s_totalLagCount = 0;
+	g_currentInputCount = g_totalInputCount = 0;
+	s_totalTickCount = s_tickCountAtLastInput = 0;
+	s_bongos = 0;
+	s_memcards = 0;
+	if (NetPlay::IsNetPlayRunning())
+	{
+		s_bNetPlay = true;
+		s_recordingStartTime = g_netplay_initial_gctime;
+	}
+	else
+	{
+		s_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970();
+	}
+
+	s_rerecords = 0;
+
+	for (int i = 0; i < MAX_SI_CHANNELS; ++i)
+		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
+			s_bongos |= (1 << i);
+
+	if (Core::IsRunningAndStarted())
+	{
+		const std::string save_path = File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav";
+		if (File::Exists(save_path))
+			File::Delete(save_path);
+
+		State::SaveAs(save_path);
+		s_bRecordingFromSaveState = true;
+
+		// This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp.
+		// TODO: find a way to GetTitleDataPath() from Movie::Init()
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		{
+			if (File::Exists(Common::GetTitleDataPath(g_titleID) + "banner.bin"))
+				Movie::g_bClearSave = false;
+			else
+				Movie::g_bClearSave = true;
+		}
+		std::thread md5thread(GetMD5);
+		md5thread.detach();
+		GetSettings();
+	}
+	s_playMode = MODE_RECORDING;
+	s_author = SConfig::GetInstance().m_strMovieAuthor;
+	EnsureTmpInputSize(1);
+
+	s_currentByte = s_totalBytes = 0;
+
+	Core::UpdateWantDeterminism();
+
+	Core::PauseAndLock(false, was_unpaused);
+
+	Core::DisplayMessage("Starting movie recording", 2000);
+	return true;
+}
+
+static std::string Analog2DToString(u8 x, u8 y, const std::string& prefix, u8 range = 255)
+{
+	u8 center = range / 2 + 1;
+	if ((x <= 1 || x == center || x >= range) &&
+	    (y <= 1 || y == center || y >= range))
+	{
+		if (x != center || y != center)
+		{
+			if (x != center && y != center)
+			{
+				return StringFromFormat("%s:%s,%s", prefix.c_str(), x < center ? "LEFT" : "RIGHT", y < center ? "DOWN" : "UP");
+			}
+			else if (x != center)
+			{
+				return StringFromFormat("%s:%s", prefix.c_str(), x < center ? "LEFT" : "RIGHT");
+			}
+			else
+			{
+				return StringFromFormat("%s:%s", prefix.c_str(), y < center ? "DOWN" : "UP");
+			}
+		}
+		else
+		{
+			return "";
+		}
+	}
+	else
+	{
+		return StringFromFormat("%s:%d,%d", prefix.c_str(), x, y);
+	}
+}
+
+static std::string Analog1DToString(u8 v, const std::string& prefix, u8 range = 255)
+{
+	if (v > 0)
+	{
+		if (v == range)
+		{
+			return prefix;
+		}
+		else
+		{
+			return StringFromFormat("%s:%d", prefix.c_str(), v);
+		}
+	}
+	else
+	{
+		return "";
+	}
+}
+
+static void SetInputDisplayString(ControllerState padState, int controllerID)
+{
+	s_InputDisplay[controllerID] = StringFromFormat("P%d:", controllerID + 1);
+
+	if (padState.A)
+		s_InputDisplay[controllerID].append(" A");
+	if (padState.B)
+		s_InputDisplay[controllerID].append(" B");
+	if (padState.X)
+		s_InputDisplay[controllerID].append(" X");
+	if (padState.Y)
+		s_InputDisplay[controllerID].append(" Y");
+	if (padState.Z)
+		s_InputDisplay[controllerID].append(" Z");
+	if (padState.Start)
+		s_InputDisplay[controllerID].append(" START");
+
+	if (padState.DPadUp)
+		s_InputDisplay[controllerID].append(" UP");
+	if (padState.DPadDown)
+		s_InputDisplay[controllerID].append(" DOWN");
+	if (padState.DPadLeft)
+		s_InputDisplay[controllerID].append(" LEFT");
+	if (padState.DPadRight)
+		s_InputDisplay[controllerID].append(" RIGHT");
+	if (padState.reset)
+		s_InputDisplay[controllerID].append(" RESET");
+
+	s_InputDisplay[controllerID].append(Analog1DToString(padState.TriggerL, " L"));
+	s_InputDisplay[controllerID].append(Analog1DToString(padState.TriggerR, " R"));
+	s_InputDisplay[controllerID].append(Analog2DToString(padState.AnalogStickX, padState.AnalogStickY, " ANA"));
+	s_InputDisplay[controllerID].append(Analog2DToString(padState.CStickX, padState.CStickY, " C"));
+	s_InputDisplay[controllerID].append("\n");
+}
+
+static void SetWiiInputDisplayString(int remoteID, u8* const data, const WiimoteEmu::ReportFeatures& rptf, int ext, const wiimote_key key)
+{
+	int controllerID = remoteID + 4;
+
+	s_InputDisplay[controllerID] = StringFromFormat("R%d:", remoteID + 1);
+
+	u8* const coreData = rptf.core ? (data + rptf.core) : nullptr;
+	u8* const accelData = rptf.accel ? (data + rptf.accel) : nullptr;
+	u8* const irData = rptf.ir ? (data + rptf.ir) : nullptr;
+	u8* const extData = rptf.ext ? (data + rptf.ext) : nullptr;
+
+	if (coreData)
+	{
+		wm_buttons buttons = *(wm_buttons*)coreData;
+		if(buttons.left)
+			s_InputDisplay[controllerID].append(" LEFT");
+		if(buttons.right)
+			s_InputDisplay[controllerID].append(" RIGHT");
+		if(buttons.down)
+			s_InputDisplay[controllerID].append(" DOWN");
+		if(buttons.up)
+			s_InputDisplay[controllerID].append(" UP");
+		if(buttons.a)
+			s_InputDisplay[controllerID].append(" A");
+		if(buttons.b)
+			s_InputDisplay[controllerID].append(" B");
+		if(buttons.plus)
+			s_InputDisplay[controllerID].append(" +");
+		if(buttons.minus)
+			s_InputDisplay[controllerID].append(" -");
+		if(buttons.one)
+			s_InputDisplay[controllerID].append(" 1");
+		if(buttons.two)
+			s_InputDisplay[controllerID].append(" 2");
+		if(buttons.home)
+			s_InputDisplay[controllerID].append(" HOME");
+	}
+
+	if (accelData)
+	{
+		wm_accel* dt = (wm_accel*)accelData;
+		std::string accel = StringFromFormat(" ACC:%d,%d,%d",
+			dt->x << 2 | ((wm_buttons*)coreData)->acc_x_lsb, dt->y << 2 | ((wm_buttons*)coreData)->acc_y_lsb << 1, dt->z << 2 | ((wm_buttons*)coreData)->acc_z_lsb << 1);
+		s_InputDisplay[controllerID].append(accel);
+	}
+
+	if (irData)
+	{
+		u16 x = irData[0] | ((irData[2] >> 4 & 0x3) << 8);
+		u16 y = irData[1] | ((irData[2] >> 6 & 0x3) << 8);
+		std::string ir = StringFromFormat(" IR:%d,%d", x,y);
+		s_InputDisplay[controllerID].append(ir);
+	}
+
+	// Nunchuk
+	if (extData && ext == 1)
+	{
+		wm_nc nunchuk;
+		memcpy(&nunchuk, extData, sizeof(wm_nc));
+		WiimoteDecrypt(&key, (u8*)&nunchuk, 0, sizeof(wm_nc));
+		nunchuk.bt.hex = nunchuk.bt.hex ^ 0x3;
+
+		std::string accel = StringFromFormat(" N-ACC:%d,%d,%d",
+			(nunchuk.ax << 2) | nunchuk.bt.acc_x_lsb, (nunchuk.ay << 2) | nunchuk.bt.acc_y_lsb, (nunchuk.az << 2) | nunchuk.bt.acc_z_lsb);
+
+		if (nunchuk.bt.c)
+			s_InputDisplay[controllerID].append(" C");
+		if (nunchuk.bt.z)
+			s_InputDisplay[controllerID].append(" Z");
+		s_InputDisplay[controllerID].append(accel);
+		s_InputDisplay[controllerID].append(Analog2DToString(nunchuk.jx, nunchuk.jy, " ANA"));
+	}
+
+	// Classic controller
+	if (extData && ext == 2)
+	{
+		wm_classic_extension cc;
+		memcpy(&cc, extData, sizeof(wm_classic_extension));
+		WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
+		cc.bt.hex = cc.bt.hex ^ 0xFFFF;
+
+		if (cc.bt.regular_data.dpad_left)
+			s_InputDisplay[controllerID].append(" LEFT");
+		if (cc.bt.dpad_right)
+			s_InputDisplay[controllerID].append(" RIGHT");
+		if (cc.bt.dpad_down)
+			s_InputDisplay[controllerID].append(" DOWN");
+		if (cc.bt.regular_data.dpad_up)
+			s_InputDisplay[controllerID].append(" UP");
+		if (cc.bt.a)
+			s_InputDisplay[controllerID].append(" A");
+		if (cc.bt.b)
+			s_InputDisplay[controllerID].append(" B");
+		if (cc.bt.x)
+			s_InputDisplay[controllerID].append(" X");
+		if (cc.bt.y)
+			s_InputDisplay[controllerID].append(" Y");
+		if (cc.bt.zl)
+			s_InputDisplay[controllerID].append(" ZL");
+		if (cc.bt.zr)
+			s_InputDisplay[controllerID].append(" ZR");
+		if (cc.bt.plus)
+			s_InputDisplay[controllerID].append(" +");
+		if (cc.bt.minus)
+			s_InputDisplay[controllerID].append(" -");
+		if (cc.bt.home)
+			s_InputDisplay[controllerID].append(" HOME");
+
+		s_InputDisplay[controllerID].append(Analog1DToString(cc.lt1 | (cc.lt2 << 3), " L", 31));
+		s_InputDisplay[controllerID].append(Analog1DToString(cc.rt, " R", 31));
+		s_InputDisplay[controllerID].append(Analog2DToString(cc.regular_data.lx, cc.regular_data.ly, " ANA", 63));
+		s_InputDisplay[controllerID].append(Analog2DToString(cc.rx1 | (cc.rx2 << 1) | (cc.rx3 << 3), cc.ry, " R-ANA", 31));
+	}
+
+	s_InputDisplay[controllerID].append("\n");
+}
+
+void CheckPadStatus(GCPadStatus* PadStatus, int controllerID)
+{
+	s_padState.A         = ((PadStatus->button & PAD_BUTTON_A) != 0);
+	s_padState.B         = ((PadStatus->button & PAD_BUTTON_B) != 0);
+	s_padState.X         = ((PadStatus->button & PAD_BUTTON_X) != 0);
+	s_padState.Y         = ((PadStatus->button & PAD_BUTTON_Y) != 0);
+	s_padState.Z         = ((PadStatus->button & PAD_TRIGGER_Z) != 0);
+	s_padState.Start     = ((PadStatus->button & PAD_BUTTON_START) != 0);
+
+	s_padState.DPadUp    = ((PadStatus->button & PAD_BUTTON_UP) != 0);
+	s_padState.DPadDown  = ((PadStatus->button & PAD_BUTTON_DOWN) != 0);
+	s_padState.DPadLeft  = ((PadStatus->button & PAD_BUTTON_LEFT) != 0);
+	s_padState.DPadRight = ((PadStatus->button & PAD_BUTTON_RIGHT) != 0);
+
+	s_padState.L         = ((PadStatus->button & PAD_TRIGGER_L) != 0);
+	s_padState.R         = ((PadStatus->button & PAD_TRIGGER_R) != 0);
+	s_padState.TriggerL  = PadStatus->triggerLeft;
+	s_padState.TriggerR  = PadStatus->triggerRight;
+
+	s_padState.AnalogStickX = PadStatus->stickX;
+	s_padState.AnalogStickY = PadStatus->stickY;
+
+	s_padState.CStickX   = PadStatus->substickX;
+	s_padState.CStickY   = PadStatus->substickY;
+
+	s_padState.disc = g_bDiscChange;
+	g_bDiscChange = false;
+	s_padState.reset = g_bReset;
+	g_bReset = false;
+
+	SetInputDisplayString(s_padState, controllerID);
+}
+
+void RecordInput(GCPadStatus* PadStatus, int controllerID)
+{
+	if (!IsRecordingInput() || !IsUsingPad(controllerID))
+		return;
+
+	CheckPadStatus(PadStatus, controllerID);
+
+	EnsureTmpInputSize((size_t)(s_currentByte + 8));
+	memcpy(&(tmpInput[s_currentByte]), &s_padState, 8);
+	s_currentByte += 8;
+	s_totalBytes = s_currentByte;
+}
+
+void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int ext, const wiimote_key key)
+{
+	SetWiiInputDisplayString(wiimote, data, rptf, ext, key);
+
+	if (IsRecordingInput())
+		RecordWiimote(wiimote, data, rptf.size);
+}
+
+void RecordWiimote(int wiimote, u8 *data, u8 size)
+{
+	if (!IsRecordingInput() || !IsUsingWiimote(wiimote))
+		return;
+
+	InputUpdate();
+	EnsureTmpInputSize((size_t)(s_currentByte + size + 1));
+	tmpInput[s_currentByte++] = size;
+	memcpy(&(tmpInput[s_currentByte]), data, size);
+	s_currentByte += size;
+	s_totalBytes = s_currentByte;
+}
+
+void ReadHeader()
+{
+	s_numPads = tmpHeader.numControllers;
+	s_recordingStartTime = tmpHeader.recordingStartTime;
+	if (s_rerecords < tmpHeader.numRerecords)
+		s_rerecords = tmpHeader.numRerecords;
+
+	if (tmpHeader.bSaveConfig)
+	{
+		s_bSaveConfig = true;
+		s_bSkipIdle = tmpHeader.bSkipIdle;
+		s_bDualCore = tmpHeader.bDualCore;
+		s_bProgressive = tmpHeader.bProgressive;
+		s_bDSPHLE = tmpHeader.bDSPHLE;
+		s_bFastDiscSpeed = tmpHeader.bFastDiscSpeed;
+		s_iCPUCore = tmpHeader.CPUCore;
+		g_bClearSave = tmpHeader.bClearSave;
+		s_memcards = tmpHeader.memcards;
+		s_bongos = tmpHeader.bongos;
+		s_bSyncGPU = tmpHeader.bSyncGPU;
+		s_bNetPlay = tmpHeader.bNetPlay;
+		memcpy(s_revision, tmpHeader.revision, ArraySize(s_revision));
+	}
+	else
+	{
+		GetSettings();
+	}
+
+	s_videoBackend = (char*) tmpHeader.videoBackend;
+	g_discChange = (char*) tmpHeader.discChange;
+	s_author = (char*) tmpHeader.author;
+	memcpy(s_MD5, tmpHeader.md5, 16);
+	s_DSPiromHash = tmpHeader.DSPiromHash;
+	s_DSPcoefHash = tmpHeader.DSPcoefHash;
+}
+
+bool PlayInput(const std::string& filename)
+{
+	if (s_playMode != MODE_NONE)
+		return false;
+
+	if (!File::Exists(filename))
+		return false;
+
+	File::IOFile g_recordfd;
+
+	if (!g_recordfd.Open(filename, "rb"))
+		return false;
+
+	g_recordfd.ReadArray(&tmpHeader, 1);
+
+	if (!IsMovieHeader(tmpHeader.filetype))
+	{
+		PanicAlertT("Invalid recording file");
+		g_recordfd.Close();
+		return false;
+	}
+
+	ReadHeader();
+	g_totalFrames = tmpHeader.frameCount;
+	s_totalLagCount = tmpHeader.lagCount;
+	g_totalInputCount = tmpHeader.inputCount;
+	s_totalTickCount = tmpHeader.tickCount;
+	g_currentFrame = 0;
+	g_currentLagCount = 0;
+	g_currentInputCount = 0;
+
+	s_playMode = MODE_PLAYING;
+
+	Core::UpdateWantDeterminism();
+
+	s_totalBytes = g_recordfd.GetSize() - 256;
+	EnsureTmpInputSize((size_t)s_totalBytes);
+	g_recordfd.ReadArray(tmpInput, (size_t)s_totalBytes);
+	s_currentByte = 0;
+	g_recordfd.Close();
+
+	// Load savestate (and skip to frame data)
+	if (tmpHeader.bFromSaveState)
+	{
+		const std::string stateFilename = filename + ".sav";
+		if (File::Exists(stateFilename))
+			Core::SetStateFileName(stateFilename);
+		s_bRecordingFromSaveState = true;
+		Movie::LoadInput(filename);
+	}
+
+	return true;
+}
+
+void DoState(PointerWrap &p)
+{
+	// many of these could be useful to save even when no movie is active,
+	// and the data is tiny, so let's just save it regardless of movie state.
+	p.Do(g_currentFrame);
+	p.Do(s_currentByte);
+	p.Do(g_currentLagCount);
+	p.Do(g_currentInputCount);
+	p.Do(s_bPolled);
+	p.Do(s_tickCountAtLastInput);
+	// other variables (such as s_totalBytes and g_totalFrames) are set in LoadInput
+}
+
+void LoadInput(const std::string& filename)
+{
+	File::IOFile t_record;
+	if (!t_record.Open(filename, "r+b"))
+	{
+		PanicAlertT("Failed to read %s", filename.c_str());
+		EndPlayInput(false);
+		return;
+	}
+
+	t_record.ReadArray(&tmpHeader, 1);
+
+	if (!IsMovieHeader(tmpHeader.filetype))
+	{
+		PanicAlertT("Savestate movie %s is corrupted, movie recording stopping...", filename.c_str());
+		EndPlayInput(false);
+		return;
+	}
+	ReadHeader();
+	if (!s_bReadOnly)
+	{
+		s_rerecords++;
+		tmpHeader.numRerecords = s_rerecords;
+		t_record.Seek(0, SEEK_SET);
+		t_record.WriteArray(&tmpHeader, 1);
+	}
+
+	ChangePads(true);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		ChangeWiiPads(true);
+
+	u64 totalSavedBytes = t_record.GetSize() - 256;
+
+	bool afterEnd = false;
+	// This can only happen if the user manually deletes data from the dtm.
+	if (s_currentByte > totalSavedBytes)
+	{
+		PanicAlertT("Warning: You loaded a save whose movie ends before the current frame in the save (byte %u < %u) (frame %u < %u). You should load another save before continuing.", (u32)totalSavedBytes+256, (u32)s_currentByte+256, (u32)tmpHeader.frameCount, (u32)g_currentFrame);
+		afterEnd = true;
+	}
+
+	if (!s_bReadOnly || tmpInput == nullptr)
+	{
+		g_totalFrames = tmpHeader.frameCount;
+		s_totalLagCount = tmpHeader.lagCount;
+		g_totalInputCount = tmpHeader.inputCount;
+		s_totalTickCount = s_tickCountAtLastInput = tmpHeader.tickCount;
+
+		EnsureTmpInputSize((size_t)totalSavedBytes);
+		s_totalBytes = totalSavedBytes;
+		t_record.ReadArray(tmpInput, (size_t)s_totalBytes);
+	}
+	else if (s_currentByte > 0)
+	{
+		if (s_currentByte > totalSavedBytes)
+		{
+		}
+		else if (s_currentByte > s_totalBytes)
+		{
+			afterEnd = true;
+			PanicAlertT("Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)s_currentByte+256, (u32)s_totalBytes+256, (u32)g_currentFrame, (u32)g_totalFrames);
+		}
+		else if (s_currentByte > 0 && s_totalBytes > 0)
+		{
+			// verify identical from movie start to the save's current frame
+			u32 len = (u32)s_currentByte;
+			u8* movInput = new u8[len];
+			t_record.ReadArray(movInput, (size_t)len);
+			for (u32 i = 0; i < len; ++i)
+			{
+				if (movInput[i] != tmpInput[i])
+				{
+					// this is a "you did something wrong" alert for the user's benefit.
+					// we'll try to say what's going on in excruciating detail, otherwise the user might not believe us.
+					if (IsUsingWiimote(0))
+					{
+						// TODO: more detail
+						PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256);
+						memcpy(tmpInput, movInput, s_currentByte);
+					}
+					else
+					{
+						int frame = i / 8;
+						ControllerState curPadState;
+						memcpy(&curPadState, &(tmpInput[frame*8]), 8);
+						ControllerState movPadState;
+						memcpy(&movPadState, &(movInput[frame*8]), 8);
+						PanicAlertT("Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n\n"
+							"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n\n"
+							"On frame %d, the current movie presses:\n"
+							"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
+							"\n\n"
+							"On frame %d, the savestate's movie presses:\n"
+							"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d",
+							(int)frame,
+							(int)g_totalFrames, (int)tmpHeader.frameCount,
+							(int)frame,
+							(int)curPadState.Start, (int)curPadState.A, (int)curPadState.B, (int)curPadState.X, (int)curPadState.Y, (int)curPadState.Z, (int)curPadState.DPadUp, (int)curPadState.DPadDown, (int)curPadState.DPadLeft, (int)curPadState.DPadRight, (int)curPadState.L, (int)curPadState.R, (int)curPadState.TriggerL, (int)curPadState.TriggerR, (int)curPadState.AnalogStickX, (int)curPadState.AnalogStickY, (int)curPadState.CStickX, (int)curPadState.CStickY,
+							(int)frame,
+							(int)movPadState.Start, (int)movPadState.A, (int)movPadState.B, (int)movPadState.X, (int)movPadState.Y, (int)movPadState.Z, (int)movPadState.DPadUp, (int)movPadState.DPadDown, (int)movPadState.DPadLeft, (int)movPadState.DPadRight, (int)movPadState.L, (int)movPadState.R, (int)movPadState.TriggerL, (int)movPadState.TriggerR, (int)movPadState.AnalogStickX, (int)movPadState.AnalogStickY, (int)movPadState.CStickX, (int)movPadState.CStickY);
+
+					}
+					break;
+				}
+			}
+			delete [] movInput;
+		}
+	}
+	t_record.Close();
+
+	s_bSaveConfig = tmpHeader.bSaveConfig;
+
+	if (!afterEnd)
+	{
+		if (s_bReadOnly)
+		{
+			if (s_playMode != MODE_PLAYING)
+			{
+				s_playMode = MODE_PLAYING;
+				Core::DisplayMessage("Switched to playback", 2000);
+			}
+		}
+		else
+		{
+			if (s_playMode != MODE_RECORDING)
+			{
+				s_playMode = MODE_RECORDING;
+				Core::DisplayMessage("Switched to recording", 2000);
+			}
+		}
+	}
+	else
+	{
+		EndPlayInput(false);
+	}
+}
+
+static void CheckInputEnd()
+{
+	if (g_currentFrame > g_totalFrames || s_currentByte >= s_totalBytes || (CoreTiming::GetTicks() > s_totalTickCount && !IsRecordingInputFromSaveState()))
+	{
+		EndPlayInput(!s_bReadOnly);
+	}
+}
+
+void PlayController(GCPadStatus* PadStatus, int controllerID)
+{
+	// Correct playback is entirely dependent on the emulator polling the controllers
+	// in the same order done during recording
+	if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == nullptr)
+		return;
+
+	if (s_currentByte + 8 > s_totalBytes)
+	{
+		PanicAlertT("Premature movie end in PlayController. %u + 8 > %u", (u32)s_currentByte, (u32)s_totalBytes);
+		EndPlayInput(!s_bReadOnly);
+		return;
+	}
+
+	// dtm files don't save the mic button or error bit. not sure if they're actually used, but better safe than sorry
+	signed char e = PadStatus->err;
+	memset(PadStatus, 0, sizeof(GCPadStatus));
+	PadStatus->err = e;
+
+
+	memcpy(&s_padState, &(tmpInput[s_currentByte]), 8);
+	s_currentByte += 8;
+
+	PadStatus->triggerLeft = s_padState.TriggerL;
+	PadStatus->triggerRight = s_padState.TriggerR;
+
+	PadStatus->stickX = s_padState.AnalogStickX;
+	PadStatus->stickY = s_padState.AnalogStickY;
+
+	PadStatus->substickX = s_padState.CStickX;
+	PadStatus->substickY = s_padState.CStickY;
+
+	PadStatus->button |= PAD_USE_ORIGIN;
+
+	if (s_padState.A)
+	{
+		PadStatus->button |= PAD_BUTTON_A;
+		PadStatus->analogA = 0xFF;
+	}
+	if (s_padState.B)
+	{
+		PadStatus->button |= PAD_BUTTON_B;
+		PadStatus->analogB = 0xFF;
+	}
+	if (s_padState.X)
+		PadStatus->button |= PAD_BUTTON_X;
+	if (s_padState.Y)
+		PadStatus->button |= PAD_BUTTON_Y;
+	if (s_padState.Z)
+		PadStatus->button |= PAD_TRIGGER_Z;
+	if (s_padState.Start)
+		PadStatus->button |= PAD_BUTTON_START;
+
+	if (s_padState.DPadUp)
+		PadStatus->button |= PAD_BUTTON_UP;
+	if (s_padState.DPadDown)
+		PadStatus->button |= PAD_BUTTON_DOWN;
+	if (s_padState.DPadLeft)
+		PadStatus->button |= PAD_BUTTON_LEFT;
+	if (s_padState.DPadRight)
+		PadStatus->button |= PAD_BUTTON_RIGHT;
+
+	if (s_padState.L)
+		PadStatus->button |= PAD_TRIGGER_L;
+	if (s_padState.R)
+		PadStatus->button |= PAD_TRIGGER_R;
+	if (s_padState.disc)
+	{
+		// This implementation assumes the disc change will only happen once. Trying to change more than that will cause
+		// it to load the last disc every time. As far as i know though, there are no 3+ disc games, so this should be fine.
+		Core::SetState(Core::CORE_PAUSE);
+		bool found = false;
+		std::string path;
+		for (size_t i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); ++i)
+		{
+			path = SConfig::GetInstance().m_ISOFolder[i];
+			if (File::Exists(path + '/' + g_discChange))
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
+		{
+			DVDInterface::ChangeDisc(path + '/' + g_discChange);
+			Core::SetState(Core::CORE_RUN);
+		}
+		else
+		{
+			PanicAlertT("Change the disc to %s", g_discChange.c_str());
+		}
+	}
+
+	if (s_padState.reset)
+		ProcessorInterface::ResetButton_Tap();
+
+	SetInputDisplayString(s_padState, controllerID);
+	CheckInputEnd();
+}
+
+bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int ext, const wiimote_key key)
+{
+	if (!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == nullptr)
+		return false;
+
+	if (s_currentByte > s_totalBytes)
+	{
+		PanicAlertT("Premature movie end in PlayWiimote. %u > %u", (u32)s_currentByte, (u32)s_totalBytes);
+		EndPlayInput(!s_bReadOnly);
+		return false;
+	}
+
+	u8 size = rptf.size;
+
+	u8 sizeInMovie = tmpInput[s_currentByte];
+
+	if (size != sizeInMovie)
+	{
+		PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)s_currentByte,
+					(s_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > GameCube > Device Settings)." : "");
+		EndPlayInput(!s_bReadOnly);
+		return false;
+	}
+
+	s_currentByte++;
+
+	if (s_currentByte + size > s_totalBytes)
+	{
+		PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)s_currentByte, size, (u32)s_totalBytes);
+		EndPlayInput(!s_bReadOnly);
+		return false;
+	}
+
+	memcpy(data, &(tmpInput[s_currentByte]), size);
+	s_currentByte += size;
+
+	g_currentInputCount++;
+
+	CheckInputEnd();
+	return true;
+}
+
+void EndPlayInput(bool cont)
+{
+	if (cont)
+	{
+		s_playMode = MODE_RECORDING;
+		Core::DisplayMessage("Reached movie end. Resuming recording.", 2000);
+	}
+	else if (s_playMode != MODE_NONE)
+	{
+		s_rerecords = 0;
+		s_currentByte = 0;
+		s_playMode = MODE_NONE;
+		Core::UpdateWantDeterminism();
+		Core::DisplayMessage("Movie End.", 2000);
+		s_bRecordingFromSaveState = false;
+		// we don't clear these things because otherwise we can't resume playback if we load a movie state later
+		//g_totalFrames = s_totalBytes = 0;
+		//delete tmpInput;
+		//tmpInput = nullptr;
+	}
+}
+
+void SaveRecording(const std::string& filename)
+{
+	File::IOFile save_record(filename, "wb");
+	// Create the real header now and write it
+	DTMHeader header;
+	memset(&header, 0, sizeof(DTMHeader));
+
+	header.filetype[0] = 'D'; header.filetype[1] = 'T'; header.filetype[2] = 'M'; header.filetype[3] = 0x1A;
+	strncpy((char *)header.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), 6);
+	header.bWii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
+	header.numControllers = s_numPads & (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 0xFF : 0x0F);
+
+	header.bFromSaveState = s_bRecordingFromSaveState;
+	header.frameCount = g_totalFrames;
+	header.lagCount = s_totalLagCount;
+	header.inputCount = g_totalInputCount;
+	header.numRerecords = s_rerecords;
+	header.recordingStartTime = s_recordingStartTime;
+
+	header.bSaveConfig = true;
+	header.bSkipIdle = s_bSkipIdle;
+	header.bDualCore = s_bDualCore;
+	header.bProgressive = s_bProgressive;
+	header.bDSPHLE = s_bDSPHLE;
+	header.bFastDiscSpeed = s_bFastDiscSpeed;
+	strncpy((char *)header.videoBackend, s_videoBackend.c_str(),ArraySize(header.videoBackend));
+	header.CPUCore = s_iCPUCore;
+	header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable;
+	header.bEFBCopyEnable = true;
+	header.bSkipEFBCopyToRam = g_ActiveConfig.bSkipEFBCopyToRam;
+	header.bEFBCopyCacheEnable = false;
+	header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges;
+	header.bUseXFB = g_ActiveConfig.bUseXFB;
+	header.bUseRealXFB = g_ActiveConfig.bUseRealXFB;
+	header.memcards = s_memcards;
+	header.bClearSave = g_bClearSave;
+	header.bSyncGPU = s_bSyncGPU;
+	header.bNetPlay = s_bNetPlay;
+	strncpy((char *)header.discChange, g_discChange.c_str(),ArraySize(header.discChange));
+	strncpy((char *)header.author, s_author.c_str(),ArraySize(header.author));
+	memcpy(header.md5,s_MD5,16);
+	header.bongos = s_bongos;
+	memcpy(header.revision, s_revision, ArraySize(header.revision));
+	header.DSPiromHash = s_DSPiromHash;
+	header.DSPcoefHash = s_DSPcoefHash;
+	header.tickCount = s_totalTickCount;
+
+	// TODO
+	header.uniqueID = 0;
+	// header.audioEmulator;
+
+	save_record.WriteArray(&header, 1);
+
+	bool success = save_record.WriteArray(tmpInput, (size_t)s_totalBytes);
+
+	if (success && s_bRecordingFromSaveState)
+	{
+		std::string stateFilename = filename + ".sav";
+		success = File::Copy(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav", stateFilename);
+	}
+
+	if (success)
+		Core::DisplayMessage(StringFromFormat("DTM %s saved", filename.c_str()), 2000);
+	else
+		Core::DisplayMessage(StringFromFormat("Failed to save %s", filename.c_str()), 2000);
+}
+
+void SetGCInputManip(GCManipFunction func)
+{
+	gcmfunc = func;
+}
+void SetWiiInputManip(WiiManipFunction func)
+{
+	wiimfunc = func;
+}
+
+void CallGCInputManip(GCPadStatus* PadStatus, int controllerID)
+{
+	if (gcmfunc)
+		(*gcmfunc)(PadStatus, controllerID);
+}
+void CallWiiInputManip(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key)
+{
+	if (wiimfunc)
+		(*wiimfunc)(data, rptf, controllerID, ext, key);
+}
+
+void SetGraphicsConfig()
+{
+	g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable;
+	g_Config.bSkipEFBCopyToRam = tmpHeader.bSkipEFBCopyToRam;
+	g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges;
+	g_Config.bUseXFB = tmpHeader.bUseXFB;
+	g_Config.bUseRealXFB = tmpHeader.bUseRealXFB;
+}
+
+void GetSettings()
+{
+	s_bSaveConfig = true;
+	s_bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle;
+	s_bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
+	s_bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;
+	s_bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE;
+	s_bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed;
+	s_videoBackend = g_video_backend->GetName();
+	s_bSyncGPU = SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU;
+	s_iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
+	s_bNetPlay = NetPlay::IsNetPlayRunning();
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
+	s_memcards |= (SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD) << 0;
+	s_memcards |= (SConfig::GetInstance().m_EXIDevice[1] == EXIDEVICE_MEMORYCARD) << 1;
+	unsigned int tmp;
+	for (int i = 0; i < 20; ++i)
+	{
+		sscanf(&scm_rev_git_str[2 * i], "%02x", &tmp);
+		s_revision[i] = tmp;
+	}
+	if (!s_bDSPHLE)
+	{
+		std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM;
+		std::string coef_file = File::GetUserPath(D_GCUSER_IDX) + DSP_COEF;
+
+		if (!File::Exists(irom_file))
+			irom_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_IROM;
+		if (!File::Exists(coef_file))
+			coef_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_COEF;
+		std::vector<u16> irom(DSP_IROM_SIZE);
+		File::IOFile file_irom(irom_file, "rb");
+
+		file_irom.ReadArray(irom.data(), DSP_IROM_SIZE);
+		file_irom.Close();
+		for (int i = 0; i < DSP_IROM_SIZE; ++i)
+			irom[i] = Common::swap16(irom[i]);
+
+		std::vector<u16> coef(DSP_COEF_SIZE);
+		File::IOFile file_coef(coef_file, "rb");
+
+		file_coef.ReadArray(coef.data(), DSP_COEF_SIZE);
+		file_coef.Close();
+		for (int i = 0; i < DSP_COEF_SIZE; ++i)
+			coef[i] = Common::swap16(coef[i]);
+		s_DSPiromHash = HashAdler32((u8*)irom.data(), DSP_IROM_BYTE_SIZE);
+		s_DSPcoefHash = HashAdler32((u8*)coef.data(), DSP_COEF_BYTE_SIZE);
+	}
+	else
+	{
+		s_DSPiromHash = 0;
+		s_DSPcoefHash = 0;
+	}
+}
+
+void CheckMD5()
+{
+	for (int i = 0, n = 0; i < 16; ++i)
+	{
+		if (tmpHeader.md5[i] != 0)
+			continue;
+		n++;
+		if (n == 16)
+			return;
+	}
+	Core::DisplayMessage("Verifying checksum...", 2000);
+
+	unsigned char gameMD5[16];
+	md5_file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), gameMD5);
+
+	if (memcmp(gameMD5,s_MD5,16) == 0)
+		Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000);
+	else
+		Core::DisplayMessage("Checksum of current game does not match the recorded game!", 3000);
+}
+
+void GetMD5()
+{
+	Core::DisplayMessage("Calculating checksum of game file...", 2000);
+	memset(s_MD5, 0, sizeof(s_MD5));
+	md5_file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), s_MD5);
+	Core::DisplayMessage("Finished calculating checksum.", 2000);
+}
+
+void Shutdown()
+{
+	g_currentInputCount = g_totalInputCount = g_totalFrames = s_totalBytes = s_tickCountAtLastInput = 0;
+	delete [] tmpInput;
+	tmpInput = nullptr;
+	tmpInputAllocated = 0;
+}
+};
diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
new file mode 100644
index 0000000000..6c9be3f279
--- /dev/null
+++ b/Source/Core/Core/Movie.h
@@ -0,0 +1,186 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+struct GCPadStatus;
+class PointerWrap;
+struct wiimote_key;
+
+namespace WiimoteEmu
+{
+struct ReportFeatures;
+}
+
+// Per-(video )Movie actions
+
+namespace Movie
+{
+
+// Enumerations and structs
+enum PlayMode
+{
+	MODE_NONE = 0,
+	MODE_RECORDING,
+	MODE_PLAYING
+};
+
+// GameCube Controller State
+#pragma pack(push,1)
+struct ControllerState
+{
+	bool Start:1, A:1, B:1, X:1, Y:1, Z:1; // Binary buttons, 6 bits
+	bool DPadUp:1, DPadDown:1,             // Binary D-Pad buttons, 4 bits
+	     DPadLeft:1, DPadRight:1;
+	bool L:1, R:1;                         // Binary triggers, 2 bits
+	bool disc:1;                           // Checks for disc being changed
+	bool reset:1;                          // Console reset button
+	bool reserved:2;                       // Reserved bits used for padding, 2 bits
+
+	u8   TriggerL, TriggerR;               // Triggers, 16 bits
+	u8   AnalogStickX, AnalogStickY;       // Main Stick, 16 bits
+	u8   CStickX, CStickY;                 // Sub-Stick, 16 bits
+};
+static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes");
+#pragma pack(pop)
+
+// Global declarations
+extern bool g_bDiscChange, g_bClearSave, g_bReset;
+extern u64 g_titleID;
+
+extern u64 g_currentFrame, g_totalFrames;
+extern u64 g_currentLagCount;
+extern u64 g_currentInputCount, g_totalInputCount;
+extern std::string g_discChange;
+
+#pragma pack(push,1)
+struct DTMHeader
+{
+	u8 filetype[4];         // Unique Identifier (always "DTM"0x1A)
+
+	u8 gameID[6];           // The Game ID
+	bool bWii;              // Wii game
+
+	u8  numControllers;     // The number of connected controllers (1-4)
+
+	bool bFromSaveState;    // false indicates that the recording started from bootup, true for savestate
+	u64 frameCount;         // Number of frames in the recording
+	u64 inputCount;         // Number of input frames in recording
+	u64 lagCount;           // Number of lag frames in the recording
+	u64 uniqueID;           // (not implemented) A Unique ID comprised of: md5(time + Game ID)
+	u32 numRerecords;       // Number of rerecords/'cuts' of this TAS
+	u8  author[32];         // Author's name (encoded in UTF-8)
+
+	u8  videoBackend[16];   // UTF-8 representation of the video backend
+	u8  audioEmulator[16];  // UTF-8 representation of the audio emulator
+	u8  md5[16];            // MD5 of game iso
+
+	u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC)
+
+	bool bSaveConfig;       // Loads the settings below on startup if true
+	bool bSkipIdle;
+	bool bDualCore;
+	bool bProgressive;
+	bool bDSPHLE;
+	bool bFastDiscSpeed;
+	u8   CPUCore;           // 0 = interpreter, 1 = JIT, 2 = JITIL
+	bool bEFBAccessEnable;
+	bool bEFBCopyEnable;
+	bool bSkipEFBCopyToRam;
+	bool bEFBCopyCacheEnable;
+	bool bEFBEmulateFormatChanges;
+	bool bUseXFB;
+	bool bUseRealXFB;
+	u8   memcards;
+	bool bClearSave;        // Create a new memory card when playing back a movie if true
+	u8   bongos;
+	bool bSyncGPU;
+	bool bNetPlay;
+	u8   reserved[13];      // Padding for any new config options
+	u8   discChange[40];    // Name of iso file to switch to, for two disc games.
+	u8   revision[20];      // Git hash
+	u32  DSPiromHash;
+	u32  DSPcoefHash;
+	u64  tickCount;	        // Number of ticks in the recording
+	u8   reserved2[11];     // Make heading 256 bytes, just because we can
+};
+static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes");
+
+#pragma pack(pop)
+
+void FrameUpdate();
+void InputUpdate();
+void Init();
+
+void SetPolledDevice();
+
+bool IsRecordingInput();
+bool IsRecordingInputFromSaveState();
+bool IsJustStartingRecordingInputFromSaveState();
+bool IsJustStartingPlayingInputFromSaveState();
+bool IsPlayingInput();
+bool IsMovieActive();
+bool IsReadOnly();
+u64  GetRecordingStartTime();
+
+bool IsConfigSaved();
+bool IsDualCore();
+bool IsProgressive();
+bool IsSkipIdle();
+bool IsDSPHLE();
+bool IsFastDiscSpeed();
+int  GetCPUMode();
+bool IsStartingFromClearSave();
+bool IsUsingMemcard(int memcard);
+bool IsSyncGPU();
+void SetGraphicsConfig();
+void GetSettings();
+bool IsNetPlayRecording();
+
+bool IsUsingPad(int controller);
+bool IsUsingWiimote(int wiimote);
+bool IsUsingBongo(int controller);
+void ChangePads(bool instantly = false);
+void ChangeWiiPads(bool instantly = false);
+
+void DoFrameStep();
+void SetFrameStopping(bool bEnabled);
+void SetReadOnly(bool bEnabled);
+
+void SetFrameSkipping(unsigned int framesToSkip);
+void FrameSkipping();
+
+bool BeginRecordingInput(int controllers);
+void RecordInput(GCPadStatus* PadStatus, int controllerID);
+void RecordWiimote(int wiimote, u8 *data, u8 size);
+
+bool PlayInput(const std::string& filename);
+void LoadInput(const std::string& filename);
+void ReadHeader();
+void PlayController(GCPadStatus* PadStatus, int controllerID);
+bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int ext, const wiimote_key key);
+void EndPlayInput(bool cont);
+void SaveRecording(const std::string& filename);
+void DoState(PointerWrap &p);
+void CheckMD5();
+void GetMD5();
+void Shutdown();
+void CheckPadStatus(GCPadStatus* PadStatus, int controllerID);
+void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int ext, const wiimote_key key);
+
+std::string GetInputDisplay();
+
+// Done this way to avoid mixing of core and gui code
+typedef void(*GCManipFunction)(GCPadStatus*, int);
+typedef void(*WiiManipFunction)(u8*, WiimoteEmu::ReportFeatures, int, int, wiimote_key);
+
+void SetGCInputManip(GCManipFunction);
+void SetWiiInputManip(WiiManipFunction);
+void CallGCInputManip(GCPadStatus* PadStatus, int controllerID);
+void CallWiiInputManip(u8* core, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key);
+}
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
new file mode 100644
index 0000000000..eeae193110
--- /dev/null
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -0,0 +1,1146 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ENetUtil.h"
+#include "Common/Timer.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayClient.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/SI_DeviceDanceMat.h"
+#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI_DeviceGCSteeringWheel.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+
+static std::mutex crit_netplay_client;
+static NetPlayClient * netplay_client = nullptr;
+NetSettings g_NetPlaySettings;
+
+// called from ---GUI--- thread
+NetPlayClient::~NetPlayClient()
+{
+	// not perfect
+	if (m_is_running.load())
+		StopGame();
+
+	if (is_connected)
+	{
+		m_do_loop.store(false);
+		m_thread.join();
+	}
+
+	if (m_server)
+	{
+		Disconnect();
+	}
+
+	if (g_MainNetHost.get() == m_client)
+	{
+		g_MainNetHost.release();
+	}
+	if (m_client)
+	{
+		enet_host_destroy(m_client);
+		m_client = nullptr;
+	}
+
+	if (m_traversal_client)
+	{
+		ReleaseTraversalClient();
+	}
+}
+
+// called from ---GUI--- thread
+NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name, bool traversal, const std::string& centralServer, u16 centralPort)
+	: m_state(Failure)
+	, m_dialog(dialog)
+	, m_client(nullptr)
+	, m_server(nullptr)
+	, m_is_running(false)
+	, m_do_loop(true)
+	, m_target_buffer_size()
+	, m_local_player(nullptr)
+	, m_current_game(0)
+	, m_is_recording(false)
+	, m_pid(0)
+	, m_connecting(false)
+	, m_traversal_client(nullptr)
+{
+	m_target_buffer_size = 20;
+	ClearBuffers();
+
+	is_connected = false;
+
+	m_player_name = name;
+
+	if (!traversal)
+	{
+		//Direct Connection
+		m_client = enet_host_create(nullptr, 1, 3, 0, 0);
+
+		if (m_client == nullptr)
+		{
+			PanicAlertT("Couldn't Create Client");
+		}
+
+		ENetAddress addr;
+		enet_address_set_host(&addr, address.c_str());
+		addr.port = port;
+
+		m_server = enet_host_connect(m_client, &addr, 3, 0);
+
+		if (m_server == nullptr)
+		{
+			PanicAlertT("Couldn't create peer.");
+		}
+
+		ENetEvent netEvent;
+		int net = enet_host_service(m_client, &netEvent, 5000);
+		if (net > 0 && netEvent.type == ENET_EVENT_TYPE_CONNECT)
+		{
+			if (Connect())
+			{
+				m_client->intercept = ENetUtil::InterceptCallback;
+				m_thread = std::thread(&NetPlayClient::ThreadFunc, this);
+			}
+		}
+		else
+		{
+			PanicAlertT("Failed to Connect!");
+		}
+
+	}
+	else
+	{
+		if (address.size() > NETPLAY_CODE_SIZE)
+		{
+			PanicAlertT("Host code size is to large.\nPlease recheck that you have the correct code");
+			return;
+		}
+
+		if (!EnsureTraversalClient(centralServer, centralPort))
+			return;
+		m_client = g_MainNetHost.get();
+
+		m_traversal_client = g_TraversalClient.get();
+
+		// If we were disconnected in the background, reconnect.
+		if (m_traversal_client->m_State == TraversalClient::Failure)
+			m_traversal_client->ReconnectToServer();
+		m_traversal_client->m_Client = this;
+		m_host_spec = address;
+		m_state = WaitingForTraversalClientConnection;
+		OnTraversalStateChanged();
+		m_connecting = true;
+
+		Common::Timer connect_timer;
+		connect_timer.Start();
+
+		while (m_connecting)
+		{
+			ENetEvent netEvent;
+			if (m_traversal_client)
+				m_traversal_client->HandleResends();
+
+			while (enet_host_service(m_client, &netEvent, 4) > 0)
+			{
+				sf::Packet rpac;
+				switch (netEvent.type)
+				{
+				case ENET_EVENT_TYPE_CONNECT:
+					m_server = netEvent.peer;
+					if (Connect())
+					{
+						m_state = Connected;
+						m_thread = std::thread(&NetPlayClient::ThreadFunc, this);
+					}
+					return;
+				default:
+					break;
+				}
+			}
+			if (connect_timer.GetTimeElapsed() > 5000)
+				break;
+		}
+		PanicAlertT("Failed To Connect!");
+	}
+}
+
+bool NetPlayClient::Connect()
+{
+	// send connect message
+	sf::Packet spac;
+	spac << NETPLAY_VERSION;
+	spac << netplay_dolphin_ver;
+	spac << m_player_name;
+	Send(spac);
+	enet_host_flush(m_client);
+	sf::Packet rpac;
+	// TODO: make this not hang
+	ENetEvent netEvent;
+	if (enet_host_service(m_client, &netEvent, 5000) > 0 && netEvent.type == ENET_EVENT_TYPE_RECEIVE)
+	{
+		rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
+	}
+	else
+	{
+		return false;
+	}
+
+	MessageId error;
+	rpac >> error;
+
+	// got error message
+	if (error)
+	{
+		switch (error)
+		{
+		case CON_ERR_SERVER_FULL:
+			PanicAlertT("The server is full!");
+			break;
+		case CON_ERR_VERSION_MISMATCH:
+			PanicAlertT("The server and client's NetPlay versions are incompatible!");
+			break;
+		case CON_ERR_GAME_RUNNING:
+			PanicAlertT("The server responded: the game is currently running!");
+			break;
+		default:
+			PanicAlertT("The server sent an unknown error message!");
+			break;
+		}
+
+		Disconnect();
+		return false;
+	}
+	else
+	{
+		rpac >> m_pid;
+
+		Player player;
+		player.name = m_player_name;
+		player.pid = m_pid;
+		player.revision = netplay_dolphin_ver;
+
+		// add self to player list
+		m_players[m_pid] = player;
+		m_local_player = &m_players[m_pid];
+
+		m_dialog->Update();
+
+		is_connected = true;
+
+		return true;
+	}
+}
+
+// called from ---NETPLAY--- thread
+unsigned int NetPlayClient::OnData(sf::Packet& packet)
+{
+	MessageId mid;
+	packet >> mid;
+
+	switch (mid)
+	{
+	case NP_MSG_PLAYER_JOIN:
+	{
+		Player player;
+		packet >> player.pid;
+		packet >> player.name;
+		packet >> player.revision;
+
+		{
+			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+			m_players[player.pid] = player;
+		}
+
+		m_dialog->Update();
+	}
+	break;
+
+	case NP_MSG_PLAYER_LEAVE:
+	{
+		PlayerId pid;
+		packet >> pid;
+
+		{
+			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+			m_players.erase(m_players.find(pid));
+		}
+
+		m_dialog->Update();
+	}
+	break;
+
+	case NP_MSG_CHAT_MESSAGE:
+	{
+		PlayerId pid;
+		packet >> pid;
+		std::string msg;
+		packet >> msg;
+
+		// don't need lock to read in this thread
+		const Player& player = m_players[pid];
+
+		// add to gui
+		std::ostringstream ss;
+		ss << player.name << '[' << (char)(pid + '0') << "]: " << msg;
+
+		m_dialog->AppendChat(ss.str());
+	}
+	break;
+
+	case NP_MSG_PAD_MAPPING:
+	{
+		for (PadMapping& mapping : m_pad_map)
+		{
+			packet >> mapping;
+		}
+
+		UpdateDevices();
+
+		m_dialog->Update();
+	}
+	break;
+
+	case NP_MSG_WIIMOTE_MAPPING:
+	{
+		for (PadMapping& mapping : m_wiimote_map)
+		{
+			packet >> mapping;
+		}
+
+		m_dialog->Update();
+	}
+	break;
+
+	case NP_MSG_PAD_DATA:
+	{
+		PadMapping map = 0;
+		GCPadStatus pad;
+		packet >> map >> pad.button >> pad.analogA >> pad.analogB >> pad.stickX >> pad.stickY >> pad.substickX >> pad.substickY >> pad.triggerLeft >> pad.triggerRight;
+
+		// trusting server for good map value (>=0 && <4)
+		// add to pad buffer
+		m_pad_buffer[map].Push(pad);
+	}
+	break;
+
+	case NP_MSG_WIIMOTE_DATA:
+	{
+		PadMapping map = 0;
+		NetWiimote nw;
+		u8 size;
+		packet >> map >> size;
+
+		nw.resize(size);
+
+		for (unsigned int i = 0; i < size; ++i)
+			packet >> nw[i];
+
+		// trusting server for good map value (>=0 && <4)
+		// add to Wiimote buffer
+		m_wiimote_buffer[(unsigned)map].Push(nw);
+	}
+	break;
+
+
+	case NP_MSG_PAD_BUFFER:
+	{
+		u32 size = 0;
+		packet >> size;
+
+		m_target_buffer_size = size;
+	}
+	break;
+
+	case NP_MSG_CHANGE_GAME:
+	{
+		{
+			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+			packet >> m_selected_game;
+		}
+
+		// update gui
+		m_dialog->OnMsgChangeGame(m_selected_game);
+	}
+	break;
+
+	case NP_MSG_START_GAME:
+	{
+		{
+			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+			packet >> m_current_game;
+			packet >> g_NetPlaySettings.m_CPUthread;
+			packet >> g_NetPlaySettings.m_CPUcore;
+			packet >> g_NetPlaySettings.m_DSPEnableJIT;
+			packet >> g_NetPlaySettings.m_DSPHLE;
+			packet >> g_NetPlaySettings.m_WriteToMemcard;
+			packet >> g_NetPlaySettings.m_OCEnable;
+			packet >> g_NetPlaySettings.m_OCFactor;
+
+			int tmp;
+			packet >> tmp;
+			g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices)tmp;
+			packet >> tmp;
+			g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices)tmp;
+
+			u32 time_low, time_high;
+			packet >> time_low;
+			packet >> time_high;
+			g_netplay_initial_gctime = time_low | ((u64)time_high << 32);
+		}
+
+		m_dialog->OnMsgStartGame();
+	}
+	break;
+
+	case NP_MSG_STOP_GAME:
+	{
+		m_dialog->OnMsgStopGame();
+	}
+	break;
+
+	case NP_MSG_DISABLE_GAME:
+	{
+		PanicAlertT("Other client disconnected while game is running!! NetPlay is disabled. You must manually stop the game.");
+		m_is_running.store(false);
+		NetPlay_Disable();
+	}
+	break;
+
+	case NP_MSG_PING:
+	{
+		u32 ping_key = 0;
+		packet >> ping_key;
+
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_PONG;
+		spac << ping_key;
+
+		Send(spac);
+	}
+	break;
+
+	case NP_MSG_PLAYER_PING_DATA:
+	{
+		PlayerId pid;
+		packet >> pid;
+
+		{
+			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+			Player& player = m_players[pid];
+			packet >> player.ping;
+		}
+
+		m_dialog->Update();
+	}
+	break;
+
+	case NP_MSG_DESYNC_DETECTED:
+	{
+		int pid_to_blame;
+		u32 frame;
+		packet >> pid_to_blame;
+		packet >> frame;
+		const char* blame_str = "";
+		const char* blame_name = "";
+		std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+		if (pid_to_blame != -1)
+		{
+			auto it = m_players.find(pid_to_blame);
+			blame_str = " from player ";
+			blame_name = it != m_players.end() ? it->second.name.c_str() : "??";
+		}
+
+		m_dialog->AppendChat(StringFromFormat("/!\\ Possible desync detected%s%s on frame %u", blame_str, blame_name, frame));
+	}
+	break;
+
+	default:
+		PanicAlertT("Unknown message received with id : %d", mid);
+		break;
+
+	}
+
+	return 0;
+}
+
+void NetPlayClient::Send(sf::Packet& packet)
+{
+	ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
+	enet_peer_send(m_server, 0, epac);
+}
+
+void NetPlayClient::Disconnect()
+{
+	ENetEvent netEvent;
+	m_connecting = false;
+	m_state = Failure;
+	if (m_server)
+		enet_peer_disconnect(m_server, 0);
+	else
+		return;
+
+	while (enet_host_service(m_client, &netEvent, 3000) > 0)
+	{
+		switch (netEvent.type)
+		{
+		case ENET_EVENT_TYPE_RECEIVE:
+			enet_packet_destroy(netEvent.packet);
+			break;
+		case ENET_EVENT_TYPE_DISCONNECT:
+			m_server = nullptr;
+			return;
+		default:
+			break;
+		}
+	}
+	//didn't disconnect gracefully force disconnect
+	enet_peer_reset(m_server);
+	m_server = nullptr;
+}
+
+void NetPlayClient::SendAsync(sf::Packet* packet)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lkq(m_crit.async_queue_write);
+		m_async_queue.Push(std::unique_ptr<sf::Packet>(packet));
+	}
+	ENetUtil::WakeupThread(m_client);
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::ThreadFunc()
+{
+	while (m_do_loop.load())
+	{
+		ENetEvent netEvent;
+		int net;
+		if (m_traversal_client)
+			m_traversal_client->HandleResends();
+		net = enet_host_service(m_client, &netEvent, 250);
+		while (!m_async_queue.Empty())
+		{
+			Send(*(m_async_queue.Front().get()));
+			m_async_queue.Pop();
+		}
+		if (net > 0)
+		{
+			sf::Packet rpac;
+			switch (netEvent.type)
+			{
+			case ENET_EVENT_TYPE_RECEIVE:
+				rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
+				OnData(rpac);
+
+				enet_packet_destroy(netEvent.packet);
+				break;
+			case ENET_EVENT_TYPE_DISCONNECT:
+				m_is_running.store(false);
+				NetPlay_Disable();
+				m_dialog->AppendChat("< LOST CONNECTION TO SERVER >");
+				PanicAlertT("Lost connection to server!");
+				m_do_loop.store(false);
+
+				netEvent.peer->data = nullptr;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	Disconnect();
+	return;
+}
+
+// called from ---GUI--- thread
+void NetPlayClient::GetPlayerList(std::string& list, std::vector<int>& pid_list)
+{
+	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+
+	std::ostringstream ss;
+
+	std::map<PlayerId, Player>::const_iterator
+		i = m_players.begin(),
+		e = m_players.end();
+	for (; i != e; ++i)
+	{
+		const Player *player = &(i->second);
+		ss << player->name << "[" << (int)player->pid << "] : " << player->revision << " | ";
+		for (unsigned int j = 0; j < 4; j++)
+		{
+			if (m_pad_map[j] == player->pid)
+				ss << j + 1;
+			else
+				ss << '-';
+		}
+		for (unsigned int j = 0; j < 4; j++)
+		{
+			if (m_wiimote_map[j] == player->pid)
+				ss << j + 1;
+			else
+				ss << '-';
+		}
+		ss << " |\nPing: " << player->ping << "ms\n\n";
+		pid_list.push_back(player->pid);
+	}
+
+	list = ss.str();
+}
+
+// called from ---GUI--- thread
+void NetPlayClient::GetPlayers(std::vector<const Player *> &player_list)
+{
+	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+	std::map<PlayerId, Player>::const_iterator
+		i = m_players.begin(),
+		e = m_players.end();
+	for (; i != e; ++i)
+	{
+		const Player *player = &(i->second);
+		player_list.push_back(player);
+	}
+}
+
+
+// called from ---GUI--- thread
+void NetPlayClient::SendChatMessage(const std::string& msg)
+{
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_CHAT_MESSAGE;
+	*spac << msg;
+	SendAsync(spac);
+}
+
+// called from ---CPU--- thread
+void NetPlayClient::SendPadState(const PadMapping in_game_pad, const GCPadStatus& pad)
+{
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_PAD_DATA;
+	*spac << in_game_pad;
+	*spac << pad.button << pad.analogA << pad.analogB << pad.stickX << pad.stickY << pad.substickX << pad.substickY << pad.triggerLeft << pad.triggerRight;
+
+	SendAsync(spac);
+}
+
+// called from ---CPU--- thread
+void NetPlayClient::SendWiimoteState(const PadMapping in_game_pad, const NetWiimote& nw)
+{
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_WIIMOTE_DATA;
+	*spac << in_game_pad;
+	*spac << (u8)nw.size();
+	for (auto it : nw)
+	{
+		*spac << it;
+	}
+	SendAsync(spac);
+}
+
+// called from ---GUI--- thread
+bool NetPlayClient::StartGame(const std::string &path)
+{
+	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+	// tell server i started the game
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_START_GAME;
+	*spac << m_current_game;
+	*spac << (char *)&g_NetPlaySettings;
+	SendAsync(spac);
+
+	if (m_is_running.load())
+	{
+		PanicAlertT("Game is already running!");
+		return false;
+	}
+
+	m_dialog->AppendChat(" -- STARTING GAME -- ");
+
+	m_timebase_frame = 0;
+
+	m_is_running.store(true);
+	NetPlay_Enable(this);
+
+	ClearBuffers();
+
+	if (m_dialog->IsRecording())
+	{
+
+		if (Movie::IsReadOnly())
+			Movie::SetReadOnly(false);
+
+		u8 controllers_mask = 0;
+		for (unsigned int i = 0; i < 4; ++i)
+		{
+			if (m_pad_map[i] > 0)
+				controllers_mask |= (1 << i);
+			if (m_wiimote_map[i] > 0)
+				controllers_mask |= (1 << (i + 4));
+		}
+		Movie::BeginRecordingInput(controllers_mask);
+	}
+
+	// boot game
+
+	m_dialog->BootGame(path);
+
+	UpdateDevices();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		for (unsigned int i = 0; i < 4; ++i)
+			WiimoteReal::ChangeWiimoteSource(i, m_wiimote_map[i] > 0 ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE);
+
+		// Needed to prevent locking up at boot if (when) the wiimotes connect out of order.
+		NetWiimote nw;
+		nw.resize(4, 0);
+
+		for (unsigned int w = 0; w < 4; ++w)
+		{
+			if (m_wiimote_map[w] != -1)
+				// probably overkill, but whatever
+				for (unsigned int i = 0; i < 7; ++i)
+					m_wiimote_buffer[w].Push(nw);
+		}
+	}
+
+	return true;
+}
+
+// called from ---GUI--- thread
+bool NetPlayClient::ChangeGame(const std::string&)
+{
+	return true;
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::UpdateDevices()
+{
+	for (PadMapping i = 0; i < 4; i++)
+	{
+		// XXX: add support for other device types? does it matter?
+		SerialInterface::AddDevice(m_pad_map[i] > 0 ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i);
+	}
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::ClearBuffers()
+{
+	// clear pad buffers, Clear method isn't thread safe
+	for (unsigned int i = 0; i<4; ++i)
+	{
+		while (m_pad_buffer[i].Size())
+			m_pad_buffer[i].Pop();
+
+		while (m_wiimote_buffer[i].Size())
+			m_wiimote_buffer[i].Pop();
+	}
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::OnTraversalStateChanged()
+{
+	if (m_state == WaitingForTraversalClientConnection &&
+		m_traversal_client->m_State == TraversalClient::Connected)
+	{
+		m_state = WaitingForTraversalClientConnectReady;
+		m_traversal_client->ConnectToClient(m_host_spec);
+	}
+	else if (m_state != Failure &&
+		m_traversal_client->m_State == TraversalClient::Failure)
+	{
+		Disconnect();
+	}
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::OnConnectReady(ENetAddress addr)
+{
+	if (m_state == WaitingForTraversalClientConnectReady)
+	{
+		m_state = Connecting;
+		enet_host_connect(m_client, &addr, 0, 0);
+	}
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayClient::OnConnectFailed(u8 reason)
+{
+	m_connecting = false;
+	m_state = Failure;
+	switch (reason)
+	{
+	case TraversalConnectFailedClientDidntRespond:
+		PanicAlertT("Traversal server timed out connecting to the host");
+		break;
+	case TraversalConnectFailedClientFailure:
+		PanicAlertT("Server rejected traversal attempt");
+		break;
+	case TraversalConnectFailedNoSuchClient:
+		PanicAlertT("Invalid host");
+		break;
+	default:
+		PanicAlertT("Unknown error %x", reason);
+		break;
+	}
+}
+
+// called from ---CPU--- thread
+bool NetPlayClient::GetNetPads(const u8 pad_nb, GCPadStatus* pad_status)
+{
+	// The interface for this is extremely silly.
+	//
+	// Imagine a physical device that links three GameCubes together
+	// and emulates NetPlay that way. Which GameCube controls which
+	// in-game controllers can be configured on the device (m_pad_map)
+	// but which sockets on each individual GameCube should be used
+	// to control which players? The solution that Dolphin uses is
+	// that we hardcode the knowledge that they go in order, so if
+	// you have a 3P game with three GameCubes, then every single
+	// controller should be plugged into slot 1.
+	//
+	// If you have a 4P game, then one of the GameCubes will have
+	// a controller plugged into slot 1, and another in slot 2.
+	//
+	// The slot number is the "local" pad number, and what  player
+	// it actually means is the "in-game" pad number.
+	//
+	// The interface here gives us the status of local pads, and
+	// expects to get back "in-game" pad numbers back in response.
+	// e.g. it asks "here's the input that slot 1 has, and by the
+	// way, what's the state of P1?"
+	//
+	// We should add this split between "in-game" pads and "local"
+	// pads higher up.
+
+	int in_game_num = LocalPadToInGamePad(pad_nb);
+
+	// If this in-game pad is one of ours, then update from the
+	// information given.
+	if (in_game_num < 4)
+	{
+		// adjust the buffer either up or down
+		// inserting multiple padstates or dropping states
+		while (m_pad_buffer[in_game_num].Size() <= m_target_buffer_size)
+		{
+			// add to buffer
+			m_pad_buffer[in_game_num].Push(*pad_status);
+
+			// send
+			SendPadState(in_game_num, *pad_status);
+		}
+	}
+
+	// Now, we need to swap out the local value with the values
+	// retrieved from NetPlay. This could be the value we pushed
+	// above if we're configured as P1 and the code is trying
+	// to retrieve data for slot 1.
+	while (!m_pad_buffer[pad_nb].Pop(*pad_status))
+	{
+		if (!m_is_running.load())
+			return false;
+
+		// TODO: use a condition instead of sleeping
+		Common::SleepCurrentThread(1);
+	}
+
+	if (Movie::IsRecordingInput())
+	{
+		Movie::RecordInput(pad_status, pad_nb);
+		Movie::InputUpdate();
+	}
+	else
+	{
+		Movie::CheckPadStatus(pad_status, pad_nb);
+	}
+
+	return true;
+}
+
+
+// called from ---CPU--- thread
+bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const u8 size)
+{
+	NetWiimote nw;
+	static u8 previousSize[4] = { 4, 4, 4, 4 };
+	{
+		std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+
+		// in game mapping for this local Wiimote
+		unsigned int in_game_num = LocalWiimoteToInGameWiimote(_number);
+		// does this local Wiimote map in game?
+		if (in_game_num < 4)
+		{
+			if (previousSize[in_game_num] == size)
+			{
+				nw.assign(data, data + size);
+				do
+				{
+					// add to buffer
+					m_wiimote_buffer[in_game_num].Push(nw);
+
+					SendWiimoteState(in_game_num, nw);
+				} while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size * 200 / 120); // TODO: add a seperate setting for wiimote buffer?
+			}
+			else
+			{
+				while (m_wiimote_buffer[in_game_num].Size() > 0)
+				{
+					// Reporting mode changed, so previous buffer is no good.
+					m_wiimote_buffer[in_game_num].Pop();
+				}
+				nw.resize(size, 0);
+
+				m_wiimote_buffer[in_game_num].Push(nw);
+				m_wiimote_buffer[in_game_num].Push(nw);
+				m_wiimote_buffer[in_game_num].Push(nw);
+				m_wiimote_buffer[in_game_num].Push(nw);
+				m_wiimote_buffer[in_game_num].Push(nw);
+				m_wiimote_buffer[in_game_num].Push(nw);
+				previousSize[in_game_num] = size;
+			}
+		}
+
+	} // unlock players
+
+	while (previousSize[_number] == size && !m_wiimote_buffer[_number].Pop(nw))
+	{
+		// wait for receiving thread to push some data
+		Common::SleepCurrentThread(1);
+		if (!m_is_running.load())
+			return false;
+	}
+
+	// Use a blank input, since we may not have any valid input.
+	if (previousSize[_number] != size)
+	{
+		nw.resize(size, 0);
+		m_wiimote_buffer[_number].Push(nw);
+		m_wiimote_buffer[_number].Push(nw);
+		m_wiimote_buffer[_number].Push(nw);
+		m_wiimote_buffer[_number].Push(nw);
+		m_wiimote_buffer[_number].Push(nw);
+	}
+
+	// We should have used a blank input last time, so now we just need to pop through the old buffer, until we reach a good input
+	if (nw.size() != size)
+	{
+		u8 tries = 0;
+		// Clear the buffer and wait for new input, since we probably just changed reporting mode.
+		while (nw.size() != size)
+		{
+			while (!m_wiimote_buffer[_number].Pop(nw))
+			{
+				Common::SleepCurrentThread(1);
+				if (!m_is_running.load())
+					return false;
+			}
+			++tries;
+			if (tries > m_target_buffer_size * 200 / 120)
+				break;
+		}
+
+		// If it still mismatches, it surely desynced
+		if (size != nw.size())
+		{
+			PanicAlertT("Netplay has desynced. There is no way to recover from this.");
+			return false;
+		}
+	}
+
+	previousSize[_number] = size;
+	memcpy(data, nw.data(), size);
+	return true;
+}
+
+// called from ---GUI--- thread and ---NETPLAY--- thread (client side)
+bool NetPlayClient::StopGame()
+{
+	if (!m_is_running.load())
+	{
+		PanicAlertT("Game isn't running!");
+		return false;
+	}
+
+	m_dialog->AppendChat(" -- STOPPING GAME -- ");
+
+	m_is_running.store(false);
+	NetPlay_Disable();
+
+	// stop game
+	m_dialog->StopGame();
+
+	return true;
+}
+
+// called from ---GUI--- thread
+void NetPlayClient::Stop()
+{
+	if (!m_is_running.load())
+		return;
+
+	bool isPadMapped = false;
+	for (PadMapping mapping : m_pad_map)
+	{
+		if (mapping == m_local_player->pid)
+		{
+			isPadMapped = true;
+		}
+	}
+	for (PadMapping mapping : m_wiimote_map)
+	{
+		if (mapping == m_local_player->pid)
+		{
+			isPadMapped = true;
+		}
+	}
+	// tell the server to stop if we have a pad mapped in game.
+	if (isPadMapped)
+	{
+		sf::Packet* spac = new sf::Packet;
+		*spac << (MessageId)NP_MSG_STOP_GAME;
+		SendAsync(spac);
+	}
+}
+
+u8 NetPlayClient::InGamePadToLocalPad(u8 ingame_pad)
+{
+	// not our pad
+	if (m_pad_map[ingame_pad] != m_local_player->pid)
+		return 4;
+
+	int local_pad = 0;
+	int pad = 0;
+
+	for (; pad < ingame_pad; pad++)
+	{
+		if (m_pad_map[pad] == m_local_player->pid)
+			local_pad++;
+	}
+
+	return local_pad;
+}
+
+u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad)
+{
+	// Figure out which in-game pad maps to which local pad.
+	// The logic we have here is that the local slots always
+	// go in order.
+	int local_pad_count = -1;
+	int ingame_pad = 0;
+	for (; ingame_pad < 4; ingame_pad++)
+	{
+		if (m_pad_map[ingame_pad] == m_local_player->pid)
+			local_pad_count++;
+
+		if (local_pad_count == local_pad)
+			break;
+	}
+
+	return ingame_pad;
+}
+
+u8 NetPlayClient::LocalWiimoteToInGameWiimote(u8 local_pad)
+{
+	// Figure out which in-game pad maps to which local pad.
+	// The logic we have here is that the local slots always
+	// go in order.
+	int local_pad_count = -1;
+	int ingame_pad = 0;
+	for (; ingame_pad < 4; ingame_pad++)
+	{
+		if (m_wiimote_map[ingame_pad] == m_local_player->pid)
+			local_pad_count++;
+
+		if (local_pad_count == local_pad)
+			break;
+	}
+
+	return ingame_pad;
+}
+
+void NetPlayClient::SendTimeBase()
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+
+	u64 timebase = SystemTimers::GetFakeTimeBase();
+
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_TIMEBASE;
+	*spac << (u32)timebase;
+	*spac << (u32)(timebase << 32);
+	*spac << netplay_client->m_timebase_frame++;
+	netplay_client->SendAsync(spac);
+}
+
+// stuff hacked into dolphin
+
+// called from ---CPU--- thread
+// Actual Core function which is called on every frame
+bool CSIDevice_GCController::NetPlay_GetInput(u8 numPAD, GCPadStatus* PadStatus)
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+
+	if (netplay_client)
+		return netplay_client->GetNetPads(numPAD, PadStatus);
+	else
+		return false;
+}
+
+bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size)
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+
+	if (netplay_client)
+		return netplay_client->WiimoteUpdate(wiimote, data, size);
+	else
+		return false;
+}
+
+// called from ---CPU--- thread
+// so all players' games get the same time
+u64 CEXIIPL::NetPlay_GetGCTime()
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+
+	if (netplay_client)
+		return g_netplay_initial_gctime;
+	else
+		return 0;
+}
+
+// called from ---CPU--- thread
+// return the local pad num that should rumble given a ingame pad num
+u8 CSIDevice_GCController::NetPlay_InGamePadToLocalPad(u8 numPAD)
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+
+	if (netplay_client)
+		return netplay_client->InGamePadToLocalPad(numPAD);
+	else
+		return numPAD;
+}
+
+bool NetPlay::IsNetPlayRunning()
+{
+	return netplay_client != nullptr;
+}
+
+void NetPlay_Enable(NetPlayClient* const np)
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+	netplay_client = np;
+}
+
+void NetPlay_Disable()
+{
+	std::lock_guard<std::mutex> lk(crit_netplay_client);
+	netplay_client = nullptr;
+}
diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h
new file mode 100644
index 0000000000..c80afda9f7
--- /dev/null
+++ b/Source/Core/Core/NetPlayClient.h
@@ -0,0 +1,151 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <map>
+#include <mutex>
+#include <queue>
+#include <sstream>
+#include <thread>
+#include <SFML/Network/Packet.hpp>
+#include "Common/CommonTypes.h"
+#include "Common/FifoQueue.h"
+#include "Common/TraversalClient.h"
+#include "Core/NetPlayProto.h"
+#include "InputCommon/GCPadStatus.h"
+
+
+class NetPlayUI
+{
+public:
+	virtual ~NetPlayUI() {}
+
+	virtual void BootGame(const std::string& filename) = 0;
+	virtual void StopGame() = 0;
+
+	virtual void Update() = 0;
+	virtual void AppendChat(const std::string& msg) = 0;
+
+	virtual void OnMsgChangeGame(const std::string& filename) = 0;
+	virtual void OnMsgStartGame() = 0;
+	virtual void OnMsgStopGame() = 0;
+	virtual bool IsRecording() = 0;
+};
+
+class Player
+{
+public:
+	PlayerId    pid;
+	std::string name;
+	std::string revision;
+	u32         ping;
+};
+
+class NetPlayClient : public TraversalClientClient
+{
+public:
+	void ThreadFunc();
+	void SendAsync(sf::Packet* packet);
+
+	NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name, bool traversal, const std::string& centralServer, u16 centralPort);
+	~NetPlayClient();
+
+	void GetPlayerList(std::string& list, std::vector<int>& pid_list);
+	void GetPlayers(std::vector<const Player *>& player_list);
+
+	bool is_connected;
+
+	bool StartGame(const std::string &path);
+	bool StopGame();
+	void Stop();
+	bool ChangeGame(const std::string& game);
+	void SendChatMessage(const std::string& msg);
+
+	// Send and receive pads values
+	bool WiimoteUpdate(int _number, u8* data, const u8 size);
+	bool GetNetPads(const u8 pad_nb, GCPadStatus* pad_status);
+
+	void OnTraversalStateChanged() override;
+	void OnConnectReady(ENetAddress addr) override;
+	void OnConnectFailed(u8 reason) override;
+
+	u8 LocalPadToInGamePad(u8 localPad);
+	u8 InGamePadToLocalPad(u8 localPad);
+
+	u8 LocalWiimoteToInGameWiimote(u8 local_pad);
+
+	static void SendTimeBase();
+
+	enum State
+	{
+		WaitingForTraversalClientConnection,
+		WaitingForTraversalClientConnectReady,
+		Connecting,
+		WaitingForHelloResponse,
+		Connected,
+		Failure
+	} m_state;
+
+protected:
+	void ClearBuffers();
+
+	struct
+	{
+		std::recursive_mutex game;
+		// lock order
+		std::recursive_mutex players;
+		std::recursive_mutex async_queue_write;
+	} m_crit;
+
+	Common::FifoQueue<std::unique_ptr<sf::Packet>, false> m_async_queue;
+
+	Common::FifoQueue<GCPadStatus> m_pad_buffer[4];
+	Common::FifoQueue<NetWiimote>  m_wiimote_buffer[4];
+
+	NetPlayUI*   m_dialog;
+
+	ENetHost*    m_client;
+	ENetPeer*    m_server;
+	std::thread  m_thread;
+
+	std::string       m_selected_game;
+	std::atomic<bool> m_is_running;
+	std::atomic<bool> m_do_loop;
+
+	unsigned int  m_target_buffer_size;
+
+	Player* m_local_player;
+
+	u32 m_current_game;
+
+	PadMapping m_pad_map[4];
+	PadMapping m_wiimote_map[4];
+
+	bool m_is_recording;
+
+private:
+	void UpdateDevices();
+	void SendPadState(const PadMapping in_game_pad, const GCPadStatus& np);
+	void SendWiimoteState(const PadMapping in_game_pad, const NetWiimote& nw);
+	unsigned int OnData(sf::Packet& packet);
+	void Send(sf::Packet& packet);
+	void Disconnect();
+	bool Connect();
+
+	void OnTraversalDisconnect(int fail);
+
+	PlayerId m_pid;
+	std::map<PlayerId, Player> m_players;
+	std::string m_host_spec;
+	std::string m_player_name;
+	bool m_connecting;
+	TraversalClient* m_traversal_client;
+
+	u32 m_timebase_frame;
+};
+
+void NetPlay_Enable(NetPlayClient* const np);
+void NetPlay_Disable();
diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h
new file mode 100644
index 0000000000..e473c660fa
--- /dev/null
+++ b/Source/Core/Core/NetPlayProto.h
@@ -0,0 +1,82 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include "Common/CommonTypes.h"
+#include "Core/HW/EXI_Device.h"
+
+struct NetSettings
+{
+	bool m_CPUthread;
+	int m_CPUcore;
+	bool m_DSPHLE;
+	bool m_DSPEnableJIT;
+	bool m_WriteToMemcard;
+	bool m_OCEnable;
+	float m_OCFactor;
+	TEXIDevices m_EXIDevice[2];
+};
+
+extern NetSettings g_NetPlaySettings;
+
+struct Rpt : public std::vector<u8>
+{
+	u16 channel;
+};
+
+typedef std::vector<u8> NetWiimote;
+
+#define NETPLAY_VERSION  "Dolphin NetPlay 2015-03-10"
+
+extern u64 g_netplay_initial_gctime;
+
+// messages
+enum
+{
+	NP_MSG_PLAYER_JOIN = 0x10,
+	NP_MSG_PLAYER_LEAVE = 0x11,
+
+	NP_MSG_CHAT_MESSAGE = 0x30,
+
+	NP_MSG_PAD_DATA = 0x60,
+	NP_MSG_PAD_MAPPING = 0x61,
+	NP_MSG_PAD_BUFFER = 0x62,
+
+	NP_MSG_WIIMOTE_DATA = 0x70,
+	NP_MSG_WIIMOTE_MAPPING = 0x71,
+
+	NP_MSG_START_GAME = 0xA0,
+	NP_MSG_CHANGE_GAME = 0xA1,
+	NP_MSG_STOP_GAME = 0xA2,
+	NP_MSG_DISABLE_GAME = 0xA3,
+
+	NP_MSG_TIMEBASE = 0xB0,
+	NP_MSG_DESYNC_DETECTED = 0xB1,
+
+	NP_MSG_READY = 0xD0,
+	NP_MSG_NOT_READY = 0xD1,
+
+	NP_MSG_PING = 0xE0,
+	NP_MSG_PONG = 0xE1,
+	NP_MSG_PLAYER_PING_DATA = 0xE2,
+};
+
+typedef u8  MessageId;
+typedef u8  PlayerId;
+typedef s8  PadMapping;
+typedef u32 FrameNum;
+
+enum
+{
+	CON_ERR_SERVER_FULL = 1,
+	CON_ERR_GAME_RUNNING = 2,
+	CON_ERR_VERSION_MISMATCH = 3
+};
+
+namespace NetPlay
+{
+	bool IsNetPlayRunning();
+}
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
new file mode 100644
index 0000000000..aa10e56afb
--- /dev/null
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -0,0 +1,966 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <vector>
+#include "Common/ENetUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Core/NetPlayClient.h" //for NetPlayUI
+#include "Core/NetPlayServer.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "InputCommon/GCPadStatus.h"
+#if !defined(_WIN32)
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifndef ANDROID
+#include <ifaddrs.h>
+#endif
+#include <arpa/inet.h>
+#endif
+
+u64 g_netplay_initial_gctime = 1272737767;
+
+NetPlayServer::~NetPlayServer()
+{
+	if (is_connected)
+	{
+		m_do_loop = false;
+		m_thread.join();
+		enet_host_destroy(m_server);
+
+		if (g_MainNetHost.get() == m_server)
+		{
+			g_MainNetHost.release();
+		}
+
+		if (m_traversal_client)
+		{
+			g_TraversalClient->m_Client = nullptr;
+			ReleaseTraversalClient();
+		}
+	}
+
+#ifdef USE_UPNP
+	if (m_upnp_thread.joinable())
+		m_upnp_thread.join();
+	m_upnp_thread = std::thread(&NetPlayServer::unmapPortThread);
+	m_upnp_thread.join();
+#endif
+}
+
+// called from ---GUI--- thread
+NetPlayServer::NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort)
+	: is_connected(false)
+	, m_is_running(false)
+	, m_do_loop(false)
+	, m_ping_key(0)
+	, m_update_pings(false)
+	, m_current_game(0)
+	, m_target_buffer_size(0)
+	, m_selected_game("")
+	, m_server(nullptr)
+	, m_traversal_client(nullptr)
+	, m_dialog(nullptr)
+{
+	//--use server time
+	if (enet_initialize() != 0)
+	{
+		PanicAlertT("Enet Didn't Initialize");
+	}
+
+	memset(m_pad_map, -1, sizeof(m_pad_map));
+	memset(m_wiimote_map, -1, sizeof(m_wiimote_map));
+	if (traversal)
+	{
+		if (!EnsureTraversalClient(centralServer, centralPort))
+			return;
+
+		g_TraversalClient->m_Client = this;
+		m_traversal_client = g_TraversalClient.get();
+
+		m_server = g_MainNetHost.get();
+
+		if (g_TraversalClient->m_State == TraversalClient::Failure)
+			g_TraversalClient->ReconnectToServer();
+	}
+	else
+	{
+		ENetAddress serverAddr;
+		serverAddr.host = ENET_HOST_ANY;
+		serverAddr.port = port;
+		m_server = enet_host_create(&serverAddr, 10, 3, 0, 0);
+		if (m_server != nullptr)
+			m_server->intercept = ENetUtil::InterceptCallback;
+	}
+	if (m_server != nullptr)
+	{
+		is_connected = true;
+		m_do_loop = true;
+		m_thread = std::thread(&NetPlayServer::ThreadFunc, this);
+		m_target_buffer_size = 5;
+	}
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayServer::ThreadFunc()
+{
+	while (m_do_loop)
+	{
+		// update pings every so many seconds
+		if ((m_ping_timer.GetTimeElapsed() > 1000) || m_update_pings)
+		{
+			m_ping_key = Common::Timer::GetTimeMs();
+
+			sf::Packet spac;
+			spac << (MessageId)NP_MSG_PING;
+			spac << m_ping_key;
+
+			m_ping_timer.Start();
+			SendToClients(spac);
+			m_update_pings = false;
+		}
+
+		ENetEvent netEvent;
+		int net;
+		if (m_traversal_client)
+			m_traversal_client->HandleResends();
+		net = enet_host_service(m_server, &netEvent, 1000);
+		while (!m_async_queue.Empty())
+		{
+			{
+				std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+				SendToClients(*(m_async_queue.Front().get()));
+			}
+			m_async_queue.Pop();
+		}
+		if (net > 0)
+		{
+			switch (netEvent.type)
+			{
+			case ENET_EVENT_TYPE_CONNECT:
+			{
+				ENetPeer* accept_peer = netEvent.peer;
+				unsigned int error;
+				{
+					std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+					error = OnConnect(accept_peer);
+				}
+
+				if (error)
+				{
+					sf::Packet spac;
+					spac << (MessageId)error;
+					// don't need to lock, this client isn't in the client map
+					Send(accept_peer, spac);
+					if (netEvent.peer->data)
+					{
+						delete (PlayerId *) netEvent.peer->data;
+						netEvent.peer->data = nullptr;
+					}
+					enet_peer_disconnect(accept_peer, 0);
+				}
+			}
+			break;
+			case ENET_EVENT_TYPE_RECEIVE:
+			{
+				sf::Packet rpac;
+				rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
+
+				auto it = m_players.find(*(PlayerId *)netEvent.peer->data);
+				Client& client = it->second;
+				if (OnData(rpac, client) != 0)
+				{
+					// if a bad packet is received, disconnect the client
+					std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+					OnDisconnect(client);
+
+					if (netEvent.peer->data)
+					{
+						delete (PlayerId *)netEvent.peer->data;
+						netEvent.peer->data = nullptr;
+					}
+				}
+				enet_packet_destroy(netEvent.packet);
+			}
+			break;
+			case ENET_EVENT_TYPE_DISCONNECT:
+			{
+				std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+				auto it = m_players.find(*(PlayerId *)netEvent.peer->data);
+				if (it != m_players.end())
+				{
+					Client& client = it->second;
+					OnDisconnect(client);
+
+					if (netEvent.peer->data)
+					{
+						delete (PlayerId *)netEvent.peer->data;
+						netEvent.peer->data = nullptr;
+					}
+				}
+			}
+			break;
+			default:
+			break;
+			}
+		}
+	}
+
+	// close listening socket and client sockets
+	for (auto& player_entry : m_players)
+	{
+		delete (PlayerId *)player_entry.second.socket->data;
+		player_entry.second.socket->data = nullptr;
+		enet_peer_disconnect(player_entry.second.socket, 0);
+	}
+}
+
+// called from ---NETPLAY--- thread
+unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
+{
+	sf::Packet rpac;
+	ENetPacket* epack;
+	do
+	{
+		epack = enet_peer_receive(socket, 0);
+	} while (epack == nullptr);
+	rpac.append(epack->data, epack->dataLength);
+
+	std::string npver;
+	rpac >> npver;
+	// Dolphin netplay version
+	if (npver != NETPLAY_VERSION)
+		return CON_ERR_VERSION_MISMATCH;
+
+	// game is currently running
+	if (m_is_running)
+		return CON_ERR_GAME_RUNNING;
+
+	// too many players
+	if (m_players.size() >= 255)
+		return CON_ERR_SERVER_FULL;
+
+	// cause pings to be updated
+	m_update_pings = true;
+
+	Client player;
+	player.socket = socket;
+	rpac >> player.revision;
+	rpac >> player.name;
+
+	enet_packet_destroy(epack);
+
+	// give new client first available id
+	PlayerId pid = 1;
+	for (auto i = m_players.begin(); i != m_players.end(); ++i)
+	{
+		if (i->second.pid == pid)
+		{
+			pid++;
+			i = m_players.begin();
+		}
+	}
+	player.pid = pid;
+	socket->data = new PlayerId(pid);
+
+	// try to automatically assign new user a pad
+	for (PadMapping& mapping : m_pad_map)
+	{
+		if (mapping == -1)
+		{
+			mapping = player.pid;
+			break;
+		}
+	}
+
+	// send join message to already connected clients
+	sf::Packet spac;
+	spac << (MessageId)NP_MSG_PLAYER_JOIN;
+	spac << player.pid << player.name << player.revision;
+	SendToClients(spac);
+
+	// send new client success message with their id
+	spac.clear();
+	spac << (MessageId)0;
+	spac << player.pid;
+	Send(player.socket, spac);
+
+	// send new client the selected game
+	if (m_selected_game != "")
+	{
+		spac.clear();
+		spac << (MessageId)NP_MSG_CHANGE_GAME;
+		spac << m_selected_game;
+		Send(player.socket, spac);
+	}
+
+	// send the pad buffer value
+	spac.clear();
+	spac << (MessageId)NP_MSG_PAD_BUFFER;
+	spac << (u32)m_target_buffer_size;
+	Send(player.socket, spac);
+
+	// sync values with new client
+	for (const auto& p : m_players)
+	{
+		spac.clear();
+		spac << (MessageId)NP_MSG_PLAYER_JOIN;
+		spac << p.second.pid << p.second.name << p.second.revision;
+		Send(player.socket, spac);
+	}
+
+	// add client to the player list
+	{
+		std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+		m_players.insert(std::pair<PlayerId, Client>(*(PlayerId *)player.socket->data, player));
+		UpdatePadMapping(); // sync pad mappings with everyone
+		UpdateWiimoteMapping();
+	}
+
+	return 0;
+}
+
+// called from ---NETPLAY--- thread
+unsigned int NetPlayServer::OnDisconnect(Client& player)
+{
+	PlayerId pid = player.pid;
+
+	if (m_is_running)
+	{
+		for (PadMapping mapping : m_pad_map)
+		{
+			if (mapping == pid && pid != 1)
+			{
+				PanicAlertT("Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game.");
+				std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+				m_is_running = false;
+
+				sf::Packet spac;
+				spac << (MessageId)NP_MSG_DISABLE_GAME;
+				// this thread doesn't need players lock
+				SendToClients(spac, 1);
+				break;
+			}
+		}
+	}
+
+	sf::Packet spac;
+	spac << (MessageId)NP_MSG_PLAYER_LEAVE;
+	spac << pid;
+
+	enet_peer_disconnect(player.socket, 0);
+
+	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+	auto it = m_players.find(player.pid);
+	if (it != m_players.end())
+		m_players.erase(it);
+
+	// alert other players of disconnect
+	SendToClients(spac);
+
+	for (PadMapping& mapping : m_pad_map)
+	{
+		if (mapping == pid)
+		{
+			mapping = -1;
+		}
+	}
+	UpdatePadMapping();
+
+	for (PadMapping& mapping : m_wiimote_map)
+	{
+		if (mapping == pid)
+		{
+			mapping = -1;
+		}
+	}
+	UpdateWiimoteMapping();
+
+	return 0;
+}
+
+// called from ---GUI--- thread
+void NetPlayServer::GetPadMapping(PadMapping map[4])
+{
+	for (int i = 0; i < 4; i++)
+		map[i] = m_pad_map[i];
+}
+
+void NetPlayServer::GetWiimoteMapping(PadMapping map[4])
+{
+	for (int i = 0; i < 4; i++)
+		map[i] = m_wiimote_map[i];
+}
+
+// called from ---GUI--- thread
+void NetPlayServer::SetPadMapping(const PadMapping map[4])
+{
+	for (int i = 0; i < 4; i++)
+		m_pad_map[i] = map[i];
+	UpdatePadMapping();
+}
+
+// called from ---GUI--- thread
+void NetPlayServer::SetWiimoteMapping(const PadMapping map[4])
+{
+	for (int i = 0; i < 4; i++)
+		m_wiimote_map[i] = map[i];
+	UpdateWiimoteMapping();
+}
+
+// called from ---GUI--- thread and ---NETPLAY--- thread
+void NetPlayServer::UpdatePadMapping()
+{
+	sf::Packet spac;
+	spac << (MessageId)NP_MSG_PAD_MAPPING;
+	for (PadMapping mapping : m_pad_map)
+	{
+		spac << mapping;
+	}
+	SendToClients(spac);
+}
+
+// called from ---NETPLAY--- thread
+void NetPlayServer::UpdateWiimoteMapping()
+{
+	sf::Packet spac;
+	spac << (MessageId)NP_MSG_WIIMOTE_MAPPING;
+	for (PadMapping mapping : m_wiimote_map)
+	{
+		spac << mapping;
+	}
+	SendToClients(spac);
+}
+
+// called from ---GUI--- thread and ---NETPLAY--- thread
+void NetPlayServer::AdjustPadBufferSize(unsigned int size)
+{
+	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+
+	m_target_buffer_size = size;
+
+	// tell clients to change buffer size
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_PAD_BUFFER;
+	*spac << (u32)m_target_buffer_size;
+
+	SendAsyncToClients(spac);
+}
+
+void NetPlayServer::SendAsyncToClients(sf::Packet* packet)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lkq(m_crit.async_queue_write);
+		m_async_queue.Push(std::unique_ptr<sf::Packet>(packet));
+	}
+	ENetUtil::WakeupThread(m_server);
+}
+
+// called from ---NETPLAY--- thread
+unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
+{
+	MessageId mid;
+	packet >> mid;
+
+	// don't need lock because this is the only thread that modifies the players
+	// only need locks for writes to m_players in this thread
+
+	switch (mid)
+	{
+	case NP_MSG_CHAT_MESSAGE:
+	{
+		std::string msg;
+		packet >> msg;
+
+		// send msg to other clients
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_CHAT_MESSAGE;
+		spac << player.pid;
+		spac << msg;
+
+		SendToClients(spac, player.pid);
+	}
+	break;
+
+	case NP_MSG_PAD_DATA:
+	{
+		// if this is pad data from the last game still being received, ignore it
+		if (player.current_game != m_current_game)
+			break;
+
+		PadMapping map = 0;
+		GCPadStatus pad;
+		packet >> map >> pad.button >> pad.analogA >> pad.analogB >> pad.stickX >> pad.stickY >> pad.substickX >> pad.substickY >> pad.triggerLeft >> pad.triggerRight;
+
+		// If the data is not from the correct player,
+		// then disconnect them.
+		if (m_pad_map[map] != player.pid)
+			return 1;
+
+		// Relay to clients
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_PAD_DATA;
+		spac << map << pad.button << pad.analogA << pad.analogB << pad.stickX << pad.stickY << pad.substickX << pad.substickY << pad.triggerLeft << pad.triggerRight;
+
+		SendToClients(spac, player.pid);
+	}
+	break;
+
+	case NP_MSG_WIIMOTE_DATA:
+	{
+		// if this is Wiimote data from the last game still being received, ignore it
+		if (player.current_game != m_current_game)
+			break;
+
+		PadMapping map = 0;
+		u8 size;
+		packet >> map >> size;
+		std::vector<u8> data(size);
+		for (size_t i = 0; i < data.size(); ++i)
+			packet >> data[i];
+
+		// If the data is not from the correct player,
+		// then disconnect them.
+		if (m_wiimote_map[map] != player.pid)
+		{
+			return 1;
+		}
+
+		// relay to clients
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_WIIMOTE_DATA;
+		spac << map;
+		spac << size;
+		for (const u8& byte : data)
+			spac << byte;
+
+		SendToClients(spac, player.pid);
+	}
+	break;
+
+	case NP_MSG_PONG:
+	{
+		const u32 ping = (u32)m_ping_timer.GetTimeElapsed();
+		u32 ping_key = 0;
+		packet >> ping_key;
+
+		if (m_ping_key == ping_key)
+		{
+			player.ping = ping;
+		}
+
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_PLAYER_PING_DATA;
+		spac << player.pid;
+		spac << player.ping;
+
+		SendToClients(spac);
+	}
+	break;
+
+	case NP_MSG_START_GAME:
+	{
+		packet >> player.current_game;
+	}
+	break;
+
+	case NP_MSG_STOP_GAME:
+	{
+		// tell clients to stop game
+		sf::Packet spac;
+		spac << (MessageId)NP_MSG_STOP_GAME;
+
+		std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
+		SendToClients(spac);
+
+		m_is_running = false;
+	}
+	break;
+
+	case NP_MSG_TIMEBASE:
+	{
+		u32 x, y, frame;
+		packet >> x;
+		packet >> y;
+		packet >> frame;
+
+		if (m_desync_detected)
+			break;
+
+		u64 timebase = x | ((u64)y << 32);
+		std::vector<std::pair<PlayerId, u64>>& timebases = m_timebase_by_frame[frame];
+		timebases.emplace_back(player.pid, timebase);
+		if (timebases.size() >= m_players.size())
+		{
+			// we have all records for this frame
+
+			if (!std::all_of(timebases.begin(), timebases.end(), [&](std::pair<PlayerId, u64> pair){ return pair.second == timebases[0].second; }))
+			{
+				int pid_to_blame = -1;
+				if (timebases.size() > 2)
+				{
+					for (auto pair : timebases)
+					{
+						if (std::all_of(timebases.begin(), timebases.end(), [&](std::pair<PlayerId, u64> other) {
+							return other.first == pair.first || other.second != pair.second;
+						}))
+						{
+							// we are the only outlier
+							pid_to_blame = pair.first;
+							break;
+						}
+					}
+				}
+
+				sf::Packet spac;
+				spac << (MessageId) NP_MSG_DESYNC_DETECTED;
+				spac << pid_to_blame;
+				spac << frame;
+				SendToClients(spac);
+
+				m_desync_detected = true;
+			}
+			m_timebase_by_frame.erase(frame);
+		}
+	}
+	break;
+	default:
+		PanicAlertT("Unknown message with id:%d received from player:%d Kicking player!", mid, player.pid);
+		// unknown message, kick the client
+		return 1;
+		break;
+	}
+
+	return 0;
+}
+
+
+void NetPlayServer::OnTraversalStateChanged()
+{
+	if (m_dialog)
+		m_dialog->Update();
+}
+
+// called from ---GUI--- thread
+void NetPlayServer::SendChatMessage(const std::string& msg)
+{
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_CHAT_MESSAGE;
+	*spac << (PlayerId)0; // server id always 0
+	*spac << msg;
+
+	SendAsyncToClients(spac);
+}
+
+// called from ---GUI--- thread
+bool NetPlayServer::ChangeGame(const std::string &game)
+{
+	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+
+	m_selected_game = game;
+
+	// send changed game to clients
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_CHANGE_GAME;
+	*spac << game;
+
+	SendAsyncToClients(spac);
+
+	return true;
+}
+
+// called from ---GUI--- thread
+void NetPlayServer::SetNetSettings(const NetSettings &settings)
+{
+	m_settings = settings;
+}
+
+// called from ---GUI--- thread
+bool NetPlayServer::StartGame()
+{
+	m_timebase_by_frame.clear();
+	m_desync_detected = false;
+	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+	m_current_game = Common::Timer::GetTimeMs();
+
+	// no change, just update with clients
+	AdjustPadBufferSize(m_target_buffer_size);
+
+	g_netplay_initial_gctime = Common::Timer::GetLocalTimeSinceJan1970();
+
+	// tell clients to start game
+	sf::Packet* spac = new sf::Packet;
+	*spac << (MessageId)NP_MSG_START_GAME;
+	*spac << m_current_game;
+	*spac << m_settings.m_CPUthread;
+	*spac << m_settings.m_CPUcore;
+	*spac << m_settings.m_DSPEnableJIT;
+	*spac << m_settings.m_DSPHLE;
+	*spac << m_settings.m_WriteToMemcard;
+	*spac << m_settings.m_OCEnable;
+	*spac << m_settings.m_OCFactor;
+	*spac << m_settings.m_EXIDevice[0];
+	*spac << m_settings.m_EXIDevice[1];
+	*spac << (u32)g_netplay_initial_gctime;
+	*spac << (u32)(g_netplay_initial_gctime >> 32);
+
+	SendAsyncToClients(spac);
+
+	m_is_running = true;
+
+	return true;
+}
+
+// called from multiple threads
+void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid)
+{
+	for (auto& p : m_players)
+	{
+		if (p.second.pid && p.second.pid != skip_pid)
+		{
+			Send(p.second.socket, packet);
+		}
+	}
+}
+
+void NetPlayServer::Send(ENetPeer* socket, sf::Packet& packet)
+{
+	ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
+	enet_peer_send(socket, 0, epac);
+}
+
+void NetPlayServer::KickPlayer(PlayerId player)
+{
+	for (auto& current_player : m_players)
+	{
+		if (current_player.second.pid == player)
+		{
+			enet_peer_disconnect(current_player.second.socket, 0);
+			return;
+		}
+	}
+}
+
+u16 NetPlayServer::GetPort()
+{
+	return m_server->address.port;
+}
+
+void NetPlayServer::SetNetPlayUI(NetPlayUI* dialog)
+{
+	m_dialog = dialog;
+}
+
+// called from ---GUI--- thread
+std::unordered_set<std::string> NetPlayServer::GetInterfaceSet()
+{
+	std::unordered_set<std::string> result;
+	auto lst = GetInterfaceListInternal();
+	for (auto list_entry : lst)
+		result.emplace(list_entry.first);
+	return result;
+}
+
+// called from ---GUI--- thread
+std::string NetPlayServer::GetInterfaceHost(const std::string& inter)
+{
+	char buf[16];
+	sprintf(buf, ":%d", GetPort());
+	auto lst = GetInterfaceListInternal();
+	for (const auto& list_entry : lst)
+	{
+		if (list_entry.first == inter)
+		{
+			return list_entry.second + buf;
+		}
+	}
+	return "?";
+}
+
+// called from ---GUI--- thread
+std::vector<std::pair<std::string, std::string>> NetPlayServer::GetInterfaceListInternal()
+{
+	std::vector<std::pair<std::string, std::string>> result;
+#if defined(_WIN32)
+
+#elif defined(ANDROID)
+	// Android has no getifaddrs for some stupid reason.  If this
+	// functionality ends up actually being used on Android, fix this.
+#else
+	ifaddrs* ifp = nullptr;
+	char buf[512];
+	if (getifaddrs(&ifp) != -1)
+	{
+		for (ifaddrs* curifp = ifp; curifp; curifp = curifp->ifa_next)
+		{
+			sockaddr* sa = curifp->ifa_addr;
+			if (sa->sa_family != AF_INET)
+				continue;
+			sockaddr_in* sai = (struct sockaddr_in*) sa;
+			if (ntohl(((struct sockaddr_in*) sa)->sin_addr.s_addr) == 0x7f000001)
+				continue;
+			const char* ip = inet_ntop(sa->sa_family, &sai->sin_addr, buf, sizeof(buf));
+			if (ip == nullptr)
+				continue;
+			result.emplace_back(std::make_pair(curifp->ifa_name, ip));
+		}
+		freeifaddrs(ifp);
+	}
+#endif
+	if (result.empty())
+		result.emplace_back(std::make_pair("!local!", "127.0.0.1"));
+	return result;
+}
+
+#ifdef USE_UPNP
+#include <miniwget.h>
+#include <miniupnpc.h>
+#include <upnpcommands.h>
+
+struct UPNPUrls NetPlayServer::m_upnp_urls;
+struct IGDdatas NetPlayServer::m_upnp_data;
+u16 NetPlayServer::m_upnp_mapped = 0;
+bool NetPlayServer::m_upnp_inited = false;
+bool NetPlayServer::m_upnp_error = false;
+std::thread NetPlayServer::m_upnp_thread;
+
+// called from ---GUI--- thread
+void NetPlayServer::TryPortmapping(u16 port)
+{
+	if (m_upnp_thread.joinable())
+		m_upnp_thread.join();
+	m_upnp_thread = std::thread(&NetPlayServer::mapPortThread, port);
+}
+
+// UPnP thread: try to map a port
+void NetPlayServer::mapPortThread(const u16 port)
+{
+	ENetAddress adr = { ENET_HOST_ANY, port };
+	char cIP[20];
+
+	enet_address_get_host(&adr, cIP, 20);
+	std::string ourIP(cIP);
+
+	if (!m_upnp_inited)
+		if (!initUPnP())
+			goto fail;
+
+	if (!UPnPMapPort(ourIP, port))
+		goto fail;
+
+	NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, ourIP.c_str());
+	return;
+fail:
+	WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, ourIP.c_str());
+	return;
+}
+
+// UPnP thread: try to unmap a port
+void NetPlayServer::unmapPortThread()
+{
+	if (m_upnp_mapped > 0)
+		UPnPUnmapPort(m_upnp_mapped);
+}
+
+// called from ---UPnP--- thread
+// discovers the IGD
+bool NetPlayServer::initUPnP()
+{
+	std::vector<UPNPDev *> igds;
+	int descXMLsize = 0, upnperror = 0;
+
+	// Don't init if already inited
+	if (m_upnp_inited)
+		return true;
+
+	// Don't init if it failed before
+	if (m_upnp_error)
+		return false;
+
+	memset(&m_upnp_urls, 0, sizeof(UPNPUrls));
+	memset(&m_upnp_data, 0, sizeof(IGDdatas));
+
+	// Find all UPnP devices
+	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
+	if (!devlist)
+	{
+		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
+
+		m_upnp_error = true;
+		m_upnp_inited = false;
+
+		return false;
+	}
+
+	// Look for the IGD
+	for (UPNPDev* dev = devlist; dev; dev = dev->pNext)
+	{
+		if (strstr(dev->st, "InternetGatewayDevice"))
+			igds.push_back(dev);
+	}
+
+	for (const UPNPDev* dev : igds)
+	{
+		char* descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0);
+		if (descXML)
+		{
+			parserootdesc(descXML, descXMLsize, &m_upnp_data);
+			free(descXML);
+			descXML = nullptr;
+			GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
+
+			NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
+			break;
+		}
+		else
+		{
+			WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL);
+		}
+	}
+
+	freeUPNPDevlist(devlist);
+
+	return true;
+}
+
+// called from ---UPnP--- thread
+// Attempt to portforward!
+bool NetPlayServer::UPnPMapPort(const std::string& addr, const u16 port)
+{
+	if (m_upnp_mapped > 0)
+		UPnPUnmapPort(m_upnp_mapped);
+
+	std::string port_str = StringFromFormat("%d", port);
+	int result = UPNP_AddPortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
+		port_str.c_str(), port_str.c_str(), addr.c_str(),
+		(std::string("dolphin-emu UDP on ") + addr).c_str(),
+		"UDP", nullptr, nullptr);
+
+	if (result != 0)
+		return false;
+
+	m_upnp_mapped = port;
+
+	return true;
+}
+
+// called from ---UPnP--- thread
+// Attempt to stop portforwarding.
+// --
+// NOTE: It is important that this happens! A few very crappy routers
+// apparently do not delete UPnP mappings on their own, so if you leave them
+// hanging, the NVRAM will fill with portmappings, and eventually all UPnP
+// requests will fail silently, with the only recourse being a factory reset.
+// --
+bool NetPlayServer::UPnPUnmapPort(const u16 port)
+{
+	std::string port_str = StringFromFormat("%d", port);
+	UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
+		port_str.c_str(), "UDP", nullptr);
+
+	return true;
+}
+#endif
diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
new file mode 100644
index 0000000000..842c795c38
--- /dev/null
+++ b/Source/Core/Core/NetPlayServer.h
@@ -0,0 +1,137 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <mutex>
+#include <queue>
+#include <sstream>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <SFML/Network/Packet.hpp>
+#include "Common/Timer.h"
+#include "Common/TraversalClient.h"
+#include "Core/NetPlayProto.h"
+
+class NetPlayUI;
+
+class NetPlayServer : public TraversalClientClient
+{
+public:
+	void ThreadFunc();
+	void SendAsyncToClients(sf::Packet* packet);
+
+	NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort);
+	~NetPlayServer();
+
+	bool ChangeGame(const std::string& game);
+	void SendChatMessage(const std::string& msg);
+
+	void SetNetSettings(const NetSettings &settings);
+
+	bool StartGame();
+
+	void GetPadMapping(PadMapping map[]);
+	void SetPadMapping(const PadMapping map[]);
+
+	void GetWiimoteMapping(PadMapping map[]);
+	void SetWiimoteMapping(const PadMapping map[]);
+
+	void AdjustPadBufferSize(unsigned int size);
+
+	void KickPlayer(PlayerId player);
+
+	u16 GetPort();
+
+	void SetNetPlayUI(NetPlayUI* dialog);
+	std::unordered_set<std::string> GetInterfaceSet();
+	std::string GetInterfaceHost(const std::string& inter);
+
+	bool is_connected;
+
+#ifdef USE_UPNP
+	void TryPortmapping(u16 port);
+#endif
+
+private:
+	class Client
+	{
+	public:
+		PlayerId    pid;
+		std::string name;
+		std::string revision;
+
+		ENetPeer* socket;
+		u32 ping;
+		u32 current_game;
+
+		bool operator==(const Client& other) const
+		{
+			return this == &other;
+		}
+	};
+
+	void SendToClients(sf::Packet& packet, const PlayerId skip_pid = 0);
+	void Send(ENetPeer* socket, sf::Packet& packet);
+	unsigned int OnConnect(ENetPeer* socket);
+	unsigned int OnDisconnect(Client& player);
+	unsigned int OnData(sf::Packet& packet, Client& player);
+	virtual void OnTraversalStateChanged();
+	virtual void OnConnectReady(ENetAddress addr) {}
+	virtual void OnConnectFailed(u8 reason) {}
+	void UpdatePadMapping();
+	void UpdateWiimoteMapping();
+	std::vector<std::pair<std::string, std::string>> GetInterfaceListInternal();
+
+	NetSettings     m_settings;
+
+	bool            m_is_running;
+	bool            m_do_loop;
+	Common::Timer   m_ping_timer;
+	u32             m_ping_key;
+	bool            m_update_pings;
+	u32             m_current_game;
+	unsigned int    m_target_buffer_size;
+	PadMapping      m_pad_map[4];
+	PadMapping      m_wiimote_map[4];
+
+	std::map<PlayerId, Client> m_players;
+
+	std::unordered_map<u32, std::vector<std::pair<PlayerId, u64>>> m_timebase_by_frame;
+	bool m_desync_detected;
+
+	struct
+	{
+		std::recursive_mutex game;
+		// lock order
+		std::recursive_mutex players;
+		std::recursive_mutex async_queue_write;
+	} m_crit;
+
+	std::string m_selected_game;
+	std::thread m_thread;
+	Common::FifoQueue<std::unique_ptr<sf::Packet>, false> m_async_queue;
+
+	ENetHost*        m_server;
+	TraversalClient* m_traversal_client;
+	NetPlayUI*       m_dialog;
+
+#ifdef USE_UPNP
+	static void mapPortThread(const u16 port);
+	static void unmapPortThread();
+
+	static bool initUPnP();
+	static bool UPnPMapPort(const std::string& addr, const u16 port);
+	static bool UPnPUnmapPort(const u16 port);
+
+	static struct UPNPUrls m_upnp_urls;
+	static struct IGDdatas m_upnp_data;
+	static u16 m_upnp_mapped;
+	static bool m_upnp_inited;
+	static bool m_upnp_error;
+	static std::thread m_upnp_thread;
+#endif
+};
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
new file mode 100644
index 0000000000..b0a26e675f
--- /dev/null
+++ b/Source/Core/Core/PatchEngine.cpp
@@ -0,0 +1,232 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// PatchEngine
+// Supports simple memory patches, and has a partial Action Replay implementation
+// in ActionReplay.cpp/h.
+
+// TODO: Still even needed?  Zelda WW now works with improved DSP code.
+// Zelda item hang fixes:
+// [Tue Aug 21 2007] [18:30:40] <Knuckles->    0x802904b4 in US released
+// [Tue Aug 21 2007] [18:30:53] <Knuckles->    0x80294d54 in EUR Demo version
+// [Tue Aug 21 2007] [18:31:10] <Knuckles->    we just patch a blr on it (0x4E800020)
+// [OnLoad]
+// 0x80020394=dword,0x4e800020
+
+#include <algorithm>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ActionReplay.h"
+#include "Core/ConfigManager.h"
+#include "Core/GeckoCode.h"
+#include "Core/GeckoCodeConfig.h"
+#include "Core/PatchEngine.h"
+#include "Core/PowerPC/PowerPC.h"
+
+using namespace Common;
+
+namespace PatchEngine
+{
+
+const char *PatchTypeStrings[] =
+{
+	"byte",
+	"word",
+	"dword",
+};
+
+static std::vector<Patch> onFrame;
+static std::map<u32, int> speedHacks;
+
+void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, IniFile& globalIni, IniFile& localIni)
+{
+	// Load the name of all enabled patches
+	std::string enabledSectionName = section + "_Enabled";
+	std::vector<std::string> enabledLines;
+	std::set<std::string> enabledNames;
+	localIni.GetLines(enabledSectionName, &enabledLines);
+	for (const std::string& line : enabledLines)
+	{
+		if (line.size() != 0 && line[0] == '$')
+		{
+			std::string name = line.substr(1, line.size() - 1);
+			enabledNames.insert(name);
+		}
+	}
+
+	const IniFile* inis[2] = {&globalIni, &localIni};
+
+	for (const IniFile* ini : inis)
+	{
+		std::vector<std::string> lines;
+		Patch currentPatch;
+		ini->GetLines(section, &lines);
+
+		for (std::string& line : lines)
+		{
+			if (line.size() == 0)
+				continue;
+
+			if (line[0] == '$')
+			{
+				// Take care of the previous code
+				if (currentPatch.name.size())
+				{
+					patches.push_back(currentPatch);
+				}
+				currentPatch.entries.clear();
+
+				// Set active and name
+				currentPatch.name = line.substr(1, line.size() - 1);
+				currentPatch.active = enabledNames.find(currentPatch.name) != enabledNames.end();
+				currentPatch.user_defined = (ini == &localIni);
+			}
+			else
+			{
+				std::string::size_type loc = line.find('=');
+
+				if (loc != std::string::npos)
+				{
+					line[loc] = ':';
+				}
+
+				std::vector<std::string> items;
+				SplitString(line, ':', items);
+
+				if (items.size() >= 3)
+				{
+					PatchEntry pE;
+					bool success = true;
+					success &= TryParse(items[0], &pE.address);
+					success &= TryParse(items[2], &pE.value);
+
+					pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
+					success &= (pE.type != (PatchType)3);
+					if (success)
+					{
+						currentPatch.entries.push_back(pE);
+					}
+				}
+			}
+		}
+
+		if (currentPatch.name.size() && currentPatch.entries.size())
+		{
+			patches.push_back(currentPatch);
+		}
+	}
+}
+
+static void LoadSpeedhacks(const std::string& section, IniFile& ini)
+{
+	std::vector<std::string> keys;
+	ini.GetKeys(section, &keys);
+	for (const std::string& key : keys)
+	{
+		std::string value;
+		ini.GetOrCreateSection(section)->Get(key, &value, "BOGUS");
+		if (value != "BOGUS")
+		{
+			u32 address;
+			u32 cycles;
+			bool success = true;
+			success &= TryParse(key, &address);
+			success &= TryParse(value, &cycles);
+			if (success)
+			{
+				speedHacks[address] = (int)cycles;
+			}
+		}
+	}
+}
+
+int GetSpeedhackCycles(const u32 addr)
+{
+	std::map<u32, int>::const_iterator iter = speedHacks.find(addr);
+	if (iter == speedHacks.end())
+		return 0;
+	else
+		return iter->second;
+}
+
+void LoadPatches()
+{
+	IniFile merged = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
+	IniFile globalIni = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadDefaultGameIni();
+	IniFile localIni = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadLocalGameIni();
+
+	LoadPatchSection("OnFrame", onFrame, globalIni, localIni);
+	ActionReplay::LoadCodes(globalIni, localIni, false);
+
+	// lil silly
+	std::vector<Gecko::GeckoCode> gcodes;
+	Gecko::LoadCodes(globalIni, localIni, gcodes);
+	Gecko::SetActiveCodes(gcodes);
+
+	LoadSpeedhacks("Speedhacks", merged);
+}
+
+static void ApplyPatches(const std::vector<Patch> &patches)
+{
+	for (const Patch& patch : patches)
+	{
+		if (patch.active)
+		{
+			for (const PatchEntry& entry : patch.entries)
+			{
+				u32 addr = entry.address;
+				u32 value = entry.value;
+				switch (entry.type)
+				{
+				case PATCH_8BIT:
+					PowerPC::HostWrite_U8((u8)value, addr);
+					break;
+				case PATCH_16BIT:
+					PowerPC::HostWrite_U16((u16)value, addr);
+					break;
+				case PATCH_32BIT:
+					PowerPC::HostWrite_U32(value, addr);
+					break;
+				default:
+					//unknown patchtype
+					break;
+				}
+			}
+		}
+	}
+}
+
+void ApplyFramePatches()
+{
+	// TODO: Messing with MSR this way is really, really, evil; we should
+	// probably be using some sort of Gecko OS-style hooking mechanism
+	// so the emulated CPU is in a predictable state when we process cheats.
+	u32 oldMSR = MSR;
+	UReg_MSR newMSR = oldMSR;
+	newMSR.IR = 1;
+	newMSR.DR = 1;
+	MSR = newMSR.Hex;
+	ApplyPatches(onFrame);
+
+	// Run the Gecko code handler
+	Gecko::RunCodeHandler();
+	ActionReplay::RunAllActive();
+	MSR = oldMSR;
+}
+
+void Shutdown()
+{
+	onFrame.clear();
+}
+
+}  // namespace
diff --git a/Source/Core/Core/PatchEngine.h b/Source/Core/Core/PatchEngine.h
new file mode 100644
index 0000000000..8132a15fa6
--- /dev/null
+++ b/Source/Core/Core/PatchEngine.h
@@ -0,0 +1,71 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+class IniFile;
+
+namespace PatchEngine
+{
+
+enum PatchType
+{
+	PATCH_8BIT,
+	PATCH_16BIT,
+	PATCH_32BIT,
+};
+
+extern const char *PatchTypeStrings[];
+
+struct PatchEntry
+{
+	PatchEntry() {}
+	PatchEntry(PatchType _t, u32 _addr, u32 _value) : type(_t), address(_addr), value(_value) {}
+	PatchType type;
+	u32 address;
+	u32 value;
+};
+
+struct Patch
+{
+	std::string name;
+	std::vector<PatchEntry> entries;
+	bool active;
+	bool user_defined; // False if this code is shipped with Dolphin.
+};
+
+int GetSpeedhackCycles(const u32 addr);
+void LoadPatchSection(const std::string& section, std::vector<Patch> &patches,
+                      IniFile &globalIni, IniFile &localIni);
+void LoadPatches();
+void ApplyFramePatches();
+void Shutdown();
+
+inline int GetPatchTypeCharLength(PatchType type)
+{
+	int size = 8;
+	switch (type)
+	{
+	case PatchEngine::PATCH_8BIT:
+		size = 2;
+		break;
+
+	case PatchEngine::PATCH_16BIT:
+		size = 4;
+		break;
+
+	case PatchEngine::PATCH_32BIT:
+		size = 8;
+		break;
+	}
+	return size;
+}
+
+}  // namespace
+extern std::vector<PatchEngine::Patch> onFrame;
diff --git a/Source/Core/Core/PowerPC/CPUCoreBase.h b/Source/Core/Core/PowerPC/CPUCoreBase.h
new file mode 100644
index 0000000000..2de9cd28f6
--- /dev/null
+++ b/Source/Core/Core/PowerPC/CPUCoreBase.h
@@ -0,0 +1,18 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+class CPUCoreBase
+{
+public:
+	virtual ~CPUCoreBase() {}
+
+	virtual void Init() = 0;
+	virtual void Shutdown() = 0;
+	virtual void ClearCache() = 0;
+	virtual void Run() = 0;
+	virtual void SingleStep() = 0;
+	virtual const char *GetName() = 0;
+};
diff --git a/Source/Core/Core/Src/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp
similarity index 84%
rename from Source/Core/Core/Src/PowerPC/GDBStub.cpp
rename to Source/Core/Core/PowerPC/GDBStub.cpp
index 763aa24b8a..6948d7127e 100644
--- a/Source/Core/Core/Src/PowerPC/GDBStub.cpp
+++ b/Source/Core/Core/PowerPC/GDBStub.cpp
@@ -1,27 +1,13 @@
-// Copyright (C) 2010 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 // Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
 
-#include "GDBStub.h"
-
+#include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
 #include <unistd.h>
 #ifdef _WIN32
 #include <ws2tcpip.h>
@@ -30,24 +16,24 @@
 #else
 #include <sys/select.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <netinet/in.h>
 #endif
-#include <stdarg.h>
 
-#include "Host.h"
+#include "Core/Host.h"
+#include "Core/PowerPC/GDBStub.h"
 
-#define		GDB_BFR_MAX	10000
-#define		GDB_MAX_BP	10
+#define GDB_BFR_MAX  10000
+#define GDB_MAX_BP   10
 
-#define		GDB_STUB_START	'$'
-#define		GDB_STUB_END	'#'
-#define		GDB_STUB_ACK	'+'
-#define		GDB_STUB_NAK	'-'
+#define GDB_STUB_START '$'
+#define GDB_STUB_END   '#'
+#define GDB_STUB_ACK   '+'
+#define GDB_STUB_NAK   '-'
 
 
 static int tmpsock = -1;
 static int sock = -1;
-static struct sockaddr_in saddr_server, saddr_client;
 
 static u8 cmd_bfr[GDB_BFR_MAX];
 static u32 cmd_len;
@@ -130,7 +116,7 @@ static u8 gdb_calc_chksum()
 	u8 *ptr = cmd_bfr;
 	u8 c = 0;
 
-	while(len-- > 0)
+	while (len-- > 0)
 		c += *ptr++;
 
 	return c;
@@ -148,7 +134,7 @@ static gdb_bp_t *gdb_bp_ptr(u32 type)
 		case GDB_BP_TYPE_A:
 			return bp_x;
 		default:
-			return NULL;
+			return nullptr;
 	}
 }
 
@@ -158,15 +144,16 @@ static gdb_bp_t *gdb_bp_empty_slot(u32 type)
 	u32 i;
 
 	p = gdb_bp_ptr(type);
-	if (p == NULL)
-		return NULL;
+	if (p == nullptr)
+		return nullptr;
 
-	for (i = 0; i < GDB_MAX_BP; i++) {
+	for (i = 0; i < GDB_MAX_BP; i++)
+	{
 		if (p[i].active == 0)
 			return &p[i];
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 static gdb_bp_t *gdb_bp_find(u32 type, u32 addr, u32 len)
@@ -175,31 +162,34 @@ static gdb_bp_t *gdb_bp_find(u32 type, u32 addr, u32 len)
 	u32 i;
 
 	p = gdb_bp_ptr(type);
-	if (p == NULL)
-		return NULL;
+	if (p == nullptr)
+		return nullptr;
 
-	for (i = 0; i < GDB_MAX_BP; i++) {
+	for (i = 0; i < GDB_MAX_BP; i++)
+	{
 		if (p[i].active == 1 &&
 			p[i].addr == addr &&
 			p[i].len == len)
 			return &p[i];
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 static void gdb_bp_remove(u32 type, u32 addr, u32 len)
 {
 	gdb_bp_t *p;
 
-	do {
+	do
+	{
 		p = gdb_bp_find(type, addr, len);
-		if (p != NULL) {
+		if (p != nullptr)
+		{
 			DEBUG_LOG(GDB_STUB, "gdb: removed a breakpoint: %08x bytes at %08x\n", len, addr);
 			p->active = 0;
 			memset(p, 0, sizeof(gdb_bp_t));
 		}
-	} while (p != NULL);
+	} while (p != nullptr);
 }
 
 static int gdb_bp_check(u32 addr, u32 type)
@@ -208,10 +198,11 @@ static int gdb_bp_check(u32 addr, u32 type)
 	u32 i;
 
 	p = gdb_bp_ptr(type);
-	if (p == NULL)
+	if (p == nullptr)
 		return 0;
 
-	for (i = 0; i < GDB_MAX_BP; i++) {
+	for (i = 0; i < GDB_MAX_BP; i++)
+	{
 		if (p[i].active == 1 &&
 			(addr >= p[i].addr && addr < p[i].addr + p[i].len))
 			return 1;
@@ -260,12 +251,14 @@ static void gdb_read_command()
 		gdb_signal(SIGTRAP);
 		return;
 	}
-	else if (c != GDB_STUB_START) {
+	else if (c != GDB_STUB_START)
+	{
 		DEBUG_LOG(GDB_STUB, "gdb: read invalid byte %02x\n", c);
 		return;
 	}
 
-	while ((c = gdb_read_byte()) != GDB_STUB_END) {
+	while ((c = gdb_read_byte()) != GDB_STUB_END)
+	{
 		cmd_bfr[cmd_len++] = c;
 		if (cmd_len == sizeof cmd_bfr)
 		{
@@ -280,7 +273,8 @@ static void gdb_read_command()
 
 	chk_calc = gdb_calc_chksum();
 
-	if (chk_calc != chk_read) {
+	if (chk_calc != chk_read)
+	{
 		ERROR_LOG(GDB_STUB, "gdb: invalid checksum: calculated %02x and read %02x for $%s# (length: %d)\n", chk_calc, chk_read, cmd_bfr, cmd_len);
 		cmd_len = 0;
 
@@ -302,7 +296,7 @@ static int gdb_data_available() {
 	t.tv_sec = 0;
 	t.tv_usec = 20;
 
-	if (select(sock + 1, fds, NULL, NULL, &t) < 0)
+	if (select(sock + 1, fds, nullptr, nullptr, &t) < 0)
 	{
 		ERROR_LOG(GDB_STUB, "select failed");
 		return 0;
@@ -320,7 +314,7 @@ static void gdb_reply(const char *reply)
 	u8 *ptr;
 	int n;
 
-	if(!gdb_active())
+	if (!gdb_active())
 		return;
 
 	memset(cmd_bfr, 0, sizeof cmd_bfr);
@@ -343,7 +337,8 @@ static void gdb_reply(const char *reply)
 
 	ptr = cmd_bfr;
 	left = cmd_len + 4;
-	while (left > 0) {
+	while (left > 0)
+	{
 		n = send(sock, ptr, left, 0);
 		if (n < 0)
 		{
@@ -482,23 +477,25 @@ static void gdb_read_registers()
 
 	memset(bfr, 0, sizeof bfr);
 
-	for (i = 0; i < 32; i++) {
+	for (i = 0; i < 32; i++)
+	{
 		wbe32hex(bufptr + i*8, GPR(i));
 	}
 	bufptr += 32 * 8;
 
 	/*
-	for (i = 0; i < 32; i++) {
+	for (i = 0; i < 32; i++)
+	{
 		wbe32hex(bufptr + i*8, riPS0(i));
 	}
 	bufptr += 32 * 8;
-	wbe32hex(bufptr, PC); 		bufptr += 4;
-	wbe32hex(bufptr, MSR); 		bufptr += 4;
-	wbe32hex(bufptr, GetCR()); 	bufptr += 4;
-	wbe32hex(bufptr, LR); 		bufptr += 4;
+	wbe32hex(bufptr, PC);      bufptr += 4;
+	wbe32hex(bufptr, MSR);     bufptr += 4;
+	wbe32hex(bufptr, GetCR()); bufptr += 4;
+	wbe32hex(bufptr, LR);      bufptr += 4;
 
 
-	wbe32hex(bufptr, CTR); 		bufptr += 4;
+	wbe32hex(bufptr, CTR);     bufptr += 4;
 	wbe32hex(bufptr, PowerPC::ppcState.spr[SPR_XER]); bufptr += 4;
 	// MQ register not used.
 	wbe32hex(bufptr, 0x0BADC0DE); bufptr += 4;
@@ -513,7 +510,8 @@ static void gdb_write_registers()
 	u32 i;
 	u8 * bufptr = cmd_bfr;
 
-	for (i = 0; i < 32; i++) {
+	for (i = 0; i < 32; i++)
+	{
 		GPR(i) = re32hex(bufptr + i*8);
 	}
 	bufptr += 32 * 8;
@@ -645,7 +643,7 @@ bool gdb_add_bp(u32 type, u32 addr, u32 len)
 {
 	gdb_bp_t *bp;
 	bp = gdb_bp_empty_slot(type);
-	if (bp == NULL)
+	if (bp == nullptr)
 		return false;
 
 	bp->active = 1;
@@ -662,7 +660,8 @@ static void _gdb_add_bp()
 	u32 i, addr = 0, len = 0;
 
 	type = hex2char(cmd_bfr[1]);
-	switch (type) {
+	switch (type)
+	{
 		case 0:
 		case 1:
 			type = GDB_BP_TYPE_X;
@@ -733,14 +732,15 @@ static void gdb_remove_bp()
 
 void gdb_handle_exception()
 {
-	while (gdb_active()) {
-		if(!gdb_data_available())
+	while (gdb_active())
+	{
+		if (!gdb_data_available())
 			continue;
 		gdb_read_command();
 		if (cmd_len == 0)
 			continue;
 
-		switch(cmd_bfr[0]) {
+		switch (cmd_bfr[0]) {
 			case 'q':
 				gdb_handle_query();
 				break;
@@ -800,9 +800,52 @@ WSADATA InitData;
 
 // exported functions
 
+static void gdb_init_generic(int domain,
+	const sockaddr *server_addr, socklen_t server_addrlen,
+	sockaddr *client_addr, socklen_t *client_addrlen);
+
+#ifndef _WIN32
+void gdb_init_local(const char *socket)
+{
+	unlink(socket);
+
+	sockaddr_un addr = {}
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, socket);
+
+	gdb_init_generic(PF_LOCAL, (const sockaddr *)&addr, sizeof(addr),
+		NULL, NULL);
+}
+#endif
+
 void gdb_init(u32 port)
 {
-	socklen_t len;
+	sockaddr_in saddr_server = {};
+	sockaddr_in saddr_client;
+
+	saddr_server.sin_family = AF_INET;
+	saddr_server.sin_port = htons(port);
+	saddr_server.sin_addr.s_addr = INADDR_ANY;
+
+	socklen_t client_addrlen = sizeof(saddr_client);
+
+	gdb_init_generic(PF_INET,
+		(const sockaddr *)&saddr_server, sizeof(saddr_server),
+		(sockaddr *)&saddr_client, &client_addrlen);
+
+	saddr_client.sin_addr.s_addr = ntohl(saddr_client.sin_addr.s_addr);
+	/*if (((saddr_client.sin_addr.s_addr >> 24) & 0xff) != 127 ||
+	*      ((saddr_client.sin_addr.s_addr >> 16) & 0xff) !=   0 ||
+	*      ((saddr_client.sin_addr.s_addr >>  8) & 0xff) !=   0 ||
+	*      ((saddr_client.sin_addr.s_addr >>  0) & 0xff) !=   1)
+	*      ERROR_LOG(GDB_STUB, "gdb: incoming connection not from localhost");
+	*/
+}
+
+static void gdb_init_generic(int domain,
+	const sockaddr *server_addr, socklen_t server_addrlen,
+	sockaddr *client_addr, socklen_t *client_addrlen)
+{
 	int on;
 	#ifdef _WIN32
 	WSAStartup(MAKEWORD(2,2), &InitData);
@@ -813,7 +856,7 @@ void gdb_init(u32 port)
 	memset(bp_w, 0, sizeof bp_w);
 	memset(bp_a, 0, sizeof bp_a);
 
-	tmpsock = socket(AF_INET, SOCK_STREAM, 0);
+	tmpsock = socket(domain, SOCK_STREAM, 0);
 	if (tmpsock == -1)
 		ERROR_LOG(GDB_STUB, "Failed to create gdb socket");
 
@@ -821,12 +864,7 @@ void gdb_init(u32 port)
 	if (setsockopt(tmpsock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on) < 0)
 		ERROR_LOG(GDB_STUB, "Failed to setsockopt");
 
-	memset(&saddr_server, 0, sizeof saddr_server);
-	saddr_server.sin_family = AF_INET;
-	saddr_server.sin_port = htons(port);
-	saddr_server.sin_addr.s_addr = INADDR_ANY;
-
-	if (bind(tmpsock, (struct sockaddr *)&saddr_server, sizeof saddr_server) < 0)
+	if (bind(tmpsock, server_addr, server_addrlen) < 0)
 		ERROR_LOG(GDB_STUB, "Failed to bind gdb socket");
 
 	if (listen(tmpsock, 1) < 0)
@@ -834,18 +872,11 @@ void gdb_init(u32 port)
 
 	INFO_LOG(GDB_STUB, "Waiting for gdb to connect...\n");
 
-	sock = accept(tmpsock, (struct sockaddr *)&saddr_client, &len);
+	sock = accept(tmpsock, client_addr, client_addrlen);
 	if (sock < 0)
 		ERROR_LOG(GDB_STUB, "Failed to accept gdb client");
 	INFO_LOG(GDB_STUB, "Client connected.\n");
 
-	saddr_client.sin_addr.s_addr = ntohl(saddr_client.sin_addr.s_addr);
-	/*if (((saddr_client.sin_addr.s_addr >> 24) & 0xff) != 127 ||
-	 *	    ((saddr_client.sin_addr.s_addr >> 16) & 0xff) !=   0 ||
-	 *	    ((saddr_client.sin_addr.s_addr >>  8) & 0xff) !=   0 ||
-	 *	    ((saddr_client.sin_addr.s_addr >>  0) & 0xff) !=   1)
-	 *		ERROR_LOG(GDB_STUB, "gdb: incoming connection not from localhost");
-	 */
 	close(tmpsock);
 	tmpsock = -1;
 }
@@ -881,7 +912,8 @@ int gdb_signal(u32 s)
 
 	sig = s;
 
-	if (send_signal) {
+	if (send_signal)
+	{
 		gdb_handle_signal();
 		send_signal = 0;
 	}
diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h
new file mode 100644
index 0000000000..b064e3f85f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/GDBStub.h
@@ -0,0 +1,46 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
+
+#pragma once
+
+#include <signal.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#ifdef _WIN32
+#define SIGTRAP      5
+#define SIGTERM     15
+#define MSG_WAITALL  8
+#endif
+
+typedef enum {
+	GDB_BP_TYPE_NONE = 0,
+	GDB_BP_TYPE_X,
+	GDB_BP_TYPE_R,
+	GDB_BP_TYPE_W,
+	GDB_BP_TYPE_A
+} gdb_bp_type;
+
+void gdb_init(u32 port);
+void gdb_init_local(const char *socket);
+void gdb_deinit();
+bool gdb_active();
+void gdb_break();
+
+void gdb_handle_exception();
+int  gdb_signal(u32 signal);
+
+int  gdb_bp_x(u32 addr);
+int  gdb_bp_r(u32 addr);
+int  gdb_bp_w(u32 addr);
+int  gdb_bp_a(u32 addr);
+
+bool gdb_add_bp(u32 type, u32 addr, u32 len);
diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h
new file mode 100644
index 0000000000..ae061baf9d
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Gekko.h
@@ -0,0 +1,840 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// Gekko related unions, structs, ...
+
+#pragma once
+
+#include "Common/BitField.h"
+#include "Common/CommonTypes.h"
+
+// --- Gekko Instruction ---
+
+
+union UGeckoInstruction
+{
+	u32 hex;
+
+	UGeckoInstruction(u32 _hex) { hex = _hex;}
+	UGeckoInstruction()         { hex = 0;}
+
+	struct
+	{
+		// Record bit
+		// 1, if the condition register should be updated by this instruction
+		u32 Rc      : 1;
+		u32 SUBOP10 : 10;
+		// Source GPR
+		u32 RB      : 5;
+		// Source or destination GPR
+		u32 RA      : 5;
+		// Destination GPR
+		u32 RD      : 5;
+		// Primary opcode
+		u32 OPCD    : 6;
+	};
+	struct
+	{
+		// Immediate, signed 16-bit
+		signed SIMM_16 : 16;
+		u32            : 5;
+		// Conditions on which to trap
+		u32 TO         : 5;
+		u32 OPCD_2     : 6;
+	};
+	struct
+	{
+		u32 Rc_2    : 1;
+		u32         : 10;
+		u32         : 5;
+		u32         : 5;
+		// Source GPR
+		u32 RS      : 5;
+		u32 OPCD_3  : 6;
+	};
+	struct
+	{
+		// Immediate, unsigned 16-bit
+		u32 UIMM    : 16;
+		u32         : 5;
+		u32         : 5;
+		u32 OPCD_4  : 6;
+	};
+	struct
+	{
+		// Link bit
+		// 1, if branch instructions should put the address of the next instruction into the link register
+		u32 LK      : 1;
+		// Absolute address bit
+		// 1, if the immediate field represents an absolute address
+		u32 AA      : 1;
+		// Immediate, signed 24-bit
+		u32 LI      : 24;
+		u32 OPCD_5  : 6;
+	};
+	struct
+	{
+		u32 LK_2    : 1;
+		u32 AA_2    : 1;
+		// Branch displacement, signed 14-bit (right-extended by 0b00)
+		u32 BD      : 14;
+		// Branch condition
+		u32 BI      : 5;
+		// Conditional branch control
+		u32 BO      : 5;
+		u32 OPCD_6  : 6;
+	};
+	struct
+	{
+		u32 LK_3   : 1;
+		u32        : 10;
+		u32        : 5;
+		u32 BI_2   : 5;
+		u32 BO_2   : 5;
+		u32 OPCD_7 : 6;
+	};
+	struct
+	{
+		u32         : 11;
+		u32 RB_2    : 5;
+		u32 RA_2    : 5;
+		// ?
+		u32 L       : 1;
+		u32         : 1;
+		// Destination field in CR or FPSCR
+		u32 CRFD    : 3;
+		u32 OPCD_8  : 6;
+	};
+	struct
+	{
+		signed  SIMM_16_2 : 16;
+		u32 RA_3    : 5;
+		u32 L_2     : 1;
+		u32         : 1;
+		u32 CRFD_2  : 3;
+		u32 OPCD_9  : 6;
+	};
+	struct
+	{
+		u32 UIMM_2  : 16;
+		u32 RA_4    : 5;
+		u32 L_3     : 1;
+		u32         : 1;
+		u32 CRFD_3  : 3;
+		u32 OPCD_A  : 6;
+	};
+	struct
+	{
+		u32         : 1;
+		u32 SUBOP10_2: 10;
+		u32 RB_5    : 5;
+		u32 RA_5    : 5;
+		u32 L_4     : 1;
+		u32         : 1;
+		u32 CRFD_4  : 3;
+		u32 OPCD_B  : 6;
+	};
+	struct
+	{
+		u32         : 16;
+		// Segment register
+		u32 SR      : 4;
+		u32         : 1;
+		u32 RS_2    : 5;
+		u32 OPCD_C  : 6;
+	};
+
+	// Table 59
+	struct
+	{
+		u32 Rc_4    : 1;
+		u32 SUBOP5  : 5;
+		// ?
+		u32 RC      : 5;
+		u32         : 5;
+		u32 RA_6    : 5;
+		u32 RD_2    : 5;
+		u32 OPCD_D  : 6;
+	};
+
+	struct
+	{
+		u32         : 10;
+		// Overflow enable
+		u32 OE      : 1;
+		// Special-purpose register
+		u32 SPR     : 10;
+		u32         : 11;
+	};
+	struct
+	{
+		u32         : 10;
+		u32 OE_3    : 1;
+		// Upper special-purpose register
+		u32 SPRU    : 5;
+		// Lower special-purpose register
+		u32 SPRL    : 5;
+		u32         : 11;
+	};
+
+	// rlwinmx
+	struct
+	{
+		u32 Rc_3    : 1;
+		// Mask end
+		u32 ME      : 5;
+		// Mask begin
+		u32 MB      : 5;
+		// Shift amount
+		u32 SH      : 5;
+		u32         : 16;
+	};
+
+	// crxor
+	struct
+	{
+		u32         : 11;
+		// Source bit in the CR
+		u32 CRBB    : 5;
+		// Source bit in the CR
+		u32 CRBA    : 5;
+		// Destination bit in the CR
+		u32 CRBD    : 5;
+		u32         : 6;
+	};
+
+	// mftb
+	struct
+	{
+		u32         : 11;
+		// Time base register
+		u32 TBR     : 10;
+		u32         : 11;
+	};
+
+	struct
+	{
+		u32         : 11;
+		// Upper time base register
+		u32 TBRU    : 5;
+		// Lower time base register
+		u32 TBRL    : 5;
+		u32         : 11;
+	};
+
+	struct
+	{
+		u32         : 18;
+		// Source field in the CR or FPSCR
+		u32 CRFS    : 3;
+		u32         : 2;
+		u32 CRFD_5  : 3;
+		u32         : 6;
+	};
+
+	struct
+	{
+		u32         : 12;
+		// Field mask, identifies the CR fields to be updated by mtcrf
+		u32 CRM     : 8;
+		u32         : 1;
+		// Destination FPR
+		u32 FD      : 5;
+		u32         : 6;
+	};
+	struct
+	{
+		u32         : 6;
+		// Source FPR
+		u32 FC      : 5;
+		// Source FPR
+		u32 FB      : 5;
+		// Source FPR
+		u32 FA      : 5;
+		// Source FPR
+		u32 FS      : 5;
+		u32         : 6;
+	};
+	struct
+	{
+		u32         :  17;
+		// Field mask, identifies the FPSCR fields to be updated by mtfsf
+		u32 FM      :   8;
+		u32         :   7;
+	};
+
+	// paired single quantized load/store
+	struct
+	{
+		u32         : 1;
+		u32 SUBOP6  : 6;
+		// Graphics quantization register to use
+		u32 Ix      : 3;
+		// 0: paired single, 1: scalar
+		u32 Wx      : 1;
+		u32         : 1;
+		// Graphics quantization register to use
+		u32 I       : 3;
+		// 0: paired single, 1: scalar
+		u32 W       : 1;
+		u32         : 16;
+	};
+
+	struct
+	{
+		signed SIMM_12 : 12;
+		u32            : 20;
+	};
+
+	struct
+	{
+		u32         : 11;
+		// Number of bytes to use in lswi/stswi (0 means 32 bytes)
+		u32 NB      : 5;
+	};
+};
+
+
+//
+// --- Gekko Special Registers ---
+//
+
+// quantize types
+enum EQuantizeType : u32
+{
+	QUANTIZE_FLOAT = 0,
+	QUANTIZE_INVALID1 = 1,
+	QUANTIZE_INVALID2 = 2,
+	QUANTIZE_INVALID3 = 3,
+	QUANTIZE_U8    = 4,
+	QUANTIZE_U16   = 5,
+	QUANTIZE_S8    = 6,
+	QUANTIZE_S16   = 7,
+};
+
+// GQR Register
+union UGQR
+{
+	BitField< 0, 3, EQuantizeType> st_type;
+	BitField< 8, 6, u32> st_scale;
+	BitField<16, 3, EQuantizeType> ld_type;
+	BitField<24, 6, u32> ld_scale;
+
+	u32 Hex;
+
+	UGQR(u32 _hex) { Hex = _hex; }
+	UGQR()         { Hex = 0;  }
+};
+
+// FPU Register
+union UFPR
+{
+	u64 as_u64;
+	s64 as_s64;
+	double d;
+	u32 as_u32[2];
+	s32 as_s32[2];
+	float f[2];
+};
+
+#define XER_CA_SHIFT 29
+#define XER_OV_SHIFT 30
+#define XER_SO_SHIFT 31
+#define XER_OV_MASK 1
+#define XER_SO_MASK 2
+// XER
+union UReg_XER
+{
+	struct
+	{
+		u32 BYTE_COUNT : 7;
+		u32            : 1;
+		u32 BYTE_CMP   : 8;
+		u32            : 13;
+		u32 CA         : 1;
+		u32 OV         : 1;
+		u32 SO         : 1;
+	};
+	u32 Hex;
+
+	UReg_XER(u32 _hex) { Hex = _hex; }
+	UReg_XER()         { Hex = 0; }
+};
+
+// Machine State Register
+union UReg_MSR
+{
+	struct
+	{
+		u32 LE      : 1;
+		u32 RI      : 1;
+		u32 PM      : 1;
+		u32         : 1; // res28
+		u32 DR      : 1;
+		u32 IR      : 1;
+		u32 IP      : 1;
+		u32         : 1; // res24
+		u32 FE1     : 1;
+		u32 BE      : 1;
+		u32 SE      : 1;
+		u32 FE0     : 1;
+		u32 MCHECK  : 1;
+		u32 FP      : 1;
+		u32 PR      : 1;
+		u32 EE      : 1;
+		u32 ILE     : 1;
+		u32         : 1; // res14
+		u32 POW     : 1;
+		u32 res     : 13;
+	};
+	u32 Hex;
+
+	UReg_MSR(u32 _hex) { Hex = _hex; }
+	UReg_MSR()         { Hex = 0; }
+};
+
+#define FPRF_SHIFT 12
+#define FPRF_MASK (0x1F << FPRF_SHIFT)
+
+// FPSCR exception flags
+enum FPSCRExceptionFlag : u32
+{
+	FPSCR_FX     = 1U << (31 - 0),
+	FPSCR_FEX    = 1U << (31 - 1),
+	FPSCR_VX     = 1U << (31 - 2),
+	FPSCR_OX     = 1U << (31 - 3),
+	FPSCR_UX     = 1U << (31 - 4),
+	FPSCR_ZX     = 1U << (31 - 5),
+	FPSCR_XX     = 1U << (31 - 6),
+	FPSCR_VXSNAN = 1U << (31 - 7),
+	FPSCR_VXISI  = 1U << (31 - 8),
+	FPSCR_VXIDI  = 1U << (31 - 9),
+	FPSCR_VXZDZ  = 1U << (31 - 10),
+	FPSCR_VXIMZ  = 1U << (31 - 11),
+	FPSCR_VXVC   = 1U << (31 - 12),
+	FPSCR_VXSOFT = 1U << (31 - 21),
+	FPSCR_VXSQRT = 1U << (31 - 22),
+	FPSCR_VXCVI  = 1U << (31 - 23),
+	FPSCR_VE     = 1U << (31 - 24),
+
+	FPSCR_VX_ANY = FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI | FPSCR_VXZDZ | FPSCR_VXIMZ |
+	               FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI,
+
+	FPSCR_ANY_X  = FPSCR_OX | FPSCR_UX | FPSCR_ZX | FPSCR_XX | FPSCR_VX_ANY,
+};
+
+// Floating Point Status and Control Register
+union UReg_FPSCR
+{
+	struct
+	{
+		// Rounding mode (towards: nearest, zero, +inf, -inf)
+		u32 RN      : 2;
+		// Non-IEEE mode enable (aka flush-to-zero)
+		u32 NI      : 1;
+		// Inexact exception enable
+		u32 XE      : 1;
+		// IEEE division by zero exception enable
+		u32 ZE      : 1;
+		// IEEE underflow exception enable
+		u32 UE      : 1;
+		// IEEE overflow exception enable
+		u32 OE      : 1;
+		// Invalid operation exception enable
+		u32 VE      : 1;
+		// Invalid operation exception for integer conversion (sticky)
+		u32 VXCVI   : 1;
+		// Invalid operation exception for square root (sticky)
+		u32 VXSQRT  : 1;
+		// Invalid operation exception for software request (sticky)
+		u32 VXSOFT  : 1;
+		// reserved
+		u32         : 1;
+		// Floating point result flags (includes FPCC) (not sticky)
+		// from more to less significand: class, <, >, =, ?
+		u32 FPRF    : 5;
+		// Fraction inexact (not sticky)
+		u32 FI      : 1;
+		// Fraction rounded (not sticky)
+		u32 FR      : 1;
+		// Invalid operation exception for invalid comparison (sticky)
+		u32 VXVC    : 1;
+		// Invalid operation exception for inf * 0 (sticky)
+		u32 VXIMZ   : 1;
+		// Invalid operation exception for 0 / 0 (sticky)
+		u32 VXZDZ   : 1;
+		// Invalid operation exception for int / inf (sticky)
+		u32 VXIDI   : 1;
+		// Invalid operation exception for inf - inf (sticky)
+		u32 VXISI   : 1;
+		// Invalid operation exception for SNaN (sticky)
+		u32 VXSNAN  : 1;
+		// Inexact exception (sticky)
+		u32 XX      : 1;
+		// Division by zero exception (sticky)
+		u32 ZX      : 1;
+		// Underflow exception (sticky)
+		u32 UX      : 1;
+		// Overflow exception (sticky)
+		u32 OX      : 1;
+		// Invalid operation exception summary (not sticky)
+		u32 VX      : 1;
+		// Enabled exception summary (not sticky)
+		u32 FEX     : 1;
+		// Exception summary (sticky)
+		u32 FX      : 1;
+	};
+	u32 Hex;
+
+	UReg_FPSCR(u32 _hex) { Hex = _hex; }
+	UReg_FPSCR()         { Hex = 0;}
+};
+
+// Hardware Implementation-Dependent Register 0
+union UReg_HID0
+{
+	struct
+	{
+		u32 NOOPTI  : 1;
+		u32         : 1;
+		u32 BHT     : 1;
+		u32 ABE     : 1;
+		u32         : 1;
+		u32 BTIC    : 1;
+		u32 DCFA    : 1;
+		u32 SGE     : 1;
+		u32 IFEM    : 1;
+		u32 SPD     : 1;
+		u32 DCFI    : 1;
+		u32 ICFI    : 1;
+		u32 DLOCK   : 1;
+		u32 ILOCK   : 1;
+		u32 DCE     : 1;
+		u32 ICE     : 1;
+		u32 NHR     : 1;
+		u32         : 3;
+		u32 DPM     : 1;
+		u32 SLEEP   : 1;
+		u32 NAP     : 1;
+		u32 DOZE    : 1;
+		u32 PAR     : 1;
+		u32 ECLK    : 1;
+		u32         : 1;
+		u32 BCLK    : 1;
+		u32 EBD     : 1;
+		u32 EBA     : 1;
+		u32 DBP     : 1;
+		u32 EMCP    : 1;
+	};
+	u32 Hex;
+};
+
+// Hardware Implementation-Dependent Register 2
+union UReg_HID2
+{
+	struct
+	{
+		u32         : 16;
+		u32 DQOMEE  : 1;
+		u32 DCMEE   : 1;
+		u32 DNCEE   : 1;
+		u32 DCHEE   : 1;
+		u32 DQOERR  : 1;
+		u32 DCEMERR : 1;
+		u32 DNCERR  : 1;
+		u32 DCHERR  : 1;
+		u32 DMAQL   : 4;
+		u32 LCE     : 1;
+		u32 PSE     : 1;
+		u32 WPE     : 1;
+		u32 LSQE    : 1;
+	};
+	u32 Hex;
+
+	UReg_HID2(u32 _hex) { Hex = _hex; }
+	UReg_HID2()         { Hex = 0; }
+};
+
+// Hardware Implementation-Dependent Register 4
+union UReg_HID4
+{
+	struct
+	{
+		u32       : 20;
+		u32 L2CFI : 1;
+		u32 L2MUM : 1;
+		u32 DBP   : 1;
+		u32 LPE   : 1;
+		u32 ST0   : 1;
+		u32 SBE   : 1;
+		u32       : 1;
+		u32 BPD   : 2;
+		u32 L2FM  : 2;
+		u32       : 1;
+	};
+	u32 Hex;
+
+	UReg_HID4(u32 _hex) { Hex = _hex; }
+	UReg_HID4()         { Hex = 0; }
+};
+
+// SPR1 - Page Table format
+union UReg_SPR1
+{
+	u32 Hex;
+	struct
+	{
+		u32 htaborg  : 16;
+		u32          : 7;
+		u32 htabmask : 9;
+	};
+};
+
+// MMCR0 - Monitor Mode Control Register 0 format
+union UReg_MMCR0
+{
+	u32 Hex;
+	struct
+	{
+		u32 PMC2SELECT     : 6;
+		u32 PMC1SELECT     : 7;
+		u32 PMCTRIGGER     : 1;
+		u32 PMCINTCONTROL  : 1;
+		u32 PMC1INTCONTROL : 1;
+		u32 THRESHOLD      : 6;
+		u32 INTONBITTRANS  : 1;
+		u32 RTCSELECT      : 2;
+		u32 DISCOUNT       : 1;
+		u32 ENINT          : 1;
+		u32 DMR            : 1;
+		u32 DMS            : 1;
+		u32 DU             : 1;
+		u32 DP             : 1;
+		u32 DIS            : 1;
+	};
+};
+
+// MMCR1 - Monitor Mode Control Register 1 format
+union UReg_MMCR1
+{
+	u32 Hex;
+	struct
+	{
+		u32            : 22;
+		u32 PMC4SELECT : 5;
+		u32 PMC3SELECT : 5;
+	};
+};
+
+// Write Pipe Address Register
+union UReg_WPAR
+{
+	struct
+	{
+		u32 BNE     : 1;
+		u32         : 4;
+		u32 GB_ADDR : 27;
+	};
+	u32 Hex;
+
+	UReg_WPAR(u32 _hex) { Hex = _hex; }
+	UReg_WPAR()         { Hex = 0; }
+};
+
+// Direct Memory Access Upper register
+union UReg_DMAU
+{
+	struct
+	{
+		u32 DMA_LEN_U : 5;
+		u32 MEM_ADDR  : 27;
+	};
+	u32 Hex;
+
+	UReg_DMAU(u32 _hex) { Hex = _hex; }
+	UReg_DMAU()         { Hex = 0; }
+};
+
+// Direct Memory Access Lower (DMAL) register
+union UReg_DMAL
+{
+	struct
+	{
+		u32 DMA_F     : 1;
+		u32 DMA_T     : 1;
+		u32 DMA_LEN_L : 2;
+		u32 DMA_LD    : 1;
+		u32 LC_ADDR   : 27;
+	};
+	u32 Hex;
+
+	UReg_DMAL(u32 _hex) { Hex = _hex; }
+	UReg_DMAL()         { Hex = 0; }
+};
+
+union UReg_BAT_Up
+{
+	struct
+	{
+		u32 VP   : 1;
+		u32 VS   : 1;
+		u32 BL   : 11; // Block length (aka block size mask)
+		u32      : 4;
+		u32 BEPI : 15;
+	};
+	u32 Hex;
+
+	UReg_BAT_Up(u32 _hex) { Hex = _hex; }
+	UReg_BAT_Up()         { Hex = 0; }
+};
+
+union UReg_BAT_Lo
+{
+	struct
+	{
+		u32 PP   : 2;
+		u32      : 1;
+		u32 WIMG : 4;
+		u32      : 10;
+		u32 BRPN : 15; // Physical Block Number
+	};
+	u32 Hex;
+
+	UReg_BAT_Lo(u32 _hex) { Hex = _hex; }
+	UReg_BAT_Lo()         { Hex = 0; }
+};
+
+union UReg_PTE
+{
+	struct
+	{
+		u64 API  : 6;
+		u64 H    : 1;
+		u64 VSID : 24;
+		u64 V    : 1;
+		u64 PP   : 2;
+		u64      : 1;
+		u64 WIMG : 4;
+		u64 C    : 1;
+		u64 R    : 1;
+		u64      : 3;
+		u64 RPN  : 20;
+
+	};
+
+	u64 Hex;
+	u32 Hex32[2];
+};
+
+
+//
+// --- Gekko Types and Defs ---
+//
+
+// branches
+enum
+{
+	BO_BRANCH_IF_CTR_0      =  2, // 3
+	BO_DONT_DECREMENT_FLAG  =  4, // 2
+	BO_BRANCH_IF_TRUE       =  8, // 1
+	BO_DONT_CHECK_CONDITION = 16, // 0
+};
+
+// Special purpose register indices
+enum
+{
+	SPR_XER   = 1,
+	SPR_LR    = 8,
+	SPR_CTR   = 9,
+	SPR_DSISR = 18,
+	SPR_DAR   = 19,
+	SPR_DEC   = 22,
+	SPR_SDR   = 25,
+	SPR_SRR0  = 26,
+	SPR_SRR1  = 27,
+	SPR_TL    = 268,
+	SPR_TU    = 269,
+	SPR_TL_W  = 284,
+	SPR_TU_W  = 285,
+	SPR_PVR   = 287,
+	SPR_SPRG0 = 272,
+	SPR_SPRG1 = 273,
+	SPR_SPRG2 = 274,
+	SPR_SPRG3 = 275,
+	SPR_EAR   = 282,
+	SPR_IBAT0U  = 528,
+	SPR_IBAT0L  = 529,
+	SPR_IBAT1U  = 530,
+	SPR_IBAT1L  = 531,
+	SPR_IBAT2U  = 532,
+	SPR_IBAT2L  = 533,
+	SPR_IBAT3U  = 534,
+	SPR_IBAT3L  = 535,
+	SPR_DBAT0U  = 536,
+	SPR_DBAT0L  = 537,
+	SPR_DBAT1U  = 538,
+	SPR_DBAT1L  = 539,
+	SPR_DBAT2U  = 540,
+	SPR_DBAT2L  = 541,
+	SPR_DBAT3U  = 542,
+	SPR_DBAT3L  = 543,
+	SPR_IBAT4U  = 560,
+	SPR_IBAT4L  = 561,
+	SPR_IBAT5U  = 562,
+	SPR_IBAT5L  = 563,
+	SPR_IBAT6U  = 564,
+	SPR_IBAT6L  = 565,
+	SPR_IBAT7U  = 566,
+	SPR_IBAT7L  = 567,
+	SPR_DBAT4U  = 568,
+	SPR_DBAT4L  = 569,
+	SPR_DBAT5U  = 570,
+	SPR_DBAT5L  = 571,
+	SPR_DBAT6U  = 572,
+	SPR_DBAT6L  = 573,
+	SPR_DBAT7U  = 574,
+	SPR_DBAT7L  = 575,
+	SPR_GQR0  = 912,
+	SPR_HID0  = 1008,
+	SPR_HID1  = 1009,
+	SPR_HID2  = 920,
+	SPR_HID4  = 1011,
+	SPR_WPAR  = 921,
+	SPR_DMAU  = 922,
+	SPR_DMAL  = 923,
+	SPR_ECID_U = 924,
+	SPR_ECID_M = 925,
+	SPR_ECID_L = 926,
+	SPR_L2CR  = 1017,
+
+	SPR_UMMCR0 = 936,
+	SPR_MMCR0 = 952,
+	SPR_PMC1 = 953,
+	SPR_PMC2 = 954,
+
+	SPR_UMMCR1 = 940,
+	SPR_MMCR1 = 956,
+	SPR_PMC3 = 957,
+	SPR_PMC4 = 958,
+};
+
+// Exceptions
+enum
+{
+	EXCEPTION_DECREMENTER         = 0x00000001,
+	EXCEPTION_SYSCALL             = 0x00000002,
+	EXCEPTION_EXTERNAL_INT        = 0x00000004,
+	EXCEPTION_DSI                 = 0x00000008,
+	EXCEPTION_ISI                 = 0x00000010,
+	EXCEPTION_ALIGNMENT           = 0x00000020,
+	EXCEPTION_FPU_UNAVAILABLE     = 0x00000040,
+	EXCEPTION_PROGRAM             = 0x00000080,
+	EXCEPTION_PERFORMANCE_MONITOR = 0x00000100,
+
+	EXCEPTION_FAKE_MEMCHECK_HIT   = 0x00000200,
+};
+
+inline s32 SignExt16(s16 x) {return (s32)(s16)x;}
+inline s32 SignExt26(u32 x) {return x & 0x2000000 ? (s32)(x | 0xFC000000) : (s32)(x);}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
new file mode 100644
index 0000000000..f142ac8609
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
@@ -0,0 +1,311 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <string>
+
+#include "Common/GekkoDisassembler.h"
+#include "Common/StringUtil.h"
+#include "Core/Host.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+#ifdef USE_GDBSTUB
+#include "Core/PowerPC/GDBStub.h"
+#endif
+
+namespace
+{
+	u32 last_pc;
+}
+
+bool Interpreter::m_EndBlock;
+
+// function tables
+Interpreter::_interpreterInstruction Interpreter::m_opTable[64];
+Interpreter::_interpreterInstruction Interpreter::m_opTable4[1024];
+Interpreter::_interpreterInstruction Interpreter::m_opTable19[1024];
+Interpreter::_interpreterInstruction Interpreter::m_opTable31[1024];
+Interpreter::_interpreterInstruction Interpreter::m_opTable59[32];
+Interpreter::_interpreterInstruction Interpreter::m_opTable63[1024];
+
+void Interpreter::RunTable4(UGeckoInstruction _inst)  { m_opTable4 [_inst.SUBOP10](_inst); }
+void Interpreter::RunTable19(UGeckoInstruction _inst) { m_opTable19[_inst.SUBOP10](_inst); }
+void Interpreter::RunTable31(UGeckoInstruction _inst) { m_opTable31[_inst.SUBOP10](_inst); }
+void Interpreter::RunTable59(UGeckoInstruction _inst) { m_opTable59[_inst.SUBOP5 ](_inst); }
+void Interpreter::RunTable63(UGeckoInstruction _inst) { m_opTable63[_inst.SUBOP10](_inst); }
+
+void Interpreter::Init()
+{
+	g_bReserve = false;
+	m_EndBlock = false;
+}
+
+void Interpreter::Shutdown()
+{
+}
+
+static int startTrace = 0;
+
+static void Trace(UGeckoInstruction& instCode)
+{
+	std::string regs = "";
+	for (int i = 0; i < 32; i++)
+	{
+		regs += StringFromFormat("r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
+	}
+
+	std::string fregs = "";
+	for (int i = 0; i < 32; i++)
+	{
+		fregs += StringFromFormat("f%02d: %08" PRIx64 " %08" PRIx64 " ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]);
+	}
+
+	std::string ppc_inst = GekkoDisassembler::Disassemble(instCode.hex, PC);
+	DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRval: %016lx FPSCR: %08x MSR: %08x LR: %08x %s %08x %s", PC, SRR0, SRR1, (unsigned long) PowerPC::ppcState.cr_val[0], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), instCode.hex, ppc_inst.c_str());
+}
+
+int Interpreter::SingleStepInner()
+{
+	static UGeckoInstruction instCode;
+	u32 function = HLE::GetFunctionIndex(PC);
+	if (function != 0)
+	{
+		int type = HLE::GetFunctionTypeByIndex(function);
+		if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
+		{
+			int flags = HLE::GetFunctionFlagsByIndex(function);
+			if (HLE::IsEnabled(flags))
+			{
+				HLEFunction(function);
+				if (type == HLE::HLE_HOOK_START)
+				{
+					// Run the original.
+					function = 0;
+				}
+			}
+			else
+			{
+				function = 0;
+			}
+		}
+	}
+
+	if (function == 0)
+	{
+		#ifdef USE_GDBSTUB
+		if (gdb_active() && gdb_bp_x(PC))
+		{
+			Host_UpdateDisasmDialog();
+
+			gdb_signal(SIGTRAP);
+			gdb_handle_exception();
+		}
+		#endif
+
+		NPC = PC + sizeof(UGeckoInstruction);
+		instCode.hex = PowerPC::Read_Opcode(PC);
+
+		// Uncomment to trace the interpreter
+		//if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624)
+		//	startTrace = 1;
+		//else
+		//	startTrace = 0;
+
+		if (startTrace)
+		{
+			Trace(instCode);
+		}
+
+		if (instCode.hex != 0)
+		{
+			UReg_MSR& msr = (UReg_MSR&)MSR;
+			if (msr.FP)  //If FPU is enabled, just execute
+			{
+				m_opTable[instCode.OPCD](instCode);
+				if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+				{
+					PowerPC::CheckExceptions();
+					m_EndBlock = true;
+				}
+			}
+			else
+			{
+				// check if we have to generate a FPU unavailable exception
+				if (!PPCTables::UsesFPU(instCode))
+				{
+					m_opTable[instCode.OPCD](instCode);
+					if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+					{
+						PowerPC::CheckExceptions();
+						m_EndBlock = true;
+					}
+				}
+				else
+				{
+					PowerPC::ppcState.Exceptions |= EXCEPTION_FPU_UNAVAILABLE;
+					PowerPC::CheckExceptions();
+					m_EndBlock = true;
+				}
+			}
+		}
+		else
+		{
+			// Memory exception on instruction fetch
+			PowerPC::CheckExceptions();
+			m_EndBlock = true;
+		}
+	}
+	last_pc = PC;
+	PC = NPC;
+
+	GekkoOPInfo *opinfo = GetOpInfo(instCode);
+	return opinfo->numCycles;
+}
+
+void Interpreter::SingleStep()
+{
+	SingleStepInner();
+
+	CoreTiming::slicelength = 1;
+	PowerPC::ppcState.downcount = 0;
+	CoreTiming::Advance();
+
+	if (PowerPC::ppcState.Exceptions)
+	{
+		PowerPC::CheckExceptions();
+		PC = NPC;
+	}
+}
+
+//#define SHOW_HISTORY
+#ifdef SHOW_HISTORY
+std::vector <int> PCVec;
+std::vector <int> PCBlockVec;
+int ShowBlocks = 30;
+int ShowSteps = 300;
+#endif
+
+// FastRun - inspired by GCemu (to imitate the JIT so that they can be compared).
+void Interpreter::Run()
+{
+	while (!PowerPC::GetState())
+	{
+		//we have to check exceptions at branches apparently (or maybe just rfi?)
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		{
+			#ifdef SHOW_HISTORY
+				PCBlockVec.push_back(PC);
+				if (PCBlockVec.size() > ShowBlocks)
+					PCBlockVec.erase(PCBlockVec.begin());
+			#endif
+
+			// Debugging friendly version of inner loop. Tries to do the timing as similarly to the
+			// JIT as possible. Does not take into account that some instructions take multiple cycles.
+			while (PowerPC::ppcState.downcount > 0)
+			{
+				m_EndBlock = false;
+				int i;
+				for (i = 0; !m_EndBlock; i++)
+				{
+					#ifdef SHOW_HISTORY
+						PCVec.push_back(PC);
+						if (PCVec.size() > ShowSteps)
+							PCVec.erase(PCVec.begin());
+					#endif
+
+
+					//2: check for breakpoint
+					if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
+					{
+						#ifdef SHOW_HISTORY
+							NOTICE_LOG(POWERPC, "----------------------------");
+							NOTICE_LOG(POWERPC, "Blocks:");
+							for (int j = 0; j < PCBlockVec.size(); j++)
+								NOTICE_LOG(POWERPC, "PC: 0x%08x", PCBlockVec.at(j));
+							NOTICE_LOG(POWERPC, "----------------------------");
+							NOTICE_LOG(POWERPC, "Steps:");
+							for (int j = 0; j < PCVec.size(); j++)
+							{
+								// Write space
+								if (j > 0)
+								{
+									if (PCVec.at(j) != PCVec.at(j-1) + 4)
+										NOTICE_LOG(POWERPC, "");
+								}
+
+								NOTICE_LOG(POWERPC, "PC: 0x%08x", PCVec.at(j));
+							}
+						#endif
+						INFO_LOG(POWERPC, "Hit Breakpoint - %08x", PC);
+						CCPU::Break();
+						if (PowerPC::breakpoints.IsTempBreakPoint(PC))
+							PowerPC::breakpoints.Remove(PC);
+
+						Host_UpdateDisasmDialog();
+						return;
+					}
+					SingleStepInner();
+				}
+				PowerPC::ppcState.downcount -= i;
+			}
+		}
+		else
+		{
+			// "fast" version of inner loop. well, it's not so fast.
+			while (PowerPC::ppcState.downcount > 0)
+			{
+				m_EndBlock = false;
+
+				int cycles = 0;
+				while (!m_EndBlock)
+				{
+					cycles += SingleStepInner();
+				}
+				PowerPC::ppcState.downcount -= cycles;
+			}
+		}
+
+		CoreTiming::Advance();
+
+		if (PowerPC::ppcState.Exceptions)
+		{
+			PowerPC::CheckExceptions();
+			PC = NPC;
+		}
+	}
+
+	// Let the waiting thread know we are done leaving
+	PowerPC::FinishStateMove();
+}
+
+void Interpreter::unknown_instruction(UGeckoInstruction _inst)
+{
+	std::string disasm = GekkoDisassembler::Disassemble(PowerPC::HostRead_U32(last_pc), last_pc);
+	NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm.c_str());
+	Dolphin_Debugger::PrintCallstack();
+	_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x  last_PC = %08x  LR = %08x\n", _inst.hex, PC, last_pc, LR);
+}
+
+void Interpreter::ClearCache()
+{
+	// Do nothing.
+}
+
+const char *Interpreter::GetName()
+{
+#ifdef _ARCH_64
+		return "Interpreter64";
+#else
+		return "Interpreter32";
+#endif
+}
+
+Interpreter *Interpreter::getInstance()
+{
+	static Interpreter instance;
+	return &instance;
+}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
similarity index 90%
rename from Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
rename to Source/Core/Core/PowerPC/Interpreter/Interpreter.h
index c61fa6a573..2f3ea38452 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
@@ -1,35 +1,35 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _INTERPRETER_H
-#define _INTERPRETER_H
+#pragma once
 
-#include "../Gekko.h"
-#include "../PowerPC.h"
-#include "../CPUCoreBase.h"
+#include "Common/Atomic.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PowerPC.h"
 
 class Interpreter : public CPUCoreBase
 {
 public:
-	void Init();
-	void Shutdown();
+	void Init() override;
+	void Shutdown() override;
 	void Reset();
-	void SingleStep();
+	void SingleStep() override;
 	int SingleStepInner();
 
-	void Run();
-	void ClearCache();
-	const char *GetName();
-
-	typedef void (*_interpreterInstruction)(UGeckoInstruction instCode);
-
-	_interpreterInstruction GetInstruction(UGeckoInstruction instCode);
+	void Run() override;
+	void ClearCache() override;
+	const char *GetName() override;
 
 	void Log();
 
-	// to keep the code cleaner
-	#define m_GPR (PowerPC::ppcState.gpr)
 	static bool m_EndBlock;
 
 	static void unknown_instruction(UGeckoInstruction _inst);
@@ -40,7 +40,6 @@ public:
 	static void bcctrx(UGeckoInstruction _inst);
 	static void bclrx(UGeckoInstruction _inst);
 	static void HLEFunction(UGeckoInstruction _inst);
-	static void CompiledBlock(UGeckoInstruction _inst);
 
 	// Syscall Instruction
 	static void sc(UGeckoInstruction _inst);
@@ -54,7 +53,7 @@ public:
 	static void fnmaddsx(UGeckoInstruction _inst);
 	static void fnmsubsx(UGeckoInstruction _inst);
 	static void fresx(UGeckoInstruction _inst);
-//	static void fsqrtsx(UGeckoInstruction _inst);
+	//static void fsqrtsx(UGeckoInstruction _inst);
 	static void fsubsx(UGeckoInstruction _inst);
 	static void fabsx(UGeckoInstruction _inst);
 	static void fcmpo(UGeckoInstruction _inst);
@@ -200,7 +199,6 @@ public:
 	static void stwcxd(UGeckoInstruction _inst);
 	static void stwux(UGeckoInstruction _inst);
 	static void stwx(UGeckoInstruction _inst);
-	static void sync(UGeckoInstruction _inst);
 	static void tlbia(UGeckoInstruction _inst);
 	static void tlbie(UGeckoInstruction _inst);
 	static void tlbsync(UGeckoInstruction _inst);
@@ -274,36 +272,11 @@ public:
 	static void crxor(UGeckoInstruction _inst);
 	static void mcrf(UGeckoInstruction _inst);
 	static void rfi(UGeckoInstruction _inst);
-	static void rfid(UGeckoInstruction _inst);	
-//   static void sync(UGeckoInstruction _inst);
+	static void rfid(UGeckoInstruction _inst);
+	static void sync(UGeckoInstruction _inst);
 	static void isync(UGeckoInstruction _inst);
 
-	static void RunTable4(UGeckoInstruction _instCode);
-	static void RunTable19(UGeckoInstruction _instCode);
-	static void RunTable31(UGeckoInstruction _instCode);
-	static void RunTable59(UGeckoInstruction _instCode);
-	static void RunTable63(UGeckoInstruction _instCode);
-
-	// flag helper
-	static void Helper_UpdateCR0(u32 _uValue);
-	static void Helper_UpdateCR1(double _fValue);
-	static void Helper_UpdateCR1(float _fValue);
-	static void Helper_UpdateCRx(int _x, u32 _uValue);
-	static u32 Helper_Carry(u32 _uValue1, u32 _uValue2);
-
-	// address helper
-	static u32 Helper_Get_EA   (const UGeckoInstruction _inst);
-	static u32 Helper_Get_EA_U (const UGeckoInstruction _inst);
-	static u32 Helper_Get_EA_X (const UGeckoInstruction _inst);
-	static u32 Helper_Get_EA_UX(const UGeckoInstruction _inst);
-
-	// paired helper
-	static float Helper_Dequantize(const u32 _Addr, const EQuantizeType _quantizeType, const unsigned int _uScale);
-	static void  Helper_Quantize  (const u32 _Addr, const double _fValue, const EQuantizeType _quantizeType, const unsigned _uScale);
-
-	// other helper
-	static u32 Helper_Mask(int mb, int me);
-
+	typedef void(*_interpreterInstruction)(UGeckoInstruction instCode);
 	static _interpreterInstruction m_opTable[64];
 	static _interpreterInstruction m_opTable4[1024];
 	static _interpreterInstruction m_opTable19[1024];
@@ -312,18 +285,40 @@ public:
 	static _interpreterInstruction m_opTable63[1024];
 
 	// singleton
-	static Interpreter *getInstance();
+	static Interpreter* getInstance();
+
+	static void RunTable4(UGeckoInstruction _instCode);
+	static void RunTable19(UGeckoInstruction _instCode);
+	static void RunTable31(UGeckoInstruction _instCode);
+	static void RunTable59(UGeckoInstruction _instCode);
+	static void RunTable63(UGeckoInstruction _instCode);
+
+	static u32 Helper_Carry(u32 _uValue1, u32 _uValue2);
 
 private:
-	Interpreter() { }
-	~Interpreter() { }
-	Interpreter(const Interpreter &);
-	Interpreter & operator=(const Interpreter &);
+	// flag helper
+	static void Helper_UpdateCR0(u32 _uValue);
+	static void Helper_UpdateCR1();
+	static void Helper_UpdateCRx(int _x, u32 _uValue);
+
+	// address helper
+	static u32 Helper_Get_EA   (const UGeckoInstruction _inst);
+	static u32 Helper_Get_EA_U (const UGeckoInstruction _inst);
+	static u32 Helper_Get_EA_X (const UGeckoInstruction _inst);
+	static u32 Helper_Get_EA_UX(const UGeckoInstruction _inst);
+
+	// paired helper
+	static void Helper_Dequantize(u32 addr, u32 instI, u32 instRD, u32 instW);
+	static void Helper_Quantize(u32 addr, u32 instI, u32 instRS, u32 instW);
+
+	// other helper
+	static u32 Helper_Mask(int mb, int me);
+
+	static void Helper_FloatCompareOrdered(UGeckoInstruction _inst, double a, double b);
+	static void Helper_FloatCompareUnordered(UGeckoInstruction _inst, double a, double b);
 
 	// TODO: These should really be in the save state, although it's unlikely to matter much.
 	// They are for lwarx and its friend stwcxd.
 	static bool g_bReserve;
 	static u32  g_reserveAddr;
 };
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp
similarity index 82%
rename from Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
rename to Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp
index 0b0aa1ba98..67f2707e9a 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp
@@ -1,17 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Interpreter.h"
-#include "../../HW/CPU.h"
-#include "../../HLE/HLE.h"
-#include "../PPCAnalyst.h"
-#include "Atomic.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
 
 void Interpreter::bx(UGeckoInstruction _inst)
 {
 	if (_inst.LK)
 		LR = PC + 4;
+
 	if (_inst.AA)
 		NPC = SignExt26(_inst.LI << 2);
 	else
@@ -44,11 +42,13 @@ void Interpreter::bcx(UGeckoInstruction _inst)
 	{
 		if (_inst.LK)
 			LR = PC + 4;
+
 		if (_inst.AA)
 			NPC = SignExt16(_inst.BD << 2);
 		else
 			NPC = PC + SignExt16(_inst.BD << 2);
 	}
+
 	m_EndBlock = true;
 }
 
@@ -64,6 +64,7 @@ void Interpreter::bcctrx(UGeckoInstruction _inst)
 		if (_inst.LK_3)
 			LR = PC + 4;
 	}
+
 	m_EndBlock = true;
 }
 
@@ -81,6 +82,7 @@ void Interpreter::bclrx(UGeckoInstruction _inst)
 		if (_inst.LK_3)
 			LR = PC + 4;
 	}
+
 	m_EndBlock = true;
 }
 
@@ -90,11 +92,6 @@ void Interpreter::HLEFunction(UGeckoInstruction _inst)
 	HLE::Execute(PC, _inst.hex);
 }
 
-void Interpreter::CompiledBlock(UGeckoInstruction _inst)
-{
-	_assert_msg_(POWERPC, 0, "CompiledBlock - shouldn't be here!");
-}
-
 void Interpreter::rfi(UGeckoInstruction _inst)
 {
 	// Restore saved bits from SRR1 to MSR.
@@ -112,17 +109,17 @@ void Interpreter::rfi(UGeckoInstruction _inst)
 	m_EndBlock = true;
 }
 
-void Interpreter::rfid(UGeckoInstruction _inst) 
+void Interpreter::rfid(UGeckoInstruction _inst)
 {
 	_dbg_assert_msg_(POWERPC, 0, "rfid instruction unimplemented (does this instruction even exist?)");
 	m_EndBlock = true;
 }
 
-// sc isn't really used for anything important in gc games (just for a write barrier) so we really don't have to emulate it.
+// sc isn't really used for anything important in GameCube games (just for a write barrier) so we really don't have to emulate it.
 // We do it anyway, though :P
 void Interpreter::sc(UGeckoInstruction _inst)
 {
-	Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_SYSCALL);
+	PowerPC::ppcState.Exceptions |= EXCEPTION_SYSCALL;
 	PowerPC::CheckExceptions();
 	m_EndBlock = true;
 }
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
new file mode 100644
index 0000000000..795bab7b0e
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
@@ -0,0 +1,236 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <limits>
+
+#include "Common/CPUDetect.h"
+#include "Common/MathUtil.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+#define MIN_SINGLE 0xc7efffffe0000000ull
+#define MAX_SINGLE 0x47efffffe0000000ull
+
+const u64 PPC_NAN_U64 = 0x7ff8000000000000ull;
+const double PPC_NAN  = *(double* const)&PPC_NAN_U64;
+
+// the 4 less-significand bits in FPSCR[FPRF]
+enum FPCC
+{
+	FL = 8, // <
+	FG = 4, // >
+	FE = 2, // =
+	FU = 1, // ?
+};
+
+inline void SetFPException(u32 mask)
+{
+	if ((FPSCR.Hex & mask) != mask)
+	{
+		FPSCR.FX = 1;
+	}
+	FPSCR.Hex |= mask;
+}
+
+inline void SetFI(int FI)
+{
+	if (FI)
+	{
+		SetFPException(FPSCR_XX);
+	}
+	FPSCR.FI = FI;
+}
+
+inline void UpdateFPSCR()
+{
+	FPSCR.VX = (FPSCR.Hex & FPSCR_VX_ANY) != 0;
+	FPSCR.FEX = 0; // we assume that "?E" bits are always 0
+}
+
+inline double ForceSingle(double _x)
+{
+	// convert to float...
+	float x = (float) _x;
+	if (!cpu_info.bFlushToZero && FPSCR.NI)
+	{
+		x = MathUtil::FlushToZero(x);
+	}
+	// ...and back to double:
+	return x;
+}
+
+inline double ForceDouble(double d)
+{
+	if (!cpu_info.bFlushToZero && FPSCR.NI)
+	{
+		d = MathUtil::FlushToZero(d);
+	}
+	return d;
+}
+
+inline double Force25Bit(double d)
+{
+	MathUtil::IntDouble x(d);
+	x.i = (x.i & 0xFFFFFFFFF8000000ULL) + (x.i & 0x8000000);
+	return x.d;
+}
+
+// these functions allow globally modify operations behaviour
+// also, these may be used to set flags like FR, FI, OX, UX
+
+inline double NI_mul(double a, double b)
+{
+	if (a != a) return a;
+	if (b != b) return b;
+	double t = a * b;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXIMZ);
+		return PPC_NAN;
+	}
+	return t;
+}
+
+inline double NI_add(double a, double b)
+{
+	if (a != a) return a;
+	if (b != b) return b;
+	double t = a + b;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXISI);
+		return PPC_NAN;
+	}
+	return t;
+}
+
+inline double NI_sub(double a, double b)
+{
+	if (a != a) return a;
+	if (b != b) return b;
+	double t = a - b;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXISI);
+		return PPC_NAN;
+	}
+	return t;
+}
+
+inline double NI_madd(double a, double c, double b, bool negate = false)
+{
+	if (a != a) return a;
+	if (b != b) return b;
+	if (c != c) return c;
+	double t = a * c;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXIMZ);
+		return PPC_NAN;
+	}
+	t = t + b;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXISI);
+		return PPC_NAN;
+	}
+	return negate ? -t : t;
+}
+
+inline double NI_msub(double a, double c, double b, bool negate = false)
+{
+	if (a != a) return a;
+	if (b != b) return b;
+	if (c != c) return c;
+	double t = a * c;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXIMZ);
+		return PPC_NAN;
+	}
+
+	t = t - b;
+	if (t != t)
+	{
+		SetFPException(FPSCR_VXISI);
+		return PPC_NAN;
+	}
+	return negate ? -t : t;
+}
+
+// used by stfsXX instructions and ps_rsqrte
+inline u32 ConvertToSingle(u64 x)
+{
+	u32 exp = (x >> 52) & 0x7ff;
+	if (exp > 896 || (x & ~MathUtil::DOUBLE_SIGN) == 0)
+	{
+		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
+	}
+	else if (exp >= 874)
+	{
+		u32 t = (u32)(0x80000000 | ((x & MathUtil::DOUBLE_FRAC) >> 21));
+		t = t >> (905 - exp);
+		t |= (x >> 32) & 0x80000000;
+		return t;
+	}
+	else
+	{
+		// This is said to be undefined.
+		// The code is based on hardware tests.
+		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
+	}
+}
+
+// used by psq_stXX operations.
+inline u32 ConvertToSingleFTZ(u64 x)
+{
+	u32 exp = (x >> 52) & 0x7ff;
+	if (exp > 896 || (x & ~MathUtil::DOUBLE_SIGN) == 0)
+	{
+		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
+	}
+	else
+	{
+		return (x >> 32) & 0x80000000;
+	}
+}
+
+inline u64 ConvertToDouble(u32 _x)
+{
+	// This is a little-endian re-implementation of the algorithm described in
+	// the PowerPC Programming Environments Manual for loading single
+	// precision floating point numbers.
+	// See page 566 of http://www.freescale.com/files/product/doc/MPCFPE32B.pdf
+
+	u64 x = _x;
+	u64 exp = (x >> 23) & 0xff;
+	u64 frac = x & 0x007fffff;
+
+	if (exp > 0 && exp < 255) // Normal number
+	{
+		u64 y = !(exp >> 7);
+		u64 z = y << 61 | y << 60 | y << 59;
+		return ((x & 0xc0000000) << 32) | z | ((x & 0x3fffffff) << 29);
+	}
+	else if (exp == 0 && frac != 0) // Subnormal number
+	{
+		exp = 1023 - 126;
+		do
+		{
+			frac <<= 1;
+			exp -= 1;
+		} while ((frac & 0x00800000) == 0);
+
+		return ((x & 0x80000000) << 32) | (exp << 52) | ((frac & 0x007fffff) << 29);
+	}
+	else // QNaN, SNaN or Zero
+	{
+		u64 y = exp >> 7;
+		u64 z = y << 61 | y << 60 | y << 59;
+		return ((x & 0xc0000000) << 32) | z | ((x & 0x3fffffff) << 29);
+	}
+}
+
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
new file mode 100644
index 0000000000..c5eee4d0ea
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
@@ -0,0 +1,563 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <limits>
+
+#include "Common/MathUtil.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
+
+using namespace MathUtil;
+
+// Extremely rare - actually, never seen.
+// Star Wars : Rogue Leader spams that at some point :|
+void Interpreter::Helper_UpdateCR1()
+{
+	SetCRField(1, (FPSCR.FX << 3) | (FPSCR.FEX << 2) | (FPSCR.VX << 1) | FPSCR.OX);
+}
+
+void Interpreter::Helper_FloatCompareOrdered(UGeckoInstruction _inst, double fa, double fb)
+{
+	int compareResult;
+
+	if (IsNAN(fa) || IsNAN(fb))
+	{
+		FPSCR.FX = 1;
+		compareResult = FPCC::FU;
+		if (IsSNAN(fa) || IsSNAN(fb))
+		{
+			SetFPException(FPSCR_VXSNAN);
+			if (FPSCR.VE == 0)
+			{
+				SetFPException(FPSCR_VXVC);
+			}
+		}
+		else // QNaN
+		{
+			SetFPException(FPSCR_VXVC);
+		}
+	}
+	else if (fa < fb)
+	{
+		compareResult = FPCC::FL;
+	}
+	else if (fa > fb)
+	{
+		compareResult = FPCC::FG;
+	}
+	else // Equals
+	{
+		compareResult = FPCC::FE;
+	}
+
+	// Clear and set the FPCC bits accordingly.
+	FPSCR.FPRF = (FPSCR.FPRF & ~0xF) | compareResult;
+
+	SetCRField(_inst.CRFD, compareResult);
+}
+
+void Interpreter::Helper_FloatCompareUnordered(UGeckoInstruction _inst, double fa, double fb)
+{
+	int compareResult;
+
+	if (IsNAN(fa) || IsNAN(fb))
+	{
+		compareResult = FPCC::FU;
+
+		if (IsSNAN(fa) || IsSNAN(fb))
+		{
+			FPSCR.FX = 1;
+			SetFPException(FPSCR_VXSNAN);
+		}
+	}
+	else if (fa < fb)
+	{
+		compareResult = FPCC::FL;
+	}
+	else if (fa > fb)
+	{
+		compareResult = FPCC::FG;
+	}
+	else // Equals
+	{
+		compareResult = FPCC::FE;
+	}
+
+	// Clear and set the FPCC bits accordingly.
+	FPSCR.FPRF = (FPSCR.FPRF & ~0xF) | compareResult;
+
+	SetCRField(_inst.CRFD, compareResult);
+}
+
+void Interpreter::fcmpo(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareOrdered(_inst, rPS0(_inst.FA), rPS0(_inst.FB));
+}
+
+void Interpreter::fcmpu(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareUnordered(_inst, rPS0(_inst.FA), rPS0(_inst.FB));
+}
+
+// Apply current rounding mode
+void Interpreter::fctiwx(UGeckoInstruction _inst)
+{
+	const double b = rPS0(_inst.FB);
+	u32 value;
+
+	if (b > (double)0x7fffffff)
+	{
+		value = 0x7fffffff;
+		SetFPException(FPSCR_VXCVI);
+		FPSCR.FI = 0;
+		FPSCR.FR = 0;
+	}
+	else if (b < -(double)0x80000000)
+	{
+		value = 0x80000000;
+		SetFPException(FPSCR_VXCVI);
+		FPSCR.FI = 0;
+		FPSCR.FR = 0;
+	}
+	else
+	{
+		s32 i = 0;
+		switch (FPSCR.RN)
+		{
+		case 0: // nearest
+			{
+				double t = b + 0.5;
+				i = (s32)t;
+
+				if (t - i < 0 || (t - i == 0 && b > 0))
+				{
+					i--;
+				}
+				break;
+			}
+		case 1: // zero
+			i = (s32)b;
+			break;
+		case 2: // +inf
+			i = (s32)b;
+			if (b - i > 0)
+			{
+				i++;
+			}
+			break;
+		case 3: // -inf
+			i = (s32)b;
+			if (b - i < 0)
+			{
+				i--;
+			}
+			break;
+		}
+		value = (u32)i;
+		double di = i;
+		if (di == b)
+		{
+			FPSCR.FI = 0;
+			FPSCR.FR = 0;
+		}
+		else
+		{
+			SetFI(1);
+			FPSCR.FR = fabs(di) > fabs(b);
+		}
+	}
+
+	// based on HW tests
+	// FPRF is not affected
+	riPS0(_inst.FD) = 0xfff8000000000000ull | value;
+	if (value == 0 && ( (*(u64*)&b) & DOUBLE_SIGN ))
+		riPS0(_inst.FD) |= 0x100000000ull;
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+// Always round toward zero
+void Interpreter::fctiwzx(UGeckoInstruction _inst)
+{
+	const double b = rPS0(_inst.FB);
+	u32 value;
+
+	if (b > (double)0x7fffffff)
+	{
+		value = 0x7fffffff;
+		SetFPException(FPSCR_VXCVI);
+		FPSCR.FI = 0;
+		FPSCR.FR = 0;
+	}
+	else if (b < -(double)0x80000000)
+	{
+		value = 0x80000000;
+		SetFPException(FPSCR_VXCVI);
+		FPSCR.FI = 0;
+		FPSCR.FR = 0;
+	}
+	else
+	{
+		s32 i = (s32)b;
+		double di = i;
+		if (di == b)
+		{
+			FPSCR.FI = 0;
+			FPSCR.FR = 0;
+		}
+		else
+		{
+			SetFI(1);
+			FPSCR.FR = fabs(di) > fabs(b);
+		}
+		value = (u32)i;
+	}
+
+	// based on HW tests
+	// FPRF is not affected
+	riPS0(_inst.FD) = 0xfff8000000000000ull | value;
+	if (value == 0 && ( (*(u64*)&b) & DOUBLE_SIGN ))
+		riPS0(_inst.FD) |= 0x100000000ull;
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fmrx(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB);
+
+	// This is a binary instruction. Does not alter FPSCR
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fabsx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = fabs(rPS0(_inst.FB));
+
+	// This is a binary instruction. Does not alter FPSCR
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnabsx(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB) | (1ULL << 63);
+
+	// This is a binary instruction. Does not alter FPSCR
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnegx(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB) ^ (1ULL << 63);
+
+	// This is a binary instruction. Does not alter FPSCR
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fselx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = (rPS0(_inst.FA) >= -0.0) ? rPS0(_inst.FC) : rPS0(_inst.FB);
+
+	// This is a binary instruction. Does not alter FPSCR
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+// !!! warning !!!
+// PS1 must be set to the value of PS0 or DragonballZ will be f**ked up
+// PS1 is said to be undefined
+void Interpreter::frspx(UGeckoInstruction _inst)  // round to single
+{
+	double b = rPS0(_inst.FB);
+	double rounded = ForceSingle(b);
+	SetFI(b != rounded);
+	FPSCR.FR = fabs(rounded) > fabs(b);
+	UpdateFPRF(rounded);
+	rPS0(_inst.FD) = rPS1(_inst.FD) = rounded;
+	return;
+}
+
+
+void Interpreter::fmulx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_mul(rPS0(_inst.FA), rPS0(_inst.FC)));
+	FPSCR.FI = 0; // are these flags important?
+	FPSCR.FR = 0;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+void Interpreter::fmulsx(UGeckoInstruction _inst)
+{
+	double c_value = Force25Bit(rPS0(_inst.FC));
+	double d_value = NI_mul(rPS0(_inst.FA), c_value);
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(d_value);
+	//FPSCR.FI = d_value != rPS0(_inst.FD);
+	FPSCR.FI = 0;
+	FPSCR.FR = 0;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fmaddx(UGeckoInstruction _inst)
+{
+	double result = ForceDouble(NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
+	rPS0(_inst.FD) = result;
+	UpdateFPRF(result);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fmaddsx(UGeckoInstruction _inst)
+{
+	double c_value = Force25Bit(rPS0(_inst.FC));
+	double d_value = NI_madd(rPS0(_inst.FA), c_value, rPS0(_inst.FB));
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(d_value);
+	FPSCR.FI = d_value != rPS0(_inst.FD);
+	FPSCR.FR = 0;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+
+void Interpreter::faddx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+void Interpreter::faddsx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fdivx(UGeckoInstruction _inst)
+{
+	double a = rPS0(_inst.FA);
+	double b = rPS0(_inst.FB);
+
+	if (a != a)
+	{
+		rPS0(_inst.FD) = a;
+	}
+	else if (b != b)
+	{
+		rPS0(_inst.FD) = b;
+	}
+	else
+	{
+		rPS0(_inst.FD) = ForceDouble(a / b);
+		if (b == 0.0)
+		{
+			if (a == 0.0)
+			{
+				SetFPException(FPSCR_VXZDZ);
+				rPS0(_inst.FD) = PPC_NAN;
+			}
+			SetFPException(FPSCR_ZX);
+		}
+		else
+		{
+			if (IsINF(a) && IsINF(b))
+			{
+				SetFPException(FPSCR_VXIDI);
+				rPS0(_inst.FD) = PPC_NAN;
+			}
+		}
+	}
+	UpdateFPRF(rPS0(_inst.FD));
+
+	// FR,FI,OX,UX???
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+void Interpreter::fdivsx(UGeckoInstruction _inst)
+{
+	double a = rPS0(_inst.FA);
+	double b = rPS0(_inst.FB);
+	double res;
+
+	if (a != a)
+	{
+		res = a;
+	}
+	else if (b != b)
+	{
+		res = b;
+	}
+	else
+	{
+		res = ForceSingle(a / b);
+		if (b == 0.0)
+		{
+			if (a == 0.0)
+			{
+				SetFPException(FPSCR_VXZDZ);
+				res = PPC_NAN;
+			}
+			SetFPException(FPSCR_ZX);
+		}
+		else
+		{
+			if (IsINF(a) && IsINF(b))
+			{
+				SetFPException(FPSCR_VXIDI);
+				res = PPC_NAN;
+			}
+		}
+	}
+
+	rPS0(_inst.FD) = rPS1(_inst.FD) = res;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+// Single precision only.
+void Interpreter::fresx(UGeckoInstruction _inst)
+{
+	double b = rPS0(_inst.FB);
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ApproximateReciprocal(b);
+
+	if (b == 0.0)
+	{
+		SetFPException(FPSCR_ZX);
+	}
+
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::frsqrtex(UGeckoInstruction _inst)
+{
+	double b = rPS0(_inst.FB);
+
+	if (b < 0.0)
+	{
+		SetFPException(FPSCR_VXSQRT);
+	}
+	else if (b == 0.0)
+	{
+		SetFPException(FPSCR_ZX);
+	}
+
+	rPS0(_inst.FD) = ApproximateReciprocalSquareRoot(b);
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fmsubx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fmsubsx(UGeckoInstruction _inst)
+{
+	double c_value = Force25Bit(rPS0(_inst.FC));
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_msub(rPS0(_inst.FA), c_value, rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnmaddx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnmaddsx(UGeckoInstruction _inst)
+{
+	double c_value = Force25Bit(rPS0(_inst.FC));
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_madd(rPS0(_inst.FA), c_value, rPS0(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnmsubx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fnmsubsx(UGeckoInstruction _inst)
+{
+	double c_value = Force25Bit(rPS0(_inst.FC));
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_msub(rPS0(_inst.FA), c_value, rPS0(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fsubx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceDouble(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fsubsx(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::fsqrtx(UGeckoInstruction _inst)
+{
+	// GEKKO is not supposed to support this instruction.
+	// PanicAlert("fsqrtx");
+	double b = rPS0(_inst.FB);
+
+	if (b < 0.0)
+	{
+		FPSCR.VXSQRT = 1;
+	}
+
+	rPS0(_inst.FD) = sqrt(b);
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
new file mode 100644
index 0000000000..7dd41c33a9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -0,0 +1,680 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+void Interpreter::Helper_UpdateCR0(u32 value)
+{
+	s64 sign_extended = (s64)(s32)value;
+	u64 cr_val = (u64)sign_extended;
+	cr_val = (cr_val & ~(1ull << 61)) | ((u64)GetXER_SO() << 61);
+
+	PowerPC::ppcState.cr_val[0] = cr_val;
+}
+
+void Interpreter::Helper_UpdateCRx(int idx, u32 value)
+{
+	s64 sign_extended = (s64)(s32)value;
+	u64 cr_val = (u64)sign_extended;
+	cr_val = (cr_val & ~(1ull << 61)) | ((u64)GetXER_SO() << 61);
+
+	PowerPC::ppcState.cr_val[idx] = cr_val;
+}
+
+u32 Interpreter::Helper_Carry(u32 _uValue1, u32 _uValue2)
+{
+	return _uValue2 > (~_uValue1);
+}
+
+u32 Interpreter::Helper_Mask(int mb, int me)
+{
+	//first make 001111111111111 part
+	u32 begin = 0xFFFFFFFF >> mb;
+	//then make 000000000001111 part, which is used to flip the bits of the first one
+	u32 end = me < 31 ? (0xFFFFFFFF >> (me + 1)) : 0;
+	//do the bitflip
+	u32 mask = begin ^ end;
+	//and invert if backwards
+	if (me < mb)
+		return ~mask;
+	else
+		return mask;
+}
+
+void Interpreter::addi(UGeckoInstruction _inst)
+{
+	if (_inst.RA)
+		rGPR[_inst.RD] = rGPR[_inst.RA] + _inst.SIMM_16;
+	else
+		rGPR[_inst.RD] = _inst.SIMM_16;
+}
+
+void Interpreter::addic(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 imm = (u32)(s32)_inst.SIMM_16;
+	// TODO(ector): verify this thing
+	rGPR[_inst.RD] = a + imm;
+	SetCarry(Helper_Carry(a, imm));
+}
+
+void Interpreter::addic_rc(UGeckoInstruction _inst)
+{
+	addic(_inst);
+	Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::addis(UGeckoInstruction _inst)
+{
+	if (_inst.RA)
+		rGPR[_inst.RD] = rGPR[_inst.RA] + (_inst.SIMM_16 << 16);
+	else
+		rGPR[_inst.RD] = (_inst.SIMM_16 << 16);
+}
+
+void Interpreter::andi_rc(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] & _inst.UIMM;
+	Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::andis_rc(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] & ((u32)_inst.UIMM << 16);
+	Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::cmpi(UGeckoInstruction _inst)
+{
+	Helper_UpdateCRx(_inst.CRFD, rGPR[_inst.RA] - _inst.SIMM_16);
+}
+
+void Interpreter::cmpli(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = _inst.UIMM;
+	int f;
+
+	if (a < b)
+		f = 0x8;
+	else if (a > b)
+		f = 0x4;
+	else
+		f = 0x2; //equals
+
+	if (GetXER_SO())
+		f |= 0x1;
+
+	SetCRField(_inst.CRFD, f);
+}
+
+void Interpreter::mulli(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = (s32)rGPR[_inst.RA] * _inst.SIMM_16;
+}
+
+void Interpreter::ori(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] | _inst.UIMM;
+}
+
+void Interpreter::oris(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] | (_inst.UIMM << 16);
+}
+
+void Interpreter::subfic(UGeckoInstruction _inst)
+{
+/*	u32 rra = ~rGPR[_inst.RA];
+	s32 immediate = (s16)_inst.SIMM_16 + 1;
+
+//	#define CALC_XER_CA(X,Y) (((X) + (Y) < X) ? SET_XER_CA : CLEAR_XER_CA)
+	if ((rra + immediate) < rra)
+		SetCarry(1);
+	else
+		SetCarry(0);
+
+	rGPR[_inst.RD] = rra - immediate;
+*/
+
+	s32 immediate = _inst.SIMM_16;
+	rGPR[_inst.RD] = immediate - (int)rGPR[_inst.RA];
+	SetCarry((rGPR[_inst.RA] == 0) || (Helper_Carry(0 - rGPR[_inst.RA], immediate)));
+}
+
+void Interpreter::twi(UGeckoInstruction _inst)
+{
+	s32 a = rGPR[_inst.RA];
+	s32 b = _inst.SIMM_16;
+	s32 TO = _inst.TO;
+
+	DEBUG_LOG(POWERPC, "twi rA %x SIMM %x TO %0x", a, b, TO);
+
+	if (((a < b) && (TO & 0x10)) ||
+	    ((a > b) && (TO & 0x08)) ||
+	    ((a ==b) && (TO & 0x04)) ||
+	    (((u32)a <(u32)b) && (TO & 0x02)) ||
+	    (((u32)a >(u32)b) && (TO & 0x01)))
+	{
+		PowerPC::ppcState.Exceptions |= EXCEPTION_PROGRAM;
+		PowerPC::CheckExceptions();
+		m_EndBlock = true; // Dunno about this
+	}
+}
+
+void Interpreter::xori(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] ^ _inst.UIMM;
+}
+
+void Interpreter::xoris(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] ^ (_inst.UIMM << 16);
+}
+
+void Interpreter::rlwimix(UGeckoInstruction _inst)
+{
+	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
+	rGPR[_inst.RA] = (rGPR[_inst.RA] & ~mask) | (_rotl(rGPR[_inst.RS],_inst.SH) & mask);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::rlwinmx(UGeckoInstruction _inst)
+{
+	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
+	rGPR[_inst.RA] = _rotl(rGPR[_inst.RS],_inst.SH) & mask;
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::rlwnmx(UGeckoInstruction _inst)
+{
+	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
+	rGPR[_inst.RA] = _rotl(rGPR[_inst.RS], rGPR[_inst.RB] & 0x1F) & mask;
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::andx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] & rGPR[_inst.RB];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::andcx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] & ~rGPR[_inst.RB];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::cmp(UGeckoInstruction _inst)
+{
+	s32 a = (s32)rGPR[_inst.RA];
+	s32 b = (s32)rGPR[_inst.RB];
+	int fTemp;
+
+	if (a < b)
+		fTemp = 0x8;
+	else if (a > b)
+		fTemp = 0x4;
+	else // Equals
+		fTemp = 0x2;
+
+	if (GetXER_SO())
+		fTemp |= 0x1;
+
+	SetCRField(_inst.CRFD, fTemp);
+}
+
+void Interpreter::cmpl(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	u32 fTemp;
+
+	if (a < b)
+		fTemp = 0x8;
+	else if (a > b)
+		fTemp = 0x4;
+	else // Equals
+		fTemp = 0x2;
+
+	if (GetXER_SO())
+		fTemp |= 0x1;
+
+	SetCRField(_inst.CRFD, fTemp);
+}
+
+void Interpreter::cntlzwx(UGeckoInstruction _inst)
+{
+	u32 val = rGPR[_inst.RS];
+	u32 mask = 0x80000000;
+
+	int i = 0;
+	for (; i < 32; i++, mask >>= 1)
+	{
+		if (val & mask)
+			break;
+	}
+
+	rGPR[_inst.RA] = i;
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::eqvx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = ~(rGPR[_inst.RS] ^ rGPR[_inst.RB]);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::extsbx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = (u32)(s32)(s8)rGPR[_inst.RS];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::extshx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = (u32)(s32)(s16)rGPR[_inst.RS];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::nandx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = ~(rGPR[_inst.RS] & rGPR[_inst.RB]);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::norx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = ~(rGPR[_inst.RS] | rGPR[_inst.RB]);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::orx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] | rGPR[_inst.RB];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::orcx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] | (~rGPR[_inst.RB]);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::slwx(UGeckoInstruction _inst)
+{
+	u32 amount = rGPR[_inst.RB];
+	rGPR[_inst.RA] = (amount & 0x20) ? 0 : rGPR[_inst.RS] << (amount & 0x1f);
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::srawx(UGeckoInstruction _inst)
+{
+	int rb = rGPR[_inst.RB];
+
+	if (rb & 0x20)
+	{
+		if (rGPR[_inst.RS] & 0x80000000)
+		{
+			rGPR[_inst.RA] = 0xFFFFFFFF;
+			SetCarry(1);
+		}
+		else
+		{
+			rGPR[_inst.RA] = 0x00000000;
+			SetCarry(0);
+		}
+	}
+	else
+	{
+		int amount = rb & 0x1f;
+		if (amount == 0)
+		{
+			rGPR[_inst.RA] = rGPR[_inst.RS];
+			SetCarry(0);
+		}
+		else
+		{
+			s32 rrs = rGPR[_inst.RS];
+			rGPR[_inst.RA] = rrs >> amount;
+
+			if ((rrs < 0) && (rrs << (32 - amount)))
+				SetCarry(1);
+			else
+				SetCarry(0);
+		}
+	}
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::srawix(UGeckoInstruction _inst)
+{
+	int amount = _inst.SH;
+
+	if (amount != 0)
+	{
+		s32 rrs = rGPR[_inst.RS];
+		rGPR[_inst.RA] = rrs >> amount;
+
+		if ((rrs < 0) && (rrs << (32 - amount)))
+			SetCarry(1);
+		else
+			SetCarry(0);
+	}
+	else
+	{
+		SetCarry(0);
+		rGPR[_inst.RA] = rGPR[_inst.RS];
+	}
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::srwx(UGeckoInstruction _inst)
+{
+	u32 amount = rGPR[_inst.RB];
+	rGPR[_inst.RA] = (amount & 0x20) ? 0 : (rGPR[_inst.RS] >> (amount & 0x1f));
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::tw(UGeckoInstruction _inst)
+{
+	s32 a = rGPR[_inst.RA];
+	s32 b = rGPR[_inst.RB];
+	s32 TO = _inst.TO;
+
+	DEBUG_LOG(POWERPC, "tw rA %0x rB %0x TO %0x", a, b, TO);
+
+	if (((a < b) && (TO & 0x10)) ||
+	    ((a > b) && (TO & 0x08)) ||
+	    ((a ==b) && (TO & 0x04)) ||
+	    (((u32)a <(u32)b) && (TO & 0x02)) ||
+	    (((u32)a >(u32)b) && (TO & 0x01)))
+	{
+		PowerPC::ppcState.Exceptions |= EXCEPTION_PROGRAM;
+		PowerPC::CheckExceptions();
+		m_EndBlock = true; // Dunno about this
+	}
+}
+
+void Interpreter::xorx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RA] = rGPR[_inst.RS] ^ rGPR[_inst.RB];
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RA]);
+}
+
+void Interpreter::addx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = rGPR[_inst.RA] + rGPR[_inst.RB];
+
+	if (_inst.OE)
+		PanicAlert("OE: addx");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::addcx(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	rGPR[_inst.RD] = a + b;
+	SetCarry(Helper_Carry(a,b));
+
+	if (_inst.OE)
+		PanicAlert("OE: addcx");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::addex(UGeckoInstruction _inst)
+{
+	int carry = GetCarry();
+	int a = rGPR[_inst.RA];
+	int b = rGPR[_inst.RB];
+	rGPR[_inst.RD] = a + b + carry;
+	SetCarry(Helper_Carry(a, b) || (carry != 0 && Helper_Carry(a + b, carry)));
+
+	if (_inst.OE)
+		PanicAlert("OE: addex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::addmex(UGeckoInstruction _inst)
+{
+	int carry = GetCarry();
+	int a = rGPR[_inst.RA];
+	rGPR[_inst.RD] = a + carry - 1;
+	SetCarry(Helper_Carry(a, carry - 1));
+
+	if (_inst.OE)
+		PanicAlert("OE: addmex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::addzex(UGeckoInstruction _inst)
+{
+	int carry = GetCarry();
+	int a = rGPR[_inst.RA];
+	rGPR[_inst.RD] = a + carry;
+	SetCarry(Helper_Carry(a, carry));
+
+	if (_inst.OE)
+		PanicAlert("OE: addzex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::divwx(UGeckoInstruction _inst)
+{
+	s32 a = rGPR[_inst.RA];
+	s32 b = rGPR[_inst.RB];
+
+	if (b == 0 || ((u32)a == 0x80000000 && b == -1))
+	{
+		if (_inst.OE)
+		{
+			// should set OV
+			PanicAlert("OE: divwx");
+		}
+
+		if (((u32)a & 0x80000000) && b == 0)
+			rGPR[_inst.RD] = -1;
+		else
+			rGPR[_inst.RD] = 0;
+	}
+	else
+	{
+		rGPR[_inst.RD] = (u32)(a / b);
+	}
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+
+void Interpreter::divwux(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+
+	if (b == 0)
+	{
+		if (_inst.OE)
+		{
+			// should set OV
+			PanicAlert("OE: divwux");
+		}
+
+		rGPR[_inst.RD] = 0;
+	}
+	else
+	{
+		rGPR[_inst.RD] = a / b;
+	}
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::mulhwx(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32);  // This can be done better. Not in plain C/C++ though.
+	rGPR[_inst.RD] = d;
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::mulhwux(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	u32 d = (u32)(((u64)a * (u64)b) >> 32);
+	rGPR[_inst.RD] = d;
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::mullwx(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	u32 d = (u32)((s32)a * (s32)b);
+	rGPR[_inst.RD] = d;
+
+	if (_inst.OE)
+		PanicAlert("OE: mullwx");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::negx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = (~rGPR[_inst.RA]) + 1;
+
+	if (rGPR[_inst.RD] == 0x80000000)
+	{
+		if (_inst.OE)
+			PanicAlert("OE: negx");
+	}
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::subfx(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = rGPR[_inst.RB] - rGPR[_inst.RA];
+
+	if (_inst.OE)
+		PanicAlert("OE: subfx");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::subfcx(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	rGPR[_inst.RD] = b - a;
+	SetCarry(a == 0 || Helper_Carry(b, 0-a));
+
+	if (_inst.OE)
+		PanicAlert("OE: subfcx");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+void Interpreter::subfex(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	u32 b = rGPR[_inst.RB];
+	int carry = GetCarry();
+	rGPR[_inst.RD] = (~a) + b + carry;
+	SetCarry(Helper_Carry(~a, b) || Helper_Carry((~a) + b, carry));
+
+	if (_inst.OE)
+		PanicAlert("OE: subfex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+// sub from minus one
+void Interpreter::subfmex(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	int carry = GetCarry();
+	rGPR[_inst.RD] = (~a) + carry - 1;
+	SetCarry(Helper_Carry(~a, carry - 1));
+
+	if (_inst.OE)
+		PanicAlert("OE: subfmex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
+
+// sub from zero
+void Interpreter::subfzex(UGeckoInstruction _inst)
+{
+	u32 a = rGPR[_inst.RA];
+	int carry = GetCarry();
+	rGPR[_inst.RD] = (~a) + carry;
+	SetCarry(Helper_Carry(~a, carry));
+
+	if (_inst.OE)
+		PanicAlert("OE: subfzex");
+
+	if (_inst.Rc)
+		Helper_UpdateCR0(rGPR[_inst.RD]);
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp
new file mode 100644
index 0000000000..b0199b9724
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp
@@ -0,0 +1,837 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+#include "Core/HW/DSP.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
+
+
+bool Interpreter::g_bReserve;
+u32  Interpreter::g_reserveAddr;
+
+u32 Interpreter::Helper_Get_EA(const UGeckoInstruction _inst)
+{
+	return _inst.RA ? (rGPR[_inst.RA] + _inst.SIMM_16) : (u32)_inst.SIMM_16;
+}
+
+u32 Interpreter::Helper_Get_EA_U(const UGeckoInstruction _inst)
+{
+	return (rGPR[_inst.RA] + _inst.SIMM_16);
+}
+
+u32 Interpreter::Helper_Get_EA_X(const UGeckoInstruction _inst)
+{
+	return _inst.RA ? (rGPR[_inst.RA] + rGPR[_inst.RB]) : rGPR[_inst.RB];
+}
+
+u32 Interpreter::Helper_Get_EA_UX(const UGeckoInstruction _inst)
+{
+	return (rGPR[_inst.RA] + rGPR[_inst.RB]);
+}
+
+void Interpreter::lbz(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)PowerPC::Read_U8(Helper_Get_EA(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+		rGPR[_inst.RD] = temp;
+}
+
+void Interpreter::lbzu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u32 temp = (u32)PowerPC::Read_U8(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lfd(UGeckoInstruction _inst)
+{
+	u64 temp = PowerPC::Read_U64(Helper_Get_EA(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+		riPS0(_inst.FD) = temp;
+}
+
+void Interpreter::lfdu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u64 temp = PowerPC::Read_U64(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		riPS0(_inst.FD) = temp;
+		rGPR[_inst.RA]  = uAddress;
+	}
+}
+
+void Interpreter::lfdux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	u64 temp = PowerPC::Read_U64(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		riPS0(_inst.FD) = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lfdx(UGeckoInstruction _inst)
+{
+	u64 temp = PowerPC::Read_U64(Helper_Get_EA_X(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+		riPS0(_inst.FD) = temp;
+}
+
+void Interpreter::lfs(UGeckoInstruction _inst)
+{
+	u32 uTemp = PowerPC::Read_U32(Helper_Get_EA(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		u64 value = ConvertToDouble(uTemp);
+		riPS0(_inst.FD) = value;
+		riPS1(_inst.FD) = value;
+	}
+}
+
+void Interpreter::lfsu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u32 uTemp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		u64 value = ConvertToDouble(uTemp);
+		riPS0(_inst.FD) = value;
+		riPS1(_inst.FD) = value;
+		rGPR[_inst.RA] = uAddress;
+	}
+
+}
+
+void Interpreter::lfsux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	u32 uTemp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		u64 value = ConvertToDouble(uTemp);
+		riPS0(_inst.FD) = value;
+		riPS1(_inst.FD) = value;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lfsx(UGeckoInstruction _inst)
+{
+	u32 uTemp = PowerPC::Read_U32(Helper_Get_EA_X(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		u64 value = ConvertToDouble(uTemp);
+		riPS0(_inst.FD) = value;
+		riPS1(_inst.FD) = value;
+	}
+}
+
+void Interpreter::lha(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)(s32)(s16)PowerPC::Read_U16(Helper_Get_EA(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lhau(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u32 temp = (u32)(s32)(s16)PowerPC::Read_U16(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lhz(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)(u16)PowerPC::Read_U16(Helper_Get_EA(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lhzu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u32 temp = (u32)(u16)PowerPC::Read_U16(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+// FIXME: lmw should do a total rollback if a DSI occurs
+void Interpreter::lmw(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA(_inst);
+	for (int iReg = _inst.RD; iReg <= 31; iReg++, uAddress += 4)
+	{
+		u32 TempReg = PowerPC::Read_U32(uAddress);
+		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+		{
+			PanicAlert("DSI exception in lmw");
+			NOTICE_LOG(POWERPC, "DSI exception in lmw");
+			return;
+		}
+		else
+		{
+			rGPR[iReg] = TempReg;
+		}
+	}
+}
+
+// FIXME: stmw should do a total rollback if a DSI occurs
+void Interpreter::stmw(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA(_inst);
+	for (int iReg = _inst.RS; iReg <= 31; iReg++, uAddress+=4)
+	{
+		PowerPC::Write_U32(rGPR[iReg], uAddress);
+		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+		{
+			PanicAlert("DSI exception in stmw");
+			NOTICE_LOG(POWERPC, "DSI exception in stmw");
+			return;
+		}
+	}
+}
+
+void Interpreter::lwz(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA(_inst);
+	u32 temp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lwzu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	u32 temp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stb(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA(_inst));
+}
+
+void Interpreter::stbu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	PowerPC::Write_U8((u8)rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stfd(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U64(riPS0(_inst.FS), Helper_Get_EA(_inst));
+}
+
+void Interpreter::stfdu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	PowerPC::Write_U64(riPS0(_inst.FS), uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stfs(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA(_inst));
+}
+
+void Interpreter::stfsu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::sth(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA(_inst));
+}
+
+void Interpreter::sthu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	PowerPC::Write_U16((u16)rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stw(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U32(rGPR[_inst.RS], Helper_Get_EA(_inst));
+}
+
+void Interpreter::stwu(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_U(_inst);
+	PowerPC::Write_U32(rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::dcba(UGeckoInstruction _inst)
+{
+	_assert_msg_(POWERPC,0,"dcba - Not implemented - not a Gekko instruction");
+}
+
+void Interpreter::dcbf(UGeckoInstruction _inst)
+{
+	//This should tell GFX backend to throw out any cached data here
+	// !!! SPEEDUP HACK for OSProtectRange !!!
+/*	u32 tmp1 = PowerPC::HostRead_U32(PC+4);
+	u32 tmp2 = PowerPC::HostRead_U32(PC+8);
+
+	if ((tmp1 == 0x38630020) &&
+		(tmp2 == 0x4200fff8))
+	{
+		NPC = PC + 12;
+	}*/
+	u32 address = Helper_Get_EA_X(_inst);
+	JitInterface::InvalidateICache(address & ~0x1f, 32, false);
+}
+
+void Interpreter::dcbi(UGeckoInstruction _inst)
+{
+	// Removes a block from data cache. Since we don't emulate the data cache, we don't need to do anything to the data cache
+	// However, we invalidate the jit block cache on dcbi
+	u32 address = Helper_Get_EA_X(_inst);
+	JitInterface::InvalidateICache(address & ~0x1f, 32, false);
+
+	// The following detects a situation where the game is writing to the dcache at the address being DMA'd. As we do not
+	// have dcache emulation, invalid data is being DMA'd causing audio glitches. The following code detects this and
+	// enables the DMA to complete instantly before the invalid data is written. Resident Evil 2 & 3 trigger this.
+	u64 dma_in_progress = DSP::DMAInProgress();
+	if (dma_in_progress != 0)
+	{
+		u32 start_addr = (dma_in_progress >> 32) & Memory::RAM_MASK;
+		u32 end_addr = (dma_in_progress & Memory::RAM_MASK) & 0xffffffff;
+		u32 invalidated_addr = (address & Memory::RAM_MASK) & ~0x1f;
+
+		if (invalidated_addr >= start_addr && invalidated_addr <= end_addr)
+		{
+			DSP::EnableInstantDMA();
+		}
+	}
+}
+
+void Interpreter::dcbst(UGeckoInstruction _inst)
+{
+	// Cache line flush. Since we don't emulate the data cache, we don't need to do anything.
+	// Invalidate the jit block cache on dcbst in case new code has been loaded via the data cache
+	u32 address = Helper_Get_EA_X(_inst);
+	JitInterface::InvalidateICache(address & ~0x1f, 32, false);
+}
+
+void Interpreter::dcbt(UGeckoInstruction _inst)
+{
+	// Prefetch. Since we don't emulate the data cache, we don't need to do anything.
+}
+
+void Interpreter::dcbtst(UGeckoInstruction _inst)
+{
+	// This is just some sort of store "prefetching".
+	// Since we don't emulate the data cache, we don't need to do anything.
+}
+
+void Interpreter::dcbz(UGeckoInstruction _inst)
+{
+	// HACK but works... we think
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bDCBZOFF)
+		PowerPC::ClearCacheLine(Helper_Get_EA_X(_inst) & (~31));
+	if (!JitInterface::GetCore())
+		PowerPC::CheckExceptions();
+}
+
+// eciwx/ecowx technically should access the specified device
+// We just do it instantly from ppc...and hey, it works! :D
+void Interpreter::eciwx(UGeckoInstruction _inst)
+{
+	u32 EA = Helper_Get_EA_X(_inst);
+
+	if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000))
+	{
+		PowerPC::ppcState.Exceptions |= EXCEPTION_DSI;
+	}
+	if (EA & 3)
+		PowerPC::ppcState.Exceptions |= EXCEPTION_ALIGNMENT;
+
+// 	_assert_msg_(POWERPC,0,"eciwx - fill r%i with word @ %08x from device %02x",
+// 		_inst.RS, EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f);
+
+	rGPR[_inst.RD] = PowerPC::Read_U32(EA);
+}
+
+void Interpreter::ecowx(UGeckoInstruction _inst)
+{
+	u32 EA = Helper_Get_EA_X(_inst);
+
+	if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000))
+	{
+		PowerPC::ppcState.Exceptions |= EXCEPTION_DSI;
+	}
+	if (EA & 3)
+		PowerPC::ppcState.Exceptions |= EXCEPTION_ALIGNMENT;
+
+// 	_assert_msg_(POWERPC,0,"ecowx - send stw request (%08x@%08x) to device %02x",
+// 		rGPR[_inst.RS], EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f);
+
+	PowerPC::Write_U32(rGPR[_inst.RS], EA);
+}
+
+void Interpreter::eieio(UGeckoInstruction _inst)
+{
+	// Basically ensures that loads/stores before this instruction
+	// have completed (in order) before executing the next op.
+	// Prevents real ppc from "smartly" reordering loads/stores
+	// But (at least in interpreter) we do everything realtime anyways.
+}
+
+void Interpreter::icbi(UGeckoInstruction _inst)
+{
+	u32 address = Helper_Get_EA_X(_inst);
+	PowerPC::ppcState.iCache.Invalidate(address);
+}
+
+void Interpreter::lbzux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	u32 temp = (u32)PowerPC::Read_U8(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lbzx(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)PowerPC::Read_U8(Helper_Get_EA_X(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lhaux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	s32 temp = (s32)(s16)PowerPC::Read_U16(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lhax(UGeckoInstruction _inst)
+{
+	s32 temp = (s32)(s16)PowerPC::Read_U16(Helper_Get_EA_X(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lhbrx(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)Common::swap16(PowerPC::Read_U16(Helper_Get_EA_X(_inst)));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lhzux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	u32 temp = (u32)PowerPC::Read_U16(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lhzx(UGeckoInstruction _inst)
+{
+	u32 temp = (u32)PowerPC::Read_U16(Helper_Get_EA_X(_inst));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+// TODO: is this right?
+// FIXME: Should rollback if a DSI occurs
+void Interpreter::lswx(UGeckoInstruction _inst)
+{
+	u32 EA = Helper_Get_EA_X(_inst);
+	u32 n = (u8)PowerPC::ppcState.xer_stringctrl;
+	int r = _inst.RD;
+	int i = 0;
+
+	if (n > 0)
+	{
+		rGPR[r] = 0;
+		do
+		{
+			u32 TempValue = PowerPC::Read_U8(EA) << (24 - i);
+			if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+			{
+				PanicAlert("DSI exception in lswx.");
+				NOTICE_LOG(POWERPC, "DSI exception in lswx");
+				return;
+			}
+			rGPR[r] |= TempValue;
+
+			EA++;
+			n--;
+			i += 8;
+			if (i == 32)
+			{
+				i = 0;
+				r = (r + 1) & 31;
+				rGPR[r] = 0;
+			}
+		} while (n > 0);
+	}
+}
+
+void Interpreter::lwbrx(UGeckoInstruction _inst)
+{
+	u32 temp = Common::swap32(PowerPC::Read_U32(Helper_Get_EA_X(_inst)));
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::lwzux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	u32 temp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::lwzx(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_X(_inst);
+	u32 temp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+	}
+}
+
+void Interpreter::stbux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	PowerPC::Write_U8((u8)rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stbx(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U8((u8)rGPR[_inst.RS], Helper_Get_EA_X(_inst));
+}
+
+void Interpreter::stfdux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	PowerPC::Write_U64(riPS0(_inst.FS), uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stfdx(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U64(riPS0(_inst.FS), Helper_Get_EA_X(_inst));
+}
+
+// Stores Floating points into Integers indeXed
+void Interpreter::stfiwx(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_X(_inst);
+
+	PowerPC::Write_U32((u32)riPS0(_inst.FS), uAddress);
+}
+
+
+void Interpreter::stfsux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stfsx(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA_X(_inst));
+}
+
+void Interpreter::sthbrx(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U16(Common::swap16((u16)rGPR[_inst.RS]), Helper_Get_EA_X(_inst));
+}
+
+void Interpreter::sthux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	PowerPC::Write_U16((u16)rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::sthx(UGeckoInstruction _inst)
+{
+	PowerPC::Write_U16((u16)rGPR[_inst.RS], Helper_Get_EA_X(_inst));
+}
+
+// __________________________________________________________________________________________________
+// lswi - bizarro string instruction
+// FIXME: Should rollback if a DSI occurs
+void Interpreter::lswi(UGeckoInstruction _inst)
+{
+	u32 EA;
+	if (_inst.RA == 0)
+		EA = 0;
+	else
+		EA = rGPR[_inst.RA];
+
+	u32 n;
+	if (_inst.NB == 0)
+		n = 32;
+	else
+		n = _inst.NB;
+
+	int r = _inst.RD - 1;
+	int i = 0;
+	while (n>0)
+	{
+		if (i==0)
+		{
+			r++;
+			r &= 31;
+			rGPR[r] = 0;
+		}
+
+		u32 TempValue = PowerPC::Read_U8(EA) << (24 - i);
+		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+		{
+			PanicAlert("DSI exception in lsw.");
+			return;
+		}
+
+		rGPR[r] |= TempValue;
+
+		i += 8;
+		if (i == 32)
+			i = 0;
+		EA++;
+		n--;
+	}
+}
+
+// todo : optimize ?
+// __________________________________________________________________________________________________
+// stswi - bizarro string instruction
+// FIXME: Should rollback if a DSI occurs
+void Interpreter::stswi(UGeckoInstruction _inst)
+{
+	u32 EA;
+	if (_inst.RA == 0)
+		EA = 0;
+	else
+		EA = rGPR[_inst.RA];
+
+	u32 n;
+	if (_inst.NB == 0)
+		n = 32;
+	else
+		n = _inst.NB;
+
+	int r = _inst.RS - 1;
+	int i = 0;
+	while (n > 0)
+	{
+		if (i == 0)
+		{
+			r++;
+			r &= 31;
+		}
+		PowerPC::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA);
+		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+		{
+			return;
+		}
+
+		i += 8;
+		if (i == 32)
+			i = 0;
+		EA++;
+		n--;
+	}
+}
+
+// TODO: is this right? is it DSI interruptible?
+void Interpreter::stswx(UGeckoInstruction _inst)
+{
+	u32 EA = Helper_Get_EA_X(_inst);
+	u32 n = (u8)PowerPC::ppcState.xer_stringctrl;
+	int r = _inst.RS;
+	int i = 0;
+
+	while (n > 0)
+	{
+		PowerPC::Write_U8((rGPR[r] >> (24 - i)) & 0xFF, EA);
+
+		EA++;
+		n--;
+		i += 8;
+		if (i == 32)
+		{
+			i = 0;
+			r++;
+		}
+	}
+}
+
+void Interpreter::stwbrx(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_X(_inst);
+	PowerPC::Write_U32(Common::swap32(rGPR[_inst.RS]), uAddress);
+}
+
+
+// The following two instructions are for SMP communications. On a single
+// CPU, they cannot fail unless an interrupt happens in between.
+
+void Interpreter::lwarx(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_X(_inst);
+	u32 temp = PowerPC::Read_U32(uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RD] = temp;
+		g_bReserve = true;
+		g_reserveAddr = uAddress;
+	}
+}
+
+void Interpreter::stwcxd(UGeckoInstruction _inst)
+{
+	// Stores Word Conditional indeXed
+	u32 uAddress;
+	if (g_bReserve)
+	{
+		uAddress = Helper_Get_EA_X(_inst);
+
+		if (uAddress == g_reserveAddr)
+		{
+			PowerPC::Write_U32(rGPR[_inst.RS], uAddress);
+			if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+			{
+				g_bReserve = false;
+				SetCRField(0, 2 | GetXER_SO());
+				return;
+			}
+		}
+	}
+
+	SetCRField(0, GetXER_SO());
+}
+
+void Interpreter::stwux(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_UX(_inst);
+	PowerPC::Write_U32(rGPR[_inst.RS], uAddress);
+	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
+	{
+		rGPR[_inst.RA] = uAddress;
+	}
+}
+
+void Interpreter::stwx(UGeckoInstruction _inst)
+{
+	u32 uAddress = Helper_Get_EA_X(_inst);
+	PowerPC::Write_U32(rGPR[_inst.RS], uAddress);
+}
+
+void Interpreter::sync(UGeckoInstruction _inst)
+{
+	//ignored
+}
+
+void Interpreter::tlbia(UGeckoInstruction _inst)
+{
+	// Gekko does not support this instructions.
+	PanicAlert("The GameCube CPU does not support tlbia");
+	// invalid the whole TLB
+	//MessageBox(0,"TLBIA","TLBIA",0);
+}
+
+void Interpreter::tlbie(UGeckoInstruction _inst)
+{
+	// Invalidate TLB entry
+	u32 _Address = rGPR[_inst.RB];
+	PowerPC::InvalidateTLBEntry(_Address);
+}
+
+void Interpreter::tlbsync(UGeckoInstruction _inst)
+{
+	//MessageBox(0,"TLBsync","TLBsyncE",0);
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
new file mode 100644
index 0000000000..4e3d467541
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -0,0 +1,348 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/MathUtil.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
+
+// dequantize table
+const float m_dequantizeTable[] =
+{
+	1.0 / (1ULL <<  0), 1.0 / (1ULL <<  1), 1.0 / (1ULL <<  2), 1.0 / (1ULL <<  3),
+	1.0 / (1ULL <<  4), 1.0 / (1ULL <<  5), 1.0 / (1ULL <<  6), 1.0 / (1ULL <<  7),
+	1.0 / (1ULL <<  8), 1.0 / (1ULL <<  9), 1.0 / (1ULL << 10), 1.0 / (1ULL << 11),
+	1.0 / (1ULL << 12), 1.0 / (1ULL << 13), 1.0 / (1ULL << 14), 1.0 / (1ULL << 15),
+	1.0 / (1ULL << 16), 1.0 / (1ULL << 17), 1.0 / (1ULL << 18), 1.0 / (1ULL << 19),
+	1.0 / (1ULL << 20), 1.0 / (1ULL << 21), 1.0 / (1ULL << 22), 1.0 / (1ULL << 23),
+	1.0 / (1ULL << 24), 1.0 / (1ULL << 25), 1.0 / (1ULL << 26), 1.0 / (1ULL << 27),
+	1.0 / (1ULL << 28), 1.0 / (1ULL << 29), 1.0 / (1ULL << 30), 1.0 / (1ULL << 31),
+	(1ULL << 32), (1ULL << 31), (1ULL << 30), (1ULL << 29),
+	(1ULL << 28), (1ULL << 27), (1ULL << 26), (1ULL << 25),
+	(1ULL << 24), (1ULL << 23), (1ULL << 22), (1ULL << 21),
+	(1ULL << 20), (1ULL << 19), (1ULL << 18), (1ULL << 17),
+	(1ULL << 16), (1ULL << 15), (1ULL << 14), (1ULL << 13),
+	(1ULL << 12), (1ULL << 11), (1ULL << 10), (1ULL <<  9),
+	(1ULL <<  8), (1ULL <<  7), (1ULL <<  6), (1ULL <<  5),
+	(1ULL <<  4), (1ULL <<  3), (1ULL <<  2), (1ULL <<  1),
+};
+
+// quantize table
+const float m_quantizeTable[] =
+{
+	(1ULL <<  0), (1ULL <<  1), (1ULL <<  2), (1ULL <<  3),
+	(1ULL <<  4), (1ULL <<  5), (1ULL <<  6), (1ULL <<  7),
+	(1ULL <<  8), (1ULL <<  9), (1ULL << 10), (1ULL << 11),
+	(1ULL << 12), (1ULL << 13), (1ULL << 14), (1ULL << 15),
+	(1ULL << 16), (1ULL << 17), (1ULL << 18), (1ULL << 19),
+	(1ULL << 20), (1ULL << 21), (1ULL << 22), (1ULL << 23),
+	(1ULL << 24), (1ULL << 25), (1ULL << 26), (1ULL << 27),
+	(1ULL << 28), (1ULL << 29), (1ULL << 30), (1ULL << 31),
+	1.0 / (1ULL << 32), 1.0 / (1ULL << 31), 1.0 / (1ULL << 30), 1.0 / (1ULL << 29),
+	1.0 / (1ULL << 28), 1.0 / (1ULL << 27), 1.0 / (1ULL << 26), 1.0 / (1ULL << 25),
+	1.0 / (1ULL << 24), 1.0 / (1ULL << 23), 1.0 / (1ULL << 22), 1.0 / (1ULL << 21),
+	1.0 / (1ULL << 20), 1.0 / (1ULL << 19), 1.0 / (1ULL << 18), 1.0 / (1ULL << 17),
+	1.0 / (1ULL << 16), 1.0 / (1ULL << 15), 1.0 / (1ULL << 14), 1.0 / (1ULL << 13),
+	1.0 / (1ULL << 12), 1.0 / (1ULL << 11), 1.0 / (1ULL << 10), 1.0 / (1ULL <<  9),
+	1.0 / (1ULL <<  8), 1.0 / (1ULL <<  7), 1.0 / (1ULL <<  6), 1.0 / (1ULL <<  5),
+	1.0 / (1ULL <<  4), 1.0 / (1ULL <<  3), 1.0 / (1ULL <<  2), 1.0 / (1ULL <<  1),
+};
+
+template<typename SType> SType ScaleAndClamp(double ps, u32 stScale)
+{
+	float convPS = (float)ps * m_quantizeTable[stScale];
+	float min = (float)std::numeric_limits<SType>::min();
+	float max = (float)std::numeric_limits<SType>::max();
+	MathUtil::Clamp(&convPS, min, max);
+	return (SType)convPS;
+}
+
+template<typename T> static T ReadUnpaired(u32 addr);
+
+template<> u8 ReadUnpaired<u8>(u32 addr)
+{
+	return PowerPC::Read_U8(addr);
+}
+
+template<> u16 ReadUnpaired<u16>(u32 addr)
+{
+	return PowerPC::Read_U16(addr);
+}
+
+template<> u32 ReadUnpaired<u32>(u32 addr)
+{
+	return PowerPC::Read_U32(addr);
+}
+
+template<typename T> static std::pair<T, T> ReadPair(u32 addr);
+
+template<> std::pair<u8, u8> ReadPair<u8>(u32 addr)
+{
+	u16 val = PowerPC::Read_U16(addr);
+	return { (u8)(val >> 8), (u8)val };
+}
+
+template<> std::pair<u16, u16> ReadPair<u16>(u32 addr)
+{
+	u32 val = PowerPC::Read_U32(addr);
+	return { (u16)(val >> 16), (u16)val };
+}
+
+template<> std::pair<u32, u32> ReadPair<u32>(u32 addr)
+{
+	u64 val = PowerPC::Read_U64(addr);
+	return { (u32)(val >> 32), (u32)val };
+}
+
+template<typename T> static void WriteUnpaired(T val, u32 addr);
+
+template<> void WriteUnpaired<u8>(u8 val, u32 addr)
+{
+	PowerPC::Write_U8(val, addr);
+}
+
+template<> void WriteUnpaired<u16>(u16 val, u32 addr)
+{
+	PowerPC::Write_U16(val, addr);
+}
+
+template<> void WriteUnpaired<u32>(u32 val, u32 addr)
+{
+	PowerPC::Write_U32(val, addr);
+}
+
+template<typename T> static void WritePair(T val1, T val2, u32 addr);
+
+template<> void WritePair<u8>(u8 val1, u8 val2, u32 addr)
+{
+	PowerPC::Write_U16(((u16)val1 << 8) | (u16)val2, addr);
+}
+
+template<> void WritePair<u16>(u16 val1, u16 val2, u32 addr)
+{
+	PowerPC::Write_U32(((u32)val1 << 16) | (u32)val2, addr);
+}
+
+template<> void WritePair<u32>(u32 val1, u32 val2, u32 addr)
+{
+	PowerPC::Write_U64(((u64)val1 << 32) | (u64)val2, addr);
+}
+
+template<typename T>
+void QuantizeAndStore(double ps0, double ps1, u32 addr, u32 instW, u32 stScale)
+{
+	typedef typename std::make_unsigned<T>::type U;
+	U convPS0 = (U)ScaleAndClamp<T>(ps0, stScale);
+	if (instW)
+	{
+		WriteUnpaired<U>(convPS0, addr);
+	}
+	else
+	{
+		U convPS1 = (U)ScaleAndClamp<T>(ps1, stScale);
+		WritePair<U>(convPS0, convPS1, addr);
+	}
+}
+
+void Interpreter::Helper_Quantize(u32 addr, u32 instI, u32 instRS, u32 instW)
+{
+	const UGQR gqr(rSPR(SPR_GQR0 + instI));
+	const EQuantizeType stType = gqr.st_type;
+	const unsigned int stScale = gqr.st_scale;
+
+	double ps0 = rPS0(instRS);
+	double ps1 = rPS1(instRS);
+	switch (stType)
+	{
+	case QUANTIZE_FLOAT:
+	{
+		u32 convPS0 = ConvertToSingleFTZ(MathUtil::IntDouble(ps0).i);
+		if (instW)
+		{
+			WriteUnpaired<u32>(convPS0, addr);
+		}
+		else
+		{
+			u32 convPS1 = ConvertToSingleFTZ(MathUtil::IntDouble(ps1).i);
+			WritePair<u32>(convPS0, convPS1, addr);
+		}
+		break;
+	}
+
+	case QUANTIZE_U8:
+		QuantizeAndStore<u8>(ps0, ps1, addr, instW, stScale);
+		break;
+
+	case QUANTIZE_U16:
+		QuantizeAndStore<u16>(ps0, ps1, addr, instW, stScale);
+		break;
+
+	case QUANTIZE_S8:
+		QuantizeAndStore<s8>(ps0, ps1, addr, instW, stScale);
+		break;
+
+	case QUANTIZE_S16:
+		QuantizeAndStore<s16>(ps0, ps1, addr, instW, stScale);
+		break;
+
+	case QUANTIZE_INVALID1:
+	case QUANTIZE_INVALID2:
+	case QUANTIZE_INVALID3:
+		_assert_msg_(POWERPC, 0, "PS dequantize - unknown type to read");
+		break;
+	}
+}
+
+template<typename T>
+std::pair<float, float> LoadAndDequantize(u32 addr, u32 instW, u32 ldScale)
+{
+	typedef typename std::make_unsigned<T>::type U;
+	float ps0, ps1;
+	if (instW)
+	{
+		U value = ReadUnpaired<U>(addr);
+		ps0 = (float)(T)(value) * m_dequantizeTable[ldScale];
+		ps1 = 1.0f;
+	}
+	else
+	{
+		std::pair<U, U> value = ReadPair<U>(addr);
+		ps0 = (float)(T)(value.first) * m_dequantizeTable[ldScale];
+		ps1 = (float)(T)(value.second) * m_dequantizeTable[ldScale];
+	}
+	return { ps0, ps1 };
+}
+
+void Interpreter::Helper_Dequantize(u32 addr, u32 instI, u32 instRD, u32 instW)
+{
+	UGQR gqr(rSPR(SPR_GQR0 + instI));
+	EQuantizeType ldType = gqr.ld_type;
+	unsigned int ldScale = gqr.ld_scale;
+
+	float ps0 = 0.0f;
+	float ps1 = 0.0f;
+
+	switch (ldType)
+	{
+	case QUANTIZE_FLOAT:
+		if (instW)
+		{
+			u32 value = ReadUnpaired<u32>(addr);
+			ps0 = MathUtil::IntFloat(value).f;
+			ps1 = 1.0f;
+		}
+		else
+		{
+			std::pair<u32, u32> value = ReadPair<u32>(addr);
+			ps0 = MathUtil::IntFloat(value.first).f;
+			ps1 = MathUtil::IntFloat(value.second).f;
+		}
+		break;
+
+	case QUANTIZE_U8:
+		std::tie(ps0, ps1) = LoadAndDequantize<u8>(addr, instW, ldScale);
+		break;
+
+	case QUANTIZE_U16:
+		std::tie(ps0, ps1) = LoadAndDequantize<u16>(addr, instW, ldScale);
+		break;
+
+	case QUANTIZE_S8:
+		std::tie(ps0, ps1) = LoadAndDequantize<s8>(addr, instW, ldScale);
+		break;
+
+	case QUANTIZE_S16:
+		std::tie(ps0, ps1) = LoadAndDequantize<s16>(addr, instW, ldScale);
+		break;
+
+	case QUANTIZE_INVALID1:
+	case QUANTIZE_INVALID2:
+	case QUANTIZE_INVALID3:
+		_assert_msg_(POWERPC, 0, "PS dequantize - unknown type to read");
+		ps0 = 0.f;
+		ps1 = 0.f;
+		break;
+	}
+
+	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+	{
+		return;
+	}
+
+	rPS0(instRD) = ps0;
+	rPS1(instRD) = ps1;
+}
+
+void Interpreter::psq_l(UGeckoInstruction _inst)
+{
+	const u32 EA = _inst.RA ?
+		(rGPR[_inst.RA] + _inst.SIMM_12) : (u32)_inst.SIMM_12;
+	Helper_Dequantize(EA, _inst.I, _inst.RD, _inst.W);
+}
+
+void Interpreter::psq_lu(UGeckoInstruction _inst)
+{
+	const u32 EA = rGPR[_inst.RA] + _inst.SIMM_12;
+	Helper_Dequantize(EA, _inst.I, _inst.RD, _inst.W);
+
+	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+	{
+		return;
+	}
+	rGPR[_inst.RA] = EA;
+}
+
+void Interpreter::psq_st(UGeckoInstruction _inst)
+{
+	const u32 EA = _inst.RA ?
+		(rGPR[_inst.RA] + _inst.SIMM_12) : (u32)_inst.SIMM_12;
+	Helper_Quantize(EA, _inst.I, _inst.RS, _inst.W);
+}
+
+void Interpreter::psq_stu(UGeckoInstruction _inst)
+{
+	const u32 EA = rGPR[_inst.RA] + _inst.SIMM_12;
+	Helper_Quantize(EA, _inst.I, _inst.RS, _inst.W);
+
+	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+	{
+		return;
+	}
+	rGPR[_inst.RA] = EA;
+}
+
+void Interpreter::psq_lx(UGeckoInstruction _inst)
+{
+	const u32 EA = _inst.RA ? (rGPR[_inst.RA] + rGPR[_inst.RB]) : rGPR[_inst.RB];
+	Helper_Dequantize(EA, _inst.Ix, _inst.RD, _inst.Wx);
+}
+
+void Interpreter::psq_stx(UGeckoInstruction _inst)
+{
+	const u32 EA = _inst.RA ? (rGPR[_inst.RA] + rGPR[_inst.RB]) : rGPR[_inst.RB];
+	Helper_Quantize(EA, _inst.Ix, _inst.RS, _inst.Wx);
+}
+
+void Interpreter::psq_lux(UGeckoInstruction _inst)
+{
+	const u32 EA = rGPR[_inst.RA] + rGPR[_inst.RB];
+	Helper_Dequantize(EA, _inst.Ix, _inst.RD, _inst.Wx);
+
+	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+	{
+		return;
+	}
+	rGPR[_inst.RA] = EA;
+}
+
+void Interpreter::psq_stux(UGeckoInstruction _inst)
+{
+	const u32 EA = rGPR[_inst.RA] + rGPR[_inst.RB];
+	Helper_Quantize(EA, _inst.Ix, _inst.RS, _inst.Wx);
+
+	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
+	{
+		return;
+	}
+	rGPR[_inst.RA] = EA;
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp
new file mode 100644
index 0000000000..2c9656bd8f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp
@@ -0,0 +1,429 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
+
+using namespace MathUtil;
+
+// These "binary instructions" do not alter FPSCR.
+void Interpreter::ps_sel(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = rPS0(_inst.FA) >= -0.0 ? rPS0(_inst.FC) : rPS0(_inst.FB);
+	rPS1(_inst.FD) = rPS1(_inst.FA) >= -0.0 ? rPS1(_inst.FC) : rPS1(_inst.FB);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_neg(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB) ^ (1ULL << 63);
+	riPS1(_inst.FD) = riPS1(_inst.FB) ^ (1ULL << 63);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_mr(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = rPS0(_inst.FB);
+	rPS1(_inst.FD) = rPS1(_inst.FB);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_nabs(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB) | (1ULL << 63);
+	riPS1(_inst.FD) = riPS1(_inst.FB) | (1ULL << 63);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_abs(UGeckoInstruction _inst)
+{
+	riPS0(_inst.FD) = riPS0(_inst.FB) & ~(1ULL << 63);
+	riPS1(_inst.FD) = riPS1(_inst.FB) & ~(1ULL << 63);
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+// These are just moves, double is OK.
+void Interpreter::ps_merge00(UGeckoInstruction _inst)
+{
+	double p0 = rPS0(_inst.FA);
+	double p1 = rPS0(_inst.FB);
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_merge01(UGeckoInstruction _inst)
+{
+	double p0 = rPS0(_inst.FA);
+	double p1 = rPS1(_inst.FB);
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_merge10(UGeckoInstruction _inst)
+{
+	double p0 = rPS1(_inst.FA);
+	double p1 = rPS0(_inst.FB);
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_merge11(UGeckoInstruction _inst)
+{
+	double p0 = rPS1(_inst.FA);
+	double p1 = rPS1(_inst.FB);
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+// From here on, the real deal.
+void Interpreter::ps_div(UGeckoInstruction _inst)
+{
+	u32 ex_mask = 0;
+
+	// PS0
+	{
+		double a = rPS0(_inst.FA);
+		double b = rPS0(_inst.FB);
+		double &res = rPS0(_inst.FD);
+
+		if (a != a)
+		{
+			res = a;
+		}
+		else if (b != b)
+		{
+			res = b;
+		}
+		else
+		{
+			if (b == 0.0)
+			{
+				ex_mask |= FPSCR_ZX;
+				if (rPS0(_inst.FA) == 0.0)
+				{
+					ex_mask |= FPSCR_VXZDZ;
+					res = PPC_NAN;
+				}
+				else
+				{
+					res = ForceSingle(a / b);
+				}
+			}
+			else
+			{
+				if (IsINF(a) && IsINF(b))
+				{
+					ex_mask |= FPSCR_VXIDI;
+					res = PPC_NAN;
+				}
+				else
+				{
+					res = ForceSingle(a / b);
+				}
+			}
+		}
+	}
+
+	// PS1
+	{
+		double a = rPS1(_inst.FA);
+		double b = rPS1(_inst.FB);
+		double &res = rPS1(_inst.FD);
+
+		if (a != a)
+		{
+			res = a;
+		}
+		else if (b != b)
+		{
+			res = b;
+		}
+		else
+		{
+			if (b == 0.0)
+			{
+				ex_mask |= FPSCR_ZX;
+				if (rPS0(_inst.FA) == 0.0)
+				{
+					ex_mask |= FPSCR_VXZDZ;
+					res = PPC_NAN;
+				}
+				else
+				{
+					res = ForceSingle(a / b);
+				}
+			}
+			else
+			{
+				if (IsINF(a) && IsINF(b))
+				{
+					ex_mask |= FPSCR_VXIDI;
+					res = PPC_NAN;
+				}
+				else
+				{
+					res = ForceSingle(a / b);
+				}
+			}
+		}
+	}
+
+	SetFPException(ex_mask);
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_res(UGeckoInstruction _inst)
+{
+	// this code is based on the real hardware tests
+	double a = rPS0(_inst.FB);
+	double b = rPS1(_inst.FB);
+
+	if (a == 0.0 || b == 0.0)
+	{
+		SetFPException(FPSCR_ZX);
+	}
+
+	rPS0(_inst.FD) = ApproximateReciprocal(a);
+	rPS1(_inst.FD) = ApproximateReciprocal(b);
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_rsqrte(UGeckoInstruction _inst)
+{
+	if (rPS0(_inst.FB) == 0.0 || rPS1(_inst.FB) == 0.0)
+	{
+		SetFPException(FPSCR_ZX);
+	}
+
+	if (rPS0(_inst.FB) < 0.0 || rPS1(_inst.FB) < 0.0)
+	{
+		SetFPException(FPSCR_VXSQRT);
+	}
+
+	rPS0(_inst.FD) = ForceSingle(ApproximateReciprocalSquareRoot(rPS0(_inst.FB)));
+	rPS1(_inst.FD) = ForceSingle(ApproximateReciprocalSquareRoot(rPS1(_inst.FB)));
+
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+
+void Interpreter::ps_sub(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceSingle(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
+	rPS1(_inst.FD) = ForceSingle(NI_sub(rPS1(_inst.FA), rPS1(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_add(UGeckoInstruction _inst)
+{
+	rPS0(_inst.FD) = ForceSingle(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
+	rPS1(_inst.FD) = ForceSingle(NI_add(rPS1(_inst.FA), rPS1(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_mul(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	rPS0(_inst.FD) = ForceSingle(NI_mul(rPS0(_inst.FA), c0));
+	rPS1(_inst.FD) = ForceSingle(NI_mul(rPS1(_inst.FA), c1));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+
+void Interpreter::ps_msub(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	rPS0(_inst.FD) = ForceSingle(NI_msub(rPS0(_inst.FA), c0, rPS0(_inst.FB)));
+	rPS1(_inst.FD) = ForceSingle(NI_msub(rPS1(_inst.FA), c1, rPS1(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_madd(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	rPS0(_inst.FD) = ForceSingle(NI_madd(rPS0(_inst.FA), c0, rPS0(_inst.FB)));
+	rPS1(_inst.FD) = ForceSingle(NI_madd(rPS1(_inst.FA), c1, rPS1(_inst.FB)));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_nmsub(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	rPS0(_inst.FD) = ForceSingle(NI_msub(rPS0(_inst.FA), c0, rPS0(_inst.FB), true));
+	rPS1(_inst.FD) = ForceSingle(NI_msub(rPS1(_inst.FA), c1, rPS1(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_nmadd(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	rPS0(_inst.FD) = ForceSingle(NI_madd(rPS0(_inst.FA), c0, rPS0(_inst.FB), true));
+	rPS1(_inst.FD) = ForceSingle(NI_madd(rPS1(_inst.FA), c1, rPS1(_inst.FB), true));
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_sum0(UGeckoInstruction _inst)
+{
+	double p0 = ForceSingle(NI_add(rPS0(_inst.FA), rPS1(_inst.FB)));
+	double p1 = ForceSingle(rPS1(_inst.FC));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_sum1(UGeckoInstruction _inst)
+{
+	double p0 = ForceSingle(rPS0(_inst.FC));
+	double p1 = ForceSingle(NI_add(rPS0(_inst.FA), rPS1(_inst.FB)));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS1(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_muls0(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double p0 = ForceSingle(NI_mul(rPS0(_inst.FA), c0));
+	double p1 = ForceSingle(NI_mul(rPS1(_inst.FA), c0));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_muls1(UGeckoInstruction _inst)
+{
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	double p0 = ForceSingle(NI_mul(rPS0(_inst.FA), c1));
+	double p1 = ForceSingle(NI_mul(rPS1(_inst.FA), c1));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_madds0(UGeckoInstruction _inst)
+{
+	double c0 = Force25Bit(rPS0(_inst.FC));
+	double p0 = ForceSingle(NI_madd(rPS0(_inst.FA), c0, rPS0(_inst.FB)));
+	double p1 = ForceSingle(NI_madd(rPS1(_inst.FA), c0, rPS1(_inst.FB)));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_madds1(UGeckoInstruction _inst)
+{
+	double c1 = Force25Bit(rPS1(_inst.FC));
+	double p0 = ForceSingle(NI_madd(rPS0(_inst.FA), c1, rPS0(_inst.FB)));
+	double p1 = ForceSingle(NI_madd(rPS1(_inst.FA), c1, rPS1(_inst.FB)));
+	rPS0(_inst.FD) = p0;
+	rPS1(_inst.FD) = p1;
+	UpdateFPRF(rPS0(_inst.FD));
+
+	if (_inst.Rc)
+		Helper_UpdateCR1();
+}
+
+void Interpreter::ps_cmpu0(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareUnordered(_inst, rPS0(_inst.FA), rPS0(_inst.FB));
+}
+
+void Interpreter::ps_cmpo0(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareOrdered(_inst, rPS0(_inst.FA), rPS0(_inst.FB));
+}
+
+void Interpreter::ps_cmpu1(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareUnordered(_inst, rPS1(_inst.FA), rPS1(_inst.FB));
+}
+
+void Interpreter::ps_cmpo1(UGeckoInstruction _inst)
+{
+	Helper_FloatCompareOrdered(_inst, rPS1(_inst.FA), rPS1(_inst.FB));
+}
+
+// __________________________________________________________________________________________________
+// dcbz_l
+// TODO(ector) check docs
+void Interpreter::dcbz_l(UGeckoInstruction _inst)
+{
+	//FAKE: clear memory instead of clearing the cache block
+	PowerPC::ClearCacheLine(Helper_Get_EA_X(_inst) & (~31));
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
new file mode 100644
index 0000000000..7258959467
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
@@ -0,0 +1,459 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CPUDetect.h"
+#include "Common/FPURoundMode.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
+
+/*
+
+Most of these are together with fctiwx
+mffsx: 800c3624
+mffsx: 80043c98
+mffsx: 8003dd48
+mffsx: 8003dd9c
+mffsx: 80036608
+mffsx: 80036650 (huh?)
+
+*/
+// TODO(ector): More proper handling of SSE state.
+// That is, set rounding mode etc when entering jit code or the interpreter loop
+// Restore rounding mode when calling anything external
+
+static void FPSCRtoFPUSettings(UReg_FPSCR fp)
+{
+	FPURoundMode::SetRoundMode(fp.RN);
+
+	if (fp.VE || fp.OE || fp.UE || fp.ZE || fp.XE)
+	{
+		//PanicAlert("FPSCR - exceptions enabled. Please report. VE=%i OE=%i UE=%i ZE=%i XE=%i",
+		//	fp.VE, fp.OE, fp.UE, fp.ZE, fp.XE);
+		// Pokemon Colosseum does this. Gah.
+	}
+
+	// Set SSE rounding mode and denormal handling
+	FPURoundMode::SetSIMDMode(fp.RN, fp.NI);
+}
+
+void Interpreter::mtfsb0x(UGeckoInstruction _inst)
+{
+	u32 b = 0x80000000 >> _inst.CRBD;
+
+	/*if (b & 0x9ff80700)
+		PanicAlert("mtfsb0 clears bit %d, PC=%x", _inst.CRBD, PC);*/
+
+	FPSCR.Hex &= ~b;
+	FPSCRtoFPUSettings(FPSCR);
+
+	if (_inst.Rc)
+		PanicAlert("mtfsb0x: inst_.Rc");
+}
+
+void Interpreter::mtfsb1x(UGeckoInstruction _inst)
+{
+	// this instruction can affect FX
+	u32 b = 0x80000000 >> _inst.CRBD;
+	if (b & FPSCR_ANY_X)
+		SetFPException(b);
+	else
+		FPSCR.Hex |= b;
+	FPSCRtoFPUSettings(FPSCR);
+
+	if (_inst.Rc)
+		PanicAlert("mtfsb1x: inst_.Rc");
+}
+
+void Interpreter::mtfsfix(UGeckoInstruction _inst)
+{
+	u32 mask = (0xF0000000 >> (4 * _inst.CRFD));
+	u32 imm = (_inst.hex << 16) & 0xF0000000;
+
+	/*u32 cleared = ~(imm >> (4 * _inst.CRFD)) & FPSCR.Hex & mask;
+	if (cleared & 0x9ff80700)
+		PanicAlert("mtfsfi clears %08x, PC=%x", cleared, PC);*/
+
+	FPSCR.Hex = (FPSCR.Hex & ~mask) | (imm >> (4 * _inst.CRFD));
+
+	FPSCRtoFPUSettings(FPSCR);
+
+	if (_inst.Rc)
+		PanicAlert("mtfsfix: inst_.Rc");
+}
+
+void Interpreter::mtfsfx(UGeckoInstruction _inst)
+{
+	u32 fm = _inst.FM;
+	u32 m = 0;
+	for (int i = 0; i < 8; i++)
+	{
+		if (fm & (1 << i))
+			m |= (0xF << (i * 4));
+	}
+
+	/*u32 cleared = ~((u32)(riPS0(_inst.FB))) & FPSCR.Hex & m;
+	if (cleared & 0x9ff80700)
+		PanicAlert("mtfsf clears %08x, PC=%x", cleared, PC);*/
+
+	FPSCR.Hex = (FPSCR.Hex & ~m) | ((u32)(riPS0(_inst.FB)) & m);
+	FPSCRtoFPUSettings(FPSCR);
+
+	if (_inst.Rc)
+		PanicAlert("mtfsfx: inst_.Rc");
+}
+
+void Interpreter::mcrxr(UGeckoInstruction _inst)
+{
+	SetCRField(_inst.CRFD, GetXER().Hex >> 28);
+	PowerPC::ppcState.xer_ca = 0;
+	PowerPC::ppcState.xer_so_ov = 0;
+}
+
+void Interpreter::mfcr(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = GetCR();
+}
+
+void Interpreter::mtcrf(UGeckoInstruction _inst)
+{
+	u32 crm = _inst.CRM;
+	if (crm == 0xFF)
+	{
+		SetCR(rGPR[_inst.RS]);
+	}
+	else
+	{
+		//TODO: use lookup table? probably not worth it
+		u32 mask = 0;
+		for (int i = 0; i < 8; i++)
+		{
+			if (crm & (1 << i))
+				mask |= 0xF << (i*4);
+		}
+
+		SetCR((GetCR() & ~mask) | (rGPR[_inst.RS] & mask));
+	}
+}
+
+
+void Interpreter::mfmsr(UGeckoInstruction _inst)
+{
+	//Privileged?
+	rGPR[_inst.RD] = MSR;
+}
+
+void Interpreter::mfsr(UGeckoInstruction _inst)
+{
+	rGPR[_inst.RD] = PowerPC::ppcState.sr[_inst.SR];
+}
+
+void Interpreter::mfsrin(UGeckoInstruction _inst)
+{
+	int index = (rGPR[_inst.RB] >> 28) & 0xF;
+	rGPR[_inst.RD] = PowerPC::ppcState.sr[index];
+}
+
+void Interpreter::mtmsr(UGeckoInstruction _inst)
+{
+	// Privileged?
+	MSR = rGPR[_inst.RS];
+	PowerPC::CheckExceptions();
+	m_EndBlock = true;
+}
+
+// Segment registers. MMU control.
+
+static void SetSR(int index, u32 value)
+{
+	DEBUG_LOG(POWERPC, "%08x: MMU: Segment register %i set to %08x", PowerPC::ppcState.pc, index, value);
+	PowerPC::ppcState.sr[index] = value;
+}
+
+void Interpreter::mtsr(UGeckoInstruction _inst)
+{
+	int index = _inst.SR;
+	u32 value = rGPR[_inst.RS];
+	SetSR(index, value);
+}
+
+void Interpreter::mtsrin(UGeckoInstruction _inst)
+{
+	int index = (rGPR[_inst.RB] >> 28) & 0xF;
+	u32 value = rGPR[_inst.RS];
+	SetSR(index, value);
+}
+
+
+
+void Interpreter::mftb(UGeckoInstruction _inst)
+{
+	int iIndex = (_inst.TBR >> 5) | ((_inst.TBR & 0x1F) << 5);
+	_dbg_assert_msg_(POWERPC, (iIndex == SPR_TL) || (iIndex == SPR_TU), "Invalid mftb");
+	(void)iIndex;
+	mfspr(_inst);
+}
+
+
+void Interpreter::mfspr(UGeckoInstruction _inst)
+{
+	u32 iIndex = ((_inst.SPR & 0x1F) << 5) + ((_inst.SPR >> 5) & 0x1F);
+
+	//TODO - check processor privilege level - many of these require privilege
+	//XER LR CTR are the only ones available in user mode, time base can be read too.
+	//GameCube games always run in superuser mode, but hey....
+
+	switch (iIndex)
+	{
+	case SPR_DEC:
+		if ((rSPR(iIndex) & 0x80000000) == 0) // We are still decrementing
+		{
+			rSPR(iIndex) = SystemTimers::GetFakeDecrementer();
+		}
+		break;
+
+	case SPR_TL:
+	case SPR_TU:
+		*((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :)
+		break;
+
+	case SPR_WPAR:
+		{
+			// TODO: If wpar_empty ever is false, Paper Mario hangs. Strange.
+			// Maybe WPAR is automatically flushed after a certain amount of time?
+			bool wpar_empty = true; //GPFifo::IsEmpty();
+			if (!wpar_empty)
+				rSPR(iIndex) |= 1;  // BNE = buffer not empty
+			else
+				rSPR(iIndex) &= ~1;
+		}
+		break;
+	case SPR_XER:
+		rSPR(iIndex) = GetXER().Hex;
+		break;
+	}
+	rGPR[_inst.RD] = rSPR(iIndex);
+}
+
+void Interpreter::mtspr(UGeckoInstruction _inst)
+{
+	u32 iIndex = (_inst.SPRU << 5) | (_inst.SPRL & 0x1F);
+	u32 oldValue = rSPR(iIndex);
+	rSPR(iIndex) = rGPR[_inst.RD];
+
+	//TODO - check processor privilege level - many of these require privilege
+	//XER LR CTR are the only ones available in user mode, time base can be read too.
+	//GameCube games always run in superuser mode, but hey....
+
+	//Our DMA emulation is highly inaccurate - instead of properly emulating the queue
+	//and so on, we simply make all DMA:s complete instantaneously.
+
+	switch (iIndex)
+	{
+	case SPR_TL:
+	case SPR_TU:
+		PanicAlert("Illegal Write to TL/TU");
+		break;
+
+	case SPR_TL_W:
+		TL = rGPR[_inst.RD];
+		SystemTimers::TimeBaseSet();
+		break;
+
+	case SPR_TU_W:
+		TU = rGPR[_inst.RD];
+		SystemTimers::TimeBaseSet();
+		break;
+
+	case SPR_HID0: // HID0
+		{
+			UReg_HID0 old_hid0;
+			old_hid0.Hex = oldValue;
+			if (HID0.ICE != old_hid0.ICE)
+			{
+				INFO_LOG(POWERPC, "Instruction Cache Enable (HID0.ICE) = %d", (int)HID0.ICE);
+			}
+			if (HID0.ILOCK != old_hid0.ILOCK)
+			{
+				INFO_LOG(POWERPC, "Instruction Cache Lock (HID0.ILOCK) = %d", (int)HID0.ILOCK);
+			}
+			if (HID0.ICFI)
+			{
+				HID0.ICFI = 0;
+				INFO_LOG(POWERPC, "Flush Instruction Cache! ICE=%d", (int)HID0.ICE);
+				// this is rather slow
+				// most games do it only once during initialization
+				PowerPC::ppcState.iCache.Reset();
+			}
+		}
+		break;
+	case SPR_HID2: // HID2
+		// TODO: generate illegal instruction for paired inst if PSE or LSQE
+		// not set.
+		// TODO: disable write gather pipe if WPE not set
+		// TODO: emulate locked cache and DMA bits.
+		break;
+
+	case SPR_WPAR:
+		_assert_msg_(POWERPC, rGPR[_inst.RD] == 0x0C008000, "Gather pipe @ %08x", PC);
+		GPFifo::ResetGatherPipe();
+		break;
+
+	// Graphics Quantization Registers
+	case SPR_GQR0:
+	case SPR_GQR0 + 1:
+	case SPR_GQR0 + 2:
+	case SPR_GQR0 + 3:
+	case SPR_GQR0 + 4:
+	case SPR_GQR0 + 5:
+	case SPR_GQR0 + 6:
+	case SPR_GQR0 + 7:
+		break;
+
+	case SPR_DMAL:
+		// Locked cache<->Memory DMA
+		// Total fake, we ignore that DMAs take time.
+		if (DMAL.DMA_T)
+		{
+			u32 dwMemAddress = DMAU.MEM_ADDR << 5;
+			u32 dwCacheAddress = DMAL.LC_ADDR << 5;
+			u32 iLength = ((DMAU.DMA_LEN_U << 2) | DMAL.DMA_LEN_L);
+			// INFO_LOG(POWERPC, "DMA: mem = %x, cache = %x, len = %u, LD = %d, PC=%x", dwMemAddress, dwCacheAddress, iLength, (int)DMAL.DMA_LD, PC);
+			if (iLength == 0)
+				iLength = 128;
+			if (DMAL.DMA_LD)
+				PowerPC::DMA_MemoryToLC(dwCacheAddress, dwMemAddress, iLength);
+			else
+				PowerPC::DMA_LCToMemory(dwMemAddress, dwCacheAddress, iLength);
+		}
+		DMAL.DMA_T = 0;
+		break;
+
+	case SPR_L2CR:
+		//PanicAlert("mtspr( L2CR )!");
+		break;
+
+	case SPR_DEC:
+		if (!(oldValue >> 31) && (rGPR[_inst.RD]>>31))   //top bit from 0 to 1
+		{
+			PanicAlert("Interesting - Software triggered Decrementer exception");
+			PowerPC::ppcState.Exceptions |= EXCEPTION_DECREMENTER;
+		}
+		SystemTimers::DecrementerSet();
+		break;
+
+	// Page table base etc
+	case SPR_SDR:
+		PowerPC::SDRUpdated();
+		break;
+
+	case SPR_XER:
+		SetXER(rSPR(iIndex));
+		break;
+	}
+}
+
+void Interpreter::crand(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, GetCRBit(_inst.CRBA) & GetCRBit(_inst.CRBB));
+}
+
+void Interpreter::crandc(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, GetCRBit(_inst.CRBA) & (1 ^ GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::creqv(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) ^ GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::crnand(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) & GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::crnor(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) | GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::cror(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) | GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::crorc(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) | (1 ^ GetCRBit(_inst.CRBB))));
+}
+
+void Interpreter::crxor(UGeckoInstruction _inst)
+{
+	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) ^ GetCRBit(_inst.CRBB)));
+}
+
+void Interpreter::mcrf(UGeckoInstruction _inst)
+{
+	int cr_f = GetCRField(_inst.CRFS);
+	SetCRField(_inst.CRFD, cr_f);
+}
+
+void Interpreter::isync(UGeckoInstruction _inst)
+{
+	//shouldn't do anything
+}
+
+// the following commands read from FPSCR
+
+void Interpreter::mcrfs(UGeckoInstruction _inst)
+{
+	//if (_inst.CRFS != 3 && _inst.CRFS != 4)
+	//	PanicAlert("msrfs at %x, CRFS = %d, CRFD = %d", PC, (int)_inst.CRFS, (int)_inst.CRFD);
+
+	UpdateFPSCR();
+	u32 fpflags = ((FPSCR.Hex >> (4 * (7 - _inst.CRFS))) & 0xF);
+	switch (_inst.CRFS)
+	{
+	case 0:
+		FPSCR.FX = 0;
+		FPSCR.OX = 0;
+		break;
+	case 1:
+		FPSCR.UX = 0;
+		FPSCR.ZX = 0;
+		FPSCR.XX = 0;
+		FPSCR.VXSNAN = 0;
+		break;
+	case 2:
+		FPSCR.VXISI = 0;
+		FPSCR.VXIDI = 0;
+		FPSCR.VXZDZ = 0;
+		FPSCR.VXIMZ = 0;
+		break;
+	case 3:
+		FPSCR.VXVC = 0;
+		break;
+	case 5:
+		FPSCR.VXSOFT = 0;
+		FPSCR.VXSQRT = 0;
+		FPSCR.VXCVI = 0;
+		break;
+	}
+	SetCRField(_inst.CRFD, fpflags);
+}
+
+void Interpreter::mffsx(UGeckoInstruction _inst)
+{
+	// load from FPSCR
+	// This may or may not be accurate - but better than nothing, I guess
+	// TODO(ector): grab all overflow flags etc and set them in FPSCR
+
+	UpdateFPSCR();
+	riPS0(_inst.FD) = (u64)FPSCR.Hex;
+
+	if (_inst.Rc)
+		PanicAlert("mffsx: inst_.Rc");
+}
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
new file mode 100644
index 0000000000..7ce41cdf32
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
@@ -0,0 +1,495 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/Interpreter/Interpreter_Tables.h"
+
+typedef void (*_Instruction) (UGeckoInstruction instCode);
+
+struct GekkoOPTemplate
+{
+	int opcode;
+	_Instruction Inst;
+	GekkoOPInfo opinfo;
+};
+
+static GekkoOPInfo unknownopinfo = { "unknown_instruction", OPTYPE_UNKNOWN, FL_ENDBLOCK, 0, 0, 0, 0 };
+
+static GekkoOPTemplate primarytable[] =
+{
+	{4,  Interpreter::RunTable4,    {"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0, 0, 0, 0, 0}},
+	{19, Interpreter::RunTable19,   {"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0, 0, 0, 0, 0}},
+	{31, Interpreter::RunTable31,   {"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0, 0, 0, 0, 0}},
+	{59, Interpreter::RunTable59,   {"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0, 0, 0, 0, 0}},
+	{63, Interpreter::RunTable63,   {"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0, 0, 0, 0, 0}},
+
+	{16, Interpreter::bcx,          {"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}},
+	{18, Interpreter::bx,           {"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}},
+
+	{3,  Interpreter::twi,          {"twi",         OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}},
+	{17, Interpreter::sc,           {"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 2, 0, 0, 0}},
+
+	{7,  Interpreter::mulli,        {"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A, 3, 0, 0, 0}},
+	{8,  Interpreter::subfic,       {"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA, 1, 0, 0, 0}},
+	{10, Interpreter::cmpli,        {"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 1, 0, 0, 0}},
+	{11, Interpreter::cmpi,         {"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 1, 0, 0, 0}},
+	{12, Interpreter::addic,        {"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA, 1, 0, 0, 0}},
+	{13, Interpreter::addic_rc,     {"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA | FL_SET_CR0, 1, 0, 0, 0}},
+	{14, Interpreter::addi,         {"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0, 1, 0, 0, 0}},
+	{15, Interpreter::addis,        {"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0, 1, 0, 0, 0}},
+
+	{20, Interpreter::rlwimix,      {"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT, 1, 0, 0, 0}},
+	{21, Interpreter::rlwinmx,      {"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 1, 0, 0, 0}},
+	{23, Interpreter::rlwnmx,       {"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+
+	{24, Interpreter::ori,          {"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 1, 0, 0, 0}},
+	{25, Interpreter::oris,         {"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 1, 0, 0, 0}},
+	{26, Interpreter::xori,         {"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 1, 0, 0, 0}},
+	{27, Interpreter::xoris,        {"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 1, 0, 0, 0}},
+	{28, Interpreter::andi_rc,      {"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0, 1, 0, 0, 0}},
+	{29, Interpreter::andis_rc,     {"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0, 1, 0, 0, 0}},
+
+	{32, Interpreter::lwz,          {"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_LOADSTORE, 1, 0, 0, 0}},
+	{33, Interpreter::lwzu,         {"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 1, 0, 0, 0}},
+	{34, Interpreter::lbz,          {"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_LOADSTORE, 1, 0, 0, 0}},
+	{35, Interpreter::lbzu,         {"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 1, 0, 0, 0}},
+	{40, Interpreter::lhz,          {"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_LOADSTORE, 1, 0, 0, 0}},
+	{41, Interpreter::lhzu,         {"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{42, Interpreter::lha,          {"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_LOADSTORE, 1, 0, 0, 0}},
+	{43, Interpreter::lhau,         {"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{44, Interpreter::sth,          {"sth",  OPTYPE_STORE, FL_IN_A0 | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{45, Interpreter::sthu,         {"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{36, Interpreter::stw,          {"stw",  OPTYPE_STORE, FL_IN_A0 | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{37, Interpreter::stwu,         {"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{38, Interpreter::stb,          {"stb",  OPTYPE_STORE, FL_IN_A0 | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{39, Interpreter::stbu,         {"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{46, Interpreter::lmw,          {"lmw",   OPTYPE_SYSTEM, FL_EVIL | FL_IN_A0 | FL_LOADSTORE, 11, 0, 0, 0}},
+	{47, Interpreter::stmw,         {"stmw",  OPTYPE_SYSTEM, FL_EVIL | FL_IN_A0 | FL_LOADSTORE, 11, 0, 0, 0}},
+
+	{48, Interpreter::lfs,          {"lfs",  OPTYPE_LOADFP, FL_OUT_FLOAT_D | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{49, Interpreter::lfsu,         {"lfsu", OPTYPE_LOADFP, FL_OUT_FLOAT_D | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{50, Interpreter::lfd,          {"lfd",  OPTYPE_LOADFP, FL_INOUT_FLOAT_D | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{51, Interpreter::lfdu,         {"lfdu", OPTYPE_LOADFP, FL_INOUT_FLOAT_D | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{52, Interpreter::stfs,         {"stfs",  OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_A0 | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{53, Interpreter::stfsu,        {"stfsu", OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{54, Interpreter::stfd,         {"stfd",  OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_A0 | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{55, Interpreter::stfdu,        {"stfdu", OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{56, Interpreter::psq_l,        {"psq_l",   OPTYPE_LOADPS, FL_OUT_FLOAT_D | FL_IN_A0 | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{57, Interpreter::psq_lu,       {"psq_lu",  OPTYPE_LOADPS, FL_OUT_FLOAT_D | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{60, Interpreter::psq_st,       {"psq_st",  OPTYPE_STOREPS, FL_IN_FLOAT_S | FL_IN_A0 | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{61, Interpreter::psq_stu,      {"psq_stu", OPTYPE_STOREPS, FL_IN_FLOAT_S | FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//missing: 0, 1, 2, 5, 6, 9, 22, 30, 62, 58
+};
+
+static GekkoOPTemplate table4[] =
+{    //SUBOP10
+	{0,    Interpreter::ps_cmpu0,   {"ps_cmpu0",   OPTYPE_PS, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+	{32,   Interpreter::ps_cmpo0,   {"ps_cmpo0",   OPTYPE_PS, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+	{40,   Interpreter::ps_neg,     {"ps_neg",     OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{136,  Interpreter::ps_nabs,    {"ps_nabs",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{264,  Interpreter::ps_abs,     {"ps_abs",     OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{64,   Interpreter::ps_cmpu1,   {"ps_cmpu1",   OPTYPE_PS, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+	{72,   Interpreter::ps_mr,      {"ps_mr",      OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{96,   Interpreter::ps_cmpo1,   {"ps_cmpo1",   OPTYPE_PS, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+	{528,  Interpreter::ps_merge00, {"ps_merge00", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{560,  Interpreter::ps_merge01, {"ps_merge01", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{592,  Interpreter::ps_merge10, {"ps_merge10", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{624,  Interpreter::ps_merge11, {"ps_merge11", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+
+	{1014, Interpreter::dcbz_l,     {"dcbz_l",     OPTYPE_SYSTEM, FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+};
+
+static GekkoOPTemplate table4_2[] =
+{
+	{10, Interpreter::ps_sum0,      {"ps_sum0",   OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{11, Interpreter::ps_sum1,      {"ps_sum1",   OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{12, Interpreter::ps_muls0,     {"ps_muls0",  OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{13, Interpreter::ps_muls1,     {"ps_muls1",  OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{14, Interpreter::ps_madds0,    {"ps_madds0", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{15, Interpreter::ps_madds1,    {"ps_madds1", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{18, Interpreter::ps_div,       {"ps_div",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 17, 0, 0, 0}},
+	{20, Interpreter::ps_sub,       {"ps_sub",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{21, Interpreter::ps_add,       {"ps_add",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{23, Interpreter::ps_sel,       {"ps_sel",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{24, Interpreter::ps_res,       {"ps_res",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{25, Interpreter::ps_mul,       {"ps_mul",    OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_AC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{26, Interpreter::ps_rsqrte,    {"ps_rsqrte", OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 2, 0, 0, 0}},
+	{28, Interpreter::ps_msub,      {"ps_msub",   OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{29, Interpreter::ps_madd,      {"ps_madd",   OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{30, Interpreter::ps_nmsub,     {"ps_nmsub",  OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{31, Interpreter::ps_nmadd,     {"ps_nmadd",  OPTYPE_PS, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+};
+
+
+static GekkoOPTemplate table4_3[] =
+{
+	{6,  Interpreter::psq_lx,       {"psq_lx",   OPTYPE_LOADPS, FL_OUT_FLOAT_D | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{7,  Interpreter::psq_stx,      {"psq_stx",  OPTYPE_STOREPS, FL_IN_FLOAT_S | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{38, Interpreter::psq_lux,      {"psq_lux",  OPTYPE_LOADPS, FL_OUT_FLOAT_D | FL_OUT_A | FL_IN_AB | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{39, Interpreter::psq_stux,     {"psq_stux", OPTYPE_STOREPS, FL_IN_FLOAT_S | FL_OUT_A | FL_IN_AB | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+};
+
+static GekkoOPTemplate table19[] =
+{
+	{528, Interpreter::bcctrx,      {"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK, 1, 0, 0, 0}},
+	{16,  Interpreter::bclrx,       {"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK, 1, 0, 0, 0}},
+	{257, Interpreter::crand,       {"crand",  OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{129, Interpreter::crandc,      {"crandc", OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{289, Interpreter::creqv,       {"creqv",  OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{225, Interpreter::crnand,      {"crnand", OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{33,  Interpreter::crnor,       {"crnor",  OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{449, Interpreter::cror,        {"cror",   OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{417, Interpreter::crorc,       {"crorc",  OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+	{193, Interpreter::crxor,       {"crxor",  OPTYPE_CR, FL_EVIL, 1, 0, 0, 0}},
+
+	{150, Interpreter::isync,       {"isync",  OPTYPE_ICACHE, FL_EVIL, 1, 0, 0, 0}},
+	{0,   Interpreter::mcrf,        {"mcrf",   OPTYPE_SYSTEM, FL_EVIL | FL_SET_CRn, 1, 0, 0, 0}},
+
+	{50,  Interpreter::rfi,         {"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 2, 0, 0, 0}},
+	{18,  Interpreter::rfid,        {"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1, 0, 0, 0}}
+};
+
+
+static GekkoOPTemplate table31[] =
+{
+	{266,  Interpreter::addx,       {"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 1, 0, 0, 0}},
+	{778,  Interpreter::addx,       {"addox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{10,   Interpreter::addcx,      {"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{522,  Interpreter::addcx,      {"addcox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{138,  Interpreter::addex,      {"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{650,  Interpreter::addex,      {"addeox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{234,  Interpreter::addmex,     {"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{746,  Interpreter::addmex,     {"addmeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{202,  Interpreter::addzex,     {"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{714,  Interpreter::addzex,     {"addzeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{491,  Interpreter::divwx,      {"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 40, 0, 0, 0}},
+	{1003, Interpreter::divwx,      {"divwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT | FL_SET_OE, 40, 0, 0, 0}},
+	{459,  Interpreter::divwux,     {"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 40, 0, 0, 0}},
+	{971,  Interpreter::divwux,     {"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT | FL_SET_OE, 40, 0, 0, 0}},
+	{75,   Interpreter::mulhwx,     {"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 5, 0, 0, 0}},
+	{11,   Interpreter::mulhwux,    {"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 5, 0, 0, 0}},
+	{235,  Interpreter::mullwx,     {"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 5, 0, 0, 0}},
+	{747,  Interpreter::mullwx,     {"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT | FL_SET_OE, 5, 0, 0, 0}},
+	{104,  Interpreter::negx,       {"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 1, 0, 0, 0}},
+	{616,  Interpreter::negx,       {"negox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{40,   Interpreter::subfx,      {"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 1, 0, 0, 0}},
+	{552,  Interpreter::subfx,      {"subfox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{8,    Interpreter::subfcx,     {"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{520,  Interpreter::subfcx,     {"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{136,  Interpreter::subfex,     {"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{648,  Interpreter::subfex,     {"subfeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{232,  Interpreter::subfmex,    {"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{744,  Interpreter::subfmex,    {"subfmeox",OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+	{200,  Interpreter::subfzex,    {"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{712,  Interpreter::subfzex,    {"subfzeox",OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_READ_CA | FL_SET_CA | FL_RC_BIT | FL_SET_OE, 1, 0, 0, 0}},
+
+	{28,  Interpreter::andx,        {"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{60,  Interpreter::andcx,       {"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{444, Interpreter::orx,         {"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{124, Interpreter::norx,        {"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{316, Interpreter::xorx,        {"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{412, Interpreter::orcx,        {"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{476, Interpreter::nandx,       {"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{284, Interpreter::eqvx,        {"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{0,   Interpreter::cmp,         {"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn, 1, 0, 0, 0}},
+	{32,  Interpreter::cmpl,        {"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn, 1, 0, 0, 0}},
+	{26,  Interpreter::cntlzwx,     {"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 1, 0, 0, 0}},
+	{922, Interpreter::extshx,      {"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 1, 0, 0, 0}},
+	{954, Interpreter::extsbx,      {"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 1, 0, 0, 0}},
+	{536, Interpreter::srwx,        {"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+	{792, Interpreter::srawx,       {"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{824, Interpreter::srawix,      {"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CA | FL_RC_BIT, 1, 0, 0, 0}},
+	{24,  Interpreter::slwx,        {"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 1, 0, 0, 0}},
+
+	{54,   Interpreter::dcbst,      {"dcbst",  OPTYPE_DCACHE, FL_IN_A0B | FL_LOADSTORE, 5, 0, 0, 0}},
+	{86,   Interpreter::dcbf,       {"dcbf",   OPTYPE_DCACHE, FL_IN_A0B | FL_LOADSTORE, 5, 0, 0, 0}},
+	{246,  Interpreter::dcbtst,     {"dcbtst", OPTYPE_DCACHE, 0, 2, 0, 0, 0}},
+	{278,  Interpreter::dcbt,       {"dcbt",   OPTYPE_DCACHE, 0, 2, 0, 0, 0}},
+	{470,  Interpreter::dcbi,       {"dcbi",   OPTYPE_DCACHE, FL_IN_A0B | FL_LOADSTORE, 5, 0, 0, 0}},
+	{758,  Interpreter::dcba,       {"dcba",   OPTYPE_DCACHE, 0, 5, 0, 0, 0}},
+	{1014, Interpreter::dcbz,       {"dcbz",   OPTYPE_DCACHE, FL_IN_A0B | FL_LOADSTORE, 5, 0, 0, 0}},
+
+	//load word
+	{23,  Interpreter::lwzx,        {"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{55,  Interpreter::lwzux,       {"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//load halfword
+	{279, Interpreter::lhzx,        {"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{311, Interpreter::lhzux,       {"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//load halfword signextend
+	{343, Interpreter::lhax,        {"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{375, Interpreter::lhaux,       {"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//load byte
+	{87,  Interpreter::lbzx,        {"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{119, Interpreter::lbzux,       {"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//load byte reverse
+	{534, Interpreter::lwbrx,       {"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{790, Interpreter::lhbrx,       {"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	// Conditional load/store (Wii SMP)
+	{150, Interpreter::stwcxd,      {"stwcxd", OPTYPE_STORE, FL_EVIL | FL_IN_S | FL_IN_A0B | FL_SET_CR0 | FL_LOADSTORE, 1, 0, 0, 0}},
+	{20,  Interpreter::lwarx,       {"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0 | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//load string (Inst these)
+	{533, Interpreter::lswx,        {"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A0B | FL_OUT_D | FL_LOADSTORE, 1, 0, 0, 0}},
+	{597, Interpreter::lswi,        {"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_A0 | FL_OUT_D | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//store word
+	{151, Interpreter::stwx,        {"stwx",   OPTYPE_STORE, FL_IN_S | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{183, Interpreter::stwux,       {"stwux",  OPTYPE_STORE, FL_IN_S | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//store halfword
+	{407, Interpreter::sthx,        {"sthx",   OPTYPE_STORE, FL_IN_S | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{439, Interpreter::sthux,       {"sthux",  OPTYPE_STORE, FL_IN_S | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//store byte
+	{215, Interpreter::stbx,        {"stbx",   OPTYPE_STORE, FL_IN_S | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{247, Interpreter::stbux,       {"stbux",  OPTYPE_STORE, FL_IN_S | FL_OUT_A | FL_IN_AB | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	//store bytereverse
+	{662, Interpreter::stwbrx,      {"stwbrx", OPTYPE_STORE, FL_IN_S | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{918, Interpreter::sthbrx,      {"sthbrx", OPTYPE_STORE, FL_IN_S | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{661, Interpreter::stswx,       {"stswx",  OPTYPE_STORE, FL_EVIL | FL_IN_A0B | FL_LOADSTORE, 1, 0, 0, 0}},
+	{725, Interpreter::stswi,       {"stswi",  OPTYPE_STORE, FL_EVIL | FL_IN_A0 | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	// fp load/store
+	{535, Interpreter::lfsx,        {"lfsx",  OPTYPE_LOADFP, FL_OUT_FLOAT_D | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{567, Interpreter::lfsux,       {"lfsux", OPTYPE_LOADFP, FL_OUT_FLOAT_D | FL_IN_AB | FL_OUT_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{599, Interpreter::lfdx,        {"lfdx",  OPTYPE_LOADFP, FL_INOUT_FLOAT_D | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{631, Interpreter::lfdux,       {"lfdux", OPTYPE_LOADFP, FL_INOUT_FLOAT_D | FL_IN_AB | FL_OUT_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{663, Interpreter::stfsx,       {"stfsx",  OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{695, Interpreter::stfsux,      {"stfsux", OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_AB | FL_OUT_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{727, Interpreter::stfdx,       {"stfdx",  OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{759, Interpreter::stfdux,      {"stfdux", OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_AB | FL_OUT_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+	{983, Interpreter::stfiwx,      {"stfiwx", OPTYPE_STOREFP, FL_IN_FLOAT_S | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}},
+
+	{19,  Interpreter::mfcr,        {"mfcr",   OPTYPE_SYSTEM, FL_OUT_D, 1, 0, 0, 0}},
+	{83,  Interpreter::mfmsr,       {"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D, 1, 0, 0, 0}},
+	{144, Interpreter::mtcrf,       {"mtcrf",  OPTYPE_SYSTEM, FL_IN_S | FL_SET_CRn, 1, 0, 0, 0}},
+	{146, Interpreter::mtmsr,       {"mtmsr",  OPTYPE_SYSTEM, FL_IN_S | FL_ENDBLOCK, 1, 0, 0, 0}},
+	{210, Interpreter::mtsr,        {"mtsr",   OPTYPE_SYSTEM, FL_IN_S, 1, 0, 0, 0}},
+	{242, Interpreter::mtsrin,      {"mtsrin", OPTYPE_SYSTEM, FL_IN_SB, 1, 0, 0, 0}},
+	{339, Interpreter::mfspr,       {"mfspr",  OPTYPE_SPR, FL_OUT_D, 1, 0, 0, 0}},
+	{467, Interpreter::mtspr,       {"mtspr",  OPTYPE_SPR, FL_IN_S, 2, 0, 0, 0}},
+	{371, Interpreter::mftb,        {"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER, 1, 0, 0, 0}},
+	{512, Interpreter::mcrxr,       {"mcrxr",  OPTYPE_SYSTEM, FL_SET_CRn | FL_READ_CA | FL_SET_CA, 1, 0, 0, 0}},
+	{595, Interpreter::mfsr,        {"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 3, 0, 0, 0}},
+	{659, Interpreter::mfsrin,      {"mfsrin", OPTYPE_SYSTEM, FL_OUT_D | FL_IN_B, 3, 0, 0, 0}},
+
+	{4,   Interpreter::tw,          {"tw",     OPTYPE_SYSTEM, FL_IN_AB | FL_ENDBLOCK, 2, 0, 0, 0}},
+	{598, Interpreter::sync,        {"sync",   OPTYPE_SYSTEM, 0, 3, 0, 0, 0}},
+	{982, Interpreter::icbi,        {"icbi",   OPTYPE_SYSTEM, FL_IN_A0B | FL_ENDBLOCK | FL_LOADSTORE, 4, 0, 0, 0}},
+
+	// Unused instructions on GC
+	{310, Interpreter::eciwx,       {"eciwx",   OPTYPE_SYSTEM, FL_IN_A0B | FL_OUT_D | FL_LOADSTORE, 1, 0, 0, 0}},
+	{438, Interpreter::ecowx,       {"ecowx",   OPTYPE_SYSTEM, FL_IN_A0B | FL_IN_S | FL_LOADSTORE, 1, 0, 0, 0}},
+	{854, Interpreter::eieio,       {"eieio",   OPTYPE_SYSTEM, 0, 1, 0, 0, 0}},
+	{306, Interpreter::tlbie,       {"tlbie",   OPTYPE_SYSTEM, FL_IN_B, 1, 0, 0, 0}},
+	{370, Interpreter::tlbia,       {"tlbia",   OPTYPE_SYSTEM, 0, 1, 0, 0, 0}},
+	{566, Interpreter::tlbsync,     {"tlbsync", OPTYPE_SYSTEM, 0, 1, 0, 0, 0}},
+};
+
+static GekkoOPTemplate table59[] =
+{
+	{18, Interpreter::fdivsx,       {"fdivsx",   OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 17, 0, 0, 0}}, // TODO
+	{20, Interpreter::fsubsx,       {"fsubsx",   OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{21, Interpreter::faddsx,       {"faddsx",   OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	//{22, Interpreter::fsqrtsx,      {"fsqrtsx",  OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}}, // Not implemented on gekko
+	{24, Interpreter::fresx,        {"fresx",    OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{25, Interpreter::fmulsx,       {"fmulsx",   OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_AC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{28, Interpreter::fmsubsx,      {"fmsubsx",  OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{29, Interpreter::fmaddsx,      {"fmaddsx",  OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{30, Interpreter::fnmsubsx,     {"fnmsubsx", OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{31, Interpreter::fnmaddsx,     {"fnmaddsx", OPTYPE_SINGLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+};
+
+static GekkoOPTemplate table63[] =
+{
+	{264, Interpreter::fabsx,       {"fabsx",   OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+
+	// FIXME: fcmp modifies the FPRF flags, but if the flags are clobbered later,
+	// we don't actually need to calculate or store them here. So FL_READ_FPRF and FL_SET_FPRF is not
+	// an ideal representation of fcmp's effect on FPRF flags and might result in
+	// slightly sub-optimal code.
+	{32,  Interpreter::fcmpo,       {"fcmpo",   OPTYPE_DOUBLEFP, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+	{0,   Interpreter::fcmpu,       {"fcmpu",   OPTYPE_DOUBLEFP, FL_IN_FLOAT_AB | FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 1, 0, 0, 0}},
+
+	{14,  Interpreter::fctiwx,      {"fctiwx",  OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{15,  Interpreter::fctiwzx,     {"fctiwzx", OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{72,  Interpreter::fmrx,        {"fmrx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{136, Interpreter::fnabsx,      {"fnabsx",  OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{40,  Interpreter::fnegx,       {"fnegx",   OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{12,  Interpreter::frspx,       {"frspx",   OPTYPE_DOUBLEFP, FL_OUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+
+	{64,  Interpreter::mcrfs,       {"mcrfs",   OPTYPE_SYSTEMFP, FL_SET_CRn | FL_USE_FPU | FL_READ_FPRF, 1, 0, 0, 0}},
+	{583, Interpreter::mffsx,       {"mffsx",   OPTYPE_SYSTEMFP, FL_RC_BIT_F | FL_INOUT_FLOAT_D | FL_USE_FPU | FL_READ_FPRF, 1, 0, 0, 0}},
+	{70,  Interpreter::mtfsb0x,     {"mtfsb0x", OPTYPE_SYSTEMFP, FL_RC_BIT_F | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 3, 0, 0, 0}},
+	{38,  Interpreter::mtfsb1x,     {"mtfsb1x", OPTYPE_SYSTEMFP, FL_RC_BIT_F | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 3, 0, 0, 0}},
+	{134, Interpreter::mtfsfix,     {"mtfsfix", OPTYPE_SYSTEMFP, FL_RC_BIT_F | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 3, 0, 0, 0}},
+	{711, Interpreter::mtfsfx,      {"mtfsfx",  OPTYPE_SYSTEMFP, FL_RC_BIT_F | FL_IN_FLOAT_B | FL_USE_FPU | FL_READ_FPRF | FL_SET_FPRF, 3, 0, 0, 0}},
+};
+
+static GekkoOPTemplate table63_2[] =
+{
+	{18, Interpreter::fdivx,        {"fdivx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 31, 0, 0, 0}},
+	{20, Interpreter::fsubx,        {"fsubx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{21, Interpreter::faddx,        {"faddx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_AB | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{22, Interpreter::fsqrtx,       {"fsqrtx",   OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{23, Interpreter::fselx,        {"fselx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU, 1, 0, 0, 0}},
+	{25, Interpreter::fmulx,        {"fmulx",    OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_AC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{26, Interpreter::frsqrtex,     {"frsqrtex", OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_B | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{28, Interpreter::fmsubx,       {"fmsubx",   OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{29, Interpreter::fmaddx,       {"fmaddx",   OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{30, Interpreter::fnmsubx,      {"fnmsubx",  OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+	{31, Interpreter::fnmaddx,      {"fnmaddx",  OPTYPE_DOUBLEFP, FL_INOUT_FLOAT_D | FL_IN_FLOAT_ABC | FL_RC_BIT_F | FL_USE_FPU | FL_SET_FPRF, 1, 0, 0, 0}},
+};
+namespace InterpreterTables
+{
+
+void InitTables()
+{
+	// once initialized, tables are read-only
+	static bool initialized = false;
+	if (initialized)
+		return;
+
+	//clear
+	for (int i = 0; i < 64; i++)
+	{
+		Interpreter::m_opTable[i] = Interpreter::unknown_instruction;
+		m_infoTable[i] = &unknownopinfo;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		Interpreter::m_opTable59[i] = Interpreter::unknown_instruction;
+		m_infoTable59[i] = &unknownopinfo;
+	}
+
+	for (int i = 0; i < 1024; i++)
+	{
+		Interpreter::m_opTable4 [i] = Interpreter::unknown_instruction;
+		Interpreter::m_opTable19[i] = Interpreter::unknown_instruction;
+		Interpreter::m_opTable31[i] = Interpreter::unknown_instruction;
+		Interpreter::m_opTable63[i] = Interpreter::unknown_instruction;
+		m_infoTable4[i] = &unknownopinfo;
+		m_infoTable19[i] = &unknownopinfo;
+		m_infoTable31[i] = &unknownopinfo;
+		m_infoTable63[i] = &unknownopinfo;
+	}
+
+	for (auto& tpl : primarytable)
+	{
+		Interpreter::m_opTable[tpl.opcode] = tpl.Inst;
+		m_infoTable[tpl.opcode] = &tpl.opinfo;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table4_2)
+		{
+			int op = fill+tpl.opcode;
+			Interpreter::m_opTable4[op] = tpl.Inst;
+			m_infoTable4[op] = &tpl.opinfo;
+		}
+	}
+
+	for (int i = 0; i < 16; i++)
+	{
+		int fill = i << 6;
+		for (auto& tpl : table4_3)
+		{
+			int op = fill+tpl.opcode;
+			Interpreter::m_opTable4[op] = tpl.Inst;
+			m_infoTable4[op] = &tpl.opinfo;
+		}
+	}
+
+	for (auto& tpl : table4)
+	{
+		int op = tpl.opcode;
+		Interpreter::m_opTable4[op] = tpl.Inst;
+		m_infoTable4[op] = &tpl.opinfo;
+	}
+
+	for (auto& tpl : table31)
+	{
+		int op = tpl.opcode;
+		Interpreter::m_opTable31[op] = tpl.Inst;
+		m_infoTable31[op] = &tpl.opinfo;
+	}
+
+	for (auto& tpl : table19)
+	{
+		int op = tpl.opcode;
+		Interpreter::m_opTable19[op] = tpl.Inst;
+		m_infoTable19[op] = &tpl.opinfo;
+	}
+
+	for (auto& tpl : table59)
+	{
+		int op = tpl.opcode;
+		Interpreter::m_opTable59[op] = tpl.Inst;
+		m_infoTable59[op] = &tpl.opinfo;
+	}
+
+	for (auto& tpl : table63)
+	{
+		int op = tpl.opcode;
+		Interpreter::m_opTable63[op] = tpl.Inst;
+		m_infoTable63[op] = &tpl.opinfo;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table63_2)
+		{
+			int op = fill + tpl.opcode;
+			Interpreter::m_opTable63[op] = tpl.Inst;
+			m_infoTable63[op] = &tpl.opinfo;
+		}
+	}
+
+	m_numInstructions = 0;
+	for (auto& tpl : primarytable)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table4_2)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table4_3)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table4)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table31)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table19)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table59)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table63)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+	for (auto& tpl : table63_2)
+		m_allInstructions[m_numInstructions++] = &tpl.opinfo;
+
+	if (m_numInstructions >= 512)
+	{
+		PanicAlert("m_allInstructions underdimensioned");
+	}
+
+	initialized = true;
+}
+
+}
+//remove
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h
new file mode 100644
index 0000000000..4368d5b643
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h
@@ -0,0 +1,14 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "../Gekko.h"
+#include "../PPCTables.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+namespace InterpreterTables
+{
+	void InitTables();
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
new file mode 100644
index 0000000000..30266180f5
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
@@ -0,0 +1,902 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <map>
+#include <string>
+
+// for the PROFILER stuff
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/PatchEngine.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/Jit64_Tables.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+#if defined(_DEBUG) || defined(DEBUGFAST)
+#include "Common/GekkoDisassembler.h"
+#endif
+
+using namespace Gen;
+using namespace PowerPC;
+
+// Dolphin's PowerPC->x86_64 JIT dynamic recompiler
+// Written mostly by ector (hrydgard)
+// Features:
+// * Basic block linking
+// * Fast dispatcher
+
+// Unfeatures:
+// * Does not recompile all instructions - sometimes falls back to inserting a CALL to the corresponding Interpreter function.
+
+// Various notes below
+
+// IMPORTANT:
+// Make sure that all generated code and all emulator state sits under the 2GB boundary so that
+// RIP addressing can be used easily. Windows will always allocate static code under the 2GB boundary.
+// Also make sure to use VirtualAlloc and specify EXECUTE permission.
+
+// Open questions
+// * Should there be any statically allocated registers? r3, r4, r5, r8, r0 come to mind.. maybe sp
+// * Does it make sense to finish off the remaining non-jitted instructions? Seems we are hitting diminishing returns.
+
+// Other considerations
+//
+// We support block linking. Reserve space at the exits of every block for a full 5-byte jmp. Save 16-bit offsets
+// from the starts of each block, marking the exits so that they can be nicely patched at any time.
+//
+// Blocks do NOT use call/ret, they only jmp to each other and to the dispatcher when necessary.
+//
+// All blocks that can be precompiled will be precompiled. Code will be memory protected - any write will mark
+// the region as non-compilable, and all links to the page will be torn out and replaced with dispatcher jmps.
+//
+// Alternatively, icbi instruction SHOULD mark where we can't compile
+//
+// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
+// expensive anyway since we need to return to dispatcher, except when they can be predicted).
+
+// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
+//       Somewhat fixed by disabling idle skipping when certain interrupts are enabled
+//       This is no permanent reliable fix
+// TODO: Zeldas go whacko when you hang the gfx thread
+
+// Idea - Accurate exception handling
+// Compute register state at a certain instruction by running the JIT in "dry mode", and stopping at the right place.
+// Not likely to be done :P
+
+
+// Optimization Ideas -
+/*
+  * Assume SP is in main RAM (in Wii mode too?) - partly done
+  * Assume all floating point loads and double precision loads+stores are to/from main ram
+    (single precision stores can be used in write gather pipe, specialized fast check added)
+  * AMD only - use movaps instead of movapd when loading ps from memory?
+  * HLE functions like floorf, sin, memcpy, etc - they can be much faster
+  * ABI optimizations - drop F0-F13 on blr, for example. Watch out for context switching.
+    CR2-CR4 are non-volatile, rest of CR is volatile -> dropped on blr.
+	R5-R12 are volatile -> dropped on blr.
+  * classic inlining across calls.
+  * Track which registers a block clobbers without using, then take advantage of this knowledge
+    when compiling a block that links to that block.
+  * Track more dependencies between instructions, e.g. avoiding PPC_FP code, single/double
+    conversion, movddup on non-paired singles, etc where possible.
+  * Support loads/stores directly from xmm registers in jit_util and the backpatcher; this might
+    help AMD a lot since gpr/xmm transfers are slower there.
+  * Smarter register allocation in general; maybe learn to drop values once we know they won't be
+    used again before being overwritten?
+  * More flexible reordering; there's limits to how far we can go because of exception handling
+    and such, but it's currently limited to integer ops only. This can definitely be made better.
+*/
+
+// The BLR optimization is nice, but it means that JITted code can overflow the
+// native stack by repeatedly running BL.  (The chance of this happening in any
+// retail game is close to 0, but correctness is correctness...) Also, the
+// overflow might not happen directly in the JITted code but in a C++ function
+// called from it, so we can't just adjust RSP in the case of a fault.
+// Instead, we have to have extra stack space preallocated under the fault
+// point which allows the code to continue, after wiping the JIT cache so we
+// can reset things at a safe point.  Once this condition trips, the
+// optimization is permanently disabled, under the assumption this will never
+// happen in practice.
+
+// On Unix, we just mark an appropriate region of the stack as PROT_NONE and
+// handle it the same way as fastmem faults.  It's safe to take a fault with a
+// bad RSP, because on Linux we can use sigaltstack and on OS X we're already
+// on a separate thread.
+
+// On Windows, the OS gets upset if RSP doesn't work, and I don't know any
+// equivalent of sigaltstack.  Windows supports guard pages which, when
+// accessed, immediately turn into regular pages but cause a trap... but
+// putting them in the path of RSP just leads to something (in the kernel?)
+// thinking a regular stack extension is required.  So this protection is not
+// supported on Windows yet...
+
+enum
+{
+	STACK_SIZE = 2 * 1024 * 1024,
+	SAFE_STACK_SIZE = 512 * 1024,
+	GUARD_SIZE = 0x10000, // two guards - bottom (permanent) and middle (see above)
+	GUARD_OFFSET = STACK_SIZE - SAFE_STACK_SIZE - GUARD_SIZE,
+};
+
+void Jit64::AllocStack()
+{
+#ifndef _WIN32
+	m_stack = (u8*)AllocateMemoryPages(STACK_SIZE);
+	ReadProtectMemory(m_stack, GUARD_SIZE);
+	ReadProtectMemory(m_stack + GUARD_OFFSET, GUARD_SIZE);
+#endif
+}
+
+void Jit64::FreeStack()
+{
+#ifndef _WIN32
+	if (m_stack)
+	{
+		FreeMemoryPages(m_stack, STACK_SIZE);
+		m_stack = nullptr;
+	}
+#endif
+}
+
+bool Jit64::HandleFault(uintptr_t access_address, SContext* ctx)
+{
+	uintptr_t stack = (uintptr_t)m_stack, diff = access_address - stack;
+	// In the trap region?
+	if (m_enable_blr_optimization && diff >= GUARD_OFFSET && diff < GUARD_OFFSET + GUARD_SIZE)
+	{
+		WARN_LOG(POWERPC, "BLR cache disabled due to excessive BL in the emulated program.");
+		m_enable_blr_optimization = false;
+		UnWriteProtectMemory(m_stack + GUARD_OFFSET, GUARD_SIZE);
+		// We're going to need to clear the whole cache to get rid of the bad
+		// CALLs, but we can't yet.  Fake the downcount so we're forced to the
+		// dispatcher (no block linking), and clear the cache so we're sent to
+		// Jit.  Yeah, it's kind of gross.
+		GetBlockCache()->InvalidateICache(0, 0xffffffff, true);
+		CoreTiming::ForceExceptionCheck(0);
+		m_clear_cache_asap = true;
+
+		return true;
+	}
+
+	return Jitx86Base::HandleFault(access_address, ctx);
+}
+
+
+
+void Jit64::Init()
+{
+	EnableBlockLink();
+
+	jo.optimizeGatherPipe = true;
+	jo.accurateSinglePrecision = true;
+	UpdateMemoryOptions();
+	js.fastmemLoadStore = nullptr;
+	js.compilerPC = 0;
+
+	gpr.SetEmitter(this);
+	fpr.SetEmitter(this);
+
+	trampolines.Init(jo.memcheck ? TRAMPOLINE_CODE_SIZE_MMU : TRAMPOLINE_CODE_SIZE);
+	AllocCodeSpace(CODE_SIZE);
+
+	// BLR optimization has the same consequences as block linking, as well as
+	// depending on the fault handler to be safe in the event of excessive BL.
+	m_enable_blr_optimization = jo.enableBlocklink && SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem && !SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging;
+	m_clear_cache_asap = false;
+
+	m_stack = nullptr;
+	if (m_enable_blr_optimization)
+		AllocStack();
+
+	blocks.Init();
+	asm_routines.Init(m_stack ? (m_stack + STACK_SIZE) : nullptr);
+
+	// important: do this *after* generating the global asm routines, because we can't use farcode in them.
+	// it'll crash because the farcode functions get cleared on JIT clears.
+	farcode.Init(jo.memcheck ? FARCODE_SIZE_MMU : FARCODE_SIZE);
+
+	code_block.m_stats = &js.st;
+	code_block.m_gpa = &js.gpa;
+	code_block.m_fpa = &js.fpa;
+	EnableOptimization();
+}
+
+void Jit64::ClearCache()
+{
+	blocks.Clear();
+	trampolines.ClearCodeSpace();
+	farcode.ClearCodeSpace();
+	ClearCodeSpace();
+	UpdateMemoryOptions();
+	m_clear_cache_asap = false;
+}
+
+void Jit64::Shutdown()
+{
+	FreeStack();
+	FreeCodeSpace();
+
+	blocks.Shutdown();
+	trampolines.Shutdown();
+	asm_routines.Shutdown();
+	farcode.Shutdown();
+}
+
+// This is only called by FallBackToInterpreter() in this file. It will execute an instruction with the interpreter functions.
+void Jit64::WriteCallInterpreter(UGeckoInstruction inst)
+{
+	gpr.Flush();
+	fpr.Flush();
+	if (js.isLastInstruction)
+	{
+		MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
+		MOV(32, PPCSTATE(npc), Imm32(js.compilerPC + 4));
+	}
+	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunctionC((void*)instr, inst.hex);
+	ABI_PopRegistersAndAdjustStack({}, 0);
+}
+
+void Jit64::FallBackToInterpreter(UGeckoInstruction _inst)
+{
+	WriteCallInterpreter(_inst.hex);
+}
+
+void Jit64::HLEFunction(UGeckoInstruction _inst)
+{
+	gpr.Flush();
+	fpr.Flush();
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex);
+	ABI_PopRegistersAndAdjustStack({}, 0);
+}
+
+void Jit64::DoNothing(UGeckoInstruction _inst)
+{
+	// Yup, just don't do anything.
+}
+
+static const bool ImHereDebug = false;
+static const bool ImHereLog = false;
+static std::map<u32, int> been_here;
+
+static void ImHere()
+{
+	static File::IOFile f;
+	if (ImHereLog)
+	{
+		if (!f)
+			f.Open("log64.txt", "w");
+
+		fprintf(f.GetHandle(), "%08x\n", PC);
+	}
+	if (been_here.find(PC) != been_here.end())
+	{
+		been_here.find(PC)->second++;
+		if ((been_here.find(PC)->second) & 1023)
+			return;
+	}
+	DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR);
+	been_here[PC] = 1;
+}
+
+bool Jit64::Cleanup()
+{
+	bool did_something = false;
+
+	if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0)
+	{
+		ABI_PushRegistersAndAdjustStack({}, 0);
+		ABI_CallFunction((void *)&GPFifo::FastCheckGatherPipe);
+		ABI_PopRegistersAndAdjustStack({}, 0);
+		did_something = true;
+	}
+
+	// SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time.
+	if (MMCR0.Hex || MMCR1.Hex)
+	{
+		ABI_PushRegistersAndAdjustStack({}, 0);
+		ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
+		ABI_PopRegistersAndAdjustStack({}, 0);
+		did_something = true;
+	}
+
+	return did_something;
+}
+
+void Jit64::WriteExit(u32 destination, bool bl, u32 after)
+{
+	if (!m_enable_blr_optimization)
+		bl = false;
+
+	Cleanup();
+
+	if (bl)
+	{
+		MOV(32, R(RSCRATCH2), Imm32(after));
+		PUSH(RSCRATCH2);
+	}
+
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+
+	JustWriteExit(destination, bl, after);
+}
+
+void Jit64::JustWriteExit(u32 destination, bool bl, u32 after)
+{
+	//If nobody has taken care of this yet (this can be removed when all branches are done)
+	JitBlock *b = js.curBlock;
+	JitBlock::LinkData linkData;
+	linkData.exitAddress = destination;
+	linkData.linkStatus = false;
+
+	// Link opportunity!
+	int block;
+	if (jo.enableBlocklink && (block = blocks.GetBlockNumberFromStartAddress(destination)) >= 0)
+	{
+		// It exists! Joy of joy!
+		JitBlock* jb = blocks.GetBlock(block);
+		const u8* addr = jb->checkedEntry;
+		linkData.exitPtrs = GetWritableCodePtr();
+		if (bl)
+			CALL(addr);
+		else
+			JMP(addr, true);
+		linkData.linkStatus = true;
+	}
+	else
+	{
+		MOV(32, PPCSTATE(pc), Imm32(destination));
+		linkData.exitPtrs = GetWritableCodePtr();
+		if (bl)
+			CALL(asm_routines.dispatcher);
+		else
+			JMP(asm_routines.dispatcher, true);
+	}
+
+	b->linkData.push_back(linkData);
+
+	if (bl)
+	{
+		POP(RSCRATCH);
+		JustWriteExit(after, false, 0);
+	}
+}
+
+void Jit64::WriteExitDestInRSCRATCH(bool bl, u32 after)
+{
+	if (!m_enable_blr_optimization)
+		bl = false;
+	MOV(32, PPCSTATE(pc), R(RSCRATCH));
+	Cleanup();
+
+	if (bl)
+	{
+		MOV(32, R(RSCRATCH2), Imm32(after));
+		PUSH(RSCRATCH2);
+	}
+
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	if (bl)
+	{
+		CALL(asm_routines.dispatcher);
+		POP(RSCRATCH);
+		JustWriteExit(after, false, 0);
+	}
+	else
+	{
+		JMP(asm_routines.dispatcher, true);
+	}
+}
+
+void Jit64::WriteBLRExit()
+{
+	if (!m_enable_blr_optimization)
+	{
+		WriteExitDestInRSCRATCH();
+		return;
+	}
+	MOV(32, PPCSTATE(pc), R(RSCRATCH));
+	bool disturbed = Cleanup();
+	if (disturbed)
+		MOV(32, R(RSCRATCH), PPCSTATE(pc));
+	MOV(32, R(RSCRATCH2), Imm32(js.downcountAmount));
+	CMP(64, R(RSCRATCH), MDisp(RSP, 8));
+	J_CC(CC_NE, asm_routines.dispatcherMispredictedBLR);
+	SUB(32, PPCSTATE(downcount), R(RSCRATCH2));
+	RET();
+}
+
+void Jit64::WriteRfiExitDestInRSCRATCH()
+{
+	MOV(32, PPCSTATE(pc), R(RSCRATCH));
+	MOV(32, PPCSTATE(npc), R(RSCRATCH));
+	Cleanup();
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
+	ABI_PopRegistersAndAdjustStack({}, 0);
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void Jit64::WriteExceptionExit()
+{
+	Cleanup();
+	MOV(32, R(RSCRATCH), PPCSTATE(pc));
+	MOV(32, PPCSTATE(npc), R(RSCRATCH));
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
+	ABI_PopRegistersAndAdjustStack({}, 0);
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void Jit64::WriteExternalExceptionExit()
+{
+	Cleanup();
+	MOV(32, R(RSCRATCH), PPCSTATE(pc));
+	MOV(32, PPCSTATE(npc), R(RSCRATCH));
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExternalExceptions));
+	ABI_PopRegistersAndAdjustStack({}, 0);
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void Jit64::Run()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+}
+
+void Jit64::SingleStep()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+}
+
+void Jit64::Trace()
+{
+	std::string regs;
+	std::string fregs;
+
+#ifdef JIT_LOG_GPR
+	for (int i = 0; i < 32; i++)
+	{
+		regs += StringFromFormat("r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
+	}
+#endif
+
+#ifdef JIT_LOG_FPR
+	for (int i = 0; i < 32; i++)
+	{
+		fregs += StringFromFormat("f%02d: %016x ", i, riPS0(i));
+	}
+#endif
+
+	DEBUG_LOG(DYNA_REC, "JIT64 PC: %08x SRR0: %08x SRR1: %08x FPSCR: %08x MSR: %08x LR: %08x %s %s",
+		PC, SRR0, SRR1, PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str());
+}
+
+void Jit64::Jit(u32 em_address)
+{
+	if (GetSpaceLeft() < 0x10000 ||
+	    farcode.GetSpaceLeft() < 0x10000 ||
+	    trampolines.GetSpaceLeft() < 0x10000 ||
+	    blocks.IsFull() ||
+	    SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache ||
+	    m_clear_cache_asap)
+	{
+		ClearCache();
+	}
+
+	int blockSize = code_buffer.GetSize();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+	{
+		// We can link blocks as long as we are not single stepping and there are no breakpoints here
+		EnableBlockLink();
+		EnableOptimization();
+
+		// Comment out the following to disable breakpoints (speed-up)
+		if (!Profiler::g_ProfileBlocks)
+		{
+			if (GetState() == CPU_STEPPING)
+			{
+				blockSize = 1;
+
+				// Do not link this block to other blocks While single stepping
+				jo.enableBlocklink = false;
+				analyzer.ClearOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE);
+				analyzer.ClearOption(PPCAnalyst::PPCAnalyzer::OPTION_BRANCH_MERGE);
+				analyzer.ClearOption(PPCAnalyst::PPCAnalyzer::OPTION_CROR_MERGE);
+				analyzer.ClearOption(PPCAnalyst::PPCAnalyzer::OPTION_CARRY_MERGE);
+			}
+			Trace();
+		}
+	}
+
+	// Analyze the block, collect all instructions it is made of (including inlining,
+	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
+	u32 nextPC = analyzer.Analyze(em_address, &code_block, &code_buffer, blockSize);
+
+	if (code_block.m_memory_exception)
+	{
+		// Address of instruction could not be translated
+		NPC = nextPC;
+		PowerPC::ppcState.Exceptions |= EXCEPTION_ISI;
+		PowerPC::CheckExceptions();
+		WARN_LOG(POWERPC, "ISI exception at 0x%08x", nextPC);
+		return;
+	}
+
+	int block_num = blocks.AllocateBlock(em_address);
+	JitBlock *b = blocks.GetBlock(block_num);
+	blocks.FinalizeBlock(block_num, jo.enableBlocklink, DoJit(em_address, &code_buffer, b, nextPC));
+}
+
+const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC)
+{
+	js.firstFPInstructionFound = false;
+	js.isLastInstruction = false;
+	js.blockStart = em_address;
+	js.fifoBytesThisBlock = 0;
+	js.curBlock = b;
+	jit->js.numLoadStoreInst = 0;
+	jit->js.numFloatingPointInst = 0;
+
+	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
+
+	const u8 *start = AlignCode4(); // TODO: Test if this or AlignCode16 make a difference from GetCodePtr
+	b->checkedEntry = start;
+	b->runCount = 0;
+
+	// Downcount flag check. The last block decremented downcounter, and the flag should still be available.
+	FixupBranch skip = J_CC(CC_NBE);
+	MOV(32, PPCSTATE(pc), Imm32(js.blockStart));
+	JMP(asm_routines.doTiming, true);  // downcount hit zero - go doTiming.
+	SetJumpTarget(skip);
+
+	const u8 *normalEntry = GetCodePtr();
+	b->normalEntry = normalEntry;
+
+	if (ImHereDebug)
+	{
+		ABI_PushRegistersAndAdjustStack({}, 0);
+		ABI_CallFunction((void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful
+		ABI_PopRegistersAndAdjustStack({}, 0);
+	}
+
+	// Conditionally add profiling code.
+	if (Profiler::g_ProfileBlocks)
+	{
+		MOV(64, R(RSCRATCH), Imm64((u64)&b->runCount));
+		ADD(32, MatR(RSCRATCH), Imm8(1));
+		b->ticCounter = 0;
+		b->ticStart = 0;
+		b->ticStop = 0;
+		// get start tic
+		PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart);
+	}
+#if defined(_DEBUG) || defined(DEBUGFAST) || defined(NAN_CHECK)
+	// should help logged stack-traces become more accurate
+	MOV(32, PPCSTATE(pc), Imm32(js.blockStart));
+#endif
+
+	// Start up the register allocators
+	// They use the information in gpa/fpa to preload commonly used registers.
+	gpr.Start();
+	fpr.Start();
+
+	js.downcountAmount = 0;
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		js.downcountAmount += PatchEngine::GetSpeedhackCycles(code_block.m_address);
+
+	js.skipInstructions = 0;
+	js.carryFlagSet = false;
+	js.carryFlagInverted = false;
+	js.assumeNoPairedQuantize = false;
+
+	// If the block only uses one GQR and the GQR is zero at compile time, make a guess that the block
+	// never uses quantized loads/stores. Many paired-heavy games use largely float loads and stores,
+	// which are significantly faster when inlined (especially in MMU mode, where this lets them use
+	// fastmem).
+	// Insert a check that the GQR is still zero at the start of the block in case our guess turns out
+	// wrong.
+	// TODO: support any other constant GQR value, not merely zero/unquantized: we can optimize quantized
+	// loadstores too, it'd just be more code.
+	if (code_block.m_gqr_used.Count() == 1 && js.pairedQuantizeAddresses.find(js.blockStart) == js.pairedQuantizeAddresses.end())
+	{
+		int gqr = *code_block.m_gqr_used.begin();
+		if (!code_block.m_gqr_modified[gqr] && !GQR(gqr))
+		{
+			CMP(32, PPCSTATE(spr[SPR_GQR0 + gqr]), Imm8(0));
+			FixupBranch failure = J_CC(CC_NZ, true);
+			SwitchToFarCode();
+				SetJumpTarget(failure);
+				MOV(32, PPCSTATE(pc), Imm32(js.blockStart));
+				ABI_PushRegistersAndAdjustStack({}, 0);
+				ABI_CallFunctionC((void *)&JitInterface::CompileExceptionCheck,
+				                  (u32)JitInterface::ExceptionType::EXCEPTIONS_PAIRED_QUANTIZE);
+				ABI_PopRegistersAndAdjustStack({}, 0);
+				JMP(asm_routines.dispatcher, true);
+			SwitchToNearCode();
+			js.assumeNoPairedQuantize = true;
+		}
+	}
+
+	// Translate instructions
+	for (u32 i = 0; i < code_block.m_num_instructions; i++)
+	{
+		js.compilerPC = ops[i].address;
+		js.op = &ops[i];
+		js.instructionNumber = i;
+		js.instructionsLeft = (code_block.m_num_instructions - 1) - i;
+		const GekkoOPInfo *opinfo = ops[i].opinfo;
+		js.downcountAmount += opinfo->numCycles;
+		js.fastmemLoadStore = nullptr;
+		js.fixupExceptionHandler = false;
+		js.revertGprLoad = -1;
+		js.revertFprLoad = -1;
+
+		if (i == (code_block.m_num_instructions - 1))
+		{
+			if (Profiler::g_ProfileBlocks)
+			{
+				// WARNING - cmp->branch merging will screw this up.
+				PROFILER_VPUSH;
+				// get end tic
+				PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop);
+				// tic counter += (end tic - start tic)
+				PROFILER_UPDATE_TIME(b);
+				PROFILER_VPOP;
+			}
+			js.isLastInstruction = true;
+		}
+
+		// Gather pipe writes using a non-immediate address are discovered by profiling.
+		bool gatherPipeIntCheck = jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end();
+
+		// Gather pipe writes using an immediate address are explicitly tracked.
+		if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32)
+		{
+			js.fifoBytesThisBlock -= 32;
+			BitSet32 registersInUse = CallerSavedRegistersInUse();
+			ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+			ABI_CallFunction((void *)&GPFifo::FastCheckGatherPipe);
+			ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+			gatherPipeIntCheck = true;
+		}
+
+		// Gather pipe writes can generate an exception; add an exception check.
+		// TODO: This doesn't really match hardware; the CP interrupt is
+		// asynchronous.
+		if (gatherPipeIntCheck)
+		{
+			TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
+			FixupBranch extException = J_CC(CC_NZ, true);
+
+			SwitchToFarCode();
+				SetJumpTarget(extException);
+				TEST(32, PPCSTATE(msr), Imm32(0x0008000));
+				FixupBranch noExtIntEnable = J_CC(CC_Z, true);
+				TEST(32, M(&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP |
+				                                                         ProcessorInterface::INT_CAUSE_PE_TOKEN |
+				                                                         ProcessorInterface::INT_CAUSE_PE_FINISH));
+				FixupBranch noCPInt = J_CC(CC_Z, true);
+
+				gpr.Flush(FLUSH_MAINTAIN_STATE);
+				fpr.Flush(FLUSH_MAINTAIN_STATE);
+
+				MOV(32, PPCSTATE(pc), Imm32(ops[i].address));
+				WriteExternalExceptionExit();
+			SwitchToNearCode();
+
+			SetJumpTarget(noCPInt);
+			SetJumpTarget(noExtIntEnable);
+		}
+
+		u32 function = HLE::GetFunctionIndex(ops[i].address);
+		if (function != 0)
+		{
+			int type = HLE::GetFunctionTypeByIndex(function);
+			if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
+			{
+				int flags = HLE::GetFunctionFlagsByIndex(function);
+				if (HLE::IsEnabled(flags))
+				{
+					HLEFunction(function);
+					if (type == HLE::HLE_HOOK_REPLACE)
+					{
+						MOV(32, R(RSCRATCH), PPCSTATE(npc));
+						js.downcountAmount += js.st.numCycles;
+						WriteExitDestInRSCRATCH();
+						break;
+					}
+				}
+			}
+		}
+
+		if (!ops[i].skip)
+		{
+			if ((opinfo->flags & FL_USE_FPU) && !js.firstFPInstructionFound)
+			{
+				//This instruction uses FPU - needs to add FP exception bailout
+				TEST(32, PPCSTATE(msr), Imm32(1 << 13)); // Test FP enabled bit
+				FixupBranch b1 = J_CC(CC_Z, true);
+
+				SwitchToFarCode();
+					SetJumpTarget(b1);
+					gpr.Flush(FLUSH_MAINTAIN_STATE);
+					fpr.Flush(FLUSH_MAINTAIN_STATE);
+
+					// If a FPU exception occurs, the exception handler will read
+					// from PC.  Update PC with the latest value in case that happens.
+					MOV(32, PPCSTATE(pc), Imm32(ops[i].address));
+					OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
+					WriteExceptionExit();
+				SwitchToNearCode();
+
+				js.firstFPInstructionFound = true;
+			}
+
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
+			{
+				// Turn off block linking if there are breakpoints so that the Step Over command does not link this block.
+				jo.enableBlocklink = false;
+
+				gpr.Flush();
+				fpr.Flush();
+
+				MOV(32, PPCSTATE(pc), Imm32(ops[i].address));
+				ABI_PushRegistersAndAdjustStack({}, 0);
+				ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
+				ABI_PopRegistersAndAdjustStack({}, 0);
+				TEST(32, M(PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
+				FixupBranch noBreakpoint = J_CC(CC_Z);
+
+				WriteExit(ops[i].address);
+				SetJumpTarget(noBreakpoint);
+			}
+
+			// If we have an input register that is going to be used again, load it pre-emptively,
+			// even if the instruction doesn't strictly need it in a register, to avoid redundant
+			// loads later. Of course, don't do this if we're already out of registers.
+			// As a bit of a heuristic, make sure we have at least one register left over for the
+			// output, which needs to be bound in the actual instruction compilation.
+			// TODO: make this smarter in the case that we're actually register-starved, i.e.
+			// prioritize the more important registers.
+			for (int reg : ops[i].regsIn)
+			{
+				if (gpr.NumFreeRegisters() < 2)
+					break;
+				if (ops[i].gprInReg[reg] && !gpr.R(reg).IsImm())
+					gpr.BindToRegister(reg, true, false);
+			}
+			for (int reg : ops[i].fregsIn)
+			{
+				if (fpr.NumFreeRegisters() < 2)
+					break;
+				if (ops[i].fprInXmm[reg])
+					fpr.BindToRegister(reg, true, false);
+			}
+
+			Jit64Tables::CompileInstruction(ops[i]);
+
+			if (jo.memcheck && (opinfo->flags & FL_LOADSTORE))
+			{
+				// If we have a fastmem loadstore, we can omit the exception check and let fastmem handle it.
+				FixupBranch memException;
+				_assert_msg_(DYNA_REC, !(js.fastmemLoadStore && js.fixupExceptionHandler),
+					"Fastmem loadstores shouldn't have exception handler fixups (PC=%x)!", ops[i].address);
+				if (!js.fastmemLoadStore && !js.fixupExceptionHandler)
+				{
+					TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_DSI));
+					memException = J_CC(CC_NZ, true);
+				}
+
+				SwitchToFarCode();
+					if (!js.fastmemLoadStore)
+					{
+						exceptionHandlerAtLoc[js.fastmemLoadStore] = nullptr;
+						SetJumpTarget(js.fixupExceptionHandler ? js.exceptionHandler : memException);
+					}
+					else
+					{
+						exceptionHandlerAtLoc[js.fastmemLoadStore] = GetWritableCodePtr();
+					}
+
+					BitSet32 gprToFlush = BitSet32::AllTrue(32);
+					BitSet32 fprToFlush = BitSet32::AllTrue(32);
+					if (js.revertGprLoad >= 0)
+						gprToFlush[js.revertGprLoad] = false;
+					if (js.revertFprLoad >= 0)
+						fprToFlush[js.revertFprLoad] = false;
+					gpr.Flush(FLUSH_MAINTAIN_STATE, gprToFlush);
+					fpr.Flush(FLUSH_MAINTAIN_STATE, fprToFlush);
+
+					// If a memory exception occurs, the exception handler will read
+					// from PC.  Update PC with the latest value in case that happens.
+					MOV(32, PPCSTATE(pc), Imm32(ops[i].address));
+					WriteExceptionExit();
+				SwitchToNearCode();
+			}
+
+			// If we have a register that will never be used again, flush it.
+			for (int j : ~ops[i].gprInUse)
+				gpr.StoreFromRegister(j);
+			for (int j : ~ops[i].fprInUse)
+				fpr.StoreFromRegister(j);
+
+			if (opinfo->flags & FL_LOADSTORE)
+				++jit->js.numLoadStoreInst;
+
+			if (opinfo->flags & FL_USE_FPU)
+				++jit->js.numFloatingPointInst;
+		}
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+		if (gpr.SanityCheck() || fpr.SanityCheck())
+		{
+			std::string ppc_inst = GekkoDisassembler::Disassemble(ops[i].inst.hex, em_address);
+			//NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppc_inst.c_str());
+		}
+#endif
+		i += js.skipInstructions;
+		js.skipInstructions = 0;
+	}
+
+	if (code_block.m_broken)
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(nextPC);
+	}
+
+	b->codeSize = (u32)(GetCodePtr() - start);
+	b->originalSize = code_block.m_num_instructions;
+
+#ifdef JIT_LOG_X86
+	LogGeneratedX86(code_block.m_num_instructions, code_buf, start, b);
+#endif
+
+	return normalEntry;
+}
+
+BitSet32 Jit64::CallerSavedRegistersInUse()
+{
+	BitSet32 result;
+	for (int i = 0; i < NUMXREGS; i++)
+	{
+		if (!gpr.IsFreeX(i))
+			result[i] = true;
+		if (!fpr.IsFreeX(i))
+			result[16 + i] = true;
+	}
+	return result & ABI_ALL_CALLER_SAVED;
+}
+
+void Jit64::EnableBlockLink()
+{
+	jo.enableBlocklink = true;
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockLinking)
+		jo.enableBlocklink = false;
+}
+
+void Jit64::EnableOptimization()
+{
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE);
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_BRANCH_MERGE);
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_CROR_MERGE);
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_CARRY_MERGE);
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h
new file mode 100644
index 0000000000..a344242e10
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.h
@@ -0,0 +1,252 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// ========================
+// See comments in Jit.cpp.
+// ========================
+
+// Mystery: Capcom vs SNK 800aa278
+
+// CR flags approach:
+//   * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3".
+//   * All flag altering instructions flush this
+//   * A flush simply does a conditional write to the appropriate CRx.
+//   * If flag available, branch code can become absolutely trivial.
+
+// Settings
+// ----------
+#pragma once
+
+#include "Common/x64ABI.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+class Jit64 : public Jitx86Base
+{
+private:
+	void AllocStack();
+	void FreeStack();
+
+	GPRRegCache gpr;
+	FPURegCache fpr;
+
+	// The default code buffer. We keep it around to not have to alloc/dealloc a
+	// large chunk of memory for each recompiled block.
+	PPCAnalyst::CodeBuffer code_buffer;
+	Jit64AsmRoutineManager asm_routines;
+
+	bool m_enable_blr_optimization;
+	bool m_clear_cache_asap;
+	u8* m_stack;
+
+public:
+	Jit64() : code_buffer(32000) {}
+	~Jit64() {}
+
+	void Init() override;
+
+	void EnableOptimization();
+
+	void EnableBlockLink();
+
+	void Shutdown() override;
+
+	bool HandleFault(uintptr_t access_address, SContext* ctx) override;
+
+	// Jit!
+
+	void Jit(u32 em_address) override;
+	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC);
+
+	BitSet32 CallerSavedRegistersInUse();
+
+	JitBlockCache *GetBlockCache() override { return &blocks; }
+
+	void Trace();
+
+	void ClearCache() override;
+
+	const CommonAsmRoutines *GetAsmRoutines() override
+	{
+		return &asm_routines;
+	}
+
+	const char *GetName() override
+	{
+		return "JIT64";
+	}
+
+	// Run!
+	void Run() override;
+	void SingleStep() override;
+
+	// Utilities for use by opcodes
+
+	void WriteExit(u32 destination, bool bl = false, u32 after = 0);
+	void JustWriteExit(u32 destination, bool bl, u32 after);
+	void WriteExitDestInRSCRATCH(bool bl = false, u32 after = 0);
+	void WriteBLRExit();
+	void WriteExceptionExit();
+	void WriteExternalExceptionExit();
+	void WriteRfiExitDestInRSCRATCH();
+	void WriteCallInterpreter(UGeckoInstruction _inst);
+	bool Cleanup();
+
+	void GenerateConstantOverflow(bool overflow);
+	void GenerateConstantOverflow(s64 val);
+	void GenerateOverflow();
+	void FinalizeCarryOverflow(bool oe, bool inv = false);
+	void FinalizeCarry(Gen::CCFlags cond);
+	void FinalizeCarry(bool ca);
+	void ComputeRC(const Gen::OpArg & arg, bool needs_test = true, bool needs_sext = true);
+
+	// Use to extract bytes from a register using the regcache. offset is in bytes.
+	Gen::OpArg ExtractFromReg(int reg, int offset);
+	void AndWithMask(Gen::X64Reg reg, u32 mask);
+	bool CheckMergedBranch(int crf);
+	void DoMergedBranch();
+	void DoMergedBranchCondition();
+	void DoMergedBranchImmediate(s64 val);
+
+	// Reads a given bit of a given CR register part.
+	void GetCRFieldBit(int field, int bit, Gen::X64Reg out, bool negate = false);
+	// Clobbers RDX.
+	void SetCRFieldBit(int field, int bit, Gen::X64Reg in);
+	void ClearCRFieldBit(int field, int bit);
+	void SetCRFieldBit(int field, int bit);
+
+	// Generates a branch that will check if a given bit of a CR register part
+	// is set or not.
+	Gen::FixupBranch JumpIfCRFieldBit(int field, int bit, bool jump_if_set = true);
+	void SetFPRFIfNeeded(Gen::X64Reg xmm);
+
+	void HandleNaNs(UGeckoInstruction inst, Gen::X64Reg xmm_out, Gen::X64Reg xmm_in);
+
+	void MultiplyImmediate(u32 imm, int a, int d, bool overflow);
+
+	typedef u32 (*Operation)(u32 a, u32 b);
+	void regimmop(int d, int a, bool binary, u32 value, Operation doop,
+	              void (Gen::XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&),
+	              bool Rc = false, bool carry = false);
+	Gen::X64Reg fp_tri_op(int d, int a, int b, bool reversible, bool single,
+	                      void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, const Gen::OpArg&),
+	                      void (Gen::XEmitter::*sseOp)(Gen::X64Reg, const Gen::OpArg&),
+	                      bool packed, bool preserve_inputs, bool roundRHS = false);
+	void FloatCompare(UGeckoInstruction inst, bool upper = false);
+
+	// OPCODES
+	void FallBackToInterpreter(UGeckoInstruction _inst);
+	void DoNothing(UGeckoInstruction _inst);
+	void HLEFunction(UGeckoInstruction _inst);
+
+	void DynaRunTable4(UGeckoInstruction _inst);
+	void DynaRunTable19(UGeckoInstruction _inst);
+	void DynaRunTable31(UGeckoInstruction _inst);
+	void DynaRunTable59(UGeckoInstruction _inst);
+	void DynaRunTable63(UGeckoInstruction _inst);
+
+	void addx(UGeckoInstruction inst);
+	void arithcx(UGeckoInstruction inst);
+	void mulli(UGeckoInstruction inst);
+	void mulhwXx(UGeckoInstruction inst);
+	void mullwx(UGeckoInstruction inst);
+	void divwux(UGeckoInstruction inst);
+	void divwx(UGeckoInstruction inst);
+	void srawix(UGeckoInstruction inst);
+	void srawx(UGeckoInstruction inst);
+	void arithXex(UGeckoInstruction inst);
+
+	void extsXx(UGeckoInstruction inst);
+
+	void sc(UGeckoInstruction _inst);
+	void rfi(UGeckoInstruction _inst);
+
+	void bx(UGeckoInstruction inst);
+	void bclrx(UGeckoInstruction _inst);
+	void bcctrx(UGeckoInstruction _inst);
+	void bcx(UGeckoInstruction inst);
+
+	void mtspr(UGeckoInstruction inst);
+	void mfspr(UGeckoInstruction inst);
+	void mtmsr(UGeckoInstruction inst);
+	void mfmsr(UGeckoInstruction inst);
+	void mftb(UGeckoInstruction inst);
+	void mtcrf(UGeckoInstruction inst);
+	void mfcr(UGeckoInstruction inst);
+	void mcrf(UGeckoInstruction inst);
+	void mcrxr(UGeckoInstruction inst);
+
+	void boolX(UGeckoInstruction inst);
+	void crXXX(UGeckoInstruction inst);
+
+	void reg_imm(UGeckoInstruction inst);
+
+	void ps_mr(UGeckoInstruction inst);
+	void ps_mergeXX(UGeckoInstruction inst);
+	void ps_res(UGeckoInstruction inst);
+	void ps_rsqrte(UGeckoInstruction inst);
+	void ps_sum(UGeckoInstruction inst);
+	void ps_muls(UGeckoInstruction inst);
+	void ps_cmpXX(UGeckoInstruction inst);
+
+	void fp_arith(UGeckoInstruction inst);
+
+	void fcmpx(UGeckoInstruction inst);
+	void fctiwx(UGeckoInstruction inst);
+	void fmrx(UGeckoInstruction inst);
+	void frspx(UGeckoInstruction inst);
+	void frsqrtex(UGeckoInstruction inst);
+	void fresx(UGeckoInstruction inst);
+
+	void cmpXX(UGeckoInstruction inst);
+
+	void cntlzwx(UGeckoInstruction inst);
+
+	void lfXXX(UGeckoInstruction inst);
+	void stfXXX(UGeckoInstruction inst);
+	void stfiwx(UGeckoInstruction inst);
+	void psq_lXX(UGeckoInstruction inst);
+	void psq_stXX(UGeckoInstruction inst);
+
+	void fmaddXX(UGeckoInstruction inst);
+	void fsign(UGeckoInstruction inst);
+	void fselx(UGeckoInstruction inst);
+	void stX(UGeckoInstruction inst); //stw sth stb
+	void rlwinmx(UGeckoInstruction inst);
+	void rlwimix(UGeckoInstruction inst);
+	void rlwnmx(UGeckoInstruction inst);
+	void negx(UGeckoInstruction inst);
+	void slwx(UGeckoInstruction inst);
+	void srwx(UGeckoInstruction inst);
+	void dcbt(UGeckoInstruction inst);
+	void dcbz(UGeckoInstruction inst);
+
+	void subfic(UGeckoInstruction inst);
+	void subfx(UGeckoInstruction inst);
+
+	void twX(UGeckoInstruction inst);
+
+	void lXXx(UGeckoInstruction inst);
+
+	void stXx(UGeckoInstruction inst);
+
+	void lmw(UGeckoInstruction inst);
+	void stmw(UGeckoInstruction inst);
+
+	void icbi(UGeckoInstruction inst);
+};
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
new file mode 100644
index 0000000000..051a85f335
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
@@ -0,0 +1,478 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/Jit64_Tables.h"
+
+// Should be moved in to the Jit class
+typedef void (Jit64::*_Instruction) (UGeckoInstruction instCode);
+
+static _Instruction dynaOpTable[64];
+static _Instruction dynaOpTable4[1024];
+static _Instruction dynaOpTable19[1024];
+static _Instruction dynaOpTable31[1024];
+static _Instruction dynaOpTable59[32];
+static _Instruction dynaOpTable63[1024];
+void Jit64::DynaRunTable4(UGeckoInstruction _inst)  {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);}
+void Jit64::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);}
+void Jit64::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);}
+void Jit64::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);}
+void Jit64::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);}
+
+struct GekkoOPTemplate
+{
+	int opcode;
+	_Instruction Inst;
+	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
+};
+
+static GekkoOPTemplate primarytable[] =
+{
+	{4,  &Jit64::DynaRunTable4},         // RunTable4
+	{19, &Jit64::DynaRunTable19},        // RunTable19
+	{31, &Jit64::DynaRunTable31},        // RunTable31
+	{59, &Jit64::DynaRunTable59},        // RunTable59
+	{63, &Jit64::DynaRunTable63},        // RunTable63
+
+	{16, &Jit64::bcx},                   // bcx
+	{18, &Jit64::bx},                    // bx
+
+	{3,  &Jit64::twX},                   // twi
+	{17, &Jit64::sc},                    // sc
+
+	{7,  &Jit64::mulli},                 // mulli
+	{8,  &Jit64::subfic},                // subfic
+	{10, &Jit64::cmpXX},                 // cmpli
+	{11, &Jit64::cmpXX},                 // cmpi
+	{12, &Jit64::reg_imm},               // addic
+	{13, &Jit64::reg_imm},               // addic_rc
+	{14, &Jit64::reg_imm},               // addi
+	{15, &Jit64::reg_imm},               // addis
+
+	{20, &Jit64::rlwimix},               // rlwimix
+	{21, &Jit64::rlwinmx},               // rlwinmx
+	{23, &Jit64::rlwnmx},                // rlwnmx
+
+	{24, &Jit64::reg_imm},               // ori
+	{25, &Jit64::reg_imm},               // oris
+	{26, &Jit64::reg_imm},               // xori
+	{27, &Jit64::reg_imm},               // xoris
+	{28, &Jit64::reg_imm},               // andi_rc
+	{29, &Jit64::reg_imm},               // andis_rc
+
+	{32, &Jit64::lXXx},                  // lwz
+	{33, &Jit64::lXXx},                  // lwzu
+	{34, &Jit64::lXXx},                  // lbz
+	{35, &Jit64::lXXx},                  // lbzu
+	{40, &Jit64::lXXx},                  // lhz
+	{41, &Jit64::lXXx},                  // lhzu
+	{42, &Jit64::lXXx},                  // lha
+	{43, &Jit64::lXXx},                  // lhau
+
+	{44, &Jit64::stX},                   // sth
+	{45, &Jit64::stX},                   // sthu
+	{36, &Jit64::stX},                   // stw
+	{37, &Jit64::stX},                   // stwu
+	{38, &Jit64::stX},                   // stb
+	{39, &Jit64::stX},                   // stbu
+
+	{46, &Jit64::lmw},                   // lmw
+	{47, &Jit64::stmw},                  // stmw
+
+	{48, &Jit64::lfXXX},                 // lfs
+	{49, &Jit64::lfXXX},                 // lfsu
+	{50, &Jit64::lfXXX},                 // lfd
+	{51, &Jit64::lfXXX},                 // lfdu
+
+	{52, &Jit64::stfXXX},                // stfs
+	{53, &Jit64::stfXXX},                // stfsu
+	{54, &Jit64::stfXXX},                // stfd
+	{55, &Jit64::stfXXX},                // stfdu
+
+	{56, &Jit64::psq_lXX},               // psq_l
+	{57, &Jit64::psq_lXX},               // psq_lu
+	{60, &Jit64::psq_stXX},              // psq_st
+	{61, &Jit64::psq_stXX},              // psq_stu
+
+	//missing: 0, 1, 2, 5, 6, 9, 22, 30, 62, 58
+};
+
+static GekkoOPTemplate table4[] =
+{    //SUBOP10
+	{0,    &Jit64::ps_cmpXX},              // ps_cmpu0
+	{32,   &Jit64::ps_cmpXX},              // ps_cmpo0
+	{40,   &Jit64::fsign},               // ps_neg
+	{136,  &Jit64::fsign},               // ps_nabs
+	{264,  &Jit64::fsign},               // ps_abs
+	{64,   &Jit64::ps_cmpXX},              // ps_cmpu1
+	{72,   &Jit64::ps_mr},                 // ps_mr
+	{96,   &Jit64::ps_cmpXX},              // ps_cmpo1
+	{528,  &Jit64::ps_mergeXX},            // ps_merge00
+	{560,  &Jit64::ps_mergeXX},            // ps_merge01
+	{592,  &Jit64::ps_mergeXX},            // ps_merge10
+	{624,  &Jit64::ps_mergeXX},            // ps_merge11
+
+	{1014, &Jit64::FallBackToInterpreter}, // dcbz_l
+};
+
+static GekkoOPTemplate table4_2[] =
+{
+	{10, &Jit64::ps_sum},    // ps_sum0
+	{11, &Jit64::ps_sum},    // ps_sum1
+	{12, &Jit64::ps_muls},   // ps_muls0
+	{13, &Jit64::ps_muls},   // ps_muls1
+	{14, &Jit64::fmaddXX},   // ps_madds0
+	{15, &Jit64::fmaddXX},   // ps_madds1
+	{18, &Jit64::fp_arith},  // ps_div
+	{20, &Jit64::fp_arith},  // ps_sub
+	{21, &Jit64::fp_arith},  // ps_add
+	{23, &Jit64::fselx},     // ps_sel
+	{24, &Jit64::ps_res},    // ps_res
+	{25, &Jit64::fp_arith},  // ps_mul
+	{26, &Jit64::ps_rsqrte}, // ps_rsqrte
+	{28, &Jit64::fmaddXX}, // ps_msub
+	{29, &Jit64::fmaddXX}, // ps_madd
+	{30, &Jit64::fmaddXX}, // ps_nmsub
+	{31, &Jit64::fmaddXX}, // ps_nmadd
+};
+
+
+static GekkoOPTemplate table4_3[] =
+{
+	{6,  &Jit64::psq_lXX},  // psq_lx
+	{7,  &Jit64::psq_stXX}, // psq_stx
+	{38, &Jit64::psq_lXX},  // psq_lux
+	{39, &Jit64::psq_stXX}, // psq_stux
+};
+
+static GekkoOPTemplate table19[] =
+{
+	{528, &Jit64::bcctrx},                // bcctrx
+	{16,  &Jit64::bclrx},                 // bclrx
+	{257, &Jit64::crXXX},                 // crand
+	{129, &Jit64::crXXX},                 // crandc
+	{289, &Jit64::crXXX},                 // creqv
+	{225, &Jit64::crXXX},                 // crnand
+	{33,  &Jit64::crXXX},                 // crnor
+	{449, &Jit64::crXXX},                 // cror
+	{417, &Jit64::crXXX},                 // crorc
+	{193, &Jit64::crXXX},                 // crxor
+
+	{150, &Jit64::DoNothing},             // isync
+	{0,   &Jit64::mcrf},                  // mcrf
+
+	{50,  &Jit64::rfi},                   // rfi
+	{18,  &Jit64::FallBackToInterpreter}, // rfid
+};
+
+
+static GekkoOPTemplate table31[] =
+{
+	{266,  &Jit64::addx},                  // addx
+	{778,  &Jit64::addx},                  // addox
+	{10,   &Jit64::arithcx},               // addcx
+	{522,  &Jit64::arithcx},               // addcox
+	{138,  &Jit64::arithXex},              // addex
+	{650,  &Jit64::arithXex},              // addeox
+	{234,  &Jit64::arithXex},              // addmex
+	{746,  &Jit64::arithXex},              // addmeox
+	{202,  &Jit64::arithXex},              // addzex
+	{714,  &Jit64::arithXex},              // addzeox
+	{491,  &Jit64::divwx},                 // divwx
+	{1003, &Jit64::divwx},                 // divwox
+	{459,  &Jit64::divwux},                // divwux
+	{971,  &Jit64::divwux},                // divwuox
+	{75,   &Jit64::mulhwXx},               // mulhwx
+	{11,   &Jit64::mulhwXx},               // mulhwux
+	{235,  &Jit64::mullwx},                // mullwx
+	{747,  &Jit64::mullwx},                // mullwox
+	{104,  &Jit64::negx},                  // negx
+	{616,  &Jit64::negx},                  // negox
+	{40,   &Jit64::subfx},                 // subfx
+	{552,  &Jit64::subfx},                 // subfox
+	{8,    &Jit64::arithcx},               // subfcx
+	{520,  &Jit64::arithcx},               // subfcox
+	{136,  &Jit64::arithXex},              // subfex
+	{648,  &Jit64::arithXex},              // subfeox
+	{232,  &Jit64::arithXex},              // subfmex
+	{744,  &Jit64::arithXex},              // subfmeox
+	{200,  &Jit64::arithXex},              // subfzex
+	{712,  &Jit64::arithXex},              // subfzeox
+
+	{28,  &Jit64::boolX},                  // andx
+	{60,  &Jit64::boolX},                  // andcx
+	{444, &Jit64::boolX},                  // orx
+	{124, &Jit64::boolX},                  // norx
+	{316, &Jit64::boolX},                  // xorx
+	{412, &Jit64::boolX},                  // orcx
+	{476, &Jit64::boolX},                  // nandx
+	{284, &Jit64::boolX},                  // eqvx
+	{0,   &Jit64::cmpXX},                  // cmp
+	{32,  &Jit64::cmpXX},                  // cmpl
+	{26,  &Jit64::cntlzwx},                // cntlzwx
+	{922, &Jit64::extsXx},                 // extshx
+	{954, &Jit64::extsXx},                 // extsbx
+	{536, &Jit64::srwx},                   // srwx
+	{792, &Jit64::srawx},                  // srawx
+	{824, &Jit64::srawix},                 // srawix
+	{24,  &Jit64::slwx},                   // slwx
+
+	{54,   &Jit64::FallBackToInterpreter}, // dcbst
+	{86,   &Jit64::FallBackToInterpreter}, // dcbf
+	{246,  &Jit64::dcbt },                 // dcbtst
+	{278,  &Jit64::dcbt },                 // dcbt
+	{470,  &Jit64::FallBackToInterpreter}, // dcbi
+	{758,  &Jit64::DoNothing},             // dcba
+	{1014, &Jit64::dcbz},                  // dcbz
+
+	//load word
+	{23,  &Jit64::lXXx},                   // lwzx
+	{55,  &Jit64::lXXx},                   // lwzux
+
+	//load halfword
+	{279, &Jit64::lXXx},                   // lhzx
+	{311, &Jit64::lXXx},                   // lhzux
+
+	//load halfword signextend
+	{343, &Jit64::lXXx},                   // lhax
+	{375, &Jit64::lXXx},                   // lhaux
+
+	//load byte
+	{87,  &Jit64::lXXx},                   // lbzx
+	{119, &Jit64::lXXx},                   // lbzux
+
+	//load byte reverse
+	{534, &Jit64::lXXx},                   // lwbrx
+	{790, &Jit64::lXXx},                   // lhbrx
+
+	// Conditional load/store (Wii SMP)
+	{150, &Jit64::FallBackToInterpreter},  // stwcxd
+	{20,  &Jit64::FallBackToInterpreter},  // lwarx
+
+	//load string (interpret these)
+	{533, &Jit64::FallBackToInterpreter},  // lswx
+	{597, &Jit64::FallBackToInterpreter},  // lswi
+
+	//store word
+	{151, &Jit64::stXx},                   // stwx
+	{183, &Jit64::stXx},                   // stwux
+
+	//store halfword
+	{407, &Jit64::stXx},                   // sthx
+	{439, &Jit64::stXx},                   // sthux
+
+	//store byte
+	{215, &Jit64::stXx},                   // stbx
+	{247, &Jit64::stXx},                   // stbux
+
+	//store bytereverse
+	{662, &Jit64::stXx},                   // stwbrx
+	{918, &Jit64::stXx},                   // sthbrx
+
+	{661, &Jit64::FallBackToInterpreter},  // stswx
+	{725, &Jit64::FallBackToInterpreter},  // stswi
+
+	// fp load/store
+	{535, &Jit64::lfXXX},                  // lfsx
+	{567, &Jit64::lfXXX},                  // lfsux
+	{599, &Jit64::lfXXX},                  // lfdx
+	{631, &Jit64::lfXXX},                  // lfdux
+
+	{663, &Jit64::stfXXX},                 // stfsx
+	{695, &Jit64::stfXXX},                 // stfsux
+	{727, &Jit64::stfXXX},                 // stfdx
+	{759, &Jit64::stfXXX},                 // stfdux
+	{983, &Jit64::stfiwx},                 // stfiwx
+
+	{19,  &Jit64::mfcr},                   // mfcr
+	{83,  &Jit64::mfmsr},                  // mfmsr
+	{144, &Jit64::mtcrf},                  // mtcrf
+	{146, &Jit64::mtmsr},                  // mtmsr
+	{210, &Jit64::FallBackToInterpreter},  // mtsr
+	{242, &Jit64::FallBackToInterpreter},  // mtsrin
+	{339, &Jit64::mfspr},                  // mfspr
+	{467, &Jit64::mtspr},                  // mtspr
+	{371, &Jit64::mftb},                   // mftb
+	{512, &Jit64::mcrxr},                  // mcrxr
+	{595, &Jit64::FallBackToInterpreter},  // mfsr
+	{659, &Jit64::FallBackToInterpreter},  // mfsrin
+
+	{4,   &Jit64::twX},                    // tw
+	{598, &Jit64::DoNothing},              // sync
+	{982, &Jit64::icbi},                   // icbi
+
+	// Unused instructions on GC
+	{310, &Jit64::FallBackToInterpreter},  // eciwx
+	{438, &Jit64::FallBackToInterpreter},  // ecowx
+	{854, &Jit64::DoNothing},              // eieio
+	{306, &Jit64::FallBackToInterpreter},  // tlbie
+	{370, &Jit64::FallBackToInterpreter},  // tlbia
+	{566, &Jit64::DoNothing},              // tlbsync
+};
+
+static GekkoOPTemplate table59[] =
+{
+	{18, &Jit64::fp_arith},              // fdivsx
+	{20, &Jit64::fp_arith},              // fsubsx
+	{21, &Jit64::fp_arith},              // faddsx
+//	{22, &Jit64::FallBackToInterpreter},   // fsqrtsx
+	{24, &Jit64::fresx},                 // fresx
+	{25, &Jit64::fp_arith},              // fmulsx
+	{28, &Jit64::fmaddXX},               // fmsubsx
+	{29, &Jit64::fmaddXX},               // fmaddsx
+	{30, &Jit64::fmaddXX},               // fnmsubsx
+	{31, &Jit64::fmaddXX},               // fnmaddsx
+};
+
+static GekkoOPTemplate table63[] =
+{
+	{264, &Jit64::fsign},                 // fabsx
+	{32,  &Jit64::fcmpx},                 // fcmpo
+	{0,   &Jit64::fcmpx},                 // fcmpu
+	{14,  &Jit64::fctiwx},                // fctiwx
+	{15,  &Jit64::fctiwx},                // fctiwzx
+	{72,  &Jit64::fmrx},                  // fmrx
+	{136, &Jit64::fsign},                 // fnabsx
+	{40,  &Jit64::fsign},                 // fnegx
+	{12,  &Jit64::frspx},                 // frspx
+
+	{64,  &Jit64::FallBackToInterpreter}, // mcrfs
+	{583, &Jit64::FallBackToInterpreter}, // mffsx
+	{70,  &Jit64::FallBackToInterpreter}, // mtfsb0x
+	{38,  &Jit64::FallBackToInterpreter}, // mtfsb1x
+	{134, &Jit64::FallBackToInterpreter}, // mtfsfix
+	{711, &Jit64::FallBackToInterpreter}, // mtfsfx
+};
+
+static GekkoOPTemplate table63_2[] =
+{
+	{18, &Jit64::fp_arith},              // fdivx
+	{20, &Jit64::fp_arith},              // fsubx
+	{21, &Jit64::fp_arith},              // faddx
+	{22, &Jit64::FallBackToInterpreter}, // fsqrtx
+	{23, &Jit64::fselx},                 // fselx
+	{25, &Jit64::fp_arith},              // fmulx
+	{26, &Jit64::frsqrtex},              // frsqrtex
+	{28, &Jit64::fmaddXX},               // fmsubx
+	{29, &Jit64::fmaddXX},               // fmaddx
+	{30, &Jit64::fmaddXX},               // fnmsubx
+	{31, &Jit64::fmaddXX},               // fnmaddx
+};
+
+namespace Jit64Tables
+{
+
+void CompileInstruction(PPCAnalyst::CodeOp & op)
+{
+	Jit64 *jit64 = (Jit64 *)jit;
+	(jit64->*dynaOpTable[op.inst.OPCD])(op.inst);
+	GekkoOPInfo *info = op.opinfo;
+	if (info)
+	{
+#ifdef OPLOG
+		if (!strcmp(info->opname, OP_TO_LOG)) // "mcrfs"
+		{
+			rsplocations.push_back(jit.js.compilerPC);
+		}
+#endif
+		info->compileCount++;
+		info->lastUse = jit->js.compilerPC;
+	}
+}
+
+void InitTables()
+{
+	// once initialized, tables are read-only
+	static bool initialized = false;
+	if (initialized)
+		return;
+
+	//clear
+	for (auto& tpl : dynaOpTable)
+	{
+		tpl = &Jit64::FallBackToInterpreter;
+	}
+
+	for (auto& tpl : dynaOpTable59)
+	{
+		tpl = &Jit64::FallBackToInterpreter;
+	}
+
+	for (int i = 0; i < 1024; i++)
+	{
+		dynaOpTable4 [i] = &Jit64::FallBackToInterpreter;
+		dynaOpTable19[i] = &Jit64::FallBackToInterpreter;
+		dynaOpTable31[i] = &Jit64::FallBackToInterpreter;
+		dynaOpTable63[i] = &Jit64::FallBackToInterpreter;
+	}
+
+	for (auto& tpl : primarytable)
+	{
+		dynaOpTable[tpl.opcode] = tpl.Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table4_2)
+		{
+			int op = fill+tpl.opcode;
+			dynaOpTable4[op] = tpl.Inst;
+		}
+	}
+
+	for (int i = 0; i < 16; i++)
+	{
+		int fill = i << 6;
+		for (auto& tpl : table4_3)
+		{
+			int op = fill+tpl.opcode;
+			dynaOpTable4[op] = tpl.Inst;
+		}
+	}
+
+	for (auto& tpl : table4)
+	{
+		int op = tpl.opcode;
+		dynaOpTable4[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table31)
+	{
+		int op = tpl.opcode;
+		dynaOpTable31[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table19)
+	{
+		int op = tpl.opcode;
+		dynaOpTable19[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table59)
+	{
+		int op = tpl.opcode;
+		dynaOpTable59[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table63)
+	{
+		int op = tpl.opcode;
+		dynaOpTable63[op] = tpl.Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table63_2)
+		{
+			int op = fill + tpl.opcode;
+			dynaOpTable63[op] = tpl.Inst;
+		}
+	}
+
+	initialized = true;
+}
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h
new file mode 100644
index 0000000000..fd8a6a8030
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h
@@ -0,0 +1,15 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64/Jit.h"
+
+namespace Jit64Tables
+{
+	void CompileInstruction(PPCAnalyst::CodeOp & op);
+	void InitTables();
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
new file mode 100644
index 0000000000..f194098bbc
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
@@ -0,0 +1,280 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/JitRegister.h"
+#include "Common/MemoryUtil.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+
+using namespace Gen;
+
+// Not PowerPC state.  Can't put in 'this' because it's out of range...
+static void* s_saved_rsp;
+
+// PLAN: no more block numbers - crazy opcodes just contain offset within
+// dynarec buffer
+// At this offset - 4, there is an int specifying the block number.
+
+void Jit64AsmRoutineManager::Generate()
+{
+	enterCode = AlignCode16();
+	// We need to own the beginning of RSP, so we do an extra stack adjustment
+	// for the shadow region before calls in this function.  This call will
+	// waste a bit of space for a second shadow, but whatever.
+	ABI_PushRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, /*frame*/ 16);
+	if (m_stack_top)
+	{
+		// Pivot the stack to our custom one.
+		MOV(64, R(RSCRATCH), R(RSP));
+		MOV(64, R(RSP), Imm64((u64)m_stack_top - 0x20));
+		MOV(64, MDisp(RSP, 0x18), R(RSCRATCH));
+	}
+	else
+	{
+		MOV(64, M(&s_saved_rsp), R(RSP));
+	}
+	// something that can't pass the BLR test
+	MOV(64, MDisp(RSP, 8), Imm32((u32)-1));
+
+	// Two statically allocated registers.
+	//MOV(64, R(RMEM), Imm64((u64)Memory::physical_base));
+	MOV(64, R(RPPCSTATE), ImmPtr(PPCSTATE_BASE));
+
+	const u8* outerLoop = GetCodePtr();
+		ABI_PushRegistersAndAdjustStack({}, 0);
+		ABI_CallFunction(reinterpret_cast<void *>(&CoreTiming::Advance));
+		ABI_PopRegistersAndAdjustStack({}, 0);
+		FixupBranch skipToRealDispatch = J(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging); //skip the sync and compare first time
+		dispatcherMispredictedBLR = GetCodePtr();
+		AND(32, PPCSTATE(pc), Imm32(0xFFFFFFFC));
+
+		#if 0 // debug mispredicts
+		MOV(32, R(ABI_PARAM1), MDisp(RSP, 8)); // guessed_pc
+		ABI_PushRegistersAndAdjustStack(1 << RSCRATCH2, 0);
+		CALL(reinterpret_cast<void *>(&ReportMispredict));
+		ABI_PopRegistersAndAdjustStack(1 << RSCRATCH2, 0);
+		#endif
+
+		ResetStack();
+
+		SUB(32, PPCSTATE(downcount), R(RSCRATCH2));
+
+		dispatcher = GetCodePtr();
+			// The result of slice decrementation should be in flags if somebody jumped here
+			// IMPORTANT - We jump on negative, not carry!!!
+			FixupBranch bail = J_CC(CC_BE, true);
+
+			FixupBranch dbg_exit;
+
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+			{
+				TEST(32, M(PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING));
+				FixupBranch notStepping = J_CC(CC_Z);
+				ABI_PushRegistersAndAdjustStack({}, 0);
+				ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
+				ABI_PopRegistersAndAdjustStack({}, 0);
+				TEST(32, M(PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
+				dbg_exit = J_CC(CC_NZ, true);
+				SetJumpTarget(notStepping);
+			}
+
+			SetJumpTarget(skipToRealDispatch);
+
+			dispatcherNoCheck = GetCodePtr();
+
+			// Switch to the correct memory base, in case MSR.DR has changed.
+			// TODO: Is there a more efficient place to put this?  We don't
+			// need to do this for indirect jumps, just exceptions etc.
+			TEST(32, PPCSTATE(msr), Imm32(1 << (31 - 27)));
+			FixupBranch physmem = J_CC(CC_NZ);
+			MOV(64, R(RMEM), Imm64((u64)Memory::physical_base));
+			FixupBranch membaseend = J();
+			SetJumpTarget(physmem);
+			MOV(64, R(RMEM), Imm64((u64)Memory::logical_base));
+			SetJumpTarget(membaseend);
+
+			MOV(32, R(RSCRATCH), PPCSTATE(pc));
+
+			// TODO: We need to handle code which executes the same PC with
+			// different values of MSR.IR. It probably makes sense to handle
+			// MSR.DR here too, to allow IsOptimizableRAMAddress-based
+			// optimizations safe, because IR and DR are usually set/cleared together.
+			// TODO: Branching based on the 20 most significant bits of instruction
+			// addresses without translating them is wrong.
+			u8* icache = jit->GetBlockCache()->iCache.data();
+			u8* icacheVmem = jit->GetBlockCache()->iCacheVMEM.data();
+			u8* icacheEx = jit->GetBlockCache()->iCacheEx.data();
+			u32 mask = 0;
+			FixupBranch no_mem;
+			FixupBranch exit_mem;
+			FixupBranch exit_vmem;
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+				mask = JIT_ICACHE_EXRAM_BIT;
+			mask |= JIT_ICACHE_VMEM_BIT;
+			TEST(32, R(RSCRATCH), Imm32(mask));
+			no_mem = J_CC(CC_NZ);
+			AND(32, R(RSCRATCH), Imm32(JIT_ICACHE_MASK));
+
+			if (FitsInS32(PPCSTATE_OFS(icache)))
+			{
+				MOV(32, R(RSCRATCH), MPIC(icache, RSCRATCH));
+			}
+			else
+			{
+				MOV(64, R(RSCRATCH2), ImmPtr(icache));
+				MOV(32, R(RSCRATCH), MRegSum(RSCRATCH2, RSCRATCH));
+			}
+
+			exit_mem = J();
+			SetJumpTarget(no_mem);
+			TEST(32, R(RSCRATCH), Imm32(JIT_ICACHE_VMEM_BIT));
+			FixupBranch no_vmem = J_CC(CC_Z);
+			AND(32, R(RSCRATCH), Imm32(JIT_ICACHE_MASK));
+
+			if (FitsInS32(PPCSTATE_OFS(icacheVmem)))
+			{
+				MOV(32, R(RSCRATCH), MPIC(icacheVmem, RSCRATCH));
+			}
+			else
+			{
+				MOV(64, R(RSCRATCH2), ImmPtr(icacheVmem));
+				MOV(32, R(RSCRATCH), MRegSum(RSCRATCH2, RSCRATCH));
+			}
+
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) exit_vmem = J();
+			SetJumpTarget(no_vmem);
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+			{
+				TEST(32, R(RSCRATCH), Imm32(JIT_ICACHE_EXRAM_BIT));
+				FixupBranch no_exram = J_CC(CC_Z);
+				AND(32, R(RSCRATCH), Imm32(JIT_ICACHEEX_MASK));
+				if (FitsInS32(PPCSTATE_OFS(icacheEx)))
+				{
+					MOV(32, R(RSCRATCH), MPIC(icacheEx, RSCRATCH));
+				}
+				else
+				{
+					MOV(64, R(RSCRATCH2), ImmPtr(icacheEx));
+					MOV(32, R(RSCRATCH), MRegSum(RSCRATCH2, RSCRATCH));
+				}
+
+				SetJumpTarget(no_exram);
+			}
+			SetJumpTarget(exit_mem);
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+				SetJumpTarget(exit_vmem);
+
+			TEST(32, R(RSCRATCH), R(RSCRATCH));
+			FixupBranch notfound = J_CC(CC_L);
+			//grab from list and jump to it
+			const u8** codePointers = jit->GetBlockCache()->GetCodePointers();
+			if (FitsInS32(PPCSTATE_OFS(codePointers)))
+			{
+				JMPptr(MPIC(codePointers, RSCRATCH, SCALE_8));
+			}
+			else
+			{
+				MOV(64, R(RSCRATCH2), ImmPtr(codePointers));
+				JMPptr(MComplex(RSCRATCH2, RSCRATCH, SCALE_8, 0));
+			}
+
+			SetJumpTarget(notfound);
+
+			//Ok, no block, let's jit
+			ABI_PushRegistersAndAdjustStack({}, 0);
+			ABI_CallFunctionA(32, (void *)&Jit, PPCSTATE(pc));
+			ABI_PopRegistersAndAdjustStack({}, 0);
+
+			// Jit might have cleared the code cache
+			ResetStack();
+
+			JMP(dispatcherNoCheck, true); // no point in special casing this
+
+		SetJumpTarget(bail);
+		doTiming = GetCodePtr();
+
+		// Test external exceptions.
+		TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_EXTERNAL_INT | EXCEPTION_PERFORMANCE_MONITOR | EXCEPTION_DECREMENTER));
+		FixupBranch noExtException = J_CC(CC_Z);
+		MOV(32, R(RSCRATCH), PPCSTATE(pc));
+		MOV(32, PPCSTATE(npc), R(RSCRATCH));
+		ABI_PushRegistersAndAdjustStack({}, 0);
+		ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExternalExceptions));
+		ABI_PopRegistersAndAdjustStack({}, 0);
+		SetJumpTarget(noExtException);
+
+		TEST(32, M(PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
+		J_CC(CC_Z, outerLoop);
+
+	//Landing pad for drec space
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		SetJumpTarget(dbg_exit);
+	ResetStack();
+	if (m_stack_top)
+	{
+		ADD(64, R(RSP), Imm8(0x18));
+		POP(RSP);
+	}
+
+	// Let the waiting thread know we are done leaving
+	ABI_PushRegistersAndAdjustStack({}, 0);
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::FinishStateMove));
+	ABI_PopRegistersAndAdjustStack({}, 0);
+
+	ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16);
+	RET();
+
+	JitRegister::Register(enterCode, GetCodePtr(), "JIT_Loop");
+
+	GenerateCommon();
+}
+
+void Jit64AsmRoutineManager::ResetStack()
+{
+	if (m_stack_top)
+		MOV(64, R(RSP), Imm64((u64)m_stack_top - 0x20));
+	else
+		MOV(64, R(RSP), M(&s_saved_rsp));
+}
+
+
+void Jit64AsmRoutineManager::GenerateCommon()
+{
+	fifoDirectWrite8 = AlignCode4();
+	GenFifoWrite(8);
+	fifoDirectWrite16 = AlignCode4();
+	GenFifoWrite(16);
+	fifoDirectWrite32 = AlignCode4();
+	GenFifoWrite(32);
+	fifoDirectWrite64 = AlignCode4();
+	GenFifoWrite(64);
+	frsqrte = AlignCode4();
+	GenFrsqrte();
+	fres = AlignCode4();
+	GenFres();
+	mfcr = AlignCode4();
+	GenMfcr();
+
+	GenQuantizedLoads();
+	GenQuantizedStores();
+	GenQuantizedSingleStores();
+
+	//CMPSD(R(XMM0), M(&zero),
+	// TODO
+
+	// Fast write routines - special case the most common hardware write
+	// TODO: use this.
+	// Even in x86, the param values will be in the right registers.
+	/*
+	const u8 *fastMemWrite8 = AlignCode16();
+	CMP(32, R(ABI_PARAM2), Imm32(0xCC008000));
+	FixupBranch skip_fast_write = J_CC(CC_NE, false);
+	MOV(32, RSCRATCH, M(&m_gatherPipeCount));
+	MOV(8, MPIC(&m_gatherPipe, RSCRATCH), ABI_PARAM1);
+	ADD(32, 1, M(&m_gatherPipeCount));
+	RET();
+	SetJumpTarget(skip_fast_write);
+	CALL((void *)&PowerPC::Write_U8);*/
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/PowerPC/Jit64/JitAsm.h
new file mode 100644
index 0000000000..6b0ae28ebe
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.h
@@ -0,0 +1,46 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
+
+// In Dolphin, we don't use inline assembly. Instead, we generate all machine-near
+// code at runtime. In the case of fixed code like this, after writing it, we write
+// protect the memory, essentially making it work just like precompiled code.
+
+// There are some advantages to this approach:
+//   1) No need to setup an external assembler in the build.
+//   2) Cross platform, as long as it's x86/x64.
+//   3) Can optimize code at runtime for the specific CPU model.
+// There aren't really any disadvantages other than having to maintain a x86 emitter,
+// which we have to do anyway :)
+//
+// To add a new asm routine, just add another const here, and add the code to Generate.
+// Also, possibly increase the size of the code buffer.
+
+class Jit64AsmRoutineManager : public CommonAsmRoutines
+{
+private:
+	void Generate();
+	void ResetStack();
+	void GenerateCommon();
+	u8* m_stack_top;
+
+public:
+	void Init(u8* stack_top)
+	{
+		m_stack_top = stack_top;
+		// NOTE: When making large additions to the AsmCommon code, you might
+		// want to ensure this number is big enough.
+		AllocCodeSpace(16384, PPCSTATE_BASE);
+		Generate();
+		WriteProtect();
+	}
+
+	void Shutdown()
+	{
+		FreeCodeSpace();
+	}
+};
diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp
new file mode 100644
index 0000000000..eda4c3dc78
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp
@@ -0,0 +1,403 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+using namespace PowerPC;
+
+RegCache::RegCache() : emit(nullptr)
+{
+}
+
+void RegCache::Start()
+{
+	for (auto& xreg : xregs)
+	{
+		xreg.free = true;
+		xreg.dirty = false;
+		xreg.locked = false;
+		xreg.ppcReg = INVALID_REG;
+	}
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		regs[i].location = GetDefaultLocation(i);
+		regs[i].away = false;
+		regs[i].locked = false;
+	}
+
+	// todo: sort to find the most popular regs
+	/*
+	int maxPreload = 2;
+	for (int i = 0; i < 32; i++)
+	{
+		if (stats.numReads[i] > 2 || stats.numWrites[i] >= 2)
+		{
+			LoadToX64(i, true, false); //stats.firstRead[i] <= stats.firstWrite[i], false);
+			maxPreload--;
+			if (!maxPreload)
+				break;
+		}
+	}*/
+	//Find top regs - preload them (load bursts ain't bad)
+	//But only preload IF written OR reads >= 3
+}
+
+void RegCache::UnlockAll()
+{
+	for (auto& reg : regs)
+		reg.locked = false;
+}
+
+void RegCache::UnlockAllX()
+{
+	for (auto& xreg : xregs)
+		xreg.locked = false;
+}
+
+BitSet32 GPRRegCache::GetRegUtilization()
+{
+	return jit->js.op->gprInReg;
+}
+
+BitSet32 FPURegCache::GetRegUtilization()
+{
+	return jit->js.op->gprInReg;
+}
+
+BitSet32 GPRRegCache::CountRegsIn(size_t preg, u32 lookahead)
+{
+	BitSet32 regsUsed;
+	for (u32 i = 1; i < lookahead; i++)
+	{
+		BitSet32 regsIn = jit->js.op[i].regsIn;
+		regsUsed |= regsIn;
+		if (regsIn[preg])
+			return regsUsed;
+	}
+	return regsUsed;
+}
+
+BitSet32 FPURegCache::CountRegsIn(size_t preg, u32 lookahead)
+{
+	BitSet32 regsUsed;
+	for (u32 i = 1; i < lookahead; i++)
+	{
+		BitSet32 regsIn = jit->js.op[i].fregsIn;
+		regsUsed |= regsIn;
+		if (regsIn[preg])
+			return regsUsed;
+	}
+	return regsUsed;
+}
+
+// Estimate roughly how bad it would be to de-allocate this register. Higher score
+// means more bad.
+float RegCache::ScoreRegister(X64Reg xr)
+{
+	size_t preg = xregs[xr].ppcReg;
+	float score = 0;
+
+	// If it's not dirty, we don't need a store to write it back to the register file, so
+	// bias a bit against dirty registers. Testing shows that a bias of 2 seems roughly
+	// right: 3 causes too many extra clobbers, while 1 saves very few clobbers relative
+	// to the number of extra stores it causes.
+	if (xregs[xr].dirty)
+		score += 2;
+
+	// If the register isn't actually needed in a physical register for a later instruction,
+	// writing it back to the register file isn't quite as bad.
+	if (GetRegUtilization()[preg])
+	{
+		// Don't look too far ahead; we don't want to have quadratic compilation times for
+		// enormous block sizes!
+		// This actually improves register allocation a tiny bit; I'm not sure why.
+		u32 lookahead = std::min(jit->js.instructionsLeft, 64);
+		// Count how many other registers are going to be used before we need this one again.
+		u32 regs_in_count = CountRegsIn(preg, lookahead).Count();
+		// Totally ad-hoc heuristic to bias based on how many other registers we'll need
+		// before this one gets used again.
+		score += 1 + 2 * (5 - log2f(1 + (float)regs_in_count));
+	}
+
+	return score;
+}
+
+X64Reg RegCache::GetFreeXReg()
+{
+	size_t aCount;
+	const int* aOrder = GetAllocationOrder(aCount);
+	for (size_t i = 0; i < aCount; i++)
+	{
+		X64Reg xr = (X64Reg)aOrder[i];
+		if (!xregs[xr].locked && xregs[xr].free)
+		{
+			return (X64Reg)xr;
+		}
+	}
+
+	// Okay, not found; run the register allocator heuristic and figure out which register we should
+	// clobber.
+	float min_score = std::numeric_limits<float>::max();
+	X64Reg best_xreg = INVALID_REG;
+	size_t best_preg = 0;
+	for (size_t i = 0; i < aCount; i++)
+	{
+		X64Reg xreg = (X64Reg)aOrder[i];
+		size_t preg = xregs[xreg].ppcReg;
+		if (xregs[xreg].locked || regs[preg].locked)
+			continue;
+		float score = ScoreRegister(xreg);
+		if (score < min_score)
+		{
+			min_score = score;
+			best_xreg = xreg;
+			best_preg = preg;
+		}
+	}
+
+	if (best_xreg != INVALID_REG)
+	{
+		StoreFromRegister(best_preg);
+		return best_xreg;
+	}
+
+	//Still no dice? Die!
+	_assert_msg_(DYNA_REC, 0, "Regcache ran out of regs");
+	return INVALID_REG;
+}
+
+void RegCache::FlushR(X64Reg reg)
+{
+	if (reg >= xregs.size())
+		PanicAlert("Flushing non existent reg");
+	if (!xregs[reg].free)
+	{
+		StoreFromRegister(xregs[reg].ppcReg);
+	}
+}
+
+int RegCache::SanityCheck() const
+{
+	for (size_t i = 0; i < regs.size(); i++)
+	{
+		if (regs[i].away)
+		{
+			if (regs[i].location.IsSimpleReg())
+			{
+				Gen::X64Reg simple = regs[i].location.GetSimpleReg();
+				if (xregs[simple].locked)
+					return 1;
+				if (xregs[simple].ppcReg != i)
+					return 2;
+			}
+			else if (regs[i].location.IsImm())
+			{
+				return 3;
+			}
+		}
+	}
+	return 0;
+}
+
+void RegCache::DiscardRegContentsIfCached(size_t preg)
+{
+	if (IsBound(preg))
+	{
+		X64Reg xr = regs[preg].location.GetSimpleReg();
+		xregs[xr].free = true;
+		xregs[xr].dirty = false;
+		xregs[xr].ppcReg = INVALID_REG;
+		regs[preg].away = false;
+		regs[preg].location = GetDefaultLocation(preg);
+	}
+}
+
+
+void GPRRegCache::SetImmediate32(size_t preg, u32 immValue)
+{
+	DiscardRegContentsIfCached(preg);
+	regs[preg].away = true;
+	regs[preg].location = Imm32(immValue);
+}
+
+const int* GPRRegCache::GetAllocationOrder(size_t& count)
+{
+	static const int allocationOrder[] =
+	{
+		// R12, when used as base register, for example in a LEA, can generate bad code! Need to look into this.
+#ifdef _WIN32
+		RSI, RDI, R13, R14, R15, R8, R9, R10, R11, R12, RCX
+#else
+		R12, R13, R14, R15, RSI, RDI, R8, R9, R10, R11, RCX
+#endif
+	};
+	count = sizeof(allocationOrder) / sizeof(const int);
+	return allocationOrder;
+}
+
+const int* FPURegCache::GetAllocationOrder(size_t& count)
+{
+	static const int allocationOrder[] =
+	{
+		XMM6, XMM7, XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, XMM2, XMM3, XMM4, XMM5
+	};
+	count = sizeof(allocationOrder) / sizeof(int);
+	return allocationOrder;
+}
+
+OpArg GPRRegCache::GetDefaultLocation(size_t reg) const
+{
+	return PPCSTATE(gpr[reg]);
+}
+
+OpArg FPURegCache::GetDefaultLocation(size_t reg) const
+{
+	return PPCSTATE(ps[reg][0]);
+}
+
+void RegCache::KillImmediate(size_t preg, bool doLoad, bool makeDirty)
+{
+	if (regs[preg].away)
+	{
+		if (regs[preg].location.IsImm())
+			BindToRegister(preg, doLoad, makeDirty);
+		else if (regs[preg].location.IsSimpleReg())
+			xregs[RX(preg)].dirty |= makeDirty;
+	}
+}
+
+void RegCache::BindToRegister(size_t i, bool doLoad, bool makeDirty)
+{
+	if (!regs[i].away && regs[i].location.IsImm())
+		PanicAlert("Bad immediate");
+
+	if (!regs[i].away || (regs[i].away && regs[i].location.IsImm()))
+	{
+		X64Reg xr = GetFreeXReg();
+		if (xregs[xr].dirty) PanicAlert("Xreg already dirty");
+		if (xregs[xr].locked) PanicAlert("GetFreeXReg returned locked register");
+		xregs[xr].free = false;
+		xregs[xr].ppcReg = i;
+		xregs[xr].dirty = makeDirty || regs[i].location.IsImm();
+		if (doLoad)
+			LoadRegister(i, xr);
+		for (size_t j = 0; j < regs.size(); j++)
+		{
+			if (i != j && regs[j].location.IsSimpleReg() && regs[j].location.GetSimpleReg() == xr)
+			{
+				Crash();
+			}
+		}
+		regs[i].away = true;
+		regs[i].location = ::Gen::R(xr);
+	}
+	else
+	{
+		// reg location must be simplereg; memory locations
+		// and immediates are taken care of above.
+		xregs[RX(i)].dirty |= makeDirty;
+	}
+
+	if (xregs[RX(i)].locked)
+	{
+		PanicAlert("Seriously WTF, this reg should have been flushed");
+	}
+}
+
+void RegCache::StoreFromRegister(size_t i, FlushMode mode)
+{
+	if (regs[i].away)
+	{
+		bool doStore;
+		if (regs[i].location.IsSimpleReg())
+		{
+			X64Reg xr = RX(i);
+			doStore = xregs[xr].dirty;
+			if (mode == FLUSH_ALL)
+			{
+				xregs[xr].free = true;
+				xregs[xr].ppcReg = INVALID_REG;
+				xregs[xr].dirty = false;
+			}
+		}
+		else
+		{
+			//must be immediate - do nothing
+			doStore = true;
+		}
+		OpArg newLoc = GetDefaultLocation(i);
+		if (doStore)
+			StoreRegister(i, newLoc);
+		if (mode == FLUSH_ALL)
+		{
+			regs[i].location = newLoc;
+			regs[i].away = false;
+		}
+	}
+}
+
+void GPRRegCache::LoadRegister(size_t preg, X64Reg newLoc)
+{
+	emit->MOV(32, ::Gen::R(newLoc), regs[preg].location);
+}
+
+void GPRRegCache::StoreRegister(size_t preg, const OpArg& newLoc)
+{
+	emit->MOV(32, newLoc, regs[preg].location);
+}
+
+void FPURegCache::LoadRegister(size_t preg, X64Reg newLoc)
+{
+	emit->MOVAPD(newLoc, regs[preg].location);
+}
+
+void FPURegCache::StoreRegister(size_t preg, const OpArg& newLoc)
+{
+	emit->MOVAPD(newLoc, regs[preg].location.GetSimpleReg());
+}
+
+void RegCache::Flush(FlushMode mode, BitSet32 regsToFlush)
+{
+	for (unsigned int i = 0; i < xregs.size(); i++)
+	{
+		if (xregs[i].locked)
+			PanicAlert("Someone forgot to unlock X64 reg %u", i);
+	}
+
+	for (unsigned int i : regsToFlush)
+	{
+		if (regs[i].locked)
+		{
+			PanicAlert("Someone forgot to unlock PPC reg %u (X64 reg %i).", i, RX(i));
+		}
+
+		if (regs[i].away)
+		{
+			if (regs[i].location.IsSimpleReg() || regs[i].location.IsImm())
+			{
+				StoreFromRegister(i, mode);
+			}
+			else
+			{
+				_assert_msg_(DYNA_REC,0,"Jit64 - Flush unhandled case, reg %u PC: %08x", i, PC);
+			}
+		}
+	}
+}
+
+int RegCache::NumFreeRegisters()
+{
+	int count = 0;
+	size_t aCount;
+	const int* aOrder = GetAllocationOrder(aCount);
+	for (size_t i = 0; i < aCount; i++)
+		if (!xregs[aOrder[i]].locked && xregs[aOrder[i]].free)
+			count++;
+	return count;
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
new file mode 100644
index 0000000000..05d80ce8f6
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h
@@ -0,0 +1,195 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <cinttypes>
+
+#include "Common/x64Emitter.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+
+enum FlushMode
+{
+	FLUSH_ALL,
+	FLUSH_MAINTAIN_STATE,
+};
+
+struct PPCCachedReg
+{
+	Gen::OpArg location;
+	bool away;  // value not in source register
+	bool locked;
+};
+
+struct X64CachedReg
+{
+	size_t ppcReg;
+	bool dirty;
+	bool free;
+	bool locked;
+};
+
+typedef int XReg;
+typedef int PReg;
+
+#define NUMXREGS 16
+
+class RegCache
+{
+protected:
+	std::array<PPCCachedReg, 32> regs;
+	std::array<X64CachedReg, NUMXREGS> xregs;
+
+	virtual const int *GetAllocationOrder(size_t& count) = 0;
+
+	virtual BitSet32 GetRegUtilization() = 0;
+	virtual BitSet32 CountRegsIn(size_t preg, u32 lookahead) = 0;
+
+	Gen::XEmitter *emit;
+
+	float ScoreRegister(Gen::X64Reg xreg);
+
+public:
+	RegCache();
+	virtual ~RegCache() {}
+
+	void Start();
+
+	void DiscardRegContentsIfCached(size_t preg);
+	void SetEmitter(Gen::XEmitter *emitter)
+	{
+		emit = emitter;
+	}
+
+	void FlushR(Gen::X64Reg reg);
+	void FlushR(Gen::X64Reg reg, Gen::X64Reg reg2)
+	{
+		FlushR(reg);
+		FlushR(reg2);
+	}
+
+	void FlushLockX(Gen::X64Reg reg)
+	{
+		FlushR(reg);
+		LockX(reg);
+	}
+	void FlushLockX(Gen::X64Reg reg1, Gen::X64Reg reg2)
+	{
+		FlushR(reg1); FlushR(reg2);
+		LockX(reg1); LockX(reg2);
+	}
+
+	void Flush(FlushMode mode = FLUSH_ALL, BitSet32 regsToFlush = BitSet32::AllTrue(32));
+	void Flush(PPCAnalyst::CodeOp *op) { Flush(); }
+	int SanityCheck() const;
+	void KillImmediate(size_t preg, bool doLoad, bool makeDirty);
+
+	//TODO - instead of doload, use "read", "write"
+	//read only will not set dirty flag
+	void BindToRegister(size_t preg, bool doLoad = true, bool makeDirty = true);
+	void StoreFromRegister(size_t preg, FlushMode mode = FLUSH_ALL);
+	virtual void StoreRegister(size_t preg, const Gen::OpArg& newLoc) = 0;
+	virtual void LoadRegister(size_t preg, Gen::X64Reg newLoc) = 0;
+
+	const Gen::OpArg &R(size_t preg) const
+	{
+		return regs[preg].location;
+	}
+
+	Gen::X64Reg RX(size_t preg) const
+	{
+		if (IsBound(preg))
+			return regs[preg].location.GetSimpleReg();
+
+		PanicAlert("Not so simple - %u", (unsigned int)preg);
+		return Gen::INVALID_REG;
+	}
+	virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0;
+
+	// Register locking.
+
+	// these are powerpc reg indices
+	template<typename T>
+	void Lock(T p)
+	{
+		regs[p].locked = true;
+	}
+	template<typename T, typename... Args>
+	void Lock(T first, Args... args)
+	{
+		Lock(first);
+		Lock(args...);
+	}
+
+	// these are x64 reg indices
+	template<typename T>
+	void LockX(T x)
+	{
+		if (xregs[x].locked)
+			PanicAlert("RegCache: x %i already locked!", x);
+		xregs[x].locked = true;
+	}
+	template<typename T, typename... Args>
+	void LockX(T first, Args... args)
+	{
+		LockX(first);
+		LockX(args...);
+	}
+
+	template<typename T>
+	void UnlockX(T x)
+	{
+		if (!xregs[x].locked)
+			PanicAlert("RegCache: x %i already unlocked!", x);
+		xregs[x].locked = false;
+	}
+	template<typename T, typename... Args>
+	void UnlockX(T first, Args... args)
+	{
+		UnlockX(first);
+		UnlockX(args...);
+	}
+
+	void UnlockAll();
+	void UnlockAllX();
+
+	bool IsFreeX(size_t xreg) const
+	{
+		return xregs[xreg].free && !xregs[xreg].locked;
+	}
+
+	bool IsBound(size_t preg) const
+	{
+		return regs[preg].away && regs[preg].location.IsSimpleReg();
+	}
+
+
+	Gen::X64Reg GetFreeXReg();
+	int NumFreeRegisters();
+};
+
+class GPRRegCache : public RegCache
+{
+public:
+	void StoreRegister(size_t preg, const Gen::OpArg& newLoc) override;
+	void LoadRegister(size_t preg, Gen::X64Reg newLoc) override;
+	Gen::OpArg GetDefaultLocation(size_t reg) const override;
+	const int* GetAllocationOrder(size_t& count) override;
+	void SetImmediate32(size_t preg, u32 immValue);
+	BitSet32 GetRegUtilization() override;
+	BitSet32 CountRegsIn(size_t preg, u32 lookahead) override;
+};
+
+
+class FPURegCache : public RegCache
+{
+public:
+	void StoreRegister(size_t preg, const Gen::OpArg& newLoc) override;
+	void LoadRegister(size_t preg, Gen::X64Reg newLoc) override;
+	const int* GetAllocationOrder(size_t& count) override;
+	Gen::OpArg GetDefaultLocation(size_t reg) const override;
+	BitSet32 GetRegUtilization() override;
+	BitSet32 CountRegsIn(size_t preg, u32 lookahead) override;
+};
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp
new file mode 100644
index 0000000000..e23e3da2e9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp
@@ -0,0 +1,255 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+// The branches are known good, or at least reasonably good.
+// No need for a disable-mechanism.
+
+// If defined, clears CR0 at blr and bl-s. If the assumption that
+// flags never carry over between functions holds, then the task for
+// an optimizer becomes much easier.
+
+// #define ACID_TEST
+
+// Zelda and many more games seem to pass the Acid Test.
+
+using namespace Gen;
+
+void Jit64::sc(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	gpr.Flush();
+	fpr.Flush();
+	MOV(32, PPCSTATE(pc), Imm32(js.compilerPC + 4));
+	LOCK();
+	OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_SYSCALL));
+	WriteExceptionExit();
+}
+
+void Jit64::rfi(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	gpr.Flush();
+	fpr.Flush();
+	// See Interpreter rfi for details
+	const u32 mask = 0x87C0FFFF;
+	const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
+	// MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13;
+	AND(32, PPCSTATE(msr), Imm32((~mask) & clearMSR13));
+	MOV(32, R(RSCRATCH), PPCSTATE_SRR1);
+	AND(32, R(RSCRATCH), Imm32(mask & clearMSR13));
+	OR(32, PPCSTATE(msr), R(RSCRATCH));
+	// NPC = SRR0;
+	MOV(32, R(RSCRATCH), PPCSTATE_SRR0);
+	WriteRfiExitDestInRSCRATCH();
+}
+
+void Jit64::bx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	// We must always process the following sentence
+	// even if the blocks are merged by PPCAnalyst::Flatten().
+	if (inst.LK)
+		MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4));
+
+	// If this is not the last instruction of a block,
+	// we will skip the rest process.
+	// Because PPCAnalyst::Flatten() merged the blocks.
+	if (!js.isLastInstruction)
+	{
+		return;
+	}
+
+	gpr.Flush();
+	fpr.Flush();
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt26(inst.LI << 2);
+	else
+		destination = js.compilerPC + SignExt26(inst.LI << 2);
+#ifdef ACID_TEST
+	if (inst.LK)
+		AND(32, PPCSTATE(cr), Imm32(~(0xFF000000)));
+#endif
+	if (destination == js.compilerPC)
+	{
+		//PanicAlert("Idle loop detected at %08x", destination);
+		// CALL(ProtectFunction(&CoreTiming::Idle, 0));
+		// JMP(Asm::testExceptions, true);
+		// make idle loops go faster
+		js.downcountAmount += 8;
+	}
+	WriteExit(destination, inst.LK, js.compilerPC + 4);
+}
+
+// TODO - optimize to hell and beyond
+// TODO - make nice easy to optimize special cases for the most common
+// variants of this instruction.
+void Jit64::bcx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	// USES_CR
+
+	FixupBranch pCTRDontBranch;
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
+	{
+		SUB(32, PPCSTATE_CTR, Imm8(1));
+		if (inst.BO & BO_BRANCH_IF_CTR_0)
+			pCTRDontBranch = J_CC(CC_NZ, true);
+		else
+			pCTRDontBranch = J_CC(CC_Z, true);
+	}
+
+	FixupBranch pConditionDontBranch;
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
+	{
+		pConditionDontBranch = JumpIfCRFieldBit(inst.BI >> 2, 3 - (inst.BI & 3),
+		                                        !(inst.BO_2 & BO_BRANCH_IF_TRUE));
+	}
+
+	if (inst.LK)
+		MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4));
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt16(inst.BD << 2);
+	else
+		destination = js.compilerPC + SignExt16(inst.BD << 2);
+
+	gpr.Flush(FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FLUSH_MAINTAIN_STATE);
+	WriteExit(destination, inst.LK, js.compilerPC + 4);
+
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
+		SetJumpTarget(pConditionDontBranch);
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
+		SetJumpTarget(pCTRDontBranch);
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(js.compilerPC + 4);
+	}
+}
+
+void Jit64::bcctrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	// bcctrx doesn't decrement and/or test CTR
+	_dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!");
+
+	if (inst.BO_2 & BO_DONT_CHECK_CONDITION)
+	{
+		// BO_2 == 1z1zz -> b always
+
+		//NPC = CTR & 0xfffffffc;
+		gpr.Flush();
+		fpr.Flush();
+
+		MOV(32, R(RSCRATCH), PPCSTATE_CTR);
+		if (inst.LK_3)
+			MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4)); // LR = PC + 4;
+		AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
+		WriteExitDestInRSCRATCH(inst.LK_3, js.compilerPC + 4);
+	}
+	else
+	{
+		// Rare condition seen in (just some versions of?) Nintendo's NES Emulator
+
+		// BO_2 == 001zy -> b if false
+		// BO_2 == 011zy -> b if true
+
+		FixupBranch b = JumpIfCRFieldBit(inst.BI >> 2, 3 - (inst.BI & 3),
+		                                 !(inst.BO_2 & BO_BRANCH_IF_TRUE));
+		MOV(32, R(RSCRATCH), PPCSTATE_CTR);
+		AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
+		//MOV(32, PPCSTATE(pc), R(RSCRATCH)); => Already done in WriteExitDestInRSCRATCH()
+		if (inst.LK_3)
+			MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4)); // LR = PC + 4;
+
+		gpr.Flush(FLUSH_MAINTAIN_STATE);
+		fpr.Flush(FLUSH_MAINTAIN_STATE);
+		WriteExitDestInRSCRATCH(inst.LK_3, js.compilerPC + 4);
+		// Would really like to continue the block here, but it ends. TODO.
+		SetJumpTarget(b);
+
+		if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+		{
+			gpr.Flush();
+			fpr.Flush();
+			WriteExit(js.compilerPC + 4);
+		}
+	}
+}
+
+void Jit64::bclrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITBranchOff);
+
+	FixupBranch pCTRDontBranch;
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
+	{
+		SUB(32, PPCSTATE_CTR, Imm8(1));
+		if (inst.BO & BO_BRANCH_IF_CTR_0)
+			pCTRDontBranch = J_CC(CC_NZ, true);
+		else
+			pCTRDontBranch = J_CC(CC_Z, true);
+	}
+
+	FixupBranch pConditionDontBranch;
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
+	{
+		pConditionDontBranch = JumpIfCRFieldBit(inst.BI >> 2, 3 - (inst.BI & 3),
+		                                        !(inst.BO_2 & BO_BRANCH_IF_TRUE));
+	}
+
+	// This below line can be used to prove that blr "eats flags" in practice.
+	// This observation could let us do some useful optimizations.
+#ifdef ACID_TEST
+	AND(32, PPCSTATE(cr), Imm32(~(0xFF000000)));
+#endif
+
+	MOV(32, R(RSCRATCH), PPCSTATE_LR);
+	// We don't have to do this because WriteBLRExit handles it for us. Specifically, since we only ever push
+	// divisible-by-four instruction addresses onto the stack, if the return address matches, we're already
+	// good. If it doesn't match, the mispredicted-BLR code handles the fixup.
+	if (!m_enable_blr_optimization)
+		AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
+	if (inst.LK)
+		MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4));
+
+	gpr.Flush(FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FLUSH_MAINTAIN_STATE);
+	WriteBLRExit();
+
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
+		SetJumpTarget(pConditionDontBranch);
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
+		SetJumpTarget(pCTRDontBranch);
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(js.compilerPC + 4);
+	}
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
new file mode 100644
index 0000000000..c9bed760e2
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -0,0 +1,659 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+static const u64 GC_ALIGNED16(psSignBits[2])      = {0x8000000000000000ULL, 0x0000000000000000ULL};
+static const u64 GC_ALIGNED16(psSignBits2[2])     = {0x8000000000000000ULL, 0x8000000000000000ULL};
+static const u64 GC_ALIGNED16(psAbsMask[2])       = {0x7FFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL};
+static const u64 GC_ALIGNED16(psAbsMask2[2])      = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL};
+static const u64 GC_ALIGNED16(psGeneratedQNaN[2]) = {0x7FF8000000000000ULL, 0x7FF8000000000000ULL};
+static const double GC_ALIGNED16(half_qnan_and_s32_max[2]) = {0x7FFFFFFF, -0x80000};
+
+X64Reg Jit64::fp_tri_op(int d, int a, int b, bool reversible, bool single, void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&),
+                        void (XEmitter::*sseOp)(X64Reg, const OpArg&), bool packed, bool preserve_inputs, bool roundRHS)
+{
+	fpr.Lock(d, a, b);
+	fpr.BindToRegister(d, d == a || d == b || !single);
+	X64Reg dest = preserve_inputs ? XMM1 : fpr.RX(d);
+	if (roundRHS)
+	{
+		if (d == a && !preserve_inputs)
+		{
+			Force25BitPrecision(XMM0, fpr.R(b), XMM1);
+			(this->*sseOp)(fpr.RX(d), R(XMM0));
+		}
+		else
+		{
+			Force25BitPrecision(dest, fpr.R(b), XMM0);
+			(this->*sseOp)(dest, fpr.R(a));
+		}
+	}
+	else
+	{
+		avx_op(avxOp, sseOp, dest, fpr.R(a), fpr.R(b), packed, reversible);
+	}
+	return dest;
+}
+
+// We can avoid calculating FPRF if it's not needed; every float operation resets it, so
+// if it's going to be clobbered in a future instruction before being read, we can just
+// not calculate it.
+void Jit64::SetFPRFIfNeeded(X64Reg xmm)
+{
+	// As far as we know, the games that use this flag only need FPRF for fmul and fmadd, but
+	// FPRF is fast enough in JIT that we might as well just enable it for every float instruction
+	// if the FPRF flag is set.
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFPRF && js.op->wantsFPRF)
+		SetFPRF(xmm);
+}
+
+void Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm_out, X64Reg xmm)
+{
+	//                      | PowerPC  | x86
+	// ---------------------+----------+---------
+	// input NaN precedence | 1*3 + 2  | 1*2 + 3
+	// generated QNaN       | positive | negative
+	//
+	// Dragon Ball: Revenge of King Piccolo requires generated NaNs
+	// to be positive, so we'll have to handle them manually.
+
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bAccurateNaNs)
+	{
+		if (xmm_out != xmm)
+			MOVAPD(xmm_out, R(xmm));
+		return;
+	}
+
+	_assert_(xmm != XMM0);
+
+	std::vector<u32> inputs;
+	u32 a = inst.FA, b = inst.FB, c = inst.FC;
+	for (u32 i : {a, b, c})
+	{
+		if (!js.op->fregsIn[i])
+			continue;
+		if (std::find(inputs.begin(), inputs.end(), i) == inputs.end())
+			inputs.push_back(i);
+	}
+	if (inst.OPCD != 4)
+	{
+		// not paired-single
+		UCOMISD(xmm, R(xmm));
+		FixupBranch handle_nan = J_CC(CC_P, true);
+		SwitchToFarCode();
+			SetJumpTarget(handle_nan);
+			std::vector<FixupBranch> fixups;
+			for (u32 x : inputs)
+			{
+				MOVDDUP(xmm, fpr.R(x));
+				UCOMISD(xmm, R(xmm));
+				fixups.push_back(J_CC(CC_P));
+			}
+			MOVDDUP(xmm, M(psGeneratedQNaN));
+			for (FixupBranch fixup : fixups)
+				SetJumpTarget(fixup);
+			FixupBranch done = J(true);
+		SwitchToNearCode();
+		SetJumpTarget(done);
+	}
+	else
+	{
+		// paired-single
+		std::reverse(inputs.begin(), inputs.end());
+		if (cpu_info.bSSE4_1)
+		{
+			avx_op(&XEmitter::VCMPPD, &XEmitter::CMPPD, XMM0, R(xmm), R(xmm), CMP_UNORD);
+			PTEST(XMM0, R(XMM0));
+			FixupBranch handle_nan = J_CC(CC_NZ, true);
+			SwitchToFarCode();
+				SetJumpTarget(handle_nan);
+				BLENDVPD(xmm, M(psGeneratedQNaN));
+				for (u32 x : inputs)
+				{
+					avx_op(&XEmitter::VCMPPD, &XEmitter::CMPPD, XMM0, fpr.R(x), fpr.R(x), CMP_UNORD);
+					BLENDVPD(xmm, fpr.R(x));
+				}
+				FixupBranch done = J(true);
+			SwitchToNearCode();
+			SetJumpTarget(done);
+		}
+		else
+		{
+			// SSE2 fallback
+			X64Reg tmp = fpr.GetFreeXReg();
+			fpr.FlushLockX(tmp);
+			MOVAPD(XMM0, R(xmm));
+			CMPPD(XMM0, R(XMM0), CMP_UNORD);
+			MOVMSKPD(RSCRATCH, R(XMM0));
+			TEST(32, R(RSCRATCH), R(RSCRATCH));
+			FixupBranch handle_nan = J_CC(CC_NZ, true);
+			SwitchToFarCode();
+				SetJumpTarget(handle_nan);
+				MOVAPD(tmp, R(XMM0));
+				PANDN(XMM0, R(xmm));
+				PAND(tmp, M(psGeneratedQNaN));
+				POR(tmp, R(XMM0));
+				MOVAPD(xmm, R(tmp));
+				for (u32 x : inputs)
+				{
+					MOVAPD(XMM0, fpr.R(x));
+					CMPPD(XMM0, R(XMM0), CMP_ORD);
+					MOVAPD(tmp, R(XMM0));
+					PANDN(XMM0, fpr.R(x));
+					PAND(xmm, R(tmp));
+					POR(xmm, R(XMM0));
+				}
+				FixupBranch done = J(true);
+			SwitchToNearCode();
+			SetJumpTarget(done);
+			fpr.UnlockX(tmp);
+		}
+	}
+	if (xmm_out != xmm)
+		MOVAPD(xmm_out, R(xmm));
+}
+
+void Jit64::fp_arith(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int a = inst.FA;
+	int b = inst.FB;
+	int c = inst.FC;
+	int d = inst.FD;
+	int arg2 = inst.SUBOP5 == 25 ? c : b;
+
+	bool single = inst.OPCD == 4 || inst.OPCD == 59;
+	// If both the inputs are known to have identical top and bottom halves, we can skip the MOVDDUP at the end by
+	// using packed arithmetic instead.
+	bool packed = inst.OPCD == 4 || (inst.OPCD == 59 &&
+	                                 jit->js.op->fprIsDuplicated[a] &&
+	                                 jit->js.op->fprIsDuplicated[arg2]);
+	// Packed divides are slower than scalar divides on basically all x86, so this optimization isn't worth it in that case.
+	// Atoms (and a few really old CPUs) are also slower on packed operations than scalar ones.
+	if (inst.OPCD == 59 && (inst.SUBOP5 == 18 || cpu_info.bAtom))
+		packed = false;
+
+	bool round_input = single && !jit->js.op->fprIsSingle[inst.FC];
+	bool preserve_inputs = SConfig::GetInstance().m_LocalCoreStartupParameter.bAccurateNaNs;
+
+	X64Reg dest = INVALID_REG;
+	switch (inst.SUBOP5)
+	{
+	case 18: dest = fp_tri_op(d, a, b, false, single, packed ? &XEmitter::VDIVPD : &XEmitter::VDIVSD,
+	                          packed ? &XEmitter::DIVPD : &XEmitter::DIVSD, packed, preserve_inputs); break;
+	case 20: dest = fp_tri_op(d, a, b, false, single, packed ? &XEmitter::VSUBPD : &XEmitter::VSUBSD,
+	                          packed ? &XEmitter::SUBPD : &XEmitter::SUBSD, packed, preserve_inputs); break;
+	case 21: dest = fp_tri_op(d, a, b, true, single, packed ? &XEmitter::VADDPD : &XEmitter::VADDSD,
+	                          packed ? &XEmitter::ADDPD : &XEmitter::ADDSD, packed, preserve_inputs); break;
+	case 25: dest = fp_tri_op(d, a, c, true, single, packed ? &XEmitter::VMULPD : &XEmitter::VMULSD,
+	                          packed ? &XEmitter::MULPD : &XEmitter::MULSD, packed, preserve_inputs, round_input); break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "fp_arith WTF!!!");
+	}
+	HandleNaNs(inst, fpr.RX(d), dest);
+	if (single)
+		ForceSinglePrecision(fpr.RX(d), fpr.R(d), packed, true);
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+}
+
+void Jit64::fmaddXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int a = inst.FA;
+	int b = inst.FB;
+	int c = inst.FC;
+	int d = inst.FD;
+	bool single = inst.OPCD == 4 || inst.OPCD == 59;
+	bool round_input = single && !jit->js.op->fprIsSingle[c];
+	bool packed = inst.OPCD == 4 ||
+	              (!cpu_info.bAtom && single &&
+	               jit->js.op->fprIsDuplicated[a] &&
+	               jit->js.op->fprIsDuplicated[b] &&
+	               jit->js.op->fprIsDuplicated[c]);
+
+	fpr.Lock(a, b, c, d);
+
+	switch(inst.SUBOP5)
+	{
+	case 14:
+		MOVDDUP(XMM1, fpr.R(c));
+		if (round_input)
+			Force25BitPrecision(XMM1, R(XMM1), XMM0);
+		break;
+	case 15:
+		avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, XMM1, fpr.R(c), fpr.R(c), 3);
+		if (round_input)
+			Force25BitPrecision(XMM1, R(XMM1), XMM0);
+		break;
+	default:
+		bool special = inst.SUBOP5 == 30 && (!cpu_info.bFMA || Core::g_want_determinism);
+		X64Reg tmp1 = special ? XMM0 : XMM1;
+		X64Reg tmp2 = special ? XMM1 : XMM0;
+		if (single && round_input)
+			Force25BitPrecision(tmp1, fpr.R(c), tmp2);
+		else
+			MOVAPD(tmp1, fpr.R(c));
+		break;
+	}
+
+	// While we don't know if any games are actually affected (replays seem to work with all the usual
+	// suspects for desyncing), netplay and other applications need absolute perfect determinism, so
+	// be extra careful and don't use FMA, even if in theory it might be okay.
+	// Note that FMA isn't necessarily less correct (it may actually be closer to correct) compared
+	// to what the Gekko does here; in deterministic mode, the important thing is multiple Dolphin
+	// instances on different computers giving identical results.
+	if (cpu_info.bFMA && !Core::g_want_determinism)
+	{
+		// Statistics suggests b is a lot less likely to be unbound in practice, so
+		// if we have to pick one of a or b to bind, let's make it b.
+		fpr.BindToRegister(b, true, false);
+		switch (inst.SUBOP5)
+		{
+		case 28: //msub
+			if (packed)
+				VFMSUB132PD(XMM1, fpr.RX(b), fpr.R(a));
+			else
+				VFMSUB132SD(XMM1, fpr.RX(b), fpr.R(a));
+			break;
+		case 14: //madds0
+		case 15: //madds1
+		case 29: //madd
+			if (packed)
+				VFMADD132PD(XMM1, fpr.RX(b), fpr.R(a));
+			else
+				VFMADD132SD(XMM1, fpr.RX(b), fpr.R(a));
+			break;
+			// PowerPC and x86 define NMADD/NMSUB differently
+			// x86: D = -A*C (+/-) B
+			// PPC: D = -(A*C (+/-) B)
+			// so we have to swap them; the ADD/SUB here isn't a typo.
+		case 30: //nmsub
+			if (packed)
+				VFNMADD132PD(XMM1, fpr.RX(b), fpr.R(a));
+			else
+				VFNMADD132SD(XMM1, fpr.RX(b), fpr.R(a));
+			break;
+		case 31: //nmadd
+			if (packed)
+				VFNMSUB132PD(XMM1, fpr.RX(b), fpr.R(a));
+			else
+				VFNMSUB132SD(XMM1, fpr.RX(b), fpr.R(a));
+			break;
+		}
+	}
+	else if (inst.SUBOP5 == 30) //nmsub
+	{
+		// We implement nmsub a little differently ((b - a*c) instead of -(a*c - b)), so handle it separately.
+		MOVAPD(XMM1, fpr.R(b));
+		if (packed)
+		{
+			MULPD(XMM0, fpr.R(a));
+			SUBPD(XMM1, R(XMM0));
+		}
+		else
+		{
+			MULSD(XMM0, fpr.R(a));
+			SUBSD(XMM1, R(XMM0));
+		}
+	}
+	else
+	{
+		if (packed)
+		{
+			MULPD(XMM1, fpr.R(a));
+			if (inst.SUBOP5 == 28) //msub
+				SUBPD(XMM1, fpr.R(b));
+			else                   //(n)madd(s[01])
+				ADDPD(XMM1, fpr.R(b));
+		}
+		else
+		{
+			MULSD(XMM1, fpr.R(a));
+			if (inst.SUBOP5 == 28)
+				SUBSD(XMM1, fpr.R(b));
+			else
+				ADDSD(XMM1, fpr.R(b));
+		}
+		if (inst.SUBOP5 == 31) //nmadd
+			PXOR(XMM1, M(packed ? psSignBits2 : psSignBits));
+	}
+	fpr.BindToRegister(d, !single);
+	if (single)
+	{
+		HandleNaNs(inst, fpr.RX(d), XMM1);
+		ForceSinglePrecision(fpr.RX(d), fpr.R(d), packed, true);
+	}
+	else
+	{
+		HandleNaNs(inst, XMM1, XMM1);
+		MOVSD(fpr.RX(d), R(XMM1));
+	}
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+}
+
+void Jit64::fsign(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int b = inst.FB;
+	bool packed = inst.OPCD == 4;
+
+	fpr.Lock(b, d);
+	OpArg src = fpr.R(b);
+	fpr.BindToRegister(d, false);
+
+	switch (inst.SUBOP10)
+	{
+	case 40: // neg
+		avx_op(&XEmitter::VPXOR, &XEmitter::PXOR, fpr.RX(d), src, M(packed ? psSignBits2 : psSignBits), packed);
+		break;
+	case 136: // nabs
+		avx_op(&XEmitter::VPOR, &XEmitter::POR, fpr.RX(d), src, M(packed ? psSignBits2 : psSignBits), packed);
+		break;
+	case 264: // abs
+		avx_op(&XEmitter::VPAND, &XEmitter::PAND, fpr.RX(d), src, M(packed ? psAbsMask2 : psAbsMask), packed);
+		break;
+	default:
+		PanicAlert("fsign bleh");
+		break;
+	}
+	fpr.UnlockAll();
+}
+
+void Jit64::fselx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int a = inst.FA;
+	int b = inst.FB;
+	int c = inst.FC;
+
+	bool packed = inst.OPCD == 4; // ps_sel
+
+	fpr.Lock(a, b, c, d);
+	PXOR(XMM0, R(XMM0));
+	// This condition is very tricky; there's only one right way to handle both the case of
+	// negative/positive zero and NaN properly.
+	// (a >= -0.0 ? c : b) transforms into (0 > a ? b : c), hence the NLE.
+	if (packed)
+		CMPPD(XMM0, fpr.R(a), CMP_NLE);
+	else
+		CMPSD(XMM0, fpr.R(a), CMP_NLE);
+
+	if (cpu_info.bSSE4_1)
+	{
+		MOVAPD(XMM1, fpr.R(c));
+		BLENDVPD(XMM1, fpr.R(b));
+	}
+	else
+	{
+		MOVAPD(XMM1, R(XMM0));
+		PAND(XMM0, fpr.R(b));
+		PANDN(XMM1, fpr.R(c));
+		POR(XMM1, R(XMM0));
+	}
+
+	fpr.BindToRegister(d, !packed);
+	if (packed)
+		MOVAPD(fpr.RX(d), R(XMM1));
+	else
+		MOVSD(fpr.RX(d), R(XMM1));
+	fpr.UnlockAll();
+}
+
+void Jit64::fmrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int b = inst.FB;
+
+	if (d == b)
+		return;
+
+	fpr.Lock(b, d);
+
+	if (fpr.IsBound(d))
+	{
+		// We don't need to load d, but if it is loaded, we need to mark it as dirty.
+		fpr.BindToRegister(d);
+		// We have to use MOVLPD if b isn't loaded because "MOVSD reg, mem" sets the upper bits (64+)
+		// to zero and we don't want that.
+		if (!fpr.R(b).IsSimpleReg())
+			MOVLPD(fpr.RX(d), fpr.R(b));
+		else
+			MOVSD(fpr.R(d), fpr.RX(b));
+	}
+	else
+	{
+		fpr.BindToRegister(b, true, false);
+		MOVSD(fpr.R(d), fpr.RX(b));
+	}
+
+	fpr.UnlockAll();
+}
+
+void Jit64::FloatCompare(UGeckoInstruction inst, bool upper)
+{
+	bool fprf = SConfig::GetInstance().m_LocalCoreStartupParameter.bFPRF && js.op->wantsFPRF;
+	//bool ordered = !!(inst.SUBOP10 & 32);
+	int a = inst.FA;
+	int b = inst.FB;
+	int crf = inst.CRFD;
+	int output[4] = { CR_SO, CR_EQ, CR_GT, CR_LT };
+
+	// Merge neighboring fcmp and cror (the primary use of cror).
+	UGeckoInstruction next = js.op[1].inst;
+	if (analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CROR_MERGE) &&
+	    MergeAllowedNextInstructions(1) && next.OPCD == 19 && next.SUBOP10 == 449 &&
+	    (next.CRBA >> 2) == crf && (next.CRBB >> 2) == crf && (next.CRBD >> 2) == crf)
+	{
+		js.skipInstructions = 1;
+		js.downcountAmount++;
+		int dst = 3 - (next.CRBD & 3);
+		output[3 - (next.CRBD & 3)] &= ~(1 << dst);
+		output[3 - (next.CRBA & 3)] |= 1 << dst;
+		output[3 - (next.CRBB & 3)] |= 1 << dst;
+	}
+
+	fpr.Lock(a, b);
+	fpr.BindToRegister(b, true, false);
+
+	if (fprf)
+		AND(32, PPCSTATE(fpscr), Imm32(~FPRF_MASK));
+
+	if (upper)
+	{
+		fpr.BindToRegister(a, true, false);
+		MOVHLPS(XMM0, fpr.RX(a));
+		MOVHLPS(XMM1, fpr.RX(b));
+		UCOMISD(XMM1, R(XMM0));
+	}
+	else
+	{
+		UCOMISD(fpr.RX(b), fpr.R(a));
+	}
+
+	FixupBranch pNaN, pLesser, pGreater;
+	FixupBranch continue1, continue2, continue3;
+
+	if (a != b)
+	{
+		// if B > A, goto Lesser's jump target
+		pLesser = J_CC(CC_A);
+	}
+
+	// if (B != B) or (A != A), goto NaN's jump target
+	pNaN = J_CC(CC_P);
+
+	if (a != b)
+	{
+		// if B < A, goto Greater's jump target
+		// JB can't precede the NaN check because it doesn't test ZF
+		pGreater = J_CC(CC_B);
+	}
+
+	MOV(64, R(RSCRATCH), Imm64(PPCCRToInternal(output[CR_EQ_BIT])));
+	if (fprf)
+		OR(32, PPCSTATE(fpscr), Imm32(CR_EQ << FPRF_SHIFT));
+
+	continue1 = J();
+
+	SetJumpTarget(pNaN);
+	MOV(64, R(RSCRATCH), Imm64(PPCCRToInternal(output[CR_SO_BIT])));
+	if (fprf)
+		OR(32, PPCSTATE(fpscr), Imm32(CR_SO << FPRF_SHIFT));
+
+	if (a != b)
+	{
+		continue2 = J();
+
+		SetJumpTarget(pGreater);
+		MOV(64, R(RSCRATCH), Imm64(PPCCRToInternal(output[CR_GT_BIT])));
+		if (fprf)
+			OR(32, PPCSTATE(fpscr), Imm32(CR_GT << FPRF_SHIFT));
+		continue3 = J();
+
+		SetJumpTarget(pLesser);
+		MOV(64, R(RSCRATCH), Imm64(PPCCRToInternal(output[CR_LT_BIT])));
+		if (fprf)
+			OR(32, PPCSTATE(fpscr), Imm32(CR_LT << FPRF_SHIFT));
+	}
+
+	SetJumpTarget(continue1);
+	if (a != b)
+	{
+		SetJumpTarget(continue2);
+		SetJumpTarget(continue3);
+	}
+
+	MOV(64, PPCSTATE(cr_val[crf]), R(RSCRATCH));
+	fpr.UnlockAll();
+}
+
+void Jit64::fcmpx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+
+	FloatCompare(inst);
+}
+
+void Jit64::fctiwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.RD;
+	int b = inst.RB;
+	fpr.Lock(d, b);
+	fpr.BindToRegister(d);
+
+	// Intel uses 0x80000000 as a generic error code while PowerPC uses clamping:
+	//
+	// input       | output fctiw | output CVTPD2DQ
+	// ------------+--------------+----------------
+	// > +2^31 - 1 | 0x7fffffff   | 0x80000000
+	// < -2^31     | 0x80000000   | 0x80000000
+	// any NaN     | 0x80000000   | 0x80000000
+	//
+	// The upper 32 bits of the result are set to 0xfff80000,
+	// except for -0.0 where they are set to 0xfff80001 (TODO).
+
+	MOVAPD(XMM0, M(half_qnan_and_s32_max));
+	MINSD(XMM0, fpr.R(b));
+	switch (inst.SUBOP10)
+	{
+		// fctiwx
+		case 14:
+			CVTPD2DQ(XMM0, R(XMM0));
+			break;
+
+		// fctiwzx
+		case 15:
+			CVTTPD2DQ(XMM0, R(XMM0));
+			break;
+	}
+	// d[64+] must not be modified
+	MOVSD(fpr.R(d), XMM0);
+	fpr.UnlockAll();
+}
+
+void Jit64::frspx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	int b = inst.FB;
+	int d = inst.FD;
+	bool packed = jit->js.op->fprIsDuplicated[b] && !cpu_info.bAtom;
+
+	fpr.Lock(b, d);
+	OpArg src = fpr.R(b);
+	fpr.BindToRegister(d, false);
+	ForceSinglePrecision(fpr.RX(d), src, packed, true);
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+}
+
+void Jit64::frsqrtex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+	int b = inst.FB;
+	int d = inst.FD;
+
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	fpr.Lock(b, d);
+	fpr.BindToRegister(d);
+	MOVAPD(XMM0, fpr.R(b));
+	CALL((void *)asm_routines.frsqrte);
+	MOVSD(fpr.R(d), XMM0);
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::fresx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+	int b = inst.FB;
+	int d = inst.FD;
+
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	fpr.Lock(b, d);
+	fpr.BindToRegister(d);
+	MOVAPD(XMM0, fpr.R(b));
+	CALL((void *)asm_routines.fres);
+	MOVSD(fpr.R(d), XMM0);
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+	gpr.UnlockAllX();
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
new file mode 100644
index 0000000000..00d8fd52b3
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -0,0 +1,1902 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <limits>
+#include <vector>
+
+#include "Common/MathUtil.h"
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+void Jit64::GenerateConstantOverflow(s64 val)
+{
+	GenerateConstantOverflow(val > std::numeric_limits<s32>::max() || val < std::numeric_limits<s32>::min());
+}
+
+void Jit64::GenerateConstantOverflow(bool overflow)
+{
+	if (overflow)
+	{
+		//XER[OV/SO] = 1
+		MOV(8, PPCSTATE(xer_so_ov), Imm8(XER_OV_MASK | XER_SO_MASK));
+	}
+	else
+	{
+		//XER[OV] = 0
+		AND(8, PPCSTATE(xer_so_ov), Imm8(~XER_OV_MASK));
+	}
+}
+
+// We could do overflow branchlessly, but unlike carry it seems to be quite a bit rarer.
+void Jit64::GenerateOverflow()
+{
+	FixupBranch jno = J_CC(CC_NO);
+	//XER[OV/SO] = 1
+	MOV(8, PPCSTATE(xer_so_ov), Imm8(XER_OV_MASK | XER_SO_MASK));
+	FixupBranch exit = J();
+	SetJumpTarget(jno);
+	//XER[OV] = 0
+	//We need to do this without modifying flags so as not to break stuff that assumes flags
+	//aren't clobbered (carry, branch merging): speed doesn't really matter here (this is really
+	//rare).
+	static const u8 ovtable[4] = {0, 0, XER_SO_MASK, XER_SO_MASK};
+	MOVZX(32, 8, RSCRATCH, PPCSTATE(xer_so_ov));
+	MOV(8, R(RSCRATCH), MPIC(ovtable, RSCRATCH));
+	MOV(8, PPCSTATE(xer_so_ov), R(RSCRATCH));
+	SetJumpTarget(exit);
+}
+
+void Jit64::FinalizeCarry(CCFlags cond)
+{
+	js.carryFlagSet = false;
+	js.carryFlagInverted = false;
+	if (js.op->wantsCA)
+	{
+		// Not actually merging instructions, but the effect is equivalent (we can't have breakpoints/etc in between).
+		if (MergeAllowedNextInstructions(1) && js.op[1].wantsCAInFlags)
+		{
+			if (cond == CC_C || cond == CC_NC)
+			{
+				js.carryFlagInverted = cond == CC_NC;
+			}
+			else
+			{
+				// convert the condition to a carry flag (is there a better way?)
+				SETcc(cond, R(RSCRATCH));
+				SHR(8, R(RSCRATCH), Imm8(1));
+			}
+			LockFlags();
+			js.carryFlagSet = true;
+		}
+		else
+		{
+			JitSetCAIf(cond);
+		}
+	}
+}
+
+// Unconditional version
+void Jit64::FinalizeCarry(bool ca)
+{
+	js.carryFlagSet = false;
+	js.carryFlagInverted = false;
+	if (js.op->wantsCA)
+	{
+		if (MergeAllowedNextInstructions(1) && js.op[1].wantsCAInFlags)
+		{
+			if (ca)
+				STC();
+			else
+				CLC();
+			LockFlags();
+			js.carryFlagSet = true;
+		}
+		else if (ca)
+		{
+			JitSetCA();
+		}
+		else
+		{
+			JitClearCA();
+		}
+	}
+}
+
+void Jit64::FinalizeCarryOverflow(bool oe, bool inv)
+{
+	if (oe)
+	{
+		// Make sure not to lose the carry flags (not a big deal, this path is rare).
+		PUSHF();
+		//XER[OV] = 0
+		AND(8, PPCSTATE(xer_so_ov), Imm8(~XER_OV_MASK));
+		FixupBranch jno = J_CC(CC_NO);
+		//XER[OV/SO] = 1
+		MOV(8, PPCSTATE(xer_so_ov), Imm8(XER_SO_MASK | XER_OV_MASK));
+		SetJumpTarget(jno);
+		POPF();
+	}
+	// Do carry
+	FinalizeCarry(inv ? CC_NC : CC_C);
+}
+
+// Be careful; only set needs_test to false if we can be absolutely sure flags don't need
+// to be recalculated and haven't been clobbered. Keep in mind not all instructions set
+// sufficient flags -- for example, the flags from SHL/SHR are *not* sufficient for LT/GT
+// branches, only EQ.
+void Jit64::ComputeRC(const Gen::OpArg & arg, bool needs_test, bool needs_sext)
+{
+	_assert_msg_(DYNA_REC, arg.IsSimpleReg() || arg.IsImm(), "Invalid ComputeRC operand");
+	if (arg.IsImm())
+	{
+		MOV(64, PPCSTATE(cr_val[0]), Imm32(arg.SImm32()));
+	}
+	else if (needs_sext)
+	{
+		MOVSX(64, 32, RSCRATCH, arg);
+		MOV(64, PPCSTATE(cr_val[0]), R(RSCRATCH));
+	}
+	else
+	{
+		MOV(64, PPCSTATE(cr_val[0]), arg);
+	}
+	if (CheckMergedBranch(0))
+	{
+		if (arg.IsImm())
+		{
+			DoMergedBranchImmediate(arg.SImm32());
+		}
+		else
+		{
+			if (needs_test)
+			{
+				TEST(32, arg, arg);
+			}
+			else
+			{
+				// If an operand to the cmp/rc op we're merging with the branch isn't used anymore, it'd be
+				// better to flush it here so that we don't have to flush it on both sides of the branch.
+				// We don't want to do this if a test is needed though, because it would interrupt macro-op
+				// fusion.
+				for (int j : ~js.op->gprInUse)
+					gpr.StoreFromRegister(j);
+			}
+			DoMergedBranchCondition();
+		}
+	}
+}
+
+OpArg Jit64::ExtractFromReg(int reg, int offset)
+{
+	OpArg src = gpr.R(reg);
+	// store to load forwarding should handle this case efficiently
+	if (offset)
+	{
+		gpr.StoreFromRegister(reg, FLUSH_MAINTAIN_STATE);
+		src = gpr.GetDefaultLocation(reg);
+		src.AddMemOffset(offset);
+	}
+	return src;
+}
+
+// we can't do this optimization in the emitter because MOVZX and AND have different effects on flags.
+void Jit64::AndWithMask(X64Reg reg, u32 mask)
+{
+	if (mask == 0xff)
+		MOVZX(32, 8, reg, R(reg));
+	else if (mask == 0xffff)
+		MOVZX(32, 16, reg, R(reg));
+	else
+		AND(32, R(reg), Imm32(mask));
+}
+
+// Following static functions are used in conjunction with regimmop
+static u32 Add(u32 a, u32 b)
+{
+	return a + b;
+}
+
+static u32 Or(u32 a, u32 b)
+{
+	return a | b;
+}
+
+static u32 And(u32 a, u32 b)
+{
+	return a & b;
+}
+
+static u32 Xor(u32 a, u32 b)
+{
+	return a ^ b;
+}
+
+void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void (XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&), bool Rc, bool carry)
+{
+	bool needs_test = false;
+	gpr.Lock(d, a);
+	// Be careful; addic treats r0 as r0, but addi treats r0 as zero.
+	if (a || binary || carry)
+	{
+		carry &= js.op->wantsCA;
+		if (gpr.R(a).IsImm() && !carry)
+		{
+			gpr.SetImmediate32(d, doop(gpr.R(a).Imm32(), value));
+		}
+		else if (a == d)
+		{
+			gpr.BindToRegister(d, true);
+			(this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
+		}
+		else
+		{
+			gpr.BindToRegister(d, false);
+			if (doop == Add && gpr.R(a).IsSimpleReg() && !carry)
+			{
+				needs_test = true;
+				LEA(32, gpr.RX(d), MDisp(gpr.RX(a), value));
+			}
+			else
+			{
+				MOV(32, gpr.R(d), gpr.R(a));
+				(this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
+			}
+		}
+		if (carry)
+			FinalizeCarry(CC_C);
+	}
+	else if (doop == Add)
+	{
+		// a == 0, which for these instructions imply value = 0
+		gpr.SetImmediate32(d, value);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, 0, "WTF regimmop");
+	}
+	if (Rc)
+		ComputeRC(gpr.R(d), needs_test, doop != And || (value & 0x80000000));
+	gpr.UnlockAll();
+}
+
+void Jit64::reg_imm(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	u32 d = inst.RD, a = inst.RA, s = inst.RS;
+	switch (inst.OPCD)
+	{
+	case 14: // addi
+		// occasionally used as MOV - emulate, with immediate propagation
+		if (gpr.R(a).IsImm() && d != a && a != 0)
+		{
+			gpr.SetImmediate32(d, gpr.R(a).Imm32() + (u32)(s32)inst.SIMM_16);
+		}
+		else if (inst.SIMM_16 == 0 && d != a && a != 0)
+		{
+			gpr.Lock(a, d);
+			gpr.BindToRegister(d, false, true);
+			MOV(32, gpr.R(d), gpr.R(a));
+			gpr.UnlockAll();
+		}
+		else
+		{
+			regimmop(d, a, false, (u32)(s32)inst.SIMM_16,  Add, &XEmitter::ADD); //addi
+		}
+		break;
+	case 15: // addis
+		regimmop(d, a, false, (u32)inst.SIMM_16 << 16, Add, &XEmitter::ADD);
+		break;
+	case 24: // ori
+		if (a == 0 && s == 0 && inst.UIMM == 0 && !inst.Rc)  //check for nop
+		{
+			// Make the nop visible in the generated code. not much use but interesting if we see one.
+			NOP();
+			return;
+		}
+		regimmop(a, s, true, inst.UIMM, Or, &XEmitter::OR);
+		break;
+	case 25: // oris
+		regimmop(a, s, true, inst.UIMM << 16, Or,  &XEmitter::OR, false);
+		break;
+	case 28: // andi
+		regimmop(a, s, true, inst.UIMM,       And, &XEmitter::AND, true);
+		break;
+	case 29: // andis
+		regimmop(a, s, true, inst.UIMM << 16, And, &XEmitter::AND, true);
+		break;
+	case 26: // xori
+		regimmop(a, s, true, inst.UIMM,       Xor, &XEmitter::XOR, false);
+		break;
+	case 27: // xoris
+		regimmop(a, s, true, inst.UIMM << 16, Xor, &XEmitter::XOR, false);
+		break;
+	case 12: // addic
+		regimmop(d, a, false, (u32)(s32)inst.SIMM_16, Add, &XEmitter::ADD, false, true);
+		break;
+	case 13: // addic_rc
+		regimmop(d, a, true, (u32)(s32)inst.SIMM_16, Add, &XEmitter::ADD, true, true);
+		break;
+	default:
+		FALLBACK_IF(true);
+	}
+}
+
+bool Jit64::CheckMergedBranch(int crf)
+{
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_BRANCH_MERGE))
+		return false;
+
+	if (!MergeAllowedNextInstructions(1))
+		return false;
+
+	const UGeckoInstruction& next = js.op[1].inst;
+	return (((next.OPCD == 16 /* bcx */) ||
+	        ((next.OPCD == 19) && (next.SUBOP10 == 528) /* bcctrx */) ||
+	        ((next.OPCD == 19) && (next.SUBOP10 == 16) /* bclrx */)) &&
+	         (next.BO & BO_DONT_DECREMENT_FLAG) &&
+	        !(next.BO & BO_DONT_CHECK_CONDITION) &&
+	         (next.BI >> 2) == crf);
+}
+
+void Jit64::DoMergedBranch()
+{
+	// Code that handles successful PPC branching.
+	const UGeckoInstruction& next = js.op[1].inst;
+	const u32 nextPC = js.op[1].address;
+	if (next.OPCD == 16) // bcx
+	{
+		if (next.LK)
+			MOV(32, M(&LR), Imm32(nextPC + 4));
+
+		u32 destination;
+		if (next.AA)
+			destination = SignExt16(next.BD << 2);
+		else
+			destination = nextPC + SignExt16(next.BD << 2);
+		WriteExit(destination, next.LK, nextPC + 4);
+	}
+	else if ((next.OPCD == 19) && (next.SUBOP10 == 528)) // bcctrx
+	{
+		if (next.LK)
+			MOV(32, M(&LR), Imm32(nextPC + 4));
+		MOV(32, R(RSCRATCH), M(&CTR));
+		AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
+		WriteExitDestInRSCRATCH(next.LK, nextPC + 4);
+	}
+	else if ((next.OPCD == 19) && (next.SUBOP10 == 16)) // bclrx
+	{
+		MOV(32, R(RSCRATCH), M(&LR));
+		if (!m_enable_blr_optimization)
+			AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
+		if (next.LK)
+			MOV(32, M(&LR), Imm32(nextPC + 4));
+		WriteBLRExit();
+	}
+	else
+	{
+		PanicAlert("WTF invalid branch");
+	}
+}
+
+void Jit64::DoMergedBranchCondition()
+{
+	js.downcountAmount++;
+	js.skipInstructions = 1;
+	const UGeckoInstruction& next = js.op[1].inst;
+	int test_bit = 8 >> (next.BI & 3);
+	bool condition = !!(next.BO & BO_BRANCH_IF_TRUE);
+	const u32 nextPC = js.op[1].address;
+
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+	FixupBranch pDontBranch;
+	if (test_bit & 8)
+		pDontBranch = J_CC(condition ? CC_GE : CC_L, true);  // Test < 0, so jump over if >= 0.
+	else if (test_bit & 4)
+		pDontBranch = J_CC(condition ? CC_LE : CC_G, true);  // Test > 0, so jump over if <= 0.
+	else if (test_bit & 2)
+		pDontBranch = J_CC(condition ? CC_NE : CC_E, true);  // Test = 0, so jump over if != 0.
+	else  // SO bit, do not branch (we don't emulate SO for cmp).
+		pDontBranch = J(true);
+
+	gpr.Flush(FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FLUSH_MAINTAIN_STATE);
+
+	DoMergedBranch();
+
+	SetJumpTarget(pDontBranch);
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(nextPC + 4);
+	}
+}
+
+void Jit64::DoMergedBranchImmediate(s64 val)
+{
+	js.downcountAmount++;
+	js.skipInstructions = 1;
+	const UGeckoInstruction& next = js.op[1].inst;
+	int test_bit = 8 >> (next.BI & 3);
+	bool condition = !!(next.BO & BO_BRANCH_IF_TRUE);
+	const u32 nextPC = js.op[1].address;
+
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+	bool branch;
+	if (test_bit & 8)
+		branch = condition ? val < 0 : val >= 0;
+	else if (test_bit & 4)
+		branch = condition ? val > 0 : val <= 0;
+	else if (test_bit & 2)
+		branch = condition ? val == 0 : val != 0;
+	else  // SO bit, do not branch (we don't emulate SO for cmp).
+		branch = false;
+
+	if (branch)
+	{
+		gpr.Flush();
+		fpr.Flush();
+		DoMergedBranch();
+	}
+	else if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(nextPC + 4);
+	}
+}
+
+void Jit64::cmpXX(UGeckoInstruction inst)
+{
+	// USES_CR
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int b = inst.RB;
+	int crf = inst.CRFD;
+	bool merge_branch = CheckMergedBranch(crf);
+
+	OpArg comparand;
+	bool signedCompare;
+	if (inst.OPCD == 31)
+	{
+		// cmp / cmpl
+		gpr.Lock(a, b);
+		comparand = gpr.R(b);
+		signedCompare = (inst.SUBOP10 == 0);
+	}
+	else
+	{
+		gpr.Lock(a);
+		if (inst.OPCD == 10)
+		{
+			//cmpli
+			comparand = Imm32((u32)inst.UIMM);
+			signedCompare = false;
+		}
+		else if (inst.OPCD == 11)
+		{
+			//cmpi
+			comparand = Imm32((u32)(s32)(s16)inst.UIMM);
+			signedCompare = true;
+		}
+		else
+		{
+			signedCompare = false; // silence compiler warning
+			PanicAlert("cmpXX");
+		}
+	}
+
+	if (gpr.R(a).IsImm() && comparand.IsImm())
+	{
+		// Both registers contain immediate values, so we can pre-compile the compare result
+		s64 compareResult = signedCompare ? (s64)gpr.R(a).SImm32() - (s64)comparand.SImm32() :
+		                                    (u64)gpr.R(a).Imm32() - (u64)comparand.Imm32();
+		if (compareResult == (s32)compareResult)
+		{
+			MOV(64, PPCSTATE(cr_val[crf]), Imm32((u32)compareResult));
+		}
+		else
+		{
+			MOV(64, R(RSCRATCH), Imm64(compareResult));
+			MOV(64, PPCSTATE(cr_val[crf]), R(RSCRATCH));
+		}
+
+		if (merge_branch)
+			DoMergedBranchImmediate(compareResult);
+	}
+	else
+	{
+		X64Reg input = RSCRATCH;
+		if (signedCompare)
+		{
+			if (gpr.R(a).IsImm())
+				MOV(64, R(input), Imm32(gpr.R(a).SImm32()));
+			else
+				MOVSX(64, 32, input, gpr.R(a));
+
+			if (!comparand.IsImm())
+			{
+				MOVSX(64, 32, RSCRATCH2, comparand);
+				comparand = R(RSCRATCH2);
+			}
+		}
+		else
+		{
+			if (gpr.R(a).IsImm())
+			{
+				MOV(32, R(input), Imm32(gpr.R(a).Imm32()));
+			}
+			else if (comparand.IsImm() && !comparand.Imm32())
+			{
+				gpr.BindToRegister(a, true, false);
+				input = gpr.RX(a);
+			}
+			else
+			{
+				MOVZX(64, 32, input, gpr.R(a));
+			}
+
+			if (comparand.IsImm())
+			{
+				// sign extension will ruin this, so store it in a register
+				if (comparand.Imm32() & 0x80000000U)
+				{
+					MOV(32, R(RSCRATCH2), comparand);
+					comparand = R(RSCRATCH2);
+				}
+			}
+			else
+			{
+				gpr.BindToRegister(b, true, false);
+				comparand = gpr.R(b);
+			}
+		}
+		if (comparand.IsImm() && !comparand.Imm32())
+		{
+			MOV(64, PPCSTATE(cr_val[crf]), R(input));
+			// Place the comparison next to the branch for macro-op fusion
+			if (merge_branch)
+				TEST(64, R(input), R(input));
+		}
+		else
+		{
+			SUB(64, R(input), comparand);
+			MOV(64, PPCSTATE(cr_val[crf]), R(input));
+		}
+
+		if (merge_branch)
+			DoMergedBranchCondition();
+	}
+
+	gpr.UnlockAll();
+}
+
+void Jit64::boolX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, s = inst.RS, b = inst.RB;
+	bool needs_test = false;
+	_dbg_assert_msg_(DYNA_REC, inst.OPCD == 31, "Invalid boolX");
+
+	if (gpr.R(s).IsImm() && gpr.R(b).IsImm())
+	{
+		const u32 rs_offset = gpr.R(s).Imm32();
+		const u32 rb_offset = gpr.R(b).Imm32();
+
+		if (inst.SUBOP10 == 28)       // andx
+			gpr.SetImmediate32(a, rs_offset & rb_offset);
+		else if (inst.SUBOP10 == 476) // nandx
+			gpr.SetImmediate32(a, ~(rs_offset & rb_offset));
+		else if (inst.SUBOP10 == 60)  // andcx
+			gpr.SetImmediate32(a, rs_offset & (~rb_offset));
+		else if (inst.SUBOP10 == 444) // orx
+			gpr.SetImmediate32(a, rs_offset | rb_offset);
+		else if (inst.SUBOP10 == 124) // norx
+			gpr.SetImmediate32(a, ~(rs_offset | rb_offset));
+		else if (inst.SUBOP10 == 412) // orcx
+			gpr.SetImmediate32(a, rs_offset | (~rb_offset));
+		else if (inst.SUBOP10 == 316) // xorx
+			gpr.SetImmediate32(a, rs_offset ^ rb_offset);
+		else if (inst.SUBOP10 == 284) // eqvx
+			gpr.SetImmediate32(a, ~(rs_offset ^ rb_offset));
+	}
+	else if (s == b)
+	{
+		if ((inst.SUBOP10 == 28 /* andx */) || (inst.SUBOP10 == 444 /* orx */))
+		{
+			if (a != s)
+			{
+				gpr.Lock(a,s);
+				gpr.BindToRegister(a, false, true);
+				MOV(32, gpr.R(a), gpr.R(s));
+			}
+			else if (inst.Rc)
+			{
+				gpr.BindToRegister(a, true, false);
+			}
+			needs_test = true;
+		}
+		else if ((inst.SUBOP10 == 476 /* nandx */) || (inst.SUBOP10 == 124 /* norx */))
+		{
+			if (a != s)
+			{
+				gpr.Lock(a,s);
+				gpr.BindToRegister(a, false, true);
+				MOV(32, gpr.R(a), gpr.R(s));
+			}
+			else if (inst.Rc)
+			{
+				gpr.BindToRegister(a, true, true);
+			}
+			else
+			{
+				gpr.KillImmediate(a, true, true);
+			}
+			NOT(32, gpr.R(a));
+			needs_test = true;
+		}
+		else if ((inst.SUBOP10 == 412 /* orcx */) || (inst.SUBOP10 == 284 /* eqvx */))
+		{
+			gpr.SetImmediate32(a, 0xFFFFFFFF);
+		}
+		else if ((inst.SUBOP10 == 60 /* andcx */) || (inst.SUBOP10 == 316 /* xorx */))
+		{
+			gpr.SetImmediate32(a, 0);
+		}
+		else
+		{
+			PanicAlert("WTF!");
+		}
+	}
+	else if ((a == s) || (a == b))
+	{
+		gpr.Lock(a,((a == s) ? b : s));
+		OpArg operand = ((a == s) ? gpr.R(b) : gpr.R(s));
+		gpr.BindToRegister(a, true, true);
+
+		if (inst.SUBOP10 == 28) // andx
+		{
+			AND(32, gpr.R(a), operand);
+		}
+		else if (inst.SUBOP10 == 476) // nandx
+		{
+			AND(32, gpr.R(a), operand);
+			NOT(32, gpr.R(a));
+			needs_test = true;
+		}
+		else if (inst.SUBOP10 == 60) // andcx
+		{
+			if (a == b)
+			{
+				NOT(32, gpr.R(a));
+				AND(32, gpr.R(a), operand);
+			}
+			else
+			{
+				MOV(32, R(RSCRATCH), operand);
+				NOT(32, R(RSCRATCH));
+				AND(32, gpr.R(a), R(RSCRATCH));
+			}
+		}
+		else if (inst.SUBOP10 == 444) // orx
+		{
+			OR(32, gpr.R(a), operand);
+		}
+		else if (inst.SUBOP10 == 124) // norx
+		{
+			OR(32, gpr.R(a), operand);
+			NOT(32, gpr.R(a));
+			needs_test = true;
+		}
+		else if (inst.SUBOP10 == 412) // orcx
+		{
+			if (a == b)
+			{
+				NOT(32, gpr.R(a));
+				OR(32, gpr.R(a), operand);
+			}
+			else
+			{
+				MOV(32, R(RSCRATCH), operand);
+				NOT(32, R(RSCRATCH));
+				OR(32, gpr.R(a), R(RSCRATCH));
+			}
+		}
+		else if (inst.SUBOP10 == 316) // xorx
+		{
+			XOR(32, gpr.R(a), operand);
+		}
+		else if (inst.SUBOP10 == 284) // eqvx
+		{
+			NOT(32, gpr.R(a));
+			XOR(32, gpr.R(a), operand);
+		}
+		else
+		{
+			PanicAlert("WTF");
+		}
+	}
+	else
+	{
+		gpr.Lock(a,s,b);
+		gpr.BindToRegister(a, false, true);
+
+		if (inst.SUBOP10 == 28) // andx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			AND(32, gpr.R(a), gpr.R(b));
+		}
+		else if (inst.SUBOP10 == 476) // nandx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			AND(32, gpr.R(a), gpr.R(b));
+			NOT(32, gpr.R(a));
+			needs_test = true;
+		}
+		else if (inst.SUBOP10 == 60) // andcx
+		{
+			MOV(32, gpr.R(a), gpr.R(b));
+			NOT(32, gpr.R(a));
+			AND(32, gpr.R(a), gpr.R(s));
+		}
+		else if (inst.SUBOP10 == 444) // orx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			OR(32, gpr.R(a), gpr.R(b));
+		}
+		else if (inst.SUBOP10 == 124) // norx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			OR(32, gpr.R(a), gpr.R(b));
+			NOT(32, gpr.R(a));
+			needs_test = true;
+		}
+		else if (inst.SUBOP10 == 412) // orcx
+		{
+			MOV(32, gpr.R(a), gpr.R(b));
+			NOT(32, gpr.R(a));
+			OR(32, gpr.R(a), gpr.R(s));
+		}
+		else if (inst.SUBOP10 == 316) // xorx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			XOR(32, gpr.R(a), gpr.R(b));
+		}
+		else if (inst.SUBOP10 == 284) // eqvx
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+			NOT(32, gpr.R(a));
+			XOR(32, gpr.R(a), gpr.R(b));
+		}
+		else
+		{
+			PanicAlert("WTF!");
+		}
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(a), needs_test);
+	gpr.UnlockAll();
+}
+
+void Jit64::extsXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, s = inst.RS;
+	int size = inst.SUBOP10 == 922 ? 16 : 8;
+
+	if (gpr.R(s).IsImm())
+	{
+		gpr.SetImmediate32(a, (u32)(s32)(size == 16 ? (s16)gpr.R(s).Imm32() : (s8)gpr.R(s).Imm32()));
+	}
+	else
+	{
+		gpr.Lock(a, s);
+		gpr.BindToRegister(a, a == s, true);
+		MOVSX(32, size, gpr.RX(a), gpr.R(s));
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(a));
+	gpr.UnlockAll();
+}
+
+void Jit64::subfic(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, d = inst.RD;
+	gpr.Lock(a, d);
+	gpr.BindToRegister(d, a == d, true);
+	int imm = inst.SIMM_16;
+	if (d == a)
+	{
+		if (imm == 0)
+		{
+			// Flags act exactly like subtracting from 0
+			NEG(32, gpr.R(d));
+			// Output carry is inverted
+			FinalizeCarry(CC_NC);
+		}
+		else if (imm == -1)
+		{
+			NOT(32, gpr.R(d));
+			// CA is always set in this case
+			FinalizeCarry(true);
+		}
+		else
+		{
+			NOT(32, gpr.R(d));
+			ADD(32, gpr.R(d), Imm32(imm+1));
+			// Output carry is normal
+			FinalizeCarry(CC_C);
+		}
+	}
+	else
+	{
+		MOV(32, gpr.R(d), Imm32(imm));
+		SUB(32, gpr.R(d), gpr.R(a));
+		// Output carry is inverted
+		FinalizeCarry(CC_NC);
+	}
+	gpr.UnlockAll();
+	// This instruction has no RC flag
+}
+
+void Jit64::subfx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		s32 i = gpr.R(b).SImm32(), j = gpr.R(a).SImm32();
+		gpr.SetImmediate32(d, i - j);
+		if (inst.OE)
+			GenerateConstantOverflow((s64)i - (s64)j);
+	}
+	else
+	{
+		gpr.Lock(a, b, d);
+		gpr.BindToRegister(d, (d == a || d == b), true);
+		if (d == b)
+		{
+			SUB(32, gpr.R(d), gpr.R(a));
+		}
+		else if (d == a)
+		{
+			MOV(32, R(RSCRATCH), gpr.R(a));
+			MOV(32, gpr.R(d), gpr.R(b));
+			SUB(32, gpr.R(d), R(RSCRATCH));
+		}
+		else
+		{
+			MOV(32, gpr.R(d), gpr.R(b));
+			SUB(32, gpr.R(d), gpr.R(a));
+		}
+		if (inst.OE)
+			GenerateOverflow();
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), false);
+	gpr.UnlockAll();
+}
+
+void Jit64::MultiplyImmediate(u32 imm, int a, int d, bool overflow)
+{
+	// simplest cases first
+	if (imm == 0)
+	{
+		XOR(32, gpr.R(d), gpr.R(d));
+		return;
+	}
+
+	if (imm == (u32)-1)
+	{
+		if (d != a)
+			MOV(32, gpr.R(d), gpr.R(a));
+		NEG(32, gpr.R(d));
+		return;
+	}
+
+	// skip these if we need to check overflow flag
+	if (!overflow)
+	{
+		// power of 2; just a shift
+		if (IsPow2(imm))
+		{
+			u32 shift = IntLog2(imm);
+			// use LEA if it saves an op
+			if (d != a && shift <= 3 && shift >= 1 && gpr.R(a).IsSimpleReg())
+			{
+				LEA(32, gpr.RX(d), MScaled(gpr.RX(a), SCALE_1 << shift, 0));
+			}
+			else
+			{
+				if (d != a)
+					MOV(32, gpr.R(d), gpr.R(a));
+				if (shift)
+					SHL(32, gpr.R(d), Imm8(shift));
+			}
+			return;
+		}
+
+		// We could handle factors of 2^N*3, 2^N*5, and 2^N*9 using lea+shl, but testing shows
+		// it seems to be slower overall.
+		static u8 lea_scales[3] = { 3, 5, 9 };
+		for (int i = 0; i < 3; i++)
+		{
+			if (imm == lea_scales[i])
+			{
+				if (d != a)
+					gpr.BindToRegister(a, true, false);
+				LEA(32, gpr.RX(d), MComplex(gpr.RX(a), gpr.RX(a), SCALE_2 << i, 0));
+				return;
+			}
+		}
+	}
+
+	// if we didn't find any better options
+	IMUL(32, gpr.RX(d), gpr.R(a), Imm32(imm));
+}
+
+void Jit64::mulli(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, d = inst.RD;
+	u32 imm = inst.SIMM_16;
+
+	if (gpr.R(a).IsImm())
+	{
+		gpr.SetImmediate32(d, gpr.R(a).Imm32() * imm);
+	}
+	else
+	{
+		gpr.Lock(a, d);
+		gpr.BindToRegister(d, (d == a), true);
+		MultiplyImmediate(imm, a, d, false);
+		gpr.UnlockAll();
+	}
+}
+
+void Jit64::mullwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		s32 i = gpr.R(a).SImm32(), j = gpr.R(b).SImm32();
+		gpr.SetImmediate32(d, i * j);
+		if (inst.OE)
+			GenerateConstantOverflow((s64)i * (s64)j);
+	}
+	else
+	{
+		gpr.Lock(a, b, d);
+		gpr.BindToRegister(d, (d == a || d == b), true);
+		if (gpr.R(a).IsImm() || gpr.R(b).IsImm())
+		{
+			u32 imm = gpr.R(a).IsImm() ? gpr.R(a).Imm32() : gpr.R(b).Imm32();
+			int src = gpr.R(a).IsImm() ? b : a;
+			MultiplyImmediate(imm, src, d, inst.OE);
+		}
+		else if (d == a)
+		{
+			IMUL(32, gpr.RX(d), gpr.R(b));
+		}
+		else if (d == b)
+		{
+			IMUL(32, gpr.RX(d), gpr.R(a));
+		}
+		else
+		{
+			MOV(32, gpr.R(d), gpr.R(b));
+			IMUL(32, gpr.RX(d), gpr.R(a));
+		}
+		if (inst.OE)
+			GenerateOverflow();
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d));
+	gpr.UnlockAll();
+}
+
+void Jit64::mulhwXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+	bool sign = inst.SUBOP10 == 75;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		if (sign)
+			gpr.SetImmediate32(d, (u32)((u64)(((s64)gpr.R(a).SImm32() * (s64)gpr.R(b).SImm32())) >> 32));
+		else
+			gpr.SetImmediate32(d, (u32)(((u64)gpr.R(a).Imm32() * (u64)gpr.R(b).Imm32()) >> 32));
+	}
+	else if (sign)
+	{
+		gpr.Lock(a, b, d);
+		// no register choice
+		gpr.FlushLockX(EDX, EAX);
+		gpr.BindToRegister(d, d == a || d == b, true);
+		MOV(32, R(EAX), gpr.R(a));
+		gpr.KillImmediate(b, true, false);
+		IMUL(32, gpr.R(b));
+		MOV(32, gpr.R(d), R(EDX));
+	}
+	else
+	{
+		// Not faster for signed because we'd need two movsx.
+		gpr.Lock(a, b, d);
+		// We need to bind everything to registers since the top 32 bits need to be zero.
+		int src = d == b ? a : b;
+		gpr.BindToRegister(d, d == a || d == b, true);
+		gpr.BindToRegister(src, true, false);
+		if (d != a && d != b)
+			MOV(32, gpr.R(d), gpr.R(a));
+		IMUL(64, gpr.RX(d), gpr.R(src));
+		SHR(64, gpr.R(d), Imm8(32));
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::divwux(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		if (gpr.R(b).Imm32() == 0)
+		{
+			gpr.SetImmediate32(d, 0);
+			if (inst.OE)
+				GenerateConstantOverflow(true);
+		}
+		else
+		{
+			gpr.SetImmediate32(d, gpr.R(a).Imm32() / gpr.R(b).Imm32());
+			if (inst.OE)
+				GenerateConstantOverflow(false);
+		}
+	}
+	else if (gpr.R(b).IsImm())
+	{
+		u32 divisor = gpr.R(b).Imm32();
+		if (divisor == 0)
+		{
+			gpr.SetImmediate32(d, 0);
+			if (inst.OE)
+				GenerateConstantOverflow(true);
+		}
+		else
+		{
+			u32 shift = 31;
+			while (!(divisor & (1 << shift)))
+				shift--;
+
+			if (divisor == (u32)(1 << shift))
+			{
+				gpr.Lock(a, b, d);
+				gpr.BindToRegister(d, d == a, true);
+				if (d != a)
+					MOV(32, gpr.R(d), gpr.R(a));
+				if (shift)
+					SHR(32, gpr.R(d), Imm8(shift));
+			}
+			else
+			{
+				u64 magic_dividend = 0x100000000ULL << shift;
+				u32 magic = (u32)(magic_dividend / divisor);
+				u32 max_quotient = magic >> shift;
+
+				// Test for failure in round-up method
+				if (((u64)(magic+1) * (max_quotient*divisor-1)) >> (shift + 32) != max_quotient-1)
+				{
+					// If failed, use slower round-down method
+					gpr.Lock(a, b, d);
+					gpr.BindToRegister(d, d == a, true);
+					MOV(32, R(RSCRATCH), Imm32(magic));
+					if (d != a)
+						MOV(32, gpr.R(d), gpr.R(a));
+					IMUL(64, gpr.RX(d), R(RSCRATCH));
+					ADD(64, gpr.R(d), R(RSCRATCH));
+					SHR(64, gpr.R(d), Imm8(shift+32));
+				}
+				else
+				{
+					// If success, use faster round-up method
+					gpr.Lock(a, b, d);
+					gpr.BindToRegister(a, true, false);
+					gpr.BindToRegister(d, false, true);
+					if (d == a)
+					{
+						MOV(32, R(RSCRATCH), Imm32(magic+1));
+						IMUL(64, gpr.RX(d), R(RSCRATCH));
+					}
+					else
+					{
+						MOV(32, gpr.R(d), Imm32(magic+1));
+						IMUL(64, gpr.RX(d), gpr.R(a));
+					}
+					SHR(64, gpr.R(d), Imm8(shift+32));
+				}
+			}
+			if (inst.OE)
+				GenerateConstantOverflow(false);
+		}
+	}
+	else
+	{
+		gpr.Lock(a, b, d);
+		// no register choice (do we need to do this?)
+		gpr.FlushLockX(EAX, EDX);
+		gpr.BindToRegister(d, (d == a || d == b), true);
+		MOV(32, R(EAX), gpr.R(a));
+		XOR(32, R(EDX), R(EDX));
+		gpr.KillImmediate(b, true, false);
+		CMP_or_TEST(32, gpr.R(b), Imm32(0));
+		FixupBranch not_div_by_zero = J_CC(CC_NZ);
+		MOV(32, gpr.R(d), R(EDX));
+		if (inst.OE)
+		{
+			GenerateConstantOverflow(true);
+		}
+		FixupBranch end = J();
+		SetJumpTarget(not_div_by_zero);
+		DIV(32, gpr.R(b));
+		MOV(32, gpr.R(d), R(EAX));
+		if (inst.OE)
+		{
+			GenerateConstantOverflow(false);
+		}
+		SetJumpTarget(end);
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::divwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		s32 i = gpr.R(a).SImm32(), j = gpr.R(b).SImm32();
+		if (j == 0 || (i == (s32)0x80000000 && j == -1))
+		{
+			gpr.SetImmediate32(d, (i >> 31) ^ j);
+			if (inst.OE)
+				GenerateConstantOverflow(true);
+		}
+		else
+		{
+			gpr.SetImmediate32(d, i / j);
+			if (inst.OE)
+				GenerateConstantOverflow(false);
+		}
+	}
+	else
+	{
+		gpr.Lock(a, b, d);
+		// no register choice
+		gpr.FlushLockX(EAX, EDX);
+		gpr.BindToRegister(d, (d == a || d == b), true);
+		MOV(32, R(EAX), gpr.R(a));
+		CDQ();
+		gpr.BindToRegister(b, true, false);
+		TEST(32, gpr.R(b), gpr.R(b));
+		FixupBranch not_div_by_zero = J_CC(CC_NZ);
+		MOV(32, gpr.R(d), R(EDX));
+		if (inst.OE)
+		{
+			GenerateConstantOverflow(true);
+		}
+		FixupBranch end1 = J();
+		SetJumpTarget(not_div_by_zero);
+		CMP(32, gpr.R(b), R(EDX));
+		FixupBranch not_div_by_neg_one = J_CC(CC_NZ);
+		MOV(32, gpr.R(d), R(EAX));
+		NEG(32, gpr.R(d));
+		FixupBranch no_overflow = J_CC(CC_NO);
+		XOR(32, gpr.R(d), gpr.R(d));
+		if (inst.OE)
+		{
+			GenerateConstantOverflow(true);
+		}
+		FixupBranch end2 = J();
+		SetJumpTarget(not_div_by_neg_one);
+		IDIV(32, gpr.R(b));
+		MOV(32, gpr.R(d), R(EAX));
+		SetJumpTarget(no_overflow);
+		if (inst.OE)
+		{
+			GenerateConstantOverflow(false);
+		}
+		SetJumpTarget(end1);
+		SetJumpTarget(end2);
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::addx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+	bool needs_test = false;
+
+	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
+	{
+		s32 i = gpr.R(a).SImm32(), j = gpr.R(b).SImm32();
+		gpr.SetImmediate32(d, i + j);
+		if (inst.OE)
+			GenerateConstantOverflow((s64)i + (s64)j);
+	}
+	else if ((d == a) || (d == b))
+	{
+		int operand = ((d == a) ? b : a);
+		gpr.Lock(a, b, d);
+		gpr.BindToRegister(d, true);
+		ADD(32, gpr.R(d), gpr.R(operand));
+		if (inst.OE)
+			GenerateOverflow();
+	}
+	else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.OE)
+	{
+		gpr.Lock(a, b, d);
+		gpr.BindToRegister(d, false);
+		LEA(32, gpr.RX(d), MRegSum(gpr.RX(a), gpr.RX(b)));
+		needs_test = true;
+	}
+	else
+	{
+		gpr.Lock(a, b, d);
+		gpr.BindToRegister(d, false);
+		MOV(32, gpr.R(d), gpr.R(a));
+		ADD(32, gpr.R(d), gpr.R(b));
+		if (inst.OE)
+			GenerateOverflow();
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), needs_test);
+	gpr.UnlockAll();
+}
+
+void Jit64::arithXex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	bool regsource = !(inst.SUBOP10 & 64); // addex or subfex
+	bool mex = !!(inst.SUBOP10 & 32);      // addmex/subfmex or addzex/subfzex
+	bool add = !!(inst.SUBOP10 & 2);       // add or sub
+	int a = inst.RA;
+	int b = regsource ? inst.RB : a;
+	int d = inst.RD;
+	bool same_input_sub = !add && regsource && a == b;
+
+	gpr.Lock(a, b, d);
+	gpr.BindToRegister(d, !same_input_sub && (d == a || d == b));
+	if (!js.carryFlagSet)
+		JitGetAndClearCAOV(inst.OE);
+	else
+		UnlockFlags();
+
+	bool invertedCarry = false;
+	// Special case: subfe A, B, B is a common compiler idiom
+	if (same_input_sub)
+	{
+		// Convert carry to borrow
+		if (!js.carryFlagInverted)
+			CMC();
+		SBB(32, gpr.R(d), gpr.R(d));
+		invertedCarry = true;
+	}
+	else if (!add && regsource && d == b)
+	{
+		if (!js.carryFlagInverted)
+			CMC();
+		if (d != b)
+			MOV(32, gpr.R(d), gpr.R(b));
+		SBB(32, gpr.R(d), gpr.R(a));
+		invertedCarry = true;
+	}
+	else
+	{
+		OpArg source = regsource ? gpr.R(d == b ? a : b) : Imm32(mex ? 0xFFFFFFFF : 0);
+		if (d != a && d != b)
+			MOV(32, gpr.R(d), gpr.R(a));
+		if (!add)
+			NOT(32, gpr.R(d));
+		// if the source is an immediate, we can invert carry by going from add -> sub and doing src = -1 - src
+		if (js.carryFlagInverted && source.IsImm())
+		{
+			source = Imm32(-1 - source.SImm32());
+			SBB(32, gpr.R(d), source);
+			invertedCarry = true;
+		}
+		else
+		{
+			if (js.carryFlagInverted)
+				CMC();
+			ADC(32, gpr.R(d), source);
+		}
+	}
+	FinalizeCarryOverflow(inst.OE, invertedCarry);
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), false);
+	gpr.UnlockAll();
+}
+
+void Jit64::arithcx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	bool add = !!(inst.SUBOP10 & 2); // add or sub
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+	gpr.Lock(a, b, d);
+	gpr.BindToRegister(d, d == a || d == b, true);
+
+	if (d == a && d != b)
+	{
+		if (add)
+		{
+			ADD(32, gpr.R(d), gpr.R(b));
+		}
+		else
+		{
+			// special case, because sub isn't reversible
+			MOV(32, R(RSCRATCH), gpr.R(a));
+			MOV(32, gpr.R(d), gpr.R(b));
+			SUB(32, gpr.R(d), R(RSCRATCH));
+		}
+	}
+	else
+	{
+		if (d != b)
+			MOV(32, gpr.R(d), gpr.R(b));
+		if (add)
+			ADD(32, gpr.R(d), gpr.R(a));
+		else
+			SUB(32, gpr.R(d), gpr.R(a));
+	}
+
+	FinalizeCarryOverflow(inst.OE, !add);
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), false);
+	gpr.UnlockAll();
+}
+
+void Jit64::rlwinmx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int s = inst.RS;
+
+	if (gpr.R(s).IsImm())
+	{
+		u32 result = gpr.R(s).Imm32();
+		if (inst.SH != 0)
+			result = _rotl(result, inst.SH);
+		result &= Helper_Mask(inst.MB, inst.ME);
+		gpr.SetImmediate32(a, result);
+		if (inst.Rc)
+			ComputeRC(gpr.R(a));
+	}
+	else
+	{
+		bool left_shift = inst.SH && inst.MB == 0 && inst.ME == 31 - inst.SH;
+		bool right_shift = inst.SH && inst.ME == 31 && inst.MB == 32 - inst.SH;
+		u32 mask = Helper_Mask(inst.MB, inst.ME);
+		bool simple_mask = mask == 0xff || mask == 0xffff;
+		// In case of a merged branch, track whether or not we've set flags.
+		// If not, we need to do a test later to get them.
+		bool needs_test = true;
+		// If we know the high bit can't be set, we can avoid doing a sign extend for flag storage.
+		bool needs_sext = true;
+		int mask_size = inst.ME - inst.MB + 1;
+
+		gpr.Lock(a, s);
+		gpr.BindToRegister(a, a == s);
+		if (a != s && left_shift && gpr.R(s).IsSimpleReg() && inst.SH <= 3)
+		{
+			LEA(32, gpr.RX(a), MScaled(gpr.RX(s), SCALE_1 << inst.SH, 0));
+		}
+		// common optimized case: byte/word extract
+		else if (simple_mask && !(inst.SH & (mask_size - 1)))
+		{
+			MOVZX(32, mask_size, gpr.RX(a), ExtractFromReg(s, inst.SH ? (32 - inst.SH) >> 3 : 0));
+			needs_sext = false;
+		}
+		// another optimized special case: byte/word extract plus shift
+		else if (((mask >> inst.SH) << inst.SH) == mask && !left_shift &&
+		         ((mask >> inst.SH) == 0xff || (mask >> inst.SH) == 0xffff))
+		{
+			MOVZX(32, mask_size, gpr.RX(a), gpr.R(s));
+			SHL(32, gpr.R(a), Imm8(inst.SH));
+			needs_sext = inst.SH + mask_size >= 32;
+		}
+		else
+		{
+			if (a != s)
+				MOV(32, gpr.R(a), gpr.R(s));
+
+			if (left_shift)
+			{
+				SHL(32, gpr.R(a), Imm8(inst.SH));
+			}
+			else if (right_shift)
+			{
+				SHR(32, gpr.R(a), Imm8(inst.MB));
+				needs_sext = false;
+			}
+			else
+			{
+				if (inst.SH != 0)
+					ROL(32, gpr.R(a), Imm8(inst.SH));
+				if (!(inst.MB == 0 && inst.ME == 31))
+				{
+					// we need flags if we're merging the branch
+					if (inst.Rc && CheckMergedBranch(0))
+						AND(32, gpr.R(a), Imm32(mask));
+					else
+						AndWithMask(gpr.RX(a), mask);
+					needs_sext = inst.MB == 0;
+					needs_test = false;
+				}
+			}
+		}
+		if (inst.Rc)
+			ComputeRC(gpr.R(a), needs_test, needs_sext);
+		gpr.UnlockAll();
+	}
+}
+
+
+void Jit64::rlwimix(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int s = inst.RS;
+
+	if (gpr.R(a).IsImm() && gpr.R(s).IsImm())
+	{
+		u32 mask = Helper_Mask(inst.MB,inst.ME);
+		gpr.SetImmediate32(a, (gpr.R(a).Imm32() & ~mask) | (_rotl(gpr.R(s).Imm32(),inst.SH) & mask));
+		if (inst.Rc)
+			ComputeRC(gpr.R(a));
+	}
+	else
+	{
+		gpr.Lock(a, s);
+		u32 mask = Helper_Mask(inst.MB, inst.ME);
+		bool needs_test = false;
+		if (mask == 0 || (a == s && inst.SH == 0))
+		{
+			needs_test = true;
+		}
+		else if (mask == 0xFFFFFFFF)
+		{
+			gpr.BindToRegister(a, a == s, true);
+			if (a != s)
+				MOV(32, gpr.R(a), gpr.R(s));
+			if (inst.SH)
+				ROL(32, gpr.R(a), Imm8(inst.SH));
+			needs_test = true;
+		}
+		else if(gpr.R(s).IsImm())
+		{
+			gpr.BindToRegister(a, true, true);
+			AndWithMask(gpr.RX(a), ~mask);
+			OR(32, gpr.R(a), Imm32(_rotl(gpr.R(s).Imm32(), inst.SH) & mask));
+		}
+		else if (inst.SH)
+		{
+			bool isLeftShift = mask == 0U - (1U << inst.SH);
+			bool isRightShift = mask == (1U << inst.SH) - 1;
+			if (gpr.R(a).IsImm())
+			{
+				u32 maskA = gpr.R(a).Imm32() & ~mask;
+				gpr.BindToRegister(a, false, true);
+				MOV(32, gpr.R(a), gpr.R(s));
+				if (isLeftShift)
+				{
+					SHL(32, gpr.R(a), Imm8(inst.SH));
+				}
+				else if (isRightShift)
+				{
+					SHR(32, gpr.R(a), Imm8(32 - inst.SH));
+				}
+				else
+				{
+					ROL(32, gpr.R(a), Imm8(inst.SH));
+					AND(32, gpr.R(a), Imm32(mask));
+				}
+				OR(32, gpr.R(a), Imm32(maskA));
+			}
+			else
+			{
+				// TODO: common cases of this might be faster with pinsrb or abuse of AH
+				gpr.BindToRegister(a, true, true);
+				MOV(32, R(RSCRATCH), gpr.R(s));
+				if (isLeftShift)
+				{
+					SHL(32, R(RSCRATCH), Imm8(inst.SH));
+					AndWithMask(gpr.RX(a), ~mask);
+					OR(32, gpr.R(a), R(RSCRATCH));
+				}
+				else if (isRightShift)
+				{
+					SHR(32, R(RSCRATCH), Imm8(32 - inst.SH));
+					AndWithMask(gpr.RX(a), ~mask);
+					OR(32, gpr.R(a), R(RSCRATCH));
+				}
+				else
+				{
+					ROL(32, R(RSCRATCH), Imm8(inst.SH));
+					XOR(32, R(RSCRATCH), gpr.R(a));
+					AndWithMask(RSCRATCH, mask);
+					XOR(32, gpr.R(a), R(RSCRATCH));
+				}
+			}
+		}
+		else
+		{
+			gpr.BindToRegister(a, true, true);
+			XOR(32, gpr.R(a), gpr.R(s));
+			AndWithMask(gpr.RX(a), ~mask);
+			XOR(32, gpr.R(a), gpr.R(s));
+		}
+		if (inst.Rc)
+			ComputeRC(gpr.R(a), needs_test);
+		gpr.UnlockAll();
+	}
+}
+
+void Jit64::rlwnmx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, b = inst.RB, s = inst.RS;
+
+	u32 mask = Helper_Mask(inst.MB, inst.ME);
+	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
+	{
+		gpr.SetImmediate32(a, _rotl(gpr.R(s).Imm32(), gpr.R(b).Imm32() & 0x1F) & mask);
+	}
+	else
+	{
+		// no register choice
+		gpr.FlushLockX(ECX);
+		gpr.Lock(a, b, s);
+		MOV(32, R(ECX), gpr.R(b));
+		gpr.BindToRegister(a, (a == s), true);
+		if (a != s)
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+		}
+		ROL(32, gpr.R(a), R(ECX));
+		// we need flags if we're merging the branch
+		if (inst.Rc && CheckMergedBranch(0))
+			AND(32, gpr.R(a), Imm32(mask));
+		else
+			AndWithMask(gpr.RX(a), mask);
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(a), false);
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::negx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int d = inst.RD;
+
+	if (gpr.R(a).IsImm())
+	{
+		gpr.SetImmediate32(d, ~(gpr.R(a).Imm32()) + 1);
+		if (inst.OE)
+			GenerateConstantOverflow(gpr.R(d).Imm32() == 0x80000000);
+	}
+	else
+	{
+		gpr.Lock(a, d);
+		gpr.BindToRegister(d, a == d, true);
+		if (a != d)
+			MOV(32, gpr.R(d), gpr.R(a));
+		NEG(32, gpr.R(d));
+		if (inst.OE)
+			GenerateOverflow();
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), false);
+	gpr.UnlockAll();
+}
+
+void Jit64::srwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int b = inst.RB;
+	int s = inst.RS;
+
+	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
+	{
+		u32 amount = gpr.R(b).Imm32();
+		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (gpr.R(s).Imm32() >> (amount & 0x1f)));
+	}
+	else
+	{
+		// no register choice
+		gpr.FlushLockX(ECX);
+		gpr.Lock(a, b, s);
+		MOV(32, R(ECX), gpr.R(b));
+		gpr.BindToRegister(a, a == s, true);
+		if (a != s)
+		{
+			MOV(32, gpr.R(a), gpr.R(s));
+		}
+		SHR(64, gpr.R(a), R(ECX));
+	}
+	// Shift of 0 doesn't update flags, so we need to test just in case
+	if (inst.Rc)
+		ComputeRC(gpr.R(a));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::slwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int b = inst.RB;
+	int s = inst.RS;
+
+	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
+	{
+		u32 amount = gpr.R(b).Imm32();
+		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : gpr.R(s).Imm32() << (amount & 0x1f));
+		if (inst.Rc)
+			ComputeRC(gpr.R(a));
+	}
+	else
+	{
+		// no register choice
+		gpr.FlushLockX(ECX);
+		gpr.Lock(a, b, s);
+		MOV(32, R(ECX), gpr.R(b));
+		gpr.BindToRegister(a, a == s, true);
+		if (a != s)
+			MOV(32, gpr.R(a), gpr.R(s));
+		SHL(64, gpr.R(a), R(ECX));
+		if (inst.Rc)
+		{
+			AND(32, gpr.R(a), gpr.R(a));
+			ComputeRC(gpr.R(a), false);
+		}
+		else
+		{
+			MOVZX(64, 32, gpr.RX(a), gpr.R(a));
+		}
+		gpr.UnlockAll();
+		gpr.UnlockAllX();
+	}
+}
+
+void Jit64::srawx(UGeckoInstruction inst)
+{
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int b = inst.RB;
+	int s = inst.RS;
+
+	gpr.FlushLockX(ECX);
+	gpr.Lock(a, s, b);
+	gpr.BindToRegister(a, (a == s || a == b), true);
+	MOV(32, R(ECX), gpr.R(b));
+	if (a != s)
+		MOV(32, gpr.R(a), gpr.R(s));
+	SHL(64, gpr.R(a), Imm8(32));
+	SAR(64, gpr.R(a), R(ECX));
+	if (js.op->wantsCA)
+	{
+		MOV(32, R(RSCRATCH), gpr.R(a));
+		SHR(64, gpr.R(a), Imm8(32));
+		TEST(32, gpr.R(a), R(RSCRATCH));
+	}
+	else
+	{
+		SHR(64, gpr.R(a), Imm8(32));
+	}
+	FinalizeCarry(CC_NZ);
+	if (inst.Rc)
+		ComputeRC(gpr.R(a));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::srawix(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int s = inst.RS;
+	int amount = inst.SH;
+
+	if (amount != 0)
+	{
+		gpr.Lock(a, s);
+		gpr.BindToRegister(a, a == s, true);
+		if (!js.op->wantsCA)
+		{
+			if (a != s)
+				MOV(32, gpr.R(a), gpr.R(s));
+			SAR(32, gpr.R(a), Imm8(amount));
+		}
+		else
+		{
+			MOV(32, R(RSCRATCH), gpr.R(s));
+			if (a != s)
+				MOV(32, gpr.R(a), R(RSCRATCH));
+			// some optimized common cases that can be done in slightly fewer ops
+			if (amount == 1)
+			{
+				SHR(32, R(RSCRATCH), Imm8(31));         // sign
+				AND(32, R(RSCRATCH), gpr.R(a));         // (sign && carry)
+				SAR(32, gpr.R(a), Imm8(1));
+				MOV(8, PPCSTATE(xer_ca), R(RSCRATCH));  // XER.CA = sign && carry, aka (input&0x80000001) == 0x80000001
+			}
+			else
+			{
+				SAR(32, gpr.R(a), Imm8(amount));
+				SHL(32, R(RSCRATCH), Imm8(32 - amount));
+				TEST(32, R(RSCRATCH), gpr.R(a));
+				FinalizeCarry(CC_NZ);
+			}
+		}
+	}
+	else
+	{
+		gpr.Lock(a, s);
+		FinalizeCarry(false);
+		gpr.BindToRegister(a, a == s, true);
+
+		if (a != s)
+			MOV(32, gpr.R(a), gpr.R(s));
+	}
+	if (inst.Rc)
+		ComputeRC(gpr.R(a));
+	gpr.UnlockAll();
+}
+
+// count leading zeroes
+void Jit64::cntlzwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int s = inst.RS;
+	bool needs_test = false;
+
+	if (gpr.R(s).IsImm())
+	{
+		u32 mask = 0x80000000;
+		u32 i = 0;
+		for (; i < 32; i++, mask >>= 1)
+		{
+			if (gpr.R(s).Imm32() & mask)
+				break;
+		}
+		gpr.SetImmediate32(a, i);
+	}
+	else
+	{
+		gpr.Lock(a, s);
+		gpr.BindToRegister(a, a == s, true);
+		if (cpu_info.bLZCNT)
+		{
+			LZCNT(32, gpr.RX(a), gpr.R(s));
+			needs_test = true;
+		}
+		else
+		{
+			BSR(32, gpr.RX(a), gpr.R(s));
+			FixupBranch gotone = J_CC(CC_NZ);
+			MOV(32, gpr.R(a), Imm32(63));
+			SetJumpTarget(gotone);
+			XOR(32, gpr.R(a), Imm8(0x1f));  // flip order
+		}
+	}
+
+	if (inst.Rc)
+		ComputeRC(gpr.R(a), needs_test, false);
+	gpr.UnlockAll();
+}
+
+void Jit64::twX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	s32 a = inst.RA;
+
+	if (inst.OPCD == 3) // twi
+	{
+		gpr.KillImmediate(a, true, false);
+		CMP(32, gpr.R(a), Imm32((s32)(s16)inst.SIMM_16));
+	}
+	else // tw
+	{
+		gpr.BindToRegister(a, true, false);
+		CMP(32, gpr.R(a), gpr.R(inst.RB));
+	}
+
+	std::vector<FixupBranch> fixups;
+	CCFlags conditions[] = { CC_A, CC_B, CC_E, CC_G, CC_L };
+
+	for (int i = 0; i < 5; i++)
+	{
+		if (inst.TO & (1 << i))
+		{
+			FixupBranch f = J_CC(conditions[i], true);
+			fixups.push_back(f);
+		}
+	}
+	FixupBranch dont_trap = J();
+
+	for (const FixupBranch& fixup : fixups)
+	{
+		SetJumpTarget(fixup);
+	}
+	LOCK();
+	OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_PROGRAM));
+
+	gpr.Flush(FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FLUSH_MAINTAIN_STATE);
+
+	WriteExceptionExit();
+
+	SetJumpTarget(dont_trap);
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush();
+		fpr.Flush();
+		WriteExit(js.compilerPC + 4);
+	}
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
new file mode 100644
index 0000000000..881b7cf338
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -0,0 +1,569 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
+// Should give a very noticable speed boost to paired single heavy code.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+void Jit64::lXXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	// Skip disabled JIT instructions
+	FALLBACK_IF(SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelbzxOff && (inst.OPCD == 31) && (inst.SUBOP10 == 87));
+	FALLBACK_IF(SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelXzOff && ((inst.OPCD == 34) || (inst.OPCD == 40) || (inst.OPCD == 32)));
+	FALLBACK_IF(SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelwzOff && (inst.OPCD == 32));
+
+	// Determine memory access size and sign extend
+	int accessSize = 0;
+	bool signExtend = false;
+	bool byte_reversed = false;
+	switch (inst.OPCD)
+	{
+	case 32: // lwz
+	case 33: // lwzu
+		accessSize = 32;
+		signExtend = false;
+		break;
+
+	case 34: // lbz
+	case 35: // lbzu
+		accessSize = 8;
+		signExtend = false;
+		break;
+
+	case 40: // lhz
+	case 41: // lhzu
+		accessSize = 16;
+		signExtend = false;
+		break;
+
+	case 42: // lha
+	case 43: // lhau
+		accessSize = 16;
+		signExtend = true;
+		break;
+
+	case 31:
+		switch (inst.SUBOP10)
+		{
+		case 534: // lwbrx
+			byte_reversed = true;
+		case 23: // lwzx
+		case 55: // lwzux
+			accessSize = 32;
+			signExtend = false;
+			break;
+
+		case 87:  // lbzx
+		case 119: // lbzux
+			accessSize = 8;
+			signExtend = false;
+			break;
+		case 790: // lhbrx
+			byte_reversed = true;
+		case 279: // lhzx
+		case 311: // lhzux
+			accessSize = 16;
+			signExtend = false;
+			break;
+
+		case 343: // lhax
+		case 375: // lhaux
+			accessSize = 16;
+			signExtend = true;
+			break;
+
+		default:
+			PanicAlert("Invalid instruction");
+		}
+		break;
+
+	default:
+		PanicAlert("Invalid instruction");
+	}
+
+	// PowerPC has no 8-bit sign extended load, but x86 does, so merge extsb with the load if we find it.
+	if (MergeAllowedNextInstructions(1) && accessSize == 8 && js.op[1].inst.OPCD == 31 && js.op[1].inst.SUBOP10 == 954 &&
+	    js.op[1].inst.RS == inst.RD && js.op[1].inst.RA == inst.RD && !js.op[1].inst.Rc)
+	{
+		js.downcountAmount++;
+		js.skipInstructions = 1;
+		signExtend = true;
+	}
+
+	// TODO(ector): Make it dynamically enable/disable idle skipping where appropriate
+	// Will give nice boost to dual core mode
+	// (mb2): I agree,
+	// IMHO those Idles should always be skipped and replaced by a more controllable "native" Idle methode
+	// ... maybe the throttle one already do that :p
+	// TODO: We shouldn't use a debug read here.  It should be possible to get
+	// the following instructions out of the JIT state.
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
+	    PowerPC::GetState() != PowerPC::CPU_STEPPING &&
+	    inst.OPCD == 32 &&
+	    MergeAllowedNextInstructions(2) &&
+	    (inst.hex & 0xFFFF0000) == 0x800D0000 &&
+	    (js.op[1].inst.hex == 0x28000000 ||
+	    (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && js.op[1].inst.hex == 0x2C000000)) &&
+	    js.op[2].inst.hex == 0x4182fff8)
+	{
+		// TODO(LinesPrower):
+		// - Rewrite this!
+		// It seems to be ugly and inefficient, but I don't know JIT stuff enough to make it right
+		// It only demonstrates the idea
+
+		// do our job at first
+		s32 offset = (s32)(s16)inst.SIMM_16;
+		gpr.BindToRegister(a, true, false);
+		gpr.BindToRegister(d, false, true);
+		SafeLoadToReg(gpr.RX(d), gpr.R(a), accessSize, offset, CallerSavedRegistersInUse(), signExtend);
+
+		// if it's still 0, we can wait until the next event
+		TEST(32, gpr.R(d), gpr.R(d));
+		FixupBranch noIdle = J_CC(CC_NZ);
+
+		BitSet32 registersInUse = CallerSavedRegistersInUse();
+		ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+
+		ABI_CallFunction((void *)&PowerPC::OnIdle);
+
+		ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+
+		// ! we must continue executing of the loop after exception handling, maybe there is still 0 in r0
+		//MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
+		WriteExceptionExit();
+
+		SetJumpTarget(noIdle);
+
+		//js.compilerPC += 8;
+		return;
+	}
+
+	// Determine whether this instruction updates inst.RA
+	bool update;
+	if (inst.OPCD == 31)
+		update = ((inst.SUBOP10 & 0x20) != 0) && (!gpr.R(b).IsImm() || gpr.R(b).Imm32() != 0);
+	else
+		update = ((inst.OPCD & 1) != 0) && inst.SIMM_16 != 0;
+
+	bool storeAddress = false;
+	s32 loadOffset = 0;
+
+	// Prepare address operand
+	Gen::OpArg opAddress;
+	if (!update && !a)
+	{
+		if (inst.OPCD == 31)
+		{
+			if (!gpr.R(b).IsImm())
+				gpr.BindToRegister(b, true, false);
+			opAddress = gpr.R(b);
+		}
+		else
+		{
+			opAddress = Imm32((u32)(s32)inst.SIMM_16);
+		}
+	}
+	else if (update && ((a == 0) || (d == a)))
+	{
+		PanicAlert("Invalid instruction");
+	}
+	else
+	{
+		if ((inst.OPCD != 31) && gpr.R(a).IsImm() && !jo.memcheck)
+		{
+			u32 val = gpr.R(a).Imm32() + inst.SIMM_16;
+			opAddress = Imm32(val);
+			if (update)
+				gpr.SetImmediate32(a, val);
+		}
+		else if ((inst.OPCD == 31) && gpr.R(a).IsImm() && gpr.R(b).IsImm() && !jo.memcheck)
+		{
+			u32 val = gpr.R(a).Imm32() + gpr.R(b).Imm32();
+			opAddress = Imm32(val);
+			if (update)
+				gpr.SetImmediate32(a, val);
+		}
+		else
+		{
+			// If we're using reg+reg mode and b is an immediate, pretend we're using constant offset mode
+			bool use_constant_offset = inst.OPCD != 31 || gpr.R(b).IsImm();
+
+			s32 offset;
+			if (use_constant_offset)
+				offset = inst.OPCD == 31 ? gpr.R(b).SImm32() : (s32)inst.SIMM_16;
+			// Depending on whether we have an immediate and/or update, find the optimum way to calculate
+			// the load address.
+			if ((update || use_constant_offset) && !jo.memcheck)
+			{
+				gpr.BindToRegister(a, true, update);
+				opAddress = gpr.R(a);
+				if (!use_constant_offset)
+					ADD(32, opAddress, gpr.R(b));
+				else if (update)
+					ADD(32, opAddress, Imm32((u32)offset));
+				else
+					loadOffset = offset;
+			}
+			else
+			{
+				// In this case we need an extra temporary register.
+				opAddress = R(RSCRATCH2);
+				storeAddress = true;
+				if (use_constant_offset)
+				{
+					if (gpr.R(a).IsSimpleReg() && offset != 0)
+					{
+						LEA(32, RSCRATCH2, MDisp(gpr.RX(a), offset));
+					}
+					else
+					{
+						MOV(32, opAddress, gpr.R(a));
+						if (offset != 0)
+							ADD(32, opAddress, Imm32((u32)offset));
+					}
+				}
+				else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+				{
+					LEA(32, RSCRATCH2, MRegSum(gpr.RX(a), gpr.RX(b)));
+				}
+				else
+				{
+					MOV(32, opAddress, gpr.R(a));
+					ADD(32, opAddress, gpr.R(b));
+				}
+			}
+		}
+	}
+
+	gpr.Lock(a, b, d);
+
+	if (update && storeAddress)
+		gpr.BindToRegister(a, true, true);
+
+	// A bit of an evil hack here. We need to retain the original value of this register for the
+	// exception path, but we'd rather not needlessly pass it around if we don't have to, since
+	// the exception path is very rare. So we store the value in the regcache, let the load path
+	// clobber it, then restore the value in the exception path.
+	// TODO: no other load has to do this at the moment, since no other loads go directly to the
+	// target registers, but if that ever changes, we need to do it there too.
+	if (jo.memcheck)
+	{
+		gpr.StoreFromRegister(d);
+		js.revertGprLoad = d;
+	}
+	gpr.BindToRegister(d, false, true);
+
+	BitSet32 registersInUse = CallerSavedRegistersInUse();
+	// We need to save the (usually scratch) address register for the update.
+	if (update && storeAddress)
+		registersInUse[RSCRATCH2] = true;
+
+	SafeLoadToReg(gpr.RX(d), opAddress, accessSize, loadOffset, registersInUse, signExtend);
+
+	if (update && storeAddress)
+	{
+		MemoryExceptionCheck();
+		MOV(32, gpr.R(a), opAddress);
+	}
+
+	// TODO: support no-swap in SafeLoadToReg instead
+	if (byte_reversed)
+	{
+		MemoryExceptionCheck();
+		BSWAP(accessSize, gpr.RX(d));
+	}
+
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::dcbt(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	// Prefetch. Since we don't emulate the data cache, we don't need to do anything.
+
+	// If a dcbst follows a dcbt, it probably isn't a case of dynamic code
+	// modification, so don't bother invalidating the jit block cache.
+	// This is important because invalidating the block cache when we don't
+	// need to is terrible for performance.
+	// (Invalidating the jit block cache on dcbst is a heuristic.)
+	if (MergeAllowedNextInstructions(1) &&
+	    js.op[1].inst.OPCD == 31 && js.op[1].inst.SUBOP10 == 54 &&
+	    js.op[1].inst.RA == inst.RA && js.op[1].inst.RB == inst.RB)
+	{
+		js.skipInstructions = 1;
+	}
+}
+
+// Zero cache line.
+void Jit64::dcbz(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDCBZOFF)
+		return;
+
+	int a = inst.RA;
+	int b = inst.RB;
+
+	u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
+
+	// The following masks the region used by the GC/Wii virtual memory lib
+	mem_mask |= Memory::ADDR_MASK_MEM1;
+
+	MOV(32, R(RSCRATCH), gpr.R(b));
+	if (a)
+		ADD(32, R(RSCRATCH), gpr.R(a));
+	AND(32, R(RSCRATCH), Imm32(~31));
+	TEST(32, R(RSCRATCH), Imm32(mem_mask));
+	FixupBranch slow = J_CC(CC_NZ, true);
+
+	// Should this code ever run? I can't find any games that use DCBZ on non-physical addresses, but
+	// supposedly there are, at least for some MMU titles. Let's be careful and support it to be sure.
+	SwitchToFarCode();
+		SetJumpTarget(slow);
+		MOV(32, M(&PC), Imm32(jit->js.compilerPC));
+		BitSet32 registersInUse = CallerSavedRegistersInUse();
+		ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+		ABI_CallFunctionR((void *)&PowerPC::ClearCacheLine, RSCRATCH);
+		ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+		FixupBranch exit = J(true);
+	SwitchToNearCode();
+
+	// Mask out the address so we don't write to MEM1 out of bounds
+	// FIXME: Work out why the AGP disc writes out of bounds
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		AND(32, R(RSCRATCH), Imm32(Memory::RAM_MASK));
+	PXOR(XMM0, R(XMM0));
+	MOVAPS(MComplex(RMEM, RSCRATCH, SCALE_1, 0), XMM0);
+	MOVAPS(MComplex(RMEM, RSCRATCH, SCALE_1, 16), XMM0);
+	SetJumpTarget(exit);
+}
+
+void Jit64::stX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	int s = inst.RS;
+	int a = inst.RA;
+	s32 offset = (s32)(s16)inst.SIMM_16;
+	bool update = (inst.OPCD & 1) && offset;
+
+	if (!a && update)
+		PanicAlert("Invalid stX");
+
+	int accessSize;
+	switch (inst.OPCD & ~1)
+	{
+	case 36: // stw
+		accessSize = 32;
+		break;
+	case 44: // sth
+		accessSize = 16;
+		break;
+	case 38: // stb
+		accessSize = 8;
+		break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "stX: Invalid access size.");
+		return;
+	}
+
+	// If we already know the address of the write
+	if (!a || gpr.R(a).IsImm())
+	{
+		u32 addr = (a ? gpr.R(a).Imm32() : 0) + offset;
+		bool exception = WriteToConstAddress(accessSize, gpr.R(s), addr, CallerSavedRegistersInUse());
+		if (update)
+		{
+			if (!jo.memcheck || !exception)
+			{
+				gpr.SetImmediate32(a, addr);
+			}
+			else
+			{
+				gpr.KillImmediate(a, true, true);
+				MemoryExceptionCheck();
+				ADD(32, gpr.R(a), Imm32((u32)offset));
+			}
+		}
+	}
+	else
+	{
+		gpr.Lock(a, s);
+		gpr.BindToRegister(a, true, update);
+		if (gpr.R(s).IsImm())
+		{
+			SafeWriteRegToReg(gpr.R(s), gpr.RX(a), accessSize, offset, CallerSavedRegistersInUse(), SAFE_LOADSTORE_CLOBBER_RSCRATCH_INSTEAD_OF_ADDR);
+		}
+		else
+		{
+			X64Reg reg_value;
+			if (WriteClobbersRegValue(accessSize, /* swap */ true))
+			{
+				MOV(32, R(RSCRATCH2), gpr.R(s));
+				reg_value = RSCRATCH2;
+			}
+			else
+			{
+				gpr.BindToRegister(s, true, false);
+				reg_value = gpr.RX(s);
+			}
+			SafeWriteRegToReg(reg_value, gpr.RX(a), accessSize, offset, CallerSavedRegistersInUse(), SAFE_LOADSTORE_CLOBBER_RSCRATCH_INSTEAD_OF_ADDR);
+		}
+
+		if (update)
+		{
+			MemoryExceptionCheck();
+			ADD(32, gpr.R(a), Imm32((u32)offset));
+		}
+	}
+	gpr.UnlockAll();
+}
+
+void Jit64::stXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	int a = inst.RA, b = inst.RB, s = inst.RS;
+	bool update = !!(inst.SUBOP10 & 32);
+	bool byte_reverse = !!(inst.SUBOP10 & 512);
+	FALLBACK_IF(!a || (update && a == s) || (update && jo.memcheck && a == b));
+
+	gpr.Lock(a, b, s);
+
+	if (update)
+		gpr.BindToRegister(a, true, true);
+
+	if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+	{
+		LEA(32, RSCRATCH2, MRegSum(gpr.RX(a), gpr.RX(b)));
+	}
+	else
+	{
+		MOV(32, R(RSCRATCH2), gpr.R(a));
+		ADD(32, R(RSCRATCH2), gpr.R(b));
+	}
+
+	int accessSize;
+	switch (inst.SUBOP10 & ~32)
+	{
+		case 151:
+		case 662:
+			accessSize = 32;
+			break;
+		case 407:
+		case 918:
+			accessSize = 16;
+			break;
+		case 215:
+			accessSize = 8;
+			break;
+		default:
+			PanicAlert("stXx: invalid access size");
+			accessSize = 0;
+			break;
+	}
+
+	if (gpr.R(s).IsImm())
+	{
+		BitSet32 registersInUse = CallerSavedRegistersInUse();
+		if (update)
+			registersInUse[RSCRATCH2] = true;
+		SafeWriteRegToReg(gpr.R(s), RSCRATCH2, accessSize, 0, registersInUse, byte_reverse ? SAFE_LOADSTORE_NO_SWAP : 0);
+	}
+	else
+	{
+		X64Reg reg_value;
+		if (WriteClobbersRegValue(accessSize, /* swap */ !byte_reverse))
+		{
+			MOV(32, R(RSCRATCH), gpr.R(s));
+			reg_value = RSCRATCH;
+		}
+		else
+		{
+			gpr.BindToRegister(s, true, false);
+			reg_value = gpr.RX(s);
+		}
+		BitSet32 registersInUse = CallerSavedRegistersInUse();
+		if (update)
+			registersInUse[RSCRATCH2] = true;
+		SafeWriteRegToReg(reg_value, RSCRATCH2, accessSize, 0, registersInUse, byte_reverse ? SAFE_LOADSTORE_NO_SWAP : 0);
+	}
+
+	if (update)
+	{
+		MemoryExceptionCheck();
+		MOV(32, gpr.R(a), R(RSCRATCH2));
+	}
+
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+// A few games use these heavily in video codecs.
+void Jit64::lmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	// TODO: This doesn't handle rollback on DSI correctly
+	MOV(32, R(RSCRATCH2), Imm32((u32)(s32)inst.SIMM_16));
+	if (inst.RA)
+		ADD(32, R(RSCRATCH2), gpr.R(inst.RA));
+	for (int i = inst.RD; i < 32; i++)
+	{
+		SafeLoadToReg(RSCRATCH, R(RSCRATCH2), 32, (i - inst.RD) * 4, CallerSavedRegistersInUse() | BitSet32 { RSCRATCH2 }, false);
+		gpr.BindToRegister(i, false, true);
+		MOV(32, gpr.R(i), R(RSCRATCH));
+	}
+	gpr.UnlockAllX();
+}
+
+void Jit64::stmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	// TODO: This doesn't handle rollback on DSI correctly
+	for (int i = inst.RD; i < 32; i++)
+	{
+		if (inst.RA)
+			MOV(32, R(RSCRATCH), gpr.R(inst.RA));
+		else
+			XOR(32, R(RSCRATCH), R(RSCRATCH));
+		if (gpr.R(i).IsImm())
+		{
+			SafeWriteRegToReg(gpr.R(i), RSCRATCH, 32, (i - inst.RD) * 4 + (u32)(s32)inst.SIMM_16, CallerSavedRegistersInUse());
+		}
+		else
+		{
+			MOV(32, R(RSCRATCH2), gpr.R(i));
+			SafeWriteRegToReg(RSCRATCH2, RSCRATCH, 32, (i - inst.RD) * 4 + (u32)(s32)inst.SIMM_16, CallerSavedRegistersInUse());
+		}
+	}
+	gpr.UnlockAllX();
+}
+
+void Jit64::icbi(UGeckoInstruction inst)
+{
+	FallBackToInterpreter(inst);
+	WriteExit(js.compilerPC + 4);
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
new file mode 100644
index 0000000000..7101d378da
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
@@ -0,0 +1,222 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+// TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common,
+// and pshufb could help a lot.
+
+void Jit64::lfXXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	bool indexed = inst.OPCD == 31;
+	bool update = indexed ? !!(inst.SUBOP10 & 0x20) : !!(inst.OPCD & 1);
+	bool single = indexed ? !(inst.SUBOP10 & 0x40) : !(inst.OPCD & 2);
+	update &= indexed || inst.SIMM_16;
+
+	int d = inst.RD;
+	int a = inst.RA;
+	int b = inst.RB;
+
+	FALLBACK_IF(!indexed && !a);
+
+	gpr.BindToRegister(a, true, update);
+
+	s32 offset = 0;
+	OpArg addr = gpr.R(a);
+	if (update && jo.memcheck)
+	{
+		addr = R(RSCRATCH2);
+		MOV(32, addr, gpr.R(a));
+	}
+	if (indexed)
+	{
+		if (update)
+		{
+			ADD(32, addr, gpr.R(b));
+		}
+		else
+		{
+			addr = R(RSCRATCH2);
+			if (a && gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+				LEA(32, RSCRATCH2, MRegSum(gpr.RX(a), gpr.RX(b)));
+			else
+			{
+				MOV(32, addr, gpr.R(b));
+				if (a)
+					ADD(32, addr, gpr.R(a));
+			}
+		}
+	}
+	else
+	{
+		if (update)
+			ADD(32, addr, Imm32((s32)(s16)inst.SIMM_16));
+		else
+			offset = (s16)inst.SIMM_16;
+	}
+
+	fpr.Lock(d);
+	if (jo.memcheck && single)
+	{
+		fpr.StoreFromRegister(d);
+		js.revertFprLoad = d;
+	}
+	fpr.BindToRegister(d, !single);
+	BitSet32 registersInUse = CallerSavedRegistersInUse();
+	if (update && jo.memcheck)
+		registersInUse[RSCRATCH2] = true;
+	SafeLoadToReg(RSCRATCH, addr, single ? 32 : 64, offset, registersInUse, false);
+
+	MemoryExceptionCheck();
+	if (single)
+	{
+		ConvertSingleToDouble(fpr.RX(d), RSCRATCH, true);
+	}
+	else
+	{
+		MOVQ_xmm(XMM0, R(RSCRATCH));
+		MOVSD(fpr.RX(d), R(XMM0));
+	}
+	if (update && jo.memcheck)
+		MOV(32, gpr.R(a), addr);
+	fpr.UnlockAll();
+	gpr.UnlockAll();
+}
+
+void Jit64::stfXXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	bool indexed = inst.OPCD == 31;
+	bool update = indexed ? !!(inst.SUBOP10&0x20) : !!(inst.OPCD&1);
+	bool single = indexed ? !(inst.SUBOP10&0x40) : !(inst.OPCD&2);
+	update &= indexed || inst.SIMM_16;
+
+	int s = inst.RS;
+	int a = inst.RA;
+	int b = inst.RB;
+	s32 imm = (s16)inst.SIMM_16;
+	int accessSize = single ? 32 : 64;
+
+	FALLBACK_IF(update && jo.memcheck && a == b);
+
+	if (single)
+	{
+		if (jit->js.op->fprIsStoreSafe[s])
+		{
+			CVTSD2SS(XMM0, fpr.R(s));
+		}
+		else
+		{
+			fpr.BindToRegister(s, true, false);
+			ConvertDoubleToSingle(XMM0, fpr.RX(s));
+		}
+		MOVD_xmm(R(RSCRATCH), XMM0);
+	}
+	else
+	{
+		if (fpr.R(s).IsSimpleReg())
+			MOVQ_xmm(R(RSCRATCH), fpr.RX(s));
+		else
+			MOV(64, R(RSCRATCH), fpr.R(s));
+	}
+
+	if (!indexed && (!a || gpr.R(a).IsImm()))
+	{
+		u32 addr = (a ? gpr.R(a).Imm32() : 0) + imm;
+		bool exception = WriteToConstAddress(accessSize, R(RSCRATCH), addr, CallerSavedRegistersInUse());
+
+		if (update)
+		{
+			if (!jo.memcheck || !exception)
+			{
+				gpr.SetImmediate32(a, addr);
+			}
+			else
+			{
+				gpr.KillImmediate(a, true, true);
+				MemoryExceptionCheck();
+				ADD(32, gpr.R(a), Imm32((u32)imm));
+			}
+		}
+		fpr.UnlockAll();
+		gpr.UnlockAll();
+		return;
+	}
+
+	s32 offset = 0;
+	if (update)
+		gpr.BindToRegister(a, true, true);
+	if (indexed)
+	{
+		if (a && gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+			LEA(32, RSCRATCH2, MRegSum(gpr.RX(a), gpr.RX(b)));
+		else
+		{
+			MOV(32, R(RSCRATCH2), gpr.R(b));
+			if (a)
+				ADD(32, R(RSCRATCH2), gpr.R(a));
+		}
+	}
+	else
+	{
+		if (update)
+		{
+			LEA(32, RSCRATCH2, MDisp(gpr.RX(a), imm));
+		}
+		else
+		{
+			offset = imm;
+			MOV(32, R(RSCRATCH2), gpr.R(a));
+		}
+	}
+
+	BitSet32 registersInUse = CallerSavedRegistersInUse();
+	// We need to save the (usually scratch) address register for the update.
+	if (update)
+		registersInUse[RSCRATCH2] = true;
+
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH2, accessSize, offset, registersInUse);
+
+	if (update)
+	{
+		MemoryExceptionCheck();
+		MOV(32, gpr.R(a), R(RSCRATCH2));
+	}
+
+	fpr.UnlockAll();
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+// This one is a little bit weird; it stores the low 32 bits of a double without converting it
+void Jit64::stfiwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+
+	int s = inst.RS;
+	int a = inst.RA;
+	int b = inst.RB;
+
+	MOV(32, R(RSCRATCH2), gpr.R(b));
+	if (a)
+		ADD(32, R(RSCRATCH2), gpr.R(a));
+
+	if (fpr.R(s).IsSimpleReg())
+		MOVD_xmm(R(RSCRATCH), fpr.RX(s));
+	else
+		MOV(32, R(RSCRATCH), fpr.R(s));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH2, 32, 0, CallerSavedRegistersInUse());
+	gpr.UnlockAllX();
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
new file mode 100644
index 0000000000..824e7f96e6
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
@@ -0,0 +1,323 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
+// Should give a very noticeable speed boost to paired single heavy code.
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
+
+using namespace Gen;
+
+// The big problem is likely instructions that set the quantizers in the same block.
+// We will have to break block after quantizers are written to.
+void Jit64::psq_stXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+
+	s32 offset = inst.SIMM_12;
+	bool indexed = inst.OPCD == 4;
+	bool update = (inst.OPCD == 61 && offset) || (inst.OPCD == 4 && !!(inst.SUBOP6 & 32));
+	int a = inst.RA;
+	int b = indexed ? inst.RB : a;
+	int s = inst.FS;
+	int i = indexed ? inst.Ix : inst.I;
+	int w = indexed ? inst.Wx : inst.W;
+	FALLBACK_IF(!a);
+
+	gpr.Lock(a, b);
+	if (js.assumeNoPairedQuantize)
+	{
+		int storeOffset = 0;
+		gpr.BindToRegister(a, true, update);
+		X64Reg addr = gpr.RX(a);
+		// TODO: this is kind of ugly :/ we should probably create a universal load/store address calculation
+		// function that handles all these weird cases, e.g. how non-fastmem loadstores clobber addresses.
+		bool storeAddress = (update && jo.memcheck) || !jo.fastmem;
+		if (storeAddress)
+		{
+			addr = RSCRATCH2;
+			MOV(32, R(addr), gpr.R(a));
+		}
+		if (indexed)
+		{
+			if (update)
+			{
+				ADD(32, R(addr), gpr.R(b));
+			}
+			else
+			{
+				addr = RSCRATCH2;
+				if (a && gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+				{
+					LEA(32, addr, MRegSum(gpr.RX(a), gpr.RX(b)));
+				}
+				else
+				{
+					MOV(32, R(addr), gpr.R(b));
+					if (a)
+						ADD(32, R(addr), gpr.R(a));
+				}
+			}
+		}
+		else
+		{
+			if (update)
+				ADD(32, R(addr), Imm32(offset));
+			else
+				storeOffset = offset;
+		}
+
+		fpr.Lock(s);
+		if (w)
+		{
+			CVTSD2SS(XMM0, fpr.R(s));
+			MOVD_xmm(R(RSCRATCH), XMM0);
+		}
+		else
+		{
+			CVTPD2PS(XMM0, fpr.R(s));
+			MOVQ_xmm(R(RSCRATCH), XMM0);
+			ROL(64, R(RSCRATCH), Imm8(32));
+		}
+
+		BitSet32 registersInUse = CallerSavedRegistersInUse();
+		if (update && storeAddress)
+			registersInUse[addr] = true;
+		SafeWriteRegToReg(RSCRATCH, addr, w ? 32 : 64, storeOffset, registersInUse);
+		MemoryExceptionCheck();
+		if (update && storeAddress)
+			MOV(32, gpr.R(a), R(addr));
+		gpr.UnlockAll();
+		fpr.UnlockAll();
+		return;
+	}
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	if (update)
+		gpr.BindToRegister(a, true, true);
+	if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && (indexed || offset))
+	{
+		if (indexed)
+			LEA(32, RSCRATCH_EXTRA, MRegSum(gpr.RX(a), gpr.RX(b)));
+		else
+			LEA(32, RSCRATCH_EXTRA, MDisp(gpr.RX(a), offset));
+	}
+	else
+	{
+		MOV(32, R(RSCRATCH_EXTRA), gpr.R(a));
+		if (indexed)
+			ADD(32, R(RSCRATCH_EXTRA), gpr.R(b));
+		else if (offset)
+			ADD(32, R(RSCRATCH_EXTRA), Imm32((u32)offset));
+	}
+	// In memcheck mode, don't update the address until the exception check
+	if (update && !jo.memcheck)
+		MOV(32, gpr.R(a), R(RSCRATCH_EXTRA));
+	// Some games (e.g. Dirt 2) incorrectly set the unused bits which breaks the lookup table code.
+	// Hence, we need to mask out the unused bits. The layout of the GQR register is
+	// UU[SCALE]UUUUU[TYPE] where SCALE is 6 bits and TYPE is 3 bits, so we have to AND with
+	// 0b0011111100000111, or 0x3F07.
+	MOV(32, R(RSCRATCH2), Imm32(0x3F07));
+	AND(32, R(RSCRATCH2), PPCSTATE(spr[SPR_GQR0 + i]));
+	MOVZX(32, 8, RSCRATCH, R(RSCRATCH2));
+
+	if (w)
+	{
+		// One value
+		CVTSD2SS(XMM0, fpr.R(s));
+		CALLptr(MPIC(asm_routines.singleStoreQuantized, RSCRATCH, SCALE_8));
+	}
+	else
+	{
+		// Pair of values
+		CVTPD2PS(XMM0, fpr.R(s));
+		CALLptr(MPIC(asm_routines.pairedStoreQuantized, RSCRATCH, SCALE_8));
+	}
+
+	if (update && jo.memcheck)
+	{
+		MemoryExceptionCheck();
+		if (indexed)
+			ADD(32, gpr.R(a), gpr.R(b));
+		else
+			ADD(32, gpr.R(a), Imm32((u32)offset));
+	}
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::psq_lXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+
+	s32 offset = inst.SIMM_12;
+	bool indexed = inst.OPCD == 4;
+	bool update = (inst.OPCD == 57 && offset) || (inst.OPCD == 4 && !!(inst.SUBOP6 & 32));
+	int a = inst.RA;
+	int b = indexed ? inst.RB : a;
+	int s = inst.FS;
+	int i = indexed ? inst.Ix : inst.I;
+	int w = indexed ? inst.Wx : inst.W;
+	FALLBACK_IF(!a);
+
+	gpr.Lock(a, b);
+	if (js.assumeNoPairedQuantize)
+	{
+		s32 loadOffset = 0;
+		gpr.BindToRegister(a, true, update);
+		X64Reg addr = gpr.RX(a);
+		if (update && jo.memcheck)
+		{
+			addr = RSCRATCH2;
+			MOV(32, R(addr), gpr.R(a));
+		}
+		if (indexed)
+		{
+			if (update)
+			{
+				ADD(32, R(addr), gpr.R(b));
+			}
+			else
+			{
+				addr = RSCRATCH2;
+				if (a && gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg())
+				{
+					LEA(32, addr, MRegSum(gpr.RX(a), gpr.RX(b)));
+				}
+				else
+				{
+					MOV(32, R(addr), gpr.R(b));
+					if (a)
+						ADD(32, R(addr), gpr.R(a));
+				}
+			}
+		}
+		else
+		{
+			if (update)
+				ADD(32, R(addr), Imm32(offset));
+			else
+				loadOffset = offset;
+		}
+
+		fpr.Lock(s);
+		if (jo.memcheck)
+		{
+			fpr.StoreFromRegister(s);
+			js.revertFprLoad = s;
+		}
+		fpr.BindToRegister(s, false);
+
+		// Let's mirror the JitAsmCommon code and assume all non-MMU loads go to RAM.
+		if (!jo.memcheck)
+		{
+			if (w)
+			{
+				if (cpu_info.bSSSE3)
+				{
+					MOVD_xmm(XMM0, MComplex(RMEM, addr, SCALE_1, loadOffset));
+					PSHUFB(XMM0, M(pbswapShuffle1x4));
+					UNPCKLPS(XMM0, M(m_one));
+				}
+				else
+				{
+					LoadAndSwap(32, RSCRATCH, MComplex(RMEM, addr, SCALE_1, loadOffset));
+					MOVD_xmm(XMM0, R(RSCRATCH));
+					UNPCKLPS(XMM0, M(m_one));
+				}
+			}
+			else
+			{
+				if (cpu_info.bSSSE3)
+				{
+					MOVQ_xmm(XMM0, MComplex(RMEM, addr, SCALE_1, loadOffset));
+					PSHUFB(XMM0, M(pbswapShuffle2x4));
+				}
+				else
+				{
+					LoadAndSwap(64, RSCRATCH, MComplex(RMEM, addr, SCALE_1, loadOffset));
+					ROL(64, R(RSCRATCH), Imm8(32));
+					MOVQ_xmm(XMM0, R(RSCRATCH));
+				}
+			}
+			CVTPS2PD(fpr.RX(s), R(XMM0));
+		}
+		else
+		{
+			BitSet32 registersInUse = CallerSavedRegistersInUse();
+			registersInUse[fpr.RX(s) << 16] = false;
+			if (update)
+				registersInUse[addr] = true;
+			SafeLoadToReg(RSCRATCH, R(addr), w ? 32 : 64, loadOffset, registersInUse, false);
+			MemoryExceptionCheck();
+			if (w)
+			{
+				MOVD_xmm(XMM0, R(RSCRATCH));
+				UNPCKLPS(XMM0, M(m_one));
+			}
+			else
+			{
+				ROL(64, R(RSCRATCH), Imm8(32));
+				MOVQ_xmm(XMM0, R(RSCRATCH));
+			}
+			CVTPS2PD(fpr.RX(s), R(XMM0));
+			if (update)
+				MOV(32, gpr.R(a), R(addr));
+		}
+		gpr.UnlockAll();
+		fpr.UnlockAll();
+		return;
+	}
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	gpr.BindToRegister(a, true, update);
+	fpr.BindToRegister(s, false, true);
+	if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && (indexed || offset))
+	{
+		if (indexed)
+			LEA(32, RSCRATCH_EXTRA, MRegSum(gpr.RX(a), gpr.RX(b)));
+		else
+			LEA(32, RSCRATCH_EXTRA, MDisp(gpr.RX(a), offset));
+	}
+	else
+	{
+		MOV(32, R(RSCRATCH_EXTRA), gpr.R(a));
+		if (indexed)
+			ADD(32, R(RSCRATCH_EXTRA), gpr.R(b));
+		else if (offset)
+			ADD(32, R(RSCRATCH_EXTRA), Imm32((u32)offset));
+	}
+	// In memcheck mode, don't update the address until the exception check
+	if (update && !jo.memcheck)
+		MOV(32, gpr.R(a), R(RSCRATCH_EXTRA));
+	MOV(32, R(RSCRATCH2), Imm32(0x3F07));
+
+	// Get the high part of the GQR register
+	OpArg gqr = PPCSTATE(spr[SPR_GQR0 + i]);
+	gqr.AddMemOffset(2);
+
+	AND(32, R(RSCRATCH2), gqr);
+	MOVZX(32, 8, RSCRATCH, R(RSCRATCH2));
+
+	CALLptr(MPIC(&asm_routines.pairedLoadQuantized[w * 8], RSCRATCH, SCALE_8));
+
+	MemoryExceptionCheck();
+	CVTPS2PD(fpr.RX(s), R(XMM0));
+	if (update && jo.memcheck)
+	{
+		if (indexed)
+			ADD(32, gpr.R(a), gpr.R(b));
+		else
+			ADD(32, gpr.R(a), Imm32((u32)offset));
+	}
+
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp
new file mode 100644
index 0000000000..a985d265ac
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp
@@ -0,0 +1,203 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+void Jit64::ps_mr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int b = inst.FB;
+	if (d == b)
+		return;
+
+	fpr.BindToRegister(d, false);
+	MOVAPD(fpr.RX(d), fpr.R(b));
+}
+
+void Jit64::ps_sum(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int a = inst.FA;
+	int b = inst.FB;
+	int c = inst.FC;
+	fpr.Lock(a, b, c, d);
+	OpArg op_a = fpr.R(a);
+	fpr.BindToRegister(d, d == b || d == c);
+	X64Reg tmp = XMM1;
+	MOVDDUP(tmp, op_a);   // {a.ps0, a.ps0}
+	ADDPD(tmp, fpr.R(b)); // {a.ps0 + b.ps0, a.ps0 + b.ps1}
+	switch (inst.SUBOP5)
+	{
+	case 10: // ps_sum0: {a.ps0 + b.ps1, c.ps1}
+		UNPCKHPD(tmp, fpr.R(c));
+		break;
+	case 11: // ps_sum1: {c.ps0, a.ps0 + b.ps1}
+		if (fpr.R(c).IsSimpleReg())
+		{
+			if (cpu_info.bSSE4_1)
+			{
+				BLENDPD(tmp, fpr.R(c), 1);
+			}
+			else
+			{
+				MOVAPD(XMM0, fpr.R(c));
+				SHUFPD(XMM0, R(tmp), 2);
+				tmp = XMM0;
+			}
+		}
+		else
+		{
+			MOVLPD(tmp, fpr.R(c));
+		}
+		break;
+	default:
+		PanicAlert("ps_sum WTF!!!");
+	}
+	HandleNaNs(inst, fpr.RX(d), tmp);
+	ForceSinglePrecision(fpr.RX(d), fpr.R(d));
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+}
+
+
+void Jit64::ps_muls(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int a = inst.FA;
+	int c = inst.FC;
+	bool round_input = !jit->js.op->fprIsSingle[c];
+	fpr.Lock(a, c, d);
+	switch (inst.SUBOP5)
+	{
+	case 12: // ps_muls0
+		MOVDDUP(XMM1, fpr.R(c));
+		break;
+	case 13: // ps_muls1
+		avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, XMM1, fpr.R(c), fpr.R(c), 3);
+		break;
+	default:
+		PanicAlert("ps_muls WTF!!!");
+	}
+	if (round_input)
+		Force25BitPrecision(XMM1, R(XMM1), XMM0);
+	MULPD(XMM1, fpr.R(a));
+	fpr.BindToRegister(d, false);
+	HandleNaNs(inst, fpr.RX(d), XMM1);
+	ForceSinglePrecision(fpr.RX(d), fpr.R(d));
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+}
+
+
+void Jit64::ps_mergeXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	int d = inst.FD;
+	int a = inst.FA;
+	int b = inst.FB;
+	fpr.Lock(a, b, d);
+	fpr.BindToRegister(d, d == a || d == b);
+
+	switch (inst.SUBOP10)
+	{
+	case 528:
+		avx_op(&XEmitter::VUNPCKLPD, &XEmitter::UNPCKLPD, fpr.RX(d), fpr.R(a), fpr.R(b));
+		break; //00
+	case 560:
+		avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, fpr.RX(d), fpr.R(a), fpr.R(b), 2);
+		break; //01
+	case 592:
+		avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, fpr.RX(d), fpr.R(a), fpr.R(b), 1);
+		break; //10
+	case 624:
+		avx_op(&XEmitter::VUNPCKHPD, &XEmitter::UNPCKHPD, fpr.RX(d), fpr.R(a), fpr.R(b));
+		break; //11
+	default:
+		_assert_msg_(DYNA_REC, 0, "ps_merge - invalid op");
+	}
+	fpr.UnlockAll();
+}
+
+void Jit64::ps_rsqrte(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+	int b = inst.FB;
+	int d = inst.FD;
+
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	fpr.Lock(b, d);
+	fpr.BindToRegister(b, true, false);
+	fpr.BindToRegister(d, false);
+
+	MOVSD(XMM0, fpr.R(b));
+	CALL((void *)asm_routines.frsqrte);
+	MOVSD(fpr.R(d), XMM0);
+
+	MOVHLPS(XMM0, fpr.RX(b));
+	CALL((void *)asm_routines.frsqrte);
+	MOVLHPS(fpr.RX(d), XMM0);
+
+	ForceSinglePrecision(fpr.RX(d), fpr.R(d));
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::ps_res(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+	int b = inst.FB;
+	int d = inst.FD;
+
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	fpr.Lock(b, d);
+	fpr.BindToRegister(b, true, false);
+	fpr.BindToRegister(d, false);
+
+	MOVSD(XMM0, fpr.R(b));
+	CALL((void *)asm_routines.fres);
+	MOVSD(fpr.R(d), XMM0);
+
+	MOVHLPS(XMM0, fpr.RX(b));
+	CALL((void *)asm_routines.fres);
+	MOVLHPS(fpr.RX(d), XMM0);
+
+	ForceSinglePrecision(fpr.RX(d), fpr.R(d));
+	SetFPRFIfNeeded(fpr.RX(d));
+	fpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::ps_cmpXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+
+	FloatCompare(inst, !!(inst.SUBOP10 & 64));
+}
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
new file mode 100644
index 0000000000..e798237311
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -0,0 +1,559 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/JitRegCache.h"
+
+using namespace Gen;
+
+void Jit64::GetCRFieldBit(int field, int bit, Gen::X64Reg out, bool negate)
+{
+	switch (bit)
+	{
+	case CR_SO_BIT:  // check bit 61 set
+		BT(64, PPCSTATE(cr_val[field]), Imm8(61));
+		SETcc(negate ? CC_NC : CC_C, R(out));
+		break;
+
+	case CR_EQ_BIT:  // check bits 31-0 == 0
+		CMP(32, PPCSTATE(cr_val[field]), Imm8(0));
+		SETcc(negate ? CC_NZ : CC_Z, R(out));
+		break;
+
+	case CR_GT_BIT:  // check val > 0
+		CMP(64, PPCSTATE(cr_val[field]), Imm8(0));
+		SETcc(negate ? CC_NG : CC_G, R(out));
+		break;
+
+	case CR_LT_BIT:  // check bit 62 set
+		BT(64, PPCSTATE(cr_val[field]), Imm8(62));
+		SETcc(negate ? CC_NC : CC_C, R(out));
+		break;
+
+	default:
+		_assert_msg_(DYNA_REC, false, "Invalid CR bit");
+	}
+}
+
+void Jit64::SetCRFieldBit(int field, int bit, Gen::X64Reg in)
+{
+	MOV(64, R(RSCRATCH2), PPCSTATE(cr_val[field]));
+	MOVZX(32, 8, in, R(in));
+
+	// Gross but necessary; if the input is totally zero and we set SO or LT,
+	// or even just add the (1<<32), GT will suddenly end up set without us
+	// intending to. This can break actual games, so fix it up.
+	if (bit != CR_GT_BIT)
+	{
+		TEST(64, R(RSCRATCH2), R(RSCRATCH2));
+		FixupBranch dont_clear_gt = J_CC(CC_NZ);
+		BTS(64, R(RSCRATCH2), Imm8(63));
+		SetJumpTarget(dont_clear_gt);
+	}
+
+	switch (bit)
+	{
+	case CR_SO_BIT:  // set bit 61 to input
+		BTR(64, R(RSCRATCH2), Imm8(61));
+		SHL(64, R(in), Imm8(61));
+		OR(64, R(RSCRATCH2), R(in));
+		break;
+
+	case CR_EQ_BIT:  // clear low 32 bits, set bit 0 to !input
+		SHR(64, R(RSCRATCH2), Imm8(32));
+		SHL(64, R(RSCRATCH2), Imm8(32));
+		XOR(32, R(in), Imm8(1));
+		OR(64, R(RSCRATCH2), R(in));
+		break;
+
+	case CR_GT_BIT:  // set bit 63 to !input
+		BTR(64, R(RSCRATCH2), Imm8(63));
+		NOT(32, R(in));
+		SHL(64, R(in), Imm8(63));
+		OR(64, R(RSCRATCH2), R(in));
+		break;
+
+	case CR_LT_BIT:  // set bit 62 to input
+		BTR(64, R(RSCRATCH2), Imm8(62));
+		SHL(64, R(in), Imm8(62));
+		OR(64, R(RSCRATCH2), R(in));
+		break;
+	}
+
+	BTS(64, R(RSCRATCH2), Imm8(32));
+	MOV(64, PPCSTATE(cr_val[field]), R(RSCRATCH2));
+}
+
+void Jit64::ClearCRFieldBit(int field, int bit)
+{
+	switch (bit)
+	{
+	case CR_SO_BIT:
+		BTR(64, PPCSTATE(cr_val[field]), Imm8(61));
+		break;
+
+	case CR_EQ_BIT:
+		OR(64, PPCSTATE(cr_val[field]), Imm8(1));
+		break;
+
+	case CR_GT_BIT:
+		BTS(64, PPCSTATE(cr_val[field]), Imm8(63));
+		break;
+
+	case CR_LT_BIT:
+		BTR(64, PPCSTATE(cr_val[field]), Imm8(62));
+		break;
+	}
+	// We don't need to set bit 32; the cases where that's needed only come up when setting bits, not clearing.
+}
+
+void Jit64::SetCRFieldBit(int field, int bit)
+{
+	MOV(64, R(RSCRATCH), PPCSTATE(cr_val[field]));
+	if (bit != CR_GT_BIT)
+	{
+		TEST(64, R(RSCRATCH), R(RSCRATCH));
+		FixupBranch dont_clear_gt = J_CC(CC_NZ);
+		BTS(64, R(RSCRATCH), Imm8(63));
+		SetJumpTarget(dont_clear_gt);
+	}
+
+	switch (bit)
+	{
+	case CR_SO_BIT:
+		BTS(64, PPCSTATE(cr_val[field]), Imm8(61));
+		break;
+
+	case CR_EQ_BIT:
+		SHR(64, R(RSCRATCH), Imm8(32));
+		SHL(64, R(RSCRATCH), Imm8(32));
+		break;
+
+	case CR_GT_BIT:
+		BTR(64, PPCSTATE(cr_val[field]), Imm8(63));
+		break;
+
+	case CR_LT_BIT:
+		BTS(64, PPCSTATE(cr_val[field]), Imm8(62));
+		break;
+	}
+
+	BTS(64, R(RSCRATCH), Imm8(32));
+	MOV(64, PPCSTATE(cr_val[field]), R(RSCRATCH));
+}
+
+FixupBranch Jit64::JumpIfCRFieldBit(int field, int bit, bool jump_if_set)
+{
+	switch (bit)
+	{
+	case CR_SO_BIT:  // check bit 61 set
+		BT(64, PPCSTATE(cr_val[field]), Imm8(61));
+		return J_CC(jump_if_set ? CC_C : CC_NC, true);
+
+	case CR_EQ_BIT:  // check bits 31-0 == 0
+		CMP(32, PPCSTATE(cr_val[field]), Imm8(0));
+		return J_CC(jump_if_set ? CC_Z : CC_NZ, true);
+
+	case CR_GT_BIT:  // check val > 0
+		CMP(64, PPCSTATE(cr_val[field]), Imm8(0));
+		return J_CC(jump_if_set ? CC_G : CC_LE, true);
+
+	case CR_LT_BIT:  // check bit 62 set
+		BT(64, PPCSTATE(cr_val[field]), Imm8(62));
+		return J_CC(jump_if_set ? CC_C : CC_NC, true);
+
+	default:
+		_assert_msg_(DYNA_REC, false, "Invalid CR bit");
+	}
+
+	// Should never happen.
+	return FixupBranch();
+}
+
+void Jit64::mtspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+	int d = inst.RD;
+
+	switch (iIndex)
+	{
+	case SPR_DMAU:
+
+	case SPR_SPRG0:
+	case SPR_SPRG1:
+	case SPR_SPRG2:
+	case SPR_SPRG3:
+
+	case SPR_SRR0:
+	case SPR_SRR1:
+		// These are safe to do the easy way, see the bottom of this function.
+		break;
+
+	case SPR_LR:
+	case SPR_CTR:
+		// These are safe to do the easy way, see the bottom of this function.
+		break;
+
+	case SPR_GQR0:
+	case SPR_GQR0 + 1:
+	case SPR_GQR0 + 2:
+	case SPR_GQR0 + 3:
+	case SPR_GQR0 + 4:
+	case SPR_GQR0 + 5:
+	case SPR_GQR0 + 6:
+	case SPR_GQR0 + 7:
+		// These are safe to do the easy way, see the bottom of this function.
+		break;
+
+	case SPR_XER:
+		gpr.Lock(d);
+		gpr.BindToRegister(d, true, false);
+		MOV(32, R(RSCRATCH), gpr.R(d));
+		AND(32, R(RSCRATCH), Imm32(0xff7f));
+		MOV(16, PPCSTATE(xer_stringctrl), R(RSCRATCH));
+
+		MOV(32, R(RSCRATCH), gpr.R(d));
+		SHR(32, R(RSCRATCH), Imm8(XER_CA_SHIFT));
+		AND(8, R(RSCRATCH), Imm8(1));
+		MOV(8, PPCSTATE(xer_ca), R(RSCRATCH));
+
+		MOV(32, R(RSCRATCH), gpr.R(d));
+		SHR(32, R(RSCRATCH), Imm8(XER_OV_SHIFT));
+		MOV(8, PPCSTATE(xer_so_ov), R(RSCRATCH));
+		gpr.UnlockAll();
+		return;
+
+	default:
+		FALLBACK_IF(true);
+	}
+
+	// OK, this is easy.
+	if (!gpr.R(d).IsImm())
+	{
+		gpr.Lock(d);
+		gpr.BindToRegister(d, true, false);
+	}
+	MOV(32, PPCSTATE(spr[iIndex]), gpr.R(d));
+	gpr.UnlockAll();
+}
+
+void Jit64::mfspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+	int d = inst.RD;
+	switch (iIndex)
+	{
+	case SPR_TL:
+	case SPR_TU:
+	{
+		// TODO: we really only need to call GetFakeTimeBase once per JIT block; this matters because
+		// typical use of this instruction is to call it three times, e.g. mftbu/mftbl/mftbu/cmpw/bne
+		// to deal with possible timer wraparound. This makes the second two (out of three) completely
+		// redundant for the JIT.
+		// no register choice
+
+		gpr.FlushLockX(RDX, RAX);
+
+		// An inline implementation of CoreTiming::GetFakeTimeBase, since in timer-heavy games the
+		// cost of calling out to C for this is actually significant.
+		MOV(64, R(RAX), M(&CoreTiming::globalTimer));
+		SUB(64, R(RAX), M(&CoreTiming::fakeTBStartTicks));
+		// It might seem convenient to correct the timer for the block position here for even more accurate
+		// timing, but as of currently, this can break games. If we end up reading a time *after* the time
+		// at which an interrupt was supposed to occur, e.g. because we're 100 cycles into a block with only
+		// 50 downcount remaining, some games don't function correctly, such as Karaoke Party Revolution,
+		// which won't get past the loading screen.
+		//if (js.downcountAmount)
+		//	ADD(64, R(RAX), Imm32(js.downcountAmount));
+		// a / 12 = (a * 0xAAAAAAAAAAAAAAAB) >> 67
+		MOV(64, R(RDX), Imm64(0xAAAAAAAAAAAAAAABULL));
+		MUL(64, R(RDX));
+		MOV(64, R(RAX), M(&CoreTiming::fakeTBStartValue));
+		SHR(64, R(RDX), Imm8(3));
+		ADD(64, R(RAX), R(RDX));
+		MOV(64, PPCSTATE(spr[SPR_TL]), R(RAX));
+
+		if (MergeAllowedNextInstructions(1))
+		{
+			const UGeckoInstruction& next = js.op[1].inst;
+			// Two calls of TU/TL next to each other are extremely common in typical usage, so merge them
+			// if we can.
+			u32 nextIndex = (next.SPRU << 5) | (next.SPRL & 0x1F);
+			// Be careful; the actual opcode is for mftb (371), not mfspr (339)
+			int n = next.RD;
+			if (next.OPCD == 31 && next.SUBOP10 == 371 && (nextIndex == SPR_TU || nextIndex == SPR_TL) && n != d)
+			{
+				js.downcountAmount++;
+				js.skipInstructions = 1;
+				gpr.Lock(d, n);
+				gpr.BindToRegister(d, false);
+				gpr.BindToRegister(n, false);
+				if (iIndex == SPR_TL)
+					MOV(32, gpr.R(d), R(RAX));
+				if (nextIndex == SPR_TL)
+					MOV(32, gpr.R(n), R(RAX));
+				SHR(64, R(RAX), Imm8(32));
+				if (iIndex == SPR_TU)
+					MOV(32, gpr.R(d), R(RAX));
+				if (nextIndex == SPR_TU)
+					MOV(32, gpr.R(n), R(RAX));
+				break;
+			}
+		}
+		gpr.Lock(d);
+		gpr.BindToRegister(d, false);
+		if (iIndex == SPR_TU)
+			SHR(64, R(RAX), Imm8(32));
+		MOV(32, gpr.R(d), R(RAX));
+		break;
+	}
+	case SPR_XER:
+		gpr.Lock(d);
+		gpr.BindToRegister(d, false);
+		MOVZX(32, 16, gpr.RX(d), PPCSTATE(xer_stringctrl));
+		MOVZX(32, 8, RSCRATCH, PPCSTATE(xer_ca));
+		SHL(32, R(RSCRATCH), Imm8(XER_CA_SHIFT));
+		OR(32, gpr.R(d), R(RSCRATCH));
+
+		MOVZX(32, 8, RSCRATCH, PPCSTATE(xer_so_ov));
+		SHL(32, R(RSCRATCH), Imm8(XER_OV_SHIFT));
+		OR(32, gpr.R(d), R(RSCRATCH));
+		break;
+	case SPR_WPAR:
+	case SPR_DEC:
+	case SPR_PMC1:
+	case SPR_PMC2:
+	case SPR_PMC3:
+	case SPR_PMC4:
+		FALLBACK_IF(true);
+	default:
+		gpr.Lock(d);
+		gpr.BindToRegister(d, false);
+		MOV(32, gpr.R(d), PPCSTATE(spr[iIndex]));
+		break;
+	}
+	gpr.UnlockAllX();
+	gpr.UnlockAll();
+}
+
+void Jit64::mtmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	// Don't interpret this, if we do we get thrown out
+	//JITDISABLE(bJITSystemRegistersOff);
+	if (!gpr.R(inst.RS).IsImm())
+	{
+		gpr.Lock(inst.RS);
+		gpr.BindToRegister(inst.RS, true, false);
+	}
+	MOV(32, PPCSTATE(msr), gpr.R(inst.RS));
+	gpr.UnlockAll();
+	gpr.Flush();
+	fpr.Flush();
+
+	// If some exceptions are pending and EE are now enabled, force checking
+	// external exceptions when going out of mtmsr in order to execute delayed
+	// interrupts as soon as possible.
+	TEST(32, PPCSTATE(msr), Imm32(0x8000));
+	FixupBranch eeDisabled = J_CC(CC_Z);
+
+	TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_EXTERNAL_INT | EXCEPTION_PERFORMANCE_MONITOR | EXCEPTION_DECREMENTER));
+	FixupBranch noExceptionsPending = J_CC(CC_Z);
+
+	// Check if a CP interrupt is waiting and keep the GPU emulation in sync (issue 4336)
+	TEST(32, M(&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP));
+	FixupBranch cpInt = J_CC(CC_NZ);
+
+	MOV(32, PPCSTATE(pc), Imm32(js.compilerPC + 4));
+	WriteExternalExceptionExit();
+
+	SetJumpTarget(cpInt);
+	SetJumpTarget(noExceptionsPending);
+	SetJumpTarget(eeDisabled);
+
+	MOV(32, R(RSCRATCH), Imm32(js.compilerPC + 4));
+	WriteExitDestInRSCRATCH();
+}
+
+void Jit64::mfmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	//Privileged?
+	gpr.Lock(inst.RD);
+	gpr.BindToRegister(inst.RD, false, true);
+	MOV(32, gpr.R(inst.RD), PPCSTATE(msr));
+	gpr.UnlockAll();
+}
+
+void Jit64::mftb(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	mfspr(inst);
+}
+
+void Jit64::mfcr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	int d = inst.RD;
+	gpr.FlushLockX(RSCRATCH_EXTRA);
+	CALL((void *)asm_routines.mfcr);
+	gpr.Lock(d);
+	gpr.BindToRegister(d, false, true);
+	MOV(32, gpr.R(d), R(RSCRATCH));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+}
+
+void Jit64::mtcrf(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	// USES_CR
+	u32 crm = inst.CRM;
+	if (crm != 0)
+	{
+		if (gpr.R(inst.RS).IsImm())
+		{
+			for (int i = 0; i < 8; i++)
+			{
+				if ((crm & (0x80 >> i)) != 0)
+				{
+					u8 newcr = (gpr.R(inst.RS).Imm32() >> (28 - (i * 4))) & 0xF;
+					u64 newcrval = PPCCRToInternal(newcr);
+					if ((s64)newcrval == (s32)newcrval)
+					{
+						MOV(64, PPCSTATE(cr_val[i]), Imm32((s32)newcrval));
+					}
+					else
+					{
+						MOV(64, R(RSCRATCH), Imm64(newcrval));
+						MOV(64, PPCSTATE(cr_val[i]), R(RSCRATCH));
+					}
+				}
+			}
+		}
+		else
+		{
+			gpr.Lock(inst.RS);
+			gpr.BindToRegister(inst.RS, true, false);
+			for (int i = 0; i < 8; i++)
+			{
+				if ((crm & (0x80 >> i)) != 0)
+				{
+					MOV(32, R(RSCRATCH), gpr.R(inst.RS));
+					if (i != 7)
+						SHR(32, R(RSCRATCH), Imm8(28 - (i * 4)));
+					if (i != 0)
+						AND(32, R(RSCRATCH), Imm8(0xF));
+					MOV(64, R(RSCRATCH), MPIC(m_crTable, RSCRATCH, SCALE_8));
+					MOV(64, PPCSTATE(cr_val[i]), R(RSCRATCH));
+				}
+			}
+			gpr.UnlockAll();
+		}
+	}
+}
+
+void Jit64::mcrf(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	// USES_CR
+	if (inst.CRFS != inst.CRFD)
+	{
+		MOV(64, R(RSCRATCH), PPCSTATE(cr_val[inst.CRFS]));
+		MOV(64, PPCSTATE(cr_val[inst.CRFD]), R(RSCRATCH));
+	}
+}
+
+void Jit64::mcrxr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	// Copy XER[0-3] into CR[inst.CRFD]
+	MOVZX(32, 8, RSCRATCH, PPCSTATE(xer_ca));
+	MOVZX(32, 8, RSCRATCH2, PPCSTATE(xer_so_ov));
+	// [0 SO OV CA]
+	LEA(32, RSCRATCH, MComplex(RSCRATCH, RSCRATCH2, SCALE_2, 0));
+	// [SO OV CA 0] << 3
+	SHL(32, R(RSCRATCH), Imm8(4));
+
+	MOV(64, R(RSCRATCH), MPIC(m_crTable, RSCRATCH));
+	MOV(64, PPCSTATE(cr_val[inst.CRFD]), R(RSCRATCH));
+
+	// Clear XER[0-3]
+	MOV(8, PPCSTATE(xer_ca), Imm8(0));
+	MOV(8, PPCSTATE(xer_so_ov), Imm8(0));
+}
+
+void Jit64::crXXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	_dbg_assert_msg_(DYNA_REC, inst.OPCD == 19, "Invalid crXXX");
+
+	// Special case: crclr
+	if (inst.CRBA == inst.CRBB && inst.CRBA == inst.CRBD && inst.SUBOP10 == 193)
+	{
+		ClearCRFieldBit(inst.CRBD >> 2, 3 - (inst.CRBD & 3));
+		return;
+	}
+
+	// Special case: crset
+	if (inst.CRBA == inst.CRBB && inst.CRBA == inst.CRBD && inst.SUBOP10 == 289)
+	{
+		SetCRFieldBit(inst.CRBD >> 2, 3 - (inst.CRBD & 3));
+		return;
+	}
+
+	// TODO(delroth): Potential optimizations could be applied here. For
+	// instance, if the two CR bits being loaded are the same, two loads are
+	// not required.
+
+	// creqv or crnand or crnor
+	bool negateA = inst.SUBOP10 == 289 || inst.SUBOP10 == 225 || inst.SUBOP10 == 33;
+	// crandc or crorc or crnand or crnor
+	bool negateB = inst.SUBOP10 == 129 || inst.SUBOP10 == 417 || inst.SUBOP10 == 225 || inst.SUBOP10 == 33;
+
+	GetCRFieldBit(inst.CRBA >> 2, 3 - (inst.CRBA & 3), RSCRATCH, negateA);
+	GetCRFieldBit(inst.CRBB >> 2, 3 - (inst.CRBB & 3), RSCRATCH2, negateB);
+
+	// Compute combined bit
+	switch (inst.SUBOP10)
+	{
+	case 33:  // crnor: ~(A || B) == (~A && ~B)
+	case 129: // crandc: A && ~B
+	case 257: // crand:  A && B
+		AND(8, R(RSCRATCH), R(RSCRATCH2));
+		break;
+
+	case 193: // crxor: A ^ B
+	case 289: // creqv: ~(A ^ B) = ~A ^ B
+		XOR(8, R(RSCRATCH), R(RSCRATCH2));
+		break;
+
+	case 225: // crnand: ~(A && B) == (~A || ~B)
+	case 417: // crorc: A || ~B
+	case 449: // cror:  A || B
+		OR(8, R(RSCRATCH), R(RSCRATCH2));
+		break;
+	}
+
+	// Store result bit in CRBD
+	SetCRFieldBit(inst.CRBD >> 2, 3 - (inst.CRBD & 3), RSCRATCH);
+}
diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
new file mode 100644
index 0000000000..d7fb70f5fe
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
@@ -0,0 +1,629 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/JitRegister.h"
+#include "Common/MathUtil.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#define QUANTIZED_REGS_TO_SAVE \
+	(ABI_ALL_CALLER_SAVED & ~BitSet32 { \
+		RSCRATCH, RSCRATCH2, RSCRATCH_EXTRA, XMM0+16, XMM1+16 \
+	})
+
+#define QUANTIZED_REGS_TO_SAVE_LOAD (QUANTIZED_REGS_TO_SAVE | BitSet32 { RSCRATCH2 })
+
+using namespace Gen;
+
+void CommonAsmRoutines::GenFifoWrite(int size)
+{
+	const void* start = GetCodePtr();
+
+	// Assume value in RSCRATCH
+	MOV(32, R(RSCRATCH2), M(&GPFifo::m_gatherPipeCount));
+	SwapAndStore(size, MPIC(GPFifo::m_gatherPipe, RSCRATCH2), RSCRATCH);
+	ADD(32, R(RSCRATCH2), Imm8(size >> 3));
+	MOV(32, M(&GPFifo::m_gatherPipeCount), R(RSCRATCH2));
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_FifoWrite_%i", size);
+}
+
+void CommonAsmRoutines::GenFrsqrte()
+{
+	const void* start = GetCodePtr();
+
+	// Assume input in XMM0.
+	// This function clobbers all three RSCRATCH.
+	MOVQ_xmm(R(RSCRATCH), XMM0);
+
+	// Negative and zero inputs set an exception and take the complex path.
+	TEST(64, R(RSCRATCH), R(RSCRATCH));
+	FixupBranch zero = J_CC(CC_Z, true);
+	FixupBranch negative = J_CC(CC_S, true);
+	MOV(64, R(RSCRATCH_EXTRA), R(RSCRATCH));
+	SHR(64, R(RSCRATCH_EXTRA), Imm8(52));
+
+	// Zero and max exponents (non-normal floats) take the complex path.
+	FixupBranch complex1 = J_CC(CC_Z, true);
+	CMP(32, R(RSCRATCH_EXTRA), Imm32(0x7FF));
+	FixupBranch complex2 = J_CC(CC_E, true);
+
+	SUB(32, R(RSCRATCH_EXTRA), Imm32(0x3FD));
+	SAR(32, R(RSCRATCH_EXTRA), Imm8(1));
+	MOV(32, R(RSCRATCH2), Imm32(0x3FF));
+	SUB(32, R(RSCRATCH2), R(RSCRATCH_EXTRA));
+	SHL(64, R(RSCRATCH2), Imm8(52));   // exponent = ((0x3FFLL << 52) - ((exponent - (0x3FELL << 52)) / 2)) & (0x7FFLL << 52);
+
+	MOV(64, R(RSCRATCH_EXTRA), R(RSCRATCH));
+	SHR(64, R(RSCRATCH_EXTRA), Imm8(48));
+	AND(32, R(RSCRATCH_EXTRA), Imm8(0x1F));
+	XOR(32, R(RSCRATCH_EXTRA), Imm8(0x10)); // int index = i / 2048 + (odd_exponent ? 16 : 0);
+
+	SHR(64, R(RSCRATCH), Imm8(37));
+	AND(32, R(RSCRATCH), Imm32(0x7FF));
+	IMUL(32, RSCRATCH, MPIC(MathUtil::frsqrte_expected_dec, RSCRATCH_EXTRA, SCALE_4));
+	MOV(32, R(RSCRATCH_EXTRA), MPIC(MathUtil::frsqrte_expected_base, RSCRATCH_EXTRA, SCALE_4));
+	SUB(32, R(RSCRATCH_EXTRA), R(RSCRATCH));
+	SHL(64, R(RSCRATCH_EXTRA), Imm8(26));
+	OR(64, R(RSCRATCH2), R(RSCRATCH_EXTRA));     // vali |= (s64)(frsqrte_expected_base[index] - frsqrte_expected_dec[index] * (i % 2048)) << 26;
+	MOVQ_xmm(XMM0, R(RSCRATCH2));
+	RET();
+
+	// Exception flags for zero input.
+	SetJumpTarget(zero);
+	TEST(32, PPCSTATE(fpscr), Imm32(FPSCR_ZX));
+	FixupBranch skip_set_fx1 = J_CC(CC_NZ);
+	OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX | FPSCR_ZX));
+	FixupBranch complex3 = J();
+
+	// Exception flags for negative input.
+	SetJumpTarget(negative);
+	TEST(32, PPCSTATE(fpscr), Imm32(FPSCR_VXSQRT));
+	FixupBranch skip_set_fx2 = J_CC(CC_NZ);
+	OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX | FPSCR_VXSQRT));
+
+	SetJumpTarget(skip_set_fx1);
+	SetJumpTarget(skip_set_fx2);
+	SetJumpTarget(complex1);
+	SetJumpTarget(complex2);
+	SetJumpTarget(complex3);
+	ABI_PushRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
+	ABI_CallFunction((void *)&MathUtil::ApproximateReciprocalSquareRoot);
+	ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_Frsqrte");
+}
+
+void CommonAsmRoutines::GenFres()
+{
+	const void* start = GetCodePtr();
+
+	// Assume input in XMM0.
+	// This function clobbers all three RSCRATCH.
+	MOVQ_xmm(R(RSCRATCH), XMM0);
+
+	// Zero inputs set an exception and take the complex path.
+	TEST(64, R(RSCRATCH), R(RSCRATCH));
+	FixupBranch zero = J_CC(CC_Z);
+
+	MOV(64, R(RSCRATCH_EXTRA), R(RSCRATCH));
+	SHR(64, R(RSCRATCH_EXTRA), Imm8(52));
+	MOV(32, R(RSCRATCH2), R(RSCRATCH_EXTRA));
+	AND(32, R(RSCRATCH_EXTRA), Imm32(0x7FF)); // exp
+	AND(32, R(RSCRATCH2), Imm32(0x800)); // sign
+	CMP(32, R(RSCRATCH_EXTRA), Imm32(895));
+	// Take the complex path for very large/small exponents.
+	FixupBranch complex1 = J_CC(CC_L);
+	CMP(32, R(RSCRATCH_EXTRA), Imm32(1149));
+	FixupBranch complex2 = J_CC(CC_GE);
+
+	SUB(32, R(RSCRATCH_EXTRA), Imm32(0x7FD));
+	NEG(32, R(RSCRATCH_EXTRA));
+	OR(32, R(RSCRATCH_EXTRA), R(RSCRATCH2));
+	SHL(64, R(RSCRATCH_EXTRA), Imm8(52));	   // vali = sign | exponent
+
+	MOV(64, R(RSCRATCH2), R(RSCRATCH));
+	SHR(64, R(RSCRATCH), Imm8(37));
+	SHR(64, R(RSCRATCH2), Imm8(47));
+	AND(32, R(RSCRATCH), Imm32(0x3FF)); // i % 1024
+	AND(32, R(RSCRATCH2), Imm8(0x1F));   // i / 1024
+
+	IMUL(32, RSCRATCH, MPIC(MathUtil::fres_expected_dec, RSCRATCH2, SCALE_4));
+	ADD(32, R(RSCRATCH), Imm8(1));
+	SHR(32, R(RSCRATCH), Imm8(1));
+
+	MOV(32, R(RSCRATCH2), MPIC(MathUtil::fres_expected_base, RSCRATCH2, SCALE_4));
+	SUB(32, R(RSCRATCH2), R(RSCRATCH));
+	SHL(64, R(RSCRATCH2), Imm8(29));
+	OR(64, R(RSCRATCH2), R(RSCRATCH_EXTRA));     // vali |= (s64)(fres_expected_base[i / 1024] - (fres_expected_dec[i / 1024] * (i % 1024) + 1) / 2) << 29
+	MOVQ_xmm(XMM0, R(RSCRATCH2));
+	RET();
+
+	// Exception flags for zero input.
+	SetJumpTarget(zero);
+	TEST(32, PPCSTATE(fpscr), Imm32(FPSCR_ZX));
+	FixupBranch skip_set_fx1 = J_CC(CC_NZ);
+	OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX | FPSCR_ZX));
+	SetJumpTarget(skip_set_fx1);
+
+	SetJumpTarget(complex1);
+	SetJumpTarget(complex2);
+	ABI_PushRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
+	ABI_CallFunction((void *)&MathUtil::ApproximateReciprocal);
+	ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_Fres");
+}
+
+void CommonAsmRoutines::GenMfcr()
+{
+	const void* start = GetCodePtr();
+
+	// Input: none
+	// Output: RSCRATCH
+	// This function clobbers all three RSCRATCH.
+	X64Reg dst = RSCRATCH;
+	X64Reg tmp = RSCRATCH2;
+	X64Reg cr_val = RSCRATCH_EXTRA;
+	XOR(32, R(dst), R(dst));
+	// we only need to zero the high bits of tmp once
+	XOR(32, R(tmp), R(tmp));
+	for (int i = 0; i < 8; i++)
+	{
+		static const u32 m_flagTable[8] = { 0x0, 0x1, 0x8, 0x9, 0x0, 0x1, 0x8, 0x9 };
+		if (i != 0)
+			SHL(32, R(dst), Imm8(4));
+
+		MOV(64, R(cr_val), PPCSTATE(cr_val[i]));
+
+		// EQ: Bits 31-0 == 0; set flag bit 1
+		TEST(32, R(cr_val), R(cr_val));
+		// FIXME: is there a better way to do this without the partial register merging?
+		SETcc(CC_Z, R(tmp));
+		LEA(32, dst, MComplex(dst, tmp, SCALE_2, 0));
+
+		// GT: Value > 0; set flag bit 2
+		TEST(64, R(cr_val), R(cr_val));
+		SETcc(CC_G, R(tmp));
+		LEA(32, dst, MComplex(dst, tmp, SCALE_4, 0));
+
+		// SO: Bit 61 set; set flag bit 0
+		// LT: Bit 62 set; set flag bit 3
+		SHR(64, R(cr_val), Imm8(61));
+		OR(32, R(dst), MPIC(m_flagTable, cr_val, SCALE_4));
+	}
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_Mfcr");
+}
+
+// Safe + Fast Quantizers, originally from JITIL by magumagu
+static const float GC_ALIGNED16(m_65535[4]) = {65535.0f, 65535.0f, 65535.0f, 65535.0f};
+static const float GC_ALIGNED16(m_32767) = 32767.0f;
+static const float GC_ALIGNED16(m_m32768) = -32768.0f;
+static const float GC_ALIGNED16(m_255) = 255.0f;
+static const float GC_ALIGNED16(m_127) = 127.0f;
+static const float GC_ALIGNED16(m_m128) = -128.0f;
+
+#define QUANTIZE_OVERFLOW_SAFE
+
+// according to Intel Docs CVTPS2DQ writes 0x80000000 if the source floating point value is out of int32 range
+// while it's OK for large negatives, it isn't for positives
+// I don't know whether the overflow actually happens in any games
+// but it potentially can cause problems, so we need some clamping
+
+// See comment in header for in/outs.
+void CommonAsmRoutines::GenQuantizedStores()
+{
+	const void* start = GetCodePtr();
+
+	const u8* storePairedIllegal = AlignCode4();
+	UD2();
+
+	const u8* storePairedFloat = AlignCode4();
+	if (cpu_info.bSSSE3)
+	{
+		PSHUFB(XMM0, M((void *)pbswapShuffle2x4));
+		MOVQ_xmm(R(RSCRATCH), XMM0);
+	}
+	else
+	{
+		MOVQ_xmm(R(RSCRATCH), XMM0);
+		ROL(64, R(RSCRATCH), Imm8(32));
+		BSWAP(64, RSCRATCH);
+	}
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 64, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+
+	RET();
+
+	const u8* storePairedU8 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_quantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+#ifdef QUANTIZE_OVERFLOW_SAFE
+	MINPS(XMM0, M(m_65535));
+#endif
+	CVTTPS2DQ(XMM0, R(XMM0));
+	PACKSSDW(XMM0, R(XMM0));
+	PACKUSWB(XMM0, R(XMM0));
+	MOVD_xmm(R(RSCRATCH), XMM0);
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 16, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+
+	RET();
+
+	const u8* storePairedS8 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_quantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+#ifdef QUANTIZE_OVERFLOW_SAFE
+	MINPS(XMM0, M(m_65535));
+#endif
+	CVTTPS2DQ(XMM0, R(XMM0));
+	PACKSSDW(XMM0, R(XMM0));
+	PACKSSWB(XMM0, R(XMM0));
+	MOVD_xmm(R(RSCRATCH), XMM0);
+
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 16, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+
+	RET();
+
+	const u8* storePairedU16 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_quantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+
+	if (cpu_info.bSSE4_1)
+	{
+#ifdef QUANTIZE_OVERFLOW_SAFE
+		MINPS(XMM0, M(m_65535));
+#endif
+		CVTTPS2DQ(XMM0, R(XMM0));
+		PACKUSDW(XMM0, R(XMM0));
+		MOVD_xmm(R(RSCRATCH), XMM0);
+		BSWAP(32, RSCRATCH);
+		ROL(32, R(RSCRATCH), Imm8(16));
+	}
+	else
+	{
+		XORPS(XMM1, R(XMM1));
+		MAXPS(XMM0, R(XMM1));
+		MINPS(XMM0, M(m_65535));
+
+		CVTTPS2DQ(XMM0, R(XMM0));
+		PSHUFLW(XMM0, R(XMM0), 2); // AABBCCDD -> CCAA____
+		MOVD_xmm(R(RSCRATCH), XMM0);
+		BSWAP(32, RSCRATCH);
+	}
+
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 32, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+
+	RET();
+
+	const u8* storePairedS16 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_quantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+#ifdef QUANTIZE_OVERFLOW_SAFE
+	MINPS(XMM0, M(m_65535));
+#endif
+	CVTTPS2DQ(XMM0, R(XMM0));
+	PACKSSDW(XMM0, R(XMM0));
+	MOVD_xmm(R(RSCRATCH), XMM0);
+	BSWAP(32, RSCRATCH);
+	ROL(32, R(RSCRATCH), Imm8(16));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 32, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore");
+
+	pairedStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
+	ReserveCodeSpace(8 * sizeof(u8*));
+
+	pairedStoreQuantized[0] = storePairedFloat;
+	pairedStoreQuantized[1] = storePairedIllegal;
+	pairedStoreQuantized[2] = storePairedIllegal;
+	pairedStoreQuantized[3] = storePairedIllegal;
+	pairedStoreQuantized[4] = storePairedU8;
+	pairedStoreQuantized[5] = storePairedU16;
+	pairedStoreQuantized[6] = storePairedS8;
+	pairedStoreQuantized[7] = storePairedS16;
+}
+
+// See comment in header for in/outs.
+void CommonAsmRoutines::GenQuantizedSingleStores()
+{
+	const void* start = GetCodePtr();
+
+	const u8* storeSingleIllegal = AlignCode4();
+	UD2();
+
+	// Easy!
+	const u8* storeSingleFloat = AlignCode4();
+	MOVD_xmm(R(RSCRATCH), XMM0);
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 32, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+	RET();
+
+	const u8* storeSingleU8 = AlignCode4();  // Used by MKWii
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_quantizeTableS, RSCRATCH2));
+	XORPS(XMM1, R(XMM1));
+	MAXSS(XMM0, R(XMM1));
+	MINSS(XMM0, M(&m_255));
+	CVTTSS2SI(RSCRATCH, R(XMM0));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 8, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+	RET();
+
+	const u8* storeSingleS8 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_quantizeTableS, RSCRATCH2));
+	MAXSS(XMM0, M(&m_m128));
+	MINSS(XMM0, M(&m_127));
+	CVTTSS2SI(RSCRATCH, R(XMM0));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 8, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+	RET();
+
+	const u8* storeSingleU16 = AlignCode4();  // Used by MKWii
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_quantizeTableS, RSCRATCH2));
+	XORPS(XMM1, R(XMM1));
+	MAXSS(XMM0, R(XMM1));
+	MINSS(XMM0, M(m_65535));
+	CVTTSS2SI(RSCRATCH, R(XMM0));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 16, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+	RET();
+
+	const u8* storeSingleS16 = AlignCode4();
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_quantizeTableS, RSCRATCH2));
+	MAXSS(XMM0, M(&m_m32768));
+	MINSS(XMM0, M(&m_32767));
+	CVTTSS2SI(RSCRATCH, R(XMM0));
+	SafeWriteRegToReg(RSCRATCH, RSCRATCH_EXTRA, 16, 0, QUANTIZED_REGS_TO_SAVE, SAFE_LOADSTORE_NO_PROLOG | SAFE_LOADSTORE_NO_FASTMEM);
+	RET();
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedSingleStore");
+
+	singleStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
+	ReserveCodeSpace(8 * sizeof(u8*));
+
+	singleStoreQuantized[0] = storeSingleFloat;
+	singleStoreQuantized[1] = storeSingleIllegal;
+	singleStoreQuantized[2] = storeSingleIllegal;
+	singleStoreQuantized[3] = storeSingleIllegal;
+	singleStoreQuantized[4] = storeSingleU8;
+	singleStoreQuantized[5] = storeSingleU16;
+	singleStoreQuantized[6] = storeSingleS8;
+	singleStoreQuantized[7] = storeSingleS16;
+}
+
+void CommonAsmRoutines::GenQuantizedLoads()
+{
+	const void* start = GetCodePtr();
+
+	const u8* loadPairedIllegal = AlignCode4();
+	UD2();
+
+	// FIXME? This code (in non-MMU mode) assumes all accesses are directly to RAM, i.e.
+	// don't need hardware access handling. This will definitely crash if paired loads occur
+	// from non-RAM areas, but as far as I know, this never happens. I don't know if this is
+	// for a good reason, or merely because no game does this.
+	// If we find something that actually does do this, maybe this should be changed. How
+	// much of a performance hit would it be?
+	const u8* loadPairedFloatTwo = AlignCode4();
+	if (jit->jo.memcheck)
+	{
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 64, 0, QUANTIZED_REGS_TO_SAVE, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+		ROL(64, R(RSCRATCH_EXTRA), Imm8(32));
+		MOVQ_xmm(XMM0, R(RSCRATCH_EXTRA));
+	}
+	else if (cpu_info.bSSSE3)
+	{
+		MOVQ_xmm(XMM0, MRegSum(RMEM, RSCRATCH_EXTRA));
+		PSHUFB(XMM0, M(pbswapShuffle2x4));
+	}
+	else
+	{
+		LoadAndSwap(64, RSCRATCH_EXTRA, MRegSum(RMEM, RSCRATCH_EXTRA));
+		ROL(64, R(RSCRATCH_EXTRA), Imm8(32));
+		MOVQ_xmm(XMM0, R(RSCRATCH_EXTRA));
+	}
+	RET();
+
+	const u8* loadPairedFloatOne = AlignCode4();
+	if (jit->jo.memcheck)
+	{
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 32, 0, QUANTIZED_REGS_TO_SAVE, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+		MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+		UNPCKLPS(XMM0, M(m_one));
+	}
+	else if (cpu_info.bSSSE3)
+	{
+		MOVD_xmm(XMM0, MRegSum(RMEM, RSCRATCH_EXTRA));
+		PSHUFB(XMM0, M(pbswapShuffle1x4));
+		UNPCKLPS(XMM0, M(m_one));
+	}
+	else
+	{
+		LoadAndSwap(32, RSCRATCH_EXTRA, MRegSum(RMEM, RSCRATCH_EXTRA));
+		MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+		UNPCKLPS(XMM0, M(m_one));
+	}
+	RET();
+
+	const u8* loadPairedU8Two = AlignCode4();
+	if (jit->jo.memcheck)
+	{
+		// TODO: Support not swapping in safeLoadToReg to avoid bswapping twice
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 16, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+		ROR(16, R(RSCRATCH_EXTRA), Imm8(8));
+	}
+	else
+	{
+		UnsafeLoadRegToRegNoSwap(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 16, 0);
+	}
+	MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+	if (cpu_info.bSSE4_1)
+	{
+		PMOVZXBD(XMM0, R(XMM0));
+	}
+	else
+	{
+		PXOR(XMM1, R(XMM1));
+		PUNPCKLBW(XMM0, R(XMM1));
+		PUNPCKLWD(XMM0, R(XMM1));
+	}
+	CVTDQ2PS(XMM0, R(XMM0));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_dequantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+	RET();
+
+	const u8* loadPairedU8One = AlignCode4();
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 8, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToRegNoSwap(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 8, 0); // RSCRATCH_EXTRA = 0x000000xx
+	CVTSI2SS(XMM0, R(RSCRATCH_EXTRA));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_dequantizeTableS, RSCRATCH2));
+	UNPCKLPS(XMM0, M(m_one));
+	RET();
+
+	const u8* loadPairedS8Two = AlignCode4();
+	if (jit->jo.memcheck)
+	{
+		// TODO: Support not swapping in safeLoadToReg to avoid bswapping twice
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 16, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+		ROR(16, R(RSCRATCH_EXTRA), Imm8(8));
+	}
+	else
+	{
+		UnsafeLoadRegToRegNoSwap(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 16, 0);
+	}
+	MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+	if (cpu_info.bSSE4_1)
+	{
+		PMOVSXBD(XMM0, R(XMM0));
+	}
+	else
+	{
+		PUNPCKLBW(XMM0, R(XMM0));
+		PUNPCKLWD(XMM0, R(XMM0));
+		PSRAD(XMM0, 24);
+	}
+	CVTDQ2PS(XMM0, R(XMM0));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_dequantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+	RET();
+
+	const u8* loadPairedS8One = AlignCode4();
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 8, 0, QUANTIZED_REGS_TO_SAVE_LOAD, true, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToRegNoSwap(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 8, 0, true);
+	CVTSI2SS(XMM0, R(RSCRATCH_EXTRA));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_dequantizeTableS, RSCRATCH2));
+	UNPCKLPS(XMM0, M(m_one));
+	RET();
+
+	const u8* loadPairedU16Two = AlignCode4();
+	// TODO: Support not swapping in (un)safeLoadToReg to avoid bswapping twice
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 32, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToReg(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 32, 0, false);
+	ROL(32, R(RSCRATCH_EXTRA), Imm8(16));
+	MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+	if (cpu_info.bSSE4_1)
+	{
+		PMOVZXWD(XMM0, R(XMM0));
+	}
+	else
+	{
+		PXOR(XMM1, R(XMM1));
+		PUNPCKLWD(XMM0, R(XMM1));
+	}
+	CVTDQ2PS(XMM0, R(XMM0));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_dequantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+	RET();
+
+	const u8* loadPairedU16One = AlignCode4();
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 16, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToReg(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 16, 0, false);
+	CVTSI2SS(XMM0, R(RSCRATCH_EXTRA));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_dequantizeTableS, RSCRATCH2));
+	UNPCKLPS(XMM0, M(m_one));
+	RET();
+
+	const u8* loadPairedS16Two = AlignCode4();
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 32, 0, QUANTIZED_REGS_TO_SAVE_LOAD, false, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToReg(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 32, 0, false);
+	ROL(32, R(RSCRATCH_EXTRA), Imm8(16));
+	MOVD_xmm(XMM0, R(RSCRATCH_EXTRA));
+	if (cpu_info.bSSE4_1)
+	{
+		PMOVSXWD(XMM0, R(XMM0));
+	}
+	else
+	{
+		PUNPCKLWD(XMM0, R(XMM0));
+		PSRAD(XMM0, 16);
+	}
+	CVTDQ2PS(XMM0, R(XMM0));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MOVQ_xmm(XMM1, MPIC(m_dequantizeTableS, RSCRATCH2));
+	MULPS(XMM0, R(XMM1));
+	RET();
+
+	const u8* loadPairedS16One = AlignCode4();
+	if (jit->jo.memcheck)
+		SafeLoadToReg(RSCRATCH_EXTRA, R(RSCRATCH_EXTRA), 16, 0, QUANTIZED_REGS_TO_SAVE_LOAD, true, SAFE_LOADSTORE_NO_FASTMEM | SAFE_LOADSTORE_NO_PROLOG);
+	else
+		UnsafeLoadRegToReg(RSCRATCH_EXTRA, RSCRATCH_EXTRA, 16, 0, true);
+	CVTSI2SS(XMM0, R(RSCRATCH_EXTRA));
+	SHR(32, R(RSCRATCH2), Imm8(5));
+	MULSS(XMM0, MPIC(m_dequantizeTableS, RSCRATCH2));
+	UNPCKLPS(XMM0, M(m_one));
+	RET();
+
+
+	JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad");
+
+	pairedLoadQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
+	ReserveCodeSpace(16 * sizeof(u8*));
+
+	pairedLoadQuantized[0] = loadPairedFloatTwo;
+	pairedLoadQuantized[1] = loadPairedIllegal;
+	pairedLoadQuantized[2] = loadPairedIllegal;
+	pairedLoadQuantized[3] = loadPairedIllegal;
+	pairedLoadQuantized[4] = loadPairedU8Two;
+	pairedLoadQuantized[5] = loadPairedU16Two;
+	pairedLoadQuantized[6] = loadPairedS8Two;
+	pairedLoadQuantized[7] = loadPairedS16Two;
+
+	pairedLoadQuantized[8] = loadPairedFloatOne;
+	pairedLoadQuantized[9] = loadPairedIllegal;
+	pairedLoadQuantized[10] = loadPairedIllegal;
+	pairedLoadQuantized[11] = loadPairedIllegal;
+	pairedLoadQuantized[12] = loadPairedU8One;
+	pairedLoadQuantized[13] = loadPairedU16One;
+	pairedLoadQuantized[14] = loadPairedS8One;
+	pairedLoadQuantized[15] = loadPairedS16One;
+}
diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h
new file mode 100644
index 0000000000..9509923bb9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h
@@ -0,0 +1,22 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
+
+class CommonAsmRoutines : public CommonAsmRoutinesBase, public EmuCodeBlock
+{
+protected:
+	void GenQuantizedLoads();
+	void GenQuantizedStores();
+	void GenQuantizedSingleStores();
+
+public:
+	void GenFifoWrite(int size);
+	void GenFrsqrte();
+	void GenFres();
+	void GenMfcr();
+};
diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
new file mode 100644
index 0000000000..51763de8a9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
@@ -0,0 +1,2337 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/*
+For a more general explanation of the IR, see IR.cpp.
+
+X86 codegen is a backward pass followed by a forward pass.
+
+The first pass to actually doing codegen is a liveness analysis pass.
+Liveness is important for two reasons: one, it lets us do dead code
+elimination, which results both from earlier folding, PPC
+instructions with unused parts like srawx, and just random strangeness.
+The other bit is that is allows us to identify the last instruction to
+use a value: this is absolutely essential for register allocation
+because it the allocator needs to be able to free unused registers.
+In addition, this allows eliminating redundant mov instructions in a lot
+of cases.
+
+The register allocation is linear scan allocation.
+*/
+
+#ifdef _MSC_VER
+#pragma warning(disable:4146)   // unary minus operator applied to unsigned type, result still unsigned
+#endif
+
+#include <algorithm>
+
+#include "Common/BitSet.h"
+#include "Common/CPUDetect.h"
+#include "Common/MathUtil.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/Jit64IL/JitIL.h"
+
+using namespace IREmitter;
+using namespace Gen;
+
+static const unsigned int MAX_NUMBER_OF_REGS = 16;
+
+struct RegInfo
+{
+	JitIL *Jit;
+	IRBuilder* Build;
+	InstLoc FirstI;
+
+	// IInfo contains (per instruction)
+	// Bits 0-1: Saturating count of number of instructions referencing this instruction.
+	// Bits 2-3: single bit per operand marking if this is the last instruction to reference that operand's result.
+	//           Used to decide if we should free any registers associated with the operands after this instruction
+	//           and if we can clobber the operands registers.
+	//           Warning, Memory instruction use these bits slightly differently.
+	// Bits 15-31: Spill location
+	std::vector<unsigned> IInfo;
+
+	// The last instruction which uses the result of this instruction. Used by the register allocator.
+	std::vector<InstLoc> lastUsed;
+
+	InstLoc regs[MAX_NUMBER_OF_REGS];
+	InstLoc fregs[MAX_NUMBER_OF_REGS];
+	unsigned numSpills;
+	unsigned numFSpills;
+	unsigned exitNumber;
+
+	RegInfo(JitIL* j, InstLoc f, unsigned insts)
+		: Jit(j), Build(nullptr), FirstI(f), IInfo(insts), lastUsed(insts)
+		, regs(), fregs(), numSpills(0), numFSpills(0), exitNumber(0)
+	{
+	}
+
+	private:
+		RegInfo(RegInfo&); // DO NOT IMPLEMENT
+};
+
+static BitSet32 regsInUse(RegInfo& R)
+{
+	BitSet32 result;
+	for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++)
+	{
+		if (R.regs[i] != nullptr)
+			result[i] = true;
+		if (R.fregs[i] != nullptr)
+			result[16 + i] = true;
+	}
+	return result;
+}
+
+static void regMarkUse(RegInfo& R, InstLoc I, InstLoc Op, unsigned OpNum)
+{
+	unsigned& info = R.IInfo[Op - R.FirstI];
+
+	if (info == 0)
+		R.IInfo[I - R.FirstI] |= 1 << (OpNum + 1);
+
+	if (info < 2)
+		info++;
+
+	R.lastUsed[Op - R.FirstI] = std::max(R.lastUsed[Op - R.FirstI], I);
+}
+
+static unsigned regReadUse(RegInfo& R, InstLoc I)
+{
+	return R.IInfo[I - R.FirstI] & 3;
+}
+
+static u64 SlotSet[1000];
+static u8 GC_ALIGNED16(FSlotSet[16*1000]);
+
+static OpArg regLocForSlot(RegInfo& RI, unsigned slot)
+{
+	return M(&SlotSet[slot - 1]);
+}
+
+static unsigned regCreateSpill(RegInfo& RI, InstLoc I)
+{
+	unsigned newSpill = ++RI.numSpills;
+	RI.IInfo[I - RI.FirstI] |= newSpill << 16;
+	return newSpill;
+}
+
+static unsigned regGetSpill(RegInfo& RI, InstLoc I)
+{
+	return RI.IInfo[I - RI.FirstI] >> 16;
+}
+
+static void regSpill(RegInfo& RI, X64Reg reg)
+{
+	if (!RI.regs[reg])
+		return;
+
+	unsigned slot = regGetSpill(RI, RI.regs[reg]);
+	if (!slot)
+	{
+		slot = regCreateSpill(RI, RI.regs[reg]);
+		RI.Jit->MOV(64, regLocForSlot(RI, slot), R(reg));
+	}
+
+	RI.regs[reg] = nullptr;
+}
+
+static OpArg fregLocForSlot(RegInfo& RI, unsigned slot)
+{
+	return M(&FSlotSet[slot*16]);
+}
+
+static unsigned fregCreateSpill(RegInfo& RI, InstLoc I)
+{
+	unsigned newSpill = ++RI.numFSpills;
+	RI.IInfo[I - RI.FirstI] |= newSpill << 16;
+	return newSpill;
+}
+
+static unsigned fregGetSpill(RegInfo& RI, InstLoc I)
+{
+	return RI.IInfo[I - RI.FirstI] >> 16;
+}
+
+static void fregSpill(RegInfo& RI, X64Reg reg)
+{
+	if (!RI.fregs[reg])
+		return;
+
+	unsigned slot = fregGetSpill(RI, RI.fregs[reg]);
+	if (!slot)
+	{
+		slot = fregCreateSpill(RI, RI.fregs[reg]);
+		RI.Jit->MOVAPD(fregLocForSlot(RI, slot), reg);
+	}
+
+	RI.fregs[reg] = nullptr;
+}
+
+// RAX and RDX are scratch, so we don't allocate them
+// (TODO: if we could lock RCX here too then we could allocate it - needed for
+// shifts)
+
+// 64-bit - calling conventions differ between Linux & Windows, so...
+#ifdef _WIN32
+static const X64Reg RegAllocOrder[] = {RSI, RDI, R12, R13, R14, R8, R9, R10, R11};
+#else
+static const X64Reg RegAllocOrder[] = {R12, R13, R14, R8, R9, R10, R11};
+#endif
+static const int RegAllocSize = sizeof(RegAllocOrder) / sizeof(X64Reg);
+static const X64Reg FRegAllocOrder[] = {XMM6, XMM7, XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, XMM2, XMM3, XMM4, XMM5};
+static const int FRegAllocSize = sizeof(FRegAllocOrder) / sizeof(X64Reg);
+
+static X64Reg regFindFreeReg(RegInfo& RI)
+{
+	for (auto& reg : RegAllocOrder)
+	{
+		if (RI.regs[reg] == nullptr)
+			return reg;
+	}
+
+	int bestIndex = -1;
+	InstLoc bestEnd = nullptr;
+	for (int i = 0; i < RegAllocSize; ++i)
+	{
+		const InstLoc start = RI.regs[RegAllocOrder[i]];
+		const InstLoc end = RI.lastUsed[start - RI.FirstI];
+
+		if (bestEnd < end)
+		{
+			bestEnd = end;
+			bestIndex = i;
+		}
+	}
+
+	X64Reg reg = RegAllocOrder[bestIndex];
+	regSpill(RI, reg);
+	return reg;
+}
+
+static X64Reg fregFindFreeReg(RegInfo& RI)
+{
+	for (auto& reg : FRegAllocOrder)
+	{
+		if (RI.fregs[reg] == nullptr)
+			return reg;
+	}
+
+	int bestIndex = -1;
+	InstLoc bestEnd = nullptr;
+	for (int i = 0; i < FRegAllocSize; ++i)
+	{
+		const InstLoc start = RI.fregs[FRegAllocOrder[i]];
+		const InstLoc end = RI.lastUsed[start - RI.FirstI];
+
+		if (bestEnd < end)
+		{
+			bestEnd = end;
+			bestIndex = i;
+		}
+	}
+
+	X64Reg reg = FRegAllocOrder[bestIndex];
+	fregSpill(RI, reg);
+	return reg;
+}
+
+static OpArg regLocForInst(RegInfo& RI, InstLoc I)
+{
+	for (auto& reg : RegAllocOrder)
+	{
+		if (RI.regs[reg] == I)
+			return R(reg);
+	}
+
+	unsigned slot = regGetSpill(RI, I);
+	if (!slot)
+		PanicAlert("Retrieving unknown spill slot?!");
+	return regLocForSlot(RI, slot);
+}
+
+static OpArg fregLocForInst(RegInfo& RI, InstLoc I)
+{
+	for (auto& reg : FRegAllocOrder)
+	{
+		if (RI.fregs[reg] == I)
+			return R(reg);
+	}
+
+	unsigned slot = fregGetSpill(RI, I);
+	if (!slot)
+		PanicAlert("Retrieving unknown spill slot?!");
+	return fregLocForSlot(RI, slot);
+}
+
+static void regClearInst(RegInfo& RI, InstLoc I)
+{
+	for (auto& reg : RegAllocOrder)
+	{
+		if (RI.regs[reg] == I)
+			RI.regs[reg] = nullptr;
+	}
+}
+
+static void fregClearInst(RegInfo& RI, InstLoc I)
+{
+	for (auto& reg : FRegAllocOrder)
+	{
+		if (RI.fregs[reg] == I)
+			RI.fregs[reg] = nullptr;
+	}
+}
+
+static X64Reg regEnsureInReg(RegInfo& RI, InstLoc I)
+{
+	OpArg loc = regLocForInst(RI, I);
+
+	if (!loc.IsSimpleReg())
+	{
+		X64Reg newReg = regFindFreeReg(RI);
+		RI.Jit->MOV(32, R(newReg), loc);
+		loc = R(newReg);
+	}
+
+	return loc.GetSimpleReg();
+}
+
+static X64Reg fregEnsureInReg(RegInfo& RI, InstLoc I)
+{
+	OpArg loc = fregLocForInst(RI, I);
+
+	if (!loc.IsSimpleReg())
+	{
+		X64Reg newReg = fregFindFreeReg(RI);
+		RI.Jit->MOVAPD(newReg, loc);
+		loc = R(newReg);
+	}
+
+	return loc.GetSimpleReg();
+}
+
+static void regSpillCallerSaved(RegInfo& RI)
+{
+	regSpill(RI, RCX);
+	regSpill(RI, RDX);
+	regSpill(RI, RSI);
+	regSpill(RI, RDI);
+	regSpill(RI, R8);
+	regSpill(RI, R9);
+	regSpill(RI, R10);
+	regSpill(RI, R11);
+}
+
+static X64Reg regUReg(RegInfo& RI, InstLoc I)
+{
+	const OpArg loc = regLocForInst(RI, getOp1(I));
+
+	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg())
+	{
+		return loc.GetSimpleReg();
+	}
+
+	return regFindFreeReg(RI);
+}
+
+// Recycle the register if the lifetime of op1 register ends at I.
+static X64Reg fregURegWithoutMov(RegInfo& RI, InstLoc I)
+{
+	const OpArg loc = fregLocForInst(RI, getOp1(I));
+
+	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg())
+	{
+		return loc.GetSimpleReg();
+	}
+
+	return fregFindFreeReg(RI);
+}
+
+static X64Reg fregURegWithMov(RegInfo& RI, InstLoc I)
+{
+	const OpArg loc = fregLocForInst(RI, getOp1(I));
+
+	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg())
+	{
+		return loc.GetSimpleReg();
+	}
+
+	X64Reg reg = fregFindFreeReg(RI);
+	RI.Jit->MOVAPD(reg, loc);
+	return reg;
+}
+
+// Recycle the register if the lifetime of op1 register ends at I.
+static X64Reg fregBinLHSRegWithMov(RegInfo& RI, InstLoc I)
+{
+	const OpArg loc = fregLocForInst(RI, getOp1(I));
+
+	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg())
+	{
+		return loc.GetSimpleReg();
+	}
+
+	X64Reg reg = fregFindFreeReg(RI);
+	RI.Jit->MOVAPD(reg, loc);
+	return reg;
+}
+
+// Recycle the register if the lifetime of op2 register ends at I.
+static X64Reg fregBinRHSRegWithMov(RegInfo& RI, InstLoc I)
+{
+	const OpArg loc = fregLocForInst(RI, getOp2(I));
+
+	if ((RI.IInfo[I - RI.FirstI] & 8) && loc.IsSimpleReg())
+	{
+		return loc.GetSimpleReg();
+	}
+
+	X64Reg reg = fregFindFreeReg(RI);
+	RI.Jit->MOVAPD(reg, loc);
+	return reg;
+}
+
+// If the lifetime of the register used by an operand ends at I,
+// return the register. Otherwise return a free register.
+static X64Reg regBinReg(RegInfo& RI, InstLoc I)
+{
+	// FIXME: When regLocForInst() is extracted as a local variable,
+	//        "Retrieving unknown spill slot?!" is shown.
+	if ((RI.IInfo[I - RI.FirstI] & 4) && regLocForInst(RI, getOp1(I)).IsSimpleReg())
+	{
+		return regLocForInst(RI, getOp1(I)).GetSimpleReg();
+	}
+	else if ((RI.IInfo[I - RI.FirstI] & 8) && regLocForInst(RI, getOp2(I)).IsSimpleReg())
+	{
+		return regLocForInst(RI, getOp2(I)).GetSimpleReg();
+	}
+
+	return regFindFreeReg(RI);
+}
+
+static X64Reg regBinLHSReg(RegInfo& RI, InstLoc I)
+{
+	if (RI.IInfo[I - RI.FirstI] & 4)
+	{
+		return regEnsureInReg(RI, getOp1(I));
+	}
+
+	X64Reg reg = regFindFreeReg(RI);
+	RI.Jit->MOV(32, R(reg), regLocForInst(RI, getOp1(I)));
+	return reg;
+}
+
+// Clear any registers which end their lifetime at I
+// Don't use this for special instructions like memory load/stores
+static void regNormalRegClear(RegInfo& RI, InstLoc I)
+{
+	if (RI.IInfo[I - RI.FirstI] & 4)
+		regClearInst(RI, getOp1(I));
+	if (RI.IInfo[I - RI.FirstI] & 8)
+		regClearInst(RI, getOp2(I));
+}
+
+// Clear any floating point registers which end their lifetime at I
+static void fregNormalRegClear(RegInfo& RI, InstLoc I)
+{
+	if (RI.IInfo[I - RI.FirstI] & 4)
+		fregClearInst(RI, getOp1(I));
+	if (RI.IInfo[I - RI.FirstI] & 8)
+		fregClearInst(RI, getOp2(I));
+}
+
+static void regEmitBinInst(RegInfo& RI, InstLoc I,
+                           void (JitIL::*op)(int, const OpArg&, const OpArg&),
+                           bool commutable = false)
+{
+	X64Reg reg;
+	bool commuted = false;
+	if (RI.IInfo[I - RI.FirstI] & 4)
+	{
+		reg = regEnsureInReg(RI, getOp1(I));
+	}
+	else if (commutable && (RI.IInfo[I - RI.FirstI] & 8))
+	{
+		reg = regEnsureInReg(RI, getOp2(I));
+		commuted = true;
+	}
+	else
+	{
+		reg = regFindFreeReg(RI);
+		RI.Jit->MOV(32, R(reg), regLocForInst(RI, getOp1(I)));
+	}
+
+	if (isImm(*getOp2(I)))
+	{
+		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+		if (RHS + 128 < 256)
+		{
+			(RI.Jit->*op)(32, R(reg), Imm8(RHS));
+		}
+		else
+		{
+			(RI.Jit->*op)(32, R(reg), Imm32(RHS));
+		}
+	}
+	else if (commuted)
+	{
+		(RI.Jit->*op)(32, R(reg), regLocForInst(RI, getOp1(I)));
+	}
+	else
+	{
+		(RI.Jit->*op)(32, R(reg), regLocForInst(RI, getOp2(I)));
+	}
+
+	RI.regs[reg] = I;
+	regNormalRegClear(RI, I);
+}
+
+static void fregEmitBinInst(RegInfo& RI, InstLoc I, void (JitIL::*op)(X64Reg, const OpArg&))
+{
+	X64Reg reg;
+
+	if (RI.IInfo[I - RI.FirstI] & 4)
+	{
+		reg = fregEnsureInReg(RI, getOp1(I));
+	}
+	else
+	{
+		reg = fregFindFreeReg(RI);
+		RI.Jit->MOVAPD(reg, fregLocForInst(RI, getOp1(I)));
+	}
+
+	(RI.Jit->*op)(reg, fregLocForInst(RI, getOp2(I)));
+	RI.fregs[reg] = I;
+	fregNormalRegClear(RI, I);
+}
+
+// Mark and calculation routines for profiled load/store addresses
+// Could be extended to unprofiled addresses.
+static void regMarkMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, unsigned OpNum)
+{
+	if (isImm(*AI))
+	{
+		unsigned addr = RI.Build->GetImmValue(AI);
+		if (PowerPC::IsOptimizableRAMAddress(addr))
+			return;
+	}
+
+	if (getOpcode(*AI) == Add && isImm(*getOp2(AI)))
+	{
+		regMarkUse(RI, I, getOp1(AI), OpNum);
+		return;
+	}
+
+	regMarkUse(RI, I, AI, OpNum);
+}
+
+// in 64-bit build, this returns a completely bizarre address sometimes!
+static std::pair<OpArg, u32> regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI,
+                                                unsigned OpNum, X64Reg* dest)
+{
+	if (isImm(*AI))
+	{
+		unsigned addr = RI.Build->GetImmValue(AI);
+		if (PowerPC::IsOptimizableRAMAddress(addr))
+		{
+			if (dest)
+				*dest = regFindFreeReg(RI);
+
+			return std::make_pair(Imm32(addr), 0);
+		}
+	}
+
+	unsigned offset;
+	InstLoc AddrBase;
+	if (getOpcode(*AI) == Add && isImm(*getOp2(AI)))
+	{
+		offset = RI.Build->GetImmValue(getOp2(AI));
+		AddrBase = getOp1(AI);
+	}
+	else
+	{
+		offset = 0;
+		AddrBase = AI;
+	}
+
+	X64Reg baseReg;
+	// Ok, this stuff needs a comment or three :P -ector
+	if (RI.IInfo[I - RI.FirstI] & (2 << OpNum))
+	{
+		baseReg = regEnsureInReg(RI, AddrBase);
+		regClearInst(RI, AddrBase);
+		if (dest)
+			*dest = baseReg;
+	}
+	else if (dest)
+	{
+		X64Reg reg = regFindFreeReg(RI);
+		const OpArg loc = regLocForInst(RI, AddrBase);
+		if (!loc.IsSimpleReg())
+		{
+			RI.Jit->MOV(32, R(reg), loc);
+			baseReg = reg;
+		}
+		else
+		{
+			baseReg = loc.GetSimpleReg();
+		}
+		*dest = reg;
+	}
+	else
+	{
+		baseReg = regEnsureInReg(RI, AddrBase);
+	}
+
+	return std::make_pair(R(baseReg), offset);
+}
+
+static void regEmitMemLoad(RegInfo& RI, InstLoc I, unsigned Size)
+{
+	X64Reg reg;
+	auto info = regBuildMemAddress(RI, I, getOp1(I), 1, &reg);
+
+	RI.Jit->SafeLoadToReg(reg, info.first, Size, info.second, regsInUse(RI), false);
+	if (regReadUse(RI, I))
+		RI.regs[reg] = I;
+}
+
+static OpArg regImmForConst(RegInfo& RI, InstLoc I, unsigned Size)
+{
+	unsigned imm = RI.Build->GetImmValue(I);
+
+	if (Size == 32)
+	{
+		return Imm32(imm);
+	}
+	else if (Size == 16)
+	{
+		return Imm16(imm);
+	}
+	else
+	{
+		return Imm8(imm);
+	}
+}
+
+static void regEmitMemStore(RegInfo& RI, InstLoc I, unsigned Size)
+{
+	auto info = regBuildMemAddress(RI, I, getOp2(I), 2, nullptr);
+	if (info.first.IsImm())
+		RI.Jit->MOV(32, R(RSCRATCH2), info.first);
+	else
+		RI.Jit->LEA(32, RSCRATCH2, MDisp(info.first.GetSimpleReg(), info.second));
+
+	regSpill(RI, RSCRATCH);
+
+	if (isImm(*getOp1(I)))
+	{
+		RI.Jit->MOV(Size, R(RSCRATCH), regImmForConst(RI, getOp1(I), Size));
+	}
+	else
+	{
+		RI.Jit->MOV(32, R(RSCRATCH), regLocForInst(RI, getOp1(I)));
+	}
+
+	RI.Jit->SafeWriteRegToReg(RSCRATCH, RSCRATCH2, Size, 0, regsInUse(RI));
+	if (RI.IInfo[I - RI.FirstI] & 4)
+		regClearInst(RI, getOp1(I));
+}
+
+static void regEmitShiftInst(RegInfo& RI, InstLoc I, void (JitIL::*op)(int, const OpArg&, const OpArg&))
+{
+	X64Reg reg = regBinLHSReg(RI, I);
+
+	if (isImm(*getOp2(I)))
+	{
+		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+		(RI.Jit->*op)(32, R(reg), Imm8(RHS));
+		RI.regs[reg] = I;
+		return;
+	}
+
+	RI.Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
+	(RI.Jit->*op)(32, R(reg), R(ECX));
+	RI.regs[reg] = I;
+	regNormalRegClear(RI, I);
+}
+
+static void regStoreInstToConstLoc(RegInfo& RI, unsigned width, InstLoc I, void* loc)
+{
+	if (width != 32)
+	{
+		PanicAlert("Not implemented!");
+		return;
+	}
+
+	if (isImm(*I))
+	{
+		RI.Jit->MOV(32, M(loc), Imm32(RI.Build->GetImmValue(I)));
+		return;
+	}
+
+	X64Reg reg = regEnsureInReg(RI, I);
+	RI.Jit->MOV(32, M(loc), R(reg));
+}
+
+static void regEmitCmp(RegInfo& RI, InstLoc I)
+{
+	if (isImm(*getOp2(I)))
+	{
+		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+		RI.Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm32(RHS));
+	}
+	else
+	{
+		X64Reg reg = regEnsureInReg(RI, getOp1(I));
+		RI.Jit->CMP(32, R(reg), regLocForInst(RI, getOp2(I)));
+	}
+}
+
+static void regEmitICmpInst(RegInfo& RI, InstLoc I, CCFlags flag)
+{
+	regEmitCmp(RI, I);
+	RI.Jit->SETcc(flag, R(RSCRATCH2)); // Caution: SETCC uses 8-bit regs!
+	X64Reg reg = regBinReg(RI, I);
+	RI.Jit->MOVZX(32, 8, reg, R(RSCRATCH2));
+	RI.regs[reg] = I;
+	regNormalRegClear(RI, I);
+}
+
+static void regEmitICmpCRInst(RegInfo& RI, InstLoc I)
+{
+	bool signed_compare = getOpcode(*I) == ICmpCRSigned;
+	X64Reg reg;
+
+	if (RI.IInfo[I - RI.FirstI] & 4)
+	{
+		reg = regEnsureInReg(RI, getOp1(I));
+		if (signed_compare)
+			RI.Jit->MOVSX(64, 32, reg, R(reg));
+	}
+	else
+	{
+		reg = regFindFreeReg(RI);
+		if (signed_compare)
+			RI.Jit->MOVSX(64, 32, reg, regLocForInst(RI, getOp1(I)));
+		else
+			RI.Jit->MOV(32, R(reg), regLocForInst(RI, getOp1(I)));
+	}
+
+	if (isImm(*getOp2(I)))
+	{
+		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+		if (!signed_compare && (RHS & 0x80000000U))
+		{
+			RI.Jit->MOV(32, R(RSCRATCH), Imm32(RHS));
+			RI.Jit->SUB(64, R(reg), R(RSCRATCH));
+		}
+		else if (RHS)
+		{
+			RI.Jit->SUB(64, R(reg), Imm32(RHS));
+		}
+	}
+	else
+	{
+		if (signed_compare)
+			RI.Jit->MOVSX(64, 32, RSCRATCH, regLocForInst(RI, getOp2(I)));
+		else
+			RI.Jit->MOV(32, R(RSCRATCH), regLocForInst(RI, getOp2(I)));
+		RI.Jit->SUB(64, R(reg), R(RSCRATCH));
+	}
+
+	RI.regs[reg] = I;
+	regNormalRegClear(RI, I);
+}
+
+static void regWriteExit(RegInfo& RI, InstLoc dest)
+{
+	if (isImm(*dest))
+	{
+		RI.exitNumber++;
+		RI.Jit->WriteExit(RI.Build->GetImmValue(dest));
+	}
+	else
+	{
+		RI.Jit->WriteExitDestInOpArg(regLocForInst(RI, dest));
+	}
+}
+
+// Helper function to check floating point exceptions
+static double GC_ALIGNED16(isSNANTemp[2][2]);
+static bool checkIsSNAN()
+{
+	return MathUtil::IsSNAN(isSNANTemp[0][0]) || MathUtil::IsSNAN(isSNANTemp[1][0]);
+}
+
+static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress)
+{
+	//printf("Writing block: %x\n", js.blockStart);
+	RegInfo RI(Jit, ibuild->getFirstInst(), ibuild->getNumInsts());
+	RI.Build = ibuild;
+
+	// Pass to compute liveness
+	ibuild->StartBackPass();
+	for (unsigned int index = (unsigned int)RI.IInfo.size() - 1; index != -1U; --index)
+	{
+		InstLoc I = ibuild->ReadBackward();
+		unsigned int op = getOpcode(*I);
+		bool thisUsed = regReadUse(RI, I) ? true : false;
+
+		switch (op)
+		{
+		default:
+			PanicAlert("Unexpected inst!");
+		case Nop:
+		case CInt16:
+		case CInt32:
+		case LoadGReg:
+		case LoadLink:
+		case LoadCR:
+		case LoadCarry:
+		case LoadCTR:
+		case LoadMSR:
+		case LoadFReg:
+		case LoadFRegDENToZero:
+		case LoadGQR:
+		case BlockEnd:
+		case BlockStart:
+		case FallBackToInterpreter:
+		case SystemCall:
+		case RFIExit:
+		case InterpreterBranch:
+		case ShortIdleLoop:
+		case FPExceptionCheck:
+		case DSIExceptionCheck:
+		case ExtExceptionCheck:
+		case BreakPointCheck:
+		case Int3:
+		case Tramp:
+			// No liveness effects
+			break;
+		case SExt8:
+		case SExt16:
+		case BSwap32:
+		case BSwap16:
+		case Cntlzw:
+		case Not:
+		case DupSingleToMReg:
+		case DoubleToSingle:
+		case ExpandPackedToMReg:
+		case CompactMRegToPacked:
+		case FPNeg:
+		case FPDup0:
+		case FPDup1:
+		case FSNeg:
+		case FDNeg:
+		case ConvertFromFastCR:
+		case ConvertToFastCR:
+		case FastCRSOSet:
+		case FastCREQSet:
+		case FastCRGTSet:
+		case FastCRLTSet:
+			if (thisUsed)
+				regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case Load8:
+		case Load16:
+		case Load32:
+		case LoadDouble:
+		case LoadSingle:
+			regMarkMemAddress(RI, I, getOp1(I), 1);
+			break;
+		case LoadPaired:
+			if (thisUsed)
+				regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case StoreCR:
+		case StoreCarry:
+		case StoreFPRF:
+			regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case StoreGReg:
+		case StoreLink:
+		case StoreCTR:
+		case StoreMSR:
+		case StoreGQR:
+		case StoreSRR:
+		case StoreFReg:
+			if (!isImm(*getOp1(I)))
+				regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case Add:
+		case Sub:
+		case And:
+		case Or:
+		case Xor:
+		case Mul:
+		case MulHighUnsigned:
+		case Rol:
+		case Shl:
+		case Shrl:
+		case Sarl:
+		case ICmpCRUnsigned:
+		case ICmpCRSigned:
+		case ICmpEq:
+		case ICmpNe:
+		case ICmpUgt:
+		case ICmpUlt:
+		case ICmpUge:
+		case ICmpUle:
+		case ICmpSgt:
+		case ICmpSlt:
+		case ICmpSge:
+		case ICmpSle:
+		case FSMul:
+		case FSAdd:
+		case FSSub:
+		case FDMul:
+		case FDAdd:
+		case FDSub:
+		case FPAdd:
+		case FPMul:
+		case FPSub:
+		case FPMerge00:
+		case FPMerge01:
+		case FPMerge10:
+		case FPMerge11:
+		case FDCmpCR:
+		case InsertDoubleInMReg:
+			if (thisUsed)
+			{
+				regMarkUse(RI, I, getOp1(I), 1);
+				if (!isImm(*getOp2(I)))
+					regMarkUse(RI, I, getOp2(I), 2);
+			}
+			break;
+		case Store8:
+		case Store16:
+		case Store32:
+			if (!isImm(*getOp1(I)))
+				regMarkUse(RI, I, getOp1(I), 1);
+			regMarkMemAddress(RI, I, getOp2(I), 2);
+			break;
+		case StoreSingle:
+		case StoreDouble:
+			regMarkUse(RI, I, getOp1(I), 1);
+			regMarkMemAddress(RI, I, getOp2(I), 2);
+			break;
+		case StorePaired:
+			regMarkUse(RI, I, getOp1(I), 1);
+			regMarkUse(RI, I, getOp2(I), 2);
+			break;
+		case BranchUncond:
+			if (!isImm(*getOp1(I)))
+				regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case IdleBranch:
+			regMarkUse(RI, I, getOp1(I), 1);
+			break;
+		case BranchCond:
+		{
+			if (isICmp(*getOp1(I)))
+			{
+				regMarkUse(RI, I, getOp1(getOp1(I)), 1);
+				if (!isImm(*getOp2(getOp1(I))))
+					regMarkUse(RI, I, getOp2(getOp1(I)), 2);
+			}
+			else
+			{
+				regMarkUse(RI, I, getOp1(I), 1);
+			}
+			if (!isImm(*getOp2(I)))
+				regMarkUse(RI, I, getOp2(I), 2);
+			break;
+		}
+		}
+	}
+
+	ibuild->StartForwardPass();
+	for (unsigned i = 0; i != RI.IInfo.size(); i++)
+	{
+		InstLoc I = ibuild->ReadForward();
+		bool thisUsed = regReadUse(RI, I) ? true : false;
+		if (thisUsed)
+		{
+			// Needed for IR Writer
+			ibuild->SetMarkUsed(I);
+		}
+
+		switch (getOpcode(*I))
+		{
+		case FallBackToInterpreter:
+		{
+			unsigned InstCode = ibuild->GetImmValue(getOp1(I));
+			unsigned InstLoc = ibuild->GetImmValue(getOp2(I));
+			// There really shouldn't be anything live across an
+			// interpreter call at the moment, but optimizing interpreter
+			// calls isn't completely out of the question...
+			regSpillCallerSaved(RI);
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->MOV(32, PPCSTATE(npc), Imm32(InstLoc+4));
+			Jit->ABI_CallFunctionC((void*)GetInterpreterOp(InstCode),
+					       InstCode);
+			break;
+		}
+		case LoadGReg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			unsigned ppcreg = *I >> 8;
+			Jit->MOV(32, R(reg), PPCSTATE(gpr[ppcreg]));
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadCR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			unsigned ppcreg = *I >> 8;
+			Jit->MOV(64, R(reg), PPCSTATE(cr_val[ppcreg]));
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadCTR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			Jit->MOV(32, R(reg), PPCSTATE_CTR);
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadLink:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			Jit->MOV(32, R(reg), PPCSTATE_LR);
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadMSR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			Jit->MOV(32, R(reg), PPCSTATE(msr));
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadGQR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			unsigned gqr = *I >> 8;
+			Jit->MOV(32, R(reg), PPCSTATE(spr[SPR_GQR0 + gqr]));
+			RI.regs[reg] = I;
+			break;
+		}
+		case LoadCarry:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			Jit->MOVZX(32, 8, reg, PPCSTATE(xer_ca));
+			RI.regs[reg] = I;
+			break;
+		}
+		case StoreGReg:
+		{
+			unsigned ppcreg = *I >> 16;
+			regStoreInstToConstLoc(RI, 32, getOp1(I),
+					       &PowerPC::ppcState.gpr[ppcreg]);
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreCR:
+		{
+			X64Reg reg = regEnsureInReg(RI, getOp1(I));
+			unsigned ppcreg = *I >> 16;
+			Jit->MOV(64, PPCSTATE(cr_val[ppcreg]), R(reg));
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreLink:
+		{
+			regStoreInstToConstLoc(RI, 32, getOp1(I), &LR);
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreCTR:
+		{
+			regStoreInstToConstLoc(RI, 32, getOp1(I), &CTR);
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreMSR:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp2(I));
+			regStoreInstToConstLoc(RI, 32, getOp1(I), &MSR);
+			regNormalRegClear(RI, I);
+
+			// If some exceptions are pending and EE are now enabled, force checking
+			// external exceptions when going out of mtmsr in order to execute delayed
+			// interrupts as soon as possible.
+			Jit->MOV(32, R(RSCRATCH), PPCSTATE(msr));
+			Jit->TEST(32, R(RSCRATCH), Imm32(0x8000));
+			FixupBranch eeDisabled = Jit->J_CC(CC_Z);
+
+			Jit->MOV(32, R(RSCRATCH), PPCSTATE(Exceptions));
+			Jit->TEST(32, R(RSCRATCH), R(RSCRATCH));
+			FixupBranch noExceptionsPending = Jit->J_CC(CC_Z);
+
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc + 4));
+			Jit->WriteExceptionExit(); // TODO: Implement WriteExternalExceptionExit for JitIL
+
+			Jit->SetJumpTarget(eeDisabled);
+			Jit->SetJumpTarget(noExceptionsPending);
+			break;
+		}
+		case StoreGQR:
+		{
+			unsigned gqr = *I >> 16;
+			regStoreInstToConstLoc(RI, 32, getOp1(I), &GQR(gqr));
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreSRR:
+		{
+			unsigned srr = *I >> 16;
+			regStoreInstToConstLoc(RI, 32, getOp1(I),
+					&PowerPC::ppcState.spr[SPR_SRR0+srr]);
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreCarry:
+		{
+			Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm8(0));
+			FixupBranch nocarry = Jit->J_CC(CC_Z);
+			Jit->JitSetCA();
+			FixupBranch cont = Jit->J();
+			Jit->SetJumpTarget(nocarry);
+			Jit->JitClearCA();
+			Jit->SetJumpTarget(cont);
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreFPRF:
+		{
+			Jit->MOV(32, R(RSCRATCH2), regLocForInst(RI, getOp1(I)));
+			Jit->AND(32, R(RSCRATCH2), Imm8(0x1F));
+			Jit->SHL(32, R(RSCRATCH2), Imm8(12));
+			Jit->AND(32, PPCSTATE(fpscr), Imm32(~(0x1F << 12)));
+			Jit->OR(32, PPCSTATE(fpscr), R(RSCRATCH2));
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case Load8:
+		{
+			regEmitMemLoad(RI, I, 8);
+			break;
+		}
+		case Load16:
+		{
+			regEmitMemLoad(RI, I, 16);
+			break;
+		}
+		case Load32:
+		{
+			regEmitMemLoad(RI, I, 32);
+			break;
+		}
+		case Store8:
+		{
+			regEmitMemStore(RI, I, 8);
+			break;
+		}
+		case Store16:
+		{
+			regEmitMemStore(RI, I, 16);
+			break;
+		}
+		case Store32:
+		{
+			regEmitMemStore(RI, I, 32);
+			break;
+		}
+		case SExt8:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->MOV(32, R(RSCRATCH2), regLocForInst(RI, getOp1(I)));
+			Jit->MOVSX(32, 8, reg, R(RSCRATCH2));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case SExt16:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->MOVSX(32, 16, reg, regLocForInst(RI, getOp1(I)));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case Cntlzw:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->MOV(32, R(RSCRATCH2), Imm32(63));
+			Jit->BSR(32, reg, regLocForInst(RI, getOp1(I)));
+			Jit->CMOVcc(32, reg, R(RSCRATCH2), CC_Z);
+			Jit->XOR(32, R(reg), Imm8(31));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case Not:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regBinLHSReg(RI, I);
+			Jit->NOT(32, R(reg));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case And:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitBinInst(RI, I, &JitIL::AND, true);
+			break;
+		}
+		case Xor:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitBinInst(RI, I, &JitIL::XOR, true);
+			break;
+		}
+		case Sub:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitBinInst(RI, I, &JitIL::SUB);
+			break;
+		}
+		case Or:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitBinInst(RI, I, &JitIL::OR, true);
+			break;
+		}
+		case Add:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitBinInst(RI, I, &JitIL::ADD, true);
+			break;
+		}
+		case Mul:
+		{
+			if (!thisUsed)
+				break;
+
+			// FIXME: Use three-address capability of IMUL!
+			X64Reg reg = regBinLHSReg(RI, I);
+			if (isImm(*getOp2(I)))
+			{
+				unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+				if (RHS + 128 < 256)
+					Jit->IMUL(32, reg, Imm8(RHS));
+				else
+					Jit->IMUL(32, reg, Imm32(RHS));
+			}
+			else
+			{
+				Jit->IMUL(32, reg, regLocForInst(RI, getOp2(I)));
+			}
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case MulHighUnsigned:
+		{
+			if (!thisUsed)
+				break;
+
+			// no register choice
+			regSpill(RI, EAX);
+			regSpill(RI, EDX);
+			X64Reg reg = regBinReg(RI, I);
+			if (isImm(*getOp2(I)))
+			{
+				unsigned RHS = RI.Build->GetImmValue(getOp2(I));
+				Jit->MOV(32, R(EAX), Imm32(RHS));
+			}
+			else
+			{
+				Jit->MOV(32, R(EAX), regLocForInst(RI, getOp2(I)));
+			}
+			Jit->MUL(32, regLocForInst(RI, getOp1(I)));
+			Jit->MOV(32, R(reg), R(EDX));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case Rol:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitShiftInst(RI, I, &JitIL::ROL);
+			break;
+		}
+		case Shl:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitShiftInst(RI, I, &JitIL::SHL);
+			break;
+		}
+		case Shrl:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitShiftInst(RI, I, &JitIL::SHR);
+			break;
+		}
+		case Sarl:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitShiftInst(RI, I, &JitIL::SAR);
+			break;
+		}
+		case ICmpEq:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_E);
+			break;
+		}
+		case ICmpNe:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_NE);
+			break;
+		}
+		case ICmpUgt:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_A);
+			break;
+		}
+		case ICmpUlt:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_B);
+			break;
+		}
+		case ICmpUge:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_AE);
+			break;
+		}
+		case ICmpUle:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_BE);
+			break;
+		}
+		case ICmpSgt:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_G);
+			break;
+		}
+		case ICmpSlt:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_L);
+			break;
+		}
+		case ICmpSge:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_GE);
+			break;
+		}
+		case ICmpSle:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpInst(RI, I, CC_LE);
+			break;
+		}
+		case ICmpCRUnsigned:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpCRInst(RI, I);
+			break;
+		}
+		case ICmpCRSigned:
+		{
+			if (!thisUsed)
+				break;
+
+			regEmitICmpCRInst(RI, I);
+			break;
+		}
+		case ConvertFromFastCR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg cr_val = regUReg(RI, I);
+			Jit->MOV(64, R(cr_val), regLocForInst(RI, getOp1(I)));
+
+			Jit->XOR(32, R(RSCRATCH), R(RSCRATCH));
+
+			// SO: Bit 61 set.
+			Jit->MOV(64, R(RSCRATCH2), R(cr_val));
+			Jit->SHR(64, R(RSCRATCH2), Imm8(61));
+			Jit->AND(32, R(RSCRATCH2), Imm8(1));
+			Jit->OR(32, R(RSCRATCH), R(RSCRATCH2));
+
+			// EQ: Bits 31-0 == 0.
+			Jit->XOR(32, R(RSCRATCH2), R(RSCRATCH2));
+			Jit->TEST(32, R(cr_val), R(cr_val));
+			Jit->SETcc(CC_Z, R(RSCRATCH2));
+			Jit->SHL(32, R(RSCRATCH2), Imm8(1));
+			Jit->OR(32, R(RSCRATCH), R(RSCRATCH2));
+
+			// GT: Value > 0.
+			Jit->XOR(32, R(RSCRATCH2), R(RSCRATCH2));
+			Jit->TEST(64, R(cr_val), R(cr_val));
+			Jit->SETcc(CC_G, R(RSCRATCH2));
+			Jit->SHL(32, R(RSCRATCH2), Imm8(2));
+			Jit->OR(32, R(RSCRATCH), R(RSCRATCH2));
+
+			// LT: Bit 62 set.
+			Jit->MOV(64, R(RSCRATCH2), R(cr_val));
+			Jit->SHR(64, R(RSCRATCH2), Imm8(62 - 3));
+			Jit->AND(32, R(RSCRATCH2), Imm8(0x8));
+			Jit->OR(32, R(RSCRATCH), R(RSCRATCH2));
+
+			Jit->MOV(32, R(cr_val), R(RSCRATCH));
+			RI.regs[cr_val] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case ConvertToFastCR:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg cr_val = regUReg(RI, I);
+			Jit->MOV(64, R(cr_val), regLocForInst(RI, getOp1(I)));
+
+			Jit->MOV(64, R(RSCRATCH2), Imm64(1ull << 32));
+
+			// SO
+			Jit->MOV(64, R(RSCRATCH), R(cr_val));
+			Jit->SHL(64, R(RSCRATCH), Imm8(63));
+			Jit->SHR(64, R(RSCRATCH), Imm8(63 - 61));
+			Jit->OR(64, R(RSCRATCH2), R(RSCRATCH));
+
+			// EQ
+			Jit->MOV(64, R(RSCRATCH), R(cr_val));
+			Jit->NOT(64, R(RSCRATCH));
+			Jit->AND(64, R(RSCRATCH), Imm8(CR_EQ));
+			Jit->OR(64, R(RSCRATCH2), R(RSCRATCH));
+
+			// GT
+			Jit->MOV(64, R(RSCRATCH), R(cr_val));
+			Jit->NOT(64, R(RSCRATCH));
+			Jit->AND(64, R(RSCRATCH), Imm8(CR_GT));
+			Jit->SHL(64, R(RSCRATCH), Imm8(63 - 2));
+			Jit->OR(64, R(RSCRATCH2), R(RSCRATCH));
+
+			// LT
+			Jit->MOV(64, R(RSCRATCH), R(cr_val));
+			Jit->AND(64, R(RSCRATCH), Imm8(CR_LT));
+			Jit->SHL(64, R(RSCRATCH), Imm8(62 - 3));
+			Jit->OR(64, R(RSCRATCH2), R(RSCRATCH));
+
+			Jit->MOV(64, R(cr_val), R(RSCRATCH2));
+
+			RI.regs[cr_val] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case FastCRSOSet:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->MOV(64, R(RSCRATCH), Imm64(1ull << 61));
+			Jit->TEST(64, regLocForInst(RI, getOp1(I)), R(RSCRATCH));
+			Jit->SETcc(CC_NZ, R(RSCRATCH));
+			Jit->MOVZX(32, 8, reg, R(RSCRATCH));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case FastCREQSet:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm32(0));
+			Jit->SETcc(CC_Z, R(RSCRATCH));
+			Jit->MOVZX(32, 8, reg, R(RSCRATCH));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case FastCRGTSet:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->CMP(64, regLocForInst(RI, getOp1(I)), Imm8(0));
+			Jit->SETcc(CC_G, R(RSCRATCH));
+			Jit->MOVZX(32, 8, reg, R(RSCRATCH));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case FastCRLTSet:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regUReg(RI, I);
+			Jit->MOV(64, R(RSCRATCH), Imm64(1ull << 62));
+			Jit->TEST(64, regLocForInst(RI, getOp1(I)), R(RSCRATCH));
+			Jit->SETcc(CC_NZ, R(RSCRATCH));
+			Jit->MOVZX(32, 8, reg, R(RSCRATCH));
+			RI.regs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case LoadSingle:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregFindFreeReg(RI);
+			auto info = regBuildMemAddress(RI, I, getOp1(I), 1, nullptr);
+
+			RI.Jit->SafeLoadToReg(RSCRATCH2, info.first, 32, info.second, regsInUse(RI), false);
+			Jit->MOVD_xmm(reg, R(RSCRATCH2));
+			RI.fregs[reg] = I;
+			break;
+		}
+		case LoadDouble:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregFindFreeReg(RI);
+			auto info = regBuildMemAddress(RI, I, getOp1(I), 1, nullptr);
+
+			RI.Jit->SafeLoadToReg(RSCRATCH2, info.first, 64, info.second, regsInUse(RI), false);
+			Jit->MOVQ_xmm(reg, R(RSCRATCH2));
+			RI.fregs[reg] = I;
+			break;
+		}
+		case LoadPaired:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregFindFreeReg(RI);
+			// The lower 3 bits is for GQR index. The next 1 bit is for inst.W
+			unsigned int quantreg = (*I >> 16) & 0x7;
+			unsigned int w = *I >> 19;
+			// Some games (e.g. Dirt 2) incorrectly set the unused bits which breaks the lookup table code.
+			// Hence, we need to mask out the unused bits. The layout of the GQR register is
+			// UU[SCALE]UUUUU[TYPE] where SCALE is 6 bits and TYPE is 3 bits, so we have to AND with
+			// 0b0011111100000111, or 0x3F07.
+			Jit->MOV(32, R(RSCRATCH2), Imm32(0x3F07));
+			Jit->AND(32, R(RSCRATCH2), M(((char *)&GQR(quantreg)) + 2));
+			Jit->MOVZX(32, 8, RSCRATCH, R(RSCRATCH2));
+			Jit->OR(32, R(RSCRATCH), Imm8(w << 3));
+
+			Jit->MOV(32, R(RSCRATCH_EXTRA), regLocForInst(RI, getOp1(I)));
+			Jit->CALLptr(MPIC(Jit->asm_routines.pairedLoadQuantized, RSCRATCH, SCALE_8));
+			Jit->MOVAPD(reg, R(XMM0));
+			RI.fregs[reg] = I;
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case StoreSingle:
+		{
+			regSpill(RI, RSCRATCH);
+			const OpArg loc1 = fregLocForInst(RI, getOp1(I));
+			if (loc1.IsSimpleReg())
+				Jit->MOVD_xmm(R(RSCRATCH), loc1.GetSimpleReg());
+			else
+				Jit->MOV(32, R(RSCRATCH), loc1);
+
+			auto info = regBuildMemAddress(RI, I, getOp2(I), 2, nullptr);
+			if (info.first.IsImm())
+				RI.Jit->MOV(32, R(RSCRATCH2), info.first);
+			else
+				RI.Jit->LEA(32, RSCRATCH2, MDisp(info.first.GetSimpleReg(), info.second));
+
+			RI.Jit->SafeWriteRegToReg(RSCRATCH, RSCRATCH2, 32, 0, regsInUse(RI));
+
+			if (RI.IInfo[I - RI.FirstI] & 4)
+				fregClearInst(RI, getOp1(I));
+			break;
+		}
+		case StoreDouble:
+		{
+			regSpill(RI, RSCRATCH);
+
+			OpArg value = fregLocForInst(RI, getOp1(I));
+			Jit->MOVAPD(XMM0, value);
+			Jit->MOVQ_xmm(R(RSCRATCH), XMM0);
+
+			auto info = regBuildMemAddress(RI, I, getOp2(I), 2, nullptr);
+			if (info.first.IsImm())
+				RI.Jit->MOV(32, R(RSCRATCH2), info.first);
+			else
+				RI.Jit->LEA(32, RSCRATCH2, MDisp(info.first.GetSimpleReg(), info.second));
+
+			RI.Jit->SafeWriteRegToReg(RSCRATCH, RSCRATCH2, 64, 0, regsInUse(RI));
+
+			if (RI.IInfo[I - RI.FirstI] & 4)
+				fregClearInst(RI, getOp1(I));
+			break;
+		}
+		case StorePaired:
+		{
+			regSpill(RI, RSCRATCH);
+			regSpill(RI, RSCRATCH2);
+			u32 quantreg = *I >> 24;
+			Jit->MOV(32, R(RSCRATCH2), Imm32(0x3F07));
+			Jit->AND(32, R(RSCRATCH2), PPCSTATE(spr[SPR_GQR0 + quantreg]));
+			Jit->MOVZX(32, 8, RSCRATCH, R(RSCRATCH2));
+
+			Jit->MOV(32, R(RSCRATCH_EXTRA), regLocForInst(RI, getOp2(I)));
+			Jit->MOVAPD(XMM0, fregLocForInst(RI, getOp1(I)));
+			Jit->CALLptr(MPIC(Jit->asm_routines.pairedStoreQuantized, RSCRATCH, SCALE_8));
+			if (RI.IInfo[I - RI.FirstI] & 4)
+				fregClearInst(RI, getOp1(I));
+			if (RI.IInfo[I - RI.FirstI] & 8)
+				regClearInst(RI, getOp2(I));
+			break;
+		}
+		case DupSingleToMReg:
+		{
+			if (!thisUsed) break;
+
+			X64Reg input = fregEnsureInReg(RI, getOp1(I));
+			X64Reg output = fregURegWithoutMov(RI, I);
+			Jit->ConvertSingleToDouble(output, input);
+
+			RI.fregs[output] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case InsertDoubleInMReg:
+		{
+			if (!thisUsed) break;
+			// r[0] = op1[0]; r[1] = op2[1];
+
+			// TODO: Optimize the case that the register of op1 can be
+			//       recycled. (SHUFPD may not be so fast.)
+			X64Reg reg = fregBinRHSRegWithMov(RI, I);
+			OpArg loc1 = fregLocForInst(RI, getOp1(I));
+			if (loc1.IsSimpleReg())
+			{
+				Jit->MOVSD(reg, loc1);
+			}
+			else
+			{
+				// If op1 is in FSlotSet, we have to mov loc1 to XMM0
+				// before MOVSD/MOVSS.
+				// Because register<->memory transfer with MOVSD/MOVSS
+				// clears upper 64/96-bits of the destination register.
+				Jit->MOVAPD(XMM0, loc1);
+				Jit->MOVSD(reg, R(XMM0));
+			}
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case ExpandPackedToMReg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithoutMov(RI, I);
+			Jit->CVTPS2PD(reg, fregLocForInst(RI, getOp1(I)));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case CompactMRegToPacked:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithoutMov(RI, I);
+			Jit->CVTPD2PS(reg, fregLocForInst(RI, getOp1(I)));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FSNeg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithMov(RI, I);
+			static const u32 GC_ALIGNED16(ssSignBits[4]) = {0x80000000};
+			Jit->PXOR(reg, M(ssSignBits));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FDNeg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithMov(RI, I);
+			static const u64 GC_ALIGNED16(sdSignBits[2]) = {0x8000000000000000ULL};
+			Jit->PXOR(reg, M(sdSignBits));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPNeg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithMov(RI, I);
+			static const u32 GC_ALIGNED16(psSignBits[4]) = {0x80000000, 0x80000000};
+			Jit->PXOR(reg, M(psSignBits));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPDup0:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithMov(RI, I);
+			Jit->PUNPCKLDQ(reg, R(reg));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPDup1:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregURegWithMov(RI, I);
+			Jit->SHUFPS(reg, R(reg), 0xE5);
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case LoadFReg:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregFindFreeReg(RI);
+			unsigned ppcreg = *I >> 8;
+			Jit->MOVAPD(reg, PPCSTATE(ps[ppcreg]));
+			RI.fregs[reg] = I;
+			break;
+		}
+		case LoadFRegDENToZero:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = fregFindFreeReg(RI);
+			unsigned ppcreg = *I >> 8;
+			char *p = (char*)&(PowerPC::ppcState.ps[ppcreg][0]);
+			Jit->MOV(32, R(RSCRATCH2), M(p+4));
+			Jit->AND(32, R(RSCRATCH2), Imm32(0x7ff00000));
+			Jit->CMP(32, R(RSCRATCH2), Imm32(0x38000000));
+			FixupBranch ok = Jit->J_CC(CC_AE);
+			Jit->AND(32, M(p+4), Imm32(0x80000000));
+			Jit->MOV(32, M(p), Imm32(0));
+			Jit->SetJumpTarget(ok);
+			Jit->MOVAPD(reg, PPCSTATE(ps[ppcreg]));
+			RI.fregs[reg] = I;
+			break;
+		}
+		case StoreFReg:
+		{
+			unsigned ppcreg = *I >> 16;
+			Jit->MOVAPD(PPCSTATE(ps[ppcreg]),
+				      fregEnsureInReg(RI, getOp1(I)));
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case DoubleToSingle:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg input = fregEnsureInReg(RI, getOp1(I));
+			X64Reg output = fregURegWithoutMov(RI, I);
+			Jit->ConvertDoubleToSingle(output, input);
+
+			RI.fregs[output] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FSMul:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::MULSS);
+			break;
+		}
+		case FSAdd:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::ADDSS);
+			break;
+		}
+		case FSSub:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::SUBSS);
+			break;
+		}
+		case FDMul:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::MULSD);
+			break;
+		}
+		case FDAdd:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::ADDSD);
+			break;
+		}
+		case FDSub:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::SUBSD);
+			break;
+		}
+		case FDCmpCR:
+		{
+			const u32 ordered = *I >> 24;
+			X64Reg destreg = regFindFreeReg(RI);
+			// TODO: Remove an extra MOVSD if loc1.IsSimpleReg()
+			OpArg loc1 = fregLocForInst(RI, getOp1(I));
+			OpArg loc2 = fregLocForInst(RI, getOp2(I));
+			Jit->MOVSD(XMM0, loc1);
+			Jit->UCOMISD(XMM0, loc2);
+			FixupBranch pNan     = Jit->J_CC(CC_P);
+			FixupBranch pEqual   = Jit->J_CC(CC_Z);
+			FixupBranch pLesser  = Jit->J_CC(CC_C);
+			// Greater
+			Jit->MOV(32, R(destreg), Imm32(0x4));
+			FixupBranch continue1 = Jit->J();
+			// NaN
+			Jit->SetJumpTarget(pNan);
+			Jit->MOV(32, R(destreg), Imm32(0x1));
+
+			if (ordered)
+			{
+				// fcmpo
+				// TODO: Optimize the following code if slow.
+				//       SNAN check may not be needed
+				//       because it does not happen so much.
+				Jit->MOVSD(M(isSNANTemp[0]), XMM0);
+				if (loc2.IsSimpleReg())
+				{
+					Jit->MOVSD(M(isSNANTemp[1]), loc2.GetSimpleReg());
+				}
+				else
+				{
+					Jit->MOVSD(XMM0, loc2);
+					Jit->MOVSD(M(isSNANTemp[1]), XMM0);
+				}
+				Jit->ABI_CallFunction((void*)checkIsSNAN);
+				Jit->TEST(8, R(ABI_RETURN), R(ABI_RETURN));
+				FixupBranch ok = Jit->J_CC(CC_Z);
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_VXSNAN)); // FPSCR.Hex |= mask;
+					Jit->TEST(32, PPCSTATE(fpscr), Imm32(FPSCR_VE));
+					FixupBranch finish0 = Jit->J_CC(CC_NZ);
+						Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
+						FixupBranch finish1 = Jit->J();
+				Jit->SetJumpTarget(ok);
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
+				Jit->SetJumpTarget(finish0);
+				Jit->SetJumpTarget(finish1);
+			}
+			else
+			{
+				// fcmpu
+				// TODO: Optimize the following code if slow
+				Jit->MOVSD(M(isSNANTemp[0]), XMM0);
+				if (loc2.IsSimpleReg())
+				{
+					Jit->MOVSD(M(isSNANTemp[1]), loc2.GetSimpleReg());
+				}
+				else
+				{
+					Jit->MOVSD(XMM0, loc2);
+					Jit->MOVSD(M(isSNANTemp[1]), XMM0);
+				}
+				Jit->ABI_CallFunction((void*)checkIsSNAN);
+				Jit->TEST(8, R(ABI_RETURN), R(ABI_RETURN));
+				FixupBranch finish = Jit->J_CC(CC_Z);
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
+					Jit->OR(32, PPCSTATE(fpscr), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
+				Jit->SetJumpTarget(finish);
+			}
+
+			FixupBranch continue2 = Jit->J();
+			// Equal
+			Jit->SetJumpTarget(pEqual);
+			Jit->MOV(32, R(destreg), Imm32(0x2));
+			FixupBranch continue3 = Jit->J();
+			// Less
+			Jit->SetJumpTarget(pLesser);
+			Jit->MOV(32, R(destreg), Imm32(0x8));
+			Jit->SetJumpTarget(continue1);
+			Jit->SetJumpTarget(continue2);
+			Jit->SetJumpTarget(continue3);
+			RI.regs[destreg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPAdd:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::ADDPS);
+			break;
+		}
+		case FPMul:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::MULPS);
+			break;
+		}
+		case FPSub:
+		{
+			if (!thisUsed)
+				break;
+
+			fregEmitBinInst(RI, I, &JitIL::SUBPS);
+			break;
+		}
+		case FPMerge00:
+		{
+			// r[0] = op1[0]; r[1] = op2[0];
+			if (!thisUsed)
+				break;
+
+			// TODO: Optimize the case that the register of only op2 can be
+			//       recycled.
+			X64Reg reg = fregBinLHSRegWithMov(RI, I);
+			Jit->PUNPCKLDQ(reg, fregLocForInst(RI, getOp2(I)));
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPMerge01:
+		{
+			// r[0] = op1[0]; r[1] = op2[1];
+			if (!thisUsed)
+				break;
+
+			// TODO: Optimize the case that the register of only op1 can be
+			//       recycled.
+			X64Reg reg = fregBinRHSRegWithMov(RI, I);
+			OpArg loc1 = fregLocForInst(RI, getOp1(I));
+			if (loc1.IsSimpleReg())
+			{
+				Jit->MOVSS(reg, loc1);
+			}
+			else
+			{
+				Jit->MOVAPD(XMM0, loc1);
+				Jit->MOVSS(reg, R(XMM0));
+			}
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPMerge10:
+		{
+			// r[0] = op1[1]; r[1] = op2[0];
+			if (!thisUsed)
+				break;
+
+			// TODO: Optimize the case that the register of only op2 can be
+			//       recycled.
+			X64Reg reg = fregBinLHSRegWithMov(RI, I);
+			OpArg loc2 = fregLocForInst(RI, getOp2(I));
+			if (loc2.IsSimpleReg())
+			{
+				Jit->MOVSS(reg, loc2);
+			}
+			else
+			{
+				Jit->MOVAPD(XMM0, loc2);
+				Jit->MOVSS(reg, R(XMM0));
+			}
+			Jit->SHUFPS(reg, R(reg), 0xF1);
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case FPMerge11:
+		{
+			// r[0] = op1[1]; r[1] = op2[1];
+			if (!thisUsed)
+				break;
+
+			// TODO: Optimize the case that the register of only op2 can be
+			//       recycled.
+			X64Reg reg = fregBinLHSRegWithMov(RI, I);
+			// TODO: Check whether the following code works
+			//       when the op1 is in the FSlotSet
+			Jit->PUNPCKLDQ(reg, fregLocForInst(RI, getOp2(I)));
+			Jit->SHUFPD(reg, R(reg), 0x1);
+			RI.fregs[reg] = I;
+			fregNormalRegClear(RI, I);
+			break;
+		}
+		case CInt32:
+		case CInt16:
+		{
+			if (!thisUsed)
+				break;
+
+			X64Reg reg = regFindFreeReg(RI);
+			u64 val = ibuild->GetImmValue64(I);
+			if ((u32)val == val)
+				Jit->MOV(32, R(reg), Imm32((u32)val));
+			else if ((s32)val == (s64)val)
+				Jit->MOV(64, R(reg), Imm32((s32)val));
+			else
+				Jit->MOV(64, R(reg), Imm64(val));
+			RI.regs[reg] = I;
+			break;
+		}
+		case BlockStart:
+		case BlockEnd:
+			break;
+
+		case IdleBranch:
+		{
+			// If value is 0, we don't need to call out to the idle function.
+			OpArg value = regLocForInst(RI, getOp1(I));
+			Jit->TEST(32, value, value);
+			FixupBranch noidle = Jit->J_CC(CC_NZ);
+
+			RI.Jit->Cleanup(); // is it needed?
+			Jit->ABI_CallFunction((void *)&PowerPC::OnIdle);
+
+			Jit->MOV(32, PPCSTATE(pc), Imm32(ibuild->GetImmValue( getOp2(I) )));
+			Jit->WriteExceptionExit();
+
+			Jit->SetJumpTarget(noidle);
+			if (RI.IInfo[I - RI.FirstI] & 4)
+					regClearInst(RI, getOp1(I));
+			if (RI.IInfo[I - RI.FirstI] & 8)
+				regClearInst(RI, getOp2(I));
+			break;
+		}
+
+		case BranchCond:
+		{
+			if (isICmp(*getOp1(I)))
+			{
+				regEmitCmp(RI, getOp1(I));
+				CCFlags flag;
+				switch (getOpcode(*getOp1(I)))
+				{
+					case ICmpEq:
+						flag = CC_NE;
+						break;
+					case ICmpNe:
+						flag = CC_E;
+						break;
+					case ICmpUgt:
+						flag = CC_BE;
+						break;
+					case ICmpUlt:
+						flag = CC_AE;
+						break;
+					case ICmpUge:
+						flag = CC_B;
+						break;
+					case ICmpUle:
+						flag = CC_A;
+						break;
+					case ICmpSgt:
+						flag = CC_LE;
+						break;
+					case ICmpSlt:
+						flag = CC_GE;
+						break;
+					case ICmpSge:
+						flag = CC_L;
+						break;
+					case ICmpSle:
+						flag = CC_G;
+						break;
+					default:
+						PanicAlert("cmpXX");
+						flag = CC_O;
+						break;
+				}
+				FixupBranch cont = Jit->J_CC(flag);
+				regWriteExit(RI, getOp2(I));
+				Jit->SetJumpTarget(cont);
+				if (RI.IInfo[I - RI.FirstI] & 4)
+					regClearInst(RI, getOp1(getOp1(I)));
+				if (RI.IInfo[I - RI.FirstI] & 8)
+					regClearInst(RI, getOp2(getOp1(I)));
+			}
+			else
+			{
+				Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm8(0));
+				FixupBranch cont = Jit->J_CC(CC_Z);
+				regWriteExit(RI, getOp2(I));
+				Jit->SetJumpTarget(cont);
+				if (RI.IInfo[I - RI.FirstI] & 4)
+					regClearInst(RI, getOp1(I));
+			}
+			if (RI.IInfo[I - RI.FirstI] & 8)
+				regClearInst(RI, getOp2(I));
+			break;
+		}
+		case BranchUncond:
+		{
+			regWriteExit(RI, getOp1(I));
+			regNormalRegClear(RI, I);
+			break;
+		}
+		case ShortIdleLoop:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+			Jit->ABI_CallFunction((void *)&CoreTiming::Idle);
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->WriteExceptionExit();
+			break;
+		}
+		case SystemCall:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+			Jit->LOCK();
+			Jit->OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_SYSCALL));
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc + 4));
+			Jit->WriteExceptionExit();
+			break;
+		}
+		case InterpreterBranch:
+		{
+			Jit->MOV(32, R(RSCRATCH), PPCSTATE(npc));
+			Jit->WriteExitDestInOpArg(R(RSCRATCH));
+			break;
+		}
+		case RFIExit:
+		{
+			// See Interpreter rfi for details
+			const u32 mask = 0x87C0FFFF;
+			// MSR = (MSR & ~mask) | (SRR1 & mask);
+			Jit->MOV(32, R(RSCRATCH), PPCSTATE(msr));
+			Jit->MOV(32, R(RSCRATCH2), PPCSTATE_SRR1);
+			Jit->AND(32, R(RSCRATCH), Imm32(~mask));
+			Jit->AND(32, R(RSCRATCH2), Imm32(mask));
+			Jit->OR(32, R(RSCRATCH), R(RSCRATCH2));
+			// MSR &= 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
+			Jit->AND(32, R(RSCRATCH), Imm32(0xFFFBFFFF));
+			Jit->MOV(32, PPCSTATE(msr), R(RSCRATCH));
+			// NPC = SRR0;
+			Jit->MOV(32, R(RSCRATCH), PPCSTATE_SRR0);
+			Jit->WriteRfiExitDestInOpArg(R(RSCRATCH));
+			break;
+		}
+		case FPExceptionCheck:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+			//This instruction uses FPU - needs to add FP exception bailout
+			Jit->TEST(32, PPCSTATE(msr), Imm32(1 << 13)); // Test FP enabled bit
+			FixupBranch b1 = Jit->J_CC(CC_NZ);
+
+			// If a FPU exception occurs, the exception handler will read
+			// from PC.  Update PC with the latest value in case that happens.
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->SUB(32, PPCSTATE(downcount), Imm32(Jit->js.downcountAmount));
+			Jit->OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
+			Jit->WriteExceptionExit();
+			Jit->SetJumpTarget(b1);
+			break;
+		}
+		case DSIExceptionCheck:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+			Jit->TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_DSI));
+			FixupBranch noMemException = Jit->J_CC(CC_Z);
+
+			// If a memory exception occurs, the exception handler will read
+			// from PC.  Update PC with the latest value in case that happens.
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->WriteExceptionExit();
+			Jit->SetJumpTarget(noMemException);
+			break;
+		}
+		case ExtExceptionCheck:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+
+			Jit->TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT));
+			FixupBranch clearInt = Jit->J_CC(CC_NZ);
+			Jit->TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
+			FixupBranch noExtException = Jit->J_CC(CC_Z);
+			Jit->TEST(32, PPCSTATE(msr), Imm32(0x0008000));
+			FixupBranch noExtIntEnable = Jit->J_CC(CC_Z);
+			Jit->TEST(32, M(&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH));
+			FixupBranch noCPInt = Jit->J_CC(CC_Z);
+
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->WriteExceptionExit();
+
+			Jit->SetJumpTarget(noCPInt);
+			Jit->SetJumpTarget(noExtIntEnable);
+			Jit->SetJumpTarget(noExtException);
+			Jit->SetJumpTarget(clearInt);
+			break;
+		}
+		case BreakPointCheck:
+		{
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+
+			Jit->MOV(32, PPCSTATE(pc), Imm32(InstLoc));
+			Jit->ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
+			Jit->TEST(32, M(PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
+			FixupBranch noBreakpoint = Jit->J_CC(CC_Z);
+			Jit->WriteExit(InstLoc);
+			Jit->SetJumpTarget(noBreakpoint);
+			break;
+		}
+		case Int3:
+		{
+			Jit->INT3();
+			break;
+		}
+		case Tramp: break;
+		case Nop: break;
+		default:
+			PanicAlert("Unknown JIT instruction; aborting!");
+			exit(1);
+		}
+	}
+
+	for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++)
+	{
+		if (RI.regs[i])
+		{
+			// Start a game in Burnout 2 to get this. Or animal crossing.
+			PanicAlert("Incomplete cleanup! (regs)");
+			exit(1);
+		}
+
+		if (RI.fregs[i])
+		{
+			PanicAlert("Incomplete cleanup! (fregs)");
+			exit(1);
+		}
+	}
+
+	Jit->WriteExit(exitAddress);
+	Jit->UD2();
+}
+
+void JitIL::WriteCode(u32 exitAddress)
+{
+	DoWriteCode(&ibuild, this, exitAddress);
+}
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
new file mode 100644
index 0000000000..aea7d9446f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
@@ -0,0 +1,684 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <ctime> // For profiling
+#include <map>
+#include <memory>
+#include <string>
+
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/Intrinsics.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Core/PatchEngine.h"
+#include "Core/HLE/HLE.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/Jit64IL/JitIL.h"
+#include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
+
+using namespace Gen;
+using namespace PowerPC;
+
+// Dolphin's PowerPC->x86 JIT dynamic recompiler
+// (Nearly) all code by ector (hrydgard)
+// Features:
+// * x86 & x64 support, lots of shared code.
+// * Basic block linking
+// * Fast dispatcher
+
+// Unfeatures:
+// * Does not recompile all instructions - sometimes falls back to inserting a CALL to the corresponding Interpreter function.
+
+// Various notes below
+
+// Register allocation
+//   RAX - Generic quicktemp register
+//   RBX - point to base of memory map
+//   RSI RDI R12 R13 R14 R15 - free for allocation
+//   RCX RDX R8 R9 R10 R11 - allocate in emergencies. These need to be flushed before functions are called.
+//   RSP - stack pointer, do not generally use, very dangerous
+//   RBP - ?
+
+// IMPORTANT:
+// Make sure that all generated code and all emulator state sits under the 2GB boundary so that
+// RIP addressing can be used easily. Windows will always allocate static code under the 2GB boundary.
+// Also make sure to use VirtualAlloc and specify EXECUTE permission.
+
+// Open questions
+// * Should there be any statically allocated registers? r3, r4, r5, r8, r0 come to mind.. maybe sp
+// * Does it make sense to finish off the remaining non-jitted instructions? Seems we are hitting diminishing returns.
+
+// Other considerations
+//
+// Many instructions have shorter forms for EAX. However, I believe their performance boost
+// will be as small to be negligible, so I haven't dirtied up the code with that. AMD recommends it in their
+// optimization manuals, though.
+//
+// We support block linking. Reserve space at the exits of every block for a full 5-byte jmp. Save 16-bit offsets
+// from the starts of each block, marking the exits so that they can be nicely patched at any time.
+//
+// Blocks do NOT use call/ret, they only jmp to each other and to the dispatcher when necessary.
+//
+// All blocks that can be precompiled will be precompiled. Code will be memory protected - any write will mark
+// the region as non-compilable, and all links to the page will be torn out and replaced with dispatcher jmps.
+//
+// Alternatively, icbi instruction SHOULD mark where we can't compile
+//
+// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
+// expensive anyway since we need to return to dispatcher, except when they can be predicted).
+
+// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
+//       Somewhat fixed by disabling idle skipping when certain interrupts are enabled
+//       This is no permanent reliable fix
+// TODO: Zeldas go whacko when you hang the gfx thread
+
+// Idea - Accurate exception handling
+// Compute register state at a certain instruction by running the JIT in "dry mode", and stopping at the right place.
+// Not likely to be done :P
+
+
+// Optimization Ideas -
+/*
+  * Assume SP is in main RAM (in Wii mode too?) - partly done
+  * Assume all floating point loads and double precision loads+stores are to/from main ram
+    (single precision can be used in write gather pipe, specialized fast check added)
+  * AMD only - use movaps instead of movapd when loading ps from memory?
+  * HLE functions like floorf, sin, memcpy, etc - they can be much faster
+  * ABI optimizations - drop F0-F13 on blr, for example. Watch out for context switching.
+    CR2-CR4 are non-volatile, rest of CR is volatile -> dropped on blr.
+	R5-R12 are volatile -> dropped on blr.
+  * classic inlining across calls.
+
+Low hanging fruit:
+stfd -- guaranteed in memory
+cmpl
+mulli
+stfs
+stwu
+lb/stzx
+
+bcx - optimize!
+bcctr
+stfs
+psq_st
+addx
+orx
+rlwimix
+fcmpo
+DSP_UpdateARAMDMA
+lfd
+stwu
+cntlzwx
+bcctrx
+WriteBigEData
+
+TODO
+lha
+srawx
+addic_rc
+addex
+subfcx
+subfex
+
+fmaddx
+fmulx
+faddx
+fnegx
+frspx
+frsqrtex
+ps_sum0
+ps_muls0
+ps_adds1
+
+*/
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <memory>
+#include <stdint.h>
+
+#if defined(__clang__)
+#if !__has_builtin(__builtin_ia32_rdtsc)
+static inline uint64_t __rdtsc()
+{
+	uint32_t lo, hi;
+#ifdef _LP64
+	__asm__ __volatile__("xorl %%eax,%%eax \n cpuid"
+			::: "%rax", "%rbx", "%rcx", "%rdx");
+	__asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi));
+	return (uint64_t)hi << 32 | lo;
+#else
+	__asm__ __volatile__(
+			"xor    %%eax,%%eax;"
+			"push   %%ebx;"
+			"cpuid;"
+			"pop    %%ebx;"
+			::: "%eax", "%ecx", "%edx");
+	__asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi));
+#endif
+	return (uint64_t)hi << 32 | lo;
+}
+#endif
+#endif
+#endif
+
+namespace JitILProfiler
+{
+	struct Block
+	{
+		u32 index;
+		u64 codeHash;
+		u64 totalElapsed;
+		u64 numberOfCalls;
+
+		Block() : index(0), codeHash(0), totalElapsed(0), numberOfCalls(0)
+		{
+		}
+	};
+
+	static std::vector<Block> blocks;
+	static u32 blockIndex;
+	static u64 beginTime;
+	static Block& Add(u64 codeHash)
+	{
+		const u32 _blockIndex = (u32)blocks.size();
+		blocks.emplace_back();
+		Block& block = blocks.back();
+		block.index = _blockIndex;
+		block.codeHash = codeHash;
+		return block;
+	}
+
+	// These functions need to be static because they are called with
+	// ABI_CallFunction().
+	static void Begin(u32 index)
+	{
+		blockIndex = index;
+		beginTime = __rdtsc();
+	}
+
+	static void End()
+	{
+		const u64 endTime = __rdtsc();
+		const u64 duration = endTime - beginTime;
+		Block& block = blocks[blockIndex];
+		block.totalElapsed += duration;
+		++block.numberOfCalls;
+	}
+
+	struct JitILProfilerFinalizer
+	{
+		virtual ~JitILProfilerFinalizer()
+		{
+			std::string filename = StringFromFormat("JitIL_profiling_%d.csv", (int)time(nullptr));
+			File::IOFile file(filename, "w");
+			setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024);
+			fprintf(file.GetHandle(), "code hash,total elapsed,number of calls,elapsed per call\n");
+			for (auto& block : blocks)
+			{
+				const u64 codeHash = block.codeHash;
+				const u64 totalElapsed = block.totalElapsed;
+				const u64 numberOfCalls = block.numberOfCalls;
+				const double elapsedPerCall = totalElapsed / (double)numberOfCalls;
+				fprintf(file.GetHandle(), "%016" PRIx64 ",%" PRId64 ",%" PRId64 ",%f\n", codeHash, totalElapsed, numberOfCalls, elapsedPerCall);
+			}
+		}
+	};
+
+	static std::unique_ptr<JitILProfilerFinalizer> finalizer;
+	static void Init()
+	{
+		finalizer = std::make_unique<JitILProfilerFinalizer>();
+	}
+
+	static void Shutdown()
+	{
+		finalizer.reset();
+	}
+};
+
+void JitIL::Init()
+{
+	EnableBlockLink();
+
+	jo.optimizeGatherPipe = true;
+	jo.accurateSinglePrecision = false;
+	UpdateMemoryOptions();
+
+	trampolines.Init(jo.memcheck ? TRAMPOLINE_CODE_SIZE_MMU : TRAMPOLINE_CODE_SIZE);
+	AllocCodeSpace(CODE_SIZE, PPCSTATE_BASE);
+	blocks.Init();
+	asm_routines.Init(nullptr);
+
+	farcode.Init(jo.memcheck ? FARCODE_SIZE_MMU : FARCODE_SIZE);
+
+	code_block.m_stats = &js.st;
+	code_block.m_gpa = &js.gpa;
+	code_block.m_fpa = &js.fpa;
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		JitILProfiler::Init();
+	}
+}
+
+void JitIL::ClearCache()
+{
+	blocks.Clear();
+	trampolines.ClearCodeSpace();
+	ClearCodeSpace();
+}
+
+void JitIL::Shutdown()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		JitILProfiler::Shutdown();
+	}
+
+	FreeCodeSpace();
+
+	blocks.Shutdown();
+	trampolines.Shutdown();
+	asm_routines.Shutdown();
+	farcode.Shutdown();
+}
+
+
+void JitIL::WriteCallInterpreter(UGeckoInstruction inst)
+{
+	if (js.isLastInstruction)
+	{
+		MOV(32, PPCSTATE(pc), Imm32(js.compilerPC));
+		MOV(32, PPCSTATE(npc), Imm32(js.compilerPC + 4));
+	}
+	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
+	ABI_CallFunctionC((void*)instr, inst.hex);
+	if (js.isLastInstruction)
+	{
+		MOV(32, R(RSCRATCH), PPCSTATE(npc));
+		WriteRfiExitDestInOpArg(R(RSCRATCH));
+	}
+}
+
+void JitIL::FallBackToInterpreter(UGeckoInstruction _inst)
+{
+	ibuild.EmitFallBackToInterpreter(
+		ibuild.EmitIntConst(_inst.hex),
+		ibuild.EmitIntConst(js.compilerPC));
+}
+
+void JitIL::HLEFunction(UGeckoInstruction _inst)
+{
+	ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex);
+	MOV(32, R(RSCRATCH), PPCSTATE(npc));
+	WriteExitDestInOpArg(R(RSCRATCH));
+}
+
+void JitIL::DoNothing(UGeckoInstruction _inst)
+{
+	// Yup, just don't do anything.
+}
+
+static const bool ImHereDebug = false;
+static const bool ImHereLog = false;
+static std::map<u32, int> been_here;
+
+static void ImHere()
+{
+	static File::IOFile f;
+	if (ImHereLog)
+	{
+		if (!f)
+		{
+			f.Open("log64.txt", "w");
+		}
+		fprintf(f.GetHandle(), "%08x r0: %08x r5: %08x r6: %08x\n", PC, PowerPC::ppcState.gpr[0],
+			PowerPC::ppcState.gpr[5], PowerPC::ppcState.gpr[6]);
+		f.Flush();
+	}
+
+	if (been_here.find(PC) != been_here.end())
+	{
+		been_here.find(PC)->second++;
+		if ((been_here.find(PC)->second) & 1023)
+			return;
+	}
+
+	DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR);
+	been_here[PC] = 1;
+}
+
+void JitIL::Cleanup()
+{
+	// SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time.
+	if (MMCR0.Hex || MMCR1.Hex)
+		ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
+}
+
+void JitIL::WriteExit(u32 destination)
+{
+	Cleanup();
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		ABI_CallFunction((void *)JitILProfiler::End);
+	}
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+
+	//If nobody has taken care of this yet (this can be removed when all branches are done)
+	JitBlock *b = js.curBlock;
+	JitBlock::LinkData linkData;
+	linkData.exitAddress = destination;
+	linkData.exitPtrs = GetWritableCodePtr();
+	linkData.linkStatus = false;
+
+	// Link opportunity!
+	int block;
+	if (jo.enableBlocklink && (block = blocks.GetBlockNumberFromStartAddress(destination)) >= 0)
+	{
+		// It exists! Joy of joy!
+		JMP(blocks.GetBlock(block)->checkedEntry, true);
+		linkData.linkStatus = true;
+	}
+	else
+	{
+		MOV(32, PPCSTATE(pc), Imm32(destination));
+		JMP(asm_routines.dispatcher, true);
+	}
+	b->linkData.push_back(linkData);
+}
+
+void JitIL::WriteExitDestInOpArg(const Gen::OpArg& arg)
+{
+	MOV(32, PPCSTATE(pc), arg);
+	Cleanup();
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		ABI_CallFunction((void *)JitILProfiler::End);
+	}
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void JitIL::WriteRfiExitDestInOpArg(const Gen::OpArg& arg)
+{
+	MOV(32, PPCSTATE(pc), arg);
+	MOV(32, PPCSTATE(npc), arg);
+	Cleanup();
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		ABI_CallFunction((void *)JitILProfiler::End);
+	}
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void JitIL::WriteExceptionExit()
+{
+	Cleanup();
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		ABI_CallFunction((void *)JitILProfiler::End);
+	}
+	MOV(32, R(EAX), PPCSTATE(pc));
+	MOV(32, PPCSTATE(npc), R(EAX));
+	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
+	SUB(32, PPCSTATE(downcount), Imm32(js.downcountAmount));
+	JMP(asm_routines.dispatcher, true);
+}
+
+void JitIL::Run()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+	//Will return when PowerPC::state changes
+}
+
+void JitIL::SingleStep()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+}
+
+void JitIL::Trace()
+{
+	std::string regs;
+	std::string fregs;
+
+#ifdef JIT_LOG_GPR
+	for (int i = 0; i < 32; i++)
+	{
+		regs += StringFromFormat("r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
+	}
+#endif
+
+#ifdef JIT_LOG_FPR
+	for (int i = 0; i < 32; i++)
+	{
+		fregs += StringFromFormat("f%02d: %016x ", i, riPS0(i));
+	}
+#endif
+
+	DEBUG_LOG(DYNA_REC, "JITIL PC: %08x SRR0: %08x SRR1: %08x CRval: %016lx%016lx%016lx%016lx%016lx%016lx%016lx%016lx FPSCR: %08x MSR: %08x LR: %08x %s %s",
+		PC, SRR0, SRR1, (unsigned long) PowerPC::ppcState.cr_val[0], (unsigned long) PowerPC::ppcState.cr_val[1], (unsigned long) PowerPC::ppcState.cr_val[2],
+		(unsigned long) PowerPC::ppcState.cr_val[3], (unsigned long) PowerPC::ppcState.cr_val[4], (unsigned long) PowerPC::ppcState.cr_val[5],
+		(unsigned long) PowerPC::ppcState.cr_val[6], (unsigned long) PowerPC::ppcState.cr_val[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr,
+		PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str());
+}
+
+void JitIL::Jit(u32 em_address)
+{
+	if (GetSpaceLeft() < 0x10000 || farcode.GetSpaceLeft() < 0x10000 || blocks.IsFull() ||
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache)
+	{
+		ClearCache();
+	}
+
+	int blockSize = code_buffer.GetSize();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+	{
+		// We can link blocks as long as we are not single stepping and there are no breakpoints here
+		EnableBlockLink();
+
+		// Comment out the following to disable breakpoints (speed-up)
+		if (!Profiler::g_ProfileBlocks)
+		{
+			if (GetState() == CPU_STEPPING)
+			{
+				blockSize = 1;
+
+				// Do not link this block to other blocks While single stepping
+				jo.enableBlocklink = false;
+			}
+			Trace();
+		}
+	}
+
+	// Analyze the block, collect all instructions it is made of (including inlining,
+	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
+	u32 nextPC = analyzer.Analyze(em_address, &code_block, &code_buffer, blockSize);
+
+	if (code_block.m_memory_exception)
+	{
+		// Address of instruction could not be translated
+		NPC = nextPC;
+		PowerPC::ppcState.Exceptions |= EXCEPTION_ISI;
+		PowerPC::CheckExceptions();
+		WARN_LOG(POWERPC, "ISI exception at 0x%08x", nextPC);
+		return;
+	}
+
+	int block_num = blocks.AllocateBlock(em_address);
+	JitBlock *b = blocks.GetBlock(block_num);
+	blocks.FinalizeBlock(block_num, jo.enableBlocklink, DoJit(em_address, &code_buffer, b, nextPC));
+}
+
+const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC)
+{
+	js.isLastInstruction = false;
+	js.blockStart = em_address;
+	js.fifoBytesThisBlock = 0;
+	js.curBlock = b;
+	jit->js.numLoadStoreInst = 0;
+	jit->js.numFloatingPointInst = 0;
+
+	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
+
+	const u8 *start = AlignCode4(); // TODO: Test if this or AlignCode16 make a difference from GetCodePtr
+	b->checkedEntry = start;
+	b->runCount = 0;
+
+	// Downcount flag check. The last block decremented downcounter, and the flag should still be available.
+	FixupBranch skip = J_CC(CC_NBE);
+	MOV(32, PPCSTATE(pc), Imm32(js.blockStart));
+	JMP(asm_routines.doTiming, true);  // downcount hit zero - go doTiming.
+	SetJumpTarget(skip);
+
+	const u8 *normalEntry = GetCodePtr();
+	b->normalEntry = normalEntry;
+
+	if (ImHereDebug)
+		ABI_CallFunction((void *)&ImHere); // Used to get a trace of the last few blocks before a crash, sometimes VERY useful
+
+	if (js.fpa.any)
+	{
+		// This block uses FPU - needs to add FP exception bailout
+		TEST(32, PPCSTATE(msr), Imm32(1 << 13)); //Test FP enabled bit
+		FixupBranch b1 = J_CC(CC_NZ);
+
+		// If a FPU exception occurs, the exception handler will read
+		// from PC.  Update PC with the latest value in case that happens.
+		MOV(32, PPCSTATE(pc), Imm32(js.blockStart));
+		OR(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
+		WriteExceptionExit();
+
+		SetJumpTarget(b1);
+	}
+
+	js.rewriteStart = (u8*)GetCodePtr();
+
+	u64 codeHash = -1;
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling ||
+	    SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILOutputIR)
+	{
+		// For profiling and IR Writer
+		for (u32 i = 0; i < code_block.m_num_instructions; i++)
+		{
+			const u64 inst = ops[i].inst.hex;
+			// Ported from boost::hash
+			codeHash ^= inst + (codeHash << 6) + (codeHash >> 2);
+		}
+	}
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
+	{
+		JitILProfiler::Block& block = JitILProfiler::Add(codeHash);
+		ABI_CallFunctionC((void *)JitILProfiler::Begin, block.index);
+	}
+
+	// Start up IR builder (structure that collects the
+	// instruction processed by the JIT routines)
+	ibuild.Reset();
+
+	js.downcountAmount = 0;
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		js.downcountAmount += PatchEngine::GetSpeedhackCycles(code_block.m_address);
+
+	// Translate instructions
+	for (u32 i = 0; i < code_block.m_num_instructions; i++)
+	{
+		js.compilerPC = ops[i].address;
+		js.op = &ops[i];
+		js.instructionNumber = i;
+		const GekkoOPInfo *opinfo = GetOpInfo(ops[i].inst);
+		js.downcountAmount += opinfo->numCycles;
+
+		if (i == (code_block.m_num_instructions - 1))
+			js.isLastInstruction = true;
+
+		u32 function = HLE::GetFunctionIndex(ops[i].address);
+		if (function != 0)
+		{
+			int type = HLE::GetFunctionTypeByIndex(function);
+			if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
+			{
+				int flags = HLE::GetFunctionFlagsByIndex(function);
+				if (HLE::IsEnabled(flags))
+				{
+					HLEFunction(function);
+					if (type == HLE::HLE_HOOK_REPLACE)
+					{
+						MOV(32, R(EAX), PPCSTATE(npc));
+						jit->js.downcountAmount += jit->js.st.numCycles;
+						WriteExitDestInOpArg(R(EAX));
+						break;
+					}
+				}
+			}
+		}
+
+		if (!ops[i].skip)
+		{
+			if (jo.memcheck && (opinfo->flags & FL_USE_FPU))
+			{
+				ibuild.EmitFPExceptionCheck(ibuild.EmitIntConst(ops[i].address));
+			}
+
+			if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end())
+			{
+				ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address));
+			}
+
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
+			{
+				// Turn off block linking if there are breakpoints so that the Step Over command does not link this block.
+				jo.enableBlocklink = false;
+
+				ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address));
+			}
+
+			JitILTables::CompileInstruction(ops[i]);
+
+			if (jo.memcheck && (opinfo->flags & FL_LOADSTORE))
+			{
+				ibuild.EmitDSIExceptionCheck(ibuild.EmitIntConst(ops[i].address));
+			}
+
+			if (opinfo->flags & FL_LOADSTORE)
+				++jit->js.numLoadStoreInst;
+
+			if (opinfo->flags & FL_USE_FPU)
+				++jit->js.numFloatingPointInst;
+		}
+	}
+
+	// Perform actual code generation
+	WriteCode(nextPC);
+
+	b->codeSize = (u32)(GetCodePtr() - start);
+	b->originalSize = code_block.m_num_instructions;
+
+#ifdef JIT_LOG_X86
+	LogGeneratedX86(code_block.m_num_instructions, code_buf, normalEntry, b);
+#endif
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILOutputIR)
+	{
+		ibuild.WriteToFile(codeHash);
+	}
+
+	return normalEntry;
+}
+
+void JitIL::EnableBlockLink()
+{
+	jo.enableBlocklink = true;
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockLinking)
+		jo.enableBlocklink = false;
+}
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h
new file mode 100644
index 0000000000..aaf5ea6569
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h
@@ -0,0 +1,101 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// ========================
+// See comments in Jit.cpp.
+// ========================
+
+// Mystery: Capcom vs SNK 800aa278
+
+// CR flags approach:
+//   * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3".
+//   * All flag altering instructions flush this
+//   * A flush simply does a conditional write to the appropriate CRx.
+//   * If flag available, branch code can become absolutely trivial.
+
+#pragma once
+
+#include "Common/x64ABI.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64/JitAsm.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+#include "Core/PowerPC/JitILCommon/IR.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+class JitIL : public JitILBase
+{
+public:
+	Jit64AsmRoutineManager asm_routines;
+
+	JitIL() {}
+	~JitIL() {}
+
+	// Initialization, etc
+
+	void Init() override;
+
+	void EnableBlockLink();
+
+	void Shutdown() override;
+
+	// Jit!
+
+	void Jit(u32 em_address) override;
+	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC);
+
+	void Trace();
+
+	JitBlockCache *GetBlockCache() override { return &blocks; }
+
+	void ClearCache() override;
+
+	const CommonAsmRoutines *GetAsmRoutines() override
+	{
+		return &asm_routines;
+	}
+
+	const char *GetName() override
+	{
+		return "JIT64IL";
+	}
+
+	// Run!
+	void Run() override;
+	void SingleStep() override;
+
+	// Utilities for use by opcodes
+
+	void WriteExit(u32 destination);
+	void WriteExitDestInOpArg(const Gen::OpArg& arg);
+	void WriteExceptionExit();
+	void WriteRfiExitDestInOpArg(const Gen::OpArg& arg);
+	void WriteCallInterpreter(UGeckoInstruction _inst);
+	void Cleanup();
+
+	void WriteCode(u32 exitAddress);
+
+	// OPCODES
+	void FallBackToInterpreter(UGeckoInstruction _inst) override;
+	void DoNothing(UGeckoInstruction _inst) override;
+	void HLEFunction(UGeckoInstruction _inst) override;
+
+	void DynaRunTable4(UGeckoInstruction _inst) override;
+	void DynaRunTable19(UGeckoInstruction _inst) override;
+	void DynaRunTable31(UGeckoInstruction _inst) override;
+	void DynaRunTable59(UGeckoInstruction _inst) override;
+	void DynaRunTable63(UGeckoInstruction _inst) override;
+
+};
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
new file mode 100644
index 0000000000..dc7cd2e5f2
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp
@@ -0,0 +1,483 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
+
+// Should be moved in to the Jit class
+typedef void (JitIL::*_Instruction) (UGeckoInstruction instCode);
+
+static _Instruction dynaOpTable[64];
+static _Instruction dynaOpTable4[1024];
+static _Instruction dynaOpTable19[1024];
+static _Instruction dynaOpTable31[1024];
+static _Instruction dynaOpTable59[32];
+static _Instruction dynaOpTable63[1024];
+
+void JitIL::DynaRunTable4(UGeckoInstruction _inst)  {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);}
+void JitIL::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);}
+void JitIL::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);}
+void JitIL::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);}
+void JitIL::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);}
+
+
+
+struct GekkoOPTemplate
+{
+	int opcode;
+	_Instruction Inst;
+	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
+};
+
+static GekkoOPTemplate primarytable[] =
+{
+	{4,  &JitIL::DynaRunTable4},         //"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0}},
+	{19, &JitIL::DynaRunTable19},        //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}},
+	{31, &JitIL::DynaRunTable31},        //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}},
+	{59, &JitIL::DynaRunTable59},        //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}},
+	{63, &JitIL::DynaRunTable63},        //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}},
+
+	{16, &JitIL::bcx},                   //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}},
+	{18, &JitIL::bx},                    //"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
+
+	{3,  &JitIL::FallBackToInterpreter}, //"twi",         OPTYPE_SYSTEM, 0}},
+	{17, &JitIL::sc},                    //"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
+
+	{7,  &JitIL::mulli},                 //"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}},
+	{8,  &JitIL::subfic},                //"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}},
+	{10, &JitIL::cmpXX},                 //"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
+	{11, &JitIL::cmpXX},                 //"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
+	{12, &JitIL::reg_imm},               //"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}},
+	{13, &JitIL::reg_imm},               //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}},
+	{14, &JitIL::reg_imm},               //"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
+	{15, &JitIL::reg_imm},               //"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
+
+	{20, &JitIL::rlwimix},               //"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}},
+	{21, &JitIL::rlwinmx},               //"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
+	{23, &JitIL::rlwnmx},                //"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
+
+	{24, &JitIL::reg_imm},               //"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
+	{25, &JitIL::reg_imm},               //"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
+	{26, &JitIL::reg_imm},               //"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
+	{27, &JitIL::reg_imm},               //"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
+	{28, &JitIL::reg_imm},               //"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
+	{29, &JitIL::reg_imm},               //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
+
+	{32, &JitIL::lXz},                   //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
+	{33, &JitIL::lXz},                   //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
+	{34, &JitIL::lXz},                   //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
+	{35, &JitIL::lbzu},                  //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
+	{40, &JitIL::lXz},                   //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
+	{41, &JitIL::lXz},                   //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
+	{42, &JitIL::lha},                   //"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
+	{43, &JitIL::lhau},                  //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
+
+	{44, &JitIL::stX},                   //"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
+	{45, &JitIL::stX},                   //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
+	{36, &JitIL::stX},                   //"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
+	{37, &JitIL::stX},                   //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
+	{38, &JitIL::stX},                   //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
+	{39, &JitIL::stX},                   //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
+
+	{46, &JitIL::lmw},                   //"lmw",   OPTYPE_SYSTEM, FL_EVIL, 10}},
+	{47, &JitIL::stmw},                  //"stmw",  OPTYPE_SYSTEM, FL_EVIL, 10}},
+
+	{48, &JitIL::lfs},                   //"lfs",  OPTYPE_LOADFP, FL_IN_A}},
+	{49, &JitIL::lfsu},                  //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
+	{50, &JitIL::lfd},                   //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
+	{51, &JitIL::lfdu},                  //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
+
+	{52, &JitIL::stfs},                  //"stfs",  OPTYPE_STOREFP, FL_IN_A}},
+	{53, &JitIL::stfs},                  //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
+	{54, &JitIL::stfd},                  //"stfd",  OPTYPE_STOREFP, FL_IN_A}},
+	{55, &JitIL::stfd},                  //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
+
+	{56, &JitIL::psq_l},                 //"psq_l",   OPTYPE_PS, FL_IN_A}},
+	{57, &JitIL::psq_l},                 //"psq_lu",  OPTYPE_PS, FL_OUT_A | FL_IN_A}},
+	{60, &JitIL::psq_st},                //"psq_st",  OPTYPE_PS, FL_IN_A}},
+	{61, &JitIL::psq_st},                //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}},
+
+	//missing: 0, 1, 2, 5, 6, 9, 22, 30, 62, 58
+};
+
+static GekkoOPTemplate table4[] =
+{    //SUBOP10
+	{0,    &JitIL::FallBackToInterpreter}, //"ps_cmpu0",   OPTYPE_PS, FL_SET_CRn}},
+	{32,   &JitIL::FallBackToInterpreter}, //"ps_cmpo0",   OPTYPE_PS, FL_SET_CRn}},
+	{40,   &JitIL::FallBackToInterpreter}, //"ps_neg",     OPTYPE_PS, FL_RC_BIT}},
+	{136,  &JitIL::FallBackToInterpreter}, //"ps_nabs",    OPTYPE_PS, FL_RC_BIT}},
+	{264,  &JitIL::FallBackToInterpreter}, //"ps_abs",     OPTYPE_PS, FL_RC_BIT}},
+	{64,   &JitIL::FallBackToInterpreter}, //"ps_cmpu1",   OPTYPE_PS, FL_RC_BIT}},
+	{72,   &JitIL::FallBackToInterpreter}, //"ps_mr",      OPTYPE_PS, FL_RC_BIT}},
+	{96,   &JitIL::FallBackToInterpreter}, //"ps_cmpo1",   OPTYPE_PS, FL_RC_BIT}},
+	{528,  &JitIL::ps_mergeXX},            //"ps_merge00", OPTYPE_PS, FL_RC_BIT}},
+	{560,  &JitIL::ps_mergeXX},            //"ps_merge01", OPTYPE_PS, FL_RC_BIT}},
+	{592,  &JitIL::ps_mergeXX},            //"ps_merge10", OPTYPE_PS, FL_RC_BIT}},
+	{624,  &JitIL::ps_mergeXX},            //"ps_merge11", OPTYPE_PS, FL_RC_BIT}},
+
+	{1014, &JitIL::FallBackToInterpreter}, //"dcbz_l",     OPTYPE_SYSTEM, 0}},
+};
+
+static GekkoOPTemplate table4_2[] =
+{
+	{10, &JitIL::ps_sum},                //"ps_sum0",   OPTYPE_PS, 0}},
+	{11, &JitIL::ps_sum},                //"ps_sum1",   OPTYPE_PS, 0}},
+	{12, &JitIL::ps_muls},               //"ps_muls0",  OPTYPE_PS, 0}},
+	{13, &JitIL::ps_muls},               //"ps_muls1",  OPTYPE_PS, 0}},
+	{14, &JitIL::ps_maddXX},             //"ps_madds0", OPTYPE_PS, 0}},
+	{15, &JitIL::ps_maddXX},             //"ps_madds1", OPTYPE_PS, 0}},
+	{18, &JitIL::ps_arith},              //"ps_div",    OPTYPE_PS, 0, 16}},
+	{20, &JitIL::ps_arith},              //"ps_sub",    OPTYPE_PS, 0}},
+	{21, &JitIL::ps_arith},              //"ps_add",    OPTYPE_PS, 0}},
+	{23, &JitIL::FallBackToInterpreter}, //"ps_sel",    OPTYPE_PS, 0}},
+	{24, &JitIL::FallBackToInterpreter}, //"ps_res",    OPTYPE_PS, 0}},
+	{25, &JitIL::ps_arith},              //"ps_mul",    OPTYPE_PS, 0}},
+	{26, &JitIL::FallBackToInterpreter}, //"ps_rsqrte", OPTYPE_PS, 0, 1}},
+	{28, &JitIL::ps_maddXX},             //"ps_msub",   OPTYPE_PS, 0}},
+	{29, &JitIL::ps_maddXX},             //"ps_madd",   OPTYPE_PS, 0}},
+	{30, &JitIL::ps_maddXX},             //"ps_nmsub",  OPTYPE_PS, 0}},
+	{31, &JitIL::ps_maddXX},             //"ps_nmadd",  OPTYPE_PS, 0}},
+};
+
+static GekkoOPTemplate table4_3[] =
+{
+	{6,  &JitIL::FallBackToInterpreter},  //"psq_lx",   OPTYPE_PS, 0}},
+	{7,  &JitIL::FallBackToInterpreter},  //"psq_stx",  OPTYPE_PS, 0}},
+	{38, &JitIL::FallBackToInterpreter},  //"psq_lux",  OPTYPE_PS, 0}},
+	{39, &JitIL::FallBackToInterpreter},  //"psq_stux", OPTYPE_PS, 0}},
+};
+
+static GekkoOPTemplate table19[] =
+{
+	{528, &JitIL::bcctrx},                //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}},
+	{16,  &JitIL::bclrx},                 //"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK}},
+	{257, &JitIL::crXX},                  //"crand",  OPTYPE_CR, FL_EVIL}},
+	{129, &JitIL::crXX},                  //"crandc", OPTYPE_CR, FL_EVIL}},
+	{289, &JitIL::crXX},                  //"creqv",  OPTYPE_CR, FL_EVIL}},
+	{225, &JitIL::crXX},                  //"crnand", OPTYPE_CR, FL_EVIL}},
+	{33,  &JitIL::crXX},                  //"crnor",  OPTYPE_CR, FL_EVIL}},
+	{449, &JitIL::crXX},                  //"cror",   OPTYPE_CR, FL_EVIL}},
+	{417, &JitIL::crXX},                  //"crorc",  OPTYPE_CR, FL_EVIL}},
+	{193, &JitIL::crXX},                  //"crxor",  OPTYPE_CR, FL_EVIL}},
+
+	{150, &JitIL::DoNothing},             //"isync",  OPTYPE_ICACHE, FL_EVIL}},
+	{0,   &JitIL::mcrf},                  //"mcrf",   OPTYPE_SYSTEM, FL_EVIL}},
+
+	{50,  &JitIL::rfi},                   //"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}},
+	{18,  &JitIL::FallBackToInterpreter}, //"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}}
+};
+
+
+static GekkoOPTemplate table31[] =
+{
+	{266,  &JitIL::addx},                  //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{778,  &JitIL::addx},                  //"addox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{10,   &JitIL::FallBackToInterpreter}, //"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
+	{522,  &JitIL::FallBackToInterpreter}, //"addcox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
+	{138,  &JitIL::addex},                 //"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{650,  &JitIL::addex},                 //"addeox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{234,  &JitIL::FallBackToInterpreter}, //"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{746,  &JitIL::FallBackToInterpreter}, //"addmeox"
+	{202,  &JitIL::addzex},                //"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{714,  &JitIL::addzex},                //"addzeox"
+	{491,  &JitIL::FallBackToInterpreter}, //"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
+	{1003, &JitIL::FallBackToInterpreter}, //"divwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
+	{459,  &JitIL::divwux},                //"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
+	{971,  &JitIL::divwux},                //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
+	{75,   &JitIL::FallBackToInterpreter}, //"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
+	{11,   &JitIL::mulhwux},               //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
+	{235,  &JitIL::mullwx},                //"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
+	{747,  &JitIL::mullwx},                //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
+	{104,  &JitIL::negx},                  //"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{616,  &JitIL::negx},                  //"negox"
+	{40,   &JitIL::subfx},                 //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{552,  &JitIL::subfx},                 //"subfox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{8,    &JitIL::subfcx},                //"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
+	{520,  &JitIL::subfcx},                //"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
+	{136,  &JitIL::subfex},                //"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{648,  &JitIL::subfex},                //"subfeox"
+	{232,  &JitIL::FallBackToInterpreter}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{744,  &JitIL::FallBackToInterpreter}, //"subfmeox"
+	{200,  &JitIL::FallBackToInterpreter}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
+	{712,  &JitIL::FallBackToInterpreter}, //"subfzeox"
+
+	{28,  &JitIL::boolX},                  //"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{60,  &JitIL::boolX},                  //"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{444, &JitIL::boolX},                  //"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{124, &JitIL::boolX},                  //"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{316, &JitIL::boolX},                  //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{412, &JitIL::boolX},                  //"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{476, &JitIL::boolX},                  //"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{284, &JitIL::boolX},                  //"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{0,   &JitIL::cmpXX},                  //"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
+	{32,  &JitIL::cmpXX},                  //"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
+	{26,  &JitIL::cntlzwx},                //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
+	{922, &JitIL::extshx},                 //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
+	{954, &JitIL::extsbx},                 //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
+	{536, &JitIL::srwx},                   //"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
+	{792, &JitIL::srawx},                  //"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
+	{824, &JitIL::srawix},                 //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
+	{24,  &JitIL::slwx},                   //"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
+
+	{54,   &JitIL::dcbst},                 //"dcbst",  OPTYPE_DCACHE, 0, 4}},
+	{86,   &JitIL::FallBackToInterpreter}, //"dcbf",   OPTYPE_DCACHE, 0, 4}},
+	{246,  &JitIL::DoNothing},             //"dcbtst", OPTYPE_DCACHE, 0, 1}},
+	{278,  &JitIL::DoNothing},             //"dcbt",   OPTYPE_DCACHE, 0, 1}},
+	{470,  &JitIL::FallBackToInterpreter}, //"dcbi",   OPTYPE_DCACHE, 0, 4}},
+	{758,  &JitIL::DoNothing},             //"dcba",   OPTYPE_DCACHE, 0, 4}},
+	{1014, &JitIL::dcbz},                  //"dcbz",   OPTYPE_DCACHE, 0, 4}},
+
+	//load word
+	{23,  &JitIL::lXzx},                   //"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+	{55,  &JitIL::lXzx},                   //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//load halfword
+	{279, &JitIL::lXzx},                   //"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+	{311, &JitIL::lXzx},                   //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//load halfword signextend
+	{343, &JitIL::lhax},                   //"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+	{375, &JitIL::lhaux},                  //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//load byte
+	{87,  &JitIL::lXzx},                   //"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+	{119, &JitIL::lXzx},                   //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//load byte reverse
+	{534, &JitIL::FallBackToInterpreter},  //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+	{790, &JitIL::FallBackToInterpreter},  //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
+
+	// Conditional load/store (Wii SMP)
+	{150, &JitIL::FallBackToInterpreter},  //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}},
+	{20,  &JitIL::FallBackToInterpreter},  //"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}},
+
+	//load string (interpret these)
+	{533, &JitIL::FallBackToInterpreter},  //"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}},
+	{597, &JitIL::FallBackToInterpreter},  //"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}},
+
+	//store word
+	{151, &JitIL::stXx},                   //"stwx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
+	{183, &JitIL::stXx},                   //"stwux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//store halfword
+	{407, &JitIL::stXx},                   //"sthx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
+	{439, &JitIL::stXx},                   //"sthux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//store byte
+	{215, &JitIL::stXx},                   //"stbx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
+	{247, &JitIL::stXx},                   //"stbux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
+
+	//store bytereverse
+	{662, &JitIL::FallBackToInterpreter},  //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
+	{918, &JitIL::FallBackToInterpreter},  //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}},
+
+	{661, &JitIL::FallBackToInterpreter},  //"stswx",  OPTYPE_STORE, FL_EVIL}},
+	{725, &JitIL::FallBackToInterpreter},  //"stswi",  OPTYPE_STORE, FL_EVIL}},
+
+	// fp load/store
+	{535, &JitIL::lfsx},                   //"lfsx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
+	{567, &JitIL::FallBackToInterpreter},  //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
+	{599, &JitIL::FallBackToInterpreter},  //"lfdx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
+	{631, &JitIL::FallBackToInterpreter},  //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
+
+	{663, &JitIL::stfsx},                  //"stfsx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
+	{695, &JitIL::FallBackToInterpreter},  //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
+	{727, &JitIL::FallBackToInterpreter},  //"stfdx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
+	{759, &JitIL::FallBackToInterpreter},  //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
+	{983, &JitIL::FallBackToInterpreter},  //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
+
+	{19,  &JitIL::mfcr},                   //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
+	{83,  &JitIL::mfmsr},                  //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
+	{144, &JitIL::mtcrf},                  //"mtcrf",  OPTYPE_SYSTEM, 0}},
+	{146, &JitIL::mtmsr},                  //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
+	{210, &JitIL::FallBackToInterpreter},  //"mtsr",   OPTYPE_SYSTEM, 0}},
+	{242, &JitIL::FallBackToInterpreter},  //"mtsrin", OPTYPE_SYSTEM, 0}},
+	{339, &JitIL::mfspr},                  //"mfspr",  OPTYPE_SPR, FL_OUT_D}},
+	{467, &JitIL::mtspr},                  //"mtspr",  OPTYPE_SPR, 0, 2}},
+	{371, &JitIL::mftb},                   //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
+	{512, &JitIL::FallBackToInterpreter},  //"mcrxr",  OPTYPE_SYSTEM, 0}},
+	{595, &JitIL::FallBackToInterpreter},  //"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2}},
+	{659, &JitIL::FallBackToInterpreter},  //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}},
+
+	{4,   &JitIL::FallBackToInterpreter},  //"tw",     OPTYPE_SYSTEM, 0, 1}},
+	{598, &JitIL::DoNothing},              //"sync",   OPTYPE_SYSTEM, 0, 2}},
+	{982, &JitIL::icbi},                   //"icbi",   OPTYPE_SYSTEM, FL_ENDBLOCK, 3}},
+
+	// Unused instructions on GC
+	{310, &JitIL::FallBackToInterpreter},  //"eciwx",   OPTYPE_INTEGER, FL_RC_BIT}},
+	{438, &JitIL::FallBackToInterpreter},  //"ecowx",   OPTYPE_INTEGER, FL_RC_BIT}},
+	{854, &JitIL::DoNothing},              //"eieio",   OPTYPE_INTEGER, FL_RC_BIT}},
+	{306, &JitIL::FallBackToInterpreter},  //"tlbie",   OPTYPE_SYSTEM, 0}},
+	{370, &JitIL::FallBackToInterpreter},  //"tlbia",   OPTYPE_SYSTEM, 0}},
+	{566, &JitIL::DoNothing},              //"tlbsync", OPTYPE_SYSTEM, 0}},
+};
+
+static GekkoOPTemplate table59[] =
+{
+	{18, &JitIL::FallBackToInterpreter},       //{"fdivsx",  OPTYPE_FPU, FL_RC_BIT_F, 16}},
+	{20, &JitIL::fp_arith_s},                  //"fsubsx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{21, &JitIL::fp_arith_s},                  //"faddsx",   OPTYPE_FPU, FL_RC_BIT_F}},
+//	{22, &JitIL::FallBackToInterpreter},         //"fsqrtsx",  OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko
+	{24, &JitIL::FallBackToInterpreter},       //"fresx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{25, &JitIL::fp_arith_s},                  //"fmulsx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{28, &JitIL::fmaddXX},                     //"fmsubsx",  OPTYPE_FPU, FL_RC_BIT_F}},
+	{29, &JitIL::fmaddXX},                     //"fmaddsx",  OPTYPE_FPU, FL_RC_BIT_F}},
+	{30, &JitIL::fmaddXX},                     //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}},
+	{31, &JitIL::fmaddXX},                     //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}},
+};
+
+static GekkoOPTemplate table63[] =
+{
+	{264, &JitIL::fsign},                 //"fabsx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{32,  &JitIL::fcmpx},                 //"fcmpo",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{0,   &JitIL::fcmpx},                 //"fcmpu",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{14,  &JitIL::FallBackToInterpreter}, //"fctiwx",  OPTYPE_FPU, FL_RC_BIT_F}},
+	{15,  &JitIL::FallBackToInterpreter}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}},
+	{72,  &JitIL::fmrx},                  //"fmrx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{136, &JitIL::fsign},                 //"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F}},
+	{40,  &JitIL::fsign},                 //"fnegx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{12,  &JitIL::FallBackToInterpreter}, //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
+
+	{64,  &JitIL::FallBackToInterpreter}, //"mcrfs",   OPTYPE_SYSTEMFP, 0}},
+	{583, &JitIL::FallBackToInterpreter}, //"mffsx",   OPTYPE_SYSTEMFP, 0}},
+	{70,  &JitIL::FallBackToInterpreter}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}},
+	{38,  &JitIL::FallBackToInterpreter}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}},
+	{134, &JitIL::FallBackToInterpreter}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}},
+	{711, &JitIL::FallBackToInterpreter}, //"mtfsfx",  OPTYPE_SYSTEMFP, 0, 2}},
+};
+
+static GekkoOPTemplate table63_2[] =
+{
+	{18, &JitIL::FallBackToInterpreter}, //"fdivx",    OPTYPE_FPU, FL_RC_BIT_F, 30}},
+	{20, &JitIL::FallBackToInterpreter}, //"fsubx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{21, &JitIL::FallBackToInterpreter}, //"faddx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{22, &JitIL::FallBackToInterpreter}, //"fsqrtx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{23, &JitIL::FallBackToInterpreter}, //"fselx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{25, &JitIL::fp_arith_s},            //"fmulx",    OPTYPE_FPU, FL_RC_BIT_F}},
+	{26, &JitIL::FallBackToInterpreter}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}},
+	{28, &JitIL::fmaddXX},               //"fmsubx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{29, &JitIL::fmaddXX},               //"fmaddx",   OPTYPE_FPU, FL_RC_BIT_F}},
+	{30, &JitIL::fmaddXX},               //"fnmsubx",  OPTYPE_FPU, FL_RC_BIT_F}},
+	{31, &JitIL::fmaddXX},               //"fnmaddx",  OPTYPE_FPU, FL_RC_BIT_F}},
+};
+
+namespace JitILTables
+{
+
+void CompileInstruction(PPCAnalyst::CodeOp & op)
+{
+	JitIL *jitil = (JitIL *)jit;
+	(jitil->*dynaOpTable[op.inst.OPCD])(op.inst);
+	GekkoOPInfo *info = op.opinfo;
+	if (info)
+	{
+#ifdef OPLOG
+		if (!strcmp(info->opname, OP_TO_LOG)) // "mcrfs"
+		{
+			rsplocations.push_back(jit.js.compilerPC);
+		}
+#endif
+		info->compileCount++;
+		info->lastUse = jit->js.compilerPC;
+	}
+	else
+	{
+		PanicAlert("Tried to compile illegal (or unknown) instruction %08x, at %08x", op.inst.hex, jit->js.compilerPC);
+	}
+}
+
+void InitTables()
+{
+	// once initialized, tables are read-only
+	static bool initialized = false;
+	if (initialized)
+		return;
+
+	//clear
+	for (auto& tpl : dynaOpTable)
+	{
+		tpl = &JitIL::FallBackToInterpreter;
+	}
+
+	for (auto& tpl : dynaOpTable59)
+	{
+		tpl = &JitIL::FallBackToInterpreter;
+	}
+
+	for (int i = 0; i < 1024; i++)
+	{
+		dynaOpTable4 [i] = &JitIL::FallBackToInterpreter;
+		dynaOpTable19[i] = &JitIL::FallBackToInterpreter;
+		dynaOpTable31[i] = &JitIL::FallBackToInterpreter;
+		dynaOpTable63[i] = &JitIL::FallBackToInterpreter;
+	}
+
+	for (auto& tpl : primarytable)
+	{
+		dynaOpTable[tpl.opcode] = tpl.Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table4_2)
+		{
+			int op = fill+tpl.opcode;
+			dynaOpTable4[op] = tpl.Inst;
+		}
+	}
+
+	for (int i = 0; i < 16; i++)
+	{
+		int fill = i << 6;
+		for (auto& tpl : table4_3)
+		{
+			int op = fill+tpl.opcode;
+			dynaOpTable4[op] = tpl.Inst;
+		}
+	}
+
+	for (auto& tpl : table4)
+	{
+		int op = tpl.opcode;
+		dynaOpTable4[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table31)
+	{
+		int op = tpl.opcode;
+		dynaOpTable31[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table19)
+	{
+		int op = tpl.opcode;
+		dynaOpTable19[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table59)
+	{
+		int op = tpl.opcode;
+		dynaOpTable59[op] = tpl.Inst;
+	}
+
+	for (auto& tpl : table63)
+	{
+		int op = tpl.opcode;
+		dynaOpTable63[op] = tpl.Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (auto& tpl : table63_2)
+		{
+			int op = fill + tpl.opcode;
+			dynaOpTable63[op] = tpl.Inst;
+		}
+	}
+
+	initialized = true;
+}
+
+}
diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
new file mode 100644
index 0000000000..25d58ae377
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.h
@@ -0,0 +1,15 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64IL/JitIL.h"
+
+namespace JitILTables
+{
+	void CompileInstruction(PPCAnalyst::CodeOp & op);
+	void InitTables();
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
new file mode 100644
index 0000000000..835c795f84
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
@@ -0,0 +1,396 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+#include "Common/PerformanceCounter.h"
+
+#include "Core/PatchEngine.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitArm64_Tables.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::Init()
+{
+	AllocCodeSpace(CODE_SIZE);
+	jo.enableBlocklink = true;
+	jo.optimizeGatherPipe = true;
+	UpdateMemoryOptions();
+	gpr.Init(this);
+	fpr.Init(this);
+
+	blocks.Init();
+	asm_routines.Init();
+
+	code_block.m_stats = &js.st;
+	code_block.m_gpa = &js.gpa;
+	code_block.m_fpa = &js.fpa;
+	InitBackpatch();
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE);
+}
+
+void JitArm64::ClearCache()
+{
+	ClearCodeSpace();
+	blocks.Clear();
+	UpdateMemoryOptions();
+}
+
+void JitArm64::Shutdown()
+{
+	FreeCodeSpace();
+	blocks.Shutdown();
+	asm_routines.Shutdown();
+}
+
+void JitArm64::FallBackToInterpreter(UGeckoInstruction inst)
+{
+	gpr.Flush(FlushMode::FLUSH_INTERPRETER, js.op);
+	fpr.Flush(FlushMode::FLUSH_INTERPRETER, js.op);
+	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
+	MOVI2R(W0, inst.hex);
+	MOVI2R(X30, (u64)instr);
+	BLR(X30);
+}
+
+void JitArm64::HLEFunction(UGeckoInstruction inst)
+{
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	MOVI2R(W0, js.compilerPC);
+	MOVI2R(W1, inst.hex);
+	MOVI2R(X30, (u64)&HLE::Execute);
+	BLR(X30);
+
+	ARM64Reg WA = gpr.GetReg();
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(npc));
+	WriteExitDestInR(WA);
+}
+
+void JitArm64::DoNothing(UGeckoInstruction inst)
+{
+	// Yup, just don't do anything.
+}
+
+void JitArm64::Break(UGeckoInstruction inst)
+{
+	WARN_LOG(DYNA_REC, "Breaking! %08x - Fix me ;)", inst.hex);
+	exit(0);
+}
+
+void JitArm64::DoDownCount()
+{
+	ARM64Reg WA = gpr.GetReg();
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(downcount));
+	if (js.downcountAmount < 4096) // We can enlarge this if we used rotations
+	{
+		SUBS(WA, WA, js.downcountAmount);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(downcount));
+	}
+	else
+	{
+		ARM64Reg WB = gpr.GetReg();
+		MOVI2R(WB, js.downcountAmount);
+		SUBS(WA, WA, WB);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(downcount));
+		gpr.Unlock(WB);
+	}
+	gpr.Unlock(WA);
+}
+
+// Exits
+void JitArm64::WriteExit(u32 destination)
+{
+	DoDownCount();
+
+	if (Profiler::g_ProfileBlocks)
+		EndTimeProfile(js.curBlock);
+
+	//If nobody has taken care of this yet (this can be removed when all branches are done)
+	JitBlock *b = js.curBlock;
+	JitBlock::LinkData linkData;
+	linkData.exitAddress = destination;
+	linkData.exitPtrs = GetWritableCodePtr();
+	linkData.linkStatus = false;
+
+	// Link opportunity!
+	int block;
+	if (jo.enableBlocklink && (block = blocks.GetBlockNumberFromStartAddress(destination)) >= 0)
+	{
+		// It exists! Joy of joy!
+		B(blocks.GetBlock(block)->checkedEntry);
+		linkData.linkStatus = true;
+	}
+	else
+	{
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+		MOVI2R(WA, destination);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(pc));
+		MOVI2R(XA, (u64)asm_routines.dispatcher);
+		BR(XA);
+		gpr.Unlock(WA);
+	}
+
+	b->linkData.push_back(linkData);
+}
+void JitArm64::WriteExceptionExit(ARM64Reg dest)
+{
+	STR(INDEX_UNSIGNED, dest, X29, PPCSTATE_OFF(pc));
+	STR(INDEX_UNSIGNED, dest, X29, PPCSTATE_OFF(npc));
+	gpr.Unlock(dest);
+		DoDownCount();
+
+		if (Profiler::g_ProfileBlocks)
+			EndTimeProfile(js.curBlock);
+
+		MOVI2R(EncodeRegTo64(dest), (u64)&PowerPC::CheckExceptions);
+		BLR(EncodeRegTo64(dest));
+	LDR(INDEX_UNSIGNED, dest, X29, PPCSTATE_OFF(npc));
+	STR(INDEX_UNSIGNED, dest, X29, PPCSTATE_OFF(pc));
+
+	MOVI2R(EncodeRegTo64(dest), (u64)asm_routines.dispatcher);
+	BR(EncodeRegTo64(dest));
+}
+
+void JitArm64::WriteExceptionExit()
+{
+	DoDownCount();
+
+	if (Profiler::g_ProfileBlocks)
+		EndTimeProfile(js.curBlock);
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(pc));
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(npc));
+		MOVI2R(XA, (u64)&PowerPC::CheckExceptions);
+		BLR(XA);
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(npc));
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(pc));
+
+	MOVI2R(XA, (u64)asm_routines.dispatcher);
+	BR(XA);
+
+	gpr.Unlock(WA);
+}
+
+void JitArm64::WriteExitDestInR(ARM64Reg Reg)
+{
+	STR(INDEX_UNSIGNED, Reg, X29, PPCSTATE_OFF(pc));
+	gpr.Unlock(Reg);
+	DoDownCount();
+
+	if (Profiler::g_ProfileBlocks)
+		EndTimeProfile(js.curBlock);
+
+	MOVI2R(EncodeRegTo64(Reg), (u64)asm_routines.dispatcher);
+	BR(EncodeRegTo64(Reg));
+}
+
+void JitArm64::DumpCode(const u8* start, const u8* end)
+{
+	std::string output = "";
+	for (u8* code = (u8*)start; code < end; code += 4)
+		output += StringFromFormat("%08x", Common::swap32(*(u32*)code));
+	WARN_LOG(DYNA_REC, "Code dump from %p to %p:\n%s", start, end, output.c_str());
+}
+
+void JitArm64::BeginTimeProfile(JitBlock* b)
+{
+	b->ticCounter = 0;
+	b->ticStart = 0;
+	b->ticStop = 0;
+
+	MOVI2R(X1, (u64)QueryPerformanceCounter);
+	MOVI2R(X0, (u64)&b->ticStart);
+	BLR(X1);
+}
+
+void JitArm64::EndTimeProfile(JitBlock* b)
+{
+	MOVI2R(X1, (u64)QueryPerformanceCounter);
+	MOVI2R(X0, (u64)&b->ticStop);
+	BLR(X1);
+
+	MOVI2R(X0, (u64)&b->ticStart);
+	LDR(INDEX_UNSIGNED, X1, X0, 0); // Start
+	LDR(INDEX_UNSIGNED, X2, X0, 8); // Stop
+	LDR(INDEX_UNSIGNED, X3, X0, 16); // Counter
+	SUB(X2, X2, X1);
+	ADD(X3, X3, X2);
+	STR(INDEX_UNSIGNED, X3, X0, 16);
+}
+
+void JitArm64::Run()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+}
+
+void JitArm64::SingleStep()
+{
+	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
+	pExecAddr();
+}
+
+void JitArm64::Jit(u32)
+{
+	if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache)
+	{
+		ClearCache();
+	}
+	int block_num = blocks.AllocateBlock(PowerPC::ppcState.pc);
+	JitBlock *b = blocks.GetBlock(block_num);
+	const u8* BlockPtr = DoJit(PowerPC::ppcState.pc, &code_buffer, b);
+	blocks.FinalizeBlock(block_num, jo.enableBlocklink, BlockPtr);
+}
+
+const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b)
+{
+	int blockSize = code_buf->GetSize();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+	{
+		// Comment out the following to disable breakpoints (speed-up)
+		blockSize = 1;
+	}
+
+	if (em_address == 0)
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		WARN_LOG(DYNA_REC, "ERROR: Compiling at 0. LR=%08x CTR=%08x", LR, CTR);
+	}
+
+	js.isLastInstruction = false;
+	js.blockStart = em_address;
+	js.fifoBytesThisBlock = 0;
+	js.downcountAmount = 0;
+	js.skipInstructions = 0;
+	js.curBlock = b;
+
+	u32 nextPC = em_address;
+	// Analyze the block, collect all instructions it is made of (including inlining,
+	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
+	nextPC = analyzer.Analyze(em_address, &code_block, code_buf, blockSize);
+
+	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
+
+	const u8 *start = GetCodePtr();
+	b->checkedEntry = start;
+	b->runCount = 0;
+
+	// Downcount flag check, Only valid for linked blocks
+	{
+		FixupBranch bail = B(CC_PL);
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+		MOVI2R(WA, js.blockStart);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(pc));
+		MOVI2R(XA, (u64)asm_routines.doTiming);
+		BR(XA);
+		gpr.Unlock(WA);
+		SetJumpTarget(bail);
+	}
+
+	// Conditionally add profiling code.
+	if (Profiler::g_ProfileBlocks)
+	{
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg WB = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+		ARM64Reg XB = EncodeRegTo64(WB);
+		MOVI2R(XA, (u64)&b->runCount);
+		LDR(INDEX_UNSIGNED, XB, XA, 0);
+		ADD(XB, XB, 1);
+		STR(INDEX_UNSIGNED, XB, XA, 0);
+		gpr.Unlock(WA, WB);
+		// get start tic
+		BeginTimeProfile(b);
+	}
+	const u8 *normalEntry = GetCodePtr();
+	b->normalEntry = normalEntry;
+
+	gpr.Start(js.gpa);
+	fpr.Start(js.fpa);
+
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		js.downcountAmount += PatchEngine::GetSpeedhackCycles(em_address);
+
+	// Translate instructions
+	for (u32 i = 0; i < code_block.m_num_instructions; i++)
+	{
+		js.compilerPC = ops[i].address;
+		js.op = &ops[i];
+		js.instructionNumber = i;
+		const GekkoOPInfo *opinfo = ops[i].opinfo;
+		js.downcountAmount += opinfo->numCycles;
+
+		if (i == (code_block.m_num_instructions - 1))
+		{
+			// WARNING - cmp->branch merging will screw this up.
+			js.isLastInstruction = true;
+		}
+
+		if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32)
+		{
+			js.fifoBytesThisBlock -= 32;
+
+			gpr.Lock(W30);
+			BitSet32 regs_in_use = gpr.GetCallerSavedUsed();
+			regs_in_use[W30] = 0;
+
+			ABI_PushRegisters(regs_in_use);
+			MOVI2R(X30, (u64)&GPFifo::FastCheckGatherPipe);
+			BLR(X30);
+			ABI_PopRegisters(regs_in_use);
+			gpr.Unlock(W30);
+		}
+
+		if (!ops[i].skip)
+		{
+			if (jo.memcheck && (opinfo->flags & FL_USE_FPU))
+			{
+				// Don't do this yet
+				BRK(0x7777);
+			}
+
+			JitArm64Tables::CompileInstruction(ops[i]);
+
+			// If we have a register that will never be used again, flush it.
+			for (int j : ~ops[i].gprInUse)
+				gpr.StoreRegister(j);
+			for (int j : ~ops[i].fprInUse)
+				fpr.StoreRegister(j);
+
+			if (jo.memcheck && (opinfo->flags & FL_LOADSTORE))
+			{
+				// Don't do this yet
+				BRK(0x666);
+			}
+		}
+
+		i += js.skipInstructions;
+		js.skipInstructions = 0;
+	}
+
+	if (code_block.m_memory_exception)
+		BRK(0x500);
+
+	if (code_block.m_broken)
+	{
+		printf("Broken Block going to 0x%08x\n", nextPC);
+		WriteExit(nextPC);
+	}
+
+	b->codeSize = (u32)(GetCodePtr() - start);
+	b->originalSize = code_block.m_num_instructions;
+
+	FlushIcache();
+	return start;
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h
new file mode 100644
index 0000000000..55c7b86435
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h
@@ -0,0 +1,225 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+
+#include "Common/Arm64Emitter.h"
+
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitArm64Cache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+#include "Core/PowerPC/JitArmCommon/BackPatch.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#define PPCSTATE_OFF(elem) (offsetof(PowerPC::PowerPCState, elem))
+
+// Some asserts to make sure we will be able to load everything
+static_assert(PPCSTATE_OFF(spr[1023]) <= 16380, "LDR(32bit) can't reach the last SPR");
+static_assert((PPCSTATE_OFF(ps[0][0]) % 8) == 0, "LDR(64bit VFP) requires FPRs to be 8 byte aligned");
+static_assert(PPCSTATE_OFF(xer_ca) < 4096, "STRB can't store xer_ca!");
+static_assert(PPCSTATE_OFF(xer_so_ov) < 4096, "STRB can't store xer_so_ov!");
+
+class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock
+{
+public:
+	JitArm64() : code_buffer(32000), m_float_emit(this) {}
+	~JitArm64() {}
+
+	void Init();
+	void Shutdown();
+
+	JitBaseBlockCache *GetBlockCache() { return &blocks; }
+
+	bool IsInCodeSpace(u8 *ptr) const { return IsInSpace(ptr); }
+
+	bool HandleFault(uintptr_t access_address, SContext* ctx) override;
+
+	void ClearCache();
+
+	CommonAsmRoutinesBase *GetAsmRoutines()
+	{
+		return &asm_routines;
+	}
+
+	void Run();
+	void SingleStep();
+
+	void Jit(u32);
+
+	const char *GetName()
+	{
+		return "JITARM64";
+	}
+
+	// OPCODES
+	void FallBackToInterpreter(UGeckoInstruction inst);
+	void DoNothing(UGeckoInstruction inst);
+	void HLEFunction(UGeckoInstruction inst);
+
+	void DynaRunTable4(UGeckoInstruction inst);
+	void DynaRunTable19(UGeckoInstruction inst);
+	void DynaRunTable31(UGeckoInstruction inst);
+	void DynaRunTable59(UGeckoInstruction inst);
+	void DynaRunTable63(UGeckoInstruction inst);
+
+	// Force break
+	void Break(UGeckoInstruction inst);
+
+	// Branch
+	void sc(UGeckoInstruction inst);
+	void rfi(UGeckoInstruction inst);
+	void bx(UGeckoInstruction inst);
+	void bcx(UGeckoInstruction inst);
+	void bcctrx(UGeckoInstruction inst);
+	void bclrx(UGeckoInstruction inst);
+
+	// Integer
+	void arith_imm(UGeckoInstruction inst);
+	void boolX(UGeckoInstruction inst);
+	void addx(UGeckoInstruction inst);
+	void extsXx(UGeckoInstruction inst);
+	void cntlzwx(UGeckoInstruction inst);
+	void negx(UGeckoInstruction inst);
+	void cmp(UGeckoInstruction inst);
+	void cmpl(UGeckoInstruction inst);
+	void cmpi(UGeckoInstruction inst);
+	void cmpli(UGeckoInstruction inst);
+	void rlwinmx(UGeckoInstruction inst);
+	void srawix(UGeckoInstruction inst);
+	void mullwx(UGeckoInstruction inst);
+	void addic(UGeckoInstruction inst);
+	void mulli(UGeckoInstruction inst);
+	void addzex(UGeckoInstruction inst);
+	void subfx(UGeckoInstruction inst);
+	void addcx(UGeckoInstruction inst);
+
+	// System Registers
+	void mtmsr(UGeckoInstruction inst);
+	void mfmsr(UGeckoInstruction inst);
+	void mcrf(UGeckoInstruction inst);
+	void mfsr(UGeckoInstruction inst);
+	void mtsr(UGeckoInstruction inst);
+	void mfsrin(UGeckoInstruction inst);
+	void mtsrin(UGeckoInstruction inst);
+	void twx(UGeckoInstruction inst);
+	void mfspr(UGeckoInstruction inst);
+	void mftb(UGeckoInstruction inst);
+	void mtspr(UGeckoInstruction inst);
+
+	// LoadStore
+	void icbi(UGeckoInstruction inst);
+	void lXX(UGeckoInstruction inst);
+	void stX(UGeckoInstruction inst);
+	void lmw(UGeckoInstruction inst);
+	void stmw(UGeckoInstruction inst);
+
+	// LoadStore floating point
+	void lfXX(UGeckoInstruction inst);
+	void stfXX(UGeckoInstruction inst);
+
+	// Floating point
+	void fabsx(UGeckoInstruction inst);
+	void faddsx(UGeckoInstruction inst);
+	void faddx(UGeckoInstruction inst);
+	void fmaddsx(UGeckoInstruction inst);
+	void fmaddx(UGeckoInstruction inst);
+	void fmrx(UGeckoInstruction inst);
+	void fmsubsx(UGeckoInstruction inst);
+	void fmsubx(UGeckoInstruction inst);
+	void fmulsx(UGeckoInstruction inst);
+	void fmulx(UGeckoInstruction inst);
+	void fnabsx(UGeckoInstruction inst);
+	void fnegx(UGeckoInstruction inst);
+	void fnmaddsx(UGeckoInstruction inst);
+	void fnmaddx(UGeckoInstruction inst);
+	void fnmsubsx(UGeckoInstruction inst);
+	void fnmsubx(UGeckoInstruction inst);
+	void fselx(UGeckoInstruction inst);
+	void fsubsx(UGeckoInstruction inst);
+	void fsubx(UGeckoInstruction inst);
+
+	// Paired
+	void ps_abs(UGeckoInstruction inst);
+	void ps_add(UGeckoInstruction inst);
+	void ps_div(UGeckoInstruction inst);
+	void ps_madd(UGeckoInstruction inst);
+	void ps_madds0(UGeckoInstruction inst);
+	void ps_madds1(UGeckoInstruction inst);
+	void ps_merge00(UGeckoInstruction inst);
+	void ps_merge01(UGeckoInstruction inst);
+	void ps_merge10(UGeckoInstruction inst);
+	void ps_merge11(UGeckoInstruction inst);
+	void ps_mr(UGeckoInstruction inst);
+	void ps_msub(UGeckoInstruction inst);
+	void ps_mul(UGeckoInstruction inst);
+	void ps_muls0(UGeckoInstruction inst);
+	void ps_muls1(UGeckoInstruction inst);
+	void ps_nabs(UGeckoInstruction inst);
+	void ps_nmadd(UGeckoInstruction inst);
+	void ps_nmsub(UGeckoInstruction inst);
+	void ps_neg(UGeckoInstruction inst);
+	void ps_res(UGeckoInstruction inst);
+	void ps_sel(UGeckoInstruction inst);
+	void ps_sub(UGeckoInstruction inst);
+	void ps_sum0(UGeckoInstruction inst);
+	void ps_sum1(UGeckoInstruction inst);
+
+	// Loadstore paired
+	void psq_l(UGeckoInstruction inst);
+	void psq_st(UGeckoInstruction inst);
+
+private:
+	Arm64GPRCache gpr;
+	Arm64FPRCache fpr;
+
+	JitArm64BlockCache blocks;
+	JitArm64AsmRoutineManager asm_routines;
+
+	PPCAnalyst::CodeBuffer code_buffer;
+
+	ARM64FloatEmitter m_float_emit;
+
+	// Dump a memory range of code
+	void DumpCode(const u8* start, const u8* end);
+
+	// The key is the backpatch flags
+	std::map<u32, BackPatchInfo> m_backpatch_info;
+
+	// Backpatching routines
+	bool DisasmLoadStore(const u8* ptr, u32* flags, Arm64Gen::ARM64Reg* reg);
+	void InitBackpatch();
+	u32 EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, bool do_padding, Arm64Gen::ARM64Reg RS, Arm64Gen::ARM64Reg addr);
+	// Loadstore routines
+	void SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 offset, bool update);
+	void SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, u32 flags, s32 offset);
+
+	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b);
+
+	void DoDownCount();
+
+	// Profiling
+	void BeginTimeProfile(JitBlock* b);
+	void EndTimeProfile(JitBlock* b);
+
+	// Exits
+	void WriteExit(u32 destination);
+	void WriteExceptionExit(Arm64Gen::ARM64Reg dest);
+	void WriteExceptionExit();
+	void WriteExitDestInR(Arm64Gen::ARM64Reg dest);
+
+	FixupBranch JumpIfCRFieldBit(int field, int bit, bool jump_if_set);
+
+	void ComputeRC(Arm64Gen::ARM64Reg reg, int crf = 0);
+	void ComputeRC(u32 imm, int crf = 0);
+	void ComputeCarry(bool Carry);
+	void ComputeCarry();
+
+	typedef u32 (*Operation)(u32, u32);
+	void reg_imm(u32 d, u32 a, bool binary, u32 value, Operation do_op, void (ARM64XEmitter::*op)(Arm64Gen::ARM64Reg, Arm64Gen::ARM64Reg, Arm64Gen::ARM64Reg, ArithOption), bool Rc = false);
+};
+
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp
new file mode 100644
index 0000000000..96f5d1aaf6
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp
@@ -0,0 +1,25 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64Cache.h"
+
+void JitArm64BlockCache::WriteLinkBlock(u8* location, const u8* address)
+{
+	ARM64XEmitter emit(location);
+	emit.B(address);
+	emit.FlushIcache();
+}
+
+void JitArm64BlockCache::WriteDestroyBlock(const u8* location, u32 address)
+{
+	ARM64XEmitter emit((u8 *)location);
+	emit.MOVI2R(W0, address);
+	emit.MOVI2R(X30, (u64)jit->GetAsmRoutines()->dispatcher);
+	emit.STR(INDEX_UNSIGNED, W0, X29, PPCSTATE_OFF(pc));
+	emit.BR(X30);
+	emit.FlushIcache();
+}
+
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.h
new file mode 100644
index 0000000000..7b7b2c755b
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+
+typedef void (*CompiledCode)();
+
+class JitArm64BlockCache : public JitBaseBlockCache
+{
+private:
+	void WriteLinkBlock(u8* location, const u8* address);
+	void WriteDestroyBlock(const u8* location, u32 address);
+};
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
new file mode 100644
index 0000000000..fdce4dea7b
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
@@ -0,0 +1,639 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArmCommon/BackPatch.h"
+
+using namespace Arm64Gen;
+
+static void DoBacktrace(uintptr_t access_address, SContext* ctx)
+{
+	for (int i = 0; i < 30; i += 2)
+		ERROR_LOG(DYNA_REC, "R%d: 0x%016llx\tR%d: 0x%016llx", i, ctx->CTX_REG(i), i + 1, ctx->CTX_REG(i + 1));
+
+	ERROR_LOG(DYNA_REC, "R30: 0x%016llx\tSP: 0x%016llx", ctx->CTX_REG(30), ctx->CTX_SP);
+
+	ERROR_LOG(DYNA_REC, "Access Address: 0x%016lx", access_address);
+	ERROR_LOG(DYNA_REC, "PC: 0x%016llx", ctx->CTX_PC);
+
+	ERROR_LOG(DYNA_REC, "Memory Around PC");
+
+	std::string pc_memory = "";
+	for (u64 pc = (ctx->CTX_PC - 32); pc < (ctx->CTX_PC + 32); pc += 16)
+	{
+		pc_memory += StringFromFormat("%08x%08x%08x%08x",
+			Common::swap32(*(u32*)pc), Common::swap32(*(u32*)(pc + 4)),
+			Common::swap32(*(u32*)(pc + 8)), Common::swap32(*(u32*)(pc + 12)));
+
+		ERROR_LOG(DYNA_REC, "0x%016lx: %08x %08x %08x %08x",
+			pc, *(u32*)pc, *(u32*)(pc + 4), *(u32*)(pc + 8), *(u32*)(pc + 12));
+	}
+
+	ERROR_LOG(DYNA_REC, "Full block: %s", pc_memory.c_str());
+}
+
+bool JitArm64::DisasmLoadStore(const u8* ptr, u32* flags, ARM64Reg* reg)
+{
+	u32 inst = *(u32*)ptr;
+	u32 prev_inst = *(u32*)(ptr - 4);
+	u32 next_inst = *(u32*)(ptr + 4);
+
+	u8 op = (inst >> 22) & 0xFF;
+	u8 size = (inst >> 30) & 0x3;
+
+	if (size == 0) // 8-bit
+		*flags |= BackPatchInfo::FLAG_SIZE_8;
+	else if (size == 1) // 16-bit
+		*flags |= BackPatchInfo::FLAG_SIZE_16;
+	else if (size == 2) // 32-bit
+		*flags |= BackPatchInfo::FLAG_SIZE_32;
+	else if (size == 3) // 64-bit
+		*flags |= BackPatchInfo::FLAG_SIZE_F64;
+
+	if (op == 0xF5) // NEON LDR
+	{
+		if (size == 2) // 32-bit float
+		{
+			*flags &= ~BackPatchInfo::FLAG_SIZE_32;
+			*flags |= BackPatchInfo::FLAG_SIZE_F32;
+
+			// Loads directly in to the target register
+			// Duplicates bottom result in to top register
+			*reg = (ARM64Reg)(inst & 0x1F);
+		}
+		else // 64-bit float
+		{
+			// Real register is in the INS instruction
+			u32 ins_inst = *(u32*)(ptr + 8);
+			*reg = (ARM64Reg)(ins_inst & 0x1F);
+		}
+		*flags |= BackPatchInfo::FLAG_LOAD;
+		return true;
+	}
+	else if (op == 0xF4) // NEON STR
+	{
+		if (size == 2) // 32-bit float
+		{
+			*flags &= ~BackPatchInfo::FLAG_SIZE_32;
+			*flags |= BackPatchInfo::FLAG_SIZE_F32;
+
+			// Real register is in the first FCVT conversion instruction
+			u32 fcvt_inst = *(u32*)(ptr - 8);
+			*reg = (ARM64Reg)((fcvt_inst >> 5) & 0x1F);
+		}
+		else // 64-bit float
+		{
+			// Real register is in the previous REV64 instruction
+			*reg = (ARM64Reg)((prev_inst >> 5) & 0x1F);
+		}
+		*flags |= BackPatchInfo::FLAG_STORE;
+		return true;
+	}
+	else if (op == 0xE5) // Load
+	{
+		*flags |= BackPatchInfo::FLAG_LOAD;
+		*reg = (ARM64Reg)(inst & 0x1F);
+		if ((next_inst & 0x7FFFF000) == 0x5AC00000) // REV
+		{
+			u32 sxth_inst = *(u32*)(ptr + 8);
+			if ((sxth_inst & 0x7F800000) == 0x13000000) // SXTH
+				*flags |= BackPatchInfo::FLAG_EXTEND;
+		}
+		else
+		{
+			*flags |= BackPatchInfo::FLAG_REVERSE;
+		}
+		return true;
+	}
+	else if (op == 0xE4) // Store
+	{
+		*flags |= BackPatchInfo::FLAG_STORE;
+
+		if (size == 0) // 8-bit
+			*reg = (ARM64Reg)(inst & 0x1F);
+		else // 16-bit/32-bit register is in previous REV instruction
+			*reg = (ARM64Reg)((prev_inst >> 5) & 0x1F);
+		return true;
+	}
+
+	return false;
+}
+
+u32 JitArm64::EmitBackpatchRoutine(ARM64XEmitter* emit, u32 flags, bool fastmem, bool do_padding, ARM64Reg RS, ARM64Reg addr)
+{
+	u32 trouble_offset = 0;
+	const u8* code_base = emit->GetCodePtr();
+
+	if (fastmem)
+	{
+		u8* base = UReg_MSR(MSR).DR ? Memory::logical_base : Memory::physical_base;
+		MOVK(addr, ((u64)base >> 32) & 0xFFFF, SHIFT_32);
+
+		if (flags & BackPatchInfo::FLAG_STORE &&
+		    flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64))
+		{
+			ARM64FloatEmitter float_emit(emit);
+			if (flags & BackPatchInfo::FLAG_SIZE_F32)
+			{
+				float_emit.FCVT(32, 64, D0, RS);
+				float_emit.REV32(8, D0, D0);
+				trouble_offset = (emit->GetCodePtr() - code_base) / 4;
+				float_emit.STR(32, INDEX_UNSIGNED, D0, addr, 0);
+			}
+			else
+			{
+				float_emit.REV64(8, Q0, RS);
+				trouble_offset = (emit->GetCodePtr() - code_base) / 4;
+				float_emit.STR(64, INDEX_UNSIGNED, Q0, addr, 0);
+			}
+		}
+		else if (flags & BackPatchInfo::FLAG_LOAD &&
+		         flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64))
+		{
+			ARM64FloatEmitter float_emit(emit);
+			trouble_offset = (emit->GetCodePtr() - code_base) / 4;
+			if (flags & BackPatchInfo::FLAG_SIZE_F32)
+			{
+				float_emit.LD1R(32, EncodeRegToDouble(RS), addr);
+				float_emit.REV32(8, EncodeRegToDouble(RS), EncodeRegToDouble(RS));
+				float_emit.FCVTL(64, EncodeRegToDouble(RS), EncodeRegToDouble(RS));
+			}
+			else
+			{
+				float_emit.LDR(64, INDEX_UNSIGNED, Q0, addr, 0);
+				float_emit.REV64(8, Q0, Q0);
+				float_emit.INS(64, RS, 0, Q0, 0);
+			}
+		}
+		else if (flags & BackPatchInfo::FLAG_STORE)
+		{
+			ARM64Reg temp = W0;
+			if (flags & BackPatchInfo::FLAG_SIZE_32)
+				emit->REV32(temp, RS);
+			else if (flags & BackPatchInfo::FLAG_SIZE_16)
+				emit->REV16(temp, RS);
+
+			trouble_offset = (emit->GetCodePtr() - code_base) / 4;
+
+			if (flags & BackPatchInfo::FLAG_SIZE_32)
+				emit->STR(INDEX_UNSIGNED, temp, addr, 0);
+			else if (flags & BackPatchInfo::FLAG_SIZE_16)
+				emit->STRH(INDEX_UNSIGNED, temp, addr, 0);
+			else
+				emit->STRB(INDEX_UNSIGNED, RS, addr, 0);
+		}
+		else
+		{
+			trouble_offset = (emit->GetCodePtr() - code_base) / 4;
+
+			if (flags & BackPatchInfo::FLAG_SIZE_32)
+				emit->LDR(INDEX_UNSIGNED, RS, addr, 0);
+			else if (flags & BackPatchInfo::FLAG_SIZE_16)
+				emit->LDRH(INDEX_UNSIGNED, RS, addr, 0);
+			else if (flags & BackPatchInfo::FLAG_SIZE_8)
+				emit->LDRB(INDEX_UNSIGNED, RS, addr, 0);
+
+			if (!(flags & BackPatchInfo::FLAG_REVERSE))
+			{
+				if (flags & BackPatchInfo::FLAG_SIZE_32)
+					emit->REV32(RS, RS);
+				else if (flags & BackPatchInfo::FLAG_SIZE_16)
+					emit->REV16(RS, RS);
+			}
+
+			if (flags & BackPatchInfo::FLAG_EXTEND)
+				emit->SXTH(RS, RS);
+		}
+	}
+	else
+	{
+		if (flags & BackPatchInfo::FLAG_STORE &&
+		    flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64))
+		{
+			ARM64FloatEmitter float_emit(emit);
+			if (flags & BackPatchInfo::FLAG_SIZE_F32)
+			{
+				float_emit.FCVT(32, 64, D0, RS);
+				float_emit.UMOV(32, W0, Q0, 0);
+				emit->MOVI2R(X30, (u64)&PowerPC::Write_U32);
+				emit->BLR(X30);
+			}
+			else
+			{
+				emit->MOVI2R(X30, (u64)&PowerPC::Write_U64);
+				float_emit.UMOV(64, X0, RS, 0);
+				emit->BLR(X30);
+			}
+
+		}
+		else if (flags & BackPatchInfo::FLAG_LOAD &&
+			   flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64))
+		{
+			ARM64FloatEmitter float_emit(emit);
+			if (flags & BackPatchInfo::FLAG_SIZE_F32)
+			{
+				emit->MOVI2R(X30, (u64)&PowerPC::Read_U32);
+				emit->BLR(X30);
+				float_emit.DUP(32, RS, X0);
+				float_emit.FCVTL(64, RS, RS);
+			}
+			else
+			{
+				emit->MOVI2R(X30, (u64)&PowerPC::Read_F64);
+				emit->BLR(X30);
+				float_emit.INS(64, RS, 0, X0);
+			}
+		}
+		else if (flags & BackPatchInfo::FLAG_STORE)
+		{
+			emit->MOV(W0, RS);
+
+			if (flags & BackPatchInfo::FLAG_SIZE_32)
+				emit->MOVI2R(X30, (u64)&PowerPC::Write_U32);
+			else if (flags & BackPatchInfo::FLAG_SIZE_16)
+				emit->MOVI2R(X30, (u64)&PowerPC::Write_U16);
+			else
+				emit->MOVI2R(X30, (u64)&PowerPC::Write_U8);
+
+			emit->BLR(X30);
+		}
+		else
+		{
+			if (flags & BackPatchInfo::FLAG_SIZE_32)
+				emit->MOVI2R(X30, (u64)&PowerPC::Read_U32);
+			else if (flags & BackPatchInfo::FLAG_SIZE_16)
+				emit->MOVI2R(X30, (u64)&PowerPC::Read_U16);
+			else if (flags & BackPatchInfo::FLAG_SIZE_8)
+				emit->MOVI2R(X30, (u64)&PowerPC::Read_U8);
+
+			emit->BLR(X30);
+
+			if (!(flags & BackPatchInfo::FLAG_REVERSE))
+			{
+				emit->MOV(RS, W0);
+			}
+			else
+			{
+				if (flags & BackPatchInfo::FLAG_SIZE_32)
+					emit->REV32(RS, W0);
+				else if (flags & BackPatchInfo::FLAG_SIZE_16)
+					emit->REV16(RS, W0);
+			}
+
+			if (flags & BackPatchInfo::FLAG_EXTEND)
+				emit->SXTH(RS, RS);
+		}
+	}
+
+	if (do_padding)
+	{
+		BackPatchInfo& info = m_backpatch_info[flags];
+		u32 num_insts_max = std::max(info.m_fastmem_size, info.m_slowmem_size);
+
+		u32 code_size = emit->GetCodePtr() - code_base;
+		code_size /= 4;
+
+		for (u32 i = 0; i < (num_insts_max - code_size); ++i)
+			emit->HINT(HINT_NOP);
+	}
+
+	return trouble_offset;
+}
+
+bool JitArm64::HandleFault(uintptr_t access_address, SContext* ctx)
+{
+	if (!(access_address >= (uintptr_t)Memory::physical_base && access_address < (uintptr_t)Memory::physical_base + 0x100010000) &&
+		!(access_address >= (uintptr_t)Memory::logical_base && access_address < (uintptr_t)Memory::logical_base + 0x100010000))
+	{
+		ERROR_LOG(DYNA_REC, "Exception handler - access below memory space. PC: 0x%016llx 0x%016lx < 0x%016lx", ctx->CTX_PC, access_address, (uintptr_t)Memory::physical_base);
+
+		DoBacktrace(access_address, ctx);
+		return false;
+	}
+
+	if (!IsInSpace((u8*)ctx->CTX_PC))
+	{
+		ERROR_LOG(DYNA_REC, "Backpatch location not within codespace 0x%016llx(0x%08x)", ctx->CTX_PC, Common::swap32(*(u32*)ctx->CTX_PC));
+
+		DoBacktrace(access_address, ctx);
+		return false;
+	}
+
+	ARM64Reg reg = INVALID_REG;
+	u32 flags = 0;
+
+	if (!DisasmLoadStore((const u8*)ctx->CTX_PC, &flags, &reg))
+	{
+		ERROR_LOG(DYNA_REC, "Error disassembling address 0x%016llx(0x%08x)", ctx->CTX_PC, Common::swap32(*(u32*)ctx->CTX_PC));
+
+		DoBacktrace(access_address, ctx);
+		return false;
+	}
+
+	BackPatchInfo& info = m_backpatch_info[flags];
+	ARM64XEmitter emitter((u8*)(ctx->CTX_PC - info.m_fastmem_trouble_inst_offset * 4));
+	u64 new_pc = (u64)emitter.GetCodePtr();
+
+	// Slowmem routine doesn't need the address location
+	// It is already in the correct location
+	EmitBackpatchRoutine(&emitter, flags, false, true, reg, INVALID_REG);
+
+	emitter.FlushIcache();
+	ctx->CTX_PC = new_pc;
+
+	// Wipe the top bits of the addr_register
+	if (flags & BackPatchInfo::FLAG_STORE &&
+	    !(flags & BackPatchInfo::FLAG_SIZE_F64))
+		ctx->CTX_REG(1) &= 0xFFFFFFFFUll;
+	else
+		ctx->CTX_REG(0) &= 0xFFFFFFFFUll;
+	return true;
+}
+
+void JitArm64::InitBackpatch()
+{
+	u32 flags = 0;
+	BackPatchInfo info;
+	u8* code_base = GetWritableCodePtr();
+	u8* code_end;
+
+	// Loads
+	{
+		// 8bit
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_8;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 16bit
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_16;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 32bit
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_32;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 16bit - Extend
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_16 |
+				BackPatchInfo::FLAG_EXTEND;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 16bit - Reverse
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_16 |
+				BackPatchInfo::FLAG_REVERSE;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 32bit - Reverse
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_32 |
+				BackPatchInfo::FLAG_REVERSE;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 32bit float
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_F32;
+			EmitBackpatchRoutine(this, flags, false, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 64bit float
+		{
+			flags =
+				BackPatchInfo::FLAG_LOAD |
+				BackPatchInfo::FLAG_SIZE_F64;
+			EmitBackpatchRoutine(this, flags, false, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+	}
+
+	// Stores
+	{
+		// 8bit
+		{
+			flags =
+				BackPatchInfo::FLAG_STORE |
+				BackPatchInfo::FLAG_SIZE_8;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 16bit
+		{
+			flags =
+				BackPatchInfo::FLAG_STORE |
+				BackPatchInfo::FLAG_SIZE_16;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 32bit
+		{
+			flags =
+				BackPatchInfo::FLAG_STORE |
+				BackPatchInfo::FLAG_SIZE_32;
+			EmitBackpatchRoutine(this, flags, false, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, W0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 32bit float
+		{
+			flags =
+				BackPatchInfo::FLAG_STORE |
+				BackPatchInfo::FLAG_SIZE_F32;
+			EmitBackpatchRoutine(this, flags, false, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+		// 64bit float
+		{
+			flags =
+				BackPatchInfo::FLAG_STORE |
+				BackPatchInfo::FLAG_SIZE_F64;
+			EmitBackpatchRoutine(this, flags, false, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_slowmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			info.m_fastmem_trouble_inst_offset =
+				EmitBackpatchRoutine(this, flags, true, false, Q0, X1);
+			code_end = GetWritableCodePtr();
+			info.m_fastmem_size = (code_end - code_base) / 4;
+
+			SetCodePtr(code_base);
+
+			m_backpatch_info[flags] = info;
+		}
+	}
+}
+
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
new file mode 100644
index 0000000000..8efd81e0f1
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
@@ -0,0 +1,265 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::sc(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	ARM64Reg WA = gpr.GetReg();
+
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(Exceptions));
+	ORR(WA, WA, 31, 0); // Same as WA | EXCEPTION_SYSCALL
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(Exceptions));
+
+	MOVI2R(WA, js.compilerPC + 4);
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(pc));
+
+	// WA is unlocked in this function
+	WriteExceptionExit(WA);
+}
+
+void JitArm64::rfi(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	// See Interpreter rfi for details
+	const u32 mask = 0x87C0FFFF;
+	const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
+	// MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13;
+	// R0 = MSR location
+	// R1 = MSR contents
+	// R2 = Mask
+	// R3 = Mask
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg WB = gpr.GetReg();
+	ARM64Reg WC = gpr.GetReg();
+
+	MOVI2R(WA, (~mask) & clearMSR13);
+	MOVI2R(WB, mask & clearMSR13);
+
+	LDR(INDEX_UNSIGNED, WC, X29, PPCSTATE_OFF(msr));
+
+	AND(WC, WC, WB, ArithOption(WC, ST_LSL, 0)); // rD = Masked MSR
+
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_SRR1])); // rB contains SRR1 here
+
+	AND(WA, WA, WB, ArithOption(WA, ST_LSL, 0)); // rB contains masked SRR1 here
+	ORR(WA, WA, WC, ArithOption(WA, ST_LSL, 0)); // rB = Masked MSR OR masked SRR1
+
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(msr)); // STR rB in to rA
+
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_SRR0]));
+	gpr.Unlock(WB, WC);
+
+	// WA is unlocked in this function
+	WriteExceptionExit(WA);
+}
+
+void JitArm64::bx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt26(inst.LI << 2);
+	else
+		destination = js.compilerPC + SignExt26(inst.LI << 2);
+
+	if (inst.LK)
+	{
+		u32 Jumpto = js.compilerPC + 4;
+		ARM64Reg WA = gpr.GetReg();
+		MOVI2R(WA, Jumpto);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_LR]));
+		gpr.Unlock(WA);
+	}
+
+	if (destination == js.compilerPC)
+	{
+		// make idle loops go faster
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+
+		MOVI2R(XA, (u64)&CoreTiming::Idle);
+		BLR(XA);
+		MOVI2R(WA, js.compilerPC);
+		WriteExceptionExit(WA);
+	}
+
+	WriteExit(destination);
+}
+
+void JitArm64::bcx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	ARM64Reg WA = gpr.GetReg();
+	FixupBranch pCTRDontBranch;
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
+	{
+		LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_CTR]));
+		SUBS(WA, WA, 1);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_CTR]));
+
+		if (inst.BO & BO_BRANCH_IF_CTR_0)
+			pCTRDontBranch = B(CC_NEQ);
+		else
+			pCTRDontBranch = B(CC_EQ);
+	}
+
+	FixupBranch pConditionDontBranch;
+
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
+	{
+		pConditionDontBranch = JumpIfCRFieldBit(inst.BI >> 2, 3 - (inst.BI & 3),
+		                                        !(inst.BO_2 & BO_BRANCH_IF_TRUE));
+	}
+
+	if (inst.LK)
+	{
+		u32 Jumpto = js.compilerPC + 4;
+		MOVI2R(WA, Jumpto);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_LR]));
+	}
+	gpr.Unlock(WA);
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt16(inst.BD << 2);
+	else
+		destination = js.compilerPC + SignExt16(inst.BD << 2);
+
+	gpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+
+	WriteExit(destination);
+
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
+		SetJumpTarget( pConditionDontBranch );
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
+		SetJumpTarget( pCTRDontBranch );
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush(FlushMode::FLUSH_ALL);
+		fpr.Flush(FlushMode::FLUSH_ALL);
+		WriteExit(js.compilerPC + 4);
+	}
+}
+
+void JitArm64::bcctrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	// bcctrx doesn't decrement and/or test CTR
+	_assert_msg_(DYNA_REC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!");
+
+	if (inst.BO_2 & BO_DONT_CHECK_CONDITION)
+	{
+		// BO_2 == 1z1zz -> b always
+
+		//NPC = CTR & 0xfffffffc;
+		gpr.Flush(FlushMode::FLUSH_ALL);
+		fpr.Flush(FlushMode::FLUSH_ALL);
+
+		if (inst.LK_3)
+		{
+			ARM64Reg WB = gpr.GetReg();
+			u32 Jumpto = js.compilerPC + 4;
+			MOVI2R(WB, Jumpto);
+			STR(INDEX_UNSIGNED, WB, X29, PPCSTATE_OFF(spr[SPR_LR]));
+			gpr.Unlock(WB);
+		}
+
+		ARM64Reg WA = gpr.GetReg();
+
+		LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_CTR]));
+		AND(WA, WA, 30, 29); // Wipe the bottom 2 bits.
+		WriteExitDestInR(WA);
+	}
+	else
+	{
+		// Rare condition seen in (just some versions of?) Nintendo's NES Emulator
+		// BO_2 == 001zy -> b if false
+		// BO_2 == 011zy -> b if true
+		_assert_msg_(DYNA_REC, false, "Haven't implemented rare form of bcctrx yet");
+	}
+}
+
+void JitArm64::bclrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	ARM64Reg WA = gpr.GetReg();
+	FixupBranch pCTRDontBranch;
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
+	{
+		LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_CTR]));
+		SUBS(WA, WA, 1);
+		STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_CTR]));
+
+		if (inst.BO & BO_BRANCH_IF_CTR_0)
+			pCTRDontBranch = B(CC_NEQ);
+		else
+			pCTRDontBranch = B(CC_EQ);
+	}
+
+	FixupBranch pConditionDontBranch;
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
+	{
+		pConditionDontBranch = JumpIfCRFieldBit(inst.BI >> 2, 3 - (inst.BI & 3),
+		                                        !(inst.BO_2 & BO_BRANCH_IF_TRUE));
+	}
+
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_LR]));
+	AND(WA, WA, 30, 29); // Wipe the bottom 2 bits.
+
+	if (inst.LK)
+	{
+		ARM64Reg WB = gpr.GetReg();
+		u32 Jumpto = js.compilerPC + 4;
+		MOVI2R(WB, Jumpto);
+		STR(INDEX_UNSIGNED, WB, X29, PPCSTATE_OFF(spr[SPR_LR]));
+		gpr.Unlock(WB);
+	}
+
+	gpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+
+	WriteExitDestInR(WA);
+
+	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
+		SetJumpTarget( pConditionDontBranch );
+	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
+		SetJumpTarget( pCTRDontBranch );
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush(FlushMode::FLUSH_ALL);
+		fpr.Flush(FlushMode::FLUSH_ALL);
+		WriteExit(js.compilerPC + 4);
+	}
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
new file mode 100644
index 0000000000..479e5c06c8
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
@@ -0,0 +1,394 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::fabsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FABS(EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::faddsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FADD(EncodeRegToDouble(VD), EncodeRegToDouble(VA), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+}
+
+void JitArm64::faddx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FADD(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fmaddsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FADD(EncodeRegToDouble(VD), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fmaddx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FADD(EncodeRegToDouble(V0), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fmrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.INS(64, VD, 0, VB, 0);
+}
+
+void JitArm64::fmsubsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FSUB(EncodeRegToDouble(VD), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fmsubx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FSUB(EncodeRegToDouble(V0), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fmulsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FMUL(EncodeRegToDouble(VD), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+}
+
+void JitArm64::fmulx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnabsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FABS(EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.FNEG(EncodeRegToDouble(V0), EncodeRegToDouble(V0));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnegx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FNEG(EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnmaddsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FADD(EncodeRegToDouble(VD), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnmaddx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FADD(EncodeRegToDouble(V0), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.FNEG(EncodeRegToDouble(V0), EncodeRegToDouble(V0));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnmsubsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FSUB(EncodeRegToDouble(VD), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.FNEG(EncodeRegToDouble(VD), EncodeRegToDouble(VD));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fnmsubx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VC));
+	m_float_emit.FSUB(EncodeRegToDouble(V0), EncodeRegToDouble(V0), EncodeRegToDouble(VB));
+	m_float_emit.FNEG(EncodeRegToDouble(V0), EncodeRegToDouble(V0));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fselx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FCMPE(EncodeRegToDouble(VA));
+	m_float_emit.FCSEL(EncodeRegToDouble(V0), EncodeRegToDouble(VC), EncodeRegToDouble(VB), CC_GE);
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::fsubsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FSUB(EncodeRegToDouble(VD), EncodeRegToDouble(VA), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 1, VD, 0);
+}
+
+void JitArm64::fsubx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, true);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FSUB(EncodeRegToDouble(V0), EncodeRegToDouble(VA), EncodeRegToDouble(VB));
+	m_float_emit.INS(64, VD, 0, V0, 0);
+
+	fpr.Unlock(V0);
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
new file mode 100644
index 0000000000..e20f07a61d
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
@@ -0,0 +1,720 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::ComputeRC(ARM64Reg reg, int crf)
+{
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+
+	SXTW(XA, reg);
+
+	STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[crf]));
+	gpr.Unlock(WA);
+}
+
+void JitArm64::ComputeRC(u32 imm, int crf)
+{
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+
+	MOVI2R(XA, imm);
+	if (imm & 0x80000000)
+		SXTW(XA, WA);
+
+	STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[crf]));
+	gpr.Unlock(WA);
+}
+
+void JitArm64::ComputeCarry(bool Carry)
+{
+	if (Carry)
+	{
+		ARM64Reg WA = gpr.GetReg();
+		MOVI2R(WA, 1);
+		STRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+		gpr.Unlock(WA);
+		return;
+	}
+
+	STRB(INDEX_UNSIGNED, WSP, X29, PPCSTATE_OFF(xer_ca));
+}
+
+void JitArm64::ComputeCarry()
+{
+	ARM64Reg WA = gpr.GetReg();
+	CSINC(WA, WSP, WSP, CC_CC);
+	STRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+	gpr.Unlock(WA);
+}
+
+// Following static functions are used in conjunction with reg_imm
+static u32 Add(u32 a, u32 b)
+{
+	return a + b;
+}
+
+static u32 Or(u32 a, u32 b)
+{
+	return a | b;
+}
+
+static u32 And(u32 a, u32 b)
+{
+	return a & b;
+}
+
+static u32 Xor(u32 a, u32 b)
+{
+	return a ^ b;
+}
+
+void JitArm64::reg_imm(u32 d, u32 a, bool binary, u32 value, Operation do_op, void (ARM64XEmitter::*op)(ARM64Reg, ARM64Reg, ARM64Reg, ArithOption), bool Rc)
+{
+	if (a || binary)
+	{
+		if (gpr.IsImm(a))
+		{
+			gpr.SetImmediate(d, do_op(gpr.GetImm(a), value));
+			if (Rc)
+				ComputeRC(gpr.GetImm(d));
+		}
+		else
+		{
+			gpr.BindToRegister(d, d == a);
+			ARM64Reg WA = gpr.GetReg();
+			MOVI2R(WA, value);
+			(this->*op)(gpr.R(d), gpr.R(a), WA, ArithOption(WA, ST_LSL, 0));
+			gpr.Unlock(WA);
+
+			if (Rc)
+				ComputeRC(gpr.R(d), 0);
+		}
+	}
+	else if (do_op == Add)
+	{
+		// a == 0, implies zero register
+		gpr.SetImmediate(d, value);
+		if (Rc)
+			ComputeRC(value, 0);
+	}
+	else
+	{
+		_assert_msg_(DYNA_REC, false, "Hit impossible condition in reg_imm!");
+	}
+}
+
+void JitArm64::arith_imm(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	u32 d = inst.RD, a = inst.RA, s = inst.RS;
+
+	switch (inst.OPCD)
+	{
+	case 14: // addi
+		reg_imm(d, a, false, (u32)(s32)inst.SIMM_16, Add, &ARM64XEmitter::ADD);
+	break;
+	case 15: // addis
+		reg_imm(d, a, false, (u32)inst.SIMM_16 << 16, Add, &ARM64XEmitter::ADD);
+	break;
+	case 24: // ori
+		if (a == 0 && s == 0 && inst.UIMM == 0 && !inst.Rc)  //check for nop
+		{
+			// NOP
+			return;
+		}
+		reg_imm(a, s, true, inst.UIMM, Or, &ARM64XEmitter::ORR);
+	break;
+	case 25: // oris
+		reg_imm(a, s, true, inst.UIMM << 16, Or,  &ARM64XEmitter::ORR);
+	break;
+	case 28: // andi
+		reg_imm(a, s, true, inst.UIMM,       And, &ARM64XEmitter::AND, true);
+	break;
+	case 29: // andis
+		reg_imm(a, s, true, inst.UIMM << 16, And, &ARM64XEmitter::AND, true);
+	break;
+	case 26: // xori
+		reg_imm(a, s, true, inst.UIMM,       Xor, &ARM64XEmitter::EOR);
+	break;
+	case 27: // xoris
+		reg_imm(a, s, true, inst.UIMM << 16, Xor, &ARM64XEmitter::EOR);
+	break;
+	}
+}
+
+void JitArm64::boolX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, s = inst.RS, b = inst.RB;
+
+	if (gpr.IsImm(s) && gpr.IsImm(b))
+	{
+		if (inst.SUBOP10 == 28)       // andx
+			gpr.SetImmediate(a, (u32)gpr.GetImm(s) & (u32)gpr.GetImm(b));
+		else if (inst.SUBOP10 == 476) // nandx
+			gpr.SetImmediate(a, ~((u32)gpr.GetImm(s) & (u32)gpr.GetImm(b)));
+		else if (inst.SUBOP10 == 60)  // andcx
+			gpr.SetImmediate(a, (u32)gpr.GetImm(s) & (~(u32)gpr.GetImm(b)));
+		else if (inst.SUBOP10 == 444) // orx
+			gpr.SetImmediate(a, (u32)gpr.GetImm(s) | (u32)gpr.GetImm(b));
+		else if (inst.SUBOP10 == 124) // norx
+			gpr.SetImmediate(a, ~((u32)gpr.GetImm(s) | (u32)gpr.GetImm(b)));
+		else if (inst.SUBOP10 == 412) // orcx
+			gpr.SetImmediate(a, (u32)gpr.GetImm(s) | (~(u32)gpr.GetImm(b)));
+		else if (inst.SUBOP10 == 316) // xorx
+			gpr.SetImmediate(a, (u32)gpr.GetImm(s) ^ (u32)gpr.GetImm(b));
+		else if (inst.SUBOP10 == 284) // eqvx
+			gpr.SetImmediate(a, ~((u32)gpr.GetImm(s) ^ (u32)gpr.GetImm(b)));
+
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(a), 0);
+	}
+	else if (s == b)
+	{
+		if ((inst.SUBOP10 == 28 /* andx */) || (inst.SUBOP10 == 444 /* orx */))
+		{
+			if (a != s)
+			{
+				gpr.BindToRegister(a, false);
+				MOV(gpr.R(a), gpr.R(s));
+			}
+			if (inst.Rc)
+				ComputeRC(gpr.R(a));
+		}
+		else if ((inst.SUBOP10 == 476 /* nandx */) || (inst.SUBOP10 == 124 /* norx */))
+		{
+			gpr.BindToRegister(a, a == s);
+			MVN(gpr.R(a), gpr.R(s));
+			if (inst.Rc)
+				ComputeRC(gpr.R(a));
+		}
+		else if ((inst.SUBOP10 == 412 /* orcx */) || (inst.SUBOP10 == 284 /* eqvx */))
+		{
+			gpr.SetImmediate(a, 0xFFFFFFFF);
+			if (inst.Rc)
+				ComputeRC(gpr.GetImm(a), 0);
+		}
+		else if ((inst.SUBOP10 == 60 /* andcx */) || (inst.SUBOP10 == 316 /* xorx */))
+		{
+			gpr.SetImmediate(a, 0);
+			if (inst.Rc)
+				ComputeRC(gpr.GetImm(a), 0);
+		}
+		else
+		{
+			PanicAlert("WTF!");
+		}
+	}
+	else
+	{
+		gpr.BindToRegister(a, (a == s) || (a == b));
+		if (inst.SUBOP10 == 28) // andx
+		{
+			AND(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else if (inst.SUBOP10 == 476) // nandx
+		{
+			AND(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+			MVN(gpr.R(a), gpr.R(a));
+		}
+		else if (inst.SUBOP10 == 60) // andcx
+		{
+			BIC(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else if (inst.SUBOP10 == 444) // orx
+		{
+			ORR(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else if (inst.SUBOP10 == 124) // norx
+		{
+			ORR(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+			MVN(gpr.R(a), gpr.R(a));
+		}
+		else if (inst.SUBOP10 == 412) // orcx
+		{
+			ORN(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else if (inst.SUBOP10 == 316) // xorx
+		{
+			EOR(gpr.R(a), gpr.R(s), gpr.R(b), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else if (inst.SUBOP10 == 284) // eqvx
+		{
+			EON(gpr.R(a), gpr.R(b), gpr.R(s), ArithOption(gpr.R(a), ST_LSL, 0));
+		}
+		else
+		{
+			PanicAlert("WTF!");
+		}
+		if (inst.Rc)
+			ComputeRC(gpr.R(a), 0);
+	}
+}
+
+void JitArm64::addx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		s32 i = (s32)gpr.GetImm(a), j = (s32)gpr.GetImm(b);
+		gpr.SetImmediate(d, i + j);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a || d == b);
+		ADD(gpr.R(d), gpr.R(a), gpr.R(b));
+		if (inst.Rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
+
+void JitArm64::extsXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA, s = inst.RS;
+	int size = inst.SUBOP10 == 922 ? 16 : 8;
+
+	if (gpr.IsImm(s))
+	{
+		gpr.SetImmediate(a, (u32)(s32)(size == 16 ? (s16)gpr.GetImm(s) : (s8)gpr.GetImm(s)));
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(a), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(a, a == s);
+		SBFM(gpr.R(a), gpr.R(s), 0, size - 1);
+		if (inst.Rc)
+			ComputeRC(gpr.R(a), 0);
+	}
+}
+
+void JitArm64::cntlzwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int s = inst.RS;
+
+	if (gpr.IsImm(s))
+	{
+		gpr.SetImmediate(a, __builtin_clz(gpr.GetImm(s)));
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(a), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(a, a == s);
+		CLZ(gpr.R(a), gpr.R(s));
+		if (inst.Rc)
+			ComputeRC(gpr.R(a), 0);
+	}
+}
+
+void JitArm64::negx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int a = inst.RA;
+	int d = inst.RD;
+
+	FALLBACK_IF(inst.OE);
+
+	if (gpr.IsImm(a))
+	{
+		gpr.SetImmediate(d, ~((u32)gpr.GetImm(a)) + 1);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a);
+		SUB(gpr.R(d), WSP, gpr.R(a), ArithOption(gpr.R(a), ST_LSL, 0));
+		if (inst.Rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
+
+void JitArm64::cmp(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	int crf = inst.CRFD;
+	u32 a = inst.RA, b = inst.RB;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		ComputeRC((s32)gpr.GetImm(a) - (s32)gpr.GetImm(b), crf);
+		return;
+	}
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg WB = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+	ARM64Reg XB = EncodeRegTo64(WB);
+	ARM64Reg RA = gpr.R(a);
+	ARM64Reg RB = gpr.R(b);
+	SXTW(XA, RA);
+	SXTW(XB, RB);
+
+	SUB(XA, XA, XB);
+	STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[0]) + (sizeof(PowerPC::ppcState.cr_val[0]) * crf));
+
+	gpr.Unlock(WA, WB);
+}
+
+void JitArm64::cmpl(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	int crf = inst.CRFD;
+	u32 a = inst.RA, b = inst.RB;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		ComputeRC(gpr.GetImm(a) - gpr.GetImm(b), crf);
+		return;
+	}
+	else if (gpr.IsImm(b) && !gpr.GetImm(b))
+	{
+		ComputeRC(gpr.R(a), crf);
+		return;
+	}
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+	SUB(XA, EncodeRegTo64(gpr.R(a)), EncodeRegTo64(gpr.R(b)));
+	STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[0]) + (sizeof(PowerPC::ppcState.cr_val[0]) * crf));
+	gpr.Unlock(WA);
+}
+
+void JitArm64::cmpi(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	u32 a = inst.RA;
+	int crf = inst.CRFD;
+	if (gpr.IsImm(a))
+	{
+		ComputeRC((s32)gpr.GetImm(a) - inst.SIMM_16, crf);
+		return;
+	}
+
+	ARM64Reg WA = gpr.GetReg();
+
+	if (inst.SIMM_16 >= 0 && inst.SIMM_16 < 4096)
+	{
+		SUB(WA, gpr.R(a), inst.SIMM_16);
+	}
+	else
+	{
+		MOVI2R(WA, inst.SIMM_16);
+		SUB(WA, gpr.R(a), WA);
+	}
+
+	ComputeRC(WA, crf);
+
+	gpr.Unlock(WA);
+}
+
+void JitArm64::cmpli(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	u32 a = inst.RA;
+	int crf = inst.CRFD;
+
+	if (gpr.IsImm(a))
+	{
+		ComputeRC(gpr.GetImm(a) - inst.UIMM, crf);
+		return;
+	}
+
+	if (!inst.UIMM)
+	{
+		ComputeRC(gpr.R(a), crf);
+		return;
+	}
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+
+	if (inst.UIMM < 4096)
+	{
+		SUB(XA, EncodeRegTo64(gpr.R(a)), inst.UIMM);
+	}
+	else
+	{
+		MOVI2R(WA, inst.UIMM);
+		SUB(XA, EncodeRegTo64(gpr.R(a)), XA);
+	}
+
+	STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[0]) + (sizeof(PowerPC::ppcState.cr_val[0]) * crf));
+	gpr.Unlock(WA);
+}
+
+void JitArm64::rlwinmx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	u32 a = inst.RA, s = inst.RS;
+
+	u32 mask = Helper_Mask(inst.MB, inst.ME);
+	if (gpr.IsImm(inst.RS))
+	{
+		gpr.SetImmediate(a, _rotl(gpr.GetImm(s), inst.SH) & mask);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(a), 0);
+		return;
+	}
+
+	gpr.BindToRegister(a, a == s);
+
+	ARM64Reg WA = gpr.GetReg();
+	ArithOption Shift(gpr.R(s), ST_ROR, 32 - inst.SH);
+	MOVI2R(WA, mask);
+	AND(gpr.R(a), WA, gpr.R(s), Shift);
+	gpr.Unlock(WA);
+
+	if (inst.Rc)
+		ComputeRC(gpr.R(a), 0);
+}
+
+void JitArm64::srawix(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	int a = inst.RA;
+	int s = inst.RS;
+	int amount = inst.SH;
+
+	if (gpr.IsImm(s))
+	{
+		s32 imm = (s32)gpr.GetImm(s);
+		gpr.SetImmediate(a, imm >> amount);
+
+		if (amount != 0 && (imm < 0) && (imm << (32 - amount)))
+			ComputeCarry(true);
+		else
+			ComputeCarry(false);
+	}
+	else if (amount != 0)
+	{
+		gpr.BindToRegister(a, a == s);
+		ARM64Reg RA = gpr.R(a);
+		ARM64Reg RS = gpr.R(s);
+		ARM64Reg WA = gpr.GetReg();
+
+		ORR(WA, WSP, RS, ArithOption(RS, ST_LSL, 32 - amount));
+		ORR(RA, WSP, RS, ArithOption(RS, ST_ASR, amount));
+		if (inst.Rc)
+			ComputeRC(RA, 0);
+
+		ANDS(WSP, WA, RA, ArithOption(RA, ST_LSL, 0));
+		CSINC(WA, WSP, WSP, CC_EQ);
+		STRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+		gpr.Unlock(WA);
+	}
+	else
+	{
+		gpr.BindToRegister(a, a == s);
+		ARM64Reg RA = gpr.R(a);
+		ARM64Reg RS = gpr.R(s);
+		MOV(RA, RS);
+		STRB(INDEX_UNSIGNED, WSP, X29, PPCSTATE_OFF(xer_ca));
+	}
+}
+
+void JitArm64::addic(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	int a = inst.RA, d = inst.RD;
+	bool rc = inst.OPCD == 13;
+	s32 simm = inst.SIMM_16;
+	u32 imm = (u32)simm;
+
+	if (gpr.IsImm(a))
+	{
+
+		u32 i = gpr.GetImm(a);
+		gpr.SetImmediate(d, i + imm);
+
+		bool has_carry = Interpreter::Helper_Carry(i, imm);
+		ComputeCarry(has_carry);
+		if (rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a);
+		if (imm < 4096)
+		{
+			ADDS(gpr.R(d), gpr.R(a), imm);
+		}
+		else if (simm > -4096 && simm < 0)
+		{
+			SUBS(gpr.R(d), gpr.R(a), std::abs(simm));
+		}
+		else
+		{
+			ARM64Reg WA = gpr.GetReg();
+			MOVI2R(WA, imm);
+			ADDS(gpr.R(d), gpr.R(a), WA);
+			gpr.Unlock(WA);
+		}
+
+		ComputeCarry();
+		if (rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
+
+void JitArm64::mulli(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, d = inst.RD;
+
+	if (gpr.IsImm(a))
+	{
+		s32 i = (s32)gpr.GetImm(a);
+		gpr.SetImmediate(d, i * inst.SIMM_16);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a);
+		ARM64Reg WA = gpr.GetReg();
+		MOVI2R(WA, (u32)(s32)inst.SIMM_16);
+		MUL(gpr.R(d), gpr.R(a), WA);
+		gpr.Unlock(WA);
+	}
+}
+
+void JitArm64::mullwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		s32 i = (s32)gpr.GetImm(a), j = (s32)gpr.GetImm(b);
+		gpr.SetImmediate(d, i * j);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a || d == b);
+		MUL(gpr.R(d), gpr.R(a), gpr.R(b));
+		if (inst.Rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
+
+void JitArm64::addzex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, d = inst.RD;
+
+	gpr.BindToRegister(d, d == a);
+	ARM64Reg WA = gpr.GetReg();
+	LDRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+	CMP(WA, 0);
+	CSINC(gpr.R(d), gpr.R(a), gpr.R(a), CC_EQ);
+	CMP(gpr.R(d), 0);
+	gpr.Unlock(WA);
+	ComputeCarry();
+	if (inst.Rc)
+		ComputeRC(gpr.R(d), 0);
+}
+
+void JitArm64::subfx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		u32 i = gpr.GetImm(a), j = gpr.GetImm(b);
+		gpr.SetImmediate(d, j - i);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a || d == b);
+		SUB(gpr.R(d), gpr.R(b), gpr.R(a));
+		if (inst.Rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
+
+void JitArm64::addcx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	FALLBACK_IF(inst.OE);
+
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+
+	if (gpr.IsImm(a) && gpr.IsImm(b))
+	{
+		u32 i = gpr.GetImm(a), j = gpr.GetImm(b);
+		gpr.SetImmediate(d, i + j);
+
+		bool has_carry = Interpreter::Helper_Carry(i, j);
+		ComputeCarry(has_carry);
+		if (inst.Rc)
+			ComputeRC(gpr.GetImm(d), 0);
+	}
+	else
+	{
+		gpr.BindToRegister(d, d == a || d == b);
+		ADDS(gpr.R(d), gpr.R(a), gpr.R(b));
+
+		ComputeCarry();
+		if (inst.Rc)
+			ComputeRC(gpr.R(d), 0);
+	}
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
new file mode 100644
index 0000000000..aba1493899
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
@@ -0,0 +1,628 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/MMIO.h"
+
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/Jit_Util.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::icbi(UGeckoInstruction inst)
+{
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	FallBackToInterpreter(inst);
+	WriteExit(js.compilerPC + 4);
+}
+
+void JitArm64::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 offset, bool update)
+{
+	// We want to make sure to not get LR as a temp register
+	gpr.Lock(W0, W30);
+
+	gpr.BindToRegister(dest, dest == (u32)addr || dest == (u32)offsetReg);
+	ARM64Reg dest_reg = gpr.R(dest);
+	ARM64Reg up_reg = INVALID_REG;
+	ARM64Reg off_reg = INVALID_REG;
+
+	if (addr != -1 && !gpr.IsImm(addr))
+		up_reg = gpr.R(addr);
+
+	if (offsetReg != -1 && !gpr.IsImm(offsetReg))
+		off_reg = gpr.R(offsetReg);
+
+	BitSet32 regs_in_use = gpr.GetCallerSavedUsed();
+	BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();
+	regs_in_use[W0] = 0;
+	regs_in_use[W30] = 0;
+	regs_in_use[dest_reg] = 0;
+
+	ARM64Reg addr_reg = W0;
+	u32 imm_addr = 0;
+	bool is_immediate = false;
+
+	if (offsetReg == -1)
+	{
+		if (addr != -1)
+		{
+			if (gpr.IsImm(addr))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(addr) + offset;
+			}
+			else
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, up_reg, offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, up_reg, std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, up_reg);
+				}
+			}
+		}
+		else
+		{
+			is_immediate = true;
+			imm_addr = offset;
+		}
+	}
+	else
+	{
+		if (addr != -1)
+		{
+			if (gpr.IsImm(addr) && gpr.IsImm(offsetReg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(addr) + gpr.GetImm(offsetReg);
+			}
+			else if (gpr.IsImm(addr) && !gpr.IsImm(offsetReg))
+			{
+				u32 reg_offset = gpr.GetImm(addr);
+				if (reg_offset < 4096)
+				{
+					ADD(addr_reg, off_reg, reg_offset);
+				}
+				else
+				{
+					MOVI2R(addr_reg, gpr.GetImm(addr));
+					ADD(addr_reg, addr_reg, off_reg);
+				}
+			}
+			else if (!gpr.IsImm(addr) && gpr.IsImm(offsetReg))
+			{
+				u32 reg_offset = gpr.GetImm(offsetReg);
+				if (reg_offset < 4096)
+				{
+					ADD(addr_reg, up_reg, reg_offset);
+				}
+				else
+				{
+					MOVI2R(addr_reg, gpr.GetImm(offsetReg));
+					ADD(addr_reg, addr_reg, up_reg);
+				}
+			}
+			else
+			{
+				ADD(addr_reg, up_reg, off_reg);
+			}
+		}
+		else
+		{
+			if (gpr.IsImm(offsetReg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(offsetReg);
+			}
+			else
+			{
+				MOV(addr_reg, off_reg);
+			}
+		}
+	}
+
+	ARM64Reg XA = EncodeRegTo64(addr_reg);
+
+	if (is_immediate)
+		MOVI2R(XA, imm_addr);
+
+	if (update)
+	{
+		gpr.BindToRegister(addr, false);
+		MOV(gpr.R(addr), addr_reg);
+	}
+
+	u32 access_size = BackPatchInfo::GetFlagSize(flags);
+	u32 mmio_address = 0;
+	if (is_immediate)
+		mmio_address = PowerPC::IsOptimizableMMIOAccess(imm_addr, access_size);
+
+	if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr))
+	{
+		EmitBackpatchRoutine(this, flags, true, false, dest_reg, XA);
+	}
+	else if (mmio_address)
+	{
+		MMIOLoadToReg(Memory::mmio_mapping, this,
+		              regs_in_use, fprs_in_use, dest_reg,
+		              mmio_address, flags);
+	}
+	else
+	{
+		// Has a chance of being backpatched which will destroy our state
+		// push and pop everything in this instance
+		ABI_PushRegisters(regs_in_use);
+		m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+		EmitBackpatchRoutine(this, flags,
+			jo.fastmem,
+			jo.fastmem,
+			dest_reg, XA);
+		m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+		ABI_PopRegisters(regs_in_use);
+	}
+
+	gpr.Unlock(W0, W30);
+}
+
+void JitArm64::SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, u32 flags, s32 offset)
+{
+	// We want to make sure to not get LR as a temp register
+	gpr.Lock(W0, W1, W30);
+
+	ARM64Reg RS = gpr.R(value);
+
+	ARM64Reg reg_dest = INVALID_REG;
+	ARM64Reg reg_off = INVALID_REG;
+
+	if (regOffset != -1 && !gpr.IsImm(regOffset))
+		reg_off = gpr.R(regOffset);
+	if (dest != -1 && !gpr.IsImm(dest))
+		reg_dest = gpr.R(dest);
+
+	BitSet32 regs_in_use = gpr.GetCallerSavedUsed();
+	BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();
+	regs_in_use[W0] = 0;
+	regs_in_use[W1] = 0;
+	regs_in_use[W30] = 0;
+
+	ARM64Reg addr_reg = W1;
+
+	u32 imm_addr = 0;
+	bool is_immediate = false;
+
+	if (regOffset == -1)
+	{
+		if (dest != -1)
+		{
+			if (gpr.IsImm(dest))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(dest) + offset;
+			}
+			else
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, reg_dest, offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, reg_dest, std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, reg_dest);
+				}
+			}
+		}
+		else
+		{
+			is_immediate = true;
+			imm_addr = offset;
+		}
+	}
+	else
+	{
+		if (dest != -1)
+		{
+			if (gpr.IsImm(dest) && gpr.IsImm(regOffset))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(dest) + gpr.GetImm(regOffset);
+			}
+			else if (gpr.IsImm(dest) && !gpr.IsImm(regOffset))
+			{
+				u32 reg_offset = gpr.GetImm(dest);
+				if (reg_offset < 4096)
+				{
+					ADD(addr_reg, reg_off, reg_offset);
+				}
+				else
+				{
+					MOVI2R(addr_reg, reg_offset);
+					ADD(addr_reg, addr_reg, reg_off);
+				}
+			}
+			else if (!gpr.IsImm(dest) && gpr.IsImm(regOffset))
+			{
+				u32 reg_offset = gpr.GetImm(regOffset);
+				if (reg_offset < 4096)
+				{
+					ADD(addr_reg, reg_dest, reg_offset);
+				}
+				else
+				{
+					MOVI2R(addr_reg, gpr.GetImm(regOffset));
+					ADD(addr_reg, addr_reg, reg_dest);
+				}
+			}
+			else
+			{
+				ADD(addr_reg, reg_dest, reg_off);
+			}
+		}
+		else
+		{
+			if (gpr.IsImm(regOffset))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(regOffset);
+			}
+			else
+			{
+				MOV(addr_reg, reg_off);
+			}
+		}
+	}
+
+	ARM64Reg XA = EncodeRegTo64(addr_reg);
+
+	u32 access_size = BackPatchInfo::GetFlagSize(flags);
+	u32 mmio_address = 0;
+	if (is_immediate)
+		mmio_address = PowerPC::IsOptimizableMMIOAccess(imm_addr, access_size);
+
+	if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr))
+	{
+		MOVI2R(XA, imm_addr);
+
+		EmitBackpatchRoutine(this, flags, true, false, RS, XA);
+	}
+	else if (mmio_address && !(flags & BackPatchInfo::FLAG_REVERSE))
+	{
+		MMIOWriteRegToAddr(Memory::mmio_mapping, this,
+		                   regs_in_use, fprs_in_use, RS,
+		                   mmio_address, flags);
+	}
+	else
+	{
+		if (is_immediate)
+			MOVI2R(XA, imm_addr);
+
+		// Has a chance of being backpatched which will destroy our state
+		// push and pop everything in this instance
+		ABI_PushRegisters(regs_in_use);
+		m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+		EmitBackpatchRoutine(this, flags,
+			jo.fastmem,
+			jo.fastmem,
+			RS, XA);
+		m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+		ABI_PopRegisters(regs_in_use);
+	}
+
+	gpr.Unlock(W0, W1, W30);
+}
+
+void JitArm64::lXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	u32 a = inst.RA, b = inst.RB, d = inst.RD;
+	s32 offset = inst.SIMM_16;
+	s32 offsetReg = -1;
+	u32 flags = BackPatchInfo::FLAG_LOAD;
+	bool update = false;
+
+	switch (inst.OPCD)
+	{
+		case 31:
+			switch (inst.SUBOP10)
+			{
+				case 55: // lwzux
+					update = true;
+				case 23: // lwzx
+					flags |= BackPatchInfo::FLAG_SIZE_32;
+					offsetReg = b;
+				break;
+				case 119: //lbzux
+					update = true;
+				case 87: // lbzx
+					flags |= BackPatchInfo::FLAG_SIZE_8;
+					offsetReg = b;
+				break;
+				case 311: // lhzux
+					update = true;
+				case 279: // lhzx
+					flags |= BackPatchInfo::FLAG_SIZE_16;
+					offsetReg = b;
+				break;
+				case 375: // lhaux
+					update = true;
+				case 343: // lhax
+					flags |= BackPatchInfo::FLAG_EXTEND |
+					         BackPatchInfo::FLAG_SIZE_16;
+					offsetReg = b;
+				break;
+				case 534: // lwbrx
+					flags |= BackPatchInfo::FLAG_REVERSE |
+					         BackPatchInfo::FLAG_SIZE_32;
+				break;
+				case 790: // lhbrx
+					flags |= BackPatchInfo::FLAG_REVERSE |
+					         BackPatchInfo::FLAG_SIZE_16;
+				break;
+			}
+		break;
+		case 33: // lwzu
+			update = true;
+		case 32: // lwz
+			flags |= BackPatchInfo::FLAG_SIZE_32;
+		break;
+		case 35: // lbzu
+			update = true;
+		case 34: // lbz
+			flags |= BackPatchInfo::FLAG_SIZE_8;
+		break;
+		case 41: // lhzu
+			update = true;
+		case 40: // lhz
+			flags |= BackPatchInfo::FLAG_SIZE_16;
+		break;
+		case 43: // lhau
+			update = true;
+		case 42: // lha
+			flags |= BackPatchInfo::FLAG_EXTEND |
+			        BackPatchInfo::FLAG_SIZE_16;
+		break;
+	}
+
+	SafeLoadToReg(d, update ? a : (a ? a : -1), offsetReg, flags, offset, update);
+
+	// LWZ idle skipping
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
+	    inst.OPCD == 32 &&
+	    (inst.hex & 0xFFFF0000) == 0x800D0000 &&
+	    (PowerPC::HostRead_U32(js.compilerPC + 4) == 0x28000000 ||
+	    (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC + 4) == 0x2C000000)) &&
+	    PowerPC::HostRead_U32(js.compilerPC + 8) == 0x4182fff8)
+	{
+		// if it's still 0, we can wait until the next event
+		FixupBranch noIdle = CBNZ(gpr.R(d));
+
+		gpr.Flush(FLUSH_MAINTAIN_STATE);
+		fpr.Flush(FLUSH_MAINTAIN_STATE);
+
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+
+		MOVI2R(XA, (u64)&PowerPC::OnIdle);
+		BLR(XA);
+
+		gpr.Unlock(WA);
+		WriteExceptionExit();
+
+		SetJumpTarget(noIdle);
+
+		//js.compilerPC += 8;
+		return;
+	}
+}
+
+void JitArm64::stX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	u32 a = inst.RA, b = inst.RB, s = inst.RS;
+	s32 offset = inst.SIMM_16;
+	s32 regOffset = -1;
+	u32 flags = BackPatchInfo::FLAG_STORE;
+	bool update = false;
+	switch (inst.OPCD)
+	{
+		case 31:
+			switch (inst.SUBOP10)
+			{
+				case 183: // stwux
+					update = true;
+				case 151: // stwx
+					flags |= BackPatchInfo::FLAG_SIZE_32;
+					regOffset = b;
+				break;
+				case 247: // stbux
+					update = true;
+				case 215: // stbx
+					flags |= BackPatchInfo::FLAG_SIZE_8;
+					regOffset = b;
+				break;
+				case 439: // sthux
+					update = true;
+				case 407: // sthx
+					flags |= BackPatchInfo::FLAG_SIZE_16;
+					regOffset = b;
+				break;
+			}
+		break;
+		case 37: // stwu
+			update = true;
+		case 36: // stw
+			flags |= BackPatchInfo::FLAG_SIZE_32;
+		break;
+		case 39: // stbu
+			update = true;
+		case 38: // stb
+			flags |= BackPatchInfo::FLAG_SIZE_8;
+		break;
+		case 45: // sthu
+			update = true;
+		case 44: // sth
+			flags |= BackPatchInfo::FLAG_SIZE_16;
+		break;
+
+	}
+
+	SafeStoreFromReg(update ? a : (a ? a : -1), s, regOffset, flags, offset);
+
+	if (update)
+	{
+		gpr.BindToRegister(a, false);
+
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg RB;
+		ARM64Reg RA = gpr.R(a);
+		if (regOffset != -1)
+			RB = gpr.R(regOffset);
+		if (regOffset == -1)
+		{
+			MOVI2R(WA, offset);
+			ADD(RA, RA, WA);
+		}
+		else
+		{
+			ADD(RA, RA, RB);
+		}
+		gpr.Unlock(WA);
+	}
+}
+
+void JitArm64::lmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(!jo.fastmem);
+
+	u32 a = inst.RA;
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+	if (a)
+	{
+		bool add = inst.SIMM_16 >= 0;
+		u16 off = std::abs(inst.SIMM_16);
+		if (off < 4096)
+		{
+			if (add)
+				ADD(WA, gpr.R(a), off);
+			else
+				SUB(WA, gpr.R(a), off);
+		}
+		else
+		{
+			u16 remaining = off >> 12;
+			if (add)
+			{
+				ADD(WA, WA, remaining, true);
+				ADD(WA, gpr.R(a), off & 0xFFF);
+			}
+			else
+			{
+				SUB(WA, WA, remaining, true);
+				SUB(WA, gpr.R(a), off & 0xFFF);
+			}
+		}
+	}
+	else
+	{
+		MOVI2R(WA, (u32)(s32)(s16)inst.SIMM_16);
+	}
+
+	u8* base = UReg_MSR(MSR).DR ? Memory::logical_base : Memory::physical_base;
+	MOVK(XA, ((u64)base >> 32) & 0xFFFF, SHIFT_32);
+
+	for (int i = inst.RD; i < 32; i++)
+	{
+		gpr.BindToRegister(i, false);
+		ARM64Reg RX = gpr.R(i);
+		LDR(INDEX_UNSIGNED, RX, XA, (i - inst.RD) * 4);
+		REV32(RX, RX);
+	}
+
+	gpr.Unlock(WA);
+}
+
+void JitArm64::stmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(!jo.fastmem);
+
+	u32 a = inst.RA;
+
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+	ARM64Reg WB = gpr.GetReg();
+
+	if (a)
+	{
+		bool add = inst.SIMM_16 >= 0;
+		u16 off = std::abs(inst.SIMM_16);
+		if (off < 4096)
+		{
+			if (add)
+				ADD(WA, gpr.R(a), off);
+			else
+				SUB(WA, gpr.R(a), off);
+		}
+		else
+		{
+			u16 remaining = off >> 12;
+			if (add)
+			{
+				ADD(WA, WA, remaining, true);
+				ADD(WA, gpr.R(a), off & 0xFFF);
+			}
+			else
+			{
+				SUB(WA, WA, remaining, true);
+				SUB(WA, gpr.R(a), off & 0xFFF);
+			}
+		}
+	}
+	else
+	{
+		MOVI2R(WA, (u32)(s32)(s16)inst.SIMM_16);
+	}
+
+	u8* base = UReg_MSR(MSR).DR ? Memory::logical_base : Memory::physical_base;
+	MOVK(XA, ((u64)base >> 32) & 0xFFFF, SHIFT_32);
+
+	for (int i = inst.RD; i < 32; i++)
+	{
+		ARM64Reg RX = gpr.R(i);
+		REV32(WB, RX);
+		STR(INDEX_UNSIGNED, WB, XA, (i - inst.RD) * 4);
+	}
+
+	gpr.Unlock(WA, WB);
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp
new file mode 100644
index 0000000000..8e4aaf59e9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp
@@ -0,0 +1,463 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::lfXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+
+	u32 a = inst.RA, b = inst.RB;
+
+	s32 offset = inst.SIMM_16;
+	u32 flags = BackPatchInfo::FLAG_LOAD;
+	bool update = false;
+	s32 offset_reg = -1;
+
+	switch (inst.OPCD)
+	{
+		case 31:
+			switch (inst.SUBOP10)
+			{
+				case 567: // lfsux
+					flags |= BackPatchInfo::FLAG_SIZE_F32;
+					update = true;
+					offset_reg = b;
+				break;
+				case 535: // lfsx
+					flags |= BackPatchInfo::FLAG_SIZE_F32;
+					offset_reg = b;
+				break;
+				case 631: // lfdux
+					flags |= BackPatchInfo::FLAG_SIZE_F64;
+					update = true;
+					offset_reg = b;
+				break;
+				case 599: // lfdx
+					flags |= BackPatchInfo::FLAG_SIZE_F64;
+					offset_reg = b;
+				break;
+			}
+		break;
+		case 49: // lfsu
+			flags |= BackPatchInfo::FLAG_SIZE_F32;
+			update = true;
+		break;
+		case 48: // lfs
+			flags |= BackPatchInfo::FLAG_SIZE_F32;
+		break;
+		case 51: // lfdu
+			flags |= BackPatchInfo::FLAG_SIZE_F64;
+			update = true;
+		break;
+		case 50: // lfd
+			flags |= BackPatchInfo::FLAG_SIZE_F64;
+		break;
+	}
+
+	u32 imm_addr = 0;
+	bool is_immediate = false;
+
+	fpr.BindToRegister(inst.FD, false);
+	ARM64Reg VD = fpr.R(inst.FD);
+	ARM64Reg addr_reg = W0;
+
+	gpr.Lock(W0, W30);
+	fpr.Lock(Q0);
+
+	if (update)
+	{
+		// Always uses RA
+		if (gpr.IsImm(a) && offset_reg == -1)
+		{
+			is_immediate = true;
+			imm_addr = offset + gpr.GetImm(a);
+		}
+		else if (gpr.IsImm(a) && offset_reg != -1 && gpr.IsImm(offset_reg))
+		{
+			is_immediate = true;
+			imm_addr = gpr.GetImm(a) + gpr.GetImm(offset_reg);
+		}
+		else
+		{
+			if (offset_reg == -1)
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, gpr.R(a), offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, gpr.R(a), std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, gpr.R(a));
+				}			}
+			else
+			{
+				ADD(addr_reg, gpr.R(offset_reg), gpr.R(a));
+			}
+		}
+	}
+	else
+	{
+		if (offset_reg == -1)
+		{
+			if (a && gpr.IsImm(a))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(a) + offset;
+			}
+			else if (a)
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, gpr.R(a), offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, gpr.R(a), std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, gpr.R(a));
+				}			}
+			else
+			{
+				is_immediate = true;
+				imm_addr = offset;
+			}
+		}
+		else
+		{
+			if (a && gpr.IsImm(a) && gpr.IsImm(offset_reg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(a) + gpr.GetImm(offset_reg);
+			}
+			else if (!a && gpr.IsImm(offset_reg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(offset_reg);
+			}
+			else if (a)
+			{
+				ADD(addr_reg, gpr.R(a), gpr.R(offset_reg));
+			}
+			else
+			{
+				MOV(addr_reg, gpr.R(offset_reg));
+			}
+		}
+	}
+
+	ARM64Reg XA = EncodeRegTo64(addr_reg);
+
+	if (is_immediate)
+		MOVI2R(XA, imm_addr);
+
+	if (update)
+	{
+		gpr.BindToRegister(a, false);
+		MOV(gpr.R(a), addr_reg);
+	}
+
+	BitSet32 regs_in_use = gpr.GetCallerSavedUsed();
+	BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();
+	regs_in_use[W0] = 0;
+	regs_in_use[W30] = 0;
+	fprs_in_use[0] = 0; // Q0
+	fprs_in_use[VD - Q0] = 0;
+
+	if (is_immediate && PowerPC::IsOptimizableRAMAddress(imm_addr))
+	{
+		EmitBackpatchRoutine(this, flags, true, false, VD, XA);
+	}
+	else
+	{
+		// Has a chance of being backpatched which will destroy our state
+		// push and pop everything in this instance
+		ABI_PushRegisters(regs_in_use);
+		m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+		EmitBackpatchRoutine(this, flags,
+			jo.fastmem,
+			jo.fastmem,
+			VD, XA);
+		m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+		ABI_PopRegisters(regs_in_use);
+	}
+
+	gpr.Unlock(W0, W30);
+	fpr.Unlock(Q0);
+}
+
+void JitArm64::stfXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+
+	u32 a = inst.RA, b = inst.RB;
+
+	s32 offset = inst.SIMM_16;
+	u32 flags = BackPatchInfo::FLAG_STORE;
+	bool update = false;
+	s32 offset_reg = -1;
+
+	switch (inst.OPCD)
+	{
+		case 31:
+			switch (inst.SUBOP10)
+			{
+				case 663: // stfsx
+					flags |= BackPatchInfo::FLAG_SIZE_F32;
+					offset_reg = b;
+				break;
+				case 695: // stfsux
+					flags |= BackPatchInfo::FLAG_SIZE_F32;
+					offset_reg = b;
+				break;
+				case 727: // stfdx
+					flags |= BackPatchInfo::FLAG_SIZE_F64;
+					offset_reg = b;
+				break;
+				case 759: // stfdux
+					flags |= BackPatchInfo::FLAG_SIZE_F64;
+					update = true;
+					offset_reg = b;
+				break;
+			}
+		break;
+		case 53: // stfsu
+			flags |= BackPatchInfo::FLAG_SIZE_F32;
+			update = true;
+		break;
+		case 52: // stfs
+			flags |= BackPatchInfo::FLAG_SIZE_F32;
+		break;
+		case 55: // stfdu
+			flags |= BackPatchInfo::FLAG_SIZE_F64;
+			update = true;
+		break;
+		case 54: // stfd
+			flags |= BackPatchInfo::FLAG_SIZE_F64;
+		break;
+	}
+
+	u32 imm_addr = 0;
+	bool is_immediate = false;
+
+	ARM64Reg V0 = fpr.R(inst.FS);
+	ARM64Reg addr_reg = W1;
+
+	gpr.Lock(W0, W1, W30);
+	fpr.Lock(Q0);
+
+	if (update)
+	{
+		// Always uses RA
+		if (gpr.IsImm(a) && offset_reg == -1)
+		{
+			is_immediate = true;
+			imm_addr = offset + gpr.GetImm(a);
+		}
+		else if (gpr.IsImm(a) && offset_reg != -1 && gpr.IsImm(offset_reg))
+		{
+			is_immediate = true;
+			imm_addr = gpr.GetImm(a) + gpr.GetImm(offset_reg);
+		}
+		else
+		{
+			if (offset_reg == -1)
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, gpr.R(a), offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, gpr.R(a), std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, gpr.R(a));
+				}
+			}
+			else
+			{
+				ADD(addr_reg, gpr.R(offset_reg), gpr.R(a));
+			}
+		}
+	}
+	else
+	{
+		if (offset_reg == -1)
+		{
+			if (a && gpr.IsImm(a))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(a) + offset;
+			}
+			else if (a)
+			{
+				if (offset >= 0 && offset < 4096)
+				{
+					ADD(addr_reg, gpr.R(a), offset);
+				}
+				else if (offset < 0 && offset > -4096)
+				{
+					SUB(addr_reg, gpr.R(a), std::abs(offset));
+				}
+				else
+				{
+					MOVI2R(addr_reg, offset);
+					ADD(addr_reg, addr_reg, gpr.R(a));
+				}			}
+			else
+			{
+				is_immediate = true;
+				imm_addr = offset;
+			}
+		}
+		else
+		{
+			if (a && gpr.IsImm(a) && gpr.IsImm(offset_reg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(a) + gpr.GetImm(offset_reg);
+			}
+			else if (!a && gpr.IsImm(offset_reg))
+			{
+				is_immediate = true;
+				imm_addr = gpr.GetImm(offset_reg);
+			}
+			else if (a)
+			{
+				ADD(addr_reg, gpr.R(a), gpr.R(offset_reg));
+			}
+			else
+			{
+				MOV(addr_reg, gpr.R(offset_reg));
+			}
+		}
+	}
+
+	ARM64Reg XA = EncodeRegTo64(addr_reg);
+
+	if (is_immediate && !(jit->jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr)))
+	{
+		MOVI2R(XA, imm_addr);
+
+		if (update)
+		{
+			gpr.BindToRegister(a, false);
+			MOV(gpr.R(a), addr_reg);
+		}
+	}
+	else if (!is_immediate && update)
+	{
+		gpr.BindToRegister(a, false);
+		MOV(gpr.R(a), addr_reg);
+	}
+
+	BitSet32 regs_in_use = gpr.GetCallerSavedUsed();
+	BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();
+	regs_in_use[W0] = 0;
+	regs_in_use[W1] = 0;
+	regs_in_use[W30] = 0;
+	fprs_in_use[0] = 0; // Q0
+
+	if (is_immediate)
+	{
+		if (jit->jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr))
+		{
+			int accessSize;
+			if (flags & BackPatchInfo::FLAG_SIZE_F64)
+				accessSize = 64;
+			else
+				accessSize = 32;
+
+			u64 base_ptr = std::min((u64)&GPFifo::m_gatherPipeCount, (u64)&GPFifo::m_gatherPipe);
+			u32 count_off = (u64)&GPFifo::m_gatherPipeCount - base_ptr;
+			u32 pipe_off = (u64)&GPFifo::m_gatherPipe - base_ptr;
+
+			MOVI2R(X30, base_ptr);
+
+			if (pipe_off)
+				ADD(X1, X30, pipe_off);
+
+			LDR(INDEX_UNSIGNED, W0, X30, count_off);
+			if (accessSize == 64)
+			{
+				m_float_emit.REV64(8, Q0, V0);
+				if (pipe_off)
+					m_float_emit.STR(64, Q0, X1, ArithOption(X0));
+				else
+					m_float_emit.STR(64, Q0, X30, ArithOption(X0));
+			}
+			else if (accessSize == 32)
+			{
+				m_float_emit.FCVT(32, 64, D0, EncodeRegToDouble(V0));
+				m_float_emit.REV32(8, D0, D0);
+				if (pipe_off)
+					m_float_emit.STR(32, D0, X1, ArithOption(X0));
+				else
+					m_float_emit.STR(32, D0, X30, ArithOption(X0));
+
+			}
+			ADD(W0, W0, accessSize >> 3);
+			STR(INDEX_UNSIGNED, W0, X30, count_off);
+			jit->js.fifoBytesThisBlock += accessSize >> 3;
+
+			if (update)
+			{
+				// Chance of this happening is fairly low, but support it
+				gpr.BindToRegister(a, false);
+				MOVI2R(gpr.R(a), imm_addr);
+			}
+		}
+		else if (PowerPC::IsOptimizableRAMAddress(imm_addr))
+		{
+			EmitBackpatchRoutine(this, flags, true, false, V0, XA);
+		}
+		else
+		{
+			ABI_PushRegisters(regs_in_use);
+			m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+			EmitBackpatchRoutine(this, flags, false, false, V0, XA);
+			m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+			ABI_PopRegisters(regs_in_use);
+		}
+	}
+	else
+	{
+		// Has a chance of being backpatched which will destroy our state
+		// push and pop everything in this instance
+		ABI_PushRegisters(regs_in_use);
+		m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+		EmitBackpatchRoutine(this, flags,
+			jo.fastmem,
+			jo.fastmem,
+			V0, XA);
+		m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+		ABI_PopRegisters(regs_in_use);
+	}
+	gpr.Unlock(W0, W1, W30);
+	fpr.Unlock(Q0);
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
new file mode 100644
index 0000000000..e22cba65f5
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
@@ -0,0 +1,168 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::psq_l(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+	FALLBACK_IF(jo.memcheck || !jo.fastmem);
+	FALLBACK_IF(true);
+
+	// X30 is LR
+	// X0 contains the scale
+	// X1 is the address
+	// X2 is a temporary
+	// Q0 is the return register
+	// Q1 is a temporary
+	bool update = inst.OPCD == 57;
+	s32 offset = inst.SIMM_12;
+
+	gpr.Lock(W0, W1, W2, W30);
+	fpr.Lock(Q0, Q1);
+
+	ARM64Reg arm_addr = gpr.R(inst.RA);
+	ARM64Reg scale_reg = W0;
+	ARM64Reg addr_reg = W1;
+	ARM64Reg type_reg = W2;
+
+	LDR(INDEX_UNSIGNED, scale_reg, X29, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
+
+	if (inst.RA || update) // Always uses the register on update
+	{
+		if (offset >= 0)
+			ADD(addr_reg, gpr.R(inst.RA), offset);
+		else
+			SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
+	}
+	else
+	{
+		MOVI2R(addr_reg, (u32)offset);
+	}
+
+	UBFM(type_reg, scale_reg, 16, 18); // Type
+	UBFM(scale_reg, scale_reg, 24, 29); // Scale
+
+	if (update)
+	{
+		gpr.BindToRegister(inst.RA, false);
+		MOV(arm_addr, addr_reg);
+	}
+
+	MOVI2R(X30, (u64)&asm_routines.pairedLoadQuantized[inst.W * 8]);
+	LDR(X30, X30, ArithOption(EncodeRegTo64(type_reg), true));
+	BLR(X30);
+
+	fpr.BindToRegister(inst.RS, false);
+	ARM64Reg VS = fpr.R(inst.RS);
+	m_float_emit.FCVTL(64, VS, D0);
+	if (inst.W)
+	{
+		m_float_emit.FMOV(D0, 0x70); // 1.0 as a Double
+		m_float_emit.INS(64, VS, 1, Q0, 0);
+	}
+
+	gpr.Unlock(W0, W1, W2, W30);
+	fpr.Unlock(Q0, Q1);
+}
+
+void JitArm64::psq_st(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+	FALLBACK_IF(jo.memcheck || !jo.fastmem);
+
+	// X30 is LR
+	// X0 contains the scale
+	// X1 is the address
+	// Q0 is the store register
+
+	bool update = inst.OPCD == 61;
+	s32 offset = inst.SIMM_12;
+
+	gpr.Lock(W0, W1, W2, W30);
+	fpr.Lock(Q0, Q1);
+
+	ARM64Reg arm_addr = gpr.R(inst.RA);
+	ARM64Reg VS = fpr.R(inst.RS);
+
+	ARM64Reg scale_reg = W0;
+	ARM64Reg addr_reg = W1;
+	ARM64Reg type_reg = W2;
+
+	BitSet32 gprs_in_use = gpr.GetCallerSavedUsed();
+	BitSet32 fprs_in_use = fpr.GetCallerSavedUsed();
+
+	// Wipe the registers we are using as temporaries
+	gprs_in_use &= BitSet32(~0x40000007);
+	fprs_in_use &= BitSet32(~3);
+
+	LDR(INDEX_UNSIGNED, scale_reg, X29, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
+
+	if (inst.RA || update) // Always uses the register on update
+	{
+		if (offset >= 0)
+			ADD(addr_reg, gpr.R(inst.RA), offset);
+		else
+			SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
+	}
+	else
+	{
+		MOVI2R(addr_reg, (u32)offset);
+	}
+
+	UBFM(type_reg, scale_reg, 0, 2); // Type
+	UBFM(scale_reg, scale_reg, 8, 13); // Scale
+
+	if (update)
+	{
+		gpr.BindToRegister(inst.RA, false);
+		MOV(arm_addr, addr_reg);
+	}
+
+	m_float_emit.FCVTN(32, D0, VS);
+
+	// Inline address check
+	{
+		TST(addr_reg, 6, 1);
+		FixupBranch argh = B(CC_NEQ);
+
+		// Fast
+		MOVI2R(X30, (u64)&asm_routines.pairedStoreQuantized[inst.W * 8]);
+		LDR(EncodeRegTo64(type_reg), X30, ArithOption(EncodeRegTo64(type_reg), true));
+		BLR(EncodeRegTo64(type_reg));
+
+		FixupBranch continue1 = B();
+		SetJumpTarget(argh);
+
+		// Slow
+		MOVI2R(X30, (u64)&asm_routines.pairedStoreQuantized[16 + inst.W * 8]);
+		LDR(EncodeRegTo64(type_reg), X30, ArithOption(EncodeRegTo64(type_reg), true));
+
+		ABI_PushRegisters(gprs_in_use);
+		m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
+		BLR(EncodeRegTo64(type_reg));
+		m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
+		ABI_PushRegisters(gprs_in_use);
+
+		SetJumpTarget(continue1);
+	}
+
+	gpr.Unlock(W0, W1, W2, W30);
+	fpr.Unlock(Q0, Q1);
+}
+
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
new file mode 100644
index 0000000000..664e29764e
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
@@ -0,0 +1,495 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+using namespace Arm64Gen;
+
+void JitArm64::ps_abs(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == b);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FABS(64, VD, VB);
+}
+
+void JitArm64::ps_add(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FADD(64, VD, VA, VB);
+}
+
+void JitArm64::ps_div(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FDIV(64, VD, VA, VB);
+}
+
+void JitArm64::ps_madd(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(64, V0, VA, VC);
+	m_float_emit.FADD(64, VD, V0, VB);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_madds0(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VC, 0);
+	m_float_emit.FMUL(64, V0, V0, VA);
+	m_float_emit.FADD(64, VD, V0, VB);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_madds1(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VC, 1);
+	m_float_emit.FMUL(64, V0, V0, VA);
+	m_float_emit.FADD(64, VD, V0, VB);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_merge00(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.TRN1(64, VD, VA, VB);
+}
+
+void JitArm64::ps_merge01(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.INS(64, VD, 0, VA, 0);
+	m_float_emit.INS(64, VD, 1, VB, 1);
+}
+
+void JitArm64::ps_merge10(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	if (d != a && d != b)
+	{
+		m_float_emit.INS(64, VD, 0, VA, 1);
+		m_float_emit.INS(64, VD, 1, VB, 0);
+	}
+	else
+	{
+		ARM64Reg V0 = fpr.GetReg();
+		m_float_emit.INS(64, V0, 0, VA, 1);
+		m_float_emit.INS(64, V0, 1, VB, 0);
+		m_float_emit.ORR(VD, V0, V0);
+		fpr.Unlock(V0);
+	}
+}
+
+void JitArm64::ps_merge11(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.TRN2(64, VD, VA, VB);
+}
+
+void JitArm64::ps_mr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+
+	if (d == b)
+		return;
+
+	fpr.BindToRegister(d, false);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.ORR(VD, VB, VB);
+}
+
+void JitArm64::ps_mul(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FMUL(64, VD, VA, VC);
+}
+
+void JitArm64::ps_muls0(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VC, 0);
+	m_float_emit.FMUL(64, VD, VA, V0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_muls1(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VC, 1);
+	m_float_emit.FMUL(64, VD, VA, V0);
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_msub(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(64, V0, VA, VC);
+	m_float_emit.FSUB(64, VD, V0, VB);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_nabs(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == b);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FABS(64, VD, VB);
+	m_float_emit.FNEG(64, VD, VD);
+}
+
+void JitArm64::ps_neg(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == b);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FNEG(64, VD, VB);
+}
+
+void JitArm64::ps_nmadd(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(64, V0, VA, VC);
+	m_float_emit.FADD(64, VD, V0, VB);
+	m_float_emit.FNEG(64, VD, VD);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_nmsub(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.FMUL(64, V0, VA, VC);
+	m_float_emit.FSUB(64, VD, V0, VB);
+	m_float_emit.FNEG(64, VD, VD);
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_res(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == b);
+
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FRSQRTE(64, VD, VB);
+}
+
+void JitArm64::ps_sel(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+
+	if (d != a && d != b && d != c)
+	{
+		m_float_emit.FCMGE(64, VD, VA);
+		m_float_emit.BSL(VD, VC, VB);
+	}
+	else
+	{
+		ARM64Reg V0 = fpr.GetReg();
+		m_float_emit.FCMGE(64, V0, VA);
+		m_float_emit.BSL(V0, VC, VB);
+		m_float_emit.ORR(VD, V0, V0);
+		fpr.Unlock(V0);
+	}
+}
+
+void JitArm64::ps_sub(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VD = fpr.R(d);
+
+	m_float_emit.FSUB(64, VD, VA, VB);
+}
+
+void JitArm64::ps_sum0(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VB, 1);
+	if (d != c)
+	{
+		m_float_emit.FADD(64, VD, V0, VA);
+		m_float_emit.INS(64, VD, 1, VC, 1);
+	}
+	else
+	{
+		m_float_emit.FADD(64, V0, V0, VA);
+		m_float_emit.INS(64, VD, 0, V0, 0);
+	}
+
+	fpr.Unlock(V0);
+}
+
+void JitArm64::ps_sum1(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
+	fpr.BindToRegister(d, d == a || d == b || d == c);
+
+	ARM64Reg VA = fpr.R(a);
+	ARM64Reg VB = fpr.R(b);
+	ARM64Reg VC = fpr.R(c);
+	ARM64Reg VD = fpr.R(d);
+	ARM64Reg V0 = fpr.GetReg();
+
+	m_float_emit.DUP(64, V0, VA, 0);
+	if (d != c)
+	{
+		m_float_emit.FADD(64, VD, V0, VB);
+		m_float_emit.INS(64, VD, 0, VC, 0);
+	}
+	else
+	{
+		m_float_emit.FADD(64, V0, V0, VB);
+		m_float_emit.INS(64, VD, 1, V0, 1);
+	}
+
+	fpr.Unlock(V0);
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
new file mode 100644
index 0000000000..cac9ce4481
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
@@ -0,0 +1,382 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
+
+using namespace Arm64Gen;
+
+void Arm64RegCache::Init(ARM64XEmitter *emitter)
+{
+	m_emit = emitter;
+	m_float_emit.reset(new ARM64FloatEmitter(m_emit));
+	GetAllocationOrder();
+}
+
+ARM64Reg Arm64RegCache::GetReg()
+{
+	// If we have no registers left, dump the most stale register first
+	if (!GetUnlockedRegisterCount())
+		FlushMostStaleRegister();
+
+	for (auto& it : m_host_registers)
+	{
+		if (!it.IsLocked())
+		{
+			it.Lock();
+			return it.GetReg();
+		}
+	}
+	// Holy cow, how did you run out of registers?
+	// We can't return anything reasonable in this case. Return INVALID_REG and watch the failure happen
+	WARN_LOG(DYNA_REC, "All available registers are locked dumb dumb");
+	return INVALID_REG;
+}
+
+u32 Arm64RegCache::GetUnlockedRegisterCount()
+{
+	u32 unlocked_registers = 0;
+	for (auto& it : m_host_registers)
+		if (!it.IsLocked())
+			++unlocked_registers;
+	return unlocked_registers;
+}
+
+void Arm64RegCache::LockRegister(ARM64Reg host_reg)
+{
+	auto reg = std::find(m_host_registers.begin(), m_host_registers.end(), host_reg);
+	_assert_msg_(DYNA_REC, reg != m_host_registers.end(), "Don't try locking a register that isn't in the cache. Reg %d", host_reg);
+	reg->Lock();
+}
+
+void Arm64RegCache::UnlockRegister(ARM64Reg host_reg)
+{
+	auto reg = std::find(m_host_registers.begin(), m_host_registers.end(), host_reg);
+	_assert_msg_(DYNA_REC, reg != m_host_registers.end(), "Don't try unlocking a register that isn't in the cache. Reg %d", host_reg);
+	reg->Unlock();
+}
+
+void Arm64RegCache::FlushMostStaleRegister()
+{
+	u32 most_stale_preg = 0;
+	u32 most_stale_amount = 0;
+	for (u32 i = 0; i < 32; ++i)
+	{
+		u32 last_used = m_guest_registers[i].GetLastUsed();
+		if (last_used > most_stale_amount &&
+		    m_guest_registers[i].GetType() == REG_REG)
+		{
+			most_stale_preg = i;
+			most_stale_amount = last_used;
+		}
+	}
+	FlushRegister(most_stale_preg, false);
+}
+
+// GPR Cache
+void Arm64GPRCache::Start(PPCAnalyst::BlockRegStats &stats)
+{
+}
+
+bool Arm64GPRCache::IsCalleeSaved(ARM64Reg reg)
+{
+	static std::vector<ARM64Reg> callee_regs =
+	{
+		X28, X27, X26, X25, X24, X23, X22, X21, X20,
+		X19, INVALID_REG,
+	};
+	return std::find(callee_regs.begin(), callee_regs.end(), EncodeRegTo64(reg)) != callee_regs.end();
+}
+
+void Arm64GPRCache::FlushRegister(u32 preg, bool maintain_state)
+{
+	OpArg& reg = m_guest_registers[preg];
+	if (reg.GetType() == REG_REG)
+	{
+		ARM64Reg host_reg = reg.GetReg();
+		if (reg.IsDirty())
+			m_emit->STR(INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(gpr[preg]));
+
+		if (!maintain_state)
+		{
+			UnlockRegister(host_reg);
+			reg.Flush();
+		}
+	}
+	else if (reg.GetType() == REG_IMM)
+	{
+		if (!reg.GetImm())
+		{
+			m_emit->STR(INDEX_UNSIGNED, WSP, X29, PPCSTATE_OFF(gpr[preg]));
+		}
+		else
+		{
+			ARM64Reg host_reg = GetReg();
+
+			m_emit->MOVI2R(host_reg, reg.GetImm());
+			m_emit->STR(INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(gpr[preg]));
+
+			UnlockRegister(host_reg);
+		}
+
+		if (!maintain_state)
+			reg.Flush();
+	}
+}
+
+void Arm64GPRCache::Flush(FlushMode mode, PPCAnalyst::CodeOp* op)
+{
+	for (int i = 0; i < 32; ++i)
+	{
+		bool flush = true;
+		if (mode == FLUSH_INTERPRETER)
+		{
+			if (!(op->regsOut[i] || op->regsIn[i]))
+			{
+				// This interpreted instruction doesn't use this register
+				flush = false;
+			}
+		}
+
+		if (m_guest_registers[i].GetType() == REG_REG)
+		{
+			// Has to be flushed if it isn't in a callee saved register
+			ARM64Reg host_reg = m_guest_registers[i].GetReg();
+			if (flush || !IsCalleeSaved(host_reg))
+				FlushRegister(i, mode == FLUSH_MAINTAIN_STATE);
+		}
+		else if (m_guest_registers[i].GetType() == REG_IMM)
+		{
+			if (flush)
+				FlushRegister(i, mode == FLUSH_MAINTAIN_STATE);
+		}
+	}
+}
+
+ARM64Reg Arm64GPRCache::R(u32 preg)
+{
+	OpArg& reg = m_guest_registers[preg];
+	IncrementAllUsed();
+	reg.ResetLastUsed();
+
+	switch (reg.GetType())
+	{
+	case REG_REG: // already in a reg
+		return reg.GetReg();
+	break;
+	case REG_IMM: // Is an immediate
+	{
+		ARM64Reg host_reg = GetReg();
+		m_emit->MOVI2R(host_reg, reg.GetImm());
+		reg.LoadToReg(host_reg);
+		reg.SetDirty(true);
+		return host_reg;
+	}
+	break;
+	case REG_NOTLOADED: // Register isn't loaded at /all/
+	{
+		// This is a bit annoying. We try to keep these preloaded as much as possible
+		// This can also happen on cases where PPCAnalyst isn't feeing us proper register usage statistics
+		ARM64Reg host_reg = GetReg();
+		reg.LoadToReg(host_reg);
+		reg.SetDirty(false);
+		m_emit->LDR(INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(gpr[preg]));
+		return host_reg;
+	}
+	break;
+	default:
+		ERROR_LOG(DYNA_REC, "Invalid OpArg Type!");
+	break;
+	}
+	// We've got an issue if we end up here
+	return INVALID_REG;
+}
+
+void Arm64GPRCache::SetImmediate(u32 preg, u32 imm)
+{
+	OpArg& reg = m_guest_registers[preg];
+	if (reg.GetType() == REG_REG)
+		UnlockRegister(reg.GetReg());
+	reg.LoadToImm(imm);
+}
+
+void Arm64GPRCache::BindToRegister(u32 preg, bool do_load)
+{
+	OpArg& reg = m_guest_registers[preg];
+
+	reg.SetDirty(true);
+	if (reg.GetType() == REG_NOTLOADED)
+	{
+		ARM64Reg host_reg = GetReg();
+		reg.LoadToReg(host_reg);
+		if (do_load)
+			m_emit->LDR(INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(gpr[preg]));
+	}
+}
+
+void Arm64GPRCache::GetAllocationOrder()
+{
+	// Callee saved registers first in hopes that we will keep everything stored there first
+	const std::vector<ARM64Reg> allocation_order =
+	{
+		// Callee saved
+		W28, W27, W26, W25, W24, W23, W22, W21, W20,
+		W19,
+
+		// Caller saved
+		W18, W17, W16, W15, W14, W13, W12, W11, W10,
+		W9, W8, W7, W6, W5, W4, W3, W2, W1, W0,
+		W30,
+	};
+
+	for (ARM64Reg reg : allocation_order)
+		m_host_registers.push_back(HostReg(reg));
+}
+
+BitSet32 Arm64GPRCache::GetCallerSavedUsed()
+{
+	BitSet32 registers(0);
+	for (auto& it : m_host_registers)
+		if (it.IsLocked() && !IsCalleeSaved(it.GetReg()))
+				registers[it.GetReg()] = 1;
+	return registers;
+}
+
+void Arm64GPRCache::FlushByHost(ARM64Reg host_reg)
+{
+	for (int i = 0; i < 32; ++i)
+	{
+		OpArg& reg = m_guest_registers[i];
+		if (reg.GetType() == REG_REG && reg.GetReg() == host_reg)
+		{
+			FlushRegister(i, false);
+			return;
+		}
+	}
+}
+
+// FPR Cache
+void Arm64FPRCache::Flush(FlushMode mode, PPCAnalyst::CodeOp* op)
+{
+	for (int i = 0; i < 32; ++i)
+	{
+		bool flush = true;
+		if (mode == FLUSH_INTERPRETER)
+		{
+			if (!(op->regsOut[i] || op->regsIn[i]))
+			{
+				// This interpreted instruction doesn't use this register
+				flush = false;
+			}
+		}
+
+		if (m_guest_registers[i].GetType() == REG_REG)
+		{
+			// Has to be flushed if it isn't in a callee saved register
+			ARM64Reg host_reg = m_guest_registers[i].GetReg();
+			if (flush || !IsCalleeSaved(host_reg))
+				FlushRegister(i, mode == FLUSH_MAINTAIN_STATE);
+		}
+	}
+}
+
+ARM64Reg Arm64FPRCache::R(u32 preg)
+{
+	OpArg& reg = m_guest_registers[preg];
+	IncrementAllUsed();
+	reg.ResetLastUsed();
+
+	switch (reg.GetType())
+	{
+	case REG_REG: // already in a reg
+		return reg.GetReg();
+	break;
+	case REG_NOTLOADED: // Register isn't loaded at /all/
+	{
+		ARM64Reg host_reg = GetReg();
+		reg.LoadToReg(host_reg);
+		reg.SetDirty(false);
+		m_float_emit->LDR(128, INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(ps[preg][0]));
+		return host_reg;
+	}
+	break;
+	default:
+		_dbg_assert_msg_(DYNA_REC, false, "Invalid OpArg Type!");
+	break;
+	}
+	// We've got an issue if we end up here
+	return INVALID_REG;
+}
+
+void Arm64FPRCache::BindToRegister(u32 preg, bool do_load)
+{
+	OpArg& reg = m_guest_registers[preg];
+
+	reg.SetDirty(true);
+	if (reg.GetType() == REG_NOTLOADED)
+	{
+		ARM64Reg host_reg = GetReg();
+		reg.LoadToReg(host_reg);
+		if (do_load)
+			m_float_emit->LDR(128, INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(ps[preg][0]));
+	}
+}
+
+void Arm64FPRCache::GetAllocationOrder()
+{
+	const std::vector<ARM64Reg> allocation_order =
+	{
+		// Callee saved
+		Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15,
+
+		// Caller saved
+		Q16, Q17, Q18, Q19, Q20, Q21, Q22, Q23,
+		Q24, Q25, Q26, Q27, Q28, Q29, Q30, Q31,
+		Q7, Q6, Q5, Q4, Q3, Q2, Q1, Q0
+	};
+
+	for (ARM64Reg reg : allocation_order)
+		m_host_registers.push_back(HostReg(reg));
+}
+
+void Arm64FPRCache::FlushByHost(ARM64Reg host_reg)
+{
+	// XXX: Scan guest registers and flush if found
+}
+
+bool Arm64FPRCache::IsCalleeSaved(ARM64Reg reg)
+{
+	static std::vector<ARM64Reg> callee_regs =
+	{
+		Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15, INVALID_REG,
+	};
+	return std::find(callee_regs.begin(), callee_regs.end(), EncodeRegTo64(reg)) != callee_regs.end();
+}
+
+void Arm64FPRCache::FlushRegister(u32 preg, bool maintain_state)
+{
+	OpArg& reg = m_guest_registers[preg];
+	if (reg.GetType() == REG_REG)
+	{
+		ARM64Reg host_reg = reg.GetReg();
+
+		if (reg.IsDirty())
+			m_float_emit->STR(128, INDEX_UNSIGNED, host_reg, X29, PPCSTATE_OFF(ps[preg][0]));
+
+		if (!maintain_state)
+		{
+			UnlockRegister(host_reg);
+			reg.Flush();
+		}
+	}
+}
+
+BitSet32 Arm64FPRCache::GetCallerSavedUsed()
+{
+	BitSet32 registers(0);
+	for (auto& it : m_host_registers)
+		if (it.IsLocked())
+			registers[Q0 - it.GetReg()] = 1;
+	return registers;
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
new file mode 100644
index 0000000000..d4abffb523
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
@@ -0,0 +1,285 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+
+#include "Common/Arm64Emitter.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+
+// Dedicated host registers
+// X29 = ppcState pointer
+using namespace Arm64Gen;
+
+enum RegType
+{
+	REG_NOTLOADED = 0,
+	REG_REG, // Reg type is register
+	REG_IMM, // Reg is really a IMM
+};
+enum RegLocation
+{
+	REG_LOW = 0,
+	REG_HIGH,
+};
+
+enum FlushMode
+{
+	// Flushes all registers, no exceptions
+	FLUSH_ALL = 0,
+	// Flushes registers in a conditional branch
+	// Doesn't wipe the state of the registers from the cache
+	FLUSH_MAINTAIN_STATE,
+	// Flushes only the required registers for an interpreter call
+	FLUSH_INTERPRETER,
+};
+
+class OpArg
+{
+public:
+	OpArg()
+		: m_type(REG_NOTLOADED), m_reg(INVALID_REG),
+		  m_value(0), m_last_used(0)
+	{
+	}
+
+	RegType GetType() const
+	{
+		return m_type;
+	}
+
+	ARM64Reg GetReg() const
+	{
+		return m_reg;
+	}
+	u32 GetImm() const
+	{
+		return m_value;
+	}
+	void LoadToReg(ARM64Reg reg)
+	{
+		m_type = REG_REG;
+		m_reg = reg;
+	}
+	void LoadToImm(u32 imm)
+	{
+		m_type = REG_IMM;
+		m_value = imm;
+
+		m_reg = INVALID_REG;
+	}
+	void Flush()
+	{
+		// Invalidate any previous information
+		m_type = REG_NOTLOADED;
+		m_reg = INVALID_REG;
+
+		// Arbitrarily large value that won't roll over on a lot of increments
+		m_last_used = 0xFFFF;
+	}
+
+	u32 GetLastUsed() const { return m_last_used; }
+	void ResetLastUsed() { m_last_used = 0; }
+	void IncrementLastUsed() { ++m_last_used; }
+
+	void SetDirty(bool dirty) { m_dirty = dirty; }
+	bool IsDirty() const { return m_dirty; }
+
+private:
+	// For REG_REG
+	RegType m_type; // store type
+	ARM64Reg m_reg; // host register we are in
+
+	// For REG_IMM
+	u32 m_value; // IMM value
+
+	u32 m_last_used;
+
+	bool m_dirty;
+};
+
+class HostReg
+{
+public:
+	HostReg() : m_reg(INVALID_REG), m_locked(false) {}
+	HostReg(ARM64Reg reg) : m_reg(reg), m_locked(false) {}
+	bool IsLocked() const { return m_locked; }
+	void Lock() { m_locked = true; }
+	void Unlock() { m_locked = false; }
+	ARM64Reg GetReg() const { return m_reg; }
+
+	bool operator==(const ARM64Reg& reg)
+	{
+		return reg == m_reg;
+	}
+
+private:
+	ARM64Reg m_reg;
+	bool m_locked;
+};
+
+class Arm64RegCache
+{
+public:
+	Arm64RegCache() : m_emit(nullptr), m_float_emit(nullptr), m_reg_stats(nullptr) {};
+	virtual ~Arm64RegCache() {};
+
+	void Init(ARM64XEmitter *emitter);
+
+	virtual void Start(PPCAnalyst::BlockRegStats &stats) {}
+
+	// Flushes the register cache in different ways depending on the mode
+	virtual void Flush(FlushMode mode, PPCAnalyst::CodeOp* op) = 0;
+
+	// Returns a guest register inside of a host register
+	// Will dump an immediate to the host register as well
+	virtual ARM64Reg R(u32 reg) = 0;
+
+	virtual BitSet32 GetCallerSavedUsed() = 0;
+
+	// Returns a temporary register for use
+	// Requires unlocking after done
+	ARM64Reg GetReg();
+
+	void StoreRegister(u32 preg) { FlushRegister(preg, false); }
+
+	// Locks a register so a cache cannot use it
+	// Useful for function calls
+	template<typename T = ARM64Reg, typename... Args>
+	void Lock(Args... args)
+	{
+		for (T reg : {args...})
+		{
+			FlushByHost(reg);
+			LockRegister(reg);
+		}
+	}
+
+	// Unlocks a locked register
+	// Unlocks registers locked with both GetReg and LockRegister
+	template<typename T = ARM64Reg, typename... Args>
+	void Unlock(Args... args)
+	{
+		for (T reg : {args...})
+		{
+			FlushByHost(reg);
+			UnlockRegister(reg);
+		}
+	}
+
+protected:
+	// Get the order of the host registers
+	virtual void GetAllocationOrder() = 0;
+
+	// Flushes the most stale register
+	void FlushMostStaleRegister();
+
+	// Lock a register
+	void LockRegister(ARM64Reg host_reg);
+
+	// Unlock a register
+	void UnlockRegister(ARM64Reg host_reg);
+
+	// Flushes a guest register by host provided
+	virtual void FlushByHost(ARM64Reg host_reg) = 0;
+
+	virtual void FlushRegister(u32 preg, bool maintain_state) = 0;
+
+	// Get available host registers
+	u32 GetUnlockedRegisterCount();
+
+	void IncrementAllUsed()
+	{
+		for (auto& reg : m_guest_registers)
+			reg.IncrementLastUsed();
+	}
+
+	// Code emitter
+	ARM64XEmitter *m_emit;
+
+	// Float emitter
+	std::unique_ptr<ARM64FloatEmitter> m_float_emit;
+
+	// Host side registers that hold the host registers in order of use
+	std::vector<HostReg> m_host_registers;
+
+	// Our guest GPRs
+	// PowerPC has 32 GPRs
+	// PowerPC also has 32 paired FPRs
+	OpArg m_guest_registers[32];
+
+	// Register stats for the current block
+	PPCAnalyst::BlockRegStats *m_reg_stats;
+};
+
+class Arm64GPRCache : public Arm64RegCache
+{
+public:
+	~Arm64GPRCache() {}
+
+	void Start(PPCAnalyst::BlockRegStats &stats);
+
+	// Flushes the register cache in different ways depending on the mode
+	void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr);
+
+	// Returns a guest register inside of a host register
+	// Will dump an immediate to the host register as well
+	ARM64Reg R(u32 preg);
+
+	// Set a register to an immediate
+	void SetImmediate(u32 preg, u32 imm);
+
+	// Returns if a register is set as an immediate
+	bool IsImm(u32 reg) const { return m_guest_registers[reg].GetType() == REG_IMM; }
+
+	// Gets the immediate that a register is set to
+	u32 GetImm(u32 reg) const { return m_guest_registers[reg].GetImm(); }
+
+	void BindToRegister(u32 preg, bool do_load);
+
+	BitSet32 GetCallerSavedUsed() override;
+
+protected:
+	// Get the order of the host registers
+	void GetAllocationOrder();
+
+	// Flushes a guest register by host provided
+	void FlushByHost(ARM64Reg host_reg) override;
+
+	void FlushRegister(u32 preg, bool maintain_state) override;
+
+private:
+	bool IsCalleeSaved(ARM64Reg reg);
+
+};
+
+class Arm64FPRCache : public Arm64RegCache
+{
+public:
+	~Arm64FPRCache() {}
+	// Flushes the register cache in different ways depending on the mode
+	void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr);
+
+	// Returns a guest register inside of a host register
+	// Will dump an immediate to the host register as well
+	ARM64Reg R(u32 preg);
+
+	void BindToRegister(u32 preg, bool do_load);
+
+	BitSet32 GetCallerSavedUsed() override;
+
+protected:
+	// Get the order of the host registers
+	void GetAllocationOrder();
+
+	// Flushes a guest register by host provided
+	void FlushByHost(ARM64Reg host_reg) override;
+
+	void FlushRegister(u32 preg, bool maintain_state) override;
+
+private:
+	bool IsCalleeSaved(ARM64Reg reg);
+};
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
new file mode 100644
index 0000000000..72e42c1769
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
@@ -0,0 +1,369 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+
+FixupBranch JitArm64::JumpIfCRFieldBit(int field, int bit, bool jump_if_set)
+{
+	ARM64Reg WA = gpr.GetReg();
+	ARM64Reg XA = EncodeRegTo64(WA);
+
+	FixupBranch branch;
+	switch (bit)
+	{
+	case CR_SO_BIT:  // check bit 61 set
+		LDR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[field]));
+		branch = jump_if_set ? TBNZ(XA, 61) : TBZ(XA, 61);
+	break;
+	case CR_EQ_BIT:  // check bits 31-0 == 0
+		LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(cr_val[field]));
+		branch = jump_if_set ? CBZ(WA) : CBNZ(WA);
+	break;
+	case CR_GT_BIT:  // check val > 0
+		LDR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[field]));
+		CMP(XA, SP);
+		branch = B(jump_if_set ? CC_GT : CC_LE);
+	break;
+	case CR_LT_BIT:  // check bit 62 set
+		LDR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[field]));
+		branch = jump_if_set ? TBNZ(XA, 62) : TBZ(XA, 62);
+	break;
+	default:
+		_assert_msg_(DYNA_REC, false, "Invalid CR bit");
+	}
+
+	gpr.Unlock(WA);
+	return branch;
+}
+
+void JitArm64::mtmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	// Don't interpret this, if we do we get thrown out
+	//JITDISABLE(bJITSystemRegistersOff)
+
+	gpr.BindToRegister(inst.RS, true);
+	STR(INDEX_UNSIGNED, gpr.R(inst.RS), X29, PPCSTATE_OFF(msr));
+
+	gpr.Flush(FlushMode::FLUSH_ALL);
+	fpr.Flush(FlushMode::FLUSH_ALL);
+
+	WriteExit(js.compilerPC + 4);
+}
+
+void JitArm64::mfmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	gpr.BindToRegister(inst.RD, false);
+	LDR(INDEX_UNSIGNED, gpr.R(inst.RD), X29, PPCSTATE_OFF(msr));
+}
+
+void JitArm64::mcrf(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	if (inst.CRFS != inst.CRFD)
+	{
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+		LDR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[inst.CRFS]));
+		STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(cr_val[inst.CRFD]));
+		gpr.Unlock(WA);
+	}
+}
+
+void JitArm64::mfsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	gpr.BindToRegister(inst.RD, false);
+	LDR(INDEX_UNSIGNED, gpr.R(inst.RD), X29, PPCSTATE_OFF(sr[inst.SR]));
+}
+
+void JitArm64::mtsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	gpr.BindToRegister(inst.RS, true);
+	STR(INDEX_UNSIGNED, gpr.R(inst.RS), X29, PPCSTATE_OFF(sr[inst.SR]));
+}
+
+void JitArm64::mfsrin(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	u32 b = inst.RB, d = inst.RD;
+	gpr.BindToRegister(d, d == b);
+
+	ARM64Reg index = gpr.GetReg();
+	ARM64Reg index64 = EncodeRegTo64(index);
+	ARM64Reg RB = gpr.R(b);
+
+	UBFM(index, RB, 28, 31);
+	ADD(index64, X29, index64, ArithOption(index64, ST_LSL, 2));
+	LDR(INDEX_UNSIGNED, gpr.R(d), index64, PPCSTATE_OFF(sr[0]));
+
+	gpr.Unlock(index);
+}
+
+void JitArm64::mtsrin(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	u32 b = inst.RB, d = inst.RD;
+	gpr.BindToRegister(d, d == b);
+
+	ARM64Reg index = gpr.GetReg();
+	ARM64Reg index64 = EncodeRegTo64(index);
+	ARM64Reg RB = gpr.R(b);
+
+	UBFM(index, RB, 28, 31);
+	ADD(index64, X29, index64, ArithOption(index64, ST_LSL, 2));
+	STR(INDEX_UNSIGNED, gpr.R(d), index64, PPCSTATE_OFF(sr[0]));
+
+	gpr.Unlock(index);
+}
+
+void JitArm64::twx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+
+	s32 a = inst.RA;
+
+	ARM64Reg WA = gpr.GetReg();
+
+	if (inst.OPCD == 3) // twi
+	{
+		if (inst.SIMM_16 >= 0 && inst.SIMM_16 < 4096)
+		{
+			// Can fit in immediate in to the instruction encoding
+			CMP(gpr.R(a), inst.SIMM_16);
+		}
+		else
+		{
+			MOVI2R(WA, (s32)(s16)inst.SIMM_16);
+			CMP(gpr.R(a), WA);
+		}
+	}
+	else // tw
+	{
+		CMP(gpr.R(a), gpr.R(inst.RB));
+	}
+
+	std::vector<FixupBranch> fixups;
+	CCFlags conditions[] = { CC_LT, CC_GT, CC_EQ, CC_VC, CC_VS };
+
+	for (int i = 0; i < 5; i++)
+	{
+		if (inst.TO & (1 << i))
+		{
+			FixupBranch f = B(conditions[i]);
+			fixups.push_back(f);
+		}
+	}
+	FixupBranch dont_trap = B();
+
+	for (const FixupBranch& fixup : fixups)
+	{
+		SetJumpTarget(fixup);
+	}
+
+	gpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+	fpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
+
+	LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(Exceptions));
+	ORR(WA, WA, 24, 0); // Same as WA | EXCEPTION_PROGRAM
+	STR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(Exceptions));
+
+	MOVI2R(WA, js.compilerPC);
+
+	// WA is unlocked in this function
+	WriteExceptionExit(WA);
+
+	SetJumpTarget(dont_trap);
+
+	if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
+	{
+		gpr.Flush(FlushMode::FLUSH_ALL);
+		fpr.Flush(FlushMode::FLUSH_ALL);
+		WriteExit(js.compilerPC + 4);
+	}
+}
+
+void JitArm64::mfspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+	int d = inst.RD;
+	switch (iIndex)
+	{
+	case SPR_TL:
+	case SPR_TU:
+	{
+		ARM64Reg WA = gpr.GetReg();
+		ARM64Reg WB = gpr.GetReg();
+		ARM64Reg XA = EncodeRegTo64(WA);
+		ARM64Reg XB = EncodeRegTo64(WB);
+
+		// An inline implementation of CoreTiming::GetFakeTimeBase, since in timer-heavy games the
+		// cost of calling out to C for this is actually significant.
+		MOVI2R(XA, (u64)&CoreTiming::globalTimer);
+		LDR(INDEX_UNSIGNED, XA, XA, 0);
+		MOVI2R(XB, (u64)&CoreTiming::fakeTBStartTicks);
+		LDR(INDEX_UNSIGNED, XB, XB, 0);
+		SUB(XA, XA, XB);
+
+		// It might seem convenient to correct the timer for the block position here for even more accurate
+		// timing, but as of currently, this can break games. If we end up reading a time *after* the time
+		// at which an interrupt was supposed to occur, e.g. because we're 100 cycles into a block with only
+		// 50 downcount remaining, some games don't function correctly, such as Karaoke Party Revolution,
+		// which won't get past the loading screen.
+		// a / 12 = (a * 0xAAAAAAAAAAAAAAAB) >> 67
+		ORR(XB, SP, 1, 60);
+		ADD(XB, XB, 1);
+		UMULH(XA, XA, XB);
+
+		MOVI2R(XB, (u64)&CoreTiming::fakeTBStartValue);
+		LDR(INDEX_UNSIGNED, XB, XB, 0);
+		ADD(XA, XB, XA, ArithOption(XA, ST_LSR, 3));
+		STR(INDEX_UNSIGNED, XA, X29, PPCSTATE_OFF(spr[SPR_TL]));
+
+		if (MergeAllowedNextInstructions(1))
+		{
+			const UGeckoInstruction& next = js.op[1].inst;
+			// Two calls of TU/TL next to each other are extremely common in typical usage, so merge them
+			// if we can.
+			u32 nextIndex = (next.SPRU << 5) | (next.SPRL & 0x1F);
+			// Be careful; the actual opcode is for mftb (371), not mfspr (339)
+			int n = next.RD;
+			if (next.OPCD == 31 && next.SUBOP10 == 371 && (nextIndex == SPR_TU || nextIndex == SPR_TL) && n != d)
+			{
+				js.downcountAmount++;
+				js.skipInstructions = 1;
+				gpr.BindToRegister(d, false);
+				gpr.BindToRegister(n, false);
+				if (iIndex == SPR_TL)
+					MOV(gpr.R(d), WA);
+				else
+					ORR(EncodeRegTo64(gpr.R(d)), SP, XA, ArithOption(XA, ST_LSR, 32));
+
+				if (nextIndex == SPR_TL)
+					MOV(gpr.R(n), WA);
+				else
+					ORR(EncodeRegTo64(gpr.R(n)), SP, XA, ArithOption(XA, ST_LSR, 32));
+
+				gpr.Unlock(WA, WB);
+				break;
+			}
+		}
+		gpr.BindToRegister(d, false);
+		if (iIndex == SPR_TU)
+			ORR(EncodeRegTo64(gpr.R(d)), SP, XA, ArithOption(XA, ST_LSR, 32));
+		else
+			MOV(gpr.R(d), WA);
+		gpr.Unlock(WA, WB);
+	}
+	break;
+	case SPR_XER:
+	{
+		gpr.BindToRegister(d, false);
+		ARM64Reg RD = gpr.R(d);
+		ARM64Reg WA = gpr.GetReg();
+		LDRH(INDEX_UNSIGNED, RD, X29, PPCSTATE_OFF(xer_stringctrl));
+		LDRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+		ORR(RD, RD, WA, ArithOption(WA, ST_LSL, XER_CA_SHIFT));
+		LDRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_so_ov));
+		ORR(RD, RD, WA, ArithOption(WA, ST_LSL, XER_OV_SHIFT));
+		gpr.Unlock(WA);
+	}
+	break;
+	case SPR_WPAR:
+	case SPR_DEC:
+		FALLBACK_IF(true);
+	default:
+		gpr.BindToRegister(d, false);
+		ARM64Reg RD = gpr.R(d);
+		LDR(INDEX_UNSIGNED, RD, X29, PPCSTATE_OFF(spr) + iIndex * 4);
+		break;
+	}
+}
+
+void JitArm64::mftb(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	mfspr(inst);
+}
+
+void JitArm64::mtspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+
+	switch (iIndex)
+	{
+	case SPR_DMAU:
+
+	case SPR_SPRG0:
+	case SPR_SPRG1:
+	case SPR_SPRG2:
+	case SPR_SPRG3:
+
+	case SPR_SRR0:
+	case SPR_SRR1:
+		// These are safe to do the easy way, see the bottom of this function.
+	break;
+
+	case SPR_LR:
+	case SPR_CTR:
+	case SPR_GQR0:
+	case SPR_GQR0 + 1:
+	case SPR_GQR0 + 2:
+	case SPR_GQR0 + 3:
+	case SPR_GQR0 + 4:
+	case SPR_GQR0 + 5:
+	case SPR_GQR0 + 6:
+	case SPR_GQR0 + 7:
+		// These are safe to do the easy way, see the bottom of this function.
+	break;
+	case SPR_XER:
+	{
+		ARM64Reg RD = gpr.R(inst.RD);
+		ARM64Reg WA = gpr.GetReg();
+		AND(WA, RD, 24, 30);
+		STRH(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_stringctrl));
+		UBFM(WA, RD, XER_CA_SHIFT, XER_CA_SHIFT + 1);
+		STRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_ca));
+		UBFM(WA, RD, XER_OV_SHIFT, 31); // Same as WA = RD >> XER_OV_SHIFT
+		STRB(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(xer_so_ov));
+		gpr.Unlock(WA);
+	}
+	break;
+	default:
+		FALLBACK_IF(true);
+	}
+
+	// OK, this is easy.
+	ARM64Reg RD = gpr.R(inst.RD);
+	STR(INDEX_UNSIGNED, RD, X29,  PPCSTATE_OFF(spr) + iIndex * 4);
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
new file mode 100644
index 0000000000..fa5ed296ff
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
@@ -0,0 +1,481 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_Tables.h"
+
+// Should be moved in to the Jit class
+typedef void (JitArm64::*_Instruction) (UGeckoInstruction instCode);
+
+static _Instruction dynaOpTable[64];
+static _Instruction dynaOpTable4[1024];
+static _Instruction dynaOpTable19[1024];
+static _Instruction dynaOpTable31[1024];
+static _Instruction dynaOpTable59[32];
+static _Instruction dynaOpTable63[1024];
+
+void JitArm64::DynaRunTable4(UGeckoInstruction inst)  {(this->*dynaOpTable4 [inst.SUBOP10])(inst);}
+void JitArm64::DynaRunTable19(UGeckoInstruction inst) {(this->*dynaOpTable19[inst.SUBOP10])(inst);}
+void JitArm64::DynaRunTable31(UGeckoInstruction inst) {(this->*dynaOpTable31[inst.SUBOP10])(inst);}
+void JitArm64::DynaRunTable59(UGeckoInstruction inst) {(this->*dynaOpTable59[inst.SUBOP5 ])(inst);}
+void JitArm64::DynaRunTable63(UGeckoInstruction inst) {(this->*dynaOpTable63[inst.SUBOP10])(inst);}
+
+struct GekkoOPTemplate
+{
+	int opcode;
+	_Instruction Inst;
+	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
+};
+
+static GekkoOPTemplate primarytable[] =
+{
+	{4,  &JitArm64::DynaRunTable4},             // RunTable4
+	{19, &JitArm64::DynaRunTable19},            // RunTable19
+	{31, &JitArm64::DynaRunTable31},            // RunTable31
+	{59, &JitArm64::DynaRunTable59},            // RunTable59
+	{63, &JitArm64::DynaRunTable63},            // RunTable63
+
+	{16, &JitArm64::bcx},                       // bcx
+	{18, &JitArm64::bx},                        // bx
+
+	{3,  &JitArm64::twx},                       // twi
+	{17, &JitArm64::sc},                        // sc
+
+	{7,  &JitArm64::mulli},                     // mulli
+	{8,  &JitArm64::FallBackToInterpreter},     // subfic
+	{10, &JitArm64::cmpli},                     // cmpli
+	{11, &JitArm64::cmpi},                      // cmpi
+	{12, &JitArm64::addic},                     // addic
+	{13, &JitArm64::addic},                     // addic_rc
+	{14, &JitArm64::arith_imm},                 // addi
+	{15, &JitArm64::arith_imm},                 // addis
+
+	{20, &JitArm64::FallBackToInterpreter},     // rlwimix
+	{21, &JitArm64::rlwinmx},                   // rlwinmx
+	{23, &JitArm64::FallBackToInterpreter},     // rlwnmx
+
+	{24, &JitArm64::arith_imm},                 // ori
+	{25, &JitArm64::arith_imm},                 // oris
+	{26, &JitArm64::arith_imm},                 // xori
+	{27, &JitArm64::arith_imm},                 // xoris
+	{28, &JitArm64::arith_imm},                 // andi_rc
+	{29, &JitArm64::arith_imm},                 // andis_rc
+
+	{32, &JitArm64::lXX},                       // lwz
+	{33, &JitArm64::lXX},                       // lwzu
+	{34, &JitArm64::lXX},                       // lbz
+	{35, &JitArm64::lXX},                       // lbzu
+	{40, &JitArm64::lXX},                       // lhz
+	{41, &JitArm64::lXX},                       // lhzu
+	{42, &JitArm64::lXX},                       // lha
+	{43, &JitArm64::lXX},                       // lhau
+
+	{44, &JitArm64::stX},                       // sth
+	{45, &JitArm64::stX},                       // sthu
+	{36, &JitArm64::stX},                       // stw
+	{37, &JitArm64::stX},                       // stwu
+	{38, &JitArm64::stX},                       // stb
+	{39, &JitArm64::stX},                       // stbu
+
+	{46, &JitArm64::lmw},                       // lmw
+	{47, &JitArm64::stmw},                      // stmw
+
+	{48, &JitArm64::lfXX},                      // lfs
+	{49, &JitArm64::lfXX},                      // lfsu
+	{50, &JitArm64::lfXX},                      // lfd
+	{51, &JitArm64::lfXX},                      // lfdu
+
+	{52, &JitArm64::stfXX},                     // stfs
+	{53, &JitArm64::stfXX},                     // stfsu
+	{54, &JitArm64::stfXX},                     // stfd
+	{55, &JitArm64::stfXX},                     // stfdu
+
+	{56, &JitArm64::psq_l},                     // psq_l
+	{57, &JitArm64::psq_l},                     // psq_lu
+	{60, &JitArm64::psq_st},                    // psq_st
+	{61, &JitArm64::psq_st},                    // psq_stu
+
+	//missing: 0, 1, 2, 5, 6, 9, 22, 30, 62, 58
+};
+
+static GekkoOPTemplate table4[] =
+{    //SUBOP10
+	{0,    &JitArm64::FallBackToInterpreter},   // ps_cmpu0
+	{32,   &JitArm64::FallBackToInterpreter},   // ps_cmpo0
+	{40,   &JitArm64::ps_neg},                  // ps_neg
+	{136,  &JitArm64::ps_nabs},                 // ps_nabs
+	{264,  &JitArm64::ps_abs},                  // ps_abs
+	{64,   &JitArm64::FallBackToInterpreter},   // ps_cmpu1
+	{72,   &JitArm64::ps_mr},                   // ps_mr
+	{96,   &JitArm64::FallBackToInterpreter},   // ps_cmpo1
+	{528,  &JitArm64::ps_merge00},              // ps_merge00
+	{560,  &JitArm64::ps_merge01},              // ps_merge01
+	{592,  &JitArm64::ps_merge10},              // ps_merge10
+	{624,  &JitArm64::ps_merge11},              // ps_merge11
+
+	{1014, &JitArm64::FallBackToInterpreter},   // dcbz_l
+};
+
+static GekkoOPTemplate table4_2[] =
+{
+	{10, &JitArm64::ps_sum0},                   // ps_sum0
+	{11, &JitArm64::ps_sum1},                   // ps_sum1
+	{12, &JitArm64::ps_muls0},                  // ps_muls0
+	{13, &JitArm64::ps_muls1},                  // ps_muls1
+	{14, &JitArm64::ps_madds0},                 // ps_madds0
+	{15, &JitArm64::ps_madds1},                 // ps_madds1
+	{18, &JitArm64::ps_div},                    // ps_div
+	{20, &JitArm64::ps_sub},                    // ps_sub
+	{21, &JitArm64::ps_add},                    // ps_add
+	{23, &JitArm64::ps_sel},                    // ps_sel
+	{24, &JitArm64::ps_res},                    // ps_res
+	{25, &JitArm64::ps_mul},                    // ps_mul
+	{26, &JitArm64::FallBackToInterpreter},     // ps_rsqrte
+	{28, &JitArm64::ps_msub},                   // ps_msub
+	{29, &JitArm64::ps_madd},                   // ps_madd
+	{30, &JitArm64::ps_nmsub},                  // ps_nmsub
+	{31, &JitArm64::ps_nmadd},                  // ps_nmadd
+};
+
+
+static GekkoOPTemplate table4_3[] =
+{
+	{6,  &JitArm64::FallBackToInterpreter},     // psq_lx
+	{7,  &JitArm64::FallBackToInterpreter},     // psq_stx
+	{38, &JitArm64::FallBackToInterpreter},     // psq_lux
+	{39, &JitArm64::FallBackToInterpreter},     // psq_stux
+};
+
+static GekkoOPTemplate table19[] =
+{
+	{528, &JitArm64::bcctrx},                   // bcctrx
+	{16,  &JitArm64::bclrx},                    // bclrx
+	{257, &JitArm64::FallBackToInterpreter},    // crand
+	{129, &JitArm64::FallBackToInterpreter},    // crandc
+	{289, &JitArm64::FallBackToInterpreter},    // creqv
+	{225, &JitArm64::FallBackToInterpreter},    // crnand
+	{33,  &JitArm64::FallBackToInterpreter},    // crnor
+	{449, &JitArm64::FallBackToInterpreter},    // cror
+	{417, &JitArm64::FallBackToInterpreter},    // crorc
+	{193, &JitArm64::FallBackToInterpreter},    // crxor
+
+	{150, &JitArm64::DoNothing},                // isync
+	{0,   &JitArm64::mcrf},                     // mcrf
+
+	{50,  &JitArm64::rfi},                      // rfi
+	{18,  &JitArm64::Break},                    // rfid
+};
+
+
+static GekkoOPTemplate table31[] =
+{
+	{266,  &JitArm64::addx},                    // addx
+	{778,  &JitArm64::addx},                    // addox
+	{10,   &JitArm64::addcx},                   // addcx
+	{522,  &JitArm64::addcx},                   // addcox
+	{138,  &JitArm64::FallBackToInterpreter},   // addex
+	{650,  &JitArm64::FallBackToInterpreter},   // addeox
+	{234,  &JitArm64::FallBackToInterpreter},   // addmex
+	{746,  &JitArm64::FallBackToInterpreter},   // addmeox
+	{202,  &JitArm64::addzex},                  // addzex
+	{714,  &JitArm64::addzex},                  // addzeox
+	{491,  &JitArm64::FallBackToInterpreter},   // divwx
+	{1003, &JitArm64::FallBackToInterpreter},   // divwox
+	{459,  &JitArm64::FallBackToInterpreter},   // divwux
+	{971,  &JitArm64::FallBackToInterpreter},   // divwuox
+	{75,   &JitArm64::FallBackToInterpreter},   // mulhwx
+	{11,   &JitArm64::FallBackToInterpreter},   // mulhwux
+	{235,  &JitArm64::mullwx},                  // mullwx
+	{747,  &JitArm64::mullwx},                  // mullwox
+	{104,  &JitArm64::negx},                    // negx
+	{616,  &JitArm64::negx},                    // negox
+	{40,   &JitArm64::subfx},                   // subfx
+	{552,  &JitArm64::subfx},                   // subfox
+	{8,    &JitArm64::FallBackToInterpreter},   // subfcx
+	{520,  &JitArm64::FallBackToInterpreter},   // subfcox
+	{136,  &JitArm64::FallBackToInterpreter},   // subfex
+	{648,  &JitArm64::FallBackToInterpreter},   // subfeox
+	{232,  &JitArm64::FallBackToInterpreter},   // subfmex
+	{744,  &JitArm64::FallBackToInterpreter},   // subfmeox
+	{200,  &JitArm64::FallBackToInterpreter},   // subfzex
+	{712,  &JitArm64::FallBackToInterpreter},   // subfzeox
+
+	{28,  &JitArm64::boolX},                    // andx
+	{60,  &JitArm64::boolX},                    // andcx
+	{444, &JitArm64::boolX},                    // orx
+	{124, &JitArm64::boolX},                    // norx
+	{316, &JitArm64::boolX},                    // xorx
+	{412, &JitArm64::boolX},                    // orcx
+	{476, &JitArm64::boolX},                    // nandx
+	{284, &JitArm64::boolX},                    // eqvx
+	{0,   &JitArm64::cmp},                      // cmp
+	{32,  &JitArm64::cmpl},                     // cmpl
+	{26,  &JitArm64::cntlzwx},                  // cntlzwx
+	{922, &JitArm64::extsXx},                   // extshx
+	{954, &JitArm64::extsXx},                   // extsbx
+	{536, &JitArm64::FallBackToInterpreter},    // srwx
+	{792, &JitArm64::FallBackToInterpreter},    // srawx
+	{824, &JitArm64::srawix},                   // srawix
+	{24,  &JitArm64::FallBackToInterpreter},    // slwx
+
+	{54,   &JitArm64::FallBackToInterpreter},   // dcbst
+	{86,   &JitArm64::FallBackToInterpreter},   // dcbf
+	{246,  &JitArm64::DoNothing},               // dcbtst
+	{278,  &JitArm64::DoNothing},               // dcbt
+	{470,  &JitArm64::FallBackToInterpreter},   // dcbi
+	{758,  &JitArm64::DoNothing},               // dcba
+	{1014, &JitArm64::FallBackToInterpreter},   // dcbz
+
+	//load word
+	{23,  &JitArm64::lXX},                      // lwzx
+	{55,  &JitArm64::lXX},                      // lwzux
+
+	//load halfword
+	{279, &JitArm64::lXX},                      // lhzx
+	{311, &JitArm64::lXX},                      // lhzux
+
+	//load halfword signextend
+	{343, &JitArm64::lXX},                      // lhax
+	{375, &JitArm64::lXX},                      // lhaux
+
+	//load byte
+	{87,  &JitArm64::lXX},                      // lbzx
+	{119, &JitArm64::lXX},                      // lbzux
+
+	//load byte reverse
+	{534, &JitArm64::lXX},                      // lwbrx
+	{790, &JitArm64::lXX},                      // lhbrx
+
+	// Conditional load/store (Wii SMP)
+	{150, &JitArm64::FallBackToInterpreter},    // stwcxd
+	{20,  &JitArm64::FallBackToInterpreter},    // lwarx
+
+	//load string (interpret these)
+	{533, &JitArm64::FallBackToInterpreter},    // lswx
+	{597, &JitArm64::FallBackToInterpreter},    // lswi
+
+	//store word
+	{151, &JitArm64::stX},                      // stwx
+	{183, &JitArm64::stX},                      // stwux
+
+	//store halfword
+	{407, &JitArm64::stX},                      // sthx
+	{439, &JitArm64::stX},                      // sthux
+
+	//store byte
+	{215, &JitArm64::stX},                      // stbx
+	{247, &JitArm64::stX},                      // stbux
+
+	//store bytereverse
+	{662, &JitArm64::FallBackToInterpreter},    // stwbrx
+	{918, &JitArm64::FallBackToInterpreter},    // sthbrx
+
+	{661, &JitArm64::FallBackToInterpreter},    // stswx
+	{725, &JitArm64::FallBackToInterpreter},    // stswi
+
+	// fp load/store
+	{535, &JitArm64::lfXX},                     // lfsx
+	{567, &JitArm64::lfXX},                     // lfsux
+	{599, &JitArm64::lfXX},                     // lfdx
+	{631, &JitArm64::lfXX},                     // lfdux
+
+	{663, &JitArm64::stfXX},                    // stfsx
+	{695, &JitArm64::stfXX},                    // stfsux
+	{727, &JitArm64::stfXX},                    // stfdx
+	{759, &JitArm64::stfXX},                    // stfdux
+	{983, &JitArm64::FallBackToInterpreter},    // stfiwx
+
+	{19,  &JitArm64::FallBackToInterpreter},    // mfcr
+	{83,  &JitArm64::mfmsr},                    // mfmsr
+	{144, &JitArm64::FallBackToInterpreter},    // mtcrf
+	{146, &JitArm64::mtmsr},                    // mtmsr
+	{210, &JitArm64::mtsr},                     // mtsr
+	{242, &JitArm64::mtsrin},                   // mtsrin
+	{339, &JitArm64::mfspr},                    // mfspr
+	{467, &JitArm64::mtspr},                    // mtspr
+	{371, &JitArm64::mftb},                     // mftb
+	{512, &JitArm64::FallBackToInterpreter},    // mcrxr
+	{595, &JitArm64::mfsr},                     // mfsr
+	{659, &JitArm64::mfsrin},                   // mfsrin
+
+	{4,   &JitArm64::twx},                      // tw
+	{598, &JitArm64::DoNothing},                // sync
+	{982, &JitArm64::icbi},                     // icbi
+
+	// Unused instructions on GC
+	{310, &JitArm64::FallBackToInterpreter},    // eciwx
+	{438, &JitArm64::FallBackToInterpreter},    // ecowx
+	{854, &JitArm64::DoNothing},                // eieio
+	{306, &JitArm64::FallBackToInterpreter},    // tlbie
+	{370, &JitArm64::FallBackToInterpreter},    // tlbia
+	{566, &JitArm64::DoNothing},                // tlbsync
+};
+
+static GekkoOPTemplate table59[] =
+{
+	{18, &JitArm64::FallBackToInterpreter},     // fdivsx
+	{20, &JitArm64::fsubsx},                    // fsubsx
+	{21, &JitArm64::faddsx},                    // faddsx
+//  {22, &JitArm64::FallBackToInterpreter},       // fsqrtsx
+	{24, &JitArm64::FallBackToInterpreter},     // fresx
+	{25, &JitArm64::fmulsx},                    // fmulsx
+	{28, &JitArm64::fmsubsx},                   // fmsubsx
+	{29, &JitArm64::fmaddsx},                   // fmaddsx
+	{30, &JitArm64::fnmsubsx},                  // fnmsubsx
+	{31, &JitArm64::fnmaddsx},                  // fnmaddsx
+};
+
+static GekkoOPTemplate table63[] =
+{
+	{264, &JitArm64::fabsx},                    // fabsx
+	{32,  &JitArm64::FallBackToInterpreter},    // fcmpo
+	{0,   &JitArm64::FallBackToInterpreter},    // fcmpu
+	{14,  &JitArm64::FallBackToInterpreter},    // fctiwx
+	{15,  &JitArm64::FallBackToInterpreter},    // fctiwzx
+	{72,  &JitArm64::fmrx},                     // fmrx
+	{136, &JitArm64::fnabsx},                   // fnabsx
+	{40,  &JitArm64::fnegx},                    // fnegx
+	{12,  &JitArm64::FallBackToInterpreter},    // frspx
+
+	{64,  &JitArm64::FallBackToInterpreter},    // mcrfs
+	{583, &JitArm64::FallBackToInterpreter},    // mffsx
+	{70,  &JitArm64::FallBackToInterpreter},    // mtfsb0x
+	{38,  &JitArm64::FallBackToInterpreter},    // mtfsb1x
+	{134, &JitArm64::FallBackToInterpreter},    // mtfsfix
+	{711, &JitArm64::FallBackToInterpreter},    // mtfsfx
+};
+
+static GekkoOPTemplate table63_2[] =
+{
+	{18, &JitArm64::FallBackToInterpreter},     // fdivx
+	{20, &JitArm64::fsubx},                     // fsubx
+	{21, &JitArm64::faddx},                     // faddx
+	{22, &JitArm64::FallBackToInterpreter},     // fsqrtx
+	{23, &JitArm64::fselx},                     // fselx
+	{25, &JitArm64::fmulx},                     // fmulx
+	{26, &JitArm64::FallBackToInterpreter},     // frsqrtex
+	{28, &JitArm64::fmsubx},                    // fmsubx
+	{29, &JitArm64::fmaddx},                    // fmaddx
+	{30, &JitArm64::fnmsubx},                   // fnmsubx
+	{31, &JitArm64::fnmaddx},                   // fnmaddx
+};
+
+
+namespace JitArm64Tables
+{
+
+void CompileInstruction(PPCAnalyst::CodeOp & op)
+{
+	JitArm64 *jitarm = (JitArm64 *)jit;
+	(jitarm->*dynaOpTable[op.inst.OPCD])(op.inst);
+	GekkoOPInfo *info = op.opinfo;
+	if (info)
+	{
+#ifdef OPLOG
+		if (!strcmp(info->opname, OP_TO_LOG)){  ///"mcrfs"
+			rsplocations.push_back(jit.js.compilerPC);
+		}
+#endif
+		info->compileCount++;
+		info->lastUse = jit->js.compilerPC;
+	}
+}
+
+void InitTables()
+{
+	// once initialized, tables are read-only
+	static bool initialized = false;
+	if (initialized)
+		return;
+
+	//clear
+	for (auto& tpl : dynaOpTable)
+	{
+		tpl = &JitArm64::FallBackToInterpreter;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		dynaOpTable59[i] = &JitArm64::FallBackToInterpreter;
+	}
+
+	for (int i = 0; i < 1024; i++)
+	{
+		dynaOpTable4 [i] = &JitArm64::FallBackToInterpreter;
+		dynaOpTable19[i] = &JitArm64::FallBackToInterpreter;
+		dynaOpTable31[i] = &JitArm64::FallBackToInterpreter;
+		dynaOpTable63[i] = &JitArm64::FallBackToInterpreter;
+	}
+
+	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
+	{
+		dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++)
+		{
+			int op = fill+table4_2[j].opcode;
+			dynaOpTable4[op] = table4_2[j].Inst;
+		}
+	}
+
+	for (int i = 0; i < 16; i++)
+	{
+		int fill = i << 6;
+		for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++)
+		{
+			int op = fill+table4_3[j].opcode;
+			dynaOpTable4[op] = table4_3[j].Inst;
+		}
+	}
+
+	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
+	{
+		int op = table4[i].opcode;
+		dynaOpTable4[op] = table4[i].Inst;
+	}
+
+	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
+	{
+		int op = table31[i].opcode;
+		dynaOpTable31[op] = table31[i].Inst;
+	}
+
+	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
+	{
+		int op = table19[i].opcode;
+		dynaOpTable19[op] = table19[i].Inst;
+	}
+
+	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
+	{
+		int op = table59[i].opcode;
+		dynaOpTable59[op] = table59[i].Inst;
+	}
+
+	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
+	{
+		int op = table63[i].opcode;
+		dynaOpTable63[op] = table63[i].Inst;
+	}
+
+	for (int i = 0; i < 32; i++)
+	{
+		int fill = i << 5;
+		for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++)
+		{
+			int op = fill + table63_2[j].opcode;
+			dynaOpTable63[op] = table63_2[j].Inst;
+		}
+	}
+
+	initialized = true;
+
+}
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.h
new file mode 100644
index 0000000000..a00c14e075
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.h
@@ -0,0 +1,14 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCTables.h"
+
+namespace JitArm64Tables
+{
+	void CompileInstruction(PPCAnalyst::CodeOp & op);
+	void InitTables();
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
new file mode 100644
index 0000000000..16534edf5f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
@@ -0,0 +1,555 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitAsm.h"
+#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+using namespace Arm64Gen;
+
+void JitArm64AsmRoutineManager::Generate()
+{
+	// This value is all of the callee saved registers that we are required to save.
+	// According to the AACPS64 we need to save R19 ~ R30.
+	const u32 ALL_CALLEE_SAVED = 0x7FF80000;
+	BitSet32 regs_to_save(ALL_CALLEE_SAVED);
+	enterCode = GetCodePtr();
+
+	ABI_PushRegisters(regs_to_save);
+
+	MOVI2R(X29, (u64)&PowerPC::ppcState);
+	FixupBranch to_dispatcher = B();
+
+	// If we align the dispatcher to a page then we can load its location with one ADRP instruction
+	AlignCodePage();
+	dispatcher = GetCodePtr();
+	WARN_LOG(DYNA_REC, "Dispatcher is %p\n", dispatcher);
+
+	SetJumpTarget(to_dispatcher);
+
+	// Downcount Check
+	// The result of slice decrementation should be in flags if somebody jumped here
+	// IMPORTANT - We jump on negative, not carry!!!
+	FixupBranch bail = B(CC_MI);
+
+		dispatcherNoCheck = GetCodePtr();
+
+		// This block of code gets the address of the compiled block of code
+		// It runs though to the compiling portion if it isn't found
+		LDR(INDEX_UNSIGNED, W28, X29, PPCSTATE_OFF(pc)); // Load the current PC into W28
+		BFM(W28, WSP, 3, 2); // Wipe the top 3 bits. Same as PC & JIT_ICACHE_MASK
+
+		MOVI2R(X27, (u64)jit->GetBlockCache()->iCache.data());
+		LDR(W27, X27, X28);
+
+		FixupBranch JitBlock = TBNZ(W27, 7); // Test the 7th bit
+			// Success, it is our Jitblock.
+			MOVI2R(X30, (u64)jit->GetBlockCache()->GetCodePointers());
+			UBFM(X27, X27, 61, 60); // Same as X27 << 3
+			LDR(X30, X30, X27); // Load the block address in to R14
+			BR(X30);
+			// No need to jump anywhere after here, the block will go back to dispatcher start
+
+		SetJumpTarget(JitBlock);
+
+		MOVI2R(X30, (u64)&Jit);
+		BLR(X30);
+
+		B(dispatcherNoCheck);
+
+	SetJumpTarget(bail);
+	doTiming = GetCodePtr();
+		MOVI2R(X30, (u64)&CoreTiming::Advance);
+		BLR(X30);
+
+		// Does exception checking
+		LDR(INDEX_UNSIGNED, W0, X29, PPCSTATE_OFF(pc));
+		STR(INDEX_UNSIGNED, W0, X29, PPCSTATE_OFF(npc));
+			MOVI2R(X30, (u64)&PowerPC::CheckExceptions);
+			BLR(X30);
+		LDR(INDEX_UNSIGNED, W0, X29, PPCSTATE_OFF(npc));
+		STR(INDEX_UNSIGNED, W0, X29, PPCSTATE_OFF(pc));
+
+		// Check the state pointer to see if we are exiting
+		// Gets checked on every exception check
+		MOVI2R(X0, (u64)PowerPC::GetStatePtr());
+		LDR(INDEX_UNSIGNED, W0, X0, 0);
+
+		CMP(W0, 0);
+		FixupBranch Exit = B(CC_NEQ);
+
+	B(dispatcher);
+
+	SetJumpTarget(Exit);
+
+	// Let the waiting thread know we are done leaving
+	MOVI2R(X0, (u64)&PowerPC::FinishStateMove);
+	BLR(X0);
+
+	ABI_PopRegisters(regs_to_save);
+	RET(X30);
+
+	GenerateCommon();
+
+	FlushIcache();
+}
+
+void JitArm64AsmRoutineManager::GenerateCommon()
+{
+	// X0 is the scale
+	// X1 is address
+	// X2 is a temporary on stores
+	// X30 is LR
+	// Q0 is the return for loads
+	//    is the register for stores
+	// Q1 is a temporary
+	ARM64Reg addr_reg = X1;
+	ARM64Reg scale_reg = X0;
+	ARM64FloatEmitter float_emit(this);
+
+	const u8* loadPairedIllegal = GetCodePtr();
+		BRK(100);
+	const u8* loadPairedFloatTwo = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LD1(32, 1, D0, addr_reg);
+		float_emit.REV32(8, D0, D0);
+		RET(X30);
+	}
+	const u8* loadPairedU8Two = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.UXTL(8, D0, D0);
+		float_emit.UXTL(16, D0, D0);
+		float_emit.UCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedS8Two = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.SXTL(8, D0, D0);
+		float_emit.SXTL(16, D0, D0);
+		float_emit.SCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedU16Two = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LD1(16, 1, D0, addr_reg);
+		float_emit.REV16(8, D0, D0);
+		float_emit.UXTL(16, D0, D0);
+		float_emit.UCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedS16Two = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LD1(16, 1, D0, addr_reg);
+		float_emit.REV16(8, D0, D0);
+		float_emit.SXTL(16, D0, D0);
+		float_emit.SCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+
+	const u8* loadPairedFloatOne = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(32, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.REV32(8, D0, D0);
+		RET(X30);
+	}
+	const u8* loadPairedU8One = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(8, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.UXTL(8, D0, D0);
+		float_emit.UXTL(16, D0, D0);
+		float_emit.UCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedS8One = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(8, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.SXTL(8, D0, D0);
+		float_emit.SXTL(16, D0, D0);
+		float_emit.SCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedU16One = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.REV16(8, D0, D0);
+		float_emit.UXTL(16, D0, D0);
+		float_emit.UCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+	const u8* loadPairedS16One = GetCodePtr();
+	{
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.LDR(16, INDEX_UNSIGNED, D0, addr_reg, 0);
+		float_emit.REV16(8, D0, D0);
+		float_emit.SXTL(16, D0, D0);
+		float_emit.SCVTF(32, D0, D0);
+
+		MOVI2R(addr_reg, (u64)&m_dequantizeTableS);
+		ADD(scale_reg, addr_reg, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+		float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+		float_emit.FMUL(32, D0, D0, D1, 0);
+		RET(X30);
+	}
+
+	pairedLoadQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
+	ReserveCodeSpace(16 * sizeof(u8*));
+
+	pairedLoadQuantized[0] = loadPairedFloatTwo;
+	pairedLoadQuantized[1] = loadPairedIllegal;
+	pairedLoadQuantized[2] = loadPairedIllegal;
+	pairedLoadQuantized[3] = loadPairedIllegal;
+	pairedLoadQuantized[4] = loadPairedU8Two;
+	pairedLoadQuantized[5] = loadPairedU16Two;
+	pairedLoadQuantized[6] = loadPairedS8Two;
+	pairedLoadQuantized[7] = loadPairedS16Two;
+
+	pairedLoadQuantized[8] = loadPairedFloatOne;
+	pairedLoadQuantized[9] = loadPairedIllegal;
+	pairedLoadQuantized[10] = loadPairedIllegal;
+	pairedLoadQuantized[11] = loadPairedIllegal;
+	pairedLoadQuantized[12] = loadPairedU8One;
+	pairedLoadQuantized[13] = loadPairedU16One;
+	pairedLoadQuantized[14] = loadPairedS8One;
+	pairedLoadQuantized[15] = loadPairedS16One;
+
+	// Stores
+	const u8* storePairedIllegal = GetCodePtr();
+		BRK(0x101);
+	const u8* storePairedFloat;
+	const u8* storePairedFloatSlow;
+	{
+		storePairedFloat = GetCodePtr();
+		float_emit.REV32(8, D0, D0);
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(64, Q0, 0, addr_reg, SP);
+		RET(X30);
+
+		storePairedFloatSlow = GetCodePtr();
+		float_emit.UMOV(64, X0, Q0, 0);
+		ORR(X0, SP, X0, ArithOption(X0, ST_ROR, 32));
+		MOVI2R(X2, (u64)PowerPC::Write_U64);
+		BR(X2);
+	}
+
+	const u8* storePairedU8;
+	const u8* storePairedU8Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1, 0);
+			float_emit.FCVTZU(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.XTN(8, D0, D0);
+		};
+
+		storePairedU8 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(16, Q0, 0, addr_reg, SP);
+		RET(X30);
+
+		storePairedU8Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.UMOV(16, W0, Q0, 0);
+		REV16(W0, W0);
+		MOVI2R(X2, (u64)PowerPC::Write_U16);
+		BR(X2);
+	}
+	const u8* storePairedS8;
+	const u8* storePairedS8Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1, 0);
+			float_emit.FCVTZS(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.XTN(8, D0, D0);
+		};
+
+		storePairedS8 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(16, Q0, 0, addr_reg, SP);
+		RET(X30);
+
+		storePairedS8Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.UMOV(16, W0, Q0, 0);
+		REV16(W0, W0);
+		MOVI2R(X2, (u64)PowerPC::Write_U16);
+		BR(X2);
+	}
+
+	const u8* storePairedU16;
+	const u8* storePairedU16Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1, 0);
+			float_emit.FCVTZU(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.REV16(8, D0, D0);
+		};
+
+		storePairedU16 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(32, Q0, 0, addr_reg, SP);
+		RET(X30);
+
+		storePairedU16Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.REV32(8, D0, D0);
+		float_emit.UMOV(32, W0, Q0, 0);
+		MOVI2R(X2, (u64)PowerPC::Write_U32);
+		BR(X2);
+	}
+	const u8* storePairedS16; // Used by Viewtiful Joe's intro movie
+	const u8* storePairedS16Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1, 0);
+			float_emit.FCVTZS(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.REV16(8, D0, D0);
+		};
+
+		storePairedS16 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(32, Q0, 0, addr_reg, SP);
+		RET(X30);
+
+		storePairedS16Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.REV32(8, D0, D0);
+		float_emit.UMOV(32, W0, Q0, 0);
+		MOVI2R(X2, (u64)PowerPC::Write_U32);
+		BR(X2);
+	}
+
+	const u8* storeSingleFloat;
+	const u8* storeSingleFloatSlow;
+	{
+		storeSingleFloat = GetCodePtr();
+		float_emit.REV32(8, D0, D0);
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.STR(32, INDEX_UNSIGNED, D0, addr_reg, 0);
+		RET(X30);
+
+		storeSingleFloatSlow = GetCodePtr();
+		float_emit.UMOV(32, W0, Q0, 0);
+		MOVI2R(X2, (u64)&PowerPC::Write_U32);
+		BR(X2);
+	}
+	const u8* storeSingleU8;  // Used by MKWii
+	const u8* storeSingleU8Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1);
+			float_emit.FCVTZU(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.XTN(8, D0, D0);
+		};
+
+		storeSingleU8 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(8, Q0, 0, addr_reg);
+		RET(X30);
+
+		storeSingleU8Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.UMOV(8, W0, Q0, 0);
+		MOVI2R(X2, (u64)&PowerPC::Write_U8);
+		BR(X2);
+	}
+	const u8* storeSingleS8;
+	const u8* storeSingleS8Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1);
+			float_emit.FCVTZS(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+			float_emit.XTN(8, D0, D0);
+		};
+
+		storeSingleS8 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.ST1(8, Q0, 0, addr_reg);
+		RET(X30);
+
+		storeSingleS8Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.SMOV(8, W0, Q0, 0);
+		MOVI2R(X2, (u64)&PowerPC::Write_U8);
+		BR(X2);
+	}
+	const u8* storeSingleU16;  // Used by MKWii
+	const u8* storeSingleU16Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1);
+			float_emit.FCVTZU(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+		};
+
+		storeSingleU16 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.REV16(8, D0, D0);
+		float_emit.ST1(16, Q0, 0, addr_reg);
+		RET(X30);
+
+		storeSingleU16Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.UMOV(16, W0, Q0, 0);
+		MOVI2R(X2, (u64)&PowerPC::Write_U16);
+		BR(X2);
+	}
+	const u8* storeSingleS16;
+	const u8* storeSingleS16Slow;
+	{
+		auto emit_quantize = [this, &float_emit, scale_reg]()
+		{
+			MOVI2R(X2, (u64)&m_quantizeTableS);
+			ADD(scale_reg, X2, scale_reg, ArithOption(scale_reg, ST_LSL, 3));
+			float_emit.LDR(32, INDEX_UNSIGNED, D1, scale_reg, 0);
+			float_emit.FMUL(32, D0, D0, D1);
+			float_emit.FCVTZS(32, D0, D0);
+			float_emit.XTN(16, D0, D0);
+		};
+
+		storeSingleS16 = GetCodePtr();
+		emit_quantize();
+		MOVK(addr_reg, ((u64)Memory::logical_base >> 32) & 0xFFFF, SHIFT_32);
+		float_emit.REV16(8, D0, D0);
+		float_emit.ST1(16, Q0, 0, addr_reg);
+		RET(X30);
+
+		storeSingleS16Slow = GetCodePtr();
+		emit_quantize();
+		float_emit.SMOV(16, W0, Q0, 0);
+		MOVI2R(X2, (u64)&PowerPC::Write_U16);
+		BR(X2);
+	}
+
+	pairedStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
+	ReserveCodeSpace(32 * sizeof(u8*));
+
+	// Fast
+	pairedStoreQuantized[0] = storePairedFloat;
+	pairedStoreQuantized[1] = storePairedIllegal;
+	pairedStoreQuantized[2] = storePairedIllegal;
+	pairedStoreQuantized[3] = storePairedIllegal;
+	pairedStoreQuantized[4] = storePairedU8;
+	pairedStoreQuantized[5] = storePairedU16;
+	pairedStoreQuantized[6] = storePairedS8;
+	pairedStoreQuantized[7] = storePairedS16;
+
+	pairedStoreQuantized[8] = storeSingleFloat;
+	pairedStoreQuantized[9] = storePairedIllegal;
+	pairedStoreQuantized[10] = storePairedIllegal;
+	pairedStoreQuantized[11] = storePairedIllegal;
+	pairedStoreQuantized[12] = storeSingleU8;
+	pairedStoreQuantized[13] = storeSingleU16;
+	pairedStoreQuantized[14] = storeSingleS8;
+	pairedStoreQuantized[15] = storeSingleS16;
+
+	// Slow
+	pairedStoreQuantized[16] = storePairedFloatSlow;
+	pairedStoreQuantized[17] = storePairedIllegal;
+	pairedStoreQuantized[18] = storePairedIllegal;
+	pairedStoreQuantized[19] = storePairedIllegal;
+	pairedStoreQuantized[20] = storePairedU8Slow;
+	pairedStoreQuantized[21] = storePairedU16Slow;
+	pairedStoreQuantized[22] = storePairedS8Slow;
+	pairedStoreQuantized[23] = storePairedS16Slow;
+
+	pairedStoreQuantized[24] = storeSingleFloatSlow;
+	pairedStoreQuantized[25] = storePairedIllegal;
+	pairedStoreQuantized[26] = storePairedIllegal;
+	pairedStoreQuantized[27] = storePairedIllegal;
+	pairedStoreQuantized[28] = storeSingleU8Slow;
+	pairedStoreQuantized[29] = storeSingleU16Slow;
+	pairedStoreQuantized[30] = storeSingleS8Slow;
+	pairedStoreQuantized[31] = storeSingleS16Slow;
+
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.h b/Source/Core/Core/PowerPC/JitArm64/JitAsm.h
new file mode 100644
index 0000000000..daa09d0bd2
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.h
@@ -0,0 +1,29 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Arm64Emitter.h"
+#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
+
+class JitArm64AsmRoutineManager : public CommonAsmRoutinesBase, public Arm64Gen::ARM64CodeBlock
+{
+private:
+	void Generate();
+	void GenerateCommon();
+
+public:
+	void Init()
+	{
+		AllocCodeSpace(16384);
+		Generate();
+		WriteProtect();
+	}
+
+	void Shutdown()
+	{
+		FreeCodeSpace();
+	}
+};
+
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp
new file mode 100644
index 0000000000..60ea797498
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp
@@ -0,0 +1,248 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/HW/MMIO.h"
+
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/Jit_Util.h"
+template <typename T>
+class MMIOWriteCodeGenerator : public MMIO::WriteHandlingMethodVisitor<T>
+{
+public:
+	MMIOWriteCodeGenerator(ARM64XEmitter* emit, BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+	                      ARM64Reg src_reg, u32 address)
+		: m_emit(emit), m_gprs_in_use(gprs_in_use), m_fprs_in_use(fprs_in_use),
+		  m_src_reg(src_reg), m_address(address)
+	{
+	}
+
+	virtual void VisitNop()
+	{
+		// Do nothing
+	}
+	virtual void VisitDirect(T* addr, u32 mask)
+	{
+		WriteRegToAddr(8 * sizeof (T), addr, mask);
+	}
+	virtual void VisitComplex(const std::function<void(u32, T)>* lambda)
+	{
+		CallLambda(8 * sizeof (T), lambda);
+	}
+
+private:
+
+	void StoreFromRegister(int sbits, ARM64Reg reg)
+	{
+		switch (sbits)
+		{
+		case 8:
+			m_emit->STRB(INDEX_UNSIGNED, reg, X0, 0);
+		break;
+		case 16:
+			m_emit->STRH(INDEX_UNSIGNED, reg, X0, 0);
+		break;
+		case 32:
+			m_emit->STR(INDEX_UNSIGNED, reg, X0, 0);
+		break;
+		default:
+			_assert_msg_(DYNA_REC, false, "Unknown size %d passed to MMIOWriteCodeGenerator!", sbits);
+		break;
+		}
+	}
+
+	void WriteRegToAddr(int sbits, const void* ptr, u32 mask)
+	{
+		m_emit->MOVI2R(X0, (u64)ptr);
+
+		// If we do not need to mask, we can do the sign extend while loading
+		// from memory. If masking is required, we have to first zero extend,
+		// then mask, then sign extend if needed (1 instr vs. ~4).
+		u32 all_ones = (1ULL << sbits) - 1;
+		if ((all_ones & mask) == all_ones)
+		{
+			StoreFromRegister(sbits, m_src_reg);
+		}
+		else
+		{
+			m_emit->MOVI2R(W1, mask);
+			m_emit->AND(W1, m_src_reg, W1, ArithOption(W1, ST_LSL, 0));
+			StoreFromRegister(sbits, W1);
+		}
+	}
+
+	void CallLambda(int sbits, const std::function<void(u32, T)>* lambda)
+	{
+		ARM64FloatEmitter float_emit(m_emit);
+
+		m_emit->ABI_PushRegisters(m_gprs_in_use);
+		float_emit.ABI_PushRegisters(m_fprs_in_use, X1);
+			m_emit->MOVI2R(W1, m_address);
+			m_emit->MOV(W2, m_src_reg);
+			m_emit->BLR(m_emit->ABI_SetupLambda(lambda));
+		float_emit.ABI_PopRegisters(m_fprs_in_use, X1);
+		m_emit->ABI_PopRegisters(m_gprs_in_use);
+	}
+
+	ARM64XEmitter* m_emit;
+	BitSet32 m_gprs_in_use;
+	BitSet32 m_fprs_in_use;
+	ARM64Reg m_src_reg;
+	u32 m_address;
+};
+// Visitor that generates code to read a MMIO value.
+template <typename T>
+class MMIOReadCodeGenerator : public MMIO::ReadHandlingMethodVisitor<T>
+{
+public:
+	MMIOReadCodeGenerator(ARM64XEmitter* emit, BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+	                      ARM64Reg dst_reg, u32 address, bool sign_extend)
+		: m_emit(emit), m_gprs_in_use(gprs_in_use), m_fprs_in_use(fprs_in_use),
+		  m_dst_reg(dst_reg), m_address(address), m_sign_extend(sign_extend)
+	{
+	}
+
+	virtual void VisitConstant(T value)
+	{
+		LoadConstantToReg(8 * sizeof (T), value);
+	}
+	virtual void VisitDirect(const T* addr, u32 mask)
+	{
+		LoadAddrMaskToReg(8 * sizeof (T), addr, mask);
+	}
+	virtual void VisitComplex(const std::function<T(u32)>* lambda)
+	{
+		CallLambda(8 * sizeof (T), lambda);
+	}
+
+private:
+
+	void LoadConstantToReg(int sbits, u32 value)
+	{
+		m_emit->MOVI2R(m_dst_reg, value);
+		if (m_sign_extend)
+			m_emit->SBFM(m_dst_reg, m_dst_reg, 0, sbits - 1);
+	}
+
+	void LoadToRegister(int sbits, bool dont_extend)
+	{
+		switch (sbits)
+		{
+		case 8:
+			if (m_sign_extend && !dont_extend)
+				m_emit->LDRSB(INDEX_UNSIGNED, m_dst_reg, X0, 0);
+			else
+				m_emit->LDRB(INDEX_UNSIGNED, m_dst_reg, X0, 0);
+		break;
+		case 16:
+			if (m_sign_extend && !dont_extend)
+				m_emit->LDRSH(INDEX_UNSIGNED, m_dst_reg, X0, 0);
+			else
+				m_emit->LDRH(INDEX_UNSIGNED, m_dst_reg, X0, 0);
+		break;
+		case 32:
+			m_emit->LDR(INDEX_UNSIGNED, m_dst_reg, X0, 0);
+		break;
+		default:
+			_assert_msg_(DYNA_REC, false, "Unknown size %d passed to MMIOReadCodeGenerator!", sbits);
+		break;
+		}
+	}
+
+	void LoadAddrMaskToReg(int sbits, const void* ptr, u32 mask)
+	{
+		m_emit->MOVI2R(X0, (u64)ptr);
+
+		// If we do not need to mask, we can do the sign extend while loading
+		// from memory. If masking is required, we have to first zero extend,
+		// then mask, then sign extend if needed (1 instr vs. ~4).
+		u32 all_ones = (1ULL << sbits) - 1;
+		if ((all_ones & mask) == all_ones)
+		{
+			LoadToRegister(sbits, false);
+		}
+		else
+		{
+			LoadToRegister(sbits, true);
+			m_emit->MOVI2R(W0, mask);
+			m_emit->AND(m_dst_reg, m_dst_reg, W0, ArithOption(W0, ST_LSL, 0));
+			if (m_sign_extend)
+				m_emit->SBFM(m_dst_reg, m_dst_reg, 0, sbits - 1);
+		}
+	}
+
+	void CallLambda(int sbits, const std::function<T(u32)>* lambda)
+	{
+		ARM64FloatEmitter float_emit(m_emit);
+
+		m_emit->ABI_PushRegisters(m_gprs_in_use);
+		float_emit.ABI_PushRegisters(m_fprs_in_use, X1);
+			m_emit->MOVI2R(W1, m_address);
+			m_emit->BLR(m_emit->ABI_SetupLambda(lambda));
+		float_emit.ABI_PopRegisters(m_fprs_in_use, X1);
+		m_emit->ABI_PopRegisters(m_gprs_in_use);
+
+		if (m_sign_extend)
+			m_emit->SBFM(m_dst_reg, W0, 0, sbits - 1);
+		else
+			m_emit->UBFM(m_dst_reg, W0, 0, sbits - 1);
+	}
+
+	ARM64XEmitter* m_emit;
+	BitSet32 m_gprs_in_use;
+	BitSet32 m_fprs_in_use;
+	ARM64Reg m_dst_reg;
+	u32 m_address;
+	bool m_sign_extend;
+};
+
+void MMIOLoadToReg(MMIO::Mapping* mmio, Arm64Gen::ARM64XEmitter* emit,
+                   BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+                   ARM64Reg dst_reg, u32 address, u32 flags)
+{
+	if (flags & BackPatchInfo::FLAG_SIZE_8)
+	{
+		MMIOReadCodeGenerator<u8> gen(emit, gprs_in_use, fprs_in_use, dst_reg,
+							address, flags & BackPatchInfo::FLAG_EXTEND);
+		mmio->GetHandlerForRead<u8>(address).Visit(gen);
+	}
+	else if (flags & BackPatchInfo::FLAG_SIZE_16)
+	{
+		MMIOReadCodeGenerator<u16> gen(emit, gprs_in_use, fprs_in_use, dst_reg,
+							 address, flags & BackPatchInfo::FLAG_EXTEND);
+		mmio->GetHandlerForRead<u16>(address).Visit(gen);
+	}
+	else if (flags & BackPatchInfo::FLAG_SIZE_32)
+	{
+		MMIOReadCodeGenerator<u32> gen(emit, gprs_in_use, fprs_in_use, dst_reg,
+							 address, flags & BackPatchInfo::FLAG_EXTEND);
+		mmio->GetHandlerForRead<u32>(address).Visit(gen);
+	}
+}
+
+void MMIOWriteRegToAddr(MMIO::Mapping* mmio, Arm64Gen::ARM64XEmitter* emit,
+                        BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+                        ARM64Reg src_reg, u32 address, u32 flags)
+{
+	if (flags & BackPatchInfo::FLAG_SIZE_8)
+	{
+		MMIOWriteCodeGenerator<u8> gen(emit, gprs_in_use, fprs_in_use, src_reg,
+							address);
+		mmio->GetHandlerForWrite<u8>(address).Visit(gen);
+	}
+	else if (flags & BackPatchInfo::FLAG_SIZE_16)
+	{
+		MMIOWriteCodeGenerator<u16> gen(emit, gprs_in_use, fprs_in_use, src_reg,
+							 address);
+		mmio->GetHandlerForWrite<u16>(address).Visit(gen);
+	}
+	else if (flags & BackPatchInfo::FLAG_SIZE_32)
+	{
+		MMIOWriteCodeGenerator<u32> gen(emit, gprs_in_use, fprs_in_use, src_reg,
+							 address);
+		mmio->GetHandlerForWrite<u32>(address).Visit(gen);
+	}
+}
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit_Util.h b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.h
new file mode 100644
index 0000000000..f1d257836b
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit_Util.h
@@ -0,0 +1,18 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Arm64Emitter.h"
+#include "Common/Common.h"
+
+#include "Core/HW/MMIO.h"
+
+void MMIOLoadToReg(MMIO::Mapping* mmio, Arm64Gen::ARM64XEmitter* emit,
+                   BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+                   ARM64Reg dst_reg, u32 address, u32 flags);
+
+void MMIOWriteRegToAddr(MMIO::Mapping* mmio, Arm64Gen::ARM64XEmitter* emit,
+                        BitSet32 gprs_in_use, BitSet32 fprs_in_use,
+                        ARM64Reg src_reg, u32 address, u32 flags);
diff --git a/Source/Core/Core/PowerPC/JitArmCommon/BackPatch.h b/Source/Core/Core/PowerPC/JitArmCommon/BackPatch.h
new file mode 100644
index 0000000000..369854a621
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitArmCommon/BackPatch.h
@@ -0,0 +1,41 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+#include "Common/CommonTypes.h"
+
+struct BackPatchInfo
+{
+	enum
+	{
+		FLAG_STORE    = (1 << 0),
+		FLAG_LOAD     = (1 << 1),
+		FLAG_SIZE_8   = (1 << 2),
+		FLAG_SIZE_16  = (1 << 3),
+		FLAG_SIZE_32  = (1 << 4),
+		FLAG_SIZE_F32 = (1 << 5),
+		FLAG_SIZE_F64 = (1 << 6),
+		FLAG_REVERSE  = (1 << 7),
+		FLAG_EXTEND   = (1 << 8),
+	};
+
+	static u32 GetFlagSize(u32 flags)
+	{
+		if (flags & FLAG_SIZE_8)
+			return 8;
+		if (flags & FLAG_SIZE_16)
+			return 16;
+		if (flags & FLAG_SIZE_32)
+			return 32;
+		if (flags & FLAG_SIZE_F32)
+			return 32;
+		if (flags & FLAG_SIZE_F64)
+			return 64;
+		return 0;
+	}
+
+	u32 m_fastmem_size;
+	u32 m_fastmem_trouble_inst_offset;
+	u32 m_slowmem_size;
+};
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp
new file mode 100644
index 0000000000..0f3884b475
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
+
+const u8 GC_ALIGNED16(pbswapShuffle1x4[16]) = { 3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = { 3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+const float GC_ALIGNED16(m_quantizeTableS[]) =
+{
+	(1ULL <<  0), (1ULL <<  0), (1ULL <<  1), (1ULL <<  1), (1ULL <<  2), (1ULL <<  2), (1ULL <<  3), (1ULL <<  3),
+	(1ULL <<  4), (1ULL <<  4), (1ULL <<  5), (1ULL <<  5), (1ULL <<  6), (1ULL <<  6), (1ULL <<  7), (1ULL <<  7),
+	(1ULL <<  8), (1ULL <<  8), (1ULL <<  9), (1ULL <<  9), (1ULL << 10), (1ULL << 10), (1ULL << 11), (1ULL << 11),
+	(1ULL << 12), (1ULL << 12), (1ULL << 13), (1ULL << 13), (1ULL << 14), (1ULL << 14), (1ULL << 15), (1ULL << 15),
+	(1ULL << 16), (1ULL << 16), (1ULL << 17), (1ULL << 17), (1ULL << 18), (1ULL << 18), (1ULL << 19), (1ULL << 19),
+	(1ULL << 20), (1ULL << 20), (1ULL << 21), (1ULL << 21), (1ULL << 22), (1ULL << 22), (1ULL << 23), (1ULL << 23),
+	(1ULL << 24), (1ULL << 24), (1ULL << 25), (1ULL << 25), (1ULL << 26), (1ULL << 26), (1ULL << 27), (1ULL << 27),
+	(1ULL << 28), (1ULL << 28), (1ULL << 29), (1ULL << 29), (1ULL << 30), (1ULL << 30), (1ULL << 31), (1ULL << 31),
+	1.0 / (1ULL << 32), 1.0 / (1ULL << 32), 1.0 / (1ULL << 31), 1.0 / (1ULL << 31),
+	1.0 / (1ULL << 30), 1.0 / (1ULL << 30), 1.0 / (1ULL << 29), 1.0 / (1ULL << 29),
+	1.0 / (1ULL << 28), 1.0 / (1ULL << 28), 1.0 / (1ULL << 27), 1.0 / (1ULL << 27),
+	1.0 / (1ULL << 26), 1.0 / (1ULL << 26), 1.0 / (1ULL << 25), 1.0 / (1ULL << 25),
+	1.0 / (1ULL << 24), 1.0 / (1ULL << 24), 1.0 / (1ULL << 23), 1.0 / (1ULL << 23),
+	1.0 / (1ULL << 22), 1.0 / (1ULL << 22), 1.0 / (1ULL << 21), 1.0 / (1ULL << 21),
+	1.0 / (1ULL << 20), 1.0 / (1ULL << 20), 1.0 / (1ULL << 19), 1.0 / (1ULL << 19),
+	1.0 / (1ULL << 18), 1.0 / (1ULL << 18), 1.0 / (1ULL << 17), 1.0 / (1ULL << 17),
+	1.0 / (1ULL << 16), 1.0 / (1ULL << 16), 1.0 / (1ULL << 15), 1.0 / (1ULL << 15),
+	1.0 / (1ULL << 14), 1.0 / (1ULL << 14), 1.0 / (1ULL << 13), 1.0 / (1ULL << 13),
+	1.0 / (1ULL << 12), 1.0 / (1ULL << 12), 1.0 / (1ULL << 11), 1.0 / (1ULL << 11),
+	1.0 / (1ULL << 10), 1.0 / (1ULL << 10), 1.0 / (1ULL <<  9), 1.0 / (1ULL <<  9),
+	1.0 / (1ULL <<  8), 1.0 / (1ULL <<  8), 1.0 / (1ULL <<  7), 1.0 / (1ULL <<  7),
+	1.0 / (1ULL <<  6), 1.0 / (1ULL <<  6), 1.0 / (1ULL <<  5), 1.0 / (1ULL <<  5),
+	1.0 / (1ULL <<  4), 1.0 / (1ULL <<  4), 1.0 / (1ULL <<  3), 1.0 / (1ULL <<  3),
+	1.0 / (1ULL <<  2), 1.0 / (1ULL <<  2), 1.0 / (1ULL <<  1), 1.0 / (1ULL <<  1),
+};
+
+const float GC_ALIGNED16(m_dequantizeTableS[]) =
+{
+	1.0 / (1ULL <<  0), 1.0 / (1ULL <<  0), 1.0 / (1ULL <<  1), 1.0 / (1ULL <<  1),
+	1.0 / (1ULL <<  2), 1.0 / (1ULL <<  2), 1.0 / (1ULL <<  3), 1.0 / (1ULL <<  3),
+	1.0 / (1ULL <<  4), 1.0 / (1ULL <<  4), 1.0 / (1ULL <<  5), 1.0 / (1ULL <<  5),
+	1.0 / (1ULL <<  6), 1.0 / (1ULL <<  6), 1.0 / (1ULL <<  7), 1.0 / (1ULL <<  7),
+	1.0 / (1ULL <<  8), 1.0 / (1ULL <<  8), 1.0 / (1ULL <<  9), 1.0 / (1ULL <<  9),
+	1.0 / (1ULL << 10), 1.0 / (1ULL << 10), 1.0 / (1ULL << 11), 1.0 / (1ULL << 11),
+	1.0 / (1ULL << 12), 1.0 / (1ULL << 12), 1.0 / (1ULL << 13), 1.0 / (1ULL << 13),
+	1.0 / (1ULL << 14), 1.0 / (1ULL << 14), 1.0 / (1ULL << 15), 1.0 / (1ULL << 15),
+	1.0 / (1ULL << 16), 1.0 / (1ULL << 16), 1.0 / (1ULL << 17), 1.0 / (1ULL << 17),
+	1.0 / (1ULL << 18), 1.0 / (1ULL << 18), 1.0 / (1ULL << 19), 1.0 / (1ULL << 19),
+	1.0 / (1ULL << 20), 1.0 / (1ULL << 20), 1.0 / (1ULL << 21), 1.0 / (1ULL << 21),
+	1.0 / (1ULL << 22), 1.0 / (1ULL << 22), 1.0 / (1ULL << 23), 1.0 / (1ULL << 23),
+	1.0 / (1ULL << 24), 1.0 / (1ULL << 24), 1.0 / (1ULL << 25), 1.0 / (1ULL << 25),
+	1.0 / (1ULL << 26), 1.0 / (1ULL << 26), 1.0 / (1ULL << 27), 1.0 / (1ULL << 27),
+	1.0 / (1ULL << 28), 1.0 / (1ULL << 28), 1.0 / (1ULL << 29), 1.0 / (1ULL << 29),
+	1.0 / (1ULL << 30), 1.0 / (1ULL << 30), 1.0 / (1ULL << 31), 1.0 / (1ULL << 31),
+	(1ULL << 32), (1ULL << 32), (1ULL << 31), (1ULL << 31), (1ULL << 30), (1ULL << 30), (1ULL << 29), (1ULL << 29),
+	(1ULL << 28), (1ULL << 28), (1ULL << 27), (1ULL << 27), (1ULL << 26), (1ULL << 26), (1ULL << 25), (1ULL << 25),
+	(1ULL << 24), (1ULL << 24), (1ULL << 23), (1ULL << 23), (1ULL << 22), (1ULL << 22), (1ULL << 21), (1ULL << 21),
+	(1ULL << 20), (1ULL << 20), (1ULL << 19), (1ULL << 19), (1ULL << 18), (1ULL << 18), (1ULL << 17), (1ULL << 17),
+	(1ULL << 16), (1ULL << 16), (1ULL << 15), (1ULL << 15), (1ULL << 14), (1ULL << 14), (1ULL << 13), (1ULL << 13),
+	(1ULL << 12), (1ULL << 12), (1ULL << 11), (1ULL << 11), (1ULL << 10), (1ULL << 10), (1ULL <<  9), (1ULL <<  9),
+	(1ULL <<  8), (1ULL <<  8), (1ULL <<  7), (1ULL <<  7), (1ULL <<  6), (1ULL <<  6), (1ULL <<  5), (1ULL <<  5),
+	(1ULL <<  4), (1ULL <<  4), (1ULL <<  3), (1ULL <<  3), (1ULL <<  2), (1ULL <<  2), (1ULL <<  1), (1ULL <<  1),
+};
+
+const float GC_ALIGNED16(m_one[]) = { 1.0f, 0.0f, 0.0f, 0.0f };
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
new file mode 100644
index 0000000000..9f67ac4ffd
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
@@ -0,0 +1,54 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+
+extern const u8 GC_ALIGNED16(pbswapShuffle1x4[16]);
+extern const u8 GC_ALIGNED16(pbswapShuffle2x4[16]);
+extern const float GC_ALIGNED16(m_one[]);
+extern const float GC_ALIGNED16(m_quantizeTableS[]);
+extern const float GC_ALIGNED16(m_dequantizeTableS[]);
+
+class CommonAsmRoutinesBase
+{
+public:
+	const u8 *fifoDirectWrite8;
+	const u8 *fifoDirectWrite16;
+	const u8 *fifoDirectWrite32;
+	const u8 *fifoDirectWrite64;
+
+	const u8 *enterCode;
+
+	const u8 *dispatcherMispredictedBLR;
+	const u8 *dispatcher;
+	const u8 *dispatcherNoCheck;
+
+	const u8 *doTiming;
+
+	const u8 *frsqrte;
+	const u8 *fres;
+	const u8 *mfcr;
+
+	// In: array index: GQR to use.
+	// In: ECX: Address to read from.
+	// Out: XMM0: Bottom two 32-bit slots hold the read value,
+	//            converted to a pair of floats.
+	// Trashes: all three RSCRATCH
+	const u8 **pairedLoadQuantized;
+
+	// In: array index: GQR to use.
+	// In: ECX: Address to write to.
+	// In: XMM0: Bottom two 32-bit slots hold the pair of floats to be written.
+	// Out: Nothing.
+	// Trashes: all three RSCRATCH
+	const u8 **pairedStoreQuantized;
+
+	// In: array index: GQR to use.
+	// In: ECX: Address to write to.
+	// In: XMM0: Bottom 32-bit slot holds the float to be written.
+	const u8 **singleStoreQuantized;
+};
+
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
new file mode 100644
index 0000000000..81b22972f4
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
@@ -0,0 +1,190 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+
+#include "disasm.h"
+
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+using namespace Gen;
+
+static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress)
+{
+	u64 code_addr = (u64)codePtr;
+	disassembler disasm;
+	char disbuf[256];
+	memset(disbuf, 0, 256);
+	disasm.disasm64(0, code_addr, codePtr, disbuf);
+	PanicAlert("%s\n\n"
+		"Error encountered accessing emulated address %08x.\n"
+		"Culprit instruction: \n%s\nat %#" PRIx64,
+		text.c_str(), emAddress, disbuf, code_addr);
+	return;
+}
+
+// This generates some fairly heavy trampolines, but it doesn't really hurt.
+// Only instructions that access I/O will get these, and there won't be that
+// many of them in a typical program/game.
+bool Jitx86Base::HandleFault(uintptr_t access_address, SContext* ctx)
+{
+	// TODO: do we properly handle off-the-end?
+	if (access_address >= (uintptr_t)Memory::physical_base && access_address < (uintptr_t)Memory::physical_base + 0x100010000)
+		return BackPatch((u32)(access_address - (uintptr_t)Memory::physical_base), ctx);
+	if (access_address >= (uintptr_t)Memory::logical_base && access_address < (uintptr_t)Memory::logical_base + 0x100010000)
+		return BackPatch((u32)(access_address - (uintptr_t)Memory::logical_base), ctx);
+
+
+	return false;
+}
+
+bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx)
+{
+	u8* codePtr = (u8*) ctx->CTX_PC;
+
+	if (!IsInSpace(codePtr))
+		return false;  // this will become a regular crash real soon after this
+
+	InstructionInfo info = {};
+
+	if (!DisassembleMov(codePtr, &info))
+	{
+		BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress);
+		return false;
+	}
+
+	if (info.otherReg != RMEM)
+	{
+		PanicAlert("BackPatch : Base reg not RMEM."
+		           "\n\nAttempted to access %08x.", emAddress);
+		return false;
+	}
+
+	if (info.byteSwap && info.instructionSize < BACKPATCH_SIZE)
+	{
+		PanicAlert("BackPatch: MOVBE is too small");
+		return false;
+	}
+
+	auto it = registersInUseAtLoc.find(codePtr);
+	if (it == registersInUseAtLoc.end())
+	{
+		PanicAlert("BackPatch: no register use entry for address %p", codePtr);
+		return false;
+	}
+
+	BitSet32 registersInUse = it->second;
+
+	u8* exceptionHandler = nullptr;
+	if (jit->jo.memcheck)
+	{
+		auto it2 = exceptionHandlerAtLoc.find(codePtr);
+		if (it2 != exceptionHandlerAtLoc.end())
+			exceptionHandler = it2->second;
+	}
+
+	// Compute the start and length of the memory operation, including
+	// any byteswapping.
+	int totalSize;
+	u8 *start = codePtr;
+	if (!info.isMemoryWrite)
+	{
+		int bswapNopCount;
+		if (info.byteSwap || info.operandSize == 1)
+			bswapNopCount = 0;
+		// Check the following BSWAP for REX byte
+		else if ((codePtr[info.instructionSize] & 0xF0) == 0x40)
+			bswapNopCount = 3;
+		else
+			bswapNopCount = 2;
+
+		totalSize = info.instructionSize + bswapNopCount;
+		if (info.operandSize == 2 && !info.byteSwap)
+		{
+			if ((codePtr[totalSize] & 0xF0) == 0x40)
+			{
+				++totalSize;
+			}
+			if (codePtr[totalSize] != 0xc1 || codePtr[totalSize + 2] != 0x10)
+			{
+				PanicAlert("BackPatch: didn't find expected shift %p", codePtr);
+				return false;
+			}
+			info.signExtend = (codePtr[totalSize + 1] & 0x10) != 0;
+			totalSize += 3;
+		}
+	}
+	else
+	{
+		if (info.byteSwap || info.hasImmediate)
+		{
+			// The instruction is a MOVBE but it failed so the value is still in little-endian byte order.
+			totalSize = info.instructionSize;
+		}
+		else
+		{
+			// We entered here with a BSWAP-ed register. We'll have to swap it back.
+			u64 *ptr = ContextRN(ctx, info.regOperandReg);
+			int bswapSize = 0;
+			switch (info.operandSize)
+			{
+			case 1:
+				bswapSize = 0;
+				break;
+			case 2:
+				bswapSize = 4 + (info.regOperandReg >= 8 ? 1 : 0);
+				*ptr = Common::swap16((u16) *ptr);
+				break;
+			case 4:
+				bswapSize = 2 + (info.regOperandReg >= 8 ? 1 : 0);
+				*ptr = Common::swap32((u32) *ptr);
+				break;
+			case 8:
+				bswapSize = 3;
+				*ptr = Common::swap64(*ptr);
+				break;
+			}
+			start = codePtr - bswapSize;
+			totalSize = info.instructionSize + bswapSize;
+		}
+	}
+
+	// In the trampoline code, we jump back into the block at the beginning
+	// of the next instruction. The next instruction comes immediately
+	// after the backpatched operation, or BACKPATCH_SIZE bytes after the start
+	// of the backpatched operation, whichever comes last. (The JIT inserts NOPs
+	// into the original code if necessary to ensure there is enough space
+	// to insert the backpatch jump.)
+	int padding = totalSize > BACKPATCH_SIZE ? totalSize - BACKPATCH_SIZE : 0;
+	u8* returnPtr = start + 5 + padding;
+
+	// Generate the trampoline.
+	const u8* trampoline;
+	if (info.isMemoryWrite)
+	{
+		// TODO: special case FIFO writes.
+		auto it3 = pcAtLoc.find(codePtr);
+		if (it3 == pcAtLoc.end())
+		{
+			PanicAlert("BackPatch: no pc entry for address %p", codePtr);
+			return false;
+		}
+
+		u32 pc = it3->second;
+		trampoline = trampolines.GenerateWriteTrampoline(info, registersInUse, exceptionHandler, returnPtr, pc);
+	}
+	else
+	{
+		trampoline = trampolines.GenerateReadTrampoline(info, registersInUse, exceptionHandler, returnPtr);
+	}
+
+	// Patch the original memory operation.
+	XEmitter emitter(start);
+	emitter.JMP(trampoline, true);
+	for (int i = 0; i < padding; ++i)
+		emitter.INT3();
+	ctx->CTX_PC = (u64)start;
+
+	return true;
+}
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
new file mode 100644
index 0000000000..314cf0e580
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
@@ -0,0 +1,88 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <string>
+
+#include "disasm.h"
+
+#include "Common/GekkoDisassembler.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+JitBase *jit;
+
+void Jit(u32 em_address)
+{
+	jit->Jit(em_address);
+}
+
+u32 Helper_Mask(u8 mb, u8 me)
+{
+	u32 mask = ((u32)-1 >> mb) ^ (me >= 31 ? 0 : (u32)-1 >> (me + 1));
+	return mb > me ? ~mask : mask;
+}
+
+void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *normalEntry, JitBlock *b)
+{
+	for (int i = 0; i < size; i++)
+	{
+		const PPCAnalyst::CodeOp &op = code_buffer->codebuffer[i];
+		std::string temp = StringFromFormat("%08x %s", op.address, GekkoDisassembler::Disassemble(op.inst.hex, op.address).c_str());
+		DEBUG_LOG(DYNA_REC, "IR_X86 PPC: %s\n", temp.c_str());
+	}
+
+	disassembler x64disasm;
+	x64disasm.set_syntax_intel();
+
+	u64 disasmPtr = (u64)normalEntry;
+	const u8 *end = normalEntry + b->codeSize;
+
+	while ((u8*)disasmPtr < end)
+	{
+		char sptr[1000] = "";
+		disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
+		DEBUG_LOG(DYNA_REC,"IR_X86 x86: %s", sptr);
+	}
+
+	if (b->codeSize <= 250)
+	{
+		std::stringstream ss;
+		ss << std::hex;
+		for (u8 i = 0; i <= b->codeSize; i++)
+		{
+			ss.width(2);
+			ss.fill('0');
+			ss << (u32)*(normalEntry + i);
+		}
+		DEBUG_LOG(DYNA_REC,"IR_X86 bin: %s\n\n\n", ss.str().c_str());
+	}
+}
+
+bool JitBase::MergeAllowedNextInstructions(int count)
+{
+	if (PowerPC::GetState() == PowerPC::CPU_STEPPING || js.instructionsLeft < count)
+		return false;
+	// Be careful: a breakpoint kills flags in between instructions
+	for (int i = 1; i <= count; i++)
+	{
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging &&
+			PowerPC::breakpoints.IsAddressBreakPoint(js.op[i].address))
+			return false;
+		if (js.op[i].isBranchTarget)
+			return false;
+	}
+	return true;
+}
+
+void JitBase::UpdateMemoryOptions()
+{
+	bool any_watchpoints = PowerPC::memchecks.HasAny();
+	jo.fastmem = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem &&
+	             !any_watchpoints;
+	jo.memcheck = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU ||
+	              any_watchpoints;
+	jo.alwaysUseMemFuncs = any_watchpoints;
+
+}
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
new file mode 100644
index 0000000000..8476a6dbb5
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
@@ -0,0 +1,159 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+//#define JIT_LOG_X86     // Enables logging of the generated x86 code
+//#define JIT_LOG_GPR     // Enables logging of the PPC general purpose regs
+//#define JIT_LOG_FPR     // Enables logging of the PPC floating point regs
+
+#include <unordered_set>
+
+#include "Common/x64ABI.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/MachineContext.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+#include "Core/PowerPC/JitCommon/TrampolineCache.h"
+
+// TODO: find a better place for x86-specific stuff
+// The following register assignments are common to Jit64 and Jit64IL:
+// RSCRATCH and RSCRATCH2 are always scratch registers and can be used without
+// limitation.
+#define RSCRATCH RAX
+#define RSCRATCH2 RDX
+// RSCRATCH_EXTRA may be in the allocation order, so it has to be flushed
+// before use.
+#define RSCRATCH_EXTRA RCX
+// RMEM points to the start of emulated memory.
+#define RMEM RBX
+// RPPCSTATE points to ppcState + 0x80.  It's offset because we want to be able
+// to address as much as possible in a one-byte offset form.
+#define RPPCSTATE RBP
+
+namespace Gen
+{
+
+inline OpArg MPIC(const void* address, X64Reg scale_reg, int scale = SCALE_1)
+{
+	ptrdiff_t offset = PPCSTATE_OFS(address);
+	_dbg_assert_(DYNA_REC, FitsInS32(offset));
+	return MComplex(RPPCSTATE, scale_reg, scale, offset);
+}
+
+}
+
+// Use these to control the instruction selection
+// #define INSTRUCTION_START FallBackToInterpreter(inst); return;
+// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
+#define INSTRUCTION_START
+
+#define FALLBACK_IF(cond) do { if (cond) { FallBackToInterpreter(inst); return; } } while (0)
+
+#define JITDISABLE(setting) FALLBACK_IF(SConfig::GetInstance().m_LocalCoreStartupParameter.bJITOff || \
+                                        SConfig::GetInstance().m_LocalCoreStartupParameter.setting)
+
+class JitBase : public CPUCoreBase
+{
+protected:
+	struct JitOptions
+	{
+		bool enableBlocklink;
+		bool optimizeGatherPipe;
+		bool accurateSinglePrecision;
+		bool fastmem;
+		bool memcheck;
+		bool alwaysUseMemFuncs;
+	};
+	struct JitState
+	{
+		u32 compilerPC;
+		u32 blockStart;
+		int instructionNumber;
+		int instructionsLeft;
+		int downcountAmount;
+		u32 numLoadStoreInst;
+		u32 numFloatingPointInst;
+		// If this is set, we need to generate an exception handler for the fastmem load.
+		u8* fastmemLoadStore;
+		// If this is set, a load or store already prepared a jump to the exception handler for us,
+		// so just fixup that branch instead of testing for a DSI again.
+		bool fixupExceptionHandler;
+		Gen::FixupBranch exceptionHandler;
+		// If these are set, we've stored the old value of a register which will be loaded in revertLoad,
+		// which lets us revert it on the exception path.
+		int revertGprLoad;
+		int revertFprLoad;
+
+		bool assumeNoPairedQuantize;
+		bool firstFPInstructionFound;
+		bool isLastInstruction;
+		int skipInstructions;
+		bool carryFlagSet;
+		bool carryFlagInverted;
+
+		int fifoBytesThisBlock;
+
+		PPCAnalyst::BlockStats st;
+		PPCAnalyst::BlockRegStats gpa;
+		PPCAnalyst::BlockRegStats fpa;
+		PPCAnalyst::CodeOp* op;
+		u8* rewriteStart;
+
+		JitBlock *curBlock;
+
+		std::unordered_set<u32> fifoWriteAddresses;
+		std::unordered_set<u32> pairedQuantizeAddresses;
+	};
+
+	PPCAnalyst::CodeBlock code_block;
+	PPCAnalyst::PPCAnalyzer analyzer;
+
+	bool MergeAllowedNextInstructions(int count);
+
+	void UpdateMemoryOptions();
+
+public:
+	// This should probably be removed from public:
+	JitOptions jo;
+	JitState js;
+
+	virtual JitBaseBlockCache *GetBlockCache() = 0;
+
+	virtual void Jit(u32 em_address) = 0;
+
+	virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0;
+
+	virtual bool HandleFault(uintptr_t access_address, SContext* ctx) = 0;
+};
+
+class Jitx86Base : public JitBase, public EmuCodeBlock
+{
+protected:
+	bool BackPatch(u32 emAddress, SContext* ctx);
+	JitBlockCache blocks;
+	TrampolineCache trampolines;
+public:
+	JitBlockCache *GetBlockCache() override { return &blocks; }
+	bool HandleFault(uintptr_t access_address, SContext* ctx) override;
+};
+
+extern JitBase *jit;
+
+void Jit(u32 em_address);
+
+// Merged routines that should be moved somewhere better
+u32 Helper_Mask(u8 mb, u8 me);
+void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *normalEntry, JitBlock *b);
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
new file mode 100644
index 0000000000..1a4bfc5957
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
@@ -0,0 +1,337 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Enable define below to enable oprofile integration. For this to work,
+// it requires at least oprofile version 0.9.4, and changing the build
+// system to link the Dolphin executable against libopagent.  Since the
+// dependency is a little inconvenient and this is possibly a slight
+// performance hit, it's not enabled by default, but it's useful for
+// locating performance issues.
+
+#include "disasm.h"
+
+#include "Common/CommonTypes.h"
+#include "Common/JitRegister.h"
+#include "Common/MemoryUtil.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+using namespace Gen;
+
+	bool JitBaseBlockCache::IsFull() const
+	{
+		return GetNumBlocks() >= MAX_NUM_BLOCKS - 1;
+	}
+
+	void JitBaseBlockCache::Init()
+	{
+		if (m_initialized)
+		{
+			PanicAlert("JitBaseBlockCache::Init() - iCache is already initialized");
+			return;
+		}
+
+		JitRegister::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_perfDir);
+
+		iCache.fill(JIT_ICACHE_INVALID_BYTE);
+		iCacheEx.fill(JIT_ICACHE_INVALID_BYTE);
+		iCacheVMEM.fill(JIT_ICACHE_INVALID_BYTE);
+		Clear();
+
+		m_initialized = true;
+	}
+
+	void JitBaseBlockCache::Shutdown()
+	{
+		num_blocks = 0;
+		m_initialized = false;
+
+		JitRegister::Shutdown();
+	}
+
+	// This clears the JIT cache. It's called from JitCache.cpp when the JIT cache
+	// is full and when saving and loading states.
+	void JitBaseBlockCache::Clear()
+	{
+#if defined(_DEBUG) || defined(DEBUGFAST)
+		if (IsFull())
+			Core::DisplayMessage("Clearing block cache.", 3000);
+		else
+			Core::DisplayMessage("Clearing code cache.", 3000);
+#endif
+		jit->js.fifoWriteAddresses.clear();
+		jit->js.pairedQuantizeAddresses.clear();
+		for (int i = 0; i < num_blocks; i++)
+		{
+			DestroyBlock(i, false);
+		}
+		links_to.clear();
+		block_map.clear();
+
+		valid_block.ClearAll();
+
+		num_blocks = 0;
+		blockCodePointers.fill(nullptr);
+	}
+
+	void JitBaseBlockCache::Reset()
+	{
+		Shutdown();
+		Init();
+	}
+
+	JitBlock *JitBaseBlockCache::GetBlock(int no)
+	{
+		return &blocks[no];
+	}
+
+	int JitBaseBlockCache::GetNumBlocks() const
+	{
+		return num_blocks;
+	}
+
+	bool JitBaseBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const
+	{
+		// check if any endpoint is inside the other range
+		if ((s1 >= s2 && s1 <= e2) ||
+		    (e1 >= s2 && e1 <= e2) ||
+		    (s2 >= s1 && s2 <= e1) ||
+		    (e2 >= s1 && e2 <= e1))
+			return true;
+		else
+			return false;
+	}
+
+	int JitBaseBlockCache::AllocateBlock(u32 em_address)
+	{
+		JitBlock &b = blocks[num_blocks];
+		b.invalid = false;
+		b.originalAddress = em_address;
+		b.linkData.clear();
+		num_blocks++; //commit the current block
+		return num_blocks - 1;
+	}
+
+	void JitBaseBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr)
+	{
+		blockCodePointers[block_num] = code_ptr;
+		JitBlock &b = blocks[block_num];
+		u32* icp = GetICachePtr(b.originalAddress);
+		*icp = block_num;
+
+		// Convert the logical address to a physical address for the block map
+		u32 pAddr = b.originalAddress & 0x1FFFFFFF;
+
+		for (u32 block = pAddr / 32; block <= (pAddr + (b.originalSize - 1) * 4) / 32; ++block)
+			valid_block.Set(block);
+
+		block_map[std::make_pair(pAddr + 4 * b.originalSize - 1, pAddr)] = block_num;
+
+		if (block_link)
+		{
+			for (const auto& e : b.linkData)
+			{
+				links_to.insert(std::pair<u32, int>(e.exitAddress, block_num));
+			}
+
+			LinkBlock(block_num);
+			LinkBlockExits(block_num);
+		}
+
+		JitRegister::Register(blockCodePointers[block_num], b.codeSize,
+			"JIT_PPC_%08x", b.originalAddress);
+	}
+
+	const u8 **JitBaseBlockCache::GetCodePointers()
+	{
+		return blockCodePointers.data();
+	}
+
+	u32* JitBaseBlockCache::GetICachePtr(u32 addr)
+	{
+		if (addr & JIT_ICACHE_VMEM_BIT)
+			return (u32*)(&jit->GetBlockCache()->iCacheVMEM[addr & JIT_ICACHE_MASK]);
+		else if (addr & JIT_ICACHE_EXRAM_BIT)
+			return (u32*)(&jit->GetBlockCache()->iCacheEx[addr & JIT_ICACHEEX_MASK]);
+		else
+			return (u32*)(&jit->GetBlockCache()->iCache[addr & JIT_ICACHE_MASK]);
+	}
+
+	int JitBaseBlockCache::GetBlockNumberFromStartAddress(u32 addr)
+	{
+		u32 inst = *GetICachePtr(addr);
+		if (inst & 0xfc000000) // definitely not a JIT block
+			return -1;
+
+		if ((int)inst >= num_blocks)
+			return -1;
+
+		if (blocks[inst].originalAddress != addr)
+			return -1;
+
+		return inst;
+	}
+
+	CompiledCode JitBaseBlockCache::GetCompiledCodeFromBlock(int block_num)
+	{
+		return (CompiledCode)blockCodePointers[block_num];
+	}
+
+	//Block linker
+	//Make sure to have as many blocks as possible compiled before calling this
+	//It's O(N), so it's fast :)
+	//Can be faster by doing a queue for blocks to link up, and only process those
+	//Should probably be done
+
+	void JitBaseBlockCache::LinkBlockExits(int i)
+	{
+		JitBlock &b = blocks[i];
+		if (b.invalid)
+		{
+			// This block is dead. Don't relink it.
+			return;
+		}
+		for (auto& e : b.linkData)
+		{
+			if (!e.linkStatus)
+			{
+				int destinationBlock = GetBlockNumberFromStartAddress(e.exitAddress);
+				if (destinationBlock != -1)
+				{
+					WriteLinkBlock(e.exitPtrs, blocks[destinationBlock].checkedEntry);
+					e.linkStatus = true;
+				}
+			}
+		}
+	}
+
+	void JitBaseBlockCache::LinkBlock(int i)
+	{
+		LinkBlockExits(i);
+		JitBlock &b = blocks[i];
+		// equal_range(b) returns pair<iterator,iterator> representing the range
+		// of element with key b
+		auto ppp = links_to.equal_range(b.originalAddress);
+
+		if (ppp.first == ppp.second)
+			return;
+
+		for (auto iter = ppp.first; iter != ppp.second; ++iter)
+		{
+			// PanicAlert("Linking block %i to block %i", iter->second, i);
+			LinkBlockExits(iter->second);
+		}
+	}
+
+	void JitBaseBlockCache::UnlinkBlock(int i)
+	{
+		JitBlock &b = blocks[i];
+		auto ppp = links_to.equal_range(b.originalAddress);
+
+		if (ppp.first == ppp.second)
+			return;
+
+		for (auto iter = ppp.first; iter != ppp.second; ++iter)
+		{
+			JitBlock &sourceBlock = blocks[iter->second];
+			for (auto& e : sourceBlock.linkData)
+			{
+				if (e.exitAddress == b.originalAddress)
+					e.linkStatus = false;
+			}
+		}
+		links_to.erase(b.originalAddress);
+	}
+
+	void JitBaseBlockCache::DestroyBlock(int block_num, bool invalidate)
+	{
+		if (block_num < 0 || block_num >= num_blocks)
+		{
+			PanicAlert("DestroyBlock: Invalid block number %d", block_num);
+			return;
+		}
+		JitBlock &b = blocks[block_num];
+		if (b.invalid)
+		{
+			if (invalidate)
+				PanicAlert("Invalidating invalid block %d", block_num);
+			return;
+		}
+		b.invalid = true;
+		*GetICachePtr(b.originalAddress) = JIT_ICACHE_INVALID_WORD;
+
+		UnlinkBlock(block_num);
+
+		// Send anyone who tries to run this block back to the dispatcher.
+		// Not entirely ideal, but .. pretty good.
+		// Spurious entrances from previously linked blocks can only come through checkedEntry
+		WriteDestroyBlock(b.checkedEntry, b.originalAddress);
+	}
+
+	void JitBaseBlockCache::InvalidateICache(u32 address, const u32 length, bool forced)
+	{
+		// Convert the logical address to a physical address for the block map
+		u32 pAddr = address & 0x1FFFFFFF;
+
+		// Optimize the common case of length == 32 which is used by Interpreter::dcb*
+		bool destroy_block = true;
+		if (length == 32)
+		{
+			if (!valid_block.Test(pAddr / 32))
+				destroy_block = false;
+			else
+				valid_block.Clear(pAddr / 32);
+		}
+
+		// destroy JIT blocks
+		// !! this works correctly under assumption that any two overlapping blocks end at the same address
+		if (destroy_block)
+		{
+			std::map<std::pair<u32,u32>, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1;
+			while (it2 != block_map.end() && it2->first.second < pAddr + length)
+			{
+				JitBlock &b = blocks[it2->second];
+				*GetICachePtr(b.originalAddress) = JIT_ICACHE_INVALID_WORD;
+				DestroyBlock(it2->second, true);
+				++it2;
+			}
+			if (it1 != it2)
+			{
+				block_map.erase(it1, it2);
+			}
+
+			// If the code was actually modified, we need to clear the relevant entries from the
+			// FIFO write address cache, so we don't end up with FIFO checks in places they shouldn't
+			// be (this can clobber flags, and thus break any optimization that relies on flags
+			// being in the right place between instructions).
+			if (!forced)
+			{
+				for (u32 i = address; i < address + length; i += 4)
+				{
+					jit->js.fifoWriteAddresses.erase(i);
+					jit->js.pairedQuantizeAddresses.erase(i);
+				}
+			}
+		}
+	}
+
+	void JitBlockCache::WriteLinkBlock(u8* location, const u8* address)
+	{
+		XEmitter emit(location);
+		if (*location == 0xE8)
+			emit.CALL(address);
+		else
+			emit.JMP(address, true);
+	}
+
+	void JitBlockCache::WriteDestroyBlock(const u8* location, u32 address)
+	{
+		XEmitter emit((u8 *)location);
+		emit.MOV(32, PPCSTATE(pc), Imm32(address));
+		emit.JMP(jit->GetAsmRoutines()->dispatcher, true);
+	}
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/PowerPC/JitCommon/JitCache.h
new file mode 100644
index 0000000000..7e310f6a35
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.h
@@ -0,0 +1,168 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <bitset>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+
+// emulate CPU with unlimited instruction cache
+// the only way to invalidate a region is the "icbi" instruction
+#define JIT_UNLIMITED_ICACHE
+
+#define JIT_ICACHE_SIZE 0x2000000
+#define JIT_ICACHE_MASK 0x1ffffff
+#define JIT_ICACHEEX_SIZE 0x4000000
+#define JIT_ICACHEEX_MASK 0x3ffffff
+#define JIT_ICACHE_EXRAM_BIT 0x10000000
+#define JIT_ICACHE_VMEM_BIT 0x20000000
+// this corresponds to opcode 5 which is invalid in PowerPC
+#define JIT_ICACHE_INVALID_BYTE 0x80
+#define JIT_ICACHE_INVALID_WORD 0x80808080
+
+struct JitBlock
+{
+	const u8 *checkedEntry;
+	const u8 *normalEntry;
+
+	u32 originalAddress;
+	u32 codeSize;
+	u32 originalSize;
+	int runCount;  // for profiling.
+
+	bool invalid;
+
+	struct LinkData
+	{
+		u8 *exitPtrs;    // to be able to rewrite the exit jum
+		u32 exitAddress;
+		bool linkStatus; // is it already linked?
+	};
+	std::vector<LinkData> linkData;
+
+	// we don't really need to save start and stop
+	// TODO (mb2): ticStart and ticStop -> "local var" mean "in block" ... low priority ;)
+	u64 ticStart;   // for profiling - time.
+	u64 ticStop;    // for profiling - time.
+	u64 ticCounter; // for profiling - time.
+};
+
+typedef void (*CompiledCode)();
+
+// This is essentially just an std::bitset, but Visual Studia 2013's
+// implementation of std::bitset is slow.
+class ValidBlockBitSet final
+{
+	enum
+	{
+		VALID_BLOCK_MASK_SIZE = 0x20000000 / 32,
+		VALID_BLOCK_ALLOC_ELEMENTS = VALID_BLOCK_MASK_SIZE / 32
+	};
+	std::unique_ptr<u32[]> m_valid_block;
+
+public:
+	ValidBlockBitSet()
+	{
+		m_valid_block.reset(new u32[VALID_BLOCK_ALLOC_ELEMENTS]);
+		ClearAll();
+	}
+
+	void Set(u32 bit)
+	{
+		m_valid_block[bit / 32] |= 1u << (bit % 32);
+	}
+
+	void Clear(u32 bit)
+	{
+		m_valid_block[bit / 32] &= ~(1u << (bit % 32));
+	}
+
+	void ClearAll()
+	{
+		memset(m_valid_block.get(), 0, sizeof(u32) * VALID_BLOCK_ALLOC_ELEMENTS);
+	}
+
+	bool Test(u32 bit)
+	{
+		return (m_valid_block[bit / 32] & (1u << (bit % 32))) != 0;
+	}
+};
+
+class JitBaseBlockCache
+{
+	enum
+	{
+		MAX_NUM_BLOCKS = 65536 * 2,
+	};
+
+	std::array<const u8*, MAX_NUM_BLOCKS> blockCodePointers;
+	std::array<JitBlock, MAX_NUM_BLOCKS> blocks;
+	int num_blocks;
+	std::multimap<u32, int> links_to;
+	std::map<std::pair<u32, u32>, u32> block_map; // (end_addr, start_addr) -> number
+	ValidBlockBitSet valid_block;
+
+	bool m_initialized;
+
+	bool RangeIntersect(int s1, int e1, int s2, int e2) const;
+	void LinkBlockExits(int i);
+	void LinkBlock(int i);
+	void UnlinkBlock(int i);
+
+	u32* GetICachePtr(u32 addr);
+	void DestroyBlock(int block_num, bool invalidate);
+
+	// Virtual for overloaded
+	virtual void WriteLinkBlock(u8* location, const u8* address) = 0;
+	virtual void WriteDestroyBlock(const u8* location, u32 address) = 0;
+
+public:
+	JitBaseBlockCache() : num_blocks(0), m_initialized(false)
+	{
+	}
+
+	virtual ~JitBaseBlockCache()
+	{
+	}
+
+	int AllocateBlock(u32 em_address);
+	void FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr);
+
+	void Clear();
+	void Init();
+	void Shutdown();
+	void Reset();
+
+	bool IsFull() const;
+
+	// Code Cache
+	JitBlock *GetBlock(int block_num);
+	int GetNumBlocks() const;
+	const u8 **GetCodePointers();
+	std::array<u8, JIT_ICACHE_SIZE>   iCache;
+	std::array<u8, JIT_ICACHEEX_SIZE> iCacheEx;
+	std::array<u8, JIT_ICACHE_SIZE>   iCacheVMEM;
+
+	// Fast way to get a block. Only works on the first ppc instruction of a block.
+	int GetBlockNumberFromStartAddress(u32 em_address);
+
+	CompiledCode GetCompiledCodeFromBlock(int block_num);
+
+	// DOES NOT WORK CORRECTLY WITH INLINING
+	void InvalidateICache(u32 address, const u32 length, bool forced);
+};
+
+// x86 BlockCache
+class JitBlockCache : public JitBaseBlockCache
+{
+private:
+	void WriteLinkBlock(u8* location, const u8* address) override;
+	void WriteDestroyBlock(const u8* location, u32 address) override;
+};
diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
new file mode 100644
index 0000000000..404c673d20
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
@@ -0,0 +1,1069 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/Intrinsics.h"
+#include "Common/MathUtil.h"
+
+#include "Core/HW/MMIO.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+using namespace Gen;
+
+void EmuCodeBlock::MemoryExceptionCheck()
+{
+	if (jit->jo.memcheck && !jit->js.fastmemLoadStore && !jit->js.fixupExceptionHandler)
+	{
+		TEST(32, PPCSTATE(Exceptions), Gen::Imm32(EXCEPTION_DSI));
+		jit->js.exceptionHandler = J_CC(Gen::CC_NZ, true);
+		jit->js.fixupExceptionHandler = true;
+	}
+}
+
+void EmuCodeBlock::UnsafeLoadRegToReg(X64Reg reg_addr, X64Reg reg_value, int accessSize, s32 offset, bool signExtend)
+{
+	MOVZX(32, accessSize, reg_value, MComplex(RMEM, reg_addr, SCALE_1, offset));
+	if (accessSize == 32)
+	{
+		BSWAP(32, reg_value);
+	}
+	else if (accessSize == 16)
+	{
+		BSWAP(32, reg_value);
+		if (signExtend)
+			SAR(32, R(reg_value), Imm8(16));
+		else
+			SHR(32, R(reg_value), Imm8(16));
+	}
+	else if (signExtend)
+	{
+		// TODO: bake 8-bit into the original load.
+		MOVSX(32, accessSize, reg_value, R(reg_value));
+	}
+}
+
+void EmuCodeBlock::UnsafeLoadRegToRegNoSwap(X64Reg reg_addr, X64Reg reg_value, int accessSize, s32 offset, bool signExtend)
+{
+	if (signExtend)
+		MOVSX(32, accessSize, reg_value, MComplex(RMEM, reg_addr, SCALE_1, offset));
+	else
+		MOVZX(32, accessSize, reg_value, MComplex(RMEM, reg_addr, SCALE_1, offset));
+}
+
+u8 *EmuCodeBlock::UnsafeLoadToReg(X64Reg reg_value, OpArg opAddress, int accessSize, s32 offset, bool signExtend)
+{
+	u8 *result;
+	OpArg memOperand;
+	if (opAddress.IsSimpleReg())
+	{
+		// Deal with potential wraparound.  (This is just a heuristic, and it would
+		// be more correct to actually mirror the first page at the end, but the
+		// only case where it probably actually matters is JitIL turning adds into
+		// offsets with the wrong sign, so whatever.  Since the original code
+		// *could* try to wrap an address around, however, this is the correct
+		// place to address the issue.)
+		if ((u32) offset >= 0x1000)
+		{
+			LEA(32, reg_value, MDisp(opAddress.GetSimpleReg(), offset));
+			opAddress = R(reg_value);
+			offset = 0;
+		}
+		memOperand = MComplex(RMEM, opAddress.GetSimpleReg(), SCALE_1, offset);
+	}
+	else if (opAddress.IsImm())
+	{
+		MOV(32, R(reg_value), Imm32((u32)(opAddress.Imm32() + offset)));
+		memOperand = MRegSum(RMEM, reg_value);
+	}
+	else
+	{
+		MOV(32, R(reg_value), opAddress);
+		memOperand = MComplex(RMEM, reg_value, SCALE_1, offset);
+	}
+
+	result = GetWritableCodePtr();
+	if (accessSize == 8 && signExtend)
+		MOVSX(32, accessSize, reg_value, memOperand);
+	else
+		MOVZX(64, accessSize, reg_value, memOperand);
+
+	switch (accessSize)
+	{
+	case 8:
+		_dbg_assert_(DYNA_REC, BACKPATCH_SIZE - (GetCodePtr() - result <= 0));
+		break;
+
+	case 16:
+		BSWAP(32, reg_value);
+		if (signExtend)
+			SAR(32, R(reg_value), Imm8(16));
+		else
+			SHR(32, R(reg_value), Imm8(16));
+		break;
+
+	case 32:
+		BSWAP(32, reg_value);
+		break;
+
+	case 64:
+		BSWAP(64, reg_value);
+		break;
+	}
+
+	return result;
+}
+
+// Visitor that generates code to read a MMIO value.
+template <typename T>
+class MMIOReadCodeGenerator : public MMIO::ReadHandlingMethodVisitor<T>
+{
+public:
+	MMIOReadCodeGenerator(Gen::X64CodeBlock* code, BitSet32 registers_in_use,
+	                      Gen::X64Reg dst_reg, u32 address, bool sign_extend)
+		: m_code(code), m_registers_in_use(registers_in_use), m_dst_reg(dst_reg),
+		  m_address(address), m_sign_extend(sign_extend)
+	{
+	}
+
+	virtual void VisitConstant(T value)
+	{
+		LoadConstantToReg(8 * sizeof (T), value);
+	}
+	virtual void VisitDirect(const T* addr, u32 mask)
+	{
+		LoadAddrMaskToReg(8 * sizeof (T), addr, mask);
+	}
+	virtual void VisitComplex(const std::function<T(u32)>* lambda)
+	{
+		CallLambda(8 * sizeof (T), lambda);
+	}
+
+private:
+	// Generates code to load a constant to the destination register. In
+	// practice it would be better to avoid using a register for this, but it
+	// would require refactoring a lot of JIT code.
+	void LoadConstantToReg(int sbits, u32 value)
+	{
+		if (m_sign_extend)
+		{
+			u32 sign = !!(value & (1 << (sbits - 1)));
+			value |= sign * ((0xFFFFFFFF >> sbits) << sbits);
+		}
+		m_code->MOV(32, R(m_dst_reg), Gen::Imm32(value));
+	}
+
+	// Generate the proper MOV instruction depending on whether the read should
+	// be sign extended or zero extended.
+	void MoveOpArgToReg(int sbits, const Gen::OpArg& arg)
+	{
+		if (m_sign_extend)
+			m_code->MOVSX(32, sbits, m_dst_reg, arg);
+		else
+			m_code->MOVZX(32, sbits, m_dst_reg, arg);
+	}
+
+	void LoadAddrMaskToReg(int sbits, const void* ptr, u32 mask)
+	{
+		m_code->MOV(64, R(RSCRATCH), ImmPtr(ptr));
+		// If we do not need to mask, we can do the sign extend while loading
+		// from memory. If masking is required, we have to first zero extend,
+		// then mask, then sign extend if needed (1 instr vs. 2/3).
+		u32 all_ones = (1ULL << sbits) - 1;
+		if ((all_ones & mask) == all_ones)
+		{
+			MoveOpArgToReg(sbits, MatR(RSCRATCH));
+		}
+		else
+		{
+			m_code->MOVZX(32, sbits, m_dst_reg, MatR(RSCRATCH));
+			m_code->AND(32, R(m_dst_reg), Imm32(mask));
+			if (m_sign_extend)
+				m_code->MOVSX(32, sbits, m_dst_reg, R(m_dst_reg));
+		}
+	}
+
+	void CallLambda(int sbits, const std::function<T(u32)>* lambda)
+	{
+		m_code->ABI_PushRegistersAndAdjustStack(m_registers_in_use, 0);
+		m_code->ABI_CallLambdaC(lambda, m_address);
+		m_code->ABI_PopRegistersAndAdjustStack(m_registers_in_use, 0);
+		MoveOpArgToReg(sbits, R(ABI_RETURN));
+	}
+
+	Gen::X64CodeBlock* m_code;
+	BitSet32 m_registers_in_use;
+	Gen::X64Reg m_dst_reg;
+	u32 m_address;
+	bool m_sign_extend;
+};
+
+void EmuCodeBlock::MMIOLoadToReg(MMIO::Mapping* mmio, Gen::X64Reg reg_value,
+                                 BitSet32 registers_in_use, u32 address,
+                                 int access_size, bool sign_extend)
+{
+	switch (access_size)
+	{
+	case 8:
+		{
+			MMIOReadCodeGenerator<u8> gen(this, registers_in_use, reg_value,
+			                              address, sign_extend);
+			mmio->GetHandlerForRead<u8>(address).Visit(gen);
+			break;
+		}
+	case 16:
+		{
+			MMIOReadCodeGenerator<u16> gen(this, registers_in_use, reg_value,
+			                               address, sign_extend);
+			mmio->GetHandlerForRead<u16>(address).Visit(gen);
+			break;
+		}
+	case 32:
+		{
+			MMIOReadCodeGenerator<u32> gen(this, registers_in_use, reg_value,
+			                               address, sign_extend);
+			mmio->GetHandlerForRead<u32>(address).Visit(gen);
+			break;
+		}
+	}
+}
+
+FixupBranch EmuCodeBlock::CheckIfSafeAddress(const OpArg& reg_value, X64Reg reg_addr, BitSet32 registers_in_use, u32 mem_mask)
+{
+	registers_in_use[reg_addr] = true;
+	if (reg_value.IsSimpleReg())
+		registers_in_use[reg_value.GetSimpleReg()] = true;
+
+	// Get ourselves a free register; try to pick one that doesn't involve pushing, if we can.
+	X64Reg scratch = RSCRATCH;
+	if (!registers_in_use[RSCRATCH])
+		scratch = RSCRATCH;
+	else if (!registers_in_use[RSCRATCH_EXTRA])
+		scratch = RSCRATCH_EXTRA;
+	else
+		scratch = reg_addr;
+
+	// On Gamecube games with MMU, do a little bit of extra work to make sure we're not accessing the
+	// 0x81800000 to 0x83FFFFFF range.
+	// It's okay to take a shortcut and not check this range on non-MMU games, since we're already
+	// assuming they'll never do an invalid memory access.
+	// The slightly more complex check needed for Wii games using the space just above MEM1 isn't
+	// implemented here yet, since there are no known working Wii MMU games to test it with.
+	if (jit->jo.memcheck && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		if (scratch == reg_addr)
+			PUSH(scratch);
+		else
+			MOV(32, R(scratch), R(reg_addr));
+		AND(32, R(scratch), Imm32(0x3FFFFFFF));
+		CMP(32, R(scratch), Imm32(0x01800000));
+		if (scratch == reg_addr)
+			POP(scratch);
+		return J_CC(CC_AE, farcode.Enabled());
+	}
+	else
+	{
+		TEST(32, R(reg_addr), Imm32(mem_mask));
+		return J_CC(CC_NZ, farcode.Enabled());
+	}
+}
+
+void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg & opAddress, int accessSize, s32 offset, BitSet32 registersInUse, bool signExtend, int flags)
+{
+	registersInUse[reg_value] = false;
+	if (jit->jo.fastmem &&
+	    !opAddress.IsImm() &&
+	    !(flags & (SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_FASTMEM)))
+	{
+		u8 *mov = UnsafeLoadToReg(reg_value, opAddress, accessSize, offset, signExtend);
+
+		registersInUseAtLoc[mov] = registersInUse;
+		jit->js.fastmemLoadStore = mov;
+		return;
+	}
+
+	u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
+
+	// The following masks the region used by the GC/Wii virtual memory lib
+	mem_mask |= Memory::ADDR_MASK_MEM1;
+
+	if (opAddress.IsImm())
+	{
+		u32 address = opAddress.Imm32() + offset;
+
+		// If the address is known to be RAM, just load it directly.
+		if (PowerPC::IsOptimizableRAMAddress(address))
+		{
+			UnsafeLoadToReg(reg_value, opAddress, accessSize, offset, signExtend);
+			return;
+		}
+
+		// If the address maps to an MMIO register, inline MMIO read code.
+		u32 mmioAddress = PowerPC::IsOptimizableMMIOAccess(address, accessSize);
+		if (accessSize != 64 && mmioAddress)
+		{
+			MMIOLoadToReg(Memory::mmio_mapping, reg_value, registersInUse,
+			              mmioAddress, accessSize, signExtend);
+			return;
+		}
+
+		// Fall back to general-case code.
+		ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+		switch (accessSize)
+		{
+		case 64: ABI_CallFunctionC((void *)&PowerPC::Read_U64, address); break;
+		case 32: ABI_CallFunctionC((void *)&PowerPC::Read_U32, address); break;
+		case 16: ABI_CallFunctionC((void *)&PowerPC::Read_U16_ZX, address); break;
+		case 8:  ABI_CallFunctionC((void *)&PowerPC::Read_U8_ZX, address); break;
+		}
+		ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+
+		MemoryExceptionCheck();
+		if (signExtend && accessSize < 32)
+		{
+			// Need to sign extend values coming from the Read_U* functions.
+			MOVSX(32, accessSize, reg_value, R(ABI_RETURN));
+		}
+		else if (reg_value != ABI_RETURN)
+		{
+			MOVZX(64, accessSize, reg_value, R(ABI_RETURN));
+		}
+
+		return;
+	}
+
+	_assert_msg_(DYNA_REC, opAddress.IsSimpleReg(), "Incorrect use of SafeLoadToReg (address isn't register or immediate)");
+	X64Reg reg_addr = opAddress.GetSimpleReg();
+	if (offset)
+	{
+		reg_addr = RSCRATCH;
+		LEA(32, RSCRATCH, MDisp(opAddress.GetSimpleReg(), offset));
+	}
+
+	FixupBranch exit;
+	if (!jit->jo.alwaysUseMemFuncs)
+	{
+		FixupBranch slow = CheckIfSafeAddress(R(reg_value), reg_addr, registersInUse, mem_mask);
+		UnsafeLoadToReg(reg_value, R(reg_addr), accessSize, 0, signExtend);
+		if (farcode.Enabled())
+			SwitchToFarCode();
+		else
+			exit = J(true);
+		SetJumpTarget(slow);
+	}
+	size_t rsp_alignment = (flags & SAFE_LOADSTORE_NO_PROLOG) ? 8 : 0;
+	ABI_PushRegistersAndAdjustStack(registersInUse, rsp_alignment);
+	switch (accessSize)
+	{
+	case 64:
+		ABI_CallFunctionR((void *)&PowerPC::Read_U64, reg_addr);
+		break;
+	case 32:
+		ABI_CallFunctionR((void *)&PowerPC::Read_U32, reg_addr);
+		break;
+	case 16:
+		ABI_CallFunctionR((void *)&PowerPC::Read_U16_ZX, reg_addr);
+		break;
+	case 8:
+		ABI_CallFunctionR((void *)&PowerPC::Read_U8_ZX, reg_addr);
+		break;
+	}
+	ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment);
+
+	MemoryExceptionCheck();
+	if (signExtend && accessSize < 32)
+	{
+		// Need to sign extend values coming from the Read_U* functions.
+		MOVSX(32, accessSize, reg_value, R(ABI_RETURN));
+	}
+	else if (reg_value != ABI_RETURN)
+	{
+		MOVZX(64, accessSize, reg_value, R(ABI_RETURN));
+	}
+
+	if (!jit->jo.alwaysUseMemFuncs)
+	{
+		if (farcode.Enabled())
+		{
+			exit = J(true);
+			SwitchToNearCode();
+		}
+		SetJumpTarget(exit);
+	}
+}
+
+static OpArg SwapImmediate(int accessSize, const OpArg& reg_value)
+{
+	if (accessSize == 32)
+		return Imm32(Common::swap32(reg_value.Imm32()));
+	else if (accessSize == 16)
+		return Imm16(Common::swap16(reg_value.Imm16()));
+	else
+		return Imm8(reg_value.Imm8());
+}
+
+u8 *EmuCodeBlock::UnsafeWriteRegToReg(OpArg reg_value, X64Reg reg_addr, int accessSize, s32 offset, bool swap)
+{
+	u8* result = GetWritableCodePtr();
+	OpArg dest = MComplex(RMEM, reg_addr, SCALE_1, offset);
+	if (reg_value.IsImm())
+	{
+		if (swap)
+			reg_value = SwapImmediate(accessSize, reg_value);
+		MOV(accessSize, dest, reg_value);
+	}
+	else if (swap)
+	{
+		if (cpu_info.bMOVBE)
+		{
+			MOVBE(accessSize, dest, reg_value.GetSimpleReg());
+		}
+		else
+		{
+			if (accessSize > 8)
+				BSWAP(accessSize, reg_value.GetSimpleReg());
+			result = GetWritableCodePtr();
+			MOV(accessSize, dest, reg_value);
+		}
+	}
+	else
+	{
+		MOV(accessSize, dest, reg_value);
+	}
+
+	return result;
+}
+
+static OpArg FixImmediate(int accessSize, OpArg arg)
+{
+	if (arg.IsImm())
+	{
+		arg = accessSize == 8  ? Imm8((u8)arg.Imm32()) :
+		      accessSize == 16 ? Imm16((u16)arg.Imm32()) :
+		                         Imm32((u32)arg.Imm32());
+	}
+	return arg;
+}
+
+void EmuCodeBlock::UnsafeWriteGatherPipe(int accessSize)
+{
+	// No need to protect these, they don't touch any state
+	// question - should we inline them instead? Pro: Lose a CALL   Con: Code bloat
+	switch (accessSize)
+	{
+	case 8:
+		CALL((void *)jit->GetAsmRoutines()->fifoDirectWrite8);
+		break;
+	case 16:
+		CALL((void *)jit->GetAsmRoutines()->fifoDirectWrite16);
+		break;
+	case 32:
+		CALL((void *)jit->GetAsmRoutines()->fifoDirectWrite32);
+		break;
+	case 64:
+		CALL((void *)jit->GetAsmRoutines()->fifoDirectWrite64);
+		break;
+	}
+	jit->js.fifoBytesThisBlock += accessSize >> 3;
+}
+
+bool EmuCodeBlock::WriteToConstAddress(int accessSize, OpArg arg, u32 address, BitSet32 registersInUse)
+{
+	arg = FixImmediate(accessSize, arg);
+
+	// If we already know the address through constant folding, we can do some
+	// fun tricks...
+	if (jit->jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(address))
+	{
+		if (!arg.IsSimpleReg() || arg.GetSimpleReg() != RSCRATCH)
+			MOV(accessSize, R(RSCRATCH), arg);
+
+		UnsafeWriteGatherPipe(accessSize);
+		return false;
+	}
+	else if (PowerPC::IsOptimizableRAMAddress(address))
+	{
+		WriteToConstRamAddress(accessSize, arg, address);
+		return false;
+	}
+	else
+	{
+		// Helps external systems know which instruction triggered the write
+		MOV(32, PPCSTATE(pc), Imm32(jit->js.compilerPC));
+
+		ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+		switch (accessSize)
+		{
+		case 64:
+			ABI_CallFunctionAC(64, (void *)&PowerPC::Write_U64, arg, address);
+			break;
+		case 32:
+			ABI_CallFunctionAC(32, (void *)&PowerPC::Write_U32, arg, address);
+			break;
+		case 16:
+			ABI_CallFunctionAC(16, (void *)&PowerPC::Write_U16, arg, address);
+			break;
+		case 8:
+			ABI_CallFunctionAC(8, (void *)&PowerPC::Write_U8, arg, address);
+			break;
+		}
+		ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+		return true;
+	}
+}
+
+void EmuCodeBlock::SafeWriteRegToReg(OpArg reg_value, X64Reg reg_addr, int accessSize, s32 offset, BitSet32 registersInUse, int flags)
+{
+	// set the correct immediate format
+	reg_value = FixImmediate(accessSize, reg_value);
+
+	// TODO: support byte-swapped non-immediate fastmem stores
+	if (jit->jo.fastmem &&
+	    !(flags & SAFE_LOADSTORE_NO_FASTMEM) &&
+		(reg_value.IsImm() || !(flags & SAFE_LOADSTORE_NO_SWAP)))
+	{
+		const u8* backpatchStart = GetCodePtr();
+		u8* mov = UnsafeWriteRegToReg(reg_value, reg_addr, accessSize, offset, !(flags & SAFE_LOADSTORE_NO_SWAP));
+		ptrdiff_t padding = BACKPATCH_SIZE - (GetCodePtr() - backpatchStart);
+		if (padding > 0)
+		{
+			NOP(padding);
+		}
+
+		registersInUseAtLoc[mov] = registersInUse;
+		pcAtLoc[mov] = jit->js.compilerPC;
+		jit->js.fastmemLoadStore = mov;
+		return;
+	}
+
+	if (offset)
+	{
+		if (flags & SAFE_LOADSTORE_CLOBBER_RSCRATCH_INSTEAD_OF_ADDR)
+		{
+			LEA(32, RSCRATCH, MDisp(reg_addr, (u32)offset));
+			reg_addr = RSCRATCH;
+		}
+		else
+		{
+			ADD(32, R(reg_addr), Imm32((u32)offset));
+		}
+	}
+
+	u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
+
+	// The following masks the region used by the GC/Wii virtual memory lib
+	mem_mask |= Memory::ADDR_MASK_MEM1;
+
+	bool swap = !(flags & SAFE_LOADSTORE_NO_SWAP);
+
+	FixupBranch slow, exit;
+	slow = CheckIfSafeAddress(reg_value, reg_addr, registersInUse, mem_mask);
+	UnsafeWriteRegToReg(reg_value, reg_addr, accessSize, 0, swap);
+	if (farcode.Enabled())
+		SwitchToFarCode();
+	else
+		exit = J(true);
+	SetJumpTarget(slow);
+
+	// PC is used by memory watchpoints (if enabled) or to print accurate PC locations in debug logs
+	MOV(32, PPCSTATE(pc), Imm32(jit->js.compilerPC));
+
+	size_t rsp_alignment = (flags & SAFE_LOADSTORE_NO_PROLOG) ? 8 : 0;
+	ABI_PushRegistersAndAdjustStack(registersInUse, rsp_alignment);
+
+	// If the input is an immediate, we need to put it in a register.
+	X64Reg reg;
+	if (reg_value.IsImm())
+	{
+		reg = reg_addr == ABI_PARAM1 ? RSCRATCH : ABI_PARAM1;
+		MOV(accessSize, R(reg), reg_value);
+	}
+	else
+	{
+		reg = reg_value.GetSimpleReg();
+	}
+
+	switch (accessSize)
+	{
+	case 64:
+		ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U64) : ((void *)&PowerPC::Write_U64_Swap), reg, reg_addr);
+		break;
+	case 32:
+		ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U32) : ((void *)&PowerPC::Write_U32_Swap), reg, reg_addr);
+		break;
+	case 16:
+		ABI_CallFunctionRR(swap ? ((void *)&PowerPC::Write_U16) : ((void *)&PowerPC::Write_U16_Swap), reg, reg_addr);
+		break;
+	case 8:
+		ABI_CallFunctionRR((void *)&PowerPC::Write_U8, reg, reg_addr);
+		break;
+	}
+	ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment);
+	if (farcode.Enabled())
+	{
+		exit = J(true);
+		SwitchToNearCode();
+	}
+	SetJumpTarget(exit);
+}
+
+void EmuCodeBlock::WriteToConstRamAddress(int accessSize, OpArg arg, u32 address, bool swap)
+{
+	X64Reg reg;
+	if (arg.IsImm())
+	{
+		arg = SwapImmediate(accessSize, arg);
+		MOV(32, R(RSCRATCH), Imm32(address));
+		MOV(accessSize, MRegSum(RMEM, RSCRATCH), arg);
+		return;
+	}
+
+	if (!arg.IsSimpleReg() || (!cpu_info.bMOVBE && swap && arg.GetSimpleReg() != RSCRATCH))
+	{
+		MOV(accessSize, R(RSCRATCH), arg);
+		reg = RSCRATCH;
+	}
+	else
+	{
+		reg = arg.GetSimpleReg();
+	}
+
+	MOV(32, R(RSCRATCH2), Imm32(address));
+	if (swap)
+		SwapAndStore(accessSize, MRegSum(RMEM, RSCRATCH2), reg);
+	else
+		MOV(accessSize, MRegSum(RMEM, RSCRATCH2), R(reg));
+}
+
+void EmuCodeBlock::ForceSinglePrecision(X64Reg output, const OpArg& input, bool packed, bool duplicate)
+{
+	// Most games don't need these. Zelda requires it though - some platforms get stuck without them.
+	if (jit->jo.accurateSinglePrecision)
+	{
+		if (packed)
+		{
+			CVTPD2PS(output, input);
+			CVTPS2PD(output, R(output));
+		}
+		else
+		{
+			CVTSD2SS(output, input);
+			CVTSS2SD(output, R(output));
+			if (duplicate)
+				MOVDDUP(output, R(output));
+		}
+	}
+	else if (!input.IsSimpleReg() || input.GetSimpleReg() != output)
+	{
+		if (duplicate)
+			MOVDDUP(output, input);
+		else
+			MOVAPD(output, input);
+	}
+}
+
+// Abstract between AVX and SSE: automatically handle 3-operand instructions
+void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&), void (XEmitter::*sseOp)(X64Reg, const OpArg&),
+                          X64Reg regOp, const OpArg& arg1, const OpArg& arg2, bool packed, bool reversible)
+{
+	if (arg1.IsSimpleReg() && regOp == arg1.GetSimpleReg())
+	{
+		(this->*sseOp)(regOp, arg2);
+	}
+	else if (arg1.IsSimpleReg() && cpu_info.bAVX)
+	{
+		(this->*avxOp)(regOp, arg1.GetSimpleReg(), arg2);
+	}
+	else if (arg2.IsSimpleReg() && arg2.GetSimpleReg() == regOp)
+	{
+		if (reversible)
+		{
+			(this->*sseOp)(regOp, arg1);
+		}
+		else
+		{
+			// The ugly case: regOp == arg2 without AVX, or with arg1 == memory
+			if (!arg1.IsSimpleReg() || arg1.GetSimpleReg() != XMM0)
+				MOVAPD(XMM0, arg1);
+			if (cpu_info.bAVX)
+			{
+				(this->*avxOp)(regOp, XMM0, arg2);
+			}
+			else
+			{
+				(this->*sseOp)(XMM0, arg2);
+				if (packed)
+					MOVAPD(regOp, R(XMM0));
+				else
+					MOVSD(regOp, R(XMM0));
+			}
+		}
+	}
+	else
+	{
+		if (packed)
+			MOVAPD(regOp, arg1);
+		else
+			MOVSD(regOp, arg1);
+		(this->*sseOp)(regOp, arg1 == arg2 ? R(regOp) : arg2);
+	}
+}
+
+// Abstract between AVX and SSE: automatically handle 3-operand instructions
+void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&, u8), void (XEmitter::*sseOp)(X64Reg, const OpArg&, u8),
+                          X64Reg regOp, const OpArg& arg1, const OpArg& arg2, u8 imm)
+{
+	if (arg1.IsSimpleReg() && regOp == arg1.GetSimpleReg())
+	{
+		(this->*sseOp)(regOp, arg2, imm);
+	}
+	else if (arg1.IsSimpleReg() && cpu_info.bAVX)
+	{
+		(this->*avxOp)(regOp, arg1.GetSimpleReg(), arg2, imm);
+	}
+	else if (arg2.IsSimpleReg() && arg2.GetSimpleReg() == regOp)
+	{
+		// The ugly case: regOp == arg2 without AVX, or with arg1 == memory
+		if (!arg1.IsSimpleReg() || arg1.GetSimpleReg() != XMM0)
+			MOVAPD(XMM0, arg1);
+		if (cpu_info.bAVX)
+		{
+			(this->*avxOp)(regOp, XMM0, arg2, imm);
+		}
+		else
+		{
+			(this->*sseOp)(XMM0, arg2, imm);
+			MOVAPD(regOp, R(XMM0));
+		}
+	}
+	else
+	{
+		MOVAPD(regOp, arg1);
+		(this->*sseOp)(regOp, arg1 == arg2 ? R(regOp) : arg2, imm);
+	}
+}
+
+static const u64 GC_ALIGNED16(psMantissaTruncate[2]) = {0xFFFFFFFFF8000000ULL, 0xFFFFFFFFF8000000ULL};
+static const u64 GC_ALIGNED16(psRoundBit[2]) = {0x8000000, 0x8000000};
+
+// Emulate the odd truncation/rounding that the PowerPC does on the RHS operand before
+// a single precision multiply. To be precise, it drops the low 28 bits of the mantissa,
+// rounding to nearest as it does.
+// It needs a temp, so let the caller pass that in.
+void EmuCodeBlock::Force25BitPrecision(X64Reg output, const OpArg& input, X64Reg tmp)
+{
+	if (jit->jo.accurateSinglePrecision)
+	{
+		// mantissa = (mantissa & ~0xFFFFFFF) + ((mantissa & (1ULL << 27)) << 1);
+		if (input.IsSimpleReg() && cpu_info.bAVX)
+		{
+			VPAND(tmp, input.GetSimpleReg(), M(psRoundBit));
+			VPAND(output, input.GetSimpleReg(), M(psMantissaTruncate));
+			PADDQ(output, R(tmp));
+		}
+		else
+		{
+			if (!input.IsSimpleReg() || input.GetSimpleReg() != output)
+				MOVAPD(output, input);
+			avx_op(&XEmitter::VPAND, &XEmitter::PAND, tmp, R(output), M(psRoundBit), true, true);
+			PAND(output, M(psMantissaTruncate));
+			PADDQ(output, R(tmp));
+		}
+	}
+	else if (!input.IsSimpleReg() || input.GetSimpleReg() != output)
+	{
+		MOVAPD(output, input);
+	}
+}
+
+static u32 GC_ALIGNED16(temp32);
+static u64 GC_ALIGNED16(temp64);
+
+// Since the following float conversion functions are used in non-arithmetic PPC float instructions,
+// they must convert floats bitexact and never flush denormals to zero or turn SNaNs into QNaNs.
+// This means we can't use CVTSS2SD/CVTSD2SS :(
+// The x87 FPU doesn't even support flush-to-zero so we can use FLD+FSTP even on denormals.
+// If the number is a NaN, make sure to set the QNaN bit back to its original value.
+
+// Another problem is that officially, converting doubles to single format results in undefined behavior.
+// Relying on undefined behavior is a bug so no software should ever do this.
+// In case it does happen, phire's more accurate implementation of ConvertDoubleToSingle() is reproduced below.
+
+//#define MORE_ACCURATE_DOUBLETOSINGLE
+#ifdef MORE_ACCURATE_DOUBLETOSINGLE
+
+static const __m128i GC_ALIGNED16(double_exponent) = _mm_set_epi64x(0, 0x7ff0000000000000);
+static const __m128i GC_ALIGNED16(double_fraction) = _mm_set_epi64x(0, 0x000fffffffffffff);
+static const __m128i GC_ALIGNED16(double_sign_bit) = _mm_set_epi64x(0, 0x8000000000000000);
+static const __m128i GC_ALIGNED16(double_explicit_top_bit) = _mm_set_epi64x(0, 0x0010000000000000);
+static const __m128i GC_ALIGNED16(double_top_two_bits) = _mm_set_epi64x(0, 0xc000000000000000);
+static const __m128i GC_ALIGNED16(double_bottom_bits)  = _mm_set_epi64x(0, 0x07ffffffe0000000);
+
+// This is the same algorithm used in the interpreter (and actual hardware)
+// The documentation states that the conversion of a double with an outside the
+// valid range for a single (or a single denormal) is undefined.
+// But testing on actual hardware shows it always picks bits 0..1 and 5..34
+// unless the exponent is in the range of 874 to 896.
+void EmuCodeBlock::ConvertDoubleToSingle(X64Reg dst, X64Reg src)
+{
+	MOVSD(XMM1, R(src));
+
+	// Grab Exponent
+	PAND(XMM1, M(&double_exponent));
+	PSRLQ(XMM1, 52);
+	MOVD_xmm(R(RSCRATCH), XMM1);
+
+
+	// Check if the double is in the range of valid single subnormal
+	CMP(16, R(RSCRATCH), Imm16(896));
+	FixupBranch NoDenormalize = J_CC(CC_G);
+	CMP(16, R(RSCRATCH), Imm16(874));
+	FixupBranch NoDenormalize2 = J_CC(CC_L);
+
+	// Denormalise
+
+	// shift = (905 - Exponent) plus the 21 bit double to single shift
+	MOV(16, R(RSCRATCH), Imm16(905 + 21));
+	MOVD_xmm(XMM0, R(RSCRATCH));
+	PSUBQ(XMM0, R(XMM1));
+
+	// xmm1 = fraction | 0x0010000000000000
+	MOVSD(XMM1, R(src));
+	PAND(XMM1, M(&double_fraction));
+	POR(XMM1, M(&double_explicit_top_bit));
+
+	// fraction >> shift
+	PSRLQ(XMM1, R(XMM0));
+
+	// OR the sign bit in.
+	MOVSD(XMM0, R(src));
+	PAND(XMM0, M(&double_sign_bit));
+	PSRLQ(XMM0, 32);
+	POR(XMM1, R(XMM0));
+
+	FixupBranch end = J(false); // Goto end
+
+	SetJumpTarget(NoDenormalize);
+	SetJumpTarget(NoDenormalize2);
+
+	// Don't Denormalize
+
+	// We want bits 0, 1
+	MOVSD(XMM1, R(src));
+	PAND(XMM1, M(&double_top_two_bits));
+	PSRLQ(XMM1, 32);
+
+	// And 5 through to 34
+	MOVSD(XMM0, R(src));
+	PAND(XMM0, M(&double_bottom_bits));
+	PSRLQ(XMM0, 29);
+
+	// OR them togther
+	POR(XMM1, R(XMM0));
+
+	// End
+	SetJumpTarget(end);
+	MOVDDUP(dst, R(XMM1));
+}
+
+#else // MORE_ACCURATE_DOUBLETOSINGLE
+
+static const __m128i GC_ALIGNED16(double_sign_bit) = _mm_set_epi64x(0xffffffffffffffff, 0x7fffffffffffffff);
+static const __m128i GC_ALIGNED16(single_qnan_bit) = _mm_set_epi64x(0xffffffffffffffff, 0xffffffffffbfffff);
+static const __m128i GC_ALIGNED16(double_qnan_bit) = _mm_set_epi64x(0xffffffffffffffff, 0xfff7ffffffffffff);
+
+// Smallest positive double that results in a normalized single.
+static const double GC_ALIGNED16(min_norm_single) = std::numeric_limits<float>::min();
+
+void EmuCodeBlock::ConvertDoubleToSingle(X64Reg dst, X64Reg src)
+{
+	// Most games have flush-to-zero enabled, which causes the single -> double -> single process here to be lossy.
+	// This is a problem when games use float operations to copy non-float data.
+	// Changing the FPU mode is very expensive, so we can't do that.
+	// Here, check to see if the source is small enough that it will result in a denormal, and pass it to the x87 unit
+	// if it is.
+	avx_op(&XEmitter::VPAND, &XEmitter::PAND, XMM0, R(src), M(&double_sign_bit), true, true);
+	UCOMISD(XMM0, M(&min_norm_single));
+	FixupBranch nanConversion = J_CC(CC_P, true);
+	FixupBranch denormalConversion = J_CC(CC_B, true);
+	CVTSD2SS(dst, R(src));
+
+	SwitchToFarCode();
+		SetJumpTarget(nanConversion);
+		MOVQ_xmm(R(RSCRATCH), src);
+		// Put the quiet bit into CF.
+		BT(64, R(RSCRATCH), Imm8(51));
+		CVTSD2SS(dst, R(src));
+		FixupBranch continue1 = J_CC(CC_C, true);
+		// Clear the quiet bit of the SNaN, which was 0 (signalling) but got set to 1 (quiet) by conversion.
+		ANDPS(dst, M(&single_qnan_bit));
+		FixupBranch continue2 = J(true);
+
+		SetJumpTarget(denormalConversion);
+		MOVSD(M(&temp64), src);
+		FLD(64, M(&temp64));
+		FSTP(32, M(&temp32));
+		MOVSS(dst, M(&temp32));
+		FixupBranch continue3 = J(true);
+	SwitchToNearCode();
+
+	SetJumpTarget(continue1);
+	SetJumpTarget(continue2);
+	SetJumpTarget(continue3);
+	// We'd normally need to MOVDDUP here to put the single in the top half of the output register too, but
+	// this function is only used to go directly to a following store, so we omit the MOVDDUP here.
+}
+#endif // MORE_ACCURATE_DOUBLETOSINGLE
+
+// Converting single->double is a bit easier because all single denormals are double normals.
+void EmuCodeBlock::ConvertSingleToDouble(X64Reg dst, X64Reg src, bool src_is_gpr)
+{
+	X64Reg gprsrc = src_is_gpr ? src : RSCRATCH;
+	if (src_is_gpr)
+	{
+		MOVD_xmm(dst, R(src));
+	}
+	else
+	{
+		if (dst != src)
+			MOVAPS(dst, R(src));
+		MOVD_xmm(R(RSCRATCH), src);
+	}
+
+	UCOMISS(dst, R(dst));
+	CVTSS2SD(dst, R(dst));
+	FixupBranch nanConversion = J_CC(CC_P, true);
+
+	SwitchToFarCode();
+		SetJumpTarget(nanConversion);
+		TEST(32, R(gprsrc), Imm32(0x00400000));
+		FixupBranch continue1 = J_CC(CC_NZ, true);
+		ANDPD(dst, M(&double_qnan_bit));
+		FixupBranch continue2 = J(true);
+	SwitchToNearCode();
+
+	SetJumpTarget(continue1);
+	SetJumpTarget(continue2);
+	MOVDDUP(dst, R(dst));
+}
+
+static const u64 GC_ALIGNED16(psDoubleExp[2])  = {0x7FF0000000000000ULL, 0};
+static const u64 GC_ALIGNED16(psDoubleFrac[2]) = {0x000FFFFFFFFFFFFFULL, 0};
+static const u64 GC_ALIGNED16(psDoubleNoSign[2]) = {0x7FFFFFFFFFFFFFFFULL, 0};
+
+// TODO: it might be faster to handle FPRF in the same way as CR is currently handled for integer, storing
+// the result of each floating point op and calculating it when needed. This is trickier than for integers
+// though, because there's 32 possible FPRF bit combinations but only 9 categories of floating point values,
+// which makes the whole thing rather trickier.
+// Fortunately, PPCAnalyzer can optimize out a large portion of FPRF calculations, so maybe this isn't
+// quite that necessary.
+void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm)
+{
+	AND(32, PPCSTATE(fpscr), Imm32(~FPRF_MASK));
+
+	FixupBranch continue1, continue2, continue3, continue4;
+	if (cpu_info.bSSE4_1)
+	{
+		MOVQ_xmm(R(RSCRATCH), xmm);
+		SHR(64, R(RSCRATCH), Imm8(63)); // Get the sign bit; almost all the branches need it.
+		PTEST(xmm, M(psDoubleExp));
+		FixupBranch maxExponent = J_CC(CC_C);
+		FixupBranch zeroExponent = J_CC(CC_Z);
+
+		// Nice normalized number: sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, MathUtil::PPC_FPCLASS_PN));
+		continue1 = J();
+
+		SetJumpTarget(maxExponent);
+		PTEST(xmm, M(psDoubleFrac));
+		FixupBranch notNAN = J_CC(CC_Z);
+
+		// Max exponent + mantissa: PPC_FPCLASS_QNAN
+		MOV(32, R(RSCRATCH), Imm32(MathUtil::PPC_FPCLASS_QNAN));
+		continue2 = J();
+
+		// Max exponent + no mantissa: sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+		SetJumpTarget(notNAN);
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, MathUtil::PPC_FPCLASS_NINF));
+		continue3 = J();
+
+		SetJumpTarget(zeroExponent);
+		PTEST(xmm, R(xmm));
+		FixupBranch zero = J_CC(CC_Z);
+
+		// No exponent + mantissa: sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, MathUtil::PPC_FPCLASS_ND));
+		continue4 = J();
+
+		// Zero: sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+		SetJumpTarget(zero);
+		SHL(32, R(RSCRATCH), Imm8(4));
+		ADD(32, R(RSCRATCH), Imm8(MathUtil::PPC_FPCLASS_PZ));
+	}
+	else
+	{
+		MOVQ_xmm(R(RSCRATCH), xmm);
+		TEST(64, R(RSCRATCH), M(psDoubleExp));
+		FixupBranch zeroExponent = J_CC(CC_Z);
+		AND(64, R(RSCRATCH), M(psDoubleNoSign));
+		CMP(64, R(RSCRATCH), M(psDoubleExp));
+		FixupBranch nan = J_CC(CC_G); // This works because if the sign bit is set, RSCRATCH is negative
+		FixupBranch infinity = J_CC(CC_E);
+		MOVQ_xmm(R(RSCRATCH), xmm);
+		SHR(64, R(RSCRATCH), Imm8(63));
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, MathUtil::PPC_FPCLASS_PN));
+		continue1 = J();
+		SetJumpTarget(nan);
+		MOVQ_xmm(R(RSCRATCH), xmm);
+		SHR(64, R(RSCRATCH), Imm8(63));
+		MOV(32, R(RSCRATCH), Imm32(MathUtil::PPC_FPCLASS_QNAN));
+		continue2 = J();
+		SetJumpTarget(infinity);
+		MOVQ_xmm(R(RSCRATCH), xmm);
+		SHR(64, R(RSCRATCH), Imm8(63));
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, MathUtil::PPC_FPCLASS_NINF));
+		continue3 = J();
+		SetJumpTarget(zeroExponent);
+		TEST(64, R(RSCRATCH), R(RSCRATCH));
+		FixupBranch zero = J_CC(CC_Z);
+		SHR(64, R(RSCRATCH), Imm8(63));
+		LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, MathUtil::PPC_FPCLASS_ND));
+		continue4 = J();
+		SetJumpTarget(zero);
+		SHR(64, R(RSCRATCH), Imm8(63));
+		SHL(32, R(RSCRATCH), Imm8(4));
+		ADD(32, R(RSCRATCH), Imm8(MathUtil::PPC_FPCLASS_PZ));
+	}
+
+	SetJumpTarget(continue1);
+	SetJumpTarget(continue2);
+	SetJumpTarget(continue3);
+	SetJumpTarget(continue4);
+	SHL(32, R(RSCRATCH), Imm8(FPRF_SHIFT));
+	OR(32, PPCSTATE(fpscr), R(RSCRATCH));
+}
+
+void EmuCodeBlock::JitGetAndClearCAOV(bool oe)
+{
+	if (oe)
+		AND(8, PPCSTATE(xer_so_ov), Imm8(~XER_OV_MASK)); //XER.OV = 0
+	SHR(8, PPCSTATE(xer_ca), Imm8(1)); //carry = XER.CA, XER.CA = 0
+}
+
+void EmuCodeBlock::JitSetCA()
+{
+	MOV(8, PPCSTATE(xer_ca), Imm8(1)); //XER.CA = 1
+}
+
+// Some testing shows CA is set roughly ~1/3 of the time (relative to clears), so
+// branchless calculation of CA is probably faster in general.
+void EmuCodeBlock::JitSetCAIf(CCFlags conditionCode)
+{
+	SETcc(conditionCode, PPCSTATE(xer_ca));
+}
+
+void EmuCodeBlock::JitClearCA()
+{
+	MOV(8, PPCSTATE(xer_ca), Imm8(0));
+}
diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h
new file mode 100644
index 0000000000..5dc67d9f3c
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h
@@ -0,0 +1,135 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included./
+
+#pragma once
+
+#include <unordered_map>
+
+#include "Common/BitSet.h"
+#include "Common/CPUDetect.h"
+#include "Common/x64Emitter.h"
+#include "Core/PowerPC/PowerPC.h"
+
+namespace MMIO { class Mapping; }
+
+// We offset by 0x80 because the range of one byte memory offsets is
+// -0x80..0x7f.
+#define PPCSTATE_BASE ((u8*)&PowerPC::ppcState + 0x80)
+#define PPCSTATE_OFS(x) ((u8*)(x) - PPCSTATE_BASE)
+#define PPCSTATE(x) MDisp(RPPCSTATE, PPCSTATE_OFS(&PowerPC::ppcState.x))
+#define PPCSTATE_LR PPCSTATE(spr[SPR_LR])
+#define PPCSTATE_CTR PPCSTATE(spr[SPR_CTR])
+#define PPCSTATE_SRR0 PPCSTATE(spr[SPR_SRR0])
+#define PPCSTATE_SRR1 PPCSTATE(spr[SPR_SRR1])
+
+// A place to throw blocks of code we don't want polluting the cache, e.g. rarely taken
+// exception branches.
+class FarCodeCache : public Gen::X64CodeBlock
+{
+private:
+	bool m_enabled = false;
+public:
+	bool Enabled() { return m_enabled; }
+	void Init(int size) { AllocCodeSpace(size, PPCSTATE_BASE); m_enabled = true; }
+	void Shutdown() { FreeCodeSpace(); m_enabled = false; }
+};
+
+static const int CODE_SIZE = 1024 * 1024 * 32;
+
+// a bit of a hack; the MMU results in a vast amount more code ending up in the far cache,
+// mostly exception handling, so give it a whole bunch more space if the MMU is on.
+static const int FARCODE_SIZE = 1024 * 1024 * 8;
+static const int FARCODE_SIZE_MMU = 1024 * 1024 * 48;
+
+// same for the trampoline code cache, because fastmem results in far more backpatches in MMU mode
+static const int TRAMPOLINE_CODE_SIZE = 1024 * 1024 * 8;
+static const int TRAMPOLINE_CODE_SIZE_MMU = 1024 * 1024 * 32;
+
+// Like XCodeBlock but has some utilities for memory access.
+class EmuCodeBlock : public Gen::X64CodeBlock
+{
+public:
+	FarCodeCache farcode;
+	u8* nearcode; // Backed up when we switch to far code.
+
+	void MemoryExceptionCheck();
+
+	// Simple functions to switch between near and far code emitting
+	void SwitchToFarCode()
+	{
+		nearcode = GetWritableCodePtr();
+		SetCodePtr(farcode.GetWritableCodePtr());
+	}
+
+	void SwitchToNearCode()
+	{
+		farcode.SetCodePtr(GetWritableCodePtr());
+		SetCodePtr(nearcode);
+	}
+
+	Gen::FixupBranch CheckIfSafeAddress(const Gen::OpArg& reg_value, Gen::X64Reg reg_addr, BitSet32 registers_in_use, u32 mem_mask);
+	void UnsafeLoadRegToReg(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset = 0, bool signExtend = false);
+	void UnsafeLoadRegToRegNoSwap(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset, bool signExtend = false);
+	// these return the address of the MOV, for backpatching
+	u8 *UnsafeWriteRegToReg(Gen::OpArg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset = 0, bool swap = true);
+	u8 *UnsafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset = 0, bool swap = true)
+	{
+		return UnsafeWriteRegToReg(R(reg_value), reg_addr, accessSize, offset, swap);
+	}
+	u8 *UnsafeLoadToReg(Gen::X64Reg reg_value, Gen::OpArg opAddress, int accessSize, s32 offset, bool signExtend);
+	void UnsafeWriteGatherPipe(int accessSize);
+
+	// Generate a load/write from the MMIO handler for a given address. Only
+	// call for known addresses in MMIO range (MMIO::IsMMIOAddress).
+	void MMIOLoadToReg(MMIO::Mapping* mmio, Gen::X64Reg reg_value, BitSet32 registers_in_use, u32 address, int access_size, bool sign_extend);
+
+	enum SafeLoadStoreFlags
+	{
+		SAFE_LOADSTORE_NO_SWAP = 1,
+		SAFE_LOADSTORE_NO_PROLOG = 2,
+		SAFE_LOADSTORE_NO_FASTMEM = 4,
+		SAFE_LOADSTORE_CLOBBER_RSCRATCH_INSTEAD_OF_ADDR = 8
+	};
+
+	void SafeLoadToReg(Gen::X64Reg reg_value, const Gen::OpArg & opAddress, int accessSize, s32 offset, BitSet32 registersInUse, bool signExtend, int flags = 0);
+	// Clobbers RSCRATCH or reg_addr depending on the relevant flag.  Preserves
+	// reg_value if the load fails and js.memcheck is enabled.
+	// Works with immediate inputs and simple registers only.
+	void SafeWriteRegToReg(Gen::OpArg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset, BitSet32 registersInUse, int flags = 0);
+	void SafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset, BitSet32 registersInUse, int flags = 0)
+	{
+		SafeWriteRegToReg(R(reg_value), reg_addr, accessSize, offset, registersInUse, flags);
+	}
+
+	// applies to safe and unsafe WriteRegToReg
+	bool WriteClobbersRegValue(int accessSize, bool swap)
+	{
+		return swap && !cpu_info.bMOVBE && accessSize > 8;
+	}
+
+	void WriteToConstRamAddress(int accessSize, Gen::OpArg arg, u32 address, bool swap = true);
+	// returns true if an exception could have been caused
+	bool WriteToConstAddress(int accessSize, Gen::OpArg arg, u32 address, BitSet32 registersInUse);
+	void JitGetAndClearCAOV(bool oe);
+	void JitSetCA();
+	void JitSetCAIf(Gen::CCFlags conditionCode);
+	void JitClearCA();
+
+	void avx_op(void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, const Gen::OpArg&), void (Gen::XEmitter::*sseOp)(Gen::X64Reg, const Gen::OpArg&),
+	            Gen::X64Reg regOp, const Gen::OpArg& arg1, const Gen::OpArg& arg2, bool packed = true, bool reversible = false);
+	void avx_op(void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, const Gen::OpArg&, u8), void (Gen::XEmitter::*sseOp)(Gen::X64Reg, const Gen::OpArg&, u8),
+	            Gen::X64Reg regOp, const Gen::OpArg& arg1, const Gen::OpArg& arg2, u8 imm);
+
+	void ForceSinglePrecision(Gen::X64Reg output, const Gen::OpArg& input, bool packed = true, bool duplicate = false);
+	void Force25BitPrecision(Gen::X64Reg output, const Gen::OpArg& input, Gen::X64Reg tmp);
+
+	// RSCRATCH might get trashed
+	void ConvertSingleToDouble(Gen::X64Reg dst, Gen::X64Reg src, bool src_is_gpr = false);
+	void ConvertDoubleToSingle(Gen::X64Reg dst, Gen::X64Reg src);
+	void SetFPRF(Gen::X64Reg xmm);
+protected:
+	std::unordered_map<u8 *, BitSet32> registersInUseAtLoc;
+	std::unordered_map<u8 *, u32> pcAtLoc;
+	std::unordered_map<u8 *, u8 *> exceptionHandlerAtLoc;
+};
diff --git a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp
new file mode 100644
index 0000000000..0a02764142
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.cpp
@@ -0,0 +1,180 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/JitRegister.h"
+#include "Common/StringUtil.h"
+#include "Common/x64ABI.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/TrampolineCache.h"
+
+#ifdef _WIN32
+	#include <windows.h>
+#endif
+
+
+using namespace Gen;
+
+void TrampolineCache::Init(int size)
+{
+	AllocCodeSpace(size, PPCSTATE_BASE);
+}
+
+void TrampolineCache::ClearCodeSpace()
+{
+	X64CodeBlock::ClearCodeSpace();
+}
+
+void TrampolineCache::Shutdown()
+{
+	FreeCodeSpace();
+}
+
+const u8* TrampolineCache::GenerateReadTrampoline(const InstructionInfo &info, BitSet32 registersInUse, u8* exceptionHandler, u8* returnPtr)
+{
+	if (GetSpaceLeft() < 1024)
+		PanicAlert("Trampoline cache full");
+
+	const u8* trampoline = GetCodePtr();
+	X64Reg addrReg = (X64Reg)info.scaledReg;
+	X64Reg dataReg = (X64Reg)info.regOperandReg;
+	int stack_offset = 0;
+	bool push_param1 = registersInUse[ABI_PARAM1];
+
+	if (push_param1)
+	{
+		PUSH(ABI_PARAM1);
+		stack_offset = 8;
+		registersInUse[ABI_PARAM1] = 0;
+	}
+
+	int dataRegSize = info.operandSize == 8 ? 64 : 32;
+	if (addrReg != ABI_PARAM1 && info.displacement)
+		LEA(32, ABI_PARAM1, MDisp(addrReg, info.displacement));
+	else if (addrReg != ABI_PARAM1)
+		MOV(32, R(ABI_PARAM1), R(addrReg));
+	else if (info.displacement)
+		ADD(32, R(ABI_PARAM1), Imm32(info.displacement));
+
+	ABI_PushRegistersAndAdjustStack(registersInUse, stack_offset);
+
+	switch (info.operandSize)
+	{
+	case 8:
+		CALL((void*)&PowerPC::Read_U64);
+		break;
+	case 4:
+		CALL((void*)&PowerPC::Read_U32);
+		break;
+	case 2:
+		CALL((void*)&PowerPC::Read_U16);
+		break;
+	case 1:
+		CALL((void*)&PowerPC::Read_U8);
+		break;
+	}
+
+	ABI_PopRegistersAndAdjustStack(registersInUse, stack_offset);
+
+	if (push_param1)
+		POP(ABI_PARAM1);
+
+	if (exceptionHandler)
+	{
+		TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_DSI));
+		J_CC(CC_NZ, exceptionHandler);
+	}
+
+	if (info.signExtend)
+		MOVSX(dataRegSize, info.operandSize * 8, dataReg, R(ABI_RETURN));
+	else if (dataReg != ABI_RETURN || info.operandSize < 4)
+		MOVZX(dataRegSize, info.operandSize * 8, dataReg, R(ABI_RETURN));
+
+	JMP(returnPtr, true);
+
+	JitRegister::Register(trampoline, GetCodePtr(), "JIT_ReadTrampoline");
+	return trampoline;
+}
+
+const u8* TrampolineCache::GenerateWriteTrampoline(const InstructionInfo &info, BitSet32 registersInUse, u8* exceptionHandler, u8* returnPtr, u32 pc)
+{
+	if (GetSpaceLeft() < 1024)
+		PanicAlert("Trampoline cache full");
+
+	const u8* trampoline = GetCodePtr();
+
+	X64Reg dataReg = (X64Reg)info.regOperandReg;
+	X64Reg addrReg = (X64Reg)info.scaledReg;
+
+	// Don't treat FIFO writes specially for now because they require a burst
+	// check anyway.
+
+	// PC is used by memory watchpoints (if enabled) or to print accurate PC locations in debug logs
+	MOV(32, PPCSTATE(pc), Imm32(pc));
+
+	ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+
+	if (info.hasImmediate)
+	{
+		if (addrReg != ABI_PARAM2 && info.displacement)
+			LEA(32, ABI_PARAM2, MDisp(addrReg, info.displacement));
+		else if (addrReg != ABI_PARAM2)
+			MOV(32, R(ABI_PARAM2), R(addrReg));
+		else if (info.displacement)
+			ADD(32, R(ABI_PARAM2), Imm32(info.displacement));
+
+		// we have to swap back the immediate to pass it to the write functions
+		switch (info.operandSize)
+		{
+		case 8:
+			PanicAlert("Invalid 64-bit immediate!");
+			break;
+		case 4:
+			MOV(32, R(ABI_PARAM1), Imm32(Common::swap32((u32)info.immediate)));
+			break;
+		case 2:
+			MOV(16, R(ABI_PARAM1), Imm16(Common::swap16((u16)info.immediate)));
+			break;
+		case 1:
+			MOV(8, R(ABI_PARAM1), Imm8((u8)info.immediate));
+			break;
+		}
+	}
+	else
+	{
+		int dataRegSize = info.operandSize == 8 ? 64 : 32;
+		MOVTwo(dataRegSize, ABI_PARAM2, addrReg, info.displacement, ABI_PARAM1, dataReg);
+	}
+
+	switch (info.operandSize)
+	{
+	case 8:
+		CALL((void *)&PowerPC::Write_U64);
+		break;
+	case 4:
+		CALL((void *)&PowerPC::Write_U32);
+		break;
+	case 2:
+		CALL((void *)&PowerPC::Write_U16);
+		break;
+	case 1:
+		CALL((void *)&PowerPC::Write_U8);
+		break;
+	}
+
+	ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+	if (exceptionHandler)
+	{
+		TEST(32, PPCSTATE(Exceptions), Imm32(EXCEPTION_DSI));
+		J_CC(CC_NZ, exceptionHandler);
+	}
+	JMP(returnPtr, true);
+
+	JitRegister::Register(trampoline, GetCodePtr(), "JIT_WriteTrampoline_%x", pc);
+	return trampoline;
+}
diff --git a/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h
new file mode 100644
index 0000000000..c5744849c8
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h
@@ -0,0 +1,26 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <unordered_map>
+
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+#include "Common/x64Analyzer.h"
+#include "Common/x64Emitter.h"
+
+// We need at least this many bytes for backpatching.
+const int BACKPATCH_SIZE = 5;
+
+class TrampolineCache : public Gen::X64CodeBlock
+{
+public:
+	void Init(int size);
+	void Shutdown();
+
+	const u8* GenerateReadTrampoline(const InstructionInfo &info, BitSet32 registersInUse, u8* exceptionHandler, u8* returnPtr);
+	const u8* GenerateWriteTrampoline(const InstructionInfo &info, BitSet32 registersInUse, u8* exceptionHandler, u8* returnPtr, u32 pc);
+	void ClearCodeSpace();
+};
diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp
new file mode 100644
index 0000000000..c96dfcea93
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp
@@ -0,0 +1,1580 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/*
+
+IR implementation comments:
+This file implements code generation for a new IR-based JIT. The idea of
+the IR is that as much as possible, it strips away the complexities
+of the PPC instruction set into a simpler instruction set.  In its current
+form, the semantics are very simple: each instruction does its calculation
+and performs its side effects in order.  For an instruction with a result,
+the instruction also represents the returned value.  This works quite
+simply because jumps within a block are not allowed.
+
+The IR treats loads and stores to PPC registers as separate steps from actual
+calculations.  This allows the instruction set to be significantly simpler,
+because one PPC instruction can be mapped to multiple IR instructions.  It
+also allows optimizing out dead register stores: this reduces register
+pressure and allows dead code elimination to completely remove instructions
+which produce unused values, or the carry flag of srawx.
+
+The actual IR representation uses a few tricks I picked up from nanojit:
+each instruction is a single 32-bit integer, the operands are 8-bit offsets
+back from the current instruction, and there's a special Tramp instruction
+to reference operands that are too far away to reference otherwise.
+
+The first step of code generation is producing the IR; this is roughly
+equivalent to all of code generation in the previous code. In addition
+to storing the IR, some optimizations occur in this step: the primary
+optimizations are that redundant register loads/stores are eliminated,
+and constant-folding is done.
+
+The second step is a quick pass over the IL to figure out liveness: this
+information is used both for dead code elimination and to find the last
+use of an instruction, which is allowed to destroy the value.
+
+The third step is the actual code generation: this just goes through each
+instruction and generates code.  Dead code elimination works in this step,
+by simply skipping unused instructions.  The register allocator is a dumb,
+greedy allocator: at the moment, it's really a bit too dumb, but it's
+actually not as bad as it looks: unless a block is relatively long, spills
+are rarely needed.  EDX is used as a scratch register: requiring a scratch
+register isn't ideal, but the register allocator is too dumb to handle
+instructions that need a specific register at the moment.
+
+In addition to the optimizations that are deeply tied to the IR,
+I've implemented one additional trick: fast memory for 32-bit machines.
+This works off of the observation that loads and stores can be classified
+at runtime: any particular load instruction will always load similar addresses,
+and any store will store to similar addresses.  Using this observation, every
+block is JIT-ed twice: the first time, the block includes extra code to
+instrument the loads.  Then, at the end of the block, it jumps back into the JIT
+to recompile itself.  The second recompilation looks at the address of each load
+and store, and bakes the information into the generated code.  This allows removing
+the overhead for both the mask and the branch normally required for loads on 32-bit
+machines.  This optimization isn't completely safe: it depends on a guarantee which
+isn't made by the PPC instruction set.  That said, it's reliable enough that games
+work without any fallback, and it's a large performance boost.  Also, if it turns
+out it isn't completely reliable, we can use a solution using segments which is
+similar to the 64-bit fast memory implementation.
+
+The speed with this JIT is better than I expected, but not at much as I hoped...
+on the test I've been working on (which bounded by JIT performance and doesn't
+use any floating-point), it's roughly 25% faster than the current JIT, with the
+edge over the current JIT mostly due to the fast memory optimization.
+
+Update on perf:
+I've been doing a bit more tweaking for a small perf improvement (in the
+range of 5-10%).  That said, it's getting to the point where I'm simply
+not seeing potential for improvements to codegen, at least for long,
+straightforward blocks.  For one long block that's at the top of my samples,
+I've managed to get the bloat% (number of instructions compared to PPC
+equivalent) down to 225%, and I can't really see it going down much further.
+It looks like the most promising paths to further improvement for pure
+integer code are more aggresively combining blocks and dead condition
+register elimination, which should be very helpful for small blocks.
+
+TODO (in no particular order):
+- JIT for misc remaining FP instructions
+- JIT for bcctrx
+- Misc optimizations for FP instructions
+- Inter-block dead register elimination; this seems likely to have large
+  performance benefits, although I'm not completely sure.
+
+- Inter-block inlining; also likely to have large performance benefits.
+  The tricky parts are deciding which blocks to inline, and that the
+  IR can't really deal with branches whose destination is in the
+  the middle of a generated block.
+
+- Specialized slw/srw/sraw; I think there are some tricks that could
+  have a non-trivial effect, and there are significantly shorter
+  implementations for 64-bit involving abusing 64-bit shifts.
+  64-bit compat (it should only be a few tweaks to register allocation and the load/store code)
+
+- Scheduling to reduce register pressure: PowerPCcompilers like to push
+  uses far away from definitions, but it's rather unfriendly to modern
+  x86 processors, which are short on registers and extremely good at instruction reordering.
+
+- Common subexpression elimination
+- Optimize load/store of sum using complex addressing (partially implemented)
+- Loop optimizations (loop-carried registers, LICM)
+- Code refactoring/cleanup
+
+- Investigate performance of the JIT itself; this doesn't affect
+  framerates significantly, but it does take a visible amount
+  of time for a complicated piece of code like a video decoder to compile.
+
+- Fix profiled loads/stores to work safely.  On 32-bit, one solution is to
+  use a spare segment register, and expand the backpatch solution
+  to work in all the relevant situations.  On 64-bit, the existing
+  fast memory solution should basically work.  An alternative
+  would be to figure out a heuristic for what loads actually
+  vary their "type", and special-case them.
+
+*/
+
+#ifdef _MSC_VER
+#pragma warning(disable:4146)   // unary minus operator applied to unsigned type, result still unsigned
+#endif
+
+#include <algorithm>
+#include <cinttypes>
+#include <ctime>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitILCommon/IR.h"
+using namespace Gen;
+
+namespace IREmitter
+{
+
+InstLoc IRBuilder::EmitZeroOp(unsigned Opcode, unsigned extra = 0)
+{
+	InstLoc curIndex = InstList.data() + InstList.size();
+	InstList.push_back(Opcode | (extra << 8));
+	MarkUsed.push_back(false);
+	return curIndex;
+}
+
+InstLoc IRBuilder::EmitUOp(unsigned Opcode, InstLoc Op1, unsigned extra)
+{
+	InstLoc curIndex = InstList.data() + InstList.size();
+	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
+	if (backOp1 >= 256)
+	{
+		InstList.push_back(Tramp | backOp1 << 8);
+		MarkUsed.push_back(false);
+		backOp1 = 0;
+		curIndex++;
+	}
+
+	InstList.push_back(Opcode | (backOp1 << 8) | (extra << 16));
+	MarkUsed.push_back(false);
+	return curIndex;
+}
+
+InstLoc IRBuilder::EmitBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, unsigned extra)
+{
+	InstLoc curIndex = InstList.data() + InstList.size();
+	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
+	if (backOp1 >= 255)
+	{
+		InstList.push_back(Tramp | backOp1 << 8);
+		MarkUsed.push_back(false);
+		backOp1 = 0;
+		curIndex++;
+	}
+
+	unsigned backOp2 = (s32)(curIndex - 1 - Op2);
+	if (backOp2 >= 256)
+	{
+		InstList.push_back(Tramp | backOp2 << 8);
+		MarkUsed.push_back(false);
+		backOp2 = 0;
+		backOp1++;
+		curIndex++;
+	}
+
+	InstList.push_back(Opcode | (backOp1 << 8) | (backOp2 << 16) | (extra << 24));
+	MarkUsed.push_back(false);
+	return curIndex;
+}
+
+#if 0
+InstLoc IRBuilder::EmitTriOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, InstLoc Op3)
+{
+	InstLoc curIndex = InstList.data() + InstList.size();
+	unsigned backOp1 = curIndex - 1 - Op1;
+	if (backOp1 >= 254)
+	{
+		InstList.push_back(Tramp | backOp1 << 8);
+		MarkUsed.push_back(false);
+		backOp1 = 0;
+		curIndex++;
+	}
+
+	unsigned backOp2 = curIndex - 1 - Op2;
+	if (backOp2 >= 255)
+	{
+		InstList.push_back((Tramp | backOp2 << 8));
+		MarkUsed.push_back(false);
+		backOp2 = 0;
+		backOp1++;
+		curIndex++;
+	}
+
+	unsigned backOp3 = curIndex - 1 - Op3;
+	if (backOp3 >= 256)
+	{
+		InstList.push_back(Tramp | (backOp3 << 8));
+		MarkUsed.push_back(false);
+		backOp3 = 0;
+		backOp2++;
+		backOp1++;
+		curIndex++;
+	}
+
+	InstList.push_back(Opcode | (backOp1 << 8) | (backOp2 << 16) | (backOp3 << 24));
+	MarkUsed.push_back(false);
+	return curIndex;
+}
+#endif
+
+unsigned IRBuilder::ComputeKnownZeroBits(InstLoc I) const
+{
+	switch (getOpcode(*I))
+	{
+	case Load8:
+		return 0xFFFFFF00;
+	case Or:
+		return ComputeKnownZeroBits(getOp1(I)) &
+		       ComputeKnownZeroBits(getOp2(I));
+	case And:
+		return ComputeKnownZeroBits(getOp1(I)) |
+		       ComputeKnownZeroBits(getOp2(I));
+	case Shl:
+		if (isImm(*getOp2(I)))
+		{
+			unsigned samt = GetImmValue(getOp2(I)) & 31;
+			return (ComputeKnownZeroBits(getOp1(I)) << samt) |
+			        ~(-1U << samt);
+		}
+		return 0;
+	case Shrl:
+		if (isImm(*getOp2(I)))
+		{
+			unsigned samt = GetImmValue(getOp2(I)) & 31;
+			return (ComputeKnownZeroBits(getOp1(I)) >> samt) |
+			        ~(-1U >> samt);
+		}
+		return 0;
+	case Rol:
+		if (isImm(*getOp2(I)))
+		{
+			return _rotl(ComputeKnownZeroBits(getOp1(I)),
+			             GetImmValue(getOp2(I)));
+		}
+	default:
+		return 0;
+	}
+}
+
+InstLoc IRBuilder::FoldZeroOp(unsigned Opcode, unsigned extra)
+{
+	if (Opcode == LoadGReg)
+	{
+		// Reg load folding: if we already loaded the value,
+		// load it again
+		if (!GRegCache[extra])
+			GRegCache[extra] = EmitZeroOp(LoadGReg, extra);
+		return GRegCache[extra];
+	}
+	else if (Opcode == LoadFReg)
+	{
+		// Reg load folding: if we already loaded the value,
+		// load it again
+		if (!FRegCache[extra])
+			FRegCache[extra] = EmitZeroOp(LoadFReg, extra);
+		return FRegCache[extra];
+	}
+	else if (Opcode == LoadFRegDENToZero)
+	{
+		FRegCacheStore[extra] = nullptr; // prevent previous store operation from zapping
+		FRegCache[extra] = EmitZeroOp(LoadFRegDENToZero, extra);
+		return FRegCache[extra];
+	}
+	else if (Opcode == LoadCarry)
+	{
+		if (!CarryCache)
+			CarryCache = EmitZeroOp(LoadCarry, extra);
+		return CarryCache;
+	}
+	else if (Opcode == LoadCR)
+	{
+		if (!CRCache[extra])
+			CRCache[extra] = EmitZeroOp(LoadCR, extra);
+		return CRCache[extra];
+	}
+	else if (Opcode == LoadCTR)
+	{
+		if (!CTRCache)
+			CTRCache = EmitZeroOp(LoadCTR, extra);
+		return CTRCache;
+	}
+
+	return EmitZeroOp(Opcode, extra);
+}
+
+InstLoc IRBuilder::FoldUOp(unsigned Opcode, InstLoc Op1, unsigned extra)
+{
+	if (Opcode == StoreGReg)
+	{
+		// Reg store folding: save the value for load folding.
+		// If there's a previous store, zap it because it's dead.
+		GRegCache[extra] = Op1;
+		if (GRegCacheStore[extra])
+			*GRegCacheStore[extra] = 0;
+
+		GRegCacheStore[extra] = EmitUOp(StoreGReg, Op1, extra);
+		return GRegCacheStore[extra];
+	}
+	else if (Opcode == StoreFReg)
+	{
+		FRegCache[extra] = Op1;
+		if (FRegCacheStore[extra])
+			*FRegCacheStore[extra] = 0;
+
+		FRegCacheStore[extra] = EmitUOp(StoreFReg, Op1, extra);
+		return FRegCacheStore[extra];
+	}
+	else if (Opcode == StoreCarry)
+	{
+		CarryCache = Op1;
+		if (CarryCacheStore)
+			*CarryCacheStore = 0;
+
+		CarryCacheStore = EmitUOp(StoreCarry, Op1, extra);
+		return CarryCacheStore;
+	}
+	else if (Opcode == StoreCR)
+	{
+		CRCache[extra] = Op1;
+		if (CRCacheStore[extra])
+			*CRCacheStore[extra] = 0;
+
+		CRCacheStore[extra] = EmitUOp(StoreCR, Op1, extra);
+		return CRCacheStore[extra];
+	}
+	else if (Opcode == StoreCTR)
+	{
+		CTRCache = Op1;
+		if (CTRCacheStore)
+			*CTRCacheStore = 0;
+
+		CTRCacheStore = EmitUOp(StoreCTR, Op1, extra);
+		return CTRCacheStore;
+	}
+	else if (Opcode == CompactMRegToPacked)
+	{
+		if (getOpcode(*Op1) == ExpandPackedToMReg)
+			return getOp1(Op1);
+	}
+	else if (Opcode == DoubleToSingle)
+	{
+		if (getOpcode(*Op1) == DupSingleToMReg)
+			return getOp1(Op1);
+
+		if (getOpcode(*Op1) >= FDMul && getOpcode(*Op1) <= FDSub)
+		{
+			InstLoc OOp1 = getOp1(Op1), OOp2 = getOp2(Op1);
+			if (getOpcode(*OOp1) == DupSingleToMReg &&
+			    getOpcode(*OOp2) == DupSingleToMReg)
+			{
+				if (getOpcode(*Op1) == FDMul)
+					return FoldBiOp(FSMul, getOp1(OOp1), getOp2(OOp2));
+				else if (getOpcode(*Op1) == FDAdd)
+					return FoldBiOp(FSAdd, getOp1(OOp1), getOp2(OOp2));
+				else if (getOpcode(*Op1) == FDSub)
+					return FoldBiOp(FSSub, getOp1(OOp1), getOp2(OOp2));
+			}
+		}
+	}
+	else if (Opcode == Not)
+	{
+		if (getOpcode(*Op1) == Not)
+		{
+			return getOp1(Op1);
+		}
+	}
+	else if (Opcode == FastCRGTSet)
+	{
+		if (getOpcode(*Op1) == ICmpCRSigned)
+			return EmitICmpSgt(getOp1(Op1), getOp2(Op1));
+		if (getOpcode(*Op1) == ICmpCRUnsigned)
+			return EmitICmpUgt(getOp1(Op1), getOp2(Op1));
+		if (isImm(*Op1))
+			return EmitIntConst((s64)GetImmValue64(Op1) > 0);
+	}
+	else if (Opcode == FastCRLTSet)
+	{
+		if (getOpcode(*Op1) == ICmpCRSigned)
+			return EmitICmpSlt(getOp1(Op1), getOp2(Op1));
+		if (getOpcode(*Op1) == ICmpCRUnsigned)
+			return EmitICmpUlt(getOp1(Op1), getOp2(Op1));
+		if (isImm(*Op1))
+			return EmitIntConst(!!(GetImmValue64(Op1) & (1ull << 62)));
+	}
+	else if (Opcode == FastCREQSet)
+	{
+		if (getOpcode(*Op1) == ICmpCRSigned || getOpcode(*Op1) == ICmpCRUnsigned)
+			return EmitICmpEq(getOp1(Op1), getOp2(Op1));
+		if (isImm(*Op1))
+			return EmitIntConst((GetImmValue64(Op1) & 0xFFFFFFFFU) == 0);
+	}
+
+	return EmitUOp(Opcode, Op1, extra);
+}
+
+// Fold Add opcode. Some rules are ported from LLVM
+InstLoc IRBuilder::FoldAdd(InstLoc Op1, InstLoc Op2)
+{
+	simplifyCommutative(Add, Op1, Op2);
+
+	// i0 + i1 => (i0 + i1)
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) + GetImmValue(Op2));
+	}
+
+	// x + 0 => x
+	if (isImm(*Op2) && GetImmValue(Op2) == 0)
+	{
+		return Op1;
+	}
+
+	// x + (y - x) --> y
+	if (getOpcode(*Op2) == Sub && isSameValue(Op1, getOp2(Op2)))
+	{
+		return getOp1(Op2);
+	}
+
+	// (x - y) + y => x
+	if (getOpcode(*Op1) == Sub && isSameValue(getOp2(Op1), Op2))
+	{
+		return getOp1(Op1);
+	}
+
+	if (InstLoc negOp1 = isNeg(Op1))
+	{
+		//// TODO: Test the folding below
+		//// -A + -B  -->  -(A + B)
+		//if (InstLoc negOp2 = isNeg(Op2))
+		//{
+		//	return FoldSub(EmitIntConst(0), FoldAdd(negOp1, negOp2));
+		//}
+
+		// -A + B  -->  B - A
+		return FoldSub(Op2, negOp1);
+	}
+
+	// A + -B  -->  A - B
+	if (InstLoc negOp2 = isNeg(Op2))
+	{
+		return FoldSub(Op1, negOp2);
+	}
+
+	// (x * i0) + x => x * (i0 + 1)
+	if (getOpcode(*Op1) == Mul && isImm(*getOp2(Op1)) && isSameValue(getOp1(Op1), Op2))
+	{
+		return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + 1));
+	}
+
+	//// TODO: Test the folding below
+	//// (x * i0) + (x * i1) => x * (i0 + i1)
+	//if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul && isSameValue(getOp1(Op1), getOp1(Op2)) && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2)))
+	//{
+	//	return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + GetImmValue(getOp2(Op2))));
+	//}
+
+	// x + x * i0 => x * (i0 + 1)
+	if (getOpcode(*Op2) == Mul && isImm(*getOp2(Op2)) && isSameValue(Op1, getOp1(Op2)))
+	{
+		return FoldMul(Op1, EmitIntConst(GetImmValue(getOp2(Op2)) + 1));
+	}
+
+	// w * x + y * z => w * (x + z) iff w == y
+	if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul)
+	{
+		InstLoc w = getOp1(Op1);
+		InstLoc x = getOp2(Op1);
+		InstLoc y = getOp1(Op2);
+		InstLoc z = getOp2(Op2);
+
+		if (!isSameValue(w, y))
+		{
+			if (isSameValue(w, z))
+			{
+				std::swap(y, z);
+			}
+			else if (isSameValue(y, x))
+			{
+				std::swap(w, x);
+			}
+			else if (isSameValue(x, z))
+			{
+				std::swap(y, z);
+				std::swap(w, x);
+			}
+		}
+
+		if (isSameValue(w, y))
+		{
+			return FoldMul(w, FoldAdd(x, z));
+		}
+	}
+
+	return EmitBiOp(Add, Op1, Op2);
+}
+
+// Fold Sub opcode. Some rules are ported from LLVM
+InstLoc IRBuilder::FoldSub(InstLoc Op1, InstLoc Op2)
+{
+	// (x - x) => 0
+	if (isSameValue(Op1, Op2))
+	{
+		return EmitIntConst(0);
+	}
+
+	// x - (-A) => x + A
+	if (InstLoc negOp2 = isNeg(Op2))
+	{
+		return FoldAdd(Op1, negOp2);
+	}
+
+	// (x - i0) => x + -i0
+	if (isImm(*Op2))
+	{
+		return FoldAdd(Op1, EmitIntConst(-GetImmValue(Op2)));
+	}
+
+	if (getOpcode(*Op2) == Add)
+	{
+		// x - (x + y) => -y
+		if (isSameValue(Op1, getOp1(Op2)))
+		{
+			return FoldSub(EmitIntConst(0), getOp2(Op2));
+		}
+
+		// x - (y + x) => -y
+		if (isSameValue(Op1, getOp2(Op2)))
+		{
+			return FoldSub(EmitIntConst(0), getOp1(Op2));
+		}
+
+		// i0 - (x + i1) => (i0 - i1) - x
+		if (isImm(*Op1) && isImm(*getOp2(Op2)))
+		{
+			return FoldSub(EmitIntConst(GetImmValue(Op1) - GetImmValue(getOp2(Op2))), getOp1(Op2));
+		}
+	}
+
+	//// TODO: Test the folding below
+	//// 0 - (C << X)  -> (-C << X)
+	//if (isImm(*Op1) && GetImmValue(Op1) == 0 && getOpcode(*Op2) == Shl && isImm(*getOp1(Op2)))
+	//{
+	//	return FoldShl(EmitIntConst(-GetImmValue(getOp1(Op2))), getOp2(Op2));
+	//}
+
+	//// TODO: Test the folding below
+	//// x - x * i0 = x * (1 - i0)
+	//if (getOpcode(*Op2) == Mul && isImm(*getOp2(Op2)) && isSameValue(Op1, getOp1(Op2)))
+	//{
+	//	return FoldMul(Op1, EmitIntConst(1 - GetImmValue(getOp2(Op2))));
+	//}
+
+	if (getOpcode(*Op1) == Add)
+	{
+		// (x + y) - x => y
+		if (isSameValue(getOp1(Op1), Op2))
+		{
+			return getOp2(Op1);
+		}
+
+		// (x + y) - y => x
+		if (isSameValue(getOp2(Op1), Op2))
+		{
+			return getOp1(Op1);
+		}
+	}
+
+	//if (getOpcode(*Op1) == Sub)
+	//{
+	//	// TODO: Test the folding below
+	//	// (x - y) - x => -y
+	//	if (isSameValue(getOp1(Op1), Op2))
+	//	{
+	//		return FoldSub(EmitIntConst(0), getOp2(Op1));
+	//	}
+	//}
+
+	if (getOpcode(*Op1) == Mul)
+	{
+		// x * i0 - x => x * (i0 - 1)
+		if (isImm(*getOp2(Op1)) && isSameValue(getOp1(Op1), Op2))
+		{
+			return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) - 1));
+		}
+
+		//// TODO: Test the folding below
+		//// x * i0 - x * i1 => x * (i0 - i1)
+		//if (getOpcode(*Op2) == Mul && isSameValue(getOp1(Op1), getOp1(Op2)) && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2)))
+		//{
+		//	return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + GetImmValue(getOp2(Op2))));
+		//}
+	}
+
+	// (x + i0) - (y + i1) => (x - y) + (i0 - i1)
+	if (getOpcode(*Op1) == Add && getOpcode(*Op2) == Add && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2)))
+	{
+		return FoldAdd(FoldSub(getOp1(Op1), getOp1(Op2)), EmitIntConst(GetImmValue(getOp2(Op1)) - GetImmValue(getOp2(Op2))));
+	}
+
+	// w * x - y * z => w * (x - z) iff w == y
+	if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul)
+	{
+		InstLoc w = getOp1(Op1);
+		InstLoc x = getOp2(Op1);
+		InstLoc y = getOp1(Op2);
+		InstLoc z = getOp2(Op2);
+
+		if (!isSameValue(w, y))
+		{
+			if (isSameValue(w, z))
+			{
+				std::swap(y, z);
+			}
+			else if (isSameValue(y, x))
+			{
+				std::swap(w, x);
+			}
+			else if (isSameValue(x, z))
+			{
+				std::swap(y, z);
+				std::swap(w, x);
+			}
+		}
+
+		if (isSameValue(w, y))
+		{
+			return FoldMul(w, FoldSub(x, z));
+		}
+	}
+
+	return EmitBiOp(Sub, Op1, Op2);
+}
+
+// Fold Mul opcode. Some rules are ported from LLVM
+InstLoc IRBuilder::FoldMul(InstLoc Op1, InstLoc Op2)
+{
+	simplifyCommutative(Mul, Op1, Op2);
+
+	// i0 * i1 => (i0 * i1)
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) * GetImmValue(Op2));
+	}
+
+	// (x << i0) * i1 => x * (i1 << i0)
+	if (getOpcode(*Op1) == Shl && isImm(*getOp2(Op1)) && isImm(*Op2))
+	{
+		return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(Op2) << GetImmValue(getOp2(Op1))));
+	}
+
+	if (isImm(*Op2))
+	{
+		const unsigned imm = GetImmValue(Op2);
+
+		// x * 0 => 0
+		if (imm == 0)
+		{
+			return EmitIntConst(0);
+		}
+
+		// x * -1 => 0 - x
+		if (imm == -1U)
+		{
+			return FoldSub(EmitIntConst(0), Op1);
+		}
+
+		for (unsigned i0 = 0; i0 < 30; ++i0)
+		{
+			// x * (1 << i0) => x << i0
+			// One "shl" is faster than one "imul".
+			if (imm == (1U << i0))
+			{
+				return FoldShl(Op1, EmitIntConst(i0));
+			}
+		}
+	}
+
+	// (x + i0) * i1 => x * i1 + i0 * i1
+	// The later format can be folded by other rules, again.
+	if (getOpcode(*Op1) == Add && isImm(*getOp2(Op1)) && isImm(*Op2))
+	{
+		return FoldAdd(FoldMul(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) * GetImmValue(Op2)));
+	}
+
+	//// TODO: Test the folding below
+	//// -X * -Y => X * Y
+	//if (InstLoc negOp1 = isNeg(Op1))
+	//{
+	//	if (InstLoc negOp2 = isNeg(Op2))
+	//	{
+	//		return FoldMul(negOp1, negOp2);
+	//	}
+	//}
+
+	//// TODO: Test the folding below
+	//// x * (1 << y) => x << y
+	//if (getOpcode(*Op2) == Shl && isImm(*getOp1(Op2)) && GetImmValue(getOp1(Op2)) == 1)
+	//{
+	//	return FoldShl(Op1, getOp2(Op2));
+	//}
+
+	//// TODO: Test the folding below
+	//// (1 << y) * x => x << y
+	//if (getOpcode(*Op1) == Shl && isImm(*getOp1(Op1)) && GetImmValue(getOp1(Op1)) == 1)
+	//{
+	//	return FoldShl(Op2, getOp2(Op1));
+	//}
+
+	// x * y (where y is 0 or 1) => (0 - y) & x
+	if (ComputeKnownZeroBits(Op2) == -2U)
+	{
+		return FoldAnd(FoldSub(EmitIntConst(0), Op2), Op1);
+	}
+
+	// x * y (where y is 0 or 1) => (0 - x) & y
+	if (ComputeKnownZeroBits(Op1) == -2U)
+	{
+		return FoldAnd(FoldSub(EmitIntConst(0), Op1), Op2);
+	}
+
+	return EmitBiOp(Mul, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldMulHighUnsigned(InstLoc Op1, InstLoc Op2)
+{
+	// (i0 * i1) >> 32
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst((u32)(((u64)GetImmValue(Op1) * (u64)GetImmValue(Op2)) >> 32));
+	}
+
+	if (isImm(*Op1) && !isImm(*Op2))
+	{
+		return FoldMulHighUnsigned(Op2, Op1);
+	}
+
+	if (isImm(*Op2))
+	{
+		const unsigned imm = GetImmValue(Op2);
+
+		// (x * 0) >> 32 => 0
+		if (imm == 0)
+		{
+			return EmitIntConst(0);
+		}
+
+		for (unsigned i0 = 0; i0 < 30; ++i0)
+		{
+			// (x * (1 << i0)) => x >> (32 - i0)
+			// One "shl" is faster than one "imul".
+			if (imm == (1U << i0))
+			{
+				return FoldShrl(Op1, EmitIntConst(32 - i0));
+			}
+		}
+	}
+
+	return EmitBiOp(MulHighUnsigned, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldAnd(InstLoc Op1, InstLoc Op2)
+{
+	simplifyCommutative(And, Op1, Op2);
+
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) & GetImmValue(Op2));
+	}
+
+	if (isImm(*Op2))
+	{
+		if (!GetImmValue(Op2))
+			return EmitIntConst(0);
+
+		if (GetImmValue(Op2) == -1U)
+			return Op1;
+
+		if (getOpcode(*Op1) == And && isImm(*getOp2(Op1)))
+		{
+			unsigned RHS = GetImmValue(Op2) & GetImmValue(getOp2(Op1));
+			return FoldAnd(getOp1(Op1), EmitIntConst(RHS));
+		}
+		else if (getOpcode(*Op1) == Rol && isImm(*getOp2(Op1)))
+		{
+			unsigned shiftMask1 = -1U << (GetImmValue(getOp2(Op1)) & 31);
+
+			if (GetImmValue(Op2) == shiftMask1)
+				return FoldShl(getOp1(Op1), getOp2(Op1));
+
+			unsigned shiftAmt2 = ((32 - GetImmValue(getOp2(Op1))) & 31);
+			unsigned shiftMask2 = -1U >> shiftAmt2;
+
+			if (GetImmValue(Op2) == shiftMask2)
+			{
+				return FoldShrl(getOp1(Op1), EmitIntConst(shiftAmt2));
+			}
+		}
+
+		if (!(~ComputeKnownZeroBits(Op1) & ~GetImmValue(Op2)))
+		{
+			return Op1;
+		}
+
+		//if (getOpcode(*Op1) == Xor || getOpcode(*Op1) == Or)
+		//{
+		//	// TODO: Test the folding below
+		//	// (x op y) & z => (x & z) op y if (y & z) == 0
+		//	if ((~ComputeKnownZeroBits(getOp2(Op1)) & ~ComputeKnownZeroBits(Op2)) == 0)
+		//	{
+		//		return FoldBiOp(getOpcode(*Op1), FoldAnd(getOp1(Op1), Op2), getOp2(Op1));
+		//	}
+
+		//	// TODO: Test the folding below
+		//	// (x op y) & z => (y & z) op x if (x & z) == 0
+		//	if ((~ComputeKnownZeroBits(getOp1(Op1)) & ~ComputeKnownZeroBits(Op2)) == 0)
+		//	{
+		//		return FoldBiOp(getOpcode(*Op1), FoldAnd(getOp2(Op1), Op2), getOp1(Op1));
+		//	}
+		//}
+	}
+
+	//// TODO: Test the folding below
+	//// (x >> z) & (y >> z) => (x & y) >> z
+	//if (getOpcode(*Op1) == Shrl && getOpcode(*Op2) == Shrl && isSameValue(getOp2(Op1), getOp2(Op2)))
+	//{
+	//	return FoldShl(FoldAnd(getOp1(Op1), getOp2(Op1)), getOp2(Op1));
+	//}
+
+	//// TODO: Test the folding below
+	//// ((A | N) + B) & AndRHS -> (A + B) & AndRHS iff N&AndRHS == 0
+	//// ((A ^ N) + B) & AndRHS -> (A + B) & AndRHS iff N&AndRHS == 0
+	//// ((A | N) - B) & AndRHS -> (A - B) & AndRHS iff N&AndRHS == 0
+	//// ((A ^ N) - B) & AndRHS -> (A - B) & AndRHS iff N&AndRHS == 0
+	//if ((getOpcode(*Op1) == Add || getOpcode(*Op1) == Sub) &&
+	//    (getOpcode(*getOp1(Op1)) == Or || getOpcode(*getOp1(Op1)) == Xor))
+	//{
+	//	const InstLoc A = getOp1(getOp1(Op1));
+	//	const InstLoc N = getOp2(getOp1(Op1));
+	//	const InstLoc B = getOp2(Op1);
+	//	const InstLoc AndRHS = Op2;
+	//	if ((~ComputeKnownZeroBits(N) & ~ComputeKnownZeroBits(AndRHS)) == 0)
+	//	{
+	//		return FoldAnd(FoldBiOp(getOpcode(*Op1), A, B), AndRHS);
+	//	}
+	//}
+
+	//// TODO: Test the folding below
+	//// (~A & ~B) == (~(A | B)) - De Morgan's Law
+	//if (InstLoc notOp1 = isNot(Op1))
+	//{
+	//	if (InstLoc notOp2 = isNot(Op2))
+	//	{
+	//		return FoldXor(EmitIntConst(-1U), FoldOr(notOp1, notOp2));
+	//	}
+	//}
+
+	//// TODO: Test the folding below
+	//// (X^C)|Y -> (X|Y)^C iff Y&C == 0
+	//if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1)) && (~ComputeKnownZeroBits(Op2) & GetImmValue(getOp2(Op1))) == 0)
+	//{
+	//	return FoldXor(FoldOr(getOp1(Op1), Op2), getOp2(Op1));
+	//}
+
+	if (Op1 == Op2)
+		return Op1;
+
+	return EmitBiOp(And, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldOr(InstLoc Op1, InstLoc Op2)
+{
+	simplifyCommutative(Or, Op1, Op2);
+
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) | GetImmValue(Op2));
+	}
+
+	if (isImm(*Op2))
+	{
+		if (!GetImmValue(Op2))
+			return Op1;
+
+		if (GetImmValue(Op2) == -1U)
+			return EmitIntConst(-1U);
+
+		if (getOpcode(*Op1) == Or && isImm(*getOp2(Op1)))
+		{
+			unsigned RHS = GetImmValue(Op2) | GetImmValue(getOp2(Op1));
+
+			return FoldOr(getOp1(Op1), EmitIntConst(RHS));
+		}
+
+		// (X & C1) | C2 --> (X | C2) & (C1|C2)
+		// iff (C1 & C2) == 0.
+		if (getOpcode(*Op1) == And && isImm(*getOp2(Op1)) && (GetImmValue(getOp2(Op1)) & GetImmValue(Op2)) == 0)
+		{
+			return FoldAnd(FoldOr(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) | GetImmValue(Op2)));
+		}
+
+		// (X ^ C1) | C2 --> (X | C2) ^ (C1&~C2)
+		if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1)) && isImm(*Op2))
+		{
+			return FoldXor(FoldOr(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) & ~GetImmValue(Op2)));
+		}
+	}
+
+	// (~A | ~B) == (~(A & B)) - De Morgan's Law
+	if (getOpcode(*Op1) == Not && getOpcode(*Op2) == Not)
+	{
+		return EmitNot(FoldAnd(getOp1(Op1), getOp1(Op2)));
+	}
+
+	if (Op1 == Op2)
+		return Op1;
+
+	return EmitBiOp(Or, Op1, Op2);
+}
+
+static unsigned ICmpInverseOp(unsigned op)
+{
+	switch (op)
+	{
+	case ICmpEq:
+		return ICmpNe;
+	case ICmpNe:
+		return ICmpEq;
+	case ICmpUlt:
+		return ICmpUge;
+	case ICmpUgt:
+		return ICmpUle;
+	case ICmpUle:
+		return ICmpUgt;
+	case ICmpUge:
+		return ICmpUlt;
+	case ICmpSlt:
+		return ICmpSge;
+	case ICmpSgt:
+		return ICmpSle;
+	case ICmpSle:
+		return ICmpSgt;
+	case ICmpSge:
+		return ICmpSlt;
+	default:
+		PanicAlert("Bad opcode");
+		return Nop;
+	}
+}
+
+InstLoc IRBuilder::FoldXor(InstLoc Op1, InstLoc Op2)
+{
+	simplifyCommutative(Xor, Op1, Op2);
+
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) ^ GetImmValue(Op2));
+	}
+
+	if (isImm(*Op2))
+	{
+		if (!GetImmValue(Op2))
+			return Op1;
+
+		if (GetImmValue(Op2) == 0xFFFFFFFFU)
+		{
+			return EmitNot(Op1);
+		}
+
+		if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1)))
+		{
+			unsigned RHS = GetImmValue(Op2) ^
+				       GetImmValue(getOp2(Op1));
+			return FoldXor(getOp1(Op1), EmitIntConst(RHS));
+		}
+
+		if (isICmp(getOpcode(*Op1)) && GetImmValue(Op2) == 1)
+		{
+			return FoldBiOp(ICmpInverseOp(getOpcode(*Op1)), getOp1(Op1), getOp2(Op1));
+		}
+	}
+
+	if (Op1 == Op2)
+		return EmitIntConst(0);
+
+	return EmitBiOp(Xor, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldShl(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op2))
+	{
+		// Shl x 0 => x
+		if (!GetImmValue(Op2))
+		{
+			return Op1;
+		}
+
+		if (isImm(*Op1))
+			return EmitIntConst(GetImmValue(Op1) << (GetImmValue(Op2) & 31));
+
+		// ((x * i0) << i1) == x * (i0 << i1)
+		if (getOpcode(*Op1) == Mul && isImm(*getOp2(Op1)))
+		{
+			return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) << GetImmValue(Op2)));
+		}
+	}
+
+	// 0 << x => 0
+	if (isImm(*Op1) && GetImmValue(Op1) == 0)
+	{
+		return EmitIntConst(0);
+	}
+
+	return EmitBiOp(Shl, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldShrl(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		return EmitIntConst(GetImmValue(Op1) >> (GetImmValue(Op2) & 31));
+	}
+
+	return EmitBiOp(Shrl, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldRol(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op2))
+	{
+		if (isImm(*Op1))
+			return EmitIntConst(_rotl(GetImmValue(Op1), GetImmValue(Op2)));
+
+		if (!(GetImmValue(Op2) & 31))
+			return Op1;
+	}
+	return EmitBiOp(Rol, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldBranchCond(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op1))
+	{
+		if (GetImmValue(Op1))
+			return EmitBranchUncond(Op2);
+
+		return nullptr;
+	}
+
+	return EmitBiOp(BranchCond, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldICmp(unsigned Opcode, InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op1))
+	{
+		if (isImm(*Op2))
+		{
+			unsigned result = 0;
+			switch (Opcode)
+			{
+			case ICmpEq:
+				result = GetImmValue(Op1) == GetImmValue(Op2);
+				break;
+			case ICmpNe:
+				result = GetImmValue(Op1) != GetImmValue(Op2);
+				break;
+			case ICmpUgt:
+				result = GetImmValue(Op1) > GetImmValue(Op2);
+				break;
+			case ICmpUlt:
+				result = GetImmValue(Op1) < GetImmValue(Op2);
+				break;
+			case ICmpUge:
+				result = GetImmValue(Op1) >= GetImmValue(Op2);
+				break;
+			case ICmpUle:
+				result = GetImmValue(Op1) <= GetImmValue(Op2);
+				break;
+			case ICmpSgt:
+				result = (signed)GetImmValue(Op1) >  (signed)GetImmValue(Op2);
+				break;
+			case ICmpSlt:
+				result = (signed)GetImmValue(Op1) <  (signed)GetImmValue(Op2);
+				break;
+			case ICmpSge:
+				result = (signed)GetImmValue(Op1) >= (signed)GetImmValue(Op2);
+				break;
+			case ICmpSle:
+				result = (signed)GetImmValue(Op1) <= (signed)GetImmValue(Op2);
+				break;
+			}
+			return EmitIntConst(result);
+		}
+		switch (Opcode)
+		{
+		case ICmpEq:
+			return FoldICmp(ICmpEq, Op2, Op1);
+		case ICmpNe:
+			return FoldICmp(ICmpNe, Op2, Op1);
+		case ICmpUlt:
+			return FoldICmp(ICmpUgt, Op2, Op1);
+		case ICmpUgt:
+			return FoldICmp(ICmpUlt, Op2, Op1);
+		case ICmpUle:
+			return FoldICmp(ICmpUge, Op2, Op1);
+		case ICmpUge:
+			return FoldICmp(ICmpUle, Op2, Op1);
+		case ICmpSlt:
+			return FoldICmp(ICmpSgt, Op2, Op1);
+		case ICmpSgt:
+			return FoldICmp(ICmpSlt, Op2, Op1);
+		case ICmpSle:
+			return FoldICmp(ICmpSge, Op2, Op1);
+		case ICmpSge:
+			return FoldICmp(ICmpSle, Op2, Op1);
+		}
+	}
+
+	return EmitBiOp(Opcode, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldICmpCRSigned(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		s64 diff = (s64)(s32)GetImmValue(Op1) - (s64)(s32)GetImmValue(Op2);
+		return EmitIntConst64((u64)diff);
+	}
+
+	return EmitBiOp(ICmpCRSigned, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldICmpCRUnsigned(InstLoc Op1, InstLoc Op2)
+{
+	if (isImm(*Op1) && isImm(*Op2))
+	{
+		u64 diff = (u64)GetImmValue(Op1) - (u64)GetImmValue(Op2);
+		return EmitIntConst64(diff);
+	}
+
+	return EmitBiOp(ICmpCRUnsigned, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldFallBackToInterpreter(InstLoc Op1, InstLoc Op2)
+{
+	for (unsigned i = 0; i < 32; i++)
+	{
+		GRegCache[i] = nullptr;
+		GRegCacheStore[i] = nullptr;
+		FRegCache[i] = nullptr;
+		FRegCacheStore[i] = nullptr;
+	}
+
+	CarryCache = nullptr;
+	CarryCacheStore = nullptr;
+
+	for (unsigned i = 0; i < 8; i++)
+	{
+		CRCache[i] = nullptr;
+		CRCacheStore[i] = nullptr;
+	}
+
+	CTRCache = nullptr;
+	CTRCacheStore = nullptr;
+	return EmitBiOp(FallBackToInterpreter, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldDoubleBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2)
+{
+	if (getOpcode(*Op1) == InsertDoubleInMReg)
+	{
+		return FoldDoubleBiOp(Opcode, getOp1(Op1), Op2);
+	}
+
+	if (getOpcode(*Op2) == InsertDoubleInMReg)
+	{
+		return FoldDoubleBiOp(Opcode, Op1, getOp1(Op2));
+	}
+
+	return EmitBiOp(Opcode, Op1, Op2);
+}
+
+InstLoc IRBuilder::FoldBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, unsigned extra)
+{
+	switch (Opcode)
+	{
+		case Add:
+			return FoldAdd(Op1, Op2);
+		case Sub:
+			return FoldSub(Op1, Op2);
+		case Mul:
+			return FoldMul(Op1, Op2);
+		case MulHighUnsigned:
+			return FoldMulHighUnsigned(Op1, Op2);
+		case And:
+			return FoldAnd(Op1, Op2);
+		case Or:
+			return FoldOr(Op1, Op2);
+		case Xor:
+			return FoldXor(Op1, Op2);
+		case Shl:
+			return FoldShl(Op1, Op2);
+		case Shrl:
+			return FoldShrl(Op1, Op2);
+		case Rol:
+			return FoldRol(Op1, Op2);
+		case BranchCond:
+			return FoldBranchCond(Op1, Op2);
+		case ICmpEq: case ICmpNe:
+		case ICmpUgt: case ICmpUlt: case ICmpUge: case ICmpUle:
+		case ICmpSgt: case ICmpSlt: case ICmpSge: case ICmpSle:
+			return FoldICmp(Opcode, Op1, Op2);
+		case ICmpCRSigned:
+			return FoldICmpCRSigned(Op1, Op2);
+		case ICmpCRUnsigned:
+			return FoldICmpCRUnsigned(Op1, Op2);
+		case FallBackToInterpreter:
+			return FoldFallBackToInterpreter(Op1, Op2);
+		case FDMul:
+		case FDAdd:
+		case FDSub:
+			return FoldDoubleBiOp(Opcode, Op1, Op2);
+		default:
+			return EmitBiOp(Opcode, Op1, Op2, extra);
+	}
+}
+
+InstLoc IRBuilder::EmitIntConst64(u64 value)
+{
+	InstLoc curIndex = InstList.data() + InstList.size();
+	InstList.push_back(CInt32 | ((unsigned int)ConstList.size() << 8));
+	MarkUsed.push_back(false);
+	ConstList.push_back(value);
+	return curIndex;
+}
+
+u64 IRBuilder::GetImmValue64(InstLoc I) const
+{
+	return ConstList[*I >> 8];
+}
+
+void IRBuilder::SetMarkUsed(InstLoc I)
+{
+	const unsigned i = (unsigned)(I - InstList.data());
+	MarkUsed[i] = true;
+}
+
+bool IRBuilder::IsMarkUsed(InstLoc I) const
+{
+	const unsigned i = (unsigned)(I - InstList.data());
+	return MarkUsed[i];
+}
+
+bool IRBuilder::isSameValue(InstLoc Op1, InstLoc Op2) const
+{
+	if (Op1 == Op2)
+	{
+		return true;
+	}
+
+	if (isImm(*Op1) && isImm(*Op2) && GetImmValue(Op1) == GetImmValue(Op2))
+	{
+		return true;
+	}
+
+	if (getNumberOfOperands(Op1) == 2 && getOpcode(*Op1) != StorePaired && getOpcode(*Op1) == getOpcode(*Op2) &&
+	    isSameValue(getOp1(Op1), getOp1(Op2)) && isSameValue(getOp2(Op1), getOp2(Op2)))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+// Assign a complexity or rank value to Inst
+// Ported from InstructionCombining.cpp in LLVM
+// 0 -> undef
+// 1 -> Nop, Const
+// 2 -> ZeroOp
+// 3 -> UOp
+// 4 -> BiOp
+unsigned IRBuilder::getComplexity(InstLoc I) const
+{
+	const unsigned Opcode = getOpcode(*I);
+	if (Opcode == Nop || Opcode == CInt16 || Opcode == CInt32)
+	{
+		return 1;
+	}
+
+	const unsigned numberOfOperands = getNumberOfOperands(I);
+	if (numberOfOperands == -1U)
+	{
+		return 0;
+	}
+
+	return numberOfOperands + 2;
+}
+
+
+unsigned IRBuilder::getNumberOfOperands(InstLoc I) const
+{
+	static unsigned numberOfOperands[256];
+	static bool initialized = false;
+	if (!initialized)
+	{
+		initialized = true;
+		std::fill_n(numberOfOperands, sizeof(numberOfOperands) / sizeof(numberOfOperands[0]), -1U);
+
+		numberOfOperands[Nop] = 0;
+		numberOfOperands[CInt16] = 0;
+		numberOfOperands[CInt32] = 0;
+
+		static unsigned ZeroOp[] = { LoadCR, LoadLink, LoadMSR, LoadGReg, LoadCTR, InterpreterBranch, LoadCarry, RFIExit, LoadFReg, LoadFRegDENToZero, LoadGQR, Int3, };
+		static unsigned UOp[] = { StoreLink, BranchUncond, StoreCR, StoreMSR, StoreFPRF, StoreGReg, StoreCTR, Load8, Load16, Load32, SExt16, SExt8, Cntlzw, Not, StoreCarry, SystemCall, ShortIdleLoop, LoadSingle, LoadDouble, LoadPaired, StoreFReg, DupSingleToMReg, DupSingleToPacked, ExpandPackedToMReg, CompactMRegToPacked, FSNeg, FDNeg, FPDup0, FPDup1, FPNeg, DoubleToSingle, StoreGQR, StoreSRR, ConvertFromFastCR, ConvertToFastCR, FastCRSOSet, FastCREQSet, FastCRGTSet, FastCRLTSet, };
+		static unsigned BiOp[] = { BranchCond, IdleBranch, And, Xor, Sub, Or, Add, Mul, Rol, Shl, Shrl, Sarl, ICmpEq, ICmpNe, ICmpUgt, ICmpUlt, ICmpSgt, ICmpSlt, ICmpSge, ICmpSle, Store8, Store16, Store32, ICmpCRSigned, ICmpCRUnsigned, FallBackToInterpreter, StoreSingle, StoreDouble, StorePaired, InsertDoubleInMReg, FSMul, FSAdd, FSSub, FDMul, FDAdd, FDSub, FPAdd, FPMul, FPSub, FPMerge00, FPMerge01, FPMerge10, FPMerge11, FDCmpCR, };
+		for (auto& op : ZeroOp)
+			numberOfOperands[op] = 0;
+
+		for (auto& op : UOp)
+			numberOfOperands[op] = 1;
+
+		for (auto& op : BiOp)
+			numberOfOperands[op] = 2;
+	}
+
+	return numberOfOperands[getOpcode(*I)];
+}
+
+// Performs a few simplifications for commutative operators
+// Ported from InstructionCombining.cpp in LLVM
+void IRBuilder::simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2)
+{
+	// Order operands such that they are listed from right (least complex) to
+	// left (most complex).  This puts constants before unary operators before
+	// binary operators.
+	if (getComplexity(Op1) < getComplexity(Op2))
+	{
+		std::swap(Op1, Op2);
+	}
+
+	// Is this associative?
+	switch (Opcode)
+	{
+		case Add:
+		case Mul:
+		case And:
+		case Or:
+		case Xor:
+			break;
+		default:
+			return;
+	}
+
+	// (V op C1) op C2 => V + (C1 + C2)
+	if (getOpcode(*Op1) == Opcode && isImm(*getOp2(Op1)) && isImm(*Op2))
+	{
+		const InstLoc Op1Old = Op1;
+		const InstLoc Op2Old = Op2;
+		Op1 = getOp1(Op1Old);
+		Op2 = FoldBiOp(Opcode, getOp2(Op1Old), Op2Old);
+	}
+
+	// ((V1 op C1) op (V2 op C2)) => ((V1 op V2) op (C1 op C2))
+	// Transform: (op (op V1, C1), (op V2, C2)) ==> (op (op V1, V2), (op C1,C2))
+	if (getOpcode(*Op1) == Opcode && isImm(*getOp2(Op1)) && getOpcode(*Op2) == Opcode && isImm(*getOp2(Op2)))
+	{
+		const InstLoc Op1Old = Op1;
+		const InstLoc Op2Old = Op2;
+		Op1 = FoldBiOp(Opcode, getOp1(Op1Old), getOp1(Op2Old));
+		Op2 = FoldBiOp(Opcode, getOp2(Op1Old), getOp2(Op2Old));
+	}
+
+	// FIXME: Following code has a bug.
+	// ((w op x) op (y op z)) => (((w op x) op y) op z)
+	/*
+	if (getOpcode(*Op1) == Opcode && getOpcode(*Op2) == Opcode)
+	{
+		// Sort the operands where the complexities will be descending order.
+		std::pair<unsigned, InstLoc> ops[4];
+		ops[0] = std::make_pair(getComplexity(getOp1(Op1)), getOp1(Op1));
+		ops[1] = std::make_pair(getComplexity(getOp2(Op1)), getOp2(Op1));
+		ops[2] = std::make_pair(getComplexity(getOp1(Op2)), getOp1(Op2));
+		ops[3] = std::make_pair(getComplexity(getOp2(Op2)), getOp2(Op2));
+		std::sort(ops, ops + 4, std::greater<std::pair<unsigned, InstLoc> >());
+
+		Op1 = FoldBiOp(Opcode, FoldBiOp(Opcode, ops[0].second, ops[1].second), ops[2].second);
+		Op2 = ops[3].second;
+	}
+	*/
+}
+
+bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const
+{
+	return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op2)) == 0;
+}
+
+// Returns I' if I == (0 - I')
+InstLoc IRBuilder::isNeg(InstLoc I) const
+{
+	if (getOpcode(*I) == Sub && isImm(*getOp1(I)) && GetImmValue(getOp1(I)) == 0)
+	{
+		return getOp2(I);
+	}
+
+	return nullptr;
+}
+
+// TODO: Move the following code to a separated file.
+struct Writer
+{
+	File::IOFile file;
+	Writer() : file(nullptr)
+	{
+		std::string filename = StringFromFormat("JitIL_IR_%d.txt", (int)time(nullptr));
+		file.Open(filename, "w");
+		setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024);
+	}
+
+	virtual ~Writer() {}
+};
+
+static std::unique_ptr<Writer> writer;
+
+static const std::string opcodeNames[] = {
+	"Nop", "LoadGReg", "LoadLink", "LoadCR", "LoadCarry", "LoadCTR",
+	"LoadMSR", "LoadGQR", "SExt8", "SExt16", "BSwap32", "BSwap16", "Cntlzw",
+	"Not", "Load8", "Load16", "Load32", "BranchUncond", "ConvertFromFastCR",
+	"ConvertToFastCR", "StoreGReg",	"StoreCR", "StoreLink", "StoreCarry",
+	"StoreCTR", "StoreMSR", "StoreFPRF", "StoreGQR", "StoreSRR",
+	"FastCRSOSet", "FastCREQSet", "FastCRGTSet", "FastCRLTSet",
+	"FallBackToInterpreter", "Add", "Mul", "And", "Or",	"Xor",
+	"MulHighUnsigned", "Sub", "Shl", "Shrl", "Sarl", "Rol",
+	"ICmpCRSigned", "ICmpCRUnsigned", "ICmpEq", "ICmpNe", "ICmpUgt",
+	"ICmpUlt", "ICmpUge", "ICmpUle", "ICmpSgt", "ICmpSlt", "ICmpSge",
+	"ICmpSle", "Store8", "Store16", "Store32", "BranchCond", "FResult_Start",
+	"LoadSingle", "LoadDouble", "LoadPaired", "DoubleToSingle",
+	"DupSingleToMReg", "DupSingleToPacked", "InsertDoubleInMReg",
+	"ExpandPackedToMReg", "CompactMRegToPacked", "LoadFReg",
+	"LoadFRegDENToZero", "FSMul", "FSAdd", "FSSub", "FSNeg", "FSRSqrt",
+	"FPAdd", "FPMul", "FPSub", "FPNeg", "FDMul", "FDAdd", "FDSub", "FDNeg",
+	"FPMerge00", "FPMerge01", "FPMerge10", "FPMerge11", "FPDup0", "FPDup1",
+	"FResult_End", "StorePaired", "StoreSingle", "StoreDouble", "StoreFReg",
+	"FDCmpCR", "CInt16", "CInt32", "SystemCall", "RFIExit",
+	"InterpreterBranch", "IdleBranch", "ShortIdleLoop",
+	"FPExceptionCheckStart", "FPExceptionCheckEnd", "ExtExceptionCheck",
+	"Tramp", "BlockStart", "BlockEnd", "Int3",
+};
+static const unsigned alwaysUsedList[] = {
+	FallBackToInterpreter, StoreGReg, StoreCR, StoreLink, StoreCTR, StoreMSR,
+	StoreGQR, StoreSRR, StoreCarry, StoreFPRF, Load8, Load16, Load32, Store8,
+	Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR,
+	BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop,
+	SystemCall, InterpreterBranch, RFIExit, FPExceptionCheck,
+	DSIExceptionCheck, ExtExceptionCheck, BreakPointCheck,
+	Int3, Tramp, Nop
+};
+static const unsigned extra8RegList[] = {
+	LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero,
+};
+static const unsigned extra16RegList[] = {
+	StoreGReg, StoreCR, StoreGQR, StoreSRR, LoadPaired, StoreFReg,
+};
+static const unsigned extra24RegList[] = {
+	StorePaired,
+};
+
+static const std::set<unsigned> alwaysUseds(alwaysUsedList, alwaysUsedList + sizeof(alwaysUsedList) / sizeof(alwaysUsedList[0]));
+static const std::set<unsigned> extra8Regs(extra8RegList, extra8RegList + sizeof(extra8RegList) / sizeof(extra8RegList[0]));
+static const std::set<unsigned> extra16Regs(extra16RegList, extra16RegList + sizeof(extra16RegList) / sizeof(extra16RegList[0]));
+static const std::set<unsigned> extra24Regs(extra24RegList, extra24RegList + sizeof(extra24RegList) / sizeof(extra24RegList[0]));
+
+void IRBuilder::WriteToFile(u64 codeHash)
+{
+	_assert_(sizeof(opcodeNames) / sizeof(opcodeNames[0]) == Int3 + 1);
+
+	if (!writer.get())
+	{
+		writer = std::make_unique<Writer>();
+	}
+
+	FILE* const file = writer->file.GetHandle();
+	fprintf(file, "\ncode hash:%016" PRIx64 "\n", codeHash);
+
+	const InstLoc lastCurReadPtr = curReadPtr;
+	StartForwardPass();
+	const unsigned numInsts = getNumInsts();
+	for (unsigned int i = 0; i < numInsts; ++i)
+	{
+		const InstLoc I = ReadForward();
+		const unsigned opcode = getOpcode(*I);
+		const bool thisUsed = IsMarkUsed(I) ||
+			alwaysUseds.find(opcode) != alwaysUseds.end();
+
+		// Line number
+		fprintf(file, "%4u", i);
+
+		if (!thisUsed)
+			fprintf(file, "%*c", 32, ' ');
+
+		// Opcode
+		const std::string& opcodeName = opcodeNames[opcode];
+		fprintf(file, " %-20s", opcodeName.c_str());
+		const unsigned numberOfOperands = getNumberOfOperands(I);
+
+		// Op1
+		if (numberOfOperands >= 1)
+		{
+			const IREmitter::InstLoc inst = getOp1(I);
+
+			if (isImm(*inst))
+				fprintf(file, " 0x%08x", GetImmValue(inst));
+			else
+				fprintf(file, " %10u", i - (unsigned int)(I - inst));
+		}
+
+		// Op2
+		if (numberOfOperands >= 2)
+		{
+			const IREmitter::InstLoc inst = getOp2(I);
+
+			if (isImm(*inst))
+				fprintf(file, " 0x%08x", GetImmValue(inst));
+			else
+				fprintf(file, " %10u", i - (unsigned int)(I - inst));
+		}
+
+		if (extra8Regs.count(opcode))
+			fprintf(file, " R%d", *I >> 8);
+
+		if (extra16Regs.count(opcode))
+			fprintf(file, " R%d", *I >> 16);
+
+		if (extra24Regs.count(opcode))
+			fprintf(file, " R%d", *I >> 24);
+
+		if (opcode == CInt32 || opcode == CInt16)
+			fprintf(file, " 0x%08x", GetImmValue(I));
+
+		fprintf(file, "\n");
+	}
+
+	curReadPtr = lastCurReadPtr;
+}
+
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.h b/Source/Core/Core/PowerPC/JitILCommon/IR.h
new file mode 100644
index 0000000000..53339be7eb
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/IR.h
@@ -0,0 +1,835 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+
+#include "Common/x64Emitter.h"
+
+namespace IREmitter
+{
+
+enum Opcode
+{
+	Nop = 0,
+
+	// "Zero-operand" operators
+	// Register load operators
+	LoadGReg,
+	LoadLink,
+	LoadCR,
+	LoadCarry,
+	LoadCTR,
+	LoadMSR,
+	LoadGQR,
+
+	// Unary operators
+	// Integer unary operators
+	SExt8,
+	SExt16,
+	BSwap32,
+	BSwap16,
+	Cntlzw, // Count leading zeros
+	Not,
+	Load8,  // These loads zext
+	Load16,
+	Load32,
+	// CR conversions
+	ConvertFromFastCR,
+	ConvertToFastCR,
+	// Branches
+	BranchUncond,
+	// Register store operators
+	StoreGReg,
+	StoreCR,
+	StoreLink,
+	StoreCarry,
+	StoreCTR,
+	StoreMSR,
+	StoreFPRF,
+	StoreGQR,
+	StoreSRR,
+	// Branch conditions
+	FastCRSOSet,
+	FastCREQSet,
+	FastCRGTSet,
+	FastCRLTSet,
+	// Arbitrary interpreter instruction
+	FallBackToInterpreter,
+
+	// Binary operators
+	// Commutative integer operators
+	Add,
+	Mul,
+	And,
+	Or,
+	Xor,
+	// Non-commutative integer operators
+	MulHighUnsigned,
+	Sub,
+	Shl,  // Note that shifts ignore bits above the bottom 5
+	Shrl,
+	Sarl,
+	Rol,
+	ICmpCRSigned,   // CR for signed int compare
+	ICmpCRUnsigned, // CR for unsigned int compare
+	ICmpEq,         // One if equal, zero otherwise
+	ICmpNe,
+	ICmpUgt, // One if op1 > op2, zero otherwise
+	ICmpUlt,
+	ICmpUge,
+	ICmpUle,
+	ICmpSgt, // One if op1 > op2, zero otherwise
+	ICmpSlt,
+	ICmpSge,
+	ICmpSle, // Opposite of sgt
+
+	// Memory store operators
+	Store8,
+	Store16,
+	Store32,
+	BranchCond,
+	// Floating-point
+	// There are three floating-point formats: single, double,
+	// and packed.  For any operation where the format of the
+	// operand isn't known, the ForceTo* operations are used;
+	// these are folded into the appropriate conversion
+	// (or no conversion) depending on the type of the operand.
+	// The "mreg" format is a pair of doubles; this is the
+	// most general possible represenation which is used
+	// in the register state.
+	// This might seem like overkill, but the semantics require
+	// having the different formats.
+	// FIXME: Check the accuracy of the mapping:
+	// 1. Is paired arithmetic always rounded to single-precision
+	//    first, or does it do double-to-single like the
+	//    single-precision instructions?
+	// 2. The implementation of madd is slightly off, and
+	//    the implementation of fmuls is very slightly off;
+	//    likely nothing cares, though.
+	FResult_Start,
+	LoadSingle,
+	LoadDouble,
+	LoadPaired, // This handles quantizers itself
+	DoubleToSingle,
+	DupSingleToMReg,
+	DupSingleToPacked,
+	InsertDoubleInMReg,
+	ExpandPackedToMReg,
+	CompactMRegToPacked,
+	LoadFReg,
+	LoadFRegDENToZero,
+	FSMul,
+	FSAdd,
+	FSSub,
+	FSNeg,
+	FPAdd,
+	FPMul,
+	FPSub,
+	FPNeg,
+	FDMul,
+	FDAdd,
+	FDSub,
+	FDNeg,
+	FPMerge00,
+	FPMerge01,
+	FPMerge10,
+	FPMerge11,
+	FPDup0,
+	FPDup1,
+	FResult_End,
+	StorePaired,
+	StoreSingle,
+	StoreDouble,
+	StoreFReg,
+	FDCmpCR,
+
+	// "Trinary" operators
+	// FIXME: Need to change representation!
+	//Select,       // Equivalent to C "Op1 ? Op2 : Op3"
+
+	// Integer constants
+	CInt16,
+	CInt32,
+
+	// Funny PPC "branches"
+	SystemCall,
+	RFIExit,
+	InterpreterBranch,
+
+	IdleBranch,    // branch operation belonging to idle loop
+	ShortIdleLoop, // Idle loop seen in homebrew like Wii mahjong,
+	               // just a branch
+
+	// used for exception checking, at least until someone
+	// has a better idea of integrating it
+	FPExceptionCheck, DSIExceptionCheck,
+	ExtExceptionCheck, BreakPointCheck,
+	// "Opcode" representing a register too far away to
+	// reference directly; this is a size optimization
+	Tramp,
+	// "Opcode"s representing the start and end
+	BlockStart, BlockEnd,
+
+	// used for debugging
+	Int3
+};
+
+typedef unsigned Inst;
+typedef Inst* InstLoc;
+
+unsigned inline getOpcode(Inst i)
+{
+	return i & 255;
+}
+
+unsigned inline isImm(Inst i)
+{
+	return getOpcode(i) >= CInt16 && getOpcode(i) <= CInt32;
+}
+
+unsigned inline isICmp(Inst i)
+{
+	return getOpcode(i) >= ICmpEq && getOpcode(i) <= ICmpSle;
+}
+
+unsigned inline isFResult(Inst i)
+{
+	return getOpcode(i) > FResult_Start &&
+	       getOpcode(i) < FResult_End;
+}
+
+InstLoc inline getOp1(InstLoc i)
+{
+	i = i - 1 - ((*i >> 8) & 255);
+
+	if (getOpcode(*i) == Tramp)
+	{
+		i = i - 1 - (*i >> 8);
+	}
+
+	return i;
+}
+
+InstLoc inline getOp2(InstLoc i)
+{
+	i = i - 1 - ((*i >> 16) & 255);
+
+	if (getOpcode(*i) == Tramp)
+	{
+		i = i - 1 - (*i >> 8);
+	}
+
+	return i;
+}
+
+class IRBuilder
+{
+private:
+	InstLoc EmitZeroOp(unsigned Opcode, unsigned extra);
+	InstLoc EmitUOp(unsigned OpCode, InstLoc Op1, unsigned extra = 0);
+	InstLoc EmitBiOp(unsigned OpCode, InstLoc Op1, InstLoc Op2, unsigned extra = 0);
+
+	InstLoc FoldAdd(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldSub(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldMul(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldMulHighUnsigned(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldAnd(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldOr(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldRol(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldShl(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldShrl(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldXor(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldBranchCond(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldIdleBranch(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldICmp(unsigned Opcode, InstLoc Op1, InstLoc Op2);
+	InstLoc FoldICmpCRSigned(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldICmpCRUnsigned(InstLoc Op1, InstLoc Op2);
+	InstLoc FoldDoubleBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2);
+
+	InstLoc FoldFallBackToInterpreter(InstLoc Op1, InstLoc Op2);
+
+	InstLoc FoldZeroOp(unsigned Opcode, unsigned extra);
+	InstLoc FoldUOp(unsigned OpCode, InstLoc Op1, unsigned extra = 0);
+	InstLoc FoldBiOp(unsigned OpCode, InstLoc Op1, InstLoc Op2, unsigned extra = 0);
+
+	unsigned ComputeKnownZeroBits(InstLoc I) const;
+
+public:
+	InstLoc EmitIntConst(unsigned value) { return EmitIntConst64(value); }
+	InstLoc EmitIntConst64(u64 value);
+
+	InstLoc EmitStoreLink(InstLoc val)
+	{
+		return FoldUOp(StoreLink, val);
+	}
+
+	InstLoc EmitBranchUncond(InstLoc val)
+	{
+		return FoldUOp(BranchUncond, val);
+	}
+
+	InstLoc EmitBranchCond(InstLoc check, InstLoc dest)
+	{
+		return FoldBiOp(BranchCond, check, dest);
+	}
+
+	InstLoc EmitIdleBranch(InstLoc check, InstLoc dest)
+	{
+		return FoldBiOp(IdleBranch, check, dest);
+	}
+
+	InstLoc EmitLoadCR(unsigned crreg)
+	{
+		return FoldZeroOp(LoadCR, crreg);
+	}
+
+	InstLoc EmitStoreCR(InstLoc value, unsigned crreg)
+	{
+		return FoldUOp(StoreCR, value, crreg);
+	}
+
+	InstLoc EmitLoadLink()
+	{
+		return FoldZeroOp(LoadLink, 0);
+	}
+
+	InstLoc EmitLoadMSR()
+	{
+		return FoldZeroOp(LoadMSR, 0);
+	}
+
+	InstLoc EmitStoreMSR(InstLoc val, InstLoc pc)
+	{
+		return FoldBiOp(StoreMSR, val, pc);
+	}
+
+	InstLoc EmitStoreFPRF(InstLoc value)
+	{
+		return FoldUOp(StoreFPRF, value);
+	}
+
+	InstLoc EmitLoadGReg(unsigned reg)
+	{
+		return FoldZeroOp(LoadGReg, reg);
+	}
+
+	InstLoc EmitStoreGReg(InstLoc value, unsigned reg)
+	{
+		return FoldUOp(StoreGReg, value, reg);
+	}
+
+	InstLoc EmitNot(InstLoc op1)
+	{
+		return FoldUOp(Not, op1);
+	}
+
+	InstLoc EmitAnd(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(And, op1, op2);
+	}
+
+	InstLoc EmitXor(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Xor, op1, op2);
+	}
+
+	InstLoc EmitSub(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Sub, op1, op2);
+	}
+
+	InstLoc EmitOr(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Or, op1, op2);
+	}
+
+	InstLoc EmitAdd(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Add, op1, op2);
+	}
+
+	InstLoc EmitMul(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Mul, op1, op2);
+	}
+
+	InstLoc EmitMulHighUnsigned(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(MulHighUnsigned, op1, op2);
+	}
+
+	InstLoc EmitRol(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Rol, op1, op2);
+	}
+
+	InstLoc EmitShl(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Shl, op1, op2);
+	}
+
+	InstLoc EmitShrl(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Shrl, op1, op2);
+	}
+
+	InstLoc EmitSarl(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Sarl, op1, op2);
+	}
+
+	InstLoc EmitLoadCTR()
+	{
+		return FoldZeroOp(LoadCTR, 0);
+	}
+
+	InstLoc EmitStoreCTR(InstLoc op1)
+	{
+		return FoldUOp(StoreCTR, op1);
+	}
+
+	InstLoc EmitICmpEq(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpEq, op1, op2);
+	}
+
+	InstLoc EmitICmpNe(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpNe, op1, op2);
+	}
+
+	InstLoc EmitICmpUgt(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpUgt, op1, op2);
+	}
+
+	InstLoc EmitICmpUlt(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpUlt, op1, op2);
+	}
+
+	InstLoc EmitICmpSgt(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpSgt, op1, op2);
+	}
+
+	InstLoc EmitICmpSlt(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpSlt, op1, op2);
+	}
+
+	InstLoc EmitICmpSge(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpSge, op1, op2);
+	}
+
+	InstLoc EmitICmpSle(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpSle, op1, op2);
+	}
+
+	InstLoc EmitLoad8(InstLoc op1)
+	{
+		return FoldUOp(Load8, op1);
+	}
+
+	InstLoc EmitLoad16(InstLoc op1)
+	{
+		return FoldUOp(Load16, op1);
+	}
+
+	InstLoc EmitLoad32(InstLoc op1)
+	{
+		return FoldUOp(Load32, op1);
+	}
+
+	InstLoc EmitStore8(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Store8, op1, op2);
+	}
+
+	InstLoc EmitStore16(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Store16, op1, op2);
+	}
+
+	InstLoc EmitStore32(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(Store32, op1, op2);
+	}
+
+	InstLoc EmitSExt16(InstLoc op1)
+	{
+		return FoldUOp(SExt16, op1);
+	}
+
+	InstLoc EmitSExt8(InstLoc op1)
+	{
+		return FoldUOp(SExt8, op1);
+	}
+
+	InstLoc EmitCntlzw(InstLoc op1)
+	{
+		return FoldUOp(Cntlzw, op1);
+	}
+
+	InstLoc EmitICmpCRSigned(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpCRSigned, op1, op2);
+	}
+
+	InstLoc EmitICmpCRUnsigned(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(ICmpCRUnsigned, op1, op2);
+	}
+
+	InstLoc EmitConvertFromFastCR(InstLoc op1)
+	{
+		return FoldUOp(ConvertFromFastCR, op1);
+	}
+
+	InstLoc EmitConvertToFastCR(InstLoc op1)
+	{
+		return FoldUOp(ConvertToFastCR, op1);
+	}
+
+	InstLoc EmitFastCRSOSet(InstLoc op1)
+	{
+		return FoldUOp(FastCRSOSet, op1);
+	}
+
+	InstLoc EmitFastCREQSet(InstLoc op1)
+	{
+		return FoldUOp(FastCREQSet, op1);
+	}
+
+	InstLoc EmitFastCRLTSet(InstLoc op1)
+	{
+		return FoldUOp(FastCRLTSet, op1);
+	}
+
+	InstLoc EmitFastCRGTSet(InstLoc op1)
+	{
+		return FoldUOp(FastCRGTSet, op1);
+	}
+
+	InstLoc EmitFallBackToInterpreter(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FallBackToInterpreter, op1, op2);
+	}
+
+	InstLoc EmitInterpreterBranch()
+	{
+		return FoldZeroOp(InterpreterBranch, 0);
+	}
+
+	InstLoc EmitLoadCarry()
+	{
+		return FoldZeroOp(LoadCarry, 0);
+	}
+
+	InstLoc EmitStoreCarry(InstLoc op1)
+	{
+		return FoldUOp(StoreCarry, op1);
+	}
+
+	InstLoc EmitSystemCall(InstLoc pc)
+	{
+		return FoldUOp(SystemCall, pc);
+	}
+
+	InstLoc EmitFPExceptionCheck(InstLoc pc)
+	{
+		return EmitUOp(FPExceptionCheck, pc);
+	}
+
+	InstLoc EmitDSIExceptionCheck(InstLoc pc)
+	{
+		return EmitUOp(DSIExceptionCheck, pc);
+	}
+
+	InstLoc EmitExtExceptionCheck(InstLoc pc)
+	{
+		return EmitUOp(ExtExceptionCheck, pc);
+	}
+
+	InstLoc EmitBreakPointCheck(InstLoc pc)
+	{
+		return EmitUOp(BreakPointCheck, pc);
+	}
+
+	InstLoc EmitRFIExit()
+	{
+		return FoldZeroOp(RFIExit, 0);
+	}
+
+	InstLoc EmitShortIdleLoop(InstLoc pc)
+	{
+		return FoldUOp(ShortIdleLoop, pc);
+	}
+
+	InstLoc EmitLoadSingle(InstLoc addr)
+	{
+		return FoldUOp(LoadSingle, addr);
+	}
+
+	InstLoc EmitLoadDouble(InstLoc addr)
+	{
+		return FoldUOp(LoadDouble, addr);
+	}
+
+	InstLoc EmitLoadPaired(InstLoc addr, unsigned quantReg)
+	{
+		return FoldUOp(LoadPaired, addr, quantReg);
+	}
+
+	InstLoc EmitStoreSingle(InstLoc value, InstLoc addr)
+	{
+		return FoldBiOp(StoreSingle, value, addr);
+	}
+
+	InstLoc EmitStoreDouble(InstLoc value, InstLoc addr)
+	{
+		return FoldBiOp(StoreDouble, value, addr);
+	}
+
+	InstLoc EmitStorePaired(InstLoc value, InstLoc addr, unsigned quantReg)
+	{
+		return FoldBiOp(StorePaired, value, addr, quantReg);
+	}
+
+	InstLoc EmitLoadFReg(unsigned freg)
+	{
+		return FoldZeroOp(LoadFReg, freg);
+	}
+
+	InstLoc EmitLoadFRegDENToZero(unsigned freg)
+	{
+		return FoldZeroOp(LoadFRegDENToZero, freg);
+	}
+
+	InstLoc EmitStoreFReg(InstLoc val, unsigned freg)
+	{
+		return FoldUOp(StoreFReg, val, freg);
+	}
+
+	InstLoc EmitDupSingleToMReg(InstLoc val)
+	{
+		return FoldUOp(DupSingleToMReg, val);
+	}
+
+	InstLoc EmitDupSingleToPacked(InstLoc val)
+	{
+		return FoldUOp(DupSingleToPacked, val);
+	}
+
+	InstLoc EmitInsertDoubleInMReg(InstLoc val, InstLoc reg)
+	{
+		return FoldBiOp(InsertDoubleInMReg, val, reg);
+	}
+
+	InstLoc EmitExpandPackedToMReg(InstLoc val)
+	{
+		return FoldUOp(ExpandPackedToMReg, val);
+	}
+
+	InstLoc EmitCompactMRegToPacked(InstLoc val)
+	{
+		return FoldUOp(CompactMRegToPacked, val);
+	}
+
+	InstLoc EmitFSMul(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FSMul, op1, op2);
+	}
+
+	InstLoc EmitFSAdd(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FSAdd, op1, op2);
+	}
+
+	InstLoc EmitFSSub(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FSSub, op1, op2);
+	}
+
+	InstLoc EmitFSNeg(InstLoc op1)
+	{
+		return FoldUOp(FSNeg, op1);
+	}
+
+	InstLoc EmitFDMul(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FDMul, op1, op2);
+	}
+
+	InstLoc EmitFDAdd(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FDAdd, op1, op2);
+	}
+
+	InstLoc EmitFDSub(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FDSub, op1, op2);
+	}
+
+	InstLoc EmitFDNeg(InstLoc op1)
+	{
+		return FoldUOp(FDNeg, op1);
+	}
+
+	InstLoc EmitFPAdd(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPAdd, op1, op2);
+	}
+
+	InstLoc EmitFPMul(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPMul, op1, op2);
+	}
+
+	InstLoc EmitFPSub(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPSub, op1, op2);
+	}
+
+	InstLoc EmitFPMerge00(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPMerge00, op1, op2);
+	}
+
+	InstLoc EmitFPMerge01(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPMerge01, op1, op2);
+	}
+
+	InstLoc EmitFPMerge10(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPMerge10, op1, op2);
+	}
+
+	InstLoc EmitFPMerge11(InstLoc op1, InstLoc op2)
+	{
+		return FoldBiOp(FPMerge11, op1, op2);
+	}
+
+	InstLoc EmitFPDup0(InstLoc op1)
+	{
+		return FoldUOp(FPDup0, op1);
+	}
+
+	InstLoc EmitFPDup1(InstLoc op1)
+	{
+		return FoldUOp(FPDup1, op1);
+	}
+
+	InstLoc EmitFPNeg(InstLoc op1)
+	{
+		return FoldUOp(FPNeg, op1);
+	}
+
+	InstLoc EmitDoubleToSingle(InstLoc op1)
+	{
+		return FoldUOp(DoubleToSingle, op1);
+	}
+
+	InstLoc EmitFDCmpCR(InstLoc op1, InstLoc op2, int ordered)
+	{
+		return FoldBiOp(FDCmpCR, op1, op2, ordered);
+	}
+
+	InstLoc EmitLoadGQR(unsigned gqr)
+	{
+		return FoldZeroOp(LoadGQR, gqr);
+	}
+
+	InstLoc EmitStoreGQR(InstLoc op1, unsigned gqr)
+	{
+		return FoldUOp(StoreGQR, op1, gqr);
+	}
+
+	InstLoc EmitStoreSRR(InstLoc op1, unsigned srr)
+	{
+		return FoldUOp(StoreSRR, op1, srr);
+	}
+
+	InstLoc EmitINT3()
+	{
+		return FoldZeroOp(Int3, 0);
+	}
+
+	void StartBackPass() { curReadPtr = InstList.data() + InstList.size(); }
+	void StartForwardPass() { curReadPtr = InstList.data(); }
+	InstLoc ReadForward() { return curReadPtr++; }
+	InstLoc ReadBackward() { return --curReadPtr; }
+	InstLoc getFirstInst() { return InstList.data(); }
+	unsigned int getNumInsts() { return (unsigned int)InstList.size(); }
+	unsigned int ReadInst(InstLoc I) { return *I; }
+	unsigned int GetImmValue(InstLoc I) const { return (u32)GetImmValue64(I); }
+	u64 GetImmValue64(InstLoc I) const;
+	void SetMarkUsed(InstLoc I);
+	bool IsMarkUsed(InstLoc I) const;
+	void WriteToFile(u64 codeHash);
+
+	void Reset()
+	{
+		InstList.clear();
+		InstList.reserve(100000);
+		MarkUsed.clear();
+		MarkUsed.reserve(100000);
+
+		for (unsigned i = 0; i < 32; i++)
+		{
+			GRegCache[i] = nullptr;
+			GRegCacheStore[i] = nullptr;
+			FRegCache[i] = nullptr;
+			FRegCacheStore[i] = nullptr;
+		}
+
+		CarryCache = nullptr;
+		CarryCacheStore = nullptr;
+
+		for (unsigned i = 0; i < 8; i++)
+		{
+			CRCache[i] = nullptr;
+			CRCacheStore[i] = nullptr;
+		}
+
+		CTRCache = nullptr;
+		CTRCacheStore = nullptr;
+	}
+
+	IRBuilder()
+	{
+		Reset();
+	}
+
+private:
+	IRBuilder(IRBuilder&); // DO NOT IMPLEMENT
+	bool isSameValue(InstLoc Op1, InstLoc Op2) const;
+	unsigned getComplexity(InstLoc I) const;
+	unsigned getNumberOfOperands(InstLoc I) const;
+	void simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2);
+	bool maskedValueIsZero(InstLoc Op1, InstLoc Op2) const;
+	InstLoc isNeg(InstLoc I) const;
+
+	std::vector<Inst> InstList; // FIXME: We must ensure this is continuous!
+	std::vector<bool> MarkUsed; // Used for IRWriter
+	std::vector<u64> ConstList;
+	InstLoc curReadPtr;
+	InstLoc GRegCache[32];
+	InstLoc GRegCacheStore[32];
+	InstLoc FRegCache[32];
+	InstLoc FRegCacheStore[32];
+	InstLoc CarryCache;
+	InstLoc CarryCacheStore;
+	InstLoc CTRCache;
+	InstLoc CTRCacheStore;
+	InstLoc CRCache[8];
+	InstLoc CRCacheStore[8];
+};
+
+};
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h
new file mode 100644
index 0000000000..f536113812
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h
@@ -0,0 +1,141 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitILCommon/IR.h"
+
+class JitILBase : public Jitx86Base
+{
+protected:
+	// The default code buffer. We keep it around to not have to alloc/dealloc a
+	// large chunk of memory for each recompiled block.
+	PPCAnalyst::CodeBuffer code_buffer;
+public:
+	JitILBase() : code_buffer(32000) {}
+	~JitILBase() {}
+
+	IREmitter::IRBuilder ibuild;
+
+	virtual void Jit(u32 em_address) = 0;
+
+	virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0;
+
+	// OPCODES
+	virtual void FallBackToInterpreter(UGeckoInstruction inst) = 0;
+	virtual void DoNothing(UGeckoInstruction inst) = 0;
+	virtual void HLEFunction(UGeckoInstruction inst) = 0;
+
+	virtual void DynaRunTable4(UGeckoInstruction _inst) = 0;
+	virtual void DynaRunTable19(UGeckoInstruction _inst) = 0;
+	virtual void DynaRunTable31(UGeckoInstruction _inst) = 0;
+	virtual void DynaRunTable59(UGeckoInstruction _inst) = 0;
+	virtual void DynaRunTable63(UGeckoInstruction _inst) = 0;
+
+	// Branches
+	void sc(UGeckoInstruction inst);
+	void rfi(UGeckoInstruction inst);
+	void bx(UGeckoInstruction inst);
+	void bcx(UGeckoInstruction inst);
+	void bcctrx(UGeckoInstruction inst);
+	void bclrx(UGeckoInstruction inst);
+
+	// LoadStore
+	void lXzx(UGeckoInstruction inst);
+	void lhax(UGeckoInstruction inst);
+	void lhaux(UGeckoInstruction inst);
+	void stXx(UGeckoInstruction inst);
+	void lmw(UGeckoInstruction inst);
+	void stmw(UGeckoInstruction inst);
+	void stX(UGeckoInstruction inst); //stw sth stb
+	void lXz(UGeckoInstruction inst);
+	void lbzu(UGeckoInstruction inst);
+	void lha(UGeckoInstruction inst);
+	void lhau(UGeckoInstruction inst);
+
+	// System Registers
+	void mtspr(UGeckoInstruction inst);
+	void mfspr(UGeckoInstruction inst);
+	void mtmsr(UGeckoInstruction inst);
+	void mfmsr(UGeckoInstruction inst);
+	void mftb(UGeckoInstruction inst);
+	void mtcrf(UGeckoInstruction inst);
+	void mfcr(UGeckoInstruction inst);
+	void mcrf(UGeckoInstruction inst);
+	void crXX(UGeckoInstruction inst);
+
+	void dcbst(UGeckoInstruction inst);
+	void dcbz(UGeckoInstruction inst);
+	void icbi(UGeckoInstruction inst);
+
+	void addx(UGeckoInstruction inst);
+	void boolX(UGeckoInstruction inst);
+	void mulli(UGeckoInstruction inst);
+	void mulhwux(UGeckoInstruction inst);
+	void mullwx(UGeckoInstruction inst);
+	void divwux(UGeckoInstruction inst);
+	void srawix(UGeckoInstruction inst);
+	void srawx(UGeckoInstruction inst);
+	void addex(UGeckoInstruction inst);
+	void addzex(UGeckoInstruction inst);
+
+	void extsbx(UGeckoInstruction inst);
+	void extshx(UGeckoInstruction inst);
+
+	void reg_imm(UGeckoInstruction inst);
+
+	void ps_sel(UGeckoInstruction inst);
+	void ps_mr(UGeckoInstruction inst);
+	void ps_sign(UGeckoInstruction inst); //aggregate
+	void ps_arith(UGeckoInstruction inst); //aggregate
+	void ps_mergeXX(UGeckoInstruction inst);
+	void ps_maddXX(UGeckoInstruction inst);
+	void ps_rsqrte(UGeckoInstruction inst);
+	void ps_sum(UGeckoInstruction inst);
+	void ps_muls(UGeckoInstruction inst);
+
+	void fp_arith_s(UGeckoInstruction inst);
+
+	void fcmpx(UGeckoInstruction inst);
+	void fmrx(UGeckoInstruction inst);
+
+	void cmpXX(UGeckoInstruction inst);
+
+	void cntlzwx(UGeckoInstruction inst);
+
+	void lfs(UGeckoInstruction inst);
+	void lfsu(UGeckoInstruction inst);
+	void lfd(UGeckoInstruction inst);
+	void lfdu(UGeckoInstruction inst);
+	void stfd(UGeckoInstruction inst);
+	void stfs(UGeckoInstruction inst);
+	void stfsx(UGeckoInstruction inst);
+	void psq_l(UGeckoInstruction inst);
+	void psq_st(UGeckoInstruction inst);
+
+	void fmaddXX(UGeckoInstruction inst);
+	void fsign(UGeckoInstruction inst);
+	void rlwinmx(UGeckoInstruction inst);
+	void rlwimix(UGeckoInstruction inst);
+	void rlwnmx(UGeckoInstruction inst);
+	void negx(UGeckoInstruction inst);
+	void slwx(UGeckoInstruction inst);
+	void srwx(UGeckoInstruction inst);
+	void lfsx(UGeckoInstruction inst);
+
+	void subfic(UGeckoInstruction inst);
+	void subfcx(UGeckoInstruction inst);
+	void subfx(UGeckoInstruction inst);
+	void subfex(UGeckoInstruction inst);
+
+};
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp
new file mode 100644
index 0000000000..2deeec41ac
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp
@@ -0,0 +1,218 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+
+// The branches are known good, or at least reasonably good.
+// No need for a disable-mechanism.
+
+// If defined, clears CR0 at blr and bl-s. If the assumption that
+// flags never carry over between functions holds, then the task for
+// an optimizer becomes much easier.
+
+// #define ACID_TEST
+
+// Zelda and many more games seem to pass the Acid Test.
+
+//#define NORMALBRANCH_START FallBackToInterpreter(inst); ibuild.EmitInterpreterBranch(); return;
+#define NORMALBRANCH_START
+
+void JitILBase::sc(UGeckoInstruction inst)
+{
+	ibuild.EmitSystemCall(ibuild.EmitIntConst(js.compilerPC));
+}
+
+void JitILBase::rfi(UGeckoInstruction inst)
+{
+	ibuild.EmitRFIExit();
+}
+
+void JitILBase::bx(UGeckoInstruction inst)
+{
+	NORMALBRANCH_START
+	INSTRUCTION_START;
+
+	// We must always process the following sentence
+	// even if the blocks are merged by PPCAnalyst::Flatten().
+	if (inst.LK)
+		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
+
+	// If this is not the last instruction of a block,
+	// we will skip the rest process.
+	// Because PPCAnalyst::Flatten() merged the blocks.
+	if (!js.isLastInstruction)
+	{
+		return;
+	}
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt26(inst.LI << 2);
+	else
+		destination = js.compilerPC + SignExt26(inst.LI << 2);
+
+	if (destination == js.compilerPC)
+	{
+		ibuild.EmitShortIdleLoop(ibuild.EmitIntConst(js.compilerPC));
+		return;
+	}
+
+	ibuild.EmitBranchUncond(ibuild.EmitIntConst(destination));
+}
+
+static IREmitter::InstLoc EmitCRTest(IREmitter::IRBuilder& ibuild, UGeckoInstruction inst)
+{
+	IREmitter::InstLoc CRReg = ibuild.EmitLoadCR(inst.BI >> 2);
+	IREmitter::InstLoc CRTest = nullptr;
+	switch (3 - (inst.BI & 3))
+	{
+	case CR_SO_BIT:
+		CRTest = ibuild.EmitFastCRSOSet(CRReg);
+		break;
+	case CR_EQ_BIT:
+		CRTest = ibuild.EmitFastCREQSet(CRReg);
+		break;
+	case CR_GT_BIT:
+		CRTest = ibuild.EmitFastCRGTSet(CRReg);
+		break;
+	case CR_LT_BIT:
+		CRTest = ibuild.EmitFastCRLTSet(CRReg);
+		break;
+	}
+	if (!(inst.BO & 8))
+		CRTest = ibuild.EmitXor(CRTest, ibuild.EmitIntConst(1));
+	return CRTest;
+}
+
+static IREmitter::InstLoc TestBranch(IREmitter::IRBuilder& ibuild, UGeckoInstruction inst)
+{
+	IREmitter::InstLoc CRTest = nullptr, CTRTest = nullptr;
+	if ((inst.BO & 16) == 0)  // Test a CR bit
+	{
+		CRTest = EmitCRTest(ibuild, inst);
+	}
+
+	if ((inst.BO & 4) == 0)
+	{
+		IREmitter::InstLoc c = ibuild.EmitLoadCTR();
+		c = ibuild.EmitSub(c, ibuild.EmitIntConst(1));
+		ibuild.EmitStoreCTR(c);
+
+		if (inst.BO & 2)
+			CTRTest = ibuild.EmitICmpEq(c, ibuild.EmitIntConst(0));
+		else
+			CTRTest = c;
+	}
+
+	IREmitter::InstLoc Test = CRTest;
+	if (CTRTest)
+	{
+		if (Test)
+			Test = ibuild.EmitAnd(Test, CTRTest);
+		else
+			Test = CTRTest;
+	}
+
+	if (!Test)
+	{
+		Test = ibuild.EmitIntConst(1);
+	}
+
+	return Test;
+}
+
+void JitILBase::bcx(UGeckoInstruction inst)
+{
+	NORMALBRANCH_START
+	if (inst.LK)
+		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
+
+	IREmitter::InstLoc Test = TestBranch(ibuild, inst);
+
+	u32 destination;
+	if (inst.AA)
+		destination = SignExt16(inst.BD << 2);
+	else
+		destination = js.compilerPC + SignExt16(inst.BD << 2);
+
+	// Idle skipping:
+	// The main Idle skipping is done in the LoadStore code, but there is an optimization here.
+	// If idle skipping is enabled, then this branch will only be reached when the branch is not
+	// taken.
+	// TODO: We shouldn't use debug reads here.
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
+		inst.hex == 0x4182fff8 &&
+		(PowerPC::HostRead_U32(js.compilerPC - 8) & 0xFFFF0000) == 0x800D0000 &&
+		(PowerPC::HostRead_U32(js.compilerPC - 4) == 0x28000000 ||
+		(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC - 4) == 0x2C000000))
+		)
+	{
+		// Uh, Do nothing.
+	}
+	else
+	{
+		ibuild.EmitBranchCond(Test, ibuild.EmitIntConst(destination));
+	}
+	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
+}
+
+void JitILBase::bcctrx(UGeckoInstruction inst)
+{
+	NORMALBRANCH_START
+	if ((inst.BO & 4) == 0)
+	{
+		IREmitter::InstLoc c = ibuild.EmitLoadCTR();
+		c = ibuild.EmitSub(c, ibuild.EmitIntConst(1));
+		ibuild.EmitStoreCTR(c);
+	}
+
+	IREmitter::InstLoc test;
+	if ((inst.BO & 16) == 0)  // Test a CR bit
+	{
+		test = EmitCRTest(ibuild, inst);
+	}
+	else
+	{
+		test = ibuild.EmitIntConst(1);
+	}
+	test = ibuild.EmitICmpEq(test, ibuild.EmitIntConst(0));
+	ibuild.EmitBranchCond(test, ibuild.EmitIntConst(js.compilerPC + 4));
+
+	IREmitter::InstLoc destination = ibuild.EmitLoadCTR();
+	destination = ibuild.EmitAnd(destination, ibuild.EmitIntConst(-4));
+	if (inst.LK)
+		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
+	ibuild.EmitBranchUncond(destination);
+}
+
+void JitILBase::bclrx(UGeckoInstruction inst)
+{
+	NORMALBRANCH_START
+
+	if (!js.isLastInstruction &&
+	    (inst.BO & (1 << 4)) && (inst.BO & (1 << 2)))
+	{
+		if (inst.LK)
+			ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
+		return;
+	}
+
+	if (inst.hex == 0x4e800020)
+	{
+		ibuild.EmitBranchUncond(ibuild.EmitLoadLink());
+		return;
+	}
+
+	IREmitter::InstLoc test = TestBranch(ibuild, inst);
+	test = ibuild.EmitICmpEq(test, ibuild.EmitIntConst(0));
+	ibuild.EmitBranchCond(test, ibuild.EmitIntConst(js.compilerPC + 4));
+
+	IREmitter::InstLoc destination = ibuild.EmitLoadLink();
+	destination = ibuild.EmitAnd(destination, ibuild.EmitIntConst(-4));
+	if (inst.LK)
+		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
+	ibuild.EmitBranchUncond(destination);
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp
new file mode 100644
index 0000000000..bb1c8dc2a3
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp
@@ -0,0 +1,122 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+void JitILBase::fp_arith_s(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc || (inst.SUBOP5 != 25 && inst.SUBOP5 != 20 && inst.SUBOP5 != 21));
+
+	// Only the interpreter has "proper" support for (some) FP flags
+	FALLBACK_IF(inst.SUBOP5 == 25 && SConfig::GetInstance().m_LocalCoreStartupParameter.bFPRF);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
+	switch (inst.SUBOP5)
+	{
+	case 20: //sub
+		val = ibuild.EmitFDSub(val, ibuild.EmitLoadFReg(inst.FB));
+		break;
+	case 21: //add
+		val = ibuild.EmitFDAdd(val, ibuild.EmitLoadFReg(inst.FB));
+		break;
+	case 25: //mul
+		val = ibuild.EmitFDMul(val, ibuild.EmitLoadFReg(inst.FC));
+		break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "fp_arith_s WTF!!!");
+	}
+
+	if (inst.OPCD == 59)
+	{
+		val = ibuild.EmitDoubleToSingle(val);
+		val = ibuild.EmitDupSingleToMReg(val);
+	}
+	else
+	{
+		val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
+	}
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+void JitILBase::fmaddXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	// Only the interpreter has "proper" support for (some) FP flags
+	FALLBACK_IF(inst.SUBOP5 == 29 && SConfig::GetInstance().m_LocalCoreStartupParameter.bFPRF);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
+	val = ibuild.EmitFDMul(val, ibuild.EmitLoadFReg(inst.FC));
+
+	if (inst.SUBOP5 & 1)
+		val = ibuild.EmitFDAdd(val, ibuild.EmitLoadFReg(inst.FB));
+	else
+		val = ibuild.EmitFDSub(val, ibuild.EmitLoadFReg(inst.FB));
+
+	if (inst.SUBOP5 & 2)
+		val = ibuild.EmitFDNeg(val);
+
+	if (inst.OPCD == 59)
+	{
+		val = ibuild.EmitDoubleToSingle(val);
+		val = ibuild.EmitDupSingleToMReg(val);
+	}
+	else
+	{
+		val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
+	}
+
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+void JitILBase::fmrx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	FALLBACK_IF(inst.Rc);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FB);
+	val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+void JitILBase::fcmpx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+	IREmitter::InstLoc lhs, rhs, res;
+	lhs = ibuild.EmitLoadFReg(inst.FA);
+	rhs = ibuild.EmitLoadFReg(inst.FB);
+	int ordered = (inst.SUBOP10 == 32) ? 1 : 0;
+	res = ibuild.EmitFDCmpCR(lhs, rhs, ordered);
+	ibuild.EmitStoreFPRF(res);
+	ibuild.EmitStoreCR(ibuild.EmitConvertToFastCR(res), inst.CRFD);
+}
+
+void JitILBase::fsign(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITFloatingPointOff);
+
+	FALLBACK_IF(true);
+
+	// TODO
+	switch (inst.SUBOP10)
+	{
+	case 40:  // fnegx
+		break;
+	case 264: // fabsx
+		break;
+	case 136: // fnabs
+		break;
+	default:
+		PanicAlert("fsign bleh");
+		break;
+	}
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp
new file mode 100644
index 0000000000..0a79fb0ca4
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp
@@ -0,0 +1,559 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _MSC_VER
+#pragma warning(disable:4146)  // unary minus operator applied to unsigned type, result still unsigned
+#endif
+
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+static void ComputeRC(IREmitter::IRBuilder& ibuild, IREmitter::InstLoc val)
+{
+	IREmitter::InstLoc res =
+		ibuild.EmitICmpCRSigned(val, ibuild.EmitIntConst(0));
+	ibuild.EmitStoreCR(res, 0);
+}
+
+void JitILBase::reg_imm(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	int d = inst.RD, a = inst.RA, s = inst.RS;
+	IREmitter::InstLoc val, test, c;
+	switch (inst.OPCD)
+	{
+	case 14: //addi
+		val = ibuild.EmitIntConst(inst.SIMM_16);
+		if (a)
+			val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), val);
+		ibuild.EmitStoreGReg(val, d);
+		break;
+	case 15: //addis
+		val = ibuild.EmitIntConst(inst.SIMM_16 << 16);
+		if (a)
+			val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), val);
+		ibuild.EmitStoreGReg(val, d);
+		break;
+	case 24: //ori
+		val = ibuild.EmitIntConst(inst.UIMM);
+		val = ibuild.EmitOr(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		break;
+	case 25: //oris
+		val = ibuild.EmitIntConst(inst.UIMM << 16);
+		val = ibuild.EmitOr(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		break;
+	case 28: //andi
+		val = ibuild.EmitIntConst(inst.UIMM);
+		val = ibuild.EmitAnd(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		ComputeRC(ibuild, val);
+		break;
+	case 29: //andis
+		val = ibuild.EmitIntConst(inst.UIMM << 16);
+		val = ibuild.EmitAnd(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		ComputeRC(ibuild, val);
+		break;
+	case 26: //xori
+		val = ibuild.EmitIntConst(inst.UIMM);
+		val = ibuild.EmitXor(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		break;
+	case 27: //xoris
+		val = ibuild.EmitIntConst(inst.UIMM << 16);
+		val = ibuild.EmitXor(ibuild.EmitLoadGReg(s), val);
+		ibuild.EmitStoreGReg(val, a);
+		break;
+	case 12: //addic
+	case 13: //addic_rc
+		c = ibuild.EmitIntConst(inst.SIMM_16);
+		val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), c);
+		ibuild.EmitStoreGReg(val, d);
+		test = ibuild.EmitICmpUgt(c, val);
+		ibuild.EmitStoreCarry(test);
+		if (inst.OPCD == 13)
+			ComputeRC(ibuild, val);
+		break;
+	default:
+		FALLBACK_IF(true);
+	}
+}
+
+void JitILBase::cmpXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc lhs, rhs, res;
+	lhs = ibuild.EmitLoadGReg(inst.RA);
+
+	if (inst.OPCD == 31)
+	{
+		rhs = ibuild.EmitLoadGReg(inst.RB);
+		if (inst.SUBOP10 == 32)
+		{
+			res = ibuild.EmitICmpCRUnsigned(lhs, rhs);
+		}
+		else
+		{
+			res = ibuild.EmitICmpCRSigned(lhs, rhs);
+		}
+	}
+	else if (inst.OPCD == 10)
+	{
+		rhs = ibuild.EmitIntConst(inst.UIMM);
+		res = ibuild.EmitICmpCRUnsigned(lhs, rhs);
+	}
+	else // inst.OPCD == 11
+	{
+		rhs = ibuild.EmitIntConst(inst.SIMM_16);
+		res = ibuild.EmitICmpCRSigned(lhs, rhs);
+	}
+
+	js.downcountAmount++; //TODO: should this be somewhere else?
+
+	ibuild.EmitStoreCR(res, inst.CRFD);
+}
+
+void JitILBase::boolX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	IREmitter::InstLoc a = nullptr;
+	IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS);
+	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
+
+	// FIXME: Some instructions does not work well in NSMBW, MP2, etc.
+	//        Refer JitIL_Tables.cpp.
+	if (inst.SUBOP10 == 28) /* andx */
+	{
+		a = ibuild.EmitAnd(s, b);
+	}
+	else if (inst.SUBOP10 == 476) /* nandx */
+	{
+		a = ibuild.EmitNot(ibuild.EmitAnd(s, b));
+	}
+	else if (inst.SUBOP10 == 60) /* andcx */
+	{
+		a = ibuild.EmitAnd(s, ibuild.EmitNot(b));
+	}
+	else if (inst.SUBOP10 == 444) /* orx */
+	{
+		a = ibuild.EmitOr(s, b);
+	}
+	else if (inst.SUBOP10 == 124) /* norx */
+	{
+		a = ibuild.EmitNot(ibuild.EmitOr(s, b));
+	}
+	else if (inst.SUBOP10 == 412) /* orcx */
+	{
+		a = ibuild.EmitOr(s, ibuild.EmitNot(b));
+	}
+	else if (inst.SUBOP10 == 316) /* xorx */
+	{
+		a = ibuild.EmitXor(s, b);
+	}
+	else if (inst.SUBOP10 == 284) /* eqvx */
+	{
+		a = ibuild.EmitNot(ibuild.EmitXor(s, b));
+	}
+	else
+	{
+		PanicAlert("WTF!");
+	}
+
+	ibuild.EmitStoreGReg(a, inst.RA);
+	if (inst.Rc)
+		ComputeRC(ibuild, a);
+}
+
+void JitILBase::extsbx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitSExt8(val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::extshx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitSExt16(val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::subfic(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc nota, lhs, val, test;
+	nota = ibuild.EmitXor(ibuild.EmitLoadGReg(inst.RA),
+	                      ibuild.EmitIntConst(-1));
+
+	if (inst.SIMM_16 == -1)
+	{
+		val = nota;
+		test = ibuild.EmitIntConst(1);
+	}
+	else
+	{
+		lhs = ibuild.EmitIntConst(inst.SIMM_16 + 1);
+		val = ibuild.EmitAdd(nota, lhs);
+		test = ibuild.EmitICmpUgt(lhs, val);
+	}
+
+	ibuild.EmitStoreGReg(val, inst.RD);
+	ibuild.EmitStoreCarry(test);
+}
+
+void JitILBase::subfcx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	if (inst.OE)
+		PanicAlert("OE: subfcx");
+
+	IREmitter::InstLoc val, test, lhs, rhs;
+	lhs = ibuild.EmitLoadGReg(inst.RB);
+	rhs = ibuild.EmitLoadGReg(inst.RA);
+	val = ibuild.EmitSub(lhs, rhs);
+	ibuild.EmitStoreGReg(val, inst.RD);
+	test = ibuild.EmitICmpEq(rhs, ibuild.EmitIntConst(0));
+	test = ibuild.EmitOr(test, ibuild.EmitICmpUgt(lhs, val));
+	ibuild.EmitStoreCarry(test);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::subfex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	if (inst.OE)
+		PanicAlert("OE: subfex");
+
+	IREmitter::InstLoc val, test, lhs, rhs, carry;
+	rhs = ibuild.EmitLoadGReg(inst.RA);
+	carry = ibuild.EmitLoadCarry();
+	rhs = ibuild.EmitXor(rhs, ibuild.EmitIntConst(-1));
+	rhs = ibuild.EmitAdd(rhs, carry);
+	test = ibuild.EmitICmpEq(rhs, ibuild.EmitIntConst(0));
+	test = ibuild.EmitAnd(test, carry);
+	lhs = ibuild.EmitLoadGReg(inst.RB);
+	val = ibuild.EmitAdd(lhs, rhs);
+	ibuild.EmitStoreGReg(val, inst.RD);
+	test = ibuild.EmitOr(test, ibuild.EmitICmpUgt(lhs, val));
+	ibuild.EmitStoreCarry(test);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::subfx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	if (inst.OE)
+		PanicAlert("OE: subfx");
+
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
+	val = ibuild.EmitSub(val, ibuild.EmitLoadGReg(inst.RA));
+	ibuild.EmitStoreGReg(val, inst.RD);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::mulli(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA);
+	val = ibuild.EmitMul(val, ibuild.EmitIntConst(inst.SIMM_16));
+	ibuild.EmitStoreGReg(val, inst.RD);
+}
+
+void JitILBase::mullwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
+	val = ibuild.EmitMul(ibuild.EmitLoadGReg(inst.RA), val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::mulhwux(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA);
+	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
+	IREmitter::InstLoc d = ibuild.EmitMulHighUnsigned(a, b);
+	ibuild.EmitStoreGReg(d, inst.RD);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, d);
+}
+
+// skipped some of the special handling in here - if we get crashes, let the interpreter handle this op
+void JitILBase::divwux(UGeckoInstruction inst)
+{
+	// FIXME
+	FALLBACK_IF(true);
+
+#if 0
+	int a = inst.RA, b = inst.RB, d = inst.RD;
+	gpr.FlushLockX(RSCRATCH1);
+	gpr.Lock(a, b, d);
+
+	if (d != a && d != b)
+	{
+		gpr.LoadToX64(d, false, true);
+	}
+	else
+	{
+		gpr.LoadToX64(d, true, true);
+	}
+
+	MOV(32, R(RSCRATCH), gpr.R(a));
+	XOR(32, R(RSCRATCH2), R(RSCRATCH));
+	gpr.KillImmediate(b);
+	DIV(32, gpr.R(b));
+	MOV(32, gpr.R(d), R(RSCRATCH));
+	gpr.UnlockAll();
+	gpr.UnlockAllX();
+
+	if (inst.Rc)
+	{
+		CALL((u8*)asm_routines.computeRc);
+	}
+#endif
+}
+
+void JitILBase::addx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
+	val = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::addzex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc lhs = ibuild.EmitLoadGReg(inst.RA), val, newcarry;
+	val = ibuild.EmitAdd(lhs, ibuild.EmitLoadCarry());
+	ibuild.EmitStoreGReg(val, inst.RD);
+	newcarry = ibuild.EmitICmpUlt(val, lhs);
+	ibuild.EmitStoreCarry(newcarry);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::addex(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA);
+	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
+
+	IREmitter::InstLoc ab = ibuild.EmitAdd(a, b);
+	IREmitter::InstLoc new_carry = ibuild.EmitICmpUlt(ab, a);
+
+	IREmitter::InstLoc previous_carry = ibuild.EmitLoadCarry();
+	IREmitter::InstLoc abc = ibuild.EmitAdd(ab, previous_carry);
+	new_carry = ibuild.EmitOr(new_carry, ibuild.EmitICmpUlt(abc, ab));
+
+	ibuild.EmitStoreGReg(abc, inst.RD);
+	ibuild.EmitStoreCarry(new_carry);
+
+	if (inst.OE)
+		PanicAlert("OE: addex");
+
+	if (inst.Rc)
+		ComputeRC(ibuild, abc);
+}
+
+void JitILBase::rlwinmx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	unsigned mask = Helper_Mask(inst.MB, inst.ME);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH));
+	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+
+void JitILBase::rlwimix(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	unsigned mask = Helper_Mask(inst.MB, inst.ME);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH));
+	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
+	IREmitter::InstLoc ival = ibuild.EmitLoadGReg(inst.RA);
+	ival = ibuild.EmitAnd(ival, ibuild.EmitIntConst(~mask));
+	val = ibuild.EmitOr(ival, val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::rlwnmx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	unsigned int mask = Helper_Mask(inst.MB, inst.ME);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitRol(val, ibuild.EmitLoadGReg(inst.RB));
+	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::negx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA);
+	val = ibuild.EmitSub(ibuild.EmitIntConst(0), val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::srwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	IREmitter::InstLoc samt = ibuild.EmitLoadGReg(inst.RB);
+	IREmitter::InstLoc corr;
+
+	// FIXME: We can do better with a cmov
+	// FIXME: We can do better on 64-bit
+	val = ibuild.EmitShrl(val, samt);
+	corr = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
+	corr = ibuild.EmitSarl(corr, ibuild.EmitIntConst(31));
+	corr = ibuild.EmitXor(corr, ibuild.EmitIntConst(-1));
+	val = ibuild.EmitAnd(corr, val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::slwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	IREmitter::InstLoc samt = ibuild.EmitLoadGReg(inst.RB);
+	IREmitter::InstLoc corr;
+
+	// FIXME: We can do better with a cmov
+	// FIXME: We can do better on 64-bit
+	val = ibuild.EmitShl(val, samt);
+	corr = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
+	corr = ibuild.EmitSarl(corr, ibuild.EmitIntConst(31));
+	corr = ibuild.EmitXor(corr, ibuild.EmitIntConst(-1));
+	val = ibuild.EmitAnd(corr, val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::srawx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	// FIXME: We can do a lot better on 64-bit
+	IREmitter::InstLoc val, samt, mask, mask2, test;
+	val = ibuild.EmitLoadGReg(inst.RS);
+	samt = ibuild.EmitLoadGReg(inst.RB);
+	mask = ibuild.EmitIntConst(-1);
+	val = ibuild.EmitSarl(val, samt);
+	mask = ibuild.EmitShl(mask, samt);
+	samt = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
+	samt = ibuild.EmitSarl(samt, ibuild.EmitIntConst(31));
+	samt = ibuild.EmitAnd(samt, ibuild.EmitIntConst(31));
+	val = ibuild.EmitSarl(val, samt);
+	ibuild.EmitStoreGReg(val, inst.RA);
+	mask = ibuild.EmitShl(mask, samt);
+	mask2 = ibuild.EmitAnd(mask, ibuild.EmitIntConst(0x7FFFFFFF));
+	test = ibuild.EmitOr(val, mask2);
+	test = ibuild.EmitICmpUgt(test, mask);
+	ibuild.EmitStoreCarry(test);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
+
+void JitILBase::srawix(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	// Shift right by two
+	IREmitter::InstLoc input = ibuild.EmitLoadGReg(inst.RS);
+	IREmitter::InstLoc output = ibuild.EmitSarl(input, ibuild.EmitIntConst(inst.SH));
+	ibuild.EmitStoreGReg(output, inst.RA);
+	// Check whether the input is negative and any bits got shifted out.
+	unsigned int mask = -1u << inst.SH;
+	IREmitter::InstLoc test = ibuild.EmitOr(input, ibuild.EmitIntConst(mask & 0x7FFFFFFF));
+	test = ibuild.EmitICmpUgt(test, ibuild.EmitIntConst(mask));
+
+	ibuild.EmitStoreCarry(test);
+	if (inst.Rc)
+		ComputeRC(ibuild, output);
+}
+
+// count leading zeroes
+void JitILBase::cntlzwx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITIntegerOff);
+	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
+	val = ibuild.EmitCntlzw(val);
+	ibuild.EmitStoreGReg(val, inst.RA);
+
+	if (inst.Rc)
+		ComputeRC(ibuild, val);
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp
new file mode 100644
index 0000000000..c7ed3bf26a
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp
@@ -0,0 +1,307 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+void JitILBase::lhax(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
+	val = ibuild.EmitSExt16(val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+}
+
+void JitILBase::lhaux(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
+	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
+	val = ibuild.EmitSExt16(val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+	ibuild.EmitStoreGReg(addr, inst.RA);
+}
+
+void JitILBase::lXz(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+	if (inst.OPCD & 1)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	IREmitter::InstLoc val;
+
+	// Idle Skipping.
+	// TODO: This really should be done somewhere else. Either lower in the IR
+	// or higher in PPCAnalyst
+	// TODO: We shouldn't use debug reads here.
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
+		PowerPC::GetState() != PowerPC::CPU_STEPPING &&
+		inst.OPCD == 32 && // Lwx
+		(inst.hex & 0xFFFF0000) == 0x800D0000 &&
+		(PowerPC::HostRead_U32(js.compilerPC + 4) == 0x28000000 ||
+		(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && PowerPC::HostRead_U32(js.compilerPC + 4) == 0x2C000000)) &&
+		PowerPC::HostRead_U32(js.compilerPC + 8) == 0x4182fff8)
+	{
+		val = ibuild.EmitLoad32(addr);
+		ibuild.EmitIdleBranch(val, ibuild.EmitIntConst(js.compilerPC));
+		ibuild.EmitStoreGReg(val, inst.RD);
+		return;
+	}
+
+	switch (inst.OPCD & ~0x1)
+	{
+	case 32: // lwz
+		val = ibuild.EmitLoad32(addr);
+		break;
+	case 40: // lhz
+		val = ibuild.EmitLoad16(addr);
+		break;
+	case 34: // lbz
+		val = ibuild.EmitLoad8(addr);
+		break;
+	default:
+		PanicAlert("lXz: invalid access size");
+		val = nullptr;
+		break;
+	}
+
+	ibuild.EmitStoreGReg(val, inst.RD);
+}
+
+void JitILBase::lbzu(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	const IREmitter::InstLoc uAddress = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), ibuild.EmitIntConst((int)inst.SIMM_16));
+	const IREmitter::InstLoc temp = ibuild.EmitLoad8(uAddress);
+	ibuild.EmitStoreGReg(temp, inst.RD);
+	ibuild.EmitStoreGReg(uAddress, inst.RA);
+}
+
+void JitILBase::lha(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst((s32)(s16)inst.SIMM_16);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
+	val = ibuild.EmitSExt16(val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+}
+
+void JitILBase::lhau(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst((s32)inst.SIMM_16);
+
+	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
+	val = ibuild.EmitSExt16(val);
+	ibuild.EmitStoreGReg(val, inst.RD);
+	ibuild.EmitStoreGReg(addr, inst.RA);
+}
+
+void JitILBase::lXzx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
+
+	if (inst.RA)
+	{
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+		if (inst.SUBOP10 & 32)
+			ibuild.EmitStoreGReg(addr, inst.RA);
+	}
+
+	IREmitter::InstLoc val;
+	switch (inst.SUBOP10 & ~32)
+	{
+	default:
+		PanicAlert("lXzx: invalid access size");
+	case 23:  // lwzx
+		val = ibuild.EmitLoad32(addr);
+		break;
+	case 279: // lhzx
+		val = ibuild.EmitLoad16(addr);
+		break;
+	case 87:  // lbzx
+		val = ibuild.EmitLoad8(addr);
+		break;
+	}
+	ibuild.EmitStoreGReg(val, inst.RD);
+}
+
+void JitILBase::dcbst(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+
+	// If the dcbst instruction is preceded by dcbt, it is flushing a prefetched
+	// memory location.  Do not invalidate the JIT cache in this case as the memory
+	// will be the same.
+	// dcbt = 0x7c00022c
+	// TODO: We shouldn't use a debug read here; it should be possible to get the
+	// previous instruction from the JIT state.
+	FALLBACK_IF((PowerPC::HostRead_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c);
+}
+
+// Zero cache line.
+void JitILBase::dcbz(UGeckoInstruction inst)
+{
+	FALLBACK_IF(true);
+
+	// TODO!
+#if 0
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITOff || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStoreOff)
+	{
+		Default(inst);
+		return;
+	}
+	INSTRUCTION_START;
+		MOV(32, R(RSCRATCH), gpr.R(inst.RB));
+	if (inst.RA)
+		ADD(32, R(RSCRATCH), gpr.R(inst.RA));
+	AND(32, R(RSCRATCH), Imm32(~31));
+	PXOR(XMM0, R(XMM0));
+	MOVAPS(MComplex(RMEM, RSCRATCH, SCALE_1, 0), XMM0);
+	MOVAPS(MComplex(RMEM, RSCRATCH, SCALE_1, 16), XMM0);
+#endif
+}
+
+void JitILBase::stX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+	IREmitter::InstLoc value = ibuild.EmitLoadGReg(inst.RS);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), addr);
+	if (inst.OPCD & 1)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	switch (inst.OPCD & ~1)
+	{
+	case 36: // stw
+		ibuild.EmitStore32(value, addr);
+		break;
+	case 44: // sth
+		ibuild.EmitStore16(value, addr);
+		break;
+	case 38: // stb
+		ibuild.EmitStore8(value, addr);
+		break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "stX: Invalid access size.");
+		return;
+	}
+}
+
+void JitILBase::stXx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
+	IREmitter::InstLoc value = ibuild.EmitLoadGReg(inst.RS);
+
+	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	if (inst.SUBOP10 & 32)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	switch (inst.SUBOP10 & ~32)
+	{
+	case 151: // stw
+		ibuild.EmitStore32(value, addr);
+		break;
+	case 407: // sth
+		ibuild.EmitStore16(value, addr);
+		break;
+	case 215: // stb
+		ibuild.EmitStore8(value, addr);
+		break;
+	default:
+		_assert_msg_(DYNA_REC, 0, "stXx: Invalid store size.");
+		return;
+	}
+}
+
+// A few games use these heavily in video codecs. (GFZP01 @ 0x80020E18)
+void JitILBase::lmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	for (int i = inst.RD; i < 32; i++)
+	{
+		IREmitter::InstLoc val = ibuild.EmitLoad32(addr);
+		ibuild.EmitStoreGReg(val, i);
+		addr = ibuild.EmitAdd(addr, ibuild.EmitIntConst(4));
+	}
+}
+
+void JitILBase::stmw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	for (int i = inst.RD; i < 32; i++)
+	{
+		IREmitter::InstLoc val = ibuild.EmitLoadGReg(i);
+		ibuild.EmitStore32(val, addr);
+		addr = ibuild.EmitAdd(addr, ibuild.EmitIntConst(4));
+	}
+}
+
+void JitILBase::icbi(UGeckoInstruction inst)
+{
+	FallBackToInterpreter(inst);
+	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp
new file mode 100644
index 0000000000..8c062813ee
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp
@@ -0,0 +1,142 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+// TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common,
+// and pshufb could help a lot.
+// Also add hacks for things like lfs/stfs the same reg consecutively, that is, simple memory moves.
+
+void JitILBase::lfs(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitDupSingleToMReg(ibuild.EmitLoadSingle(addr));
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+void JitILBase::lfsu(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitDupSingleToMReg(ibuild.EmitLoadSingle(addr));
+	ibuild.EmitStoreFReg(val, inst.FD);
+	ibuild.EmitStoreGReg(addr, inst.RA);
+}
+
+void JitILBase::lfd(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.RD);
+	val = ibuild.EmitInsertDoubleInMReg(ibuild.EmitLoadDouble(addr), val);
+	ibuild.EmitStoreFReg(val, inst.RD);
+}
+
+void JitILBase::lfdu(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+
+	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FD);
+	val = ibuild.EmitInsertDoubleInMReg(ibuild.EmitLoadDouble(addr), val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+	ibuild.EmitStoreGReg(addr, inst.RA);
+}
+
+void JitILBase::stfd(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+	IREmitter::InstLoc val  = ibuild.EmitLoadFReg(inst.RS);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+	if (inst.OPCD & 1)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	ibuild.EmitStoreDouble(val, addr);
+}
+
+
+void JitILBase::stfs(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
+	IREmitter::InstLoc val  = ibuild.EmitLoadFReg(inst.RS);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+	if (inst.OPCD & 1)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	val = ibuild.EmitDoubleToSingle(val);
+	ibuild.EmitStoreSingle(val, addr);
+}
+
+
+void JitILBase::stfsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
+	IREmitter::InstLoc val  = ibuild.EmitLoadFReg(inst.RS);
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	val = ibuild.EmitDoubleToSingle(val);
+	ibuild.EmitStoreSingle(val, addr);
+}
+
+
+void JitILBase::lfsx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStoreFloatingOff);
+	FALLBACK_IF(jo.memcheck);
+
+	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB), val;
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	val = ibuild.EmitDupSingleToMReg(ibuild.EmitLoadSingle(addr));
+	ibuild.EmitStoreFReg(val, inst.RD);
+}
+
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp
new file mode 100644
index 0000000000..192f7d3567
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp
@@ -0,0 +1,46 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+void JitILBase::psq_st(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+	FALLBACK_IF(jo.memcheck || inst.W);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12);
+	IREmitter::InstLoc val;
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	if (inst.OPCD == 61)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	val = ibuild.EmitLoadFReg(inst.RS);
+	val = ibuild.EmitCompactMRegToPacked(val);
+	ibuild.EmitStorePaired(val, addr, inst.I);
+}
+
+void JitILBase::psq_l(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITLoadStorePairedOff);
+	FALLBACK_IF(jo.memcheck || inst.W);
+
+	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12);
+	IREmitter::InstLoc val;
+
+	if (inst.RA)
+		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
+
+	if (inst.OPCD == 57)
+		ibuild.EmitStoreGReg(addr, inst.RA);
+
+	val = ibuild.EmitLoadPaired(addr, inst.I | (inst.W << 3)); // The lower 3 bits is for GQR index. The next 1 bit is for inst.W
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.RD);
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp
new file mode 100644
index 0000000000..5b76d90e6f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp
@@ -0,0 +1,188 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+void JitILBase::ps_arith(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc || (inst.SUBOP5 != 21 && inst.SUBOP5 != 20 && inst.SUBOP5 != 25));
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
+	IREmitter::InstLoc rhs;
+
+	if (inst.SUBOP5 == 25)
+		rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+	else
+		rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+
+	val = ibuild.EmitCompactMRegToPacked(val);
+
+	switch (inst.SUBOP5)
+	{
+	case 20:
+		val = ibuild.EmitFPSub(val, rhs);
+		break;
+	case 21:
+		val = ibuild.EmitFPAdd(val, rhs);
+		break;
+	case 25:
+		val = ibuild.EmitFPMul(val, rhs);
+	}
+
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+void JitILBase::ps_sum(UGeckoInstruction inst)
+{
+	// TODO: This operation strikes me as a bit strange...
+	// perhaps we can optimize it depending on the users?
+	// TODO: ps_sum breaks Sonic Colours (black screen)
+	FALLBACK_IF(true);
+
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc || inst.SUBOP5 != 10);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
+	IREmitter::InstLoc temp;
+
+	val = ibuild.EmitCompactMRegToPacked(val);
+	val = ibuild.EmitFPDup0(val);
+	temp = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+	val = ibuild.EmitFPAdd(val, temp);
+	temp = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+	val = ibuild.EmitFPMerge11(val, temp);
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+
+void JitILBase::ps_muls(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
+	IREmitter::InstLoc rhs = ibuild.EmitLoadFReg(inst.FC);
+
+	val = ibuild.EmitCompactMRegToPacked(val);
+	rhs = ibuild.EmitCompactMRegToPacked(rhs);
+
+	if (inst.SUBOP5 == 12)
+		rhs = ibuild.EmitFPDup0(rhs);
+	else
+		rhs = ibuild.EmitFPDup1(rhs);
+
+	val = ibuild.EmitFPMul(val, rhs);
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+
+//TODO: find easy cases and optimize them, do a breakout like ps_arith
+void JitILBase::ps_mergeXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	IREmitter::InstLoc val = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FA));
+	IREmitter::InstLoc rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+
+	switch (inst.SUBOP10)
+	{
+	case 528:
+		val = ibuild.EmitFPMerge00(val, rhs);
+		break; //00
+	case 560:
+		val = ibuild.EmitFPMerge01(val, rhs);
+		break; //01
+	case 592:
+		val = ibuild.EmitFPMerge10(val, rhs);
+		break; //10
+	case 624:
+		val = ibuild.EmitFPMerge11(val, rhs);
+		break; //11
+	default:
+		_assert_msg_(DYNA_REC, 0, "ps_merge - invalid op");
+	}
+
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
+
+
+void JitILBase::ps_maddXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITPairedOff);
+	FALLBACK_IF(inst.Rc);
+
+	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA), op2, op3;
+	val = ibuild.EmitCompactMRegToPacked(val);
+
+	switch (inst.SUBOP5)
+	{
+	case 14: // madds0
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		op2 = ibuild.EmitFPDup0(op2);
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPAdd(val, op3);
+		break;
+	}
+	case 15: // madds1
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		op2 = ibuild.EmitFPDup1(op2);
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPAdd(val, op3);
+		break;
+	}
+	case 28: // msub
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPSub(val, op3);
+		break;
+	}
+	case 29: // madd
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPAdd(val, op3);
+		break;
+	}
+	case 30: // nmsub
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPSub(val, op3);
+		val = ibuild.EmitFPNeg(val);
+		break;
+	}
+	case 31: // nmadd
+	{
+		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
+		val = ibuild.EmitFPMul(val, op2);
+		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
+		val = ibuild.EmitFPAdd(val, op3);
+		val = ibuild.EmitFPNeg(val);
+		break;
+	}
+	}
+
+	val = ibuild.EmitExpandPackedToMReg(val);
+	ibuild.EmitStoreFReg(val, inst.FD);
+}
diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp
new file mode 100644
index 0000000000..e807aa5023
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp
@@ -0,0 +1,217 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/JitILCommon/JitILBase.h"
+
+void JitILBase::mtspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+
+	switch (iIndex)
+	{
+		case SPR_TL:
+		case SPR_TU:
+			FALLBACK_IF(true);
+		case SPR_LR:
+			ibuild.EmitStoreLink(ibuild.EmitLoadGReg(inst.RD));
+			return;
+		case SPR_CTR:
+			ibuild.EmitStoreCTR(ibuild.EmitLoadGReg(inst.RD));
+			return;
+		case SPR_GQR0:
+		case SPR_GQR0 + 1:
+		case SPR_GQR0 + 2:
+		case SPR_GQR0 + 3:
+		case SPR_GQR0 + 4:
+		case SPR_GQR0 + 5:
+		case SPR_GQR0 + 6:
+		case SPR_GQR0 + 7:
+			ibuild.EmitStoreGQR(ibuild.EmitLoadGReg(inst.RD), iIndex - SPR_GQR0);
+			return;
+		case SPR_SRR0:
+		case SPR_SRR1:
+			ibuild.EmitStoreSRR(ibuild.EmitLoadGReg(inst.RD), iIndex - SPR_SRR0);
+			return;
+		default:
+			FALLBACK_IF(true);
+	}
+}
+
+void JitILBase::mfspr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+		JITDISABLE(bJITSystemRegistersOff);
+		u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+	switch (iIndex)
+	{
+	case SPR_TL:
+	case SPR_TU:
+		FALLBACK_IF(true);
+	case SPR_LR:
+		ibuild.EmitStoreGReg(ibuild.EmitLoadLink(), inst.RD);
+		return;
+	case SPR_CTR:
+		ibuild.EmitStoreGReg(ibuild.EmitLoadCTR(), inst.RD);
+		return;
+	case SPR_GQR0:
+	case SPR_GQR0 + 1:
+	case SPR_GQR0 + 2:
+	case SPR_GQR0 + 3:
+	case SPR_GQR0 + 4:
+	case SPR_GQR0 + 5:
+	case SPR_GQR0 + 6:
+	case SPR_GQR0 + 7:
+		ibuild.EmitStoreGReg(ibuild.EmitLoadGQR(iIndex - SPR_GQR0), inst.RD);
+		return;
+	default:
+		FALLBACK_IF(true);
+	}
+}
+
+
+// =======================================================================================
+// Don't interpret this, if we do we get thrown out
+// --------------
+void JitILBase::mtmsr(UGeckoInstruction inst)
+{
+	ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS), ibuild.EmitIntConst(js.compilerPC));
+	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
+}
+// ==============
+
+
+void JitILBase::mfmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+		JITDISABLE(bJITSystemRegistersOff);
+		ibuild.EmitStoreGReg(ibuild.EmitLoadMSR(), inst.RD);
+}
+
+void JitILBase::mftb(UGeckoInstruction inst)
+{
+	INSTRUCTION_START;
+	JITDISABLE(bJITSystemRegistersOff);
+		mfspr(inst);
+}
+
+void JitILBase::mfcr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START;
+	JITDISABLE(bJITSystemRegistersOff);
+
+	IREmitter::InstLoc d = ibuild.EmitIntConst(0);
+	for (int i = 0; i < 8; ++i)
+	{
+		IREmitter::InstLoc cr = ibuild.EmitLoadCR(i);
+		cr = ibuild.EmitConvertFromFastCR(cr);
+		cr = ibuild.EmitShl(cr, ibuild.EmitIntConst(28 - 4 * i));
+		d = ibuild.EmitOr(d, cr);
+	}
+	ibuild.EmitStoreGReg(d, inst.RD);
+}
+
+void JitILBase::mtcrf(UGeckoInstruction inst)
+{
+	INSTRUCTION_START;
+	JITDISABLE(bJITSystemRegistersOff);
+
+	IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS);
+	for (int i = 0; i < 8; ++i)
+	{
+		if (inst.CRM & (0x80 >> i))
+		{
+			IREmitter::InstLoc value;
+			value = ibuild.EmitShrl(s, ibuild.EmitIntConst(28 - i * 4));
+			value = ibuild.EmitAnd(value, ibuild.EmitIntConst(0xF));
+			value = ibuild.EmitConvertToFastCR(value);
+			ibuild.EmitStoreCR(value, i);
+		}
+	}
+}
+
+void JitILBase::mcrf(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	if (inst.CRFS != inst.CRFD)
+	{
+		ibuild.EmitStoreCR(ibuild.EmitLoadCR(inst.CRFS), inst.CRFD);
+	}
+}
+
+void JitILBase::crXX(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(bJITSystemRegistersOff);
+
+	// Get bit CRBA in EAX aligned with bit CRBD
+	const int shiftA = (inst.CRBD & 3) - (inst.CRBA & 3);
+	IREmitter::InstLoc eax = ibuild.EmitLoadCR(inst.CRBA >> 2);
+	eax = ibuild.EmitConvertFromFastCR(eax);
+	if (shiftA < 0)
+		eax = ibuild.EmitShl(eax, ibuild.EmitIntConst(-shiftA));
+	else if (shiftA > 0)
+		eax = ibuild.EmitShrl(eax, ibuild.EmitIntConst(shiftA));
+
+	// Get bit CRBB in ECX aligned with bit CRBD
+	const int shiftB = (inst.CRBD & 3) - (inst.CRBB & 3);
+	IREmitter::InstLoc ecx = ibuild.EmitLoadCR(inst.CRBB >> 2);
+	ecx = ibuild.EmitConvertFromFastCR(ecx);
+	if (shiftB < 0)
+		ecx = ibuild.EmitShl(ecx, ibuild.EmitIntConst(-shiftB));
+	else if (shiftB > 0)
+		ecx = ibuild.EmitShrl(ecx, ibuild.EmitIntConst(shiftB));
+
+	// Compute combined bit
+	const unsigned subop = inst.SUBOP10;
+	switch (subop)
+	{
+		case 257: // crand
+			eax = ibuild.EmitAnd(eax, ecx);
+			break;
+		case 129: // crandc
+			ecx = ibuild.EmitNot(ecx);
+			eax = ibuild.EmitAnd(eax, ecx);
+			break;
+		case 289: // creqv
+			eax = ibuild.EmitXor(eax, ecx);
+			eax = ibuild.EmitNot(eax);
+			break;
+		case 225: // crnand
+			eax = ibuild.EmitAnd(eax, ecx);
+			eax = ibuild.EmitNot(eax);
+			break;
+		case 33:  // crnor
+			eax = ibuild.EmitOr(eax, ecx);
+			eax = ibuild.EmitNot(eax);
+			break;
+		case 449: // cror
+			eax = ibuild.EmitOr(eax, ecx);
+			break;
+		case 417: // crorc
+			ecx = ibuild.EmitNot(ecx);
+			eax = ibuild.EmitOr(eax, ecx);
+			break;
+		case 193: // crxor
+			eax = ibuild.EmitXor(eax, ecx);
+			break;
+		default:
+			PanicAlert("crXX: invalid instruction");
+			break;
+	}
+
+	// Store result bit in CRBD
+	eax = ibuild.EmitAnd(eax, ibuild.EmitIntConst(0x8 >> (inst.CRBD & 3)));
+	IREmitter::InstLoc bd = ibuild.EmitLoadCR(inst.CRBD >> 2);
+	bd = ibuild.EmitConvertFromFastCR(bd);
+	bd = ibuild.EmitAnd(bd, ibuild.EmitIntConst(~(0x8 >> (inst.CRBD & 3))));
+	bd = ibuild.EmitOr(bd, eax);
+	bd = ibuild.EmitConvertToFastCR(bd);
+	ibuild.EmitStoreCR(bd, inst.CRBD >> 2);
+}
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp
new file mode 100644
index 0000000000..e1d5415ee5
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitInterface.cpp
@@ -0,0 +1,272 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <string>
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include "Common/PerformanceCounter.h"
+#endif
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#if _M_X86
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64/Jit64_Tables.h"
+#include "Core/PowerPC/Jit64IL/JitIL.h"
+#include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
+#endif
+
+#if _M_ARM_64
+#include "Core/PowerPC/JitArm64/Jit.h"
+#include "Core/PowerPC/JitArm64/JitArm64_Tables.h"
+#endif
+
+static bool bFakeVMEM = false;
+bool bMMU = false;
+
+namespace JitInterface
+{
+	void DoState(PointerWrap &p)
+	{
+		if (jit && p.GetMode() == PointerWrap::MODE_READ)
+			jit->GetBlockCache()->Clear();
+	}
+	CPUCoreBase *InitJitCore(int core)
+	{
+		bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
+		bFakeVMEM = !bMMU;
+
+		CPUCoreBase *ptr = nullptr;
+		switch (core)
+		{
+		#if _M_X86
+		case PowerPC::CORE_JIT64:
+			ptr = new Jit64();
+			break;
+		case PowerPC::CORE_JITIL64:
+			ptr = new JitIL();
+			break;
+		#endif
+		#if _M_ARM_64
+		case PowerPC::CORE_JITARM64:
+			ptr = new JitArm64();
+			break;
+		#endif
+		default:
+			PanicAlert("Unrecognizable cpu_core: %d", core);
+			jit = nullptr;
+			return nullptr;
+		}
+		jit = static_cast<JitBase*>(ptr);
+		jit->Init();
+		return ptr;
+	}
+	void InitTables(int core)
+	{
+		switch (core)
+		{
+		#if _M_X86
+		case PowerPC::CORE_JIT64:
+			Jit64Tables::InitTables();
+			break;
+		case PowerPC::CORE_JITIL64:
+			JitILTables::InitTables();
+			break;
+		#endif
+		#if _M_ARM_64
+		case PowerPC::CORE_JITARM64:
+			JitArm64Tables::InitTables();
+			break;
+		#endif
+		default:
+			PanicAlert("Unrecognizable cpu_core: %d", core);
+			break;
+		}
+	}
+	CPUCoreBase *GetCore()
+	{
+		return jit;
+	}
+
+	void WriteProfileResults(const std::string& filename)
+	{
+		ProfileStats prof_stats;
+		GetProfileResults(&prof_stats);
+
+		File::IOFile f(filename, "w");
+		if (!f)
+		{
+			PanicAlert("Failed to open %s", filename.c_str());
+			return;
+		}
+		fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n");
+		for (auto& stat : prof_stats.block_stats)
+		{
+			std::string name = g_symbolDB.GetDescription(stat.addr);
+			double percent = 100.0 * (double)stat.cost / (double)prof_stats.cost_sum;
+			double timePercent = 100.0 * (double)stat.tick_counter / (double)prof_stats.timecost_sum;
+			fprintf(f.GetHandle(), "%08x\t%s\t%" PRIu64 "\t%" PRIu64 "\t%.2f\t%.2f\t%.2f\t%i\n",
+					stat.addr, name.c_str(), stat.cost,
+					stat.tick_counter, percent, timePercent,
+					(double)stat.tick_counter*1000.0/(double)prof_stats.countsPerSec, stat.block_size);
+		}
+	}
+
+	void GetProfileResults(ProfileStats* prof_stats)
+	{
+		prof_stats->cost_sum = 0;
+		prof_stats->timecost_sum = 0;
+		prof_stats->block_stats.clear();
+		prof_stats->block_stats.reserve(jit->GetBlockCache()->GetNumBlocks());
+
+		// Can't really do this with no jit core available
+		if (!jit)
+			return;
+
+		Core::EState old_state = Core::GetState();
+		if (old_state == Core::CORE_RUN)
+			Core::SetState(Core::CORE_PAUSE);
+
+		QueryPerformanceFrequency((LARGE_INTEGER*)&prof_stats->countsPerSec);
+		for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++)
+		{
+			const JitBlock *block = jit->GetBlockCache()->GetBlock(i);
+			// Rough heuristic.  Mem instructions should cost more.
+			u64 cost = block->originalSize * (block->runCount / 4);
+			u64 timecost = block->ticCounter;
+			// Todo: tweak.
+			if (block->runCount >= 1)
+				prof_stats->block_stats.emplace_back(i, block->originalAddress,
+				                                        cost, timecost, block->codeSize);
+			prof_stats->cost_sum += cost;
+			prof_stats->timecost_sum += timecost;
+		}
+
+		sort(prof_stats->block_stats.begin(), prof_stats->block_stats.end());
+		if (old_state == Core::CORE_RUN)
+			Core::SetState(Core::CORE_RUN);
+	}
+
+	int GetHostCode(u32* address, const u8** code, u32* code_size)
+	{
+		if (!jit)
+		{
+			*code_size = 0;
+			return 1;
+		}
+
+		int block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(*address);
+		if (block_num < 0)
+		{
+			for (int i = 0; i < 500; i++)
+			{
+				block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(*address - 4 * i);
+				if (block_num >= 0)
+					break;
+			}
+
+			if (block_num >= 0)
+			{
+				JitBlock* block = jit->GetBlockCache()->GetBlock(block_num);
+				if (!(block->originalAddress <= *address &&
+				    block->originalSize + block->originalAddress >= *address))
+					block_num = -1;
+			}
+
+			// Do not merge this "if" with the above - block_num changes inside it.
+			if (block_num < 0)
+			{
+				*code_size = 0;
+				return 2;
+			}
+		}
+
+		JitBlock* block = jit->GetBlockCache()->GetBlock(block_num);
+
+		*code = (const u8*)jit->GetBlockCache()->GetCompiledCodeFromBlock(block_num);
+
+		*code_size = block->codeSize;
+		*address = block->originalAddress;
+		return 0;
+	}
+
+	bool HandleFault(uintptr_t access_address, SContext* ctx)
+	{
+		return jit->HandleFault(access_address, ctx);
+	}
+
+	void ClearCache()
+	{
+		if (jit)
+			jit->ClearCache();
+	}
+	void ClearSafe()
+	{
+		// This clear is "safe" in the sense that it's okay to run from
+		// inside a JIT'ed block: it clears the instruction cache, but not
+		// the JIT'ed code.
+		// TODO: There's probably a better way to handle this situation.
+		if (jit)
+			jit->GetBlockCache()->Clear();
+	}
+
+	void InvalidateICache(u32 address, u32 size, bool forced)
+	{
+		if (jit)
+			jit->GetBlockCache()->InvalidateICache(address, size, forced);
+	}
+
+	void CompileExceptionCheck(ExceptionType type)
+	{
+		if (!jit)
+			return;
+
+		std::unordered_set<u32>* exception_addresses = nullptr;
+
+		switch (type)
+		{
+		case ExceptionType::EXCEPTIONS_FIFO_WRITE:
+			exception_addresses = &jit->js.fifoWriteAddresses;
+			break;
+		case ExceptionType::EXCEPTIONS_PAIRED_QUANTIZE:
+			exception_addresses = &jit->js.pairedQuantizeAddresses;
+			break;
+		}
+
+		if (PC != 0 && (exception_addresses->find(PC)) == (exception_addresses->end()))
+		{
+			if (type == ExceptionType::EXCEPTIONS_FIFO_WRITE)
+			{
+				// Check in case the code has been replaced since: do we need to do this?
+				int optype = GetOpInfo(PowerPC::HostRead_U32(PC))->type;
+				if (optype != OPTYPE_STORE && optype != OPTYPE_STOREFP && (optype != OPTYPE_STOREPS))
+					return;
+			}
+			exception_addresses->insert(PC);
+
+			// Invalidate the JIT block so that it gets recompiled with the external exception check included.
+			jit->GetBlockCache()->InvalidateICache(PC, 4, true);
+		}
+	}
+
+	void Shutdown()
+	{
+		if (jit)
+		{
+			jit->Shutdown();
+			delete jit;
+			jit = nullptr;
+		}
+	}
+}
diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h
new file mode 100644
index 0000000000..bc5601a769
--- /dev/null
+++ b/Source/Core/Core/PowerPC/JitInterface.h
@@ -0,0 +1,48 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "Common/ChunkFile.h"
+#include "Core/MachineContext.h"
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/Profiler.h"
+
+namespace JitInterface
+{
+	enum class ExceptionType
+	{
+		EXCEPTIONS_FIFO_WRITE,
+		EXCEPTIONS_PAIRED_QUANTIZE
+	};
+
+	void DoState(PointerWrap &p);
+
+	CPUCoreBase *InitJitCore(int core);
+	void InitTables(int core);
+	CPUCoreBase *GetCore();
+
+	// Debugging
+	void WriteProfileResults(const std::string& filename);
+	void GetProfileResults(ProfileStats* prof_stats);
+	int GetHostCode(u32* address, const u8** code, u32* code_size);
+
+	// Memory Utilities
+	bool HandleFault(uintptr_t access_address, SContext* ctx);
+
+	// Clearing CodeCache
+	void ClearCache();
+
+	void ClearSafe();
+
+	// If "forced" is true, a recompile is being requested on code that hasn't been modified.
+	void InvalidateICache(u32 address, u32 size, bool forced);
+
+	void CompileExceptionCheck(ExceptionType type);
+
+	void Shutdown();
+}
+extern bool bMMU;
+
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
new file mode 100644
index 0000000000..71be1e2f11
--- /dev/null
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -0,0 +1,1094 @@
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Atomic.h"
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+#ifdef USE_GDBSTUB
+#include "Core/PowerPC/GDBStub.h"
+#endif
+
+namespace PowerPC
+{
+
+#define HW_PAGE_SIZE 4096
+
+// EFB RE
+/*
+GXPeekZ
+80322de8: rlwinm    r0, r3, 2, 14, 29 (0003fffc)   a =  x << 2 & 0x3fffc
+80322dec: oris      r0, r0, 0xC800                 a |= 0xc8000000
+80322df0: rlwinm    r3, r0, 0, 20, 9 (ffc00fff)    x = a & 0xffc00fff
+80322df4: rlwinm    r0, r4, 12, 4, 19 (0ffff000)   a = (y << 12) & 0x0ffff000;
+80322df8: or        r0, r3, r0                     a |= x;
+80322dfc: rlwinm    r0, r0, 0, 10, 7 (ff3fffff)    a &= 0xff3fffff
+80322e00: oris      r3, r0, 0x0040                 x = a | 0x00400000
+80322e04: lwz       r0, 0 (r3)                     r0 = *r3
+80322e08: stw       r0, 0 (r5)                     z =
+80322e0c: blr
+*/
+
+
+// =================================
+// From Memmap.cpp
+// ----------------
+
+// Overloaded byteswap functions, for use within the templated functions below.
+inline u8 bswap(u8 val)   { return val; }
+inline s8 bswap(s8 val)   { return val; }
+inline u16 bswap(u16 val) { return Common::swap16(val); }
+inline s16 bswap(s16 val) { return Common::swap16(val); }
+inline u32 bswap(u32 val) { return Common::swap32(val); }
+inline u64 bswap(u64 val) { return Common::swap64(val); }
+// =================
+
+enum XCheckTLBFlag
+{
+	FLAG_NO_EXCEPTION,
+	FLAG_READ,
+	FLAG_WRITE,
+	FLAG_OPCODE,
+};
+template <const XCheckTLBFlag flag> static u32 TranslateAddress(const u32 address);
+
+// Nasty but necessary. Super Mario Galaxy pointer relies on this stuff.
+static u32 EFB_Read(const u32 addr)
+{
+	u32 var = 0;
+	// Convert address to coordinates. It's possible that this should be done
+	// differently depending on color depth, especially regarding PEEK_COLOR.
+	int x = (addr & 0xfff) >> 2;
+	int y = (addr >> 12) & 0x3ff;
+
+	if (addr & 0x00400000)
+	{
+		var = g_video_backend->Video_AccessEFB(PEEK_Z, x, y, 0);
+		DEBUG_LOG(MEMMAP, "EFB Z Read @ %i, %i\t= 0x%08x", x, y, var);
+	}
+	else
+	{
+		var = g_video_backend->Video_AccessEFB(PEEK_COLOR, x, y, 0);
+		DEBUG_LOG(MEMMAP, "EFB Color Read @ %i, %i\t= 0x%08x", x, y, var);
+	}
+
+	return var;
+}
+
+static void EFB_Write(u32 data, u32 addr)
+{
+	int x = (addr & 0xfff) >> 2;
+	int y = (addr >> 12) & 0x3ff;
+
+	if (addr & 0x00400000)
+	{
+		g_video_backend->Video_AccessEFB(POKE_Z, x, y, data);
+		DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %i, %i", data, x, y);
+	}
+	else
+	{
+		g_video_backend->Video_AccessEFB(POKE_COLOR, x, y, data);
+		DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %i, %i", data, x, y);
+	}
+}
+
+
+static void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite);
+
+template <XCheckTLBFlag flag, typename T>
+__forceinline static T ReadFromHardware(const u32 em_address)
+{
+	int segment = em_address >> 28;
+	bool performTranslation = UReg_MSR(MSR).DR;
+
+	// Quick check for an address that can't meet any of the following conditions,
+	// to speed up the MMU path.
+	if (!BitSet32(0xCFC)[segment] && performTranslation)
+	{
+		// TODO: Figure out the fastest order of tests for both read and write (they are probably different).
+		if (flag == FLAG_READ && (em_address & 0xF8000000) == 0xC8000000)
+		{
+			if (em_address < 0xcc000000)
+				return EFB_Read(em_address);
+			else
+				return (T)Memory::mmio_mapping->Read<typename std::make_unsigned<T>::type>(em_address & 0x0FFFFFFF);
+		}
+		if (segment == 0x0 || segment == 0x8 || segment == 0xC)
+		{
+			// Handle RAM; the masking intentionally discards bits (essentially creating
+			// mirrors of memory).
+			// TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory.
+			return bswap((*(const T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK]));
+		}
+		if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+		{
+			// Handle EXRAM.
+			// TODO: Is this supposed to be mirrored like main RAM?
+			return bswap((*(const T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF]));
+		}
+		if (segment == 0xE && (em_address < (0xE0000000 + Memory::L1_CACHE_SIZE)))
+		{
+			return bswap((*(const T*)&Memory::m_pL1Cache[em_address & 0x0FFFFFFF]));
+		}
+	}
+
+	if (Memory::bFakeVMEM && performTranslation && (segment == 0x7 || segment == 0x4))
+	{
+		// fake VMEM
+		return bswap((*(const T*)&Memory::m_pFakeVMEM[em_address & Memory::FAKEVMEM_MASK]));
+	}
+
+	if (!performTranslation)
+	{
+		if (flag == FLAG_READ && (em_address & 0xF8000000) == 0x08000000)
+		{
+			if (em_address < 0x0c000000)
+				return EFB_Read(em_address);
+			else
+				return (T)Memory::mmio_mapping->Read<typename std::make_unsigned<T>::type>(em_address);
+		}
+		if (segment == 0x0)
+		{
+			// Handle RAM; the masking intentionally discards bits (essentially creating
+			// mirrors of memory).
+			// TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory.
+			return bswap((*(const T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK]));
+		}
+		if (Memory::m_pEXRAM && segment == 0x1 && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+		{
+			return bswap((*(const T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF]));
+		}
+		PanicAlert("Unable to resolve read address %x PC %x", em_address, PC);
+		return 0;
+	}
+
+	// MMU: Do page table translation
+	u32 tlb_addr = TranslateAddress<flag>(em_address);
+	if (tlb_addr == 0)
+	{
+		if (flag == FLAG_READ)
+			GenerateDSIException(em_address, false);
+		return 0;
+	}
+
+	// Handle loads that cross page boundaries (ewwww)
+	// The alignment check isn't strictly necessary, but since this is a rare slow path, it provides a faster
+	// (1 instruction on x86) bailout.
+	if (sizeof(T) > 1 && (em_address & (sizeof(T) - 1)) && (em_address & (HW_PAGE_SIZE - 1)) > HW_PAGE_SIZE - sizeof(T))
+	{
+		// This could be unaligned down to the byte level... hopefully this is rare, so doing it this
+		// way isn't too terrible.
+		// TODO: floats on non-word-aligned boundaries should technically cause alignment exceptions.
+		// Note that "word" means 32-bit, so paired singles or doubles might still be 32-bit aligned!
+		u32 em_address_next_page = (em_address + sizeof(T) - 1) & ~(HW_PAGE_SIZE - 1);
+		u32 tlb_addr_next_page = TranslateAddress<flag>(em_address_next_page);
+		if (tlb_addr == 0 || tlb_addr_next_page == 0)
+		{
+			if (flag == FLAG_READ)
+				GenerateDSIException(em_address_next_page, false);
+			return 0;
+		}
+		T var = 0;
+		for (u32 addr = em_address; addr < em_address + sizeof(T); addr++, tlb_addr++)
+		{
+			if (addr == em_address_next_page)
+				tlb_addr = tlb_addr_next_page;
+			var = (var << 8) | Memory::physical_base[tlb_addr];
+		}
+		return var;
+	}
+
+	// The easy case!
+	return bswap(*(const T*)&Memory::physical_base[tlb_addr]);
+}
+
+
+template <XCheckTLBFlag flag, typename T>
+__forceinline static void WriteToHardware(u32 em_address, const T data)
+{
+	int segment = em_address >> 28;
+	// Quick check for an address that can't meet any of the following conditions,
+	// to speed up the MMU path.
+	bool performTranslation = UReg_MSR(MSR).DR;
+
+	if (!BitSet32(0xCFC)[segment] && performTranslation)
+	{
+		// First, let's check for FIFO writes, since they are probably the most common
+		// reason we end up in this function.
+		// Note that we must mask the address to correctly emulate certain games;
+		// Pac-Man World 3 in particular is affected by this.
+		if (flag == FLAG_WRITE && (em_address & 0xFFFFF000) == 0xCC008000)
+		{
+			switch (sizeof(T))
+			{
+			case 1: GPFifo::Write8((u8)data); return;
+			case 2: GPFifo::Write16((u16)data); return;
+			case 4: GPFifo::Write32((u32)data); return;
+			case 8: GPFifo::Write64((u64)data); return;
+			}
+		}
+		if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0xC8000000)
+		{
+			if (em_address < 0xcc000000)
+			{
+				// TODO: This only works correctly for 32-bit writes.
+				EFB_Write((u32)data, em_address);
+				return;
+			}
+			else
+			{
+				Memory::mmio_mapping->Write(em_address & 0x0FFFFFFF, data);
+				return;
+			}
+		}
+		if (segment == 0x0 || segment == 0x8 || segment == 0xC)
+		{
+			// Handle RAM; the masking intentionally discards bits (essentially creating
+			// mirrors of memory).
+			// TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory.
+			*(T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK] = bswap(data);
+			return;
+		}
+		if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+		{
+			// Handle EXRAM.
+			// TODO: Is this supposed to be mirrored like main RAM?
+			*(T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF] = bswap(data);
+			return;
+		}
+		if (segment == 0xE && (em_address < (0xE0000000 + Memory::L1_CACHE_SIZE)))
+		{
+			*(T*)&Memory::m_pL1Cache[em_address & 0x0FFFFFFF] = bswap(data);
+			return;
+		}
+	}
+
+	if (Memory::bFakeVMEM && performTranslation && (segment == 0x7 || segment == 0x4))
+	{
+		// fake VMEM
+		*(T*)&Memory::m_pFakeVMEM[em_address & Memory::FAKEVMEM_MASK] = bswap(data);
+		return;
+	}
+
+	if (!performTranslation)
+	{
+		if (flag == FLAG_WRITE && (em_address & 0xFFFFF000) == 0x0C008000)
+		{
+			switch (sizeof(T))
+			{
+			case 1: GPFifo::Write8((u8)data); return;
+			case 2: GPFifo::Write16((u16)data); return;
+			case 4: GPFifo::Write32((u32)data); return;
+			case 8: GPFifo::Write64((u64)data); return;
+			}
+		}
+		if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0x08000000)
+		{
+			if (em_address < 0x0c000000)
+			{
+				// TODO: This only works correctly for 32-bit writes.
+				EFB_Write((u32)data, em_address);
+				return;
+			}
+			else
+			{
+				Memory::mmio_mapping->Write(em_address, data);
+				return;
+			}
+		}
+		if (segment == 0x0)
+		{
+			// Handle RAM; the masking intentionally discards bits (essentially creating
+			// mirrors of memory).
+			// TODO: Only the first REALRAM_SIZE is supposed to be backed by actual memory.
+			*(T*)&Memory::m_pRAM[em_address & Memory::RAM_MASK] = bswap(data);
+			return;
+		}
+		if (Memory::m_pEXRAM && segment == 0x1 && (em_address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+		{
+			*(T*)&Memory::m_pEXRAM[em_address & 0x0FFFFFFF] = bswap(data);
+			return;
+		}
+		PanicAlert("Unable to resolve write address %x PC %x", em_address, PC);
+		return;
+	}
+
+	// MMU: Do page table translation
+	u32 tlb_addr = TranslateAddress<flag>(em_address);
+	if (tlb_addr == 0)
+	{
+		if (flag == FLAG_WRITE)
+			GenerateDSIException(em_address, true);
+		return;
+	}
+
+	// Handle stores that cross page boundaries (ewwww)
+	if (sizeof(T) > 1 && (em_address & (sizeof(T) - 1)) && (em_address & (HW_PAGE_SIZE - 1)) > HW_PAGE_SIZE - sizeof(T))
+	{
+		T val = bswap(data);
+
+		// We need to check both addresses before writing in case there's a DSI.
+		u32 em_address_next_page = (em_address + sizeof(T) - 1) & ~(HW_PAGE_SIZE - 1);
+		u32 tlb_addr_next_page = TranslateAddress<flag>(em_address_next_page);
+		if (tlb_addr_next_page == 0)
+		{
+			if (flag == FLAG_WRITE)
+				GenerateDSIException(em_address_next_page, true);
+			return;
+		}
+		for (u32 addr = em_address; addr < em_address + sizeof(T); addr++, tlb_addr++, val >>= 8)
+		{
+			if (addr == em_address_next_page)
+				tlb_addr = tlb_addr_next_page;
+			Memory::physical_base[tlb_addr] = (u8)val;
+		}
+		return;
+	}
+
+	// The easy case!
+	*(T*)&Memory::physical_base[tlb_addr] = bswap(data);
+}
+// =====================
+
+
+// =================================
+/* These functions are primarily called by the Interpreter functions and are routed to the correct
+   location through ReadFromHardware and WriteToHardware */
+// ----------------
+
+static void GenerateISIException(u32 effective_address);
+
+u32 Read_Opcode(u32 address)
+{
+	TryReadInstResult result = TryReadInstruction(address);
+	if (!result.valid)
+	{
+		GenerateISIException(address);
+		return 0;
+	}
+	return result.hex;
+}
+
+TryReadInstResult TryReadInstruction(u32 address)
+{
+	bool from_bat = true;
+	if (UReg_MSR(MSR).IR)
+	{
+		// TODO: Use real translation.
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU && (address & Memory::ADDR_MASK_MEM1))
+		{
+			u32 tlb_addr = TranslateAddress<FLAG_OPCODE>(address);
+			if (tlb_addr == 0)
+			{
+				return TryReadInstResult{ false, false, 0 };
+			}
+			else
+			{
+				address = tlb_addr;
+				from_bat = false;
+			}
+		}
+		else
+		{
+			int segment = address >> 28;
+			if ((segment == 0x8 || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE)
+			{
+				address = address & 0x3FFFFFFF;
+			}
+			else if (segment == 0x9 && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+			{
+				address = address & 0x3FFFFFFF;
+			}
+			else if (Memory::bFakeVMEM && (segment == 0x7 || segment == 0x4))
+			{
+				u32 hex = bswap((*(const u32*)&Memory::m_pFakeVMEM[address & Memory::FAKEVMEM_MASK]));
+				return TryReadInstResult{ true, true, hex };
+			}
+			else
+			{
+				return TryReadInstResult{ false, false, 0 };
+			}
+		}
+	}
+	else
+	{
+		if (address & 0xC0000000)
+			ERROR_LOG(MEMMAP, "Strange program counter with address translation off: 0x%08x", address);
+	}
+
+	u32 hex = PowerPC::ppcState.iCache.ReadInstruction(address);
+	return TryReadInstResult{ true, from_bat, hex };
+}
+
+u32 HostRead_Instruction(const u32 address)
+{
+	UGeckoInstruction inst = HostRead_U32(address);
+	return inst.hex;
+}
+
+static __forceinline void Memcheck(u32 address, u32 var, bool write, int size)
+{
+#ifdef ENABLE_MEM_CHECK
+	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(address);
+	if (mc)
+	{
+		if (CCPU::IsStepping())
+		{
+			// Disable when stepping so that resume works.
+			return;
+		}
+		mc->numHits++;
+		bool pause = mc->Action(&PowerPC::debug_interface, var, address, write, size, PC);
+		if (pause)
+		{
+			CCPU::Break();
+			// Fake a DSI so that all the code that tests for it in order to skip
+			// the rest of the instruction will apply.  (This means that
+			// watchpoints will stop the emulator before the offending load/store,
+			// not after like GDB does, but that's better anyway.  Just need to
+			// make sure resuming after that works.)
+			// It doesn't matter if ReadFromHardware triggers its own DSI because
+			// we'll take it after resuming.
+			PowerPC::ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
+		}
+	}
+#endif
+}
+
+u8 Read_U8(const u32 address)
+{
+	u8 var = ReadFromHardware<FLAG_READ, u8>(address);
+	Memcheck(address, var, false, 1);
+	return (u8)var;
+}
+
+u16 Read_U16(const u32 address)
+{
+	u16 var = ReadFromHardware<FLAG_READ, u16>(address);
+	Memcheck(address, var, false, 2);
+	return (u16)var;
+}
+
+u32 Read_U32(const u32 address)
+{
+	u32 var = ReadFromHardware<FLAG_READ, u32>(address);
+	Memcheck(address, var, false, 4);
+	return var;
+}
+
+u64 Read_U64(const u32 address)
+{
+	u64 var = ReadFromHardware<FLAG_READ, u64>(address);
+	Memcheck(address, (u32)var, false, 8);
+	return var;
+}
+
+double Read_F64(const u32 address)
+{
+	union
+	{
+		u64 i;
+		double d;
+	} cvt;
+
+	cvt.i = Read_U64(address);
+	return cvt.d;
+}
+
+float Read_F32(const u32 address)
+{
+	union
+	{
+		u32 i;
+		float d;
+	} cvt;
+
+	cvt.i = Read_U32(address);
+	return cvt.d;
+}
+
+u32 Read_U8_ZX(const u32 address)
+{
+	return (u32)Read_U8(address);
+}
+
+u32 Read_U16_ZX(const u32 address)
+{
+	return (u32)Read_U16(address);
+}
+
+void Write_U8(const u8 var, const u32 address)
+{
+	Memcheck(address, var, true, 1);
+	WriteToHardware<FLAG_WRITE, u8>(address, var);
+}
+
+void Write_U16(const u16 var, const u32 address)
+{
+	Memcheck(address, var, true, 2);
+	WriteToHardware<FLAG_WRITE, u16>(address, var);
+}
+void Write_U16_Swap(const u16 var, const u32 address)
+{
+	Memcheck(address, var, true, 2);
+	Write_U16(Common::swap16(var), address);
+}
+
+
+void Write_U32(const u32 var, const u32 address)
+{
+	Memcheck(address, var, true, 4);
+	WriteToHardware<FLAG_WRITE, u32>(address, var);
+}
+void Write_U32_Swap(const u32 var, const u32 address)
+{
+	Memcheck(address, var, true, 4);
+	Write_U32(Common::swap32(var), address);
+}
+
+void Write_U64(const u64 var, const u32 address)
+{
+	Memcheck(address, (u32)var, true, 8);
+	WriteToHardware<FLAG_WRITE, u64>(address, var);
+}
+void Write_U64_Swap(const u64 var, const u32 address)
+{
+	Memcheck(address, (u32)var, true, 8);
+	Write_U64(Common::swap64(var), address);
+}
+
+void Write_F64(const double var, const u32 address)
+{
+	union
+	{
+		u64 i;
+		double d;
+	} cvt;
+	cvt.d = var;
+	Write_U64(cvt.i, address);
+}
+
+u8 HostRead_U8(const u32 address)
+{
+	u8 var = ReadFromHardware<FLAG_NO_EXCEPTION, u8>(address);
+	return var;
+}
+
+u16 HostRead_U16(const u32 address)
+{
+	u16 var = ReadFromHardware<FLAG_NO_EXCEPTION, u16>(address);
+	return var;
+}
+
+u32 HostRead_U32(const u32 address)
+{
+	u32 var = ReadFromHardware<FLAG_NO_EXCEPTION, u32>(address);
+	return var;
+}
+
+void HostWrite_U8(const u8 var, const u32 address)
+{
+	WriteToHardware<FLAG_NO_EXCEPTION, u8>(address, var);
+}
+
+void HostWrite_U16(const u16 var, const u32 address)
+{
+	WriteToHardware<FLAG_NO_EXCEPTION, u16>(address, var);
+}
+
+void HostWrite_U32(const u32 var, const u32 address)
+{
+	WriteToHardware<FLAG_NO_EXCEPTION, u32>(address, var);
+}
+
+void HostWrite_U64(const u64 var, const u32 address)
+{
+	WriteToHardware<FLAG_NO_EXCEPTION, u64>(address, var);
+}
+
+std::string HostGetString(u32 address, size_t size)
+{
+	std::string s;
+	do
+	{
+		if (!HostIsRAMAddress(address))
+			break;
+		u8 res = HostRead_U8(address);
+		if (!res)
+			break;
+		++address;
+	} while (size == 0 || s.length() < size);
+	return s;
+}
+
+bool IsOptimizableRAMAddress(const u32 address)
+{
+#ifdef ENABLE_MEM_CHECK
+	return false;
+#endif
+
+	if (!UReg_MSR(MSR).DR)
+		return false;
+
+	int segment = address >> 28;
+
+	return (((segment == 0x8 || segment == 0xC || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE) ||
+		(Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE) ||
+		(segment == 0xE && (address < (0xE0000000 + Memory::L1_CACHE_SIZE))));
+}
+
+bool HostIsRAMAddress(u32 address)
+{
+	// TODO: This needs to be rewritten; it makes incorrect assumptions
+	// about BATs and page tables.
+	bool performTranslation = UReg_MSR(MSR).DR;
+	int segment = address >> 28;
+	if (performTranslation)
+	{
+		if ((segment == 0x8 || segment == 0xC || segment == 0x0) && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE)
+			return true;
+		else if (Memory::m_pEXRAM && (segment == 0x9 || segment == 0xD) && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+			return true;
+		else if (Memory::bFakeVMEM && (segment == 0x7 || segment == 0x4))
+			return true;
+		else if (segment == 0xE && (address < (0xE0000000 + Memory::L1_CACHE_SIZE)))
+			return true;
+
+		address = TranslateAddress<FLAG_NO_EXCEPTION>(address);
+		if (!address)
+			return false;
+	}
+
+	if (segment == 0x0 && (address & 0x0FFFFFFF) < Memory::REALRAM_SIZE)
+		return true;
+	else if (Memory::m_pEXRAM && segment == 0x1 && (address & 0x0FFFFFFF) < Memory::EXRAM_SIZE)
+		return true;
+	return false;
+
+
+}
+
+void DMA_LCToMemory(const u32 memAddr, const u32 cacheAddr, const u32 numBlocks)
+{
+	// TODO: It's not completely clear this is the right spot for this code;
+	// what would happen if, for example, the DVD drive tried to write to the EFB?
+	// TODO: This is terribly slow.
+	// TODO: Refactor.
+	// Avatar: The Last Airbender (GC) uses this for videos.
+	if ((memAddr & 0x0F000000) == 0x08000000)
+	{
+		for (u32 i = 0; i < 32 * numBlocks; i += 4)
+		{
+			u32 data = bswap(*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)));
+			EFB_Write(data, memAddr + i);
+		}
+		return;
+	}
+
+	// No known game uses this; here for completeness.
+	// TODO: Refactor.
+	if ((memAddr & 0x0F000000) == 0x0C000000)
+	{
+		for (u32 i = 0; i < 32 * numBlocks; i += 4)
+		{
+			u32 data = bswap(*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)));
+			Memory::mmio_mapping->Write(memAddr + i, data);
+		}
+		return;
+	}
+
+	const u8* src = Memory::m_pL1Cache + (cacheAddr & 0x3FFFF);
+	u8* dst = Memory::GetPointer(memAddr);
+	if (dst == nullptr)
+		return;
+
+	memcpy(dst, src, 32 * numBlocks);
+}
+
+void DMA_MemoryToLC(const u32 cacheAddr, const u32 memAddr, const u32 numBlocks)
+{
+	const u8* src = Memory::GetPointer(memAddr);
+	u8* dst = Memory::m_pL1Cache + (cacheAddr & 0x3FFFF);
+
+	// No known game uses this; here for completeness.
+	// TODO: Refactor.
+	if ((memAddr & 0x0F000000) == 0x08000000)
+	{
+		for (u32 i = 0; i < 32 * numBlocks; i += 4)
+		{
+			u32 data = EFB_Read(memAddr + i);
+			*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)) = bswap(data);
+		}
+		return;
+	}
+
+	// No known game uses this.
+	// TODO: Refactor.
+	if ((memAddr & 0x0F000000) == 0x0C000000)
+	{
+		for (u32 i = 0; i < 32 * numBlocks; i += 4)
+		{
+			u32 data = Memory::mmio_mapping->Read<u32>(memAddr + i);
+			*(u32*)(Memory::m_pL1Cache + ((cacheAddr + i) & 0x3FFFF)) = bswap(data);
+		}
+		return;
+	}
+
+	if (src == nullptr)
+		return;
+
+	memcpy(dst, src, 32 * numBlocks);
+}
+
+void ClearCacheLine(const u32 address)
+{
+	// FIXME: does this do the right thing if dcbz is run on hardware memory, e.g.
+	// the FIFO? Do games even do that? Probably not, but we should try to be correct...
+	for (u32 i = 0; i < 32; i += 8)
+		Write_U64(0, address + i);
+}
+
+u32 IsOptimizableMMIOAccess(u32 address, u32 accessSize)
+{
+#ifdef ENABLE_MEM_CHECK
+	return 0;
+#endif
+
+	if (!UReg_MSR(MSR).DR)
+		return 0;
+
+	if ((address & 0xF0000000) != 0xC0000000)
+		return 0;
+
+	unsigned translated = address & 0x0FFFFFFF;
+	bool aligned = (translated & ((accessSize >> 3) - 1)) == 0;
+	if (!aligned || !MMIO::IsMMIOAddress(translated))
+		return 0;
+	return translated;
+}
+
+bool IsOptimizableGatherPipeWrite(u32 address)
+{
+#ifdef ENABLE_MEM_CHECK
+	return false;
+#endif
+
+	if (!UReg_MSR(MSR).DR)
+		return false;
+
+	return address == 0xCC008000;
+}
+
+// *********************************************************************************
+// Warning: Test Area
+//
+// This code is for TESTING and it works in interpreter mode ONLY. Some games (like
+// COD iirc) work thanks to this basic TLB emulation.
+// It is just a small hack and we have never spend enough time to finalize it.
+// Cheers PearPC!
+//
+// *********************************************************************************
+
+/*
+* PearPC
+* ppc_mmu.cc
+*
+* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#define PPC_EXC_DSISR_PAGE (1<<30)
+#define PPC_EXC_DSISR_PROT (1<<27)
+#define PPC_EXC_DSISR_STORE (1<<25)
+
+#define SDR1_HTABORG(v) (((v)>>16)&0xffff)
+#define SDR1_HTABMASK(v) ((v)&0x1ff)
+#define SDR1_PAGETABLE_BASE(v) ((v)&0xffff)
+#define SR_T  (1<<31)
+#define SR_Ks (1<<30)
+#define SR_Kp (1<<29)
+#define SR_N  (1<<28)
+#define SR_VSID(v)       ((v)&0xffffff)
+#define SR_BUID(v)       (((v)>>20)&0x1ff)
+#define SR_CNTRL_SPEC(v) ((v)&0xfffff)
+
+#define EA_SR(v)         (((v)>>28)&0xf)
+#define EA_PageIndex(v)  (((v)>>12)&0xffff)
+#define EA_Offset(v)     ((v)&0xfff)
+#define EA_API(v)        (((v)>>22)&0x3f)
+
+#define PA_RPN(v)        (((v)>>12)&0xfffff)
+#define PA_Offset(v)     ((v)&0xfff)
+
+#define PTE1_V       (1<<31)
+#define PTE1_VSID(v) (((v)>>7)&0xffffff)
+#define PTE1_H       (1<<6)
+#define PTE1_API(v)  ((v)&0x3f)
+
+#define PTE2_RPN(v)  ((v)&0xfffff000)
+#define PTE2_R       (1<<8)
+#define PTE2_C       (1<<7)
+#define PTE2_WIMG(v) (((v)>>3)&0xf)
+#define PTE2_PP(v)   ((v)&3)
+
+// Hey! these duplicate a structure in Gekko.h
+union UPTE1
+{
+	struct
+	{
+		u32 API    : 6;
+		u32 H      : 1;
+		u32 VSID   : 24;
+		u32 V      : 1;
+	};
+	u32 Hex;
+};
+
+union UPTE2
+{
+	struct
+	{
+		u32 PP     : 2;
+		u32        : 1;
+		u32 WIMG   : 4;
+		u32 C      : 1;
+		u32 R      : 1;
+		u32        : 3;
+		u32 RPN    : 20;
+	};
+	u32 Hex;
+};
+
+static void GenerateDSIException(u32 effectiveAddress, bool write)
+{
+	// DSI exceptions are only supported in MMU mode.
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU)
+	{
+		PanicAlert("Invalid %s to 0x%08x, PC = 0x%08x ", write ? "Write to" : "Read from", effectiveAddress, PC);
+		return;
+	}
+
+	if (effectiveAddress)
+		PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE | PPC_EXC_DSISR_STORE;
+	else
+		PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE;
+
+	PowerPC::ppcState.spr[SPR_DAR] = effectiveAddress;
+
+	PowerPC::ppcState.Exceptions |= EXCEPTION_DSI;
+}
+
+
+static void GenerateISIException(u32 _EffectiveAddress)
+{
+	// Address of instruction could not be translated
+	NPC = _EffectiveAddress;
+
+	PowerPC::ppcState.Exceptions |= EXCEPTION_ISI;
+}
+
+
+void SDRUpdated()
+{
+	u32 htabmask = SDR1_HTABMASK(PowerPC::ppcState.spr[SPR_SDR]);
+	u32 x = 1;
+	u32 xx = 0;
+	int n = 0;
+	while ((htabmask & x) && (n < 9))
+	{
+		n++;
+		xx|=x;
+		x<<=1;
+	}
+	if (htabmask & ~xx)
+	{
+		return;
+	}
+	u32 htaborg = SDR1_HTABORG(PowerPC::ppcState.spr[SPR_SDR]);
+	if (htaborg & xx)
+	{
+		return;
+	}
+	PowerPC::ppcState.pagetable_base = htaborg<<16;
+	PowerPC::ppcState.pagetable_hashmask = ((xx<<10)|0x3ff);
+}
+
+enum TLBLookupResult
+{
+	TLB_FOUND,
+	TLB_NOTFOUND,
+	TLB_UPDATE_C
+};
+
+static __forceinline TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32 *paddr)
+{
+	u32 tag = vpa >> HW_PAGE_INDEX_SHIFT;
+	PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[flag == FLAG_OPCODE][tag & HW_PAGE_INDEX_MASK];
+	if (tlbe->tag[0] == tag)
+	{
+		// Check if C bit requires updating
+		if (flag == FLAG_WRITE)
+		{
+			UPTE2 PTE2;
+			PTE2.Hex = tlbe->pte[0];
+			if (PTE2.C == 0)
+			{
+				PTE2.C = 1;
+				tlbe->pte[0] = PTE2.Hex;
+				return TLB_UPDATE_C;
+			}
+		}
+
+		if (flag != FLAG_NO_EXCEPTION)
+			tlbe->recent = 0;
+
+		*paddr = tlbe->paddr[0] | (vpa & 0xfff);
+
+		return TLB_FOUND;
+	}
+	if (tlbe->tag[1] == tag)
+	{
+		// Check if C bit requires updating
+		if (flag == FLAG_WRITE)
+		{
+			UPTE2 PTE2;
+			PTE2.Hex = tlbe->pte[1];
+			if (PTE2.C == 0)
+			{
+				PTE2.C = 1;
+				tlbe->pte[1] = PTE2.Hex;
+				return TLB_UPDATE_C;
+			}
+		}
+
+		if (flag != FLAG_NO_EXCEPTION)
+			tlbe->recent = 1;
+
+		*paddr = tlbe->paddr[1] | (vpa & 0xfff);
+
+		return TLB_FOUND;
+	}
+	return TLB_NOTFOUND;
+}
+
+static __forceinline void UpdateTLBEntry(const XCheckTLBFlag flag, UPTE2 PTE2, const u32 address)
+{
+	if (flag == FLAG_NO_EXCEPTION)
+		return;
+
+	int tag = address >> HW_PAGE_INDEX_SHIFT;
+	PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[flag == FLAG_OPCODE][tag & HW_PAGE_INDEX_MASK];
+	int index = tlbe->recent == 0 && tlbe->tag[0] != TLB_TAG_INVALID;
+	tlbe->recent = index;
+	tlbe->paddr[index] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
+	tlbe->pte[index] = PTE2.Hex;
+	tlbe->tag[index] = tag;
+}
+
+void InvalidateTLBEntry(u32 address)
+{
+	PowerPC::tlb_entry *tlbe = &PowerPC::ppcState.tlb[0][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK];
+	tlbe->tag[0] = TLB_TAG_INVALID;
+	tlbe->tag[1] = TLB_TAG_INVALID;
+	PowerPC::tlb_entry *tlbe_i = &PowerPC::ppcState.tlb[1][(address >> HW_PAGE_INDEX_SHIFT) & HW_PAGE_INDEX_MASK];
+	tlbe_i->tag[0] = TLB_TAG_INVALID;
+	tlbe_i->tag[1] = TLB_TAG_INVALID;
+}
+
+// Page Address Translation
+static __forceinline u32 TranslatePageAddress(const u32 address, const XCheckTLBFlag flag)
+{
+	// TLB cache
+	// This catches 99%+ of lookups in practice, so the actual page table entry code below doesn't benefit
+	// much from optimization.
+	u32 translatedAddress = 0;
+	TLBLookupResult res = LookupTLBPageAddress(flag , address, &translatedAddress);
+	if (res == TLB_FOUND)
+		return translatedAddress;
+
+	u32 sr = PowerPC::ppcState.sr[EA_SR(address)];
+
+	u32 offset = EA_Offset(address);        // 12 bit
+	u32 page_index = EA_PageIndex(address); // 16 bit
+	u32 VSID = SR_VSID(sr);                  // 24 bit
+	u32 api = EA_API(address);              //  6 bit (part of page_index)
+
+	// hash function no 1 "xor" .360
+	u32 hash = (VSID ^ page_index);
+	u32 pte1 = bswap((VSID << 7) | api | PTE1_V);
+
+	for (int hash_func = 0; hash_func < 2; hash_func++)
+	{
+		// hash function no 2 "not" .360
+		if (hash_func == 1)
+		{
+			hash = ~hash;
+			pte1 |= PTE1_H << 24;
+		}
+
+		u32 pteg_addr = ((hash & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
+
+		for (int i = 0; i < 8; i++, pteg_addr += 8)
+		{
+			if (pte1 == *(u32*)&Memory::physical_base[pteg_addr])
+			{
+				UPTE2 PTE2;
+				PTE2.Hex = bswap((*(u32*)&Memory::physical_base[pteg_addr + 4]));
+
+				// set the access bits
+				switch (flag)
+				{
+				case FLAG_NO_EXCEPTION: break;
+				case FLAG_READ:     PTE2.R = 1; break;
+				case FLAG_WRITE:    PTE2.R = 1; PTE2.C = 1; break;
+				case FLAG_OPCODE:   PTE2.R = 1; break;
+				}
+
+				if (flag != FLAG_NO_EXCEPTION)
+					*(u32*)&Memory::physical_base[pteg_addr + 4] = bswap(PTE2.Hex);
+
+				// We already updated the TLB entry if this was caused by a C bit.
+				if (res != TLB_UPDATE_C)
+					UpdateTLBEntry(flag, PTE2, address);
+
+				return (PTE2.RPN << 12) | offset;
+			}
+		}
+	}
+	return 0;
+}
+
+// Translate effective address using BAT or PAT.  Returns 0 if the address cannot be translated.
+template <const XCheckTLBFlag flag>
+__forceinline u32 TranslateAddress(const u32 address)
+{
+	// TODO: Perform BAT translation.  (At the moment, we hardcode an assumed BAT
+	// configuration, so there's no reason to actually check the registers.)
+	return TranslatePageAddress(address, flag);
+}
+
+} // namespace
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
new file mode 100644
index 0000000000..a0774be4cf
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
@@ -0,0 +1,906 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <queue>
+#include <string>
+
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/GeckoCode.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/SignatureDB.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+// Analyzes PowerPC code in memory to find functions
+// After running, for each function we will know what functions it calls
+// and what functions calls it. That is, we will have an incomplete call graph,
+// but only missing indirect branches.
+
+// The results of this analysis is displayed in the code browsing sections at the bottom left
+// of the disassembly window (debugger).
+
+// It is also useful for finding function boundaries so that we can find, fingerprint and detect library functions.
+// We don't do this much currently. Only for the special case Super Monkey Ball.
+
+namespace PPCAnalyst
+{
+static const int CODEBUFFER_SIZE = 32000;
+// 0 does not perform block merging
+static const u32 FUNCTION_FOLLOWING_THRESHOLD = 16;
+
+CodeBuffer::CodeBuffer(int size)
+{
+	codebuffer = new PPCAnalyst::CodeOp[size];
+	size_ = size;
+}
+
+CodeBuffer::~CodeBuffer()
+{
+	delete[] codebuffer;
+}
+
+void AnalyzeFunction2(Symbol &func);
+u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc);
+
+#define INVALID_TARGET ((u32)-1)
+
+u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc)
+{
+	switch (instr.OPCD)
+	{
+	case 18://branch instruction
+		{
+			u32 target = SignExt26(instr.LI<<2);
+			if (!instr.AA)
+				target += pc;
+
+			return target;
+		}
+	default:
+		return INVALID_TARGET;
+	}
+}
+
+//To find the size of each found function, scan
+//forward until we hit blr. In the meantime, collect information
+//about which functions this function calls.
+//Also collect which internal branch goes the farthest
+//If any one goes farther than the blr, assume that there is more than
+//one blr, and keep scanning.
+
+bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size)
+{
+	if (!func.name.size())
+		func.name = StringFromFormat("zz_%07x_", startAddr & 0x0FFFFFF);
+	if (func.analyzed >= 1)
+		return true;  // No error, just already did it.
+
+	func.calls.clear();
+	func.callers.clear();
+	func.size = 0;
+	func.flags = FFLAG_LEAF;
+	u32 addr = startAddr;
+
+	u32 farthestInternalBranchTarget = startAddr;
+	int numInternalBranches = 0;
+	while (true)
+	{
+		func.size += 4;
+		if (func.size >= CODEBUFFER_SIZE * 4) //weird
+			return false;
+
+		UGeckoInstruction instr = (UGeckoInstruction)PowerPC::HostRead_U32(addr);
+		if (max_size && func.size > max_size)
+		{
+			func.address = startAddr;
+			func.analyzed = 1;
+			func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
+			if (numInternalBranches == 0)
+				func.flags |= FFLAG_STRAIGHT;
+			return true;
+		}
+		if (PPCTables::IsValidInstruction(instr))
+		{
+			if (instr.hex == 0x4e800020) //4e800021 is blrl, not the end of a function
+			{
+				//BLR
+				if (farthestInternalBranchTarget > addr)
+				{
+					//bah, not this one, continue..
+				}
+				else
+				{
+					//a final blr!
+					//We're done! Looks like we have a neat valid function. Perfect.
+					//Let's calc the checksum and get outta here
+					func.address = startAddr;
+					func.analyzed = 1;
+					func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
+					if (numInternalBranches == 0)
+						func.flags |= FFLAG_STRAIGHT;
+					return true;
+				}
+			}
+			/*
+			else if ((instr.hex & 0xFC000000) == (0x4b000000 & 0xFC000000) && !instr.LK)
+			{
+				u32 target = addr + SignExt26(instr.LI << 2);
+				if (target < startAddr || (max_size && target > max_size+startAddr))
+				{
+					//block ends by branching away. We're done!
+					func.size *= 4; // into bytes
+					func.address = startAddr;
+					func.analyzed = 1;
+					func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
+					if (numInternalBranches == 0)
+						func.flags |= FFLAG_STRAIGHT;
+					return true;
+				}
+			}*/
+			else if (instr.hex == 0x4e800021 || instr.hex == 0x4e800420 || instr.hex == 0x4e800421)
+			{
+				func.flags &= ~FFLAG_LEAF;
+				func.flags |= FFLAG_EVIL;
+			}
+			else if (instr.hex == 0x4c000064)
+			{
+				func.flags &= ~FFLAG_LEAF;
+				func.flags |= FFLAG_RFI;
+			}
+			else
+			{
+				if (instr.OPCD == 16)
+				{
+					u32 target = SignExt16(instr.BD << 2);
+
+					if (!instr.AA)
+						target += addr;
+
+					if (target > farthestInternalBranchTarget && !instr.LK)
+					{
+						farthestInternalBranchTarget = target;
+					}
+					numInternalBranches++;
+				}
+				else
+				{
+					u32 target = EvaluateBranchTarget(instr, addr);
+					if (target != INVALID_TARGET && instr.LK)
+					{
+						//we found a branch-n-link!
+						func.calls.emplace_back(target, addr);
+						func.flags &= ~FFLAG_LEAF;
+					}
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		addr += 4;
+	}
+}
+
+
+// Second pass analysis, done after the first pass is done for all functions
+// so we have more information to work with
+static void AnalyzeFunction2(Symbol *func)
+{
+	u32 flags = func->flags;
+
+	bool nonleafcall = false;
+	for (const SCall& c : func->calls)
+	{
+		Symbol *called_func = g_symbolDB.GetSymbolFromAddr(c.function);
+		if (called_func && (called_func->flags & FFLAG_LEAF) == 0)
+		{
+			nonleafcall = true;
+			break;
+		}
+	}
+
+	if (nonleafcall && !(flags & FFLAG_EVIL) && !(flags & FFLAG_RFI))
+		flags |= FFLAG_ONLYCALLSNICELEAFS;
+
+	func->flags = flags;
+}
+
+static bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b)
+{
+	const GekkoOPInfo *a_info = a.opinfo;
+	const GekkoOPInfo *b_info = b.opinfo;
+	int a_flags = a_info->flags;
+	int b_flags = b_info->flags;
+
+	// can't reorder around breakpoints
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging &&
+	    (PowerPC::breakpoints.IsAddressBreakPoint(a.address) || PowerPC::breakpoints.IsAddressBreakPoint(b.address)))
+		return false;
+	if (b_flags & (FL_SET_CRx | FL_ENDBLOCK | FL_TIMER | FL_EVIL | FL_SET_OE))
+		return false;
+	if ((b_flags & (FL_RC_BIT | FL_RC_BIT_F)) && (b.inst.Rc))
+		return false;
+	if ((a_flags & (FL_SET_CA | FL_READ_CA)) && (b_flags & (FL_SET_CA | FL_READ_CA)))
+		return false;
+
+	switch (b.inst.OPCD)
+	{
+	case 16:
+	case 18:
+		//branches. Do not swap.
+	case 17: //sc
+	case 46: //lmw
+	case 19: //table19 - lots of tricky stuff
+		return false;
+	}
+
+	// For now, only integer ops acceptable. Any instruction which can raise an
+	// interrupt is *not* a possible swap candidate: see [1] for an example of
+	// a crash caused by this error.
+	//
+	// [1] https://code.google.com/p/dolphin-emu/issues/detail?id=5864#c7
+	if (b_info->type != OPTYPE_INTEGER)
+		return false;
+
+	// Check that we have no register collisions.
+	// That is, check that none of b's outputs matches any of a's inputs,
+	// and that none of a's outputs matches any of b's inputs.
+	// The latter does not apply if a is a cmp, of course, but doesn't hurt to check.
+	// register collision: b outputs to one of a's inputs
+	if (b.regsOut & a.regsIn)
+		return false;
+	// register collision: a outputs to one of b's inputs
+	if (a.regsOut & b.regsIn)
+		return false;
+	// register collision: b outputs to one of a's outputs (overwriting it)
+	if (b.regsOut & a.regsOut)
+		return false;
+
+	return true;
+}
+
+// Most functions that are relevant to analyze should be
+// called by another function. Therefore, let's scan the
+// entire space for bl operations and find what functions
+// get called.
+static void FindFunctionsFromBranches(u32 startAddr, u32 endAddr, SymbolDB *func_db)
+{
+	for (u32 addr = startAddr; addr < endAddr; addr+=4)
+	{
+		UGeckoInstruction instr = (UGeckoInstruction)PowerPC::HostRead_U32(addr);
+
+		if (PPCTables::IsValidInstruction(instr))
+		{
+			switch (instr.OPCD)
+			{
+			case 18://branch instruction
+				{
+					if (instr.LK) //bl
+					{
+						u32 target = SignExt26(instr.LI << 2);
+						if (!instr.AA)
+							target += addr;
+						if (PowerPC::HostIsRAMAddress(target))
+						{
+							func_db->AddFunction(target);
+						}
+					}
+				}
+				break;
+			default:
+				break;
+			}
+		}
+	}
+}
+
+static void FindFunctionsAfterBLR(PPCSymbolDB *func_db)
+{
+	std::vector<u32> funcAddrs;
+
+	for (const auto& func : func_db->Symbols())
+		funcAddrs.push_back(func.second.address + func.second.size);
+
+	for (u32& location : funcAddrs)
+	{
+		while (true)
+		{
+			// skip zeroes that sometimes pad function to 16 byte boundary (e.g. Donkey Kong Country Returns)
+			while (PowerPC::HostRead_Instruction(location) == 0 && ((location & 0xf) != 0))
+				location += 4;
+			if (PPCTables::IsValidInstruction(PowerPC::HostRead_Instruction(location)))
+			{
+				//check if this function is already mapped
+				Symbol *f = func_db->AddFunction(location);
+				if (!f)
+					break;
+				else
+					location += f->size;
+			}
+			else
+				break;
+		}
+	}
+}
+
+void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db)
+{
+	//Step 1: Find all functions
+	FindFunctionsFromBranches(startAddr, endAddr, func_db);
+	FindFunctionsAfterBLR(func_db);
+
+	//Step 2:
+	func_db->FillInCallers();
+
+	int numLeafs = 0, numNice = 0, numUnNice = 0;
+	int numTimer = 0, numRFI = 0, numStraightLeaf = 0;
+	int leafSize = 0, niceSize = 0, unniceSize = 0;
+	for (auto& func : func_db->AccessSymbols())
+	{
+		if (func.second.address == 4)
+		{
+			WARN_LOG(OSHLE, "Weird function");
+			continue;
+		}
+		AnalyzeFunction2(&(func.second));
+		Symbol &f = func.second;
+		if (f.name.substr(0, 3) == "zzz")
+		{
+			if (f.flags & FFLAG_LEAF)
+				f.name += "_leaf";
+			if (f.flags & FFLAG_STRAIGHT)
+				f.name += "_straight";
+		}
+		if (f.flags & FFLAG_LEAF)
+		{
+			numLeafs++;
+			leafSize += f.size;
+		}
+		else if (f.flags & FFLAG_ONLYCALLSNICELEAFS)
+		{
+			numNice++;
+			niceSize += f.size;
+		}
+		else
+		{
+			numUnNice++;
+			unniceSize += f.size;
+		}
+
+		if (f.flags & FFLAG_TIMERINSTRUCTIONS)
+			numTimer++;
+		if (f.flags & FFLAG_RFI)
+			numRFI++;
+		if ((f.flags & FFLAG_STRAIGHT) && (f.flags & FFLAG_LEAF))
+			numStraightLeaf++;
+	}
+	if (numLeafs == 0)
+		leafSize = 0;
+	else
+		leafSize /= numLeafs;
+
+	if (numNice == 0)
+		niceSize = 0;
+	else
+		niceSize /= numNice;
+
+	if (numUnNice == 0)
+		unniceSize = 0;
+	else
+		unniceSize /= numUnNice;
+
+	INFO_LOG(OSHLE, "Functions analyzed. %i leafs, %i nice, %i unnice."
+		"%i timer, %i rfi. %i are branchless leafs.", numLeafs,
+		numNice, numUnNice, numTimer, numRFI, numStraightLeaf);
+	INFO_LOG(OSHLE, "Average size: %i (leaf), %i (nice), %i(unnice)",
+		leafSize, niceSize, unniceSize);
+}
+
+static bool isCmp(const CodeOp& a)
+{
+	return (a.inst.OPCD == 10 || a.inst.OPCD == 11) || (a.inst.OPCD == 31 && (a.inst.SUBOP10 == 0 || a.inst.SUBOP10 == 32));
+}
+
+static bool isCarryOp(const CodeOp& a)
+{
+	return (a.opinfo->flags & FL_SET_CA) && !(a.opinfo->flags & FL_SET_OE) && a.opinfo->type == OPTYPE_INTEGER;
+}
+
+static bool isCror(const CodeOp& a)
+{
+	return a.inst.OPCD == 19 && a.inst.SUBOP10 == 449;
+}
+
+void PPCAnalyzer::ReorderInstructionsCore(u32 instructions, CodeOp* code, bool reverse, ReorderType type)
+{
+	// Bubbling an instruction sometimes reveals another opportunity to bubble an instruction, so do
+	// multiple passes.
+	while (true)
+	{
+		// Instruction Reordering Pass
+		// Carry pass: bubble carry-using instructions as close to each other as possible, so we can avoid
+		// storing the carry flag.
+		// Compare pass: bubble compare instructions next to branches, so they can be merged.
+		bool swapped = false;
+		int increment = reverse ? -1 : 1;
+		int start = reverse ? instructions - 1 : 0;
+		int end = reverse ? 0 : instructions - 1;
+		for (int i = start; i != end; i += increment)
+		{
+			CodeOp &a = code[i];
+			CodeOp &b = code[i + increment];
+			// Reorder integer compares, rlwinm., and carry-affecting ops
+			// (if we add more merged branch instructions, add them here!)
+			if ((type == REORDER_CROR && isCror(a)) || (type == REORDER_CARRY && isCarryOp(a)) || (type == REORDER_CMP && (isCmp(a) || a.outputCR0)))
+			{
+				// once we're next to a carry instruction, don't move away!
+				if (type == REORDER_CARRY && i != start)
+				{
+					// if we read the CA flag, and the previous instruction sets it, don't move away.
+					if (!reverse && (a.opinfo->flags & FL_READ_CA) && (code[i - increment].opinfo->flags & FL_SET_CA))
+						continue;
+					// if we set the CA flag, and the next instruction reads it, don't move away.
+					if (reverse && (a.opinfo->flags & FL_SET_CA) && (code[i - increment].opinfo->flags & FL_READ_CA))
+						continue;
+				}
+
+				if (CanSwapAdjacentOps(a, b))
+				{
+					// Alright, let's bubble it!
+					std::swap(a, b);
+					swapped = true;
+				}
+			}
+		}
+		if (!swapped)
+			return;
+	}
+}
+
+void PPCAnalyzer::ReorderInstructions(u32 instructions, CodeOp *code)
+{
+	// Reorder cror instructions upwards (e.g. towards an fcmp). Technically we should be more
+	// picky about this, but cror seems to almost solely be used for this purpose in real code.
+	// Additionally, the other boolean ops seem to almost never be used.
+	if (HasOption(OPTION_CROR_MERGE))
+		ReorderInstructionsCore(instructions, code, true, REORDER_CROR);
+	// For carry, bubble instructions *towards* each other; one direction often isn't enough
+	// to get pairs like addc/adde next to each other.
+	if (HasOption(OPTION_CARRY_MERGE))
+	{
+		ReorderInstructionsCore(instructions, code, false, REORDER_CARRY);
+		ReorderInstructionsCore(instructions, code, true, REORDER_CARRY);
+	}
+	if (HasOption(OPTION_BRANCH_MERGE))
+		ReorderInstructionsCore(instructions, code, false, REORDER_CMP);
+}
+
+void PPCAnalyzer::SetInstructionStats(CodeBlock *block, CodeOp *code, GekkoOPInfo *opinfo, u32 index)
+{
+	code->wantsCR0 = false;
+	code->wantsCR1 = false;
+
+	if (opinfo->flags & FL_USE_FPU)
+		block->m_fpa->any = true;
+
+	if (opinfo->flags & FL_TIMER)
+		block->m_gpa->anyTimer = true;
+
+	// Does the instruction output CR0?
+	if (opinfo->flags & FL_RC_BIT)
+		code->outputCR0 = code->inst.hex & 1; //todo fix
+	else if ((opinfo->flags & FL_SET_CRn) && code->inst.CRFD == 0)
+		code->outputCR0 = true;
+	else
+		code->outputCR0 = (opinfo->flags & FL_SET_CR0) ? true : false;
+
+	// Does the instruction output CR1?
+	if (opinfo->flags & FL_RC_BIT_F)
+		code->outputCR1 = code->inst.hex & 1; //todo fix
+	else if ((opinfo->flags & FL_SET_CRn) && code->inst.CRFD == 1)
+		code->outputCR1 = true;
+	else
+		code->outputCR1 = (opinfo->flags & FL_SET_CR1) ? true : false;
+
+	code->wantsFPRF = (opinfo->flags & FL_READ_FPRF) ? true : false;
+	code->outputFPRF = (opinfo->flags & FL_SET_FPRF) ? true : false;
+	code->canEndBlock = (opinfo->flags & FL_ENDBLOCK) ? true : false;
+
+	code->wantsCA = (opinfo->flags & FL_READ_CA) ? true : false;
+	code->outputCA = (opinfo->flags & FL_SET_CA) ? true : false;
+
+	// We're going to try to avoid storing carry in XER if we can avoid it -- keep it in the x86 carry flag!
+	// If the instruction reads CA but doesn't write it, we still need to store CA in XER; we can't
+	// leave it in flags.
+	if (HasOption(OPTION_CARRY_MERGE))
+		code->wantsCAInFlags = code->wantsCA && code->outputCA && opinfo->type == OPTYPE_INTEGER;
+	else
+		code->wantsCAInFlags = false;
+
+	// mfspr/mtspr can affect/use XER, so be super careful here
+	// we need to note specifically that mfspr needs CA in XER, not in the x86 carry flag
+	if (code->inst.OPCD == 31 && code->inst.SUBOP10 == 339) // mfspr
+		code->wantsCA = ((code->inst.SPRU << 5) | (code->inst.SPRL & 0x1F)) == SPR_XER;
+	if (code->inst.OPCD == 31 && code->inst.SUBOP10 == 467) // mtspr
+		code->outputCA = ((code->inst.SPRU << 5) | (code->inst.SPRL & 0x1F)) == SPR_XER;
+
+	code->regsIn = BitSet32(0);
+	code->regsOut = BitSet32(0);
+	if (opinfo->flags & FL_OUT_A)
+	{
+		code->regsOut[code->inst.RA] = true;
+		block->m_gpa->SetOutputRegister(code->inst.RA, index);
+	}
+	if (opinfo->flags & FL_OUT_D)
+	{
+		code->regsOut[code->inst.RD] = true;
+		block->m_gpa->SetOutputRegister(code->inst.RD, index);
+	}
+	if ((opinfo->flags & FL_IN_A) || ((opinfo->flags & FL_IN_A0) && code->inst.RA != 0))
+	{
+		code->regsIn[code->inst.RA] = true;
+		block->m_gpa->SetInputRegister(code->inst.RA, index);
+	}
+	if (opinfo->flags & FL_IN_B)
+	{
+		code->regsIn[code->inst.RB] = true;
+		block->m_gpa->SetInputRegister(code->inst.RB, index);
+	}
+	if (opinfo->flags & FL_IN_C)
+	{
+		code->regsIn[code->inst.RC] = true;
+		block->m_gpa->SetInputRegister(code->inst.RC, index);
+	}
+	if (opinfo->flags & FL_IN_S)
+	{
+		code->regsIn[code->inst.RS] = true;
+		block->m_gpa->SetInputRegister(code->inst.RS, index);
+	}
+	if (code->inst.OPCD == 46) // lmw
+	{
+		for (int iReg = code->inst.RD; iReg < 32; ++iReg)
+		{
+			code->regsOut[iReg] = true;
+			block->m_gpa->SetOutputRegister(iReg, index);
+		}
+	}
+	else if (code->inst.OPCD == 47) //stmw
+	{
+		for (int iReg = code->inst.RS; iReg < 32; ++iReg)
+		{
+			code->regsIn[iReg] = true;
+			block->m_gpa->SetInputRegister(iReg, index);
+		}
+	}
+
+	code->fregOut = -1;
+	if (opinfo->flags & FL_OUT_FLOAT_D)
+		code->fregOut = code->inst.FD;
+
+	code->fregsIn = BitSet32(0);
+	if (opinfo->flags & FL_IN_FLOAT_A)
+		code->fregsIn[code->inst.FA] = true;
+	if (opinfo->flags & FL_IN_FLOAT_B)
+		code->fregsIn[code->inst.FB] = true;
+	if (opinfo->flags & FL_IN_FLOAT_C)
+		code->fregsIn[code->inst.FC] = true;
+	if (opinfo->flags & FL_IN_FLOAT_D)
+		code->fregsIn[code->inst.FD] = true;
+	if (opinfo->flags & FL_IN_FLOAT_S)
+		code->fregsIn[code->inst.FS] = true;
+
+	switch (opinfo->type)
+	{
+	case OPTYPE_INTEGER:
+	case OPTYPE_LOAD:
+	case OPTYPE_STORE:
+	case OPTYPE_LOADFP:
+	case OPTYPE_STOREFP:
+		break;
+	case OPTYPE_SINGLEFP:
+	case OPTYPE_DOUBLEFP:
+		break;
+	case OPTYPE_BRANCH:
+		if (code->inst.hex == 0x4e800020)
+		{
+			// For analysis purposes, we can assume that blr eats opinfo->flags.
+			code->outputCR0 = true;
+			code->outputCR1 = true;
+		}
+		break;
+	case OPTYPE_SYSTEM:
+	case OPTYPE_SYSTEMFP:
+		break;
+	}
+}
+
+u32 PPCAnalyzer::Analyze(u32 address, CodeBlock *block, CodeBuffer *buffer, u32 blockSize)
+{
+	// Clear block stats
+	memset(block->m_stats, 0, sizeof(BlockStats));
+
+	// Clear register stats
+	block->m_gpa->any = true;
+	block->m_fpa->any = false;
+
+	block->m_gpa->Clear();
+	block->m_fpa->Clear();
+
+	// Set the blocks start address
+	block->m_address = address;
+
+	// Reset our block state
+	block->m_broken = false;
+	block->m_memory_exception = false;
+	block->m_num_instructions = 0;
+	block->m_gqr_used = BitSet8(0);
+
+	CodeOp *code = buffer->codebuffer;
+
+	bool found_exit = false;
+	u32 return_address = 0;
+	u32 numFollows = 0;
+	u32 num_inst = 0;
+	bool prev_inst_from_bat = true;
+
+	for (u32 i = 0; i < blockSize; ++i)
+	{
+		auto result = PowerPC::TryReadInstruction(address);
+		if (!result.valid)
+		{
+			if (i == 0)
+				block->m_memory_exception = true;
+			break;
+		}
+		UGeckoInstruction inst = result.hex;
+
+		// Slight hack: the JIT block cache currently assumes all blocks end at the same place,
+		// but broken blocks due to page faults break this assumption. Avoid this by just ending
+		// all virtual memory instruction blocks at page boundaries.
+		// FIXME: improve the JIT block cache so we don't need to do this.
+		if ((!result.from_bat || !prev_inst_from_bat) && i > 0 && (address & 0xfff) == 0)
+		{
+			break;
+		}
+		prev_inst_from_bat = result.from_bat;
+
+		num_inst++;
+		memset(&code[i], 0, sizeof(CodeOp));
+		GekkoOPInfo *opinfo = GetOpInfo(inst);
+
+		code[i].opinfo = opinfo;
+		code[i].address = address;
+		code[i].inst = inst;
+		code[i].branchTo = -1;
+		code[i].branchToIndex = -1;
+		code[i].skip = false;
+		block->m_stats->numCycles += opinfo->numCycles;
+
+		SetInstructionStats(block, &code[i], opinfo, i);
+
+		bool follow = false;
+		u32 destination = 0;
+
+		bool conditional_continue = false;
+
+		// Do we inline leaf functions?
+		if (HasOption(OPTION_LEAF_INLINE))
+		{
+			if (inst.OPCD == 18 && blockSize > 1)
+			{
+				//Is bx - should we inline? yes!
+				if (inst.AA)
+					destination = SignExt26(inst.LI << 2);
+				else
+					destination = address + SignExt26(inst.LI << 2);
+				if (destination != block->m_address)
+					follow = true;
+			}
+			else if (inst.OPCD == 19 && inst.SUBOP10 == 16 &&
+				(inst.BO & (1 << 4)) && (inst.BO & (1 << 2)) &&
+				return_address != 0)
+			{
+				// bclrx with unconditional branch = return
+				follow = true;
+				destination = return_address;
+				return_address = 0;
+
+				if (inst.LK)
+					return_address = address + 4;
+			}
+			else if (inst.OPCD == 31 && inst.SUBOP10 == 467)
+			{
+				// mtspr
+				const u32 index = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
+				if (index == SPR_LR)
+				{
+					// We give up to follow the return address
+					// because we have to check the register usage.
+					return_address = 0;
+				}
+			}
+
+			// TODO: Find the optimal value for FUNCTION_FOLLOWING_THRESHOLD.
+			//       If it is small, the performance will be down.
+			//       If it is big, the size of generated code will be big and
+			//       cache clearning will happen many times.
+			// TODO: Investivate the reason why
+			//       "0" is fastest in some games, MP2 for example.
+			if (numFollows > FUNCTION_FOLLOWING_THRESHOLD)
+				follow = false;
+		}
+
+		if (HasOption(OPTION_CONDITIONAL_CONTINUE))
+		{
+			if (inst.OPCD == 16 &&
+				((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0))
+			{
+				// bcx with conditional branch
+				conditional_continue = true;
+			}
+			else if (inst.OPCD == 19 && inst.SUBOP10 == 16 &&
+				    ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0))
+			{
+				// bclrx with conditional branch
+				conditional_continue = true;
+			}
+			else if (inst.OPCD == 3 ||
+					(inst.OPCD == 31 && inst.SUBOP10 == 4))
+			{
+				// tw/twi tests and raises an exception
+				conditional_continue = true;
+			}
+			else if (inst.OPCD == 19 && inst.SUBOP10 == 528 &&
+				    (inst.BO_2 & BO_DONT_CHECK_CONDITION) == 0)
+			{
+				// Rare bcctrx with conditional branch
+				// Seen in NES games
+				conditional_continue = true;
+			}
+		}
+
+		if (!follow)
+		{
+			address += 4;
+			if (!conditional_continue && opinfo->flags & FL_ENDBLOCK) //right now we stop early
+			{
+				found_exit = true;
+				break;
+			}
+		}
+		// XXX: We don't support inlining yet.
+#if 0
+		else
+		{
+			numFollows++;
+			// We don't "code[i].skip = true" here
+			// because bx may store a certain value to the link register.
+			// Instead, we skip a part of bx in Jit**::bx().
+			address = destination;
+			merged_addresses[size_of_merged_addresses++] = address;
+		}
+#endif
+	}
+
+	block->m_num_instructions = num_inst;
+
+	if (block->m_num_instructions > 1)
+		ReorderInstructions(block->m_num_instructions, code);
+
+	if ((!found_exit && num_inst > 0) || blockSize == 1)
+	{
+		// We couldn't find an exit
+		block->m_broken = true;
+	}
+
+	// Scan for flag dependencies; assume the next block (or any branch that can leave the block)
+	// wants flags, to be safe.
+	bool wantsCR0 = true, wantsCR1 = true, wantsFPRF = true, wantsCA = true;
+	BitSet32 fprInUse, gprInUse, gprInReg, fprInXmm;
+	for (int i = block->m_num_instructions - 1; i >= 0; i--)
+	{
+		bool opWantsCR0 = code[i].wantsCR0;
+		bool opWantsCR1 = code[i].wantsCR1;
+		bool opWantsFPRF = code[i].wantsFPRF;
+		bool opWantsCA = code[i].wantsCA;
+		code[i].wantsCR0 = wantsCR0 || code[i].canEndBlock;
+		code[i].wantsCR1 = wantsCR1 || code[i].canEndBlock;
+		code[i].wantsFPRF = wantsFPRF || code[i].canEndBlock;
+		code[i].wantsCA = wantsCA || code[i].canEndBlock;
+		wantsCR0 |= opWantsCR0 || code[i].canEndBlock;
+		wantsCR1 |= opWantsCR1 || code[i].canEndBlock;
+		wantsFPRF |= opWantsFPRF || code[i].canEndBlock;
+		wantsCA |= opWantsCA || code[i].canEndBlock;
+		wantsCR0 &= !code[i].outputCR0 || opWantsCR0;
+		wantsCR1 &= !code[i].outputCR1 || opWantsCR1;
+		wantsFPRF &= !code[i].outputFPRF || opWantsFPRF;
+		wantsCA &= !code[i].outputCA || opWantsCA;
+		code[i].gprInUse = gprInUse;
+		code[i].fprInUse = fprInUse;
+		code[i].gprInReg = gprInReg;
+		code[i].fprInXmm = fprInXmm;
+		// TODO: if there's no possible endblocks or exceptions in between, tell the regcache
+		// we can throw away a register if it's going to be overwritten later.
+		gprInUse |= code[i].regsIn;
+		gprInReg |= code[i].regsIn;
+		fprInUse |= code[i].fregsIn;
+		if (strncmp(code[i].opinfo->opname, "stfd", 4))
+			fprInXmm |= code[i].fregsIn;
+		// For now, we need to count output registers as "used" though; otherwise the flush
+		// will result in a redundant store (e.g. store to regcache, then store again to
+		// the same location later).
+		gprInUse |= code[i].regsOut;
+		if (code[i].fregOut >= 0)
+			fprInUse[code[i].fregOut] = true;
+	}
+
+	// Forward scan, for flags that need the other direction for calculation.
+	BitSet32 fprIsSingle, fprIsDuplicated, fprIsStoreSafe;
+	BitSet8 gqrUsed, gqrModified;
+	for (u32 i = 0; i < block->m_num_instructions; i++)
+	{
+		code[i].fprIsSingle = fprIsSingle;
+		code[i].fprIsDuplicated = fprIsDuplicated;
+		code[i].fprIsStoreSafe = fprIsStoreSafe;
+		if (code[i].fregOut >= 0)
+		{
+			fprIsSingle[code[i].fregOut] = false;
+			fprIsDuplicated[code[i].fregOut] = false;
+			fprIsStoreSafe[code[i].fregOut] = false;
+			// Single, duplicated, and doesn't need PPC_FP.
+			if (code[i].opinfo->type == OPTYPE_SINGLEFP)
+			{
+				fprIsSingle[code[i].fregOut] = true;
+				fprIsDuplicated[code[i].fregOut] = true;
+				fprIsStoreSafe[code[i].fregOut] = true;
+			}
+			// Single and duplicated, but might be a denormal (not safe to skip PPC_FP).
+			// TODO: if we go directly from a load to store, skip conversion entirely?
+			// TODO: if we go directly from a load to a float instruction, and the value isn't used
+			// for anything else, we can skip PPC_FP on a load too.
+			if (!strncmp(code[i].opinfo->opname, "lfs", 3))
+			{
+				fprIsSingle[code[i].fregOut] = true;
+				fprIsDuplicated[code[i].fregOut] = true;
+			}
+			// Paired are still floats, but the top/bottom halves may differ.
+			if (code[i].opinfo->type == OPTYPE_PS || code[i].opinfo->type == OPTYPE_LOADPS)
+			{
+				fprIsSingle[code[i].fregOut] = true;
+				fprIsStoreSafe[code[i].fregOut] = true;
+			}
+			// Careful: changing the float mode in a block breaks this optimization, since
+			// a previous float op might have had had FTZ off while the later store has FTZ
+			// on. So, discard all information we have.
+			if (!strncmp(code[i].opinfo->opname, "mtfs", 4))
+				fprIsStoreSafe = BitSet32(0);
+		}
+
+		if (code[i].opinfo->type == OPTYPE_STOREPS || code[i].opinfo->type == OPTYPE_LOADPS)
+		{
+			int gqr = code[i].inst.OPCD == 4 ? code[i].inst.Ix : code[i].inst.I;
+			gqrUsed[gqr] = true;
+		}
+
+		if (code[i].inst.OPCD == 31 && code[i].inst.SUBOP10 == 467) // mtspr
+		{
+			int gqr = ((code[i].inst.SPRU << 5) | code[i].inst.SPRL) - SPR_GQR0;
+			if (gqr >= 0 && gqr <= 7)
+				gqrModified[gqr] = true;
+		}
+	}
+	block->m_gqr_used = gqrUsed;
+	block->m_gqr_modified = gqrModified;
+	return address;
+}
+
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.h b/Source/Core/Core/PowerPC/PPCAnalyst.h
new file mode 100644
index 0000000000..116a7541aa
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.h
@@ -0,0 +1,241 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <cstdlib>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+#include "Core/PowerPC/PPCTables.h"
+
+class PPCSymbolDB;
+struct Symbol;
+
+namespace PPCAnalyst
+{
+
+struct CodeOp //16B
+{
+	UGeckoInstruction inst;
+	GekkoOPInfo * opinfo;
+	u32 address;
+	u32 branchTo; //if 0, not a branch
+	int branchToIndex; //index of target block
+	BitSet32 regsOut;
+	BitSet32 regsIn;
+	BitSet32 fregsIn;
+	s8 fregOut;
+	bool isBranchTarget;
+	bool wantsCR0;
+	bool wantsCR1;
+	bool wantsFPRF;
+	bool wantsCA;
+	bool wantsCAInFlags;
+	bool outputCR0;
+	bool outputCR1;
+	bool outputFPRF;
+	bool outputCA;
+	bool canEndBlock;
+	bool skip;  // followed BL-s for example
+	// which registers are still needed after this instruction in this block
+	BitSet32 fprInUse;
+	BitSet32 gprInUse;
+	// just because a register is in use doesn't mean we actually need or want it in an x86 register.
+	BitSet32 gprInReg;
+	// we do double stores from GPRs, so we don't want to load a PowerPC floating point register into
+	// an XMM only to move it again to a GPR afterwards.
+	BitSet32 fprInXmm;
+	// whether an fpr is known to be an actual single-precision value at this point in the block.
+	BitSet32 fprIsSingle;
+	// whether an fpr is known to have identical top and bottom halves (e.g. due to a single instruction)
+	BitSet32 fprIsDuplicated;
+	// whether an fpr is the output of a single-precision arithmetic instruction, i.e. whether we can safely
+	// skip PPC_FP.
+	BitSet32 fprIsStoreSafe;
+};
+
+struct BlockStats
+{
+	bool isFirstBlockOfFunction;
+	bool isLastBlockOfFunction;
+	int numCycles;
+};
+
+struct BlockRegStats
+{
+	short firstRead[32];
+	short firstWrite[32];
+	short lastRead[32];
+	short lastWrite[32];
+	short numReads[32];
+	short numWrites[32];
+
+	bool any;
+	bool anyTimer;
+
+	int GetTotalNumAccesses(int reg) const
+	{
+		return numReads[reg] + numWrites[reg];
+	}
+
+	int GetUseRange(int reg) const
+	{
+		return std::max(lastRead[reg], lastWrite[reg]) -
+		       std::min(firstRead[reg], firstWrite[reg]);
+	}
+
+	bool IsUsed(int reg) const
+	{
+		return (numReads[reg] + numWrites[reg]) > 0;
+	}
+
+	void SetInputRegister(int reg, short opindex)
+	{
+		if (firstRead[reg] == -1)
+			firstRead[reg] = opindex;
+		lastRead[reg] = opindex;
+		numReads[reg]++;
+	}
+
+	void SetOutputRegister(int reg, short opindex)
+	{
+		if (firstWrite[reg] == -1)
+			firstWrite[reg] = opindex;
+		lastWrite[reg] = opindex;
+		numWrites[reg]++;
+	}
+
+	void Clear()
+	{
+		for (int i = 0; i < 32; ++i)
+		{
+			firstRead[i] = -1;
+			firstWrite[i] = -1;
+			numReads[i] = 0;
+			numWrites[i] = 0;
+		}
+	}
+};
+
+
+class CodeBuffer
+{
+public:
+	CodeBuffer(int size);
+	~CodeBuffer();
+
+	int GetSize() const { return size_; }
+
+	PPCAnalyst::CodeOp *codebuffer;
+
+private:
+	int size_;
+};
+
+struct CodeBlock
+{
+	// Beginning PPC address.
+	u32 m_address;
+
+	// Number of instructions
+	// Gives us the size of the block.
+	u32 m_num_instructions;
+
+	// Some basic statistics about the block.
+	BlockStats *m_stats;
+
+	// Register statistics about the block.
+	BlockRegStats *m_gpa, *m_fpa;
+
+	// Are we a broken block?
+	bool m_broken;
+
+	// Did we have a memory_exception?
+	bool m_memory_exception;
+
+	// Which GQRs this block uses, if any.
+	BitSet8 m_gqr_used;
+
+	// Which GQRs this block modifies, if any.
+	BitSet8 m_gqr_modified;
+};
+
+class PPCAnalyzer
+{
+private:
+
+	enum ReorderType
+	{
+		REORDER_CARRY,
+		REORDER_CMP,
+		REORDER_CROR
+	};
+
+	void ReorderInstructionsCore(u32 instructions, CodeOp* code, bool reverse, ReorderType type);
+	void ReorderInstructions(u32 instructions, CodeOp *code);
+	void SetInstructionStats(CodeBlock *block, CodeOp *code, GekkoOPInfo *opinfo, u32 index);
+
+	// Options
+	u32 m_options;
+public:
+
+	enum AnalystOption
+	{
+		// Conditional branch continuing
+		// If the JIT core supports conditional branches within the blocks
+		// Block will end on unconditional branch or other ENDBLOCK flagged instruction.
+		// Requires JIT support to be enabled.
+		OPTION_CONDITIONAL_CONTINUE = (1 << 0),
+
+		// If there is a unconditional branch that jumps to a leaf function then inline it.
+		// Might require JIT intervention to support it correctly.
+		// Requires JITBLock support for inlined code
+		// XXX: NOT COMPLETE
+		OPTION_LEAF_INLINE = (1 << 1),
+
+		// Complex blocks support jumping backwards on to themselves.
+		// Happens commonly in loops, pretty complex to support.
+		// May require register caches to use register usage metrics.
+		// XXX: NOT COMPLETE
+		OPTION_COMPLEX_BLOCK = (1 << 2),
+
+		// Similar to complex blocks.
+		// Instead of jumping backwards, this jumps forwards within the block.
+		// Requires JIT support to work.
+		// XXX: NOT COMPLETE
+		OPTION_FORWARD_JUMP = (1 << 3),
+
+		// Reorder compare/Rc instructions next to their associated branches and
+		// merge in the JIT (for common cases, anyway).
+		OPTION_BRANCH_MERGE = (1 << 4),
+
+		// Reorder carry instructions next to their associated branches and pass
+		// carry flags in the x86 flags between them, instead of in XER.
+		OPTION_CARRY_MERGE = (1 << 5),
+
+		// Reorder cror instructions next to their associated fcmp.
+		OPTION_CROR_MERGE =  (1 << 6),
+	};
+
+
+	PPCAnalyzer() : m_options(0) {}
+
+	// Option setting/getting
+	void SetOption(AnalystOption option) { m_options |= option; }
+	void ClearOption(AnalystOption option) { m_options &= ~(option); }
+	bool HasOption(AnalystOption option) const { return !!(m_options & option); }
+
+	u32 Analyze(u32 address, CodeBlock *block, CodeBuffer *buffer, u32 blockSize);
+};
+
+void LogFunctionCall(u32 addr);
+void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db);
+bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size = 0);
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp
new file mode 100644
index 0000000000..57c798c91c
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCCache.cpp
@@ -0,0 +1,157 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonFuncs.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCCache.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+namespace PowerPC
+{
+	static const u32 s_plru_mask[8] = {11, 11, 19, 19, 37, 37, 69, 69};
+	static const u32 s_plru_value[8] = {11, 3, 17, 1, 36, 4, 64, 0};
+
+	InstructionCache::InstructionCache()
+	{
+		for (u32 m = 0; m < 0xff; m++)
+		{
+			u32 w = 0;
+			while (m & (1 << w))
+				w++;
+			way_from_valid[m] = w;
+		}
+
+		for (u32 m = 0; m < 128; m++)
+		{
+			u32 b[7];
+			for (int i = 0; i < 7; i++)
+				b[i] = m & (1 << i);
+			u32 w;
+			if (b[0])
+				if (b[2])
+					if (b[6])
+						w = 7;
+					else
+						w = 6;
+				else
+					if (b[5])
+						w = 5;
+					else
+						w = 4;
+			else
+				if (b[1])
+					if (b[4])
+						w = 3;
+					else
+						w = 2;
+				else
+					if (b[3])
+						w = 1;
+					else
+						w = 0;
+			way_from_plru[m] = w;
+		}
+	}
+
+	void InstructionCache::Reset()
+	{
+		memset(valid, 0, sizeof(valid));
+		memset(plru, 0, sizeof(plru));
+		memset(lookup_table, 0xff, sizeof(lookup_table));
+		memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex));
+		memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem));
+		JitInterface::ClearSafe();
+	}
+
+	void InstructionCache::Init()
+	{
+		memset(data, 0, sizeof(data));
+		memset(tags, 0, sizeof(tags));
+		memset(way_from_valid, 0, sizeof(way_from_valid));
+		memset(way_from_plru, 0, sizeof(way_from_plru));
+
+		Reset();
+	}
+
+	void InstructionCache::Invalidate(u32 addr)
+	{
+		if (!HID0.ICE)
+			return;
+		// invalidates the whole set
+		u32 set = (addr >> 5) & 0x7f;
+		for (int i = 0; i < 8; i++)
+			if (valid[set] & (1 << i))
+			{
+				if (tags[set][i] & (ICACHE_VMEM_BIT >> 12))
+					lookup_table_vmem[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
+				else if (tags[set][i] & (ICACHE_EXRAM_BIT >> 12))
+					lookup_table_ex[((tags[set][i] << 7) | set) & 0x1fffff] = 0xff;
+				else
+					lookup_table[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
+			}
+		valid[set] = 0;
+		JitInterface::InvalidateICache(addr & ~0x1f, 32, false);
+	}
+
+	u32 InstructionCache::ReadInstruction(u32 addr)
+	{
+		if (!HID0.ICE) // instruction cache is disabled
+			return Memory::Read_U32(addr);
+		u32 set = (addr >> 5) & 0x7f;
+		u32 tag = addr >> 12;
+
+		u32 t;
+		if (addr & ICACHE_VMEM_BIT)
+		{
+			t = lookup_table_vmem[(addr >> 5) & 0xfffff];
+		}
+		else if (addr & ICACHE_EXRAM_BIT)
+		{
+			t = lookup_table_ex[(addr >> 5) & 0x1fffff];
+		}
+		else
+		{
+			t = lookup_table[(addr >> 5) & 0xfffff];
+		}
+
+		if (t == 0xff) // load to the cache
+		{
+			if (HID0.ILOCK) // instruction cache is locked
+				return Memory::Read_U32(addr);
+			// select a way
+			if (valid[set] != 0xff)
+				t = way_from_valid[valid[set]];
+			else
+				t = way_from_plru[plru[set]];
+			// load
+			Memory::CopyFromEmu((u8*)data[set][t], (addr & ~0x1f), 32);
+			if (valid[set] & (1 << t))
+			{
+				if (tags[set][t] & (ICACHE_VMEM_BIT >> 12))
+					lookup_table_vmem[((tags[set][t] << 7) | set) & 0xfffff] = 0xff;
+				else if (tags[set][t] & (ICACHE_EXRAM_BIT >> 12))
+					lookup_table_ex[((tags[set][t] << 7) | set) & 0x1fffff] = 0xff;
+				else
+					lookup_table[((tags[set][t] << 7) | set) & 0xfffff] = 0xff;
+			}
+
+			if (addr & ICACHE_VMEM_BIT)
+				lookup_table_vmem[(addr >> 5) & 0xfffff] = t;
+			else if (addr & ICACHE_EXRAM_BIT)
+				lookup_table_ex[(addr >> 5) & 0x1fffff] = t;
+			else
+				lookup_table[(addr >> 5) & 0xfffff] = t;
+			tags[set][t] = tag;
+			valid[set] |= (1 << t);
+		}
+		// update plru
+		plru[set] = (plru[set] & ~s_plru_mask[t]) | s_plru_value[t];
+		u32 res = Common::swap32(data[set][t][(addr >> 2) & 7]);
+		return res;
+	}
+
+}
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/PowerPC/PPCCache.h
similarity index 80%
rename from Source/Core/Core/Src/PowerPC/PPCCache.h
rename to Source/Core/Core/PowerPC/PPCCache.h
index 21ff0f64d5..b621f9b094 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.h
+++ b/Source/Core/Core/PowerPC/PPCCache.h
@@ -1,13 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _PPCCACHE_H
-#define _PPCCACHE_H
+#pragma once
 
-#include "Common.h"
-
-#define FAST_ICACHE
+#include "Common/CommonTypes.h"
 
 namespace PowerPC
 {
@@ -30,11 +27,9 @@ namespace PowerPC
 		u32 way_from_valid[255];
 		u32 way_from_plru[128];
 
-#ifdef FAST_ICACHE
 		u8 lookup_table[1<<20];
 		u8 lookup_table_ex[1<<21];
 		u8 lookup_table_vmem[1<<20];
-#endif
 
 		InstructionCache();
 		u32 ReadInstruction(u32 addr);
@@ -44,5 +39,3 @@ namespace PowerPC
 	};
 
 }
-
-#endif
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
new file mode 100644
index 0000000000..ed05c21e6e
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -0,0 +1,446 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Host.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
+
+
+PPCSymbolDB g_symbolDB;
+
+PPCSymbolDB::PPCSymbolDB()
+{
+	// Get access to the disasm() fgnction
+	debugger = &PowerPC::debug_interface;
+}
+
+PPCSymbolDB::~PPCSymbolDB()
+{
+}
+
+// Adds the function to the list, unless it's already there
+Symbol *PPCSymbolDB::AddFunction(u32 startAddr)
+{
+	if (startAddr < 0x80000010)
+		return nullptr;
+	XFuncMap::iterator iter = functions.find(startAddr);
+	if (iter != functions.end())
+	{
+		// it's already in the list
+		return nullptr;
+	}
+	else
+	{
+		Symbol tempFunc; //the current one we're working on
+		u32 targetEnd = PPCAnalyst::AnalyzeFunction(startAddr, tempFunc);
+		if (targetEnd == 0)
+			return nullptr;  //found a dud :(
+		//LOG(OSHLE, "Symbol found at %08x", startAddr);
+		functions[startAddr] = tempFunc;
+		tempFunc.type = Symbol::SYMBOL_FUNCTION;
+		checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
+		return &functions[startAddr];
+	}
+}
+
+void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& name, int type)
+{
+	XFuncMap::iterator iter = functions.find(startAddr);
+	if (iter != functions.end())
+	{
+		// already got it, let's just update name, checksum & size to be sure.
+		Symbol *tempfunc = &iter->second;
+		tempfunc->name = name;
+		tempfunc->hash = SignatureDB::ComputeCodeChecksum(startAddr, startAddr + size - 4);
+		tempfunc->type = type;
+		tempfunc->size = size;
+	}
+	else
+	{
+		// new symbol. run analyze.
+		Symbol tf;
+		tf.name = name;
+		tf.type = type;
+		tf.address = startAddr;
+		if (tf.type == Symbol::SYMBOL_FUNCTION)
+		{
+			PPCAnalyst::AnalyzeFunction(startAddr, tf, size);
+			checksumToFunction[tf.hash] = &(functions[startAddr]);
+		}
+		tf.size = size;
+		functions[startAddr] = tf;
+	}
+}
+
+Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr)
+{
+	if (!PowerPC::HostIsRAMAddress(addr))
+		return nullptr;
+
+	XFuncMap::iterator it = functions.find(addr);
+	if (it != functions.end())
+	{
+		return &it->second;
+	}
+	else
+	{
+		for (auto& p : functions)
+		{
+			if (addr >= p.second.address && addr < p.second.address + p.second.size)
+				return &p.second;
+		}
+	}
+	return nullptr;
+}
+
+const std::string PPCSymbolDB::GetDescription(u32 addr)
+{
+	Symbol *symbol = GetSymbolFromAddr(addr);
+	if (symbol)
+		return symbol->name;
+	else
+		return " --- ";
+}
+
+void PPCSymbolDB::FillInCallers()
+{
+	for (auto& p : functions)
+	{
+		p.second.callers.clear();
+	}
+
+	for (auto& entry : functions)
+	{
+		Symbol &f = entry.second;
+		for (const SCall& call : f.calls)
+		{
+			SCall NewCall(entry.first, call.callAddress);
+			u32 FunctionAddress = call.function;
+
+			XFuncMap::iterator FuncIterator = functions.find(FunctionAddress);
+			if (FuncIterator != functions.end())
+			{
+				Symbol& rCalledFunction = FuncIterator->second;
+				rCalledFunction.callers.push_back(NewCall);
+			}
+			else
+			{
+				//LOG(OSHLE, "FillInCallers tries to fill data in an unknown function 0x%08x.", FunctionAddress);
+				// TODO - analyze the function instead.
+			}
+		}
+	}
+}
+
+void PPCSymbolDB::PrintCalls(u32 funcAddr) const
+{
+	XFuncMap::const_iterator iter = functions.find(funcAddr);
+	if (iter != functions.end())
+	{
+		const Symbol &f = iter->second;
+		INFO_LOG(OSHLE, "The function %s at %08x calls:", f.name.c_str(), f.address);
+		for (const SCall& call : f.calls)
+		{
+			XFuncMap::const_iterator n = functions.find(call.function);
+			if (n != functions.end())
+			{
+				INFO_LOG(CONSOLE,"* %08x : %s", call.callAddress, n->second.name.c_str());
+			}
+		}
+	}
+	else
+	{
+		WARN_LOG(CONSOLE, "Symbol does not exist");
+	}
+}
+
+void PPCSymbolDB::PrintCallers(u32 funcAddr) const
+{
+	XFuncMap::const_iterator iter = functions.find(funcAddr);
+	if (iter != functions.end())
+	{
+		const Symbol &f = iter->second;
+		INFO_LOG(CONSOLE,"The function %s at %08x is called by:",f.name.c_str(),f.address);
+		for (const SCall& caller : f.callers)
+		{
+			XFuncMap::const_iterator n = functions.find(caller.function);
+			if (n != functions.end())
+			{
+				INFO_LOG(CONSOLE,"* %08x : %s", caller.callAddress, n->second.name.c_str());
+			}
+		}
+	}
+}
+
+void PPCSymbolDB::LogFunctionCall(u32 addr)
+{
+	//u32 from = PC;
+	XFuncMap::iterator iter = functions.find(addr);
+	if (iter != functions.end())
+	{
+		Symbol &f = iter->second;
+		f.numCalls++;
+	}
+}
+
+// The use case for handling bad map files is when you have a game with a map file on the disc,
+// but you can't tell whether that map file is for the particular release version used in that game,
+// or when you know that the map file is not for that build, but perhaps half the functions in the
+// map file are still at the correct locations. Which are both common situations. It will load any
+// function names and addresses that have a BLR before the start and at the end, but ignore any that
+// don't, and then tell you how many were good and how many it ignored. That way you either find out
+// it is all good and use it, find out it is partly good and use the good part, or find out that only
+// a handful of functions lined up by coincidence and then you can clear the symbols. In the future I
+// want to make it smarter, so it checks that there are no BLRs in the middle of the function
+// (by checking the code length), and also make it cope with added functions in the middle or work
+// based on the order of the functions and their approximate length. Currently that process has to be
+// done manually and is very tedious.
+// The use case for separate handling of map files that aren't bad is that you usually want to also
+// load names that aren't functions(if included in the map file) without them being rejected as invalid.
+// You can see discussion about these kinds of issues here : https://forums.oculus.com/viewtopic.php?f=42&t=11241&start=580
+// https://m2k2.taigaforum.com/post/metroid_prime_hacking_help_25.html#metroid_prime_hacking_help_25
+
+// This one can load both leftover map files on game discs (like Zelda), and mapfiles
+// produced by SaveSymbolMap below.
+// bad=true means carefully load map files that might not be from exactly the right version
+bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad)
+{
+	File::IOFile f(filename, "r");
+	if (!f)
+		return false;
+
+	// four columns are used in American Mensa Academy map files and perhaps other games
+	bool started = false, four_columns = false;
+	int good_count = 0, bad_count = 0;
+
+	char line[512];
+	while (fgets(line, 512, f.GetHandle()))
+	{
+		size_t length = strlen(line);
+		if (length < 4)
+			continue;
+
+		if (length == 34 && strcmp(line, "  address  Size   address  offset\n") == 0)
+		{
+			four_columns = true;
+			continue;
+		}
+
+		char temp[256];
+		sscanf(line, "%255s", temp);
+
+		if (strcmp(temp, "UNUSED")==0) continue;
+		if (strcmp(temp, ".text")==0)  {started = true; continue;};
+		if (strcmp(temp, ".init")==0)  {started = true; continue;};
+		if (strcmp(temp, "Starting")==0) continue;
+		if (strcmp(temp, "extab")==0) continue;
+		if (strcmp(temp, ".ctors")==0) break; //uh?
+		if (strcmp(temp, ".dtors")==0) break;
+		if (strcmp(temp, ".rodata")==0) continue;
+		if (strcmp(temp, ".data")==0) continue;
+		if (strcmp(temp, ".sbss")==0) continue;
+		if (strcmp(temp, ".sdata")==0) continue;
+		if (strcmp(temp, ".sdata2")==0) continue;
+		if (strcmp(temp, "address")==0)  continue;
+		if (strcmp(temp, "-----------------------")==0)  continue;
+		if (strcmp(temp, ".sbss2")==0) break;
+		if (temp[1] == ']') continue;
+
+		if (!started) continue;
+
+		u32 address, vaddress, size, offset, unknown;
+		char name[512], container[512];
+		if (four_columns)
+		{
+			// sometimes there is no unknown number, and sometimes it is because it is an entry of something else
+			if (length > 37 && line[37]==' ')
+			{
+				unknown = 0;
+				sscanf(line, "%08x %08x %08x %08x %511s", &address, &size, &vaddress, &offset, name);
+				char *s = strstr(line, "(entry of ");
+				if (s)
+				{
+					sscanf(s + 10, "%511s", container);
+					char *s2 = (strchr(container, ')'));
+					if (s2 && container[0]!='.')
+					{
+						s2[0] = '\0';
+						strcat(container, "::");
+						strcat(container, name);
+						strcpy(name, container);
+					}
+				}
+			}
+			else
+			{
+				sscanf(line, "%08x %08x %08x %08x %i %511s", &address, &size, &vaddress, &offset, &unknown, name);
+			}
+		}
+		// some entries in the table have a function name followed by " (entry of " followed by a container name, followed by ")"
+		// instead of a space followed by a number followed by a space followed by a name
+		else if (length > 27 && line[27] != ' ' && strstr(line, "(entry of "))
+		{
+			unknown = 0;
+			sscanf(line, "%08x %08x %08x %511s", &address, &size, &vaddress, name);
+			char *s = strstr(line, "(entry of ");
+			if (s)
+			{
+				sscanf(s + 10, "%511s", container);
+				char *s2 = (strchr(container, ')'));
+				if (s2 && container[0] != '.')
+				{
+					s2[0] = '\0';
+					strcat(container, "::");
+					strcat(container, name);
+					strcpy(name, container);
+				}
+			}
+		}
+		else
+		{
+			sscanf(line, "%08x %08x %08x %i %511s", &address, &size, &vaddress, &unknown, name);
+		}
+
+		const char *namepos = strstr(line, name);
+		if (namepos != nullptr) //would be odd if not :P
+			strcpy(name, namepos);
+		name[strlen(name) - 1] = 0;
+
+		// we want the function names only .... TODO: or do we really? aren't we wasting information here?
+		for (size_t i = 0; i < strlen(name); i++)
+		{
+			if (name[i] == ' ') name[i] = 0x00;
+			if (name[i] == '(') name[i] = 0x00;
+		}
+
+		// Check if this is a valid entry.
+		if (strcmp(name, ".text") != 0 && strcmp(name, ".init") != 0 && strlen(name) > 0)
+		{
+			vaddress |= 0x80000000;
+			bool good = !bad;
+			if (!good)
+			{
+				// check for BLR before function
+				u32 opcode = PowerPC::HostRead_Instruction(vaddress - 4);
+				if (opcode == 0x4e800020)
+				{
+					// check for BLR at end of function
+					opcode = PowerPC::HostRead_Instruction(vaddress + size - 4);
+					if (opcode == 0x4e800020)
+						good = true;
+				}
+			}
+			if (good)
+			{
+				++good_count;
+				AddKnownSymbol(vaddress | 0x80000000, size, name); // ST_FUNCTION
+			}
+			else
+			{
+				++bad_count;
+			}
+		}
+	}
+
+	Index();
+	if (bad)
+		SuccessAlertT("Loaded %d good functions, ignored %d bad functions.", good_count, bad_count);
+	return true;
+}
+
+
+// ===================================================
+/* Save the map file and save a code file */
+// ----------------
+bool PPCSymbolDB::SaveMap(const std::string& filename, bool WithCodes) const
+{
+	// Format the name for the codes version
+	std::string mapFile = filename;
+	if (WithCodes)
+		mapFile = mapFile.substr(0, mapFile.find_last_of(".")) + "_code.map";
+
+	// Check size
+	const int wxYES_NO = 0x00000002 | 0x00000008;
+	if (functions.size() == 0)
+	{
+		if (!AskYesNo(StringFromFormat(
+			"No symbol names are generated. Do you want to replace '%s' with a blank file?",
+			mapFile.c_str()).c_str(), "Confirm", wxYES_NO)) return false;
+	}
+
+	// Make a file
+	File::IOFile f(mapFile, "w");
+	if (!f)
+		return false;
+
+	// --------------------------------------------------------------------
+	// Walk through every code row
+	// -------------------------
+	fprintf(f.GetHandle(), ".text\n"); // Write ".text" at the top
+	XFuncMap::const_iterator itr = functions.begin();
+	u32 LastAddress = 0x80004000;
+	std::string LastSymbolName;
+	while (itr != functions.end())
+	{
+		// Save a map file
+		const Symbol &rSymbol = itr->second;
+		if (!WithCodes)
+		{
+			fprintf(f.GetHandle(),"%08x %08x %08x %i %s\n", rSymbol.address, rSymbol.size, rSymbol.address,
+			0, rSymbol.name.c_str());
+			++itr;
+		}
+
+		// Save a code file
+		else
+		{
+			// Get the current and next address
+			LastAddress = rSymbol.address;
+			LastSymbolName = rSymbol.name;
+			++itr;
+
+			/* To make nice straight lines we fill out the name with spaces, we also cut off
+			   all names longer than 25 letters */
+			std::string TempSym;
+			for (u32 i = 0; i < 25; i++)
+			{
+				if (i < LastSymbolName.size())
+					TempSym += LastSymbolName[i];
+				else
+					TempSym += " ";
+			}
+
+			// We currently skip the last block because we don't know how long it goes
+			int space;
+			if (itr != functions.end())
+				space = itr->second.address - LastAddress;
+			else
+				space = 0;
+
+			for (int i = 0; i < space; i += 4)
+			{
+				int Address = LastAddress + i;
+
+				std::string disasm = debugger->Disassemble(Address);
+				fprintf(f.GetHandle(),"%08x %i %20s %s\n", Address, 0, TempSym.c_str(), disasm.c_str());
+			}
+			// Write a blank line after each block
+			fprintf(f.GetHandle(), "\n");
+		}
+	}
+
+	return true;
+}
+// ===========
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h
new file mode 100644
index 0000000000..b238e694f9
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h
@@ -0,0 +1,45 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/SymbolDB.h"
+
+#include "Core/Debugger/PPCDebugInterface.h"
+
+// This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later.
+class PPCSymbolDB : public SymbolDB
+{
+private:
+	DebugInterface* debugger;
+
+public:
+	typedef void (*functionGetterCallback)(Symbol *f);
+
+	PPCSymbolDB();
+	~PPCSymbolDB();
+
+	Symbol *AddFunction(u32 startAddr) override;
+	void AddKnownSymbol(u32 startAddr, u32 size, const std::string& name, int type = Symbol::SYMBOL_FUNCTION);
+
+	Symbol *GetSymbolFromAddr(u32 addr) override;
+
+	const std::string GetDescription(u32 addr);
+
+	void FillInCallers();
+
+	bool LoadMap(const std::string& filename, bool bad = false);
+	bool SaveMap(const std::string& filename, bool WithCodes = false) const;
+
+	void PrintCalls(u32 funcAddr) const;
+	void PrintCallers(u32 funcAddr) const;
+	void LogFunctionCall(u32 addr);
+};
+
+extern PPCSymbolDB g_symbolDB;
diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp
new file mode 100644
index 0000000000..d54f689743
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCTables.cpp
@@ -0,0 +1,206 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/Interpreter/Interpreter_Tables.h"
+
+GekkoOPInfo *m_infoTable[64];
+GekkoOPInfo *m_infoTable4[1024];
+GekkoOPInfo *m_infoTable19[1024];
+GekkoOPInfo *m_infoTable31[1024];
+GekkoOPInfo *m_infoTable59[32];
+GekkoOPInfo *m_infoTable63[1024];
+
+GekkoOPInfo *m_allInstructions[512];
+int m_numInstructions;
+
+const u64 m_crTable[16] =
+{
+	PPCCRToInternal(0x0), PPCCRToInternal(0x1), PPCCRToInternal(0x2), PPCCRToInternal(0x3),
+	PPCCRToInternal(0x4), PPCCRToInternal(0x5), PPCCRToInternal(0x6), PPCCRToInternal(0x7),
+	PPCCRToInternal(0x8), PPCCRToInternal(0x9), PPCCRToInternal(0xA), PPCCRToInternal(0xB),
+	PPCCRToInternal(0xC), PPCCRToInternal(0xD), PPCCRToInternal(0xE), PPCCRToInternal(0xF),
+};
+
+GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
+{
+	GekkoOPInfo *info = m_infoTable[_inst.OPCD];
+	if ((info->type & 0xFFFFFF) == OPTYPE_SUBTABLE)
+	{
+		int table = info->type>>24;
+		switch (table)
+		{
+		case 4:  return m_infoTable4[_inst.SUBOP10];
+		case 19: return m_infoTable19[_inst.SUBOP10];
+		case 31: return m_infoTable31[_inst.SUBOP10];
+		case 59: return m_infoTable59[_inst.SUBOP5];
+		case 63: return m_infoTable63[_inst.SUBOP10];
+		default:
+			_assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC);
+			return nullptr;
+		}
+	}
+	else
+	{
+		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
+		{
+			_assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC);
+			return nullptr;
+		}
+		return m_infoTable[_inst.OPCD];
+	}
+}
+
+Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst)
+{
+	const GekkoOPInfo *info = m_infoTable[_inst.OPCD];
+	if ((info->type & 0xFFFFFF) == OPTYPE_SUBTABLE)
+	{
+		int table = info->type>>24;
+		switch (table)
+		{
+		case 4:  return Interpreter::m_opTable4[_inst.SUBOP10];
+		case 19: return Interpreter::m_opTable19[_inst.SUBOP10];
+		case 31: return Interpreter::m_opTable31[_inst.SUBOP10];
+		case 59: return Interpreter::m_opTable59[_inst.SUBOP5];
+		case 63: return Interpreter::m_opTable63[_inst.SUBOP10];
+		default:
+			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid subtable op %08x @ %08x", _inst.hex, PC);
+			return nullptr;
+		}
+	}
+	else
+	{
+		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
+		{
+			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid op %08x @ %08x", _inst.hex, PC);
+			return nullptr;
+		}
+		return Interpreter::m_opTable[_inst.OPCD];
+	}
+}
+namespace PPCTables
+{
+
+bool UsesFPU(UGeckoInstruction inst)
+{
+	GekkoOPInfo* const info = GetOpInfo(inst);
+
+	return (info->flags & FL_USE_FPU) != 0;
+}
+
+void InitTables(int cpu_core)
+{
+	// Interpreter ALWAYS needs to be initialized
+	InterpreterTables::InitTables();
+
+	if (cpu_core != PowerPC::CORE_INTERPRETER)
+		JitInterface::InitTables(cpu_core);
+}
+
+#define OPLOG
+#define OP_TO_LOG "mtfsb0x"
+
+#ifdef OPLOG
+namespace {
+	std::vector<u32> rsplocations;
+}
+#endif
+
+const char *GetInstructionName(UGeckoInstruction _inst)
+{
+	const GekkoOPInfo *info = GetOpInfo(_inst);
+	return info ? info->opname : nullptr;
+}
+
+bool IsValidInstruction(UGeckoInstruction _inst)
+{
+	const GekkoOPInfo *info = GetOpInfo(_inst);
+	return info != nullptr;
+}
+
+void CountInstruction(UGeckoInstruction _inst)
+{
+	GekkoOPInfo *info = GetOpInfo(_inst);
+	if (info)
+	{
+		info->runCount++;
+	}
+}
+
+void PrintInstructionRunCounts()
+{
+	typedef std::pair<const char*, u64> OpInfo;
+	std::vector<OpInfo> temp;
+	temp.reserve(m_numInstructions);
+	for (int i = 0; i < m_numInstructions; ++i)
+	{
+		GekkoOPInfo *pInst = m_allInstructions[i];
+		temp.emplace_back(pInst->opname, pInst->runCount);
+	}
+	std::sort(temp.begin(), temp.end(),
+		[](const OpInfo &a, const OpInfo &b)
+		{
+			return a.second > b.second;
+		});
+
+	for (auto &inst : temp)
+	{
+		if (inst.second == 0)
+			break;
+
+		DEBUG_LOG(POWERPC, "%s : %" PRIu64, inst.first, inst.second);
+		//PanicAlert("%s : %llu", inst.first, inst.second);
+	}
+}
+
+void LogCompiledInstructions()
+{
+	static unsigned int time = 0;
+
+	File::IOFile f(StringFromFormat("%sinst_log%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
+	for (int i = 0; i < m_numInstructions; i++)
+	{
+		GekkoOPInfo *pInst = m_allInstructions[i];
+		if (pInst->compileCount > 0)
+		{
+			fprintf(f.GetHandle(), "%s\t%i\t%" PRId64 "\t%08x\n", pInst->opname,
+				pInst->compileCount, pInst->runCount, pInst->lastUse);
+		}
+	}
+
+	f.Open(StringFromFormat("%sinst_not%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
+	for (int i = 0; i < m_numInstructions; i++)
+	{
+		GekkoOPInfo *pInst = m_allInstructions[i];
+		if (pInst->compileCount == 0)
+		{
+			fprintf(f.GetHandle(), "%s\t%i\t%" PRId64 "\n", pInst->opname,
+				pInst->compileCount, pInst->runCount);
+		}
+	}
+
+#ifdef OPLOG
+	f.Open(StringFromFormat("%s" OP_TO_LOG "_at%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
+	for (auto& rsplocation : rsplocations)
+	{
+		fprintf(f.GetHandle(), OP_TO_LOG ": %08x\n", rsplocation);
+	}
+#endif
+
+	++time;
+}
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/PPCTables.h b/Source/Core/Core/PowerPC/PPCTables.h
new file mode 100644
index 0000000000..82a9ac5d37
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PPCTables.h
@@ -0,0 +1,117 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+// Flags that indicate what an instruction can do.
+enum
+{
+	FL_SET_CR0         = (1<<0),  // Sets CR0.
+	FL_SET_CR1         = (1<<1),  // Sets CR1.
+	FL_SET_CRn         = (1<<2),  // Encoding decides which CR can be set.
+	FL_SET_CRx         = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn,
+	FL_SET_CA          = (1<<3),  // Sets the carry flag.
+	FL_READ_CA         = (1<<4),  // Reads the carry flag.
+	FL_RC_BIT          = (1<<5),  // Sets the record bit.
+	FL_RC_BIT_F        = (1<<6),  // Sets the record bit. Used for floating point instructions that do this.
+	FL_ENDBLOCK        = (1<<7),  // Specifies that the instruction can be used as an exit point for a JIT block.
+	FL_IN_A            = (1<<8),  // Uses rA as an input.
+	FL_IN_A0           = (1<<9),  // Uses rA as an input. Indicates that if rA is zero, the value zero is used, not the contents of r0.
+	FL_IN_B            = (1<<10), // Uses rB as an input.
+	FL_IN_C            = (1<<11), // Uses rC as an input.
+	FL_IN_S            = (1<<12), // Uses rS as an input.
+	FL_IN_AB           = FL_IN_A | FL_IN_B,
+	FL_IN_AC           = FL_IN_A | FL_IN_C,
+	FL_IN_ABC          = FL_IN_A | FL_IN_B | FL_IN_C,
+	FL_IN_SB           = FL_IN_S | FL_IN_B,
+	FL_IN_A0B          = FL_IN_A0 | FL_IN_B,
+	FL_IN_A0BC         = FL_IN_A0 | FL_IN_B | FL_IN_C,
+	FL_OUT_D           = (1<<13),  // rD is used as a destination.
+	FL_OUT_A           = (1<<14),  // rA is used as a destination.
+	FL_OUT_AD          = FL_OUT_A | FL_OUT_D,
+	FL_TIMER           = (1<<15),  // Used only for mftb.
+	FL_CHECKEXCEPTIONS = (1<<16),  // Used with rfi/rfid.
+	FL_EVIL            = (1<<17),  // Historically used to refer to instructions that messed up Super Monkey Ball.
+	FL_USE_FPU         = (1<<18),  // Used to indicate a floating point instruction.
+	FL_LOADSTORE       = (1<<19),  // Used to indicate a load/store instruction.
+	FL_SET_FPRF        = (1<<20),  // Sets bits in the FPRF.
+	FL_READ_FPRF       = (1<<21),  // Reads bits from the FPRF.
+	FL_SET_OE          = (1<<22),  // Sets the overflow flag.
+	FL_IN_FLOAT_A      = (1<<23),  // frA is used as an input.
+	FL_IN_FLOAT_B      = (1<<24),  // frB is used as an input.
+	FL_IN_FLOAT_C      = (1<<25),  // frC is used as an input.
+	FL_IN_FLOAT_S      = (1<<26),  // frS is used as an input.
+	FL_IN_FLOAT_D      = (1<<27),  // frD is used as an input.
+	FL_IN_FLOAT_AB     = FL_IN_FLOAT_A | FL_IN_FLOAT_B,
+	FL_IN_FLOAT_AC     = FL_IN_FLOAT_A | FL_IN_FLOAT_C,
+	FL_IN_FLOAT_ABC    = FL_IN_FLOAT_A | FL_IN_FLOAT_B | FL_IN_FLOAT_C,
+	FL_OUT_FLOAT_D     = (1<<28),  // frD is used as a destination.
+	// Used in the case of double ops (they don't modify the top half of the output)
+	FL_INOUT_FLOAT_D   = FL_IN_FLOAT_D | FL_OUT_FLOAT_D,
+};
+
+enum
+{
+	OPTYPE_INVALID ,
+	OPTYPE_SUBTABLE,
+	OPTYPE_INTEGER ,
+	OPTYPE_CR      ,
+	OPTYPE_SPR     ,
+	OPTYPE_SYSTEM  ,
+	OPTYPE_SYSTEMFP,
+	OPTYPE_LOAD    ,
+	OPTYPE_STORE   ,
+	OPTYPE_LOADFP  ,
+	OPTYPE_STOREFP ,
+	OPTYPE_DOUBLEFP,
+	OPTYPE_SINGLEFP,
+	OPTYPE_LOADPS  ,
+	OPTYPE_STOREPS ,
+	OPTYPE_PS      ,
+	OPTYPE_DCACHE  ,
+	OPTYPE_ICACHE  ,
+	OPTYPE_BRANCH  ,
+	OPTYPE_UNKNOWN ,
+};
+
+struct GekkoOPInfo
+{
+	const char *opname;
+	int type;
+	int flags;
+	int numCycles;
+	u64 runCount;
+	int compileCount;
+	u32 lastUse;
+};
+extern GekkoOPInfo *m_infoTable[64];
+extern GekkoOPInfo *m_infoTable4[1024];
+extern GekkoOPInfo *m_infoTable19[1024];
+extern GekkoOPInfo *m_infoTable31[1024];
+extern GekkoOPInfo *m_infoTable59[32];
+extern GekkoOPInfo *m_infoTable63[1024];
+
+extern GekkoOPInfo *m_allInstructions[512];
+
+extern int m_numInstructions;
+
+GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst);
+Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst);
+
+namespace PPCTables
+{
+
+void InitTables(int cpu_core);
+bool IsValidInstruction(UGeckoInstruction _instCode);
+bool UsesFPU(UGeckoInstruction _inst);
+
+void CountInstruction(UGeckoInstruction _inst);
+void PrintInstructionRunCounts();
+void LogCompiledInstructions();
+const char *GetInstructionName(UGeckoInstruction _inst);
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp
new file mode 100644
index 0000000000..f392c3e264
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PowerPC.cpp
@@ -0,0 +1,547 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Common/FPURoundMode.h"
+#include "Common/MathUtil.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Host.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Interpreter/Interpreter.h"
+
+
+CPUCoreBase *cpu_core_base;
+
+namespace PowerPC
+{
+
+// STATE_TO_SAVE
+PowerPCState GC_ALIGNED16(ppcState);
+static volatile CPUState state = CPU_POWERDOWN;
+
+Interpreter * const interpreter = Interpreter::getInstance();
+static CoreMode mode;
+static Common::Event s_state_change;
+
+Watches watches;
+BreakPoints breakpoints;
+MemChecks memchecks;
+PPCDebugInterface debug_interface;
+
+u32 CompactCR()
+{
+	u32 new_cr = 0;
+	for (int i = 0; i < 8; i++)
+	{
+		new_cr |= GetCRField(i) << (28 - i * 4);
+	}
+	return new_cr;
+}
+
+void ExpandCR(u32 cr)
+{
+	for (int i = 0; i < 8; i++)
+	{
+		SetCRField(i, (cr >> (28 - i * 4)) & 0xF);
+	}
+}
+
+void DoState(PointerWrap &p)
+{
+	// some of this code has been disabled, because
+	// it changes registers even in MODE_MEASURE (which is suspicious and seems like it could cause desyncs)
+	// and because the values it's changing have been added to CoreTiming::DoState, so it might conflict to mess with them here.
+
+	// rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer();
+	// *((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :)
+
+	p.DoPOD(ppcState);
+
+	// SystemTimers::DecrementerSet();
+	// SystemTimers::TimeBaseSet();
+
+	JitInterface::DoState(p);
+}
+
+static void ResetRegisters()
+{
+	memset(ppcState.ps, 0, sizeof(ppcState.ps));
+	memset(ppcState.gpr, 0, sizeof(ppcState.gpr));
+	memset(ppcState.spr, 0, sizeof(ppcState.spr));
+	/*
+	0x00080200 = lonestar 2.0
+	0x00088202 = lonestar 2.2
+	0x70000100 = gekko 1.0
+	0x00080100 = gekko 2.0
+	0x00083203 = gekko 2.3a
+	0x00083213 = gekko 2.3b
+	0x00083204 = gekko 2.4
+	0x00083214 = gekko 2.4e (8SE) - retail HW2
+	*/
+	ppcState.spr[SPR_PVR] = 0x00083214;
+	ppcState.spr[SPR_HID1] = 0x80000000; // We're running at 3x the bus clock
+	ppcState.spr[SPR_ECID_U] = 0x0d96e200;
+	ppcState.spr[SPR_ECID_M] = 0x1840c00d;
+	ppcState.spr[SPR_ECID_L] = 0x82bb08e8;
+
+	ppcState.fpscr = 0;
+	ppcState.pc = 0;
+	ppcState.npc = 0;
+	ppcState.Exceptions = 0;
+	for (auto& v : ppcState.cr_val)
+		v = 0x8000000000000001;
+
+	TL = 0;
+	TU = 0;
+	SystemTimers::TimeBaseSet();
+
+	// MSR should be 0x40, but we don't emulate BS1, so it would never be turned off :}
+	ppcState.msr = 0;
+	rDEC = 0xFFFFFFFF;
+	SystemTimers::DecrementerSet();
+}
+
+void Init(int cpu_core)
+{
+	FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53);
+
+	memset(ppcState.sr, 0, sizeof(ppcState.sr));
+	ppcState.pagetable_base = 0;
+	ppcState.pagetable_hashmask = 0;
+
+	for (int tlb = 0; tlb < 2; tlb++)
+	{
+		for (int set = 0; set < 64; set++)
+		{
+			ppcState.tlb[tlb][set].recent = 0;
+			for (int way = 0; way < 2; way++)
+			{
+				ppcState.tlb[tlb][set].paddr[way] = 0;
+				ppcState.tlb[tlb][set].pte[way] = 0;
+				ppcState.tlb[tlb][set].tag[way] = TLB_TAG_INVALID;
+			}
+		}
+	}
+
+	ResetRegisters();
+	PPCTables::InitTables(cpu_core);
+
+	// We initialize the interpreter because
+	// it is used on boot and code window independently.
+	interpreter->Init();
+
+	switch (cpu_core)
+	{
+	case PowerPC::CORE_INTERPRETER:
+		cpu_core_base = interpreter;
+		break;
+
+	default:
+		cpu_core_base = JitInterface::InitJitCore(cpu_core);
+		if (!cpu_core_base) // Handle Situations where JIT core isn't available
+		{
+			WARN_LOG(POWERPC, "Jit core %d not available. Defaulting to interpreter.", cpu_core);
+			cpu_core_base = interpreter;
+		}
+		break;
+	}
+
+	if (cpu_core_base != interpreter)
+	{
+		mode = MODE_JIT;
+	}
+	else
+	{
+		mode = MODE_INTERPRETER;
+	}
+	state = CPU_STEPPING;
+
+	ppcState.iCache.Init();
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
+		breakpoints.ClearAllTemporary();
+}
+
+void Shutdown()
+{
+	JitInterface::Shutdown();
+	interpreter->Shutdown();
+	cpu_core_base = nullptr;
+	state = CPU_POWERDOWN;
+}
+
+CoreMode GetMode()
+{
+	return mode;
+}
+
+void SetMode(CoreMode new_mode)
+{
+	if (new_mode == mode)
+		return;  // We don't need to do anything.
+
+	mode = new_mode;
+
+	switch (mode)
+	{
+	case MODE_INTERPRETER:  // Switching from JIT to interpreter
+		cpu_core_base = interpreter;
+		break;
+
+	case MODE_JIT:  // Switching from interpreter to JIT.
+		// Don't really need to do much. It'll work, the cache will refill itself.
+		cpu_core_base = JitInterface::GetCore();
+		if (!cpu_core_base) // Has a chance to not get a working JIT core if one isn't active on host
+			cpu_core_base = interpreter;
+		break;
+	}
+}
+
+void SingleStep()
+{
+	cpu_core_base->SingleStep();
+}
+
+void RunLoop()
+{
+	state = CPU_RUNNING;
+	cpu_core_base->Run();
+	Host_UpdateDisasmDialog();
+}
+
+CPUState GetState()
+{
+	return state;
+}
+
+volatile CPUState *GetStatePtr()
+{
+	return &state;
+}
+
+void Start()
+{
+	state = CPU_RUNNING;
+	Host_UpdateDisasmDialog();
+}
+
+void Pause()
+{
+	volatile CPUState old_state = state;
+	state = CPU_STEPPING;
+
+	// Wait for the CPU core to leave
+	if (old_state == CPU_RUNNING)
+		s_state_change.WaitFor(std::chrono::seconds(1));
+	Host_UpdateDisasmDialog();
+}
+
+void Stop()
+{
+	volatile CPUState old_state = state;
+	state = CPU_POWERDOWN;
+
+	// Wait for the CPU core to leave
+	if (old_state == CPU_RUNNING)
+		s_state_change.WaitFor(std::chrono::seconds(1));
+	Host_UpdateDisasmDialog();
+}
+
+void FinishStateMove()
+{
+	s_state_change.Set();
+}
+
+void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst)
+{
+	switch (MMCR0.PMC1SELECT)
+	{
+	case 0: // No change
+		break;
+	case 1: // Processor cycles
+		PowerPC::ppcState.spr[SPR_PMC1] += cycles;
+		break;
+	default:
+		break;
+	}
+
+	switch (MMCR0.PMC2SELECT)
+	{
+	case 0: // No change
+		break;
+	case 1: // Processor cycles
+		PowerPC::ppcState.spr[SPR_PMC2] += cycles;
+		break;
+	case 11: // Number of loads and stores completed
+		PowerPC::ppcState.spr[SPR_PMC2] += num_load_stores;
+		break;
+	default:
+		break;
+	}
+
+	switch (MMCR1.PMC3SELECT)
+	{
+	case 0: // No change
+		break;
+	case 1: // Processor cycles
+		PowerPC::ppcState.spr[SPR_PMC3] += cycles;
+		break;
+	case 11: // Number of FPU instructions completed
+		PowerPC::ppcState.spr[SPR_PMC3] += num_fp_inst;
+		break;
+	default:
+		break;
+	}
+
+	switch (MMCR1.PMC4SELECT)
+	{
+	case 0: // No change
+		break;
+	case 1: // Processor cycles
+		PowerPC::ppcState.spr[SPR_PMC4] += cycles;
+		break;
+	default:
+		break;
+	}
+
+	if ((MMCR0.PMC1INTCONTROL && (PowerPC::ppcState.spr[SPR_PMC1] & 0x80000000) != 0) ||
+		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC2] & 0x80000000) != 0) ||
+		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC3] & 0x80000000) != 0) ||
+		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC4] & 0x80000000) != 0))
+		PowerPC::ppcState.Exceptions |= EXCEPTION_PERFORMANCE_MONITOR;
+}
+
+void CheckExceptions()
+{
+	u32 exceptions = ppcState.Exceptions;
+
+	// Example procedure:
+	// set SRR0 to either PC or NPC
+	//SRR0 = NPC;
+	// save specified MSR bits
+	//SRR1 = MSR & 0x87C0FFFF;
+	// copy ILE bit to LE
+	//MSR |= (MSR >> 16) & 1;
+	// clear MSR as specified
+	//MSR &= ~0x04EF36; // 0x04FF36 also clears ME (only for machine check exception)
+	// set to exception type entry point
+	//NPC = 0x00000x00;
+
+	// TODO(delroth): Exception priority is completely wrong here: depending on
+	// the instruction class, exceptions should be executed in a given order,
+	// which is very different from the one arbitrarily chosen here. See §6.1.5
+	// in 6xx_pem.pdf.
+
+	if (exceptions & EXCEPTION_ISI)
+	{
+		SRR0 = NPC;
+		// Page fault occurred
+		SRR1 = (MSR & 0x87C0FFFF) | (1 << 30);
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000400;
+
+		INFO_LOG(POWERPC, "EXCEPTION_ISI");
+		ppcState.Exceptions &= ~EXCEPTION_ISI;
+	}
+	else if (exceptions & EXCEPTION_PROGRAM)
+	{
+		SRR0 = PC;
+		// say that it's a trap exception
+		SRR1 = (MSR & 0x87C0FFFF) | 0x20000;
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000700;
+
+		INFO_LOG(POWERPC, "EXCEPTION_PROGRAM");
+		ppcState.Exceptions &= ~EXCEPTION_PROGRAM;
+	}
+	else if (exceptions & EXCEPTION_SYSCALL)
+	{
+		SRR0 = NPC;
+		SRR1 = MSR & 0x87C0FFFF;
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000C00;
+
+		INFO_LOG(POWERPC, "EXCEPTION_SYSCALL (PC=%08x)", PC);
+		ppcState.Exceptions &= ~EXCEPTION_SYSCALL;
+	}
+	else if (exceptions & EXCEPTION_FPU_UNAVAILABLE)
+	{
+		//This happens a lot - GameCube OS uses deferred FPU context switching
+		SRR0 = PC; // re-execute the instruction
+		SRR1 = MSR & 0x87C0FFFF;
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000800;
+
+		INFO_LOG(POWERPC, "EXCEPTION_FPU_UNAVAILABLE");
+		ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE;
+	}
+#ifdef ENABLE_MEM_CHECK
+	else if (exceptions & EXCEPTION_FAKE_MEMCHECK_HIT)
+	{
+		ppcState.Exceptions &= ~EXCEPTION_DSI & ~EXCEPTION_FAKE_MEMCHECK_HIT;
+	}
+#endif
+	else if (exceptions & EXCEPTION_DSI)
+	{
+		SRR0 = PC;
+		SRR1 = MSR & 0x87C0FFFF;
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000300;
+		//DSISR and DAR regs are changed in GenerateDSIException()
+
+		INFO_LOG(POWERPC, "EXCEPTION_DSI");
+		ppcState.Exceptions &= ~EXCEPTION_DSI;
+	}
+	else if (exceptions & EXCEPTION_ALIGNMENT)
+	{
+		//This never happens ATM
+		// perhaps we can get dcb* instructions to use this :p
+		SRR0 = PC;
+		SRR1 = MSR & 0x87C0FFFF;
+		MSR |= (MSR >> 16) & 1;
+		MSR &= ~0x04EF36;
+		PC = NPC = 0x00000600;
+
+		//TODO crazy amount of DSISR options to check out
+
+		INFO_LOG(POWERPC, "EXCEPTION_ALIGNMENT");
+		ppcState.Exceptions &= ~EXCEPTION_ALIGNMENT;
+	}
+
+	// EXTERNAL INTERRUPT
+	else if (MSR & 0x0008000)  // Handling is delayed until MSR.EE=1.
+	{
+		if (exceptions & EXCEPTION_EXTERNAL_INT)
+		{
+			// Pokemon gets this "too early", it hasn't a handler yet
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000500;
+
+			INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT");
+			ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
+
+			_dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???");
+		}
+		else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
+		{
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000F00;
+
+			INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
+			ppcState.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR;
+		}
+		else if (exceptions & EXCEPTION_DECREMENTER)
+		{
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000900;
+
+			INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER");
+			ppcState.Exceptions &= ~EXCEPTION_DECREMENTER;
+		}
+	}
+}
+
+void CheckExternalExceptions()
+{
+	u32 exceptions = ppcState.Exceptions;
+
+	// EXTERNAL INTERRUPT
+	if (exceptions && (MSR & 0x0008000))  // Handling is delayed until MSR.EE=1.
+	{
+		if (exceptions & EXCEPTION_EXTERNAL_INT)
+		{
+			// Pokemon gets this "too early", it hasn't a handler yet
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000500;
+
+			INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT");
+			ppcState.Exceptions &= ~EXCEPTION_EXTERNAL_INT;
+
+			_dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???");
+		}
+		else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
+		{
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000F00;
+
+			INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
+			ppcState.Exceptions &= ~EXCEPTION_PERFORMANCE_MONITOR;
+		}
+		else if (exceptions & EXCEPTION_DECREMENTER)
+		{
+			SRR0 = NPC;
+			SRR1 = MSR & 0x87C0FFFF;
+			MSR |= (MSR >> 16) & 1;
+			MSR &= ~0x04EF36;
+			PC = NPC = 0x00000900;
+
+			INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER");
+			ppcState.Exceptions &= ~EXCEPTION_DECREMENTER;
+		}
+		else
+		{
+			_dbg_assert_msg_(POWERPC, 0, "Unknown EXT interrupt: Exceptions == %08x", exceptions);
+			ERROR_LOG(POWERPC, "Unknown EXTERNAL INTERRUPT exception: Exceptions == %08x", exceptions);
+		}
+	}
+}
+
+void CheckBreakPoints()
+{
+	if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
+	{
+		PowerPC::Pause();
+		if (PowerPC::breakpoints.IsTempBreakPoint(PC))
+			PowerPC::breakpoints.Remove(PC);
+	}
+}
+
+void OnIdle()
+{
+	CoreTiming::Idle();
+}
+
+}  // namespace
+
+
+// FPSCR update functions
+
+void UpdateFPRF(double dvalue)
+{
+	FPSCR.FPRF = MathUtil::ClassifyDouble(dvalue);
+	//if (FPSCR.FPRF == 0x11)
+	//	PanicAlert("QNAN alert");
+}
diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h
new file mode 100644
index 0000000000..67a0f9d85f
--- /dev/null
+++ b/Source/Core/Core/PowerPC/PowerPC.h
@@ -0,0 +1,391 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <tuple>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/PowerPC/CPUCoreBase.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCCache.h"
+
+class PointerWrap;
+
+extern CPUCoreBase *cpu_core_base;
+
+namespace PowerPC
+{
+
+enum
+{
+	CORE_INTERPRETER,
+	CORE_JIT64,
+	CORE_JITIL64,
+	CORE_JITARM,
+	CORE_JITARM64
+};
+
+enum CoreMode
+{
+	MODE_INTERPRETER,
+	MODE_JIT,
+};
+
+// TLB cache
+#define TLB_SIZE 128
+#define NUM_TLBS 2
+#define TLB_WAYS 2
+
+#define HW_PAGE_INDEX_SHIFT 12
+#define HW_PAGE_INDEX_MASK 0x3f
+#define HW_PAGE_TAG_SHIFT 18
+
+#define TLB_TAG_INVALID 0xffffffff
+
+struct tlb_entry
+{
+	u32 tag[TLB_WAYS];
+	u32 paddr[TLB_WAYS];
+	u32 pte[TLB_WAYS];
+	u8 recent;
+};
+
+// This contains the entire state of the emulated PowerPC "Gekko" CPU.
+struct GC_ALIGNED64(PowerPCState)
+{
+	u32 gpr[32];    // General purpose registers. r1 = stack pointer.
+
+	u32 pc;     // program counter
+	u32 npc;
+
+	// Optimized CR implementation. Instead of storing CR in its PowerPC format
+	// (4 bit value, SO/EQ/LT/GT), we store instead a 64 bit value for each of
+	// the 8 CR register parts. This 64 bit value follows this format:
+	//   - SO iff. bit 61 is set
+	//   - EQ iff. lower 32 bits == 0
+	//   - GT iff. (s64)cr_val > 0
+	//   - LT iff. bit 62 is set
+	//
+	// This has the interesting property that sign-extending the result of an
+	// operation from 32 to 64 bits results in a 64 bit value that works as a
+	// CR value. Checking each part of CR is also fast, as it is equivalent to
+	// testing one bit or the low 32 bit part of a register. And CR can still
+	// be manipulated bit by bit fairly easily.
+	u64 cr_val[8];
+
+	u32 msr;    // machine specific register
+	u32 fpscr;  // floating point flags/status bits
+
+	// Exception management.
+	u32 Exceptions;
+
+	// Downcount for determining when we need to do timing
+	// This isn't quite the right location for it, but it is here to accelerate the ARM JIT
+	// This variable should be inside of the CoreTiming namespace if we wanted to be correct.
+	int downcount;
+
+	// XER, reformatted into byte fields for easier access.
+	u8 xer_ca;
+	u8 xer_so_ov; // format: (SO << 1) | OV
+	// The Broadway CPU implements bits 16-23 of the XER register... even though it doesn't support lscbx
+	u16 xer_stringctrl;
+
+#if _M_X86_64
+	// This member exists for the purpose of an assertion in x86 JitBase.cpp
+	// that its offset <= 0x100.  To minimize code size on x86, we want as much
+	// useful stuff in the one-byte offset range as possible - which is why ps
+	// is sitting down here.  It currently doesn't make a difference on other
+	// supported architectures.
+	std::tuple<> above_fits_in_first_0x100;
+#endif
+
+	// The paired singles are strange : PS0 is stored in the full 64 bits of each FPR
+	// but ps calculations are only done in 32-bit precision, and PS1 is only 32 bits.
+	// Since we want to use SIMD, SSE2 is the only viable alternative - 2x double.
+	GC_ALIGNED16(u64 ps[32][2]);
+
+	u32 sr[16];  // Segment registers.
+
+	// special purpose registers - controls quantizers, DMA, and lots of other misc extensions.
+	// also for power management, but we don't care about that.
+	u32 spr[1024];
+
+	tlb_entry tlb[NUM_TLBS][TLB_SIZE / TLB_WAYS];
+
+	u32 pagetable_base;
+	u32 pagetable_hashmask;
+
+	InstructionCache iCache;
+};
+
+#if _M_X86_64
+static_assert(offsetof(PowerPC::PowerPCState, above_fits_in_first_0x100) <= 0x100, "top of PowerPCState too big");
+#endif
+
+enum CPUState
+{
+	CPU_RUNNING = 0,
+	CPU_STEPPING = 2,
+	CPU_POWERDOWN = 3,
+};
+
+extern PowerPCState ppcState;
+
+extern Watches watches;
+extern BreakPoints breakpoints;
+extern MemChecks memchecks;
+extern PPCDebugInterface debug_interface;
+
+void Init(int cpu_core);
+void Shutdown();
+void DoState(PointerWrap &p);
+
+CoreMode GetMode();
+void SetMode(CoreMode _coreType);
+
+void SingleStep();
+void CheckExceptions();
+void CheckExternalExceptions();
+void CheckBreakPoints();
+void RunLoop();
+void Start();
+void Pause();
+void Stop();
+void FinishStateMove();
+CPUState GetState();
+volatile CPUState *GetStatePtr();  // this oddity is here instead of an extern declaration to easily be able to find all direct accesses throughout the code.
+
+u32 CompactCR();
+void ExpandCR(u32 cr);
+
+void OnIdle();
+
+void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst);
+
+// Easy register access macros.
+#define HID0 ((UReg_HID0&)PowerPC::ppcState.spr[SPR_HID0])
+#define HID2 ((UReg_HID2&)PowerPC::ppcState.spr[SPR_HID2])
+#define HID4 ((UReg_HID4&)PowerPC::ppcState.spr[SPR_HID4])
+#define DMAU  (*(UReg_DMAU*)&PowerPC::ppcState.spr[SPR_DMAU])
+#define DMAL  (*(UReg_DMAL*)&PowerPC::ppcState.spr[SPR_DMAL])
+#define MMCR0 ((UReg_MMCR0&)PowerPC::ppcState.spr[SPR_MMCR0])
+#define MMCR1 ((UReg_MMCR1&)PowerPC::ppcState.spr[SPR_MMCR1])
+#define PC     PowerPC::ppcState.pc
+#define NPC    PowerPC::ppcState.npc
+#define FPSCR  ((UReg_FPSCR&)PowerPC::ppcState.fpscr)
+#define MSR    PowerPC::ppcState.msr
+#define GPR(n) PowerPC::ppcState.gpr[n]
+
+#define rGPR PowerPC::ppcState.gpr
+#define rSPR(i) PowerPC::ppcState.spr[i]
+#define LR     PowerPC::ppcState.spr[SPR_LR]
+#define CTR    PowerPC::ppcState.spr[SPR_CTR]
+#define rDEC   PowerPC::ppcState.spr[SPR_DEC]
+#define SRR0   PowerPC::ppcState.spr[SPR_SRR0]
+#define SRR1   PowerPC::ppcState.spr[SPR_SRR1]
+#define SPRG0  PowerPC::ppcState.spr[SPR_SPRG0]
+#define SPRG1  PowerPC::ppcState.spr[SPR_SPRG1]
+#define SPRG2  PowerPC::ppcState.spr[SPR_SPRG2]
+#define SPRG3  PowerPC::ppcState.spr[SPR_SPRG3]
+#define GQR(x) PowerPC::ppcState.spr[SPR_GQR0+x]
+#define TL     PowerPC::ppcState.spr[SPR_TL]
+#define TU     PowerPC::ppcState.spr[SPR_TU]
+
+#define rPS0(i) (*(double*)(&PowerPC::ppcState.ps[i][0]))
+#define rPS1(i) (*(double*)(&PowerPC::ppcState.ps[i][1]))
+
+#define riPS0(i) (*(u64*)(&PowerPC::ppcState.ps[i][0]))
+#define riPS1(i) (*(u64*)(&PowerPC::ppcState.ps[i][1]))
+
+// Routines for debugger UI, cheats, etc. to access emulated memory from the
+// perspective of the CPU.  Not for use by core emulation routines.
+// Use "Host_" prefix.
+u8 HostRead_U8(const u32 address);
+u16 HostRead_U16(const u32 address);
+u32 HostRead_U32(const u32 address);
+u32 HostRead_Instruction(const u32 address);
+
+void HostWrite_U8(const u8 var, const u32 address);
+void HostWrite_U16(const u16 var, const u32 address);
+void HostWrite_U32(const u32 var, const u32 address);
+void HostWrite_U64(const u64 var, const u32 address);
+
+// Returns whether a read or write to the given address will resolve to a RAM
+// access given the current CPU state.
+bool HostIsRAMAddress(const u32 address);
+
+std::string HostGetString(u32 em_address, size_t size = 0);
+
+// Routines for the CPU core to access memory.
+
+// Used by interpreter to read instructions, uses iCache
+u32 Read_Opcode(const u32 address);
+struct TryReadInstResult
+{
+	bool valid;
+	bool from_bat;
+	u32 hex;
+};
+TryReadInstResult TryReadInstruction(const u32 address);
+
+u8  Read_U8(const u32 address);
+u16 Read_U16(const u32 address);
+u32 Read_U32(const u32 address);
+u64 Read_U64(const u32 address);
+
+// Useful helper functions, used by ARM JIT
+float Read_F32(const u32 address);
+double Read_F64(const u32 address);
+
+// used by JIT. Return zero-extended 32bit values
+u32 Read_U8_ZX(const u32 address);
+u32 Read_U16_ZX(const u32 address);
+
+void Write_U8(const u8 var, const u32 address);
+void Write_U16(const u16 var, const u32 address);
+void Write_U32(const u32 var, const u32 address);
+void Write_U64(const u64 var, const u32 address);
+
+void Write_U16_Swap(const u16 var, const u32 address);
+void Write_U32_Swap(const u32 var, const u32 address);
+void Write_U64_Swap(const u64 var, const u32 address);
+
+// Useful helper functions, used by ARM JIT
+void Write_F64(const double var, const u32 address);
+
+void DMA_LCToMemory(const u32 memAddr, const u32 cacheAddr, const u32 numBlocks);
+void DMA_MemoryToLC(const u32 cacheAddr, const u32 memAddr, const u32 numBlocks);
+void ClearCacheLine(const u32 address); // Zeroes 32 bytes; address should be 32-byte-aligned
+
+// TLB functions
+void SDRUpdated();
+void InvalidateTLBEntry(u32 address);
+
+// Result changes based on the BAT registers and MSR.DR.  Returns whether
+// it's safe to optimize a read or write to this address to an unguarded
+// memory access.  Does not consider page tables.
+bool IsOptimizableRAMAddress(const u32 address);
+u32 IsOptimizableMMIOAccess(u32 address, u32 accessSize);
+bool IsOptimizableGatherPipeWrite(u32 address);
+
+}  // namespace
+
+enum CRBits
+{
+	CR_SO = 1,
+	CR_EQ = 2,
+	CR_GT = 4,
+	CR_LT = 8,
+
+	CR_SO_BIT = 0,
+	CR_EQ_BIT = 1,
+	CR_GT_BIT = 2,
+	CR_LT_BIT = 3,
+};
+
+// Convert between PPC and internal representation of CR.
+inline u64 PPCCRToInternal(u8 value)
+{
+	u64 cr_val = 0x100000000;
+	cr_val |= (u64)!!(value & CR_SO) << 61;
+	cr_val |= (u64)!(value & CR_EQ);
+	cr_val |= (u64)!(value & CR_GT) << 63;
+	cr_val |= (u64)!!(value & CR_LT) << 62;
+
+	return cr_val;
+}
+
+// convert flags into 64-bit CR values with a lookup table
+extern const u64 m_crTable[16];
+
+// Warning: these CR operations are fairly slow since they need to convert from
+// PowerPC format (4 bit) to our internal 64 bit format. See the definition of
+// ppcState.cr_val for more explanations.
+inline void SetCRField(int cr_field, int value)
+{
+	PowerPC::ppcState.cr_val[cr_field] = m_crTable[value];
+}
+
+inline u32 GetCRField(int cr_field)
+{
+	u64 cr_val = PowerPC::ppcState.cr_val[cr_field];
+	u32 ppc_cr = 0;
+
+	// SO
+	ppc_cr |= !!(cr_val & (1ull << 61));
+	// EQ
+	ppc_cr |= ((cr_val & 0xFFFFFFFF) == 0) << 1;
+	// GT
+	ppc_cr |= ((s64)cr_val > 0) << 2;
+	// LT
+	ppc_cr |= !!(cr_val & (1ull << 62)) << 3;
+
+	return ppc_cr;
+}
+
+inline u32 GetCRBit(int bit)
+{
+	return (GetCRField(bit >> 2) >> (3 - (bit & 3))) & 1;
+}
+
+inline void SetCRBit(int bit, int value)
+{
+	if (value & 1)
+		SetCRField(bit >> 2, GetCRField(bit >> 2) | (0x8 >> (bit & 3)));
+	else
+		SetCRField(bit >> 2, GetCRField(bit >> 2) & ~(0x8 >> (bit & 3)));
+}
+
+// SetCR and GetCR are fairly slow. Should be avoided if possible.
+inline void SetCR(u32 new_cr)
+{
+	PowerPC::ExpandCR(new_cr);
+}
+
+inline u32 GetCR()
+{
+	return PowerPC::CompactCR();
+}
+
+inline void SetCarry(int ca)
+{
+	PowerPC::ppcState.xer_ca = ca;
+}
+
+inline int GetCarry()
+{
+	return PowerPC::ppcState.xer_ca;
+}
+
+inline UReg_XER GetXER()
+{
+	u32 xer = 0;
+	xer |= PowerPC::ppcState.xer_stringctrl;
+	xer |= PowerPC::ppcState.xer_ca << XER_CA_SHIFT;
+	xer |= PowerPC::ppcState.xer_so_ov << XER_OV_SHIFT;
+	return xer;
+}
+
+inline void SetXER(UReg_XER new_xer)
+{
+	PowerPC::ppcState.xer_stringctrl = new_xer.BYTE_COUNT + (new_xer.BYTE_CMP << 8);
+	PowerPC::ppcState.xer_ca = new_xer.CA;
+	PowerPC::ppcState.xer_so_ov = (new_xer.SO << 1) + new_xer.OV;
+}
+
+inline int GetXER_SO()
+{
+	return PowerPC::ppcState.xer_so_ov >> 1;
+}
+
+inline void SetXER_SO(int value)
+{
+	PowerPC::ppcState.xer_so_ov |= value << 1;
+}
+
+void UpdateFPRF(double dvalue);
diff --git a/Source/Core/Core/PowerPC/Profiler.cpp b/Source/Core/Core/PowerPC/Profiler.cpp
new file mode 100644
index 0000000000..af54f785df
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Profiler.cpp
@@ -0,0 +1,19 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/Profiler.h"
+
+namespace Profiler
+{
+
+bool g_ProfileBlocks;
+
+void WriteProfileResults(const std::string& filename)
+{
+	JitInterface::WriteProfileResults(filename);
+}
+
+}  // namespace
diff --git a/Source/Core/Core/PowerPC/Profiler.h b/Source/Core/Core/PowerPC/Profiler.h
new file mode 100644
index 0000000000..e3785847fe
--- /dev/null
+++ b/Source/Core/Core/PowerPC/Profiler.h
@@ -0,0 +1,71 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#pragma once
+
+#include <cstddef>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "Common/PerformanceCounter.h"
+
+#if defined(_M_X86_64)
+
+#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \
+	MOV(64, R(ABI_PARAM1), Imm64((u64) pt)); \
+	ABI_CallFunction((const void*) QueryPerformanceCounter)
+
+// block->ticCounter += block->ticStop - block->ticStart
+#define PROFILER_UPDATE_TIME(block) \
+	MOV(64, R(RSCRATCH2), Imm64((u64) block)); \
+	MOV(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStop))); \
+	SUB(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStart))); \
+	ADD(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter))); \
+	MOV(64, MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter)), R(RSCRATCH));
+
+#define PROFILER_VPUSH \
+	BitSet32 registersInUse = CallerSavedRegistersInUse(); \
+	ABI_PushRegistersAndAdjustStack(registersInUse, 0);
+
+#define PROFILER_VPOP \
+	ABI_PopRegistersAndAdjustStack(registersInUse, 0);
+
+#else
+
+#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt)
+#define PROFILER_UPDATE_TIME(b)
+#define PROFILER_VPUSH
+#define PROFILER_VPOP
+
+#endif
+
+struct BlockStat
+{
+	BlockStat(int bn, u32 _addr, u64 c, u64 ticks, u32 size) :
+		blockNum(bn), addr(_addr), cost(c), tick_counter(ticks), block_size(size) {}
+	int blockNum;
+	u32 addr;
+	u64 cost;
+	u64 tick_counter;
+	u32 block_size;
+
+	bool operator <(const BlockStat &other) const
+	{ return cost > other.cost; }
+};
+struct ProfileStats
+{
+	std::vector<BlockStat> block_stats;
+	u64 cost_sum;
+	u64 timecost_sum;
+	u64 countsPerSec;
+};
+
+namespace Profiler
+{
+extern bool g_ProfileBlocks;
+
+void WriteProfileResults(const std::string& filename);
+}
diff --git a/Source/Core/Core/PowerPC/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB.cpp
new file mode 100644
index 0000000000..8afbe30737
--- /dev/null
+++ b/Source/Core/Core/PowerPC/SignatureDB.cpp
@@ -0,0 +1,206 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#include "Core/HW/Memmap.h"
+
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
+
+namespace
+{
+
+// On-disk format for SignatureDB entries.
+struct FuncDesc
+{
+	u32 checkSum;
+	u32 size;
+	char name[128];
+};
+
+}  // namespace
+
+bool SignatureDB::Load(const std::string& filename)
+{
+	File::IOFile f(filename, "rb");
+	if (!f)
+		return false;
+	u32 fcount = 0;
+	f.ReadArray(&fcount, 1);
+	for (size_t i = 0; i < fcount; i++)
+	{
+		FuncDesc temp;
+		memset(&temp, 0, sizeof(temp));
+
+		f.ReadArray(&temp, 1);
+		temp.name[sizeof(temp.name)-1] = 0;
+
+		DBFunc dbf;
+		dbf.name = temp.name;
+		dbf.size = temp.size;
+		database[temp.checkSum] = dbf;
+	}
+
+	return true;
+}
+
+bool SignatureDB::Save(const std::string& filename)
+{
+	File::IOFile f(filename, "wb");
+	if (!f)
+	{
+		ERROR_LOG(OSHLE, "Database save failed");
+		return false;
+	}
+	u32 fcount = (u32)database.size();
+	f.WriteArray(&fcount, 1);
+	for (const auto& entry : database)
+	{
+		FuncDesc temp;
+		memset(&temp, 0, sizeof(temp));
+		temp.checkSum = entry.first;
+		temp.size = entry.second.size;
+		strncpy(temp.name, entry.second.name.c_str(), 127);
+		f.WriteArray(&temp, 1);
+	}
+
+	INFO_LOG(OSHLE, "Database save successful");
+	return true;
+}
+
+//Adds a known function to the hash database
+u32 SignatureDB::Add(u32 startAddr, u32 size, const std::string& name)
+{
+	u32 hash = ComputeCodeChecksum(startAddr, startAddr + size - 4);
+
+	DBFunc temp_dbfunc;
+	temp_dbfunc.size = size;
+	temp_dbfunc.name = name;
+
+	FuncDB::iterator iter = database.find(hash);
+	if (iter == database.end())
+		database[hash] = temp_dbfunc;
+
+	return hash;
+}
+
+void SignatureDB::List()
+{
+	for (const auto& entry : database)
+	{
+		INFO_LOG(OSHLE, "%s : %i bytes, hash = %08x", entry.second.name.c_str(), entry.second.size, entry.first);
+	}
+	INFO_LOG(OSHLE, "%lu functions known in current database.",
+		(unsigned long)database.size());
+}
+
+void SignatureDB::Clear()
+{
+	database.clear();
+}
+
+void SignatureDB::Apply(PPCSymbolDB *symbol_db)
+{
+	for (const auto& entry : database)
+	{
+		u32 hash = entry.first;
+		Symbol *function = symbol_db->GetSymbolFromHash(hash);
+		if (function)
+		{
+			// Found the function. Let's rename it according to the symbol file.
+			if (entry.second.size == (unsigned int)function->size)
+			{
+				function->name = entry.second.name;
+				INFO_LOG(OSHLE, "Found %s at %08x (size: %08x)!", entry.second.name.c_str(), function->address, function->size);
+			}
+			else
+			{
+				function->name = entry.second.name;
+				ERROR_LOG(OSHLE, "Wrong size! Found %s at %08x (size: %08x instead of %08x)!",
+				          entry.second.name.c_str(), function->address, function->size, entry.second.size);
+			}
+		}
+	}
+	symbol_db->Index();
+}
+
+void SignatureDB::Initialize(PPCSymbolDB *symbol_db, const std::string& prefix)
+{
+	for (const auto& symbol : symbol_db->Symbols())
+	{
+		if ((prefix.empty() && (!symbol.second.name.empty()) && symbol.second.name.substr(0, 3) != "zz_" && symbol.second.name.substr(0, 1) != ".") ||
+			((!prefix.empty()) && symbol.second.name.substr(0, prefix.size()) == prefix))
+		{
+			DBFunc temp_dbfunc;
+			temp_dbfunc.name = symbol.second.name;
+			temp_dbfunc.size = symbol.second.size;
+			database[symbol.second.hash] = temp_dbfunc;
+		}
+	}
+}
+
+/*static*/ u32 SignatureDB::ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd)
+{
+	u32 sum = 0;
+	for (u32 offset = offsetStart; offset <= offsetEnd; offset += 4)
+	{
+		u32 opcode = PowerPC::HostRead_Instruction(offset);
+		u32 op = opcode & 0xFC000000;
+		u32 op2 = 0;
+		u32 op3 = 0;
+		u32 auxop = op >> 26;
+		switch (auxop)
+		{
+		case 4: //PS instructions
+			op2 = opcode & 0x0000003F;
+			switch ( op2 )
+			{
+			case 0:
+			case 8:
+			case 16:
+			case 21:
+			case 22:
+				op3 = opcode & 0x000007C0;
+			}
+			break;
+
+		case 7: //addi muli etc
+		case 8:
+		case 10:
+		case 11:
+		case 12:
+		case 13:
+		case 14:
+		case 15:
+			op2 = opcode & 0x03FF0000;
+			break;
+
+		case 19: // MCRF??
+		case 31: //integer
+		case 63: //fpu
+			op2 = opcode & 0x000007FF;
+			break;
+		case 59: //fpu
+			op2 = opcode & 0x0000003F;
+			if (op2 < 16)
+				op3 = opcode & 0x000007C0;
+			break;
+		default:
+			if (auxop >= 32  && auxop < 56)
+				op2 = opcode & 0x03FF0000;
+			break;
+		}
+		// Checksum only uses opcode, not opcode data, because opcode data changes
+		// in all compilations, but opcodes don't!
+		sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) );
+		sum = sum ^ (op | op2 | op3);
+	}
+	return sum;
+}
+
diff --git a/Source/Core/Core/PowerPC/SignatureDB.h b/Source/Core/Core/PowerPC/SignatureDB.h
new file mode 100644
index 0000000000..3cf12cf60e
--- /dev/null
+++ b/Source/Core/Core/PowerPC/SignatureDB.h
@@ -0,0 +1,46 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+// You're not meant to keep around SignatureDB objects persistently. Use 'em, throw them away.
+
+class PPCSymbolDB;
+
+class SignatureDB
+{
+	struct DBFunc
+	{
+		std::string name;
+		u32 size;
+		DBFunc() : size(0)
+		{
+		}
+	};
+
+	// Map from signature to function. We store the DB in this map because it optimizes the
+	// most common operation - lookup. We don't care about ordering anyway.
+	typedef std::map<u32, DBFunc> FuncDB;
+	FuncDB database;
+
+public:
+	// Returns the hash.
+	u32 Add(u32 startAddr, u32 size, const std::string& name);
+
+	bool Load(const std::string& filename);  // Does not clear. Remember to clear first if that's what you want.
+	bool Save(const std::string& filename);
+	void Clean(const char *prefix);
+	void Clear();
+	void List();
+
+	void Initialize(PPCSymbolDB *func_db, const std::string& prefix = "");
+	void Apply(PPCSymbolDB *func_db);
+
+	static u32 ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd);
+};
diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h
deleted file mode 100644
index 45004edfa3..0000000000
--- a/Source/Core/Core/Src/ARDecrypt.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ARDECRYPT_H_
-#define _ARDECRYPT_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vector>
-#include "Common.h"
-#include "ActionReplay.h"
-
-namespace ActionReplay
-{
-
-void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops);
-
-} //namespace
-
-#endif //_ARDECRYPT_H_
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
deleted file mode 100644
index 771ef5700b..0000000000
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ /dev/null
@@ -1,947 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// -----------------------------------------------------------------------------------------
-// Partial Action Replay code system implementation.
-// Will never be able to support some AR codes - specifically those that patch the running
-// Action Replay engine itself - yes they do exist!!!
-// Action Replay actually is a small virtual machine with a limited number of commands.
-// It probably is Turing complete - but what does that matter when AR codes can write
-// actual PowerPC code...
-// -----------------------------------------------------------------------------------------
-
-// -------------------------------------------------------------------------------------------------------------
-// Code Types:
-// (Unconditional) Normal Codes (0): this one has subtypes inside
-// (Conditional) Normal Codes (1 - 7): these just compare values and set the line skip info
-// Zero Codes: any code with no address.  These codes are used to do special operations like memory copy, etc
-// -------------------------------------------------------------------------------------------------------------
-
-#include <string>
-#include <vector>
-
-#include "Common.h"
-#include "StringUtil.h"
-#include "HW/Memmap.h"
-#include "ActionReplay.h"
-#include "Core.h"
-#include "ARDecrypt.h"
-#include "LogManager.h"
-#include "ConfigManager.h"
-
-namespace ActionReplay
-{
-
-enum
-{
-	// Zero Code Types
-	ZCODE_END	= 0x00,
-	ZCODE_NORM	= 0x02, 
-	ZCODE_ROW	= 0x03, 
-	ZCODE_04	= 0x04,
-
-	// Conditional Codes
-	CONDTIONAL_EQUAL				= 0x01,
-	CONDTIONAL_NOT_EQUAL			= 0x02, 
-	CONDTIONAL_LESS_THAN_SIGNED		= 0x03,
-	CONDTIONAL_GREATER_THAN_SIGNED	= 0x04,
-	CONDTIONAL_LESS_THAN_UNSIGNED	= 0x05,
-	CONDTIONAL_GREATER_THAN_UNSIGNED	= 0x06,
-	CONDTIONAL_AND					= 0x07,	// bitwise AND
-
-	// Conditional Line Counts
-	CONDTIONAL_ONE_LINE		= 0x00,
-	CONDTIONAL_TWO_LINES	= 0x01,
-	CONDTIONAL_ALL_LINES_UNTIL	= 0x02,
-	CONDTIONAL_ALL_LINES	= 0x03,
-
-	// Data Types
-	DATATYPE_8BIT		= 0x00,
-	DATATYPE_16BIT		= 0x01, 
-	DATATYPE_32BIT		= 0x02, 
-	DATATYPE_32BIT_FLOAT	= 0x03,
-
-	// Normal Code 0 Subtypes
-	SUB_RAM_WRITE		= 0x00,
-	SUB_WRITE_POINTER	= 0x01, 
-	SUB_ADD_CODE		= 0x02, 
-	SUB_MASTER_CODE		= 0x03,
-};
-
-// pointer to the code currently being run, (used by log messages that include the code name)
-static ARCode const* current_code = NULL;
-
-static bool b_RanOnce = false;
-static std::vector<ARCode> arCodes;
-static std::vector<ARCode> activeCodes;
-static bool logSelf = false;
-static std::vector<std::string> arLog;
-
-struct ARAddr
-{
-	union
-	{
-		u32 address;
-		struct
-		{
-			u32 gcaddr : 25;
-			u32 size : 2;
-			u32 type : 3;
-			u32 subtype : 2;
-		};
-	};
-
-	ARAddr(const u32 addr) : address(addr) {}
-	u32 GCAddress() const { return gcaddr | 0x80000000; }
-	operator u32() const { return address; }
-};
-
-void LogInfo(const char *format, ...);
-bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data);
-bool Subtype_WriteToPointer(const ARAddr addr, const u32 data);
-bool Subtype_AddCode(const ARAddr addr, const u32 data);
-bool Subtype_MasterCodeAndWriteToCCXXXXXX(const ARAddr addr, const u32 data);
-bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr addr, const u32 data);
-bool ZeroCode_MemoryCopy(const u32 val_last, const ARAddr addr, const u32 data);
-bool NormalCode(const ARAddr addr, const u32 data);
-bool ConditionalCode(const ARAddr addr, const u32 data, int* const pSkipCount);
-bool CompareValues(const u32 val1, const u32 val2, const int type);
-
-// ----------------------
-// AR Remote Functions
-void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad)
-{
-	// Parses the Action Replay section of a game ini file.
-	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats 
-		&& !forceLoad) 
-		return;
-
-	arCodes.clear();
-
-	std::vector<std::string> enabledLines;
-	std::set<std::string> enabledNames;
-	localIni.GetLines("ActionReplay_Enabled", enabledLines);
-	for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter)
-	{
-		const std::string& line = *iter;
-		if (line.size() != 0 && line[0] == '$')
-		{
-			std::string name = line.substr(1, line.size() - 1);
-			enabledNames.insert(name);
-		}
-	}
-
-	IniFile* inis[] = {&globalIni, &localIni};
-	for (size_t i = 0; i < ArraySize(inis); ++i)
-	{
-		std::vector<std::string> lines;
-		std::vector<std::string> encryptedLines;
-		ARCode currentCode;
-		
-		inis[i]->GetLines("ActionReplay", lines);
-
-		std::vector<std::string>::const_iterator
-			it = lines.begin(),
-			lines_end = lines.end();
-		for (; it != lines_end; ++it)
-		{
-			const std::string line = *it;
-			
-			if (line.empty())
-				continue;
-
-			std::vector<std::string> pieces;
-
-			// Check if the line is a name of the code
-			if (line[0] == '$')
-			{
-				if (currentCode.ops.size())
-				{
-					arCodes.push_back(currentCode);
-					currentCode.ops.clear();
-				}
-				if (encryptedLines.size())
-				{
-					DecryptARCode(encryptedLines, currentCode.ops);
-					arCodes.push_back(currentCode);
-					currentCode.ops.clear();
-					encryptedLines.clear();
-				}
-
-				currentCode.name = line.substr(1, line.size() - 1);
-				currentCode.active = enabledNames.find(currentCode.name) != enabledNames.end();
-				currentCode.user_defined = (i == 1);
-			}
-			else
-			{
-				SplitString(line, ' ', pieces);
-
-				// Check if the AR code is decrypted
-				if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
-				{
-					AREntry op;
-					bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr);
-					bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
-					if (!(success_addr | success_val)) {
-						PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str());
-						if (!success_addr) PanicAlertT("The address is invalid");
-						if (!success_val) PanicAlertT("The value is invalid");
-					}
-					else
-					{
-						currentCode.ops.push_back(op);
-					}
-				}
-				else
-				{
-					SplitString(line, '-', pieces);
-					if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5) 
-					{
-						// Encrypted AR code
-						// Decryption is done in "blocks", so we must push blocks into a vector,
-						//	then send to decrypt when a new block is encountered, or if it's the last block.
-						encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]);
-					}
-				}
-			}
-		}
-
-		// Handle the last code correctly.
-		if (currentCode.ops.size())
-		{
-			arCodes.push_back(currentCode);
-		}
-		if (encryptedLines.size())
-		{
-			DecryptARCode(encryptedLines, currentCode.ops);
-			arCodes.push_back(currentCode);
-		}
-	}
-
-	UpdateActiveList();
-}
-
-void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalIni, IniFile& localIni)
-{
-	LoadCodes(globalIni, localIni, true);
-	_arCodes = arCodes;
-}
-
-
-void LogInfo(const char *format, ...)
-{
-	if (!b_RanOnce) 
-	{
-		if (LogManager::GetMaxLevel() >= LogTypes::LINFO || logSelf)
-		{
-			char* temp = (char*)alloca(strlen(format)+512);
-			va_list args;
-			va_start(args, format);
-			CharArrayFromFormatV(temp, 512, format, args);
-			va_end(args);
-			INFO_LOG(ACTIONREPLAY, "%s", temp);
-
-			if (logSelf)
-			{
-				std::string text = temp;
-				text += '\n';
-				arLog.push_back(text.c_str());
-			}
-		}
-	}
-}
-
-
-void RunAllActive()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
-	{
-		for (std::vector<ARCode>::iterator i = activeCodes.begin(); i != activeCodes.end(); ++i) 
-		{
-			if (i->active)
-			{
-				i->active = RunCode(*i);
-				LogInfo("\n");
-			}
-		}
-
-		b_RanOnce = true;
-	}
-}
-
-bool RunCode(const ARCode &arcode)
-{
-	// The mechanism is different than what the real AR uses, so there may be compatibility problems.
-
-	bool doFillNSlide = false;
-	bool doMemoryCopy = false;
-
-	// used for conditional codes
-	int skip_count = 0;
-
-	u32 val_last = 0;
-
-	current_code = &arcode;
-
-	LogInfo("Code Name: %s", arcode.name.c_str());
-	LogInfo("Number of codes: %i", arcode.ops.size());
-
-	std::vector<AREntry>::const_iterator
-		iter = arcode.ops.begin(),
-		ops_end = arcode.ops.end();
-	for (; iter != ops_end; ++iter)
-	{
-		const ARAddr& addr = *(ARAddr*)&iter->cmd_addr;
-		const u32 data = iter->value;
-
-		// after a conditional code, skip lines if needed
-		if (skip_count)
-		{
-			if (skip_count > 0)	// skip x lines
-			{
-				LogInfo("Line skipped");
-				--skip_count;
-			}
-			else if (-CONDTIONAL_ALL_LINES == skip_count)
-			{
-				// skip all lines
-				LogInfo("All Lines skipped");
-				return true;	// don't need to iterate through the rest of the ops
-			}
-			else if (-CONDTIONAL_ALL_LINES_UNTIL == skip_count)
-			{
-				// skip until a "00000000 40000000" line is reached
-				LogInfo("Line skipped");
-				if (0 == addr && 0x40000000 == data)	// check for an endif line
-					skip_count = 0;
-			}
-
-			continue;
-		}
-		
-		LogInfo("--- Running Code: %08x %08x ---", addr.address, data);
-		//LogInfo("Command: %08x", cmd);
-
-		// Do Fill & Slide
-		if (doFillNSlide)
-		{
-			doFillNSlide = false;
-			LogInfo("Doing Fill And Slide");
-			if (false == ZeroCode_FillAndSlide(val_last, addr, data))
-				return false;
-			continue;
-		}
-
-		// Memory Copy
-		if (doMemoryCopy)
-		{
-			doMemoryCopy = false;
-			LogInfo("Doing Memory Copy");
-			if (false == ZeroCode_MemoryCopy(val_last, addr, data))
-				return false;
-			continue;
-		}
-
-		// ActionReplay program self modification codes
-		if (addr >= 0x00002000 && addr < 0x00003000)
-		{
-			LogInfo("This action replay simulator does not support codes that modify Action Replay itself.");
-			PanicAlertT("This action replay simulator does not support codes that modify Action Replay itself.");
-			return false;
-		}
-
-		// skip these weird init lines
-		// TODO: Where are the "weird init lines"?
-		//if (iter == code.ops.begin() && cmd == 1)
-			//continue;
-
-		// Zero codes
-		if (0x0 == addr) // Check if the code is a zero code
-		{
-			const u8 zcode = (data >> 29);
-
-			LogInfo("Doing Zero Code %08x", zcode);
-
-			switch (zcode)
-			{
-				case ZCODE_END: // END OF CODES
-					LogInfo("ZCode: End Of Codes");
-					return true;
-					break;
-
-				// TODO: the "00000000 40000000"(end if) codes fall into this case, I don't think that is correct
-				case ZCODE_NORM: // Normal execution of codes
-					// Todo: Set register 1BB4 to 0
-					LogInfo("ZCode: Normal execution of codes, set register 1BB4 to 0 (zcode not supported)");
-					break;
-
-				case ZCODE_ROW: // Executes all codes in the same row
-					// Todo: Set register 1BB4 to 1
-					LogInfo("ZCode: Executes all codes in the same row, Set register 1BB4 to 1 (zcode not supported)");
-					PanicAlertT("Zero 3 code not supported");
-					return false;
-					break;
-
-				case ZCODE_04: // Fill & Slide or Memory Copy
-					if (0x3 == ((data >> 25) & 0x03))
-					{
-						LogInfo("ZCode: Memory Copy");
-						doMemoryCopy = true;
-						val_last = data;
-					}
-					else 
-					{
-						LogInfo("ZCode: Fill And Slide");
-						doFillNSlide = true;
-						val_last = data;
-					}
-					break;
-
-				default: 
-					LogInfo("ZCode: Unknown");
-					PanicAlertT("Zero code unknown to dolphin: %08x", zcode); 
-					return false;
-					break;
-			}
-
-			// done handling zero codes
-			continue;
-		}
-
-		// Normal codes
-		LogInfo("Doing Normal Code %08x", addr.type);
-		LogInfo("Subtype: %08x", addr.subtype);
-
-		switch (addr.type)
-		{
-		case 0x00:
-			if (false == NormalCode(addr, data))
-				return false;
-			break;
-			
-		default:
-			LogInfo("This Normal Code is a Conditional Code");
-			if (false == ConditionalCode(addr, data, &skip_count))
-				return false;
-			break;
-		}
-	}
-
-	b_RanOnce = true;
-
-	return true;
-}
-size_t GetCodeListSize()
-{
-	return arCodes.size();
-}
-
-ARCode GetARCode(size_t index)
-{
-	if (index > arCodes.size())
-	{
-		PanicAlertT("GetARCode: Index is greater than "
-			"ar code list size %lu", (unsigned long)index);
-		return ARCode();
-	}
-	return arCodes[index];
-}
-
-void SetARCode_IsActive(bool active, size_t index)
-{
-	if (index > arCodes.size())
-	{
-		PanicAlertT("SetARCode_IsActive: Index is greater than "
-			"ar code list size %lu", (unsigned long)index);
-		return;
-	}
-	arCodes[index].active = active;
-	UpdateActiveList();
-}
-
-void UpdateActiveList()
-{
-	bool old_value = SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats;
-	SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = false;
-	b_RanOnce = false;
-	activeCodes.clear();
-	for (size_t i = 0; i < arCodes.size(); i++)
-	{
-		if (arCodes[i].active)
-			activeCodes.push_back(arCodes[i]);
-	}
-	SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = old_value;
-}
-
-void EnableSelfLogging(bool enable)
-{
-	logSelf = enable;
-}
-
-const std::vector<std::string> &GetSelfLog()
-{
-	return arLog;
-}
-
-bool IsSelfLogging()
-{
-	return logSelf;
-}
-
-// ----------------------
-// Code Functions
-bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data)
-{
-	const u32 new_addr = addr.GCAddress();
-
-	LogInfo("Hardware Address: %08x", new_addr);
-	LogInfo("Size: %08x", addr.size);
-
-	switch (addr.size)
-	{
-	case DATATYPE_8BIT:
-	{
-		LogInfo("8-bit Write");
-		LogInfo("--------");
-		u32 repeat = data >> 8;
-		for (u32 i = 0; i <= repeat; ++i)
-		{
-			Memory::Write_U8(data & 0xFF, new_addr + i);
-			LogInfo("Wrote %08x to address %08x", data & 0xFF, new_addr + i);
-		}
-		LogInfo("--------");
-		break;
-	}
-
-	case DATATYPE_16BIT:
-	{
-		LogInfo("16-bit Write");
-		LogInfo("--------");
-		u32 repeat = data >> 16;
-		for (u32 i = 0; i <= repeat; ++i)
-		{
-			Memory::Write_U16(data & 0xFFFF, new_addr + i * 2);
-			LogInfo("Wrote %08x to address %08x", data & 0xFFFF, new_addr + i * 2);
-		}
-		LogInfo("--------");
-		break;
-	}
-
-	case DATATYPE_32BIT_FLOAT:
-	case DATATYPE_32BIT: // Dword write
-		LogInfo("32-bit Write");
-		LogInfo("--------");
-		Memory::Write_U32(data, new_addr);
-		LogInfo("Wrote %08x to address %08x", data, new_addr);
-		LogInfo("--------");
-		break;
-
-	default:
-		LogInfo("Bad Size");
-		PanicAlertT("Action Replay Error: Invalid size "
-			"(%08x : address = %08x) in Ram Write And Fill (%s)",
-			addr.size, addr.gcaddr, current_code->name.c_str());
-		return false;
-	}
-
-	return true;
-}
-
-bool Subtype_WriteToPointer(const ARAddr addr, const u32 data)
-{
-	const u32 new_addr = addr.GCAddress();
-	const u32 ptr = Memory::Read_U32(new_addr);
-
-	LogInfo("Hardware Address: %08x", new_addr);
-	LogInfo("Size: %08x", addr.size);
-
-	switch (addr.size)
-	{
-	case DATATYPE_8BIT:
-	{
-		LogInfo("Write 8-bit to pointer");
-		LogInfo("--------");
-		const u8 thebyte = data & 0xFF;
-		const u32 offset = data >> 8;
-		LogInfo("Pointer: %08x", ptr);
-		LogInfo("Byte: %08x", thebyte);
-		LogInfo("Offset: %08x", offset);
-		Memory::Write_U8(thebyte, ptr + offset);
-		LogInfo("Wrote %08x to address %08x", thebyte, ptr + offset);
-		LogInfo("--------");
-		break;
-	}
-
-	case DATATYPE_16BIT:
-	{
-		LogInfo("Write 16-bit to pointer");
-		LogInfo("--------");
-		const u16 theshort = data & 0xFFFF;
-		const u32 offset = (data >> 16) << 1;
-		LogInfo("Pointer: %08x", ptr);
-		LogInfo("Byte: %08x", theshort);
-		LogInfo("Offset: %08x", offset);
-		Memory::Write_U16(theshort, ptr + offset);
-		LogInfo("Wrote %08x to address %08x", theshort, ptr + offset);
-		LogInfo("--------");
-		break;
-	}
-
-	case DATATYPE_32BIT_FLOAT:
-	case DATATYPE_32BIT:
-		LogInfo("Write 32-bit to pointer");
-		LogInfo("--------");
-		Memory::Write_U32(data, ptr);
-		LogInfo("Wrote %08x to address %08x", data, ptr);
-		LogInfo("--------");
-		break;
-
-	default:
-		LogInfo("Bad Size");
-		PanicAlertT("Action Replay Error: Invalid size "
-			"(%08x : address = %08x) in Write To Pointer (%s)",
-			addr.size, addr.gcaddr, current_code->name.c_str());
-		return false;
-	}
-	return true;
-}
-
-bool Subtype_AddCode(const ARAddr addr, const u32 data)
-{
-	// Used to increment/decrement a value in memory
-	const u32 new_addr = addr.GCAddress();
-
-	LogInfo("Hardware Address: %08x", new_addr);
-	LogInfo("Size: %08x", addr.size);
-
-	switch (addr.size)
-	{
-	case DATATYPE_8BIT:
-		LogInfo("8-bit Add");
-		LogInfo("--------");
-		Memory::Write_U8(Memory::Read_U8(new_addr) + data, new_addr);
-		LogInfo("Wrote %08x to address %08x", Memory::Read_U8(new_addr) + (data & 0xFF), new_addr);
-		LogInfo("--------");
-		break;
-
-	case DATATYPE_16BIT:
-		LogInfo("16-bit Add");
-		LogInfo("--------");
-		Memory::Write_U16(Memory::Read_U16(new_addr) + data, new_addr);
-		LogInfo("Wrote %08x to address %08x", Memory::Read_U16(new_addr) + (data & 0xFFFF), new_addr);
-		LogInfo("--------");
-		break;
-
-	case DATATYPE_32BIT:
-		LogInfo("32-bit Add");
-		LogInfo("--------");
-		Memory::Write_U32(Memory::Read_U32(new_addr) + data, new_addr);
-		LogInfo("Wrote %08x to address %08x", Memory::Read_U32(new_addr) + data, new_addr);
-		LogInfo("--------");
-		break;
-
-	case DATATYPE_32BIT_FLOAT:
-	{
-		LogInfo("32-bit floating Add");
-		LogInfo("--------");
-
-		const u32 read = Memory::Read_U32(new_addr);
-		const float fread = *((float*)&read) + (float)data;	// data contains an integer value
-		const u32 newval = *((u32*)&fread);
-		Memory::Write_U32(newval, new_addr);
-		LogInfo("Old Value %08x", read);
-		LogInfo("Increment %08x", data);
-		LogInfo("New value %08x", newval);
-		LogInfo("--------");
-		break;
-	}
-
-	default:
-		LogInfo("Bad Size");
-		PanicAlertT("Action Replay Error: Invalid size "
-			"(%08x : address = %08x) in Add Code (%s)",
-			addr.size, addr.gcaddr, current_code->name.c_str());
-		return false;
-	}
-	return true;
-}
-
-bool Subtype_MasterCodeAndWriteToCCXXXXXX(const ARAddr addr, const u32 data)
-{
-	// code not yet implemented - TODO
-	// u32 new_addr = (addr & 0x01FFFFFF) | 0x80000000;
-	// u8  mcode_type = (data & 0xFF0000) >> 16;
-	// u8  mcode_count = (data & 0xFF00) >> 8;
-	// u8  mcode_number = data & 0xFF;
-	PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
-		"Master codes are not needed. Do not use master codes.", current_code->name.c_str());
-	return false;
-}
-
-bool ZeroCode_FillAndSlide(const u32 val_last, const ARAddr addr, const u32 data) // This needs more testing
-{
-	const u32 new_addr = ((ARAddr*)&val_last)->GCAddress();
-	const u8 size = ((ARAddr*)&val_last)->size;
-
-	const s16 addr_incr = (s16)(data & 0xFFFF);
-	const s8  val_incr = (s8)(data >> 24);
-	const u8  write_num = (data & 0xFF0000) >> 16;
-	
-	u32 val = addr;
-	u32 curr_addr = new_addr;
-
-	LogInfo("Current Hardware Address: %08x", new_addr);
-	LogInfo("Size: %08x", addr.size);
-	LogInfo("Write Num: %08x", write_num);
-	LogInfo("Address Increment: %i", addr_incr);
-	LogInfo("Value Increment: %i", val_incr);
-
-	switch (size)
-	{
-	case DATATYPE_8BIT:
-		LogInfo("8-bit Write");
-		LogInfo("--------");
-		for (int i = 0; i < write_num; ++i) 
-		{
-			Memory::Write_U8(val & 0xFF, curr_addr);
-			curr_addr += addr_incr;
-			val += val_incr;
-			LogInfo("Write %08x to address %08x", val & 0xFF, curr_addr);
-
-			LogInfo("Value Update: %08x", val);
-			LogInfo("Current Hardware Address Update: %08x", curr_addr);
-		}
-		LogInfo("--------");
-		break;
-
-	case DATATYPE_16BIT:
-		LogInfo("16-bit Write");
-		LogInfo("--------");
-		for (int i=0; i < write_num; ++i)
-		{
-			Memory::Write_U16(val & 0xFFFF, curr_addr);
-			LogInfo("Write %08x to address %08x", val & 0xFFFF, curr_addr);
-			curr_addr += addr_incr * 2;
-			val += val_incr;
-			LogInfo("Value Update: %08x", val);
-			LogInfo("Current Hardware Address Update: %08x", curr_addr);
-		}
-		LogInfo("--------");
-		break;
-
-	case DATATYPE_32BIT:
-		LogInfo("32-bit Write");
-		LogInfo("--------");
-		for (int i = 0; i < write_num; ++i)
-		{
-			Memory::Write_U32(val, curr_addr);
-			LogInfo("Write %08x to address %08x", val, curr_addr);
-			curr_addr += addr_incr * 4;
-			val += val_incr;
-			LogInfo("Value Update: %08x", val);
-			LogInfo("Current Hardware Address Update: %08x", curr_addr);
-		}
-		LogInfo("--------");
-		break;
-
-	default:
-		LogInfo("Bad Size");
-		PanicAlertT("Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)", size, new_addr, current_code->name.c_str());
-		return false;
-	}
-	return true;
-}
-
-// Looks like this is new?? - untested
-bool ZeroCode_MemoryCopy(const u32 val_last, const ARAddr addr, const u32 data)
-{
-	const u32 addr_dest = val_last | 0x06000000;
-	const u32 addr_src = addr.GCAddress();
-
-	const u8 num_bytes = data & 0x7FFF;
-
-	LogInfo("Dest Address: %08x", addr_dest);
-	LogInfo("Src Address: %08x", addr_src);
-	LogInfo("Size: %08x", num_bytes);
-
-	if ((data & ~0x7FFF) == 0x0000)
-	{ 
-		if ((data >> 24) != 0x0)
-		{ // Memory Copy With Pointers Support
-			LogInfo("Memory Copy With Pointers Support");
-			LogInfo("--------");
-			for (int i = 0; i < 138; ++i)
-			{
-				Memory::Write_U8(Memory::Read_U8(addr_src + i), addr_dest + i);
-				LogInfo("Wrote %08x to address %08x", Memory::Read_U8(addr_src + i), addr_dest + i);
-			}
-			LogInfo("--------");
-		}
-		else
-		{ // Memory Copy Without Pointer Support
-			LogInfo("Memory Copy Without Pointers Support");
-			LogInfo("--------");
-			for (int i=0; i < num_bytes; ++i)
-			{
-				Memory::Write_U32(Memory::Read_U32(addr_src + i), addr_dest + i);
-				LogInfo("Wrote %08x to address %08x", Memory::Read_U32(addr_src + i), addr_dest + i);
-			}
-			LogInfo("--------");
-			return true;
-		}
-	}
-	else
-	{
-		LogInfo("Bad Value");
-		PanicAlertT("Action Replay Error: Invalid value (%08x) in Memory Copy (%s)", (data & ~0x7FFF), current_code->name.c_str());
-		return false;
-	}
-	return true;
-}
-
-bool NormalCode(const ARAddr addr, const u32 data)
-{
-	switch (addr.subtype)
-	{
-	case SUB_RAM_WRITE: // Ram write (and fill)
-		LogInfo("Doing Ram Write And Fill");
-		if (!Subtype_RamWriteAndFill(addr, data))
-			return false;
-		break;
-
-	case SUB_WRITE_POINTER: // Write to pointer
-		LogInfo("Doing Write To Pointer");
-		if (!Subtype_WriteToPointer(addr, data))
-			return false;
-		break;
-
-	case SUB_ADD_CODE: // Increment Value
-		LogInfo("Doing Add Code");
-		if (!Subtype_AddCode(addr, data))
-			return false;
-		break;
-
-	case SUB_MASTER_CODE: // Master Code & Write to CCXXXXXX
-		LogInfo("Doing Master Code And Write to CCXXXXXX (ncode not supported)");
-		if (!Subtype_MasterCodeAndWriteToCCXXXXXX(addr, data))
-			return false;
-		break;
-
-	default:
-		LogInfo("Bad Subtype");
-		PanicAlertT("Action Replay: Normal Code 0: Invalid Subtype %08x (%s)", addr.subtype, current_code->name.c_str());
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-bool ConditionalCode(const ARAddr addr, const u32 data, int* const pSkipCount)
-{
-	const u32 new_addr = addr.GCAddress();
-
-	LogInfo("Size: %08x", addr.size);
-	LogInfo("Hardware Address: %08x", new_addr);
-
-	bool result = true;
-
-	switch (addr.size)
-	{
-	case DATATYPE_8BIT:
-		result = CompareValues((u32)Memory::Read_U8(new_addr), (data & 0xFF), addr.type);
-		break;
-
-	case DATATYPE_16BIT:
-		result = CompareValues((u32)Memory::Read_U16(new_addr), (data & 0xFFFF), addr.type);
-		break;
-
-	case DATATYPE_32BIT_FLOAT:
-	case DATATYPE_32BIT:
-		result = CompareValues(Memory::Read_U32(new_addr), data, addr.type);
-		break;
-
-	default:
-		LogInfo("Bad Size");
-		PanicAlertT("Action Replay: Conditional Code: Invalid Size %08x (%s)", addr.size, current_code->name.c_str());
-		return false;
-		break;
-	}
-
-	// if the comparison failed we need to skip some lines
-	if (false == result)
-	{
-		switch (addr.subtype)
-		{
-		case CONDTIONAL_ONE_LINE:
-		case CONDTIONAL_TWO_LINES:
-			*pSkipCount = addr.subtype + 1; // Skip 1 or 2 lines
-			break;
-
-		// Skip all lines,
-		// Skip lines until a "00000000 40000000" line is reached
-		case CONDTIONAL_ALL_LINES:
-		case CONDTIONAL_ALL_LINES_UNTIL:
-			*pSkipCount = -(int) addr.subtype;
-			break;
-
-		default:
-			LogInfo("Bad Subtype");
-			PanicAlertT("Action Replay: Normal Code %i: Invalid subtype %08x (%s)", 1, addr.subtype, current_code->name.c_str());
-			return false;
-			break;
-		}
-	}
-
-	return true;
-}
-
-bool CompareValues(const u32 val1, const u32 val2, const int type)
-{
-	switch(type)
-	{
-	case CONDTIONAL_EQUAL:
-		LogInfo("Type 1: If Equal");
-		return (val1 == val2);
-		break;
-
-	case CONDTIONAL_NOT_EQUAL:
-		LogInfo("Type 2: If Not Equal");
-		return (val1 != val2);
-		break;
-
-	case CONDTIONAL_LESS_THAN_SIGNED:
-		LogInfo("Type 3: If Less Than (Signed)");
-		return ((int)val1 < (int)val2);
-		break;
-
-	case CONDTIONAL_GREATER_THAN_SIGNED:
-		LogInfo("Type 4: If Greater Than (Signed)");
-		return ((int)val1 > (int)val2);
-		break;
-
-	case CONDTIONAL_LESS_THAN_UNSIGNED:
-		LogInfo("Type 5: If Less Than (Unsigned)");
-		return (val1 < val2);
-		break;
-
-	case CONDTIONAL_GREATER_THAN_UNSIGNED:
-		LogInfo("Type 6: If Greater Than (Unsigned)");
-		return (val1 > val2);
-		break;
-
-	case CONDTIONAL_AND:
-		LogInfo("Type 7: If And");
-		return !!(val1 & val2);	// bitwise AND
-		break;
-
-	default: LogInfo("Unknown Compare type");
-		PanicAlertT("Action Replay: Invalid Normal Code Type %08x (%s)", type, current_code->name.c_str());
-		return false;
-		break;
-	}
-}
-
-} // namespace ActionReplay
diff --git a/Source/Core/Core/Src/ActionReplay.h b/Source/Core/Core/Src/ActionReplay.h
deleted file mode 100644
index ac2bb7bd2a..0000000000
--- a/Source/Core/Core/Src/ActionReplay.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ACTIONREPLAY_H_
-#define _ACTIONREPLAY_H_
-
-#include "IniFile.h"
-
-namespace ActionReplay
-{
-
-struct AREntry
-{
-	AREntry() {}
-	AREntry(u32 _addr, u32 _value) : cmd_addr(_addr), value(_value) {}
-	u32 cmd_addr;
-	u32 value;
-};
-
-struct ARCode
-{
-	std::string name;
-	std::vector<AREntry> ops;
-	bool active;
-	bool user_defined;
-};
-
-void RunAllActive();
-bool RunCode(const ARCode &arcode);
-void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad);
-void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalIni, IniFile &localIni);
-size_t GetCodeListSize();
-ARCode GetARCode(size_t index);
-void SetARCode_IsActive(bool active, size_t index);
-void UpdateActiveList();
-void EnableSelfLogging(bool enable);
-const std::vector<std::string> &GetSelfLog();
-bool IsSelfLogging();
-}  // namespace
-
-#endif // _ACTIONREPLAY_H_
diff --git a/Source/Core/Core/Src/ArmMemTools.cpp b/Source/Core/Core/Src/ArmMemTools.cpp
deleted file mode 100644
index 01e63a6a42..0000000000
--- a/Source/Core/Core/Src/ArmMemTools.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-
-#include <stdio.h>
-#include <signal.h>
-#ifdef ANDROID
-#include <asm/sigcontext.h>
-#else
-#include <sys/ucontext.h>   // Look in here for the context definition.
-#include <execinfo.h>
-#endif
-
-#include "Common.h"
-#include "MemTools.h"
-#include "HW/Memmap.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitInterface.h"
-#include "PowerPC/JitCommon/JitBase.h"
-
-namespace EMM
-{
-#ifdef ANDROID
-typedef struct sigcontext mcontext_t;
-typedef struct ucontext {
-	uint32_t uc_flags;
-	struct ucontext* uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	// Other fields are not used by Google Breakpad. Don't define them.
-} ucontext_t;
-#endif
-
-void sigsegv_handler(int signal, siginfo_t *info, void *raw_context)
-{
-	if (signal != SIGSEGV)
-	{
-		// We are not interested in other signals - handle it as usual.
-		return;
-	}
-	ucontext_t *context = (ucontext_t *)raw_context;
-	int sicode = info->si_code;
-	if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR)
-	{
-		// Huh? Return.
-		return;
-	}
-
-
-	// Get all the information we can out of the context.
-	mcontext_t *ctx = &context->uc_mcontext;
-
-	void *fault_memory_ptr = (void*)ctx->arm_r10;
-	u8 *fault_instruction_ptr = (u8 *)ctx->arm_pc;
-	
-	if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) {
-		// Let's not prevent debugging.
-		return;
-	}
-
-	u64 bad_address = (u64)fault_memory_ptr;
-	u64 memspace_bottom = (u64)Memory::base;
-	if (bad_address < memspace_bottom) {
-		PanicAlertT("Exception handler - access below memory space. %08llx%08llx",
-			bad_address >> 32, bad_address);
-	}
-
-	u32 em_address = (u32)(bad_address - memspace_bottom);
-
-	CONTEXT fake_ctx;
-	fake_ctx.reg_pc = ctx->arm_pc;
-	const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, em_address, &fake_ctx);
-	if (new_rip) {
-		ctx->arm_pc = fake_ctx.reg_pc;
-	}
-}
-
-void InstallExceptionHandler()
-{
-	struct sigaction sa;
-	sa.sa_handler = 0;
-	sa.sa_sigaction = &sigsegv_handler;
-	sa.sa_flags = SA_SIGINFO;
-	sigemptyset(&sa.sa_mask);
-	sigaction(SIGSEGV, &sa, NULL);
-}
-}  // namespace
diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
deleted file mode 100644
index 1d53f9814b..0000000000
--- a/Source/Core/Core/Src/Boot/Boot.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h" // Common
-#include "StringUtil.h"
-#include "FileUtil.h"
-#include "MathUtil.h"
-
-#include "../HLE/HLE.h" // Core
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCAnalyst.h"
-#include "../Core.h"
-#include "../HW/HW.h"
-#include "../HW/EXI_DeviceIPL.h"
-#include "../HW/Memmap.h"
-#include "../HW/ProcessorInterface.h"
-#include "../HW/DVDInterface.h"
-#include "../HW/VideoInterface.h"
-#include "../HW/CPU.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
-
-#include "../Debugger/Debugger_SymbolMap.h" // Debugger
-
-#include "Boot_DOL.h"
-#include "Boot.h"
-#include "../Host.h"
-#include "../VolumeHandler.h"
-#include "../PatchEngine.h"
-#include "../PowerPC/SignatureDB.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "../MemTools.h"
-
-#include "../ConfigManager.h"
-#include "VolumeCreator.h" // DiscIO
-#include "NANDContentLoader.h"
-#include "Hash.h"
-#include "CommonPaths.h"
-
-void CBoot::Load_FST(bool _bIsWii)
-{
-	if (!VolumeHandler::IsValid())
-		return;
-
-	// copy first 20 bytes of disc to start of Mem 1
-	VolumeHandler::ReadToPtr(Memory::GetPointer(0x80000000), 0, 0x20);		
-
-	// copy of game id
-	Memory::Write_U32(Memory::Read_U32(0x80000000), 0x80003180);
-		
-	u32 shift = 0;
-	if (_bIsWii)
-		shift = 2;
-
-	u32 fstOffset  = VolumeHandler::Read32(0x0424) << shift;
-	u32 fstSize    = VolumeHandler::Read32(0x0428) << shift;
-	u32 maxFstSize = VolumeHandler::Read32(0x042c) << shift;
-
-	u32 arenaHigh = ROUND_DOWN(0x817FFFFF - maxFstSize, 0x20);
-	Memory::Write_U32(arenaHigh, 0x00000034);
-
-	// load FST
-	VolumeHandler::ReadToPtr(Memory::GetPointer(arenaHigh), fstOffset, fstSize);
-	Memory::Write_U32(arenaHigh, 0x00000038);
-	Memory::Write_U32(maxFstSize, 0x0000003c);
-}
-
-void CBoot::UpdateDebugger_MapLoaded(const char *_gameID)
-{
-	Host_NotifyMapLoaded();
-}
-
-bool CBoot::FindMapFile(std::string* existing_map_file,
-                        std::string* writable_map_file)
-{
-	std::string title_id_str;
-
-	SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter;
-	switch (_StartupPara.m_BootType)
-	{
-	case SCoreStartupParameter::BOOT_WII_NAND:
-	{
-		const DiscIO::INANDContentLoader& Loader =
-				DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename);
-		if (Loader.IsValid())
-		{
-			u64 TitleID = Loader.GetTitleID();
-			title_id_str = StringFromFormat("%08X_%08X",
-					(u32)(TitleID >> 32) & 0xFFFFFFFF,
-					(u32)TitleID & 0xFFFFFFFF);
-		}
-		break;
-	}
-
-	case SCoreStartupParameter::BOOT_ELF:
-	case SCoreStartupParameter::BOOT_DOL:
-		// Strip the .elf/.dol file extension
-		title_id_str = _StartupPara.m_strFilename.substr(
-				0, _StartupPara.m_strFilename.size() - 4);
-		break;
-
-	default:
-		title_id_str = _StartupPara.GetUniqueID();
-		break;
-	}
-
-	if (writable_map_file)
-		*writable_map_file = File::GetUserPath(D_MAPS_IDX) + title_id_str + ".map";
-
-	bool found = false;
-	static const std::string maps_directories[] = {
-		File::GetUserPath(D_MAPS_IDX),
-		File::GetSysDirectory() + MAPS_DIR DIR_SEP
-	};
-	for (size_t i = 0; !found && i < ArraySize(maps_directories); ++i)
-	{
-		std::string path = maps_directories[i] + title_id_str + ".map";
-		if (File::Exists(path))
-		{
-			found = true;
-			if (existing_map_file)
-				*existing_map_file = path;
-		}
-	}
-
-	return found;
-}
-
-bool CBoot::LoadMapFromFilename()
-{
-	std::string strMapFilename;
-	bool found = FindMapFile(&strMapFilename, NULL);
-	if (found && g_symbolDB.LoadMap(strMapFilename.c_str()))
-	{
-		UpdateDebugger_MapLoaded();
-		return true;
-	}
-
-	return false;
-}
-
-// If ipl.bin is not found, this function does *some* of what BS1 does: 
-// loading IPL(BS2) and jumping to it.
-// It does not initialize the hardware or anything else like BS1 does.
-bool CBoot::Load_BS2(const std::string& _rBootROMFilename)
-{
-	const u32 USA = 0x1FCE3FD6;
-	const u32 USA_v1_1 = 0x4D5935D1;
-	const u32 JAP = 0x87424396;
-	const u32 PAL = 0xA0EA7341;
-	//const u32 PanasonicQJ = 0xAEA8265C;
-	//const u32 PanasonicQU = 0x94015753;
-
-	// Load the whole ROM dump
-	std::string data;
-	if (!File::ReadFileToString(false, _rBootROMFilename.c_str(), data))
-		return false;
-
-	u32 ipl_hash = HashAdler32((const u8*)data.data(), data.size());
-	std::string ipl_region;
-	switch (ipl_hash)
-	{
-	case USA:
-	case USA_v1_1:
-		ipl_region = USA_DIR;
-		break;
-	case JAP:
-		ipl_region = JAP_DIR;
-		break;
-	case PAL:
-		ipl_region = EUR_DIR;
-		break;
-	default:
-		PanicAlert("IPL with unknown hash %x", ipl_hash);
-		break;
-	}
-
-	std::string BootRegion = _rBootROMFilename.substr(_rBootROMFilename.find_last_of(DIR_SEP) - 3, 3);
-	if (BootRegion != ipl_region)
-		PanicAlert("%s IPL found in %s directory. The disc may not be recognized", ipl_region.c_str(), BootRegion.c_str());
-
-	// Run the descrambler over the encrypted section containing BS1/BS2
-	CEXIIPL::Descrambler((u8*)data.data()+0x100, 0x1AFE00);
-
-	Memory::WriteBigEData((const u8*)data.data() + 0x100, 0x81200000, 0x700);
-	Memory::WriteBigEData((const u8*)data.data() + 0x820, 0x81300000, 0x1AFE00);
-	PC = 0x81200000;
-	return true;
-}
-
-
-// Third boot step after BootManager and Core. See Call schedule in BootManager.cpp
-bool CBoot::BootUp()
-{
-	SCoreStartupParameter& _StartupPara = 
-	SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str());
-
-	g_symbolDB.Clear();
-	VideoInterface::Preset(_StartupPara.bNTSC);
-	switch (_StartupPara.m_BootType)
-	{
-	// GCM and Wii
-	case SCoreStartupParameter::BOOT_ISO:
-	{
-		DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_StartupPara.m_strFilename);
-		if (pVolume == NULL)
-			break;
-
-		bool isoWii = DiscIO::IsVolumeWiiDisc(pVolume);
-		if (isoWii != _StartupPara.bWii)
-		{
-			PanicAlertT("Warning - starting ISO in wrong console mode!");
-		}
-
-		// setup the map from ISOFile ID
-		VolumeHandler::SetVolumeName(_StartupPara.m_strFilename);
-
-		std::string unique_id = VolumeHandler::GetVolume()->GetUniqueID();
-		if (unique_id.size() >= 4)
-			VideoInterface::SetRegionReg(unique_id.at(3));
-
-		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
-
-		u32 _TMDsz = 0x208;
-		u8* _pTMD = new u8[_TMDsz];
-		pVolume->GetTMD(_pTMD, &_TMDsz);
-		if (_TMDsz)
-		{
-			WII_IPC_HLE_Interface::ES_DIVerify(_pTMD, _TMDsz);
-		}
-		delete []_pTMD;
-
-
-		_StartupPara.bWii = VolumeHandler::IsWii();
-
-		// HLE BS2 or not
-		if (_StartupPara.bHLE_BS2)
-		{
-			EmulatedBS2(_StartupPara.bWii);
-		}
-		else if (!Load_BS2(_StartupPara.m_strBootROM))
-		{
-			// If we can't load the bootrom file we HLE it instead
-			EmulatedBS2(_StartupPara.bWii);
-		}
-
-		// Scan for common HLE functions
-		if (_StartupPara.bSkipIdle && !_StartupPara.bEnableDebugging)
-		{
-			PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
-			SignatureDB db;
-			if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
-			{
-				db.Apply(&g_symbolDB);
-				HLE::PatchFunctions();
-				db.Clear();
-			}
-		}
-
-		/* Try to load the symbol map if there is one, and then scan it for
-			and eventually replace code */
-		if (LoadMapFromFilename())
-			HLE::PatchFunctions();
-
-		// We don't need the volume any more
-		delete pVolume;
-		break;
-	}
-
-	// DOL
-	case SCoreStartupParameter::BOOT_DOL:
-	{
-		CDolLoader dolLoader(_StartupPara.m_strFilename.c_str());
-		// Check if we have gotten a Wii file or not
-		bool dolWii = dolLoader.IsWii();
-		if (dolWii != _StartupPara.bWii)
-		{
-			PanicAlertT("Warning - starting DOL in wrong console mode!");
-		}
-
-		bool BS2Success = false;
-
-		if (dolWii)
-		{
-			BS2Success = EmulatedBS2(dolWii);
-		}
-		else if (!VolumeHandler::IsWii() && !_StartupPara.m_strDefaultGCM.empty())
-		{
-			VolumeHandler::SetVolumeName(_StartupPara.m_strDefaultGCM.c_str());
-			BS2Success = EmulatedBS2(dolWii);
-		}
-
-		if (!_StartupPara.m_strDVDRoot.empty())
-		{
-			NOTICE_LOG(BOOT, "Setting DVDRoot %s", _StartupPara.m_strDVDRoot.c_str());
-			VolumeHandler::SetVolumeDirectory(_StartupPara.m_strDVDRoot, dolWii, _StartupPara.m_strApploader, _StartupPara.m_strFilename);
-			BS2Success = EmulatedBS2(dolWii);
-		} 
-
-		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
-
-		if (!BS2Success)
-		{
-			dolLoader.Load();
-			PC = dolLoader.GetEntryPoint();
-		}
-
-		if (LoadMapFromFilename())
-			HLE::PatchFunctions();
-
-		break;
-	}
-
-	// ELF
-	case SCoreStartupParameter::BOOT_ELF:
-	{
-		if(!File::Exists(_StartupPara.m_strFilename))
-		{
-			PanicAlertT("The file you specified (%s) does not exist",
-				_StartupPara.m_strFilename.c_str());
-			return false;
-		}
-
-		// Check if we have gotten a Wii file or not
-		bool elfWii = IsElfWii(_StartupPara.m_strFilename.c_str());
-		if (elfWii != _StartupPara.bWii)
-		{
-			PanicAlertT("Warning - starting ELF in wrong console mode!");
-		}			
-
-		bool BS2Success = false;
-
-		if (elfWii)
-		{
-			BS2Success = EmulatedBS2(elfWii);
-		}
-		else if (!VolumeHandler::IsWii() && !_StartupPara.m_strDefaultGCM.empty())
-		{
-			VolumeHandler::SetVolumeName(_StartupPara.m_strDefaultGCM.c_str());
-			BS2Success = EmulatedBS2(elfWii);
-		}
-
-		// load image or create virtual drive from directory
-		if (!_StartupPara.m_strDVDRoot.empty())
-		{
-			NOTICE_LOG(BOOT, "Setting DVDRoot %s", _StartupPara.m_strDVDRoot.c_str());
-			// TODO: auto-convert elf to dol, so we can load them :)
-			VolumeHandler::SetVolumeDirectory(_StartupPara.m_strDVDRoot, elfWii);
-			BS2Success = EmulatedBS2(elfWii);
-		} 
-		else if (!_StartupPara.m_strDefaultGCM.empty())
-		{
-			NOTICE_LOG(BOOT, "Loading default ISO %s", _StartupPara.m_strDefaultGCM.c_str());
-			VolumeHandler::SetVolumeName(_StartupPara.m_strDefaultGCM);
-		}
-		else VolumeHandler::SetVolumeDirectory(_StartupPara.m_strFilename, elfWii);
-
-		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
-
-		if (BS2Success)
-		{
-			HLE::PatchFunctions();
-		}
-		else // Poor man's bootup
-		{
-			Load_FST(elfWii);
-			Boot_ELF(_StartupPara.m_strFilename.c_str()); 
-		}
-		UpdateDebugger_MapLoaded();
-		Dolphin_Debugger::AddAutoBreakpoints();
-		break;
-	}
-
-	// Wii WAD
-	case SCoreStartupParameter::BOOT_WII_NAND:
-		Boot_WiiWAD(_StartupPara.m_strFilename.c_str());
-
-		if (LoadMapFromFilename())
-			HLE::PatchFunctions();
-
-		// load default image or create virtual drive from directory
-		if (!_StartupPara.m_strDVDRoot.empty())
-			VolumeHandler::SetVolumeDirectory(_StartupPara.m_strDVDRoot, true);
-		else if (!_StartupPara.m_strDefaultGCM.empty())
-			VolumeHandler::SetVolumeName(_StartupPara.m_strDefaultGCM);
-
-		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
-		break;
-
-
-	// Bootstrap 2 (AKA: Initial Program Loader, "BIOS")
-	case SCoreStartupParameter::BOOT_BS2:
-	{
-		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
-		if (Load_BS2(_StartupPara.m_strBootROM))
-		{
-			if (LoadMapFromFilename())
-				HLE::PatchFunctions();
-		}
-		else
-		{
-			return false;
-		}
-		break;
-	}
-
-	case SCoreStartupParameter::BOOT_DFF:
-		// do nothing
-		break;
-
-	default:
-	{
-		PanicAlertT("Tried to load an unknown file type.");
-		return false;
-	}
-	}
-
-	// HLE jump to loader (homebrew).  Disabled when Gecko is active as it interferes with the code handler
-	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
-	{
-		HLE::Patch(0x80001800, "HBReload");
-		const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' };
-		Memory::WriteBigEData(stubstr, 0x80001804, 8);
-	}
-
-	// Not part of the binary itself, but either we or Gecko OS might insert
-	// this, and it doesn't clear the icache properly.
-	HLE::Patch(0x800018a8, "GeckoCodehandler");
-
-	Host_UpdateLogDisplay();
-	return true;
-}
diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h
deleted file mode 100644
index 94b26273a8..0000000000
--- a/Source/Core/Core/Src/Boot/Boot.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BOOT_H
-#define _BOOT_H
-
-#include <string>
-
-#include "Common.h"
-#include "../CoreParameter.h"
-
-class CBoot
-{
-public:
-
-	static bool BootUp();
-	static bool IsElfWii(const char *filename);
-
-	// Tries to find a map file for the current game by looking first in the
-	// local user directory, then in the shared user directory.
-	//
-	// If existing_map_file is not NULL and a map file exists, it is set to the
-	// path to the existing map file.
-	//
-	// If writable_map_file is not NULL, it is set to the path to where a map
-	// file should be saved.
-	//
-	// Returns true if a map file exists, false if none could be found.
-	static bool FindMapFile(std::string* existing_map_file,
-	                        std::string* writable_map_file);
-
-private:
-	static void RunFunction(u32 _iAddr);
-
-	static void UpdateDebugger_MapLoaded(const char* _gameID = NULL);
-
-	static bool LoadMapFromFilename();
-	static bool Boot_ELF(const char *filename);
-	static bool Boot_WiiWAD(const char *filename);
-
-	static bool EmulatedBS2_GC();
-	static bool EmulatedBS2_Wii();
-	static bool EmulatedBS2(bool _bIsWii);
-	static bool Load_BS2(const std::string& _rBootROMFilename);
-	static void Load_FST(bool _bIsWii);
-
-	static bool SetupWiiMemory(unsigned int _CountryCode);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
deleted file mode 100644
index 7266fe1deb..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "NandPaths.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "../Core.h"
-#include "../HW/EXI_DeviceIPL.h"
-#include "../HW/Memmap.h"
-#include "../HW/DVDInterface.h"
-#include "../HW/CPU.h"
-
-#include "../Host.h"
-#include "../VolumeHandler.h"
-#include "../PatchEngine.h"
-#include "../MemTools.h"
-
-#include "../ConfigManager.h"
-#include "VolumeCreator.h"
-#include "Boot.h"
-#include "HLE/HLE.h"
-#include "SettingsHandler.h"
-
-void CBoot::RunFunction(u32 _iAddr)
-{
-	PC = _iAddr;
-	LR = 0x00;
-
-	while (PC != 0x00)
-		PowerPC::SingleStep();
-}
-
-// __________________________________________________________________________________________________
-// GameCube Bootstrap 2 HLE:
-// copy the apploader to 0x81200000
-// execute the apploader, function by function, using the above utility.
-bool CBoot::EmulatedBS2_GC()
-{
-	INFO_LOG(BOOT, "Faking GC BS2...");
-
-	UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
-	m_MSR.FP = 1;
-
-	// Clear ALL memory
-	Memory::Clear();
-
-	// Write necessary values
-	// Here we write values to memory that the apploader does not take care of. Game info goes
-	// to 0x80000000 according to yagcd 4.2.
-	DVDInterface::DVDRead(0x00000000, 0x80000000, 0x20); // write disc info
-
-	Memory::Write_U32(0x0D15EA5E, 0x80000020);	// booted from bootrom. 0xE5207C22 = booted from jtag
-	Memory::Write_U32(Memory::REALRAM_SIZE, 0x80000028);	// Physical Memory Size (24MB on retail)
-	// TODO determine why some games fail when using a retail id. (Seem to take different EXI paths, see ikaruga for example)
-	Memory::Write_U32(0x10000006, 0x8000002C);	// Console type - DevKit  (retail ID == 0x00000003) see yagcd 4.2.1.1.2
-
-	Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC
-						 ? 0 : 1, 0x800000CC);	// fake the VI Init of the IPL (yagcd 4.2.1.4)
-
-	Memory::Write_U32(0x01000000, 0x800000d0);	// ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM)
-
-	Memory::Write_U32(0x09a7ec80, 0x800000F8);	// Bus Clock Speed
-	Memory::Write_U32(0x1cf7c580, 0x800000FC);	// CPU Clock Speed
-
-	Memory::Write_U32(0x4c000064, 0x80000300);	// write default DFI Handler:		rfi
-	Memory::Write_U32(0x4c000064, 0x80000800);	// write default FPU Handler:		rfi
-	Memory::Write_U32(0x4c000064, 0x80000C00);	// write default Syscall Handler:   rfi
-
-	Memory::Write_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8);	// preset time base ticks
-	// HIO checks this
-	//Memory::Write_U16(0x8200,     0x000030e6);	// Console type
-
-	HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader
-
-	// Load Apploader to Memory - The apploader is hardcoded to begin at 0x2440 on the disc,
-	// but the size can differ between discs. Compare with yagcd chap 13.
-	u32 iAppLoaderOffset = 0x2440;
-	u32 iAppLoaderEntry	= VolumeHandler::Read32(iAppLoaderOffset + 0x10);
-	u32 iAppLoaderSize	= VolumeHandler::Read32(iAppLoaderOffset + 0x14) + VolumeHandler::Read32(iAppLoaderOffset + 0x18);
-	if ((iAppLoaderEntry == (u32)-1) || (iAppLoaderSize == (u32)-1))
-	{
-		INFO_LOG(BOOT, "GC BS2: Not running apploader!");
-		return false;
-	}
-	VolumeHandler::ReadToPtr(Memory::GetPointer(0x81200000), iAppLoaderOffset + 0x20, iAppLoaderSize);
-
-	// Setup pointers like real BS2 does
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC)
-	{
-		PowerPC::ppcState.gpr[1] = 0x81566550;		// StackPointer, used to be set to 0x816ffff0
-		PowerPC::ppcState.gpr[2] = 0x81465cc0;		// global pointer to Small Data Area 2 Base (haven't seen anything use it...meh)
-		PowerPC::ppcState.gpr[13] = 0x81465320;		// global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it)
-	}
-	else
-	{
-		PowerPC::ppcState.gpr[1] = 0x815edca8;
-		PowerPC::ppcState.gpr[2] = 0x814b5b20;
-		PowerPC::ppcState.gpr[13] = 0x814b4fc0;
-	}
-
-	// TODO - Make Apploader(or just RunFunction()) debuggable!!!
-
-	// Call iAppLoaderEntry.
-	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderEntry");
-	u32 iAppLoaderFuncAddr = 0x80003100;
-	PowerPC::ppcState.gpr[3] = iAppLoaderFuncAddr + 0;
-	PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4;
-	PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8;
-	RunFunction(iAppLoaderEntry);
-	u32 iAppLoaderInit = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 0);
-	u32 iAppLoaderMain = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 4);
-	u32 iAppLoaderClose = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr + 8);
-
-	// iAppLoaderInit
-	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderInit");
-	PowerPC::ppcState.gpr[3] = 0x81300000;
-	RunFunction(iAppLoaderInit);
-
-	// iAppLoaderMain - Here we load the apploader, the DOL (the exe) and the FST (filesystem).
-	// To give you an idea about where the stuff is located on the disc take a look at yagcd
-	// ch 13.
-	DEBUG_LOG(MASTER_LOG, "Call iAppLoaderMain");
-	do
-	{
-		PowerPC::ppcState.gpr[3] = 0x81300004;
-		PowerPC::ppcState.gpr[4] = 0x81300008;
-		PowerPC::ppcState.gpr[5] = 0x8130000c;
-
-		RunFunction(iAppLoaderMain);
-
-		u32 iRamAddress	= Memory::ReadUnchecked_U32(0x81300004);
-		u32 iLength		= Memory::ReadUnchecked_U32(0x81300008);
-		u32 iDVDOffset	= Memory::ReadUnchecked_U32(0x8130000c);
-
-		INFO_LOG(MASTER_LOG, "DVDRead: offset: %08x   memOffset: %08x   length: %i", iDVDOffset, iRamAddress, iLength);
-		DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength);
-
-	} while(PowerPC::ppcState.gpr[3] != 0x00);
-
-	// iAppLoaderClose
-	DEBUG_LOG(MASTER_LOG, "call iAppLoaderClose");
-	RunFunction(iAppLoaderClose);
-
-	// return
-	PC = PowerPC::ppcState.gpr[3];
-
-	// Load patches
-	std::string gameID = VolumeHandler::GetVolume()->GetUniqueID();
-	PatchEngine::LoadPatches(gameID.c_str());
-
-	PowerPC::ppcState.DebugCount = 0;
-
-	// If we have any patches that need to be applied very early, here's a good place
-	PatchEngine::ApplyFramePatches();
-
-	return true;
-}
-
-bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
-{
-	INFO_LOG(BOOT, "Setup Wii Memory...");
-
-	// Write the 256 byte setting.txt to memory.
-	std::string settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
-	std::string area, model, code, video, game;
-
-
-	switch((DiscIO::IVolume::ECountry)_CountryCode)
-	{
-	case DiscIO::IVolume::COUNTRY_KOREA:
-		area = "KOR";
-		video = "NTSC";
-		game = "KR";
-		code = "LKH";
-		break;
-	case DiscIO::IVolume::COUNTRY_TAIWAN:
-		// TODO: Determine if Taiwan have their own specific settings.
-	case DiscIO::IVolume::COUNTRY_JAPAN:
-		area = "JPN";
-		video = "NTSC";
-		game = "JP";
-		code = "LJ";
-		break;
-	case DiscIO::IVolume::COUNTRY_USA:
-		area = "USA";
-		video = "NTSC";
-		game = "US";
-		code = "LU";
-		break;
-	case DiscIO::IVolume::COUNTRY_EUROPE:
-		area = "EUR";
-		video = "PAL";
-		game = "EU";
-		code = "LE";
-		break;
-	default:
-		// PanicAlertT("SetupWiiMem: Unknown country. Wii boot process will be switched to European settings.");
-		area = "EUR";
-		video = "PAL";
-		game = "EU";
-		code = "LE";
-		break;
-	}
-
-	model = "RVL-001(" + area + ")";
-
-	SettingsHandler gen;
-	std::string serno = "";
-	if (File::Exists(settings_Filename))
-	{
-		File::IOFile settingsFileHandle(settings_Filename, "rb");
-		if (settingsFileHandle.ReadBytes((void*)gen.GetData(), SettingsHandler::SETTINGS_SIZE))
-		{
-			gen.Decrypt();
-			serno = gen.GetValue("SERNO");
-			gen.Reset();
-		}
-		File::Delete(settings_Filename);
-	}
-
-	if (serno.empty() || serno == "000000000")
-	{
-		serno = gen.generateSerialNumber();
-		INFO_LOG(BOOT, "No previous serial number found, generated one instead: %s", serno.c_str());
-	}
-	else
-	{
-		INFO_LOG(BOOT, "Using serial number: %s", serno.c_str());
-	}
-
-	gen.AddSetting("AREA", area.c_str());
-	gen.AddSetting("MODEL", model.c_str());
-	gen.AddSetting("DVD", "0");
-	gen.AddSetting("MPCH", "0x7FFE");
-	gen.AddSetting("CODE", code.c_str());
-	gen.AddSetting("SERNO", serno.c_str());
-	gen.AddSetting("VIDEO", video.c_str());
-	gen.AddSetting("GAME", game.c_str());
-
-
-	File::CreateFullPath(settings_Filename);
-
-	{
-		File::IOFile settingsFileHandle(settings_Filename, "wb");
-
-		if (!settingsFileHandle.WriteBytes(gen.GetData(), SettingsHandler::SETTINGS_SIZE))
-		{
-			PanicAlertT("SetupWiiMem: Cant create setting file");
-			return false;
-		}
-		Memory::WriteBigEData(gen.GetData(), 0x3800, SettingsHandler::SETTINGS_SIZE);
-	}
-
-	/*
-	Set hardcoded global variables to Wii memory. These are partly collected from
-	Wiibrew. These values are needed for the games to function correctly. A few
-	values in this region will also be placed here by the game as it boots.
-	They are:
-	0x80000038	Start of FST
-	0x8000003c	Size of FST Size
-	0x80000060	Copyright code
-	*/
-
-	DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20); // Game Code
-	Memory::Write_U32(0x0D15EA5E, 0x00000020);		// Another magic word
-	Memory::Write_U32(0x00000001, 0x00000024);		// Unknown
-	Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028);	// MEM1 size 24MB
-	Memory::Write_U32(0x00000023, 0x0000002c);		// Production Board Model
-	Memory::Write_U32(0x00000000, 0x00000030);		// Init
-	Memory::Write_U32(0x817FEC60, 0x00000034);		// Init
-	// 38, 3C should get start, size of FST through apploader
-	Memory::Write_U32(0x38a00040, 0x00000060);		// Exception init
-	Memory::Write_U32(0x8008f7b8, 0x000000e4);		// Thread Init
-	Memory::Write_U32(Memory::REALRAM_SIZE, 0x000000f0);		// "Simulated memory size" (debug mode?)
-	Memory::Write_U32(0x8179b500, 0x000000f4);		// __start
-	Memory::Write_U32(0x0e7be2c0, 0x000000f8);		// Bus speed
-	Memory::Write_U32(0x2B73A840, 0x000000fc);		// CPU speed
-	Memory::Write_U16(0x0000,     0x000030e6);		// Console type
-	Memory::Write_U32(0x00000000, 0x000030c0);		// EXI
-	Memory::Write_U32(0x00000000, 0x000030c4);		// EXI
-	Memory::Write_U32(0x00000000, 0x000030dc);		// Time
-	Memory::Write_U32(0x00000000, 0x000030d8);		// Time
-	Memory::Write_U16(0x8201,     0x000030e6);		// Dev console / debug capable
-	Memory::Write_U32(0x00000000, 0x000030f0);		// Apploader
-	Memory::Write_U32(0x01800000, 0x00003100);		// BAT
-	Memory::Write_U32(0x01800000, 0x00003104);		// BAT
-	Memory::Write_U32(0x00000000, 0x0000310c);		// Init
-	Memory::Write_U32(0x8179d500, 0x00003110);		// Init
-	Memory::Write_U32(0x04000000, 0x00003118);		// Unknown
-	Memory::Write_U32(0x04000000, 0x0000311c);		// BAT
-	Memory::Write_U32(0x93400000, 0x00003120);		// BAT
-	Memory::Write_U32(0x90000800, 0x00003124);		// Init - MEM2 low
-	Memory::Write_U32(0x93ae0000, 0x00003128);		// Init - MEM2 high
-	Memory::Write_U32(0x93ae0000, 0x00003130);		// IOS MEM2 low
-	Memory::Write_U32(0x93b00000, 0x00003134);		// IOS MEM2 high
-	Memory::Write_U32(0x00000012, 0x00003138);		// Console type
-	// 40 is copied from 88 after running apploader
-	Memory::Write_U32(0x00090204, 0x00003140);		// IOS revision (IOS9, v2.4)
-	Memory::Write_U32(0x00062507, 0x00003144);		// IOS date in USA format (June 25, 2007)
-	Memory::Write_U16(0x0113,     0x0000315e);		// Apploader
-	Memory::Write_U32(0x0000FF16, 0x00003158);		// DDR ram vendor code
-	Memory::Write_U32(0x00000000, 0x00003160);		// Init semaphore (sysmenu waits for this to clear)
-	Memory::Write_U32(0x00090204, 0x00003188);		// Expected IOS revision
-
-	Memory::Write_U8(0x80, 0x0000315c);				// OSInit
-	Memory::Write_U16(0x0000, 0x000030e0);			// PADInit
-	Memory::Write_U32(0x80000000, 0x00003184);		// GameID Address
-
-	// Fake the VI Init of the IPL
-	Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC ? 0 : 1, 0x000000CC);
-
-	// Clear exception handler. Why? Don't we begin with only zeros?
-	for (int i = 0x3000; i <= 0x3038; i += 4)
-	{
-		Memory::Write_U32(0x00000000, 0x80000000 + i);
-	}
-	return true;
-}
-
-// __________________________________________________________________________________________________
-// Wii Bootstrap 2 HLE:
-// copy the apploader to 0x81200000
-// execute the apploader
-bool CBoot::EmulatedBS2_Wii()
-{
-	INFO_LOG(BOOT, "Faking Wii BS2...");
-
-	// setup wii memory
-	DiscIO::IVolume::ECountry CountryCode = DiscIO::IVolume::COUNTRY_UNKNOWN;
-	if (VolumeHandler::IsValid())
-		CountryCode = VolumeHandler::GetVolume()->GetCountry();
-	if (SetupWiiMemory(CountryCode) == false)
-		return false;
-
-	// This is some kind of consistency check that is compared to the 0x00
-	// values as the game boots. This location keep the 4 byte ID for as long
-	// as the game is running. The 6 byte ID at 0x00 is overwritten sometime
-	// after this check during booting.
-	VolumeHandler::ReadToPtr(Memory::GetPointer(0x3180), 0, 4);
-
-	// Execute the apploader
-	bool apploaderRan = false;
-	if (VolumeHandler::IsValid() && VolumeHandler::IsWii())
-	{
-		UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
-		m_MSR.FP = 1;
-
-		Memory::Write_U32(0x4c000064,	0x80000300);	// write default DFI Handler:		rfi
-		Memory::Write_U32(0x4c000064,	0x80000800);	// write default FPU Handler:		rfi
-		Memory::Write_U32(0x4c000064,	0x80000C00);	// write default Syscall Handler:	rfi
-
-		HLE::Patch(0x81300000, "OSReport");				// HLE OSReport for Apploader
-
-		PowerPC::ppcState.gpr[1] = 0x816ffff0;			// StackPointer
-
-		u32 iAppLoaderOffset = 0x2440; // 0x1c40;
-
-		// Load Apploader to Memory
-		u32 iAppLoaderEntry = VolumeHandler::Read32(iAppLoaderOffset + 0x10);
-		u32 iAppLoaderSize = VolumeHandler::Read32(iAppLoaderOffset + 0x14);
-		if ((iAppLoaderEntry == (u32)-1) || (iAppLoaderSize == (u32)-1))
-		{
-			ERROR_LOG(BOOT, "Invalid apploader. Probably your image is corrupted.");
-			return false;
-		}
-		VolumeHandler::ReadToPtr(Memory::GetPointer(0x81200000), iAppLoaderOffset + 0x20, iAppLoaderSize);
-
-		//call iAppLoaderEntry
-		DEBUG_LOG(BOOT, "Call iAppLoaderEntry");
-
-		u32 iAppLoaderFuncAddr = 0x80004000;
-		PowerPC::ppcState.gpr[3] = iAppLoaderFuncAddr + 0;
-		PowerPC::ppcState.gpr[4] = iAppLoaderFuncAddr + 4;
-		PowerPC::ppcState.gpr[5] = iAppLoaderFuncAddr + 8;
-		RunFunction(iAppLoaderEntry);
-		u32 iAppLoaderInit = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+0);
-		u32 iAppLoaderMain = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+4);
-		u32 iAppLoaderClose = Memory::ReadUnchecked_U32(iAppLoaderFuncAddr+8);
-
-		// iAppLoaderInit
-		DEBUG_LOG(BOOT, "Run iAppLoaderInit");
-		PowerPC::ppcState.gpr[3] = 0x81300000;
-		RunFunction(iAppLoaderInit);
-
-		// Let the apploader load the exe to memory. At this point I get an unknown IPC command
-		// (command zero) when I load Wii Sports or other games a second time. I don't notice
-		// any side effects however. It's a little disconcerting however that Start after Stop
-		// behaves differently than the first Start after starting Dolphin. It means something
-		// was not reset correctly.
-		DEBUG_LOG(BOOT, "Run iAppLoaderMain");
-		do
-		{
-			PowerPC::ppcState.gpr[3] = 0x81300004;
-			PowerPC::ppcState.gpr[4] = 0x81300008;
-			PowerPC::ppcState.gpr[5] = 0x8130000c;
-
-			RunFunction(iAppLoaderMain);
-
-			u32 iRamAddress	= Memory::ReadUnchecked_U32(0x81300004);
-			u32 iLength		= Memory::ReadUnchecked_U32(0x81300008);
-			u32 iDVDOffset	= Memory::ReadUnchecked_U32(0x8130000c) << 2;
-
-			INFO_LOG(BOOT, "DVDRead: offset: %08x   memOffset: %08x   length: %i", iDVDOffset, iRamAddress, iLength);
-			DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength);
-		} while(PowerPC::ppcState.gpr[3] != 0x00);
-
-		// iAppLoaderClose
-		DEBUG_LOG(BOOT, "Run iAppLoaderClose");
-		RunFunction(iAppLoaderClose);
-
-		apploaderRan = true;
-
-		// Pass the "#002 check"
-		// Apploader writes the IOS version and revision here, we copy it
-		// Fake IOSv9 r2.4 if no version is found (elf loading)
-		u32 firmwareVer = Memory::Read_U32(0x80003188);
-		Memory::Write_U32(firmwareVer ? firmwareVer : 0x00090204, 0x00003140);
-
-		// Load patches and run startup patches
-		std::string gameID = VolumeHandler::GetVolume()->GetUniqueID();
-		PatchEngine::LoadPatches(gameID.c_str());
-
-		// return
-		PC = PowerPC::ppcState.gpr[3];
-	}
-
-	PowerPC::ppcState.DebugCount = 0;
-
-	return apploaderRan;
-}
-
-// Returns true if apploader has run successfully
-bool CBoot::EmulatedBS2(bool _bIsWii)
-{
-	return _bIsWii ? EmulatedBS2_Wii() : EmulatedBS2_GC();
-}
diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.cpp b/Source/Core/Core/Src/Boot/Boot_DOL.cpp
deleted file mode 100644
index b1476f82d0..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_DOL.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Boot_DOL.h"
-#include "FileUtil.h"
-#include "../HW/Memmap.h"
-#include "CommonFuncs.h"
-
-CDolLoader::CDolLoader(u8* _pBuffer, u32 _Size)
-	: m_isWii(false)
-{
-	Initialize(_pBuffer, _Size);
-}
-
-CDolLoader::CDolLoader(const char* _szFilename)
-	: m_isWii(false)
-{
-	const u64 size = File::GetSize(_szFilename);
-	u8* const tmpBuffer = new u8[(size_t)size];
-
-	{
-	File::IOFile pStream(_szFilename, "rb");	
-	pStream.ReadBytes(tmpBuffer, (size_t)size);
-	}
-
-	Initialize(tmpBuffer, (u32)size);
-	delete[] tmpBuffer;
-}
-
-CDolLoader::~CDolLoader()
-{
-	for (int i = 0; i < DOL_NUM_TEXT; i++)
-	{
-		delete [] text_section[i];
-		text_section[i] = NULL;
-	}
-
-	for (int i = 0; i < DOL_NUM_DATA; i++)
-	{
-		delete [] data_section[i];
-		data_section[i] = NULL;
-	}
-}
-
-void CDolLoader::Initialize(u8* _pBuffer, u32 _Size)
-{	
-	memcpy(&m_dolheader, _pBuffer, sizeof(SDolHeader));
-
-	// swap memory
-	u32* p = (u32*)&m_dolheader;
-	for (size_t i = 0; i < (sizeof(SDolHeader)/sizeof(u32)); i++)	
-		p[i] = Common::swap32(p[i]);
-
-	for (int i = 0; i < DOL_NUM_TEXT; i++)
-		text_section[i] = NULL;
-	for (int i = 0; i < DOL_NUM_DATA; i++)
-		data_section[i] = NULL;
-	
-	u32 HID4_pattern = 0x7c13fba6;
-	u32 HID4_mask = 0xfc1fffff;
-
-	for (int i = 0; i < DOL_NUM_TEXT; i++)
-	{
-		if (m_dolheader.textOffset[i] != 0)
-		{
-			text_section[i] = new u8[m_dolheader.textSize[i]];
-			memcpy(text_section[i], _pBuffer + m_dolheader.textOffset[i], m_dolheader.textSize[i]);
-			for (unsigned int j = 0; j < (m_dolheader.textSize[i]/sizeof(u32)); j++)
-			{
-				u32 word = Common::swap32(((u32*)text_section[i])[j]);
-				if ((word & HID4_mask) == HID4_pattern)
-				{
-					m_isWii = true;
-					break;
-				}
-			}
-		}
-	}
-
-	for (int i = 0; i < DOL_NUM_DATA; i++)
-	{
-		if (m_dolheader.dataOffset[i] != 0)
-		{
-			data_section[i] = new u8[m_dolheader.dataSize[i]];
-			memcpy(data_section[i], _pBuffer + m_dolheader.dataOffset[i], m_dolheader.dataSize[i]);
-		}
-	}
-}
-
-void CDolLoader::Load()
-{
-	// load all text (code) sections
-	for (int i = 0; i < DOL_NUM_TEXT; i++)
-	{
-		if (m_dolheader.textOffset[i] != 0)
-		{
-			for (u32 num = 0; num < m_dolheader.textSize[i]; num++)
-				Memory::Write_U8(text_section[i][num], m_dolheader.textAddress[i] + num);
-		}
-	}
-
-	// load all data sections
-	for (int i = 0; i < DOL_NUM_DATA; i++)
-	{
-		if (m_dolheader.dataOffset[i] != 0)
-		{
-			for (u32 num = 0; num < m_dolheader.dataSize[i]; num++)
-				Memory::Write_U8(data_section[i][num], m_dolheader.dataAddress[i] + num);
-		}
-	}
-}
diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.h b/Source/Core/Core/Src/Boot/Boot_DOL.h
deleted file mode 100644
index 690a58eefd..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_DOL.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BOOT_DOL_H
-#define _BOOT_DOL_H
-
-#include "Common.h"
-
-class CDolLoader
-{
-public:
-	CDolLoader(const char* _szFilename);
-	CDolLoader(u8* _pBuffer, u32 _Size);
-	~CDolLoader();
-
-	bool IsWii()		{ return m_isWii; }
-	u32 GetEntryPoint()	{ return m_dolheader.entryPoint; }
-
-	// Load into emulated memory
-	void Load();
-
-private:
-	enum
-	{
-		DOL_NUM_TEXT	= 7,
-		DOL_NUM_DATA	= 11
-	};
-
-	struct SDolHeader
-	{
-		u32 textOffset[DOL_NUM_TEXT];
-		u32 dataOffset[DOL_NUM_DATA];
-
-		u32 textAddress[DOL_NUM_TEXT];
-		u32 dataAddress[DOL_NUM_DATA];
-
-		u32 textSize[DOL_NUM_TEXT];
-		u32 dataSize[DOL_NUM_DATA];
-
-		u32 bssAddress;
-		u32 bssSize;
-		u32 entryPoint;
-		u32 padd[7];
-	};
-	SDolHeader m_dolheader;
-
-	u8 *data_section[DOL_NUM_DATA];
-	u8 *text_section[DOL_NUM_TEXT];
-
-	bool m_isWii;
-
-	// Copy sections to internal buffers
-	void Initialize(u8* _pBuffer, u32 _Size);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.cpp b/Source/Core/Core/Src/Boot/Boot_ELF.cpp
deleted file mode 100644
index 99b0c3c0a3..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_ELF.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../PowerPC/PowerPC.h"
-#include "Boot.h"
-#include "../HLE/HLE.h"
-#include "Boot_ELF.h"
-#include "ElfReader.h"
-#include "FileUtil.h"
-
-bool CBoot::IsElfWii(const char *filename)
-{
-	/* We already check if filename existed before we called this function, so
-	   there is no need for another check, just read the file right away */
-
-	const u64 filesize = File::GetSize(filename);
-	u8 *const mem = new u8[(size_t)filesize];
-
-	{
-	File::IOFile f(filename, "rb");
-	f.ReadBytes(mem, (size_t)filesize);
-	}
-	
-	// Use the same method as the DOL loader uses: search for mfspr from HID4,
-	// which should only be used in Wii ELFs.
-	// 
-	// Likely to have some false positives/negatives, patches implementing a
-	// better heuristic are welcome.
-
-	u32 HID4_pattern = 0x7c13fba6;
-	u32 HID4_mask = 0xfc1fffff;
-	ElfReader reader(mem);
-	bool isWii = false;
-
-	for (int i = 0; i < reader.GetNumSections(); ++i)
-	{
-		if (reader.IsCodeSection(i))
-		{
-			for (unsigned int j = 0; j < reader.GetSectionSize(i) / sizeof (u32); ++j)
-			{
-				u32 word = Common::swap32(((u32*)reader.GetSectionDataPtr(i))[j]);
-				if ((word & HID4_mask) == HID4_pattern)
-				{
-					isWii = true;
-					break;
-				}
-			}
-		}
-	}
-
-	delete[] mem;
-	return isWii;
-}
-
-
-bool CBoot::Boot_ELF(const char *filename)
-{
-	const u64 filesize = File::GetSize(filename);
-	u8 *mem = new u8[(size_t)filesize];
-
-	{
-	File::IOFile f(filename, "rb");
-	f.ReadBytes(mem, (size_t)filesize);
-	}
-	
-	ElfReader reader(mem);
-	reader.LoadInto(0x80000000);
-	if (!reader.LoadSymbols())
-	{
-		if (LoadMapFromFilename())
-			HLE::PatchFunctions();
-	}
-	else
-	{
-		HLE::PatchFunctions();
-	}
-	
-	PC = reader.GetEntryPoint();
-	delete[] mem;
-
-	return true;
-}
diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.h b/Source/Core/Core/Src/Boot/Boot_ELF.h
deleted file mode 100644
index 013cbd45db..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_ELF.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
diff --git a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
deleted file mode 100644
index 519db4a92b..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Boot.h"
-#include "../PowerPC/PowerPC.h"
-#include "../HLE/HLE.h"
-#include "../HW/Memmap.h"
-#include "../ConfigManager.h"
-#include "../PatchEngine.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
-#include "../IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-
-#include "WiiWad.h"
-#include "NANDContentLoader.h"
-#include "FileUtil.h"
-#include "Boot_DOL.h"
-#include "Volume.h"
-#include "VolumeCreator.h"
-#include "CommonPaths.h"
-
-#include <memory>
-
-static u32 state_checksum(u32 *buf, int len)
-{
-	u32 checksum = 0;
-	len = len>>2;
-
-	for(int i=0; i<len; i++)
-	{
-		checksum += buf[i];
-	}
-
-	return checksum;
-}
-
-typedef struct {
-	u32 checksum;
-	u8 flags;
-	u8 type;
-	u8 discstate;
-	u8 returnto;
-	u32 unknown[6];
-} StateFlags;
-
-bool CBoot::Boot_WiiWAD(const char* _pFilename)
-{
-	
-	std::string state_filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_STATE);
-
-	if (File::Exists(state_filename))
-	{
-		File::IOFile state_file(state_filename, "r+b");
-		StateFlags state;
-		state_file.ReadBytes(&state, sizeof(StateFlags));
-		
-		state.type = 0x03; // TYPE_RETURN
-		state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags)-4);
-
-		state_file.Seek(0, SEEK_SET);
-		state_file.WriteBytes(&state, sizeof(StateFlags));
-	}
-	else
-	{
-		File::CreateFullPath(state_filename);
-		File::IOFile state_file(state_filename, "a+b");
-		StateFlags state;
-		memset(&state,0,sizeof(StateFlags));
-		state.type = 0x03; // TYPE_RETURN
-		state.discstate = 0x01; // DISCSTATE_WII
-		state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags)-4);
-		state_file.WriteBytes(&state, sizeof(StateFlags));
-	}
-
-	const DiscIO::INANDContentLoader& ContentLoader = DiscIO::CNANDContentManager::Access().GetNANDLoader(_pFilename);
-	if (!ContentLoader.IsValid())
-		return false;
-
-	u64 titleID = ContentLoader.GetTitleID();
-	// create data directory
-	File::CreateFullPath(Common::GetTitleDataPath(titleID));
-	
-	if (titleID == TITLEID_SYSMENU)
-		HLE_IPC_CreateVirtualFATFilesystem();
-	// setup wii mem
-	if (!SetupWiiMemory(ContentLoader.GetCountry()))
-		return false;
-
-	// DOL
-	const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex());
-	if (pContent == NULL)
-		return false;
-
-	WII_IPC_HLE_Interface::SetDefaultContentFile(_pFilename);
-
-	std::unique_ptr<CDolLoader> pDolLoader;
-	if (pContent->m_pData)
-	{
-		pDolLoader.reset(new CDolLoader(pContent->m_pData, pContent->m_Size));
-	}
-	else
-	{
-		pDolLoader.reset(new CDolLoader(pContent->m_Filename.c_str()));
-	}
-	pDolLoader->Load();
-	PC = pDolLoader->GetEntryPoint() | 0x80000000;
-
-	// Pass the "#002 check"
-	// Apploader should write the IOS version and revision to 0x3140, and compare it
-	// to 0x3188 to pass the check, but we don't do it, and i don't know where to read the IOS rev...
-	// Currently we just write 0xFFFF for the revision, copy manually and it works fine :p
-
-	// TODO : figure it correctly : where should we read the IOS rev that the wad "needs" ?
-	Memory::Write_U16(ContentLoader.GetIosVersion(), 0x00003140);
-	Memory::Write_U16(0xFFFF, 0x00003142);
-	Memory::Write_U32(Memory::Read_U32(0x00003140), 0x00003188);
-
-	// Load patches and run startup patches
-	const DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_pFilename);
-	if (pVolume != NULL)
-		PatchEngine::LoadPatches(pVolume->GetUniqueID().c_str());
-
-	return true;
-}
-
diff --git a/Source/Core/Core/Src/Boot/Boot_WiiWAD.h b/Source/Core/Core/Src/Boot/Boot_WiiWAD.h
deleted file mode 100644
index de90c5a148..0000000000
--- a/Source/Core/Core/Src/Boot/Boot_WiiWAD.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#pragma once
-
diff --git a/Source/Core/Core/Src/Boot/ElfReader.cpp b/Source/Core/Core/Src/Boot/ElfReader.cpp
deleted file mode 100644
index 5aa0e2b78d..0000000000
--- a/Source/Core/Core/Src/Boot/ElfReader.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-
-#include "Common.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "ElfReader.h"
-
-void bswap(Elf32_Word &w) {w = Common::swap32(w);}
-void bswap(Elf32_Half &w) {w = Common::swap16(w);}
-
-static void byteswapHeader(Elf32_Ehdr &ELF_H)
-{
-	bswap(ELF_H.e_type);
-	bswap(ELF_H.e_machine);
-	bswap(ELF_H.e_ehsize);
-	bswap(ELF_H.e_phentsize);
-	bswap(ELF_H.e_phnum);
-	bswap(ELF_H.e_shentsize);
-	bswap(ELF_H.e_shnum);
-	bswap(ELF_H.e_shstrndx);
-	bswap(ELF_H.e_version);
-	bswap(ELF_H.e_entry);
-	bswap(ELF_H.e_phoff);
-	bswap(ELF_H.e_shoff);
-	bswap(ELF_H.e_flags);
-}
-
-static void byteswapSegment(Elf32_Phdr &sec)
-{
-	bswap(sec.p_align);
-	bswap(sec.p_filesz);
-	bswap(sec.p_flags);
-	bswap(sec.p_memsz);
-	bswap(sec.p_offset);
-	bswap(sec.p_paddr);
-	bswap(sec.p_vaddr);
-	bswap(sec.p_type);
-}
-
-static void byteswapSection(Elf32_Shdr &sec)
-{
-	bswap(sec.sh_addr);
-	bswap(sec.sh_addralign);
-	bswap(sec.sh_entsize);
-	bswap(sec.sh_flags);
-	bswap(sec.sh_info);
-	bswap(sec.sh_link);
-	bswap(sec.sh_name);
-	bswap(sec.sh_offset);
-	bswap(sec.sh_size);
-	bswap(sec.sh_type);
-}
-
-ElfReader::ElfReader(void *ptr)
-{
-	base = (char*)ptr;
-	base32 = (u32 *)ptr;
-	header = (Elf32_Ehdr*)ptr;
-	byteswapHeader(*header);
-
-	segments = (Elf32_Phdr *)(base + header->e_phoff);
-	sections = (Elf32_Shdr *)(base + header->e_shoff);	
-
-	for (int i = 0; i < GetNumSegments(); i++)
-	{
-		byteswapSegment(segments[i]);
-	}
-
-	for (int i = 0; i < GetNumSections(); i++)
-	{
-		byteswapSection(sections[i]);
-	}
-	entryPoint = header->e_entry;
-}
-
-const char *ElfReader::GetSectionName(int section) const
-{
-	if (sections[section].sh_type == SHT_NULL)
-		return NULL;
-
-	int nameOffset = sections[section].sh_name;
-	char *ptr = (char*)GetSectionDataPtr(header->e_shstrndx);
-
-	if (ptr)
-		return ptr + nameOffset;
-	else
-		return NULL;
-}
-
-bool ElfReader::LoadInto(u32 vaddr)
-{
-	DEBUG_LOG(MASTER_LOG,"String section: %i", header->e_shstrndx);
-
-//	sectionOffsets = new u32[GetNumSections()];
-//	sectionAddrs = new u32[GetNumSections()];
-	
-	// Should we relocate?
-	bRelocate = (header->e_type != ET_EXEC);
-
-	if (bRelocate)
-	{
-		DEBUG_LOG(MASTER_LOG,"Relocatable module");
-		entryPoint += vaddr;
-	}
-	else
-	{
-		DEBUG_LOG(MASTER_LOG,"Prerelocated executable");
-	}
-
-	INFO_LOG(MASTER_LOG,"%i segments:", header->e_phnum);
-
-	// First pass : Get the bits into RAM
-	u32 segmentVAddr[32];
-
-	u32 baseAddress = bRelocate?vaddr:0;
-	for (int i = 0; i < header->e_phnum; i++)
-	{
-		Elf32_Phdr *p = segments + i;
-
-		INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ", p->p_type, p->p_vaddr, p->p_filesz, p->p_memsz);
-		
-		if (p->p_type == PT_LOAD)
-		{
-			segmentVAddr[i] = baseAddress + p->p_vaddr;
-			u32 writeAddr = segmentVAddr[i];
-
-			const u8 *src = GetSegmentPtr(i);
-			u8 *dst = Memory::GetPointer(writeAddr);
-			u32 srcSize = p->p_filesz;
-			u32 dstSize = p->p_memsz;
-			u32 *s = (u32*)src;
-			u32 *d = (u32*)dst;
-			for (int j = 0; j < (int)(srcSize + 3) / 4; j++)
-			{
-				*d++ = /*_byteswap_ulong*/(*s++);
-			}
-			if (srcSize < dstSize)
-			{
-				//memset(dst + srcSize, 0, dstSize-srcSize); //zero out bss
-			}
-			INFO_LOG(MASTER_LOG,"Loadable Segment Copied to %08x, size %08x", writeAddr, p->p_memsz);
-		}
-	}
-
-	/*
-	LOG(MASTER_LOG,"%i sections:", header->e_shnum);
-
-	for (int i=0; i<GetNumSections(); i++)
-	{
-		Elf32_Shdr *s = &sections[i];
-		const char *name = GetSectionName(i);
-		
-		u32 writeAddr = s->sh_addr + baseAddress;
-		sectionOffsets[i] = writeAddr - vaddr;
-		sectionAddrs[i] = writeAddr;
-
-		if (s->sh_flags & SHF_ALLOC)
-		{
-			LOG(MASTER_LOG,"Data Section found: %s     Sitting at %08x, size %08x", name, writeAddr, s->sh_size);
-	
-		}
-		else
-		{
-			LOG(MASTER_LOG,"NonData Section found: %s     Ignoring (size=%08x) (flags=%08x)", name, s->sh_size, s->sh_flags);
-		}
-	}
-*/
-	INFO_LOG(MASTER_LOG,"Done loading.");
-	return true;
-}
-
-SectionID ElfReader::GetSectionByName(const char *name, int firstSection) const
-{
-	for (int i = firstSection; i < header->e_shnum; i++)
-	{
-		const char *secname = GetSectionName(i);
-
-		if (secname != NULL && strcmp(name, secname) == 0)
-			return i;
-	}
-	return -1;
-}
-
-bool ElfReader::LoadSymbols()
-{
-	bool hasSymbols = false;
-	SectionID sec = GetSectionByName(".symtab");
-	if (sec != -1)
-	{
-		int stringSection = sections[sec].sh_link;
-		const char *stringBase = (const char *)GetSectionDataPtr(stringSection);
-
-		//We have a symbol table!
-		Elf32_Sym *symtab = (Elf32_Sym *)(GetSectionDataPtr(sec));
-		int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym);
-		for (int sym = 0; sym < numSymbols; sym++)
-		{
-			int size = Common::swap32(symtab[sym].st_size);
-			if (size == 0)
-				continue;
-
-			// int bind = symtab[sym].st_info >> 4;
-			int type = symtab[sym].st_info & 0xF;
-			int sectionIndex = Common::swap16(symtab[sym].st_shndx);
-			int value = Common::swap32(symtab[sym].st_value);
-			const char *name = stringBase + Common::swap32(symtab[sym].st_name);
-			if (bRelocate)
-				value += sectionAddrs[sectionIndex];
-
-			int symtype = Symbol::SYMBOL_DATA;
-			switch (type)
-			{
-			case STT_OBJECT:
-				symtype = Symbol::SYMBOL_DATA; break;
-			case STT_FUNC:
-				symtype = Symbol::SYMBOL_FUNCTION; break;
-			default:
-				continue;
-			}
-			g_symbolDB.AddKnownSymbol(value, size, name, symtype);
-			hasSymbols = true;
-		}
-	}
-	g_symbolDB.Index();
-	return hasSymbols;
-}
diff --git a/Source/Core/Core/Src/Boot/ElfReader.h b/Source/Core/Core/Src/Boot/ElfReader.h
deleted file mode 100644
index 47a4ef7103..0000000000
--- a/Source/Core/Core/Src/Boot/ElfReader.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ELFREADER_H
-#define _ELFREADER_H
-
-#include "ElfTypes.h"
-
-enum KnownElfTypes
-{
-	KNOWNELF_PSP = 0,
-	KNOWNELF_DS = 1,
-	KNOWNELF_GBA = 2,
-	KNOWNELF_GC = 3,
-};
-
-typedef int SectionID;
-
-class ElfReader
-{
-private:
-	char *base;
-	u32 *base32;
-
-	Elf32_Ehdr *header;
-	Elf32_Phdr *segments;
-	Elf32_Shdr *sections;
-	
-	u32 *sectionAddrs;
-	bool bRelocate;
-	u32 entryPoint;
-
-public:	
-	ElfReader(void *ptr);
-	~ElfReader() { }
-	
-	u32 Read32(int off) const { return base32[off>>2]; }
-
-	// Quick accessors
-	ElfType GetType() const { return (ElfType)(header->e_type); }
-	ElfMachine GetMachine() const { return (ElfMachine)(header->e_machine); }
-	u32 GetEntryPoint() const { return entryPoint; }
-	u32 GetFlags() const { return (u32)(header->e_flags); }
-	bool LoadInto(u32 vaddr);
-	bool LoadSymbols();
-
-	int GetNumSegments() const { return (int)(header->e_phnum); }
-	int GetNumSections() const { return (int)(header->e_shnum); }
-	const u8 *GetPtr(int offset) const { return (u8*)base + offset; }
-	const char *GetSectionName(int section) const;
-	const u8 *GetSectionDataPtr(int section) const
-	{
-		if (section < 0 || section >= header->e_shnum)
-			return 0;
-		if (sections[section].sh_type != SHT_NOBITS)
-			return GetPtr(sections[section].sh_offset);
-		else
-			return 0;
-	}
-	bool IsCodeSection(int section) const
-	{
-		return sections[section].sh_type == SHT_PROGBITS;
-	}
-	const u8 *GetSegmentPtr(int segment)
-	{
-		return GetPtr(segments[segment].p_offset);
-	}
-	u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; }
-	int GetSectionSize(SectionID section) const { return sections[section].sh_size;	}
-	SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found
-
-	bool DidRelocate() {
-		return bRelocate;
-	}
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/Boot/ElfTypes.h b/Source/Core/Core/Src/Boot/ElfTypes.h
deleted file mode 100644
index c696b24a07..0000000000
--- a/Source/Core/Core/Src/Boot/ElfTypes.h
+++ /dev/null
@@ -1,285 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ELFTYPES_H
-#define _ELFTYPES_H
-
-// ELF Header Constants
-
-// File type
-enum ElfType
-{
-	ET_NONE        =0,
-	ET_REL         =1,
-	ET_EXEC        =2,
-	ET_DYN         =3,
-	ET_CORE        =4,
-	ET_LOPROC =0xFF00,
-	ET_HIPROC =0xFFFF,
-};
-
-// Machine/Architecture
-enum ElfMachine
-{
-	EM_NONE  =0,
-	EM_M32   =1,
-	EM_SPARC =2,
-	EM_386   =3,
-	EM_68K   =4,
-	EM_88K   =5,
-	EM_860   =7,
-	EM_MIPS  =8
-};
-
-// File version
-#define EV_NONE    0
-#define EV_CURRENT 1
-
-// Identification index
-#define EI_MAG0    0
-#define EI_MAG1    1
-#define EI_MAG2    2
-#define EI_MAG3    3
-#define EI_CLASS   4
-#define EI_DATA    5
-#define EI_VERSION 6
-#define EI_PAD     7
-#define EI_NIDENT 16
-
-// Magic number
-#define ELFMAG0 0x7F
-#define ELFMAG1  'E'
-#define ELFMAG2  'L'
-#define ELFMAG3  'F'
-
-// File class
-#define ELFCLASSNONE 0
-#define ELFCLASS32   1
-#define ELFCLASS64   2
-
-// Encoding
-#define ELFDATANONE 0
-#define ELFDATA2LSB 1
-#define ELFDATA2MSB 2
-
-
-
-// Sections constants
-
-// Section indexes
-#define SHN_UNDEF          0
-#define SHN_LORESERVE 0xFF00
-#define SHN_LOPROC    0xFF00
-#define SHN_HIPROC    0xFF1F
-#define SHN_ABS       0xFFF1
-#define SHN_COMMON    0xFFF2
-#define SHN_HIRESERVE 0xFFFF
-
-// Section types
-#define SHT_NULL            0
-#define SHT_PROGBITS        1
-#define SHT_SYMTAB          2
-#define SHT_STRTAB          3
-#define SHT_RELA            4
-#define SHT_HASH            5
-#define SHT_DYNAMIC         6
-#define SHT_NOTE            7
-#define SHT_NOBITS          8
-#define SHT_REL             9
-#define SHT_SHLIB          10
-#define SHT_DYNSYM         11
-#define SHT_LOPROC 0x70000000
-#define SHT_HIPROC 0x7FFFFFFF
-#define SHT_LOUSER 0x80000000
-#define SHT_HIUSER 0xFFFFFFFF
-
-// Custom section types
-#define SHT_PSPREL 0x700000a0
-
-
-// Section flags
-enum ElfSectionFlags
-{
-	SHF_WRITE     =0x1,
-	SHF_ALLOC     =0x2,
-	SHF_EXECINSTR =0x4,
-	SHF_MASKPROC  =0xF0000000,
-};
-
-// Symbol binding 
-#define STB_LOCAL   0 
-#define STB_GLOBAL  1 
-#define STB_WEAK    2 
-#define STB_LOPROC 13 
-#define STB_HIPROC 15 
-
-// Symbol types
-#define STT_NOTYPE   0
-#define STT_OBJECT   1
-#define STT_FUNC     2
-#define STT_SECTION  3
-#define STT_FILE     4
-#define STT_LOPROC  13
-#define STT_HIPROC  15
-
-// Undefined name
-#define STN_UNDEF 0
-
-// Relocation types
-#define R_386_NONE      0
-#define R_386_32        1
-#define R_386_PC32      2
-#define R_386_GOT32     3
-#define R_386_PLT32     4
-#define R_386_COPY      5
-#define R_386_GLOB_DAT  6
-#define R_386_JMP_SLOT  7
-#define R_386_RELATIVE  8
-#define R_386_GOTOFF    9
-#define R_386_GOTPC    10
-
-// Segment types
-#define PT_NULL             0
-#define PT_LOAD             1
-#define PT_DYNAMIC          2
-#define PT_INTERP           3
-#define PT_NOTE             4
-#define PT_SHLIB            5
-#define PT_PHDR             6
-#define PT_LOPROC  0x70000000
-#define PT_HIPROC  0x7FFFFFFF
-
-// Segment flags
-#define PF_X 1
-#define PF_W 2
-#define PF_R 4
-
-// Dynamic Array Tags
-#define DT_NULL              0
-#define DT_NEEDED            1
-#define DT_PLTRELSZ          2
-#define DT_PLTGOT            3
-#define DT_HASH              4
-#define DT_STRTAB            5
-#define DT_SYMTAB            6
-#define DT_RELA              7
-#define DT_RELASZ            8
-#define DT_RELAENT           9
-#define DT_STRSZ            10
-#define DT_SYMENT           11
-#define DT_INIT             12
-#define DT_FINI             13
-#define DT_SONAME           14
-#define DT_RPATH            15
-#define DT_SYMBOLIC         16
-#define DT_REL              17
-#define DT_RELSZ            18
-#define DT_RELENT           19
-#define DT_PLTREL           20
-#define DT_DEBUG            21
-#define DT_TEXTREL          22
-#define DT_JMPREL           23
-#define DT_LOPROC   0x70000000
-#define DT_HIPROC   0x7FFFFFFF
-
-typedef unsigned int  Elf32_Addr;
-typedef unsigned short Elf32_Half;
-typedef unsigned int  Elf32_Off;
-typedef signed   int  Elf32_Sword;
-typedef unsigned int  Elf32_Word;
-
-
-// ELF file header
-struct Elf32_Ehdr 
-{
-	unsigned char e_ident[EI_NIDENT];
-	Elf32_Half    e_type;
-	Elf32_Half    e_machine;
-	Elf32_Word    e_version;
-	Elf32_Addr    e_entry;
-	Elf32_Off     e_phoff;
-	Elf32_Off     e_shoff;
-	Elf32_Word    e_flags;
-	Elf32_Half    e_ehsize;
-	Elf32_Half    e_phentsize;
-	Elf32_Half    e_phnum;
-	Elf32_Half    e_shentsize;
-	Elf32_Half    e_shnum;
-	Elf32_Half    e_shstrndx;
-};
-
-// Section header
-struct Elf32_Shdr 
-{
-	Elf32_Word sh_name;
-	Elf32_Word sh_type;
-	Elf32_Word sh_flags;
-	Elf32_Addr sh_addr;
-	Elf32_Off  sh_offset;
-	Elf32_Word sh_size;
-	Elf32_Word sh_link;
-	Elf32_Word sh_info;
-	Elf32_Word sh_addralign;
-	Elf32_Word sh_entsize;
-};
-
-// Segment header
-struct Elf32_Phdr 
-{
-	Elf32_Word p_type;
-	Elf32_Off  p_offset;
-	Elf32_Addr p_vaddr;
-	Elf32_Addr p_paddr;
-	Elf32_Word p_filesz;
-	Elf32_Word p_memsz;
-	Elf32_Word p_flags;
-	Elf32_Word p_align;
-};
-
-// Symbol table entry
-struct Elf32_Sym 
-{
-	Elf32_Word    st_name;
-	Elf32_Addr    st_value;
-	Elf32_Word    st_size;
-	unsigned char st_info;
-	unsigned char st_other;
-	Elf32_Half    st_shndx;
-};
-
-#define ELF32_ST_BIND(i)   ((i)>>4)
-#define ELF32_ST_TYPE(i)   ((i)&0xf)
-#define ELF32_ST_INFO(b,t) (((b)<<4)+((t)&0xf))
-
-// Relocation entries
-struct Elf32_Rel 
-{
-	Elf32_Addr r_offset;
-	Elf32_Word r_info;
-};
-
-struct Elf32_Rela 
-{
-	Elf32_Addr  r_offset;
-	Elf32_Word  r_info;
-	Elf32_Sword r_addend;
-};
-
-#define ELF32_R_SYM(i) ((i)>>8)
-#define ELF32_R_TYPE(i) ((unsigned char)(i))
-#define ELF32_R_INFO(s,t) (((s)<<8 )+(unsigned char)(t))
-
-
-struct Elf32_Dyn 
-{
-	Elf32_Sword d_tag;
-	union 
-	{
-		Elf32_Word d_val;
-		Elf32_Addr d_ptr; 
-	} d_un;
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
deleted file mode 100644
index a7051dd127..0000000000
--- a/Source/Core/Core/Src/BootManager.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// File description
-// -------------
-// Purpose of this file: Collect boot settings for Core::Init()
-
-// Call sequence: This file has one of the first function called when a game is booted,
-// the boot sequence in the code is:
-  
-// DolphinWX:    FrameTools.cpp         StartGame
-// Core          BootManager.cpp        BootCore
-//               Core.cpp               Init                     Thread creation
-//                                      EmuThread                Calls CBoot::BootUp
-//               Boot.cpp               CBoot::BootUp()
-//                                      CBoot::EmulatedBS2_Wii() / GC() or Load_BS2()
-
-
-// Includes
-// ----------------
-#include <string>
-#include <vector>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "IniFile.h"
-#include "BootManager.h"
-#include "Volume.h"
-#include "VolumeCreator.h"
-#include "ConfigManager.h"
-#include "SysConf.h"
-#include "Core.h"
-#include "Host.h"
-#include "VideoBackendBase.h"
-#include "Movie.h"
-#include "NetPlayProto.h"
-
-namespace BootManager
-{
-
-// TODO this is an ugly hack which allows us to restore values trampled by per-game settings
-// Apply fire liberally
-struct ConfigCache
-{
-	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread,
-		bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2;
-	int iTLBHack, iCPUCore;
-	TEXIDevices m_EXIDevice[2];
-	std::string strBackend;
-};
-static ConfigCache config_cache;
-
-// Boot the ISO or file
-bool BootCore(const std::string& _rFilename)
-{
-	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	// Use custom settings for debugging mode
-	Host_SetStartupDebuggingParameters();
-
-	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
-	StartUp.m_strFilename = _rFilename;
-	SConfig::GetInstance().m_LastFilename = _rFilename;
-	SConfig::GetInstance().SaveSettings();
-	StartUp.bRunCompareClient = false;
-	StartUp.bRunCompareServer = false;
-
-	StartUp.hInstance = Host_GetInstance();
-
-	// If for example the ISO file is bad we return here
-	if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT))
-		return false;
-
-	// Load game specific settings
-	std::string unique_id = StartUp.GetUniqueID();
-	StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini";
-	StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini";
-
-	if (unique_id.size() == 6)
-	{
-		IniFile game_ini;
-		game_ini.Load(StartUp.m_strGameIniDefault);
-		game_ini.Load(StartUp.m_strGameIniLocal, true);
-
-		config_cache.valid = true;
-		config_cache.bCPUThread = StartUp.bCPUThread;
-		config_cache.bSkipIdle = StartUp.bSkipIdle;
-		config_cache.iCPUCore = StartUp.iCPUCore;
-		config_cache.bEnableFPRF = StartUp.bEnableFPRF;
-		config_cache.bMMU = StartUp.bMMU;
-		config_cache.bDCBZOFF = StartUp.bDCBZOFF;
-		config_cache.iTLBHack = StartUp.iTLBHack;
-		config_cache.bVBeamSpeedHack = StartUp.bVBeamSpeedHack;
-		config_cache.bSyncGPU = StartUp.bSyncGPU;
-		config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed;
-		config_cache.bMergeBlocks = StartUp.bMergeBlocks;
-		config_cache.bDSPHLE = StartUp.bDSPHLE;
-		config_cache.strBackend = StartUp.m_strVideoBackend;
-		config_cache.bHLE_BS2 = StartUp.bHLE_BS2;
-		config_cache.m_EnableJIT = SConfig::GetInstance().m_EnableJIT;
-		config_cache.bDSPThread = StartUp.bDSPThread;
-		config_cache.m_EXIDevice[0] = SConfig::GetInstance().m_EXIDevice[0];
-		config_cache.m_EXIDevice[1] = SConfig::GetInstance().m_EXIDevice[1];
-
-		// General settings
-		game_ini.Get("Core", "CPUThread",			&StartUp.bCPUThread, StartUp.bCPUThread);
-		game_ini.Get("Core", "SkipIdle",			&StartUp.bSkipIdle, StartUp.bSkipIdle);
-		game_ini.Get("Core", "EnableFPRF",			&StartUp.bEnableFPRF, StartUp.bEnableFPRF);
-		game_ini.Get("Core", "MMU",					&StartUp.bMMU, StartUp.bMMU);
-		game_ini.Get("Core", "TLBHack",				&StartUp.iTLBHack, StartUp.iTLBHack);
-		game_ini.Get("Core", "DCBZ",				&StartUp.bDCBZOFF, StartUp.bDCBZOFF);
-		game_ini.Get("Core", "VBeam",				&StartUp.bVBeamSpeedHack, StartUp.bVBeamSpeedHack);
-		game_ini.Get("Core", "SyncGPU",				&StartUp.bSyncGPU, StartUp.bSyncGPU);
-		game_ini.Get("Core", "FastDiscSpeed",		&StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed);
-		game_ini.Get("Core", "BlockMerging",		&StartUp.bMergeBlocks, StartUp.bMergeBlocks);
-		game_ini.Get("Core", "DSPHLE",				&StartUp.bDSPHLE, StartUp.bDSPHLE);
-		game_ini.Get("Core", "DSPThread",			&StartUp.bDSPThread, StartUp.bDSPThread);
-		game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str());
-		game_ini.Get("Core", "CPUCore",				&StartUp.iCPUCore, StartUp.iCPUCore);
-		game_ini.Get("Core", "HLE_BS2",				&StartUp.bHLE_BS2, StartUp.bHLE_BS2);
-		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
-
-		// Wii settings
-		if (StartUp.bWii)
-		{
-			// Flush possible changes to SYSCONF to file
-			SConfig::GetInstance().m_SYSCONF->Save();
-		}
-	} 
-
-	// movie settings
-	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
-	{
-		StartUp.bCPUThread = Movie::IsDualCore();
-		StartUp.bSkipIdle = Movie::IsSkipIdle();
-		StartUp.bDSPHLE = Movie::IsDSPHLE();
-		StartUp.bProgressive = Movie::IsProgressive();
-		StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
-		StartUp.iCPUCore = Movie::GetCPUMode();
-		StartUp.bSyncGPU = Movie::IsSyncGPU();
-		if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
-		{
-			if (File::Exists(File::GetUserPath(D_GCUSER_IDX) + "Movie.raw"))
-				File::Delete(File::GetUserPath(D_GCUSER_IDX) + "Movie.raw");
-		}
-	}
-
-	if (NetPlay::IsNetPlayRunning())
-	{
-		StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
-		StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
-		StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard;
-		SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
-		SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0];
-		SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1];
-	}
-
-	// Run the game
-	// Init the core
-	if (!Core::Init())
-	{
-		PanicAlertT("Couldn't init the core.\nCheck your configuration.");
-		return false;
-	}
-
-	return true;
-}
-
-void Stop()
-{
-	Core::Stop();
-
-	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	StartUp.m_strUniqueID = "00000000";
-	if (config_cache.valid)
-	{
-		config_cache.valid = false;
-		StartUp.bCPUThread = config_cache.bCPUThread;
-		StartUp.bSkipIdle = config_cache.bSkipIdle;
-		StartUp.iCPUCore = config_cache.iCPUCore;
-		StartUp.bEnableFPRF = config_cache.bEnableFPRF;
-		StartUp.bMMU = config_cache.bMMU;
-		StartUp.bDCBZOFF = config_cache.bDCBZOFF;
-		StartUp.iTLBHack = config_cache.iTLBHack;
-		StartUp.bVBeamSpeedHack = config_cache.bVBeamSpeedHack;
-		StartUp.bSyncGPU = config_cache.bSyncGPU;
-		StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed;
-		StartUp.bMergeBlocks = config_cache.bMergeBlocks;
-		StartUp.bDSPHLE = config_cache.bDSPHLE;
-		StartUp.bDSPThread = config_cache.bDSPThread;
-		StartUp.m_strVideoBackend = config_cache.strBackend;
-		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
-		StartUp.bHLE_BS2 = config_cache.bHLE_BS2;
-		SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT;
-		SConfig::GetInstance().m_EXIDevice[0] = config_cache.m_EXIDevice[0];
-		SConfig::GetInstance().m_EXIDevice[1] = config_cache.m_EXIDevice[1];
-	}
-}
-
-} // namespace
diff --git a/Source/Core/Core/Src/BootManager.h b/Source/Core/Core/Src/BootManager.h
deleted file mode 100644
index 41f3b3f8d0..0000000000
--- a/Source/Core/Core/Src/BootManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BOOTMANAGER_H
-#define _BOOTMANAGER_H
-
-#include <string>
-
-class GameListItem;
-
-namespace BootManager
-{
-bool BootCore(const std::string& _rFilename);
-
-void Stop();
-};
-
-#endif
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
deleted file mode 100644
index d93378f91f..0000000000
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "IniFile.h"
-#include "ConfigManager.h"
-#include "FileUtil.h"
-#include "NANDContentLoader.h"
-
-SConfig* SConfig::m_Instance;
-
-static const struct {
-	const char*	IniText;
-	const int	DefaultKey;
-	const int	DefaultModifier;
-} g_HKData[] = {
-#ifdef __APPLE__
-	{ "Open",		79 /* 'O' */,		2 /* wxMOD_CMD */ },
-	{ "ChangeDisc",		0,			0 /* wxMOD_NONE */ },
-	{ "RefreshList",	0,			0 /* wxMOD_NONE */ },
-
-	{ "PlayPause",		80 /* 'P' */,		2 /* wxMOD_CMD */ },
-	{ "Stop",			87 /* 'W' */,		2 /* wxMOD_CMD */ },
-	{ "Reset",			0,			0 /* wxMOD_NONE */ },
-	{ "FrameAdvance",	0,			0 /* wxMOD_NONE */ },
-
-	{ "StartRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "PlayRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "ExportRecording",	0,		0 /* wxMOD_NONE */ },
-	{ "Readonlymode",	0,			0 /* wxMOD_NONE */ },
-
-	{ "ToggleFullscreen",	70 /* 'F' */,		2 /* wxMOD_CMD */ },
-	{ "Screenshot",			83 /* 'S' */,		2 /* wxMOD_CMD */ },
-	{ "Exit",	0,	0 /* wxMOD_NONE */ },
-
-	{ "Wiimote1Connect",	49 /* '1' */,		2 /* wxMOD_CMD */ },
-	{ "Wiimote2Connect",	50 /* '2' */,		2 /* wxMOD_CMD */ },
-	{ "Wiimote3Connect",	51 /* '3' */,		2 /* wxMOD_CMD */ },
-	{ "Wiimote4Connect",	52 /* '4' */,		2 /* wxMOD_CMD */ },
-	{ "BalanceBoardConnect",53 /* '4' */,		2 /* wxMOD_CMD */ },
-#else
-	{ "Open",		79 /* 'O' */,		2 /* wxMOD_CONTROL */},
-	{ "ChangeDisc",		0,			0 /* wxMOD_NONE */ },
-	{ "RefreshList",	0,			0 /* wxMOD_NONE */ },
-
-	{ "PlayPause",		349 /* WXK_F10 */,	0 /* wxMOD_NONE */ },
-	{ "Stop",		27 /* WXK_ESCAPE */,	0 /* wxMOD_NONE */ },
-	{ "Reset",			0,			0 /* wxMOD_NONE */ },
-	{ "FrameAdvance",	0,			0 /* wxMOD_NONE */ },
-
-	{ "StartRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "PlayRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "ExportRecording",0,			0 /* wxMOD_NONE */ },
-	{ "Readonlymode",	0,			0 /* wxMOD_NONE */ },
-
-	{ "ToggleFullscreen",	13 /* WXK_RETURN */,	1 /* wxMOD_ALT */ },
-	{ "Screenshot",		348 /* WXK_F9 */,	0 /* wxMOD_NONE */ },
-	{ "Exit",	0,	0 /* wxMOD_NONE */ },
-
-	{ "Wiimote1Connect",	344 /* WXK_F5 */,	1 /* wxMOD_ALT */ },
-	{ "Wiimote2Connect",	345 /* WXK_F6 */,	1 /* wxMOD_ALT */ },
-	{ "Wiimote3Connect",	346 /* WXK_F7 */,	1 /* wxMOD_ALT */ },
-	{ "Wiimote4Connect",	347 /* WXK_F8 */,	1 /* wxMOD_ALT */ },
-	{ "BalanceBoardConnect",348 /* WXK_F9 */,	1 /* wxMOD_ALT */ },
-#endif
-	{ "ToggleIR",			0,	0 /* wxMOD_NONE */ },
-	{ "ToggleAspectRatio",	0,	0 /* wxMOD_NONE */ },
-	{ "ToggleEFBCopies",	0,	0 /* wxMOD_NONE */ },
-	{ "ToggleFog",			0,	0 /* wxMOD_NONE */ },
-	{ "IncreaseFrameLimit",	0,	0 /* wxMOD_NONE */ },
-	{ "DecreaseFrameLimit",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot1",	340 /* WXK_F1 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot2",	341 /* WXK_F2 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot3",	342 /* WXK_F3 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot4",	343 /* WXK_F4 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot5",	344 /* WXK_F5 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot6",	345 /* WXK_F6 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot7",	346 /* WXK_F7 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot8",	347 /* WXK_F8 */,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot9",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadStateSlot10",0,	0 /* wxMOD_NONE */ },
-
-	{ "SaveStateSlot1",	340 /* WXK_F1 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot2",	341 /* WXK_F2 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot3",	342 /* WXK_F3 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot4",	343 /* WXK_F4 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot5",	344 /* WXK_F5 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot6",	345 /* WXK_F6 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot7",	346 /* WXK_F7 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot8",	347 /* WXK_F8 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateSlot9",	0,	0 /* wxMOD_NONE */ },
-	{ "SaveStateSlot10",0,	0 /* wxMOD_NONE */ },
-
-	{ "LoadLastState1",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState2",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState3",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState4",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState5",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState6",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState7",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadLastState8",	0,	0 /* wxMOD_NONE */ },
-
-	{ "SaveFirstState",	0,	0 /* wxMOD_NONE */ },
-	{ "UndoLoadState",	351 /* WXK_F12 */,	0 /* wxMOD_NONE */ },
-	{ "UndoSaveState",	351 /* WXK_F12 */,	4 /* wxMOD_SHIFT */ },
-	{ "SaveStateFile",	0,	0 /* wxMOD_NONE */ },
-	{ "LoadStateFile",	0,	0 /* wxMOD_NONE */ },
-};
-
-SConfig::SConfig()
-{
-	// Make sure we have log manager
-	LoadSettings();
-}
-
-void SConfig::Init()
-{
-	m_Instance = new SConfig;
-}
-
-void SConfig::Shutdown()
-{
-	delete m_Instance;
-	m_Instance = NULL;
-}
-
-SConfig::~SConfig()
-{
-	SaveSettings();
-	delete m_SYSCONF;
-}
-
-
-void SConfig::SaveSettings()
-{
-	NOTICE_LOG(BOOT, "Saving settings to %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff
-
-	// General
-	ini.Set("General", "LastFilename",	m_LastFilename);
-	ini.Set("General", "ShowLag", m_ShowLag);
-
-	// ISO folders
-	// clear removed folders
-	int oldPaths,
-		numPaths = (int)m_ISOFolder.size();
-	ini.Get("General", "GCMPathes", &oldPaths, 0);
-	for (int i = numPaths; i < oldPaths; i++)
-	{
-		char tmp[16];
-		sprintf(tmp, "GCMPath%i", i);
-		ini.DeleteKey("General", tmp);
-	}
-
-	ini.Set("General", "GCMPathes",		numPaths);
-
-	for (int i = 0; i < numPaths; i++)
-	{
-		char tmp[16];
-		sprintf(tmp, "GCMPath%i", i);
-		ini.Set("General", tmp, m_ISOFolder[i]);
-	}
-
-	ini.Set("General", "RecursiveGCMPaths", m_RecursiveISOFolder);
-	ini.Set("General", "NANDRootPath",		m_NANDPath);
-	ini.Set("General", "WirelessMac",		m_WirelessMac);
-	#ifdef USE_GDBSTUB
-	ini.Set("General", "GDBPort", m_LocalCoreStartupParameter.iGDBPort);
-	#endif
-	
-	// Interface		
-	ini.Set("Interface", "ConfirmStop",			m_LocalCoreStartupParameter.bConfirmStop);
-	ini.Set("Interface", "UsePanicHandlers",	m_LocalCoreStartupParameter.bUsePanicHandlers);
-	ini.Set("Interface", "OnScreenDisplayMessages",	m_LocalCoreStartupParameter.bOnScreenDisplayMessages);
-	ini.Set("Interface", "HideCursor",			m_LocalCoreStartupParameter.bHideCursor);
-	ini.Set("Interface", "AutoHideCursor",		m_LocalCoreStartupParameter.bAutoHideCursor);
-	ini.Set("Interface", "MainWindowPosX",		(m_LocalCoreStartupParameter.iPosX == -32000) ? 0 : m_LocalCoreStartupParameter.iPosX); // TODO - HAX
-	ini.Set("Interface", "MainWindowPosY",		(m_LocalCoreStartupParameter.iPosY == -32000) ? 0 : m_LocalCoreStartupParameter.iPosY); // TODO - HAX
-	ini.Set("Interface", "MainWindowWidth",		m_LocalCoreStartupParameter.iWidth);
-	ini.Set("Interface", "MainWindowHeight",	m_LocalCoreStartupParameter.iHeight);
-	ini.Set("Interface", "Language",			m_InterfaceLanguage);
-	ini.Set("Interface", "ShowToolbar",			m_InterfaceToolbar);
-	ini.Set("Interface", "ShowStatusbar",		m_InterfaceStatusbar);
-	ini.Set("Interface", "ShowLogWindow",		m_InterfaceLogWindow);
-	ini.Set("Interface", "ShowLogConfigWindow",	m_InterfaceLogConfigWindow);
-	ini.Set("Interface", "ShowConsole",			m_InterfaceConsole);
-	ini.Set("Interface", "ThemeName40",			m_LocalCoreStartupParameter.theme_name);
-
-	// Hotkeys
-	for (int i = 0; i < NUM_HOTKEYS; i++)
-	{
-		ini.Set("Hotkeys", g_HKData[i].IniText, m_LocalCoreStartupParameter.iHotkey[i]);
-		ini.Set("Hotkeys", (std::string(g_HKData[i].IniText) + "Modifier").c_str(),
-				m_LocalCoreStartupParameter.iHotkeyModifier[i]);
-	}
-
-	// Display
-	ini.Set("Display", "FullscreenResolution",	m_LocalCoreStartupParameter.strFullscreenResolution);
-	ini.Set("Display", "Fullscreen",			m_LocalCoreStartupParameter.bFullscreen);
-	ini.Set("Display", "RenderToMain",			m_LocalCoreStartupParameter.bRenderToMain);
-	ini.Set("Display", "RenderWindowXPos",		m_LocalCoreStartupParameter.iRenderWindowXPos);
-	ini.Set("Display", "RenderWindowYPos",		m_LocalCoreStartupParameter.iRenderWindowYPos);
-	ini.Set("Display", "RenderWindowWidth",		m_LocalCoreStartupParameter.iRenderWindowWidth);
-	ini.Set("Display", "RenderWindowHeight",	m_LocalCoreStartupParameter.iRenderWindowHeight);
-	ini.Set("Display", "RenderWindowAutoSize",	m_LocalCoreStartupParameter.bRenderWindowAutoSize);
-	ini.Set("Display", "KeepWindowOnTop",		m_LocalCoreStartupParameter.bKeepWindowOnTop);
-	ini.Set("Display", "ProgressiveScan",		m_LocalCoreStartupParameter.bProgressive);
-	ini.Set("Display", "DisableScreenSaver",	m_LocalCoreStartupParameter.bDisableScreenSaver);
-	ini.Set("Display", "ForceNTSCJ",			m_LocalCoreStartupParameter.bForceNTSCJ);
-
-	// Game List Control
-	ini.Set("GameList", "ListDrives",	m_ListDrives);
-	ini.Set("GameList", "ListWad",		m_ListWad);
-	ini.Set("GameList", "ListWii",		m_ListWii);
-	ini.Set("GameList", "ListGC",		m_ListGC);
-	ini.Set("GameList", "ListJap",		m_ListJap);
-	ini.Set("GameList", "ListPal",		m_ListPal);
-	ini.Set("GameList", "ListUsa",		m_ListUsa);
-	ini.Set("GameList", "ListFrance",	m_ListFrance);
-	ini.Set("GameList", "ListItaly",	m_ListItaly);
-	ini.Set("GameList", "ListKorea",	m_ListKorea);
-	ini.Set("GameList", "ListTaiwan",	m_ListTaiwan);
-	ini.Set("GameList", "ListUnknown",	m_ListUnknown);
-	ini.Set("GameList", "ListSort",		m_ListSort);
-	ini.Set("GameList", "ListSortSecondary", m_ListSort2);
-
-	// Core
-	ini.Set("Core", "HLE_BS2",			m_LocalCoreStartupParameter.bHLE_BS2);
-	ini.Set("Core", "CPUCore",			m_LocalCoreStartupParameter.iCPUCore);
-	ini.Set("Core", "Fastmem",			m_LocalCoreStartupParameter.bFastmem);
-	ini.Set("Core", "CPUThread",		m_LocalCoreStartupParameter.bCPUThread);
-	ini.Set("Core", "DSPThread",		m_LocalCoreStartupParameter.bDSPThread);
-	ini.Set("Core", "DSPHLE",			m_LocalCoreStartupParameter.bDSPHLE);
-	ini.Set("Core", "SkipIdle",			m_LocalCoreStartupParameter.bSkipIdle);
-	ini.Set("Core", "DefaultGCM",		m_LocalCoreStartupParameter.m_strDefaultGCM);
-	ini.Set("Core", "DVDRoot",			m_LocalCoreStartupParameter.m_strDVDRoot);
-	ini.Set("Core", "Apploader",		m_LocalCoreStartupParameter.m_strApploader);
-	ini.Set("Core", "EnableCheats",		m_LocalCoreStartupParameter.bEnableCheats);
-	ini.Set("Core", "SelectedLanguage",	m_LocalCoreStartupParameter.SelectedLanguage);
-	ini.Set("Core", "DPL2Decoder",		m_LocalCoreStartupParameter.bDPL2Decoder);
-	ini.Set("Core", "Latency",			m_LocalCoreStartupParameter.iLatency);
-	ini.Set("Core", "MemcardAPath",		m_strMemoryCardA);
-	ini.Set("Core", "MemcardBPath",		m_strMemoryCardB);
-	ini.Set("Core", "SlotA",			m_EXIDevice[0]);
-	ini.Set("Core", "SlotB",			m_EXIDevice[1]);
-	ini.Set("Core", "SerialPort1",		m_EXIDevice[2]);
-	ini.Set("Core", "BBA_MAC",			m_bba_mac);
-	char sidevicenum[16];
-	for (int i = 0; i < 4; ++i)
-	{
-		sprintf(sidevicenum, "SIDevice%i", i);
-		ini.Set("Core", sidevicenum, m_SIDevice[i]);
-	}
-
-	ini.Set("Core", "WiiSDCard", m_WiiSDCard);
-	ini.Set("Core", "WiiKeyboard", m_WiiKeyboard);
-	ini.Set("Core", "WiimoteContinuousScanning", m_WiimoteContinuousScanning);
-	ini.Set("Core", "WiimoteEnableSpeaker", m_WiimoteEnableSpeaker);
-	ini.Set("Core", "RunCompareServer",	m_LocalCoreStartupParameter.bRunCompareServer);
-	ini.Set("Core", "RunCompareClient",	m_LocalCoreStartupParameter.bRunCompareClient);
-	ini.Set("Core", "FrameLimit",		m_Framelimit);
-	ini.Set("Core", "UseFPS",		b_UseFPS);
-
-	// GFX Backend
-	ini.Set("Core", "GFXBackend",	m_LocalCoreStartupParameter.m_strVideoBackend);
-
-	// Movie
-	ini.Set("Movie", "PauseMovie", m_PauseMovie);
-	ini.Set("Movie", "Author", m_strMovieAuthor);
-
-	// DSP
-	ini.Set("DSP", "EnableJIT", m_EnableJIT);
-	ini.Set("DSP", "DumpAudio", m_DumpAudio);
-	ini.Set("DSP", "Backend", sBackend);
-	ini.Set("DSP", "Volume", m_Volume);
-
-	// Fifo Player
-	ini.Set("FifoPlayer", "LoopReplay", m_LocalCoreStartupParameter.bLoopFifoReplay);
-
-	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-	m_SYSCONF->Save();
-}
-
-
-void SConfig::LoadSettings()
-{
-	INFO_LOG(BOOT, "Loading Settings from %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-
-	// General
-	{
-		ini.Get("General", "LastFilename",	&m_LastFilename);
-		ini.Get("General", "ShowLag", &m_ShowLag, false);
-		#ifdef USE_GDBSTUB
-		ini.Get("General", "GDBPort", &(m_LocalCoreStartupParameter.iGDBPort), -1);
-		#endif
-
-		m_ISOFolder.clear();
-		int numGCMPaths;
-
-		if (ini.Get("General", "GCMPathes", &numGCMPaths, 0))
-		{
-			for (int i = 0; i < numGCMPaths; i++)
-			{
-				char tmp[16];
-				sprintf(tmp, "GCMPath%i", i);
-				std::string tmpPath;
-				ini.Get("General", tmp, &tmpPath, "");
-				m_ISOFolder.push_back(tmpPath);
-			}
-		}
-
-		ini.Get("General", "RecursiveGCMPaths",		&m_RecursiveISOFolder,							false);
-
-		ini.Get("General", "NANDRootPath",		&m_NANDPath);
-		m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, m_NANDPath);
-		DiscIO::cUIDsys::AccessInstance().UpdateLocation();
-		DiscIO::CSharedContent::AccessInstance().UpdateLocation();
-		ini.Get("General", "WirelessMac",	&m_WirelessMac);
-	}
-
-	{
-		// Interface
-		ini.Get("Interface", "ConfirmStop",			&m_LocalCoreStartupParameter.bConfirmStop,		true);
-		ini.Get("Interface", "UsePanicHandlers",	&m_LocalCoreStartupParameter.bUsePanicHandlers,	true);
-		ini.Get("Interface", "OnScreenDisplayMessages",	&m_LocalCoreStartupParameter.bOnScreenDisplayMessages,	true);
-		ini.Get("Interface", "HideCursor",			&m_LocalCoreStartupParameter.bHideCursor,		false);
-		ini.Get("Interface", "AutoHideCursor",		&m_LocalCoreStartupParameter.bAutoHideCursor,	false);
-		ini.Get("Interface", "MainWindowPosX",		&m_LocalCoreStartupParameter.iPosX,				100);
-		ini.Get("Interface", "MainWindowPosY",		&m_LocalCoreStartupParameter.iPosY,				100);
-		ini.Get("Interface", "MainWindowWidth",		&m_LocalCoreStartupParameter.iWidth,			800);
-		ini.Get("Interface", "MainWindowHeight",	&m_LocalCoreStartupParameter.iHeight,			600);
-		ini.Get("Interface", "Language",			&m_InterfaceLanguage,							0);
-		ini.Get("Interface", "ShowToolbar",			&m_InterfaceToolbar,							true);
-		ini.Get("Interface", "ShowStatusbar",		&m_InterfaceStatusbar,							true);
-		ini.Get("Interface", "ShowLogWindow",		&m_InterfaceLogWindow,							false);
-		ini.Get("Interface", "ShowLogConfigWindow",	&m_InterfaceLogConfigWindow,					false);
-		ini.Get("Interface", "ShowConsole",			&m_InterfaceConsole,							false);
-		ini.Get("Interface", "ThemeName40",			&m_LocalCoreStartupParameter.theme_name,		"Clean");
-
-		// Hotkeys
-		for (int i = 0; i < NUM_HOTKEYS; i++)
-		{
-			ini.Get("Hotkeys", g_HKData[i].IniText,
-					&m_LocalCoreStartupParameter.iHotkey[i], g_HKData[i].DefaultKey);
-			ini.Get("Hotkeys", (std::string(g_HKData[i].IniText) + "Modifier").c_str(),
-					&m_LocalCoreStartupParameter.iHotkeyModifier[i], g_HKData[i].DefaultModifier);
-		}
-
-		// Display
-		ini.Get("Display", "Fullscreen",			&m_LocalCoreStartupParameter.bFullscreen,		false);
-		ini.Get("Display", "FullscreenResolution",	&m_LocalCoreStartupParameter.strFullscreenResolution, "Auto");
-		ini.Get("Display", "RenderToMain",			&m_LocalCoreStartupParameter.bRenderToMain,		false);
-		ini.Get("Display", "RenderWindowXPos",		&m_LocalCoreStartupParameter.iRenderWindowXPos,	-1);
-		ini.Get("Display", "RenderWindowYPos",		&m_LocalCoreStartupParameter.iRenderWindowYPos,	-1);
-		ini.Get("Display", "RenderWindowWidth",		&m_LocalCoreStartupParameter.iRenderWindowWidth, 640);
-		ini.Get("Display", "RenderWindowHeight",	&m_LocalCoreStartupParameter.iRenderWindowHeight, 480);
-		ini.Get("Display", "RenderWindowAutoSize",	&m_LocalCoreStartupParameter.bRenderWindowAutoSize, false);
-		ini.Get("Display", "KeepWindowOnTop",		&m_LocalCoreStartupParameter.bKeepWindowOnTop, false);
-		ini.Get("Display", "ProgressiveScan",		&m_LocalCoreStartupParameter.bProgressive, false);
-		ini.Get("Display", "DisableScreenSaver",	&m_LocalCoreStartupParameter.bDisableScreenSaver, true);
-		ini.Get("Display", "ForceNTSCJ",			&m_LocalCoreStartupParameter.bForceNTSCJ, false);
-
-		// Game List Control
-		ini.Get("GameList", "ListDrives",	&m_ListDrives,	false);
-		ini.Get("GameList", "ListWad",		&m_ListWad,		true);
-		ini.Get("GameList", "ListWii",		&m_ListWii,		true);
-		ini.Get("GameList", "ListGC",		&m_ListGC,		true);
-		ini.Get("GameList", "ListJap",		&m_ListJap,		true);
-		ini.Get("GameList", "ListPal",		&m_ListPal,		true);
-		ini.Get("GameList", "ListUsa",		&m_ListUsa,		true);
-
-		ini.Get("GameList", "ListFrance",	&m_ListFrance,	true);
-		ini.Get("GameList", "ListItaly",	&m_ListItaly,	true);
-		ini.Get("GameList", "ListKorea",	&m_ListKorea,	true);
-		ini.Get("GameList", "ListTaiwan",	&m_ListTaiwan,	true);
-		ini.Get("GameList", "ListUnknown",	&m_ListUnknown,	true);
-		ini.Get("GameList", "ListSort",		&m_ListSort,	3);
-		ini.Get("GameList", "ListSortSecondary",&m_ListSort2,	0);
-
-		// Core
-		ini.Get("Core", "HLE_BS2",		&m_LocalCoreStartupParameter.bHLE_BS2,		false);
-#ifdef _M_ARM
-		ini.Get("Core", "CPUCore",		&m_LocalCoreStartupParameter.iCPUCore,		3);
-#else
-		ini.Get("Core", "CPUCore",		&m_LocalCoreStartupParameter.iCPUCore,		1);
-#endif
-		ini.Get("Core", "Fastmem",		&m_LocalCoreStartupParameter.bFastmem,		true);
-		ini.Get("Core", "DSPThread",	&m_LocalCoreStartupParameter.bDSPThread,	false);
-		ini.Get("Core", "DSPHLE",		&m_LocalCoreStartupParameter.bDSPHLE,		true);
-		ini.Get("Core", "CPUThread",	&m_LocalCoreStartupParameter.bCPUThread,	true);
-		ini.Get("Core", "SkipIdle",		&m_LocalCoreStartupParameter.bSkipIdle,		true);
-		ini.Get("Core", "DefaultGCM",	&m_LocalCoreStartupParameter.m_strDefaultGCM);
-		ini.Get("Core", "DVDRoot",		&m_LocalCoreStartupParameter.m_strDVDRoot);
-		ini.Get("Core", "Apploader",	&m_LocalCoreStartupParameter.m_strApploader);
-		ini.Get("Core", "EnableCheats",	&m_LocalCoreStartupParameter.bEnableCheats,				false);
-		ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage,		0);
-		ini.Get("Core", "DPL2Decoder",	&m_LocalCoreStartupParameter.bDPL2Decoder,	false);
-		ini.Get("Core", "Latency",		&m_LocalCoreStartupParameter.iLatency,		2);
-		ini.Get("Core", "MemcardAPath",	&m_strMemoryCardA);
-		ini.Get("Core", "MemcardBPath",	&m_strMemoryCardB);
-		ini.Get("Core", "SlotA",		(int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD);
-		ini.Get("Core", "SlotB",		(int*)&m_EXIDevice[1], EXIDEVICE_NONE);
-		ini.Get("Core", "SerialPort1",	(int*)&m_EXIDevice[2], EXIDEVICE_NONE);
-		ini.Get("Core", "BBA_MAC",		&m_bba_mac);
-		ini.Get("Core", "ProfiledReJIT",&m_LocalCoreStartupParameter.bJITProfiledReJIT,			false);
-		ini.Get("Core", "TimeProfiling",&m_LocalCoreStartupParameter.bJITILTimeProfiling,		false);
-		ini.Get("Core", "OutputIR",		&m_LocalCoreStartupParameter.bJITILOutputIR,			false);
-		char sidevicenum[16];
-		for (int i = 0; i < 4; ++i)
-		{
-			sprintf(sidevicenum, "SIDevice%i", i);
-			ini.Get("Core", sidevicenum,	(u32*)&m_SIDevice[i], (i == 0) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE);
-		}
-
-		ini.Get("Core", "WiiSDCard",		&m_WiiSDCard,									false);
-		ini.Get("Core", "WiiKeyboard",		&m_WiiKeyboard,									false);
-		ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning,			false);
-		ini.Get("Core", "WiimoteEnableSpeaker", &m_WiimoteEnableSpeaker,					true);
-		ini.Get("Core", "RunCompareServer",	&m_LocalCoreStartupParameter.bRunCompareServer,	false);
-		ini.Get("Core", "RunCompareClient",	&m_LocalCoreStartupParameter.bRunCompareClient,	false);
-		ini.Get("Core", "MMU",				&m_LocalCoreStartupParameter.bMMU,				false);
-		ini.Get("Core", "TLBHack",			&m_LocalCoreStartupParameter.iTLBHack,			0);
-		ini.Get("Core", "BBDumpPort",		&m_LocalCoreStartupParameter.iBBDumpPort,		-1);
-		ini.Get("Core", "VBeam",			&m_LocalCoreStartupParameter.bVBeamSpeedHack,			false);
-		ini.Get("Core", "SyncGPU",			&m_LocalCoreStartupParameter.bSyncGPU,			false);
-		ini.Get("Core", "FastDiscSpeed",	&m_LocalCoreStartupParameter.bFastDiscSpeed,	false);
-		ini.Get("Core", "DCBZ",				&m_LocalCoreStartupParameter.bDCBZOFF,			false);
-		ini.Get("Core", "FrameLimit",		&m_Framelimit,									1); // auto frame limit by default
-		ini.Get("Core", "UseFPS",			&b_UseFPS,										false); // use vps as default
-
-		// GFX Backend
-		ini.Get("Core", "GFXBackend",  &m_LocalCoreStartupParameter.m_strVideoBackend, "");
-
-		// Movie
-		ini.Get("Movie", "PauseMovie", &m_PauseMovie, false);
-		ini.Get("Movie", "Author", &m_strMovieAuthor, "");
-
-		// DSP
-		ini.Get("DSP", "EnableJIT", &m_EnableJIT, true);
-		ini.Get("DSP", "DumpAudio", &m_DumpAudio, false);
-	#if defined __linux__ && HAVE_ALSA
-		ini.Get("DSP", "Backend", &sBackend, BACKEND_ALSA);
-	#elif defined __APPLE__
-		ini.Get("DSP", "Backend", &sBackend, BACKEND_COREAUDIO);
-	#elif defined _WIN32
-		ini.Get("DSP", "Backend", &sBackend, BACKEND_XAUDIO2);
-	#elif defined ANDROID
-		ini.Get("DSP", "Backend", &sBackend, BACKEND_OPENSLES);
-	#else
-		ini.Get("DSP", "Backend", &sBackend, BACKEND_NULLSOUND);
-	#endif
-		ini.Get("DSP", "Volume", &m_Volume, 100);
-
-		ini.Get("FifoPlayer", "LoopReplay", &m_LocalCoreStartupParameter.bLoopFifoReplay, true);
-	}
-
-	m_SYSCONF = new SysConf();
-}
diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h
deleted file mode 100644
index 6fc411a3ea..0000000000
--- a/Source/Core/Core/Src/ConfigManager.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONFIGMANAGER_H
-#define _CONFIGMANAGER_H
-
-#include <string>
-#include <vector>
-
-#include "Boot/Boot.h"
-#include "HW/EXI_Device.h"
-#include "HW/SI_Device.h"
-#include "SysConf.h"
-
-// DSP Backend Types
-#define BACKEND_NULLSOUND	_trans("No audio output")
-#define BACKEND_ALSA		"ALSA"
-#define BACKEND_AOSOUND		"AOSound"
-#define BACKEND_COREAUDIO	"CoreAudio"
-#define BACKEND_DIRECTSOUND	"DSound"
-#define BACKEND_OPENAL		"OpenAL"
-#define BACKEND_PULSEAUDIO	"Pulse"
-#define BACKEND_XAUDIO2		"XAudio2"
-#define BACKEND_OPENSLES	"OpenSLES"
-struct SConfig : NonCopyable
-{
-	// Wii Devices
-	bool m_WiiSDCard;
-	bool m_WiiKeyboard;
-	bool m_WiimoteContinuousScanning;
-	bool m_WiimoteEnableSpeaker;
-
-	// name of the last used filename
-	std::string m_LastFilename;
-
-	// gcm folder
-	std::vector<std::string> m_ISOFolder;
-	bool m_RecursiveISOFolder;
-
-	SCoreStartupParameter m_LocalCoreStartupParameter;
-	std::string m_NANDPath;
-
-	std::string m_strMemoryCardA;
-	std::string m_strMemoryCardB;
-	TEXIDevices m_EXIDevice[3];
-	SIDevices m_SIDevice[4];
-	std::string m_bba_mac;
-
-	// interface language
-	int m_InterfaceLanguage;
-	// framelimit choose
-	unsigned int m_Framelimit;
-	bool b_UseFPS;
-	// other interface settings
-	bool m_InterfaceToolbar;
-	bool m_InterfaceStatusbar;
-	bool m_InterfaceLogWindow;
-	bool m_InterfaceLogConfigWindow;
-	bool m_InterfaceConsole;
-
-	bool m_ListDrives;
-	bool m_ListWad;
-	bool m_ListWii;
-	bool m_ListGC;
-	bool m_ListPal;
-	bool m_ListUsa;
-	bool m_ListJap;
-	bool m_ListFrance;
-	bool m_ListItaly;
-	bool m_ListKorea;
-	bool m_ListTaiwan;
-	bool m_ListUnknown;
-	int m_ListSort;
-	int m_ListSort2;
-
-	std::string m_WirelessMac;
-	bool m_PauseMovie;
-	bool m_ShowLag;
-	std::string m_strMovieAuthor;
-
-	// DSP settings
-	bool m_EnableJIT;
-	bool m_DumpAudio;
-	int m_Volume;
-	std::string sBackend;
-
-	SysConf* m_SYSCONF;
-
-	// save settings
-	void SaveSettings();
-
-	// load settings
-	void LoadSettings();
-
-	// Return the permanent and somewhat globally used instance of this struct
-	static SConfig& GetInstance() {return(*m_Instance);}
-
-	static void Init();
-	static void Shutdown();
-
-private:
-	SConfig();
-	~SConfig();
-
-	static SConfig* m_Instance;
-};
-
-#endif // endif config manager
-
diff --git a/Source/Core/Core/Src/Console.cpp b/Source/Core/Core/Src/Console.cpp
deleted file mode 100644
index 15a19b4b74..0000000000
--- a/Source/Core/Core/Src/Console.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <iostream>
-#include <cstring>
-
-#include "Common.h"
-#include "Thread.h"
-#include "HW/Memmap.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/PPCTables.h"
-#include "CoreTiming.h"
-#include "Core.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPCDisasm.h"
-#include "Console.h"
-
-#define CASE1(x) if (memcmp(cmd, x, 2*sizeof(TCHAR))==0)
-#define CASE(x) else if (memcmp(cmd, x, 4*sizeof(TCHAR))==0)
-
-void Console_Submit(const char *cmd)
-{
-	CASE1("r")
-	{
-		Core::StartTrace(false);
-		INFO_LOG(CONSOLE, "Read tracing started.");
-	}
-	CASE1("w")
-	{
-		Core::StartTrace(true);
-		INFO_LOG(CONSOLE, "Write tracing started.");
-	}
-	CASE("trans")
-	{
-		TCHAR temp[256];
-		u32 addr;
-		sscanf(cmd, "%s %08x", temp, &addr);
-
-		if (addr)
-		{
-#if MAX_LOGLEVEL >= INFO_LEVEL
-			u32 EA =
-				Memory::TranslateAddress(addr, Memory::FLAG_NO_EXCEPTION);
-			INFO_LOG(CONSOLE, "EA 0x%08x to 0x%08x", addr, EA);
-#endif
-		}
-		else
-		{
-			DEBUG_LOG(CONSOLE, "Syntax: trans ADDR");
-		}
-	}
-	CASE("call")
-	{
-		TCHAR temp[256];
-		u32 addr;
-		sscanf(cmd, "%s %08x", temp, &addr);
-		if (addr)
-		{
-			g_symbolDB.PrintCalls(addr);
-		}
-		else
-		{
-			DEBUG_LOG(CONSOLE, "Syntax: call ADDR");
-		}
-	}
-	CASE("llac")
-	{
-		TCHAR temp[256];
-		u32 addr;
-		sscanf(cmd, "%s %08x", temp, &addr);
-		if (addr)
-		{
-			g_symbolDB.PrintCallers(addr);
-		}
-		else
-		{
-			DEBUG_LOG(CONSOLE, "Syntax: llac ADDR");
-		}
-	}
-	CASE("pend")
-	{
-		CoreTiming::LogPendingEvents();
-	}
-	CASE("dump")
-	{
-		char temp[256];
-		char filename[256];
-		u32 start;
-		u32 end;
-		sscanf(cmd, "%s %08x %08x %s", temp, &start, &end, filename);
-
-		File::IOFile f(filename, "wb");
-		for (u32 i = start; i < end; i++)
-		{
-			u8 b = Memory::ReadUnchecked_U8(i);
-			fputc(b, f.GetHandle());
-		}
-		INFO_LOG(CONSOLE, "Dumped from %08x to %08x to %s",start,end,filename);
-	}
-	CASE("disa")
-	{
-		u32 start;
-		u32 end;
-		TCHAR temp[256];
-		sscanf(cmd, "%s %08x %08x", temp, &start, &end);
-		char disasm[256];
-		for (u32 addr = start; addr <= end; addr += 4)
-		{
-			u32 data = Memory::ReadUnchecked_U32(addr);
-			DisassembleGekko(data, addr, disasm, 256);
-			DEBUG_LOG(CONSOLE, "%08x: %08x: %s\n", addr, data, disasm);
-		}
-	}
-	CASE("help")
-	{
-		ERROR_LOG(CONSOLE, "Dolphin Console Command List");
-		ERROR_LOG(CONSOLE, "scan ADDR - will find functions that are called by this function");
-		ERROR_LOG(CONSOLE, "call ADDR - will find functions that call this function");
-		ERROR_LOG(CONSOLE, "dump START_A END_A FILENAME - will dump memory between START_A and END_A");
-		ERROR_LOG(CONSOLE, "help - guess what this does :P");
-		ERROR_LOG(CONSOLE, "lisd - list signature database");
-		ERROR_LOG(CONSOLE, "lisf - list functions");
-		ERROR_LOG(CONSOLE, "trans ADDR - translate address");
-	}
-	CASE("lisd")
-	{
-		// PPCAnalyst::ListDB();
-	}
-	CASE("ipro")
-	{
-		PPCTables::PrintInstructionRunCounts();
-	}
-	CASE("lisf")
-	{
-		g_symbolDB.List();
-	}
-	else
-	{
-		ERROR_LOG(CONSOLE, "Invalid command");
-	}
-}
diff --git a/Source/Core/Core/Src/Console.h b/Source/Core/Core/Src/Console.h
deleted file mode 100644
index 00b0a83f71..0000000000
--- a/Source/Core/Core/Src/Console.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Simple debugging console currently residing in the Logging window. Not used much.
-
-#ifndef _CONSOLE_H
-#define _CONSOLE_H
-
-void Console_Submit(const char *cmd);
-
-#endif
-
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
deleted file mode 100644
index 4974635ea4..0000000000
--- a/Source/Core/Core/Src/Core.cpp
+++ /dev/null
@@ -1,766 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifdef _WIN32
-#include <windows.h>
-#include "EmuWindow.h"
-#endif
-
-#include "Atomic.h"
-#include "Thread.h"
-#include "Timer.h"
-#include "Common.h"
-#include "CommonPaths.h"
-#include "StringUtil.h"
-#include "MathUtil.h"
-#include "MemoryUtil.h"
-
-#include "Console.h"
-#include "Core.h"
-#include "CPUDetect.h"
-#include "CoreTiming.h"
-#include "Boot/Boot.h"
-#include "FifoPlayer/FifoPlayer.h"
-
-#include "HW/Memmap.h"
-#include "HW/ProcessorInterface.h"
-#include "HW/GPFifo.h"
-#include "HW/CPU.h"
-#include "HW/GCPad.h"
-#include "HW/Wiimote.h"
-#include "HW/HW.h"
-#include "HW/DSP.h"
-#include "HW/GPFifo.h"
-#include "HW/AudioInterface.h"
-#include "HW/VideoInterface.h"
-#include "HW/EXI.h"
-#include "HW/SystemTimers.h"
-
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-
-#include "PowerPC/PowerPC.h"
-#ifdef USE_GDBSTUB
-#include "PowerPC/GDBStub.h"
-#endif
-
-#include "DSPEmulator.h"
-#include "ConfigManager.h"
-#include "VideoBackendBase.h"
-#include "AudioCommon.h"
-#include "OnScreenDisplay.h"
-
-#include "VolumeHandler.h"
-#include "FileMonitor.h"
-
-#include "MemTools.h"
-#include "Host.h"
-#include "LogManager.h"
-
-#include "State.h"
-#include "Movie.h"
-#include "PatchEngine.h"
-
-// TODO: ugly, remove
-bool g_aspect_wide;
-
-namespace Core
-{
-
-// Declarations and definitions
-Common::Timer Timer;
-volatile u32 DrawnFrame = 0;
-u32 DrawnVideo = 0;
-
-// Function forwarding
-const char *Callback_ISOName(void);
-void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
-
-// Function declarations
-void EmuThread();
-
-bool g_bStopping = false;
-bool g_bHwInit = false;
-bool g_bStarted = false;
-void *g_pWindowHandle = NULL;
-std::string g_stateFileName;
-std::thread g_EmuThread;
-
-static std::thread g_cpu_thread;
-static bool g_requestRefreshInfo = false;
-static int g_pauseAndLockDepth = 0;
-
-SCoreStartupParameter g_CoreStartupParameter;
-bool isTabPressed = false;
-
-std::string GetStateFileName() { return g_stateFileName; }
-void SetStateFileName(std::string val) { g_stateFileName = val; }
-
-// Display messages and return values
-
-// Formatted stop message
-std::string StopMessage(bool bMainThread, std::string Message)
-{
-	return StringFromFormat("Stop [%s %i]\t%s\t%s",
-		bMainThread ? "Main Thread" : "Video Thread", Common::CurrentThreadId(), MemUsage().c_str(), Message.c_str());
-}
-
-//
-bool PanicAlertToVideo(const char* text, bool yes_no)
-{
-	DisplayMessage(text, 3000);
-	return true;
-}
-
-void DisplayMessage(const char *message, int time_in_ms)
-{
-	SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	// Actually displaying non-ASCII could cause things to go pear-shaped
-	for (const char *c = message; *c != '\0'; ++c)
-		if (*c < ' ')
-			return;
-
-	g_video_backend->Video_AddMessage(message, time_in_ms);
-
-	if (_CoreParameter.bRenderToMain &&
-		SConfig::GetInstance().m_InterfaceStatusbar)
-	{
-			Host_UpdateStatusBar(message);
-	}
-	else
-	{
-		Host_UpdateTitle(message);
-	}
-}
-
-void Callback_DebuggerBreak()
-{
-	CCPU::Break();
-}
-
-void *GetWindowHandle()
-{
-	return g_pWindowHandle;
-}
-
-bool IsRunning()
-{
-	return (GetState() != CORE_UNINITIALIZED) || g_bHwInit;
-}
-
-bool IsRunningAndStarted()
-{
-	return g_bStarted;
-}
-
-bool IsRunningInCurrentThread()
-{
-	return IsRunning() && IsCPUThread();
-}
-
-bool IsCPUThread()
-{
-	return (g_cpu_thread.joinable() ? (g_cpu_thread.get_id() == std::this_thread::get_id()) : !g_bStarted);
-}
-
-bool IsGPUThread()
-{
-	const SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-	if (_CoreParameter.bCPUThread)
-	{
-		return (g_EmuThread.joinable() && (g_EmuThread.get_id() == std::this_thread::get_id()));
-	}
-	else
-	{
-		return IsCPUThread();
-	}
-}
-
-// This is called from the GUI thread. See the booting call schedule in
-// BootManager.cpp
-bool Init()
-{
-	const SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	if (g_EmuThread.joinable())
-	{
-		PanicAlertT("Emu Thread already running");
-		return false;
-	}
-
-	g_CoreStartupParameter = _CoreParameter;
-
-	INFO_LOG(OSREPORT, "Starting core = %s mode",
-		g_CoreStartupParameter.bWii ? "Wii" : "Gamecube");
-	INFO_LOG(OSREPORT, "CPU Thread separate = %s",
-		g_CoreStartupParameter.bCPUThread ? "Yes" : "No");
-
-	Host_UpdateMainFrame(); // Disable any menus or buttons at boot
-
-	g_aspect_wide = _CoreParameter.bWii;
-	if (g_aspect_wide)
-	{
-		IniFile gameIni;
-		gameIni.Load(_CoreParameter.m_strGameIniDefault.c_str());
-		gameIni.Load(_CoreParameter.m_strGameIniLocal.c_str(), true);
-		gameIni.Get("Wii", "Widescreen", &g_aspect_wide,
-			!!SConfig::GetInstance().m_SYSCONF->
-				GetData<u8>("IPL.AR"));
-	}
-
-	// g_pWindowHandle is first the m_Panel handle,
-	// then it is updated to the render window handle,
-	// within g_video_backend->Initialize()
-	g_pWindowHandle = Host_GetRenderHandle();
-
-	// Start the emu thread
-	g_EmuThread = std::thread(EmuThread);
-
-	return true;
-}
-
-// Called from GUI thread
-void Stop()  // - Hammertime!
-{
-	if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
-	{
-		if (g_EmuThread.joinable())
-			g_EmuThread.join();
-		return;
-	}
-
-	const SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	g_bStopping = true;
-
-	g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP);
-
-	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");
-
-	// Stop the CPU
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
-	PowerPC::Stop();
-
-	// Kick it if it's waiting (code stepping wait loop)
-	CCPU::StepOpcode();
-
-	if (_CoreParameter.bCPUThread)
-	{
-		// Video_EnterLoop() should now exit so that EmuThread()
-		// will continue concurrently with the rest of the commands
-		// in this function. We no longer rely on Postmessage.
-		INFO_LOG(CONSOLE, "%s", StopMessage(true, "Wait for Video Loop to exit ...").c_str());
-
-		g_video_backend->Video_ExitLoop();
-	}
-
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
-
-	g_EmuThread.join();	// Wait for emuthread to close.
-
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Main Emu thread stopped").c_str());
-
-#ifdef _WIN32
-	EmuWindow::Close();
-#endif
-
-	// Clear on screen messages that haven't expired
-	g_video_backend->Video_ClearMessages();
-
-	// Close the trace file
-	Core::StopTrace();
-
-	// Reload sysconf file in order to see changes committed during emulation
-	if (_CoreParameter.bWii)
-		SConfig::GetInstance().m_SYSCONF->Reload();
-
-	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
-	Movie::Shutdown();
-	PatchEngine::Shutdown();
-
-	g_bStopping = false;
-}
-
-// Create the CPU thread, which is a CPU + Video thread in Single Core mode.
-void CpuThread()
-{
-	const SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	if (_CoreParameter.bCPUThread)
-	{
-		Common::SetCurrentThreadName("CPU thread");
-	}
-	else
-	{
-		Common::SetCurrentThreadName("CPU-GPU thread");
-		g_video_backend->Video_Prepare();
-	}
-
-	#if defined(_M_X64) || _M_ARM
-	if (_CoreParameter.bFastmem)
-		EMM::InstallExceptionHandler(); // Let's run under memory watch
-	#endif
-
-	if (!g_stateFileName.empty())
-		State::LoadAs(g_stateFileName);
-
-	g_bStarted = true;
-
-
-	#ifdef USE_GDBSTUB
-	if(_CoreParameter.iGDBPort > 0)
-	{
-		gdb_init(_CoreParameter.iGDBPort);
-		// break at next instruction (the first instruction)
-		gdb_break();
-	}
-	#endif
-
-	// Enter CPU run loop. When we leave it - we are done.
-	CCPU::Run();
-
-	g_bStarted = false;
-
-	if (!_CoreParameter.bCPUThread)
-		g_video_backend->Video_Cleanup();
-
-	return;
-}
-
-void FifoPlayerThread()
-{
-	const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	if (_CoreParameter.bCPUThread)
-	{
-		Common::SetCurrentThreadName("FIFO player thread");
-	}
-	else
-	{
-		g_video_backend->Video_Prepare();
-		Common::SetCurrentThreadName("FIFO-GPU thread");
-	}
-
-	g_bStarted = true;
-
-	// Enter CPU run loop. When we leave it - we are done.
-	if (FifoPlayer::GetInstance().Open(_CoreParameter.m_strFilename))
-	{
-		FifoPlayer::GetInstance().Play();
-		FifoPlayer::GetInstance().Close();
-	}
-
-	g_bStarted = false;
-
-	if(!_CoreParameter.bCPUThread)
-		g_video_backend->Video_Cleanup();
-
-	return;
-}
-
-// Initalize and create emulation thread
-// Call browser: Init():g_EmuThread().
-// See the BootManager.cpp file description for a complete call schedule.
-void EmuThread()
-{
-	const SCoreStartupParameter& _CoreParameter =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	Common::SetCurrentThreadName("Emuthread - Starting");
-
-	DisplayMessage(cpu_info.brand_string, 8000);
-	DisplayMessage(cpu_info.Summarize(), 8000);
-	DisplayMessage(_CoreParameter.m_strFilename, 3000);
-
-	Movie::Init();
-
-	HW::Init();
-
-	if (!g_video_backend->Initialize(g_pWindowHandle))
-	{
-		PanicAlert("Failed to initialize video backend!");
-		Host_Message(WM_USER_STOP);
-		return;
-	}
-
-	OSD::AddMessage("Dolphin " + g_video_backend->GetName() + " Video Backend.", 5000);
-
-	if (!DSP::GetDSPEmulator()->Initialize(g_pWindowHandle,
-				_CoreParameter.bWii, _CoreParameter.bDSPThread))
-	{
-		HW::Shutdown();
-		g_video_backend->Shutdown();
-		PanicAlert("Failed to initialize DSP emulator!");
-		Host_Message(WM_USER_STOP);
-		return;
-	}
-
-	Pad::Initialize(g_pWindowHandle);
-	// Load and Init Wiimotes - only if we are booting in wii mode
-	if (g_CoreStartupParameter.bWii)
-	{
-		Wiimote::Initialize(g_pWindowHandle, !g_stateFileName.empty());
-
-		// Activate wiimotes which don't have source set to "None"
-		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
-			if (g_wiimote_sources[i])
-				GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);
-
-	}
-
-	// The hardware is initialized.
-	g_bHwInit = true;
-
-	// Boot to pause or not
-	Core::SetState(_CoreParameter.bBootToPause ? Core::CORE_PAUSE : Core::CORE_RUN);
-
-	// Load GCM/DOL/ELF whatever ... we boot with the interpreter core
-	PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
-
-	CBoot::BootUp();
-
-	// Setup our core, but can't use dynarec if we are compare server
-	if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer ||
-					_CoreParameter.bRunCompareClient))
-		PowerPC::SetMode(PowerPC::MODE_JIT);
-	else
-		PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
-
-	// Update the window again because all stuff is initialized
-	Host_UpdateDisasmDialog();
-	Host_UpdateMainFrame();
-
-	// Determine the cpu thread function
-	void (*cpuThreadFunc)(void);
-	if (_CoreParameter.m_BootType == SCoreStartupParameter::BOOT_DFF)
-		cpuThreadFunc = FifoPlayerThread;
-	else
-		cpuThreadFunc = CpuThread;
-
-	// ENTER THE VIDEO THREAD LOOP
-	if (_CoreParameter.bCPUThread)
-	{
-		// This thread, after creating the EmuWindow, spawns a CPU
-		// thread, and then takes over and becomes the video thread
-		Common::SetCurrentThreadName("Video thread");
-
-		g_video_backend->Video_Prepare();
-
-		// Spawn the CPU thread
-		g_cpu_thread = std::thread(cpuThreadFunc);
-
-		// become the GPU thread
-		g_video_backend->Video_EnterLoop();
-
-		// We have now exited the Video Loop
-		INFO_LOG(CONSOLE, "%s", StopMessage(false, "Video Loop Ended").c_str());
-	}
-	else // SingleCore mode
-	{
-		// The spawned CPU Thread also does the graphics.
-		// The EmuThread is thus an idle thread, which sleeps while
-		// waiting for the program to terminate. Without this extra
-		// thread, the video backend window hangs in single core mode
-		// because noone is pumping messages.
-		Common::SetCurrentThreadName("Emuthread - Idle");
-
-		// Spawn the CPU+GPU thread
-		g_cpu_thread = std::thread(cpuThreadFunc);
-
-		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
-		{
-			g_video_backend->PeekMessages();
-			Common::SleepCurrentThread(20);
-		}
-	}
-
-	// Wait for g_cpu_thread to exit
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping CPU-GPU thread ...").c_str());
-
-	#ifdef USE_GDBSTUB
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping GDB ...").c_str());
-	gdb_deinit();
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "GDB stopped.").c_str());
-	#endif
-
-	g_cpu_thread.join();
-
-	INFO_LOG(CONSOLE, "%s", StopMessage(true, "CPU thread stopped.").c_str());
-
-	if(_CoreParameter.bCPUThread)
-		g_video_backend->Video_Cleanup();
-
-	VolumeHandler::EjectVolume();
-	FileMon::Close();
-
-	// Stop audio thread - Actually this does nothing when using HLE
-	// emulation, but stops the DSP Interpreter when using LLE emulation.
-	DSP::GetDSPEmulator()->DSP_StopSoundStream();
-
-	// We must set up this flag before executing HW::Shutdown()
-	g_bHwInit = false;
-	INFO_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str());
-	HW::Shutdown();
-	INFO_LOG(CONSOLE, "%s", StopMessage(false, "HW shutdown").c_str());
-	Pad::Shutdown();
-	Wiimote::Shutdown();
-	g_video_backend->Shutdown();
-}
-
-// Set or get the running state
-
-void SetState(EState _State)
-{
-	switch (_State)
-	{
-	case CORE_PAUSE:
-		CCPU::EnableStepping(true);  // Break
-		Wiimote::Pause();
-		break;
-	case CORE_RUN:
-		CCPU::EnableStepping(false);
-		Wiimote::Resume();
-		break;
-	default:
-		PanicAlertT("Invalid state");
-		break;
-	}
-}
-
-EState GetState()
-{
-	if (g_bHwInit)
-	{
-		if (CCPU::IsStepping())
-			return CORE_PAUSE;
-		else if (g_bStopping)
-			return CORE_STOPPING;
-		else
-			return CORE_RUN;
-	}
-	return CORE_UNINITIALIZED;
-}
-
-static std::string GenerateScreenshotName()
-{
-	const std::string& gameId = SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID();
-	std::string path = File::GetUserPath(D_SCREENSHOTS_IDX) + gameId + DIR_SEP_CHR;
-
-	if (!File::CreateFullPath(path))
-	{
-		// fallback to old-style screenshots, without folder.
-		path = File::GetUserPath(D_SCREENSHOTS_IDX);
-	}
-
-	//append gameId, path only contains the folder here.
-	path += gameId;
-
-	std::string name;
-	for (int i = 1; File::Exists(name = StringFromFormat("%s-%d.png", path.c_str(), i)); ++i)
-	{
-		// TODO?
-	}
-
-	return name;
-}
-
-void SaveScreenShot()
-{
-	const bool bPaused = (GetState() == CORE_PAUSE);
-
-	SetState(CORE_PAUSE);
-
-	g_video_backend->Video_Screenshot(GenerateScreenshotName().c_str());
-
-	if (!bPaused)
-		SetState(CORE_RUN);
-}
-
-void RequestRefreshInfo()
-{
-	g_requestRefreshInfo = true;
-}
-
-bool PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	// let's support recursive locking to simplify things on the caller's side,
-	// and let's do it at this outer level in case the individual systems don't support it.
-	if (doLock ? g_pauseAndLockDepth++ : --g_pauseAndLockDepth)
-		return true;
-
-	// first pause or unpause the cpu
-	bool wasUnpaused = CCPU::PauseAndLock(doLock, unpauseOnUnlock);
-	ExpansionInterface::PauseAndLock(doLock, unpauseOnUnlock);
-
-	// audio has to come after cpu, because cpu thread can wait for audio thread (m_throttle).
-	AudioCommon::PauseAndLock(doLock, unpauseOnUnlock);
-	DSP::GetDSPEmulator()->PauseAndLock(doLock, unpauseOnUnlock);
-
-	// video has to come after cpu, because cpu thread can wait for video thread (s_efbAccessRequested).
-	g_video_backend->PauseAndLock(doLock, unpauseOnUnlock);
-	return wasUnpaused;
-}
-
-// Apply Frame Limit and Display FPS info
-// This should only be called from VI
-void VideoThrottle()
-{
-	u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 2) ?
-		(SConfig::GetInstance().m_Framelimit - 1) * 5 : VideoInterface::TargetRefreshRate;
-
-	if (Host_GetKeyState('\t'))
-		isTabPressed = true;
-
-	// Disable the frame-limiter when the throttle (Tab) key is held down. Audio throttle: m_Framelimit = 2
-	if (SConfig::GetInstance().m_Framelimit && SConfig::GetInstance().m_Framelimit != 2 && !Host_GetKeyState('\t'))
-	{
-		isTabPressed = false;
-		u32 frametime = ((SConfig::GetInstance().b_UseFPS)? Common::AtomicLoad(DrawnFrame) : DrawnVideo) * 1000 / TargetVPS;
-
-		u32 timeDifference = (u32)Timer.GetTimeDifference();
-		if (timeDifference < frametime)
-		{
-			Common::SleepCurrentThread(frametime - timeDifference - 1);
-		}
-
-		while ((u32)Timer.GetTimeDifference() < frametime)
-			Common::YieldCPU();
-			//Common::SleepCurrentThread(1);
-	}
-
-	// Update info per second
-	u32 ElapseTime = (u32)Timer.GetTimeDifference();
-	if ((ElapseTime >= 1000 && DrawnVideo > 0) || g_requestRefreshInfo)
-	{
-		UpdateTitle();
-
-		// Reset counter
-		Timer.Update();
-		Common::AtomicStore(DrawnFrame, 0);
-		DrawnVideo = 0;
-	}
-
-	DrawnVideo++;
-}
-
-// Executed from GPU thread
-// reports if a frame should be skipped or not
-// depending on the framelimit set
-bool ShouldSkipFrame(int skipped)
-{
-	const u32 TargetFPS = (SConfig::GetInstance().m_Framelimit > 1)
-		? SConfig::GetInstance().m_Framelimit * 5
-		: VideoInterface::TargetRefreshRate;
-	const u32 frames = Common::AtomicLoad(DrawnFrame);
-	const bool fps_slow = !(Timer.GetTimeDifference() < (frames + skipped) * 1000 / TargetFPS);
-
-	return fps_slow;
-}
-
-// --- Callbacks for backends / engine ---
-
-// Should be called from GPU thread when a frame is drawn
-void Callback_VideoCopiedToXFB(bool video_update)
-{
-	if(video_update)
-		Common::AtomicIncrement(DrawnFrame);
-	Movie::FrameUpdate();
-}
-
-// Callback_ISOName: Let the DSP emulator get the game name
-//
-const char *Callback_ISOName()
-{
-	SCoreStartupParameter& params =
-		SConfig::GetInstance().m_LocalCoreStartupParameter;
-	if (params.m_strName.length() > 0)
-		return params.m_strName.c_str();
-	else
-		return "";
-}
-
-void UpdateTitle()
-{
-	u32 ElapseTime = (u32)Timer.GetTimeDifference();
-	g_requestRefreshInfo = false;
-	SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	if (ElapseTime == 0)
-		ElapseTime = 1;
-
-	u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime;
-	u32 VPS = DrawnVideo * 1000 / ElapseTime;
-	u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime);
-
-	// Settings are shown the same for both extended and summary info
-	std::string SSettings = StringFromFormat("%s %s | %s | %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC",
-		g_video_backend->GetName().c_str(), _CoreParameter.bDSPHLE ? "HLE" : "LLE");
-
-	// Use extended or summary information. The summary information does not print the ticks data,
-	// that's more of a debugging interest, it can always be optional of course if someone is interested.
-	//#define EXTENDED_INFO
-	#ifdef EXTENDED_INFO
-		u64 newTicks = CoreTiming::GetTicks();
-		u64 newIdleTicks = CoreTiming::GetIdleTicks();
-
-		u64 diff = (newTicks - ticks) / 1000000;
-		u64 idleDiff = (newIdleTicks - idleTicks) / 1000000;
-
-		ticks = newTicks;
-		idleTicks = newIdleTicks;
-
-		float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100;
-
-		std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - %u%%", FPS, VPS, Speed);
-		SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)",
-				_CoreParameter.bSkipIdle ? "~" : "",
-				(int)(diff),
-				(int)(diff - idleDiff),
-				(int)(idleDiff),
-				SystemTimers::GetTicksPerSecond() / 1000000,
-				_CoreParameter.bSkipIdle ? "~" : "",
-				TicksPercentage);
-
-	#else	// Summary information
-	std::string SFPS;
-	if (Movie::IsPlayingInput())
-		SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed);
-	else if (Movie::IsRecordingInput())
-		SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed);
-	else
-		SFPS = StringFromFormat("FPS: %u - VPS: %u - %u%%", FPS, VPS, Speed);
-	#endif
-
-	// This is our final "frame counter" string
-	std::string SMessage = StringFromFormat("%s | %s",
-		SSettings.c_str(), SFPS.c_str());
-	std::string TMessage = StringFromFormat("%s | ", scm_rev_str) +
-		SMessage;
-
-	// Show message
-	g_video_backend->UpdateFPSDisplay(SMessage.c_str());
-
-	// Update the audio timestretcher with the current speed
-	if (soundStream)
-	{
-		CMixer* pMixer = soundStream->GetMixer();
-		pMixer->UpdateSpeed((float)Speed / 100);
-	}
-
-	if (_CoreParameter.bRenderToMain &&
-		SConfig::GetInstance().m_InterfaceStatusbar)
-	{
-		Host_UpdateStatusBar(SMessage.c_str());
-		Host_UpdateTitle(scm_rev_str);
-	}
-	else
-		Host_UpdateTitle(TMessage.c_str());
-	}
-
-} // Core
diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h
deleted file mode 100644
index 0fe904ffc1..0000000000
--- a/Source/Core/Core/Src/Core.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Core
-
-// The external interface to the emulator core. Plus some extras.
-// This is another part of the emu that needs cleaning - Core.cpp really has
-// too much random junk inside.
-
-#ifndef _CORE_H
-#define _CORE_H
-
-#include <vector>
-#include <string>
-
-#include "Common.h"
-#include "CoreParameter.h"
-
-namespace Core
-{
-
-// Get core parameters
-// TODO: kill, use SConfig instead
-extern SCoreStartupParameter g_CoreStartupParameter;
-
-extern bool isTabPressed;
-
-void Callback_VideoCopiedToXFB(bool video_update);
-
-enum EState
-{
-	CORE_UNINITIALIZED,
-	CORE_PAUSE,
-	CORE_RUN,
-	CORE_STOPPING
-};
-
-bool Init();
-void Stop();
-
-std::string StopMessage(bool, std::string);
-
-bool IsRunning();
-bool IsRunningAndStarted(); // is running and the cpu loop has been entered
-bool IsRunningInCurrentThread(); // this tells us whether we are running in the cpu thread.
-bool IsCPUThread(); // this tells us whether we are the cpu thread.
-bool IsGPUThread();
-
-void SetState(EState _State);
-EState GetState();
-
-void SaveScreenShot();
-
-void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
-
-void* GetWindowHandle();
-
-void StartTrace(bool write);
-
-// This displays messages in a user-visible way.
-void DisplayMessage(const char *message, int time_in_ms);
-
-inline void DisplayMessage(const std::string &message, int time_in_ms)
-{
-	DisplayMessage(message.c_str(), time_in_ms);
-}
-	
-std::string GetStateFileName();
-void SetStateFileName(std::string val);
-
-int SyncTrace();
-void SetBlockStart(u32 addr);
-void StopTrace();
-
-bool ShouldSkipFrame(int skipped);
-void VideoThrottle();
-void RequestRefreshInfo();
-
-void UpdateTitle();
-
-// waits until all systems are paused and fully idle, and acquires a lock on that state.
-// or, if doLock is false, releases a lock on that state and optionally unpauses.
-// calls must be balanced (once with doLock true, then once with doLock false) but may be recursive.
-// the return value of the first call should be passed in as the second argument of the second call.
-bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-
-}  // namespace
-
-#endif
-
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
deleted file mode 100644
index 462a7e8474..0000000000
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "CDUtils.h"
-#include "NANDContentLoader.h"
-
-#include "VolumeCreator.h" // DiscIO
-
-#include "Boot/Boot.h" // Core
-#include "Boot/Boot_DOL.h"
-#include "CoreParameter.h"
-#include "ConfigManager.h"
-#include "Core.h" // for bWii
-#include "FifoPlayer/FifoDataFile.h"
-
-SCoreStartupParameter::SCoreStartupParameter()
-: hInstance(0),
-  bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
-  bJITNoBlockCache(false), bJITBlockLinking(true),
-  bJITOff(false),
-  bJITLoadStoreOff(false), bJITLoadStorelXzOff(false),
-  bJITLoadStorelwzOff(false), bJITLoadStorelbzxOff(false),
-  bJITLoadStoreFloatingOff(false), bJITLoadStorePairedOff(false),
-  bJITFloatingPointOff(false), bJITIntegerOff(false),
-  bJITPairedOff(false), bJITSystemRegistersOff(false),
-  bJITBranchOff(false), bJITProfiledReJIT(false),
-  bJITILTimeProfiling(false), bJITILOutputIR(false),
-  bEnableFPRF(false),
-  bCPUThread(true), bDSPThread(false), bDSPHLE(true),
-  bSkipIdle(true), bNTSC(false), bForceNTSCJ(false),
-  bHLE_BS2(true), bEnableCheats(false),
-  bMergeBlocks(false), bEnableMemcardSaving(true),
-  bDPL2Decoder(false), iLatency(14),
-  bRunCompareServer(false), bRunCompareClient(false),
-  bMMU(false), bDCBZOFF(false), iTLBHack(0), iBBDumpPort(0), bVBeamSpeedHack(false),
-  bSyncGPU(false), bFastDiscSpeed(false),
-  SelectedLanguage(0), bWii(false),
-  bConfirmStop(false), bHideCursor(false),
-  bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true),
-  iRenderWindowXPos(-1), iRenderWindowYPos(-1),
-  iRenderWindowWidth(640), iRenderWindowHeight(480),
-  bRenderWindowAutoSize(false), bKeepWindowOnTop(false),
-  bFullscreen(false), bRenderToMain(false),
-  bProgressive(false), bDisableScreenSaver(false),
-  iPosX(100), iPosY(100), iWidth(800), iHeight(600),
-  bLoopFifoReplay(true)
-{
-	LoadDefaults();
-}
-
-void SCoreStartupParameter::LoadDefaults()
-{
-	bEnableDebugging = false;
-	bAutomaticStart = false;
-	bBootToPause = false;
-
-	#ifdef USE_GDBSTUB
-	iGDBPort = -1;
-	#endif
-
-	iCPUCore = 1;
-	bCPUThread = false;
-	bSkipIdle = false;
-	bRunCompareServer = false;
-	bDSPHLE = true;
-	bDSPThread = true;
-	bFastmem = true;
-	bEnableFPRF = false;
-	bMMU = false;
-	bDCBZOFF = false;
-	iTLBHack = 0;
-	iBBDumpPort = -1;
-	bVBeamSpeedHack = false;
-	bSyncGPU = false;
-	bFastDiscSpeed = false;
-	bMergeBlocks = false;
-	bEnableMemcardSaving = true;
-	SelectedLanguage = 0;
-	bWii = false;
-	bDPL2Decoder = false;
-	iLatency = 14;
-
-	iPosX = 100;
-	iPosY = 100;
-	iWidth = 800;
-	iHeight = 600;
-
-	bLoopFifoReplay = true;
-
-	bJITOff = false; // debugger only settings
-	bJITLoadStoreOff = false;
-	bJITLoadStoreFloatingOff = false;
-	bJITLoadStorePairedOff = false;		// XXX not 64-bit clean
-	bJITFloatingPointOff = false;
-	bJITIntegerOff = false;
-	bJITPairedOff = false;
-	bJITSystemRegistersOff = false;
-
-	m_strName = "NONE";
-	m_strUniqueID = "00000000";
-}
-
-bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
-{
-	std::string Region(EUR_DIR);
-
-	switch (_BootBS2)
-	{
-	case BOOT_DEFAULT:
-		{
-			bool bootDrive = cdio_is_cdrom(m_strFilename);
-			// Check if the file exist, we may have gotten it from a --elf command line
-			// that gave an incorrect file name
-			if (!bootDrive && !File::Exists(m_strFilename))
-			{
-				PanicAlertT("The specified file \"%s\" does not exist", m_strFilename.c_str());
-				return false;
-			}
-
-			std::string Extension;
-			SplitPath(m_strFilename, NULL, NULL, &Extension);
-			if (!strcasecmp(Extension.c_str(), ".gcm") ||
-				!strcasecmp(Extension.c_str(), ".iso") ||
-				!strcasecmp(Extension.c_str(), ".wbfs") ||
-				!strcasecmp(Extension.c_str(), ".ciso") ||
-				!strcasecmp(Extension.c_str(), ".gcz") ||
-				bootDrive)
-			{
-				m_BootType = BOOT_ISO;
-				DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(m_strFilename.c_str());
-				if (pVolume == NULL)
-				{
-					if (bootDrive)
-						PanicAlertT("Could not read \"%s\".  "
-								"There is no disc in the drive, or it is not a GC/Wii backup.  "
-								"Please note that original Gamecube and Wii discs cannot be read "
-								"by most PC DVD drives.", m_strFilename.c_str());
-					else
-						PanicAlertT("\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO.",
-								m_strFilename.c_str());
-					return false;
-				}
-				m_strName = pVolume->GetName();
-				m_strUniqueID = pVolume->GetUniqueID();
-
-				// Check if we have a Wii disc
-				bWii = DiscIO::IsVolumeWiiDisc(pVolume);
-				switch (pVolume->GetCountry())
-				{
-				case DiscIO::IVolume::COUNTRY_USA:
-					bNTSC = true;
-					Region = USA_DIR;
-					break;
-
-				case DiscIO::IVolume::COUNTRY_TAIWAN:
-				case DiscIO::IVolume::COUNTRY_KOREA:
-					// TODO: Should these have their own Region Dir?
-				case DiscIO::IVolume::COUNTRY_JAPAN:
-					bNTSC = true;
-					Region = JAP_DIR;
-					break;
-
-				case DiscIO::IVolume::COUNTRY_EUROPE:
-				case DiscIO::IVolume::COUNTRY_FRANCE:
-				case DiscIO::IVolume::COUNTRY_ITALY:
-				case DiscIO::IVolume::COUNTRY_RUSSIA:
-					bNTSC = false;
-					Region = EUR_DIR;
-					break;
-
-				default:
-					if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)."
-								   "\nContinue with PAL region?"))
-					{
-						bNTSC = false;
-						Region = EUR_DIR;
-						break;
-					}else return false;
-				}
-
-				delete pVolume;
-			}
-			else if (!strcasecmp(Extension.c_str(), ".elf"))
-			{
-				bWii = CBoot::IsElfWii(m_strFilename.c_str());
-				Region = USA_DIR;
-				m_BootType = BOOT_ELF;
-				bNTSC = true;
-			}
-			else if (!strcasecmp(Extension.c_str(), ".dol"))
-			{
-				CDolLoader dolfile(m_strFilename.c_str());
-				bWii = dolfile.IsWii();
-				Region = USA_DIR;
-				m_BootType = BOOT_DOL;
-				bNTSC = true;
-			}
-			else if (!strcasecmp(Extension.c_str(), ".dff"))
-			{
-				bWii = true;
-				Region = USA_DIR;
-				bNTSC = true;
-				m_BootType = BOOT_DFF;
-
-				FifoDataFile *ddfFile = FifoDataFile::Load(m_strFilename.c_str(), true);
-
-				if (ddfFile)
-				{
-					bWii = ddfFile->GetIsWii();
-					delete ddfFile;
-				}
-			}
-			else if (DiscIO::CNANDContentManager::Access().GetNANDLoader(m_strFilename).IsValid())
-			{
-				const DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(m_strFilename.c_str());
-				const DiscIO::INANDContentLoader& ContentLoader = DiscIO::CNANDContentManager::Access().GetNANDLoader(m_strFilename);
-
-				if (ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()) == NULL)
-				{
-					//WAD is valid yet cannot be booted. Install instead.
-					u64 installed = DiscIO::CNANDContentManager::Access().Install_WiiWAD(m_strFilename);
-					if (installed)
-						SuccessAlertT("The WAD has been installed successfully");
-					return false; //do not boot
-				}
-
-				switch (ContentLoader.GetCountry())
-				{
-				case DiscIO::IVolume::COUNTRY_USA:
-					bNTSC = true;
-					Region = USA_DIR;
-					break;
-
-				case DiscIO::IVolume::COUNTRY_TAIWAN:
-				case DiscIO::IVolume::COUNTRY_KOREA:
-					// TODO: Should these have their own Region Dir?
-				case DiscIO::IVolume::COUNTRY_JAPAN:
-					bNTSC = true;
-					Region = JAP_DIR;
-					break;
-
-				case DiscIO::IVolume::COUNTRY_EUROPE:
-				case DiscIO::IVolume::COUNTRY_FRANCE:
-				case DiscIO::IVolume::COUNTRY_ITALY:
-				case DiscIO::IVolume::COUNTRY_RUSSIA:
-					bNTSC = false;
-					Region = EUR_DIR;
-					break;
-
-				default:
-					bNTSC = false;
-					Region = EUR_DIR;
-						break;
-				}
-
-				bWii = true;
-				m_BootType = BOOT_WII_NAND;
-
-				if (pVolume)
-				{
-					m_strName = pVolume->GetName();
-					m_strUniqueID = pVolume->GetUniqueID();
-					delete pVolume;
-				}
-				else
-				{	// null pVolume means that we are loading from nand folder (Most Likely Wii Menu)
-					// if this is the second boot we would be using the Name and id of the last title
-					m_strName.clear();
-					m_strUniqueID.clear();
-				}
-
-				// Use the TitleIDhex for name and/or unique ID if launching from nand folder
-				// or if it is not ascii characters (specifically sysmenu could potentially apply to other things)
-				char titleidstr[17];
-				snprintf(titleidstr, 17, "%016llx", ContentLoader.GetTitleID());
-
-				if (!m_strName.length())
-				{
-					m_strName = titleidstr;
-				}
-				if (!m_strUniqueID.length())
-				{
-					m_strUniqueID = titleidstr;
-				}
-
-			}
-			else
-			{
-				PanicAlertT("Could not recognize ISO file %s", m_strFilename.c_str());
-				return false;
-			}
-		}
-		break;
-
-	case BOOT_BS2_USA:
-		Region = USA_DIR;
-		m_strFilename.clear();
-		bNTSC = true;
-		break;
-
-	case BOOT_BS2_JAP:
-		Region = JAP_DIR;
-		m_strFilename.clear();
-		bNTSC = true;
-		break;
-
-	case BOOT_BS2_EUR:
-		Region = EUR_DIR;
-		m_strFilename.clear();
-		bNTSC = false;
-		break;
-	}
-
-	// Setup paths
-	CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true);
-	CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false);
-	m_strSRAM = File::GetUserPath(F_GCSRAM_IDX);
-	if (!bWii)
-	{
-		m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + Region + DIR_SEP GC_IPL;
-		if (!File::Exists(m_strBootROM))
-			m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL;
-
-		if (!bHLE_BS2)
-		{
-			if (!File::Exists(m_strBootROM))
-			{
-				WARN_LOG(BOOT, "Bootrom file %s not found - using HLE.", m_strBootROM.c_str());
-				bHLE_BS2 = true;
-			}
-		}
-	}
-	else if (bWii && !bHLE_BS2)
-	{
-		WARN_LOG(BOOT, "GC bootrom file will not be loaded for Wii mode.");
-		bHLE_BS2 = true;
-	}
-
-	return true;
-}
-
-void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::string gameRegion, bool isSlotA)
-{
-	std::string ext("." + gameRegion + ".raw");
-	if (memcardPath.empty())
-	{
-		// Use default memcard path if there is no user defined name
-		std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB;
-		memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext;
-	}
-	else
-	{
-		std::string filename = memcardPath;
-		std::string region = filename.substr(filename.size()-7, 3);
-		bool hasregion = false;
-		hasregion |= region.compare(USA_DIR) == 0;
-		hasregion |= region.compare(JAP_DIR) == 0;
-		hasregion |= region.compare(EUR_DIR) == 0;
-		if (!hasregion)
-		{
-			// filename doesn't have region in the extension
-			if (File::Exists(filename))
-			{
-				// If the old file exists we are polite and ask if we should copy it
-				std::string oldFilename = filename;
-				filename.replace(filename.size()-4, 4, ext);
-				if (PanicYesNoT("Memory Card filename in Slot %c is incorrect\n"
-					"Region not specified\n\n"
-					"Slot %c path was changed to\n"
-					"%s\n"
-					"Would you like to copy the old file to this new location?\n",
-					isSlotA ? 'A':'B', isSlotA ? 'A':'B', filename.c_str()))
-				{
-					if (!File::Copy(oldFilename, filename))
-						PanicAlertT("Copy failed");
-				}
-			}
-			memcardPath = filename; // Always correct the path!
-		}
-		else if (region.compare(gameRegion) != 0)
-		{
-			// filename has region, but it's not == gameRegion
-			// Just set the correct filename, the EXI Device will create it if it doesn't exist
-			memcardPath = filename.replace(filename.size()-ext.size(), ext.size(), ext);;
-		}
-	}
-}
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
deleted file mode 100644
index 6e87673f95..0000000000
--- a/Source/Core/Core/Src/CoreParameter.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COREPARAMETER_H
-#define _COREPARAMETER_H
-
-#include "IniFile.h"
-#include <string>
-
-enum Hotkey
-{
-	HK_OPEN,
-	HK_CHANGE_DISC,
-	HK_REFRESH_LIST,
-
-	HK_PLAY_PAUSE,
-	HK_STOP,
-	HK_RESET,
-	HK_FRAME_ADVANCE,
-
-	HK_START_RECORDING,
-	HK_PLAY_RECORDING,
-	HK_EXPORT_RECORDING,
-	HK_READ_ONLY_MODE,
-
-	HK_FULLSCREEN,
-	HK_SCREENSHOT,
-	HK_EXIT,
-
-	HK_WIIMOTE1_CONNECT,
-	HK_WIIMOTE2_CONNECT,
-	HK_WIIMOTE3_CONNECT,
-	HK_WIIMOTE4_CONNECT,
-	HK_BALANCEBOARD_CONNECT,
-
-	HK_TOGGLE_IR,
-	HK_TOGGLE_AR,
-	HK_TOGGLE_EFBCOPIES,
-	HK_TOGGLE_FOG,
-
-	HK_INCREASE_FRAME_LIMIT,
-	HK_DECREASE_FRAME_LIMIT,
-
-	HK_LOAD_STATE_SLOT_1,
-	HK_LOAD_STATE_SLOT_2,
-	HK_LOAD_STATE_SLOT_3,
-	HK_LOAD_STATE_SLOT_4,
-	HK_LOAD_STATE_SLOT_5,
-	HK_LOAD_STATE_SLOT_6,
-	HK_LOAD_STATE_SLOT_7,
-	HK_LOAD_STATE_SLOT_8,
-	HK_LOAD_STATE_SLOT_9,
-	HK_LOAD_STATE_SLOT_10,
-
-	HK_SAVE_STATE_SLOT_1,
-	HK_SAVE_STATE_SLOT_2,
-	HK_SAVE_STATE_SLOT_3,
-	HK_SAVE_STATE_SLOT_4,
-	HK_SAVE_STATE_SLOT_5,
-	HK_SAVE_STATE_SLOT_6,
-	HK_SAVE_STATE_SLOT_7,
-	HK_SAVE_STATE_SLOT_8,
-	HK_SAVE_STATE_SLOT_9,
-	HK_SAVE_STATE_SLOT_10,
-
-	HK_LOAD_LAST_STATE_1,
-	HK_LOAD_LAST_STATE_2,
-	HK_LOAD_LAST_STATE_3,
-	HK_LOAD_LAST_STATE_4,
-	HK_LOAD_LAST_STATE_5,
-	HK_LOAD_LAST_STATE_6,
-	HK_LOAD_LAST_STATE_7,
-	HK_LOAD_LAST_STATE_8,
-
-	HK_SAVE_FIRST_STATE,
-	HK_UNDO_LOAD_STATE,
-	HK_UNDO_SAVE_STATE,
-	HK_SAVE_STATE_FILE,
-	HK_LOAD_STATE_FILE,
-
-	NUM_HOTKEYS,
-};
-
-struct SCoreStartupParameter
-{
-	void* hInstance;  // HINSTANCE but we don't want to include <windows.h>
-
-	// Settings
-	bool bEnableDebugging;
-	#ifdef USE_GDBSTUB
-	int  iGDBPort;
-	#endif
-	bool bAutomaticStart;
-	bool bBootToPause;
-
-	// 0 = Interpreter
-	// 1 = Jit
-	// 2 = JitIL
-	// 3 = JIT ARM
-	int iCPUCore;
-
-	// JIT (shared between JIT and JITIL)
-	bool bJITNoBlockCache, bJITBlockLinking;
-	bool bJITOff;
-	bool bJITLoadStoreOff, bJITLoadStorelXzOff, bJITLoadStorelwzOff, bJITLoadStorelbzxOff;
-	bool bJITLoadStoreFloatingOff;
-	bool bJITLoadStorePairedOff;
-	bool bJITFloatingPointOff;
-	bool bJITIntegerOff;
-	bool bJITPairedOff;
-	bool bJITSystemRegistersOff;
-	bool bJITBranchOff;
-	bool bJITProfiledReJIT;
-	bool bJITILTimeProfiling;
-	bool bJITILOutputIR;
-
-	bool bFastmem;
-	bool bEnableFPRF;
-
-	bool bCPUThread;
-	bool bDSPThread;
-	bool bDSPHLE;
-	bool bSkipIdle;
-	bool bNTSC;
-	bool bForceNTSCJ;
-	bool bHLE_BS2;
-	bool bEnableCheats;
-	bool bMergeBlocks;
-	bool bEnableMemcardSaving;
-
-	bool bDPL2Decoder;
-	int iLatency;
-
-	bool bRunCompareServer;
-	bool bRunCompareClient;
-
-	bool bMMU;
-	bool bDCBZOFF;
-	int iTLBHack;
-	int iBBDumpPort;
-	bool bVBeamSpeedHack;
-	bool bSyncGPU;
-	bool bFastDiscSpeed;
-
-	int SelectedLanguage;
-
-	bool bWii;
-
-	// Interface settings
-	bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages;
-	std::string theme_name;
-
-	// Hotkeys
-	int iHotkey[NUM_HOTKEYS];
-	int iHotkeyModifier[NUM_HOTKEYS];
-
-	// Display settings
-	std::string strFullscreenResolution;
-	int iRenderWindowXPos, iRenderWindowYPos;
-	int iRenderWindowWidth, iRenderWindowHeight;
-	bool bRenderWindowAutoSize, bKeepWindowOnTop;
-	bool bFullscreen, bRenderToMain;
-	bool bProgressive, bDisableScreenSaver;
-
-	int iPosX, iPosY, iWidth, iHeight;
-
-	// Fifo Player related settings
-	bool bLoopFifoReplay;
-
-	enum EBootBS2
-	{
-		BOOT_DEFAULT,
-		BOOT_BS2_JAP,
-		BOOT_BS2_USA,
-		BOOT_BS2_EUR,
-	};
-
-	enum EBootType
-	{
-		BOOT_ISO,
-		BOOT_ELF,
-		BOOT_DOL,
-		BOOT_WII_NAND,
-		BOOT_BS2,
-		BOOT_DFF
-	};
-	EBootType m_BootType;
-
-	std::string m_strVideoBackend;
-
-	// files
-	std::string m_strFilename;
-	std::string m_strBootROM;
-	std::string m_strSRAM;
-	std::string m_strDefaultGCM;
-	std::string m_strDVDRoot;
-	std::string m_strApploader;
-	std::string m_strUniqueID;
-	std::string m_strName;
-	std::string m_strGameIniDefault;
-	std::string m_strGameIniLocal;
-
-	// Constructor just calls LoadDefaults
-	SCoreStartupParameter();
-
-	void LoadDefaults();
-	bool AutoSetup(EBootBS2 _BootBS2);
-	const std::string &GetUniqueID() const { return m_strUniqueID; }
-	void CheckMemcardPath(std::string& memcardPath, std::string Region, bool isSlotA);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp
deleted file mode 100644
index 06770aa375..0000000000
--- a/Source/Core/Core/Src/CoreTiming.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <vector>
-
-#include "Thread.h"
-#include "PowerPC/PowerPC.h"
-#include "CoreTiming.h"
-#include "Core.h"
-#include "StringUtil.h"
-#include "VideoBackendBase.h"
-
-#define MAX_SLICE_LENGTH 20000
-
-namespace CoreTiming
-{
-
-struct EventType
-{
-	TimedCallback callback;
-	const char *name;
-};
-
-std::vector<EventType> event_types;
-
-struct BaseEvent
-{
-	s64 time;
-	u64 userdata;
-	int type;
-//	Event *next;
-};
-
-typedef LinkedListItem<BaseEvent> Event;
-
-// STATE_TO_SAVE
-Event *first;
-Event *tsFirst;
-Event *tsLast;
-
-// event pools
-Event *eventPool = 0;
-Event *eventTsPool = 0;
-int allocatedTsEvents = 0;
-
-int downcount, slicelength;
-int maxSliceLength = MAX_SLICE_LENGTH;
-
-s64 globalTimer;
-s64 idledCycles;
-
-u32 fakeDecStartValue;
-u64 fakeDecStartTicks;
-u64 fakeTBStartValue;
-u64 fakeTBStartTicks;
-
-int ev_lost;
-
-static std::recursive_mutex externalEventSection;
-
-void (*advanceCallback)(int cyclesExecuted) = NULL;
-
-Event* GetNewEvent()
-{
-	if(!eventPool)
-		return new Event;
-
-	Event* ev = eventPool;
-	eventPool = ev->next;
-	return ev;
-}
-
-Event* GetNewTsEvent()
-{
-	allocatedTsEvents++;
-
-	if(!eventTsPool)
-		return new Event;
-
-	Event* ev = eventTsPool;
-	eventTsPool = ev->next;
-	return ev;
-}
-
-void FreeEvent(Event* ev)
-{
-	ev->next = eventPool;
-	eventPool = ev;
-}
-
-void FreeTsEvent(Event* ev)
-{
-	ev->next = eventTsPool;
-	eventTsPool = ev;
-	allocatedTsEvents--;
-}
-
-static void EmptyTimedCallback(u64 userdata, int cyclesLate) {}
-
-int RegisterEvent(const char *name, TimedCallback callback)
-{
-	EventType type;
-	type.name = name;
-	type.callback = callback;
-
-	// check for existing type with same name.
-	// we want event type names to remain unique so that we can use them for serialization.
-	for (unsigned int i = 0; i < event_types.size(); ++i)
-	{
-		if (!strcmp(name, event_types[i].name))
-		{
-			WARN_LOG(POWERPC, "Discarded old event type \"%s\" because a new type with the same name was registered.", name);
-			// we don't know if someone might be holding on to the type index,
-			// so we gut the old event type instead of actually removing it.
-			event_types[i].name = "_discarded_event";
-			event_types[i].callback = &EmptyTimedCallback;
-		}
-	}
-
-	event_types.push_back(type);
-	return (int)event_types.size() - 1;
-}
-
-void UnregisterAllEvents()
-{
-	if (first)
-		PanicAlertT("Cannot unregister events with events pending");
-	event_types.clear();
-}
-
-void Init()
-{
-	downcount = maxSliceLength;
-	slicelength = maxSliceLength;
-	globalTimer = 0;
-	idledCycles = 0;
-	
-	ev_lost = RegisterEvent("_lost_event", &EmptyTimedCallback);
-}
-
-void Shutdown()
-{
-	MoveEvents();
-	ClearPendingEvents();
-	UnregisterAllEvents();
-
-	while(eventPool)
-	{
-		Event *ev = eventPool;
-		eventPool = ev->next;
-		delete ev;
-	}
-
-	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-	while(eventTsPool)
-	{
-		Event *ev = eventTsPool;
-		eventTsPool = ev->next;
-		delete ev;
-	}
-}
-
-void EventDoState(PointerWrap &p, BaseEvent* ev)
-{
-	p.Do(ev->time);
-
-	// this is why we can't have (nice things) pointers as userdata
-	p.Do(ev->userdata);
-
-	// we can't savestate ev->type directly because events might not get registered in the same order (or at all) every time.
-	// so, we savestate the event's type's name, and derive ev->type from that when loading.
-	std::string name;
-	if (p.GetMode() != PointerWrap::MODE_READ)
-		name = event_types[ev->type].name;
-
-	p.Do(name);
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		bool foundMatch = false;
-		for (unsigned int i = 0; i < event_types.size(); ++i)
-		{
-			if (!strcmp(name.c_str(), event_types[i].name))
-			{
-				ev->type = i;
-				foundMatch = true;
-				break;
-			}
-		}
-		if (!foundMatch)
-		{
-			WARN_LOG(POWERPC, "Lost event from savestate because its type, \"%s\", has not been registered.", name.c_str());
-			ev->type = ev_lost;
-		}
-	}
-}
-
-void DoState(PointerWrap &p)
-{
-	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-	p.Do(downcount);
-	p.Do(slicelength);
-	p.Do(globalTimer);
-	p.Do(idledCycles);
-	p.Do(fakeDecStartValue);
-	p.Do(fakeDecStartTicks);
-	p.Do(fakeTBStartValue);
-	p.Do(fakeTBStartTicks);
-	p.DoMarker("CoreTimingData");
-
-	p.DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, EventDoState>(first);
-	p.DoMarker("CoreTimingEvents");
-
-	p.DoLinkedList<BaseEvent, GetNewTsEvent, FreeTsEvent, EventDoState>(tsFirst, &tsLast);
-	p.DoMarker("CoreTimingTsEvents");
-}
-
-u64 GetTicks()
-{
-	return (u64)globalTimer; 
-}
-
-u64 GetIdleTicks()
-{
-	return (u64)idledCycles;
-}
-
-// This is to be called when outside threads, such as the graphics thread, wants to
-// schedule things to be executed on the main thread.
-void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata)
-{
-	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-	Event *ne = GetNewTsEvent();
-	ne->time = globalTimer + cyclesIntoFuture;
-	ne->type = event_type;
-	ne->next = 0;
-	ne->userdata = userdata;
-	if(!tsFirst)
-		tsFirst = ne;
-	if(tsLast)
-		tsLast->next = ne;
-	tsLast = ne;
-}
-
-// Same as ScheduleEvent_Threadsafe(0, ...) EXCEPT if we are already on the CPU thread
-// in which case the event will get handled immediately, before returning.
-void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata)
-{
-	if(Core::IsCPUThread())
-	{
-		std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-		event_types[event_type].callback(userdata, 0);
-	}
-	else
-	{
-		ScheduleEvent_Threadsafe(0, event_type, userdata);
-	}
-}
-
-void ClearPendingEvents()
-{
-	while (first)
-	{
-		Event *e = first->next;
-		FreeEvent(first);
-		first = e;
-	}
-}
-
-void AddEventToQueue(Event* ne)
-{
-	Event* prev = NULL;
-	Event** pNext = &first;
-	for(;;)
-	{
-		Event*& next = *pNext;
-		if(!next || ne->time < next->time)
-		{
-			ne->next = next;
-			next = ne;
-			break;
-		}
-		prev = next;
-		pNext = &prev->next;
-	}
-}
-
-// This must be run ONLY from within the cpu thread
-// cyclesIntoFuture may be VERY inaccurate if called from anything else
-// than Advance 
-void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata)
-{
-	Event *ne = GetNewEvent();
-	ne->userdata = userdata;
-	ne->type = event_type;
-	ne->time = globalTimer + cyclesIntoFuture;
-	AddEventToQueue(ne);
-}
-
-void RegisterAdvanceCallback(void (*callback)(int cyclesExecuted))
-{
-	advanceCallback = callback;
-}
-
-bool IsScheduled(int event_type) 
-{
-	if (!first)
-		return false;
-	Event *e = first;
-	while (e) {
-		if (e->type == event_type)
-			return true;
-		e = e->next;
-	}
-	return false;
-}
-
-void RemoveEvent(int event_type)
-{
-	if (!first)
-		return;
-
-	while(first)
-	{
-		if (first->type == event_type)
-		{
-			Event *next = first->next;
-			FreeEvent(first);
-			first = next;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	if (!first)
-		return;
-
-	Event *prev = first;
-	Event *ptr = prev->next;
-	while (ptr)
-	{
-		if (ptr->type == event_type)
-		{
-			prev->next = ptr->next;
-			FreeEvent(ptr);
-			ptr = prev->next;
-		}
-		else
-		{
-			prev = ptr;
-			ptr = ptr->next;
-		}
-	}
-}
-
-void RemoveThreadsafeEvent(int event_type)
-{
-	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-	if (!tsFirst)
-	{
-		return;
-	}
-
-	while(tsFirst)
-	{
-		if (tsFirst->type == event_type)
-		{
-			Event *next = tsFirst->next;
-			FreeTsEvent(tsFirst);
-			tsFirst = next;
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	if (!tsFirst)
-	{
-		return;
-	}
-
-	Event *prev = tsFirst;
-	Event *ptr = prev->next;
-	while (ptr)
-	{
-		if (ptr->type == event_type)
-		{
-			prev->next = ptr->next;
-			FreeTsEvent(ptr);
-			ptr = prev->next;
-		}
-		else
-		{
-			prev = ptr;
-			ptr = ptr->next;
-		}
-	}
-}
-
-void RemoveAllEvents(int event_type)
-{	
-	RemoveThreadsafeEvent(event_type);
-	RemoveEvent(event_type);
-}
-
-void SetMaximumSlice(int maximumSliceLength)
-{
-	maxSliceLength = maximumSliceLength;
-}
-
-void ForceExceptionCheck(int cycles)
-{
-	if (downcount > cycles)
-	{
-		slicelength -= (downcount - cycles); // Account for cycles already executed by adjusting the slicelength
-		downcount = cycles;
-	}
-}
-
-void ResetSliceLength()
-{
-	maxSliceLength = MAX_SLICE_LENGTH;
-}
-
-
-//This raise only the events required while the fifo is processing data
-void ProcessFifoWaitEvents()
-{
-	MoveEvents();
-
-	if (!first)
-		return;
-
-	while (first)
-	{
-		if (first->time <= globalTimer)
-		{
-			Event* evt = first;
-			first = first->next;
-			event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
-			FreeEvent(evt);
-		}
-		else
-		{
-			break;
-		}
-	}	
-}
-
-void MoveEvents()
-{
-	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-	// Move events from async queue into main queue
-	while (tsFirst)
-	{
-		Event *next = tsFirst->next;
-		AddEventToQueue(tsFirst);
-		tsFirst = next;
-	}
-	tsLast = NULL;
-
-	// Move free events to threadsafe pool
-	while(allocatedTsEvents > 0 && eventPool)
-	{
-		Event *ev = eventPool;
-		eventPool = ev->next;
-		ev->next = eventTsPool;
-		eventTsPool = ev;
-		allocatedTsEvents--;
-	}
-}
-
-void Advance()
-{	
-	MoveEvents();
-
-	int cyclesExecuted = slicelength - downcount;
-	globalTimer += cyclesExecuted;
-	downcount = slicelength;
-
-	while (first)
-	{
-		if (first->time <= globalTimer)
-		{
-//			LOG(POWERPC, "[Scheduler] %s     (%lld, %lld) ", 
-//				event_types[first->type].name ? event_types[first->type].name : "?", (u64)globalTimer, (u64)first->time);
-			Event* evt = first;
-			first = first->next;
-			event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
-			FreeEvent(evt);
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	if (!first) 
-	{
-		WARN_LOG(POWERPC, "WARNING - no events in queue. Setting downcount to 10000");
-		downcount += 10000;
-	}
-	else
-	{
-		slicelength = (int)(first->time - globalTimer);
-		if (slicelength > maxSliceLength)
-			slicelength = maxSliceLength;
-		downcount = slicelength;
-	}
-
-	if (advanceCallback)
-		advanceCallback(cyclesExecuted);
-}
-
-void LogPendingEvents()
-{
-	Event *ptr = first;
-	while (ptr)
-	{
-		INFO_LOG(POWERPC, "PENDING: Now: %lld Pending: %lld Type: %d", globalTimer, ptr->time, ptr->type);
-		ptr = ptr->next;
-	}
-}
-
-void Idle()
-{
-	//DEBUG_LOG(POWERPC, "Idle");
-	
-	//When the FIFO is processing data we must not advance because in this way
-	//the VI will be desynchronized. So, We are waiting until the FIFO finish and 
-	//while we process only the events required by the FIFO.
-	while (g_video_backend->Video_IsPossibleWaitingSetDrawDone())
-	{
-		ProcessFifoWaitEvents();
-		Common::YieldCPU();
-	}
-
-	idledCycles += downcount;
-	downcount = 0;
-	
-	Advance();
-}
-
-std::string GetScheduledEventsSummary()
-{
-	Event *ptr = first;
-	std::string text = "Scheduled events\n";
-	text.reserve(1000);
-	while (ptr)
-	{
-		unsigned int t = ptr->type;
-		if (t >= event_types.size())
-			PanicAlertT("Invalid event type %i", t);
-		
-		const char *name = event_types[ptr->type].name;
-		if (!name)
-			name = "[unknown]";
-		
-		text += StringFromFormat("%s : %i %08x%08x\n", event_types[ptr->type].name, ptr->time, ptr->userdata >> 32, ptr->userdata);
-		ptr = ptr->next;
-	}
-	return text;
-}
-
-u32 GetFakeDecStartValue()
-{
-	return fakeDecStartValue;
-}
-
-void SetFakeDecStartValue(u32 val)
-{
-	fakeDecStartValue = val;
-}
-
-u64 GetFakeDecStartTicks()
-{
-	return fakeDecStartTicks;
-}
-
-void SetFakeDecStartTicks(u64 val)
-{
-	fakeDecStartTicks = val;
-}
-
-u64 GetFakeTBStartValue()
-{
-	return fakeTBStartValue;
-}
-
-void SetFakeTBStartValue(u64 val)
-{
-	fakeTBStartValue = val;
-}
-
-u64 GetFakeTBStartTicks()
-{
-	return fakeTBStartTicks;
-}
-
-void SetFakeTBStartTicks(u64 val)
-{
-	fakeTBStartTicks = val;
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp
deleted file mode 100644
index 71b3f91294..0000000000
--- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPHWInterface.h"
-#include "DSPInterpreter.h"
-
-// The hardware adpcm decoder :)
-static s16 ADPCM_Step(u32& _rSamplePos)
-{
-	const s16 *pCoefTable = (const s16 *)&g_dsp.ifx_regs[DSP_COEF_A1_0];
-
-	if (((_rSamplePos) & 15) == 0)
-	{
-		g_dsp.ifx_regs[DSP_PRED_SCALE] = DSPHost_ReadHostMemory((_rSamplePos & ~15) >> 1);
-		_rSamplePos += 2;
-	}
-
-	int scale = 1 << (g_dsp.ifx_regs[DSP_PRED_SCALE] & 0xF);
-	int coef_idx = (g_dsp.ifx_regs[DSP_PRED_SCALE] >> 4) & 0x7;
-
-	s32 coef1 = pCoefTable[coef_idx * 2 + 0];
-	s32 coef2 = pCoefTable[coef_idx * 2 + 1];
-
-	int temp = (_rSamplePos & 1) ?
-		   (DSPHost_ReadHostMemory(_rSamplePos >> 1) & 0xF) :
-		   (DSPHost_ReadHostMemory(_rSamplePos >> 1) >> 4);
-
-	if (temp >= 8)
-		temp -= 16;
-
-	// 0x400 = 0.5  in 11-bit fixed point
-	int val = (scale * temp) + ((0x400 + coef1 * (s16)g_dsp.ifx_regs[DSP_YN1] + coef2 * (s16)g_dsp.ifx_regs[DSP_YN2]) >> 11);
-
-	// Clamp values.
-	if (val > 0x7FFF)
-		val = 0x7FFF;
-	else if (val < -0x7FFF)
-		val = -0x7FFF;
-
-	g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
-	g_dsp.ifx_regs[DSP_YN1] = val;
-
-	_rSamplePos++;
-
-	// The advanced interpolation (linear, polyphase,...) is done by the UCode,
-	// so we don't need to bother with it here.
-	return val;
-}
-
-u16 dsp_read_aram_d3()
-{
-	// Zelda ucode reads ARAM through 0xffd3.
-	const u32 EndAddress = (g_dsp.ifx_regs[DSP_ACEAH] << 16) | g_dsp.ifx_regs[DSP_ACEAL];
-	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
-	u16 val = 0;
-
-	switch (g_dsp.ifx_regs[DSP_FORMAT]) {
-		case 0x5:   // u8 reads
-			val = DSPHost_ReadHostMemory(Address);
-			Address++;
-			break;
-		case 0x6:   // u16 reads
-			val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
-			Address++;
-			break;
-		default:
-			ERROR_LOG(DSPLLE, "dsp_read_aram_d3() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
-			break;
-	}
-
-	if (Address >= EndAddress) 
-	{
-		// Set address back to start address. (never seen this here!)
-		Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
-	}
-
-	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
-	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
-	return val;
-}
-
-void dsp_write_aram_d3(u16 value)
-{
-	// Zelda ucode writes a bunch of zeros to ARAM through d3 during
-	// initialization.  Don't know if it ever does it later, too.
-	// Pikmin 2 Wii writes non-stop to 0x10008000-0x1000801f (non-zero values too)
-	// Zelda TP WII writes non-stop to 0x10000000-0x1000001f (non-zero values too)
-	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
-
-	switch (g_dsp.ifx_regs[DSP_FORMAT]) {
-		case 0xA:   // u16 writes
-			DSPHost_WriteHostMemory(value >> 8, Address*2);
-			DSPHost_WriteHostMemory(value & 0xFF, Address*2 + 1);
-			Address++;
-			break;
-		default:
-			ERROR_LOG(DSPLLE, "dsp_write_aram_d3() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
-			break;
-	}
-
-	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
-	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
-}
-
-u16 dsp_read_accelerator()
-{
-	const u32 EndAddress = (g_dsp.ifx_regs[DSP_ACEAH] << 16) | g_dsp.ifx_regs[DSP_ACEAL];
-	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
-	u16 val;
-
-	// let's do the "hardware" decode DSP_FORMAT is interesting - the Zelda
-	// ucode seems to indicate that the bottom two bits specify the "read size"
-	// and the address multiplier.  The bits above that may be things like sign
-	// extention and do/do not use ADPCM.  It also remains to be figured out
-	// whether there's a difference between the usual accelerator "read
-	// address" and 0xd3.
-	switch (g_dsp.ifx_regs[DSP_FORMAT])
-	{
-		case 0x00:  // ADPCM audio
-			val = ADPCM_Step(Address);
-			break;
-		case 0x0A:  // 16-bit PCM audio
-			val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
-			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
-			g_dsp.ifx_regs[DSP_YN1] = val;
-			Address++;
-			break;
-		case 0x19:  // 8-bit PCM audio
-			val = DSPHost_ReadHostMemory(Address) << 8; 
-			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
-			g_dsp.ifx_regs[DSP_YN1] = val;
-			Address++;
-			break;
-		default:
-			ERROR_LOG(DSPLLE, "dsp_read_accelerator() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
-			Address++;
-			val = 0;
-			break;
-	}
-
-	// TODO: Take GAIN into account
-	// adpcm = 0, pcm8 = 0x100, pcm16 = 0x800
-	// games using pcm8 : Phoenix Wright Ace Attorney (Wiiware), Megaman 9-10 (WiiWare)
-	// games using pcm16: gc sega games, ...
-
-	// Check for loop.
-	// Somehow, YN1 and YN2 must be initialized with their "loop" values,
-	// so yeah, it seems likely that we should raise an exception to let
-	// the DSP program do that, at least if DSP_FORMAT == 0x0A.
-	if ((Address & ~1) == (EndAddress & ~1))
-	{
-		// Set address back to start address.
-		Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
-		DSPCore_SetException(EXP_ACCOV);
-	}
-
-	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
-	g_dsp.ifx_regs[DSP_ACCAL] = Address & 0xffff;
-	return val;
-}
diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.h b/Source/Core/Core/Src/DSP/DSPAccelerator.h
deleted file mode 100644
index 05a8db63b2..0000000000
--- a/Source/Core/Core/Src/DSP/DSPAccelerator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSP_ACCELERATOR_H
-#define _DSP_ACCELERATOR_H
-
-u16 dsp_read_accelerator();
-
-u16 dsp_read_aram_d3();
-void dsp_write_aram_d3(u16 value);
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp b/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
deleted file mode 100644
index 1e5f727fa1..0000000000
--- a/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPAnalyzer.h"
-#include "DSPInterpreter.h"
-#include "DSPTables.h"
-#include "DSPMemoryMap.h"
-
-namespace DSPAnalyzer {
-
-// Holds data about all instructions in RAM.
-u8 code_flags[ISPACE];
-
-// Good candidates for idle skipping is mail wait loops. If we're time slicing
-// between the main CPU and the DSP, if the DSP runs into one of these, it might
-// as well give up its time slice immediately, after executing once.
-
-// Max signature length is 6. A 0 in a signature is ignored.
-#define NUM_IDLE_SIGS 8
-#define MAX_IDLE_SIG_SIZE 6
-
-// 0xFFFF means ignore.
-const u16 idle_skip_sigs[NUM_IDLE_SIGS][MAX_IDLE_SIG_SIZE + 1] =
-{
-	// From AX:
-	{ 0x26fc,          // LRS $30, @DMBH
-	  0x02c0, 0x8000,  // ANDCF $30, #0x8000
-	  0x029d, 0xFFFF,  // JLZ 0x027a
-	  0, 0 },     // RET
-	{ 0x27fc,          // LRS $31, @DMBH
-	  0x03c0, 0x8000,  // ANDCF $31, #0x8000
-	  0x029d, 0xFFFF,  // JLZ 0x027a
-	  0, 0 },     // RET
-	{ 0x26fe,          // LRS $30, @CMBH
-	  0x02c0, 0x8000,  // ANDCF $30, #0x8000
-	  0x029c, 0xFFFF,  // JLNZ 0x0280
-	  0, 0 },     // RET
-	{ 0x27fe,          // LRS $31, @CMBH
-	  0x03c0, 0x8000,  // ANDCF $31, #0x8000
-	  0x029c, 0xFFFF,  // JLNZ 0x0280
-	  0, 0 },     // RET
-	{ 0x26fc,			// lrs         $AC0.M, @DMBH
-	  0x02a0, 0x8000,	// andf        $AC0.M, #0x8000
-	  0x029c, 0xFFFF,	// jlnz        0x????
-	  0, 0 }, 
-	{ 0x27fc,			// lrs         $AC1.M, @DMBH
-	  0x03a0, 0x8000,	// andf        $AC1.M, #0x8000
-	  0x029c, 0xFFFF,	// jlnz        0x????
-	  0, 0 }, 
-	// From Zelda:
-	{ 0x00de, 0xFFFE,  // LR $AC0.M, @CMBH
-	  0x02c0, 0x8000,  // ANDCF $AC0.M, #0x8000 
-	  0x029c, 0xFFFF,  // JLNZ 0x05cf
-	  0 },
-	// From Zelda - experimental
-	{ 0x00da, 0x0352, // lr          $AX0.H, @0x0352
-	  0x8600,         // tstaxh      $AX0.H
-	  0x0295, 0xFFFF, // jz          0x???? 
-	  0, 0 }
-};
-
-void Reset()
-{
-	memset(code_flags, 0, sizeof(code_flags));
-}
-
-void AnalyzeRange(int start_addr, int end_addr)
-{
-	// First we run an extremely simplified version of a disassembler to find
-	// where all instructions start.
-
-	// This may not be 100% accurate in case of jump tables!
-	// It could get desynced, which would be bad. We'll see if that's an issue.
-	u16 last_arithmetic = 0;
-	for (int addr = start_addr; addr < end_addr;)
-	{
-		UDSPInstruction inst = dsp_imem_read(addr);
-		const DSPOPCTemplate *opcode = GetOpTemplate(inst);
-		if (!opcode)
-		{
-			addr++;
-			continue;
-		}
-		code_flags[addr] |= CODE_START_OF_INST;
-		// Look for loops.
-		if ((inst & 0xffe0) == 0x0060 || (inst & 0xff00) == 0x1100)
-		{
-			// BLOOP, BLOOPI
-			u16 loop_end = dsp_imem_read(addr + 1);
-			code_flags[addr] |= CODE_LOOP_START;
-			code_flags[loop_end] |= CODE_LOOP_END;
-		}
-		else if ((inst & 0xffe0) == 0x0040 || (inst & 0xff00) == 0x1000)
-		{
-			// LOOP, LOOPI
-			code_flags[addr] |= CODE_LOOP_START;
-			code_flags[addr + 1] |= CODE_LOOP_END;
-		}
-
-		// Mark the last arithmetic/multiplier instruction before a branch.
-		// We must update the SR reg at these instructions
-		if (opcode->updates_sr)
-		{
-			last_arithmetic = addr;
-		}
-
-		if (opcode->branch && !opcode->uncond_branch)
-		{
-			code_flags[last_arithmetic] |= CODE_UPDATE_SR;
-		}
-
-		// If an instruction potentially raises exceptions, mark the following
-		// instruction as needing to check for exceptions
-		if (opcode->opcode == 0x00c0 || 
-			opcode->opcode == 0x1800 || 
-			opcode->opcode == 0x1880 || 
-			opcode->opcode == 0x1900 || 
-			opcode->opcode == 0x1980 || 
-			opcode->opcode == 0x2000 ||
-			opcode->extended
-			)
-		code_flags[addr + opcode->size] |= CODE_CHECK_INT;
-
-		addr += opcode->size;
-	}
-
-	// Next, we'll scan for potential idle skips.
-	for (int s = 0; s < NUM_IDLE_SIGS; s++)
-	{
-		for (int addr = start_addr; addr < end_addr; addr++)
-		{
-			bool found = false;
-			for (int i = 0; i < MAX_IDLE_SIG_SIZE + 1; i++)
-			{
-				if (idle_skip_sigs[s][i] == 0)
-					found = true;
-				if (idle_skip_sigs[s][i] == 0xFFFF)
-					continue;
-				if (idle_skip_sigs[s][i] != dsp_imem_read(addr + i))
-					break;
-			}
-			if (found)
-			{
-				INFO_LOG(DSPLLE, "Idle skip location found at %02x (sigNum:%d)", addr, s+1);
-				code_flags[addr] |= CODE_IDLE_SKIP;
-			}
-		}
-	}
-	INFO_LOG(DSPLLE, "Finished analysis.");
-}
-
-void Analyze()
-{
-	Reset();
-	AnalyzeRange(0x0000, 0x1000);  // IRAM
-	AnalyzeRange(0x8000, 0x9000);  // IROM
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPAnalyzer.h b/Source/Core/Core/Src/DSP/DSPAnalyzer.h
deleted file mode 100644
index 82cfab9ecc..0000000000
--- a/Source/Core/Core/Src/DSP/DSPAnalyzer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Basic code analysis.
-
-#include "DSPInterpreter.h"
-
-namespace DSPAnalyzer {
-
-#define ISPACE 65536
-
-// Useful things to detect:
-// * Loop endpoints - so that we can avoid checking for loops every cycle.
-
-enum
-{
-	CODE_START_OF_INST = 1,
-	CODE_IDLE_SKIP = 2,
-	CODE_LOOP_START = 4,
-	CODE_LOOP_END = 8,
-	CODE_UPDATE_SR = 16,
-	CODE_CHECK_INT = 32,
-};
-
-// Easy to query array covering the whole of instruction memory.
-// Just index by address.
-// This one will be helpful for debuggers and jits.
-extern u8 code_flags[ISPACE];
-
-// This one should be called every time IRAM changes - which is basically
-// every time that a new ucode gets uploaded, and never else. At that point,
-// we can do as much static analysis as we want - but we should always throw
-// all old analysis away. Luckily the entire address space is only 64K code
-// words and the actual code space 8K instructions in total, so we can do
-// some pretty expensive analysis if necessary.
-void Analyze();
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
deleted file mode 100644
index 73e2c1f8b4..0000000000
--- a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <iostream>
-#include <vector>
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "DSPCodeUtil.h"
-#include "assemble.h"
-#include "disassemble.h"
-
-
-bool Assemble(const char *text, std::vector<u16> &code, bool force)
-{
-	AssemblerSettings settings;
-	//	settings.pc = 0;
-	// settings.decode_registers = false;
-	// settings.decode_names = false;
-	settings.force = force;
-	//	settings.print_tabs = false;
-	//	settings.ext_separator = '\'';
-
-	// TODO: fix the terrible api of the assembler.
-	DSPAssembler assembler(settings);
-	if (!assembler.Assemble(text, code))
-	{
-		std::cerr << assembler.GetErrorString() << std::endl;
-		return false;
-	}
-
-	return true;
-}
-
-bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text)
-{
-	if (code.empty())
-		return false;
-
-	AssemblerSettings settings;
-
-	// These two prevent roundtripping.
-	settings.show_hex = true;
-	settings.show_pc = line_numbers;
-	settings.ext_separator = '\'';
-	settings.decode_names = true;
-	settings.decode_registers = true;
-
-	DSPDisassembler disasm(settings);
-	bool success = disasm.Disassemble(0, code, 0x0000, text);
-	return success;
-}
-
-bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2)
-{		
-	if (code1.size() != code2.size())
-		printf("Size difference! 1=%i 2=%i\n", (int)code1.size(), (int)code2.size());
-	u32 count_equal = 0;
-	const int min_size = (int)std::min(code1.size(), code2.size());
-
-	AssemblerSettings settings;
-	DSPDisassembler disassembler(settings);
-	for (int i = 0; i < min_size; i++)
-	{
-		if (code1[i] == code2[i])
-		{
-			count_equal++;
-		}
-		else
-		{
-			std::string line1, line2;
-			u16 pc = i;
-			disassembler.DisOpcode(&code1[0], 0x0000, 2, &pc, line1);
-			pc = i;
-			disassembler.DisOpcode(&code2[0], 0x0000, 2, &pc, line2);
-			printf("!! %04x : %04x vs %04x - %s  vs  %s\n", i, code1[i], code2[i], line1.c_str(), line2.c_str());
-		}
-	}
-	if (code2.size() != code1.size())
-	{
-		printf("Extra code words:\n");
-		const std::vector<u16> &longest = code1.size() > code2.size() ? code1 : code2;
-		for (int i = min_size; i < (int)longest.size(); i++)
-		{
-			u16 pc = i;
-			std::string line;
-			disassembler.DisOpcode(&longest[0], 0x0000, 2, &pc, line);
-			printf("!! %s\n", line.c_str());
-		}
-	}
-	printf("Equal instruction words: %i / %i\n", count_equal, min_size);
-	return code1.size() == code2.size() && code1.size() == count_equal;
-}
-
-void GenRandomCode(u32 size, std::vector<u16> &code) 
-{
-	code.resize(size);
-	for (u32 i = 0; i < size; i++)
-	{
-		code[i] = rand() ^ (rand() << 8);
-	}
-}
-
-void CodeToHeader(const std::vector<u16> &code, std::string _filename,
-				  const char *name, std::string &header)
-{
-	std::vector<u16> code_padded = code;
-	// Pad with nops to 32byte boundary
-	while (code_padded.size() & 0x7f)
-		code_padded.push_back(0);
-
-	char buffer[1024];
-	header.clear();
-	header.reserve(code_padded.size() * 4);
-	header.append("#define NUM_UCODES 1\n\n");
-	std::string filename;
-	SplitPath(_filename, NULL, &filename, NULL);
-	header.append(StringFromFormat("const char* UCODE_NAMES[NUM_UCODES] = {\"%s\"};\n\n", filename.c_str()));
-	header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n");
-
-	header.append("\t{\n\t\t");
-	for (u32 j = 0; j < code_padded.size(); j++)
-	{
-		if (j && ((j & 15) == 0))
-			header.append("\n\t\t");
-		sprintf(buffer, "0x%04x, ", code_padded[j]);
-		header.append(buffer);
-	}
-	header.append("\n\t},\n");
-
-	header.append("};\n");
-}
-
-void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string>* filenames,
-				   u32 numCodes, const char *name, std::string &header)
-{
-	std::vector<std::vector<u16> > codes_padded;
-	char buffer[1024];
-	u32 reserveSize = 0;
-	for(u32 i = 0; i < numCodes; i++)
-	{
-		codes_padded.push_back(codes[i]);
-		// Pad with nops to 32byte boundary
-		while (codes_padded.at(i).size() & 0x7f)
-			codes_padded.at(i).push_back(0);
-
-		reserveSize += (u32)codes_padded.at(i).size();
-	}
-
-	
-	header.clear();
-	header.reserve(reserveSize * 4);
-	sprintf(buffer, "#define NUM_UCODES %u\n\n", numCodes);
-	header.append(buffer);
-	header.append("const char* UCODE_NAMES[NUM_UCODES] = {\n");
-	for (u32 i = 0; i < numCodes; i++)
-	{
-		std::string filename;
-		if (! SplitPath(filenames->at(i), NULL, &filename, NULL))
-			filename = filenames->at(i);
-		sprintf(buffer, "\t\"%s\",\n", filename.c_str());
-		header.append(buffer);
-	}
-	header.append("};\n\n");
-	header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n");
-
-	for(u32 i = 0; i < numCodes; i++)
-	{
-		if(codes[i].size() == 0)
-			continue;
-
-		header.append("\t{\n\t\t");
-		for (u32 j = 0; j < codes_padded.at(i).size(); j++) 
-		{
-			if (j && ((j & 15) == 0))
-				header.append("\n\t\t");
-			sprintf(buffer, "0x%04x, ", codes_padded.at(i).at(j));
-			header.append(buffer);
-		}
-		header.append("\n\t},\n");
-	}
-	header.append("};\n");
-}
-
-void CodeToBinaryStringBE(const std::vector<u16> &code, std::string &str)
-{
-	str.resize(code.size() * 2);
-	for (size_t i = 0; i < code.size(); i++)
-	{
-		str[i * 2 + 0] = code[i] >> 8;
-		str[i * 2 + 1] = code[i] & 0xff;
-	}
-}
-
-void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code)
-{
-	code.resize(str.size() / 2);
-	for (size_t i = 0; i < code.size(); i++)
-	{
-		code[i] = ((u16)(u8)str[i * 2 + 0] << 8) | ((u16)(u8)str[i * 2 + 1]);
-	}
-}
-
-bool LoadBinary(const char *filename, std::vector<u16> &code)
-{
-	std::string buffer;
-	if (!File::ReadFileToString(false, filename, buffer))
-		return false;
-
-	BinaryStringBEToCode(buffer, code);
-	return true;
-}
-
-bool SaveBinary(const std::vector<u16> &code, const char *filename)
-{
-	std::string buffer;
-	CodeToBinaryStringBE(code, buffer);
-	if (!File::WriteStringToFile(false, buffer, filename))
-		return false;
-	return true;
-}
diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.h b/Source/Core/Core/Src/DSP/DSPCodeUtil.h
deleted file mode 100644
index b1b05c5329..0000000000
--- a/Source/Core/Core/Src/DSP/DSPCodeUtil.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPCODEUTIL_H
-#define _DSPCODEUTIL_H
-
-#include <string>
-#include <vector>
-
-#include "Common.h"
-
-bool Assemble(const char *text, std::vector<u16> &code, bool force = false);
-bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text);
-bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2);
-void GenRandomCode(u32 size, std::vector<u16> &code);
-void CodeToHeader(const std::vector<u16> &code, std::string _filename,
-				  const char *name, std::string &header);
-void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string> *filenames,
-				   u32 numCodes, const char *name, std::string &header);
-
-// Big-endian, for writing straight to file using File::WriteStringToFile.
-void CodeToBinaryStringBE(const std::vector<u16> &code, std::string &str);
-void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code);
-
-// Load code (big endian binary).
-bool LoadBinary(const char *filename, std::vector<u16> &code);
-bool SaveBinary(const std::vector<u16> &code, const char *filename);
-
-#endif  // _DSPCODEUTIL_H
diff --git a/Source/Core/Core/Src/DSP/DSPCommon.h b/Source/Core/Core/Src/DSP/DSPCommon.h
deleted file mode 100644
index f8abd6ed8a..0000000000
--- a/Source/Core/Core/Src/DSP/DSPCommon.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __DSPCOMMON_H
-#define __DSPCOMMON_H
-
-#include "CommonTypes.h"
-typedef u16 UDSPInstruction;
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPCore.cpp b/Source/Core/Core/Src/DSP/DSPCore.cpp
deleted file mode 100644
index 64206b3ee0..0000000000
--- a/Source/Core/Core/Src/DSP/DSPCore.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_interpreter.cpp
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include "Common.h"
-#include "Hash.h"
-#include "Thread.h"
-#include "DSPCore.h"
-#include "DSPEmitter.h"
-#include "DSPHost.h"
-#include "DSPAnalyzer.h"
-#include "MemoryUtil.h"
-#include "FileUtil.h"
-
-#include "DSPHWInterface.h"
-#include "DSPIntUtil.h"
-
-SDSP g_dsp;
-DSPBreakpoints dsp_breakpoints;
-DSPCoreState core_state = DSPCORE_STOP;
-u16 cyclesLeft = 0;
-bool init_hax = false;
-DSPEmitter *dspjit = NULL;
-Common::Event step_event;
-
-static bool LoadRom(const char *fname, int size_in_words, u16 *rom)
-{
-	File::IOFile pFile(fname, "rb");
-	const size_t size_in_bytes = size_in_words * sizeof(u16);
-	if (pFile)
-	{
-		pFile.ReadArray(rom, size_in_words);
-		pFile.Close();
-	
-		// Byteswap the rom.
-		for (int i = 0; i < size_in_words; i++)
-			rom[i] = Common::swap16(rom[i]);
-
-		// Always keep ROMs write protected.
-		WriteProtectMemory(rom, size_in_bytes, false);
-		return true;
-	}
-
-	PanicAlertT(
-		"Failed to load DSP ROM:\t%s\n"
-		"\n"
-		"This file is required to use DSP LLE.\n"
-		"It is not included with Dolphin as it contains copyrighted data.\n"
-		"Use DSPSpy to dump the file from your physical console.\n"
-		"\n"
-		"You may use the DSP HLE engine which does not require ROM dumps.\n"
-		"(Choose it from the \"Audio\" tab of the configuration dialog.)", fname);
-	return false;
-}
-
-// Returns false iff the hash fails and the user hits "Yes"
-static bool VerifyRoms(const char *irom_filename, const char *coef_filename)
-{
-	struct DspRomHashes
-	{
-		u32 hash_irom;		// dsp_rom.bin
-		u32 hash_drom;		// dsp_coef.bin
-	} KNOWN_ROMS[] = {
-		// Official Nintendo ROM
-		{ 0x66f334fe, 0xf3b93527 },
-
-		// LM1234 replacement ROM (Zelda UCode only)
-		{ 0x9c8f593c, 0x10000001 },
-
-		// delroth's improvement on LM1234 replacement ROM (Zelda and AX only,
-		// IPL/Card/GBA still broken)
-		{ 0xd9907f71, 0xb019c2fb }
-	};
-
-	u32 hash_irom = HashAdler32((u8*)g_dsp.irom, DSP_IROM_BYTE_SIZE);
-	u32 hash_drom = HashAdler32((u8*)g_dsp.coef, DSP_COEF_BYTE_SIZE);
-	int rom_idx = -1;
-
-	for (u32 i = 0; i < sizeof (KNOWN_ROMS) / sizeof (KNOWN_ROMS[0]); ++i)
-	{
-		DspRomHashes& rom = KNOWN_ROMS[i];
-		if (hash_irom == rom.hash_irom && hash_drom == rom.hash_drom)
-			rom_idx = i;
-	}
-
-	if (rom_idx < 0)
-	{
-		if (AskYesNoT("Your DSP ROMs have incorrect hashes.\n"
-			"Would you like to stop now to fix the problem?\n"
-			"If you select \"No\", audio might be garbled."))
-			return false;
-	}
-
-	if (rom_idx == 1)
-		PanicAlertT("You are using an old free DSP ROM made by the Dolphin Team.\n"
-					"Only games using the Zelda UCode will work correctly.\n");
-
-	if (rom_idx == 2)
-		PanicAlertT("You are using a free DSP ROM made by the Dolphin Team.\n"
-					"All Wii games will work correctly, and most GC games should "
-					"also work fine, but the GBA/IPL/CARD UCodes will not work.\n");
-
-	return true;
-}
-
-static void DSPCore_FreeMemoryPages()
-{
-	FreeMemoryPages(g_dsp.irom, DSP_IROM_BYTE_SIZE);
-	FreeMemoryPages(g_dsp.iram, DSP_IRAM_BYTE_SIZE);
-	FreeMemoryPages(g_dsp.dram, DSP_DRAM_BYTE_SIZE);
-	FreeMemoryPages(g_dsp.coef, DSP_COEF_BYTE_SIZE);
-}
-
-bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
-				  bool bUsingJIT)
-{
-	g_dsp.step_counter = 0;
-	cyclesLeft = 0;
-	init_hax = false;
-	dspjit = NULL;
-	
-	g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
-	g_dsp.iram = (u16*)AllocateMemoryPages(DSP_IRAM_BYTE_SIZE);
-	g_dsp.dram = (u16*)AllocateMemoryPages(DSP_DRAM_BYTE_SIZE);
-	g_dsp.coef = (u16*)AllocateMemoryPages(DSP_COEF_BYTE_SIZE);
-
-	// Fill roms with zeros.
-	memset(g_dsp.irom, 0, DSP_IROM_BYTE_SIZE);
-	memset(g_dsp.coef, 0, DSP_COEF_BYTE_SIZE);
-
-	// Try to load real ROM contents.
-	if (!LoadRom(irom_filename, DSP_IROM_SIZE, g_dsp.irom) ||
-			!LoadRom(coef_filename, DSP_COEF_SIZE, g_dsp.coef) ||
-			!VerifyRoms(irom_filename, coef_filename))
-	{
-		DSPCore_FreeMemoryPages();
-		return false;
-	}
-
-	memset(&g_dsp.r,0,sizeof(g_dsp.r));
-
-	for (int i = 0; i < 4; i++)
-	{
-		g_dsp.reg_stack_ptr[i] = 0;
-		for (int j = 0; j < DSP_STACK_DEPTH; j++)
-		{
-			g_dsp.reg_stack[i][j] = 0;
-		}
-	}
-
-	// Fill IRAM with HALT opcodes.
-	for (int i = 0; i < DSP_IRAM_SIZE; i++)
-	{
-		g_dsp.iram[i] = 0x0021; // HALT opcode
-	}
-
-	// Just zero out DRAM.
-	for (int i = 0; i < DSP_DRAM_SIZE; i++)
-	{
-		g_dsp.dram[i] = 0;
-	}
-
-	// Copied from a real console after the custom UCode has been loaded.
-	// These are the indexing wrapping registers.
-	g_dsp.r.wr[0] = 0xffff;
-	g_dsp.r.wr[1] = 0xffff;
-	g_dsp.r.wr[2] = 0xffff;
-	g_dsp.r.wr[3] = 0xffff;
-
-	g_dsp.r.sr |= SR_INT_ENABLE;
-	g_dsp.r.sr |= SR_EXT_INT_ENABLE;
-
-	g_dsp.cr = 0x804;
-	gdsp_ifx_init();
-	// Mostly keep IRAM write protected. We unprotect only when DMA-ing
-	// in new ucodes.
-	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
-
-	// Initialize JIT, if necessary
-	if(bUsingJIT) 
-		dspjit = new DSPEmitter();
-
-	core_state = DSPCORE_RUNNING;
-	return true;
-}
-
-void DSPCore_Shutdown()
-{
-	if (core_state == DSPCORE_STOP)
-		return;
-
-	core_state = DSPCORE_STOP;
-
-	if(dspjit) {
-		delete dspjit;
-		dspjit = NULL;
-	}
-	DSPCore_FreeMemoryPages();
-}
-
-void DSPCore_Reset()
-{
-	g_dsp.pc = DSP_RESET_VECTOR;
-
-	g_dsp.r.wr[0] = 0xffff;
-	g_dsp.r.wr[1] = 0xffff;
-	g_dsp.r.wr[2] = 0xffff;
-	g_dsp.r.wr[3] = 0xffff;
-
-	DSPAnalyzer::Analyze();
-}
-
-void DSPCore_SetException(u8 level)
-{
-	g_dsp.exceptions |= 1 << level;
-}
-
-// Notify that an external interrupt is pending (used by thread mode)
-void DSPCore_SetExternalInterrupt(bool val)
-{
-	g_dsp.external_interrupt_waiting = val;
-}
-
-// Coming from the CPU
-void DSPCore_CheckExternalInterrupt()
-{
-	if (! dsp_SR_is_flag_set(SR_EXT_INT_ENABLE))
-		return;
-
-	// Signal the SPU about new mail
-	DSPCore_SetException(EXP_INT);
-	
-	g_dsp.cr &= ~CR_EXTERNAL_INT;
-}
-
-
-void DSPCore_CheckExceptions()
-{
-	// Early out to skip the loop in the common case.
-	if (g_dsp.exceptions == 0)
-		return;
-
-	for (int i = 7; i > 0; i--)
-	{
-		// Seems exp int are not masked by sr_int_enable
-		if (g_dsp.exceptions & (1 << i))
-		{
-			if (dsp_SR_is_flag_set(SR_INT_ENABLE) || (i == EXP_INT))
-			{
-				// store pc and sr until RTI
-				dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
-				dsp_reg_store_stack(DSP_STACK_D, g_dsp.r.sr);
-
-				g_dsp.pc = i * 2;
-				g_dsp.exceptions &= ~(1 << i);
-				if (i == 7)
-					g_dsp.r.sr &= ~SR_EXT_INT_ENABLE;
-				else
-					g_dsp.r.sr &= ~SR_INT_ENABLE;
-				break;
-			}
-			else
-			{
-#if defined(_DEBUG) || defined(DEBUGFAST)
-				ERROR_LOG(DSPLLE, "Firing exception %d failed", i);
-#endif
-			}
-		}
-	}
-}
-
-// Delegate to JIT or interpreter as appropriate.
-// Handle state changes and stepping.
-int DSPCore_RunCycles(int cycles)
-{
-	if (dspjit)
-	{
-		if (g_dsp.external_interrupt_waiting)
-		{
-			DSPCore_CheckExternalInterrupt();
-			DSPCore_CheckExceptions();
-			DSPCore_SetExternalInterrupt(false);
-		}
-
-		cyclesLeft = cycles;
-		DSPCompiledCode pExecAddr = (DSPCompiledCode)dspjit->enterDispatcher;
-		pExecAddr();
-
-		if (g_dsp.reset_dspjit_codespace)
-			dspjit->ClearIRAMandDSPJITCodespaceReset();
-
-		return cyclesLeft;
-	}
-
-	while (cycles > 0)
-	{
-		switch (core_state)
-		{
-		case DSPCORE_RUNNING:
-			// Seems to slow things down
-#if defined(_DEBUG) || defined(DEBUGFAST)
-			cycles = DSPInterpreter::RunCyclesDebug(cycles);
-#else
-			cycles = DSPInterpreter::RunCycles(cycles);
-#endif
-			break;
-
-		case DSPCORE_STEPPING:
-			step_event.Wait();
-			if (core_state != DSPCORE_STEPPING)
-				continue;
-
-			DSPInterpreter::Step();
-			cycles--;
-
-			DSPHost_UpdateDebugger();
-			break;
-		case DSPCORE_STOP:
-			break;
-		}
-	}
-	return cycles;
-}
-
-void DSPCore_SetState(DSPCoreState new_state)
-{
-	core_state = new_state;
-	// kick the event, in case we are waiting
-	if (new_state == DSPCORE_RUNNING)
-		step_event.Set();
-	// Sleep(10);
-	DSPHost_UpdateDebugger();
-}
-
-DSPCoreState DSPCore_GetState()
-{
-	return core_state;
-}
-
-void DSPCore_Step()
-{
-	if (core_state == DSPCORE_STEPPING)
-		step_event.Set();
-}
-
-void CompileCurrent()
-{
-	dspjit->Compile(g_dsp.pc);
-
-	bool retry = true;
-
-	while (retry)
-	{
-		retry = false;
-		for(u16 i = 0x0000; i < 0xffff; ++i)
-		{
-			if (!dspjit->unresolvedJumps[i].empty())
-			{
-				u16 addrToCompile = dspjit->unresolvedJumps[i].front();
-				dspjit->Compile(addrToCompile);
-				if (!dspjit->unresolvedJumps[i].empty())
-					retry = true;
-			}
-		}
-	}
-}
-
-u16 DSPCore_ReadRegister(int reg)
-{
-	switch(reg)
-	{
-	case DSP_REG_AR0:
-	case DSP_REG_AR1:
-	case DSP_REG_AR2:
-	case DSP_REG_AR3:
-		return g_dsp.r.ar[reg - DSP_REG_AR0];
-	case DSP_REG_IX0:
-	case DSP_REG_IX1:
-	case DSP_REG_IX2:
-	case DSP_REG_IX3:
-		return g_dsp.r.ix[reg - DSP_REG_IX0];
-	case DSP_REG_WR0:
-	case DSP_REG_WR1:
-	case DSP_REG_WR2:
-	case DSP_REG_WR3:
-		return g_dsp.r.wr[reg - DSP_REG_WR0];
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		return g_dsp.r.st[reg - DSP_REG_ST0];
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		return g_dsp.r.ac[reg - DSP_REG_ACH0].h;
-	case DSP_REG_CR:     return g_dsp.r.cr;
-	case DSP_REG_SR:     return g_dsp.r.sr;
-	case DSP_REG_PRODL:  return g_dsp.r.prod.l;
-	case DSP_REG_PRODM:  return g_dsp.r.prod.m;
-	case DSP_REG_PRODH:  return g_dsp.r.prod.h;
-	case DSP_REG_PRODM2: return g_dsp.r.prod.m2;
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		return g_dsp.r.ax[reg - DSP_REG_AXL0].l;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		return g_dsp.r.ax[reg - DSP_REG_AXH0].h;
-	case DSP_REG_ACL0:
-	case DSP_REG_ACL1:
-		return g_dsp.r.ac[reg - DSP_REG_ACL0].l;
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-		return g_dsp.r.ac[reg - DSP_REG_ACM0].m;
-	default:
-		_assert_msg_(DSP_CORE, 0, "cannot happen");
-		return 0;
-	}
-}
-
-void DSPCore_WriteRegister(int reg, u16 val)
-{
-	switch(reg)
-	{
-	case DSP_REG_AR0:
-	case DSP_REG_AR1:
-	case DSP_REG_AR2:
-	case DSP_REG_AR3:
-		g_dsp.r.ar[reg - DSP_REG_AR0] = val;
-		break;
-	case DSP_REG_IX0:
-	case DSP_REG_IX1:
-	case DSP_REG_IX2:
-	case DSP_REG_IX3:
-		g_dsp.r.ix[reg - DSP_REG_IX0] = val;
-		break;
-	case DSP_REG_WR0:
-	case DSP_REG_WR1:
-	case DSP_REG_WR2:
-	case DSP_REG_WR3:
-		g_dsp.r.wr[reg - DSP_REG_WR0] = val;
-		break;
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		g_dsp.r.st[reg - DSP_REG_ST0] = val;
-		break;
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		g_dsp.r.ac[reg - DSP_REG_ACH0].h = val;
-		break;
-	case DSP_REG_CR:     g_dsp.r.cr = val; break;
-	case DSP_REG_SR:     g_dsp.r.sr = val; break;
-	case DSP_REG_PRODL:  g_dsp.r.prod.l = val; break;
-	case DSP_REG_PRODM:  g_dsp.r.prod.m = val; break;
-	case DSP_REG_PRODH:  g_dsp.r.prod.h = val; break;
-	case DSP_REG_PRODM2: g_dsp.r.prod.m2 = val; break;
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		g_dsp.r.ax[reg - DSP_REG_AXL0].l = val;
-		break;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		g_dsp.r.ax[reg - DSP_REG_AXH0].h = val;
-		break;
-	case DSP_REG_ACL0:
-	case DSP_REG_ACL1:
-		g_dsp.r.ac[reg - DSP_REG_ACL0].l = val;
-		break;
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-		g_dsp.r.ac[reg - DSP_REG_ACM0].m = val;
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/DSP/DSPCore.h b/Source/Core/Core/Src/DSP/DSPCore.h
deleted file mode 100644
index de5b309e13..0000000000
--- a/Source/Core/Core/Src/DSP/DSPCore.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*====================================================================
-
-   filename:     DSPCore.h
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _DSPCORE_H
-#define _DSPCORE_H
-
-#include "Thread.h"
-
-#include "DSPBreakpoints.h"
-#include "DSPEmitter.h"
-
-#define DSP_IRAM_BYTE_SIZE	0x2000
-#define DSP_IRAM_SIZE		0x1000
-#define DSP_IRAM_MASK		0x0fff
-
-#define DSP_IROM_BYTE_SIZE	0x2000
-#define DSP_IROM_SIZE		0x1000
-#define DSP_IROM_MASK		0x0fff
-
-#define DSP_DRAM_BYTE_SIZE	0x2000
-#define DSP_DRAM_SIZE		0x1000
-#define DSP_DRAM_MASK		0x0fff
-
-#define DSP_COEF_BYTE_SIZE	0x1000
-#define DSP_COEF_SIZE		0x800
-#define DSP_COEF_MASK		0x7ff
-
-#define DSP_RESET_VECTOR	0x8000
-
-#define DSP_STACK_DEPTH	0x20
-#define DSP_STACK_MASK	0x1f
-
-#define DSP_CR_IMEM		2
-#define DSP_CR_DMEM		0
-#define DSP_CR_TO_CPU	1
-#define DSP_CR_FROM_CPU	0
-
-
-// Register table taken from libasnd
-#define DSP_REG_AR0		0x00 // address registers
-#define DSP_REG_AR1		0x01
-#define DSP_REG_AR2		0x02
-#define DSP_REG_AR3		0x03
-
-#define DSP_REG_IX0		0x04 // indexing registers (actually, mostly used as increments)
-#define DSP_REG_IX1		0x05
-#define DSP_REG_IX2		0x06
-#define DSP_REG_IX3		0x07
-
-#define DSP_REG_WR0		0x08 // address wrapping registers. should be initialized to 0xFFFF if not used.
-#define DSP_REG_WR1		0x09
-#define DSP_REG_WR2		0x0a
-#define DSP_REG_WR3		0x0b
-
-#define DSP_REG_ST0		0x0c // stacks.
-#define DSP_REG_ST1		0x0d
-#define DSP_REG_ST2		0x0e
-#define DSP_REG_ST3		0x0f
-
-#define DSP_REG_CR		0x12 // Seems to be the top 8 bits of LRS/SRS.
-#define DSP_REG_SR		0x13
-
-#define DSP_REG_PRODL	0x14 // product.
-#define DSP_REG_PRODM	0x15
-#define DSP_REG_PRODH	0x16
-#define DSP_REG_PRODM2	0x17
-
-#define DSP_REG_AXL0	0x18
-#define DSP_REG_AXL1	0x19
-#define DSP_REG_AXH0	0x1a
-#define DSP_REG_AXH1	0x1b
-
-#define DSP_REG_ACC0	0x1c // accumulator (global)
-#define DSP_REG_ACC1	0x1d
-
-#define DSP_REG_ACL0	0x1c // Low accumulator
-#define DSP_REG_ACL1	0x1d
-#define DSP_REG_ACM0	0x1e // Mid accumulator
-#define DSP_REG_ACM1	0x1f
-#define DSP_REG_ACH0	0x10 // Sign extended 8 bit register 0
-#define DSP_REG_ACH1	0x11 // Sign extended 8 bit register 1
-
-// Hardware registers address
-
-#define DSP_COEF_A1_0	0xa0
-
-#define DSP_DSCR		0xc9 // DSP DMA Control Reg
-#define DSP_DSPA		0xcd // DSP DMA Address (DSP)
-#define DSP_DSBL		0xcb // DSP DMA Block Length
-#define DSP_DSMAH		0xce // DSP DMA Address High (External)
-#define DSP_DSMAL		0xcf // DSP DMA Address Low (External)
-
-#define DSP_FORMAT		0xd1 // Sample format
-#define DSP_ACUNK		0xd2 // Set to 3 on my dumps
-#define DSP_ACDATA1		0xd3 // used only by Zelda ucodes
-#define DSP_ACSAH		0xd4 // Start of loop
-#define DSP_ACSAL		0xd5
-#define DSP_ACEAH		0xd6 // End of sample (and loop)
-#define DSP_ACEAL		0xd7
-#define DSP_ACCAH		0xd8 // Current playback position
-#define DSP_ACCAL		0xd9
-#define DSP_PRED_SCALE	0xda // ADPCM predictor and scale
-#define DSP_YN1			0xdb
-#define DSP_YN2			0xdc
-#define DSP_ACCELERATOR	0xdd // ADPCM accelerator read. Used by AX.
-#define DSP_GAIN		0xde
-#define DSP_ACUNK2		0xdf // Set to 0xc on my dumps
-
-#define DSP_AMDM		0xef // ARAM DMA Request Mask 0: DMA with ARAM unmasked 1: masked
-
-#define DSP_DIRQ		0xfb // DSP Irq Rest
-#define DSP_DMBH		0xfc // DSP Mailbox H
-#define DSP_DMBL		0xfd // DSP Mailbox L
-#define DSP_CMBH		0xfe // CPU Mailbox H
-#define DSP_CMBL		0xff // CPU Mailbox L
-
-#define DMA_TO_DSP		0
-#define DMA_TO_CPU		1
-
-// Stacks
-#define DSP_STACK_C		0
-#define DSP_STACK_D		1
-
-// cr (Not g_dsp.r[CR]) bits
-// See HW/DSP.cpp.
-#define CR_EXTERNAL_INT	0x0002
-#define CR_HALT			0x0004
-#define CR_INIT			0x0400
-
-
-// SR bits
-#define SR_CARRY			0x0001
-#define SR_OVERFLOW			0x0002
-#define SR_ARITH_ZERO		0x0004
-#define SR_SIGN				0x0008
-#define SR_OVER_S32			0x0010 // set when there was mod/tst/cmp on accu and result is over s32
-#define SR_TOP2BITS			0x0020 // if the upper (ac?.m/ax?.h) 2 bits are equal
-#define SR_LOGIC_ZERO		0x0040
-#define SR_OVERFLOW_STICKY	0x0080 // set at the same time as 0x2 (under same conditions) - but not cleared the same
-#define SR_100				0x0100 // unknown
-#define SR_INT_ENABLE		0x0200 // Not 100% sure but duddie says so. This should replace the hack, if so.
-#define SR_400				0x0400 // unknown
-#define SR_EXT_INT_ENABLE	0x0800 // Appears in zelda - seems to disable external interrupts
-#define SR_1000				0x1000 // unknown
-#define SR_MUL_MODIFY		0x2000 // 1 = normal. 0 = x2   (M0, M2) (Free mul by 2)
-#define SR_40_MODE_BIT		0x4000 // 0 = "16", 1 = "40"  (SET16, SET40)  Controls sign extension when loading mid accums and data saturation for stores from mid accums.
-#define SR_MUL_UNSIGNED		0x8000 // 0 = normal. 1 = unsigned  (CLR15, SET15) If set, treats ax?.l as unsigned (MULX family only).
-
-// This should be the bits affected by CMP. Does not include logic zero.
-#define SR_CMP_MASK		0x3f
-
-// exceptions vector
-#define EXP_STOVF		1 // 0x0002 stack under/over flow
-#define EXP_2			2 // 0x0004
-#define EXP_3			3 // 0x0006
-#define EXP_4			4 // 0x0008
-#define EXP_ACCOV		5 // 0x000a accelerator address overflow
-#define EXP_6			6 // 0x000c
-#define EXP_INT			7 // 0x000e external int (message from cpu)
-
-typedef struct {
-	u16 ar[4];
-	u16 ix[4];
-	u16 wr[4];
-	u16 st[4];
-	u16 cr;
-	u16 sr;
-	union {
-		u64 val;
-		struct {
-			u16 l;
-			u16 m;
-			u16 h;
-			u16 m2;//if this gets in the way, drop it.
-		};
-	} prod;
-	union {
-		u32 val;
-		struct {
-			u16 l;
-			u16 h;
-		};
-	} ax[2];
-	union {
-		u64 val;
-		struct {
-			u16 l;
-			u16 m;
-			u16 h;
-		};
-	} ac[2];
-} DSP_Regs;
-
-// All the state of the DSP should be in this struct. Any DSP state that is not filled on init
-// should be moved here.
-struct SDSP
-{
-	DSP_Regs r;
-	u16 pc;
-#if PROFILE
-	u16 err_pc;
-#endif
-	
-	// This is NOT the same cr as r.cr.
-	// This register is shared with the main emulation, see DSP.cpp
-	// The engine has control over 0x0C07 of this reg.
-	// Bits are defined in a struct in DSP.cpp.
-	u16 cr;
-
-	u8 reg_stack_ptr[4];
-	u8 exceptions;   // pending exceptions
-	volatile bool external_interrupt_waiting;
-	bool reset_dspjit_codespace;
-
-	// DSP hardware stacks. They're mapped to a bunch of registers, such that writes
-	// to them push and reads pop.
-	// Let's make stack depth 32 for now, which is way more than what's needed.
-	// The real DSP has different depths for the different stacks, but it would
-	// be strange if any ucode relied on stack overflows since on the DSP, when
-	// the stack overflows, you're screwed.
-	u16 reg_stack[4][DSP_STACK_DEPTH];
-
-	// For debugging.
-	u32 iram_crc;
-	u64 step_counter;
-
-	// Mailbox.
-	volatile u32 mbox[2];
-
-	// Accelerator / DMA / other hardware registers. Not GPRs.
-	u16 ifx_regs[256];
-
-	// When state saving, all of the above can just be memcpy'd into the save state.
-	// The below needs special handling.
-	u16 *iram;
-	u16 *dram;
-	u16 *irom;
-	u16 *coef;
-
-	// This one doesn't really belong here.
-	u8  *cpu_ram;
-};
-
-extern SDSP g_dsp;
-extern DSPBreakpoints dsp_breakpoints;
-extern DSPEmitter *dspjit;
-extern u16 cyclesLeft;
-extern bool init_hax;
-
-bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
-				  bool bUsingJIT);
-
-void DSPCore_Reset();
-void DSPCore_Shutdown(); // Frees all allocated memory.
-
-void DSPCore_CheckExternalInterrupt();
-void DSPCore_CheckExceptions();
-void DSPCore_SetExternalInterrupt(bool val);
-
-// sets a flag in the pending exception register.
-void DSPCore_SetException(u8 level);
-
-void CompileCurrent();
-
-enum DSPCoreState
-{
-	DSPCORE_STOP = 0,
-	DSPCORE_RUNNING,
-	DSPCORE_STEPPING,
-};
-
-int DSPCore_RunCycles(int cycles);
-
-// These are meant to be called from the UI thread.
-void DSPCore_SetState(DSPCoreState new_state);
-DSPCoreState DSPCore_GetState();
-
-void DSPCore_Step();
-
-u16 DSPCore_ReadRegister(int reg);
-void DSPCore_WriteRegister(int reg, u16 val);
-
-#endif // _DSPCORE_H
diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
deleted file mode 100644
index 56e998d3c0..0000000000
--- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_interface.h
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include "Atomic.h"
-#include "Thread.h"
-#include "MemoryUtil.h"
-
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPTables.h"
-#include "DSPAnalyzer.h"
-#include "DSPAccelerator.h"
-#include "DSPInterpreter.h"
-#include "DSPHWInterface.h"
-#include "CPUDetect.h"
-
-#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-static void gdsp_do_dma();
-
-void gdsp_ifx_init()
-{
-	for (int i = 0; i < 256; i++)
-	{
-		g_dsp.ifx_regs[i] = 0;
-	}
-
-	g_dsp.mbox[0] = 0;
-	g_dsp.mbox[1] = 0;
-}
-
-u32 gdsp_mbox_peek(u8 mbx)
-{
-	return Common::AtomicLoad(g_dsp.mbox[mbx]);
-}
-
-void gdsp_mbox_write_h(u8 mbx, u16 val)
-{
-	const u32 new_value = (Common::AtomicLoadAcquire(g_dsp.mbox[mbx]) & 0xffff) | (val << 16);
-	Common::AtomicStoreRelease(g_dsp.mbox[mbx], new_value & ~0x80000000);
-}
-
-void gdsp_mbox_write_l(u8 mbx, u16 val)
-{
-	const u32 new_value = (Common::AtomicLoadAcquire(g_dsp.mbox[mbx]) & ~0xffff) | val;
-	Common::AtomicStoreRelease(g_dsp.mbox[mbx], new_value | 0x80000000);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (mbx == GDSP_MBOX_DSP)
-	{
-		INFO_LOG(DSP_MAIL, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
-	} else {
-		INFO_LOG(DSP_MAIL, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
-	}
-#endif
-}
-
-u16 gdsp_mbox_read_h(u8 mbx)
-{
-	if (init_hax && mbx)
-	{
-		return 0x8054;
-	}
-
-	return (u16)(Common::AtomicLoad(g_dsp.mbox[mbx]) >> 16); // TODO: mask away the top bit?
-}
-
-u16 gdsp_mbox_read_l(u8 mbx)
-{
-	const u32 value = Common::AtomicLoadAcquire(g_dsp.mbox[mbx]);
-	Common::AtomicStoreRelease(g_dsp.mbox[mbx], value & ~0x80000000);
-
-	if (init_hax && mbx)
-	{
-		init_hax = false;
-		DSPCore_Reset();
-		return 0x4348;
-	}
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (mbx == GDSP_MBOX_DSP)
-	{
-		INFO_LOG(DSP_MAIL, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
-	} else {
-		INFO_LOG(DSP_MAIL, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
-	}
-#endif
-
-	return (u16)value;
-}
-
-void gdsp_ifx_write(u32 addr, u32 val)
-{
-	switch (addr & 0xff)
-	{
-		case DSP_DIRQ:
-			if (val & 0x1)
-				DSPHost_InterruptRequest();
-			else 
-				INFO_LOG(DSPLLE, "Unknown Interrupt Request pc=%04x (%04x)", g_dsp.pc, val);
-			break;
-
-		case DSP_DMBH:
-			gdsp_mbox_write_h(GDSP_MBOX_DSP, val);
-			break;
-
-		case DSP_DMBL:
-			gdsp_mbox_write_l(GDSP_MBOX_DSP, val);
-			break;
-
-		case DSP_CMBH:
-			return gdsp_mbox_write_h(GDSP_MBOX_CPU, val);
-
-		case DSP_CMBL:
-			return gdsp_mbox_write_l(GDSP_MBOX_CPU, val);
-
-		case DSP_DSBL:
-			g_dsp.ifx_regs[DSP_DSBL] = val;
-			g_dsp.ifx_regs[DSP_DSCR] |= 4; // Doesn't really matter since we do DMA instantly
-			if (!g_dsp.ifx_regs[DSP_AMDM])
-				gdsp_do_dma();
-			else
-				NOTICE_LOG(DSPLLE, "Masked DMA skipped");
-			g_dsp.ifx_regs[DSP_DSCR] &= ~4;
-			g_dsp.ifx_regs[DSP_DSBL] = 0;
-			break;
-
-		case DSP_ACDATA1: // Accelerator write (Zelda type) - "UnkZelda"
-			dsp_write_aram_d3(val);
-			break;
-
-		case DSP_GAIN:
-			if (val)
-			{
-				INFO_LOG(DSPLLE,"Gain Written: 0x%04x", val); 
-			}
-		case DSP_DSPA:
-		case DSP_DSMAH:
-		case DSP_DSMAL:
-		case DSP_DSCR:
-			g_dsp.ifx_regs[addr & 0xFF] = val;
-			break;
-/*
-		case DSP_ACCAL:
-			dsp_step_accelerator();
-			break;
-*/
-		default:
-			if ((addr & 0xff) >= 0xa0)
-			{
-				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
-				{
-					INFO_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
-				}
-				else
-				{
-					ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
-				}
-			}
-			else
-			{
-				ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
-			}
-			g_dsp.ifx_regs[addr & 0xFF] = val;
-			break;
-	}
-}
-
-u16 gdsp_ifx_read(u16 addr)
-{
-	switch (addr & 0xff)
-	{
-		case DSP_DMBH:
-			return gdsp_mbox_read_h(GDSP_MBOX_DSP);
-
-		case DSP_DMBL:
-			return gdsp_mbox_read_l(GDSP_MBOX_DSP);
-
-		case DSP_CMBH:
-			return gdsp_mbox_read_h(GDSP_MBOX_CPU);
-
-		case DSP_CMBL:
-			return gdsp_mbox_read_l(GDSP_MBOX_CPU);
-
-		case DSP_DSCR:
-			return g_dsp.ifx_regs[addr & 0xFF];
-
-		case DSP_ACCELERATOR:  // ADPCM Accelerator reads
-			return dsp_read_accelerator();
-
-		case DSP_ACDATA1: // Accelerator reads (Zelda type) - "UnkZelda"
-			return dsp_read_aram_d3();
-
-		default:
-			if ((addr & 0xff) >= 0xa0)
-			{
-				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
-				{
-					INFO_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, g_dsp.ifx_regs[addr & 0xFF]);
-				}
-				else
-				{
-					ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
-				}
-			}
-			else
-			{
-				ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
-			}
-			return g_dsp.ifx_regs[addr & 0xFF];
-	}
-}
-
-static void gdsp_idma_in(u16 dsp_addr, u32 addr, u32 size)
-{
-	UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
-
-	u8* dst = ((u8*)g_dsp.iram);
-	for (u32 i = 0; i < size; i += 2)
-	{ 
-		*(u16*)&dst[dsp_addr + i] = Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x0fffffff]);
-	}
-	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
-
-	DSPHost_CodeLoaded((const u8*)g_dsp.iram + dsp_addr, size);
-
-	NOTICE_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc);
-}
-
-static void gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size)
-{
-	ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size);
-}
-
-#if _M_SSE >= 0x301
-static const __m128i s_mask = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L);
-#endif
-
-// TODO: These should eat clock cycles.
-static void gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size)
-{
-	u8* dst = ((u8*)g_dsp.dram);
-
-#if _M_SSE >= 0x301
-	if (cpu_info.bSSSE3 && !(size % 16))
-	{
-		for (u32 i = 0; i < size; i += 16)
-		{
-			_mm_storeu_si128((__m128i *)&dst[dsp_addr + i], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]), s_mask));
-		}
-	}
-	else
-#endif
-	{
-		for (u32 i = 0; i < size; i += 2)
-		{
-			*(u16*)&dst[dsp_addr + i] = Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]);
-		}
-	}
-	INFO_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)", addr, dsp_addr / 2, size);
-}
-
-static void gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size)
-{
-	const u8* src = ((const u8*)g_dsp.dram);
-
-#if _M_SSE >= 0x301
-	if (cpu_info.bSSSE3 && !(size % 16))
-	{
-		for (u32 i = 0; i < size; i += 16)
-		{
-			_mm_storeu_si128((__m128i *)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&src[dsp_addr + i]), s_mask));
-		}
-	}
-	else
-#endif
-	{
-		for (u32 i = 0; i < size; i += 2)
-		{
-			*(u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF] = Common::swap16(*(const u16*)&src[dsp_addr + i]);
-		}
-	}
-
-	INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size);
-}
-
-static void gdsp_do_dma()
-{
-	u16 ctl;
-	u32 addr;
-	u16 dsp_addr;
-	u16 len;
-
-	addr = (g_dsp.ifx_regs[DSP_DSMAH] << 16) | g_dsp.ifx_regs[DSP_DSMAL];
-	ctl = g_dsp.ifx_regs[DSP_DSCR];
-	dsp_addr = g_dsp.ifx_regs[DSP_DSPA] * 2;
-	len = g_dsp.ifx_regs[DSP_DSBL];
-
-	if (len > 0x4000)
-	{
-		ERROR_LOG(DSPLLE, "DMA ERROR: PC: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
-		exit(0);
-	}
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	DEBUG_LOG(DSPLLE, "DMA pc: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
-#endif
-	switch (ctl & 0x3)
-	{
-		case (DSP_CR_DMEM | DSP_CR_TO_CPU):
-			gdsp_ddma_out(dsp_addr, addr, len);
-			break;
-
-		case (DSP_CR_DMEM | DSP_CR_FROM_CPU):
-			gdsp_ddma_in(dsp_addr, addr, len);
-			break;
-
-		case (DSP_CR_IMEM | DSP_CR_TO_CPU):
-			gdsp_idma_out(dsp_addr, addr, len);
-			break;
-
-		case (DSP_CR_IMEM | DSP_CR_FROM_CPU):
-			gdsp_idma_in(dsp_addr, addr, len);
-			break;
-	}
-}
diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.h b/Source/Core/Core/Src/DSP/DSPHWInterface.h
deleted file mode 100644
index 13ea8cf7a1..0000000000
--- a/Source/Core/Core/Src/DSP/DSPHWInterface.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_interface.h
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _GDSP_INTERFACE_H
-#define _GDSP_INTERFACE_H
-
-#include "Common.h"
-
-#define GDSP_MBOX_CPU   0
-#define GDSP_MBOX_DSP   1
-
-u32  gdsp_mbox_peek(u8 mbx);
-void gdsp_mbox_write_h(u8 mbx, u16 val);
-void gdsp_mbox_write_l(u8 mbx, u16 val);
-u16  gdsp_mbox_read_h(u8 mbx);
-u16  gdsp_mbox_read_l(u8 mbx);
-
-void gdsp_ifx_init();
-
-void gdsp_ifx_write(u32 addr, u32 val);
-u16  gdsp_ifx_read(u16 addr);
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPHost.h b/Source/Core/Core/Src/DSP/DSPHost.h
deleted file mode 100644
index cef329a7ec..0000000000
--- a/Source/Core/Core/Src/DSP/DSPHost.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPHOST_H
-#define _DSPHOST_H
-
-// The user of the DSPCore library must supply a few functions so that the
-// emulation core can access the environment it runs in. If the emulation
-// core isn't used, for example in an asm/disasm tool, then most of these
-// can be stubbed out.
-
-u8 DSPHost_ReadHostMemory(u32 addr);
-void DSPHost_WriteHostMemory(u8 value, u32 addr);
-bool DSPHost_OnThread();
-bool DSPHost_Wii();
-void DSPHost_InterruptRequest();
-void DSPHost_CodeLoaded(const u8 *ptr, int size);
-void DSPHost_UpdateDebugger();
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPIntCCUtil.h b/Source/Core/Core/Src/DSP/DSPIntCCUtil.h
deleted file mode 100644
index e98c0d905d..0000000000
--- a/Source/Core/Core/Src/DSP/DSPIntCCUtil.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-#ifndef _GDSP_CONDITION_CODES_H
-#define _GDSP_CONDITION_CODES_H
-
-// Anything to do with SR and conditions goes here.
-
-#include "Common.h"
-
-namespace DSPInterpreter {
-
-bool CheckCondition(u8 _Condition);
-
-int GetMultiplyModifier();
-
-void Update_SR_Register16(s16 _Value, bool carry = false, bool overflow = false, bool overS32 = false);
-void Update_SR_Register64(s64 _Value, bool carry = false, bool overflow = false);
-void Update_SR_LZ(bool value);
-
-inline bool isCarry(u64 val, u64 result) {
-	return (val>result);
-}
-
-inline bool isCarry2(u64 val, u64 result) {
-	return (val>=result); 
-}
-
-inline bool isOverflow(s64 val1, s64 val2, s64 res) {
-	return ((val1 ^ res) & (val2 ^ res)) < 0;
-}
-
-inline bool isOverS32(s64 acc) {
-	return (acc != (s32)acc) ? true : false;
-}
-
-}  // namespace
-
-#endif  // _GDSP_CONDITION_CODES_H
diff --git a/Source/Core/Core/Src/DSP/DSPIntExtOps.h b/Source/Core/Core/Src/DSP/DSPIntExtOps.h
deleted file mode 100644
index fa6d22edba..0000000000
--- a/Source/Core/Core/Src/DSP/DSPIntExtOps.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*====================================================================
-
-   filename:     opcodes.h
-   project:      GameCube DSP Tool (gcdsp)
-   created:      2005.03.04
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _GDSP_EXT_OP_H
-#define _GDSP_EXT_OP_H
-
-#include "DSPTables.h"
-
-// Extended opcode support.
-// Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension
-// can be stored. 
-
-namespace DSPInterpreter
-{
-namespace Ext
-{ 
-void l(const UDSPInstruction opc);
-void ln(const UDSPInstruction opc);
-void ls(const UDSPInstruction opc);
-void lsn(const UDSPInstruction opc);
-void lsm(const UDSPInstruction opc);
-void lsnm(const UDSPInstruction opc);
-void sl(const UDSPInstruction opc);
-void sln(const UDSPInstruction opc);
-void slm(const UDSPInstruction opc);
-void slnm(const UDSPInstruction opc);
-void s(const UDSPInstruction opc);
-void sn(const UDSPInstruction opc);
-void ld(const UDSPInstruction opc);
-void ldax(const UDSPInstruction opc);
-void ldn(const UDSPInstruction opc);
-void ldaxn(const UDSPInstruction opc);
-void ldm(const UDSPInstruction opc);
-void ldaxm(const UDSPInstruction opc);
-void ldnm(const UDSPInstruction opc);
-void ldaxnm(const UDSPInstruction opc);
-void mv(const UDSPInstruction opc);
-void dr(const UDSPInstruction opc);
-void ir(const UDSPInstruction opc);
-void nr(const UDSPInstruction opc);
-void nop(const UDSPInstruction opc);
- 
-} // end namespace Ext
-} // end namespace DSPinterpeter
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp
deleted file mode 100644
index 4a841b41e5..0000000000
--- a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_interpreter.cpp
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include "DSPTables.h"
-#include "DSPHost.h"
-#include "DSPCore.h"
-#include "DSPAnalyzer.h"
-
-#include "DSPHWInterface.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-volatile u32 gdsp_running;
-
-// NOTE: These have nothing to do with g_dsp.r.cr !
-
-void WriteCR(u16 val) 
-{
-	// reset
-	if (val & 1)
-	{
-		INFO_LOG(DSPLLE,"DSP_CONTROL RESET");
-		DSPCore_Reset();
-		val &= ~1;
-	}
-	// init
-	else if (val == 4)
-	{
-		// HAX!
-		// OSInitAudioSystem ucode should send this mail - not dsp core itself
-		INFO_LOG(DSPLLE,"DSP_CONTROL INIT");
-		init_hax = true;
-		val |= 0x800;
-	}
-
-	// update cr
-	g_dsp.cr = val;
-}
-
-u16 ReadCR()
-{
-	if (g_dsp.pc & 0x8000)
-	{
-		g_dsp.cr |= 0x800;
-	}
-	else
-	{
-		g_dsp.cr &= ~0x800;
-	}
-
-	return g_dsp.cr;
-}
-
-void Step()
-{
-	DSPCore_CheckExceptions();
-
-	g_dsp.step_counter++;
-
-#if PROFILE
-	g_dsp.err_pc = g_dsp.pc;
-
-	ProfilerAddDelta(g_dsp.err_pc, 1);
-	if (g_dsp.step_counter == 1)
-	{
-		ProfilerInit();
-	}
-
-	if ((g_dsp.step_counter & 0xFFFFF) == 0)
-	{
-		ProfilerDump(g_dsp.step_counter);
-	}
-#endif
-
-	u16 opc = dsp_fetch_code();
-	ExecuteInstruction(UDSPInstruction(opc));
-	
-	if (DSPAnalyzer::code_flags[g_dsp.pc - 1] & DSPAnalyzer::CODE_LOOP_END)
-		HandleLoop();
-}
-
-// Used by thread mode.
-int RunCyclesThread(int cycles)
-{
-	while (true)
-	{
-		if (g_dsp.cr & CR_HALT)
-			return 0; 
-
-		if (g_dsp.external_interrupt_waiting)
-		{
-			DSPCore_CheckExternalInterrupt();
-			DSPCore_SetExternalInterrupt(false);
-		}
-
-		Step();
-		cycles--;
-		if (cycles < 0)
-			return 0;
-	}
-}
-
-// This one has basic idle skipping, and checks breakpoints.
-int RunCyclesDebug(int cycles)
-{
-	// First, let's run a few cycles with no idle skipping so that things can progress a bit.
-	for (int i = 0; i < 8; i++)
-	{
-		if (g_dsp.cr & CR_HALT)
-			return 0; 
-		if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
-		{
-			DSPCore_SetState(DSPCORE_STEPPING);
-			return cycles;
-		}
-		Step();
-		cycles--;
-		if (cycles < 0)
-			return 0;
-	}
-
-	while (true)
-	{
-		// Next, let's run a few cycles with idle skipping, so that we can skip
-		// idle loops.
-		for (int i = 0; i < 8; i++)
-		{
-			if (g_dsp.cr & CR_HALT)
-				return 0;
-			if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
-			{
-				DSPCore_SetState(DSPCORE_STEPPING);
-				return cycles;
-			}
-			// Idle skipping.
-			if (DSPAnalyzer::code_flags[g_dsp.pc] & DSPAnalyzer::CODE_IDLE_SKIP)
-				return 0;
-			Step();
-			cycles--;
-			if (cycles < 0)
-				return 0;
-		}
-
-		// Now, lets run some more without idle skipping. 
-		for (int i = 0; i < 200; i++)
-		{
-			if (dsp_breakpoints.IsAddressBreakPoint(g_dsp.pc))
-			{
-				DSPCore_SetState(DSPCORE_STEPPING);
-				return cycles;
-			}
-			Step();
-			cycles--;
-			if (cycles < 0)
-				return 0;
-			// We don't bother directly supporting pause - if the main emu pauses,
-			// it just won't call this function anymore.
-		}
-	}
-}
-
-// Used by non-thread mode. Meant to be efficient.
-int RunCycles(int cycles)
-{
-	// First, let's run a few cycles with no idle skipping so that things can
-	// progress a bit.
-	for (int i = 0; i < 8; i++)
-	{
-		if (g_dsp.cr & CR_HALT)
-			return 0; 
-		Step();
-		cycles--;
-		if (cycles < 0)
-			return 0;
-	}
-
-	while (true)
-	{
-		// Next, let's run a few cycles with idle skipping, so that we can skip
-		// idle loops.
-		for (int i = 0; i < 8; i++)
-		{
-			if (g_dsp.cr & CR_HALT)
-				return 0;
-			// Idle skipping.
-			if (DSPAnalyzer::code_flags[g_dsp.pc] & DSPAnalyzer::CODE_IDLE_SKIP)
-				return 0;
-			Step();
-			cycles--;
-			if (cycles < 0)
-				return 0;
-		}
-
-		// Now, lets run some more without idle skipping. 
-		for (int i = 0; i < 200; i++)	
-		{
-			Step();
-			cycles--;
-			if (cycles < 0)
-				return 0;
-			// We don't bother directly supporting pause - if the main emu pauses,
-			// it just won't call this function anymore.
-		}
-	}
-}
-
-void Stop()
-{
-	gdsp_running = false;
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
deleted file mode 100644
index 7a56c2618f..0000000000
--- a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_memory.cpp
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include "DSPInterpreter.h"
-#include "DSPMemoryMap.h"
-#include "DSPHWInterface.h"
-#include "DSPCore.h"
-
-u16 dsp_imem_read(u16 addr)
-{
-	switch (addr >> 12)
-	{
-	case 0:   // 0xxx IRAM
-		return g_dsp.iram[addr & DSP_IRAM_MASK];
-
-	case 8:   // 8xxx IROM - contains code to receive code for IRAM, and a bunch of mixing loops.
-		return g_dsp.irom[addr & DSP_IROM_MASK];
-
-	default:  // Unmapped/non-existing memory
-		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Executing from invalid (%04x) memory", g_dsp.pc, addr);
-		return 0;
-	}
-}
-
-u16 dsp_dmem_read(u16 addr)
-{
-	switch (addr >> 12)
-	{
-	case 0x0:  // 0xxx DRAM
-		return g_dsp.dram[addr & DSP_DRAM_MASK];
-		
-	case 0x1:  // 1xxx COEF
-		DEBUG_LOG(DSPLLE, "%04x : Coefficient Read @ %04x", g_dsp.pc, addr);
-		return g_dsp.coef[addr & DSP_COEF_MASK];
-
-	case 0xf:  // Fxxx HW regs
-		return gdsp_ifx_read(addr);
-		
-	default:   // Unmapped/non-existing memory
-		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Read from UNKNOWN (%04x) memory", g_dsp.pc, addr);
-		return 0;
-	}
-}
-
-void dsp_dmem_write(u16 addr, u16 val)
-{
-	switch (addr >> 12)
-	{
-	case 0x0: // 0xxx DRAM
-		g_dsp.dram[addr & DSP_DRAM_MASK] = val;
-		break;
-
-	case 0xf: // Fxxx HW regs
-		gdsp_ifx_write(addr, val);
-		break;
-
-	default:  // Unmapped/non-existing memory
-		ERROR_LOG(DSPLLE, "%04x DSP ERROR: Write to UNKNOWN (%04x) memory", g_dsp.pc, addr);
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.h b/Source/Core/Core/Src/DSP/DSPMemoryMap.h
deleted file mode 100644
index c271537130..0000000000
--- a/Source/Core/Core/Src/DSP/DSPMemoryMap.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_memory.h
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _GDSP_MEMORY_H
-#define _GDSP_MEMORY_H
-
-#include "Common.h"
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
-
-u16  dsp_imem_read(u16 addr);
-void dsp_dmem_write(u16 addr, u16 val);
-u16  dsp_dmem_read(u16 addr);
-
-inline u16 dsp_fetch_code()
-{
-	u16 opc = dsp_imem_read(g_dsp.pc);
-
-	g_dsp.pc++;
-	return opc;
-}
-
-inline u16 dsp_peek_code()
-{
-	return dsp_imem_read(g_dsp.pc);
-}
-
-inline void dsp_skip_inst()
-{
-	g_dsp.pc += opTable[dsp_peek_code()]->size;
-}
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPStacks.cpp b/Source/Core/Core/Src/DSP/DSPStacks.cpp
deleted file mode 100644
index d1e70a616a..0000000000
--- a/Source/Core/Core/Src/DSP/DSPStacks.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_registers.cpp
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include "Common.h"
-
-#include "DSPCore.h"
-#include "DSPStacks.h"
-
-// Stacks. The stacks are outside the DSP RAM, in dedicated hardware.
-
-static void dsp_reg_stack_push(int stack_reg)
-{
-	g_dsp.reg_stack_ptr[stack_reg]++;
-	g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
-	g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]] = g_dsp.r.st[stack_reg];
-}
-
-static void dsp_reg_stack_pop(int stack_reg)
-{
-	g_dsp.r.st[stack_reg] = g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]];
-	g_dsp.reg_stack_ptr[stack_reg]--;
-	g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
-}
-
-void dsp_reg_store_stack(int stack_reg, u16 val)
-{
-	dsp_reg_stack_push(stack_reg);
-	g_dsp.r.st[stack_reg] = val;
-}
-
-u16 dsp_reg_load_stack(int stack_reg)
-{
-	u16 val = g_dsp.r.st[stack_reg];
-	dsp_reg_stack_pop(stack_reg);
-	return val;
-}
diff --git a/Source/Core/Core/Src/DSP/DSPStacks.h b/Source/Core/Core/Src/DSP/DSPStacks.h
deleted file mode 100644
index cb808ee8a7..0000000000
--- a/Source/Core/Core/Src/DSP/DSPStacks.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*====================================================================
-
-   filename:     gdsp_registers.h
-   project:      GCemu
-   created:      2004-6-18
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie & Tratax
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _DSP_STACKS_H
-#define _DSP_STACKS_H
-
-#include "Common.h"
-
-void dsp_reg_store_stack(int stack_reg, u16 val);
-u16 dsp_reg_load_stack(int stack_reg);
-
-#endif
diff --git a/Source/Core/Core/Src/DSP/DSPTables.cpp b/Source/Core/Core/Src/DSP/DSPTables.cpp
deleted file mode 100644
index bc2cbf1488..0000000000
--- a/Source/Core/Core/Src/DSP/DSPTables.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
-
-#include "Common.h"
-#include "DSPTables.h"
-
-#include "DSPInterpreter.h"
-#include "DSPIntExtOps.h"
-#include "DSPEmitter.h"
-
-void nop(const UDSPInstruction opc)
-{
-	// The real nop is 0. Anything else is bad.
-	if (opc)
-	{
-		ERROR_LOG(DSPLLE, "LLE: Unrecognized opcode 0x%04x", opc);
-	}
-}
- 
-const DSPOPCTemplate opcodes[] =
-{
-	{"NOP",		0x0000, 0xfffc, nop,                     &DSPEmitter::nop,    1, 0, {},                                                                                     false, false, false, false, false},
-
-	{"DAR",		0x0004, 0xfffc, DSPInterpreter::dar,     &DSPEmitter::dar,    1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false},
-	{"IAR",		0x0008, 0xfffc, DSPInterpreter::iar,     &DSPEmitter::iar,    1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false},
-	{"SUBARN",	0x000c, 0xfffc, DSPInterpreter::subarn,  &DSPEmitter::subarn, 1, 1, {{P_REG, 1, 0, 0, 0x0003}},                                                             false, false, false, false, false},
-	{"ADDARN",	0x0010, 0xfff0, DSPInterpreter::addarn,  &DSPEmitter::addarn, 1, 2, {{P_REG, 1, 0, 0, 0x0003},     {P_REG04, 1, 0, 2, 0x000c}},                             false, false, false, false, false},
-
-	{"HALT",	0x0021, 0xffff, DSPInterpreter::halt,    &DSPEmitter::halt,   1, 0, {},                                                                                     false, true, true, false, false},
-
-	{"RETGE",	0x02d0, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETL",	0x02d1, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETG",	0x02d2, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETLE",	0x02d3, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETNZ",	0x02d4, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETZ",	0x02d5, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETNC",	0x02d6, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETC",	0x02d7, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETx8",	0x02d8, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETx9",	0x02d9, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETxA",	0x02da, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETxB",	0x02db, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETLNZ",	0x02dc, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETLZ",	0x02dd, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RETO",	0x02de, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, false, true, false},
-	{"RET",		0x02df, 0xffff, DSPInterpreter::ret,     &DSPEmitter::ret,    1, 0, {},                                                                                     false, true, true, false, false},
-	
-	{"RTI",		0x02ff, 0xffff, DSPInterpreter::rti,     &DSPEmitter::rti,    1, 0, {},                                                                                     false, true, true, false, false},
-
-	{"CALLGE",	0x02b0, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLL",	0x02b1, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLG",	0x02b2, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLLE",	0x02b3, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLNZ",	0x02b4, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLZ",	0x02b5, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLNC",	0x02b6, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLC",	0x02b7, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLx8",	0x02b8, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLx9",	0x02b9, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLxA",	0x02ba, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLxB",	0x02bb, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLLNZ",	0x02bc, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLLZ",	0x02bd, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALLO",	0x02be, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"CALL",	0x02bf, 0xffff, DSPInterpreter::call,    &DSPEmitter::call,   2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, true, true, false},
-
-	{"IFGE",	0x0270, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFL",		0x0271, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFG",		0x0272, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFLE",	0x0273, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFNZ",	0x0274, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFZ",		0x0275, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFNC",	0x0276, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFC",		0x0277, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFx8",	0x0278, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFx9",	0x0279, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFxA",	0x027a, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFxB",	0x027b, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFLNZ",	0x027c, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFLZ",	0x027d, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IFO",		0x027e, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, false, true, false},
-	{"IF",		0x027f, 0xffff, DSPInterpreter::ifcc,    &DSPEmitter::ifcc,   1, 0, {},                                                                                     false, true, true, true, false},
-
-	{"JGE",		0x0290, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JL",		0x0291, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JG",		0x0292, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JLE",		0x0293, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JNZ",		0x0294, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JZ",		0x0295, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JNC",		0x0296, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JC",		0x0297, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JMPx8",	0x0298, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JMPx9",	0x0299, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JMPxA",	0x029a, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JMPxB",	0x029b, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JLNZ",	0x029c, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JLZ",		0x029d, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JO",		0x029e, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, false, true, false},
-	{"JMP",		0x029f, 0xffff, DSPInterpreter::jcc,     &DSPEmitter::jcc,    2, 1, {{P_ADDR_I, 2, 1, 0, 0xffff}},                                                          false, true, true, true, false},
-
-	{"JRGE",	0x1700, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRL",		0x1701, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRG",		0x1702, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRLE",	0x1703, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRNZ",	0x1704, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRZ",		0x1705, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRNC",	0x1706, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRC",		0x1707, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JMPRx8",	0x1708, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JMPRx9",	0x1709, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JMPRxA",	0x170a, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JMPRxB",	0x170b, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRLNZ",	0x170c, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRLZ",	0x170d, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JRO",		0x170e, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, false, false},
-	{"JMPR",	0x170f, 0xff1f, DSPInterpreter::jmprcc,  &DSPEmitter::jmprcc, 1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, true, false, false},
-
-	{"CALLRGE",	0x1710, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRL",	0x1711, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRG",	0x1712, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRLE",	0x1713, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRNZ",	0x1714, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRZ",	0x1715, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRNC",	0x1716, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRC",	0x1717, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRx8",	0x1718, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRx9",	0x1719, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRxA",	0x171a, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRxB",	0x171b, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRLNZ",0x171c, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRLZ",	0x171d, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLRO",	0x171e, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, false, true, false},
-	{"CALLR",	0x171f, 0xff1f, DSPInterpreter::callr,   &DSPEmitter::callr,  1, 1, {{P_REG, 1, 0, 5, 0x00e0}},                                                             false, true, true, true, false},
-
-	{"SBCLR",	0x1200, 0xff00, DSPInterpreter::sbclr,   &DSPEmitter::sbclr,  1, 1, {{P_IMM, 1, 0, 0, 0x0007}},                                                             false, false, false, false, false},
-	{"SBSET",	0x1300, 0xff00, DSPInterpreter::sbset,   &DSPEmitter::sbset,  1, 1, {{P_IMM, 1, 0, 0, 0x0007}},                                                             false, false, false, false, false},
-
-	{"LSL",		0x1400, 0xfec0, DSPInterpreter::lsl,     &DSPEmitter::lsl,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true},
-	{"LSR",		0x1440, 0xfec0, DSPInterpreter::lsr,     &DSPEmitter::lsr,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true},
-	{"ASL",		0x1480, 0xfec0, DSPInterpreter::asl,     &DSPEmitter::asl,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true},
-	{"ASR",		0x14c0, 0xfec0, DSPInterpreter::asr,     &DSPEmitter::asr,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_IMM, 1, 0, 0, 0x003f}},                               false, false, false, false, true},
-	
-	{"LSRN",	0x02ca, 0xffff, DSPInterpreter::lsrn,    &DSPEmitter::lsrn,   1, 0, {},                                                                                     false, false, false, false, true}, // discovered by ector!
-	{"ASRN",	0x02cb, 0xffff, DSPInterpreter::asrn,    &DSPEmitter::asrn,   1, 0, {},                                                                                     false, false, false, false, true}, // discovered by ector!
-
-	{"LRI",		0x0080, 0xffe0, DSPInterpreter::lri,     &DSPEmitter::lri,    2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, false},
-	{"LR",		0x00c0, 0xffe0, DSPInterpreter::lr,      &DSPEmitter::lr,     2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_MEM, 2, 1, 0, 0xffff}},                               false, false, false, true, false},
-	{"SR",		0x00e0, 0xffe0, DSPInterpreter::sr,      &DSPEmitter::sr,     2, 2, {{P_MEM, 2, 1, 0, 0xffff},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, true, false},
-
-	{"MRR",		0x1c00, 0xfc00, DSPInterpreter::mrr,     &DSPEmitter::mrr,    1, 2, {{P_REG, 1, 0, 5, 0x03e0},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false},
-
-	{"SI",		0x1600, 0xff00, DSPInterpreter::si,      &DSPEmitter::si,     2, 2, {{P_MEM, 1, 0, 0, 0x00ff},     {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, false},
-
-	{"ADDIS",	0x0400, 0xfe00, DSPInterpreter::addis,   &DSPEmitter::addis,  1, 2, {{P_ACCM,  1, 0, 8, 0x0100},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true},
-	{"CMPIS",	0x0600, 0xfe00, DSPInterpreter::cmpis,   &DSPEmitter::cmpis,   1, 2, {{P_ACCM,  1, 0, 8, 0x0100},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true},
-	{"LRIS",	0x0800, 0xf800, DSPInterpreter::lris,    &DSPEmitter::lris,   1, 2, {{P_REG18, 1, 0, 8, 0x0700},   {P_IMM, 1, 0, 0, 0x00ff}},                               false, false, false, false, true},
-
-	{"ADDI",	0x0200, 0xfeff, DSPInterpreter::addi,    &DSPEmitter::addi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-	{"XORI",	0x0220, 0xfeff, DSPInterpreter::xori,    &DSPEmitter::xori,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-	{"ANDI",	0x0240, 0xfeff, DSPInterpreter::andi,    &DSPEmitter::andi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-	{"ORI",		0x0260, 0xfeff, DSPInterpreter::ori,     &DSPEmitter::ori,    2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-	{"CMPI",	0x0280, 0xfeff, DSPInterpreter::cmpi,    &DSPEmitter::cmpi,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-
-	{"ANDF",	0x02a0, 0xfeff, DSPInterpreter::andf,    &DSPEmitter::andf,   2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-	{"ANDCF",	0x02c0, 0xfeff, DSPInterpreter::andcf,   &DSPEmitter::andcf,  2, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_IMM, 2, 1, 0, 0xffff}},                               false, false, false, true, true},
-
-	{"ILRR",	0x0210, 0xfefc, DSPInterpreter::ilrr,    &DSPEmitter::ilrr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false},
-	{"ILRRD",	0x0214, 0xfefc, DSPInterpreter::ilrrd,   &DSPEmitter::ilrrd,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false},
-	{"ILRRI",	0x0218, 0xfefc, DSPInterpreter::ilrri,   &DSPEmitter::ilrri,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false},
-	{"ILRRN",	0x021c, 0xfefc, DSPInterpreter::ilrrn,   &DSPEmitter::ilrrn,  1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_PRG, 1, 0, 0, 0x0003}},                               false, false, false, false, false},
-
-	// LOOPS
-	{"LOOP",	0x0040, 0xffe0, DSPInterpreter::loop,    &DSPEmitter::loop,   1, 1, {{P_REG, 1, 0, 0, 0x001f}},                                                             false, true, true, true, false},
-	{"BLOOP",	0x0060, 0xffe0, DSPInterpreter::bloop,   &DSPEmitter::bloop,  2, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_ADDR_I, 2, 1, 0, 0xffff}},                            false, true, true, true, false},
-	{"LOOPI",	0x1000, 0xff00, DSPInterpreter::loopi,   &DSPEmitter::loopi,  1, 1, {{P_IMM, 1, 0, 0, 0x00ff}},                                                             false, true, true, true, false},
-	{"BLOOPI",	0x1100, 0xff00, DSPInterpreter::bloopi,  &DSPEmitter::bloopi, 2, 2, {{P_IMM, 1, 0, 0, 0x00ff},     {P_ADDR_I, 2, 1, 0, 0xffff}},                            false, true, true, true, false},
-
-	// load and store value pointed by indexing reg and increment; LRR/SRR variants
-	{"LRR",		0x1800, 0xff80, DSPInterpreter::lrr,     &DSPEmitter::lrr,    1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false},
-	{"LRRD",	0x1880, 0xff80, DSPInterpreter::lrrd,    &DSPEmitter::lrrd,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false},
-	{"LRRI",	0x1900, 0xff80, DSPInterpreter::lrri,    &DSPEmitter::lrri,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false},
-	{"LRRN",	0x1980, 0xff80, DSPInterpreter::lrrn,    &DSPEmitter::lrrn,   1, 2, {{P_REG, 1, 0, 0, 0x001f},     {P_PRG, 1, 0, 5, 0x0060}},                               false, false, false, false, false},
-
-	{"SRR",		0x1a00, 0xff80, DSPInterpreter::srr,     &DSPEmitter::srr,    1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false},
-	{"SRRD",	0x1a80, 0xff80, DSPInterpreter::srrd,    &DSPEmitter::srrd,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false},
-	{"SRRI",	0x1b00, 0xff80, DSPInterpreter::srri,    &DSPEmitter::srri,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false},
-	{"SRRN",	0x1b80, 0xff80, DSPInterpreter::srrn,    &DSPEmitter::srrn,   1, 2, {{P_PRG, 1, 0, 5, 0x0060},     {P_REG, 1, 0, 0, 0x001f}},                               false, false, false, false, false},
-
-	//2
-	{"LRS",		0x2000, 0xf800, DSPInterpreter::lrs,     &DSPEmitter::lrs,    1, 2, {{P_REG18, 1, 0, 8, 0x0700},   {P_MEM, 1, 0, 0, 0x00ff}},                               false, false, false, false, false},
-	{"SRS",		0x2800, 0xf800, DSPInterpreter::srs,     &DSPEmitter::srs,    1, 2, {{P_MEM,   1, 0, 0, 0x00ff},   {P_REG18, 1, 0, 8, 0x0700}},                             false, false, false, false, false},
-
-// opcodes that can be extended
-
-	//3 - main opcode defined by 9 bits, extension defined by last 7 bits!!
-	{"XORR",	0x3000, 0xfc80, DSPInterpreter::xorr,    &DSPEmitter::xorr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true},
-	{"ANDR",	0x3400, 0xfc80, DSPInterpreter::andr,    &DSPEmitter::andr,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true},
-	{"ORR", 	0x3800, 0xfc80, DSPInterpreter::orr,     &DSPEmitter::orr,    1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true},
-	{"ANDC",	0x3c00, 0xfe80, DSPInterpreter::andc,    &DSPEmitter::andc,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true},
-	{"ORC", 	0x3e00, 0xfe80, DSPInterpreter::orc,     &DSPEmitter::orc,    1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true},
-	{"XORC",	0x3080, 0xfe80, DSPInterpreter::xorc,    &DSPEmitter::xorc,   1, 2, {{P_ACCM, 1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true},
-	{"NOT", 	0x3280, 0xfe80, DSPInterpreter::notc,    &DSPEmitter::notc,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"LSRNRX",	0x3480, 0xfc80, DSPInterpreter::lsrnrx,  &DSPEmitter::lsrnrx, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true},
-	{"ASRNRX",	0x3880, 0xfc80, DSPInterpreter::asrnrx,  &DSPEmitter::asrnrx, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG1A,  1, 0, 9, 0x0200}},                            true, false, false, false, true},
-	{"LSRNR",	0x3c80, 0xfe80, DSPInterpreter::lsrnr,   &DSPEmitter::lsrnr,  1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true},
-	{"ASRNR",	0x3e80, 0xfe80, DSPInterpreter::asrnr,   &DSPEmitter::asrnr,  1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_ACCM_D, 1, 0, 8, 0x0100}},                            true, false, false, false, true},
-
-	//4
-	{"ADDR",	0x4000, 0xf800, DSPInterpreter::addr,    &DSPEmitter::addr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true},
-	{"ADDAX",	0x4800, 0xfc00, DSPInterpreter::addax,   &DSPEmitter::addax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true},
-	{"ADD", 	0x4c00, 0xfe00, DSPInterpreter::add,     &DSPEmitter::add,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true},
-	{"ADDP",	0x4e00, 0xfe00, DSPInterpreter::addp,    &DSPEmitter::addp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true},
-
-	//5
-	{"SUBR",	0x5000, 0xf800, DSPInterpreter::subr,    &DSPEmitter::subr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true},
-	{"SUBAX",	0x5800, 0xfc00, DSPInterpreter::subax,   &DSPEmitter::subax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true},
-	{"SUB", 	0x5c00, 0xfe00, DSPInterpreter::sub,     &DSPEmitter::sub,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true},
-	{"SUBP",	0x5e00, 0xfe00, DSPInterpreter::subp,    &DSPEmitter::subp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true},
-
-	//6
-	{"MOVR",	0x6000, 0xf800, DSPInterpreter::movr,    &DSPEmitter::movr,   1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_REG18, 1, 0, 9, 0x0600}},                             true, false, false, false, true},
-	{"MOVAX",	0x6800, 0xfc00, DSPInterpreter::movax,   &DSPEmitter::movax,  1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_AX, 1, 0, 9, 0x0200}},                                true, false, false, false, true},
-	{"MOV", 	0x6c00, 0xfe00, DSPInterpreter::mov,     &DSPEmitter::mov,    1, 2, {{P_ACC, 1, 0, 8, 0x0100},     {P_ACC_D, 1, 0, 8, 0x0100}},                             true, false, false, false, true},
-	{"MOVP",	0x6e00, 0xfe00, DSPInterpreter::movp,    &DSPEmitter::movp,   1, 1, {{P_ACC, 1, 0, 8, 0x0100}},                                                             true, false, false, false, true},
-
-	//7
-	{"ADDAXL",	0x7000, 0xfc00, DSPInterpreter::addaxl,  &DSPEmitter::addaxl, 1, 2, {{P_ACC,  1, 0, 8, 0x0100},    {P_REG18, 1, 0, 9, 0x0200}},                             true, false, false, false, true},
-	{"INCM",	0x7400, 0xfe00, DSPInterpreter::incm,    &DSPEmitter::incm,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"INC",		0x7600, 0xfe00, DSPInterpreter::inc,     &DSPEmitter::inc,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"DECM",	0x7800, 0xfe00, DSPInterpreter::decm,    &DSPEmitter::decm,   1, 1, {{P_ACCM, 1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"DEC",		0x7a00, 0xfe00, DSPInterpreter::dec,     &DSPEmitter::dec,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"NEG",		0x7c00, 0xfe00, DSPInterpreter::neg,     &DSPEmitter::neg,    1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-	{"MOVNP",	0x7e00, 0xfe00, DSPInterpreter::movnp,   &DSPEmitter::movnp,  1, 1, {{P_ACC,  1, 0, 8, 0x0100}},                                                            true, false, false, false, true},
-
-	//8
-	{"NX",	 	0x8000, 0xf700, DSPInterpreter::nx,      &DSPEmitter::nx,     1, 0, {},                                                                                     true, false, false, false, false},
-	{"CLR",		0x8100, 0xf700, DSPInterpreter::clr,     &DSPEmitter::clr,    1, 1, {{P_ACC,   1, 0, 11, 0x0800}},                                                          true, false, false, false, true},
-	{"CMP",		0x8200, 0xff00, DSPInterpreter::cmp,     &DSPEmitter::cmp,    1, 0, {},                                                                                     true, false, false, false, true},
-	{"MULAXH",	0x8300, 0xff00, DSPInterpreter::mulaxh,  &DSPEmitter::mulaxh, 1, 0, {},                                                                                     true, false, false, false, true},
-	{"CLRP",	0x8400, 0xff00, DSPInterpreter::clrp,    &DSPEmitter::clrp,   1, 0, {},                                                                                     true, false, false, false, true},
-	{"TSTPROD",	0x8500, 0xff00, DSPInterpreter::tstprod, &DSPEmitter::tstprod,1, 0, {},                                                                                     true, false, false, false, true},
-	{"TSTAXH",	0x8600, 0xfe00, DSPInterpreter::tstaxh,  &DSPEmitter::tstaxh, 1, 1, {{P_REG1A, 1, 0, 8, 0x0100}},                                                           true, false, false, false, true},
-	{"M2",		0x8a00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-	{"M0",		0x8b00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-	{"CLR15",	0x8c00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-	{"SET15",	0x8d00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-	{"SET16",	0x8e00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-	{"SET40",	0x8f00, 0xff00, DSPInterpreter::srbith,  &DSPEmitter::srbith, 1, 0, {},                                                                                     true, false, false, false, false},
-
-	//9
-	{"MUL",		0x9000, 0xf700, DSPInterpreter::mul,     &DSPEmitter::mul,    1, 2, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800}},                            true, false, false, false, true},
-	{"ASR16",	0x9100, 0xf700, DSPInterpreter::asr16,   &DSPEmitter::asr16,  1, 1, {{P_ACC,   1, 0, 11, 0x0800}},                                                          true, false, false, false, true},
-	{"MULMVZ",	0x9200, 0xf600, DSPInterpreter::mulmvz,  &DSPEmitter::mulmvz, 1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULAC",	0x9400, 0xf600, DSPInterpreter::mulac,   &DSPEmitter::mulac,  1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULMV",	0x9600, 0xf600, DSPInterpreter::mulmv,   &DSPEmitter::mulmv,  1, 3, {{P_REG18, 1, 0, 11, 0x0800},  {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-
-	//a-b
-	{"MULX",	0xa000, 0xe700, DSPInterpreter::mulx,    &DSPEmitter::mulx,   1, 2, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}},                           true, false, false, false, true},
-	{"ABS",		0xa100, 0xf700, DSPInterpreter::abs,     &DSPEmitter::abs,    1, 1, {{P_ACC,    1, 0, 11, 0x0800}},                                                         true, false, false, false, true},
-	{"MULXMVZ",	0xa200, 0xe600, DSPInterpreter::mulxmvz, &DSPEmitter::mulxmvz,1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULXAC",	0xa400, 0xe600, DSPInterpreter::mulxac,  &DSPEmitter::mulxac, 1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULXMV",	0xa600, 0xe600, DSPInterpreter::mulxmv,  &DSPEmitter::mulxmv, 1, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"TST",		0xb100, 0xf700, DSPInterpreter::tst,     &DSPEmitter::tst,    1, 1, {{P_ACC,    1, 0, 11, 0x0800}},                                                         true, false, false, false, true},
-
-	//c-d
-	{"MULC",	0xc000, 0xe700, DSPInterpreter::mulc,    &DSPEmitter::mulc,   1, 2, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800}},                            true, false, false, false, true},
-	{"CMPAR" ,	0xc100, 0xe700, DSPInterpreter::cmpar,   &DSPEmitter::cmpar,  1, 2, {{P_ACC,  1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800}},                            true, false, false, false, true},
-	{"MULCMVZ",	0xc200, 0xe600, DSPInterpreter::mulcmvz, &DSPEmitter::mulcmvz,1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULCAC",	0xc400, 0xe600, DSPInterpreter::mulcac,  &DSPEmitter::mulcac, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-	{"MULCMV",	0xc600, 0xe600, DSPInterpreter::mulcmv,  &DSPEmitter::mulcmv, 1, 3, {{P_ACCM, 1, 0, 12, 0x1000},   {P_REG1A, 1, 0, 11, 0x0800},  {P_ACC, 1, 0, 8, 0x0100}}, true, false, false, false, true},
-
-	//e
-	{"MADDX",	0xe000, 0xfc00, DSPInterpreter::maddx,   &DSPEmitter::maddx,  1, 2, {{P_REGM18, 1, 0, 8, 0x0200},  {P_REGM19, 1, 0, 7, 0x0100}},                            true, false, false, false, true},
-	{"MSUBX",	0xe400, 0xfc00, DSPInterpreter::msubx,   &DSPEmitter::msubx,  1, 2, {{P_REGM18, 1, 0, 8, 0x0200},  {P_REGM19, 1, 0, 7, 0x0100}},                            true, false, false, false, true},
-	{"MADDC",	0xe800, 0xfc00, DSPInterpreter::maddc,   &DSPEmitter::maddc,  1, 2, {{P_ACCM,   1, 0, 9, 0x0200},  {P_REG19, 1, 0, 7, 0x0100}},                             true, false, false, false, true},
-	{"MSUBC",	0xec00, 0xfc00, DSPInterpreter::msubc,   &DSPEmitter::msubc,  1, 2, {{P_ACCM,   1, 0, 9, 0x0200},  {P_REG19, 1, 0, 7, 0x0100}},                             true, false, false, false, true},
-
-	//f
-	{"LSL16",	0xf000, 0xfe00, DSPInterpreter::lsl16,   &DSPEmitter::lsl16,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true},
-	{"MADD",	0xf200, 0xfe00, DSPInterpreter::madd,    &DSPEmitter::madd,   1, 2, {{P_REG18, 1, 0,  8, 0x0100},  {P_REG1A, 1, 0, 8, 0x0100}},                             true, false, false, false, true},
-	{"LSR16",	0xf400, 0xfe00, DSPInterpreter::lsr16,   &DSPEmitter::lsr16,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true},
-	{"MSUB",	0xf600, 0xfe00, DSPInterpreter::msub,    &DSPEmitter::msub,   1, 2, {{P_REG18, 1, 0,  8, 0x0100},  {P_REG1A, 1, 0, 8, 0x0100}},                             true, false, false, false, true},
-	{"ADDPAXZ",	0xf800, 0xfc00, DSPInterpreter::addpaxz, &DSPEmitter::addpaxz,1, 2, {{P_ACC,   1, 0,  9, 0x0200},  {P_AX, 1, 0, 8, 0x0100}},                                true, false, false, false, true},
-	{"CLRL",	0xfc00, 0xfe00, DSPInterpreter::clrl,    &DSPEmitter::clrl,   1, 1, {{P_ACCL,  1, 0, 11, 0x0800}},                                                          true, false, false, false, true},
-	{"MOVPZ",	0xfe00, 0xfe00, DSPInterpreter::movpz,   &DSPEmitter::movpz,  1, 1, {{P_ACC,   1, 0,  8, 0x0100}},                                                          true, false, false, false, true},
-};
-
-const DSPOPCTemplate cw = 
-	{"CW",		0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
-
-// extended opcodes
-
-const DSPOPCTemplate opcodes_ext[] =
-{
-	{"XXX",		0x0000, 0x00fc, DSPInterpreter::Ext::nop,  &DSPEmitter::nop,  1, 1, {{P_VAL, 1, 0, 0, 0x00ff}}, false, false, false, false, false},
-
-	{"DR",		0x0004, 0x00fc, DSPInterpreter::Ext::dr,   &DSPEmitter::dr,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"IR",		0x0008, 0x00fc, DSPInterpreter::Ext::ir,   &DSPEmitter::ir,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"NR",		0x000c, 0x00fc, DSPInterpreter::Ext::nr,   &DSPEmitter::nr,   1, 1, {{P_REG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"MV",		0x0010, 0x00f0, DSPInterpreter::Ext::mv,   &DSPEmitter::mv,   1, 2, {{P_REG18, 1, 0, 2, 0x000c}, {P_REG1C, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-
-	{"S",		0x0020, 0x00e4, DSPInterpreter::Ext::s,    &DSPEmitter::s,    1, 2, {{P_PRG, 1, 0, 0, 0x0003}, {P_REG1C, 1, 0, 3, 0x0018}}, false, false, false, false, false},
-	{"SN",		0x0024, 0x00e4, DSPInterpreter::Ext::sn,   &DSPEmitter::sn,   1, 2, {{P_PRG, 1, 0, 0, 0x0003}, {P_REG1C, 1, 0, 3, 0x0018}}, false, false, false, false, false},
-
-	{"L",		0x0040, 0x00c4, DSPInterpreter::Ext::l,    &DSPEmitter::l,    1, 2, {{P_REG18, 1, 0, 3, 0x0038}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"LN",		0x0044, 0x00c4, DSPInterpreter::Ext::ln,   &DSPEmitter::ln,   1, 2, {{P_REG18, 1, 0, 3, 0x0038}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-
-	{"LS",		0x0080, 0x00ce, DSPInterpreter::Ext::ls,   &DSPEmitter::ls,   1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false},
-	{"SL",		0x0082, 0x00ce, DSPInterpreter::Ext::sl,   &DSPEmitter::sl,   1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false},
-	{"LSN",		0x0084, 0x00ce, DSPInterpreter::Ext::lsn,  &DSPEmitter::lsn,  1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false},
-	{"SLN",		0x0086, 0x00ce, DSPInterpreter::Ext::sln,  &DSPEmitter::sln,  1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false},
-	{"LSM",		0x0088, 0x00ce, DSPInterpreter::Ext::lsm,  &DSPEmitter::lsm,  1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false},
-	{"SLM",		0x008a, 0x00ce, DSPInterpreter::Ext::slm,  &DSPEmitter::slm,  1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false},
-	{"LSNM",	0x008c, 0x00ce, DSPInterpreter::Ext::lsnm, &DSPEmitter::lsnm, 1, 2, {{P_REG18, 1, 0, 4, 0x0030}, {P_ACCM, 1, 0, 0, 0x0001}}, false, false, false, false, false},
-	{"SLNM",	0x008e, 0x00ce, DSPInterpreter::Ext::slnm, &DSPEmitter::slnm, 1, 2, {{P_ACCM, 1, 0, 0, 0x0001}, {P_REG18, 1, 0, 4, 0x0030}}, false, false, false, false, false},
-
-	{"LDAX",	0x00c3, 0x00cf, DSPInterpreter::Ext::ldax,   &DSPEmitter::ldax,   1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false},
-	{"LDAXN",	0x00c7, 0x00cf, DSPInterpreter::Ext::ldaxn,  &DSPEmitter::ldaxn,  1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false},
-	{"LDAXM",	0x00cb, 0x00cf, DSPInterpreter::Ext::ldaxm,  &DSPEmitter::ldaxm,  1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false},
-	{"LDAXNM",	0x00cf, 0x00cf, DSPInterpreter::Ext::ldaxnm, &DSPEmitter::ldaxnm, 1, 2, {{P_AX, 1, 0, 4, 0x0010}, {P_PRG, 1, 0, 5, 0x0020}}, false, false, false, false, false},
-
-	{"LD",		0x00c0, 0x00cc, DSPInterpreter::Ext::ld,   &DSPEmitter::ld,   1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"LDN",		0x00c4, 0x00cc, DSPInterpreter::Ext::ldn,  &DSPEmitter::ldn,  1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"LDM",		0x00c8, 0x00cc, DSPInterpreter::Ext::ldm,  &DSPEmitter::ldm,  1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-	{"LDNM",	0x00cc, 0x00cc, DSPInterpreter::Ext::ldnm, &DSPEmitter::ldnm, 1, 3, {{P_REGM18, 1, 0, 4, 0x0020}, {P_REGM19, 1, 0, 3, 0x0010}, {P_PRG, 1, 0, 0, 0x0003}}, false, false, false, false, false},
-};
-
-const int opcodes_size = sizeof(opcodes) / sizeof(DSPOPCTemplate);
-const int opcodes_ext_size = sizeof(opcodes_ext) / sizeof(DSPOPCTemplate);
-
-const pdlabel_t pdlabels[] =
-{
-	{0xffa0, "COEF_A1_0", "COEF_A1_0",},
-	{0xffa1, "COEF_A2_0", "COEF_A2_0",},
-	{0xffa2, "COEF_A1_1", "COEF_A1_1",},
-	{0xffa3, "COEF_A2_1", "COEF_A2_1",},
-	{0xffa4, "COEF_A1_2", "COEF_A1_2",},
-	{0xffa5, "COEF_A2_2", "COEF_A2_2",},
-	{0xffa6, "COEF_A1_3", "COEF_A1_3",},
-	{0xffa7, "COEF_A2_3", "COEF_A2_3",},
-	{0xffa8, "COEF_A1_4", "COEF_A1_4",},
-	{0xffa9, "COEF_A2_4", "COEF_A2_4",},
-	{0xffaa, "COEF_A1_5", "COEF_A1_5",},
-	{0xffab, "COEF_A2_5", "COEF_A2_5",},
-	{0xffac, "COEF_A1_6", "COEF_A1_6",},
-	{0xffad, "COEF_A2_6", "COEF_A2_6",},
-	{0xffae, "COEF_A1_7", "COEF_A1_7",},
-	{0xffaf, "COEF_A2_7", "COEF_A2_7",},
-
-	{0xffb0, "0xffb0", 0,},
-	{0xffb1, "0xffb1", 0,},
-	{0xffb2, "0xffb2", 0,},
-	{0xffb3, "0xffb3", 0,},
-	{0xffb4, "0xffb4", 0,},
-	{0xffb5, "0xffb5", 0,},
-	{0xffb6, "0xffb6", 0,},
-	{0xffb7, "0xffb7", 0,},
-	{0xffb8, "0xffb8", 0,},
-	{0xffb9, "0xffb9", 0,},
-	{0xffba, "0xffba", 0,},
-	{0xffbb, "0xffbb", 0,},
-	{0xffbc, "0xffbc", 0,},
-	{0xffbd, "0xffbd", 0,},
-	{0xffbe, "0xffbe", 0,},
-	{0xffbf, "0xffbf", 0,},
-
-	{0xffc0, "0xffc0", 0,},
-	{0xffc1, "0xffc1", 0,},
-	{0xffc2, "0xffc2", 0,},
-	{0xffc3, "0xffc3", 0,},
-	{0xffc4, "0xffc4", 0,},
-	{0xffc5, "0xffc5", 0,},
-	{0xffc6, "0xffc6", 0,},
-	{0xffc7, "0xffc7", 0,},
-	{0xffc8, "0xffc8", 0,},
-	{0xffc9, "DSCR", "DSP DMA Control Reg",},
-	{0xffca, "0xffca", 0,},
-	{0xffcb, "DSBL", "DSP DMA Block Length",},
-	{0xffcc, "0xffcc", 0,},
-	{0xffcd, "DSPA", "DSP DMA DMEM Address",},
-	{0xffce, "DSMAH", "DSP DMA Mem Address H",},
-	{0xffcf, "DSMAL", "DSP DMA Mem Address L",},
-
-	{0xffd0, "0xffd0",0,},
-	{0xffd1, "SampleFormat", "SampleFormat",},
-	{0xffd2, "0xffd2",0,},
-	{0xffd3, "UnkZelda", "Unk Zelda reads/writes from/to it",},
-	{0xffd4, "ACSAH", "Accelerator start address H",},
-	{0xffd5, "ACSAL", "Accelerator start address L",},
-	{0xffd6, "ACEAH", "Accelerator end address H",},
-	{0xffd7, "ACEAL", "Accelerator end address L",},
-	{0xffd8, "ACCAH", "Accelerator current address H",},
-	{0xffd9, "ACCAL", "Accelerator current address L",},
-	{0xffda, "pred_scale", "pred_scale",},
-	{0xffdb, "yn1", "yn1",},
-	{0xffdc, "yn2", "yn2",},
-	{0xffdd, "ARAM", "Direct Read from ARAM (uses ADPCM)",},
-	{0xffde, "GAIN", "Gain",},
-	{0xffdf, "0xffdf", 0,},
-
-	{0xffe0, "0xffe0",0,},
-	{0xffe1, "0xffe1",0,},
-	{0xffe2, "0xffe2",0,},
-	{0xffe3, "0xffe3",0,},
-	{0xffe4, "0xffe4",0,},
-	{0xffe5, "0xffe5",0,},
-	{0xffe6, "0xffe6",0,},
-	{0xffe7, "0xffe7",0,},
-	{0xffe8, "0xffe8",0,},
-	{0xffe9, "0xffe9",0,},
-	{0xffea, "0xffea",0,},
-	{0xffeb, "0xffeb",0,},
-	{0xffec, "0xffec",0,},
-	{0xffed, "0xffed",0,},
-	{0xffee, "0xffee",0,},
-	{0xffef, "AMDM", "ARAM DMA Request Mask",},
-
-	{0xfff0, "0xfff0",0,},
-	{0xfff1, "0xfff1",0,},
-	{0xfff2, "0xfff2",0,},
-	{0xfff3, "0xfff3",0,},
-	{0xfff4, "0xfff4",0,},
-	{0xfff5, "0xfff5",0,},
-	{0xfff6, "0xfff6",0,},
-	{0xfff7, "0xfff7",0,},
-	{0xfff8, "0xfff8",0,},
-	{0xfff9, "0xfff9",0,},
-	{0xfffa, "0xfffa",0,},
-	{0xfffb, "DIRQ", "DSP IRQ Request",},
-	{0xfffc, "DMBH", "DSP Mailbox H",},
-	{0xfffd, "DMBL", "DSP Mailbox L",},
-	{0xfffe, "CMBH", "CPU Mailbox H",},
-	{0xffff, "CMBL", "CPU Mailbox L",},
-};
-
-const u32 pdlabels_size = sizeof(pdlabels) / sizeof(pdlabel_t);
-
-const pdlabel_t regnames[] =
-{
-	{0x00, "AR0",       "Addr Reg 00",},
-	{0x01, "AR1",       "Addr Reg 01",},
-	{0x02, "AR2",       "Addr Reg 02",},
-	{0x03, "AR3",       "Addr Reg 03",},
-	{0x04, "IX0",       "Index Reg 0",},
-	{0x05, "IX1",       "Index Reg 1",},
-	{0x06, "IX2",       "Index Reg 2",},
-	{0x07, "IX3",       "Index Reg 3",},
-	{0x08, "WR0",       "Wrapping Register 0",},
-	{0x09, "WR1",       "Wrapping Register 1",},
-	{0x0a, "WR2",       "Wrapping Register 2",},
-	{0x0b, "WR3",       "Wrapping Register 3",},
-	{0x0c, "ST0",       "Call stack",},
-	{0x0d, "ST1",       "Data stack",},
-	{0x0e, "ST2",       "Loop addr stack",},
-	{0x0f, "ST3",       "Loop counter",},
-	{0x10, "AC0.H",     "Accu High 0",},
-	{0x11, "AC1.H",     "Accu High 1",},
-	{0x12, "CR",        "Config Register",},
-	{0x13, "SR",        "Special Register",},
-	{0x14, "PROD.L",    "Prod L",},
-	{0x15, "PROD.M1",   "Prod M1",},
-	{0x16, "PROD.H",    "Prod H",},
-	{0x17, "PROD.M2",   "Prod M2",},
-	{0x18, "AX0.L",		"Extra Accu L 0",},
-	{0x19, "AX1.L",		"Extra Accu L 1",},
-	{0x1a, "AX0.H",		"Extra Accu H 0",},
-	{0x1b, "AX1.H",		"Extra Accu H 1",},
-	{0x1c, "AC0.L",		"Accu Low 0",},
-	{0x1d, "AC1.L",		"Accu Low 1",},
-	{0x1e, "AC0.M",		"Accu Mid 0",},
-	{0x1f, "AC1.M",		"Accu Mid 1",},
-
-	// To resolve combined register names.
-	{0x20, "ACC0",		"Accu Full 0",},
-	{0x21, "ACC1",		"Accu Full 1",},
-	{0x22, "AX0",		"Extra Accu 0",},
-	{0x23, "AX1",		"Extra Accu 1",},
-};
-
-const DSPOPCTemplate *opTable[OPTABLE_SIZE];
-const DSPOPCTemplate *extOpTable[EXT_OPTABLE_SIZE];
-u16 writeBackLog[WRITEBACKLOGSIZE];
-int writeBackLogIdx[WRITEBACKLOGSIZE];
-
-const char* pdname(u16 val)
-{
-	static char tmpstr[12]; // nasty
-
-	for (int i = 0; i < (int)(sizeof(pdlabels) / sizeof(pdlabel_t)); i++)
-	{
-		if (pdlabels[i].addr == val)
-			return pdlabels[i].name;
-	}
-
-	sprintf(tmpstr, "0x%04x", val);
-	return tmpstr;
-}
-
-const char *pdregname(int val)
-{
-	return regnames[val].name;
-}
-
-const char *pdregnamelong(int val)
-{
-	return regnames[val].description;
-}
-
-const DSPOPCTemplate *GetOpTemplate(const UDSPInstruction &inst)
-{
-	return opTable[inst];
-}
-
-
-// This function could use the above GetOpTemplate, but then we'd lose the
-// nice property that it catches colliding op masks.
-void InitInstructionTable()
-{
-	// ext op table
-	for (int i = 0; i < EXT_OPTABLE_SIZE; i++)
-		extOpTable[i] = &cw;
-
-	for (int i = 0; i < EXT_OPTABLE_SIZE; i++)
-	{
-		for (int j = 0; j < opcodes_ext_size; j++)
-		{
-			u16 mask = opcodes_ext[j].opcode_mask;
-			if ((mask & i) == opcodes_ext[j].opcode)
-			{
-				if (extOpTable[i] == &cw)
-					extOpTable[i] = &opcodes_ext[j];
-				else
-				{
-					//if the entry already in the table
-					//is a strict subset, allow it
-					if ((extOpTable[i]->opcode_mask | opcodes_ext[j].opcode_mask) != extOpTable[i]->opcode_mask)
-						ERROR_LOG(DSPLLE, "opcode ext table place %d already in use by %s when inserting %s", i, extOpTable[i]->name, opcodes_ext[j].name);
-				}
-			}
-		}
-	}
-
-	// op table
-	for (int i = 0; i < OPTABLE_SIZE; i++)
-		opTable[i] = &cw;
-	
-	for (int i = 0; i < OPTABLE_SIZE; i++)
-	{
-		for (int j = 0; j < opcodes_size; j++)
-		{
-			u16 mask = opcodes[j].opcode_mask;
-			if ((mask & i) == opcodes[j].opcode)
-			{
-				if (opTable[i] == &cw)
-					opTable[i] = &opcodes[j];
-				else
-					ERROR_LOG(DSPLLE, "opcode table place %d already in use for %s", i, opcodes[j].name); 
-			}
-		}
-	}
-
-	for (int i=0; i < WRITEBACKLOGSIZE; i++)
-		writeBackLogIdx[i] = -1;
-}
diff --git a/Source/Core/Core/Src/DSP/DSPTables.h b/Source/Core/Core/Src/DSP/DSPTables.h
deleted file mode 100644
index fdad92bc2b..0000000000
--- a/Source/Core/Core/Src/DSP/DSPTables.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
-
-#ifndef _DSPTABLES_H
-#define _DSPTABLES_H
-
-//nclude "Common.h"
-#include "DSPEmitter.h"
-#include "DSPCommon.h"
-
-// The non-ADDR ones that end with _D are the opposite one - if the bit specify
-// ACC0, then ACC_D will be ACC1.
-
-// The values of these are very important.
-// For the reg ones, the value >> 8 is the base register.
-// & 0x80  means it's a "D".
-
-enum partype_t
-{
-	P_NONE		= 0x0000,
-	P_VAL		= 0x0001,
-	P_IMM		= 0x0002,
-	P_MEM		= 0x0003,
-	P_STR		= 0x0004,
-	P_ADDR_I	= 0x0005,
-	P_ADDR_D	= 0x0006,
-	P_REG		= 0x8000,
-	P_REG04		= P_REG | 0x0400, // IX
-	P_REG08		= P_REG | 0x0800, 
-	P_REG18		= P_REG | 0x1800,
-	P_REGM18	= P_REG | 0x1810, // used in multiply instructions
-	P_REG19		= P_REG | 0x1900,
-	P_REGM19	= P_REG | 0x1910, // used in multiply instructions
-	P_REG1A		= P_REG | 0x1a80,
-	P_REG1C		= P_REG | 0x1c00,
-//	P_ACC		= P_REG | 0x1c10, // used for global accum (gcdsptool's value)
-	P_ACCL		= P_REG | 0x1c00, // used for low part of accum
-	P_ACCM		= P_REG | 0x1e00, // used for mid part of accum
-	// The following are not in gcdsptool
-	P_ACCM_D	= P_REG | 0x1e80,
-	P_ACC		= P_REG | 0x2000, // used for full accum.
-	P_ACC_D		= P_REG | 0x2080,
-	P_AX		= P_REG | 0x2200,
-	P_REGS_MASK	= 0x03f80, // gcdsptool's value = 0x01f80
-	P_REF		= P_REG | 0x4000,
-	P_PRG		= P_REF | P_REG,
-
-	// The following seem like junk:
-	//	P_REG10		= P_REG | 0x1000,
-	//	P_AX_D		= P_REG | 0x2280,
-};
-
-#define OPTABLE_SIZE 0xffff + 1
-#define EXT_OPTABLE_SIZE 0xff + 1
-
-typedef void (*dspIntFunc)(const UDSPInstruction);
-typedef void (DSPEmitter::*dspJitFunc)(const UDSPInstruction);
-
-struct param2_t
-{
-	partype_t type;
-	u8 size;
-	u8 loc;
-	s8 lshift;
-	u16 mask;
-};
-
-typedef struct
-{
-	const char *name;
-	u16 opcode;
-	u16 opcode_mask;
-
-	dspIntFunc intFunc;
-	dspJitFunc jitFunc;
-
-	u8 size;
-	u8 param_count;
-	param2_t params[8];
-	bool extended;
-	bool branch;
-	bool uncond_branch;
-	bool reads_pc;
-	bool updates_sr;
-} DSPOPCTemplate;
-
-typedef DSPOPCTemplate opc_t;
-
-// Opcodes
-extern const DSPOPCTemplate opcodes[];
-extern const int opcodes_size;
-extern const DSPOPCTemplate opcodes_ext[];
-extern const int opcodes_ext_size;
-extern const DSPOPCTemplate cw;
-
-#define WRITEBACKLOGSIZE 5
-
-extern const DSPOPCTemplate *opTable[OPTABLE_SIZE];
-extern const DSPOPCTemplate *extOpTable[EXT_OPTABLE_SIZE];
-extern u16 writeBackLog[WRITEBACKLOGSIZE];
-extern int writeBackLogIdx[WRITEBACKLOGSIZE];
-
-// Predefined labels
-struct pdlabel_t
-{
-	u16 addr;
-	const char* name;
-	const char* description;
-};
-
-extern const pdlabel_t regnames[];
-extern const pdlabel_t pdlabels[];
-extern const u32 pdlabels_size;
-
-const char *pdname(u16 val);
-const char *pdregname(int val);
-const char *pdregnamelong(int val);
-
-void InitInstructionTable();
-void applyWriteBackLog();
-void zeroWriteBackLog();
-void zeroWriteBackLogPreserveAcc(u8 acc);
-
-const DSPOPCTemplate *GetOpTemplate(const UDSPInstruction &inst);
-
-inline void ExecuteInstruction(const UDSPInstruction inst)
-{
-	const DSPOPCTemplate *tinst = GetOpTemplate(inst);
-
-	if (tinst->extended)
-	{
-		if ((inst >> 12) == 0x3)
-			extOpTable[inst & 0x7F]->intFunc(inst);
-		else
-			extOpTable[inst & 0xFF]->intFunc(inst);
-	}
-
-	tinst->intFunc(inst);
-
-	if (tinst->extended)
-	{
-		applyWriteBackLog();
-	}
-}
-
-#endif // _DSPTABLES_H
diff --git a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
deleted file mode 100644
index 4d2b5be3ac..0000000000
--- a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
+++ /dev/null
@@ -1,1151 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-#include "DSPInterpreter.h"
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
-
-// Arithmetic and accumulator control.
-
-namespace DSPInterpreter {
-
-// CLR $acR
-// 1000 r001 xxxx xxxx
-// Clears accumulator $acR
-//
-// flags out: --10 0100
-void clr(const UDSPInstruction opc)
-{
-	u8 reg = (opc >> 11) & 0x1;
-
-	dsp_set_long_acc(reg, 0);
-	Update_SR_Register64(0);
-	zeroWriteBackLog();
-}
-
-// CLRL $acR.l
-// 1111 110r xxxx xxxx
-// Clears (and rounds!) $acR.l - low 16 bits of accumulator $acR.
-//
-// flags out: --xx xx00
-void clrl(const UDSPInstruction opc)
-{
-	u8 reg = (opc >> 8) & 0x1;
-	s64 acc = dsp_round_long_acc(dsp_get_long_acc(reg));
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(reg, acc);
-	Update_SR_Register64(acc);
-}
-
-//----
-
-// ANDCF $acD.m, #I
-// 0000 001r 1100 0000
-// iiii iiii iiii iiii
-// Set logic zero (LZ) flag in status register $sr if result of logic AND of
-// accumulator mid part $acD.m with immediate value I is equal I.
-//
-// flags out: -x-- ----
-void andcf(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-
-	u16 imm = dsp_fetch_code();
-	u16 val = dsp_get_acc_m(reg);
-	Update_SR_LZ(((val & imm) == imm) ? true : false);
-}
-
-// ANDF $acD.m, #I
-// 0000 001r 1010 0000
-// iiii iiii iiii iiii
-// Set logic zero (LZ) flag in status register $sr if result of logical AND
-// operation of accumulator mid part $acD.m with immediate value I is equal
-// immediate value 0.
-//
-// flags out: -x-- ----
-void andf(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-
-	u16 imm = dsp_fetch_code();
-	u16 val = dsp_get_acc_m(reg);
-	Update_SR_LZ(((val & imm) == 0) ? true : false);
-}
-
-//----
-
-// TST
-// 1011 r001 xxxx xxxx
-// Test accumulator %acR.
-//
-// flags out: --xx xx00
-void tst(const UDSPInstruction opc)
-{
-	u8 reg = (opc >> 11) & 0x1;
-
-	s64 acc = dsp_get_long_acc(reg);
-	Update_SR_Register64(acc);
-	zeroWriteBackLog();
-}
-
-// TSTAXH $axR.h
-// 1000 011r xxxx xxxx
-// Test high part of secondary accumulator $axR.h.
-//
-// flags out: --x0 xx00
-void tstaxh(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-
-	s16 val = dsp_get_ax_h(reg);
-	Update_SR_Register16(val);
-	zeroWriteBackLog();
-}
-
-//----
-
-// CMP
-// 1000 0010 xxxx xxxx
-// Compares accumulator $ac0 with accumulator $ac1.
-//
-// flags out: x-xx xxxx
-void cmp(const UDSPInstruction opc)
-{
-	s64 acc0 = dsp_get_long_acc(0);
-	s64 acc1 = dsp_get_long_acc(1);
-	s64 res = dsp_convert_long_acc(acc0 - acc1);
-	
-	Update_SR_Register64(res, isCarry2(acc0, res), isOverflow(acc0, -acc1, res)); // CF -> influence on ABS/0xa100
-	zeroWriteBackLog();
-}
-
-// CMPAR $acS axR.h
-// 1100 0001 xxxx xxxx
-// Compares accumulator $acS with accumulator axR.h.
-// Not described by Duddie's doc - at least not as a separate instruction.
-//
-// flags out: x-xx xxxx
-void cmpar(const UDSPInstruction opc)
-{
-	u8 rreg = ((opc >> 12) & 0x1) + DSP_REG_AXH0;
-	u8 sreg = (opc >> 11) & 0x1;
-
-	s64 sr = dsp_get_long_acc(sreg);
-	s64 rr = (s16)g_dsp.r.ax[rreg-DSP_REG_AXH0].h;
-	rr <<= 16;
-	s64 res = dsp_convert_long_acc(sr - rr);
-	
-	Update_SR_Register64(res, isCarry2(sr, res), isOverflow(sr, -rr, res));
-	zeroWriteBackLog();
-}
-
-// CMPI $amD, #I
-// 0000 001r 1000 0000
-// iiii iiii iiii iiii
-// Compares mid accumulator $acD.hm ($amD) with sign extended immediate value I. 
-// Although flags are being set regarding whole accumulator register.
-//
-// flags out: x-xx xxxx
-void cmpi(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-
-	s64 val = dsp_get_long_acc(reg);
-	s64 imm = (s64)(s16)dsp_fetch_code() << 16; // Immediate is considered to be at M level in the 40-bit accumulator.
-	s64 res = dsp_convert_long_acc(val - imm);
-
-	Update_SR_Register64(res, isCarry2(val, res), isOverflow(val, -imm, res));
-}
-
-// CMPIS $acD, #I
-// 0000 011d iiii iiii
-// Compares accumulator with short immediate. Comaprison is executed
-// by subtracting short immediate (8bit sign extended) from mid accumulator
-// $acD.hm and computing flags based on whole accumulator $acD.
-//
-// flags out: x-xx xxxx
-void cmpis(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(areg);
-	s64 val = (s8)opc;
-	val <<= 16; 
-	s64 res = dsp_convert_long_acc(acc - val);
-
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -val, res));
-}
-
-//----
-
-// XORR $acD.m, $axS.h
-// 0011 00sd 0xxx xxxx
-// Logic XOR (exclusive or) middle part of accumulator $acD.m with
-// high part of secondary accumulator $axS.h.
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void xorr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m ^ g_dsp.r.ax[sreg].h;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// ANDR $acD.m, $axS.h
-// 0011 01sd 0xxx xxxx
-// Logic AND middle part of accumulator $acD.m with high part of
-// secondary accumulator $axS.h.
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void andr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m & g_dsp.r.ax[sreg].h;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// ORR $acD.m, $axS.h
-// 0011 10sd 0xxx xxxx
-// Logic OR middle part of accumulator $acD.m with high part of
-// secondary accumulator $axS.h.
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void orr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m | g_dsp.r.ax[sreg].h;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// ANDC $acD.m, $ac(1-D).m
-// 0011 110d 0xxx xxxx
-// Logic AND middle part of accumulator $acD.m with middle part of
-// accumulator $ac(1-D).m
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void andc(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m & g_dsp.r.ac[1 - dreg].m;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// ORC $acD.m, $ac(1-D).m
-// 0011 111d 0xxx xxxx
-// Logic OR middle part of accumulator $acD.m with middle part of
-// accumulator $ac(1-D).m.
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void orc(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m | g_dsp.r.ac[1 - dreg].m;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// XORC $acD.m
-// 0011 000d 1xxx xxxx
-// Logic XOR (exclusive or) middle part of accumulator $acD.m with $ac(1-D).m
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void xorc(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m ^ g_dsp.r.ac[1 - dreg].m;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// NOT $acD.m
-// 0011 001d 1xxx xxxx
-// Invert all bits in dest reg, aka xor with 0xffff
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void notc(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u16 accm = g_dsp.r.ac[dreg].m ^ 0xffff;
-
-	zeroWriteBackLogPreserveAcc(dreg);
-
-	g_dsp.r.ac[dreg].m = accm;
-	Update_SR_Register16((s16)accm, false, false, isOverS32(dsp_get_long_acc(dreg)));
-}
-
-// XORI $acD.m, #I
-// 0000 001r 0010 0000
-// iiii iiii iiii iiii
-// Logic exclusive or (XOR) of accumulator mid part $acD.m with
-// immediate value I.
-//
-// flags out: --xx xx00
-void xori(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-	u16 imm = dsp_fetch_code();
-	g_dsp.r.ac[reg].m ^= imm;
-
-	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
-}
-
-// ANDI $acD.m, #I
-// 0000 001r 0100 0000
-// iiii iiii iiii iiii
-// Logic AND of accumulator mid part $acD.m with immediate value I.
-//
-// flags out: --xx xx00
-void andi(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-	u16 imm = dsp_fetch_code();
-	g_dsp.r.ac[reg].m &= imm;
-
-	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
-}
-
-// ORI $acD.m, #I
-// 0000 001r 0110 0000
-// iiii iiii iiii iiii
-// Logic OR of accumulator mid part $acD.m with immediate value I.
-//
-// flags out: --xx xx00
-void ori(const UDSPInstruction opc)
-{
-	u8 reg  = (opc >> 8) & 0x1;
-	u16 imm = dsp_fetch_code();
-	g_dsp.r.ac[reg].m |= imm;
-
-	Update_SR_Register16((s16)g_dsp.r.ac[reg].m, false, false, isOverS32(dsp_get_long_acc(reg)));
-}
-
-//----
-
-// ADDR $acD.M, $axS.L
-// 0100 0ssd xxxx xxxx
-// Adds register $axS.L to accumulator $acD.M register.
-//
-// flags out: x-xx xxxx
-void addr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 ax = 0;
-	switch(sreg) {
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
-		break;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
-		break;
-	default:
-		ax = 0;
-		break;
-	}
-	ax <<= 16;
-	s64 res = acc + ax;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, ax, res));
-}
-
-// ADDAX $acD, $axS
-// 0100 10sd xxxx xxxx
-// Adds secondary accumulator $axS to accumulator register $acD.
-//
-// flags out: x-xx xxxx
-void addax(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 ax  = dsp_get_long_acx(sreg);
-	s64 res = acc + ax;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, ax, res));
-}
-
-// ADD $acD, $ac(1-D)
-// 0100 110d xxxx xxxx
-// Adds accumulator $ac(1-D) to accumulator register $acD.
-//
-// flags out: x-xx xxxx
-void add(const UDSPInstruction opc)
-{
-	u8 dreg  = (opc >> 8) & 0x1;
-
-	s64 acc0 = dsp_get_long_acc(dreg);
-	s64 acc1 = dsp_get_long_acc(1 - dreg);
-	s64 res = acc0 + acc1;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc0, res), isOverflow(acc0, acc1, res));
-}
-
-// ADDP $acD
-// 0100 111d xxxx xxxx
-// Adds product register to accumulator register.
-//
-// flags out: x-xx xxxx
-void addp(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 prod = dsp_get_long_prod();
-	s64 res = acc + prod;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, prod, res));
-}
-
-// ADDAXL $acD, $axS.l
-// 0111 00sd xxxx xxxx
-// Adds secondary accumulator $axS.l to accumulator register $acD.
-// should be unsigned values!!
-//
-// flags out: x-xx xxxx
-void addaxl(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 9) & 0x1;
-	u8 dreg = (opc >> 8) & 0x1;
-
-	u64 acc = dsp_get_long_acc(dreg);
-	u16 acx = (u16)dsp_get_ax_l(sreg);
-
-	u64 res = acc + acx;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, (s64)res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64((s64)res, isCarry(acc, res), isOverflow((s64)acc, (s64)acx, (s64)res));
-}
-
-// ADDI $amR, #I 
-// 0000 001r 0000 0000
-// iiii iiii iiii iiii
-// Adds immediate (16-bit sign extended) to mid accumulator $acD.hm.
-//
-// flags out: x-xx xxxx
-void addi(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(areg);
-	s64 imm = (s16)dsp_fetch_code();
-	imm <<= 16;
-	s64 res = acc + imm;
-
-	dsp_set_long_acc(areg, res);
-	res = dsp_get_long_acc(areg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, imm, res));
-}
-
-// ADDIS $acD, #I
-// 0000 010d iiii iiii
-// Adds short immediate (8-bit sign extended) to mid accumulator $acD.hm.
-//
-// flags out: x-xx xxxx
-void addis(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 imm = (s8)(u8)opc;
-	imm <<= 16;
-	s64 res = acc + imm;
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, imm, res));
-}
-
-// INCM $acsD
-// 0111 010d xxxx xxxx
-// Increment 24-bit mid-accumulator $acsD.
-//
-// flags out: x-xx xxxx
-void incm(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 sub = 0x10000;
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 res = acc + sub;
-
-	zeroWriteBackLog();
-	
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, sub, res));
-}
-
-// INC $acD
-// 0111 011d xxxx xxxx
-// Increment accumulator $acD.
-//
-// flags out: x-xx xxxx
-void inc(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 res = acc + 1;	
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, 1, res));
-}
-
-//----
-
-// SUBR $acD.M, $axS.L
-// 0101 0ssd xxxx xxxx
-// Subtracts register $axS.L from accumulator $acD.M register.
-//
-// flags out: x-xx xxxx
-void subr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 ax = 0;
-	switch(sreg) {
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
-		break;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
-		break;
-	default:
-		ax = 0;
-		break;
-	}
-	ax <<= 16;
-	s64 res = acc - ax;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -ax, res));
-}
-
-// SUBAX $acD, $axS
-// 0101 10sd xxxx xxxx
-// Subtracts secondary accumulator $axS from accumulator register $acD.
-//
-// flags out: x-xx xxxx
-void subax(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 acx = dsp_get_long_acx(sreg);
-	s64 res = acc - acx;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -acx, res));
-}
-
-// SUB $acD, $ac(1-D)
-// 0101 110d xxxx xxxx
-// Subtracts accumulator $ac(1-D) from accumulator register $acD. 
-//
-// flags out: x-xx xxxx
-void sub(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc1 = dsp_get_long_acc(dreg);
-	s64 acc2 = dsp_get_long_acc(1 - dreg);
-	s64 res = acc1 - acc2;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc1, res), isOverflow(acc1, -acc2, res));
-}
-
-// SUBP $acD
-// 0101 111d xxxx xxxx
-// Subtracts product register from accumulator register.
-//
-// flags out: x-xx xxxx
-void subp(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 prod = dsp_get_long_prod();
-	s64 res = acc - prod;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -prod, res));
-}
-
-// DECM $acsD
-// 0111 100d xxxx xxxx
-// Decrement 24-bit mid-accumulator $acsD.
-//
-// flags out: x-xx xxxx
-void decm(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x01;
-
-	s64 sub = 0x10000;
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 res = acc - sub;
-
-	zeroWriteBackLog();
-	
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);	
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -sub, res));
-}
-
-// DEC $acD
-// 0111 101d xxxx xxxx
-// Decrement accumulator $acD.
-//
-// flags out: x-xx xxxx
-void dec(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x01;
-
-	s64 acc = dsp_get_long_acc(dreg);
-	s64 res = acc - 1;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, -1, res));
-}
-
-//----
-
-// NEG $acD
-// 0111 110d xxxx xxxx
-// Negate accumulator $acD.
-//
-// flags out: --xx xx00
-void neg(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	
-	s64 acc = dsp_get_long_acc(dreg);
-	acc = 0 - acc;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-// ABS  $acD
-// 1010 d001 xxxx xxxx 
-// absolute value of $acD
-//
-// flags out: --xx xx00
-void abs(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 11) & 0x1;
-
-	s64 acc = dsp_get_long_acc(dreg);
-
-	if (acc < 0)
-		acc = 0 - acc;
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-//----
-
-// MOVR $acD, $axS.R
-// 0110 0srd xxxx xxxx
-// Moves register $axS.R (sign extended) to middle accumulator $acD.hm.
-// Sets $acD.l to 0.
-//
-// flags out: --xx xx00
-void movr(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 8) & 0x1;
-	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
-
-	s64 ax = 0;
-	switch(sreg)
-	{
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
-		break;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXH0].h;
-		break;
-	default:
-		ax = 0;
-		break;
-	}
-	ax <<= 16;
-	ax &= ~0xffff;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(areg, ax);
-	Update_SR_Register64(ax);
-}
-
-// MOVAX $acD, $axS
-// 0110 10sd xxxx xxxx
-// Moves secondary accumulator $axS to accumulator $axD. 
-//
-// flags out: --xx xx00
-void movax(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s64 acx = dsp_get_long_acx(sreg);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acx);
-	Update_SR_Register64(acx);
-}
-
-// MOV $acD, $ac(1-D)
-// 0110 110d xxxx xxxx
-// Moves accumulator $ax(1-D) to accumulator $axD.
-//
-// flags out: --x0 xx00
-void mov(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u64 acc = dsp_get_long_acc(1 - dreg);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(acc);
-}
-
-//----
-
-// LSL16 $acR
-// 1111 000r xxxx xxxx
-// Logically shifts left accumulator $acR by 16.
-//
-// flags out: --xx xx00
-void lsl16(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_acc(areg);
-	acc <<= 16;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(areg, acc);
-	Update_SR_Register64(dsp_get_long_acc(areg));
-}
-
-// LSR16 $acR
-// 1111 010r xxxx xxxx
-// Logically shifts right accumulator $acR by 16.
-//
-// flags out: --xx xx00
-void lsr16(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 8) & 0x1;
-
-	u64 acc = dsp_get_long_acc(areg);
-	acc &= 0x000000FFFFFFFFFFULL; 	// Lop off the extraneous sign extension our 64-bit fake accum causes
-	acc >>= 16; 
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(areg, (s64)acc);
-	Update_SR_Register64(dsp_get_long_acc(areg));
-}
-
-// ASR16 $acR
-// 1001 r001 xxxx xxxx
-// Arithmetically shifts right accumulator $acR by 16.
-//
-// flags out: --xx xx00
-void asr16(const UDSPInstruction opc)
-{
-	u8 areg = (opc >> 11) & 0x1;
-
-	s64 acc = dsp_get_long_acc(areg);
-	acc >>= 16;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(areg, acc);
-	Update_SR_Register64(dsp_get_long_acc(areg));
-}
-
-// LSL $acR, #I
-// 0001 010r 00ii iiii
-// Logically shifts left accumulator $acR by number specified by value I.
-//
-// flags out: --xx xx00
-void lsl(const UDSPInstruction opc) 
-{
-	u8 rreg = (opc >> 8) & 0x01;
-	u16 shift = opc & 0x3f; 
-	u64 acc = dsp_get_long_acc(rreg);
-
-	acc <<= shift;
-
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// LSR $acR, #I
-// 0001 010r 01ii iiii
-// Logically shifts right accumulator $acR by number specified by value
-// calculated by negating sign extended bits 0-6.
-//
-// flags out: --xx xx00
-void lsr(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x01;
-	u16 shift;
-	u64 acc = dsp_get_long_acc(rreg);
-	acc &= 0x000000FFFFFFFFFFULL; 	// Lop off the extraneous sign extension our 64-bit fake accum causes
-
-	if ((opc & 0x3f) == 0)
-		shift = 0;
-	else
-		shift = 0x40 - (opc & 0x3f);
-
-	acc >>= shift;
-	
-	dsp_set_long_acc(rreg, (s64)acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// ASL $acR, #I
-// 0001 010r 10ii iiii
-// Logically shifts left accumulator $acR by number specified by value I.
-//
-// flags out: --xx xx00
-void asl(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x01;
-	u16 shift = opc & 0x3f;
-	u64 acc = dsp_get_long_acc(rreg);
-
-	acc <<= shift;
-	
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// ASR $acR, #I
-// 0001 010r 11ii iiii
-// Arithmetically shifts right accumulator $acR by number specified by
-// value calculated by negating sign extended bits 0-6.
-//
-// flags out: --xx xx00
-void asr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x01;
-	u16 shift;
-
-	if ((opc & 0x3f) == 0)
-		shift = 0;
-	else
-		shift = 0x40 - (opc & 0x3f);
-
-	// arithmetic shift
-	s64 acc = dsp_get_long_acc(dreg);
-	acc >>= shift;
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-// LSRN  (fixed parameters)
-// 0000 0010 1100 1010
-// Logically shifts right accumulator $ACC0 by lower 7-bit (signed) value in $AC1.M
-// (if value negative, becomes left shift).
-//
-// flags out: --xx xx00
-void lsrn(const UDSPInstruction opc)
-{
-	s16 shift; 
-	u16 accm = (u16)dsp_get_acc_m(1);
-	u64 acc = dsp_get_long_acc(0);
-	acc &= 0x000000FFFFFFFFFFULL;
-
-	if ((accm & 0x3f) == 0)
-		shift = 0;
-	else if (accm & 0x40)
-		shift = -0x40 + (accm & 0x3f);
-	else
-		shift = accm & 0x3f;
-
-	if (shift > 0)
-	{
-		acc >>= shift;
-	}
-	else if (shift < 0)
-	{
-		acc <<= -shift;
-	}
-
-	dsp_set_long_acc(0, (s64)acc);
-	Update_SR_Register64(dsp_get_long_acc(0));
-}
-
-// ASRN  (fixed parameters)
-// 0000 0010 1100 1011
-// Arithmetically shifts right accumulator $ACC0 by lower 7-bit (signed) value in $AC1.M
-// (if value negative, becomes left shift).
-//
-// flags out: --xx xx00
-void asrn(const UDSPInstruction opc)
-{
-	s16 shift;
-	u16 accm = (u16)dsp_get_acc_m(1);
-	s64 acc = dsp_get_long_acc(0);
-
-	if ((accm & 0x3f) == 0)
-		shift = 0;
-	else if (accm & 0x40)
-		shift = -0x40 + (accm & 0x3f);
-	else
-		shift = accm & 0x3f;
-
-	if (shift > 0)
-	{
-		acc >>= shift;
-	}
-	else if (shift < 0)
-	{
-		acc <<= -shift;
-	}
-
-	dsp_set_long_acc(0, acc);
-	Update_SR_Register64(dsp_get_long_acc(0));
-}
-
-// LSRNRX $acD, $axS.h
-// 0011 01sd 1xxx xxxx
-// Logically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AX[S].H
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void lsrnrx(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s16 shift;
-	u16 axh = g_dsp.r.ax[sreg].h;
-	u64 acc = dsp_get_long_acc(dreg);
-	acc &= 0x000000FFFFFFFFFFULL;
-
-	if ((axh & 0x3f) == 0)
-		shift = 0;
-	else if (axh & 0x40)
-		shift = -0x40 + (axh & 0x3f);
-	else
-		shift = axh & 0x3f;
-
-	if (shift > 0)
-	{
-		acc <<= shift;
-	}
-	else if (shift < 0)
-	{
-		acc >>= -shift;
-	}
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, (s64)acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-// ASRNRX $acD, $axS.h
-// 0011 10sd 1xxx xxxx
-// Arithmetically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AX[S].H
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void asrnrx(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s16 shift;
-	u16 axh = g_dsp.r.ax[sreg].h;
-	s64 acc = dsp_get_long_acc(dreg);
-
-	if ((axh & 0x3f) == 0)
-		shift = 0;
-	else if (axh & 0x40)
-		shift = -0x40 + (axh & 0x3f);
-	else
-		shift = axh & 0x3f;
-
-	if (shift > 0)
-	{
-		acc <<= shift;
-	}
-	else if (shift < 0)
-	{
-		acc >>= -shift;
-	}
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-// LSRNR  $acD
-// 0011 110d 1xxx xxxx
-// Logically shifts left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void lsrnr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s16 shift;
-	u16 accm = (u16)dsp_get_acc_m(1 - dreg);
-	u64 acc = dsp_get_long_acc(dreg);
-	acc &= 0x000000FFFFFFFFFFULL;
-
-	if ((accm & 0x3f) == 0)
-		shift = 0;
-	else if (accm & 0x40)
-		shift = -0x40 + (accm & 0x3f);
-	else
-		shift = accm & 0x3f;
-
-	if (shift > 0)
-		acc <<= shift;
-	else if (shift < 0)
-		acc >>= -shift;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, (s64)acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-// ASRNR  $acD
-// 0011 111d 1xxx xxxx
-// Arithmetically shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
-// x = extension (7 bits!!)
-//
-// flags out: --xx xx00
-void asrnr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s16 shift;
-	u16 accm = (u16)dsp_get_acc_m(1 - dreg);
-	s64 acc = dsp_get_long_acc(dreg);
-
-	if ((accm & 0x3f) == 0)
-		shift = 0;
-	else if (accm & 0x40)
-		shift = -0x40 + (accm & 0x3f);
-	else
-		shift = accm & 0x3f;
-
-	if (shift > 0)
-		acc <<= shift;
-	else if (shift < 0)
-		acc >>= -shift;
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(dreg));
-}
-
-
-}  // namespace
-
diff --git a/Source/Core/Core/Src/DSP/DspIntBranch.cpp b/Source/Core/Core/Src/DSP/DspIntBranch.cpp
deleted file mode 100644
index a4c861c814..0000000000
--- a/Source/Core/Core/Src/DSP/DspIntBranch.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
-#include "DSPMemoryMap.h"
-#include "DSPStacks.h"
-
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-// Generic call implementation
-// CALLcc addressA
-// 0000 0010 1011 cccc
-// aaaa aaaa aaaa aaaa
-// Call function if condition cc has been met. Push program counter of
-// instruction following "call" to $st0. Set program counter to address
-// represented by value that follows this "call" instruction.
-void call(const UDSPInstruction opc)
-{
-	// must be outside the if.
-	u16 dest = dsp_fetch_code();
-	if (CheckCondition(opc & 0xf))
-	{
-		dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
-		g_dsp.pc = dest;
-	}
-}
-
-// Generic callr implementation
-// CALLRcc $R
-// 0001 0111 rrr1 cccc
-// Call function if condition cc has been met. Push program counter of 
-// instruction following "call" to call stack $st0. Set program counter to 
-// register $R.
-void callr(const UDSPInstruction opc)
-{
-	if (CheckCondition(opc & 0xf))
-	{
-		u8 reg  = (opc >> 5) & 0x7;
-		u16 addr = dsp_op_read_reg(reg);
-		dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
-		g_dsp.pc = addr;
-	}
-}
-
-// Generic if implementation
-// IFcc
-// 0000 0010 0111 cccc
-// Execute following opcode if the condition has been met.
-void ifcc(const UDSPInstruction opc)
-{
-	if (!CheckCondition(opc & 0xf))
-	{
-		// skip the next opcode - we have to lookup its size.
-		dsp_skip_inst();
-	}
-}
-
-// Generic jmp implementation
-// Jcc addressA
-// 0000 0010 1001 cccc
-// aaaa aaaa aaaa aaaa
-// Jump to addressA if condition cc has been met. Set program counter to
-// address represented by value that follows this "jmp" instruction.
-void jcc(const UDSPInstruction opc)
-{
-	u16 dest = dsp_fetch_code();
-	if (CheckCondition(opc & 0xf))
-	{
-		g_dsp.pc = dest;
-	}
-}
-
-// Generic jmpr implementation
-// JMPcc $R
-// 0001 0111 rrr0 cccc
-// Jump to address; set program counter to a value from register $R.
-void jmprcc(const UDSPInstruction opc)
-{
-	if (CheckCondition(opc & 0xf))
-	{
-		u8 reg  = (opc >> 5) & 0x7;
-		g_dsp.pc = dsp_op_read_reg(reg);
-	} 
-}
-
-// Generic ret implementation
-// RETcc
-// 0000 0010 1101 cccc
-// Return from subroutine if condition cc has been met. Pops stored PC
-// from call stack $st0 and sets $pc to this location.
-void ret(const UDSPInstruction opc)
-{
-	if (CheckCondition(opc & 0xf))
-	{
-		g_dsp.pc = dsp_reg_load_stack(DSP_STACK_C);
-	}
-}
-
-// RTI
-// 0000 0010 1111 1111
-// Return from exception. Pops stored status register $sr from data stack
-// $st1 and program counter PC from call stack $st0 and sets $pc to this
-// location.
-void rti(const UDSPInstruction opc)
-{
-	g_dsp.r.sr = dsp_reg_load_stack(DSP_STACK_D);
-	g_dsp.pc = dsp_reg_load_stack(DSP_STACK_C);
-
-}
-
-// HALT
-// 0000 0000 0020 0001 
-// Stops execution of DSP code. Sets bit DSP_CR_HALT in register DREG_CR.
-void halt(const UDSPInstruction opc)
-{
-	g_dsp.cr |= 0x4;
-	g_dsp.pc--;
-}
-
-
-// LOOP handling: Loop stack is used to control execution of repeated blocks of
-// instructions. Whenever there is value on stack $st2 and current PC is equal
-// value at $st2, then value at stack $st3 is decremented. If value is not zero
-// then PC is modified with value from call stack $st0. Otherwise values from
-// call stack $st0 and both loop stacks $st2 and $st3 are popped and execution
-// continues at next opcode.
-void HandleLoop()
-{
-	// Handle looping hardware. 
-	const u16 rCallAddress = g_dsp.r.st[0];
-	const u16 rLoopAddress = g_dsp.r.st[2];
-	u16& rLoopCounter = g_dsp.r.st[3];
-
-	if (rLoopAddress > 0 && rLoopCounter > 0)
-	{
-		// FIXME: why -1? because we just read past it.
-		if (g_dsp.pc - 1 == rLoopAddress)
-		{
-			rLoopCounter--;
-			if (rLoopCounter > 0)
-			{
-				g_dsp.pc = rCallAddress;
-			}
-			else
-			{
-				// end of loop
-				dsp_reg_load_stack(0);
-				dsp_reg_load_stack(2);
-				dsp_reg_load_stack(3);
-			}
-		}
-	}
-}
-
-
-// LOOP $R
-// 0000 0000 010r rrrr
-// Repeatedly execute following opcode until counter specified by value
-// from register $R reaches zero. Each execution decrement counter. Register
-// $R remains unchanged. If register $R is set to zero at the beginning of loop
-// then looped instruction will not get executed.
-// Actually, this instruction simply prepares the loop stacks for the above.
-// The looping hardware takes care of the rest.
-void loop(const UDSPInstruction opc)
-{
-	u16 reg = opc & 0x1f;
-	u16 cnt = dsp_op_read_reg(reg);
-	u16 loop_pc = g_dsp.pc;
-
-	if (cnt)
-	{
-		dsp_reg_store_stack(0, g_dsp.pc);
-		dsp_reg_store_stack(2, loop_pc);
-		dsp_reg_store_stack(3, cnt);
-	}
-	else
-	{
-		dsp_skip_inst();
-	}
-}
-
-// LOOPI #I
-// 0001 0000 iiii iiii
-// Repeatedly execute following opcode until counter specified by
-// immediate value I reaches zero. Each execution decrement counter. If
-// immediate value I is set to zero at the beginning of loop then looped
-// instruction will not get executed.
-// Actually, this instruction simply prepares the loop stacks for the above.
-// The looping hardware takes care of the rest.
-void loopi(const UDSPInstruction opc)
-{
-	u16 cnt = opc & 0xff;
-	u16 loop_pc = g_dsp.pc;
-
-	if (cnt)
-	{
-		dsp_reg_store_stack(0, g_dsp.pc);
-		dsp_reg_store_stack(2, loop_pc);
-		dsp_reg_store_stack(3, cnt);
-	}
-	else
-	{
-		dsp_skip_inst();
-	}
-}
-
-
-// BLOOP $R, addrA
-// 0000 0000 011r rrrr
-// aaaa aaaa aaaa aaaa
-// Repeatedly execute block of code starting at following opcode until
-// counter specified by value from register $R reaches zero. Block ends at
-// specified address addrA inclusive, ie. opcode at addrA is the last opcode
-// included in loop. Counter is pushed on loop stack $st3, end of block address
-// is pushed on loop stack $st2 and repeat address is pushed on call stack $st0.
-// Up to 4 nested loops are allowed.
-void bloop(const UDSPInstruction opc)
-{
-	u16 reg = opc & 0x1f;
-	u16 cnt = dsp_op_read_reg(reg);
-	u16 loop_pc = dsp_fetch_code();
-
-	if (cnt)
-	{
-		dsp_reg_store_stack(0, g_dsp.pc);
-		dsp_reg_store_stack(2, loop_pc);
-		dsp_reg_store_stack(3, cnt);
-	}
-	else
-	{
-		g_dsp.pc = loop_pc;
-		dsp_skip_inst();
-	}
-}
-
-// BLOOPI #I, addrA
-// 0001 0001 iiii iiii
-// aaaa aaaa aaaa aaaa
-// Repeatedly execute block of code starting at following opcode until
-// counter specified by immediate value I reaches zero. Block ends at specified
-// address addrA inclusive, ie. opcode at addrA is the last opcode included in
-// loop. Counter is pushed on loop stack $st3, end of block address is pushed
-// on loop stack $st2 and repeat address is pushed on call stack $st0. Up to 4
-// nested loops are allowed.
-void bloopi(const UDSPInstruction opc)
-{
-	u16 cnt = opc & 0xff;
-	u16 loop_pc = dsp_fetch_code();
-
-	if (cnt) 
-	{
-		dsp_reg_store_stack(0, g_dsp.pc);
-		dsp_reg_store_stack(2, loop_pc);
-		dsp_reg_store_stack(3, cnt);
-	}
-	else
-	{
-		g_dsp.pc = loop_pc;
-		dsp_skip_inst();
-	}
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp b/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
deleted file mode 100644
index b1a8f1b868..0000000000
--- a/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-#include "DSPInterpreter.h"
-
-#include "DSPMemoryMap.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-// SRS @M, $(0x18+S)
-// 0010 1sss mmmm mmmm
-// Move value from register $(0x18+D) to data memory pointed by address 
-// CR[0-7] | M. That is, the upper 8 bits of the address are the 
-// bottom 8 bits from CR, and the lower 8 bits are from the 8-bit immediate.  
-// Note: pc+=2 in duddie's doc seems wrong
-void srs(const UDSPInstruction opc)
-{
-	u8 reg   = ((opc >> 8) & 0x7) + 0x18;
-	u16 addr = (g_dsp.r.cr << 8) | (opc & 0xFF);
-	
-	if (reg >= DSP_REG_ACM0)
-		dsp_dmem_write(addr, dsp_op_read_reg_and_saturate(reg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(addr, dsp_op_read_reg(reg));
-}
-
-// LRS $(0x18+D), @M
-// 0010 0ddd mmmm mmmm
-// Move value from data memory pointed by address CR[0-7] | M to register
-// $(0x18+D).  That is, the upper 8 bits of the address are the bottom 8 bits
-// from CR, and the lower 8 bits are from the 8-bit immediate.
-void lrs(const UDSPInstruction opc)
-{
-	u8 reg   = ((opc >> 8) & 0x7) + 0x18;
-	u16 addr = (g_dsp.r.cr << 8) | (opc & 0xFF);
-	dsp_op_write_reg(reg, dsp_dmem_read(addr));
-	dsp_conditional_extend_accum(reg);
-}
-
-// LR $D, @M
-// 0000 0000 110d dddd
-// mmmm mmmm mmmm mmmm
-// Move value from data memory pointed by address M to register $D.
-void lr(const UDSPInstruction opc)
-{
-	u8 reg   = opc & DSP_REG_MASK;
-	u16 addr = dsp_fetch_code();
-	u16 val  = dsp_dmem_read(addr);
-	dsp_op_write_reg(reg, val);
-	dsp_conditional_extend_accum(reg);
-}
-
-// SR @M, $S
-// 0000 0000 111s ssss
-// mmmm mmmm mmmm mmmm
-// Store value from register $S to a memory pointed by address M.
-void sr(const UDSPInstruction opc)
-{
-	u8 reg   = opc & DSP_REG_MASK;
-	u16 addr = dsp_fetch_code();
-
-	if (reg >= DSP_REG_ACM0)
-		dsp_dmem_write(addr, dsp_op_read_reg_and_saturate(reg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(addr, dsp_op_read_reg(reg));
-}
-
-// SI @M, #I
-// 0001 0110 mmmm mmmm
-// iiii iiii iiii iiii
-// Store 16-bit immediate value I to a memory location pointed by address
-// M (M is 8-bit value sign extended).
-void si(const UDSPInstruction opc)
-{
-	u16 addr = (s8)opc;
-	u16 imm = dsp_fetch_code();
-	dsp_dmem_write(addr, imm);
-}
-
-// LRR $D, @$S
-// 0001 1000 0ssd dddd
-// Move value from data memory pointed by addressing register $S to register $D.
-void lrr(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 5) & 0x3;
-	u8 dreg = opc & 0x1f;
-
-	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
-	dsp_op_write_reg(dreg, val);
-	dsp_conditional_extend_accum(dreg);
-}
-
-// LRRD $D, @$S
-// 0001 1000 1ssd dddd
-// Move value from data memory pointed by addressing register $S toregister $D.
-// Decrement register $S. 
-void lrrd(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 5) & 0x3;
-	u8 dreg = opc & 0x1f;
-
-	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
-	dsp_op_write_reg(dreg, val);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[sreg] = dsp_decrement_addr_reg(sreg);
-}
-
-// LRRI $D, @$S
-// 0001 1001 0ssd dddd
-// Move value from data memory pointed by addressing register $S to register $D.
-// Increment register $S. 
-void lrri(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 5) & 0x3;
-	u8 dreg = opc & 0x1f;
-
-	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
-	dsp_op_write_reg(dreg, val);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[sreg] = dsp_increment_addr_reg(sreg);
-}
-
-// LRRN $D, @$S
-// 0001 1001 1ssd dddd
-// Move value from data memory pointed by addressing register $S to register $D.
-// Add indexing register $(0x4+S) to register $S. 
-void lrrn(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 5) & 0x3;
-	u8 dreg = opc & 0x1f;
-
-	u16 val = dsp_dmem_read(dsp_op_read_reg(sreg));
-	dsp_op_write_reg(dreg, val);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[sreg] = dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]);
-}
-
-// SRR @$D, $S
-// 0001 1010 0dds ssss
-// Store value from source register $S to a memory location pointed by 
-// addressing register $D. 
-void srr(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 5) & 0x3;
-	u8 sreg = opc & 0x1f;
-
-	if (sreg >= DSP_REG_ACM0)
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
-}
-
-// SRRD @$D, $S
-// 0001 1010 1dds ssss
-// Store value from source register $S to a memory location pointed by
-// addressing register $D. Decrement register $D. 
-void srrd(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 5) & 0x3;
-	u8 sreg = opc & 0x1f;
-
-	if (sreg >= DSP_REG_ACM0)
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
-
-	g_dsp.r.ar[dreg] = dsp_decrement_addr_reg(dreg);
-}
-
-// SRRI @$D, $S
-// 0001 1011 0dds ssss
-// Store value from source register $S to a memory location pointed by
-// addressing register $D. Increment register $D. 
-void srri(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 5) & 0x3;
-	u8 sreg = opc & 0x1f;
-
-	if (sreg >= DSP_REG_ACM0)
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
-
-	g_dsp.r.ar[dreg] = dsp_increment_addr_reg(dreg);
-}
-
-// SRRN @$D, $S
-// 0001 1011 1dds ssss
-// Store value from source register $S to a memory location pointed by
-// addressing register $D. Add DSP_REG_IX0 register to register $D.
-void srrn(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 5) & 0x3;
-	u8 sreg = opc & 0x1f;
-
-	if (sreg >= DSP_REG_ACM0)
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
-	else
-		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg(sreg));
-
-	g_dsp.r.ar[dreg] = dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]);
-}
-
-// ILRR $acD.m, @$arS
-// 0000 001d 0001 00ss
-// Move value from instruction memory pointed by addressing register
-// $arS to mid accumulator register $acD.m.
-void ilrr(const UDSPInstruction opc)
-{
-	u16 reg  = opc & 0x3;
-	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
-
-	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
-	dsp_conditional_extend_accum(dreg);
-}
-
-// ILRRD $acD.m, @$arS
-// 0000 001d 0001 01ss
-// Move value from instruction memory pointed by addressing register
-// $arS to mid accumulator register $acD.m. Decrement addressing register $arS.
-void ilrrd(const UDSPInstruction opc)
-{
-	u16 reg  = opc & 0x3;
-	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
-
-	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[reg] = dsp_decrement_addr_reg(reg);
-}
-
-// ILRRI $acD.m, @$S
-// 0000 001d 0001 10ss
-// Move value from instruction memory pointed by addressing register
-// $arS to mid accumulator register $acD.m. Increment addressing register $arS.
-void ilrri(const UDSPInstruction opc)
-{
-	u16 reg  = opc & 0x3;
-	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
-
-	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[reg] = dsp_increment_addr_reg(reg);
-}
-
-// ILRRN $acD.m, @$arS
-// 0000 001d 0001 11ss
-// Move value from instruction memory pointed by addressing register
-// $arS to mid accumulator register $acD.m. Add corresponding indexing
-// register $ixS to addressing register $arS.
-void ilrrn(const UDSPInstruction opc)
-{
-	u16 reg  = opc & 0x3;
-	u16 dreg = DSP_REG_ACM0 + ((opc >> 8) & 1);
-
-	g_dsp.r.ac[dreg-DSP_REG_ACM0].m = dsp_imem_read(g_dsp.r.ar[reg]);
-	dsp_conditional_extend_accum(dreg);
-	g_dsp.r.ar[reg] = dsp_increase_addr_reg(reg, (s16)g_dsp.r.ix[reg]);
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DspIntMisc.cpp b/Source/Core/Core/Src/DSP/DspIntMisc.cpp
deleted file mode 100644
index 93d04d15b0..0000000000
--- a/Source/Core/Core/Src/DSP/DspIntMisc.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-
-#include "DSPInterpreter.h"
-
-#include "DSPCore.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-// MRR $D, $S
-// 0001 11dd ddds ssss
-// Move value from register $S to register $D.
-void mrr(const UDSPInstruction opc)
-{
-	u8 sreg = opc & 0x1f;
-	u8 dreg = (opc >> 5) & 0x1f;
-
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_write_reg(dreg, dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
-	else
-		dsp_op_write_reg(dreg, dsp_op_read_reg(sreg));
-	
-	dsp_conditional_extend_accum(dreg);
-}
-
-// LRI $D, #I
-// 0000 0000 100d dddd
-// iiii iiii iiii iiii
-// Load immediate value I to register $D. 
-//
-// DSPSpy discovery: This, and possibly other instructions that load a
-// register, has a different behaviour in S40 mode if loaded to AC0.M: The
-// value gets sign extended to the whole accumulator! This does not happen in
-// S16 mode.
-void lri(const UDSPInstruction opc)
-{
-	u8 reg  = opc & DSP_REG_MASK;
-	u16 imm = dsp_fetch_code();
-	dsp_op_write_reg(reg, imm);
-	dsp_conditional_extend_accum(reg);
-}
-
-// LRIS $(0x18+D), #I
-// 0000 1ddd iiii iiii
-// Load immediate value I (8-bit sign extended) to accumulator register. 
-void lris(const UDSPInstruction opc)
-{
-	u8 reg  = ((opc >> 8) & 0x7) + DSP_REG_AXL0;
-	u16 imm = (s8)opc;
-	dsp_op_write_reg(reg, imm);
-	dsp_conditional_extend_accum(reg);
-}
-
-//----
-
-// NX
-// 1000 -000 xxxx xxxx
-// No operation, but can be extended with extended opcode.
-// This opcode is supposed to do nothing - it's used if you want to use
-// an opcode extension but not do anything. At least according to duddie.
-void nx(const UDSPInstruction opc)
-{
-	zeroWriteBackLog();
-}
-
-//----
-
-// DAR $arD
-// 0000 0000 0000 01dd
-// Decrement address register $arD.
-void dar(const UDSPInstruction opc)
-{
-	g_dsp.r.ar[opc & 0x3] = dsp_decrement_addr_reg(opc & 0x3);
-}
-
-// IAR $arD
-// 0000 0000 0000 10dd
-// Increment address register $arD.
-void iar(const UDSPInstruction opc)
-{
-	g_dsp.r.ar[opc & 0x3] = dsp_increment_addr_reg(opc & 0x3);
-}
-
-// SUBARN $arD  
-// 0000 0000 0000 11dd
-// Subtract indexing register $ixD from an addressing register $arD.
-// used only in IPL-NTSC ucode
-void subarn(const UDSPInstruction opc)
-{
-	u8 dreg = opc & 0x3;
-	g_dsp.r.ar[dreg] = dsp_decrease_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]);
-}
-
-// ADDARN $arD, $ixS
-// 0000 0000 0001 ssdd
-// Adds indexing register $ixS to an addressing register $arD.
-// It is critical for the Zelda ucode that this one wraps correctly.
-void addarn(const UDSPInstruction opc)
-{
-	u8 dreg = opc & 0x3;
-	u8 sreg = (opc >> 2) & 0x3;
-	g_dsp.r.ar[dreg] = dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[sreg]);
-}
-
-//----
-
-// SBCLR #I
-// 0001 0011 aaaa aiii
-// bit of status register $sr. Bit number is calculated by adding 6 to
-// immediate value I.
-void sbclr(const UDSPInstruction opc)
-{
-	u8 bit = (opc & 0x7) + 6;
-	g_dsp.r.sr &= ~(1 << bit);
-}
-
-// SBSET #I
-// 0001 0010 aaaa aiii
-// Set bit of status register $sr. Bit number is calculated by adding 6 to
-// immediate value I.
-void sbset(const UDSPInstruction opc)
-{
-	u8 bit = (opc & 0x7) + 6;
-	g_dsp.r.sr |= (1 << bit);
-}
-
-// This is a bunch of flag setters, flipping bits in SR. 
-void srbith(const UDSPInstruction opc)
-{
-	zeroWriteBackLog();
-	switch ((opc >> 8) & 0xf)
-	{
-	case 0xa:  // M2
-		g_dsp.r.sr &= ~SR_MUL_MODIFY;
-		break;
-	case 0xb:  // M0
-		g_dsp.r.sr |= SR_MUL_MODIFY;
-		break;
-	case 0xc:  // CLR15
-		g_dsp.r.sr &= ~SR_MUL_UNSIGNED;
-		break;
-	case 0xd:  // SET15
-		g_dsp.r.sr |= SR_MUL_UNSIGNED;
-		break;
-	case 0xe:  // SET16 (CLR40)
-		g_dsp.r.sr &= ~SR_40_MODE_BIT;
-		break;
-	case 0xf:  // SET40
-		g_dsp.r.sr |= SR_40_MODE_BIT;
-		break;
-	default:
-		break;
-	}
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp b/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
deleted file mode 100644
index 5a1b98e4b7..0000000000
--- a/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
+++ /dev/null
@@ -1,596 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-
-// Multiplier and product register control
-
-#include "DSPInterpreter.h"
-
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-// Only MULX family instructions have unsigned/mixed support.
-inline s64 dsp_get_multiply_prod(u16 a, u16 b, u8 sign)
-{
-	s64 prod;
-
-	if ((sign == 1) && (g_dsp.r.sr & SR_MUL_UNSIGNED)) //unsigned
-		prod = (u32)(a * b);
-	else if ((sign == 2) && (g_dsp.r.sr & SR_MUL_UNSIGNED)) //mixed
-		prod = a * (s16)b;
-	else
-		prod = (s16)a * (s16)b; //signed
-
-	// Conditionally multiply by 2.
-	if ((g_dsp.r.sr & SR_MUL_MODIFY) == 0)
-		prod <<= 1;
-
-	return prod;
-}
-	
-inline s64 dsp_multiply(u16 a, u16 b, u8 sign = 0)
-{
-	s64 prod = dsp_get_multiply_prod(a, b, sign);
-	return prod;
-}
-
-inline s64 dsp_multiply_add(u16 a, u16 b, u8 sign = 0)
-{
-	s64 prod = dsp_get_long_prod() + dsp_get_multiply_prod(a, b, sign);
-	return prod;
-}
-
-inline s64 dsp_multiply_sub(u16 a, u16 b, u8 sign = 0)
-{
-	s64 prod = dsp_get_long_prod() - dsp_get_multiply_prod(a, b, sign);
-	return prod;
-}
-
-inline s64 dsp_multiply_mulx(u8 axh0, u8 axh1, u16 val1, u16 val2)
-{
-	s64 result;
-
-	if ((axh0==0) && (axh1==0))
-		result = dsp_multiply(val1, val2, 1); // unsigned support ON if both ax?.l regs are used
-	else if ((axh0==0) && (axh1==1))
-		result = dsp_multiply(val1, val2, 2); // mixed support ON (u16)axl.0  * (s16)axh.1
-	else if ((axh0==1) && (axh1==0))
-		result = dsp_multiply(val2, val1, 2); // mixed support ON (u16)axl.1  * (s16)axh.0
-	else
-		result = dsp_multiply(val1, val2, 0); // unsigned support OFF if both ax?.h regs are used
-
-	return result;
-}
-
-//----
-
-// CLRP
-// 1000 0100 xxxx xxxx
-// Clears product register $prod.
-// Magic numbers taken from duddie's doc
-//
-// 00ff_(fff0 + 0010)_0000 = 0100_0000_0000, conveniently, lower 40bits = 0
-//
-// It's not ok, to just zero all of them, correct values should be set because of
-// direct use of prod regs by AX/AXWII (look @that part of ucode).
-void clrp(const UDSPInstruction opc)
-{
-	zeroWriteBackLog();
-
-	g_dsp.r.prod.l = 0x0000;
-	g_dsp.r.prod.m = 0xfff0;
-	g_dsp.r.prod.h = 0x00ff;
-	g_dsp.r.prod.m2 = 0x0010;
-}
-
-// TSTPROD
-// 1000 0101 xxxx xxxx
-// Test prod regs value.
-//
-// flags out: --xx xx0x
-void tstprod(const UDSPInstruction opc)
-{
-	s64 prod = dsp_get_long_prod();
-	Update_SR_Register64(prod);
-	zeroWriteBackLog();
-}
-
-//----
-
-// MOVP $acD
-// 0110 111d xxxx xxxx
-// Moves multiply product from $prod register to accumulator $acD register.
-//
-// flags out: --xx xx0x
-void movp(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = dsp_get_long_prod();
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(acc);
-}
-
-// MOVNP $acD
-// 0111 111d xxxx xxxx 
-// Moves negative of multiply product from $prod register to accumulator
-// $acD register.
-//
-// flags out: --xx xx0x
-void movnp(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-
-	s64 acc = -dsp_get_long_prod();
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(acc);
-}
-
-// MOVPZ $acD
-// 1111 111d xxxx xxxx
-// Moves multiply product from $prod register to accumulator $acD
-// register and sets (rounds) $acD.l to 0
-//
-// flags out: --xx xx0x
-void movpz(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x01;
-
-	s64 acc = dsp_get_long_prod_round_prodl();
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, acc);
-	Update_SR_Register64(acc);
-}
-
-// ADDPAXZ $acD, $axS
-// 1111 10sd xxxx xxxx
-// Adds secondary accumulator $axS to product register and stores result
-// in accumulator register. Low 16-bits of $acD ($acD.l) are set (round) to 0.
-//
-// TODO: ugly code and still small error here (+/- 1 in .m - randomly) 
-// flags out: --xx xx0x
-void addpaxz(const UDSPInstruction opc)
-{
-	u8 dreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	s64 oldprod = dsp_get_long_prod();
-	s64 prod = dsp_get_long_prod_round_prodl();
-	s64 ax = dsp_get_long_acx(sreg);
-	s64 res = prod + (ax & ~0xffff);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_acc(dreg, res);
-	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry(oldprod, res), false); 
-}
-
-//----
-
-// MULAXH
-// 1000 0011 xxxx xxxx
-// Multiply $ax0.h by $ax0.h 
-void mulaxh(const UDSPInstruction opc)
-{
-	s64 prod = dsp_multiply(dsp_get_ax_h(0), dsp_get_ax_h(0));
-
-	zeroWriteBackLog();
-	
-	dsp_set_long_prod(prod);
-}
-
-//----
-
-// MUL $axS.l, $axS.h
-// 1001 s000 xxxx xxxx
-// Multiply low part $axS.l of secondary accumulator $axS by high part
-// $axS.h of secondary accumulator $axS (treat them both as signed).
-void mul(const UDSPInstruction opc)
-{
-	u8 sreg  = (opc >> 11) & 0x1;
-
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply(axh, axl);
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MULAC $axS.l, $axS.h, $acR
-// 1001 s10r xxxx xxxx
-// Add product register to accumulator register $acR. Multiply low part
-// $axS.l of secondary accumulator $axS by high part $axS.h of secondary
-// accumulator $axS (treat them both as signed).
-//
-// flags out: --xx xx0x
-void mulac(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 11) & 0x1;
-
-	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply(axl, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULMV $axS.l, $axS.h, $acR
-// 1001 s11r xxxx xxxx
-// Move product register to accumulator register $acR. Multiply low part
-// $axS.l of secondary accumulator $axS by high part $axS.h of secondary
-// accumulator $axS (treat them both as signed).
-//
-// flags out: --xx xx0x
-void mulmv(const UDSPInstruction opc)
-{
-	u8 rreg  = (opc >> 8) & 0x1;
-	u8 sreg  = ((opc >> 11) & 0x1);
-
-	s64 acc = dsp_get_long_prod();
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply(axl, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULMVZ $axS.l, $axS.h, $acR
-// 1001 s01r xxxx xxxx
-// Move product register to accumulator register $acR and clear (round) low part
-// of accumulator register $acR.l. Multiply low part $axS.l of secondary
-// accumulator $axS by high part $axS.h of secondary accumulator $axS (treat
-// them both as signed).
-//
-// flags out: --xx xx0x
-void mulmvz(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 11) & 0x1;
-
-	s64 acc = dsp_get_long_prod_round_prodl();
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply(axl, axh);
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-//----
-
-// MULX $ax0.S, $ax1.T
-// 101s t000 xxxx xxxx
-// Multiply one part $ax0 by one part $ax1.
-// Part is selected by S and T bits. Zero selects low part, one selects high part.
-void mulx(const UDSPInstruction opc)
-{
-	u8 treg = ((opc >> 11) & 0x1);
-	u8 sreg = ((opc >> 12) & 0x1);
-
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MULXAC $ax0.S, $ax1.T, $acR
-// 101s t01r xxxx xxxx
-// Add product register to accumulator register $acR. Multiply one part
-// $ax0 by one part $ax1. Part is selected by S and
-// T bits. Zero selects low part, one selects high part.
-//
-// flags out: --xx xx0x
-void mulxac(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 treg = (opc >> 11) & 0x1;
-	u8 sreg = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULXMV $ax0.S, $ax1.T, $acR
-// 101s t11r xxxx xxxx
-// Move product register to accumulator register $acR. Multiply one part
-// $ax0 by one part $ax1. Part is selected by S and
-// T bits. Zero selects low part, one selects high part.
-//
-// flags out: --xx xx0x
-void mulxmv(const UDSPInstruction opc)
-{
-	u8 rreg = ((opc >> 8) & 0x1);
-	u8 treg = (opc >> 11) & 0x1;
-	u8 sreg = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_prod();
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULXMVZ $ax0.S, $ax1.T, $acR
-// 101s t01r xxxx xxxx
-// Move product register to accumulator register $acR and clear (round) low part
-// of accumulator register $acR.l. Multiply one part $ax0 by one part $ax1
-// Part is selected by S and T bits. Zero selects low part,
-// one selects high part.
-//
-// flags out: --xx xx0x
-void mulxmvz(const UDSPInstruction opc)
-{
-	u8 rreg  = (opc >> 8) & 0x1;
-	u8 treg = (opc >> 11) & 0x1;
-	u8 sreg = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_prod_round_prodl();
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-//----
-
-// MULC $acS.m, $axT.h
-// 110s t000 xxxx xxxx
-// Multiply mid part of accumulator register $acS.m by high part $axS.h of
-// secondary accumulator $axS (treat them both as signed).
-void mulc(const UDSPInstruction opc)
-{
-	u8 treg = (opc >> 11) & 0x1;
-	u8 sreg = (opc >> 12) & 0x1;
-
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply(accm, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MULCAC $acS.m, $axT.h, $acR
-// 110s	t10r xxxx xxxx
-// Multiply mid part of accumulator register $acS.m by high part $axS.h of
-// secondary accumulator $axS  (treat them both as signed). Add product
-// register before multiplication to accumulator $acR.
-//
-// flags out: --xx xx0x
-void mulcac(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 treg  = (opc >> 11) & 0x1;
-	u8 sreg  = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_acc(rreg) + dsp_get_long_prod();
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply(accm, axh);
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULCMV $acS.m, $axT.h, $acR
-// 110s t11r xxxx xxxx
-// Multiply mid part of accumulator register $acS.m by high part $axT.h of
-// secondary accumulator $axT  (treat them both as signed). Move product
-// register before multiplication to accumulator $acR.
-// possible mistake in duddie's doc axT.h rather than axS.h
-//
-// flags out: --xx xx0x
-void mulcmv(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 treg  = (opc >> 11) & 0x1;
-	u8 sreg  = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_prod();
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply(accm, axh);
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-// MULCMVZ $acS.m, $axT.h, $acR
-// 110s	t01r xxxx xxxx
-// (fixed possible bug in duddie's description, s->t)
-// Multiply mid part of accumulator register $acS.m by high part $axT.h of
-// secondary accumulator $axT  (treat them both as signed). Move product
-// register before multiplication to accumulator $acR, set (round) low part of 
-// accumulator $acR.l to zero.
-//
-// flags out: --xx xx0x
-void mulcmvz(const UDSPInstruction opc)
-{
-	u8 rreg = (opc >> 8) & 0x1;
-	u8 treg  = (opc >> 11) & 0x1;
-	u8 sreg  = (opc >> 12) & 0x1;
-
-	s64 acc = dsp_get_long_prod_round_prodl();
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply(accm, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-	dsp_set_long_acc(rreg, acc);
-	Update_SR_Register64(dsp_get_long_acc(rreg));
-}
-
-//----
-
-// MADDX ax0.S ax1.T
-// 1110 00st xxxx xxxx
-// Multiply one part of secondary accumulator $ax0 (selected by S) by
-// one part of secondary accumulator $ax1 (selected by T) (treat them both as
-// signed) and add result to product register.
-void maddx(const UDSPInstruction opc)
-{
-	u8 treg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_add(val1, val2);
-	
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MSUBX $(0x18+S*2), $(0x19+T*2)
-// 1110 01st xxxx xxxx
-// Multiply one part of secondary accumulator $ax0 (selected by S) by
-// one part of secondary accumulator $ax1 (selected by T) (treat them both as
-// signed) and subtract result from product register.
-void msubx(const UDSPInstruction opc)
-{
-	u8 treg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
-	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
-	s64 prod = dsp_multiply_sub(val1, val2);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MADDC $acS.m, $axT.h
-// 1110 10st xxxx xxxx
-// Multiply middle part of accumulator $acS.m by high part of secondary
-// accumulator $axT.h (treat them both as signed) and add result to product
-// register.
-void maddc(const UDSPInstruction opc)
-{
-	u8 treg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply_add(accm, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MSUBC $acS.m, $axT.h
-// 1110 11st xxxx xxxx
-// Multiply middle part of accumulator $acS.m by high part of secondary
-// accumulator $axT.h (treat them both as signed) and subtract result from
-// product register.
-void msubc(const UDSPInstruction opc)
-{
-	u8 treg = (opc >> 8) & 0x1;
-	u8 sreg = (opc >> 9) & 0x1;
-	
-	u16 accm = dsp_get_acc_m(sreg);
-	u16 axh = dsp_get_ax_h(treg);
-	s64 prod = dsp_multiply_sub(accm, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MADD $axS.l, $axS.h
-// 1111 001s xxxx xxxx
-// Multiply low part $axS.l of secondary accumulator $axS by high part
-// $axS.h of secondary accumulator $axS (treat them both as signed) and add
-// result to product register.
-void madd(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 8) & 0x1;
-	
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply_add(axl, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-// MSUB $axS.l, $axS.h
-// 1111 011s xxxx xxxx
-// Multiply low part $axS.l of secondary accumulator $axS by high part
-// $axS.h of secondary accumulator $axS (treat them both as signed) and
-// subtract result from product register.
-void msub(const UDSPInstruction opc)
-{
-	u8 sreg = (opc >> 8) & 0x1;
-	
-	u16 axl = dsp_get_ax_l(sreg);
-	u16 axh = dsp_get_ax_h(sreg);
-	s64 prod = dsp_multiply_sub(axl, axh);
-
-	zeroWriteBackLog();
-
-	dsp_set_long_prod(prod);
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
deleted file mode 100644
index ff3180e92c..0000000000
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-
-// HELPER FUNCTIONS
-
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-using namespace Gen;
-
-// In: RAX: s64 _Value
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register(Gen::X64Reg val)
-{
-#ifdef _M_X64
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	//	// 0x04
-	//	if (_Value == 0) g_dsp.r[DSP_REG_SR] |= SR_ARITH_ZERO;
-	CMP(64, R(val), Imm8(0));
-	FixupBranch notZero = J_CC(CC_NZ);
-	OR(16, sr_reg, Imm16(SR_ARITH_ZERO));
-	SetJumpTarget(notZero);
-
-	//	// 0x08
-	//	if (_Value < 0) g_dsp.r[DSP_REG_SR] |= SR_SIGN;
-	CMP(64, R(val), Imm8(0));
-	FixupBranch greaterThanEqual = J_CC(CC_GE);
-	OR(16, sr_reg, Imm16(SR_SIGN));
-	SetJumpTarget(greaterThanEqual);
-
-	//	// 0x10
-	//	if (_Value != (s32)_Value) g_dsp.r[DSP_REG_SR] |= SR_OVER_S32;
-	MOVSX(64, 32, RDX, R(val));
-	CMP(64, R(RDX), R(val));
-	FixupBranch noOverS32 = J_CC(CC_E);
-	OR(16, sr_reg, Imm16(SR_OVER_S32));
-	SetJumpTarget(noOverS32);
-
-	//	// 0x20 - Checks if top bits of m are equal
-	//	if (((_Value & 0xc0000000) == 0) || ((_Value & 0xc0000000) == 0xc0000000))
-	AND(32, R(val), Imm32(0xc0000000));
-	CMP(32, R(val), Imm32(0));
-	FixupBranch zeroC = J_CC(CC_E);
-	CMP(32, R(val), Imm32(0xc0000000));
-	FixupBranch cC = J_CC(CC_NE);
-	SetJumpTarget(zeroC);
-	//		g_dsp.r[DSP_REG_SR] |= SR_TOP2BITS;
-	OR(16, sr_reg, Imm16(SR_TOP2BITS));
-	SetJumpTarget(cC);
-	gpr.putReg(DSP_REG_SR);
-#endif
-}
-
-// In: RAX: s64 _Value
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register64(Gen::X64Reg val)
-{
-#ifdef _M_X64
-//	g_dsp.r[DSP_REG_SR] &= ~SR_CMP_MASK;
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
-	gpr.putReg(DSP_REG_SR);
-	Update_SR_Register(val);
-#endif
-}
-
-// In: (val): s64 _Value
-// In: (carry_ovfl): 1 = carry, 2 = overflow
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register64_Carry(X64Reg val, X64Reg carry_ovfl)
-{
-#ifdef _M_X64
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	//	g_dsp.r[DSP_REG_SR] &= ~SR_CMP_MASK;
-	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
-
-	CMP(64, R(carry_ovfl), R(val));
-
-	// 0x01
-	//	g_dsp.r[DSP_REG_SR] |= SR_CARRY;
-	// Carry = (acc>res)
-	FixupBranch noCarry = J_CC(CC_BE);
-	OR(16, sr_reg, Imm16(SR_CARRY));
-	SetJumpTarget(noCarry);
-
-	// 0x02 and 0x80
-	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW;
-	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW_STICKY;
-	// Overflow = ((acc ^ res) & (ax ^ res)) < 0
-	XOR(64, R(carry_ovfl), R(val));
-	XOR(64, R(RDX), R(val));
-	AND(64, R(carry_ovfl), R(RDX));
-	CMP(64, R(carry_ovfl), Imm8(0));
-	FixupBranch noOverflow = J_CC(CC_GE);
-	OR(16, sr_reg, Imm16(SR_OVERFLOW | SR_OVERFLOW_STICKY));
-	SetJumpTarget(noOverflow);
-
-	gpr.putReg(DSP_REG_SR);
-	Update_SR_Register(val);
-#endif
-}
-
-// In: (val): s64 _Value
-// In: (carry_ovfl): 1 = carry, 2 = overflow
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register64_Carry2(X64Reg val, X64Reg carry_ovfl)
-{
-#ifdef _M_X64
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	//	g_dsp.r[DSP_REG_SR] &= ~SR_CMP_MASK;
-	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
-
-	CMP(64, R(carry_ovfl), R(val));
-
-	// 0x01
-	//	g_dsp.r[DSP_REG_SR] |= SR_CARRY;
-	// Carry2 = (acc>=res)
-	FixupBranch noCarry2 = J_CC(CC_B);
-	OR(16, sr_reg, Imm16(SR_CARRY));
-	SetJumpTarget(noCarry2);
-
-	// 0x02 and 0x80
-	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW;
-	//	g_dsp.r[DSP_REG_SR] |= SR_OVERFLOW_STICKY;
-	// Overflow = ((acc ^ res) & (ax ^ res)) < 0
-	XOR(64, R(carry_ovfl), R(val));
-	XOR(64, R(RDX), R(val));
-	AND(64, R(carry_ovfl), R(RDX));
-	CMP(64, R(carry_ovfl), Imm8(0));
-	FixupBranch noOverflow = J_CC(CC_GE);
-	OR(16, sr_reg, Imm16(SR_OVERFLOW | SR_OVERFLOW_STICKY));
-	SetJumpTarget(noOverflow);
-	gpr.putReg(DSP_REG_SR);
-
-	Update_SR_Register();
-#endif
-}
-
-//void DSPEmitter::Update_SR_Register16(s16 _Value, bool carry, bool overflow, bool overS32)
-//{
-
-//	// 0x20 - Checks if top bits of m are equal
-//	if ((((u16)_Value >> 14) == 0) || (((u16)_Value >> 14) == 3))
-//	{
-//		g_dsp.r[DSP_REG_SR] |= SR_TOP2BITS;
-//	}
-//}
-
-// In: RAX: s64 _Value
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register16(X64Reg val)
-{
-#ifdef _M_X64
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
-
-	//	// 0x04
-	//	if (_Value == 0) g_dsp.r[DSP_REG_SR] |= SR_ARITH_ZERO;
-	CMP(64, R(val), Imm8(0));
-	FixupBranch notZero = J_CC(CC_NZ);
-	OR(16, sr_reg, Imm16(SR_ARITH_ZERO));
-	SetJumpTarget(notZero);
-
-	//	// 0x08
-	//	if (_Value < 0) g_dsp.r[DSP_REG_SR] |= SR_SIGN;
-	CMP(64, R(val), Imm8(0));
-	FixupBranch greaterThanEqual = J_CC(CC_GE);
-	OR(16, sr_reg, Imm16(SR_SIGN));
-	SetJumpTarget(greaterThanEqual);
-
-	//	// 0x20 - Checks if top bits of m are equal
-	//	if ((((u16)_Value >> 14) == 0) || (((u16)_Value >> 14) == 3))
-	//AND(32, R(val), Imm32(0xc0000000));
-	SHR(16, R(val), Imm8(14));
-	CMP(16, R(val), Imm16(0));
-	FixupBranch nZero = J_CC(CC_NE);
-	OR(16, sr_reg, Imm16(SR_TOP2BITS));
-	FixupBranch cC = J();
-	SetJumpTarget(nZero);
-	CMP(16, R(val), Imm16(3));
-	FixupBranch notThree = J_CC(CC_NE);
-	//		g_dsp.r[DSP_REG_SR] |= SR_TOP2BITS;
-	OR(16, sr_reg, Imm16(SR_TOP2BITS));
-	SetJumpTarget(notThree);
-	SetJumpTarget(cC);
-	gpr.putReg(DSP_REG_SR);
-#endif
-}
-
-// In: RAX: s64 _Value
-// Clobbers RDX
-void DSPEmitter::Update_SR_Register16_OverS32(Gen::X64Reg val)
-{
-#ifdef _M_X64
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-	AND(16, sr_reg, Imm16(~SR_CMP_MASK));
-
-	//	// 0x10
-	//	if (_Value != (s32)_Value) g_dsp.r[DSP_REG_SR] |= SR_OVER_S32;
-	MOVSX(64, 32, RCX, R(val));
-	CMP(64, R(RCX), R(val));
-	FixupBranch noOverS32 = J_CC(CC_E);
-	OR(16, sr_reg, Imm16(SR_OVER_S32));
-	SetJumpTarget(noOverS32);
-
-	gpr.putReg(DSP_REG_SR);
-	//	// 0x20 - Checks if top bits of m are equal
-	//	if ((((u16)_Value >> 14) == 0) || (((u16)_Value >> 14) == 3))
-	//AND(32, R(val), Imm32(0xc0000000));
-	Update_SR_Register16(val);
-#endif
-}
-
-//void DSPEmitter::Update_SR_LZ(bool value) {
-
-//	if (value == true) 
-//		g_dsp.r[DSP_REG_SR] |= SR_LOGIC_ZERO; 
-//	else
-//		g_dsp.r[DSP_REG_SR] &= ~SR_LOGIC_ZERO;
-//}
-
-//inline int GetMultiplyModifier()
-//{
-//	return (g_dsp.r[DSP_REG_SR] & SR_MUL_MODIFY)?1:2;
-//}
-
-//inline bool isCarry() {
-//	return (g_dsp.r[DSP_REG_SR] & SR_CARRY) ? true : false;
-//}
-
-//inline bool isOverflow() {
-//	return (g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) ? true : false;
-//}
-
-//inline bool isOverS32() {
-//	return (g_dsp.r[DSP_REG_SR] & SR_OVER_S32) ? true : false;
-//}
-
-//inline bool isLess() {
-//	return (!(g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) != !(g_dsp.r[DSP_REG_SR] & SR_SIGN));
-//}
-
-//inline bool isZero() {
-//	return (g_dsp.r[DSP_REG_SR] & SR_ARITH_ZERO) ? true : false;
-//}
-
-//inline bool isLogicZero() {
-//	return (g_dsp.r[DSP_REG_SR] & SR_LOGIC_ZERO) ? true : false;
-//}
-
-//inline bool isConditionA() {
-//	return (((g_dsp.r[DSP_REG_SR] & SR_OVER_S32) || (g_dsp.r[DSP_REG_SR] & SR_TOP2BITS)) && !(g_dsp.r[DSP_REG_SR] & SR_ARITH_ZERO)) ? true : false;
-//}
-
-//see DSPCore.h for flags
-//bool CheckCondition(u8 _Condition)
-//{
-//	switch (_Condition & 0xf)
-//	{
-//	case 0xf: // Always true.
-//		return true;
-//	case 0x0: // GE - Greater Equal
-//		return !isLess();
-//	case 0x1: // L - Less
-//		return isLess();
-//	case 0x2: // G - Greater
-//		return !isLess() && !isZero();
-//	case 0x3: // LE - Less Equal
-//		return isLess() || isZero();
-//	case 0x4: // NZ - Not Zero
-//		return !isZero();
-//	case 0x5: // Z - Zero 
-//		return isZero();
-//	case 0x6: // NC - Not carry
-//		return !isCarry();
-//	case 0x7: // C - Carry 
-//		return isCarry();
-//	case 0x8: // ? - Not over s32
-//		return !isOverS32();
-//	case 0x9: // ? - Over s32
-//		return isOverS32();
-//	case 0xa: // ?
-//		return isConditionA();
-//	case 0xb: // ?
-//		return !isConditionA();
-//	case 0xc: // LNZ  - Logic Not Zero
-//		return !isLogicZero();
-//	case 0xd: // LZ - Logic Zero
-//		return isLogicZero();
-//	case 0xe: // 0 - Overflow
-//		return isOverflow();
-//	default:
-//		return true;
-//	}
-//}
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
deleted file mode 100644
index 386c32d8bc..0000000000
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
+++ /dev/null
@@ -1,1094 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPJitRegCache.h"
-#include "../DSPEmitter.h"
-#include "../DSPMemoryMap.h"
-
-using namespace Gen;
-
-static void *reg_ptr(int reg)
-{
-	switch(reg)
-	{
-	case DSP_REG_AR0:
-	case DSP_REG_AR1:
-	case DSP_REG_AR2:
-	case DSP_REG_AR3:
-		return &g_dsp.r.ar[reg - DSP_REG_AR0];
-	case DSP_REG_IX0:
-	case DSP_REG_IX1:
-	case DSP_REG_IX2:
-	case DSP_REG_IX3:
-		return &g_dsp.r.ix[reg - DSP_REG_IX0];
-	case DSP_REG_WR0:
-	case DSP_REG_WR1:
-	case DSP_REG_WR2:
-	case DSP_REG_WR3:
-		return &g_dsp.r.wr[reg - DSP_REG_WR0];
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		return &g_dsp.r.st[reg - DSP_REG_ST0];
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		return &g_dsp.r.ac[reg - DSP_REG_ACH0].h;
-	case DSP_REG_CR:     return &g_dsp.r.cr;
-	case DSP_REG_SR:     return &g_dsp.r.sr;
-	case DSP_REG_PRODL:  return &g_dsp.r.prod.l;
-	case DSP_REG_PRODM:  return &g_dsp.r.prod.m;
-	case DSP_REG_PRODH:  return &g_dsp.r.prod.h;
-	case DSP_REG_PRODM2: return &g_dsp.r.prod.m2;
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		return &g_dsp.r.ax[reg - DSP_REG_AXL0].l;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		return &g_dsp.r.ax[reg - DSP_REG_AXH0].h;
-	case DSP_REG_ACL0:
-	case DSP_REG_ACL1:
-		return &g_dsp.r.ac[reg - DSP_REG_ACL0].l;
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-		return &g_dsp.r.ac[reg - DSP_REG_ACM0].m;
-	case DSP_REG_AX0_32:
-	case DSP_REG_AX1_32:
-		return &g_dsp.r.ax[reg - DSP_REG_AX0_32].val;
-#ifdef _M_X64
-	case DSP_REG_ACC0_64:
-	case DSP_REG_ACC1_64:
-		return &g_dsp.r.ac[reg - DSP_REG_ACC0_64].val;
-	case DSP_REG_PROD_64:
-		return &g_dsp.r.prod.val;
-#endif
-	default:
-		_assert_msg_(DSPLLE, 0, "cannot happen");
-		return NULL;
-	}
-}
-
-#define STATIC_REG_ACCS
-//#undef STATIC_REG_ACCS
-
-DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
-	: emitter(_emitter), temporary(false), merged(false)
-{
-	for(unsigned int i = 0; i < NUMXREGS; i++)
-	{
-		xregs[i].guest_reg = DSP_REG_STATIC;
-		xregs[i].pushed = false;
-	}
-
-	xregs[RAX].guest_reg = DSP_REG_STATIC;// reserved for MUL/DIV
-	xregs[RDX].guest_reg = DSP_REG_STATIC;// reserved for MUL/DIV
-	xregs[RCX].guest_reg = DSP_REG_STATIC;// reserved for shifts
-
-	xregs[RBX].guest_reg = DSP_REG_STATIC;//extended op backing store
-
-	xregs[RSP].guest_reg = DSP_REG_STATIC;//stack pointer
-
-	xregs[RBP].guest_reg = DSP_REG_NONE;//definitely usable in dsplle because
-										//all external calls are protected
-
-	xregs[RSI].guest_reg = DSP_REG_NONE;
-	xregs[RDI].guest_reg = DSP_REG_NONE;
-
-#ifdef _M_X64
-#ifdef STATIC_REG_ACCS
-	xregs[R8].guest_reg = DSP_REG_STATIC;//acc0
-	xregs[R9].guest_reg = DSP_REG_STATIC;//acc1
-#else
-	xregs[R8].guest_reg = DSP_REG_NONE;
-	xregs[R9].guest_reg = DSP_REG_NONE;
-#endif
-	xregs[R10].guest_reg = DSP_REG_NONE;
-	xregs[R11].guest_reg = DSP_REG_NONE;
-	xregs[R12].guest_reg = DSP_REG_NONE;
-	xregs[R13].guest_reg = DSP_REG_NONE;
-	xregs[R14].guest_reg = DSP_REG_NONE;
-	xregs[R15].guest_reg = DSP_REG_NONE;
-#endif
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		regs[i].mem = reg_ptr(i);
-		regs[i].size = 0;
-		regs[i].dirty = false;
-		regs[i].used = false;
-		regs[i].last_use_ctr = -1;
-		regs[i].parentReg = DSP_REG_NONE;
-		regs[i].shift = 0;
-		regs[i].host_reg = INVALID_REG;
-
-		regs[i].loc = M(regs[i].mem);
-	}
-
-	for(unsigned int i = 0; i < 32; i++)
-		regs[i].size = 2;
-	//special composite registers
-#ifdef _M_X64
-#ifdef STATIC_REG_ACCS
-	regs[DSP_REG_ACC0_64].host_reg = R8;
-	regs[DSP_REG_ACC1_64].host_reg = R9;
-#endif
-	for(unsigned int i = 0; i < 2; i++)
-	{
-		regs[i+DSP_REG_ACC0_64].size = 8;
-		regs[i+DSP_REG_ACL0].parentReg = i+DSP_REG_ACC0_64;
-		regs[i+DSP_REG_ACM0].parentReg = i+DSP_REG_ACC0_64;
-		regs[i+DSP_REG_ACH0].parentReg = i+DSP_REG_ACC0_64;
-		regs[i+DSP_REG_ACL0].shift = 0;
-		regs[i+DSP_REG_ACM0].shift = 16;
-		regs[i+DSP_REG_ACH0].shift = 32;
-	}
-
-	regs[DSP_REG_PROD_64].size = 8;
-	regs[DSP_REG_PRODL].parentReg = DSP_REG_PROD_64;
-	regs[DSP_REG_PRODM].parentReg = DSP_REG_PROD_64;
-	regs[DSP_REG_PRODH].parentReg = DSP_REG_PROD_64;
-	regs[DSP_REG_PRODM2].parentReg = DSP_REG_PROD_64;
-	regs[DSP_REG_PRODL].shift = 0;
-	regs[DSP_REG_PRODM].shift = 16;
-	regs[DSP_REG_PRODH].shift = 32;
-	regs[DSP_REG_PRODM2].shift = 48;
-#endif
-
-	for(unsigned int i = 0; i < 2; i++)
-	{
-		regs[i+DSP_REG_AX0_32].size = 4;
-		regs[i+DSP_REG_AXL0].parentReg = i+DSP_REG_AX0_32;
-		regs[i+DSP_REG_AXH0].parentReg = i+DSP_REG_AX0_32;
-		regs[i+DSP_REG_AXL0].shift = 0;
-		regs[i+DSP_REG_AXH0].shift = 16;
-	}
-
-	use_ctr = 0;
-}
-
-DSPJitRegCache::DSPJitRegCache(const DSPJitRegCache &cache)
-	: emitter(cache.emitter), temporary(true), merged(false)
-{
-	memcpy(xregs,cache.xregs,sizeof(xregs));
-	memcpy(regs,cache.regs,sizeof(regs));
-}
-
-DSPJitRegCache& DSPJitRegCache::operator=(const DSPJitRegCache &cache)
-{
-	_assert_msg_(DSPLLE, &emitter == &cache.emitter, "emitter does not match");
-	_assert_msg_(DSPLLE, temporary, "register cache not temporary??");
-	merged = false;
-	memcpy(xregs,cache.xregs,sizeof(xregs));
-	memcpy(regs,cache.regs,sizeof(regs));
-
-	return *this;
-}
-
-DSPJitRegCache::~DSPJitRegCache()
-{
-	_assert_msg_(DSPLLE, !temporary || merged, "temporary cache not merged");
-}
-
-void DSPJitRegCache::drop()
-{
-	merged = true;
-}
-
-void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit)
-{
-	cache.merged = true;
-
-	unsigned int i;
-
-	//drop all guest register not used by cache
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		regs[i].used = false;//used is restored later
-		if (regs[i].loc.IsSimpleReg() &&
-			!cache.regs[i].loc.IsSimpleReg())
-			movToMemory(i);
-	}
-
-	//try to move guest regs in the wrong host reg to the correct one
-	int movcnt;
-	do
-	{
-		movcnt = 0;
-		for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-		{
-			X64Reg simple = regs[i].loc.GetSimpleReg();
-			X64Reg simple_cache = cache.regs[i].loc.GetSimpleReg();
-
-			if (simple_cache != simple && xregs[simple_cache].guest_reg == DSP_REG_NONE)
-			{
-				movToHostReg(i, simple_cache, true);
-				movcnt++;
-			}
-		}
-	} while (movcnt != 0);
-
-	//free all host regs that are not used for the same guest reg
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (cache.regs[i].loc.GetSimpleReg() !=
-			regs[i].loc.GetSimpleReg() &&
-			regs[i].loc.IsSimpleReg())
-			movToMemory(i);
-	}
-
-	//load all guest regs that are in memory and should be in host reg
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (cache.regs[i].loc.IsSimpleReg())
-		{
-			movToHostReg(i, cache.regs[i].loc.GetSimpleReg(), true);
-			rotateHostReg(i, cache.regs[i].shift, true);
-		}
-		else if(cache.regs[i].loc.IsImm())
-		{
-			// TODO: Immediates?
-		}
-
-		regs[i].used = cache.regs[i].used;
-		regs[i].dirty |= cache.regs[i].dirty;
-		regs[i].last_use_ctr = cache.regs[i].last_use_ctr;
-	}
-
-	//sync the freely used xregs
-	if (!emit) {
-		for(i = 0; i < NUMXREGS; i++) {
-			if (cache.xregs[i].guest_reg == DSP_REG_USED &&
-			    xregs[i].guest_reg == DSP_REG_NONE)
-				xregs[i].guest_reg = DSP_REG_USED;
-			if (cache.xregs[i].guest_reg == DSP_REG_NONE &&
-			    xregs[i].guest_reg == DSP_REG_USED)
-				xregs[i].guest_reg = DSP_REG_NONE;
-		}
-	}
-
-	//consistency checks
-	for(i = 0; i < NUMXREGS; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     xregs[i].guest_reg == cache.xregs[i].guest_reg,
-			     "cache and current xreg guest_reg mismatch for %d", i);
-	}
-
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     regs[i].loc.IsImm() == cache.regs[i].loc.IsImm(),
-			     "cache and current reg loc mismatch for %x", i);
-		_assert_msg_(DSPLLE,
-			     regs[i].loc.GetSimpleReg() == cache.regs[i].loc.GetSimpleReg(),
-			     "cache and current reg loc mismatch for %x", i);
-		_assert_msg_(DSPLLE,
-			     regs[i].dirty || !cache.regs[i].dirty,
-			     "cache and current reg dirty mismatch for %x", i);
-		_assert_msg_(DSPLLE,
-			     regs[i].used == cache.regs[i].used,
-			     "cache and current reg used mismatch for %x", i);
-		_assert_msg_(DSPLLE,
-			     regs[i].shift == cache.regs[i].shift,
-			     "cache and current reg shift mismatch for %x", i);
-	}
-
-	use_ctr = cache.use_ctr;
-}
-
-void DSPJitRegCache::flushMemBackedRegs()
-{
-	//also needs to undo any dynamic changes to static allocated regs
-	//this should have the same effect as
-	//merge(DSPJitRegCache(emitter));
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		_assert_msg_(DSPLLE, !regs[i].used,
-			     "register %x still in use", i);
-
-		if (regs[i].used)
-			emitter.INT3();
-
-		if (regs[i].host_reg != INVALID_REG)
-		{
-			movToHostReg(i,regs[i].host_reg,true);
-			rotateHostReg(i, 0, true);
-		}
-		else if (regs[i].parentReg == DSP_REG_NONE)
-		{
-			movToMemory(i);
-		}
-	}
-}
-
-void DSPJitRegCache::flushRegs()
-{
-	flushMemBackedRegs();
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (regs[i].host_reg != INVALID_REG)
-			movToMemory(i);
-	}
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     !regs[i].loc.IsSimpleReg(),
-			     "register %x is still a simple reg", i);
-	}
-
-	_assert_msg_(DSPLLE,
-		     xregs[RSP].guest_reg == DSP_REG_STATIC,
-		     "wrong xreg state for %d", RSP);
-	_assert_msg_(DSPLLE,
-		     xregs[RBX].guest_reg == DSP_REG_STATIC,
-		     "wrong xreg state for %d", RBX);
-	_assert_msg_(DSPLLE,
-		     xregs[RBP].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", RBP);
-	_assert_msg_(DSPLLE,
-		     xregs[RSI].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", RSI);
-	_assert_msg_(DSPLLE,
-		     xregs[RDI].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", RDI);
-#ifdef _M_X64
-#ifdef STATIC_REG_ACCS
-	_assert_msg_(DSPLLE,
-		     xregs[R8].guest_reg == DSP_REG_STATIC,
-		     "wrong xreg state for %d", R8);
-	_assert_msg_(DSPLLE,
-		     xregs[R9].guest_reg == DSP_REG_STATIC,
-		     "wrong xreg state for %d", R9);
-#else
-	_assert_msg_(DSPLLE,
-		     xregs[R8].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R8);
-	_assert_msg_(DSPLLE,
-		     xregs[R9].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R9);
-#endif
-	_assert_msg_(DSPLLE,
-		     xregs[R10].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R10);
-	_assert_msg_(DSPLLE,
-		     xregs[R11].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R11);
-	_assert_msg_(DSPLLE,
-		     xregs[R12].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R12);
-	_assert_msg_(DSPLLE,
-		     xregs[R13].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R13);
-	_assert_msg_(DSPLLE,
-		     xregs[R14].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R14);
-	_assert_msg_(DSPLLE,
-		     xregs[R15].guest_reg == DSP_REG_NONE,
-		     "wrong xreg state for %d", R15);
-#endif
-
-	use_ctr = 0;
-}
-
-static u64 ebp_store;
-
-void DSPJitRegCache::loadRegs(bool emit)
-{
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (regs[i].host_reg != INVALID_REG)
-			movToHostReg(i,regs[i].host_reg, emit);
-	}
-
-	if (emit)
-	{
-#ifdef _M_X64
-		emitter.MOV(64, M(&ebp_store), R(RBP));
-#else
-		emitter.MOV(32, M(&ebp_store), R(EBP));
-#endif
-	}
-}
-
-void DSPJitRegCache::saveRegs()
-{
-	flushRegs();
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (regs[i].host_reg != INVALID_REG)
-			movToMemory(i);
-	}
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     !regs[i].loc.IsSimpleReg(),
-			     "register %x is still a simple reg", i);
-	}
-
-#ifdef _M_X64
-	emitter.MOV(64, R(RBP), M(&ebp_store));
-#else
-	emitter.MOV(32, R(EBP), M(&ebp_store));
-#endif
-}
-
-void DSPJitRegCache::pushRegs()
-{
-	flushMemBackedRegs();
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (regs[i].host_reg != INVALID_REG)
-			movToMemory(i);
-	}
-
-	int push_count = 0;
-	for(unsigned int i = 0; i < NUMXREGS; i++)
-	{
-		if (xregs[i].guest_reg == DSP_REG_USED)
-			push_count++;
-	}
-
-	//hardcoding alignment to 16 bytes
-#ifdef _M_X64
-	if (push_count & 1)
-		emitter.SUB(64,R(RSP),Imm32(8));
-#else
-	if (push_count & 3)
-		emitter.SUB(32,R(ESP),Imm32(16 - 4 * (push_count & 3)));
-#endif
-
-	for(unsigned int i = 0; i < NUMXREGS; i++)
-	{
-		if (xregs[i].guest_reg == DSP_REG_USED)
-		{
-			emitter.PUSH((X64Reg)i);
-			xregs[i].pushed = true;
-			xregs[i].guest_reg = DSP_REG_NONE;
-		}
-	}
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     !regs[i].loc.IsSimpleReg(),
-			     "register %x is still a simple reg", i);
-	}
-
-	for(unsigned int i = 0; i < NUMXREGS; i++)
-	{
-		_assert_msg_(DSPLLE,
-			     xregs[i].guest_reg == DSP_REG_NONE ||
-			     xregs[i].guest_reg == DSP_REG_STATIC,
-			     "register %x is still used", i);
-	}
-
-#ifdef _M_X64
-	emitter.MOV(64, R(RBP), M(&ebp_store));
-#else
-	emitter.MOV(32, R(EBP), M(&ebp_store));
-#endif
-}
-
-void DSPJitRegCache::popRegs() {
-#ifdef _M_X64
-	emitter.MOV(64, M(&ebp_store), R(RBP));
-#else
-	emitter.MOV(32, M(&ebp_store), R(EBP));
-#endif
-	int push_count = 0;
-	for(unsigned int i = 0; i < NUMXREGS; i++)
-	{
-		if (xregs[i].pushed)
-			push_count++;
-	}
-
-	for(int i = NUMXREGS-1; i >= 0; i--)
-	{
-		if (xregs[i].pushed)
-		{
-			emitter.POP((X64Reg)i);
-			xregs[i].pushed = false;
-			xregs[i].guest_reg = DSP_REG_USED;
-		}
-	}
-
-	//hardcoding alignment to 16 bytes
-#ifdef _M_X64
-	if (push_count & 1)
-		emitter.ADD(64,R(RSP),Imm32(8));
-#else
-	if (push_count & 3)
-		emitter.ADD(32,R(ESP),Imm32(16 - 4 * (push_count & 3)));
-#endif
-
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
-	{
-		if (regs[i].host_reg != INVALID_REG)
-			movToHostReg(i,regs[i].host_reg, true);
-	}
-}
-
-X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg)
-{
-	if (reg != RBP)
-	{
-		return reg;
-	}
-
-	int rbp_guest = xregs[RBP].guest_reg;
-	xregs[RBP].guest_reg = DSP_REG_USED;
-	X64Reg safe = findSpillFreeXReg();
-	_assert_msg_(DSPLLE, safe != INVALID_REG, "could not find register");
-	if (safe == INVALID_REG)
-		emitter.INT3();
-	xregs[RBP].guest_reg = rbp_guest;
-#ifdef _M_X64
-	emitter.MOV(64,R(safe),R(reg));
-#else
-	emitter.MOV(32,R(safe),R(reg));
-#endif
-	return safe;
-}
-
-void DSPJitRegCache::movToHostReg(int reg, X64Reg host_reg, bool load)
-{
-	_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
-		     "bad register name %x", reg);
-	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
-		     "register %x is proxy for %x", reg, regs[reg].parentReg);
-	_assert_msg_(DSPLLE, !regs[reg].used,
-		     "moving to host reg in use guest reg %x!", reg);
-	X64Reg old_reg = regs[reg].loc.GetSimpleReg();
-	if (old_reg == host_reg)
-		return;
-
-	if (xregs[host_reg].guest_reg != DSP_REG_STATIC)
-		xregs[host_reg].guest_reg = reg;
-
-	if (load)
-	{
-		switch(regs[reg].size)
-		{
-		case 2:
-			emitter.MOV(16, R(host_reg), regs[reg].loc); break;
-		case 4:
-			emitter.MOV(32, R(host_reg), regs[reg].loc); break;
-#ifdef _M_X64
-		case 8:
-			emitter.MOV(64, R(host_reg), regs[reg].loc); break;
-#endif
-		default:
-			_assert_msg_(DSPLLE, 0, "unsupported memory size");
-			break;
-		}
-	}
-
-	regs[reg].loc = R(host_reg);
-	if (old_reg != INVALID_REG &&
-		xregs[old_reg].guest_reg != DSP_REG_STATIC)
-		xregs[old_reg].guest_reg = DSP_REG_NONE;
-}
-
-void DSPJitRegCache::movToHostReg(int reg, bool load)
-{
-	_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
-		     "bad register name %x", reg);
-	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
-		     "register %x is proxy for %x", reg, regs[reg].parentReg);
-	_assert_msg_(DSPLLE, !regs[reg].used,
-		     "moving to host reg in use guest reg %x!", reg);
-
-	if (regs[reg].loc.IsSimpleReg())
-		return;
-
-	X64Reg tmp;
-	if (regs[reg].host_reg != INVALID_REG)
-		tmp = regs[reg].host_reg;
-	else
-		tmp = findSpillFreeXReg();
-	
-	if (tmp == INVALID_REG)
-		return;
-
-	movToHostReg(reg, tmp, load);
-}
-
-void DSPJitRegCache::rotateHostReg(int reg, int shift, bool emit)
-{
-	_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
-		     "bad register name %x", reg);
-	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
-		     "register %x is proxy for %x", reg, regs[reg].parentReg);
-	_assert_msg_(DSPLLE, regs[reg].loc.IsSimpleReg(),
-		     "register %x is not a simple reg", reg);
-	_assert_msg_(DSPLLE, !regs[reg].used,
-		     "rotating in use guest reg %x!", reg);
-
-	if (shift > regs[reg].shift && emit)
-	{
-		switch(regs[reg].size)
-		{
-		case 2:
-			emitter.ROR(16, regs[reg].loc,
-					Imm8(shift - regs[reg].shift));
-			break;
-		case 4:
-			emitter.ROR(32, regs[reg].loc,
-					Imm8(shift - regs[reg].shift));
-			break;
-#ifdef _M_X64
-		case 8:
-			emitter.ROR(64, regs[reg].loc,
-					Imm8(shift - regs[reg].shift));
-			break;
-#endif
-		}
-	}
-	else if (shift < regs[reg].shift && emit)
-	{
-		switch(regs[reg].size)
-		{
-		case 2:
-			emitter.ROL(16, regs[reg].loc,
-					Imm8(regs[reg].shift - shift));
-			break;
-		case 4:
-			emitter.ROL(32, regs[reg].loc,
-					Imm8(regs[reg].shift - shift));
-			break;
-#ifdef _M_X64
-		case 8:
-			emitter.ROL(64, regs[reg].loc,
-					Imm8(regs[reg].shift - shift));
-			break;
-#endif
-		}
-	}
-	regs[reg].shift = shift;
-}
-
-void DSPJitRegCache::movToMemory(int reg)
-{
-	_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
-		     "bad register name %x", reg);
-	_assert_msg_(DSPLLE, regs[reg].parentReg == DSP_REG_NONE,
-		     "register %x is proxy for %x", reg, regs[reg].parentReg);
-	_assert_msg_(DSPLLE, !regs[reg].used,
-		     "moving to memory in use guest reg %x!", reg);
-
-	if (regs[reg].used)
-		emitter.INT3();
-
-	if (!regs[reg].loc.IsSimpleReg() &&
-	    !regs[reg].loc.IsImm())
-		return;
-
-	//but first, check for any needed rotations
-	if (regs[reg].loc.IsSimpleReg())
-	{
-		rotateHostReg(reg, 0, true);
-	}
-	else
-	{
-		// TODO: Immediates?
-	}
-
-	_assert_msg_(DSPLLE, regs[reg].shift == 0, "still shifted??");
-
-	//move to mem
-	OpArg tmp = M(regs[reg].mem);
-
-	if (regs[reg].dirty)
-	{
-		switch(regs[reg].size)
-		{
-		case 2:
-			emitter.MOV(16, tmp, regs[reg].loc); break;
-		case 4:
-			emitter.MOV(32, tmp, regs[reg].loc); break;
-#ifdef _M_X64
-		case 8:
-			emitter.MOV(64, tmp, regs[reg].loc); break;
-#endif
-		default:
-			_assert_msg_(DSPLLE, 0, "unsupported memory size");
-			break;
-		}
-		regs[reg].dirty = false;
-	}
-
-	if (regs[reg].loc.IsSimpleReg())
-	{
-		X64Reg hostreg = regs[reg].loc.GetSimpleReg();
-		if (xregs[hostreg].guest_reg != DSP_REG_STATIC)
-			xregs[hostreg].guest_reg = DSP_REG_NONE;
-	}
-
-	regs[reg].last_use_ctr = -1;
-	regs[reg].loc = tmp;
-}
-
-void DSPJitRegCache::getReg(int reg, OpArg &oparg, bool load)
-{
-	int real_reg;
-	int shift;
-	if (regs[reg].parentReg != DSP_REG_NONE)
-	{
-		real_reg = regs[reg].parentReg;
-
-		// always load and rotate since we need the other
-		// parts of the register
-		load = true;
-
-		shift = regs[reg].shift;
-	}
-	else
-	{
-		real_reg = reg;
-		shift = 0;
-	}
-
-	_assert_msg_(DSPLLE, !regs[real_reg].used,
-		     "register %x already in use", real_reg);
-
-	if (regs[real_reg].used)
-		emitter.INT3();
-	// no nead to actually emit code for load or rotate if caller doesn't
-	// use the contents, but see above for a reason to force the load
-	movToHostReg(real_reg, load);
-
-	// TODO: actually handle INVALID_REG
-	_assert_msg_(DSPLLE, regs[real_reg].loc.IsSimpleReg(),
-		     "did not get host reg for %x", reg);
-
-	rotateHostReg(real_reg, shift, load);
-	oparg = regs[real_reg].loc;
-	regs[real_reg].used = true;
-
-	//do some register specific fixup
-	switch(reg)
-	{
-#ifdef _M_X64
-	case DSP_REG_ACC0_64:
-	case DSP_REG_ACC1_64:
-	{
-		if (load)
-		{
-			//need to do this because interpreter only does 48 bits
-			//(and putReg does the same)
-			emitter.SHL(64, oparg, Imm8(64-40));//sign extend
-			emitter.SAR(64, oparg, Imm8(64-40));
-		}
-	}
-	break;
-#endif
-	default:
-		break;
-	}
-}
-
-void DSPJitRegCache::putReg(int reg, bool dirty)
-{
-	int real_reg = reg;
-	if (regs[reg].parentReg != DSP_REG_NONE)
-		real_reg = regs[reg].parentReg;
-
-	OpArg oparg = regs[real_reg].loc;
-
-	switch(reg)
-	{
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-	{
-		if (dirty)
-		{
-			//no need to extend to full 64bit here until interpreter
-			//uses that
-			if (oparg.IsSimpleReg())
-			{
-				//register is already shifted correctly
-				//(if at all)
-
-				// sign extend from the bottom 8 bits.
-#ifndef _M_X64
-				//cannot use movsx with SPL, BPL, SIL or DIL
-				//on 32 bit
-				if (oparg.GetSimpleReg() == RSP ||
-					oparg.GetSimpleReg() == RBP ||
-					oparg.GetSimpleReg() == RSI ||
-					oparg.GetSimpleReg() == RDI)
-				{
-					emitter.SHL(16,oparg,Imm8(8));
-					emitter.SAR(16,oparg,Imm8(8));
-				}
-				else
-#endif
-				{
-					emitter.MOVSX(16, 8,
-								oparg.GetSimpleReg(),
-								oparg);
-				}
-			}
-			else if (oparg.IsImm())
-			{
-				// TODO: Immediates?
-			}
-			else
-			{
-				//this works on the memory, so use reg instead
-				//of real_reg, since it has the right loc
-				X64Reg tmp;
-				getFreeXReg(tmp);
-				// sign extend from the bottom 8 bits.
-				emitter.MOVSX(16, 8, tmp, regs[reg].loc);
-				emitter.MOV(16, regs[reg].loc, R(tmp));
-				putXReg(tmp);
-			}
-		}
-	}
-	break;
-#ifdef _M_X64
-	case DSP_REG_ACC0_64:
-	case DSP_REG_ACC1_64:
-	{
-		if (dirty)
-		{
-			emitter.SHL(64, oparg, Imm8(64-40));//sign extend
-			emitter.SAR(64, oparg, Imm8(64-40));
-		}
-	}
-	break;
-#endif
-	default:
-		break;
-	}
-
-	regs[real_reg].used = false;
-
-	if (regs[real_reg].loc.IsSimpleReg())
-	{
-		regs[real_reg].dirty |= dirty;
-		regs[real_reg].last_use_ctr = use_ctr;
-		use_ctr++;
-	}
-}
-
-void DSPJitRegCache::readReg(int sreg, X64Reg host_dreg, DSPJitSignExtend extend)
-{
-	OpArg reg;
-	getReg(sreg, reg);
-
-	switch(regs[sreg].size)
-	{
-	case 2:
-		switch(extend)
-		{
-#ifdef _M_X64
-		case SIGN: emitter.MOVSX(64, 16, host_dreg, reg); break;
-		case ZERO: emitter.MOVZX(64, 16, host_dreg, reg); break;
-#else
-		case SIGN: emitter.MOVSX(32, 16, host_dreg, reg); break;
-		case ZERO: emitter.MOVZX(32, 16, host_dreg, reg); break;
-#endif
-		case NONE: emitter.MOV(16, R(host_dreg), reg); break;
-		}
-		break;
-	case 4:
-#ifdef _M_X64
-		switch(extend)
-		{
-		case SIGN: emitter.MOVSX(64, 32, host_dreg, reg); break;
-		case ZERO: emitter.MOVZX(64, 32, host_dreg, reg); break;
-		case NONE: emitter.MOV(32, R(host_dreg), reg); break;
-		}
-#else
-		emitter.MOV(32, R(host_dreg), reg); break;
-#endif
-		break;
-#ifdef _M_X64
-	case 8:
-		emitter.MOV(64, R(host_dreg), reg); break;
-		break;
-#endif
-	default:
-		_assert_msg_(DSPLLE, 0, "unsupported memory size");
-		break;
-	}
-	putReg(sreg, false);
-}
-
-void DSPJitRegCache::writeReg(int dreg, OpArg arg)
-{
-	OpArg reg;
-	getReg(dreg, reg, false);
-	if (arg.IsImm())
-	{
-		switch(regs[dreg].size)
-		{
-		case 2: emitter.MOV(16, reg, Imm16((u16) arg.offset)); break;
-		case 4: emitter.MOV(32, reg, Imm32((u32) arg.offset)); break;
-#ifdef _M_X64
-		case 8:
-			if ((u32) arg.offset == arg.offset)
-				emitter.MOV(64, reg, Imm32((u32) arg.offset));
-			else
-				emitter.MOV(64, reg, Imm64(arg.offset));
-			break;
-#endif
-		default:
-			_assert_msg_(DSPLLE, 0, "unsupported memory size");
-			break;
-		}
-	}
-	else
-	{
-		switch(regs[dreg].size)
-		{
-		case 2: emitter.MOV(16, reg, arg); break;
-		case 4: emitter.MOV(32, reg, arg); break;
-#ifdef _M_X64
-		case 8: emitter.MOV(64, reg, arg); break;
-#endif
-		default:
-			_assert_msg_(DSPLLE, 0, "unsupported memory size");
-			break;
-		}
-	}
-	putReg(dreg, true);
-}
-
-//ordered in order of prefered use
-//not all of these are actually available
-static X64Reg alloc_order[] = {
-#ifdef _M_X64
-	R8,R9,R10,R11,R12,R13,R14,R15,RSI,RDI,RBX,RCX,RDX,RAX,RBP
-#else
-	ESI,EDI,EBX,ECX,EDX,EAX,EBP
-#endif
-};
-
-X64Reg DSPJitRegCache::spillXReg()
-{
-	unsigned int i;
-	unsigned int max_use_ctr_diff = 0;
-	X64Reg least_recent_use_reg = INVALID_REG;
-	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
-	{
-		X64Reg reg = alloc_order[i];
-		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
-			!regs[xregs[reg].guest_reg].used)
-		{
-			unsigned int use_ctr_diff = use_ctr -
-				regs[xregs[reg].guest_reg].last_use_ctr;
-
-			if (use_ctr_diff >= max_use_ctr_diff)
-			{
-				max_use_ctr_diff = use_ctr_diff;
-				least_recent_use_reg = reg;
-			}
-		}
-	}
-
-	if (least_recent_use_reg != INVALID_REG)
-	{
-		movToMemory(xregs[least_recent_use_reg].guest_reg);
-		return least_recent_use_reg;
-	}
-
-	//just choose one.
-	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
-	{
-		X64Reg reg = alloc_order[i];
-		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
-			!regs[xregs[reg].guest_reg].used)
-		{
-			movToMemory(xregs[reg].guest_reg);
-			return reg;
-		}
-	}
-
-	return INVALID_REG;
-}
-
-void DSPJitRegCache::spillXReg(X64Reg reg)
-{
-	if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED)
-	{
-		_assert_msg_(DSPLLE, !regs[xregs[reg].guest_reg].used,
-			     "to be spilled host reg %x(guest reg %x) still in use!",
-			     reg, xregs[reg].guest_reg);
-
-		movToMemory(xregs[reg].guest_reg);
-	}
-	else
-	{
-		_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE,
-			     "to be spilled host reg %x still in use!",
-			     reg);
-	}
-}
-
-X64Reg DSPJitRegCache::findFreeXReg()
-{
-	for(unsigned int i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
-	{
-		if (xregs[alloc_order[i]].guest_reg == DSP_REG_NONE)
-		{
-			return alloc_order[i];
-		}
-	}
-	return INVALID_REG;
-}
-
-X64Reg DSPJitRegCache::findSpillFreeXReg()
-{
-	X64Reg reg = findFreeXReg();
-	if (reg == INVALID_REG)
-		reg = spillXReg();
-	return reg;
-}
-
-void DSPJitRegCache::getFreeXReg(X64Reg &reg)
-{
-	reg = findSpillFreeXReg();
-
-	_assert_msg_(DSPLLE, reg != INVALID_REG, "could not find register");
-	if (reg == INVALID_REG)
-		emitter.INT3();
-	xregs[reg].guest_reg = DSP_REG_USED;
-}
-
-void DSPJitRegCache::getXReg(X64Reg reg)
-{
-	if (xregs[reg].guest_reg == DSP_REG_STATIC)
-	{
-		ERROR_LOG(DSPLLE, "Trying to get statically used XReg %d", reg);
-		return;
-	}
-
-	if (xregs[reg].guest_reg != DSP_REG_NONE)
-		spillXReg(reg);
-	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE, "register already in use");
-	xregs[reg].guest_reg = DSP_REG_USED;
-}
-
-void DSPJitRegCache::putXReg(X64Reg reg)
-{
-	if (xregs[reg].guest_reg == DSP_REG_STATIC)
-	{
-		ERROR_LOG(DSPLLE, "Trying to put statically used XReg %d", reg);
-		return;
-	}
-
-	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_USED,
-		     "putXReg without get(Free)XReg");
-
-	xregs[reg].guest_reg = DSP_REG_NONE;
-}
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
deleted file mode 100644
index a1a43e7047..0000000000
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __DSPJITUTIL_H__
-#define __DSPJITUTIL_H__
-
-#endif /*__DSPJITUTIL_H__*/
diff --git a/Source/Core/Core/Src/DSP/LabelMap.cpp b/Source/Core/Core/Src/DSP/LabelMap.cpp
deleted file mode 100644
index a5e6e1b6dd..0000000000
--- a/Source/Core/Core/Src/DSP/LabelMap.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "LabelMap.h"
-#include "DSPTables.h"
-
-LabelMap::LabelMap()
-{
-
-}
-
-void LabelMap::RegisterDefaults()
-{
-	for (int i = 0; i < 0x24; i++)
-	{
-		if (regnames[i].name)
-			RegisterLabel(regnames[i].name, regnames[i].addr);
-	}
-	for (int i = 0; i < (int)pdlabels_size; i++)
-	{
-		if (pdlabels[i].name)
-			RegisterLabel(pdlabels[i].name, pdlabels[i].addr);
-	}
-}
-
-void LabelMap::RegisterLabel(const std::string &label, u16 lval, LabelType type)
-{
-	u16 old_value;
-	if (GetLabelValue(label, &old_value) && old_value != lval) 
-	{
-		printf("WARNING: Redefined label %s to %04x - old value %04x\n",
-			   label.c_str(), lval, old_value);
-		DeleteLabel(label);
-	}
-	labels.push_back(label_t(label, lval, type));
-}
-
-void LabelMap::DeleteLabel(const std::string &label)
-{
-	for (std::vector<label_t>::iterator iter = labels.begin();
-		iter != labels.end(); ++iter)
-	{
-		if (!label.compare(iter->name))
-		{
-			labels.erase(iter);
-			return;
-		}
-	}
-}
-
-bool LabelMap::GetLabelValue(const std::string &label, u16 *value, LabelType type) const
-{
-	for (u32 i = 0; i < labels.size(); i++)
-	{
-		if (!label.compare(labels[i].name))
-		{
-			if (type & labels[i].type)
-			{
-				*value = labels[i].addr;
-				return true;
-			}
-			else
-			{
-				printf("WARNING: Wrong label type requested. %s\n", label.c_str());
-			}
-		}
-	}
-	return false;
-}
-
-void LabelMap::Clear()
-{
-	labels.clear();
-}
diff --git a/Source/Core/Core/Src/DSP/assemble.cpp b/Source/Core/Core/Src/DSP/assemble.cpp
deleted file mode 100644
index 8deef98ed9..0000000000
--- a/Source/Core/Core/Src/DSP/assemble.cpp
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*====================================================================
-
-$Id: assemble.cpp,v 1.3 2008-11-11 01:04:26 wntrmute Exp $
-
-project:      GameCube DSP Tool (gcdsp)
-mail:		  duddie@walla.com
-
-Copyright (c) 2005 Duddie
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-Revision 1.4  2008/10/04 10:30:00  Hermes
-added function to export the code to .h file
-added support for '/ *' '* /' and '//' for comentaries
-added some sintax detection when use registers
-
-$Log: not supported by cvs2svn $
-Revision 1.2  2005/09/14 02:19:29  wntrmute
-added header guards
-use standard main function
-
-Revision 1.1  2005/08/24 22:13:34  wntrmute
-Initial import
-
-
-====================================================================*/
-
-#include <cstdio>
-#include <cstdlib>
-
-#include <map>
-#include <iostream>
-#include <fstream>
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "DSPInterpreter.h"
-#include "DSPTables.h"
-#include "disassemble.h"
-#include "assemble.h"
-
-static const char *err_string[] =
-{
-	"",
-	"Unknown Error",
-	"Unknown opcode",
-	"Not enough parameters",
-	"Too many parameters",
-	"Wrong parameter",
-	"Expected parameter of type 'string'",
-	"Expected parameter of type 'value'",
-	"Expected parameter of type 'register'",
-	"Expected parameter of type 'memory pointer'",
-	"Expected parameter of type 'immediate'",
-	"Incorrect binary value",
-	"Incorrect hexadecimal value",
-	"Incorrect decimal value",
-	"Label already exists",
-	"Label not defined",
-	"No matching brackets",
-	"This opcode cannot be extended",
-	"Given extending params for non extensible opcode",
-	"Wrong parameter: must be accumulator register",
-	"Wrong parameter: must be mid accumulator register",
-	"Invalid register",
-	"Number out of range"
-};
-
-DSPAssembler::DSPAssembler(const AssemblerSettings &settings) :	
-	gdg_buffer(NULL),
-	m_cur_addr(0),
-	m_cur_pass(0),
-	m_current_param(0),
-	settings_(settings)
-
-{
-}
-
-DSPAssembler::~DSPAssembler()
-{
-	if(gdg_buffer)
-		free(gdg_buffer);
-}
-
-bool DSPAssembler::Assemble(const char *text, std::vector<u16> &code, std::vector<int> *line_numbers)
-{
-	if (line_numbers)
-		line_numbers->clear();
-	const char *fname = "tmp.asm";
-	if (!File::WriteStringToFile(true, text, fname))
-		return false;
-	InitPass(1);
-	if (!AssembleFile(fname, 1))
-		return false;
-
-	// We now have the size of the output buffer
-	if (m_totalSize > 0)
-	{
-		gdg_buffer = (char *)malloc(m_totalSize * sizeof(u16) + 4);
-		if(!gdg_buffer)
-			return false;
-
-		memset(gdg_buffer, 0, m_totalSize * sizeof(u16));
-	} else
-		return false;
-
-	InitPass(2);
-	if (!AssembleFile(fname, 2))
-		return false;
-
-	code.resize(m_totalSize);
-	for (int i = 0; i < m_totalSize; i++) {
-		code[i] = *(u16 *)(gdg_buffer + i * 2);
-	}
-
-	if(gdg_buffer) {
-		free(gdg_buffer);
-		gdg_buffer = NULL;
-	}
-
-	last_error_str = "(no errors)";
-	last_error = ERR_OK;
-
-	return true;
-}
-
-void DSPAssembler::ShowError(err_t err_code, const char *extra_info)
-{
-
-	if (!settings_.force)
-		failed = true;
-
-	char error_buffer[1024];
-	char *buf_ptr = error_buffer;
-	buf_ptr += sprintf(buf_ptr, "%i : %s ", code_line, cur_line.c_str());
-	if (!extra_info)
-		extra_info = "-";
-
-	if (m_current_param == 0)
-		buf_ptr += sprintf(buf_ptr, "ERROR: %s Line: %d : %s\n", err_string[err_code], code_line, extra_info);
-	else 
-		buf_ptr += sprintf(buf_ptr, "ERROR: %s Line: %d Param: %d : %s\n",
-						   err_string[err_code], code_line, m_current_param, extra_info);
-	last_error_str = error_buffer;
-	last_error = err_code;
-}
-
-char *skip_spaces(char *ptr)
-{
-	while (*ptr == ' ')
-		ptr++;
-	return ptr;
-}
-
-const char *skip_spaces(const char *ptr)
-{
-	while (*ptr == ' ')
-		ptr++;
-	return ptr;
-}
-
-// Parse a standalone value - it can be a number in one of several formats or a label.
-s32 DSPAssembler::ParseValue(const char *str)
-{
-	bool negative = false;
-	s32 val = 0;
-	const char *ptr = str;
-
-	if (ptr[0] == '#')
-	{
-		ptr++;
-		negative = true;  // Wow! Double # (needed one to get in here) negates???
-	}
-	if (ptr[0] == '-')
-	{
-		ptr++;
-		negative = true;
-	}
-	if (ptr[0] == '0')
-	{
-		if (ptr[1] >= '0' && ptr[1] <= '9')
-		{
-			for (int i = 0; ptr[i] != 0; i++)
-			{
-				val *= 10;
-				if (ptr[i] >= '0' && ptr[i] <= '9')
-					val += ptr[i] - '0';
-				else
-					ShowError(ERR_INCORRECT_DEC, str);
-			}
-		}
-		else
-		{
-			switch (ptr[1])
-			{
-			case 'X': // hex
-				for (int i = 2 ; ptr[i] != 0 ; i++)
-				{
-					val <<= 4;
-					if (ptr[i] >= 'a' && ptr[i] <= 'f')
-						val += (ptr[i]-'a'+10);
-					else if (ptr[i] >= 'A' && ptr[i] <= 'F')
-						val += (ptr[i]-'A'+10);
-					else if (ptr[i] >= '0' && ptr[i] <= '9')
-						val += (ptr[i] - '0');
-					else
-						ShowError(ERR_INCORRECT_HEX, str);
-				}
-				break;
-			case '\'': // binary
-				for (int i = 2; ptr[i] != 0; i++)
-				{
-					val *=2;
-					if(ptr[i] >= '0' && ptr[i] <= '1')
-						val += ptr[i] - '0';
-					else
-						ShowError(ERR_INCORRECT_BIN, str);
-				}
-				break;
-			default:
-				// value is 0 or error
-				val = 0;
-				break;
-			}
-		}
-	}
-	else
-	{
-		// Symbol starts with a digit - it's a dec number.
-		if (ptr[0] >= '0' && ptr[0] <= '9')
-		{
-			for (int i = 0; ptr[i] != 0; i++)
-			{
-				val *= 10;
-				if (ptr[i] >= '0' && ptr[i] <= '9')
-					val += ptr[i] - '0';
-				else
-					ShowError(ERR_INCORRECT_DEC, str);
-			}
-		}
-		else  // Everything else is a label.
-		{
-			// Lookup label
-			u16 value;
-			if (labels.GetLabelValue(ptr, &value))
-				return value;
-			if (m_cur_pass == 2)
-				ShowError(ERR_UNKNOWN_LABEL, str);
-		}
-	}
-	if (negative)
-		return -val;
-	return val;
-}
-
-// Modifies both src and dst!
-// What does it do, really??
-char *DSPAssembler::FindBrackets(char *src, char *dst)
-{
-	s32 len = (s32) strlen(src);
-	s32 first = -1;
-	s32 count = 0;
-	s32 i, j;
-	j = 0;
-	for (i = 0 ; i < len ; i++)
-	{
-		if (src[i] == '(')
-		{
-			if (first < 0)
-			{
-				count = 1;
-				src[i] = 0x0;
-				first = i;
-			}
-			else
-			{
-				count++;
-				dst[j++] = src[i];
-			}
-		}
-		else if (src[i] == ')')
-		{
-			if (--count == 0)
-			{
-				dst[j] = 0;
-				return &src[i+1];
-			}
-			else
-			{
-				dst[j++] = src[i];
-			}
-		}
-		else
-		{
-			if (first >= 0)
-				dst[j++] = src[i];
-		}
-	}
-	if (count)
-		ShowError(ERR_NO_MATCHING_BRACKETS);
-	return NULL;
-}
-
-// Bizarre in-place expression evaluator.
-u32 DSPAssembler::ParseExpression(const char *ptr)
-{
-	char *pbuf;
-	s32 val = 0;
-
-	char *d_buffer = (char *)malloc(1024);
-	char *s_buffer = (char *)malloc(1024);
-	strcpy(s_buffer, ptr);
-
-	while ((pbuf = FindBrackets(s_buffer, d_buffer)) != NULL)
-	{
-		val = ParseExpression(d_buffer);
-		sprintf(d_buffer, "%s%d%s", s_buffer, val, pbuf);
-		strcpy(s_buffer, d_buffer);
-	}
-
-	int j = 0;
-	for (int i = 0; i < ((s32)strlen(s_buffer) + 1) ; i++)
-	{
-		char c = s_buffer[i];
-		if (c != ' ')
-			d_buffer[j++] = c;
-	}
-
-	for (int i = 0; i < ((s32)strlen(d_buffer) + 1) ; i++)
-	{
-		char c = d_buffer[i];
-		if (c == '-')
-		{
-			if (i == 0)
-				c = '#';
-			else
-			{
-				switch (d_buffer[i - 1])
-				{
-				case '/':
-				case '%':
-				case '*':
-					c = '#';
-				}
-			}
-		}
-		d_buffer[i] = c;
-	}
-
-	while ((pbuf = strstr(d_buffer, "+")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) + ParseExpression(pbuf+1);
-		sprintf(d_buffer, "%d", val);
-	}
-
-	while ((pbuf = strstr(d_buffer, "-")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) - ParseExpression(pbuf+1);
-		if (val < 0)
-		{
-			val = 0x10000 + (val & 0xffff); // ATTENTION: avoid a terrible bug!!! number cannot write with '-' in sprintf
-			fprintf(stderr, "WARNING: Number Underflow at Line: %d \n", code_line);
-		}
-		sprintf(d_buffer, "%d", val);
-	}
-
-	while ((pbuf = strstr(d_buffer, "*")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) * ParseExpression(pbuf+1);
-		sprintf(d_buffer, "%d", val);
-	}
-
-	while ((pbuf = strstr(d_buffer, "/")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) / ParseExpression(pbuf+1);
-		sprintf(d_buffer, "%d", val);
-	}
-
-	while ((pbuf = strstr(d_buffer, "|")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) | ParseExpression(pbuf+1);
-		sprintf(d_buffer, "%d", val);
-	}
-
-	while ((pbuf = strstr(d_buffer, "&")) != NULL)
-	{
-		*pbuf = 0x0;
-		val = ParseExpression(d_buffer) & ParseExpression(pbuf+1);
-		sprintf(d_buffer, "%d", val);
-	}
-
-	val = ParseValue(d_buffer);
-	free(d_buffer);
-	free(s_buffer);
-	return val;
-}
-
-// Destroys parstr
-u32 DSPAssembler::GetParams(char *parstr, param_t *par)
-{
-	u32 count = 0;
-	char *tmpstr = skip_spaces(parstr);
-	tmpstr = strtok(tmpstr, ",\x00");
-	for (int i = 0; i < 10; i++)
-	{
-		if (tmpstr == NULL)
-			break;
-		tmpstr = skip_spaces(tmpstr);
-		if (strlen(tmpstr) == 0)
-			break;
-		if (tmpstr)
-			count++;
-		else
-			break;
-
-		par[i].type = P_NONE;
-		switch (tmpstr[0])
-		{
-		case '"':
-			par[i].str = strtok(tmpstr, "\"");
-			par[i].type = P_STR;
-			break;
-		case '#':
-			par[i].val = ParseExpression(tmpstr + 1);
-			par[i].type = P_IMM;
-			break;
-		case '@':
-			if (tmpstr[1] == '$')
-			{
-				par[i].val = ParseExpression(tmpstr + 2);
-				par[i].type = P_PRG;
-			}
-			else
-			{
-				par[i].val = ParseExpression(tmpstr + 1);
-				par[i].type = P_MEM;
-			}
-			break;
-		case '$':
-			par[i].val = ParseExpression(tmpstr + 1);
-			par[i].type = P_REG;
-			break;
-
-		default:
-			par[i].val = ParseExpression(tmpstr);
-			par[i].type = P_VAL;
-			break;
-		}
-		tmpstr = strtok(NULL, ",\x00");
-	}
-	return count;
-}
-
-const opc_t *DSPAssembler::FindOpcode(const char *opcode, u32 par_count, const opc_t * const opcod, int opcod_size)
-{
-	if (opcode[0] == 'C' && opcode[1] == 'W')
-		return &cw;
-
-	AliasMap::const_iterator alias_iter = aliases.find(opcode);
-	if (alias_iter != aliases.end())
-		opcode = alias_iter->second.c_str();
-	for (int i = 0; i < opcod_size; i++)
-	{
-		const opc_t *opc = &opcod[i];
-		if (strcmp(opc->name, opcode) == 0)
-		{
-			if (par_count < opc->param_count)
-			{
-				ShowError(ERR_NOT_ENOUGH_PARAMETERS);
-			}
-			if (par_count > opc->param_count)
-			{
-				ShowError(ERR_TOO_MANY_PARAMETERS);
-			}
-			return opc;
-		}
-	}
-	ShowError(ERR_UNKNOWN_OPCODE);
-	return NULL;
-}
-
-// weird...
-u16 get_mask_shifted_down(u16 mask)
-{
-	while (!(mask & 1))
-		mask >>= 1;
-	return mask;
-}
-
-bool DSPAssembler::VerifyParams(const opc_t *opc, param_t *par, int count, bool ext)
-{
-	for (int i = 0; i < count; i++)
-	{
-		const int current_param = i + 1;  // just for display.
-		if (opc->params[i].type != par[i].type || (par[i].type & P_REG))
-		{
-			if (par[i].type == P_VAL &&
-				(opc->params[i].type == P_ADDR_I || opc->params[i].type == P_ADDR_D))
-			{
-				// Data and instruction addresses are valid as VAL values.
-				continue;
-			}
-
-			if ((opc->params[i].type & P_REG) && (par[i].type & P_REG))
-			{
-				// Just a temp. Should be replaced with more purposeful vars.
-				int value;
-
-				// modified by Hermes: test the register range
-				switch ((unsigned)opc->params[i].type)
-				{ 
-				case P_REG18:
-				case P_REG19:
-				case P_REG1A:
-					value = (opc->params[i].type >> 8) & 31;
-					if ((int)par[i].val < value ||
-						(int)par[i].val > value + get_mask_shifted_down(opc->params[i].mask))
-					{
-						if (ext) fprintf(stderr, "(ext) ");
-						fprintf(stderr, "%s   (param %i)", cur_line.c_str(), current_param);
-						ShowError(ERR_INVALID_REGISTER);
-					}
-					break;
-				case P_PRG:
-					if ((int)par[i].val < 0 || (int)par[i].val > 0x3)
-					{
-						if (ext) fprintf(stderr, "(ext) ");
-						fprintf(stderr, "%s   (param %i)", cur_line.c_str(), current_param);
-						ShowError(ERR_INVALID_REGISTER);
-					}
-					break;
-				case P_ACC:
-					if ((int)par[i].val < 0x20 || (int)par[i].val > 0x21)
-					{
-						if (ext) fprintf(stderr, "(ext) ");
-						if (par[i].val >= 0x1e && par[i].val <= 0x1f) {
-							fprintf(stderr, "%i : %s ", code_line, cur_line.c_str());
-							fprintf(stderr, "WARNING: $ACM%d register used instead of $ACC%d register Line: %d Param: %d Ext: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param, ext);
-						}
-						else if (par[i].val >= 0x1c && par[i].val <= 0x1d) {
-							fprintf(stderr, "WARNING: $ACL%d register used instead of $ACC%d register Line: %d Param: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
-						}
-						else
-							ShowError(ERR_WRONG_PARAMETER_ACC);
-					}
-					break;
-				case P_ACCM:
-					if ((int)par[i].val < 0x1e || (int)par[i].val > 0x1f)
-					{
-						if (ext) fprintf(stderr, "(ext) ");
-						if (par[i].val >= 0x1c && par[i].val <= 0x1d)
-							fprintf(stderr, "WARNING: $ACL%d register used instead of $ACM%d register Line: %d Param: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
-						else if (par[i].val >= 0x20 && par[i].val <= 0x21)
-							fprintf(stderr, "WARNING: $ACC%d register used instead of $ACM%d register Line: %d Param: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
-						else
-							ShowError(ERR_WRONG_PARAMETER_ACC);
-					}
-					break;
-
-				case P_ACCL:
-					if ((int)par[i].val < 0x1c || (int)par[i].val > 0x1d)
-					{
-						if (ext) fprintf(stderr, "(ext) ");
-						if (par[i].val >= 0x1e && par[i].val <= 0x1f)
-						{
-							fprintf(stderr, "%s ", cur_line.c_str());
-							fprintf(stderr, "WARNING: $ACM%d register used instead of $ACL%d register Line: %d Param: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
-						}
-						else if (par[i].val >= 0x20 && par[i].val <= 0x21) {
-							fprintf(stderr, "%s ", cur_line.c_str());
-							fprintf(stderr, "WARNING: $ACC%d register used instead of $ACL%d register Line: %d Param: %d\n",
-								(par[i].val & 1), (par[i].val & 1), code_line, current_param);
-						}
-						else
-							ShowError(ERR_WRONG_PARAMETER_ACC);
-					}
-					break;
-/*				case P_ACCM_D: //P_ACC_MID:
-					if ((int)par[i].val < 0x1e || (int)par[i].val > 0x1f)
-					{
-						ShowError(ERR_WRONG_PARAMETER_MID_ACC);
-					}
-					break;*/
-				}
-				continue;
-			}
-
-			switch (par[i].type & (P_REG | 7))
-			{
-			case P_REG:
-				if (ext) fprintf(stderr, "(ext) ");
-				ShowError(ERR_EXPECTED_PARAM_REG);
-				break;
-			case P_MEM:
-				if (ext) fprintf(stderr, "(ext) ");
-				ShowError(ERR_EXPECTED_PARAM_MEM);
-				break;
-			case P_VAL:
-				if (ext) fprintf(stderr, "(ext) ");
-				ShowError(ERR_EXPECTED_PARAM_VAL);
-				break;
-			case P_IMM:
-				if (ext) fprintf(stderr, "(ext) ");
-				ShowError(ERR_EXPECTED_PARAM_IMM);
-				break;
-			}
-			ShowError(ERR_WRONG_PARAMETER);
-			break;
-		}
-		else if ((opc->params[i].type & 3) != 0 && (par[i].type & 3) != 0)
-		{
-			// modified by Hermes: test NUMBER range
-			int value = get_mask_shifted_down(opc->params[i].mask);
-			unsigned int valueu = 0xffff & ~(value >> 1);
-			if ((int)par[i].val < 0)
-			{
-				if (value == 7) // value 7 por sbclr/sbset
-				{
-					fprintf(stderr,"Value must be from 0x0 to 0x%x\n", value);
-					ShowError(ERR_OUT_RANGE_NUMBER);
-				}
-				else if (opc->params[i].type == P_MEM)
-				{
-					if (value < 256)
-						fprintf(stderr, "Address value must be from 0x%x to 0x%x\n",valueu, (value>>1));
-					else
-						fprintf(stderr, "Address value must be from 0x0 to 0x%x\n", value);
-
-					ShowError(ERR_OUT_RANGE_NUMBER);
-				}
-				else if ((int)par[i].val < -((value >> 1) + 1))
-				{
-					if (value < 128)
-						fprintf(stderr, "Value must be from -0x%x to 0x%x, is %i\n",
-						        (value >> 1) + 1, value >> 1, par[i].val);
-					else
-						fprintf(stderr, "Value must be from -0x%x to 0x%x or 0x0 to 0x%x, is %i\n",
-						        (value >> 1) + 1, value >> 1, value, par[i].val);
-
-					ShowError(ERR_OUT_RANGE_NUMBER);
-				}
-			}
-			else
-			{
-				if (value == 7) // value 7 por sbclr/sbset
-				{
-					if (par[i].val > (unsigned)value)
-					{
-						fprintf(stderr,"Value must be from 0x%x to 0x%x, is %i\n",valueu, value, par[i].val);
-						ShowError(ERR_OUT_RANGE_NUMBER);
-					}
-				}
-				else if (opc->params[i].type == P_MEM)
-				{
-					if (value < 256)
-						value >>= 1; // addressing 8 bit with sign
-					if (par[i].val > (unsigned)value &&
-						(par[i].val < valueu || par[i].val > (unsigned)0xffff))
-					{
-						if (value < 256)
-							fprintf(stderr,"Address value must be from 0x%x to 0x%x, is %04x\n", valueu, value, par[i].val);
-						else
-							fprintf(stderr,"Address value must be minor of 0x%x\n", value+1);
-						ShowError(ERR_OUT_RANGE_NUMBER);
-					}
-				}
-				else
-				{
-					if (value < 128)
-						value >>= 1; // special case ASL/ASR/LSL/LSR
-					if (par[i].val > (unsigned)value)
-					{
-						if (value < 64)
-							fprintf(stderr,"Value must be from -0x%x to 0x%x, is %i\n", (value + 1), value, par[i].val);
-						else
-							fprintf(stderr,"Value must be minor of 0x%x, is %i\n", value + 1, par[i].val);
-						ShowError(ERR_OUT_RANGE_NUMBER);
-					}
-				}
-			}
-			continue;
-		}
-	}
-	m_current_param = 0;
-	return true;
-}
-
-
-// Merge opcode with params.
-void DSPAssembler::BuildCode(const opc_t *opc, param_t *par, u32 par_count, u16 *outbuf)
-{
-	outbuf[m_cur_addr] |= opc->opcode;
-	for (u32 i = 0; i < par_count; i++)
-	{
-		// Ignore the "reverse" parameters since they are implicit.
-		if (opc->params[i].type != P_ACC_D && opc->params[i].type != P_ACCM_D)
-		{
-			u16 t16 = outbuf[m_cur_addr + opc->params[i].loc];
-			u16 v16 = par[i].val;
-			if (opc->params[i].lshift > 0)
-				v16 <<= opc->params[i].lshift;
-			else
-				v16 >>= -opc->params[i].lshift;
-			v16 &= opc->params[i].mask;
-			outbuf[m_cur_addr + opc->params[i].loc] = t16 | v16;
-		}
-	}
-}
-
-void DSPAssembler::InitPass(int pass)
-{
-	failed = false;
-	if (pass == 1)
-	{
-		// Reset label table. Pre-populate with hw addresses and registers.
-		labels.Clear();
-		labels.RegisterDefaults();
-		aliases.clear();
-		aliases["S15"] = "SET15";
-		aliases["S16"] = "SET16";
-		aliases["S40"] = "SET40";
-	}
-	m_cur_addr = 0;
-	m_totalSize = 0;
-	cur_segment = SEGMENT_CODE;
-	segment_addr[SEGMENT_CODE] = 0;
-	segment_addr[SEGMENT_DATA] = 0;
-	segment_addr[SEGMENT_OVERLAY] = 0;
-}
-
-bool DSPAssembler::AssembleFile(const char *fname, int pass)
-{
-	int disable_text = 0; // modified by Hermes
-
-	std::ifstream fsrc;
-	OpenFStream(fsrc, fname, std::ios_base::in);
-
-	if (fsrc.fail())
-	{
-		std::cerr << "Cannot open file " << fname << std::endl;
-		return false;
-	}
-
-	//printf("%s: Pass %d\n", fname, pass);
-	code_line = 0;
-	m_cur_pass = pass;
-
-#define LINEBUF_SIZE 1024
-	char line[LINEBUF_SIZE] = {0};
-	while (!failed && !fsrc.fail() && !fsrc.eof())
-	{
-		int opcode_size = 0;
-		fsrc.getline(line, LINEBUF_SIZE);
-		if(fsrc.fail())
-			break;
-		
-		cur_line = line;
-		//printf("A: %s\n", line);
-		code_line++;
-
-		param_t params[10] = {{0, P_NONE, NULL}};
-		param_t params_ext[10] = {{0, P_NONE, NULL}};
-		
-		bool upper = true;
-		for (int i = 0; i < LINEBUF_SIZE; i++)
-		{
-			char c = line[i];
-			// This stuff handles /**/ and // comments.
-			// modified by Hermes : added // and /* */ for long commentaries 
-			if (c == '/')
-			{
-				if (i < 1023)
-				{
-					if (line[i+1] == '/')
-						c = 0x00;
-					else if (line[i+1] == '*') 
-					{
-						// toggle comment mode.
-						disable_text = !disable_text;
-					}
-				}
-			}
-			else if (c == '*')
-			{
-				if (i < 1023 && line[i+1] == '/' && disable_text)
-				{
-					disable_text = 0;
-					c = 32;
-					line[i + 1] = 32;
-				}
-			}
-
-			// turn text into spaces if disable_text is on (in a comment).
-			if (disable_text && ((unsigned char)c) > 32) c = 32;
-
-			if (c == 0x0a || c == 0x0d || c == ';')
-				c = 0x00;
-			if (c == 0x09)				// tabs to spaces
-				c = ' ';
-			if (c == '"')
-				upper = !upper;
-			if (upper && c >= 'a' && c <= 'z')	// convert to uppercase
-				c = c - 'a' + 'A';
-			line[i] = c;
-			if (c == 0)
-				break; // modified by Hermes
-		}
-		char *ptr = line;
-
-		std::string label;
-
-		size_t col_pos = std::string(line).find(":");
-		if (col_pos != std::string::npos)
-		{
-			bool valid = true;
-
-			for(int j = 0; j < (int)col_pos; j++)
-			{
-				if (j == 0)
-					if (!((ptr[j] >= 'A' && ptr[j] <= 'Z') || (ptr[j] == '_')))
-						valid = false;
-				if (!((ptr[j] >= '0' && ptr[j] <= '9') || (ptr[j] >= 'A' && ptr[j] <= 'Z') || (ptr[j] == '_')))
-					valid = false;
-			}
-			if (valid)
-			{
-				label = std::string(line).substr(0, col_pos);
-				ptr	+= col_pos + 1;
-			}
-		}
-
-		char *opcode = NULL;
-		opcode = strtok(ptr, " ");
-		char *opcode_ext = NULL;
-
-		u32 params_count = 0;
-		u32 params_count_ext = 0;
-		if (opcode)
-		{
-			if ((opcode_ext = strstr(opcode, "'")) != NULL)
-			{
-				opcode_ext[0] = '\0';
-				opcode_ext++;
-				if (strlen(opcode_ext) == 0)
-					opcode_ext = NULL;
-			}
-			// now we have opcode and label
-
-			params_count = 0;
-			params_count_ext = 0;
-
-			char *paramstr = strtok(NULL, "\0");
-			char *paramstr_ext = 0;
-			// there is valid opcode so probably we have parameters
-
-			if (paramstr)
-			{
-				if ((paramstr_ext = strstr(paramstr, ":")) != NULL)
-				{
-					paramstr_ext[0] = '\0';
-					paramstr_ext++;
-				}
-			}
-
-			if (paramstr)
-				params_count = GetParams(paramstr, params);
-			if (paramstr_ext)
-				params_count_ext = GetParams(paramstr_ext, params_ext);
-		}
-
-		if (!label.empty())
-		{
-			// there is a valid label so lets store it in labels table
-			u32 lval = m_cur_addr;
-			if (opcode)
-			{
-				if (strcmp(opcode, "EQU") == 0)
-				{
-					lval = params[0].val;
-					opcode = NULL;
-				}
-			}
-			if (pass == 1)
-				labels.RegisterLabel(label, lval);
-		}
-
-		if (opcode == NULL)
-			continue;
-
-		// check if opcode is reserved compiler word
-		if (strcmp("INCLUDE", opcode) == 0)
-		{
-			if (params[0].type == P_STR)
-			{
-				char *tmpstr;
-				u32 thisCodeline = code_line;
-				
-				if (include_dir.size())
-				{
-					tmpstr = (char *)malloc(include_dir.size() + strlen(params[0].str) + 2);
-					sprintf(tmpstr, "%s/%s", include_dir.c_str(), params[0].str);
-				}
-				else
-				{
-					tmpstr = (char *)malloc(strlen(params[0].str) + 1);
-					strcpy(tmpstr, params[0].str);
-				}
-				
-				AssembleFile(tmpstr, pass);
-
-				code_line = thisCodeline;
-
-				free(tmpstr);
-			}
-			else
-				ShowError(ERR_EXPECTED_PARAM_STR);
-			continue;
-		}
-
-		if (strcmp("INCDIR", opcode) == 0)
-		{
-			if (params[0].type == P_STR)
-				include_dir = params[0].str;
-			else
-				ShowError(ERR_EXPECTED_PARAM_STR);
-			continue;
-		}
-
-		if (strcmp("ORG", opcode) == 0)
-		{
-			if (params[0].type == P_VAL)
-				m_cur_addr = params[0].val;
-			else
-				ShowError(ERR_EXPECTED_PARAM_VAL);
-			continue;
-		}
-
-		if (strcmp("SEGMENT", opcode) == 0)
-		{
-			if (params[0].type == P_STR)
-			{
-				segment_addr[cur_segment] = m_cur_addr;
-				if (strcmp("DATA", params[0].str) == 0)
-					cur_segment = SEGMENT_DATA;
-				if (strcmp("CODE", params[0].str) == 0)
-					cur_segment = SEGMENT_CODE;
-				m_cur_addr = segment_addr[cur_segment];
-			}
-			else
-				ShowError(ERR_EXPECTED_PARAM_STR);
-			continue;
-		}
-
-		const opc_t *opc = FindOpcode(opcode, params_count, opcodes, opcodes_size);
-		if (!opc)
-			opc = &cw;
-
-		opcode_size = opc->size;
-
-		VerifyParams(opc, params, params_count);
-
-		const opc_t *opc_ext = NULL;
-		// Check for opcode extensions.
-		if (opc->extended)
-		{
-			if (opcode_ext)
-			{
-				opc_ext = FindOpcode(opcode_ext, params_count_ext, opcodes_ext, opcodes_ext_size);
-				VerifyParams(opc_ext, params_ext, params_count_ext, true);
-			}
-			else if (params_count_ext)
-				ShowError(ERR_EXT_PAR_NOT_EXT);
-		}
-		else
-		{
-			if (opcode_ext)
-				ShowError(ERR_EXT_CANT_EXTEND_OPCODE);
-			if (params_count_ext)
-				ShowError(ERR_EXT_PAR_NOT_EXT);
-		}
-
-		if (pass == 2)
-		{
-			// generate binary
-			((u16 *)gdg_buffer)[m_cur_addr] = 0x0000;
-			BuildCode(opc, params, params_count, (u16 *)gdg_buffer);
-			if (opc_ext)
-				BuildCode(opc_ext, params_ext, params_count_ext, (u16 *)gdg_buffer);
-		}
-
-		m_cur_addr += opcode_size;
-		m_totalSize += opcode_size;
-	};
-
-	if (!failed)
-		fsrc.close();
-
-	return !failed;
-}
diff --git a/Source/Core/Core/Src/DSP/assemble.h b/Source/Core/Core/Src/DSP/assemble.h
deleted file mode 100644
index f140d0e69e..0000000000
--- a/Source/Core/Core/Src/DSP/assemble.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*====================================================================
-
-   project:      GameCube DSP Tool (gcdsp)
-   created:      2005.03.04
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-   ====================================================================*/
-
-#ifndef _DSP_ASSEMBLE_H
-#define _DSP_ASSEMBLE_H
-
-#include <string>
-#include <map>
-
-#include "Common.h"
-#include "disassemble.h"
-#include "DSPTables.h"
-#include "LabelMap.h"
-
-enum err_t
-{
-	ERR_OK = 0,
-	ERR_UNKNOWN,
-	ERR_UNKNOWN_OPCODE,
-	ERR_NOT_ENOUGH_PARAMETERS,
-	ERR_TOO_MANY_PARAMETERS,
-	ERR_WRONG_PARAMETER,
-	ERR_EXPECTED_PARAM_STR,
-	ERR_EXPECTED_PARAM_VAL,
-	ERR_EXPECTED_PARAM_REG,
-	ERR_EXPECTED_PARAM_MEM,
-	ERR_EXPECTED_PARAM_IMM,
-	ERR_INCORRECT_BIN,
-	ERR_INCORRECT_HEX,
-	ERR_INCORRECT_DEC,
-	ERR_LABEL_EXISTS,
-	ERR_UNKNOWN_LABEL,
-	ERR_NO_MATCHING_BRACKETS,
-	ERR_EXT_CANT_EXTEND_OPCODE,
-	ERR_EXT_PAR_NOT_EXT,
-	ERR_WRONG_PARAMETER_ACC,
-	ERR_WRONG_PARAMETER_MID_ACC,
-	ERR_INVALID_REGISTER,
-	ERR_OUT_RANGE_NUMBER
-};
-
-
-// Unless you want labels to carry over between files, you probably
-// want to create a new DSPAssembler for every file you assemble.
-class DSPAssembler
-{
-public:
-	DSPAssembler(const AssemblerSettings &settings);
-	~DSPAssembler();
-
-	// line_numbers is optional (and not yet implemented). It'll receieve a list of ints,
-	// one for each word of code, indicating the source assembler code line number it came from.
-
-	// If returns false, call GetErrorString to get some text to present to the user.
-	bool Assemble(const char *text, std::vector<u16> &code, std::vector<int> *line_numbers = NULL);
-
-	std::string GetErrorString() const { return last_error_str; }
-	err_t GetError() const { return last_error; }
-
-private:
-	struct param_t
-	{
-		u32			val;
-		partype_t	type;
-		char		*str;
-	};
-
-	enum segment_t
-	{
-		SEGMENT_CODE = 0,
-		SEGMENT_DATA,
-		SEGMENT_OVERLAY,
-		SEGMENT_MAX
-	};
-
-	// Utility functions
-	s32 ParseValue(const char *str);
-	u32 ParseExpression(const char *ptr);
-
-	u32 GetParams(char *parstr, param_t *par);
-
-	void InitPass(int pass);
-	bool AssembleFile(const char *fname, int pass);
-
-	void ShowError(err_t err_code, const char *extra_info = NULL);
-	// void ShowWarning(err_t err_code, const char *extra_info = NULL);
-
-	char *FindBrackets(char *src, char *dst);
-	const opc_t *FindOpcode(const char *opcode, u32 par_count, const opc_t * const opcod, int opcod_size);
-	bool VerifyParams(const opc_t *opc, param_t *par, int count, bool ext = false);
-	void BuildCode(const opc_t *opc, param_t *par, u32 par_count, u16 *outbuf);
-
-	char *gdg_buffer;
-
-	std::string include_dir;
-	std::string cur_line;
-
-	u32 m_cur_addr;
-	int m_totalSize;
-	u8  m_cur_pass;
-	
-	LabelMap labels;
-
-	u32	code_line;
-	bool failed;
-	std::string last_error_str;
-	err_t last_error;
-
-	typedef std::map<std::string, std::string> AliasMap;
-	AliasMap aliases;
-
-	segment_t cur_segment;
-	u32 segment_addr[SEGMENT_MAX];
-	int m_current_param;
-	const AssemblerSettings settings_;
-};
-
-#endif  // _DSP_ASSEMBLE_H
diff --git a/Source/Core/Core/Src/DSP/disassemble.cpp b/Source/Core/Core/Src/DSP/disassemble.cpp
deleted file mode 100644
index 99bd2811b3..0000000000
--- a/Source/Core/Core/Src/DSP/disassemble.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*====================================================================
-
-   filename:     disassemble.cpp
-   project:      GameCube DSP Tool (gcdsp)
-   created:      2005.03.04
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "disassemble.h"
-#include "DSPTables.h"
-
-#ifdef _MSC_VER
-#pragma warning(disable:4996)
-#endif
-
-#ifndef MAX_PATH
-#include <Windows.h> // For MAX_PATH
-#endif
-
-extern void nop(const UDSPInstruction opc);
-
-DSPDisassembler::DSPDisassembler(const AssemblerSettings &settings)
-	: settings_(settings)
-{
-}
-
-DSPDisassembler::~DSPDisassembler()
-{
-	// Some old code for logging unknown ops.
-	std::string filename = File::GetUserPath(D_DUMPDSP_IDX) + "UnkOps.txt";
-	File::IOFile uo(filename, "w");
-	if (!uo)
-		return;
-
-	int count = 0;
-	for (std::map<u16, int>::const_iterator iter = unk_opcodes.begin();
-		iter != unk_opcodes.end(); ++iter)
-	{
-		if (iter->second > 0)
-		{
-			count++;
-			fprintf(uo.GetHandle(), "OP%04x\t%d", iter->first, iter->second);
-			for (int j = 15; j >= 0; j--)  // print op bits
-			{
-				if ((j & 0x3) == 3)
-					fprintf(uo.GetHandle(), "\tb");
-				fprintf(uo.GetHandle(), "%d", (iter->first >> j) & 0x1);
-			}
-			fprintf(uo.GetHandle(), "\n");
-		}
-	}
-	fprintf(uo.GetHandle(), "Unknown opcodes count: %d\n", count);
-}
-
-bool DSPDisassembler::Disassemble(int start_pc, const std::vector<u16> &code, int base_addr, std::string &text)
-{
-	const char *tmp1 = "tmp1.bin";
-
-	// First we have to dump the code to a bin file.
-	{
-	File::IOFile f(tmp1, "wb");
-	f.WriteArray(&code[0], code.size());
-	}
-
-	// Run the two passes.
-	return DisFile(tmp1, base_addr, 1, text) && DisFile(tmp1, base_addr, 2, text);
-}
-
-char *DSPDisassembler::DisParams(const DSPOPCTemplate& opc, u16 op1, u16 op2, char *strbuf)
-{
-	char *buf = strbuf;
-	for (int j = 0; j < opc.param_count; j++)
-	{
-		if (j > 0)
-			buf += sprintf(buf, ", ");
-
-		u32 val = (opc.params[j].loc >= 1) ? op2 : op1;
-		val &= opc.params[j].mask;
-		if (opc.params[j].lshift < 0)
-			val = val << (-opc.params[j].lshift);
-		else
-			val = val >> opc.params[j].lshift;
-
-		u32 type = opc.params[j].type;
-		if ((type & 0xff) == 0x10)
-			type &= 0xff00;
-
-		if (type & P_REG)
-		{
-			// Check for _D parameter - if so flip.
-			if ((type == P_ACC_D) || (type == P_ACCM_D))  // Used to be P_ACCM_D TODO verify
-				val = (~val & 0x1) | ((type & P_REGS_MASK) >> 8);
-			else
-				val |= (type & P_REGS_MASK) >> 8;
-			type &= ~P_REGS_MASK;
-		}
-
-		switch (type)
-		{
-		case P_REG:
-			if (settings_.decode_registers)
-				sprintf(buf, "$%s", pdregname(val));
-			else
-				sprintf(buf, "$%d", val);
-			break;
-
-		case P_PRG:
-			if (settings_.decode_registers)
-				sprintf(buf, "@$%s", pdregname(val));
-			else
-				sprintf(buf, "@$%d", val);
-			break;
-
-		case P_VAL:
-		case P_ADDR_I:
-		case P_ADDR_D:
-			if (settings_.decode_names)
-			{
-				sprintf(buf, "%s", pdname(val));
-			}
-			else
-				sprintf(buf, "0x%04x", val);
-			break;
-
-		case P_IMM:
-			if (opc.params[j].size != 2)
-			{
-				if (opc.params[j].mask == 0x003f) // LSL, LSR, ASL, ASR
-					sprintf(buf, "#%d", (val & 0x20) ? (val | 0xFFFFFFC0) : val);  // 6-bit sign extension
-				else
-					sprintf(buf, "#0x%02x", val);
-			}
-			else
-			{
-				sprintf(buf, "#0x%04x", val);
-			}
-			break;
-
-		case P_MEM:
-			if (opc.params[j].size != 2)
-				val = (u16)(s16)(s8)val;
-
-			if (settings_.decode_names)
-				sprintf(buf, "@%s", pdname(val));
-			else
-				sprintf(buf, "@0x%04x", val);
-			break;
-
-		default:
-			ERROR_LOG(DSPLLE, "Unknown parameter type: %x", opc.params[j].type);
-			break;
-		}
-
-		buf += strlen(buf);
-	}
-
-	return strbuf;
-}
-
-static void MakeLowerCase(char *ptr)
-{
-	int i = 0;
-	while (ptr[i])
-	{
-		ptr[i] = tolower(ptr[i]);
-		i++;
-	}
-}
-
-bool DSPDisassembler::DisOpcode(const u16 *binbuf, int base_addr, int pass, u16 *pc, std::string &dest)
-{
-	char buffer[256];
-	char *buf = buffer;
-
-	// Start with 8 spaces, if there's no label.
-	buf[0] = ' ';
-	buf[1] = '\0';
-	buf++;
-
-	if ((*pc & 0x7fff) >= 0x1000)
-	{
-		++pc;
-		dest.append("; outside memory");
-		return false;
-	}
-
-	const u32 op1 = binbuf[*pc & 0x0fff];
-
-	const DSPOPCTemplate *opc = NULL;
-	const DSPOPCTemplate *opc_ext = NULL;
-
-	// find opcode
-	for (int j = 0; j < opcodes_size; j++)
-	{
-		u16 mask = opcodes[j].opcode_mask;
-
-		if ((op1 & mask) == opcodes[j].opcode)
-		{
-			opc = &opcodes[j];
-			break;
-		}
-	}
-	const DSPOPCTemplate fake_op = {"CW",		0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
-	if (!opc)
-		opc = &fake_op;
-
-	bool extended = false;
-	bool only7bitext = false;
-
-	if (((opc->opcode >> 12) == 0x3) && (op1 & 0x007f)) {
-		extended = true;
-		only7bitext = true;
-	}
-	else if (((opc->opcode >> 12) > 0x3) && (op1 & 0x00ff))
-		extended = true;
-	else
-		extended = false;
-
-	if (extended)
-	{
-		// opcode has an extension
-		// find opcode
-		for (int j = 0; j < opcodes_ext_size; j++)
-		{
-			if (only7bitext) {
-				if (((op1 & 0x7f) & opcodes_ext[j].opcode_mask) == opcodes_ext[j].opcode)
-				{
-					opc_ext = &opcodes_ext[j];
-					break;
-				}
-			}
-			else {
-				if ((op1 & opcodes_ext[j].opcode_mask) == opcodes_ext[j].opcode)
-				{
-					opc_ext = &opcodes_ext[j];
-					break;
-				}
-			}
-		}
-	}
-
-	// printing
-
-	if (settings_.show_pc)
-		buf += sprintf(buf, "%04x ", *pc);
-
-	u32 op2;
-
-	// Size 2 - the op has a large immediate.
-	if (opc->size == 2)
-	{
-		op2 = binbuf[(*pc + 1) & 0x0fff];
-		if (settings_.show_hex)
-			buf += sprintf(buf, "%04x %04x ", op1, op2);
-	}
-	else
-	{
-		op2 = 0;
-		if (settings_.show_hex)
-			buf += sprintf(buf, "%04x      ", op1);
-	}
-
-	char opname[20];
-	strcpy(opname, opc->name);
-	if (settings_.lower_case_ops)
-		MakeLowerCase(opname);
-	char ext_buf[20];
-	if (extended)
-		sprintf(ext_buf, "%s%c%s", opname, settings_.ext_separator, opc_ext->name);
-	else
-		sprintf(ext_buf, "%s", opname);
-	if (settings_.lower_case_ops)
-		MakeLowerCase(ext_buf);
-
-	if (settings_.print_tabs)
-		buf += sprintf(buf, "%s\t", ext_buf);
-	else
-		buf += sprintf(buf, "%-12s", ext_buf);
-
-	if (opc->param_count > 0)
-		DisParams(*opc, op1, op2, buf);
-
-	buf += strlen(buf);
-
-	// Handle opcode extension.
-	if (extended)
-	{
-		if (opc->param_count > 0)
-			buf += sprintf(buf, " ");
-		buf += sprintf(buf, ": ");
-		if (opc_ext->param_count > 0)
-			DisParams(*opc_ext, op1, op2, buf);
-
-		buf += strlen(buf);
-	}
-
-	if (opc->opcode_mask == 0)
-	{
-		// unknown opcode
-		unk_opcodes[op1]++;
-		sprintf(buf, "\t\t; *** UNKNOWN OPCODE ***");
-	}
-
-	if (extended)
-		*pc += opc_ext->size;
-	else
-		*pc += opc->size;
-
-	if (pass == 2)
-		dest.append(buffer);
-	return true;
-}
-
-bool DSPDisassembler::DisFile(const char* name, int base_addr, int pass, std::string &output)
-{
-	File::IOFile in(name, "rb");
-	if (!in)
-	{
-		printf("gd_dis_file: No input\n");
-		return false;
-	}
-
-	const int size = ((int)in.GetSize() & ~1) / 2;
-	u16 *const binbuf = new u16[size];
-	in.ReadArray(binbuf, size);
-	in.Close();
-
-	// Actually do the disassembly.
-	for (u16 pc = 0; pc < size;)
-	{
-		DisOpcode(binbuf, base_addr, pass, &pc, output);
-		if (pass == 2)
-			output.append("\n");
-	}
-	delete[] binbuf;
-	return true;
-}
diff --git a/Source/Core/Core/Src/DSP/disassemble.h b/Source/Core/Core/Src/DSP/disassemble.h
deleted file mode 100644
index c9c0a304c1..0000000000
--- a/Source/Core/Core/Src/DSP/disassemble.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*====================================================================
-
-   project:      GameCube DSP Tool (gcdsp)
-   created:      2005.03.04
-   mail:		  duddie@walla.com
-
-   Copyright (c) 2005 Duddie
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   ====================================================================*/
-
-#ifndef _DSP_DISASSEMBLE_H
-#define _DSP_DISASSEMBLE_H
-
-#include <map>
-#include <vector>
-
-#include "Common.h"
-#include "DSPTables.h"
-#include "LabelMap.h"
-
-struct AssemblerSettings
-{
-	AssemblerSettings()
-		: print_tabs(false),
-		  show_hex(false),
-		  show_pc(false),
-		  force(false),
-		  decode_names(true),
-		  decode_registers(true),
-		  ext_separator('\''),
-		  lower_case_ops(true),
-		  pc(0)
-	{
-	}
-
-	bool print_tabs;
-	bool show_hex;
-	bool show_pc;
-	bool force;
-	bool decode_names;
-	bool decode_registers;
-	char ext_separator;
-	bool lower_case_ops;
-
-	u16 pc;
-};
-
-class DSPDisassembler
-{
-public:
-	DSPDisassembler(const AssemblerSettings &settings);
-	~DSPDisassembler();
-
-	bool Disassemble(int start_pc, const std::vector<u16> &code, int base_addr, std::string &text);
-
-	// Warning - this one is trickier to use right.
-	// Use pass == 2 if you're just using it by itself.
-	bool DisOpcode(const u16 *binbuf, int base_addr, int pass, u16 *pc, std::string &dest);
-
-private:
-	// Moves PC forward and writes the result to dest.
-	bool DisFile(const char* name, int base_addr, int pass, std::string &output);
-
-	char* DisParams(const DSPOPCTemplate& opc, u16 op1, u16 op2, char* strbuf);
-	std::map<u16, int> unk_opcodes;
-
-	const AssemblerSettings settings_;
-
-	LabelMap labels;
-};
-
-#endif  // _DSP_DISASSEMBLE_H
-
diff --git a/Source/Core/Core/Src/DSPEmulator.cpp b/Source/Core/Core/Src/DSPEmulator.cpp
deleted file mode 100644
index 96e1a1107e..0000000000
--- a/Source/Core/Core/Src/DSPEmulator.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPEmulator.h"
-
-#include "HW/DSPLLE/DSPLLE.h"
-#include "HW/DSPHLE/DSPHLE.h"
-
-DSPEmulator *CreateDSPEmulator(bool HLE) 
-{
-	if (HLE)
-	{
-		return new DSPHLE();
-	}
-	else
-	{
-		return new DSPLLE();
-	}
-}
diff --git a/Source/Core/Core/Src/DSPEmulator.h b/Source/Core/Core/Src/DSPEmulator.h
deleted file mode 100644
index 6df274d757..0000000000
--- a/Source/Core/Core/Src/DSPEmulator.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPEMULATOR_H_
-#define _DSPEMULATOR_H_
-
-#include "ChunkFile.h"
-#include "SoundStream.h"
-
-class DSPEmulator
-{
-public:
-	virtual ~DSPEmulator() {}
-
-	virtual bool IsLLE() = 0;
-
-	virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread) = 0;
-	virtual void Shutdown() = 0;
-
-	virtual void DoState(PointerWrap &p) = 0;
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) = 0;
-
-	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) = 0;
-	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) = 0;
-	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) = 0;
-	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) = 0;
-	virtual unsigned short DSP_ReadControlRegister() = 0;
-	virtual unsigned short DSP_WriteControlRegister(unsigned short) = 0;
-	virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) = 0;
-	virtual void DSP_Update(int cycles) = 0;
-	virtual void DSP_StopSoundStream() = 0;
-	virtual void DSP_ClearAudioBuffer(bool mute) = 0;
-	virtual u32 DSP_UpdateRate() = 0;
-
-protected:
-	SoundStream *soundStream;
-};
-
-DSPEmulator *CreateDSPEmulator(bool HLE);
-
-#endif // _DSPEMULATOR_H_
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
deleted file mode 100644
index 2b84297832..0000000000
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "StringUtil.h"
-#include "Debugger_SymbolMap.h"
-#include "../Core.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCAnalyst.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "PowerPCDisasm.h"
-
-namespace Dolphin_Debugger
-{
-
-void AddAutoBreakpoints()
-{
-#if defined(_DEBUG) || defined(DEBUGFAST)
-#if 1
-	const char *bps[] = {
-		"PPCHalt",
-	};
-
-	for (u32 i = 0; i < sizeof(bps) / sizeof(const char *); i++)
-	{
-		Symbol *symbol = g_symbolDB.GetSymbolFromName(bps[i]);
-		if (symbol)
-			PowerPC::breakpoints.Add(symbol->address, false);
-	}
-#endif
-#endif
-}
-
-// Returns callstack "formatted for debugging" - meaning that it
-// includes LR as the last item, and all items are the last step,
-// instead of "pointing ahead"
-bool GetCallstack(std::vector<CallstackEntry> &output) 
-{
-	if (Core::GetState() == Core::CORE_UNINITIALIZED)
-		return false;
-
-	if (!Memory::IsRAMAddress(PowerPC::ppcState.gpr[1]))
-		return false;
-
-	u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]);  // SP
-	if (LR == 0)
-	{
-		CallstackEntry entry;
-		entry.Name = "(error: LR=0)";
-		entry.vAddress = 0x0;
-		output.push_back(entry);
-		return false;
-	}
-
-	int count = 1;
-
-	CallstackEntry entry;
-	entry.Name = StringFromFormat(" * %s [ LR = %08x ]\n", g_symbolDB.GetDescription(LR), LR - 4);
-	entry.vAddress = LR - 4;
-	output.push_back(entry);
-	count++;
-
-	//walk the stack chain
-	while ((addr != 0xFFFFFFFF) && (addr != 0) && (count++ < 20) && (PowerPC::ppcState.gpr[1] != 0))
-	{
-		if (!Memory::IsRAMAddress(addr + 4))
-			return false;
-
-		u32 func = Memory::ReadUnchecked_U32(addr + 4);
-		const char *str = g_symbolDB.GetDescription(func);
-		if (!str || strlen(str) == 0 || !strcmp(str, "Invalid"))
-			str = "(unknown)";
-
-		entry.Name = StringFromFormat(" * %s [ addr = %08x ]\n", str, func - 4);
-		entry.vAddress = func - 4;
-		output.push_back(entry);
-
-		if (!Memory::IsRAMAddress(addr))
-			return false;
-
-		addr = Memory::ReadUnchecked_U32(addr);
-	}
-
-	return true;
-}
-
-void PrintCallstack()
-{
-	u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]);  // SP
-
-	printf("== STACK TRACE - SP = %08x ==", PowerPC::ppcState.gpr[1]);
-	
-	if (LR == 0) {
-		printf(" LR = 0 - this is bad");	
-	}
-	int count = 1;
-	if (g_symbolDB.GetDescription(PowerPC::ppcState.pc) != g_symbolDB.GetDescription(LR))
-	{
-		printf(" * %s  [ LR = %08x ]", g_symbolDB.GetDescription(LR), LR);
-		count++;
-	}
-
-	//walk the stack chain
-	while ((addr != 0xFFFFFFFF) && (addr != 0) && (count++ < 20) && (PowerPC::ppcState.gpr[1] != 0))
-	{
-		u32 func = Memory::ReadUnchecked_U32(addr + 4);
-		const char *str = g_symbolDB.GetDescription(func);
-		if (!str || strlen(str) == 0 || !strcmp(str, "Invalid"))
-			str = "(unknown)";
-		printf( " * %s [ addr = %08x ]", str, func);
-		addr = Memory::ReadUnchecked_U32(addr);
-	}
-}
-
-void PrintCallstack(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
-{
-	u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]);  // SP
-
-	GENERIC_LOG(type, level, "== STACK TRACE - SP = %08x ==", 
-				PowerPC::ppcState.gpr[1]);
-
-	if (LR == 0) {
-		GENERIC_LOG(type, level, " LR = 0 - this is bad");	
-	}
-	int count = 1;
-	if (g_symbolDB.GetDescription(PowerPC::ppcState.pc) != g_symbolDB.GetDescription(LR))
-	{
-		GENERIC_LOG(type, level, " * %s  [ LR = %08x ]", 
-					g_symbolDB.GetDescription(LR), LR);
-		count++;
-	}
-
-	//walk the stack chain
-	while ((addr != 0xFFFFFFFF) && (addr != 0) && (count++ < 20) && (PowerPC::ppcState.gpr[1] != 0))
-	{
-		u32 func = Memory::ReadUnchecked_U32(addr + 4);
-		const char *str = g_symbolDB.GetDescription(func);
-		if (!str || strlen(str) == 0 || !strcmp(str, "Invalid"))
-			str = "(unknown)";
-		GENERIC_LOG(type, level, " * %s [ addr = %08x ]", str, func);
-		addr = Memory::ReadUnchecked_U32(addr);
-	}
-}
-
-void PrintDataBuffer(LogTypes::LOG_TYPE type, u8* _pData, size_t _Size, const char* _title)
-{
-	GENERIC_LOG(type, LogTypes::LDEBUG, "%s", _title);		
-	for (u32 j = 0; j < _Size;)
-	{
-		std::string Temp;
-		for (int i = 0; i < 16; i++)
-		{
-			char Buffer[128];
-			sprintf(Buffer, "%02x ", _pData[j++]);
-			Temp.append(Buffer);
-
-			if (j >= _Size)
-				break;
-		}
-		GENERIC_LOG(type, LogTypes::LDEBUG, "   Data: %s", Temp.c_str());
-	}
-}
-
-}  // end of namespace Debugger
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h
deleted file mode 100644
index fac79b2959..0000000000
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DEBUGGER_SYMBOLMAP_H
-#define _DEBUGGER_SYMBOLMAP_H
-
-#include <vector>
-#include <string>
-
-#include "Common.h"
-
-namespace Dolphin_Debugger
-{
-
-struct CallstackEntry 
-{
-    std::string Name;
-    u32 vAddress;
-};
-
-bool GetCallstack(std::vector<CallstackEntry> &output);
-void PrintCallstack();
-void PrintCallstack(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level);
-void PrintDataBuffer(LogTypes::LOG_TYPE _Log, u8* _pData, size_t _Size, const char* _title);
-void AddAutoBreakpoints();
-
-
-} // end of namespace Debugger
-
-#endif
-
diff --git a/Source/Core/Core/Src/Debugger/Dump.cpp b/Source/Core/Core/Src/Debugger/Dump.cpp
deleted file mode 100644
index 8a9a87c2b8..0000000000
--- a/Source/Core/Core/Src/Debugger/Dump.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-
-#include "Common.h"
-#include "Dump.h"
-#include "FileUtil.h"
-
-CDump::CDump(const char* _szFilename) :
-	m_pData(NULL)
-{
-	File::IOFile pStream(_szFilename, "rb");
-	if (pStream)
-	{
-		m_size = (size_t)pStream.GetSize();
-
-		m_pData = new u8[m_size];
-
-		pStream.ReadArray(m_pData, m_size);
-	}
-}
-
-CDump::~CDump(void)
-{
-	if (m_pData != NULL)
-	{
-		delete[] m_pData;
-		m_pData = NULL;
-	}
-}
-
-int
-CDump::GetNumberOfSteps(void)
-{
-	return (int)(m_size / STRUCTUR_SIZE);
-}
-
-u32 
-CDump::GetGPR(int _step, int _gpr)
-{
-	u32 offset = _step * STRUCTUR_SIZE;
-
-	if (offset >= m_size)
-		return -1;
-
-	return Read32(offset + OFFSET_GPR + (_gpr * 4));
-}
-
-u32 
-CDump::GetPC(int _step)
-{
-	u32 offset = _step * STRUCTUR_SIZE;
-
-	if (offset >= m_size)
-		return -1;
-
-	return Read32(offset + OFFSET_PC);
-}
-
-u32 
-CDump::Read32(u32 _pos)
-{
-	u32 result = (m_pData[_pos+0] << 24) |
-				  (m_pData[_pos+1] << 16) |
-				  (m_pData[_pos+2] << 8)  |
-				  (m_pData[_pos+3] << 0);
-
-	return result;
-}
diff --git a/Source/Core/Core/Src/Debugger/Dump.h b/Source/Core/Core/Src/Debugger/Dump.h
deleted file mode 100644
index d2764714c0..0000000000
--- a/Source/Core/Core/Src/Debugger/Dump.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Purpose: uncompress the dumps from costis GC-Debugger tool
-//
-//
-#ifndef _DUMP_H
-#define _DUMP_H
-
-#include "Common.h"
-
-class CDump
-{
-public:
-
-	CDump(const char* _szFilename);
-	~CDump();
-	
-	int GetNumberOfSteps();
-	u32 GetGPR(int _step, int _gpr);
-	u32 GetPC(int _step);
-
-private:
-	enum
-	{
-		OFFSET_GPR		= 0x4,
-		OFFSET_PC		= 0x194,
-		STRUCTUR_SIZE	= 0x2BC
-	};
-
-	u8 *m_pData;
-
-	size_t m_size;
-
-	u32 Read32(u32 _pos);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/Debugger/GCELF.h b/Source/Core/Core/Src/Debugger/GCELF.h
deleted file mode 100644
index f47c9bf6a5..0000000000
--- a/Source/Core/Core/Src/Debugger/GCELF.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef GCELF_H
-#define GCELF_H
-
-// ELF File Types
-#define ET_NONE			0 // No file type
-#define ET_REL			1 // Relocatable file
-#define ET_EXEC			2 // Executable file
-#define ET_DYN			3 // Shared object file
-#define ET_CORE			4 // Core file
-#define ET_LOPROC		0xFF00 // Processor specific
-#define ET_HIPROC		0xFFFF // Processor specific
-
-// ELF Machine Types
-#define EM_NONE			0 // No machine
-#define EM_M32			1 // AT&T WE 32100
-#define EM_SPARC		2 // SPARC
-#define EM_386			3 // Intel Architecture
-#define EM_68K			4 // Motorola 68000
-#define EM_88K			5 // Motorola 88000
-#define EM_860			6 // Intel 80860
-#define EM_MIPS			7 // MIPS RS3000 Big-Endian
-#define EM_MIPS_RS4_BE	8 // MIPS RS4000 Big-Endian
-#define EM_ARM			40 // ARM/Thumb Architecture
-
-// ELF Version Types
-#define EV_NONE			0 // Invalid version
-#define EV_CURRENT		1 // Current version
-
-// ELF Section Header Types
-#define SHT_NULL		0
-#define SHT_PROGBITS	1
-#define SHT_SYMTAB		2
-#define SHT_STRTAB		3
-#define SHT_RELA		4
-#define SHT_HASH		5
-#define SHT_DYNAMIC		6
-#define SHT_NOTE		7
-#define SHT_NOBITS		8
-#define SHT_REL			9
-#define SHT_SHLIB		10
-#define SHT_DYNSYM		11
-
-
-typedef struct
-{
-	unsigned char ID[4];
-	unsigned char clazz;
-	unsigned char data;
-	unsigned char version;
-	unsigned char pad[9];
-	unsigned short e_type; // ELF file type
-	unsigned short e_machine; // ELF target machine
-	unsigned int e_version; // ELF file version number
-	unsigned int e_entry;
-	unsigned int e_phoff;
-	unsigned int e_shoff;
-	unsigned int e_flags;
-	unsigned short e_ehsize;
-	unsigned short e_phentsize;
-	unsigned short e_phnum;
-	unsigned short e_shentsize;
-	unsigned short e_shnum;
-	unsigned short e_shtrndx;
-} ELF_Header;
-
-typedef struct
-{
-	unsigned int type;
-	unsigned int offset;
-	unsigned int vaddr;
-	unsigned int paddr;
-	unsigned int filesz;
-	unsigned int memsz;
-	unsigned int flags;
-	unsigned int align;
-} Program_Header;
-
-typedef struct
-{
-	unsigned int name;
-	unsigned int type;
-	unsigned int flags;
-	unsigned int addr;
-	unsigned int offset;
-	unsigned int size;
-	unsigned int link;
-	unsigned int info;
-	unsigned int addralign;
-	unsigned int entsize;
-} Section_Header;
-
-typedef struct
-{
-	unsigned int name;
-	unsigned int value;
-	unsigned int size;
-	unsigned char info;
-	unsigned char other;
-	unsigned short shndx;
-} Symbol_Header;
-
-typedef struct
-{
-	unsigned int offset;
-	unsigned int info;
-	signed int addend;
-} Rela_Header;
-
-const char ELFID[4] = {0x7F, 'E', 'L', 'F'};
-
-#endif
-
diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
deleted file mode 100644
index f2e36ee1ee..0000000000
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Debugger_SymbolMap.h"
-#include "DebugInterface.h"
-#include "PPCDebugInterface.h"
-#include "PowerPCDisasm.h"
-#include "../Host.h"
-#include "../Core.h"
-#include "../HW/CPU.h"
-#include "../HW/DSP.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/JitCommon/JitBase.h"
-#include "../PowerPC/PPCSymbolDB.h"
-
-void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size) 
-{
-	// Memory::ReadUnchecked_U32 seemed to crash on shutdown
-	if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		if (Memory::IsRAMAddress(address, true, true))
-		{
-			u32 op = Memory::Read_Instruction(address);
-			DisassembleGekko(op, address, dest, max_size);
-			UGeckoInstruction inst;
-			inst.hex = Memory::ReadUnchecked_U32(address);
-			if (inst.OPCD == 1) {
-				strcat(dest, " (hle)");
-			}
-		}
-		else
-		{
-			strcpy(dest, "(No RAM here)");
-		}
-	}
-	else
-	{
-		strcpy(dest, "<unknown>");
-	}
-}
-
-void PPCDebugInterface::getRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		if (memory || Memory::IsRAMAddress(address, true, true))
-		{
-			snprintf(dest, max_size, "%08X%s", readExtraMemory(memory, address), memory ? " (ARAM)" : "");
-		}
-		else
-		{
-			strcpy(dest, memory ? "--ARAM--" : "--------");
-		}
-	}
-	else
-	{
-		strcpy(dest, "<unknwn>");  // bad spelling - 8 chars
-	}
-}
-
-unsigned int PPCDebugInterface::readMemory(unsigned int address)
-{
-	return Memory::ReadUnchecked_U32(address);
-}
-
-unsigned int PPCDebugInterface::readExtraMemory(int memory, unsigned int address)
-{
-	switch (memory)
-	{
-	case 0:
-		return Memory::ReadUnchecked_U32(address);
-	case 1:
-		return (DSP::ReadARAM(address)     << 24) |
-			   (DSP::ReadARAM(address + 1) << 16) |
-			   (DSP::ReadARAM(address + 2) << 8) |
-			   (DSP::ReadARAM(address + 3));
-	default:
-		return 0;
-	}
-}
-
-unsigned int PPCDebugInterface::readInstruction(unsigned int address)
-{
-	return Memory::Read_Instruction(address);
-}
-
-bool PPCDebugInterface::isAlive()
-{
-	return Core::GetState() != Core::CORE_UNINITIALIZED;
-}
-
-bool PPCDebugInterface::isBreakpoint(unsigned int address) 
-{
-	return PowerPC::breakpoints.IsAddressBreakPoint(address);
-}
-
-void PPCDebugInterface::setBreakpoint(unsigned int address)
-{
-	PowerPC::breakpoints.Add(address);
-}
-
-void PPCDebugInterface::clearBreakpoint(unsigned int address)
-{
-	PowerPC::breakpoints.Remove(address);
-}
-
-void PPCDebugInterface::clearAllBreakpoints() {}
-
-void PPCDebugInterface::toggleBreakpoint(unsigned int address)
-{
-	if (PowerPC::breakpoints.IsAddressBreakPoint(address))
-		PowerPC::breakpoints.Remove(address);
-	else
-		PowerPC::breakpoints.Add(address);
-}
-
-bool PPCDebugInterface::isMemCheck(unsigned int address)
-{
-	return (Memory::AreMemoryBreakpointsActivated()
-		&& PowerPC::memchecks.GetMemCheck(address));
-}
-
-void PPCDebugInterface::toggleMemCheck(unsigned int address)
-{
-	if (Memory::AreMemoryBreakpointsActivated()
-		&& !PowerPC::memchecks.GetMemCheck(address))
-	{
-		// Add Memory Check
-		TMemCheck MemCheck;
-		MemCheck.StartAddress = address;
-		MemCheck.EndAddress = address;
-		MemCheck.OnRead = true;
-		MemCheck.OnWrite = true;
-
-		MemCheck.Log = true;
-		MemCheck.Break = true;
-
-		PowerPC::memchecks.Add(MemCheck);
-
-	}
-	else
-		PowerPC::memchecks.Remove(address);
-}
-
-void PPCDebugInterface::insertBLR(unsigned int address, unsigned int value) 
-{
-	Memory::Write_U32(value, address);
-}
-
-void PPCDebugInterface::breakNow()
-{
-	CCPU::Break();
-}
-
-
-// =======================================================
-// Separate the blocks with colors.
-// -------------
-int PPCDebugInterface::getColor(unsigned int address)
-{
-	if (!Memory::IsRAMAddress(address, true, true))
-		return 0xeeeeee;
-	static const int colors[6] =
-	{ 
-		0xd0FFFF,  // light cyan
-		0xFFd0d0,  // light red
-		0xd8d8FF,  // light blue
-		0xFFd0FF,  // light purple
-		0xd0FFd0,  // light green
-		0xFFFFd0,  // light yellow
-	};
-	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(address);
-	if (!symbol)
-		return 0xFFFFFF;
-	if (symbol->type != Symbol::SYMBOL_FUNCTION)
-		return 0xEEEEFF;
-	return colors[symbol->index % 6];
-}
-// =============
-
-
-std::string PPCDebugInterface::getDescription(unsigned int address) 
-{
-	return g_symbolDB.GetDescription(address);
-}
-
-unsigned int PPCDebugInterface::getPC() 
-{
-	return PowerPC::ppcState.pc;
-}
-
-void PPCDebugInterface::setPC(unsigned int address) 
-{
-	PowerPC::ppcState.pc = address;
-}
-
-void PPCDebugInterface::showJitResults(unsigned int address) 
-{
-	Host_ShowJitResults(address);
-}
-
-void PPCDebugInterface::runToBreakpoint()
-{
-
-}
diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
deleted file mode 100644
index e7d08ddd3a..0000000000
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PPCDEBUGINTERFACE_H
-#define _PPCDEBUGINTERFACE_H
-
-#include <string>
-
-#include "DebugInterface.h"
-
-//wrapper between disasm control and Dolphin debugger
-
-class PPCDebugInterface : public DebugInterface
-{
-public:
-	PPCDebugInterface(){} 
-	virtual void disasm(unsigned int address, char *dest, int max_size);
-	virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size);
-	virtual int getInstructionSize(int /*instruction*/) {return 4;}
-	virtual bool isAlive();
-	virtual bool isBreakpoint(unsigned int address);
-	virtual void setBreakpoint(unsigned int address);
-	virtual void clearBreakpoint(unsigned int address);
-	virtual void clearAllBreakpoints();
-	virtual void toggleBreakpoint(unsigned int address);
-	virtual bool isMemCheck(unsigned int address);
-	virtual void toggleMemCheck(unsigned int address);
-	virtual unsigned int readMemory(unsigned int address);
-
-	enum {
-		EXTRAMEM_ARAM = 1,
-	};
-	virtual unsigned int readExtraMemory(int memory, unsigned int address);
-	virtual unsigned int readInstruction(unsigned int address);
-	virtual unsigned int getPC();
-	virtual void setPC(unsigned int address);
-	virtual void step() {}
-	virtual void breakNow();
-	virtual void runToBreakpoint();
-	virtual void insertBLR(unsigned int address, unsigned int value);
-	virtual int getColor(unsigned int address);
-	virtual std::string getDescription(unsigned int address);
-	virtual void showJitResults(u32 address);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp
deleted file mode 100644
index f8359e1bc5..0000000000
--- a/Source/Core/Core/Src/GeckoCode.cpp
+++ /dev/null
@@ -1,1119 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GeckoCode.h"
-
-#include "Thread.h"
-#include "HW/Memmap.h"
-#include "ConfigManager.h"
-
-#include "vector"
-#include "PowerPC/PowerPC.h"
-#include "CommonPaths.h"
-
-namespace Gecko
-{
-
-enum
-{
-	// Code Types
-	CODETYPE_WRITE_FILL =		0x0,
-	CODETYPE_IF =				0x1,
-	CODETYPE_BA_PO_OPS =		0x2,
-	CODETYPE_FLOW_CONTROL =		0x3,
-	CODETYPE_REGISTER_OPS =		0x4,
-	CODETYPE_SPECIAL_IF =		0x5,
-	CODETYPE_ASM_SWITCH_RANGE =	0x6,
-	CODETYPE_END_CODES =		0x7,
-
-	// Data Types
-	DATATYPE_8BIT =		0x0,
-	DATATYPE_16BIT =	0x1,
-	DATATYPE_32BIT =	0x2,
-};
-
-// globals
-static u32 base_address = 0;
-static u32 pointer_address = 0;
-static u32 gecko_register[0x10] = {0};
-static struct
-{
-	u32 address;
-	u32 number;
-} block[0x10];
-
-// codes execute when counter is 0
-static int	code_execution_counter = 0;
-
-// Track whether the code handler has been installed
-static bool	code_handler_installed = false;
-
-// the currently active codes
-std::vector<GeckoCode>	active_codes;
-
-// return true if code execution is on
-inline bool CodeExecution()
-{
-	return (0 == code_execution_counter);
-}
-
-u32 GeckoCode::Code::GetAddress() const
-{
-	return gcaddress + (use_po ? pointer_address : (base_address & 0xFE000000));
-}
-
-// return true if a code exists
-bool GeckoCode::Exist(u32 address, u32 data)
-{
-	std::vector<GeckoCode::Code>::const_iterator
-		codes_iter = codes.begin(),
-		codes_end = codes.end();
-	for (; codes_iter != codes_end; ++codes_iter)
-	{
-		if (codes_iter->address == address && codes_iter->data == data)
-			return true;
-	}
-	return false;
-}
-
-// return true if the code is identical
-bool GeckoCode::Compare(GeckoCode compare) const
-{
-	if (codes.size() != compare.codes.size())
-		return false;
-
-	unsigned int exist = 0;
-	std::vector<GeckoCode::Code>::const_iterator
-		codes_iter = codes.begin(),
-		codes_end = codes.end();
-	for (; codes_iter != codes_end; ++codes_iter)
-	{
-		if (compare.Exist(codes_iter->address, codes_iter->data))
-			exist++;
-	}
-	return exist == codes.size();
-}
-
-static std::mutex active_codes_lock;
-
-// currently running code
-static GeckoCode::Code *codes_start = NULL, *current_code = NULL;
-static const GeckoCode::Code *codes_end = NULL;
-
-// asm codes used for CT6 CST1
-static std::map<u32, std::vector<u32> > inserted_asm_codes;
-
-// Functions for each code type
-bool RamWriteAndFill();
-bool RegularIf();
-bool BaPoOps();
-bool FlowControl();
-bool RegisterOps();
-bool SpecialIf();
-bool AsmSwitchRange();
-bool EndCodes();
-
-bool MathOperation(u32& ret, const u32 left, const u32 right, const u8 type);
-
-void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
-{
-	std::lock_guard<std::mutex> lk(active_codes_lock);
-
-	active_codes.clear();
-	// add enabled codes
-	std::vector<GeckoCode>::const_iterator
-		gcodes_iter = gcodes.begin(),
-		gcodes_end = gcodes.end();
-	for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
-	{
-		if (gcodes_iter->enabled)
-		{
-			// TODO: apply modifiers
-			// TODO: don't need description or creator string, just takin up memory
-			active_codes.push_back(*gcodes_iter);
-		}
-	}
-
-	inserted_asm_codes.clear();
-
-	code_handler_installed = false;
-}
-
-bool InstallCodeHandler()
-{
-	u32 codelist_location = 0x800028B8; // Debugger on location (0x800022A8 = Debugger off, using codehandleronly.bin)
-	std::string data;
-	std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER;
-	if (!File::ReadFileToString(false, _rCodeHandlerFilename.c_str(), data))
-		return false;
-
-	// Install code handler
-	Memory::WriteBigEData((const u8*)data.data(), 0x80001800, data.length());
-
-	// Turn off Pause on start
-	Memory::Write_U32(0, 0x80002774);
-
-	// Write a magic value to 'gameid' (codehandleronly does not actually read this).
-	// For the purpose of this, see HLEGeckoCodehandler.
-	Memory::Write_U32(0xd01f1bad, 0x80001800);
-
-	// Create GCT in memory
-	Memory::Write_U32(0x00d0c0de, codelist_location);
-	Memory::Write_U32(0x00d0c0de, codelist_location + 4);
-
-	std::lock_guard<std::mutex> lk(active_codes_lock);
-
-	int i = 0;
-	std::vector<GeckoCode>::iterator
-		gcodes_iter = active_codes.begin(),
-		gcodes_end = active_codes.end();
-	for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
-	{
-		if (gcodes_iter->enabled)
-		{
-			current_code = codes_start = &*gcodes_iter->codes.begin();
-			codes_end = &*gcodes_iter->codes.end();
-			for (; current_code < codes_end; ++current_code)
-			{
-				const GeckoCode::Code& code = *current_code;
-
-				// Make sure we have enough memory to hold the code list
-				if ((codelist_location + 24 + i) < 0x80003000)
-				{
-					Memory::Write_U32(code.address, codelist_location + 8 + i);
-					Memory::Write_U32(code.data, codelist_location + 12 + i);
-					i += 8;
-				}
-			}
-		}
-	}
-
-	Memory::Write_U32(0xff000000, codelist_location + 8 + i);
-	Memory::Write_U32(0x00000000, codelist_location + 12 + i);
-
-	// Turn on codes
-	Memory::Write_U8(1, 0x80001807);
-
-	// Invalidate the icache
-	for (unsigned int j = 0; j < data.length(); j += 32)
-	{
-		PowerPC::ppcState.iCache.Invalidate(0x80001800 + j);
-	}
-	return true;
-}
-
-bool RunGeckoCode(GeckoCode& gecko_code)
-{
-	static bool (*code_type_funcs[])(void) =
-	{ RamWriteAndFill, RegularIf, BaPoOps, FlowControl, RegisterOps, SpecialIf, AsmSwitchRange, EndCodes };
-
-	base_address = 0x80000000;
-	pointer_address = 0x80000000;
-	code_execution_counter = 0;
-
-	current_code = codes_start = &*gecko_code.codes.begin();
-	codes_end = &*gecko_code.codes.end();
-	for (; current_code < codes_end; ++current_code)
-	{
-		const GeckoCode::Code& code = *current_code;
-
-		bool result = true;
-
-		switch (code.type)
-		{
-			// These codetypes run even if code_execution is off
-		case CODETYPE_IF :
-		case CODETYPE_FLOW_CONTROL :
-		case CODETYPE_SPECIAL_IF :
-		case CODETYPE_ASM_SWITCH_RANGE :
-		case CODETYPE_END_CODES :
-			result = code_type_funcs[code.type]();
-			break;
-
-			// The rest of the codetypes only run if code_execution is on
-		default :
-			if (CodeExecution())
-				result = code_type_funcs[code.type]();
-			break;
-		}
-
-		// code failed
-		if (false == result)
-		{
-			// disable code to stop annoying error messages
-			gecko_code.enabled = false;
-
-			PanicAlertT("GeckoCode failed to run (CT%i CST%i) (%s)"
-				"\n(either a bad code or the code type is not yet supported. Try using the native code handler by placing the codehandler.bin file into the Sys directory and restarting Dolphin.)"
-				, code.type, code.subtype, gecko_code.name.c_str());
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool RunActiveCodes()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
-	{
-		std::lock_guard<std::mutex> lk(active_codes_lock);
-
-		std::vector<GeckoCode>::iterator
-			gcodes_iter = active_codes.begin(),
-			gcodes_end = active_codes.end();
-		for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
-		{
-			if (gcodes_iter->enabled)
-				RunGeckoCode(*gcodes_iter);
-			// we don't need to stop all codes if one fails, maybe
-			//if (false == RunGeckoCode(*gcodes_iter))
-				//return false;
-		}
-	}
-
-	return true;
-}
-
-void RunCodeHandler()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats && active_codes.size() > 0)
-	{
-		if (!code_handler_installed || Memory::Read_U32(0x80001800) - 0xd01f1bad > 5)
-			code_handler_installed = InstallCodeHandler();
-
-		if (code_handler_installed)
-		{
-			if (PC == LR)
-			{
-				u32 oldLR = LR;
-				PowerPC::CoreMode oldMode = PowerPC::GetMode();
-
-				PC = 0x800018A8;
-				LR = 0;
-
-				// Execute the code handler in interpreter mode to track when it exits
-				PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
-
-				while (PC != 0)
-					PowerPC::SingleStep();
-
-				PowerPC::SetMode(oldMode);
-				PC = LR = oldLR;
-			}
-		}
-		else
-		{
-			// Use the emulated code handler
-			Gecko::RunActiveCodes();
-		}
-	}
-}
-
-const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes()
-{
-	return inserted_asm_codes;
-}
-
-// CT0: Direct ram write/fill
-// COMPLETE, maybe
-bool RamWriteAndFill()
-{
-	const GeckoCode::Code& code = *current_code;
-	u32 new_addr = code.GetAddress();
-	const u32& data = code.data;
-
-	u32 count = (data >> 16) + 1;	// note: +1
-
-	switch (code.subtype)
-	{
-		// CST0: 8bits Write & Fill
-	case DATATYPE_8BIT :
-		while (count--)
-		{
-			Memory::Write_U8((u8)data, new_addr);
-			++new_addr;
-		}
-		break;
-
-		// CST1: 16bits Write & Fill
-	case DATATYPE_16BIT :
-		while (count--)
-		{
-			Memory::Write_U16((u16)data, new_addr);
-			new_addr += 2;
-		}
-		break;
-
-		// CST2: 32bits Write
-	case DATATYPE_32BIT :
-		Memory::Write_U32((u32)data, new_addr);
-		break;
-
-		// CST3: String Code
-	case 0x3 :
-		count = code.data;	// count is different from the other subtypes
-		while (count)
-		{
-			if (codes_end == ++current_code)
-				return false;
-
-			// write bytes from address
-			int byte_num = 4;
-			while (byte_num-- && count)
-			{
-				Memory::Write_U8((u8)(current_code->address >> byte_num * 8), new_addr);
-				++new_addr;
-				--count;
-			}
-
-			// write bytes from data
-			byte_num = 4;
-			while (byte_num-- && count)
-			{
-				Memory::Write_U8((u8)(current_code->data >> byte_num * 8), new_addr);
-				++new_addr;
-				--count;
-			}
-		}
-		break;
-
-		// CST4: Serial Code
-	case 0x4 :
-	{
-		if (codes_end == ++current_code)
-			return false;
-		u32 new_data = data;	// starting value of data
-		const u8 data_type = current_code->address >> 28;
-		const u32 data_inc = current_code->data;	// amount to increment the data
-		const u16 addr_inc = (u16)current_code->address;	// amount to increment the address
-		count = ((current_code->address >> 16) & 0xFFF) + 1;	// count is different from the other subtypes, note: +1
-		while (count--)
-		{
-			// switch inside the loop, :/ o well
-			switch (data_type)
-			{
-			case DATATYPE_8BIT :
-				Memory::Write_U8((u8)new_data, new_addr);
-				new_data = (u8)new_data + (u8)data_inc;
-				break;
-
-			case DATATYPE_16BIT :
-				Memory::Write_U16((u16)new_data, new_addr);
-				new_data = (u16)new_data + (u16)data_inc;
-				break;
-
-			case DATATYPE_32BIT :
-				Memory::Write_U32((u32)new_data, new_addr);
-				new_data += data_inc;
-				break;
-
-				// INVALID DATATYPE
-			default :
-				return false;
-				break;
-			}
-
-			new_addr += addr_inc;
-		}
-	}
-		break;
-
-		// INVALID SUBTYPE
-	default :
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-// CT1 Regular If codes (16/32 bits)
-// COMPLETE
-bool RegularIf()
-{
-	const GeckoCode::Code& code = *current_code;
-
-	const bool is_endif = !!(code.address & 0x1);
-
-	// if code_execution is off and this is an endif, decrease the execution counter
-	if (false == CodeExecution())
-	{
-		if (is_endif)
-			--code_execution_counter;
-	}
-
-	bool result = false;
-
-	// if code_execution is on, execute the conditional
-	if (CodeExecution())
-	{
-		const u32 new_addr = code.GetAddress() & ~0x1;
-		const u32& data = code.data;
-
-		s32 read_value = 0;
-		s32 data_value = 0;
-
-		// 16bit vs 32bit
-		if (code.subtype & 0x4)
-		{
-			// 16bits
-			read_value = Memory::Read_U16(new_addr) & ~(data >> 16);
-			data_value = (data & 0xFFFF);
-		}
-		else
-		{
-			// 32bits
-			read_value = Memory::Read_U32(new_addr);
-			data_value = data;
-		}
-
-		switch (code.subtype & 0x3)
-		{
-			// CST0 : 32bits (endif, then) If equal
-			// CST4 : 16bits (endif, then) If equal
-		case 0x0 :
-			result = (read_value == data_value);
-			break;
-
-			// CST1 : 32bits (endif, then) If not equal
-			// CST5 : 16bits (endif, then) If not equal
-		case 0x1 :
-			result = (read_value != data_value);
-			break;
-
-			// CST2 : 32bits (endif, then) If greater
-			// CST6 : 16bits (endif, then) If greater
-		case 0x2 :
-			result = (read_value > data_value);
-			break;
-
-			// CST3 : 32bits (endif, then) If lower
-			// CST7 : 16bits (endif, then) If lower
-		case 0x3 :
-			result = (read_value < data_value);
-			break;
-		}
-	}
-
-	// if the conditional returned false, or it never ran because execution is off,
-	// increase the code execution counter
-	if (false == result)
-		++code_execution_counter;
-
-	return true;
-}
-
-// CT2 Base Address/Pointer Operations
-// NOT COMPLETE, last 2 subtypes aren't done
-bool BaPoOps()
-{
-	const GeckoCode::Code& code = *current_code;
-
-	// base_address vs pointer (ba vs po)
-	u32& change_address = (code.subtype & 0x4) ? pointer_address : base_address;
-
-	// 4STYZ00N XXXXXXXX
-	u32 new_data = code.data;
-
-	// append grN
-	if (code.z)
-		new_data += gecko_register[code.n];
-
-	// append ba or po (depending on last nibble's first bit)
-	if (code.y)
-		new_data += (code.use_po ? pointer_address : base_address);
-
-	// append to current value (not used in all subtypes, T will be 0 in those)
-	if (code.t)
-		new_data += change_address;
-
-	switch (code.subtype & 0x3)
-	{
-		// CST0 : Load into Base Address
-		// CST4 : Load into Pointer
-	case 0x0 :
-		change_address = Memory::Read_U32(new_data);
-		break;
-
-		// CST1 : Set Base Address to
-		// CST5 : Set Pointer to
-	case 0x1 :
-		change_address = new_data;
-		break;
-
-		// CST2 : Save Base Address to
-		// CST6 : Save Pointer to
-	case 0x2 :
-		Memory::Write_U32(change_address, new_data);
-		break;
-
-		// CST3 : Put next line of code location into the Base Address
-		// CST7 : Put grN's location into the Pointer
-
-		// conflicting documentation, one doc says CST7 is the same as CST3 but with po
-	case 0x3 :
-		// TODO:
-		return false;	//
-		break;
-	}
-
-	return true;
-}
-
-// CT3 Repeat/Goto/Gosub/Return
-// COMPLETE, maybe
-bool FlowControl()
-{
-	const GeckoCode::Code& code = *current_code;
-
-	// only the return subtype runs when code execution is off
-	if (false == CodeExecution() && code.subtype != 0x2)
-		return true;
-
-	// not all of these are used in all subtypes
-	const u8 block_num = (u8)(code.data & 0xF);
-
-	switch (code.subtype)
-	{
-		// CST0 : Set Repeat
-	case 0x0 :
-		block[block_num].number = code.address & 0xFFFF;
-		block[block_num].address = (u32)(current_code - codes_start + 1);
-		break;
-
-		// CST1 : Execute Repeat
-	case 0x1 :
-		if (block[block_num].number)
-		{
-			--block[block_num].number;
-			// needs -1 cause iterator gets ++ after code runs
-			current_code = codes_start + block[block_num].address - 1;
-		}
-		break;
-
-		// CST2 : Return
-	case 0x2 :
-		if (((code.address >> 20) & 0xF) ^ (u32)CodeExecution())
-		{
-			// needs -1 cause iterator gets ++ after code runs
-			current_code = codes_start + block[block_num].address - 1;
-		}
-		break;
-
-		// CST3 : Goto
-	case 0x3 :
-		if (((code.address >> 20) & 0xF) ^ (u32)CodeExecution())
-		{
-			GeckoCode::Code* const target_code = current_code + (s16)(code.address & 0xFFFF);
-
-			if (target_code >= codes_start && target_code < codes_end)
-			{
-				// needs -1 cause iterator gets ++ after code runs
-				current_code = target_code - 1;
-			}
-			else
-			{
-				return false;	// trying to GOTO to bad address
-			}
-		}
-		break;
-
-		// CST4 : Gosub
-	case 0x4 :
-		if (((code.address >> 20) & 0xF) ^ (u32)CodeExecution())
-		{
-			GeckoCode::Code* const target_code = current_code + (s16)(code.address & 0xFFFF);
-
-			if (target_code >= codes_start && target_code < codes_end)
-			{
-				block[block_num].address = u32(current_code - codes_start + 1);
-				// needs -1 cause iterator gets ++ after code runs
-				current_code = target_code - 1;
-			}
-			else
-			{
-				return false;	// trying to GOSUB to bad address
-			}
-		}
-		break;
-
-		// INVALID SUBTYPE
-	default :
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-// CT4 Gecko Register Operations
-// COMPLETE, maybe
-bool RegisterOps()
-{
-	const GeckoCode::Code& code = *current_code;
-
-	// 80TYZZZN XXXXXXXX
-
-	u32 new_data = code.data;
-
-	// append ba or po (depending on last nibble's first bit)
-	if (code.y)
-		new_data += (code.use_po ? pointer_address : base_address);
-
-	u32& geckreg = gecko_register[code.n];
-
-	switch (code.subtype)
-	{
-		// CST0 : Set Gecko Register to
-	case 0x0 :
-		// append to or set register
-		geckreg = new_data + (code.t ? geckreg : 0);
-		break;
-
-		// CST1 : Load into Gecko Register
-	case 0x1 :
-		switch (code.t)
-		{
-			// 8bit
-		case DATATYPE_8BIT :
-			geckreg = Memory::Read_U8(new_data);
-			break;
-
-			// 16bit
-		case DATATYPE_16BIT :
-			geckreg = Memory::Read_U16(new_data);
-			break;
-
-			// 32bit
-		case DATATYPE_32BIT :
-			geckreg = Memory::Read_U32(new_data);
-			break;
-
-			// INVALID DATATYPE
-		default :
-			return false;
-			break;
-		}
-		break;
-
-		// CST2 : Save Gecko Register to
-	case 0x2 :
-		switch (code.t)
-		{
-			// 8bit
-		case DATATYPE_8BIT :
-			for (u16 i = 0; i <= code.z; ++i)
-				Memory::Write_U8((u8)geckreg, new_data + i);
-			break;
-
-			// 16bit
-		case DATATYPE_16BIT :
-			for (u16 i = 0; i <= code.z; ++i)
-				Memory::Write_U16((u16)geckreg, new_data + (i << 1));
-			break;
-
-			// 32bit
-		case DATATYPE_32BIT :
-			for (u16 i = 0; i <= code.z; ++i)
-				Memory::Write_U32((u32)geckreg, new_data + (i << 2));
-			break;
-
-			// INVALID DATATYPE
-		default :
-			return false;
-			break;
-		}
-		break;
-
-		// CST3 : Gecko Register / Direct Value operations
-		// CST4 : Gecko Registers operations
-	case 0x3 :
-	case 0x4 :
-	{
-		// subtype 3 uses value in .data subtype 4 uses register
-		u32 right_val = (code.subtype & 0x1 ? code.data : gecko_register[code.data & 0xF]);
-		if (code.y & 0x2)
-			right_val = Memory::Read_U32(right_val);
-
-		u32 left_val = geckreg;
-		if (code.y & 0x1)
-			left_val = Memory::Read_U32(left_val);
-
-		if (false == MathOperation(geckreg, left_val, right_val, code.t))
-			return false;
-	}
-		break;
-
-		// CST5 : Memory Copy 1
-		// CST6 : Memory Copy 2
-	case 0x5 :
-	case 0x6 :
-	{
-		const u8 src_gr = (code.z & 0xF);
-		const u8 dst_gr = (code.n);
-
-		u16 count = (u16)(code.address >> 8);
-
-		// docs don't specify allowing 0xF for source and dest, but it can't hurt
-		u32 src_addr = ((0xF == src_gr) ? (code.use_po ? pointer_address : base_address) : gecko_register[src_gr]);
-		u32 dst_addr = ((0xF == dst_gr) ? (code.use_po ? pointer_address : base_address) : gecko_register[dst_gr]);
-
-		if (0x5 == code.subtype)
-			dst_addr += new_data;
-		else
-			src_addr += new_data;
-		
-		while (count--)
-			Memory::Write_U8(Memory::Read_U8(src_addr++), dst_addr++);
-	}
-		break;
-
-		// INVALID SUBTYPE
-	default :
-		return false;
-		break;
-
-	}
-
-	return true;
-}
-
-// NOT COMPLETE, at least one op needs to be coded/fixed
-bool MathOperation(u32& ret, const u32 left, const u32 right, const u8 type)
-{
-	// ? = T :
-	switch (type)
-	{
-		// 0 : add (+)
-	case 0x0 :
-		ret = left + right;
-		break;
-
-		// 1 : mul (*)
-	case 0x1 :
-		ret = left * right;
-		break;
-
-		// 2 : or (|)
-	case 0x2 :
-		ret = left | right;
-		break;
-
-		// 3 : and (&)
-	case 0x3 :
-		ret = left & right;
-		break;
-
-		// 4 : xor (^)
-	case 0x4 :
-		ret = left ^ right;
-		break;
-
-		// 5 : slw (<<)
-	case 0x5 :
-		ret = left << right;
-		break;
-
-		// 6 : srw (>>)
-	case 0x6 :
-		ret = left >> right;
-		break;
-
-		// TODO: this one good?
-		// 7 : rol (rotate left)
-	case 0x7 :
-		ret = (left << right) | (left >> (8 - right));
-		break;
-
-		// 8 : asr (arithmetic shift right)
-	case 0x8 :
-		ret = (s32)left >> right;
-		break;
-
-		// TODO: these float ops good?
-		// A : fadds (single float add)
-	case 0x9 :
-		*(float*)&ret = *(float*)&left + *(float*)&right;
-		break;
-
-		// B : fmuls (single float mul)
-	case 0xA :
-		*(float*)&ret = *(float*)&left * *(float*)&right;
-		break;
-
-		// INVALID OPERATION TYPE
-	default :
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-// CT5: Special If codes (16bits)
-// COMPLETE, maybe (ugly)
-bool SpecialIf()
-{
-	// counter can modify the code :/
-	GeckoCode::Code& code = *current_code;
-
-	const bool is_endif = !!(code.address & 0x1);
-
-	// if code_execution is off and this is an endif, decrease the execution counter
-	if (false == CodeExecution())
-	{
-		if (is_endif)
-			--code_execution_counter;
-	}
-
-	bool result = false;
-
-	// TODO: should these be signed? probably?
-	s16 left_val = 0, right_val = 0;
-
-	// if code_execution is on, execute the conditional
-	if (CodeExecution())
-	{
-		const u32 addr = code.GetAddress() & ~0x1;
-		const u32& data = code.data;
-
-		if (code.subtype ^ 0x4)
-		{
-			// CT5 Part1 : Unknown values comparison
-			// A-______ NM00YYYY
-
-			const u8 n = (u8)(data >> 28);
-			const u8 m = (u8)((data >> 24) & 0xF);
-			const u16 y = (u16)data;
-
-			left_val = Memory::Read_U16(((0xF == n) ? addr : gecko_register[n]) & ~y);
-			right_val = Memory::Read_U16(((0xF == m) ? addr : gecko_register[m]) & ~y);
-		}
-		else
-		{
-			// CT5 Part2 : 16bits Counter check
-			// A-0ZZZZT MMMMXXXX
-
-			left_val = (u16)(data) & ~(u16)(data >> 16);
-			right_val = (u16)(addr >> 4);
-		}
-
-		switch (code.subtype & 0x3)
-		{
-			// CST0 : 16bits (endif, then) If equal
-		case 0x0 :
-			result = (left_val == right_val);
-			break;
-
-			// CST1 : 16bits (endif, then) If not equal
-		case 0x1 :
-			result = (left_val != right_val);
-			break;
-
-			// CST2 : 16bits (endif, then) If greater
-		case 0x2 :
-			result = (left_val > right_val);
-			break;
-
-			// CST3 : 16bits (endif, then) If lower
-		case 0x3 :
-			result = (left_val < right_val);
-			break;
-		}
-	}	
-	else if (code.subtype & 0x4)
-	{
-		// counters get reset if code execution is off
-		code.address &= ~0x000FFFF0;
-	}
-
-	// if the conditional returned false, or it never ran because execution is off, increase the code execution counter
-	if (false == result)
-		++code_execution_counter;
-	else if (code.subtype & 0x4)
-	{
-		// counters gets advanced if condition was true
-		// right_val is the value of the counter
-
-		code.address &= ~0x000FFFF0;
-		code.address |= ((right_val+1) << 4);
-	}
-
-	return true;
-}
-
-// CT6 ASM Codes, On/Off switch and Address Range Check
-// NOT COMPLETE, asm stuff not started
-// TODO: Fix the ugliness
-bool AsmSwitchRange()
-{
-	// the switch subtype modifies the code :/
-	GeckoCode::Code& code = *current_code;
-
-	// only run if code_execution is set or this code is a switch or rangecheck subtype
-	// the switch and rangecheck run if execution_counter is 1 (directly inside the failed if) if they are an endif
-	if (false == CodeExecution())
-	{
-		if (code.subtype < 0x6)
-			return true;
-		else if (1 != code_execution_counter)
-			return true;
-	}
-
-	u32& data = code.data;
-
-	switch (code.subtype)
-	{
-		// CST0 : Execute following ASM Code
-	case 0x0 :
-		// TODO:
-		return false;	//
-		break;
-
-		// CST1 : Insert ASM code in the game
-	case 0x1 :
-		{
-			const int number_of_codes = code.data;
-			std::vector<u32>& asm_code = inserted_asm_codes[code.GetAddress()];
-			if (asm_code.empty()) {
-				for (int index = 0; index < number_of_codes; ++index) {
-					// Reserved for padding
-					if (current_code[index + 1].address != 0x60000000) {
-						asm_code.push_back(current_code[index + 1].address);
-					}
-
-					// Reserved for b instruction
-					if (current_code[index + 1].data != 0x00000000) {
-						asm_code.push_back(current_code[index + 1].data);
-					}
-				}
-			}
-
-			// Though the next code starts at current_code+number_of_codes+1,
-			// we add only number_of_codes. It is because the for statement in
-			// RunGeckoCode() increments current_code.
-			current_code += number_of_codes;
-
-			break;
-		}
-
-		// CST3 : Create a branch
-	case 0x3 :
-		// watever
-		//if (code.data)
-		return false;	//
-		break;
-
-		// CST6 : On/Off switch
-	case 0x6 :
-		// in the 1st bit of code.data, i store if code execution was previously off
-		// in the 2nd bit of code.data, i store the switch's on/off state
-		if (CodeExecution())
-		{
-			if (data & 0x1)
-				data ^= 0x2;	// if code exec was previously off, flip the switch
-
-			// mark code execution as previously on
-			data &= ~0x1;
-		}
-		else
-		{
-			// mark code execution as previously off
-			data |= 0x1;
-		}
-
-		// set code execution to the state of the switch
-		code_execution_counter = !(data & 0x2);
-		break;
-
-		// CST7 : Address range check (If... code)
-	case 0x7 :
-	{
-		const bool is_endif = !!(code.address & 0x1);
-		if (is_endif)
-			--code_execution_counter;
-
-		if (CodeExecution())
-		{
-			const u32 addr = (code.use_po ? pointer_address : base_address);
-			if (addr < (data & 0xFFFF0000) || addr > (data << 16))
-				++code_execution_counter;
-		}
-	}
-		break;
-
-		// INVALID SUBTYPE
-	default :
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-// CT7 End of codes, Endif (Else)
-// COMPLETE, maybe
-bool EndCodes()
-{
-	const GeckoCode::Code& code = *current_code;
-	const u32& data = code.data;
-
-	const u32 x = (data & 0xFFFF0000);
-	const u32 y = (data << 16);
-
-	// these 2 do not happen in the "CST7 : End of Code", but in that subtype they will be 0
-	if (x)
-		base_address = x;
-	if (y)
-		pointer_address = y;
-
-	switch (code.subtype)
-	{
-		// CST0 : Full Terminator
-	case 0x0 :
-		// clears the code execution status
-		code_execution_counter = 0;
-		break;
-
-		// CST1 : Endif (+else)
-	case 0x1 :
-	{
-		// apply endifs
-		const u8 v = (u8)code.address;
-		if (code_execution_counter >= v)
-			code_execution_counter -= v;
-		else
-		{
-			// too many endifs
-			// no it's not, i gotta fix my code execution on/off stuff
-			code_execution_counter = 0;
-		}
-
-		const bool is_else = !!(code.address & 0x00100000);
-		// apply else
-		if (is_else)
-			if (code_execution_counter <= 1)
-				code_execution_counter ^= 1;
-	}
-		break;
-
-		// CST7 : End of Code
-	case 0x7 :
-		// tell the code handler that there are no more codes in the code list
-		// TODO: should this always stop all codes, even if execution is off?
-		if (CodeExecution())
-			code_execution_counter = -1;	// silly maybe
-		break;
-
-		// INVALID SUBTYPE
-	default :
-		return false;
-		break;
-	}
-
-	return true;
-}
-
-}	// namespace Gecko
diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h
deleted file mode 100644
index 59da6fd091..0000000000
--- a/Source/Core/Core/Src/GeckoCode.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __GECKOCODE_h__
-#define __GECKOCODE_h__
-
-#include "Common.h"
-
-#include <vector>
-#include <string>
-#include <map>
-
-namespace Gecko
-{
-
-	class GeckoCode
-	{
-	public:
-
-		GeckoCode() : enabled(false) {}
-
-		struct Code
-		{
-			Code() : address(0), data(0) {}
-
-			union
-			{
-				u32	address;
-
-				struct
-				{
-					u32 gcaddress : 25;
-					u32 subtype: 3;
-					u32 use_po : 1;
-					u32 type: 3;
-				};
-
-				struct
-				{
-					u32 n : 4;
-					u32 z : 12;
-					u32 y : 4;
-					u32 t : 4;
-					//u32 s : 4;
-					//u32 : 4;
-				};// subsubtype;
-			};
-
-			union
-			{
-				u32 data;
-				//struct
-				//{
-				//	
-				//};
-			};
-
-			std::string original_line;
-
-			u32 GetAddress() const;
-		};
-
-		std::vector<Code>	codes;
-		std::string		name, creator;
-		std::vector<std::string>	notes;
-
-		bool	enabled;
-
-		bool Compare(GeckoCode compare) const;
-		bool Exist(u32 address, u32 data);
-	};
-
-	void SetActiveCodes(const std::vector<GeckoCode>& gcodes);
-	bool RunActiveCodes();
-	void RunCodeHandler();
-	const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes();
-
-}	// namespace Gecko
-
-#endif
diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp
deleted file mode 100644
index 54a00d1a47..0000000000
--- a/Source/Core/Core/Src/GeckoCodeConfig.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GeckoCodeConfig.h"
-
-#include "StringUtil.h"
-
-#include <vector>
-#include <string>
-#include <sstream>
-
-#define GECKO_CODE_INI_SECTION	"Gecko"
-
-namespace Gecko
-{
-
-// TODO: Support loading codes from default game inis.
-void LoadCodes(const IniFile& inifile, std::vector<GeckoCode>& gcodes)
-{
-	std::vector<std::string> lines;
-	inifile.GetLines(GECKO_CODE_INI_SECTION, lines, false);
-
-	GeckoCode gcode;
-
-	std::vector<std::string>::const_iterator
-		lines_iter = lines.begin(),
-		lines_end = lines.end();
-	for (; lines_iter!=lines_end; ++lines_iter)
-	{
-		if (lines_iter->empty())
-			continue;
-
-		std::istringstream	ss(*lines_iter);
-
-		switch ((*lines_iter)[0])
-		{
-
-			// enabled or disabled code
-		case '+' :
-			ss.seekg(1);
-		case '$' :
-			if (gcode.name.size())
-				gcodes.push_back(gcode);
-			gcode = GeckoCode();
-			gcode.enabled = (1 == ss.tellg());	// silly
-			ss.seekg(1, std::ios_base::cur);
-			// read the code name
-			std::getline(ss, gcode.name, '[');	// stop at [ character (beginning of contributor name)
-			gcode.name = StripSpaces(gcode.name);
-			// read the code creator name
-			std::getline(ss, gcode.creator, ']');
-			break;
-
-			// notes
-		case '*':
-			gcode.notes.push_back(std::string(++lines_iter->begin(), lines_iter->end()));
-			break;
-
-			// either part of the code, or an option choice
-		default :
-		{
-			GeckoCode::Code new_code;
-			// TODO: support options
-			new_code.original_line = *lines_iter;
-			ss >> std::hex >> new_code.address >> new_code.data;
-			gcode.codes.push_back(new_code);
-		}
-			break;
-		}
-
-	}
-
-	// add the last code
-	if (gcode.name.size())
-		gcodes.push_back(gcode);
-}
-
-// used by the SaveGeckoCodes function
-void SaveGeckoCode(std::vector<std::string>& lines, const GeckoCode& gcode)
-{
-	std::string name;
-
-	if (gcode.enabled)
-		name += '+';
-
-	// save the name
-	name += '$';
-	name += gcode.name;
-
-	// save the creator name
-	if (gcode.creator.size())
-	{
-		name += " [";
-		name += gcode.creator;
-		name += ']';
-	}
-
-	lines.push_back(name);
-
-	// save all the code lines
-	std::vector<GeckoCode::Code>::const_iterator
-		codes_iter = gcode.codes.begin(),
-		codes_end = gcode.codes.end();
-	for (; codes_iter!=codes_end; ++codes_iter)
-	{
-		//ss << std::hex << codes_iter->address << ' ' << codes_iter->data;
-		//lines.push_back(StringFromFormat("%08X %08X", codes_iter->address, codes_iter->data));
-		lines.push_back(codes_iter->original_line);
-		//ss.clear();
-	}
-
-	// save the notes
-	std::vector<std::string>::const_iterator
-		notes_iter = gcode.notes.begin(),
-		notes_end = gcode.notes.end();
-	for (; notes_iter!=notes_end; ++notes_iter)
-		lines.push_back(std::string("*") + *notes_iter);
-}
-
-void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
-{
-	std::vector<std::string> lines;
-
-	std::vector<GeckoCode>::const_iterator
-		gcodes_iter = gcodes.begin(),
-		gcodes_end = gcodes.end();
-	for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
-	{
-		SaveGeckoCode(lines, *gcodes_iter);
-	}
-
-	inifile.SetLines(GECKO_CODE_INI_SECTION, lines);
-}
-
-};
diff --git a/Source/Core/Core/Src/GeckoCodeConfig.h b/Source/Core/Core/Src/GeckoCodeConfig.h
deleted file mode 100644
index 1b3d5e5bf9..0000000000
--- a/Source/Core/Core/Src/GeckoCodeConfig.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __GECKOCODECONFIG_h__
-#define __GECKOCODECONFIG_h__
-
-#include "GeckoCode.h"
-
-#include "IniFile.h"
-
-namespace Gecko
-{
-
-void LoadCodes(const IniFile& inifile, std::vector<GeckoCode>& gcodes);
-void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes);
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp
deleted file mode 100644
index 3d3d8d6052..0000000000
--- a/Source/Core/Core/Src/HLE/HLE.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "HLE.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "../HW/Memmap.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-
-#include "HLE_OS.h"
-#include "HLE_Misc.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_es.h"
-#include "ConfigManager.h"
-#include "Core.h"
-
-namespace HLE
-{
-
-using namespace PowerPC;
-
-typedef void (*TPatchFunction)();
-
-enum
-{
-	HLE_RETURNTYPE_BLR = 0,
-	HLE_RETURNTYPE_RFI = 1,
-};
-
-struct SPatch
-{
-	char m_szPatchName[128];
-	TPatchFunction PatchFunction;
-	int type;
-	int flags;
-};
-
-static const SPatch OSPatches[] = 
-{	
-	{ "FAKE_TO_SKIP_0",		HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
-
-	{ "PanicAlert",			HLE_Misc::HLEPanicAlert, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-
-	// Name doesn't matter, installed in CBoot::BootUp()
-	{ "HBReload",			HLE_Misc::HBReload, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
-
-	// ES_LAUNCH
-	{ "__OSBootDol",		HLE_Misc::OSBootDol, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
-	{ "OSGetResetCode",		HLE_Misc::OSGetResetCode, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
-
-	// Debug/OS Support
-	{ "OSPanic",			HLE_OS::HLE_OSPanic, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-
-	{ "OSReport",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "DEBUGPrint",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "WUD_DEBUGPrint",		HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "vprintf",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "printf",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "puts",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf?
-	{ "___blank(char *,...)",	HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally)
-	{ "___blank",			HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG },
-	{ "__write_console",		HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?)
-	{ "GeckoCodehandler",		HLE_Misc::HLEGeckoCodehandler, HLE_HOOK_START, HLE_TYPE_GENERIC },
-};
-
-static const SPatch OSBreakPoints[] =
-{
-	{ "FAKE_TO_SKIP_0",		HLE_Misc::UnimplementedFunction },
-};
-
-void Patch(u32 addr, const char *hle_func_name)
-{
-	for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++)
-	{
-		if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name))
-		{
-			orig_instruction[addr] = i;
-			return;
-		}
-	}
-}
-
-void PatchFunctions()
-{
-	orig_instruction.clear();
-	for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++)
-	{
-		Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
-		if (symbol > 0)
-		{
-			for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
-			{
-				orig_instruction[addr] = i;
-			}
-			INFO_LOG(OSHLE, "Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address);
-		}
-	}
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
-	{
-		for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++)
-		{
-			Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
-			if (symbol > 0)
-			{
-				PowerPC::breakpoints.Add(symbol->address, false);
-				INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address);
-			}
-		}
-	}
-
-	//    CBreakPoints::AddBreakPoint(0x8000D3D0, false);
-}
-
-void Execute(u32 _CurrentPC, u32 _Instruction)
-{
-	unsigned int FunctionIndex = _Instruction & 0xFFFFF;
-	if ((FunctionIndex > 0) && (FunctionIndex < (sizeof(OSPatches) / sizeof(SPatch))))
-	{
-		OSPatches[FunctionIndex].PatchFunction();
-	}
-	else
-	{
-		PanicAlert("HLE system tried to call an undefined HLE function %i.", FunctionIndex);
-	}
-
-	//	_dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName);
-}
-
-u32 GetFunctionIndex(u32 addr)
-{
-	std::map<u32, u32>::const_iterator iter = orig_instruction.find(addr);
-	return (iter != orig_instruction.end()) ?  iter->second : 0;
-}
-
-int GetFunctionTypeByIndex(u32 index)
-{
-	return OSPatches[index].type;
-}
-
-int GetFunctionFlagsByIndex(u32 index)
-{
-	return OSPatches[index].flags;
-}
-
-bool IsEnabled(int flags)
-{
-	if (flags == HLE::HLE_TYPE_MEMORY && Core::g_CoreStartupParameter.bMMU)
-		return false;
-
-	if (flags == HLE::HLE_TYPE_DEBUG && !Core::g_CoreStartupParameter.bEnableDebugging && PowerPC::GetMode() != MODE_INTERPRETER)
-		return false;
-
-	return true;
-}
-
-u32 UnPatch(std::string patchName)
-{
-	Symbol *symbol = g_symbolDB.GetSymbolFromName(patchName.c_str());
-	if (symbol > 0)
-	{
-		for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
-		{
-			orig_instruction[addr] = 0;
-			PowerPC::ppcState.iCache.Invalidate(addr);
-		}
-		return symbol->address;
-	}
-	return 0;
-}
-
-}  // end of namespace HLE
diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h
deleted file mode 100644
index 32b79268b7..0000000000
--- a/Source/Core/Core/Src/HLE/HLE.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _HLE_H
-#define _HLE_H
-
-#include <map>
-#include "Common.h"
-
-namespace HLE
-{
-	enum
-	{
-		HLE_HOOK_START   = 0,    // Hook the beginning of the function and execute the function afterwards
-		HLE_HOOK_END     = 1,    // Hook the end of the function, executing the function first before the hook
-		HLE_HOOK_REPLACE = 2,    // Replace the function with the HLE version
-		HLE_HOOK_NONE    = 3,    // Do not hook the function
-	};
-
-	enum
-	{
-		HLE_TYPE_GENERIC = 0,    // Miscellaneous function
-		HLE_TYPE_MEMORY  = 1,    // Memory operation
-		HLE_TYPE_FP      = 2,    // Floating Point operation
-		HLE_TYPE_DEBUG   = 3,    // Debug output function
-	};
-
-	void PatchFunctions();
-
-	void Patch(u32 pc, const char *func_name);
-	u32 UnPatch(std::string patchName);
-	void Execute(u32 _CurrentPC, u32 _Instruction);
-
-	u32 GetFunctionIndex(u32 em_address);
-	int GetFunctionTypeByIndex(u32 index);
-	int GetFunctionFlagsByIndex(u32 index);
-
-	bool IsEnabled(int flags);
-
-	static std::map<u32, u32> orig_instruction;
-}
-
-#endif
-
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
deleted file mode 100644
index fa5f8c7d61..0000000000
--- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-#include "Common.h"
-#include "HLE_OS.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "../HW/Memmap.h"
-#include "../Host.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_DI.h"
-#include "ConfigManager.h"
-#include "VolumeCreator.h"
-#include "Filesystem.h"
-#include "../Boot/Boot_DOL.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "HLE.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/PPCCache.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "CommonPaths.h"
-#include "TextureCacheBase.h"
-
-namespace HLE_Misc
-{
-
-std::string args;
-u32 argsPtr;
-
-// If you just want to kill a function, one of the three following are usually appropriate.
-// According to the PPC ABI, the return value is always in r3.
-void UnimplementedFunction()
-{
-	NPC = LR;
-}
-
-// If you want a function to panic, you can rename it PanicAlert :p
-// Don't know if this is worth keeping.
-void HLEPanicAlert()
-{
-	::PanicAlert("HLE: PanicAlert %08x", LR);
-	NPC = LR;
-}
-
-void HBReload()
-{
-	// There isn't much we can do. Just stop cleanly.
-	PowerPC::Pause();
-	Host_Message(WM_USER_STOP);
-}
-
-void ExecuteDOL(u8* dolFile, u32 fileSize)
-{
-	// Clear memory before loading the dol
-	for (u32 i = 0x80004000; i < Memory::Read_U32(0x00000034); i += 4)
-	{
-		// TODO: Should not write over the "save region"
-		Memory::Write_U32(0x00000000, i);
-	}
-	CDolLoader dolLoader(dolFile, fileSize);
-	dolLoader.Load();
-
-	// Scan for common HLE functions
-	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
-	{
-		g_symbolDB.Clear();
-		PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
-		SignatureDB db;
-		if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
-		{
-			db.Apply(&g_symbolDB);
-			HLE::PatchFunctions();
-			db.Clear();
-		}
-	}
-
-	PowerPC::ppcState.iCache.Reset();
-	TextureCache::RequestInvalidateTextureCache();
-
-	CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
-	size_t size = s_Usb->m_WiiMotes.size();
-	bool* wiiMoteConnected = new bool[size];
-	for (unsigned int i = 0; i < size; i++)
-		wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected();
-
-	WII_IPC_HLE_Interface::Reset(true);
-	WII_IPC_HLE_Interface::Init();
-	s_Usb = GetUsbPointer();
-	for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++)
-	{
-		if (wiiMoteConnected[i])
-		{
-			s_Usb->m_WiiMotes[i].Activate(false);
-			s_Usb->m_WiiMotes[i].Activate(true);
-		}
-		else
-		{
-			s_Usb->m_WiiMotes[i].Activate(false);
-		}
-	}
-
-	delete[] wiiMoteConnected;
-
-	if (argsPtr)
-	{
-		u32 args_base = Memory::Read_U32(0x800000f4);
-		u32 ptr_to_num_args = 0xc;
-		u32 num_args = 1;
-		u32 hi_ptr = args_base + ptr_to_num_args + 4;
-		u32 new_args_ptr = args_base + ptr_to_num_args + 8;
-
-		Memory::Write_U32(ptr_to_num_args, args_base + 8);
-		Memory::Write_U32(num_args, args_base + ptr_to_num_args);
-		Memory::Write_U32(0x14, hi_ptr);
-
-		for (unsigned int i = 0; i < args.length(); i++)
-			Memory::WriteUnchecked_U8(args[i], new_args_ptr+i);
-	}
-
-	NPC = dolLoader.GetEntryPoint() | 0x80000000;
-}
-
-void LoadDOLFromDisc(std::string dol)
-{
-	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
-	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-
-	if (dol.length() > 1 && dol.compare(0, 1, "/") == 0)
-		dol = dol.substr(1);
-
-	u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str());
-	u8* dolFile = new u8[fileSize];
-	if (fileSize > 0)
-	{
-		pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize);
-		ExecuteDOL(dolFile, fileSize);
-	}
-	delete[] dolFile;
-}
-
-void LoadBootDOLFromDisc()
-{
-	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
-	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-	u32 fileSize = pFileSystem->GetBootDOLSize();
-	u8* dolFile = new u8[fileSize];
-	if (fileSize > 0)
-	{
-		pFileSystem->GetBootDOL(dolFile, fileSize);
-		ExecuteDOL(dolFile, fileSize);
-	}
-	delete[] dolFile;
-}
-
-u32 GetDolFileSize(std::string dol)
-{
-	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str());
-	DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-
-	std::string dolFile;
-
-	if (dol.length() > 1 && dol.compare(0, 1, "/") == 0)
-		dolFile = dol.substr(1);
-	else
-		dolFile = dol;
-
-	return (u32)pFileSystem->GetFileSize(dolFile.c_str());
-}
-
-void OSGetResetCode()
-{
-	u32 resetCode = Memory::Read_U32(0xCC003024);
-
-	if ((resetCode & 0x1fffffff) != 0)
-	{
-		GPR(3) = resetCode | 0x80000000;
-	}
-	else
-	{
-		GPR(3) = 0;
-	}
-
-	NPC = LR;
-}
-
-u16 GetIOSVersion()
-{
-	return Memory::Read_U16(0x00003140);
-}
-
-void OSBootDol()
-{
-	if (GetIOSVersion() >= 30)
-	{
-		if ((GPR(4) >> 28) == 0x8)
-		{
-			u32 resetCode = GPR(30);
-
-			// Reset game
-			Memory::Write_U32(resetCode, 0xCC003024);
-			LoadBootDOLFromDisc();
-			return;
-		}
-		else if ((GPR(4) >> 28) == 0xA)
-		{
-			// Boot from disc partition
-			PanicAlert("Boot Partition: %08x", GPR(26));
-		}
-		else if ((GPR(4) >> 28) == 0xC)
-		{
-			std::string dol;
-
-			// Boot DOL from disc
-			u32 ptr = GPR(28);
-			Memory::GetString(dol, ptr);
-
-			if (GetDolFileSize(dol) == 0)
-			{
-				ptr = GPR(30);
-				Memory::GetString(dol, ptr);
-				if (GetDolFileSize(dol) == 0)
-				{
-					// Cannot locate the dol file, exit.
-					HLE::UnPatch("__OSBootDol");
-					NPC = PC;
-					return;
-				}
-			}
-
-			argsPtr = Memory::Read_U32(GPR(5));
-			Memory::GetString(args, argsPtr);
-			LoadDOLFromDisc(dol);
-			return;
-		}
-		else
-		{
-			PanicAlert("Unknown boot type: %08x", GPR(4));
-		}
-	}
-	HLE::UnPatch("__OSBootDol");
-	NPC = PC;
-}
-
-void HLEGeckoCodehandler()
-{
-	// Work around the codehandler not properly invalidating the icache, but
-	// only the first few frames.
-	// (Project M uses a conditional to only apply patches after something has
-	// been read into memory, or such, so we do the first 5 frames.  More
-	// robust alternative would be to actually detect memory writes, but that
-	// would be even uglier.)
-	u32 magic = 0xd01f1bad;
-	u32 existing = Memory::Read_U32(0x80001800);
-	if (existing - magic == 5)
-	{
-		return;
-	}
-	else if(existing - magic > 5)
-	{
-		existing = magic;
-	}
-	Memory::Write_U32(existing + 1, 0x80001800);
-	PowerPC::ppcState.iCache.Reset();
-}
-
-}
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h
deleted file mode 100644
index bc3acd143f..0000000000
--- a/Source/Core/Core/Src/HLE/HLE_Misc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef HLE_MISC_H
-#define HLE_MISC_H
-
-namespace HLE_Misc
-{
-	void HLEPanicAlert();
-	void UnimplementedFunction();
-	void HBReload();
-	void OSBootDol();
-	void OSGetResetCode();
-	void HLEGeckoCodehandler();
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp
deleted file mode 100644
index ed80a68154..0000000000
--- a/Source/Core/Core/Src/HLE/HLE_OS.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "StringUtil.h"
-#include <string>
-
-#include "Common.h"
-#include "HLE_OS.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "../HW/Memmap.h"
-
-namespace HLE_OS
-{
-
-void GetStringVA(std::string& _rOutBuffer, u32 strReg = 3);
-
-void HLE_OSPanic()
-{
-	std::string Error, Msg;
-	GetStringVA(Error);
-	GetStringVA(Msg, 5);
-
-	PanicAlert("OSPanic: %s: %s", Error.c_str(), Msg.c_str());
-	ERROR_LOG(OSREPORT, "%08x->%08x| OSPanic: %s: %s", LR, PC, Error.c_str(), Msg.c_str());
-
-	NPC = LR;
-}
-
-// Generalized func for just printing string pointed to by r3.
-void HLE_GeneralDebugPrint()
-{
-	std::string ReportMessage;
-	if(*(u32*)Memory::GetPointer(GPR(3)) > 0x80000000){
-		GetStringVA(ReportMessage, 4);
-	}else{
-		GetStringVA(ReportMessage);
-	}
-	NPC = LR;
-
-	//PanicAlert("(%08x->%08x) %s", LR, PC, ReportMessage.c_str());
-	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
-}
-
-void HLE_VPrintf()
-{
-	std::string ReportMessage;
-	u32 r4 = GPR(4);
-	u32 offset = Memory::Read_U32(r4+8);
-	u32 check = Memory::Read_U32(r4);
-	//NOTICE_LOG(OSREPORT, "Offset: %08X, Check %08X", offset, check);
-	for(int i = 4; i<= 10; i++){
-		GPR(i) = Memory::Read_U32(offset+(i-(check == 0x01000000? 3 : 2))*4);
-		//NOTICE_LOG(OSREPORT, "r%d: %08X",i, GPR(i));
-	}
-
-	GetStringVA(ReportMessage);
-
-	NPC = LR;
-
-	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
-}
-// Generalized func for just printing string pointed to by r3.
-void HLE_GeneralDebugPrintWithInt()
-{
-	std::string ReportMessage;
-	GetStringVA(ReportMessage, 5);
-	NPC = LR;
-
-	//PanicAlert("(%08x->%08x) %s", LR, PC, ReportMessage.c_str());
-	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
-}
-
-// __write_console is slightly abnormal
-void HLE_write_console()
-{
-	std::string ReportMessage;
-	GetStringVA(ReportMessage, 4);
-	NPC = LR;
-
-	//PanicAlert("(%08x->%08x) %s", LR, PC, ReportMessage.c_str());
-	NOTICE_LOG(OSREPORT, "%08x->%08x| %s", LR, PC, ReportMessage.c_str());
-}
-
-void GetStringVA(std::string& _rOutBuffer, u32 strReg)
-{
-	_rOutBuffer = "";
-	char ArgumentBuffer[256];
-	u32 ParameterCounter = strReg+1;
-	u32 FloatingParameterCounter = 1;
-	char *pString = (char*)Memory::GetPointer(GPR(strReg));
-	if (!pString)
-	{
-		ERROR_LOG(OSREPORT, "r%i invalid", strReg);
-		return;
-	}
-
-	while(*pString)
-	{
-		if (*pString == '%')
-		{
-			char* pArgument = ArgumentBuffer;
-			*pArgument++ = *pString++;
-			if(*pString == '%') {
-				_rOutBuffer += "%";
-				pString++;
-				continue;
-			}
-			while(*pString < 'A' || *pString > 'z' || *pString == 'l' || *pString == '-')
-				*pArgument++ = *pString++;
-
-			*pArgument++ = *pString;
-			*pArgument = 0;
-
-			u64 Parameter;
-			if (ParameterCounter > 10)
-			{
-				Parameter = Memory::Read_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4));
-			}
-			else
-			{
-				if ((*(pString-2) == 'l') && (*(pString-1) == 'l')) // hax, just seen this on sysmenu osreport
-				{
-					Parameter = GPR(++ParameterCounter);
-					Parameter = (Parameter<<32)|GPR(++ParameterCounter);
-				}
-				else // normal, 32bit
-					Parameter = GPR(ParameterCounter);
-			}
-			ParameterCounter++;
-
-			switch(*pString)
-			{
-			case 's':
-				_rOutBuffer += StringFromFormat(ArgumentBuffer, (char*)Memory::GetPointer((u32)Parameter));
-				break;
-
-			case 'd':
-			case 'i':
-			{
-				//u64 Double = Memory::Read_U64(Parameter);
-				_rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter);
-				break;
-			}
-
-			case 'f':
-			{
-				_rOutBuffer += StringFromFormat(ArgumentBuffer,
-												rPS0(FloatingParameterCounter));
-				FloatingParameterCounter++;
-				ParameterCounter--;
-				break;
-			}
-
-			case 'p':
-				// Override, so 64bit dolphin prints 32bit pointers, since the ppc is 32bit :)
-				_rOutBuffer += StringFromFormat("%x", Parameter);
-				break;
-
-			default:
-				_rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter);
-				break;
-			}
-			pString++;
-		}
-		else
-		{
-			_rOutBuffer += StringFromFormat("%c", *pString);
-			pString++;
-		}
-	}
-	if(_rOutBuffer[_rOutBuffer.length() - 1] == '\n')
-		_rOutBuffer.resize(_rOutBuffer.length() - 1);
-}
-
-}  // end of namespace HLE_OS
diff --git a/Source/Core/Core/Src/HLE/HLE_OS.h b/Source/Core/Core/Src/HLE/HLE_OS.h
deleted file mode 100644
index 59e3cf021a..0000000000
--- a/Source/Core/Core/Src/HLE/HLE_OS.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef HLE_OS_H
-#define HLE_OS_H
-
-#include "Common.h"
-
-namespace HLE_OS
-{
-	void HLE_GeneralDebugPrint();
-	void HLE_write_console();
-	void HLE_OSPanic();
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp
deleted file mode 100644
index e9ef2eed03..0000000000
--- a/Source/Core/Core/Src/HW/AudioInterface.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-/*
-Here is a nice ascii overview of audio flow affected by this file:
-
-(RAM)---->[AI FIFO]---->[SRC]---->[Mixer]---->[DAC]---->(Speakers)
-                          ^
-                          |
-                      [L/R Volume]
-                           \
-(DVD)---->[Drive I/F]---->[SRC]---->[Counter]
-
-Notes:
-Output at "48KHz" is actually 48043Hz.
-Sample counter counts streaming stereo samples after upsampling.
-[DAC] causes [AI I/F] to read from RAM at rate selected by AIDFR.
-Each [SRC] will upsample a 32KHz source, or pass through the 48KHz
-  source. The [Mixer]/[DAC] only operate at 48KHz.
-
-AIS == disc streaming == DTK(Disk Track Player) == streaming audio, etc.
-
-Supposedly, the retail hardware only supports 48KHz streaming from
-  [Drive I/F]. However it's more likely that the hardware supports
-  32KHz streaming, and the upsampling is transparent to the user.
-  TODO check if anything tries to stream at 32KHz.
-
-The [Drive I/F] actually supports simultaneous requests for audio and
-  normal data. For this reason, we can't really get rid of the crit section.
-
-IMPORTANT:
-This file mainly deals with the [Drive I/F], however [AIDFR] controls
-  the rate at which the audio data is DMA'd from RAM into the [AI FIFO]
-  (and the speed at which the FIFO is read by its SRC). Everything else
-  relating to AID happens in DSP.cpp. It's kinda just bad hardware design.
-  TODO maybe the files should be merged?
-*/
-
-#include "Common.h"
-
-#include "StreamADPCM.h"
-#include "AudioInterface.h"
-
-#include "CPU.h"
-#include "ProcessorInterface.h"
-#include "DVDInterface.h"
-#include "../PowerPC/PowerPC.h"
-#include "../CoreTiming.h"
-#include "../HW/SystemTimers.h"
-
-namespace AudioInterface
-{
-
-// Internal hardware addresses
-enum
-{
-	AI_CONTROL_REGISTER		= 0x6C00,
-	AI_VOLUME_REGISTER		= 0x6C04,
-	AI_SAMPLE_COUNTER		= 0x6C08,
-	AI_INTERRUPT_TIMING		= 0x6C0C,
-};
-
-enum
-{
-	AIS_32KHz = 0,
-	AIS_48KHz = 1,
-
-	AID_32KHz = 1,
-	AID_48KHz = 0
-};
-
-// AI Control Register
-union AICR
-{
-	AICR() { hex = 0;}
-	AICR(u32 _hex) { hex = _hex;}
-	struct 
-	{
-		u32 PSTAT		: 1;  // sample counter/playback enable
-		u32 AISFR		: 1;  // AIS Frequency (0=32khz 1=48khz)
-		u32 AIINTMSK	: 1;  // 0=interrupt masked 1=interrupt enabled
-		u32 AIINT		: 1;  // audio interrupt status
-		u32 AIINTVLD	: 1;  // This bit controls whether AIINT is affected by the Interrupt Timing register 
-                              // matching the sample counter. Once set, AIINT will hold its last value
-		u32 SCRESET		: 1;  // write to reset counter
-		u32 AIDFR		: 1;  // AID Frequency (0=48khz 1=32khz)
-		u32				:25;
-	};
-	u32 hex;
-};
-
-// AI Volume Register
-union AIVR
-{
-	AIVR() { hex = 0;}
-	struct
-	{
-		u32 left		: 8;
-		u32 right		: 8;
-		u32				:16;
-	};
-	u32 hex;
-};
-
-// STATE_TO_SAVE
-// Registers
-static AICR m_Control;
-static AIVR m_Volume;
-static u32 m_SampleCounter = 0;
-static u32 m_InterruptTiming = 0;
-
-static u64 g_LastCPUTime = 0;
-static u64 g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
-
-static unsigned int g_AISSampleRate = 48000;
-static unsigned int g_AIDSampleRate = 32000;
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(m_Control);
-	p.DoPOD(m_Volume);
-	p.Do(m_SampleCounter);
-	p.Do(m_InterruptTiming);
-	p.Do(g_LastCPUTime);
-	p.Do(g_AISSampleRate);
-	p.Do(g_AIDSampleRate);
-	p.Do(g_CPUCyclesPerSample);
-}
-
-static void GenerateAudioInterrupt();
-static void UpdateInterrupts();
-static void IncreaseSampleCount(const u32 _uAmount);
-void ReadStreamBlock(s16* _pPCM);
-u64 GetAIPeriod();
-int et_AI;
-
-void Init()
-{
-	m_Control.hex = 0;
-	m_Control.AISFR = AIS_48KHz;
-	m_Volume.hex = 0;
-	m_SampleCounter	= 0;
-	m_InterruptTiming = 0;
-
-	g_LastCPUTime = 0;
-	g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
-
-	g_AISSampleRate = 48000;
-	g_AIDSampleRate = 32000;
-
-	et_AI = CoreTiming::RegisterEvent("AICallback", Update);
-}
-
-void Shutdown()
-{
-}
-
-void Read32(u32& _rReturnValue, const u32 _Address)
-{
-	switch (_Address & 0xFFFF)
-	{
-	case AI_CONTROL_REGISTER:
-		_rReturnValue = m_Control.hex;
-		break;
-
-	case AI_VOLUME_REGISTER:
-		_rReturnValue = m_Volume.hex;
-		break;
-
-	case AI_SAMPLE_COUNTER:
-		Update(0, 0);
-		_rReturnValue = m_SampleCounter;
-		break;
-
-	case AI_INTERRUPT_TIMING:
-		_rReturnValue = m_InterruptTiming;
-		break;
-
-	default:
-		ERROR_LOG(AUDIO_INTERFACE, "Unknown read 0x%08x", _Address);
-		_dbg_assert_msg_(AUDIO_INTERFACE, 0, "AudioInterface - Read from 0x%08x", _Address);
-		_rReturnValue = 0;
-		return;
-	}
-	DEBUG_LOG(AUDIO_INTERFACE, "r32 %08x %08x", _Address, _rReturnValue);
-}
-
-void Write32(const u32 _Value, const u32 _Address)
-{
-	switch (_Address & 0xFFFF)
-	{
-	case AI_CONTROL_REGISTER:
-		{
-			AICR tmpAICtrl(_Value);
-		
-			m_Control.AIINTMSK	= tmpAICtrl.AIINTMSK;
-			m_Control.AIINTVLD	= tmpAICtrl.AIINTVLD;
-
-			// Set frequency of streaming audio
-			if (tmpAICtrl.AISFR != m_Control.AISFR)
-			{
-				DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmpAICtrl.AISFR ? "48khz":"32khz");
-				m_Control.AISFR = tmpAICtrl.AISFR;
-			}
-			// Set frequency of DMA
-			if (tmpAICtrl.AIDFR != m_Control.AIDFR)
-			{
-				DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmpAICtrl.AIDFR ? "32khz":"48khz");
-				m_Control.AIDFR = tmpAICtrl.AIDFR;
-			}
-
-			g_AISSampleRate = tmpAICtrl.AISFR ? 48000 : 32000;
-			g_AIDSampleRate = tmpAICtrl.AIDFR ? 32000 : 48000;
-
-			g_CPUCyclesPerSample = SystemTimers::GetTicksPerSecond() / g_AISSampleRate;
-
-			// Streaming counter
-			if (tmpAICtrl.PSTAT != m_Control.PSTAT)
-			{
-				DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmpAICtrl.PSTAT ? "start":"stop");
-				m_Control.PSTAT	= tmpAICtrl.PSTAT;
-				g_LastCPUTime = CoreTiming::GetTicks();
-
-				// Tell Drive Interface to start/stop streaming
-				DVDInterface::g_bStream = tmpAICtrl.PSTAT;
-
-				CoreTiming::RemoveEvent(et_AI);
-				CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
-			}
-
-			// AI Interrupt
-			if (tmpAICtrl.AIINT)
-			{
-				DEBUG_LOG(AUDIO_INTERFACE, "Clear AIS Interrupt");
-				m_Control.AIINT = 0;
-			}
-
-			// Sample Count Reset
-			if (tmpAICtrl.SCRESET)	
-			{
-				DEBUG_LOG(AUDIO_INTERFACE, "Reset AIS sample counter");
-				m_SampleCounter = 0;
-
-				g_LastCPUTime = CoreTiming::GetTicks();
-			}
-
-			UpdateInterrupts();
-		}
-		break;
-
-	case AI_VOLUME_REGISTER:
-		m_Volume.hex = _Value;
-		DEBUG_LOG(AUDIO_INTERFACE,  "Set volume: left(%02x) right(%02x)", m_Volume.left, m_Volume.right);
-		break;
-
-	case AI_SAMPLE_COUNTER:
-		// Why was this commented out? Does something do this?
-		_dbg_assert_msg_(AUDIO_INTERFACE, 0, "AIS - sample counter is read only");
-		m_SampleCounter = _Value;
-		break;
-
-	case AI_INTERRUPT_TIMING:
-		m_InterruptTiming = _Value;
-		CoreTiming::RemoveEvent(et_AI);
-		CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
-		DEBUG_LOG(AUDIO_INTERFACE, "Set interrupt: %08x samples", m_InterruptTiming);
-		break;
-
-	default:
-		ERROR_LOG(AUDIO_INTERFACE, "Unknown write %08x @ %08x", _Value, _Address);
-		_dbg_assert_msg_(AUDIO_INTERFACE,0,"AIS - Write %08x to %08x", _Value, _Address);
-		break;
-	}
-}
-
-static void UpdateInterrupts()
-{
-	ProcessorInterface::SetInterrupt(
-		ProcessorInterface::INT_CAUSE_AI, m_Control.AIINT & m_Control.AIINTMSK);
-}
-
-static void GenerateAudioInterrupt()
-{
-	m_Control.AIINT = 1;
-	UpdateInterrupts();
-}
-
-void GenerateAISInterrupt()
-{
-	GenerateAudioInterrupt();
-}
-
-void Callback_GetSampleRate(unsigned int &_AISampleRate, unsigned int &_DACSampleRate)
-{
-	_AISampleRate = g_AISSampleRate;
-	_DACSampleRate = g_AIDSampleRate;
-}
-
-// Callback for the disc streaming
-// WARNING - called from audio thread
-unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples, unsigned int _sampleRate)
-{
-	if (m_Control.PSTAT && !CCPU::IsStepping())
-	{
-		static int pos = 0;
-		static short pcm[NGCADPCM::SAMPLES_PER_BLOCK*2];
-		const int lvolume = m_Volume.left;
-		const int rvolume = m_Volume.right;
-
-		if (g_AISSampleRate == 48000 && _sampleRate == 32000)
-		{
-			_dbg_assert_msg_(AUDIO_INTERFACE, !(_numSamples & 1), "Number of Samples: %i must be even!", _numSamples);
-			_numSamples = _numSamples * 3 / 2;
-		}
-
-		int pcm_l = 0, pcm_r = 0;
-		for (unsigned int i = 0; i < _numSamples; i++)
-		{
-			if (pos == 0)
-				ReadStreamBlock(pcm);
-
-			if (g_AISSampleRate == 48000 && _sampleRate == 32000) //downsample 48>32
-			{
-				if (i % 3)
-				{
-					pcm_l = (((pcm_l + (int)pcm[pos*2]) / 2  * lvolume) >> 8) + (int)(*_pDestBuffer);
-					if (pcm_l > 32767)			pcm_l = 32767;
-					else if (pcm_l < -32767)	pcm_l = -32767;
-					*_pDestBuffer++ = pcm_l;
-
-					pcm_r = (((pcm_r + (int)pcm[pos*2+1]) / 2 * rvolume) >> 8) + (int)(*_pDestBuffer);
- 					if (pcm_r > 32767)			pcm_r = 32767;
-					else if (pcm_r < -32767)	pcm_r = -32767;
-					*_pDestBuffer++ = pcm_r;
-				}
-				pcm_l = pcm[pos*2];
-				pcm_r = pcm[pos*2+1];
-
-				pos++;
-			}
-			else if (g_AISSampleRate == 32000 && _sampleRate == 48000) //upsample 32>48
-			{
-				//starts with one sample of 0
-				const u32 ratio = (u32)( 65536.0f * 32000.0f / (float)_sampleRate );
-				static u32 frac = 0;
-
-				static s16 l1 = 0;
-				static s16 l2 = 0;
-				
-				if ( frac >= 0x10000 || frac == 0)
-				{
-					frac &= 0xffff;
-
-					l1 = l2;		   //current
-					l2 = pcm[pos * 2]; //next
-				}
-
-				pcm_l = ((l1 << 16) + (l2 - l1) * (u16)frac)  >> 16;
-				pcm_r = ((l1 << 16) + (l2 - l1) * (u16)frac)  >> 16;
-
-
-				pcm_l = (pcm_l * lvolume >> 8) + (int)(*_pDestBuffer);
-				if (pcm_l > 32767)			pcm_l = 32767;
-				else if (pcm_l < -32767)	pcm_l = -32767;
-				*_pDestBuffer++ = pcm_l;
-
-				pcm_r = (pcm_r * lvolume >> 8) + (int)(*_pDestBuffer);
-				if (pcm_r > 32767)			pcm_r = 32767;
-				else if (pcm_r < -32767)	pcm_r = -32767;
-				*_pDestBuffer++ = pcm_r;
-
-				frac += ratio;
-				pos += frac >> 16;
-
-			}
-			else //1:1 no resampling
-			{ 
-				pcm_l = (((int)pcm[pos*2] * lvolume) >> 8) + (int)(*_pDestBuffer);
-				if (pcm_l > 32767)		pcm_l = 32767;
-				else if (pcm_l < -32767)	pcm_l = -32767;
-				*_pDestBuffer++ = pcm_l;
-
-				pcm_r = (((int)pcm[pos*2+1] * rvolume) >> 8) + (int)(*_pDestBuffer);
-				if (pcm_r > 32767)		pcm_r = 32767;
-				else if (pcm_r < -32767)	pcm_r = -32767;
-				*_pDestBuffer++ = pcm_r;
-				
-				pos++;
-			}
-
-			if (pos == NGCADPCM::SAMPLES_PER_BLOCK) 
-				pos = 0;
-		}
-	}
-	else
-	{
-		// Don't overwrite existed sample data
-		/*
-		for (unsigned int i = 0; i < _numSamples * 2; i++)
-		{
-			_pDestBuffer[i] = 0; //silence!
-		}
-		*/
-	}
-
-	return _numSamples;
-}
-
-// WARNING - called from audio thread
-void ReadStreamBlock(s16 *_pPCM)
-{
-	u8 tempADPCM[NGCADPCM::ONE_BLOCK_SIZE];
-	if (DVDInterface::DVDReadADPCM(tempADPCM, NGCADPCM::ONE_BLOCK_SIZE))
-	{
-		NGCADPCM::DecodeBlock(_pPCM, tempADPCM);
-	}
-	else
-	{
-		memset(_pPCM, 0, NGCADPCM::SAMPLES_PER_BLOCK*2);
-	}
-
-	// our whole streaming code is "faked" ... so it shouldn't increase the sample counter
-	// streaming will never work correctly this way, but at least the program will think all is alright.
-}
-
-static void IncreaseSampleCount(const u32 _iAmount)
-{
-	if (m_Control.PSTAT)
-	{
-		m_SampleCounter += _iAmount;
-		if (m_Control.AIINTVLD && (m_SampleCounter >= m_InterruptTiming))
-		{
-			GenerateAudioInterrupt();
-		}
-	}
-}
-
-unsigned int GetAIDSampleRate()
-{
-	return g_AIDSampleRate;
-}
-
-void Update(u64 userdata, int cyclesLate)
-{
-	if (m_Control.PSTAT)
-	{
-		const u64 Diff = CoreTiming::GetTicks() - g_LastCPUTime;
-		if (Diff > g_CPUCyclesPerSample)
-		{
-			const u32 Samples = static_cast<u32>(Diff / g_CPUCyclesPerSample);
-			g_LastCPUTime += Samples * g_CPUCyclesPerSample;
-			IncreaseSampleCount(Samples);
-		}
-		CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2) - cyclesLate, et_AI);
-	}
-}
-
-u64 GetAIPeriod()
-{
-	u64 period = g_CPUCyclesPerSample * m_InterruptTiming;
-	if (period == 0)
-		period = 32000 * g_CPUCyclesPerSample;
-	return period;
-}
-
-} // end of namespace AudioInterface
diff --git a/Source/Core/Core/Src/HW/AudioInterface.h b/Source/Core/Core/Src/HW/AudioInterface.h
deleted file mode 100644
index 6893cff20f..0000000000
--- a/Source/Core/Core/Src/HW/AudioInterface.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// See CPP file for comments.
-
-#ifndef _AUDIOINTERFACE_H
-#define _AUDIOINTERFACE_H
-
-#include "CommonTypes.h"
-
-class PointerWrap;
-
-namespace AudioInterface
-{
-
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-void Update(u64 userdata, int cyclesLate);
-
-// Called by DSP emulator
-void Callback_GetSampleRate(unsigned int &_AISampleRate, unsigned int &_DACSampleRate);
-unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples, unsigned int _sampleRate = 48000);
-
-void Read32(u32& _uReturnValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-// Get the audio rates (48000 or 32000 only)
-unsigned int GetAIDSampleRate();
-
-void GenerateAISInterrupt();
-
-}  // namespace
-
-#endif
diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Apple.cpp
deleted file mode 100644
index 5309d9fc6a..0000000000
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Apple.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2003-2009 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "../EXI_Device.h"
-#include "../EXI_DeviceEthernet.h"
-
-bool CEXIETHERNET::Activate()
-{
-	return false;
-}
-
-void CEXIETHERNET::Deactivate()
-{
-}
-
-bool CEXIETHERNET::IsActivated()
-{
-	return false;
-}
-
-bool CEXIETHERNET::SendFrame(u8 *, u32)
-{
-	return false;
-}
-
-bool CEXIETHERNET::RecvInit()
-{
-	return false;
-}
-
-bool CEXIETHERNET::RecvStart()
-{
-	return false;
-}
-
-void CEXIETHERNET::RecvStop()
-{
-}
diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp
deleted file mode 100644
index 97c73eeb40..0000000000
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (C) 2003-2009 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "StringUtil.h"
-#include "../EXI_Device.h"
-#include "../EXI_DeviceEthernet.h"
-
-#ifdef __linux__
-#include <fcntl.h>
-#include <linux/if_tun.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#endif
-
-#define NOTIMPLEMENTED(Name) \
-	NOTICE_LOG(SP1, "CEXIETHERNET::%s not implemented for your UNIX", Name);
-
-bool CEXIETHERNET::Activate()
-{
-#ifdef __linux__
-	if (IsActivated())
-		return true;
-
-	// Assumes that there is a TAP device named "Dolphin" preconfigured for
-	// bridge/NAT/whatever the user wants it configured.
-
-	if ((fd = open("/dev/net/tun", O_RDWR)) < 0)
-	{
-		ERROR_LOG(SP1, "Couldn't open /dev/net/tun, unable to init BBA");
-		return false;
-	}
-
-	struct ifreq ifr;
-	memset(&ifr, 0, sizeof(ifr));
-	ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE;
-
-	strncpy(ifr.ifr_name, "Dolphin", IFNAMSIZ);
-
-	int err;
-	if ((err = ioctl(fd, TUNSETIFF, (void*)&ifr)) < 0)
-	{
-		close(fd);
-		fd = -1;
-		ERROR_LOG(SP1, "TUNSETIFF failed: err=%d", err);
-		return false;
-	}
-	ioctl(fd, TUNSETNOCSUM, 1);
-
-	readEnabled = false;
-
-	INFO_LOG(SP1, "BBA initialized with associated tap %s", ifr.ifr_name);
-	return true;
-#else
-	NOTIMPLEMENTED("Activate");
-	return false;
-#endif
-}
-
-void CEXIETHERNET::Deactivate()
-{
-#ifdef __linux__
-	close(fd);
-	fd = -1;
-
-	readEnabled = false;
-	if (readThread.joinable())
-		readThread.join();
-#else
-	NOTIMPLEMENTED("Deactivate");
-#endif
-}
-
-bool CEXIETHERNET::IsActivated()
-{ 
-#ifdef __linux__
-	return fd != -1 ? true : false;
-#else
-	return false;
-#endif
-}
-
-bool CEXIETHERNET::SendFrame(u8* frame, u32 size) 
-{
-#ifdef __linux__
-	INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
-
-	int writtenBytes = write(fd, frame, size);
-	if ((u32)writtenBytes != size)
-	{
-		ERROR_LOG(SP1, "SendFrame(): expected to write %d bytes, instead wrote %d",
-		          size, writtenBytes);
-		return false;
-	}
-	else
-	{
-		SendComplete();
-		return true;
-	}
-#else
-	NOTIMPLEMENTED("SendFrame");
-	return false;
-#endif
-}
-
-void ReadThreadHandler(CEXIETHERNET* self)
-{
-	while (true)
-	{
-		if (self->fd < 0)
-			return;
-
-		fd_set rfds;
-		FD_ZERO(&rfds);
-		FD_SET(self->fd, &rfds);
-
-		struct timeval timeout;
-		timeout.tv_sec = 0;
-		timeout.tv_usec = 50000;
-		if (select(self->fd + 1, &rfds, NULL, NULL, &timeout) <= 0)
-			continue;
-
-		int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE);
-		if (readBytes < 0)
-		{
-			ERROR_LOG(SP1, "Failed to read from BBA, err=%d", readBytes);
-		}
-		else if (self->readEnabled)
-		{
-			INFO_LOG(SP1, "Read data: %s", ArrayToString(self->mRecvBuffer, readBytes, 0x10).c_str());
-			self->mRecvBufferLength = readBytes;
-			self->RecvHandlePacket();
-		}
-	}
-}
-
-bool CEXIETHERNET::RecvInit()
-{
-#ifdef __linux__
-	readThread = std::thread(ReadThreadHandler, this);
-	return true;
-#else
-	NOTIMPLEMENTED("RecvInit");
-	return false;
-#endif
-}
-
-bool CEXIETHERNET::RecvStart()
-{
-#ifdef __linux__
-	if (!readThread.joinable())
-		RecvInit();
-
-	readEnabled = true;
-	return true;
-#else
-	NOTIMPLEMENTED("RecvStart");
-	return false;
-#endif
-}
-
-void CEXIETHERNET::RecvStop()
-{
-#ifdef __linux__
-	readEnabled = false;
-#else
-	NOTIMPLEMENTED("RecvStop");
-#endif
-}
diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp
deleted file mode 100644
index f013c9ee7d..0000000000
--- a/Source/Core/Core/Src/HW/CPU.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thread.h"
-
-#include "../DSPEmulator.h"
-#include "../PowerPC/PowerPC.h"
-#include "../Host.h"
-#include "../Core.h"
-#include "CPU.h"
-#include "DSP.h"
-#include "Movie.h"
-
-#include "VideoBackendBase.h"
-
-namespace
-{
-	static Common::Event m_StepEvent;
-	static Common::Event *m_SyncEvent = NULL;
-	static std::mutex m_csCpuOccupied;
-}
-
-void CCPU::Init(int cpu_core)
-{
-	PowerPC::Init(cpu_core);
-	m_SyncEvent = NULL;
-}
-
-void CCPU::Shutdown()
-{
-	PowerPC::Shutdown();
-	m_SyncEvent = NULL;
-}
-
-void CCPU::Run()
-{
-	std::lock_guard<std::mutex> lk(m_csCpuOccupied);
-	Host_UpdateDisasmDialog();
-
-	while (true)
-	{
-reswitch:
-		switch (PowerPC::GetState())
-		{
-		case PowerPC::CPU_RUNNING:
-			//1: enter a fast runloop
-			PowerPC::RunLoop();
-			break;
-
-		case PowerPC::CPU_STEPPING:
-			m_csCpuOccupied.unlock();
-
-			//1: wait for step command..
-			m_StepEvent.Wait();
-
-			m_csCpuOccupied.lock();
-			if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
-				return;
-			if (PowerPC::GetState() != PowerPC::CPU_STEPPING)
-				goto reswitch;
-
-			//3: do a step
-			PowerPC::SingleStep();
-
-			//4: update disasm dialog
-			if (m_SyncEvent)
-			{
-				m_SyncEvent->Set();
-				m_SyncEvent = NULL;
-			}
-			Host_UpdateDisasmDialog();
-			break;
-
-		case PowerPC::CPU_POWERDOWN:
-			//1: Exit loop!!
-			return; 
-		}
-	}
-}
-
-void CCPU::Stop()
-{
-	PowerPC::Stop();
-	m_StepEvent.Set();
-}
-
-bool CCPU::IsStepping()
-{
-	return PowerPC::GetState() == PowerPC::CPU_STEPPING;
-}
-
-void CCPU::Reset()
-{
-
-}
-
-void CCPU::StepOpcode(Common::Event *event) 
-{
-	m_StepEvent.Set();
-	if (PowerPC::GetState() == PowerPC::CPU_STEPPING)
-	{
-		m_SyncEvent = event;
-	}
-}
-
-void CCPU::EnableStepping(const bool _bStepping)
-{	
-	if (_bStepping)
-	{
-		PowerPC::Pause();
-		m_StepEvent.Reset();
-		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE);
-		DSP::GetDSPEmulator()->DSP_ClearAudioBuffer(true);
-	}
-	else
-	{
-		PowerPC::Start();
-		m_StepEvent.Set();
-		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PLAY);
-		DSP::GetDSPEmulator()->DSP_ClearAudioBuffer(false);
-	}
-}
-
-void CCPU::Break() 
-{
-	EnableStepping(true);
-}
-
-bool CCPU::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	bool wasUnpaused = !IsStepping();
-	if (doLock)
-	{
-		// we can't use EnableStepping, that would causes deadlocks with both audio and video
-		PowerPC::Pause();
-		if (!Core::IsCPUThread())
-			m_csCpuOccupied.lock();
-	}
-	else
-	{
-		if (unpauseOnUnlock)
-		{
-			PowerPC::Start();
-			m_StepEvent.Set();
-		}
-
-		if (!Core::IsCPUThread())
-			m_csCpuOccupied.unlock();
-	}
-	return wasUnpaused;
-}
diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp
deleted file mode 100644
index 3ef62e5aaa..0000000000
--- a/Source/Core/Core/Src/HW/DSP.cpp
+++ /dev/null
@@ -1,839 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// AID / AUDIO_DMA controls pushing audio out to the SRC and then the speakers.
-// The audio DMA pushes audio through a small FIFO 32 bytes at a time, as
-// needed.
-
-// The SRC behind the fifo eats stereo 16-bit data at a sample rate of 32khz,
-// that is, 4 bytes at 32 khz, which is 32 bytes at 4 khz. We thereforce
-// schedule an event that runs at 4khz, that eats audio from the fifo. Thus, we
-// have homebrew audio.
-
-// The AID interrupt is set when the fifo STARTS a transfer. It latches address
-// and count into internal registers and starts copying. This means that the
-// interrupt handler can simply set the registers to where the next buffer is,
-// and start filling it. When the DMA is complete, it will automatically
-// relatch and fire a new interrupt.
-
-// Then there's the DSP... what likely happens is that the
-// fifo-latched-interrupt handler kicks off the DSP, requesting it to fill up
-// the just used buffer through the AXList (or whatever it might be called in
-// Nintendo games).
-
-#include "DSP.h"
-
-#include "../CoreTiming.h"
-#include "../Core.h"
-#include "CPU.h"
-#include "MemoryUtil.h"
-#include "Memmap.h"
-#include "ProcessorInterface.h"
-#include "AudioInterface.h"
-#include "../PowerPC/PowerPC.h"
-#include "../ConfigManager.h"
-#include "../DSPEmulator.h"
-
-namespace DSP
-{
-
-// register offsets
-enum
-{
-	DSP_MAIL_TO_DSP_HI		= 0x5000,
-	DSP_MAIL_TO_DSP_LO		= 0x5002,
-	DSP_MAIL_FROM_DSP_HI	= 0x5004,
-	DSP_MAIL_FROM_DSP_LO	= 0x5006,
-	DSP_CONTROL				= 0x500A,
-	DSP_INTERRUPT_CONTROL	= 0x5010,
-	AR_INFO					= 0x5012,  // These names are a good guess at best
-	AR_MODE					= 0x5016,  //
-	AR_REFRESH				= 0x501a,
-	AR_DMA_MMADDR_H			= 0x5020,
-	AR_DMA_MMADDR_L			= 0x5022,
-	AR_DMA_ARADDR_H			= 0x5024,
-	AR_DMA_ARADDR_L			= 0x5026,
-	AR_DMA_CNT_H			= 0x5028,
-	AR_DMA_CNT_L			= 0x502A,
-	AUDIO_DMA_START_HI		= 0x5030,
-	AUDIO_DMA_START_LO		= 0x5032,
-	AUDIO_DMA_BLOCKS_LENGTH	= 0x5034,  // Ever used?
-	AUDIO_DMA_CONTROL_LEN	= 0x5036,
-	AUDIO_DMA_BLOCKS_LEFT	= 0x503A,
-};
-
-// UARAMCount
-union UARAMCount
-{
-	u32 Hex;
-	struct
-	{
-		u32 count	: 31;
-		u32 dir		: 1; // 0: MRAM -> ARAM 1: ARAM -> MRAM
-	};
-};
-
-// UDSPControl
-#define DSP_CONTROL_MASK 0x0C07
-union UDSPControl
-{
-	u16 Hex;
-	struct
-	{
-		// DSP Control
-		u16 DSPReset		: 1;	// Write 1 to reset and waits for 0
-		u16 DSPAssertInt	: 1;
-		u16 DSPHalt			: 1;
-		// Interrupt for DMA to the AI/speakers
-		u16 AID				: 1;
-		u16 AID_mask		: 1;
-		// ARAM DMA interrupt
-		u16 ARAM			: 1;
-		u16 ARAM_mask		: 1;
-		// DSP DMA interrupt
-		u16 DSP				: 1;
-		u16 DSP_mask		: 1;
-		// Other ???
-		u16 DMAState		: 1;	// DSPGetDMAStatus() uses this flag. __ARWaitForDMA() uses it too...maybe it's just general DMA flag
-		u16 unk3			: 1;
-		u16 DSPInit			: 1;	// DSPInit() writes to this flag
-		u16 pad				: 4;
-	};
-};
-
-// DSPState
-struct DSPState
-{
-	UDSPControl DSPControl;
-	DSPState()
-	{
-		DSPControl.Hex = 0;
-	}
-};
-
-// Blocks are 32 bytes.
-union UAudioDMAControl
-{
-	u16 Hex;
-	struct
-	{
-		u16 NumBlocks  : 15;
-		u16 Enable     : 1;
-	};
-
-	UAudioDMAControl(u16 _Hex = 0) : Hex(_Hex)
-	{}
-};
-
-// AudioDMA
-struct AudioDMA
-{
-	u32 SourceAddress;
-	u32 ReadAddress;
-	UAudioDMAControl AudioDMAControl;
-	int BlocksLeft;
-
-	AudioDMA()
-	{
-		SourceAddress = 0;
-		ReadAddress = 0;
-		AudioDMAControl.Hex = 0;
-		BlocksLeft = 0;
-	}
-};
-
-// ARAM_DMA
-struct ARAM_DMA
-{
-	u32 MMAddr;
-	u32 ARAddr;
-	UARAMCount Cnt;
-
-	ARAM_DMA()
-	{
-		MMAddr = 0;
-		ARAddr = 0;
-		Cnt.Hex = 0;
-	}
-};
-
-// So we may abstract gc/wii differences a little
-struct ARAMInfo
-{
-	bool wii_mode; // wii EXRAM is managed in Memory:: so we need to skip statesaving, etc
-	u32 size;
-	u32 mask;
-	u8* ptr; // aka audio ram, auxiliary ram, MEM2, EXRAM, etc...
-
-	// Default to GC mode
-	ARAMInfo()
-	{
-		wii_mode = false;
-		size = ARAM_SIZE;
-		mask = ARAM_MASK;
-		ptr = NULL;
-	}
-};
-
-// STATE_TO_SAVE
-static ARAMInfo g_ARAM;
-static DSPState g_dspState;
-static AudioDMA g_audioDMA;
-static ARAM_DMA g_arDMA;
-
-union ARAM_Info
-{
-	u16 Hex;
-	struct
-	{
-		u16 size	: 6;
-		u16 unk		: 1;
-		u16			: 9;
-	};
-};
-static ARAM_Info g_ARAM_Info;
-// Contains bitfields for some stuff we don't care about (and nothing ever reads):
-//  CAS latency/burst length/addressing mode/write mode
-// We care about the LSB tho. It indicates that the ARAM controller has finished initializing
-static u16 g_AR_MODE;
-static u16 g_AR_REFRESH;
-
-DSPEmulator *dsp_emulator;
-
-static int dsp_slice = 0;
-static bool dsp_is_lle = false;
-
-//time given to lle dsp on every read of the high bits in a mailbox
-static const int DSP_MAIL_SLICE=72;
-
-void DoState(PointerWrap &p)
-{
-	if (!g_ARAM.wii_mode)
-		p.DoArray(g_ARAM.ptr, g_ARAM.size);
-	p.DoPOD(g_dspState);
-	p.DoPOD(g_audioDMA);
-	p.DoPOD(g_arDMA);
-	p.Do(g_ARAM_Info);
-	p.Do(g_AR_MODE);
-	p.Do(g_AR_REFRESH);
-	p.Do(dsp_slice);
-
-	dsp_emulator->DoState(p);
-}
-
-
-void UpdateInterrupts();
-void Do_ARAM_DMA();
-void WriteARAM(u8 _iValue, u32 _iAddress);
-bool Update_DSP_ReadRegister();
-void Update_DSP_WriteRegister();
-
-int et_GenerateDSPInterrupt;
-
-void GenerateDSPInterrupt_Wrapper(u64 userdata, int cyclesLate)
-{
-	GenerateDSPInterrupt((DSPInterruptType)(userdata&0xFFFF), (bool)((userdata>>16) & 1));
-}
-
-DSPEmulator *GetDSPEmulator()
-{
-	return dsp_emulator;
-}
-
-void Init(bool hle)
-{
-	dsp_emulator = CreateDSPEmulator(hle);
-	dsp_is_lle = dsp_emulator->IsLLE();
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-	{
-		g_ARAM.wii_mode = true;
-		g_ARAM.size = Memory::EXRAM_SIZE;
-		g_ARAM.mask = Memory::EXRAM_MASK;
-		g_ARAM.ptr = Memory::GetPointer(0x10000000);
-	}
-	else
-	{
-		// On the GC, ARAM is accessible only through this interface.
-		g_ARAM.wii_mode = false;
-		g_ARAM.size = ARAM_SIZE;
-		g_ARAM.mask = ARAM_MASK;
-		g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size);
-	}
-
-	memset(&g_audioDMA, 0, sizeof(g_audioDMA));
-	memset(&g_arDMA, 0, sizeof(g_arDMA));
-
-	g_dspState.DSPControl.Hex = 0;
-	g_dspState.DSPControl.DSPHalt = 1;
-
-	g_ARAM_Info.Hex = 0;
-	g_AR_MODE = 1; // ARAM Controller has init'd
-	g_AR_REFRESH = 156; // 156MHz
-
-	et_GenerateDSPInterrupt = CoreTiming::RegisterEvent("DSPint", GenerateDSPInterrupt_Wrapper);
-}
-
-void Shutdown()
-{
-	if (!g_ARAM.wii_mode)
-		FreeMemoryPages(g_ARAM.ptr, g_ARAM.size);
-	g_ARAM.ptr = NULL;
-
-	dsp_emulator->Shutdown();
-	delete dsp_emulator;
-	dsp_emulator = NULL;
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	switch (_iAddress & 0xFFFF)
-	{
-		// DSP
-	case DSP_MAIL_TO_DSP_HI:
-		if (dsp_slice > DSP_MAIL_SLICE && dsp_is_lle) {
-			dsp_emulator->DSP_Update(DSP_MAIL_SLICE);
-			dsp_slice -= DSP_MAIL_SLICE;
-		}
-		_uReturnValue = dsp_emulator->DSP_ReadMailBoxHigh(true);
-		break;
-
-	case DSP_MAIL_TO_DSP_LO:
-		_uReturnValue = dsp_emulator->DSP_ReadMailBoxLow(true);
-		break;
-
-	case DSP_MAIL_FROM_DSP_HI:
-		if (dsp_slice > DSP_MAIL_SLICE && dsp_is_lle) {
-			dsp_emulator->DSP_Update(DSP_MAIL_SLICE);
-			dsp_slice -= DSP_MAIL_SLICE;
-		}
-		_uReturnValue = dsp_emulator->DSP_ReadMailBoxHigh(false);
-		break;
-
-	case DSP_MAIL_FROM_DSP_LO:
-		_uReturnValue = dsp_emulator->DSP_ReadMailBoxLow(false);
-		break;
-
-	case DSP_CONTROL:
-		_uReturnValue = (g_dspState.DSPControl.Hex & ~DSP_CONTROL_MASK) |
-			(dsp_emulator->DSP_ReadControlRegister() & DSP_CONTROL_MASK);
-		break;
-
-		// ARAM
-	case AR_INFO:
-		//PanicAlert("Read %x %x", g_ARAM_Info.Hex,PowerPC::ppcState.pc);
-		_uReturnValue = g_ARAM_Info.Hex;
-		break;
-
-	case AR_MODE:
-		_uReturnValue = g_AR_MODE;
-		break;
-
-	case AR_REFRESH:
-		_uReturnValue = g_AR_REFRESH;
-		break;
-
-	case AR_DMA_MMADDR_H: _uReturnValue = g_arDMA.MMAddr >> 16; return;
-	case AR_DMA_MMADDR_L: _uReturnValue = g_arDMA.MMAddr & 0xFFFF; return;
-	case AR_DMA_ARADDR_H: _uReturnValue = g_arDMA.ARAddr >> 16; return;
-	case AR_DMA_ARADDR_L: _uReturnValue = g_arDMA.ARAddr & 0xFFFF; return;
-	case AR_DMA_CNT_H:    _uReturnValue = g_arDMA.Cnt.Hex >> 16; return;
-	case AR_DMA_CNT_L:    _uReturnValue = g_arDMA.Cnt.Hex & 0xFFFF; return;
-
-		// AI
-	case AUDIO_DMA_BLOCKS_LEFT:
-		_uReturnValue = g_audioDMA.BlocksLeft > 0 ? g_audioDMA.BlocksLeft - 1 : 0; // AUDIO_DMA_BLOCKS_LEFT is zero based
-		break;
-
-	case AUDIO_DMA_START_LO:
-		_uReturnValue = g_audioDMA.SourceAddress & 0xFFFF;
-		break;
-
-	case AUDIO_DMA_START_HI:
-		_uReturnValue = g_audioDMA.SourceAddress >> 16;
-		break;
-
-	case AUDIO_DMA_CONTROL_LEN:
-		_uReturnValue = g_audioDMA.AudioDMAControl.Hex;
-		break;
-
-	default:
-		_uReturnValue = 0;
-		_dbg_assert_(DSPINTERFACE,0);
-		break;
-	}
-
-	if (_iAddress != (0xCC000000 + DSP_MAIL_FROM_DSP_HI))
-	{
-		DEBUG_LOG(DSPINTERFACE, "DSPInterface(r16) 0x%08x (0x%04x)  (%08x)", _iAddress, _uReturnValue, PowerPC::ppcState.pc);
-	}
-}
-
-void Write16(const u16 _Value, const u32 _Address)
-{
-	DEBUG_LOG(DSPINTERFACE, "DSPInterface(w16) 0x%08x (0x%04x)  (%08x)", _Address, _Value, PowerPC::ppcState.pc);
-
-	switch (_Address & 0xFFFF)
-	{
-	// DSP
-	case DSP_MAIL_TO_DSP_HI:
-		dsp_emulator->DSP_WriteMailBoxHigh(true, _Value);
-		break;
-
-	case DSP_MAIL_TO_DSP_LO:
-		dsp_emulator->DSP_WriteMailBoxLow(true, _Value);
-		break;
-
-	case DSP_MAIL_FROM_DSP_HI:
-		_dbg_assert_msg_(DSPINTERFACE, 0, "W16: DSP_MAIL_FROM_DSP_HI");
-		break;
-
-	case DSP_MAIL_FROM_DSP_LO:
-		_dbg_assert_msg_(DSPINTERFACE, 0, "W16: DSP_MAIL_FROM_DSP_LO");
-		break;
-
-	// Control Register
-	case DSP_CONTROL:
-		{
-			UDSPControl tmpControl;
-			tmpControl.Hex = (_Value & ~DSP_CONTROL_MASK) |
-							(dsp_emulator->DSP_WriteControlRegister(_Value) & DSP_CONTROL_MASK);
-
-			// Not really sure if this is correct, but it works...
-			// Kind of a hack because DSP_CONTROL_MASK should make this bit
-			// only viewable to dsp emulator
-			if (_Value & 1 /*DSPReset*/)
-			{
-				g_audioDMA.AudioDMAControl.Hex = 0;
-			}
-
-			// Update DSP related flags
-			g_dspState.DSPControl.DSPReset		= tmpControl.DSPReset;
-			g_dspState.DSPControl.DSPAssertInt	= tmpControl.DSPAssertInt;
-			g_dspState.DSPControl.DSPHalt		= tmpControl.DSPHalt;
-			g_dspState.DSPControl.DSPInit		= tmpControl.DSPInit;
-
-			// Interrupt (mask)
-			g_dspState.DSPControl.AID_mask	= tmpControl.AID_mask;
-			g_dspState.DSPControl.ARAM_mask	= tmpControl.ARAM_mask;
-			g_dspState.DSPControl.DSP_mask	= tmpControl.DSP_mask;
-
-			// Interrupt
-			if (tmpControl.AID)  g_dspState.DSPControl.AID  = 0;
-			if (tmpControl.ARAM) g_dspState.DSPControl.ARAM = 0;
-			if (tmpControl.DSP)  g_dspState.DSPControl.DSP  = 0;
-
-			// unknown
-			g_dspState.DSPControl.unk3	= tmpControl.unk3;
-			g_dspState.DSPControl.pad	= tmpControl.pad;
-			if (g_dspState.DSPControl.pad != 0)
-			{
-				PanicAlert("DSPInterface (w) g_dspState.DSPControl (CC00500A) gets a value with junk in the padding %08x", _Value);
-			}
-
-			UpdateInterrupts();
-		}
-		break;
-
-	// ARAM
-	// DMA back and forth between ARAM and RAM
-	case AR_INFO:
-		//PanicAlert("AR_INFO %x PC: %x", _Value, PowerPC::ppcState.pc);
-		ERROR_LOG(DSPINTERFACE, "AR_INFO %x PC: %x", _Value, PowerPC::ppcState.pc);
-		g_ARAM_Info.Hex = _Value;
-
-		// 0x43
-		// Monster Hunter Tri, DKCR
-
-		// 0x43, 0x63:
-		// Rebel Strike, Clone Wars, WWE DOR2, Mario Golf
-
-		// 0x43, 0x64, 0x63
-		// Transworld Surf, Smashing Drive, SSBM, Cel Damage
-
-		// __OSInitAudioSystem sets to 0x43 -> expects 16bit adressing and mapping to dsp iram?
-		// __OSCheckSize sets = 0x20 | 3 (keeps upper bits)
-		// 0x23 -> Zelda standard mode (standard ARAM access ??)
-		// 0x43 -> Set by __OSInitAudioSystem
-		// 0x58 -> Transworld Surf, Cel Damage, SSBM
-		// 0x60 -> Transworld Surf, Cel Damage, SSBM
-		// 0x63 -> ARCheckSize Mode (access AR-registers ??) or no exception ??
-		// 0x64 -> Transworld Surf, Cel Damage, SSBM
-
-		// 0x00 -> Switch to external ARAM
-		// 0x04 -> Switch to internal ARAM
-		break;
-
-	case AR_MODE:
-		g_AR_MODE = _Value;
-		break;
-
-	case AR_REFRESH:
-		// 0x9c -> Set by Eternal Darkness
-		g_AR_REFRESH = _Value;
-		break;
-
-	case AR_DMA_MMADDR_H:
-		g_arDMA.MMAddr = (g_arDMA.MMAddr & 0xFFFF) | (_Value<<16);
-		break;
-
-	case AR_DMA_MMADDR_L:
-		// Align MMAddr to the 32 byte boundary. Verified on real HW
-		g_arDMA.MMAddr = ((g_arDMA.MMAddr & 0xFFFF0000) | (_Value)) & ~31;
-		break;
-
-	case AR_DMA_ARADDR_H:
-		g_arDMA.ARAddr = (g_arDMA.ARAddr & 0xFFFF) | (_Value<<16);
-		break;
-
-	case AR_DMA_ARADDR_L:
-		// Align ARAddr to the 32 byte boundary. Verified on real HW
-		g_arDMA.ARAddr = ((g_arDMA.ARAddr & 0xFFFF0000) | (_Value)) & ~31;
-		break;
-
-	case AR_DMA_CNT_H:
-		g_arDMA.Cnt.Hex = (g_arDMA.Cnt.Hex & 0xFFFF) | (_Value<<16);
-		break;
-
-	case AR_DMA_CNT_L:
-		// Align count to the 32 byte boundary. Verified on real HW
-		g_arDMA.Cnt.Hex = ((g_arDMA.Cnt.Hex & 0xFFFF0000) | (_Value)) & ~31;
-		Do_ARAM_DMA();
-		break;
-
-	// AI
-	// This is the DMA that goes straight out the speaker.
-	case AUDIO_DMA_START_HI:
-		g_audioDMA.SourceAddress = (g_audioDMA.SourceAddress & 0xFFFF) | (_Value<<16);
-		break;
-
-	case AUDIO_DMA_START_LO:
-		g_audioDMA.SourceAddress = (g_audioDMA.SourceAddress & 0xFFFF0000) | (_Value);
-		break;
-
-	case AUDIO_DMA_CONTROL_LEN:			// called by AIStartDMA()
-		g_audioDMA.AudioDMAControl.Hex = _Value;
-		g_audioDMA.ReadAddress = g_audioDMA.SourceAddress;
-		g_audioDMA.BlocksLeft = g_audioDMA.AudioDMAControl.NumBlocks;
-		INFO_LOG(DSPINTERFACE, "AID DMA started - source address %08x, length %i blocks", g_audioDMA.SourceAddress, g_audioDMA.AudioDMAControl.NumBlocks);
-		break;
-
-	case AUDIO_DMA_BLOCKS_LEFT:
-		_dbg_assert_(DSPINTERFACE,0);
-		break;
-
-	default:
-		_dbg_assert_(DSPINTERFACE,0);
-		break;
-	}
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	INFO_LOG(DSPINTERFACE, "DSPInterface(r32) 0x%08x", _iAddress);
-
-	switch (_iAddress & 0xFFFF)
-	{
-		// DSP
-	case DSP_MAIL_TO_DSP_HI:
-		_uReturnValue = (dsp_emulator->DSP_ReadMailBoxHigh(true) << 16) | dsp_emulator->DSP_ReadMailBoxLow(true);
-		break;
-
-		// AI
-	case AUDIO_DMA_START_HI:
-		_uReturnValue = g_audioDMA.SourceAddress;
-		break;
-
-		// ARAM
-	case AR_DMA_ARADDR_H:
-		_uReturnValue = g_arDMA.ARAddr;
-		break;
-
-	case AR_DMA_CNT_H:
-		_uReturnValue = g_arDMA.Cnt.Hex;
-		break;
-	
-	case AR_DMA_MMADDR_H:
-		_uReturnValue = g_arDMA.MMAddr;
-		break;
-
-	default:
-		_uReturnValue = 0;
-		_dbg_assert_(DSPINTERFACE,0);
-		break;
-	}
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	INFO_LOG(DSPINTERFACE, "DSPInterface(w32) 0x%08x 0x%08x", _iValue, _iAddress);
-
-	switch (_iAddress & 0xFFFF)
-	{
-		// DSP
-	case DSP_MAIL_TO_DSP_HI:
-		dsp_emulator->DSP_WriteMailBoxHigh(true, _iValue >> 16);
-		dsp_emulator->DSP_WriteMailBoxLow(true, (u16)_iValue);
-		break;
-
-		// AI
-	case AUDIO_DMA_START_HI:
-		g_audioDMA.SourceAddress = _iValue;
-		break;
-
-		// ARAM
-	case AR_DMA_MMADDR_H:
-		g_arDMA.MMAddr = _iValue & ~31;
-		break;
-
-	case AR_DMA_ARADDR_H:
-		g_arDMA.ARAddr = _iValue & ~31;
-		break;
-
-	case AR_DMA_CNT_H:   
-		g_arDMA.Cnt.Hex = _iValue & ~31;
-		Do_ARAM_DMA();
-		break;
-
-	default:
-		_dbg_assert_(DSPINTERFACE,0);
-		break;
-	}
-}
-
-
-// UpdateInterrupts
-void UpdateInterrupts()
-{
-	if ((g_dspState.DSPControl.AID  & g_dspState.DSPControl.AID_mask) ||
-		(g_dspState.DSPControl.ARAM & g_dspState.DSPControl.ARAM_mask) ||
-		(g_dspState.DSPControl.DSP  & g_dspState.DSPControl.DSP_mask))
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DSP, true);
-	}
-	else
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DSP, false);
-	}
-}
-
-void GenerateDSPInterrupt(DSPInterruptType type, bool _bSet)
-{
-	switch (type)
-	{
-	case INT_DSP:	g_dspState.DSPControl.DSP		= _bSet ? 1 : 0; break;
-	case INT_ARAM:	g_dspState.DSPControl.ARAM		= _bSet ? 1 : 0; if (_bSet) g_dspState.DSPControl.DMAState = 0; break;
-	case INT_AID:	g_dspState.DSPControl.AID		= _bSet ? 1 : 0; break;
-	}
-
-	UpdateInterrupts();
-}
-
-// CALLED FROM DSP EMULATOR, POSSIBLY THREADED
-void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type, bool _bSet)
-{
-	CoreTiming::ScheduleEvent_Threadsafe(
-		0, et_GenerateDSPInterrupt, type | (_bSet<<16));
-	CoreTiming::ForceExceptionCheck(100);
-}
-
-// called whenever SystemTimers thinks the dsp deserves a few more cycles
-void UpdateDSPSlice(int cycles)
-{
-	if (dsp_is_lle)
-	{
-		//use up the rest of the slice(if any)
-		dsp_emulator->DSP_Update(dsp_slice);
-		dsp_slice %= 6;
-		//note the new budget
-		dsp_slice += cycles;
-	}
-	else
-	{
-		dsp_emulator->DSP_Update(cycles);
-	}
-}
-
-// This happens at 4 khz, since 32 bytes at 4khz = 4 bytes at 32 khz (16bit stereo pcm)
-void UpdateAudioDMA()
-{
-	if (g_audioDMA.AudioDMAControl.Enable && g_audioDMA.BlocksLeft)
-	{
-		// Read audio at g_audioDMA.ReadAddress in RAM and push onto an
-		// external audio fifo in the emulator, to be mixed with the disc
-		// streaming output. If that audio queue fills up, we delay the
-		// emulator.
-		
-		g_audioDMA.BlocksLeft--;
-		g_audioDMA.ReadAddress += 32;
-
-		if (g_audioDMA.BlocksLeft == 0)
-		{
-			dsp_emulator->DSP_SendAIBuffer(g_audioDMA.SourceAddress, 8*g_audioDMA.AudioDMAControl.NumBlocks);
-			GenerateDSPInterrupt(DSP::INT_AID);
-			g_audioDMA.BlocksLeft = g_audioDMA.AudioDMAControl.NumBlocks;
-			g_audioDMA.ReadAddress = g_audioDMA.SourceAddress;
-		}
-	}
-	else
-	{
-		// Send silence. Yeah, it's a bit of a waste to sample rate convert
-		// silence.  or hm. Maybe we shouldn't do this :)
-		dsp_emulator->DSP_SendAIBuffer(0, AudioInterface::GetAIDSampleRate());
-	}
-}
-
-void Do_ARAM_DMA()
-{
-	if (g_arDMA.Cnt.count == 32)
-	{
-		// Beyond Good and Evil (GGEE41) sends count 32
-		// Lost Kingdoms 2 needs the exception check here in DSP HLE mode
-		GenerateDSPInterrupt(INT_ARAM);
-		CoreTiming::ForceExceptionCheck(100);
-	}
-	else
-	{
-		g_dspState.DSPControl.DMAState = 1;
-		CoreTiming::ScheduleEvent_Threadsafe(0, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
-
-		// Force an early exception check on large transfers. Fixes RE2 audio.
-		// NFS:HP2 (<= 6144)
-		// Viewtiful Joe (<= 6144)
-		// Sonic Mega Collection (> 2048)
-		// Paper Mario battles (> 32)
-		// Mario Super Baseball (> 32)
-		// Knockout Kings 2003 loading (> 32)
-		// WWE DOR (> 32)
-		if (g_arDMA.Cnt.count > 2048 && g_arDMA.Cnt.count <= 6144)
-			CoreTiming::ForceExceptionCheck(100);
-	}
-
-	// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
-	if (g_arDMA.Cnt.dir)
-	{
-		// ARAM -> MRAM
-		INFO_LOG(DSPINTERFACE, "DMA %08x bytes from ARAM %08x to MRAM %08x PC: %08x",
-			g_arDMA.Cnt.count, g_arDMA.ARAddr, g_arDMA.MMAddr, PC);
-
-		// Outgoing data from ARAM is mirrored every 64MB (verified on real HW)
-		g_arDMA.ARAddr &= 0x3ffffff;
-		g_arDMA.MMAddr &= 0x3ffffff;
-
-		if (g_arDMA.ARAddr < g_ARAM.size)
-		{
-			while (g_arDMA.Cnt.count)
-			{
-				// These are logically seperated in code to show that a memory map has been set up
-				// See below in the write section for more information
-				if ((g_ARAM_Info.Hex & 0xf) == 3)
-				{
-					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
-				}
-				else if ((g_ARAM_Info.Hex & 0xf) == 4)
-				{
-					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
-				}
-				else
-				{
-					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
-				}
-
-				g_arDMA.MMAddr += 8;
-				g_arDMA.ARAddr += 8;
-				g_arDMA.Cnt.count -= 8;
-			}
-		}
-		else
-		{
-			// Assuming no external ARAM installed; returns zeroes on out of bounds reads (verified on real HW)
-			while (g_arDMA.Cnt.count)
-			{
-				Memory::Write_U64(0, g_arDMA.MMAddr);
-				g_arDMA.MMAddr += 8;
-				g_arDMA.ARAddr += 8;
-				g_arDMA.Cnt.count -= 8;
-			}
-		}
-	}
-	else
-	{
-		// MRAM -> ARAM
-		INFO_LOG(DSPINTERFACE, "DMA %08x bytes from MRAM %08x to ARAM %08x PC: %08x",
-			g_arDMA.Cnt.count, g_arDMA.MMAddr, g_arDMA.ARAddr, PC);
-
-		// Incoming data into ARAM is mirrored every 64MB (verified on real HW)
-		g_arDMA.ARAddr &= 0x3ffffff;
-		g_arDMA.MMAddr &= 0x3ffffff;
-
-		if (g_arDMA.ARAddr < g_ARAM.size)
-		{
-			while (g_arDMA.Cnt.count)
-			{
-				if ((g_ARAM_Info.Hex & 0xf) == 3)
-				{
-					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
-				}
-				else if ((g_ARAM_Info.Hex & 0xf) == 4)
-				{
-					if (g_arDMA.ARAddr < 0x400000)
-					{
-						*(u64*)&g_ARAM.ptr[(g_arDMA.ARAddr + 0x400000) & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
-					}
-					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
-				}
-				else
-				{
-					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
-				}
-
-				g_arDMA.MMAddr += 8;
-				g_arDMA.ARAddr += 8;
-				g_arDMA.Cnt.count -= 8;
-			}
-		}
-		else
-		{
-			// Assuming no external ARAM installed; writes nothing to ARAM when out of bounds (verified on real HW)
-			g_arDMA.MMAddr += g_arDMA.Cnt.count;
-			g_arDMA.ARAddr += g_arDMA.Cnt.count;
-			g_arDMA.Cnt.count = 0;
-		}
-	}
-}
-
-// (shuffle2) I still don't believe that this hack is actually needed... :(
-// Maybe the wii sports ucode is processed incorrectly?
-// (LM) It just means that dsp reads via '0xffdd' on WII can end up in EXRAM or main RAM
-u8 ReadARAM(u32 _iAddress)
-{
-	//NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x", _iAddress);
-	if (g_ARAM.wii_mode)
-	{	
-		if (_iAddress & 0x10000000)
-			return g_ARAM.ptr[_iAddress & g_ARAM.mask];
-		else 
-			return Memory::Read_U8(_iAddress & Memory::RAM_MASK);
-	}
-	else
-	{
-		return g_ARAM.ptr[_iAddress & g_ARAM.mask];
-	}
-}
-
-void WriteARAM(u8 value, u32 _uAddress)
-{
-	//NOTICE_LOG(DSPINTERFACE, "WriteARAM 0x%08x", _uAddress);
-	//TODO: verify this on WII
-	g_ARAM.ptr[_uAddress & g_ARAM.mask] = value;
-}
-
-u8 *GetARAMPtr()
-{
-	return g_ARAM.ptr;
-}
-
-} // end of namespace DSP
-
diff --git a/Source/Core/Core/Src/HW/DSP.h b/Source/Core/Core/Src/HW/DSP.h
deleted file mode 100644
index 68d83edabb..0000000000
--- a/Source/Core/Core/Src/HW/DSP.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPINTERFACE_H
-#define _DSPINTERFACE_H
-
-#include "Common.h"
-class PointerWrap;
-class DSPEmulator;
-
-namespace DSP
-{
-
-enum DSPInterruptType
-{
-	INT_DSP		= 0,
-	INT_ARAM	= 1,
-	INT_AID		= 2
-};
-
-// aram size and mask
-enum
-{
-	ARAM_SIZE	= 0x01000000,	// 16 MB
-	ARAM_MASK	= 0x00FFFFFF,
-};
-
-void Init(bool hle);
-void Shutdown();
-
-DSPEmulator *GetDSPEmulator();
-
-void DoState(PointerWrap &p);
-
-void GenerateDSPInterrupt(DSPInterruptType _DSPInterruptType, bool _bSet = true);
-void GenerateDSPInterruptFromDSPEmu(DSPInterruptType _DSPInterruptType, bool _bSet = true);
-
-// Read32
-void Read16(u16& _uReturnValue, const u32 _uAddress);
-void Read32(u32& _uReturnValue, const u32 _uAddress);	
-
-// Write
-void Write16(const u16 _uValue, const u32 _uAddress);
-void Write32(const u32 _uValue, const u32 _uAddress);
-
-// Audio/DSP Helper
-u8 ReadARAM(const u32 _uAddress);
-void WriteARAM(u8 value, u32 _uAddress);
-
-// Debugger Helper
-u8* GetARAMPtr();
-
-void UpdateAudioDMA();
-void UpdateDSPSlice(int cycles);
-
-}// end of namespace DSP
-
-#endif
-
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
deleted file mode 100644
index 71c43a0302..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <iostream>
-
-#include "ChunkFile.h"
-#include "IniFile.h"
-#include "HLEMixer.h"
-#include "StringUtil.h"
-#include "LogManager.h"
-#include "IniFile.h"
-#include "DSPHLE.h"
-#include "UCodes/UCodes.h"
-#include "../AudioInterface.h"
-#include "ConfigManager.h"
-#include "Core.h"
-#include "HW/SystemTimers.h"
-#include "HW/VideoInterface.h"
-
-DSPHLE::DSPHLE()
-{
-	m_InitMixer = false;
-	soundStream = NULL;
-}
-
-// Mailbox utility
-struct DSPState
-{
-	u32 CPUMailbox;
-	u32 DSPMailbox;
-
-	void Reset()
-	{
-		CPUMailbox = 0x00000000;
-		DSPMailbox = 0x00000000;
-	}
-
-	DSPState()
-	{
-		Reset();
-	}
-};
-
-bool DSPHLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
-{
-	m_hWnd = hWnd;
-	m_bWii = bWii;
-	m_pUCode = NULL;
-	m_lastUCode = NULL;
-	m_bHalt = false;
-	m_bAssertInt = false;
-
-	SetUCode(UCODE_ROM);
-	m_DSPControl.DSPHalt = 1;
-	m_DSPControl.DSPInit = 1;
-
-	m_InitMixer = false;
-	m_dspState.Reset();
-
-	return true;
-}
-
-void DSPHLE::DSP_StopSoundStream()
-{
-}
-
-void DSPHLE::Shutdown()
-{
-	AudioCommon::ShutdownSoundStream();
-}
-
-void DSPHLE::DSP_Update(int cycles)
-{
-	// This is called OFTEN - better not do anything expensive!
-	// ~1/6th as many cycles as the period PPC-side.
-	if (m_pUCode != NULL)
-		m_pUCode->Update(cycles / 6);
-}
-
-u32 DSPHLE::DSP_UpdateRate()
-{
-	// AX HLE uses 3ms (Wii) or 5ms (GC) timing period
-	int fields = VideoInterface::GetNumFields();
-	if (m_pUCode != NULL)
-		return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs() / fields;
-	else
-		return SystemTimers::GetTicksPerSecond() / 1000;
-}
-
-void DSPHLE::SendMailToDSP(u32 _uMail)
-{
-	if (m_pUCode != NULL) {
-		DEBUG_LOG(DSP_MAIL, "CPU writes 0x%08x", _uMail);
-		m_pUCode->HandleMail(_uMail);
-	}
-}
-
-IUCode* DSPHLE::GetUCode()
-{
-	return m_pUCode;
-}
-
-void DSPHLE::SetUCode(u32 _crc)
-{
-	delete m_pUCode;
-
-	m_pUCode = NULL;
-	m_MailHandler.Clear();
-	m_pUCode = UCodeFactory(_crc, this, m_bWii);
-}
-
-// TODO do it better?
-// Assumes that every odd call to this func is by the persistent ucode.
-// Even callers are deleted.
-void DSPHLE::SwapUCode(u32 _crc)
-{
-	m_MailHandler.Clear();
-
-	if (m_lastUCode == NULL)
-	{
-		m_lastUCode = m_pUCode;
-		m_pUCode = UCodeFactory(_crc, this, m_bWii);
-	}
-	else
-	{
-		delete m_pUCode;
-		m_pUCode = m_lastUCode;
-		m_lastUCode = NULL;
-	}
-}
-
-void DSPHLE::DoState(PointerWrap &p)
-{
-	bool isHLE = true;
-	p.Do(isHLE);
-	if (isHLE != true && p.GetMode() == PointerWrap::MODE_READ)
-	{
-		Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000);
-		p.SetMode(PointerWrap::MODE_VERIFY);
-		return;
-	}
-	bool prevInitMixer = m_InitMixer;
-	p.Do(m_InitMixer);
-	if (prevInitMixer != m_InitMixer && p.GetMode() == PointerWrap::MODE_READ)
-	{
-		if (m_InitMixer)
-		{
-			InitMixer();
-			AudioCommon::PauseAndLock(true);
-		}
-		else
-		{
-			AudioCommon::PauseAndLock(false);
-			soundStream->Stop();
-			delete soundStream;
-			soundStream = NULL;
-		}
-	}
-
-	p.DoPOD(m_DSPControl);
-	p.DoPOD(m_dspState);
-
-	int ucode_crc = IUCode::GetCRC(m_pUCode);
-	int ucode_crc_beforeLoad = ucode_crc;
-	int lastucode_crc = IUCode::GetCRC(m_lastUCode);
-	int lastucode_crc_beforeLoad = lastucode_crc;
-
-	p.Do(ucode_crc);
-	p.Do(lastucode_crc);
-
-	// if a different type of ucode was being used when the savestate was created,
-	// we have to reconstruct the old type of ucode so that we have a valid thing to call DoState on.
-	IUCode*     ucode =     (ucode_crc ==     ucode_crc_beforeLoad) ?    m_pUCode : UCodeFactory(    ucode_crc, this, m_bWii);
-	IUCode* lastucode = (lastucode_crc != lastucode_crc_beforeLoad) ? m_lastUCode : UCodeFactory(lastucode_crc, this, m_bWii);
-
-	if (ucode)
-		ucode->DoState(p);
-	if (lastucode)
-		lastucode->DoState(p);
-
-	// if a different type of ucode was being used when the savestate was created,
-	// discard it if we're not loading, otherwise discard the old one and keep the new one.
-	if (ucode != m_pUCode)
-	{
-		if (p.GetMode() != PointerWrap::MODE_READ)
-		{
-			delete ucode;
-		}
-		else
-		{
-			delete m_pUCode;
-			m_pUCode = ucode;
-		}
-	}
-	if (lastucode != m_lastUCode)
-	{
-		if (p.GetMode() != PointerWrap::MODE_READ)
-		{
-			delete lastucode;
-		}
-		else
-		{
-			delete m_lastUCode;
-			m_lastUCode = lastucode;
-		}
-	}
-
-	m_MailHandler.DoState(p);
-}
-
-// Mailbox fuctions
-unsigned short DSPHLE::DSP_ReadMailBoxHigh(bool _CPUMailbox)
-{
-	if (_CPUMailbox)
-	{
-		return (m_dspState.CPUMailbox >> 16) & 0xFFFF;
-	}
-	else
-	{
-		return AccessMailHandler().ReadDSPMailboxHigh();
-	}
-}
-
-unsigned short DSPHLE::DSP_ReadMailBoxLow(bool _CPUMailbox)
-{
-	if (_CPUMailbox)
-	{
-		return m_dspState.CPUMailbox & 0xFFFF;
-	}
-	else
-	{
-		return AccessMailHandler().ReadDSPMailboxLow();
-	}
-}
-
-void DSPHLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short _Value)
-{
-	if (_CPUMailbox)
-	{
-		m_dspState.CPUMailbox = (m_dspState.CPUMailbox & 0xFFFF) | (_Value << 16);
-	}
-	else
-	{
-		PanicAlert("CPU can't write %08x to DSP mailbox", _Value);
-	}
-}
-
-void DSPHLE::DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short _Value)
-{
-	if (_CPUMailbox)
-	{
-		m_dspState.CPUMailbox = (m_dspState.CPUMailbox & 0xFFFF0000) | _Value;
-		SendMailToDSP(m_dspState.CPUMailbox);
-		// Mail sent so clear MSB to show that it is progressed
-		m_dspState.CPUMailbox &= 0x7FFFFFFF; 
-	}
-	else
-	{
-		PanicAlert("CPU can't write %08x to DSP mailbox", _Value);
-	}
-}
-
-void DSPHLE::InitMixer()
-{
-	unsigned int AISampleRate, DACSampleRate;
-	AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate);
-	delete soundStream;
-	soundStream = AudioCommon::InitSoundStream(new HLEMixer(this, AISampleRate, DACSampleRate, 48000), m_hWnd);
-	if(!soundStream) PanicAlert("Error starting up sound stream");
-	// Mixer is initialized
-	m_InitMixer = true;
-}
-
-// Other DSP fuctions
-u16 DSPHLE::DSP_WriteControlRegister(unsigned short _Value)
-{
-	UDSPControl Temp(_Value);
-	if (!m_InitMixer)
-	{
-		if (!Temp.DSPHalt)
-		{
-			InitMixer();
-		}
-	}
-
-	if (Temp.DSPReset)
-	{
-		SetUCode(UCODE_ROM);
-		Temp.DSPReset = 0;
-	}
-	if (Temp.DSPInit == 0)
-	{
-		// copy 128 byte from ARAM 0x000000 to IMEM
-		SetUCode(UCODE_INIT_AUDIO_SYSTEM);
-		Temp.DSPInitCode = 0;
-	}
-
-	m_DSPControl.Hex = Temp.Hex;
-	return m_DSPControl.Hex;
-}
-
-u16 DSPHLE::DSP_ReadControlRegister()
-{
-	return m_DSPControl.Hex;
-}
-
-
-// The reason that we don't disable this entire
-// function when Other Audio is disabled is that then we can't turn it back on
-// again once the game has started.
-void DSPHLE::DSP_SendAIBuffer(unsigned int address, unsigned int num_samples)
-{
-	if (!soundStream)
-		return;
-
-	CMixer* pMixer = soundStream->GetMixer();
-
-	if (pMixer && address)
-	{
-		short* samples = (short*)HLEMemory_Get_Pointer(address);
-		pMixer->PushSamples(samples, num_samples);
-	}
-
-	soundStream->Update();
-}
-
-void DSPHLE::DSP_ClearAudioBuffer(bool mute)
-{
-	if (soundStream)
-		soundStream->Clear(mute);
-}
-
-void DSPHLE::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	if (doLock || unpauseOnUnlock)
-		DSP_ClearAudioBuffer(doLock); 
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
deleted file mode 100644
index f53d4f7d1b..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPHLE_H
-#define _DSPHLE_H
-
-#include "AudioCommon.h"
-#include "SoundStream.h"
-#include "MailHandler.h"
-#include "../../DSPEmulator.h"
-
-class IUCode;
-
-class DSPHLE : public DSPEmulator {
-public:
-	DSPHLE();
-
-	virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread);
-	virtual void Shutdown();
-	virtual bool IsLLE() { return false; }
-
-	virtual void DoState(PointerWrap &p);
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-
-	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
-	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);
-	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox);
-	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox);
-	virtual unsigned short DSP_ReadControlRegister();
-	virtual unsigned short DSP_WriteControlRegister(unsigned short);
-	virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples);
-	virtual void DSP_Update(int cycles);
-	virtual void DSP_StopSoundStream();
-	virtual void DSP_ClearAudioBuffer(bool mute);
-	virtual u32 DSP_UpdateRate();
-
-	CMailHandler& AccessMailHandler() { return m_MailHandler; }
-
-	// Formerly DSPHandler
-	IUCode *GetUCode();
-	void SetUCode(u32 _crc);
-	void SwapUCode(u32 _crc);
-
-private:
-	void SendMailToDSP(u32 _uMail);
-	void InitMixer();
-
-	// Declarations and definitions
-	void *m_hWnd;
-	bool m_bWii;
-	
-	bool m_InitMixer;
-
-	// Fake mailbox utility
-	struct DSPState
-	{
-		u32 CPUMailbox;
-		u32 DSPMailbox;
-
-		void Reset()
-		{
-			CPUMailbox = 0x00000000;
-			DSPMailbox = 0x00000000;
-		}
-
-		DSPState()
-		{
-			Reset();
-		}
-	};
-	DSPState m_dspState;
-
-	IUCode* m_pUCode;
-	IUCode* m_lastUCode;
-
-	UDSPControl m_DSPControl;
-	CMailHandler m_MailHandler;
-
-	bool m_bHalt;
-	bool m_bAssertInt;
-};
-
-#endif  // _DSPHLE_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
deleted file mode 100644
index 3b4e53c735..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPHLE.h"
-#include "HLEMixer.h"
-#include "UCodes/UCodes.h"
-
-void HLEMixer::Premix(short *samples, unsigned int numSamples)
-{
-	// if this was called directly from the HLE
-	if (IsHLEReady())
-	{
-		IUCode *pUCode = m_DSPHLE->GetUCode();
-		if (pUCode && samples)
-			pUCode->MixAdd(samples, numSamples);
-	}
-}
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
deleted file mode 100644
index 3d0369d452..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef HLEMIXER_H
-#define HLEMIXER_H
-#include "AudioCommon.h"
-#include "Mixer.h"
-
-class DSPHLE;
-
-class HLEMixer : public CMixer 
-{
-public:
-	HLEMixer(DSPHLE *dsp_hle, unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000)
-		: CMixer(AISampleRate, DACSampleRate, BackendSampleRate), m_DSPHLE(dsp_hle) {};
-	
-	virtual void Premix(short *samples, unsigned int numSamples);
-private:
-	DSPHLE *m_DSPHLE;
-};
-
-#endif // HLEMIXER_H
-
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h b/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h
deleted file mode 100644
index efc512012f..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _MAILHANDLER_H
-#define _MAILHANDLER_H
-
-#include <queue>
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-class CMailHandler
-{
-public:
-	CMailHandler();
-	~CMailHandler();
-
-	void PushMail(u32 _Mail);
-	void Clear();
-	void Halt(bool _Halt);
-	void DoState(PointerWrap &p);
-	bool IsEmpty();
-
-	u16 ReadDSPMailboxHigh();
-	u16 ReadDSPMailboxLow();
-
-	u32 GetNextMail()
-	{ 
-		if (m_Mails.size())
-		{
-			return m_Mails.front();
-		}
-		else
-		{
-			// WARN_LOG(DSPHLE, "GetNextMail: No mails");
-			return 0;
-		}
-	}
-
-private:
-	// mail handler
-	std::queue<u32> m_Mails;
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
deleted file mode 100644
index e82ce626c9..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
+++ /dev/null
@@ -1,775 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "UCode_AX.h"
-#include "../../DSP.h"
-#include "FileUtil.h"
-#include "ConfigManager.h"
-
-#define AX_GC
-#include "UCode_AX_Voice.h"
-
-CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
-	, m_work_available(false)
-	, m_cmdlist_size(0)
-	, m_run_on_thread(false)
-{
-	WARN_LOG(DSPHLE, "Instantiating CUCode_AX: crc=%08x", crc);
-	m_rMailHandler.PushMail(DSP_INIT);
-	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-
-	LoadResamplingCoefficients();
-
-	// DSP HLE on thread is always disabled because it causes audio
-	// issues/glitching (different timing characteristics). m_run_on_thread is
-	// always false.
-	if (m_run_on_thread)
-		m_axthread = std::thread(SpawnAXThread, this);
-}
-
-CUCode_AX::~CUCode_AX()
-{
-	if (m_run_on_thread)
-	{
-		m_cmdlist_size = (u16)-1;	// Special value to signal end
-		NotifyAXThread();
-		m_axthread.join();
-	}
-
-	m_rMailHandler.Clear();
-}
-
-void CUCode_AX::LoadResamplingCoefficients()
-{
-	m_coeffs_available = false;
-
-	std::string filenames[] = {
-		File::GetUserPath(D_GCUSER_IDX) + "dsp_coef.bin",
-		File::GetSysDirectory() + "/GC/dsp_coef.bin"
-	};
-
-	size_t fidx;
-	std::string filename;
-	for (fidx = 0; fidx < sizeof (filenames) / sizeof (filenames[0]); ++fidx)
-	{
-		filename = filenames[fidx];
-		if (!File::Exists(filename))
-			continue;
-
-		if (File::GetSize(filename) != 0x1000)
-			continue;
-
-		break;
-	}
-
-	if (fidx >= sizeof (filenames) / sizeof (filenames[0]))
-		return;
-
-	WARN_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
-
-	File::IOFile fp(filename, "rb");
-	fp.ReadBytes(m_coeffs, 0x1000);
-
-	for (u32 i = 0; i < 0x800; ++i)
-		m_coeffs[i] = Common::swap16(m_coeffs[i]);
-
-	m_coeffs_available = true;
-}
-
-void CUCode_AX::SpawnAXThread(CUCode_AX* self)
-{
-	self->AXThread();
-}
-
-void CUCode_AX::AXThread()
-{
-	while (true)
-	{
-		{
-			std::unique_lock<std::mutex> lk(m_cmdlist_mutex);
-			while (m_cmdlist_size == 0)
-				m_cmdlist_cv.wait(lk);
-		}
-
-		if (m_cmdlist_size == (u16)-1)	// End of thread signal
-			break;
-
-		m_processing.lock();
-		HandleCommandList();
-		m_cmdlist_size = 0;
-		SignalWorkEnd();
-		m_processing.unlock();
-	}
-}
-
-void CUCode_AX::SignalWorkEnd()
-{
-	// Signal end of processing
-	m_rMailHandler.PushMail(DSP_YIELD);
-	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-}
-
-void CUCode_AX::NotifyAXThread()
-{
-	std::unique_lock<std::mutex> lk(m_cmdlist_mutex);
-	m_cmdlist_cv.notify_one();
-}
-
-void CUCode_AX::StartWorking()
-{
-	if (m_run_on_thread)
-		NotifyAXThread();
-	else
-		m_work_available = true;
-}
-
-void CUCode_AX::HandleCommandList()
-{
-	// Temp variables for addresses computation
-	u16 addr_hi, addr_lo;
-	u16 addr2_hi, addr2_lo;
-	u16 size;
-
-	u32 pb_addr = 0;
-
-#if 0
-	WARN_LOG(DSPHLE, "Command list:");
-	for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
-		WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
-	WARN_LOG(DSPHLE, "-------------");
-#endif
-
-	u32 curr_idx = 0;
-	bool end = false;
-	while (!end)
-	{
-		u16 cmd = m_cmdlist[curr_idx++];
-
-		switch (cmd)
-		{
-			// Some of these commands are unknown, or unused in this AX HLE.
-			// We still need to skip their arguments using "curr_idx += N".
-
-			case CMD_SETUP:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				SetupProcessing(HILO_TO_32(addr));
-				break;
-
-			case CMD_DL_AND_VOL_MIX:
-			{
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				u16 vol_main = m_cmdlist[curr_idx++];
-				u16 vol_auxa = m_cmdlist[curr_idx++];
-				u16 vol_auxb = m_cmdlist[curr_idx++];
-				DownloadAndMixWithVolume(HILO_TO_32(addr), vol_main, vol_auxa, vol_auxb);
-				break;
-			}
-
-			case CMD_PB_ADDR:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				pb_addr = HILO_TO_32(addr);
-				break;
-
-			case CMD_PROCESS:
-				ProcessPBList(pb_addr);
-				break;
-
-			case CMD_MIX_AUXA:
-			case CMD_MIX_AUXB:
-				// These two commands are handled almost the same internally.
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				addr2_hi = m_cmdlist[curr_idx++];
-				addr2_lo = m_cmdlist[curr_idx++];
-				MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2));
-				break;
-
-			case CMD_UPLOAD_LRS:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				UploadLRS(HILO_TO_32(addr));
-				break;
-
-			case CMD_SET_LR:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				SetMainLR(HILO_TO_32(addr));
-				break;
-
-			case CMD_UNK_08: curr_idx += 10; break;	// TODO: check
-
-			case CMD_MIX_AUXB_NOWRITE:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				MixAUXSamples(false, 0, HILO_TO_32(addr));
-				break;
-
-			case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break;
-			case CMD_UNK_0B: break; // TODO: check other versions
-			case CMD_UNK_0C: break; // TODO: check other versions
-
-			case CMD_MORE:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				size = m_cmdlist[curr_idx++];
-
-				CopyCmdList(HILO_TO_32(addr), size);
-				curr_idx = 0;
-				break;
-
-			case CMD_OUTPUT:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				addr2_hi = m_cmdlist[curr_idx++];
-				addr2_lo = m_cmdlist[curr_idx++];
-				OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr));
-				break;
-
-			case CMD_END:
-				end = true;
-				break;
-
-			case CMD_MIX_AUXB_LR:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				addr2_hi = m_cmdlist[curr_idx++];
-				addr2_lo = m_cmdlist[curr_idx++];
-				MixAUXBLR(HILO_TO_32(addr), HILO_TO_32(addr2));
-				break;
-
-			case CMD_SET_OPPOSITE_LR:
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				SetOppositeLR(HILO_TO_32(addr));
-				break;
-
-			case CMD_UNK_12:
-			{
-				u16 samp_val = m_cmdlist[curr_idx++];
-				u16 idx = m_cmdlist[curr_idx++];
-				addr_hi = m_cmdlist[curr_idx++];
-				addr_lo = m_cmdlist[curr_idx++];
-				// TODO
-				// suppress warnings:
-				(void)samp_val; (void)idx;
-				break;
-			}
-
-			// Send the contents of MAIN LRS, AUXA LRS and AUXB S to RAM, and
-			// mix data to MAIN LR and AUXB LR.
-			case CMD_SEND_AUX_AND_MIX:
-			{
-				// Address for Main + AUXA LRS upload
-				u16 main_auxa_up_hi = m_cmdlist[curr_idx++];
-				u16 main_auxa_up_lo = m_cmdlist[curr_idx++];
-
-				// Address for AUXB S upload
-				u16 auxb_s_up_hi = m_cmdlist[curr_idx++];
-				u16 auxb_s_up_lo = m_cmdlist[curr_idx++];
-
-				// Address to read data for Main L
-				u16 main_l_dl_hi = m_cmdlist[curr_idx++];
-				u16 main_l_dl_lo = m_cmdlist[curr_idx++];
-
-				// Address to read data for Main R
-				u16 main_r_dl_hi = m_cmdlist[curr_idx++];
-				u16 main_r_dl_lo = m_cmdlist[curr_idx++];
-
-				// Address to read data for AUXB L
-				u16 auxb_l_dl_hi = m_cmdlist[curr_idx++];
-				u16 auxb_l_dl_lo = m_cmdlist[curr_idx++];
-
-				// Address to read data for AUXB R
-				u16 auxb_r_dl_hi = m_cmdlist[curr_idx++];
-				u16 auxb_r_dl_lo = m_cmdlist[curr_idx++];
-
-				SendAUXAndMix(HILO_TO_32(main_auxa_up), HILO_TO_32(auxb_s_up),
-				              HILO_TO_32(main_l_dl), HILO_TO_32(main_r_dl),
-				              HILO_TO_32(auxb_l_dl), HILO_TO_32(auxb_r_dl));
-				break;
-			}
-
-			default:
-				ERROR_LOG(DSPHLE, "Unknown command in AX command list: %04x", cmd);
-				end = true;
-				break;
-		}
-	}
-}
-
-void CUCode_AX::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates)
-{
-	u32 start_idx = 0;
-	for (int i = 0; i < curr_ms; ++i)
-		start_idx += num_updates[i];
-
-	for (u32 i = start_idx; i < start_idx + num_updates[curr_ms]; ++i)
-	{
-		u16 update_off = Common::swap16(updates[2 * i]);
-		u16 update_val = Common::swap16(updates[2 * i + 1]);
-
-		pb[update_off] = update_val;
-	}
-}
-
-AXMixControl CUCode_AX::ConvertMixerControl(u32 mixer_control)
-{
-	u32 ret = 0;
-
-	// TODO: find other UCode versions with different mixer_control values
-	if (m_CRC == 0x4e8a8b21)
-	{
-		ret |= MIX_L | MIX_R;
-		if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R;
-		if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R;
-		if (mixer_control & 0x0004)
-		{
-			ret |= MIX_S;
-			if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S;
-			if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S;
-		}
-		if (mixer_control & 0x0008)
-		{
-			ret |= MIX_L_RAMP | MIX_R_RAMP;
-			if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
-			if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
-			if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP;
-			if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP;
-		}
-	}
-	else
-	{
-		if (mixer_control & 0x0001) ret |= MIX_L;
-		if (mixer_control & 0x0002) ret |= MIX_R;
-		if (mixer_control & 0x0004) ret |= MIX_S;
-		if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP;
-		if (mixer_control & 0x0010) ret |= MIX_AUXA_L;
-		if (mixer_control & 0x0020) ret |= MIX_AUXA_R;
-		if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
-		if (mixer_control & 0x0080) ret |= MIX_AUXA_S;
-		if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP;
-		if (mixer_control & 0x0200) ret |= MIX_AUXB_L;
-		if (mixer_control & 0x0400) ret |= MIX_AUXB_R;
-		if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
-		if (mixer_control & 0x1000) ret |= MIX_AUXB_S;
-		if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP;
-
-		// TODO: 0x4000 is used for Dolby Pro 2 sound mixing
-	}
-
-	return (AXMixControl)ret;
-}
-
-void CUCode_AX::SetupProcessing(u32 init_addr)
-{
-	u16 init_data[0x20];
-
-	for (u32 i = 0; i < 0x20; ++i)
-		init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
-
-	// List of all buffers we have to initialize
-	int* buffers[] = {
-		m_samples_left,
-		m_samples_right,
-		m_samples_surround,
-		m_samples_auxA_left,
-		m_samples_auxA_right,
-		m_samples_auxA_surround,
-		m_samples_auxB_left,
-		m_samples_auxB_right,
-		m_samples_auxB_surround
-	};
-
-	u32 init_idx = 0;
-	for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i)
-	{
-		s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
-		s16 delta = (s16)init_data[init_idx + 2];
-
-		init_idx += 3;
-
-		if (!init_val)
-		{
-			memset(buffers[i], 0, 5 * 32 * sizeof (int));
-		}
-		else
-		{
-			for (u32 j = 0; j < 32 * 5; ++j)
-			{
-				buffers[i][j] = init_val;
-				init_val += delta;
-			}
-		}
-	}
-}
-
-void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb)
-{
-	int* buffers_main[3] = { m_samples_left, m_samples_right, m_samples_surround };
-	int* buffers_auxa[3] = { m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround };
-	int* buffers_auxb[3] = { m_samples_auxB_left, m_samples_auxB_right, m_samples_auxB_surround };
-	int** buffers[3] = { buffers_main, buffers_auxa, buffers_auxb };
-	u16 volumes[3] = { vol_main, vol_auxa, vol_auxb };
-
-	for (u32 i = 0; i < 3; ++i)
-	{
-		int* ptr = (int*)HLEMemory_Get_Pointer(addr);
-		u16 volume = volumes[i];
-		for (u32 j = 0; j < 3; ++j)
-		{
-			int* buffer = buffers[i][j];
-			for (u32 k = 0; k < 5 * 32; ++k)
-			{
-				s64 sample = (s64)(s32)Common::swap32(*ptr++);
-				sample *= volume;
-				buffer[k] += (s32)(sample >> 15);
-			}
-		}
-	}
-}
-
-void CUCode_AX::ProcessPBList(u32 pb_addr)
-{
-	// Samples per millisecond. In theory DSP sampling rate can be changed from
-	// 32KHz to 48KHz, but AX always process at 32KHz.
-	const u32 spms = 32;
-
-	AXPB pb;
-
-	while (pb_addr)
-	{
-		AXBuffers buffers = {{
-			m_samples_left,
-			m_samples_right,
-			m_samples_surround,
-			m_samples_auxA_left,
-			m_samples_auxA_right,
-			m_samples_auxA_surround,
-			m_samples_auxB_left,
-			m_samples_auxB_right,
-			m_samples_auxB_surround
-		}};
-
-		if (!ReadPB(pb_addr, pb))
-			break;
-
-		u32 updates_addr = HILO_TO_32(pb.updates.data);
-		u16* updates = (u16*)HLEMemory_Get_Pointer(updates_addr);
-
-		for (int curr_ms = 0; curr_ms < 5; ++curr_ms)
-		{
-			ApplyUpdatesForMs(curr_ms, (u16*)&pb, pb.updates.num_updates, updates);
-
-			ProcessVoice(pb, buffers, spms, ConvertMixerControl(pb.mixer_control),
-			             m_coeffs_available ? m_coeffs : NULL);
-
-			// Forward the buffers
-			for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
-				buffers.ptrs[i] += spms;
-		}
-
-		WritePB(pb_addr, pb);
-		pb_addr = HILO_TO_32(pb.next_pb);
-	}
-}
-
-void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
-{
-	int* buffers[3] = { 0 };
-
-	switch (aux_id)
-	{
-	case 0:
-		buffers[0] = m_samples_auxA_left;
-		buffers[1] = m_samples_auxA_right;
-		buffers[2] = m_samples_auxA_surround;
-		break;
-
-	case 1:
-		buffers[0] = m_samples_auxB_left;
-		buffers[1] = m_samples_auxB_right;
-		buffers[2] = m_samples_auxB_surround;
-		break;
-	}
-
-	// First, we need to send the contents of our AUX buffers to the CPU.
-	if (write_addr)
-	{
-		int* ptr = (int*)HLEMemory_Get_Pointer(write_addr);
-		for (u32 i = 0; i < 3; ++i)
-			for (u32 j = 0; j < 5 * 32; ++j)
-				*ptr++ = Common::swap32(buffers[i][j]);
-	}
-
-	// Then, we read the new temp from the CPU and add to our current
-	// temp.
-	int* ptr = (int*)HLEMemory_Get_Pointer(read_addr);
-	for (u32 i = 0; i < 5 * 32; ++i)
-		m_samples_left[i] += (int)Common::swap32(*ptr++);
-	for (u32 i = 0; i < 5 * 32; ++i)
-		m_samples_right[i] += (int)Common::swap32(*ptr++);
-	for (u32 i = 0; i < 5 * 32; ++i)
-		m_samples_surround[i] += (int)Common::swap32(*ptr++);
-}
-
-void CUCode_AX::UploadLRS(u32 dst_addr)
-{
-	int buffers[3][5 * 32];
-
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		buffers[0][i] = Common::swap32(m_samples_left[i]);
-		buffers[1][i] = Common::swap32(m_samples_right[i]);
-		buffers[2][i] = Common::swap32(m_samples_surround[i]);
-	}
-	memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers));
-}
-
-void CUCode_AX::SetMainLR(u32 src_addr)
-{
-	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		int samp = (int)Common::swap32(*ptr++);
-		m_samples_left[i] = samp;
-		m_samples_right[i] = samp;
-		m_samples_surround[i] = 0;
-	}
-}
-
-void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr)
-{
-	int surround_buffer[5 * 32];
-
-	for (u32 i = 0; i < 5 * 32; ++i)
-		surround_buffer[i] = Common::swap32(m_samples_surround[i]);
-	memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer));
-
-	// 32 samples per ms, 5 ms, 2 channels
-	short buffer[5 * 32 * 2];
-
-	// Output samples clamped to 16 bits and interlaced RLRLRLRLRL...
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		int left  = m_samples_left[i];
-		int right = m_samples_right[i];
-
-		if (left < -32767)  left = -32767;
-		if (left > 32767)   left = 32767;
-		if (right < -32767) right = -32767;
-		if (right >  32767) right = 32767;
-
-		buffer[2 * i] = Common::swap16(right);
-		buffer[2 * i + 1] = Common::swap16(left);
-	}
-
-	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
-}
-
-void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr)
-{
-	// Upload AUXB L/R
-	int* ptr = (int*)HLEMemory_Get_Pointer(ul_addr);
-	for (u32 i = 0; i < 5 * 32; ++i)
-		*ptr++ = Common::swap32(m_samples_auxB_left[i]);
-	for (u32 i = 0; i < 5 * 32; ++i)
-		*ptr++ = Common::swap32(m_samples_auxB_right[i]);
-
-	// Mix AUXB L/R to MAIN L/R, and replace AUXB L/R
-	ptr = (int*)HLEMemory_Get_Pointer(dl_addr);
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		int samp = Common::swap32(*ptr++);
-		m_samples_auxB_left[i] = samp;
-		m_samples_left[i] += samp;
-	}
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		int samp = Common::swap32(*ptr++);
-		m_samples_auxB_right[i] = samp;
-		m_samples_right[i] += samp;
-	}
-}
-
-void CUCode_AX::SetOppositeLR(u32 src_addr)
-{
-	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
-	for (u32 i = 0; i < 5 * 32; ++i)
-	{
-		int inp = Common::swap32(*ptr++);
-		m_samples_left[i] = -inp;
-		m_samples_right[i] = inp;
-		m_samples_surround[i] = 0;
-	}
-}
-
-void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
-                              u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl)
-{
-	// Buffers to upload first
-	int* up_buffers[] = {
-		m_samples_auxA_left,
-		m_samples_auxA_right,
-		m_samples_auxA_surround
-	};
-
-	// Upload AUXA LRS
-	int* ptr = (int*)HLEMemory_Get_Pointer(main_auxa_up);
-	for (u32 i = 0; i < sizeof (up_buffers) / sizeof (up_buffers[0]); ++i)
-		for (u32 j = 0; j < 32 * 5; ++j)
-			*ptr++ = Common::swap32(up_buffers[i][j]);
-
-	// Upload AUXB S
-	ptr = (int*)HLEMemory_Get_Pointer(auxb_s_up);
-	for (u32 i = 0; i < 32 * 5; ++i)
-		*ptr++ = Common::swap32(m_samples_auxB_surround[i]);
-
-	// Download buffers and addresses
-	int* dl_buffers[] = {
-		m_samples_left,
-		m_samples_right,
-		m_samples_auxB_left,
-		m_samples_auxB_right
-	};
-	u32 dl_addrs[] = {
-		main_l_dl,
-		main_r_dl,
-		auxb_l_dl,
-		auxb_r_dl
-	};
-
-	// Download and mix
-	for (u32 i = 0; i < sizeof (dl_buffers) / sizeof (dl_buffers[0]); ++i)
-	{
-		int* dl_src = (int*)HLEMemory_Get_Pointer(dl_addrs[i]);
-		for (u32 j = 0; j < 32 * 5; ++j)
-			dl_buffers[i][j] += (int)Common::swap32(*dl_src++);
-	}
-}
-
-void CUCode_AX::HandleMail(u32 mail)
-{
-	// Indicates if the next message is a command list address.
-	static bool next_is_cmdlist = false;
-	static u16 cmdlist_size = 0;
-
-	bool set_next_is_cmdlist = false;
-
-	// Wait for DSP processing to be done before answering any mail. This is
-	// safe to do because it matches what the DSP does on real hardware: there
-	// is no interrupt when a mail from CPU is received.
-	m_processing.lock();
-
-	if (next_is_cmdlist)
-	{
-		CopyCmdList(mail, cmdlist_size);
-		StartWorking();
-		NotifyAXThread();
-	}
-	else if (m_UploadSetupInProgress)
-	{
-		PrepareBootUCode(mail);
-	}
-	else if (mail == MAIL_RESUME)
-	{
-		// Acknowledge the resume request
-		m_rMailHandler.PushMail(DSP_RESUME);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-	else if (mail == MAIL_NEW_UCODE)
-	{
-		soundStream->GetMixer()->SetHLEReady(false);
-		m_UploadSetupInProgress = true;
-	}
-	else if (mail == MAIL_RESET)
-	{
-		m_DSPHLE->SetUCode(UCODE_ROM);
-	}
-	else if (mail == MAIL_CONTINUE)
-	{
-		// We don't have to do anything here - the CPU does not wait for a ACK
-		// and sends a cmdlist mail just after.
-	}
-	else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST)
-	{
-		// A command list address is going to be sent next.
-		set_next_is_cmdlist = true;
-		cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK);
-	}
-	else
-	{
-		ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail);
-	}
-
-	m_processing.unlock();
-	next_is_cmdlist = set_next_is_cmdlist;
-}
-
-void CUCode_AX::CopyCmdList(u32 addr, u16 size)
-{
-	if (size >= (sizeof (m_cmdlist) / sizeof (u16)))
-	{
-		ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size);
-		return;
-	}
-
-	for (u32 i = 0; i < size; ++i, addr += 2)
-		m_cmdlist[i] = HLEMemory_Read_U16(addr);
-	m_cmdlist_size = size;
-}
-
-void CUCode_AX::MixAdd(short* out_buffer, int nsamples)
-{
-	// Should never be called: we do not set HLE as ready.
-	// We accurately send samples to RAM instead of directly to the mixer.
-}
-
-void CUCode_AX::Update(int cycles)
-{
-	// Used for UCode switching.
-	if (NeedsResumeMail())
-	{
-		m_rMailHandler.PushMail(DSP_RESUME);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-	else if (m_work_available)
-	{
-		HandleCommandList();
-		m_cmdlist_size = 0;
-		SignalWorkEnd();
-	}
-}
-
-u32 CUCode_AX::GetUpdateMs()
-{
-	return 5;
-}
-
-void CUCode_AX::DoAXState(PointerWrap& p)
-{
-	p.Do(m_cmdlist);
-	p.Do(m_cmdlist_size);
-
-	p.Do(m_samples_left);
-	p.Do(m_samples_right);
-	p.Do(m_samples_surround);
-	p.Do(m_samples_auxA_left);
-	p.Do(m_samples_auxA_right);
-	p.Do(m_samples_auxA_surround);
-	p.Do(m_samples_auxB_left);
-	p.Do(m_samples_auxB_right);
-	p.Do(m_samples_auxB_surround);
-}
-
-void CUCode_AX::DoState(PointerWrap& p)
-{
-	std::lock_guard<std::mutex> lk(m_processing);
-
-	DoStateShared(p);
-	DoAXState(p);
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
deleted file mode 100644
index 5af2daed12..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// High-level emulation for the AX Gamecube UCode.
-//
-// TODO:
-//  * Depop support
-//  * ITD support
-//  * Polyphase sample interpolation support (not very useful)
-//  * Dolby Pro 2 mixing with recent AX versions
-
-#ifndef _UCODE_AX_H
-#define _UCODE_AX_H
-
-#include "UCodes.h"
-#include "UCode_AXStructs.h"
-
-// We can't directly use the mixer_control field from the PB because it does
-// not mean the same in all AX versions. The AX UCode converts the
-// mixer_control value to an AXMixControl bitfield.
-enum AXMixControl
-{
-	MIX_L				= 0x000001,
-	MIX_L_RAMP			= 0x000002,
-	MIX_R				= 0x000004,
-	MIX_R_RAMP			= 0x000008,
-	MIX_S				= 0x000010,
-	MIX_S_RAMP			= 0x000020,
-
-	MIX_AUXA_L			= 0x000040,
-	MIX_AUXA_L_RAMP		= 0x000080,
-	MIX_AUXA_R			= 0x000100,
-	MIX_AUXA_R_RAMP		= 0x000200,
-	MIX_AUXA_S			= 0x000400,
-	MIX_AUXA_S_RAMP		= 0x000800,
-
-	MIX_AUXB_L			= 0x001000,
-	MIX_AUXB_L_RAMP		= 0x002000,
-	MIX_AUXB_R			= 0x004000,
-	MIX_AUXB_R_RAMP		= 0x008000,
-	MIX_AUXB_S			= 0x010000,
-	MIX_AUXB_S_RAMP		= 0x020000,
-
-	MIX_AUXC_L			= 0x040000,
-	MIX_AUXC_L_RAMP		= 0x080000,
-	MIX_AUXC_R			= 0x100000,
-	MIX_AUXC_R_RAMP		= 0x200000,
-	MIX_AUXC_S			= 0x400000,
-	MIX_AUXC_S_RAMP		= 0x800000
-};
-
-class CUCode_AX : public IUCode
-{
-public:
-	CUCode_AX(DSPHLE* dsp_hle, u32 crc);
-	virtual ~CUCode_AX();
-
-	virtual void HandleMail(u32 mail);
-	virtual void MixAdd(short* out_buffer, int nsamples);
-	virtual void Update(int cycles);
-	virtual void DoState(PointerWrap& p);
-	u32 GetUpdateMs();
-
-	// Needed because StdThread.h std::thread implem does not support member
-	// pointers. TODO(delroth): obsolete.
-	static void SpawnAXThread(CUCode_AX* self);
-
-protected:
-	enum MailType
-	{
-		MAIL_RESUME = 0xCDD10000,
-		MAIL_NEW_UCODE = 0xCDD10001,
-		MAIL_RESET = 0xCDD10002,
-		MAIL_CONTINUE = 0xCDD10003,
-
-		// CPU sends 0xBABE0000 | cmdlist_size to the DSP
-		MAIL_CMDLIST = 0xBABE0000,
-		MAIL_CMDLIST_MASK = 0xFFFF0000
-	};
-
-	// 32 * 5 because 32 samples per millisecond, for max 5 milliseconds.
-	int m_samples_left[32 * 5];
-	int m_samples_right[32 * 5];
-	int m_samples_surround[32 * 5];
-	int m_samples_auxA_left[32 * 5];
-	int m_samples_auxA_right[32 * 5];
-	int m_samples_auxA_surround[32 * 5];
-	int m_samples_auxB_left[32 * 5];
-	int m_samples_auxB_right[32 * 5];
-	int m_samples_auxB_surround[32 * 5];
-
-	// This flag is set if there is anything to process.
-	bool m_work_available;
-
-	// Volatile because it's set by HandleMail and accessed in
-	// HandleCommandList, which are running in two different threads.
-	volatile u16 m_cmdlist[512];
-	volatile u32 m_cmdlist_size;
-
-	bool m_run_on_thread;
-
-	// Sync objects
-	std::mutex m_processing;
-	std::condition_variable m_cmdlist_cv;
-	std::mutex m_cmdlist_mutex;
-
-	std::thread m_axthread;
-
-	// Table of coefficients for polyphase sample rate conversion.
-	// The coefficients aren't always available (they are part of the DSP DROM)
-	// so we also need to know if they are valid or not.
-	bool m_coeffs_available;
-	s16 m_coeffs[0x800];
-
-	void LoadResamplingCoefficients();
-
-	// Copy a command list from memory to our temp buffer
-	void CopyCmdList(u32 addr, u16 size);
-
-	// Convert a mixer_control bitfield to our internal representation for that
-	// value. Required because that bitfield has a different meaning in some
-	// versions of AX.
-	AXMixControl ConvertMixerControl(u32 mixer_control);
-
-	// Apply updates to a PB. Generic, used in AX GC and AX Wii.
-	void ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates);
-
-	// Signal that we should start handling a command list. Dispatches to the
-	// AX thread if using a thread, else just sets a boolean flag.
-	void StartWorking();
-
-	// Send a notification to the AX thread to tell it a new cmdlist addr is
-	// available for processing.
-	void NotifyAXThread();
-
-	void AXThread();
-
-	virtual void HandleCommandList();
-	void SignalWorkEnd();
-
-	void SetupProcessing(u32 init_addr);
-	void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb);
-	void ProcessPBList(u32 pb_addr);
-	void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr);
-	void UploadLRS(u32 dst_addr);
-	void SetMainLR(u32 src_addr);
-	void OutputSamples(u32 out_addr, u32 surround_addr);
-	void MixAUXBLR(u32 ul_addr, u32 dl_addr);
-	void SetOppositeLR(u32 src_addr);
-	void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
-	                   u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl);
-
-	// Handle save states for main AX.
-	void DoAXState(PointerWrap& p);
-
-private:
-	enum CmdType
-	{
-		CMD_SETUP = 0x00,
-		CMD_DL_AND_VOL_MIX = 0x01,
-		CMD_PB_ADDR = 0x02,
-		CMD_PROCESS = 0x03,
-		CMD_MIX_AUXA = 0x04,
-		CMD_MIX_AUXB = 0x05,
-		CMD_UPLOAD_LRS = 0x06,
-		CMD_SET_LR = 0x07,
-		CMD_UNK_08 = 0x08,
-		CMD_MIX_AUXB_NOWRITE = 0x09,
-		CMD_COMPRESSOR_TABLE_ADDR = 0x0A,
-		CMD_UNK_0B = 0x0B,
-		CMD_UNK_0C = 0x0C,
-		CMD_MORE = 0x0D,
-		CMD_OUTPUT = 0x0E,
-		CMD_END = 0x0F,
-		CMD_MIX_AUXB_LR = 0x10,
-		CMD_SET_OPPOSITE_LR = 0x11,
-		CMD_UNK_12 = 0x12,
-		CMD_SEND_AUX_AND_MIX = 0x13,
-	};
-};
-
-#endif // !_UCODE_AX_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h
deleted file mode 100644
index 54a7dce6e9..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h
+++ /dev/null
@@ -1,336 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_AX_STRUCTS_H
-#define _UCODE_AX_STRUCTS_H
-
-struct PBMixer
-{
-	u16 left;
-	u16 left_delta;
-	u16 right;
-	u16 right_delta;
-
-	u16 auxA_left;
-	u16 auxA_left_delta;
-	u16 auxA_right;
-	u16 auxA_right_delta;
-
-	u16 auxB_left;
-	u16 auxB_left_delta;
-	u16 auxB_right;
-	u16 auxB_right_delta;
-
-	u16 auxB_surround;
-	u16 auxB_surround_delta;
-	u16 surround;
-	u16 surround_delta;
-	u16 auxA_surround;
-	u16 auxA_surround_delta;
-};
-
-struct PBMixerWii
-{
-	// volume mixing values in .15, 0x8000 = ca. 1.0
-	u16 left;
-	u16 left_delta;
-	u16 right;
-	u16 right_delta;
-
-	u16 auxA_left;
-	u16 auxA_left_delta;
-	u16 auxA_right;
-	u16 auxA_right_delta;
-
-	u16 auxB_left;
-	u16 auxB_left_delta;
-	u16 auxB_right;
-	u16 auxB_right_delta;
-
-	// Note: the following elements usage changes a little in DPL2 mode
-	// TODO: implement and comment it in the mixer
-	u16 auxC_left;
-	u16 auxC_left_delta;
-	u16 auxC_right;
-	u16 auxC_right_delta;
-
-	u16 surround;
-	u16 surround_delta;
-	u16 auxA_surround;
-	u16 auxA_surround_delta;
-	u16 auxB_surround;
-	u16 auxB_surround_delta;
-	u16 auxC_surround;
-	u16 auxC_surround_delta;
-};
-
-struct PBMixerWM
-{
-	u16 main0;
-	u16 main0_delta;
-	u16 aux0;
-	u16 aux0_delta;
-
-	u16 main1;
-	u16 main1_delta;
-	u16 aux1;
-	u16 aux1_delta;
-
-	u16 main2;
-	u16 main2_delta;
-	u16 aux2;
-	u16 aux2_delta;
-
-	u16 main3;
-	u16 main3_delta;
-	u16 aux3;
-	u16 aux3_delta;
-};
-
-struct PBInitialTimeDelay
-{
-	u16 on;
-	u16 addrMemHigh;
-	u16 addrMemLow;
-	u16 offsetLeft;
-	u16 offsetRight;
-	u16 targetLeft;
-	u16 targetRight;
-};
-
-// Update data - read these each 1ms subframe and use them!
-// It seems that to provide higher time precisions for MIDI events, some games
-// use this thing to update the parameter blocks per 1ms sub-block (a block is 5ms).
-// Using this data should fix games that are missing MIDI notes.
-struct PBUpdates
-{
-	u16 num_updates[5];
-	u16 data_hi;  // These point to main RAM. Not sure about the structure of the data.
-	u16 data_lo;
-};
-
-// The DSP stores the final sample values for each voice after every frame of processing.
-// The values are then accumulated for all dropped voices, added to the next frame of audio,
-// and ramped down on a per-sample basis to provide a gentle "roll off."
-struct PBDpop
-{
-	s16 left;
-	s16 auxA_left;
-	s16 auxB_left;
-
-	s16 right;
-	s16 auxA_right;
-	s16 auxB_right;
-
-	s16 surround;
-	s16 auxA_surround;
-	s16 auxB_surround;
-};
-
-struct PBDpopWii
-{
-	s16 left;
-	s16 auxA_left;
-	s16 auxB_left;
-	s16 auxC_left;
-
-	s16 right;
-	s16 auxA_right;
-	s16 auxB_right;
-	s16 auxC_right;
-
-	s16 surround;
-	s16 auxA_surround;
-	s16 auxB_surround;
-	s16 auxC_surround;
-};
-
-struct PBDpopWM
-{
-	s16 main0;
-	s16 main1;
-	s16 main2;
-	s16 main3;
-
-	s16 aux0;
-	s16 aux1;
-	s16 aux2;
-	s16 aux3;
-};
-
-struct PBVolumeEnvelope
-{
-	u16 cur_volume;			// volume at start of frame
-	s16 cur_volume_delta;	// signed per sample delta (96 samples per frame)
-};
-
-struct PBUnknown2
-{
-	u16 unknown_reserved[3];
-};
-
-struct PBAudioAddr
-{
-	u16 looping;
-	u16 sample_format;
-	u16 loop_addr_hi;  // Start of loop (this will point to a shared "zero" buffer if one-shot mode is active)
-	u16 loop_addr_lo;
-	u16 end_addr_hi;   // End of sample (and loop), inclusive
-	u16 end_addr_lo;
-	u16 cur_addr_hi;
-	u16 cur_addr_lo;
-};
-
-struct PBADPCMInfo
-{
-	s16 coefs[16];
-	u16 gain;
-	u16 pred_scale;
-	s16 yn1;
-	s16 yn2;
-};
-
-struct PBSampleRateConverter
-{
-	// ratio = (f32)ratio * 0x10000;
-	// valid range is 1/512 to 4.0000
-	u16 ratio_hi; // integer part of sampling ratio
-	u16 ratio_lo; // fraction part of sampling ratio
-	u16 cur_addr_frac;
-	s16 last_samples[4];
-};
-
-struct PBSampleRateConverterWM
-{
-	u16 cur_addr_frac;
-	s16 last_samples[4];
-};
-
-struct PBADPCMLoopInfo
-{
-	u16 pred_scale;
-	u16 yn1;
-	u16 yn2;
-};
-
-struct PBLowPassFilter
-{
-	u16 enabled;
-	s16 yn1;
-	u16 a0;
-	u16 b0;
-};
-
-struct AXPB
-{
-	u16 next_pb_hi;
-	u16 next_pb_lo;
-	u16 this_pb_hi;
-	u16 this_pb_lo;
-
-	u16 src_type;     // Type of sample rate converter (none, ?, linear)
-	u16 coef_select;
-	u16 mixer_control;
-
-	u16 running;       // 1=RUN 0=STOP
-	u16 is_stream;     // 1 = stream, 0 = one shot
-
-	PBMixer mixer;
-	PBInitialTimeDelay initial_time_delay;  
-	PBUpdates updates;
-	PBDpop dpop;
-	PBVolumeEnvelope vol_env;
-	PBUnknown2 unknown3;
-	PBAudioAddr audio_addr;
-	PBADPCMInfo adpcm;
-	PBSampleRateConverter src;
-	PBADPCMLoopInfo adpcm_loop_info;
-	PBLowPassFilter lpf;
-
-	u16 padding[25];
-};
-
-struct PBBiquadFilter
-{
-
-	u16 on;		// on = 2, off = 0
-	u16 xn1;	// History data
-	u16 xn2;
-	u16 yn1;
-	u16 yn2;
-	u16 b0;		// Filter coefficients
-	u16 b1;
-	u16 b2;
-	u16 a1;
-	u16 a2;
-
-};
-
-union PBInfImpulseResponseWM
-{
-	PBLowPassFilter lpf;
-	PBBiquadFilter biquad;
-};
-
-struct AXPBWii
-{
-	u16 next_pb_hi;
-	u16 next_pb_lo;
-	u16 this_pb_hi;
-	u16 this_pb_lo;
-
-	u16 src_type;		// Type of sample rate converter (none, 4-tap, linear)
-	u16 coef_select;	// coef for the 4-tap src
-	u16 mixer_control_hi;
-	u16 mixer_control_lo;
-
-	u16 running;		// 1=RUN   0=STOP
-	u16 is_stream;		// 1 = stream, 0 = one shot
-
-	PBMixerWii mixer;
-	PBInitialTimeDelay initial_time_delay;
-	PBDpopWii dpop;
-	PBVolumeEnvelope vol_env;
-	PBAudioAddr audio_addr;
-	PBADPCMInfo adpcm;
-	PBSampleRateConverter src;
-	PBADPCMLoopInfo adpcm_loop_info;
-	PBLowPassFilter lpf;
-	PBBiquadFilter biquad;
-
-	// WIIMOTE :D
-	u16 remote;
-	u16 remote_mixer_control;
-
-	PBMixerWM remote_mixer;
-	PBDpopWM remote_dpop;
-	PBSampleRateConverterWM remote_src;
-	PBInfImpulseResponseWM remote_iir;
-
-	u16 pad[12]; // align us, captain! (32B)
-};
-
-// TODO: All these enums have changed a lot for wii
-enum
-{
-	AUDIOFORMAT_ADPCM = 0,
-	AUDIOFORMAT_PCM8  = 0x19,
-	AUDIOFORMAT_PCM16 = 0xA,
-};
-
-enum
-{
-	SRCTYPE_POLYPHASE = 0,
-	SRCTYPE_LINEAR  = 1,
-	SRCTYPE_NEAREST = 2,
-};
-
-// Both may be used at once
-enum
-{
-	FILTER_LOWPASS = 1,
-	FILTER_BIQUAD = 2,
-};
-
-#endif  // _UCODE_AX_STRUCTS_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
deleted file mode 100644
index a67d5538ee..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
+++ /dev/null
@@ -1,692 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "StringUtil.h"
-
-#include "../MailHandler.h"
-#include "Mixer.h"
-
-#include "UCodes.h"
-#include "UCode_AXStructs.h"
-#include "UCode_AXWii.h"
-
-#define AX_WII
-#include "UCode_AX_Voice.h"
-
-
-CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC)
-	: CUCode_AX(dsp_hle, l_CRC),
-	  m_last_main_volume(0x8000)
-{
-	for (int i = 0; i < 3; ++i)
-		m_last_aux_volumes[i] = 0x8000;
-	WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii");
-
-	m_old_axwii = (l_CRC == 0xfa450138);
-}
-
-CUCode_AXWii::~CUCode_AXWii()
-{
-}
-
-void CUCode_AXWii::HandleCommandList()
-{
-	// Temp variables for addresses computation
-	u16 addr_hi, addr_lo;
-	u16 addr2_hi, addr2_lo;
-	u16 volume;
-
-	u32 pb_addr = 0;
-
-//	WARN_LOG(DSPHLE, "Command list:");
-//	for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
-//		WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
-//	WARN_LOG(DSPHLE, "-------------");
-
-	u32 curr_idx = 0;
-	bool end = false;
-	while (!end)
-	{
-		u16 cmd = m_cmdlist[curr_idx++];
-
-		if (m_old_axwii)
-		{
-			switch (cmd)
-			{
-				// Some of these commands are unknown, or unused in this AX HLE.
-				// We still need to skip their arguments using "curr_idx += N".
-
-				case CMD_SETUP_OLD:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					SetupProcessing(HILO_TO_32(addr));
-					break;
-
-				case CMD_ADD_TO_LR_OLD:
-				case CMD_SUB_TO_LR_OLD:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR_OLD);
-					break;
-
-				case CMD_ADD_SUB_TO_LR_OLD:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					AddSubToLR(HILO_TO_32(addr));
-					break;
-
-				case CMD_PB_ADDR_OLD:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					pb_addr = HILO_TO_32(addr);
-					break;
-
-				case CMD_PROCESS_OLD:
-					ProcessPBList(pb_addr);
-					break;
-
-				case CMD_MIX_AUXA_OLD:
-				case CMD_MIX_AUXB_OLD:
-				case CMD_MIX_AUXC_OLD:
-					volume = m_cmdlist[curr_idx++];
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					addr2_hi = m_cmdlist[curr_idx++];
-					addr2_lo = m_cmdlist[curr_idx++];
-					MixAUXSamples(cmd - CMD_MIX_AUXA_OLD, HILO_TO_32(addr), HILO_TO_32(addr2), volume);
-					break;
-
-				case CMD_UPL_AUXA_MIX_LRSC_OLD:
-				case CMD_UPL_AUXB_MIX_LRSC_OLD:
-				{
-					volume = m_cmdlist[curr_idx++];
-					u32 addresses[6] = {
-						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
-						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
-						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
-						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
-						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
-						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
-					};
-					curr_idx += 12;
-					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC_OLD, addresses, volume);
-					break;
-				}
-
-				// TODO(delroth): figure this one out, it's used by almost every
-				// game I've tested so far.
-				case CMD_UNK_0B_OLD: curr_idx += 4; break;
-
-				case CMD_OUTPUT_OLD:
-				case CMD_OUTPUT_DPL2_OLD:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					addr2_hi = m_cmdlist[curr_idx++];
-					addr2_lo = m_cmdlist[curr_idx++];
-					OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), 0x8000,
-					             cmd == CMD_OUTPUT_DPL2_OLD);
-					break;
-
-				case CMD_WM_OUTPUT_OLD:
-				{
-					u32 addresses[4] = {
-						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
-						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
-						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
-						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
-					};
-					curr_idx += 8;
-					OutputWMSamples(addresses);
-					break;
-				}
-
-				case CMD_END_OLD:
-					end = true;
-					break;
-			}
-		}
-		else
-		{
-			switch (cmd)
-			{
-				// Some of these commands are unknown, or unused in this AX HLE.
-				// We still need to skip their arguments using "curr_idx += N".
-
-				case CMD_SETUP:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					SetupProcessing(HILO_TO_32(addr));
-					break;
-
-				case CMD_ADD_TO_LR:
-				case CMD_SUB_TO_LR:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR);
-					break;
-
-				case CMD_ADD_SUB_TO_LR:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					AddSubToLR(HILO_TO_32(addr));
-					break;
-
-				case CMD_PROCESS:
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					ProcessPBList(HILO_TO_32(addr));
-					break;
-
-				case CMD_MIX_AUXA:
-				case CMD_MIX_AUXB:
-				case CMD_MIX_AUXC:
-					volume = m_cmdlist[curr_idx++];
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					addr2_hi = m_cmdlist[curr_idx++];
-					addr2_lo = m_cmdlist[curr_idx++];
-					MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume);
-					break;
-
-				case CMD_UPL_AUXA_MIX_LRSC:
-				case CMD_UPL_AUXB_MIX_LRSC:
-				{
-					volume = m_cmdlist[curr_idx++];
-					u32 addresses[6] = {
-						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
-						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
-						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
-						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
-						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
-						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
-					};
-					curr_idx += 12;
-					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC, addresses, volume);
-					break;
-				}
-
-				// TODO(delroth): figure this one out, it's used by almost every
-				// game I've tested so far.
-				case CMD_UNK_0A: curr_idx += 4; break;
-
-				case CMD_OUTPUT:
-				case CMD_OUTPUT_DPL2:
-					volume = m_cmdlist[curr_idx++];
-					addr_hi = m_cmdlist[curr_idx++];
-					addr_lo = m_cmdlist[curr_idx++];
-					addr2_hi = m_cmdlist[curr_idx++];
-					addr2_lo = m_cmdlist[curr_idx++];
-					OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume,
-					              cmd == CMD_OUTPUT_DPL2);
-					break;
-
-				case CMD_WM_OUTPUT:
-				{
-					u32 addresses[4] = {
-						(u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1],
-						(u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3],
-						(u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5],
-						(u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7],
-					};
-					curr_idx += 8;
-					OutputWMSamples(addresses);
-					break;
-				}
-
-				case CMD_END:
-					end = true;
-					break;
-			}
-		}
-	}
-}
-
-void CUCode_AXWii::SetupProcessing(u32 init_addr)
-{
-	// TODO: should be easily factorizable with AX
-	s16 init_data[60];
-
-	for (u32 i = 0; i < 60; ++i)
-		init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
-
-	// List of all buffers we have to initialize
-	struct {
-		int* ptr;
-		u32 samples;
-	} buffers[] = {
-		{ m_samples_left, 32 },
-		{ m_samples_right, 32 },
-		{ m_samples_surround, 32 },
-		{ m_samples_auxA_left, 32 },
-		{ m_samples_auxA_right, 32 },
-		{ m_samples_auxA_surround, 32 },
-		{ m_samples_auxB_left, 32 },
-		{ m_samples_auxB_right, 32 },
-		{ m_samples_auxB_surround, 32 },
-		{ m_samples_auxC_left, 32 },
-		{ m_samples_auxC_right, 32 },
-		{ m_samples_auxC_surround, 32 },
-
-		{ m_samples_wm0, 6 },
-		{ m_samples_aux0, 6 },
-		{ m_samples_wm1, 6 },
-		{ m_samples_aux1, 6 },
-		{ m_samples_wm2, 6 },
-		{ m_samples_aux2, 6 },
-		{ m_samples_wm3, 6 },
-		{ m_samples_aux3, 6 }
-	};
-
-	u32 init_idx = 0;
-	for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i)
-	{
-		s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
-		s16 delta = (s16)init_data[init_idx + 2];
-
-		init_idx += 3;
-
-		if (!init_val)
-		{
-			memset(buffers[i].ptr, 0, 3 * buffers[i].samples * sizeof (int));
-		}
-		else
-		{
-			for (u32 j = 0; j < 3 * buffers[i].samples; ++j)
-			{
-				buffers[i].ptr[j] = init_val;
-				init_val += delta;
-			}
-		}
-	}
-}
-
-void CUCode_AXWii::AddToLR(u32 val_addr, bool neg)
-{
-	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
-	for (int i = 0; i < 32 * 3; ++i)
-	{
-		int val = (int)Common::swap32(*ptr++);
-		if (neg)
-			val = -val;
-
-		m_samples_left[i] += val;
-		m_samples_right[i] += val;
-	}
-}
-
-void CUCode_AXWii::AddSubToLR(u32 val_addr)
-{
-	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
-	for (int i = 0; i < 32 * 3; ++i)
-	{
-		int val = (int)Common::swap32(*ptr++);
-		m_samples_left[i] += val;
-	}
-	for (int i = 0; i < 32 * 3; ++i)
-	{
-		int val = (int)Common::swap32(*ptr++);
-		m_samples_right[i] -= val;
-	}
-}
-
-AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control)
-{
-	u32 ret = 0;
-
-	if (mixer_control & 0x00000001) ret |= MIX_L;
-	if (mixer_control & 0x00000002) ret |= MIX_R;
-	if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP;
-	if (mixer_control & 0x00000008) ret |= MIX_S;
-	if (mixer_control & 0x00000010) ret |= MIX_S_RAMP;
-	if (mixer_control & 0x00010000) ret |= MIX_AUXA_L;
-	if (mixer_control & 0x00020000) ret |= MIX_AUXA_R;
-	if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP;
-	if (mixer_control & 0x00080000) ret |= MIX_AUXA_S;
-	if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP;
-	if (mixer_control & 0x00200000) ret |= MIX_AUXB_L;
-	if (mixer_control & 0x00400000) ret |= MIX_AUXB_R;
-	if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP;
-	if (mixer_control & 0x01000000) ret |= MIX_AUXB_S;
-	if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP;
-	if (mixer_control & 0x04000000) ret |= MIX_AUXC_L;
-	if (mixer_control & 0x08000000) ret |= MIX_AUXC_R;
-	if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP;
-	if (mixer_control & 0x20000000) ret |= MIX_AUXC_S;
-	if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP;
-
-	return (AXMixControl)ret;
-}
-
-void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals)
-{
-	float curr = vol1;
-	for (size_t i = 0; i < nvals; ++i)
-	{
-		curr += (vol2 - vol1) / (float)nvals;
-		output[i] = (u16) curr;
-	}
-}
-
-bool CUCode_AXWii::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
-                                        u32* updates_addr)
-{
-	u16* pb_mem = (u16*)&pb;
-
-	if (!m_old_axwii)
-		return false;
-
-	// Copy the num_updates field.
-	memcpy(num_updates, pb_mem + 41, 6);
-
-	// Get the address of the updates data
-	u16 addr_hi = pb_mem[44];
-	u16 addr_lo = pb_mem[45];
-	u32 addr = HILO_TO_32(addr);
-	u16* ptr = (u16*)HLEMemory_Get_Pointer(addr);
-
-	*updates_addr = addr;
-
-	// Copy the updates data and change the offset to match a PB without
-	// updates data.
-	u32 updates_count = num_updates[0] + num_updates[1] + num_updates[2];
-	for (u32 i = 0; i < updates_count; ++i)
-	{
-		u16 update_off = Common::swap16(ptr[2 * i]);
-		u16 update_val = Common::swap16(ptr[2 * i + 1]);
-
-		if (update_off > 45)
-			update_off -= 5;
-
-		updates[2 * i] = update_off;
-		updates[2 * i + 1] = update_val;
-	}
-
-	// Remove the updates data from the PB
-	memmove(pb_mem + 41, pb_mem + 46, sizeof (pb) - 2 * 46);
-
-	return true;
-}
-
-void CUCode_AXWii::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr)
-{
-	u16* pb_mem = (u16*)&pb;
-
-	// Make some space
-	memmove(pb_mem + 46, pb_mem + 41, sizeof (pb) - 2 * 46);
-
-	// Reinsert previous values
-	pb_mem[41] = num_updates[0];
-	pb_mem[42] = num_updates[1];
-	pb_mem[43] = num_updates[2];
-	pb_mem[44] = updates_addr >> 16;
-	pb_mem[45] = updates_addr & 0xFFFF;
-}
-
-void CUCode_AXWii::ProcessPBList(u32 pb_addr)
-{
-	AXPBWii pb;
-
-	while (pb_addr)
-	{
-		AXBuffers buffers = {{
-			m_samples_left,
-			m_samples_right,
-			m_samples_surround,
-			m_samples_auxA_left,
-			m_samples_auxA_right,
-			m_samples_auxA_surround,
-			m_samples_auxB_left,
-			m_samples_auxB_right,
-			m_samples_auxB_surround,
-			m_samples_auxC_left,
-			m_samples_auxC_right,
-			m_samples_auxC_surround,
-			m_samples_wm0,
-			m_samples_aux0,
-			m_samples_wm1,
-			m_samples_aux1,
-			m_samples_wm2,
-			m_samples_aux2,
-			m_samples_wm3,
-			m_samples_aux3
-		}};
-
-		if (!ReadPB(pb_addr, pb))
-			break;
-
-		u16 num_updates[3];
-		u16 updates[1024];
-		u32 updates_addr;
-		if (ExtractUpdatesFields(pb, num_updates, updates, &updates_addr))
-		{
-			for (int curr_ms = 0; curr_ms < 3; ++curr_ms)
-			{
-				ApplyUpdatesForMs(curr_ms, (u16*)&pb, num_updates, updates);
-				ProcessVoice(pb, buffers, 32,
-				             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
-				             m_coeffs_available ? m_coeffs : NULL);
-
-				// Forward the buffers
-				for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
-					buffers.ptrs[i] += 32;
-			}
-			ReinjectUpdatesFields(pb, num_updates, updates_addr);
-		}
-		else
-		{
-			ProcessVoice(pb, buffers, 96,
-			             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
-			             m_coeffs_available ? m_coeffs : NULL);
-		}
-
-		WritePB(pb_addr, pb);
-		pb_addr = HILO_TO_32(pb.next_pb);
-	}
-}
-
-void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume)
-{
-	u16 volume_ramp[96];
-	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
-	m_last_aux_volumes[aux_id] = volume;
-
-	int* buffers[3] = { 0 };
-	int* main_buffers[3] = {
-		m_samples_left,
-		m_samples_right,
-		m_samples_surround
-	};
-
-	switch (aux_id)
-	{
-	case 0:
-		buffers[0] = m_samples_auxA_left;
-		buffers[1] = m_samples_auxA_right;
-		buffers[2] = m_samples_auxA_surround;
-		break;
-
-	case 1:
-		buffers[0] = m_samples_auxB_left;
-		buffers[1] = m_samples_auxB_right;
-		buffers[2] = m_samples_auxB_surround;
-		break;
-
-	case 2:
-		buffers[0] = m_samples_auxC_left;
-		buffers[1] = m_samples_auxC_right;
-		buffers[2] = m_samples_auxC_surround;
-		break;
-	}
-
-	// Send the content of AUX buffers to the CPU
-	if (write_addr)
-	{
-		int* ptr = (int*)HLEMemory_Get_Pointer(write_addr);
-		for (u32 i = 0; i < 3; ++i)
-			for (u32 j = 0; j < 3 * 32; ++j)
-				*ptr++ = Common::swap32(buffers[i][j]);
-	}
-
-	// Then read the buffers from the CPU and add to our main buffers.
-	int* ptr = (int*)HLEMemory_Get_Pointer(read_addr);
-	for (u32 i = 0; i < 3; ++i)
-		for (u32 j = 0; j < 3 * 32; ++j)
-		{
-			s64 sample = (s64)(s32)Common::swap32(*ptr++);
-			sample *= volume_ramp[j];
-			main_buffers[i][j] += (s32)(sample >> 15);
-		}
-}
-
-void CUCode_AXWii::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
-{
-	int* aux_left = aux_id ? m_samples_auxB_left : m_samples_auxA_left;
-	int* aux_right = aux_id ? m_samples_auxB_right : m_samples_auxA_right;
-	int* aux_surround = aux_id ? m_samples_auxB_surround : m_samples_auxA_surround;
-	int* auxc_buffer = aux_id ? m_samples_auxC_surround : m_samples_auxC_right;
-
-	int* upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[0]);
-	for (u32 i = 0; i < 96; ++i)
-		*upload_ptr++ = Common::swap32(aux_left[i]);
-	for (u32 i = 0; i < 96; ++i)
-		*upload_ptr++ = Common::swap32(aux_right[i]);
-	for (u32 i = 0; i < 96; ++i)
-		*upload_ptr++ = Common::swap32(aux_surround[i]);
-
-	upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[1]);
-	for (u32 i = 0; i < 96; ++i)
-		*upload_ptr++ = Common::swap32(auxc_buffer[i]);
-
-	u16 volume_ramp[96];
-	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
-	m_last_aux_volumes[aux_id] = volume;
-
-	int* mix_dest[4] = {
-		m_samples_left,
-		m_samples_right,
-		m_samples_surround,
-		m_samples_auxC_left
-	};
-	for (u32 mix_i = 0; mix_i < 4; ++mix_i)
-	{
-		int* dl_ptr = (int*)HLEMemory_Get_Pointer(addresses[2 + mix_i]);
-		for (u32 i = 0; i < 96; ++i)
-			aux_left[i] = Common::swap32(dl_ptr[i]);
-
-		for (u32 i = 0; i < 96; ++i)
-		{
-			s64 sample = (s64)(s32)aux_left[i];
-			sample *= volume_ramp[i];
-			mix_dest[mix_i][i] += (s32)(sample >> 15);
-		}
-	}
-}
-
-void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
-                                 bool upload_auxc)
-{
-	u16 volume_ramp[96];
-	GenerateVolumeRamp(volume_ramp, m_last_main_volume, volume, 96);
-	m_last_main_volume = volume;
-
-	int upload_buffer[3 * 32] = { 0 };
-
-	for (u32 i = 0; i < 3 * 32; ++i)
-		upload_buffer[i] = Common::swap32(m_samples_surround[i]);
-	memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_buffer));
-
-	if (upload_auxc)
-	{
-		surround_addr += sizeof (upload_buffer);
-		for (u32 i = 0; i < 3 * 32; ++i)
-			upload_buffer[i] = Common::swap32(m_samples_auxC_left[i]);
-		memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_buffer));
-	}
-
-	short buffer[3 * 32 * 2];
-
-	// Clamp internal buffers to 16 bits.
-	for (u32 i = 0; i < 3 * 32; ++i)
-	{
-		int left  = m_samples_left[i];
-		int right = m_samples_right[i];
-
-		// Apply global volume. Cast to s64 to avoid overflow.
-		left = ((s64)left * volume_ramp[i]) >> 15;
-		right = ((s64)right * volume_ramp[i]) >> 15;
-
-		if (left < -32767)  left = -32767;
-		if (left > 32767)   left = 32767;
-		if (right < -32767) right = -32767;
-		if (right >  32767) right = 32767;
-
-		m_samples_left[i] = left;
-		m_samples_right[i] = right;
-	}
-
-	for (u32 i = 0; i < 3 * 32; ++i)
-	{
-		buffer[2 * i] = Common::swap16(m_samples_right[i]);
-		buffer[2 * i + 1] = Common::swap16(m_samples_left[i]);
-	}
-
-	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
-
-	// There should be a DSP_SYNC message sent here. However, it looks like not
-	// sending it does not cause any issue, and sending it actually causes some
-	// sounds to go at half speed. I have no idea why.
-}
-
-void CUCode_AXWii::OutputWMSamples(u32* addresses)
-{
-	int* buffers[] = {
-		m_samples_wm0,
-		m_samples_wm1,
-		m_samples_wm2,
-		m_samples_wm3
-	};
-
-	for (u32 i = 0; i < 4; ++i)
-	{
-		int* in = buffers[i];
-		u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]);
-		for (u32 j = 0; j < 3 * 6; ++j)
-		{
-			int sample = in[j];
-			if (sample < -32767) sample = -32767;
-			if (sample > 32767) sample = 32767;
-			out[j] = Common::swap16((u16)sample);
-		}
-	}
-}
-
-u32 CUCode_AXWii::GetUpdateMs()
-{
-	return 3;
-}
-
-void CUCode_AXWii::DoState(PointerWrap &p)
-{
-	std::lock_guard<std::mutex> lk(m_processing);
-
-	DoStateShared(p);
-	DoAXState(p);
-
-	p.Do(m_samples_auxC_left);
-	p.Do(m_samples_auxC_right);
-	p.Do(m_samples_auxC_surround);
-
-	p.Do(m_samples_wm0);
-	p.Do(m_samples_wm1);
-	p.Do(m_samples_wm2);
-	p.Do(m_samples_wm3);
-
-	p.Do(m_samples_aux0);
-	p.Do(m_samples_aux1);
-	p.Do(m_samples_aux2);
-	p.Do(m_samples_aux3);
-
-	p.Do(m_last_main_volume);
-	p.Do(m_last_aux_volumes);
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
deleted file mode 100644
index 5e8080b97a..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_AXWII_H
-#define _UCODE_AXWII_H
-
-#include "UCode_AX.h"
-
-class CUCode_AXWii : public CUCode_AX
-{
-public:
-	CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
-	virtual ~CUCode_AXWii();
-	u32 GetUpdateMs();
-
-	virtual void DoState(PointerWrap &p);
-
-protected:
-	// Additional AUX buffers
-	int m_samples_auxC_left[32 * 3];
-	int m_samples_auxC_right[32 * 3];
-	int m_samples_auxC_surround[32 * 3];
-
-	// Wiimote buffers
-	int m_samples_wm0[6 * 3];
-	int m_samples_aux0[6 * 3];
-	int m_samples_wm1[6 * 3];
-	int m_samples_aux1[6 * 3];
-	int m_samples_wm2[6 * 3];
-	int m_samples_aux2[6 * 3];
-	int m_samples_wm3[6 * 3];
-	int m_samples_aux3[6 * 3];
-
-	// Are we implementing an old version of AXWii which still has updates?
-	bool m_old_axwii;
-
-	// Last volume values for MAIN and AUX. Used to generate volume ramps to
-	// interpolate nicely between old and new volume values.
-	u16 m_last_main_volume;
-	u16 m_last_aux_volumes[3];
-
-	// If needed, extract the updates related fields from a PB. We need to
-	// reinject them afterwards so that the correct PB typs is written to RAM.
-	bool ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
-	                          u32* updates_addr);
-	void ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr);
-
-	// Convert a mixer_control bitfield to our internal representation for that
-	// value. Required because that bitfield has a different meaning in some
-	// versions of AX.
-	AXMixControl ConvertMixerControl(u32 mixer_control);
-
-	// Generate a volume ramp from vol1 to vol2, interpolating n volume values.
-	// Uses floating point arithmetic, which isn't exactly what the UCode does,
-	// but this gives better precision and nicer code.
-	void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
-
-	virtual void HandleCommandList();
-
-	void SetupProcessing(u32 init_addr);
-	void AddToLR(u32 val_addr, bool neg);
-	void AddSubToLR(u32 val_addr);
-	void ProcessPBList(u32 pb_addr);
-	void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume);
-	void UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume);
-	void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
-	                   bool upload_auxc);
-	void OutputWMSamples(u32* addresses);	// 4 addresses
-
-private:
-	enum CmdType
-	{
-		CMD_SETUP = 0x00,
-		CMD_ADD_TO_LR = 0x01,
-		CMD_SUB_TO_LR = 0x02,
-		CMD_ADD_SUB_TO_LR = 0x03,
-		CMD_PROCESS = 0x04,
-		CMD_MIX_AUXA = 0x05,
-		CMD_MIX_AUXB = 0x06,
-		CMD_MIX_AUXC = 0x07,
-		CMD_UPL_AUXA_MIX_LRSC = 0x08,
-		CMD_UPL_AUXB_MIX_LRSC = 0x09,
-		CMD_UNK_0A = 0x0A,
-		CMD_OUTPUT = 0x0B,
-		CMD_OUTPUT_DPL2 = 0x0C,
-		CMD_WM_OUTPUT = 0x0D,
-		CMD_END = 0x0E,
-	};
-
-	// A lot of these are similar to the new version, but there is an offset in
-	// the command ids due to the PB_ADDR command (which was removed from the
-	// new AXWii).
-	enum CmdTypeOld
-	{
-		CMD_SETUP_OLD = 0x00,
-		CMD_ADD_TO_LR_OLD = 0x01,
-		CMD_SUB_TO_LR_OLD = 0x02,
-		CMD_ADD_SUB_TO_LR_OLD = 0x03,
-		CMD_PB_ADDR_OLD = 0x04,
-		CMD_PROCESS_OLD = 0x05,
-		CMD_MIX_AUXA_OLD = 0x06,
-		CMD_MIX_AUXB_OLD = 0x07,
-		CMD_MIX_AUXC_OLD = 0x08,
-		CMD_UPL_AUXA_MIX_LRSC_OLD = 0x09,
-		CMD_UPL_AUXB_MIX_LRSC_OLD = 0x0a,
-		CMD_UNK_0B_OLD = 0x0B,
-		CMD_OUTPUT_OLD = 0x0C,	// no volume!
-		CMD_OUTPUT_DPL2_OLD = 0x0D,
-		CMD_WM_OUTPUT_OLD = 0x0E,
-		CMD_END_OLD = 0x0F
-	};
-};
-
-#endif  // _UCODE_AXWII
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
deleted file mode 100644
index 6819b05818..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
+++ /dev/null
@@ -1,552 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// This file is UGLY (full of #ifdef) so that it can be used with both GC and
-// Wii version of AX. Maybe it would be better to abstract away the parts that
-// can be made common.
-
-#ifndef _UCODE_AX_VOICE_H
-#define _UCODE_AX_VOICE_H
-
-#if !defined(AX_GC) && !defined(AX_WII)
-#error UCode_AX_Voice.h included without specifying version
-#endif
-
-#include "Common.h"
-#include "UCode_AXStructs.h"
-#include "../../DSP.h"
-
-#include <functional>
-
-#ifdef AX_GC
-# define PB_TYPE AXPB
-# define MAX_SAMPLES_PER_FRAME 32
-#else
-# define PB_TYPE AXPBWii
-# define MAX_SAMPLES_PER_FRAME 96
-#endif
-
-// Put all of that in an anonymous namespace to avoid stupid compilers merging
-// functions from AX GC and AX Wii.
-namespace {
-
-// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits.
-#define HILO_TO_32(name) \
-	((name##_hi << 16) | name##_lo)
-
-// Used to pass a large amount of buffers to the mixing function.
-union AXBuffers
-{
-	struct
-	{
-		int* left;
-		int* right;
-		int* surround;
-
-		int* auxA_left;
-		int* auxA_right;
-		int* auxA_surround;
-
-		int* auxB_left;
-		int* auxB_right;
-		int* auxB_surround;
-
-#ifdef AX_WII
-		int* auxC_left;
-		int* auxC_right;
-		int* auxC_surround;
-
-		int* wm_main0;
-		int* wm_aux0;
-		int* wm_main1;
-		int* wm_aux1;
-		int* wm_main2;
-		int* wm_aux2;
-		int* wm_main3;
-		int* wm_aux3;
-#endif
-	};
-
-#ifdef AX_GC
-	int* ptrs[9];
-#else
-	int* ptrs[20];
-#endif
-};
-
-// Read a PB from MRAM/ARAM
-bool ReadPB(u32 addr, PB_TYPE& pb)
-{
-	u16* dst = (u16*)&pb;
-	const u16* src = (const u16*)Memory::GetPointer(addr);
-	if (!src)
-		return false;
-
-	for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
-		dst[i] = Common::swap16(src[i]);
-
-	return true;
-}
-
-// Write a PB back to MRAM/ARAM
-bool WritePB(u32 addr, const PB_TYPE& pb)
-{
-	const u16* src = (const u16*)&pb;
-	u16* dst = (u16*)Memory::GetPointer(addr);
-	if (!dst)
-		return false;
-
-	for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
-		dst[i] = Common::swap16(src[i]);
-
-	return true;
-}
-
-#if 0
-// Dump the value of a PB for debugging
-#define DUMP_U16(field) WARN_LOG(DSPHLE, "    %04x (%s)", pb.field, #field)
-#define DUMP_U32(field) WARN_LOG(DSPHLE, "    %08x (%s)", HILO_TO_32(pb.field), #field)
-void DumpPB(const PB_TYPE& pb)
-{
-	DUMP_U32(next_pb);
-	DUMP_U32(this_pb);
-	DUMP_U16(src_type);
-	DUMP_U16(coef_select);
-#ifdef AX_GC
-	DUMP_U16(mixer_control);
-#else
-	DUMP_U32(mixer_control);
-#endif
-	DUMP_U16(running);
-	DUMP_U16(is_stream);
-
-	// TODO: complete as needed
-}
-#endif
-
-// Simulated accelerator state.
-static u32 acc_loop_addr, acc_end_addr;
-static u32* acc_cur_addr;
-static PB_TYPE* acc_pb;
-static bool acc_end_reached;
-
-// Sets up the simulated accelerator.
-void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
-{
-	acc_pb = pb;
-	acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr);
-	acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr);
-	acc_cur_addr = cur_addr;
-	acc_end_reached = false;
-}
-
-// Reads a sample from the simulated accelerator. Also handles looping and
-// disabling streams that reached the end (this is done by an exception raised
-// by the accelerator on real hardware).
-u16 AcceleratorGetSample()
-{
-	u16 ret;
-
-	// Have we reached the end address?
-	//
-	// On real hardware, this would raise an interrupt that is handled by the
-	// UCode. We simulate what this interrupt does here.
-	if ((*acc_cur_addr & ~1) == (acc_end_addr & ~1))
-	{
-		// loop back to loop_addr.
-		*acc_cur_addr = acc_loop_addr;
-
-		if (acc_pb->audio_addr.looping)
-		{
-			// Set the ADPCM infos to continue processing at loop_addr.
-			//
-			// For some reason, yn1 and yn2 aren't set if the voice is not of
-			// stream type. This is what the AX UCode does and I don't really
-			// know why.
-			acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale;
-			if (!acc_pb->is_stream)
-			{
-				acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1;
-				acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2;
-			}
-		}
-		else
-		{
-			// Non looping voice reached the end -> running = 0.
-			acc_pb->running = 0;
-
-#ifdef AX_WII
-			// One of the few meaningful differences between AXGC and AXWii:
-			// while AXGC handles non looping voices ending by having 0000
-			// samples at the loop address, AXWii has the 0000 samples
-			// internally in DRAM and use an internal pointer to it (loop addr
-			// does not contain 0000 samples on AXWii!).
-			acc_end_reached = true;
-#endif
-		}
-	}
-
-	// See above for explanations about acc_end_reached.
-	if (acc_end_reached)
-		return 0;
-
-	switch (acc_pb->audio_addr.sample_format)
-	{
-		case 0x00:	// ADPCM
-		{
-			// ADPCM decoding, not much to explain here.
-			if ((*acc_cur_addr & 15) == 0)
-			{
-				acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1);
-				*acc_cur_addr += 2;
-			}
-
-			int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF);
-			int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7;
-
-			s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0];
-			s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1];
-
-			int temp = (*acc_cur_addr & 1) ?
-					(DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) :
-					(DSP::ReadARAM(*acc_cur_addr >> 1) >> 4);
-
-			if (temp >= 8)
-				temp -= 16;
-
-			int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11);
-
-			if (val > 0x7FFF) val = 0x7FFF;
-			else if (val < -0x7FFF) val = -0x7FFF;
-
-			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
-			acc_pb->adpcm.yn1 = val;
-			*acc_cur_addr += 1;
-			ret = val;
-			break;
-		}
-
-		case 0x0A:	// 16-bit PCM audio
-			ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1);
-			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
-			acc_pb->adpcm.yn1 = ret;
-			*acc_cur_addr += 1;
-			break;
-
-		case 0x19:	// 8-bit PCM audio
-			ret = DSP::ReadARAM(*acc_cur_addr) << 8;
-			acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1;
-			acc_pb->adpcm.yn1 = ret;
-			*acc_cur_addr += 1;
-			break;
-
-		default:
-			ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format);
-			return 0;
-	}
-
-	return ret;
-}
-
-// Reads samples from the input callback, resamples them to <count> samples at
-// the wanted sample rate (computed from the ratio, see below).
-//
-// If srctype is SRCTYPE_POLYPHASE, coefficients need to be provided as well
-// (or the srctype will automatically be changed to LINEAR).
-//
-// Returns the current position after resampling (including fractional part).
-//
-// The input to output ratio is set in <ratio>, which is a floating point num
-// stored as a 32b integer:
-//  * Upper 16 bits of the ratio are the integer part
-//  * Lower 16 bits are the decimal part
-//
-// <curr_pos> is a 32b integer structured in the same way as the ratio: the
-// upper 16 bits are the integer part of the current position in the input
-// stream, and the lower 16 bits are the decimal part.
-//
-// We start getting samples not from sample 0, but 0.<curr_pos_frac>. This
-// avoids discontinuities in the audio stream, especially with very low ratios
-// which interpolate a lot of values between two "real" samples.
-u32 ResampleAudio(std::function<s16(u32)> input_callback, s16* output, u32 count,
-                  s16* last_samples, u32 curr_pos, u32 ratio, int srctype,
-                  const s16* coeffs)
-{
-	int read_samples_count = 0;
-
-	// TODO(delroth): find out why the polyphase resampling algorithm causes
-	// audio glitches in Wii games with non integral ratios.
-
-	// If DSP DROM coefficients are available, support polyphase resampling.
-	if (0) // if (coeffs && srctype == SRCTYPE_POLYPHASE)
-	{
-		s16 temp[4];
-		u32 idx = 0;
-
-		temp[idx++ & 3] = last_samples[0];
-		temp[idx++ & 3] = last_samples[1];
-		temp[idx++ & 3] = last_samples[2];
-		temp[idx++ & 3] = last_samples[3];
-
-		for (u32 i = 0; i < count; ++i)
-		{
-			curr_pos += ratio;
-			while (curr_pos >= 0x10000)
-			{
-				temp[idx++ & 3] = input_callback(read_samples_count++);
-				curr_pos -= 0x10000;
-			}
-
-			u16 curr_pos_frac = ((curr_pos & 0xFFFF) >> 9) << 2;
-			const s16* c = &coeffs[curr_pos_frac];
-
-			s64 t0 = temp[idx++ & 3];
-			s64 t1 = temp[idx++ & 3];
-			s64 t2 = temp[idx++ & 3];
-			s64 t3 = temp[idx++ & 3];
-
-			s64 samp = (t0 * c[0] + t1 * c[1] + t2 * c[2] + t3 * c[3]) >> 15;
-
-			output[i] = (s16)samp;
-		}
-
-		last_samples[3] = temp[--idx & 3];
-		last_samples[2] = temp[--idx & 3];
-		last_samples[1] = temp[--idx & 3];
-		last_samples[0] = temp[--idx & 3];
-	}
-	else if (srctype == SRCTYPE_LINEAR || srctype == SRCTYPE_POLYPHASE)
-	{
-		// This is the circular buffer containing samples to use for the
-		// interpolation. It is initialized with the values from the PB, and it
-		// will be stored back to the PB at the end.
-		s16 temp[4];
-		u32 idx = 0;
-
-		temp[idx++ & 3] = last_samples[0];
-		temp[idx++ & 3] = last_samples[1];
-		temp[idx++ & 3] = last_samples[2];
-		temp[idx++ & 3] = last_samples[3];
-
-		for (u32 i = 0; i < count; ++i)
-		{
-			curr_pos += ratio;
-
-			// While our current position is >= 1.0, push new samples to the
-			// circular buffer.
-			while (curr_pos >= 0x10000)
-			{
-				temp[idx++ & 3] = input_callback(read_samples_count++);
-				curr_pos -= 0x10000;
-			}
-
-			// Get our current fractional position, used to know how much of
-			// curr0 and how much of curr1 the output sample should be.
-			u16 curr_frac = curr_pos & 0xFFFF;
-			u16 inv_curr_frac = -curr_frac;
-
-			// Interpolate! If curr_frac is 0, we can simply take the last
-			// sample without any multiplying.
-			s16 sample;
-			if (curr_frac)
-			{
-				s32 s0 = temp[idx++ & 3];
-				s32 s1 = temp[idx++ & 3];
-
-				sample = ((s0 * inv_curr_frac) + (s1 * curr_frac)) >> 16;
-				idx += 2;
-			}
-			else
-			{
-				sample = temp[idx++ & 3];
-				idx += 3;
-			}
-
-			output[i] = sample;
-		}
-
-		// Update the four last_samples values.
-		last_samples[3] = temp[--idx & 3];
-		last_samples[2] = temp[--idx & 3];
-		last_samples[1] = temp[--idx & 3];
-		last_samples[0] = temp[--idx & 3];
-	}
-	else // SRCTYPE_NEAREST
-	{
-		// No sample rate conversion here: simply read samples from the
-		// accelerator to the output buffer.
-		for (u32 i = 0; i < count; ++i)
-			output[i] = input_callback(i);
-
-		memcpy(last_samples, output + count - 4, 4 * sizeof (u16));
-	}
-
-	return curr_pos;
-}
-
-// Read <count> input samples from ARAM, decoding and converting rate
-// if required.
-void GetInputSamples(PB_TYPE& pb, s16* samples, u16 count, const s16* coeffs)
-{
-	u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr);
-	AcceleratorSetup(&pb, &cur_addr);
-
-	if (coeffs)
-		coeffs += pb.coef_select * 0x200;
-	u32 curr_pos = ResampleAudio([](u32) { return AcceleratorGetSample(); },
-	                             samples, count, pb.src.last_samples,
-	                             pb.src.cur_addr_frac, HILO_TO_32(pb.src.ratio),
-	                             pb.src_type, coeffs);
-	pb.src.cur_addr_frac = (curr_pos & 0xFFFF);
-
-	// Update current position in the PB.
-	pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16);
-	pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF);
-}
-
-// Add samples to an output buffer, with optional volume ramping.
-void MixAdd(int* out, const s16* input, u32 count, u16* pvol, s16* dpop, bool ramp)
-{
-	u16& volume = pvol[0];
-	u16 volume_delta = pvol[1];
-
-	// If volume ramping is disabled, set volume_delta to 0. That way, the
-	// mixing loop can avoid testing if volume ramping is enabled at each step,
-	// and just add volume_delta.
-	if (!ramp)
-		volume_delta = 0;
-
-	for (u32 i = 0; i < count; ++i)
-	{
-		s64 sample = input[i];
-		sample *= volume;
-		sample >>= 15;
-
-		out[i] += (s16)sample;
-		volume += volume_delta;
-
-		*dpop = (s16)sample;
-	}
-}
-
-// Execute a low pass filter on the samples using one history value. Returns
-// the new history value.
-s16 LowPassFilter(s16* samples, u32 count, s16 yn1, u16 a0, u16 b0)
-{
-	for (u32 i = 0; i < count; ++i)
-		yn1 = samples[i] = (a0 * (s32)samples[i] + b0 * (s32)yn1) >> 15;
-	return yn1;
-}
-
-// Process 1ms of audio (for AX GC) or 3ms of audio (for AX Wii) from a PB and
-// mix it to the output buffers.
-void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl mctrl, const s16* coeffs)
-{
-	// If the voice is not running, nothing to do.
-	if (!pb.running)
-		return;
-
-	// Read input samples, performing sample rate conversion if needed.
-	s16 samples[MAX_SAMPLES_PER_FRAME];
-	GetInputSamples(pb, samples, count, coeffs);
-
-	// Apply a global volume ramp using the volume envelope parameters.
-	for (u32 i = 0; i < count; ++i)
-	{
-		samples[i] = ((s32)samples[i] * pb.vol_env.cur_volume) >> 15;
-		pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta;
-	}
-
-	// Optionally, execute a low pass filter
-	// TODO: LPF code is currently broken, causing Super Monkey Ball sound
-	// corruption. Disabled until someone figures out what is wrong with it.
-	if (0 && pb.lpf.enabled)
-	{
-		pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
-	}
-
-	// Mix LRS, AUXA and AUXB depending on mixer_control
-	// TODO: Handle DPL2 on AUXB.
-
-	if (mctrl & MIX_L)
-		MixAdd(buffers.left, samples, count, &pb.mixer.left, &pb.dpop.left, mctrl & MIX_L_RAMP);
-	if (mctrl & MIX_R)
-		MixAdd(buffers.right, samples, count, &pb.mixer.right, &pb.dpop.right, mctrl & MIX_R_RAMP);
-	if (mctrl & MIX_S)
-		MixAdd(buffers.surround, samples, count, &pb.mixer.surround, &pb.dpop.surround, mctrl & MIX_S_RAMP);
-
-	if (mctrl & MIX_AUXA_L)
-		MixAdd(buffers.auxA_left, samples, count, &pb.mixer.auxA_left, &pb.dpop.auxA_left, mctrl & MIX_AUXA_L_RAMP);
-	if (mctrl & MIX_AUXA_R)
-		MixAdd(buffers.auxA_right, samples, count, &pb.mixer.auxA_right, &pb.dpop.auxA_right, mctrl & MIX_AUXA_R_RAMP);
-	if (mctrl & MIX_AUXA_S)
-		MixAdd(buffers.auxA_surround, samples, count, &pb.mixer.auxA_surround, &pb.dpop.auxA_surround, mctrl & MIX_AUXA_S_RAMP);
-
-	if (mctrl & MIX_AUXB_L)
-		MixAdd(buffers.auxB_left, samples, count, &pb.mixer.auxB_left, &pb.dpop.auxB_left, mctrl & MIX_AUXB_L_RAMP);
-	if (mctrl & MIX_AUXB_R)
-		MixAdd(buffers.auxB_right, samples, count, &pb.mixer.auxB_right, &pb.dpop.auxB_right, mctrl & MIX_AUXB_R_RAMP);
-	if (mctrl & MIX_AUXB_S)
-		MixAdd(buffers.auxB_surround, samples, count, &pb.mixer.auxB_surround, &pb.dpop.auxB_surround, mctrl & MIX_AUXB_S_RAMP);
-
-#ifdef AX_WII
-	if (mctrl & MIX_AUXC_L)
-		MixAdd(buffers.auxC_left, samples, count, &pb.mixer.auxC_left, &pb.dpop.auxC_left, mctrl & MIX_AUXC_L_RAMP);
-	if (mctrl & MIX_AUXC_R)
-		MixAdd(buffers.auxC_right, samples, count, &pb.mixer.auxC_right, &pb.dpop.auxC_right, mctrl & MIX_AUXC_R_RAMP);
-	if (mctrl & MIX_AUXC_S)
-		MixAdd(buffers.auxC_surround, samples, count, &pb.mixer.auxC_surround, &pb.dpop.auxC_surround, mctrl & MIX_AUXC_S_RAMP);
-#endif
-
-	// Optionally, phase shift left or right channel to simulate 3D sound.
-	if (pb.initial_time_delay.on)
-	{
-		// TODO
-	}
-
-#ifdef AX_WII
-	// Wiimote mixing.
-	if (pb.remote)
-	{
-		// Old AXWii versions process ms per ms.
-		u16 wm_count = count == 96 ? 18 : 6;
-
-		// Interpolate at most 18 samples from the 96 samples we read before.
-		s16 wm_samples[18];
-
-		// We use ratio 0x55555 == (5 * 65536 + 21845) / 65536 == 5.3333 which
-		// is the nearest we can get to 96/18
-		u32 curr_pos = ResampleAudio([&samples](u32 i) { return samples[i]; },
-		                             wm_samples, wm_count, pb.remote_src.last_samples,
-		                             pb.remote_src.cur_addr_frac, 0x55555,
-		                             SRCTYPE_POLYPHASE, coeffs);
-		pb.remote_src.cur_addr_frac = curr_pos & 0xFFFF;
-
-		// Mix to main[0-3] and aux[0-3]
-#define WMCHAN_MIX_ON(n) ((pb.remote_mixer_control >> (2 * n)) & 3)
-#define WMCHAN_MIX_RAMP(n) ((pb.remote_mixer_control >> (2 * n)) & 2)
-
-		if (WMCHAN_MIX_ON(0))
-			MixAdd(buffers.wm_main0, wm_samples, wm_count, &pb.remote_mixer.main0, &pb.remote_dpop.main0, WMCHAN_MIX_RAMP(0));
-		if (WMCHAN_MIX_ON(1))
-			MixAdd(buffers.wm_aux0, wm_samples, wm_count, &pb.remote_mixer.aux0, &pb.remote_dpop.aux0, WMCHAN_MIX_RAMP(1));
-		if (WMCHAN_MIX_ON(2))
-			MixAdd(buffers.wm_main1, wm_samples, wm_count, &pb.remote_mixer.main1, &pb.remote_dpop.main1, WMCHAN_MIX_RAMP(2));
-		if (WMCHAN_MIX_ON(3))
-			MixAdd(buffers.wm_aux1, wm_samples, wm_count, &pb.remote_mixer.aux1, &pb.remote_dpop.aux1, WMCHAN_MIX_RAMP(3));
-		if (WMCHAN_MIX_ON(4))
-			MixAdd(buffers.wm_main2, wm_samples, wm_count, &pb.remote_mixer.main2, &pb.remote_dpop.main2, WMCHAN_MIX_RAMP(4));
-		if (WMCHAN_MIX_ON(5))
-			MixAdd(buffers.wm_aux2, wm_samples, wm_count, &pb.remote_mixer.aux2, &pb.remote_dpop.aux2, WMCHAN_MIX_RAMP(5));
-		if (WMCHAN_MIX_ON(6))
-			MixAdd(buffers.wm_main3, wm_samples, wm_count, &pb.remote_mixer.main3, &pb.remote_dpop.main3, WMCHAN_MIX_RAMP(6));
-		if (WMCHAN_MIX_ON(7))
-			MixAdd(buffers.wm_aux3, wm_samples, wm_count, &pb.remote_mixer.aux3, &pb.remote_dpop.aux3, WMCHAN_MIX_RAMP(7));
-	}
-#endif
-}
-
-} // namespace
-
-#endif // !_UCODE_AX_VOICE_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
deleted file mode 100644
index bb0d858548..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../DSPHLE.h"
-#include "UCodes.h"
-#include "UCode_CARD.h"
-#include "../../DSP.h"
-#include "ConfigManager.h"
-
-
-CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
-{
-	DEBUG_LOG(DSPHLE, "CUCode_CARD - initialized");
-	m_rMailHandler.PushMail(DSP_INIT);
-}
-
-
-CUCode_CARD::~CUCode_CARD()
-{
-	m_rMailHandler.Clear();
-}
-
-
-void CUCode_CARD::Update(int cycles)
-{
-	// check if we have to sent something
-	if (!m_rMailHandler.IsEmpty())
-	{
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-}
-
-u32 CUCode_CARD::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_CARD::HandleMail(u32 _uMail)
-{
-	if (_uMail == 0xFF000000) // unlock card
-	{
-		//	m_Mails.push(0x00000001); // ACK (actually anything != 0)
-	}
-	else
-	{
-		DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown command: %x", _uMail);
-	}
-
-	m_rMailHandler.PushMail(DSP_DONE);
-	m_DSPHLE->SetUCode(UCODE_ROM);
-}
-
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
deleted file mode 100644
index 831bf63c8e..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_CARD_H
-#define _UCODE_CARD_H
-
-#include "UCodes.h"
-
-class CUCode_CARD : public IUCode
-{
-public:
-	CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_CARD();
-	u32 GetUpdateMs();
-
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
deleted file mode 100644
index 6490dd9c66..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "UCodes.h"
-#include "UCode_GBA.h"
-
-#include "../../DSP.h"
-#include "ConfigManager.h"
-
-CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
-: IUCode(dsp_hle, crc)
-{
-	m_rMailHandler.PushMail(DSP_INIT);
-}
-
-CUCode_GBA::~CUCode_GBA()
-{
-	m_rMailHandler.Clear();
-}
-
-void CUCode_GBA::Update(int cycles)
-{
-	// check if we have to send something
-	if (!m_rMailHandler.IsEmpty())
-	{
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-}
-
-u32 CUCode_GBA::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_GBA::HandleMail(u32 _uMail)
-{
-	static bool nextmail_is_mramaddr = false;
-	static bool calc_done = false;
-
-	if (m_UploadSetupInProgress)
-	{
-		PrepareBootUCode(_uMail);
-	}
-	else if ((_uMail >> 16 == 0xabba) && !nextmail_is_mramaddr)
-	{
-		nextmail_is_mramaddr = true;
-	}
-	else if (nextmail_is_mramaddr)
-	{
-		nextmail_is_mramaddr = false;
-		u32 mramaddr = _uMail;
-
-		struct sec_params_t
-		{
-			u16 key[2];
-			u16 unk1[2];
-			u16 unk2[2];
-			u32 length;
-			u32 dest_addr;
-			u32 pad[3];
-		} sec_params;
-
-		// 32 bytes from mram addr to dram @ 0
-		for (int i = 0; i < 8; i++, mramaddr += 4)
-			((u32*)&sec_params)[i] = HLEMemory_Read_U32(mramaddr);
-
-		// This is the main decrypt routine
-		u16 x11 = 0, x12 = 0,
-			x20 = 0, x21 = 0, x22 = 0, x23 = 0;
-
-		x20 = Common::swap16(sec_params.key[0]) ^ 0x6f64;
-		x21 = Common::swap16(sec_params.key[1]) ^ 0x6573;
-
-		s16 unk2 = (s8)sec_params.unk2[0];
-		if (unk2 < 0)
-		{
-			x11 = ((~unk2 + 3) << 1) | (sec_params.unk1[0] << 4);
-		}
-		else if (unk2 == 0)
-		{
-			x11 = (sec_params.unk1[0] << 1) | 0x70;
-		}
-		else // unk2 > 0
-		{
-			x11 = ((unk2 - 1) << 1) | (sec_params.unk1[0] << 4);
-		}
-
-		s32 rounded_sub = ((sec_params.length + 7) & ~7) - 0x200;
-		u16 size = (rounded_sub < 0) ? 0 : rounded_sub >> 3;
-
-		u32 t = (((size << 16) | 0x3f80) & 0x3f80ffff) << 1;
-		s16 t_low = (s8)(t >> 8);
-		t += (t_low & size) << 16;
-		x12 = t >> 16;
-		x11 |= (size & 0x4000) >> 14; // this would be stored in ac0.h if we weren't constrained to 32bit :)
-		t = ((x11 & 0xff) << 16) + ((x12 & 0xff) << 16) + (x12 << 8);
-
-		u16 final11 = 0, final12 = 0;
-		final11 = x11 | ((t >> 8) & 0xff00) | 0x8080;
-		final12 = x12 | 0x8080;
-
-		if ((final12 & 0x200) != 0)
-		{
-			x22 = final11 ^ 0x6f64;
-			x23 = final12 ^ 0x6573;
-		}
-		else
-		{
-			x22 = final11 ^ 0x6177;
-			x23 = final12 ^ 0x614b;
-		}
-
-		// Send the result back to mram
-		*(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr) = Common::swap32((x20 << 16) | x21);
-		*(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr+4) = Common::swap32((x22 << 16) | x23);
-
-		// Done!
-		DEBUG_LOG(DSPHLE, "\n%08x -> key: %08x, len: %08x, dest_addr: %08x, unk1: %08x, unk2: %08x"
-			" 22: %04x, 23: %04x",
-			mramaddr,
-			*(u32*)sec_params.key, sec_params.length, sec_params.dest_addr,
-			*(u32*)sec_params.unk1, *(u32*)sec_params.unk2,
-			x22, x23);
-
-		calc_done = true;
-		m_rMailHandler.PushMail(DSP_DONE);
-	}
-	else if ((_uMail >> 16 == 0xcdd1) && calc_done)
-	{
-		switch (_uMail & 0xffff)
-		{
-		case 1:
-			m_UploadSetupInProgress = true;
-			break;
-		case 2:
-			m_DSPHLE->SetUCode(UCODE_ROM);
-			break;
-		default:
-			DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 command: %08x", _uMail);
-			break;
-		}
-	}
-	else
-	{
-		DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown command: %08x", _uMail);
-	}
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
deleted file mode 100644
index e2e5ddd8bb..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "UCodes.h"
-
-struct CUCode_GBA : public IUCode
-{
-	CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_GBA();
-	u32 GetUpdateMs();
-
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
-};
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
deleted file mode 100644
index 1d54f7075c..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "UCodes.h"
-#include "UCode_InitAudioSystem.h"
-#include "ConfigManager.h"
-
-CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
-{
-	DEBUG_LOG(DSPHLE, "CUCode_InitAudioSystem - initialized");
-}
-
-
-CUCode_InitAudioSystem::~CUCode_InitAudioSystem()
-{
-}
-
-
-void CUCode_InitAudioSystem::Init()
-{
-}
-
-
-void CUCode_InitAudioSystem::Update(int cycles)
-{
-	if (m_rMailHandler.IsEmpty())
-	{
-		m_rMailHandler.PushMail(0x80544348);
-		// HALT
-	}
-}
-
-u32 CUCode_InitAudioSystem::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_InitAudioSystem::HandleMail(u32 _uMail)
-{
-}
-
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
deleted file mode 100644
index 17b74d4b59..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_INITAUDIOSYSTEM
-#define _UCODE_INITAUDIOSYSTEM
-
-#include "UCodes.h"
-
-class CUCode_InitAudioSystem : public IUCode
-{
-public:
-	CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_InitAudioSystem();
-	u32 GetUpdateMs();
-
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
-	void Init();
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
deleted file mode 100644
index 1c89a1f8f7..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "UCodes.h"
-#include "UCode_ROM.h"
-#include "Hash.h"
-#include "../../Memmap.h"
-#include "ConfigManager.h"
-
-CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
-	, m_CurrentUCode()
-	, m_BootTask_numSteps(0)
-	, m_NextParameter(0)
-{
-	DEBUG_LOG(DSPHLE, "UCode_Rom - initialized");
-	m_rMailHandler.Clear();
-	m_rMailHandler.PushMail(0x8071FEED);
-}
-
-CUCode_Rom::~CUCode_Rom()
-{}
-
-void CUCode_Rom::Update(int cycles)
-{}
-
-void CUCode_Rom::HandleMail(u32 _uMail)
-{
-	if (m_NextParameter == 0)
-	{
-		// wait for beginning of UCode
-		if ((_uMail & 0xFFFF0000) != 0x80F30000)
-		{
-			u32 Message = 0xFEEE0000 | (_uMail & 0xFFFF);
-			m_rMailHandler.PushMail(Message);
-		}
-		else
-		{
-			m_NextParameter = _uMail;
-		}
-	}
-	else
-	{
-		switch (m_NextParameter)
-		{
-			case 0x80F3A001:
-				m_CurrentUCode.m_RAMAddress = _uMail;
-				break;
-
-			case 0x80F3A002:
-				m_CurrentUCode.m_Length = _uMail & 0xffff;
-				break;
-
-			case 0x80F3C002:
-				m_CurrentUCode.m_IMEMAddress = _uMail & 0xffff;
-				break;
-
-			case 0x80F3B002:
-				m_CurrentUCode.m_DMEMLength = _uMail & 0xffff;
-				if (m_CurrentUCode.m_DMEMLength) {
-					NOTICE_LOG(DSPHLE,"m_CurrentUCode.m_DMEMLength = 0x%04x.", m_CurrentUCode.m_DMEMLength);
-				}
-				break;
-
-			case 0x80F3D001:
-			{
-				m_CurrentUCode.m_StartPC = _uMail & 0xffff;
-				BootUCode();
-				return;  // Important! BootUCode indirectly does "delete this;". Must exit immediately.
-			}
-			break;
-
-			default:
-			break;
-		}
-
-		// THE GODDAMN OVERWRITE WAS HERE. Without the return above, since BootUCode may delete "this", well ...
-		m_NextParameter = 0;
-	}
-}
-
-void CUCode_Rom::BootUCode()
-{
-	u32 ector_crc = HashEctor(
-		(u8*)HLEMemory_Get_Pointer(m_CurrentUCode.m_RAMAddress),
-		m_CurrentUCode.m_Length);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	char binFile[MAX_PATH];
-	sprintf(binFile, "%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), ector_crc);
-
-	File::IOFile pFile(binFile, "wb");
-	pFile.WriteArray((u8*)Memory::GetPointer(m_CurrentUCode.m_RAMAddress), m_CurrentUCode.m_Length);
-#endif
-
-	DEBUG_LOG(DSPHLE, "CurrentUCode SOURCE Addr: 0x%08x", m_CurrentUCode.m_RAMAddress);
-	DEBUG_LOG(DSPHLE, "CurrentUCode Length:      0x%08x", m_CurrentUCode.m_Length);
-	DEBUG_LOG(DSPHLE, "CurrentUCode DEST Addr:   0x%08x", m_CurrentUCode.m_IMEMAddress);
-	DEBUG_LOG(DSPHLE, "CurrentUCode DMEM Length: 0x%08x", m_CurrentUCode.m_DMEMLength);
-	DEBUG_LOG(DSPHLE, "CurrentUCode init_vector: 0x%08x", m_CurrentUCode.m_StartPC);
-	DEBUG_LOG(DSPHLE, "CurrentUCode CRC:         0x%08x", ector_crc);
-	DEBUG_LOG(DSPHLE, "BootTask - done");
-
-	m_DSPHLE->SetUCode(ector_crc);
-}
-
-u32 CUCode_Rom::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_Rom::DoState(PointerWrap &p)
-{
-	p.Do(m_CurrentUCode);
-	p.Do(m_BootTask_numSteps);
-	p.Do(m_NextParameter);
-
-	DoStateShared(p);
-}
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
deleted file mode 100644
index e6dbe80f1e..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_ROM
-#define _UCODE_ROM
-
-#include "UCodes.h"
-
-class CUCode_Rom : public IUCode
-{
-public:
-	CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
-	virtual ~CUCode_Rom();
-	u32 GetUpdateMs();
-
-	void HandleMail(u32 _uMail);
-	void Update(int cycles);
-
-	void DoState(PointerWrap &p);
-
-private:
-	struct SUCode
-	{
-		u32 m_RAMAddress;
-		u32 m_Length;
-		u32 m_IMEMAddress;
-		u32 m_DMEMLength;
-		u32 m_StartPC;
-	};
-	SUCode m_CurrentUCode;
-	int m_BootTask_numSteps;
-
-	u32 m_NextParameter;
-
-	void BootUCode();
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
deleted file mode 100644
index b1627a0cd7..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Games that uses this UCode:
-// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
-// Super Mario Galaxy
-
-#include "UCodes.h"
-#include "UCode_Zelda.h"
-#include "../MailHandler.h"
-
-#include "Mixer.h"
-
-#include "WaveFile.h"
-#include "../../DSP.h"
-#include "ConfigManager.h"
-
-
-CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)
-	: 
-	IUCode(dsp_hle, _CRC),
-
-	m_bSyncInProgress(false),
-	m_MaxVoice(0),
-
-	m_NumSyncMail(0),
-
-	m_NumVoices(0),
-
-	m_bSyncCmdPending(false),
-	m_CurVoice(0),
-	m_CurBuffer(0),
-	m_NumBuffers(0),
-
-	m_VoicePBsAddr(0),
-	m_UnkTableAddr(0),
-	m_ReverbPBsAddr(0),
-
-	m_RightBuffersAddr(0),
-	m_LeftBuffersAddr(0),
-	m_pos(0),
-
-	m_DMABaseAddr(0),
-
-	m_numSteps(0),
-	m_bListInProgress(false),
-	m_step(0),
-
-	m_readOffset(0),
-
-	m_MailState(WaitForMail),
-
-	m_NumPBs(0),
-	m_PBAddress(0),
-	m_PBAddress2(0)
-{
-	DEBUG_LOG(DSPHLE, "UCode_Zelda - add boot mails for handshake");
-
-	if (IsLightVersion())
-	{
-		NOTICE_LOG(DSPHLE, "Luigi Stylee!");
-		m_rMailHandler.PushMail(0x88881111);	
-	}
-	else
-	{
-		m_rMailHandler.PushMail(DSP_INIT);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-		m_rMailHandler.PushMail(0xF3551111); // handshake
-	}
-
-	m_VoiceBuffer = new s32[256 * 1024];
-	m_ResampleBuffer = new s16[256 * 1024];
-	m_LeftBuffer = new s32[256 * 1024];
-	m_RightBuffer = new s32[256 * 1024];
-
-	memset(m_Buffer, 0, sizeof(m_Buffer));
-	memset(m_SyncFlags, 0, sizeof(m_SyncFlags));
-	memset(m_AFCCoefTable, 0, sizeof(m_AFCCoefTable));
-	memset(m_PBMask, 0, sizeof(m_PBMask));
-}
-
-CUCode_Zelda::~CUCode_Zelda()
-{
-	m_rMailHandler.Clear();
-
-	delete [] m_VoiceBuffer;
-	delete [] m_ResampleBuffer;
-	delete [] m_LeftBuffer;
-	delete [] m_RightBuffer;
-}
-
-u8 *CUCode_Zelda::GetARAMPointer(u32 address)
-{
-	if (IsDMAVersion())
-		return (u8 *)(Memory::GetPointer(m_DMABaseAddr)) + address;
-	else
-		return (u8 *)(DSP::GetARAMPtr()) + address;
-}
-
-void CUCode_Zelda::Update(int cycles)
-{
-	if (!IsLightVersion())
-	{
-		if (m_rMailHandler.GetNextMail() == DSP_FRAME_END)
-			DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-
-	if (NeedsResumeMail())
-	{
-		m_rMailHandler.PushMail(DSP_RESUME);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-}
-
-void CUCode_Zelda::HandleMail(u32 _uMail)
-{
-	if (IsLightVersion())
-		HandleMail_LightVersion(_uMail);
-	else if (IsSMSVersion())
-		HandleMail_SMSVersion(_uMail);
-	else
-		HandleMail_NormalVersion(_uMail);
-}
-
-void CUCode_Zelda::HandleMail_LightVersion(u32 _uMail)
-{
-	//ERROR_LOG(DSPHLE, "Light version mail %08X, list in progress: %s, step: %i/%i", 
-	//	_uMail, m_bListInProgress ? "yes":"no", m_step, m_numSteps);
-
-	if (m_bSyncCmdPending)
-	{
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-		m_CurBuffer++;
-
-		if (m_CurBuffer == m_NumBuffers)
-		{
-			soundStream->GetMixer()->SetHLEReady(true);
-			m_bSyncCmdPending = false;
-			DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
-		}
-		return;
-	}
-
-	if (!m_bListInProgress)
-	{
-		switch ((_uMail >> 24) & 0x7F)
-		{
-		case 0x00: m_numSteps = 1; break; // dummy
-		case 0x01: m_numSteps = 5; break; // DsetupTable
-		case 0x02: m_numSteps = 3; break; // DsyncFrame
-
-		default:
-			{
-				m_numSteps = 0;
-				PanicAlert("Zelda uCode (light version): unknown/unsupported command %02X", (_uMail >> 24) & 0x7F);
-			}
-			return;
-		}
-
-		m_bListInProgress = true;
-		m_step = 0;
-	}
-
-	if (m_step >= sizeof(m_Buffer) / 4)
-		PanicAlert("m_step out of range");
-
-	((u32*)m_Buffer)[m_step] = _uMail;
-	m_step++;
-
-	if (m_step >= m_numSteps)
-	{
-		ExecuteList();
-		m_bListInProgress = false;
-	}
-}
-
-void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail)
-{
-	if (m_bSyncInProgress)
-	{
-		if (m_bSyncCmdPending)
-		{
-			m_SyncFlags[(m_NumSyncMail << 1)    ] = _uMail >> 16;
-			m_SyncFlags[(m_NumSyncMail << 1) + 1] = _uMail & 0xFFFF;
-
-			m_NumSyncMail++;
-			if (m_NumSyncMail == 2)
-			{
-				m_NumSyncMail = 0;
-				m_bSyncInProgress = false;
-
-				m_CurBuffer++;
-
-				m_rMailHandler.PushMail(DSP_SYNC);
-				DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-				m_rMailHandler.PushMail(0xF355FF00 | m_CurBuffer);
-
-				if (m_CurBuffer == m_NumBuffers)
-				{
-					m_rMailHandler.PushMail(DSP_FRAME_END);
-					//	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-
-					soundStream->GetMixer()->SetHLEReady(true);
-					DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
-//					soundStream->Update(); //do it in this thread to avoid sync problems
-
-					m_bSyncCmdPending = false;
-				}
-			}
-		}
-		else
-		{
-			m_bSyncInProgress = false;
-		}
-
-		return;
-	}
-
-	if (m_bListInProgress)
-	{
-		if (m_step >= sizeof(m_Buffer) / 4)
-			PanicAlert("m_step out of range");
-
-		((u32*)m_Buffer)[m_step] = _uMail;
-		m_step++;
-
-		if (m_step >= m_numSteps)
-		{
-			ExecuteList();
-			m_bListInProgress = false;
-		}
-
-		return;
-	}
-
-	// Here holds: m_bSyncInProgress == false && m_bListInProgress == false
-
-	if (_uMail == 0)
-	{
-		m_bSyncInProgress = true;
-		m_NumSyncMail = 0;
-	}
-	else if ((_uMail >> 16) == 0)
-	{
-		m_bListInProgress = true;
-		m_numSteps = _uMail;
-		m_step = 0;
-	}
-	else if ((_uMail >> 16) == 0xCDD1)			// A 0xCDD1000X mail should come right after we send a DSP_SYNCEND mail
-	{
-		// The low part of the mail tells the operation to perform
-		// Seeing as every possible operation number halts the uCode,
-		// except 3, that thing seems to be intended for debugging
-		switch (_uMail & 0xFFFF)
-		{
-		case 0x0003:		// Do nothing
-			return;
-
-		case 0x0000:		// Halt
-		case 0x0001:		// Dump memory? and halt
-		case 0x0002:		// Do something and halt
-			WARN_LOG(DSPHLE, "Zelda uCode(SMS version): received halting operation %04X", _uMail & 0xFFFF);
-			return;
-
-		default:			// Invalid (the real ucode would likely crash)
-			WARN_LOG(DSPHLE, "Zelda uCode(SMS version): received invalid operation %04X", _uMail & 0xFFFF);
-			return;
-		}
-	}
-	else
-	{
-		WARN_LOG(DSPHLE, "Zelda uCode (SMS version): unknown mail %08X", _uMail);
-	}
-}
-
-void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
-{
-	// WARN_LOG(DSPHLE, "Zelda uCode: Handle mail %08X", _uMail);
-
-	if (m_UploadSetupInProgress) // evaluated first!
-	{
-		PrepareBootUCode(_uMail);
-		return;
-	}
-
-	if (m_bSyncInProgress)
-	{
-		if (m_bSyncCmdPending)
-		{
-			u32 n = (_uMail >> 16) & 0xF;
-			m_MaxVoice = (n + 1) << 4;
-			m_SyncFlags[n] = _uMail & 0xFFFF;
-			m_bSyncInProgress = false;
-
-			// Normally, we should mix to the buffers used by the game.
-			// We don't do it currently for a simple reason:
-			// if the game runs fast all the time, then it's OK,
-			// but if it runs slow, sound can become choppy.
-			// This problem won't happen when mixing to the buffer
-			// provided by MixAdd(), because the size of this buffer
-			// is automatically adjusted if the game runs slow.
-#if 0
-			if (m_SyncFlags[n] & 0x8000)
-			{
-				for (; m_CurVoice < m_MaxVoice; m_CurVoice++)
-				{
-					if (m_CurVoice >= m_NumVoices)
-						break;
-
-					MixVoice(m_CurVoice);
-				}
-			}
-			else
-#endif
-				m_CurVoice = m_MaxVoice;
-
-			if (m_CurVoice >= m_NumVoices)
-			{
-				m_CurBuffer++;
-
-				m_rMailHandler.PushMail(DSP_SYNC);
-				DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-				m_rMailHandler.PushMail(0xF355FF00 | m_CurBuffer);
-					
-				m_CurVoice = 0;
-
-				if (m_CurBuffer == m_NumBuffers)
-				{
-					if (!IsDMAVersion()) // this is a hack... without it Pikmin 1 Wii/ Zelda TP Wii mail-s stopped
-						m_rMailHandler.PushMail(DSP_FRAME_END);
-					//g_dspInitialize.pGenerateDSPInterrupt();
-
-					soundStream->GetMixer()->SetHLEReady(true);
-					DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
-//					soundStream->Update(); //do it in this thread to avoid sync problems
-
-					m_bSyncCmdPending = false;
-				}
-			}
-		}
-		else
-		{
-			m_bSyncInProgress = false;
-		}
-
-		return;
-	}
-
-	if (m_bListInProgress)
-	{
-		if (m_step >= sizeof(m_Buffer) / 4)
-			PanicAlert("m_step out of range");
-
-		((u32*)m_Buffer)[m_step] = _uMail;
-		m_step++;
-
-		if (m_step >= m_numSteps)
-		{
-			ExecuteList();
-			m_bListInProgress = false;
-		}
-
-		return;
-	}
-
-	// Here holds: m_bSyncInProgress == false && m_bListInProgress == false
-
-	// Zelda-only mails:
-	// - 0000XXXX - Begin list
-	// - 00000000, 000X0000 - Sync mails
-	// - CDD1XXXX - comes after DsyncFrame completed, seems to be debugging stuff
-
-	if (_uMail == 0) 
-	{
-		m_bSyncInProgress = true;
-	} 
-	else if ((_uMail >> 16) == 0)
-	{
-		m_bListInProgress = true;
-		m_numSteps = _uMail;
-		m_step = 0;
-	}
-	else if ((_uMail >> 16) == 0xCDD1)			// A 0xCDD1000X mail should come right after we send a DSP_FRAME_END mail
-	{
-		// The low part of the mail tells the operation to perform
-		// Seeing as every possible operation number halts the uCode,
-		// except 3, that thing seems to be intended for debugging
-		switch (_uMail & 0xFFFF)
-		{
-		case 0x0003:	// Do nothing - continue normally
-			return;
-
-		case 0x0001:	// accepts params to either dma to iram and/or dram (used for hotbooting a new ucode)
-			// TODO find a better way to protect from HLEMixer?
-			soundStream->GetMixer()->SetHLEReady(false);
-			m_UploadSetupInProgress = true;
-			return;
-
-		case 0x0002:	// Let IROM play us off
-			m_DSPHLE->SetUCode(UCODE_ROM);
-			return;
-
-		case 0x0000:	// Halt
-			WARN_LOG(DSPHLE, "Zelda uCode: received halting operation %04X", _uMail & 0xFFFF);
-			return;
-
-		default:		// Invalid (the real ucode would likely crash)
-			WARN_LOG(DSPHLE, "Zelda uCode: received invalid operation %04X", _uMail & 0xFFFF);
-			return;
-		}
-	}
-	else
-	{
-		WARN_LOG(DSPHLE, "Zelda uCode: unknown mail %08X", _uMail);
-	}
-}
-
-// zelda debug ..803F6418
-void CUCode_Zelda::ExecuteList()
-{
-	// begin with the list
-	m_readOffset = 0;
-
-	u32 CmdMail = Read32();
-	u32 Command = (CmdMail >> 24) & 0x7f;
-	u32 Sync;
-	u32 ExtraData = CmdMail & 0xFFFF;
-
-	if (IsLightVersion())
-		Sync = 0x62 + (Command << 1); // seen in DSP_UC_Luigi.txt
-	else
-		Sync = CmdMail >> 16;
-
-	DEBUG_LOG(DSPHLE, "==============================================================================");
-	DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (command: 0x%04x : sync: 0x%04x)", Command, Sync);
-
-	switch (Command)
-	{
-		// dummy
-		case 0x00: break;
-
-		// DsetupTable ... zelda ww jumps to 0x0095
-		case 0x01:
-		{
-			m_NumVoices = ExtraData;
-			m_VoicePBsAddr = Read32() & 0x7FFFFFFF;
-			m_UnkTableAddr = Read32() & 0x7FFFFFFF;
-			m_AFCCoefTableAddr = Read32() & 0x7FFFFFFF;
-			m_ReverbPBsAddr = Read32() & 0x7FFFFFFF;  // WARNING: reverb PBs are very different from voice PBs!
-
-			// Read the other table
-			u16 *TempPtr = (u16*)Memory::GetPointer(m_UnkTableAddr);
-			for (int i = 0; i < 0x280; i++)
-				m_MiscTable[i] = (s16)Common::swap16(TempPtr[i]);
-
-			// Read AFC coef table
-			TempPtr = (u16*)Memory::GetPointer(m_AFCCoefTableAddr);
-			for (int i = 0; i < 32; i++)
-				m_AFCCoefTable[i] = (s16)Common::swap16(TempPtr[i]);
-
-			DEBUG_LOG(DSPHLE, "DsetupTable");
-			DEBUG_LOG(DSPHLE, "Num voice param blocks:             %i", m_NumVoices);
-			DEBUG_LOG(DSPHLE, "Voice param blocks address:         0x%08x", m_VoicePBsAddr);
-
-			// This points to some strange data table. Don't know yet what it's for. Reverb coefs?
-			DEBUG_LOG(DSPHLE, "DSPRES_FILTER   (size: 0x40):       0x%08x", m_UnkTableAddr);
-
-			// Zelda WW: This points to a 64-byte array of coefficients, which are EXACTLY the same
-			// as the AFC ADPCM coef array in decode.c of the in_cube winamp plugin,
-			// which can play Zelda audio. So, these should definitely be used when decoding AFC.
-			DEBUG_LOG(DSPHLE, "DSPADPCM_FILTER (size: 0x500):      0x%08x", m_AFCCoefTableAddr);
-			DEBUG_LOG(DSPHLE, "Reverb param blocks address:        0x%08x", m_ReverbPBsAddr);
-		}
-			break;
-
-			// SyncFrame ... zelda ww jumps to 0x0243
-		case 0x02:
-		{
-			m_bSyncCmdPending = true;
-
-			m_CurBuffer = 0;
-			m_NumBuffers = (CmdMail >> 16) & 0xFF;
-
-			// Addresses for right & left buffers in main memory
-			// Each buffer is 160 bytes long. The number of (both left & right) buffers
-			// is set by the first mail of the list.
-			m_RightBuffersAddr = Read32() & 0x7FFFFFFF;
-			m_LeftBuffersAddr = Read32() & 0x7FFFFFFF;
-
-			DEBUG_LOG(DSPHLE, "DsyncFrame");
-			// These alternate between three sets of mixing buffers. They are all three fairly near,
-			// but not at, the ADMA read addresses.
-			DEBUG_LOG(DSPHLE, "Right buffer address:               0x%08x", m_RightBuffersAddr);
-			DEBUG_LOG(DSPHLE, "Left buffer address:                0x%08x", m_LeftBuffersAddr);
-
-			if (IsLightVersion())
-				break;
-			else
-				return;
-		}
-
-
-		// Simply sends the sync messages
-		case 0x03: break;
-
-/*		case 0x04: break;   // dunno ... zelda ww jmps to 0x0580
-		case 0x05: break;   // dunno ... zelda ww jmps to 0x0592
-		case 0x06: break;   // dunno ... zelda ww jmps to 0x0469
-		case 0x07: break;   // dunno ... zelda ww jmps to 0x044d
-		case 0x08: break;   // Mixer ... zelda ww jmps to 0x0485
-		case 0x09: break;   // dunno ... zelda ww jmps to 0x044d
- */
-
-		// DsetDolbyDelay ... zelda ww jumps to 0x00b2
-		case 0x0d:
-		{
-			u32 tmp = Read32();
-			DEBUG_LOG(DSPHLE, "DSetDolbyDelay");
-			DEBUG_LOG(DSPHLE, "DOLBY2_DELAY_BUF (size 0x960):      0x%08x", tmp);
-		}
-			break;
-
-			// This opcode, in the SMG ucode, sets the base address for audio data transfers from main memory (using DMA).
-			// In the Zelda ucode, it is dummy, because this ucode uses accelerator for audio data transfers.
-		case 0x0e:
-			{
-				m_DMABaseAddr = Read32() & 0x7FFFFFFF;
-				DEBUG_LOG(DSPHLE, "DsetDMABaseAddr");
-				DEBUG_LOG(DSPHLE, "DMA base address:                   0x%08x", m_DMABaseAddr);
-			}
-			break;
-
-		// default ... zelda ww jumps to 0x0043
-		default:
-			PanicAlert("Zelda UCode - unknown command: %x (size %i)", Command, m_numSteps);
-			break;
-	}
-
-	// sync, we are ready
-	if (IsLightVersion())
-	{
-		if (m_bSyncCmdPending)
-			m_rMailHandler.PushMail(0x80000000 | m_NumBuffers); // after CMD_2
-		else	
-			m_rMailHandler.PushMail(0x80000000 | Sync); // after CMD_0, CMD_1
-	}
-	else
-	{
-		m_rMailHandler.PushMail(DSP_SYNC);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-		m_rMailHandler.PushMail(0xF3550000 | Sync);
-	}
-}
-
-u32 CUCode_Zelda::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_Zelda::DoState(PointerWrap &p)
-{
-	// It's bad if we try to save during Mix()
-	std::lock_guard<std::mutex> lk(m_csMix);
-
-	p.Do(m_AFCCoefTable);
-	p.Do(m_MiscTable);
-
-	p.Do(m_bSyncInProgress);
-	p.Do(m_MaxVoice);
-	p.Do(m_SyncFlags);
-
-	p.Do(m_NumSyncMail);
-
-	p.Do(m_NumVoices);
-
-	p.Do(m_bSyncCmdPending);
-	p.Do(m_CurVoice);
-	p.Do(m_CurBuffer);
-	p.Do(m_NumBuffers);
-
-	p.Do(m_VoicePBsAddr);
-	p.Do(m_UnkTableAddr);
-	p.Do(m_AFCCoefTableAddr);
-	p.Do(m_ReverbPBsAddr);
-
-	p.Do(m_RightBuffersAddr);
-	p.Do(m_LeftBuffersAddr);
-	p.Do(m_pos);
-
-	p.Do(m_DMABaseAddr);
-
-	p.Do(m_numSteps);
-	p.Do(m_bListInProgress);
-	p.Do(m_step);
-	p.Do(m_Buffer);
-
-	p.Do(m_readOffset);
-
-	p.Do(m_MailState);
-	p.Do(m_PBMask);
-
-	p.Do(m_NumPBs);
-	p.Do(m_PBAddress);
-	p.Do(m_PBAddress2);
-
-	DoStateShared(p);
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
deleted file mode 100644
index 29a9678ed2..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODE_ZELDA_H
-#define _UCODE_ZELDA_H
-
-#include "Common.h"
-#include "UCodes.h"
-
-// Obviously missing things that must be in here, somewhere among the "unknown":
-//   * Volume
-//   * L/R Pan
-//   * (probably) choice of resampling algorithm (point, linear, cubic)
-
-union ZeldaVoicePB
-{
-	struct 
-	{
-		// Read-Write part
-		u16 Status;						// 0x00 | 1 = play, 0 = stop
-		u16 KeyOff;						// 0x01 | writing 1 stops voice? 
-		u16 RatioInt;					// 0x02 | Position delta (playback speed)
-		u16 Unk03;						// 0x03 | unknown
-		u16 NeedsReset;					// 0x04 | indicates if some values in PB need to be reset
-		u16 ReachedEnd;					// 0x05 | set to 1 when end reached
-		u16 IsBlank;					// 0x06 | 0 = normal sound, 1 = samples are always the same
-		u16 Unk07;						// 0x07 | unknown, in zelda always 0x0010. Something to do with number of saved samples (0x68)?
-
-		u16 SoundType;					// 0x08 | "Sound type": so far in zww: 0x0d00 for music (volume mode 0), 0x4861 for sfx (volume mode 1)
-		u16 volumeLeft1;				// 0x09 | Left Volume 1   // There's probably two of each because they should be ramped within each frame.
-		u16 volumeLeft2;				// 0x0A | Left Volume 2
-		u16 Unk0B;						// 0x0B | unknown
-
-		u16 SoundType2;					// 0x0C | "Sound type" 2   (not really sound type)
-		u16 volumeRight1;				// 0x0D | Right Volume 1
-		u16 volumeRight2;				// 0x0E | Right Volume 2
-		u16 Unk0F;						// 0x0F | unknown
-
-		u16 SoundType3;					// 0x10 | "Sound type" 3   (not really sound type)
-		u16 volumeUnknown1_1;			// 0x11 | Unknown Volume 1
-		u16 volumeUnknown1_2;			// 0x12 | Unknown Volume 1
-		u16 Unk13;						// 0x13 | unknown
-
-		u16 SoundType4;					// 0x14 | "Sound type" 4   (not really sound type)
-		u16 volumeUnknown2_1;			// 0x15 | Unknown Volume 2
-		u16 volumeUnknown2_2;			// 0x16 | Unknown Volume 2
-		u16 Unk17;						// 0x17 | unknown
-
-		u16 Unk18[0x10];				// 0x18 | unknown
-		u16 Unk28;						// 0x28 | unknown  
-		u16 Unk29;						// 0x29 | unknown  // multiplied by 0x2a @ 0d21/ZWW
-		u16 Unk2a;						// 0x2A | unknown  // loaded at 0d2e/ZWW
-		u16 Unk2b;						// 0x2B | unknown  
-		u16 VolumeMode;					// 0x2C | unknown  // See 0337/ZWW
-		u16 Unk2D;						// 0x2D | unknown
-		u16 Unk2E;						// 0x2E | unknown
-		u16 Unk2F;						// 0x2F | unknown
-		u16 CurSampleFrac;				// 0x30 | Fractional part of the current sample position
-		u16 Unk31;						// 0x31 | unknown / unused
-		u16 CurBlock;					// 0x32 | current block? used by zelda's AFC decoder. we don't need it.
-		u16 FixedSample;				// 0x33 | sample value for "blank" voices
-		u32 RestartPos;					// 0x34 | restart pos  / "loop start offset"
-		u16 Unk36[2];					// 0x36 | unknown   // loaded at 0adc/ZWW in 0x21 decoder
-		u32 CurAddr;					// 0x38 | current address
-		u32 RemLength;					// 0x3A | remaining length
-		u16 ResamplerOldData[4];		// 0x3C | The resampler stores the last 4 decoded samples here from the previous frame, so that the filter kernel has something to read before the start of the buffer.
-		u16 Unk40[0x10];				// 0x40 | Used as some sort of buffer by IIR
-		u16 Unk50[0x8];	 				// 0x50 | Used as some sort of buffer by 06ff/ZWW
-		u16 Unk58[0x8];	 				// 0x58 |
-		u16 Unk60[0x6];	 				// 0x60 |
-		u16 YN2;						// 0x66 | YN2
-		u16 YN1;						// 0x67 | YN1
-		u16 Unk68[0x10];				// 0x68 | Saved samples from last decode?
-		u16 FilterState1;				// 0x78 | unknown  // ZWW: 0c84_FilterBufferInPlace loads and stores. Simply, the filter state.
-		u16 FilterState2;				// 0x79 | unknown  // ZWW: same as above.  these two are active if 0x04a8 != 0.
-		u16 Unk7A;						// 0x7A | unknown
-		u16 Unk7B;						// 0x7B | unknown  
-		u16 Unk7C;						// 0x7C | unknown
-		u16 Unk7D;						// 0x7D | unknown
-		u16 Unk7E;						// 0x7E | unknown
-		u16 Unk7F;						// 0x7F | unknown
-
-		// Read-only part
-		u16 Format;						// 0x80 | audio format
-		u16 RepeatMode;					// 0x81 | 0 = one-shot, non zero = loop
-		u16 LoopYN1;					// 0x82 | YN1 reload (when AFC loops)
-		u16 LoopYN2;					// 0x83 | YN2 reload (when AFC loops)
-		u16 Unk84;						// 0x84 | IIR Filter # coefs?
-		u16 StopOnSilence;				// 0x85 | Stop on silence? (Flag for something volume related. Decides the weird stuff at 035a/ZWW, alco 0cd3)
-		u16 Unk86;						// 0x86 | unknown
-		u16 Unk87;						// 0x87 | unknown
-		u32 LoopStartPos;				// 0x88 | loopstart pos
-		u32 Length;						// 0x8A | sound length
-		u32 StartAddr;					// 0x8C | sound start address
-		u32 UnkAddr;					// 0x8E | ???
-		u16 Padding[0x10];				// 0x90 | padding
-		u16 Padding2[0x8];				// 0xa0 | FIR filter coefs of some sort (0xa4 controls the appearance of 0xa5-0xa7 and is almost always 0x7FFF)
-		u16 FilterEnable;				// 0xa8 | FilterBufferInPlace enable
-		u16 Padding3[0x7];				// 0xa9 | padding
-		u16 Padding4[0x10];				// 0xb0 | padding
-	};
-	u16 raw[0xc0]; // WARNING-do not use on parts of the 32-bit values - they are swapped!
-};
-
-union ZeldaUnkPB
-{
-	struct
-	{
-		u16 Control;					// 0x00 | control
-		u16 Unk01;						// 0x01 | unknown
-		u32 SrcAddr;					// 0x02 | some address
-		u16 Unk04[0xC];					// 0x04 | unknown
-	};
-	u16 raw[16];
-};
-
-class CUCode_Zelda : public IUCode
-{
-public:
-	CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC);
-	virtual ~CUCode_Zelda();
-	u32 GetUpdateMs();
-
-	void HandleMail(u32 _uMail);
-	void HandleMail_LightVersion(u32 _uMail);
-	void HandleMail_SMSVersion(u32 _uMail);
-	void HandleMail_NormalVersion(u32 _uMail);
-
-	void Update(int cycles);
-	void MixAdd(short* buffer, int size);
-
-	void CopyPBsFromRAM();
-	void CopyPBsToRAM();
-
-	void DoState(PointerWrap &p);
-
-	int *templbuffer;
-	int *temprbuffer;
-
-	// Simple dump ...
-	int DumpAFC(u8* pIn, const int size, const int srate);
-
-	u32 Read32()
-	{
-		u32 res = *(u32*)&m_Buffer[m_readOffset];
-		m_readOffset += 4;
-		return res;
-	}
-
-private:
-	// These map CRC to behaviour.
-
-	// DMA version
-	// - sound data transferred using DMA instead of accelerator
-	bool IsDMAVersion() const
-	{
-		switch (m_CRC)
-		{
-			case 0xb7eb9a9c: // Wii Pikmin - PAL
-			case 0xeaeb38cc: // Wii Pikmin 2 - PAL
-			case 0x6c3f6f94: // Wii Zelda TP - PAL
-			case 0xD643001F: // Super Mario Galaxy
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	// Light version
-	// - slightly different communication protocol (no list begin mail)
-	// - exceptions and interrupts not used
-	bool IsLightVersion() const
-	{
-		switch (m_CRC)
-		{
-			case 0x6ba3b3ea: // IPL - PAL
-			case 0x24b22038: // IPL - NTSC/NTSC-JAP
-			case 0x42f64ac4: // Luigi
-			case 0x4be6a5cb: // AC, Pikmin NTSC
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	// SMS version
-	// - sync mails are sent every frame, not every 16 PBs
-	// (named SMS because it's used by Super Mario Sunshine
-	// and I couldn't find a better name)
-	bool IsSMSVersion() const
-	{
-		switch (m_CRC)
-		{
-			case 0x56d36052: // Super Mario Sunshine
-			case 0x267fd05a: // Pikmin PAL
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	// These are the only dynamically allocated things allowed in the ucode.
-	s32* m_VoiceBuffer;
-	s16* m_ResampleBuffer;
-	s32* m_LeftBuffer;
-	s32* m_RightBuffer;
-
-	// If you add variables, remember to keep DoState() and the constructor up to date.
-
-	s16 m_AFCCoefTable[32];
-	s16 m_MiscTable[0x280];
-
-	bool m_bSyncInProgress;
-	u32 m_MaxVoice;
-	u32 m_SyncFlags[16];
-
-	// Used by SMS version
-	u32 m_NumSyncMail;
-
-	u32 m_NumVoices;
-
-	bool m_bSyncCmdPending;
-	u32 m_CurVoice;
-	u32 m_CurBuffer;
-	u32 m_NumBuffers;
-
-	// Those are set by command 0x1 (DsetupTable)
-	u32 m_VoicePBsAddr;
-	u32 m_UnkTableAddr;
-	u32 m_AFCCoefTableAddr;
-	u32 m_ReverbPBsAddr;
-
-	u32 m_RightBuffersAddr;
-	u32 m_LeftBuffersAddr;
-	//u32 m_unkAddr;
-	u32 m_pos;
-
-	// Only in SMG ucode
-	// Set by command 0xE (DsetDMABaseAddr)
-	u32 m_DMABaseAddr;
-
-	// List, buffer management =====================
-	u32 m_numSteps;
-	bool m_bListInProgress;
-	u32 m_step;
-	u8 m_Buffer[1024];
-
-	u32 m_readOffset;
-
-	enum EMailState
-	{
-		WaitForMail,
-		ReadingFrameSync,
-		ReadingMessage,
-		ReadingSystemMsg
-	};
-
-	EMailState m_MailState;
-	u16 m_PBMask[0x10];
-
-	u32 m_NumPBs;
-	u32 m_PBAddress;   // The main param block array
-	u32 m_PBAddress2;  // 4 smaller param blocks
-
-	void ExecuteList();
-
-	u8 *GetARAMPointer(u32 address);
-
-	// AFC decoder
-	static void AFCdecodebuffer(const s16 *coef, const char *input, signed short *out, short *histp, short *hist2p, int type);
-
-	void ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB);
-	void WritebackVoicePB(u32 _Addr, ZeldaVoicePB& PB);
-
-	// Voice formats
-	void RenderSynth_Constant(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
-	void RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
-	void RenderSynth_SawWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
-	void RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Size);
-
-	void RenderVoice_PCM8(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
-	void RenderVoice_PCM16(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
-
-	void RenderVoice_AFC(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
-	void RenderVoice_Raw(ZeldaVoicePB& PB, s16* _Buffer, int _Size);
-
-	void Resample(ZeldaVoicePB &PB, int size, s16 *in, s32 *out, bool do_resample = false);
-
-	int ConvertRatio(int pb_ratio);
-	int SizeForResampling(ZeldaVoicePB &PB, int size, int ratio);
-
-	// Renders a voice and mixes it into LeftBuffer, RightBuffer
-	void RenderAddVoice(ZeldaVoicePB& PB, s32* _LeftBuffer, s32* _RightBuffer, int _Size);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
deleted file mode 100644
index 1fbfaebaba..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "UCode_Zelda.h"
-
-void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed short *out, short *histp, short *hist2p, int type)
-{
-	// First 2 nibbles are ADPCM scale etc.
-	short delta = 1 << (((*src) >> 4) & 0xf);
-	short idx = (*src) & 0xf;
-	src++;
-
-	short nibbles[16];
-	if (type == 9)
-	{
-		for (int i = 0; i < 16; i += 2)
-		{
-			nibbles[i + 0] = *src >> 4;
-			nibbles[i + 1] = *src & 15;
-			src++;
-		}
-		for (int i = 0; i < 16; i++) {
-			if (nibbles[i] >= 8) 
-				nibbles[i] = nibbles[i] - 16;
-			nibbles[i] <<= 11;
-		}
-	}
-	else
-	{
-		// In Pikmin, Dolphin's engine sound is using AFC type 5, even though such a sound is hard
-		// to compare, it seems like to sound exactly like a real GC
-		// In Super Mario Sunshine, you can get such a sound by talking to/jumping on anyone
-		for (int i = 0; i < 16; i += 4)
-		{
-			nibbles[i + 0] = (*src >> 6) & 0x03;
-			nibbles[i + 1] = (*src >> 4) & 0x03;
-			nibbles[i + 2] = (*src >> 2) & 0x03;
-			nibbles[i + 3] = (*src >> 0) & 0x03;
-			src++;
-		}
-
-		for (int i = 0; i < 16; i++) 
-		{
-			if (nibbles[i] >= 2) 
-				nibbles[i] = nibbles[i] - 4;
-			nibbles[i] <<= 13;
-		}
-	}
-
-	short hist = *histp;
-	short hist2 = *hist2p;
-	for (int i = 0; i < 16; i++)
-	{
-		int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
-		sample >>= 11;
-		if (sample > 32767)
-			sample = 32767;
-		if (sample < -32768)
-			sample = -32768;
-		out[i] = sample;
-		hist2 = hist;
-		hist = (short)sample;
-	}
-	*histp = hist;
-	*hist2p = hist2;
-} 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Obsolete.txt b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Obsolete.txt
deleted file mode 100644
index 441789a550..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Obsolete.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-
-#if 0
-void CUCode_Zelda::UpdatePB(ZPB& _rPB, int *templbuffer, int *temprbuffer, u32 _Size)
-{
-    u16* pTest = (u16*)&_rPB;
-
-	// Checks at 0293
-    if (pTest[0x00] == 0) 
-        return;
-
-    if (pTest[0x01] != 0)
-        return;
-  
-
-    if (pTest[0x06] != 0x00)
-    {
-        // probably pTest[0x06] == 0 -> AFC (and variants)
-		// See 02a4
-    }
-    else
-    {
-        switch (_rPB.type)  // or Bytes per Sample
-        {
-        case 0x05:
-        case 0x09:
-            {
-                // initialize "decoder" if the sample is played the first time
-                if (pTest[0x04] != 0)
-                {
-					// This is 0717_ReadOutPBStuff
-
-					// increment 4fb
-
-                    // zelda: 
-                    // perhaps init or "has played before"
-                    pTest[0x32] = 0x00;
-					pTest[0x66] = 0x00;     // history1 
-                    pTest[0x67] = 0x00;     // history2 
-
-                    // samplerate? length? num of samples? i dunno...
-					// Likely length...
-                    pTest[0x3a] = pTest[0x8a];
-                    pTest[0x3b] = pTest[0x8b];
-
-                    // Copy ARAM addr from r to rw area.
-                    pTest[0x38] = pTest[0x8c];
-                    pTest[0x39] = pTest[0x8d];
-                }
-
-                if (pTest[0x01] != 0)  // 0747 early out... i dunno if this can happen because we filter it above
-                    return;
-
-                u32 ARAMAddr        = (pTest[0x38] << 16) | pTest[0x39];
-                u32 NumberOfSamples = (pTest[0x3a] << 16) | pTest[0x3b];
-
-				// round upwards how many samples we need to copy, 0759
-                NumberOfSamples = (NumberOfSamples + 0xf) >> 4;   // i think the lower 4 are the fraction
-                u32 frac = NumberOfSamples & 0xF;
-
-                u8 inBuffer[9];
-                short outbuf[16];
-                u32 sampleCount = 0;
-
-				// It must be something like this:
-
-				// The PB contains a small sample buffer of 0x4D decoded samples.
-				// If it's empty or "used", decode to it.
-				// Then, resample from this buffer to the output as you go. When it needs
-				// wrapping, decode more.
-				
-#define USE_RESAMPLE
-#if !defined(USE_RESAMPLE)
-                for (int s = 0; s < _Size/16; s++)
-                {
-                    for (int i = 0; i < 9; i++)    
-                    {
-                        inBuffer[i] = DSP::ReadARAM(ARAMAddr);
-                        ARAMAddr++;
-                    }
-                                        
-                    AFCdecodebuffer((char*)inBuffer, outbuf, (short*)&pTest[0x66], (short*)&pTest[0x67]);
-
-                    for (int i = 0; i < 16; i++)
-                    {
-                        templbuffer[sampleCount] += outbuf[i];
-                        temprbuffer[sampleCount] += outbuf[i];
-                        sampleCount++;
-                    }
-
-                    NumberOfSamples--;
-
-                    if (NumberOfSamples<=0)
-                        break;
-                }
-#else
-                while (NumberOfSamples > 0)
-                {
-                    for (int i = 0; i < 9; i++)    
-                    {
-                        inBuffer[i] =  DSP::ReadARAM(ARAMAddr);
-                        ARAMAddr++;
-                    }
-
-                    AFCdecodebuffer(m_AFCCoefTable, (char*)inBuffer, outbuf, (short*)&pTest[0x66], (short*)&pTest[0x67], 9);
-                    CResampler Sampler(outbuf, 16, 48000);
-
-                    while (Sampler.m_queueSize > 0) 
-                    {
-                        int sample = Sampler.sample_queue.front();
-                        Sampler.sample_queue.pop();
-                        Sampler.m_queueSize -= 1;
-
-                        templbuffer[sampleCount] += sample;
-                        temprbuffer[sampleCount] += sample;
-                        sampleCount++;
-
-                        if (sampleCount > _Size)
-                            break;
-                    }
-
-                    if (sampleCount > _Size)
-                        break;
-
-                    NumberOfSamples--;
-                }
-#endif
-                if (NumberOfSamples == 0)
-                {
-                    pTest[0x01] = 1; // we are done ??
-                }
-
-                // write back
-                NumberOfSamples = (NumberOfSamples << 4);    // missing fraction
-
-                pTest[0x38] = ARAMAddr >> 16;
-                pTest[0x39] = ARAMAddr & 0xFFFF;
-                pTest[0x3a] = NumberOfSamples >> 16;
-                pTest[0x3b] = NumberOfSamples & 0xFFFF;
-                
-
-#if 0
-                NumberOfSamples = (NumberOfSamples + 0xf) >> 4;
-                
-                static u8 Buffer[500000];
-                for (int i =0; i<NumberOfSamples*9; i++)
-                {
-                    Buffer[i] = DSP::ReadARAM(ARAMAddr+i);
-                }
-
-                // yes, the dumps are really zelda sound ;)
-                DumpAFC(Buffer, NumberOfSamples*9, 0x3d00);
-
-                DumpPB(_rPB);
-
-             //   exit(1);
-#endif
-
-                // i think  pTest[0x3a] and pTest[0x3b] got an update after you have decoded some samples...
-                // just decrement them with the number of samples you have played
-                // and incrrease the ARAM Offset in pTest[0x38], pTest[0x39]
-
-
-                // end of block (Zelda 03b2)
-                if (pTest[0x06] == 0)
-                {
-					// 02a4
-					//
-
-                    pTest[0x04] = 0;
-                }
-            }
-            break;
-
-        default:
-			ERROR_LOG(DSPHLE, "Zelda Ucode: Unknown PB type %i", _rPB.type);
-			break;
-        }
-    }
-}
-#endif
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
deleted file mode 100644
index cc7fd68ea0..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-
-#include "UCodes.h"
-#include "UCode_Zelda.h"
-#include "AudioCommon.h"
-
-#include "Mixer.h"
-
-void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
-{
-	float _ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
-	u32 _ratio = (PB.RatioInt << 16);
-	s64 ratio = (s64)((_ratio * _ratioFactor) * 16);
-	s64 TrueSamplePosition = PB.CurSampleFrac;
-
-	// PB.Format == 0x3 -> Rectangular Wave, 0x0 -> Square Wave
-	unsigned int mask = PB.Format ? 3 : 1; 
-	// int shift = PB.Format ? 2 : 1; // Unused?
-	
-	u32 pos[2] = {0, 0};
-	int i = 0;
-
-	if (PB.KeyOff != 0)
-		return;
-
-	if (PB.NeedsReset)
-	{
-		PB.RemLength = PB.Length - PB.RestartPos;
-		PB.CurAddr =  PB.StartAddr + (PB.RestartPos << 1);
-		PB.ReachedEnd = 0;
-	}
-
-_lRestart:
-	if (PB.ReachedEnd)
-	{
-		PB.ReachedEnd = 0;
-
-		if (PB.RepeatMode == 0)
-		{
-			PB.KeyOff = 1;
-			PB.RemLength = 0;
-			PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1) + PB.Length;
-			return;
-		}
-		else
-		{
-			PB.RestartPos = PB.LoopStartPos;
-			PB.RemLength = PB.Length - PB.RestartPos;
-			PB.CurAddr =  PB.StartAddr + (PB.RestartPos << 1);
-			pos[1] = 0; pos[0] = 0;
-		}
-	}
-
-	while(i < _Size) 
-	{
-		s16 sample = ((pos[1] & mask) == mask) ? 0xc000 : 0x4000;
-
-		TrueSamplePosition += (ratio >> 16);
-
-		_Buffer[i++] = (s32)sample;
-
-		(*(u64*)&pos) += ratio;
-		if ((pos[1] + ((PB.CurAddr - PB.StartAddr) >> 1)) >= PB.Length)
-		{
-			PB.ReachedEnd = 1;
-			goto _lRestart;
-		}
-	}
-
-	if (PB.RemLength < pos[1])
-	{
-		PB.RemLength = 0;
-		PB.ReachedEnd = 1;
-	}
-	else
-	{
-		PB.RemLength -= pos[1];
-	}
-
-	PB.CurSampleFrac = TrueSamplePosition & 0xFFFF;
-}
-
-void CUCode_Zelda::RenderSynth_SawWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size) 
-{
-	s32 ratio = (s32)ceil((float)PB.RatioInt / 3);
-	s64 pos = PB.CurSampleFrac;
-
-	for (int i = 0; i < _Size; i++) 
-	{
-		pos += ratio;
-		_Buffer[i] = pos & 0xFFFF;
-	}
-
-	PB.CurSampleFrac = pos & 0xFFFF;
-}
-
-void CUCode_Zelda::RenderSynth_Constant(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
-{
-	// TODO: Header, footer
-	for (int i = 0; i < _Size; i++)
-		_Buffer[i] = (s32)PB.RatioInt;
-}
-
-// A piece of code from LLE so we can see how the wrap register affects the sound
-
-inline u16 AddValueToReg(u32 ar, s32 ix)
-{
-	u32 wr = 0x3f;
-	u32 mx = (wr | 1) << 1;
-	u32 nar = ar + ix;
-	u32 dar = (nar ^ ar ^ ix) & mx;
-
-	if (ix >= 0)
-	{
-		if (dar > wr) //overflow
-			nar -= wr + 1;
-	}
-	else
-	{
-		if ((((nar + wr + 1) ^ nar) & dar) <= wr) //underflow or below min for mask
-			nar += wr + 1;
-	}
-	return nar;
-}
-
-void CUCode_Zelda::RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
-{
-	u16 address;
-
-	switch(PB.Format)
-	{
-	default:
-	case 0x0004:
-		address = 0x140;
-		break;
-
-	case 0x0007:
-		address = 0x100;
-		break;
-
-	case 0x000b:
-		address = 0x180;
-		break;
-
-	case 0x000c:
-		address = 0x1c0;
-		break;
-	}
-
-	// TODO: Resample this!
-	INFO_LOG(DSPHLE, "Synthesizing the incomplete format 0x%04x", PB.Format);
-
-	u64 ACC0 = PB.CurSampleFrac << 6;
-
-	ACC0 &= 0xffff003fffffULL;
-
-	address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
-	ACC0 &= 0xffff0000ffffULL;
-
-	for(int i = 0; i < 0x50; i++) 
-	{
-		_Buffer[i] = m_MiscTable[address];
-	
-		ACC0 += PB.RatioInt << 5;
-		address = AddValueToReg(address, ((ACC0 >> 16) & 0xffff));
-
-		ACC0 &= 0xffff0000ffffULL;
-	}
-
-	ACC0 += address << 16;
-	PB.CurSampleFrac = (ACC0 >> 6) & 0xffff;
-}
-
-
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
deleted file mode 100644
index 9c3fedddb3..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
+++ /dev/null
@@ -1,793 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <sstream>
-
-#include "UCodes.h"
-#include "UCode_Zelda.h"
-
-#include "AudioCommon.h"
-#include "Mixer.h"
-#include "../../Memmap.h"
-#include "../../DSP.h"
-
-void CUCode_Zelda::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB)
-{
-	u16 *memory = (u16*)Memory::GetPointer(_Addr);
-
-	// Perform byteswap
-	for (int i = 0; i < (0x180 / 2); i++)
-		((u16*)&PB)[i] = Common::swap16(memory[i]);
-
-	// Word swap all 32-bit variables.
-	PB.RestartPos = (PB.RestartPos << 16) | (PB.RestartPos >> 16);
-	PB.CurAddr = (PB.CurAddr << 16) | (PB.CurAddr >> 16);
-	PB.RemLength = (PB.RemLength << 16) | (PB.RemLength >> 16);
-	// Read only part
-	PB.LoopStartPos = (PB.LoopStartPos << 16) | (PB.LoopStartPos >> 16);
-	PB.Length = (PB.Length << 16) | (PB.Length >> 16);
-	PB.StartAddr = (PB.StartAddr << 16) | (PB.StartAddr >> 16);
-	PB.UnkAddr = (PB.UnkAddr << 16) | (PB.UnkAddr >> 16);
-}
-
-void CUCode_Zelda::WritebackVoicePB(u32 _Addr, ZeldaVoicePB& PB)
-{
-	u16 *memory = (u16*)Memory::GetPointer(_Addr);
-
-	// Word swap all 32-bit variables.
-	PB.RestartPos = (PB.RestartPos << 16) | (PB.RestartPos >> 16);
-	PB.CurAddr = (PB.CurAddr << 16) | (PB.CurAddr >> 16);
-	PB.RemLength = (PB.RemLength << 16) | (PB.RemLength >> 16);
-
-	// Perform byteswap
-	// Only the first 0x100 bytes are written back
-	for (int i = 0; i < (0x100 / 2); i++)
-		memory[i] = Common::swap16(((u16*)&PB)[i]);
-}
-
-int CUCode_Zelda::ConvertRatio(int pb_ratio)
-{
-	float _ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
-	u32 _ratio = (pb_ratio << 16);
-	return (u64)((_ratio * _ratioFactor) * 16) >> 16;
-}
-
-int CUCode_Zelda::SizeForResampling(ZeldaVoicePB &PB, int size, int ratio) {
-	// This is the little calculation at the start of every sample decoder
-	// in the ucode.
-	return (PB.CurSampleFrac + size * ConvertRatio(PB.RatioInt)) >> 16;
-}
-
-// Simple resampler, linear interpolation.
-// Any future state should be stored in PB.raw[0x3c to 0x3f].
-// In must point 4 samples into a buffer.
-void CUCode_Zelda::Resample(ZeldaVoicePB &PB, int size, s16 *in, s32 *out, bool do_resample)
-{
-	if (!do_resample)
-	{
-		memcpy(out, in, size * sizeof(int));
-		return;
-	}
-
-	for (int i = 0; i < 4; i++)
-	{
-		in[i - 4] = (s16)PB.ResamplerOldData[i];
-	}
-
-	int ratio = ConvertRatio(PB.RatioInt);
-	int in_size = SizeForResampling(PB, size, ratio);
-	
-	int position = PB.CurSampleFrac;
-	for (int i = 0; i < size; i++)
-	{
-		int int_pos = (position >> 16);
-		int frac = ((position & 0xFFFF) >> 1);
-		out[i] = (in[int_pos - 3] * (frac ^ 0x7FFF) + in[int_pos - 2] * frac) >> 15;
-		position += ratio;
-	}
-
-	for (int i = 0; i < 4; i++)
-	{
-		PB.ResamplerOldData[i] = (u16)(s16)in[in_size - 4 + i];
-	}
-	PB.CurSampleFrac = position & 0xFFFF;
-}
-
-void UpdateSampleCounters10(ZeldaVoicePB &PB)
-{
-	PB.RemLength = PB.Length - PB.RestartPos;
-	PB.CurAddr = PB.StartAddr + (PB.RestartPos << 1);
-	PB.ReachedEnd = 0;
-}
-
-void CUCode_Zelda::RenderVoice_PCM16(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
-{
-	int _RealSize = SizeForResampling(PB, _Size, PB.RatioInt);
-	u32 rem_samples = _RealSize;
-	if (PB.KeyOff)
-		goto clear_buffer;
-	if (PB.NeedsReset)
-	{
-		UpdateSampleCounters10(PB);
-		for (int i = 0; i < 4; i++) 
-			PB.ResamplerOldData[i] = 0;  // Doesn't belong here, but dunno where to do it.
-	}
-	if (PB.ReachedEnd)
-	{
-		PB.ReachedEnd = 0;
-reached_end:
-		if (!PB.RepeatMode)
-		{
-			// One shot - play zeros the rest of the buffer.
-clear_buffer:
-			for (u32 i = 0; i < rem_samples; i++)
-				*_Buffer++ = 0;
-			PB.KeyOff = 1;
-			return;
-		}
-		else
-		{
-			PB.RestartPos = PB.LoopStartPos;
-			UpdateSampleCounters10(PB);
-		}
-	}
-	// SetupAccelerator
-	const s16 *read_ptr = (s16*)GetARAMPointer(PB.CurAddr);
-	if (PB.RemLength < (u32)rem_samples)
-	{
-		// finish-up loop
-		for (u32 i = 0; i < PB.RemLength; i++)
-			*_Buffer++ = Common::swap16(*read_ptr++);
-		rem_samples -= PB.RemLength;
-		goto reached_end;
-	}
-	// main render loop
-	for (u32 i = 0; i < rem_samples; i++)
-		*_Buffer++ = Common::swap16(*read_ptr++);
-
-	PB.RemLength -= rem_samples;
-	if (PB.RemLength == 0)
-		PB.ReachedEnd = 1;
-	PB.CurAddr += rem_samples << 1;
-}
-
-void UpdateSampleCounters8(ZeldaVoicePB &PB)
-{
-	PB.RemLength = PB.Length - PB.RestartPos;
-	PB.CurAddr = PB.StartAddr + PB.RestartPos;
-	PB.ReachedEnd = 0;
-}
-
-void CUCode_Zelda::RenderVoice_PCM8(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
-{
-	int _RealSize = SizeForResampling(PB, _Size, PB.RatioInt);
-	u32 rem_samples = _RealSize;
-	if (PB.KeyOff)
-		goto clear_buffer;
-	if (PB.NeedsReset)
-	{
-		UpdateSampleCounters8(PB);
-		for (int i = 0; i < 4; i++) 
-			PB.ResamplerOldData[i] = 0;  // Doesn't belong here, but dunno where to do it.
-	}
-	if (PB.ReachedEnd)
-	{
-reached_end:
-		PB.ReachedEnd = 0;
-		if (!PB.RepeatMode)
-		{
-			// One shot - play zeros the rest of the buffer.
-clear_buffer:
-			for (u32 i = 0; i < rem_samples; i++)
-				*_Buffer++ = 0;
-			PB.KeyOff = 1;
-			return;
-		}
-		else
-		{
-			PB.RestartPos = PB.LoopStartPos;
-			UpdateSampleCounters8(PB);
-		}
-	}
-
-	// SetupAccelerator
-	const s8 *read_ptr = (s8*)GetARAMPointer(PB.CurAddr);
-	if (PB.RemLength < (u32)rem_samples)
-	{
-		// finish-up loop
-		for (u32 i = 0; i < PB.RemLength; i++)
-			*_Buffer++ = (s8)(*read_ptr++) << 8;
-		rem_samples -= PB.RemLength;
-		goto reached_end;
-	}
-	// main render loop
-	for (u32 i = 0; i < rem_samples; i++)
-		*_Buffer++ = (s8)(*read_ptr++) << 8;
-
-	PB.RemLength -= rem_samples;
-	if (PB.RemLength == 0)
-		PB.ReachedEnd = 1;
-	PB.CurAddr += rem_samples;
-}
-
-template <typename T> 
-void PrintObject(const T &Obj) 
-{
-	std::stringstream ss;
-	u8 *o = (u8 *)&Obj;
-
-	// If this miscompiles, adjust the size of
-	// ZeldaVoicePB to 0x180 bytes (0xc0 shorts).
-	static_assert(sizeof(ZeldaVoicePB) == 0x180, "ZeldaVoicePB incorrectly defined.");
-
-	ss << std::hex;
-	for (size_t i = 0; i < sizeof(T); i++)
-	{
-		if((i & 1) == 0)
-			ss << ' ';
-		ss.width(2);
-		ss.fill('0');
-		ss << Common::swap16(o[i]);
-	}
-
-	DEBUG_LOG(DSPHLE, "AFC PB:%s", ss.str().c_str());
-}
-
-void CUCode_Zelda::RenderVoice_AFC(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
-{
-	// TODO: Compare mono, stereo and surround samples
-#if defined DEBUG || defined DEBUGFAST
-	PrintObject(PB);
-#endif
-
-	int _RealSize = SizeForResampling(PB, _Size, PB.RatioInt);
-
-	// initialize "decoder" if the sample is played the first time
-	if (PB.NeedsReset != 0)
-	{
-		// This is 0717_ReadOutPBStuff
-		// increment 4fb
-		// zelda: 
-		// perhaps init or "has played before"
-		PB.CurBlock = 0x00;
-		PB.YN2 = 0x00;     // history1 
-		PB.YN1 = 0x00;     // history2 
-
-		// Length in samples.
-		PB.RemLength = PB.Length;
-		// Copy ARAM addr from r to rw area.
-		PB.CurAddr = PB.StartAddr;
-		PB.ReachedEnd = 0;
-		PB.CurSampleFrac = 0;
-
-		for (int i = 0; i < 4; i++) 
-			PB.ResamplerOldData[i] = 0;
-	}
-
-	if (PB.KeyOff != 0)  // 0747 early out... i dunno if this can happen because we filter it above
-	{
-		for (int i = 0; i < _RealSize; i++)
-			*_Buffer++ = 0;
-		return;
-	}
-
-	// Round upwards how many samples we need to copy, 0759
-	// u32 frac = NumberOfSamples & 0xF;
-	// NumberOfSamples = (NumberOfSamples + 0xf) >> 4;   // i think the lower 4 are the fraction
-
-	const u8 *source;
-	u32 ram_mask = 1024 * 1024 * 16 - 1;
-	if (IsDMAVersion())
-	{
-		source = Memory::GetPointer(m_DMABaseAddr);
-		ram_mask = 1024 * 1024 * 64 - 1;
-	}
-	else
-	{
-		source = DSP::GetARAMPtr();
-	}
-
-	int sampleCount = 0;  // must be above restart.
-
-restart:
-	if (PB.ReachedEnd)
-	{
-		PB.ReachedEnd = 0;
-
-		if ((PB.RepeatMode == 0) || (!PB.StopOnSilence == 0))
-		{
-			PB.KeyOff = 1;
-			PB.RemLength = 0;
-			PB.CurAddr = PB.StartAddr + PB.RestartPos + PB.Length;
-			
-			while (sampleCount < _RealSize)
-				_Buffer[sampleCount++] = 0;
-			return;
-		}
-		else
-		{
-			//AFC looping
-			// The loop start pos is incorrect? (Fixed?), so samples will loop a bit wrong.
-			// this fixes the intro music in ZTP.
-			PB.RestartPos = PB.LoopStartPos;
-			PB.RemLength = PB.Length - PB.RestartPos;
-			// see DSP_UC_Zelda.txt line 2817
-			PB.CurAddr = ((((((PB.LoopStartPos >> 4) & 0xffff0000)*PB.Format)<<16)+
-				(((PB.LoopStartPos >> 4) & 0xffff)*PB.Format))+PB.StartAddr) & 0xffffffff;
-
-			// Hmm, this shouldn't be reversed .. or should it? Is it different between versions of the ucode?
-			// -> it has to be reversed in ZTP, otherwise intro music is broken...
-			PB.YN1 = PB.LoopYN2;
-			PB.YN2 = PB.LoopYN1;
-		}
-	}
-
-	short outbuf[16] = {0};
-	u16 prev_yn1 = PB.YN1;
-	u16 prev_yn2 = PB.YN2;
-	u32 prev_addr = PB.CurAddr;
-
-	// Prefill the decode buffer.
-	AFCdecodebuffer(m_AFCCoefTable, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
-	PB.CurAddr += PB.Format;  // 9 or 5
-
-	u32 SamplePosition = PB.Length - PB.RemLength;
-	while (sampleCount < _RealSize)
-	{
-		_Buffer[sampleCount] = outbuf[SamplePosition & 15];
-		sampleCount++;
-
-		SamplePosition++;
-		PB.RemLength--;
-		if (PB.RemLength == 0)
-		{
-			PB.ReachedEnd = 1;
-			goto restart;
-		}
-
-		// Need new samples!
-		if ((SamplePosition & 15) == 0)
-		{
-			prev_yn1 = PB.YN1;
-			prev_yn2 = PB.YN2;
-			prev_addr = PB.CurAddr;
-
-			AFCdecodebuffer(m_AFCCoefTable, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
-			PB.CurAddr += PB.Format;  // 9 or 5
-		}
-	}
-
-	// Here we should back off to the previous addr/yn1/yn2, since we didn't consume the full last block.
-	// We'll re-decode it the next time around.
-	PB.YN2 = prev_yn2;
-	PB.YN1 = prev_yn1;
-	PB.CurAddr = prev_addr;
-
-	PB.NeedsReset = 0;
-	// PB.CurBlock = 0x10 - (PB.LoopStartPos & 0xf);
-	// write back
-	// NumberOfSamples = (NumberOfSamples << 4) | frac;    // missing fraction
-
-	// i think  pTest[0x3a] and pTest[0x3b] got an update after you have decoded some samples...
-	// just decrement them with the number of samples you have played
-	// and increase the ARAM Offset in pTest[0x38], pTest[0x39]
-
-	// end of block (Zelda 03b2)
-}
-
-void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer);
-
-// Researching what's actually inside the mysterious 0x21 case
-// 0x21 seems to really just be reading raw 16-bit audio from RAM (not ARAM).
-// The rules seem to be quite different, though.
-// It's used for streaming, not for one-shot or looped sample playback.
-void CUCode_Zelda::RenderVoice_Raw(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
-{
-	// Decoder0x21 starts here.
-	u32 _RealSize = SizeForResampling(PB, _Size, PB.RatioInt);
-
-	// Decoder0x21Core starts here.
-	u32 AX0 = _RealSize;
-
-	// ERROR_LOG(DSPHLE, "0x21 volume mode: %i , stop: %i ", PB.VolumeMode, PB.StopOnSilence);
-
-	// The PB.StopOnSilence check is a hack, we should check the buffers and enter this
-	// only when the buffer is completely 0 (i.e. when the music has finished fading out)
-	if (PB.StopOnSilence || PB.RemLength < (u32)_RealSize)
-	{
-		WARN_LOG(DSPHLE, "Raw: END");
-		// Let's ignore this entire case since it doesn't seem to happen
-		// in Zelda, since Length is set to 0xF0000000
-		// blah
-		// blah
-		// readaudio
-		// blah
-		PB.RemLength = 0;
-		PB.KeyOff = 1;
-	}
-
-	PB.RemLength -= _RealSize;
-
-	u64 ACC0 = (u32)(PB.raw[0x8a ^ 1] << 16);  // 0x8a    0ad5, yes it loads a, not b
-	u64 ACC1 = (u32)(PB.raw[0x34 ^ 1] << 16);  // 0x34
-
-	// ERROR_LOG(DSPHLE, "%08x %08x", (u32)ACC0, (u32)ACC1);
-	
-	ACC0 -= ACC1;
-
-	PB.Unk36[0] = (u16)(ACC0 >> 16);
-
-	ACC0 -= AX0 << 16;
-
-	if ((s64)ACC0 < 0)
-	{
-		// ERROR_LOG(DSPHLE, "Raw loop: ReadAudio size = %04x 34:%04x %08x", PB.Unk36[0], PB.raw[0x34 ^ 1], (int)ACC0);
-		Decoder21_ReadAudio(PB, PB.Unk36[0], _Buffer);
-
-		ACC0 = -(s64)ACC0;
-		_Buffer += PB.Unk36[0];
-
-		PB.raw[0x34 ^ 1] = 0;
-
-		PB.StartAddr = PB.LoopStartPos;
-
-		Decoder21_ReadAudio(PB, (int)(ACC0 >> 16), _Buffer);
-		return;
-	}
-
-	Decoder21_ReadAudio(PB, _RealSize, _Buffer);
-}
-
-void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer)
-{
-	// 0af6
-	if (!size)
-		return;
-
-#if 0
-	// 0afa
-	u32 AX1 = (PB.RestartPos >> 16) & 1;  // PB.raw[0x34], except that it's part of a dword
-	// 0b00 - Eh, WTF.
-	u32 ACC0 = PB.StartAddr + ((PB.RestartPos >> 16) << 1) - 2*AX1;
-	u32 ACC1 = (size << 16) + 0x20000;
-	// All this trickery, and more, seems to be to align the DMA, which
-	// we really don't care about. So let's skip it. See the #else.
-
-#else
-	// ERROR_LOG(DSPHLE, "ReadAudio: %08x %08x", PB.StartAddr, PB.raw[0x34 ^ 1]);
-	u32 ACC0 = PB.StartAddr + (PB.raw[0x34 ^ 1] << 1);
-	u32 ACC1 = (size << 16);
-#endif
-	// ACC0 is the address
-	// ACC1 is the read size
-	
-	const u32 ram_mask = 0x1FFFFFF;
-	const u8 *source = Memory::GetPointer(0x80000000);
-	const u16 *src = (u16 *)(source + (ACC0 & ram_mask));
-
-	for (u32 i = 0; i < (ACC1 >> 16); i++) {
-		_Buffer[i] = Common::swap16(src[i]);
-	}
-
-	PB.raw[0x34 ^ 1] += size;
-}
-
-
-void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _RightBuffer, int _Size)
-{
-	if (PB.IsBlank)
-	{
-		s32 sample = (s32)(s16)PB.FixedSample;
-		for (int i = 0; i < _Size; i++)
-			m_VoiceBuffer[i] = sample;
-
-		goto ContinueWithBlock;  // Yes, a goto. Yes, it's evil, but it makes the flow look much more like the DSP code.
-	}
-
-	// XK: Use this to disable MIDI music (GREAT for testing). Also kills some sound FX.
-	//if(PB.SoundType == 0x0d00) {
-	//	PB.NeedsReset = 0;
-	//	return;
-	//}
-
-	// The Resample calls actually don't resample yet.
-
-	// ResampleBuffer corresponds to 0x0580 in ZWW ucode.
-	// VoiceBuffer corresponds to 0x0520.
-
-	// First jump table at ZWW: 2a6
-	switch (PB.Format)
-	{
-	case 0x0005:		// AFC with extra low bitrate (32:5 compression).
-	case 0x0009:		// AFC with normal bitrate (32:9 compression).
-		RenderVoice_AFC(PB, m_ResampleBuffer + 4, _Size);
-		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
-		break;
-
-	case 0x0008:		// PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW.
-		RenderVoice_PCM8(PB, m_ResampleBuffer + 4, _Size);
-		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
-		break;
-
-	case 0x0010:		// PCM16 - normal PCM 16-bit audio.
-		RenderVoice_PCM16(PB, m_ResampleBuffer + 4, _Size);
-		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
-		break;
-
-	case 0x0020:
-		// Normally, this shouldn't resample, it should just decode directly
-		// to the output buffer. However, (if we ever see this sound type), we'll
-		// have to resample anyway since we're running at a different sample rate.
-
-		RenderVoice_Raw(PB, m_ResampleBuffer + 4, _Size);
-		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
-		break;
-
-	case 0x0021:
-		// Raw sound from RAM. Important for Zelda WW. Cutscenes use the music 
-		// to let the game know they ended
-		RenderVoice_Raw(PB, m_ResampleBuffer + 4, _Size);
-		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
-		break;
-	
-	default:
-		// Second jump table
-		// TODO: Cases to find examples of:
-		//		 -0x0002
-		//		 -0x0003
-		//		 -0x0006
-		//		 -0x000a
-		switch (PB.Format)
-		{
-		// Synthesized sounds
-		case 0x0003: WARN_LOG(DSPHLE, "PB Format 0x03 used!");
-		case 0x0000: // Example: Magic meter filling up in ZWW
-			RenderSynth_RectWave(PB, m_VoiceBuffer, _Size);
-			break;
-
-		case 0x0001: // Example: "Denied" sound when trying to pull out a sword 
-					 // indoors in ZWW
-			RenderSynth_SawWave(PB, m_VoiceBuffer, _Size);
-			break;
-
-		case 0x0006:
-			WARN_LOG(DSPHLE, "Synthesizing 0x0006 (constant sound)");
-			RenderSynth_Constant(PB, m_VoiceBuffer, _Size);
-			break;
-
-		// These are more "synth" formats - square wave, saw wave etc.
-		case 0x0002:
-			WARN_LOG(DSPHLE, "PB Format 0x02 used!");
-			break;
-
-		case 0x0004: // Example: Big Pikmin onion mothership landing/building a bridge in Pikmin
-		case 0x0007: // Example: "success" SFX in Pikmin 1, Pikmin 2 in a cave, not sure what sound it is.
-		case 0x000b: // Example: SFX in area selection menu in Pikmin
-		case 0x000c: // Example: beam of death/yellow force-field in Temple of the Gods, ZWW
-			RenderSynth_WaveTable(PB, m_VoiceBuffer, _Size);
-			break;
-
-		default:
-			// TODO: Implement general decoder here
-			memset(m_VoiceBuffer, 0, _Size * sizeof(s32));
-			ERROR_LOG(DSPHLE, "Unknown MixAddVoice format in zelda %04x", PB.Format);
-			break;
-		}
-	}
-
-ContinueWithBlock:
-	
-	if (PB.FilterEnable)
-	{  // 0x04a8
-		for (int i = 0; i < _Size; i++)
-		{
-			// TODO: Apply filter from ZWW: 0c84_FilterBufferInPlace
-		}
-	}
-
-	for (int i = 0; i < _Size; i++)
-	{
-		// TODO?
-	}
-	
-	// Apply volume. There are two different modes.
-	if (PB.VolumeMode != 0)
-	{
-		// Complex volume mode. Let's see what we can do.
-		if (PB.StopOnSilence) {
-			PB.raw[0x2b] = PB.raw[0x2a] >> 1;
-			if (PB.raw[0x2b] == 0)
-			{
-				PB.KeyOff = 1;
-			}
-		}
-		short AX0L = PB.raw[0x28] >> 8;
-		short AX0H = PB.raw[0x28] & 0x7F;
-		short AX1L = AX0L ^ 0x7F;
-		short AX1H = AX0H ^ 0x7F;
-		AX0L = m_MiscTable[0x200 + AX0L];
-		AX0H = m_MiscTable[0x200 + AX0H];
-		AX1L = m_MiscTable[0x200 + AX1L];
-		AX1H = m_MiscTable[0x200 + AX1H];
-
-		short b00[20];
-		b00[0] = AX1L * AX1H >> 16;
-		b00[1] = AX0L * AX1H >> 16;
-		b00[2] = AX0H * AX1L >> 16;
-		b00[3] = AX0L * AX0H >> 16;
-
-		for (int i = 0; i < 4; i++)
-		{
-			b00[i + 4] = (s16)b00[i] * (s16)PB.raw[0x2a] >> 16;
-		}
-
-		int prod = ((s16)PB.raw[0x2a] * (s16)PB.raw[0x29] * 2) >> 16;
-		for (int i = 0; i < 4; i++)
-		{
-			b00[i + 8] = (s16)b00[i + 4] * prod;
-		}
-
-		// ZWW 0d34
-		
-		int diff = (s16)PB.raw[0x2b] - (s16)PB.raw[0x2a];
-		PB.raw[0x2a] = PB.raw[0x2b];
-
-		for (int i = 0; i < 4; i++)
-		{
-			b00[i + 0xc] = (unsigned short)b00[i] * diff >> 16;
-		}
-
-		for (int i = 0; i < 4; i++)
-		{
-			b00[i + 0x10] = (s16)b00[i + 0xc] * PB.raw[0x29];
-		}
-
-		for (int count = 0; count < 8; count++)
-		{
-			// The 8 buffers to mix to: 0d00, 0d60, 0f40 0ca0 0e80 0ee0 0c00 0c50
-			// We just mix to the first two and call it stereo :p
-			int value = b00[0x4 + count];
-			//int delta = b00[0xC + count] << 11; // Unused?
-			
-			int ramp = value << 16;
-			for (int i = 0; i < _Size; i++)
-			{
-				int unmixed_audio = m_VoiceBuffer[i];
-				switch (count) {
-				case 0: _LeftBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
-				case 1: _RightBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
-					break;
-				}
-			}
-		}
-	}
-	else
-	{
-		// ZWW 0355
-		if (PB.StopOnSilence)
-		{
-			int sum = 0;
-			int addr = 0x0a;
-			for (int i = 0; i < 6; i++)
-			{
-				u16 value = PB.raw[addr];
-				addr--;
-				value >>= 1;
-				PB.raw[addr] = value;
-				sum += value;
-				addr += 5;
-			}
-
-			if (sum == 0)
-			{
-				PB.KeyOff = 1;
-			}
-		}
-
-		// Seems there are 6 temporary output buffers.
-		for (int count = 0; count < 6; count++)
-		{
-			int addr = 0x08;
-
-			// we'll have to keep a map of buffers I guess...
-			u16 dest_buffer_address = PB.raw[addr++];
-
-			bool mix = dest_buffer_address ? true : false;
-
-			u16 vol2 = PB.raw[addr++];
-			u16 vol1 = PB.raw[addr++];
-
-			int delta = (vol2 - vol1) << 11;
-
-			addr--;
-
-			u32 ramp = vol1 << 16;
-			if (mix)
-			{
-				// 0ca9_RampedMultiplyAddBuffer
-				for (int i = 0; i < _Size; i++)
-				{
-					int value = m_VoiceBuffer[i];
-
-					// TODO - add to buffer specified by dest_buffer_address
-					switch (count)
-					{
-						// These really should be 32.
-						case 0: _LeftBuffer[i] += (u64)value * ramp >> 29; break;
-						case 1: _RightBuffer[i] += (u64)value * ramp >> 29; break;
-					}
-
-					if (((i & 1) == 0) && i < 64)
-					{
-						ramp += delta;
-					}
-				}
-				if (_Size < 32)
-				{
-					ramp += delta * (_Size - 32);
-				}
-			}
-			// Update the PB with the volume actually reached.
-			PB.raw[addr++] = ramp >> 16;
-	
-			addr++;
-		}
-	}
-	// 03b2, this is the reason of using PB.NeedsReset. Seems to be necessary for SMG, and maybe other games.
-	if (PB.IsBlank == 0){
-		PB.NeedsReset = 0;
-	}
-}
-
-// size is in stereo samples.
-void CUCode_Zelda::MixAdd(short *_Buffer, int _Size)
-{
-	std::lock_guard<std::mutex> lk(m_csMix);
-	// Safety check
-	if (_Size > 256 * 1024 - 8)
-		_Size = 256 * 1024 - 8;
-
-	// Final mix buffers
-	memset(m_LeftBuffer, 0, _Size * sizeof(s32));
-	memset(m_RightBuffer, 0, _Size * sizeof(s32));
-
-	// For each PB...
-	for (u32 i = 0; i < m_NumVoices; i++)
-	{
-		if (!IsLightVersion())
-		{
-			u32 flags = m_SyncFlags[(i >> 4) & 0xF];
-			if (!(flags & 1 << (15 - (i & 0xF))))
-				continue;
-		}
-
-		ZeldaVoicePB pb;
-		ReadVoicePB(m_VoicePBsAddr + (i * 0x180), pb);
-
-		if (pb.Status == 0)
-			continue;
-		if (pb.KeyOff != 0)
-			continue;
-
-		RenderAddVoice(pb, m_LeftBuffer, m_RightBuffer, _Size);
-		WritebackVoicePB(m_VoicePBsAddr + (i * 0x180), pb);
-	}
-
-	// Post processing, final conversion.
-	for (int i = 0; i < _Size; i++)
-	{
-		s32 left  = (s32)_Buffer[0] + m_LeftBuffer[i];
-		s32 right = (s32)_Buffer[1] + m_RightBuffer[i];
-
-		if (left < -32768) left = -32768;
-		if (left > 32767)  left = 32767;
-		_Buffer[0] = (short)left;
-
-		if (right < -32768) right = -32768;
-		if (right > 32767)  right = 32767;
-		_Buffer[1] = (short)right;
-
-		_Buffer += 2;
-	}
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
deleted file mode 100644
index 47981192f3..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "UCodes.h"
-
-#include "UCode_AX.h"
-#include "UCode_AXWii.h"
-#include "UCode_Zelda.h"
-#include "UCode_ROM.h"
-#include "UCode_CARD.h"
-#include "UCode_InitAudioSystem.h"
-#include "UCode_GBA.h"
-#include "Hash.h"
-
-IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
-{
-	switch (_CRC)
-	{
-	case UCODE_ROM:
-		INFO_LOG(DSPHLE, "Switching to ROM ucode");
-		return new CUCode_Rom(dsp_hle, _CRC);
-
-	case UCODE_INIT_AUDIO_SYSTEM:
-		INFO_LOG(DSPHLE, "Switching to INIT ucode");
-		return new CUCode_InitAudioSystem(dsp_hle, _CRC);
-
-	case 0x65d6cc6f: // CARD
-		INFO_LOG(DSPHLE, "Switching to CARD ucode");
-		return new CUCode_CARD(dsp_hle, _CRC);
-
-	case 0xdd7e72d5:
-		INFO_LOG(DSPHLE, "Switching to GBA ucode");
-		return new CUCode_GBA(dsp_hle, _CRC);
-
-	case 0x3ad3b7ac: // Naruto3, Paper Mario - The Thousand Year Door
-	case 0x3daf59b9: // Alien Hominid
-	case 0x4e8a8b21: // spdemo, ctaxi, 18 wheeler, disney, monkeyball 1/2,cubivore,puzzlecollection,wario,
-					 // capcom vs snk, naruto2, lost kingdoms, star fox, mario party 4, mortal kombat,
-					 // smugglers run warzone, smash brothers, sonic mega collection, ZooCube
-					 // nddemo, starfox
-	case 0x07f88145: // bustamove, ikaruga, fzero, robotech battle cry, star soldier, soul calibur2,
-					 // Zelda:OOT, Tony hawk, viewtiful joe
-	case 0xe2136399: // billy hatcher, dragonballz, mario party 5, TMNT, ava1080
-	case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy)
-		INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", _CRC);
-		return new CUCode_AX(dsp_hle, _CRC);
-
-	case 0x6ba3b3ea: // IPL - PAL
-	case 0x24b22038: // IPL - NTSC/NTSC-JAP
-	case 0x42f64ac4: // Luigi
-	case 0x4be6a5cb: // AC, Pikmin
-		INFO_LOG(DSPHLE, "CRC %08x: JAC (early Zelda) ucode chosen", _CRC);
-		return new CUCode_Zelda(dsp_hle, _CRC);
-
-	case 0x6CA33A6D: // DK Jungle Beat
-	case 0x86840740: // Zelda WW - US
-	case 0x56d36052: // Mario Sunshine
-	case 0x2fcdf1ec: // Mario Kart, zelda 4 swords
-	case 0x267fd05a: // Pikmin PAL
-		INFO_LOG(DSPHLE, "CRC %08x: Zelda ucode chosen", _CRC);
-		return new CUCode_Zelda(dsp_hle, _CRC);
-
-	// WII CRCs
-	case 0xb7eb9a9c: // Wii Pikmin - PAL
-	case 0xeaeb38cc: // Wii Pikmin 2 - PAL
-	case 0x6c3f6f94: // Zelda TP - PAL
-	case 0xd643001f: // Mario Galaxy - PAL / WII DK Jungle Beat - PAL
-		INFO_LOG(DSPHLE, "CRC %08x: Zelda Wii ucode chosen\n", _CRC);
-		return new CUCode_Zelda(dsp_hle, _CRC);
-
-	case 0x2ea36ce6: // Some Wii demos
-	case 0x5ef56da3: // AX demo
-	case 0x347112ba: // raving rabbits
-	case 0xfa450138: // wii sports - PAL
-	case 0xadbc06bd: // Elebits
-	case 0x4cc52064: // Bleach: Versus Crusade
-	case 0xd9c4bf34: // WiiMenu
-		INFO_LOG(DSPHLE, "CRC %08x: Wii - AXWii chosen", _CRC);
-		return new CUCode_AXWii(dsp_hle, _CRC);
-
-	default:
-		if (bWii)
-		{
-			PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE emulator if this is homebrew.", _CRC);
-			return new CUCode_AXWii(dsp_hle, _CRC);
-		}
-		else
-		{
-			PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.\n\nTry LLE emulator if this is homebrew.", _CRC);
-			return new CUCode_AX(dsp_hle, _CRC);
-		}
-
-	case UCODE_NULL:
-		break;
-	}
-
-	return NULL;
-}
-
-bool IUCode::NeedsResumeMail()
-{
-	if (m_NeedsResumeMail)
-	{
-		m_NeedsResumeMail = false;
-		return true;
-	}
-	return false;
-}
-
-void IUCode::PrepareBootUCode(u32 mail)
-{
-	switch (m_NextUCode_steps)
-	{
-	case 0: m_NextUCode.mram_dest_addr	= mail;				break;
-	case 1: m_NextUCode.mram_size		= mail & 0xffff;	break;
-	case 2: m_NextUCode.mram_dram_addr	= mail & 0xffff;	break;
-	case 3: m_NextUCode.iram_mram_addr	= mail;				break;
-	case 4: m_NextUCode.iram_size		= mail & 0xffff;	break;
-	case 5: m_NextUCode.iram_dest		= mail & 0xffff;	break;
-	case 6: m_NextUCode.iram_startpc	= mail & 0xffff;	break;
-	case 7: m_NextUCode.dram_mram_addr	= mail;				break;
-	case 8: m_NextUCode.dram_size		= mail & 0xffff;	break;
-	case 9: m_NextUCode.dram_dest		= mail & 0xffff;	break;
-	}
-	m_NextUCode_steps++;
-
-	if (m_NextUCode_steps == 10)
-	{
-		m_NextUCode_steps = 0;
-		m_NeedsResumeMail = true;
-		m_UploadSetupInProgress = false;
-
-		u32 ector_crc = HashEctor(
-			(u8*)HLEMemory_Get_Pointer(m_NextUCode.iram_mram_addr),
-			m_NextUCode.iram_size);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-		char binFile[MAX_PATH];
-		sprintf(binFile, "%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), ector_crc);
-
-		File::IOFile pFile(binFile, "wb");
-		if (pFile)
-		pFile.WriteArray((u8*)Memory::GetPointer(m_NextUCode.iram_mram_addr), m_NextUCode.iram_size);
-#endif
-
-		DEBUG_LOG(DSPHLE, "PrepareBootUCode 0x%08x", ector_crc);
-		DEBUG_LOG(DSPHLE, "DRAM -> MRAM: src %04x dst %08x size %04x",
-			m_NextUCode.mram_dram_addr, m_NextUCode.mram_dest_addr,
-			m_NextUCode.mram_size);
-		DEBUG_LOG(DSPHLE, "MRAM -> IRAM: src %08x dst %04x size %04x startpc %04x",
-			m_NextUCode.iram_mram_addr, m_NextUCode.iram_dest,
-			m_NextUCode.iram_size, m_NextUCode.iram_startpc);
-		DEBUG_LOG(DSPHLE, "MRAM -> DRAM: src %08x dst %04x size %04x",
-			m_NextUCode.dram_mram_addr, m_NextUCode.dram_dest,
-			m_NextUCode.dram_size);
-
-		if (m_NextUCode.mram_size)
-		{
-			WARN_LOG(DSPHLE,
-				"Trying to boot new ucode with dram download - not implemented");
-		}
-		if (m_NextUCode.dram_size)
-		{
-			WARN_LOG(DSPHLE,
-				"Trying to boot new ucode with dram upload - not implemented");
-		}
-
-		m_DSPHLE->SwapUCode(ector_crc);
-	}
-}
-
-void IUCode::DoStateShared(PointerWrap &p)
-{
-	p.Do(m_UploadSetupInProgress);
-	p.Do(m_NextUCode);
-	p.Do(m_NextUCode_steps);
-	p.Do(m_NeedsResumeMail);
-}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
deleted file mode 100644
index cd8e8f9552..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _UCODES_H
-#define _UCODES_H
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "Thread.h"
-
-#include "../DSPHLE.h"
-#include "../../Memmap.h"
-
-#define UCODE_ROM                   0x00000000
-#define UCODE_INIT_AUDIO_SYSTEM     0x00000001
-#define UCODE_NULL                  0xFFFFFFFF
-
-class CMailHandler;
-
-inline bool ExramRead(u32 _uAddress)
-{
-	if (_uAddress & 0x10000000)
-		return true;
-	else
-		return false;
-}
-
-inline u8 HLEMemory_Read_U8(u32 _uAddress)
-{
-	if (ExramRead(_uAddress))
-		return Memory::m_pEXRAM[_uAddress & Memory::EXRAM_MASK];
-	else
-		return Memory::m_pRAM[_uAddress & Memory::RAM_MASK];
-}
-
-inline u16 HLEMemory_Read_U16(u32 _uAddress)
-{
-	if (ExramRead(_uAddress))
-		return Common::swap16(*(u16*)&Memory::m_pEXRAM[_uAddress & Memory::EXRAM_MASK]);
-	else
-		return Common::swap16(*(u16*)&Memory::m_pRAM[_uAddress & Memory::RAM_MASK]);
-}
-
-inline u32 HLEMemory_Read_U32(u32 _uAddress)
-{
-	if (ExramRead(_uAddress))
-		return Common::swap32(*(u32*)&Memory::m_pEXRAM[_uAddress & Memory::EXRAM_MASK]);
-	else
-		return Common::swap32(*(u32*)&Memory::m_pRAM[_uAddress & Memory::RAM_MASK]);
-}
-
-inline void* HLEMemory_Get_Pointer(u32 _uAddress)
-{
-	if (ExramRead(_uAddress))
-		return &Memory::m_pEXRAM[_uAddress & Memory::EXRAM_MASK];
-	else
-		return &Memory::m_pRAM[_uAddress & Memory::RAM_MASK];
-}
-
-class IUCode
-{
-public:
-	IUCode(DSPHLE *dsphle, u32 _crc)
-		: m_rMailHandler(dsphle->AccessMailHandler())
-		, m_UploadSetupInProgress(false)
-		, m_DSPHLE(dsphle)
-		, m_CRC(_crc)
-		, m_NextUCode()
-		, m_NextUCode_steps(0)
-		, m_NeedsResumeMail(false)
-	{}
-
-	virtual ~IUCode()
-	{}
-
-	virtual void HandleMail(u32 _uMail) = 0;
-
-	// Cycles are out of the 81/121mhz the DSP runs at.
-	virtual void Update(int cycles) = 0;
-	virtual void MixAdd(short* buffer, int size) {}
-	virtual u32 GetUpdateMs() = 0;
-
-	virtual void DoState(PointerWrap &p) { DoStateShared(p); }
-
-	static u32 GetCRC(IUCode* pUCode) { return pUCode ? pUCode->m_CRC : UCODE_NULL; }
-
-protected:
-	void PrepareBootUCode(u32 mail);
-
-	// Some ucodes (notably zelda) require a resume mail to be
-	// sent if they are be started via PrepareBootUCode.
-	// The HLE can use this to 
-	bool NeedsResumeMail();
-
-	void DoStateShared(PointerWrap &p);
-
-	CMailHandler& m_rMailHandler;
-	std::mutex m_csMix;
-
-	enum EDSP_Codes
-	{
-		DSP_INIT        = 0xDCD10000,
-		DSP_RESUME      = 0xDCD10001,
-		DSP_YIELD       = 0xDCD10002,
-		DSP_DONE        = 0xDCD10003,
-		DSP_SYNC        = 0xDCD10004,
-		DSP_FRAME_END   = 0xDCD10005,
-	};
-
-	// UCode is forwarding mails to PrepareBootUCode
-	// UCode only needs to set this to true, IUCode will set to false when done!
-	bool m_UploadSetupInProgress;
-
-	// Need a pointer back to DSPHLE to switch ucodes.
-	DSPHLE *m_DSPHLE;
-
-	// used for reconstruction when loading saves,
-	// and for variations within certain ucodes.
-	u32 m_CRC;
-
-private:
-	struct SUCode
-	{
-		u32 mram_dest_addr;
-		u16 mram_size;
-		u16 mram_dram_addr;
-		u32 iram_mram_addr;
-		u16 iram_size;
-		u16 iram_dest;
-		u16 iram_startpc;
-		u32 dram_mram_addr;
-		u16 dram_size;
-		u16 dram_dest;
-	};
-	SUCode	m_NextUCode;
-	int	m_NextUCode_steps;
-
-	bool m_NeedsResumeMail;
-};
-
-extern IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii);
-
-#endif
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
deleted file mode 100644
index 1aa64aa190..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPDebugInterface.h"
-
-#include "DSP/DSPCore.h"
-#include "DSP/disassemble.h"
-
-#include "DSPSymbols.h"
-#include "DSP/DSPMemoryMap.h"
-
-void DSPDebugInterface::disasm(unsigned int address, char *dest, int max_size) 
-{
-	// we'll treat addresses as line numbers.
-	strncpy(dest, DSPSymbols::GetLineText(address), max_size);
-	dest[max_size-1] = 0;
-}
-
-void DSPDebugInterface::getRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
-{
-	if (DSPCore_GetState() == DSPCORE_STOP)
-	{
-		dest[0] = 0;
-		return;
-	}
-
-	switch (memory)
-	{
-	case 0:  // IMEM
-		switch (address >> 12)
-		{
-		case 0:
-		case 0x8:
-			sprintf(dest, "%04x", dsp_imem_read(address));
-			break;
-		default:
-			sprintf(dest, "--IMEM--");
-			break;
-		}
-		break;
-	case 1:  // DMEM
-		switch (address >> 12)
-		{
-		case 0:
-		case 1:
-			sprintf(dest, "%04x (DMEM)", dsp_dmem_read(address));
-			break;
-		case 0xf:
-			sprintf(dest, "%04x (MMIO)", g_dsp.ifx_regs[address & 0xFF]);
-			break;
-		default:
-			sprintf(dest, "--DMEM--");
-			break;
-		}
-		break;
-	}
-}
-
-unsigned int DSPDebugInterface::readMemory(unsigned int address)
-{
-	return 0; //Memory::ReadUnchecked_U32(address);
-}
-
-unsigned int DSPDebugInterface::readInstruction(unsigned int address)
-{
-	return 0; //Memory::Read_Instruction(address);
-}
-
-bool DSPDebugInterface::isAlive()
-{
-	return true; //Core::GetState() != Core::CORE_UNINITIALIZED;
-}
-
-bool DSPDebugInterface::isBreakpoint(unsigned int address) 
-{
-	int real_addr = DSPSymbols::Line2Addr(address);
-	if (real_addr >= 0)
-		return dsp_breakpoints.IsAddressBreakPoint(real_addr);
-	else
-		return false;
-}
-
-void DSPDebugInterface::setBreakpoint(unsigned int address)
-{
-	int real_addr = DSPSymbols::Line2Addr(address);
-
-	if (real_addr >= 0)
-	{
-		if (dsp_breakpoints.Add(real_addr))
-		{
-
-		}
-	}
-}
-
-void DSPDebugInterface::clearBreakpoint(unsigned int address)
-{
-	int real_addr = DSPSymbols::Line2Addr(address);
-	
-	if (real_addr >= 0)
-	{
-		if (dsp_breakpoints.Remove(real_addr))
-		{
-
-		}
-	}
-}
-
-void DSPDebugInterface::clearAllBreakpoints()
-{
-	dsp_breakpoints.Clear();
-}
-
-void DSPDebugInterface::toggleBreakpoint(unsigned int address)
-{
-	int real_addr = DSPSymbols::Line2Addr(address);
-	if (real_addr >= 0)
-	{
-		if (dsp_breakpoints.IsAddressBreakPoint(real_addr))
-			dsp_breakpoints.Remove(real_addr);
-		else
-			dsp_breakpoints.Add(real_addr);
-	}
-}
-
-bool DSPDebugInterface::isMemCheck(unsigned int address)
-{
-	return false;
-}
-
-void DSPDebugInterface::toggleMemCheck(unsigned int address)
-{
-	PanicAlert("MemCheck functionality not supported in DSP module.");
-}
-
-void DSPDebugInterface::insertBLR(unsigned int address, unsigned int value) 
-{
-	PanicAlert("insertBLR functionality not supported in DSP module.");
-}
-
-// =======================================================
-// Separate the blocks with colors.
-// -------------
-int DSPDebugInterface::getColor(unsigned int address)
-{
-	static const int colors[6] =
-	{ 
-		0xd0FFFF,  // light cyan
-		0xFFd0d0,  // light red
-		0xd8d8FF,  // light blue
-		0xFFd0FF,  // light purple
-		0xd0FFd0,  // light green
-		0xFFFFd0,  // light yellow
-	};
-
-	// Scan backwards so we don't miss it. Hm, actually, let's not - it looks pretty good.
-	int addr = -1;
-	for (int i = 0; i < 1; i++)
-	{
-		addr = DSPSymbols::Line2Addr(address - i);
-		if (addr >= 0)
-			break;
-	}
-	if (addr == -1)
-		return 0xFFFFFF;
-
-	Symbol *symbol = DSPSymbols::g_dsp_symbol_db.GetSymbolFromAddr(addr);
-	if (!symbol)
-		return 0xFFFFFF;
-	if (symbol->type != Symbol::SYMBOL_FUNCTION)
-		return 0xEEEEFF;
-	return colors[symbol->index % 6];
-}
-// =============
-
-
-std::string DSPDebugInterface::getDescription(unsigned int address) 
-{
-	return "";  // g_symbolDB.GetDescription(address);
-}
-
-unsigned int DSPDebugInterface::getPC() 
-{
-	return DSPSymbols::Addr2Line(g_dsp.pc);
-}
-
-void DSPDebugInterface::setPC(unsigned int address) 
-{
-	int new_pc = DSPSymbols::Line2Addr(address);
-	if (new_pc > 0)
-		g_dsp.pc = new_pc;
-}
-
-void DSPDebugInterface::runToBreakpoint() 
-{
-
-}
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
deleted file mode 100644
index d1d204c9bb..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPDEBUGINTERFACE_H
-#define _DSPDEBUGINTERFACE_H
-
-#include <string>
-
-#include "DebugInterface.h"
-#include "Common.h"
-
-class DSPDebugInterface : public DebugInterface
-{
-public:
-	DSPDebugInterface(){} 
-	virtual void disasm(unsigned int address, char *dest, int max_size);
-	virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size);
-	virtual int getInstructionSize(int instruction) {return 1;}
-	virtual bool isAlive();
-	virtual bool isBreakpoint(unsigned int address);
-	virtual void setBreakpoint(unsigned int address);
-	virtual void clearBreakpoint(unsigned int address);
-	virtual void clearAllBreakpoints();
-	virtual void toggleBreakpoint(unsigned int address);
-	virtual bool isMemCheck(unsigned int address);
-	virtual void toggleMemCheck(unsigned int address);
-	virtual unsigned int readMemory(unsigned int address);
-	virtual unsigned int readInstruction(unsigned int address);
-	virtual unsigned int getPC();
-	virtual void setPC(unsigned int address);
-	virtual void step() {}
-	virtual void runToBreakpoint();
-	virtual void insertBLR(unsigned int address, unsigned int value);
-	virtual int getColor(unsigned int address);
-	virtual std::string getDescription(unsigned int address);
-};
-
-#endif  // _DSPDEBUGINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
deleted file mode 100644
index d16af5f601..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Atomic.h"
-#include "CommonTypes.h"
-#include "LogManager.h"
-#include "Thread.h"
-#include "ChunkFile.h"
-#include "IniFile.h"
-#include "ConfigManager.h"
-#include "CPUDetect.h"
-#include "Core.h"
-
-#include "DSPLLEGlobals.h" // Local
-#include "DSP/DSPHost.h"
-#include "DSP/DSPInterpreter.h"
-#include "DSP/DSPHWInterface.h"
-#include "DSP/disassemble.h"
-#include "DSPSymbols.h"
-#include "Host.h"
-
-#include "AudioCommon.h"
-#include "Mixer.h"
-
-#include "DSP/DSPTables.h"
-#include "DSP/DSPCore.h"
-#include "DSPLLE.h"
-#include "../Memmap.h"
-#include "../AudioInterface.h"
-
-
-DSPLLE::DSPLLE() {
-	soundStream = NULL;
-	m_InitMixer = false;
-	m_bIsRunning = false;
-	m_cycle_count = 0;
-}
-
-Common::Event dspEvent;
-Common::Event ppcEvent;
-
-void DSPLLE::DoState(PointerWrap &p)
-{
-	bool isHLE = false;
-	p.Do(isHLE);
-	if (isHLE != false && p.GetMode() == PointerWrap::MODE_READ)
-	{
-		Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000);
-		p.SetMode(PointerWrap::MODE_VERIFY);
-		return;
-	}
-	p.Do(g_dsp.r);
-	p.Do(g_dsp.pc);
-#if PROFILE
-	p.Do(g_dsp.err_pc);
-#endif
-	p.Do(g_dsp.cr);
-	p.Do(g_dsp.reg_stack_ptr);
-	p.Do(g_dsp.exceptions);
-	p.Do(g_dsp.external_interrupt_waiting);
-
-	for (int i = 0; i < 4; i++)
-	{
-		p.Do(g_dsp.reg_stack[i]);
-	}
-
-	p.Do(g_dsp.step_counter);
-	p.Do(g_dsp.ifx_regs);
-	p.Do(g_dsp.mbox[0]);
-	p.Do(g_dsp.mbox[1]);
-	UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
-	p.DoArray(g_dsp.iram, DSP_IRAM_SIZE);
-	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
-	if (p.GetMode() == PointerWrap::MODE_READ)
-		DSPHost_CodeLoaded((const u8*)g_dsp.iram, DSP_IRAM_BYTE_SIZE);
-	p.DoArray(g_dsp.dram, DSP_DRAM_SIZE);
-	p.Do(cyclesLeft);
-	p.Do(init_hax);
-	p.Do(m_cycle_count);
-
-	bool prevInitMixer = m_InitMixer;
-	p.Do(m_InitMixer);
-	if (prevInitMixer != m_InitMixer && p.GetMode() == PointerWrap::MODE_READ)
-	{
-		if (m_InitMixer)
-		{
-			InitMixer();
-			AudioCommon::PauseAndLock(true);
-		}
-		else
-		{
-			AudioCommon::PauseAndLock(false);
-			soundStream->Stop();
-			delete soundStream;
-			soundStream = NULL;
-		}
-	}
-}
-
-// Regular thread
-void DSPLLE::dsp_thread(DSPLLE *dsp_lle)
-{
-	Common::SetCurrentThreadName("DSP thread");
-
-	while (dsp_lle->m_bIsRunning)
-	{
-		int cycles = (int)dsp_lle->m_cycle_count;
-		if (cycles > 0)
-		{
-			std::lock_guard<std::mutex> lk(dsp_lle->m_csDSPThreadActive);
-			if (dspjit)
-			{
-				DSPCore_RunCycles(cycles);
-			}
-			else
-			{
-				DSPInterpreter::RunCyclesThread(cycles);
-			}
-			Common::AtomicStore(dsp_lle->m_cycle_count, 0);
-		}
-		else
-		{
-			ppcEvent.Set();
-			dspEvent.Wait();
-		}
-	}
-}
-
-bool DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
-{
-	m_hWnd = hWnd;
-	m_bWii = bWii;
-	m_bDSPThread = bDSPThread;
-	m_InitMixer = false;
-
-	std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM;
-	std::string coef_file = File::GetUserPath(D_GCUSER_IDX) + DSP_COEF;
-
-	if (!File::Exists(irom_file))
-		irom_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_IROM;
-	if (!File::Exists(coef_file))
-		coef_file = File::GetSysDirectory() + GC_SYS_DIR DIR_SEP DSP_COEF;
-	if (!DSPCore_Init(irom_file.c_str(), coef_file.c_str(), AudioCommon::UseJIT()))
-		return false;
-
-	g_dsp.cpu_ram = Memory::GetPointer(0);
-	DSPCore_Reset();
-
-	m_bIsRunning = true;
-
-	InitInstructionTable();
-
-	if (m_bDSPThread)
-		m_hDSPThread = std::thread(dsp_thread, this);
-
-	Host_RefreshDSPDebuggerWindow();
-
-	return true;
-}
-
-void DSPLLE::DSP_StopSoundStream()
-{
-	DSPInterpreter::Stop();
-	m_bIsRunning = false;
-	if (m_bDSPThread)
-	{
-		ppcEvent.Set();
-		dspEvent.Set();
-		m_hDSPThread.join();
-	}
-}
-
-void DSPLLE::Shutdown()
-{
-	AudioCommon::ShutdownSoundStream();
-	DSPCore_Shutdown();
-}
-
-void DSPLLE::InitMixer()
-{
-	unsigned int AISampleRate, DACSampleRate;
-	AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate);
-	delete soundStream;
-	soundStream = AudioCommon::InitSoundStream(new CMixer(AISampleRate, DACSampleRate, 48000), m_hWnd); 
-	if(!soundStream) PanicAlert("Error starting up sound stream");
-	// Mixer is initialized
-	m_InitMixer = true;
-}
-
-u16 DSPLLE::DSP_WriteControlRegister(u16 _uFlag)
-{
-	UDSPControl Temp(_uFlag);
-	if (!m_InitMixer)
-	{
-		if (!Temp.DSPHalt)
-		{
-			InitMixer();
-		}
-	}
-	DSPInterpreter::WriteCR(_uFlag);
-
-	// Check if the CPU has set an external interrupt (CR_EXTERNAL_INT)
-	// and immediately process it, if it has.
-	if (_uFlag & 2)
-	{
-		if (!m_bDSPThread)
-		{
-			DSPCore_CheckExternalInterrupt();
-			DSPCore_CheckExceptions();
-		}
-		else
-		{
-			DSPCore_SetExternalInterrupt(true);
-		}
-
-	}
-
-	return DSPInterpreter::ReadCR();
-}
-
-u16 DSPLLE::DSP_ReadControlRegister()
-{
-	return DSPInterpreter::ReadCR();
-}
-
-u16 DSPLLE::DSP_ReadMailBoxHigh(bool _CPUMailbox)
-{
-	if (_CPUMailbox)
-		return gdsp_mbox_read_h(GDSP_MBOX_CPU);
-	else
-		return gdsp_mbox_read_h(GDSP_MBOX_DSP);
-}
-
-u16 DSPLLE::DSP_ReadMailBoxLow(bool _CPUMailbox)
-{
-	if (_CPUMailbox)
-		return gdsp_mbox_read_l(GDSP_MBOX_CPU);
-	else
-		return gdsp_mbox_read_l(GDSP_MBOX_DSP);
-}
-
-void DSPLLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, u16 _uHighMail)
-{
-	if (_CPUMailbox)
-	{
-		if (gdsp_mbox_peek(GDSP_MBOX_CPU) & 0x80000000)
-		{
-			ERROR_LOG(DSPLLE, "Mailbox isnt empty ... strange");
-		}
-
-#if PROFILE
-		if ((_uHighMail) == 0xBABE)
-		{
-			ProfilerStart();
-		}
-#endif
-
-		gdsp_mbox_write_h(GDSP_MBOX_CPU, _uHighMail);
-	}
-	else
-	{
-		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
-	}
-}
-
-void DSPLLE::DSP_WriteMailBoxLow(bool _CPUMailbox, u16 _uLowMail)
-{
-	if (_CPUMailbox)
-	{
-		gdsp_mbox_write_l(GDSP_MBOX_CPU, _uLowMail);
-	}
-	else
-	{
-		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
-	}
-}
-
-void DSPLLE::DSP_Update(int cycles)
-{
-	int dsp_cycles = cycles / 6;
-
-	if (dsp_cycles <= 0)
-		return;
-// Sound stream update job has been handled by AudioDMA routine, which is more efficient
-/*
-	// This gets called VERY OFTEN. The soundstream update might be expensive so only do it 200 times per second or something.
-	int cycles_between_ss_update;
-
-	if (g_dspInitialize.bWii)
-		cycles_between_ss_update = 121500000 / 200;
-	else
-		cycles_between_ss_update = 81000000 / 200;
-	
-	m_cycle_count += cycles;
-	if (m_cycle_count > cycles_between_ss_update)
-	{
-		while (m_cycle_count > cycles_between_ss_update)
-			m_cycle_count -= cycles_between_ss_update;
-		soundStream->Update();
-	}
-*/
-	// If we're not on a thread, run cycles here.
-	if (!m_bDSPThread)
-	{
-		// ~1/6th as many cycles as the period PPC-side.
-		DSPCore_RunCycles(dsp_cycles);
-	}
-	else
-	{
-		// Wait for dsp thread to complete its cycle. Note: this logic should be thought through.
-		ppcEvent.Wait();
-		Common::AtomicStore(m_cycle_count, dsp_cycles);
-		dspEvent.Set();
-
-	}
-}
-
-u32 DSPLLE::DSP_UpdateRate()
-{
-	return 12600; // TO BE TWEAKED
-}
-
-void DSPLLE::DSP_SendAIBuffer(unsigned int address, unsigned int num_samples)
-{
-	if (!soundStream)
-		return;
-
-	CMixer *pMixer = soundStream->GetMixer();
-
-	if (pMixer && address)
-	{
-		address &= (address & 0x10000000) ? 0x13ffffff : 0x01ffffff;
-		const short *samples = (const short *)&g_dsp.cpu_ram[address];
-		pMixer->PushSamples(samples, num_samples);
-	}
-
-	soundStream->Update();
-}
-
-void DSPLLE::DSP_ClearAudioBuffer(bool mute)
-{
-	if (soundStream)
-		soundStream->Clear(mute);
-}
-
-void DSPLLE::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	if (doLock || unpauseOnUnlock)
-		DSP_ClearAudioBuffer(doLock); 
-
-	if (doLock)
-		m_csDSPThreadActive.lock();
-	else
-		m_csDSPThreadActive.unlock();
-}
-
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
deleted file mode 100644
index 05321aee06..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPLLE_H
-#define _DSPLLE_H
-
-#include "Thread.h"
-#include "SoundStream.h"
-#include "DSPLLEGlobals.h" // Local
-#include "../../DSPEmulator.h"
-
-class DSPLLE : public DSPEmulator {
-public:
-	DSPLLE();
-
-	virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread);
-	virtual void Shutdown();
-	virtual bool IsLLE() { return true; }
-
-	virtual void DoState(PointerWrap &p);
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-
-	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
-	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);
-	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox);
-	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox);
-	virtual unsigned short DSP_ReadControlRegister();
-	virtual unsigned short DSP_WriteControlRegister(unsigned short);
-	virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples);
-	virtual void DSP_Update(int cycles);
-	virtual void DSP_StopSoundStream();
-	virtual void DSP_ClearAudioBuffer(bool mute);
-	virtual u32 DSP_UpdateRate();
-
-private:
-	static void dsp_thread(DSPLLE* lpParameter);
-	void InitMixer();
-
-	std::thread m_hDSPThread;
-	std::mutex m_csDSPThreadActive;
-	bool m_InitMixer;
-	void *m_hWnd;
-	bool m_bWii;
-	bool m_bDSPThread;
-	bool m_bIsRunning;
-	volatile u32 m_cycle_count;
-};
-
-#endif  // _DSPLLE_H
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
deleted file mode 100644
index a132d10654..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h" // for Common::swap
-#include "FileUtil.h"
-#include "DSP/DSPCore.h"
-#include "DSPLLEGlobals.h"
-
-#if PROFILE
-
-#define PROFILE_MAP_SIZE 0x10000
-
-u64 g_profileMap[PROFILE_MAP_SIZE];
-bool g_profile = false;
-
-void ProfilerStart()
-{
-	g_profile = true;
-}
-
-void ProfilerAddDelta(int _addr, int _delta)
-{
-	if (g_profile)
-	{
-		g_profileMap[_addr] += _delta;
-	}
-}
-
-void ProfilerInit()
-{
-	memset(g_profileMap, 0, sizeof(g_profileMap));
-}
-
-void ProfilerDump(u64 count)
-{
-	File::IOFile pFile("DSP_Prof.txt", "wt");
-	if (pFile)
-	{
-		fprintf(pFile.GetHandle(), "Number of DSP steps: %llu\n\n", count);
-		for (int i=0; i<PROFILE_MAP_SIZE;i++)
-		{
-			if (g_profileMap[i] > 0)
-			{
-				fprintf(pFile.GetHandle(), "0x%04X: %llu\n", i, g_profileMap[i]);
-			}
-		}
-	}
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
deleted file mode 100644
index eca1e8a245..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLOBALS_H
-#define _GLOBALS_H
-
-#include "Common.h"
-#include "AudioCommon.h"
-#include <stdio.h>
-
-// TODO: Get rid of this file.
-
-#define PROFILE					0
-
-#if PROFILE	
-	void ProfilerDump(u64 _count);
-	void ProfilerInit();
-	void ProfilerAddDelta(int _addr, int _delta);
-	void ProfilerStart();
-#endif
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
deleted file mode 100644
index 3bc919a17b..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "Common.h"
-#include "DSPLLEGlobals.h"
-
-#include "FileUtil.h"
-#include "DSP/DSPCore.h"
-#include "DSP/DSPCodeUtil.h"
-#include "DSPLLETools.h"
-#include "DSP/disassemble.h"
-#include "DSP/DSPInterpreter.h"
-
-bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc)
-{
-	char binFile[MAX_PATH];
-	char txtFile[MAX_PATH];
-	sprintf(binFile, "%sDSP_UC_%08X.bin", File::GetUserPath(D_DUMPDSP_IDX).c_str(), crc);
-	sprintf(txtFile, "%sDSP_UC_%08X.txt", File::GetUserPath(D_DUMPDSP_IDX).c_str(), crc);
-
-	File::IOFile pFile(binFile, "wb");
-	if (pFile)
-	{
-		pFile.WriteBytes(code_be, size_in_bytes);
-		pFile.Close();
-	}
-	else
-	{
-		PanicAlert("Can't open file (%s) to dump UCode!!", binFile);
-		return false;
-	}
-
-	// Load the binary back in.
-	std::vector<u16> code;
-	LoadBinary(binFile, code);
-
-	AssemblerSettings settings;
-	settings.show_hex = true;
-	settings.show_pc = true;
-	settings.ext_separator = '\'';
-	settings.decode_names = true;
-	settings.decode_registers = true;
-
-	std::string text;
-	DSPDisassembler disasm(settings);
-
-	if (!disasm.Disassemble(0, code, 0x0000, text))
-		return false;
-
-	return File::WriteStringToFile(true, text, txtFile);
-}
-
-// TODO make this useful :p
-bool DumpCWCode(u32 _Address, u32 _Length)
-{
-	std::string filename = File::GetUserPath(D_DUMPDSP_IDX) + "DSP_UCode.bin";
-	File::IOFile pFile(filename, "wb");
-
-	if (pFile)
-	{
-		for (size_t i = _Address; i != _Address + _Length; ++i)
-		{
-			u16 val = g_dsp.iram[i];
-			fprintf(pFile.GetHandle(), "    cw 0x%04x \n", val);
-		}
-		return true;
-	}
-
-	return false;
-}
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h
deleted file mode 100644
index 80545a0b25..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPLLE_TOOLS_H
-#define _DSPLLE_TOOLS_H
-
-bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc);
-bool DumpCWCode(u32 _Address, u32 _Length);
-
-#endif //_DSPLLE_TOOLS_H
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
deleted file mode 100644
index 003475b956..0000000000
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSPSYMBOLS_H
-#define _DSPSYMBOLS_H
-
-#include "Common.h"
-#include "SymbolDB.h"
-
-#include <stdio.h>
-
-namespace DSPSymbols {
-
-class DSPSymbolDB : public SymbolDB 
-{
-public:
-	DSPSymbolDB() {}
-	~DSPSymbolDB() {}
-	
-	Symbol *GetSymbolFromAddr(u32 addr);
-
-};
-
-extern DSPSymbolDB g_dsp_symbol_db;
-
-bool ReadAnnotatedAssembly(const char *filename);
-void AutoDisassembly(u16 start_addr, u16 end_addr);
-
-void Clear();
-
-int Addr2Line(u16 address);
-int Line2Addr(int line);   // -1 for not found
-
-const char *GetLineText(int line);
-
-}  // namespace DSPSymbols
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp
deleted file mode 100644
index 0e77b2a443..0000000000
--- a/Source/Core/Core/Src/HW/DVDInterface.cpp
+++ /dev/null
@@ -1,980 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h" // Common
-#include "ChunkFile.h"
-#include "../ConfigManager.h"
-#include "../CoreTiming.h"
-#include "../HW/SystemTimers.h"
-
-#include "StreamADPCM.h" // Core
-#include "DVDInterface.h"
-#include "../PowerPC/PowerPC.h"
-#include "ProcessorInterface.h"
-#include "Thread.h"
-#include "Memmap.h"
-#include "../VolumeHandler.h"
-#include "AudioInterface.h"
-#include "../Movie.h"
-
-// Disc transfer rate measured in bytes per second
-static const u32 DISC_TRANSFER_RATE_GC = 4 * 1024 * 1024;
-
-namespace DVDInterface
-{
-
-// internal hardware addresses
-enum
-{
-	DI_STATUS_REGISTER			= 0x00,
-	DI_COVER_REGISTER			= 0x04,
-	DI_COMMAND_0				= 0x08,
-	DI_COMMAND_1				= 0x0C,
-	DI_COMMAND_2				= 0x10,
-	DI_DMA_ADDRESS_REGISTER		= 0x14,
-	DI_DMA_LENGTH_REGISTER		= 0x18, 
-	DI_DMA_CONTROL_REGISTER		= 0x1C,
-	DI_IMMEDIATE_DATA_BUFFER	= 0x20,
-	DI_CONFIG_REGISTER			= 0x24
-};
-
-
-// DVD IntteruptTypes
-enum DI_InterruptType
-{
-	INT_DEINT		= 0,
-	INT_TCINT		= 1,
-	INT_BRKINT		= 2,
-	INT_CVRINT		= 3,
-};
-
-// debug commands which may be ORd
-enum
-{
-	STOP_DRIVE	= 0,
-	START_DRIVE	= 0x100,
-	ACCEPT_COPY	= 0x4000,
-	DISC_CHECK	= 0x8000,
-};
-
-// DI Status Register
-union UDISR	
-{
-	u32 Hex;
-	struct
-	{
-		u32 BREAK			:  1;	// Stop the Device + Interrupt
-		u32 DEINITMASK		:  1;	// Access Device Error Int Mask
-		u32 DEINT			:  1;	// Access Device Error Int
-		u32 TCINTMASK		:  1;	// Transfer Complete Int Mask
-		u32 TCINT			:  1;	// Transfer Complete Int
-		u32 BRKINTMASK		:  1;
-		u32 BRKINT			:  1;	// w 1: clear brkint
-		u32					: 25;
-	};
-	UDISR() {Hex = 0;}
-	UDISR(u32 _hex) {Hex = _hex;}
-};
-
-// DI Cover Register
-union UDICVR
-{
-	u32 Hex;
-	struct
-	{
-		u32 CVR				:  1;	// 0: Cover closed	1: Cover open
-		u32 CVRINTMASK		:  1;	// 1: Interrupt enabled
-		u32 CVRINT			:  1;	// r 1: Interrupt requested w 1: Interrupt clear
-		u32					: 29;
-	};
-	UDICVR() {Hex = 0;}
-	UDICVR(u32 _hex) {Hex = _hex;}
-};
-
-union UDICMDBUF
-{
-	u32 Hex;
-	struct
-	{
-		u8 CMDBYTE3;
-		u8 CMDBYTE2;
-		u8 CMDBYTE1;
-		u8 CMDBYTE0;
-	};
-};
-
-// DI DMA Address Register
-union UDIMAR
-{
-	u32 Hex;
-	struct
-	{
-		u32 Zerobits	:	5; // Must be zero (32byte aligned)
-		u32				:	27;
-	};
-	struct
-	{
-		u32 Address		:	26;
-		u32				:	6;
-	};
-};
-
-// DI DMA Address Length Register
-union UDILENGTH
-{
-	u32 Hex;
-	struct
-	{
-		u32 Zerobits	:	5; // Must be zero (32byte aligned)
-		u32				:	27;
-	};
-	struct
-	{
-		u32 Length		:	26;
-		u32				:	6;
-	};
-};
-
-// DI DMA Control Register
-union UDICR
-{
-	u32 Hex;
-	struct
-	{
-		u32 TSTART		:	1;	// w:1 start   r:0 ready
-		u32 DMA			:	1;	// 1: DMA Mode    0: Immediate Mode (can only do Access Register Command)
-		u32 RW			:	1;	// 0: Read Command (DVD to Memory)  1: Write Command (Memory to DVD)
-		u32				:  29;
-	};
-};
-
-union UDIIMMBUF
-{
-	u32 Hex;
-	struct
-	{
-		u8 REGVAL3;
-		u8 REGVAL2;
-		u8 REGVAL1;
-		u8 REGVAL0;
-	};
-};
-
-// DI Config Register
-union UDICFG
-{
-	u32 Hex;
-	struct
-	{
-		u32 CONFIG		:	8;
-		u32				:  24;
-	};
-	UDICFG() {Hex = 0;}
-	UDICFG(u32 _hex) {Hex = _hex;}
-};
-
-
-// STATE_TO_SAVE
-// hardware registers
-static UDISR		m_DISR;
-static UDICVR		m_DICVR;
-static UDICMDBUF	m_DICMDBUF[3];
-static UDIMAR		m_DIMAR;
-static UDILENGTH	m_DILENGTH;
-static UDICR		m_DICR;
-static UDIIMMBUF	m_DIIMMBUF;
-static UDICFG		m_DICFG;
-
-static u32			LoopStart;
-static u32			AudioPos;
-static u32			CurrentStart;
-static u32			LoopLength;
-static u32			CurrentLength;
-
-u32	 g_ErrorCode = 0;
-bool g_bDiscInside = false;
-bool g_bStream = false;
-int  tc = 0;
-
-// GC-AM only
-static unsigned char media_buffer[0x40];
-
-// Needed because data and streaming audio access needs to be managed by the "drive"
-// (both requests can happen at the same time, audio takes precedence)
-static std::mutex dvdread_section;
-
-static int ejectDisc;
-static int insertDisc;
-
-void EjectDiscCallback(u64 userdata, int cyclesLate);
-void InsertDiscCallback(u64 userdata, int cyclesLate);
-
-void UpdateInterrupts();
-void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt);
-void ExecuteCommand(UDICR& _DICR);
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(m_DISR);
-	p.DoPOD(m_DICVR);
-	p.DoArray(m_DICMDBUF, 3);
-	p.Do(m_DIMAR);
-	p.Do(m_DILENGTH);
-	p.Do(m_DICR);
-	p.Do(m_DIIMMBUF);
-	p.DoPOD(m_DICFG);
-
-	p.Do(LoopStart);
-	p.Do(AudioPos);
-	p.Do(LoopLength);
-
-	p.Do(g_ErrorCode);
-	p.Do(g_bDiscInside);
-	p.Do(g_bStream);
-
-	p.Do(CurrentStart);
-	p.Do(CurrentLength);
-}
-
-void TransferComplete(u64 userdata, int cyclesLate)
-{
-	if (m_DICR.TSTART)
-		ExecuteCommand(m_DICR);
-}
-
-void Init()
-{
-	m_DISR.Hex		= 0;
-	m_DICVR.Hex		= 0;
-	m_DICMDBUF[0].Hex= 0;
-	m_DICMDBUF[1].Hex= 0;
-	m_DICMDBUF[2].Hex= 0;
-	m_DIMAR.Hex		= 0;
-	m_DILENGTH.Hex	= 0;
-	m_DICR.Hex		= 0;
-	m_DIIMMBUF.Hex	= 0;
-	m_DICFG.Hex		= 0;
-	m_DICFG.CONFIG	= 1; // Disable bootrom descrambler
-
-	AudioPos = 0;
-	LoopStart = 0;
-	LoopLength = 0;
-	CurrentStart = 0;
-	CurrentLength = 0;
-
-	g_bStream = false;
-
-	ejectDisc = CoreTiming::RegisterEvent("EjectDisc", EjectDiscCallback);
-	insertDisc = CoreTiming::RegisterEvent("InsertDisc", InsertDiscCallback);
-
-	tc = CoreTiming::RegisterEvent("TransferComplete", TransferComplete);
-}
-
-void Shutdown()
-{
-}
-
-void SetDiscInside(bool _DiscInside)
-{
-	g_bDiscInside = _DiscInside;
-}
-
-bool IsDiscInside()
-{	
-	return g_bDiscInside;
-}
-
-// Take care of all logic of "swapping discs"
-// We want this in the "backend", NOT the gui
-// any !empty string will be deleted to ensure
-// that the userdata string exists when called
-void EjectDiscCallback(u64 userdata, int cyclesLate)
-{
-	// Empty the drive
-	SetDiscInside(false);
-	SetLidOpen();
-	VolumeHandler::EjectVolume();
-}
-
-void InsertDiscCallback(u64 userdata, int cyclesLate)
-{
-	std::string& SavedFileName = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename;
-	std::string *_FileName = (std::string *)userdata;
-
-	if (!VolumeHandler::SetVolumeName(*_FileName))
-	{
-		// Put back the old one
-		VolumeHandler::SetVolumeName(SavedFileName);
-		PanicAlertT("Invalid file");
-	}
-	SetLidOpen(false);
-	SetDiscInside(VolumeHandler::IsValid());
-	delete _FileName;
-}
-
-void ChangeDisc(const char* _newFileName)
-{
-	std::string* _FileName = new std::string(_newFileName);
-	CoreTiming::ScheduleEvent_Threadsafe(0, ejectDisc);
-	CoreTiming::ScheduleEvent_Threadsafe(500000000, insertDisc, (u64)_FileName);
-	if (Movie::IsRecordingInput())
-	{
-		Movie::g_bDiscChange = true;
-		std::string fileName = _newFileName;
-		int sizeofpath = fileName.find_last_of("/\\") + 1;
-		if (fileName.substr(sizeofpath).length() > 40)
-		{
-			PanicAlert("Saving iso filename to .dtm failed; max file name length is 40 characters.");
-		}
-		Movie::g_discChange = fileName.substr(sizeofpath);
-	}
-}
-
-void SetLidOpen(bool _bOpen)
-{
-	m_DICVR.CVR = _bOpen ? 1 : 0;
-
-	GenerateDIInterrupt(INT_CVRINT);
-}
-
-bool IsLidOpen()
-{	
-	return (m_DICVR.CVR == 1);
-}
-
-void ClearCoverInterrupt()
-{
-	m_DICVR.CVRINT = 0;
-}
-
-bool DVDRead(u32 _iDVDOffset, u32 _iRamAddress, u32 _iLength)
-{
-	// We won't need the crit sec when DTK streaming has been rewritten correctly.
-	std::lock_guard<std::mutex> lk(dvdread_section);
-	return VolumeHandler::ReadToPtr(Memory::GetPointer(_iRamAddress), _iDVDOffset, _iLength);
-}
-
-bool DVDReadADPCM(u8* _pDestBuffer, u32 _iNumSamples)
-{
-	_iNumSamples &= ~31;
-
-	if (AudioPos == 0)
-	{
-		memset(_pDestBuffer, 0, _iNumSamples); // probably __AI_SRC_INIT :P
-	}
-	else
-	{
-		std::lock_guard<std::mutex> lk(dvdread_section);
-		VolumeHandler::ReadToPtr(_pDestBuffer, AudioPos, _iNumSamples);
-	}
-
-	// loop check
-	if (g_bStream)
-	{
-		AudioPos += _iNumSamples;
-
-		if (AudioPos >= CurrentStart + CurrentLength)
-		{
-			if (LoopStart == 0)
-			{
-				AudioPos = 0;
-				CurrentStart = 0;
-				CurrentLength = 0;
-			}
-			else
-			{
-				AudioPos = LoopStart;
-				CurrentStart = LoopStart;
-				CurrentLength = LoopLength;
-			}
-			NGCADPCM::InitFilter();
-			AudioInterface::GenerateAISInterrupt();
-		}
-
-		//WARN_LOG(DVDINTERFACE,"ReadADPCM");
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	switch (_iAddress & 0xFF)
-	{
-	case DI_STATUS_REGISTER:		_uReturnValue = m_DISR.Hex; break;
-	case DI_COVER_REGISTER:			_uReturnValue = m_DICVR.Hex; break;
-	case DI_COMMAND_0:				_uReturnValue = m_DICMDBUF[0].Hex; break;
-	case DI_COMMAND_1:				_uReturnValue = m_DICMDBUF[1].Hex; break;
-	case DI_COMMAND_2:				_uReturnValue = m_DICMDBUF[2].Hex; break;
-	case DI_DMA_ADDRESS_REGISTER:	_uReturnValue = m_DIMAR.Hex; break;
-	case DI_DMA_LENGTH_REGISTER:	_uReturnValue = m_DILENGTH.Hex; break;
-	case DI_DMA_CONTROL_REGISTER:	_uReturnValue = m_DICR.Hex; break;
-	case DI_IMMEDIATE_DATA_BUFFER:	_uReturnValue = m_DIIMMBUF.Hex; break;
-	case DI_CONFIG_REGISTER:		_uReturnValue = m_DICFG.Hex; break;
-
-	default:
-		_dbg_assert_(DVDINTERFACE, 0);
-		_uReturnValue = 0;
-		break;
-	}
-	DEBUG_LOG(DVDINTERFACE, "(r32): 0x%08x - 0x%08x", _iAddress, _uReturnValue);
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	DEBUG_LOG(DVDINTERFACE, "(w32): 0x%08x @ 0x%08x", _iValue, _iAddress);
-
-	switch (_iAddress & 0xFF)
-	{
-	case DI_STATUS_REGISTER:
-		{
-			UDISR tmpStatusReg(_iValue);
-
-			m_DISR.DEINITMASK	= tmpStatusReg.DEINITMASK;
-			m_DISR.TCINTMASK	= tmpStatusReg.TCINTMASK;
-			m_DISR.BRKINTMASK	= tmpStatusReg.BRKINTMASK;
-			m_DISR.BREAK		= tmpStatusReg.BREAK;
-
-			if (tmpStatusReg.DEINT)
-				m_DISR.DEINT = 0;
-
-			if (tmpStatusReg.TCINT)
-				m_DISR.TCINT = 0;
-
-			if (tmpStatusReg.BRKINT)
-				m_DISR.BRKINT = 0;
-
-			if (m_DISR.BREAK)
-			{
-				_dbg_assert_(DVDINTERFACE, 0);
-			}
-			
-			UpdateInterrupts();
-		}
-		break;
-
-	case DI_COVER_REGISTER:
-		{
-			UDICVR tmpCoverReg(_iValue);
-
-			m_DICVR.CVRINTMASK = tmpCoverReg.CVRINTMASK;
-
-			if (tmpCoverReg.CVRINT)
-				m_DICVR.CVRINT = 0;
-
-			UpdateInterrupts();
-		}
-		break;
-
-	case DI_COMMAND_0:		m_DICMDBUF[0].Hex = _iValue; break;
-	case DI_COMMAND_1:		m_DICMDBUF[1].Hex = _iValue; break;
-	case DI_COMMAND_2:		m_DICMDBUF[2].Hex = _iValue; break;
-
-	case DI_DMA_ADDRESS_REGISTER:
-		{
-			m_DIMAR.Hex = _iValue & ~0xfc00001f;
-		}
-		break;
-	case DI_DMA_LENGTH_REGISTER:
-		{
-			m_DILENGTH.Hex = _iValue & ~0x1f;
-		}
-		break;
-	case DI_DMA_CONTROL_REGISTER:	
-		{
-			m_DICR.Hex = _iValue & 7;
-			if (m_DICR.TSTART)
-			{
-				if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed)
-				{
-					u64 ticksUntilTC = m_DILENGTH.Length * 
-						(SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 1 : DISC_TRANSFER_RATE_GC));
-					CoreTiming::ScheduleEvent((int)ticksUntilTC, tc);
-				}
-				else
-				{
-					ExecuteCommand(m_DICR);
-				}
-			}
-		}
-		break;
-
-	case DI_IMMEDIATE_DATA_BUFFER:	m_DIIMMBUF.Hex = _iValue; break;
-
-	case DI_CONFIG_REGISTER:
-		{
-			WARN_LOG(DVDINTERFACE, "Write to DICFG, ignored as it's read-only");
-		}
-		break;
-
-	default:
-		_dbg_assert_msg_(DVDINTERFACE, 0, "Write to unknown DI address 0x%08x", _iAddress);
-		break;
-	}
-}
-
-void UpdateInterrupts()
-{
-	if ((m_DISR.DEINT	& m_DISR.DEINITMASK) ||
-		(m_DISR.TCINT	& m_DISR.TCINTMASK)  ||
-		(m_DISR.BRKINT	& m_DISR.BRKINTMASK) ||
-		(m_DICVR.CVRINT	& m_DICVR.CVRINTMASK))
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, true);
-	}
-	else
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, false);
-	}
-
-	// Required for Summoner: A Goddess Reborn
-	CoreTiming::ForceExceptionCheck(50);
-}
-
-void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt)
-{
-	switch(_DVDInterrupt) 
-	{
-	case INT_DEINT:		m_DISR.DEINT	= 1; break;
-	case INT_TCINT:		m_DISR.TCINT	= 1; break;
-	case INT_BRKINT:	m_DISR.BRKINT	= 1; break;
-	case INT_CVRINT:	m_DICVR.CVRINT	= 1; break;
-	}
-
-	UpdateInterrupts();
-}
-
-void ExecuteCommand(UDICR& _DICR)
-{
-//	_dbg_assert_(DVDINTERFACE, _DICR.RW == 0); // only DVD to Memory
-	int GCAM = ((SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD)
-		&& (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD))
-		? 1 : 0;
-
-	if (GCAM)
-	{
-		ERROR_LOG(DVDINTERFACE,
-			"DVD: %08x, %08x, %08x, DMA=addr:%08x,len:%08x,ctrl:%08x",
-			m_DICMDBUF[0].Hex, m_DICMDBUF[1].Hex, m_DICMDBUF[2].Hex,
-			m_DIMAR.Hex, m_DILENGTH.Hex, m_DICR.Hex);
-		// decrypt command. But we have a zero key, that simplifies things a lot.
-		// If you get crazy dvd command errors, make sure 0x80000000 - 0x8000000c is zero'd
-		m_DICMDBUF[0].Hex <<= 24;
-	}
-
-
-	switch (m_DICMDBUF[0].CMDBYTE0)
-	{
-	case DVDLowInquiry:
-		if (GCAM)
-		{
-			// 0x29484100...
-			// was 21 i'm not entirely sure about this, but it works well.
-			m_DIIMMBUF.Hex = 0x21000000;
-		}
-		else
-		{
-			// small safety check, dunno if it's needed
-			if ((m_DICMDBUF[1].Hex == 0) && (m_DILENGTH.Length == 0x20))
-			{
-				u8* driveInfo = Memory::GetPointer(m_DIMAR.Address);
-				// gives the correct output in GCOS - 06 2001/08 (61)
-				// there may be other stuff missing ?
-				driveInfo[4] = 0x20;
-				driveInfo[5] = 0x01;
-				driveInfo[6] = 0x06;
-				driveInfo[7] = 0x08;
-				driveInfo[8] = 0x61;
-
-				// Just for fun
-				INFO_LOG(DVDINTERFACE, "Drive Info: %02x %02x%02x/%02x (%02x)",
-					driveInfo[6], driveInfo[4], driveInfo[5], driveInfo[7], driveInfo[8]);
-			}
-		}
-		break;
-
-	// "Set Extension"...not sure what it does
-	case 0x55:
-		INFO_LOG(DVDINTERFACE, "SetExtension");
-		break;
-
-	// DMA Read from Disc
-	case 0xA8:
-		if (g_bDiscInside)
-		{
-			switch (m_DICMDBUF[0].CMDBYTE3)
-			{
-			case 0x00: // Read Sector
-				{
-					u32 iDVDOffset = m_DICMDBUF[1].Hex << 2;
-
-					DEBUG_LOG(DVDINTERFACE, "Read: DVDOffset=%08x, DMABuffer=%08x, SrcLength=%08x, DMALength=%08x",
-						iDVDOffset, m_DIMAR.Address, m_DICMDBUF[2].Hex, m_DILENGTH.Length);
-					_dbg_assert_(DVDINTERFACE, m_DICMDBUF[2].Hex == m_DILENGTH.Length);
-
-					if (GCAM)
-					{
-						if (iDVDOffset & 0x80000000) // read request to hardware buffer
-						{
-							u32 len = m_DILENGTH.Length / 4;
-							switch (iDVDOffset)
-							{
-							case 0x80000000:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (80000000)");
-								for (u32 i = 0; i < len; i++)
-									Memory::Write_U32(0, m_DIMAR.Address + i * 4);
-								break;
-							case 0x80000040:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (2) (80000040)");
-								for (u32 i = 0; i < len; i++)
-									Memory::Write_U32(~0, m_DIMAR.Address + i * 4);
-								Memory::Write_U32(0x00000020, m_DIMAR.Address); // DIMM SIZE, LE
-								Memory::Write_U32(0x4743414D, m_DIMAR.Address + 4); // GCAM signature
-								break;
-							case 0x80000120:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000120)");
-								for (u32 i = 0; i < len; i++)
-									Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4);
-								break;
-							case 0x80000140:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000140)");
-								for (u32 i = 0; i < len; i++)
-									Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4);
-								break;
-							case 0x84000020:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (1) (84000020)");
-								for (u32 i = 0; i < len; i++)
-									Memory::Write_U32(0x00000000, m_DIMAR.Address + i * 4);
-								break;
-							default:
-								ERROR_LOG(DVDINTERFACE, "GC-AM: UNKNOWN MEDIA BOARD LOCATION %x", iDVDOffset);
-								break;
-							}
-							break;
-						}
-						else if ((iDVDOffset == 0x1f900000) || (iDVDOffset == 0x1f900020))
-						{
-							ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD COMM AREA (1f900020)");
-							memcpy(Memory::GetPointer(m_DIMAR.Address), media_buffer + iDVDOffset - 0x1f900000, m_DILENGTH.Length);
-							for (u32 i = 0; i < m_DILENGTH.Length; i += 4)
-								ERROR_LOG(DVDINTERFACE, "GC-AM: %08x", Memory::Read_U32(m_DIMAR.Address + i));
-							break;
-						}
-					}
-
-					// Here is the actual Disk Reading
-					if (!DVDRead(iDVDOffset, m_DIMAR.Address, m_DILENGTH.Length))
-					{
-						PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
-					}
-				}
-				break;
-
-			case 0x40: // Read DiscID
-				_dbg_assert_(DVDINTERFACE, m_DICMDBUF[1].Hex == 0);
-				_dbg_assert_(DVDINTERFACE, m_DICMDBUF[2].Hex == m_DILENGTH.Length);
-				_dbg_assert_(DVDINTERFACE, m_DILENGTH.Length == 0x20);
-				if (!DVDRead(m_DICMDBUF[1].Hex, m_DIMAR.Address, m_DILENGTH.Length))
-					PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
-				WARN_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(m_DIMAR.Address));
-				break;
-
-			default:
-				_dbg_assert_msg_(DVDINTERFACE, 0, "Unknown Read Subcommand");
-				break;
-			}
-		}
-		else
-		{
-			// there is no disc to read
-			_DICR.TSTART = 0;
-			m_DILENGTH.Length = 0;
-			g_ErrorCode = ERROR_NO_DISK | ERROR_COVER_H;
-			GenerateDIInterrupt(INT_DEINT);
-			return;
-		}
-		break;
-
-	// GC-AM
-	case 0xAA:
-		if (GCAM)
-		{
-			ERROR_LOG(DVDINTERFACE, "GC-AM: 0xAA, DMABuffer=%08x, DMALength=%08x", m_DIMAR.Address, m_DILENGTH.Length);
-			u32 iDVDOffset = m_DICMDBUF[1].Hex << 2;
-			unsigned int len = m_DILENGTH.Length; 
-			int offset = iDVDOffset - 0x1F900000;
-			/*
-			if (iDVDOffset == 0x84800000)
-			{
-				ERROR_LOG(DVDINTERFACE, "Firmware upload");
-			}
-			else*/
-			if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)
-			{
-				u32 addr = m_DIMAR.Address;
-				if (iDVDOffset == 0x84800000)
-				{
-					ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD");
-				}
-				else
-				{
-					ERROR_LOG(DVDINTERFACE, "ILLEGAL MEDIA WRITE");
-				}
-
-				while (len >= 4)
-				{
-					ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08x: %08x", iDVDOffset, Memory::Read_U32(addr));
-					addr += 4;
-					len -= 4;
-					iDVDOffset += 4;
-				}
-			}
-			else
-			{
-				u32 addr = m_DIMAR.Address;
-				memcpy(media_buffer + offset, Memory::GetPointer(addr), len);
-				while (len >= 4)
-				{
-					ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08x: %08x", iDVDOffset, Memory::Read_U32(addr));
-					addr += 4;
-					len -= 4;
-					iDVDOffset += 4;
-				}
-			}
-		}
-		break;
-
-	// Seek (immediate)
-	case DVDLowSeek:
-		if (!GCAM)
-		{
-			// We don't care :)
-			DEBUG_LOG(DVDINTERFACE, "Seek: offset=%08x (ignoring)", m_DICMDBUF[1].Hex << 2);
-		}
-		else
-		{
-			memset(media_buffer, 0, 0x20);
-			media_buffer[0] = media_buffer[0x20]; // ID
-			media_buffer[2] = media_buffer[0x22];
-			media_buffer[3] = media_buffer[0x23] | 0x80;
-			int cmd = (media_buffer[0x23]<<8)|media_buffer[0x22];
-			ERROR_LOG(DVDINTERFACE, "GC-AM: execute buffer, cmd=%04x", cmd);
-			switch (cmd)
-			{
-			case 0x00:
-				media_buffer[4] = 1;
-				break;
-			case 0x1:
-				media_buffer[7] = 0x20; // DIMM Size
-				break;
-			case 0x100:
-				{
-					// urgh
-					static int percentage = 0;
-					static int status = 0;
-					percentage++;
-					if (percentage > 100)
-					{
-						status++;
-						percentage = 0;
-					}
-					media_buffer[4] = status;
-					/* status:
-					0 - "Initializing media board. Please wait.."
-					1 - "Checking network. Please wait..."
-					2 - "Found a system disc. Insert a game disc"
-					3 - "Testing a game program. %d%%"
-					4 - "Loading a game program. %d%%"
-					5  - go
-					6  - error xx 
-					*/
-					media_buffer[8] = percentage;
-					media_buffer[4] = 0x05;
-					media_buffer[8] = 0x64;
-					break;
-				}
-			case 0x101:
-				media_buffer[4] = 3; // version
-				media_buffer[5] = 3; 
-				media_buffer[6] = 1; // xxx
-				media_buffer[8] = 1;
-				media_buffer[16] = 0xFF;
-				media_buffer[17] = 0xFF;
-				media_buffer[18] = 0xFF;
-				media_buffer[19] = 0xFF;
-				break;
-			case 0x102:  // get error code
-				media_buffer[4] = 1; // 0: download incomplete (31), 1: corrupted, other error 1
-				media_buffer[5] = 0;
-				break;
-			case 0x103:
-				memcpy(media_buffer + 4, "A89E27A50364511", 15);  // serial
-				break;
-#if 0
-			case 0x301: // unknown
-				memcpy(media_buffer + 4, media_buffer + 0x24, 0x1c);
-				break;
-			case 0x302:
-				break;
-#endif
-			default:
-				ERROR_LOG(DVDINTERFACE, "GC-AM: execute buffer (unknown)");
-				break;
-			}
-			memset(media_buffer + 0x20, 0, 0x20);
-			m_DIIMMBUF.Hex = 0x66556677; // just a random value that works.
-		}
-		break;
-
-	case DVDLowOffset:
-		DEBUG_LOG(DVDINTERFACE, "DVDLowOffset: ignoring...");
-		break;
-
-	// Request Error Code
-	case DVDLowRequestError:
-		ERROR_LOG(DVDINTERFACE, "Requesting error... (0x%08x)", g_ErrorCode);
-		m_DIIMMBUF.Hex = g_ErrorCode;
-		break;
-
-	// Audio Stream (Immediate)
-	//	m_DICMDBUF[0].CMDBYTE1		= subcommand
-	//	m_DICMDBUF[1].Hex << 2		= offset on disc 
-	//	m_DICMDBUF[2].Hex			= Length of the stream
-	case 0xE1:
-		{
-			u32 pos = m_DICMDBUF[1].Hex << 2;
-			u32 length = m_DICMDBUF[2].Hex;
-
-			// Start playing
-			if (!g_bStream && m_DICMDBUF[0].CMDBYTE1 == 0 && pos != 0 && length != 0)
-			{
-				AudioPos = pos;
-				CurrentStart = pos;
-				CurrentLength = length;
-				NGCADPCM::InitFilter();
-				g_bStream = true;
-			}
-
-			LoopStart = pos;
-			LoopLength = length;
-			g_bStream = (m_DICMDBUF[0].CMDBYTE1 == 0); // This command can start/stop the stream
-
-			// Stop stream
-			if (m_DICMDBUF[0].CMDBYTE1 == 1)
-			{
-				AudioPos = 0;
-				LoopStart = 0;
-				LoopLength = 0;
-				CurrentStart = 0;
-				CurrentLength = 0;
-			}
-
-			WARN_LOG(DVDINTERFACE, "(Audio) Stream subcmd = %08x offset = %08x length=%08x",
-				m_DICMDBUF[0].Hex, m_DICMDBUF[1].Hex << 2, m_DICMDBUF[2].Hex);
-		}
-		break;
-
-	// Request Audio Status (Immediate)
-	case 0xE2:
-		{
-			switch (m_DICMDBUF[0].CMDBYTE1)
-			{
-			case 0x00: // Returns streaming status
-				m_DIIMMBUF.Hex = (AudioPos == 0) ? 0 : 1;
-				break;
-			case 0x01: // Returns the current offset
-				if (g_bStream)
-					m_DIIMMBUF.Hex = (AudioPos - CurrentStart) >> 2;
-				else
-					m_DIIMMBUF.Hex = 0;
-				break;
-			case 0x02: // Returns the start offset
-				if (g_bStream)
-					m_DIIMMBUF.Hex = CurrentStart >> 2;
-				else
-					m_DIIMMBUF.Hex = 0;
-				break;
-			case 0x03: // Returns the total length
-				if (g_bStream)
-					m_DIIMMBUF.Hex = CurrentLength;
-				else
-					m_DIIMMBUF.Hex = 0;
-				break;
-			default:
-				WARN_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x  Request Audio status %s", m_DICMDBUF[0].CMDBYTE1, g_bStream? "on":"off");
-				break;
-			}
-		}
-		break;
-
-	case DVDLowStopMotor:
-		DEBUG_LOG(DVDINTERFACE, "Stop motor");
-		break;
-
-	// DVD Audio Enable/Disable (Immediate)
-	case DVDLowAudioBufferConfig:
-		if (m_DICMDBUF[0].CMDBYTE1 == 1)
-		{
-			g_bStream = true;
-			WARN_LOG(DVDINTERFACE, "(Audio): Audio enabled");
-		}
-		else
-		{
-			g_bStream = false;
-			WARN_LOG(DVDINTERFACE, "(Audio): Audio disabled");
-		}
-		break;
-
-	// yet another command we prolly don't care about
-	case 0xEE:
-		DEBUG_LOG(DVDINTERFACE, "SetStatus - Unimplemented");
-		break;
-
-	// Debug commands; see yagcd. We don't really care
-	// NOTE: commands to stream data will send...a raw data stream
-	// This will appear as unknown commands, unless the check is re-instated to catch such data.
-	case 0xFE:
-		INFO_LOG(DVDINTERFACE, "Unsupported DVD Drive debug command 0x%08x", m_DICMDBUF[0].Hex);
-		break;
-
-	// Unlock Commands. 1: "MATSHITA" 2: "DVD-GAME"
-	// Just for fun
-	case 0xFF:
-		{
-			if (m_DICMDBUF[0].Hex == 0xFF014D41
-				&& m_DICMDBUF[1].Hex == 0x54534849
-				&& m_DICMDBUF[2].Hex == 0x54410200)
-			{
-				INFO_LOG(DVDINTERFACE, "Unlock test 1 passed");
-			}
-			else if (m_DICMDBUF[0].Hex == 0xFF004456
-				&& m_DICMDBUF[1].Hex == 0x442D4741
-				&& m_DICMDBUF[2].Hex == 0x4D450300)
-			{
-				INFO_LOG(DVDINTERFACE, "Unlock test 2 passed");
-			}
-			else
-			{
-				INFO_LOG(DVDINTERFACE, "Unlock test failed");
-			}
-		}
-		break;
-
-	default:
-		PanicAlertT("Unknown DVD command %08x - fatal error", m_DICMDBUF[0].Hex);
-		_dbg_assert_(DVDINTERFACE, 0);
-		break;
-	}
-
-	// transfer is done
-	_DICR.TSTART = 0;
-	m_DILENGTH.Length = 0;
-	GenerateDIInterrupt(INT_TCINT);
-	g_ErrorCode = 0;
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/HW/DVDInterface.h b/Source/Core/Core/Src/HW/DVDInterface.h
deleted file mode 100644
index 2eb3b7e377..0000000000
--- a/Source/Core/Core/Src/HW/DVDInterface.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DVDINTERFACE_H
-#define _DVDINTERFACE_H
-
-#include "Common.h"
-class PointerWrap;
-
-namespace DVDInterface
-{
-
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-// Disc detection and swapping
-void SetDiscInside(bool _DiscInside);
-bool IsDiscInside();
-void ChangeDisc(const char* _FileName);
-
-// Lid Functions
-void SetLidOpen(bool _bOpen = true);
-bool IsLidOpen();
-
-// Used as low level control by WII_IPC_HLE_Device_DI
-void ClearCoverInterrupt();
-
-// DVD Access Functions
-bool DVDRead(u32 _iDVDOffset, u32 _iRamAddress, u32 _iLength);
-// For AudioInterface
-bool DVDReadADPCM(u8* _pDestBuffer, u32 _iNumSamples);
-extern bool g_bStream;
-
-// Read32
-void Read32(u32& _uReturnValue, const u32 _iAddress);
-
-// Write32
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-
-// Not sure about endianness here. I'll just name them like this...
-enum DIErrorLow
-{
-	ERROR_READY			= 0x00000000, // Ready.
-	ERROR_COVER_L		= 0x01000000, // Cover is opened.
-	ERROR_CHANGE_DISK	= 0x02000000, // Disk change.
-	ERROR_NO_DISK		= 0x03000000, // No Disk.
-	ERROR_MOTOR_STOP_L	= 0x04000000, // Motor stop.
-	ERROR_NO_DISKID_L	= 0x05000000 // Disk ID not read.
-};
-enum DIErrorHigh
-{
-	ERROR_NONE			= 0x000000, // No error.
-	ERROR_MOTOR_STOP_H	= 0x020400, // Motor stopped.
-	ERROR_NO_DISKID_H	= 0x020401, // Disk ID not read.
-	ERROR_COVER_H		= 0x023a00, // Medium not present / Cover opened.
-	ERROR_SEEK_NDONE	= 0x030200, // No Seek complete.
-	ERROR_READ			= 0x031100, // UnRecoverd read error.
-	ERROR_PROTOCOL		= 0x040800, // Transfer protocol error.
-	ERROR_INV_CMD		= 0x052000, // Invalid command operation code.
-	ERROR_AUDIO_BUF		= 0x052001, // Audio Buffer not set.
-	ERROR_BLOCK_OOB		= 0x052100, // Logical block address out of bounds.
-	ERROR_INV_FIELD		= 0x052400, // Invalid Field in command packet.
-	ERROR_INV_AUDIO		= 0x052401, // Invalid audio command.
-	ERROR_INV_PERIOD	= 0x052402, // Configuration out of permitted period.
-	ERROR_END_USR_AREA	= 0x056300, // End of user area encountered on this track.
-	ERROR_MEDIUM		= 0x062800, // Medium may have changed.
-	ERROR_MEDIUM_REQ	= 0x0b5a01 // Operator medium removal request.
-};
-
-enum DICommand
-{
-	DVDLowInquiry				= 0x12,
-	DVDLowReadDiskID			= 0x70,
-	DVDLowRead					= 0x71,
-	DVDLowWaitForCoverClose		= 0x79,
-	DVDLowGetCoverReg			= 0x7a, // DVDLowPrepareCoverRegister?
-	DVDLowNotifyReset			= 0x7e,
-	DVDLowReadDvdPhysical		= 0x80,
-	DVDLowReadDvdCopyright		= 0x81,
-	DVDLowReadDvdDiscKey		= 0x82,
-	DVDLowClearCoverInterrupt	= 0x86,
-	DVDLowGetCoverStatus		= 0x88,
-	DVDLowReset					= 0x8a,
-	DVDLowOpenPartition			= 0x8b,
-	DVDLowClosePartition		= 0x8c,
-	DVDLowUnencryptedRead		= 0x8d,
-	DVDLowEnableDvdVideo		= 0x8e,
-	DVDLowReportKey				= 0xa4,
-	DVDLowSeek					= 0xab,
-	DVDLowReadDvd				= 0xd0,
-	DVDLowReadDvdConfig			= 0xd1,
-	DVDLowStopLaser				= 0xd2,
-	DVDLowOffset				= 0xd9,
-	DVDLowReadDiskBca			= 0xda,
-	DVDLowRequestDiscStatus		= 0xdb,
-	DVDLowRequestRetryNumber	= 0xdc,
-	DVDLowSetMaximumRotation	= 0xdd,
-	DVDLowSerMeasControl		= 0xdf,
-	DVDLowRequestError			= 0xe0,
-	DVDLowStopMotor				= 0xe3,
-	DVDLowAudioBufferConfig		= 0xe4
-};
-
-} // end of namespace DVDInterface
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp
deleted file mode 100644
index aa3e42c160..0000000000
--- a/Source/Core/Core/Src/HW/EXI.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "../ConfigManager.h"
-#include "../CoreTiming.h"
-
-#include "ProcessorInterface.h"
-#include "../PowerPC/PowerPC.h"
-
-#include "EXI.h"
-#include "Sram.h"
-#include "../Movie.h"
-SRAM g_SRAM;
-
-namespace ExpansionInterface
-{
-
-static int changeDevice;
-
-enum
-{
-	NUM_CHANNELS = 3
-};
-
-CEXIChannel *g_Channels[NUM_CHANNELS];
-void Init()
-{
-	initSRAM();
-	for (u32 i = 0; i < NUM_CHANNELS; i++)
-		g_Channels[i] = new CEXIChannel(i);
-
-	if (Movie::IsPlayingInput() && Movie::IsUsingMemcard() && Movie::IsConfigSaved())
-		g_Channels[0]->AddDevice(EXIDEVICE_MEMORYCARD,	0); // SlotA
-	else if(Movie::IsPlayingInput() && !Movie::IsUsingMemcard() && Movie::IsConfigSaved())
-		g_Channels[0]->AddDevice(EXIDEVICE_NONE,		0); // SlotA
-	else
-		g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0],	0); // SlotA
-	g_Channels[0]->AddDevice(EXIDEVICE_MASKROM,						1);
-	g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2],	2); // Serial Port 1
-	g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1],	0); // SlotB
-	g_Channels[2]->AddDevice(EXIDEVICE_AD16,						0);
-
-	changeDevice = CoreTiming::RegisterEvent("ChangeEXIDevice", ChangeDeviceCallback);
-}
-
-void Shutdown()
-{
-	for (u32 i = 0; i < NUM_CHANNELS; i++)
-	{
-		delete g_Channels[i];
-		g_Channels[i] = NULL;
-	}
-}
-
-void DoState(PointerWrap &p)
-{
-	for (int c = 0; c < NUM_CHANNELS; ++c)
-		g_Channels[c]->DoState(p);
-}
-
-void PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	for (int c = 0; c < NUM_CHANNELS; ++c)
-		g_Channels[c]->PauseAndLock(doLock, unpauseOnUnlock);
-}
-
-
-void ChangeDeviceCallback(u64 userdata, int cyclesLate)
-{
-	u8 channel = (u8)(userdata >> 32);
-	u8 type = (u8)(userdata >> 16);
-	u8 num = (u8)userdata;
-
-	g_Channels[channel]->AddDevice((TEXIDevices)type, num);
-}
-
-void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num)
-{
-	// Called from GUI, so we need to make it thread safe.
-	// Let the hardware see no device for .5b cycles
-	CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | ((u64)EXIDEVICE_NONE << 16) | device_num);
-	CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | ((u64)device_type << 16) | device_num);
-}
-
-IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex)
-{
-	for (int i = 0; i < NUM_CHANNELS; ++i)
-	{
-		IEXIDevice* device = g_Channels[i]->FindDevice(device_type, customIndex);
-		if (device)
-			return device;
-	}
-	return NULL;
-}
-
-// Unused (?!)
-void Update()
-{
-	g_Channels[0]->Update();
-	g_Channels[1]->Update();
-	g_Channels[2]->Update();
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	// TODO 0xfff00000 is mapped to EXI -> mapped to first MB of maskrom
-	u32 iAddr = _iAddress & 0x3FF;
-	u32 iRegister = (iAddr >> 2) % 5;
-	u32 iChannel = (iAddr >> 2) / 5;
-
-	_dbg_assert_(EXPANSIONINTERFACE, iChannel < NUM_CHANNELS);
-
-	if (iChannel < NUM_CHANNELS)
-	{
-		g_Channels[iChannel]->Read32(_uReturnValue, iRegister);
-	}
-	else
-	{
-		_uReturnValue = 0;
-	}
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	// TODO 0xfff00000 is mapped to EXI -> mapped to first MB of maskrom
-	u32 iAddr = _iAddress & 0x3FF;
-	u32 iRegister = (iAddr >> 2) % 5;
-	u32 iChannel = (iAddr >> 2) / 5;
-
-	_dbg_assert_(EXPANSIONINTERFACE, iChannel < NUM_CHANNELS);
-
-	if (iChannel < NUM_CHANNELS)
-		g_Channels[iChannel]->Write32(_iValue, iRegister);
-}
-
-void UpdateInterrupts()
-{
-	// Interrupts are mapped a bit strangely:
-	// Channel 0 Device 0 generates interrupt on channel 0
-	// Channel 0 Device 2 generates interrupt on channel 2
-	// Channel 1 Device 0 generates interrupt on channel 1
-	g_Channels[2]->SetEXIINT(g_Channels[0]->GetDevice(4)->IsInterruptSet());
-
-	bool causeInt = false;
-	for (int i = 0; i < NUM_CHANNELS; i++)
-		causeInt |= g_Channels[i]->IsCausingInterrupt();
-
-	ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_EXI, causeInt);
-}
-
-} // end of namespace ExpansionInterface
diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h
deleted file mode 100644
index 013a049010..0000000000
--- a/Source/Core/Core/Src/HW/EXI.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIINTERFACE_H
-#define _EXIINTERFACE_H
-
-#include "Common.h"
-#include "EXI_Channel.h"
-#include "Thread.h"
-class PointerWrap;
-
-namespace ExpansionInterface
-{
-
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-void PauseAndLock(bool doLock, bool unpauseOnUnlock);
-
-void Update();
-void UpdateInterrupts();
-
-void ChangeDeviceCallback(u64 userdata, int cyclesLate);
-void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num);
-IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
-
-void Read32(u32& _uReturnValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-} // end of namespace ExpansionInterface
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp
deleted file mode 100644
index 13784b4011..0000000000
--- a/Source/Core/Core/Src/HW/EXI_Channel.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "EXI_Channel.h"
-#include "EXI_Device.h"
-#include "EXI.h"
-#include "../ConfigManager.h"
-#include "../Movie.h"
-
-#define EXI_READ		0
-#define EXI_WRITE		1
-#define EXI_READWRITE	2
-
-#include "ProcessorInterface.h"
-#include "../PowerPC/PowerPC.h"
-#include "CoreTiming.h"
-
-CEXIChannel::CEXIChannel(u32 ChannelId) :
-	m_DMAMemoryAddress(0),
-	m_DMALength(0),
-	m_ImmData(0),
-	m_ChannelId(ChannelId)
-{
-	m_Control.Hex = 0;
-	m_Status.Hex = 0;
-
-	if (m_ChannelId == 0 || m_ChannelId == 1)
-		m_Status.EXTINT = 1;
-	if (m_ChannelId == 1)
-		m_Status.CHIP_SELECT = 1;
-
-	for (int i = 0; i < NUM_DEVICES; i++)
-		m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId);
-
-	updateInterrupts = CoreTiming::RegisterEvent("EXIInterrupt", UpdateInterrupts);
-}
-
-CEXIChannel::~CEXIChannel()
-{
-	RemoveDevices();
-}
-
-void CEXIChannel::RemoveDevices()
-{
-	for (int i = 0; i < NUM_DEVICES; i++)
-	{
-		delete m_pDevices[i];
-		m_pDevices[i] = NULL;
-	}
-}
-
-void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num)
-{
-	IEXIDevice* pNewDevice = EXIDevice_Create(device_type, m_ChannelId);
-	AddDevice(pNewDevice, device_num);
-}
-
-void CEXIChannel::AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged)
-{
-	_dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES);
-
-	// delete the old device
-	if (m_pDevices[device_num] != NULL)
-	{
-		delete m_pDevices[device_num];
-		m_pDevices[device_num] = NULL;
-	}
-
-	// replace it with the new one
-	m_pDevices[device_num] = pDevice;
-
-	if(notifyPresenceChanged)
-	{
-		// This means "device presence changed", software has to check
-		// m_Status.EXT to see if it is now present or not
-		if (m_ChannelId != 2)
-		{
-			m_Status.EXTINT = 1;
-			CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
-		}
-	}
-}
-
-void CEXIChannel::UpdateInterrupts(u64 userdata, int cyclesLate)
-{
-	ExpansionInterface::UpdateInterrupts();
-}
-
-bool CEXIChannel::IsCausingInterrupt()
-{
-	if (m_ChannelId != 2 && GetDevice(1)->IsInterruptSet())
-		m_Status.EXIINT = 1; // Always check memcard slots
-	else if (GetDevice(m_Status.CHIP_SELECT))
-		if (GetDevice(m_Status.CHIP_SELECT)->IsInterruptSet())
-			m_Status.EXIINT = 1;
-
-	if ((m_Status.EXIINT	& m_Status.EXIINTMASK) ||
-		(m_Status.TCINT		& m_Status.TCINTMASK) ||
-		(m_Status.EXTINT	& m_Status.EXTINTMASK))
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
-{
-	switch (chip_select)
-	{
-	case 1: return m_pDevices[0];
-	case 2: return m_pDevices[1];
-	case 4: return m_pDevices[2];
-	}
-	return NULL;
-}
-
-void CEXIChannel::Update()
-{
-	// start the transfer
-	for (int i = 0; i < NUM_DEVICES; i++)
-	{
-		m_pDevices[i]->Update();
-	}
-}
-
-void CEXIChannel::Read32(u32& _uReturnValue, const u32 _iRegister)
-{
-	switch (_iRegister)
-	{
-	case EXI_STATUS:
-		{
-			// check if external device is present
-			// pretty sure it is memcard only, not entirely sure
-			if (m_ChannelId == 2)
-			{
-				m_Status.EXT = 0;
-			}
-			else
-			{
-				m_Status.EXT = GetDevice(1)->IsPresent() ? 1 : 0;
-			}
-
-			_uReturnValue = m_Status.Hex;
-			break;
-		}
-
-	case EXI_DMAADDR:
-		_uReturnValue = m_DMAMemoryAddress;
-		break;
-
-	case EXI_DMALENGTH:
-		_uReturnValue = m_DMALength;
-		break;
-
-	case EXI_DMACONTROL:
-		_uReturnValue = m_Control.Hex;
-		break;
-
-	case EXI_IMMDATA:
-		_uReturnValue = m_ImmData;
-		break;
-
-	default:
-		_dbg_assert_(EXPANSIONINTERFACE, 0);
-		_uReturnValue = 0xDEADBEEF;
-	}
-
-	DEBUG_LOG(EXPANSIONINTERFACE, "(r32) 0x%08x channel: %i  register: %s",
-		_uReturnValue, m_ChannelId, Debug_GetRegisterName(_iRegister));
-}
-
-void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
-{
-	DEBUG_LOG(EXPANSIONINTERFACE, "(w32) 0x%08x channel: %i  register: %s",
-		_iValue, m_ChannelId, Debug_GetRegisterName(_iRegister));
-
-	switch (_iRegister)
-	{
-	case EXI_STATUS:
-		{
-			UEXI_STATUS newStatus(_iValue);
-
-			m_Status.EXIINTMASK = newStatus.EXIINTMASK;
-			if (newStatus.EXIINT)
-				m_Status.EXIINT = 0;
-
-			m_Status.TCINTMASK = newStatus.TCINTMASK;
-			if (newStatus.TCINT)
-				m_Status.TCINT = 0;
-
-			m_Status.CLK = newStatus.CLK;
-
-			if (m_ChannelId == 0 || m_ChannelId == 1)
-			{
-				m_Status.EXTINTMASK = newStatus.EXTINTMASK;
-
-				if (newStatus.EXTINT)
-					m_Status.EXTINT = 0;
-			}
-
-			if (m_ChannelId == 0)
-				m_Status.ROMDIS = newStatus.ROMDIS;
-
-			IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT ^ newStatus.CHIP_SELECT);
-			m_Status.CHIP_SELECT = newStatus.CHIP_SELECT;
-			if (pDevice != NULL)
-				pDevice->SetCS(m_Status.CHIP_SELECT);
-
-			CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
-		}
-		break;
-
-	case EXI_DMAADDR:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAAddr, channel %i", m_ChannelId);
-		m_DMAMemoryAddress = _iValue;
-		break;
-
-	case EXI_DMALENGTH:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMALength, channel %i", m_ChannelId);
-		m_DMALength = _iValue;
-		break;
-
-	case EXI_DMACONTROL:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAControl, channel %i", m_ChannelId);
-		m_Control.Hex = _iValue;
-
-		if (m_Control.TSTART)
-		{
-			IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT);
-			if (pDevice == NULL)
-				return;
-
-			if (m_Control.DMA == 0)
-			{
-				// immediate data
-				switch (m_Control.RW)
-				{
-					case EXI_READ: m_ImmData = pDevice->ImmRead(m_Control.TLEN + 1); break;
-					case EXI_WRITE: pDevice->ImmWrite(m_ImmData, m_Control.TLEN + 1); break;
-					case EXI_READWRITE: pDevice->ImmReadWrite(m_ImmData, m_Control.TLEN + 1); break;
-					default: _dbg_assert_msg_(EXPANSIONINTERFACE,0,"EXI Imm: Unknown transfer type %i", m_Control.RW);
-				}
-				m_Control.TSTART = 0;
-			}
-			else
-			{
-				// DMA
-				switch (m_Control.RW)
-				{
-					case EXI_READ: pDevice->DMARead (m_DMAMemoryAddress, m_DMALength); break;
-					case EXI_WRITE: pDevice->DMAWrite(m_DMAMemoryAddress, m_DMALength); break;
-					default: _dbg_assert_msg_(EXPANSIONINTERFACE,0,"EXI DMA: Unknown transfer type %i", m_Control.RW);
-				}
-				m_Control.TSTART = 0;
-			}
-
-			if(!m_Control.TSTART) // completed !
-			{
-				m_Status.TCINT = 1;
-				CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
-			}
-		}
-		break;
-
-	case EXI_IMMDATA:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote IMMData, channel %i", m_ChannelId);
-		m_ImmData = _iValue;
-		break;
-	}
-}
-
-void CEXIChannel::DoState(PointerWrap &p)
-{
-	p.DoPOD(m_Status);
-	p.Do(m_DMAMemoryAddress);
-	p.Do(m_DMALength);
-	p.Do(m_Control);
-	p.Do(m_ImmData);
-
-	for (int d = 0; d < NUM_DEVICES; ++d)
-	{
-		IEXIDevice* pDevice = m_pDevices[d];
-		TEXIDevices type = pDevice->m_deviceType;
-		p.Do(type);
-		IEXIDevice* pSaveDevice = (type == pDevice->m_deviceType) ? pDevice : EXIDevice_Create(type, m_ChannelId);
-		pSaveDevice->DoState(p);
-		if(pSaveDevice != pDevice)
-		{
-			// if we had to create a temporary device, discard it if we're not loading.
-			// also, if no movie is active, we'll assume the user wants to keep their current devices
-			// instead of the ones they had when the savestate was created,
-			// unless the device is NONE (since ChangeDevice sets that temporarily).
-			if(p.GetMode() != PointerWrap::MODE_READ)
-			{
-				delete pSaveDevice;
-			}
-			else
-			{
-				AddDevice(pSaveDevice, d, false);
-			}
-		}
-	}
-}
-
-void CEXIChannel::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	for (int d = 0; d < NUM_DEVICES; ++d)
-		m_pDevices[d]->PauseAndLock(doLock, unpauseOnUnlock);
-}
-
-IEXIDevice* CEXIChannel::FindDevice(TEXIDevices device_type, int customIndex)
-{
-	for (int d = 0; d < NUM_DEVICES; ++d)
-	{
-		IEXIDevice* device = m_pDevices[d]->FindDevice(device_type, customIndex);
-		if (device)
-			return device;
-	}
-	return NULL;
-}
diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h
deleted file mode 100644
index ca6cb1e176..0000000000
--- a/Source/Core/Core/Src/HW/EXI_Channel.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXICHANNEL_H
-#define _EXICHANNEL_H
-
-#include "Common.h"
-
-#include "EXI_Device.h"
-
-#ifdef _WIN32
-#pragma warning(disable:4201)
-#endif
-
-class CEXIChannel
-{
-private:
-
-	enum
-	{
-		EXI_STATUS		= 0,
-		EXI_DMAADDR		= 1,
-		EXI_DMALENGTH	= 2,
-		EXI_DMACONTROL	= 3,
-		EXI_IMMDATA		= 4
-	};
-	const char* Debug_GetRegisterName(u32 _register)
-	{
-		switch (_register)
-		{
-		case EXI_STATUS:		return "STATUS";
-		case EXI_DMAADDR:		return "DMAADDR";
-		case EXI_DMALENGTH:		return "DMALENGTH";
-		case EXI_DMACONTROL:	return "DMACONTROL";
-		case EXI_IMMDATA:		return "IMMDATA";
-		default:				return "!!! Unknown EXI Register !!!";
-		}
-	}
-
-	// EXI Status Register - "Channel Parameter Register"
-	union UEXI_STATUS
-	{
-		u32 Hex;
-		// DO NOT obey the warning and give this struct a name. Things will fail.
-		struct
-		{
-		// Indentation Meaning:
-		//	Channels 0, 1, 2
-		//		Channels 0, 1 only
-		//			Channel 0 only
-			u32 EXIINTMASK		: 1;
-			u32 EXIINT			: 1;
-			u32 TCINTMASK		: 1;
-			u32 TCINT			: 1;
-			u32 CLK				: 3;
-			u32 CHIP_SELECT		: 3; // CS1 and CS2 are Channel 0 only
-				u32 EXTINTMASK	: 1;
-				u32 EXTINT		: 1;
-				u32 EXT			: 1; // External Insertion Status (1: External EXI device present)
-					u32 ROMDIS	: 1; // ROM Disable
-			u32					:18;
-		};
-		UEXI_STATUS() {Hex = 0;}
-		UEXI_STATUS(u32 _hex) {Hex = _hex;}
-	};
-
-	// EXI Control Register
-	union UEXI_CONTROL
-	{
-		u32 Hex;
-		struct
-		{
-			u32 TSTART		: 1;
-			u32 DMA			: 1;
-			u32 RW			: 2;
-			u32 TLEN		: 2;
-			u32				:26;
-		};
-	};
-
-	// STATE_TO_SAVE
-	UEXI_STATUS		m_Status;
-	u32				m_DMAMemoryAddress;
-	u32				m_DMALength;
-	UEXI_CONTROL	m_Control;
-	u32				m_ImmData;
-
-	// Devices
-	enum
-	{
-		NUM_DEVICES = 3
-	};
-
-	IEXIDevice* m_pDevices[NUM_DEVICES];
-
-	// Since channels operate a bit differently from each other
-	u32 m_ChannelId;
-
-	int updateInterrupts;
-
-	static void UpdateInterrupts(u64 userdata, int cyclesLate);
-public:
-	// get device
-	IEXIDevice* GetDevice(const u8 _CHIP_SELECT);
-	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
-
-	CEXIChannel(u32 ChannelId);
-	~CEXIChannel();
-
-	void AddDevice(const TEXIDevices device_type, const int device_num);
-	void AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged=true);
-
-	// Remove all devices
-	void RemoveDevices();
-
-	void Read32(u32& _uReturnValue, const u32 _iRegister);
-	void Write32(const u32 _iValue, const u32 _iRegister);
-
-	void Update();
-	bool IsCausingInterrupt();
-	void DoState(PointerWrap &p);
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock);
-
-	// This should only be used to transition interrupts from SP1 to Channel 2
-	void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; }
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp
deleted file mode 100644
index b956859c76..0000000000
--- a/Source/Core/Core/Src/HW/EXI_Device.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Memmap.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceIPL.h"
-#include "EXI_DeviceMemoryCard.h"
-#include "EXI_DeviceAD16.h"
-#include "EXI_DeviceMic.h"
-#include "EXI_DeviceEthernet.h"
-#include "EXI_DeviceAMBaseboard.h"
-#include "EXI_DeviceGecko.h"
-
-#include "../Core.h"
-#include "../ConfigManager.h"
-
-
-// --- interface IEXIDevice ---
-void IEXIDevice::ImmWrite(u32 _uData, u32 _uSize)
-{
-	while (_uSize--)
-	{
-		u8 uByte = _uData >> 24;
-		TransferByte(uByte);
-		_uData <<= 8;
-	}
-}
-
-u32 IEXIDevice::ImmRead(u32 _uSize)
-{
-	u32 uResult = 0;
-	u32 uPosition = 0;
-	while (_uSize--)
-	{
-		u8 uByte = 0;
-		TransferByte(uByte);
-		uResult |= uByte << (24-(uPosition++ * 8));
-	}
-	return uResult;
-}
-
-void IEXIDevice::DMAWrite(u32 _uAddr, u32 _uSize)
-{
-//	_dbg_assert_(EXPANSIONINTERFACE, 0);
-	while (_uSize--)
-	{
-		u8 uByte = Memory::Read_U8(_uAddr++);
-		TransferByte(uByte);
-	}
-}
-
-void IEXIDevice::DMARead(u32 _uAddr, u32 _uSize)
-{
-//	_dbg_assert_(EXPANSIONINTERFACE, 0);
-	while (_uSize--)
-	{
-		u8 uByte = 0;
-		TransferByte(uByte);
-		Memory::Write_U8(uByte, _uAddr++);
-	}
-};
-
-
-// --- class CEXIDummy ---
-// Just a dummy that logs reads and writes
-// to be used for EXI devices we haven't emulated
-// DOES NOT FUNCTION AS "NO DEVICE INSERTED" -> Appears as unknown device
-class CEXIDummy : public IEXIDevice
-{
-	std::string m_strName;
-
-	void TransferByte(u8& _byte) {}
-
-public:
-	CEXIDummy(const std::string& _strName) :
-	  m_strName(_strName)
-	{
-	}
-
-	virtual ~CEXIDummy(){}
-
-	void ImmWrite(u32 data, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
-	u32  ImmRead (u32 size)				{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
-	void DMAWrite(u32 addr, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
-	void DMARead (u32 addr, u32 size)	{INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead:  %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
-};
-
-
-// F A C T O R Y 
-IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
-{
-	IEXIDevice* result = NULL;
-
-	switch (device_type)
-	{
-	case EXIDEVICE_DUMMY:
-		result = new CEXIDummy("Dummy");
-		break;
-
-	case EXIDEVICE_MEMORYCARD:
-		result = new CEXIMemoryCard(channel_num);
-		break;
-
-	case EXIDEVICE_MASKROM:
-		result = new CEXIIPL();
-		break;
-
-	case EXIDEVICE_AD16:
-		result = new CEXIAD16();
-		break;
-
-	case EXIDEVICE_MIC:
-		result = new CEXIMic(channel_num);
-		break;
-
-	case EXIDEVICE_ETH:
-		result = new CEXIETHERNET();
-		break;
-
-	case EXIDEVICE_AM_BASEBOARD:
-		result = new CEXIAMBaseboard();
-		break;
-
-	case EXIDEVICE_GECKO:
-		result = new CEXIGecko();
-		break;
-
-	case EXIDEVICE_NONE:
-	default:
-		result = new IEXIDevice();
-		break;
-	}
-
-	if (result != NULL)
-		result->m_deviceType = device_type;
-
-	return result;
-}
diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h
deleted file mode 100644
index e2a39154f5..0000000000
--- a/Source/Core/Core/Src/HW/EXI_Device.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_H
-#define _EXIDEVICE_H
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-enum TEXIDevices
-{
-	EXIDEVICE_DUMMY,
-	EXIDEVICE_MEMORYCARD,
-	EXIDEVICE_MASKROM,
-	EXIDEVICE_AD16,
-	EXIDEVICE_MIC,
-	EXIDEVICE_ETH,
-	EXIDEVICE_AM_BASEBOARD,
-	EXIDEVICE_GECKO,
-	EXIDEVICE_NONE = (u8)-1
-};
-
-class IEXIDevice
-{
-private:
-	// Byte transfer function for this device
-	virtual void TransferByte(u8&) {}
-
-public:
-	// Immediate copy functions
-	virtual void ImmWrite(u32 _uData,  u32 _uSize);
-	virtual u32  ImmRead(u32 _uSize);
-	virtual void ImmReadWrite(u32 &/*_uData*/, u32 /*_uSize*/) {}
-
-	// DMA copy functions
-	virtual void DMAWrite(u32 _uAddr, u32 _uSize);
-	virtual void DMARead (u32 _uAddr, u32 _uSize);
-
-	virtual bool IsPresent() {return false;}
-	virtual void SetCS(int) {}
-	virtual void DoState(PointerWrap&) {}
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {}
-	virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : NULL; }
-
-	// Update
-	virtual void Update() {}
-
-	// Is generating interrupt ?
-	virtual bool IsInterruptSet() {return false;}
-	virtual ~IEXIDevice() {}
-
-	// for savestates. storing it here seemed cleaner than requiring each implementation to report its type.
-	// I know this class is set up like an interface, but no code requires it to be strictly such.
-	TEXIDevices m_deviceType;
-};
-
-extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num);
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
deleted file mode 100644
index de97d0d590..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_AD16_H
-#define _EXIDEVICE_AD16_H
-
-class CEXIAD16 : public IEXIDevice
-{
-public:
-	CEXIAD16();
-	virtual void SetCS(int _iCS);
-	virtual bool IsPresent();
-	virtual void DoState(PointerWrap &p);
-
-private:
-	enum 
-	{
-		init	= 0x00,
-		write	= 0xa0,
-		read	= 0xa2
-	};
-
-	union UAD16Reg
-	{
-		u32 U32;
-		u32 U8[4];
-	};
-
-	// STATE_TO_SAVE
-	u32 m_uPosition;
-	u32 m_uCommand;
-	UAD16Reg m_uAD16Register;
-
-	virtual void TransferByte(u8& _uByte);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
deleted file mode 100644
index 7a51a81baa..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_AMBASEBOARD_H
-#define _EXIDEVICE_AMBASEBOARD_H
-
-class CEXIAMBaseboard : public IEXIDevice
-{
-public:
-	CEXIAMBaseboard();
-
-	virtual void SetCS(int _iCS);
-	virtual bool IsPresent();
-	virtual bool IsInterruptSet();
-	virtual void DoState(PointerWrap &p);
-
-private:
-	virtual void TransferByte(u8& _uByte);
-	int m_position;
-	bool m_have_irq;
-	unsigned char m_command[4];
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
deleted file mode 100644
index 7fb9a5775e..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_ETHERNET_H
-#define _EXIDEVICE_ETHERNET_H
-
-#include "Thread.h"
-
-// Network Control Register A
-enum NCRA
-{
-	NCRA_RESET		= 0x01, // RESET
-	NCRA_ST0		= 0x02, // Start transmit command/status
-	NCRA_ST1		= 0x04, // "
-	NCRA_SR			= 0x08  // Start Receive
-};
-
-// Network Control Register B
-enum NCRB
-{
-	NCRB_PR			= 0x01, // Promiscuous Mode
-	NCRB_CA			= 0x02, // Capture Effect Mode
-	NCRB_PM			= 0x04, // Pass Multicast
-	NCRB_PB			= 0x08, // Pass Bad Frame
-	NCRB_AB			= 0x10, // Accept Broadcast
-	NCRB_HBD		= 0x20, // reserved
-	NCRB_RXINTC		= 0xC0  // Receive Interrupt Counter (mask)
-};
-
-// Interrupt Mask Register
-// Interrupt Register
-enum Interrupts
-{
-	INT_FRAG		= 0x01, // Fragment Counter
-	INT_R			= 0x02, // Receive
-	INT_T			= 0x04, // Transmit
-	INT_R_ERR		= 0x08, // Receive Error
-	INT_T_ERR		= 0x10, // Transmit Error
-	INT_FIFO_ERR	= 0x20, // FIFO Error
-	INT_BUS_ERR		= 0x40, // BUS Error
-	INT_RBF			= 0x80  // RX Buffer Full
-};
-
-// NWAY Configuration Register
-enum NWAYC
-{
-	NWAYC_FD		= 0x01, // Full Duplex Mode
-	NWAYC_PS100_10	= 0x02, // Port Select 100/10
-	NWAYC_ANE		= 0x04, // Autonegotiate enable
-	
-	// Autonegotiation status bits...
-
-	NWAYC_NTTEST	= 0x40, // Reserved
-	NWAYC_LTE		= 0x80  // Link Test Enable
-};
-
-enum NWAYS
-{
-	NWAYS_LS10		= 0x01,
-	NWAYS_LS100		= 0x02,
-	NWAYS_LPNWAY	= 0x04,
-	NWAYS_ANCLPT	= 0x08,
-	NWAYS_100TXF	= 0x10,
-	NWAYS_100TXH	= 0x20,
-	NWAYS_10TXF		= 0x40,
-	NWAYS_10TXH		= 0x80
-};
-
-enum MISC1
-{
-	MISC1_BURSTDMA	= 0x01,
-	MISC1_DISLDMA	= 0x02,
-	MISC1_TPF		= 0x04,
-	MISC1_TPH		= 0x08,
-	MISC1_TXF		= 0x10,
-	MISC1_TXH		= 0x20,
-	MISC1_TXFIFORST	= 0x40,
-	MISC1_RXFIFORST	= 0x80
-};
-
-enum MISC2
-{
-	MISC2_HBRLEN0	= 0x01,
-	MISC2_HBRLEN1	= 0x02,
-	MISC2_RUNTSIZE	= 0x04,
-	MISC2_DREQBCTRL	= 0x08,
-	MISC2_RINTSEL	= 0x10,
-	MISC2_ITPSEL	= 0x20,
-	MISC2_A11A8EN	= 0x40,
-	MISC2_AUTORCVR	= 0x80
-};
-
-enum
-{
-	BBA_NCRA		= 0x00,
-	BBA_NCRB		= 0x01,
-	
-	BBA_LTPS		= 0x04,
-	BBA_LRPS		= 0x05,
-	
-	BBA_IMR			= 0x08,
-	BBA_IR			= 0x09,
-	
-	BBA_BP			= 0x0a,
-	BBA_TLBP		= 0x0c,
-	BBA_TWP			= 0x0e,
-	BBA_IOB			= 0x10,
-	BBA_TRP			= 0x12,
-	BBA_RWP			= 0x16,
-	BBA_RRP			= 0x18,
-	BBA_RHBP		= 0x1a,
-
-	BBA_RXINTT		= 0x14,
-
-	BBA_NAFR_PAR0	= 0x20,
-	BBA_NAFR_PAR1	= 0x21,
-	BBA_NAFR_PAR2	= 0x22,
-	BBA_NAFR_PAR3	= 0x23,
-	BBA_NAFR_PAR4	= 0x24,
-	BBA_NAFR_PAR5	= 0x25,
-	BBA_NAFR_MAR0	= 0x26,
-	BBA_NAFR_MAR1	= 0x27,
-	BBA_NAFR_MAR2	= 0x28,
-	BBA_NAFR_MAR3	= 0x29,
-	BBA_NAFR_MAR4	= 0x2a,
-	BBA_NAFR_MAR5	= 0x2b,
-	BBA_NAFR_MAR6	= 0x2c,
-	BBA_NAFR_MAR7	= 0x2d,
-
-	BBA_NWAYC		= 0x30,
-	BBA_NWAYS		= 0x31,
-
-	BBA_GCA			= 0x32,
-
-	BBA_MISC		= 0x3d,
-
-	BBA_TXFIFOCNT	= 0x3e,
-	BBA_WRTXFIFOD	= 0x48,
-
-	BBA_MISC2		= 0x50,
-
-	BBA_SI_ACTRL	= 0x5c,
-	BBA_SI_STATUS	= 0x5d,
-	BBA_SI_ACTRL2	= 0x60
-};
-
-enum
-{
-	BBA_NUM_PAGES	= 0x10,
-	BBA_PAGE_SIZE	= 0x100,
-	BBA_MEM_SIZE	= BBA_NUM_PAGES * BBA_PAGE_SIZE
-};
-
-enum { EXI_DEVTYPE_ETHER = 0x04020200 };
-
-enum SendStatus
-{
-	DESC_CC0	= 0x01,
-	DESC_CC1	= 0x02,
-	DESC_CC2	= 0x04,
-	DESC_CC3	= 0x08,
-	DESC_CRSLOST= 0x10,
-	DESC_UF		= 0x20,
-	DESC_OWC	= 0x40,
-	DESC_OWN	= 0x80
-};
-
-enum RecvStatus
-{
-	DESC_BF		= 0x01,
-	DESC_CRC	= 0x02,
-	DESC_FAE	= 0x04,
-	DESC_FO		= 0x08,
-	DESC_RW		= 0x10,
-	DESC_MF		= 0x20,
-	DESC_RF		= 0x40,
-	DESC_RERR	= 0x80
-};
-
-#define BBA_RECV_SIZE 0x800
-
-class CEXIETHERNET : public IEXIDevice
-{
-public:
-	CEXIETHERNET();
-	virtual ~CEXIETHERNET();
-	void SetCS(int cs);
-	bool IsPresent();
-	bool IsInterruptSet();
-	void ImmWrite(u32 data,  u32 size);
-	u32  ImmRead(u32 size);
-	void DMAWrite(u32 addr, u32 size);
-	void DMARead(u32 addr, u32 size);
-	void DoState(PointerWrap &p);
-
-//private:
-	struct
-	{
-		enum
-		{
-			READ,
-			WRITE
-		} direction;
-
-		enum
-		{
-			EXI,
-			MX
-		} region;
-
-		u16 address;
-		bool valid;
-	} transfer;
-
-	enum
-	{
-		EXI_ID,
-		REVISION_ID,
-		INTERRUPT_MASK,
-		INTERRUPT,
-		DEVICE_ID,
-		ACSTART,
-		HASH_READ = 8,
-		HASH_WRITE,
-		HASH_STATUS = 0xb,
-		RESET = 0xf
-	};
-
-	// exi regs
-	struct EXIStatus
-	{
-		enum
-		{
-			TRANSFER = 0x80
-		};
-
-		u8 revision_id;
-		u8 interrupt_mask;
-		u8 interrupt;
-		u16 device_id;
-		u8 acstart;
-		u32 hash_challenge;
-		u32 hash_response;
-		u8 hash_status;
-
-		EXIStatus()
-		{
-			device_id = 0xd107;
-			revision_id = 0;//0xf0;
-			acstart = 0x4e;
-
-			interrupt_mask = 0;
-			interrupt = 0;
-			hash_challenge = 0;
-			hash_response = 0;
-			hash_status = 0;
-		}
-
-	} exi_status;
-
-	struct Descriptor
-	{
-		u32 word;
-
-		inline void set(u32 const next_page, u32 const packet_length, u32 const status)
-		{
-			word = 0;
-			word |= (status & 0xff) << 24;
-			word |= (packet_length & 0xfff) << 12;
-			word |= next_page & 0xfff;
-		}
-	};
-
-	inline u16 page_ptr(int const index) const
-	{
-		return ((u16)mBbaMem[index + 1] << 8) | mBbaMem[index];
-	}
-
-	inline u8 *ptr_from_page_ptr(int const index) const
-	{
-		return &mBbaMem[page_ptr(index) << 8];
-	}
-
-	bool IsMXCommand(u32 const data);
-	bool IsWriteCommand(u32 const data);
-	const char* GetRegisterName() const;
-	void MXHardReset();
-	void MXCommandHandler(u32 data, u32 size);
-	void DirectFIFOWrite(u8 *data, u32 size);
-	void SendFromDirectFIFO();
-	void SendFromPacketBuffer();
-	void SendComplete();
-	u8 HashIndex(u8 *dest_eth_addr);
-	bool RecvMACFilter();
-	void inc_rwp();
-	bool RecvHandlePacket();
-
-	u8 *tx_fifo;
-	u8 *mBbaMem;
-
-	// TAP interface
-	bool Activate();
-	void Deactivate();
-	bool IsActivated();
-	bool SendFrame(u8 *frame, u32 size);
-	bool RecvInit();
-	bool RecvStart();
-	void RecvStop();
-
-	u8 *mRecvBuffer;
-	u32 mRecvBufferLength;
-
-#if defined(_WIN32)
-	HANDLE mHAdapter, mHRecvEvent, mHReadWait;
-	DWORD mMtu;
-	OVERLAPPED mReadOverlapped;
-	static VOID CALLBACK ReadWaitCallback(PVOID lpParameter, BOOLEAN TimerFired);
-#elif defined(__linux__)
-	int fd;
-	std::thread readThread;
-	volatile bool readEnabled;
-#endif
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
deleted file mode 100644
index 792b045fd4..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <functional>
-
-#include "EXI_Device.h"
-#include "EXI_DeviceGecko.h"
-#include "../Core.h"
-
-u16							GeckoSockServer::server_port;
-int							GeckoSockServer::client_count;
-std::thread					GeckoSockServer::connectionThread;
-volatile bool				GeckoSockServer::server_running;
-std::queue<sf::SocketTCP>	GeckoSockServer::waiting_socks;
-std::mutex					GeckoSockServer::connection_lock;
-
-GeckoSockServer::GeckoSockServer()
-	: client_running(false)
-{
-	if (!connectionThread.joinable())
-		connectionThread = std::thread(GeckoConnectionWaiter);
-}
-
-GeckoSockServer::~GeckoSockServer()
-{
-	if (clientThread.joinable())
-		--client_count;
-
-	client_running = false;
-	clientThread.join();
-
-	if (client_count <= 0)
-	{
-		server_running = false;
-		connectionThread.join();
-	}
-}
-
-void GeckoSockServer::GeckoConnectionWaiter()
-{
-	Common::SetCurrentThreadName("Gecko Connection Waiter");
-
-	sf::SocketTCP server;
-	server_port = 0xd6ec; // "dolphin gecko"
-	for (int bind_tries = 0; bind_tries <= 10 && !server_running; bind_tries++)
-	{
-		if (!(server_running = server.Listen(server_port)))
-			server_port++;
-	}
-
-	if (!server_running)
-		return;
-
-	Core::DisplayMessage(
-		StringFromFormat("USBGecko: Listening on TCP port %u", server_port),
-		5000);
-
-	server.SetBlocking(false);
-
-	sf::SocketTCP new_client;
-	while (server_running)
-	{
-		if (server.Accept(new_client) == sf::Socket::Done)
-		{
-			std::lock_guard<std::mutex> lk(connection_lock);
-			waiting_socks.push(new_client);
-		}
-		SLEEP(1);
-	}
-	server.Close();
-}
-
-bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill)
-{
-	bool sock_filled = false;
-
-	std::lock_guard<std::mutex> lk(connection_lock);
-
-	if (waiting_socks.size())
-	{
-		sock_to_fill = waiting_socks.front();
-		if (clientThread.joinable())
-		{
-			client_running = false;
-			clientThread.join();
-
-			recv_fifo = std::deque<u8>();
-			send_fifo = std::deque<u8>();
-		}
-		clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this);
-		client_count++;
-		waiting_socks.pop();
-		sock_filled = true;
-	}
-
-	return sock_filled;
-}
-
-void GeckoSockServer::ClientThread()
-{
-	client_running = true;
-
-	Common::SetCurrentThreadName("Gecko Client");
-
-	client.SetBlocking(false);
-
-	while (client_running)
-	{
-		bool did_nothing = true;
-		
-		{
-		std::lock_guard<std::mutex> lk(transfer_lock);
-
-		// what's an ideal buffer size?
-		char data[128];
-		std::size_t got = 0;
-		
-		if (client.Receive(&data[0], ArraySize(data), got) == sf::Socket::Disconnected)
-			client_running = false;
-		
-		if (got != 0)
-		{
-			did_nothing = false;
-			
-			recv_fifo.insert(recv_fifo.end(), &data[0], &data[got]);
-		}
-
-		if (!send_fifo.empty())
-		{
-			did_nothing = false;
-			
-			std::vector<char> packet(send_fifo.begin(), send_fifo.end());
-			send_fifo.clear();
-			
-			if (client.Send(&packet[0], packet.size()) == sf::Socket::Disconnected)
-				client_running = false;
-		}
-		}	// unlock transfer
-
-		if (did_nothing)
-			Common::YieldCPU();
-	}
-
-	client.Close();
-}
-
-void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize)
-{
-	// We don't really care about _uSize
-	(void)_uSize;
-
-	if (!client.IsValid())
-		GetAvailableSock(client);
-
-	switch (_uData >> 28)
-	{
-	case CMD_LED_OFF:
-		Core::DisplayMessage(StringFromFormat(
-			"USBGecko: No LEDs for you!"),
-			3000);
-		break;
-	case CMD_LED_ON:
-		Core::DisplayMessage(StringFromFormat(
-			"USBGecko: A piercing blue light is now shining in your general direction"),
-			3000);
-		break;
-	
-	case CMD_INIT:
-		_uData = ident;
-		break;
-
-		// PC -> Gecko
-		// |= 0x08000000 if successful
-	case CMD_RECV:
-		{
-		std::lock_guard<std::mutex> lk(transfer_lock);
-		if (!recv_fifo.empty())
-		{
-			_uData = 0x08000000 | (recv_fifo.front() << 16);
-			recv_fifo.pop_front();
-		}
-		break;
-		}
-
-		// Gecko -> PC
-		// |= 0x04000000 if successful
-	case CMD_SEND:
-		{
-		std::lock_guard<std::mutex> lk(transfer_lock);
-		send_fifo.push_back(_uData >> 20);
-		_uData = 0x04000000;
-		break;
-		}
-
-		// Check if ok for Gecko -> PC, or FIFO full
-		// |= 0x04000000 if FIFO is not full
-	case CMD_CHK_TX:
-		_uData = 0x04000000;
-		break;
-
-		// Check if data in FIFO for PC -> Gecko, or FIFO empty
-		// |= 0x04000000 if data in recv FIFO
-	case CMD_CHK_RX:
-		{
-		std::lock_guard<std::mutex> lk(transfer_lock);
-		_uData = recv_fifo.empty() ? 0 : 0x04000000;
-		break;
-		}
-
-	default:
-		ERROR_LOG(EXPANSIONINTERFACE, "Unknown USBGecko command %x", _uData);
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
deleted file mode 100644
index f720a83a5d..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_GECKO_H
-#define _EXIDEVICE_GECKO_H
-
-#include "SFML/Network.hpp"
-#include "Thread.h"
-
-#include <deque>
-#include <queue>
-
-class GeckoSockServer
-	: public sf::SocketTCP
-{
-public:
-	GeckoSockServer();
-	~GeckoSockServer();
-	bool GetAvailableSock(sf::SocketTCP &sock_to_fill);
-
-	// Client for this server object
-	sf::SocketTCP client;
-	void ClientThread();
-	std::thread clientThread;
-	std::mutex transfer_lock;
-
-	std::deque<u8> send_fifo;
-	std::deque<u8> recv_fifo;
-
-private:
-	static int		client_count;
-	volatile bool	client_running;
-
-	// Only ever one server thread
-	static void GeckoConnectionWaiter();
-
-	static u16							server_port;
-	static volatile bool				server_running;
-	static std::thread					connectionThread;
-	static std::queue<sf::SocketTCP>	waiting_socks;
-	static std::mutex					connection_lock;
-};
-
-class CEXIGecko
-	: public IEXIDevice
-	, private GeckoSockServer
-{
-public:
-	CEXIGecko() {}
-	bool IsPresent() { return true; }
-	void ImmReadWrite(u32 &_uData, u32 _uSize);
-
-private:
-	enum
-	{
-		CMD_LED_OFF	= 0x7,
-		CMD_LED_ON	= 0x8,
-		CMD_INIT	= 0x9,
-		CMD_RECV	= 0xa,
-		CMD_SEND	= 0xb,
-		CMD_CHK_TX	= 0xc,
-		CMD_CHK_RX	= 0xd,
-	};
-
-	static const u32 ident = 0x04700000;
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h
deleted file mode 100644
index 3198d0b1bd..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXIDEVICE_IPL_H
-#define _EXIDEVICE_IPL_H
-
-#include "EXI_Device.h"
-#include "Sram.h"
-
-class CEXIIPL : public IEXIDevice
-{
-public:
-	CEXIIPL();
-	virtual ~CEXIIPL();
-
-	virtual void SetCS(int _iCS);
-	bool IsPresent();
-	void DoState(PointerWrap &p);
-
-	static u32 GetGCTime();
-	static u32 NetPlay_GetGCTime();
-
-	static void Descrambler(u8* data, u32 size);
-
-private:
-	enum
-	{
-		ROM_SIZE = 1024*1024*2,
-		ROM_MASK = (ROM_SIZE - 1)
-	};
-
-	enum
-	{
-		REGION_RTC		= 0x200000,
-		REGION_SRAM		= 0x200001,
-		REGION_UART		= 0x200100,
-		REGION_UART_UNK	= 0x200103,
-		REGION_BARNACLE	= 0x200113,
-		REGION_WRTC0	= 0x210000,
-		REGION_WRTC1	= 0x210001,
-		REGION_WRTC2	= 0x210008,
-		REGION_EUART_UNK= 0x300000,
-		REGION_EUART	= 0x300001
-	};
-
-	// Region
-	bool m_bNTSC;
-
-	//! IPL
-	u8* m_pIPL;
-
-	// STATE_TO_SAVE
-	//! RealTimeClock
-	u8 m_RTC[4];
-
-	//! Helper
-	u32 m_uPosition;
-	u32 m_uAddress;
-	u32 m_uRWOffset;
-
-	char m_szBuffer[256];
-	int m_count;
-	bool m_FontsLoaded;
-
-	virtual void TransferByte(u8 &_uByte);
-	bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
-	u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }
-
-	void LoadFileToIPL(std::string filename, u32 offset);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
deleted file mode 100644
index 692db55ecc..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "../Core.h"
-#include "../CoreTiming.h"
-
-#include "../ConfigManager.h"
-#include "../Movie.h"
-#include "EXI.h"
-#include "EXI_Device.h"
-#include "EXI_DeviceMemoryCard.h"
-#include "Sram.h"
-#include "GCMemcard.h"
-
-#define MC_STATUS_BUSY					0x80   
-#define MC_STATUS_UNLOCKED				0x40
-#define MC_STATUS_SLEEP					0x20
-#define MC_STATUS_ERASEERROR			0x10
-#define MC_STATUS_PROGRAMEERROR			0x08
-#define MC_STATUS_READY					0x01
-#define SIZE_TO_Mb (1024 * 8 * 16)
-#define MC_HDR_SIZE 0xA000
-
-void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate)
-{
-	// note that userdata is forbidden to be a pointer, due to the implementation of EventDoState
-	int card_index = (int)userdata;
-	CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index);
-	if (pThis)
-		pThis->Flush();
-}
-
-void CEXIMemoryCard::CmdDoneCallback(u64 userdata, int cyclesLate)
-{
-	int card_index = (int)userdata;
-	CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index);
-	if (pThis)
-		pThis->CmdDone();
-}
-
-CEXIMemoryCard::CEXIMemoryCard(const int index)
-	: card_index(index)
-	, m_bDirty(false)
-{
-	m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
-	if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave())
-		m_strFilename = File::GetUserPath(D_GCUSER_IDX) + "Movie.raw";
-
-	// we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential
-	et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardFlushA" : "memcardFlushB", FlushCallback);
-	et_cmd_done = CoreTiming::RegisterEvent((card_index == 0) ? "memcardDoneA" : "memcardDoneB", CmdDoneCallback);
- 
-	interruptSwitch = 0;
-	m_bInterruptSet = 0;
-	command = 0;
-	status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY;
-	m_uPosition = 0;
-	memset(programming_buffer, 0, sizeof(programming_buffer));
-	formatDelay = 0;
- 
-	//Nintendo Memory Card EXI IDs
-	//0x00000004 Memory Card 59		4Mbit
-	//0x00000008 Memory Card 123	8Mb
-	//0x00000010 Memory Card 251	16Mb
-	//0x00000020 Memory Card 507	32Mb
-	//0x00000040 Memory Card 1019	64Mb
-	//0x00000080 Memory Card 2043	128Mb
- 
-	//0x00000510 16Mb "bigben" card
-	//card_id = 0xc243;
- 
-	card_id = 0xc221; // It's a Nintendo brand memcard
- 
-	File::IOFile pFile(m_strFilename, "rb");
-	if (pFile)
-	{
-		// Measure size of the memcard file.
-		memory_card_size = (int)pFile.GetSize();
-		nintendo_card_id = memory_card_size / SIZE_TO_Mb;
-		memory_card_content = new u8[memory_card_size];
-		memset(memory_card_content, 0xFF, memory_card_size);
- 
-		INFO_LOG(EXPANSIONINTERFACE, "Reading memory card %s", m_strFilename.c_str());
-		pFile.ReadBytes(memory_card_content, memory_card_size);
-
-	}
-	else
-	{
-		// Create a new 128Mb memcard
-		nintendo_card_id = 0x00000080;
-		memory_card_size = nintendo_card_id * SIZE_TO_Mb;
-
-		memory_card_content = new u8[memory_card_size];
-		GCMemcard::Format(memory_card_content, m_strFilename.find(".JAP.raw") != std::string::npos, nintendo_card_id);
-		memset(memory_card_content+MC_HDR_SIZE, 0xFF, memory_card_size-MC_HDR_SIZE); 
-		WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create a new one.");
-	}
-	SetCardFlashID(memory_card_content, card_index);
-}
-
-void innerFlush(FlushData* data)
-{
-	File::IOFile pFile(data->filename, "r+b");
-	if (!pFile)
-	{
-		std::string dir;
-		SplitPath(data->filename, &dir, 0, 0);
-		if (!File::IsDirectory(dir))
-			File::CreateFullPath(dir);
-		pFile.Open(data->filename, "wb");
-	}
-
-	if (!pFile) // Note - pFile changed inside above if
-	{
-		PanicAlertT("Could not write memory card file %s.\n\n"
-			"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?\n\n"
-			"Are you receiving this after moving the emulator directory?\nIf so, then you may "
-			"need to re-specify your memory card location in the options.", data->filename.c_str());
-		return;
-	}
-
-	pFile.WriteBytes(data->memcardContent, data->memcardSize);
-
-	if (!data->bExiting)
-		Core::DisplayMessage(StringFromFormat("Wrote memory card %c contents to %s",
-			data->memcardIndex ? 'B' : 'A', data->filename.c_str()).c_str(), 4000);
-	return;
-}
-
-// Flush memory card contents to disc
-void CEXIMemoryCard::Flush(bool exiting)
-{
-	if(!m_bDirty)
-		return;
-
-	if (!Core::g_CoreStartupParameter.bEnableMemcardSaving)
-		return;
-
-	if (flushThread.joinable())
-	{
-		flushThread.join();
-	}
-
-	if(!exiting)
-		Core::DisplayMessage(StringFromFormat("Writing to memory card %c", card_index ? 'B' : 'A'), 1000);
-
-	flushData.filename = m_strFilename;
-	flushData.memcardContent = memory_card_content;
-	flushData.memcardIndex = card_index;
-	flushData.memcardSize = memory_card_size;
-	flushData.bExiting = exiting;
-
-	flushThread = std::thread(innerFlush, &flushData);
-	if (exiting)
-		flushThread.join();
-
-	m_bDirty = false;
-}
-
-CEXIMemoryCard::~CEXIMemoryCard()
-{
-	CoreTiming::RemoveEvent(et_this_card);
-	Flush(true);
-	delete[] memory_card_content;
-	memory_card_content = NULL;
-	
-	if (flushThread.joinable())
-	{
-		flushThread.join();
-	}
-}
-
-bool CEXIMemoryCard::IsPresent() 
-{
-	return true;
-}
-
-void CEXIMemoryCard::CmdDone()
-{
-	status |= MC_STATUS_READY;
-	status &= ~MC_STATUS_BUSY;
-
-	m_bInterruptSet = 1;
-	m_bDirty = true;
-}
-
-void CEXIMemoryCard::CmdDoneLater(u64 cycles)
-{
-	CoreTiming::RemoveEvent(et_cmd_done);
-	CoreTiming::ScheduleEvent(cycles, et_cmd_done, (u64)card_index);
-}
-
-void CEXIMemoryCard::SetCS(int cs)
-{
-	// So that memory card won't be invalidated during flushing
-	if (flushThread.joinable())
-	{
-		flushThread.join();
-	}
-
-	if (cs)  // not-selected to selected
-	{
-		m_uPosition = 0;
-	}
-	else
-	{	
-		switch (command)
-		{
-		case cmdSectorErase:
-			if (m_uPosition > 2)
-			{
-				memset(memory_card_content + (address & (memory_card_size-1)), 0xFF, 0x2000);
-				status |= MC_STATUS_BUSY;
-				status &= ~MC_STATUS_READY;
-
-				//???
-
-				CmdDoneLater(5000);
-			}
-			break;
-
-		case cmdChipErase:
-			if (m_uPosition > 2)
-			{
-				memset(memory_card_content, 0xFF, memory_card_size);
-				status &= ~MC_STATUS_BUSY;
-				m_bDirty = true;
-			}
-			break;
-
-		case cmdPageProgram:
-			if (m_uPosition >= 5)
-			{
-				int count = m_uPosition - 5;
-				int i=0;
-				status &= ~0x80;
-
-				while (count--)
-				{
-					memory_card_content[address] = programming_buffer[i++];
-					i &= 127;
-					address = (address & ~0x1FF) | ((address+1) & 0x1FF);
-				}
-
-				CmdDoneLater(5000);
-			}
-			
-			// Page written to memory card, not just to buffer - let's schedule a flush 0.5b cycles into the future (1 sec)
-			// But first we unschedule already scheduled flushes - no point in flushing once per page for a large write.
-			CoreTiming::RemoveEvent(et_this_card);
-			CoreTiming::ScheduleEvent(500000000, et_this_card, (u64)card_index);
-			break;
-		}
-	}
-}
-
-void CEXIMemoryCard::Update()
-{
-	if (formatDelay)
-	{
-		formatDelay--;
-
-		if (!formatDelay)
-		{
-			status |= MC_STATUS_READY;
-			status &= ~MC_STATUS_BUSY;
-
-			m_bInterruptSet = 1;
-		}
-	}
-}
-
-bool CEXIMemoryCard::IsInterruptSet()
-{
-	if (interruptSwitch)
-		return m_bInterruptSet;
-	return false;
-}
-
-void CEXIMemoryCard::TransferByte(u8 &byte)
-{
-	DEBUG_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: > %02x", byte);
-	if (m_uPosition == 0)
-	{
-		command = byte;  // first byte is command
-		byte = 0xFF; // would be tristate, but we don't care.
-
-		switch (command) // This seems silly, do we really need it?
-		{
-		case cmdNintendoID:
-		case cmdReadArray:
-		case cmdArrayToBuffer:
-		case cmdSetInterrupt:
-		case cmdWriteBuffer:
-		case cmdReadStatus:
-		case cmdReadID:
-		case cmdReadErrorBuffer:
-		case cmdWakeUp:
-		case cmdSleep:
-		case cmdClearStatus:
-		case cmdSectorErase:
-		case cmdPageProgram:
-		case cmdExtraByteProgram:
-		case cmdChipErase:
-			INFO_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: command %02x at position 0. seems normal.", command);
-			break;
-		default:
-			WARN_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: command %02x at position 0", command);
-			break;
-		}
-		if (command == cmdClearStatus)
-		{
-			status &= ~MC_STATUS_PROGRAMEERROR;
-			status &= ~MC_STATUS_ERASEERROR;
-
-			status |= MC_STATUS_READY;
-
-			m_bInterruptSet = 0;
-
-			byte = 0xFF;
-			m_uPosition = 0;
-		}
-	} 
-	else
-	{
-		switch (command)
-		{
-		case cmdNintendoID:
-			//
-			// Nintendo card:
-			// 00 | 80 00 00 00 10 00 00 00 
-			// "bigben" card:
-			// 00 | ff 00 00 05 10 00 00 00 00 00 00 00 00 00 00
-			// we do it the Nintendo way.
-			if (m_uPosition == 1)
-				byte = 0x80; // dummy cycle
-			else
-				byte = (u8)(nintendo_card_id >> (24-(((m_uPosition-2) & 3) * 8)));
-			break;
-
-		case cmdReadArray:
-			switch (m_uPosition)
-			{
-			case 1: // AD1
-				address = byte << 17;
-				byte = 0xFF;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
-			case 3: // AD3
-				address |= (byte & 3) << 7;
-				break;
-			case 4: // BA
-				address |= (byte & 0x7F);
-				break;
-			}
-			if (m_uPosition > 1) // not specified for 1..8, anyway
-			{
-				byte = memory_card_content[address & (memory_card_size-1)];
-				// after 9 bytes, we start incrementing the address,
-				// but only the sector offset - the pointer wraps around
-				if (m_uPosition >= 9)
-					address = (address & ~0x1FF) | ((address+1) & 0x1FF);
-			}
-			break;
-
-		case cmdReadStatus:
-			// (unspecified for byte 1)
-			byte = status;
-			break;
-
-		case cmdReadID:
-			if (m_uPosition == 1) // (unspecified)
-				byte = (u8)(card_id >> 8);
-			else
-				byte = (u8)((m_uPosition & 1) ? (card_id) : (card_id >> 8));
-			break;
-
-		case cmdSectorErase:
-			switch (m_uPosition)
-			{
-			case 1: // AD1
-				address = byte << 17;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
-			}
-			byte = 0xFF;
-			break;
-
-		case cmdSetInterrupt:
-			if (m_uPosition == 1)
-			{
-				interruptSwitch = byte;
-			}
-			byte = 0xFF;
-			break;
-
-		case cmdChipErase:
-			byte = 0xFF;
-			break;
-
-		case cmdPageProgram:
-			switch (m_uPosition)
-			{
-			case 1: // AD1
-				address = byte << 17;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
-			case 3: // AD3
-				address |= (byte & 3) << 7;
-				break;
-			case 4: // BA
-				address |= (byte & 0x7F);
-				break;
-			}
-
-			if(m_uPosition >= 5)
-				programming_buffer[((m_uPosition - 5) & 0x7F)] = byte; // wrap around after 128 bytes
-
-			byte = 0xFF;
-			break;
-
-		default:
-			WARN_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: unknown command byte %02x\n", byte);
-			byte = 0xFF;	
-		}
-	}
-	m_uPosition++;
-	DEBUG_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: < %02x", byte);
-}
-
-void CEXIMemoryCard::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	if (doLock)
-	{
-		// we don't exactly have anything to pause,
-		// but let's make sure the flush thread isn't running.
-		if (flushThread.joinable())
-		{
-			flushThread.join();
-		}
-	}
-}
-
-void CEXIMemoryCard::DoState(PointerWrap &p)
-{
-	// for movie sync, we need to save/load memory card contents (and other data) in savestates.
-	// otherwise, we'll assume the user wants to keep their memcards and saves separate,
-	// unless we're loading (in which case we let the savestate contents decide, in order to stay aligned with them).
-	bool storeContents = (Movie::IsRecordingInput() || Movie::IsPlayingInput());
-	p.Do(storeContents);
-
-	if (storeContents)
-	{
-		p.Do(interruptSwitch);
-		p.Do(m_bInterruptSet);
-		p.Do(command);
-		p.Do(status);
-		p.Do(m_uPosition);
-		p.Do(programming_buffer);
-		p.Do(formatDelay);
-		p.Do(m_bDirty);
-		p.Do(address);
-
-		p.Do(nintendo_card_id);
-		p.Do(card_id);
-		p.Do(memory_card_size);
-		p.DoArray(memory_card_content, memory_card_size); 
-		p.Do(card_index);
-	}
-}
-
-IEXIDevice* CEXIMemoryCard::FindDevice(TEXIDevices device_type, int customIndex)
-{
-	if (device_type != m_deviceType)
-		return NULL;
-	if (customIndex != card_index)
-		return NULL;
-	return this;
-}
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
deleted file mode 100644
index 2ccef0aeab..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXI_DEVICEMEMORYCARD_H
-#define _EXI_DEVICEMEMORYCARD_H
-
-#include "Thread.h"
-
-// Data structure to be passed to the flushing thread.
-struct FlushData
-{
-	bool bExiting;
-	std::string filename;
-	u8 *memcardContent;
-	int memcardSize, memcardIndex;
-};
-
-class CEXIMemoryCard : public IEXIDevice
-{
-public:
-	CEXIMemoryCard(const int index);
-	virtual ~CEXIMemoryCard();
-	void SetCS(int cs);
-	void Update();
-	bool IsInterruptSet();
-	bool IsPresent();
-	void DoState(PointerWrap &p);
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-	IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
-
-private:
-	// This is scheduled whenever a page write is issued. The this pointer is passed
-	// through the userdata parameter, so that it can then call Flush on the right card.
-	static void FlushCallback(u64 userdata, int cyclesLate);
-
-	// Scheduled when a command that required delayed end signaling is done.
-	static void CmdDoneCallback(u64 userdata, int cyclesLate);
-
-	// Flushes the memory card contents to disk.
-	void Flush(bool exiting = false);
-
-	// Signals that the command that was previously executed is now done.
-	void CmdDone();
-
-	// Variant of CmdDone which schedules an event later in the future to complete the command.
-	void CmdDoneLater(u64 cycles);
-
-	enum 
-	{
-		cmdNintendoID			= 0x00,
-		cmdReadArray			= 0x52,
-		cmdArrayToBuffer		= 0x53,
-		cmdSetInterrupt			= 0x81,
-		cmdWriteBuffer			= 0x82,
-		cmdReadStatus			= 0x83,
-		cmdReadID				= 0x85,
-		cmdReadErrorBuffer		= 0x86,
-		cmdWakeUp				= 0x87,
-		cmdSleep				= 0x88,
-		cmdClearStatus			= 0x89,
-		cmdSectorErase			= 0xF1,
-		cmdPageProgram			= 0xF2,
-		cmdExtraByteProgram		= 0xF3,
-		cmdChipErase			= 0xF4,
-	};
-
-	std::string m_strFilename;
-	int card_index;
-	int et_this_card, et_cmd_done;
-	//! memory card state
-
-	// STATE_TO_SAVE
-	int interruptSwitch;
-	bool m_bInterruptSet;
-	int command;
-	int status;
-	u32 m_uPosition;
-	u8 programming_buffer[128];
-	u32 formatDelay;
-	bool m_bDirty;
-	//! memory card parameters 
-	unsigned int nintendo_card_id, card_id;
-	unsigned int address;	
-	int memory_card_size; //! in bytes, must be power of 2.
-	u8 *memory_card_content; 
-
-	FlushData flushData;
-	std::thread flushThread;
-	
-protected:
-	virtual void TransferByte(u8 &byte);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h
deleted file mode 100644
index 093424df25..0000000000
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EXI_DEVICEMIC_H
-#define _EXI_DEVICEMIC_H
-
-#if HAVE_PORTAUDIO
-
-#include "StdMutex.h"
-
-class CEXIMic : public IEXIDevice
-{
-public:
-	CEXIMic(const int index);
-	virtual ~CEXIMic();
-	void SetCS(int cs);
-	bool IsInterruptSet();
-	bool IsPresent();
-
-private:
-	static u8 const exi_id[];
-	static int const sample_size = sizeof(s16);
-	static int const rate_base = 11025;
-	static int const ring_base = 32;
-
-	enum
-	{
-		cmdID			= 0x00,
-		cmdGetStatus	= 0x40,
-		cmdSetStatus	= 0x80,
-		cmdGetBuffer	= 0x20,
-		cmdReset		= 0xFF,
-	};
-
-	int slot;
-
-	u32 m_position;
-	int command;
-	union UStatus
-	{
-		u16 U16;
-		u8 U8[2];
-		struct
-		{
-			u16	out			:4; // MICSet/GetOut...???
-			u16 id			:1; // Used for MICGetDeviceID (always 0)
-			u16 button_unk	:3; // Button bits which appear unused
-			u16 button		:1; // The actual button on the mic
-			u16 buff_ovrflw	:1; // Ring buffer wrote over bytes which weren't read by console
-			u16 gain		:1; // Gain: 0dB or 15dB
-			u16 sample_rate	:2; // Sample rate, 00-11025, 01-22050, 10-44100, 11-??
-			u16 buff_size	:2; // Ring buffer size in bytes, 00-32, 01-64, 10-128, 11-???
-			u16 is_active	:1; // If we are sampling or not
-		};
-	};
-
-	// 64 is the max size, can be 16 or 32 as well
-	int ring_pos;
-	u8 ring_buffer[64 * sample_size];
-
-	// 0 to disable interrupts, else it will be checked against current cpu ticks
-	// to determine if interrupt should be raised
-	u64 next_int_ticks;
-	void UpdateNextInterruptTicks();
-
-	// Streaming input interface
-	int pa_error; // PaError
-	void *pa_stream; // PaStream
-
-	void StreamLog(const char *msg);
-	void StreamInit();
-	void StreamTerminate();
-	void StreamStart();
-	void StreamStop();
-	void StreamReadOne();
-
-public:
-	UStatus status;
-
-	std::mutex ring_lock;
-
-	// status bits converted to nice numbers
-	int sample_rate;
-	int buff_size;
-	int buff_size_samples;
-
-	// Arbitrarily small ringbuffer used by audio input backend in order to
-	// keep delay tolerable
-	s16 *stream_buffer;
-	int stream_size;
-	int stream_wpos;
-	int stream_rpos;
-	int samples_avail;
-	
-protected:
-	virtual void TransferByte(u8 &byte);
-};
-
-#else // HAVE_PORTAUDIO
-
-class CEXIMic : public IEXIDevice
-{
-public:
-	CEXIMic(const int) {}
-};
-
-#endif
-
-#endif // _EXI_DEVICEMIC_H
diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h
deleted file mode 100644
index 215402dd10..0000000000
--- a/Source/Core/Core/Src/HW/GCMemcard.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __GCMEMCARD_h__
-#define __GCMEMCARD_h__
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Sram.h"
-#include "StringUtil.h"
-#include "EXI_DeviceIPL.h"
-
-#define BE64(x) (Common::swap64(x))
-#define BE32(x) (Common::swap32(x))
-#define BE16(x) (Common::swap16(x))
-#define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8)));
-enum
-{
-	SLOT_A = 0,
-	SLOT_B = 1,
-	GCI = 0,
-	SUCCESS,
-	NOMEMCARD,
-	OPENFAIL,
-	OUTOFBLOCKS,
-	OUTOFDIRENTRIES,
-	LENGTHFAIL,
-	INVALIDFILESIZE,
-	TITLEPRESENT,
-	DIRLEN = 0x7F,
-	SAV = 0x80,
-	SAVFAIL,
-	GCS = 0x110,
-	GCSFAIL,	
-	FAIL,
-	WRITEFAIL,
-	DELETE_FAIL,
-
-	MC_FST_BLOCKS  = 0x05,
-	MBIT_TO_BLOCKS = 0x10,
-	DENTRY_STRLEN  = 0x20,
-	DENTRY_SIZE    = 0x40,
-	BLOCK_SIZE     = 0x2000,
-	BAT_SIZE       = 0xFFB,
-
-	MemCard59Mb   = 0x04,
-	MemCard123Mb  = 0x08,
-	MemCard251Mb  = 0x10,
-	Memcard507Mb  = 0x20,
-	MemCard1019Mb = 0x40,
-	MemCard2043Mb = 0x80,
-
-	CI8SHARED = 1,
-	RGB5A3,
-	CI8,
-};
-
-class GCMemcard : NonCopyable
-{
-private:
-	friend class CMemcardManagerDebug;
-	bool m_valid;
-	std::string m_fileName;
-
-	u32 maxBlock;
-	u16 m_sizeMb;
-	struct GCMBlock
-	{
-		GCMBlock(){erase();}
-		void erase() {memset(block, 0xFF, BLOCK_SIZE);}
-		u8 block[BLOCK_SIZE];
-	};
-	std::vector<GCMBlock> mc_data_blocks;
-#pragma pack(push,1)
-	struct Header {			//Offset	Size	Description
-		 // Serial in libogc
-		u8 serial[12];		//0x0000	12		?
-		u64 formatTime;		//0x000c	8		time of format (OSTime value)
-		u32 SramBias;		//0x0014	4		sram bias at time of format
-		u32 SramLang;		//0x0018	4		sram language
-		u8 Unk2[4];			//0x001c	4	 	? almost always 0
-		// end Serial in libogc
-		u8 deviceID[2];		//0x0020	2		0 if formated in slot A 1 if formated in slot B
-		u8 SizeMb[2];		//0x0022	2		size of memcard in Mbits
-		u16 Encoding;		//0x0024	2		encoding (ASCII or japanese)
-		u8 Unused1[468];	//0x0026	468		unused (0xff)
-		u16 UpdateCounter;	//0x01fa	2		update Counter (?, probably unused)
-		u16 Checksum;		//0x01fc	2		Additive Checksum
-		u16 Checksum_Inv;	//0x01fe	2		Inverse Checksum
-		u8 Unused2[7680];	//0x0200	0x1e00	unused (0xff)
-	} hdr;
-
-	struct DEntry
-	{
-		u8 Gamecode[4];		//0x00		0x04	Gamecode
-		u8 Makercode[2];	//0x04		0x02	Makercode
-		u8 Unused1;			//0x06		0x01	reserved/unused (always 0xff, has no effect)
-		u8 BIFlags;			//0x07		0x01	banner gfx format and icon animation (Image Key)
-							//		bit(s)	description
-							//		2		Icon Animation 0: forward 1: ping-pong
-							//		1		[--0: No Banner 1: Banner present--] WRONG! YAGCD LIES!
-							//		0		[--Banner Color 0: RGB5A3 1: CI8--]  WRONG! YAGCD LIES!
-							//		bits 0 and 1: image format
-							//		00 no banner
-							//		01 CI8 banner
-							//		10 RGB5A3 banner
-							//		11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner
-							//
-		u8 Filename[DENTRY_STRLEN];	//0x08		0x20	filename
-		u8 ModTime[4];		//0x28		0x04	Time of file's last modification in seconds since 12am, January 1st, 2000
-		u8 ImageOffset[4];	//0x2c		0x04	image data offset
-		u8 IconFmt[2];		//0x30		0x02	icon gfx format (2bits per icon)
-							//		bits	Description
-							//		00	no icon
-							//		01	CI8 with a shared color palette after the last frame
-							//		10	RGB5A3
-							//		11	CI8 with a unique color palette after itself
-							//
-		u8 AnimSpeed[2];	//0x32		0x02	animation speed (2bits per icon) (*1)
-							//		bits	Description
-							//		00	no icon
-							//		01	Icon lasts for 4 frames
-							//		10	Icon lasts for 8 frames
-							//		11	Icon lasts for 12 frames
-							//
-		u8 Permissions;		//0x34		0x01	file-permissions
-							//		bit	permission	Description
-							//		4	no move		File cannot be moved by the IPL
-							//		3	no copy		File cannot be copied by the IPL
-							//		2	public		Can be read by any game
-							//
-		u8 CopyCounter;		//0x35		0x01	copy counter (*2)
-		u8 FirstBlock[2];	//0x36		0x02	block no of first block of file (0 == offset 0)
-		u8 BlockCount[2];	//0x38		0x02	file-length (number of blocks in file)
-		u8 Unused2[2];		//0x3a		0x02	reserved/unused (always 0xffff, has no effect)
-		u8 CommentsAddr[4];	//0x3c		0x04	Address of the two comments within the file data (*3)
-	};
-
-	struct Directory
-	{
-		DEntry Dir[DIRLEN];	//0x0000		Directory Entries (max 127)
-		u8 Padding[0x3a];
-		u16 UpdateCounter;	//0x1ffa	2	update Counter
-		u16 Checksum;		//0x1ffc	2	Additive Checksum
-		u16 Checksum_Inv;	//0x1ffe	2	Inverse Checksum
-	} dir, dir_backup;
-
-	Directory *CurrentDir, *PreviousDir;
-	struct BlockAlloc
-	{
-		u16 Checksum;			//0x0000	2	Additive Checksum
-		u16 Checksum_Inv;		//0x0002	2	Inverse Checksum
-		u16 UpdateCounter;		//0x0004	2	update Counter
-		u16 FreeBlocks;			//0x0006	2	free Blocks
-		u16 LastAllocated;		//0x0008	2	last allocated Block
-		u16 Map[BAT_SIZE];		//0x000a	0x1ff8	Map of allocated Blocks
-		u16 GetNextBlock(u16 Block) const;
-		u16 NextFreeBlock(u16 StartingBlock=MC_FST_BLOCKS) const;
-		bool ClearBlocks(u16 StartingBlock, u16 Length);
-	} bat,bat_backup;
-
-	BlockAlloc *CurrentBat, *PreviousBat;
-	struct GCMC_Header
-	{
-		Header *hdr;
-		Directory *dir, *dir_backup;
-		BlockAlloc *bat, *bat_backup;
-	};
-#pragma pack(pop)
-
-	u32 ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile);
-	static void FormatInternal(GCMC_Header &GCP);
-	void initDirBatPointers() ;
-public:
-
-	GCMemcard(const char* fileName, bool forceCreation=false, bool sjis=false);
-	bool IsValid() const { return m_valid; }
-	bool IsAsciiEncoding() const;
-	bool Save();
-	bool Format(bool sjis = false, u16 SizeMb = MemCard2043Mb);
-	static bool Format(u8 * card_data, bool sjis = false, u16 SizeMb = MemCard2043Mb);
-	
-	static void calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum);
-	u32 TestChecksums() const;
-	bool FixChecksums();
-	
-	// get number of file entries in the directory
-	u8 GetNumFiles() const;
-	u8 GetFileIndex(u8 fileNumber) const;
-
-	// get the free blocks from bat
-	u16 GetFreeBlocks() const;
-
-	// If title already on memcard returns index, otherwise returns -1
-	u8 TitlePresent(DEntry d) const;
-
-	bool GCI_FileName(u8 index, std::string &filename) const;
-	// DEntry functions, all take u8 index < DIRLEN (127)
-	std::string DEntry_GameCode(u8 index) const;
-	std::string DEntry_Makercode(u8 index) const;
-	std::string DEntry_BIFlags(u8 index) const;
-	std::string DEntry_FileName(u8 index) const;
-	u32 DEntry_ModTime(u8 index) const;
-	u32 DEntry_ImageOffset(u8 index) const;
-	std::string DEntry_IconFmt(u8 index) const;
-	std::string DEntry_AnimSpeed(u8 index) const;
-	std::string DEntry_Permissions(u8 index) const;
-	u8 DEntry_CopyCounter(u8 index) const;
-	// get first block for file
-	u16 DEntry_FirstBlock(u8 index) const;
-	// get file length in blocks
-	u16 DEntry_BlockCount(u8 index) const;
-	u32 DEntry_CommentsAddress(u8 index) const;
-	std::string GetSaveComment1(u8 index) const;
-	std::string GetSaveComment2(u8 index) const;
-	// Copies a DEntry from u8 index to DEntry& data
-	bool GetDEntry(u8 index, DEntry &dest) const;
-
-	// assumes there's enough space in buffer
-	// old determines if function uses old or new method of copying data
-	// some functions only work with old way, some only work with new way
-	// TODO: find a function that works for all calls or split into 2 functions
-	u32 GetSaveData(u8 index, std::vector<GCMBlock> &saveBlocks) const;
-
-	// adds the file to the directory and copies its contents
-	u32 ImportFile(DEntry& direntry, std::vector<GCMBlock> &saveBlocks);
-
-	// delete a file from the directory
-	u32 RemoveFile(u8 index);
-
-	// reads a save from another memcard, and imports the data into this memcard
-	u32 CopyFrom(const GCMemcard& source, u8 index);
-
-	// reads a .gci/.gcs/.sav file and calls ImportFile or saves out a gci file
-	u32 ImportGci(const char* inputFile,const std::string &outputFile);
-
-	// writes a .gci file to disk containing index
-	u32 ExportGci(u8 index, const char* fileName, const std::string &directory) const;
-
-	// GCI files are untouched, SAV files are byteswapped
-	// GCS files have the block count set, default is 1 (For export as GCS)
-	static void Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length = BLOCK_SIZE);
-
-	// reads the banner image
-	bool ReadBannerRGBA8(u8 index, u32* buffer) const;
-
-	// reads the animation frames
-	u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const;
-
-	void CARD_GetSerialNo(u32 *serial1,u32 *serial2);
-	s32 FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer);
-	s32 PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer);
-};
-#endif
-
diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
deleted file mode 100644
index 9862c1b347..0000000000
--- a/Source/Core/Core/Src/HW/GCPad.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "GCPadStatus.h"
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "GCPadEmu.h"
-#include "../ConfigManager.h"
-
-#include "../../InputCommon/Src/InputConfig.h"
-#include "Host.h"
-
-namespace Pad
-{
-
-static InputPlugin g_plugin("GCPadNew", _trans("Pad"), "GCPad");
-InputPlugin *GetPlugin()
-{
-	return &g_plugin;
-}
-
-void Shutdown()
-{
-	std::vector<ControllerEmu*>::const_iterator
-		i = g_plugin.controllers.begin(),
-		e = g_plugin.controllers.end();
-	for ( ; i!=e; ++i )
-		delete *i;
-	g_plugin.controllers.clear();
-
-	g_controller_interface.Shutdown();
-}
-
-// if plugin isn't initialized, init and load config
-void Initialize(void* const hwnd)
-{
-	// add 4 gcpads
-	for (unsigned int i=0; i<4; ++i)
-		g_plugin.controllers.push_back(new GCPad(i));
-
-	g_controller_interface.SetHwnd(hwnd);
-	g_controller_interface.Initialize();
-
-	// load the saved controller config
-	g_plugin.LoadConfig(true);
-}
-
-void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
-{
-	memset(_pPADStatus, 0, sizeof(*_pPADStatus));
-	_pPADStatus->err = PAD_ERR_NONE;
-
-	std::unique_lock<std::recursive_mutex> lk(g_plugin.controls_lock, std::try_to_lock);
-
-	if (!lk.owns_lock())
-	{
-		// if gui has lock (messing with controls), skip this input cycle
-		// center axes and return
-		memset(&_pPADStatus->stickX, 0x80, 4);
-		return;
-	}
-
-	// if we are on the next input cycle, update output and input
-	// if we can get a lock
-	static int _last_numPAD = 4;
-	if (_numPAD <= _last_numPAD)
-	{
-		g_controller_interface.UpdateOutput();
-		g_controller_interface.UpdateInput();
-	}
-	_last_numPAD = _numPAD;
-	
-	// get input
-	((GCPad*)g_plugin.controllers[_numPAD])->GetInput(_pPADStatus);
-}
-
-// __________________________________________________________________________________________________
-// Function: Rumble
-// Purpose:  Pad rumble!
-// input:    _numPad    - Which pad to rumble.
-//           _uType     - Command type (Stop=0, Rumble=1, Stop Hard=2).
-//           _uStrength - Strength of the Rumble
-// output:   none
-//
-void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
-{
-	std::unique_lock<std::recursive_mutex> lk(g_plugin.controls_lock, std::try_to_lock);
-
-	if (lk.owns_lock())
-	{
-		// TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time
-		// set rumble
-		if (1 == _uType && _uStrength > 2)
-		{
-			((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(255);
-		}
-		else
-		{
-			((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(0);
-		}
-	}
-}
-
-// __________________________________________________________________________________________________
-// Function: Motor
-// Purpose:  For devices with constant Force feedback
-// input:    _numPAD    - The pad to operate on 
-//           _uType     - 06 = Motor On, 04 = Motor Off
-//           _uStrength - 00 = Left Strong, 127 = Left Weak, 128 = Right Weak, 255 = Right Strong
-// output:   none
-//
-void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
-{
-	std::unique_lock<std::recursive_mutex> lk(g_plugin.controls_lock, std::try_to_lock);
-
-	if (lk.owns_lock())
-	{
-		// TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time
-		// set rumble
-		if (_uType == 6)
-		{
-			((GCPad*)g_plugin.controllers[ _numPAD ])->SetMotor(_uStrength);
-		}
-	}
-}
-
-bool GetMicButton(u8 pad)
-{
-	
-	std::unique_lock<std::recursive_mutex> lk(g_plugin.controls_lock, std::try_to_lock);
-
-	if (!lk.owns_lock())
-		return false;
-
-	return ((GCPad*)g_plugin.controllers[pad])->GetMicButton();
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/GCPad.h b/Source/Core/Core/Src/HW/GCPad.h
deleted file mode 100644
index c4ddb2d96c..0000000000
--- a/Source/Core/Core/Src/HW/GCPad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "CommonTypes.h"
-#include "GCPadStatus.h"
-#include "../../InputCommon/Src/InputConfig.h"
-
-#ifndef _GCPAD_H_
-#define _GCPAD_H_
-
-namespace Pad
-{
-
-void Shutdown();
-void Initialize(void* const hwnd);
-
-InputPlugin *GetPlugin();
-
-void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus);
-void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength);
-void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength);
-
-bool GetMicButton(u8 pad);
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp
deleted file mode 100644
index a1e07794c7..0000000000
--- a/Source/Core/Core/Src/HW/GCPadEmu.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GCPadEmu.h"
-#include "../Host.h"
-
-const u16 button_bitmasks[] =
-{
-	PAD_BUTTON_A,
-	PAD_BUTTON_B,
-	PAD_BUTTON_X,
-	PAD_BUTTON_Y,
-	PAD_TRIGGER_Z,
-	PAD_BUTTON_START,
-	0	// MIC HAX
-};
-
-const u16 trigger_bitmasks[] =
-{
-	PAD_TRIGGER_L,
-	PAD_TRIGGER_R,
-};
-
-const u16 dpad_bitmasks[] =
-{
-	PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT 
-};
-
-const char* const named_buttons[] =
-{
-	"A",
-	"B",
-	"X",
-	"Y",
-	"Z",
-	_trans("Start"),
-	"Mic"
-};
-
-const char* const named_triggers[] =
-{
-	// i18n:  Left
-	_trans("L"),
-	// i18n:  Right
-	_trans("R"),
-	// i18n:  Left-Analog
-	_trans("L-Analog"),
-	// i18n:  Right-Analog
-	_trans("R-Analog")
-};
-
-GCPad::GCPad(const unsigned int index) : m_index(index)
-{
-	int const mic_hax = index > 1;
-
-	// buttons
-	groups.push_back(m_buttons = new Buttons(_trans("Buttons")));
-	for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons) - mic_hax; ++i)
-		m_buttons->controls.push_back(new ControlGroup::Input(named_buttons[i]));
-
-	// sticks
-	groups.push_back(m_main_stick = new AnalogStick(_trans("Main Stick")));
-	groups.push_back(m_c_stick = new AnalogStick(_trans("C-Stick")));
-
-	// triggers
-	groups.push_back(m_triggers = new MixedTriggers(_trans("Triggers")));
-	for (unsigned int i=0; i < sizeof(named_triggers)/sizeof(*named_triggers); ++i)
-		m_triggers->controls.push_back(new ControlGroup::Input(named_triggers[i]));
-
-	// rumble
-	groups.push_back(m_rumble = new ControlGroup(_trans("Rumble")));
-	m_rumble->controls.push_back(new ControlGroup::Output(_trans("Motor")));
-
-	// dpad
-	groups.push_back(m_dpad = new Buttons(_trans("D-Pad")));
-	for (unsigned int i=0; i < 4; ++i)
-		m_dpad->controls.push_back(new ControlGroup::Input(named_directions[i]));
-
-	// options
-	groups.push_back(m_options = new ControlGroup(_trans("Options")));
-	m_options->settings.push_back(new ControlGroup::Setting(_trans("Background Input"), false));
-}
-
-std::string GCPad::GetName() const
-{
-	return std::string("GCPad") + char('1'+m_index);
-}
-
-void GCPad::GetInput(SPADStatus* const pad)
-{
-	// if window has focus or background input enabled
-	if (Host_RendererHasFocus() || m_options[0].settings[0]->value)
-	{
-		// buttons
-		m_buttons->GetState(&pad->button, button_bitmasks);
-
-		// set analog A/B analog to full or w/e, prolly not needed
-		if (pad->button & PAD_BUTTON_A) pad->analogA = 0xFF;
-		if (pad->button & PAD_BUTTON_B) pad->analogB = 0xFF;
-
-		// dpad
-		m_dpad->GetState(&pad->button, dpad_bitmasks);
-
-		// sticks
-		m_main_stick->GetState(&pad->stickX, &pad->stickY, 0x80, 127);
-		m_c_stick->GetState(&pad->substickX, &pad->substickY, 0x80, 127);
-
-		// triggers
-		m_triggers->GetState(&pad->button, trigger_bitmasks, &pad->triggerLeft, 0xFF);
-	}
-	else
-	{
-		// center sticks
-		memset(&pad->stickX, 0x80, 4);
-	}
-}
-
-void GCPad::SetMotor(const u8 on)
-{
-	float state = (float)on / 255;
-	float force = abs(state - 0.5f) * 2;
-	if (state < 0.5)
-		force = -force;
-
-	// only rumble if window has focus or background input is enabled
-	if (Host_RendererHasFocus() || m_options[0].settings[0]->value)
-		m_rumble->controls[0]->control_ref->State(force);
-	else
-		m_rumble->controls[0]->control_ref->State(0);
-}
-
-void GCPad::SetOutput(const u8 on)
-{
-	// only rumble if window has focus or background input is enabled
-	m_rumble->controls[0]->control_ref->State(on && (Host_RendererHasFocus() || m_options[0].settings[0]->value));
-}
-
-void GCPad::LoadDefaults(const ControllerInterface& ciface)
-{
-	#define set_control(group, num, str)	(group)->controls[num]->control_ref->expression = (str)
-
-	ControllerEmu::LoadDefaults(ciface);
-
-	// Buttons
-	set_control(m_buttons, 0, "X");		// A
-	set_control(m_buttons, 1, "Z");		// B
-	set_control(m_buttons, 2, "C");		// X
-	set_control(m_buttons, 3, "S");		// Y
-	set_control(m_buttons, 4, "D");		// Z
-#ifdef _WIN32
-	set_control(m_buttons, 5, "RETURN");	// Start
-#else
-	// osx/linux
-	set_control(m_buttons, 5, "Return");	// Start
-#endif
-
-	// stick modifiers to 50 %
-	m_main_stick->controls[4]->control_ref->range = 0.5f;
-	m_c_stick->controls[4]->control_ref->range = 0.5f;
-
-	// D-Pad
-	set_control(m_dpad, 0, "T");		// Up
-	set_control(m_dpad, 1, "G");		// Down
-	set_control(m_dpad, 2, "F");		// Left
-	set_control(m_dpad, 3, "H");		// Right
-
-	// C-Stick
-	set_control(m_c_stick, 0, "I");		// Up
-	set_control(m_c_stick, 1, "K");		// Down
-	set_control(m_c_stick, 2, "J");		// Left
-	set_control(m_c_stick, 3, "L");		// Right
-#ifdef _WIN32
-	set_control(m_c_stick, 4, "LCONTROL");	// Modifier
-
-	// Main Stick
-	set_control(m_main_stick, 0, "UP");			// Up
-	set_control(m_main_stick, 1, "DOWN");		// Down
-	set_control(m_main_stick, 2, "LEFT");		// Left
-	set_control(m_main_stick, 3, "RIGHT");		// Right
-	set_control(m_main_stick, 4, "LSHIFT");		// Modifier
-
-#elif __APPLE__
-	set_control(m_c_stick, 4, "Left Control");	// Modifier
-
-	// Main Stick
-	set_control(m_main_stick, 0, "Up Arrow");		// Up
-	set_control(m_main_stick, 1, "Down Arrow");		// Down
-	set_control(m_main_stick, 2, "Left Arrow");		// Left
-	set_control(m_main_stick, 3, "Right Arrow");	// Right
-	set_control(m_main_stick, 4, "Left Shift");		// Modifier
-#else
-	// not sure if these are right
-
-	set_control(m_c_stick, 4, "Control_L");	// Modifier
-
-	// Main Stick
-	set_control(m_main_stick, 0, "Up");		// Up
-	set_control(m_main_stick, 1, "Down");		// Down
-	set_control(m_main_stick, 2, "Left");		// Left
-	set_control(m_main_stick, 3, "Right");	// Right
-	set_control(m_main_stick, 4, "Shift_L");		// Modifier
-#endif
-
-	// Triggers
-	set_control(m_triggers, 0, "Q");	// L
-	set_control(m_triggers, 1, "W");	// R
-}
-
-bool GCPad::GetMicButton() const
-{
-	return m_buttons->controls.back()->control_ref->State();
-}
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h
deleted file mode 100644
index aa5b33d252..0000000000
--- a/Source/Core/Core/Src/HW/GCPadEmu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONEMU_GCPAD_H_
-#define _CONEMU_GCPAD_H_
-
-#include <string>
-
-#include "ControllerEmu.h"
-
-class GCPad : public ControllerEmu
-{
-public:
-
-	GCPad(const unsigned int index);
-	void GetInput(SPADStatus* const pad);
-	void SetOutput(const u8 on);
-	void SetMotor(const u8 on);
-
-	bool GetMicButton() const;
-	
-	std::string GetName() const;
-
-	void LoadDefaults(const ControllerInterface& ciface);
-
-private:
-
-	Buttons*				m_buttons;
-	AnalogStick*			m_main_stick;
-	AnalogStick*			m_c_stick;
-	Buttons*				m_dpad;
-	MixedTriggers*			m_triggers;
-	ControlGroup*			m_rumble;
-	ControlGroup*			m_options;
-
-	const unsigned int		m_index;
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp
deleted file mode 100644
index c889466938..0000000000
--- a/Source/Core/Core/Src/HW/GPFifo.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "ProcessorInterface.h"
-#include "Memmap.h"
-#include "VideoBackendBase.h"
-#include "../PowerPC/JitCommon/JitBase.h"
-#include "../PowerPC/PowerPC.h"
-
-#include "GPFifo.h"
-
-namespace GPFifo
-{
-
-// 32 Byte gather pipe with extra space
-// Overfilling is no problem (up to the real limit), CheckGatherPipe will blast the 
-// contents in nicely sized chunks
-
-// Other optimizations to think about:
-
-// If the gp is NOT linked to the fifo, just blast to memory byte by word
-// If the gp IS linked to the fifo, use a fast wrapping buffer and skip writing to memory
-
-// Both of these should actually work! Only problem is that we have to decide at run time, 
-// the same function could use both methods. Compile 2 different versions of each such block?
-
-u8 GC_ALIGNED32(m_gatherPipe[GATHER_PIPE_SIZE*16]); //more room, for the fastmodes
-
-// pipe counter
-u32 m_gatherPipeCount = 0;
-
-void DoState(PointerWrap &p)
-{
-	p.Do(m_gatherPipe);
-	p.Do(m_gatherPipeCount);
-}
-
-void Init()
-{
-	ResetGatherPipe();
-	memset(m_gatherPipe, 0, sizeof(m_gatherPipe));
-}
-
-bool IsEmpty()
-{
-	return m_gatherPipeCount == 0;
-}
-
-void ResetGatherPipe()
-{
-	m_gatherPipeCount = 0;
-}
-
-void STACKALIGN CheckGatherPipe()
-{
-	if (m_gatherPipeCount >= GATHER_PIPE_SIZE)
-	{
-		u32 cnt;
-		u8* curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
-		for (cnt = 0; m_gatherPipeCount >= GATHER_PIPE_SIZE; cnt += GATHER_PIPE_SIZE)
-		{
-			// copy the GatherPipe
-			memcpy(curMem, m_gatherPipe + cnt, GATHER_PIPE_SIZE);
-			m_gatherPipeCount -= GATHER_PIPE_SIZE;
-
-			// increase the CPUWritePointer
-			if (ProcessorInterface::Fifo_CPUWritePointer == ProcessorInterface::Fifo_CPUEnd)
-			{
-				ProcessorInterface::Fifo_CPUWritePointer = ProcessorInterface::Fifo_CPUBase;
-				curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
-			}
-			else
-			{
-				curMem += GATHER_PIPE_SIZE;
-				ProcessorInterface::Fifo_CPUWritePointer += GATHER_PIPE_SIZE;
-			}
-
-			g_video_backend->Video_GatherPipeBursted();
-		}
-		
-		// move back the spill bytes
-		memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount);
-		
-		// Profile where the FIFO writes are occurring.
-		if (jit && PC != 0 && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end()))
-		{
-			// Log only stores, fp stores and ps stores, filtering out other instructions arrived via optimizeGatherPipe
-			int type = GetOpInfo(Memory::ReadUnchecked_U32(PC))->type;
-			if (type == OPTYPE_STORE || type == OPTYPE_STOREFP || (type == OPTYPE_PS && !strcmp(GetOpInfo(Memory::ReadUnchecked_U32(PC))->opname, "psq_st")))
-			{
-				jit->js.fifoWriteAddresses.insert(PC);
-
-				// Invalidate the JIT block so that it gets recompiled with the external exception check included.
-				jit->GetBlockCache()->InvalidateICache(PC, 4);
-			}
-		}
-	}
-}
-
-void Write8(const u8 _iValue, const u32 _iAddress)
-{
-//	LOG(GPFIFO, "GPFIFO #%x: 0x%02x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
-	FastWrite8(_iValue);
-	CheckGatherPipe();
-}
-
-void Write16(const u16 _iValue, const u32 _iAddress)
-{
-//	LOG(GPFIFO, "GPFIFO #%x: 0x%04x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
-	FastWrite16(_iValue);
-	CheckGatherPipe();
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-//#ifdef _DEBUG
-//	float floatvalue = *(float*)&_iValue;
-//	LOG(GPFIFO, "GPFIFO #%x: 0x%08x / %f",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue, floatvalue);
-//#endif
-	FastWrite32(_iValue);
-	CheckGatherPipe();
-}
-
-void Write64(const u64 _iValue, const u32 _iAddress)
-{
-	FastWrite64(_iValue);
-	CheckGatherPipe();
-}
-
-void FastWrite8(const u8 _iValue)
-{
-	m_gatherPipe[m_gatherPipeCount] = _iValue;
-	++m_gatherPipeCount;
-}
-
-void FastWrite16(const u16 _iValue)
-{
-	*(u16*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap16(_iValue);
-	m_gatherPipeCount += 2;
-}
-
-void FastWrite32(const u32 _iValue)
-{
-	*(u32*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap32(_iValue);
-	m_gatherPipeCount += 4;
-}
-
-void FastWrite64(const u64 _iValue)
-{
-	*(u64*)(&m_gatherPipe[m_gatherPipeCount]) = Common::swap64(_iValue);
-	m_gatherPipeCount += 8;
-}
-
-void FastWriteEnd()
-{
-	CheckGatherPipe();
-}
-
-} // end of namespace GPFifo
diff --git a/Source/Core/Core/Src/HW/GPFifo.h b/Source/Core/Core/Src/HW/GPFifo.h
deleted file mode 100644
index 973d4eabab..0000000000
--- a/Source/Core/Core/Src/HW/GPFifo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GPFIFO_H
-#define _GPFIFO_H
-
-#include "Common.h"
-class PointerWrap;
-
-namespace GPFifo
-{
-
-enum
-{
-	GATHER_PIPE_SIZE = 32
-};
-
-extern u8 GC_ALIGNED32(m_gatherPipe[GATHER_PIPE_SIZE*16]); //more room, for the fastmodes
-
-// pipe counter
-extern u32 m_gatherPipeCount;
-
-// Init
-void Init();
-void DoState(PointerWrap &p);
-
-// ResetGatherPipe
-void ResetGatherPipe();
-void CheckGatherPipe();
-
-bool IsEmpty();
-
-// Write
-void Write8(const u8 _iValue, const u32 _iAddress);
-void Write16(const u16 _iValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-void Write64(const u64 _iValue, const u32 _iAddress);
-
-// These expect pre-byteswapped values
-// Also there's an upper limit of about 512 per batch
-// Most likely these should be inlined into JIT instead
-void FastWrite8(const u8 _iValue);
-void FastWrite16(const u16 _iValue);
-void FastWrite32(const u32 _iValue);
-void FastWrite64(const u64 _iValue);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp
deleted file mode 100644
index cef3666d59..0000000000
--- a/Source/Core/Core/Src/HW/HW.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thunk.h"
-#include "../Core.h"
-#include "HW.h"
-#include "../PowerPC/PowerPC.h"
-#include "CPU.h"
-#include "DSP.h"
-#include "DVDInterface.h"
-#include "EXI.h"
-#include "GPFifo.h"
-#include "Memmap.h"
-#include "ProcessorInterface.h"
-#include "SI.h"
-#include "AudioInterface.h"
-#include "VideoInterface.h"
-#include "WII_IPC.h"
-#include "../ConfigManager.h"
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
-#include "../State.h"
-#include "../PowerPC/PPCAnalyst.h"
-
-namespace HW
-{
-	void Init()
-	{
-		CoreTiming::Init();
-		SystemTimers::PreInit();
-
-		State::Init();
-
-		// Init the whole Hardware
-		AudioInterface::Init();
-		VideoInterface::Init();
-		SerialInterface::Init();
-		ProcessorInterface::Init();
-		Memory::Init();
-		DSP::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE);
-		DVDInterface::Init();
-		GPFifo::Init();
-		ExpansionInterface::Init();
-		CCPU::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore);
-		SystemTimers::Init();
-
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		{
-			WII_IPCInterface::Init();
-			WII_IPC_HLE_Interface::Init();
-		}
-	}
-
-	void Shutdown()
-	{
-		SystemTimers::Shutdown();
-		CCPU::Shutdown();
-		ExpansionInterface::Shutdown();
-		DVDInterface::Shutdown();
-		DSP::Shutdown();
-		Memory::Shutdown();
-		SerialInterface::Shutdown();
-		AudioInterface::Shutdown();
-
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		{
-			WII_IPCInterface::Shutdown();
-			WII_IPC_HLE_Interface::Shutdown();
-		}
-
-		State::Shutdown();
-		CoreTiming::Shutdown();
-	}
-
-	void DoState(PointerWrap &p)
-	{
-		Memory::DoState(p);
-		p.DoMarker("Memory");
-		VideoInterface::DoState(p);
-		p.DoMarker("VideoInterface");
-		SerialInterface::DoState(p);
-		p.DoMarker("SerialInterface");
-		ProcessorInterface::DoState(p);
-		p.DoMarker("ProcessorInterface");
-		DSP::DoState(p);
-		p.DoMarker("DSP");
-		DVDInterface::DoState(p);
-		p.DoMarker("DVDInterface");
-		GPFifo::DoState(p);
-		p.DoMarker("GPFifo");
-		ExpansionInterface::DoState(p);
-		p.DoMarker("ExpansionInterface");
-		AudioInterface::DoState(p);
-		p.DoMarker("AudioInterface");
-
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		{
-			WII_IPCInterface::DoState(p);
-			p.DoMarker("WII_IPCInterface");
-			WII_IPC_HLE_Interface::DoState(p);
-			p.DoMarker("WII_IPC_HLE_Interface");
-		}
-
-		p.DoMarker("WIIHW");
-	}
-}
diff --git a/Source/Core/Core/Src/HW/HW.h b/Source/Core/Core/Src/HW/HW.h
deleted file mode 100644
index 1fb760dbf4..0000000000
--- a/Source/Core/Core/Src/HW/HW.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _HW_H
-#define _HW_H
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-namespace HW
-{
-	void Init();
-	void Shutdown();
-	void DoState(PointerWrap &p);
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
deleted file mode 100644
index 82b984fdb2..0000000000
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ /dev/null
@@ -1,578 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// NOTE:
-// These functions are primarily used by the interpreter versions of the LoadStore instructions.
-// However, if a JITed instruction (for example lwz) wants to access a bad memory area that call
-// may be redirected here (for example to Read_U32()).
-
-
-#include "Common.h"
-#include "MemoryUtil.h"
-#include "MemArena.h"
-#include "ChunkFile.h"
-
-#include "Memmap.h"
-#include "../Core.h"
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/JitCommon/JitBase.h"
-#include "../HLE/HLE.h"
-#include "CPU.h"
-#include "ProcessorInterface.h"
-#include "DSP.h"
-#include "DVDInterface.h"
-#include "GPFifo.h"
-#include "VideoInterface.h"
-#include "SI.h"
-#include "EXI.h"
-#include "AudioInterface.h"
-#include "MemoryInterface.h"
-#include "WII_IOB.h"
-#include "WII_IPC.h"
-#include "../ConfigManager.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "VideoBackendBase.h"
-
-namespace Memory
-{
-
-// =================================
-// LOCAL SETTINGS
-// ----------------
-
-/* Enable the Translation Lookaside Buffer functions. TLBHack = 1 in Dolphin.ini or a
-   <GameID>.ini file will set this to true */
-bool bFakeVMEM = false;
-bool bMMU = false;
-// ==============
-
-
-// =================================
-// Init() declarations
-// ----------------
-// Store the MemArena here
-u8*	base = NULL;
-
-// The MemArena class
-MemArena g_arena;
-// ==============
-
-// STATE_TO_SAVE
-bool m_IsInitialized = false; // Save the Init(), Shutdown() state
-// END STATE_TO_SAVE
-
-// 64-bit: Pointers to low-mem (sub-0x10000000) mirror
-// 32-bit: Same as the corresponding physical/virtual pointers.
-u8 *m_pRAM;
-u8 *m_pL1Cache;
-u8 *m_pEXRAM;
-u8 *m_pFakeVMEM;
-//u8 *m_pEFB;
-
-// 64-bit: Pointers to high-mem mirrors
-// 32-bit: Same as above
-u8 *m_pPhysicalRAM;
-u8 *m_pVirtualCachedRAM;
-u8 *m_pVirtualUncachedRAM;
-u8 *m_pPhysicalEXRAM;        // wii only
-u8 *m_pVirtualCachedEXRAM;   // wii only
-u8 *m_pVirtualUncachedEXRAM; // wii only
-//u8 *m_pVirtualEFB;
-u8 *m_pVirtualL1Cache;
-u8 *m_pVirtualFakeVMEM;
-
-// =================================
-// Read and write shortcuts
-// ----------------
-writeFn8  hwWrite8 [NUMHWMEMFUN];
-writeFn16 hwWrite16[NUMHWMEMFUN];
-writeFn32 hwWrite32[NUMHWMEMFUN];
-writeFn64 hwWrite64[NUMHWMEMFUN];
-
-readFn8   hwRead8 [NUMHWMEMFUN];
-readFn16  hwRead16[NUMHWMEMFUN];
-readFn32  hwRead32[NUMHWMEMFUN];
-readFn64  hwRead64[NUMHWMEMFUN];
-
-writeFn8  hwWriteWii8 [NUMHWMEMFUN];
-writeFn16 hwWriteWii16[NUMHWMEMFUN];
-writeFn32 hwWriteWii32[NUMHWMEMFUN];
-writeFn64 hwWriteWii64[NUMHWMEMFUN];
-
-readFn8   hwReadWii8 [NUMHWMEMFUN];
-readFn16  hwReadWii16[NUMHWMEMFUN];
-readFn32  hwReadWii32[NUMHWMEMFUN];
-readFn64  hwReadWii64[NUMHWMEMFUN];
-
-// Default read and write functions
-template <class T>
-void HW_Default_Write(const T _Data, const u32 _Address){	ERROR_LOG(MASTER_LOG, "Illegal HW Write%lu %08x", (unsigned long)sizeof(T)*8, _Address);_dbg_assert_(MEMMAP, 0);}
-
-template <class T>
-void HW_Default_Read(T _Data, const u32 _Address){	ERROR_LOG(MASTER_LOG, "Illegal HW Read%lu %08x", (unsigned long)sizeof(T)*8, _Address); _dbg_assert_(MEMMAP, 0);}
-
-#define HW_PAGE_SHIFT 10
-#define HW_PAGE_SIZE (1 << HW_PAGE_SHIFT)
-#define HW_PAGE_MASK (HW_PAGE_SHIFT - 1)
-
-template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address)
-{
-	_Data = *(T *)&P[_Address & HW_PAGE_MASK];
-}
-
-template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address)
-{
-	*(T *)&P[_Address & HW_PAGE_MASK] = _Data;
-}
-
-// Create shortcuts to the hardware devices' read and write functions.
-// This can be seen as an alternative to a switch() or if() table. 
-#define BLOCKSIZE 4
-#define CP_START		0x00 //0x0000 >> 10
-#define WII_IPC_START	0x00 //0x0000 >> 10
-#define PE_START		0x04 //0x1000 >> 10
-#define VI_START		0x08 //0x2000 >> 10
-#define PI_START		0x0C //0x3000 >> 10
-#define MI_START		0x10 //0x4000 >> 10
-#define DSP_START		0x14 //0x5000 >> 10
-#define DVD_START		0x18 //0x6000 >> 10
-#define SI_START		0x19 //0x6400 >> 10
-#define EI_START		0x1A //0x6800 >> 10
-#define AUDIO_START		0x1B //0x6C00 >> 10
-#define GP_START		0x20 //0x8000 >> 10
-
-void InitHWMemFuncs()
-{
-	for (int i = 0; i < NUMHWMEMFUN; i++)
-	{
-		hwWrite8 [i] = HW_Default_Write<u8>;
-		hwWrite16[i] = HW_Default_Write<u16>;
-		hwWrite32[i] = HW_Default_Write<u32>;
-		hwWrite64[i] = HW_Default_Write<u64>;
-		hwRead8  [i] = HW_Default_Read<u8&>;
-		hwRead16 [i] = HW_Default_Read<u16&>;
-		hwRead32 [i] = HW_Default_Read<u32&>;
-		hwRead64 [i] = HW_Default_Read<u64&>;
-
-		// To prevent Dolphin from crashing when accidentally running Wii
-		// executables in GC mode (or running malicious GC executables...)
-		hwWriteWii8 [i] = HW_Default_Write<u8>;
-		hwWriteWii16[i] = HW_Default_Write<u16>;
-		hwWriteWii32[i] = HW_Default_Write<u32>;
-		hwWriteWii64[i] = HW_Default_Write<u64>;
-		hwReadWii8  [i] = HW_Default_Read<u8&>;
-		hwReadWii16 [i] = HW_Default_Read<u16&>;
-		hwReadWii32 [i] = HW_Default_Read<u32&>;
-		hwReadWii64 [i] = HW_Default_Read<u64&>;
-	}
-
-	for (int i = 0; i < BLOCKSIZE; i++)
-	{
-		hwRead16 [CP_START+i] = g_video_backend->Video_CPRead16();
-		hwWrite16[CP_START+i] = g_video_backend->Video_CPWrite16();
-
-		hwRead16 [PE_START+i] = g_video_backend->Video_PERead16();
-		hwWrite16[PE_START+i] = g_video_backend->Video_PEWrite16();
-		hwWrite32[PE_START+i] = g_video_backend->Video_PEWrite32();
-
-		hwRead8  [VI_START+i] = VideoInterface::Read8;
-		hwRead16 [VI_START+i] = VideoInterface::Read16;
-		hwRead32 [VI_START+i] = VideoInterface::Read32;
-		hwWrite16[VI_START+i] = VideoInterface::Write16;
-		hwWrite32[VI_START+i] = VideoInterface::Write32;
-
-		hwRead16 [PI_START+i] = ProcessorInterface::Read16;
-		hwRead32 [PI_START+i] = ProcessorInterface::Read32;
-		hwWrite32[PI_START+i] = ProcessorInterface::Write32;
-
-		hwRead16 [MI_START+i] = MemoryInterface::Read16;
-		hwRead32 [MI_START+i] = MemoryInterface::Read32;
-		hwWrite32[MI_START+i] = MemoryInterface::Write32;
-		hwWrite16[MI_START+i] = MemoryInterface::Write16;
-
-		hwRead16 [DSP_START+i] = DSP::Read16;
-		hwWrite16[DSP_START+i] = DSP::Write16;
-		hwRead32 [DSP_START+i] = DSP::Read32;
-		hwWrite32[DSP_START+i] = DSP::Write32;
-	}
-
-	hwRead32 [DVD_START] = DVDInterface::Read32;
-	hwWrite32[DVD_START] = DVDInterface::Write32;
-
-	hwRead32 [SI_START] = SerialInterface::Read32;
-	hwWrite32[SI_START] = SerialInterface::Write32;
-
-	hwRead32 [EI_START] = ExpansionInterface::Read32;
-	hwWrite32[EI_START] = ExpansionInterface::Write32;
-
-	hwRead32 [AUDIO_START] = AudioInterface::Read32;
-	hwWrite32[AUDIO_START] = AudioInterface::Write32;
-
-	hwWrite8 [GP_START] = GPFifo::Write8;
-	hwWrite16[GP_START] = GPFifo::Write16;
-	hwWrite32[GP_START] = GPFifo::Write32;
-	hwWrite64[GP_START] = GPFifo::Write64;
-}
-
-
-void InitHWMemFuncsWii()
-{
-	for (int i = 0; i < NUMHWMEMFUN; i++)
-	{
-		hwWrite8 [i] = HW_Default_Write<u8>;
-		hwWrite16[i] = HW_Default_Write<u16>;
-		hwWrite32[i] = HW_Default_Write<u32>;
-		hwWrite64[i] = HW_Default_Write<u64>;
-		hwRead8  [i] = HW_Default_Read<u8&>;
-		hwRead16 [i] = HW_Default_Read<u16&>;
-		hwRead32 [i] = HW_Default_Read<u32&>;
-		hwRead64 [i] = HW_Default_Read<u64&>;
-
-		hwWriteWii8 [i] = HW_Default_Write<u8>;
-		hwWriteWii16[i] = HW_Default_Write<u16>;
-		hwWriteWii32[i] = HW_Default_Write<u32>;
-		hwWriteWii64[i] = HW_Default_Write<u64>;
-		hwReadWii8  [i] = HW_Default_Read<u8&>;
-		hwReadWii16 [i] = HW_Default_Read<u16&>;
-		hwReadWii32 [i] = HW_Default_Read<u32&>;
-		hwReadWii64 [i] = HW_Default_Read<u64&>;
-	}
-
-	// MI, PI, DSP are still mapped to 0xCCxxxxxx
-	for (int i = 0; i < BLOCKSIZE; i++)
-	{
-		hwRead16 [CP_START+i] = g_video_backend->Video_CPRead16();
-		hwWrite16[CP_START+i] = g_video_backend->Video_CPWrite16();
-
-		hwRead16 [PE_START+i] = g_video_backend->Video_PERead16();
-		hwWrite16[PE_START+i] = g_video_backend->Video_PEWrite16();
-		hwWrite32[PE_START+i] = g_video_backend->Video_PEWrite32();
-
-		hwRead16 [PI_START+i] = ProcessorInterface::Read16;
-		hwRead32 [PI_START+i] = ProcessorInterface::Read32;
-		hwWrite32[PI_START+i] = ProcessorInterface::Write32;
-
-		hwRead8  [VI_START+i] = VideoInterface::Read8;
-		hwRead16 [VI_START+i] = VideoInterface::Read16;
-		hwRead32 [VI_START+i] = VideoInterface::Read32;
-		hwWrite16[VI_START+i] = VideoInterface::Write16;
-		hwWrite32[VI_START+i] = VideoInterface::Write32;
-
-		hwRead16 [MI_START+i] = MemoryInterface::Read16;
-		hwRead32 [MI_START+i] = MemoryInterface::Read32;
-		hwWrite32[MI_START+i] = MemoryInterface::Write32;
-		hwWrite16[MI_START+i] = MemoryInterface::Write16;
-
-		hwRead16 [DSP_START+i] = DSP::Read16;
-		hwWrite16[DSP_START+i] = DSP::Write16;
-		hwRead32 [DSP_START+i] = DSP::Read32;
-		hwWrite32[DSP_START+i] = DSP::Write32;
-	}
-
-	hwWrite8 [GP_START] = GPFifo::Write8;
-	hwWrite16[GP_START] = GPFifo::Write16;
-	hwWrite32[GP_START] = GPFifo::Write32;
-	hwWrite64[GP_START] = GPFifo::Write64;
-
-	for (int i = 0; i < BLOCKSIZE; i++)
-	{
-		hwReadWii32[WII_IPC_START+i] = WII_IPCInterface::Read32;
-		hwWriteWii32[WII_IPC_START+i] = WII_IPCInterface::Write32;
-	}
-
-	hwRead32	[DVD_START] = DVDInterface::Read32;
-	hwReadWii32	[DVD_START] = DVDInterface::Read32;
-	hwWrite32	[DVD_START] = DVDInterface::Write32;
-	hwWriteWii32[DVD_START] = DVDInterface::Write32;
-
-	hwRead32	[SI_START] = SerialInterface::Read32;
-	hwReadWii32	[SI_START] = SerialInterface::Read32;
-	hwWrite32	[SI_START] = SerialInterface::Write32;
-	hwWriteWii32[SI_START] = SerialInterface::Write32;
-
-	hwRead32	[EI_START] = ExpansionInterface::Read32;
-	hwReadWii32	[EI_START] = ExpansionInterface::Read32;
-	hwWrite32	[EI_START] = ExpansionInterface::Write32;
-	hwWriteWii32[EI_START] = ExpansionInterface::Write32;
-
-	// [F|RES] i thought this doesn't exist anymore
-	hwRead32	[AUDIO_START] = AudioInterface::Read32;
-	hwReadWii32	[AUDIO_START] = AudioInterface::Read32;
-	hwWrite32	[AUDIO_START] = AudioInterface::Write32;
-	hwWriteWii32[AUDIO_START] = AudioInterface::Write32;
-}
-
-writeFn32 GetHWWriteFun32(const u32 _Address)
-{
-	return hwWrite32[(_Address >> HWSHIFT) & (NUMHWMEMFUN-1)];
-}
-
-bool IsInitialized()
-{
-	return m_IsInitialized;
-}
-
-
-// We don't declare the IO region in here since its handled by other means.
-static const MemoryView views[] =
-{
-	{&m_pRAM,      &m_pPhysicalRAM,          0x00000000, RAM_SIZE, 0},
-	{NULL,         &m_pVirtualCachedRAM,     0x80000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
-	{NULL,         &m_pVirtualUncachedRAM,   0xC0000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
-
-//  Don't map any memory for the EFB. We want all access to this area to go
-//  through the hardware access handlers.
-#ifndef _M_X64
-//	{&m_pEFB,      &m_pVirtualEFB,           0xC8000000, EFB_SIZE, 0},
-#endif
-	{&m_pL1Cache,  &m_pVirtualL1Cache,       0xE0000000, L1_CACHE_SIZE, 0},
-
-	{&m_pFakeVMEM, &m_pVirtualFakeVMEM,      0x7E000000, FAKEVMEM_SIZE, MV_FAKE_VMEM},
-
-	{&m_pEXRAM,    &m_pPhysicalEXRAM,        0x10000000, EXRAM_SIZE, MV_WII_ONLY},
-	{NULL,         &m_pVirtualCachedEXRAM,   0x90000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
-	{NULL,         &m_pVirtualUncachedEXRAM, 0xD0000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
-};
-static const int num_views = sizeof(views) / sizeof(MemoryView);
-
-void Init()
-{
-	bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
-	bFakeVMEM = SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack == 1;
-	bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
-
-	u32 flags = 0;
-	if (wii) flags |= MV_WII_ONLY;
-	if (bFakeVMEM) flags |= MV_FAKE_VMEM;
-	base = MemoryMap_Setup(views, num_views, flags, &g_arena);
-
-	if (wii)
-		InitHWMemFuncsWii();
-	else
-		InitHWMemFuncs();
-
-	INFO_LOG(MEMMAP, "Memory system initialized. RAM at %p (mirrors at 0 @ %p, 0x80000000 @ %p , 0xC0000000 @ %p)",
-		m_pRAM, m_pPhysicalRAM, m_pVirtualCachedRAM, m_pVirtualUncachedRAM);
-	m_IsInitialized = true;
-}
-
-void DoState(PointerWrap &p)
-{
-	bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
-	p.DoArray(m_pPhysicalRAM, RAM_SIZE);
-//	p.DoArray(m_pVirtualEFB, EFB_SIZE);
-	p.DoArray(m_pVirtualL1Cache, L1_CACHE_SIZE);
-	p.DoMarker("Memory RAM");
-	if (bFakeVMEM)
-		p.DoArray(m_pVirtualFakeVMEM, FAKEVMEM_SIZE);
-	p.DoMarker("Memory FakeVMEM");
-	if (wii)
-		p.DoArray(m_pEXRAM, EXRAM_SIZE);
-	p.DoMarker("Memory EXRAM");
-}
-
-void Shutdown()
-{
-	m_IsInitialized = false;
-	u32 flags = 0;
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) flags |= MV_WII_ONLY;
-	if (bFakeVMEM) flags |= MV_FAKE_VMEM;
-	MemoryMap_Shutdown(views, num_views, flags, &g_arena);
-	g_arena.ReleaseSpace();
-	base = NULL;
-	INFO_LOG(MEMMAP, "Memory system shut down.");
-}
-
-void Clear()
-{
-	if (m_pRAM)
-		memset(m_pRAM, 0, RAM_SIZE);
-	if (m_pL1Cache)
-		memset(m_pL1Cache, 0, L1_CACHE_SIZE);
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && m_pEXRAM)
-		memset(m_pEXRAM, 0, EXRAM_SIZE);
-}
-
-bool AreMemoryBreakpointsActivated()
-{
-#ifndef ENABLE_MEM_CHECK
-	return false;
-#else
-	return true;
-#endif
-}
-
-u32 Read_Instruction(const u32 em_address)
-{
-	UGeckoInstruction inst = ReadUnchecked_U32(em_address);	
-	return inst.hex;
-}
-
-void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t _iSize)
-{
-	memcpy(GetPointer(_Address), _pData, _iSize);
-}
-
-void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
-{
-	u8 *ptr = GetPointer(_Address);
-	if (ptr != NULL)
-	{
-		memset(ptr,_iValue,_iLength);
-	}
-	else
-	{
-		for (u32 i = 0; i < _iLength; i++)
-			Write_U8(_iValue, _Address + i);
-	}
-}
-
-void DMA_LCToMemory(const u32 _MemAddr, const u32 _CacheAddr, const u32 _iNumBlocks)
-{
-	const u8 *src = GetCachePtr() + (_CacheAddr & 0x3FFFF);
-	u8 *dst = GetPointer(_MemAddr);
-
-	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
-	{
-		memcpy(dst, src, 32 * _iNumBlocks);
-	}
-	else
-	{
-		for (u32 i = 0; i < 32 * _iNumBlocks; i++)
-		{
-			u8 Temp = Read_U8(_CacheAddr + i);
-			Write_U8(Temp, _MemAddr + i);
-		}
-	}
-}
-
-void DMA_MemoryToLC(const u32 _CacheAddr, const u32 _MemAddr, const u32 _iNumBlocks)
-{
-	const u8 *src = GetPointer(_MemAddr);
-	u8 *dst = GetCachePtr() + (_CacheAddr & 0x3FFFF);
-
-	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
-	{
-		memcpy(dst, src, 32 * _iNumBlocks);
-	}
-	else
-	{
-		for (u32 i = 0; i < 32 * _iNumBlocks; i++)
-		{
-			u8 Temp = Read_U8(_MemAddr + i);
-			Write_U8(Temp, _CacheAddr + i);
-		}
-	}
-}
-
-void ReadBigEData(u8 *data, const u32 em_address, const u32 size)
-{
-	u8 *src = GetPointer(em_address);
-	memcpy(data, src, size);
-}
-
-void GetString(std::string& _string, const u32 em_address)
-{
-	char stringBuffer[2048];
-	char *string = stringBuffer;
-	char c;
-	u32 addr = em_address;
-	while ((c = Read_U8(addr)))
-	{
-		*string++ = c;
-		addr++;
-	}
-	*string++ = '\0';
-	_string = stringBuffer;
-}
-
-// GetPointer must always return an address in the bottom 32 bits of address space, so that 64-bit
-// programs don't have problems directly addressing any part of memory.
-// TODO re-think with respect to other BAT setups...
-u8 *GetPointer(const u32 _Address)
-{
-	switch (_Address >> 28)
-	{
-	case 0x0:
-	case 0x8:
-		if ((_Address & 0xfffffff) < REALRAM_SIZE)
-			return m_pPhysicalRAM + (_Address & RAM_MASK);
-	case 0xc:
-		switch (_Address >> 24)
-		{
-		case 0xcc:
-		case 0xcd:
-			_dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work");
-		case 0xc8:
-			// EFB. We don't want to return a pointer here since we have no memory mapped for it.
-			break;
-
-		default:
-			if ((_Address & 0xfffffff) < REALRAM_SIZE)
-				return m_pPhysicalRAM + (_Address & RAM_MASK);
-		}
-
-	case 0x1:
-	case 0x9:
-	case 0xd:
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		{
-			if ((_Address & 0xfffffff) < EXRAM_SIZE)
-				return m_pPhysicalEXRAM + (_Address & EXRAM_MASK);
-		}
-		else
-			break;
-
-	case 0xe:
-		if (_Address < (0xE0000000 + L1_CACHE_SIZE))
-			return GetCachePtr() + (_Address & L1_CACHE_MASK);
-		else
-			break;
-
-	default:
-		if (bFakeVMEM)
-			return m_pVirtualFakeVMEM + (_Address & FAKEVMEM_MASK);
-	}
-
-	ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", _Address, PC, LR);
-
-	return NULL;
-}
-
-
-bool IsRAMAddress(const u32 addr, bool allow_locked_cache, bool allow_fake_vmem)
-{
-	switch ((addr >> 24) & 0xFC)
-	{
-	case 0x00:
-	case 0x80:
-	case 0xC0:
-		if ((addr & 0x1FFFFFFF) < RAM_SIZE)
-			return true;
-		else
-			return false;
-	case 0x10:
-	case 0x90:
-	case 0xD0:
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && (addr & 0x0FFFFFFF) < EXRAM_SIZE)
-			return true;
-		else
-			return false;
-	case 0xE0:
-		if (allow_locked_cache && addr - 0xE0000000 < L1_CACHE_SIZE)
-			return true;
-		else
-			return false;
-	case 0x7C:
-		if (allow_fake_vmem && bFakeVMEM && addr >= 0x7E000000)
-			return true;
-		else
-			return false;
-	default:
-		return false;
-	}
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h
deleted file mode 100644
index 689e5a57dd..0000000000
--- a/Source/Core/Core/Src/HW/Memmap.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _MEMMAP_H
-#define _MEMMAP_H
-
-// Includes
-#include <string>
-#include "Common.h"
-
-// Enable memory checks in the Debug/DebugFast builds, but NOT in release
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	#define ENABLE_MEM_CHECK
-#endif
-
-// Global declarations
-class PointerWrap;
-
-typedef void (*writeFn8 )(const u8, const u32);
-typedef void (*writeFn16)(const u16,const u32);
-typedef void (*writeFn32)(const u32,const u32);
-typedef void (*writeFn64)(const u64,const u32);
-
-typedef void (*readFn8 )(u8&,  const u32);
-typedef void (*readFn16)(u16&, const u32);
-typedef void (*readFn32)(u32&, const u32);
-typedef void (*readFn64)(u64&, const u32);
-
-namespace Memory
-{
-// Base is a pointer to the base of the memory map. Yes, some MMU tricks
-// are used to set up a full GC or Wii memory map in process memory.  on
-// 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that
-// some things are mirrored too many times, but eh... it works.
-
-// In 64-bit, this might point to "high memory" (above the 32-bit limit),
-// so be sure to load it into a 64-bit register.
-extern u8 *base; 
-
-// These are guaranteed to point to "low memory" addresses (sub-32-bit).
-extern u8 *m_pRAM;
-extern u8 *m_pEXRAM;
-extern u8 *m_pL1Cache;
-extern u8 *m_pVirtualFakeVMEM;
-
-enum
-{
-	// RAM_SIZE is the amount allocated by the emulator, whereas REALRAM_SIZE is
-	// what will be reported in lowmem, and thus used by emulated software.
-	// Note: Writing to lowmem is done by IPL. If using retail IPL, it will
-	// always be set to 24MB.
-	REALRAM_SIZE	= 0x1800000,
-	RAM_SIZE		= ROUND_UP_POW2(REALRAM_SIZE),
-	RAM_MASK		= RAM_SIZE - 1,
-	FAKEVMEM_SIZE	= 0x2000000,
-	FAKEVMEM_MASK	= FAKEVMEM_SIZE - 1,
-	L1_CACHE_SIZE	= 0x40000,
-	L1_CACHE_MASK	= L1_CACHE_SIZE - 1,
-	EFB_SIZE		= 0x200000,
-	EFB_MASK		= EFB_SIZE - 1,
-	IO_SIZE			= 0x10000,
-	EXRAM_SIZE		= 0x4000000,
-	EXRAM_MASK		= EXRAM_SIZE - 1,
-
-	ADDR_MASK_HW_ACCESS	= 0x0c000000,
-	ADDR_MASK_MEM1		= 0x20000000,
-
-#ifdef _M_IX86
-	MEMVIEW32_MASK  = 0x3FFFFFFF,
-#endif
-};
-
-// Init and Shutdown
-bool IsInitialized();
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-void Clear();
-bool AreMemoryBreakpointsActivated();
-
-// ONLY for use by GUI
-u8 ReadUnchecked_U8(const u32 _Address);
-u32 ReadUnchecked_U32(const u32 _Address);
-
-void WriteUnchecked_U8(const u8 _Data, const u32 _Address);
-void WriteUnchecked_U32(const u32 _Data, const u32 _Address);
-
-void InitHWMemFuncs();
-void InitHWMemFuncsWii();
-
-bool IsRAMAddress(const u32 addr, bool allow_locked_cache = false, bool allow_fake_vmem = false);
-writeFn32 GetHWWriteFun32(const u32 _Address);
-
-inline u8* GetCachePtr() {return m_pL1Cache;}
-inline u8* GetMainRAMPtr() {return m_pRAM;}
-inline u32 ReadFast32(const u32 _Address)
-{
-#ifdef _M_IX86
-	return Common::swap32(*(u32 *)(base + (_Address & MEMVIEW32_MASK)));  // ReadUnchecked_U32(_Address);
-#elif defined(_M_X64)
-	return Common::swap32(*(u32 *)(base + _Address));
-#endif
-}
-
-// used by interpreter to read instructions, uses iCache
-u32 Read_Opcode(const u32 _Address);
-// this is used by Debugger a lot. 
-// For now, just reads from memory!
-u32 Read_Instruction(const u32 _Address);
-
-
-// For use by emulator
-
-// Read and write functions
-#define NUMHWMEMFUN 64
-#define HWSHIFT 10
-#define HW_MASK 0x3FF
-
-u8  Read_U8(const u32 _Address);
-u16 Read_U16(const u32 _Address);
-u32 Read_U32(const u32 _Address);
-u64 Read_U64(const u32 _Address);
-
-// Useful helper functions, used by ARM JIT
-float Read_F32(const u32 _Address);
-double Read_F64(const u32 _Address);
-
-// used by JIT. Return zero-extended 32bit values
-u32 Read_U8_ZX(const u32 _Address);
-u32 Read_U16_ZX(const u32 _Address);
-
-// used by JIT (Jit64::lXz)
-u32 EFB_Read(const u32 addr);
-
-void Write_U8(const u8 _Data, const u32 _Address);
-void Write_U16(const u16 _Data, const u32 _Address);
-void Write_U32(const u32 _Data, const u32 _Address);
-void Write_U64(const u64 _Data, const u32 _Address);
-
-void Write_U16_Swap(const u16 _Data, const u32 _Address);
-void Write_U32_Swap(const u32 _Data, const u32 _Address);
-void Write_U64_Swap(const u64 _Data, const u32 _Address);
-
-// Useful helper functions, used by ARM JIT
-void Write_F64(const double _Data, const u32 _Address);
-
-void WriteHW_U32(const u32 _Data, const u32 _Address);
-void GetString(std::string& _string, const u32 _Address);
-
-void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t size);
-void ReadBigEData(u8 *_pDest, const u32 _Address, const u32 size);
-u8* GetPointer(const u32 _Address);
-void DMA_LCToMemory(const u32 _iMemAddr, const u32 _iCacheAddr, const u32 _iNumBlocks);
-void DMA_MemoryToLC(const u32 _iCacheAddr, const u32 _iMemAddr, const u32 _iNumBlocks);
-void Memset(const u32 _Address, const u8 _Data, const u32 _iLength);
-
-// TLB functions
-void SDRUpdated();
-enum XCheckTLBFlag
-{
-	FLAG_NO_EXCEPTION,
-	FLAG_READ,
-	FLAG_WRITE,
-	FLAG_OPCODE,
-};
-u32 TranslateAddress(u32 _Address, XCheckTLBFlag _Flag);
-void InvalidateTLBEntry(u32 _Address);
-void GenerateDSIException(u32 _EffectiveAdress, bool _bWrite);
-void GenerateISIException(u32 _EffectiveAdress);
-extern u32 pagetable_base;
-extern u32 pagetable_hashmask;
-
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
deleted file mode 100644
index 47872e3cd0..0000000000
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ /dev/null
@@ -1,1018 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "Atomic.h"
-
-#include "GPFifo.h"
-#include "Memmap.h"
-#include "WII_IOB.h"
-#include "../Core.h"
-#include "../PowerPC/PowerPC.h"
-#include "VideoBackendBase.h"
-
-#ifdef USE_GDBSTUB
-#include "../PowerPC/GDBStub.h"
-#endif
-
-namespace Memory
-{
-
-// EFB RE
-/*
-GXPeekZ
-80322de8: rlwinm	r0, r3, 2, 14, 29 (0003fffc)   a =  x << 2 & 0x3fffc      
-80322dec: oris	r0, r0, 0xC800                     a |= 0xc8000000
-80322df0: rlwinm	r3, r0, 0, 20, 9 (ffc00fff)    x = a & 0xffc00fff
-80322df4: rlwinm	r0, r4, 12, 4, 19 (0ffff000)   a = (y << 12) & 0x0ffff000; 
-80322df8: or	r0, r3, r0                         a |= x;
-80322dfc: rlwinm	r0, r0, 0, 10, 7 (ff3fffff)    a &= 0xff3fffff
-80322e00: oris	r3, r0, 0x0040                     x = a | 0x00400000
-80322e04: lwz	r0, 0 (r3)						   r0 = *r3
-80322e08: stw	r0, 0 (r5)						   z = 
-80322e0c: blr	
-*/
-
-
-// =================================
-// From Memmap.cpp
-// ----------------
-
-// Pointers to low memory
-extern u8 *m_pFakeVMEM;
-extern u8 *m_pEXRAM;  // Wii
-extern u8 *m_pEFB;
-
-// Init
-extern bool m_IsInitialized;
-extern bool bFakeVMEM;
-
-// Read and write shortcuts
-
-// It appears that some clever games use stfd to write 64 bits to the fifo. Hence the hwWrite64.
-
-extern writeFn8  hwWrite8 [NUMHWMEMFUN];
-extern writeFn16 hwWrite16[NUMHWMEMFUN];
-extern writeFn32 hwWrite32[NUMHWMEMFUN];
-extern writeFn64 hwWrite64[NUMHWMEMFUN];
-
-extern readFn8   hwRead8 [NUMHWMEMFUN];
-extern readFn16  hwRead16[NUMHWMEMFUN];
-extern readFn32  hwRead32[NUMHWMEMFUN];
-
-extern writeFn8  hwWriteWii8 [NUMHWMEMFUN];
-extern writeFn16 hwWriteWii16[NUMHWMEMFUN];
-extern writeFn32 hwWriteWii32[NUMHWMEMFUN];
-extern writeFn64 hwWriteWii64[NUMHWMEMFUN];
-
-extern readFn8   hwReadWii8 [NUMHWMEMFUN];
-extern readFn16  hwReadWii16[NUMHWMEMFUN];
-extern readFn32  hwReadWii32[NUMHWMEMFUN];
-
-// Overloaded byteswap functions, for use within the templated functions below.
-inline u8 bswap(u8 val)   {return val;}
-inline u16 bswap(u16 val) {return Common::swap16(val);}
-inline u32 bswap(u32 val) {return Common::swap32(val);}
-inline u64 bswap(u64 val) {return Common::swap64(val);}
-// =================
-
-
-// Read and write
-// ----------------
-// The read and write macros that direct us to the right functions
-
-// All these little inline functions are needed because we can't paste symbols together in templates
-// like we can in macros.
-inline void hwRead(u8 &var, u32 addr)  {hwRead8 [(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwRead(u16 &var, u32 addr) {hwRead16[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwRead(u32 &var, u32 addr) {hwRead32[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwRead(u64 &var, u32 addr) {PanicAlert("hwRead: There's no 64-bit HW read. %08x", addr);}
-
-inline void hwWrite(u8 var, u32 addr)  {hwWrite8[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWrite(u16 var, u32 addr) {hwWrite16[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWrite(u32 var, u32 addr) {hwWrite32[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWrite(u64 var, u32 addr) {hwWrite64[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-
-inline void hwReadWii(u8 &var, u32 addr)  {hwReadWii8 [(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwReadWii(u16 &var, u32 addr) {hwReadWii16[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwReadWii(u32 &var, u32 addr) {hwReadWii32[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwReadWii(u64 &var, u32 addr) {PanicAlert("hwReadWii: There's no 64-bit HW read. %08x", addr);}
-
-inline void hwWriteWii(u8 var, u32 addr)  {hwWriteWii8[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWriteWii(u16 var, u32 addr) {hwWriteWii16[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWriteWii(u32 var, u32 addr) {hwWriteWii32[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-inline void hwWriteWii(u64 var, u32 addr) {hwWriteWii64[(addr>>HWSHIFT) & (NUMHWMEMFUN-1)](var, addr);}
-
-inline void hwReadIOBridge(u8 &var, u32 addr)  {WII_IOBridge::Read8(var, addr);}
-inline void hwReadIOBridge(u16 &var, u32 addr) {WII_IOBridge::Read16(var, addr);}
-inline void hwReadIOBridge(u32 &var, u32 addr) {WII_IOBridge::Read32(var, addr);}
-inline void hwReadIOBridge(u64 &var, u32 addr) {PanicAlert("hwReadIOBridge: There's no 64-bit HW read. %08x", addr);}
-
-inline void hwWriteIOBridge(u8 var, u32 addr)  {WII_IOBridge::Write8(var, addr);}
-inline void hwWriteIOBridge(u16 var, u32 addr) {WII_IOBridge::Write16(var, addr);}
-inline void hwWriteIOBridge(u32 var, u32 addr) {WII_IOBridge::Write32(var, addr);}
-inline void hwWriteIOBridge(u64 var, u32 addr) {PanicAlert("hwWriteIOBridge: There's no 64-bit HW write. %08x", addr);}
-
-// Nasty but necessary. Super Mario Galaxy pointer relies on this stuff.
-u32 EFB_Read(const u32 addr) 
-{
-	u32 var = 0;
-	// Convert address to coordinates. It's possible that this should be done
-	// differently depending on color depth, especially regarding PEEK_COLOR.
-	int x = (addr & 0xfff) >> 2;
-	int y = (addr >> 12) & 0x3ff;
-
-	if (addr & 0x00400000) {
-		var = g_video_backend->Video_AccessEFB(PEEK_Z, x, y, 0);
-		DEBUG_LOG(MEMMAP, "EFB Z Read @ %i, %i\t= 0x%08x", x, y, var);
-	} else {
-		var = g_video_backend->Video_AccessEFB(PEEK_COLOR, x, y, 0);
-		DEBUG_LOG(MEMMAP, "EFB Color Read @ %i, %i\t= 0x%08x", x, y, var);
-	}
-
-	return var;
-}
-
-template <typename T>
-inline void ReadFromHardware(T &_var, const u32 em_address, const u32 effective_address, Memory::XCheckTLBFlag flag)
-{
-	// TODO: Figure out the fastest order of tests for both read and write (they are probably different).
-	if ((em_address & 0xC8000000) == 0xC8000000)
-	{
-		if (em_address < 0xcc000000)
-			_var = EFB_Read(em_address);
-		else if (em_address <= 0xcc009000)
-			hwRead(_var, em_address);
-		/* WIIMODE */
-		else if (((em_address & 0xFF000000) == 0xCD000000) &&
-			(em_address <= 0xcd009000))
-			hwReadWii(_var, em_address);
-		else if (((em_address & 0xFFF00000) == 0xCD800000) &&
-			(em_address <= 0xCD809000))
-			hwReadIOBridge(_var, em_address);
-		else
-		{
-			/* Disabled because the debugger makes trouble with */
-			/*_dbg_assert_(MEMMAP,0); */
-		}
-	}
-	else if (((em_address & 0xF0000000) == 0x80000000) ||
-		((em_address & 0xF0000000) == 0xC0000000) ||
-		((em_address & 0xF0000000) == 0x00000000))
-	{
-		_var = bswap((*(const T*)&m_pRAM[em_address & RAM_MASK]));
-	}
-	else if (m_pEXRAM && (((em_address & 0xF0000000) == 0x90000000) ||
-		((em_address & 0xF0000000) == 0xD0000000) ||
-		((em_address & 0xF0000000) == 0x10000000)))
-	{
-		_var = bswap((*(const T*)&m_pEXRAM[em_address & EXRAM_MASK]));
-	}
-	else if ((em_address >= 0xE0000000) && (em_address < (0xE0000000+L1_CACHE_SIZE)))
-	{
-		_var = bswap((*(const T*)&m_pL1Cache[em_address & L1_CACHE_MASK]));
-	}
-	else if ((bFakeVMEM && ((em_address &0xF0000000) == 0x70000000)) ||
-		(bFakeVMEM && ((em_address &0xF0000000) == 0x40000000)))
-	{
-		// fake VMEM
-		_var = bswap((*(const T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK]));
-	}
-	else
-	{
-		// MMU
-		u32 tlb_addr = TranslateAddress(em_address, flag);
-		if (tlb_addr == 0)
-		{
-			if (flag == FLAG_READ)
-			{
-				GenerateDSIException(em_address, false);
-			}
-		}
-		else
-		{
-			_var = bswap((*(const T*)&m_pRAM[tlb_addr & RAM_MASK]));
-		}
-	}
-}
-
-
-template <typename T>
-inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, Memory::XCheckTLBFlag flag)
-{
-	// First, let's check for FIFO writes, since they are probably the most common
-	// reason we end up in this function:
-	if (em_address == 0xCC008000)
-	{
-		switch (sizeof(T)) {
-		case 1:	GPFifo::Write8((u8)data, em_address); return;
-		case 2:	GPFifo::Write16((u16)data, em_address); return;
-		case 4:	GPFifo::Write32((u32)data, em_address); return;
-		case 8:	GPFifo::Write64((u64)data, em_address); return;
-		}
-	}
-	if ((em_address & 0xC8000000) == 0xC8000000)
-	{
-		if (em_address < 0xcc000000)
-		{
-			int x = (em_address & 0xfff) >> 2;
-			int y = (em_address >> 12) & 0x3ff;
-
-			// TODO figure out a way to send data without falling into the template trap
-			if (em_address & 0x00400000)
-			{
-				g_video_backend->Video_AccessEFB(POKE_Z, x, y, (u32)data);
-				DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %i, %i", (u32)data, x, y);
-			}
-			else
-			{
-				g_video_backend->Video_AccessEFB(POKE_COLOR, x, y,(u32)data);
-				DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %i, %i", (u32)data, x, y);
-			}
-			return;
-		}
-		else if (em_address <= 0xcc009000)
-		{
-			hwWrite(data, em_address);
-			return;
-		}
-		/* WIIMODE */
-		else if (((em_address & 0xFF000000) == 0xCD000000) &&
-			(em_address <= 0xcd009000))
-		{
-				hwWriteWii(data,em_address);
-				return;
-		}
-		else if (((em_address & 0xFFF00000) == 0xCD800000) &&
-			(em_address <= 0xCD809000))
-		{
-				hwWriteIOBridge(data,em_address);
-				return;
-		}
-		else
-		{
-			ERROR_LOG(MEMMAP, "hwwrite [%08x] := %08x (PC: %08x)", em_address, (u32)data, PC);
-			_dbg_assert_msg_(MEMMAP,0,"Memory - Unknown HW address %08x", em_address);
-		}
-	}
-	else if (((em_address & 0xF0000000) == 0x80000000) ||
-		((em_address & 0xF0000000) == 0xC0000000) ||
-		((em_address & 0xF0000000) == 0x00000000))
-	{
-		*(T*)&m_pRAM[em_address & RAM_MASK] = bswap(data);
-		return;
-	}
-	else if (((em_address & 0xF0000000) == 0x90000000) ||
-		((em_address & 0xF0000000) == 0xD0000000) ||
-		((em_address & 0xF0000000) == 0x10000000))
-	{
-		*(T*)&m_pEXRAM[em_address & EXRAM_MASK] = bswap(data);
-		return;
-	}
-	else if ((em_address >= 0xE0000000) && (em_address < (0xE0000000+L1_CACHE_SIZE)))
-	{
-		*(T*)&m_pL1Cache[em_address & L1_CACHE_MASK] = bswap(data);
-		return;
-	}
-	else if ((bFakeVMEM && ((em_address &0xF0000000) == 0x70000000)) ||
-		(bFakeVMEM && ((em_address &0xF0000000) == 0x40000000)))
-	{
-		// fake VMEM
-		*(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data);
-	}
-	else
-	{
-		// MMU
-		u32 tlb_addr = TranslateAddress(em_address, flag);
-		if (tlb_addr == 0)
-		{
-			if (flag == FLAG_WRITE)
-			{
-				GenerateDSIException(em_address, true);
-			}
-		}
-		else
-		{
-			*(T*)&m_pRAM[tlb_addr & RAM_MASK] = bswap(data);
-		}
-	}
-}
-// =====================
-
-
-// =================================
-/* These functions are primarily called by the Interpreter functions and are routed to the correct
-   location through ReadFromHardware and WriteToHardware */
-// ----------------
-u32 Read_Opcode(u32 _Address)
-{
-	if (_Address == 0x00000000)
-	{
-		// FIXME use assert?
-		PanicAlert("Program tried to read an opcode from [00000000]. It has crashed.");
-		return 0x00000000;
-	}
-
-	if (Core::g_CoreStartupParameter.bMMU && 
-		!Core::g_CoreStartupParameter.iTLBHack && 
-		(_Address & ADDR_MASK_MEM1))
-	{
-		// TODO: Check for MSR instruction address translation flag before translating
-		u32 tlb_addr = Memory::TranslateAddress(_Address, FLAG_OPCODE);
-		if (tlb_addr == 0)
-		{
-			GenerateISIException(_Address);
-			return 0;
-		}
-		else
-		{
-			_Address = tlb_addr;
-		}
-	}
-
-	return PowerPC::ppcState.iCache.ReadInstruction(_Address);
-}
-
-u8 Read_U8(const u32 _Address)
-{
-	u8 _var = 0;
-	ReadFromHardware<u8>(_var, _Address, _Address, FLAG_READ);
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _var, _Address, false, 1, PC);
-	}
-#endif
-	return (u8)_var;
-}
-
-u16 Read_U16(const u32 _Address)
-{
-	u16 _var = 0;
-	ReadFromHardware<u16>(_var, _Address, _Address, FLAG_READ);
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _var, _Address, false, 2, PC);
-	}
-#endif
-	return (u16)_var;
-}
-
-u32 Read_U32(const u32 _Address)
-{
-	u32 _var = 0;
-	ReadFromHardware<u32>(_var, _Address, _Address, FLAG_READ);
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _var, _Address, false, 4, PC);
-	}
-#endif
-	return _var;
-}
-
-u64 Read_U64(const u32 _Address)
-{
-	u64 _var = 0;
-	ReadFromHardware<u64>(_var, _Address, _Address, FLAG_READ);
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, (u32)_var, _Address, false, 8, PC);
-	}
-#endif
-	return _var;
-}
-
-double Read_F64(const u32 _Address)
-{
-	union
-	{
-		u64 i;
-		double d;
-	} cvt;
-	
-	cvt.i = Read_U64(_Address);
-	return cvt.d;
-}
-
-float Read_F32(const u32 _Address)
-{
-	union
-	{
-		u32 i;
-		float d;
-	} cvt;
-
-	cvt.i = Read_U32(_Address);
-	return cvt.d;
-}
-
-u32 Read_U8_ZX(const u32 _Address)
-{
-	return (u32)Read_U8(_Address);
-}
-
-u32 Read_U16_ZX(const u32 _Address)
-{
-	return (u32)Read_U16(_Address);
-}
-
-void Write_U8(const u8 _Data, const u32 _Address)	
-{
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _Data,_Address,true,1,PC);
-	}
-#endif
-	WriteToHardware<u8>(_Address, _Data, _Address, FLAG_WRITE);
-}
-
-
-void Write_U16(const u16 _Data, const u32 _Address)
-{
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _Data,_Address,true,2,PC);
-	}
-#endif
-
-	WriteToHardware<u16>(_Address, _Data, _Address, FLAG_WRITE);
-}
-void Write_U16_Swap(const u16 _Data, const u32 _Address) {
-	Write_U16(Common::swap16(_Data), _Address);
-}
-
-
-void Write_U32(const u32 _Data, const u32 _Address)
-{	
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, _Data,_Address,true,4,PC);
-	}
-#endif
-	WriteToHardware<u32>(_Address, _Data, _Address, FLAG_WRITE);
-}
-void Write_U32_Swap(const u32 _Data, const u32 _Address)
-{
-	Write_U32(Common::swap32(_Data), _Address);
-}
-
-void Write_U64(const u64 _Data, const u32 _Address)
-{
-#ifdef ENABLE_MEM_CHECK
-	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
-	if (mc)
-	{
-		mc->numHits++;
-		mc->Action(&PowerPC::debug_interface, (u32)_Data,_Address,true,8,PC);
-	}
-#endif
-
-	WriteToHardware<u64>(_Address, _Data, _Address + 4, FLAG_WRITE);
-}
-void Write_U64_Swap(const u64 _Data, const u32 _Address) {
-	Write_U64(Common::swap64(_Data), _Address);
-}
-
-void Write_F64(const double _Data, const u32 _Address)
-{
-	union
-	{
-		u64 i;
-		double d;
-	} cvt;
-	cvt.d = _Data;
-	Write_U64(cvt.i, _Address);
-}
-u8 ReadUnchecked_U8(const u32 _Address)
-{    
-	u8 _var = 0;
-	ReadFromHardware<u8>(_var, _Address, _Address, FLAG_NO_EXCEPTION);
-	return _var;
-}
-
-
-u32 ReadUnchecked_U32(const u32 _Address)
-{
-	u32 _var = 0;
-	ReadFromHardware<u32>(_var, _Address, _Address, FLAG_NO_EXCEPTION);
-	return _var;
-}
-
-void WriteUnchecked_U8(const u8 _iValue, const u32 _Address)
-{
-	WriteToHardware<u8>(_Address, _iValue, _Address, FLAG_NO_EXCEPTION);
-}
-
-
-void WriteUnchecked_U32(const u32 _iValue, const u32 _Address)
-{
-	WriteToHardware<u32>(_Address, _iValue, _Address, FLAG_NO_EXCEPTION);
-}
-
-// *********************************************************************************
-// Warning: Test Area
-//
-// This code is for TESTING and it works in interpreter mode ONLY. Some games (like 
-// COD iirc) work thanks to this basic TLB emulation.
-// It is just a small hack and we have never spend enough time to finalize it.
-// Cheers PearPC!
-//
-// *********************************************************************************
-
-/*
-*	PearPC
-*	ppc_mmu.cc
-*
-*	Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
-*
-*	This program is free software; you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License version 2 as
-*	published by the Free Software Foundation.
-*
-*	This program is distributed in the hope that it will be useful,
-*	but WITHOUT ANY WARRANTY; without even the implied warranty of
-*	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*	GNU General Public License for more details.
-*
-*	You should have received a copy of the GNU General Public License
-*	along with this program; if not, write to the Free Software
-*	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-#define PPC_EXC_DSISR_PAGE (1<<30)
-#define PPC_EXC_DSISR_PROT (1<<27)
-#define PPC_EXC_DSISR_STORE (1<<25) 
-
-#define SDR1_HTABORG(v) (((v)>>16)&0xffff)
-#define SDR1_HTABMASK(v) ((v)&0x1ff)
-#define SDR1_PAGETABLE_BASE(v) ((v)&0xffff) 
-#define SR_T  (1<<31)
-#define SR_Ks (1<<30)
-#define SR_Kp (1<<29)
-#define SR_N  (1<<28)
-#define SR_VSID(v)       ((v)&0xffffff)
-#define SR_BUID(v)       (((v)>>20)&0x1ff)
-#define SR_CNTRL_SPEC(v) ((v)&0xfffff) 
-
-#define EA_SR(v)         (((v)>>28)&0xf) 
-#define EA_PageIndex(v)  (((v)>>12)&0xffff) 
-#define EA_Offset(v)	((v)&0xfff)
-#define EA_API(v)		(((v)>>22)&0x3f) 
-
-#define PA_RPN(v)        (((v)>>12)&0xfffff)
-#define PA_Offset(v)     ((v)&0xfff) 
-
-#define PTE1_V       (1<<31)
-#define PTE1_VSID(v) (((v)>>7)&0xffffff)
-#define PTE1_H       (1<<6)
-#define PTE1_API(v)  ((v)&0x3f)
-
-#define PTE2_RPN(v)  ((v)&0xfffff000)
-#define PTE2_R       (1<<8)
-#define PTE2_C       (1<<7)
-#define PTE2_WIMG(v) (((v)>>3)&0xf)
-#define PTE2_PP(v)   ((v)&3)
-
-// Hey! these duplicate a structure in Gekko.h
-union UPTE1
-{
-	struct 
-	{
-		u32 API    : 6;
-		u32 H      : 1;
-		u32 VSID   : 24;
-		u32 V      : 1;
-	};
-	u32 Hex;
-};
-
-union UPTE2
-{
-	struct 
-	{
-		u32 PP     : 2;
-		u32        : 1;
-		u32 WIMG   : 4;
-		u32 C      : 1;
-		u32 R      : 1;
-		u32        : 3;
-		u32 RPN    : 20;
-	};
-	u32 Hex;
-};
-
-void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite)
-{
-	if (_bWrite)
-		PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE | PPC_EXC_DSISR_STORE;
-	else
-		PowerPC::ppcState.spr[SPR_DSISR] = PPC_EXC_DSISR_PAGE;
-
-	PowerPC::ppcState.spr[SPR_DAR] = _EffectiveAddress;
-
-	Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DSI);
-}
-
-
-void GenerateISIException(u32 _EffectiveAddress)
-{
-	// Address of instruction could not be translated
-	NPC = _EffectiveAddress;
-
-	Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_ISI);
-}
-
-
-void SDRUpdated()
-{
-	u32 htabmask = SDR1_HTABMASK(PowerPC::ppcState.spr[SPR_SDR]);
-	u32 x = 1;
-	u32 xx = 0;
-	int n = 0;
-	while ((htabmask & x) && (n < 9)) 
-	{
-		n++;
-		xx|=x;
-		x<<=1;
-	}
-	if (htabmask & ~xx) 
-	{
-		return;
-	}
-	u32 htaborg = SDR1_HTABORG(PowerPC::ppcState.spr[SPR_SDR]);
-	if (htaborg & xx) 
-	{
-		return;
-	}
-	PowerPC::ppcState.pagetable_base = htaborg<<16;
-	PowerPC::ppcState.pagetable_hashmask = ((xx<<10)|0x3ff);
-} 
-
-
-// TLB cache
-//#define FAST_TLB_CACHE
-
-#define TLB_SIZE 128
-#define TLB_WAYS 2
-#define NUM_TLBS 2
-
-#define HW_PAGE_SIZE 4096
-#define HW_PAGE_INDEX_SHIFT 12
-#define HW_PAGE_INDEX_MASK 0x3f
-#define HW_PAGE_TAG_SHIFT 18
-
-#define TLB_FLAG_MOST_RECENT 0x01
-#define TLB_FLAG_INVALID 0x02
-
-typedef struct tlb_entry
-{
-	u32 tag;
-	u32 paddr;
-	u8 flags;
-} tlb_entry;
-
-// TODO: tlb needs to be in ppcState for save-state purposes.
-#ifdef FAST_TLB_CACHE
-static tlb_entry tlb[NUM_TLBS][TLB_SIZE/TLB_WAYS][TLB_WAYS];
-#endif
-
-u32 LookupTLBPageAddress(const XCheckTLBFlag _Flag, const u32 vpa, u32 *paddr)
-{
-#ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
-	if(tlbe[0].tag == (vpa & ~0xfff) && !(tlbe[0].flags & TLB_FLAG_INVALID))
-	{
-		tlbe[0].flags |= TLB_FLAG_MOST_RECENT;
-		tlbe[1].flags &= ~TLB_FLAG_MOST_RECENT;
-		*paddr = tlbe[0].paddr | (vpa & 0xfff);
-		return 1;
-	}
-	if(tlbe[1].tag == (vpa & ~0xfff) && !(tlbe[1].flags & TLB_FLAG_INVALID))
-	{
-		tlbe[1].flags |= TLB_FLAG_MOST_RECENT;
-		tlbe[0].flags &= ~TLB_FLAG_MOST_RECENT;
-		*paddr = tlbe[1].paddr | (vpa & 0xfff);
-		return 1;
-	}
-	return 0;
-#else
-	u32 _Address = vpa;
-	if (_Flag == FLAG_OPCODE)
-	{
-		for (u32 i = (PowerPC::ppcState.itlb_last); i > (PowerPC::ppcState.itlb_last - 128); i--)
-		{
-			if ((_Address & ~0xfff) == (PowerPC::ppcState.itlb_va[i & 127]))
-			{
-				*paddr = PowerPC::ppcState.itlb_pa[i & 127] | (_Address & 0xfff);
-				PowerPC::ppcState.itlb_last = i;
-				return 1;
-			}
-		}
-	}
-	else
-	{
-		for (u32 i = (PowerPC::ppcState.dtlb_last); i > (PowerPC::ppcState.dtlb_last - 128); i--)
-		{
-			if ((_Address & ~0xfff) == (PowerPC::ppcState.dtlb_va[i & 127]))
-			{
-				*paddr = PowerPC::ppcState.dtlb_pa[i & 127] | (_Address & 0xfff);
-				PowerPC::ppcState.dtlb_last = i;
-				return 1;
-			}
-		}
-	}
-	return 0;
-#endif
-}
-
-void UpdateTLBEntry(const XCheckTLBFlag _Flag, UPTE2 PTE2, const u32 vpa)
-{
-#ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
-	if((tlbe[0].flags & TLB_FLAG_MOST_RECENT) == 0)
-	{
-		tlbe[0].flags = TLB_FLAG_MOST_RECENT;
-		tlbe[1].flags &= ~TLB_FLAG_MOST_RECENT;
-		tlbe[0].paddr = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
-		tlbe[0].tag = vpa & ~0xfff;
-	}
-	else
-	{
-		tlbe[1].flags = TLB_FLAG_MOST_RECENT;
-		tlbe[0].flags &= ~TLB_FLAG_MOST_RECENT;
-		tlbe[1].paddr = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
-		tlbe[1].tag = vpa & ~0xfff;
-	}
-#else
-	if (_Flag == FLAG_OPCODE)
-	{
-		// ITLB cache
-		PowerPC::ppcState.itlb_last++;
-		PowerPC::ppcState.itlb_last &= 127;
-		PowerPC::ppcState.itlb_pa[PowerPC::ppcState.itlb_last] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
-		PowerPC::ppcState.itlb_va[PowerPC::ppcState.itlb_last] = vpa & ~0xfff;	
-	}
-	else
-	{
-		// DTLB cache
-		PowerPC::ppcState.dtlb_last++;
-		PowerPC::ppcState.dtlb_last &= 127;
-		PowerPC::ppcState.dtlb_pa[PowerPC::ppcState.dtlb_last] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
-		PowerPC::ppcState.dtlb_va[PowerPC::ppcState.dtlb_last] = vpa & ~0xfff;	
-	}
-#endif
-}
-
-void InvalidateTLBEntry(u32 vpa)
-{
-#ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[0][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
-	if(tlbe[0].tag == (vpa & ~0xfff))
-	{
-		tlbe[0].flags |= TLB_FLAG_INVALID;
-	}
-	if(tlbe[1].tag == (vpa & ~0xfff))
-	{
-		tlbe[1].flags |= TLB_FLAG_INVALID;
-	}
-	tlb_entry *tlbe_i = tlb[1][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
-	if(tlbe_i[0].tag == (vpa & ~0xfff))
-	{
-		tlbe_i[0].flags |= TLB_FLAG_INVALID;
-	}
-	if(tlbe_i[1].tag == (vpa & ~0xfff))
-	{
-		tlbe_i[1].flags |= TLB_FLAG_INVALID;
-	}
-#else
-	u32 _Address = vpa;
-	for (int i = 0; i < 128; i++)
-	{
-		if ((_Address & ~0xfff) == (PowerPC::ppcState.dtlb_va[(PowerPC::ppcState.dtlb_last + i) & 127]))
-		{
-			PowerPC::ppcState.dtlb_pa[(PowerPC::ppcState.dtlb_last + i) & 127] = 0;
-			PowerPC::ppcState.dtlb_va[(PowerPC::ppcState.dtlb_last + i) & 127] = 0;
-		}
-		if ((_Address & ~0xfff) == (PowerPC::ppcState.itlb_va[(PowerPC::ppcState.itlb_last + i) & 127]))
-		{
-			PowerPC::ppcState.itlb_pa[(PowerPC::ppcState.itlb_last + i) & 127] = 0;
-			PowerPC::ppcState.itlb_va[(PowerPC::ppcState.itlb_last + i) & 127] = 0;
-		}
-	}
-#endif
-}
-
-// Page Address Translation
-u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
-{
-	// TLB cache
-	u32 translatedAddress = 0;
-	if (LookupTLBPageAddress(_Flag, _Address, &translatedAddress))
-		return translatedAddress;
-
-	u32 sr = PowerPC::ppcState.sr[EA_SR(_Address)]; 
-
-	u32 offset = EA_Offset(_Address);			// 12 bit 
-	u32 page_index = EA_PageIndex(_Address);	// 16 bit
-	u32 VSID = SR_VSID(sr);						// 24 bit 
-	u32 api = EA_API(_Address);					//  6 bit (part of page_index) 
-
-	u8* pRAM = GetPointer(0);
-
-	// hash function no 1 "xor" .360
-	u32 hash1 = (VSID ^ page_index);
-	u32 pteg_addr = ((hash1 & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
-
-	// hash1
-	for (int i = 0; i < 8; i++)
-	{
-		UPTE1 PTE1;
-		PTE1.Hex = bswap(*(u32*)&pRAM[pteg_addr]);
-
-		if (PTE1.V && !PTE1.H) 
-		{
-			if (VSID == PTE1.VSID && (api == PTE1.API)) 
-			{
-				UPTE2 PTE2;
-				PTE2.Hex = bswap((*(u32*)&pRAM[(pteg_addr + 4)]));
-
-				UpdateTLBEntry(_Flag, PTE2, _Address);
-
-				// set the access bits
-				switch (_Flag)
-				{
-				case FLAG_READ:     PTE2.R = 1; break;
-				case FLAG_WRITE:    PTE2.C = 1; break;
-				case FLAG_NO_EXCEPTION: break;
-				case FLAG_OPCODE: break;
-				}
-				*(u32*)&pRAM[(pteg_addr + 4)] = bswap(PTE2.Hex);
-
-				return ((PTE2.RPN << 12) | offset);
-			}
-		}
-		pteg_addr+=8; 
-	}
-
-	// hash function no 2 "not" .360
-	hash1 = ~hash1;
-	pteg_addr = ((hash1 & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
-	for (int i = 0; i < 8; i++) 
-	{
-		u32 pte = bswap(*(u32*)&pRAM[pteg_addr]);
-		if ((pte & PTE1_V) && (pte & PTE1_H))
-		{
-			if (VSID == PTE1_VSID(pte) && (api == PTE1_API(pte)))
-			{
-				UPTE2 PTE2;
-				PTE2.Hex = bswap((*(u32*)&pRAM[(pteg_addr + 4)]));
-
-				UpdateTLBEntry(_Flag, PTE2, _Address);
-
-				switch (_Flag)
-				{
-				case FLAG_READ:     PTE2.R = 1; break;
-				case FLAG_WRITE:    PTE2.C = 1; break;
-				case FLAG_NO_EXCEPTION: break;
-				case FLAG_OPCODE: break;
-				}              
-				*(u32*)&pRAM[(pteg_addr + 4)] = bswap(PTE2.Hex);
-
-				return ((PTE2.RPN << 12) | offset);
-			}
-		}
-		pteg_addr+=8; 
-	}
-	return 0;
-}
-
-#define BATU_BEPI(v) ((v)&0xfffe0000)
-#define BATU_BL(v)   (((v)&0x1ffc)>>2)
-#define BATU_Vs      (1<<1)
-#define BATU_Vp      (1)
-#define BATL_BRPN(v) ((v)&0xfffe0000)
-
-#define BAT_EA_OFFSET(v) ((v)&0x1ffff)
-#define BAT_EA_11(v)     ((v)&0x0ffe0000)
-#define BAT_EA_4(v)      ((v)&0xf0000000)
-
-// Block Address Translation
-u32 TranslateBlockAddress(const u32 addr, const XCheckTLBFlag _Flag)
-{
-	u32 result = 0;
-	UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
-
-	// Check for enhanced mode (secondary BAT enable) using 8 BATs
-	int bats = (Core::g_CoreStartupParameter.bWii && HID4.SBE)?8:4;
-
-	for (int i = 0; i < bats; i++)
-	{
-		if (_Flag != FLAG_OPCODE)
-		{
-			u32 bl17 = ~(BATU_BL(PowerPC::ppcState.spr[SPR_DBAT0U + i * 2]) << 17);
-			u32 addr2 = addr & (bl17 | 0xf001ffff);
-			u32 batu = (m_MSR.PR ? BATU_Vp : BATU_Vs);
-
-			if (BATU_BEPI(addr2) == BATU_BEPI(PowerPC::ppcState.spr[SPR_DBAT0U + i * 2]))
-			{
-				// bat applies to this address
-				if (PowerPC::ppcState.spr[SPR_DBAT0U + i * 2] & batu)
-				{
-					// bat entry valid
-					u32 offset = BAT_EA_OFFSET(addr);
-					u32 page = BAT_EA_11(addr);
-					page &= ~bl17;
-					page |= BATL_BRPN(PowerPC::ppcState.spr[SPR_DBAT0L + i * 2]);
-					// fixme: check access rights
-					result = page | offset;
-					return result;
-				}
-			}
-		}
-		else
-		{
-			u32 bl17 = ~(BATU_BL(PowerPC::ppcState.spr[SPR_IBAT0U + i * 2]) << 17);
-			u32 addr2 = addr & (bl17 | 0xf001ffff);
-			u32 batu = (m_MSR.PR ? BATU_Vp : BATU_Vs);
-
-			if (BATU_BEPI(addr2) == BATU_BEPI(PowerPC::ppcState.spr[SPR_IBAT0U + i * 2]))
-			{
-				// bat applies to this address
-				if (PowerPC::ppcState.spr[SPR_IBAT0U + i * 2] & batu)
-				{
-					// bat entry valid
-					u32 offset = BAT_EA_OFFSET(addr);
-					u32 page = BAT_EA_11(addr);
-					page &= ~bl17;
-					page |= BATL_BRPN(PowerPC::ppcState.spr[SPR_IBAT0L + i * 2]);
-					// fixme: check access rights
-					result = page | offset;
-					return result;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-// Translate effective address using BAT or PAT.  Returns 0 if the address cannot be translated.
-u32 TranslateAddress(const u32 _Address, const XCheckTLBFlag _Flag)
-{
-	// Check MSR[IR] bit before translating instruction addresses.  Rogue Leader clears IR and DR??
-	//if ((_Flag == FLAG_OPCODE) && !(MSR & (1 << (31 - 26)))) return _Address;
-
-	// Check MSR[DR] bit before translating data addresses
-	//if (((_Flag == FLAG_READ) || (_Flag == FLAG_WRITE)) && !(MSR & (1 << (31 - 27)))) return _Address;
-
-	u32 tlb_addr = TranslateBlockAddress(_Address, _Flag);
-	if (tlb_addr == 0)
-	{
-		tlb_addr = TranslatePageAddress(_Address, _Flag);
-		if (tlb_addr != 0)
-		{
-			return tlb_addr;
-		}
-	}
-	else
-	{
-		return tlb_addr;
-	}
-
-	return 0;
-}
-} // namespace
diff --git a/Source/Core/Core/Src/HW/MemoryInterface.cpp b/Source/Core/Core/Src/HW/MemoryInterface.cpp
deleted file mode 100644
index 9eb833cbc0..0000000000
--- a/Source/Core/Core/Src/HW/MemoryInterface.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "MemoryInterface.h"
-
-namespace MemoryInterface
-{
-
-// internal hardware addresses
-enum
-{
-	MEM_CHANNEL0_HI		= 0x000,
-	MEM_CHANNEL0_LO		= 0x002,
-	MEM_CHANNEL1_HI		= 0x004,
-	MEM_CHANNEL1_LO		= 0x006,
-	MEM_CHANNEL2_HI		= 0x008,
-	MEM_CHANNEL2_LO		= 0x00A,
-	MEM_CHANNEL3_HI		= 0x00C,
-	MEM_CHANNEL3_LO		= 0x00E,
-	MEM_CHANNEL_CTRL	= 0x010
-};
-
-struct MIMemStruct
-{
-	u32 Channel0_Addr;
-	u32 Channel1_Addr;
-	u32 Channel2_Addr;
-	u32 Channel3_Addr;
-	u32 Channel_Ctrl;
-};
-
-// STATE_TO_SAVE
-static MIMemStruct miMem;
-
-void DoState(PointerWrap &p)
-{
-	p.Do(miMem);
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	//0x30 -> 0x5a : gp memory metrics
-	INFO_LOG(MEMMAP, "(r16) 0x%04x @ 0x%08x", 0, _iAddress);
-	_uReturnValue = 0;
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	INFO_LOG(MEMMAP, "(r32) 0x%08x @ 0x%08x", 0, _iAddress);
-	_uReturnValue = 0;
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	INFO_LOG(MEMMAP, "(w32) 0x%08x @ 0x%08x", _iValue, _iAddress);
-}
-
-//TODO : check
-void Write16(const u16 _iValue, const u32 _iAddress) 
-{
-	INFO_LOG(MEMMAP, "(w16) 0x%04x @ 0x%08x", _iValue, _iAddress);
-	switch(_iAddress & 0xFFF)
-	{
-	case MEM_CHANNEL0_HI: miMem.Channel0_Addr = (miMem.Channel0_Addr & 0xFFFF) | (_iValue<<16); return;
-	case MEM_CHANNEL0_LO: miMem.Channel0_Addr = (miMem.Channel0_Addr & 0xFFFF0000) | (_iValue); return;
-	case MEM_CHANNEL1_HI: miMem.Channel1_Addr = (miMem.Channel1_Addr & 0xFFFF) | (_iValue<<16); return;
-	case MEM_CHANNEL1_LO: miMem.Channel1_Addr = (miMem.Channel1_Addr & 0xFFFF0000) | (_iValue); return;
-	case MEM_CHANNEL2_HI: miMem.Channel2_Addr = (miMem.Channel2_Addr & 0xFFFF) | (_iValue<<16); return;
-	case MEM_CHANNEL2_LO: miMem.Channel2_Addr = (miMem.Channel2_Addr & 0xFFFF0000) | (_iValue); return;
-	case MEM_CHANNEL3_HI: miMem.Channel3_Addr = (miMem.Channel3_Addr & 0xFFFF) | (_iValue<<16); return;
-	case MEM_CHANNEL3_LO: miMem.Channel3_Addr = (miMem.Channel3_Addr & 0xFFFF0000) | (_iValue); return;
-	case MEM_CHANNEL_CTRL: miMem.Channel_Ctrl = _iValue; return;
-	}
-}
-
-} // end of namespace MemoryInterface
-
diff --git a/Source/Core/Core/Src/HW/MemoryInterface.h b/Source/Core/Core/Src/HW/MemoryInterface.h
deleted file mode 100644
index ffa255b4b2..0000000000
--- a/Source/Core/Core/Src/HW/MemoryInterface.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _MEMORYINTERFACE_H
-#define _MEMORYINTERFACE_H
-
-#include "Common.h"
-class PointerWrap;
-
-namespace MemoryInterface
-{
-void DoState(PointerWrap &p);
-
-void Read16(u16& _uReturnValue, const u32 _iAddress);
-void Read32(u32& _uReturnValue, const u32 _iAddress);	
-void Write32(const u32 _iValue, const u32 _iAddress);
-void Write16(const u16 _iValue, const u32 _iAddress);
-} // end of namespace MemoryInterface
-
-#endif
-
-
diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp
deleted file mode 100644
index 273ee32231..0000000000
--- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-
-#include "Common.h"
-#include "Atomic.h"
-#include "ChunkFile.h"
-#include "../PowerPC/PowerPC.h"
-
-#include "CPU.h"
-#include "../CoreTiming.h"
-#include "ProcessorInterface.h"
-#include "GPFifo.h"
-#include "VideoBackendBase.h"
-
-namespace ProcessorInterface
-{
-
-// Internal hardware addresses
-enum
-{
-	PI_INTERRUPT_CAUSE		= 0x00,
-	PI_INTERRUPT_MASK		= 0x04,
-	PI_FIFO_BASE			= 0x0C,
-	PI_FIFO_END				= 0x10,
-	PI_FIFO_WPTR			= 0x14,
-	PI_FIFO_RESET			= 0x18, // ??? - GXAbortFrame writes to it
-	PI_RESET_CODE			= 0x24,
-	PI_FLIPPER_REV			= 0x2C,
-	PI_FLIPPER_UNK			= 0x30 // BS1 writes 0x0245248A to it - prolly some bootstrap thing
-};
-
-
-// STATE_TO_SAVE
-volatile u32 m_InterruptCause;
-volatile u32 m_InterruptMask;
-// addresses for CPU fifo accesses
-u32 Fifo_CPUBase;
-u32 Fifo_CPUEnd;
-u32 Fifo_CPUWritePointer;
-
-u32 m_Fifo_Reset;
-u32 m_ResetCode;
-u32 m_FlipperRev;
-u32 m_Unknown;
-
-
-// ID and callback for scheduling reset button presses/releases
-static int toggleResetButton;
-void ToggleResetButtonCallback(u64 userdata, int cyclesLate);
-
-// Let the PPC know that an external exception is set/cleared
-void UpdateException();
-
-
-void DoState(PointerWrap &p)
-{
-	p.Do(m_InterruptMask);
-	p.Do(m_InterruptCause);
-	p.Do(Fifo_CPUBase);
-	p.Do(Fifo_CPUEnd);
-	p.Do(Fifo_CPUWritePointer);
-	p.Do(m_Fifo_Reset);
-	p.Do(m_ResetCode);
-	p.Do(m_FlipperRev);
-	p.Do(m_Unknown);
-}
-
-void Init()
-{
-	m_InterruptMask = 0;
-	m_InterruptCause = 0;
-
-	Fifo_CPUBase = 0;
-	Fifo_CPUEnd = 0;
-	Fifo_CPUWritePointer = 0;
-	/*
-	Previous Flipper IDs:
-	0x046500B0 = A
-	0x146500B1 = B
-	*/
-	m_FlipperRev = 0x246500B1; // revision C
-	m_Unknown = 0;
-
-	m_ResetCode = 0x80000000; // Cold reset
-	m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI;
-
-	toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", ToggleResetButtonCallback);
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	u32 word;
-	Read32(word, _iAddress & ~3);
-	_uReturnValue = word >> (_iAddress & 3) ? 16 : 0;
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	//INFO_LOG(PROCESSORINTERFACE, "(r32) 0x%08x", _iAddress);
-
-	switch(_iAddress & 0xFFF) 
-	{
-	case PI_INTERRUPT_CAUSE:
-		_uReturnValue = m_InterruptCause;
-		return;
-	
-	case PI_INTERRUPT_MASK:
-		_uReturnValue = m_InterruptMask;
-		return;
-
-	case PI_FIFO_BASE:
-		DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO base, value = %08x", Fifo_CPUBase);
-		_uReturnValue = Fifo_CPUBase;
-		return;
-
-	case PI_FIFO_END:
-		DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO end, value = %08x", Fifo_CPUEnd);
-		_uReturnValue = Fifo_CPUEnd;
-		return;
-
-	case PI_FIFO_WPTR:
-		DEBUG_LOG(PROCESSORINTERFACE, "Read writepointer, value = %08x", Fifo_CPUWritePointer);
-		_uReturnValue = Fifo_CPUWritePointer;  //really writes in 32-byte chunks
-		// Monk's gcube does some crazy align trickery here.
-		return;
-
-	case PI_RESET_CODE:
-		INFO_LOG(PROCESSORINTERFACE, "Read reset code, 0x%08x", m_ResetCode);
-		_uReturnValue = m_ResetCode;
-		return;
-
-	case PI_FLIPPER_REV:
-		INFO_LOG(PROCESSORINTERFACE, "Read flipper rev, 0x%08x", m_FlipperRev);
-		_uReturnValue = m_FlipperRev;
-		return;
-		
-	default:
-		ERROR_LOG(PROCESSORINTERFACE, "!!!!Unknown write!!!! 0x%08x", _iAddress);
-		break;
-	}
-	
-	_uReturnValue = 0xAFFE0000;
-}
-
-void Write32(const u32 _uValue, const u32 _iAddress)
-{
-	//INFO_LOG(PROCESSORINTERFACE, "(w32) 0x%08x @ 0x%08x", _uValue, _iAddress);
-	switch(_iAddress & 0xFFF) 
-	{
-	case PI_INTERRUPT_CAUSE:
-		Common::AtomicAnd(m_InterruptCause, ~_uValue); // writes turn them off
-		UpdateException();
-		return;
-
-	case PI_INTERRUPT_MASK: 
-		m_InterruptMask = _uValue;
-		DEBUG_LOG(PROCESSORINTERFACE,"New Interrupt mask: %08x", m_InterruptMask);
-		UpdateException();
-		return;
-	
-	case PI_FIFO_BASE:
-		Fifo_CPUBase = _uValue & 0xFFFFFFE0;
-		DEBUG_LOG(PROCESSORINTERFACE,"Fifo base = %08x", _uValue);
-		break;
-
-	case PI_FIFO_END:
-		Fifo_CPUEnd = _uValue & 0xFFFFFFE0;
-		DEBUG_LOG(PROCESSORINTERFACE,"Fifo end = %08x", _uValue);
-		break;
-
-	case PI_FIFO_WPTR:
-		Fifo_CPUWritePointer = _uValue & 0xFFFFFFE0;		
-		DEBUG_LOG(PROCESSORINTERFACE,"Fifo writeptr = %08x", _uValue);
-		break;
-
-	case PI_FIFO_RESET:
-		//Abort the actual frame
-		//g_video_backend->Video_AbortFrame();
-		//Fifo_CPUWritePointer = Fifo_CPUBase; ??
-		//PanicAlert("Unknown write to PI_FIFO_RESET (%08x)", _uValue);
-		WARN_LOG(PROCESSORINTERFACE, "Fifo reset (%08x)", _uValue);
-		break;
-
-	case PI_RESET_CODE:
-		DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to PI_RESET_CODE", _uValue);
-		m_ResetCode = _uValue;
-		break;
-
-	case PI_FLIPPER_UNK:
-		DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to unknown PI register %08x", _uValue, _iAddress);
-		break;
-
-	default:
-		ERROR_LOG(PROCESSORINTERFACE,"!!!!Unknown PI write!!!! 0x%08x", _iAddress);
-		PanicAlert("Unknown write to PI: %08x", _iAddress);
-		break;
-	}
-}
-
-void UpdateException()
-{
-	if ((m_InterruptCause & m_InterruptMask) != 0)
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_EXTERNAL_INT);
-	else
-		Common::AtomicAnd(PowerPC::ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT);
-}
-
-static const char *Debug_GetInterruptName(u32 _causemask)
-{
-	switch (_causemask)
-	{
-	case INT_CAUSE_PI:				return "INT_CAUSE_PI";
-	case INT_CAUSE_DI:				return "INT_CAUSE_DI";
-	case INT_CAUSE_RSW:				return "INT_CAUSE_RSW";
-	case INT_CAUSE_SI:				return "INT_CAUSE_SI";
-	case INT_CAUSE_EXI:				return "INT_CAUSE_EXI";
-	case INT_CAUSE_AI:				return "INT_CAUSE_AI";
-	case INT_CAUSE_DSP:				return "INT_CAUSE_DSP";
-	case INT_CAUSE_MEMORY:			return "INT_CAUSE_MEMORY";
-	case INT_CAUSE_VI:				return "INT_CAUSE_VI";
-	case INT_CAUSE_PE_TOKEN:		return "INT_CAUSE_PE_TOKEN";
-	case INT_CAUSE_PE_FINISH:		return "INT_CAUSE_PE_FINISH";
-	case INT_CAUSE_CP:				return "INT_CAUSE_CP";
-	case INT_CAUSE_DEBUG:			return "INT_CAUSE_DEBUG";
-	case INT_CAUSE_WII_IPC:			return "INT_CAUSE_WII_IPC";
-	case INT_CAUSE_HSP:				return "INT_CAUSE_HSP";
-	case INT_CAUSE_RST_BUTTON:		return "INT_CAUSE_RST_BUTTON";
-	default:						return "!!! ERROR-unknown Interrupt !!!";
-	}
-}
-
-void SetInterrupt(u32 _causemask, bool _bSet)
-{
-	// TODO(ector): add sanity check that current thread id is cpu thread
-
-	if (_bSet && !(m_InterruptCause & _causemask))
-	{
-		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (set)", Debug_GetInterruptName(_causemask));
-	}
-
-	if (!_bSet && (m_InterruptCause & _causemask))
-	{
-		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (clear)", Debug_GetInterruptName(_causemask));
-	}
-	
-	if (_bSet)
-		Common::AtomicOr(m_InterruptCause, _causemask);
-	else
-		Common::AtomicAnd(m_InterruptCause, ~_causemask);// is there any reason to have this possibility?
-										// F|RES: i think the hw devices reset the interrupt in the PI to 0 
-										// if the interrupt cause is eliminated. that isnt done by software (afaik)
-	UpdateException();
-}
-
-void SetResetButton(bool _bSet)
-{
-	if (_bSet)
-		Common::AtomicAnd(m_InterruptCause, ~INT_CAUSE_RST_BUTTON);
-	else
-		Common::AtomicOr(m_InterruptCause, INT_CAUSE_RST_BUTTON);
-}
-
-void ToggleResetButtonCallback(u64 userdata, int cyclesLate)
-{
-	SetResetButton(!!userdata);
-}
-
-void ResetButton_Tap()
-{
-	CoreTiming::ScheduleEvent_Threadsafe(0, toggleResetButton, true);
-	CoreTiming::ScheduleEvent_Threadsafe(243000000, toggleResetButton, false);
-}
-
-} // namespace ProcessorInterface
diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.h b/Source/Core/Core/Src/HW/ProcessorInterface.h
deleted file mode 100644
index 2ca2d74219..0000000000
--- a/Source/Core/Core/Src/HW/ProcessorInterface.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PROCESSORINTERFACE_H
-#define _PROCESSORINTERFACE_H
-
-#include "Common.h"
-class PointerWrap;
-
-// Holds statuses of things like the write gatherer used for fifos, and interrupts from various sources
-
-namespace ProcessorInterface
-{
-
-enum InterruptCause
-{
-    INT_CAUSE_PI		  =    0x1, // YAGCD says: GP runtime error
-    INT_CAUSE_RSW         =    0x2, // Reset Switch    
-    INT_CAUSE_DI          =    0x4, // DVD interrupt 
-    INT_CAUSE_SI          =    0x8, // Serial interface    
-    INT_CAUSE_EXI         =   0x10, // Expansion interface
-    INT_CAUSE_AI	      =   0x20, // Audio Interface Streaming
-    INT_CAUSE_DSP         =   0x40, // DSP interface
-    INT_CAUSE_MEMORY      =   0x80, // Memory interface
-    INT_CAUSE_VI          =  0x100, // Video interface
-    INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-    INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
-    INT_CAUSE_CP          =  0x800, // Command Fifo
-    INT_CAUSE_DEBUG       = 0x1000, // Debugger (from devkit)
-    INT_CAUSE_HSP         = 0x2000, // High Speed Port (from sdram controller)
-    INT_CAUSE_WII_IPC     = 0x4000, // Wii IPC
-    INT_CAUSE_RST_BUTTON  = 0x10000 // ResetButtonState (1 = unpressed, 0 = pressed) it's a state, not maskable
-};
-
-
-extern volatile u32 m_InterruptCause;
-extern volatile u32 m_InterruptMask;
-extern u32 Fifo_CPUBase;
-extern u32 Fifo_CPUEnd;
-extern u32 Fifo_CPUWritePointer;
-
-
-void Init();
-void DoState(PointerWrap &p);
-
-void Read16(u16& _uReturnValue, const u32 _iAddress);
-
-void Read32(u32& _uReturnValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-inline u32 GetMask() { return m_InterruptMask; }
-inline u32 GetCause() { return m_InterruptCause; }
-
-void SetInterrupt(u32 _causemask, bool _bSet=true);
-
-// Thread-safe func which sets and clears reset button state automagically
-void ResetButton_Tap();
-
-} // namespace ProcessorInterface
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
deleted file mode 100644
index 76810b7f6d..0000000000
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ /dev/null
@@ -1,663 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "../ConfigManager.h"
-#include "../CoreTiming.h"
-#include "../Movie.h"
-#include "../NetPlayProto.h"
-
-#include "SystemTimers.h"
-#include "ProcessorInterface.h"
-#include "VideoInterface.h"
-
-#include "SI.h"
-#include "SI_DeviceGBA.h"
-
-namespace SerialInterface
-{
-
-static int changeDevice;
-
-void RunSIBuffer();
-void UpdateInterrupts();
-
-// SI Interrupt Types
-enum SIInterruptType
-{
-	INT_RDSTINT		= 0,
-	INT_TCINT		= 1,
-};
-static void GenerateSIInterrupt(SIInterruptType _SIInterrupt);
-
-// SI number of channels
-enum
-{
-	NUMBER_OF_CHANNELS	= 0x04
-};
-
-// SI Internal Hardware Addresses
-enum
-{
-	SI_CHANNEL_0_OUT	= 0x00,
-	SI_CHANNEL_0_IN_HI	= 0x04,
-	SI_CHANNEL_0_IN_LO	= 0x08,
-	SI_CHANNEL_1_OUT	= 0x0C,
-	SI_CHANNEL_1_IN_HI	= 0x10,
-	SI_CHANNEL_1_IN_LO	= 0x14,
-	SI_CHANNEL_2_OUT	= 0x18,
-	SI_CHANNEL_2_IN_HI	= 0x1C,
-	SI_CHANNEL_2_IN_LO	= 0x20,
-	SI_CHANNEL_3_OUT	= 0x24,
-	SI_CHANNEL_3_IN_HI	= 0x28,
-	SI_CHANNEL_3_IN_LO	= 0x2C,
-	SI_POLL				= 0x30,
-	SI_COM_CSR			= 0x34,
-	SI_STATUS_REG		= 0x38,
-	SI_EXI_CLOCK_COUNT	= 0x3C,
-};
-
-// SI Channel Output
-union USIChannelOut
-{
-	u32 Hex;
-	struct
-	{
-		u32 OUTPUT1	:	8;
-		u32 OUTPUT0	:	8;
-		u32 CMD		:	8;
-		u32			:	8;
-	};
-};
-
-// SI Channel Input High u32
-union USIChannelIn_Hi
-{
-	u32 Hex;
-	struct
-	{
-		u32 INPUT3		:	8;
-		u32 INPUT2		:	8;
-		u32 INPUT1		:	8;
-		u32 INPUT0		:	6;
-		u32 ERRLATCH	:	1; // 0: no error  1: Error latched. Check SISR.
-		u32 ERRSTAT		:	1; // 0: no error  1: error on last transfer
-	};
-};
-
-// SI Channel Input Low u32
-union USIChannelIn_Lo
-{
-	u32 Hex;
-	struct
-	{
-		u32 INPUT7		:	8;
-		u32 INPUT6		:	8;
-		u32 INPUT5		:	8;
-		u32 INPUT4		:	8;
-	};
-};
-
-// SI Channel
-struct SSIChannel
-{
-	USIChannelOut	m_Out;
-	USIChannelIn_Hi m_InHi;
-	USIChannelIn_Lo m_InLo;
-	ISIDevice*		m_pDevice;
-};
-
-// SI Poll: Controls how often a device is polled
-union USIPoll
-{
-	u32 Hex;
-	struct
-	{
-		u32 VBCPY3	:	1;  // 1: write to output buffer only on vblank
-		u32 VBCPY2	:	1;
-		u32 VBCPY1	:	1;
-		u32 VBCPY0	:	1;
-		u32 EN3		:	1;  // Enable polling of channel
-		u32 EN2		:	1;  //  does not affect communication RAM transfers
-		u32 EN1		:	1;
-		u32 EN0		:	1;
-		u32 Y		:	8;  // Polls per frame
-		u32 X		:	10; // Polls per X lines. begins at vsync, min 7, max depends on video mode
-		u32			:	6;
-	};
-};
-
-// SI Communication Control Status Register
-union USIComCSR
-{
-	u32 Hex;
-	struct
-	{
-		u32 TSTART		:	1; // write: start transfer  read: transfer status
-		u32 CHANNEL		:	2; // determines which SI channel will be used on the communication interface.
-		u32				:	3;
-		u32 CALLBEN		:	1; // Callback enable
-		u32 CMDEN		:	1; // Command enable?
-		u32 INLNGTH		:	7;
-		u32				:	1;
-		u32 OUTLNGTH	:	7; // Communication Channel Output Length in bytes
-		u32				:	1;
-		u32 CHANEN		:	1; // Channel enable?
-		u32 CHANNUM		:	2; // Channel number?
-		u32 RDSTINTMSK	:	1; // Read Status Interrupt Status Mask
-		u32 RDSTINT		:	1; // Read Status Interrupt Status
-		u32 COMERR		:	1; // Communication Error (set 0)
-		u32 TCINTMSK	:	1; // Transfer Complete Interrupt Mask
-		u32 TCINT		:	1; // Transfer Complete Interrupt
-	};
-	USIComCSR() {Hex = 0;}
-	USIComCSR(u32 _hex) {Hex = _hex;}
-};
-
-// SI Status Register
-union USIStatusReg
-{
-	u32 Hex;
-	struct
-	{
-		u32 UNRUN3	:	1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
-		u32 OVRUN3	:	1; // (RWC) write 1: bit cleared  read 1: overrun error
-		u32 COLL3	:	1; // (RWC) write 1: bit cleared  read 1: collision error
-		u32 NOREP3	:	1; // (RWC) write 1: bit cleared  read 1: response error
-		u32 WRST3	:	1; // (R) 1: buffer channel0 not copied
-		u32 RDST3	:	1; // (R) 1: new Data available
-		u32			:	2; // 7:6
-		u32 UNRUN2	:	1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
-		u32 OVRUN2	:	1; // (RWC) write 1: bit cleared  read 1: overrun error
-		u32 COLL2	:	1; // (RWC) write 1: bit cleared  read 1: collision error
-		u32 NOREP2	:	1; // (RWC) write 1: bit cleared  read 1: response error
-		u32 WRST2	:	1; // (R) 1: buffer channel0 not copied
-		u32 RDST2	:	1; // (R) 1: new Data available
-		u32			:	2; // 15:14
-		u32 UNRUN1	:	1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
-		u32 OVRUN1	:	1; // (RWC) write 1: bit cleared  read 1: overrun error
-		u32 COLL1	:	1; // (RWC) write 1: bit cleared  read 1: collision error
-		u32 NOREP1	:	1; // (RWC) write 1: bit cleared  read 1: response error
-		u32 WRST1	:	1; // (R) 1: buffer channel0 not copied
-		u32 RDST1	:	1; // (R) 1: new Data available
-		u32			:	2; // 23:22
-		u32 UNRUN0	:	1; // (RWC) write 1: bit cleared  read 1: main proc underrun error
-		u32 OVRUN0	:	1; // (RWC) write 1: bit cleared  read 1: overrun error
-		u32 COLL0	:	1; // (RWC) write 1: bit cleared  read 1: collision error
-		u32 NOREP0	:	1; // (RWC) write 1: bit cleared  read 1: response error
-		u32 WRST0	:	1; // (R) 1: buffer channel0 not copied
-		u32 RDST0	:	1; // (R) 1: new Data available
-		u32			:	1;
-		u32 WR		:	1; // (RW) write 1 start copy, read 0 copy done
-	};
-	USIStatusReg() {Hex = 0;}
-	USIStatusReg(u32 _hex) {Hex = _hex;}
-};
-
-// SI EXI Clock Count
-union USIEXIClockCount
-{
-	u32 Hex;
-	struct
-	{
-		u32 LOCK	:	1; // 1: prevents CPU from setting EXI clock to 32MHz
-		u32			:	0;
-	};
-};
-
-// STATE_TO_SAVE
-static SSIChannel			g_Channel[NUMBER_OF_CHANNELS];
-static USIPoll				g_Poll;
-static USIComCSR			g_ComCSR;
-static USIStatusReg			g_StatusReg;
-static USIEXIClockCount		g_EXIClockCount;
-static u8					g_SIBuffer[128];
-
-void DoState(PointerWrap &p)
-{
-	for(int i = 0; i < NUMBER_OF_CHANNELS; i++)
-	{
-		p.Do(g_Channel[i].m_InHi.Hex);
-		p.Do(g_Channel[i].m_InLo.Hex);
-		p.Do(g_Channel[i].m_Out.Hex);
-		
-		ISIDevice* pDevice = g_Channel[i].m_pDevice;
-		SIDevices type = pDevice->GetDeviceType();
-		p.Do(type);
-		ISIDevice* pSaveDevice = (type == pDevice->GetDeviceType()) ? pDevice : SIDevice_Create(type, i);
-		pSaveDevice->DoState(p);
-		if(pSaveDevice != pDevice)
-		{
-			// if we had to create a temporary device, discard it if we're not loading.
-			// also, if no movie is active, we'll assume the user wants to keep their current devices
-			// instead of the ones they had when the savestate was created.
-			if(p.GetMode() != PointerWrap::MODE_READ ||
-				(!Movie::IsRecordingInput() && !Movie::IsPlayingInput()))
-			{
-				delete pSaveDevice;
-			}
-			else
-			{
-				AddDevice(pSaveDevice);
-			}
-		}
-	}
-	p.Do(g_Poll);
-	p.DoPOD(g_ComCSR);
-	p.DoPOD(g_StatusReg);
-	p.Do(g_EXIClockCount);
-	p.Do(g_SIBuffer);
-}	
-
-
-void Init()
-{
-	for (int i = 0; i < NUMBER_OF_CHANNELS; i++)
-	{	
-		g_Channel[i].m_Out.Hex = 0;
-		g_Channel[i].m_InHi.Hex = 0;
-		g_Channel[i].m_InLo.Hex = 0;
-
-		if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
-			AddDevice(Movie::IsUsingPad(i) ?  (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
-		else if (!NetPlay::IsNetPlayRunning())
-			AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
-	}
-
-	g_Poll.Hex = 0;
-	g_Poll.X = 7;
-
-	g_ComCSR.Hex = 0;
-
-	g_StatusReg.Hex = 0;
-
-	g_EXIClockCount.Hex = 0;
-	//g_EXIClockCount.LOCK = 1; // Supposedly set on reset, but logs from real wii don't look like it is...
-	memset(g_SIBuffer, 0, 128);
-
-	changeDevice = CoreTiming::RegisterEvent("ChangeSIDevice", ChangeDeviceCallback);
-}
-
-void Shutdown()
-{
-	for (int i = 0; i < NUMBER_OF_CHANNELS; i++)
-		RemoveDevice(i);
-	GBAConnectionWaiter_Shutdown();
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	// SIBuffer
-	if ((_iAddress >= 0xCC006480 && _iAddress < 0xCC006500) ||
-		(_iAddress >= 0xCD006480 && _iAddress < 0xCD006500))
-	{
-		_uReturnValue = *(u32*)&g_SIBuffer[_iAddress & 0x7F];
-		return;
-	}
-
-	// error if not changed in the switch
-	_uReturnValue = 0xdeadbeef;
-
-	// registers
-	switch (_iAddress & 0x3FF)
-	{
-	//////////////////////////////////////////////////////////////////////////
-	// Channel 0
-	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_0_OUT:
-		_uReturnValue = g_Channel[0].m_Out.Hex;
-		break;
-
-	case SI_CHANNEL_0_IN_HI:
-		g_StatusReg.RDST0 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[0].m_InHi.Hex;
-		break;
-
-	case SI_CHANNEL_0_IN_LO:
-		g_StatusReg.RDST0 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[0].m_InLo.Hex;
-		break;
-
-	//////////////////////////////////////////////////////////////////////////
-	// Channel 1
-	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_1_OUT:
-		_uReturnValue = g_Channel[1].m_Out.Hex;
-		break;
-
-	case SI_CHANNEL_1_IN_HI:
-		g_StatusReg.RDST1 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[1].m_InHi.Hex;
-		break;
-
-	case SI_CHANNEL_1_IN_LO:
-		g_StatusReg.RDST1 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[1].m_InLo.Hex;
-		break;
-
-	//////////////////////////////////////////////////////////////////////////
-	// Channel 2
-	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_2_OUT:
-		_uReturnValue = g_Channel[2].m_Out.Hex;
-		break;
-
-	case SI_CHANNEL_2_IN_HI:
-		g_StatusReg.RDST2 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[2].m_InHi.Hex;
-		break;
-
-	case SI_CHANNEL_2_IN_LO:
-		g_StatusReg.RDST2 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[2].m_InLo.Hex;
-		break;
-
-	//////////////////////////////////////////////////////////////////////////
-	// Channel 3
-	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_3_OUT:
-		_uReturnValue = g_Channel[3].m_Out.Hex;
-		break;
-
-	case SI_CHANNEL_3_IN_HI:
-		g_StatusReg.RDST3 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[3].m_InHi.Hex;
-		break;
-
-	case SI_CHANNEL_3_IN_LO:
-		g_StatusReg.RDST3 = 0;
-		UpdateInterrupts();
-		_uReturnValue = g_Channel[3].m_InLo.Hex;
-		break;
-
-	//////////////////////////////////////////////////////////////////////////
-	// Other
-	//////////////////////////////////////////////////////////////////////////
-	case SI_POLL:				_uReturnValue = g_Poll.Hex; break;
-	case SI_COM_CSR:			_uReturnValue = g_ComCSR.Hex; break;
-	case SI_STATUS_REG:			_uReturnValue = g_StatusReg.Hex; break;
-
-	case SI_EXI_CLOCK_COUNT:	_uReturnValue = g_EXIClockCount.Hex; break;
-
-	default:
-		INFO_LOG(SERIALINTERFACE, "(r32-unk): 0x%08x", _iAddress);
-		_dbg_assert_(SERIALINTERFACE,0);
-		break;
-	}
-
-	DEBUG_LOG(SERIALINTERFACE, "(r32) 0x%08x - 0x%08x", _iAddress, _uReturnValue);
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	DEBUG_LOG(SERIALINTERFACE, "(w32) 0x%08x @ 0x%08x", _iValue, _iAddress);
-
-	// SIBuffer
-	if ((_iAddress >= 0xCC006480 && _iAddress < 0xCC006500) ||
-		(_iAddress >= 0xCD006480 && _iAddress < 0xCD006500))
-	{
-		*(u32*)&g_SIBuffer[_iAddress & 0x7F] = _iValue;
-		return;
-	}
-
-	// registers
-	switch (_iAddress & 0x3FF)
-	{
-	case SI_CHANNEL_0_OUT:		g_Channel[0].m_Out.Hex = _iValue; break;
-	case SI_CHANNEL_0_IN_HI:	g_Channel[0].m_InHi.Hex = _iValue; break;
-	case SI_CHANNEL_0_IN_LO:	g_Channel[0].m_InLo.Hex = _iValue; break;
-	case SI_CHANNEL_1_OUT:		g_Channel[1].m_Out.Hex = _iValue; break;
-	case SI_CHANNEL_1_IN_HI:	g_Channel[1].m_InHi.Hex = _iValue; break;
-	case SI_CHANNEL_1_IN_LO:	g_Channel[1].m_InLo.Hex = _iValue; break;
-	case SI_CHANNEL_2_OUT:		g_Channel[2].m_Out.Hex = _iValue; break;
-	case SI_CHANNEL_2_IN_HI:	g_Channel[2].m_InHi.Hex = _iValue; break;
-	case SI_CHANNEL_2_IN_LO:	g_Channel[2].m_InLo.Hex = _iValue; break;
-	case SI_CHANNEL_3_OUT:		g_Channel[3].m_Out.Hex = _iValue; break;
-	case SI_CHANNEL_3_IN_HI:	g_Channel[3].m_InHi.Hex = _iValue; break;
-	case SI_CHANNEL_3_IN_LO:	g_Channel[3].m_InLo.Hex = _iValue; break;
-
-	case SI_POLL:
-		INFO_LOG(SERIALINTERFACE, "Wrote Poll: X=%03d Y=%03d %s%s%s%s%s%s%s%s",
-			g_Poll.X, g_Poll.Y,
-			g_Poll.EN0 ? "EN0 ":" ", g_Poll.EN1 ? "EN1 ":" ",
-			g_Poll.EN2 ? "EN2 ":" ", g_Poll.EN3 ? "EN3 ":" ",
-			g_Poll.VBCPY0 ? "VBCPY0 ":" ", g_Poll.VBCPY1 ? "VBCPY1 ":" ",
-			g_Poll.VBCPY2 ? "VBCPY2 ":" ", g_Poll.VBCPY3 ? "VBCPY3 ":" ");
-		g_Poll.Hex = _iValue;
-		break;
-
-	case SI_COM_CSR:
-		{
-			USIComCSR tmpComCSR(_iValue);
-
-			g_ComCSR.CHANNEL	= tmpComCSR.CHANNEL;
-			g_ComCSR.INLNGTH	= tmpComCSR.INLNGTH;
-			g_ComCSR.OUTLNGTH	= tmpComCSR.OUTLNGTH;
-			g_ComCSR.RDSTINTMSK = tmpComCSR.RDSTINTMSK;
-			g_ComCSR.TCINTMSK	= tmpComCSR.TCINTMSK;
-
-			g_ComCSR.COMERR		= 0;
-
-			if (tmpComCSR.RDSTINT)	g_ComCSR.RDSTINT = 0;
-			if (tmpComCSR.TCINT)	g_ComCSR.TCINT = 0;
-
-			// be careful: run si-buffer after updating the INT flags
-			if (tmpComCSR.TSTART)	RunSIBuffer();
-			UpdateInterrupts();
-		}
-		break;
-
-	case SI_STATUS_REG:
-		{
-			USIStatusReg tmpStatus(_iValue);
-
-			// clear bits ( if(tmp.bit) SISR.bit=0 )
-			if (tmpStatus.NOREP0)	g_StatusReg.NOREP0 = 0;
-			if (tmpStatus.COLL0)	g_StatusReg.COLL0 = 0;
-			if (tmpStatus.OVRUN0)	g_StatusReg.OVRUN0 = 0;
-			if (tmpStatus.UNRUN0)	g_StatusReg.UNRUN0 = 0;
-
-			if (tmpStatus.NOREP1)	g_StatusReg.NOREP1 = 0;
-			if (tmpStatus.COLL1)	g_StatusReg.COLL1 = 0;
-			if (tmpStatus.OVRUN1)	g_StatusReg.OVRUN1 = 0;
-			if (tmpStatus.UNRUN1)	g_StatusReg.UNRUN1 = 0;
-
-			if (tmpStatus.NOREP2)	g_StatusReg.NOREP2 = 0;
-			if (tmpStatus.COLL2)	g_StatusReg.COLL2 = 0;
-			if (tmpStatus.OVRUN2)	g_StatusReg.OVRUN2 = 0;
-			if (tmpStatus.UNRUN2)	g_StatusReg.UNRUN2 = 0;
-
-			if (tmpStatus.NOREP3)	g_StatusReg.NOREP3 = 0;
-			if (tmpStatus.COLL3)	g_StatusReg.COLL3 = 0;
-			if (tmpStatus.OVRUN3)	g_StatusReg.OVRUN3 = 0;
-			if (tmpStatus.UNRUN3)	g_StatusReg.UNRUN3 = 0;
-
-			// send command to devices
-			if (tmpStatus.WR)
-			{
-				g_Channel[0].m_pDevice->SendCommand(g_Channel[0].m_Out.Hex, g_Poll.EN0);
-				g_Channel[1].m_pDevice->SendCommand(g_Channel[1].m_Out.Hex, g_Poll.EN1);
-				g_Channel[2].m_pDevice->SendCommand(g_Channel[2].m_Out.Hex, g_Poll.EN2);
-				g_Channel[3].m_pDevice->SendCommand(g_Channel[3].m_Out.Hex, g_Poll.EN3);
-
-				g_StatusReg.WR = 0;
-				g_StatusReg.WRST0 = 0;
-				g_StatusReg.WRST1 = 0;
-				g_StatusReg.WRST2 = 0;
-				g_StatusReg.WRST3 = 0;
-			}
-		}
-		break;
-
-	case SI_EXI_CLOCK_COUNT:
-		g_EXIClockCount.Hex = _iValue;
-		break;
-
-	case 0x80: // Bogus? never seen it with ma own eyes
-		INFO_LOG(SERIALINTERFACE, "WII something at 0xCD006480");
-		break;
-
-	default:
-		_dbg_assert_(SERIALINTERFACE, 0);
-		break;
-	}
-}
-
-void UpdateInterrupts()
-{
-	// check if we have to update the RDSTINT flag
-	if (g_StatusReg.RDST0 || g_StatusReg.RDST1 ||
-		g_StatusReg.RDST2 || g_StatusReg.RDST3)
-		g_ComCSR.RDSTINT = 1;
-	else
-		g_ComCSR.RDSTINT = 0;
-
-	// check if we have to generate an interrupt
-	if ((g_ComCSR.RDSTINT	& g_ComCSR.RDSTINTMSK) ||
-		(g_ComCSR.TCINT		& g_ComCSR.TCINTMSK))
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_SI, true);
-	}
-	else
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_SI, false);
-	}
-}
-
-void GenerateSIInterrupt(SIInterruptType _SIInterrupt)
-{
-	switch(_SIInterrupt)
-	{
-	case INT_RDSTINT:	g_ComCSR.RDSTINT = 1; break;
-	case INT_TCINT:		g_ComCSR.TCINT = 1; break;
-	}
-
-	UpdateInterrupts();
-}
-
-void RemoveDevice(int _iDeviceNumber)
-{
-	delete g_Channel[_iDeviceNumber].m_pDevice;
-	g_Channel[_iDeviceNumber].m_pDevice = NULL;
-}
-
-void AddDevice(ISIDevice* pDevice)
-{
-	int _iDeviceNumber = pDevice->GetDeviceNumber();
-
-	//_dbg_assert_(SERIALINTERFACE, _iDeviceNumber < NUMBER_OF_CHANNELS);
-
-	// delete the old device
-	RemoveDevice(_iDeviceNumber);
-
-	// create the new one
-	g_Channel[_iDeviceNumber].m_pDevice = pDevice;
-}
-
-void AddDevice(const SIDevices _device, int _iDeviceNumber)
-{
-	ISIDevice *pDevice = SIDevice_Create(_device, _iDeviceNumber);
-	AddDevice(pDevice);
-}
-
-void SetNoResponse(u32 channel)
-{
-	// raise the NO RESPONSE error
-	switch (channel)
-	{
-	case 0: g_StatusReg.NOREP0 = 1; break;
-	case 1: g_StatusReg.NOREP1 = 1; break;
-	case 2: g_StatusReg.NOREP2 = 1; break;
-	case 3: g_StatusReg.NOREP3 = 1; break;
-	}
-	g_ComCSR.COMERR = 1;
-}
-
-void ChangeDeviceCallback(u64 userdata, int cyclesLate)
-{
-	u8 channel = (u8)(userdata >> 32);
-
-	g_Channel[channel].m_Out.Hex = 0;
-	g_Channel[channel].m_InHi.Hex = 0;
-	g_Channel[channel].m_InLo.Hex = 0;
-
-	SetNoResponse(channel);
-
-	AddDevice((SIDevices)(u32)userdata, channel);
-}
-
-void ChangeDevice(SIDevices device, int channel)
-{
-	// Called from GUI, so we need to make it thread safe.
-	// Let the hardware see no device for .5b cycles
-	CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | SIDEVICE_NONE);
-	CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | device);
-}
-
-void UpdateDevices()
-{
-	// Update channels and set the status bit if there's new data
-	g_StatusReg.RDST0 = !!g_Channel[0].m_pDevice->GetData(g_Channel[0].m_InHi.Hex, g_Channel[0].m_InLo.Hex);
-	g_StatusReg.RDST1 = !!g_Channel[1].m_pDevice->GetData(g_Channel[1].m_InHi.Hex, g_Channel[1].m_InLo.Hex);
-	g_StatusReg.RDST2 = !!g_Channel[2].m_pDevice->GetData(g_Channel[2].m_InHi.Hex, g_Channel[2].m_InLo.Hex);
-	g_StatusReg.RDST3 = !!g_Channel[3].m_pDevice->GetData(g_Channel[3].m_InHi.Hex, g_Channel[3].m_InLo.Hex);
-
-	UpdateInterrupts();
-}
-
-void RunSIBuffer()
-{
-	// Math inLength
-	int inLength = g_ComCSR.INLNGTH;
-	if (inLength == 0)
-		inLength = 128;
-	else
-		inLength++;
-
-	// Math outLength
-	int outLength = g_ComCSR.OUTLNGTH;
-	if (outLength == 0)
-		outLength = 128;
-	else
-		outLength++;
-
-	int numOutput = g_Channel[g_ComCSR.CHANNEL].m_pDevice->RunBuffer(g_SIBuffer, inLength);
-
-	DEBUG_LOG(SERIALINTERFACE, "RunSIBuffer     (intLen: %i    outLen: %i) (processed: %i)", inLength, outLength, numOutput);
-
-	// Transfer completed
-	GenerateSIInterrupt(INT_TCINT);
-	g_ComCSR.TSTART = 0;
-}
-
-int GetTicksToNextSIPoll()
-{
-	// Poll for input at regular intervals (once per frame) when playing or recording a movie
-	if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
-	{
-		if (Movie::IsNetPlayRecording())
-			return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2;
-		else
-			return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
-	}
-	if (NetPlay::IsNetPlayRunning())
-		return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2;
-
-	if (!g_Poll.Y && g_Poll.X)
-		return VideoInterface::GetTicksPerLine() * g_Poll.X;
-	else if (!g_Poll.Y)
-		return SystemTimers::GetTicksPerSecond() / 60;
-
-	return min(VideoInterface::GetTicksPerFrame() / g_Poll.Y, VideoInterface::GetTicksPerLine() * g_Poll.X);
-}
-
-} // end of namespace SerialInterface
diff --git a/Source/Core/Core/Src/HW/SI.h b/Source/Core/Core/Src/HW/SI.h
deleted file mode 100644
index c5c8b0dbca..0000000000
--- a/Source/Core/Core/Src/HW/SI.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SERIALINTERFACE_H
-#define _SERIALINTERFACE_H
-
-#include "Common.h"
-#include "SI_Device.h"
-class PointerWrap;
-class ISIDevice;
-
-namespace SerialInterface
-{
-
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-void UpdateDevices();
-
-void RemoveDevice(int _iDeviceNumber);
-void AddDevice(const SIDevices _device, int _iDeviceNumber);
-void AddDevice(ISIDevice* pDevice);
-
-void ChangeDeviceCallback(u64 userdata, int cyclesLate);
-void ChangeDevice(SIDevices device, int channel);
-
-void Read32(u32& _uReturnValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-int GetTicksToNextSIPoll();
-
-}; // end of namespace SerialInterface
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp
deleted file mode 100644
index e9674bcab6..0000000000
--- a/Source/Core/Core/Src/HW/SI_Device.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "SI_Device.h"
-#include "SI_DeviceGCController.h"
-#include "SI_DeviceGCSteeringWheel.h"
-#include "SI_DeviceDanceMat.h"
-#include "SI_DeviceGBA.h"
-#include "SI_DeviceAMBaseboard.h"
-
-
-// --- interface ISIDevice ---
-int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength)
-{
-#ifdef _DEBUG
-	DEBUG_LOG(SERIALINTERFACE, "Send Data Device(%i) - Length(%i)   ", ISIDevice::m_iDeviceNumber,_iLength);
-
-	char szTemp[256] = "";
-	int num = 0;
-	while(num < _iLength)
-	{
-		char szTemp2[128] = "";
-		sprintf(szTemp2, "0x%02x ", _pBuffer[num^3]);
-		strcat(szTemp, szTemp2);
-		num++;
-
-		if ((num % 8) == 0)
-		{
-			DEBUG_LOG(SERIALINTERFACE, "%s", szTemp);
-			szTemp[0] = '\0';
-		}
-	}
-	DEBUG_LOG(SERIALINTERFACE, "%s", szTemp);
-#endif
-	return 0;
-};
-
-
-// Stub class for saying nothing is attached, and not having to deal with null pointers :)
-class CSIDevice_Null : public ISIDevice
-{
-public:
-	CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {}
-	virtual ~CSIDevice_Null() {}
-
-	int RunBuffer(u8* _pBuffer, int _iLength) {
-		reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE;
-		return 4;
-	}
-	bool GetData(u32& _Hi, u32& _Low) {
-		_Hi = 0x80000000;
-		return true;
-	}
-	void SendCommand(u32 _Cmd, u8 _Poll) {}
-};
-
-
-// F A C T O R Y 
-ISIDevice* SIDevice_Create(const SIDevices device, const int port_number)
-{
-	switch (device)
-	{
-	case SIDEVICE_GC_CONTROLLER:
-		return new CSIDevice_GCController(device, port_number);
-		break;
-
-	case SIDEVICE_DANCEMAT:
-		return new CSIDevice_DanceMat(device, port_number);
-		break;
-
-	case SIDEVICE_GC_STEERING:
-		return new CSIDevice_GCSteeringWheel(device, port_number);
-		break;
-
-	case SIDEVICE_GC_TARUKONGA:
-		return new CSIDevice_TaruKonga(device, port_number);
-		break;
-
-	case SIDEVICE_GC_GBA:
-		return new CSIDevice_GBA(device, port_number);
-		break;
-
-	case SIDEVICE_AM_BASEBOARD:
-		return new CSIDevice_AMBaseboard(device, port_number);
-		break;
-
-	case SIDEVICE_NONE:
-	default:
-		return new CSIDevice_Null(device, port_number);
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/HW/SI_Device.h b/Source/Core/Core/Src/HW/SI_Device.h
deleted file mode 100644
index 62614656c7..0000000000
--- a/Source/Core/Core/Src/HW/SI_Device.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SIDEVICE_H
-#define _SIDEVICE_H
-
-#include "Common.h"
-
-class PointerWrap;
-
-// Devices can reply with these
-#define SI_ERROR_NO_RESPONSE    0x0008 // Nothing is attached
-#define SI_ERROR_UNKNOWN        0x0040 // Unknown device is attached
-#define SI_ERROR_BUSY           0x0080 // Still detecting
-
-// Device types
-#define SI_TYPE_MASK            0x18000000u // ???
-#define SI_TYPE_GC              0x08000000u
-
-// GC Controller types
-#define SI_GC_NOMOTOR           0x20000000u // No rumble motor
-#define SI_GC_STANDARD          0x01000000u
-
-// SI Device IDs for emulator use
-enum TSIDevices
-{
-	SI_NONE				= SI_ERROR_NO_RESPONSE,
-	SI_N64_MIC			= 0x00010000,
-	SI_N64_KEYBOARD		= 0x00020000,
-	SI_N64_MOUSE		= 0x02000000,
-	SI_N64_CONTROLLER	= 0x05000000,
-	SI_GBA				= 0x00040000,
-	SI_GC_CONTROLLER	= (SI_TYPE_GC | SI_GC_STANDARD),
-	SI_GC_KEYBOARD		= (SI_TYPE_GC | 0x00200000),
-	SI_GC_STEERING		= SI_TYPE_GC, // (shuffle2)I think the "chainsaw" is the same (Or else it's just standard)
-	SI_DANCEMAT			= (SI_TYPE_GC | SI_GC_STANDARD | 0x00000300),
-	SI_AM_BASEBOARD		= 0x10110800 // gets ORd with dipswitch state
-};
-
-// For configuration use, since some devices can have the same SI Device ID
-enum SIDevices
-{
-	SIDEVICE_NONE,
-	SIDEVICE_N64_MIC,
-	SIDEVICE_N64_KEYBOARD,
-	SIDEVICE_N64_MOUSE,
-	SIDEVICE_N64_CONTROLLER,
-	SIDEVICE_GC_GBA,
-	SIDEVICE_GC_CONTROLLER,
-	SIDEVICE_GC_KEYBOARD,
-	SIDEVICE_GC_STEERING,
-	SIDEVICE_DANCEMAT,
-	SIDEVICE_GC_TARUKONGA,
-	SIDEVICE_AM_BASEBOARD
-};
-
-
-class ISIDevice
-{
-protected:
-	int m_iDeviceNumber;
-	SIDevices m_deviceType;
-
-public:
-	// Constructor
-	ISIDevice(SIDevices deviceType, int _iDeviceNumber)
-		: m_iDeviceNumber(_iDeviceNumber)
-		, m_deviceType(deviceType)
-	{}
-
-	// Destructor
-	virtual ~ISIDevice() {}
-
-	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	// Return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low) = 0;
-
-	// Send a command directly (no detour per buffer)
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) = 0;
-
-	// Savestate support
-	virtual void DoState(PointerWrap& p) {}
-
-
-	int GetDeviceNumber()
-	{
-		return m_iDeviceNumber;
-	}
-
-	SIDevices GetDeviceType()
-	{
-		return m_deviceType;
-	}
-};
-
-extern ISIDevice* SIDevice_Create(const SIDevices device, const int port_number);
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
deleted file mode 100644
index 8c135ca980..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SIDEVICE_AMBASEBOARD_H
-#define _SIDEVICE_AMBASEBOARD_H
-
-// triforce (GC-AM) baseboard
-class CSIDevice_AMBaseboard : public ISIDevice
-{
-private:
-	enum EBufferCommands
-	{
-		CMD_RESET		= 0x00,
-		CMD_GCAM		= 0x70,
-	};
-
-public:
-	// constructor
-	CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
-
-	// run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	// return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low);
-
-	// send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll);
-};
-
-#endif // _SIDEVICE_AMBASEBOARD_H
diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
deleted file mode 100644
index d21371fe36..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "SI.h"
-#include "SI_Device.h"
-#include "SI_DeviceDanceMat.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceMic.h"
-
-#include "GCPad.h"
-
-#include "../Movie.h"
-
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
-#include "ProcessorInterface.h"
-#include "../Core.h"
-
-// --- Dance mat gamecube controller ---
-CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber)
-	: ISIDevice(device, _iDeviceNumber)
-	, m_TButtonComboStart(0)
-	, m_TButtonCombo(0)
-	, m_LastButtonCombo(COMBO_NONE)
-{
-	memset(&m_Origin, 0, sizeof(SOrigin));
-	m_Origin.uCommand			= CMD_ORIGIN;
-	m_Origin.uOriginStickX		= 0x80; // center
-	m_Origin.uOriginStickY		= 0x80;
-	m_Origin.uSubStickStickX	= 0x80;
-	m_Origin.uSubStickStickY	= 0x80;
-	m_Origin.uTrigger_L			= 0x00;
-	m_Origin.uTrigger_R			= 0x00;
-
-	// Dunno if we need to do this, game/lib should set it?
-	m_Mode						= 0x03;
-}
-
-int CSIDevice_DanceMat::RunBuffer(u8* _pBuffer, int _iLength)
-{
-	// For debug logging only
-	ISIDevice::RunBuffer(_pBuffer, _iLength);
-
-	// Read the command
-	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
-
-	// Handle it
-	switch (command)
-	{
-	case CMD_RESET:
-		*(u32*)&_pBuffer[0] = SI_DANCEMAT;
-		break;
-
-	case CMD_DIRECT:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", _iLength);
-			u32 high, low;
-			GetData(high, low);
-			for (int i = 0; i < (_iLength - 1) / 2; i++)
-			{
-				_pBuffer[0 + i] = (high >> (i * 8)) & 0xff;
-				_pBuffer[4 + i] = (low >> (i * 8)) & 0xff;
-			}
-		}
-		break;
-
-	case CMD_ORIGIN:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}
-		}
-		break;
-
-	// Recalibrate (FiRES: i am not 100 percent sure about this)
-	case CMD_RECALIBRATE:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}				
-		}
-		break;
-
-	// DEFAULT
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
-			PanicAlert("SI: Unknown command (0x%x)", command);
-		}			
-		break;
-	}
-
-	return _iLength;
-}
-
-
-// GetData
-
-// Return true on new data (max 7 Bytes and 6 bits ;)
-// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
-//  |\_ ERR_LATCH (error latched - check SISR)
-//  |_ ERR_STATUS (error on last GetData or SendCmd?)
-bool CSIDevice_DanceMat::GetData(u32& _Hi, u32& _Low)
-{
-	SPADStatus PadStatus;
-	memset(&PadStatus, 0, sizeof(PadStatus));
-	
-	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
-	Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
-
-	u32 netValues[2];
-	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
-	{
-		_Hi  = netValues[0];	// first 4 bytes
-		_Low = netValues[1];	// last  4 bytes
-		return true;
-	}
-
-	Movie::SetPolledDevice();
-
-	if(Movie::IsPlayingInput())
-	{
-		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else if(Movie::IsRecordingInput())
-	{
-		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else
-	{
-		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
-	}
-
-	// Map the dpad to the blue arrows, the buttons to the orange arrows
-	// Z = + button, Start = - button
-	u16 map = 0;
-	if (PadStatus.button & PAD_BUTTON_UP)
-		map |= 0x1000;
-	if (PadStatus.button & PAD_BUTTON_DOWN)
-		map |= 0x2;
-	if (PadStatus.button & PAD_BUTTON_LEFT)
-		map |= 0x8;
-	if (PadStatus.button & PAD_BUTTON_RIGHT)
-		map |= 0x4;
-	if (PadStatus.button & PAD_BUTTON_Y)
-		map |= 0x200;
-	if (PadStatus.button & PAD_BUTTON_A)
-		map |= 0x10;
-	if (PadStatus.button & PAD_BUTTON_B)
-		map |= 0x100;
-	if (PadStatus.button & PAD_BUTTON_X)
-		map |= 0x800;
-	if (PadStatus.button & PAD_TRIGGER_Z)
-		map |= 0x400;
-	if (PadStatus.button & PAD_BUTTON_START)
-		map |= 0x1;
-
-	_Hi = (u32)(map << 16) | 0x8080;
-
-	// Low bits are packed differently per mode
-	if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.substickY) << 16);			// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.substickX) << 24);			// All 8 bits
-	}
-	else if (m_Mode == 1)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.triggerRight << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
-	}
-	else if (m_Mode == 2)
-	{
-		// Identifies the dance mat
-		_Low = 0x8080ffff;
-	}
-	else if (m_Mode == 3)
-	{
-		// Analog A/B are always 0
-		_Low  = (u8)PadStatus.triggerRight;						// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-	else if (m_Mode == 4)
-	{
-		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
-		// triggerLeft/Right are always 0
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-	return true;
-}
-
-
-// SendCommand
-void CSIDevice_DanceMat::SendCommand(u32 _Cmd, u8 _Poll)
-{
-	UCommand command(_Cmd);
-
-	switch (command.Command)
-	{
-	// Costis sent it in some demos :)
-	case 0x00:
-		break;
-
-	case CMD_WRITE:
-		{
-			unsigned int uType = command.Parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
-			unsigned int uStrength = command.Parameter2;
-
-			// get the correct pad number that should rumble locally when using netplay
-			const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
-
-			if (numPAD < 4)
-				Pad::Rumble(numPAD, uType, uStrength);
-
-			if (!_Poll)
-			{
-				m_Mode = command.Parameter2;
-				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
-			}
-		}
-		break;
-
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
-			PanicAlert("SI: Unknown direct command");
-		}
-		break;
-	}
-}
-
-// Savestate support
-void CSIDevice_DanceMat::DoState(PointerWrap& p)
-{
-	p.Do(m_Origin);
-	p.Do(m_Mode);
-	p.Do(m_TButtonComboStart);
-	p.Do(m_TButtonCombo);
-	p.Do(m_LastButtonCombo);
-}
diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
deleted file mode 100644
index 7c413026ec..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SI_DEVICEDANCEMAT_H
-#define _SI_DEVICEDANCEMAT_H
-
-#include "SI_Device.h"
-#include "GCPadStatus.h"
-
-
-// standard gamecube controller
-class CSIDevice_DanceMat : public ISIDevice
-{
-private:
-	
-	// Commands
-	enum EBufferCommands
-	{
-		CMD_RESET		= 0x00,
-		CMD_DIRECT		= 0x40,
-		CMD_ORIGIN		= 0x41,
-		CMD_RECALIBRATE	= 0x42,
-	};
-
-	struct SOrigin
-	{
-		u8 uCommand;// Maybe should be button bits?
-		u8 unk_1;	// ..and this would be the other half
-		u8 uOriginStickX;
-		u8 uOriginStickY;
-		u8 uSubStickStickX;
-		u8 uSubStickStickY;
-		u8 uTrigger_L;
-		u8 uTrigger_R;
-		u8 unk_4;
-		u8 unk_5;
-		u8 unk_6;
-		u8 unk_7;
-	};
-
-	enum EDirectCommands
-	{
-		CMD_WRITE = 0x40
-	};
-
-	union UCommand
-	{
-		u32 Hex;
-		struct  
-		{
-			u32 Parameter1	:	8;
-			u32 Parameter2	:	8;
-			u32 Command		:	8;
-			u32				:	8;
-		};
-		UCommand()				{Hex = 0;}
-		UCommand(u32 _iValue)	{Hex = _iValue;}
-	};
-
-	enum EButtonCombo
-	{
-		COMBO_NONE = 0,
-		COMBO_ORIGIN,
-		COMBO_RESET
-	};
-
-	// struct to compare input against
-	// Set on connection and (standard pad only) on button combo
-	SOrigin m_Origin;
-
-	// PADAnalogMode
-	u8 m_Mode;
-
-	// Timer to track special button combos:
-	// y, X, start for 3 seconds updates origin with current status
-	//   Technically, the above is only on standard pad, wavebird does not support it for example
-	// b, x, start for 3 seconds triggers reset (PI reset button interrupt)
-	u64 m_TButtonComboStart, m_TButtonCombo;
-	// Type of button combo from the last/current poll
-	EButtonCombo m_LastButtonCombo;
-
-public:
-
-	// Constructor
-	CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
-
-	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	// Send and Receive pad input from network
-	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
-	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
-
-	// Return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low);
-
-	// Send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll);
-
-	// Savestate support
-	virtual void DoState(PointerWrap& p);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
deleted file mode 100644
index 937bf45036..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "SI_Device.h"
-#include "SI_DeviceGBA.h"
-
-#include "SFML/Network.hpp"
-#include "Thread.h"
-#include <queue>
-
-static std::thread connectionThread;
-static std::queue<sf::SocketTCP> waiting_socks;
-static std::mutex cs_gba;
-namespace { volatile bool server_running; }
-
-// --- GameBoy Advance "Link Cable" ---
-
-void GBAConnectionWaiter()
-{
-	server_running = true;
-
-	Common::SetCurrentThreadName("GBA Connection Waiter");
-
-	sf::SocketTCP server;
-	// "dolphin gba"
-	if (!server.Listen(0xd6ba))
-		return;
-	
-	server.SetBlocking(false);
-	
-	sf::SocketTCP new_client;
-	while (server_running)
-	{
-		if (server.Accept(new_client) == sf::Socket::Done)
-		{
-			std::lock_guard<std::mutex> lk(cs_gba);
-			waiting_socks.push(new_client);
-		}
-		SLEEP(1);
-	}
-	server.Close();
-	return;
-}
-
-void GBAConnectionWaiter_Shutdown()
-{
-	server_running = false;
-	if (connectionThread.joinable())
-		connectionThread.join();
-}
-
-bool GetAvailableSock(sf::SocketTCP& sock_to_fill)
-{
-	bool sock_filled = false;
-
-	std::lock_guard<std::mutex> lk(cs_gba);
-
-	if (waiting_socks.size())
-	{
-		sock_to_fill = waiting_socks.front();
-		waiting_socks.pop();
-		sock_filled = true;
-	}
-
-	return sock_filled;
-}
-
-GBASockServer::GBASockServer()
-{
-	if (!connectionThread.joinable())
-		connectionThread = std::thread(GBAConnectionWaiter);
-}
-
-GBASockServer::~GBASockServer()
-{
-	client.Close();
-}
-
-// Blocking, since GBA must always send lower byte of REG_JOYSTAT
-void GBASockServer::Transfer(char* si_buffer)
-{
-	if (!client.IsValid())
-		if (!GetAvailableSock(client))
-			return;
-
-	for (int i = 0; i < 5; i++)
-		current_data[i] = si_buffer[i ^ 3];
-
-	u8 cmd = *current_data;
-
-	if (cmd == CMD_WRITE)
-		client.Send(current_data, sizeof(current_data));
-	else
-		client.Send(current_data, 1);
-
-	DEBUG_LOG(SERIALINTERFACE, "> command %02x %02x%02x%02x%02x",
-		(u8)current_data[0], (u8)current_data[1], (u8)current_data[2],
-		(u8)current_data[3], (u8)current_data[4]);
-
-	memset(current_data, 0, sizeof(current_data));
-	size_t num_received = 0;
-	if (client.Receive(current_data, sizeof(current_data), num_received) == sf::Socket::Disconnected)
-		client.Close();
-
-	DEBUG_LOG(SERIALINTERFACE, "< %02x%02x%02x%02x%02x",
-		(u8)current_data[0], (u8)current_data[1], (u8)current_data[2],
-		(u8)current_data[3], (u8)current_data[4]);
-
-#ifdef _DEBUG
-	size_t num_expecting = 3;
-	if (cmd == CMD_READ)
-		num_expecting = 5;
-	else if (cmd == CMD_WRITE)
-		num_expecting = 1;
-	if (num_received != num_expecting)
-		ERROR_LOG(SERIALINTERFACE, "%x:%x:%x", (u8)cmd,
-				(unsigned int)num_received, (unsigned int)num_expecting);
-#endif
-
-	for (int i = 0; i < 5; i++)
-		si_buffer[i ^ 3] = current_data[i];
-}
-
-CSIDevice_GBA::CSIDevice_GBA(SIDevices _device, int _iDeviceNumber)
-	: ISIDevice(_device, _iDeviceNumber)
-	, GBASockServer()
-{
-}
-
-int CSIDevice_GBA::RunBuffer(u8* _pBuffer, int _iLength)
-{
-	Transfer((char*)_pBuffer);
-	return _iLength;
-}
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.h b/Source/Core/Core/Src/HW/SI_DeviceGBA.h
deleted file mode 100644
index 7783d06285..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SI_DEVICEGBA_H
-#define _SI_DEVICEGBA_H
-
-#include "SFML/Network.hpp"
-
-// GameBoy Advance "Link Cable"
-
-void GBAConnectionWaiter_Shutdown();
-
-class GBASockServer : public sf::SocketTCP
-{
-public:
-	GBASockServer();
-	~GBASockServer();
-
-	void Transfer(char* si_buffer);
-
-private:
-	enum EJoybusCmds
-	{
-		CMD_RESET	= 0xff,
-		CMD_STATUS	= 0x00,
-		CMD_READ	= 0x14,
-		CMD_WRITE	= 0x15
-	};
-
-	sf::SocketTCP client;
-	char current_data[5];
-};
-
-class CSIDevice_GBA : public ISIDevice, private GBASockServer
-{
-public:
-	CSIDevice_GBA(SIDevices device, int _iDeviceNumber);
-	~CSIDevice_GBA() {}
-
-	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	virtual bool GetData(u32& _Hi, u32& _Low) { return true; }
-	virtual void SendCommand(u32 _Cmd, u8 _Poll) {}
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
deleted file mode 100644
index 0c4bf48dcb..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "SI.h"
-#include "SI_Device.h"
-#include "SI_DeviceGCController.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceMic.h"
-
-#include "GCPad.h"
-
-#include "../Movie.h"
-
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
-#include "ProcessorInterface.h"
-#include "../Core.h"
-
-// --- standard gamecube controller ---
-CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber)
-	: ISIDevice(device, _iDeviceNumber)
-	, m_TButtonComboStart(0)
-	, m_TButtonCombo(0)
-	, m_LastButtonCombo(COMBO_NONE)
-{
-	memset(&m_Origin, 0, sizeof(SOrigin));
-	m_Origin.uCommand			= CMD_ORIGIN;
-	m_Origin.uOriginStickX		= 0x80; // center
-	m_Origin.uOriginStickY		= 0x80;
-	m_Origin.uSubStickStickX	= 0x80;
-	m_Origin.uSubStickStickY	= 0x80;
-	m_Origin.uTrigger_L			= 0x1F; // 0-30 is the lower deadzone
-	m_Origin.uTrigger_R			= 0x1F;
-
-	// Dunno if we need to do this, game/lib should set it?
-	m_Mode						= 0x03;
-}
-
-int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
-{
-	// For debug logging only
-	ISIDevice::RunBuffer(_pBuffer, _iLength);
-
-	// Read the command
-	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
-
-	// Handle it
-	switch (command)
-	{
-	case CMD_RESET:
-		*(u32*)&_pBuffer[0] = SI_GC_CONTROLLER;
-		break;
-
-	case CMD_DIRECT:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", _iLength);
-			u32 high, low;
-			GetData(high, low);
-			for (int i = 0; i < (_iLength - 1) / 2; i++)
-			{
-				_pBuffer[0 + i] = (high >> (i * 8)) & 0xff;
-				_pBuffer[4 + i] = (low >> (i * 8)) & 0xff;
-			}
-		}
-		break;
-
-	case CMD_ORIGIN:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}
-		}
-		break;
-
-	// Recalibrate (FiRES: i am not 100 percent sure about this)
-	case CMD_RECALIBRATE:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}				
-		}
-		break;
-
-	// DEFAULT
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
-			PanicAlert("SI: Unknown command (0x%x)", command);
-		}			
-		break;
-	}
-
-	return _iLength;
-}
-
-
-// GetData
-
-// Return true on new data (max 7 Bytes and 6 bits ;)
-// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
-//  |\_ ERR_LATCH (error latched - check SISR)
-//  |_ ERR_STATUS (error on last GetData or SendCmd?)
-bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
-{
-	SPADStatus PadStatus;
-	memset(&PadStatus, 0, sizeof(PadStatus));
-	
-	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
-	Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
-
-	u32 netValues[2];
-	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
-	{
-		_Hi  = netValues[0];	// first 4 bytes
-		_Low = netValues[1];	// last  4 bytes
-		return true;
-	}
-
-	Movie::SetPolledDevice();
-
-	if(Movie::IsPlayingInput())
-	{
-		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else if(Movie::IsRecordingInput())
-	{
-		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else
-	{
-		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
-	}
-
-	// Thankfully changing mode does not change the high bits ;)
-	_Hi  = (u32)((u8)PadStatus.stickY);
-	_Hi |= (u32)((u8)PadStatus.stickX << 8);
-	_Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16);
-
-	// Low bits are packed differently per mode
-	if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.substickY) << 16);			// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.substickX) << 24);			// All 8 bits
-	}
-	else if (m_Mode == 1)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.triggerRight << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
-	}
-	else if (m_Mode == 2)
-	{
-		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20);	// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
-	}
-	else if (m_Mode == 3)
-	{
-		// Analog A/B are always 0
-		_Low  = (u8)PadStatus.triggerRight;						// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-	else if (m_Mode == 4)
-	{
-		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
-		// triggerLeft/Right are always 0
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-
-	// Keep track of the special button combos (embedded in controller hardware... :( )
-	EButtonCombo tempCombo;
-	if ((PadStatus.button & 0xff00) == (PAD_BUTTON_Y|PAD_BUTTON_X|PAD_BUTTON_START))
-		tempCombo = COMBO_ORIGIN;
-	else if ((PadStatus.button & 0xff00) == (PAD_BUTTON_B|PAD_BUTTON_X|PAD_BUTTON_START))
-		tempCombo = COMBO_RESET;
-	else
-		tempCombo = COMBO_NONE;
-	if (tempCombo != m_LastButtonCombo)
-	{
-		m_LastButtonCombo = tempCombo;
-		if (m_LastButtonCombo != COMBO_NONE)
-			m_TButtonComboStart = CoreTiming::GetTicks();
-	}
-	if (m_LastButtonCombo != COMBO_NONE)
-	{
-		m_TButtonCombo = CoreTiming::GetTicks();
-		if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3)
-		{
-			if (m_LastButtonCombo == COMBO_RESET)
-				ProcessorInterface::ResetButton_Tap();
-			else if (m_LastButtonCombo == COMBO_ORIGIN)
-			{
-				m_Origin.uOriginStickX		= PadStatus.stickX;
-				m_Origin.uOriginStickY		= PadStatus.stickY;
-				m_Origin.uSubStickStickX	= PadStatus.substickX;
-				m_Origin.uSubStickStickY	= PadStatus.substickY;
-				m_Origin.uTrigger_L			= PadStatus.triggerLeft;
-				m_Origin.uTrigger_R			= PadStatus.triggerRight;
-			}
-			m_LastButtonCombo = COMBO_NONE;
-		}
-	}
-
-	return true;
-}
-
-
-// SendCommand
-void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
-{
-	UCommand command(_Cmd);
-
-	switch (command.Command)
-	{
-	// Costis sent it in some demos :)
-	case 0x00:
-		break;
-
-	case CMD_WRITE:
-		{
-			unsigned int uType = command.Parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
-			unsigned int uStrength = command.Parameter2;
-
-			// get the correct pad number that should rumble locally when using netplay
-			const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
-
-			if (numPAD < 4)
-				Pad::Rumble(numPAD, uType, uStrength);
-
-			if (!_Poll)
-			{
-				m_Mode = command.Parameter2;
-				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
-			}
-		}
-		break;
-
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
-			PanicAlert("SI: Unknown direct command");
-		}
-		break;
-	}
-}
-
-// Savestate support
-void CSIDevice_GCController::DoState(PointerWrap& p)
-{
-	p.Do(m_Origin);
-	p.Do(m_Mode);
-	p.Do(m_TButtonComboStart);
-	p.Do(m_TButtonCombo);
-	p.Do(m_LastButtonCombo);
-}
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h
deleted file mode 100644
index 9673041c6f..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SI_DEVICEGCCONTROLLER_H
-#define _SI_DEVICEGCCONTROLLER_H
-
-#include "SI_Device.h"
-#include "GCPadStatus.h"
-
-
-// standard gamecube controller
-class CSIDevice_GCController : public ISIDevice
-{
-private:
-	
-	// Commands
-	enum EBufferCommands
-	{
-		CMD_RESET		= 0x00,
-		CMD_DIRECT		= 0x40,
-		CMD_ORIGIN		= 0x41,
-		CMD_RECALIBRATE	= 0x42,
-	};
-
-	struct SOrigin
-	{
-		u8 uCommand;// Maybe should be button bits?
-		u8 unk_1;	// ..and this would be the other half
-		u8 uOriginStickX;
-		u8 uOriginStickY;
-		u8 uSubStickStickX;
-		u8 uSubStickStickY;
-		u8 uTrigger_L;
-		u8 uTrigger_R;
-		u8 unk_4;
-		u8 unk_5;
-		u8 unk_6;
-		u8 unk_7;
-	};
-
-	enum EDirectCommands
-	{
-		CMD_WRITE = 0x40
-	};
-
-	union UCommand
-	{
-		u32 Hex;
-		struct  
-		{
-			u32 Parameter1	:	8;
-			u32 Parameter2	:	8;
-			u32 Command		:	8;
-			u32				:	8;
-		};
-		UCommand()				{Hex = 0;}
-		UCommand(u32 _iValue)	{Hex = _iValue;}
-	};
-
-	enum EButtonCombo
-	{
-		COMBO_NONE = 0,
-		COMBO_ORIGIN,
-		COMBO_RESET
-	};
-
-	// struct to compare input against
-	// Set on connection and (standard pad only) on button combo
-	SOrigin m_Origin;
-
-	// PADAnalogMode
-	u8 m_Mode;
-
-	// Timer to track special button combos:
-	// y, X, start for 3 seconds updates origin with current status
-	//   Technically, the above is only on standard pad, wavebird does not support it for example
-	// b, x, start for 3 seconds triggers reset (PI reset button interrupt)
-	u64 m_TButtonComboStart, m_TButtonCombo;
-	// Type of button combo from the last/current poll
-	EButtonCombo m_LastButtonCombo;
-
-public:
-
-	// Constructor
-	CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
-
-	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	// Send and Receive pad input from network
-	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
-	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
-
-	// Return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low);
-
-	// Send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll);
-
-	// Savestate support
-	virtual void DoState(PointerWrap& p);
-};
-
-
-// "TaruKonga", the DK Bongo controller
-class CSIDevice_TaruKonga : public CSIDevice_GCController
-{
-public:
-	CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { }
-
-	virtual bool GetData(u32& _Hi, u32& _Low)
-	{
-		CSIDevice_GCController::GetData(_Hi, _Low);
-		_Hi &= ~PAD_USE_ORIGIN << 16;
-		return true;
-	}
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
deleted file mode 100644
index 4102d29193..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "SI.h"
-#include "SI_Device.h"
-#include "SI_DeviceGCSteeringWheel.h"
-
-#include "EXI_Device.h"
-#include "EXI_DeviceMic.h"
-
-#include "GCPad.h"
-
-#include "../Movie.h"
-
-#include "../CoreTiming.h"
-#include "SystemTimers.h"
-#include "ProcessorInterface.h"
-#include "../Core.h"
-
-// --- standard gamecube controller ---
-CSIDevice_GCSteeringWheel::CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber)
-	: ISIDevice(device, _iDeviceNumber)
-	, m_TButtonComboStart(0)
-	, m_TButtonCombo(0)
-	, m_LastButtonCombo(COMBO_NONE)
-{
-	memset(&m_Origin, 0, sizeof(SOrigin));
-	m_Origin.uCommand			= CMD_ORIGIN;
-	m_Origin.uOriginStickX		= 0x80; // center
-	m_Origin.uOriginStickY		= 0x80;
-	m_Origin.uSubStickStickX	= 0x80;
-	m_Origin.uSubStickStickY	= 0x80;
-	m_Origin.uTrigger_L			= 0x1F; // 0-30 is the lower deadzone
-	m_Origin.uTrigger_R			= 0x1F;
-
-	// Dunno if we need to do this, game/lib should set it?
-	m_Mode						= 0x03;
-}
-
-int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
-{
-	// For debug logging only
-	ISIDevice::RunBuffer(_pBuffer, _iLength);
-
-	// Read the command
-	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
-
-	// Handle it
-	switch (command)
-	{
-	case CMD_RESET:
-		*(u32*)&_pBuffer[0] = SI_GC_STEERING;
-		break;
-
-	case CMD_ORIGIN:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}
-		}
-		break;
-
-	// Recalibrate (FiRES: i am not 100 percent sure about this)
-	case CMD_RECALIBRATE:
-		{
-			INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
-			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
-			for (int i = 0; i < (int)sizeof(SOrigin); i++)
-			{
-				_pBuffer[i ^ 3] = *pCalibration++;
-			}
-		}
-		break;
-
-	// Seen in F-Zero GX
-	case CMD_MOTOR_OFF:
-		break;
-
-	// DEFAULT
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
-		}
-		break;
-	}
-
-	return _iLength;
-}
-
-
-// GetData
-
-// Return true on new data (max 7 Bytes and 6 bits ;)
-// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
-//  |\_ ERR_LATCH (error latched - check SISR)
-//  |_ ERR_STATUS (error on last GetData or SendCmd?)
-bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low)
-{
-	SPADStatus PadStatus;
-	memset(&PadStatus, 0, sizeof(PadStatus));
-	
-	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
-	Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
-
-	u32 netValues[2];
-	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
-	{
-		_Hi  = netValues[0];	// first 4 bytes
-		_Low = netValues[1];	// last  4 bytes
-		return true;
-	}
-
-	Movie::SetPolledDevice();
-
-	if(Movie::IsPlayingInput())
-	{
-		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else if(Movie::IsRecordingInput())
-	{
-		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
-		Movie::InputUpdate();
-	}
-	else
-	{
-		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
-	}
-
-	// Thankfully changing mode does not change the high bits ;)
-	_Hi  = (u32)((u8)PadStatus.stickX); // Steering
-	_Hi |= 0x800; // Pedal connected flag
-	_Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16);
-
-	// Low bits are packed differently per mode
-	if (m_Mode == 0 || m_Mode == 5 || m_Mode == 7)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.substickY) << 16);			// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.substickX) << 24);			// All 8 bits
-	}
-	else if (m_Mode == 1)
-	{
-		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.triggerRight << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
-	}
-	else if (m_Mode == 2)
-	{
-		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16);	// Top 4 bits
-		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20);	// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
-	}
-	else if (m_Mode == 3)
-	{
-		// Analog A/B are always 0
-		_Low  = (u8)PadStatus.triggerRight;						// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-	else if (m_Mode == 4)
-	{
-		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
-		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
-		// triggerLeft/Right are always 0
-		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
-		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
-	}
-	else if (m_Mode == 6)
-	{
-		_Low  = (u8)PadStatus.triggerRight;						// All 8 bits
-		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);			// All 8 bits
-
-		// The GC Steering Wheel appears to have combined pedals
-		// (both the Accelerate and Brake pedals are mapped to a single axis)
-		// We use the stickY axis for the pedals.
-		if (PadStatus.stickY < 128)
-			_Low |= (u32)((u8)(255 - ((PadStatus.stickY & 0x7f) * 2)) << 16); // All 8 bits (Brake)
-		if (PadStatus.stickY >= 128)
-			_Low |= (u32)((u8)((PadStatus.stickY & 0x7f) * 2) << 24); // All 8 bits (Accelerate)
-	}
-
-	// Keep track of the special button combos (embedded in controller hardware... :( )
-	EButtonCombo tempCombo;
-	if ((PadStatus.button & 0xff00) == (PAD_BUTTON_Y|PAD_BUTTON_X|PAD_BUTTON_START))
-		tempCombo = COMBO_ORIGIN;
-	else if ((PadStatus.button & 0xff00) == (PAD_BUTTON_B|PAD_BUTTON_X|PAD_BUTTON_START))
-		tempCombo = COMBO_RESET;
-	else
-		tempCombo = COMBO_NONE;
-	if (tempCombo != m_LastButtonCombo)
-	{
-		m_LastButtonCombo = tempCombo;
-		if (m_LastButtonCombo != COMBO_NONE)
-			m_TButtonComboStart = CoreTiming::GetTicks();
-	}
-	if (m_LastButtonCombo != COMBO_NONE)
-	{
-		m_TButtonCombo = CoreTiming::GetTicks();
-		if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3)
-		{
-			if (m_LastButtonCombo == COMBO_RESET)
-			{
-				ProcessorInterface::ResetButton_Tap();
-			}
-			else if (m_LastButtonCombo == COMBO_ORIGIN)
-			{
-				m_Origin.uOriginStickX		= PadStatus.stickX;
-				m_Origin.uOriginStickY		= PadStatus.stickY;
-				m_Origin.uSubStickStickX	= PadStatus.substickX;
-				m_Origin.uSubStickStickY	= PadStatus.substickY;
-				m_Origin.uTrigger_L			= PadStatus.triggerLeft;
-				m_Origin.uTrigger_R			= PadStatus.triggerRight;
-			}
-			m_LastButtonCombo = COMBO_NONE;
-		}
-	}
-
-	return true;
-}
-
-
-// SendCommand
-void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
-{
-	UCommand command(_Cmd);
-
-	switch (command.Command)
-	{
-	// Costis sent it in some demos :)
-	case 0x00:
-		break;
-
-	case CMD_FORCE:
-		{
-			unsigned int uStrength = command.Parameter1; // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong
-			unsigned int uType = command.Parameter2;  // 06 = motor on, 04 = motor off
-
-			// get the correct pad number that should rumble locally when using netplay
-			const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
-
-			if (numPAD < 4)
-				Pad::Motor(numPAD, uType, uStrength);
-
-			if (!_Poll)
-			{
-				m_Mode = command.Parameter2;
-				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
-			}
-		}
-		break;
-
-	case CMD_WRITE:
-		{
-			unsigned int uType = command.Parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
-			unsigned int uStrength = command.Parameter2;
-
-			// get the correct pad number that should rumble locally when using netplay
-			const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
-
-			if (numPAD < 4)
-				Pad::Rumble(numPAD, uType, uStrength);
-
-			if (!_Poll)
-			{
-				m_Mode = command.Parameter2;
-				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
-			}
-		}
-		break;
-
-	default:
-		{
-			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
-		}
-		break;
-	}
-}
-
-// Savestate support
-void CSIDevice_GCSteeringWheel::DoState(PointerWrap& p)
-{
-	p.Do(m_Origin);
-	p.Do(m_Mode);
-	p.Do(m_TButtonComboStart);
-	p.Do(m_TButtonCombo);
-	p.Do(m_LastButtonCombo);
-}
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
deleted file mode 100644
index 2398b8f321..0000000000
--- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _SI_DEVICEGCSTEERINGWHEEL_H
-#define _SI_DEVICEGCSTEERINGWHEEL_H
-
-#include "SI_Device.h"
-#include "GCPadStatus.h"
-
-
-// standard gamecube controller
-class CSIDevice_GCSteeringWheel : public ISIDevice
-{
-private:
-	
-	// Commands
-	enum EBufferCommands
-	{
-		CMD_RESET		= 0x00,
-		CMD_ORIGIN		= 0x41,
-		CMD_RECALIBRATE	= 0x42,
-		CMD_MOTOR_OFF	= 0xff,
-	};
-
-	struct SOrigin
-	{
-		u8 uCommand;// Maybe should be button bits?
-		u8 unk_1;	// ..and this would be the other half
-		u8 uOriginStickX;
-		u8 uOriginStickY;
-		u8 uSubStickStickX;
-		u8 uSubStickStickY;
-		u8 uTrigger_L;
-		u8 uTrigger_R;
-		u8 unk_4;
-		u8 unk_5;
-		u8 unk_6;
-		u8 unk_7;
-	};
-
-	enum EDirectCommands
-	{
-		CMD_FORCE = 0x30,
-		CMD_WRITE = 0x40
-	};
-
-	union UCommand
-	{
-		u32 Hex;
-		struct  
-		{
-			u32 Parameter1	:	8;
-			u32 Parameter2	:	8;
-			u32 Command		:	8;
-			u32				:	8;
-		};
-		UCommand()				{Hex = 0;}
-		UCommand(u32 _iValue)	{Hex = _iValue;}
-	};
-
-	enum EButtonCombo
-	{
-		COMBO_NONE = 0,
-		COMBO_ORIGIN,
-		COMBO_RESET
-	};
-
-	// struct to compare input against
-	// Set on connection and (standard pad only) on button combo
-	SOrigin m_Origin;
-
-	// PADAnalogMode
-	u8 m_Mode;
-
-	// Timer to track special button combos:
-	// y, X, start for 3 seconds updates origin with current status
-	//   Technically, the above is only on standard pad, wavebird does not support it for example
-	// b, x, start for 3 seconds triggers reset (PI reset button interrupt)
-	u64 m_TButtonComboStart, m_TButtonCombo;
-	// Type of button combo from the last/current poll
-	EButtonCombo m_LastButtonCombo;
-
-public:
-
-	// Constructor
-	CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
-
-	// Run the SI Buffer
-	virtual int RunBuffer(u8* _pBuffer, int _iLength);
-
-	// Send and Receive pad input from network
-	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
-	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
-
-	// Return true on new data
-	virtual bool GetData(u32& _Hi, u32& _Low);
-
-	// Send a command directly
-	virtual void SendCommand(u32 _Cmd, u8 _Poll);
-
-	// Savestate support
-	virtual void DoState(PointerWrap& p);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/HW/Sram.cpp b/Source/Core/Core/Src/HW/Sram.cpp
deleted file mode 100644
index ba2fa12957..0000000000
--- a/Source/Core/Core/Src/HW/Sram.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Sram.h"
-#include "../ConfigManager.h"
-// english
-SRAM sram_dump = {{
-	0x04, 0x6B,
-	0xFB, 0x91,
-	0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00,
-	0xFF, 0xFF, 0xFF, 0x40,
-	0x05,
-	0x00,
-	0x00,
-	0x2C,
-	0x44, 0x4F, 0x4C, 0x50, 0x48, 0x49, 0x4E, 0x53, 0x4C, 0x4F, 0x54, 0x41,
-	0x44, 0x4F, 0x4C, 0x50, 0x48, 0x49, 0x4E, 0x53, 0x4C, 0x4F, 0x54, 0x42,
-	0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00,
-	0x00,
-	0x6E, 0x6D,
-	0x00, 0x00,
-	0x00, 0x00
-}};
-
-#if 0
-// german
-SRAM sram_dump_german = {{ 
-	0x1F, 0x66,
-	0xE0, 0x96,
-	0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00,
-	0x04, 0xEA, 0x19, 0x40,
-	0x00,
-	0x00,
-	0x01,
-	0x3C,
-	0x12, 0xD5,	0xEA, 0xD3,	0x00, 0xFA,	0x2D, 0x33, 0x13, 0x41, 0x26, 0x03,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00, 0x00,
-	0x00,
-	0x00,
-	0x84, 0xFF,
-	0x00, 0x00,
-	0x00, 0x00
-}};
-#endif
-
-void initSRAM()
-{
-	File::IOFile file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strSRAM, "rb");
-	if (file)
-	{
-		if (!file.ReadArray(&g_SRAM, 1))
-		{
-			ERROR_LOG(EXPANSIONINTERFACE,  "EXI IPL-DEV: Could not read all of SRAM");
-			g_SRAM = sram_dump;
-		}
-	}
-	else
-	{
-		g_SRAM = sram_dump;
-	}
-}
-
-void SetCardFlashID(u8* buffer, u8 card_index)
-{
-	u64 rand = Common::swap64( *(u64*)&(buffer[12]));
-	u8 csum=0;
-	for(int i = 0; i < 12; i++)
-	{
-		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);
-		csum += g_SRAM.flash_id[card_index][i] = buffer[i] - ((u8)rand&0xff);
-		rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16);	
-		rand &= (u64)0x0000000000007fffULL;
-	}
-	g_SRAM.flashID_chksum[card_index] = csum^0xFF;
-}
-
diff --git a/Source/Core/Core/Src/HW/Sram.h b/Source/Core/Core/Src/HW/Sram.h
deleted file mode 100644
index 91e8b2a8b9..0000000000
--- a/Source/Core/Core/Src/HW/Sram.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Modified code taken from libogc
-/*-------------------------------------------------------------
-
-system.h -- OS functions and initialization
-
-Copyright (C) 2004
-Michael Wiedenbauer (shagkur)
-Dave Murphy (WinterMute)
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1.	The origin of this software must not be misrepresented; you
-must not claim that you wrote the original software. If you use
-this software in a product, an acknowledgment in the product
-documentation would be appreciated but is not required.
-
-2.	Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3.	This notice may not be removed or altered from any source
-distribution.
-
-
--------------------------------------------------------------*/
-#ifndef __SRAM_h__
-#define __SRAM_h__
-
-#include "Common.h"
-
-#pragma pack(push,1)
-union SRAM
-{
-	u8 p_SRAM[64];
-	struct {					// Stored configuration value from the system SRAM area
-		u16 checksum;			// holds the block checksum.
-		u16 checksum_inv;		// holds the inverse block checksum
-		u32 ead0;				// unknown attribute
-		u32 ead1;				// unknown attribute
-		u32 counter_bias;		// bias value for the realtime clock
-		s8 display_offsetH;		// pixel offset for the VI
-		u8 ntd;					// unknown attribute
-		u8 lang;				// language of system
-		u8 flags;				// device and operations flag
-
-								// Stored configuration value from the extended SRAM area
-		u8 flash_id[2][12];		// flash_id[2][12] 96bit memorycard unlock flash ID
-		u32 wirelessKbd_id;		// Device ID of last connected wireless keyboard
-		u16 wirelessPad_id[4];	// 16bit device ID of last connected pad.
-		u8 dvderr_code;			// last non-recoverable error from DVD interface
-		u8 __padding0;			// reserved
-		u8 flashID_chksum[2];	// 8bit checksum of unlock flash ID
-		u32 __padding1;			// padding
-	};
-};
-#pragma pack(pop)
-void initSRAM();
-void SetCardFlashID(u8* buffer, u8 card_index);
-
-extern SRAM sram_dump;
-extern SRAM g_SRAM;
-#endif
diff --git a/Source/Core/Core/Src/HW/StreamADPCM.h b/Source/Core/Core/Src/HW/StreamADPCM.h
deleted file mode 100644
index 797eca1d5f..0000000000
--- a/Source/Core/Core/Src/HW/StreamADPCM.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Adapted from in_cube by hcs & destop
-
-#ifndef _STREAMADPCM_H
-#define _STREAMADPCM_H
-
-#include "Common.h"
-
-class NGCADPCM
-{
-public:
-	enum
-	{
-		ONE_BLOCK_SIZE = 32,
-		SAMPLES_PER_BLOCK = 28
-	};
-
-	static void InitFilter();
-	static void DecodeBlock(s16 *pcm, const u8 *adpcm);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp
deleted file mode 100644
index bf77060c83..0000000000
--- a/Source/Core/Core/Src/HW/SystemTimers.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-
-// This file controls all system timers
-
-/* (shuffle2) I don't know who wrote this, but take it with salt. For starters, "time" is contextual...
-"Time" is measured in frames, not time: These update frequencies are determined by the passage
-of frames. So if a game runs slow, on a slow computer for example, these updates will occur
-less frequently. This makes sense because almost all console games are controlled by frames
-rather than time, so if a game can't keep up with the normal framerate all animations and
-actions slows down and the game runs to slow. This is different from PC games that are
-often controlled by time instead and may not have maximum framerates.
-
-However, I'm not sure if the Bluetooth communication for the Wiimote is entirely frame
-dependent, the timing problems with the ack command in Zelda - TP may be related to
-time rather than frames? For now the IPC_HLE_PERIOD is frame dependent, but because of
-different conditions on the way to PluginWiimote::Wiimote_Update() the updates may actually
-be time related after all, or not?
-
-I'm not sure about this but the text below seems to assume that 60 fps means that the game
-runs in the normal intended speed. In that case an update time of [GetTicksPerSecond() / 60]
-would mean one update per frame and [GetTicksPerSecond() / 250] would mean four updates per
-frame.
-
-
-IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
-	IPC_HLE_UpdateCallback() // In this file
-
-		// This function seems to call all devices' Update() function four times per frame
-		WII_IPC_HLE_Interface::Update()
-
-			// If the AclFrameQue is empty this will call Wiimote_Update() and make it send
-			the current input status to the game. I'm not sure if this occurs approximately
-			once every frame or if the frequency is not exactly tied to rendered frames
-			CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
-			PluginWiimote::Wiimote_Update()
-
-			// This is also a device updated by WII_IPC_HLE_Interface::Update() but it doesn't
-			seem to ultimately call PluginWiimote::Wiimote_Update(). However it can be called
-			by the /dev/usb/oh1 device if the AclFrameQue is empty.
-			CWII_IPC_HLE_WiiMote::Update()
-*/
-
-
-#include "Common.h"
-#include "Atomic.h"
-#include "../PatchEngine.h"
-#include "SystemTimers.h"
-#include "../HW/DSP.h"
-#include "../HW/AudioInterface.h"
-#include "../HW/VideoInterface.h"
-#include "../HW/SI.h"
-#include "../HW/EXI_DeviceIPL.h"
-#include "../PowerPC/PowerPC.h"
-#include "../CoreTiming.h"
-#include "../ConfigManager.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
-#include "../DSPEmulator.h"
-#include "Thread.h"
-#include "Timer.h"
-#include "VideoBackendBase.h"
-#include "CommandProcessor.h"
-
-
-namespace SystemTimers
-{
-
-u32 CPU_CORE_CLOCK  = 486000000u;             // 486 mhz (its not 485, stop bugging me!)
-
-/*
-Gamecube						MHz
-flipper <-> ARAM bus:			81 (DSP)
-gekko <-> flipper bus:			162
-flipper <-> 1T-SRAM bus:		324
-gekko:							486
-
-These contain some guesses:
-Wii								MHz
-hollywood <-> GDDR3 RAM bus:	??? no idea really
-broadway <-> hollywood bus:		243
-hollywood <-> 1T-SRAM bus:		486
-broadway:						729
-*/
-// Ratio of TB and Decrementer to clock cycles.
-// TB clk is 1/4 of BUS clk. And it seems BUS clk is really 1/3 of CPU clk.
-// So, ratio is 1 / (1/4 * 1/3 = 1/12) = 12.
-// note: ZWW is ok and faster with TIMER_RATIO=8 though.
-// !!! POSSIBLE STABLE PERF BOOST HACK THERE !!!
-
-enum
-{
-	TIMER_RATIO = 12
-};
-
-int et_Dec;
-int et_VI;
-int et_SI;
-int et_CP;
-int et_AudioDMA;
-int et_DSP;
-int et_IPC_HLE;
-int et_PatchEngine;	// PatchEngine updates every 1/60th of a second by default
-
-// These are badly educated guesses
-// Feel free to experiment. Set these in Init below.
-int
-	// This is a fixed value, don't change it 
-	AUDIO_DMA_PERIOD,
-
-	// Regulates the speed of the Command Processor
-	CP_PERIOD,
-
-	// This is completely arbitrary. If we find that we need lower latency, we can just
-	// increase this number.
-	IPC_HLE_PERIOD;
-
-
-
-u32 GetTicksPerSecond()
-{
-	return CPU_CORE_CLOCK;
-}
-
-u32 ConvertMillisecondsToTicks(u32 _Milliseconds)
-{
-	return GetTicksPerSecond() / 1000 * _Milliseconds;
-}
-
-// DSP/CPU timeslicing.
-void DSPCallback(u64 userdata, int cyclesLate)
-{
-	//splits up the cycle budget in case lle is used
-	//for hle, just gives all of the slice to hle
-	DSP::UpdateDSPSlice(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate);
-	CoreTiming::ScheduleEvent(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate, et_DSP);
-}
-
-void AudioDMACallback(u64 userdata, int cyclesLate)
-{
-	int fields = VideoInterface::GetNumFields();
-	int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32 * fields);
-	DSP::UpdateAudioDMA();  // Push audio to speakers.
-	CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA);
-}
-
-void IPC_HLE_UpdateCallback(u64 userdata, int cyclesLate)
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-	{
-		WII_IPC_HLE_Interface::Update();
-		CoreTiming::ScheduleEvent(IPC_HLE_PERIOD - cyclesLate, et_IPC_HLE);
-	}
-}
-
-void VICallback(u64 userdata, int cyclesLate)
-{
-	VideoInterface::Update();
-	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerLine() - cyclesLate, et_VI);
-}
-
-void SICallback(u64 userdata, int cyclesLate)
-{
-	SerialInterface::UpdateDevices();
-	CoreTiming::ScheduleEvent(SerialInterface::GetTicksToNextSIPoll() - cyclesLate, et_SI);
-}
-
-void CPCallback(u64 userdata, int cyclesLate)
-{
-	CommandProcessor::Update();
-	CoreTiming::ScheduleEvent(CP_PERIOD - cyclesLate, et_CP);
-}
-
-void DecrementerCallback(u64 userdata, int cyclesLate)
-{
-	PowerPC::ppcState.spr[SPR_DEC] = 0xFFFFFFFF;
-	Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DECREMENTER);
-}
-
-void DecrementerSet()
-{
-	u32 decValue = PowerPC::ppcState.spr[SPR_DEC];
-
-	CoreTiming::RemoveEvent(et_Dec);
-	if ((decValue & 0x80000000) == 0)
-	{
-		CoreTiming::SetFakeDecStartTicks(CoreTiming::GetTicks());
-		CoreTiming::SetFakeDecStartValue(decValue);
-		
-		CoreTiming::ScheduleEvent(decValue * TIMER_RATIO, et_Dec);
-	}
-}
-
-u32 GetFakeDecrementer()
-{
-	return (CoreTiming::GetFakeDecStartValue() - (u32)((CoreTiming::GetTicks() - CoreTiming::GetFakeDecStartTicks()) / TIMER_RATIO));
-}
-
-void TimeBaseSet()
-{
-	CoreTiming::SetFakeTBStartTicks(CoreTiming::GetTicks());
-	CoreTiming::SetFakeTBStartValue(*((u64 *)&TL));
-}
-
-u64 GetFakeTimeBase()
-{
-	return CoreTiming::GetFakeTBStartValue() + ((CoreTiming::GetTicks() - CoreTiming::GetFakeTBStartTicks()) / TIMER_RATIO);
-}
-
-void PatchEngineCallback(u64 userdata, int cyclesLate)
-{
-	// Patch mem and run the Action Replay
-	PatchEngine::ApplyFramePatches();
-	PatchEngine::ApplyARPatches();
-	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame() - cyclesLate, et_PatchEngine);
-}
-
-// split from Init to break a circular dependency between VideoInterface::Init and SystemTimers::Init
-void PreInit()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		CPU_CORE_CLOCK = 729000000u;
-	else
-		CPU_CORE_CLOCK = 486000000u;
-}
-
-void Init()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-	{
-		// AyuanX: TO BE TWEAKED
-		// Now the 1500 is a pure assumption
-		// We need to figure out the real frequency though
-
-		// FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32
-		const int freq = 1500;
-		IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * VideoInterface::GetNumFields());
-	}
-
-	// System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA
-	AUDIO_DMA_PERIOD = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32);
-
-	// Emulated gekko <-> flipper bus speed ratio (cpu clock / flipper clock)
-	CP_PERIOD = GetTicksPerSecond() / 10000;
-
-	Common::Timer::IncreaseResolution();
-	// store and convert localtime at boot to timebase ticks
-	CoreTiming::SetFakeTBStartValue((u64)(CPU_CORE_CLOCK / TIMER_RATIO) * (u64)CEXIIPL::GetGCTime());
-	CoreTiming::SetFakeTBStartTicks(CoreTiming::GetTicks());
-
-	CoreTiming::SetFakeDecStartValue(0xFFFFFFFF);
-	CoreTiming::SetFakeDecStartTicks(CoreTiming::GetTicks());
-
-	et_Dec = CoreTiming::RegisterEvent("DecCallback", DecrementerCallback);
-	et_VI = CoreTiming::RegisterEvent("VICallback", VICallback);
-	et_SI = CoreTiming::RegisterEvent("SICallback", SICallback);
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
-		et_CP = CoreTiming::RegisterEvent("CPCallback", CPCallback);
-	et_DSP = CoreTiming::RegisterEvent("DSPCallback", DSPCallback);
-	et_AudioDMA = CoreTiming::RegisterEvent("AudioDMACallback", AudioDMACallback);
-	et_IPC_HLE = CoreTiming::RegisterEvent("IPC_HLE_UpdateCallback", IPC_HLE_UpdateCallback);
-	et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
-
-	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerLine(), et_VI);
-	CoreTiming::ScheduleEvent(0, et_DSP);
-	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_SI);
-	CoreTiming::ScheduleEvent(AUDIO_DMA_PERIOD, et_AudioDMA);
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
-		CoreTiming::ScheduleEvent(CP_PERIOD, et_CP);
-
-	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_PatchEngine);
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-		CoreTiming::ScheduleEvent(IPC_HLE_PERIOD, et_IPC_HLE);
-}
-
-void Shutdown()
-{
-	Common::Timer::RestoreResolution();
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/HW/SystemTimers.h b/Source/Core/Core/Src/HW/SystemTimers.h
deleted file mode 100644
index 331dbf8c85..0000000000
--- a/Source/Core/Core/Src/HW/SystemTimers.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _SYSTEMTIMERS_H
-#define _SYSTEMTIMERS_H
-
-#include "Common.h"
-
-namespace SystemTimers
-{
-
-u32 GetTicksPerSecond();
-void PreInit();
-void Init();
-void Shutdown();
-
-// Notify timing system that somebody wrote to the decrementer
-void DecrementerSet();
-u32 GetFakeDecrementer();
-
-void TimeBaseSet();
-u64 GetFakeTimeBase();
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp
deleted file mode 100644
index e5d32a9a8f..0000000000
--- a/Source/Core/Core/Src/HW/VideoInterface.cpp
+++ /dev/null
@@ -1,871 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-#include "../PowerPC/PowerPC.h"
-#include "../Core.h"
-#include "ProcessorInterface.h"
-#include "VideoInterface.h"
-#include "Memmap.h"
-#include "../CoreTiming.h"
-#include "../HW/SystemTimers.h"
-#include "StringUtil.h"
-
-#include "VideoBackendBase.h"
-#include "State.h"
-
-namespace VideoInterface
-{
-
-// STATE_TO_SAVE
-// Registers listed in order:
-static UVIVerticalTimingRegister	m_VerticalTimingRegister;
-static UVIDisplayControlRegister	m_DisplayControlRegister;
-static UVIHorizontalTiming0			m_HTiming0;
-static UVIHorizontalTiming1			m_HTiming1;
-static UVIVBlankTimingRegister		m_VBlankTimingOdd;
-static UVIVBlankTimingRegister		m_VBlankTimingEven;
-static UVIBurstBlankingRegister		m_BurstBlankingOdd;
-static UVIBurstBlankingRegister		m_BurstBlankingEven;
-static UVIFBInfoRegister			m_XFBInfoTop;
-static UVIFBInfoRegister			m_XFBInfoBottom;
-static UVIFBInfoRegister			m_3DFBInfoTop;		// Start making your stereoscopic demos! :p
-static UVIFBInfoRegister			m_3DFBInfoBottom;
-static u16							m_VBeamPos = 0;	// 0: Inactive
-static u16							m_HBeamPos = 0;	// 0: Inactive
-static UVIInterruptRegister			m_InterruptRegister[4];
-static UVILatchRegister				m_LatchRegister[2];
-static UVIHorizontalStepping		m_HorizontalStepping;
-static UVIHorizontalScaling			m_HorizontalScaling;
-static SVIFilterCoefTables			m_FilterCoefTables;
-static u32							m_UnkAARegister = 0;// ??? 0x00FF0000
-static u16							m_Clock = 0;		// 0: 27MHz, 1: 54MHz
-static UVIDTVStatus					m_DTVStatus;
-static u16							m_FBWidth = 0;		// Only correct when scaling is enabled?
-static UVIBorderBlankRegister		m_BorderHBlank;
-// 0xcc002076 - 0xcc00207f is full of 0x00FF: unknown
-// 0xcc002080 - 0xcc002100 even more unknown
-
-u32 TargetRefreshRate = 0;
-
-static u32 TicksPerFrame = 0;
-static u32 s_lineCount = 0;
-static u32 s_upperFieldBegin = 0;
-static u32 s_lowerFieldBegin = 0;
-static int fields = 1;
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(m_VerticalTimingRegister);
-	p.DoPOD(m_DisplayControlRegister);
-	p.Do(m_HTiming0);
-	p.Do(m_HTiming1);
-	p.Do(m_VBlankTimingOdd);
-	p.Do(m_VBlankTimingEven);
-	p.Do(m_BurstBlankingOdd);
-	p.Do(m_BurstBlankingEven);
-	p.Do(m_XFBInfoTop);
-	p.Do(m_XFBInfoBottom);
-	p.Do(m_3DFBInfoTop);
-	p.Do(m_3DFBInfoBottom);
-	p.Do(m_VBeamPos);
-	p.Do(m_HBeamPos);
-	p.DoArray(m_InterruptRegister, 4);
-	p.DoArray(m_LatchRegister, 2);
-	p.Do(m_HorizontalStepping);
-	p.DoPOD(m_HorizontalScaling);
-	p.Do(m_FilterCoefTables);
-	p.Do(m_UnkAARegister);
-	p.Do(m_Clock);
-	p.Do(m_DTVStatus);
-	p.Do(m_FBWidth);
-	p.Do(m_BorderHBlank);
-	p.Do(TargetRefreshRate);
-	p.Do(TicksPerFrame);
-	p.Do(s_lineCount);
-	p.Do(s_upperFieldBegin);
-	p.Do(s_lowerFieldBegin);
-}
-
-// Executed after Init, before game boot
-void Preset(bool _bNTSC)
-{
-	m_VerticalTimingRegister.EQU = 6;
-
-	m_DisplayControlRegister.ENB = 1;
-	m_DisplayControlRegister.FMT = _bNTSC ? 0 : 1;
-
-	m_HTiming0.HLW = 429;
-	m_HTiming0.HCE = 105;
-	m_HTiming0.HCS = 71;
-	m_HTiming1.HSY = 64;
-	m_HTiming1.HBE640 = 162;
-	m_HTiming1.HBS640 = 373;
-
-	m_VBlankTimingOdd.PRB = 502;
-	m_VBlankTimingOdd.PSB = 5;
-	m_VBlankTimingEven.PRB = 503;
-	m_VBlankTimingEven.PSB = 4;
-
-	m_BurstBlankingOdd.BS0 = 12;
-	m_BurstBlankingOdd.BE0 = 520;
-	m_BurstBlankingOdd.BS2 = 12;
-	m_BurstBlankingOdd.BE2 = 520;
-	m_BurstBlankingEven.BS0 = 13;
-	m_BurstBlankingEven.BE0 = 519;
-	m_BurstBlankingEven.BS2 = 13;
-	m_BurstBlankingEven.BE2 = 519;
-
-	m_InterruptRegister[0].HCT = 430;
-	m_InterruptRegister[0].VCT = 263;
-	m_InterruptRegister[0].IR_MASK = 1;
-	m_InterruptRegister[0].IR_INT = 0;
-	m_InterruptRegister[1].HCT = 1;
-	m_InterruptRegister[1].VCT = 1;
-	m_InterruptRegister[1].IR_MASK = 1;
-	m_InterruptRegister[1].IR_INT = 0;
-
-	m_HorizontalStepping.FbSteps = 40;
-	m_HorizontalStepping.FieldSteps = 40;
-
-	m_HBeamPos = -1; // NTSC-U N64 VC games check for a non-zero HBeamPos
-	m_VBeamPos = 0; // RG4JC0 checks for a zero VBeamPos
-
-	// 54MHz, capable of progressive scan
-	m_Clock = Core::g_CoreStartupParameter.bProgressive;
-
-	// Say component cable is plugged
-	m_DTVStatus.component_plugged = Core::g_CoreStartupParameter.bProgressive;
-
-	UpdateParameters();
-}
-
-void Init()
-{
-	m_VerticalTimingRegister.Hex = 0;
-	m_DisplayControlRegister.Hex = 0;
-	m_HTiming0.Hex = 0;
-	m_HTiming1.Hex = 0;
-	m_VBlankTimingOdd.Hex = 0;
-	m_VBlankTimingEven.Hex = 0;
-	m_BurstBlankingOdd.Hex = 0;
-	m_BurstBlankingEven.Hex = 0;
-	m_XFBInfoTop.Hex = 0;
-	m_XFBInfoBottom.Hex = 0;
-	m_3DFBInfoTop.Hex = 0;
-	m_3DFBInfoBottom.Hex = 0;
-	m_VBeamPos = 0;
-	m_HBeamPos = 0;
-	m_HorizontalStepping.Hex = 0;
-	m_HorizontalScaling.Hex = 0;
-	m_UnkAARegister = 0;
-	m_Clock = 0;
-	m_DTVStatus.Hex = 0;
-	m_FBWidth = 0;
-	m_BorderHBlank.Hex = 0;
-	memset(&m_FilterCoefTables, 0, sizeof(m_FilterCoefTables));
-
-	fields = 1;
-
-	m_DTVStatus.ntsc_j = Core::g_CoreStartupParameter.bForceNTSCJ;
-
-	for (int i = 0; i < 4; i++)
-		m_InterruptRegister[i].Hex = 0;
-
-	for (int i = 0; i < 2; i++)
-		m_LatchRegister[i].Hex = 0;
-
-	m_DisplayControlRegister.Hex = 0;
-	UpdateParameters();
-}
-
-void SetRegionReg(char region)
-{
-	if (!Core::g_CoreStartupParameter.bForceNTSCJ)
-		m_DTVStatus.ntsc_j = region == 'J';
-}
-
-void Read8(u8& _uReturnValue, const u32 _iAddress)
-{
-	// Just like 32bit VI transfers, this is technically not allowed,
-	// but the hardware accepts it. Action Replay uses this.
-	u16 val = 0;
-
-	if ((_iAddress & 1) == 0)
-	{
-		Read16(val, _iAddress);
-		_uReturnValue = (u8)(val >> 8);
-	}
-	else
-	{
-		Read16(val, _iAddress - 1);
-		_uReturnValue = (u8)val;
-	}
-
-	INFO_LOG(VIDEOINTERFACE, "(r 8): 0x%02x, 0x%08x", _uReturnValue, _iAddress);
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	switch (_iAddress & 0xFFF)
-	{
-	case VI_VERTICAL_TIMING:
-		_uReturnValue = m_VerticalTimingRegister.Hex;
-		return;
-
-	case VI_CONTROL_REGISTER:
-		_uReturnValue = m_DisplayControlRegister.Hex;
-		return;
-
-	case VI_HORIZONTAL_TIMING_0_HI:
-		_uReturnValue = m_HTiming0.Hi;
-		break;
-	case VI_HORIZONTAL_TIMING_0_LO:
-		_uReturnValue = m_HTiming0.Lo;
-		break;
-
-	case VI_HORIZONTAL_TIMING_1_HI:
-		_uReturnValue = m_HTiming1.Hi;
-		break;
-	case VI_HORIZONTAL_TIMING_1_LO:
-		_uReturnValue = m_HTiming1.Lo;
-		break;
-
-	case VI_VBLANK_TIMING_ODD_HI:
-		_uReturnValue = m_VBlankTimingOdd.Hi;
-		break;
-	case VI_VBLANK_TIMING_ODD_LO:
-		_uReturnValue = m_VBlankTimingOdd.Lo;
-		break;
-
-	case VI_VBLANK_TIMING_EVEN_HI:
-		_uReturnValue = m_VBlankTimingEven.Hi;
-		break;
-	case VI_VBLANK_TIMING_EVEN_LO:
-		_uReturnValue = m_VBlankTimingEven.Lo;
-		break;
-
-	case VI_BURST_BLANKING_ODD_HI:
-		_uReturnValue = m_BurstBlankingOdd.Hi;
-		break;
-	case VI_BURST_BLANKING_ODD_LO:
-		_uReturnValue = m_BurstBlankingOdd.Lo;
-		break;
-
-	case VI_BURST_BLANKING_EVEN_HI:
-		_uReturnValue = m_BurstBlankingEven.Hi;
-		break;
-	case VI_BURST_BLANKING_EVEN_LO:
-		_uReturnValue = m_BurstBlankingEven.Lo;
-		break;
-
-	case VI_FB_LEFT_TOP_HI:
-		_uReturnValue = m_XFBInfoTop.Hi;
-		break;
-	case VI_FB_LEFT_TOP_LO:
-		_uReturnValue = m_XFBInfoTop.Lo;
-		break;
-
-	case VI_FB_RIGHT_TOP_HI:
-		_uReturnValue = m_3DFBInfoTop.Hi;
-		break;
-	case VI_FB_RIGHT_TOP_LO:
-		_uReturnValue = m_3DFBInfoTop.Lo;
-		break;
-
-	case VI_FB_LEFT_BOTTOM_HI:
-		_uReturnValue = m_XFBInfoBottom.Hi;
-		break;
-	case VI_FB_LEFT_BOTTOM_LO:
-		_uReturnValue = m_XFBInfoBottom.Lo;
-		break;
-
-	case VI_FB_RIGHT_BOTTOM_HI:
-		_uReturnValue = m_3DFBInfoBottom.Hi;
-		break;
-	case VI_FB_RIGHT_BOTTOM_LO:
-		_uReturnValue = m_3DFBInfoBottom.Lo;
-		break;
-
-	case VI_VERTICAL_BEAM_POSITION:
-		_uReturnValue = m_VBeamPos;
-		return;
-
-	case VI_HORIZONTAL_BEAM_POSITION:
-		_uReturnValue = m_HBeamPos;
-		return;
-
-	// RETRACE STUFF ...
-	case VI_PRERETRACE_HI:
-		_uReturnValue =	m_InterruptRegister[0].Hi;
-		return;
-	case VI_PRERETRACE_LO:
-		_uReturnValue =	m_InterruptRegister[0].Lo;
-		return;
-
-	case VI_POSTRETRACE_HI:
-		_uReturnValue =	m_InterruptRegister[1].Hi;
-		return;
-	case VI_POSTRETRACE_LO:
-		_uReturnValue =	m_InterruptRegister[1].Lo;
-		return;
-
-	case VI_DISPLAY_INTERRUPT_2_HI:
-		_uReturnValue =	m_InterruptRegister[2].Hi;
-		return;
-	case VI_DISPLAY_INTERRUPT_2_LO:
-		_uReturnValue =	m_InterruptRegister[2].Lo;
-		return;
-
-	case VI_DISPLAY_INTERRUPT_3_HI:
-		_uReturnValue =	m_InterruptRegister[3].Hi;
-		return;
-	case VI_DISPLAY_INTERRUPT_3_LO:
-		_uReturnValue =	m_InterruptRegister[3].Lo;
-		return;
-
-	case VI_DISPLAY_LATCH_0_HI:
-		_uReturnValue = m_LatchRegister[0].Hi;
-		break;
-	case VI_DISPLAY_LATCH_0_LO:
-		_uReturnValue = m_LatchRegister[0].Lo;
-		break;
-
-	case VI_DISPLAY_LATCH_1_HI:
-		_uReturnValue = m_LatchRegister[1].Hi;
-		break;
-	case VI_DISPLAY_LATCH_1_LO:
-		_uReturnValue = m_LatchRegister[1].Lo;
-		break;
-
-	case VI_HSCALEW:
-		_uReturnValue = m_HorizontalStepping.Hex;
-		break;
-
-	case VI_HSCALER:
-		_uReturnValue = m_HorizontalScaling.Hex;
-		break;
-
-	case VI_FILTER_COEF_0_HI:
-		_uReturnValue = m_FilterCoefTables.Tables02[0].Hi;
-		break;
-	case VI_FILTER_COEF_0_LO:
-		_uReturnValue = m_FilterCoefTables.Tables02[0].Lo;
-		break;
-	case VI_FILTER_COEF_1_HI:
-		_uReturnValue = m_FilterCoefTables.Tables02[1].Hi;
-		break;
-	case VI_FILTER_COEF_1_LO:
-		_uReturnValue = m_FilterCoefTables.Tables02[1].Lo;
-		break;
-	case VI_FILTER_COEF_2_HI:
-		_uReturnValue = m_FilterCoefTables.Tables02[2].Hi;
-		break;
-	case VI_FILTER_COEF_2_LO:
-		_uReturnValue = m_FilterCoefTables.Tables02[2].Lo;
-		break;
-	case VI_FILTER_COEF_3_HI:
-		_uReturnValue = m_FilterCoefTables.Tables36[0].Hi;
-		break;
-	case VI_FILTER_COEF_3_LO:
-		_uReturnValue = m_FilterCoefTables.Tables36[0].Lo;
-		break;
-	case VI_FILTER_COEF_4_HI:
-		_uReturnValue = m_FilterCoefTables.Tables36[1].Hi;
-		break;
-	case VI_FILTER_COEF_4_LO:
-		_uReturnValue = m_FilterCoefTables.Tables36[1].Lo;
-		break;
-	case VI_FILTER_COEF_5_HI:
-		_uReturnValue = m_FilterCoefTables.Tables36[2].Hi;
-		break;
-	case VI_FILTER_COEF_5_LO:
-		_uReturnValue = m_FilterCoefTables.Tables36[2].Lo;
-		break;
-	case VI_FILTER_COEF_6_HI:
-		_uReturnValue = m_FilterCoefTables.Tables36[3].Hi;
-		break;
-	case VI_FILTER_COEF_6_LO:
-		_uReturnValue = m_FilterCoefTables.Tables36[3].Lo;
-		break;
-
-	case VI_UNK_AA_REG_HI:
-		_uReturnValue = (m_UnkAARegister & 0xffff0000) >> 16;
-		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)");
-		break;
-	case VI_UNK_AA_REG_LO:
-		_uReturnValue = m_UnkAARegister & 0x0000ffff;
-		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)");
-		break;
-
-	case VI_CLOCK:
-		_uReturnValue = m_Clock;
-		break;
-
-	case VI_DTV_STATUS:
-		_uReturnValue = m_DTVStatus.Hex;
-		break;
-
-	case VI_FBWIDTH:
-		_uReturnValue = m_FBWidth;
-		break;
-
-	case VI_BORDER_BLANK_END:
-		_uReturnValue = m_BorderHBlank.Lo;
-		break;
-	case VI_BORDER_BLANK_START:
-		_uReturnValue = m_BorderHBlank.Hi;
-		break;
-
-	default:
-		ERROR_LOG(VIDEOINTERFACE, "(r16) unknown reg %x", _iAddress & 0xfff);
-		_uReturnValue = 0x0;
-		break;
-	}
-
-	DEBUG_LOG(VIDEOINTERFACE, "(r16): 0x%04x, 0x%08x", _uReturnValue, _iAddress);
-}
-
-void Write16(const u16 _iValue, const u32 _iAddress)
-{
-	DEBUG_LOG(VIDEOINTERFACE, "(w16): 0x%04x, 0x%08x",_iValue,_iAddress);
-
-	//Somewhere it sets screen width.. we need to communicate this to the gfx backend...
-
-	switch (_iAddress & 0xFFF)
-	{
-	case VI_VERTICAL_TIMING:
-		m_VerticalTimingRegister.Hex = _iValue;
-		break;
-
-	case VI_CONTROL_REGISTER:
-		{
-			UVIDisplayControlRegister tmpConfig(_iValue);
-			m_DisplayControlRegister.ENB = tmpConfig.ENB;
-			m_DisplayControlRegister.NIN = tmpConfig.NIN;
-			m_DisplayControlRegister.DLR = tmpConfig.DLR;
-			m_DisplayControlRegister.LE0 = tmpConfig.LE0;
-			m_DisplayControlRegister.LE1 = tmpConfig.LE1;
-			m_DisplayControlRegister.FMT = tmpConfig.FMT;
-
-			if (tmpConfig.RST)
-			{
-				// shuffle2 clear all data, reset to default vals, and enter idle mode
-				m_DisplayControlRegister.RST = 0;
-				for (int i = 0; i < 4; i++)
-					m_InterruptRegister[i].Hex = 0;
-				UpdateInterrupts();
-			}
-
-			UpdateParameters();
-		}		
-		break;
-
-	case VI_HORIZONTAL_TIMING_0_HI:
-		m_HTiming0.Hi = _iValue;
-		break;
-	case VI_HORIZONTAL_TIMING_0_LO:
-		m_HTiming0.Lo = _iValue;
-		break;
-
-	case VI_HORIZONTAL_TIMING_1_HI:
-		m_HTiming1.Hi = _iValue;
-		break;
-	case VI_HORIZONTAL_TIMING_1_LO:
-		m_HTiming1.Lo = _iValue;
-		break;
-
-	case VI_VBLANK_TIMING_ODD_HI:
-		m_VBlankTimingOdd.Hi = _iValue;
-		break;
-	case VI_VBLANK_TIMING_ODD_LO:
-		m_VBlankTimingOdd.Lo = _iValue;
-		break;
-
-	case VI_VBLANK_TIMING_EVEN_HI:
-		m_VBlankTimingEven.Hi = _iValue;
-		break;
-	case VI_VBLANK_TIMING_EVEN_LO:
-		m_VBlankTimingEven.Lo = _iValue;
-		break;
-
-	case VI_BURST_BLANKING_ODD_HI:
-		m_BurstBlankingOdd.Hi = _iValue;
-		break;
-	case VI_BURST_BLANKING_ODD_LO:
-		m_BurstBlankingOdd.Lo = _iValue;
-		break;
-
-	case VI_BURST_BLANKING_EVEN_HI:
-		m_BurstBlankingEven.Hi = _iValue;
-		break;
-	case VI_BURST_BLANKING_EVEN_LO:
-		m_BurstBlankingEven.Lo = _iValue;
-		break;
-
-	case VI_FB_LEFT_TOP_HI:
-		m_XFBInfoTop.Hi = _iValue;
-		if (m_XFBInfoTop.CLRPOFF) m_XFBInfoTop.POFF = 0;
-		break;
-	case VI_FB_LEFT_TOP_LO:
-		m_XFBInfoTop.Lo = _iValue;
-		break;
-
-	case VI_FB_RIGHT_TOP_HI:
-		m_3DFBInfoTop.Hi = _iValue;
-		if (m_3DFBInfoTop.CLRPOFF) m_3DFBInfoTop.POFF = 0;
-		break;
-	case VI_FB_RIGHT_TOP_LO:
-		m_3DFBInfoTop.Lo = _iValue;
-		break;
-
-	case VI_FB_LEFT_BOTTOM_HI:
-		m_XFBInfoBottom.Hi = _iValue;
-		if (m_XFBInfoBottom.CLRPOFF) m_XFBInfoBottom.POFF = 0;
-		break;
-	case VI_FB_LEFT_BOTTOM_LO:
-		m_XFBInfoBottom.Lo = _iValue;
-		break;
-
-	case VI_FB_RIGHT_BOTTOM_HI:
-		m_3DFBInfoBottom.Hi = _iValue;
-		if (m_3DFBInfoBottom.CLRPOFF) m_3DFBInfoBottom.POFF = 0;
-		break;
-	case VI_FB_RIGHT_BOTTOM_LO:
-		m_3DFBInfoBottom.Lo = _iValue;
-		break;
-
-	case VI_VERTICAL_BEAM_POSITION:
-		WARN_LOG(VIDEOINTERFACE, "Change Vertical Beam Position to 0x%04x - Not documented or implemented", _iValue);
-		break;
-
-	case VI_HORIZONTAL_BEAM_POSITION:
-		WARN_LOG(VIDEOINTERFACE, "Change Horizontal Beam Position to 0x%04x - Not documented or implemented", _iValue);
-		break;
-
-		// RETRACE STUFF ...
-	case VI_PRERETRACE_HI:
-		m_InterruptRegister[0].Hi = _iValue;
-		UpdateInterrupts();
-		break;
-	case VI_PRERETRACE_LO:
-		m_InterruptRegister[0].Lo = _iValue;
-		break;
-
-	case VI_POSTRETRACE_HI:
-		m_InterruptRegister[1].Hi = _iValue;
-		UpdateInterrupts();
-		break;
-	case VI_POSTRETRACE_LO:
-		m_InterruptRegister[1].Lo = _iValue;
-		break;
-
-	case VI_DISPLAY_INTERRUPT_2_HI:
-		m_InterruptRegister[2].Hi = _iValue;
-		UpdateInterrupts();
-		break;
-	case VI_DISPLAY_INTERRUPT_2_LO:
-		m_InterruptRegister[2].Lo = _iValue;
-		break;
-
-	case VI_DISPLAY_INTERRUPT_3_HI:
-		m_InterruptRegister[3].Hi = _iValue;
-		UpdateInterrupts();
-		break;
-	case VI_DISPLAY_INTERRUPT_3_LO:
-		m_InterruptRegister[3].Lo = _iValue;
-		break;
-
-	case VI_DISPLAY_LATCH_0_HI:
-		m_LatchRegister[0].Hi = _iValue;
-		break;
-	case VI_DISPLAY_LATCH_0_LO:
-		m_LatchRegister[0].Lo = _iValue;
-		break;
-
-	case VI_DISPLAY_LATCH_1_HI:
-		m_LatchRegister[1].Hi = _iValue;
-		break;
-	case VI_DISPLAY_LATCH_1_LO:
-		m_LatchRegister[1].Lo = _iValue;
-		break;
-
-	case VI_HSCALEW:
-		m_HorizontalStepping.Hex = _iValue;
-		break;
-
-	case VI_HSCALER:
-		m_HorizontalScaling.Hex = _iValue;
-		break;
-
-	case VI_FILTER_COEF_0_HI:
-		m_FilterCoefTables.Tables02[0].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_0_LO:
-		m_FilterCoefTables.Tables02[0].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_1_HI:
-		m_FilterCoefTables.Tables02[1].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_1_LO:
-		m_FilterCoefTables.Tables02[1].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_2_HI:
-		m_FilterCoefTables.Tables02[2].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_2_LO:
-		m_FilterCoefTables.Tables02[2].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_3_HI:
-		m_FilterCoefTables.Tables36[0].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_3_LO:
-		m_FilterCoefTables.Tables36[0].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_4_HI:
-		m_FilterCoefTables.Tables36[1].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_4_LO:
-		m_FilterCoefTables.Tables36[1].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_5_HI:
-		m_FilterCoefTables.Tables36[2].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_5_LO:
-		m_FilterCoefTables.Tables36[2].Lo = _iValue;
-		break;
-	case VI_FILTER_COEF_6_HI:
-		m_FilterCoefTables.Tables36[3].Hi = _iValue;
-		break;
-	case VI_FILTER_COEF_6_LO:
-		m_FilterCoefTables.Tables36[3].Lo = _iValue;
-		break;
-
-	case VI_UNK_AA_REG_HI:
-		m_UnkAARegister = (m_UnkAARegister & 0x0000ffff) | (u32)(_iValue << 16);
-		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)");
-		break;
-	case VI_UNK_AA_REG_LO:
-		m_UnkAARegister = (m_UnkAARegister & 0xffff0000) | _iValue;
-		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)");
-		break;
-
-	case VI_CLOCK:
-		m_Clock = _iValue;
-		break;
-
-	case VI_DTV_STATUS:
-		m_DTVStatus.Hex = _iValue;
-		break;
-
-	case VI_FBWIDTH:
-		m_FBWidth = _iValue;
-		break;
-
-	case VI_BORDER_BLANK_END:
-		m_BorderHBlank.Lo = _iValue;
-		break;
-	case VI_BORDER_BLANK_START:
-		m_BorderHBlank.Hi = _iValue;
-		break;
-
-	default:
-		ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unknown register %x", _iValue, _iAddress & 0xfff);
-		break;
-	}
-}
-
-void Read32(u32& _uReturnValue, const u32 _iAddress)
-{
-	u16 Hi = 0, Lo = 0;
-	Read16(Hi, _iAddress);
-	Read16(Lo, _iAddress + 2);
-	_uReturnValue = (Hi << 16) | Lo;
-
-	INFO_LOG(VIDEOINTERFACE, "(r32): 0x%08x, 0x%08x", _uReturnValue, _iAddress);
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	INFO_LOG(VIDEOINTERFACE, "(w32): 0x%08x, 0x%08x", _iValue, _iAddress);
-
-	// Allow 32-bit writes to the VI: although this is officially not
-	// allowed, the hardware seems to accept it (for example, DesktopMan GC
-	// Tetris uses it).
-	Write16(_iValue >> 16, _iAddress);
-	Write16(_iValue & 0xFFFF, _iAddress + 2);
-}
-
-void UpdateInterrupts()
-{
-	if ((m_InterruptRegister[0].IR_INT && m_InterruptRegister[0].IR_MASK) ||
-		(m_InterruptRegister[1].IR_INT && m_InterruptRegister[1].IR_MASK) ||
-		(m_InterruptRegister[2].IR_INT && m_InterruptRegister[2].IR_MASK) ||
-		(m_InterruptRegister[3].IR_INT && m_InterruptRegister[3].IR_MASK))
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_VI, true);
-	}
-	else
-	{
-		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_VI, false);
-	}
-}
-
-u32 GetXFBAddressTop()
-{
-	if (m_XFBInfoTop.POFF)
-		return m_XFBInfoTop.FBB << 5;
-	else
-		return m_XFBInfoTop.FBB;
-}
-
-u32 GetXFBAddressBottom()
-{
-	// POFF for XFB bottom is connected to POFF for XFB top
-	if (m_XFBInfoTop.POFF)
-		return m_XFBInfoBottom.FBB << 5;
-	else
-		return m_XFBInfoBottom.FBB;
-}
-
-void UpdateParameters()
-{
-	fields = m_DisplayControlRegister.NIN ? 2 : 1;
-
-	switch (m_DisplayControlRegister.FMT)
-	{
-	case 0: // NTSC
-		TargetRefreshRate = NTSC_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
-		s_lineCount = NTSC_LINE_COUNT;
-		s_upperFieldBegin = NTSC_UPPER_BEGIN;
-		s_lowerFieldBegin = NTSC_LOWER_BEGIN;
-		break;
-
-	case 2: // PAL-M
-		TargetRefreshRate = NTSC_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
-		s_lineCount = PAL_LINE_COUNT;
-		s_upperFieldBegin = PAL_UPPER_BEGIN;
-		s_lowerFieldBegin = PAL_LOWER_BEGIN;
-		break;
-
-	case 1: // PAL
-		TargetRefreshRate = PAL_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / PAL_FIELD_RATE;
-		s_lineCount = PAL_LINE_COUNT;
-		s_upperFieldBegin = PAL_UPPER_BEGIN;
-		s_lowerFieldBegin = PAL_LOWER_BEGIN;
-		break;
-
-	case 3: // Debug
-		PanicAlert("Debug video mode not implemented");
-		break;
-
-	default:
-		PanicAlert("Unknown Video Format - CVideoInterface");
-		break;
-	}
-}
-
-int GetNumFields()
-{
-	if (Core::g_CoreStartupParameter.bVBeamSpeedHack)
-		return (2 / fields);
-	else
-		return 1;
-}
-
-unsigned int GetTicksPerLine()
-{
-	if (s_lineCount == 0)
-	{
-		return 1;
-	}
-	else
-	{
-		if (Core::g_CoreStartupParameter.bVBeamSpeedHack)
-			return TicksPerFrame / s_lineCount;
-		else
-			return TicksPerFrame / (s_lineCount / (2 / fields)) ;
-	}
-}
-
-unsigned int GetTicksPerFrame()
-{
-	return TicksPerFrame;
-}
-
-static void BeginField(FieldType field)
-{
-	u32 fbWidth = m_HorizontalStepping.FieldSteps * 16;
-	u32 fbHeight = (m_HorizontalStepping.FbSteps / m_HorizontalStepping.FieldSteps) * m_VerticalTimingRegister.ACV;
-
-	// NTSC and PAL have opposite field orders.
-	FieldType order = (m_DisplayControlRegister.FMT == 0) ? FIELD_LOWER : FIELD_UPPER;
-	u32 xfbAddr = (field == order) ? GetXFBAddressBottom() : GetXFBAddressTop();
-
-	static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
-
-	DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): Address: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s",
-		xfbAddr, m_HorizontalStepping.FieldSteps, m_HorizontalStepping.FbSteps, m_VerticalTimingRegister.ACV,
-		fieldTypeNames[field]
-	);
-
-	if (xfbAddr)
-		g_video_backend->Video_BeginField(xfbAddr, field, fbWidth, fbHeight);
-}
-
-static void EndField()
-{
-	g_video_backend->Video_EndField();
-	Core::VideoThrottle();
-}
-
-// Purpose: Send VI interrupt when triggered
-// Run when: When a frame is scanned (progressive/interlace)
-void Update()
-{
-	if (m_DisplayControlRegister.NIN)
-	{
-		// Progressive
-		if (m_VBeamPos == 1)
-			BeginField(FIELD_PROGRESSIVE);
-	}
-	else if (m_VBeamPos == s_upperFieldBegin)
-	{
-		// Interlace Upper
-		BeginField(FIELD_UPPER);
-	}
-	else if (m_VBeamPos == s_lowerFieldBegin)
-	{
-		// Interlace Lower
-		BeginField(FIELD_LOWER);
-	}
-
-	if (m_VBeamPos == s_upperFieldBegin + m_VerticalTimingRegister.ACV)
-	{
-		// Interlace Upper.
-		EndField();
-	}
-	else if (m_VBeamPos == s_lowerFieldBegin + m_VerticalTimingRegister.ACV)
-	{
-		// Interlace Lower
-		EndField();
-	}
-
-	if (++m_VBeamPos > s_lineCount * fields)
-		m_VBeamPos = 1;
-
-	for (int i = 0; i < 4; i++)
-	{
-		if (m_VBeamPos == m_InterruptRegister[i].VCT)
-			m_InterruptRegister[i].IR_INT = 1;
-	}
-	UpdateInterrupts();
-}
-
-} // namespace
diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h
deleted file mode 100644
index 325d43f080..0000000000
--- a/Source/Core/Core/Src/HW/VideoInterface.h
+++ /dev/null
@@ -1,354 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VIDEOINTERFACE_H
-#define _VIDEOINTERFACE_H
-
-#include "Common.h"
-class PointerWrap;
-
-namespace VideoInterface
-{
-// NTSC is 60 FPS, right?
-// Wrong, it's about 59.94 FPS. The NTSC engineers had to slightly lower
-// the field rate from 60 FPS when they added color to the standard.
-// This was done to prevent analog interference between the video and
-// audio signals. PAL has no similar reduction; it is exactly 50 FPS.
-//#define NTSC_FIELD_RATE		(60.0f / 1.001f)
-#define NTSC_FIELD_RATE		60
-#define NTSC_LINE_COUNT		525
-// These line numbers indicate the beginning of the "active video" in a frame.
-// An NTSC frame has the lower field first followed by the upper field.
-// TODO: Is this true for PAL-M? Is this true for EURGB60?
-#define NTSC_LOWER_BEGIN	21
-#define NTSC_UPPER_BEGIN	283
-
-//#define PAL_FIELD_RATE		50.0f
-#define PAL_FIELD_RATE		50
-#define PAL_LINE_COUNT		625
-// These line numbers indicate the beginning of the "active video" in a frame.
-// A PAL frame has the upper field first followed by the lower field.
-#define PAL_UPPER_BEGIN		23
-#define PAL_LOWER_BEGIN		336
-
-// VI Internal Hardware Addresses
-enum
-{
-	VI_VERTICAL_TIMING					= 0x00,
-	VI_CONTROL_REGISTER					= 0x02,
-	VI_HORIZONTAL_TIMING_0_HI			= 0x04,
-	VI_HORIZONTAL_TIMING_0_LO			= 0x06,
-	VI_HORIZONTAL_TIMING_1_HI			= 0x08,
-	VI_HORIZONTAL_TIMING_1_LO			= 0x0a,
-	VI_VBLANK_TIMING_ODD_HI				= 0x0c,
-	VI_VBLANK_TIMING_ODD_LO				= 0x0e,
-	VI_VBLANK_TIMING_EVEN_HI			= 0x10,
-	VI_VBLANK_TIMING_EVEN_LO			= 0x12,
-	VI_BURST_BLANKING_ODD_HI			= 0x14,
-	VI_BURST_BLANKING_ODD_LO			= 0x16,
-	VI_BURST_BLANKING_EVEN_HI			= 0x18,
-	VI_BURST_BLANKING_EVEN_LO			= 0x1a,
-	VI_FB_LEFT_TOP_HI					= 0x1c, // FB_LEFT_TOP is first half of XFB info
-	VI_FB_LEFT_TOP_LO					= 0x1e,
-	VI_FB_RIGHT_TOP_HI					= 0x20, // FB_RIGHT_TOP is only used in 3D mode
-	VI_FB_RIGHT_TOP_LO					= 0x22,
-	VI_FB_LEFT_BOTTOM_HI				= 0x24, // FB_LEFT_BOTTOM is second half of XFB info
-	VI_FB_LEFT_BOTTOM_LO				= 0x26,
-	VI_FB_RIGHT_BOTTOM_HI				= 0x28, // FB_RIGHT_BOTTOM is only used in 3D mode
-	VI_FB_RIGHT_BOTTOM_LO				= 0x2a,
-	VI_VERTICAL_BEAM_POSITION			= 0x2c,
-	VI_HORIZONTAL_BEAM_POSITION			= 0x2e,
-	VI_PRERETRACE_HI					= 0x30,
-	VI_PRERETRACE_LO					= 0x32,
-	VI_POSTRETRACE_HI					= 0x34,
-	VI_POSTRETRACE_LO					= 0x36,
-	VI_DISPLAY_INTERRUPT_2_HI			= 0x38,
-	VI_DISPLAY_INTERRUPT_2_LO			= 0x3a,
-	VI_DISPLAY_INTERRUPT_3_HI			= 0x3c,
-	VI_DISPLAY_INTERRUPT_3_LO			= 0x3e,
-	VI_DISPLAY_LATCH_0_HI				= 0x40,
-	VI_DISPLAY_LATCH_0_LO				= 0x42,
-	VI_DISPLAY_LATCH_1_HI				= 0x44,
-	VI_DISPLAY_LATCH_1_LO				= 0x46,
-	VI_HSCALEW							= 0x48,
-	VI_HSCALER							= 0x4a,
-	VI_FILTER_COEF_0_HI					= 0x4c,
-	VI_FILTER_COEF_0_LO					= 0x4e,
-	VI_FILTER_COEF_1_HI					= 0x50,
-	VI_FILTER_COEF_1_LO					= 0x52,
-	VI_FILTER_COEF_2_HI					= 0x54,
-	VI_FILTER_COEF_2_LO					= 0x56,
-	VI_FILTER_COEF_3_HI					= 0x58,
-	VI_FILTER_COEF_3_LO					= 0x5a,
-	VI_FILTER_COEF_4_HI					= 0x5c,
-	VI_FILTER_COEF_4_LO					= 0x5e,
-	VI_FILTER_COEF_5_HI					= 0x60,
-	VI_FILTER_COEF_5_LO					= 0x62,
-	VI_FILTER_COEF_6_HI					= 0x64,
-	VI_FILTER_COEF_6_LO					= 0x66,
-	VI_UNK_AA_REG_HI					= 0x68,
-	VI_UNK_AA_REG_LO					= 0x6a,
-	VI_CLOCK							= 0x6c,
-	VI_DTV_STATUS						= 0x6e,
-	VI_FBWIDTH							= 0x70,
-	VI_BORDER_BLANK_END					= 0x72, // Only used in debug video mode
-	VI_BORDER_BLANK_START				= 0x74, // Only used in debug video mode
-	//VI_INTERLACE						= 0x850, // ??? MYSTERY OLD CODE
-};
-
-union UVIVerticalTimingRegister
-{
-	u16 Hex;
-	struct
-	{
-		u16 EQU	:	 4; // Equalization pulse in half lines
-		u16 ACV	:	10; // Active video in lines per field (seems always zero)
-		u16		:	 2;
-	};
-	UVIVerticalTimingRegister(u16 _hex) { Hex = _hex;}
-	UVIVerticalTimingRegister() { Hex = 0;}
-};
-
-union UVIDisplayControlRegister
-{
-	u16 Hex;
-	struct
-	{
-		u16 ENB	:	1; // Enables video timing generation and data request
-		u16 RST	:	1; // Clears all data requests and puts VI into its idle state
-		u16 NIN	:	1; // 0: Interlaced, 1: Non-Interlaced: top field drawn at field rate and bottom field is not displayed
-		u16 DLR	:	1; // Selects 3D Display Mode
-		u16 LE0	:	2; // Display Latch; 0: Off, 1: On for 1 field, 2: On for 2 fields, 3: Always on
-		u16 LE1	:	2;
-		u16 FMT	:	2; // 0: NTSC, 1: PAL, 2: MPAL, 3: Debug
-		u16		:	6;
-	};
-	UVIDisplayControlRegister(u16 _hex) { Hex = _hex;}
-	UVIDisplayControlRegister() { Hex = 0;}
-};
-
-union UVIHorizontalTiming0
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 HLW		:	9; // Halfline Width (W*16 = Width (720))
-		u32			:	7;
-		u32 HCE		:	7; // Horizontal Sync Start to Color Burst End
-		u32			:	1;
-		u32 HCS		:	7; // Horizontal Sync Start to Color Burst Start
-		u32			:	1;
-	};
-};
-
-union UVIHorizontalTiming1
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 HSY		:	 7; // Horizontal Sync Width
-		u32 HBE640	:	 9; // Horizontal Sync Start to horizontal blank end
-		u32			:	 1;
-		u32 HBS640	:	 9; // Half line to horizontal blanking start
-		u32			:	 6;
-	};
-};
-
-// Exists for both odd and even fields
-union UVIVBlankTimingRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 PRB		:	10; // Pre-blanking in half lines
-		u32			:	 6;
-		u32 PSB		:	10; // Post blanking in half lines
-		u32			:	 6;
-	};
-};
-
-// Exists for both odd and even fields
-union UVIBurstBlankingRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 BS0		:	 5; // Field x start to burst blanking start in halflines
-		u32 BE0		:	11; // Field x start to burst blanking end in halflines
-		u32 BS2		:	 5; // Field x+2 start to burst blanking start in halflines
-		u32 BE2		:	11; // Field x+2 start to burst blanking end in halflines
-	};
-};
-
-union UVIFBInfoRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{
-		// TODO: mask out lower 9bits/align to 9bits???
-		u32 FBB		:	24; // Base address of the framebuffer in external mem
-		// POFF only seems to exist in the top reg. XOFF, unknown.
-		u32 XOFF	:	 4; // Horizontal Offset of the left-most pixel within the first word of the fetched picture
-		u32 POFF	:	 1; // Page offest: 1: fb address is (address>>5)
-		u32 CLRPOFF	:	 3; // ? setting bit 31 clears POFF
-	};
-};
-
-// VI Interrupt Register
-union UVIInterruptRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 HCT		:	11; // Horizontal Position
-		u32			:	 5;
-		u32 VCT		:	11; // Vertical Position
-		u32			:	 1;
-		u32 IR_MASK	:	 1; // Interrupt Mask Bit
-		u32			:	 2;
-		u32 IR_INT	:	 1; // Interrupt Status (1=Active, 0=Clear)
-	};
-};
-
-union UVILatchRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct  
-	{		
-		u32 HCT		:	11; // Horizontal Count
-		u32			:	 5;
-		u32 VCT		:	11; // Vertical Count
-		u32			:	 4;
-		u32 TRG		:	 1; // Trigger Flag
-	};
-};
-
-union UVIHorizontalStepping
-{
-	u16 Hex;
-	struct
-	{
-		u16 FbSteps		:	 8;
-		u16 FieldSteps	:	 8;
-	};
-};
-
-union UVIHorizontalScaling
-{
-	u16 Hex;
-	struct
-	{
-		u16 STP		:	9; // Horizontal stepping size (U1.8 Scaler Value) (0x160 Works for 320)
-		u16			:	3;
-		u16 HS_EN	:	1; // Enable Horizontal Scaling
-		u16			:	3;
-	};
-	UVIHorizontalScaling(u16 _hex) { Hex = _hex;}
-	UVIHorizontalScaling() { Hex = 0;}
-};
-
-// Used for tables 0-2
-union UVIFilterCoefTable3
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct
-	{
-		u32 Tap0	:	10;
-		u32 Tap1	:	10;
-		u32 Tap2	:	10;
-		u32			:	 2;
-	};
-};
-
-// Used for tables 3-6
-union UVIFilterCoefTable4
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct
-	{
-		u32 Tap0	:	 8;
-		u32 Tap1	:	 8;
-		u32 Tap2	:	 8;
-		u32 Tap3	:	 8;
-	};
-};
-
-struct SVIFilterCoefTables
-{
-	UVIFilterCoefTable3 Tables02[3];
-	UVIFilterCoefTable4 Tables36[4];
-};
-
-// Debug video mode only, probably never used in dolphin...
-union UVIBorderBlankRegister
-{
-	u32 Hex;
-	struct { u16 Lo, Hi; };
-	struct
-	{
-		u32 HBE656	:	10; // Border Horizontal Blank End
-		u32			:	11;
-		u32 HBS656	:	10; // Border Horizontal Blank start
-		u32 BRDR_EN	:	 1; // Border Enable
-	};
-};
-
-// ntsc-j and component cable bits
-union UVIDTVStatus
-{
-	u16 Hex;
-	struct 
-	{
-		u16 component_plugged	: 1;
-		u16 ntsc_j				: 1;
-		u16						:14;
-	};
-};
-
-	// urgh, ugly externs.
-	extern u32 TargetRefreshRate;
-
-	// For BS2 HLE
-	void Preset(bool _bNTSC);
-
-	void Init();
-	void SetRegionReg(char region);
-	void DoState(PointerWrap &p);
-
-	void Read8(u8& _uReturnValue, const u32 _uAddress);
-	void Read16(u16& _uReturnValue, const u32 _uAddress);
-	void Read32(u32& _uReturnValue, const u32 _uAddress);
-
-	void Write16(const u16 _uValue, const u32 _uAddress);
-	void Write32(const u32 _uValue, const u32 _uAddress);
-
-	// returns a pointer to the current visible xfb
-	u8* GetXFBPointerTop();
-	u8* GetXFBPointerBottom();
-
-	// Update and draw framebuffer
-	void Update();
-
-	// UpdateInterrupts: check if we have to generate a new VI Interrupt
-	void UpdateInterrupts();
-
-	// Change values pertaining to video mode
-	void UpdateParameters();
-
-	unsigned int GetTicksPerLine();
-	unsigned int GetTicksPerFrame();
-
-	int GetNumFields();
-};
-
-#endif // _VIDEOINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/WII_IOB.cpp b/Source/Core/Core/Src/HW/WII_IOB.cpp
deleted file mode 100644
index bfcf1024e4..0000000000
--- a/Source/Core/Core/Src/HW/WII_IOB.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "WII_IOB.h"
-
-namespace WII_IOBridge
-{
-
-void Read8(u8& _rReturnValue, const u32 _Address)
-{
-	_dbg_assert_(WII_IOB, 0);
-}
-
-void Read16(u16& _rReturnValue, const u32 _Address)
-{
-	_dbg_assert_(WII_IOB, 0);
-}
-
-void Read32(u32& _rReturnValue, const u32 _Address)
-{
-	switch (_Address & 0xFFFF)
-	{
-	// NAND Loader ... no idea
-	case 0x018:
-		ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (NANDLoader)",  _Address);
-		break;
-	// WiiMenu... no idea
-	case 0x24:
-		ERROR_LOG(WII_IOB, "IOP: Read32 from 0x24 = 0x%08x (WiiMenu)",  _Address);
-		break;
-
-
-	case 0xc0:					// __VISendI2CData
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc0 = 0x%08x (__VISendI2CData)", _rReturnValue);
-		break;
-
-	case 0xc4:					// __VISendI2CData
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc4 = 0x%08x (__VISendI2CData)", _rReturnValue);
-		break;
-
-	case 0xc8:					// __VISendI2CData
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc8 = 0x%08x (__VISendI2CData)", _rReturnValue);
-		break;
-
-	case 0x180:					// __AIClockInit
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0x180 = 0x%08x (__AIClockInit)", _rReturnValue);
-		return;
-
-	case 0x1CC:					// __AIClockInit
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0x1CC = 0x%08x (__AIClockInit)", _rReturnValue);
-		return;
-
-	case 0x1D0:					// __AIClockInit
-		_rReturnValue = 0;
-		INFO_LOG(WII_IOB, "IOP: Read32 from 0x1D0 = 0x%08x (__AIClockInit)", _rReturnValue);
-		return;
-
-	default:
-		_dbg_assert_msg_(WII_IOB, 0, "IOP: Read32 from 0x%08x", _Address);
-		break;
-	}
-}
-
-void Read64(u64& _rReturnValue, const u32 _Address)
-{
-	_dbg_assert_(WII_IOB, 0);
-}
-
-void Write8(const u8 _Value, const u32 _Address)
-{
-	_dbg_assert_(WII_IOB, 0);
-}
-
-void Write16(const u16 _Value, const u32 _Address)
-{
-	_dbg_assert_(WII_IOB, 0);
-}
-
-void Write32(const u32 _Value, const u32 _Address)
-{
-	switch(_Address & 0xFFFF)
-	{
-	// NANDLoader ... no idea
-	case 0x18:
-		ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (NANDLoader)", _Value, _Address);
-		break;
-	// WiiMenu... no idea
-	case 0x24:
-		ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (WiiMenu)", _Value, _Address);
-		break;
-
-	case 0xc0:					// __VISendI2CData
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc0 = 0x%08x (__VISendI2CData)", _Value);
-		break;
-
-	case 0xc4:					// __VISendI2CData
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc4 = 0x%08x (__VISendI2CData)", _Value);
-		break;
-
-	case 0xc8:					// __VISendI2CData
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc8 = 0x%08x (__VISendI2CData)", _Value);
-		break;
-
-	case 0x180:					// __AIClockInit
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0x180 = 0x%08x (__AIClockInit)", _Value);
-		return;
-
-	case 0x1CC:					// __AIClockInit
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0x1D0 = 0x%08x (__AIClockInit)", _Value);
-		return;
-
-	case 0x1D0:					// __AIClockInit
-		INFO_LOG(WII_IOB, "IOP: Write32 to 0x1D0 = 0x%08x (__AIClockInit)", _Value);
-		return;
-
-	default:
-		_dbg_assert_msg_(WII_IOB, 0, "IOP: Write32 to 0x%08x", _Address);
-		break;
-	}
-}
-
-void Write64(const u64 _Value, const u32 _Address)
-{
-	//switch(_Address)
-	//{
-	//default:
-		_dbg_assert_msg_(WII_IOB, 0, "IOP: Write32 to 0x%08x", _Address);
-		//break;
-	//}
-}
-
-} // end of namespace AudioInterfac
diff --git a/Source/Core/Core/Src/HW/WII_IOB.h b/Source/Core/Core/Src/HW/WII_IOB.h
deleted file mode 100644
index cdca7f6c8f..0000000000
--- a/Source/Core/Core/Src/HW/WII_IOB.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IOBRIDGE_H_
-#define _WII_IOBRIDGE_H_
-
-#include "Common.h"
-class PointerWrap;
-
-namespace WII_IOBridge
-{
-
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-void Update();
-
-void Read8(u8& _rReturnValue, const u32 _Address);
-void Read16(u16& _rReturnValue, const u32 _Address);
-void Read32(u32& _rReturnValue, const u32 _Address);
-void Read64(u64& _rReturnValue, const u32 _Address);
-
-void Write8(const u8 _Value, const u32 _Address);
-void Write16(const u16 _Value, const u32 _Address);
-void Write32(const u32 _Value, const u32 _Address);
-void Write64(const u64 _Value, const u32 _Address);
-
-} // end of namespace AudioInterface
-
-#endif
-
-
diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
deleted file mode 100644
index b09d83f44b..0000000000
--- a/Source/Core/Core/Src/HW/WII_IPC.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-#include <queue>
-#include <vector>
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-#include "CPU.h"
-#include "Memmap.h"
-#include "ProcessorInterface.h"
-
-#include "../IPC_HLE/WII_IPC_HLE.h"
-#include "WII_IPC.h"
-#include "CoreTiming.h"
-
-
-// This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because of the IOS HLE
-// How IOS uses IPC:
-// X1 Execute command: a new pointer is available in HW_IPC_PPCCTRL
-// X2 Reload (a new IOS is being loaded, old one doesn't need to reply anymore)
-// Y1 Command executed and reply available in HW_IPC_ARMMSG
-// Y2 Command acknowledge
-// ppc_msg is a pointer to 0x40byte command structure
-// arm_msg is, similarly, starlet's response buffer*
-
-namespace WII_IPCInterface
-{
-
-enum
-{
-	IPC_PPCMSG	= 0x00,
-	IPC_PPCCTRL	= 0x04,
-	IPC_ARMMSG	= 0x08,
-	IPC_ARMCTRL	= 0x0c,
-
-	PPC_IRQFLAG	= 0x30,
-	PPC_IRQMASK	= 0x34,
-	ARM_IRQFLAG	= 0x38,
-	ARM_IRQMASK	= 0x3c,
-
-	GPIOB_OUT	= 0xc0 // sensor bar power flag??
-};
-
-struct CtrlRegister
-{
-	u8 X1	: 1;
-	u8 X2	: 1;
-	u8 Y1	: 1;
-	u8 Y2	: 1;
-	u8 IX1	: 1;
-	u8 IX2	: 1;
-	u8 IY1	: 1;
-	u8 IY2	: 1;
-
-	CtrlRegister() { X1 = X2 = Y1 = Y2 = IX1 = IX2 = IY1 = IY2 = 0; }
-
-	inline u8 ppc() { return (IY2<<5)|(IY1<<4)|(X2<<3)|(Y1<<2)|(Y2<<1)|X1; }
-	inline u8 arm() { return (IX2<<5)|(IX1<<4)|(Y2<<3)|(X1<<2)|(X2<<1)|Y1; }
-
-	inline void ppc(u32 v) {
-		X1 = v & 1;
-		X2 = (v >> 3) & 1;
-		if ((v >> 2) & 1) Y1 = 0;
-		if ((v >> 1) & 1) Y2 = 0;
-		IY1 = (v >> 4) & 1;
-		IY2 = (v >> 5) & 1;
-	}
-
-	inline void arm(u32 v) {
-		Y1 = v & 1;
-		Y2 = (v >> 3) & 1;
-		if ((v >> 2) & 1) X1 = 0;
-		if ((v >> 1) & 1) X2 = 0;
-		IX1 = (v >> 4) & 1;
-		IX2 = (v >> 5) & 1;
-	}
-};
-
-// STATE_TO_SAVE
-static u32 ppc_msg;
-static u32 arm_msg;
-static CtrlRegister ctrl;
-
-static u32 ppc_irq_flags;
-static u32 ppc_irq_masks;
-static u32 arm_irq_flags;
-static u32 arm_irq_masks;
-
-static u32 sensorbar_power; // do we need to care about this?
-
-int updateInterrupts;
-
-void DoState(PointerWrap &p)
-{
-	p.Do(ppc_msg);
-	p.Do(arm_msg);
-	p.DoPOD(ctrl);
-	p.Do(ppc_irq_flags);
-	p.Do(ppc_irq_masks);
-	p.Do(arm_irq_flags);
-	p.Do(arm_irq_masks);
-	p.Do(sensorbar_power);
-}
-
-void Init()
-{
-	ctrl = CtrlRegister();
-	ppc_msg =
-	arm_msg =
-
-	ppc_irq_flags =
-	ppc_irq_masks =
-	arm_irq_flags =
-	arm_irq_masks =
-
-	sensorbar_power = 0;
-
-	ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY;
-
-	updateInterrupts = CoreTiming::RegisterEvent("IPCInterrupt", UpdateInterrupts);
-}
-
-void Reset()
-{
-	INFO_LOG(WII_IPC, "Resetting ...");
-	Init();
-	WII_IPC_HLE_Interface::Reset();
-}
-
-void Shutdown()
-{
-}
-
-void Read32(u32& _rReturnValue, const u32 _Address)
-{
-	switch(_Address & 0xFFFF)
-	{
-	case IPC_PPCCTRL:
-		_rReturnValue = ctrl.ppc();
-		DEBUG_LOG(WII_IPC, "r32 IPC_PPCCTRL %03x [R:%i A:%i E:%i]",
-			ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1);
-
-		// if ((REASON_REG & 0x14) == 0x14) CALL IPCReplayHandler
-		// if ((REASON_REG & 0x22) != 0x22) Jumps to the end
-		break;
-
-	case IPC_ARMMSG:	// looks a little bit like a callback function
-		_rReturnValue = arm_msg;
-		DEBUG_LOG(WII_IPC, "r32 IPC_ARMMSG %08x ", _rReturnValue);
-		break;
-
-	case GPIOB_OUT:
-		_rReturnValue = sensorbar_power;
-		break;
-
-	default:
-		_dbg_assert_msg_(WII_IPC, 0, "r32 from %08x", _Address);
-		break;
-	}
-}
-
-void Write32(const u32 _Value, const u32 _Address)
-{
-	switch(_Address & 0xFFFF)
-	{
-	case IPC_PPCMSG:	// __ios_Ipc2 ... a value from __responses is loaded
-		{
-			ppc_msg = _Value;
-			DEBUG_LOG(WII_IPC, "IPC_PPCMSG = %08x", ppc_msg);
-		}
-		break;
-
-	case IPC_PPCCTRL:
-		{
-			ctrl.ppc(_Value);
-			DEBUG_LOG(WII_IPC, "w32 %08x IPC_PPCCTRL = %03x [R:%i A:%i E:%i]",
-				_Value, ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1);
-			if (ctrl.X1)
-			{
-				INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
-				// Let the HLE handle the request on it's own time
-				WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
-			}
-		}
-		break;
-
-	case PPC_IRQFLAG:	// ACR REGISTER IT IS CALLED IN DEBUG
-		{
-			ppc_irq_flags &= ~_Value;
-			DEBUG_LOG(WII_IPC,  "w32 PPC_IRQFLAG %08x (%08x)", _Value, ppc_irq_flags);
-		}
-		break;
-
-	case PPC_IRQMASK:	// __OSInterruptInit (0x40000000)
-		{
-			ppc_irq_masks = _Value;
-			if (ppc_irq_masks & INT_CAUSE_IPC_BROADWAY) // wtf?
-				Reset();
-			DEBUG_LOG(WII_IPC, "w32 PPC_IRQMASK %08x", ppc_irq_masks);
-		}
-		break;
-
-	case GPIOB_OUT:
-		sensorbar_power = _Value;
-		break;
-
-	default:
-		_dbg_assert_msg_(WII_IPC, 0, "w32 %08x @ %08x", _Value, _Address);
-		break;
-	}
-	
-	WII_IPC_HLE_Interface::Update();
-	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
-}
-
-void UpdateInterrupts(u64 userdata, int cyclesLate)
-{
-	if ((ctrl.Y1 & ctrl.IY1) || (ctrl.Y2 & ctrl.IY2))
-	{
-		ppc_irq_flags |= INT_CAUSE_IPC_BROADWAY;
-	}
-
-	if ((ctrl.X1 & ctrl.IX1) || (ctrl.X2 & ctrl.IX2))
-	{
-		ppc_irq_flags |= INT_CAUSE_IPC_STARLET;
-	}
-
-	// Generate interrupt on PI if any of the devices behind starlet have an interrupt and mask is set
-	ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_WII_IPC, !!(ppc_irq_flags & ppc_irq_masks));
-}
-
-void GenerateAck(u32 _Address)
-{
-	arm_msg = _Address; // dunno if it's really set here, but HLE needs to stay in context
-	ctrl.Y2 = 1;
-	INFO_LOG(WII_IPC, "GenerateAck: %08x | %08x [R:%i A:%i E:%i]",
-		ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1);
-	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
-}
-
-void GenerateReply(u32 _Address)
-{
-	arm_msg = _Address;
-	ctrl.Y1 = 1;
-	INFO_LOG(WII_IPC, "GenerateReply: %08x | %08x [R:%i A:%i E:%i]",
-		ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1);
-	UpdateInterrupts();
-}
-
-bool IsReady()
-{
-	return ((ctrl.Y1 == 0) && (ctrl.Y2 == 0) && ((ppc_irq_flags & INT_CAUSE_IPC_BROADWAY) == 0));
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WII_IPC.h b/Source/Core/Core/Src/HW/WII_IPC.h
deleted file mode 100644
index 3e5ec1c88d..0000000000
--- a/Source/Core/Core/Src/HW/WII_IPC.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_H_
-#define _WII_IPC_H_
-
-#include "Common.h"
-class PointerWrap;
-
-namespace WII_IPCInterface
-{
-
-enum StarletInterruptCause
-{
-	INT_CAUSE_TIMER			=    0x1,
-	INT_CAUSE_NAND			=    0x2,
-	INT_CAUSE_AES			=    0x4,
-	INT_CAUSE_SHA1			=    0x8,
-	INT_CAUSE_EHCI			=   0x10,
-	INT_CAUSE_OHCI0			=   0x20,
-	INT_CAUSE_OHCI1			=   0x40,
-	INT_CAUSE_SD			=   0x80,
-	INT_CAUSE_WIFI			=  0x100,
-
-	INT_CAUSE_GPIO_BROADWAY	=  0x400,
-	INT_CAUSE_GPIO_STARLET	=  0x800,
-
-	INT_CAUSE_RST_BUTTON	= 0x40000,
-
-	INT_CAUSE_IPC_BROADWAY	= 0x40000000,
-	INT_CAUSE_IPC_STARLET	= 0x80000000
-};
-
-void Init();
-void Reset();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-void Read32(u32& _rReturnValue, const u32 _Address);
-void Write32(const u32 _Value, const u32 _Address);
-
-void UpdateInterrupts(u64 userdata = 0, int cyclesLate = 0);
-void GenerateAck(u32 _Address);
-void GenerateReply(u32 _Address);
-
-bool IsReady();
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
deleted file mode 100644
index 2061e80f2e..0000000000
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "Wiimote.h"
-#include "WiimoteReal/WiimoteReal.h"
-#include "WiimoteEmu/WiimoteEmu.h"
-#include "Movie.h"
-#include "../ConfigManager.h"
-
-#include "ControllerInterface/ControllerInterface.h"
-
-#include "../../InputCommon/Src/InputConfig.h"
-
-namespace Wiimote
-{
-
-static InputPlugin g_plugin(WIIMOTE_INI_NAME, _trans("Wiimote"), "Wiimote");
-InputPlugin *GetPlugin()
-{
-	return &g_plugin;
-}
-
-void Shutdown()
-{
-	std::vector<ControllerEmu*>::const_iterator
-		i = g_plugin.controllers.begin(),
-		e = g_plugin.controllers.end();
-	for ( ; i!=e; ++i )
-		delete *i;
-	g_plugin.controllers.clear();
-
-	WiimoteReal::Stop();
-
-	g_controller_interface.Shutdown();
-}
-
-// if plugin isn't initialized, init and load config
-void Initialize(void* const hwnd, bool wait)
-{
-	// add 4 wiimotes
-	for (unsigned int i = WIIMOTE_CHAN_0; i<MAX_BBMOTES; ++i)
-		g_plugin.controllers.push_back(new WiimoteEmu::Wiimote(i));
-	
-	
-	g_controller_interface.SetHwnd(hwnd);
-	g_controller_interface.Initialize();
-
-	g_plugin.LoadConfig(false);
-
-	WiimoteReal::Initialize(wait);
-	
-	// reload Wiimotes with our settings
-	if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
-		Movie::ChangeWiiPads();
-}
-
-void Resume()
-{
-	WiimoteReal::Resume();
-}
-
-void Pause()
-{
-	WiimoteReal::Pause();
-}
-
-
-// __________________________________________________________________________________________________
-// Function: ControlChannel
-// Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
-//           on the HID CONTROL channel.
-//
-// Inputs:   _number    [Description needed]
-//           _channelID [Description needed]
-//           _pData     [Description needed]
-//           _Size      [Description needed]
-//
-// Output:   none
-//
-void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
-{
-	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
-		((WiimoteEmu::Wiimote*)g_plugin.controllers[_number])->ControlChannel(_channelID, _pData, _Size);
-}
-
-// __________________________________________________________________________________________________
-// Function: InterruptChannel
-// Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
-//           on the HID INTERRUPT channel.
-//
-// Inputs:   _number    [Description needed]
-//           _channelID [Description needed]
-//           _pData     [Description needed]
-//           _Size      [Description needed]
-//
-// Output:   none
-//
-void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
-{
-	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
-		((WiimoteEmu::Wiimote*)g_plugin.controllers[_number])->InterruptChannel(_channelID, _pData, _Size);
-}
-
-// __________________________________________________________________________________________________
-// Function: Update
-// Purpose:  This function is called periodically by the Core. // TODO: Explain why.
-// input:    _number: [Description needed]
-// output:   none
-//
-void Update(int _number)
-{
-	//PanicAlert( "Wiimote_Update" );
-
-	// TODO: change this to a try_to_lock, and make it give empty input on failure
-	std::lock_guard<std::recursive_mutex> lk(g_plugin.controls_lock);
-
-	static int _last_number = 4;
-	if (_number <= _last_number)
-	{
-		g_controller_interface.UpdateOutput();
-		g_controller_interface.UpdateInput();
-	}
-	_last_number = _number;
-
-	if (WIIMOTE_SRC_EMU & g_wiimote_sources[_number])
-		((WiimoteEmu::Wiimote*)g_plugin.controllers[_number])->Update();
-	else
-		WiimoteReal::Update(_number);
-}
-
-// __________________________________________________________________________________________________
-// Function: GetAttached
-// Purpose:  Get mask of attached pads (eg: controller 1 & 4 -> 0x9)
-// input:    none
-// output:   The number of attached pads
-//
-unsigned int GetAttached()
-{
-	unsigned int attached = 0;
-	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
-		if (g_wiimote_sources[i])
-			attached |= (1 << i);
-	return attached;
-}
-
-// ___________________________________________________________________________
-// Function: DoState
-// Purpose:  Saves/load state
-// input/output: ptr: [Description Needed]
-// input: mode        [Description needed]
-//
-void DoState(u8 **ptr, PointerWrap::Mode mode)
-{
-	// TODO:
-
-	PointerWrap p(ptr, mode);
-	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
-		((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p);
-}
-
-// ___________________________________________________________________________
-// Function: EmuStateChange
-// Purpose: Notifies the plugin of a change in emulation state
-// input:    newState - The new state for the Wiimote to change to.
-// output:   none
-//
-void EmuStateChange(EMUSTATE_CHANGE newState)
-{
-	// TODO
-	WiimoteReal::StateChange(newState);
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
deleted file mode 100644
index be1de18bc9..0000000000
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WIIMOTE_H_
-#define _WIIMOTE_H_
-
-#include "../../InputCommon/Src/InputConfig.h"
-#include "ChunkFile.h"
-
-enum {
-	WIIMOTE_CHAN_0 = 0,
-	WIIMOTE_CHAN_1,
-	WIIMOTE_CHAN_2,
-	WIIMOTE_CHAN_3,
-	WIIMOTE_BALANCE_BOARD,
-	MAX_WIIMOTES = WIIMOTE_BALANCE_BOARD,
-	MAX_BBMOTES = 5,
-};
-
-
-#define WIIMOTE_INI_NAME	"WiimoteNew"
-
-enum
-{
-	WIIMOTE_SRC_NONE = 0,
-	WIIMOTE_SRC_EMU = 1,
-	WIIMOTE_SRC_REAL = 2,
-	WIIMOTE_SRC_HYBRID = 3,	// emu + real
-};
-
-extern unsigned int g_wiimote_sources[MAX_BBMOTES];
-
-namespace Wiimote
-{
-
-void Shutdown();
-void Initialize(void* const hwnd, bool wait = false);
-void Resume();
-void Pause();
-
-unsigned int GetAttached();
-void DoState(u8 **ptr, PointerWrap::Mode mode);
-void EmuStateChange(EMUSTATE_CHANGE newState);
-InputPlugin *GetPlugin();
-
-void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
-void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
-void Update(int _number);
-
-}
-
-namespace WiimoteReal
-{
-
-void Initialize(bool wait = false);
-void Stop();
-void Shutdown();
-void Resume();
-void Pause();
-void Refresh();
-
-void LoadSettings();
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp
deleted file mode 100644
index bf4cacfea3..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Attachment.h"
-
-namespace WiimoteEmu
-{
-
-// Extension device IDs to be written to the last bytes of the extension reg
-// The id for nothing inserted
-static const u8 nothing_id[]	= { 0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e };
-// The id for a partially inserted extension
-static const u8 partially_id[]	= { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff };
-
-Attachment::Attachment( const char* const _name, WiimoteEmu::ExtensionReg& _reg )
-	: name( _name ), reg( _reg )
-{
-	memset(id, 0, sizeof(id));
-	memset(calibration, 0, sizeof(calibration));
-}
-
-None::None( WiimoteEmu::ExtensionReg& _reg ) : Attachment( "None", _reg )
-{
-	// set up register
-	memcpy(&id, nothing_id, sizeof(nothing_id));
-}
-
-std::string Attachment::GetName() const
-{
-	return name;
-}
-
-void Attachment::Reset()
-{
-	// set up register
-	memset( &reg, 0, WIIMOTE_REG_EXT_SIZE );
-	memcpy( &reg.constant_id, id, sizeof(id) );
-	memcpy( &reg.calibration, calibration, sizeof(calibration) );
-}
-
-}
-
-void ControllerEmu::Extension::GetState( u8* const data, const bool focus )
-{
-	((WiimoteEmu::Attachment*)attachments[ active_extension ])->GetState( data, focus );
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
deleted file mode 100644
index dfa292bf3b..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ATTACHMENT_EMU_H_
-#define _ATTACHMENT_EMU_H_
-
-#include "ControllerEmu.h"
-#include "../WiimoteEmu.h"
-
-namespace WiimoteEmu
-{
-
-class Attachment : public ControllerEmu
-{
-public:
-	Attachment( const char* const _name, WiimoteEmu::ExtensionReg& _reg );
-
-	virtual void GetState( u8* const data, const bool focus = true ) {}
-	void Reset();
-	std::string GetName() const;
-
-	const char*	const			name;
-	WiimoteEmu::ExtensionReg&	reg;
-
-	u8 id[6];
-	u8 calibration[0x10];
-};
-
-class None : public Attachment
-{
-public:
-	None( WiimoteEmu::ExtensionReg& _reg );
-};
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
deleted file mode 100644
index 5b0d962397..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Classic.h"
-
-
-namespace WiimoteEmu
-{
-
-static const u8 classic_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x01 };
-/* Classic Controller calibration */
-static const u8 classic_calibration[] =
-{
-	0xff, 0x00, 0x80, 0xff, 0x00, 0x80,
-	0xff, 0x00, 0x80, 0xff, 0x00, 0x80,
-	0x00, 0x00, 0x51, 0xa6
-};
-
-static const u16 classic_button_bitmasks[] =
-{
-	Classic::BUTTON_A,
-	Classic::BUTTON_B,
-	Classic::BUTTON_X,
-	Classic::BUTTON_Y,
-
-	Classic::BUTTON_ZL,
-	Classic::BUTTON_ZR,
-
-	Classic::BUTTON_MINUS,
-	Classic::BUTTON_PLUS,
-
-	Classic::BUTTON_HOME,
-};
-
-static const char* const classic_button_names[] =
-{
-	"A","B","X","Y","ZL","ZR","-","+","Home",
-};
-
-static const u16 classic_trigger_bitmasks[] =
-{
-	Classic::TRIGGER_L, Classic::TRIGGER_R,
-};
-
-static const char* const classic_trigger_names[] =
-{
-	"L", "R", "L-Analog", "R-Analog"
-};
-
-static const u16 classic_dpad_bitmasks[] =
-{
-	Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT 
-};
-
-Classic::Classic(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Classic"), _reg)
-{
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	for (unsigned int i = 0; i < sizeof(classic_button_names)/sizeof(*classic_button_names); ++i)
-		m_buttons->controls.push_back(new ControlGroup::Input(classic_button_names[i]));
-
-	// sticks
-	groups.push_back(m_left_stick = new AnalogStick(_trans("Left Stick")));
-	groups.push_back(m_right_stick = new AnalogStick(_trans("Right Stick")));
-
-	// triggers
-	groups.push_back(m_triggers = new MixedTriggers("Triggers"));
-	for (unsigned int i=0; i < sizeof(classic_trigger_names)/sizeof(*classic_trigger_names); ++i)
-		m_triggers->controls.push_back(new ControlGroup::Input(classic_trigger_names[i]));
-
-	// dpad
-	groups.push_back(m_dpad = new Buttons("D-Pad"));
-	for (unsigned int i=0; i < 4; ++i)
-		m_dpad->controls.push_back(new ControlGroup::Input(named_directions[i]));
-
-	// set up register
-	// calibration
-	memcpy(&calibration, classic_calibration, sizeof(classic_calibration));
-	// id
-	memcpy(&id, classic_id, sizeof(classic_id));
-}
-
-void Classic::GetState(u8* const data, const bool focus)
-{
-	wm_classic_extension* const ccdata = (wm_classic_extension*)data;
-	ccdata->bt = 0;
-
-	// not using calibration data, o well
-
-	// left stick
-	{
-	u8 x, y;
-	m_left_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
-
-	ccdata->lx = x;
-	ccdata->ly = y;
-	}
-
-	// right stick
-	{
-	u8 x, y;
-	m_right_stick->GetState(&x, &y, 0x10, focus ? 0x0F /*0x0C*/ : 0);
-
-	ccdata->rx1 = x;
-	ccdata->rx2 = x >> 1;
-	ccdata->rx3 = x >> 3;
-	ccdata->ry = y;
-	}
-
-	//triggers
-	{
-	u8 trigs[2];
-	m_triggers->GetState(&ccdata->bt, classic_trigger_bitmasks, trigs, focus ? 0x1F : 0);
-
-	ccdata->lt1 = trigs[0];
-	ccdata->lt2 = trigs[0] >> 3;
-	ccdata->rt = trigs[1];
-	}
-
-	if (focus)
-	{
-		// buttons
-		m_buttons->GetState(&ccdata->bt, classic_button_bitmasks);
-		// dpad
-		m_dpad->GetState(&ccdata->bt, classic_dpad_bitmasks);
-	}
-
-	// flip button bits
-	ccdata->bt ^= 0xFFFF;
-}
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h
deleted file mode 100644
index ac68b2ad77..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Attachment.h"
-
-namespace WiimoteEmu
-{
-
-class Classic : public Attachment
-{
-public:
-	Classic(WiimoteEmu::ExtensionReg& _reg);
-	void GetState( u8* const data, const bool focus );
-
-	enum
-	{
-		PAD_RIGHT = 0x80,
-		PAD_DOWN = 0x40,
-		TRIGGER_L = 0x20,
-		BUTTON_MINUS = 0x10,
-		BUTTON_HOME = 0x08,
-		BUTTON_PLUS = 0x04,
-		TRIGGER_R = 0x02,
-		NOTHING = 0x01,
-		BUTTON_ZL = 0x8000,
-		BUTTON_B = 0x4000,
-		BUTTON_Y = 0x2000,
-		BUTTON_A = 0x1000,
-		BUTTON_X = 0x0800,
-		BUTTON_ZR = 0x0400,
-		PAD_LEFT = 0x0200,
-		PAD_UP = 0x0100,
-	};
-
-private:
-	Buttons*		m_buttons;
-	MixedTriggers*	m_triggers;
-	Buttons*		m_dpad;
-	AnalogStick*	m_left_stick;
-	AnalogStick*	m_right_stick;
-};
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
deleted file mode 100644
index 1ae774ba7d..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Drums.h"
-
-
-namespace WiimoteEmu
-{
-
-static const u8 drums_id[] = { 0x01, 0x00, 0xa4, 0x20, 0x01, 0x03 };
-
-static const u16 drum_pad_bitmasks[] =
-{
-	Drums::PAD_RED,
-	Drums::PAD_YELLOW,
-	Drums::PAD_BLUE,
-	Drums::PAD_GREEN,
-	Drums::PAD_ORANGE,
-	Drums::PAD_BASS,
-};
-
-static const char* const drum_pad_names[] =
-{
-	_trans("Red"), _trans("Yellow"), _trans("Blue"),
-	_trans("Green"), _trans("Orange"), _trans("Bass")
-};
-
-static const u16 drum_button_bitmasks[] =
-{
-	Drums::BUTTON_MINUS,
-	Drums::BUTTON_PLUS,
-};
-
-Drums::Drums(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Drums"), _reg)
-{
-	// pads
-	groups.push_back(m_pads = new Buttons(_trans("Pads")));
-	for (unsigned int i = 0; i < sizeof(drum_pad_names)/sizeof(*drum_pad_names); ++i)
-		m_pads->controls.push_back(new ControlGroup::Input(drum_pad_names[i]));
-
-	// stick
-	groups.push_back(m_stick = new AnalogStick("Stick"));
-
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	m_buttons->controls.push_back(new ControlGroup::Input("-"));
-	m_buttons->controls.push_back(new ControlGroup::Input("+"));
-
-	// set up register
-	// id
-	memcpy(&id, drums_id, sizeof(drums_id));
-}
-
-void Drums::GetState(u8* const data, const bool focus)
-{
-	wm_drums_extension* const ddata = (wm_drums_extension*)data;
-	ddata->bt = 0;
-
-	// calibration data not figured out yet?
-
-	// stick
-	{
-	u8 x, y;
-	m_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
-
-	ddata->sx = x;
-	ddata->sy = y;
-	}
-
-	// TODO: softness maybe
-	data[2] = 0xFF;
-	data[3] = 0xFF;
-
-	if (focus)
-	{
-		// buttons
-		m_buttons->GetState(&ddata->bt, drum_button_bitmasks);
-		// pads
-		m_pads->GetState(&ddata->bt, drum_pad_bitmasks);
-	}
-
-	// flip button bits
-	ddata->bt ^= 0xFFFF;
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h
deleted file mode 100644
index 3771140f10..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Attachment.h"
-
-namespace WiimoteEmu
-{
-
-class Drums : public Attachment
-{
-public:
-	Drums(WiimoteEmu::ExtensionReg& _reg);
-	void GetState( u8* const data, const bool focus );
-
-	enum
-	{
-		BUTTON_PLUS = 0x04,
-		BUTTON_MINUS = 0x10,
-
-		PAD_BASS = 0x0400,
-		PAD_BLUE = 0x0800,
-		PAD_GREEN = 0x1000,
-		PAD_YELLOW = 0x2000,
-		PAD_RED = 0x4000,
-		PAD_ORANGE = 0x8000,
-	};
-
-private:
-	Buttons*		m_buttons;
-	Buttons*		m_pads;
-	AnalogStick*	m_stick;
-};
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
deleted file mode 100644
index 23a2f93054..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Guitar.h"
-
-
-namespace WiimoteEmu
-{
-
-static const u8 guitar_id[]	= { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x03 };
-
-static const u16 guitar_fret_bitmasks[] =
-{
-	Guitar::FRET_GREEN,
-	Guitar::FRET_RED,
-	Guitar::FRET_YELLOW,
-	Guitar::FRET_BLUE,
-	Guitar::FRET_ORANGE,
-};
-
-static const char* const guitar_fret_names[] =
-{
-	"Green","Red","Yellow","Blue","Orange",
-};
-
-static const u16 guitar_button_bitmasks[] =
-{
-	Guitar::BUTTON_MINUS,
-	Guitar::BUTTON_PLUS,
-};
-
-static const u16 guitar_strum_bitmasks[] =
-{
-	Guitar::BAR_UP,
-	Guitar::BAR_DOWN,
-};
-
-Guitar::Guitar(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Guitar"), _reg)
-{
-	// frets
-	groups.push_back(m_frets = new Buttons(_trans("Frets")));
-	for (unsigned int i = 0; i < sizeof(guitar_fret_names)/sizeof(*guitar_fret_names); ++i)
-		m_frets->controls.push_back(new ControlGroup::Input(guitar_fret_names[i]));
-
-	// strum
-	groups.push_back(m_strum = new Buttons(_trans("Strum")));
-	m_strum->controls.push_back(new ControlGroup::Input("Up"));
-	m_strum->controls.push_back(new ControlGroup::Input("Down"));
-
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	m_buttons->controls.push_back(new ControlGroup::Input("-"));
-	m_buttons->controls.push_back(new ControlGroup::Input("+"));
-
-	// stick
-	groups.push_back(m_stick = new AnalogStick(_trans("Stick")));
-
-	// whammy
-	groups.push_back(m_whammy = new Triggers(_trans("Whammy")));
-	m_whammy->controls.push_back(new ControlGroup::Input(_trans("Bar")));
-
-	// set up register
-	// id
-	memcpy(&id, guitar_id, sizeof(guitar_id));
-}
-
-void Guitar::GetState(u8* const data, const bool focus)
-{
-	wm_guitar_extension* const gdata = (wm_guitar_extension*)data;
-	gdata->bt = 0;
-
-	// calibration data not figured out yet?
-
-	// stick
-	{
-	u8 x, y;
-	m_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
-
-	gdata->sx = x;
-	gdata->sy = y;
-	}
-
-	// TODO: touch bar, probably not
-	gdata->tb = 0x0F;	// not touched
-
-	// whammy bar
-	u8 whammy;
-	m_whammy->GetState(&whammy, 0x1F);
-	gdata->whammy = whammy;
-
-	if (focus)
-	{
-		// buttons
-		m_buttons->GetState(&gdata->bt, guitar_button_bitmasks);
-		// frets
-		m_frets->GetState(&gdata->bt, guitar_fret_bitmasks);
-		// strum
-		m_strum->GetState(&gdata->bt, guitar_strum_bitmasks);
-	}
-
-	// flip button bits
-	gdata->bt ^= 0xFFFF;
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
deleted file mode 100644
index 245ebabb90..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Attachment.h"
-
-namespace WiimoteEmu
-{
-
-class Guitar : public Attachment
-{
-public:
-	Guitar(WiimoteEmu::ExtensionReg& _reg);
-	void GetState( u8* const data, const bool focus );
-
-	enum
-	{
-		BUTTON_PLUS = 0x04,
-		BUTTON_MINUS = 0x10,
-		BAR_DOWN = 0x40,
-
-		BAR_UP = 0x0100,
-		FRET_YELLOW = 0x0800,
-		FRET_GREEN = 0x1000,
-		FRET_BLUE = 0x2000,
-		FRET_RED = 0x4000,
-		FRET_ORANGE = 0x8000,
-	};
-
-private:
-	Buttons*		m_buttons;
-	Buttons*		m_frets;
-	Buttons*		m_strum;
-	Triggers*		m_whammy;
-	AnalogStick*	m_stick;
-};
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
deleted file mode 100644
index 63dd485ed7..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Nunchuk.h"
-
-#include "UDPWrapper.h"
-#include "UDPWiimote.h"
-
-namespace WiimoteEmu
-{
-
-static const u8 nunchuck_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x00, 0x00 };
-/* Default calibration for the nunchuck. It should be written to 0x20 - 0x3f of the
-   extension register. 0x80 is the neutral x and y accelerators and 0xb3 is the
-   neutral z accelerometer that is adjusted for gravity. */
-static const u8 nunchuck_calibration[] =
-{
-	0x80, 0x80, 0x80, 0x00, // accelerometer x, y, z neutral
-	0xb3, 0xb3, 0xb3, 0x00, //  x, y, z g-force values 
-
-	// 0x80 = analog stick x and y axis center
-	0xff, 0x00, 0x80,
-	0xff, 0x00, 0x80,
-	0xec, 0x41 // checksum on the last two bytes
-};
-
-static const u8 nunchuk_button_bitmasks[] =
-{
-	Nunchuk::BUTTON_C,
-	Nunchuk::BUTTON_Z,
-};
-
-Nunchuk::Nunchuk(UDPWrapper *wrp, WiimoteEmu::ExtensionReg& _reg)
-	: Attachment(_trans("Nunchuk"), _reg) , m_udpWrap(wrp)
-{
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	m_buttons->controls.push_back(new ControlGroup::Input("C"));
-	m_buttons->controls.push_back(new ControlGroup::Input("Z"));
-
-	// stick
-	groups.push_back(m_stick = new AnalogStick("Stick"));
-
-	// swing
-	groups.push_back(m_swing = new Force("Swing"));
-
-	// tilt
-	groups.push_back(m_tilt = new Tilt("Tilt"));
-
-	// shake
-	groups.push_back(m_shake = new Buttons("Shake"));
-	m_shake->controls.push_back(new ControlGroup::Input("X"));
-	m_shake->controls.push_back(new ControlGroup::Input("Y"));
-	m_shake->controls.push_back(new ControlGroup::Input("Z"));
-
-	// set up register
-	// calibration
-	memcpy(&calibration, nunchuck_calibration, sizeof(nunchuck_calibration));
-	// id
-	memcpy(&id, nunchuck_id, sizeof(nunchuck_id));
-
-	// this should get set to 0 on disconnect, but it isn't, o well
-	memset(m_shake_step, 0, sizeof(m_shake_step));
-}
-
-void Nunchuk::GetState(u8* const data, const bool focus)
-{
-	wm_extension* const ncdata = (wm_extension*)data;
-	ncdata->bt = 0;
-
-	// stick
-	ControlState state[2];
-	m_stick->GetState(&state[0], &state[1], 0, 1);
-
-	nu_cal &cal = *(nu_cal*)&reg.calibration;
-	nu_js cal_js[2];
-	cal_js[0] = *&cal.jx;
-	cal_js[1] = *&cal.jy;
-
-	for (int i = 0; i < 2; i++) {
-		ControlState &s = *&state[i];
-		nu_js c = *&cal_js[i];
-		if (s < 0)
-			s = s * abs(c.min - c.center) + c.center;
-		else if (s > 0)
-			s = s * abs(c.max - c.center) + c.center;
-		else
-			s = c.center;
-	}
-
-	ncdata->jx = u8(trim(state[0]));
-	ncdata->jy = u8(trim(state[1]));
-
-	if (ncdata->jx != cal.jx.center || ncdata->jy != cal.jy.center)
-	{
-		if (ncdata->jy == cal.jy.center)
-			ncdata->jy = cal.jy.center + 1;
-		if (ncdata->jx == cal.jx.center)
-			ncdata->jx = cal.jx.center + 1;
-	}
-
-	if (!focus)
-	{
-		ncdata->jx = cal.jx.center;
-		ncdata->jy = cal.jy.center;
-	}
-
-	AccelData accel;
-	accel_cal* calib = (accel_cal*)&reg.calibration[0];
-
-	// tilt
-	EmulateTilt(&accel, m_tilt, focus);
-
-	if (focus)
-	{
-		// swing
-		EmulateSwing(&accel, m_swing);
-		// shake
-		EmulateShake(&accel, calib, m_shake, m_shake_step);
-		// buttons
-		m_buttons->GetState(&ncdata->bt, nunchuk_button_bitmasks);
-	}
-	
-	// flip the button bits :/
-	ncdata->bt ^= 0x03;
-	
-	if (m_udpWrap->inst)
-	{
-		if (m_udpWrap->updNun)
-		{
-			u8 mask;
-			float x, y;
-			m_udpWrap->inst->getNunchuck(x, y, mask);
-			// buttons
-			if (mask & UDPWM_NC)
-				ncdata->bt &= ~WiimoteEmu::Nunchuk::BUTTON_C;
-			if (mask & UDPWM_NZ)
-				ncdata->bt &= ~WiimoteEmu::Nunchuk::BUTTON_Z;
-			// stick
-			if (ncdata->jx == 0x80 && ncdata->jy == 0x80)
-			{
-				ncdata->jx = u8(0x80 + x*127);
-				ncdata->jy = u8(0x80 + y*127);
-			}
-		}
-		if (m_udpWrap->updNunAccel)
-		{
-			float x, y, z;
-			m_udpWrap->inst->getNunchuckAccel(x, y, z);
-			accel.x = x;
-			accel.y = y;
-			accel.z = z;
-		}	
-	}
-
-	wm_accel* dt = (wm_accel*)&ncdata->ax;
-	dt->x = u8(trim(accel.x * (calib->one_g.x - calib->zero_g.x) + calib->zero_g.x));
-	dt->y = u8(trim(accel.y * (calib->one_g.y - calib->zero_g.y) + calib->zero_g.y));
-	dt->z = u8(trim(accel.z * (calib->one_g.z - calib->zero_g.z) + calib->zero_g.z));
-}
-
-void Nunchuk::LoadDefaults(const ControllerInterface& ciface)
-{
-	// ugly macroooo
-	#define set_control(group, num, str)	(group)->controls[num]->control_ref->expression = (str)
-
-	// Stick
-	set_control(m_stick, 0, "W");	// up
-	set_control(m_stick, 1, "S");	// down
-	set_control(m_stick, 2, "A");	// left
-	set_control(m_stick, 3, "D");	// right
-
-	// Buttons
-#ifdef _WIN32
-	set_control(m_buttons, 0, "LCONTROL");	// C
-	set_control(m_buttons, 1, "LSHIFT");	// Z
-#elif __APPLE__
-	set_control(m_buttons, 0, "Left Control");	// C
-	set_control(m_buttons, 1, "Left Shift");	// Z
-#else
-	set_control(m_buttons, 0, "Control_L");	// C
-	set_control(m_buttons, 1, "Shift_L");	// Z
-#endif
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
deleted file mode 100644
index 3b720f73a7..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef NUNCHUCK_H
-#define NUNCHUCK_H
-
-#include "Attachment.h"
-
-class UDPWrapper;
-
-namespace WiimoteEmu
-{
-
-class Nunchuk : public Attachment
-{
-public:
-	Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
-
-	virtual void GetState( u8* const data, const bool focus );
-
-	enum
-	{
-		BUTTON_C = 0x02,
-		BUTTON_Z = 0x01,
-	};
-
-	void LoadDefaults(const ControllerInterface& ciface);
-
-private:
-	Tilt*			m_tilt;
-	Force*			m_swing;
-
-	Buttons*		m_shake;
-
-	Buttons*		m_buttons;
-	AnalogStick*	m_stick;
-
-	u8	m_shake_step[3];
-	
-	UDPWrapper* const m_udpWrap;
-};
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
deleted file mode 100644
index 901ad27c9f..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Turntable.h"
-
-
-namespace WiimoteEmu
-{
-
-static const u8 turntable_id[] = {0x03, 0x00, 0xa4, 0x20, 0x01, 0x03};
-
-static const u16 turntable_button_bitmasks[] =
-{
-	Turntable::BUTTON_L_GREEN,
-	Turntable::BUTTON_L_RED,
-	Turntable::BUTTON_L_BLUE,
-	Turntable::BUTTON_R_GREEN,
-	Turntable::BUTTON_R_RED,
-	Turntable::BUTTON_R_BLUE,
-	Turntable::BUTTON_MINUS,
-	Turntable::BUTTON_PLUS,
-	Turntable::BUTTON_EUPHORIA,
-};
-
-static const char* const turntable_button_names[] =
-{
-	_trans("Green Left"), _trans("Red Left"), _trans("Blue Left"),
-	_trans("Green Right"), _trans("Red Right"), _trans("Blue Right"),
-	"-", "+", _trans("Euphoria"),
-};
-
-Turntable::Turntable(WiimoteEmu::ExtensionReg& _reg) : Attachment(_trans("Turntable"), _reg)
-{
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	for (unsigned int i = 0; i < sizeof(turntable_button_names)/sizeof(*turntable_button_names); ++i)
-		m_buttons->controls.push_back(new ControlGroup::Input(turntable_button_names[i]));
-
-	// turntables
-	groups.push_back(m_left_table = new Slider(_trans("Table Left")));
-	groups.push_back(m_right_table = new Slider(_trans("Table Right")));
-
-	// stick
-	groups.push_back(m_stick = new AnalogStick("Stick"));
-
-	// effect dial
-	groups.push_back(m_effect_dial = new Triggers(_trans("Effect")));
-	m_effect_dial->controls.push_back(new ControlGroup::Input(_trans("Dial")));
-
-	// crossfade
-	groups.push_back(m_crossfade = new Slider(_trans("Crossfade")));
-
-	// set up register
-	// id
-	memcpy(&id, turntable_id, sizeof(turntable_id));
-}
-
-void Turntable::GetState(u8* const data, const bool focus)
-{
-	wm_turntable_extension* const ttdata = (wm_turntable_extension*)data;
-	ttdata->bt = 0;
-
-	// stick
-	{
-	u8 x, y;
-	m_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
-
-	ttdata->sx = x;
-	ttdata->sy = y;
-	}
-
-	// left table
-	{
-	s8 tt = 0;
-	m_left_table->GetState(&tt, focus ? 0x1F : 0);
-
-	ttdata->ltable1 = tt;
-	ttdata->ltable2 = tt << 5;
-	}
-
-	// right table
-	{
-	s8 tt = 0;
-	m_right_table->GetState(&tt, focus ? 0x1F : 0);
-
-	ttdata->rtable1 = tt;
-	ttdata->rtable2 = tt << 1;
-	ttdata->rtable3 = tt << 3;
-	ttdata->rtable4 = tt << 5;
-	}
-
-	// effect dial
-	{
-	u8 dial = 0;
-	m_effect_dial->GetState(&dial, focus ? 0xF : 0);
-
-	ttdata->dial1 = dial;
-	ttdata->dial2 = dial << 3;
-	}
-
-	// crossfade slider
-	{
-	s8 cfs = 0;
-	m_crossfade->GetState(&cfs, focus ? 7 : 0);
-	cfs += 8;
-
-	ttdata->slider = cfs;
-	}
-
-	if (focus)
-	{
-		// buttons
-		m_buttons->GetState(&ttdata->bt, turntable_button_bitmasks);
-	}
-
-	// flip button bits :/
-	ttdata->bt ^= (
-		BUTTON_L_GREEN | BUTTON_L_RED | BUTTON_L_BLUE |
-		BUTTON_R_GREEN | BUTTON_R_RED | BUTTON_R_BLUE |
-		BUTTON_MINUS | BUTTON_PLUS | BUTTON_EUPHORIA
-		);
-}
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
deleted file mode 100644
index b2c73e1920..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Attachment.h"
-
-namespace WiimoteEmu
-{
-
-class Turntable : public Attachment
-{
-public:
-	Turntable(WiimoteEmu::ExtensionReg& _reg);
-	void GetState(u8* const data, const bool focus);
-
-	enum
-	{
-		BUTTON_EUPHORIA = 0x1000,
-
-		BUTTON_L_GREEN = 0x0800,
-		BUTTON_L_RED = 0x20,
-		BUTTON_L_BLUE = 0x8000,
-
-		BUTTON_R_GREEN = 0x2000,
-		BUTTON_R_RED = 0x02,
-		BUTTON_R_BLUE = 0x0400,
-
-		BUTTON_MINUS = 0x10,
-		BUTTON_PLUS = 0x04,
-	};
-
-private:
-	Buttons*		m_buttons;
-	AnalogStick*	m_stick;
-	Triggers	*m_effect_dial;
-	Slider		*m_left_table, *m_right_table, *m_crossfade;
-};
-
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
deleted file mode 100644
index 235d5cb7f1..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
+++ /dev/null
@@ -1,1309 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-/* HID reports access guide. */
-
-/* 0x10 - 0x1a   Output   EmuMain.cpp: HidOutputReport()
-       0x10 - 0x14: General
-	   0x15: Status report request from the Wii
-	   0x16 and 0x17: Write and read memory or registers
-       0x19 and 0x1a: General
-   0x20 - 0x22   Input    EmuMain.cpp: HidOutputReport() to the destination
-       0x15 leads to a 0x20 Input report
-       0x17 leads to a 0x21 Input report
-	   0x10 - 0x1a leads to a 0x22 Input report
-   0x30 - 0x3f   Input    This file: Update() */
-
-#include <vector>
-#include <string>
-#include <fstream>
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#include "WiimoteEmu.h"
-#include "WiimoteHid.h"
-#include "../WiimoteReal/WiimoteReal.h"
-
-#include "Attachment/Attachment.h"
-
-namespace WiimoteEmu
-{
-
-void Spy(Wiimote* wm_, const void* data_, int size_)
-{
-#if 0
-	// enable log
-	bool logCom = true;
-	bool logData = true;
-	bool logMP = false;
-	bool logAudio = false;
-
-	std::string Name, TmpData;
-	static int c;
-	int size;
-	u16 SampleValue;
-	bool AudioData = false;
-	bool DataReport = false;
-	static std::queue<u32> dataRep;
-	static u8 dataReply[3] = {0};
-	bool emu = wm_;
-	static Wiimote* wm = 0;
-
-	// a container for f.e. the extension encryption key
-	if (!wm_ && !wm)
-		wm = new Wiimote(0);
-	else
-		wm = wm_;
-
-	// ignore emulated Wiimote data
-	if (emu) return;
-
-	const hid_packet* const hidp = (hid_packet*)data_;
-	const wm_report* const sr = (wm_report*)hidp->data;
-
-	// use a non-pointer array because that makes read syntax shorter
-	u8 data[32] = {};
-	memcpy(data, data_, size_);
-
-	switch(data[1])
-	{
-	case WM_RUMBLE:
-		size = 1;
-		if (logCom) Name.append("WM_RUMBLE");
-		break;
-
-	case WM_LEDS:
-		size = sizeof(wm_leds);
-		if (logCom) Name.append("WM_LEDS");
-		break;
-
-	case WM_REPORT_MODE:
-		size = sizeof(wm_report_mode);
-		if (logCom) Name.append("WM_REPORT_MODE");
-		ERROR_LOG(CONSOLE, "WM_REPORT_MODE: 0x%02x", data[3]);
-		break;
-
-	case WM_IR_PIXEL_CLOCK:
-		if (logCom) Name.append("WM_IR_PIXEL_CLOCK");
-		break;
-
-	case WM_SPEAKER_ENABLE:
-		if (logCom) Name.append("WM_SPEAKER_ENABLE");
-		NOTICE_LOG(CONSOLE, "Speaker on: %d", sr->enable);
-		break;
-
-	case WM_REQUEST_STATUS:
-		size = sizeof(wm_request_status);
-		if (logCom) Name.append("WM_REQUEST_STATUS");
-		NOTICE_LOG(CONSOLE, "WM_REQUEST_STATUS: %s", ArrayToString(data, size+2, 0).c_str());
-		break;
-
-	case WM_WRITE_DATA:
-	{
-		if (logCom) Name.append("W 0x16");
-		size = sizeof(wm_write_data);
-
-		wm_write_data* wd = (wm_write_data*)sr->data;
-		u32 address = Common::swap24(wd->address);
-		address &= ~0x010000;
-
-		switch(data[2] >> 0x01)
-		{
-		case WM_SPACE_EEPROM:
-			if (logCom) Name.append(" REG_EEPROM"); break;
-		case WM_SPACE_REGS1:
-		case WM_SPACE_REGS2: {
-
-			const u8 region_offset = (u8)address;
-			void *region_ptr = NULL;
-			int region_size = 0;
-
-			switch(data[3])
-			{
-			case 0xa2:
-				if (logCom)
-				{
-					Name.append(" REG_SPEAKER");
-					if(data[6] == 7)
-					{
-						//INFO_LOG(CONSOLE, "Sound configuration:");
-						if(data[8] == 0x00)
-						{
-							//memcpy(&SampleValue, &data[9], 2);
-							//NOTICE_LOG(CONSOLE, "    Data format: 4-bit ADPCM (%i Hz)", 6000000 / SampleValue);
-							//NOTICE_LOG(CONSOLE, "    Volume: %02i%%", (data[11] / 0x40) * 100);
-						}
-						else if (data[8] == 0x40)
-						{
-							//memcpy(&SampleValue, &data[9], 2);
-							//NOTICE_LOG(CONSOLE, "    Data format: 8-bit PCM (%i Hz)", 12000000 / SampleValue);
-							//NOTICE_LOG(CONSOLE, "    Volume: %02i%%", (data[11] / 0xff) * 100);
-						}
-					}
-				}
-				break;
-			case 0xa4:
-				if (logCom) Name.append(" REG_EXT");
-				// Update the encryption mode
-				if (data[5] == 0xf0) {
-					if (!emu)
-						wm->m_reg_ext.encryption = wd->data[0];
-					//NOTICE_LOG(CONSOLE, "Extension encryption: %u", wm->m_reg_ext.encryption);
-				}
-				region_ptr = &wm->m_reg_ext;
-				break;
-			case 0xa6 :
-				if (logCom) Name.append(" REG_M+");
-				// update the encryption mode
-				if (data[5] == 0xf0) {
-					if (!emu)
-						wm->m_reg_motion_plus.activated = wd->data[0];
-					//NOTICE_LOG(CONSOLE, "Extension enryption: %u", wm->m_reg_ext.encryption);
-				}
-				region_ptr = &wm->m_reg_motion_plus;
-				break;
-			case 0xb0:
-				 if (logCom) Name.append(" REG_IR"); break;
-			}
-
-			// save register
-			if (!emu && region_ptr)
-				memcpy((u8*)region_ptr + region_offset, wd->data, wd->size);
-			// save key
-			if (region_offset >= 0x40 && region_offset <= 0x4c) {
-				if(!emu)
-					wiimote_gen_key(&wm->m_ext_key, wm->m_reg_ext.encryption_key);
-				INFO_LOG(CONSOLE, "Writing key: %s", ArrayToString((u8*)&wm->m_ext_key, sizeof(wm->m_ext_key), 0, 30).c_str());
-			}
-			if (data[3] == 0xa4 || data[3] == 0xa6) {
-				//DEBUG_LOG(CONSOLE, "M+: %s", ArrayToString((u8*)&wm->m_reg_motion_plus, sizeof(wm->m_reg_motion_plus), 0, 30).c_str());
-				//DEBUG_LOG(CONSOLE, "M+: %s", ArrayToString((u8*)&wm->m_reg_motion_plus.ext_identifier, sizeof(wm->m_reg_motion_plus.ext_identifier), 0, 30).c_str());
-				NOTICE_LOG(CONSOLE, "W[0x%02x 0x%02x|%d]: %s", data[3], region_offset,  wd->size, ArrayToString(wd->data, wd->size, 0).c_str());
-			}
-			break;
-		}
-		}
-
-		break;
-	}
-
-	case WM_READ_DATA:
-	{
-		if (logCom) Name.append("R");
-		size = sizeof(wm_read_data);
-
-		wm_read_data* rd = (wm_read_data*)sr->data;
-		u32 address = Common::swap24(rd->address);
-		u8 addressLO = address & 0xFFFF;
-		address &= 0xFEFFFF;
-		u16 size = Common::swap16(rd->size);
-		u8 *const block = new u8[size];
-		void *region_ptr = NULL;
-
-		dataRep.push(((data[2]>>1)<<16) + ((data[3])<<8) + addressLO);
-
-		switch(data[2]>>1)
-		{
-		case WM_SPACE_EEPROM:
-			if (logCom) Name.append(" REG_EEPROM");
-			if (!emu)
-				memcpy(block, wm->m_eeprom + address, size);
-			break;
-		case WM_SPACE_REGS1:
-		case WM_SPACE_REGS2:
-			// ignore second byte for extension area
-			if (address>>16 == 0xA4) address &= 0xFF00FF;
-			const u8 region_offset = (u8)address;
-			switch(data[3])
-			{
-			case 0xa2:
-				if (logCom) Name.append(" REG_SPEAKER");
-				region_ptr = &wm->m_reg_speaker;
-				break;
-			case 0xa4:
-				 if (logCom) Name.append(" REG_EXT");
-				 region_ptr = &wm->m_reg_motion_plus;
-				 break;
-			case 0xa6:
-				 if (logCom) Name.append(" REG_M+");
-				 region_ptr = &wm->m_reg_motion_plus;
-				break;
-			case 0xb0:
-				if (logCom) Name.append(" REG_IR");
-				region_ptr = &wm->m_reg_ir;
-				break;
-			}
-			//if (!emu && region_ptr)
-				//memcpy(block, (u8*)region_ptr + region_offset, size);
-			//WARN_LOG(CONSOLE, "READING[0x%02x 0x%02x|%d]: %s", data[3], region_offset, size, ArrayToString(block, size, 0, 30).c_str());
-			break;
-		}
-
-		break;
-	}
-
-	case WM_WRITE_SPEAKER_DATA:
-		if (logCom) Name.append("WM_SPEAKER_DATA");
-		size = 21;
-		break;
-
-	case WM_SPEAKER_MUTE:
-		if (logCom) Name.append("WM_SPEAKER");
-		size = 1;
-		NOTICE_LOG(CONSOLE, "Speaker mute: %d", sr->enable);
-		break;
-
-	case WM_IR_LOGIC:
-		if (logCom) Name.append("WM_IR");
-		size = 1;
-		break;
-
-	case WM_STATUS_REPORT:
-		size = sizeof(wm_status_report);
-		Name = "WM_STATUS_REPORT";
-		//INFO_LOG(CONSOLE, "WM_STATUS_REPORT: %s", ArrayToString(data, size+2, 0).c_str());
-		{
-			wm_status_report* pStatus = (wm_status_report*)(data + 2);
-			ERROR_LOG(CONSOLE, ""
-				"Statusreport extension: %i",
-				//"Speaker enabled: %i"
-				//"IR camera enabled: %i"
-				//"LED 1: %i\n"
-				//"LED 2: %i\n"
-				//"LED 3: %i\n"
-				//"LED 4: %i\n"
-				//"Battery low: %i\n"
-				//"Battery level: %i",
-				pStatus->extension
-				//pStatus->speaker,
-				//pStatus->ir,
-				//(pStatus->leds >> 0),
-				//(pStatus->leds >> 1),
-				//(pStatus->leds >> 2),
-				//(pStatus->leds >> 3),
-				//pStatus->battery_low,
-				//pStatus->battery
-				);
-		}
-		break;
-
-	case WM_READ_DATA_REPLY:
-	{
-		size = sizeof(wm_read_data_reply);
-		Name = "R_REPLY";
-
-		u8 data2[32];
-		memset(data2, 0, sizeof(data2));
-		memcpy(data2, data, size_);
-		wm_read_data_reply* const rdr = (wm_read_data_reply*)(data2 + 2);
-
-		bool decrypted = false;
-		if(!dataRep.empty())
-		{
-			dataReply[0] = (dataRep.front()>>16)&0x00FF;
-			dataReply[1] = (dataRep.front()>>8)&0x00FF;
-			dataReply[2] = dataRep.front()&0x00FF;
-			dataRep.pop();
-		}
-
-		switch(dataReply[0])
-		{
-		case WM_SPACE_EEPROM:
-			if (logCom)
-				Name.append(" REG_EEPROM");
-			// Wiimote calibration
-			if(data[4] == 0xf0 && data[5] == 0x00 && data[6] == 0x10) {
-				if(data[6] == 0x10) {
-					accel_cal* calib = (accel_cal*)&rdr->data[6];
-					ERROR_LOG(CONSOLE, "Wiimote calibration:");
-					//SERROR_LOG(CONSOLE, "%s", ArrayToString(rdr->data, rdr->size).c_str());
-					ERROR_LOG(CONSOLE, "Cal_zero.x: %i", calib->zero_g.x);
-					ERROR_LOG(CONSOLE, "Cal_zero.y: %i", calib->zero_g.y);
-					ERROR_LOG(CONSOLE, "Cal_zero.z: %i", calib->zero_g.z);
-					ERROR_LOG(CONSOLE, "Cal_g.x: %i", calib->one_g.x);
-					ERROR_LOG(CONSOLE, "Cal_g.y: %i", calib->one_g.y);
-					ERROR_LOG(CONSOLE, "Cal_g.z: %i", calib->one_g.z);
-					// save
-					if (!emu)
-						memcpy(wm->m_eeprom + 0x16, rdr->data + 6, rdr->size);
-				}
-			}
-			break;
-
-		case WM_SPACE_REGS1:
-		case WM_SPACE_REGS2:
-			switch(dataReply[1])
-			{
-			case 0xa2: if (logCom) Name.append(" REG_SPEAKER"); break;
-			case 0xa4: if (logCom) Name.append(" REG_EXT"); break;
-			case 0xa6: if (logCom) Name.append(" REG_M+"); break;
-			case 0xb0: if (logCom) Name.append(" REG_IR"); break;
-			}
-		}
-
-		// save key
-		if (!emu && rdr->address>>8 == 0x40)
-		{
-			memcpy(((u8*)&wm->m_reg_ext.encryption_key), rdr->data, rdr->size+1);
-			wiimote_gen_key(&wm->m_ext_key, wm->m_reg_ext.encryption_key);
-			NOTICE_LOG(CONSOLE, "Reading key: %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str());
-		}
-
-		// select decryption
-		//if(((!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || (wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa)) && rdr->address>>8 < 0xf0) {
-
-		//if(((((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa) && rdr->address>>8 < 0xf0) {
-
-		//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa && rdr->address>>8 < 0xf0) {
-
-		//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) {
-
-		//	SWARN_LOG(CONSOLE, "key %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str());
-		//	SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str());
-		//	wiimote_decrypt(&wm->m_ext_key, rdr->data, dataReply[2]&0xffff, rdr->size+1);
-		//	SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str());
-		//	decrypted = true;
-		//}
-
-		// save data
-		if (!emu && !rdr->error)
-		{
-			//if (dataReply[1] == 0xa4 && wm->GetMotionPlusActive())
-				//memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1);
-			//if (dataReply[1] == 0xa4 && !wm->GetMotionPlusActive())
-			//if (dataReply[1] == 0xa4)
-			//	memcpy(&((u8*)&wm->m_reg_ext)[rdr->address>>8], rdr->data, rdr->size+1);
-			//if (!wm->GetMotionPlusActive() && wm->GetMotionPlusAttached())
-			//if (dataReply[1] == 0xa6)
-			//	memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1);
-			//INFO_LOG(CONSOLE, "Saving[0x%2x:0x%2x]: %s", dataReply[1], rdr->address>>8, ArrayToString(rdr->data, rdr->size+1).c_str());
-		}
-
-		if (!rdr->error && rdr->address>>8 >= 0xf0 && rdr->address>>8 <= 0xff)
-		{
-			//INFO_LOG(CONSOLE, "Extension ID: %s", ArrayToString(rdr->data, rdr->size+1).c_str());
-		}
-
-		// Nunchuck calibration
-		if(data[4] == 0xf0 && data[5] == 0x00 && (data[6] == 0x20 || data[6] == 0x30))
-		{
-			// log
-			//TmpData = StringFromFormat("Read[%s] (enc): %s", (Emu ? "Emu" : "Real"), ArrayToString(data, size + 2).c_str());
-
-			// decrypt
-			//if(((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) {
-			//	wiimote_decrypt(&wm->m_ext_key, &data[0x07], 0x00, (data[4] >> 0x04) + 1);
-
-			//if (wm->m_extension->name == "NUNCHUCK") {
-			//	INFO_LOG(CONSOLE, "\nGame got the Nunchuck calibration:\n");
-			//	INFO_LOG(CONSOLE, "Cal_zero.x: %i\n", data[7 + 0]);
-			//	INFO_LOG(CONSOLE, "Cal_zero.y: %i\n", data[7 + 1]);
-			//	INFO_LOG(CONSOLE, "Cal_zero.z: %i\n",  data[7 + 2]);
-			//	INFO_LOG(CONSOLE, "Cal_g.x: %i\n", data[7 + 4]);
-			//	INFO_LOG(CONSOLE, "Cal_g.y: %i\n",  data[7 + 5]);
-			//	INFO_LOG(CONSOLE, "Cal_g.z: %i\n",  data[7 + 6]);
-			//	INFO_LOG(CONSOLE, "Js.Max.x: %i\n",  data[7 + 8]);
-			//	INFO_LOG(CONSOLE, "Js.Min.x: %i\n",  data[7 + 9]);
-			//	INFO_LOG(CONSOLE, "Js.Center.x: %i\n", data[7 + 10]);
-			//	INFO_LOG(CONSOLE, "Js.Max.y: %i\n",  data[7 + 11]);
-			//	INFO_LOG(CONSOLE, "Js.Min.y: %i\n",  data[7 + 12]);
-			//	INFO_LOG(CONSOLE, "JS.Center.y: %i\n\n", data[7 + 13]);
-			//}
-			//else // g_Config.bClassicControllerConnected {
-			//	INFO_LOG(CONSOLE, "\nGame got the Classic Controller calibration:\n");
-			//	INFO_LOG(CONSOLE, "Lx.Max: %i\n", data[7 + 0]);
-			//	INFO_LOG(CONSOLE, "Lx.Min: %i\n", data[7 + 1]);
-			//	INFO_LOG(CONSOLE, "Lx.Center: %i\n",  data[7 + 2]);
-			//	INFO_LOG(CONSOLE, "Ly.Max: %i\n", data[7 + 3]);
-			//	INFO_LOG(CONSOLE, "Ly.Min: %i\n",  data[7 + 4]);
-			//	INFO_LOG(CONSOLE, "Ly.Center: %i\n",  data[7 + 5]);
-			//	INFO_LOG(CONSOLE, "Rx.Max.x: %i\n",  data[7 + 6]);
-			//	INFO_LOG(CONSOLE, "Rx.Min.x: %i\n",  data[7 + 7]);
-			//	INFO_LOG(CONSOLE, "Rx.Center.x: %i\n", data[7 + 8]);
-			//	INFO_LOG(CONSOLE, "Ry.Max.y: %i\n",  data[7 + 9]);
-			//	INFO_LOG(CONSOLE, "Ry.Min: %i\n",  data[7 + 10]);
-			//	INFO_LOG(CONSOLE, "Ry.Center: %i\n\n", data[7 + 11]);
-			//	INFO_LOG(CONSOLE, "Lt.Neutral: %i\n",  data[7 + 12]);
-			//	INFO_LOG(CONSOLE, "Rt.Neutral %i\n\n", data[7 + 13]);
-			//}
-
-			// save values
-			if (!emu)
-			{
-				// Save to registry
-				if(data[7 + 0] != 0xff)
-				{
-					//memcpy((u8*)&wm->m_reg_ext.calibration, &data[7], 0x10);
-					//memcpy((u8*)&wm->m_reg_ext.unknown3, &data[7], 0x10);
-				}
-				// Save the default values that should work with Wireless Nunchucks
-				else
-				{
-					//WiimoteEmu::SetDefaultExtensionRegistry();
-				}
-				//WiimoteEmu::UpdateEeprom();
-			}
-			// third party Nunchuck
-			else if(data[7] == 0xff)
-			{
-				//memcpy(wm->m_reg_ext + 0x20, WiimoteEmu::wireless_nunchuck_calibration, sizeof(WiimoteEmu::wireless_nunchuck_calibration));
-				//memcpy(wm->m_reg_ext + 0x30, WiimoteEmu::wireless_nunchuck_calibration, sizeof(WiimoteEmu::wireless_nunchuck_calibration));
-			}
-
-			// print encrypted data
-			//INFO_LOG(CONSOLE, "WM_READ_DATA_REPLY: Extension calibration: %s", TmpData.c_str());
-		}
-
-		if (dataReply[1] == 0xa4 || dataReply[1] == 0xa6)
-		{
-			if(rdr->error == 7 || rdr->error == 8)
-			{
-				WARN_LOG(CONSOLE, "R%s[0x%02x 0x%02x]: e-%d", decrypted?"*":"", dataReply[1], rdr->address>>8, rdr->error);
-			}
-			else
-			{
-				WARN_LOG(CONSOLE, "R%s[0x%02x 0x%02x|%d]: %s", decrypted?"*":"", dataReply[1], rdr->address>>8, rdr->size+1, ArrayToString(rdr->data, rdr->size+1, 0).c_str());
-			}
-		}
-
-		break;
-	}
-
-	case WM_ACK_DATA:
-		size = sizeof(wm_acknowledge);
-		Name = "WM_ACK_DATA";
-		//INFO_LOG(CONSOLE, "ACK 0x%02x", data[4]);
-		break;
-
-	case WM_REPORT_CORE:
-		size = sizeof(wm_report_core);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_ACCEL:
-		size = sizeof(wm_report_core_accel);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_EXT8:
-		size = sizeof(wm_report_core_accel_ir12);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_ACCEL_IR12:
-		size = sizeof(wm_report_core_accel_ir12);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_EXT19:
-		size = sizeof(wm_report_core_accel_ext16);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_ACCEL_EXT16:
-		size = sizeof(wm_report_core_accel_ext16);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_IR10_EXT9:
-		size = sizeof(wm_report_core_accel_ir10_ext6);
-		DataReport = true;
-		break;
-	case WM_REPORT_CORE_ACCEL_IR10_EXT6:
-		size = sizeof(wm_report_core_accel_ir10_ext6);
-		DataReport = true;
-		break;
-
-	default:
-		size = 15;
-		NOTICE_LOG(CONSOLE, "Debugging[%s]: Unknown channel 0x%02x", (emu ? "E" : "R"), data[1]);
-		break;
-	}
-
-	//if (DataReport && wm->GetMotionPlusActive())
-	//{
-	//	if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6)
-	//		static bool extension = false;
-	//	if (extension != (bool)(data[17+4]&1))
-	//		ERROR_LOG(CONSOLE, "Datareport extension %d", data[17+4]&1);
-	//		extension = data[17+4]&1;
-	//}
-
-	if (!DataReport && logCom && size <= 30)
-	{
-		ERROR_LOG_S(CONSOLE, "Com[%s] %s: %s", (emu ? "E" : "R"), Name.c_str(), ArrayToString(data, size + 2, 0).c_str());
-	}
-
-	if (logAudio && AudioData)
-	{
-		//DEBUG_LOG(CONSOLE, "%s: %s\n", Name.c_str(), ArrayToString(data, std::min(10,size), 0, 30).c_str());
-	}
-
-	if (DataReport && (logData || logMP))
-	{
-		// decrypt extension data
-		//if (data[1] == 0x37 && !wm->GetMotionPlusActive())
-		//if (data[1] == 0x37)
-		//	wiimote_decrypt(&wm->m_ext_key, &data[17], 0x00, 0x06);
-		//if (data[1] == 0x35)
-		//	wiimote_decrypt(&wm->m_ext_key, &data[7], 0x00, 0x06);
-
-		//if (data[1] == 0x35 || data[1] == 0x37)
-		//{
-		//	if (!g_DebugMP && mp->is_mp_data) return;
-		//	if (!g_DebugData && !mp->is_mp_data) return;
-		//}
-
-		std::string SCore = "", SAcc = "", SIR = "", SExt = "", SExtID = "";
-
-		wm_core* core = (wm_core*)sr->data;
-		accel_cal* calib = (accel_cal*)&wm->m_eeprom[0x16];
-		wm_accel* accel = (wm_accel*)&data[4];
-
-		//SCore = StringFromFormat(
-		//	"%d %d %d %d ",
-		//	core->xL,
-		//	core->yL,
-		//	core->zL,
-		//	core->unknown);
-
-		SAcc = StringFromFormat(
-			//"%3d %3d %3d"
-			//" | %3d %3d %3d"
-			//" | %3d %3d %3d"
-			"| %5.2f %5.2f %5.2f"
-			//, calib->zero_g.x, calib->zero_g.y, calib->zero_g.z
-			//, (calib->zero_g.x<<2) + calib->zero_g.xL, (calib->zero_g.y<<2) + calib->zero_g.yL, (calib->zero_g.z<<2) + calib->zero_g.zL
-			//, calib->one_g.x, calib->one_g.y, calib->one_g.z
-			//, (calib->one_g.x<<2) + calib->one_g.xL, (calib->one_g.y<<2) + calib->one_g.yL, (calib->one_g.z<<2) + calib->one_g.zL
-			//, accel->x, accel->y, accel->z
-			//, (accel->x<<2) + core->xL, (accel->y<<2) + core->yL, (accel->z<<2) + core->zL
-			, (accel->x - calib->zero_g.x) / float(calib->one_g.x-calib->zero_g.x), (accel->y - calib->zero_g.y) / float(calib->one_g.y-calib->zero_g.y), (accel->z - calib->zero_g.z) / float(calib->one_g.z-calib->zero_g.z));
-
-		NOTICE_LOG(CONSOLE, "%d", size);
-
-		if (data[1] == WM_REPORT_CORE_ACCEL_IR12)
-		{
-			wm_ir_extended *ir = (wm_ir_extended*)&data[7];
-
-			SIR = StringFromFormat(
-				"%4u %4u | %u"
-				, ir->x | ir->xhi << 8
-				, ir->y | ir->yhi << 8
-				, ir->size);
-		}
-
-		if (data[1] == WM_REPORT_CORE_ACCEL_EXT16)
-		{
-			wm_extension *nc = (wm_extension*)&data[7];
-
-			SExt = StringFromFormat(
-				"%02x %02x | %02x %02x %02x | %02x"
-				, nc->jx, nc->jy
-				, nc->ax, nc->ay, nc->az
-				, nc->bt);
-		}
-
-		if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6)
-		{
-			wm_ir_basic *ir = (wm_ir_basic*)&data[7];
-
-			SIR = StringFromFormat(
-				"%4u %4u %4u %4u"
-				, ir->x1 | ir->x1hi << 8
-				, ir->y1 | ir->y1hi << 8
-				, ir->x2 | ir->x2hi << 8
-				, ir->y2 | ir->y1hi << 8);
-
-			/*
-			wm_motionplus *mp = (wm_motionplus*)&data[17];
-			wm_nc_mp  *nc_mp = (wm_nc_mp *)&data[17];
-
-			if (mp->is_mp_data)
-			{
-				SExt = StringFromFormat(""
-					//"%02x %02x %02x %02x %02x %02x"
-					//"| %04x %04x %04x
-					" %5.2f %5.2f %5.2f"
-					" %s%s%s"
-					//, mp->roll1, mp->roll2
-					//, mp->pitch1, mp->pitch2
-					//, mp->yaw1, mp->yaw2
-					//, mp->pitch2<<8 | mp->pitch1
-					//, mp->roll2<<8 | mp->roll1
-					//, mp->yaw2<<8 | mp->yaw1
-					//, mp->pitch2<<8 | mp->pitch1
-					//, mp->roll2<<8 | mp->roll1
-					//, mp->yaw2<<8 | mp->yaw1
-					, float((mp->pitch2<<8 | mp->pitch1) - 0x1f7f) / float(0x1fff)
-					, float((mp->roll2<<8 | mp->roll1) - 0x1f7f) / float(0x1fff)
-					, float((mp->yaw2<<8 | mp->yaw1) - 0x1f7f) / float(0x1fff)
-					, mp->pitch_slow?"*":" ", mp->roll_slow?"*":" ", mp->yaw_slow?"*":" ");
-			}
-			else
-			{
-				SExt = StringFromFormat(
-					"%02x %02x | %02x %02x | %02x %02x %02x | %02x %02x %02x",
-					nc_mp->bz, nc_mp->bc,
-					nc_mp->jx, nc_mp->jy,
-					nc_mp->ax+nc_mp->axL, nc_mp->ay+nc_mp->ayL, (nc_mp->az<<1)+nc_mp->azL);
-			}
-
-			SExtID = StringFromFormat(
-				"[%s|%d|%d]"
-				, mp->is_mp_data ? "+" : "e"
-				, mp->is_mp_data ? mp->extension_connected : nc_mp->extension_connected
-				, wm->m_extension->active_extension);
-			*/
-
-			//DEBUG_LOG_S(CONSOLE, "M+ %d Extension %d %d %s", mp->is_mp_data, mp->is_mp_data ?
-			//		mp->extension_connected : ((wm_nc_mp*)&data[17])->extension_connected, wm->m_extension->active_extension,
-			//		ArrayToString(((u8*)&wm->m_reg_motion_plus.ext_identifier), sizeof(wm->m_reg_motion_plus.ext_identifier), 0).c_str());
-		}
-
-		// select log data
-		WARN_LOG_S(CONSOLE, "Data"
-			"[%s]"
-			" | id %s"
-			" | %s"
-			" | c %s"
-			" | a %s"
-			" | ir %s"
-			" | ext %s"
-			//" | %s"
-			//" | %s"
-			//" | %s"
-			, (emu ? "E" : "R")
-			, SExtID.c_str()
-			, ArrayToString(data, 2, 0).c_str()
-			, SCore.c_str()
-			, SAcc.c_str()
-			, SIR.c_str()
-			, SExt.c_str()
-			//, ArrayToString(&data[4], 3, 0).c_str()
-			//, (accel->x - 0x7f) / float(0xff), (accel->y - 0x7f) / float(0xff), (accel->z - 0x7f) / float(0xff)
-			//, ArrayToString(&data[17], 6, 0).c_str(),
-			);
-	}
-#endif
-}
-
-void Wiimote::ReportMode(const wm_report_mode* const dr)
-{
-	//INFO_LOG(WIIMOTE, "Set data report mode");
-	//DEBUG_LOG(WIIMOTE, "  Rumble: %x", dr->rumble);
-	//DEBUG_LOG(WIIMOTE, "  Continuous: %x", dr->continuous);
-	//DEBUG_LOG(WIIMOTE, "  All The Time: %x", dr->all_the_time);
-	//DEBUG_LOG(WIIMOTE, "  Mode: 0x%02x", dr->mode);
-
-	//m_reporting_auto = dr->all_the_time;
-	m_reporting_auto = dr->continuous;	// this right?
-	m_reporting_mode = dr->mode;
-	//m_reporting_channel = _channelID;	// this is set in every Interrupt/Control Channel now
-
-	// reset IR camera
-	//memset(m_reg_ir, 0, sizeof(*m_reg_ir));  //ugly hack
-
-	if (dr->mode > 0x37)
-		PanicAlert("Wiimote: Unsupported Reporting mode.");
-	else if (dr->mode < WM_REPORT_CORE)
-		PanicAlert("Wiimote: Reporting mode < 0x30.");
-}
-
-/* Here we process the Output Reports that the Wii sends. Our response will be
-   an Input Report back to the Wii. Input and Output is from the Wii's
-   perspective, Output means data to the Wiimote (from the Wii), Input means
-   data from the Wiimote.
-
-   The call browser:
-
-   1. Wiimote_InterruptChannel > InterruptChannel > HidOutputReport
-   2. Wiimote_ControlChannel > ControlChannel > HidOutputReport
-
-   The IR enable/disable and speaker enable/disable and mute/unmute values are
-		bit2: 0 = Disable (0x02), 1 = Enable (0x06)
-*/
-void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
-{
-	INFO_LOG(WIIMOTE, "HidOutputReport (page: %i, cid: 0x%02x, wm: 0x%02x)", m_index, m_reporting_channel, sr->wm);
-
-	// wiibrew:
-	// In every single Output Report, bit 0 (0x01) of the first byte controls the Rumble feature.
-	m_rumble_on = sr->rumble;
-
-	switch (sr->wm)
-	{
-	case WM_RUMBLE : // 0x10
-		// this is handled above
-		return;	// no ack
-		break;
-
-	case WM_LEDS : // 0x11
-		//INFO_LOG(WIIMOTE, "Set LEDs: 0x%02x", sr->data[0]);
-		m_status.leds = sr->data[0] >> 4;
-		break;
-
-	case WM_REPORT_MODE :  // 0x12
-		ReportMode((wm_report_mode*)sr->data);
-		break;
-
-	case WM_IR_PIXEL_CLOCK : // 0x13
-		//INFO_LOG(WIIMOTE, "WM IR Clock: 0x%02x", sr->data[0]);
-		//m_ir_clock = sr->enable;
-		if (false == sr->ack)
-			return;
-		break;
-
-	case WM_SPEAKER_ENABLE : // 0x14
-		//ERROR_LOG(WIIMOTE, "WM Speaker Enable: %02x", sr->enable);
-		//PanicAlert( "WM Speaker Enable: %d", sr->data[0] );
-		m_status.speaker = sr->enable;
-		if (false == sr->ack)
-			return;
-		break;
-
-	case WM_REQUEST_STATUS : // 0x15
-		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
-			RequestStatus((wm_request_status*)sr->data);
-		return;	// sends its own ack
-		break;
-
-	case WM_WRITE_DATA : // 0x16
-		WriteData((wm_write_data*)sr->data);
-		break;
-
-	case WM_READ_DATA : // 0x17
-		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
-			ReadData((wm_read_data*)sr->data);
-		return;	// sends its own ack
-		break;
-
-	case WM_WRITE_SPEAKER_DATA : // 0x18
-		{
-		//wm_speaker_data *spkz = (wm_speaker_data*)sr->data;
-		//ERROR_LOG(WIIMOTE, "WM_WRITE_SPEAKER_DATA len:%x %s", spkz->length,
-		//	ArrayToString(spkz->data, spkz->length, 100, false).c_str());
-		Wiimote::SpeakerData((wm_speaker_data*)sr->data);
-		}
-		return;	// no ack
-		break;
-
-	case WM_SPEAKER_MUTE : // 0x19
-		//ERROR_LOG(WIIMOTE, "WM Speaker Mute: %02x", sr->enable);
-		//PanicAlert( "WM Speaker Mute: %d", sr->data[0] & 0x04 );
-		// testing
-		//if (sr->data[0] & 0x04)
-		//	memset(&m_channel_status, 0, sizeof(m_channel_status));
-		m_speaker_mute = sr->enable;
-		if (false == sr->ack)
-			return;
-		break;
-
-	case WM_IR_LOGIC: // 0x1a
-		// comment from old plugin:
-		// This enables or disables the IR lights, we update the global variable g_IR
-		// so that WmRequestStatus() knows about it
-		//INFO_LOG(WIIMOTE, "WM IR Enable: 0x%02x", sr->data[0]);
-		m_status.ir = sr->enable;
-		if (false == sr->ack)
-			return;
-		break;
-
-	default:
-		PanicAlert("HidOutputReport: Unknown channel 0x%02x", sr->wm);
-		return; // no ack
-		break;
-	}
-
-	// send ack
-	if (send_ack && WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
-		SendAck(sr->wm);
-}
-
-/* This will generate the 0x22 acknowledgement for most Input reports.
-   It has the form of "a1 22 00 00 _reportID 00".
-   The first two bytes are the core buttons data,
-   00 00 means nothing is pressed.
-   The last byte is the success code 00. */
-void Wiimote::SendAck(u8 _reportID)
-{
-	u8 data[6];
-
-	data[0] = 0xA1;
-	data[1] = WM_ACK_DATA;
-
-	wm_acknowledge* const ack = (wm_acknowledge*)(data + 2);
-
-	ack->buttons = m_status.buttons;
-	ack->reportID = _reportID;
-	ack->errorID = 0;
-
-	Core::Callback_WiimoteInterruptChannel( m_index, m_reporting_channel, data, sizeof(data));
-}
-
-void Wiimote::HandleExtensionSwap()
-{
-	// handle switch extension
-	if (m_extension->active_extension != m_extension->switch_extension)
-	{
-		// if an extension is currently connected and we want to switch to a different extension
-		if ((m_extension->active_extension > 0) && m_extension->switch_extension)
-			// detach extension first, wait til next Update() or RequestStatus() call to change to the new extension
-			m_extension->active_extension = 0;
-		else
-			// set the wanted extension
-			m_extension->active_extension = m_extension->switch_extension;
-
-		// reset register
-		((WiimoteEmu::Attachment*)m_extension->attachments[m_extension->active_extension])->Reset();
-	}
-}
-
-// old comment
-/* Here we produce a 0x20 status report to send to the Wii. We currently ignore
-   the status request rs and all its eventual instructions it may include (for
-   example turn off rumble or something else) and just send the status
-   report. */
-void Wiimote::RequestStatus(const wm_request_status* const rs)
-{
-	HandleExtensionSwap();
-
-	// update status struct
-	m_status.extension = (m_extension->active_extension || m_motion_plus_active) ? 1 : 0;
-
-	// set up report
-	u8 data[8];
-	data[0] = 0xA1;
-	data[1] = WM_STATUS_REPORT;
-
-	// status values
-	*(wm_status_report*)(data + 2) = m_status;
-
-	// hybrid wiimote stuff
-	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
-	{
-		using namespace WiimoteReal;
-
-		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-
-		if (g_wiimotes[m_index])
-		{
-			wm_request_status rpt = {};
-			g_wiimotes[m_index]->QueueReport(WM_REQUEST_STATUS, &rpt, sizeof(rpt));
-		}
-
-		return;
-	}
-
-	// send report
-	Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
-}
-
-/* Write data to Wiimote and Extensions registers. */
-void Wiimote::WriteData(const wm_write_data* const wd)
-{
-	u32 address = Common::swap24(wd->address);
-
-	// ignore the 0x010000 bit
-	address &= ~0x010000;
-
-	if (wd->size > 16)
-	{
-		PanicAlert("WriteData: size is > 16 bytes");
-		return;
-	}
-
-	switch (wd->space)
-	{
-	case WM_SPACE_EEPROM :
-		{
-			// Write to EEPROM
-
-			if (address + wd->size > WIIMOTE_EEPROM_SIZE)
-			{
-				ERROR_LOG(WIIMOTE, "WriteData: address + size out of bounds!");
-				PanicAlert("WriteData: address + size out of bounds!");
-				return;
-			}
-			memcpy(m_eeprom + address, wd->data, wd->size);
-
-			// write mii data to file
-			// i need to improve this greatly
-			if (address >= 0x0FCA && address < 0x12C0)
-			{
-				// writing the whole mii block each write :/
-				std::ofstream file;
-				OpenFStream(file, File::GetUserPath(D_WIIUSER_IDX) + "mii.bin", std::ios::binary | std::ios::out);
-				file.write((char*)m_eeprom + 0x0FCA, 0x02f0);
-				file.close();
-			}
-		}
-		break;
-
-	case WM_SPACE_REGS1 :
-	case WM_SPACE_REGS2 :
-		{
-			// Write to Control Register
-
-			// ignore second byte for extension area
-			if (0xA4 == (address >> 16))
-				address &= 0xFF00FF;
-
-			const u8 region_offset = (u8)address;
-			void *region_ptr = NULL;
-			int region_size = 0;
-
-			switch (address >> 16)
-			{
-			// speaker
-			case 0xa2 :
-				region_ptr = &m_reg_speaker;
-				region_size = WIIMOTE_REG_SPEAKER_SIZE;
-				break;
-
-			// extension register
-			case 0xa4 :
-				region_ptr = m_motion_plus_active ? (void*)&m_reg_motion_plus : (void*)&m_reg_ext;
-				region_size = WIIMOTE_REG_EXT_SIZE;
-				break;
-
-			// motion plus
-			case 0xa6 :
-				if (false == m_motion_plus_active)
-				{
-					region_ptr = &m_reg_motion_plus;
-					region_size = WIIMOTE_REG_EXT_SIZE;
-				}
-				break;
-
-			// ir
-			case 0xB0 :
-				region_ptr = &m_reg_ir;
-				region_size = WIIMOTE_REG_IR_SIZE;
-
-				//if (5 == m_reg_ir->mode)
-				//	PanicAlert("IR Full Mode is Unsupported!");
-				break;
-			}
-
-			if (region_ptr && (region_offset + wd->size <= region_size))
-			{
-				memcpy((u8*)region_ptr + region_offset, wd->data, wd->size);
-			}
-			else
-				return;	// TODO: generate a writedata error reply
-
-			/* TODO?
-			if (region_ptr == &m_reg_speaker)
-			{
-				ERROR_LOG(WIIMOTE, "Write to speaker register %x %s", address,
-					ArrayToString(wd->data, wd->size, 100, false).c_str());
-			}
-			*/
-
-			if (&m_reg_ext == region_ptr)
-			{
-				// Run the key generation on all writes in the key area, it doesn't matter
-				// that we send it parts of a key, only the last full key will have an effect
-				if (address >= 0xa40040 && address <= 0xa4004c)
-					wiimote_gen_key(&m_ext_key, m_reg_ext.encryption_key);
-			}
-			else if (&m_reg_motion_plus == region_ptr)
-			{
-				// activate/deactivate motion plus
-				if (0x55 == m_reg_motion_plus.activated)
-				{
-					// maybe hacky
-					m_reg_motion_plus.activated = 0;
-					m_motion_plus_active ^= 1;
-
-					RequestStatus();
-				}
-			}
-		}
-		break;
-
-	default:
-		PanicAlert("WriteData: unimplemented parameters!");
-		break;
-	}
-}
-
-/* Read data from Wiimote and Extensions registers. */
-void Wiimote::ReadData(const wm_read_data* const rd)
-{
-	u32 address = Common::swap24(rd->address);
-	u16 size = Common::swap16(rd->size);
-
-	// ignore the 0x010000 bit
-	address &= 0xFEFFFF;
-
-	// hybrid wiimote stuff
-	// relay the read data request to real-wiimote
-	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && ((0xA4 != (address >> 16)) || (m_extension->switch_extension <= 0)))
-	{
-		WiimoteReal::InterruptChannel(m_index, m_reporting_channel, ((u8*)rd) - 2, sizeof(wm_read_data) + 2); // hacky
-
-		// don't want emu-wiimote to send reply
-		return;
-	}
-
-	ReadRequest rr;
-	u8 *const block = new u8[size];
-
-	switch (rd->space)
-	{
-	case WM_SPACE_EEPROM :
-		{
-			//PanicAlert("ReadData: reading from EEPROM: address: 0x%x size: 0x%x", address, size);
-			// Read from EEPROM
-			if (address + size >= WIIMOTE_EEPROM_FREE_SIZE)
-			{
-				if (address + size > WIIMOTE_EEPROM_SIZE)
-				{
-					PanicAlert("ReadData: address + size out of bounds");
-					delete [] block;
-					return;
-				}
-				// generate a read error
-				size = 0;
-			}
-
-			// read mii data from file
-			// i need to improve this greatly
-			if (address >= 0x0FCA && address < 0x12C0)
-			{
-				// reading the whole mii block :/
-				std::ifstream file;
-				file.open((File::GetUserPath(D_WIIUSER_IDX) + "mii.bin").c_str(), std::ios::binary | std::ios::in);
-				file.read((char*)m_eeprom + 0x0FCA, 0x02f0);
-				file.close();
-			}
-
-			// read mem to be sent to wii
-			memcpy(block, m_eeprom + address, size);
-		}
-		break;
-
-	case WM_SPACE_REGS1 :
-	case WM_SPACE_REGS2 :
-		{
-			// Read from Control Register
-
-			// ignore second byte for extension area
-			if (0xA4 == (address >> 16))
-				address &= 0xFF00FF;
-
-			const u8 region_offset = (u8)address;
-			void *region_ptr = NULL;
-			int region_size = 0;
-
-			switch (address >> 16)
-			{
-			// speaker
-			case 0xa2:
-				region_ptr = &m_reg_speaker;
-				region_size = WIIMOTE_REG_SPEAKER_SIZE;
-				break;
-
-			// extension
-			case 0xa4:
-				region_ptr = m_motion_plus_active ? (void*)&m_reg_motion_plus : (void*)&m_reg_ext;
-				region_size = WIIMOTE_REG_EXT_SIZE;
-				break;
-
-			// motion plus
-			case 0xa6:
-				// reading from 0xa6 returns error when mplus is activated
-				if (false == m_motion_plus_active)
-				{
-					region_ptr = &m_reg_motion_plus;
-					region_size = WIIMOTE_REG_EXT_SIZE;
-				}
-				break;
-
-			// ir
-			case 0xb0:
-				region_ptr = &m_reg_ir;
-				region_size = WIIMOTE_REG_IR_SIZE;
-				break;
-			}
-
-			if (region_ptr && (region_offset + size <= region_size))
-			{
-				memcpy(block, (u8*)region_ptr + region_offset, size);
-			}
-			else
-				size = 0;	// generate read error
-
-			if (&m_reg_ext == region_ptr)
-			{
-				// Encrypt data read from extension register
-				// Check if encrypted reads is on
-				if (0xaa == m_reg_ext.encryption)
-					wiimote_encrypt(&m_ext_key, block, address & 0xffff, (u8)size);
-			}
-		}
-		break;
-
-	default :
-		PanicAlert("WmReadData: unimplemented parameters (size: %i, address: 0x%x)!", size, rd->space);
-		break;
-	}
-
-	// want the requested address, not the above modified one
-	rr.address = Common::swap24(rd->address);
-	rr.size = size;
-	//rr.channel = _channelID;
-	rr.position = 0;
-	rr.data = block;
-
-	// send up to 16 bytes
-	SendReadDataReply(rr);
-
-	// if there is more data to be sent, add it to the queue
-	if (rr.size)
-		m_read_requests.push( rr );
-	else
-		delete[] rr.data;
-}
-
-// old comment
-/* Here we produce the actual 0x21 Input report that we send to the Wii. The
-   message is divided into 16 bytes pieces and sent piece by piece. There will
-   be five formatting bytes at the begging of all reports. A common format is
-   00 00 f0 00 20, the 00 00 means that no buttons are pressed, the f means 16
-   bytes in the message, the 0 means no error, the 00 20 means that the message
-   is at the 00 20 offest in the registry that was read.
-*/
-void Wiimote::SendReadDataReply(ReadRequest& _request)
-{
-	u8 data[23];
-	data[0] = 0xA1;
-	data[1] = WM_READ_DATA_REPLY;
-
-	wm_read_data_reply* const reply = (wm_read_data_reply*)(data + 2);
-	reply->buttons = m_status.buttons;
-	reply->address = Common::swap16(_request.address);
-
-	// generate a read error
-	// Out of bounds. The real Wiimote generate an error for the first
-	// request to 0x1770 if we dont't replicate that the game will never
-	// read the calibration data at the beginning of Eeprom. I think this
-	// error is supposed to occur when we try to read above the freely
-	// usable space that ends at 0x16ff.
-	if (0 == _request.size)
-	{
-		reply->size = 0x0f;
-		reply->error = 0x08;
-
-		memset(reply->data, 0, sizeof(reply->data));
-	}
-	else
-	{
-		// Limit the amt to 16 bytes
-		// AyuanX: the MTU is 640B though... what a waste!
-		const int amt = std::min( (unsigned int)16, _request.size );
-
-		// no error
-		reply->error = 0;
-
-		// 0x1 means two bytes, 0xf means 16 bytes
-		reply->size = amt - 1;
-
-		// Clear the mem first
-		memset(reply->data, 0, sizeof(reply->data));
-
-		// copy piece of mem
-		memcpy(reply->data, _request.data + _request.position, amt);
-
-		// update request struct
-		_request.size -= amt;
-		_request.position += amt;
-		_request.address += amt;
-	}
-
-	// Send a piece
-	Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
-}
-
-void Wiimote::DoState(PointerWrap& p)
-{
-	p.Do(m_extension->active_extension);
-	p.Do(m_extension->switch_extension);
-
-	p.Do(m_accel);
-	p.Do(m_index);
-	p.Do(ir_sin);
-	p.Do(ir_cos);
-	p.Do(m_rumble_on);
-	p.Do(m_speaker_mute);
-	p.Do(m_motion_plus_present);
-	p.Do(m_motion_plus_active);
-	p.Do(m_reporting_auto);
-	p.Do(m_reporting_mode);
-	p.Do(m_reporting_channel);
-	p.Do(m_shake_step);
-	p.Do(m_sensor_bar_on_top);
-	p.Do(m_status);
-	p.Do(m_adpcm_state);
-	p.Do(m_ext_key);
-	p.DoArray(m_eeprom, sizeof(m_eeprom));
-	p.Do(m_reg_motion_plus);
-	p.Do(m_reg_ir);
-	p.Do(m_reg_ext);
-	p.Do(m_reg_speaker);
-
-	//Do 'm_read_requests' queue
-	{
-		u32 size = 0;
-		if (p.mode == PointerWrap::MODE_READ)
-		{
-			//clear
-			while (m_read_requests.size())
-				m_read_requests.pop();
-
-			p.Do(size);
-			while (size--)
-			{
-				ReadRequest tmp;
-				p.Do(tmp.address);
-				p.Do(tmp.position);
-				p.Do(tmp.size);
-				tmp.data = new u8[tmp.size];
-				p.DoArray(tmp.data, tmp.size);
-				m_read_requests.push(tmp);
-			}
-		}
-		else
-		{
-			std::queue<ReadRequest> tmp_queue(m_read_requests);
-			size = m_read_requests.size();
-			p.Do(size);
-			while (!tmp_queue.empty())
-			{
-				ReadRequest tmp = tmp_queue.front();
-				p.Do(tmp.address);
-				p.Do(tmp.position);
-				p.Do(tmp.size);
-				p.DoArray(tmp.data, tmp.size);
-				tmp_queue.pop();
-			}
-		}
-	}
-	p.DoMarker("Wiimote");
-
-	if (p.GetMode() == PointerWrap::MODE_READ)
-		RealState();
-}
-
-// load real Wiimote state
-void Wiimote::RealState()
-{
-	using namespace WiimoteReal;
-
-	if (g_wiimotes[m_index])
-	{
-		g_wiimotes[m_index]->SetChannel(m_reporting_channel);
-		g_wiimotes[m_index]->EnableDataReporting(m_reporting_mode);
-	}
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h b/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h
deleted file mode 100644
index 7088367d51..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-//
-// Copyright (C) Hector Martin "marcan" (hector@marcansoft.com)
-
-
-#ifndef WIIMOTE_EXTENSION_ENCRYPTION_H
-#define WIIMOTE_EXTENSION_ENCRYPTION_H
-
-
-// ===================================================
-/* They key structure to use with wiimote_gen_key() */
-// ----------------
-struct wiimote_key
-{
-	u8 ft[8];
-	u8 sb[8];
-};
-
-
-void wiimote_encrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len);
-void wiimote_decrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len);
-
-void wiimote_gen_key(wiimote_key* const key, const u8* const keydata);
-
-
-#endif
-
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h b/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h
deleted file mode 100644
index b8abafbb3a..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef MATRIXMATH_H
-#define MATRIXMATH_H
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI	3.14159265358979323846
-#endif
-
-typedef double Matrix[4][4];
-typedef struct
-{
-	double x,y,z;
-} Vertex;
-
-inline void MatrixIdentity(Matrix & m)
-{
-	m[0][0]=1; m[0][1]=0; m[0][2]=0; m[0][3]=0;
-	m[1][0]=0; m[1][1]=1; m[1][2]=0; m[1][3]=0;
-	m[2][0]=0; m[2][1]=0; m[2][2]=1; m[2][3]=0;
-	m[3][0]=0; m[3][1]=0; m[3][2]=0; m[3][3]=1;
-}
-
-inline void MatrixFrustum(Matrix &m, double l, double r, double b, double t, double n, double f)
-{
-	m[0][0]=2*n/(r-l);		m[0][1]=0;				m[0][2]=0;				m[0][3]=0; 
-	m[1][0]=0;				m[1][1]=2*n/(t-b);		m[1][2]=0;				m[1][3]=0; 
-	m[2][0]=(r+l)/(r-l);	m[2][1]=(t+b)/(t-b);	m[2][2]=(f+n)/(f-n);	m[2][3]=-1; 
-	m[3][0]=0;				m[3][1]=0;				m[3][2]=2*f*n/(f-n);	m[3][3]=0;
-}
-
-inline void MatrixPerspective(Matrix & m, double fovy, double aspect, double nplane, double fplane)
-{
-	double xmin, xmax, ymin, ymax;
-
-	ymax = nplane * tan(fovy * M_PI / 360.0);
-	ymin = -ymax;
-	xmin = ymin * aspect;
-	xmax = ymax * aspect;
-
-	MatrixFrustum(m,xmin,xmax,ymin,ymax,nplane,fplane);
-}
-
-inline void MatrixRotationByZ(Matrix &m, double sin, double cos)
-{
-	m[0][0]=cos; m[0][1]=-sin; m[0][2]=0; m[0][3]=0;
-	m[1][0]=sin; m[1][1]=cos; m[1][2]=0; m[1][3]=0;
-	m[2][0]=0; m[2][1]=0; m[2][2]=1; m[2][3]=0;
-	m[3][0]=0; m[3][1]=0; m[3][2]=0; m[3][3]=1;
-}
-
-inline void MatrixScale(Matrix &m, double xfact, double yfact, double zfact)
-{
-	m[0][0]=xfact; m[0][1]=0; m[0][2]=0; m[0][3]=0;
-	m[1][0]=0; m[1][1]=yfact; m[1][2]=0; m[1][3]=0;
-	m[2][0]=0; m[2][1]=0; m[2][2]=zfact; m[2][3]=0;
-	m[3][0]=0; m[3][1]=0; m[3][2]=0; m[3][3]=1;
-}
-
-inline void MatrixMultiply(Matrix &r, const Matrix &a, const Matrix &b)
-{
-	for (int i=0; i<16; i++)
-		r[i>>2][i&3]=0.0f;
-	for (int i=0; i<4; i++)
-		for (int j=0; j<4; j++)
-			for (int k=0; k<4; k++)
-				r[i][j]+=a[i][k]*b[k][j];
-}
-
-inline void MatrixTransformVertex(Matrix const & m, Vertex & v)
-{
-	Vertex ov;
-	double w;
-	ov.x=v.x;
-	ov.y=v.y;
-	ov.z=v.z;
-	v.x = m[0][0] * ov.x + m[0][1] * ov.y + m[0][2] * ov.z + m[0][3];
-	v.y = m[1][0] * ov.x + m[1][1] * ov.y + m[1][2] * ov.z + m[1][3];
-	v.z = m[2][0] * ov.x + m[2][1] * ov.y + m[2][2] * ov.z + m[2][3];
-	w   = m[3][0] * ov.x + m[3][1] * ov.y + m[3][2] * ov.z + m[3][3];
-	if (w!=0)
-	{
-		v.x/=w;
-		v.y/=w;
-		v.z/=w;
-	}
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp
deleted file mode 100644
index fdf3af9358..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "WiimoteEmu.h"
-
-//#define WIIMOTE_SPEAKER_DUMP
-#ifdef WIIMOTE_SPEAKER_DUMP
-#include <fstream>
-#include "WaveFile.h"
-#include <stdlib.h>
-#include "FileUtil.h"
-#endif
-
-namespace WiimoteEmu
-{
-
-// Yamaha ADPCM decoder code based on The ffmpeg Project (Copyright (s) 2001-2003)
-
-static const s32 yamaha_difflookup[] = {
-	1, 3, 5, 7, 9, 11, 13, 15,
-	-1, -3, -5, -7, -9, -11, -13, -15
-};
-
-static const s32 yamaha_indexscale[] = {
-	230, 230, 230, 230, 307, 409, 512, 614,
-	230, 230, 230, 230, 307, 409, 512, 614
-};
-
-static u16 av_clip16(s32 a)
-{
-	if ((a+32768) & ~65535) return (a>>31) ^ 32767;
-	else                    return a;
-}
-
-static s32 av_clip(s32 a, s32 amin, s32 amax)
-{
-	if      (a < amin) return amin;
-	else if (a > amax) return amax;
-	else               return a;
-}
-
-static s16 adpcm_yamaha_expand_nibble(ADPCMState& s, u8 nibble)
-{
-	if(!s.step) {
-		s.predictor = 0;
-		s.step = 0;
-	}
-
-	s.predictor += (s.step * yamaha_difflookup[nibble]) / 8;
-	s.predictor = av_clip16(s.predictor);
-	s.step = (s.step * yamaha_indexscale[nibble]) >> 8;
-	s.step = av_clip(s.step, 127, 24576);
-	return s.predictor;
-}
-
-#ifdef WIIMOTE_SPEAKER_DUMP
-std::ofstream ofile;
-WaveFileWriter wav;
-
-void stopdamnwav(){wav.Stop();ofile.close();}
-#endif
-
-void Wiimote::SpeakerData(wm_speaker_data* sd)
-{
-	// TODO consider using static max size instead of new
-	s16 *samples = new s16[sd->length * 2];
-
-	if (m_reg_speaker.format == 0x40)
-	{
-		// 8 bit PCM
-		for (int i = 0; i < sd->length; ++i)
-		{
-			samples[i] = (s16)(s8)sd->data[i];
-		}
-	}
-	else if (m_reg_speaker.format == 0x00)
-	{
-		// 4 bit Yamaha ADPCM (same as dreamcast)
-		for (int i = 0; i < sd->length; ++i)
-		{
-			samples[i * 2] = adpcm_yamaha_expand_nibble(m_adpcm_state, (sd->data[i] >> 4) & 0xf);
-			samples[i * 2 + 1] = adpcm_yamaha_expand_nibble(m_adpcm_state, sd->data[i] & 0xf);
-		}
-	}
-
-#ifdef WIIMOTE_SPEAKER_DUMP
-	std::stringstream name;
-	static int num = 0;
-
-	if (num == 0)
-	{
-		File::Delete("rmtdump.wav");
-		File::Delete("rmtdump.bin");
-		atexit(stopdamnwav);
-		OpenFStream(ofile, "rmtdump.bin", ofile.binary | ofile.out);
-		wav.Start("rmtdump.wav", 6000/*Common::swap16(m_reg_speaker.sample_rate)*/);
-	}
-	wav.AddMonoSamples(samples, sd->length*2);
-	if (ofile.good())
-	{
-		for (int i = 0; i < sd->length; i++)
-		{
-			ofile << sd->data[i];
-		}
-	}
-	num++;
-#endif
-
-	delete[] samples;
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h
deleted file mode 100644
index e7d9cb94f8..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-//UDP Wiimote Translation Layer
-
-#ifndef UDPTLAYER_H
-#define UDPTLAYER_H
-
-#include "UDPWiimote.h"
-#include "WiimoteEmu.h"
-
-namespace UDPTLayer
-{
-	void GetButtons(UDPWrapper * m , wm_core * butt)
-	{
-		if (!(m->inst)) return;
-		if (!(m->updButt)) return;
-		u32 mask = m->inst->getButtons();
-		*butt |= (mask & UDPWM_BA) ? WiimoteEmu::Wiimote::BUTTON_A : 0;
-		*butt |= (mask & UDPWM_BB) ? WiimoteEmu::Wiimote::BUTTON_B : 0;
-		*butt |= (mask & UDPWM_B1) ? WiimoteEmu::Wiimote::BUTTON_ONE : 0;
-		*butt |= (mask & UDPWM_B2) ? WiimoteEmu::Wiimote::BUTTON_TWO : 0;
-		*butt |= (mask & UDPWM_BP) ? WiimoteEmu::Wiimote::BUTTON_PLUS : 0;
-		*butt |= (mask & UDPWM_BM) ? WiimoteEmu::Wiimote::BUTTON_MINUS : 0;
-		*butt |= (mask & UDPWM_BH) ? WiimoteEmu::Wiimote::BUTTON_HOME : 0;
-		*butt |= (mask & UDPWM_BU) ? WiimoteEmu::Wiimote::PAD_UP : 0;
-		*butt |= (mask & UDPWM_BD) ? WiimoteEmu::Wiimote::PAD_DOWN : 0;
-		*butt |= (mask & UDPWM_BL) ? WiimoteEmu::Wiimote::PAD_LEFT : 0;
-		*butt |= (mask & UDPWM_BR) ? WiimoteEmu::Wiimote::PAD_RIGHT : 0;
-	}
-
-	void GetAcceleration(UDPWrapper * m , WiimoteEmu::AccelData * const data)
-	{
-		if (!(m->inst)) return;
-		if (!(m->updAccel)) return;
-		float x, y, z;
-		m->inst->getAccel(x, y, z);
-		data->x = x;
-		data->y = y;
-		data->z = z;
-	}
-
-	void GetIR( UDPWrapper * m, float * x,  float * y,  float * z)
-	{
-		if (!(m->inst)) return;
-		if (!(m->updIR)) return;
-		if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the received values are used ONLY when the normal pointer is offscreen
-		float _x, _y;
-		m->inst->getIR(_x, _y);
-		*x = _x * 2 - 1;
-		*y = -(_y * 2 - 1);
-		*z = 0;
-	}
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
deleted file mode 100644
index eb5ebc2be5..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ /dev/null
@@ -1,955 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-
-#include "Attachment/Classic.h"
-#include "Attachment/Nunchuk.h"
-#include "Attachment/Guitar.h"
-#include "Attachment/Drums.h"
-#include "Attachment/Turntable.h"
-
-#include "WiimoteEmu.h"
-#include "WiimoteHid.h"
-
-#include "../WiimoteReal/WiimoteReal.h"
-
-#include "Timer.h"
-#include "Common.h"
-#include "../../Host.h"
-#include "../../ConfigManager.h"
-
-#include "UDPTLayer.h"
-
-inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } //because damn MSVSC doesen't comply to C99
-
-#include "MatrixMath.h"
-
-#include "../../Movie.h"
-
-namespace
-{
-// :)
-auto const TAU = 6.28318530717958647692;
-auto const PI = TAU / 2.0;
-}
-
-namespace WiimoteEmu
-{
-
-/* An example of a factory default first bytes of the Eeprom memory. There are differences between
-   different Wiimotes, my Wiimote had different neutral values for the accelerometer. */
-static const u8 eeprom_data_0[] = {
-	// IR, maybe more
-	// assuming last 2 bytes are checksum
-	0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00,	// messing up the checksum on purpose
-	0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00,
-	// Accelerometer
-	// 0g x,y,z, 1g x,y,z, idk, last byte is a checksum
-	0x80, 0x80, 0x80, 0x00, 0x9A, 0x9A, 0x9A, 0x00, 0x40, 0xE3,
-	0x80, 0x80, 0x80, 0x00, 0x9A, 0x9A, 0x9A, 0x00, 0x40, 0xE3,
-};
-
-static const u8 motion_plus_id[] = { 0x00, 0x00, 0xA6, 0x20, 0x00, 0x05 };
-
-static const u8 eeprom_data_16D0[] = {
-	0x00, 0x00, 0x00, 0xFF, 0x11, 0xEE, 0x00, 0x00,
-	0x33, 0xCC, 0x44, 0xBB, 0x00, 0x00, 0x66, 0x99,
-	0x77, 0x88, 0x00, 0x00, 0x2B, 0x01, 0xE8, 0x13
-};
-
-const ReportFeatures reporting_mode_features[] = 
-{
-	//0x30: Core Buttons
-	{ 2, 0, 0, 0, 4 },
-	//0x31: Core Buttons and Accelerometer
-	{ 2, 4, 0, 0, 7 },
-	//0x32: Core Buttons with 8 Extension bytes
-	{ 2, 0, 0, 4, 12 },
-	//0x33: Core Buttons and Accelerometer with 12 IR bytes
-	{ 2, 4, 7, 0, 19 },
-	//0x34: Core Buttons with 19 Extension bytes
-	{ 2, 0, 0, 4, 23 },
-	//0x35: Core Buttons and Accelerometer with 16 Extension Bytes
-	{ 2, 4, 0, 7, 23 },
-	//0x36: Core Buttons with 10 IR bytes and 9 Extension Bytes
-	{ 2, 0, 4, 14, 23 },
-	//0x37: Core Buttons and Accelerometer with 10 IR bytes and 6 Extension Bytes
-	{ 2, 4, 7, 17, 23 },
-
-	// UNSUPPORTED:
-	//0x3d: 21 Extension Bytes
-	{ 0, 0, 0, 2, 23 },
-	//0x3e / 0x3f: Interleaved Core Buttons and Accelerometer with 36 IR bytes
-	{ 0, 0, 0, 0, 23 },
-};
-
-void EmulateShake(AccelData* const accel
-	  , accel_cal* const calib
-	  , ControllerEmu::Buttons* const buttons_group
-	  , u8* const shake_step )
-{
-	// frame count of one up/down shake
-	// < 9 no shake detection in "Wario Land: Shake It"
-	auto const shake_step_max = 15;
-
-	// peak G-force
-	double shake_intensity;
-	
-	// shake is a bitfield of X,Y,Z shake button states
-	static const unsigned int btns[] = { 0x01, 0x02, 0x04 };
-	unsigned int shake = 0;
-	buttons_group->GetState( &shake, btns );
-
-	for (int i = 0; i != 3; ++i)
-	{
-		if (shake & (1 << i))
-		{
-			double zero = double((&(calib->zero_g.x))[i]);
-			double one = double((&(calib->one_g.x))[i]);
-			shake_intensity = max(zero / (one - zero), (255.f - zero) / (one - zero));
-			(&(accel->x))[i] = std::sin(TAU * shake_step[i] / shake_step_max) * shake_intensity;
-			shake_step[i] = (shake_step[i] + 1) % shake_step_max;
-		}
-		else
-			shake_step[i] = 0;
-	}
-}
-
-void EmulateTilt(AccelData* const accel
-	, ControllerEmu::Tilt* const tilt_group
-	, const bool focus, const bool sideways, const bool upright)
-{
-	float roll, pitch;
-	// 180 degrees
-	tilt_group->GetState(&roll, &pitch, 0, focus ? PI : 0);
-
-	unsigned int	ud = 0, lr = 0, fb = 0;
-
-	// some notes that no one will understand but me :p
-	// left, forward, up
-	// lr/ left == negative for all orientations
-	// ud/ up == negative for upright longways
-	// fb/ forward == positive for (sideways flat)
-
-	// determine which axis is which direction
-	ud = upright ? (sideways ? 0 : 1) : 2;
-	lr = sideways;
-	fb = upright ? 2 : (sideways ? 0 : 1);
-
-	int sgn[3]={-1,1,1}; //sign fix
-
-	if (sideways && !upright)
-		sgn[fb] *= -1;
-	if (!sideways && upright)
-		sgn[ud] *= -1;
-
-	(&accel->x)[ud] = (sin((PI / 2) - std::max(fabsf(roll), fabsf(pitch))))*sgn[ud];
-	(&accel->x)[lr] = -sin(roll)*sgn[lr];
-	(&accel->x)[fb] = sin(pitch)*sgn[fb];
-}
-
-#define SWING_INTENSITY		2.5f//-uncalibrated(aprox) 0x40-calibrated
-
-void EmulateSwing(AccelData* const accel
-	, ControllerEmu::Force* const swing_group
-	, const bool sideways, const bool upright)
-{
-	float swing[3];
-	swing_group->GetState(swing, 0, SWING_INTENSITY);
-
-	s8 g_dir[3] = {-1, -1, -1};
-	u8 axis_map[3];
-
-	// determine which axis is which direction
-	axis_map[0] = upright ? (sideways ? 0 : 1) : 2;	// up/down
-	axis_map[1] = sideways;	// left|right
-	axis_map[2] = upright ? 2 : (sideways ? 0 : 1);	// forward/backward
-
-	// some orientations have up as positive, some as negative
-	// same with forward
-	if (sideways && !upright)
-		g_dir[axis_map[2]] *= -1;
-	if (!sideways && upright)
-		g_dir[axis_map[0]] *= -1;
-
-	for (unsigned int i=0; i<3; ++i)
-		(&accel->x)[axis_map[i]] += swing[i] * g_dir[i];
-}
-
-const u16 button_bitmasks[] =
-{
-	Wiimote::BUTTON_A,
-	Wiimote::BUTTON_B,
-	Wiimote::BUTTON_ONE,
-	Wiimote::BUTTON_TWO,
-	Wiimote::BUTTON_MINUS,
-	Wiimote::BUTTON_PLUS,
-	Wiimote::BUTTON_HOME
-};
-
-const u16 dpad_bitmasks[] =
-{
-	Wiimote::PAD_UP, Wiimote::PAD_DOWN, Wiimote::PAD_LEFT, Wiimote::PAD_RIGHT
-};
-const u16 dpad_sideways_bitmasks[] =
-{
-	Wiimote::PAD_RIGHT, Wiimote::PAD_LEFT, Wiimote::PAD_UP, Wiimote::PAD_DOWN
-};
-
-const char* const named_buttons[] =
-{
-	"A", "B", "1", "2", "-", "+", "Home",
-};
-
-void Wiimote::Reset()
-{
-	m_reporting_mode = WM_REPORT_CORE;
-	// i think these two are good
-	m_reporting_channel = 0;
-	m_reporting_auto = false;
-
-	m_rumble_on = false;
-	m_speaker_mute = false;
-	m_motion_plus_present = false;
-	m_motion_plus_active = false;
-
-	// will make the first Update() call send a status request
-	// the first call to RequestStatus() will then set up the status struct extension bit
-	m_extension->active_extension = -1;
-
-	// eeprom
-	memset(m_eeprom, 0, sizeof(m_eeprom));
-	// calibration data
-	memcpy(m_eeprom, eeprom_data_0, sizeof(eeprom_data_0));
-	// dunno what this is for, copied from old plugin
-	memcpy(m_eeprom + 0x16D0, eeprom_data_16D0, sizeof(eeprom_data_16D0));
-
-	// set up the register
-	memset(&m_reg_speaker, 0, sizeof(m_reg_speaker));
-	memset(&m_reg_ir, 0, sizeof(m_reg_ir));
-	memset(&m_reg_ext, 0, sizeof(m_reg_ext));
-	memset(&m_reg_motion_plus, 0, sizeof(m_reg_motion_plus));
-
-	memcpy(&m_reg_motion_plus.ext_identifier, motion_plus_id, sizeof(motion_plus_id));
-
-	// status
-	memset(&m_status, 0, sizeof(m_status));
-	// Battery levels in voltage
-	//   0x00 - 0x32: level 1
-	//   0x33 - 0x43: level 2
-	//   0x33 - 0x54: level 3
-	//   0x55 - 0xff: level 4
-	m_status.battery = 0x5f;
-
-	memset(m_shake_step, 0, sizeof(m_shake_step));
-
-	// clear read request queue
-	while (m_read_requests.size())
-	{
-		delete[] m_read_requests.front().data;
-		m_read_requests.pop();
-	}
-}
-
-Wiimote::Wiimote( const unsigned int index )
-	: m_index(index)
-	, ir_sin(0)
-	, ir_cos(1)
-//	, m_sound_stream( NULL )
-{
-	// ---- set up all the controls ----
-
-	// buttons
-	groups.push_back(m_buttons = new Buttons("Buttons"));
-	for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons); ++i)
-		m_buttons->controls.push_back(new ControlGroup::Input( named_buttons[i]));
-
-	// udp
-	groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote")));
-
-	// ir
-	groups.push_back(m_ir = new Cursor(_trans("IR")));
-
-	// swing
-	groups.push_back(m_swing = new Force(_trans("Swing")));
-
-	// tilt
-	groups.push_back(m_tilt = new Tilt(_trans("Tilt")));
-
-	// shake
-	groups.push_back(m_shake = new Buttons(_trans("Shake")));
-	m_shake->controls.push_back(new ControlGroup::Input("X"));
-	m_shake->controls.push_back(new ControlGroup::Input("Y"));
-	m_shake->controls.push_back(new ControlGroup::Input("Z"));
-
-	// extension
-	groups.push_back(m_extension = new Extension(_trans("Extension")));
-	m_extension->attachments.push_back(new WiimoteEmu::None(m_reg_ext));
-	m_extension->attachments.push_back(new WiimoteEmu::Nunchuk(m_udp, m_reg_ext));
-	m_extension->attachments.push_back(new WiimoteEmu::Classic(m_reg_ext));
-	m_extension->attachments.push_back(new WiimoteEmu::Guitar(m_reg_ext));
-	m_extension->attachments.push_back(new WiimoteEmu::Drums(m_reg_ext));
-	m_extension->attachments.push_back(new WiimoteEmu::Turntable(m_reg_ext));
-
-	m_extension->settings.push_back(new ControlGroup::Setting(_trans("Motion Plus"), 0, 0, 1));
-
-	// rumble
-	groups.push_back(m_rumble = new ControlGroup(_trans("Rumble")));
-	m_rumble->controls.push_back(new ControlGroup::Output(_trans("Motor")));
-
-	// dpad
-	groups.push_back(m_dpad = new Buttons("D-Pad"));
-	for (unsigned int i=0; i < 4; ++i)
-		m_dpad->controls.push_back(new ControlGroup::Input(named_directions[i]));
-
-	// options
-	groups.push_back( m_options = new ControlGroup(_trans("Options")));
-	m_options->settings.push_back(new ControlGroup::Setting(_trans("Background Input"), false));
-	m_options->settings.push_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false));
-	m_options->settings.push_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false));
-
-	// TODO: This value should probably be re-read if SYSCONF gets changed
-	m_sensor_bar_on_top = SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR") != 0;
-
-	// --- reset eeprom/register/values to default ---
-	Reset();
-}
-
-std::string Wiimote::GetName() const
-{
-	return std::string("Wiimote") + char('1'+m_index);
-}
-
-// if windows is focused or background input is enabled
-#define HAS_FOCUS	(Host_RendererHasFocus() || (m_options->settings[0]->value != 0))
-
-bool Wiimote::Step()
-{
-	const bool has_focus = HAS_FOCUS;
-
-	// TODO: change this a bit
-	m_motion_plus_present = m_extension->settings[0]->value != 0;
-
-	// no rumble if no focus
-	if (false == has_focus)
-		m_rumble_on = false;
-
-	m_rumble->controls[0]->control_ref->State(m_rumble_on);
-
-	// when a movie is active, this button status update is disabled (moved), because movies only record data reports.
-	if(!(Movie::IsPlayingInput() || Movie::IsRecordingInput()))
-	{
-		UpdateButtonsStatus(has_focus);
-	}
-
-	// check if there is a read data request
-	if (m_read_requests.size())
-	{
-		ReadRequest& rr = m_read_requests.front();
-		// send up to 16 bytes to the wii
-		SendReadDataReply(rr);
-		//SendReadDataReply(rr.channel, rr);
-
-		// if there is no more data, remove from queue
-		if (0 == rr.size)
-		{
-			delete[] rr.data;
-			m_read_requests.pop();
-		}
-
-		// dont send any other reports
-		return true;
-	}
-
-	// check if a status report needs to be sent
-	// this happens on wiimote sync and when extensions are switched
-	if (m_extension->active_extension != m_extension->switch_extension)
-	{
-		RequestStatus();
-
-		// Wiibrew: Following a connection or disconnection event on the Extension Port,
-		// data reporting is disabled and the Data Reporting Mode must be reset before new data can arrive.
-		// after a game receives an unrequested status report,
-		// it expects data reports to stop until it sets the reporting mode again
-		m_reporting_auto = false;
-
-		return true;
-	}
-
-	return false;
-}
-
-void Wiimote::UpdateButtonsStatus(bool has_focus)
-{
-	// update buttons in status struct
-	m_status.buttons = 0;
-	if (has_focus)
-	{
-		const bool is_sideways = m_options->settings[1]->value != 0;
-		m_buttons->GetState(&m_status.buttons, button_bitmasks);
-		m_dpad->GetState(&m_status.buttons, is_sideways ? dpad_sideways_bitmasks : dpad_bitmasks);
-		UDPTLayer::GetButtons(m_udp, &m_status.buttons);
-	}
-}
-
-void Wiimote::GetCoreData(u8* const data)
-{
-	// when a movie is active, the button update happens here instead of Wiimote::Step, to avoid potential desync issues.
-	if(Movie::IsPlayingInput() || Movie::IsRecordingInput())
-	{
-		UpdateButtonsStatus(HAS_FOCUS);
-	}
-
-	*(wm_core*)data |= m_status.buttons;
-}
-
-void Wiimote::GetAccelData(u8* const data, u8* const buttons)
-{
-	const bool has_focus = HAS_FOCUS;
-	const bool is_sideways = m_options->settings[1]->value != 0;
-	const bool is_upright = m_options->settings[2]->value != 0;
-	accel_cal* calib = (accel_cal*)&m_eeprom[0x16];
-
-	// ----TILT----
-	EmulateTilt(&m_accel, m_tilt, has_focus, is_sideways, is_upright);
-
-	// ----SWING----
-	// ----SHAKE----
-	if (has_focus)
-	{
-		EmulateSwing(&m_accel, m_swing, is_sideways, is_upright);
-		EmulateShake(&m_accel, calib, m_shake, m_shake_step);
-		UDPTLayer::GetAcceleration(m_udp, &m_accel);
-	}
-	wm_accel* dt = (wm_accel*)data;
-	double cx,cy,cz;
-	cx=trim(m_accel.x*(calib->one_g.x-calib->zero_g.x)+calib->zero_g.x);
-	cy=trim(m_accel.y*(calib->one_g.y-calib->zero_g.y)+calib->zero_g.y);
-	cz=trim(m_accel.z*(calib->one_g.z-calib->zero_g.z)+calib->zero_g.z);
-	dt->x=u8(cx);
-	dt->y=u8(cy);
-	dt->z=u8(cz);
-	if (buttons)
-	{
-		buttons[0]|=(u8(cx*4)&3)<<5;
-		buttons[1]|=((u8(cy*2)&1)<<5)|((u8(cz*2)&1)<<6);
-	}
-}
-#define kCutoffFreq 5.0f
-inline void LowPassFilter(double & var, double newval, double period)
-{
-	double RC=1.0/kCutoffFreq;
-	double alpha=period/(period+RC);
-	var = newval * alpha + var * (1.0 - alpha);
-}
-
-void Wiimote::GetIRData(u8* const data, bool use_accel)
-{
-	const bool has_focus = HAS_FOCUS;
-
-	u16 x[4], y[4];
-	memset(x, 0xFF, sizeof(x));
-
-	if (has_focus)
-	{
-		float xx = 10000, yy = 0, zz = 0;
-		double nsin,ncos;
-		
-		if (use_accel)
-		{
-			double ax,az,len;
-			ax=m_accel.x;
-			az=m_accel.z;
-			len=sqrt(ax*ax+az*az);
-			if (len)
-			{
-				ax/=len; 
-				az/=len; //normalizing the vector
-				nsin=ax;
-				ncos=az;
-			}
-			else
-			{
-				nsin=0;
-				ncos=1;
-			}
-		//	PanicAlert("%d %d %d\nx:%f\nz:%f\nsin:%f\ncos:%f",accel->x,accel->y,accel->z,ax,az,sin,cos);
-			//PanicAlert("%d %d %d\n%d %d %d\n%d %d %d",accel->x,accel->y,accel->z,calib->zero_g.x,calib->zero_g.y,calib->zero_g.z,
-			//	calib->one_g.x,calib->one_g.y,calib->one_g.z);
-		}
-		else
-		{
-			nsin=0; //m_tilt stuff here (can't figure it out yet....)
-			ncos=1;
-		}
-
-		LowPassFilter(ir_sin,nsin,1.0f/60);
-		LowPassFilter(ir_cos,ncos,1.0f/60);
-
-		m_ir->GetState(&xx, &yy, &zz, true);
-		UDPTLayer::GetIR(m_udp, &xx, &yy, &zz);
-
-		Vertex v[4];
-		
-		static const int camWidth=1024;
-		static const int camHeight=768;
-		static const double bndup=-0.315447;	
-		static const double bnddown=0.85;	
-		static const double bndleft=0.443364;		
-		static const double bndright=-0.443364;	
-		static const double dist1=100.f/camWidth; //this seems the optimal distance for zelda
-		static const double dist2=1.2f*dist1;
-
-		for (int i=0; i<4; i++)
-		{
-			v[i].x=xx*(bndright-bndleft)/2+(bndleft+bndright)/2;
-			if (m_sensor_bar_on_top) v[i].y=yy*(bndup-bnddown)/2+(bndup+bnddown)/2;
-			else v[i].y=yy*(bndup-bnddown)/2-(bndup+bnddown)/2;
-			v[i].z=0;
-		}
-
-		v[0].x-=(zz*0.5+1)*dist1;
-		v[1].x+=(zz*0.5+1)*dist1;
-		v[2].x-=(zz*0.5+1)*dist2;
-		v[3].x+=(zz*0.5+1)*dist2;
-
-#define printmatrix(m) PanicAlert("%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n",m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3])
-		Matrix rot,tot;
-		static Matrix scale;
-		static bool isscale=false;
-		if (!isscale)
-		{
-			MatrixScale(scale,1,camWidth/camHeight,1);
-			//MatrixIdentity(scale);
-		}
-		MatrixRotationByZ(rot,ir_sin,ir_cos);
-		//MatrixIdentity(rot);
-		MatrixMultiply(tot,scale,rot);
-
-		for (int i=0; i<4; i++)
-		{
-			MatrixTransformVertex(tot,v[i]);
-			if ((v[i].x<-1)||(v[i].x>1)||(v[i].y<-1)||(v[i].y>1))
-				continue;
-			x[i]=(u16)round((v[i].x+1)/2*(camWidth-1));
-			y[i]=(u16)round((v[i].y+1)/2*(camHeight-1));
-		}
-	//	PanicAlert("%f %f\n%f %f\n%f %f\n%f %f\n%d %d\n%d %d\n%d %d\n%d %d",
-	//		v[0].x,v[0].y,v[1].x,v[1].y,v[2].x,v[2].y,v[3].x,v[3].y,
-	//		x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[38]);
-	}
-	// Fill report with valid data when full handshake was done
-	if (m_reg_ir.data[0x30])
-	// ir mode
-	switch (m_reg_ir.mode)
-	{
-	// basic
-	case 1 :
-		{
-		memset(data, 0xFF, 10);
-		wm_ir_basic* const irdata = (wm_ir_basic*)data;
-		for (unsigned int i=0; i<2; ++i)
-		{
-			if (x[i*2] < 1024 && y[i*2] < 768) 
-			{
-				irdata[i].x1 = u8(x[i*2]);
-				irdata[i].x1hi = x[i*2] >> 8;
-
-				irdata[i].y1 = u8(y[i*2]);
-				irdata[i].y1hi = y[i*2] >> 8;
-			}
-			if (x[i*2+1] < 1024 && y[i*2+1] < 768)
-			{
-				irdata[i].x2 = u8(x[i*2+1]);
-				irdata[i].x2hi = x[i*2+1] >> 8;
-
-				irdata[i].y2 = u8(y[i*2+1]);
-				irdata[i].y2hi = y[i*2+1] >> 8;
-			}
-		}
-		}
-		break;
-	// extended
-	case 3 :
-		{
-		memset(data, 0xFF, 12);
-		wm_ir_extended* const irdata = (wm_ir_extended*)data;
-		for (unsigned int i=0; i<4; ++i)
-			if (x[i] < 1024 && y[i] < 768)
-			{
-				irdata[i].x = u8(x[i]);
-				irdata[i].xhi = x[i] >> 8;
-
-				irdata[i].y = u8(y[i]);
-				irdata[i].yhi = y[i] >> 8;
-
-				irdata[i].size = 10;
-			}
-		}
-		break;
-	// full
-	case 5 :
-		PanicAlert("Full IR report");
-		// UNSUPPORTED
-		break;
-	}
-}
-
-void Wiimote::GetExtData(u8* const data)
-{
-	m_extension->GetState(data, HAS_FOCUS);
-
-	// i dont think anything accesses the extension data like this, but ill support it. Indeed, commercial games don't do this.
-	// i think it should be unencrpyted in the register, encrypted when read.
-	memcpy(m_reg_ext.controller_data, data, sizeof(wm_extension));
-
-	// motionplus pass-through modes
-	if (m_motion_plus_active)
-	{
-		switch (m_reg_motion_plus.ext_identifier[0x4])
-		{
-		// nunchuck pass-through mode
-		// Bit 7 of byte 5 is moved to bit 6 of byte 5, overwriting it
-		// Bit 0 of byte 4 is moved to bit 7 of byte 5
-		// Bit 3 of byte 5 is moved to bit 4 of byte 5, overwriting it
-		// Bit 1 of byte 5 is moved to bit 3 of byte 5
-		// Bit 0 of byte 5 is moved to bit 2 of byte 5, overwriting it 
-		case 0x5:
-			//data[5] & (1 << 7)
-			//data[4] & (1 << 0)
-			//data[5] & (1 << 3)
-			//data[5] & (1 << 1)
-			//data[5] & (1 << 0)
-			break;
-
-		// classic controller/musical instrument pass-through mode
-		// Bit 0 of Byte 4 is overwritten
-		// Bits 0 and 1 of Byte 5 are moved to bit 0 of Bytes 0 and 1, overwriting
-		case 0x7:
-			//data[4] & (1 << 0)
-			//data[5] & (1 << 0)
-			//data[5] & (1 << 1)
-			break;
-
-		// unknown pass-through mode
-		default:
-			break;
-		}
-
-		((wm_motionplus_data*)data)->is_mp_data = 0;
-		((wm_motionplus_data*)data)->extension_connected = m_extension->active_extension;
-	}
-
-	if (0xAA == m_reg_ext.encryption)
-		wiimote_encrypt(&m_ext_key, data, 0x00, sizeof(wm_extension));
-}
-
-void Wiimote::Update()
-{
-	// no channel == not connected i guess
-	if (0 == m_reporting_channel)
-		return;
-
-	// returns true if a report was sent
-	if (Step())
-		return;
-
-	u8 data[MAX_PAYLOAD];
-	memset(data, 0, sizeof(data));
-	
-	// figure out what data we need
-	s8 rptf_size = MAX_PAYLOAD;
-
-	Movie::SetPolledDevice();
-
-	const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE];
-	rptf_size = rptf.size;
-	if (Movie::IsPlayingInput() && Movie::PlayWiimote(m_index, data, rptf, m_reg_ir.mode))
-	{
-		if (rptf.core)
-			m_status.buttons = *(wm_core*)(data + rptf.core);
-	}
-	else
-	{
-		data[0] = 0xA1;
-		data[1] = m_reporting_mode;
-	
-		// core buttons
-		if (rptf.core)
-			GetCoreData(data + rptf.core);
-	
-		// acceleration
-		if (rptf.accel)
-			GetAccelData(data + rptf.accel, rptf.core?(data+rptf.core):NULL);
-	
-		// IR
-		if (rptf.ir)
-			GetIRData(data + rptf.ir, (rptf.accel != 0)); 
-	
-		// extension
-		if (rptf.ext)
-			GetExtData(data + rptf.ext);
-	
-		// hybrid wiimote stuff (for now, it's not supported while recording)
-		if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && !Movie::IsRecordingInput())
-		{
-			using namespace WiimoteReal;
-	
-			std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-			if (g_wiimotes[m_index])
-			{
-				const Report& rpt = g_wiimotes[m_index]->ProcessReadQueue();
-				if (!rpt.empty())
-				{
-					const u8 *real_data = rpt.data();
-					switch (real_data[1])
-					{
-						// use data reports
-					default:
-						if (real_data[1] >= WM_REPORT_CORE)
-						{
-							const ReportFeatures& real_rptf = reporting_mode_features[real_data[1] - WM_REPORT_CORE];
-	
-							// force same report type from real-wiimote
-							if (&real_rptf != &rptf)
-								rptf_size = 0;
-	
-							// core
-							// mix real-buttons with emu-buttons in the status struct, and in the report
-							if (real_rptf.core && rptf.core)
-							{
-								m_status.buttons |= *(wm_core*)(real_data + real_rptf.core);
-								*(wm_core*)(data + rptf.core) = m_status.buttons;
-							}
-	
-							// accel
-							// use real-accel data always i guess
-							if (real_rptf.accel && rptf.accel)
-								memcpy(data + rptf.accel, real_data + real_rptf.accel, sizeof(wm_accel));
-	
-							// ir
-							// TODO
-	
-							// ext
-							// use real-ext data if an emu-extention isn't chosen
-							if (real_rptf.ext && rptf.ext && (0 == m_extension->switch_extension))
-								memcpy(data + rptf.ext, real_data + real_rptf.ext, sizeof(wm_extension));
-						}
-						else if (WM_ACK_DATA != real_data[1] || m_extension->active_extension > 0)
-							rptf_size = 0;
-						else
-							// use real-acks if an emu-extension isn't chosen
-							rptf_size = -1;
-						break;
-	
-						// use all status reports, after modification of the extension bit
-					case WM_STATUS_REPORT :
-						//if (m_extension->switch_extension)
-							//((wm_status_report*)(real_data + 2))->extension = (m_extension->active_extension > 0);
-						if (m_extension->active_extension)
-							((wm_status_report*)(real_data + 2))->extension = 1;
-						rptf_size = -1;
-						break;
-	
-						// use all read-data replies
-					case WM_READ_DATA_REPLY:
-						rptf_size = -1;
-						break;
-	
-					}
-	
-					// copy over report from real-wiimote
-					if (-1 == rptf_size)
-					{
-						std::copy(rpt.begin(), rpt.end(), data);
-						rptf_size = rpt.size();
-					}
-				}
-			}
-		}
-	}
-	if (!Movie::IsPlayingInput())
-	{
-		Movie::CheckWiimoteStatus(m_index, data, rptf, m_reg_ir.mode);
-	}
-
-	// don't send a data report if auto reporting is off
-	if (false == m_reporting_auto && data[2] >= WM_REPORT_CORE)
-		return;
-
-	// send data report
-	if (rptf_size)
-	{
-		WiimoteEmu::Spy(this, data, rptf_size);
-		Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, rptf_size);
-	}
-}
-
-void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size) 
-{
-	// Check for custom communication
-	if (99 == _channelID)
-	{
-		// wiimote disconnected
-		//PanicAlert( "Wiimote Disconnected" );
-
-		// reset eeprom/register/reporting mode
-		Reset();
-		return;
-	}
-
-	// this all good?
-	m_reporting_channel = _channelID;
-
-	const hid_packet* const hidp = (hid_packet*)_pData;
-
-	INFO_LOG(WIIMOTE, "Emu ControlChannel (page: %i, type: 0x%02x, param: 0x%02x)", m_index, hidp->type, hidp->param);
-
-	switch (hidp->type)
-	{
-	case HID_TYPE_HANDSHAKE :
-		PanicAlert("HID_TYPE_HANDSHAKE - %s", (hidp->param == HID_PARAM_INPUT) ? "INPUT" : "OUPUT");
-		break;
-
-	case HID_TYPE_SET_REPORT :
-		if (HID_PARAM_INPUT == hidp->param)
-		{
-			PanicAlert("HID_TYPE_SET_REPORT - INPUT"); 
-		}
-		else
-		{
-			// AyuanX: My experiment shows Control Channel is never used
-			// shuffle2: but lwbt uses this, so we'll do what we must :)
-			HidOutputReport((wm_report*)hidp->data);
-
-			u8 handshake = HID_HANDSHAKE_SUCCESS;
-			Core::Callback_WiimoteInterruptChannel(m_index, _channelID, &handshake, 1);
-		}
-		break;
-
-	case HID_TYPE_DATA :
-		PanicAlert("HID_TYPE_DATA - %s", (hidp->param == HID_PARAM_INPUT) ? "INPUT" : "OUTPUT");
-		break;
-
-	default :
-		PanicAlert("HidControlChannel: Unknown type %x and param %x", hidp->type, hidp->param);
-		break;
-	}
-
-}
-
-void Wiimote::InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size)
-{
-	// this all good?
-	m_reporting_channel = _channelID;
-
-	const hid_packet* const hidp = (hid_packet*)_pData;
-
-	switch (hidp->type)
-	{
-	case HID_TYPE_DATA:
-		switch (hidp->param)
-		{
-		case HID_PARAM_OUTPUT :
-			{
-				const wm_report* const sr = (wm_report*)hidp->data;
-
-				if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index])
-				{
-					switch (sr->wm)
-					{
-						// these two types are handled in RequestStatus() & ReadData()
-					case WM_REQUEST_STATUS :
-					case WM_READ_DATA :
-						if (WIIMOTE_SRC_REAL == g_wiimote_sources[m_index])
-							WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
-						break;
-
-					default :
-						WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
-						break;
-					}
-
-					HidOutputReport(sr, m_extension->switch_extension > 0);
-				}
-				else
-					HidOutputReport(sr);
-			}
-			break;
-
-		default :
-			PanicAlert("HidInput: HID_TYPE_DATA - param 0x%02x", hidp->param);
-			break;
-		}
-		break;
-
-	default:
-		PanicAlert("HidInput: Unknown type 0x%02x and param 0x%02x", hidp->type, hidp->param);
-		break;
-	}
-}
-
-void Wiimote::LoadDefaults(const ControllerInterface& ciface)
-{
-	ControllerEmu::LoadDefaults(ciface);
-
-	#define set_control(group, num, str)	(group)->controls[num]->control_ref->expression = (str)
-
-	// Buttons
-#if defined HAVE_X11 && HAVE_X11
-	set_control(m_buttons, 0, "Click 1");		// A
-	set_control(m_buttons, 1, "Click 3");		// B
-#else
-	set_control(m_buttons, 0, "Click 0");		// A
-	set_control(m_buttons, 1, "Click 1");		// B
-#endif
-	set_control(m_buttons, 2, "1");		// 1
-	set_control(m_buttons, 3, "2");		// 2
-	set_control(m_buttons, 4, "Q");		// -
-	set_control(m_buttons, 5, "E");		// +
-
-#ifdef _WIN32
-	set_control(m_buttons, 6, "RETURN");		// Home
-#else
-	set_control(m_buttons, 6, "Return");		// Home
-#endif
-
-	// Shake
-	for (size_t i = 0; i != 3; ++i)
-		set_control(m_shake, i, "Click 2");
-
-	// IR
-	set_control(m_ir, 0, "Cursor Y-");
-	set_control(m_ir, 1, "Cursor Y+");
-	set_control(m_ir, 2, "Cursor X-");
-	set_control(m_ir, 3, "Cursor X+");
-
-	// DPad
-#ifdef _WIN32
-	set_control(m_dpad, 0, "UP");		// Up
-	set_control(m_dpad, 1, "DOWN");		// Down
-	set_control(m_dpad, 2, "LEFT");		// Left
-	set_control(m_dpad, 3, "RIGHT");	// Right
-#elif __APPLE__
-	set_control(m_dpad, 0, "Up Arrow");		// Up
-	set_control(m_dpad, 1, "Down Arrow");	// Down
-	set_control(m_dpad, 2, "Left Arrow");	// Left
-	set_control(m_dpad, 3, "Right Arrow");	// Right
-#else
-	set_control(m_dpad, 0, "Up");		// Up
-	set_control(m_dpad, 1, "Down");		// Down
-	set_control(m_dpad, 2, "Left");		// Left
-	set_control(m_dpad, 3, "Right");	// Right
-#endif
-
-	// ugly stuff
-	// enable nunchuk
-	m_extension->switch_extension = 1;
-
-	// set nunchuk defaults
-	m_extension->attachments[1]->LoadDefaults(ciface);
-}
-
-}
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
deleted file mode 100644
index 2fd471978e..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONEMU_WIIMOTE_H_
-#define _CONEMU_WIIMOTE_H_
-
-#include "../../Core.h"
-
-#include "ControllerEmu.h"
-#include "ChunkFile.h"
-
-#include "WiimoteHid.h"
-#include "Encryption.h"
-#include "UDPWrapper.h"
-
-#include <vector>
-#include <queue>
-
-// Registry sizes
-#define WIIMOTE_EEPROM_SIZE			(16*1024)
-#define WIIMOTE_EEPROM_FREE_SIZE	0x1700
-#define WIIMOTE_REG_SPEAKER_SIZE	10
-#define WIIMOTE_REG_EXT_SIZE		0x100
-#define WIIMOTE_REG_IR_SIZE			0x34
-
-namespace WiimoteReal
-{
-class Wiimote;
-}
-
-namespace WiimoteEmu
-{
-
-struct ReportFeatures
-{
-	u8 core, accel, ir, ext, size;
-};
-
-struct AccelData
-{
-	double x,y,z;
-};
-
-struct ADPCMState
-{
-	s32 predictor, step;
-};
-
-struct ExtensionReg
-{
-	u8	unknown1[0x08];
-
-	// address 0x08
-	u8	controller_data[0x06];
-	u8	unknown2[0x12];
-
-	// address 0x20
-	u8	calibration[0x10];
-	u8	unknown3[0x10];
-
-	// address 0x40
-	u8	encryption_key[0x10];
-	u8	unknown4[0xA0];
-
-	// address 0xF0
-	u8	encryption;
-	u8	unknown5[0x9];
-
-	// address 0xFA
-	u8	constant_id[6];
-};
-
-extern const ReportFeatures reporting_mode_features[];
-
-void EmulateShake(AccelData* const accel_data
-	  , accel_cal* const calib
-	  , ControllerEmu::Buttons* const buttons_group
-	  , u8* const shake_step);
-
-void EmulateTilt(AccelData* const accel
-	 , ControllerEmu::Tilt* const tilt_group
-	 , const bool focus, const bool sideways = false, const bool upright = false);
-
-void EmulateSwing(AccelData* const accel
-	 , ControllerEmu::Force* const tilt_group
-	 , const bool sideways = false, const bool upright = false);
-
-inline double trim(double a)
-{
-	if (a<=0) return 0;
-	if (a>=255) return 255;
-	return a;
-}
-
-class Wiimote : public ControllerEmu
-{
-friend class WiimoteReal::Wiimote;
-friend void Spy(Wiimote* wm_, const void* data_, int size_);
-public:
-
-	enum
-	{
-		PAD_LEFT =		0x01,
-		PAD_RIGHT =		0x02,
-		PAD_DOWN =		0x04,
-		PAD_UP =		0x08,
-		BUTTON_PLUS =	0x10,
-
-		BUTTON_TWO =	0x0100,
-		BUTTON_ONE =	0x0200,
-		BUTTON_B =		0x0400,
-		BUTTON_A =		0x0800,
-		BUTTON_MINUS =	 0x1000,
-		BUTTON_HOME =	0x8000,
-	};
-
-	Wiimote( const unsigned int index );
-	std::string GetName() const;
-
-	void Update();
-	void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size);
-	void ControlChannel(const u16 _channelID, const void* _pData, u32 _Size);
-
-	void DoState(PointerWrap& p);
-	void RealState();
-
-	void LoadDefaults(const ControllerInterface& ciface);
-
-protected:
-	bool Step();
-	void HidOutputReport(const wm_report* const sr, const bool send_ack = true);
-	void HandleExtensionSwap();
-	void UpdateButtonsStatus(bool has_focus);
-
-	void GetCoreData(u8* const data);
-	void GetAccelData(u8* const data, u8* const buttons);
-	void GetIRData(u8* const data, bool use_accel);
-	void GetExtData(u8* const data);
-
-	bool HaveExtension() const { return m_extension->active_extension > 0; }
-	bool WantExtension() const { return m_extension->switch_extension != 0; }
-
-private:
-	struct ReadRequest
-	{
-		//u16		channel;
-		unsigned int	address, size, position;
-		u8*		data;
-	};
-
-	void Reset();
-
-	void ReportMode(const wm_report_mode* const dr);
-	void SendAck(const u8 _reportID);
-	void RequestStatus(const wm_request_status* const rs = NULL);
-	void ReadData(const wm_read_data* const rd);
-	void WriteData(const wm_write_data* const wd);
-	void SendReadDataReply(ReadRequest& _request);
-	void SpeakerData(wm_speaker_data* sd);
-
-	// control groups
-	Buttons		*m_buttons, *m_dpad, *m_shake;
-	Cursor*			m_ir;
-	Tilt*			m_tilt;
-	Force*			m_swing;
-	ControlGroup*	m_rumble;
-	Extension*		m_extension;
-	ControlGroup*	m_options;
-
-	// WiiMote accel data
-	AccelData		m_accel;
-
-	// wiimote index, 0-3
-	const u8	m_index;
-
-	double		ir_sin, ir_cos; //for the low pass filter
-
-	UDPWrapper* m_udp;
-
-	bool	m_rumble_on;
-	bool	m_speaker_mute;
-	bool	m_motion_plus_present;
-	bool	m_motion_plus_active;
-
-	bool	m_reporting_auto;
-	u8		m_reporting_mode;
-	u16		m_reporting_channel;
-
-	u8		m_shake_step[3];
-
-	bool	m_sensor_bar_on_top;
-
-	wm_status_report		m_status;
-
-	ADPCMState m_adpcm_state;
-
-	// read data request queue
-	// maybe it isn't actually a queue
-	// maybe read requests cancel any current requests
-	std::queue< ReadRequest >	m_read_requests;
-
-	wiimote_key		m_ext_key;
-
-	u8		m_eeprom[WIIMOTE_EEPROM_SIZE];
-
-	struct MotionPlusReg
-	{
-		u8 unknown[0xF0];
-
-		// address 0xF0
-		u8	activated;
-
-		u8 unknown2[9];
-
-		// address 0xFA
-		u8	ext_identifier[6];
-
-	}	m_reg_motion_plus;
-
-	struct IrReg
-	{
-		u8	data[0x33];
-		u8	mode;
-
-	}	m_reg_ir;
-
-	ExtensionReg m_reg_ext;
-
-	struct SpeakerReg
-	{
-		u8		unused_0;
-		u8		unk_1;
-		u8		format;
-		// seems to always play at 6khz no matter what this is set to?
-		// or maybe it only applies to pcm input
-		u16		sample_rate;
-		u8		volume;
-		u8		unk_6;
-		u8		unk_7;
-		u8		play;
-		u8		unk_9;
-
-	}	m_reg_speaker;
-};
-
-void Spy(Wiimote* wm_, const void* data_, int size_);
-
-}
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h
deleted file mode 100644
index 751c177f98..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef WIIMOTE_HID_H
-#define WIIMOTE_HID_H
-
-#include "CommonTypes.h"
-
-// what is this ?
-#ifdef _MSC_VER
-#pragma warning(disable:4200)
-#endif
-#pragma pack(push, 1)
-
-// Source: HID_010_SPC_PFL/1.0 (official HID specification)
-
-struct hid_packet
-{
-	u8 param : 4;
-	u8 type : 4;
-	u8 data[0];
-};
-
-#define HID_TYPE_HANDSHAKE 0
-#define HID_TYPE_SET_REPORT 5
-#define HID_TYPE_DATA 0xA
-
-#define HID_HANDSHAKE_SUCCESS 0
-
-#define HID_PARAM_INPUT 1
-#define HID_PARAM_OUTPUT 2
-
-//source: http://wiibrew.org/wiki/Wiimote
-
-typedef u16 wm_core;
-
-struct wm_accel
-{
-	u8 x, y, z;
-};
-
-// Four bytes for two objects. Filled with 0xFF if empty
-struct wm_ir_basic
-{
-	u8 x1;
-	u8 y1;
-	u8 x2hi : 2;
-	u8 y2hi : 2;
-	u8 x1hi : 2;
-	u8 y1hi : 2;
-	u8 x2;
-	u8 y2;
-};
-
-// Three bytes for one object
-struct wm_ir_extended
-{
-	u8 x;
-	u8 y;
-	u8 size : 4;
-	u8 xhi : 2;
-	u8 yhi : 2;
-};
-
-struct wm_extension
-{
-	u8 jx; // joystick x, y
-	u8 jy;
-	u8 ax; // accelerometer
-	u8 ay;
-	u8 az;
-	u8 bt; // buttons
-};
-
-struct wm_classic_extension
-{
-	u8 lx : 6; // byte 0
-	u8 rx3 : 2;
-	u8 ly : 6; // byte 1
-	u8 rx2 : 2;
-	u8 ry : 5; // byte 2
-	u8 lt2 : 2;
-	u8 rx1 : 1;
-	u8 rt : 5; // byte 3
-	u8 lt1 : 3;
-	u16 bt; // byte 4, 5
-};
-
-struct wm_guitar_extension
-{
-	u8 sx   : 6;
-	u8 pad1 : 2; // 1 on gh3, 0 on ghwt
-
-	u8 sy   : 6;
-	u8 pad2 : 2; // 1 on gh3, 0 on ghwt
-
-	u8 tb   : 5; // not used in gh3
-	u8 pad3 : 3; // always 0
-
-	u8 whammy : 5;
-	u8 pad4 : 3; // always 0
-
-	u16 bt; // buttons
-};
-
-struct wm_drums_extension
-{
-	u8 sx   : 6;
-	u8 pad1 : 2; // always 0
-
-	u8 sy   : 6;
-	u8 pad2 : 2; // always 0
-
-	u8 pad3 : 1; // unknown
-	u8 which : 5;
-	u8 none : 1;
-	u8 hhp : 1;
-
-	u8 pad4 : 1; // unknown
-	u8 velocity : 4; // unknown
-	u8 softness : 3;
-
-	u16 bt; // buttons
-};
-
-struct wm_turntable_extension
-{
-	u8 sx   : 6;
-	u8 rtable3 : 2;
-
-	u8 sy   : 6;
-	u8 rtable2 : 2;
-
-	u8 rtable4 : 1;
-	u8 slider : 4;
-	u8 dial2 : 2;
-	u8 rtable1 : 1;
-
-	u8 ltable1 : 5;
-	u8 dial1 : 3;
-
-	union
-	{
-		u16 ltable2 : 1;
-		u16 bt; // buttons
-	};
-};
-
-struct wm_motionplus_data
-{
-	u8 yaw1;
-
-	u8 roll1;
-
-	u8 pitch1;
-
-	u8 yaw2 : 6;
-	u8 yaw_slow : 1;
-	u8 pitch_slow : 1;
-
-	u8 roll2 : 6;
-	u8 roll_slow : 1;
-	u8 extension_connected : 1;
-
-	u8 pitch2 : 6;
-	u8 is_mp_data : 1;
-	u8 zero : 1;
-};
-
-struct wm_report
-{
-	u8 wm;
-	union
-	{
-		u8 data[0];
-		struct
-		{
-			u8 rumble : 1;	// enable/disable rumble
-			// only valid for certain reports
-			u8 ack : 1;		// respond with an ack
-			u8 enable : 1;	// enable/disable certain features
-		};
-	};
-};
-
-#define WM_RUMBLE 0x10
-
-#define WM_LEDS 0x11
-struct wm_leds
-{
-	u8 rumble : 1;
-	// real wii also sets bit 0x2 (unknown purpose)
-	u8 : 3;
-	u8 leds : 4;
-};
-
-#define WM_REPORT_MODE 0x12
-struct wm_report_mode
-{
-	u8 rumble : 1;
-	// unsure what "all_the_time" actually is, the real wii does set it (bit 0x2)
-	u8 all_the_time : 1;
-	u8 continuous : 1;
-	u8 : 5;
-	u8 mode;
-};
-
-#define WM_IR_PIXEL_CLOCK 0x13
-#define WM_IR_LOGIC 0x1A
-
-#define WM_REQUEST_STATUS 0x15
-struct wm_request_status
-{
-	u8 rumble : 1;
-	u8 : 7;
-};
-
-#define WM_STATUS_REPORT 0x20
-struct wm_status_report
-{
-	wm_core buttons;
-	u8 battery_low : 1;
-	u8 extension : 1;
-	u8 speaker : 1;
-	u8 ir : 1;
-	u8 leds : 4;
-	u8 padding2[2]; // two 00, TODO: this needs more investigation
-	u8 battery;
-};
-
-#define WM_WRITE_DATA 0x16
-struct wm_write_data
-{
-	u8 rumble : 1;
-	u8 space : 2;	//see WM_SPACE_*
-	u8 : 5;
-	u8 address[3];
-	u8 size;
-	u8 data[16];
-};
-
-#define WM_ACK_DATA 0x22
-struct wm_acknowledge
-{
-	wm_core buttons;
-	u8 reportID;
-	u8 errorID;
-};
-
-#define WM_READ_DATA 0x17
-struct wm_read_data
-{
-	u8 rumble : 1;
-	u8 space : 2;	//see WM_SPACE_*
-	u8 : 5;
-	u8 address[3];
-	u16 size;
-};
-
-#define WM_SPACE_EEPROM 0
-#define WM_SPACE_REGS1 1
-#define WM_SPACE_REGS2 2
-#define WM_SPACE_INVALID 3
-
-#define WM_READ_DATA_REPLY 0x21
-struct wm_read_data_reply
-{
-	wm_core buttons;
-	u8 error : 4;	//see WM_RDERR_*
-	u8 size : 4;
-	u16 address;
-	u8 data[16];
-};
-
-#define WM_RDERR_WOREG 7
-#define WM_RDERR_NOMEM 8
-
-
-// Data reports
-
-#define WM_REPORT_CORE 0x30
-struct wm_report_core
-{
-	wm_core c;
-};
-
-#define WM_REPORT_CORE_ACCEL 0x31
-struct wm_report_core_accel
-{
-	wm_core c;
-	wm_accel a;
-};
-
-#define WM_REPORT_CORE_EXT8 0x32
-
-#define WM_REPORT_CORE_ACCEL_IR12 0x33
-struct wm_report_core_accel_ir12
-{
-	wm_core c;
-	wm_accel a;
-	wm_ir_extended ir[4];
-};
-
-#define WM_REPORT_CORE_EXT19 0x34
-#define WM_REPORT_CORE_ACCEL_EXT16 0x35
-struct wm_report_core_accel_ext16
-{
-	wm_core c;
-	wm_accel a;
-	wm_extension ext;
-	//wm_ir_basic ir[2];
-	u8 pad[10];
-
-};
-
-#define WM_REPORT_CORE_IR10_EXT9 0x36
-
-#define WM_REPORT_CORE_ACCEL_IR10_EXT6 0x37
-struct wm_report_core_accel_ir10_ext6
-{
-	wm_core c;
-	wm_accel a;
-	wm_ir_basic ir[2];
-	//u8 ext[6];
-	wm_extension ext;
-};
-
-#define WM_REPORT_EXT21 0x3d // never used?
-struct wm_report_ext21
-{
-	u8 ext[21];
-};
-
-#define WM_REPORT_INTERLEAVE1 0x3e
-#define WM_REPORT_INTERLEAVE2 0x3f
-
-#define WM_SPEAKER_ENABLE 0x14
-#define WM_SPEAKER_MUTE 0x19
-#define WM_WRITE_SPEAKER_DATA 0x18
-struct wm_speaker_data
-{
-	u8 unknown : 3;
-	u8 length : 5;
-	u8 data[20];
-};
-
-// Custom structs
-
-/**
- *	@struct accel_t
- *	@brief Accelerometer struct. For any device with an accelerometer.
- */
-struct accel_cal
-{
-	struct
-	{
-		u8 x, y, z;
-		u8 xlo : 2;
-		u8 ylo : 2;
-		u8 zlo : 2;
-	} zero_g;
-
-	struct
-	{
-		u8 x, y, z;
-		u8 xlo : 2;
-		u8 ylo : 2;
-		u8 zlo : 2;
-	} one_g;
-};
-
-struct nu_js
-{
-	u8 max, min, center;
-};
-
-struct cc_trigger
-{
-	u8 neutral;
-};
-
-struct nu_cal
-{
-	wm_accel cal_zero;		// zero calibration
-	u8 pad1;
-	wm_accel cal_g;			// g size
-	u8 pad2;
-	nu_js jx;				//
-	nu_js jy;				//
-	u8 sum[2];
-};
-
-struct cc_cal
-{
-	nu_js Lx;				//
-	nu_js Ly;				//
-	nu_js Rx;				//
-	nu_js Ry;				//
-	cc_trigger Tl;			//
-	cc_trigger Tr;			//
-};
-
-struct gh3_cal
-{
-	nu_js Lx;
-	nu_js Ly;
-};
-
-#pragma pack(pop)
-
-#endif	//WIIMOTE_HID_H
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp
deleted file mode 100644
index ada6237756..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "WiimoteReal.h"
-
-namespace WiimoteReal
-{
-
-WiimoteScanner::WiimoteScanner()
-{
-	return;
-}
-
-WiimoteScanner::~WiimoteScanner()
-{}
-
-void WiimoteScanner::Update()
-{}
-
-void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
-{
-	found_wiimotes.clear();
-	found_board = NULL;
-}
-
-bool WiimoteScanner::IsReady() const
-{
-	return false;
-}
-
-void Wiimote::InitInternal()
-{}
-
-void Wiimote::TeardownInternal()
-{}
-
-bool Wiimote::ConnectInternal()
-{
-	return 0;
-}
-
-void Wiimote::DisconnectInternal()
-{
-	return;
-}
-
-bool Wiimote::IsConnected() const
-{
-	return false;
-}
-
-void Wiimote::IOWakeup()
-{}
-
-int Wiimote::IORead(u8* buf)
-{
-	return 0;
-}
-
-int Wiimote::IOWrite(const u8* buf, int len)
-{
-	return 0;
-}
-
-};
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
deleted file mode 100644
index f06bec2dde..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
-
-#include "Common.h"
-#include "WiimoteReal.h"
-
-namespace WiimoteReal
-{
-
-WiimoteScanner::WiimoteScanner()
-	: m_want_wiimotes()
-	, device_id(-1)
-	, device_sock(-1)
-{
-	// Get the id of the first bluetooth device.
-	device_id = hci_get_route(NULL);
-	if (device_id < 0)
-	{
-		NOTICE_LOG(WIIMOTE, "Bluetooth not found.");
-		return;
-	}
-
-	// Create a socket to the device
-	device_sock = hci_open_dev(device_id);
-	if (device_sock < 0)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to open bluetooth.");
-		return;
-	}
-}
-
-bool WiimoteScanner::IsReady() const
-{
-	return device_sock > 0;
-}
-
-WiimoteScanner::~WiimoteScanner()
-{
-	if (IsReady())
-		close(device_sock);
-}
-
-void WiimoteScanner::Update()
-{}
-
-void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
-{
-	// supposedly 1.28 seconds
-	int const wait_len = 1;
-
-	int const max_infos = 255;
-	inquiry_info scan_infos[max_infos] = {};
-	auto* scan_infos_ptr = scan_infos;
-	found_board = NULL;
-	
-	// Scan for bluetooth devices
-	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, NULL, &scan_infos_ptr, IREQ_CACHE_FLUSH);
-	if (found_devices < 0)
-	{
-		ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices.");
-		return;
-	}
-
-	DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices);
-
-	// Display discovered devices
-	for (int i = 0; i < found_devices; ++i)
-	{
-		ERROR_LOG(WIIMOTE, "found a device...");
-		
-		// BT names are a maximum of 248 bytes apparently
-		char name[255] = {};
-		if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 1000) < 0)
-		{
-			ERROR_LOG(WIIMOTE, "name request failed");
-			continue;
-		}
-
-		ERROR_LOG(WIIMOTE, "device name %s", name);
-		if (IsValidBluetoothName(name))
-		{
-			bool new_wiimote = true;
-
-			// TODO: do this
-
-			// Determine if this wiimote has already been found.
-			//for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j)
-			//{
-			//	if (wm[j] && bacmp(&scan_infos[i].bdaddr,&wm[j]->bdaddr) == 0)
-			//		new_wiimote = false;
-			//}
-
-			if (new_wiimote)
-			{
-				// Found a new device
-				char bdaddr_str[18] = {};
-				ba2str(&scan_infos[i].bdaddr, bdaddr_str);
-
-				auto* const wm = new Wiimote;
-				wm->bdaddr = scan_infos[i].bdaddr;
-				if(IsBalanceBoardName(name))
-				{
-					found_board = wm;
-					NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);
-				}
-				else
-				{
-					found_wiimotes.push_back(wm);
-					NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
-				}
-			}
-		}
-	}
-
-}
-
-void Wiimote::InitInternal()
-{
-	cmd_sock = -1;
-	int_sock = -1;
-
-	int fds[2];
-	if (pipe(fds))
-	{
-		ERROR_LOG(WIIMOTE, "pipe failed");
-		abort();
-	}
-	wakeup_pipe_w = fds[1];
-	wakeup_pipe_r = fds[0];
-	bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}};
-}
-
-void Wiimote::TeardownInternal()
-{
-	close(wakeup_pipe_w);
-	close(wakeup_pipe_r);
-}
-
-// Connect to a wiimote with a known address.
-bool Wiimote::ConnectInternal()
-{
-	sockaddr_l2 addr;
-	addr.l2_family = AF_BLUETOOTH;
-	addr.l2_bdaddr = bdaddr;
-	addr.l2_cid = 0;
-
-	// Output channel
-	addr.l2_psm = htobs(WM_OUTPUT_CHANNEL);
-	if ((cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
-			connect(cmd_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
-	{
-		DEBUG_LOG(WIIMOTE, "Unable to open output socket to wiimote.");
-		close(cmd_sock);
-		cmd_sock = -1;
-		return false;
-	}
-
-	// Input channel
-	addr.l2_psm = htobs(WM_INPUT_CHANNEL);
-	if ((int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
-			connect(int_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
-	{
-		DEBUG_LOG(WIIMOTE, "Unable to open input socket from wiimote.");
-		close(int_sock);
-		close(cmd_sock);
-		int_sock = cmd_sock = -1;
-		return false;
-	}
-
-	return true;
-}
-
-void Wiimote::DisconnectInternal()
-{
-	close(cmd_sock);
-	close(int_sock);
-
-	cmd_sock = -1;
-	int_sock = -1;
-}
-
-bool Wiimote::IsConnected() const
-{
-	return cmd_sock != -1;// && int_sock != -1;
-}
-
-void Wiimote::IOWakeup()
-{
-	char c = 0;
-	if (write(wakeup_pipe_w, &c, 1) != 1)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to write to wakeup pipe.");
-	}
-}
-
-// positive = read packet
-// negative = didn't read packet
-// zero = error
-int Wiimote::IORead(u8* buf)
-{
-	// Block select for 1/2000th of a second
-
-	fd_set fds;
-	FD_ZERO(&fds);
-	FD_SET(int_sock, &fds);
-	FD_SET(wakeup_pipe_r, &fds);
-
-	if (select(int_sock + 1, &fds, NULL, NULL, NULL) == -1)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1);
-		return -1;
-	}
-
-	if (FD_ISSET(wakeup_pipe_r, &fds))
-	{
-		char c;
-		if (read(wakeup_pipe_r, &c, 1) != 1)
-		{
-			ERROR_LOG(WIIMOTE, "Unable to read from wakeup pipe.");
-		}
-		return -1;
-	}
-
-	if (!FD_ISSET(int_sock, &fds))
-		return -1;
-
-	// Read the pending message into the buffer
-	int r = read(int_sock, buf, MAX_PAYLOAD);
-	if (r == -1)
-	{
-		// Error reading data
-		ERROR_LOG(WIIMOTE, "Receiving data from wiimote %i.", index + 1);
-
-		if (errno == ENOTCONN)
-		{
-			// This can happen if the bluetooth dongle is disconnected
-			ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected.  "
-					"Wiimote %i will be disconnected.", index + 1);
-		}
-
-		r = 0;
-	}
-
-	return r;
-}
-
-int Wiimote::IOWrite(u8 const* buf, int len)
-{
-	return write(int_sock, buf, len);
-}
-
-}; // WiimoteReal
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
deleted file mode 100644
index 58ebfbfa64..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ /dev/null
@@ -1,868 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <unordered_map>
-#include <ctime>
-#include <unordered_set>
-
-#include <windows.h>
-#include <dbt.h>
-#include <setupapi.h>
-
-#include "Common.h"
-#include "WiimoteReal.h"
-#include "StringUtil.h"
-
-// Used for pair up
-#undef NTDDI_VERSION
-#define NTDDI_VERSION	NTDDI_WINXPSP2
-#include <bthdef.h>
-#include <BluetoothAPIs.h>
-
-//#define AUTHENTICATE_WIIMOTES
-#define SHARE_WRITE_WIIMOTES
-
-typedef struct _HIDD_ATTRIBUTES
-{
-	ULONG   Size;
-	USHORT  VendorID;
-	USHORT  ProductID;
-	USHORT  VersionNumber;
-} HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
-
-typedef VOID (__stdcall *PHidD_GetHidGuid)(LPGUID);
-typedef BOOLEAN (__stdcall *PHidD_GetAttributes)(HANDLE, PHIDD_ATTRIBUTES);
-typedef BOOLEAN (__stdcall *PHidD_SetOutputReport)(HANDLE, PVOID, ULONG);
-typedef BOOLEAN (__stdcall *PHidD_GetProductString)(HANDLE, PVOID, ULONG);
-
-typedef BOOL (__stdcall *PBth_BluetoothFindDeviceClose)(HBLUETOOTH_DEVICE_FIND);
-typedef HBLUETOOTH_DEVICE_FIND (__stdcall *PBth_BluetoothFindFirstDevice)(const BLUETOOTH_DEVICE_SEARCH_PARAMS*, BLUETOOTH_DEVICE_INFO*);
-typedef HBLUETOOTH_RADIO_FIND (__stdcall *PBth_BluetoothFindFirstRadio)(const BLUETOOTH_FIND_RADIO_PARAMS*,HANDLE*);
-typedef BOOL (__stdcall *PBth_BluetoothFindNextDevice)(HBLUETOOTH_DEVICE_FIND, BLUETOOTH_DEVICE_INFO*);
-typedef BOOL (__stdcall *PBth_BluetoothFindNextRadio)(HBLUETOOTH_RADIO_FIND, HANDLE*);
-typedef BOOL (__stdcall *PBth_BluetoothFindRadioClose)(HBLUETOOTH_RADIO_FIND);
-typedef DWORD (__stdcall *PBth_BluetoothGetRadioInfo)(HANDLE, PBLUETOOTH_RADIO_INFO);
-typedef DWORD (__stdcall *PBth_BluetoothRemoveDevice)(const BLUETOOTH_ADDRESS*);
-typedef DWORD (__stdcall *PBth_BluetoothSetServiceState)(HANDLE, const BLUETOOTH_DEVICE_INFO*, const GUID*, DWORD);
-typedef DWORD (__stdcall *PBth_BluetoothAuthenticateDevice)(HWND, HANDLE, BLUETOOTH_DEVICE_INFO*, PWCHAR, ULONG);
-typedef DWORD (__stdcall *PBth_BluetoothEnumerateInstalledServices)(HANDLE,	BLUETOOTH_DEVICE_INFO*, DWORD*, GUID*);
-
-PHidD_GetHidGuid HidD_GetHidGuid = NULL;
-PHidD_GetAttributes HidD_GetAttributes = NULL;
-PHidD_SetOutputReport HidD_SetOutputReport = NULL;
-PHidD_GetProductString HidD_GetProductString = NULL;
-
-PBth_BluetoothFindDeviceClose Bth_BluetoothFindDeviceClose = NULL;
-PBth_BluetoothFindFirstDevice Bth_BluetoothFindFirstDevice = NULL;
-PBth_BluetoothFindFirstRadio Bth_BluetoothFindFirstRadio = NULL;
-PBth_BluetoothFindNextDevice Bth_BluetoothFindNextDevice = NULL;
-PBth_BluetoothFindNextRadio Bth_BluetoothFindNextRadio = NULL;
-PBth_BluetoothFindRadioClose Bth_BluetoothFindRadioClose = NULL;
-PBth_BluetoothGetRadioInfo Bth_BluetoothGetRadioInfo = NULL;
-PBth_BluetoothRemoveDevice Bth_BluetoothRemoveDevice = NULL;
-PBth_BluetoothSetServiceState Bth_BluetoothSetServiceState = NULL;
-PBth_BluetoothAuthenticateDevice Bth_BluetoothAuthenticateDevice = NULL;
-PBth_BluetoothEnumerateInstalledServices Bth_BluetoothEnumerateInstalledServices = NULL;
-
-HINSTANCE hid_lib = NULL;
-HINSTANCE bthprops_lib = NULL;
-
-static int initialized = 0;
-
-std::unordered_map<BTH_ADDR, std::time_t> g_connect_times;
-
-#ifdef SHARE_WRITE_WIIMOTES
-std::unordered_set<std::basic_string<TCHAR>> g_connected_wiimotes;
-std::mutex g_connected_wiimotes_lock;
-#endif
-
-inline void init_lib()
-{
-	if (!initialized)
-	{
-		hid_lib = LoadLibrary(_T("hid.dll"));
-		if (!hid_lib)
-		{
-			PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
-			return;
-		}
-
-		HidD_GetHidGuid = (PHidD_GetHidGuid)GetProcAddress(hid_lib, "HidD_GetHidGuid");
-		HidD_GetAttributes = (PHidD_GetAttributes)GetProcAddress(hid_lib, "HidD_GetAttributes");
-		HidD_SetOutputReport = (PHidD_SetOutputReport)GetProcAddress(hid_lib, "HidD_SetOutputReport");
-		HidD_GetProductString = (PHidD_GetProductString)GetProcAddress(hid_lib, "HidD_GetProductString");
-		if (!HidD_GetHidGuid || !HidD_GetAttributes ||
-			!HidD_SetOutputReport || !HidD_GetProductString)
-		{
-			PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
-			return;
-		}
-
-		bthprops_lib = LoadLibrary(_T("bthprops.cpl"));
-		if (!bthprops_lib)
-		{
-			PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
-			return;
-		}
-
-		Bth_BluetoothFindDeviceClose = (PBth_BluetoothFindDeviceClose)GetProcAddress(bthprops_lib, "BluetoothFindDeviceClose");
-		Bth_BluetoothFindFirstDevice = (PBth_BluetoothFindFirstDevice)GetProcAddress(bthprops_lib, "BluetoothFindFirstDevice");
-		Bth_BluetoothFindFirstRadio = (PBth_BluetoothFindFirstRadio)GetProcAddress(bthprops_lib, "BluetoothFindFirstRadio");
-		Bth_BluetoothFindNextDevice = (PBth_BluetoothFindNextDevice)GetProcAddress(bthprops_lib, "BluetoothFindNextDevice");
-		Bth_BluetoothFindNextRadio = (PBth_BluetoothFindNextRadio)GetProcAddress(bthprops_lib, "BluetoothFindNextRadio");
-		Bth_BluetoothFindRadioClose = (PBth_BluetoothFindRadioClose)GetProcAddress(bthprops_lib, "BluetoothFindRadioClose");
-		Bth_BluetoothGetRadioInfo = (PBth_BluetoothGetRadioInfo)GetProcAddress(bthprops_lib, "BluetoothGetRadioInfo");
-		Bth_BluetoothRemoveDevice = (PBth_BluetoothRemoveDevice)GetProcAddress(bthprops_lib, "BluetoothRemoveDevice");
-		Bth_BluetoothSetServiceState = (PBth_BluetoothSetServiceState)GetProcAddress(bthprops_lib, "BluetoothSetServiceState");
-		Bth_BluetoothAuthenticateDevice = (PBth_BluetoothAuthenticateDevice)GetProcAddress(bthprops_lib, "BluetoothAuthenticateDevice");
-		Bth_BluetoothEnumerateInstalledServices = (PBth_BluetoothEnumerateInstalledServices)GetProcAddress(bthprops_lib, "BluetoothEnumerateInstalledServices");
-
-		if (!Bth_BluetoothFindDeviceClose || !Bth_BluetoothFindFirstDevice ||
-			!Bth_BluetoothFindFirstRadio || !Bth_BluetoothFindNextDevice ||
-			!Bth_BluetoothFindNextRadio || !Bth_BluetoothFindRadioClose ||
-			!Bth_BluetoothGetRadioInfo || !Bth_BluetoothRemoveDevice ||
-			!Bth_BluetoothSetServiceState || !Bth_BluetoothAuthenticateDevice ||
-			!Bth_BluetoothEnumerateInstalledServices)
-		{
-			PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
-			return;
-		}
-
-		initialized = true;
-	}
-}
-
-namespace WiimoteReal
-{
-	
-	
-int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len);
-int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index);
-void _IOWakeup(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read);
-
-template <typename T>
-void ProcessWiimotes(bool new_scan, T& callback);
-
-bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT&);
-void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
-bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
-
-WiimoteScanner::WiimoteScanner()
-	: m_run_thread()
-	, m_want_wiimotes()
-{
-	init_lib();
-}
-
-WiimoteScanner::~WiimoteScanner()
-{
-	// TODO: what do we want here?
-#if 0
-	ProcessWiimotes(false, [](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-	{
-		RemoveWiimote(btdi);
-	});
-#endif
-}
-
-void WiimoteScanner::Update()
-{
-	bool forgot_some = false;
-
-	ProcessWiimotes(false, [&](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-	{
-		forgot_some |= ForgetWiimote(btdi);
-	});
-
-	// Some hacks that allows disconnects to be detected before connections are handled
-	// workaround for wiimote 1 moving to slot 2 on temporary disconnect
-	if (forgot_some)
-		SLEEP(100);
-}
-
-// Find and connect wiimotes.
-// Does not replace already found wiimotes even if they are disconnected.
-// wm is an array of max_wiimotes wiimotes
-// Returns the total number of found and connected wiimotes.
-void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
-{
-	ProcessWiimotes(true, [](HANDLE hRadio, const BLUETOOTH_RADIO_INFO& rinfo, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-	{
-		ForgetWiimote(btdi);
-		AttachWiimote(hRadio, rinfo, btdi);
-	});
-
-	// Get the device id
-	GUID device_id;
-	HidD_GetHidGuid(&device_id);
-
-	// Get all hid devices connected
-	HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
-
-	SP_DEVICE_INTERFACE_DATA device_data;
-	device_data.cbSize = sizeof(device_data);
-	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL;
-
-	for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data); ++index)
-	{
-		// Get the size of the data block required
-		DWORD len;
-		SetupDiGetDeviceInterfaceDetail(device_info, &device_data, NULL, 0, &len, NULL);
-		detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len);
-		detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-
-		// Query the data for this device
-		if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL))
-		{			
-			auto const wm = new Wiimote;
-			wm->devicepath = detail_data->DevicePath;
-			bool real_wiimote = false, is_bb = false;
-
-			CheckDeviceType(wm->devicepath, real_wiimote, is_bb);
-			if (is_bb)
-			{
-				found_board = wm;
-			}
-			else if (real_wiimote)
-			{
-				found_wiimotes.push_back(wm);
-			}
-			else
-			{
-				delete wm;
-			}
-		}
-
-		free(detail_data);
-	}
-
-	SetupDiDestroyDeviceInfoList(device_info);
-
-	// Don't mind me, just a random sleep to fix stuff on Windows
-	//if (!wiimotes.empty())
-	//	SLEEP(2000);
-
-}
-int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, int size, int attempts)
-{
-	OVERLAPPED hid_overlap_write = OVERLAPPED();
-	hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL);
-	enum win_bt_stack_t stack = MSBT_STACK_UNKNOWN;
-
-	DWORD written = 0;
-	
-	for (; attempts>0; --attempts)
-	{
-		if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, size))
-		{
-			auto const wait_result = WaitForSingleObject(hid_overlap_write.hEvent, WIIMOTE_DEFAULT_TIMEOUT);
-			if (WAIT_TIMEOUT == wait_result)
-			{
-				WARN_LOG(WIIMOTE, "CheckDeviceType_Write: A timeout occurred on writing to Wiimote.");
-				CancelIo(dev_handle);
-				continue;
-			}
-			else if (WAIT_FAILED == wait_result)
-			{
-				WARN_LOG(WIIMOTE, "CheckDeviceType_Write: A wait error occurred on writing to Wiimote.");
-				CancelIo(dev_handle);
-				continue;
-			}
-			if (GetOverlappedResult(dev_handle, &hid_overlap_write, &written, TRUE))
-			{
-				break;
-			}
-		}
-	}
-	
-	CloseHandle(hid_overlap_write.hEvent);
-
-	return written;
-}
-
-int CheckDeviceType_Read(HANDLE &dev_handle, u8* buf, int attempts)
-{
-	OVERLAPPED hid_overlap_read = OVERLAPPED();
-	hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL);
-	int read = 0;
-	for (; attempts>0; --attempts)
-	{
-		read = _IORead(dev_handle, hid_overlap_read, buf, 1);
-		if (read > 0)
-			break;
-	}
-	
-	CloseHandle(hid_overlap_read.hEvent);
-
-	return read;
-}
-
-// A convoluted way of checking if a device is a Wii Balance Board and if it is a connectable Wiimote.
-// Because nothing on Windows should be easy.
-// (We can't seem to easily identify the bluetooth device an HID device belongs to...)
-void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb)
-{
-	real_wiimote = false;
-	is_bb = false;
-	
-#ifdef SHARE_WRITE_WIIMOTES
-	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
-	if (g_connected_wiimotes.count(devicepath) != 0)
-		return;
-#endif
-	
-	HANDLE dev_handle = CreateFile(devicepath.c_str(),
-								GENERIC_READ | GENERIC_WRITE, 
-								FILE_SHARE_READ | FILE_SHARE_WRITE,
-								NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 
-								NULL);
-	if (dev_handle == INVALID_HANDLE_VALUE)
-		return;
-	// enable to only check for official nintendo wiimotes/bb's
-	bool check_vidpid = false;
-	HIDD_ATTRIBUTES attrib;
-	attrib.Size = sizeof(attrib);
-	if (!check_vidpid || 
-		(HidD_GetAttributes(dev_handle, &attrib) &&
-		(attrib.VendorID == 0x057e) &&
-		(attrib.ProductID == 0x0306)))
-	{
-		int rc = 0;
-		// max_cycles insures we are never stuck here due to bad coding...
-		int max_cycles = 20;
-		u8 buf[MAX_PAYLOAD] = {0};
-
-		u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
-		// The new way to initialize the extension is by writing 0x55 to 0x(4)A400F0, then writing 0x00 to 0x(4)A400FB
-		// 52 16 04 A4 00 F0 01 55
-		// 52 16 04 A4 00 FB 01 00
-		u8 const disable_enc_pt1_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xf0, 0x01, 0x55};
-		u8 const disable_enc_pt2_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xfb, 0x01, 0x00};
-
-		rc = CheckDeviceType_Write(dev_handle, 
-									disable_enc_pt1_report, 
-									sizeof(disable_enc_pt1_report), 
-									1);
-		rc = CheckDeviceType_Write(dev_handle, 
-									disable_enc_pt2_report, 
-									sizeof(disable_enc_pt2_report), 
-									1);
-		
-		rc = CheckDeviceType_Write(dev_handle, 
-									req_status_report, 
-									sizeof(req_status_report), 
-									1);
-
-		while (rc > 0 && --max_cycles > 0)
-		{
-			if ((rc = CheckDeviceType_Read(dev_handle, buf, 1)) <= 0)
-			{
-				// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Read failed...");
-				break;
-			}
-			
-			switch (buf[1])
-			{
-				case WM_STATUS_REPORT:
-				{
-					real_wiimote = true;
-					
-					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report");
-					wm_status_report * wsr = (wm_status_report*)&buf[2];
-					if (wsr->extension)
-					{
-						// Wiimote with extension, we ask it what kind.
-						u8 read_ext[MAX_PAYLOAD] = {0};
-						read_ext[0] = WM_SET_REPORT | WM_BT_OUTPUT;
-						read_ext[1] = WM_READ_DATA;
-						// Extension type register.
-						*(u32*)&read_ext[2] = Common::swap32(0x4a400fa);
-						// Size.
-						*(u16*)&read_ext[6] = Common::swap16(6);
-						rc = CheckDeviceType_Write(dev_handle, read_ext, 8, 1);
-					}
-					else
-					{
-						// Normal Wiimote, exit while and be happy.
-						rc = -1;
-					}
-					break;
-				}
-				case WM_ACK_DATA:
-				{
-					real_wiimote = true;
-					//wm_acknowledge * wm = (wm_acknowledge*)&buf[2];
-					//DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack Error: %X ReportID: %X", wm->errorID, wm->reportID);
-					break;
-				}
-				case WM_READ_DATA_REPLY:
-				{
-					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Data Reply");
-					wm_read_data_reply * wrdr 
-						= (wm_read_data_reply*)&buf[2];
-					// Check if it has returned what we asked.
-					if (Common::swap16(wrdr->address) == 0x00fa)
-					{
-						real_wiimote = true;
-						// 0x020420A40000ULL means balance board.
-						u64 ext_type = (*(u64*)&wrdr->data[0]);
-						// DEBUG_LOG(WIIMOTE, 
-						//		  "CheckDeviceType: GOT EXT TYPE %llX", 
-						//		  ext_type);
-						is_bb = (ext_type == 0x020420A40000ULL);
-					}
-					else
-					{
-						ERROR_LOG(WIIMOTE, 
-								  "CheckDeviceType: GOT UNREQUESTED ADDRESS %X", 
-								  Common::swap16(wrdr->address));
-					}
-					// force end
-					rc = -1;
-
-					break;
-				}
-				default:
-				{
-					// We let read try again incase there is another packet waiting.
-					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: GOT UNKNOWN REPLY: %X", buf[1]);
-					break;
-				}
-			}
-		}
-	}
-	CloseHandle(dev_handle);
-}
-
-bool WiimoteScanner::IsReady() const
-{
-	// TODO: don't search for a radio each time
-	
-	BLUETOOTH_FIND_RADIO_PARAMS radioParam;
-	radioParam.dwSize = sizeof(radioParam);
-
-	HANDLE hRadio;
-	HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio);
-
-	if (NULL != hFindRadio)
-	{
-		Bth_BluetoothFindRadioClose(hFindRadio);
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-// Connect to a wiimote with a known device path.
-bool Wiimote::ConnectInternal()
-{
-	if (IsConnected())
-		return false;
-
-#ifdef SHARE_WRITE_WIIMOTES
-	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
-	if (g_connected_wiimotes.count(devicepath) != 0)
-		return false;
-
-	auto const open_flags = FILE_SHARE_READ | FILE_SHARE_WRITE;
-#else
-	// Having no FILE_SHARE_WRITE disallows us from connecting to the same wiimote twice.
-	// (And disallows using wiimotes in use by other programs)
-	// This is what "WiiYourself" does.
-	// Apparently this doesn't work for everyone. It might be their fault.
-	auto const open_flags = FILE_SHARE_READ;
-#endif
-
-	dev_handle = CreateFile(devicepath.c_str(),
-		GENERIC_READ | GENERIC_WRITE, open_flags,
-		NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
-
-	if (dev_handle == INVALID_HANDLE_VALUE)
-	{
-		dev_handle = 0;
-		return false;
-	}
-
-#if 0
-	TCHAR name[128] = {};
-	HidD_GetProductString(dev_handle, name, 128);
-
-	//ERROR_LOG(WIIMOTE, "Product string: %s", TStrToUTF8(name).c_str());
-
-	if (!IsValidBluetoothName(TStrToUTF8(name)))
-	{
-		CloseHandle(dev_handle);
-		dev_handle = 0;
-		return false;
-	}
-#endif
-
-#if 0
-	HIDD_ATTRIBUTES attr;
-	attr.Size = sizeof(attr);
-	if (!HidD_GetAttributes(dev_handle, &attr))
-	{
-		CloseHandle(dev_handle);
-		dev_handle = 0;
-		return false;
-	}
-#endif
-
-	// TODO: thread isn't started here now, do this elsewhere
-	// This isn't as drastic as it sounds, since the process in which the threads
-	// reside is normal priority. Needed for keeping audio reports at a decent rate
-/*
-	if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL))
-	{
-		ERROR_LOG(WIIMOTE, "Failed to set Wiimote thread priority");
-	}
-*/
-#ifdef SHARE_WRITE_WIIMOTES
-	g_connected_wiimotes.insert(devicepath);
-#endif
-
-	return true;
-}
-
-void Wiimote::DisconnectInternal()
-{
-	if (!IsConnected())
-		return;
-
-	CloseHandle(dev_handle);
-	dev_handle = 0;
-
-#ifdef SHARE_WRITE_WIIMOTES
-	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
-	g_connected_wiimotes.erase(devicepath);
-#endif
-}
-
-void Wiimote::InitInternal()
-{
-	dev_handle = 0;
-	stack = MSBT_STACK_UNKNOWN;
-
-	hid_overlap_read = OVERLAPPED();
-	hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL);
-
-	hid_overlap_write = OVERLAPPED();
-	hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL);
-}
-
-void Wiimote::TeardownInternal()
-{
-	CloseHandle(hid_overlap_read.hEvent);
-	CloseHandle(hid_overlap_write.hEvent);
-}
-
-bool Wiimote::IsConnected() const
-{
-	return dev_handle != 0;
-}
-
-void _IOWakeup(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read)
-{
-	SetEvent(hid_overlap_read.hEvent);
-}
-
-// positive = read packet
-// negative = didn't read packet
-// zero = error
-int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index)
-{
-	// Add data report indicator byte (here, 0xa1)
-	buf[0] = 0xa1;
-	// Used below for a warning
-	buf[1] = 0;
-	
-	DWORD bytes = 0;
-	ResetEvent(hid_overlap_read.hEvent);
-	if (!ReadFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read))
-	{
-		auto const read_err = GetLastError();
-
-		if (ERROR_IO_PENDING == read_err)
-		{
-			auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, INFINITE);
-
-			// In case the event was signalled by _IOWakeup before the read completed, cancel it.
-			CancelIo(dev_handle);
-
-			if (WAIT_FAILED == wait_result)
-			{
-				WARN_LOG(WIIMOTE, "A wait error occurred on reading from Wiimote %i.", index + 1);
-			}
-
-			if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, FALSE))
-			{
-				auto const overlapped_err = GetLastError();
-
-				if (ERROR_OPERATION_ABORTED == overlapped_err)
-				{
-					// It was.
-					return -1;
-				}
-
-				WARN_LOG(WIIMOTE, "GetOverlappedResult error %d on Wiimote %i.", overlapped_err, index + 1);
-				return 0;
-			}
-		}
-		else
-		{
-			WARN_LOG(WIIMOTE, "ReadFile error %d on Wiimote %i.", read_err, index + 1);
-			return 0;
-		}
-	}
-
-	WiimoteEmu::Spy(NULL, buf, bytes + 1);
-
-	return bytes + 1;
-}
-
-void Wiimote::IOWakeup()
-{
-	_IOWakeup(dev_handle, hid_overlap_read);
-}
-
-
-// positive = read packet
-// negative = didn't read packet
-// zero = error
-int Wiimote::IORead(u8* buf)
-{
-	return _IORead(dev_handle, hid_overlap_read, buf, index);
-}
-
-
-int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len)
-{
-	WiimoteEmu::Spy(NULL, buf, len);
-
-	switch (stack)
-	{
-		case MSBT_STACK_UNKNOWN:
-		{
-			// Try to auto-detect the stack type
-			stack = MSBT_STACK_BLUESOLEIL;
-			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len))
-				return 1;
-			
-			stack = MSBT_STACK_MS;
-			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len))
-				return 1;
-			
-			stack = MSBT_STACK_UNKNOWN;
-			break;
-		}
-		case MSBT_STACK_MS:
-		{
-			auto result = HidD_SetOutputReport(dev_handle, const_cast<u8*>(buf) + 1, len - 1);
-			//FlushFileBuffers(dev_handle);
-			
-			if (!result)
-			{
-				auto err = GetLastError();
-				if (err == 121)
-				{
-					// Semaphore timeout
-					NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to the Wiimote");
-				}
-				else
-				{
-					WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err);
-				}
-			}
-			
-			return result;
-			break;
-		}
-		case MSBT_STACK_BLUESOLEIL:
-		{
-			u8 big_buf[MAX_PAYLOAD];
-			if (len < MAX_PAYLOAD)
-			{
-				std::copy(buf, buf + len, big_buf);
-				std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0);
-				buf = big_buf;
-			}
-			
-			ResetEvent(hid_overlap_write.hEvent);
-			DWORD bytes = 0;
-			if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write))
-			{
-				// WriteFile always returns true with bluesoleil.
-				return 1;
-			}
-			else
-			{
-				auto const err = GetLastError();
-				if (ERROR_IO_PENDING == err)
-				{
-					CancelIo(dev_handle);
-				}
-			}
-			break;
-		}
-	}
-	
-	return 0;
-}
-
-int Wiimote::IOWrite(const u8* buf, int len)
-{
-	return _IOWrite(dev_handle, hid_overlap_write, stack, buf, len);
-}
-
-// invokes callback for each found wiimote bluetooth device
-template <typename T>
-void ProcessWiimotes(bool new_scan, T& callback)
-{
-	BLUETOOTH_DEVICE_SEARCH_PARAMS srch;
-	srch.dwSize = sizeof(srch);
-	srch.fReturnAuthenticated = true;
-	srch.fReturnRemembered = true;
-	// Does not filter properly somehow, so we need to do an additional check on
-	// fConnected BT Devices
-	srch.fReturnConnected = true;
-	srch.fReturnUnknown = true;
-	srch.fIssueInquiry = new_scan;
-	// multiple of 1.28 seconds
-	srch.cTimeoutMultiplier = 2;
-
-	BLUETOOTH_FIND_RADIO_PARAMS radioParam;
-	radioParam.dwSize = sizeof(radioParam);
-	
-	HANDLE hRadio;
-	
-	// TODO: save radio(s) in the WiimoteScanner constructor?
-
-	// Enumerate BT radios
-	HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio);
-	while (hFindRadio)
-	{
-		BLUETOOTH_RADIO_INFO radioInfo;
-		radioInfo.dwSize = sizeof(radioInfo);
-
-		auto const rinfo_result = Bth_BluetoothGetRadioInfo(hRadio, &radioInfo);
-		if (ERROR_SUCCESS == rinfo_result)
-		{
-			srch.hRadio = hRadio;
-
-			BLUETOOTH_DEVICE_INFO btdi;
-			btdi.dwSize = sizeof(btdi);
-
-			// Enumerate BT devices
-			HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi);
-			while (hFindDevice)
-			{
-				// btdi.szName is sometimes missing it's content - it's a bt feature..
-				DEBUG_LOG(WIIMOTE, "Authenticated %i connected %i remembered %i ",
-						btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered);
-
-				if (IsValidBluetoothName(UTF16ToUTF8(btdi.szName)))
-				{
-					callback(hRadio, radioInfo, btdi);
-				}
-
-				if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi))
-				{
-					Bth_BluetoothFindDeviceClose(hFindDevice);
-					hFindDevice = NULL;
-				}
-			}
-		}
-
-		if (false == Bth_BluetoothFindNextRadio(hFindRadio, &hRadio))
-		{
-			Bth_BluetoothFindRadioClose(hFindRadio);
-			hFindRadio = NULL;
-		}
-	}
-}
-
-void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-{
-	//if (btdi.fConnected)
-	{
-		if (SUCCEEDED(Bth_BluetoothRemoveDevice(&btdi.Address)))
-		{
-			NOTICE_LOG(WIIMOTE, "Removed BT Device", GetLastError());
-		}
-	}
-}
-
-bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-{
-	// We don't want "remembered" devices.
-	// SetServiceState will just fail with them..
-	if (!btdi.fConnected && !btdi.fRemembered)
-	{
-		auto const& wm_addr = btdi.Address.rgBytes;
-
-		NOTICE_LOG(WIIMOTE, "Found Wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.",
-			wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]);
-
-#if defined(AUTHENTICATE_WIIMOTES)
-		// Authenticate
-		auto const& radio_addr = radio_info.address.rgBytes;
-		const DWORD auth_result = Bth_BluetoothAuthenticateDevice(NULL, hRadio, &btdi,
-			std::vector<WCHAR>(radio_addr, radio_addr + 6).data(), 6);
-
-		if (ERROR_SUCCESS != auth_result)
-			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothAuthenticateDevice returned %08x", auth_result);
-
-		DWORD pcServices = 16;
-		GUID guids[16];
-		// If this is not done, the Wii device will not remember the pairing
-		const DWORD srv_result = Bth_BluetoothEnumerateInstalledServices(hRadio, &btdi, &pcServices, guids);
-
-		if (ERROR_SUCCESS != srv_result)
-			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothEnumerateInstalledServices returned %08x", srv_result);
-#endif
-		// Activate service
-		const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi,
-			&HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE);
-
-		g_connect_times[btdi.Address.ullLong] = std::time(nullptr);
-
-		if (FAILED(hr))
-			ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothSetServiceState returned %08x", hr);
-		else
-			return true;
-	}
-
-	return false;
-}
-
-// Removes remembered non-connected devices
-bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
-{
-	if (!btdi.fConnected && btdi.fRemembered)
-	{
-		// Time to avoid RemoveDevice after SetServiceState.
-		// Sometimes SetServiceState takes a while..
-		auto const avoid_forget_seconds = 5.0;
-
-		auto pair_time = g_connect_times.find(btdi.Address.ullLong);
-		if (pair_time == g_connect_times.end()
-			|| std::difftime(time(nullptr), pair_time->second) >= avoid_forget_seconds)
-		{
-			// Make Windows forget about device so it will re-find it if visible.
-			// This is also required to detect a disconnect for some reason..
-			NOTICE_LOG(WIIMOTE, "Removing remembered Wiimote.");
-			Bth_BluetoothRemoveDevice(&btdi.Address);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-};
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
deleted file mode 100644
index 4f015866bc..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ /dev/null
@@ -1,329 +0,0 @@
-#define BLUETOOTH_VERSION_USE_CURRENT
-#import <IOBluetooth/IOBluetooth.h>
-
-#include "Common.h"
-#include "WiimoteReal.h"
-
-@interface SearchBT: NSObject {
-@public
-	unsigned int maxDevices;
-	bool done;
-}
-@end
-
-@implementation SearchBT
-- (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender
-	error: (IOReturn) error
-	aborted: (BOOL) aborted
-{
-	done = true;
-	CFRunLoopStop(CFRunLoopGetCurrent());
-}
-
-- (void) deviceInquiryDeviceFound: (IOBluetoothDeviceInquiry *) sender
-	device: (IOBluetoothDevice *) device
-{
-	NOTICE_LOG(WIIMOTE, "Discovered bluetooth device at %s: %s",
-		[[device addressString] UTF8String],
-		[[device name] UTF8String]);
-
-	if ([[sender foundDevices] count] == maxDevices)
-		[sender stop];
-}
-@end
-
-@interface ConnectBT: NSObject {}
-@end
-
-@implementation ConnectBT
-- (void) l2capChannelData: (IOBluetoothL2CAPChannel *) l2capChannel
-	data: (unsigned char *) data
-	length: (NSUInteger) length
-{
-	IOBluetoothDevice *device = [l2capChannel device];
-	WiimoteReal::Wiimote *wm = NULL;
-	
-	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
-
-	for (int i = 0; i < MAX_WIIMOTES; i++)
-	{
-		if (WiimoteReal::g_wiimotes[i] == NULL)
-			continue;
-		if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE)
-			wm = WiimoteReal::g_wiimotes[i];
-	}
-
-	if (wm == NULL) {
-		ERROR_LOG(WIIMOTE, "Received packet for unknown wiimote");
-		return;
-	}
-
-	if (length > MAX_PAYLOAD) {
-		WARN_LOG(WIIMOTE, "Dropping packet for wiimote %i, too large",
-				wm->index + 1);
-		return;
-	}
-
-	if (wm->inputlen != -1) {
-		WARN_LOG(WIIMOTE, "Dropping packet for wiimote %i, queue full",
-				wm->index + 1);
-		return;
-	}
-
-	memcpy(wm->input, data, length);
-	wm->inputlen = length;
-
-	(void)UpdateSystemActivity(UsrActivity);
-	CFRunLoopStop(CFRunLoopGetCurrent());
-}
-
-- (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
-{
-	IOBluetoothDevice *device = [l2capChannel device];
-	WiimoteReal::Wiimote *wm = NULL;
-	
-	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
-
-	for (int i = 0; i < MAX_WIIMOTES; i++)
-	{
-		if (WiimoteReal::g_wiimotes[i] == NULL)
-			continue;
-		if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE)
-			wm = WiimoteReal::g_wiimotes[i];
-	}
-
-	if (wm == NULL) {
-		ERROR_LOG(WIIMOTE, "Channel for unknown wiimote was closed");
-		return;
-	}
-
-	WARN_LOG(WIIMOTE, "Lost channel to wiimote %i", wm->index + 1);
-
-	wm->DisconnectInternal();
-}
-@end
-
-namespace WiimoteReal
-{
-
-WiimoteScanner::WiimoteScanner()
-	: m_run_thread()
-	, m_want_wiimotes()
-{}
-
-WiimoteScanner::~WiimoteScanner()
-{}
-
-void WiimoteScanner::Update()
-{}
-
-void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
-{
-	// TODO: find the device in the constructor and save it for later
-	IOBluetoothHostController *bth;
-	IOBluetoothDeviceInquiry *bti;
-	SearchBT *sbt;
-	NSEnumerator *en;
-	found_board = NULL;
-
-	bth = [[IOBluetoothHostController alloc] init];
-	if ([bth addressAsString] == nil)
-	{
-		WARN_LOG(WIIMOTE, "No bluetooth host controller");
-		[bth release];
-		return;
-	}
-
-	sbt = [[SearchBT alloc] init];
-	sbt->maxDevices = 32;
-	bti = [[IOBluetoothDeviceInquiry alloc] init];
-	[bti setDelegate: sbt];
-	[bti setInquiryLength: 2];
-
-	if ([bti start] != kIOReturnSuccess)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to do bluetooth discovery");
-		return;
-	}
-
-	do
-	{
-		CFRunLoopRun();
-	}
-	while(!sbt->done);
-
-	int found_devices = [[bti foundDevices] count];
-
-	if (found_devices)
-		NOTICE_LOG(WIIMOTE, "Found %i bluetooth devices", found_devices);
-
-	en = [[bti foundDevices] objectEnumerator];
-	for (int i = 0; i < found_devices; i++)
-	{
-		IOBluetoothDevice *dev = [en nextObject];
-		if (!IsValidBluetoothName([[dev name] UTF8String]))
-			continue;
-
-		Wiimote *wm = new Wiimote();
-		wm->btd = [dev retain];
-		
-		if(IsBalanceBoardName([[dev name] UTF8String]))
-		{
-			found_board = wm;
-		}
-		else
-		{
-			found_wiimotes.push_back(wm);
-		}
-	}
-
-	[bth release];
-	[bti release];
-	[sbt release];
-}
-
-bool WiimoteScanner::IsReady() const
-{
-	// TODO: only return true when a BT device is present
-	return true;
-}
-
-void Wiimote::InitInternal()
-{
-	inputlen = 0;
-	m_connected = false;
-	m_wiimote_thread_run_loop = NULL;
-	btd = nil;
-}
-
-void Wiimote::TeardownInternal()
-{
-	if (m_wiimote_thread_run_loop)
-	{
-		CFRelease(m_wiimote_thread_run_loop);
-		m_wiimote_thread_run_loop = NULL;
-	}
-	[btd release];
-	btd = nil;
-}
-
-// Connect to a wiimote with a known address.
-bool Wiimote::ConnectInternal()
-{
-	if (IsConnected())
-		return false;
-
-	ConnectBT *cbt = [[ConnectBT alloc] init];
-
-	cchan = ichan = nil;
-
-	IOReturn ret = [btd openConnection];
-	if (ret)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to open Bluetooth connection to wiimote %i: %x",
-		          index + 1, ret);
-		return false;
-	}
-
-	ret = [btd openL2CAPChannelSync: &cchan
-	           withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt];
-	if (ret)
-	{
-		ERROR_LOG(WIIMOTE, "Unable to open control channel for wiimote %i: %x",
-		          index + 1, ret);
-		goto bad;
-	}
-	// Apple docs claim:
-	// "The L2CAP channel object is already retained when this function returns
-	// success; the channel must be released when the caller is done with it."
-	// But without this, the channels get over-autoreleased, even though the
-	// refcounting behavior here is clearly correct.
-	[cchan retain];
-
-	ret = [btd openL2CAPChannelSync: &ichan
-	           withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt];
-	if (ret)
-	{
-		WARN_LOG(WIIMOTE, "Unable to open interrupt channel for wiimote %i: %x",
-		         index + 1, ret);
-		goto bad;
-	}
-	[ichan retain];
-
-	NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s",
-	           index + 1, [[btd addressString] UTF8String]);
-
-	m_connected = true;
-
-	[cbt release];
-
-	m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent());
-
-	return true;
-
-bad:
-	DisconnectInternal();
-	[cbt release];
-	return false;
-}
-
-// Disconnect a wiimote.
-void Wiimote::DisconnectInternal()
-{
-	[ichan closeChannel];
-	[ichan release];
-	ichan = nil;
-
-	[cchan closeChannel];
-	[cchan release];
-	cchan = nil;
-
-	[btd closeConnection];
-
-	if (!IsConnected())
-		return;
-
-	NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1);
-
-	m_connected = false;
-}
-
-bool Wiimote::IsConnected() const
-{
-	return m_connected;
-}
-
-void Wiimote::IOWakeup()
-{
-	if (m_wiimote_thread_run_loop)
-	{
-		CFRunLoopStop(m_wiimote_thread_run_loop);
-	}
-}
-
-int Wiimote::IORead(unsigned char *buf)
-{
-	input = buf;
-	inputlen = -1;
-
-	CFRunLoopRun();
-
-	return inputlen;
-}
-
-int Wiimote::IOWrite(const unsigned char *buf, int len)
-{
-	IOReturn ret;
-
-	if (!IsConnected())
-		return 0;
-
-	ret = [ichan writeAsync: const_cast<void*>((void *)buf) length: len refcon: nil];
-
-	if (ret == kIOReturnSuccess)
-		return len;
-	else
-		return 0;
-}
-
-};
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
deleted file mode 100644
index e4e965400c..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef WIIMOTE_REAL_H
-#define WIIMOTE_REAL_H
-
-#include <functional>
-#include <vector>
-
-#include "WiimoteRealBase.h"
-#include "ChunkFile.h"
-#include "Thread.h"
-#include "FifoQueue.h"
-#include "Timer.h"
-
-#include "../Wiimote.h"
-#include "../WiimoteEmu/WiimoteEmu.h"
-
-#include "../../InputCommon/Src/InputConfig.h"
-
-typedef std::vector<u8> Report;
-
-namespace WiimoteReal
-{
-
-class Wiimote : NonCopyable
-{
-friend class WiimoteEmu::Wiimote;
-public:
-	Wiimote();
-	~Wiimote();
-
-	void ControlChannel(const u16 channel, const void* const data, const u32 size);
-	void InterruptChannel(const u16 channel, const void* const data, const u32 size);
-	void Update();
-
-	const Report& ProcessReadQueue();
-
-	bool Read();
-	bool Write();
-
-	void StartThread();
-	void StopThread();
-
-	// "handshake" / stop packets
-	void EmuStart();
-	void EmuStop();
-	void EmuResume();
-	void EmuPause();
-
-	// connecting and disconnecting from physical devices
-	// (using address inserted by FindWiimotes)
-	// these are called from the wiimote's thread.
-	bool ConnectInternal();
-	void DisconnectInternal();
-
-	void InitInternal();
-	void TeardownInternal();
-
-	bool Connect();
-
-	// TODO: change to something like IsRelevant
-	bool IsConnected() const;
-
-	void Prepare(int index);
-	bool PrepareOnThread();
-
-	void DisableDataReporting();
-	void EnableDataReporting(u8 mode);
-	void SetChannel(u16 channel);
-	
-	void QueueReport(u8 rpt_id, const void* data, unsigned int size);
-
-	int index;
-
-#if defined(__APPLE__)
-	IOBluetoothDevice *btd;
-	IOBluetoothL2CAPChannel *ichan;
-	IOBluetoothL2CAPChannel *cchan;
-	unsigned char* input;
-	int inputlen;
-	bool m_connected;
-	CFRunLoopRef m_wiimote_thread_run_loop;
-#elif defined(__linux__) && HAVE_BLUEZ
-	bdaddr_t bdaddr;					// Bluetooth address
-	int cmd_sock;						// Command socket
-	int int_sock;						// Interrupt socket
-	int wakeup_pipe_w, wakeup_pipe_r;
-
-#elif defined(_WIN32)
-	std::basic_string<TCHAR> devicepath;	// Unique wiimote reference
-	//ULONGLONG btaddr;					// Bluetooth address
-	HANDLE dev_handle;					// HID handle
-	OVERLAPPED hid_overlap_read, hid_overlap_write;	// Overlap handle
-	enum win_bt_stack_t stack;			// Type of bluetooth stack to use
-#endif
-
-protected:
-	Report m_last_input_report;
-	u16	m_channel;
-
-private:
-	void ClearReadQueue();
-	void WriteReport(Report rpt);
-	
-	int IORead(u8* buf);
-	int IOWrite(u8 const* buf, int len);
-	void IOWakeup();
-
-	void ThreadFunc();
-	void SetReady();
-	void WaitReady();
-
-	bool m_rumble_state;
-	
-	std::thread               m_wiimote_thread;
-	// Whether to keep running the thread.
-	volatile bool             m_run_thread;
-	// Whether to call PrepareOnThread.
-	volatile bool             m_need_prepare;
-	// Whether the thread has finished ConnectInternal.
-	volatile bool             m_thread_ready;
-	std::mutex                m_thread_ready_mutex;
-	std::condition_variable   m_thread_ready_cond;
-
-	Common::FifoQueue<Report>	m_read_reports;
-	Common::FifoQueue<Report>	m_write_reports;
-	
-	Common::Timer m_last_audio_report;
-};
-
-class WiimoteScanner
-{
-public:
-	WiimoteScanner();
-	~WiimoteScanner();
-
-	bool IsReady() const;
-	
-	void WantWiimotes(bool do_want);
-	void WantBB(bool do_want);
-
-	void StartScanning();
-	void StopScanning();
-
-	void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&);
-
-	// function called when not looking for more wiimotes
-	void Update();
-
-private:
-	void ThreadFunc();
-
-	std::thread m_scan_thread;
-
-	volatile bool m_run_thread;
-	volatile bool m_want_wiimotes;
-	volatile bool m_want_bb;
-
-#if defined(_WIN32)
-	void CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb);
-#elif defined(__linux__) && HAVE_BLUEZ
-	int device_id;
-	int device_sock;
-#endif
-};
-
-extern std::recursive_mutex g_refresh_lock;
-extern WiimoteScanner g_wiimote_scanner;
-extern Wiimote *g_wiimotes[MAX_BBMOTES];
-
-void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
-void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
-void Update(int _WiimoteNumber);
-
-void DoState(PointerWrap &p);
-void StateChange(EMUSTATE_CHANGE newState);
-
-int FindWiimotes(Wiimote** wm, int max_wiimotes);
-void ChangeWiimoteSource(unsigned int index, int source);
-
-bool IsValidBluetoothName(const std::string& name);
-bool IsBalanceBoardName(const std::string& name);
-
-}; // WiimoteReal
-
-#endif
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
deleted file mode 100644
index 0ad78610fe..0000000000
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef WIIMOTE_COMM_H
-#define WIIMOTE_COMM_H
-
-#ifdef _WIN32
-	#include <windows.h>
-#elif defined(__APPLE__)
-	#import <IOBluetooth/IOBluetooth.h>
-#elif defined(__linux__) && HAVE_BLUEZ
-	#include <bluetooth/bluetooth.h>
-#endif
-
-// Wiimote internal codes
-
-// Communication channels
-#define WM_OUTPUT_CHANNEL			0x11
-#define WM_INPUT_CHANNEL			0x13
-
-// The 4 most significant bits of the first byte of an outgoing command must be
-// 0x50 if sending on the command channel and 0xA0 if sending on the interrupt
-// channel. On Mac and Linux we use interrupt channel; on Windows, command.
-#ifdef _WIN32
-#define WM_SET_REPORT				0x50
-#else
-#define WM_SET_REPORT				0xA0
-#endif
-
-#define WM_BT_INPUT					0x01
-#define WM_BT_OUTPUT				0x02
-
-// LED bit masks
-#define WIIMOTE_LED_NONE			0x00
-#define WIIMOTE_LED_1				0x10
-#define WIIMOTE_LED_2				0x20
-#define WIIMOTE_LED_3				0x40
-#define WIIMOTE_LED_4				0x80
-
-// End Wiimote internal codes
-
-// It's 23. NOT 32!
-#define MAX_PAYLOAD					23
-#define WIIMOTE_DEFAULT_TIMEOUT		1000
-
-#ifdef _WIN32
-// Available bluetooth stacks for Windows.
-enum win_bt_stack_t
-{
-	MSBT_STACK_UNKNOWN,
-	MSBT_STACK_MS,
-	MSBT_STACK_BLUESOLEIL
-};
-#endif
-
-#endif // WIIMOTE_COMM_H
diff --git a/Source/Core/Core/Src/Host.h b/Source/Core/Core/Src/Host.h
deleted file mode 100644
index bb2c9af8aa..0000000000
--- a/Source/Core/Core/Src/Host.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _HOST_H
-#define _HOST_H
-
-
-// Host - defines an interface for the emulator core to communicate back to the
-// OS-specific layer
-
-// The emulator core is abstracted from the OS using 2 interfaces:
-// Common and Host.
-
-// Common simply provides OS-neutral implementations of things like threads, mutexes,
-// INI file manipulation, memory mapping, etc. 
-
-// Host is an abstract interface for communicating things back to the host. The emulator
-// core is treated as a library, not as a main program, because it is far easier to
-// write GUI interfaces that control things than to squash GUI into some model that wasn't
-// designed for it.
-
-// The host can be just a command line app that opens a window, or a full blown debugger
-// interface.
-
-bool Host_RendererHasFocus();
-void Host_ConnectWiimote(int wm_idx, bool connect);
-bool Host_GetKeyState(int keycode);
-void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height);
-void Host_Message(int Id);
-void Host_NotifyMapLoaded();
-void Host_RefreshDSPDebuggerWindow();
-void Host_RequestRenderWindowSize(int width, int height);
-void Host_SetStartupDebuggingParameters();
-void Host_SetWiiMoteConnectionState(int _State);
-void Host_ShowJitResults(unsigned int address);
-void Host_SysMessage(const char *fmt, ...);
-void Host_UpdateBreakPointView();
-void Host_UpdateDisasmDialog();
-void Host_UpdateLogDisplay();
-void Host_UpdateMainFrame();
-void Host_UpdateStatusBar(const char* _pText, int Filed = 0);
-void Host_UpdateTitle(const char* title);
-
-// TODO (neobrain): Remove these from host!
-void* Host_GetInstance();
-void* Host_GetRenderHandle();
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/ICMP.h b/Source/Core/Core/Src/IPC_HLE/ICMP.h
deleted file mode 100644
index b446c63336..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/ICMP.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ICMP_H_
-#define _ICMP_H_
-
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-
-#include "Common.h"
-
-int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length);
-int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 data_length);
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
deleted file mode 100644
index 31baf28abb..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-/*
-This is the main Wii IPC file that handles all incoming IPC calls and directs them
-to the right function.
-
-IPC basics (IOS' usage):
-
-Return values for file handles: All IPC calls will generate a return value to 0x04,
-in case of success they are
-	Open: DeviceID
-	Close: 0
-	Read: Bytes read
-	Write: Bytes written
-	Seek: Seek position
-	Ioctl: 0 (in addition to that there may be messages to the out buffers)
-	Ioctlv: 0 (in addition to that there may be messages to the out buffers)
-They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp.
-*/
-
-#include <map>
-#include <string>
-#include <list>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Thread.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device.h"
-#include "WII_IPC_HLE_Device_DI.h"
-#include "WII_IPC_HLE_Device_FileIO.h"
-#include "WII_IPC_HLE_Device_stm.h"
-#include "WII_IPC_HLE_Device_fs.h"
-#include "WII_IPC_HLE_Device_net.h"
-#include "WII_IPC_HLE_Device_net_ssl.h"
-#include "WII_IPC_HLE_Device_es.h"
-#include "WII_IPC_HLE_Device_usb.h"
-#include "WII_IPC_HLE_Device_usb_kbd.h"
-#include "WII_IPC_HLE_Device_sdio_slot0.h"
-
-#if defined(__LIBUSB__) || defined (_WIN32)
-	#include "WII_IPC_HLE_Device_hid.h"
-#endif
-
-#include "FileUtil.h" // For Copy
-#include "../ConfigManager.h"
-#include "../HW/CPU.h"
-#include "../HW/Memmap.h"
-#include "../HW/WII_IPC.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../HW/SystemTimers.h"
-#include "CoreTiming.h"
-
-
-namespace WII_IPC_HLE_Interface
-{
-
-typedef std::map<u32, IWII_IPC_HLE_Device*> TDeviceMap;
-TDeviceMap g_DeviceMap;
-
-// STATE_TO_SAVE
-typedef std::map<u32, std::string> TFileNameMap;
-
-#define IPC_MAX_FDS 0x18
-#define ES_MAX_COUNT 2
-IWII_IPC_HLE_Device* g_FdMap[IPC_MAX_FDS];
-bool es_inuse[ES_MAX_COUNT];
-IWII_IPC_HLE_Device* es_handles[ES_MAX_COUNT];
-
-
-typedef std::deque<u32> ipc_msg_queue;
-static ipc_msg_queue request_queue;	// ppc -> arm
-static ipc_msg_queue reply_queue;	// arm -> ppc
-static std::mutex s_reply_queue;
-
-static int enque_reply;
-
-static u64 last_reply_time;
-
-void EnqueReplyCallback(u64 userdata, int)
-{
-	std::lock_guard<std::mutex> lk(s_reply_queue);
-	reply_queue.push_back(userdata);
-}
-
-void Init()
-{
-
-	_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
-	CWII_IPC_HLE_Device_es::m_ContentFile = "";
-	u32 i;
-	for (i=0; i<IPC_MAX_FDS; i++)
-	{
-		g_FdMap[i] = NULL;
-	}
-
-	i = 0;
-	// Build hardware devices
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_oh1_57e_305(i, std::string("/dev/usb/oh1/57e/305")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_immediate(i, std::string("/dev/stm/immediate")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_eventhook(i, std::string("/dev/stm/eventhook")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_fs(i, std::string("/dev/fs")); i++;
-
-	// IOS allows two ES devices at a time<
-	u32 j;
-	for (j=0; j<ES_MAX_COUNT; j++)
-	{
-		g_DeviceMap[i] = es_handles[j] = new CWII_IPC_HLE_Device_es(i, std::string("/dev/es")); i++;
-		es_inuse[j] = false;
-	}
-
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_di(i, std::string("/dev/di")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_kd_request(i, std::string("/dev/net/kd/request")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_kd_time(i, std::string("/dev/net/kd/time")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ncd_manage(i, std::string("/dev/net/ncd/manage")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_wd_command(i, std::string("/dev/net/wd/command")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ip_top(i, std::string("/dev/net/ip/top")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ssl(i, std::string("/dev/net/ssl")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++;
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/sdio/slot1")); i++;
-	#if  defined(__LIBUSB__) || defined(_WIN32)
-		g_DeviceMap[i] = new CWII_IPC_HLE_Device_hid(i, std::string("/dev/usb/hid")); i++;
-	#else
-        g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++;
-	#endif
-	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++;
-	g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); i++;
-
-	enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback);
-}
-
-void Reset(bool _bHard)
-{
-
-	CoreTiming::RemoveAllEvents(enque_reply);
-
-	u32 i;
-	for (i=0; i<IPC_MAX_FDS; i++)
-	{
-		if (g_FdMap[i] != NULL && !g_FdMap[i]->IsHardware())
-		{
-			// close all files and delete their resources
-			g_FdMap[i]->Close(0, true);
-			delete g_FdMap[i];
-		}
-		g_FdMap[i] = NULL;
-	}
-
-	u32 j;
-	for (j=0; j<ES_MAX_COUNT; j++)
-	{
-		es_inuse[j] = false;
-	}
-
-	TDeviceMap::iterator itr = g_DeviceMap.begin();
-	while (itr != g_DeviceMap.end())
-	{
-		if (itr->second)
-		{
-			// Force close
-			itr->second->Close(0, true);
-			// Hardware should not be deleted unless it is a hard reset
-			if (_bHard)
-				delete itr->second;
-		}
-		++itr;
-	}
-	if (_bHard)
-	{
-		g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end());
-	}
-	request_queue.clear();
-
-	// lock due to using reply_queue
-	{
-		std::lock_guard<std::mutex> lk(s_reply_queue);
-		reply_queue.clear();
-	}
-	last_reply_time = 0;
-}
-
-void Shutdown()
-{
-	Reset(true);
-}
-
-void SetDefaultContentFile(const std::string& _rFilename)
-{
-	TDeviceMap::const_iterator itr = g_DeviceMap.begin();
-	while (itr != g_DeviceMap.end())
-	{
-		if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0)
-		{
-			((CWII_IPC_HLE_Device_es*)itr->second)->LoadWAD(_rFilename);
-		}
-		++itr;
-	}
-}
-
-void ES_DIVerify(u8 *_pTMD, u32 _sz)
-{
-	CWII_IPC_HLE_Device_es::ES_DIVerify(_pTMD, _sz);
-}
-
-void SDIO_EventNotify()
-{
-	CWII_IPC_HLE_Device_sdio_slot0 *pDevice =
-		(CWII_IPC_HLE_Device_sdio_slot0*)GetDeviceByName(std::string("/dev/sdio/slot0"));
-	if (pDevice)
-		pDevice->EventNotify();
-}
-int getFreeDeviceId()
-{
-	u32 i;
-	for (i=0; i<IPC_MAX_FDS; i++)
-	{
-		if (g_FdMap[i] == NULL)
-		{
-			return i;
-		}
-	}
-	return -1;
-}
-
-IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName)
-{
-	TDeviceMap::const_iterator itr = g_DeviceMap.begin();
-	while (itr != g_DeviceMap.end())
-	{
-		if (itr->second && itr->second->GetDeviceName() == _rDeviceName)
-			return itr->second;
-		++itr;
-	}
-
-	return NULL;
-}
-
-IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID)
-{
-	if (g_DeviceMap.find(_ID) != g_DeviceMap.end())
-		return g_DeviceMap[_ID];
-
-		return NULL;
-}
-
-// This is called from ExecuteCommand() COMMAND_OPEN_DEVICE
-IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName)
-{
-	// scan device name and create the right one
-	IWII_IPC_HLE_Device* pDevice = NULL;
-
-	INFO_LOG(WII_IPC_FILEIO, "IOP: Create FileIO %s", _rDeviceName.c_str());
-	pDevice = new CWII_IPC_HLE_Device_FileIO(_DeviceID, _rDeviceName);
-
-	return pDevice;
-}
-
-
-void DoState(PointerWrap &p)
-{
-	std::lock_guard<std::mutex> lk(s_reply_queue);
-
-	p.Do(request_queue);
-	p.Do(reply_queue);
-	p.Do(last_reply_time);
-
-	TDeviceMap::const_iterator itr;
-
-	itr = g_DeviceMap.begin();
-	while (itr != g_DeviceMap.end())
-	{
-			if (itr->second->IsHardware())
-			{
-				itr->second->DoState(p);
-			}
-			++itr;
-	}
-
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		u32 i;
-		for (i=0; i<IPC_MAX_FDS; i++)
-		{
-			u32 exists = 0;
-			p.Do(exists);
-			if (exists)
-			{
-				u32 isHw = 0;
-				p.Do(isHw);
-				if (isHw)
-				{
-					u32 hwId = 0;
-					p.Do(hwId);
-					g_FdMap[i] = AccessDeviceByID(hwId);
-				}
-				else
-				{
-					g_FdMap[i] = new CWII_IPC_HLE_Device_FileIO(i, "");
-					g_FdMap[i]->DoState(p);
-				}
-			}
-			else
-			{
-				g_FdMap[i] = NULL;
-			}
-		}
-		for (i=0; i<ES_MAX_COUNT; i++)
-		{
-			p.Do(es_inuse[i]);
-			u32 handleID = es_handles[i]->GetDeviceID();
-			p.Do(handleID);
-
-			es_handles[i] = AccessDeviceByID(handleID);
-		}
-	}
-	else
-	{
-		u32 i;
-		for (i=0; i<IPC_MAX_FDS; i++)
-		{
-			u32 exists = g_FdMap[i] ? 1 : 0;
-			p.Do(exists);
-			if (exists)
-			{
-				u32 isHw = g_FdMap[i]->IsHardware() ? 1 : 0;
-				p.Do(isHw);
-				if (isHw)
-				{
-					u32 hwId = g_FdMap[i]->GetDeviceID();
-					p.Do(hwId);
-				}
-				else
-				{
-					g_FdMap[i]->DoState(p);
-				}
-			}
-		}
-		for (i=0; i<ES_MAX_COUNT; i++)
-		{
-			p.Do(es_inuse[i]);
-			u32 handleID = es_handles[i]->GetDeviceID();
-			p.Do(handleID);
-		}
-	}
-}
-
-void ExecuteCommand(u32 _Address)
-{
-	bool CmdSuccess = false;
-
-	ECommandType Command = static_cast<ECommandType>(Memory::Read_U32(_Address));
-	volatile s32 DeviceID = Memory::Read_U32(_Address + 8);
-
-	IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL;
-
-	INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice);
-
-	switch (Command)
-	{
-	case COMMAND_OPEN_DEVICE:
-	{
-		u32 Mode = Memory::Read_U32(_Address + 0x10);
-		DeviceID = getFreeDeviceId();
-
-		std::string DeviceName;
-		Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC));
-
-
-		WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID);
-		if (DeviceID >= 0)
-		{
-			if (DeviceName.find("/dev/es") == 0)
-			{
-				u32 j;
-				for (j=0; j<ES_MAX_COUNT; j++)
-				{
-					if (!es_inuse[j])
-					{
-						es_inuse[j] = true;
-						g_FdMap[DeviceID] = es_handles[j];
-						CmdSuccess = es_handles[j]->Open(_Address, Mode);
-						Memory::Write_U32(DeviceID, _Address+4);
-						break;
-					}
-				}
-				if (j == ES_MAX_COUNT)
-				{
-					Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4);
-					CmdSuccess = true;
-				}
-
-			}
-			else if (DeviceName.find("/dev/") == 0)
-			{
-				pDevice = GetDeviceByName(DeviceName);
-				if (pDevice)
-				{
-					g_FdMap[DeviceID] = pDevice;
-					CmdSuccess = pDevice->Open(_Address, Mode);
-					INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)",
-						pDevice->GetDeviceName().c_str(), DeviceID, Mode);
-					Memory::Write_U32(DeviceID, _Address+4);
-				}
-				else
-				{
-					WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str());
-					Memory::Write_U32(FS_ENOENT, _Address+4);
-					CmdSuccess = true;
-				}
-			}
-			else
-			{
-				pDevice = CreateFileIO(DeviceID, DeviceName);
-				CmdSuccess = pDevice->Open(_Address, Mode);
-
-				INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)",
-						pDevice->GetDeviceName().c_str(), DeviceID, Mode);
-				if (Memory::Read_U32(_Address + 4) == (u32)DeviceID)
-				{
-					g_FdMap[DeviceID] = pDevice;
-				}
-				else
-				{
-					delete pDevice;
-					pDevice = NULL;
-				}
-			}
-
-		}
-		else
-		{
-			Memory::Write_U32(FS_EFDEXHAUSTED, _Address + 4);
-			CmdSuccess = true;
-		}
-		break;
-	}
-	case COMMAND_CLOSE_DEVICE:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->Close(_Address);
-
-			u32 j;
-			for (j=0; j<ES_MAX_COUNT; j++)
-			{
-				if (es_handles[j] == g_FdMap[DeviceID])
-				{
-					es_inuse[j] = false;
-				}
-			}
-
-			g_FdMap[DeviceID] = NULL;
-
-			// Don't delete hardware
-			if (!pDevice->IsHardware())
-			{
-				delete pDevice;
-				pDevice = NULL;
-			}
-		}
-		else
-		{
-			Memory::Write_U32(FS_EINVAL, _Address + 4);
-			CmdSuccess = true;
-		}
-		break;
-	}
-	case COMMAND_READ:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->Read(_Address);
-		}
-		else
-		{
-			Memory::Write_U32(FS_EINVAL, _Address + 4);
-			CmdSuccess = true;
-		}
-		break;
-	}
-	case COMMAND_WRITE:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->Write(_Address);
-		}
-		else
-		{
-			Memory::Write_U32(FS_EINVAL, _Address + 4);
-			CmdSuccess = true;
-		}
-		break;
-	}
-	case COMMAND_SEEK:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->Seek(_Address);
-		}
-		else
-		{
-			Memory::Write_U32(FS_EINVAL, _Address + 4);
-			CmdSuccess = true;
-		}
-		break;
-	}
-	case COMMAND_IOCTL:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->IOCtl(_Address);
-		}
-		break;
-	}
-	case COMMAND_IOCTLV:
-	{
-		if (pDevice)
-		{
-			CmdSuccess = pDevice->IOCtlV(_Address);
-		}
-		break;
-	}
-	default:
-	{
-		_dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address);
-		break;
-	}
-	}
-
-
-	if (CmdSuccess)
-	{
-		// It seems that the original hardware overwrites the command after it has been
-		// executed. We write 8 which is not any valid command, and what IOS does
-		Memory::Write_U32(8, _Address);
-		// IOS seems to write back the command that was responded to
-		Memory::Write_U32(Command, _Address + 8);
-
-		// Ensure replies happen in order, fairly ugly
-		// Without this, tons of games fail now that DI commands have different reply delays
-		int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
-
-		const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks();
-
-		if (ticks_til_last_reply > 0)
-			reply_delay = ticks_til_last_reply;
-
-		last_reply_time = CoreTiming::GetTicks() + reply_delay;
-
-		// Generate a reply to the IPC command
-		EnqReply(_Address, reply_delay);
-	}
-}
-
-// Happens AS SOON AS IPC gets a new pointer!
-void EnqRequest(u32 _Address)
-{
-	request_queue.push_back(_Address);
-}
-
-// Called when IOS module has some reply
-void EnqReply(u32 _Address, int cycles_in_future)
-{
-	CoreTiming::ScheduleEvent(cycles_in_future, enque_reply, _Address);
-}
-
-// This is called every IPC_HLE_PERIOD from SystemTimers.cpp
-// Takes care of routing ipc <-> ipc HLE
-void Update()
-{
-	if (!WII_IPCInterface::IsReady())
-		return;
-
-	UpdateDevices();
-
-	if (request_queue.size())
-	{
-		WII_IPCInterface::GenerateAck(request_queue.front());
-		INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
-		u32 command = request_queue.front();
-		request_queue.pop_front();
-		ExecuteCommand(command);
-
-#if MAX_LOGLEVEL >= DEBUG_LEVEL
-		Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG);
-#endif
-	}
-
-	// lock due to using reply_queue
-	{
-		std::lock_guard<std::mutex> lk(s_reply_queue);
-		if (reply_queue.size())
-		{
-			WII_IPCInterface::GenerateReply(reply_queue.front());
-			INFO_LOG(WII_IPC_HLE, "<<-- Reply to IPC Request @ 0x%08x", reply_queue.front());
-			reply_queue.pop_front();
-		}
-	}
-}
-
-void UpdateDevices()
-{
-	// Check if a hardware device must be updated
-	for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr)
-	{
-		if (itr->second->IsOpened() && itr->second->Update())
-		{
-			break;
-		}
-	}
-}
-
-
-} // end of namespace WII_IPC_HLE_Interface
-
-// TODO: create WII_IPC_HLE_Device.cpp ?
-void IWII_IPC_HLE_Device::DoStateShared(PointerWrap& p)
-{
-	p.Do(m_Name);
-	p.Do(m_DeviceID);
-	p.Do(m_Hardware);
-	p.Do(m_Active);
-}
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h
deleted file mode 100644
index 0db0ff3853..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_H_
-#define _WII_IPC_HLE_H_
-
-#include "ChunkFile.h"
-
-class IWII_IPC_HLE_Device;
-
-namespace WII_IPC_HLE_Interface
-{
-
-#define IPC_FIRST_ID	0x00		// first IPC device ID
-#define IPC_MAX_FILES	0x10		// first IPC file ID 
-
-void EnqueReplyCallback(u64 userdata, int =0);
-
-// Init
-void Init();
-
-// Shutdown
-void Shutdown();	
-
-// Reset
-void Reset(bool _bHard = false);
-
-// Do State
-void DoState(PointerWrap &p);
-
-// Set default content file
-void SetDefaultContentFile(const std::string& _rFilename);
-void ES_DIVerify(u8 *_pTMD, u32 _sz);
-
-void SDIO_EventNotify();
-
-
-IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName);
-
-IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName);
-IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID);
-int getFreeDeviceId();
-
-// Update
-void Update();
-
-// Update Devices
-void UpdateDevices();
-
-void ExecuteCommand(u32 _Address);
-
-void EnqRequest(u32 _Address);
-void EnqReply(u32 _Address, int cycles_in_future = 0);
-
-enum ECommandType
-{
-	COMMAND_OPEN_DEVICE		= 1,
-	COMMAND_CLOSE_DEVICE	= 2,
-	COMMAND_READ			= 3,
-	COMMAND_WRITE			= 4,
-	COMMAND_SEEK			= 5,
-	COMMAND_IOCTL			= 6,
-	COMMAND_IOCTLV			= 7,
-};
-
-} // end of namespace WII_IPC_HLE_Interface
-
-#endif
-
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
deleted file mode 100644
index 2cd2aa1ff4..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_H_
-#define _WII_IPC_HLE_DEVICE_H_
-
-#include <string>
-#include <queue>
-#include "../HW/Memmap.h"
-
-#include "ChunkFile.h"
-
-#define	FS_SUCCESS		(u32)0		// Success
-#define	FS_EACCES		(u32)-1		// Permission denied 
-#define	FS_EEXIST		(u32)-2		// File exists 
-#define	FS_EINVAL		(u32)-4		// Invalid argument Invalid FD
-#define	FS_ENOENT		(u32)-6		// File not found 
-#define	FS_EBUSY		(u32)-8		// Resource busy 
-#define	FS_EIO			(u32)-12		// Returned on ECC error 
-#define	FS_ENOMEM		(u32)-22		// Alloc failed during request 
-#define	FS_EFATAL		(u32)-101	// Fatal error 
-#define	FS_EACCESS		(u32)-102	// Permission denied 
-#define	FS_ECORRUPT		(u32)-103	// returned for "corrupted" NAND 
-#define	FS_EEXIST2		(u32)-105	// File exists 
-#define	FS_ENOENT2		(u32)-106	// File not found 
-#define	FS_ENFILE		(u32)-107	// Too many fds open 
-#define	FS_EFBIG		(u32)-108	// Max block count reached? 
-#define	FS_EFDEXHAUSTED	(u32)-109	// Too many fds open 
-#define	FS_ENAMELEN		(u32)-110	// Pathname is too long 
-#define	FS_EFDOPEN		(u32)-111	// FD is already open 
-#define	FS_EIO2			(u32)-114	// Returned on ECC error 
-#define	FS_ENOTEMPTY 	(u32)-115	// Directory not empty 
-#define	FS_EDIRDEPTH	(u32)-116	// Max directory depth exceeded 
-#define	FS_EBUSY2		(u32)-118	// Resource busy 
-//#define	FS_EFATAL		(u32)-119		// Fatal error not used by IOS as fatal ERROR
-#define	FS_EESEXHAUSTED	(u32)-1016	// Max of 2 ES handles at a time
-
-// A struct for IOS ioctlv calls
-struct SIOCtlVBuffer
-{
-	SIOCtlVBuffer(u32 _Address) : m_Address(_Address)
-	{
-		// These are the Ioctlv parameters in the IOS communication. The BufferVector
-		// is a memory address offset at where the in and out buffer addresses are
-		// stored.
-		Parameter			= Memory::Read_U32(m_Address + 0x0C); // command 3, arg0
-		NumberInBuffer		= Memory::Read_U32(m_Address + 0x10); // 4, arg1
-		NumberPayloadBuffer	= Memory::Read_U32(m_Address + 0x14); // 5, arg2
-		BufferVector		= Memory::Read_U32(m_Address + 0x18); // 6, arg3
-
-		// The start of the out buffer
-		u32 BufferVectorOffset = BufferVector;
-
-		// Write the address and size for all in messages
-		for (u32 i = 0; i < NumberInBuffer; i++)
-		{
-			SBuffer Buffer;
-			Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
-			BufferVectorOffset += 4;
-			Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
-			BufferVectorOffset += 4;
-			InBuffer.push_back(Buffer);
-			DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer in%i: 0x%08x, 0x%x",
-						i, Buffer.m_Address, Buffer.m_Size);
-		}
-
-		// Write the address and size for all out or in-out messages
-		for (u32 i = 0; i < NumberPayloadBuffer; i++)
-		{
-			SBuffer Buffer;
-			Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
-			BufferVectorOffset += 4;
-			Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
-			BufferVectorOffset += 4;
-			PayloadBuffer.push_back(Buffer);
-			DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer io%i: 0x%08x, 0x%x",
-						i, Buffer.m_Address, Buffer.m_Size);
-		}
-	}
-
-	const u32 m_Address;
-
-	u32 Parameter;
-	u32 NumberInBuffer;
-	u32 NumberPayloadBuffer;
-	u32 BufferVector;
-
-	struct SBuffer { u32 m_Address, m_Size; };
-	std::vector<SBuffer> InBuffer;
-	std::vector<SBuffer> PayloadBuffer;
-};
-
-class IWII_IPC_HLE_Device
-{
-public:
-
-	IWII_IPC_HLE_Device(u32 _DeviceID, const std::string& _rName, bool _Hardware = true) :
-		m_Name(_rName),
-		m_DeviceID(_DeviceID),
-		m_Hardware(_Hardware),
-		m_Active(false)
-	{
-	}
-
-	virtual ~IWII_IPC_HLE_Device()
-	{
-	}
-
-	virtual void DoState(PointerWrap& p) 
-	{
-		DoStateShared(p);
-		p.Do(m_Active);
-	}
-	
-	void DoStateShared(PointerWrap& p);
-
-	const std::string& GetDeviceName() const { return m_Name; }
-	u32 GetDeviceID() const { return m_DeviceID; }
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode)
-	{
-		(void)_Mode;
-		WARN_LOG(WII_IPC_HLE, "%s does not support Open()", m_Name.c_str());
-		Memory::Write_U32(FS_ENOENT, _CommandAddress + 4);
-		m_Active = true;
-		return true;
-	}
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce = false)
-	{
-		WARN_LOG(WII_IPC_HLE, "%s does not support Close()", m_Name.c_str());
-		if (!_bForce)
-			Memory::Write_U32(FS_EINVAL, _CommandAddress + 4);
-		m_Active = false;
-		return true;
-	}
-
-#define UNIMPLEMENTED_CMD(cmd) WARN_LOG(WII_IPC_HLE, "%s does not support "#cmd"()", m_Name.c_str()); return true;
-	virtual bool Seek	(u32) { UNIMPLEMENTED_CMD(Seek) }
-	virtual bool Read	(u32) { UNIMPLEMENTED_CMD(Read) }
-	virtual bool Write	(u32) { UNIMPLEMENTED_CMD(Write) }
-	virtual bool IOCtl	(u32) { UNIMPLEMENTED_CMD(IOCtl) }
-	virtual bool IOCtlV	(u32) { UNIMPLEMENTED_CMD(IOCtlV) }
-#undef UNIMPLEMENTED_CMD
-
-	virtual int GetCmdDelay(u32) { return 0; }
-
-	virtual u32 Update() { return 0; }
-
-	virtual bool IsHardware() { return m_Hardware; }
-	virtual bool IsOpened() { return m_Active; }
-public:
-	std::string m_Name;
-protected:
-
-	// STATE_TO_SAVE
-	u32 m_DeviceID;
-	bool m_Hardware;
-	bool m_Active;
-
-	// Write out the IPC struct from _CommandAddress to _NumberOfCommands numbers
-	// of 4 byte commands.
-	void DumpCommands(u32 _CommandAddress, size_t _NumberOfCommands = 8,
-		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
-		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
-	{
-		GENERIC_LOG(LogType, Verbosity, "CommandDump of %s", 
-					GetDeviceName().c_str());
-		for (u32 i = 0; i < _NumberOfCommands; i++)
-		{
-			GENERIC_LOG(LogType, Verbosity, "    Command%02i: 0x%08x", i,
-						Memory::Read_U32(_CommandAddress + i*4));	
-		}
-	}
-	
-	void DumpAsync(u32 BufferVector, u32 NumberInBuffer, u32 NumberOutBuffer,
-		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
-		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
-	{
-		GENERIC_LOG(LogType, Verbosity, "======= DumpAsync ======");
-
-		u32 BufferOffset = BufferVector;
-		for (u32 i = 0; i < NumberInBuffer; i++)
-		{
-			u32 InBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
-			u32 InBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
-
-			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV InBuffer[%i]:",
-				GetDeviceName().c_str(), i);
-
-			std::string Temp;
-			for (u32 j = 0; j < InBufferSize; j++)
-			{
-				char Buffer[128];
-				sprintf(Buffer, "%02x ", Memory::Read_U8(InBuffer+j));
-				Temp.append(Buffer);
-			}
-
-			GENERIC_LOG(LogType, LogTypes::LDEBUG, "    Buffer: %s", Temp.c_str());
-		}
-
-		for (u32 i = 0; i < NumberOutBuffer; i++)
-		{
-			u32 OutBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
-			u32 OutBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
-
-			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV OutBuffer[%i]:",
-				GetDeviceName().c_str(), i);
-			GENERIC_LOG(LogType, LogTypes::LINFO, "    OutBuffer: 0x%08x (0x%x):",
-				OutBuffer, OutBufferSize);
-
-			#if defined(MAX_LOGLEVEL) && MAX_LOGLEVEL >= INFO_LEVEL
-			DumpCommands(OutBuffer, OutBufferSize, LogType, Verbosity);
-			#endif
-		}
-	}
-};
-
-class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_stub(u32 DeviceID, const std::string& Name)
-		: IWII_IPC_HLE_Device(DeviceID, Name)
-	{
-	}
-
-	bool Open(u32 CommandAddress, u32 Mode)
-	{
-		(void)Mode;
-		WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
-		Memory::Write_U32(GetDeviceID(), CommandAddress + 4);
-		m_Active = true;
-		return true;
-	}
-	bool Close(u32 CommandAddress, bool bForce = false)
-	{
-		WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
-		if (!bForce)
-			Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
-		m_Active = false;
-		return true;
-	}
-
-	bool IOCtl(u32 CommandAddress)
-	{
-		WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str());
-		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
-		return true;
-	}
-	bool IOCtlV(u32 CommandAddress)
-	{
-		WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str());
-		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
-		return true;
-	}
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
deleted file mode 100644
index 659807dcc4..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
+++ /dev/null
@@ -1,492 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "WII_IPC_HLE_Device_DI.h"
-#include "WII_IPC_HLE.h"
-
-#include "../HW/DVDInterface.h"
-#include "../HW/CPU.h"
-#include "../HW/Memmap.h"
-#include "../Core.h"
-#include "../VolumeHandler.h"
-#include "VolumeCreator.h"
-#include "Filesystem.h"
-#include "LogManager.h"
-#include "../HW/SystemTimers.h"
-
-#include "../../DiscIO/Src/FileMonitor.h"
-
-using namespace DVDInterface;
-
-
-#define DI_COVER_REG_INITIALIZED	0 // Should be 4, but doesn't work correctly...
-#define DI_COVER_REG_NO_DISC		1
-
-CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName )
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-	, m_pFileSystem(NULL)
-	, m_ErrorStatus(0)
-	, m_CoverStatus(DI_COVER_REG_NO_DISC)
-{}
-
-CWII_IPC_HLE_Device_di::~CWII_IPC_HLE_Device_di()
-{
-	if (m_pFileSystem)
-	{
-		delete m_pFileSystem;
-		m_pFileSystem = NULL;
-	}
-}
-
-bool CWII_IPC_HLE_Device_di::Open(u32 _CommandAddress, u32 _Mode)
-{
-	if (VolumeHandler::IsValid())
-	{
-		m_pFileSystem = DiscIO::CreateFileSystem(VolumeHandler::GetVolume());
-		m_CoverStatus |= DI_COVER_REG_INITIALIZED;
-		m_CoverStatus &= ~DI_COVER_REG_NO_DISC;
-	}
-	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce)
-{
-	if (m_pFileSystem)
-	{
-		delete m_pFileSystem;
-		m_pFileSystem = NULL;
-	}
-	m_ErrorStatus = 0;
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress) 
-{
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-	u32 Command			= Memory::Read_U32(BufferIn) >> 24;
-
-	DEBUG_LOG(WII_IPC_DVD, "IOCtl Command(0x%08x) BufferIn(0x%08x, 0x%x) BufferOut(0x%08x, 0x%x)",
-		Command, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-	u32 ReturnValue = ExecuteCommand(BufferIn, BufferInSize, BufferOut, BufferOutSize);
-	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress) 
-{
-	SIOCtlVBuffer CommandBuffer(_CommandAddress);
-
-	// Prepare the out buffer(s) with zeros as a safety precaution
-	// to avoid returning bad values
-	for(u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
-	{
-		Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
-			CommandBuffer.PayloadBuffer[i].m_Size);
-	}
-
-	u32 ReturnValue = 0;
-	switch (CommandBuffer.Parameter)
-	{
-	case DVDLowOpenPartition:
-		{
-			_dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[1].m_Address == 0, "DVDLowOpenPartition with ticket");
-			_dbg_assert_msg_(WII_IPC_DVD, CommandBuffer.InBuffer[2].m_Address == 0, "DVDLowOpenPartition with cert chain");
-
-			// Get TMD offset for requested partition...
-			u64 const TMDOffset = ((u64)Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address + 4) << 2 ) + 0x2c0;
-
-			INFO_LOG(WII_IPC_DVD, "DVDLowOpenPartition: TMDOffset 0x%016llx", TMDOffset);
-
-			static u32 const TMDsz = 0x208; //CommandBuffer.PayloadBuffer[0].m_Size;
-			u8 pTMD[TMDsz];
-
-			// Read TMD to the buffer
-			VolumeHandler::RAWReadToPtr(pTMD, TMDOffset, TMDsz);
-
-			memcpy(Memory::GetPointer(CommandBuffer.PayloadBuffer[0].m_Address), pTMD, TMDsz);
-			WII_IPC_HLE_Interface::ES_DIVerify(pTMD, TMDsz);
-
-			ReturnValue = 1;
-		}
-		break;
-
-	default:
-		ERROR_LOG(WII_IPC_DVD, "IOCtlV: %i", CommandBuffer.Parameter);
-		_dbg_assert_msg_(WII_IPC_DVD, 0, "IOCtlV: %i", CommandBuffer.Parameter);
-		break;
-	}
-
-	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-	return true;
-}
-
-u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize)
-{
-	u32 Command = Memory::Read_U32(_BufferIn) >> 24;
-
-	// TATSUNOKO VS CAPCOM: Gets here with _BufferOut == 0!!!
-	if (_BufferOut != 0)
-	{
-		// Set out buffer to zeroes as a safety precaution to avoid answering
-		// nonsense values
-		Memory::Memset(_BufferOut, 0, _BufferOutSize);
-	}
-
-	// Initializing a filesystem if it was just loaded
-	if(!m_pFileSystem && VolumeHandler::IsValid())
-	{
-		m_pFileSystem = DiscIO::CreateFileSystem(VolumeHandler::GetVolume());
-		m_CoverStatus |= DI_COVER_REG_INITIALIZED;
-		m_CoverStatus &= ~DI_COVER_REG_NO_DISC;
-	}
-
-	// De-initializing a filesystem if the volume was unmounted
-	if(m_pFileSystem && !VolumeHandler::IsValid())
-	{
-		delete m_pFileSystem;
-		m_pFileSystem = NULL;
-		m_CoverStatus |= DI_COVER_REG_NO_DISC;
-	}
-
-	switch (Command)
-	{
-	case DVDLowInquiry:
-		{
-			// (shuffle2) Taken from my wii
-			Memory::Write_U32(0x00000002, _BufferOut);
-			Memory::Write_U32(0x20060526, _BufferOut + 4);
-			// This was in the oubuf even though this cmd is only supposed to reply with 64bits
-			// However, this and other tests strongly suggest that the buffer is static, and it's never - or rarely cleared.
-			Memory::Write_U32(0x41000000, _BufferOut + 8);
-
-			INFO_LOG(WII_IPC_DVD, "DVDLowInquiry (Buffer 0x%08x, 0x%x)",
-				_BufferOut, _BufferOutSize);
-		}
-		break;
-
-	case DVDLowReadDiskID:
-		{
-			VolumeHandler::RAWReadToPtr(Memory::GetPointer(_BufferOut), 0, _BufferOutSize);
-
-			INFO_LOG(WII_IPC_DVD, "DVDLowReadDiskID %s",
-				ArrayToString(Memory::GetPointer(_BufferOut), _BufferOutSize, _BufferOutSize).c_str());
-		}
-		break;
-
-	case DVDLowRead:
-		{
-			if (_BufferOut == 0)
-			{
-				PanicAlert("DVDLowRead : _BufferOut == 0");
-				return 0;
-			}
-			u32 Size = Memory::Read_U32(_BufferIn + 0x04);
-			u64 DVDAddress = (u64)Memory::Read_U32(_BufferIn + 0x08) << 2;
-
-			// Don't do anything if the log is unselected
-			if (LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON))
-			{
-				const char *pFilename = NULL;
-				if (m_pFileSystem)
-					pFilename = m_pFileSystem->GetFileName(DVDAddress);
-				if (pFilename != NULL)
-				{
-					INFO_LOG(WII_IPC_DVD, "DVDLowRead: %s (0x%llx) - (DVDAddr: 0x%llx, Size: 0x%x)",
-						pFilename, m_pFileSystem->GetFileSize(pFilename), DVDAddress, Size);
-					FileMon::CheckFile(std::string(pFilename), (int)m_pFileSystem->GetFileSize(pFilename));
-				}
-				else
-				{
-					INFO_LOG(WII_IPC_DVD, "DVDLowRead: file unknown - (DVDAddr: 0x%llx, Size: 0x%x)",
-						DVDAddress, Size);
-				}
-			}
-
-			if (Size > _BufferOutSize)
-			{
-				PanicAlertT("Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp.");
-				Size = _BufferOutSize;
-			}
-
-			if (!VolumeHandler::ReadToPtr(Memory::GetPointer(_BufferOut), DVDAddress, Size))
-			{
-				PanicAlertT("DVDLowRead - Fatal Error: failed to read from volume");
-			}
-		}
-		break;
-
-	case DVDLowWaitForCoverClose:
-		{
-			INFO_LOG(WII_IPC_DVD, "DVDLowWaitForCoverClose (Buffer 0x%08x, 0x%x)",
-				_BufferOut, _BufferOutSize);
-			return 4; // ???
-		}
-		break;
-
-	case DVDLowGetCoverReg:
-		Memory::Write_U32(m_CoverStatus, _BufferOut);
-
-		INFO_LOG(WII_IPC_DVD, "DVDLowGetCoverReg 0x%08x", Memory::Read_U32(_BufferOut));
-		break;
-
-	case DVDLowNotifyReset:
-		PanicAlert("DVDLowNotifyReset");
-		break;
-
-	case DVDLowReadDvdPhysical:
-		PanicAlert("DVDLowReadDvdPhysical");
-		break;
-
-	case DVDLowReadDvdCopyright:
-		PanicAlert("DVDLowReadDvdCopyright");
-		break;
-
-	case DVDLowReadDvdDiscKey:
-		PanicAlert("DVDLowReadDvdDiscKey");
-		break;
-
-	case DVDLowClearCoverInterrupt:
-		// TODO: check (seems to work ok)
-		INFO_LOG(WII_IPC_DVD, "DVDLowClearCoverInterrupt");
-		ClearCoverInterrupt();
-		break;
-
-	case DVDLowGetCoverStatus:
-		Memory::Write_U32(IsDiscInside() ? 2 : 1, _BufferOut);
-		INFO_LOG(WII_IPC_DVD, "DVDLowGetCoverStatus: Disc %sInserted", IsDiscInside() ? "" : "Not ");
-		break;
-
-	case DVDLowReset:
-		INFO_LOG(WII_IPC_DVD, "DVDLowReset");
-		break;
-
-	case DVDLowClosePartition:
-		INFO_LOG(WII_IPC_DVD, "DVDLowClosePartition");
-		break;
-
-	case DVDLowUnencryptedRead:
-		{
-			if (_BufferOut == 0)
-			{
-				PanicAlert("DVDLowRead : _BufferOut == 0");
-				return 0;
-			}
-
-			u32 Size = Memory::Read_U32(_BufferIn + 0x04);
-
-			// We must make sure it is in a valid area! (#001 check)
-			// * 0x00000000 - 0x00014000 (limit of older IOS versions)
-			// * 0x460a0000 - 0x460a0008
-			// * 0x7ed40000 - 0x7ed40008
-			u32 DVDAddress32 = Memory::Read_U32(_BufferIn + 0x08);
-			if (!( (DVDAddress32 > 0x00000000 && DVDAddress32 < 0x00014000)
-				|| (((DVDAddress32 + Size) > 0x00000000) && (DVDAddress32 + Size) < 0x00014000)
-				|| (DVDAddress32 > 0x460a0000 && DVDAddress32 < 0x460a0008)
-				|| (((DVDAddress32 + Size) > 0x460a0000) && (DVDAddress32 + Size) < 0x460a0008)
-				|| (DVDAddress32 > 0x7ed40000 && DVDAddress32 < 0x7ed40008)
-				|| (((DVDAddress32 + Size) > 0x7ed40000) && (DVDAddress32 + Size) < 0x7ed40008)
-				))
-			{
-				WARN_LOG(WII_IPC_DVD, "DVDLowUnencryptedRead: trying to read out of bounds @ %x", DVDAddress32);
-				m_ErrorStatus = ERROR_READY | ERROR_BLOCK_OOB;
-				// Should cause software to call DVDLowRequestError
-				return 2;
-			}
-
-			u64 DVDAddress = (u64)DVDAddress32 << 2;
-
-			INFO_LOG(WII_IPC_DVD, "DVDLowUnencryptedRead: DVDAddr: 0x%08llx, Size: 0x%x", DVDAddress, Size);
-
-			if (Size > _BufferOutSize)
-			{
-				PanicAlertT("Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp.");
-				Size = _BufferOutSize;
-			}
-			if(!VolumeHandler::RAWReadToPtr(Memory::GetPointer(_BufferOut), DVDAddress, Size))
-			{
-				PanicAlertT("DVDLowUnencryptedRead - Fatal Error: failed to read from volume");
-			}
-		}
-		break;
-
-	case DVDLowEnableDvdVideo:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowEnableDvdVideo");
-		break;
-
-	case DVDLowReportKey:
-		INFO_LOG(WII_IPC_DVD, "DVDLowReportKey");
-		// Does not work on retail discs/drives
-		// Retail games send this command to see if they are running on real retail hw
-		m_ErrorStatus = ERROR_READY | ERROR_INV_CMD;
-		return 2;
-		break;
-
-	case DVDLowSeek:
-		{
-			u64 DVDAddress = Memory::Read_U32(_BufferIn + 0x4) << 2;
-			const char *pFilename = NULL;
-			if (m_pFileSystem)
-				pFilename = m_pFileSystem->GetFileName(DVDAddress);
-			if (pFilename != NULL)
-			{
-				INFO_LOG(WII_IPC_DVD, "DVDLowSeek: %s (0x%llx) - (DVDAddr: 0x%llx)",
-					pFilename, m_pFileSystem->GetFileSize(pFilename), DVDAddress);
-			}
-			else
-			{
-				INFO_LOG(WII_IPC_DVD, "DVDLowSeek: file unknown - (DVDAddr: 0x%llx)",
-					DVDAddress);
-			}
-		}
-		break;
-
-	case DVDLowReadDvd:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowReadDvd");
-		break;
-
-	case DVDLowReadDvdConfig:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowReadDvdConfig");
-		break;
-
-	case DVDLowStopLaser:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowStopLaser");
-		break;
-
-	case DVDLowOffset:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowOffset");
-		break;
-
-	case DVDLowReadDiskBca:
-		WARN_LOG(WII_IPC_DVD, "DVDLowReadDiskBca");
-		Memory::Write_U32(1, _BufferOut + 0x30);
-		break;
-
-	case DVDLowRequestDiscStatus:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowRequestDiscStatus");
-		break;
-
-	case DVDLowRequestRetryNumber:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowRequestRetryNumber");
-		break;
-
-	case DVDLowSetMaximumRotation:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowSetMaximumRotation");
-		break;
-
-	case DVDLowSerMeasControl:
-		ERROR_LOG(WII_IPC_DVD, "DVDLowSerMeasControl");
-		break;
-
-	case DVDLowRequestError:
-		// Identical to the error codes found in yagcd section 5.7.3.5.1 (so far)
-		WARN_LOG(WII_IPC_DVD, "DVDLowRequestError status = 0x%08x", m_ErrorStatus);
-		Memory::Write_U32(m_ErrorStatus, _BufferOut);
-		// When does error status get reset?
-		break;
-
-// Ex commands are immediate and respond with 4 bytes
-	case DVDLowStopMotor:
-		{
-			u32 eject = Memory::Read_U32(_BufferIn + 4);
-			// Drive won't do anything till reset is issued. I think it replies like nothing is wrong though?
-			u32 kill = Memory::Read_U32(_BufferIn + 8);
-
-			INFO_LOG(WII_IPC_DVD, "DVDLowStopMotor %s %s",
-				eject ? "eject" : "", kill ? "kill!" : "");
-
-			if (eject)
-			{
-				SetLidOpen(true);
-				SetDiscInside(false);
-			}
-		}
-		break;
-
-	case DVDLowAudioBufferConfig:
-		/*
-			For more information: http://www.crazynation.org/GC/GC_DD_TECH/GCTech.htm
-		
-			Upon Power up or reset , 2 commands must be issued for proper use of audio streaming:
-			DVDReadDiskID A8000040,00000000,00000020
-			DVDLowAudioBufferConfig E4xx00yy,00000000,00000020
-
-			xx=byte 8 [0 or 1] from the disk header retrieved from DVDReadDiskID
-			yy=0 (if xx=0) or 0xA (if xx=1)
-		*/
-		ERROR_LOG(WII_IPC_DVD, "DVDLowAudioBufferConfig");
-		break;
-
-	// New Super Mario Bros.Wii sends these cmds
-	// but it seems we don't need to implement anything
-	case 0x95:
-	case 0x96:
-		WARN_LOG(WII_IPC_DVD, "Unimplemented command 0x%08x (Buffer 0x%08x, 0x%x)",
-			Command, _BufferOut, _BufferOutSize);
-		break;
-
-	default:
-		ERROR_LOG(WII_IPC_DVD, "Unknown command 0x%08x (Buffer 0x%08x, 0x%x)",
-			Command, _BufferOut, _BufferOutSize);
-
-		PanicAlertT("Unknown command 0x%08x", Command);
-		break;
-	}
-
-	// i dunno but prolly 1 is okay all the time :)
-	return 1;
-}
-
-int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress)
-{
-	u32 BufferIn	= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 Command		= Memory::Read_U32(BufferIn) >> 24;
-	
-	// Hacks below
-	
-	switch (Command)
-	{
-	case DVDLowRead:
-	case DVDLowUnencryptedRead:
-	{
-		u32 const Size = Memory::Read_U32(BufferIn + 0x04);
-		// Delay depends on size of read, that makes sense, right?
-		// More than ~1150K "bytes / sec" hangs NSMBWii on boot.
-		// Less than ~800K "bytes / sec" hangs DKCR randomly (ok, probably not true)
-		return SystemTimers::GetTicksPerSecond() / 975000 * Size;
-		break;
-	}
-		
-	case DVDLowClearCoverInterrupt:
-		// Less than ~1/155th of a second hangs Oregon Trail at "loading wheel".
-		// More than ~1/140th of a second hangs Resident Evil Archives: Resident Evil Zero.
-		return SystemTimers::GetTicksPerSecond() / 146;
-		break;
-	
-//	case DVDLowAudioBufferConfig:
-//	case DVDLowInquiry:
-//	case DVDLowReadDiskID:
-//	case DVDLowWaitForCoverClose:
-//	case DVDLowGetCoverReg:
-//	case DVDLowGetCoverStatus:
-//	case DVDLowReset:
-//	case DVDLowClosePartition:
-	default:
-		// random numbers here!
-		// More than ~1/2000th of a second hangs DKCR with DSP HLE, maybe.
-		return SystemTimers::GetTicksPerSecond() / 15000;
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
deleted file mode 100644
index 64be42f978..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_DI_H_
-#define _WII_IPC_HLE_DEVICE_DI_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-namespace DiscIO
-{
-	class IVolume;
-	class IFileSystem;
-}
-
-class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_di();
-
-	bool Open(u32 _CommandAddress, u32 _Mode);
-	bool Close(u32 _CommandAddress, bool _bForce);
-
-	bool IOCtl(u32 _CommandAddress); 
-	bool IOCtlV(u32 _CommandAddress);
-	
-	int GetCmdDelay(u32);
-
-private:
-
-	u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 _BufferOut, u32 BufferOutSize);
-
-	DiscIO::IFileSystem* m_pFileSystem;
-	u32 m_ErrorStatus;
-	// This flag seems to only be reset with poweron/off, not sure
-	u32 m_CoverStatus;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
deleted file mode 100644
index 17dab453db..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_FILEIO_H_
-#define _WII_IPC_HLE_DEVICE_FILEIO_H_
-
-#include "WII_IPC_HLE_Device.h"
-#include "FileUtil.h"
-
-std::string HLE_IPC_BuildFilename(std::string _pFilename, int _size);
-void HLE_IPC_CreateVirtualFATFilesystem();
-
-class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_FileIO();
-
-	bool Close(u32 _CommandAddress, bool _bForce);
-	bool Open(u32 _CommandAddress, u32 _Mode);
-	bool Seek(u32 _CommandAddress);
-	bool Read(u32 _CommandAddress);
-	bool Write(u32 _CommandAddress);
-	bool IOCtl(u32 _CommandAddress);
-	void DoState(PointerWrap &p);
-
-	File::IOFile OpenFile();
-
-private:
-	enum
-	{
-		ISFS_OPEN_READ				= 1,
-		ISFS_OPEN_WRITE,
-		ISFS_OPEN_RW				= (ISFS_OPEN_READ | ISFS_OPEN_WRITE)
-	};
-
-	enum
-	{
-		ISFS_FUNCNULL				= 0,
-		ISFS_FUNCGETSTAT,
-		ISFS_FUNCREADDIR,
-		ISFS_FUNCGETATTR,
-		ISFS_FUNCGETUSAGE
-	};
-
-	enum
-	{
-		ISFS_IOCTL_FORMAT			= 1,
-		ISFS_IOCTL_GETSTATS,
-		ISFS_IOCTL_CREATEDIR,
-		ISFS_IOCTL_READDIR,
-		ISFS_IOCTL_SETATTR,
-		ISFS_IOCTL_GETATTR,
-		ISFS_IOCTL_DELETE,
-		ISFS_IOCTL_RENAME,
-		ISFS_IOCTL_CREATEFILE,
-		ISFS_IOCTL_SETFILEVERCTRL,
-		ISFS_IOCTL_GETFILESTATS,
-		ISFS_IOCTL_GETUSAGE,
-		ISFS_IOCTL_SHUTDOWN
-	};
-
-	u32 m_Mode;
-	u32 m_SeekPos;
-	
-	std::string m_filepath;
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
deleted file mode 100644
index ddc1f3613f..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_ES_H_
-#define _WII_IPC_HLE_DEVICE_ES_H_
-
-#include <map>
-#include "WII_IPC_HLE_Device.h"
-#include "NANDContentLoader.h"
-#include <memory>
-
-class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_es();
-
-	void LoadWAD(const std::string& _rContentFile);
-
-	void OpenInternal();
-
-	virtual void DoState(PointerWrap& p);
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-
-	virtual bool IOCtlV(u32 _CommandAddress);
-	static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
-
-	// This should only be cleared on power reset
-	static std::string m_ContentFile;
-
-private:
-	enum
-	{
-        IOCTL_ES_ADDTICKET             = 0x01,
-        IOCTL_ES_ADDTITLESTART         = 0x02,
-        IOCTL_ES_ADDCONTENTSTART       = 0x03,
-        IOCTL_ES_ADDCONTENTDATA        = 0x04,
-        IOCTL_ES_ADDCONTENTFINISH      = 0x05,
-        IOCTL_ES_ADDTITLEFINISH        = 0x06,
-        IOCTL_ES_GETDEVICEID           = 0x07,
-        IOCTL_ES_LAUNCH                = 0x08,
-        IOCTL_ES_OPENCONTENT           = 0x09,
-        IOCTL_ES_READCONTENT           = 0x0A,
-        IOCTL_ES_CLOSECONTENT          = 0x0B,
-        IOCTL_ES_GETOWNEDTITLECNT      = 0x0C,
-        IOCTL_ES_GETOWNEDTITLES        = 0x0D,
-        IOCTL_ES_GETTITLECNT           = 0x0E,
-        IOCTL_ES_GETTITLES             = 0x0F,
-        IOCTL_ES_GETTITLECONTENTSCNT   = 0x10,
-        IOCTL_ES_GETTITLECONTENTS      = 0x11,
-        IOCTL_ES_GETVIEWCNT            = 0x12,
-        IOCTL_ES_GETVIEWS              = 0x13,
-        IOCTL_ES_GETTMDVIEWCNT         = 0x14,
-        IOCTL_ES_GETTMDVIEWS           = 0x15,
-        IOCTL_ES_GETCONSUMPTION        = 0x16,
-        IOCTL_ES_DELETETITLE           = 0x17,
-        IOCTL_ES_DELETETICKET          = 0x18,
-        // IOCTL_ES_DIGETTMDVIEWSIZE   = 0x19,
-        // IOCTL_ES_DIGETTMDVIEW       = 0x1A,
-        IOCTL_ES_DIGETTICKETVIEW       = 0x1B,
-        IOCTL_ES_DIVERIFY              = 0x1C,
-        IOCTL_ES_GETTITLEDIR           = 0x1D,
-        IOCTL_ES_GETDEVICECERT         = 0x1E,
-        IOCTL_ES_IMPORTBOOT            = 0x1F,
-        IOCTL_ES_GETTITLEID            = 0x20,
-        IOCTL_ES_SETUID                = 0x21,
-        IOCTL_ES_DELETETITLECONTENT    = 0x22,
-        IOCTL_ES_SEEKCONTENT           = 0x23,
-        IOCTL_ES_OPENTITLECONTENT      = 0x24,
-        // IOCTL_ES_LAUNCHBC           = 0x25,
-        // IOCTL_ES_EXPORTTITLEINIT    = 0x26,
-        // IOCTL_ES_EXPORTCONTENTBEGIN = 0x27,
-        // IOCTL_ES_EXPORTCONTENTDATA  = 0x28,
-        // IOCTL_ES_EXPORTCONTENTEND   = 0x29,
-        // IOCTL_ES_EXPORTTITLEDONE    = 0x2A,
-        IOCTL_ES_ADDTMD                = 0x2B,
-        IOCTL_ES_ENCRYPT               = 0x2C,
-        IOCTL_ES_DECRYPT               = 0x2D,
-        IOCTL_ES_GETBOOT2VERSION       = 0x2E,
-        IOCTL_ES_ADDTITLECANCEL        = 0x2F,
-        IOCTL_ES_SIGN                  = 0x30,
-        // IOCTL_ES_VERIFYSIGN         = 0x31,
-        IOCTL_ES_GETSTOREDCONTENTCNT   = 0x32,
-        IOCTL_ES_GETSTOREDCONTENTS     = 0x33,
-        IOCTL_ES_GETSTOREDTMDSIZE      = 0x34,
-        IOCTL_ES_GETSTOREDTMD          = 0x35,
-        IOCTL_ES_GETSHAREDCONTENTCNT   = 0x36,
-        IOCTL_ES_GETSHAREDCONTENTS     = 0x37,
-        IOCTL_ES_DELETESHAREDCONTENT   = 0x38,
-		//
-        IOCTL_ES_CHECKKOREAREGION      = 0x45,
-	};
-
-	enum EErrorCodes
-	{
-		ES_INVALID_TMD                       = -106,   // or access denied
-		ES_READ_LESS_DATA_THAN_EXPECTED      = -1009, 
-		ES_WRITE_FAILURE                     = -1010,
-		ES_PARAMTER_SIZE_OR_ALIGNMENT        = -1017,
-		ES_HASH_DOESNT_MATCH                 = -1022,
-		ES_MEM_ALLOC_FAILED                  = -1024,
-		ES_INCORRECT_ACCESS_RIGHT            = -1026,
-		ES_NO_TICKET_INSTALLED               = -1028,
-		ES_INSTALLED_TICKET_INVALID          = -1029,
-		ES_INVALID_PARAMETR                  = -2008,
-		ES_SIGNATURE_CHECK_FAILED            = -2011,
-		ES_HASH_SIZE_WRONG                   = -2014, // HASH !=20
-	};
-
-	struct SContentAccess
-	{
-		u32 m_Position;
-		u64 m_TitleID;
-		const DiscIO::SNANDContent* m_pContent;
-		// This is a (raw) pointer to work around a MSVC bug.
-		File::IOFile* m_pFile;
-	};
-
-	typedef std::map<u32, SContentAccess> CContentAccessMap;
-	CContentAccessMap m_ContentAccessMap;
-
-	typedef std::map<u64, const DiscIO::INANDContentLoader*> CTitleToContentMap;
-	CTitleToContentMap m_NANDContent;
-
-	const DiscIO::INANDContentLoader* m_pContentLoader;
-
-	std::vector<u64> m_TitleIDs;
-	u64 m_TitleID;
-	u32 m_AccessIdentID;
-
-	static u8 *keyTable[11];
-
-	u64 GetCurrentTitleID() const;
-
-	const DiscIO::INANDContentLoader& AccessContentDevice(u64 _TitleID);
-	u32 OpenTitleContent(u32 CFD, u64 TitleID, u16 Index);
-
-	bool IsValid(u64 _TitleID) const;
-
-	typedef struct ecc_cert_t
-	{
-		u32 sig_type          ;
-		 u8 sig         [0x3c];
-		 u8 pad         [0x40];
-		 u8 issuer      [0x40];
-		u32 key_type          ;
-		 u8 key_name    [0x40];
-		u32 ng_key_id         ;
-		 u8 ecc_pubkey  [0x3c];
-		 u8 padding     [0x3c];
-	} ecc_cert_t;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
deleted file mode 100644
index 3db9f70c48..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "CommonPaths.h"
-
-#include "WII_IPC_HLE_Device_fs.h"
-#include "WII_IPC_HLE_Device_FileIO.h"
-
-#include "StringUtil.h"
-#include "FileSearch.h"
-#include "FileUtil.h"
-#include "NandPaths.h"
-#include "ChunkFile.h"
-#include "../HW/SystemTimers.h"
-
-#include "../VolumeHandler.h"
-
-#define MAX_NAME				(12)
-
-static Common::replace_v replacements;
-
-
-CWII_IPC_HLE_Device_fs::CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName) 
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-	Common::ReadReplacements(replacements);
-}
-
-CWII_IPC_HLE_Device_fs::~CWII_IPC_HLE_Device_fs()
-{}
-
-bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
-{
-	// clear tmp folder
-	{
-		std::string Path = File::GetUserPath(D_WIIUSER_IDX) + "tmp";
-		File::DeleteDirRecursively(Path);
-		File::CreateDir(Path.c_str());
-	}
-
-	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_fs::Close(u32 _CommandAddress, bool _bForce)
-{
-	INFO_LOG(WII_IPC_FILEIO, "Close");
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-// Get total filesize of contents of a directory (recursive)
-// Only used for ES_GetUsage atm, could be useful elsewhere?
-static u64 ComputeTotalFileSize(const File::FSTEntry& parentEntry)
-{
-	u64 sizeOfFiles = 0;
-	const std::vector<File::FSTEntry>& children = parentEntry.children;
-	for (std::vector<File::FSTEntry>::const_iterator it = children.begin(); it != children.end(); ++it)
-	{
-		const File::FSTEntry& entry = *it;
-		if (entry.isDirectory)
-			sizeOfFiles += ComputeTotalFileSize(entry);
-		else
-			sizeOfFiles += entry.size;
-	}
-	return sizeOfFiles;
-}
-
-bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress) 
-{
-	u32 ReturnValue = FS_RESULT_OK;
-	SIOCtlVBuffer CommandBuffer(_CommandAddress);
-	
-	// Prepare the out buffer(s) with zeros as a safety precaution
-	// to avoid returning bad values
-	for(u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
-	{
-		Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
-			CommandBuffer.PayloadBuffer[i].m_Size);
-	}
-
-	switch(CommandBuffer.Parameter)
-	{
-	case IOCTLV_READ_DIR:
-		{
-			// the wii uses this function to define the type (dir or file)
-			std::string DirName(HLE_IPC_BuildFilename((const char*)Memory::GetPointer(
-				CommandBuffer.InBuffer[0].m_Address), CommandBuffer.InBuffer[0].m_Size));
-
-			INFO_LOG(WII_IPC_FILEIO, "FS: IOCTL_READ_DIR %s", DirName.c_str());
-
-			if (!File::Exists(DirName))
-			{
-				WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", DirName.c_str());
-				ReturnValue = FS_FILE_NOT_EXIST;
-				break;
-			}
-			else if (!File::IsDirectory(DirName))
-			{
-				// It's not a directory, so error.
-				// Games don't usually seem to care WHICH error they get, as long as it's <
-				// Well the system menu CARES!
-				WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_RESULT_FATAL");
-				ReturnValue = FS_RESULT_FATAL;
-				break;
-			}
-
-			// make a file search
-			CFileSearch::XStringVector Directories;
-			Directories.push_back(DirName);
-
-			CFileSearch::XStringVector Extensions;
-			Extensions.push_back("*.*");
-
-			CFileSearch FileSearch(Extensions, Directories);
-
-			// it is one
-			if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
-			{
-				size_t numFile = FileSearch.GetFileNames().size();
-				INFO_LOG(WII_IPC_FILEIO, "\t%lu files found", (unsigned long)numFile);
-
-				Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
-			}
-			else
-			{
-				u32 MaxEntries = Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address);
-
-				memset(Memory::GetPointer(CommandBuffer.PayloadBuffer[0].m_Address), 0, CommandBuffer.PayloadBuffer[0].m_Size);
-
-				size_t numFiles = 0;
-				char* pFilename = (char*)Memory::GetPointer((u32)(CommandBuffer.PayloadBuffer[0].m_Address));
-
-				for (size_t i=0; i<FileSearch.GetFileNames().size(); i++)
-				{
-					if (i >= MaxEntries)
-						break;
-
-					std::string name, ext;
-					SplitPath(FileSearch.GetFileNames()[i], NULL, &name, &ext);
-					std::string FileName = name + ext;
-
-					// Decode entities of invalid file system characters so that
-					// games (such as HP:HBP) will be able to find what they expect.
-					for (Common::replace_v::const_iterator it = replacements.begin(); it != replacements.end(); ++it)
-					{
-						for (size_t j = 0; (j = FileName.find(it->second, j)) != FileName.npos; ++j)
-							FileName.replace(j, it->second.length(), 1, it->first);
-					}
-
-					strcpy(pFilename, FileName.c_str());
-					pFilename += FileName.length();
-					*pFilename++ = 0x00;  // termination
-					numFiles++;
-
-					INFO_LOG(WII_IPC_FILEIO, "\tFound: %s", FileName.c_str());
-				}
-
-				Memory::Write_U32((u32)numFiles, CommandBuffer.PayloadBuffer[1].m_Address);
-			}
-
-			ReturnValue = FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTLV_GETUSAGE:
-		{
-			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer.size() == 2);
-			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer[0].m_Size == 4);
-			_dbg_assert_(WII_IPC_FILEIO, CommandBuffer.PayloadBuffer[1].m_Size == 4);
-
-			// this command sucks because it asks of the number of used 
-			// fsBlocks and inodes
-			// It should be correct, but don't count on it...
-			const char *relativepath = (const char*)Memory::GetPointer(CommandBuffer.InBuffer[0].m_Address);
-			std::string path(HLE_IPC_BuildFilename(relativepath, CommandBuffer.InBuffer[0].m_Size));
-			u32 fsBlocks = 0;
-			u32 iNodes = 0;
-
-			INFO_LOG(WII_IPC_FILEIO, "IOCTL_GETUSAGE %s", path.c_str());
-			if (File::IsDirectory(path))
-			{
-				// LPFaint99: After I found that setting the number of inodes to the number of children + 1 for the directory itself
-				// I decided to compare with sneek which has the following 2 special cases which are
-				// Copyright (C) 2009-2011  crediar http://code.google.com/p/sneek/
-				if ((memcmp(relativepath, "/title/00010001", 16 ) == 0 ) ||
-					(memcmp(relativepath, "/title/00010005", 16) == 0 ))
-				{
-					fsBlocks = 23; // size is size/0x4000
-					iNodes = 42; // empty folders return a FileCount of 1
-				}
-				else
-				{
-					File::FSTEntry parentDir;
-					// add one for the folder itself, allows some games to create their save files
-					// R8XE52 (Jurassic: The Hunted), STEETR (Tetris Party Deluxe) now create their saves with this change
-					iNodes = 1 + File::ScanDirectoryTree(path, parentDir);
-
-					u64 totalSize = ComputeTotalFileSize(parentDir); // "Real" size, to be converted to nand blocks
-
-					fsBlocks = (u32)(totalSize / (16 * 1024));  // one bock is 16kb
-				}
-				ReturnValue = FS_RESULT_OK;
-
-				INFO_LOG(WII_IPC_FILEIO, "FS: fsBlock: %i, iNodes: %i", fsBlocks, iNodes);
-			}
-			else
-			{
-				fsBlocks = 0;
-				iNodes = 0;
-				ReturnValue = FS_RESULT_OK;
-				WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directory: %s", path.c_str());
-			}
-
-			Memory::Write_U32(fsBlocks, CommandBuffer.PayloadBuffer[0].m_Address);
-			Memory::Write_U32(iNodes, CommandBuffer.PayloadBuffer[1].m_Address);
-		}
-		break;
-
-
-	default:
-		PanicAlert("CWII_IPC_HLE_Device_fs::IOCtlV: %i", CommandBuffer.Parameter);
-		break;
-	}
-
-	Memory::Write_U32(ReturnValue, _CommandAddress+4);
-
-	return true; 
-}
-
-bool CWII_IPC_HLE_Device_fs::IOCtl(u32 _CommandAddress) 
-{ 
-	//u32 DeviceID = Memory::Read_U32(_CommandAddress + 8);
-	//LOG(WII_IPC_FILEIO, "FS: IOCtl (Device=%s, DeviceID=%08x)", GetDeviceName().c_str(), DeviceID);
-
-	u32 Parameter =  Memory::Read_U32(_CommandAddress + 0xC);
-	u32 BufferIn =  Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize =  Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C);
-
-	/* Prepare the out buffer(s) with zeroes as a safety precaution
-	   to avoid returning bad values. */
-	//LOG(WII_IPC_FILEIO, "Cleared %u bytes of the out buffer", _BufferOutSize);
-	Memory::Memset(BufferOut, 0, BufferOutSize);
-
-	u32 ReturnValue = ExecuteCommand(Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);	
-	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-
-	return true; 
-}
-
-s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize)
-{
-	switch(_Parameter)
-	{
-	case IOCTL_GET_STATS:
-		{
-			if (_BufferOutSize < 0x1c)
-				return -1017;
-
-			WARN_LOG(WII_IPC_FILEIO, "FS: GET STATS - returning static values for now");
-
-			NANDStat fs;
-
-			//TODO: scrape the real amounts from somewhere...
-			fs.BlockSize	= 0x4000;
-			fs.FreeUserBlocks	= 0x5DEC;
-			fs.UsedUserBlocks	= 0x1DD4;
-			fs.FreeSysBlocks	= 0x10;
-			fs.UsedSysBlocks	= 0x02F0;
-			fs.Free_INodes	= 0x146B;
-			fs.Used_Inodes	= 0x0394;
-
-			*(NANDStat*)Memory::GetPointer(_BufferOut) = fs;
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTL_CREATE_DIR:
-		{
-			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
-			u32 Addr = _BufferIn;
-
-			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
-			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
-			std::string DirName(HLE_IPC_BuildFilename((const char*)Memory::GetPointer(Addr), 64)); Addr += 64;
-			Addr += 9; // owner attribs, permission
-			u8 Attribs = Memory::Read_U8(Addr);
-
-			INFO_LOG(WII_IPC_FILEIO, "FS: CREATE_DIR %s, OwnerID %#x, GroupID %#x, Attributes %#x", DirName.c_str(), OwnerID, GroupID, Attribs);
-
-			DirName += DIR_SEP;
-			File::CreateFullPath(DirName);
-			_dbg_assert_msg_(WII_IPC_FILEIO, File::IsDirectory(DirName), "FS: CREATE_DIR %s failed", DirName.c_str());
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTL_SET_ATTR:
-		{
-			u32 Addr = _BufferIn;
-		
-			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
-			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
-			std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn), 64); Addr += 64;
-			u8 OwnerPerm = Memory::Read_U8(Addr); Addr += 1;
-			u8 GroupPerm = Memory::Read_U8(Addr); Addr += 1;
-			u8 OtherPerm = Memory::Read_U8(Addr); Addr += 1;
-			u8 Attributes = Memory::Read_U8(Addr); Addr += 1;
-
-			INFO_LOG(WII_IPC_FILEIO, "FS: SetAttrib %s", Filename.c_str());
-			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerID: 0x%08x", OwnerID);
-			DEBUG_LOG(WII_IPC_FILEIO, "    GroupID: 0x%04x", GroupID);
-			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerPerm: 0x%02x", OwnerPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    GroupPerm: 0x%02x", GroupPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    OtherPerm: 0x%02x", OtherPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    Attributes: 0x%02x", Attributes);
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTL_GET_ATTR:
-		{		
-			_dbg_assert_msg_(WII_IPC_FILEIO, _BufferOutSize == 76,
-				"    GET_ATTR needs an 76 bytes large output buffer but it is %i bytes large",
-				_BufferOutSize);
-
-			u32 OwnerID = 0;
-			u16 GroupID = 0x3031; // this is also known as makercd, 01 (0x3031) for nintendo and 08 (0x3038) for MH3 etc
-			std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn), 64);
-			u8 OwnerPerm = 0x3;		// read/write
-			u8 GroupPerm = 0x3;		// read/write
-			u8 OtherPerm = 0x3;		// read/write		
-			u8 Attributes = 0x00;	// no attributes
-			if (File::IsDirectory(Filename))
-			{
-				INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR Directory %s - all permission flags are set", Filename.c_str());
-			}
-			else
-			{
-				if (File::Exists(Filename))
-				{
-					INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR %s - all permission flags are set", Filename.c_str());
-				}
-				else
-				{
-					INFO_LOG(WII_IPC_FILEIO, "FS: GET_ATTR unknown %s", Filename.c_str());
-					return FS_FILE_NOT_EXIST;
-				}
-			}
-
-			// write answer to buffer
-			if (_BufferOutSize == 76)
-			{
-				u32 Addr = _BufferOut;
-				Memory::Write_U32(OwnerID, Addr);										Addr += 4;
-				Memory::Write_U16(GroupID, Addr);										Addr += 2;
-				memcpy(Memory::GetPointer(Addr), Memory::GetPointer(_BufferIn), 64);	Addr += 64;
-				Memory::Write_U8(OwnerPerm, Addr);										Addr += 1;
-				Memory::Write_U8(GroupPerm, Addr);										Addr += 1;
-				Memory::Write_U8(OtherPerm, Addr);										Addr += 1;
-				Memory::Write_U8(Attributes, Addr);										Addr += 1;
-			}
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-
-	case IOCTL_DELETE_FILE:
-		{
-			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
-			int Offset = 0;
-
-			std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn+Offset), 64);
-			Offset += 64;
-			if (File::Delete(Filename))
-			{
-				INFO_LOG(WII_IPC_FILEIO, "FS: DeleteFile %s", Filename.c_str());
-			}
-			else if (File::DeleteDir(Filename))
-			{
-				INFO_LOG(WII_IPC_FILEIO, "FS: DeleteDir %s", Filename.c_str());
-			}
-			else
-			{
-				WARN_LOG(WII_IPC_FILEIO, "FS: DeleteFile %s - failed!!!", Filename.c_str());
-			}
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTL_RENAME_FILE:
-		{
-			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
-			int Offset = 0;
-
-			std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn+Offset), 64);
-			Offset += 64;
-
-			std::string FilenameRename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn+Offset), 64);
-			Offset += 64;
-
-			// try to make the basis directory
-			File::CreateFullPath(FilenameRename);
-
-			// if there is already a file, delete it
-			if (File::Exists(Filename) && File::Exists(FilenameRename))
-			{
-				File::Delete(FilenameRename);
-			}
-
-			// finally try to rename the file
-			if (File::Rename(Filename, FilenameRename))
-			{
-				INFO_LOG(WII_IPC_FILEIO, "FS: Rename %s to %s", Filename.c_str(), FilenameRename.c_str());
-			}
-			else
-			{
-				ERROR_LOG(WII_IPC_FILEIO, "FS: Rename %s to %s - failed", Filename.c_str(), FilenameRename.c_str());
-				return FS_FILE_NOT_EXIST;
-			}
-
-			return FS_RESULT_OK;
-		}
-		break;
-
-	case IOCTL_CREATE_FILE:
-		{
-			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
-
-			u32 Addr = _BufferIn;
-			u32 OwnerID = Memory::Read_U32(Addr); Addr += 4;
-			u16 GroupID = Memory::Read_U16(Addr); Addr += 2;
-			std::string Filename(HLE_IPC_BuildFilename((const char*)Memory::GetPointer(Addr), 64)); Addr += 64;
-			u8 OwnerPerm = Memory::Read_U8(Addr); Addr++;
-			u8 GroupPerm = Memory::Read_U8(Addr); Addr++;
-			u8 OtherPerm = Memory::Read_U8(Addr); Addr++;
-			u8 Attributes = Memory::Read_U8(Addr); Addr++;
-
-			INFO_LOG(WII_IPC_FILEIO, "FS: CreateFile %s", Filename.c_str());
-			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerID: 0x%08x", OwnerID);
-			DEBUG_LOG(WII_IPC_FILEIO, "    GroupID: 0x%04x", GroupID);
-			DEBUG_LOG(WII_IPC_FILEIO, "    OwnerPerm: 0x%02x", OwnerPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    GroupPerm: 0x%02x", GroupPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    OtherPerm: 0x%02x", OtherPerm);
-			DEBUG_LOG(WII_IPC_FILEIO, "    Attributes: 0x%02x", Attributes);
-
-			// check if the file already exist
-			if (File::Exists(Filename))
-			{
-				WARN_LOG(WII_IPC_FILEIO, "\tresult = FS_RESULT_EXISTS");
-				return FS_FILE_EXIST;
-			}
-
-			// create the file
-			File::CreateFullPath(Filename);  // just to be sure
-			bool Result = File::CreateEmptyFile(Filename);
-			if (!Result)
-			{
-				ERROR_LOG(WII_IPC_FILEIO, "CWII_IPC_HLE_Device_fs: couldn't create new file");
-				PanicAlert("CWII_IPC_HLE_Device_fs: couldn't create new file");
-				return FS_RESULT_FATAL;
-			}
-
-			INFO_LOG(WII_IPC_FILEIO, "\tresult = FS_RESULT_OK");
-			return FS_RESULT_OK;
-		}
-		break;
-	case IOCTL_SHUTDOWN:
-		{
-			INFO_LOG(WII_IPC_FILEIO, "Wii called Shutdown()");
-			// TODO: stop emulation
-		}
-		break;
-	default:
-		ERROR_LOG(WII_IPC_FILEIO, "CWII_IPC_HLE_Device_fs::IOCtl: ni  0x%x", _Parameter);
-		PanicAlert("CWII_IPC_HLE_Device_fs::IOCtl: ni  0x%x", _Parameter);
-		break;
-	}
-
-	return FS_RESULT_FATAL;
-}
-
-int CWII_IPC_HLE_Device_fs::GetCmdDelay(u32)
-{
-	// ~1/1000th of a second is too short and causes hangs in Wii Party
-	// Play it safe at 1/500th
-	return SystemTimers::GetTicksPerSecond() / 500;
-}
-
-void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
-{
-	DoStateShared(p);
-
-	// handle /tmp
-
-	std::string Path = File::GetUserPath(D_WIIUSER_IDX) + "tmp";
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		File::DeleteDirRecursively(Path);
-		File::CreateDir(Path.c_str());
-
-		//now restore from the stream
-		while(1) {
-			char type = 0;
-			p.Do(type);
-			if (!type)
-				break;
-			std::string filename;
-			p.Do(filename);
-			std::string name = Path + DIR_SEP + filename;
-			switch(type)
-			{
-			case 'd':
-			{
-				File::CreateDir(name.c_str());
-				break;
-			}
-			case 'f':
-			{
-				u32 size = 0;
-				p.Do(size);
-
-				File::IOFile handle(name, "wb");
-				char buf[65536];
-				u32 count = size;
-				while(count > 65536) {
-					p.DoArray(&buf[0], 65536);
-					handle.WriteArray(&buf[0], 65536);
-					count -= 65536;
-				}
-				p.DoArray(&buf[0], count);
-				handle.WriteArray(&buf[0], count);
-				break;
-			}
-			}
-		}
-	}
-	else
-	{
-		//recurse through tmp and save dirs and files
-
-		File::FSTEntry parentEntry;
-		File::ScanDirectoryTree(Path, parentEntry);
-		std::deque<File::FSTEntry> todo;
-		todo.insert(todo.end(), parentEntry.children.begin(),
-			    parentEntry.children.end());
-
-		while(!todo.empty())
-		{
-			File::FSTEntry &entry = todo.front();
-			std::string name = entry.physicalName;
-			name.erase(0,Path.length()+1);
-			char type = entry.isDirectory?'d':'f';
-			p.Do(type);
-			p.Do(name);
-			if (entry.isDirectory)
-			{
-				todo.insert(todo.end(), entry.children.begin(),
-					    entry.children.end());
-			}
-			else
-			{
-				u32 size = entry.size;
-				p.Do(size);
-
-				File::IOFile handle(entry.physicalName, "rb");
-				char buf[65536];
-				u32 count = size;
-				while(count > 65536) {
-					handle.ReadArray(&buf[0], 65536);
-					p.DoArray(&buf[0], 65536);
-					count -= 65536;
-				}
-				handle.ReadArray(&buf[0], count);
-				p.DoArray(&buf[0], count);
-			}
-			todo.pop_front();
-		}
-
-		char type = 0;
-		p.Do(type);
-	}
-}
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
deleted file mode 100644
index 6e896b4e48..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_FS_H_
-#define _WII_IPC_HLE_DEVICE_FS_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-struct NANDStat
-{
-	u32 BlockSize;
-	u32 FreeUserBlocks;
-	u32 UsedUserBlocks;
-	u32 FreeSysBlocks;
-	u32 UsedSysBlocks;
-	u32 Free_INodes;
-	u32 Used_Inodes;
-};
-
-enum {
-	FS_RESULT_OK			=  0,
-	FS_INVALID				= -4,
-	FS_DIRFILE_NOT_FOUND	= -6,
-	FS_RESULT_FATAL			= -101,
-	FS_NO_ACCESS			= -102,
-	FS_FILE_EXIST			= -105,
-	FS_FILE_NOT_EXIST		= -106,
-	FS_NO_HANDLE			= -106,
-};
-
-class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
-	virtual ~CWII_IPC_HLE_Device_fs();
-
-	virtual void DoState(PointerWrap& p);
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-
-	virtual bool IOCtl(u32 _CommandAddress);
-	virtual bool IOCtlV(u32 _CommandAddress);
-	
-	virtual int GetCmdDelay(u32);
-
-private:
-
-	enum
-	{
-		IOCTL_GET_STATS		= 0x02,
-		IOCTL_CREATE_DIR	= 0x03,
-		IOCTLV_READ_DIR		= 0x04,
-		IOCTL_SET_ATTR		= 0x05,
-		IOCTL_GET_ATTR		= 0x06,
-		IOCTL_DELETE_FILE	= 0x07,
-		IOCTL_RENAME_FILE	= 0x08,
-		IOCTL_CREATE_FILE	= 0x09,
-		IOCTLV_GETUSAGE		= 0x0C,
-		IOCTL_SHUTDOWN		= 0x0D
-	};
-
-	s32 ExecuteCommand(u32 Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize);
-};
-
-#endif
-
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
deleted file mode 100644
index e663d737c2..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
+++ /dev/null
@@ -1,630 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../Core.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "../HW/WII_IPC.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device_hid.h"
-#include "errno.h"
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#  include <time.h>
-#ifndef _TIMEVAL_DEFINED /* also in winsock[2].h */
-#define _TIMEVAL_DEFINED
-struct timeval {
-	long tv_sec;
-	long tv_usec;
-};
-#endif /* _TIMEVAL_DEFINED */
-#else
-#  include <sys/time.h>
-#endif
-
-#define MAX_DEVICE_DEVNUM 256
-static u64 hidDeviceAliases[MAX_DEVICE_DEVNUM];
-
-// Regular thread
-void CWII_IPC_HLE_Device_hid::checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid)
-{
-	timeval tv;
-	tv.tv_sec = 0;
-	tv.tv_usec = 500;
-	while (hid->usb_thread_running)
-	{
-
-		static u16 timeToFill = 0;
-		if (timeToFill == 0)
-		{
-			std::lock_guard<std::mutex> lk(hid->s_device_list_reply);
-			if (hid->deviceCommandAddress != 0){
-				hid->FillOutDevices(Memory::Read_U32(hid->deviceCommandAddress + 0x18), Memory::Read_U32(hid->deviceCommandAddress + 0x1C));
-
-				Memory::Write_U32(8, hid->deviceCommandAddress);
-				// IOS seems to write back the command that was responded to
-				Memory::Write_U32(/*COMMAND_IOCTL*/ 6, hid->deviceCommandAddress + 8);
-
-				// Return value
-				Memory::Write_U32(0, hid->deviceCommandAddress + 4);
-
-				WII_IPC_HLE_Interface::EnqueReplyCallback(hid->deviceCommandAddress);
-				hid->deviceCommandAddress = 0;
-			}
-		}
-		timeToFill+=8;
-		libusb_handle_events_timeout(NULL, &tv);
-	}
-
-	return;
-}
-
-void CWII_IPC_HLE_Device_hid::handleUsbUpdates(struct libusb_transfer *transfer)
-{
-	int ret = HIDERR_NO_DEVICE_FOUND;
-	u32 replyAddress = (u32)(size_t)transfer->user_data;
-	if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
-	{
-		ret = transfer->length;
-	}
-
-	Memory::Write_U32(8, replyAddress);
-	// IOS seems to write back the command that was responded to
-	Memory::Write_U32(/*COMMAND_IOCTL*/ 6, replyAddress + 8);
-
-	// Return value
-	Memory::Write_U32(ret, replyAddress + 4);
-
-	WII_IPC_HLE_Interface::EnqueReplyCallback(replyAddress);
-	//DEBUG_LOG(WII_IPC_HID, "OMG OMG OMG I GOT A CALLBACK, IMMA BE FAMOUS %d %d %d", transfer->actual_length, transfer->length, transfer->status);
-}
-
-
-CWII_IPC_HLE_Device_hid::CWII_IPC_HLE_Device_hid(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-	deviceCommandAddress = 0;
-	memset(hidDeviceAliases, 0, sizeof(hidDeviceAliases));
-	int ret = libusb_init(NULL);
-	if (ret)
-	{
-		ERROR_LOG(WII_IPC_HID, "libusb_init failed with error: %d", ret);
-	}
-	else
-	{
-		usb_thread_running = true;
-		usb_thread = std::thread(checkUsbUpdates, this);
-	}
-}
-
-CWII_IPC_HLE_Device_hid::~CWII_IPC_HLE_Device_hid()
-{
-	bool deinit_libusb = false;
-	if (usb_thread_running)
-	{
-		usb_thread_running = false;
-		usb_thread.join();
-		deinit_libusb = true;
-	}
-
-	for ( std::map<u32,libusb_device_handle*>::const_iterator iter = open_devices.begin(); iter != open_devices.end(); ++iter )
-	{
-		libusb_close(iter->second);
-	}
-	open_devices.clear();
-
-	if (deinit_libusb)
-		libusb_exit(NULL);
-}
-
-bool CWII_IPC_HLE_Device_hid::Open(u32 _CommandAddress, u32 _Mode)
-{
-	DEBUG_LOG(WII_IPC_HID, "HID::Open");
-	m_Active = true;
-	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_hid::Close(u32 _CommandAddress, bool _bForce)
-{
-	DEBUG_LOG(WII_IPC_HID, "HID::Close");
-	m_Active = false;
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	return true;
-}
-
-u32 CWII_IPC_HLE_Device_hid::Update()
-{
-
-	u32 work_done = 0;
-	return work_done;
-}
-
-bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress)
-{
-	u32 Parameter		= Memory::Read_U32(_CommandAddress + 0xC);
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-
-	u32 ReturnValue = 0;
-	switch (Parameter)
-	{
-	case IOCTL_HID_GET_ATTACHED:
-	{
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Get Attached) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		deviceCommandAddress = _CommandAddress;
-		return false;
-		break;
-	}
-	case IOCTL_HID_OPEN:
-	{
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Open) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		//hid version, apparently
-		ReturnValue = 0x40001;
-		break;
-	}
-	case IOCTL_HID_SET_SUSPEND:
-	{
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Set Suspend) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		// not actually implemented in IOS
-		ReturnValue = 0;
-		break;
-	}
-	case IOCTL_HID_CANCEL_INTERRUPT:
-	{
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Cancel Interrupt) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		ReturnValue = 0;
-		break;
-	}
-	case IOCTL_HID_CONTROL:
-	{
-		/*
-			ERROR CODES:
-			-4 Cant find device specified
-		*/
-
-		u32 dev_num  = Memory::Read_U32(BufferIn+0x10);
-		u8 bmRequestType = Memory::Read_U8(BufferIn+0x14);
-		u8 bRequest = Memory::Read_U8(BufferIn+0x15);
-		u16 wValue = Memory::Read_U16(BufferIn+0x16);
-		u16 wIndex = Memory::Read_U16(BufferIn+0x18);
-		u16 wLength = Memory::Read_U16(BufferIn+0x1A);
-		u32 data = Memory::Read_U32(BufferIn+0x1C);
-
-		ReturnValue = HIDERR_NO_DEVICE_FOUND;
-
-		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
-
-		if (dev_handle == NULL)
-		{
-			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
-			break;
-		}
-		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
-		transfer->flags |= LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER;
-
-		u8 * buffer = (u8*)malloc(wLength + LIBUSB_CONTROL_SETUP_SIZE);
-		libusb_fill_control_setup(buffer, bmRequestType, bRequest, wValue, wIndex, wLength);
-		memcpy(buffer + LIBUSB_CONTROL_SETUP_SIZE, Memory::GetPointer(data), wLength);
-		libusb_fill_control_transfer(transfer, dev_handle, buffer, handleUsbUpdates, (void*)(size_t)_CommandAddress, /* no timeout */ 0);
-		libusb_submit_transfer(transfer);
-
-		//DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Control)(%02X, %02X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-		//		  bmRequestType, bRequest, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		// It's the async way!
-		return false;
-		break;
-	}
-	case IOCTL_HID_INTERRUPT_OUT:
-	case IOCTL_HID_INTERRUPT_IN:
-	{
-		u32 dev_num  = Memory::Read_U32(BufferIn+0x10);
-		u32 endpoint = Memory::Read_U32(BufferIn+0x14);
-		u32 length = Memory::Read_U32(BufferIn+0x18);
-
-		u32 data = Memory::Read_U32(BufferIn+0x1C);
-
-		ReturnValue = HIDERR_NO_DEVICE_FOUND;
-
-		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
-
-		if (dev_handle == NULL)
-		{
-			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
-			break;
-		}
-
-		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
-		transfer->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
-		libusb_fill_interrupt_transfer(transfer, dev_handle, endpoint, Memory::GetPointer(data), length,
-									   handleUsbUpdates, (void*)(size_t)_CommandAddress, 0);
-		libusb_submit_transfer(transfer);
-
-		//DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Interrupt %s)(%d,%d,%X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-		//	Parameter == IOCTL_HID_INTERRUPT_IN ? "In" : "Out", endpoint, length, data, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		// It's the async way!
-		return false;
-		break;
-	}
-	case IOCTL_HID_SHUTDOWN:
-	{
-		std::lock_guard<std::mutex> lk(s_device_list_reply);
-		if (deviceCommandAddress != 0){
-			Memory::Write_U32(0xFFFFFFFF, Memory::Read_U32(deviceCommandAddress + 0x18));
-
-			Memory::Write_U32(8, deviceCommandAddress);
-			// IOS seems to write back the command that was responded to
-			Memory::Write_U32(/*COMMAND_IOCTL*/ 6, deviceCommandAddress + 8);
-
-			// Return value
-			Memory::Write_U32(-1, deviceCommandAddress + 4);
-			WII_IPC_HLE_Interface::EnqueReplyCallback(deviceCommandAddress);
-			deviceCommandAddress = 0;
-		}
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Shutdown) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-	default:
-	{
-		DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(0x%x) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-	}
-
-	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-
-	return true;
-}
-
-
-bool CWII_IPC_HLE_Device_hid::ClaimDevice(libusb_device_handle * dev)
-{
-	int ret = 0;
-	if ((ret = libusb_kernel_driver_active(dev, 0)) == 1)
-	{
-		if ((ret = libusb_detach_kernel_driver(dev, 0)) && ret != LIBUSB_ERROR_NOT_SUPPORTED)
-		{
-			DEBUG_LOG(WII_IPC_HID, "libusb_detach_kernel_driver failed with error: %d", ret);
-			return false;
-		}
-	}
-	else if (ret != 0 && ret != LIBUSB_ERROR_NOT_SUPPORTED)
-	{
-		DEBUG_LOG(WII_IPC_HID, "libusb_kernel_driver_active error ret = %d", ret);
-		return false;
-	}
-
-	if ((ret = libusb_claim_interface(dev, 0)))
-	{
-		DEBUG_LOG(WII_IPC_HID, "libusb_claim_interface failed with error: %d", ret);
-		return false;
-	}
-
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_hid::IOCtlV(u32 _CommandAddress)
-{
-
-	Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HID, LogTypes::LWARNING);
-	u32 ReturnValue = 0;
-	SIOCtlVBuffer CommandBuffer(_CommandAddress);
-
-	DEBUG_LOG(WII_IPC_HID, "%s - IOCtlV:", GetDeviceName().c_str());
-	DEBUG_LOG(WII_IPC_HID, "    Parameter: 0x%x", CommandBuffer.Parameter);
-	DEBUG_LOG(WII_IPC_HID, "    NumberIn: 0x%08x", CommandBuffer.NumberInBuffer);
-	DEBUG_LOG(WII_IPC_HID, "    NumberOut: 0x%08x", CommandBuffer.NumberPayloadBuffer);
-	DEBUG_LOG(WII_IPC_HID, "    BufferVector: 0x%08x", CommandBuffer.BufferVector);
-	DEBUG_LOG(WII_IPC_HID, "    PayloadAddr: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Address);
-	DEBUG_LOG(WII_IPC_HID, "    PayloadSize: 0x%08x", CommandBuffer.PayloadBuffer[0].m_Size);
-	#if defined(_DEBUG) || defined(DEBUGFAST)
-	DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer);
-	#endif
-
-	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-	return true;
-}
-
-
-
-void CWII_IPC_HLE_Device_hid::ConvertDeviceToWii(WiiHIDDeviceDescriptor *dest, const struct libusb_device_descriptor *src)
-{
-	memcpy(dest,src,sizeof(WiiHIDDeviceDescriptor));
-	dest->bcdUSB = Common::swap16(dest->bcdUSB);
-	dest->idVendor = Common::swap16(dest->idVendor);
-	dest->idProduct = Common::swap16(dest->idProduct);
-	dest->bcdDevice = Common::swap16(dest->bcdDevice);
-}
-
-void CWII_IPC_HLE_Device_hid::ConvertConfigToWii(WiiHIDConfigDescriptor *dest, const struct libusb_config_descriptor *src)
-{
-	memcpy(dest,src,sizeof(WiiHIDConfigDescriptor));
-	dest->wTotalLength = Common::swap16(dest->wTotalLength);
-}
-
-void CWII_IPC_HLE_Device_hid::ConvertInterfaceToWii(WiiHIDInterfaceDescriptor *dest, const struct libusb_interface_descriptor *src)
-{
-	memcpy(dest,src,sizeof(WiiHIDInterfaceDescriptor));
-}
-
-void CWII_IPC_HLE_Device_hid::ConvertEndpointToWii(WiiHIDEndpointDescriptor *dest, const struct libusb_endpoint_descriptor *src)
-{
-	memcpy(dest,src,sizeof(WiiHIDEndpointDescriptor));
-	dest->wMaxPacketSize = Common::swap16(dest->wMaxPacketSize);
-}
-
-void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
-{
-	static u16 check = 1;
-	int OffsetBuffer = BufferOut;
-	int OffsetStart = 0;
-	//int OffsetDevice = 0;
-	int d,c,ic,i,e; /* config, interface container, interface, endpoint  */
-
-	libusb_device **list;
-	//libusb_device *found = NULL;
-	ssize_t cnt = libusb_get_device_list(NULL, &list);
-	DEBUG_LOG(WII_IPC_HID, "Found %ld viable USB devices.", cnt);
-	for (d = 0; d < cnt; d++)
-	{
-		libusb_device *device = list[d];
-		struct libusb_device_descriptor desc;
-		int dRet = libusb_get_device_descriptor (device, &desc);
-		if (dRet)
-		{
-			// could not aquire the descriptor, no point in trying to use it.
-			DEBUG_LOG(WII_IPC_HID, "libusb_get_device_descriptor failed with error: %d", dRet);
-			continue;
-		}
-		OffsetStart = OffsetBuffer;
-		OffsetBuffer += 4; // skip length for now, fill at end
-
-		OffsetBuffer += 4; // skip devNum for now
-
-		WiiHIDDeviceDescriptor wii_device;
-		ConvertDeviceToWii(&wii_device, &desc);
-		Memory::WriteBigEData((const u8*)&wii_device, OffsetBuffer, Align(wii_device.bLength, 4));
-		OffsetBuffer += Align(wii_device.bLength, 4);
-		bool deviceValid = true;
-
-		for (c = 0; deviceValid && c < desc.bNumConfigurations; c++)
-		{
-			struct libusb_config_descriptor *config = NULL;
-			int cRet = libusb_get_config_descriptor(device, c, &config);
-
-			// do not try to use usb devices with more than one interface, games can crash
-			if(cRet == 0 && config->bNumInterfaces <= MAX_HID_INTERFACES)
-			{
-				WiiHIDConfigDescriptor wii_config;
-				ConvertConfigToWii(&wii_config, config);
-				Memory::WriteBigEData((const u8*)&wii_config, OffsetBuffer, Align(wii_config.bLength, 4));
-				OffsetBuffer += Align(wii_config.bLength, 4);
-
-				for (ic = 0; ic < config->bNumInterfaces; ic++)
-				{
-					const struct libusb_interface *interfaceContainer = &config->interface[ic];
-					for (i = 0; i < interfaceContainer->num_altsetting; i++)
-					{
-						const struct libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i];
-
-						WiiHIDInterfaceDescriptor wii_interface;
-						ConvertInterfaceToWii(&wii_interface, interface);
-						Memory::WriteBigEData((const u8*)&wii_interface, OffsetBuffer, Align(wii_interface.bLength, 4));
-						OffsetBuffer += Align(wii_interface.bLength, 4);
-
-						for (e = 0; e < interface->bNumEndpoints; e++)
-						{
-							const struct libusb_endpoint_descriptor *endpoint = &interface->endpoint[e];
-
-							WiiHIDEndpointDescriptor wii_endpoint;
-							ConvertEndpointToWii(&wii_endpoint, endpoint);
-							Memory::WriteBigEData((const u8*)&wii_endpoint, OffsetBuffer, Align(wii_endpoint.bLength, 4));
-							OffsetBuffer += Align(wii_endpoint.bLength, 4);
-
-						} //endpoints
-					} // interfaces
-				} // interface containters
-				libusb_free_config_descriptor(config);
-				config = NULL;
-			}
-			else
-			{
-				if(cRet)
-					DEBUG_LOG(WII_IPC_HID, "libusb_get_config_descriptor failed with: %d", cRet);
-				deviceValid = false;
-				OffsetBuffer = OffsetStart;
-			}
-		} // configs
-
-		if (deviceValid)
-		{
-			Memory::Write_U32(OffsetBuffer-OffsetStart, OffsetStart); // fill in length
-
-			int devNum = GetAvaiableDevNum(desc.idVendor,
-											desc.idProduct,
-											libusb_get_bus_number (device),
-											libusb_get_device_address (device),
-											check);
-			if (devNum < 0 )
-			{
-				// too many devices to handle.
-				ERROR_LOG(WII_IPC_HID, "Exhausted device list, you have way too many usb devices plugged in."
-				"Or it might be our fault. Let us know at https://code.google.com/p/dolphin-emu/issues/entry?template=Defect%%20report");
-				OffsetBuffer = OffsetStart;
-				continue;
-			}
-
-			DEBUG_LOG(WII_IPC_HID, "Found device with Vendor: %X Product: %X Devnum: %d", desc.idVendor, desc.idProduct, devNum);
-
-			Memory::Write_U32(devNum , OffsetStart+4); //write device num
-		}
-	}
-
-	// Find devices that no longer exists and free them
-	for (i=0; i<MAX_DEVICE_DEVNUM; i++)
-	{
-		u16 check_cur = (u16)(hidDeviceAliases[i] >> 48);
-		if(hidDeviceAliases[i] != 0 && check_cur != check)
-		{
-			DEBUG_LOG(WII_IPC_HID, "Removing: device %d %hX %hX", i, check, check_cur);
-			std::lock_guard<std::mutex> lk(s_open_devices);
-			if (open_devices.find(i) != open_devices.end())
-			{
-				libusb_device_handle *handle = open_devices[i];
-				libusb_close(handle);
-				open_devices.erase(i);
-			}
-			hidDeviceAliases[i] = 0;
-		}
-	}
-	check++;
-
-
-	libusb_free_device_list(list, 1);
-
-	Memory::Write_U32(0xFFFFFFFF, OffsetBuffer); // no more devices
-
-}
-
-int CWII_IPC_HLE_Device_hid::Align(int num, int alignment)
-{
-	return (num + (alignment-1)) & ~(alignment-1);
-}
-
-
-libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
-{
-	u32 i;
-	libusb_device **list;
-	libusb_device_handle *handle = NULL;
-	ssize_t cnt;
-
-	if(devNum >= MAX_DEVICE_DEVNUM)
-		return NULL;
-
-
-	std::lock_guard<std::mutex> lk(s_open_devices);
-
-	if (open_devices.find(devNum) != open_devices.end())
-	{
-		handle = open_devices[devNum];
-		if(libusb_kernel_driver_active(handle, 0) != LIBUSB_ERROR_NO_DEVICE)
-		{
-			return handle;
-		}
-		else
-		{
-			libusb_close(handle);
-			open_devices.erase(devNum);
-		}
-	}
-
-	cnt = libusb_get_device_list(NULL, &list);
-
-	if (cnt < 0)
-		return NULL;
-
-	for (i = 0; i < cnt; i++) {
-		libusb_device *device = list[i];
-		struct libusb_device_descriptor desc;
-		int dRet = libusb_get_device_descriptor (device, &desc);
-		u8 bus = libusb_get_bus_number (device);
-		u8 port = libusb_get_device_address (device);
-		u64 unique_id = ((u64)desc.idVendor << 32) | ((u64)desc.idProduct << 16) | ((u64)bus << 8) | (u64)port;
-		if ((hidDeviceAliases[devNum] & HID_ID_MASK) == unique_id)
-		{
-			int ret = libusb_open(device, &handle);
-			if (ret)
-			{
-				if (ret == LIBUSB_ERROR_ACCESS)
-				{
-					if( dRet )
-					{
-						ERROR_LOG(WII_IPC_HID, "Dolphin does not have access to this device: Bus %03d Device %03d: ID ????:???? (couldn't get id).",
-								bus,
-								port
-						);
-					}
-					else{
-						ERROR_LOG(WII_IPC_HID, "Dolphin does not have access to this device: Bus %03d Device %03d: ID %04X:%04X.",
-								bus,
-								port,
-								desc.idVendor,
-								desc.idProduct
-						);
-					}
-				}
-#ifdef _WIN32
-				else if (ret == LIBUSB_ERROR_NOT_SUPPORTED)
-				{
-					WARN_LOG(WII_IPC_HID, "Please install the libusb drivers for the device %04X:%04X", desc.idVendor, desc.idProduct);
-				}
-#endif
-				else
-				{
-					ERROR_LOG(WII_IPC_HID, "libusb_open failed to open device with error = %d", ret);
-				}
-				continue;
-			}
-
-
-			if (!ClaimDevice(handle))
-			{
-				ERROR_LOG(WII_IPC_HID, "Could not claim the device for handle: %X", devNum);
-				libusb_close(handle);
-				continue;
-			}
-
-			open_devices[devNum] = handle;
-			break;
-		}
-		else
-		{
-			handle = NULL;
-		}
-	}
-
-	libusb_free_device_list(list, 1);
-
-
-	return handle;
-}
-
-
-int CWII_IPC_HLE_Device_hid::GetAvaiableDevNum(u16 idVendor, u16 idProduct, u8 bus, u8 port, u16 check)
-{
-	int i;
-	int pos = -1;
-	u64 unique_id = ((u64)idVendor << 32) | ((u64)idProduct << 16) | ((u64)bus << 8) | (u64)port;
-	for (i=0; i<MAX_DEVICE_DEVNUM; i++)
-	{
-		u64 id = hidDeviceAliases[i] & HID_ID_MASK;
-		if(id == 0 && pos == -1)
-		{
-			pos = i;
-		}
-		else if (id == unique_id)
-		{
-			hidDeviceAliases[i] = id | ((u64)check << 48);
-			return i;
-		}
-	}
-	if(pos != -1)
-	{
-		hidDeviceAliases[pos] = unique_id | ((u64)check << 48);
-		return pos;
-	}
-	return -1;
-}
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
deleted file mode 100644
index 74169a50b3..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_HID_H_
-#define _WII_IPC_HLE_DEVICE_HID_H_
-
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device.h"
-#include "libusb.h"
-#include "Thread.h"
-#include <list>
-
-#define HID_ID_MASK 0x0000FFFFFFFFFFFF
-#define MAX_HID_INTERFACES 1
-
-#define HIDERR_NO_DEVICE_FOUND -4
-
-/* Connection timed out */
-
-class CWII_IPC_HLE_Device_hid : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_hid(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_hid();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-	virtual u32 Update();
-
-	virtual bool IOCtlV(u32 _CommandAddress);
-	virtual bool IOCtl(u32 _CommandAddress);
-
-private:
-	enum
-	{
-		IOCTL_HID_GET_ATTACHED     = 0x00,
-		IOCTL_HID_SET_SUSPEND      = 0x01,
-		IOCTL_HID_CONTROL          = 0x02,
-		IOCTL_HID_INTERRUPT_IN     = 0x03,
-		IOCTL_HID_INTERRUPT_OUT    = 0x04,
-		IOCTL_HID_GET_US_STRING    = 0x05,
-		IOCTL_HID_OPEN             = 0x06,
-		IOCTL_HID_SHUTDOWN         = 0x07,
-		IOCTL_HID_CANCEL_INTERRUPT = 0x08,
-	};
-
-	/* Device descriptor */
-	typedef struct
-	{
-		 u8 bLength;
-		 u8 bDescriptorType;
-		u16 bcdUSB;
-		 u8 bDeviceClass;
-		 u8 bDeviceSubClass;
-		 u8 bDeviceProtocol;
-		 u8 bMaxPacketSize0;
-		u16 idVendor;
-		u16 idProduct;
-		u16 bcdDevice;
-		 u8 iManufacturer;
-		 u8 iProduct;
-		 u8 iSerialNumber;
-		 u8 bNumConfigurations;
-		 u8 pad[2];
-	} WiiHIDDeviceDescriptor;
-
-	typedef struct
-	{
-		 u8 bLength;
-		 u8 bDescriptorType;
-		u16 wTotalLength;
-		 u8 bNumInterfaces;
-		 u8 bConfigurationValue;
-		 u8 iConfiguration;
-		 u8 bmAttributes;
-		 u8 MaxPower;
-		 u8 pad[3];
-	} WiiHIDConfigDescriptor;
-
-	typedef struct
-	{
-		 u8 bLength;
-		 u8 bDescriptorType;
-		 u8 bInterfaceNumber;
-		 u8 bAlternateSetting;
-		 u8 bNumEndpoints;
-		 u8 bInterfaceClass;
-		 u8 bInterfaceSubClass;
-		 u8 bInterfaceProtocol;
-		 u8 iInterface;
-		 u8 pad[3];
-	} WiiHIDInterfaceDescriptor;
-
-	typedef struct
-	{
-		 u8 bLength;
-		 u8 bDescriptorType;
-		 u8 bEndpointAddress;
-		 u8 bmAttributes;
-		u16 wMaxPacketSize;
-		 u8 bInterval;
-		 u8 bRefresh;
-		 u8 bSynchAddress;
-		 u8 pad[1];
-	} WiiHIDEndpointDescriptor;
-
-	u32 deviceCommandAddress;
-	void FillOutDevices(u32 BufferOut, u32 BufferOutSize);
-	int GetAvaiableDevNum(u16 idVendor, u16 idProduct, u8 bus, u8 port, u16 check);
-	bool ClaimDevice(libusb_device_handle * dev);
-
-	void ConvertDeviceToWii(WiiHIDDeviceDescriptor *dest, const struct libusb_device_descriptor *src);
-	void ConvertConfigToWii(WiiHIDConfigDescriptor *dest, const struct libusb_config_descriptor *src);
-	void ConvertInterfaceToWii(WiiHIDInterfaceDescriptor *dest, const struct libusb_interface_descriptor *src);
-	void ConvertEndpointToWii(WiiHIDEndpointDescriptor *dest, const struct libusb_endpoint_descriptor *src);
-
-	int Align(int num, int alignment);
-	static void checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid);
-	static void LIBUSB_CALL handleUsbUpdates(struct libusb_transfer *transfer);
-
-	struct libusb_device_handle * GetDeviceByDevNum(u32 devNum);
-	std::map<u32,libusb_device_handle*> open_devices;
-	std::mutex s_open_devices;
-	std::mutex s_device_list_reply;
-	std::map<std::string,int> device_identifiers;
-
-	std::thread usb_thread;
-	bool usb_thread_running;
-
-	typedef struct
-	{
-		u32 enq_address;
-		u32 type;
-		void * context;
-	} _hidevent;
-
-	std::list<_hidevent> event_list;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
deleted file mode 100644
index cf5ede4c35..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+++ /dev/null
@@ -1,1416 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "WII_IPC_HLE_Device_es.h"
-#include "WII_IPC_HLE_Device_net.h"
-#include "../ConfigManager.h"
-#include "FileUtil.h"
-#include <stdio.h>
-#include <string>
-#include "ICMP.h"
-#include "CommonPaths.h"
-#include "SettingsHandler.h"
-#include "ec_wii.h"
-#include "WII_Socket.h"
-
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#include <iphlpapi.h>
-#include <iphlpapi.h>
-
-#include "fakepoll.h"
-#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
-#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
-
-#elif defined(__linux__) or defined(__APPLE__)
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <errno.h>
-#include <poll.h>
-#include <string.h>
-
-typedef struct pollfd pollfd_t;
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#endif
-
-extern std::queue<std::pair<u32,std::string> > g_ReplyQueueLater;
-const u8 default_address[] = { 0x00, 0x17, 0xAB, 0x99, 0x99, 0x99 };
-
-// **********************************************************************************
-// Handle /dev/net/kd/request requests
-CWII_IPC_HLE_Device_net_kd_request::CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-}
-
-CWII_IPC_HLE_Device_net_kd_request::~CWII_IPC_HLE_Device_net_kd_request()
-{
-	WiiSockMan::getInstance().clean();
-}
-
-bool CWII_IPC_HLE_Device_net_kd_request::Open(u32 _CommandAddress, u32 _Mode)
-{
-	INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: Open");
-	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_kd_request::Close(u32 _CommandAddress, bool _bForce)
-{
-	INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: Close");
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_kd_request::IOCtl(u32 _CommandAddress)
-{
-	u32 Parameter		= Memory::Read_U32(_CommandAddress + 0xC);
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-
-	u32 ReturnValue = 0;
-	switch (Parameter)
-	{
-	case IOCTL_NWC24_SUSPEND_SCHEDULAR:
-		// NWC24iResumeForCloseLib  from NWC24SuspendScheduler (Input: none, Output: 32 bytes)
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_SUSPEND_SCHEDULAR - NI");
-		Memory::Write_U32(0, BufferOut); // no error
-		break;
-
-	case IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR: // NWC24iResumeForCloseLib
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR - NI");
-		break;
-
-	case IOCTL_NWC24_EXEC_RESUME_SCHEDULAR : // NWC24iResumeForCloseLib
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_EXEC_RESUME_SCHEDULAR - NI");
-		Memory::Write_U32(0, BufferOut); // no error
-		break;
-
-	case IOCTL_NWC24_STARTUP_SOCKET: // NWC24iStartupSocket
-		Memory::Write_U32(0, BufferOut);
-		Memory::Write_U32(0, BufferOut+4);
-		ReturnValue = 0;
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_STARTUP_SOCKET - NI");
-		break;
-	case IOCTL_NWC24_CLEANUP_SOCKET:
-		Memory::Memset(BufferOut, 0, BufferOutSize);
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_CLEANUP_SOCKET - NI");
-		break;
-	case IOCTL_NWC24_LOCK_SOCKET: // WiiMenu
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_LOCK_SOCKET - NI");
-		break;
-
-	case IOCTL_NWC24_UNLOCK_SOCKET:
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_UNLOCK_SOCKET - NI");
-		break;
-
-	case IOCTL_NWC24_REQUEST_REGISTER_USER_ID:
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_REGISTER_USER_ID");
-		Memory::Write_U32(0, BufferOut);
-		Memory::Write_U32(0, BufferOut+4);
-		break;
-
-	case IOCTL_NWC24_REQUEST_GENERATED_USER_ID: // (Input: none, Output: 32 bytes)
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_GENERATED_USER_ID");
-		if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_INITIAL)
-		{
-			std::string settings_Filename(Common::GetTitleDataPath(TITLEID_SYSMENU) + WII_SETTING);
-			SettingsHandler gen;
-			std::string area, model;
-			bool _GotSettings = false;
-
-			if (File::Exists(settings_Filename))
-			{
-				File::IOFile settingsFileHandle(settings_Filename, "rb");
-				if (settingsFileHandle.ReadBytes((void*)gen.GetData(), SettingsHandler::SETTINGS_SIZE))
-				{
-					gen.Decrypt();
-					area = gen.GetValue("AREA");
-					model = gen.GetValue("MODEL");
-					_GotSettings = true;
-				}
-
-			}
-			if (_GotSettings)
-			{
-				u8 area_code = GetAreaCode(area.c_str());
-				u8 id_ctr = config.IdGen();
-				u8 hardware_model = GetHardwareModel(model.c_str());
-
-				EcWii &ec = EcWii::GetInstance();
-				u32 HollywoodID = ec.getNgId();
-				u64 UserID = 0;
-
-				s32 ret = NWC24MakeUserID(&UserID, HollywoodID, id_ctr, hardware_model, area_code);
-				config.SetId(UserID);
-				config.IncrementIdGen();
-				config.SetCreationStage(nwc24_config_t::NWC24_IDCS_GENERATED);
-				config.WriteConfig();
-
-				Memory::Write_U32(ret, BufferOut);
-			}
-			else
-			{
-				Memory::Write_U32(WC24_ERR_FATAL, BufferOut);
-			}
-
-		}
-		else if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_GENERATED)
-		{
-			Memory::Write_U32(WC24_ERR_ID_GENERATED, BufferOut);
-		}
-		else if (config.CreationStage() == nwc24_config_t::NWC24_IDCS_REGISTERED)
-		{
-			Memory::Write_U32(WC24_ERR_ID_REGISTERED, BufferOut);
-		}
-		Memory::Write_U64(config.Id(), BufferOut + 4);
-		Memory::Write_U32(config.CreationStage(), BufferOut + 0xC);
-		break;
-	case IOCTL_NWC24_GET_SCHEDULAR_STAT:
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_GET_SCHEDULAR_STAT - NI");
-		break;
-
-	case IOCTL_NWC24_SAVE_MAIL_NOW:
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_SAVE_MAIL_NOW - NI");
-		break;
-
-	case IOCTL_NWC24_REQUEST_SHUTDOWN:
-		// if ya set the IOS version to a very high value this happens ...
-		INFO_LOG(WII_IPC_WC24, "NET_KD_REQ: IOCTL_NWC24_REQUEST_SHUTDOWN - NI");
-		break;
-
-	default:
-		INFO_LOG(WII_IPC_WC24, "/dev/net/kd/request::IOCtl request 0x%x (BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-
-	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-	return true;
-}
-
-
-u8 CWII_IPC_HLE_Device_net_kd_request::GetAreaCode( const char * area )
-{
-	u32 i;
-	u8 regions_[] = {0,1,2,2,1,3,3,4,5,5,1,2,6,7};
-	const char* regions[] = {"JPN", "USA", "EUR", "AUS", "BRA", "TWN", "ROC", "KOR", "HKG", "ASI", "LTN", "SAF", "CHN", ""};
-	for (i=0; i<sizeof(regions)/sizeof(*regions); i++)
-	{
-		if (!strncmp(regions[i], area, 4))
-		{
-			return regions_[i];
-		}
-	}
-
-	return 7;
-}
-
-u8 CWII_IPC_HLE_Device_net_kd_request::GetHardwareModel(const char * model)
-{
-	u8 mdl;
-	if (!strncmp(model, "RVL", 4))
-	{
-		mdl = MODEL_RVL;
-	}else if (!strncmp(model, "RVT", 4))
-	{
-		mdl = MODEL_RVT;
-	}else if (!strncmp(model, "RVV", 4))
-	{
-		mdl = MODEL_RVV;
-	}else if (!strncmp(model, "RVD", 4))
-	{
-		mdl = MODEL_RVD;
-	}else
-	{
-		mdl = MODEL_ELSE;
-	}
-	return mdl;
-}
-
-static inline u8 u64_get_byte(u64 value, u8 shift)
-{
-	return (u8)(value >> (shift*8));
-}
-
-static inline u64 u64_insert_byte(u64 value, u8 shift, u8 byte)
-{
-	u64 mask = 0x00000000000000FFULL << (shift*8);
-	u64 inst = (u64)byte << (shift*8);
-	return (value & ~mask) | inst;
-}
-
-s32 CWII_IPC_HLE_Device_net_kd_request::NWC24MakeUserID(u64* nwc24_id, u32 hollywood_id, u16 id_ctr, u8 hardware_model, u8 area_code)
-{
-	const u8 table2[8]  = {0x1, 0x5, 0x0, 0x4, 0x2, 0x3, 0x6, 0x7};
-	const u8 table1[16] = {0x4, 0xB, 0x7, 0x9, 0xF, 0x1, 0xD, 0x3, 0xC, 0x2, 0x6, 0xE, 0x8, 0x0, 0xA, 0x5};
-
-	u64 mix_id = ((u64)area_code<<50) | ((u64)hardware_model<<47) | ((u64)hollywood_id<<15) | ((u64)id_ctr<<10);
-	u64 mix_id_copy1 = mix_id;
-
-	int ctr = 0;
-	for (ctr = 0; ctr <= 42; ctr++)
-	{
-		u64 value = mix_id >> (52-ctr);
-		if (value & 1)
-		{
-			value = 0x0000000000000635ULL << (42-ctr);
-			mix_id ^= value;
-		}
-	}
-
-	mix_id = (mix_id_copy1 | (mix_id & 0xFFFFFFFFUL)) ^ 0x0000B3B3B3B3B3B3ULL;
-	mix_id = (mix_id >> 10) | ((mix_id & 0x3FF) << (11+32));
-
-	for (ctr = 0; ctr <= 5; ctr++)
-	{
-		u8 ret = u64_get_byte(mix_id, ctr);
-		u8 foobar = ((table1[(ret>>4)&0xF])<<4) | (table1[ret&0xF]);
-		mix_id = u64_insert_byte(mix_id, ctr, foobar & 0xff);
-	}
-	u64 mix_id_copy2 = mix_id;
-
-	for (ctr = 0; ctr <= 5; ctr++)
-	{
-		u8 ret = u64_get_byte(mix_id_copy2, ctr);
-		mix_id = u64_insert_byte(mix_id, table2[ctr], ret);
-	}
-
-	mix_id &= 0x001FFFFFFFFFFFFFULL;
-	mix_id = (mix_id << 1) | ((mix_id >> 52) & 1);
-
-	mix_id ^= 0x00005E5E5E5E5E5EULL;
-	mix_id &= 0x001FFFFFFFFFFFFFULL;
-
-	*nwc24_id = mix_id;
-
-	if (mix_id > 9999999999999999ULL)
-		return WC24_ERR_FATAL;
-
-	return WC24_OK;
-}
-
-// **********************************************************************************
-// Handle /dev/net/ncd/manage requests
-CWII_IPC_HLE_Device_net_ncd_manage::CWII_IPC_HLE_Device_net_ncd_manage(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-}
-
-CWII_IPC_HLE_Device_net_ncd_manage::~CWII_IPC_HLE_Device_net_ncd_manage()
-{
-}
-
-bool CWII_IPC_HLE_Device_net_ncd_manage::Open(u32 _CommandAddress, u32 _Mode)
-{
-	INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: Open");
-	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ncd_manage::Close(u32 _CommandAddress, bool _bForce)
-{
-	INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: Close");
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress)
-{
-	u32 return_value = 0;
-	u32 common_result = 0;
-	u32 common_vector = 0;
-
-	SIOCtlVBuffer CommandBuffer(_CommandAddress);
-
-	switch (CommandBuffer.Parameter)
-	{
-	case IOCTLV_NCD_LOCKWIRELESSDRIVER:
-		break;
-	case IOCTLV_NCD_UNLOCKWIRELESSDRIVER:
-		//Memory::Read_U32(CommandBuffer.InBuffer.at(0).m_Address);
-		break;
-
-	case IOCTLV_NCD_GETCONFIG:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETCONFIG");
-		config.WriteToMem(CommandBuffer.PayloadBuffer.at(0).m_Address);
-		common_vector = 1;
-		break;
-
-	case IOCTLV_NCD_SETCONFIG:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_SETCONFIG");
-		config.ReadFromMem(CommandBuffer.InBuffer.at(0).m_Address);
-		break;
-
-	case IOCTLV_NCD_READCONFIG:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_READCONFIG");
-		config.ReadConfig();
-		config.WriteToMem(CommandBuffer.PayloadBuffer.at(0).m_Address);
-		common_vector = 1;
-		break;
-
-	case IOCTLV_NCD_WRITECONFIG:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_WRITECONFIG");
-		config.ReadFromMem(CommandBuffer.InBuffer.at(0).m_Address);
-		config.WriteConfig();
-		break;
-
-	case IOCTLV_NCD_GETLINKSTATUS:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETLINKSTATUS");
-		// Always connected
-		Memory::Write_U32(netcfg_connection_t::LINK_WIRED,
-			CommandBuffer.PayloadBuffer.at(0).m_Address + 4);
-		break;
-
-	case IOCTLV_NCD_GETWIRELESSMACADDRESS:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS");
-
-		if (!SConfig::GetInstance().m_WirelessMac.empty())
-		{
-			int x = 0;
-			int tmpaddress[6];
-			for (unsigned int i = 0; i < SConfig::GetInstance().m_WirelessMac.length() && x < 6; i++)
-			{
-				if (SConfig::GetInstance().m_WirelessMac[i] == ':' || SConfig::GetInstance().m_WirelessMac[i] == '-')
-					continue;
-
-				std::stringstream ss;
-				ss << std::hex << SConfig::GetInstance().m_WirelessMac[i];
-				if (SConfig::GetInstance().m_WirelessMac[i+1] != ':' && SConfig::GetInstance().m_WirelessMac[i+1] != '-')
-				{
-					ss << std::hex << SConfig::GetInstance().m_WirelessMac[i+1];
-					i++;
-				}
-				ss >> tmpaddress[x];
-				x++;
-			}
-			u8 address[6];
-			for (int i = 0; i < 6;i++)
-				address[i] = tmpaddress[i];
-			Memory::WriteBigEData(address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4);
-			break;
-		}
-
-		Memory::WriteBigEData(default_address,
-			CommandBuffer.PayloadBuffer.at(1).m_Address, sizeof(default_address));
-		break;
-
-	default:
-		INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE IOCtlV: %#x", CommandBuffer.Parameter);
-		break;
-	}
-
-	Memory::Write_U32(common_result,
-		CommandBuffer.PayloadBuffer.at(common_vector).m_Address);
-	if (common_vector == 1)
-	{
-		Memory::Write_U32(common_result,
-			CommandBuffer.PayloadBuffer.at(common_vector).m_Address + 4);
-	}
-	Memory::Write_U32(return_value, _CommandAddress + 4);
-	return true;
-}
-
-// **********************************************************************************
-// Handle /dev/net/wd/command requests
-CWII_IPC_HLE_Device_net_wd_command::CWII_IPC_HLE_Device_net_wd_command(u32 DeviceID, const std::string& DeviceName)
-	: IWII_IPC_HLE_Device(DeviceID, DeviceName)
-{
-}
-
-CWII_IPC_HLE_Device_net_wd_command::~CWII_IPC_HLE_Device_net_wd_command()
-{
-}
-
-bool CWII_IPC_HLE_Device_net_wd_command::Open(u32 CommandAddress, u32 Mode)
-{
-	INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND: Open");
-	Memory::Write_U32(GetDeviceID(), CommandAddress + 4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_wd_command::Close(u32 CommandAddress, bool Force)
-{
-	INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND: Close");
-	if (!Force)
-		Memory::Write_U32(0, CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-// This is just for debugging / playing around.
-// There really is no reason to implement wd unless we can bend it such that
-// we can talk to the DS.
-#include "StringUtil.h"
-bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
-{
-	u32 return_value = 0;
-
-	SIOCtlVBuffer CommandBuffer(CommandAddress);
-
-	switch (CommandBuffer.Parameter)
-	{
-	case IOCTLV_WD_SCAN:
-		{
-		// Gives parameters detailing type of scan and what to match
-		// XXX - unused
-		// ScanInfo *scan = (ScanInfo *)Memory::GetPointer(CommandBuffer.InBuffer.at(0).m_Address);
-
-		u16 *results = (u16 *)Memory::GetPointer(CommandBuffer.PayloadBuffer.at(0).m_Address);
-		// first u16 indicates number of BSSInfo following
-		results[0] = Common::swap16(1);
-
-		BSSInfo *bss = (BSSInfo *)&results[1];
-		memset(bss, 0, sizeof(BSSInfo));
-
-		bss->length = Common::swap16(sizeof(BSSInfo));
-		bss->rssi = Common::swap16(0xffff);
-
-		for (int i = 0; i < BSSID_SIZE; ++i)
-			bss->bssid[i] = i;
-
-		const char *ssid = "dolphin-emu";
-		strcpy((char *)bss->ssid, ssid);
-		bss->ssid_length = Common::swap16((u16)strlen(ssid));
-
-		bss->channel = Common::swap16(2);
-		}
-		break;
-
-	case IOCTLV_WD_GET_INFO:
-		{
-		Info *info = (Info *)Memory::GetPointer(CommandBuffer.PayloadBuffer.at(0).m_Address);
-		memset(info, 0, sizeof(Info));
-		// Probably used to disallow certain channels?
-		memcpy(info->country, "US", 2);
-		info->ntr_allowed_channels = Common::swap16(0xfffe);
-		memcpy(info->mac, default_address, 6);
-		}
-		break;
-
-	case IOCTLV_WD_GET_MODE:
-	case IOCTLV_WD_SET_LINKSTATE:
-	case IOCTLV_WD_GET_LINKSTATE:
-	case IOCTLV_WD_SET_CONFIG:
-	case IOCTLV_WD_GET_CONFIG:
-	case IOCTLV_WD_CHANGE_BEACON:
-	case IOCTLV_WD_DISASSOC:
-	case IOCTLV_WD_MP_SEND_FRAME:
-	case IOCTLV_WD_SEND_FRAME:
-	case IOCTLV_WD_CALL_WL:
-	case IOCTLV_WD_MEASURE_CHANNEL:
-	case IOCTLV_WD_GET_LASTERROR:
-	case IOCTLV_WD_CHANGE_GAMEINFO:
-	case IOCTLV_WD_CHANGE_VTSF:
-	case IOCTLV_WD_RECV_FRAME:
-	case IOCTLV_WD_RECV_NOTIFICATION:
-	default:
-		INFO_LOG(WII_IPC_NET, "NET_WD_COMMAND IOCtlV %#x in %i out %i",
-			CommandBuffer.Parameter, CommandBuffer.NumberInBuffer, CommandBuffer.NumberPayloadBuffer);
-		for (u32 i = 0; i < CommandBuffer.NumberInBuffer; ++i)
-		{
-			INFO_LOG(WII_IPC_NET, "in %i addr %x size %i", i,
-				CommandBuffer.InBuffer.at(i).m_Address, CommandBuffer.InBuffer.at(i).m_Size);
-			INFO_LOG(WII_IPC_NET, "%s",
-				ArrayToString(
-					Memory::GetPointer(CommandBuffer.InBuffer.at(i).m_Address),
-					CommandBuffer.InBuffer.at(i).m_Size).c_str()
-				);
-		}
-		for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; ++i)
-		{
-			INFO_LOG(WII_IPC_NET, "out %i addr %x size %i", i,
-				CommandBuffer.PayloadBuffer.at(i).m_Address, CommandBuffer.PayloadBuffer.at(i).m_Size);
-		}
-		break;
-	}
-
-	Memory::Write_U32(return_value, CommandAddress + 4);
-	return true;
-}
-
-// **********************************************************************************
-// Handle /dev/net/ip/top requests
-CWII_IPC_HLE_Device_net_ip_top::CWII_IPC_HLE_Device_net_ip_top(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-#ifdef _WIN32
-	int ret = WSAStartup(MAKEWORD(2,2), &InitData);
-	INFO_LOG(WII_IPC_NET, "WSAStartup: %d", ret);
-#endif
-}
-
-CWII_IPC_HLE_Device_net_ip_top::~CWII_IPC_HLE_Device_net_ip_top()
-{
-#ifdef _WIN32
-	WSACleanup();
-#endif
-}
-
-bool CWII_IPC_HLE_Device_net_ip_top::Open(u32 _CommandAddress, u32 _Mode)
-{
-	INFO_LOG(WII_IPC_NET, "NET_IP_TOP: Open");
-	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ip_top::Close(u32 _CommandAddress, bool _bForce)
-{
-	INFO_LOG(WII_IPC_NET, "NET_IP_TOP: Close");
-	if (!_bForce)
-		Memory::Write_U32(0, _CommandAddress + 4);
-	m_Active = false;
-	return true;
-}
-
-static int inet_pton(const char *src, unsigned char *dst)
-{
-	int saw_digit, octets;
-	char ch;
-	unsigned char tmp[4], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		if (ch >= '0' && ch <= '9') {
-			unsigned int newt = (*tp * 10) + (ch - '0');
-
-			if (newt > 255)
-				return (0);
-			*tp = newt;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-	memcpy(dst, tmp, 4);
-	return (1);
-}
-
-// Maps SOCKOPT level from native to Wii
-static unsigned int opt_level_mapping[][2] = {
-	{ SOL_SOCKET, 0xFFFF }
-};
-
-// Maps SOCKOPT optname from native to Wii
-static unsigned int opt_name_mapping[][2] = {
-	{ SO_REUSEADDR, 0x4 },
-	{ SO_SNDBUF, 0x1001 },
-	{ SO_RCVBUF, 0x1002 },
-	{ SO_ERROR, 0x1009 }
-};
-
-bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
-{
-	u32 Command			= Memory::Read_U32(_CommandAddress + 0x0C);
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-
-	u32 ReturnValue = 0;
-	switch (Command)
-	{
-	case IOCTL_SO_STARTUP:
-	{
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_STARTUP "
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-	case IOCTL_SO_SOCKET:
-	{
-		u32 af		= Memory::Read_U32(BufferIn);
-		u32 type	= Memory::Read_U32(BufferIn + 0x04);
-		u32 prot	= Memory::Read_U32(BufferIn + 0x08);
-
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		ReturnValue = sm.newSocket(af, type, prot);
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SOCKET "
-			"Socket: %08x (%d,%d,%d), BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			ReturnValue, af, type, prot, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-	case IOCTL_SO_ICMPSOCKET:
-	{
-		u32 pf = Memory::Read_U32(BufferIn);
-
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		ReturnValue = sm.newSocket(pf, SOCK_RAW, IPPROTO_ICMP);
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_ICMPSOCKET(%x) %d", pf, ReturnValue);
-		break;
-	}
-	case IOCTL_SO_CLOSE:
-	case IOCTL_SO_ICMPCLOSE:
-	{
-		u32 fd = Memory::Read_U32(BufferIn);
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		ReturnValue = sm.delSocket(fd);
-		DEBUG_LOG(WII_IPC_NET, "%s(%x) %x", 
-			Command == IOCTL_SO_ICMPCLOSE ? "IOCTL_SO_ICMPCLOSE" : "IOCTL_SO_CLOSE", 
-			fd, ReturnValue);
-		break;
-	}
-	case IOCTL_SO_ACCEPT:
-	case IOCTL_SO_BIND:
-	case IOCTL_SO_CONNECT:
-	case IOCTL_SO_FCNTL:
-	{
-		u32 fd = Memory::Read_U32(BufferIn);
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		sm.doSock(fd, _CommandAddress, (NET_IOCTL)Command);
-		return false;
-		break;
-	}
-	/////////////////////////////////////////////////////////////
-	//                  TODO: Tidy all below                   //
-	/////////////////////////////////////////////////////////////
-	case IOCTL_SO_SHUTDOWN:
-	{
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SHUTDOWN "
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		u32 fd = Memory::Read_U32(BufferIn);
-		u32 how = Memory::Read_U32(BufferIn+4);
-		int ret = shutdown(fd, how);
-		ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_SHUTDOWN", false);
-		break;
-	}
-	case IOCTL_SO_LISTEN:
-	{
-
-		u32 fd = Memory::Read_U32(BufferIn);
-		u32 BACKLOG = Memory::Read_U32(BufferIn + 0x04);
-		u32 ret = listen(fd, BACKLOG);
-		ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_LISTEN", false);
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_LISTEN = %d "
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			ReturnValue, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		break;
-	}
-	case IOCTL_SO_GETSOCKOPT:
-	{
-		u32 fd = Memory::Read_U32(BufferOut);
-		u32 level = Memory::Read_U32(BufferOut + 4);
-		u32 optname = Memory::Read_U32(BufferOut + 8);
-
-		INFO_LOG(WII_IPC_NET,"IOCTL_SO_GETSOCKOPT(%08x, %08x, %08x)"
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			fd, level, optname,
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		// Do the level/optname translation
-		int nat_level = -1, nat_optname = -1;
-
-		for (unsigned int i = 0; i < sizeof (opt_level_mapping) / sizeof (opt_level_mapping[0]); ++i)
-			if (level == opt_level_mapping[i][1])
-				nat_level = opt_level_mapping[i][0];
-
-		for (unsigned int i = 0; i < sizeof (opt_name_mapping) / sizeof (opt_name_mapping[0]); ++i)
-			if (optname == opt_name_mapping[i][1])
-				nat_optname = opt_name_mapping[i][0];
-
-		u8 optval[20];
-		u32 optlen = 4;
-
-		int ret = getsockopt (fd, nat_level, nat_optname, (char *) &optval, (socklen_t*)&optlen);
-		ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_GETSOCKOPT", false);
-
-
-		Memory::Write_U32(optlen, BufferOut + 0xC);
-		Memory::WriteBigEData((u8 *) optval, BufferOut + 0x10, optlen);
-
-		if (optname == SO_ERROR)
-		{
-			s32 last_error = WiiSockMan::getInstance().getLastNetError();
-			
-			Memory::Write_U32(sizeof(s32), BufferOut + 0xC);
-			Memory::Write_U32(last_error, BufferOut + 0x10);
-		}
-		break;
-	}
-
-	case IOCTL_SO_SETSOCKOPT:
-	{
-		u32 fd = Memory::Read_U32(BufferIn);
-		u32 level = Memory::Read_U32(BufferIn + 4);
-		u32 optname = Memory::Read_U32(BufferIn + 8);
-		u32 optlen = Memory::Read_U32(BufferIn + 0xc);
-		u8 optval[20];
-		Memory::ReadBigEData(optval, BufferIn + 0x10, optlen);
-
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_SETSOCKOPT(%08x, %08x, %08x, %08x) "
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)"
-			"%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx",
-			fd, level, optname, optlen, BufferIn, BufferInSize, BufferOut, BufferOutSize, optval[0], optval[1], optval[2], optval[3], optval[4], optval[5], optval[6], optval[7], optval[8], optval[9], optval[10], optval[11], optval[12], optval[13], optval[14], optval[15], optval[16], optval[17], optval[18], optval[19]);
-		
-		//TODO: bug booto about this, 0x2005 most likely timeout related, default value on wii is , 0x2001 is most likely tcpnodelay
-		if (level == 6 && (optname == 0x2005 || optname == 0x2001)){
-			ReturnValue = 0;
-			break;
-		}
-
-		// Do the level/optname translation
-		int nat_level = -1, nat_optname = -1;
-
-		for (unsigned int i = 0; i < sizeof (opt_level_mapping) / sizeof (opt_level_mapping[0]); ++i)
-			if (level == opt_level_mapping[i][1])
-				nat_level = opt_level_mapping[i][0];
-
-		for (unsigned int i = 0; i < sizeof (opt_name_mapping) / sizeof (opt_name_mapping[0]); ++i)
-			if (optname == opt_name_mapping[i][1])
-				nat_optname = opt_name_mapping[i][0];
-
-		if (nat_level == -1 || nat_optname == -1)
-		{
-			INFO_LOG(WII_IPC_NET, "SO_SETSOCKOPT: unknown level %d or optname %d", level, optname);
-
-			// Default to the given level/optname. They match on Windows...
-			nat_level = level;
-			nat_optname = optname;
-		}
-
-		int ret = setsockopt(fd, nat_level, nat_optname, (char*)optval, optlen);
-		ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_SETSOCKOPT", false);
-		break;
-	}
-	case IOCTL_SO_GETSOCKNAME:
-	{
-		u32 fd = Memory::Read_U32(BufferIn);
-
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETSOCKNAME "
-			"Socket: %08X, BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			fd, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-		sockaddr sa;
-		socklen_t sa_len;
-		sa_len = sizeof(sa);
-		int ret = getsockname(fd, &sa, &sa_len);
-
-		Memory::Write_U8(BufferOutSize, BufferOut);
-		Memory::Write_U8(sa.sa_family & 0xFF, BufferOut + 1);
-		Memory::WriteBigEData((u8*)&sa.sa_data, BufferOut + 2, BufferOutSize - 2);
-		ReturnValue = ret;
-		break;
-	}
-	case IOCTL_SO_GETPEERNAME:
-	{
-		u32 fd = Memory::Read_U32(BufferIn);
-
-		sockaddr sa;
-		socklen_t sa_len;
-		sa_len = sizeof(sa);
-
-		int ret = getpeername(fd, &sa, &sa_len);
-
-		Memory::Write_U8(BufferOutSize, BufferOut);
-		Memory::Write_U8(AF_INET, BufferOut + 1);
-		Memory::WriteBigEData((u8*)&sa.sa_data, BufferOut + 2, BufferOutSize - 2);
-
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETPEERNAME(%x)", fd);
-
-		ReturnValue = ret;
-		break;
-	}
-
-	case IOCTL_SO_GETHOSTID:
-	{
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETHOSTID "
-			"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			BufferIn, BufferInSize, BufferOut, BufferOutSize);
-		ReturnValue = 192 << 24 | 168 << 16 | 1 << 8 | 150;
-		break;
-	}
-
-	case IOCTL_SO_INETATON:
-	{
-		struct hostent *remoteHost = gethostbyname((char*)Memory::GetPointer(BufferIn));
-
-		Memory::Write_U32(Common::swap32(*(u32 *)remoteHost->h_addr_list[0]), BufferOut);
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d "
-			"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X",remoteHost->h_addr_list[0] == 0 ? -1 : 0,
-			(char*)Memory::GetPointer(BufferIn), BufferIn, BufferInSize, BufferOut, BufferOutSize, Common::swap32(*(u32 *)remoteHost->h_addr_list[0]));
-		ReturnValue = remoteHost->h_addr_list[0] == 0 ? 0 : 1;
-		break;
-	}
-
-	case IOCTL_SO_INETPTON:
-	{
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETPTON "
-			"(Translating: %s)", Memory::GetPointer(BufferIn));
-		ReturnValue = inet_pton((char*)Memory::GetPointer(BufferIn), Memory::GetPointer(BufferOut+4));
-		break;
-	}
-
-	case IOCTL_SO_INETNTOP:
-	{
-		//u32 af = Memory::Read_U32(BufferIn);
-		//u32 validAddress = Memory::Read_U32(BufferIn + 4);
-		//u32 src = Memory::Read_U32(BufferIn + 8);
-		char ip_s[16];
-		sprintf(ip_s, "%i.%i.%i.%i",
-			Memory::Read_U8(BufferIn + 8),
-			Memory::Read_U8(BufferIn + 8 + 1),
-			Memory::Read_U8(BufferIn + 8 + 2),
-			Memory::Read_U8(BufferIn + 8 + 3)
-			);
-		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETNTOP %s", ip_s);
-		memset(Memory::GetPointer(BufferOut), 0, BufferOutSize);
-		memcpy(Memory::GetPointer(BufferOut), ip_s, strlen(ip_s));
-		break;
-	}
-
-	case IOCTL_SO_POLL:
-		{
-			// Map Wii/native poll events types
-			unsigned int mapping[][2] = {
-				{ POLLIN, 0x0001 },
-				{ POLLOUT, 0x0008 },
-				{ POLLHUP, 0x0040 },
-			};
-
-			u32 unknown = Memory::Read_U32(BufferIn);
-			u32 timeout = Memory::Read_U32(BufferIn + 4);
-
-			int nfds = BufferOutSize / 0xc;
-			if (nfds == 0)
-				ERROR_LOG(WII_IPC_NET, "Hidden POLL");
-
-			pollfd_t* ufds = (pollfd_t *)malloc(sizeof(pollfd_t) * nfds);
-			if (ufds == NULL)
-			{
-				ReturnValue = -1;
-				break;
-			}
-
-			for (int i = 0; i < nfds; i++)
-			{
-				ufds[i].fd = Memory::Read_U32(BufferOut + 0xc*i);				//fd
-				int events = Memory::Read_U32(BufferOut + 0xc*i + 4);			//events
-				ufds[i].revents = Memory::Read_U32(BufferOut + 0xc*i + 8);	//revents
-
-				// Translate Wii to native events
-				int unhandled_events = events;
-				ufds[i].events = 0;
-				for (unsigned int j = 0; j < sizeof (mapping) / sizeof (mapping[0]); ++j)
-				{
-					if (events & mapping[j][1])
-						ufds[i].events |= mapping[j][0];
-					unhandled_events &= ~mapping[j][1];
-				}
-
-				DEBUG_LOG(WII_IPC_NET, "IOCTL_SO_POLL(%d) "
-					"Sock: %08x, Unknown: %08x, Events: %08x, "
-					"NativeEvents: %08x",
-					i, ufds[i].fd, unknown, events, ufds[i].events
-				);
-
-				if (unhandled_events)
-					ERROR_LOG(WII_IPC_NET, "SO_POLL: unhandled Wii event types: %04x", unhandled_events);
-			}
-
-			int ret = poll(ufds, nfds, timeout);
-			ret = WiiSockMan::getNetErrorCode(ret, "SO_POLL", false);
-
-			for (int i = 0; i<nfds; i++)
-			{
-
-				// Translate native to Wii events
-				int revents = 0;
-				for (unsigned int j = 0; j < sizeof (mapping) / sizeof (mapping[0]); ++j)
-				{
-					if (ufds[i].revents & mapping[j][0])
-						revents |= mapping[j][1];
-				}
-
-				// No need to change fd or events as they are input only.
-				//Memory::Write_U32(ufds[i].fd, BufferOut + 0xc*i);	//fd
-				//Memory::Write_U32(events, BufferOut + 0xc*i + 4);	//events
-				Memory::Write_U32(revents, BufferOut + 0xc*i + 8);	//revents
-
-				DEBUG_LOG(WII_IPC_NET, "IOCTL_SO_POLL socket %d revents %08X events %08X", i, revents, ufds[i].events);
-			}
-			free(ufds);
-
-			ReturnValue = ret;
-			break;
-		}
-
-	case IOCTL_SO_GETHOSTBYNAME:
-		{
-			hostent *remoteHost = gethostbyname((char*)Memory::GetPointer(BufferIn));
-
-			INFO_LOG(WII_IPC_NET, "IOCTL_SO_GETHOSTBYNAME "
-				"Address: %s, BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-				(char*)Memory::GetPointer(BufferIn), BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-			if (remoteHost)
-			{
-				for (int i = 0; remoteHost->h_aliases[i]; ++i)
-				{
-					INFO_LOG(WII_IPC_NET, "alias%i:%s", i, remoteHost->h_aliases[i]);
-				}
-
-				for (int i = 0; remoteHost->h_addr_list[i]; ++i)
-				{
-					u32 ip = Common::swap32(*(u32*)(remoteHost->h_addr_list[i]));
-					char ip_s[16];
-					sprintf(ip_s, "%i.%i.%i.%i",
-						ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
-					DEBUG_LOG(WII_IPC_NET, "addr%i:%s", i, ip_s);
-				}
-
-				Memory::Memset(BufferOut, 0, BufferOutSize);
-				u32 wii_addr = BufferOut + 4 * 3 + 2 * 2;
-
-				u32 name_length = (u32)strlen(remoteHost->h_name) + 1;
-				Memory::WriteBigEData((const u8 *)remoteHost->h_name, wii_addr, name_length);
-				Memory::Write_U32(wii_addr, BufferOut);
-				wii_addr += (name_length + 4) & ~3;
-
-				// aliases - empty
-				Memory::Write_U32(wii_addr, BufferOut + 4);
-				Memory::Write_U32(wii_addr + sizeof(u32), wii_addr);
-				wii_addr += sizeof(u32);
-				Memory::Write_U32((u32)NULL, wii_addr);
-				wii_addr += sizeof(u32);
-
-				// hardcode to ipv4
-				_dbg_assert_msg_(WII_IPC_NET,
-					remoteHost->h_addrtype == AF_INET && remoteHost->h_length == sizeof(u32),
-					"returned host info is not IPv4");
-				Memory::Write_U16(AF_INET, BufferOut + 8);
-				Memory::Write_U16(sizeof(u32), BufferOut + 10);
-
-				// addrlist - probably only really need to return 1 anyways...
-				Memory::Write_U32(wii_addr, BufferOut + 12);
-				u32 num_addr = 0;
-				while (remoteHost->h_addr_list[num_addr])
-					num_addr++;
-				for (u32 i = 0; i < num_addr; ++i)
-				{
-					Memory::Write_U32(wii_addr + sizeof(u32) * (num_addr + 1), wii_addr);
-					wii_addr += sizeof(u32);
-				}
-				// NULL terminated list
-				Memory::Write_U32((u32)NULL, wii_addr);
-				wii_addr += sizeof(u32);
-				// The actual IPs
-				for (int i = 0; remoteHost->h_addr_list[i]; i++)
-				{
-					Memory::Write_U32_Swap(*(u32*)(remoteHost->h_addr_list[i]), wii_addr);
-					wii_addr += sizeof(u32);
-				}
-
-				//ERROR_LOG(WII_IPC_NET, "\n%s",
-				//	ArrayToString(Memory::GetPointer(BufferOut), BufferOutSize, 16).c_str());
-				ReturnValue = 0;
-			}
-			else
-			{
-				ReturnValue = -1;
-			}
-
-			break;
-		}
-
-	case IOCTL_SO_ICMPCANCEL:
-		ERROR_LOG(WII_IPC_NET, "IOCTL_SO_ICMPCANCEL");
-		goto default_;
-	default:
-		INFO_LOG(WII_IPC_NET,"0x%x "
-			"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			Command, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-	default_:
-		if (BufferInSize)
-		{
-			ERROR_LOG(WII_IPC_NET, "in addr %x size %x", BufferIn, BufferInSize);
-			ERROR_LOG(WII_IPC_NET, "\n%s",
-				ArrayToString(Memory::GetPointer(BufferIn), BufferInSize, 4).c_str()
-				);
-		}
-
-		if (BufferOutSize)
-		{
-			ERROR_LOG(WII_IPC_NET, "out addr %x size %x", BufferOut, BufferOutSize);
-		}
-		break;
-	}
-
-	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-
-	return true;
-}
-
-
-bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
-{
-	SIOCtlVBuffer CommandBuffer(CommandAddress);
-
-	s32 ReturnValue = 0;
-
-
-	u32 _BufferIn = 0, _BufferIn2 = 0, _BufferIn3 = 0;
-	u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0;
-
-	u32 _BufferOut = 0, _BufferOut2 = 0;
-	u32 BufferOutSize = 0;
-
-	if (CommandBuffer.InBuffer.size() > 0)
-	{
-		_BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
-		BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
-	}
-	if (CommandBuffer.InBuffer.size() > 1)
-	{
-		_BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
-		BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
-	}
-	if (CommandBuffer.InBuffer.size() > 2)
-	{
-		_BufferIn3 = CommandBuffer.InBuffer.at(2).m_Address;
-		BufferInSize3 = CommandBuffer.InBuffer.at(2).m_Size;
-	}
-
-	if (CommandBuffer.PayloadBuffer.size() > 0)
-	{
-		_BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
-		BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
-	}
-	if (CommandBuffer.PayloadBuffer.size() > 1)
-	{
-		_BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
-	}
-
-	u32 param = 0, param2 = 0, param3, param4, param5 = 0;
-
-	switch (CommandBuffer.Parameter)
-	{
-	case IOCTLV_SO_GETINTERFACEOPT:
-	{
-		param = Memory::Read_U32(_BufferIn);
-		param2 = Memory::Read_U32(_BufferIn+4);
-		param3 = Memory::Read_U32(_BufferOut);
-		param4 = Memory::Read_U32(_BufferOut2);
-		if (BufferOutSize >= 8)
-		{
-			param5 = Memory::Read_U32(_BufferOut+4);
-		}
-
-		INFO_LOG(WII_IPC_NET,"IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ",
-			param, param2, param3, param4, param5,
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2);
-
-		switch (param2)
-		{
-		case 0xb003: // dns server table
-		{
-			u32 address = 0;
-#ifdef _WIN32
-			PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL;
-			ULONG OutBufferLength = 0;
-			ULONG RetVal = 0, i;
-			for (i = 0; i < 5; i++)
-			{
-				RetVal = GetAdaptersAddresses(
-					AF_INET,
-					0,
-					NULL,
-					AdapterAddresses,
-					&OutBufferLength);
-
-				if (RetVal != ERROR_BUFFER_OVERFLOW) {
-					break;
-				}
-
-				if (AdapterAddresses != NULL) {
-					FREE(AdapterAddresses);
-				}
-
-				AdapterAddresses = (PIP_ADAPTER_ADDRESSES)MALLOC(OutBufferLength);
-				if (AdapterAddresses == NULL) {
-					RetVal = GetLastError();
-					break;
-				}
-			}
-			if (RetVal == NO_ERROR)
-			{
-				unsigned long dwBestIfIndex = 0;
-				IPAddr dwDestAddr = (IPAddr)0x08080808;
-				// If successful, output some information from the data we received
-				PIP_ADAPTER_ADDRESSES AdapterList = AdapterAddresses;
-				if (GetBestInterface(dwDestAddr,&dwBestIfIndex) == NO_ERROR)
-				{
-					while (AdapterList)
-					{
-						if (AdapterList->IfIndex == dwBestIfIndex &&
-							AdapterList->FirstDnsServerAddress &&
-							AdapterList->OperStatus == IfOperStatusUp)
-						{
-							INFO_LOG(WII_IPC_NET, "Name of valid interface: %S", AdapterList->FriendlyName);
-							INFO_LOG(WII_IPC_NET, "DNS: %u.%u.%u.%u",
-								(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[2],
-								(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[3],
-								(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[4],
-								(unsigned char)AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[5]);
-							address = Common::swap32(*(u32*)(&AdapterList->FirstDnsServerAddress->Address.lpSockaddr->sa_data[2]));
-							break;
-						}
-						AdapterList = AdapterList->Next;
-					}
-				}
-			}
-			if (AdapterAddresses != NULL) {
-				FREE(AdapterAddresses);
-			}
-#endif
-			if (address == 0)
-				address = 0x08080808;
-
-			Memory::Write_U32(address, _BufferOut);
-			Memory::Write_U32(0x08080404, _BufferOut+4);
-			break;
-		}
-		case 0x1003: // error
-			Memory::Write_U32(0, _BufferOut);
-			break;
-		case 0x1004: // mac address
-			Memory::WriteBigEData(default_address, _BufferOut, 6);
-			break;
-		case 0x1005: // link state
-			Memory::Write_U32(1, _BufferOut);
-			break;
-		case 0x4002: // ip addr number
-			Memory::Write_U32(1, _BufferOut);
-			break;
-		case 0x4003: // ip addr table
-			Memory::Write_U32(0xC, _BufferOut2);
-			Memory::Write_U32(10 << 24 | 1 << 8 | 30, _BufferOut);
-			Memory::Write_U32(255 << 24 | 255 << 16  | 255 << 8 | 0, _BufferOut+4);
-			Memory::Write_U32(10 << 24 | 0 << 16  | 255 << 8 | 255, _BufferOut+8);
-			break;
-		default:
-			ERROR_LOG(WII_IPC_NET, "Unknown param2: %08X", param2);
-			break;
-		}
-		break;
-	}
-	case IOCTLV_SO_SENDTO:
-	{
-		u32 fd = Memory::Read_U32(_BufferIn2);
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		sm.doSock(fd, CommandAddress, IOCTLV_SO_SENDTO);
-		return false;
-		break;
-	}
-	case IOCTLV_SO_RECVFROM:
-	{
-		u32 fd = Memory::Read_U32(_BufferIn);
-		WiiSockMan &sm = WiiSockMan::getInstance();
-		sm.doSock(fd, CommandAddress, IOCTLV_SO_RECVFROM);
-		return false;
-		break;
-	}
-	case IOCTLV_SO_GETADDRINFO:
-	{
-		struct addrinfo hints;
-		struct addrinfo *result = NULL;
-
-		if (BufferInSize3)
-		{
-			hints.ai_flags		= Memory::Read_U32(_BufferIn3);
-			hints.ai_family		= Memory::Read_U32(_BufferIn3 + 0x4);
-			hints.ai_socktype	= Memory::Read_U32(_BufferIn3 + 0x8);
-			hints.ai_protocol	= Memory::Read_U32(_BufferIn3 + 0xC);
-			hints.ai_addrlen	= Memory::Read_U32(_BufferIn3 + 0x10);
-			hints.ai_canonname	= NULL;
-			hints.ai_addr		= NULL;
-			hints.ai_next		= NULL;
-		}
-
-		char* pNodeName = NULL;
-		if (BufferInSize > 0)
-			pNodeName = (char*)Memory::GetPointer(_BufferIn);
-
-		char* pServiceName = NULL;
-		if (BufferInSize2 > 0)
-			pServiceName = (char*)Memory::GetPointer(_BufferIn2);
-
-		int ret = getaddrinfo(pNodeName, pServiceName, BufferInSize3 ? &hints : NULL, &result);
-		u32 addr = _BufferOut;
-		u32 sockoffset = addr + 0x460;
-		if (ret == 0)
-		{
-			while (result != NULL)
-			{
-				Memory::Write_U32(result->ai_flags, addr);
-				Memory::Write_U32(result->ai_family, addr + 0x04);
-				Memory::Write_U32(result->ai_socktype, addr + 0x08);
-				Memory::Write_U32(result->ai_protocol, addr + 0x0C);
-				Memory::Write_U32((u32)result->ai_addrlen, addr + 0x10);
-				// what to do? where to put? the buffer of 0x834 doesn't allow space for this
-				Memory::Write_U32(/*result->ai_cannonname*/ 0, addr + 0x14);
-
-				if (result->ai_addr)
-				{
-					Memory::Write_U32(sockoffset, addr + 0x18);
-					Memory::Write_U16(((result->ai_addr->sa_family & 0xFF) << 8) | (result->ai_addrlen & 0xFF), sockoffset);
-					Memory::WriteBigEData((u8*)result->ai_addr->sa_data, sockoffset + 0x2, sizeof(result->ai_addr->sa_data));
-					sockoffset += 0x1C;
-				}
-				else
-				{
-					Memory::Write_U32(0, addr + 0x18);
-				}
-
-				if (result->ai_next)
-				{
-					Memory::Write_U32(addr + sizeof(addrinfo), addr + 0x1C);
-				}
-				else
-				{
-					Memory::Write_U32(0, addr + 0x1C);
-				}
-
-				addr += sizeof(addrinfo);
-				result = result->ai_next;
-			}
-		}
-		else
-		{
-			// Host not found
-			ret = -305;
-		}
-
-		INFO_LOG(WII_IPC_NET, "IOCTLV_SO_GETADDRINFO "
-			"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferOut, BufferOutSize);
-		INFO_LOG(WII_IPC_NET, "IOCTLV_SO_GETADDRINFO: %s", Memory::GetPointer(_BufferIn));
-		ReturnValue = ret;
-		break;
-	}
-	case IOCTLV_SO_ICMPPING:
-	{
-		struct
-		{
-			u8 length;
-			u8 addr_family;
-			u16 icmp_id;
-			u32 ip;
-		} ip_info;
-
-		u32 fd = Memory::Read_U32(_BufferIn);
-		u32 num_ip = Memory::Read_U32(_BufferIn + 4);
-		u64 timeout = Memory::Read_U64(_BufferIn + 8);
-
-		if (num_ip != 1)
-		{
-			INFO_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING %i IPs", num_ip);
-		}
-
-		ip_info.length		= Memory::Read_U8(_BufferIn + 16);
-		ip_info.addr_family	= Memory::Read_U8(_BufferIn + 17);
-		ip_info.icmp_id		= Memory::Read_U16(_BufferIn + 18);
-		ip_info.ip			= Memory::Read_U32(_BufferIn + 20);
-
-		if (ip_info.length != 8 || ip_info.addr_family != AF_INET)
-		{
-			INFO_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING strange IPInfo:\n"
-				"length %x addr_family %x",
-				ip_info.length, ip_info.addr_family);
-		}
-
-		DEBUG_LOG(WII_IPC_NET, "IOCTLV_SO_ICMPPING %x", ip_info.ip);
-
-		sockaddr_in addr;
-		addr.sin_family = AF_INET;
-		addr.sin_addr.s_addr = Common::swap32(ip_info.ip);
-		memset(addr.sin_zero, 0, 8);
-
-		u8 data[0x20];
-		memset(data, 0, sizeof(data));
-		s32 icmp_length = sizeof(data);
-
-		if (BufferInSize2 == sizeof(data))
-			memcpy(data, Memory::GetPointer(_BufferIn2), BufferInSize2);
-		else
-		{
-			// TODO sequence number is incremented either statically, by
-			// port, or by socket. Doesn't seem to matter, so we just leave
-			// it 0
-			((u16 *)data)[0] = Common::swap16(ip_info.icmp_id);
-			icmp_length = 22;
-		}
-
-		int ret = icmp_echo_req(fd, &addr, data, icmp_length);
-		if (ret == icmp_length)
-		{
-			ret = icmp_echo_rep(fd, &addr, (u32)timeout, icmp_length);
-		}
-
-		// TODO proper error codes
-		ReturnValue = 0;
-		break;
-	}
-	default:
-		INFO_LOG(WII_IPC_NET,"0x%x (BufferIn: (%08x, %i), BufferIn2: (%08x, %i)",
-			CommandBuffer.Parameter, _BufferIn, BufferInSize, _BufferIn2, BufferInSize2);
-		for (u32 i = 0; i < CommandBuffer.NumberInBuffer; ++i)
-		{
-			ERROR_LOG(WII_IPC_NET, "in %i addr %x size %x", i,
-				CommandBuffer.InBuffer.at(i).m_Address, CommandBuffer.InBuffer.at(i).m_Size);
-			ERROR_LOG(WII_IPC_NET, "\n%s",
-				ArrayToString(
-				Memory::GetPointer(CommandBuffer.InBuffer.at(i).m_Address),
-				CommandBuffer.InBuffer.at(i).m_Size, 4).c_str()
-				);
-		}
-		for (u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; ++i)
-		{
-			ERROR_LOG(WII_IPC_NET, "out %i addr %x size %x", i,
-				CommandBuffer.PayloadBuffer.at(i).m_Address, CommandBuffer.PayloadBuffer.at(i).m_Size);
-		}
-		break;
-	}
-
-	Memory::Write_U32(ReturnValue, CommandAddress + 4);
-	return true;
-}
-u32 CWII_IPC_HLE_Device_net_ip_top::Update()
-{
-	WiiSockMan::getInstance().Update();
-	return 0;
-}
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
deleted file mode 100644
index 95f75cffd7..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
+++ /dev/null
@@ -1,737 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_NET_H_
-#define _WII_IPC_HLE_DEVICE_NET_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#endif
-#include "Timer.h"
-#include "FileUtil.h"
-
-// data layout of the network configuration file (/shared2/sys/net/02/config.dat)
-// needed for /dev/net/ncd/manage
-#pragma pack(push, 1)
-struct netcfg_proxy_t
-{
-	u8 use_proxy;
-	u8 use_proxy_userandpass;
-	u8 padding_1[2];
-	u8 proxy_name[255];
-	u8 padding_2;
-	u16 proxy_port;			// 0-34463
-	u8 proxy_username[32];
-	u8 padding_3;
-	u8 proxy_password[32];
-};
-
-struct netcfg_connection_t
-{
-	enum
-	{
-		WIRED_IF			=   1, // 0: wifi 1: wired
-		DNS_DHCP			=   2, // 0: manual 1: DHCP
-		IP_DHCP				=   4, // 0: manual 1: DHCP
-		USE_PROXY			=  16,
-		CONNECTION_TEST_OK	=  32,
-		CONNECTION_SELECTED	= 128
-	};
-
-	enum
-	{
-		OPEN		= 0,
-		WEP64		= 1,
-		WEP128		= 2,
-		WPA_TKIP	= 4,
-		WPA2_AES	= 5,
-		WPA_AES		= 6
-	};
-
-	enum status
-	{
-		LINK_BUSY = 1,
-		LINK_NONE,
-		LINK_WIRED,
-		LINK_WIFI_DOWN,
-		LINK_WIFI_UP
-	};
-
-	enum
-	{
-		PERM_NONE		= 0,
-		PERM_SEND_MAIL	= 1,
-		PERM_RECV_MAIL	= 2,
-		PERM_DOWNLOAD	= 4,
-		PERM_ALL		= PERM_SEND_MAIL | PERM_RECV_MAIL | PERM_DOWNLOAD
-	};
-
-	// settings common to both wired and wireless connections
-	u8 flags;
-	u8 padding_1[3];
-	u8 ip[4];
-	u8 netmask[4];
-	u8 gateway[4];
-	u8 dns1[4];
-	u8 dns2[4];
-	u8 padding_2[2];
-	u16 mtu;
-	u8 padding_3[8];
-	netcfg_proxy_t proxy_settings;
-	u8 padding_4;
-	netcfg_proxy_t proxy_settings_copy;
-	u8 padding_5[1297];
-
-	// wireless specific settings
-	u8 ssid[32];
-	u8 padding_6;
-	u8 ssid_length;     // length of ssid in bytes.
-	u8 padding_7[3];
-	u8 encryption;
-	u8 padding_8[3];
-	u8 key_length;		// length of key in bytes.  0x00 for WEP64 and WEP128.
-	u8 unknown;			// 0x00 or 0x01 toggled with a WPA-PSK (TKIP) and with a WEP entered with hex instead of ascii.
-	u8 padding_9;
-	u8 key[64];         // encryption key; for WEP, key is stored 4 times (20 bytes for WEP64 and 52 bytes for WEP128) then padded with 0x00
-	u8 padding_10[236];
-};
-
-struct network_config_t
-{
-	enum
-	{
-		IF_NONE,
-		IF_WIFI,
-		IF_WIRED
-	};
-
-	u32 version;
-	u8 connType;
-	u8 linkTimeout;
-	u8 nwc24Permission;
-	u8 padding;
-
-	netcfg_connection_t connection[3];
-};
-
-enum nwc24_err_t
-{
-	WC24_OK 					=   0,
-	WC24_ERR_FATAL				=  -1,
-	WC24_ERR_ID_NONEXISTANCE	= -34,
-	WC24_ERR_ID_GENERATED 		= -35,
-	WC24_ERR_ID_REGISTERED 		= -36,
-	WC24_ERR_ID_NOT_REGISTERED 	= -44,
-};
-
-struct nwc24_config_t
-{
-	enum
-	{
-		NWC24_IDCS_INITIAL = 0,
-		NWC24_IDCS_GENERATED = 1,
-		NWC24_IDCS_REGISTERED = 2
-	};
-
-	enum
-	{
-		URL_COUNT = 0x05,
-		MAX_URL_LENGTH = 0x80,
-		MAX_EMAIL_LENGTH = 0x40,
-		MAX_PASSWORD_LENGTH = 0x20,
-	};
-
-	u32 magic;		/* 'WcCf' 0x57634366 */
-	u32 _unk_04;	/* must be 8 */
-	u64 nwc24_id;
-	u32 id_generation;
-	u32 creation_stage;	/* 0==not_generated;1==generated;2==registered; */
-	char email[MAX_EMAIL_LENGTH];
-	char paswd[MAX_PASSWORD_LENGTH];
-	char mlchkid[0x24];
-	char http_urls[URL_COUNT][MAX_URL_LENGTH];
-	u8 reserved[0xDC];
-	u32 enable_booting;
-	u32 checksum;
-};
-
-#pragma pack(pop)
-
-
-
-class NWC24Config
-{
-private:
-	std::string path;
-	nwc24_config_t config;
-
-public:
-	NWC24Config()
-	{
-		path = File::GetUserPath(D_WIIWC24_IDX) + "nwc24msg.cfg";
-		ReadConfig();
-	}
-
-	void ResetConfig()
-	{
-		int i;
-
-		if (File::Exists(path))
-			File::Delete(path);
-
-		const char* urls[5] = {
-			"https://amw.wc24.wii.com/cgi-bin/account.cgi",
-			"http://rcw.wc24.wii.com/cgi-bin/check.cgi",
-			"http://mtw.wc24.wii.com/cgi-bin/receive.cgi",
-			"http://mtw.wc24.wii.com/cgi-bin/delete.cgi",
-			"http://mtw.wc24.wii.com/cgi-bin/send.cgi",
-		};
-
-		memset(&config, 0, sizeof(config));
-
-		SetMagic(0x57634366);
-		SetUnk(8);
-		SetCreationStage(nwc24_config_t::NWC24_IDCS_INITIAL);
-		SetEnableBooting(0);
-		SetEmail("@wii.com");
-
-		for(i=0; i<nwc24_config_t::URL_COUNT; i++)
-		{
-			strncpy(config.http_urls[i], urls[i], nwc24_config_t::MAX_URL_LENGTH);
-		}
-
-		SetChecksum(CalculateNwc24ConfigChecksum());
-
-		WriteConfig();
-	}
-
-	void WriteConfig()
-	{
-		if (!File::Exists(path))
-		{
-			if (!File::CreateFullPath(File::GetUserPath(D_WIIWC24_IDX)))
-			{
-				ERROR_LOG(WII_IPC_WC24, "Failed to create directory for WC24");
-			}
-		}
-
-		File::IOFile(path, "wb").WriteBytes((void*)&config, sizeof(config));
-	}
-
-
-	void ReadConfig()
-	{
-		if (File::Exists(path))
-		{
-			if (!File::IOFile(path, "rb").ReadBytes((void *)&config, sizeof(config)))
-				ResetConfig();
-			else
-			{
-				s32 config_error = CheckNwc24Config();
-				if(config_error)
-					ERROR_LOG(WII_IPC_WC24, "There is an error in the config for for WC24: %d", config_error);
-			}
-		}
-		else
-		{
-			ResetConfig();
-		}
-	}
-
-	u32 CalculateNwc24ConfigChecksum(void)
-	{
-		u32* ptr = (u32*)&config;
-		u32 sum = 0;
-		int i;
-		for (i=0; i<0xFF; i++)
-		{
-			sum += Common::swap32(*ptr++);
-		}
-		return sum;
-	}
-
-	s32 CheckNwc24Config(void)
-	{
-		if (Magic() != 0x57634366)	/* 'WcCf' magic */
-		{
-			ERROR_LOG(WII_IPC_WC24, "Magic mismatch");
-			return -14;
-		}
-		u32 checksum = CalculateNwc24ConfigChecksum();
-		DEBUG_LOG(WII_IPC_WC24, "Checksum: %X", checksum);
-		if (Checksum() != checksum)
-		{
-			ERROR_LOG(WII_IPC_WC24, "Checksum mismatch expected %X and got %X", checksum, Checksum());
-			return -14;
-		}
-		if (IdGen() > 0x1F)
-		{
-			ERROR_LOG(WII_IPC_WC24, "Id gen error");
-			return -14;
-		}
-		if (Unk() != 8)
-			return -27;
-
-		return 0;
-	}
-
-	u32 Magic(){return Common::swap32(config.magic);}
-	void SetMagic(u32 magic){config.magic = Common::swap32(magic);}
-
-	u32 Unk(){return Common::swap32(config._unk_04);}
-	void SetUnk(u32 _unk_04){config._unk_04 = Common::swap32(_unk_04);}
-
-	u32 IdGen(){return Common::swap32(config.id_generation);}
-	void SetIdGen(u32 id_generation){config.id_generation = Common::swap32(id_generation);}
-	void IncrementIdGen(){
-		u32 id_ctr = IdGen();
-		id_ctr++;
-		id_ctr &= 0x1F;
-		SetIdGen(id_ctr);
-	}
-
-	u32 Checksum(){return Common::swap32(config.checksum);}
-	void SetChecksum(u32 checksum){config.checksum = Common::swap32(checksum);}
-
-	u32 CreationStage(){return Common::swap32(config.creation_stage);}
-	void SetCreationStage(u32 creation_stage){config.creation_stage = Common::swap32(creation_stage);}
-
-	u32 EnableBooting(){return Common::swap32(config.enable_booting);}
-	void SetEnableBooting(u32 enable_booting){config.enable_booting = Common::swap32(enable_booting);}
-
-	u64 Id(){return Common::swap64(config.nwc24_id);}
-	void SetId(u64 nwc24_id){config.nwc24_id = Common::swap64(nwc24_id);}
-
-	const char * Email(){return config.email;}
-	void SetEmail(const char * email)
-	{
-		strncpy(config.email, email, nwc24_config_t::MAX_EMAIL_LENGTH);
-		config.email[nwc24_config_t::MAX_EMAIL_LENGTH-1] = '\0';
-	}
-
-};
-
-class WiiNetConfig
-{
-	std::string path;
-	network_config_t config;
-
-public:
-	WiiNetConfig()
-	{
-		path = File::GetUserPath(D_WIISYSCONF_IDX) + "net/02/config.dat";
-
-		ReadConfig();
-	}
-
-	void ResetConfig()
-	{
-		if (File::Exists(path))
-			File::Delete(path);
-
-		memset(&config, 0, sizeof(config));
-		config.connType = network_config_t::IF_WIRED;
-		config.connection[0].flags =
-			netcfg_connection_t::WIRED_IF |
-			netcfg_connection_t::DNS_DHCP |
-			netcfg_connection_t::IP_DHCP |
-			netcfg_connection_t::CONNECTION_TEST_OK |
-			netcfg_connection_t::CONNECTION_SELECTED;
-
-		WriteConfig();
-	}
-
-	void WriteConfig()
-	{
-		if (!File::Exists(path))
-		{
-			if (!File::CreateFullPath(
-				std::string(File::GetUserPath(D_WIISYSCONF_IDX) + "net/02/")))
-			{
-				ERROR_LOG(WII_IPC_NET, "Failed to create directory for network config file");
-			}
-		}
-
-		File::IOFile(path, "wb").WriteBytes((void*)&config, sizeof(config));
-	}
-
-	void WriteToMem(const u32 address)
-	{
-		Memory::WriteBigEData((const u8 *)&config, address, sizeof(config));
-	}
-
-	void ReadFromMem(const u32 address)
-	{
-		Memory::ReadBigEData((u8 *)&config, address, sizeof(config));
-	}
-
-	void ReadConfig()
-	{
-		if (File::Exists(path))
-		{
-			if (!File::IOFile(path, "rb").ReadBytes((void *)&config, sizeof(config)))
-				ResetConfig();
-		}
-		else
-		{
-			ResetConfig();
-		}
-	}
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// KD is the IOS module responsible for implementing WiiConnect24 functionality.
-// It can perform HTTPS downloads, send and receive mail via SMTP, and execute a
-// JavaScript-like language while the Wii is in standby mode.
-class CWII_IPC_HLE_Device_net_kd_request : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_net_kd_request();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-	virtual bool IOCtl(u32 _CommandAddress);
-
-private:
-	enum
-	{
-		IOCTL_NWC24_SUSPEND_SCHEDULAR               = 0x01,
-		IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR      = 0x02,
-		IOCTL_NWC24_EXEC_RESUME_SCHEDULAR           = 0x03,
-		IOCTL_NWC24_KD_GET_TIME_TRIGGERS            = 0x04,
-		IOCTL_NWC24_SET_SCHEDULE_SPAN               = 0x05,
-		IOCTL_NWC24_STARTUP_SOCKET                  = 0x06,
-		IOCTL_NWC24_CLEANUP_SOCKET                  = 0x07,
-		IOCTL_NWC24_LOCK_SOCKET                     = 0x08,
-		IOCTL_NWC24_UNLOCK_SOCKET                   = 0x09,
-		IOCTL_NWC24_CHECK_MAIL_NOW                  = 0x0A,
-		IOCTL_NWC24_SEND_MAIL_NOW                   = 0x0B,
-		IOCTL_NWC24_RECEIVE_MAIL_NOW                = 0x0C,
-		IOCTL_NWC24_SAVE_MAIL_NOW                   = 0x0D,
-		IOCTL_NWC24_DOWNLOAD_NOW_EX                 = 0x0E,
-		IOCTL_NWC24_REQUEST_GENERATED_USER_ID       = 0x0F,
-		IOCTL_NWC24_REQUEST_REGISTER_USER_ID        = 0x10,
-		IOCTL_NWC24_GET_SCHEDULAR_STAT              = 0x1E,
-		IOCTL_NWC24_SET_FILTER_MODE                 = 0x1F,
-		IOCTL_NWC24_SET_DEBUG_MODE                  = 0x20,
-		IOCTL_NWC24_KD_SET_NEXT_WAKEUP              = 0x21,
-		IOCTL_NWC24_SET_SCRIPT_MODE                 = 0x22,
-		IOCTL_NWC24_REQUEST_SHUTDOWN                = 0x28,
-	};
-
-	enum {
-		MODEL_RVT = 0,
-		MODEL_RVV = 0,
-		MODEL_RVL = 1,
-		MODEL_RVD = 2,
-		MODEL_ELSE = 7
-	};
-
-	u8 GetAreaCode(const char * area);
-	u8 GetHardwareModel(const char * model);
-
-	s32 NWC24MakeUserID(u64* nwc24_id, u32 hollywood_id, u16 id_ctr, u8 hardware_model, u8 area_code);
-
-	NWC24Config config;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_net_kd_time(u32 _DeviceID, const std::string& _rDeviceName)
-		: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-		, rtc()
-		, utcdiff()
-	{
-	}
-
-	virtual ~CWII_IPC_HLE_Device_net_kd_time()
-	{}
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode)
-	{
-		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
-		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-		return true;
-	}
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce)
-	{
-		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
-		if (!_bForce)
-			Memory::Write_U32(0, _CommandAddress + 4);
-		return true;
-	}
-
-	virtual bool IOCtl(u32 _CommandAddress)
-	{
-		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
-		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-
-		u32 result = 0;
-		u32 common_result = 0;
-		// TODO Writes stuff to /shared2/nwc24/misc.bin
-		//u32 update_misc = 0;
-
-		switch (Parameter)
-		{
-		case IOCTL_NW24_GET_UNIVERSAL_TIME:
-			Memory::Write_U64(GetAdjustedUTC(), BufferOut + 4);
-			break;
-
-		case IOCTL_NW24_SET_UNIVERSAL_TIME:
-			SetAdjustedUTC(Memory::Read_U64(BufferIn));
-			//update_misc = Memory::Read_U32(BufferIn + 8);
-			break;
-
-		case IOCTL_NW24_SET_RTC_COUNTER:
-			rtc = Memory::Read_U32(BufferIn);
-			//update_misc = Memory::Read_U32(BufferIn + 4);
-			break;
-
-		case IOCTL_NW24_GET_TIME_DIFF:
-			Memory::Write_U64(GetAdjustedUTC() - rtc, BufferOut + 4);
-			break;
-
-		case IOCTL_NW24_UNIMPLEMENTED:
-			result = -9;
-			break;
-
-		default:
-			ERROR_LOG(WII_IPC_NET, "%s - unknown IOCtl: %x\n",
-				GetDeviceName().c_str(), Parameter);
-			break;
-		}
-
-		// write return values
-		Memory::Write_U32(common_result, BufferOut);
-		Memory::Write_U32(result, _CommandAddress + 4);
-		return true;
-	}
-
-private:
-	enum
-	{
-		IOCTL_NW24_GET_UNIVERSAL_TIME	= 0x14,
-		IOCTL_NW24_SET_UNIVERSAL_TIME	= 0x15,
-		IOCTL_NW24_UNIMPLEMENTED		= 0x16,
-		IOCTL_NW24_SET_RTC_COUNTER		= 0x17,
-		IOCTL_NW24_GET_TIME_DIFF		= 0x18,
-	};
-
-	u64 rtc;
-	s64 utcdiff;
-
-	// Seconds between 1.1.1970 and 4.1.2008 16:00:38
-	static const u64 wii_bias = 0x477E5826;
-
-	// Returns seconds since wii epoch
-	// +/- any bias set from IOCTL_NW24_SET_UNIVERSAL_TIME
-	u64 GetAdjustedUTC() const
-	{
-		return Common::Timer::GetTimeSinceJan1970() - wii_bias + utcdiff;
-	}
-
-	// Store the difference between what the wii thinks is UTC and
-	// what the host OS thinks
-	void SetAdjustedUTC(u64 wii_utc)
-	{
-		utcdiff = Common::Timer::GetTimeSinceJan1970() - wii_bias - wii_utc;
-	}
-};
-
-enum NET_IOCTL
-{
-	IOCTL_SO_ACCEPT = 1,
-	IOCTL_SO_BIND,
-	IOCTL_SO_CLOSE,
-	IOCTL_SO_CONNECT,
-	IOCTL_SO_FCNTL,
-	IOCTL_SO_GETPEERNAME,
-	IOCTL_SO_GETSOCKNAME,
-	IOCTL_SO_GETSOCKOPT,
-	IOCTL_SO_SETSOCKOPT,
-	IOCTL_SO_LISTEN,
-	IOCTL_SO_POLL,
-	IOCTLV_SO_RECVFROM,
-	IOCTLV_SO_SENDTO,
-	IOCTL_SO_SHUTDOWN,
-	IOCTL_SO_SOCKET,
-	IOCTL_SO_GETHOSTID,
-	IOCTL_SO_GETHOSTBYNAME,
-	IOCTL_SO_GETHOSTBYADDR,
-	IOCTLV_SO_GETNAMEINFO,
-	IOCTL_SO_UNK14,
-	IOCTL_SO_INETATON,
-	IOCTL_SO_INETPTON,
-	IOCTL_SO_INETNTOP,
-	IOCTLV_SO_GETADDRINFO,
-	IOCTL_SO_SOCKATMARK,
-	IOCTLV_SO_UNK1A,
-	IOCTLV_SO_UNK1B,
-	IOCTLV_SO_GETINTERFACEOPT,
-	IOCTLV_SO_SETINTERFACEOPT,
-	IOCTL_SO_SETINTERFACE,
-	IOCTL_SO_STARTUP,
-	IOCTL_SO_ICMPSOCKET = 0x30,
-	IOCTLV_SO_ICMPPING,
-	IOCTL_SO_ICMPCANCEL,
-	IOCTL_SO_ICMPCLOSE
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CWII_IPC_HLE_Device_net_ip_top : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_net_ip_top(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_net_ip_top();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-	virtual bool IOCtl(u32 _CommandAddress);
-	virtual bool IOCtlV(u32 _CommandAddress);
-
-	virtual u32 Update();
-
-private:
-#ifdef _WIN32
-	WSADATA InitData;
-#endif
-	u32 ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize);
-	u32 ExecuteCommandV(SIOCtlVBuffer& CommandBuffer);
-};
-
-// **********************************************************************************
-// Interface for reading and changing network configuration (probably some other stuff as well)
-class CWII_IPC_HLE_Device_net_ncd_manage : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_net_ncd_manage(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_net_ncd_manage();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-	virtual bool IOCtlV(u32 _CommandAddress);
-
-private:
-	enum
-	{
-		IOCTLV_NCD_LOCKWIRELESSDRIVER		= 0x1,  // NCDLockWirelessDriver
-		IOCTLV_NCD_UNLOCKWIRELESSDRIVER		= 0x2,  // NCDUnlockWirelessDriver
-		IOCTLV_NCD_GETCONFIG				= 0x3,  // NCDiGetConfig
-		IOCTLV_NCD_SETCONFIG				= 0x4,  // NCDiSetConfig
-		IOCTLV_NCD_READCONFIG				= 0x5,
-		IOCTLV_NCD_WRITECONFIG				= 0x6,
-		IOCTLV_NCD_GETLINKSTATUS			= 0x7,  // NCDGetLinkStatus
-		IOCTLV_NCD_GETWIRELESSMACADDRESS	= 0x8,  // NCDGetWirelessMacAddress
-	};
-
-	WiiNetConfig config;
-};
-
-//////////////////////////////////////////////////////////////////////////
-class CWII_IPC_HLE_Device_net_wd_command : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_net_wd_command(u32 DeviceID, const std::string& DeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_net_wd_command();
-
-	virtual bool Open(u32 CommandAddress, u32 Mode);
-	virtual bool Close(u32 CommandAddress, bool Force);
-	virtual bool IOCtlV(u32 CommandAddress);
-
-private:
-	enum
-	{
-		IOCTLV_WD_GET_MODE			= 0x1001, // WD_GetMode
-		IOCTLV_WD_SET_LINKSTATE		= 0x1002, // WD_SetLinkState
-		IOCTLV_WD_GET_LINKSTATE		= 0x1003, // WD_GetLinkState
-		IOCTLV_WD_SET_CONFIG		= 0x1004, // WD_SetConfig
-		IOCTLV_WD_GET_CONFIG		= 0x1005, // WD_GetConfig
-		IOCTLV_WD_CHANGE_BEACON		= 0x1006, // WD_ChangeBeacon
-		IOCTLV_WD_DISASSOC			= 0x1007, // WD_DisAssoc
-		IOCTLV_WD_MP_SEND_FRAME		= 0x1008, // WD_MpSendFrame
-		IOCTLV_WD_SEND_FRAME		= 0x1009, // WD_SendFrame
-		IOCTLV_WD_SCAN				= 0x100a, // WD_Scan
-		IOCTLV_WD_CALL_WL			= 0x100c, // WD_CallWL
-		IOCTLV_WD_MEASURE_CHANNEL	= 0x100b, // WD_MeasureChannel
-		IOCTLV_WD_GET_LASTERROR		= 0x100d, // WD_GetLastError
-		IOCTLV_WD_GET_INFO			= 0x100e, // WD_GetInfo
-		IOCTLV_WD_CHANGE_GAMEINFO	= 0x100f, // WD_ChangeGameInfo
-		IOCTLV_WD_CHANGE_VTSF		= 0x1010, // WD_ChangeVTSF
-		IOCTLV_WD_RECV_FRAME		= 0x8000, // WD_ReceiveFrame
-		IOCTLV_WD_RECV_NOTIFICATION	= 0x8001  // WD_ReceiveNotification
-	};
-
-	enum
-	{
-		BSSID_SIZE = 6,
-		SSID_SIZE = 32
-	};
-
-	enum
-	{
-		SCAN_ACTIVE,
-		SCAN_PASSIVE
-	};
-
-#pragma pack(push, 1)
-	struct ScanInfo
-	{
-		u16 channel_bitmap;
-		u16 max_channel_time;
-		u8 bssid[BSSID_SIZE];
-		u16 scan_type;
-		u16 ssid_length;
-		u8 ssid[SSID_SIZE];
-		u8 ssid_match_mask[SSID_SIZE];
-	};
-
-	struct BSSInfo
-	{
-		u16 length;
-		u16 rssi;
-		u8 bssid[BSSID_SIZE];
-		u16 ssid_length;
-		u8 ssid[SSID_SIZE];
-		u16 capabilities;
-		struct rate
-		{
-			u16 basic;
-			u16 support;
-		};
-		u16 beacon_period;
-		u16 DTIM_period;
-		u16 channel;
-		u16 CF_period;
-		u16 CF_max_duration;
-		u16 element_info_length;
-		u16 element_info[1];
-	};
-
-	struct Info
-	{
-		u8 mac[6];
-		u16 ntr_allowed_channels;
-		u16 unk8;
-		char country[2];
-		u32 unkc;
-		char wlversion[0x50];
-		u8 unk[0x30];
-	};
-#pragma pack(pop)
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
deleted file mode 100644
index 669d531dcf..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FileUtil.h"
-#include "WII_IPC_HLE_Device_net_ssl.h"
-#include "WII_Socket.h"
-
-WII_SSL CWII_IPC_HLE_Device_net_ssl::_SSL[NET_SSL_MAXINSTANCES];
-
-CWII_IPC_HLE_Device_net_ssl::CWII_IPC_HLE_Device_net_ssl(u32 _DeviceID, const std::string& _rDeviceName)
-	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-{
-	for (int i = 0; i < NET_SSL_MAXINSTANCES; ++i)
-	{
-		memset(&_SSL[i], 0, sizeof(WII_SSL));
-	}
-}
-
-CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_HLE_Device_net_ssl()
-{
-	// Cleanup sessions
-	for (int i = 0; i < NET_SSL_MAXINSTANCES; i++)
-	{
-		if (_SSL[i].active)
-		{
-			ssl_close_notify(&_SSL[i].ctx);
-			ssl_session_free(&_SSL[i].session);
-			ssl_free(&_SSL[i].ctx);
-
-			x509_free(&_SSL[i].cacert);
-			x509_free(&_SSL[i].clicert);
-
-			memset(&_SSL[i].ctx, 0, sizeof(ssl_context));
-			memset(&_SSL[i].session, 0, sizeof(ssl_session));
-			memset(&_SSL[i].hs, 0, sizeof(havege_state));
-			memset(_SSL[i].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
-
-			_SSL[i].active = false;
-		}
-	}
-}
-
-int CWII_IPC_HLE_Device_net_ssl::getSSLFreeID()
-{
-	for (int i = 0; i < NET_SSL_MAXINSTANCES; i++)
-	{
-		if (!_SSL[i].active)
-		{
-			return i + 1;
-		}
-	}
-	return 0;
-}
-
-bool CWII_IPC_HLE_Device_net_ssl::Open(u32 _CommandAddress, u32 _Mode)
-{
-	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-	m_Active = true;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ssl::Close(u32 _CommandAddress, bool _bForce)
-{
-	if (!_bForce)
-	{
-		Memory::Write_U32(0, _CommandAddress + 4);
-	}
-	m_Active = false;
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ssl::IOCtl(u32 _CommandAddress)
-{
-	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-	u32 Command			= Memory::Read_U32(_CommandAddress + 0x0C);
-	
-	INFO_LOG(WII_IPC_SSL, "%s unknown %i "
-	"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-			 GetDeviceName().c_str(), Command,
-			 BufferIn, BufferInSize, BufferOut, BufferOutSize);
-	Memory::Write_U32(0, _CommandAddress + 0x4);
-	return true;
-}
-
-bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
-{
-	SIOCtlVBuffer CommandBuffer(_CommandAddress);
-
-	u32 _BufferIn = 0, _BufferIn2 = 0, _BufferIn3 = 0;
-	u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0;
-
-	u32 BufferOut = 0, BufferOut2 = 0, BufferOut3 = 0;
-	u32 BufferOutSize = 0, BufferOutSize2 = 0, BufferOutSize3 = 0;
-
-	if (CommandBuffer.InBuffer.size() > 0)
-	{
-		_BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
-		BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
-	}
-	if (CommandBuffer.InBuffer.size() > 1)
-	{
-		_BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
-		BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
-	}
-	if (CommandBuffer.InBuffer.size() > 2)
-	{
-		_BufferIn3 = CommandBuffer.InBuffer.at(2).m_Address;
-		BufferInSize3 = CommandBuffer.InBuffer.at(2).m_Size;
-	}
-
-	if (CommandBuffer.PayloadBuffer.size() > 0)
-	{
-		BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
-		BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
-	}
-	if (CommandBuffer.PayloadBuffer.size() > 1)
-	{
-		BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
-		BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size;
-	}
-	if (CommandBuffer.PayloadBuffer.size() > 2)
-	{
-		BufferOut3 = CommandBuffer.PayloadBuffer.at(2).m_Address;
-		BufferOutSize3 = CommandBuffer.PayloadBuffer.at(2).m_Size;
-	}
-
-	switch (CommandBuffer.Parameter)
-	{
-	case IOCTLV_NET_SSL_NEW:
-	{
-		int verifyOption = Memory::Read_U32(BufferOut);
-		const char * hostname = (const char*) Memory::GetPointer(BufferOut2);
-
-		int freeSSL = this->getSSLFreeID();
-		if (freeSSL)
-		{
-			int sslID = freeSSL - 1;
-			int ret = ssl_init(&_SSL[sslID].ctx);
-			if (ret)
-			{
-				// Cleanup possibly dirty ctx
-				memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
-				goto _SSL_NEW_ERROR;
-			}
-
-			havege_init(&_SSL[sslID].hs);
-			ssl_set_rng(&_SSL[sslID].ctx, havege_random, &_SSL[sslID].hs);
-
-			// For some reason we can't use TLSv1.2, v1.1 and below are fine!
-			ssl_set_max_version(&_SSL[sslID].ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
-
-			ssl_set_ciphersuites(&_SSL[sslID].ctx, ssl_default_ciphersuites);
-			ssl_set_session(&_SSL[sslID].ctx, &_SSL[sslID].session);
-
-			ssl_set_endpoint(&_SSL[sslID].ctx, SSL_IS_CLIENT);
-			ssl_set_authmode(&_SSL[sslID].ctx, SSL_VERIFY_NONE);
-			ssl_set_renegotiation(&_SSL[sslID].ctx, SSL_RENEGOTIATION_ENABLED);
-
-			memcpy(_SSL[sslID].hostname, hostname, min((int)BufferOutSize2, NET_SSL_MAX_HOSTNAME_LEN));
-			_SSL[sslID].hostname[NET_SSL_MAX_HOSTNAME_LEN-1] = '\0';
-			ssl_set_hostname(&_SSL[sslID].ctx, _SSL[sslID].hostname);
-
-			_SSL[sslID].active = true;
-			Memory::Write_U32(freeSSL, _BufferIn);
-		}
-		else
-		{
-_SSL_NEW_ERROR:
-			Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
-		}
-
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_NEW (%d, %s) "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			verifyOption, hostname,
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_SHUTDOWN:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			ssl_close_notify(&_SSL[sslID].ctx);
-			ssl_session_free(&_SSL[sslID].session);
-			ssl_free(&_SSL[sslID].ctx);
-
-			x509_free(&_SSL[sslID].cacert);
-			x509_free(&_SSL[sslID].clicert);
-
-			memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
-			memset(&_SSL[sslID].session, 0, sizeof(ssl_session));
-			memset(&_SSL[sslID].hs, 0, sizeof(havege_state));
-			memset(_SSL[sslID].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
-
-			_SSL[sslID].active = false;
-
-			Memory::Write_U32(SSL_OK, _BufferIn);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SHUTDOWN "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_SETROOTCA:
-	{
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCA "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-
-
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			int ret = x509parse_crt_der(
-				&_SSL[sslID].cacert,
-				Memory::GetPointer(BufferOut2),
-				BufferOutSize2);
-
-			if (ret)
-			{
-				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
-			}
-			else
-			{
-				ssl_set_ca_chain(&_SSL[sslID].ctx, &_SSL[sslID].cacert, NULL, _SSL[sslID].hostname);
-				Memory::Write_U32(SSL_OK, _BufferIn);
-			}
-
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCA = %d", ret);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		break;
-	}
-	case IOCTLV_NET_SSL_SETBUILTINCLIENTCERT:
-	{
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
-			int ret = x509parse_crtfile(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
-			int rsa_ret = x509parse_keyfile(&_SSL[sslID].rsa, (cert_base_path + "clientcakey.pem").c_str(), NULL);
-			if (ret || rsa_ret)
-			{
-				x509_free(&_SSL[sslID].clicert);
-				rsa_free(&_SSL[sslID].rsa);
-				memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
-				memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
-				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
-			}
-			else
-			{
-				ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].rsa);
-				Memory::Write_U32(SSL_OK, _BufferIn);
-			}
-
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, rsa_ret);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT invalid sslID = %d", sslID);
-		}
-		break;
-	}
-	case IOCTLV_NET_SSL_REMOVECLIENTCERT:
-	{
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_REMOVECLIENTCERT "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			x509_free(&_SSL[sslID].clicert);
-			rsa_free(&_SSL[sslID].rsa);
-			memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
-			memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
-
-			ssl_set_own_cert(&_SSL[sslID].ctx, NULL, NULL);
-			Memory::Write_U32(SSL_OK, _BufferIn);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT invalid sslID = %d", sslID);
-		}
-		break;
-	}
-	case IOCTLV_NET_SSL_SETBUILTINROOTCA:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
-
-			int ret = x509parse_crtfile(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
-			if (ret)
-			{
-				x509_free(&_SSL[sslID].clicert);
-				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
-			}
-			else
-			{
-				ssl_set_ca_chain(&_SSL[sslID].ctx, &_SSL[sslID].cacert, NULL, _SSL[sslID].hostname);
-				Memory::Write_U32(SSL_OK, _BufferIn);
-			}
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA = %d", ret);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_CONNECT:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			_SSL[sslID].sockfd = Memory::Read_U32(BufferOut2);
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT socket = %d", _SSL[sslID].sockfd);
-			ssl_set_bio(&_SSL[sslID].ctx, net_recv, &_SSL[sslID].sockfd, net_send, &_SSL[sslID].sockfd);
-			Memory::Write_U32(SSL_OK, _BufferIn);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_DOHANDSHAKE:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			WiiSockMan &sm = WiiSockMan::getInstance();
-			sm.doSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_DOHANDSHAKE);
-			return false;
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		break;
-	}
-	case IOCTLV_NET_SSL_WRITE:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			WiiSockMan &sm = WiiSockMan::getInstance();
-			sm.doSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_WRITE);
-			return false;
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_WRITE "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		INFO_LOG(WII_IPC_SSL, "%s", Memory::GetPointer(BufferOut2));
-		break;
-	}
-	case IOCTLV_NET_SSL_READ:
-	{
-
-		int ret = 0;
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			WiiSockMan &sm = WiiSockMan::getInstance();
-			sm.doSock(_SSL[sslID].sockfd, _CommandAddress, IOCTLV_NET_SSL_READ);
-			return false;
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_READ(%d)"
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			ret,
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_SETROOTCADEFAULT:
-	{
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			Memory::Write_U32(SSL_OK, _BufferIn);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETROOTCADEFAULT "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	case IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT:
-	{
-		INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-
-		int sslID = Memory::Read_U32(BufferOut) - 1;
-		if (SSLID_VALID(sslID))
-		{
-			Memory::Write_U32(SSL_OK, _BufferIn);
-		}
-		else
-		{
-			Memory::Write_U32(SSL_ERR_ID, _BufferIn);
-		}
-		break;
-	}
-	default:
-		ERROR_LOG(WII_IPC_SSL, "%i "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-			"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "
-			"BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)",
-			CommandBuffer.Parameter,
-			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2,
-			_BufferIn3, BufferInSize3, BufferOut, BufferOutSize,
-			BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3);
-		break;
-	}
-	
-	// SSL return codes are written to BufferIn
-	Memory::Write_U32(0, _CommandAddress+4);
-	
-	return true;
-}
-
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
deleted file mode 100644
index b8494d43d0..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_NET_SSL_H_
-#define _WII_IPC_HLE_DEVICE_NET_SSL_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-#include <polarssl/net.h>
-#include <polarssl/ssl.h>
-#include <polarssl/havege.h>
-
-#define NET_SSL_MAX_HOSTNAME_LEN 256
-#define NET_SSL_MAXINSTANCES 4
-
-#define SSLID_VALID(x) (x >= 0 && x < NET_SSL_MAXINSTANCES && CWII_IPC_HLE_Device_net_ssl::_SSL[x].active)
-
-enum ssl_err_t
-{
-	SSL_OK 					=   0,
-	SSL_ERR_FAILED			=  -1,
-	SSL_ERR_RAGAIN			=  -2,
-	SSL_ERR_WAGAIN			=  -3,
-	SSL_ERR_SYSCALL			=  -5,
-	SSL_ERR_ZERO			=  -6,  // read or write returned 0
-	SSL_ERR_CAGAIN			=  -7,  // BIO not connected
-	SSL_ERR_ID				=  -8,  // invalid SSL id
-	SSL_ERR_VCOMMONNAME		=  -9,  // verify failed: common name
-	SSL_ERR_VROOTCA			=  -10, // verify failed: root ca
-	SSL_ERR_VCHAIN			=  -11, // verify failed: certificate chain
-	SSL_ERR_VDATE			=  -12, // verify failed: date invalid
-	SSL_ERR_SERVER_CERT		=  -13, // certificate cert invalid
-};
-
-enum SSL_IOCTL
-{
-	IOCTLV_NET_SSL_NEW							= 0x01,
-	IOCTLV_NET_SSL_CONNECT						= 0x02,
-	IOCTLV_NET_SSL_DOHANDSHAKE					= 0x03,
-	IOCTLV_NET_SSL_READ							= 0x04,
-	IOCTLV_NET_SSL_WRITE						= 0x05,
-	IOCTLV_NET_SSL_SHUTDOWN						= 0x06,
-	IOCTLV_NET_SSL_SETCLIENTCERT				= 0x07,
-	IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT			= 0x08,
-	IOCTLV_NET_SSL_REMOVECLIENTCERT				= 0x09,
-	IOCTLV_NET_SSL_SETROOTCA					= 0x0A,
-	IOCTLV_NET_SSL_SETROOTCADEFAULT				= 0x0B,
-	IOCTLV_NET_SSL_DOHANDSHAKEEX				= 0x0C,
-	IOCTLV_NET_SSL_SETBUILTINROOTCA				= 0x0D,
-	IOCTLV_NET_SSL_SETBUILTINCLIENTCERT			= 0x0E,
-	IOCTLV_NET_SSL_DISABLEVERIFYOPTIONFORDEBUG	= 0x0F,
-	IOCTLV_NET_SSL_DEBUGGETVERSION				= 0x14,
-	IOCTLV_NET_SSL_DEBUGGETTIME					= 0x15,
-};
-
-typedef struct {
-	ssl_context ctx;
-	ssl_session session;
-	havege_state hs;
-	x509_cert cacert;
-	x509_cert clicert;
-	rsa_context rsa;
-	int sockfd;
-	char hostname[NET_SSL_MAX_HOSTNAME_LEN];
-	bool active;
-} WII_SSL;
-
-class CWII_IPC_HLE_Device_net_ssl : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_net_ssl(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual ~CWII_IPC_HLE_Device_net_ssl();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-
-	virtual bool IOCtl(u32 _CommandAddress);
-	virtual bool IOCtlV(u32 _CommandAddress);
-	int getSSLFreeID();
-
-	static WII_SSL _SSL[NET_SSL_MAXINSTANCES];
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
deleted file mode 100644
index e7a323228d..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// PRELIMINARY - seems to fully work with libogc, writing has yet to be tested
-
-#ifndef _WII_IPC_HLE_DEVICE_SDIO_SLOT0_H_
-#define _WII_IPC_HLE_DEVICE_SDIO_SLOT0_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
-
-	virtual void DoState(PointerWrap& p);
-
-	bool Open(u32 _CommandAddress, u32 _Mode);
-	bool Close(u32 _CommandAddress, bool _bForce);
-	bool IOCtl(u32 _CommandAddress); 
-	bool IOCtlV(u32 _CommandAddress);
-
-	void EventNotify();
-
-private:
-
-	// SD Host Controller Registers
-	enum
-	{
-		HCR_CLOCKCONTROL	= 0x2C,
-		HCR_SOFTWARERESET	= 0x2F,
-	};
-
-	// IOCtl
-	enum 
-	{
-		IOCTL_WRITEHCR		= 0x01,
-		IOCTL_READHCR		= 0x02,
-		IOCTL_RESETCARD		= 0x04,
-		IOCTL_SETCLK		= 0x06,
-		IOCTL_SENDCMD		= 0x07,
-		IOCTL_GETSTATUS		= 0x0B,
-		IOCTL_GETOCR		= 0x0C,
-	};
-
-	// IOCtlV
-	enum
-	{
-		IOCTLV_SENDCMD		= 0x07,
-	};
-
-	// ExecuteCommand
-	enum
-	{
-		RET_OK,
-		RET_FAIL,
-		RET_EVENT_REGISTER, // internal state only - not actually returned
-		RET_EVENT_UNREGISTER
-	};
-
-	// Status
-	enum
-	{
-		CARD_NOT_EXIST		= 0,
-		CARD_INSERTED		= 1,
-		CARD_INITIALIZED	= 0x10000,
-	};
-
-	// Commands
-	enum
-	{
-		GO_IDLE_STATE		= 0x00,
-		ALL_SEND_CID		= 0x02,
-		SEND_RELATIVE_ADDR	= 0x03,
-		SELECT_CARD			= 0x07,
-		SEND_IF_COND		= 0x08,
-		SEND_CSD			= 0x09,
-		SEND_CID			= 0x0A,
-		SEND_STATUS			= 0x0D,
-		SET_BLOCKLEN		= 0x10,
-		READ_MULTIPLE_BLOCK	= 0x12,
-		WRITE_MULTIPLE_BLOCK= 0x19,
-		APP_CMD_NEXT		= 0x37,
-
-		ACMD_SETBUSWIDTH	= 0x06,
-		ACMD_SENDOPCOND		= 0x29,
-		ACMD_SENDSCR		= 0x33,
-
-		EVENT_REGISTER		= 0x40,
-		EVENT_UNREGISTER	= 0x41,
-	};
-
-	enum EventType
-	{
-		EVENT_NONE = 0,
-		EVENT_INSERT,
-		EVENT_REMOVE,
-		// from unregister, i think it is just meant to be invalid
-		EVENT_INVALID = 0xc210000
-	};
-
-	// TODO do we need more than one?
-	struct Event
-	{
-		EventType type;
-		u32 addr;
-		Event()
-			: type(EVENT_NONE)
-			, addr()
-		{}
-	} m_event;
-
-	u32 m_Status;
-	u32 m_BlockLength;
-	u32 m_BusWidth;
-
-	u32 m_Registers[0x200/4];
-
-	File::IOFile m_Card;
-
-	u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize,
-		u32 BufferIn2, u32 BufferInSize2,
-		u32 _BufferOut, u32 BufferOutSize);
-	void OpenInternal();
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h
deleted file mode 100644
index d4b26bcac2..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_STM_H_
-#define _WII_IPC_HLE_DEVICE_STM_H_
-
-#include "WII_IPC_HLE_Device.h"
-
-enum
-{
-	IOCTL_STM_EVENTHOOK			= 0x1000,
-	IOCTL_STM_GET_IDLEMODE		= 0x3001,
-	IOCTL_STM_RELEASE_EH		= 0x3002,
-	IOCTL_STM_HOTRESET			= 0x2001,
-	IOCTL_STM_HOTRESET_FOR_PD	= 0x2002,
-	IOCTL_STM_SHUTDOWN			= 0x2003,
-	IOCTL_STM_IDLE				= 0x2004,
-	IOCTL_STM_WAKEUP			= 0x2005,
-	IOCTL_STM_VIDIMMING			= 0x5001,
-	IOCTL_STM_LEDFLASH			= 0x6001,
-	IOCTL_STM_LEDMODE			= 0x6002,
-	IOCTL_STM_READVER			= 0x7001,
-	IOCTL_STM_READDDRREG		= 0x4001,
-	IOCTL_STM_READDDRREG2		= 0x4002,
-};
-
-// The /dev/stm/immediate
-class CWII_IPC_HLE_Device_stm_immediate : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_stm_immediate(u32 _DeviceID, const std::string& _rDeviceName) :
-		IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-	{}
-
-	virtual ~CWII_IPC_HLE_Device_stm_immediate()
-	{}
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode)
-	{
-		INFO_LOG(WII_IPC_STM, "STM immediate: Open");
-		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
-		m_Active = true;
-		return true;
-	}
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce)
-	{
-		INFO_LOG(WII_IPC_STM, "STM immediate: Close");
-		if (!_bForce)
-			Memory::Write_U32(0, _CommandAddress+4);
-		m_Active = false;
-		return true;
-	}
-
-	virtual bool IOCtl(u32 _CommandAddress) 
-	{
-		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
-		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-		u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-		u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-
-		// Prepare the out buffer(s) with zeroes as a safety precaution
-		// to avoid returning bad values
-		Memory::Memset(BufferOut, 0, BufferOutSize);
-		u32 ReturnValue = 0;
-
-		switch(Parameter)
-		{
-		case IOCTL_STM_RELEASE_EH:
-			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_RELEASE_EH");
-			break;
-
-		case IOCTL_STM_HOTRESET:
-			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_HOTRESET");
-			break;
-
-		case IOCTL_STM_VIDIMMING: // (Input: 20 bytes, Output: 20 bytes)
-			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_VIDIMMING");
-			//DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_STM);
-			//Memory::Write_U32(1, BufferOut);
-			//ReturnValue = 1;
-			break;
-
-		case IOCTL_STM_LEDMODE:  // (Input: 20 bytes, Output: 20 bytes)
-			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_LEDMODE");
-			break;
-
-		default:
-			{
-				_dbg_assert_msg_(WII_IPC_STM, 0, "CWII_IPC_HLE_Device_stm_immediate: 0x%x", Parameter);
-
-				INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-				DEBUG_LOG(WII_IPC_STM, "    Parameter: 0x%x", Parameter);
-				DEBUG_LOG(WII_IPC_STM, "    InBuffer: 0x%08x", BufferIn);
-				DEBUG_LOG(WII_IPC_STM, "    InBufferSize: 0x%08x", BufferInSize);
-				DEBUG_LOG(WII_IPC_STM, "    OutBuffer: 0x%08x", BufferOut);
-				DEBUG_LOG(WII_IPC_STM, "    OutBufferSize: 0x%08x", BufferOutSize);
-			}
-			break;
-		}
-
-		// Write return value to the IPC call
-		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-		return true;
-	}
-};
-
-// The /dev/stm/eventhook
-class CWII_IPC_HLE_Device_stm_eventhook : public IWII_IPC_HLE_Device
-{
-public:
-
-	CWII_IPC_HLE_Device_stm_eventhook(u32 _DeviceID, const std::string& _rDeviceName) 
-		: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-		, m_EventHookAddress(0)
-	{}
-
-	virtual ~CWII_IPC_HLE_Device_stm_eventhook()
-	{
-	}
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode)
-	{
-		Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
-		m_Active = true;
-		return true;
-	}
-
-	virtual bool Close(u32 _CommandAddress, bool _bForce)
-	{
-		m_EventHookAddress = 0;
-
-		INFO_LOG(WII_IPC_STM, "STM eventhook: Close");
-		if (!_bForce)
-			Memory::Write_U32(0, _CommandAddress+4);
-		m_Active = false;
-		return true;
-	}
-
-	virtual bool IOCtl(u32 _CommandAddress) 
-	{
-		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
-		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-		u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-		u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
-
-		// Prepare the out buffer(s) with zeros as a safety precaution
-		// to avoid returning bad values
-		Memory::Memset(BufferOut, 0, BufferOutSize);
-		u32 ReturnValue = 0;
-
-		// write return value
-		switch (Parameter)
-		{
-		case IOCTL_STM_EVENTHOOK:
-			{
-				m_EventHookAddress = _CommandAddress;
-
-				INFO_LOG(WII_IPC_STM, "%s registers event hook:", GetDeviceName().c_str());
-				DEBUG_LOG(WII_IPC_STM, "%x - IOCTL_STM_EVENTHOOK", Parameter);
-				DEBUG_LOG(WII_IPC_STM, "BufferIn: 0x%08x", BufferIn);
-				DEBUG_LOG(WII_IPC_STM, "BufferInSize: 0x%08x", BufferInSize);
-				DEBUG_LOG(WII_IPC_STM, "BufferOut: 0x%08x", BufferOut);
-				DEBUG_LOG(WII_IPC_STM, "BufferOutSize: 0x%08x", BufferOutSize);
-
-				DumpCommands(BufferIn, BufferInSize/4, LogTypes::WII_IPC_STM);
-			}
-			break;
-
-		default:
-			_dbg_assert_msg_(WII_IPC_STM, 0, "unknown %s ioctl %x",
-				GetDeviceName().c_str(), Parameter);
-			break;
-		}
-
-		// Write return value to the IPC call, 0 means success
-		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-		return false;
-	}
-
-	// STATE_TO_SAVE
-	u32 m_EventHookAddress;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
deleted file mode 100644
index 28844fac78..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_IPC_HLE_DEVICE_USB_KBD_H_
-#define _WII_IPC_HLE_DEVICE_USB_KBD_H_
-
-class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device
-{
-public:
-	CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
-	virtual ~CWII_IPC_HLE_Device_usb_kbd();
-
-	virtual bool Open(u32 _CommandAddress, u32 _Mode);
-	virtual bool Close(u32 _CommandAddress, bool _bForce);
-	virtual bool Write(u32 _CommandAddress);
-	virtual bool IOCtl(u32 _CommandAddress);
-	virtual u32 Update();
-
-private:
-	enum
-	{
-		MSG_KBD_CONNECT = 0,
-		MSG_KBD_DISCONNECT,
-		MSG_EVENT
-	};
-
-	#pragma pack(push, 1)
-	struct SMessageData
-	{
-		u32 MsgType;
-		u32 Unk1;
-		u8 Modifiers;
-		u8 Unk2;
-		u8 PressedKeys[6];
-
-		SMessageData(u32 _MsgType, u8 _Modifiers, u8 *_PressedKeys) {
-			MsgType = Common::swap32(_MsgType);
-			Unk1 = 0; // swapped
-			Modifiers = _Modifiers;
-			Unk2 = 0;
-
-			if (_PressedKeys) // Doesn't need to be in a specific order
-				memcpy(PressedKeys, _PressedKeys, sizeof(PressedKeys));
-			else
-				memset(PressedKeys, 0, sizeof(PressedKeys));
-		}
-	};
-	#pragma pack(pop)
-	std::queue<SMessageData> m_MessageQueue;
-
-	bool m_OldKeyBuffer[256];
-	u8 m_OldModifiers;
-
-	virtual bool IsKeyPressed(int _Key);
-
-	// This stuff should probably die
-	enum
-	{
-		KBD_LAYOUT_QWERTY = 0,
-		KBD_LAYOUT_AZERTY
-	};
-	int m_KeyboardLayout;
-	static u8 m_KeyCodesQWERTY[256];
-	static u8 m_KeyCodesAZERTY[256];
-};
-
-#endif // _WII_IPC_HLE_DEVICE_USB_KBD_H_
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
deleted file mode 100644
index 0caa2ed7e8..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "WII_Socket.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device.h"
-// No Wii socket support while using NetPlay or TAS
-#include "NetPlayProto.h"
-#include "Movie.h"
-
-using WII_IPC_HLE_Interface::ECommandType;
-using WII_IPC_HLE_Interface::COMMAND_IOCTL;
-using WII_IPC_HLE_Interface::COMMAND_IOCTLV;
-
-#ifdef _WIN32
-#define ERRORCODE(name) WSA ## name
-#define EITHER(win32, posix) win32
-#else
-#define ERRORCODE(name) name
-#define EITHER(win32, posix) posix
-#endif
-
-char* WiiSockMan::DecodeError(s32 ErrorCode)
-{
-#ifdef _WIN32
-	static char Message[1024];
-	// If this program was multi-threaded, we'd want to use FORMAT_MESSAGE_ALLOCATE_BUFFER
-	// instead of a static buffer here.
-	// (And of course, free the buffer when we were done with it)
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, ErrorCode,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, NULL);
-	return Message;
-#else
-	return strerror(ErrorCode);
-#endif
-}
-
-s32 translateErrorCode(s32 native_error, bool isRW)
-{
-	switch (native_error)
-	{
-	case ERRORCODE(EMSGSIZE):
-		ERROR_LOG(WII_IPC_NET, "Find out why this happened, looks like PEEK failure?");
-		return -1; // Should be -SO_EMSGSIZE
-	case EITHER(WSAENOTSOCK, EBADF):
-		return -SO_EBADF;
-	case ERRORCODE(EADDRINUSE):
-		return -SO_EADDRINUSE;
-	case ERRORCODE(ECONNRESET):
-		return -SO_ECONNRESET;
-	case ERRORCODE(EISCONN):
-		return -SO_EISCONN;
-	case ERRORCODE(ENOTCONN):
-		return -SO_EAGAIN; // After proper blocking SO_EAGAIN shouldn't be needed...
-	case ERRORCODE(EINPROGRESS):
-		return -SO_EINPROGRESS;
-	case ERRORCODE(EALREADY):
-		return -SO_EALREADY;
-	case ERRORCODE(EACCES):
-		return -SO_EACCES;
-	case ERRORCODE(ECONNREFUSED):
-		return -SO_ECONNREFUSED;
-	case ERRORCODE(ENETUNREACH):
-		return -SO_ENETUNREACH;
-	case ERRORCODE(EHOSTUNREACH):
-		return -SO_EHOSTUNREACH;
-	case EITHER(WSAEWOULDBLOCK, EAGAIN):
-		if (isRW){
-			return -SO_EAGAIN;  // EAGAIN
-		}else{
-			return -SO_EINPROGRESS; // EINPROGRESS
-		}
-	default:
-		return -1;
-	}
-}
-
-s32 WiiSockMan::getNetErrorCode(s32 ret, std::string caller, bool isRW)
-{
-#ifdef _WIN32
-	s32 errorCode = WSAGetLastError();
-#else
-	s32 errorCode = errno;
-#endif
-
-	if (ret >= 0)
-	{
-		WiiSockMan::getInstance().setLastNetError(ret);
-		return ret;
-	}
-
-	INFO_LOG(WII_IPC_NET, "%s failed with error %d: %s, ret= %d",
-		caller.c_str(), errorCode, DecodeError(errorCode), ret);
-
-	s32 ReturnValue = translateErrorCode(errorCode, isRW);
-	WiiSockMan::getInstance().setLastNetError(ReturnValue);
-
-	return ReturnValue;
-}
-
-WiiSocket::~WiiSocket()
-{
-	if (fd >= 0)
-	{
-		(void)closeFd();
-	}
-}
-
-void WiiSocket::setFd(s32 s)
-{
-	if (fd >= 0)
-		(void)closeFd();
-
-	nonBlock = false;
-	fd = s;
-
-	// Set socket to NON-BLOCK
-#ifdef _WIN32
-	u_long iMode = 1;
-	ioctlsocket(fd, FIONBIO, &iMode);
-#else
-	int flags;
-	if (-1 == (flags = fcntl(fd, F_GETFL, 0)))
-		flags = 0;
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-#endif
-}
-
-s32 WiiSocket::closeFd()
-{
-	s32 ReturnValue = 0;
-	if (fd >= 0)
-	{
-#ifdef _WIN32
-		s32 ret = closesocket(fd);
-#else
-		s32 ret = close(fd);
-#endif
-		ReturnValue = WiiSockMan::getNetErrorCode(ret, "delSocket", false);
-	}
-	else
-	{
-		ReturnValue = WiiSockMan::getNetErrorCode(EITHER(WSAENOTSOCK, EBADF), "delSocket", false);
-	}
-	fd = -1;
-	return ReturnValue;
-}
-
-s32 WiiSocket::_fcntl(u32 cmd, u32 arg)
-{
-#define F_GETFL			3
-#define F_SETFL			4
-#define F_NONBLOCK		4
-	s32 ret = 0;
-	if (cmd == F_GETFL)
-	{
-		ret = nonBlock ? F_NONBLOCK : 0;
-	}
-	else if (cmd == F_SETFL)
-	{
-		nonBlock = (arg & F_NONBLOCK) == F_NONBLOCK;
-	}
-	else
-	{
-		ERROR_LOG(WII_IPC_NET, "SO_FCNTL unknown command");
-	}
-
-	INFO_LOG(WII_IPC_NET, "IOCTL_SO_FCNTL(%08x, %08X, %08X)",
-		fd, cmd, arg);
-
-	return ret;
-}
-
-void WiiSocket::update(bool read, bool write, bool except)
-{
-	auto it = pending_sockops.begin();
-	while (it != pending_sockops.end())
-	{
-		s32 ReturnValue = 0;
-		bool forceNonBlock = false;
-		ECommandType ct = static_cast<ECommandType>(Memory::Read_U32(it->_CommandAddress));
-		if (!it->is_ssl && ct == COMMAND_IOCTL)
-		{
-			u32 BufferIn = Memory::Read_U32(it->_CommandAddress + 0x10);
-			u32 BufferInSize = Memory::Read_U32(it->_CommandAddress + 0x14);
-			u32 BufferOut = Memory::Read_U32(it->_CommandAddress + 0x18);
-			u32 BufferOutSize = Memory::Read_U32(it->_CommandAddress + 0x1C);
-
-			switch(it->net_type)
-			{
-			case IOCTL_SO_FCNTL:
-			{
-				u32 cmd	= Memory::Read_U32(BufferIn + 4);
-				u32 arg	= Memory::Read_U32(BufferIn + 8);
-				ReturnValue = _fcntl(cmd, arg);
-				break;
-			}
-			case IOCTL_SO_BIND:
-			{
-				//u32 has_addr = Memory::Read_U32(BufferIn + 0x04);
-				sockaddr_in local_name;
-				WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn + 0x08);
-				WiiSockMan::Convert(*wii_name, local_name);
-
-				int ret = bind(fd, (sockaddr*)&local_name, sizeof(local_name));
-				ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_BIND", false);
-
-				INFO_LOG(WII_IPC_NET, "IOCTL_SO_BIND (%08X %s:%d) = %d ", fd, 
-					inet_ntoa(local_name.sin_addr), Common::swap16(local_name.sin_port), ret);
-				break;
-			}
-			case IOCTL_SO_CONNECT:
-			{
-				//u32 has_addr = Memory::Read_U32(BufferIn + 0x04);
-				sockaddr_in local_name;
-				WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn + 0x08);
-				WiiSockMan::Convert(*wii_name, local_name);
-				
-				int ret = connect(fd, (sockaddr*)&local_name, sizeof(local_name));
-				ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_CONNECT", false);
-
-				INFO_LOG(WII_IPC_NET,"IOCTL_SO_CONNECT (%08x, %s:%d)",
-					fd, inet_ntoa(local_name.sin_addr), Common::swap16(local_name.sin_port));
-				break;
-			}
-			case IOCTL_SO_ACCEPT:
-			{
-		
-				if (BufferOutSize > 0)
-				{
-					sockaddr_in local_name;
-					WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut);
-					WiiSockMan::Convert(*wii_name, local_name);
-					
-					socklen_t addrlen = sizeof(sockaddr_in);
-					int ret = (s32)accept(fd, (sockaddr*)&local_name, &addrlen);
-					ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_ACCEPT", false);
-
-					WiiSockMan::Convert(local_name, *wii_name, addrlen);
-				}
-				else
-				{
-					int ret = (s32)accept(fd, NULL, 0);
-					ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_ACCEPT", false);
-				}
-
-				WiiSockMan::getInstance().addSocket(ReturnValue);
-
-				INFO_LOG(WII_IPC_NET, "IOCTL_SO_ACCEPT "
-					"BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
-					BufferIn, BufferInSize, BufferOut, BufferOutSize);
-
-				break;
-			}
-			default:
-				break;
-			}
-
-			// Fix blocking error codes
-			if (!nonBlock)
-			{
-				if (it->net_type == IOCTL_SO_CONNECT 
-					&& ReturnValue == -SO_EISCONN)
-				{
-					ReturnValue = SO_SUCCESS;
-				}
-			}
-		}
-		else if (ct == COMMAND_IOCTLV)
-		{
-			SIOCtlVBuffer CommandBuffer(it->_CommandAddress);
-			u32 BufferIn = 0, BufferIn2 = 0;
-			u32 BufferInSize = 0, BufferInSize2 = 0;
-			u32 BufferOut = 0, BufferOut2 = 0;
-			u32 BufferOutSize = 0, BufferOutSize2 = 0;
-			
-			if (CommandBuffer.InBuffer.size() > 0)
-			{
-				BufferIn = CommandBuffer.InBuffer.at(0).m_Address;
-				BufferInSize = CommandBuffer.InBuffer.at(0).m_Size;
-			}
-			
-			if (CommandBuffer.PayloadBuffer.size() > 0)
-			{
-				BufferOut = CommandBuffer.PayloadBuffer.at(0).m_Address;
-				BufferOutSize = CommandBuffer.PayloadBuffer.at(0).m_Size;
-			}
-			
-			if (CommandBuffer.PayloadBuffer.size() > 1)
-			{
-				BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
-				BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size;
-			}
-			
-			if (CommandBuffer.InBuffer.size() > 1)
-			{
-				BufferIn2 = CommandBuffer.InBuffer.at(1).m_Address;
-				BufferInSize2 = CommandBuffer.InBuffer.at(1).m_Size;
-			}
-
-			if (it->is_ssl)
-			{
-				int sslID = Memory::Read_U32(BufferOut) - 1;
-				if (SSLID_VALID(sslID))
-				{
-					switch(it->ssl_type)
-					{
-					case IOCTLV_NET_SSL_DOHANDSHAKE:
-					{
-					
-						int ret = ssl_handshake(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx);
-						switch (ret)
-						{
-						case 0:
-							Memory::Write_U32(SSL_OK, BufferIn);
-							break;
-						case POLARSSL_ERR_NET_WANT_READ:
-							Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
-							if (!nonBlock)
-								ReturnValue = SSL_ERR_RAGAIN;
-							break;
-						case POLARSSL_ERR_NET_WANT_WRITE:
-							Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
-							if (!nonBlock)
-								ReturnValue = SSL_ERR_WAGAIN;
-							break;
-						default:
-							Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
-							break;
-						}
-					
-						INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_DOHANDSHAKE = (%d) "
-							"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-							"BufferOut: (%08x, %i), BufferOut2: (%08x, %i)",
-							ret,
-							BufferIn, BufferInSize, BufferIn2, BufferInSize2,
-							BufferOut, BufferOutSize, BufferOut2, BufferOutSize2);
-						break;
-					}
-					case IOCTLV_NET_SSL_WRITE:
-					{
-						int ret = ssl_write(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx, Memory::GetPointer(BufferOut2), BufferOutSize2);
-			
-#ifdef DEBUG_SSL
-						File::IOFile("ssl_write.bin", "ab").WriteBytes(Memory::GetPointer(BufferOut2), BufferOutSize2);
-#endif
-						if (ret >= 0)
-						{
-							// Return bytes written or SSL_ERR_ZERO if none
-							Memory::Write_U32((ret == 0) ? SSL_ERR_ZERO : ret, BufferIn);
-						}
-						else 
-						{
-							switch (ret)
-							{
-							case POLARSSL_ERR_NET_WANT_READ:
-								Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
-								if (!nonBlock)
-									ReturnValue = SSL_ERR_RAGAIN;
-								break;
-							case POLARSSL_ERR_NET_WANT_WRITE:
-								Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
-								if (!nonBlock)
-									ReturnValue = SSL_ERR_WAGAIN;
-								break;
-							default:
-								Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
-								break;
-							}
-						}
-						break;
-					}
-					case IOCTLV_NET_SSL_READ:
-					{
-						int ret = ssl_read(&CWII_IPC_HLE_Device_net_ssl::_SSL[sslID].ctx, Memory::GetPointer(BufferIn2), BufferInSize2);
-#ifdef DEBUG_SSL
-						if (ret > 0)
-						{
-							File::IOFile("ssl_read.bin", "ab").WriteBytes(Memory::GetPointer(BufferIn2), ret);
-						}
-#endif
-						if (ret >= 0)
-						{
-							// Return bytes read or SSL_ERR_ZERO if none
-							Memory::Write_U32((ret == 0) ? SSL_ERR_ZERO : ret, BufferIn);
-						}
-						else 
-						{
-							switch (ret)
-							{
-							case POLARSSL_ERR_NET_WANT_READ:
-								Memory::Write_U32(SSL_ERR_RAGAIN, BufferIn);
-								if (!nonBlock)
-									ReturnValue = SSL_ERR_RAGAIN;
-								break;
-							case POLARSSL_ERR_NET_WANT_WRITE:
-								Memory::Write_U32(SSL_ERR_WAGAIN, BufferIn);
-								if (!nonBlock)
-									ReturnValue = SSL_ERR_WAGAIN;
-								break;
-							default:
-								Memory::Write_U32(SSL_ERR_FAILED, BufferIn);
-								break;
-							}
-						}
-						break;
-					}
-					default:
-						break;
-					}
-				}
-				else
-				{
-					Memory::Write_U32(SSL_ERR_ID, BufferIn);
-				}
-			} 
-			else
-			{
-				switch (it->net_type)
-				{
-				case IOCTLV_SO_SENDTO:
-				{
-				
-					u32 flags = Memory::Read_U32(BufferIn2 + 0x04);
-					u32 has_destaddr = Memory::Read_U32(BufferIn2 + 0x08);
-					char * data = (char*)Memory::GetPointer(BufferIn);
-					
-					// Act as non blocking when SO_MSG_NONBLOCK is specified
-					forceNonBlock = ((flags & SO_MSG_NONBLOCK) == SO_MSG_NONBLOCK);
-					// send/sendto only handles MSG_OOB
-					flags &= SO_MSG_OOB;
-					
-					sockaddr_in local_name;
-					if (has_destaddr)
-					{						
-						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferIn2 + 0x0C);
-						WiiSockMan::Convert(*wii_name, local_name);
-					}
-
-					int ret = sendto(fd, data, BufferInSize, flags, 
-						has_destaddr ? (struct sockaddr*)&local_name : NULL, 
-						has_destaddr ? sizeof(sockaddr) :  0);
-					ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_SENDTO", true);
-
-					INFO_LOG(WII_IPC_NET,
-						"%s = %d Socket: %08x, BufferIn: (%08x, %i), BufferIn2: (%08x, %i), %u.%u.%u.%u",
-						has_destaddr ? "IOCTLV_SO_SENDTO " : "IOCTLV_SO_SEND ",
-						ReturnValue, fd, BufferIn, BufferInSize,
-						BufferIn2, BufferInSize2,
-						local_name.sin_addr.s_addr & 0xFF,
-						(local_name.sin_addr.s_addr >> 8) & 0xFF,
-						(local_name.sin_addr.s_addr >> 16) & 0xFF,
-						(local_name.sin_addr.s_addr >> 24) & 0xFF
-						);
-					break;
-				}
-				case IOCTLV_SO_RECVFROM:
-				{
-					u32 flags = Memory::Read_U32(BufferIn + 0x04);
-					char * data = (char *)Memory::GetPointer(BufferOut);
-					int data_len = BufferOutSize;
-
-					sockaddr_in local_name;
-					memset(&local_name, 0, sizeof(sockaddr_in));
-			
-					if (BufferOutSize2 != 0)
-					{
-						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut2);
-						WiiSockMan::Convert(*wii_name, local_name);
-					}
-
-					// Act as non blocking when SO_MSG_NONBLOCK is specified
-					forceNonBlock = ((flags & SO_MSG_NONBLOCK) == SO_MSG_NONBLOCK);
-			
-					// recv/recvfrom only handles PEEK/OOB
-					flags &= SO_MSG_PEEK | SO_MSG_OOB;
-#ifdef _WIN32
-					if (flags & SO_MSG_PEEK){
-						unsigned long totallen = 0;
-						ioctlsocket(fd, FIONREAD, &totallen);
-						ReturnValue = totallen;
-						break;
-					}
-#endif
-					socklen_t addrlen = sizeof(sockaddr_in);
-					int ret = recvfrom(fd, data, data_len, flags,
-									BufferOutSize2 ? (struct sockaddr*) &local_name : NULL,
-									BufferOutSize2 ? &addrlen : 0);
-					ReturnValue = WiiSockMan::getNetErrorCode(ret, BufferOutSize2 ? "SO_RECVFROM" : "SO_RECV", true);
-
-			
-					INFO_LOG(WII_IPC_NET, "%s(%d, %p) Socket: %08X, Flags: %08X, "
-					"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
-					"BufferOut: (%08x, %i), BufferOut2: (%08x, %i)", 
-					BufferOutSize2 ? "IOCTLV_SO_RECVFROM " : "IOCTLV_SO_RECV ",
-					ReturnValue, data, fd, flags,
-					BufferIn, BufferInSize, BufferIn2, BufferInSize2,
-					BufferOut, BufferOutSize, BufferOut2, BufferOutSize2);
-
-					if (BufferOutSize2 != 0)
-					{
-						WiiSockAddrIn* wii_name = (WiiSockAddrIn*)Memory::GetPointer(BufferOut2);
-						WiiSockMan::Convert(local_name, *wii_name, addrlen);
-					}
-					break;
-				}
-				default:
-					break;
-				}
-			}
-			
-		}
-
-		if ( nonBlock || forceNonBlock
-			|| (!it->is_ssl && ReturnValue != -SO_EAGAIN && ReturnValue != -SO_EINPROGRESS && ReturnValue != -SO_EALREADY)
-			|| (it->is_ssl && ReturnValue != SSL_ERR_WAGAIN && ReturnValue != SSL_ERR_RAGAIN))
-		{
-			DEBUG_LOG(WII_IPC_NET, "IOCTL(V) Sock: %08x ioctl/v: %d returned: %d nonBlock: %d forceNonBlock: %d", 
-				fd, it->is_ssl ? (int) it->ssl_type : (int) it->net_type, ReturnValue, nonBlock, forceNonBlock);
-			WiiSockMan::EnqueueReply(it->_CommandAddress, ReturnValue);
-			it = pending_sockops.erase(it);
-		}
-		else
-		{
-			++it;
-		}
-	}
-}
-
-void WiiSocket::doSock(u32 _CommandAddress, NET_IOCTL type)
-{
-	sockop so = {_CommandAddress, false};
-	so.net_type = type;
-	pending_sockops.push_back(so);
-}
-
-void WiiSocket::doSock(u32 _CommandAddress, SSL_IOCTL type)
-{
-	sockop so = {_CommandAddress, true};
-	so.ssl_type = type;
-	pending_sockops.push_back(so);
-}
-
-void WiiSockMan::addSocket(s32 fd)
-{
-	if (fd >= 0)
-	{
-		WiiSocket& sock = WiiSockets[fd];
-		sock.setFd(fd);
-	}
-}
-
-s32 WiiSockMan::newSocket(s32 af, s32 type, s32 protocol)
-{
-	if (NetPlay::IsNetPlayRunning()
-		|| Movie::IsRecordingInput()
-		|| Movie::IsPlayingInput())
-	{
-		return SO_ENOMEM;
-	}
-
-	s32 fd = (s32)socket(af, type, protocol);
-	s32 ret = getNetErrorCode(fd, "newSocket", false);
-	addSocket(ret);
-	return ret;
-}
-
-s32 WiiSockMan::delSocket(s32 s)
-{
-	s32 ReturnValue = WiiSockets[s].closeFd();
-	WiiSockets.erase(s);
-	return ReturnValue;
-}
-
-void WiiSockMan::Update()
-{
-	s32 nfds = 0;
-	fd_set read_fds, write_fds, except_fds;
-	struct timeval t = {0,0};
-	FD_ZERO(&read_fds);
-	FD_ZERO(&write_fds);
-	FD_ZERO(&except_fds);
-	for (auto it = WiiSockets.begin(); it != WiiSockets.end(); ++it)
-	{
-		WiiSocket& sock = it->second;
-		if (sock.valid())
-		{
-			FD_SET(sock.fd, &read_fds);
-			FD_SET(sock.fd, &write_fds);
-			FD_SET(sock.fd, &except_fds);
-			nfds = max(nfds, sock.fd+1);
-		}
-		else
-		{
-			// Good time to clean up invalid sockets.
-			WiiSockets.erase(sock.fd);
-		}
-	}
-	s32 ret = select(nfds, &read_fds, &write_fds, &except_fds, &t);
-
-	if (ret >= 0)
-	{
-		for (auto it = WiiSockets.begin(); it != WiiSockets.end(); ++it)
-		{
-			WiiSocket& sock = it->second;
-			sock.update(
-				FD_ISSET(sock.fd, &read_fds) != 0, 
-				FD_ISSET(sock.fd, &write_fds) != 0, 
-				FD_ISSET(sock.fd, &except_fds) != 0
-			);
-		}
-	}
-	else
-	{
-		for (auto it = WiiSockets.begin(); it != WiiSockets.end(); ++it)
-		{
-			it->second.update(false, false, false);
-		}
-	}
-}
-
-void WiiSockMan::EnqueueReply(u32 CommandAddress, s32 ReturnValue)
-{
-	Memory::Write_U32(8, CommandAddress);
-	// IOS seems to write back the command that was responded to
-	Memory::Write_U32(Memory::Read_U32(CommandAddress), CommandAddress + 8);
-	
-	// Return value
-	Memory::Write_U32(ReturnValue, CommandAddress + 4);
-	
-	WII_IPC_HLE_Interface::EnqReply(CommandAddress);
-}
-
-
-void WiiSockMan::Convert(WiiSockAddrIn const & from, sockaddr_in& to)
-{
-	to.sin_addr.s_addr = from.addr.addr;
-	to.sin_family = from.family;
-	to.sin_port = from.port;
-}
-
-void WiiSockMan::Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrlen)
-{
-	to.addr.addr = from.sin_addr.s_addr;
-	to.family = from.sin_family & 0xFF;
-	to.port = from.sin_port;
-	if (addrlen < 0 || addrlen > (s32) sizeof(WiiSockAddrIn))
-		to.len = sizeof(WiiSockAddrIn);
-	else
-		to.len = addrlen;
-}
-
-#undef ERRORCODE
-#undef EITHER
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.h b/Source/Core/Core/Src/IPC_HLE/WII_Socket.h
deleted file mode 100644
index cc2eb7fef8..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WII_Socket.h
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_SOCKET_H_
-#define _WII_SOCKET_H_
-
-
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#include <iphlpapi.h>
-#include <iphlpapi.h>
-
-#include "fakepoll.h"
-#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
-#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
-
-#elif defined(__linux__) or defined(__APPLE__)
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#if defined(ANDROID)
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
-#include <netinet/in.h>
-#include <net/if.h>
-#include <errno.h>
-#include <poll.h>
-#include <string.h>
-
-typedef struct pollfd pollfd_t;
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/fcntl.h>
-#include <netinet/in.h>
-#include <errno.h>
-#endif
-
-#include <algorithm>    // std::for_each
-#include <unordered_map>
-#include <stdio.h>
-#include <string>
-#include <list>
-
-#include "FileUtil.h"
-#include "WII_IPC_HLE.h"
-#include "WII_IPC_HLE_Device_net.h"
-#include "WII_IPC_HLE_Device_net_ssl.h"
-
-enum {
-	SO_MSG_OOB		= 0x01,
-	SO_MSG_PEEK		= 0x02,
-	SO_MSG_NONBLOCK = 0x04,
-};
-enum {
-	SO_SUCCESS,
-	SO_E2BIG = 1,
-	SO_EACCES,
-	SO_EADDRINUSE,
-	SO_EADDRNOTAVAIL,
-	SO_EAFNOSUPPORT,
-	SO_EAGAIN,
-	SO_EALREADY,
-	SO_EBADF,
-	SO_EBADMSG,
-	SO_EBUSY,
-	SO_ECANCELED,
-	SO_ECHILD,
-	SO_ECONNABORTED,
-	SO_ECONNREFUSED,
-	SO_ECONNRESET,
-	SO_EDEADLK,
-	SO_EDESTADDRREQ,
-	SO_EDOM,
-	SO_EDQUOT,
-	SO_EEXIST,
-	SO_EFAULT,
-	SO_EFBIG,
-	SO_EHOSTUNREACH,
-	SO_EIDRM,
-	SO_EILSEQ,
-	SO_EINPROGRESS,
-	SO_EINTR,
-	SO_EINVAL,
-	SO_EIO,
-	SO_EISCONN,
-	SO_EISDIR,
-	SO_ELOOP,
-	SO_EMFILE,
-	SO_EMLINK,
-	SO_EMSGSIZE,
-	SO_EMULTIHOP,
-	SO_ENAMETOOLONG,
-	SO_ENETDOWN,
-	SO_ENETRESET,
-	SO_ENETUNREACH,
-	SO_ENFILE,
-	SO_ENOBUFS,
-	SO_ENODATA,
-	SO_ENODEV,
-	SO_ENOENT,
-	SO_ENOEXEC,
-	SO_ENOLCK,
-	SO_ENOLINK,
-	SO_ENOMEM,
-	SO_ENOMSG,
-	SO_ENOPROTOOPT,
-	SO_ENOSPC,
-	SO_ENOSR,
-	SO_ENOSTR,
-	SO_ENOSYS,
-	SO_ENOTCONN,
-	SO_ENOTDIR,
-	SO_ENOTEMPTY,
-	SO_ENOTSOCK,
-	SO_ENOTSUP,
-	SO_ENOTTY,
-	SO_ENXIO,
-	SO_EOPNOTSUPP,
-	SO_EOVERFLOW,
-	SO_EPERM,
-	SO_EPIPE,
-	SO_EPROTO,
-	SO_EPROTONOSUPPORT,
-	SO_EPROTOTYPE,
-	SO_ERANGE,
-	SO_EROFS,
-	SO_ESPIPE,
-	SO_ESRCH,
-	SO_ESTALE,
-	SO_ETIME,
-	SO_ETIMEDOUT,
-	SO_ETXTBSY,
-	SO_EXDEV
-};
-
-#pragma pack(push, 1)
-struct WiiInAddr
-{
-	u32 addr;
-};
-
-struct WiiSockAddr
-{
-    u8 len;
-    u8 family;
-    u8 data[6];
-};
-
-struct WiiSockAddrIn
-{
-    u8 len;
-    u8 family;
-    u16 port;
-    WiiInAddr addr;
-};
-#pragma pack(pop)
-
-class WiiSocket
-{
-	struct sockop{
-		u32 _CommandAddress;
-		bool is_ssl;
-		union
-		{
-			NET_IOCTL net_type;
-			SSL_IOCTL ssl_type;
-		};
-	};
-private:
-	s32 fd;
-	bool nonBlock;
-	std::list<sockop> pending_sockops;
-
-	friend class WiiSockMan;
-	void setFd(s32 s);
-	s32 closeFd();
-	s32 _fcntl(u32 cmd, u32 arg);
-
-	void doSock(u32 _CommandAddress, NET_IOCTL type);
-	void doSock(u32 _CommandAddress, SSL_IOCTL type);
-	void update(bool read, bool write, bool except);
-	bool valid() {return fd >= 0;}
-public:
-	WiiSocket() : fd(-1), nonBlock(false) {}
-	~WiiSocket();
-	void operator=(WiiSocket const&);	// Don't implement
-
-};
-
-class WiiSockMan
-{
-public:
-	static s32 getNetErrorCode(s32 ret, std::string caller, bool isRW);
-	static char* DecodeError(s32 ErrorCode);
-
-	static WiiSockMan& getInstance()
-	{
-		static WiiSockMan instance; // Guaranteed to be destroyed.
-		return instance;			// Instantiated on first use.
-	}
-	void Update();
-	static void EnqueueReply(u32 CommandAddress, s32 ReturnValue);
-	static void Convert(WiiSockAddrIn const & from, sockaddr_in& to);
-	static void Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrlen=-1);
-	// NON-BLOCKING FUNCTIONS
-	s32 newSocket(s32 af, s32 type, s32 protocol);
-	void addSocket(s32 fd);
-	s32 delSocket(s32 s);
-	s32 getLastNetError() {return errono_last;}
-	void setLastNetError(s32 error) {errono_last = error;}
-
-	void clean()
-	{
-		WiiSockets.clear();
-	}
-
-	template <typename T>
-	void doSock(s32 sock, u32 CommandAddress, T type)
-	{
-		if (WiiSockets.find(sock) == WiiSockets.end())
-		{
-			ERROR_LOG(WII_IPC_NET,
-				"doSock: Error, fd not found (%08x, %08X, %08X)",
-				sock, CommandAddress, type);
-			EnqueueReply(CommandAddress, -SO_EBADF);
-		}
-		else
-		{
-			WiiSockets[sock].doSock(CommandAddress, type);
-		}
-	}
-
-private:
-	WiiSockMan() {};                   // Constructor? (the {} brackets) are needed here.
-	WiiSockMan(WiiSockMan const&);     // Don't Implement
-	void operator=(WiiSockMan const&); // Don't implement
-	std::unordered_map<s32, WiiSocket> WiiSockets;
-
-	s32 errono_last;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp
deleted file mode 100644
index e96bb5d7da..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include <vector>
-#include "WiiMote_HID_Attr.h"
-
-#if 0
-// 0x00 (checked)
-u8 ServiceRecordHandle[] = { 0x0a, 0x00, 0x01, 0x00, 0x00 };
-// 0x01 (checked)
-u8 SrvClassIDList[] = { 0x35, 0x03, 
-						0x19, 0x11, 0x24 };
-// 0x04 (checked)
-u8 ProtocolDescriptorList[] = { 0x35, 0x0D, 
-								0x35, 0x06, 
-								0x19, 0x01, 0x00,	// Element 0 
-								0x09, 0x00, 0x11,	// Element 1 
-								0x35, 0x03,
-								0x19, 0x00, 0x11};	// Element 0 
-// 0x5 (checked)
-u8 BrowseGroupList[] = { 0x35, 0x03, 
-							0x19, 0x10, 0x02 };
-// 0x6 (checked)
-u8 LanguageBaseAttributeIDList[] = { 0x35, 0x09,
-									0x09, 0x65, 0x6e,
-									0x09, 0x00, 0x6a,
-									0x09, 0x01, 0x00 };
-// 0x09 (checked)
-u8 BluetoothProfileDescriptorList[] = { 0x35, 0x08,
-										0x35, 0x06,
-										0x19, 0x11, 0x24,
-										0x09, 0x01, 0x00 };
-// 0x0D (checked)
-u8 AdditionalProtocolDescriptorLists[] = {  0x35, 0x0F,
-												0x35, 0x0D, 
-													0x35, 0x06,
-														0x19, 0x01, 0x00,
-														0x09, 0x00, 0x13,
-													0x35, 0x03, 
-														0x19, 0x00, 0x11 };
-// 0x100
-u8 ServiceName[] = { 0x25, 0x13, 'N','i','n','t','e','n','d','o',' ','R','V','L','-','C','N','T','-','0','1' };
-// 0x101
-u8 ServiceDescription[] = { 0x25, 0x13, 'N','i','n','t','e','n','d','o',' ','R','V','L','-','C','N','T','-','0','1' };
-// 0x102
-u8 ProviderName [] = { 0x25, 0x8, 'N','i','n','t','e','n','d','o'};
-
-// 0x200
-u8 HIDDeviceReleaseNumber[] = { 0x09, 0x01, 0x00 };
-// 0x201
-u8 HIDParserVersion[] = { 0x09, 0x01, 0x11 };
-// 0x202
-u8 HIDDeviceSubclass[] = { 0x09, 0x00, 0x04 };
-// 0x203
-u8 HIDCountryCode[] = { 0x09, 0x00, 0x33 };
-// 0x204
-u8 HIDVirtualCable[] = { 0x09, 0x00, 0x00 };
-// 0x205
-u8 HIDReconnectInitiate[] = { 0x09, 0x00, 0x01 };
-
-// 0x206
-u8 HIDDescriptorList[] = { 0x35, 0xDF,
-							0x35, 0xDD, 
-							  0x08, 0x22,  // Element 0 
-							0x25, 0xD9,       // hmm... <- 0x25 is a string but there is Data
-
-							// 0xD9 Bytes - Element 1
-							0x05, 0x01, 0x09, 0x05, 0xa1, 0x01, 0x85, 0x10, 
-							0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95, 
-							0x01, 0x06, 0x00, 0xff, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x11, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x12, 0x95, 0x02, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x13, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x14, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x15, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x16, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x17, 0x95, 0x06, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x18, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x19, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x1a, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 
-							0x85, 0x20, 0x95, 0x06, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x21, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x22, 0x95, 0x04, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x30, 0x95, 0x02, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x31, 0x95, 0x05, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x32, 0x95, 0x0a, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x33, 0x95, 0x11, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x34, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x35, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x36, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x37, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x3d, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x3e, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0x85, 0x3f, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 
-							0xc0 };        // end tag 
-
-
-// 0x207
-u8 HIDLANGIDBaseList[] =  { 0x35, 0x08,
-							0x35, 0x06,
-							0x09, 0x04, 0x09,
-							0x09, 0x01, 0x00 };
-
-// 0x208
-u8 HIDSDPDisable[] = { 0x28, 0x00 };
-// 0x209
-u8 HIDBatteryPower[] = { 0x28, 0x01 };
-// 0x20a
-u8 HIDRemoteWake[] = { 0x28, 0x01 };
-// 0x20b
-u8 HIDUnk_020B[] = { 0x09, 0x01, 0x00 };
-// 0x20c
-u8 HIDUnk_020C[] = { 0x09, 0x0c, 0x80 };
-// 0x20d
-u8 HIDUnk_020D[] = { 0x28, 0x00 };
-// 0x20e
-u8 HIDBootDevice[] = { 0x28, 0x00 };
-#endif
-
-
-static u8 packet1[] = {
-	0x00, 0x7b, 0x00, 0x76, 0x36, 0x01, 0xcc, 0x09, 0x00, 0x00, 0x0a, 0x00, 0x01, 
-	0x00, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x11, 0x24, 0x09, 0x00, 0x04, 0x35, 0x0d, 0x35, 
-	0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x11, 0x35, 0x03, 0x19, 0x00, 0x11, 0x09, 0x00, 0x05, 0x35, 
-	0x03, 0x19, 0x10, 0x02, 0x09, 0x00, 0x06, 0x35, 0x09, 0x09, 0x65, 0x6e, 0x09, 0x00, 0x6a, 0x09, 
-	0x01, 0x00, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x24, 0x09, 0x01, 0x00, 0x09, 
-	0x00, 0x0d, 0x35, 0x0f, 0x35, 0x0d, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x13, 0x35, 0x03, 
-	0x19, 0x00, 0x11, 0x09, 0x01, 0x00, 0x25, 0x13, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x6f, 
-	0x20, 0x52, 0x56, 0x4c, 0x2d, 0x43, 0x4e, 0x54, 0x2d, 0x30, 0x31, 0x09, 0x01, 0x02, 0x00, 0x76, 
-};
-
-static u8 packet2[] = {
-	0x00, 0x7b, 0x00, 0x76, 0x01, 0x25, 0x13, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e, 
-	0x64, 0x6f, 0x20, 0x52, 0x56, 0x4c, 0x2d, 0x43, 0x4e, 0x54, 0x2d, 0x30, 0x31, 0x09, 0x01, 0x02, 
-	0x25, 0x08, 0x4e, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x6f, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00, 
-	0x09, 0x02, 0x01, 0x09, 0x01, 0x11, 0x09, 0x02, 0x02, 0x08, 0x04, 0x09, 0x02, 0x03, 0x08, 0x33, 
-	0x09, 0x02, 0x04, 0x28, 0x00, 0x09, 0x02, 0x05, 0x28, 0x01, 0x09, 0x02, 0x06, 0x35, 0xdf, 0x35, 
-	0xdd, 0x08, 0x22, 0x25, 0xd9, 0x05, 0x01, 0x09, 0x05, 0xa1, 0x01, 0x85, 0x10, 0x15, 0x00, 0x26, 
-	0xff, 0x00, 0x75, 0x08, 0x95, 0x01, 0x06, 0x00, 0xff, 0x09, 0x01, 0x91, 0x00, 0x85, 0x11, 0x95, 
-	0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x12, 0x95, 0x02, 0x09, 0x01, 0x91, 0x00, 0x02, 0x00, 0xec, 
-};
-
-static u8 packet3[] = {
-
-	0x00, 0x7b, 0x00, 0x76, 0x85, 0x13, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 
-	0x14, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x15, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 
-	0x16, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 0x85, 0x17, 0x95, 0x06, 0x09, 0x01, 0x91, 0x00, 0x85, 
-	0x18, 0x95, 0x15, 0x09, 0x01, 0x91, 0x00, 0x85, 0x19, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 
-	0x1a, 0x95, 0x01, 0x09, 0x01, 0x91, 0x00, 0x85, 0x20, 0x95, 0x06, 0x09, 0x01, 0x81, 0x00, 0x85, 
-	0x21, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x22, 0x95, 0x04, 0x09, 0x01, 0x81, 0x00, 0x85, 
-	0x30, 0x95, 0x02, 0x09, 0x01, 0x81, 0x00, 0x85, 0x31, 0x95, 0x05, 0x09, 0x01, 0x81, 0x00, 0x85, 
-	0x32, 0x95, 0x0a, 0x09, 0x01, 0x81, 0x00, 0x85, 0x33, 0x95, 0x11, 0x09, 0x01, 0x02, 0x01, 0x62, 
-};
-
-static u8 packet4[] = {
-	0x00, 0x70, 0x00, 0x6d, 0x81, 0x00, 0x85, 0x34, 0x95, 0x15, 0x09, 0x01, 0x81, 
-	0x00, 0x85, 0x35, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x36, 0x95, 0x15, 0x09, 0x01, 0x81, 
-	0x00, 0x85, 0x37, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x3d, 0x95, 0x15, 0x09, 0x01, 0x81, 
-	0x00, 0x85, 0x3e, 0x95, 0x15, 0x09, 0x01, 0x81, 0x00, 0x85, 0x3f, 0x95, 0x15, 0x09, 0x01, 0x81, 
-	0x00, 0xc0, 0x09, 0x02, 0x07, 0x35, 0x08, 0x35, 0x06, 0x09, 0x04, 0x09, 0x09, 0x01, 0x00, 0x09, 
-	0x02, 0x08, 0x28, 0x00, 0x09, 0x02, 0x09, 0x28, 0x01, 0x09, 0x02, 0x0a, 0x28, 0x01, 0x09, 0x02, 
-	0x0b, 0x09, 0x01, 0x00, 0x09, 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28, 0x00, 0x09, 
-	0x02, 0x0e, 0x28, 0x00, 0x00, 
-
-};
-
-
-static u8 packet4_0x10001[] = {
-	0x00, 0x60, 0x00, 0x5d, 0x36, 0x00, 0x5a, 0x09, 0x00, 0x00, 0x0a, 0x00, 0x01, 
-	0x00, 0x01, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x12, 0x00, 0x09, 0x00, 0x04, 0x35, 0x0d, 0x35, 
-	0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, 0x00, 0x01, 0x09, 0x00, 0x05, 0x35, 
-	0x03, 0x19, 0x10, 0x02, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x12, 0x00, 0x09, 0x01, 
-	0x00, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00, 0x09, 0x02, 0x01, 0x09, 0x05, 0x7e, 0x09, 0x02, 0x02, 
-	0x09, 0x03, 0x06, 0x09, 0x02, 0x03, 0x09, 0x06, 0x00, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02, 
-	0x05, 0x09, 0x00, 0x02, 0x00, 
-};
-
-
-
-const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size)
-{
-	if (serviceHandle == 0x10000)
-	{
-		if (cont == 0)
-		{
-			_size = sizeof(packet1);
-			return packet1;
-		}
-		else if (cont == 0x76)
-		{
-			_size = sizeof(packet2);
-			return packet2;
-		}
-		else if (cont == 0xec)
-		{
-			_size = sizeof(packet3);
-			return packet3;
-		}
-		else if (cont == 0x162)
-		{
-			_size = sizeof(packet4);
-			return packet4;
-		}
-	}
-
-	if (serviceHandle == 0x10001)
-	{
-		_dbg_assert_(WII_IPC_WIIMOTE, cont == 0x00);
-		_size = sizeof(packet4_0x10001);
-		return packet4_0x10001;
-	}
-
-	return 0;
-}
-
-// XXX keep these?
-#if 0
-CAttribTable m_AttribTable;
-
-void InitAttribTable()
-{
-	m_AttribTable.push_back(SAttrib(0x00, ServiceRecordHandle, sizeof(ServiceRecordHandle)));
-	m_AttribTable.push_back(SAttrib(0x01, SrvClassIDList, sizeof(SrvClassIDList)));
-	m_AttribTable.push_back(SAttrib(0x04, ProtocolDescriptorList, sizeof(ProtocolDescriptorList)));
-	m_AttribTable.push_back(SAttrib(0x05, BrowseGroupList, sizeof(BrowseGroupList)));
-	m_AttribTable.push_back(SAttrib(0x06, LanguageBaseAttributeIDList, sizeof(LanguageBaseAttributeIDList)));
-	m_AttribTable.push_back(SAttrib(0x09, BluetoothProfileDescriptorList, sizeof(BluetoothProfileDescriptorList)));
-	m_AttribTable.push_back(SAttrib(0x0D, AdditionalProtocolDescriptorLists, sizeof(AdditionalProtocolDescriptorLists)));
-
-
-	m_AttribTable.push_back(SAttrib(0x100, ServiceName, sizeof(ServiceName)));
-	m_AttribTable.push_back(SAttrib(0x101, ServiceDescription, sizeof(ServiceDescription)));
-	m_AttribTable.push_back(SAttrib(0x102, ProviderName, sizeof(ProviderName)));
-
-	m_AttribTable.push_back(SAttrib(0x200, HIDDeviceReleaseNumber, sizeof(HIDDeviceReleaseNumber)));
-	m_AttribTable.push_back(SAttrib(0x201, HIDParserVersion, sizeof(HIDParserVersion)));
-	m_AttribTable.push_back(SAttrib(0x202, HIDDeviceSubclass, sizeof(HIDDeviceSubclass)));
-	m_AttribTable.push_back(SAttrib(0x203, HIDCountryCode, sizeof(HIDCountryCode)));
-	m_AttribTable.push_back(SAttrib(0x204, HIDVirtualCable, sizeof(HIDVirtualCable)));
-	m_AttribTable.push_back(SAttrib(0x205, HIDReconnectInitiate, sizeof(HIDReconnectInitiate)));
-	m_AttribTable.push_back(SAttrib(0x206, HIDDescriptorList, sizeof(HIDDescriptorList)));
-	m_AttribTable.push_back(SAttrib(0x207, HIDLANGIDBaseList, sizeof(HIDLANGIDBaseList)));
-	m_AttribTable.push_back(SAttrib(0x208, HIDSDPDisable, sizeof(HIDSDPDisable)));
-	m_AttribTable.push_back(SAttrib(0x209, HIDBatteryPower, sizeof(HIDBatteryPower)));
-	m_AttribTable.push_back(SAttrib(0x20a, HIDRemoteWake, sizeof(HIDRemoteWake)));
-	m_AttribTable.push_back(SAttrib(0x20b, HIDUnk_020B, sizeof(HIDUnk_020B)));
-	m_AttribTable.push_back(SAttrib(0x20c, HIDUnk_020C, sizeof(HIDUnk_020C)));
-	m_AttribTable.push_back(SAttrib(0x20d, HIDUnk_020D, sizeof(HIDUnk_020D)));
-	m_AttribTable.push_back(SAttrib(0x20e, HIDBootDevice, sizeof(HIDBootDevice)));
-}
-
-const CAttribTable& GetAttribTable()
-{
-	if (m_AttribTable.empty())
-	{
-		InitAttribTable();
-	}
-
-	return m_AttribTable;
-}
-#endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h
deleted file mode 100644
index a9350ec532..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef WIIMOTE_HID_ATTR_H_
-#define WIIMOTE_HID_ATTR_H_
-
-#if 0
-struct SAttrib
-{
-	u16 ID;
-	u8* pData;
-	u16 size;
-
-	SAttrib(u16 _ID, u8* _Data, u16 _size) 
-		: ID(_ID)
-		, pData(_Data)
-		, size(_size)
-	{ }
-};
-
-typedef std::vector<SAttrib> CAttribTable;
-
-const CAttribTable& GetAttribTable();
-#endif
-
-const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size);
-
-#endif
-
diff --git a/Source/Core/Core/Src/IPC_HLE/fakepoll.h b/Source/Core/Core/Src/IPC_HLE/fakepoll.h
deleted file mode 100644
index 384f0b5567..0000000000
--- a/Source/Core/Core/Src/IPC_HLE/fakepoll.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// fakepoll.h
-// poll using select
-//Matthew Parlane sourced this from http://www.sealiesoftware.com/
-//Was listed as "Public domain." as of 31/07/2010
-
-// Warning: a call to this poll() takes about 4K of stack space.
-
-// Greg Parker     gparker-web@sealiesoftware.com     December 2000
-// This code is in the public domain and may be copied or modified without
-// permission.
-
-// Updated May 2002:
-// * fix crash when an fd is less than 0
-// * set errno=EINVAL if an fd is greater or equal to FD_SETSIZE
-// * don't set POLLIN or POLLOUT in revents if it wasn't requested
-//   in events (only happens when an fd is in the poll set twice)
-
-#if (_WIN32_WINNT < _WIN32_WINNT_VISTA)
-
-#ifndef _FAKE_POLL_H
-#define _FAKE_POLL_H
-
-#include <limits.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-typedef struct pollfd {
-	int fd;                         /* file desc to poll */
-	int events;                   /* events of interest on fd */
-	int revents;                  /* events that occurred on fd */
-} pollfd_t;
-
-#define EINVAL 22
-// poll flags
-#define POLLIN  0x0001
-#define POLLOUT 0x0008
-#define POLLERR 0x0020
-
-// synonyms
-#define POLLNORM POLLIN
-#define POLLPRI POLLIN
-#define POLLRDNORM POLLIN
-#define POLLRDBAND POLLIN
-#define POLLWRNORM POLLOUT
-#define POLLWRBAND POLLOUT
-
-// ignored
-#define POLLHUP 0x0040
-#define POLLNVAL 0x0080
-
-inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
-{
-	struct timeval tv;
-	struct timeval *tvp;
-	fd_set readFDs, writeFDs, exceptFDs;
-	fd_set *readp, *writep, *exceptp;
-	struct pollfd *pollEnd, *p;
-	int selected;
-	int result;
-	int maxFD;
-
-	if (!pollSet) {
-		pollEnd = NULL;
-		readp = NULL;
-		writep = NULL;
-		exceptp = NULL;
-		maxFD = 0;
-	}
-	else {
-		pollEnd = pollSet + pollCount;
-		readp = &readFDs;
-		writep = &writeFDs;
-		exceptp = &exceptFDs;
-
-		FD_ZERO(readp);
-		FD_ZERO(writep);
-		FD_ZERO(exceptp);
-
-		// Find the biggest fd in the poll set
-		maxFD = 0;
-		for (p = pollSet; p < pollEnd; p++) {
-			if (p->fd > maxFD) maxFD = p->fd;
-		}
-
-		// Transcribe flags from the poll set to the fd sets
-		for (p = pollSet; p < pollEnd; p++) {
-			if (p->fd < 0) {
-				// Negative fd checks nothing and always reports zero
-			} else {
-				if (p->events & POLLIN)  FD_SET(p->fd, readp);
-				if (p->events & POLLOUT)  FD_SET(p->fd, writep);
-				if (p->events != 0)      FD_SET(p->fd, exceptp);
-				// POLLERR is never set coming in; poll() always reports errors
-				// But don't report if we're not listening to anything at all.
-			}
-		}
-	}
-
-	// poll timeout is in milliseconds. Convert to struct timeval.
-	// poll timeout == -1 : wait forever : select timeout of NULL
-	// poll timeout == 0  : return immediately : select timeout of zero
-	if (pollTimeout >= 0) {
-		tv.tv_sec = pollTimeout / 1000;
-		tv.tv_usec = (pollTimeout % 1000) * 1000;
-		tvp = &tv;
-	} else {
-		tvp = NULL;
-	}
-
-
-	selected = select(maxFD+1, readp, writep, exceptp, tvp);
-
-
-	if (selected < 0) {
-		// Error during select
-		result = -1;
-	}
-	else if (selected > 0) {
-		// Select found something
-		// Transcribe result from fd sets to poll set.
-		// Also count the number of selected fds. poll returns the
-		// number of ready fds; select returns the number of bits set.
-		int polled = 0;
-		for (p = pollSet; p < pollEnd; p++) {
-			p->revents = 0;
-			if (p->fd < 0) {
-				// Negative fd always reports zero
-			} else {
-				int isToRead = FD_ISSET(p->fd, readp);
-				if ((p->events & POLLIN)   &&  isToRead) {
-					p->revents |= POLLIN;
-				}
-
-				int isToWrite = FD_ISSET(p->fd, writep);
-				if ((p->events & POLLOUT)  &&  isToWrite) {
-					p->revents |= POLLOUT;
-				}
-
-				int isToError = FD_ISSET(p->fd, exceptp);
-				if ((p->events != 0)       &&  isToError) {
-					p->revents |= POLLERR;
-				}
-
-				if (p->revents) polled++;
-			}
-		}
-		result = polled;
-	}
-	else {
-		// selected == 0, select timed out before anything happened
-		// Clear all result bits and return zero.
-		for (p = pollSet; p < pollEnd; p++) {
-			p->revents = 0;
-
-		}
-		result = 0;
-	}
-	return result;
-}
-
-#endif
-
-#else // (_WIN32_WINNT < _WIN32_WINNT_VISTA)
-
-typedef pollfd pollfd_t;
-#define poll WSAPoll
-
-#endif
diff --git a/Source/Core/Core/Src/MemTools.h b/Source/Core/Core/Src/MemTools.h
deleted file mode 100644
index a791684c41..0000000000
--- a/Source/Core/Core/Src/MemTools.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _MEMTOOLS_H
-#define _MEMTOOLS_H
-
-#include "Common.h"
-
-
-namespace EMM
-{
-	typedef u32 EAddr;
-	void InstallExceptionHandler();
-}
-
-#endif
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
deleted file mode 100644
index 9f3ca7e795..0000000000
--- a/Source/Core/Core/Src/Movie.cpp
+++ /dev/null
@@ -1,1239 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Movie.h"
-
-#include "Core.h"
-#include "ConfigManager.h"
-#include "Thread.h"
-#include "FileUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/SI.h"
-#include "HW/Wiimote.h"
-#include "HW/WiimoteEmu/WiimoteEmu.h"
-#include "HW/WiimoteEmu/WiimoteHid.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "State.h"
-#include "Timer.h"
-#include "VideoConfig.h"
-#include "HW/EXI.h"
-#include "HW/EXI_Device.h"
-#include "HW/EXI_Channel.h"
-#include "HW/DVDInterface.h"
-#include "../../Common/Src/NandPaths.h"
-#include "polarssl/md5.h"
-#include "scmrev.h"
-#include "NetPlayProto.h"
-
-// The chunk to allocate movie data in multiples of.
-#define DTM_BASE_LENGTH (1024)
-
-std::mutex cs_frameSkip;
-
-namespace Movie {
-
-bool g_bFrameStep = false;
-bool g_bFrameStop = false;
-bool g_bReadOnly = true;
-u32 g_rerecords = 0;
-PlayMode g_playMode = MODE_NONE;
-
-u32 g_framesToSkip = 0, g_frameSkipCounter = 0;
-
-u8 g_numPads = 0;
-ControllerState g_padState;
-DTMHeader tmpHeader;
-u8* tmpInput = NULL;
-size_t tmpInputAllocated = 0;
-u64 g_currentByte = 0, g_totalBytes = 0;
-u64 g_currentFrame = 0, g_totalFrames = 0; // VI
-u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats
-u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
-u64 g_recordingStartTime; // seconds since 1970 that recording started
-bool bSaveConfig = false, bSkipIdle = false, bDualCore = false, bProgressive = false, bDSPHLE = false, bFastDiscSpeed = false;
-bool bMemcard = false, g_bClearSave = false, bSyncGPU = false, bNetPlay = false;
-std::string videoBackend = "unknown";
-int iCPUCore = 1;
-bool g_bDiscChange = false;
-std::string g_discChange = "";
-std::string author = "";
-u64 g_titleID = 0;
-unsigned char MD5[16];
-u8 bongos;
-u8 revision[20];
-
-bool g_bRecordingFromSaveState = false;
-bool g_bPolled = false;
-int g_currentSaveVersion = 0;
-
-std::string tmpStateFilename = "dtm.sav";
-
-std::string g_InputDisplay[8];
-
-ManipFunction mfunc = NULL;
-
-void EnsureTmpInputSize(size_t bound)
-{
-	if (tmpInputAllocated >= bound)
-		return;
-	// The buffer expands in powers of two of DTM_BASE_LENGTH
-	// (standard exponential buffer growth).
-	size_t newAlloc = DTM_BASE_LENGTH;
-	while (newAlloc < bound)
-		newAlloc *= 2;
-	
-	u8* newTmpInput = new u8[newAlloc];
-	tmpInputAllocated = newAlloc;
-	if (tmpInput != NULL)
-	{
-		if (g_totalBytes > 0)
-			memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes);
-		delete[] tmpInput;
-	}
-	tmpInput = newTmpInput;
-}
-
-std::string GetInputDisplay()
-{
-	if (!IsPlayingInput() && !IsRecordingInput())
-	{
-		g_numPads = 0;
-		for (int i = 0; i < 4; i++)
-		{
-			if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
-				g_numPads |= (1 << i);
-			if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
-				g_numPads |= (1 << (i + 4));
-		}
-	}
-
-	std::string inputDisplay = "";
-	for (int i = 0; i < 8; ++i)
-		if ((g_numPads & (1 << i)) != 0)
-			inputDisplay.append(g_InputDisplay[i]);
-	
-	return inputDisplay; 
-}
-
-void FrameUpdate()
-{
-	g_currentFrame++;
-	if(!g_bPolled) 
-		g_currentLagCount++;
-
-	if (IsRecordingInput())
-	{
-		g_totalFrames = g_currentFrame;
-		g_totalLagCount = g_currentLagCount;
-	}
-	if (g_bFrameStep)
-	{
-		Core::SetState(Core::CORE_PAUSE);
-		g_bFrameStep = false;
-	}
-	
-	// ("framestop") the only purpose of this is to cause interpreter/jit Run() to return temporarily.
-	// after that we set it back to CPU_RUNNING and continue as normal.
-	if (g_bFrameStop)
-		*PowerPC::GetStatePtr() = PowerPC::CPU_STEPPING;
-
-	if(g_framesToSkip)
-		FrameSkipping();
-	
-	g_bPolled = false;
-}
-
-// called when game is booting up, even if no movie is active,
-// but potentially after BeginRecordingInput or PlayInput has been called.
-void Init()
-{
-	g_bPolled = false;
-	g_bFrameStep = false;
-	g_bFrameStop = false;
-	bSaveConfig = false;
-	iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
-	if (IsPlayingInput())
-	{
-		ReadHeader();
-		std::thread md5thread(CheckMD5);
-		md5thread.detach();
-		if ((strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)))
-		{
-			PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str());
-			EndPlayInput(false);
-		}
-	}
-
-	if (IsRecordingInput())
-	{
-		GetSettings();
-		std::thread md5thread(GetMD5);
-		md5thread.detach();
-	}
-
-	g_frameSkipCounter = g_framesToSkip;
-	memset(&g_padState, 0, sizeof(g_padState));
-	if (!tmpHeader.bFromSaveState || !IsPlayingInput())
-		Core::SetStateFileName("");
-
-	for (int i = 0; i < 8; ++i)
-		g_InputDisplay[i].clear();
-
-	if (!IsPlayingInput() && !IsRecordingInput())
-	{
-		g_bRecordingFromSaveState = false;
-		g_rerecords = 0;
-		g_currentByte = 0;
-		g_currentFrame = 0;
-		g_currentLagCount = 0;
-		g_currentInputCount = 0;
-	}
-}
-
-void InputUpdate()
-{
-	g_currentInputCount++;
-	if (IsRecordingInput())
-		g_totalInputCount = g_currentInputCount;
-
-	if (IsPlayingInput() && g_currentInputCount == (g_totalInputCount -1) && SConfig::GetInstance().m_PauseMovie)
-		Core::SetState(Core::CORE_PAUSE);
-}
-
-void SetFrameSkipping(unsigned int framesToSkip)
-{
-	std::lock_guard<std::mutex> lk(cs_frameSkip);
-	
-	g_framesToSkip = framesToSkip;
-	g_frameSkipCounter = 0;
-	
-	// Don't forget to re-enable rendering in case it wasn't...
-	// as this won't be changed anymore when frameskip is turned off
-	if (framesToSkip == 0)
-		g_video_backend->Video_SetRendering(true);
-}
-
-void SetPolledDevice()
-{
-	g_bPolled = true;
-}
-
-void DoFrameStep()
-{
-	if(Core::GetState() == Core::CORE_PAUSE)
-	{
-		// if already paused, frame advance for 1 frame
-		Core::SetState(Core::CORE_RUN);
-		Core::RequestRefreshInfo();
-		g_bFrameStep = true;
-	}
-	else if(!g_bFrameStep)
-	{
-		// if not paused yet, pause immediately instead
-		Core::SetState(Core::CORE_PAUSE);
-	}
-}
-
-void SetFrameStopping(bool bEnabled)
-{
-	g_bFrameStop = bEnabled;
-}
-
-void SetReadOnly(bool bEnabled)
-{
-	if (g_bReadOnly != bEnabled)
-		Core::DisplayMessage(bEnabled ? "Read-only mode." :  "Read+Write mode.", 1000);
-
-	g_bReadOnly = bEnabled;
-}
-
-void FrameSkipping()
-{
-	// Frameskipping will desync movie playback
-	if (!IsPlayingInput() && !IsRecordingInput())
-	{
-		std::lock_guard<std::mutex> lk(cs_frameSkip);
-
-		g_frameSkipCounter++;
-		if (g_frameSkipCounter > g_framesToSkip || Core::ShouldSkipFrame(g_frameSkipCounter) == false)
-			g_frameSkipCounter = 0;
-
-		g_video_backend->Video_SetRendering(!g_frameSkipCounter);
-	}
-}
-
-bool IsRecordingInput()
-{
-	return (g_playMode == MODE_RECORDING);
-}
-
-bool IsRecordingInputFromSaveState()
-{
-	return g_bRecordingFromSaveState;
-}
-
-bool IsJustStartingRecordingInputFromSaveState()
-{
-	return IsRecordingInputFromSaveState() && g_currentFrame == 0;
-}
-
-bool IsJustStartingPlayingInputFromSaveState()
-{
-	return IsRecordingInputFromSaveState() && g_currentFrame == 1 && IsPlayingInput();
-}
-
-bool IsPlayingInput()
-{
-	return (g_playMode == MODE_PLAYING);
-}
-
-bool IsReadOnly()
-{
-	return g_bReadOnly;
-}
-
-u64 GetRecordingStartTime()
-{
-	return g_recordingStartTime;
-}
-
-bool IsUsingPad(int controller)
-{
-	return ((g_numPads & (1 << controller)) != 0);
-}
-
-bool IsUsingBongo(int controller)
-{
-	return ((bongos & (1 << controller)) != 0);
-}
-
-bool IsUsingWiimote(int wiimote)
-{
-	return ((g_numPads & (1 << (wiimote + 4))) != 0);
-}
-
-bool IsConfigSaved()
-{
-	return bSaveConfig;
-}
-bool IsDualCore()
-{
-	return bDualCore;
-}
-
-bool IsProgressive()
-{
-	return bProgressive;
-}
-
-bool IsSkipIdle()
-{
-	return bSkipIdle;
-}
-
-bool IsDSPHLE()
-{
-	return bDSPHLE;
-}
-
-bool IsFastDiscSpeed()
-{
-	return bFastDiscSpeed;
-}
-
-int GetCPUMode()
-{
-	return iCPUCore;
-}
-
-bool IsStartingFromClearSave()
-{
-	return g_bClearSave;
-}
-
-bool IsUsingMemcard()
-{
-	return bMemcard;
-}
-bool IsSyncGPU()
-{
-	return bSyncGPU;
-}
-
-bool IsNetPlayRecording()
-{
-	return bNetPlay;
-}
-
-void ChangePads(bool instantly)
-{
-	if (Core::GetState() == Core::CORE_UNINITIALIZED)
-		return;
-
-	int controllers = 0;
-
-	for (int i = 0; i < 4; i++)
-		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
-			controllers |= (1 << i);
-
-	if (instantly && (g_numPads & 0x0F) == controllers)
-		return;
-
-	for (int i = 0; i < 4; i++)
-		if (instantly) // Changes from savestates need to be instantaneous
-			SerialInterface::AddDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
-		else
-			SerialInterface::ChangeDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
-}
-
-void ChangeWiiPads(bool instantly)
-{
-	int controllers = 0;
-
-	for (int i = 0; i < 4; i++)
-		if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
-			controllers |= (1 << i);
-
-	// This is important for Wiimotes, because they can desync easily if they get re-activated
-	if (instantly && (g_numPads >> 4) == controllers)
-		return;
-
-	for (int i = 0; i < MAX_BBMOTES; i++)
-	{
-		g_wiimote_sources[i] = IsUsingWiimote(i) ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE;
-		GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(IsUsingWiimote(i));
-	}
-}
-
-bool BeginRecordingInput(int controllers)
-{
-	if(g_playMode != MODE_NONE || controllers == 0)
-		return false;
-
-	g_numPads = controllers;
-	g_currentFrame = g_totalFrames = 0;
-	g_currentLagCount = g_totalLagCount = 0;
-	g_currentInputCount = g_totalInputCount = 0;
-	if (NetPlay::IsNetPlayRunning())
-	{
-		bNetPlay = true;
-		g_recordingStartTime = NETPLAY_INITIAL_GCTIME;
-	}
-	else
-		g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970();
-
-	g_rerecords = 0;
-
-	for (int i = 0; i < 4; i++)
-		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
-			bongos |= (1 << i);
-
-	if (Core::IsRunning())
-	{
-		if(File::Exists(tmpStateFilename))
-			File::Delete(tmpStateFilename);
-
-		State::SaveAs(tmpStateFilename.c_str());
-		g_bRecordingFromSaveState = true;
-
-		// This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp.
-		// TODO: find a way to GetTitleDataPath() from Movie::Init()
-		if (Core::g_CoreStartupParameter.bWii)
-		{
-			if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str()))
-				Movie::g_bClearSave = false;
-			else
-				Movie::g_bClearSave = true;
-		}
-		std::thread md5thread(GetMD5);
-		md5thread.detach();
-		GetSettings();
-	}
-	g_playMode = MODE_RECORDING;
-	author = SConfig::GetInstance().m_strMovieAuthor;
-	EnsureTmpInputSize(1);
-
-	g_currentByte = g_totalBytes = 0;
-
-	Core::DisplayMessage("Starting movie recording", 2000);
-	return true;
-}
-
-static void Analog2DToString(u8 x, u8 y, const char* prefix, char* str)
-{
-	if((x <= 1 || x == 128 || x >= 255)
-	&& (y <= 1 || y == 128 || y >= 255))
-	{
-		if(x != 128 || y != 128)
-		{
-			if(x != 128 && y != 128)
-			{
-				sprintf(str, "%s:%s,%s", prefix, x<128?"LEFT":"RIGHT", y<128?"DOWN":"UP");
-			}
-			else if(x != 128)
-			{
-				sprintf(str, "%s:%s", prefix, x<128?"LEFT":"RIGHT");
-			}
-			else
-			{
-				sprintf(str, "%s:%s", prefix, y<128?"DOWN":"UP");
-			}
-		}
-		else
-		{
-			str[0] = '\0';
-		}
-	}
-	else
-	{
-		sprintf(str, "%s:%d,%d", prefix, x, y);
-	}
-}
-
-static void Analog1DToString(u8 v, const char* prefix, char* str)
-{
-	if(v > 0)
-	{
-		if(v == 255)
-		{
-			strcpy(str, prefix);
-		}
-		else
-		{
-			sprintf(str, "%s:%d", prefix, v);
-		}
-	}
-	else
-	{
-		str[0] = '\0';
-	}
-}
-
-void SetInputDisplayString(ControllerState padState, int controllerID)
-{
-	char inp[70];
-	sprintf(inp, "P%d:", controllerID + 1);
-	g_InputDisplay[controllerID] = inp;
-
-	if(g_padState.A)
-		g_InputDisplay[controllerID].append(" A");
-	if(g_padState.B)
-		g_InputDisplay[controllerID].append(" B");
-	if(g_padState.X)
-		g_InputDisplay[controllerID].append(" X");
-	if(g_padState.Y)
-		g_InputDisplay[controllerID].append(" Y");
-	if(g_padState.Z)
-		g_InputDisplay[controllerID].append(" Z");
-	if(g_padState.Start)
-		g_InputDisplay[controllerID].append(" START");
-
-	if(g_padState.DPadUp)
-		g_InputDisplay[controllerID].append(" UP");
-	if(g_padState.DPadDown)
-		g_InputDisplay[controllerID].append(" DOWN");
-	if(g_padState.DPadLeft)
-		g_InputDisplay[controllerID].append(" LEFT");
-	if(g_padState.DPadRight)
-		g_InputDisplay[controllerID].append(" RIGHT");
-
-	Analog1DToString(g_padState.TriggerL, " L", inp);
-	g_InputDisplay[controllerID].append(inp);
-
-	Analog1DToString(g_padState.TriggerR, " R", inp);
-	g_InputDisplay[controllerID].append(inp);
-
-	Analog2DToString(g_padState.AnalogStickX, g_padState.AnalogStickY, " ANA", inp);
-	g_InputDisplay[controllerID].append(inp);
-
-	Analog2DToString(g_padState.CStickX, g_padState.CStickY, " C", inp);
-	g_InputDisplay[controllerID].append(inp);
-
-	g_InputDisplay[controllerID].append("\n");
-}
-
-void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelData, u8* const irData)
-{
-	int controllerID = remoteID + 4;
-
-	char inp[70];
-	sprintf(inp, "R%d:", remoteID + 1);
-	g_InputDisplay[controllerID] = inp;
-
-	if(coreData)
-	{
-		wm_core buttons = *(wm_core*)coreData;
-		if(buttons & WiimoteEmu::Wiimote::PAD_LEFT)
-			g_InputDisplay[controllerID].append(" LEFT");
-		if(buttons & WiimoteEmu::Wiimote::PAD_RIGHT)
-			g_InputDisplay[controllerID].append(" RIGHT");
-		if(buttons & WiimoteEmu::Wiimote::PAD_DOWN)
-			g_InputDisplay[controllerID].append(" DOWN");
-		if(buttons & WiimoteEmu::Wiimote::PAD_UP)
-			g_InputDisplay[controllerID].append(" UP");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_A)
-			g_InputDisplay[controllerID].append(" A");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_B)
-			g_InputDisplay[controllerID].append(" B");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_PLUS)
-			g_InputDisplay[controllerID].append(" +");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_MINUS)
-			g_InputDisplay[controllerID].append(" -");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_ONE)
-			g_InputDisplay[controllerID].append(" 1");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_TWO)
-			g_InputDisplay[controllerID].append(" 2");
-		if(buttons & WiimoteEmu::Wiimote::BUTTON_HOME)
-			g_InputDisplay[controllerID].append(" HOME");
-	}
-
-	if(accelData)
-	{
-		wm_accel* dt = (wm_accel*)accelData;
-		sprintf(inp, " ACC:%d,%d,%d", dt->x, dt->y, dt->z);
-		g_InputDisplay[controllerID].append(inp);
-	}
-
-	if(irData) // incomplete
-	{
-		sprintf(inp, " IR:%d,%d", ((u8*)irData)[0], ((u8*)irData)[1]);
-		g_InputDisplay[controllerID].append(inp);
-	}
-
-	g_InputDisplay[controllerID].append("\n");
-}
-
-void CheckPadStatus(SPADStatus *PadStatus, int controllerID)
-{
-	g_padState.A		 = ((PadStatus->button & PAD_BUTTON_A) != 0);
-	g_padState.B		 = ((PadStatus->button & PAD_BUTTON_B) != 0);
-	g_padState.X		 = ((PadStatus->button & PAD_BUTTON_X) != 0);
-	g_padState.Y		 = ((PadStatus->button & PAD_BUTTON_Y) != 0);
-	g_padState.Z		 = ((PadStatus->button & PAD_TRIGGER_Z) != 0);
-	g_padState.Start     = ((PadStatus->button & PAD_BUTTON_START) != 0);
-
-	g_padState.DPadUp	 = ((PadStatus->button & PAD_BUTTON_UP) != 0);
-	g_padState.DPadDown  = ((PadStatus->button & PAD_BUTTON_DOWN) != 0);
-	g_padState.DPadLeft  = ((PadStatus->button & PAD_BUTTON_LEFT) != 0);
-	g_padState.DPadRight = ((PadStatus->button & PAD_BUTTON_RIGHT) != 0);
-
-	g_padState.L = ((PadStatus->button & PAD_TRIGGER_L) != 0);
-	g_padState.R = ((PadStatus->button & PAD_TRIGGER_R) != 0);
-	g_padState.TriggerL = PadStatus->triggerLeft;
-	g_padState.TriggerR = PadStatus->triggerRight;
-
-	g_padState.AnalogStickX = PadStatus->stickX;
-	g_padState.AnalogStickY = PadStatus->stickY;
-
-	g_padState.CStickX = PadStatus->substickX;
-	g_padState.CStickY = PadStatus->substickY;
-
-	SetInputDisplayString(g_padState, controllerID);
-}
-
-void RecordInput(SPADStatus *PadStatus, int controllerID)
-{
-	if (!IsRecordingInput() || !IsUsingPad(controllerID))
-		return;
-
-	CheckPadStatus(PadStatus, controllerID);
-
-	if (g_bDiscChange)
-	{
-		g_padState.disc = g_bDiscChange;
-		g_bDiscChange = false;
-	}
-
-	EnsureTmpInputSize((size_t)(g_currentByte + 8));
-	memcpy(&(tmpInput[g_currentByte]), &g_padState, 8);
-	g_currentByte += 8;
-	g_totalBytes = g_currentByte;
-}
-
-void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode)
-{
-	u8* const coreData = rptf.core?(data+rptf.core):NULL;
-	u8* const accelData = rptf.accel?(data+rptf.accel):NULL;
-	u8* const irData = rptf.ir?(data+rptf.ir):NULL;
-	u8 size = rptf.size;
-	SetWiiInputDisplayString(wiimote, coreData, accelData, irData);
-
-	if (IsRecordingInput())
-		RecordWiimote(wiimote, data, size);
-}
-
-void RecordWiimote(int wiimote, u8 *data, u8 size)
-{
-	if(!IsRecordingInput() || !IsUsingWiimote(wiimote))
-		return;
-
-	InputUpdate();
-	EnsureTmpInputSize((size_t)(g_currentByte + size + 1));
-	tmpInput[g_currentByte++] = size;
-	memcpy(&(tmpInput[g_currentByte]), data, size);
-	g_currentByte += size;
-	g_totalBytes = g_currentByte;
-}
-
-void ReadHeader()
-{
-	g_numPads = tmpHeader.numControllers;
-	g_recordingStartTime = tmpHeader.recordingStartTime;
-	if (g_rerecords < tmpHeader.numRerecords)
-		g_rerecords = tmpHeader.numRerecords;
-
-	if (tmpHeader.bSaveConfig)
-	{
-		bSaveConfig = true;
-		bSkipIdle = tmpHeader.bSkipIdle;
-		bDualCore = tmpHeader.bDualCore;
-		bProgressive = tmpHeader.bProgressive;
-		bDSPHLE = tmpHeader.bDSPHLE;
-		bFastDiscSpeed = tmpHeader.bFastDiscSpeed;
-		iCPUCore = tmpHeader.CPUCore;
-		g_bClearSave = tmpHeader.bClearSave;
-		bMemcard = tmpHeader.bMemcard;
-		bongos = tmpHeader.bongos;
-		bSyncGPU = tmpHeader.bSyncGPU;
-		bNetPlay = tmpHeader.bNetPlay;
-		memcpy(revision, tmpHeader.revision, ArraySize(revision));
-	}
-	else
-	{
-		GetSettings();
-	}
-
-	videoBackend = (char*) tmpHeader.videoBackend;
-	g_discChange = (char*) tmpHeader.discChange;
-	author = (char*) tmpHeader.author;
-	memcpy(MD5, tmpHeader.md5, 16);
-}
-
-bool PlayInput(const char *filename)
-{
-	if(!filename || g_playMode != MODE_NONE)
-		return false;
-
-	if(!File::Exists(filename))
-		return false;
-
-	File::IOFile g_recordfd;
-
-	if (!g_recordfd.Open(filename, "rb"))
-		return false;
-
-	g_recordfd.ReadArray(&tmpHeader, 1);
-	
-	if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) {
-		PanicAlertT("Invalid recording file");
-		goto cleanup;
-	}
-
-	ReadHeader();
-	g_totalFrames = tmpHeader.frameCount;
-	g_totalLagCount = tmpHeader.lagCount;
-	g_totalInputCount = tmpHeader.inputCount;
-	g_currentFrame = 0;
-	g_currentLagCount = 0;
-	g_currentInputCount = 0;
-
-	g_playMode = MODE_PLAYING;
-	
-	g_totalBytes = g_recordfd.GetSize() - 256;
-	EnsureTmpInputSize((size_t)g_totalBytes);
-	g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes);
-	g_currentByte = 0;
-	g_recordfd.Close();
-
-	// Load savestate (and skip to frame data)
-	if(tmpHeader.bFromSaveState)
-	{
-		const std::string stateFilename = std::string(filename) + ".sav";
-		if(File::Exists(stateFilename))
-			Core::SetStateFileName(stateFilename);
-		g_bRecordingFromSaveState = true;
-		Movie::LoadInput(filename);
-	}
-
-	return true;
-
-cleanup:
-	g_recordfd.Close();
-	return false;
-}
-
-void DoState(PointerWrap &p)
-{
-	static const int MOVIE_STATE_VERSION = 1;
-	g_currentSaveVersion = MOVIE_STATE_VERSION;
-	p.Do(g_currentSaveVersion);
-	// many of these could be useful to save even when no movie is active,
-	// and the data is tiny, so let's just save it regardless of movie state.
-	p.Do(g_currentFrame);
-	p.Do(g_currentByte);
-	p.Do(g_currentLagCount);
-	p.Do(g_currentInputCount);
-	p.Do(g_bPolled);
-	// other variables (such as g_totalBytes and g_totalFrames) are set in LoadInput
-}
-
-void LoadInput(const char *filename)
-{
-	File::IOFile t_record;
-	if (!t_record.Open(filename, "r+b"))
-	{
-		PanicAlertT("Failed to read %s", filename);
-		EndPlayInput(false);
-		return;
-	}
-
-	t_record.ReadArray(&tmpHeader, 1);
-
-	if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A)
-	{
-		PanicAlertT("Savestate movie %s is corrupted, movie recording stopping...", filename);
-		EndPlayInput(false);
-		return;
-	}
-	ReadHeader();
-	if (!g_bReadOnly)
-	{
-		g_rerecords++;
-		tmpHeader.numRerecords = g_rerecords;
-		t_record.Seek(0, SEEK_SET);
-		t_record.WriteArray(&tmpHeader, 1);
-	}
-
-	ChangePads(true);
-	if (Core::g_CoreStartupParameter.bWii)
-		ChangeWiiPads(true);
-
-	u64 totalSavedBytes = t_record.GetSize() - 256;
-
-	bool afterEnd = false;
-	if (g_currentByte > totalSavedBytes)
-	{
-		//PanicAlertT("Warning: You loaded a save whose movie ends before the current frame in the save (byte %u < %u) (frame %u < %u). You should load another save before continuing.", (u32)totalSavedBytes+256, (u32)g_currentByte+256, (u32)tmpHeader.frameCount, (u32)g_currentFrame);
-		afterEnd = true;
-	}
-
-	if (!g_bReadOnly || tmpInput == NULL)
-	{
-		g_totalFrames = tmpHeader.frameCount;
-		g_totalLagCount = tmpHeader.lagCount;
-		g_totalInputCount = tmpHeader.inputCount;
-
-		EnsureTmpInputSize((size_t)totalSavedBytes);
-		g_totalBytes = totalSavedBytes;
-		t_record.ReadArray(tmpInput, (size_t)g_totalBytes);
-	}
-	else if (g_currentByte > 0)
-	{
-		if (g_currentByte > totalSavedBytes)
-		{
-		}
-		else if (g_currentByte > g_totalBytes)
-		{
-			PanicAlertT("Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_currentByte+256, (u32)g_totalBytes+256, (u32)g_currentFrame, (u32)g_totalFrames);
-		}
-		else if(g_currentByte > 0 && g_totalBytes > 0)
-		{
-			// verify identical from movie start to the save's current frame
-			u32 len = (u32)g_currentByte;
-			u8* movInput = new u8[len];
-			t_record.ReadArray(movInput, (size_t)len);
-			for (u32 i = 0; i < len; ++i)
-			{
-				if (movInput[i] != tmpInput[i])
-				{
-					// this is a "you did something wrong" alert for the user's benefit.
-					// we'll try to say what's going on in excruciating detail, otherwise the user might not believe us.
-					if(IsUsingWiimote(0))
-					{ 
-						// TODO: more detail
-						PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256);
-						memcpy(tmpInput, movInput, g_currentByte);
-					}
-					else
-					{
-						int frame = i/8;
-						ControllerState curPadState;
-						memcpy(&curPadState, &(tmpInput[frame*8]), 8);
-						ControllerState movPadState;
-						memcpy(&movPadState, &(movInput[frame*8]), 8);
-						PanicAlertT("Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n\n"
-							"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n\n"
-							"On frame %d, the current movie presses:\n"
-							"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
-							"\n\n"
-							"On frame %d, the savestate's movie presses:\n"
-							"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d",
-							(int)frame,
-							(int)g_totalFrames, (int)tmpHeader.frameCount,
-							(int)frame,
-							(int)curPadState.Start, (int)curPadState.A, (int)curPadState.B, (int)curPadState.X, (int)curPadState.Y, (int)curPadState.Z, (int)curPadState.DPadUp, (int)curPadState.DPadDown, (int)curPadState.DPadLeft, (int)curPadState.DPadRight, (int)curPadState.L, (int)curPadState.R, (int)curPadState.TriggerL, (int)curPadState.TriggerR, (int)curPadState.AnalogStickX, (int)curPadState.AnalogStickY, (int)curPadState.CStickX, (int)curPadState.CStickY,
-							(int)frame,
-							(int)movPadState.Start, (int)movPadState.A, (int)movPadState.B, (int)movPadState.X, (int)movPadState.Y, (int)movPadState.Z, (int)movPadState.DPadUp, (int)movPadState.DPadDown, (int)movPadState.DPadLeft, (int)movPadState.DPadRight, (int)movPadState.L, (int)movPadState.R, (int)movPadState.TriggerL, (int)movPadState.TriggerR, (int)movPadState.AnalogStickX, (int)movPadState.AnalogStickY, (int)movPadState.CStickX, (int)movPadState.CStickY);
-
-						memcpy(tmpInput, movInput, g_currentByte);
-					}
-					break;
-				}
-			}
-			delete [] movInput;
-		}
-	}
-	t_record.Close();
-
-	bSaveConfig = tmpHeader.bSaveConfig;
-
-	if (!afterEnd)
-	{
-		if (g_bReadOnly)
-		{
-			if(g_playMode != MODE_PLAYING)
-			{
-				g_playMode = MODE_PLAYING;
-				Core::DisplayMessage("Switched to playback", 2000);
-			}
-		}
-		else
-		{
-			if(g_playMode != MODE_RECORDING)
-			{
-				g_playMode = MODE_RECORDING;
-				Core::DisplayMessage("Switched to recording", 2000);
-			}
-		}
-	}
-	else
-	{
-		EndPlayInput(false);
-	}
-}
-
-static void CheckInputEnd()
-{
-	if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes)
-	{
-		EndPlayInput(!g_bReadOnly);
-	}
-}
-
-void PlayController(SPADStatus *PadStatus, int controllerID)
-{
-	// Correct playback is entirely dependent on the emulator polling the controllers
-	// in the same order done during recording
-	if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL)
-		return;
-
-	if (g_currentByte + 8 > g_totalBytes)
-	{
-		PanicAlertT("Premature movie end in PlayController. %u + 8 > %u", (u32)g_currentByte, (u32)g_totalBytes);
-		EndPlayInput(!g_bReadOnly);
-		return;
-	}
-
-	// dtm files don't save the mic button or error bit. not sure if they're actually used, but better safe than sorry
-	signed char e = PadStatus->err;
-	memset(PadStatus, 0, sizeof(SPADStatus));
-	PadStatus->err = e;
-
-
-	memcpy(&g_padState, &(tmpInput[g_currentByte]), 8);
-	g_currentByte += 8;
-	
-	PadStatus->triggerLeft = g_padState.TriggerL;
-	PadStatus->triggerRight = g_padState.TriggerR;
-
-	PadStatus->stickX = g_padState.AnalogStickX;
-	PadStatus->stickY = g_padState.AnalogStickY;
-
-	PadStatus->substickX = g_padState.CStickX;
-	PadStatus->substickY = g_padState.CStickY;
-
-	PadStatus->button |= PAD_USE_ORIGIN;
-	
-	if(g_padState.A)
-	{
-		PadStatus->button |= PAD_BUTTON_A;
-		PadStatus->analogA = 0xFF;
-	}
-	if(g_padState.B)
-	{
-		PadStatus->button |= PAD_BUTTON_B;
-		PadStatus->analogB = 0xFF;
-	}
-	if(g_padState.X)
-		PadStatus->button |= PAD_BUTTON_X;
-	if(g_padState.Y)
-		PadStatus->button |= PAD_BUTTON_Y;
-	if(g_padState.Z)
-		PadStatus->button |= PAD_TRIGGER_Z;
-	if(g_padState.Start)
-		PadStatus->button |= PAD_BUTTON_START;
-	
-	if(g_padState.DPadUp)
-		PadStatus->button |= PAD_BUTTON_UP;
-	if(g_padState.DPadDown)
-		PadStatus->button |= PAD_BUTTON_DOWN;
-	if(g_padState.DPadLeft)
-		PadStatus->button |= PAD_BUTTON_LEFT;
-	if(g_padState.DPadRight)
-		PadStatus->button |= PAD_BUTTON_RIGHT;
-	
-	if(g_padState.L)
-		PadStatus->button |= PAD_TRIGGER_L;
-	if(g_padState.R)
-		PadStatus->button |= PAD_TRIGGER_R;
-	if (g_padState.disc)
-	{
-		// This implementation assumes the disc change will only happen once. Trying to change more than that will cause
-		// it to load the last disc every time. As far as i know though, there are no 3+ disc games, so this should be fine.
-		Core::SetState(Core::CORE_PAUSE);
-		int numPaths = (int)SConfig::GetInstance().m_ISOFolder.size();
-		bool found = false;
-		std::string path;
-		for (int i = 0; i < numPaths; i++)
-		{
-			path = SConfig::GetInstance().m_ISOFolder[i];
-			if (File::Exists((path + '/' + g_discChange.c_str()).c_str()))
-			{
-				found = true;
-				break;
-			}
-		}
-		if (found)
-		{
-			DVDInterface::ChangeDisc((path + '/' + g_discChange.c_str()).c_str());
-			Core::SetState(Core::CORE_RUN);
-		}
-		else
-		{
-			PanicAlert("Change the disc to %s", g_discChange.c_str());
-		}
-	}
-
-	SetInputDisplayString(g_padState, controllerID);
-	CheckInputEnd();
-}
-
-bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode)
-{
-	if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL)
-		return false;
-
-	if (g_currentByte > g_totalBytes)
-	{
-		PanicAlertT("Premature movie end in PlayWiimote. %u > %u", (u32)g_currentByte, (u32)g_totalBytes);
-		EndPlayInput(!g_bReadOnly);
-		return false;
-	}
-
-	u8* const coreData = rptf.core?(data+rptf.core):NULL;
-	u8* const accelData = rptf.accel?(data+rptf.accel):NULL;
-	u8* const irData = rptf.ir?(data+rptf.ir):NULL;
-	u8 size = rptf.size;
-
-	u8 sizeInMovie = tmpInput[g_currentByte];
-
-	if (size != sizeInMovie)
-	{
-		PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings), or restarting Dolphin (Dolphin currently must be restarted every time before playing back a wiimote movie).":"");
-		EndPlayInput(!g_bReadOnly);
-		return false;
-	}
-
-	g_currentByte++;
-
-	if (g_currentByte + size > g_totalBytes)
-	{
-		PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)g_currentByte, size, (u32)g_totalBytes);
-		EndPlayInput(!g_bReadOnly);
-		return false;
-	}
-	
-	memcpy(data, &(tmpInput[g_currentByte]), size);
-	g_currentByte += size;
-	
-	SetWiiInputDisplayString(wiimote, coreData, accelData, irData);
-
-	g_currentInputCount++;
-	
-	CheckInputEnd();
-	return true;
-}
-
-void EndPlayInput(bool cont) 
-{
-	if (cont)
-	{
-		g_playMode = MODE_RECORDING;
-		Core::DisplayMessage("Reached movie end. Resuming recording.", 2000);
-	}
-	else if(g_playMode != MODE_NONE)
-	{
-		g_rerecords = 0;
-		g_currentByte = 0;
-		g_playMode = MODE_NONE;
-		Core::DisplayMessage("Movie End.", 2000);
-		g_bRecordingFromSaveState = false;
-		// we don't clear these things because otherwise we can't resume playback if we load a movie state later
-		//g_totalFrames = g_totalBytes = 0;
-		//delete tmpInput;
-		//tmpInput = NULL;
-	}
-}
-
-void SaveRecording(const char *filename)
-{
-	File::IOFile save_record(filename, "wb");
-	// Create the real header now and write it
-	DTMHeader header;
-	memset(&header, 0, sizeof(DTMHeader));
-	
-	header.filetype[0] = 'D'; header.filetype[1] = 'T'; header.filetype[2] = 'M'; header.filetype[3] = 0x1A;
-	strncpy((char *)header.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6);
-	header.bWii = Core::g_CoreStartupParameter.bWii;
-	header.numControllers = g_numPads & (Core::g_CoreStartupParameter.bWii ? 0xFF : 0x0F);
-	
-	header.bFromSaveState = g_bRecordingFromSaveState;
-	header.frameCount = g_totalFrames;
-	header.lagCount = g_totalLagCount;
-	header.inputCount = g_totalInputCount;
-	header.numRerecords = g_rerecords;
-	header.recordingStartTime = g_recordingStartTime;
-
-	header.bSaveConfig = true;
-	header.bSkipIdle = bSkipIdle;
-	header.bDualCore = bDualCore;
-	header.bProgressive = bProgressive;
-	header.bDSPHLE = bDSPHLE;
-	header.bFastDiscSpeed = bFastDiscSpeed;
-	strncpy((char *)header.videoBackend, videoBackend.c_str(),ArraySize(header.videoBackend));
-	header.CPUCore = iCPUCore;
-	header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable;
-	header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable;
-	header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture;
-	header.bEFBCopyCacheEnable = g_ActiveConfig.bEFBCopyCacheEnable;
-	header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges;
-	header.bUseXFB = g_ActiveConfig.bUseXFB;
-	header.bUseRealXFB = g_ActiveConfig.bUseRealXFB;
-	header.bMemcard = bMemcard;
-	header.bClearSave = g_bClearSave;
-	header.bSyncGPU = bSyncGPU;
-	header.bNetPlay = bNetPlay;
-	strncpy((char *)header.discChange, g_discChange.c_str(),ArraySize(header.discChange));
-	strncpy((char *)header.author, author.c_str(),ArraySize(header.author));
-	memcpy(header.md5,MD5,16);
-	header.bongos = bongos;
-	memcpy(header.revision, revision, ArraySize(header.revision));
-
-	// TODO
-	header.uniqueID = 0; 
-	// header.audioEmulator;
-
-	save_record.WriteArray(&header, 1);
-
-	bool success = save_record.WriteArray(tmpInput, (size_t)g_totalBytes);
-
-	if (success && g_bRecordingFromSaveState)
-	{
-		std::string stateFilename = filename;
-		stateFilename.append(".sav");
-		success = File::Copy(tmpStateFilename, stateFilename);
-	}
-	
-	if (success)
-		Core::DisplayMessage(StringFromFormat("DTM %s saved", filename).c_str(), 2000);
-	else
-		Core::DisplayMessage(StringFromFormat("Failed to save %s", filename).c_str(), 2000);
-}
-
-void SetInputManip(ManipFunction func)
-{
-	mfunc = func;
-}
-
-void CallInputManip(SPADStatus *PadStatus, int controllerID)
-{
-	if (mfunc)
-		(*mfunc)(PadStatus, controllerID);
-}
-
-void SetGraphicsConfig()
-{
-	g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable;
-	g_Config.bEFBCopyEnable = tmpHeader.bEFBCopyEnable;
-	g_Config.bCopyEFBToTexture = tmpHeader.bCopyEFBToTexture;
-	g_Config.bEFBCopyCacheEnable = tmpHeader.bEFBCopyCacheEnable;
-	g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges;
-	g_Config.bUseXFB = tmpHeader.bUseXFB;
-	g_Config.bUseRealXFB = tmpHeader.bUseRealXFB;
-}
-
-void GetSettings()
-{
-	bSaveConfig = true;
-	bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle;
-	bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
-	bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;
-	bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE;
-	bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed;
-	videoBackend = g_video_backend->GetName();
-	bSyncGPU = SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU;
-	iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
-	bNetPlay = NetPlay::IsNetPlayRunning();
-	if (!Core::g_CoreStartupParameter.bWii)
-		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
-	bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
-	u8 tmp[21];
-	for (int i = 0; i < 20; ++i)
-	{
-		sscanf(&SCM_REV_STR[2 * i], "%02hhx", &tmp[i]);
-		revision[i] = tmp[i];
-	}
-}
-
-void CheckMD5()
-{
-	for (int i=0, n=0; i<16; i++)
-	{
-		if (tmpHeader.md5[i] != 0)
-			continue;
-		n++;
-		if (n == 16)
-			return;
-	}
-	Core::DisplayMessage("Verifying checksum...", 2000);
-
-	unsigned char gameMD5[16];
-	char game[255];
-	memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size());
-	md5_file(game, gameMD5);
-
-	if (memcmp(gameMD5,MD5,16) == 0)
-		Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000);
-	else
-		PanicAlert("Checksum of current game does not match the recorded game!");
-}
-
-void GetMD5()
-{
-	Core::DisplayMessage("Calculating checksum of game file...", 2000);
-	memset(MD5, 0, sizeof(MD5));
-	char game[255];
-	memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(),SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size());
-	md5_file(game, MD5);
-	Core::DisplayMessage("Finished calculating checksum.", 2000);
-}
-
-void Shutdown()
-{
-	g_currentInputCount = g_totalInputCount = g_totalFrames = g_totalBytes = 0;
-	delete [] tmpInput;
-	tmpInput = NULL;
-	tmpInputAllocated = 0;
-}
-};
diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h
deleted file mode 100644
index 423393c7a4..0000000000
--- a/Source/Core/Core/Src/Movie.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __MOVIE_H
-#define __MOVIE_H
-
-#include "Common.h"
-#include "../../InputCommon/Src/GCPadStatus.h"
-
-#include <string>
-
-#include "ChunkFile.h"
-
-namespace WiimoteEmu
-{
-struct ReportFeatures;
-}
-
-// Per-(video )Movie actions
-
-namespace Movie {
-
-// Enumerations and structs
-enum PlayMode {
-	MODE_NONE = 0,
-	MODE_RECORDING,
-	MODE_PLAYING
-};
-
-// Gamecube Controller State
-#pragma pack(push,1)
-struct ControllerState {
-	bool Start:1, A:1, B:1, X:1, Y:1, Z:1;		// Binary buttons, 6 bits
-	bool DPadUp:1, DPadDown:1,					// Binary D-Pad buttons, 4 bits
-		DPadLeft:1, DPadRight:1;
-	bool L:1, R:1;								// Binary triggers, 2 bits
-	bool disc:1;								// Checks for disc being changed
-	bool reserved:3;							// Reserved bits used for padding, 4 bits
-
-	u8   TriggerL, TriggerR;					// Triggers, 16 bits
-	u8   AnalogStickX, AnalogStickY;			// Main Stick, 16 bits
-	u8   CStickX, CStickY;						// Sub-Stick, 16 bits
-	
-}; // Total: 60 + 4 = 64 bits per frame
-static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes");
-#pragma pack(pop)
-
-// Global declarations
-extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange, g_bClearSave;
-extern PlayMode g_playMode;
-extern u64 g_titleID;
-
-extern u32 g_framesToSkip, g_frameSkipCounter;
-
-extern u8 g_numPads;
-extern ControllerState *g_padStates;
-extern char g_playingFile[256];
-extern std::string g_recordFile;
-
-extern u64 g_currentByte, g_totalBytes;
-extern u64 g_currentFrame, g_totalFrames;
-extern u64 g_currentLagCount, g_totalLagCount;
-extern u64 g_currentInputCount, g_totalInputCount;
-extern std::string g_discChange;
-
-extern u32 g_rerecords;
-
-#pragma pack(push,1)
-struct DTMHeader {
-	u8 filetype[4];			// Unique Identifier (always "DTM"0x1A)
-
-	u8 gameID[6];			// The Game ID
-	bool bWii;				// Wii game
-
-	u8  numControllers;		// The number of connected controllers (1-4)
-
-	bool bFromSaveState;	// false indicates that the recording started from bootup, true for savestate
-	u64 frameCount;			// Number of frames in the recording
-	u64 inputCount;			// Number of input frames in recording
-	u64 lagCount;			// Number of lag frames in the recording
-	u64 uniqueID;			// (not implemented) A Unique ID comprised of: md5(time + Game ID)
-	u32 numRerecords;		// Number of rerecords/'cuts' of this TAS
-	u8  author[32];			// Author's name (encoded in UTF-8)
-
-	u8  videoBackend[16];	// UTF-8 representation of the video backend
-	u8  audioEmulator[16];	// UTF-8 representation of the audio emulator
-	unsigned char  md5[16];	// MD5 of game iso
-
-	u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC)
-
-	bool bSaveConfig;		// Loads the settings below on startup if true
-	bool bSkipIdle;
-	bool bDualCore;
-	bool bProgressive;
-	bool bDSPHLE;
-	bool bFastDiscSpeed;
-	u8  CPUCore;			// 0 = interpreter, 1 = JIT, 2 = JITIL
-	bool bEFBAccessEnable;
-	bool bEFBCopyEnable;
-	bool bCopyEFBToTexture;
-	bool bEFBCopyCacheEnable;
-	bool bEFBEmulateFormatChanges;
-	bool bUseXFB;
-	bool bUseRealXFB;
-	bool bMemcard;
-	bool bClearSave;		// Create a new memory card when playing back a movie if true
-	u8 bongos;
-	bool bSyncGPU;
-	bool bNetPlay;
-	u8 reserved[13];		// Padding for any new config options
-	u8 discChange[40];		// Name of iso file to switch to, for two disc games.
-	u8 revision[20];		// Git hash
-	u8 reserved2[27];		// Make heading 256 bytes, just because we can
-};
-static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes");
-
-#pragma pack(pop)
-
-void FrameUpdate();
-void InputUpdate();
-void Init();
-
-void SetPolledDevice();
-
-bool IsRecordingInput();
-bool IsRecordingInputFromSaveState();
-bool IsJustStartingRecordingInputFromSaveState();
-bool IsJustStartingPlayingInputFromSaveState();
-bool IsPlayingInput();
-bool IsReadOnly();
-u64 GetRecordingStartTime();
-
-bool IsConfigSaved();
-bool IsDualCore();
-bool IsProgressive();
-bool IsSkipIdle();
-bool IsDSPHLE();
-bool IsFastDiscSpeed();
-int GetCPUMode();
-bool IsStartingFromClearSave();
-bool IsUsingMemcard();
-bool IsSyncGPU();
-void SetGraphicsConfig();
-void GetSettings();
-bool IsNetPlayRecording();
-
-bool IsUsingPad(int controller);
-bool IsUsingWiimote(int wiimote);
-bool IsUsingBongo(int controller);
-void ChangePads(bool instantly = false);
-void ChangeWiiPads(bool instantly = false);
-
-void DoFrameStep();
-void SetFrameStopping(bool bEnabled);
-void SetReadOnly(bool bEnabled);
-
-void SetFrameSkipping(unsigned int framesToSkip);
-void FrameSkipping();
-
-bool BeginRecordingInput(int controllers);
-void RecordInput(SPADStatus *PadStatus, int controllerID);
-void RecordWiimote(int wiimote, u8 *data, u8 size);
-
-bool PlayInput(const char *filename);
-void LoadInput(const char *filename);
-void ReadHeader();
-void PlayController(SPADStatus *PadStatus, int controllerID);
-bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode);
-void EndPlayInput(bool cont);
-void SaveRecording(const char *filename);
-void DoState(PointerWrap &p);
-void CheckMD5();
-void GetMD5();
-void Shutdown();
-void CheckPadStatus(SPADStatus *PadStatus, int controllerID);
-void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode);
-
-std::string GetInputDisplay();
-
-// Done this way to avoid mixing of core and gui code
-typedef void(*ManipFunction)(SPADStatus *, int);
-
-void SetInputManip(ManipFunction);
-void CallInputManip(SPADStatus *PadStatus, int controllerID);
-};
-
-#endif // __MOVIE_H
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
deleted file mode 100644
index bc6ca9d393..0000000000
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "NetPlayClient.h"
-
-// for wiimote
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "IPC_HLE/WII_IPC_HLE_WiiMote.h"
-// for gcpad
-#include "HW/SI.h"
-#include "HW/SI_DeviceGCController.h"
-#include "HW/SI_DeviceGCSteeringWheel.h"
-#include "HW/SI_DeviceDanceMat.h"
-// for gctime
-#include "HW/EXI_DeviceIPL.h"
-// for wiimote/ OSD messages
-#include "Core.h"
-#include "ConfigManager.h"
-#include "Movie.h"
-
-std::mutex crit_netplay_client;
-static NetPlayClient * netplay_client = NULL;
-NetSettings g_NetPlaySettings;
-
-#define RPT_SIZE_HACK	(1 << 16)
-
-NetPad::NetPad()
-{
-	nHi = 0x00808080;
-	nLo = 0x80800000;
-}
-
-NetPad::NetPad(const SPADStatus* const pad_status)
-{
-	nHi = (u32)((u8)pad_status->stickY);
-	nHi |= (u32)((u8)pad_status->stickX << 8);
-	nHi |= (u32)((u16)pad_status->button << 16);
-	nHi |= 0x00800000;
-	nLo = (u8)pad_status->triggerRight;
-	nLo |= (u32)((u8)pad_status->triggerLeft << 8);
-	nLo |= (u32)((u8)pad_status->substickY << 16);
-	nLo |= (u32)((u8)pad_status->substickX << 24);
-}
-
-// called from ---GUI--- thread
-NetPlayClient::~NetPlayClient()
-{
-	// not perfect
-	if (m_is_running)
-		StopGame();
-
-	if (is_connected)
-	{
-		m_do_loop = false;
-		m_thread.join();
-	}
-}
-
-// called from ---GUI--- thread
-NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name) : m_dialog(dialog), m_is_running(false), m_do_loop(true)
-{
-	m_target_buffer_size = 20;
-	ClearBuffers();
-
-	is_connected = false;
-
-	// why is false successful? documentation says true is
-	if (0 == m_socket.Connect(port, address, 5))
-	{
-		// send connect message
-		sf::Packet spac;
-		spac << NETPLAY_VERSION;
-		spac << netplay_dolphin_ver;
-		spac << name;
-		m_socket.Send(spac);
-
-		sf::Packet rpac;
-		// TODO: make this not hang
-		m_socket.Receive(rpac);
-		MessageId error;
-		rpac >> error;
-
-		// got error message
-		if (error)
-		{
-			switch (error)
-			{
-			case CON_ERR_SERVER_FULL :
-				PanicAlertT("The server is full!");
-				break;
-			case CON_ERR_VERSION_MISMATCH :
-				PanicAlertT("The server and client's NetPlay versions are incompatible!");
-				break;
-			case CON_ERR_GAME_RUNNING :
-				PanicAlertT("The server responded: the game is currently running!");
-				break;
-			default :
-				PanicAlertT("The server sent an unknown error message!");
-				break;
-			}
-			m_socket.Close();
-		}
-		else
-		{
-			rpac >> m_pid;
-
-			Player player;
-			player.name = name;
-			player.pid = m_pid;
-			player.revision = netplay_dolphin_ver;
-
-			// add self to player list
-			m_players[m_pid] = player;
-			m_local_player = &m_players[m_pid];
-
-			m_dialog->Update();
-
-			//PanicAlertT("Connection successful: assigned player id: %d", m_pid);
-			is_connected = true;
-
-			m_selector.Add(m_socket);
-			m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this);
-		}
-	}
-	else
-		PanicAlertT("Failed to Connect!");
-
-}
-
-// called from ---NETPLAY--- thread
-unsigned int NetPlayClient::OnData(sf::Packet& packet)
-{
-	MessageId mid;
-	packet >> mid;
-
-	switch (mid)
-	{
-	case NP_MSG_PLAYER_JOIN :
-		{
-			Player player;
-			packet >> player.pid;
-			packet >> player.name;
-			packet >> player.revision;
-
-			{
-			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-			m_players[player.pid] = player;
-			}
-
-			m_dialog->Update();
-		}
-		break;
-
-	case NP_MSG_PLAYER_LEAVE :
-		{
-			PlayerId pid;
-			packet >> pid;
-
-			{
-			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-			m_players.erase(m_players.find(pid));
-			}
-
-			m_dialog->Update();
-		}
-		break;
-
-	case NP_MSG_CHAT_MESSAGE :
-		{
-			PlayerId pid;
-			packet >> pid;
-			std::string msg;
-			packet >> msg;
-
-			// don't need lock to read in this thread
-			const Player& player = m_players[pid];
-
-			// add to gui
-			std::ostringstream ss;
-			ss << player.name << '[' << (char)(pid+'0') << "]: " << msg;
-
-			m_dialog->AppendChat(ss.str());
-		}
-		break;
-
-	case NP_MSG_PAD_MAPPING :
-		{
-			for (PadMapping i = 0; i < 4; i++)
-				packet >> m_pad_map[i];
-
-			UpdateDevices();
-
-			m_dialog->Update();
-		}
-		break;
-
-	case NP_MSG_PAD_DATA :
-		{
-			PadMapping map = 0;
-			NetPad np;
-			packet >> map >> np.nHi >> np.nLo;
-
-			// trusting server for good map value (>=0 && <4)
-			// add to pad buffer
-			m_pad_buffer[map].Push(np);
-		}
-		break;
-
-	case NP_MSG_PAD_BUFFER :
-		{
-			u32 size = 0;
-			packet >> size;
-
-			m_target_buffer_size = size;
-		}
-		break;
-
-	case NP_MSG_CHANGE_GAME :
-		{
-			{
-			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-			packet >> m_selected_game;
-			}
-
-			// update gui
-			m_dialog->OnMsgChangeGame(m_selected_game);
-		}
-		break;
-
-	case NP_MSG_START_GAME :
-		{
-			{
-			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-			packet >> m_current_game;
-			packet >> g_NetPlaySettings.m_CPUthread;
-			packet >> g_NetPlaySettings.m_DSPEnableJIT;
-			packet >> g_NetPlaySettings.m_DSPHLE;
-			packet >> g_NetPlaySettings.m_WriteToMemcard;
-			int tmp;
-			packet >> tmp;
-			g_NetPlaySettings.m_EXIDevice[0] = (TEXIDevices) tmp;
-			packet >> tmp;
-			g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices) tmp;
-			}
-
-			m_dialog->OnMsgStartGame();
-		}
-		break;
-
-	case NP_MSG_STOP_GAME :
-		{
-			m_dialog->OnMsgStopGame();
-		}
-		break;
-
-	case NP_MSG_DISABLE_GAME :
-		{
-			PanicAlertT("Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game.");
-			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-			m_is_running = false;
-			NetPlay_Disable();
-		}
-		break;
-
-	case NP_MSG_PING :
-		{
-			u32 ping_key = 0;
-			packet >> ping_key;
-
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_PONG;
-			spac << ping_key;
-
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			m_socket.Send(spac);
-		}
-		break;
-
-	case NP_MSG_PLAYER_PING_DATA:
-		{
-			PlayerId pid;
-			packet >> pid;
-
-			{
-			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-			Player& player = m_players[pid];
-			packet >> player.ping;
-			}
-
-			m_dialog->Update();
-		}
-		break;
-
-	default :
-		PanicAlertT("Unknown message received with id : %d", mid);
-		break;
-
-	}
-
-	return 0;
-}
-
-// called from ---NETPLAY--- thread
-void NetPlayClient::ThreadFunc()
-{
-	while (m_do_loop)
-	{
-		if (m_selector.Wait(0.01f))
-		{
-			sf::Packet rpac;
-			switch (m_socket.Receive(rpac))
-			{
-			case sf::Socket::Done :
-				OnData(rpac);
-				break;
-
-			//case sf::Socket::Disconnected :
-			default :
-				m_is_running = false;
-				NetPlay_Disable();
-				m_dialog->AppendChat("< LOST CONNECTION TO SERVER >");
-				PanicAlertT("Lost connection to server!");
-				m_do_loop = false;
-				break;
-			}
-		}
-	}
-
-	m_socket.Close();
-
-	return;
-}
-
-// called from ---GUI--- thread
-void NetPlayClient::GetPlayerList(std::string& list, std::vector<int>& pid_list)
-{
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-
-	std::ostringstream ss;
-
-	std::map<PlayerId, Player>::const_iterator
-		i = m_players.begin(),
-		e = m_players.end();
-	for ( ; i!=e; ++i)
-	{
-		const Player *player = &(i->second);
-		ss << player->name << "[" << (int)player->pid << "] : " << player->revision << " | ";
-		for (unsigned int j = 0; j < 4; j++)
-		{
-			if (m_pad_map[j] == player->pid)
-				ss << j + 1;
-			else
-				ss << '-';
-		}
-		ss << " | " << player->ping << "ms\n";
-		pid_list.push_back(player->pid);
-	}
-
-	list = ss.str();
-}
-
-// called from ---GUI--- thread
-void NetPlayClient::GetPlayers(std::vector<const Player *> &player_list)
-{
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	std::map<PlayerId, Player>::const_iterator
-		i = m_players.begin(),
-		e = m_players.end();
-	for ( ; i!=e; ++i)
-	{
-		const Player *player = &(i->second);
-		player_list.push_back(player);
-	}
-}
-
-
-// called from ---GUI--- thread
-void NetPlayClient::SendChatMessage(const std::string& msg)
-{
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_CHAT_MESSAGE;
-	spac << msg;
-
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	m_socket.Send(spac);
-}
-
-// called from ---CPU--- thread
-void NetPlayClient::SendPadState(const PadMapping in_game_pad, const NetPad& np)
-{
-	// send to server
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_PAD_DATA;
-	spac << in_game_pad;
-	spac << np.nHi << np.nLo;
-
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	m_socket.Send(spac);
-}
-
-// called from ---GUI--- thread
-bool NetPlayClient::StartGame(const std::string &path)
-{
-	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-
-	// tell server i started the game
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_START_GAME;
-	spac << m_current_game;
-	spac << (char *)&g_NetPlaySettings;
-
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	m_socket.Send(spac);
-
-	if (m_is_running)
-	{
-		PanicAlertT("Game is already running!");
-		return false;
-	}
-
-	m_dialog->AppendChat(" -- STARTING GAME -- ");
-
-	m_is_running = true;
-	NetPlay_Enable(this);
-
-	ClearBuffers();
-
-	if (m_dialog->IsRecording())
-	{
-
-		if (Movie::IsReadOnly())
-			Movie::SetReadOnly(false);
-
-		u8 controllers_mask = 0;
-		for (unsigned int i = 0; i < 4; ++i)
-		{
-			if (m_pad_map[i] > 0)
-				controllers_mask |= (1 << i);
-		}
-		Movie::BeginRecordingInput(controllers_mask);
-	}
-
-	// boot game
-	m_dialog->BootGame(path);
-
-	UpdateDevices();
-
-	// temporary
-	NetWiimote nw;
-	for (unsigned int i = 0; i<4; ++i)
-		for (unsigned int f = 0; f<2; ++f)
-			m_wiimote_buffer[i].Push(nw);
-
-	return true;
-}
-
-// called from ---GUI--- thread
-bool NetPlayClient::ChangeGame(const std::string&)
-{
-	return true;
-}
-
-// called from ---NETPLAY--- thread
-void NetPlayClient::UpdateDevices()
-{
-	for (PadMapping i = 0; i < 4; i++)
-	{
-		// XXX: add support for other device types? does it matter?
-		SerialInterface::AddDevice(m_pad_map[i] > 0 ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i);
-	}
-}
-
-// called from ---NETPLAY--- thread
-void NetPlayClient::ClearBuffers()
-{
-	// clear pad buffers, Clear method isn't thread safe
-	for (unsigned int i=0; i<4; ++i)
-	{
-		while (m_pad_buffer[i].Size())
-			m_pad_buffer[i].Pop();
-
-		while (m_wiimote_buffer[i].Size())
-			m_wiimote_buffer[i].Pop();
-
-		m_wiimote_input[i].clear();
-	}
-}
-
-// called from ---CPU--- thread
-bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_status, NetPad* const netvalues)
-{
-	// The interface for this is extremely silly.
-	//
-	// Imagine a physical device that links three Gamecubes together
-	// and emulates NetPlay that way. Which Gamecube controls which
-	// in-game controllers can be configured on the device (m_pad_map)
-	// but which sockets on each individual Gamecube should be used
-	// to control which players? The solution that Dolphin uses is
-	// that we hardcode the knowledge that they go in order, so if
-	// you have a 3P game with three gamecubes, then every single
-	// controller should be plugged into slot 1.
-	//
-	// If you have a 4P game, then one of the Gamecubes will have
-	// a controller plugged into slot 1, and another in slot 2.
-	//
-	// The slot number is the "local" pad number, and what  player
-	// it actually means is the "in-game" pad number.
-	//
-	// The interface here gives us the status of local pads, and
-	// expects to get back "in-game" pad numbers back in response.
-	// e.g. it asks "here's the input that slot 1 has, and by the
-	// way, what's the state of P1?"
-	//
-	// We should add this split between "in-game" pads and "local"
-	// pads higher up.
-
-	int in_game_num = LocalPadToInGamePad(pad_nb);
-
-	// If this in-game pad is one of ours, then update from the
-	// information given.
-	if (in_game_num < 4)
-	{
-		NetPad np(pad_status);
-
-		// adjust the buffer either up or down
-		// inserting multiple padstates or dropping states
-		while (m_pad_buffer[in_game_num].Size() <= m_target_buffer_size)
-		{
-			// add to buffer
-			m_pad_buffer[in_game_num].Push(np);
-
-			// send
-			SendPadState(in_game_num, np);
-		}
-	}
-
-	// Now, we need to swap out the local value with the values
-	// retrieved from NetPlay. This could be the value we pushed
-	// above if we're configured as P1 and the code is trying
-	// to retrieve data for slot 1.
-	while (!m_pad_buffer[pad_nb].Pop(*netvalues))
-	{
-		if (!m_is_running)
-			return false;
-
-		// TODO: use a condition instead of sleeping
-		Common::SleepCurrentThread(1);
-	}
-
-	SPADStatus tmp;
-	tmp.stickY = ((u8*)&netvalues->nHi)[0];
-	tmp.stickX = ((u8*)&netvalues->nHi)[1];
-	tmp.button = ((u16*)&netvalues->nHi)[1];
-
-	tmp.substickX =  ((u8*)&netvalues->nLo)[3];
-	tmp.substickY =  ((u8*)&netvalues->nLo)[2];
-	tmp.triggerLeft = ((u8*)&netvalues->nLo)[1];
-	tmp.triggerRight = ((u8*)&netvalues->nLo)[0];
-	if (Movie::IsRecordingInput())
-	{
-		Movie::RecordInput(&tmp, pad_nb);
-		Movie::InputUpdate();
-	}
-	else
-	{
-		Movie::CheckPadStatus(&tmp, pad_nb);
-	}
-
-	return true;
-}
-
-// called from ---CPU--- thread
-void NetPlayClient::WiimoteInput(int _number, u16 _channelID, const void* _pData, u32 _Size)
-{
-	// XXX
-}
-
-// called from ---CPU--- thread
-void NetPlayClient::WiimoteUpdate(int _number)
-{
-	// XXX
-}
-
-// called from ---GUI--- thread and ---NETPLAY--- thread (client side)
-bool NetPlayClient::StopGame()
-{
-	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-
-	if (false == m_is_running)
-	{
-		PanicAlertT("Game isn't running!");
-		return false;
-	}
-
-	m_dialog->AppendChat(" -- STOPPING GAME -- ");
-
-	m_is_running = false;
-	NetPlay_Disable();
-
-	// stop game
-	m_dialog->StopGame();
-
-	return true;
-}
-
-void NetPlayClient::Stop()
-{
-	if (m_is_running == false)
-		return;
-	bool isPadMapped = false;
-	for (unsigned int i = 0; i < 4; ++i)
-	{
-		if (m_pad_map[i] == m_local_player->pid)
-			isPadMapped = true;
-	}
-	// tell the server to stop if we have a pad mapped in game.
-	if (isPadMapped)
-	{
-		sf::Packet spac;
-		spac << (MessageId)NP_MSG_STOP_GAME;
-		m_socket.Send(spac);
-	}
-}
-
-u8 NetPlayClient::InGamePadToLocalPad(u8 ingame_pad)
-{
-	// not our pad
-	if (m_pad_map[ingame_pad] != m_local_player->pid)
-		return 4;
-
-	int local_pad = 0;
-	int pad = 0;
-
-	for (; pad < ingame_pad; pad++)
-	{
-		if (m_pad_map[pad] == m_local_player->pid)
-			local_pad++;
-	}
-
-	return local_pad;
-}
-
-u8 NetPlayClient::LocalPadToInGamePad(u8 local_pad)
-{
-	// Figure out which in-game pad maps to which local pad.
-	// The logic we have here is that the local slots always
-	// go in order.
-	int local_pad_count = -1;
-	int ingame_pad = 0;
-	for (; ingame_pad < 4; ingame_pad++)
-	{
-		if (m_pad_map[ingame_pad] == m_local_player->pid)
-			local_pad_count++;
-
-		if (local_pad_count == local_pad)
-			break;
-	}
-
-	return ingame_pad;
-}
-
-// stuff hacked into dolphin
-
-// called from ---CPU--- thread
-// Actual Core function which is called on every frame
-bool CSIDevice_GCController::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus)
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-
-	if (netplay_client)
-		return netplay_client->GetNetPads(numPAD, &PadStatus, (NetPad*)PADStatus);
-	else
-		return false;
-}
-
-bool CSIDevice_GCSteeringWheel::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus)
-{
-	return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus);
-}
-
-bool CSIDevice_DanceMat::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus)
-{
-	return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus);
-}
-
-// called from ---CPU--- thread
-// so all players' games get the same time
-u32 CEXIIPL::NetPlay_GetGCTime()
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-
-	if (netplay_client)
-		return NETPLAY_INITIAL_GCTIME;	// watev
-	else
-		return 0;
-}
-
-// called from ---CPU--- thread
-// return the local pad num that should rumble given a ingame pad num
-u8 CSIDevice_GCController::NetPlay_InGamePadToLocalPad(u8 numPAD)
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-
-	if (netplay_client)
-		return netplay_client->InGamePadToLocalPad(numPAD);
-	else
-		return numPAD;
-}
-
-u8 CSIDevice_GCSteeringWheel::NetPlay_InGamePadToLocalPad(u8 numPAD)
-{
-	return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD);
-}
-
-u8 CSIDevice_DanceMat::NetPlay_InGamePadToLocalPad(u8 numPAD)
-{
-	return CSIDevice_GCController::NetPlay_InGamePadToLocalPad(numPAD);
-}
-
-// called from ---CPU--- thread
-// wiimote update / used for frame counting
-//void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number)
-void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int)
-{
-}
-
-// called from ---CPU--- thread
-//
-int CWII_IPC_HLE_WiiMote::NetPlay_GetWiimoteNum(int _number)
-{
-	return _number;
-}
-
-// called from ---CPU--- thread
-// intercept wiimote input callback
-//bool CWII_IPC_HLE_WiiMote::NetPlay_WiimoteInput(int _number, u16 _channelID, const void* _pData, u32& _Size)
-bool CWII_IPC_HLE_WiiMote::NetPlay_WiimoteInput(int, u16, const void*, u32&)
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-
-	if (netplay_client)
-		return true;
-	else
-		return false;
-}
-
-bool NetPlay::IsNetPlayRunning()
-{
-	return netplay_client != NULL;
-}
-
-void NetPlay_Enable(NetPlayClient* const np)
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-	netplay_client = np;
-}
-
-void NetPlay_Disable()
-{
-	std::lock_guard<std::mutex> lk(crit_netplay_client);
-	netplay_client = NULL;
-}
diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h
deleted file mode 100644
index fa53154b7e..0000000000
--- a/Source/Core/Core/Src/NetPlayClient.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NETPLAY_H
-#define _NETPLAY_H
-
-#include "Common.h"
-#include "CommonTypes.h"
-#include "Thread.h"
-#include "Timer.h"
-
-#include <SFML/Network.hpp>
-
-#include "NetPlayProto.h"
-#include "GCPadStatus.h"
-
-#include <functional>
-#include <map>
-#include <queue>
-#include <sstream>
-
-#include "FifoQueue.h"
-
-class NetPad
-{
-public:
-	NetPad();
-	NetPad(const SPADStatus* const);
-
-	u32 nHi;
-	u32 nLo;
-};
-
-class NetPlayUI
-{
-public:
-	virtual ~NetPlayUI() {};
-
-	virtual void BootGame(const std::string& filename) = 0;
-	virtual void StopGame() = 0;
-
-	virtual void Update() = 0;
-	virtual void AppendChat(const std::string& msg) = 0;
-
-	virtual void OnMsgChangeGame(const std::string& filename) = 0;
-	virtual void OnMsgStartGame() = 0;
-	virtual void OnMsgStopGame() = 0;
-	virtual bool IsRecording() = 0;
-};
-
-class Player
-{
- public:
-	PlayerId		pid;
-	std::string		name;
-	std::string		revision;
-	u32                     ping;
-};
-
-class NetPlayClient
-{
-public:
-	void ThreadFunc();
-
-	NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name);
-	~NetPlayClient();
-
-	void GetPlayerList(std::string& list, std::vector<int>& pid_list);
-	void GetPlayers(std::vector<const Player *>& player_list);
-
-	bool is_connected;
-
-	bool StartGame(const std::string &path);
-	bool StopGame();
-	void Stop();
-	bool ChangeGame(const std::string& game);
-	void SendChatMessage(const std::string& msg);
-
-	// Send and receive pads values
-	void WiimoteInput(int _number, u16 _channelID, const void* _pData, u32 _Size);
-	void WiimoteUpdate(int _number);
-	bool GetNetPads(const u8 pad_nb, const SPADStatus* const, NetPad* const netvalues);
-
-	u8 LocalPadToInGamePad(u8 localPad);
-	u8 InGamePadToLocalPad(u8 localPad);
-
-protected:
-	void ClearBuffers();
-
-	struct
-	{
-		std::recursive_mutex game;
-		// lock order
-		std::recursive_mutex players, send;
-	} m_crit;
-
-	Common::FifoQueue<NetPad>		m_pad_buffer[4];
-	Common::FifoQueue<NetWiimote>	m_wiimote_buffer[4];
-
-	NetWiimote		m_wiimote_input[4];
-
-	NetPlayUI*		m_dialog;
-	sf::SocketTCP	m_socket;
-	std::thread		m_thread;
-	sf::Selector<sf::SocketTCP>		m_selector;
-
-	std::string		m_selected_game;
-	volatile bool	m_is_running;
-	volatile bool	m_do_loop;
-
-	unsigned int	m_target_buffer_size;
-
-	Player*		m_local_player;
-
-	u32		m_current_game;
-
-	PadMapping	m_pad_map[4];
-
-	bool m_is_recording;
-
-private:
-	void UpdateDevices();
-	void SendPadState(const PadMapping in_game_pad, const NetPad& np);
-	unsigned int OnData(sf::Packet& packet);
-
-	PlayerId		m_pid;
-	std::map<PlayerId, Player>	m_players;
-};
-
-void NetPlay_Enable(NetPlayClient* const np);
-void NetPlay_Disable();
-
-#endif
diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h
deleted file mode 100644
index 2b4c49d97c..0000000000
--- a/Source/Core/Core/Src/NetPlayProto.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NETPLAY_PROTO_H
-#define _NETPLAY_PROTO_H
-
-#include "Common.h"
-#include "CommonTypes.h"
-#include "HW/EXI_Device.h"
-
-struct NetSettings
-{
-	bool m_CPUthread;
-	bool m_DSPHLE;
-	bool m_DSPEnableJIT;
-	bool m_WriteToMemcard;
-	TEXIDevices m_EXIDevice[2];
-};
-
-extern NetSettings g_NetPlaySettings;
-
-struct Rpt : public std::vector<u8>
-{
-	u16		channel;
-};
-
-typedef std::vector<Rpt>	NetWiimote;
-
-#define NETPLAY_VERSION		"Dolphin NetPlay 2013-09-03"
-
-const int NETPLAY_INITIAL_GCTIME = 1272737767;
-
-// messages
-enum
-{
-	NP_MSG_PLAYER_JOIN		= 0x10,
-	NP_MSG_PLAYER_LEAVE		= 0x11,
-
-	NP_MSG_CHAT_MESSAGE		= 0x30,
-
-	NP_MSG_PAD_DATA			= 0x60,
-	NP_MSG_PAD_MAPPING		= 0x61,
-	NP_MSG_PAD_BUFFER		= 0x62,
-
-	NP_MSG_WIIMOTE_DATA		= 0x70,
-	NP_MSG_WIIMOTE_MAPPING		= 0x71,	// just using pad mapping for now
-
-	NP_MSG_START_GAME		= 0xA0,
-	NP_MSG_CHANGE_GAME		= 0xA1,
-	NP_MSG_STOP_GAME		= 0xA2,
-	NP_MSG_DISABLE_GAME		= 0xA3,
-
-	NP_MSG_READY			= 0xD0,
-	NP_MSG_NOT_READY		= 0xD1,
-
-	NP_MSG_PING			= 0xE0,
-	NP_MSG_PONG			= 0xE1,
-	NP_MSG_PLAYER_PING_DATA		= 0xE2,
-};
-
-typedef u8	MessageId;
-typedef u8	PlayerId;
-typedef s8	PadMapping;
-typedef u32	FrameNum;
-
-enum
-{
-	CON_ERR_SERVER_FULL = 1,
-	CON_ERR_GAME_RUNNING,
-	CON_ERR_VERSION_MISMATCH
-};
-
-namespace NetPlay {
-	bool IsNetPlayRunning();
-};
-
-#endif
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
deleted file mode 100644
index 5abf805fe5..0000000000
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "NetPlayServer.h"
-
-NetPlayServer::~NetPlayServer()
-{
-	if (is_connected)
-	{
-		m_do_loop = false;
-		m_thread.join();
-		m_socket.Close();
-	}
-
-#ifdef USE_UPNP
-	if (m_upnp_thread.joinable())
-		m_upnp_thread.join();
-	m_upnp_thread = std::thread(&NetPlayServer::unmapPortThread);
-	m_upnp_thread.join();
-#endif
-}
-
-// called from ---GUI--- thread
-NetPlayServer::NetPlayServer(const u16 port) : is_connected(false), m_is_running(false)
-{
-	memset(m_pad_map, -1, sizeof(m_pad_map));
-	if (m_socket.Listen(port))
-	{
-		is_connected = true;
-		m_do_loop = true;
-		m_selector.Add(m_socket);
-		m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this);
-	}
-}
-
-// called from ---NETPLAY--- thread
-void NetPlayServer::ThreadFunc()
-{
-	while (m_do_loop)
-	{
-		// update pings every so many seconds
-		if ((m_ping_timer.GetTimeElapsed() > (10 * 1000)) || m_update_pings)
-		{
-			//PanicAlertT("Sending pings");
-
-			m_ping_key = Common::Timer::GetTimeMs();
-
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_PING;
-			spac << m_ping_key;
-			
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			m_ping_timer.Start();
-			SendToClients(spac);
-
-			m_update_pings = false;
-		}
-
-		// check which sockets need attention
-		const unsigned int num = m_selector.Wait(0.01f);
-		for (unsigned int i=0; i<num; ++i)
-		{
-			sf::SocketTCP ready_socket = m_selector.GetSocketReady(i);
-
-			// listening socket
-			if (ready_socket == m_socket)
-			{
-				sf::SocketTCP accept_socket;
-				m_socket.Accept(accept_socket);
-
-				unsigned int error;
-				{
-				std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-				error = OnConnect(accept_socket);
-				}
-
-				if (error)
-				{
-					sf::Packet spac;
-					spac << (MessageId)error;
-					// don't need to lock, this client isn't in the client map
-					accept_socket.Send(spac);
-
-					// TODO: not sure if client gets the message if i close right away
-					accept_socket.Close();
-				}
-			}
-			// client socket
-			else
-			{
-				sf::Packet rpac;
-				switch (ready_socket.Receive(rpac))
-				{
-				case sf::Socket::Done :
-					// if a bad packet is received, disconnect the client
-					if (0 == OnData(rpac, ready_socket))
-						break;
-
-				//case sf::Socket::Disconnected :
-				default :
-					{
-					std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-					OnDisconnect(ready_socket);
-					break;
-					}
-				}
-			}
-		}
-	}
-
-	// close listening socket and client sockets
-	{
-	std::map<sf::SocketTCP, Client>::reverse_iterator
-		i = m_players.rbegin(),
-		e = m_players.rend();
-	for ( ; i!=e; ++i)
-		i->second.socket.Close();
-	}
-
-	return;
-}
-
-// called from ---NETPLAY--- thread
-unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket)
-{
-	sf::Packet rpac;
-	// TODO: make this not hang / check if good packet
-	socket.Receive(rpac);
-
-	std::string npver;
-	rpac >> npver;
-	// dolphin netplay version
-	if (npver != NETPLAY_VERSION)
-		return CON_ERR_VERSION_MISMATCH;
-
-	// game is currently running
-	if (m_is_running)
-		return CON_ERR_GAME_RUNNING;
-
-	// too many players
-	if (m_players.size() >= 255)
-		return CON_ERR_SERVER_FULL;
-
-	// cause pings to be updated
-	m_update_pings = true;
-
-	Client player;
-	player.socket = socket;
-	rpac >> player.revision;
-	rpac >> player.name;
-
-	// give new client first available id
-	player.pid = m_players.size() + 1;
-
-	// try to automatically assign new user a pad
-	for (unsigned int m = 0; m < 4; ++m)
-	{
-		if (m_pad_map[m] == -1)
-		{
-			m_pad_map[m] = player.pid;
-			break;
-		}
-	}
-
-	{
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-
-	// send join message to already connected clients
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_PLAYER_JOIN;
-	spac << player.pid << player.name << player.revision;
-	SendToClients(spac);
-
-	// send new client success message with their id
-	spac.Clear();
-	spac << (MessageId)0;
-	spac << player.pid;
-	socket.Send(spac);
-
-	// send new client the selected game
-	if (m_selected_game != "")
-	{
-		spac.Clear();
-		spac << (MessageId)NP_MSG_CHANGE_GAME;
-		spac << m_selected_game;
-		socket.Send(spac);
-	}
-
-	// send the pad buffer value
-	spac.Clear();
-	spac << (MessageId)NP_MSG_PAD_BUFFER;
-	spac << (u32)m_target_buffer_size;
-	socket.Send(spac);
-
-	// sync values with new client
-	std::map<sf::SocketTCP, Client>::const_iterator
-		i,
-		e = m_players.end();
-	for (i = m_players.begin(); i!=e; ++i)
-	{
-		spac.Clear();
-		spac << (MessageId)NP_MSG_PLAYER_JOIN;
-		spac << i->second.pid << i->second.name << i->second.revision;
-		socket.Send(spac);
-	}
-
-	} // unlock send
-
-	// add client to the player list
-	{
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	m_players[socket] = player;
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	UpdatePadMapping();	// sync pad mappings with everyone
-	}
-	
-
-	// add client to selector/ used for receiving
-	m_selector.Add(socket);
-
-	return 0;
-}
-
-// called from ---NETPLAY--- thread
-unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket)
-{
-	if (m_is_running)
-	{
-		PanicAlertT("Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game.");
-		std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-		m_is_running = false;
-
-		sf::Packet spac;
-		spac << (MessageId)NP_MSG_DISABLE_GAME;
-		// this thread doesn't need players lock
-		std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-		SendToClients(spac);
-	}
-
-	int pid = m_players[socket].pid;
-
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_PLAYER_LEAVE;
-	spac << pid;
-
-	m_selector.Remove(socket);
-	
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	m_players.erase(m_players.find(socket));
-
-	// alert other players of disconnect
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	SendToClients(spac);
-
-	for (int i = 0; i < 4; i++)
-		if (m_pad_map[i] == pid)
-			m_pad_map[i] = -1;
-	UpdatePadMapping();
-
-	return 0;
-}
-
-// called from ---GUI--- thread
-void NetPlayServer::GetPadMapping(PadMapping map[4])
-{
-	for (int i = 0; i < 4; i++)
-		map[i] = m_pad_map[i];
-}
-
-// called from ---GUI--- thread
-void NetPlayServer::SetPadMapping(const PadMapping map[4])
-{
-	for (int i = 0; i < 4; i++)
-		m_pad_map[i] = map[i];
-	UpdatePadMapping();
-}
-
-// called from ---GUI--- thread and ---NETPLAY--- thread
-void NetPlayServer::UpdatePadMapping()
-{
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_PAD_MAPPING;
-	for (int i = 0; i < 4; i++)
-		spac << m_pad_map[i];
-	SendToClients(spac);
-}
-
-// called from ---GUI--- thread and ---NETPLAY--- thread
-void NetPlayServer::AdjustPadBufferSize(unsigned int size)
-{
-	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-
-	m_target_buffer_size = size;
-
-	// tell clients to change buffer size
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_PAD_BUFFER;
-	spac << (u32)m_target_buffer_size;
-
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	SendToClients(spac);
-}
-
-// called from ---NETPLAY--- thread
-unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket)
-{
-	MessageId mid;
-	packet >> mid;
-
-	// don't need lock because this is the only thread that modifies the players
-	// only need locks for writes to m_players in this thread
-	Client& player = m_players[socket];
-
-	switch (mid)
-	{
-	case NP_MSG_CHAT_MESSAGE :
-		{
-			std::string msg;
-			packet >> msg;
-
-			// send msg to other clients
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_CHAT_MESSAGE;
-			spac << player.pid;
-			spac << msg;
-
-			{
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			SendToClients(spac, player.pid);
-			}
-		}
-		break;
-
-	case NP_MSG_PAD_DATA :
-		{
-			// if this is pad data from the last game still being received, ignore it
-			if (player.current_game != m_current_game)
-				break;
-
-			PadMapping map = 0;
-			int hi, lo;
-			packet >> map >> hi >> lo;
-
-			// If the data is not from the correct player,
-			// then disconnect them.
-			if (m_pad_map[map] != player.pid)
-				return 1;
-				
-			// Relay to clients
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_PAD_DATA;
-			spac << map << hi << lo;
-
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			SendToClients(spac, player.pid);
-		}
-		break;
-
-	case NP_MSG_PONG :
-		{
-			const u32 ping = m_ping_timer.GetTimeElapsed();
-			u32 ping_key = 0;
-			packet >> ping_key;
-
-			if (m_ping_key == ping_key)
-				player.ping = ping;
-
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_PLAYER_PING_DATA;
-			spac << player.pid;
-			spac << player.ping;
-
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			SendToClients(spac);
-		}
-		break;
-
-	case NP_MSG_START_GAME :
-		{
-			packet >> player.current_game;
-		}
-		break;
-
-	case NP_MSG_STOP_GAME:
-		{
-			// tell clients to stop game
-			sf::Packet spac;
-			spac << (MessageId)NP_MSG_STOP_GAME;
-
-			std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-			std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-			SendToClients(spac);
-
-			m_is_running = false;
-		}
-		break;
-
-	default :
-		PanicAlertT("Unknown message with id:%d received from player:%d Kicking player!", mid, player.pid);
-		// unknown message, kick the client
-		return 1;
-		break;
-	}
-
-	return 0;
-}
-
-// called from ---GUI--- thread / and ---NETPLAY--- thread
-void NetPlayServer::SendChatMessage(const std::string& msg)
-{
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_CHAT_MESSAGE;
-	spac << (PlayerId)0;	// server id always 0
-	spac << msg;
-
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	SendToClients(spac);
-}
-
-// called from ---GUI--- thread
-bool NetPlayServer::ChangeGame(const std::string &game)
-{
-	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-
-	m_selected_game = game;
-
-	// send changed game to clients
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_CHANGE_GAME;
-	spac << game;
-
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	SendToClients(spac);
-
-	return true;
-}
-
-// called from ---GUI--- thread
-void NetPlayServer::SetNetSettings(const NetSettings &settings)
-{
-	m_settings = settings;
-}
-
-// called from ---GUI--- thread
-bool NetPlayServer::StartGame(const std::string &path)
-{
-	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-	m_current_game = Common::Timer::GetTimeMs();
-
-	// no change, just update with clients
-	AdjustPadBufferSize(m_target_buffer_size);
-
-	// tell clients to start game
-	sf::Packet spac;
-	spac << (MessageId)NP_MSG_START_GAME;
-	spac << m_current_game;
-	spac << m_settings.m_CPUthread;
-	spac << m_settings.m_DSPEnableJIT;
-	spac << m_settings.m_DSPHLE;
-	spac << m_settings.m_WriteToMemcard;
-	spac << m_settings.m_EXIDevice[0];
-	spac << m_settings.m_EXIDevice[1];
-
-	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
-	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-	SendToClients(spac);
-
-	m_is_running = true;
-
-	return true;
-}
-
-// called from multiple threads
-void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid)
-{
-	std::map<sf::SocketTCP, Client>::iterator
-		i = m_players.begin(),
-		e = m_players.end();
-	for ( ; i!=e; ++i)
-		if (i->second.pid && (i->second.pid != skip_pid))
-			i->second.socket.Send(packet);
-}
-
-#ifdef USE_UPNP
-#include <miniwget.h>
-#include <miniupnpc.h>
-#include <upnpcommands.h>
-
-struct UPNPUrls NetPlayServer::m_upnp_urls;
-struct IGDdatas NetPlayServer::m_upnp_data;
-u16 NetPlayServer::m_upnp_mapped = 0;
-bool NetPlayServer::m_upnp_inited = false;
-bool NetPlayServer::m_upnp_error = false;
-std::thread NetPlayServer::m_upnp_thread;
-
-// called from ---GUI--- thread
-void NetPlayServer::TryPortmapping(u16 port)
-{
-	if (m_upnp_thread.joinable())
-		m_upnp_thread.join();
-	m_upnp_thread = std::thread(&NetPlayServer::mapPortThread, port);
-}
-
-// UPnP thread: try to map a port
-void NetPlayServer::mapPortThread(const u16 port)
-{
-	std::string ourIP = sf::IPAddress::GetLocalAddress().ToString();
-
-	if (!m_upnp_inited)
-		if (!initUPnP())
-			goto fail;
-
-	if (!UPnPMapPort(ourIP, port))
-		goto fail;
-
-	NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, ourIP.c_str());
-	return;
-fail:
-	WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, ourIP.c_str());
-	return;
-}
-
-// UPnP thread: try to unmap a port
-void NetPlayServer::unmapPortThread()
-{
-	if (m_upnp_mapped > 0)
-		UPnPUnmapPort(m_upnp_mapped);
-}
-
-// called from ---UPnP--- thread
-// discovers the IGD
-bool NetPlayServer::initUPnP()
-{
-	UPNPDev *devlist, *dev;
-	std::vector<UPNPDev *> igds;
-	int descXMLsize = 0, upnperror = 0;
-	char *descXML;
-
-	// Don't init if already inited
-	if (m_upnp_inited)
-		return true;
-
-	// Don't init if it failed before
-	if (m_upnp_error)
-		return false;
-
-	memset(&m_upnp_urls, 0, sizeof(UPNPUrls));
-	memset(&m_upnp_data, 0, sizeof(IGDdatas));
-
-	// Find all UPnP devices
-	devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
-	if (!devlist)
-	{
-		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
-
-		m_upnp_error = true;
-		m_upnp_inited = false;
-
-		return false;
-	}
-
-	// Look for the IGD
-	dev = devlist;
-	while (dev)
-	{
-		if (strstr(dev->st, "InternetGatewayDevice"))
-			igds.push_back(dev);
-		dev = dev->pNext;
-	}
-
-	std::vector<UPNPDev *>::iterator i;
-	for (i = igds.begin(); i != igds.end(); i++)
-	{
-		dev = *i;
-		descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0);
-		if (descXML)
-		{
-			parserootdesc(descXML, descXMLsize, &m_upnp_data);
-			free(descXML);
-			descXML = 0;
-			GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
-
-			NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
-			break;
-		}
-		else
-		{
-			WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL);
-		}
-	}
-
-	freeUPNPDevlist(devlist);
-
-	return true;
-}
-
-// called from ---UPnP--- thread
-// Attempt to portforward!
-bool NetPlayServer::UPnPMapPort(const std::string& addr, const u16 port)
-{
-	char port_str[6] = { 0 };
-	int result;
-
-	if (m_upnp_mapped > 0)
-		UPnPUnmapPort(m_upnp_mapped);
-
-	sprintf(port_str, "%d", port);
-	result = UPNP_AddPortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
-	                             port_str, port_str, addr.c_str(),
-	                             (std::string("dolphin-emu TCP on ") + addr).c_str(),
-	                             "TCP", NULL, NULL);
-
-	if(result != 0)
-		return false;
-
-	m_upnp_mapped = port;
-
-	return true;
-}
-
-// called from ---UPnP--- thread
-// Attempt to stop portforwarding.
-// --
-// NOTE: It is important that this happens! A few very crappy routers
-// apparently do not delete UPnP mappings on their own, so if you leave them
-// hanging, the NVRAM will fill with portmappings, and eventually all UPnP
-// requests will fail silently, with the only recourse being a factory reset.
-// --
-bool NetPlayServer::UPnPUnmapPort(const u16 port)
-{
-	char port_str[6] = { 0 };
-
-	sprintf(port_str, "%d", port);
-	UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
-	                       port_str, "TCP", NULL);
-
-	return true;
-}
-#endif
diff --git a/Source/Core/Core/Src/NetPlayServer.h b/Source/Core/Core/Src/NetPlayServer.h
deleted file mode 100644
index 5349764790..0000000000
--- a/Source/Core/Core/Src/NetPlayServer.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NETPLAY_SERVER_H
-#define _NETPLAY_SERVER_H
-
-#include "Common.h"
-#include "CommonTypes.h"
-#include "Thread.h"
-#include "Timer.h"
-
-#include <SFML/Network.hpp>
-
-#include "NetPlayProto.h"
-
-#include <functional>
-#include <map>
-#include <queue>
-#include <sstream>
-
-class NetPlayServer
-{
-public:
-	void ThreadFunc();
-
-	NetPlayServer(const u16 port);
-	~NetPlayServer();
-
-	bool ChangeGame(const std::string& game);
-	void SendChatMessage(const std::string& msg);
-
-	void SetNetSettings(const NetSettings &settings);
-
-	bool StartGame(const std::string &path);
-
-	void GetPadMapping(PadMapping map[]);
-	void SetPadMapping(const PadMapping map[]);
-
-	void AdjustPadBufferSize(unsigned int size);
-
-	bool is_connected;
-
-#ifdef USE_UPNP
-	void TryPortmapping(u16 port);
-#endif
-
-private:
-	class Client
-	{
-	public:
-		PlayerId		pid;
-		std::string		name;
-		std::string		revision;
-
-		sf::SocketTCP	socket;
-		u32 ping;
-		u32 current_game;
-	};
-
-	void SendToClients(sf::Packet& packet, const PlayerId skip_pid = 0);
-	unsigned int OnConnect(sf::SocketTCP& socket);
-	unsigned int OnDisconnect(sf::SocketTCP& socket);
-	unsigned int OnData(sf::Packet& packet, sf::SocketTCP& socket);
-	void UpdatePadMapping();
-
-	NetSettings     m_settings;
-
-	bool            m_is_running;
-	bool            m_do_loop;
-	Common::Timer	m_ping_timer;
-	u32		m_ping_key;
-	bool            m_update_pings;
-	u32		m_current_game;
-	unsigned int	m_target_buffer_size;
-	PadMapping      m_pad_map[4];
-
-	std::map<sf::SocketTCP, Client>	m_players;
-
-	struct
-	{
-		std::recursive_mutex game;
-		// lock order
-		std::recursive_mutex players, send;
-	} m_crit;
-
-	std::string m_selected_game;
-
-	sf::SocketTCP m_socket;
-	std::thread m_thread;
-	sf::Selector<sf::SocketTCP> m_selector;
-
-#ifdef USE_UPNP
-	static void mapPortThread(const u16 port);
-	static void unmapPortThread();
-
-	static bool initUPnP();
-	static bool UPnPMapPort(const std::string& addr, const u16 port);
-	static bool UPnPUnmapPort(const u16 port);
-
-	static struct UPNPUrls m_upnp_urls;
-	static struct IGDdatas m_upnp_data;
-	static u16 m_upnp_mapped;
-	static bool m_upnp_inited;
-	static bool m_upnp_error;
-	static std::thread m_upnp_thread;
-#endif
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
deleted file mode 100644
index c7d133132b..0000000000
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// PatchEngine
-// Supports simple memory patches, and has a partial Action Replay implementation
-// in ActionReplay.cpp/h.
-
-// TODO: Still even needed?  Zelda WW now works with improved DSP code.
-// Zelda item hang fixes:
-// [Tue Aug 21 2007] [18:30:40] <Knuckles->    0x802904b4 in US released
-// [Tue Aug 21 2007] [18:30:53] <Knuckles->    0x80294d54 in EUR Demo version
-// [Tue Aug 21 2007] [18:31:10] <Knuckles->    we just patch a blr on it (0x4E800020)
-// [OnLoad]
-// 0x80020394=dword,0x4e800020
-
-#include <string>
-#include <vector>
-#include <map>
-#include <algorithm>
-
-#include "CommonPaths.h"
-#include "StringUtil.h"
-#include "PatchEngine.h"
-#include "HW/Memmap.h"
-#include "ActionReplay.h"
-#include "GeckoCode.h"
-#include "GeckoCodeConfig.h"
-#include "FileUtil.h"
-
-using namespace Common;
-
-namespace PatchEngine
-{
-
-const char *PatchTypeStrings[] = 
-{
-	"byte",
-	"word",
-	"dword",
-};
-
-std::vector<Patch> onFrame;
-std::map<u32, int> speedHacks;
-std::vector<std::string> discList;
-
-void LoadPatchSection(const char *section, std::vector<Patch> &patches,
-                      IniFile &globalIni, IniFile &localIni)
-{
-	// Load the name of all enabled patches
-	std::string enabledSectionName = std::string(section) + "_Enabled";
-	std::vector<std::string> enabledLines;
-	std::set<std::string> enabledNames;
-	localIni.GetLines(enabledSectionName.c_str(), enabledLines);
-	for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter)
-	{
-		const std::string& line = *iter;
-		if (line.size() != 0 && line[0] == '$')
-		{
-			std::string name = line.substr(1, line.size() - 1);
-			enabledNames.insert(name);
-		}
-	}
-
-	IniFile* inis[] = {&globalIni, &localIni};
-
-	for (size_t i = 0; i < ArraySize(inis); ++i)
-	{
-		std::vector<std::string> lines;
-		Patch currentPatch;
-		inis[i]->GetLines(section, lines);
-
-		for (auto iter = lines.begin(); iter != lines.end(); ++iter)
-		{
-			std::string line = *iter;
-
-			if (line.size() == 0)
-				continue;
-
-			if (line[0] == '$')
-			{
-				// Take care of the previous code
-				if (currentPatch.name.size())
-					patches.push_back(currentPatch);
-				currentPatch.entries.clear();
-
-				// Set active and name
-				currentPatch.name = line.substr(1, line.size() - 1);
-				currentPatch.active = enabledNames.find(currentPatch.name) != enabledNames.end();
-				currentPatch.user_defined = (i == 1);
-			}
-			else
-			{
-				std::string::size_type loc = line.find_first_of('=', 0);
-
-				if (loc != std::string::npos)
-					line[loc] = ':';
-
-				std::vector<std::string> items;
-				SplitString(line, ':', items);
-
-				if (items.size() >= 3)
-				{
-					PatchEntry pE;
-					bool success = true;
-					success &= TryParse(items[0], &pE.address);
-					success &= TryParse(items[2], &pE.value);
-
-					pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
-					success &= (pE.type != (PatchType)3);
-					if (success)
-						currentPatch.entries.push_back(pE);
-				}
-			}
-		}
-
-		if (currentPatch.name.size() && currentPatch.entries.size())
-			patches.push_back(currentPatch);
-	}
-}
-
-static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini)
-{
-	std::vector<std::string> lines;
-	if (!ini.GetLines(section, lines))
-		return;
-
-	for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
-	{
-		std::string line = *iter;
-		if (line.size())
-			_discList.push_back(line);
-	}
-}
-
-static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFile &ini)
-{
-	std::vector<std::string> keys;
-	ini.GetKeys(section, keys);
-	for (std::vector<std::string>::const_iterator iter = keys.begin(); iter != keys.end(); ++iter)
-	{
-		std::string key = *iter;
-		std::string value;
-		ini.Get(section, key.c_str(), &value, "BOGUS");
-		if (value != "BOGUS")
-		{
-			u32 address;
-			u32 cycles;
-			bool success = true;
-			success &= TryParse(key, &address);
-			success &= TryParse(value, &cycles);
-			if (success) {
-				speedHacks[address] = (int)cycles;
-			}
-		}
-	}
-}
-
-int GetSpeedhackCycles(const u32 addr)
-{
-	std::map<u32, int>::const_iterator iter = speedHacks.find(addr);
-	if (iter == speedHacks.end())
-		return 0;
-	else
-		return iter->second;
-}
-
-void LoadPatches(const char *gameID)
-{
-	IniFile globalIni, localIni;
-	globalIni.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini");
-	localIni.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true);
-
-	IniFile merged;
-	merged.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini");
-	merged.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true);
-
-	LoadPatchSection("OnFrame", onFrame, globalIni, localIni);
-	ActionReplay::LoadCodes(globalIni, localIni, false);
-
-	// lil silly
-	std::vector<Gecko::GeckoCode> gcodes;
-	Gecko::LoadCodes(localIni, gcodes);
-	Gecko::SetActiveCodes(gcodes);
-
-	LoadSpeedhacks("Speedhacks", speedHacks, merged);
-	LoadDiscList("DiscList", discList, merged);
-}
-
-void ApplyPatches(const std::vector<Patch> &patches)
-{
-	for (std::vector<Patch>::const_iterator iter = patches.begin(); iter != patches.end(); ++iter)
-	{
-		if (iter->active)
-		{
-			for (std::vector<PatchEntry>::const_iterator iter2 = iter->entries.begin(); iter2 != iter->entries.end(); ++iter2)
-			{
-				u32 addr = iter2->address;
-				u32 value = iter2->value;
-				switch (iter2->type)
-				{
-				case PATCH_8BIT:
-					Memory::Write_U8((u8)value, addr);
-					break;
-				case PATCH_16BIT:
-					Memory::Write_U16((u16)value, addr);
-					break;
-				case PATCH_32BIT:
-					Memory::Write_U32(value, addr);
-					break;
-				default:
-					//unknown patchtype
-					break;
-				}
-			}
-		}
-	}
-}
-
-void ApplyFramePatches() 
-{
-	ApplyPatches(onFrame);
-
-	// Run the Gecko code handler
-	Gecko::RunCodeHandler();
-}
-
-void ApplyARPatches()
-{
-	ActionReplay::RunAllActive();
-}
-
-void Shutdown()
-{
-	onFrame.clear();
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PatchEngine.h b/Source/Core/Core/Src/PatchEngine.h
deleted file mode 100644
index 13de073eb9..0000000000
--- a/Source/Core/Core/Src/PatchEngine.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PATCHENGINE_H
-#define _PATCHENGINE_H
-
-#include "IniFile.h"
-
-namespace PatchEngine
-{
-
-enum PatchType
-{
-	PATCH_8BIT,
-	PATCH_16BIT,
-	PATCH_32BIT,
-};
-
-extern const char *PatchTypeStrings[];
-
-struct PatchEntry
-{
-	PatchEntry() {}
-	PatchEntry(PatchType _t, u32 _addr, u32 _value) : type(_t), address(_addr), value(_value) {}
-	PatchType type;
-	u32 address;
-	u32 value;
-};
-
-struct Patch
-{
-	std::string name;
-	std::vector<PatchEntry> entries;
-	bool active;
-	bool user_defined; // False if this code is shipped with Dolphin.
-};
-
-int GetSpeedhackCycles(const u32 addr);
-void LoadPatchSection(const char *section, std::vector<Patch> &patches,
-                      IniFile &globalIni, IniFile &localIni);
-void LoadPatches(const char *gameID);
-void ApplyFramePatches();
-void ApplyARPatches();
-void Shutdown();
-
-inline int GetPatchTypeCharLength(PatchType type)
-{
-	int size = 8;
-	switch (type)
-	{
-	case PatchEngine::PATCH_8BIT:
-		size = 2;
-		break;
-
-	case PatchEngine::PATCH_16BIT:
-		size = 4;
-		break;
-
-	case PatchEngine::PATCH_32BIT:
-		size = 8;
-		break;
-	}
-	return size;
-}
-
-}  // namespace
-
-#endif //_PATCHENGINE_H
diff --git a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h b/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
deleted file mode 100644
index c8465f7707..0000000000
--- a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CPUCOREBASE_H
-#define _CPUCOREBASE_H
-
-class CPUCoreBase
-{
-public:
-	virtual ~CPUCoreBase() {}
-
-	virtual void Init() = 0;
-	virtual void Shutdown() = 0;
-	virtual void ClearCache() = 0;
-	virtual void Run() = 0;
-	virtual void SingleStep() = 0;
-	virtual const char *GetName() = 0;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/GDBStub.h b/Source/Core/Core/Src/PowerPC/GDBStub.h
deleted file mode 100644
index 300f74bf91..0000000000
--- a/Source/Core/Core/Src/PowerPC/GDBStub.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (C) 2010 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
-
-#ifndef GDB_H__
-#define GDB_H__
-
-#include <signal.h>
-#include "Common.h"
-#include "Thread.h"
-#include "PowerPC.h"
-#include "../HW/CPU.h"
-#include "../HW/Memmap.h"
-
-#ifdef _WIN32
-#define SIGTRAP 5
-#define	SIGTERM		15
-#define MSG_WAITALL  8
-#endif
-
-typedef enum {
-	GDB_BP_TYPE_NONE = 0,
-	GDB_BP_TYPE_X,
-	GDB_BP_TYPE_R,
-	GDB_BP_TYPE_W,
-	GDB_BP_TYPE_A
-} gdb_bp_type;
-
-void gdb_init(u32 port);
-void gdb_deinit();
-bool gdb_active();
-void gdb_break();
-
-void gdb_handle_exception();
-int  gdb_signal(u32 signal);
-
-int  gdb_bp_x(u32 addr);
-int  gdb_bp_r(u32 addr);
-int  gdb_bp_w(u32 addr);
-int  gdb_bp_a(u32 addr);
-
-bool gdb_add_bp(u32 type, u32 addr, u32 len);
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Gekko.h b/Source/Core/Core/Src/PowerPC/Gekko.h
deleted file mode 100644
index 3dd2def297..0000000000
--- a/Source/Core/Core/Src/PowerPC/Gekko.h
+++ /dev/null
@@ -1,722 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Gekko related unions, structs, ...
-
-#ifndef _GEKKO_H
-#define _GEKKO_H
-
-#include "Common.h"
-
-
-// --- Gekko Instruction ---
-
-
-union UGeckoInstruction
-{
-	u32 hex;
-
-	UGeckoInstruction(u32 _hex)	{ hex = _hex;}
-	UGeckoInstruction()			{ hex = 0;}
-
-	struct
-	{
-		u32 Rc		:	1;
-		u32 SUBOP10	:	10;
-		u32 RB		:	5;
-		u32 RA		:	5;
-		u32 RD		:	5;
-		u32 OPCD	:	6;
-	}; // changed
-	struct
-	{
-		signed SIMM_16	:	16;
-		u32 			:	5;
-		u32 TO			:	5;
-		u32 OPCD_2		:	6;
-	};
-	struct
-	{
-		u32 Rc_2	:	1;
-		u32			:	10;
-		u32 		:	5;
-		u32 		:	5;
-		u32 RS		:	5;
-		u32 OPCD_3	:	6;
-	};
-	struct
-	{
-		u32 UIMM	:	16;
-		u32 		:	5;
-		u32 		:	5;
-		u32 OPCD_4	:	6;
-	};
-	struct
-	{
-		u32 LK		:	1;
-		u32 AA		:	1;
-		u32 LI		:	24;
-		u32 OPCD_5	:	6;
-	};
-	struct
-	{     
-		u32 LK_2	:	1;
-		u32 AA_2	:	1;
-		u32 BD		:	14;
-		u32 BI		:	5;
-		u32 BO		:	5;
-		u32 OPCD_6	:	6;
-	};
-	struct
-	{
-		u32 LK_3	:	1;
-		u32			:	10;
-		u32			:	5;
-		u32 BI_2	:	5;
-		u32 BO_2	:	5;
-		u32 OPCD_7	:	6;
-	};
-	struct
-	{
-		u32			:	11;
-		u32 RB_2	:	5;
-		u32 RA_2	:	5;
-		u32 L		:	1;
-		u32 		:	1;
-		u32 CRFD	:	3;
-		u32 OPCD_8	:	6;
-	};
-	struct
-	{
-		signed  SIMM_16_2	:	16;
-		u32 RA_3	:	5;
-		u32 L_2		:	1;
-		u32			:	1;
-		u32 CRFD_2	:	3;
-		u32 OPCD_9	:	6;
-	};
-	struct
-	{     
-		u32 UIMM_2	:	16;
-		u32 RA_4	:	5;
-		u32 L_3		:	1;
-		u32 dummy2	:	1;
-		u32 CRFD_3	:	3;
-		u32 OPCD_A	:	6;
-	};
-	struct
-	{
-		u32			:	1;
-		u32 SUBOP10_2:	10;
-		u32 RB_5	:	5;
-		u32 RA_5	:	5;
-		u32 L_4		:	1;
-		u32 dummy3	:	1;
-		u32 CRFD_4	:	3;
-		u32 OPCD_B	:	6;
-	};
-	struct
-	{
-		u32			:	16;
-		u32 SR		:	4;
-		u32 		:	1;
-		u32 RS_2	:	5;
-		u32 OPCD_C	:	6;
-	};
-
-	// Table 59
-	struct
-	{
-		u32 Rc_4	:	1;
-		u32 SUBOP5	:	5;
-		u32 RC		:	5;
-		u32			:	5;
-		u32 RA_6	:	5;
-		u32 RD_2	:	5;
-		u32 OPCD_D	:	6;
-	};
-
-	struct
-	{	u32			:	10;
-		u32 OE		:	1;
-		u32 SPR		:	10;
-		u32			:	11;
-	};
-	struct
-	{
-		u32			:	10;
-		u32 OE_3	:	1;
-		u32 SPRU	:	5;
-		u32 SPRL	:	5;
-		u32			:	11;
-	};
-
-	// rlwinmx
-	struct
-	{
-		u32 Rc_3	:	1;
-		u32 ME		:	5;
-		u32 MB		:	5;
-		u32 SH		:	5;
-		u32			:	16;
-	};
-
-	// crxor
-	struct 
-	{
-		u32			:	11;
-		u32 CRBB	:	5;
-		u32 CRBA	:	5;
-		u32 CRBD	:	5;
-		u32			:	6;
-	};
-
-	// mftb
-	struct 
-	{
-		u32			:	11;
-		u32 TBR		:	10;
-		u32			:	11;
-	};
-
-	struct 
-	{
-		u32			:	11;
-		u32 TBRU	:	5;
-		u32 TBRL	:	5;
-		u32			:	11;
-	};
-
-	struct 
-	{
-		u32			:	18;
-		u32 CRFS	:	3;
-		u32 		:	2;
-		u32 CRFD_5	:	3;
-		u32			:	6;
-	};
-
-	// float
-	struct 
-	{
-		u32			:	12;
-		u32 CRM		:	8;
-		u32			:	1;
-		u32 FD		:	5;
-		u32			:	6;
-	};
-	struct 
-	{
-		u32			:	6;
-		u32 FC		:	5;
-		u32 FB		:	5;
-		u32 FA		:	5;
-		u32 FS		:	5;
-		u32			:	6;
-	};
-	struct 
-	{
-		u32 OFS		:	16;
-		u32			:	16;
-	};
-	struct
-	{
-		u32			:	17;
-		u32 FM		:	8;
-		u32			:	7;
-	};
-
-	// paired
-	struct 
-	{
-		u32			:	7;
-		u32 Ix		:	3;
-		u32 Wx		:	1;
-		u32			:	1;
-		u32 I		:	3;
-		u32 W		:	1;
-		u32			:	16;
-	};
-
-	struct 
-	{
-		signed	SIMM_12	:	12;
-		u32				:	20;
-	};
-
-	struct 
-	{
-		u32 dummyX	:   11;
-		u32 NB		: 5;
-	};
-};
-
-
-//
-// --- Gekko Special Registers ---
-//
-
-
-// GQR Register
-union UGQR
-{
-	u32 Hex;
-	struct 
-	{
-		u32	ST_TYPE		: 3;
-		u32				: 5;
-		u32	ST_SCALE	: 6;
-		u32				: 2;
-		u32	LD_TYPE		: 3;
-		u32				: 5;
-		u32	LD_SCALE	: 6;
-		u32				: 2;
-	};
-
-	UGQR(u32 _hex) { Hex = _hex; }
-	UGQR()		{Hex = 0;  }
-};
-
-// FPU Register
-union UFPR
-{
-	u64	as_u64;
-	s64	as_s64;
-	double	d;
-	u32	as_u32[2];
-	s32	as_s32[2];
-	float	f[2];
-};
-
-#define XER_CA_MASK 0x20000000
-#define XER_OV_MASK 0x40000000
-#define XER_SO_MASK 0x80000000
-// XER
-union UReg_XER
-{
-	struct 
-	{
-		u32 BYTE_COUNT	: 7;
-		u32				: 22;
-		u32 CA			: 1;
-		u32 OV			: 1;
-		u32 SO			: 1;
-	};
-	u32 Hex;
-
-	UReg_XER(u32 _hex) { Hex = _hex; }
-	UReg_XER()		{ Hex = 0; }
-};
-
-// Machine State Register
-union UReg_MSR
-{
-	struct
-	{
-		u32 LE		:	1;
-		u32 RI		:	1;
-		u32 PM		:	1;
-		u32 		:	1; // res28
-		u32 DR		:	1;
-		u32 IR		:	1;
-		u32 IP		:	1;
-		u32 		:	1; // res24
-		u32 FE1		:	1;
-		u32 BE	 	:	1;
-		u32 SE  	:	1;
-		u32 FE0		:	1;
-		u32 MCHECK	:	1;
-		u32 FP		:	1;
-		u32 PR		:	1;
-		u32 EE		:	1;
-		u32 ILE		:	1;
-		u32			:	1; // res14
-		u32 POW		:	1;
-		u32 res		:	13;
-	};
-	u32 Hex;
-
-	UReg_MSR(u32 _hex) { Hex = _hex; }
-	UReg_MSR()		{ Hex = 0; }
-};
-
-// Floating Point Status and Control Register
-union UReg_FPSCR
-{
-	struct
-	{
-		u32 RN		:	2;
-		u32 NI		:	1;
-		u32 XE		:	1;
-		u32 ZE		:	1;
-		u32 UE		:	1;
-		u32 OE		:	1;
-		u32 VE		:	1;
-		u32 VXCVI	:	1;
-		u32 VXSQRT	:	1;
-		u32 VXSOFT	:	1;
-		u32			:	1;
-		u32 FPRF	:	5;
-		u32 FI		:	1;
-		u32 FR		:	1;
-		u32 VXVC	:	1;
-		u32 VXIMZ	:	1;
-		u32 VXZDZ	:	1;
-		u32 VXIDI	:	1;
-		u32 VXISI	:	1;
-		u32 VXSNAN	:	1;
-		u32 XX		:	1;
-		u32 ZX		:	1;
-		u32 UX		:	1;
-		u32 OX		:	1;
-		u32 VX		:	1;
-		u32 FEX		:	1;
-		u32 FX		:	1;
-	};
-	u32 Hex;
-
-	UReg_FPSCR(u32 _hex)	{ Hex = _hex; }
-	UReg_FPSCR()		{ Hex = 0;}
-};
-
-// Hardware Implementation-Dependent Register 0
-union UReg_HID0
-{
-	struct
-	{
-		u32 NOOPTI	:	1;
-		u32			:	1;
-		u32 BHT		:	1;
-		u32 ABE		:	1;
-		u32			:	1;
-		u32 BTIC	:	1;
-		u32 DCFA	:	1;
-		u32 SGE		:	1;
-		u32 IFEM	:	1;
-		u32 SPD		:	1;
-		u32 DCFI	:	1;
-		u32 ICFI	:	1;
-		u32 DLOCK	:	1;
-		u32 ILOCK	:	1;
-		u32 DCE		:	1;
-		u32 ICE		:	1;
-		u32 NHR		:	1;
-		u32			:	3;
-		u32 DPM		:	1;
-		u32 SLEEP	:	1;
-		u32 NAP		:	1;
-		u32 DOZE	:	1;
-		u32 PAR		:	1;
-		u32 ECLK	:	1;
-		u32			:	1;
-		u32 BCLK	:	1;
-		u32 EBD		:	1;
-		u32 EBA		:	1;
-		u32 DBP		:	1;
-		u32 EMCP	:	1;
-	};
-	u32 Hex;
-};
-
-// Hardware Implementation-Dependent Register 2
-union UReg_HID2
-{
-	struct
-	{
-		u32			:	16;
-		u32 DQOMEE	:	1;
-		u32 DCMEE	:	1;
-		u32 DNCEE	:	1;
-		u32 DCHEE	:	1;
-		u32 DQOERR	:	1;
-		u32 DCEMERR	:	1;
-		u32 DNCERR	:	1;
-		u32 DCHERR	:	1;
-		u32 DMAQL	:	4;
-		u32 LCE		:	1;
-		u32 PSE		:	1;
-		u32 WPE		:	1;
-		u32 LSQE	:	1;
-	};
-	u32 Hex;
-
-	UReg_HID2(u32 _hex)	{ Hex = _hex; }
-	UReg_HID2()			{ Hex = 0; }
-};
-
-// Hardware Implementation-Dependent Register 4
-union UReg_HID4
-{
-	struct
-	{
-		u32			:	20;
-		u32 L2CFI	:	1;
-		u32 L2MUM	:	1;
-		u32 DBP		:	1;
-		u32 LPE		:	1;
-		u32 ST0		:	1;
-		u32 SBE		:	1;
-		u32			:	1;
-		u32 BPD		:	2;
-		u32 L2FM	:	2;
-		u32			:	1;
-	};
-	u32 Hex;
-
-	UReg_HID4(u32 _hex)	{ Hex = _hex; }
-	UReg_HID4()			{ Hex = 0; }
-};
-
-// SPR1 - Page Table format
-union UReg_SPR1
-{
-	u32 Hex;
-	struct 
-	{
-		u32	htaborg		:	16;
-		u32				:	7;
-		u32	htabmask	:	9;
-	};
-};
-
-// MMCR0 - Monitor Mode Control Register 0 format
-union UReg_MMCR0
-{
-	u32 Hex;
-	struct
-	{
-		u32	PMC2SELECT		:	6;
-		u32	PMC1SELECT		:	7;
-		u32	PMCTRIGGER		:	1;
-		u32	PMCINTCONTROL	:	1;
-		u32	PMC1INTCONTROL	:	1;
-		u32	THRESHOLD		:	6;
-		u32	INTONBITTRANS	:	1;
-		u32	RTCSELECT		:	2;
-		u32	DISCOUNT		:	1;
-		u32	ENINT			:	1;
-		u32	DMR				:	1;
-		u32	DMS				:	1;
-		u32	DU				:	1;
-		u32	DP				:	1;
-		u32	DIS				:	1;
-	};
-};
-
-// MMCR1 - Monitor Mode Control Register 1 format
-union UReg_MMCR1
-{
-	u32 Hex;
-	struct
-	{
-		u32				:	22;
-		u32	PMC4SELECT	:	5;
-		u32	PMC3SELECT	:	5;
-	};
-};
-
-// Write Pipe Address Register
-union UReg_WPAR
-{
-	struct
-	{
-		u32 BNE		: 1;
-		u32			: 4;
-		u32 GB_ADDR	: 27;
-	};
-	u32 Hex;
-
-	UReg_WPAR(u32 _hex)	{ Hex = _hex; }
-	UReg_WPAR()			{ Hex = 0; }
-};
-
-// Direct Memory Access Upper register
-union UReg_DMAU
-{
-	struct
-	{
-		u32 DMA_LEN_U	:	5;
-		u32 MEM_ADDR	:	27;
-	};
-	u32 Hex;
-
-	UReg_DMAU(u32 _hex)	{ Hex = _hex; }
-	UReg_DMAU()			{ Hex = 0; }
-};
-
-// Direct Memory Access Lower (DMAL) register
-union UReg_DMAL
-{
-	struct
-	{
-		u32 DMA_F		:	1;
-		u32 DMA_T		:	1;
-		u32 DMA_LEN_L	:	2;
-		u32 DMA_LD		:	1;
-		u32 LC_ADDR		:	27;
-	};
-	u32 Hex;
-
-	UReg_DMAL(u32 _hex)	{ Hex = _hex; }
-	UReg_DMAL()			{ Hex = 0; }
-};
-
-union UReg_BAT_Up
-{
-	struct 
-	{
-		u32 VP			:	1;
-		u32 VS			:	1;
-		u32 BL			:	11; // Block length (aka block size mask)
-		u32				:	4;
-		u32 BEPI		:	15;
-	};
-	u32 Hex;
-
-	UReg_BAT_Up(u32 _hex)	{ Hex = _hex; }
-	UReg_BAT_Up()		{ Hex = 0; }
-};
-
-union UReg_BAT_Lo
-{
-	struct 
-	{
-		u32 PP			:	2;
-		u32				:	1;
-		u32 WIMG		:	4;
-		u32				:	10;
-		u32 BRPN		:	15; // Physical Block Number
-	};
-	u32 Hex;
-
-	UReg_BAT_Lo(u32 _hex)	{ Hex = _hex; }
-	UReg_BAT_Lo()		{ Hex = 0; }
-};
-
-union UReg_PTE
-{
-	struct 
-	{
-		u64 API			:	6;
-		u64 H			:	1;
-		u64 VSID		:	24;
-		u64 V			:	1;
-		u64 PP			:	2;
-		u64				:	1;
-		u64 WIMG		:	4;
-		u64 C			:	1;
-		u64 R			:	1;
-		u64				:	3;
-		u64 RPN			:	20;
-
-	};
-
-	u64 Hex;
-	u32 Hex32[2];
-};
-
-
-//
-// --- Gekko Types and Defs ---
-//
-
-
-// quantize types
-enum EQuantizeType
-{
-	QUANTIZE_FLOAT	=	0,
-	QUANTIZE_U8		=	4,
-	QUANTIZE_U16	=	5,
-	QUANTIZE_S8		=	6,
-	QUANTIZE_S16	=	7,
-};
-
-// branches
-enum 
-{
-	BO_BRANCH_IF_CTR_0		=  2, // 3
-	BO_DONT_DECREMENT_FLAG	=  4, // 2
-	BO_BRANCH_IF_TRUE		=  8, // 1
-	BO_DONT_CHECK_CONDITION	= 16, // 0
-};
-
-// Special purpose register indices
-enum
-{
-	SPR_XER   = 1,
-	SPR_LR    = 8,
-	SPR_CTR   = 9,
-	SPR_DSISR = 18,
-	SPR_DAR   = 19,
-	SPR_DEC   = 22,
-	SPR_SDR   = 25,
-	SPR_SRR0  = 26,
-	SPR_SRR1  = 27,
-	SPR_TL    = 268,
-	SPR_TU    = 269,
-	SPR_TL_W  = 284,
-	SPR_TU_W  = 285,
-	SPR_PVR   = 287,
-	SPR_SPRG0 = 272,
-	SPR_SPRG1 = 273,
-	SPR_SPRG2 = 274,
-	SPR_SPRG3 = 275,
-	SPR_EAR   = 282,
-	SPR_IBAT0U  = 528,
-	SPR_IBAT0L  = 529,
-	SPR_IBAT1U  = 530,
-	SPR_IBAT1L  = 531,
-	SPR_IBAT2U  = 532,
-	SPR_IBAT2L  = 533,
-	SPR_IBAT3U  = 534,
-	SPR_IBAT3L  = 535,
-	SPR_DBAT0U  = 536,
-	SPR_DBAT0L  = 537,
-	SPR_DBAT1U  = 538,
-	SPR_DBAT1L  = 539,
-	SPR_DBAT2U  = 540,
-	SPR_DBAT2L  = 541,
-	SPR_DBAT3U  = 542,
-	SPR_DBAT3L  = 543,
-	SPR_GQR0  = 912,
-	SPR_HID0  = 1008,
-	SPR_HID1  = 1009,
-	SPR_HID2  = 920,
-	SPR_HID4  = 1011,
-	SPR_WPAR  = 921,
-	SPR_DMAU  = 922,
-	SPR_DMAL  = 923,
-	SPR_ECID_U = 924,
-	SPR_ECID_M = 925,
-	SPR_ECID_L = 926,
-	SPR_L2CR  = 1017,
-
-	SPR_UMMCR0 = 936,
-	SPR_MMCR0 = 952,
-	SPR_PMC1 = 953,
-	SPR_PMC2 = 954,
-
-	SPR_UMMCR1 = 940,
-	SPR_MMCR1 = 956,
-	SPR_PMC3 = 957,
-	SPR_PMC4 = 958,
-};
-
-// Exceptions
-#define EXCEPTION_DECREMENTER			0x00000001
-#define EXCEPTION_SYSCALL				0x00000002
-#define EXCEPTION_EXTERNAL_INT			0x00000004
-#define EXCEPTION_DSI					0x00000008
-#define EXCEPTION_ISI					0x00000010
-#define EXCEPTION_ALIGNMENT				0x00000020
-#define EXCEPTION_FPU_UNAVAILABLE		0x00000040
-#define EXCEPTION_PROGRAM				0x00000080
-#define EXCEPTION_PERFORMANCE_MONITOR	0x00000100
-
-inline s32 SignExt16(s16 x) {return (s32)(s16)x;}
-inline s32 SignExt26(u32 x) {return x & 0x2000000 ? (s32)(x | 0xFC000000) : (s32)(x);}
-
-#endif
-
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
deleted file mode 100644
index a99eab7cea..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../../HW/Memmap.h"
-#include "../../HW/CPU.h"
-#include "../../Host.h"
-#include "../PPCTables.h"
-#include "Interpreter.h"
-#include "../../Debugger/Debugger_SymbolMap.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
-#include "PowerPCDisasm.h"
-#include "../../IPC_HLE/WII_IPC_HLE.h"
-#include "Atomic.h"
-#include "HLE/HLE.h"
-
-#ifdef USE_GDBSTUB
-#include "../GDBStub.h"
-#endif
-
-
-namespace {
-	u32 last_pc;
-}
-
-bool Interpreter::m_EndBlock;
-
-// function tables
-Interpreter::_interpreterInstruction Interpreter::m_opTable[64];
-Interpreter::_interpreterInstruction Interpreter::m_opTable4[1024];
-Interpreter::_interpreterInstruction Interpreter::m_opTable19[1024];
-Interpreter::_interpreterInstruction Interpreter::m_opTable31[1024];
-Interpreter::_interpreterInstruction Interpreter::m_opTable59[32];
-Interpreter::_interpreterInstruction Interpreter::m_opTable63[1024];
-
-void Interpreter::RunTable4(UGeckoInstruction _inst)  {m_opTable4 [_inst.SUBOP10](_inst);}
-void Interpreter::RunTable19(UGeckoInstruction _inst) {m_opTable19[_inst.SUBOP10](_inst);}
-void Interpreter::RunTable31(UGeckoInstruction _inst) {m_opTable31[_inst.SUBOP10](_inst);}
-void Interpreter::RunTable59(UGeckoInstruction _inst) {m_opTable59[_inst.SUBOP5 ](_inst);}
-void Interpreter::RunTable63(UGeckoInstruction _inst) {m_opTable63[_inst.SUBOP10](_inst);}
-
-void Interpreter::Init()
-{
-	g_bReserve = false;
-	m_EndBlock = false;
-}
-
-void Interpreter::Shutdown()
-{
-}
-
-static void patches()
-{
-/*	if (Memory::Read_U16(0x90000880) == 0x130b)
-	{
-		PanicAlert("Memory::Read_U16(0x900008800) == 0x130b");
-	}
-*/
-/*	if (PC == 0x80074cd4)
-	{
-		u16 command = Common::swap16(Memory::Read_U16(PowerPC::ppcState.gpr[3] + 8));
-		if (command == 0x0b13)
-		{
-			PanicAlert("command: %x", command);
-		}
-	}*/
-}
-
-int startTrace = 0;
-
-void Trace( UGeckoInstruction &instCode )
-{
-	char reg[25]="";
-	std::string regs = "";
-	for (int i=0; i<32; i++)
-	{
-		sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
-		regs.append(reg);
-	}
-
-	char freg[25]="";
-	std::string fregs = "";
-	for (int i=0; i<32; i++)
-	{
-		sprintf(freg, "f%02d: %08llx %08llx ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]);
-		fregs.append(freg);
-	}
-
-	char ppcInst[256];
-	DisassembleGekko(instCode.hex, PC, ppcInst, 256);
-
-	DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s %08x %s", PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str(), instCode.hex, ppcInst);
-}
-
-int Interpreter::SingleStepInner(void)
-{
-	static UGeckoInstruction instCode;
-	u32 function = m_EndBlock ? HLE::GetFunctionIndex(PC) : 0; // Check for HLE functions after branches
-	if (function != 0)
-	{
-		int type = HLE::GetFunctionTypeByIndex(function);
-		if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
-		{
-			int flags = HLE::GetFunctionFlagsByIndex(function);
-			if (HLE::IsEnabled(flags))
-			{
-				HLEFunction(function);
-				if (type == HLE::HLE_HOOK_START)
-				{
-					// Run the original.
-					function = 0;
-				}
-			}
-			else
-			{
-				function = 0;
-			}
-		}
-	}
-
-	if (function == 0)
-	{
-		#ifdef USE_GDBSTUB
-		if (gdb_active() && gdb_bp_x(PC)) {
-
-			Host_UpdateDisasmDialog();
-
-			gdb_signal(SIGTRAP);
-			gdb_handle_exception();
-		}
-		#endif
-
-		NPC = PC + sizeof(UGeckoInstruction);
-		instCode.hex = Memory::Read_Opcode(PC);
-
-		// Uncomment to trace the interpreter
-		//if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624)
-		//	startTrace = 1;
-		//else
-		//	startTrace = 0;
-
-		if (startTrace)
-		{
-			Trace(instCode);
-		}
-
-		if (instCode.hex != 0)
-		{
-			UReg_MSR& msr = (UReg_MSR&)MSR;
-			if (msr.FP)  //If FPU is enabled, just execute
-			{
-				m_opTable[instCode.OPCD](instCode);
-				if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-				{
-					PowerPC::CheckExceptions();
-					m_EndBlock = true;
-				}
-			}
-			else
-			{
-				// check if we have to generate a FPU unavailable exception
-				if (!PPCTables::UsesFPU(instCode))
-				{
-					m_opTable[instCode.OPCD](instCode);
-					if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-					{
-						PowerPC::CheckExceptions();
-						m_EndBlock = true;
-					}
-				}
-				else
-				{
-					Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE);
-					PowerPC::CheckExceptions();
-					m_EndBlock = true;
-				}
-			}
-		}
-		else
-		{
-			// Memory exception on instruction fetch
-			PowerPC::CheckExceptions();
-			m_EndBlock = true;
-		}
-	}
-	last_pc = PC;
-	PC = NPC;
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (PowerPC::ppcState.gpr[1] == 0)
-	{
-		WARN_LOG(POWERPC, "%i Corrupt stack", PowerPC::ppcState.DebugCount);
-	}
-	PowerPC::ppcState.DebugCount++;
-#endif
-	patches();
-
-	GekkoOPInfo *opinfo = GetOpInfo(instCode);
-	return opinfo->numCyclesMinusOne + 1;
-}
-
-void Interpreter::SingleStep()
-{
-	SingleStepInner();
-
-	CoreTiming::slicelength = 1;
-	CoreTiming::downcount = 0;
-	CoreTiming::Advance();
-
-	if (PowerPC::ppcState.Exceptions)
-	{
-		PowerPC::CheckExceptions();
-		PC = NPC;
-	}
-}
-
-//#define SHOW_HISTORY
-#ifdef SHOW_HISTORY
-std::vector <int> PCVec;
-std::vector <int> PCBlockVec;
-int ShowBlocks = 30;
-int ShowSteps = 300;
-#endif
-
-// FastRun - inspired by GCemu (to imitate the JIT so that they can be compared).
-void Interpreter::Run()
-{
-	while (!PowerPC::GetState())
-	{
-		//we have to check exceptions at branches apparently (or maybe just rfi?)
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
-		{
-			#ifdef SHOW_HISTORY
-				PCBlockVec.push_back(PC);
-				if (PCBlockVec.size() > ShowBlocks)
-					PCBlockVec.erase(PCBlockVec.begin());
-			#endif
-
-			// Debugging friendly version of inner loop. Tries to do the timing as similarly to the
-			// JIT as possible. Does not take into account that some instructions take multiple cycles.
-			while (CoreTiming::downcount > 0)
-			{
-				m_EndBlock = false;
-				int i;
-				for (i = 0; !m_EndBlock; i++)
-				{
-					#ifdef SHOW_HISTORY
-						PCVec.push_back(PC);
-						if (PCVec.size() > ShowSteps)
-							PCVec.erase(PCVec.begin());
-					#endif
-
-
-					//2: check for breakpoint
-					if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
-					{
-						#ifdef SHOW_HISTORY
-							NOTICE_LOG(POWERPC, "----------------------------");
-							NOTICE_LOG(POWERPC, "Blocks:");
-							for (int j = 0; j < PCBlockVec.size(); j++)
-								NOTICE_LOG(POWERPC, "PC: 0x%08x", PCBlockVec.at(j));
-							NOTICE_LOG(POWERPC, "----------------------------");
-							NOTICE_LOG(POWERPC, "Steps:");
-							for (int j = 0; j < PCVec.size(); j++)
-							{
-								// Write space
-								if (j > 0)
-									if (PCVec.at(j) != PCVec.at(j-1) + 4)
-										NOTICE_LOG(POWERPC, "");
-
-								NOTICE_LOG(POWERPC, "PC: 0x%08x", PCVec.at(j));
-							}
-						#endif
-						INFO_LOG(POWERPC, "Hit Breakpoint - %08x", PC);
-						CCPU::Break();
-						if (PowerPC::breakpoints.IsTempBreakPoint(PC))
-							PowerPC::breakpoints.Remove(PC);
-
-						Host_UpdateDisasmDialog();
-						return;
-					}
-					SingleStepInner();
-				}
-				CoreTiming::downcount -= i;
-			}
-		}
-		else
-		{
-			// "fast" version of inner loop. well, it's not so fast.
-			while (CoreTiming::downcount > 0)
-			{
-				m_EndBlock = false;
-				int i;
-				int cycles = 0;
-				for (i = 0; !m_EndBlock; i++)
-				{
-					cycles += SingleStepInner();
-				}
-				CoreTiming::downcount -= cycles;
-			}
-		}
-
-		CoreTiming::Advance();
-
-		if (PowerPC::ppcState.Exceptions)
-		{
-			PowerPC::CheckExceptions();
-			PC = NPC;
-		}
-	}
-}
-
-void Interpreter::unknown_instruction(UGeckoInstruction _inst)
-{
-	if (_inst.hex != 0)
-	{
-		char disasm[256];
-		DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256);
-		NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm);
-		Dolphin_Debugger::PrintCallstack();
-		_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x  last_PC = %08x  LR = %08x\n", _inst.hex, PC, last_pc, LR);
-	}
-
-}
-
-void Interpreter::ClearCache()
-{
-	// Do nothing.
-}
-
-const char *Interpreter::GetName()
-{
-#ifdef _M_X64
-		return "Interpreter64";
-#else
-		return "Interpreter32";
-#endif
-}
-
-Interpreter *Interpreter::getInstance()
-{
-	static Interpreter instance;
-	return &instance;
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
deleted file mode 100644
index 16e5dbc635..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _INTERPRETER_FPUTILS_H
-#define _INTERPRETER_FPUTILS_H
-
-#include "../../Core.h"
-#include "Interpreter.h"
-#include "MathUtil.h"
-
-using namespace MathUtil;
-
-// warning! very slow! This setting fixes NAN
-//#define VERY_ACCURATE_FP
-
-#define MIN_SINGLE 0xc7efffffe0000000ull
-#define MAX_SINGLE 0x47efffffe0000000ull
-
-// FPSCR exception flags
-const u32 FPSCR_OX         = (u32)1 << (31 - 3);
-const u32 FPSCR_UX         = (u32)1 << (31 - 4);
-const u32 FPSCR_ZX         = (u32)1 << (31 - 5);
-// ! XX shouldn't be accessed directly to set 1. Use SetFI() instead !
-const u32 FPSCR_XX         = (u32)1 << (31 - 6);
-const u32 FPSCR_VXSNAN     = (u32)1 << (31 - 7);
-const u32 FPSCR_VXISI      = (u32)1 << (31 - 8);
-const u32 FPSCR_VXIDI      = (u32)1 << (31 - 9);
-const u32 FPSCR_VXZDZ      = (u32)1 << (31 - 10);
-const u32 FPSCR_VXIMZ      = (u32)1 << (31 - 11);
-const u32 FPSCR_VXVC       = (u32)1 << (31 - 12);
-const u32 FPSCR_VXSOFT     = (u32)1 << (31 - 21);
-const u32 FPSCR_VXSQRT     = (u32)1 << (31 - 22);
-const u32 FPSCR_VXCVI      = (u32)1 << (31 - 23);
-
-const u32 FPSCR_VX_ANY     = FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI | FPSCR_VXZDZ |
-							 FPSCR_VXIMZ | FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI;
-
-const u32 FPSCR_ANY_X      = FPSCR_OX | FPSCR_UX | FPSCR_ZX | FPSCR_XX | FPSCR_VX_ANY;
-
-const u64 PPC_NAN_U64      = 0x7ff8000000000000ull;
-const double PPC_NAN       = *(double* const)&PPC_NAN_U64;
-
-inline bool IsINF(double x)
-{
-	return ((*(u64*)&x) & ~DOUBLE_SIGN) == DOUBLE_EXP;
-}
-
-inline void SetFPException(u32 mask)
-{
-	if ((FPSCR.Hex & mask) != mask)
-		FPSCR.FX = 1;
-	FPSCR.Hex |= mask;
-}
-
-inline void SetFI(int FI)
-{
-	if (FI)
-	{
-		SetFPException(FPSCR_XX);
-	}
-	FPSCR.FI = FI;
-}
-
-inline void UpdateFPSCR()
-{
-	FPSCR.VX = (FPSCR.Hex & FPSCR_VX_ANY) != 0;
-	FPSCR.FEX = 0; // we assume that "?E" bits are always 0
-}
-
-inline double ForceSingle(double _x)
-{
-	//if (FPSCR.RN != 0)
-	//	PanicAlert("RN = %d at %x", (int)FPSCR.RN, PC);
-	if (FPSCR.NI)
-		_x = FlushToZeroAsFloat(_x);
-
-	double x = static_cast<float>(_x);
-
-	return x;
-}
-
-inline double ForceDouble(double d)
-{
-	//if (FPSCR.RN != 0)
-	//	PanicAlert("RN = %d at %x", (int)FPSCR.RN, PC);
-
-	//if (FPSCR.NI)
-	//{
-	//	IntDouble x; x.d = d;
-		//if ((x.i & DOUBLE_EXP) == 0)
-		//	x.i &= DOUBLE_SIGN;  // turn into signed zero
-	//	return x.d;
-	//}
-	return d;
-}
-
-// these functions allow globally modify operations behaviour
-// also, these may be used to set flags like FR, FI, OX, UX
-
-inline double NI_mul(const double a, const double b)
-{
-#ifdef VERY_ACCURATE_FP
-	if (a != a) return a;
-	if (b != b) return b;
-	double t = a * b;
-	if (t != t)
-	{
-		SetFPException(FPSCR_VXIMZ);
-		return PPC_NAN;
-	}
-	return t;
-#else
-	return a * b;
-#endif
-}
-
-inline double NI_add(const double a, const double b)
-{	
-#ifdef VERY_ACCURATE_FP
-	if (a != a) return a;
-	if (b != b) return b;
-	double t = a + b;
-	if (t != t)
-	{
-		SetFPException(FPSCR_VXISI);
-		return PPC_NAN;
-	}
-	return t;
-#else
-	return a + b;
-#endif
-}
-
-inline double NI_sub(const double a, const double b)
-{	
-#ifdef VERY_ACCURATE_FP
-	if (a != a) return a;
-	if (b != b) return b;
-	double t = a - b;
-	if (t != t)
-	{
-		SetFPException(FPSCR_VXISI);
-		return PPC_NAN;
-	}
-	return t;
-#else
-	return a - b;
-#endif
-}
-
-inline double NI_madd(const double a, const double b, const double c)
-{
-#ifdef VERY_ACCURATE_FP
-	if (a != a) return a;
-	if (c != c) return c;
-	if (b != b) return b;
-	double t = a * b;
-	if (t != t)
-	{
-		SetFPException(FPSCR_VXIMZ);
-		return PPC_NAN;
-	}
-	t = t + c;
-	if (t != t)
-	{
-		SetFPException(FPSCR_VXISI);
-		return PPC_NAN;
-	}
-	return t;
-#else
-	return NI_add(NI_mul(a, b), c);
-#endif
-}
-
-inline double NI_msub(const double a, const double b, const double c)
-{
-//#ifdef VERY_ACCURATE_FP
-//  This code does not produce accurate fp!  NAN's are not calculated correctly, nor negative zero.
-//	The code is kept here for reference.
-//
-//	if (a != a) return a;
-//	if (c != c) return c;
-//	if (b != b) return b;
-//	double t = a * b;
-//	if (t != t)
-//	{
-//		SetFPException(FPSCR_VXIMZ);
-//		return PPC_NAN;
-//	}
-//
-//	t = t - c;
-//	if (t != t)
-//	{
-//		SetFPException(FPSCR_VXISI);
-//		return PPC_NAN;
-//	}
-//	return t;
-//#else
-//	This code does not calculate QNAN's correctly but calculates negative zero correctly.
-	return NI_sub(NI_mul(a, b), c);
-// #endif
-}
-
-// used by stfsXX instructions and ps_rsqrte
-inline u32 ConvertToSingle(u64 x)
-{
-	u32 exp = (x >> 52) & 0x7ff;
-	if (exp > 896 || (x & ~DOUBLE_SIGN) == 0)
-	{
-		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
-	}
-	else if (exp >= 874)
-	{
-		u32 t = (u32)(0x80000000 | ((x & DOUBLE_FRAC) >> 21));
-		t = t >> (905 - exp);
-		t |= (x >> 32) & 0x80000000;
-		return t;
-	}
-	else
-	{
-		// This is said to be undefined.
-		// The code is based on hardware tests.
-		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
-	}
-}
-
-// used by psq_stXX operations. 
-inline u32 ConvertToSingleFTZ(u64 x)
-{
-	u32 exp = (x >> 52) & 0x7ff;
-	if (exp > 896 || (x & ~DOUBLE_SIGN) == 0)
-	{
-		return ((x >> 32) & 0xc0000000) | ((x >> 29) & 0x3fffffff);
-	}
-	else
-	{
-		return (x >> 32) & 0x80000000;
-	}
-}
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
deleted file mode 100644
index 2f4dc4d493..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-#include <limits>
-
-#ifdef _WIN32
-#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
-#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
-#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64
-#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64
-#include <intrin.h>
-#undef _interlockedbittestandset
-#undef _interlockedbittestandreset
-#undef _interlockedbittestandset64
-#undef _interlockedbittestandreset64
-#endif
-
-#include "../../Core.h"
-#include "Interpreter.h"
-#include "MathUtil.h"
-#include "Interpreter_FPUtils.h"
-#include "../LUT_frsqrtex.h"
-
-using namespace MathUtil;
-
-void UpdateSSEState();
-
-// Extremely rare - actually, never seen.
-// Star Wars : Rogue Leader spams that at some point :|
-void Interpreter::Helper_UpdateCR1(double _fValue)
-{
-	// Should just update exception flags, not do any compares.
-	PanicAlert("CR1");
-}
-
-void Interpreter::fcmpo(UGeckoInstruction _inst)
-{
-	double fa = rPS0(_inst.FA);
-	double fb = rPS0(_inst.FB);
-
-	int compareResult;
-
-	if (fa < fb)				compareResult = 8; 
-	else if (fa > fb)           compareResult = 4; 
-	else if (fa == fb)          compareResult = 2;
-	else
-	{
-		FPSCR.FX = 1;
-		compareResult = 1;
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-			if (FPSCR.VE == 0)
-				SetFPException(FPSCR_VXVC);
-		}
-		else
-		{
-			//if (IsQNAN(fa) || IsQNAN(fb)) // this is always true
-			SetFPException(FPSCR_VXVC);
-		}
-	}
-
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);
-}
-
-void Interpreter::fcmpu(UGeckoInstruction _inst)
-{
-	double fa = rPS0(_inst.FA);
-	double fb = rPS0(_inst.FB);
-
-	int compareResult;
-
-	if (fa < fb)            compareResult = 8; 
-	else if (fa > fb)       compareResult = 4; 
-	else if (fa == fb)		compareResult = 2;
-	else
-	{		
-		compareResult = 1; 
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-		}
-	}
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);
-}
-
-// Apply current rounding mode
-void Interpreter::fctiwx(UGeckoInstruction _inst)
-{
-	const double b = rPS0(_inst.FB);
-	u32 value;
-	if (b > (double)0x7fffffff)
-	{
-		value = 0x7fffffff;
-		SetFPException(FPSCR_VXCVI);
-		FPSCR.FI = 0;
-		FPSCR.FR = 0;
-	}
-	else if (b < -(double)0x80000000) 
-	{
-		value = 0x80000000;
-		SetFPException(FPSCR_VXCVI);
-		FPSCR.FI = 0;
-		FPSCR.FR = 0;
-	}
-	else
-	{
-		s32 i = 0;
-		switch (FPSCR.RN)
-		{
-		case 0: // nearest
-			{
-				double t = b + 0.5;
-				i = (s32)t;
-				if (t - i < 0 || (t - i == 0 && b > 0)) i--;
-				break;
-			}
-		case 1: // zero
-			i = (s32)b;
-			break;
-		case 2: // +inf
-			i = (s32)b;
-			if (b - i > 0) i++;
-			break;
-		case 3: // -inf
-			i = (s32)b;
-			if (b - i < 0) i--;
-			break;
-		}
-		value = (u32)i;
-		double di = i;
-		if (di == b)
-		{
-			FPSCR.FI = 0;
-			FPSCR.FR = 0;
-		}
-		else
-		{
-			SetFI(1);
-			FPSCR.FR = fabs(di) > fabs(b);
-		}
-	}	
-	// based on HW tests
-	// FPRF is not affected
-	riPS0(_inst.FD) = 0xfff8000000000000ull | value;
-	if (value == 0 && ( (*(u64*)&b) & DOUBLE_SIGN ))
-		riPS0(_inst.FD) |= 0x100000000ull;
-	if (_inst.Rc)
-		Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// Always round toward zero
-void Interpreter::fctiwzx(UGeckoInstruction _inst)
-{
-	const double b = rPS0(_inst.FB);
-	u32 value;
-	if (b > (double)0x7fffffff)
-	{
-		value = 0x7fffffff;
-		SetFPException(FPSCR_VXCVI);
-		FPSCR.FI = 0;
-		FPSCR.FR = 0;
-	}
-	else if (b < -(double)0x80000000)
-	{
-		value = 0x80000000;
-		SetFPException(FPSCR_VXCVI);
-		FPSCR.FI = 0;
-		FPSCR.FR = 0;
-	}
-	else
-	{
-		s32 i = (s32)b;
-		double di = i;
-		if (di == b)
-		{
-			FPSCR.FI = 0;
-			FPSCR.FR = 0;
-		}
-		else
-		{
-			SetFI(1);
-			FPSCR.FR = fabs(di) > fabs(b);
-		}
-		value = (u32)i;
-	}
-	// based on HW tests
-	// FPRF is not affected
-	riPS0(_inst.FD) = 0xfff8000000000000ull | value;
-	if (value == 0 && ( (*(u64*)&b) & DOUBLE_SIGN ))
-		riPS0(_inst.FD) |= 0x100000000ull;	
-	if (_inst.Rc)
-		Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fmrx(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB);
-	// This is a binary instruction. Does not alter FPSCR
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fabsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = fabs(rPS0(_inst.FB));
-	// This is a binary instruction. Does not alter FPSCR
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fnabsx(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB) | (1ULL << 63);
-	// This is a binary instruction. Does not alter FPSCR
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));	
-}
-
-void Interpreter::fnegx(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB) ^ (1ULL << 63);
-	// This is a binary instruction. Does not alter FPSCR
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fselx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = (rPS0(_inst.FA) >= -0.0) ? rPS0(_inst.FC) : rPS0(_inst.FB);
-	// This is a binary instruction. Does not alter FPSCR
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// !!! warning !!!
-// PS1 must be set to the value of PS0 or DragonballZ will be f**ked up
-// PS1 is said to be undefined
-void Interpreter::frspx(UGeckoInstruction _inst)  // round to single
-{
-	double b = rPS0(_inst.FB);
-	double rounded = ForceSingle(b);
-	SetFI(b != rounded);
-	FPSCR.FR = fabs(rounded) > fabs(b);
-	UpdateFPRF(rounded);
-	rPS0(_inst.FD) = rPS1(_inst.FD) = rounded;
-	return;
-}
-
-
-void Interpreter::fmulx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(NI_mul(rPS0(_inst.FA), rPS0(_inst.FC)));
-	FPSCR.FI = 0; // are these flags important?
-	FPSCR.FR = 0;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-void Interpreter::fmulsx(UGeckoInstruction _inst)
-{
-	double d_value = NI_mul(rPS0(_inst.FA), rPS0(_inst.FC));
-	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(d_value);
-	//FPSCR.FI = d_value != rPS0(_inst.FD);
-	FPSCR.FI = 0;
-	FPSCR.FR = 0;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fmaddx(UGeckoInstruction _inst)
-{
-	double result = ForceDouble(NI_madd( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ));
-	rPS0(_inst.FD) = result;
-	UpdateFPRF(result);
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fmaddsx(UGeckoInstruction _inst)
-{
-	double d_value = NI_madd( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) );
-	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(d_value);
-	FPSCR.FI = d_value != rPS0(_inst.FD);
-	FPSCR.FR = 0;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-
-void Interpreter::faddx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-void Interpreter::faddsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fdivx(UGeckoInstruction _inst)
-{
-	double a = rPS0(_inst.FA);
-	double b = rPS0(_inst.FB);
-	if (a != a) rPS0(_inst.FD) = a;
-	else if (b != b) rPS0(_inst.FD) = b;
-	else
-	{
-		rPS0(_inst.FD) = ForceDouble(a / b);
-		if (b == 0.0) 
-		{
-			if (a == 0.0)
-			{
-				SetFPException(FPSCR_VXZDZ);
-				rPS0(_inst.FD) = PPC_NAN;
-			}
-			SetFPException(FPSCR_ZX);
-		}
-		else
-		{
-			if (IsINF(a) && IsINF(b))
-			{
-				SetFPException(FPSCR_VXIDI);
-				rPS0(_inst.FD) = PPC_NAN;
-			}
-		}
-	}
-	UpdateFPRF(rPS0(_inst.FD));
-	// FR,FI,OX,UX???
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-void Interpreter::fdivsx(UGeckoInstruction _inst)
-{
-	double a = rPS0(_inst.FA);
-	double b = rPS0(_inst.FB);
-	double res;
-	if (a != a) res = a;
-	else if (b != b) res = b;
-	else
-	{
-		res = ForceSingle(a / b);
-		if (b == 0.0)
-		{
-			if (a == 0.0)
-			{
-				SetFPException(FPSCR_VXZDZ);
-				res = PPC_NAN;
-			}
-			SetFPException(FPSCR_ZX);
-		}
-		else
-		{
-			if (IsINF(a) && IsINF(b))
-			{
-				SetFPException(FPSCR_VXIDI);
-				res = PPC_NAN;
-			}
-		}
-	}
-	rPS0(_inst.FD) = rPS1(_inst.FD) = res;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// Single precision only.
-void Interpreter::fresx(UGeckoInstruction _inst)
-{
-	double b = rPS0(_inst.FB);
-	double one_over = ForceSingle(1.0 / b);
-	// this is based on the real hardware tests
-	if (b != 0.0 && IsINF(one_over)) 
-	{
-		if (one_over > 0)
-			riPS0(_inst.FD) = riPS1(_inst.FD) = MAX_SINGLE;
-		else
-			riPS0(_inst.FD) = riPS1(_inst.FD) = MIN_SINGLE;
-	}
-	else
-	{
-		rPS0(_inst.FD) = rPS1(_inst.FD) = one_over;
-	}
-	if (b == 0.0)
-	{
-		SetFPException(FPSCR_ZX);
-	}
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::frsqrtex(UGeckoInstruction _inst)
-{
-	double b = rPS0(_inst.FB);
-	if (b < 0.0) 
-	{
-		SetFPException(FPSCR_VXSQRT);
-		rPS0(_inst.FD) = PPC_NAN;
-	}
-	else
-	{
-#ifdef VERY_ACCURATE_FP
-		if (b == 0.0)
-		{
-			SetFPException(FPSCR_ZX);
-			riPS0(_inst.FD) = 0x7ff0000000000000;
-		}
-		else
-		{
-			u32 fsa = Common::swap32(Common::swap64(riPS0(_inst.FB)));
-			u32 fsb = Common::swap32(Common::swap64(riPS0(_inst.FB)) >> 32);
-			u32 idx=(fsa >> 5) % (sizeof(frsqrtex_lut) / sizeof(frsqrtex_lut[0]));
-
-			s32 e = fsa >> (32-12);
-			e &= 2047;
-			e -= 1023;
-			s32 oe =- ((e + 1) / 2);
-			oe -= ((e + 1) & 1);
-
-			u32 outb = frsqrtex_lut[idx] << 20;
-			u32 outa = ((oe + 1023) & 2047) << 20;
-			outa |= frsqrtex_lut[idx] >> 12;
-			riPS0(_inst.FD) = ((u64)outa << 32) + (u64)outb;
-		}
-#else
-		if (b == 0.0)
-			SetFPException(FPSCR_ZX);
-		rPS0(_inst.FD) = ForceDouble(1.0 / sqrt(b));
-#endif
-	}
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fmsubx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(NI_msub( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fmsubsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS1(_inst.FD) =
-		ForceSingle( NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fnmaddx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(-NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-void Interpreter::fnmaddsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS1(_inst.FD) = 
-		ForceSingle(-NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fnmsubx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(-NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// fnmsubsx does not handle QNAN properly - see NI_msub
-void Interpreter::fnmsubsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS1(_inst.FD) =
-		ForceSingle(-NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
-}
-
-void Interpreter::fsubx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceDouble(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fsubsx(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::fsqrtx(UGeckoInstruction _inst)
-{
-	// GEKKO is not supposed to support this instruction.
-	// PanicAlert("fsqrtx");
-	double b = rPS0(_inst.FB);
-	if (b < 0.0) {
-		FPSCR.VXSQRT = 1;
-	}
-	rPS0(_inst.FD) = sqrt(b);
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
deleted file mode 100644
index 71ea36eedd..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Interpreter.h"
-#include "../../Core.h"
-#include "Atomic.h"
-
-void Interpreter::Helper_UpdateCR0(u32 _uValue)
-{
-	u32 new_cr0;
-	int sValue = (int)_uValue;
-	if (sValue > 0)
-		new_cr0 = 0x4;
-	else if (sValue < 0)
-		new_cr0 = 0x8;
-	else
-		new_cr0 = 0x2;
-	new_cr0 |= GetXER_SO();
-	SetCRField(0, new_cr0);
-}
-
-void Interpreter::Helper_UpdateCRx(int _x, u32 _uValue)
-{
-	u32 new_crX;
-	int sValue = (int)_uValue;
-	if (sValue > 0)
-		new_crX = 0x4;
-	else if (sValue < 0)
-		new_crX = 0x8;
-	else
-		new_crX = 0x2;
-	new_crX |= GetXER_SO();
-	SetCRField(_x, new_crX);
-}
-
-u32 Interpreter::Helper_Carry(u32 _uValue1, u32 _uValue2)
-{
-	return _uValue2 > (~_uValue1);
-}
-
-u32 Interpreter::Helper_Mask(int mb, int me)
-{
-	//first make 001111111111111 part
-	u32 begin = 0xFFFFFFFF >> mb;
-	//then make 000000000001111 part, which is used to flip the bits of the first one
-	u32 end = me < 31 ? (0xFFFFFFFF >> (me + 1)) : 0;
-	//do the bitflip
-	u32 mask = begin ^ end;
-	//and invert if backwards
-	if (me < mb) 
-		return ~mask;
-	else
-		return mask;
-}
-
-void Interpreter::addi(UGeckoInstruction _inst)
-{
-	if (_inst.RA)
-		m_GPR[_inst.RD] = m_GPR[_inst.RA] + _inst.SIMM_16;
-	else
-		m_GPR[_inst.RD] = _inst.SIMM_16;
-}
-
-void Interpreter::addic(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 imm = (u32)(s32)_inst.SIMM_16;
-	// TODO(ector): verify this thing 
-	m_GPR[_inst.RD] = a + imm;
-	SetCarry(Helper_Carry(a, imm));
-}
-
-void Interpreter::addic_rc(UGeckoInstruction _inst)
-{
-	addic(_inst);
-	Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::addis(UGeckoInstruction _inst)
-{
-	if (_inst.RA)
-		m_GPR[_inst.RD] = m_GPR[_inst.RA] + (_inst.SIMM_16 << 16);
-	else
-		m_GPR[_inst.RD] = (_inst.SIMM_16 << 16);
-}
-
-void Interpreter::andi_rc(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] & _inst.UIMM;
-	Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::andis_rc(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] & ((u32)_inst.UIMM<<16);
-	Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::cmpi(UGeckoInstruction _inst)
-{
-	Helper_UpdateCRx(_inst.CRFD, m_GPR[_inst.RA] - _inst.SIMM_16);
-}
-
-void Interpreter::cmpli(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = _inst.UIMM;
-	int f;
-	if (a < b)      f = 0x8;
-	else if (a > b) f = 0x4;
-	else            f = 0x2; //equals
-	if (GetXER_SO()) f |= 0x1;
-	SetCRField(_inst.CRFD, f);
-}
-
-void Interpreter::mulli(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = (s32)m_GPR[_inst.RA] * _inst.SIMM_16;
-}
-
-void Interpreter::ori(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] | _inst.UIMM;
-}
-
-void Interpreter::oris(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] | (_inst.UIMM << 16);
-}
-
-void Interpreter::subfic(UGeckoInstruction _inst)
-{
-/*	u32 rra = ~m_GPR[_inst.RA];
-	s32 immediate = (s16)_inst.SIMM_16 + 1;
-
-//	#define CALC_XER_CA(X,Y) (((X) + (Y) < X) ? SET_XER_CA : CLEAR_XER_CA)
-	if ((rra + immediate) < rra)
-		SetCarry(1);
-	else 
-		SetCarry(0);
-
-	m_GPR[_inst.RD] = rra - immediate;
-*/
-
-	s32 immediate = _inst.SIMM_16;
-	m_GPR[_inst.RD] = immediate - (signed)m_GPR[_inst.RA];
-	SetCarry((m_GPR[_inst.RA] == 0) || (Helper_Carry(0-m_GPR[_inst.RA], immediate)));
-}
-
-void Interpreter::twi(UGeckoInstruction _inst) 
-{
-	s32 a = m_GPR[_inst.RA];
-	s32 b = _inst.SIMM_16;
-	s32 TO = _inst.TO;
-
-	ERROR_LOG(POWERPC, "twi rA %x SIMM %x TO %0x", a, b, TO);
-
-	if (   ((a < b) && (TO & 0x10))
-		|| ((a > b) && (TO & 0x08))
-		|| ((a ==b) && (TO & 0x04))
-		|| (((u32)a <(u32)b) && (TO & 0x02))
-		|| (((u32)a >(u32)b) && (TO & 0x01)))
-	{
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_PROGRAM);
-		PowerPC::CheckExceptions();
-		m_EndBlock = true; // Dunno about this
-	}
-}
-
-void Interpreter::xori(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] ^ _inst.UIMM;
-}
-
-void Interpreter::xoris(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] ^ (_inst.UIMM << 16);
-}
-
-void Interpreter::rlwimix(UGeckoInstruction _inst)
-{
-	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
-	m_GPR[_inst.RA] = (m_GPR[_inst.RA] & ~mask) | (_rotl(m_GPR[_inst.RS],_inst.SH) & mask);
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::rlwinmx(UGeckoInstruction _inst)
-{
-	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
-	m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS],_inst.SH) & mask;
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::rlwnmx(UGeckoInstruction _inst)
-{
-	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
-	m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS], m_GPR[_inst.RB] & 0x1F) & mask;
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::andx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] & m_GPR[_inst.RB];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::andcx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] & ~m_GPR[_inst.RB];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::cmp(UGeckoInstruction _inst)
-{
-	s32 a = (s32)m_GPR[_inst.RA];
-	s32 b = (s32)m_GPR[_inst.RB];
-	int fTemp = 0x8; // a < b 
-		//	if (a < b)  fTemp = 0x8; else 
-	if (a > b)  fTemp = 0x4;
-	else if (a == b) fTemp = 0x2;
-	if (GetXER_SO()) PanicAlert("cmp getting overflow flag"); // fTemp |= 0x1
-	SetCRField(_inst.CRFD, fTemp);
-}
-
-void Interpreter::cmpl(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	u32 fTemp = 0x8; // a < b
-
-		//	if (a < b)  fTemp = 0x8;else 
-	if (a > b)  fTemp = 0x4;
-	else if (a == b) fTemp = 0x2;
-	if (GetXER_SO()) PanicAlert("cmpl getting overflow flag"); // fTemp |= 0x1;
-	SetCRField(_inst.CRFD, fTemp);
-}
-
-void Interpreter::cntlzwx(UGeckoInstruction _inst)
-{
-	u32 val = m_GPR[_inst.RS];
-	u32 mask = 0x80000000;
-	int i = 0;
-	for (; i < 32; i++, mask >>= 1)
-		if (val & mask) 
-			break;
-	m_GPR[_inst.RA] = i;
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::eqvx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = ~(m_GPR[_inst.RS] ^ m_GPR[_inst.RB]);
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::extsbx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = (u32)(s32)(s8)m_GPR[_inst.RS];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::extshx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = (u32)(s32)(s16)m_GPR[_inst.RS];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::nandx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = ~(m_GPR[_inst.RS] & m_GPR[_inst.RB]);
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::norx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = ~(m_GPR[_inst.RS] | m_GPR[_inst.RB]);
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::orx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] | m_GPR[_inst.RB];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::orcx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] | (~m_GPR[_inst.RB]);
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::slwx(UGeckoInstruction _inst)
-{
-	u32 amount = m_GPR[_inst.RB];
-	m_GPR[_inst.RA] = (amount & 0x20) ? 0 : m_GPR[_inst.RS] << amount;
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::srawx(UGeckoInstruction _inst)
-{
-	int rb = m_GPR[_inst.RB];
-	if (rb & 0x20)
-	{
-		if (m_GPR[_inst.RS] & 0x80000000)
-		{
-			m_GPR[_inst.RA] = 0xFFFFFFFF;
-			SetCarry(1);
-		}
-		else
-		{
-			m_GPR[_inst.RA] = 0x00000000;
-			SetCarry(0);
-		}
-	}
-	else
-	{
-		int amount = rb & 0x1f;
-		if (amount == 0)
-		{
-			m_GPR[_inst.RA] = m_GPR[_inst.RS];
-			SetCarry(0);
-		}
-		else
-		{
-			m_GPR[_inst.RA] = (u32)((s32)m_GPR[_inst.RS] >> amount);
-			if (m_GPR[_inst.RS] & 0x80000000)
-				SetCarry(1);
-			else
-				SetCarry(0);
-		}
-	}
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::srawix(UGeckoInstruction _inst)
-{
-	int amount = _inst.SH;
-
-	if (amount != 0)
-	{
-		s32 rrs = m_GPR[_inst.RS];
-		m_GPR[_inst.RA] = rrs >> amount;
-
-		if ((rrs < 0) && (rrs << (32 - amount)))
-			SetCarry(1);
-		else
-			SetCarry(0);
-	}
-	else
-	{
-		SetCarry(0);
-		m_GPR[_inst.RA] = m_GPR[_inst.RS];
-	}
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::srwx(UGeckoInstruction _inst)
-{
-	u32 amount = m_GPR[_inst.RB];
-	m_GPR[_inst.RA] = (amount & 0x20) ? 0 : (m_GPR[_inst.RS] >> (amount & 0x1f));
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::tw(UGeckoInstruction _inst)  
-{
-	s32 a = m_GPR[_inst.RA];
-	s32 b = m_GPR[_inst.RB];
-	s32 TO = _inst.TO;
-
-	ERROR_LOG(POWERPC, "tw rA %0x rB %0x TO %0x", a, b, TO);
-
-	if (   ((a < b) && (TO & 0x10))
-		|| ((a > b) && (TO & 0x08))
-		|| ((a ==b) && (TO & 0x04))
-		|| (((u32)a <(u32)b) && (TO & 0x02))
-		|| (((u32)a >(u32)b) && (TO & 0x01)))
-	{
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_PROGRAM);
-		PowerPC::CheckExceptions();
-		m_EndBlock = true; // Dunno about this
-	}
-}
-
-void Interpreter::xorx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RA] = m_GPR[_inst.RS] ^ m_GPR[_inst.RB];
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
-}
-
-void Interpreter::addx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = m_GPR[_inst.RA] + m_GPR[_inst.RB];
-
-	if (_inst.OE) PanicAlert("OE: addx");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::addcx(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	m_GPR[_inst.RD] = a + b;
-	SetCarry(Helper_Carry(a,b));
-
-	if (_inst.OE) PanicAlert("OE: addcx");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::addex(UGeckoInstruction _inst)
-{
-	int carry = GetCarry();
-	int a = m_GPR[_inst.RA];
-	int b = m_GPR[_inst.RB];
-	m_GPR[_inst.RD] = a + b + carry;
-	SetCarry(Helper_Carry(a, b) || (carry != 0 && Helper_Carry(a + b, carry)));
-
-	if (_inst.OE) PanicAlert("OE: addex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::addmex(UGeckoInstruction _inst)
-{
-	int carry = GetCarry();
-	int a = m_GPR[_inst.RA];
-	m_GPR[_inst.RD] = a + carry - 1;
-	SetCarry(Helper_Carry(a, carry - 1));
-
-	if (_inst.OE) PanicAlert("OE: addmex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::addzex(UGeckoInstruction _inst)
-{
-	int carry = GetCarry();
-	int a = m_GPR[_inst.RA];
-	m_GPR[_inst.RD] = a + carry;
-	SetCarry(Helper_Carry(a, carry));
-
-	if (_inst.OE) PanicAlert("OE: addzex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::divwx(UGeckoInstruction _inst)
-{
-	s32 a = m_GPR[_inst.RA];
-	s32 b = m_GPR[_inst.RB];
-	if (b == 0 || ((u32)a == 0x80000000 && b == -1))
-	{
-		if (_inst.OE)
-			// should set OV
-			PanicAlert("OE: divwx");
-		if (((u32)a & 0x80000000) && b == 0)
-			m_GPR[_inst.RD] = -1;
-		else
-			m_GPR[_inst.RD] = 0;
-	}
-	else
-		m_GPR[_inst.RD] = (u32)(a / b);
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-
-void Interpreter::divwux(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-
-	if (b == 0)
-	{
-		if (_inst.OE)
-			// should set OV
-			PanicAlert("OE: divwux");
-		m_GPR[_inst.RD] = 0;
-	}
-	else
-		m_GPR[_inst.RD] = a / b;
-
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::mulhwx(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	u32 d = (u32)((u64)(((s64)(s32)a * (s64)(s32)b) ) >> 32);  // This can be done better. Not in plain C/C++ though.
-	m_GPR[_inst.RD] = d;
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::mulhwux(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	u32 d = (u32)(((u64)a * (u64)b) >> 32);
-	m_GPR[_inst.RD] = d;
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::mullwx(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	u32 d = (u32)((s32)a * (s32)b);
-	m_GPR[_inst.RD] = d;
-
-	if (_inst.OE) PanicAlert("OE: mullwx");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::negx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = (~m_GPR[_inst.RA]) + 1;
-	if (m_GPR[_inst.RD] == 0x80000000)
-	{
-		if (_inst.OE) PanicAlert("OE: negx");
-	}
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::subfx(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = m_GPR[_inst.RB] - m_GPR[_inst.RA];
-
-	if (_inst.OE) PanicAlert("OE: subfx");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::subfcx(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	m_GPR[_inst.RD] = b - a;
-	SetCarry(a == 0 || Helper_Carry(b, 0-a));
-
-	if (_inst.OE) PanicAlert("OE: subfcx");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-void Interpreter::subfex(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	u32 b = m_GPR[_inst.RB];
-	int carry = GetCarry();
-	m_GPR[_inst.RD] = (~a) + b + carry;
-	SetCarry(Helper_Carry(~a, b) || Helper_Carry((~a) + b, carry));
-
-	if (_inst.OE) PanicAlert("OE: subfex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-// sub from minus one
-void Interpreter::subfmex(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	int carry = GetCarry();
-	m_GPR[_inst.RD] = (~a) + carry - 1;
-	SetCarry(Helper_Carry(~a, carry - 1));
-
-	if (_inst.OE) PanicAlert("OE: subfmex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
-
-// sub from zero
-void Interpreter::subfzex(UGeckoInstruction _inst)
-{
-	u32 a = m_GPR[_inst.RA];
-	int carry = GetCarry();
-	m_GPR[_inst.RD] = (~a) + carry;
-	SetCarry(Helper_Carry(~a, carry));
-
-	if (_inst.OE) PanicAlert("OE: subfzex");
-	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RD]);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
deleted file mode 100644
index 54e1246095..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
+++ /dev/null
@@ -1,854 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Atomic.h"
-#include "MathUtil.h"
-
-#include "../../HW/Memmap.h"
-
-#include "Interpreter.h"
-#include "../../Core.h"
-
-#include "../JitInterface.h"
-
-#include "Interpreter_FPUtils.h"
-
-bool Interpreter::g_bReserve;
-u32  Interpreter::g_reserveAddr;
-
-u32 Interpreter::Helper_Get_EA(const UGeckoInstruction _inst)
-{
-	return _inst.RA ? (m_GPR[_inst.RA] + _inst.SIMM_16) : (u32)_inst.SIMM_16;
-}
-
-u32 Interpreter::Helper_Get_EA_U(const UGeckoInstruction _inst)
-{
-	return (m_GPR[_inst.RA] + _inst.SIMM_16);
-}
-
-u32 Interpreter::Helper_Get_EA_X(const UGeckoInstruction _inst)
-{
-	return _inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB];
-}
-
-u32 Interpreter::Helper_Get_EA_UX(const UGeckoInstruction _inst)
-{
-	return (m_GPR[_inst.RA] + m_GPR[_inst.RB]);
-}
-
-void Interpreter::lbz(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)Memory::Read_U8(Helper_Get_EA(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-		m_GPR[_inst.RD] = temp;
-}
-
-void Interpreter::lbzu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u32 temp = (u32)Memory::Read_U8(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lfd(UGeckoInstruction _inst)
-{
-	u64 temp = Memory::Read_U64(Helper_Get_EA(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-		riPS0(_inst.FD) = temp;
-}
-
-void Interpreter::lfdu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u64 temp = Memory::Read_U64(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		riPS0(_inst.FD) = temp;
-		m_GPR[_inst.RA]  = uAddress;
-	}
-}
-
-void Interpreter::lfdux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	u64 temp = Memory::Read_U64(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		riPS0(_inst.FD) = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lfdx(UGeckoInstruction _inst)
-{
-	u64 temp = Memory::Read_U64(Helper_Get_EA_X(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-		riPS0(_inst.FD) = temp;
-}
-
-void Interpreter::lfs(UGeckoInstruction _inst)
-{
-	u32 uTemp = Memory::Read_U32(Helper_Get_EA(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		double value = *(float*)&uTemp;
-		rPS0(_inst.FD) = value;
-		rPS1(_inst.FD) = value;
-	}
-}
-
-void Interpreter::lfsu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u32 uTemp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		double value = *(float*)&uTemp;
-		rPS0(_inst.FD) = value;
-		rPS1(_inst.FD) = value;
-		m_GPR[_inst.RA] = uAddress;
-	}
-
-}
-
-void Interpreter::lfsux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	u32 uTemp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		double value = *(float*)&uTemp;
-		rPS0(_inst.FD) = value;
-		rPS1(_inst.FD) = value;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lfsx(UGeckoInstruction _inst)
-{
-	u32 uTemp = Memory::Read_U32(Helper_Get_EA_X(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		double value = *(float*)&uTemp;
-		rPS0(_inst.FD) = value;
-		rPS1(_inst.FD) = value;
-	}
-}
-
-void Interpreter::lha(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)(s32)(s16)Memory::Read_U16(Helper_Get_EA(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::lhau(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u32 temp = (u32)(s32)(s16)Memory::Read_U16(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lhz(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)(u16)Memory::Read_U16(Helper_Get_EA(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::lhzu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u32 temp = (u32)(u16)Memory::Read_U16(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-// FIXME: lmw should do a total rollback if a DSI occurs
-void Interpreter::lmw(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA(_inst);
-	for (int iReg = _inst.RD; iReg <= 31; iReg++, uAddress += 4)
-	{
-		u32 TempReg = Memory::Read_U32(uAddress);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			PanicAlert("DSI exception in lmw");
-			NOTICE_LOG(POWERPC, "DSI exception in lmw");
-			return;
-		}
-		else
-		{
-			m_GPR[iReg] = TempReg;
-		}
-	}
-}
-
-// FIXME: stmw should do a total rollback if a DSI occurs
-void Interpreter::stmw(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA(_inst);
-	for (int iReg = _inst.RS; iReg <= 31; iReg++, uAddress+=4)
-	{
-		Memory::Write_U32(m_GPR[iReg], uAddress);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			PanicAlert("DSI exception in stmw");
-			NOTICE_LOG(POWERPC, "DSI exception in stmw");
-			return;
-		}
-	}
-}
-
-void Interpreter::lwz(UGeckoInstruction _inst)
-{ 
-	u32 uAddress = Helper_Get_EA(_inst);
-	u32 temp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-
-	// hack to detect SelectThread loop
-	// should probably run a pass through memory instead before execution
-	// but that would be dangerous
-
-	// Enable idle skipping?
-	/*
-	if ((_inst.hex & 0xFFFF0000)==0x800D0000 &&
-		Memory::ReadUnchecked_U32(PC+4)==0x28000000 &&
-		Memory::ReadUnchecked_U32(PC+8)==0x4182fff8)
-	{
-		if (CommandProcessor::AllowIdleSkipping() && PixelEngine::AllowIdleSkipping())
-		{
-			CoreTiming::Idle();
-		}
-	}*/
-}
-
-void Interpreter::lwzu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	u32 temp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stb(UGeckoInstruction _inst)
-{
-	Memory::Write_U8((u8)m_GPR[_inst.RS], Helper_Get_EA(_inst));
-}
-
-void Interpreter::stbu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	Memory::Write_U8((u8)m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stfd(UGeckoInstruction _inst)
-{
-	Memory::Write_U64(riPS0(_inst.FS), Helper_Get_EA(_inst));
-}
-
-void Interpreter::stfdu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	Memory::Write_U64(riPS0(_inst.FS), uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stfs(UGeckoInstruction _inst)
-{
-	//double value = rPS0(_inst.FS);
-	//float fTemp = (float)value;
-	//Memory::Write_U32(*(u32*)&fTemp, Helper_Get_EA(_inst));
-	Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA(_inst));
-}
-
-void Interpreter::stfsu(UGeckoInstruction _inst)
-{	
-	u32 uAddress = Helper_Get_EA_U(_inst);	
-	Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::sth(UGeckoInstruction _inst)
-{
-	Memory::Write_U16((u16)m_GPR[_inst.RS], Helper_Get_EA(_inst));
-}
-
-void Interpreter::sthu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	Memory::Write_U16((u16)m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stw(UGeckoInstruction _inst)
-{
-	Memory::Write_U32(m_GPR[_inst.RS], Helper_Get_EA(_inst));
-}
-
-void Interpreter::stwu(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_U(_inst);
-	Memory::Write_U32(m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::dcba(UGeckoInstruction _inst)
-{
-	_assert_msg_(POWERPC,0,"dcba - Not implemented - not a Gekko instruction");
-}
-
-void Interpreter::dcbf(UGeckoInstruction _inst)
-{
-	//This should tell GFX backend to throw out any cached data here
-	// !!! SPEEDUP HACK for OSProtectRange !!!
-/*	u32 tmp1 = Memory::Read_U32(PC+4);
-	u32 tmp2 = Memory::Read_U32(PC+8);
-
-	if ((tmp1 == 0x38630020) && 
-		(tmp2 == 0x4200fff8))
-	{
-		NPC = PC + 12;
-	}*/
-		u32 address = Helper_Get_EA_X(_inst);
-		JitInterface::InvalidateICache(address & ~0x1f, 32);
-}
-
-void Interpreter::dcbi(UGeckoInstruction _inst)
-{
-	// Removes a block from data cache. Since we don't emulate the data cache, we don't need to do anything to the data cache
-	// However, we invalidate the jit block cache on dcbi
-		u32 address = Helper_Get_EA_X(_inst);
-		JitInterface::InvalidateICache(address & ~0x1f, 32);
-}
-
-void Interpreter::dcbst(UGeckoInstruction _inst)
-{
-	// Cache line flush. Since we don't emulate the data cache, we don't need to do anything.
-	// Invalidate the jit block cache on dcbst in case new code has been loaded via the data cache
-		u32 address = Helper_Get_EA_X(_inst);
-		JitInterface::InvalidateICache(address & ~0x1f, 32);
-}
-
-void Interpreter::dcbt(UGeckoInstruction _inst)
-{
-	// Prefetch. Since we don't emulate the data cache, we don't need to do anything.
-}
-
-void Interpreter::dcbtst(UGeckoInstruction _inst)
-{
-	// This is just some sort of store "prefetching".
-	// Since we don't emulate the data cache, we don't need to do anything.
-}
-
-void Interpreter::dcbz(UGeckoInstruction _inst)
-{
-	// HACK but works... we think
-	if (!Core::g_CoreStartupParameter.bDCBZOFF)
-		Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32);
-	if (!JitInterface::GetCore())
-		PowerPC::CheckExceptions();
-}
-
-// eciwx/ecowx technically should access the specified device
-// We just do it instantly from ppc...and hey, it works! :D
-void Interpreter::eciwx(UGeckoInstruction _inst)
-{
-	u32 EA, b;
-	if (_inst.RA == 0)
-		b = 0;
-	else
-		b = m_GPR[_inst.RA];
-	EA = b + m_GPR[_inst.RB];
-
-	if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000))
-	{
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DSI);
-	}
-	if (EA & 3)
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_ALIGNMENT);
-
-// 	_assert_msg_(POWERPC,0,"eciwx - fill r%i with word @ %08x from device %02x",
-// 		_inst.RS, EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f);
-
-	m_GPR[_inst.RS] = Memory::Read_U32(EA);
-}
-
-void Interpreter::ecowx(UGeckoInstruction _inst)
-{
-	u32 EA, b;
-	if (_inst.RA == 0)
-		b = 0;
-	else
-		b = m_GPR[_inst.RA];
-	EA = b + m_GPR[_inst.RB];
-
-	if (!(PowerPC::ppcState.spr[SPR_EAR] & 0x80000000))
-	{
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DSI);
-	}
-	if (EA & 3)
-		Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_ALIGNMENT);
-	
-// 	_assert_msg_(POWERPC,0,"ecowx - send stw request (%08x@%08x) to device %02x",
-// 		m_GPR[_inst.RS], EA, PowerPC::ppcState.spr[SPR_EAR] & 0x1f);
-
-	Memory::Write_U32(m_GPR[_inst.RS], EA);
-}
-
-void Interpreter::eieio(UGeckoInstruction _inst)
-{
-	// Basically ensures that loads/stores before this instruction
-	// have completed (in order) before executing the next op.
-	// Prevents real ppc from "smartly" reordering loads/stores
-	// But (at least in interpreter) we do everything realtime anyways.
-}
-
-void Interpreter::icbi(UGeckoInstruction _inst)
-{
-	u32 address = Helper_Get_EA_X(_inst);	
-	PowerPC::ppcState.iCache.Invalidate(address);
-}
-
-void Interpreter::lbzux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	u32 temp = (u32)Memory::Read_U8(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lbzx(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)Memory::Read_U8(Helper_Get_EA_X(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::lhaux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	s32 temp = (s32)(s16)Memory::Read_U16(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lhax(UGeckoInstruction _inst)
-{
-	s32 temp = (s32)(s16)Memory::Read_U16(Helper_Get_EA_X(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::lhbrx(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)Common::swap16(Memory::Read_U16(Helper_Get_EA_X(_inst)));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}	
-}
-
-void Interpreter::lhzux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	u32 temp = (u32)Memory::Read_U16(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lhzx(UGeckoInstruction _inst)
-{
-	u32 temp = (u32)Memory::Read_U16(Helper_Get_EA_X(_inst));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-// TODO: is this right?
-// FIXME: Should rollback if a DSI occurs
-void Interpreter::lswx(UGeckoInstruction _inst)
-{
-	u32 EA = Helper_Get_EA_X(_inst);
-	u32 n = rSPR(SPR_XER) & 0x7F;
-	int r = _inst.RD;
-	int i = 0;
-
-	if (n > 0)
-	{
-		m_GPR[r] = 0;
-		do
-		{
-			u32 TempValue = Memory::Read_U8(EA) << (24 - i);
-			if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-			{
-				PanicAlert("DSI exception in lswx.");
-				NOTICE_LOG(POWERPC, "DSI exception in lswx");
-				return;
-			}
-			m_GPR[r] |= TempValue;
-
-			EA++;
-			n--;
-			i += 8;
-			if (i == 32)
-			{
-				i = 0;
-				r = (r + 1) & 31;
-				m_GPR[r] = 0;
-			}
-		} while (n > 0);
-	}
-}
-
-void Interpreter::lwbrx(UGeckoInstruction _inst)
-{
-	u32 temp = Common::swap32(Memory::Read_U32(Helper_Get_EA_X(_inst)));
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::lwzux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	u32 temp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::lwzx(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_X(_inst);
-	u32 temp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-	}
-}
-
-void Interpreter::stbux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	Memory::Write_U8((u8)m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stbx(UGeckoInstruction _inst)
-{
-	Memory::Write_U8((u8)m_GPR[_inst.RS], Helper_Get_EA_X(_inst));
-}
-
-void Interpreter::stfdux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	Memory::Write_U64(riPS0(_inst.FS), uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stfdx(UGeckoInstruction _inst)
-{
-	Memory::Write_U64(riPS0(_inst.FS), Helper_Get_EA_X(_inst));
-}
-
-// __________________________________________________________________________________________________
-// stfiwx
-// TODO - examine what this really does
-// Stores Floating points into Integers indeXed
-void Interpreter::stfiwx(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_X(_inst);
-
-	Memory::Write_U32((u32)riPS0(_inst.FS), uAddress);
-}
-
-
-void Interpreter::stfsux(UGeckoInstruction _inst)
-{	
-	u32 uAddress = Helper_Get_EA_UX(_inst);	
-	Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stfsx(UGeckoInstruction _inst)
-{	
-	Memory::Write_U32(ConvertToSingle(riPS0(_inst.FS)), Helper_Get_EA_X(_inst));
-}
-
-void Interpreter::sthbrx(UGeckoInstruction _inst)
-{
-	Memory::Write_U16(Common::swap16((u16)m_GPR[_inst.RS]), Helper_Get_EA_X(_inst));
-}
-
-void Interpreter::sthux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	Memory::Write_U16((u16)m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::sthx(UGeckoInstruction _inst)
-{
-	Memory::Write_U16((u16)m_GPR[_inst.RS], Helper_Get_EA_X(_inst));
-}
-
-// __________________________________________________________________________________________________
-// lswi - bizarro string instruction
-// FIXME: Should rollback if a DSI occurs
-void Interpreter::lswi(UGeckoInstruction _inst)
-{
-	u32 EA;
-	if (_inst.RA == 0)
-		EA = 0;
-	else
-		EA = m_GPR[_inst.RA];
-
-	u32 n;
-	if (_inst.NB == 0)
-		n = 32;
-	else
-		n = _inst.NB;
-
-	int r = _inst.RD - 1;
-	int i = 0;
-	while (n>0)
-	{
-		if (i==0)
-		{
-			r++;
-			r &= 31;
-			m_GPR[r] = 0;
-		}
-
-		u32 TempValue = Memory::Read_U8(EA) << (24 - i);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			PanicAlert("DSI exception in lsw.");
-			return;
-		}
-
-		m_GPR[r] |= TempValue;
-
-		i += 8;
-		if (i == 32)
-			i = 0;
-		EA++;
-		n--;
-	}
-}
-
-// todo : optimize ?
-// __________________________________________________________________________________________________
-// stswi - bizarro string instruction
-// FIXME: Should rollback if a DSI occurs
-void Interpreter::stswi(UGeckoInstruction _inst)
-{
-	u32 EA;
-	if (_inst.RA == 0)
-		EA = 0;
-	else
-		EA = m_GPR[_inst.RA];
-
-	u32 n;
-	if (_inst.NB == 0)
-		n = 32;
-	else
-		n = _inst.NB;
-
-	int r = _inst.RS - 1;
-	int i = 0;
-	while (n > 0)
-	{
-		if (i == 0)
-		{
-			r++;
-			r &= 31;
-		}
-		Memory::Write_U8((m_GPR[r] >> (24 - i)) & 0xFF, EA);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-
-		i += 8;
-		if (i == 32)
-			i = 0;
-		EA++;
-		n--;
-	}
-}
-
-// TODO: is this right? is it DSI interruptible?
-void Interpreter::stswx(UGeckoInstruction _inst)
-{
-	u32 EA = Helper_Get_EA_X(_inst);
-	u32 n = rSPR(SPR_XER) & 0x7F;
-	int r = _inst.RS;
-	int i = 0;
-
-	while (n > 0)
-	{
-		Memory::Write_U8((m_GPR[r] >> (24 - i)) & 0xFF, EA);
-
-		EA++;
-		n--;
-		i += 8;
-		if (i == 32)
-		{
-			i = 0;
-			r++;
-		}
-	}
-}
-
-void Interpreter::stwbrx(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_X(_inst);
-	Memory::Write_U32(Common::swap32(m_GPR[_inst.RS]), uAddress);
-}
-
-
-// The following two instructions are for SMP communications. On a single
-// CPU, they cannot fail unless an interrupt happens in between.
-
-void Interpreter::lwarx(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_X(_inst);
-	u32 temp = Memory::Read_U32(uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RD] = temp;
-		g_bReserve = true;
-		g_reserveAddr = uAddress;
-	}
-}
-
-void Interpreter::stwcxd(UGeckoInstruction _inst)
-{
-	// Stores Word Conditional indeXed
-	u32 uAddress;
-	if (g_bReserve) {
-		uAddress = Helper_Get_EA_X(_inst);
-		if (uAddress == g_reserveAddr) {
-			Memory::Write_U32(m_GPR[_inst.RS], uAddress);
-			if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-			{
-				g_bReserve = false;
-				SetCRField(0, 2 | GetXER_SO());
-				return;
-			}
-		}
-	}
-
-	SetCRField(0, GetXER_SO());
-}
-
-void Interpreter::stwux(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_UX(_inst);
-	Memory::Write_U32(m_GPR[_inst.RS], uAddress);
-	if (!(PowerPC::ppcState.Exceptions & EXCEPTION_DSI))
-	{
-		m_GPR[_inst.RA] = uAddress;
-	}
-}
-
-void Interpreter::stwx(UGeckoInstruction _inst)
-{
-	u32 uAddress = Helper_Get_EA_X(_inst);
-	Memory::Write_U32(m_GPR[_inst.RS], uAddress);
-}
-
-void Interpreter::sync(UGeckoInstruction _inst)
-{
-	//ignored
-}
-
-void Interpreter::tlbia(UGeckoInstruction _inst)
-{
-	// Gekko does not support this instructions.
-	PanicAlert("The GC CPU does not support tlbia");
-	// invalid the whole TLB 
-	//MessageBox(0,"TLBIA","TLBIA",0);
-}
-
-void Interpreter::tlbie(UGeckoInstruction _inst)
-{
-	// Invalidate TLB entry
-	u32 _Address = m_GPR[_inst.RB];
-	Memory::InvalidateTLBEntry(_Address);
-}
-
-void Interpreter::tlbsync(UGeckoInstruction _inst)
-{
-	//MessageBox(0,"TLBsync","TLBsyncE",0);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
deleted file mode 100644
index caaff00373..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-#include "Interpreter.h"
-#include "../../HW/Memmap.h"
-
-#include "Interpreter_FPUtils.h"
-
-// dequantize table
-const float m_dequantizeTable[] =
-{
-	1.0 / (1 <<  0),	1.0 / (1 <<  1),	1.0 / (1 <<  2),	1.0 / (1 <<  3),
-	1.0 / (1 <<  4),	1.0 / (1 <<  5),	1.0 / (1 <<  6),	1.0 / (1 <<  7),
-	1.0 / (1 <<  8),	1.0 / (1 <<  9),	1.0 / (1 << 10),	1.0 / (1 << 11),
-	1.0 / (1 << 12),	1.0 / (1 << 13),	1.0 / (1 << 14),	1.0 / (1 << 15),
-	1.0 / (1 << 16),	1.0 / (1 << 17),	1.0 / (1 << 18),	1.0 / (1 << 19),
-	1.0 / (1 << 20),	1.0 / (1 << 21),	1.0 / (1 << 22),	1.0 / (1 << 23),
-	1.0 / (1 << 24),	1.0 / (1 << 25),	1.0 / (1 << 26),	1.0 / (1 << 27),
-	1.0 / (1 << 28),	1.0 / (1 << 29),	1.0 / (1 << 30),	1.0 / (1 << 31),
-	(1ULL << 32),	(1 << 31),	(1 << 30),	(1 << 29),
-	(1 << 28),	(1 << 27),	(1 << 26),	(1 << 25),
-	(1 << 24),	(1 << 23),	(1 << 22),	(1 << 21),
-	(1 << 20),	(1 << 19),	(1 << 18),	(1 << 17),
-	(1 << 16),	(1 << 15),	(1 << 14),	(1 << 13),
-	(1 << 12),	(1 << 11),	(1 << 10),	(1 <<  9),
-	(1 <<  8),	(1 <<  7),	(1 <<  6),	(1 <<  5),
-	(1 <<  4),	(1 <<  3),	(1 <<  2),	(1 <<  1),
-}; 
-
-// quantize table
-const float m_quantizeTable[] =
-{
-	(1 <<  0),	(1 <<  1),	(1 <<  2),	(1 <<  3),
-	(1 <<  4),	(1 <<  5),	(1 <<  6),	(1 <<  7),
-	(1 <<  8),	(1 <<  9),	(1 << 10),	(1 << 11),
-	(1 << 12),	(1 << 13),	(1 << 14),	(1 << 15),
-	(1 << 16),	(1 << 17),	(1 << 18),	(1 << 19),
-	(1 << 20),	(1 << 21),	(1 << 22),	(1 << 23),
-	(1 << 24),	(1 << 25),	(1 << 26),	(1 << 27),
-	(1 << 28),	(1 << 29),	(1 << 30),	(1 << 31),
-	1.0 / (1ULL << 32),	1.0 / (1 << 31),	1.0 / (1 << 30),	1.0 / (1 << 29),
-	1.0 / (1 << 28),	1.0 / (1 << 27),	1.0 / (1 << 26),	1.0 / (1 << 25),
-	1.0 / (1 << 24),	1.0 / (1 << 23),	1.0 / (1 << 22),	1.0 / (1 << 21),
-	1.0 / (1 << 20),	1.0 / (1 << 19),	1.0 / (1 << 18),	1.0 / (1 << 17),
-	1.0 / (1 << 16),	1.0 / (1 << 15),	1.0 / (1 << 14),	1.0 / (1 << 13),
-	1.0 / (1 << 12),	1.0 / (1 << 11),	1.0 / (1 << 10),	1.0 / (1 <<  9),
-	1.0 / (1 <<  8),	1.0 / (1 <<  7),	1.0 / (1 <<  6),	1.0 / (1 <<  5),
-	1.0 / (1 <<  4),	1.0 / (1 <<  3),	1.0 / (1 <<  2),	1.0 / (1 <<  1),
-}; 
-
-template <class T>
-inline T CLAMP(T a, T bottom, T top) {
-	if (a > top) return top;
-	if (a < bottom) return bottom;
-	return a;
-}
-
-void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, 
-					 const EQuantizeType _quantizeType, const unsigned int _uScale)
-{
-	switch (_quantizeType) 
-	{
-	case QUANTIZE_FLOAT:		
-		Memory::Write_U32( ConvertToSingleFTZ( *(u64*)&_fValue ), _Addr );
-		break;
-
-	// used for THP player
-	case QUANTIZE_U8:
-		{
-			float fResult = CLAMP((float)_fValue * m_quantizeTable[_uScale], 0.0f, 255.0f);
-			Memory::Write_U8((u8)fResult, _Addr); 
-		}
-		break;
-
-	case QUANTIZE_U16:
-		{
-			float fResult = CLAMP((float)_fValue * m_quantizeTable[_uScale], 0.0f, 65535.0f);
-			Memory::Write_U16((u16)fResult, _Addr); 
-		}
-		break;
-
-	case QUANTIZE_S8:
-		{
-			float fResult = CLAMP((float)_fValue * m_quantizeTable[_uScale], -128.0f, 127.0f);
-			Memory::Write_U8((u8)(s8)fResult, _Addr); 
-		}
-		break;
-
-	case QUANTIZE_S16:
-		{
-			float fResult = CLAMP((float)_fValue * m_quantizeTable[_uScale], -32768.0f, 32767.0f);
-			Memory::Write_U16((u16)(s16)fResult, _Addr); 
-		}
-		break;
-
-	default:
-		_dbg_assert_msg_(POWERPC, 0, "PS dequantize - unknown type to read");
-		break;
-	}
-}
-
-float Interpreter::Helper_Dequantize(const u32 _Addr, const EQuantizeType _quantizeType, 
-									 const unsigned int _uScale)
-{
-	// dequantize the value
-	float fResult;
-	switch(_quantizeType)
-	{
-	case QUANTIZE_FLOAT:
-		{
-			u32 dwValue = Memory::Read_U32(_Addr);
-			fResult = *(float*)&dwValue;
-		}
-		break;
-
-	case QUANTIZE_U8:
-		fResult = static_cast<float>(Memory::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; 
-		break;
-
-	case QUANTIZE_U16:
-		fResult = static_cast<float>(Memory::Read_U16(_Addr)) * m_dequantizeTable[_uScale]; 
-		break;
-
-	case QUANTIZE_S8:
-		fResult = static_cast<float>((s8)Memory::Read_U8(_Addr)) * m_dequantizeTable[_uScale]; 
-		break;
-
-		// used for THP player
-	case QUANTIZE_S16:
-		fResult = static_cast<float>((s16)Memory::Read_U16(_Addr)) * m_dequantizeTable[_uScale];
-		break;
-
-	default:
-		_dbg_assert_msg_(POWERPC, 0, "PS dequantize - unknown type to read");
-		fResult = 0;
-		break;
-	}
-	return fResult;
-}
-
-void Interpreter::psq_l(UGeckoInstruction _inst) 
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.I));
-	const EQuantizeType ldType = static_cast<EQuantizeType>(gqr.LD_TYPE);
-	const unsigned int ldScale = gqr.LD_SCALE;
-	const u32 EA = _inst.RA ?
-		(m_GPR[_inst.RA] + _inst.SIMM_12) : (u32)_inst.SIMM_12;
-
-	int c = 4;
-	if ((ldType == QUANTIZE_U8)  || (ldType == QUANTIZE_S8))  c = 0x1;
-	if ((ldType == QUANTIZE_U16) || (ldType == QUANTIZE_S16)) c = 0x2;
-
-	if (_inst.W == 0)
-	{
-		float ps0 = Helper_Dequantize(EA,   ldType, ldScale);
-		float ps1 = Helper_Dequantize(EA+c, ldType, ldScale);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = ps1;
-	}
-	else
-	{
-		float ps0 = Helper_Dequantize(EA,   ldType, ldScale);
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = 1.0f;
-	}
-}
-
-void Interpreter::psq_lu(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.I));
-	const EQuantizeType ldType = static_cast<EQuantizeType>(gqr.LD_TYPE);
-	const unsigned int ldScale = gqr.LD_SCALE;
-	const u32 EA = m_GPR[_inst.RA] + _inst.SIMM_12;
-
-	int c = 4;
-	if ((ldType == 4) || (ldType == 6)) c = 0x1;
-	if ((ldType == 5) || (ldType == 7)) c = 0x2;
-
-	if (_inst.W == 0)
-	{
-		float ps0 = Helper_Dequantize( EA,   ldType, ldScale );
-		float ps1 = Helper_Dequantize( EA+c, ldType, ldScale );
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = ps1;
-	}
-	else
-	{
-		float ps0 = Helper_Dequantize( EA,   ldType, ldScale );
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = 1.0f;
-	}
-	m_GPR[_inst.RA] = EA;
-}
-
-void Interpreter::psq_st(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.I));
-	const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
-	const unsigned int stScale = gqr.ST_SCALE;
-	const u32 EA = _inst.RA ?
-		(m_GPR[_inst.RA] + _inst.SIMM_12) : (u32)_inst.SIMM_12;
-
-	int c = 4;
-	if ((stType == 4) || (stType == 6)) c = 0x1;
-	if ((stType == 5) || (stType == 7)) c = 0x2;
-
-	if (_inst.W == 0)
-	{
-		Helper_Quantize( EA,   rPS0(_inst.RS), stType, stScale );
-		Helper_Quantize( EA+c, rPS1(_inst.RS), stType, stScale );
-	}
-	else
-	{
-		Helper_Quantize( EA,   rPS0(_inst.RS), stType, stScale );
-	}
-}
-
-void Interpreter::psq_stu(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.I));
-	const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
-	const unsigned int stScale = gqr.ST_SCALE;
-	const u32 EA = m_GPR[_inst.RA] + _inst.SIMM_12;
-
-	int c = 4;
-	if ((stType == 4) || (stType == 6)) c = 0x1;
-	if ((stType == 5) || (stType == 7)) c = 0x2;
-
-	if (_inst.W == 0)
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-		Helper_Quantize(EA+c, rPS1(_inst.RS), stType, stScale);
-	}
-	else
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-	}
-	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-	{
-		return;
-	}
-	m_GPR[_inst.RA] = EA;
-}
-
-void Interpreter::psq_lx(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.Ix));
-	const EQuantizeType ldType = static_cast<EQuantizeType>(gqr.LD_TYPE);
-	const unsigned int ldScale = gqr.LD_SCALE;
-	const u32 EA = _inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB];
-
-	int c = 4;
-	if ((ldType == 4) || (ldType == 6)) c = 0x1;
-	if ((ldType == 5) || (ldType == 7)) c = 0x2;
-
-	if (_inst.Wx == 0)
-	{
-		float ps0 = Helper_Dequantize( EA,   ldType, ldScale );
-		float ps1 = Helper_Dequantize( EA+c, ldType, ldScale );
-
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = ps1;
-	}
-	else
-	{
-		float ps0 = Helper_Dequantize( EA, ldType, ldScale );
-		float ps1 = 1.0f;
-
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = ps1;
-	}
-}
-
-void Interpreter::psq_stx(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.Ix));
-	const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
-	const unsigned int stScale = gqr.ST_SCALE;
-	const u32 EA = _inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB];
-
-	int c = 4;
-	if ((stType == 4) || (stType == 6)) c = 0x1;
-	if ((stType == 5) || (stType == 7)) c = 0x2;
-
-	if (_inst.Wx == 0)
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-		Helper_Quantize(EA+c, rPS1(_inst.RS), stType, stScale);
-	}
-	else
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-	}
-}
-
-void Interpreter::psq_lux(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.Ix));
-	const EQuantizeType ldType = static_cast<EQuantizeType>(gqr.LD_TYPE);
-	const unsigned int ldScale = gqr.LD_SCALE;
-	const u32 EA = m_GPR[_inst.RA] + m_GPR[_inst.RB];
-
-	int c = 4;
-	if ((ldType == 4) || (ldType == 6)) c = 0x1;
-	if ((ldType == 5) || (ldType == 7)) c = 0x2;
-
-	if (_inst.Wx == 0)
-	{
-		float ps0 = Helper_Dequantize( EA,   ldType, ldScale );
-		float ps1 = Helper_Dequantize( EA+c, ldType, ldScale );
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = ps1;
-	}
-	else
-	{
-		float ps0 = Helper_Dequantize( EA, ldType, ldScale );
-		if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-		{
-			return;
-		}
-		rPS0(_inst.RS) = ps0;
-		rPS1(_inst.RS) = 1.0f;
-	}
-	m_GPR[_inst.RA] = EA;
-}
-
-void Interpreter::psq_stux(UGeckoInstruction _inst)
-{
-	const UGQR gqr(rSPR(SPR_GQR0 + _inst.Ix));
-	const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
-	const unsigned int stScale = gqr.ST_SCALE;
-	const u32 EA = m_GPR[_inst.RA] + m_GPR[_inst.RB];
-
-	int c = 4;
-	if ((stType == 4) || (stType == 6)) c = 0x1;
-	if ((stType == 5) || (stType == 7)) c = 0x2;
-
-	if (_inst.Wx == 0)
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-		Helper_Quantize(EA+c, rPS1(_inst.RS), stType, stScale);
-	}
-	else
-	{
-		Helper_Quantize(EA,   rPS0(_inst.RS), stType, stScale);
-	}
-	if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI)
-	{
-		return;
-	}
-	m_GPR[_inst.RA] = EA;
-
-}  // namespace=======
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
deleted file mode 100644
index 54baf2e0c2..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-#include "Common.h"
-#include "MathUtil.h"
-#include "Interpreter.h"
-#include "../../HW/Memmap.h"
-
-#include "Interpreter_FPUtils.h"
-
-using namespace MathUtil;
-
-// These "binary instructions" do not alter FPSCR.
-void Interpreter::ps_sel(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS0(_inst.FA) >= -0.0 ? rPS0(_inst.FC) : rPS0(_inst.FB);
-	rPS1(_inst.FD) = rPS1(_inst.FA) >= -0.0 ? rPS1(_inst.FC) : rPS1(_inst.FB);
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_neg(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB) ^ (1ULL << 63);
-	riPS1(_inst.FD) = riPS1(_inst.FB) ^ (1ULL << 63);
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_mr(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = rPS0(_inst.FB);
-	rPS1(_inst.FD) = rPS1(_inst.FB);
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_nabs(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB) | (1ULL << 63); 
-	riPS1(_inst.FD) = riPS1(_inst.FB) | (1ULL << 63); 
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_abs(UGeckoInstruction _inst)
-{
-	riPS0(_inst.FD) = riPS0(_inst.FB) &~ (1ULL << 63); 
-	riPS1(_inst.FD) = riPS1(_inst.FB) &~ (1ULL << 63); 
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// These are just moves, double is OK.
-void Interpreter::ps_merge00(UGeckoInstruction _inst)
-{
-	double p0 = rPS0(_inst.FA);
-	double p1 = rPS0(_inst.FB);
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_merge01(UGeckoInstruction _inst)
-{
-	double p0 = rPS0(_inst.FA);
-	double p1 = rPS1(_inst.FB);
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_merge10(UGeckoInstruction _inst)
-{
-	double p0 = rPS1(_inst.FA);
-	double p1 = rPS0(_inst.FB);
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_merge11(UGeckoInstruction _inst)
-{
-	double p0 = rPS1(_inst.FA);
-	double p1 = rPS1(_inst.FB);
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-// From here on, the real deal.
-void Interpreter::ps_div(UGeckoInstruction _inst)
-{	
-	u32 ex_mask = 0;
-
-	// PS0
-	{
-		double a = rPS0(_inst.FA);
-		double b = rPS0(_inst.FB);
-		double &res = rPS0(_inst.FD);
-
-		if (a != a) res = a;
-		else if (b != b) res = b;
-		else
-		{
-			if (b == 0.0)
-			{
-				ex_mask |= FPSCR_ZX;
-				if (rPS0(_inst.FA) == 0.0)
-				{
-					ex_mask |= FPSCR_VXZDZ;
-					res = PPC_NAN;
-				}
-				else
-				{
-					res = ForceSingle(a / b);
-				}
-			}
-			else
-			{
-				if (IsINF(a) && IsINF(b))
-				{
-					ex_mask |= FPSCR_VXIDI;
-					res = PPC_NAN;
-				}
-				else
-				{
-					res = ForceSingle(a / b);
-				}
-			}
-		}
-	}
-
-	// PS1
-	{
-		double a = rPS1(_inst.FA);
-		double b = rPS1(_inst.FB);
-		double &res = rPS1(_inst.FD);
-
-		if (a != a) res = a;
-		else if (b != b) res = b;
-		else
-		{
-			if (b == 0.0)
-			{
-				ex_mask |= FPSCR_ZX;
-				if (rPS0(_inst.FA) == 0.0)
-				{
-					ex_mask |= FPSCR_VXZDZ;
-					res = PPC_NAN;
-				}
-				else
-				{
-					res = ForceSingle(a / b);
-				}
-			}
-			else
-			{
-				if (IsINF(a) && IsINF(b))
-				{
-					ex_mask |= FPSCR_VXIDI;
-					res = PPC_NAN;
-				}
-				else
-				{
-					res = ForceSingle(a / b);
-				}
-			}
-		}
-	}
-
-	SetFPException(ex_mask);	
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_res(UGeckoInstruction _inst)
-{
-	// this code is based on the real hardware tests
-	double a = rPS0(_inst.FB);
-	double b = rPS1(_inst.FB);
-	if (a == 0.0 || b == 0.0)
-	{
-		SetFPException(FPSCR_ZX);
-	}
-	rPS0(_inst.FD) = ForceSingle(1.0 / a);
-	if (a != 0.0 && IsINF(rPS0(_inst.FD)))
-	{
-		if (rPS0(_inst.FD) > 0)
-			riPS0(_inst.FD) = MAX_SINGLE; // largest finite single
-		else
-			riPS0(_inst.FD) = MIN_SINGLE; // most negative finite single
-	}
-	rPS1(_inst.FD) = ForceSingle(1.0 / b);
-	if (b != 0.0 && IsINF(rPS1(_inst.FD)))
-	{
-		if (rPS1(_inst.FD) > 0)
-			riPS1(_inst.FD) = MAX_SINGLE;
-		else
-			riPS1(_inst.FD) = MIN_SINGLE;
-	}
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_rsqrte(UGeckoInstruction _inst)
-{
-	// this code is based on the real hardware tests
-	if (rPS0(_inst.FB) == 0.0 || rPS1(_inst.FB) == 0.0)
-	{
-		SetFPException(FPSCR_ZX);
-	}
-	// PS0
-	if (rPS0(_inst.FB) < 0.0)
-	{
-		SetFPException(FPSCR_VXSQRT);
-		rPS0(_inst.FD) = PPC_NAN;
-	}
-	else
-	{
-		rPS0(_inst.FD) = 1.0 / sqrt(rPS0(_inst.FB));
-		u32 t = ConvertToSingle(riPS0(_inst.FD));
-		rPS0(_inst.FD) = *(float*)&t;
-	}
-	// PS1
-	if (rPS1(_inst.FB) < 0.0)
-	{
-		SetFPException(FPSCR_VXSQRT);
-		rPS1(_inst.FD) = PPC_NAN;
-	}
-	else
-	{
-		rPS1(_inst.FD) = 1.0 / sqrt(rPS1(_inst.FB));
-		u32 t = ConvertToSingle(riPS1(_inst.FD));
-		rPS1(_inst.FD) = *(float*)&t;
-	}
-
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-
-void Interpreter::ps_sub(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
-	rPS1(_inst.FD) = ForceSingle(NI_sub(rPS1(_inst.FA), rPS1(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_add(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
-	rPS1(_inst.FD) = ForceSingle(NI_add(rPS1(_inst.FA), rPS1(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_mul(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle(NI_mul(rPS0(_inst.FA), rPS0(_inst.FC)));
-	rPS1(_inst.FD) = ForceSingle(NI_mul(rPS1(_inst.FA), rPS1(_inst.FC)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-
-void Interpreter::ps_msub(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle(NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	rPS1(_inst.FD) = ForceSingle(NI_msub(rPS1(_inst.FA), rPS1(_inst.FC), rPS1(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_madd(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle(NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
-	rPS1(_inst.FD) = ForceSingle(NI_madd(rPS1(_inst.FA), rPS1(_inst.FC), rPS1(_inst.FB)));
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_nmsub(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle( -NI_msub( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ) );
-	rPS1(_inst.FD) = ForceSingle( -NI_msub( rPS1(_inst.FA), rPS1(_inst.FC), rPS1(_inst.FB) ) );
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_nmadd(UGeckoInstruction _inst)
-{
-	rPS0(_inst.FD) = ForceSingle( -NI_madd( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ) );
-	rPS1(_inst.FD) = ForceSingle( -NI_madd( rPS1(_inst.FA), rPS1(_inst.FC), rPS1(_inst.FB) ) );
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_sum0(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle(NI_add(rPS0(_inst.FA), rPS1(_inst.FB)));
-	double p1 = ForceSingle(rPS1(_inst.FC));
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_sum1(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle(rPS0(_inst.FC));
-	double p1 = ForceSingle(NI_add(rPS0(_inst.FA), rPS1(_inst.FB)));
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS1(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_muls0(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle(NI_mul(rPS0(_inst.FA), rPS0(_inst.FC)));
-	double p1 = ForceSingle(NI_mul(rPS1(_inst.FA), rPS0(_inst.FC)));
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_muls1(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle(NI_mul(rPS0(_inst.FA), rPS1(_inst.FC)));
-	double p1 = ForceSingle(NI_mul(rPS1(_inst.FA), rPS1(_inst.FC)));
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_madds0(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle( NI_madd( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)) );
-	double p1 = ForceSingle( NI_madd( rPS1(_inst.FA), rPS0(_inst.FC), rPS1(_inst.FB)) );
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_madds1(UGeckoInstruction _inst)
-{
-	double p0 = ForceSingle( NI_madd( rPS0(_inst.FA), rPS1(_inst.FC), rPS0(_inst.FB)) );
-	double p1 = ForceSingle( NI_madd( rPS1(_inst.FA), rPS1(_inst.FC), rPS1(_inst.FB)) );
-	rPS0(_inst.FD) = p0;
-	rPS1(_inst.FD) = p1;
-	UpdateFPRF(rPS0(_inst.FD));
-	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
-}
-
-void Interpreter::ps_cmpu0(UGeckoInstruction _inst)
-{
-	double fa = rPS0(_inst.FA);
-	double fb = rPS0(_inst.FB);
-	int compareResult;
-
-	if (fa < fb)         		compareResult = 8; 
-	else if (fa > fb)        	compareResult = 4; 
-	else if (fa == fb)			compareResult = 2;
-	else						
-	{
-		compareResult = 1;
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-		}
-	}
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);	
-}
-
-void Interpreter::ps_cmpo0(UGeckoInstruction _inst)
-{	
-	double fa = rPS0(_inst.FA);
-	double fb = rPS0(_inst.FB);
-	int compareResult;
-
-	if (fa < fb)         		compareResult = 8; 
-	else if (fa > fb)        	compareResult = 4; 
-	else if (fa == fb)			compareResult = 2;
-	else
-	{
-		compareResult = 1;
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-			if (!FPSCR.VE) 
-				SetFPException(FPSCR_VXVC);
-		}
-		else 
-		{
-			//if (IsQNAN(fa) || IsQNAN(fb)) // this is always true
-			SetFPException(FPSCR_VXVC);
-		}
-	}
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);	
-}
-
-void Interpreter::ps_cmpu1(UGeckoInstruction _inst)
-{
-	double fa = rPS1(_inst.FA);
-	double fb = rPS1(_inst.FB);
-	int compareResult;
-
-	if (fa < fb)         		compareResult = 8; 
-	else if (fa > fb)        	compareResult = 4; 
-	else if (fa == fb)			compareResult = 2;
-	else						
-	{
-		compareResult = 1;
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-		}
-	}
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);	
-}
-
-void Interpreter::ps_cmpo1(UGeckoInstruction _inst)
-{	
-	double fa = rPS1(_inst.FA);
-	double fb = rPS1(_inst.FB);
-	int compareResult;
-
-	if (fa < fb)         		compareResult = 8; 
-	else if (fa > fb)        	compareResult = 4; 
-	else if (fa == fb)			compareResult = 2;
-	else
-	{
-		compareResult = 1;
-		if (IsSNAN(fa) || IsSNAN(fb))
-		{
-			SetFPException(FPSCR_VXSNAN);
-			if (!FPSCR.VE) 
-				SetFPException(FPSCR_VXVC);
-		}
-		else 
-		{
-			//if (IsQNAN(fa) || IsQNAN(fb)) // this is always true
-			SetFPException(FPSCR_VXVC);
-		}
-	}
-	FPSCR.FPRF = compareResult;
-	SetCRField(_inst.CRFD, compareResult);	
-}
-
-// __________________________________________________________________________________________________
-// dcbz_l
-// TODO(ector) check docs
-void Interpreter::dcbz_l(UGeckoInstruction _inst)
-{
-	//FAKE: clear memory instead of clearing the cache block
-	Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
deleted file mode 100644
index b55cbd6b45..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <float.h>
-#ifdef _WIN32
-#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
-#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
-#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64
-#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64
-#include <intrin.h>
-#undef _interlockedbittestandset
-#undef _interlockedbittestandreset
-#undef _interlockedbittestandset64
-#undef _interlockedbittestandreset64
-#endif
-
-#include "CPUDetect.h"
-#include "Atomic.h"
-#include "../../CoreTiming.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/SystemTimers.h"
-#include "../../Core.h"
-#include "Interpreter.h"
-#include "FPURoundMode.h"
-
-#include "Interpreter_FPUtils.h"
-
-/*
-
-Most of these are together with fctiwx
-mffsx: 800c3624
-mffsx: 80043c98
-mffsx: 8003dd48
-mffsx: 8003dd9c
-mffsx: 80036608
-mffsx: 80036650 (huh?)
-
-*/
-// TODO(ector): More proper handling of SSE state.
-// That is, set rounding mode etc when entering jit code or the interpreter loop
-// Restore rounding mode when calling anything external
-
-static void FPSCRtoFPUSettings(UReg_FPSCR fp)
-{
-
-	FPURoundMode::SetRoundMode(fp.RN);
-	
-	if (fp.VE || fp.OE || fp.UE || fp.ZE || fp.XE)
-	{
-		//PanicAlert("FPSCR - exceptions enabled. Please report. VE=%i OE=%i UE=%i ZE=%i XE=%i",
-		//	fp.VE, fp.OE, fp.UE, fp.ZE, fp.XE);
-		// Pokemon Colosseum does this. Gah.
-	}
-
-	// Also corresponding SSE rounding mode setting
-	if (FPSCR.NI)
-	{
-		// Either one of these two breaks Beyond Good & Evil.
-		// if (cpu_info.bSSSE3)
-		//     csr |= DAZ;
-		// csr |= FTZ;
-	}
-	FPURoundMode::SetSIMDMode(FPSCR.RN);
-}
-
-void Interpreter::mtfsb0x(UGeckoInstruction _inst)
-{
-	u32 b = 0x80000000 >> _inst.CRBD;
-
-	/*if (b & 0x9ff80700)
-		PanicAlert("mtfsb0 clears bit %d, PC=%x", _inst.CRBD, PC);*/
-
-	FPSCR.Hex &= ~b;
-	FPSCRtoFPUSettings(FPSCR);
-
-	if (_inst.Rc) PanicAlert("mtfsb0x: inst_.Rc");
-}
-
-void Interpreter::mtfsb1x(UGeckoInstruction _inst)
-{
-	// this instruction can affect FX
-	u32 b = 0x80000000 >> _inst.CRBD;
-	if (b & FPSCR_ANY_X)
-		SetFPException(b);
-	else
-		FPSCR.Hex |= b;
-	FPSCRtoFPUSettings(FPSCR);	
-
-	if (_inst.Rc) PanicAlert("mtfsb1x: inst_.Rc");
-}
-
-void Interpreter::mtfsfix(UGeckoInstruction _inst)
-{
-	u32 mask = (0xF0000000 >> (4 * _inst.CRFD));
-	u32 imm = (_inst.hex << 16) & 0xF0000000;
-
-	/*u32 cleared = ~(imm >> (4 * _inst.CRFD)) & FPSCR.Hex & mask;
-	if (cleared & 0x9ff80700)
-		PanicAlert("mtfsfi clears %08x, PC=%x", cleared, PC);*/
-
-	FPSCR.Hex = (FPSCR.Hex & ~mask) | (imm >> (4 * _inst.CRFD));
-
-	FPSCRtoFPUSettings(FPSCR);
-
-	if (_inst.Rc) PanicAlert("mtfsfix: inst_.Rc");
-}
-
-void Interpreter::mtfsfx(UGeckoInstruction _inst)
-{
-	u32 fm = _inst.FM;
-	u32 m = 0;
-	for (int i = 0; i < 8; i++)
-	{
-		if (fm & (1 << i))
-			m |= (0xF << (i * 4));
-	}
-
-	/*u32 cleared = ~((u32)(riPS0(_inst.FB))) & FPSCR.Hex & m;
-	if (cleared & 0x9ff80700)
-		PanicAlert("mtfsf clears %08x, PC=%x", cleared, PC);*/
-
-	FPSCR.Hex = (FPSCR.Hex & ~m) | ((u32)(riPS0(_inst.FB)) & m);
-	FPSCRtoFPUSettings(FPSCR);
-
-	if (_inst.Rc) PanicAlert("mtfsfx: inst_.Rc");
-}
-
-void Interpreter::mcrxr(UGeckoInstruction _inst)
-{
-	// USES_XER
-	SetCRField(_inst.CRFD, PowerPC::ppcState.spr[SPR_XER] >> 28); 
-	PowerPC::ppcState.spr[SPR_XER] &= ~0xF0000000; // clear 0-3
-}
-
-void Interpreter::mfcr(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = GetCR();
-}
-
-void Interpreter::mtcrf(UGeckoInstruction _inst)
-{
-	u32 crm = _inst.CRM;
-	if (crm == 0xFF)
-	{
-		SetCR(m_GPR[_inst.RS]);
-	}
-	else
-	{
-		//TODO: use lookup table? probably not worth it
-		u32 mask = 0;
-		for (int i = 0; i < 8; i++) {
-			if (crm & (1 << i))
-				mask |= 0xF << (i*4);
-		}
-		SetCR((GetCR() & ~mask) | (m_GPR[_inst.RS] & mask));
-	}
-}
-
-
-void Interpreter::mfmsr(UGeckoInstruction _inst)
-{
-	//Privileged?
-	m_GPR[_inst.RD] = MSR;
-}
-
-void Interpreter::mfsr(UGeckoInstruction _inst)
-{
-	m_GPR[_inst.RD] = PowerPC::ppcState.sr[_inst.SR];
-}
-
-void Interpreter::mfsrin(UGeckoInstruction _inst)
-{
-	int index = (m_GPR[_inst.RB] >> 28) & 0xF;
-	m_GPR[_inst.RD] = PowerPC::ppcState.sr[index];
-}
-
-void Interpreter::mtmsr(UGeckoInstruction _inst)
-{
-	// Privileged?
-	MSR = m_GPR[_inst.RS];
-	PowerPC::CheckExceptions();
-	m_EndBlock = true;
-}
-
-// Segment registers. MMU control.
-
-static void SetSR(int index, u32 value) {
-	DEBUG_LOG(POWERPC, "%08x: MMU: Segment register %i set to %08x", PowerPC::ppcState.pc, index, value);
-	PowerPC::ppcState.sr[index] = value;
-}
-
-void Interpreter::mtsr(UGeckoInstruction _inst)
-{
-	int index = _inst.SR;
-	u32 value = m_GPR[_inst.RS];
-	SetSR(index, value);
-}
-
-void Interpreter::mtsrin(UGeckoInstruction _inst)
-{
-	int index = (m_GPR[_inst.RB] >> 28) & 0xF;
-	u32 value = m_GPR[_inst.RS];
-	SetSR(index, value);
-}
-
-
-
-void Interpreter::mftb(UGeckoInstruction _inst)
-{
-	int iIndex = (_inst.TBR >> 5) | ((_inst.TBR & 0x1F) << 5);
-	_dbg_assert_msg_(POWERPC, (iIndex == SPR_TL) || (iIndex == SPR_TU), "Invalid mftb");
-	(void)iIndex;
-	mfspr(_inst);
-}
-
-
-void Interpreter::mfspr(UGeckoInstruction _inst)
-{
-	u32 iIndex = ((_inst.SPR & 0x1F) << 5) + ((_inst.SPR >> 5) & 0x1F);
-
-	//TODO - check processor privilege level - many of these require privilege
-	//XER LR CTR are the only ones available in user mode, time base can be read too.
-	//Gamecube games always run in superuser mode, but hey....
-
-	switch (iIndex) 
-	{
-	case SPR_DEC:
-		if ((rSPR(iIndex) & 0x80000000) == 0) // We are still decrementing
-		{
-			rSPR(iIndex) = SystemTimers::GetFakeDecrementer();
-		}
-		break;
-
-	case SPR_TL:
-	case SPR_TU:
-		*((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :)
-		break;
-
-	case SPR_WPAR:
-		{
-			// TODO: If wpar_empty ever is false, Paper Mario hangs. Strange.
-			// Maybe WPAR is automatically flushed after a certain amount of time?
-			bool wpar_empty = true; //GPFifo::IsEmpty();
-			if (!wpar_empty)
-				rSPR(iIndex) |= 1;  // BNE = buffer not empty
-			else
-				rSPR(iIndex) &= ~1;
-		}		
-		break;
-	}
-	m_GPR[_inst.RD] = rSPR(iIndex);
-}
-
-void Interpreter::mtspr(UGeckoInstruction _inst)
-{
-	u32 iIndex = (_inst.SPRU << 5) | (_inst.SPRL & 0x1F);
-	u32 oldValue = rSPR(iIndex);
-	rSPR(iIndex) = m_GPR[_inst.RD];
-
-	//TODO - check processor privilege level - many of these require privilege
-	//XER LR CTR are the only ones available in user mode, time base can be read too.
-	//Gamecube games always run in superuser mode, but hey....
-
-	//Our DMA emulation is highly inaccurate - instead of properly emulating the queue
-	//and so on, we simply make all DMA:s complete instantaneously.
-
-	switch(iIndex)
-	{
-	case SPR_TL:
-	case SPR_TU:
-		PanicAlert("Illegal Write to TL/TU");
-		break;
-
-	case SPR_TL_W:
-		TL = m_GPR[_inst.RD];
-		SystemTimers::TimeBaseSet();
-		break;
-
-	case SPR_TU_W:
-		TU = m_GPR[_inst.RD];
-		SystemTimers::TimeBaseSet();
-		break;
-
-	case SPR_HID0: // HID0
-		{
-			UReg_HID0 old_hid0;
-			old_hid0.Hex = oldValue;
-			if (HID0.ICE != old_hid0.ICE)
-			{
-				INFO_LOG(POWERPC, "Instruction Cache Enable (HID0.ICE) = %d", (int)HID0.ICE);
-			}
-			if (HID0.ILOCK != old_hid0.ILOCK)
-			{
-				INFO_LOG(POWERPC, "Instruction Cache Lock (HID0.ILOCK) = %d", (int)HID0.ILOCK);
-			}
-			if (HID0.ICFI)
-			{
-				HID0.ICFI = 0;
-				INFO_LOG(POWERPC, "Flush Instruction Cache! ICE=%d", (int)HID0.ICE);
-				// this is rather slow
-				// most games do it only once during initialization
-				PowerPC::ppcState.iCache.Reset();
-			}
-		}
-		break;
-	case SPR_HID2: // HID2
-		{
-			UReg_HID2 old_hid2;
-			old_hid2.Hex = oldValue;
-
-			//if (HID2.LCE && !old_hid2.LCE)
-			//	PanicAlert("Locked cache enabled!");
-
-			if (HID2.PSE == 0)
-				PanicAlert("WARNING: PSE (paired single enable) in HID2 was unset");
-
-			//	bool WriteGatherPipeEnable = (bool)HID2.WPE; //TODO?
-			//	bool LockedCacheEnable = (bool)HID2.LCE;
-			//	int DMAQueueLength = HID2.DMAQL; // Ignore - our DMA:s are instantaneous
-			//	bool PairedSingleEnable = HID2.PSE;
-			//	bool QuantizeEnable = HID2.LSQE;
-			//TODO(ector): Protect LC memory if LCE is false.
-			//TODO(ector): Honor PSE.
-
-			//_assert_msg_(POWERPC, WriteGatherPipeEnable, "Write gather pipe not enabled!");
-			//if ((HID2.PSE == 0))
-			//	MessageBox(NULL, "PSE in HID2 is set", "Warning", MB_OK);
-		}
-		break;
-
-	case SPR_WPAR:
-		_assert_msg_(POWERPC, m_GPR[_inst.RD] == 0x0C008000, "Gather pipe @ %08x", PC);
-		GPFifo::ResetGatherPipe();
-		break;
-
-	// Graphics Quantization Registers
-	case SPR_GQR0:
-	case SPR_GQR0 + 1:
-	case SPR_GQR0 + 2:
-	case SPR_GQR0 + 3:
-	case SPR_GQR0 + 4:
-	case SPR_GQR0 + 5:
-	case SPR_GQR0 + 6:
-	case SPR_GQR0 + 7:
-		break;
-
-	case SPR_DMAL:
-		// Locked cache<->Memory DMA
-		// Total fake, we ignore that DMAs take time.
-		if (DMAL.DMA_T) 
-		{
-			u32 dwMemAddress = DMAU.MEM_ADDR << 5;
-			u32 dwCacheAddress = DMAL.LC_ADDR << 5;
-			u32 iLength = ((DMAU.DMA_LEN_U << 2) | DMAL.DMA_LEN_L);
-			// INFO_LOG(POWERPC, "DMA: mem = %x, cache = %x, len = %u, LD = %d, PC=%x", dwMemAddress, dwCacheAddress, iLength, (int)DMAL.DMA_LD, PC);
-			if (iLength == 0) 
-				iLength = 128;
-			if (DMAL.DMA_LD)
-				Memory::DMA_MemoryToLC(dwCacheAddress, dwMemAddress, iLength);
-			else
-				Memory::DMA_LCToMemory(dwMemAddress, dwCacheAddress, iLength);
-		}
-		DMAL.DMA_T = 0;
-		break;
-
-	case SPR_L2CR:
-		//PanicAlert("mtspr( L2CR )!");
-		break;
-
-	case SPR_DEC:
-		if (!(oldValue >> 31) && (m_GPR[_inst.RD]>>31))   //top bit from 0 to 1
-		{
-			PanicAlert("Interesting - Software triggered Decrementer exception");
-			Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_DECREMENTER);
-		}
-		SystemTimers::DecrementerSet();
-		break;
-
-	// Page table base etc
-	case SPR_SDR:
-		Memory::SDRUpdated();
-		break;
-	}
-}
-
-void Interpreter::crand(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, GetCRBit(_inst.CRBA) & GetCRBit(_inst.CRBB));
-}
-
-void Interpreter::crandc(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, GetCRBit(_inst.CRBA) & (1 ^ GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::creqv(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) ^ GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::crnand(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) & GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::crnor(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, 1 ^ (GetCRBit(_inst.CRBA) | GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::cror(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) | GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::crorc(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) | (1 ^ GetCRBit(_inst.CRBB))));
-}
-
-void Interpreter::crxor(UGeckoInstruction _inst)
-{
-	SetCRBit(_inst.CRBD, (GetCRBit(_inst.CRBA) ^ GetCRBit(_inst.CRBB)));
-}
-
-void Interpreter::mcrf(UGeckoInstruction _inst)
-{
-	int cr_f = GetCRField(_inst.CRFS);
-	SetCRField(_inst.CRFD, cr_f);
-}
-
-void Interpreter::isync(UGeckoInstruction _inst)
-{
-	//shouldn't do anything
-}
-
-// the following commands read from FPSCR
-
-void Interpreter::mcrfs(UGeckoInstruction _inst)
-{
-	//if (_inst.CRFS != 3 && _inst.CRFS != 4)
-	//	PanicAlert("msrfs at %x, CRFS = %d, CRFD = %d", PC, (int)_inst.CRFS, (int)_inst.CRFD);
-
-	UpdateFPSCR();
-	u32 fpflags = ((FPSCR.Hex >> (4 * (7 - _inst.CRFS))) & 0xF);
-	switch (_inst.CRFS) {
-	case 0:
-		FPSCR.FX = 0;
-		FPSCR.OX = 0;
-		break;
-	case 1:
-		FPSCR.UX = 0;
-		FPSCR.ZX = 0;
-		FPSCR.XX = 0;
-		FPSCR.VXSNAN = 0;
-		break;
-	case 2:
-		FPSCR.VXISI = 0;
-		FPSCR.VXIDI = 0;
-		FPSCR.VXZDZ = 0;
-		FPSCR.VXIMZ = 0;
-		break;
-	case 3:
-		FPSCR.VXVC = 0;
-		break;
-	case 5:
-		FPSCR.VXSOFT = 0;
-		FPSCR.VXSQRT = 0;
-		FPSCR.VXCVI = 0;
-		break;
-	}
-	SetCRField(_inst.CRFD, fpflags);	
-}
-
-void Interpreter::mffsx(UGeckoInstruction _inst)
-{
-	// load from FPSCR
-	// This may or may not be accurate - but better than nothing, I guess
-	// TODO(ector): grab all overflow flags etc and set them in FPSCR
-
-	UpdateFPSCR();
-	riPS0(_inst.FD)	= (u64)FPSCR.Hex;
-	if (_inst.Rc) PanicAlert("mffsx: inst_.Rc");
-}
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp
deleted file mode 100644
index f1403bed87..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp
+++ /dev/null
@@ -1,499 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Interpreter_Tables.h"
-
-typedef void (*_Instruction) (UGeckoInstruction instCode);
-
-struct GekkoOPTemplate
-{
-	int opcode;
-	_Instruction Inst;
-	GekkoOPInfo opinfo;
-};
-
-static GekkoOPTemplate primarytable[] = 
-{
-	{4,  Interpreter::RunTable4,    {"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0, 0, 0, 0, 0}},
-	{19, Interpreter::RunTable19,   {"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0, 0, 0, 0, 0}},
-	{31, Interpreter::RunTable31,   {"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0, 0, 0, 0, 0}},
-	{59, Interpreter::RunTable59,   {"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0, 0, 0, 0, 0}},
-	{63, Interpreter::RunTable63,   {"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0, 0, 0, 0, 0}},
-
-	{16, Interpreter::bcx,          {"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}},
-	{18, Interpreter::bx,           {"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}},
-
-	{1,  Interpreter::HLEFunction,  {"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}},
-	{2,  Interpreter::CompiledBlock,{"DynaBlock",   OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{3,  Interpreter::twi,          {"twi",         OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}},
-	{17, Interpreter::sc,           {"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}},
-
-	{7,  Interpreter::mulli,        {"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2, 0, 0, 0}},
-	{8,  Interpreter::subfic,       {"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA, 0, 0, 0, 0}},
-	{10, Interpreter::cmpli,        {"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 0, 0, 0, 0}},
-	{11, Interpreter::cmpi,         {"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn, 0, 0, 0, 0}},
-	{12, Interpreter::addic,        {"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA, 0, 0, 0, 0}},
-	{13, Interpreter::addic_rc,     {"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0, 0, 0, 0, 0}},
-	{14, Interpreter::addi,         {"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0, 0, 0, 0, 0}},
-	{15, Interpreter::addis,        {"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0, 0, 0, 0, 0}},
-
-	{20, Interpreter::rlwimix,      {"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{21, Interpreter::rlwinmx,      {"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{23, Interpreter::rlwnmx,       {"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT, 0, 0, 0, 0}},
-
-	{24, Interpreter::ori,          {"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 0, 0, 0, 0}},
-	{25, Interpreter::oris,         {"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 0, 0, 0, 0}},
-	{26, Interpreter::xori,         {"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 0, 0, 0, 0}},
-	{27, Interpreter::xoris,        {"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S, 0, 0, 0, 0}},
-	{28, Interpreter::andi_rc,      {"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0, 0, 0, 0, 0}},
-	{29, Interpreter::andis_rc,     {"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0, 0, 0, 0, 0}},
-
-	{32, Interpreter::lwz,          {"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{33, Interpreter::lwzu,         {"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{34, Interpreter::lbz,          {"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{35, Interpreter::lbzu,         {"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{40, Interpreter::lhz,          {"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{41, Interpreter::lhzu,         {"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{42, Interpreter::lha,          {"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-	{43, Interpreter::lhau,         {"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{44, Interpreter::sth,          {"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-	{45, Interpreter::sthu,         {"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-	{36, Interpreter::stw,          {"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-	{37, Interpreter::stwu,         {"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-	{38, Interpreter::stb,	        {"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-	{39, Interpreter::stbu,         {"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{46, Interpreter::lmw,          {"lmw",   OPTYPE_SYSTEM, FL_EVIL | FL_LOADSTORE, 10, 0, 0, 0}},
-	{47, Interpreter::stmw,         {"stmw",  OPTYPE_SYSTEM, FL_EVIL | FL_LOADSTORE, 10, 0, 0, 0}},
-
-	{48, Interpreter::lfs,          {"lfs",  OPTYPE_LOADFP, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{49, Interpreter::lfsu,         {"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{50, Interpreter::lfd,          {"lfd",  OPTYPE_LOADFP, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{51, Interpreter::lfdu,         {"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{52, Interpreter::stfs,         {"stfs",  OPTYPE_STOREFP, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{53, Interpreter::stfsu,        {"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{54, Interpreter::stfd,         {"stfd",  OPTYPE_STOREFP, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{55, Interpreter::stfdu,        {"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{56, Interpreter::psq_l,        {"psq_l",   OPTYPE_PS, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{57, Interpreter::psq_lu,       {"psq_lu",  OPTYPE_PS, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{60, Interpreter::psq_st,       {"psq_st",  OPTYPE_PS, FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{61, Interpreter::psq_stu,      {"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//missing: 0, 5, 6, 9, 22, 30, 62, 58
-	{0,  Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{5,  Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{6,  Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{9,  Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{22, Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{30, Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{62, Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-	{58, Interpreter::unknown_instruction,   {"unknown_instruction", OPTYPE_UNKNOWN, 0, 0, 0, 0, 0}},
-};
-
-static GekkoOPTemplate table4[] = 
-{    //SUBOP10
-	{0,    Interpreter::ps_cmpu0,   {"ps_cmpu0",   OPTYPE_PS, FL_SET_CRn | FL_USE_FPU, 0, 0, 0, 0}},
-	{32,   Interpreter::ps_cmpo0,   {"ps_cmpo0",   OPTYPE_PS, FL_SET_CRn | FL_USE_FPU, 0, 0, 0, 0}},
-	{40,   Interpreter::ps_neg,     {"ps_neg",     OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{136,  Interpreter::ps_nabs,    {"ps_nabs",    OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{264,  Interpreter::ps_abs,     {"ps_abs",     OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{64,   Interpreter::ps_cmpu1,   {"ps_cmpu1",   OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{72,   Interpreter::ps_mr,      {"ps_mr",      OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{96,   Interpreter::ps_cmpo1,   {"ps_cmpo1",   OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{528,  Interpreter::ps_merge00, {"ps_merge00", OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{560,  Interpreter::ps_merge01, {"ps_merge01", OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{592,  Interpreter::ps_merge10, {"ps_merge10", OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-	{624,  Interpreter::ps_merge11, {"ps_merge11", OPTYPE_PS, FL_RC_BIT | FL_USE_FPU, 0, 0, 0, 0}},
-
-	{1014, Interpreter::dcbz_l,     {"dcbz_l",     OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-};		
-
-static GekkoOPTemplate table4_2[] = 
-{
-	{10, Interpreter::ps_sum0,      {"ps_sum0",   OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{11, Interpreter::ps_sum1,      {"ps_sum1",   OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{12, Interpreter::ps_muls0,     {"ps_muls0",  OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{13, Interpreter::ps_muls1,     {"ps_muls1",  OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{14, Interpreter::ps_madds0,    {"ps_madds0", OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{15, Interpreter::ps_madds1,    {"ps_madds1", OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{18, Interpreter::ps_div,       {"ps_div",    OPTYPE_PS, FL_USE_FPU, 16, 0, 0, 0}},
-	{20, Interpreter::ps_sub,       {"ps_sub",    OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{21, Interpreter::ps_add,       {"ps_add",    OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{23, Interpreter::ps_sel,       {"ps_sel",    OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{24, Interpreter::ps_res,       {"ps_res",    OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{25, Interpreter::ps_mul,       {"ps_mul",    OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{26, Interpreter::ps_rsqrte,    {"ps_rsqrte", OPTYPE_PS, FL_USE_FPU, 1, 0, 0, 0}},
-	{28, Interpreter::ps_msub,      {"ps_msub",   OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{29, Interpreter::ps_madd,      {"ps_madd",   OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{30, Interpreter::ps_nmsub,     {"ps_nmsub",  OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-	{31, Interpreter::ps_nmadd,     {"ps_nmadd",  OPTYPE_PS, FL_USE_FPU, 0, 0, 0, 0}},
-};
-
-
-static GekkoOPTemplate table4_3[] = 
-{
-	{6,  Interpreter::psq_lx,       {"psq_lx",   OPTYPE_PS, FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{7,  Interpreter::psq_stx,      {"psq_stx",  OPTYPE_PS, FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{38, Interpreter::psq_lux,      {"psq_lux",  OPTYPE_PS, FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{39, Interpreter::psq_stux,     {"psq_stux", OPTYPE_PS, FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}}, 
-};
-
-static GekkoOPTemplate table19[] = 
-{
-	{528, Interpreter::bcctrx,      {"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK, 0, 0, 0, 0}},
-	{16,  Interpreter::bclrx,       {"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK, 0, 0, 0, 0}},
-	{257, Interpreter::crand,       {"crand",  OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{129, Interpreter::crandc,      {"crandc", OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{289, Interpreter::creqv,       {"creqv",  OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{225, Interpreter::crnand,      {"crnand", OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{33,  Interpreter::crnor,       {"crnor",  OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{449, Interpreter::cror,        {"cror",   OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{417, Interpreter::crorc,       {"crorc",  OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-	{193, Interpreter::crxor,       {"crxor",  OPTYPE_CR, FL_EVIL, 0, 0, 0, 0}},
-												   
-	{150, Interpreter::isync,       {"isync",  OPTYPE_ICACHE, FL_EVIL, 0, 0, 0, 0}},
-	{0,   Interpreter::mcrf,        {"mcrf",   OPTYPE_SYSTEM, FL_EVIL, 0, 0, 0, 0}},
-												   
-	{50,  Interpreter::rfi,         {"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1, 0, 0, 0}},
-	{18,  Interpreter::rfid,        {"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 0, 0, 0, 0}}
-};
-
-
-static GekkoOPTemplate table31[] = 
-{
-	{28,  Interpreter::andx,        {"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{60,  Interpreter::andcx,       {"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{444, Interpreter::orx,         {"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{124, Interpreter::norx,        {"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{316, Interpreter::xorx,        {"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{412, Interpreter::orcx,        {"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{476, Interpreter::nandx,       {"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{284, Interpreter::eqvx,        {"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT, 0, 0, 0, 0}},
-	{0,   Interpreter::cmp,         {"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn, 0, 0, 0, 0}},
-	{32,  Interpreter::cmpl,        {"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn, 0, 0, 0, 0}},
-	{26,  Interpreter::cntlzwx,     {"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{922, Interpreter::extshx,      {"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{954, Interpreter::extsbx,      {"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{536, Interpreter::srwx,        {"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{792, Interpreter::srawx,       {"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{824, Interpreter::srawix,      {"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-	{24,  Interpreter::slwx,        {"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT, 0, 0, 0, 0}},
-
-	{54,   Interpreter::dcbst,      {"dcbst",  OPTYPE_DCACHE, 0, 4, 0, 0, 0}},
-	{86,   Interpreter::dcbf,       {"dcbf",   OPTYPE_DCACHE, 0, 4, 0, 0, 0}},
-	{246,  Interpreter::dcbtst,     {"dcbtst", OPTYPE_DCACHE, 0, 1, 0, 0, 0}},
-	{278,  Interpreter::dcbt,       {"dcbt",   OPTYPE_DCACHE, 0, 1, 0, 0, 0}},
-	{470,  Interpreter::dcbi,       {"dcbi",   OPTYPE_DCACHE, 0, 4, 0, 0, 0}},
-	{758,  Interpreter::dcba,       {"dcba",   OPTYPE_DCACHE, 0, 4, 0, 0, 0}},
-	{1014, Interpreter::dcbz,       {"dcbz",   OPTYPE_DCACHE, FL_LOADSTORE, 4, 0, 0, 0}},
-	
-	//load word
-	{23,  Interpreter::lwzx,        {"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{55,  Interpreter::lwzux,       {"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//load halfword
-	{279, Interpreter::lhzx,        {"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{311, Interpreter::lhzux,       {"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//load halfword signextend
-	{343, Interpreter::lhax,        {"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{375, Interpreter::lhaux,       {"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//load byte
-	{87,  Interpreter::lbzx,        {"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{119, Interpreter::lbzux,       {"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	
-	//load byte reverse
-	{534, Interpreter::lwbrx,       {"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{790, Interpreter::lhbrx,       {"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	// Conditional load/store (Wii SMP)
-	{150, Interpreter::stwcxd,      {"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0 | FL_LOADSTORE, 0, 0, 0, 0}},
-	{20,  Interpreter::lwarx,       {"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0 | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//load string (Inst these)
-	{533, Interpreter::lswx,        {"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D | FL_LOADSTORE, 0, 0, 0, 0}},
-	{597, Interpreter::lswi,        {"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//store word
-	{151, Interpreter::stwx,        {"stwx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{183, Interpreter::stwux,       {"stwux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//store halfword
-	{407, Interpreter::sthx,        {"sthx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{439, Interpreter::sthux,       {"sthux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//store byte
-	{215, Interpreter::stbx,        {"stbx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{247, Interpreter::stbux,       {"stbux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	//store bytereverse
-	{662, Interpreter::stwbrx,      {"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-	{918, Interpreter::sthbrx,      {"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{661, Interpreter::stswx,       {"stswx",  OPTYPE_STORE, FL_EVIL | FL_LOADSTORE, 0, 0, 0, 0}},
-	{725, Interpreter::stswi,       {"stswi",  OPTYPE_STORE, FL_EVIL | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	// fp load/store	
-	{535, Interpreter::lfsx,        {"lfsx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{567, Interpreter::lfsux,       {"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{599, Interpreter::lfdx,        {"lfdx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{631, Interpreter::lfdux,       {"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{663, Interpreter::stfsx,       {"stfsx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{695, Interpreter::stfsux,      {"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{727, Interpreter::stfdx,       {"stfdx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{759, Interpreter::stfdux,      {"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-	{983, Interpreter::stfiwx,      {"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B | FL_USE_FPU | FL_LOADSTORE, 0, 0, 0, 0}},
-
-	{19,  Interpreter::mfcr,        {"mfcr",   OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}},
-	{83,  Interpreter::mfmsr,       {"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}},
-	{144, Interpreter::mtcrf,       {"mtcrf",  OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{146, Interpreter::mtmsr,       {"mtmsr",  OPTYPE_SYSTEM, FL_IN_S | FL_ENDBLOCK, 0, 0, 0, 0}},
-	{210, Interpreter::mtsr,        {"mtsr",   OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{242, Interpreter::mtsrin,      {"mtsrin", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{339, Interpreter::mfspr,       {"mfspr",  OPTYPE_SPR, FL_OUT_D, 0, 0, 0, 0}},
-	{467, Interpreter::mtspr,       {"mtspr",  OPTYPE_SPR, 0, 2, 0, 0, 0}},
-	{371, Interpreter::mftb,        {"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER, 0, 0, 0, 0}},
-	{512, Interpreter::mcrxr,       {"mcrxr",  OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{595, Interpreter::mfsr,        {"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2, 0, 0, 0}},
-	{659, Interpreter::mfsrin,      {"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2, 0, 0, 0}},
-
-	{4,   Interpreter::tw,          {"tw",     OPTYPE_SYSTEM, FL_ENDBLOCK, 1, 0, 0, 0}},
-	{598, Interpreter::sync,        {"sync",   OPTYPE_SYSTEM, 0, 2, 0, 0, 0}},
-	{982, Interpreter::icbi,        {"icbi",   OPTYPE_SYSTEM, FL_ENDBLOCK, 3, 0, 0, 0}},
-
-	// Unused instructions on GC
-	{310, Interpreter::eciwx,       {"eciwx",   OPTYPE_INTEGER, FL_RC_BIT, 0, 0, 0, 0}},
-	{438, Interpreter::ecowx,       {"ecowx",   OPTYPE_INTEGER, FL_RC_BIT, 0, 0, 0, 0}},
-	{854, Interpreter::eieio,       {"eieio",   OPTYPE_INTEGER, FL_RC_BIT, 0, 0, 0, 0}},
-	{306, Interpreter::tlbie,       {"tlbie",   OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{370, Interpreter::tlbia,       {"tlbia",   OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-	{566, Interpreter::tlbsync,     {"tlbsync", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}},
-};
-
-static GekkoOPTemplate table31_2[] = 
-{	
-	{266,  Interpreter::addx,        {"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}},
-	{778,  Interpreter::addx,        {"addox",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}},
-	{10,   Interpreter::addcx,       {"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{522,  Interpreter::addcx,       {"addcox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{138,  Interpreter::addex,       {"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{650,  Interpreter::addex,       {"addeox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{234,  Interpreter::addmex,      {"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{202,  Interpreter::addzex,      {"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{491,  Interpreter::divwx,       {"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}},
-	{1003, Interpreter::divwx,       {"divwox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}},
-	{459,  Interpreter::divwux,      {"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}},
-	{971,  Interpreter::divwux,      {"divwuox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}},
-	{75,   Interpreter::mulhwx,      {"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}},
-	{11,   Interpreter::mulhwux,     {"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}},
-	{235,  Interpreter::mullwx,      {"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}},
-	{747,  Interpreter::mullwx,      {"mullwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}},
-	{104,  Interpreter::negx,        {"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}},
-	{40,   Interpreter::subfx,       {"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}},
-	{552,  Interpreter::subfx,       {"subox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}},
-	{8,    Interpreter::subfcx,      {"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{520,  Interpreter::subfcx,      {"subfcox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{136,  Interpreter::subfex,      {"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{232,  Interpreter::subfmex,     {"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-	{200,  Interpreter::subfzex,     {"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}},
-};
-
-static GekkoOPTemplate table59[] = 
-{
-	{18, Interpreter::fdivsx,       {"fdivsx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 16, 0, 0, 0}}, // TODO
-	{20, Interpreter::fsubsx,       {"fsubsx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{21, Interpreter::faddsx,       {"faddsx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-//	{22, Interpreter::fsqrtsx,      {"fsqrtsx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, // Not implemented on gekko
-	{24, Interpreter::fresx,        {"fresx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{25, Interpreter::fmulsx,       {"fmulsx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{28, Interpreter::fmsubsx,      {"fmsubsx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{29, Interpreter::fmaddsx,      {"fmaddsx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{30, Interpreter::fnmsubsx,     {"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-	{31, Interpreter::fnmaddsx,     {"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, 
-};							    
-
-static GekkoOPTemplate table63[] =
-{
-	{264, Interpreter::fabsx,       {"fabsx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{32,  Interpreter::fcmpo,       {"fcmpo",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{0,   Interpreter::fcmpu,       {"fcmpu",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{14,  Interpreter::fctiwx,      {"fctiwx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{15,  Interpreter::fctiwzx,     {"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{72,  Interpreter::fmrx,        {"fmrx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{136, Interpreter::fnabsx,      {"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{40,  Interpreter::fnegx,       {"fnegx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{12,  Interpreter::frspx,       {"frspx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-
-	{64,  Interpreter::mcrfs,       {"mcrfs",   OPTYPE_SYSTEMFP, FL_USE_FPU, 0, 0, 0, 0}},
-	{583, Interpreter::mffsx,       {"mffsx",   OPTYPE_SYSTEMFP, FL_USE_FPU, 0, 0, 0, 0}},
-	{70,  Interpreter::mtfsb0x,     {"mtfsb0x", OPTYPE_SYSTEMFP, FL_USE_FPU, 2, 0, 0, 0}},
-	{38,  Interpreter::mtfsb1x,     {"mtfsb1x", OPTYPE_SYSTEMFP, FL_USE_FPU, 2, 0, 0, 0}},
-	{134, Interpreter::mtfsfix,     {"mtfsfix", OPTYPE_SYSTEMFP, FL_USE_FPU, 2, 0, 0, 0}},
-	{711, Interpreter::mtfsfx,      {"mtfsfx",  OPTYPE_SYSTEMFP, FL_USE_FPU, 2, 0, 0, 0}},
-};
-
-static GekkoOPTemplate table63_2[] = 
-{
-	{18, Interpreter::fdivx,        {"fdivx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 30, 0, 0, 0}},
-	{20, Interpreter::fsubx,        {"fsubx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{21, Interpreter::faddx,        {"faddx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{22, Interpreter::fsqrtx,       {"fsqrtx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{23, Interpreter::fselx,        {"fselx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{25, Interpreter::fmulx,        {"fmulx",    OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{26, Interpreter::frsqrtex,     {"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{28, Interpreter::fmsubx,       {"fmsubx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{29, Interpreter::fmaddx,       {"fmaddx",   OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{30, Interpreter::fnmsubx,      {"fnmsubx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-	{31, Interpreter::fnmaddx,      {"fnmaddx",  OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}},
-};
-namespace InterpreterTables
-{
-
-void InitTables()
-{
-	// once initialized, tables are read-only
-	static bool initialized = false;
-	if (initialized)
-		return;
-
-	//clear
-	for (int i = 0; i < 32; i++) 
-	{
-		Interpreter::m_opTable59[i] = Interpreter::unknown_instruction;
-		m_infoTable59[i] = 0;
-	}
-
-	for (int i = 0; i < 1024; i++)
-	{
-		Interpreter::m_opTable4 [i] = Interpreter::unknown_instruction;
-		Interpreter::m_opTable19[i] = Interpreter::unknown_instruction;
-		Interpreter::m_opTable31[i] = Interpreter::unknown_instruction;
-		Interpreter::m_opTable63[i] = Interpreter::unknown_instruction;
-		m_infoTable4[i] = 0;		
-		m_infoTable19[i] = 0;		
-		m_infoTable31[i] = 0;		
-		m_infoTable63[i] = 0;		
-	}
-
-	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
-	{
-		Interpreter::m_opTable[primarytable[i].opcode] = primarytable[i].Inst;
-		m_infoTable[primarytable[i].opcode] = &primarytable[i].opinfo;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_2[j].opcode;
-			Interpreter::m_opTable4[op] = table4_2[j].Inst;
-			m_infoTable4[op] = &table4_2[j].opinfo;
-		}
-	}
-
-	for (int i = 0; i < 16; i++)
-	{
-		int fill = i << 6;
-		for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_3[j].opcode;
-			Interpreter::m_opTable4[op] = table4_3[j].Inst;
-			m_infoTable4[op] = &table4_3[j].opinfo;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table4[i].opcode;
-		Interpreter::m_opTable4[op] = table4[i].Inst;
-		m_infoTable4[op] = &table4[i].opinfo;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table31[i].opcode;
-		Interpreter::m_opTable31[op] = table31[i].Inst;
-		m_infoTable31[op] = &table31[i].opinfo;
-	}
-
-	for (int i = 0; i < 1; i++)
-	{
-		int fill = i << 9;
-		for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table31_2[j].opcode;
-			Interpreter::m_opTable31[op] = table31_2[j].Inst;
-			m_infoTable31[op] = &table31_2[j].opinfo;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table19[i].opcode;
-		Interpreter::m_opTable19[op] = table19[i].Inst;
-		m_infoTable19[op] = &table19[i].opinfo;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table59[i].opcode;
-		Interpreter::m_opTable59[op] = table59[i].Inst;
-		m_infoTable59[op] = &table59[i].opinfo;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table63[i].opcode;
-		Interpreter::m_opTable63[op] = table63[i].Inst;
-		m_infoTable63[op] = &table63[i].opinfo;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table63_2[j].opcode;
-			Interpreter::m_opTable63[op] = table63_2[j].Inst;
-			m_infoTable63[op] = &table63_2[j].opinfo;
-		}
-	}
-
-	m_numInstructions = 0;
-	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &primarytable[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table4_2[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table4_3[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table4[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table31[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table31_2[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table19[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table59[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table63[i].opinfo;
-	for (int i = 0; i < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); i++)
-		m_allInstructions[m_numInstructions++] = &table63_2[i].opinfo;
-	if (m_numInstructions >= 512) {
-		PanicAlert("m_allInstructions underdimensioned");
-	}
-
-	initialized = true;
-}
-
-}
-//remove
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h
deleted file mode 100644
index c9f193b4df..0000000000
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef INTERPRETER_TABLES_H
-#define INTERPRETER_TABLES_H
-#include "../Gekko.h"
-#include "../PPCTables.h"
-#include "Interpreter.h"
-
-namespace InterpreterTables
-{
-	void InitTables();
-}
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
deleted file mode 100644
index 488b2fdec6..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ /dev/null
@@ -1,739 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-
-// for the PROFILER stuff
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-#include "../../HLE/HLE.h"
-#include "../../Core.h"
-#include "../../PatchEngine.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
-#include "../PowerPC.h"
-#include "../Profiler.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
-#include "Jit.h"
-#include "JitAsm.h"
-#include "JitRegCache.h"
-#include "Jit64_Tables.h"
-#include "HW/ProcessorInterface.h"
-#if defined(_DEBUG) || defined(DEBUGFAST)
-#include "PowerPCDisasm.h"
-#endif
-
-using namespace Gen;
-using namespace PowerPC;
-
-// Dolphin's PowerPC->x86 JIT dynamic recompiler
-// (Nearly) all code by ector (hrydgard)
-// Features:
-// * x86 & x64 support, lots of shared code.
-// * Basic block linking
-// * Fast dispatcher
-
-// Unfeatures:
-// * Does not recompile all instructions - sometimes falls back to inserting a CALL to the corresponding Interpreter function.
-
-// Various notes below
-
-// Register allocation
-//   RAX - Generic quicktemp register
-//   RBX - point to base of memory map
-//   RSI RDI R12 R13 R14 R15 - free for allocation
-//   RCX RDX R8 R9 R10 R11 - allocate in emergencies. These need to be flushed before functions are called.
-//   RSP - stack pointer, do not generally use, very dangerous
-//   RBP - ?
-
-// IMPORTANT:
-// Make sure that all generated code and all emulator state sits under the 2GB boundary so that
-// RIP addressing can be used easily. Windows will always allocate static code under the 2GB boundary.
-// Also make sure to use VirtualAlloc and specify EXECUTE permission.
-
-// Open questions
-// * Should there be any statically allocated registers? r3, r4, r5, r8, r0 come to mind.. maybe sp
-// * Does it make sense to finish off the remaining non-jitted instructions? Seems we are hitting diminishing returns.
-
-// Other considerations
-//
-// Many instructions have shorter forms for EAX. However, I believe their performance boost
-// will be as small to be negligible, so I haven't dirtied up the code with that. AMD recommends it in their
-// optimization manuals, though.
-//
-// We support block linking. Reserve space at the exits of every block for a full 5-byte jmp. Save 16-bit offsets 
-// from the starts of each block, marking the exits so that they can be nicely patched at any time.
-//
-// Blocks do NOT use call/ret, they only jmp to each other and to the dispatcher when necessary.
-//
-// All blocks that can be precompiled will be precompiled. Code will be memory protected - any write will mark
-// the region as non-compilable, and all links to the page will be torn out and replaced with dispatcher jmps.
-//
-// Alternatively, icbi instruction SHOULD mark where we can't compile
-//
-// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
-// expensive anyway since we need to return to dispatcher, except when they can be predicted).
-
-// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
-//       Somewhat fixed by disabling idle skipping when certain interrupts are enabled
-//       This is no permanent reliable fix
-// TODO: Zeldas go whacko when you hang the gfx thread
-
-// Idea - Accurate exception handling
-// Compute register state at a certain instruction by running the JIT in "dry mode", and stopping at the right place.
-// Not likely to be done :P
-
-
-// Optimization Ideas -
-/*
-  * Assume SP is in main RAM (in Wii mode too?) - partly done
-  * Assume all floating point loads and double precision loads+stores are to/from main ram
-    (single precision stores can be used in write gather pipe, specialized fast check added)
-  * AMD only - use movaps instead of movapd when loading ps from memory?
-  * HLE functions like floorf, sin, memcpy, etc - they can be much faster
-  * ABI optimizations - drop F0-F13 on blr, for example. Watch out for context switching.
-    CR2-CR4 are non-volatile, rest of CR is volatile -> dropped on blr.
-	R5-R12 are volatile -> dropped on blr.
-  * classic inlining across calls.
-  
-Low hanging fruit:
-stfd -- guaranteed in memory
-cmpl
-mulli
-stfs
-stwu
-lb/stzx
-
-bcx - optimize!
-bcctr
-stfs
-psq_st
-addx
-orx
-rlwimix
-fcmpo
-DSP_UpdateARAMDMA
-lfd
-stwu
-cntlzwx
-bcctrx
-WriteBigEData
-
-TODO
-lha
-srawx
-addic_rc
-addex
-subfcx
-subfex
-
-fmaddx
-fmulx
-faddx
-fnegx
-frspx
-frsqrtex
-ps_sum0
-ps_muls0
-ps_adds1
-
-*/
-
-static int CODE_SIZE = 1024*1024*32;
-
-namespace CPUCompare
-{
-	extern u32 m_BlockStart;
-}
-
-void Jit64::Init()
-{
-	jo.optimizeStack = true;
-	/* This will enable block linking in JitBlockCache::FinalizeBlock(), it gives faster execution but may not
-	   be as stable as the alternative (to not link the blocks). However, I have not heard about any good examples
-	   where this cause problems, so I'm enabling this by default, since I seem to get perhaps as much as 20% more
-	   fps with this option enabled. If you suspect that this option cause problems you can also disable it from the
-	   debugging window. */
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		jo.enableBlocklink = false;
-		Core::g_CoreStartupParameter.bSkipIdle = false;
-	}
-	else
-	{
-		if (!Core::g_CoreStartupParameter.bJITBlockLinking)
-		{
-			jo.enableBlocklink = false;
-		}
-		else
-			jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU;
-	}
-	jo.fpAccurateFcmp = Core::g_CoreStartupParameter.bEnableFPRF;
-	jo.optimizeGatherPipe = true;
-	jo.fastInterrupts = false;
-	jo.accurateSinglePrecision = true;
-	js.memcheck = Core::g_CoreStartupParameter.bMMU;
-
-	gpr.SetEmitter(this);
-	fpr.SetEmitter(this);
-
-	trampolines.Init();
-	AllocCodeSpace(CODE_SIZE);
-
-	blocks.Init();
-	asm_routines.Init();
-}
-
-void Jit64::ClearCache() 
-{
-	blocks.Clear();
-	trampolines.ClearCodeSpace();
-	ClearCodeSpace();
-}
-
-void Jit64::Shutdown()
-{
-	FreeCodeSpace();
-
-	blocks.Shutdown();
-	trampolines.Shutdown();
-	asm_routines.Shutdown();
-}
-
-// This is only called by Default() in this file. It will execute an instruction with the interpreter functions.
-void Jit64::WriteCallInterpreter(UGeckoInstruction inst)
-{
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-	if (js.isLastInstruction)
-	{
-		MOV(32, M(&PC), Imm32(js.compilerPC));
-		MOV(32, M(&NPC), Imm32(js.compilerPC + 4));
-	}
-	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
-	ABI_CallFunctionC((void*)instr, inst.hex);
-}
-
-void Jit64::unknown_instruction(UGeckoInstruction inst)
-{
-	PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex);
-}
-
-void Jit64::Default(UGeckoInstruction _inst)
-{
-	WriteCallInterpreter(_inst.hex);
-}
-
-void Jit64::HLEFunction(UGeckoInstruction _inst)
-{
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-	ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex);
-}
-
-void Jit64::DoNothing(UGeckoInstruction _inst)
-{
-	// Yup, just don't do anything.
-}
-
-static const bool ImHereDebug = false;
-static const bool ImHereLog = false;
-static std::map<u32, int> been_here;
-
-static void ImHere()
-{
-	static File::IOFile f;
-	if (ImHereLog)
-	{
-		if (!f)
-		{
-#ifdef _M_X64
-			f.Open("log64.txt", "w");
-#else
-			f.Open("log32.txt", "w");
-#endif
-		}
-		fprintf(f.GetHandle(), "%08x\n", PC);
-	}
-	if (been_here.find(PC) != been_here.end())
-	{
-		been_here.find(PC)->second++;
-		if ((been_here.find(PC)->second) & 1023)
-			return;
-	}
-	DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR);
-	been_here[PC] = 1;
-}
-
-void Jit64::Cleanup()
-{
-	if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0)
-	{
-		ABI_CallFunction((void *)&GPFifo::CheckGatherPipe);
-	}
-
-	// SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time.
-	if (MMCR0.Hex || MMCR1.Hex)
-		ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
-}
-
-void Jit64::WriteExit(u32 destination, int exit_num)
-{
-	Cleanup();
-
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
-
-	//If nobody has taken care of this yet (this can be removed when all branches are done)
-	JitBlock *b = js.curBlock;
-	b->exitAddress[exit_num] = destination;
-	b->exitPtrs[exit_num] = GetWritableCodePtr();
-	
-	// Link opportunity!
-	int block = blocks.GetBlockNumberFromStartAddress(destination);
-	if (block >= 0 && jo.enableBlocklink) 
-	{
-		// It exists! Joy of joy!
-		JMP(blocks.GetBlock(block)->checkedEntry, true);
-		b->linkStatus[exit_num] = true;
-	}
-	else 
-	{
-		MOV(32, M(&PC), Imm32(destination));
-		JMP(asm_routines.dispatcher, true);
-	}
-}
-
-void Jit64::WriteExitDestInEAX() 
-{
-	MOV(32, M(&PC), R(EAX));
-	Cleanup();
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.dispatcher, true);
-}
-
-void Jit64::WriteRfiExitDestInEAX() 
-{
-	MOV(32, M(&PC), R(EAX));
-	MOV(32, M(&NPC), R(EAX));
-	Cleanup();
-	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.dispatcher, true);
-}
-
-void Jit64::WriteExceptionExit()
-{
-	Cleanup();
-	MOV(32, R(EAX), M(&PC));
-	MOV(32, M(&NPC), R(EAX));
-	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
-	JMP(asm_routines.dispatcher, true);
-}
-
-void Jit64::WriteExternalExceptionExit()
-{
-	Cleanup();
-	MOV(32, R(EAX), M(&PC));
-	MOV(32, M(&NPC), R(EAX));
-	ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExternalExceptions));
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.dispatcher, true);
-}
-
-void STACKALIGN Jit64::Run()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-}
-
-void Jit64::SingleStep()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-}
-
-void Jit64::Trace()
-{
-	char regs[500] = "";
-	char fregs[750] = "";
-
-#ifdef JIT_LOG_GPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
-		strncat(regs, reg, 500);
-	}
-#endif
-
-#ifdef JIT_LOG_FPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "f%02d: %016x ", i, riPS0(i));
-		strncat(fregs, reg, 750);
-	}
-#endif	
-
-	DEBUG_LOG(DYNA_REC, "JIT64 PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", 
-		PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], 
-		PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, 
-		PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs);
-}
-
-void STACKALIGN Jit64::Jit(u32 em_address)
-{
-	if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || Core::g_CoreStartupParameter.bJITNoBlockCache)
-	{
-		ClearCache();
-	}
-
-	int block_num = blocks.AllocateBlock(em_address);
-	JitBlock *b = blocks.GetBlock(block_num);
-	blocks.FinalizeBlock(block_num, jo.enableBlocklink, DoJit(em_address, &code_buffer, b));
-}
-
-const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b)
-{
-	int blockSize = code_buf->GetSize();
-
-	// Memory exception on instruction fetch
-	bool memory_exception = false;
-
-	// A broken block is a block that does not end in a branch
-	bool broken_block = false;
-
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		// Comment out the following to disable breakpoints (speed-up)
-		if (!Profiler::g_ProfileBlocks)
-		{
-			if (GetState() == CPU_STEPPING)
-				blockSize = 1;
-			Trace();
-		}
-	}
-
-	if (em_address == 0)
-	{
-		// Memory exception occurred during instruction fetch
-		memory_exception = true;
-	}
-
-	if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT))
-	{
-		if (!Memory::TranslateAddress(em_address, Memory::FLAG_OPCODE))
-		{
-			// Memory exception occurred during instruction fetch
-			memory_exception = true;
-		}
-	}
-
-	int size = 0;
-	js.firstFPInstructionFound = false;
-	js.isLastInstruction = false;
-	js.blockStart = em_address;
-	js.fifoBytesThisBlock = 0;
-	js.curBlock = b;
-	js.block_flags = 0;
-	js.cancel = false;
-	jit->js.numLoadStoreInst = 0;
-	jit->js.numFloatingPointInst = 0;
-
-	// Analyze the block, collect all instructions it is made of (including inlining,
-	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
-	u32 nextPC = em_address;
-	u32 merged_addresses[32];
-	const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]);
-	int size_of_merged_addresses = 0;
-	if (!memory_exception)
-	{
-		// If there is a memory exception inside a block (broken_block==true), compile up to that instruction.
-		nextPC = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses);
-	}
-
-	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
-
-	const u8 *start = AlignCode4(); // TODO: Test if this or AlignCode16 make a difference from GetCodePtr
-	b->checkedEntry = start;
-	b->runCount = 0;
-
-	// Downcount flag check. The last block decremented downcounter, and the flag should still be available.
-	FixupBranch skip = J_CC(CC_NBE);
-	MOV(32, M(&PC), Imm32(js.blockStart));
-	JMP(asm_routines.doTiming, true);  // downcount hit zero - go doTiming.
-	SetJumpTarget(skip);
-
-	const u8 *normalEntry = GetCodePtr();
-	b->normalEntry = normalEntry;
-
-	if (ImHereDebug)
-		ABI_CallFunction((void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful
-
-	// Conditionally add profiling code.
-	if (Profiler::g_ProfileBlocks) {
-		ADD(32, M(&b->runCount), Imm8(1));
-#ifdef _WIN32
-		b->ticCounter = 0;
-		b->ticStart = 0;
-		b->ticStop = 0;
-#else
-//TODO
-#endif
-		// get start tic
-		PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart);
-	}
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(NAN_CHECK)
-	// should help logged stack-traces become more accurate
-	MOV(32, M(&PC), Imm32(js.blockStart));
-#endif
-
-	// Start up the register allocators
-	// They use the information in gpa/fpa to preload commonly used registers.
-	gpr.Start(js.gpa);
-	fpr.Start(js.fpa);
-
-	js.downcountAmount = 0;
-	if (!Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		for (int i = 0; i < size_of_merged_addresses; ++i)
-		{
-			const u32 address = merged_addresses[i];
-			js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);
-		}
-	}
-
-	js.skipnext = false;
-	js.blockSize = size;
-	js.compilerPC = nextPC;
-	// Translate instructions
-	for (int i = 0; i < (int)size; i++)
-	{
-		js.compilerPC = ops[i].address;
-		js.op = &ops[i];
-		js.instructionNumber = i;
-		const GekkoOPInfo *opinfo = ops[i].opinfo;
-		js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
-
-		if (i == (int)size - 1)
-		{
-			// WARNING - cmp->branch merging will screw this up.
-			js.isLastInstruction = true;
-			js.next_inst = 0;
-			if (Profiler::g_ProfileBlocks) {
-				// CAUTION!!! push on stack regs you use, do your stuff, then pop
-				PROFILER_VPUSH;
-				// get end tic
-				PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop);
-				// tic counter += (end tic - start tic)
-				PROFILER_ADD_DIFF_LARGE_INTEGER(&b->ticCounter, &b->ticStop, &b->ticStart);
-				PROFILER_VPOP;
-			}
-		}
-		else
-		{
-			// help peephole optimizations
-			js.next_inst = ops[i + 1].inst;
-			js.next_compilerPC = ops[i + 1].address;
-		}
-
-		if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32)
-		{
-			js.fifoBytesThisBlock -= 32;
-			MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-			ABI_CallFunction(thunks.ProtectFunction((void *)&GPFifo::CheckGatherPipe, 0));
-		}
-
-		u32 function = HLE::GetFunctionIndex(ops[i].address);
-		if (function != 0)
-		{
-			int type = HLE::GetFunctionTypeByIndex(function);
-			if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
-			{
-				int flags = HLE::GetFunctionFlagsByIndex(function);
-				if (HLE::IsEnabled(flags))
-				{
-					HLEFunction(function);
-					if (type == HLE::HLE_HOOK_REPLACE)
-					{
-						MOV(32, R(EAX), M(&NPC));
-						js.downcountAmount += js.st.numCycles;
-						WriteExitDestInEAX();
-						break;
-					}
-				}
-			}
-		}
-
-		if (!ops[i].skip)
-		{
-			if ((opinfo->flags & FL_USE_FPU) && !js.firstFPInstructionFound)
-			{
-				gpr.Flush(FLUSH_ALL);
-				fpr.Flush(FLUSH_ALL);
-
-				//This instruction uses FPU - needs to add FP exception bailout
-				TEST(32, M(&PowerPC::ppcState.msr), Imm32(1 << 13)); // Test FP enabled bit
-				FixupBranch b1 = J_CC(CC_NZ, true);
-
-				// If a FPU exception occurs, the exception handler will read
-				// from PC.  Update PC with the latest value in case that happens.
-				MOV(32, M(&PC), Imm32(ops[i].address));
-				OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
-				WriteExceptionExit();
-
-				SetJumpTarget(b1);
-
-				js.firstFPInstructionFound = true;
-			}
-
-			// Add an external exception check if the instruction writes to the FIFO.
-			if (jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end())
-			{
-				gpr.Flush(FLUSH_ALL);
-				fpr.Flush(FLUSH_ALL);
-
-				TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT));
-				FixupBranch clearInt = J_CC(CC_NZ, true);
-				TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
-				FixupBranch noExtException = J_CC(CC_Z, true);
-				TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000));
-				FixupBranch noExtIntEnable = J_CC(CC_Z, true);
-				TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH));
-				FixupBranch noCPInt = J_CC(CC_Z, true);
-
-				MOV(32, M(&PC), Imm32(ops[i].address));
-				WriteExternalExceptionExit();
-
-				SetJumpTarget(noCPInt);
-				SetJumpTarget(noExtIntEnable);
-				SetJumpTarget(noExtException);
-				SetJumpTarget(clearInt);
-			}
-
-			if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
-			{
-				gpr.Flush(FLUSH_ALL);
-				fpr.Flush(FLUSH_ALL);
-
-				MOV(32, M(&PC), Imm32(ops[i].address));
-				ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
-				TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-				FixupBranch noBreakpoint = J_CC(CC_Z);
-
-				WriteExit(ops[i].address, 0);
-				SetJumpTarget(noBreakpoint);
-			}
-
-			Jit64Tables::CompileInstruction(ops[i]);
-
-			if (js.memcheck && (opinfo->flags & FL_LOADSTORE))
-			{
-				// In case we are about to jump to the dispatcher, flush regs
-				gpr.Flush(FLUSH_ALL);
-				fpr.Flush(FLUSH_ALL);
-
-				TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_DSI));
-				FixupBranch noMemException = J_CC(CC_Z, true);
-
-				// If a memory exception occurs, the exception handler will read
-				// from PC.  Update PC with the latest value in case that happens.
-				MOV(32, M(&PC), Imm32(ops[i].address));
-				WriteExceptionExit();
-				SetJumpTarget(noMemException);
-			}
-
-			if (opinfo->flags & FL_LOADSTORE)
-				++jit->js.numLoadStoreInst;
-
-			if (opinfo->flags & FL_USE_FPU)
-				++jit->js.numFloatingPointInst;
-		}
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-		if (gpr.SanityCheck() || fpr.SanityCheck())
-		{
-			char ppcInst[256];
-			DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256);
-			//NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst);
-		}
-#endif
-		if (js.skipnext) {
-			js.skipnext = false;
-			i++; // Skip next instruction
-		}
-		
-		if (js.cancel)
-			break;
-	}
-
-	u32 function = HLE::GetFunctionIndex(js.blockStart);
-	if (function != 0)
-	{
-		int type = HLE::GetFunctionTypeByIndex(function);
-		if (type == HLE::HLE_HOOK_END)
-		{
-			int flags = HLE::GetFunctionFlagsByIndex(function);
-			if (HLE::IsEnabled(flags))
-			{
-				HLEFunction(function);
-			}
-		}
-	}
-
-	if (memory_exception)
-	{
-		// Address of instruction could not be translated
-		MOV(32, M(&NPC), Imm32(js.compilerPC));
-
-		OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI));
-
-		// Remove the invalid instruction from the icache, forcing a recompile
-#ifdef _M_IX86
-		if (js.compilerPC & JIT_ICACHE_VMEM_BIT)
-			MOV(32, M((jit->GetBlockCache()->GetICacheVMEM() + (js.compilerPC & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-		else if (js.compilerPC & JIT_ICACHE_EXRAM_BIT)
-			MOV(32, M((jit->GetBlockCache()->GetICacheEx() + (js.compilerPC & JIT_ICACHEEX_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-		else
-			MOV(32, M((jit->GetBlockCache()->GetICache() + (js.compilerPC & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-#else
-		if (js.compilerPC & JIT_ICACHE_VMEM_BIT)
-			MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheVMEM() + (js.compilerPC & JIT_ICACHE_MASK)));
-		else if (js.compilerPC & JIT_ICACHE_EXRAM_BIT)
-			MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheEx() + (js.compilerPC & JIT_ICACHEEX_MASK)));
-		else
-			MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICache() + (js.compilerPC & JIT_ICACHE_MASK)));
-		MOV(32,MatR(RAX),Imm32(JIT_ICACHE_INVALID_WORD));
-#endif
-
-		WriteExceptionExit();
-	}
-
-	if (broken_block)
-	{
-		gpr.Flush(FLUSH_ALL);
-		fpr.Flush(FLUSH_ALL);
-		WriteExit(nextPC, 0);
-	}
-
-	b->flags = js.block_flags;
-	b->codeSize = (u32)(GetCodePtr() - normalEntry);
-	b->originalSize = size;
-
-#ifdef JIT_LOG_X86
-	LogGeneratedX86(size, code_buf, normalEntry, b);
-#endif
-
-	return normalEntry;
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
deleted file mode 100644
index 23d95b2852..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// ========================
-// See comments in Jit.cpp.
-// ========================
-
-// Mystery: Capcom vs SNK 800aa278
-
-// CR flags approach:
-//   * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3".
-//   * All flag altering instructions flush this
-//   * A flush simply does a conditional write to the appropriate CRx.
-//   * If flag available, branch code can become absolutely trivial.
-
-// Settings
-// ----------
-#ifndef _JIT64_H
-#define _JIT64_H
-
-#include "../PPCAnalyst.h"
-#include "../JitCommon/JitCache.h"
-#include "../JitCommon/Jit_Util.h"
-#include "JitRegCache.h"
-#include "x64Emitter.h"
-#include "x64Analyzer.h"
-#include "../JitCommon/JitBackpatch.h"
-#include "../JitCommon/JitBase.h"
-#include "JitAsm.h"
-
-// Use these to control the instruction selection
-// #define INSTRUCTION_START Default(inst); return;
-// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
-#define INSTRUCTION_START
-
-#define JITDISABLE(setting) \
-	if (Core::g_CoreStartupParameter.bJITOff || \
-	Core::g_CoreStartupParameter.setting) \
-	{Default(inst); return;}
-
-#define MEMCHECK_START \
-	FixupBranch memException; \
-	if (js.memcheck) \
-	{ TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_DSI)); \
-	memException = J_CC(CC_NZ); }
-
-#define MEMCHECK_END \
-	if (js.memcheck) \
-		SetJumpTarget(memException);
-
-class Jit64 : public Jitx86Base
-{
-private:
-	GPRRegCache gpr;
-	FPURegCache fpr;
-
-	// The default code buffer. We keep it around to not have to alloc/dealloc a
-	// large chunk of memory for each recompiled block.
-	PPCAnalyst::CodeBuffer code_buffer;
-	Jit64AsmRoutineManager asm_routines;
-
-public:
-	Jit64() : code_buffer(32000) {}
-	~Jit64() {}
-
-	void Init();
-	void Shutdown();
-
-	// Jit!
-
-	void Jit(u32 em_address);
-	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
-
-	JitBlockCache *GetBlockCache() { return &blocks; }
-
-	void Trace();
-
-	void ClearCache();
-
-	const u8 *GetDispatcher() {
-		return asm_routines.dispatcher;
-	}
-	const CommonAsmRoutines *GetAsmRoutines() {
-		return &asm_routines;
-	}
-
-	const char *GetName() {
-#ifdef _M_X64
-		return "JIT64";
-#else
-		return "JIT32";
-#endif
-	}
-	// Run!
-
-	void Run();
-	void SingleStep();
-
-	// Utilities for use by opcodes
-
-	void WriteExit(u32 destination, int exit_num);
-	void WriteExitDestInEAX();
-	void WriteExceptionExit();
-	void WriteExternalExceptionExit();
-	void WriteRfiExitDestInEAX();
-	void WriteCallInterpreter(UGeckoInstruction _inst);
-	void Cleanup();
-
-	void GenerateConstantOverflow(bool overflow);
-	void GenerateOverflow();
-	void FinalizeCarryOverflow(bool oe, bool inv = false);
-	void GetCarryEAXAndClear();
-	void FinalizeCarryGenerateOverflowEAX(bool oe, bool inv = false);
-	void GenerateCarry();
-	void GenerateRC();
-	void ComputeRC(const Gen::OpArg & arg);
-
-	void tri_op(int d, int a, int b, bool reversible, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg));
-	typedef u32 (*Operation)(u32 a, u32 b);
-	void regimmop(int d, int a, bool binary, u32 value, Operation doop, void (XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&), bool Rc = false, bool carry = false);
-	void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg));
-
-	// OPCODES
-	void unknown_instruction(UGeckoInstruction _inst);
-	void Default(UGeckoInstruction _inst);
-	void DoNothing(UGeckoInstruction _inst);
-	void HLEFunction(UGeckoInstruction _inst);
-
-	void DynaRunTable4(UGeckoInstruction _inst);
-	void DynaRunTable19(UGeckoInstruction _inst);
-	void DynaRunTable31(UGeckoInstruction _inst);
-	void DynaRunTable59(UGeckoInstruction _inst);
-	void DynaRunTable63(UGeckoInstruction _inst);
-
-	void addx(UGeckoInstruction inst);
-	void addcx(UGeckoInstruction inst);
-	void mulli(UGeckoInstruction inst);
-	void mulhwux(UGeckoInstruction inst);
-	void mullwx(UGeckoInstruction inst);
-	void divwux(UGeckoInstruction inst);
-	void divwx(UGeckoInstruction inst);
-	void srawix(UGeckoInstruction inst);
-	void srawx(UGeckoInstruction inst);
-	void addex(UGeckoInstruction inst);
-	void addmex(UGeckoInstruction inst);
-	void addzex(UGeckoInstruction inst);
-
-	void extsbx(UGeckoInstruction inst);
-	void extshx(UGeckoInstruction inst);
-
-	void sc(UGeckoInstruction _inst);
-	void rfi(UGeckoInstruction _inst);
-
-	void bx(UGeckoInstruction inst);
-	void bclrx(UGeckoInstruction _inst);
-	void bcctrx(UGeckoInstruction _inst);
-	void bcx(UGeckoInstruction inst);
-
-	void mtspr(UGeckoInstruction inst);
-	void mfspr(UGeckoInstruction inst);
-	void mtmsr(UGeckoInstruction inst);
-	void mfmsr(UGeckoInstruction inst);
-	void mftb(UGeckoInstruction inst);
-	void mtcrf(UGeckoInstruction inst);
-	void mfcr(UGeckoInstruction inst);
-	void mcrf(UGeckoInstruction inst);
-	void mcrxr(UGeckoInstruction inst);
-
-	void boolX(UGeckoInstruction inst);
-	void crXXX(UGeckoInstruction inst);
-
-	void reg_imm(UGeckoInstruction inst);
-
-	void ps_sel(UGeckoInstruction inst);
-	void ps_mr(UGeckoInstruction inst);
-	void ps_sign(UGeckoInstruction inst); //aggregate
-	void ps_arith(UGeckoInstruction inst); //aggregate
-	void ps_mergeXX(UGeckoInstruction inst);
-	void ps_maddXX(UGeckoInstruction inst);
-	void ps_rsqrte(UGeckoInstruction inst);
-	void ps_sum(UGeckoInstruction inst);
-	void ps_muls(UGeckoInstruction inst);
-
-	void fp_arith_s(UGeckoInstruction inst);
-	void frsqrtex(UGeckoInstruction inst);
-
-	void fcmpx(UGeckoInstruction inst);
-	void fmrx(UGeckoInstruction inst);
-
-	void cmpXX(UGeckoInstruction inst);
-
-	void cntlzwx(UGeckoInstruction inst);
-
-	void lfs(UGeckoInstruction inst);
-	void lfd(UGeckoInstruction inst);
-	void stfd(UGeckoInstruction inst);
-	void stfs(UGeckoInstruction inst);
-	void stfsx(UGeckoInstruction inst);
-	void psq_l(UGeckoInstruction inst);
-	void psq_st(UGeckoInstruction inst);
-
-	void fmaddXX(UGeckoInstruction inst);
-	void fsign(UGeckoInstruction inst);
-	void stX(UGeckoInstruction inst); //stw sth stb
-	void rlwinmx(UGeckoInstruction inst);
-	void rlwimix(UGeckoInstruction inst);
-	void rlwnmx(UGeckoInstruction inst);
-	void negx(UGeckoInstruction inst);
-	void slwx(UGeckoInstruction inst);
-	void srwx(UGeckoInstruction inst);
-	void dcbst(UGeckoInstruction inst);
-	void dcbz(UGeckoInstruction inst);
-	void lfsx(UGeckoInstruction inst);
-
-	void subfic(UGeckoInstruction inst);
-	void subfcx(UGeckoInstruction inst);
-	void subfx(UGeckoInstruction inst);
-	void subfex(UGeckoInstruction inst);
-	void subfmex(UGeckoInstruction inst);
-	void subfzex(UGeckoInstruction inst);
-
-	void twx(UGeckoInstruction inst);
-
-	void lXXx(UGeckoInstruction inst);
-	
-	void stXx(UGeckoInstruction inst);
-
-	void lmw(UGeckoInstruction inst);
-	void stmw(UGeckoInstruction inst);
-
-	void icbi(UGeckoInstruction inst);
-};
-
-void ProfiledReJit();
-
-#endif // _JIT64_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp
deleted file mode 100644
index 268e2562d6..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Jit.h"
-#include "Jit64_Tables.h"
-
-// Should be moved in to the Jit class
-typedef void (Jit64::*_Instruction) (UGeckoInstruction instCode);
-
-static _Instruction dynaOpTable[64];
-static _Instruction dynaOpTable4[1024];
-static _Instruction dynaOpTable19[1024];
-static _Instruction dynaOpTable31[1024];
-static _Instruction dynaOpTable59[32];
-static _Instruction dynaOpTable63[1024];
-void Jit64::DynaRunTable4(UGeckoInstruction _inst)  {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);}
-void Jit64::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);}
-void Jit64::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);}
-void Jit64::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);}
-void Jit64::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);}
-
-struct GekkoOPTemplate
-{
-	int opcode;
-	_Instruction Inst;
-	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
-};
-
-static GekkoOPTemplate primarytable[] = 
-{
-	{4,  &Jit64::DynaRunTable4}, //"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0}},
-	{19, &Jit64::DynaRunTable19}, //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}},
-	{31, &Jit64::DynaRunTable31}, //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}},
-	{59, &Jit64::DynaRunTable59}, //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}},
-	{63, &Jit64::DynaRunTable63}, //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}},
-
-	{16, &Jit64::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{18, &Jit64::bx}, //"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-
-	{1,  &Jit64::HLEFunction}, //"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{2,  &Jit64::Default}, //"DynaBlock",   OPTYPE_SYSTEM, 0}},
-	{3,  &Jit64::twx}, //"twi",         OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{17, &Jit64::sc}, //"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
-
-	{7,  &Jit64::mulli}, //"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}},
-	{8,  &Jit64::subfic}, //"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A |	FL_SET_CA}},
-	{10, &Jit64::cmpXX}, //"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{11, &Jit64::cmpXX}, //"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{12, &Jit64::reg_imm}, //"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}},
-	{13, &Jit64::reg_imm}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}},
-	{14, &Jit64::reg_imm}, //"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-	{15, &Jit64::reg_imm}, //"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-
-	{20, &Jit64::rlwimix}, //"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}},
-	{21, &Jit64::rlwinmx}, //"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{23, &Jit64::rlwnmx}, //"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
-
-	{24, &Jit64::reg_imm}, //"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{25, &Jit64::reg_imm}, //"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{26, &Jit64::reg_imm}, //"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{27, &Jit64::reg_imm}, //"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{28, &Jit64::reg_imm}, //"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-	{29, &Jit64::reg_imm}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-
-	{32, &Jit64::lXXx}, //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{33, &Jit64::lXXx}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{34, &Jit64::lXXx}, //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{35, &Jit64::lXXx}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{40, &Jit64::lXXx}, //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{41, &Jit64::lXXx}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{42, &Jit64::lXXx}, //"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{43, &Jit64::lXXx}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-
-	{44, &Jit64::stX}, //"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{45, &Jit64::stX}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{36, &Jit64::stX}, //"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{37, &Jit64::stX}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{38, &Jit64::stX}, //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{39, &Jit64::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-
-	{46, &Jit64::lmw}, //"lmw",   OPTYPE_SYSTEM, FL_EVIL, 10}},
-	{47, &Jit64::stmw}, //"stmw",  OPTYPE_SYSTEM, FL_EVIL, 10}},
-
-	{48, &Jit64::lfs}, //"lfs",  OPTYPE_LOADFP, FL_IN_A}},
-	{49, &Jit64::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-	{50, &Jit64::lfd}, //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
-	{51, &Jit64::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-
-	{52, &Jit64::stfs}, //"stfs",  OPTYPE_STOREFP, FL_IN_A}},
-	{53, &Jit64::stfs}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-	{54, &Jit64::stfd}, //"stfd",  OPTYPE_STOREFP, FL_IN_A}},
-	{55, &Jit64::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-
-	{56, &Jit64::psq_l}, //"psq_l",   OPTYPE_PS, FL_IN_A}},
-	{57, &Jit64::psq_l}, //"psq_lu",  OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-	{60, &Jit64::psq_st}, //"psq_st",  OPTYPE_PS, FL_IN_A}},
-	{61, &Jit64::psq_st}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-
-	//missing: 0, 5, 6, 9, 22, 30, 62, 58
-	{0,  &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{5,  &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{6,  &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{9,  &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{22, &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{30, &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{62, &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{58, &Jit64::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-};
-
-static GekkoOPTemplate table4[] = 
-{    //SUBOP10
-	{0,    &Jit64::Default}, //"ps_cmpu0",   OPTYPE_PS, FL_SET_CRn}},
-	{32,   &Jit64::Default}, //"ps_cmpo0",   OPTYPE_PS, FL_SET_CRn}},
-	{40,   &Jit64::ps_sign}, //"ps_neg",     OPTYPE_PS, FL_RC_BIT}},
-	{136,  &Jit64::ps_sign}, //"ps_nabs",    OPTYPE_PS, FL_RC_BIT}},
-	{264,  &Jit64::ps_sign}, //"ps_abs",     OPTYPE_PS, FL_RC_BIT}},
-	{64,   &Jit64::Default}, //"ps_cmpu1",   OPTYPE_PS, FL_RC_BIT}},
-	{72,   &Jit64::ps_mr}, //"ps_mr",      OPTYPE_PS, FL_RC_BIT}},
-	{96,   &Jit64::Default}, //"ps_cmpo1",   OPTYPE_PS, FL_RC_BIT}},
-	{528,  &Jit64::ps_mergeXX}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}},
-	{560,  &Jit64::ps_mergeXX}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}},
-	{592,  &Jit64::ps_mergeXX}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}},
-	{624,  &Jit64::ps_mergeXX}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}},
-
-	{1014, &Jit64::Default}, //"dcbz_l",     OPTYPE_SYSTEM, 0}},
-};		
-
-static GekkoOPTemplate table4_2[] = 
-{
-	{10, &Jit64::ps_sum}, //"ps_sum0",   OPTYPE_PS, 0}},
-	{11, &Jit64::ps_sum}, //"ps_sum1",   OPTYPE_PS, 0}},
-	{12, &Jit64::ps_muls}, //"ps_muls0",  OPTYPE_PS, 0}},
-	{13, &Jit64::ps_muls}, //"ps_muls1",  OPTYPE_PS, 0}},
-	{14, &Jit64::ps_maddXX}, //"ps_madds0", OPTYPE_PS, 0}},
-	{15, &Jit64::ps_maddXX}, //"ps_madds1", OPTYPE_PS, 0}},
-	{18, &Jit64::ps_arith}, //"ps_div",    OPTYPE_PS, 0, 16}},
-	{20, &Jit64::ps_arith}, //"ps_sub",    OPTYPE_PS, 0}},
-	{21, &Jit64::ps_arith}, //"ps_add",    OPTYPE_PS, 0}},
-	{23, &Jit64::ps_sel}, //"ps_sel",    OPTYPE_PS, 0}},
-	{24, &Jit64::Default}, //"ps_res",    OPTYPE_PS, 0}},
-	{25, &Jit64::ps_arith}, //"ps_mul",    OPTYPE_PS, 0}},
-	{26, &Jit64::ps_rsqrte}, //"ps_rsqrte", OPTYPE_PS, 0, 1}},
-	{28, &Jit64::ps_maddXX}, //"ps_msub",   OPTYPE_PS, 0}},
-	{29, &Jit64::ps_maddXX}, //"ps_madd",   OPTYPE_PS, 0}},
-	{30, &Jit64::ps_maddXX}, //"ps_nmsub",  OPTYPE_PS, 0}},
-	{31, &Jit64::ps_maddXX}, //"ps_nmadd",  OPTYPE_PS, 0}},
-};
-
-
-static GekkoOPTemplate table4_3[] = 
-{
-	{6,  &Jit64::Default}, //"psq_lx",   OPTYPE_PS, 0}},
-	{7,  &Jit64::Default}, //"psq_stx",  OPTYPE_PS, 0}},
-	{38, &Jit64::Default}, //"psq_lux",  OPTYPE_PS, 0}},
-	{39, &Jit64::Default}, //"psq_stux", OPTYPE_PS, 0}}, 
-};
-
-static GekkoOPTemplate table19[] = 
-{
-	{528, &Jit64::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{16,  &Jit64::bclrx}, //"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{257, &Jit64::crXXX}, //"crand",  OPTYPE_CR, FL_EVIL}},
-	{129, &Jit64::crXXX}, //"crandc", OPTYPE_CR, FL_EVIL}},
-	{289, &Jit64::crXXX}, //"creqv",  OPTYPE_CR, FL_EVIL}},
-	{225, &Jit64::crXXX}, //"crnand", OPTYPE_CR, FL_EVIL}},
-	{33,  &Jit64::crXXX}, //"crnor",  OPTYPE_CR, FL_EVIL}},
-	{449, &Jit64::crXXX}, //"cror",   OPTYPE_CR, FL_EVIL}},
-	{417, &Jit64::crXXX}, //"crorc",  OPTYPE_CR, FL_EVIL}},
-	{193, &Jit64::crXXX}, //"crxor",  OPTYPE_CR, FL_EVIL}},
-												   
-	{150, &Jit64::DoNothing}, //"isync",  OPTYPE_ICACHE, FL_EVIL}},
-	{0,   &Jit64::mcrf}, //"mcrf",   OPTYPE_SYSTEM, FL_EVIL}},
-												   
-	{50,  &Jit64::rfi}, //"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}},
-	{18,  &Jit64::Default}, //"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}}
-};
-
-
-static GekkoOPTemplate table31[] = 
-{
-	{28,  &Jit64::boolX}, //"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{60,  &Jit64::boolX}, //"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{444, &Jit64::boolX}, //"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{124, &Jit64::boolX}, //"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{316, &Jit64::boolX}, //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{412, &Jit64::boolX}, //"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{476, &Jit64::boolX}, //"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{284, &Jit64::boolX}, //"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{0,   &Jit64::cmpXX}, //"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{32,  &Jit64::cmpXX}, //"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{26,  &Jit64::cntlzwx}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{922, &Jit64::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{954, &Jit64::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{536, &Jit64::srwx}, //"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{792, &Jit64::srawx}, //"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{824, &Jit64::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{24,  &Jit64::slwx}, //"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-
-	{54,   &Jit64::dcbst}, //"dcbst",  OPTYPE_DCACHE, 0, 4}},
-	{86,   &Jit64::Default}, //"dcbf",   OPTYPE_DCACHE, 0, 4}},
-	{246,  &Jit64::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}},
-	{278,  &Jit64::DoNothing}, //"dcbt",   OPTYPE_DCACHE, 0, 1}},
-	{470,  &Jit64::Default}, //"dcbi",   OPTYPE_DCACHE, 0, 4}},
-	{758,  &Jit64::DoNothing}, //"dcba",   OPTYPE_DCACHE, 0, 4}},
-	{1014, &Jit64::dcbz}, //"dcbz",   OPTYPE_DCACHE, 0, 4}},
-
-	//load word
-	{23,  &Jit64::lXXx}, //"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{55,  &Jit64::lXXx}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword
-	{279, &Jit64::lXXx}, //"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{311, &Jit64::lXXx}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword signextend
-	{343, &Jit64::lXXx}, //"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{375, &Jit64::lXXx}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte
-	{87,  &Jit64::lXXx}, //"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{119, &Jit64::lXXx}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte reverse
-	{534, &Jit64::Default}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{790, &Jit64::Default}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-
-	// Conditional load/store (Wii SMP)
-	{150, &Jit64::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}},
-	{20,  &Jit64::Default}, //"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}},
-
-	//load string (interpret these)
-	{533, &Jit64::Default}, //"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}},
-	{597, &Jit64::Default}, //"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}},
-
-	//store word
-	{151, &Jit64::stXx}, //"stwx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{183, &Jit64::stXx}, //"stwux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store halfword
-	{407, &Jit64::stXx}, //"sthx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{439, &Jit64::stXx}, //"sthux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store byte
-	{215, &Jit64::stXx}, //"stbx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{247, &Jit64::stXx}, //"stbux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store bytereverse
-	{662, &Jit64::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{918, &Jit64::Default}, //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}},
-
-	{661, &Jit64::Default}, //"stswx",  OPTYPE_STORE, FL_EVIL}},
-	{725, &Jit64::Default}, //"stswi",  OPTYPE_STORE, FL_EVIL}},
-
-	// fp load/store	
-	{535, &Jit64::lfsx}, //"lfsx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{567, &Jit64::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-	{599, &Jit64::Default}, //"lfdx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{631, &Jit64::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-
-	{663, &Jit64::stfsx}, //"stfsx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{695, &Jit64::Default}, //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{727, &Jit64::Default}, //"stfdx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{759, &Jit64::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{983, &Jit64::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-
-	{19,  &Jit64::mfcr}, //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
-	{83,  &Jit64::mfmsr}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
-	{144, &Jit64::mtcrf}, //"mtcrf",  OPTYPE_SYSTEM, 0}},
-	{146, &Jit64::mtmsr}, //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{210, &Jit64::Default}, //"mtsr",   OPTYPE_SYSTEM, 0}},
-	{242, &Jit64::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}},
-	{339, &Jit64::mfspr}, //"mfspr",  OPTYPE_SPR, FL_OUT_D}},
-	{467, &Jit64::mtspr}, //"mtspr",  OPTYPE_SPR, 0, 2}},
-	{371, &Jit64::mftb}, //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
-	{512, &Jit64::mcrxr}, //"mcrxr",  OPTYPE_SYSTEM, 0}},
-	{595, &Jit64::Default}, //"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2}},
-	{659, &Jit64::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}},
-
-	{4,   &Jit64::twx}, //"tw",     OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
-	{598, &Jit64::DoNothing}, //"sync",   OPTYPE_SYSTEM, 0, 2}},
-	{982, &Jit64::icbi}, //"icbi",   OPTYPE_SYSTEM, FL_ENDBLOCK, 3}},
-
-	// Unused instructions on GC
-	{310, &Jit64::Default}, //"eciwx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{438, &Jit64::Default}, //"ecowx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{854, &Jit64::Default}, //"eieio",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{306, &Jit64::Default}, //"tlbie",   OPTYPE_SYSTEM, 0}},
-	{370, &Jit64::Default}, //"tlbia",   OPTYPE_SYSTEM, 0}},
-	{566, &Jit64::Default}, //"tlbsync", OPTYPE_SYSTEM, 0}},
-};
-
-static GekkoOPTemplate table31_2[] = 
-{	
-	{266,  &Jit64::addx}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{778,  &Jit64::addx}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{10,   &Jit64::addcx}, //"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{522,  &Jit64::addcx}, //"addcox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{138,  &Jit64::addex}, //"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{650,  &Jit64::addex}, //"addeox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{234,  &Jit64::addmex}, //"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{202,  &Jit64::addzex}, //"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{491,  &Jit64::divwx}, //"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{1003, &Jit64::divwx}, //"divwox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{459,  &Jit64::divwux}, //"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{971,  &Jit64::divwux}, //"divwuox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{75,   &Jit64::Default}, //"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{11,   &Jit64::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{235,  &Jit64::mullwx}, //"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{747,  &Jit64::mullwx}, //"mullwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{104,  &Jit64::negx}, //"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{40,   &Jit64::subfx}, //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{552,  &Jit64::subfx}, //"subox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{8,    &Jit64::subfcx}, //"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{520,  &Jit64::subfcx}, //"subfcox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{136,  &Jit64::subfex}, //"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{232,  &Jit64::subfmex}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{200,  &Jit64::subfzex}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-};
-
-static GekkoOPTemplate table59[] = 
-{
-	{18, &Jit64::Default},       //{"fdivsx",   OPTYPE_FPU, FL_RC_BIT_F, 16}}, 
-	{20, &Jit64::fp_arith_s}, //"fsubsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{21, &Jit64::fp_arith_s}, //"faddsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-//	{22, &Jit64::Default}, //"fsqrtsx",  OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko
-	{24, &Jit64::Default}, //"fresx",    OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{25, &Jit64::fp_arith_s}, //"fmulsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{28, &Jit64::fmaddXX}, //"fmsubsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{29, &Jit64::fmaddXX}, //"fmaddsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{30, &Jit64::fmaddXX}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{31, &Jit64::fmaddXX}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-};							    
-
-static GekkoOPTemplate table63[] = 
-{
-	{264, &Jit64::fsign},   //"fabsx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{32,  &Jit64::fcmpx},   //"fcmpo",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{0,   &Jit64::fcmpx},   //"fcmpu",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{14,  &Jit64::Default}, //"fctiwx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{15,  &Jit64::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}},
-	{72,  &Jit64::fmrx},    //"fmrx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{136, &Jit64::fsign},   //"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{40,  &Jit64::fsign},   //"fnegx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{12,  &Jit64::Default}, //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
-
-	{64,  &Jit64::Default}, //"mcrfs",   OPTYPE_SYSTEMFP, 0}},
-	{583, &Jit64::Default}, //"mffsx",   OPTYPE_SYSTEMFP, 0}},
-	{70,  &Jit64::Default}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}},
-	{38,  &Jit64::Default}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}},
-	{134, &Jit64::Default}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}},
-	{711, &Jit64::Default}, //"mtfsfx",  OPTYPE_SYSTEMFP, 0, 2}},
-};
-
-static GekkoOPTemplate table63_2[] = 
-{
-	{18, &Jit64::Default}, //"fdivx",    OPTYPE_FPU, FL_RC_BIT_F, 30}},
-	{20, &Jit64::Default}, //"fsubx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{21, &Jit64::Default}, //"faddx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{22, &Jit64::Default}, //"fsqrtx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{23, &Jit64::Default}, //"fselx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{25, &Jit64::fp_arith_s}, //"fmulx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{26, &Jit64::fp_arith_s}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}},
-	{28, &Jit64::fmaddXX}, //"fmsubx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{29, &Jit64::fmaddXX}, //"fmaddx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{30, &Jit64::fmaddXX}, //"fnmsubx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{31, &Jit64::fmaddXX}, //"fnmaddx",  OPTYPE_FPU, FL_RC_BIT_F}},
-};
-
-namespace Jit64Tables
-{
-
-void CompileInstruction(PPCAnalyst::CodeOp & op)
-{
-	Jit64 *jit64 = (Jit64 *)jit;
-	(jit64->*dynaOpTable[op.inst.OPCD])(op.inst);
-	GekkoOPInfo *info = op.opinfo;
-	if (info) {
-#ifdef OPLOG
-		if (!strcmp(info->opname, OP_TO_LOG)){  ///"mcrfs"
-			rsplocations.push_back(jit.js.compilerPC);
-		}
-#endif
-		info->compileCount++;
-		info->lastUse = jit->js.compilerPC;
-	}
-}
-
-void InitTables()
-{
-	// once initialized, tables are read-only
-	static bool initialized = false;
-	if (initialized)
-		return;
-
-	//clear
-	for (int i = 0; i < 32; i++) 
-	{
-		dynaOpTable59[i] = &Jit64::unknown_instruction;
-	}
-
-	for (int i = 0; i < 1024; i++)
-	{
-		dynaOpTable4 [i] = &Jit64::unknown_instruction;
-		dynaOpTable19[i] = &Jit64::unknown_instruction;
-		dynaOpTable31[i] = &Jit64::unknown_instruction;
-		dynaOpTable63[i] = &Jit64::unknown_instruction;	
-	}
-
-	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
-	{
-		dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_2[j].opcode;
-			dynaOpTable4[op] = table4_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < 16; i++)
-	{
-		int fill = i << 6;
-		for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_3[j].opcode;
-			dynaOpTable4[op] = table4_3[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table4[i].opcode;
-		dynaOpTable4[op] = table4[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table31[i].opcode;
-		dynaOpTable31[op] = table31[i].Inst;
-	}
-
-	for (int i = 0; i < 1; i++)
-	{
-		int fill = i << 9;
-		for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table31_2[j].opcode;
-			dynaOpTable31[op] = table31_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table19[i].opcode;
-		dynaOpTable19[op] = table19[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table59[i].opcode;
-		dynaOpTable59[op] = table59[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table63[i].opcode;
-		dynaOpTable63[op] = table63[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table63_2[j].opcode;
-			dynaOpTable63[op] = table63_2[j].Inst;
-		}
-	}
-
-	initialized = true;
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h
deleted file mode 100644
index e77343c496..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef JIT64_TABLES_H
-#define JIT64_TABLES_H
-
-#include "../Gekko.h"
-#include "../PPCTables.h"
-#include "../Jit64/Jit.h"
-
-namespace Jit64Tables
-{
-	void CompileInstruction(PPCAnalyst::CodeOp & op);
-	void InitTables();
-}
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
deleted file mode 100644
index 7403ead883..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "x64ABI.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
-
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "MemoryUtil.h"
-
-#include "x64ABI.h"
-#include "Jit.h"
-#include "../JitCommon/JitCache.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-#include "JitAsm.h"
-
-using namespace Gen;
-
-//static int temp32; // unused?
-
-//TODO - make an option
-//#if _DEBUG
-static bool enableDebug = false; 
-//#else
-//		bool enableDebug = false; 
-//#endif
-
-//static bool enableStatistics = false; //unused?
-
-//GLOBAL STATIC ALLOCATIONS x86
-//EAX - ubiquitous scratch register - EVERYBODY scratches this
-
-//GLOBAL STATIC ALLOCATIONS x64
-//EAX - ubiquitous scratch register - EVERYBODY scratches this
-//RBX - Base pointer of memory
-//R15 - Pointer to array of block pointers 
-
-Jit64AsmRoutineManager asm_routines;
-
-// PLAN: no more block numbers - crazy opcodes just contain offset within
-// dynarec buffer
-// At this offset - 4, there is an int specifying the block number.
-
-
-void Jit64AsmRoutineManager::Generate()
-{
-	enterCode = AlignCode16();
-	ABI_PushAllCalleeSavedRegsAndAdjustStack();
-#ifndef _M_IX86
-	// Two statically allocated registers.
-	MOV(64, R(RBX), Imm64((u64)Memory::base));
-	MOV(64, R(R15), Imm64((u64)jit->GetBlockCache()->GetCodePointers())); //It's below 2GB so 32 bits are good enough
-#endif
-
-	outerLoop = GetCodePtr();
-		ABI_CallFunction(reinterpret_cast<void *>(&CoreTiming::Advance));
-		FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time
-	 
-		dispatcher = GetCodePtr();
-			// The result of slice decrementation should be in flags if somebody jumped here
-			// IMPORTANT - We jump on negative, not carry!!!
-			FixupBranch bail = J_CC(CC_BE, true);
-
-			if (Core::g_CoreStartupParameter.bEnableDebugging)
-			{
-				TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING));
-				FixupBranch notStepping = J_CC(CC_Z);
-				ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
-				TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-				FixupBranch noBreakpoint = J_CC(CC_Z);
-				ABI_PopAllCalleeSavedRegsAndAdjustStack();
-				RET();
-				SetJumpTarget(noBreakpoint);
-				SetJumpTarget(notStepping);
-			}
-
-			SetJumpTarget(skipToRealDispatch);
-
-			dispatcherNoCheck = GetCodePtr();
-			MOV(32, R(EAX), M(&PowerPC::ppcState.pc));
-			dispatcherPcInEAX = GetCodePtr();
-
-#ifdef JIT_UNLIMITED_ICACHE
-			u32 mask = 0;
-			FixupBranch no_mem;
-			FixupBranch exit_mem;
-			FixupBranch exit_vmem;
-			if (Core::g_CoreStartupParameter.bWii)
-				mask = JIT_ICACHE_EXRAM_BIT;
-			if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-				mask |= JIT_ICACHE_VMEM_BIT;
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				TEST(32, R(EAX), Imm32(mask));
-				no_mem = J_CC(CC_NZ);
-			}
-			AND(32, R(EAX), Imm32(JIT_ICACHE_MASK));
-#ifdef _M_IX86
-			MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICache()));
-#else
-			MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICache()));
-			MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				exit_mem = J();
-				SetJumpTarget(no_mem);
-			}
-			if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				TEST(32, R(EAX), Imm32(JIT_ICACHE_VMEM_BIT));
-				FixupBranch no_vmem = J_CC(CC_Z);
-				AND(32, R(EAX), Imm32(JIT_ICACHE_MASK));
-#ifdef _M_IX86
-				MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICacheVMEM()));
-#else
-				MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICacheVMEM()));
-				MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-				if (Core::g_CoreStartupParameter.bWii) exit_vmem = J();
-				SetJumpTarget(no_vmem);
-			}
-			if (Core::g_CoreStartupParameter.bWii)
-			{
-				TEST(32, R(EAX), Imm32(JIT_ICACHE_EXRAM_BIT));
-				FixupBranch no_exram = J_CC(CC_Z);
-				AND(32, R(EAX), Imm32(JIT_ICACHEEX_MASK));
-#ifdef _M_IX86
-				MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICacheEx()));
-#else
-				MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICacheEx()));
-				MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-				SetJumpTarget(no_exram);
-			}
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-				SetJumpTarget(exit_mem);
-			if (Core::g_CoreStartupParameter.bWii && (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack))
-				SetJumpTarget(exit_vmem);
-#else
-#ifdef _M_IX86
-			AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-			MOV(32, R(EBX), Imm32((u32)Memory::base));
-			MOV(32, R(EAX), MComplex(EBX, EAX, SCALE_1, 0));
-#else
-			MOV(32, R(EAX), MComplex(RBX, RAX, SCALE_1, 0));
-#endif
-#endif
-
-			TEST(32, R(EAX), Imm32(0xFC));
-			FixupBranch notfound = J_CC(CC_NZ);
-				BSWAP(32, EAX);
-				//IDEA - we have 26 bits, why not just use offsets from base of code?
-				if (enableDebug)
-				{
-					ADD(32, M(&PowerPC::ppcState.DebugCount), Imm8(1));
-				}
-				//grab from list and jump to it
-#ifdef _M_IX86
-				MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
-				JMPptr(MComplex(EDX, EAX, 4, 0));
-#else
-				JMPptr(MComplex(R15, RAX, 8, 0));
-#endif
-			SetJumpTarget(notfound);
-
-			//Ok, no block, let's jit
-#ifdef _M_IX86
-			ABI_AlignStack(4);
-			PUSH(32, M(&PowerPC::ppcState.pc));
-			CALL(reinterpret_cast<void *>(&Jit));
-			ABI_RestoreStack(4);
-#else
-			MOV(32, R(ABI_PARAM1), M(&PowerPC::ppcState.pc));
-			CALL((void *)&Jit);
-#endif
-			JMP(dispatcherNoCheck); // no point in special casing this
-
-		SetJumpTarget(bail);
-		doTiming = GetCodePtr();
-
-		testExternalExceptions = GetCodePtr();
-		TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT | EXCEPTION_PERFORMANCE_MONITOR | EXCEPTION_DECREMENTER));
-		FixupBranch noExtException = J_CC(CC_Z);
-		MOV(32, R(EAX), M(&PC));
-		MOV(32, M(&NPC), R(EAX));
-		ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExternalExceptions));
-		SetJumpTarget(noExtException);
-		
-		TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-		J_CC(CC_Z, outerLoop, true);
-
-	//Landing pad for drec space
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	RET();
-
-	breakpointBailout = GetCodePtr();
-	//Landing pad for drec space
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	RET();
-
-	GenerateCommon();
-}
-
-void Jit64AsmRoutineManager::GenerateCommon()
-{
-	fifoDirectWrite8 = AlignCode4();
-	GenFifoWrite(8);
-	fifoDirectWrite16 = AlignCode4();
-	GenFifoWrite(16);
-	fifoDirectWrite32 = AlignCode4();
-	GenFifoWrite(32);
-	fifoDirectWriteFloat = AlignCode4();
-	GenFifoFloatWrite();
-	fifoDirectWriteXmm64 = AlignCode4(); 
-	GenFifoXmm64Write();
-
-	GenQuantizedLoads();
-	GenQuantizedStores();
-	GenQuantizedSingleStores();
-
-	//CMPSD(R(XMM0), M(&zero), 
-	// TODO
-
-	// Fast write routines - special case the most common hardware write
-	// TODO: use this.
-	// Even in x86, the param values will be in the right registers.
-	/*
-	const u8 *fastMemWrite8 = AlignCode16();
-	CMP(32, R(ABI_PARAM2), Imm32(0xCC008000));
-	FixupBranch skip_fast_write = J_CC(CC_NE, false);
-	MOV(32, EAX, M(&m_gatherPipeCount));
-	MOV(8, MDisp(EAX, (u32)&m_gatherPipe), ABI_PARAM1);
-	ADD(32, 1, M(&m_gatherPipeCount));
-	RET();
-	SetJumpTarget(skip_fast_write);
-	CALL((void *)&Memory::Write_U8);*/
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h
deleted file mode 100644
index 8835a07bcc..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JIT64ASM_H
-#define _JIT64ASM_H
-
-#include "../JitCommon/JitAsmCommon.h"
-
-// In Dolphin, we don't use inline assembly. Instead, we generate all machine-near
-// code at runtime. In the case of fixed code like this, after writing it, we write
-// protect the memory, essentially making it work just like precompiled code.
-
-// There are some advantages to this approach:
-//   1) No need to setup an external assembler in the build.
-//   2) Cross platform, as long as it's x86/x64.
-//   3) Can optimize code at runtime for the specific CPU model.
-// There aren't really any disadvantages other than having to maintain a x86 emitter,
-// which we have to do anyway :)
-// 
-// To add a new asm routine, just add another const here, and add the code to Generate.
-// Also, possibly increase the size of the code buffer.
-
-class Jit64AsmRoutineManager : public CommonAsmRoutines
-{
-private:
-	void Generate();
-	void GenerateCommon();
-
-public:
-	void Init() {
-		AllocCodeSpace(8192);
-		Generate();
-		WriteProtect();
-	}
-
-	void Shutdown() {
-		FreeCodeSpace();
-	}
-};
-
-extern Jit64AsmRoutineManager asm_routines;
-
-#endif  // _JIT64ASM_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
deleted file mode 100644
index 39c05f88e9..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-#include "Jit.h"
-#include "JitAsm.h"
-#include "JitRegCache.h"
-
-using namespace Gen;
-using namespace PowerPC;
-
-RegCache::RegCache() : emit(0)
-{
-	memset(locks, 0, sizeof(locks));
-	memset(xlocks, 0, sizeof(xlocks));
-	memset(saved_locks, 0, sizeof(saved_locks));
-	memset(saved_xlocks, 0, sizeof(saved_xlocks));
-	memset(regs, 0, sizeof(regs));
-	memset(xregs, 0, sizeof(xregs));
-	memset(saved_regs, 0, sizeof(saved_regs));
-	memset(saved_xregs, 0, sizeof(saved_xregs));
-}
-
-void RegCache::Start(PPCAnalyst::BlockRegStats &stats)
-{
-	for (int i = 0; i < NUMXREGS; i++)
-	{
-		xregs[i].free = true;
-		xregs[i].dirty = false;
-		xlocks[i] = false;
-	}
-	for (int i = 0; i < 32; i++)
-	{
-		regs[i].location = GetDefaultLocation(i);
-		regs[i].away = false;
-	}
-	
-	// todo: sort to find the most popular regs
-	/*
-	int maxPreload = 2;
-	for (int i = 0; i < 32; i++)
-	{
-		if (stats.numReads[i] > 2 || stats.numWrites[i] >= 2)
-		{
-			LoadToX64(i, true, false); //stats.firstRead[i] <= stats.firstWrite[i], false);
-			maxPreload--;
-			if (!maxPreload)
-				break;
-		}
-	}*/
-	//Find top regs - preload them (load bursts ain't bad)
-	//But only preload IF written OR reads >= 3
-}
-
-// these are powerpc reg indices
-void RegCache::Lock(int p1, int p2, int p3, int p4)
-{
-	locks[p1] = true;
-	if (p2 != 0xFF) locks[p2] = true;
-	if (p3 != 0xFF) locks[p3] = true;
-	if (p4 != 0xFF) locks[p4] = true;
-}
-
-// these are x64 reg indices
-void RegCache::LockX(int x1, int x2, int x3, int x4)
-{
-	if (xlocks[x1]) {
-		PanicAlert("RegCache: x %i already locked!", x1);
-	}
-	xlocks[x1] = true;
-	if (x2 != 0xFF) xlocks[x2] = true;
-	if (x3 != 0xFF) xlocks[x3] = true;
-	if (x4 != 0xFF) xlocks[x4] = true;
-}
-
-bool RegCache::IsFreeX(int xreg) const
-{
-	return xregs[xreg].free && !xlocks[xreg];
-}
-
-void RegCache::UnlockAll()
-{
-	for (int i = 0; i < 32; i++)
-		locks[i] = false;
-}
-
-void RegCache::UnlockAllX()
-{
-	for (int i = 0; i < NUMXREGS; i++)
-		xlocks[i] = false;
-}
-
-X64Reg RegCache::GetFreeXReg()
-{
-	int aCount;
-	const int *aOrder = GetAllocationOrder(aCount);
-	for (int i = 0; i < aCount; i++)
-	{
-		X64Reg xr = (X64Reg)aOrder[i];
-		if (!xlocks[xr] && xregs[xr].free)
-		{
-			return (X64Reg)xr;
-		}
-	}
-	//Okay, not found :( Force grab one
-
-	//TODO - add a pass to grab xregs whose ppcreg is not used in the next 3 instructions
-	for (int i = 0; i < aCount; i++)
-	{
-		X64Reg xr = (X64Reg)aOrder[i];
-		if (xlocks[xr]) 
-			continue;
-		int preg = xregs[xr].ppcReg;
-		if (!locks[preg])
-		{
-			StoreFromRegister(preg);
-			return xr;
-		}
-	}
-	//Still no dice? Die!
-	_assert_msg_(DYNA_REC, 0, "Regcache ran out of regs");
-	return (X64Reg) -1;
-}
-
-void RegCache::SaveState()
-{
-	memcpy(saved_locks, locks, sizeof(locks));
-	memcpy(saved_xlocks, xlocks, sizeof(xlocks));
-	memcpy(saved_regs, regs, sizeof(regs));
-	memcpy(saved_xregs, xregs, sizeof(xregs));
-}
-
-void RegCache::LoadState()
-{
-	memcpy(xlocks, saved_xlocks, sizeof(xlocks));
-	memcpy(locks, saved_locks, sizeof(locks));
-	memcpy(regs, saved_regs, sizeof(regs));
-	memcpy(xregs, saved_xregs, sizeof(xregs));
-}
-
-void RegCache::FlushR(X64Reg reg)
-{
-	if (reg >= NUMXREGS)
-		PanicAlert("Flushing non existent reg");
-	if (!xregs[reg].free)
-	{
-		StoreFromRegister(xregs[reg].ppcReg);
-	}
-}
-
-int RegCache::SanityCheck() const
-{
-	for (int i = 0; i < 32; i++)
-	{
-		if (regs[i].away)
-		{
-			if (regs[i].location.IsSimpleReg())
-			{
-				Gen::X64Reg simple = regs[i].location.GetSimpleReg();
-				if (xlocks[simple])
-					return 1;
-				if (xregs[simple].ppcReg != i)
-					return 2;
-			}
-			else if (regs[i].location.IsImm())
-				return 3;
-		}
-	}
-	return 0;
-}
-
-void RegCache::DiscardRegContentsIfCached(int preg)
-{
-	if (regs[preg].away && regs[preg].location.IsSimpleReg())
-	{
-		X64Reg xr = regs[preg].location.GetSimpleReg();
-		xregs[xr].free = true;
-		xregs[xr].dirty = false;
-		xregs[xr].ppcReg = -1;
-		regs[preg].away = false;
-		regs[preg].location = GetDefaultLocation(preg);
-	}
-}
-
-
-void GPRRegCache::SetImmediate32(int preg, u32 immValue)
-{
-	DiscardRegContentsIfCached(preg);
-	regs[preg].away = true;
-	regs[preg].location = Imm32(immValue);
-}
-
-void GPRRegCache::Start(PPCAnalyst::BlockRegStats &stats)
-{
-	RegCache::Start(stats);
-}
-
-void FPURegCache::Start(PPCAnalyst::BlockRegStats &stats)
-{
-	RegCache::Start(stats);
-}
-
-const int *GPRRegCache::GetAllocationOrder(int &count)
-{
-	static const int allocationOrder[] = 
-	{
-		// R12, when used as base register, for example in a LEA, can generate bad code! Need to look into this.
-#ifdef _M_X64
-#ifdef _WIN32
-		RSI, RDI, R13, R14, R8, R9, R10, R11, R12, //, RCX
-#else
-		RBP, R13, R14, R8, R9, R10, R11, R12, //, RCX
-#endif
-#elif _M_IX86
-		ESI, EDI, EBX, EBP, EDX, ECX,
-#endif
-	};
-	count = sizeof(allocationOrder) / sizeof(const int);
-	return allocationOrder;
-}
-
-const int *FPURegCache::GetAllocationOrder(int &count)
-{
-	static const int allocationOrder[] = 
-	{
-#ifdef _M_X64
-		XMM6, XMM7, XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, XMM2, XMM3, XMM4, XMM5
-#elif _M_IX86
-		XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
-#endif
-	};
-	count = sizeof(allocationOrder) / sizeof(int);
-	return allocationOrder;
-}
-
-OpArg GPRRegCache::GetDefaultLocation(int reg) const
-{
-	return M(&ppcState.gpr[reg]);
-}
-
-OpArg FPURegCache::GetDefaultLocation(int reg) const
-{
-	return M(&ppcState.ps[reg][0]);
-}
-
-void RegCache::KillImmediate(int preg, bool doLoad, bool makeDirty)
-{
-	if (regs[preg].away)
-	{
-		if (regs[preg].location.IsImm())
-			BindToRegister(preg, doLoad, makeDirty);
-		else if (regs[preg].location.IsSimpleReg())
-			xregs[RX(preg)].dirty |= makeDirty;
-	}
-}
-
-void GPRRegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
-{
-	if (!regs[i].away && regs[i].location.IsImm())
-		PanicAlert("Bad immediate");
-
-	if (!regs[i].away || (regs[i].away && regs[i].location.IsImm()))
-	{
-		X64Reg xr = GetFreeXReg();
-		if (xregs[xr].dirty) PanicAlert("Xreg already dirty");
-		if (xlocks[xr]) PanicAlert("GetFreeXReg returned locked register");
-		xregs[xr].free = false;
-		xregs[xr].ppcReg = i;
-		xregs[xr].dirty = makeDirty || regs[i].location.IsImm();
-		OpArg newloc = ::Gen::R(xr);
-		if (doLoad)
-			emit->MOV(32, newloc, regs[i].location);
-		for (int j = 0; j < 32; j++)
-		{
-			if (i != j && regs[j].location.IsSimpleReg() && regs[j].location.GetSimpleReg() == xr)
-			{
-				Crash();
-			}
-		}
-		regs[i].away = true;
-		regs[i].location = newloc;
-	}
-	else
-	{
-		// reg location must be simplereg; memory locations
-		// and immediates are taken care of above.
-		xregs[RX(i)].dirty |= makeDirty;
-	}
-
-	if (xlocks[RX(i)])
-	{
-		PanicAlert("Seriously WTF, this reg should have been flushed");
-	}
-}
-
-void GPRRegCache::StoreFromRegister(int i)
-{
-	if (regs[i].away)
-	{
-		bool doStore;
-		if (regs[i].location.IsSimpleReg())
-		{
-			X64Reg xr = RX(i);
-			xregs[xr].free = true;
-			xregs[xr].ppcReg = -1;
-			doStore = xregs[xr].dirty;
-			xregs[xr].dirty = false;
-		}
-		else
-		{
-			//must be immediate - do nothing
-			doStore = true;
-		}
-		OpArg newLoc = GetDefaultLocation(i);
-		if (doStore)
-			emit->MOV(32, newLoc, regs[i].location);
-		regs[i].location = newLoc;
-		regs[i].away = false;
-	}
-}
-
-void FPURegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
-{
-	_assert_msg_(DYNA_REC, !regs[i].location.IsImm(), "WTF - load - imm");
-	if (!regs[i].away)
-	{
-		// Reg is at home in the memory register file. Let's pull it out.
-		X64Reg xr = GetFreeXReg();
-		_assert_msg_(DYNA_REC, xr < NUMXREGS, "WTF - load - invalid reg");
-		xregs[xr].ppcReg = i;
-		xregs[xr].free = false;
-		xregs[xr].dirty = makeDirty;
-		OpArg newloc = ::Gen::R(xr);
-		if (doLoad)
-		{
-			if (!regs[i].location.IsImm() && (regs[i].location.offset & 0xF))
-			{
-				PanicAlert("WARNING - misaligned fp register location %i", i);
-			}
-			emit->MOVAPD(xr, regs[i].location);
-		}
-		regs[i].location = newloc;
-		regs[i].away = true;
-	}
-	else
-	{
-		// There are no immediates in the FPR reg file, so we already had this in a register. Make dirty as necessary.
-		xregs[RX(i)].dirty |= makeDirty;
-	}
-}
-
-void FPURegCache::StoreFromRegister(int i)
-{
-	_assert_msg_(DYNA_REC, !regs[i].location.IsImm(), "WTF - store - imm");
-	if (regs[i].away)
-	{
-		X64Reg xr = regs[i].location.GetSimpleReg();
-		_assert_msg_(DYNA_REC, xr < NUMXREGS, "WTF - store - invalid reg");
-		xregs[xr].free = true;
-		xregs[xr].dirty = false;
-		xregs[xr].ppcReg = -1;
-		OpArg newLoc = GetDefaultLocation(i);
-		emit->MOVAPD(newLoc, xr);
-		regs[i].location = newLoc;
-		regs[i].away = false;
-	}
-	else
-	{
-	//	_assert_msg_(DYNA_REC,0,"already stored");
-	}
-}
-
-void RegCache::Flush(FlushMode mode)
-{
-	for (int i = 0; i < NUMXREGS; i++)
-	{
-		if (xlocks[i])
-			PanicAlert("Someone forgot to unlock X64 reg %i.", i);
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		if (locks[i])
-		{
-			PanicAlert("Someone forgot to unlock PPC reg %i.", i);
-		}
-		if (regs[i].away)
-		{
-			if (regs[i].location.IsSimpleReg())
-			{
-				X64Reg xr = RX(i);
-				StoreFromRegister(i);
-				xregs[xr].dirty = false;
-			}
-			else if (regs[i].location.IsImm())
-			{
-				StoreFromRegister(i);
-			}
-			else
-			{
-				_assert_msg_(DYNA_REC,0,"Jit64 - Flush unhandled case, reg %i PC: %08x", i, PC);
-			}
-		}
-	}
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
deleted file mode 100644
index 73df8c8672..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JIT64REGCACHE_H
-#define _JIT64REGCACHE_H
-
-#include "x64Emitter.h"
-
-using namespace Gen;
-enum FlushMode
-{
-	FLUSH_ALL
-};
-
-enum GrabMode
-{
-	M_READ = 1,
-	M_WRITE = 2, 
-	M_READWRITE = 3,
-};
-
-struct PPCCachedReg
-{
-	OpArg location;
-	bool away;  // value not in source register
-};
-
-struct X64CachedReg
-{
-	int ppcReg;
-	bool dirty;
-	bool free;
-};
-
-typedef int XReg;
-typedef int PReg;
-
-#ifdef _M_X64
-#define NUMXREGS 16
-#elif _M_IX86
-#define NUMXREGS 8
-#endif
-
-class RegCache
-{
-private:
-	bool locks[32];
-	bool saved_locks[32];
-	bool saved_xlocks[NUMXREGS];
-
-protected:
-	bool xlocks[NUMXREGS];
-	PPCCachedReg regs[32];
-	X64CachedReg xregs[NUMXREGS];
-
-	PPCCachedReg saved_regs[32];
-	X64CachedReg saved_xregs[NUMXREGS];
-
-	virtual const int *GetAllocationOrder(int &count) = 0;
-	
-	XEmitter *emit;
-
-public:
-	RegCache();
-
-	virtual ~RegCache() {}
-	virtual void Start(PPCAnalyst::BlockRegStats &stats) = 0;
-
-	void DiscardRegContentsIfCached(int preg);
-	void SetEmitter(XEmitter *emitter) {emit = emitter;}
-
-	void FlushR(X64Reg reg); 
-	void FlushR(X64Reg reg, X64Reg reg2) {FlushR(reg); FlushR(reg2);}
-	void FlushLockX(X64Reg reg) {
-		FlushR(reg);
-		LockX(reg);
-	}
-	void FlushLockX(X64Reg reg1, X64Reg reg2) {
-		FlushR(reg1); FlushR(reg2);
-		LockX(reg1); LockX(reg2);
-	}
-	virtual void Flush(FlushMode mode);
-	virtual void Flush(PPCAnalyst::CodeOp *op) {Flush(FLUSH_ALL);}
-	int SanityCheck() const;
-	void KillImmediate(int preg, bool doLoad, bool makeDirty);
-
-	//TODO - instead of doload, use "read", "write"
-	//read only will not set dirty flag
-	virtual void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) = 0;
-	virtual void StoreFromRegister(int preg) = 0;
-
-	const OpArg &R(int preg) const {return regs[preg].location;}
-	X64Reg RX(int preg) const
-	{
-		if (regs[preg].away && regs[preg].location.IsSimpleReg()) 
-			return regs[preg].location.GetSimpleReg(); 
-		PanicAlert("Not so simple - %i", preg); 
-		return (X64Reg)-1;
-	}
-	virtual OpArg GetDefaultLocation(int reg) const = 0;
-
-	// Register locking.
-	void Lock(int p1, int p2=0xff, int p3=0xff, int p4=0xff);
-	void LockX(int x1, int x2=0xff, int x3=0xff, int x4=0xff);
-	void UnlockAll();
-	void UnlockAllX();
-
-	bool IsFreeX(int xreg) const;
-
-	X64Reg GetFreeXReg();
-
-	void SaveState();
-	void LoadState();
-};
-
-class GPRRegCache : public RegCache
-{
-public:
-	void Start(PPCAnalyst::BlockRegStats &stats);
-	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
-	void StoreFromRegister(int preg);
-	OpArg GetDefaultLocation(int reg) const;
-	const int *GetAllocationOrder(int &count);
-	void SetImmediate32(int preg, u32 immValue);
-};
-
-
-class FPURegCache : public RegCache
-{
-public:
-	void Start(PPCAnalyst::BlockRegStats &stats);
-	void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
-	void StoreFromRegister(int preg);
-	const int *GetAllocationOrder(int &count);
-	OpArg GetDefaultLocation(int reg) const;
-};
-
-#endif  // _JIT64REGCACHE_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
deleted file mode 100644
index 310deaa9c2..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-// The branches are known good, or at least reasonably good.
-// No need for a disable-mechanism.
-
-// If defined, clears CR0 at blr and bl-s. If the assumption that
-// flags never carry over between functions holds, then the task for 
-// an optimizer becomes much easier.
-
-// #define ACID_TEST
-
-// Zelda and many more games seem to pass the Acid Test. 
-
-using namespace Gen;
-
-void Jit64::sc(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-	MOV(32, M(&PC), Imm32(js.compilerPC + 4));
-	LOCK();
-	OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_SYSCALL));
-	WriteExceptionExit();
-}
-
-void Jit64::rfi(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-	// See Interpreter rfi for details
-	const u32 mask = 0x87C0FFFF;
-	const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
-	// MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13;
-	AND(32, M(&MSR), Imm32((~mask) & clearMSR13));
-	MOV(32, R(EAX), M(&SRR1));
-	AND(32, R(EAX), Imm32(mask & clearMSR13));
-	OR(32, M(&MSR), R(EAX));
-	// NPC = SRR0;
-	MOV(32, R(EAX), M(&SRR0));
-	WriteRfiExitDestInEAX();
-}
-
-void Jit64::bx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	// We must always process the following sentence
-	// even if the blocks are merged by PPCAnalyst::Flatten().
-	if (inst.LK)
-		MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-
-	// If this is not the last instruction of a block,
-	// we will skip the rest process.
-	// Because PPCAnalyst::Flatten() merged the blocks.
-	if (!js.isLastInstruction) {
-		return;
-	}
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	u32 destination;
-	if (inst.AA)
-		destination = SignExt26(inst.LI << 2);
-	else
-		destination = js.compilerPC + SignExt26(inst.LI << 2);
-#ifdef ACID_TEST
-	if (inst.LK)
-		AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000)));
-#endif
-	if (destination == js.compilerPC)
-	{
-		//PanicAlert("Idle loop detected at %08x", destination);
-		//	CALL(ProtectFunction(&CoreTiming::Idle, 0));
-		//	JMP(Asm::testExceptions, true);
-		// make idle loops go faster
-		js.downcountAmount += 8;
-	}
-	WriteExit(destination, 0);
-}
-
-// TODO - optimize to hell and beyond
-// TODO - make nice easy to optimize special cases for the most common
-// variants of this instruction.
-void Jit64::bcx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	// USES_CR
-	_assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block");
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	FixupBranch pCTRDontBranch;
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
-	{
-		SUB(32, M(&CTR), Imm8(1));
-		if (inst.BO & BO_BRANCH_IF_CTR_0)
-			pCTRDontBranch = J_CC(CC_NZ);
-		else
-			pCTRDontBranch = J_CC(CC_Z);
-	}
-
-	FixupBranch pConditionDontBranch;
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
-	{
-		TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3)));
-		if (inst.BO & BO_BRANCH_IF_TRUE)  // Conditional branch 
-			pConditionDontBranch = J_CC(CC_Z);
-		else
-			pConditionDontBranch = J_CC(CC_NZ);
-	}
-	
-	if (inst.LK)
-		MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-
-	u32 destination;
-	if(inst.AA)
-		destination = SignExt16(inst.BD << 2);
-	else
-		destination = js.compilerPC + SignExt16(inst.BD << 2);
-	WriteExit(destination, 0);
-
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
-		SetJumpTarget( pConditionDontBranch );
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
-		SetJumpTarget( pCTRDontBranch );
-	WriteExit(js.compilerPC + 4, 1);
-}
-
-void Jit64::bcctrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	// bcctrx doesn't decrement and/or test CTR
-	_dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!");
-
-	if (inst.BO_2 & BO_DONT_CHECK_CONDITION)
-	{
-		// BO_2 == 1z1zz -> b always
-
-		//NPC = CTR & 0xfffffffc;
-		MOV(32, R(EAX), M(&CTR));
-		if (inst.LK_3)
-			MOV(32, M(&LR), Imm32(js.compilerPC + 4)); //	LR = PC + 4;
-		AND(32, R(EAX), Imm32(0xFFFFFFFC));
-		WriteExitDestInEAX();
-	}
-	else
-	{
-		// Rare condition seen in (just some versions of?) Nintendo's NES Emulator
-
-		// BO_2 == 001zy -> b if false
-		// BO_2 == 011zy -> b if true
-
-		// Ripped from bclrx
-		TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3)));
-		Gen::CCFlags branch;
-		if (inst.BO_2 & BO_BRANCH_IF_TRUE)
-			branch = CC_Z;
-		else
-			branch = CC_NZ; 
-		FixupBranch b = J_CC(branch, false);
-		MOV(32, R(EAX), M(&CTR));
-		AND(32, R(EAX), Imm32(0xFFFFFFFC));
-		//MOV(32, M(&PC), R(EAX)); => Already done in WriteExitDestInEAX()
-		if (inst.LK_3)
-			MOV(32, M(&LR), Imm32(js.compilerPC + 4)); //	LR = PC + 4;
-		WriteExitDestInEAX();
-		// Would really like to continue the block here, but it ends. TODO.
-		SetJumpTarget(b);
-		WriteExit(js.compilerPC + 4, 1);
-	}
-}
-
-void Jit64::bclrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	if (!js.isLastInstruction &&
-		(inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) {
-		if (inst.LK)
-			MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-		return;
-	}
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	FixupBranch pCTRDontBranch;
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
-	{
-		SUB(32, M(&CTR), Imm8(1));
-		if (inst.BO & BO_BRANCH_IF_CTR_0)
-			pCTRDontBranch = J_CC(CC_NZ);
-		else
-			pCTRDontBranch = J_CC(CC_Z);
-	}
-
-	FixupBranch pConditionDontBranch;
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
-	{
-		TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3)));
-		if (inst.BO & BO_BRANCH_IF_TRUE)  // Conditional branch 
-			pConditionDontBranch = J_CC(CC_Z);
-		else
-			pConditionDontBranch = J_CC(CC_NZ);
-	}
-
-		// This below line can be used to prove that blr "eats flags" in practice.
-		// This observation will let us do a lot of fun observations.
-#ifdef ACID_TEST
-		AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000)));
-#endif
-
-	MOV(32, R(EAX), M(&LR));	
-	AND(32, R(EAX), Imm32(0xFFFFFFFC));
-	if (inst.LK)
-		MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-	WriteExitDestInEAX();
-
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
-		SetJumpTarget( pConditionDontBranch );
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
-		SetJumpTarget( pCTRDontBranch );
-	WriteExit(js.compilerPC + 4, 1);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
deleted file mode 100644
index a04114d110..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "CPUDetect.h"
-
-const u64 GC_ALIGNED16(psSignBits2[2]) = {0x8000000000000000ULL, 0x8000000000000000ULL};
-const u64 GC_ALIGNED16(psAbsMask2[2])  = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL};
-const double GC_ALIGNED16(psOneOne2[2]) = {1.0, 1.0};
-
-void Jit64::fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg))
-{
-	fpr.Lock(d, a, b);
-	if (d == a)
-	{
-		fpr.BindToRegister(d, true);
-		(this->*op)(fpr.RX(d), fpr.R(b));
-	}
-	else if (d == b && reversible)
-	{
-		fpr.BindToRegister(d, true);
-		(this->*op)(fpr.RX(d), fpr.R(a));
-	}
-	else if (a != d && b != d) 
-	{
-		// Sources different from d, can use rather quick solution
-		fpr.BindToRegister(d, !dupe);
-		MOVSD(fpr.RX(d), fpr.R(a));
-		(this->*op)(fpr.RX(d), fpr.R(b));
-	}
-	else if (b != d)
-	{
-		fpr.BindToRegister(d, !dupe);
-		MOVSD(XMM0, fpr.R(b));
-		MOVSD(fpr.RX(d), fpr.R(a));
-		(this->*op)(fpr.RX(d), Gen::R(XMM0));
-	}
-	else // Other combo, must use two temps :(
-	{
-		MOVSD(XMM0, fpr.R(a));
-		MOVSD(XMM1, fpr.R(b));
-		fpr.BindToRegister(d, !dupe);
-		(this->*op)(XMM0, Gen::R(XMM1));
-		MOVSD(fpr.RX(d), Gen::R(XMM0));
-	}
-	if (dupe)
-	{
-		ForceSinglePrecisionS(fpr.RX(d));
-		if (cpu_info.bSSE3)
-		{
-			MOVDDUP(fpr.RX(d), fpr.R(d));
-		}
-		else
-		{
-			if (!fpr.R(d).IsSimpleReg(fpr.RX(d)))
-				MOVQ_xmm(fpr.RX(d), fpr.R(d));
-			UNPCKLPD(fpr.RX(d), R(fpr.RX(d)));
-		}
-	}
-	fpr.UnlockAll();
-}
-
-
-static const double one_const = 1.0f;
-
-void Jit64::fp_arith_s(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-
-	// Causing problems for GC - Starfox Assault (invisible boss at the end of level 1)
-	if (inst.SUBOP5 == 21) {
-		Default(inst); return;
-	}	
-
-	if (inst.SUBOP5 == 26) {
-		// frsqrtex
-		int d = inst.FD;
-		int b = inst.FB;
-		fpr.Lock(b, d);
-		fpr.BindToRegister(d, true, true);
-		MOVSD(XMM0, M((void *)&one_const));
-		SQRTSD(XMM1, fpr.R(b));
-		DIVSD(XMM0, R(XMM1));
-		MOVSD(fpr.R(d), XMM0);
-		fpr.UnlockAll();
-		return;
-	}
-
-	if (inst.SUBOP5 != 18 && inst.SUBOP5 != 20 && inst.SUBOP5 != 21 &&
-	    inst.SUBOP5 != 25) {
-		Default(inst); return;
-	}
-
-	// Only the interpreter has "proper" support for (some) FP flags
-	if (inst.SUBOP5 == 25 && Core::g_CoreStartupParameter.bEnableFPRF) {
-		Default(inst); return;
-	}
-
-	bool dupe = inst.OPCD == 59;
-	switch (inst.SUBOP5)
-	{
-	case 18: fp_tri_op(inst.FD, inst.FA, inst.FB, false, dupe, &XEmitter::DIVSD); break; //div
-	case 20: fp_tri_op(inst.FD, inst.FA, inst.FB, false, dupe, &XEmitter::SUBSD); break; //sub
-	case 21: fp_tri_op(inst.FD, inst.FA, inst.FB, true,  dupe, &XEmitter::ADDSD); break; //add
-	case 25: fp_tri_op(inst.FD, inst.FA, inst.FC, true, dupe, &XEmitter::MULSD); break; //mul
-	default:
-		_assert_msg_(DYNA_REC, 0, "fp_arith_s WTF!!!");
-	}
-}
-
-void Jit64::fmaddXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	// Only the interpreter has "proper" support for (some) FP flags
-	if (inst.SUBOP5 == 29 && Core::g_CoreStartupParameter.bEnableFPRF) {
-		Default(inst); return;
-	}
-
-	bool single_precision = inst.OPCD == 59;
-
-	int a = inst.FA;
-	int b = inst.FB;
-	int c = inst.FC;
-	int d = inst.FD;
-
-	fpr.Lock(a, b, c, d);
-	MOVSD(XMM0, fpr.R(a));
-	switch (inst.SUBOP5)
-	{
-	case 28: //msub
-		MULSD(XMM0, fpr.R(c));
-		SUBSD(XMM0, fpr.R(b));
-		break;
-	case 29: //madd
-		MULSD(XMM0, fpr.R(c));
-		ADDSD(XMM0, fpr.R(b));
-		break;
-	case 30: //nmsub
-		MULSD(XMM0, fpr.R(c));
-		SUBSD(XMM0, fpr.R(b));
-		XORPD(XMM0, M((void*)&psSignBits2));
-		break;
-	case 31: //nmadd
-		MULSD(XMM0, fpr.R(c));
-		ADDSD(XMM0, fpr.R(b));
-		XORPD(XMM0, M((void*)&psSignBits2));
-		break;
-	}
-	fpr.BindToRegister(d, false);
-	//YES it is necessary to dupe the result :(
-	//TODO : analysis - does the top reg get used? If so, dupe, if not, don't.
-	if (single_precision) {
-		ForceSinglePrecisionS(XMM0);
-		MOVDDUP(fpr.RX(d), R(XMM0));
-	} else {
-		MOVSD(fpr.RX(d), R(XMM0));
-	}
-	// SMB checks flags after this op. Let's lie.
-	//AND(32, M(&PowerPC::ppcState.fpscr), Imm32(~((0x80000000 >> 19) | (0x80000000 >> 15))));
-	//OR(32, M(&PowerPC::ppcState.fpscr), Imm32((0x80000000 >> 16)));
-	fpr.UnlockAll();
-}
-
-void Jit64::fsign(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-
-	int d = inst.FD;
-	int b = inst.FB;
-	fpr.Lock(b, d);
-	fpr.BindToRegister(d, true, true);
-	MOVSD(XMM0, fpr.R(b));
-	switch (inst.SUBOP10) {
-	case 40:  // fnegx
-		XORPD(XMM0, M((void*)&psSignBits2));
-		break;
-	case 264: // fabsx
-		ANDPD(XMM0, M((void*)&psAbsMask2));
-		break;
-	case 136: // fnabs
-		ORPD(XMM0, M((void*)&psSignBits2));
-		break;
-	default:
-		PanicAlert("fsign bleh");
-		break;
-	}
-	MOVSD(fpr.R(d), XMM0);
-	fpr.UnlockAll();
-}
-
-void Jit64::fmrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int b = inst.FB;
-	fpr.Lock(b, d);
-	fpr.BindToRegister(d, true, true);
-	MOVSD(XMM0, fpr.R(b));
-	MOVSD(fpr.R(d), XMM0);
-	fpr.UnlockAll();
-}
- 
-void Jit64::fcmpx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (jo.fpAccurateFcmp) {
-		Default(inst); return; // turn off from debugger
-	}
-
-	//bool ordered = inst.SUBOP10 == 32;
-	int a	= inst.FA;
-	int b	= inst.FB;
-	int crf	= inst.CRFD;
-
-	fpr.Lock(a,b);
-	fpr.BindToRegister(b, true);
-
-	// Are we masking sNaN invalid floating point exceptions? If not this could crash if we don't handle the exception?
-	UCOMISD(fpr.R(b).GetSimpleReg(), fpr.R(a));
-
-	FixupBranch pNaN, pLesser, pGreater;
-	FixupBranch continue1, continue2, continue3;
-
-	if (a != b)
-	{
-		// if B > A, goto Lesser's jump target
-		pLesser  = J_CC(CC_A);
-	}
-
-	// if (B != B) or (A != A), goto NaN's jump target
-	pNaN    	 = J_CC(CC_P);
-
-	if (a != b)
-	{
-		// if B < A, goto Greater's jump target
-		// JB can't precede the NaN check because it doesn't test ZF
-		pGreater = J_CC(CC_B);
-	}
-
-	// Equal
-	MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x2));
-	continue1 = J();
-
-	// NAN
-	SetJumpTarget(pNaN);
-	MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x1));
-
-	if (a != b)
-	{
-		continue2 = J();
-
-		// Greater Than
-		SetJumpTarget(pGreater);
-		MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x4));
-		continue3 = J();
-	
-		// Less Than
-		SetJumpTarget(pLesser);
-		MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x8));
-	}
-	
-	SetJumpTarget(continue1);
-	if (a != b)
-	{
-		SetJumpTarget(continue2);
-		SetJumpTarget(continue3);
-	}
-
-	fpr.UnlockAll();
-}
-
-
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
deleted file mode 100644
index ef69ea8c4a..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
+++ /dev/null
@@ -1,2230 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../../Core.h" // include "Common.h", "CoreParameter.h", SCoreStartupParameter
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-void Jit64::GenerateConstantOverflow(bool overflow)
-{
-	if (overflow)
-	{
-		//XER[OV/SO] = 1
-		OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK));
-	}
-	else
-	{
-		//XER[OV] = 0
-		AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK));
-	}
-}
-
-void Jit64::GenerateOverflow()
-{
-	FixupBranch jno = J_CC(CC_NO);
-	//XER[OV/SO] = 1
-	OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK));
-	FixupBranch exit = J();
-	SetJumpTarget(jno);
-	//XER[OV] = 0
-	AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK));
-	SetJumpTarget(exit);
-}
-
-// Assumes CA,OV are clear
-void Jit64::FinalizeCarryOverflow(bool oe, bool inv)
-{
-	// USES_XER
-	if (oe)
-	{
-		FixupBranch jno = J_CC(CC_NO);
-		// Do carry
-		FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC);
-		JitSetCA();
-		SetJumpTarget(carry1);
-		//XER[OV/SO] = 1
-		OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK));
-		FixupBranch exit = J();
-		SetJumpTarget(jno);
-		// Do carry
-		FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC);
-		JitSetCA();
-		SetJumpTarget(carry2);
-		SetJumpTarget(exit);
-	}
-	else
-	{
-		// Do carry
-		FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC);
-		JitSetCA();
-		SetJumpTarget(carry1);
-	}
-}
-
-void Jit64::GetCarryEAXAndClear()
-{
-	MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER]));
-	BTR(32, R(EAX), Imm8(29));
-}
-
-// Assumes that XER is in EAX and that the CA bit is clear.
-void Jit64::FinalizeCarryGenerateOverflowEAX(bool oe, bool inv)
-{
-	// USES_XER
-	if (oe)
-	{
-		FixupBranch jno = J_CC(CC_NO);
-		// Do carry
-		FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC);
-		OR(32, R(EAX), Imm32(XER_CA_MASK));
-		SetJumpTarget(carry1);
-		//XER[OV/SO] = 1
-		OR(32, R(EAX), Imm32(XER_SO_MASK | XER_OV_MASK));
-		FixupBranch exit = J();
-		SetJumpTarget(jno);
-		// Do carry
-		FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC);
-		OR(32, R(EAX), Imm32(XER_CA_MASK));
-		SetJumpTarget(carry2);
-		//XER[OV] = 0
-		AND(32, R(EAX), Imm32(~XER_OV_MASK));
-		SetJumpTarget(exit);
-	}
-	else
-	{
-		// Do carry
-		FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC);
-		OR(32, R(EAX), Imm32(XER_CA_MASK));
-		SetJumpTarget(carry1);
-	}
-	// Dump EAX back into XER
-	MOV(32, M(&PowerPC::ppcState.spr[SPR_XER]), R(EAX));
-}
-
-// Assumes that the flags were just set through an addition.
-void Jit64::GenerateCarry()
-{
-	// USES_XER
-	FixupBranch pNoCarry = J_CC(CC_NC);
-	OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_CA_MASK));
-	FixupBranch pContinue = J();
-	SetJumpTarget(pNoCarry);
-	AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~(XER_CA_MASK)));
-	SetJumpTarget(pContinue);
-}
-
-// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers.
-void Jit64::GenerateRC()
-{
-	FixupBranch pZero  = J_CC(CC_Z);
-	FixupBranch pNegative = J_CC(CC_S);
-	MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4)); // Result > 0
-	FixupBranch continue1 = J();
-
-	SetJumpTarget(pNegative);
-	MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x8)); // Result < 0
-	FixupBranch continue2 = J();
-
-	SetJumpTarget(pZero);
-	MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2)); // Result == 0
-
-	SetJumpTarget(continue1);
-	SetJumpTarget(continue2);
-}
-
-void Jit64::ComputeRC(const Gen::OpArg & arg)
-{
-	if( arg.IsImm() )
-	{
-		s32 value = (s32)arg.offset;
-		if( value < 0 )
-			MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x8));
-		else if( value > 0 )
-			MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4));
-		else
-			MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2));
-	}
-	else
-	{
-		if (arg.IsSimpleReg())
-			TEST(32, arg, arg);
-		else
-			CMP(32, arg, Imm8(0));
-		FixupBranch pLesser  = J_CC(CC_L);
-		FixupBranch pGreater = J_CC(CC_G);
-		MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2)); // _x86Reg == 0
-		FixupBranch continue1 = J();
-
-		SetJumpTarget(pGreater);
-		MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4)); // _x86Reg > 0
-		FixupBranch continue2 = J();
-
-		SetJumpTarget(pLesser);
-		MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x8)); // _x86Reg < 0
-
-		SetJumpTarget(continue1);
-		SetJumpTarget(continue2);
-	}
-}
-
-u32 Add(u32 a, u32 b) {return a + b;}
-u32 Or (u32 a, u32 b) {return a | b;}
-u32 And(u32 a, u32 b) {return a & b;}
-u32 Xor(u32 a, u32 b) {return a ^ b;}
-
-void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void (XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&), bool Rc, bool carry)
-{
-	gpr.Lock(d, a);
-	if (a || binary || carry)  // yeh nasty special case addic
-	{
-		if (gpr.R(a).IsImm() && !carry)
-		{
-			gpr.SetImmediate32(d, doop((u32)gpr.R(a).offset, value));
-			if (Rc)
-			{
-				ComputeRC(gpr.R(d));
-			}
-		}
-		else if (a == d)
-		{
-			gpr.KillImmediate(d, true, true);
-			(this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
-			if (Rc)
-			{
-				// All of the possible passed operators affect Sign/Zero flags
-				GenerateRC();
-			}
-			if (carry)
-				GenerateCarry();
-		}
-		else
-		{
-			gpr.BindToRegister(d, false);
-			MOV(32, gpr.R(d), gpr.R(a));
-			(this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16;
-			if (Rc)
-			{
-				// All of the possible passed operators affect Sign/Zero flags
-				GenerateRC();
-			}
-			if (carry)
-				GenerateCarry();
-		}
-	}
-	else if (doop == Add)
-	{
-		// a == 0, which for these instructions imply value = 0
-		gpr.SetImmediate32(d, value);
-		if (Rc)
-		{
-			ComputeRC(gpr.R(d));
-		}
-	}
-	else
-	{
-		_assert_msg_(DYNA_REC, 0, "WTF regimmop");
-	}
-	gpr.UnlockAll();
-}
-
-void Jit64::reg_imm(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 d = inst.RD, a = inst.RA, s = inst.RS;
-	switch (inst.OPCD)
-	{
-	case 14:  // addi
-		// occasionally used as MOV - emulate, with immediate propagation
-		if (gpr.R(a).IsImm() && d != a && a != 0)
-		{
-			gpr.SetImmediate32(d, (u32)gpr.R(a).offset + (u32)(s32)(s16)inst.SIMM_16);
-		}
-		else if (inst.SIMM_16 == 0 && d != a && a != 0)
-		{
-			gpr.Lock(a, d);
-			gpr.BindToRegister(d, false, true);
-			MOV(32, gpr.R(d), gpr.R(a));
-			gpr.UnlockAll();
-		}
-		else
-		{
-			regimmop(d, a, false, (u32)(s32)inst.SIMM_16,  Add, &XEmitter::ADD); //addi
-		}
-		break;
-	case 15:
-		if (a == 0) {	// lis
-			// Merge with next instruction if loading a 32-bits immediate value (lis + addi, lis + ori)
-			if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging)
-			{
-				if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) // addi
-				{
-					gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16);
-					js.downcountAmount++;
-					js.skipnext = true;
-					break;
-				}
-				else if ((js.next_inst.OPCD == 24) && (js.next_inst.RA == d) && (js.next_inst.RS == d)) // ori
-				{
-					gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) | (u32)js.next_inst.UIMM);
-					js.downcountAmount++;
-					js.skipnext = true;
-					break;
-				}
-			}
-
-			// Not merged
-			regimmop(d, a, false, (u32)inst.SIMM_16 << 16, Add, &XEmitter::ADD);
-		}
-		else // addis
-		{
-			regimmop(d, a, false, (u32)inst.SIMM_16 << 16, Add, &XEmitter::ADD);
-		}
-		break;
-	case 24: 
-		if (a == 0 && s == 0 && inst.UIMM == 0 && !inst.Rc)  //check for nop
-		{NOP(); return;} //make the nop visible in the generated code. not much use but interesting if we see one.
-		regimmop(a, s, true, inst.UIMM, Or, &XEmitter::OR); 
-		break; //ori
-	case 25: regimmop(a, s, true, inst.UIMM << 16, Or,  &XEmitter::OR, false); break;//oris
-	case 28: regimmop(a, s, true, inst.UIMM,       And, &XEmitter::AND, true); break;
-	case 29: regimmop(a, s, true, inst.UIMM << 16, And, &XEmitter::AND, true); break;
-	case 26: regimmop(a, s, true, inst.UIMM,       Xor, &XEmitter::XOR, false); break; //xori
-	case 27: regimmop(a, s, true, inst.UIMM << 16, Xor, &XEmitter::XOR, false); break; //xoris
-	case 12: regimmop(d, a, false, (u32)(s32)inst.SIMM_16, Add, &XEmitter::ADD, false, true); break; //addic
-	case 13: regimmop(d, a, true, (u32)(s32)inst.SIMM_16, Add, &XEmitter::ADD, true, true); break; //addic_rc
-	default:
-		Default(inst);
-		break;
-	}
-}
-
-void Jit64::cmpXX(UGeckoInstruction inst)
-{	
-	// USES_CR
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int b = inst.RB;
-	int crf = inst.CRFD;
-
-	bool merge_branch = false;
-	int test_crf = js.next_inst.BI >> 2;
-	// Check if the next instruction is a branch - if it is, merge the two.
-	if (((js.next_inst.OPCD == 16 /* bcx */) ||
-		((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 528) /* bcctrx */) ||
-		((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 16) /* bclrx */)) &&
-		(js.next_inst.BO & BO_DONT_DECREMENT_FLAG) &&
-		!(js.next_inst.BO & BO_DONT_CHECK_CONDITION)) {
-			// Looks like a decent conditional branch that we can merge with.
-			// It only test CR, not CTR.
-			if (test_crf == crf) {
-				merge_branch = true;
-			}
-	}
-
-	OpArg comparand;
-	bool signedCompare;
-	if (inst.OPCD == 31) {
-		// cmp / cmpl
-		gpr.Lock(a, b);
-		comparand = gpr.R(b);
-		signedCompare = (inst.SUBOP10 == 0);
-	}
-	else
-	{
-		gpr.Lock(a);
-		if (inst.OPCD == 10)
-		{
-			//cmpli
-			comparand = Imm32((u32)inst.UIMM);
-			signedCompare = false;
-		}
-		else if (inst.OPCD == 11)
-		{
-			//cmpi
-			comparand = Imm32((u32)(s32)(s16)inst.UIMM);
-			signedCompare = true;
-		}
-		else
-		{
-			signedCompare = false;	// silence compiler warning
-			PanicAlert("cmpXX");
-		}
-	}
-
-	if (gpr.R(a).IsImm() && comparand.IsImm())
-	{
-		// Both registers contain immediate values, so we can pre-compile the compare result
-		u8 compareResult;
-		if (signedCompare)
-		{
-			if ((s32)gpr.R(a).offset == (s32)comparand.offset)
-				compareResult = 0x2;
-			else if ((s32)gpr.R(a).offset > (s32)comparand.offset)
-				compareResult = 0x4;
-			else
-				compareResult = 0x8;
-		}
-		else
-		{
-			if ((u32)gpr.R(a).offset == (u32)comparand.offset)
-				compareResult = 0x2;
-			else if ((u32)gpr.R(a).offset > (u32)comparand.offset)
-				compareResult = 0x4;
-			else
-				compareResult = 0x8;
-		}
-		MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(compareResult));
-		gpr.UnlockAll();
-
-		if (merge_branch)
-		{
-			js.downcountAmount++;
-
-			gpr.Flush(FLUSH_ALL);
-			fpr.Flush(FLUSH_ALL);
-
-			int test_bit = 8 >> (js.next_inst.BI & 3);
-			u8 conditionResult = (js.next_inst.BO & BO_BRANCH_IF_TRUE) ? test_bit : 0;
-			if ((compareResult & test_bit) == conditionResult)
-			{
-				if (js.next_inst.OPCD == 16) // bcx
-				{
-					if (js.next_inst.LK)
-						MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-
-					u32 destination;
-					if (js.next_inst.AA)
-						destination = SignExt16(js.next_inst.BD << 2);
-					else
-						destination = js.next_compilerPC + SignExt16(js.next_inst.BD << 2);
-					WriteExit(destination, 0);
-				}
-				else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 528)) // bcctrx
-				{
-					if (js.next_inst.LK)
-						MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-					MOV(32, R(EAX), M(&CTR));
-					AND(32, R(EAX), Imm32(0xFFFFFFFC));
-					WriteExitDestInEAX();  
-				}
-				else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 16)) // bclrx
-				{
-					MOV(32, R(EAX), M(&LR));
-					if (js.next_inst.LK)
-						MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-					WriteExitDestInEAX();  
-				}
-				else
-				{
-					PanicAlert("WTF invalid branch");
-				}
-			}
-			else
-			{
-				WriteExit(js.next_compilerPC + 4, 0);
-			}
-
-			js.cancel = true;
-		}
-	}
-	else
-	{
-		Gen::CCFlags less_than, greater_than;
-		if (signedCompare)
-		{
-			less_than = CC_L;
-			greater_than = CC_G;
-		}
-		else
-		{
-			less_than = CC_B;
-			greater_than = CC_A;
-		}
-
-		if (gpr.R(a).IsImm() || (!gpr.R(a).IsSimpleReg() && !comparand.IsImm() && !comparand.IsSimpleReg()))
-		{
-			// Syntax for CMP is invalid with such arguments. We must load RA in a register.
-			gpr.BindToRegister(a, true, false);
-		}
-		CMP(32, gpr.R(a), comparand);
-		gpr.UnlockAll();
-
-		if (!merge_branch)
-		{
-			// Keep the normal code separate for clarity.
-		
-			FixupBranch pLesser  = J_CC(less_than);
-			FixupBranch pGreater = J_CC(greater_than);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x2)); // _x86Reg == 0
-			FixupBranch continue1 = J();
-			SetJumpTarget(pGreater);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x4)); // _x86Reg > 0
-			FixupBranch continue2 = J();
-			SetJumpTarget(pLesser);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x8)); // _x86Reg < 0
-			SetJumpTarget(continue1);
-			SetJumpTarget(continue2);
-			// TODO: If we ever care about SO, borrow a trick from 
-			// http://maws.mameworld.info/maws/mamesrc/src/emu/cpu/powerpc/drc_ops.c : bt, adc
-		}
-		else
-		{
-			js.downcountAmount++;
-			int test_bit = 8 >> (js.next_inst.BI & 3);
-			bool condition = (js.next_inst.BO & BO_BRANCH_IF_TRUE) ? false : true;
-			
-			// Test swapping (in the future, will be used to inline across branches the right way)
-			// if (rand() & 1)
-			//     std::swap(destination1, destination2), condition = !condition;
-
-			gpr.Flush(FLUSH_ALL);
-			fpr.Flush(FLUSH_ALL);
-			FixupBranch pLesser  = J_CC(less_than);
-			FixupBranch pGreater = J_CC(greater_than);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x2));  //  == 0
-			FixupBranch continue1 = J();
-
-			SetJumpTarget(pGreater);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x4));  //  > 0
-			FixupBranch continue2 = J();
-
-			SetJumpTarget(pLesser);
-			MOV(8, M(&PowerPC::ppcState.cr_fast[crf]), Imm8(0x8));  //  < 0
-			FixupBranch continue3;
-			if (!!(8 & test_bit) == condition) continue3 = J();
-			if (!!(4 & test_bit) != condition) SetJumpTarget(continue2);
-			if (!!(2 & test_bit) != condition) SetJumpTarget(continue1);
-			if (js.next_inst.OPCD == 16) // bcx
-			{
-				if (js.next_inst.LK)
-					MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-
-				u32 destination;
-				if (js.next_inst.AA)
-					destination = SignExt16(js.next_inst.BD << 2);
-				else
-					destination = js.next_compilerPC + SignExt16(js.next_inst.BD << 2);
-				WriteExit(destination, 0);
-			}
-			else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 528)) // bcctrx
-			{
-				if (js.next_inst.LK)
-					MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-				MOV(32, R(EAX), M(&CTR));
-				AND(32, R(EAX), Imm32(0xFFFFFFFC));
-				WriteExitDestInEAX();  
-			}
-			else if ((js.next_inst.OPCD == 19) && (js.next_inst.SUBOP10 == 16)) // bclrx
-			{
-				MOV(32, R(EAX), M(&LR));
-				AND(32, R(EAX), Imm32(0xFFFFFFFC));
-				if (js.next_inst.LK)
-					MOV(32, M(&LR), Imm32(js.compilerPC + 4));
-				WriteExitDestInEAX();  
-			}
-			else
-			{
-				PanicAlert("WTF invalid branch");
-			}
-
-			if (!!(8 & test_bit) == condition) SetJumpTarget(continue3);
-			if (!!(4 & test_bit) == condition) SetJumpTarget(continue2);
-			if (!!(2 & test_bit) == condition) SetJumpTarget(continue1);
-
-			WriteExit(js.next_compilerPC + 4, 1);
-
-			js.cancel = true;
-		}
-	}
-
-	gpr.UnlockAll();
-}
-
-void Jit64::boolX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, s = inst.RS, b = inst.RB;
-	_dbg_assert_msg_(DYNA_REC, inst.OPCD == 31, "Invalid boolX");
-	
-	if (gpr.R(s).IsImm() && gpr.R(b).IsImm())
-	{
-		if (inst.SUBOP10 == 28) /* andx */
-			gpr.SetImmediate32(a, (u32)gpr.R(s).offset & (u32)gpr.R(b).offset);
-		else if (inst.SUBOP10 == 476) /* nandx */
-			gpr.SetImmediate32(a, ~((u32)gpr.R(s).offset & (u32)gpr.R(b).offset));
-		else if (inst.SUBOP10 == 60) /* andcx */
-			gpr.SetImmediate32(a, (u32)gpr.R(s).offset & (~(u32)gpr.R(b).offset));
-		else if (inst.SUBOP10 == 444) /* orx */
-			gpr.SetImmediate32(a, (u32)gpr.R(s).offset | (u32)gpr.R(b).offset);
-		else if (inst.SUBOP10 == 124) /* norx */
-			gpr.SetImmediate32(a, ~((u32)gpr.R(s).offset | (u32)gpr.R(b).offset));
-		else if (inst.SUBOP10 == 412) /* orcx */
-			gpr.SetImmediate32(a, (u32)gpr.R(s).offset | (~(u32)gpr.R(b).offset));
-		else if (inst.SUBOP10 == 316) /* xorx */
-			gpr.SetImmediate32(a, (u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset);
-		else if (inst.SUBOP10 == 284) /* eqvx */
-			gpr.SetImmediate32(a, ~((u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset));
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else if (s == b)
-	{
-		if ((inst.SUBOP10 == 28 /* andx */) || (inst.SUBOP10 == 444 /* orx */))
-		{
-			if (a != s)
-			{
-				gpr.Lock(a,s);
-				gpr.BindToRegister(a, false, true);
-				MOV(32, gpr.R(a), gpr.R(s));
-				gpr.UnlockAll();
-			}
-		}
-		else if ((inst.SUBOP10 == 476 /* nandx */) || (inst.SUBOP10 == 124 /* norx */))
-		{
-			if (a != s)
-			{
-				gpr.Lock(a,s);
-				gpr.BindToRegister(a, false, true);
-				MOV(32, gpr.R(a), gpr.R(s));
-			}
-			else
-			{
-				gpr.KillImmediate(a, true, true);
-			}
-			NOT(32, gpr.R(a));
-			gpr.UnlockAll();
-		}
-		else if ((inst.SUBOP10 == 412 /* orcx */) || (inst.SUBOP10 == 284 /* eqvx */))
-		{
-			gpr.SetImmediate32(a, 0xFFFFFFFF);
-		}
-		else if ((inst.SUBOP10 == 60 /* andcx */) || (inst.SUBOP10 == 316 /* xorx */))
-		{
-			gpr.SetImmediate32(a, 0);
-		}
-		else
-		{
-			PanicAlert("WTF!");
-		}
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else if ((a == s) || (a == b))
-	{
-		gpr.Lock(a,((a == s) ? b : s));
-		OpArg operand = ((a == s) ? gpr.R(b) : gpr.R(s));
-		gpr.BindToRegister(a, true, true);
-		
-		if (inst.SUBOP10 == 28) /* andx */
-		{
-			AND(32, gpr.R(a), operand);
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 476) /* nandx */
-		{
-			AND(32, gpr.R(a), operand);
-			NOT(32, gpr.R(a));
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (inst.SUBOP10 == 60) /* andcx */
-		{
-			if (a == b)
-			{
-				NOT(32, gpr.R(a));
-				AND(32, gpr.R(a), operand);
-			}
-			else
-			{
-				MOV(32, R(EAX), operand);
-				NOT(32, R(EAX));
-				AND(32, gpr.R(a), R(EAX));
-			}
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 444) /* orx */
-		{
-			OR(32, gpr.R(a), operand);
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 124) /* norx */
-		{
-			OR(32, gpr.R(a), operand);
-			NOT(32, gpr.R(a));
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (inst.SUBOP10 == 412) /* orcx */
-		{
-			if (a == b)
-			{
-				NOT(32, gpr.R(a));
-				OR(32, gpr.R(a), operand);
-			}
-			else
-			{
-				MOV(32, R(EAX), operand);
-				NOT(32, R(EAX));
-				OR(32, gpr.R(a), R(EAX));
-			}
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 316) /* xorx */
-		{
-			XOR(32, gpr.R(a), operand);
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 284) /* eqvx */
-		{
-			NOT(32, gpr.R(a));
-			XOR(32, gpr.R(a), operand);
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else
-		{
-			PanicAlert("WTF");
-		}
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a,s,b);
-		gpr.BindToRegister(a, false, true);
-		
-		if (inst.SUBOP10 == 28) /* andx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			AND(32, gpr.R(a), gpr.R(b));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 476) /* nandx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			AND(32, gpr.R(a), gpr.R(b));
-			NOT(32, gpr.R(a));
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (inst.SUBOP10 == 60) /* andcx */
-		{
-			MOV(32, gpr.R(a), gpr.R(b));
-			NOT(32, gpr.R(a));
-			AND(32, gpr.R(a), gpr.R(s));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 444) /* orx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			OR(32, gpr.R(a), gpr.R(b));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 124) /* norx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			OR(32, gpr.R(a), gpr.R(b));
-			NOT(32, gpr.R(a));
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (inst.SUBOP10 == 412) /* orcx */
-		{
-			MOV(32, gpr.R(a), gpr.R(b));
-			NOT(32, gpr.R(a));
-			OR(32, gpr.R(a), gpr.R(s));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 316) /* xorx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			XOR(32, gpr.R(a), gpr.R(b));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SUBOP10 == 284) /* eqvx */
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-			NOT(32, gpr.R(a));
-			XOR(32, gpr.R(a), gpr.R(b));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else
-		{
-			PanicAlert("WTF!");
-		}
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::extsbx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, s = inst.RS;
-
-	if (gpr.R(s).IsImm())
-	{
-		gpr.SetImmediate32(a, (u32)(s32)(s8)gpr.R(s).offset);
-	}
-	else
-	{
-		gpr.Lock(a, s);
-		gpr.BindToRegister(a, a == s, true);
-		// Always force moving to EAX because it isn't possible
-		// to refer to the lowest byte of some registers, at least in
-		// 32-bit mode.
-		MOV(32, R(EAX), gpr.R(s));
-		MOVSX(32, 8, gpr.RX(a), R(AL)); // watch out for ah and friends
-		gpr.UnlockAll();
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(a));
-	}
-}
-
-void Jit64::extshx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, s = inst.RS;
-
-	if (gpr.R(s).IsImm())
-	{
-		gpr.SetImmediate32(a, (u32)(s32)(s16)gpr.R(s).offset);
-	}
-	else
-	{
-		gpr.Lock(a, s);
-		gpr.KillImmediate(s, true, false);
-		gpr.BindToRegister(a, a == s, true);
-		// This looks a little dangerous, but it's safe because
-		// every 32-bit register has a 16-bit half at the same index
-		// as the 32-bit register.
-		MOVSX(32, 16, gpr.RX(a), gpr.R(s));
-		gpr.UnlockAll();
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(a));
-	}
-}
-
-void Jit64::subfic(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	gpr.Lock(a, d);
-	gpr.BindToRegister(d, a == d, true);
-	int imm = inst.SIMM_16;
-	if (d == a)
-	{
-		if (imm == 0)
-		{
-			JitClearCA();
-			// Flags act exactly like subtracting from 0
-			NEG(32, gpr.R(d));
-			// Output carry is inverted
-			FixupBranch carry1 = J_CC(CC_C);
-			JitSetCA();
-			SetJumpTarget(carry1);
-		}
-		else if (imm == -1)
-		{
-			// CA is always set in this case
-			JitSetCA();
-			NOT(32, gpr.R(d));
-		}
-		else
-		{
-			JitClearCA();
-			NOT(32, gpr.R(d));
-			ADD(32, gpr.R(d), Imm32(imm+1));
-			// Output carry is normal
-			FixupBranch carry1 = J_CC(CC_NC);
-			JitSetCA();
-			SetJumpTarget(carry1);
-		}
-	}
-	else
-	{
-		JitClearCA();
-		MOV(32, gpr.R(d), Imm32(imm));
-		SUB(32, gpr.R(d), gpr.R(a));
-		// Output carry is inverted
-		FixupBranch carry1 = J_CC(CC_C);
-		JitSetCA();
-		SetJumpTarget(carry1);
-	}
-	gpr.UnlockAll();
-	// This instruction has no RC flag
-}
-
-void Jit64::subfcx(UGeckoInstruction inst) 
-{
-	INSTRUCTION_START;
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	gpr.Lock(a, b, d);
-	gpr.BindToRegister(d, (d == a || d == b), true);
-
-	JitClearCAOV(inst.OE);
-	if (d == b)
-	{
-		SUB(32, gpr.R(d), gpr.R(a));
-	}
-	else if (d == a)
-	{
-		MOV(32, R(EAX), gpr.R(a));
-		MOV(32, gpr.R(d), gpr.R(b));
-		SUB(32, gpr.R(d), R(EAX));
-	}
-	else
-	{
-		MOV(32, gpr.R(d), gpr.R(b));
-		SUB(32, gpr.R(d), gpr.R(a));
-	}
-	if (inst.Rc) {
-		GenerateRC();
-	}
-	FinalizeCarryOverflow(inst.OE, true);
-
-	gpr.UnlockAll();
-}
-
-void Jit64::subfex(UGeckoInstruction inst) 
-{
-	INSTRUCTION_START;
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	gpr.Lock(a, b, d);
-	gpr.BindToRegister(d, (d == a || d == b), true);
-
-	GetCarryEAXAndClear();
-	
-	bool invertedCarry = false;
-	if (d == b)
-	{
-		// Convert carry to borrow
-		CMC();
-		SBB(32, gpr.R(d), gpr.R(a));
-		invertedCarry = true;
-	}
-	else if (d == a)
-	{
-		NOT(32, gpr.R(d));
-		ADC(32, gpr.R(d), gpr.R(b));
-	}
-	else
-	{
-		MOV(32, gpr.R(d), gpr.R(a));
-		NOT(32, gpr.R(d));
-		ADC(32, gpr.R(d), gpr.R(b));
-	}
-	if (inst.Rc) {
-		GenerateRC();
-	}
-	FinalizeCarryGenerateOverflowEAX(inst.OE, invertedCarry);
-
-	gpr.UnlockAll();
-}
-
-void Jit64::subfmex(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	gpr.Lock(a, d);
-	gpr.BindToRegister(d, d == a);
-
-	GetCarryEAXAndClear();
-	if (d != a)
-	{
-		MOV(32, gpr.R(d), gpr.R(a));
-	}
-	NOT(32, gpr.R(d));
-	ADC(32, gpr.R(d), Imm32(0xFFFFFFFF));
-	if (inst.Rc)
-	{
-		GenerateRC();
-	}
-	FinalizeCarryGenerateOverflowEAX(inst.OE);
-	gpr.UnlockAll();
-}
-
-void Jit64::subfzex(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	
-	gpr.Lock(a, d);
-	gpr.BindToRegister(d, d == a);
-	
-	GetCarryEAXAndClear();
-	if (d != a)
-	{
-		MOV(32, gpr.R(d), gpr.R(a));
-	}
-	NOT(32, gpr.R(d));
-	ADC(32, gpr.R(d), Imm8(0));
-	if (inst.Rc)
-	{
-		GenerateRC();
-	}
-	FinalizeCarryGenerateOverflowEAX(inst.OE);
-
-	gpr.UnlockAll();
-}
-
-void Jit64::subfx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		s32 i = (s32)gpr.R(b).offset, j = (s32)gpr.R(a).offset;
-		gpr.SetImmediate32(d, i - j);
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(d));
-		}
-		if (inst.OE)
-		{
-			GenerateConstantOverflow((s64)(i - j) != (s64)i - (s64)j);
-		}
-	}
-	else
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, (d == a || d == b), true);
-		if (d == b)
-		{
-			SUB(32, gpr.R(d), gpr.R(a));
-		}
-		else if (d == a)
-		{
-			MOV(32, R(EAX), gpr.R(a));
-			MOV(32, gpr.R(d), gpr.R(b));
-			SUB(32, gpr.R(d), R(EAX));
-		}
-		else
-		{
-			MOV(32, gpr.R(d), gpr.R(b));
-			SUB(32, gpr.R(d), gpr.R(a));
-		}
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		if (inst.OE)
-		{
-			GenerateOverflow();
-		}
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::mulli(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	u32 imm = inst.SIMM_16;
-
-	if (gpr.R(a).IsImm())
-	{
-		gpr.SetImmediate32(d, (u32)gpr.R(a).offset * imm);
-	}
-	else
-	{
-		gpr.Lock(a, d);
-		gpr.BindToRegister(d, (d == a), true);
-		if (imm == 0)
-		{
-			XOR(32, gpr.R(d), gpr.R(d));
-		}
-		else if(imm == (u32)-1)
-		{
-			if (d != a)
-				MOV(32, gpr.R(d), gpr.R(a));
-			NEG(32, gpr.R(d));
-		}
-		else if((imm & (imm - 1)) == 0)
-		{
-			u32 shift = 0;
-			if (imm & 0xFFFF0000) shift |= 16;
-			if (imm & 0xFF00FF00) shift |= 8;
-			if (imm & 0xF0F0F0F0) shift |= 4;
-			if (imm & 0xCCCCCCCC) shift |= 2;
-			if (imm & 0xAAAAAAAA) shift |= 1;
-			if (d != a)
-				MOV(32, gpr.R(d), gpr.R(a));
-			if (shift)
-				SHL(32, gpr.R(d), Imm8(shift));
-		}
-		else
-		{
-			IMUL(32, gpr.RX(d), gpr.R(a), Imm32(imm));
-		}
-
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::mullwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset;
-		gpr.SetImmediate32(d, i * j);
-		if (inst.OE)
-		{
-			GenerateConstantOverflow((s64)(i*j) != (s64)i * (s64)j);
-		}
-	}
-	else
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, (d == a || d == b), true);
-		if (gpr.R(a).IsImm() || gpr.R(b).IsImm())
-		{
-			u32 imm = gpr.R(a).IsImm() ? (u32)gpr.R(a).offset : (u32)gpr.R(b).offset;
-			int src = gpr.R(a).IsImm() ? b : a;
-			if (imm == 0)
-			{
-				XOR(32, gpr.R(d), gpr.R(d));
-			}
-			else if(imm == (u32)-1)
-			{
-				if (d != src)
-					MOV(32, gpr.R(d), gpr.R(src));
-				NEG(32, gpr.R(d));
-			}
-			else if((imm & (imm - 1)) == 0 && !inst.OE)
-			{
-				u32 shift = 0;
-				if (imm & 0xFFFF0000) shift |= 16;
-				if (imm & 0xFF00FF00) shift |= 8;
-				if (imm & 0xF0F0F0F0) shift |= 4;
-				if (imm & 0xCCCCCCCC) shift |= 2;
-				if (imm & 0xAAAAAAAA) shift |= 1;
-				if (d != src)
-					MOV(32, gpr.R(d), gpr.R(src));
-				if (shift)
-					SHL(32, gpr.R(d), Imm8(shift));
-			}
-			else
-			{
-				IMUL(32, gpr.RX(d), gpr.R(src), Imm32(imm));
-			}
-		}
-		else if (d == a)
-		{
-			IMUL(32, gpr.RX(d), gpr.R(b));
-		}
-		else if (d == b)
-		{
-			IMUL(32, gpr.RX(d), gpr.R(a));
-		}
-		else
-		{
-			MOV(32, gpr.R(d), gpr.R(b));
-			IMUL(32, gpr.RX(d), gpr.R(a));
-		}
-		if (inst.OE)
-		{
-			GenerateOverflow();
-		}
-		gpr.UnlockAll();
-	}
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(d));
-	}
-}
-
-void Jit64::mulhwux(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		gpr.SetImmediate32(d, (u32)(((u64)gpr.R(a).offset * (u64)gpr.R(b).offset) >> 32));
-	}
-	else
-	{
-		gpr.FlushLockX(EDX);
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, (d == a || d == b), true);
-		if (gpr.RX(d) == EDX)
-			PanicAlert("mulhwux : WTF");
-		MOV(32, R(EAX), gpr.R(a));
-		gpr.KillImmediate(b, true, false);
-		MUL(32, gpr.R(b));
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-		MOV(32, gpr.R(d), R(EDX));
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(d));
-	}
-}
-
-void Jit64::divwux(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		if( gpr.R(b).offset == 0 )
-		{
-			gpr.SetImmediate32(d, 0);
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(true);
-			}
-		}
-		else
-		{
-			gpr.SetImmediate32(d, (u32)gpr.R(a).offset / (u32)gpr.R(b).offset);
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(false);
-			}
-		}
-	}
-	else if (gpr.R(b).IsImm())
-	{
-		u32 divisor = (u32)gpr.R(b).offset;
-		if (divisor == 0)
-		{
-			gpr.SetImmediate32(d, 0);
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(true);
-			}
-		}
-		else
-		{
-			u32 shift = 31;
-			while(!(divisor & (1 << shift)))
-				shift--;
-
-			if (divisor == (u32)(1 << shift))
-			{
-				gpr.Lock(a, b, d);
-				gpr.BindToRegister(d, d == a, true);
-				if (d != a)
-					MOV(32, gpr.R(d), gpr.R(a));
-				if (shift)
-					SHR(32, gpr.R(d), Imm8(shift));
-			}
-			else
-			{
-				u64 magic_dividend = 0x100000000ULL << shift;
-				u32 magic = (u32)(magic_dividend / divisor);
-				u32 max_quotient = magic >> shift;
-				
-				// Test for failure in round-up method
-				if (((u64)(magic+1) * (max_quotient*divisor-1)) >> (shift + 32) != max_quotient-1)
-				{
-					// If failed, use slower round-down method
-#ifdef _M_X64
-					gpr.Lock(a, b, d);
-					gpr.BindToRegister(d, d == a, true);
-					MOV(32, R(EAX), Imm32(magic));
-					if (d != a)
-						MOV(32, gpr.R(d), gpr.R(a));
-					IMUL(64, gpr.RX(d), R(RAX));
-					ADD(64, gpr.R(d), R(RAX));
-					SHR(64, gpr.R(d), Imm8(shift+32));
-#else
-					gpr.FlushLockX(EDX);
-					gpr.Lock(a, b, d);
-					gpr.BindToRegister(d, d == a, true);
-					MOV(32, R(EAX), Imm32(magic));
-					MUL(32, gpr.R(a));
-					XOR(32, gpr.R(d), gpr.R(d));
-					ADD(32, R(EAX), Imm32(magic));
-					ADC(32, gpr.R(d), R(EDX));
-					if (shift)
-						SHR(32, gpr.R(d), Imm8(shift));
-					gpr.UnlockAllX();
-#endif
-				}
-				else
-				{
-					// If success, use faster round-up method
-#ifdef _M_X64
-					gpr.Lock(a, b, d);
-					gpr.BindToRegister(a, true, false);
-					gpr.BindToRegister(d, false, true);
-					if (d == a)
-					{
-						MOV(32, R(EAX), Imm32(magic+1));
-						IMUL(64, gpr.RX(d), R(RAX));
-					}
-					else
-					{
-						MOV(32, gpr.R(d), Imm32(magic+1));
-						IMUL(64, gpr.RX(d), gpr.R(a));
-					}
-					SHR(64, gpr.R(d), Imm8(shift+32));
-#else
-					gpr.FlushLockX(EDX);
-					gpr.Lock(a, b, d);
-					gpr.BindToRegister(d, d == a, true);
-					MOV(32, R(EAX), Imm32(magic+1));
-					MUL(32, gpr.R(a));
-					MOV(32, gpr.R(d), R(EDX));
-					if (shift)
-						SHR(32, gpr.R(d), Imm8(shift));
-					gpr.UnlockAllX();
-#endif
-				}
-			}
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(false);
-			}
-			gpr.UnlockAll();
-		}
-	}
-	else
-	{
-		gpr.FlushLockX(EDX);
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, (d == a || d == b), true);
-		MOV(32, R(EAX), gpr.R(a));
-		XOR(32, R(EDX), R(EDX));
-		gpr.KillImmediate(b, true, false);
-		CMP(32, gpr.R(b), Imm32(0));
-		FixupBranch not_div_by_zero = J_CC(CC_NZ);
-		MOV(32, gpr.R(d), R(EDX));
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(true);
-		}
-		//MOV(32, R(EAX), gpr.R(d));
-		FixupBranch end = J();
-		SetJumpTarget(not_div_by_zero);
-		DIV(32, gpr.R(b));
-		MOV(32, gpr.R(d), R(EAX));
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(false);
-		}
-		SetJumpTarget(end);
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(d));
-	}
-}
-
-void Jit64::divwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset;
-		if( j == 0 || (i == (s32)0x80000000 && j == -1))
-		{
-			gpr.SetImmediate32(d, (i >> 31) ^ j);
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(true);
-			}
-		}
-		else
-		{
-			gpr.SetImmediate32(d, i / j);
-			if (inst.OE)
-			{
-				GenerateConstantOverflow(false);
-			}
-		}
-	}
-	else
-	{
-		gpr.FlushLockX(EDX);
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, (d == a || d == b), true);
-		MOV(32, R(EAX), gpr.R(a));
-		CDQ();
-		gpr.BindToRegister(b, true, false);
-		TEST(32, gpr.R(b), gpr.R(b));
-		FixupBranch not_div_by_zero = J_CC(CC_NZ);
-		MOV(32, gpr.R(d), R(EDX));
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(true);
-		}
-		FixupBranch end1 = J();
-		SetJumpTarget(not_div_by_zero);
-		CMP(32, gpr.R(b), R(EDX));
-		FixupBranch not_div_by_neg_one = J_CC(CC_NZ);
-		MOV(32, gpr.R(d), R(EAX));
-		NEG(32, gpr.R(d));
-		FixupBranch no_overflow = J_CC(CC_NO);
-		XOR(32, gpr.R(d), gpr.R(d));
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(true);
-		}
-		FixupBranch end2 = J();
-		SetJumpTarget(not_div_by_neg_one);
-		IDIV(32, gpr.R(b));
-		MOV(32, gpr.R(d), R(EAX));
-		SetJumpTarget(no_overflow);
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(false);
-		}
-		SetJumpTarget(end1);
-		SetJumpTarget(end2);
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(d));
-	}
-}
-
-void Jit64::addx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	
-	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
-	{
-		s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset;
-		gpr.SetImmediate32(d, i + j);
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(d));
-		}
-		if (inst.OE)
-		{
-			GenerateConstantOverflow((s64)(i + j) != (s64)i + (s64)j);
-		}
-	}
-	else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.Rc && !inst.OE)
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, false);
-		LEA(32, gpr.RX(d), MComplex(gpr.RX(a), gpr.RX(b), 1, 0));
-		gpr.UnlockAll();
-	}
-	else if ((d == a) || (d == b))
-	{
-		int operand = ((d == a) ? b : a);
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, true);
-		ADD(32, gpr.R(d), gpr.R(operand));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		if (inst.OE)
-		{
-			GenerateOverflow();
-		}
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, false);
-		MOV(32, gpr.R(d), gpr.R(a)); 
-		ADD(32, gpr.R(d), gpr.R(b));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		if (inst.OE)
-		{
-			GenerateOverflow();
-		}
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::addex(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	
-	if ((d == a) || (d == b))
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, true);
-		
-		GetCarryEAXAndClear();
-		ADC(32, gpr.R(d), gpr.R((d == a) ? b : a));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, false);
-		
-		GetCarryEAXAndClear();
-		MOV(32, gpr.R(d), gpr.R(a));
-		ADC(32, gpr.R(d), gpr.R(b));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::addcx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	
-	if ((d == a) || (d == b))
-	{
-		int operand = ((d == a) ? b : a);
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, true);
-		JitClearCAOV(inst.OE);
-		ADD(32, gpr.R(d), gpr.R(operand));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryOverflow(inst.OE);
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a, b, d);
-		gpr.BindToRegister(d, false);
-		JitClearCAOV(inst.OE);
-		MOV(32, gpr.R(d), gpr.R(a)); 
-		ADD(32, gpr.R(d), gpr.R(b));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryOverflow(inst.OE);
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::addmex(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	
-	if (d == a)
-	{
-		gpr.Lock(d);
-		gpr.BindToRegister(d, true);
-		
-		GetCarryEAXAndClear();
-		ADC(32, gpr.R(d), Imm32(0xFFFFFFFF));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a, d);
-		gpr.BindToRegister(d, false);
-		
-		GetCarryEAXAndClear();
-		MOV(32, gpr.R(d), gpr.R(a));
-		ADC(32, gpr.R(d), Imm32(0xFFFFFFFF));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::addzex(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, d = inst.RD;
-	
-	if (d == a)
-	{
-		gpr.Lock(d);
-		gpr.BindToRegister(d, true);
-		
-		GetCarryEAXAndClear();
-		ADC(32, gpr.R(d), Imm8(0));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-	else
-	{
-		gpr.Lock(a, d);
-		gpr.BindToRegister(d, false);
-		
-		GetCarryEAXAndClear();
-		MOV(32, gpr.R(d), gpr.R(a));
-		ADC(32, gpr.R(d), Imm8(0));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		FinalizeCarryGenerateOverflowEAX(inst.OE);
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::rlwinmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int s = inst.RS;
-	if (gpr.R(s).IsImm())
-	{
-		unsigned result = (int)gpr.R(s).offset;
-		if (inst.SH != 0)
-			result = _rotl(result, inst.SH);
-		result &= Helper_Mask(inst.MB, inst.ME);
-		gpr.SetImmediate32(a, result);
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else
-	{
-		gpr.Lock(a, s);
-		gpr.BindToRegister(a, a == s);
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-
-		if (inst.SH && inst.MB == 0 && inst.ME==31-inst.SH)
-		{
-			SHL(32, gpr.R(a), Imm8(inst.SH));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else if (inst.SH && inst.ME == 31 && inst.MB == 32 - inst.SH)
-		{
-			SHR(32, gpr.R(a), Imm8(inst.MB));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else
-		{
-			if (inst.SH != 0)
-			{
-				ROL(32, gpr.R(a), Imm8(inst.SH));
-			}
-			if (!(inst.MB==0 && inst.ME==31)) 
-			{
-				AND(32, gpr.R(a), Imm32(Helper_Mask(inst.MB, inst.ME)));
-				if (inst.Rc)
-				{
-					GenerateRC();
-				}
-			}
-			else if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		gpr.UnlockAll();
-	}
-}
-
-
-void Jit64::rlwimix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int s = inst.RS;
-
-	if (gpr.R(a).IsImm() && gpr.R(s).IsImm())
-	{
-		u32 mask = Helper_Mask(inst.MB,inst.ME);
-		gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (_rotl((u32)gpr.R(s).offset,inst.SH) & mask));
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else
-	{
-		gpr.Lock(a, s);
-		gpr.BindToRegister(a, true, true);
-		u32 mask = Helper_Mask(inst.MB, inst.ME);
-		if (mask == 0 || (a == s && inst.SH == 0))
-		{
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (mask == 0xFFFFFFFF)
-		{
-			if (a != s)
-			{
-				MOV(32, gpr.R(a), gpr.R(s));
-			}
-			if (inst.SH)
-			{
-				ROL(32, gpr.R(a), Imm8(inst.SH));
-			}
-			if (inst.Rc)
-			{
-				ComputeRC(gpr.R(a));
-			}
-		}
-		else if (inst.SH)
-		{
-			if (mask == -(1U << inst.SH))
-			{
-				MOV(32, R(EAX), gpr.R(s));
-				SHL(32, R(EAX), Imm8(inst.SH));
-				AND(32, gpr.R(a), Imm32(~mask));
-				OR(32, gpr.R(a), R(EAX));
-			}
-			else if (mask == (1U << inst.SH) - 1)
-			{
-				MOV(32, R(EAX), gpr.R(s));
-				SHR(32, R(EAX), Imm8(32-inst.SH));
-				AND(32, gpr.R(a), Imm32(~mask));
-				OR(32, gpr.R(a), R(EAX));
-			}
-			else
-			{
-				MOV(32, R(EAX), gpr.R(s));
-				ROL(32, R(EAX), Imm8(inst.SH));
-				XOR(32, R(EAX), gpr.R(a));
-				AND(32, R(EAX), Imm32(mask));
-				XOR(32, gpr.R(a), R(EAX));
-			}
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		else
-		{
-			XOR(32, gpr.R(a), gpr.R(s));
-			AND(32, gpr.R(a), Imm32(~mask));
-			XOR(32, gpr.R(a), gpr.R(s));
-			if (inst.Rc)
-			{
-				GenerateRC();
-			}
-		}
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::rlwnmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA, b = inst.RB, s = inst.RS;
-
-	u32 mask = Helper_Mask(inst.MB, inst.ME);
-	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
-	{
-		gpr.SetImmediate32(a, _rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask);
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else
-	{
-		gpr.FlushLockX(ECX);
-		gpr.Lock(a, b, s);
-		gpr.BindToRegister(a, (a == b || a == s), true);
-		MOV(32, R(ECX), gpr.R(b));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		ROL(32, gpr.R(a), R(ECX));
-		AND(32, gpr.R(a), Imm32(mask));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-	}
-}
-
-void Jit64::negx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int d = inst.RD;
-
-	if (gpr.R(a).IsImm())
-	{
-		gpr.SetImmediate32(d, ~((u32)gpr.R(a).offset) + 1);
-		if (inst.Rc)
-		{
-			ComputeRC(gpr.R(d));
-		}
-		if (inst.OE)
-		{
-			GenerateConstantOverflow(gpr.R(d).offset == 0x80000000);
-		}
-	}
-	else
-	{
-		gpr.Lock(a, d);
-		gpr.BindToRegister(d, a == d, true);
-		if (a != d)
-			MOV(32, gpr.R(d), gpr.R(a));
-		NEG(32, gpr.R(d));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		if (inst.OE)
-		{
-			GenerateOverflow();
-		}
-		gpr.UnlockAll();
-	}
-}
-
-void Jit64::srwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int b = inst.RB;
-	int s = inst.RS;
-
-	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
-	{
-		u32 amount = (u32)gpr.R(b).offset;
-		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f)));
-	}
-	else
-	{
-#ifdef _M_X64
-		gpr.FlushLockX(ECX);
-		gpr.Lock(a, b, s);
-		gpr.BindToRegister(a, (a == b || a == s), true);
-		MOV(32, R(ECX), gpr.R(b));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		SHR(64, gpr.R(a), R(ECX));
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-#else
-		gpr.FlushLockX(ECX);
-		gpr.Lock(a, b, s);
-		gpr.BindToRegister(a, (a == b || a == s), true);
-		MOV(32, R(ECX), gpr.R(b));
-		TEST(32, R(ECX), Imm32(32));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		FixupBranch branch = J_CC(CC_Z);
-		XOR(32, gpr.R(a), gpr.R(a));
-		SetJumpTarget(branch);
-		SHR(32, gpr.R(a), R(ECX));
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-#endif
-	}
-	// Shift of 0 doesn't update flags, so compare manually just in case
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(a));
-	}
-}
-
-void Jit64::slwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int b = inst.RB;
-	int s = inst.RS;
-
-	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
-	{
-		u32 amount = (u32)gpr.R(b).offset;
-		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount);
-		if (inst.Rc) 
-		{
-			ComputeRC(gpr.R(a));
-		}
-	}
-	else
-	{
-#ifdef _M_X64
-		gpr.FlushLockX(ECX);
-		gpr.Lock(a, b, s);
-		gpr.BindToRegister(a, (a == b || a == s), true);
-		MOV(32, R(ECX), gpr.R(b));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		SHL(64, gpr.R(a), R(ECX));
-		if (inst.Rc) 
-		{
-			AND(32, gpr.R(a), gpr.R(a));
-			GenerateRC();
-		}
-		else
-		{
-			MOVZX(64, 32, gpr.R(a).GetSimpleReg(), gpr.R(a));
-		}
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-#else
-		gpr.FlushLockX(ECX);
-		gpr.Lock(a, b, s);
-		gpr.BindToRegister(a, (a == b || a == s), true);
-		MOV(32, R(ECX), gpr.R(b));
-		TEST(32, R(ECX), Imm32(32));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		FixupBranch branch = J_CC(CC_Z);
-		XOR(32, gpr.R(a), gpr.R(a));
-		SetJumpTarget(branch);
-		SHL(32, gpr.R(a), R(ECX));
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-		// Shift of 0 doesn't update flags, so compare manually just in case
-		if (inst.Rc) 
-		{
-			ComputeRC(gpr.R(a));
-		}
-#endif
-	}
-}
-
-void Jit64::srawx(UGeckoInstruction inst)
-{
-	// USES_XER
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int b = inst.RB;
-	int s = inst.RS;
-#ifdef _M_X64
-	gpr.Lock(a, s, b);
-	gpr.FlushLockX(ECX);
-	gpr.BindToRegister(a, (a == s || a == b), true);
-	JitClearCA();
-	MOV(32, R(ECX), gpr.R(b));
-	if (a != s)
-		MOV(32, gpr.R(a), gpr.R(s));
-	SHL(64, gpr.R(a), Imm8(32));
-	SAR(64, gpr.R(a), R(ECX));
-	MOV(32, R(EAX), gpr.R(a));
-	SHR(64, gpr.R(a), Imm8(32));
-	TEST(32, gpr.R(a), R(EAX));
-	FixupBranch nocarry = J_CC(CC_Z);
-	JitSetCA();
-	SetJumpTarget(nocarry);
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-#else
-	gpr.Lock(a, s, b);
-	gpr.FlushLockX(ECX);
-	gpr.BindToRegister(a, (a == s || a == b), true);
-	JitClearCA();
-	MOV(32, R(ECX), gpr.R(b));
-	if (a != s)
-		MOV(32, gpr.R(a), gpr.R(s));
-	TEST(32, R(ECX), Imm32(32));
-	FixupBranch topBitSet = J_CC(CC_NZ);
-	XOR(32, R(EAX), R(EAX));
-	SHRD(32, R(EAX), gpr.R(a), R(ECX));
-	SAR(32, gpr.R(a), R(ECX));
-	TEST(32, R(EAX), gpr.R(a));
-	FixupBranch nocarry1 = J_CC(CC_Z);
-	JitSetCA();
-	FixupBranch end = J();
-	SetJumpTarget(topBitSet);
-	SAR(32, gpr.R(a), Imm8(31));
-	FixupBranch nocarry2 = J_CC(CC_Z);
-	JitSetCA();
-	SetJumpTarget(end);
-	SetJumpTarget(nocarry1);
-	SetJumpTarget(nocarry2);
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-#endif
-	if (inst.Rc) {
-		ComputeRC(gpr.R(a));
-	}
-}
-
-void Jit64::srawix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int s = inst.RS;
-	int amount = inst.SH;
-	if (amount != 0)
-	{
-		gpr.Lock(a, s);
-		gpr.BindToRegister(a, a == s, true);
-		JitClearCA();
-		MOV(32, R(EAX), gpr.R(s));
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), R(EAX));
-		}
-		SAR(32, gpr.R(a), Imm8(amount));
-		if (inst.Rc)
-		{
-			GenerateRC();
-		}
-		SHL(32, R(EAX), Imm8(32-amount));
-		TEST(32, R(EAX), gpr.R(a));
-		FixupBranch nocarry = J_CC(CC_Z);
-		JitSetCA();
-		SetJumpTarget(nocarry);
-		gpr.UnlockAll();
-	}
-	else
-	{
-		Default(inst); return;
-		gpr.Lock(a, s);
-		JitClearCA();
-		gpr.BindToRegister(a, a == s, true);
-		if (a != s)
-		{
-			MOV(32, gpr.R(a), gpr.R(s));
-		}
-		if (inst.Rc) {
-			ComputeRC(gpr.R(a));
-		}
-		gpr.UnlockAll();
-	}
-}
-
-// count leading zeroes
-void Jit64::cntlzwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int s = inst.RS;
-	
-	if (gpr.R(s).IsImm())
-	{
-		u32 mask = 0x80000000;
-		u32 i = 0;
-		for (; i < 32; i++, mask >>= 1)
-			if ((u32)gpr.R(s).offset & mask) 
-				break;
-		gpr.SetImmediate32(a, i);
-	}
-	else
-	{
-		gpr.Lock(a, s);
-		gpr.KillImmediate(s, true, false);
-		gpr.BindToRegister(a, (a == s), true);
-		BSR(32, gpr.R(a).GetSimpleReg(), gpr.R(s));
-		FixupBranch gotone = J_CC(CC_NZ);
-		MOV(32, gpr.R(a), Imm32(63));
-		SetJumpTarget(gotone);
-		XOR(32, gpr.R(a), Imm8(0x1f));  // flip order
-		gpr.UnlockAll();
-	}
-
-	if (inst.Rc)
-	{
-		ComputeRC(gpr.R(a));
-		// TODO: Check PPC manual too
-	}
-}
-
-void Jit64::twx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	s32 a = inst.RA;
-
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	MOV(8, R(AL), Imm8(inst.TO));
-
-	if (inst.OPCD == 3) // twi
-		CMP(32, gpr.R(a), gpr.R(inst.RB));
-	else // tw
-		CMP(32, gpr.R(a), Imm32((s32)(s16)inst.SIMM_16));
-
-	FixupBranch al = J_CC(CC_L);
-	FixupBranch ag = J_CC(CC_G);
-	FixupBranch ae = J_CC(CC_Z);
-	// FIXME: will never be reached. But also no known code uses it...
-	FixupBranch ll = J_CC(CC_NO);
-	FixupBranch lg = J_CC(CC_O);
-
-	SetJumpTarget(al);
-	TEST(8, R(AL), Imm8(16));
-	FixupBranch exit1 = J_CC(CC_NZ);
-	FixupBranch take1 = J();
-	SetJumpTarget(ag);
-	TEST(8, R(AL), Imm8(8));
-	FixupBranch exit2 = J_CC(CC_NZ);
-	FixupBranch take2 = J();
-	SetJumpTarget(ae);
-	TEST(8, R(AL), Imm8(4));
-	FixupBranch exit3 = J_CC(CC_NZ);
-	FixupBranch take3 = J();
-	SetJumpTarget(ll);
-	TEST(8, R(AL), Imm8(2));
-	FixupBranch exit4 = J_CC(CC_NZ);
-	FixupBranch take4 = J();
-	SetJumpTarget(lg);
-	TEST(8, R(AL), Imm8(1));
-	FixupBranch exit5 = J_CC(CC_NZ);
-	FixupBranch take5 = J();
-
-	SetJumpTarget(take1);
-	SetJumpTarget(take2);
-	SetJumpTarget(take3);
-	SetJumpTarget(take4);
-	SetJumpTarget(take5);
-	LOCK();
-	OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_PROGRAM));
-	WriteExceptionExit();
-	
-	SetJumpTarget(exit1);
-	SetJumpTarget(exit2);
-	SetJumpTarget(exit3);
-	SetJumpTarget(exit4);
-	SetJumpTarget(exit5);
-	WriteExit(js.compilerPC + 4, 1);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
deleted file mode 100644
index 87a58415a1..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../ConfigManager.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "Jit.h"
-#include "JitAsm.h"
-#include "JitRegCache.h"
-
-void Jit64::lXXx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-
-	// Skip disabled JIT instructions
-	if (Core::g_CoreStartupParameter.bJITLoadStorelbzxOff && (inst.OPCD == 31) && (inst.SUBOP10 == 87))
-	{ Default(inst); return; }
-	if (Core::g_CoreStartupParameter.bJITLoadStorelXzOff && ((inst.OPCD == 34) || (inst.OPCD == 40) || (inst.OPCD == 32)))
-	{ Default(inst); return; }
-	if (Core::g_CoreStartupParameter.bJITLoadStorelwzOff && (inst.OPCD == 32))
-	{ Default(inst); return; }
-
-	// Determine memory access size and sign extend
-	int accessSize = 0;
-	bool signExtend = false;
-	switch (inst.OPCD)
-	{
-	case 32: /* lwz */
-	case 33: /* lwzu */
-		accessSize = 32;
-		signExtend = false;
-		break;
-		
-	case 34: /* lbz */
-	case 35: /* lbzu */
-		accessSize = 8;
-		signExtend = false;
-		break;
-		
-	case 40: /* lhz */
-	case 41: /* lhzu */
-		accessSize = 16;
-		signExtend = false;
-		break;
-		
-	case 42: /* lha */
-	case 43: /* lhau */
-		accessSize = 16;
-		signExtend = true;
-		break;
-		
-	case 31:
-		switch (inst.SUBOP10)
-		{
-		case 23:  /* lwzx */
-		case 55:  /* lwzux */
-			accessSize = 32;
-			signExtend = false;
-			break;
-			
-		case 87:  /* lbzx */
-		case 119: /* lbzux */
-			accessSize = 8;
-			signExtend = false;
-			break;
-		case 279: /* lhzx */
-		case 311: /* lhzux */
-			accessSize = 16;
-			signExtend = false;
-			break;
-			
-		case 343: /* lhax */
-		case 375: /* lhaux */
-			accessSize = 16;
-			signExtend = true;
-			break;
-			
-		default:
-			PanicAlert("Invalid instruction");
-		}
-		break;
-		
-	default:
-		PanicAlert("Invalid instruction");
-	}
-
-	// TODO(ector): Make it dynamically enable/disable idle skipping where appropriate
-	// Will give nice boost to dual core mode
-	// (mb2): I agree, 
-	// IMHO those Idles should always be skipped and replaced by a more controllable "native" Idle methode
-	// ... maybe the throttle one already do that :p
-	// if (CommandProcessor::AllowIdleSkipping() && PixelEngine::AllowIdleSkipping())
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
-		inst.OPCD == 32 && 
-		(inst.hex & 0xFFFF0000) == 0x800D0000 &&
-		(Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 ||
-		(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) &&
-		Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8)
-	{
-		// TODO(LinesPrower): 			
-		// - Rewrite this!
-		// It seems to be ugly and inefficient, but I don't know JIT stuff enough to make it right
-		// It only demonstrates the idea
-
-		// do our job at first
-		s32 offset = (s32)(s16)inst.SIMM_16;
-		gpr.Lock(d);
-		SafeLoadToEAX(gpr.R(a), accessSize, offset, signExtend);
-		gpr.KillImmediate(d, false, true);
-		MOV(32, gpr.R(d), R(EAX));
-		gpr.UnlockAll();
-		
-		gpr.Flush(FLUSH_ALL);
-		fpr.Flush(FLUSH_ALL);
-
-		// if it's still 0, we can wait until the next event
-		TEST(32, R(EAX), R(EAX));
-		FixupBranch noIdle = J_CC(CC_NZ);
-		
-		ABI_CallFunctionC((void *)&PowerPC::OnIdle, PowerPC::ppcState.gpr[a] + (s32)(s16)inst.SIMM_16);
-
-		// ! we must continue executing of the loop after exception handling, maybe there is still 0 in r0
-		//MOV(32, M(&PowerPC::ppcState.pc), Imm32(js.compilerPC));
-		WriteExceptionExit();
-
-		SetJumpTarget(noIdle);
-
-		//js.compilerPC += 8;
-		return;
-	}
-	
-	// Determine whether this instruction updates inst.RA
-	bool update;
-	if (inst.OPCD == 31)
-		update = ((inst.SUBOP10 & 0x20) != 0);
-	else
-		update = ((inst.OPCD & 1) != 0);
-	
-	// Prepare address operand
-	Gen::OpArg opAddress;
-	if (!update && !a)
-	{
-		if (inst.OPCD == 31)
-		{
-			gpr.Lock(b);
-			opAddress = gpr.R(b);
-		}
-		else
-		{
-			opAddress = Imm32((u32)(s32)inst.SIMM_16);
-		}
-	}
-	else if (update && ((a == 0) || (d == a)))
-	{
-		PanicAlert("Invalid instruction");
-	}
-	else
-	{
-		if ((inst.OPCD != 31) && gpr.R(a).IsImm())
-		{
-			opAddress = Imm32((u32)gpr.R(a).offset + (s32)inst.SIMM_16);
-		}
-		else if ((inst.OPCD == 31) && gpr.R(a).IsImm() && gpr.R(b).IsImm())
-		{
-			opAddress = Imm32((u32)gpr.R(a).offset + (u32)gpr.R(b).offset);
-		}
-		else
-		{
-			gpr.FlushLockX(ABI_PARAM1);
-			opAddress = R(ABI_PARAM1);
-			MOV(32, opAddress, gpr.R(a));
-			
-			if (inst.OPCD == 31)
-				ADD(32, opAddress, gpr.R(b));
-			else
-				ADD(32, opAddress, Imm32((u32)(s32)inst.SIMM_16));
-		}
-	}
-
-	SafeLoadToEAX(opAddress, accessSize, 0, signExtend);
-
-	// We must flush immediate values from the following registers because
-	// they may change at runtime if no MMU exception has been raised
-	gpr.KillImmediate(d, true, true);
-	if (update)
-	{
-		gpr.Lock(a);
-		gpr.BindToRegister(a, true, true);
-	}
-	
-	MEMCHECK_START
-
-	if (update)
-	{
-		if (inst.OPCD == 31)
-			ADD(32, gpr.R(a), gpr.R(b));
-		else
-			ADD(32, gpr.R(a), Imm32((u32)(s32)inst.SIMM_16));
-	}
-	MOV(32, gpr.R(d), R(EAX));
-
-	MEMCHECK_END
-	
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-}
-
-void Jit64::dcbst(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	// If the dcbst instruction is preceded by dcbt, it is flushing a prefetched
-	// memory location.  Do not invalidate the JIT cache in this case as the memory
-	// will be the same.
-	// dcbt = 0x7c00022c
-	if ((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c)
-	{
-		Default(inst); return;
-	}
-}
-
-// Zero cache line.
-void Jit64::dcbz(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	Default(inst); return;
-
-	MOV(32, R(EAX), gpr.R(inst.RB));
-	if (inst.RA)
-		ADD(32, R(EAX), gpr.R(inst.RA));
-	AND(32, R(EAX), Imm32(~31));
-	XORPD(XMM0, R(XMM0));
-#ifdef _M_X64
-	MOVAPS(MComplex(EBX, EAX, SCALE_1, 0), XMM0);
-	MOVAPS(MComplex(EBX, EAX, SCALE_1, 16), XMM0);
-#else
-	AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-	MOVAPS(MDisp(EAX, (u32)Memory::base), XMM0);
-	MOVAPS(MDisp(EAX, (u32)Memory::base + 16), XMM0);
-#endif
-}
-
-void Jit64::stX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	int s = inst.RS;
-	int a = inst.RA;
-
-	bool update = inst.OPCD & 1;
-
-	s32 offset = (s32)(s16)inst.SIMM_16;
-	if (a || !update) 
-	{
-		int accessSize;
-		switch (inst.OPCD & ~1)
-		{
-		case 36: accessSize = 32; break; //stw
-		case 44: accessSize = 16; break; //sth
-		case 38: accessSize = 8; break;  //stb
-		default: _assert_msg_(DYNA_REC, 0, "AWETKLJASDLKF"); return;
-		}
-
-		if ((a == 0) || gpr.R(a).IsImm())
-		{
-			// If we already know the address through constant folding, we can do some
-			// fun tricks...
-			u32 addr = ((a == 0) ? 0 : (u32)gpr.R(a).offset);
-			addr += offset;
-			if ((addr & 0xFFFFF000) == 0xCC008000 && jo.optimizeGatherPipe)
-			{
-				MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-				gpr.FlushLockX(ABI_PARAM1);
-				MOV(32, R(ABI_PARAM1), gpr.R(s));
-				if (update)
-					gpr.SetImmediate32(a, addr);
-				switch (accessSize)
-				{	
-					// No need to protect these, they don't touch any state
-					// question - should we inline them instead? Pro: Lose a CALL   Con: Code bloat
-				case 8:  CALL((void *)asm_routines.fifoDirectWrite8);  break;
-				case 16: CALL((void *)asm_routines.fifoDirectWrite16); break;
-				case 32: CALL((void *)asm_routines.fifoDirectWrite32); break;
-				}
-				js.fifoBytesThisBlock += accessSize >> 3;
-				gpr.UnlockAllX();
-				return;
-			}
-			else if (Memory::IsRAMAddress(addr))
-			{
-				MOV(32, R(EAX), gpr.R(s));
-				BSWAP(accessSize, EAX);
-				WriteToConstRamAddress(accessSize, R(EAX), addr);
-				if (update)
-					gpr.SetImmediate32(a, addr);
-				return;
-			}
-			else
-			{
-				MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-				switch (accessSize)
-				{
-				case 32: ABI_CallFunctionAC(thunks.ProtectFunction(true ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), 2), gpr.R(s), addr); break;
-				case 16: ABI_CallFunctionAC(thunks.ProtectFunction(true ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), 2), gpr.R(s), addr); break;
-				case 8:  ABI_CallFunctionAC(thunks.ProtectFunction((void *)&Memory::Write_U8, 2), gpr.R(s), addr);  break;
-				}
-				if (update)
-					gpr.SetImmediate32(a, addr);
-				return;
-			}
-		}
-		
-		// Optimized stack access?
-		if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack)
-		{
-			gpr.FlushLockX(ABI_PARAM1);
-			MOV(32, R(ABI_PARAM1), gpr.R(a));
-			MOV(32, R(EAX), gpr.R(s));
-			BSWAP(32, EAX);
-#ifdef _M_X64	
-			MOV(accessSize, MComplex(RBX, ABI_PARAM1, SCALE_1, (u32)offset), R(EAX));
-#else
-			AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK));
-			MOV(accessSize, MDisp(ABI_PARAM1, (u32)Memory::base + (u32)offset), R(EAX));
-#endif
-			if (update && offset)
-			{
-				gpr.Lock(a);
-				gpr.KillImmediate(a, true, true);
-				ADD(32, gpr.R(a), Imm32(offset));
-				gpr.UnlockAll();
-			}
-			gpr.UnlockAllX();
-			return;
-		}
-
-		/* // TODO - figure out why Beyond Good and Evil hates this
-		#if defined(_WIN32) && defined(_M_X64)
-		if (accessSize == 32 && !update)
-		{
-		// Fast and daring - requires 64-bit
-		MOV(32, R(EAX), gpr.R(s));
-		gpr.BindToRegister(a, true, false);
-		BSWAP(32, EAX);
-		MOV(accessSize, MComplex(RBX, gpr.RX(a), SCALE_1, (u32)offset), R(EAX));
-		return;
-		}
-		#endif*/
-
-		//Still here? Do regular path.
-
-		gpr.FlushLockX(ECX, EDX);
-		gpr.Lock(s, a);
-		MOV(32, R(EDX), gpr.R(a));
-		MOV(32, R(ECX), gpr.R(s));
-		SafeWriteRegToReg(ECX, EDX, accessSize, offset);
-
-		if (update && offset)
-		{
-			gpr.KillImmediate(a, true, true);
-			MEMCHECK_START
-			
-			ADD(32, gpr.R(a), Imm32((u32)offset));
-
-			MEMCHECK_END
-		}
-
-		gpr.UnlockAll();
-		gpr.UnlockAllX();
-	}
-	else
-	{
-		PanicAlert("Invalid stX");
-	}
-}
-
-void Jit64::stXx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	int a = inst.RA, b = inst.RB, s = inst.RS;
-	if (!a || a == s || a == b)
-	{
-		Default(inst);
-		return;
-	}
-	gpr.Lock(a, b, s);
-	gpr.FlushLockX(ECX, EDX);
-
-	if (inst.SUBOP10 & 32)
-	{
-		MEMCHECK_START
-		gpr.BindToRegister(a, true, true);
-		ADD(32, gpr.R(a), gpr.R(b));
-		MOV(32, R(EDX), gpr.R(a));
-		MEMCHECK_END
-	} else {
-		MOV(32, R(EDX), gpr.R(a));
-		ADD(32, R(EDX), gpr.R(b));
-	}
-	int accessSize;
-	switch (inst.SUBOP10 & ~32) {
-		case 151: accessSize = 32; break;
-		case 407: accessSize = 16; break;
-		case 215: accessSize = 8; break;
-		default: PanicAlert("stXx: invalid access size"); 
-			accessSize = 0; break;
-	}
-
-	MOV(32, R(ECX), gpr.R(s));
-	SafeWriteRegToReg(ECX, EDX, accessSize, 0);
-
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-}
-
-// A few games use these heavily in video codecs.
-void Jit64::lmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-#ifdef _M_X64
-	gpr.FlushLockX(ECX);
-	MOV(32, R(EAX), Imm32((u32)(s32)inst.SIMM_16));
-	if (inst.RA)
-		ADD(32, R(EAX), gpr.R(inst.RA));
-	for (int i = inst.RD; i < 32; i++)
-	{
-		MOV(32, R(ECX), MComplex(EBX, EAX, SCALE_1, (i - inst.RD) * 4));
-		BSWAP(32, ECX);
-		gpr.BindToRegister(i, false, true);
-		MOV(32, gpr.R(i), R(ECX));
-	}
-	gpr.UnlockAllX();
-#else
-	Default(inst); return;
-#endif
-}
-
-void Jit64::stmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-#ifdef _M_X64
-	gpr.FlushLockX(ECX);
-	MOV(32, R(EAX), Imm32((u32)(s32)inst.SIMM_16));
-	if (inst.RA)
-		ADD(32, R(EAX), gpr.R(inst.RA));
-	for (int i = inst.RD; i < 32; i++)
-	{
-		MOV(32, R(ECX), gpr.R(i));
-		BSWAP(32, ECX);
-		MOV(32, MComplex(EBX, EAX, SCALE_1, (i - inst.RD) * 4), R(ECX));
-	}
-	gpr.UnlockAllX();
-#else
-	Default(inst); return;
-#endif
-}
-
-void Jit64::icbi(UGeckoInstruction inst)
-{
-	Default(inst);
-	WriteExit(js.compilerPC + 4, 0);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
deleted file mode 100644
index 7083d24276..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticeable speed boost to paired single heavy code.
-
-#include "Common.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h" // include "Common.h", "CoreParameter.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "Jit.h"
-#include "JitAsm.h"
-#include "JitRegCache.h"
-
-// pshufb todo: MOVQ
-const u8 GC_ALIGNED16(bswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-const u8 GC_ALIGNED16(bswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15};
-const u8 GC_ALIGNED16(bswapShuffle1x8[16]) = {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15};
-const u8 GC_ALIGNED16(bswapShuffle1x8Dupe[16]) = {7, 6, 5, 4, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0};
-const u8 GC_ALIGNED16(bswapShuffle2x8[16]) = {7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8};
-
-namespace {
-
-u64 GC_ALIGNED16(temp64);
-u32 GC_ALIGNED16(temp32);
-}
-// TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common,
-// and pshufb could help a lot.
-// Also add hacks for things like lfs/stfs the same reg consecutively, that is, simple memory moves.
-
-void Jit64::lfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	int d = inst.RD;
-	int a = inst.RA;
-	if (!a) 
-	{
-		Default(inst);
-		return;
-	}
-	s32 offset = (s32)(s16)inst.SIMM_16;
-#if defined(_WIN32) && defined(_M_X64)
-	UnsafeLoadToEAX(gpr.R(a), 32, offset, false);
-#else
-	SafeLoadToEAX(gpr.R(a), 32, offset, false);
-#endif
-
-	MEMCHECK_START
-	
-	MOV(32, M(&temp32), R(EAX));
-	fpr.Lock(d);
-	fpr.BindToRegister(d, false);
-	CVTSS2SD(fpr.RX(d), M(&temp32));
-	MOVDDUP(fpr.RX(d), fpr.R(d));
-
-	MEMCHECK_END
-
-	fpr.UnlockAll();
-}
-
-
-void Jit64::lfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	if (js.memcheck) { Default(inst); return; }
-
-	int d = inst.RD;
-	int a = inst.RA;
-	if (!a) 
-	{
-		Default(inst);
-		return;
-	}
-	s32 offset = (s32)(s16)inst.SIMM_16;
-	gpr.FlushLockX(ABI_PARAM1);
-	gpr.Lock(a);
-	MOV(32, R(ABI_PARAM1), gpr.R(a));
-	// TODO - optimize. This has to load the previous value - upper double should stay unmodified.
-	fpr.Lock(d);
-	fpr.BindToRegister(d, true);
-	X64Reg xd = fpr.RX(d);
-	if (cpu_info.bSSSE3) {
-#ifdef _M_X64
-		MOVQ_xmm(XMM0, MComplex(RBX, ABI_PARAM1, SCALE_1, offset));
-#else
-		AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK));
-		MOVQ_xmm(XMM0, MDisp(ABI_PARAM1, (u32)Memory::base + offset));
-#endif
-		PSHUFB(XMM0, M((void *)bswapShuffle1x8Dupe));
-		MOVSD(xd, R(XMM0));
-	} else {
-#ifdef _M_X64
-		MOV(64, R(EAX), MComplex(RBX, ABI_PARAM1, SCALE_1, offset));
-		BSWAP(64, EAX);
-		MOV(64, M(&temp64), R(EAX));
-
-		MEMCHECK_START
-
-		MOVSD(XMM0, M(&temp64));
-		MOVSD(xd, R(XMM0));
-
-		MEMCHECK_END
-#else
-		AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK));
-		MOV(32, R(EAX), MDisp(ABI_PARAM1, (u32)Memory::base + offset));
-		BSWAP(32, EAX);
-		MOV(32, M((void*)((u8 *)&temp64+4)), R(EAX));
-
-		MEMCHECK_START
-		
-		MOV(32, R(EAX), MDisp(ABI_PARAM1, (u32)Memory::base + offset + 4));
-		BSWAP(32, EAX);
-		MOV(32, M(&temp64), R(EAX));
-		MOVSD(XMM0, M(&temp64));
-		MOVSD(xd, R(XMM0));
-
-		MEMCHECK_END
-#if 0
-		// Alternate implementation; possibly faster
-		AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK));
-		MOVQ_xmm(XMM0, MDisp(ABI_PARAM1, (u32)Memory::base + offset));
-		PSHUFLW(XMM0, R(XMM0), 0x1B);
-		PSRLW(XMM0, 8);
-		MOVSD(xd, R(XMM0));
-		MOVQ_xmm(XMM0, MDisp(ABI_PARAM1, (u32)Memory::base + offset));
-		PSHUFLW(XMM0, R(XMM0), 0x1B);
-		PSLLW(XMM0, 8);
-		POR(xd, R(XMM0));
-#endif
-#endif
-	}
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-	fpr.UnlockAll();
-}
-
-
-void Jit64::stfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	if (js.memcheck) { Default(inst); return; }
-
-	int s = inst.RS;
-	int a = inst.RA;
-	if (!a)
-	{
-		Default(inst);
-		return;
-	}
-
-	u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
-	if (Core::g_CoreStartupParameter.bMMU ||
-		Core::g_CoreStartupParameter.iTLBHack) {
-			mem_mask |= Memory::ADDR_MASK_MEM1;
-	}
-#ifdef ENABLE_MEM_CHECK
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		mem_mask |= Memory::EXRAM_MASK;
-	}
-#endif
-
-	gpr.FlushLockX(ABI_PARAM1);
-	gpr.Lock(a);
-	fpr.Lock(s);
-	gpr.BindToRegister(a, true, false);
-
-	s32 offset = (s32)(s16)inst.SIMM_16;
-	LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset));
-	TEST(32, R(ABI_PARAM1), Imm32(mem_mask));
-	FixupBranch safe = J_CC(CC_NZ);
-
-	// Fast routine
-	if (cpu_info.bSSSE3) {
-		MOVAPD(XMM0, fpr.R(s));
-		PSHUFB(XMM0, M((void*)bswapShuffle1x8));
-#ifdef _M_X64
-		MOVQ_xmm(MComplex(RBX, ABI_PARAM1, SCALE_1, 0), XMM0);
-#else
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVQ_xmm(MDisp(ABI_PARAM1, (u32)Memory::base), XMM0);
-#endif
-	} else {
-		MOVAPD(XMM0, fpr.R(s));
-		MOVD_xmm(R(EAX), XMM0);
-		UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4);
-
-		PSRLQ(XMM0, 32);
-		MOVD_xmm(R(EAX), XMM0);
-		UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0);
-	}
-	FixupBranch exit = J(true);
-	SetJumpTarget(safe);
-
-	// Safe but slow routine
-	MOVAPD(XMM0, fpr.R(s));
-	PSRLQ(XMM0, 32);
-	MOVD_xmm(R(EAX), XMM0);
-	SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0);
-
-	MOVAPD(XMM0, fpr.R(s));
-	MOVD_xmm(R(EAX), XMM0);
-	LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset));
-	SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4);
-
-	SetJumpTarget(exit);
-
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-	fpr.UnlockAll();
-}
-
-// In Release on 32bit build, 
-// this seemed to cause a problem with PokePark2
-// at start after talking to first pokemon,
-// you run and smash a box, then he goes on about
-// following him and then you cant do anything.
-// I have enabled interpreter for this function
-// in the mean time.
-// Parlane
-void Jit64::stfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	bool update = inst.OPCD & 1;
-	int s = inst.RS;
-	int a = inst.RA;
-	s32 offset = (s32)(s16)inst.SIMM_16;
-	if (!a || update) {
-		Default(inst);
-		return;
-	}
-
-	if (gpr.R(a).IsImm())
-	{
-		u32 addr = (u32)(gpr.R(a).offset + offset);
-		if (Memory::IsRAMAddress(addr))
-		{
-			if (cpu_info.bSSSE3) {
-				CVTSD2SS(XMM0, fpr.R(s));
-				PSHUFB(XMM0, M((void *)bswapShuffle1x4));
-				WriteFloatToConstRamAddress(XMM0, addr);
-				return;
-			}
-		}
-		else if (addr == 0xCC008000)
-		{
-			// Float directly to write gather pipe! Fun!
-			CVTSD2SS(XMM0, fpr.R(s));
-			CALL((void*)asm_routines.fifoDirectWriteFloat);
-			// TODO
-			js.fifoBytesThisBlock += 4;
-			return;
-		}
-	}
-
-	gpr.FlushLockX(ABI_PARAM1, ABI_PARAM2);
-	gpr.Lock(a);
-	fpr.Lock(s);
-	MOV(32, R(ABI_PARAM2), gpr.R(a));
-	ADD(32, R(ABI_PARAM2), Imm32(offset));
-	if (update && offset)
-	{
-		// We must flush immediate values from the following register because
-		// it may take another value at runtime if no MMU exception has been raised
-		gpr.KillImmediate(a, true, true);
-
-		MEMCHECK_START
-
-		MOV(32, gpr.R(a), R(ABI_PARAM2));
-
-		MEMCHECK_END
-	}
-	CVTSD2SS(XMM0, fpr.R(s));
-	SafeWriteFloatToReg(XMM0, ABI_PARAM2);
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-	fpr.UnlockAll();
-}
-
-
-void Jit64::stfsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	// We can take a shortcut here - it's not likely that a hardware access would use this instruction.
-	gpr.FlushLockX(ABI_PARAM1);
-	fpr.Lock(inst.RS);
-	MOV(32, R(ABI_PARAM1), gpr.R(inst.RB));
-	if (inst.RA)
-		ADD(32, R(ABI_PARAM1), gpr.R(inst.RA));
-	CVTSD2SS(XMM0, fpr.R(inst.RS));
-	MOVD_xmm(R(EAX), XMM0);
-	SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0);
-
-	gpr.UnlockAllX();
-	fpr.UnlockAll();
-}
-
-
-void Jit64::lfsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	MOV(32, R(EAX), gpr.R(inst.RB));
-	if (inst.RA)
-	{
-		ADD(32, R(EAX), gpr.R(inst.RA));
-	}
-	if (cpu_info.bSSSE3 && !js.memcheck) {
-		fpr.Lock(inst.RS);
-		fpr.BindToRegister(inst.RS, false, true);
-		X64Reg r = fpr.R(inst.RS).GetSimpleReg();
-#ifdef _M_IX86
-		AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVD_xmm(r, MDisp(EAX, (u32)Memory::base));
-#else
-		MOVD_xmm(r, MComplex(RBX, EAX, SCALE_1, 0));
-#endif
-		MEMCHECK_START
-		
-		PSHUFB(r, M((void *)bswapShuffle1x4));
-		CVTSS2SD(r, R(r));
-		MOVDDUP(r, R(r));
-
-		MEMCHECK_END
-	} else {
-		SafeLoadToEAX(R(EAX), 32, 0, false);
-
-		MEMCHECK_START
-
-		MOV(32, M(&temp32), R(EAX));
-		CVTSS2SD(XMM0, M(&temp32));
-		fpr.Lock(inst.RS);
-		fpr.BindToRegister(inst.RS, false, true);
-		MOVDDUP(fpr.R(inst.RS).GetSimpleReg(), R(XMM0));
-
-		MEMCHECK_END
-	}
-	fpr.UnlockAll();
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
deleted file mode 100644
index 00066f4746..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticeable speed boost to paired single heavy code.
-
-#include "Common.h"
- 
-#include "Thunk.h"
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "Jit.h"
-#include "JitAsm.h"
-#include "JitRegCache.h"
-
-const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15};
-
-//static u64 GC_ALIGNED16(temp64); // unused?
- 
-// TODO(ector): Improve 64-bit version
-#if 0
-static void WriteDual32(u64 value, u32 address)
-{
-	MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-	Memory::Write_U32((u32)(value >> 32), address);
-	Memory::Write_U32((u32)value, address + 4);
-}
-#endif
-
-// The big problem is likely instructions that set the quantizers in the same block.
-// We will have to break block after quantizers are written to.
-void Jit64::psq_st(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-
-	if (js.memcheck) { Default(inst); return; }
-
-	if (!inst.RA)
-	{
-		// TODO: Support these cases if it becomes necessary.
-		Default(inst);
-		return;
-	}
-
-	bool update = inst.OPCD == 61;
-
-	int offset = inst.SIMM_12;
-	int a = inst.RA;
-	int s = inst.RS; // Fp numbers
-
-	const UGQR gqr(rSPR(SPR_GQR0 + inst.I));
-#if 0
-	u16 store_gqr = gqr.Hex & 0xFFFF;
-
-	const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
-	int stScale = gqr.ST_SCALE;
-
-	// Is this specialization still worth it? Let's keep it for now. It's probably
-	// not very risky since a game most likely wouldn't use the same code to process
-	// floats as integers (but you never know....).
-	if (stType == QUANTIZE_FLOAT)
-	{
-		if (gpr.R(a).IsImm() && !update && cpu_info.bSSSE3)
-		{
-			u32 addr = (u32)(gpr.R(a).offset + offset);
-			if (addr == 0xCC008000) {
-				// Writing to FIFO. Let's do fast method.
-				CVTPD2PS(XMM0, fpr.R(s));
-				PSHUFB(XMM0, M((void*)&pbswapShuffle2x4));
-				CALL((void*)asm_routines.fifoDirectWriteXmm64);
-				js.fifoBytesThisBlock += 8;
-				return;
-			}
-		}
-	}
-#endif
-
-	gpr.FlushLockX(EAX, EDX);
-	gpr.FlushLockX(ECX);
-	if (update)
-		gpr.BindToRegister(inst.RA, true, true);
-	fpr.BindToRegister(inst.RS, true, false);
-	MOV(32, R(ECX), gpr.R(inst.RA));
-	if (offset)
-		ADD(32, R(ECX), Imm32((u32)offset));
-	if (update && offset)
-		MOV(32, gpr.R(a), R(ECX));
-	MOVZX(32, 16, EAX, M(&PowerPC::ppcState.spr[SPR_GQR0 + inst.I]));
-	MOVZX(32, 8, EDX, R(AL));
-	// FIXME: Fix ModR/M encoding to allow [EDX*4+disp32] without a base register!
-#ifdef _M_IX86
-	int addr_scale = SCALE_4;
-#else
-	int addr_scale = SCALE_8;
-#endif
-	if (inst.W) {
-		// One value
-		XORPS(XMM0, R(XMM0));  // TODO: See if we can get rid of this cheaply by tweaking the code in the singleStore* functions.
-		CVTSD2SS(XMM0, fpr.R(s));
-		ABI_AlignStack(0);
-		CALLptr(MScaled(EDX, addr_scale, (u32)(u64)asm_routines.singleStoreQuantized));
-		ABI_RestoreStack(0);
-	} else {
-		// Pair of values
-		CVTPD2PS(XMM0, fpr.R(s));
-		ABI_AlignStack(0);
-		CALLptr(MScaled(EDX, addr_scale, (u32)(u64)asm_routines.pairedStoreQuantized));
-		ABI_RestoreStack(0);
-	}
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-}
-
-void Jit64::psq_l(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-
-	if (js.memcheck) { Default(inst); return; }
-
-	if (!inst.RA)
-	{
-		Default(inst);
-		return;
-	}
-
-	const UGQR gqr(rSPR(SPR_GQR0 + inst.I));
-
-	if (inst.W) {
-		// PanicAlert("Single ps load: %i %i", gqr.ST_TYPE, gqr.ST_SCALE);
-		Default(inst);
-		return;
-	}
-
-	bool update = inst.OPCD == 57;
-	int offset = inst.SIMM_12;
-
-	gpr.FlushLockX(EAX, EDX);
-	gpr.FlushLockX(ECX);
-	gpr.BindToRegister(inst.RA, true, update && offset);
-	fpr.BindToRegister(inst.RS, false, true);
-	if (offset)
-		LEA(32, ECX, MDisp(gpr.RX(inst.RA), offset));
-	else
-		MOV(32, R(ECX), gpr.R(inst.RA));
-	if (update && offset)
-		MOV(32, gpr.R(inst.RA), R(ECX));
-	MOVZX(32, 16, EAX, M(((char *)&GQR(inst.I)) + 2));
-	MOVZX(32, 8, EDX, R(AL));
-#ifdef _M_IX86
-	int addr_scale = SCALE_4;
-#else
-	int addr_scale = SCALE_8;
-#endif
-	ABI_AlignStack(0);
-	CALLptr(MScaled(EDX, addr_scale, (u32)(u64)asm_routines.pairedLoadQuantized));
-	ABI_RestoreStack(0);
-
-//	MEMCHECK_START // FIXME: MMU does not work here because of unsafe memory access
-
-	CVTPS2PD(fpr.RX(inst.RS), R(XMM0));
-
-//	MEMCHECK_END
-
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
deleted file mode 100644
index b58a140497..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "../../HW/GPFifo.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-
-// TODO
-// ps_madds0
-// ps_muls0
-// ps_madds1
-// ps_sel
-//   cmppd, andpd, andnpd, or
-//   lfsx, ps_merge01 etc
-
-const u64 GC_ALIGNED16(psSignBits[2]) = {0x8000000000000000ULL, 0x8000000000000000ULL};
-const u64 GC_ALIGNED16(psAbsMask[2])  = {0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL};
-const double GC_ALIGNED16(psOneOne[2])  = {1.0, 1.0};
-const double GC_ALIGNED16(psZeroZero[2]) = {0.0, 0.0};
-
-void Jit64::ps_mr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int b = inst.FB;
-	if (d == b)
-		return;
-	fpr.BindToRegister(d, false);
-	MOVAPD(fpr.RX(d), fpr.R(b));
-}
-
-void Jit64::ps_sel(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	Default(inst); return;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	// GRR can't get this to work 100%. Getting artifacts in D.O.N. intro.
-	int d = inst.FD;
-	int a = inst.FA;
-	int b = inst.FB;
-	int c = inst.FC;
-	fpr.FlushLockX(XMM7);
-	fpr.FlushLockX(XMM6);
-	fpr.Lock(a, b, c, d);
-	fpr.BindToRegister(a, true, false);
-	fpr.BindToRegister(d, false, true);
-	// BLENDPD would have been nice...
-	MOVAPD(XMM7, fpr.R(a));
-	CMPPD(XMM7, M((void*)psZeroZero), 1); //less-than = 111111
-	MOVAPD(XMM6, R(XMM7));
-	ANDPD(XMM7, fpr.R(d));
-	ANDNPD(XMM6, fpr.R(c));
-	MOVAPD(fpr.RX(d), R(XMM7));
-	ORPD(fpr.RX(d), R(XMM6));
-	fpr.UnlockAll();
-	fpr.UnlockAllX();
-}
-
-void Jit64::ps_sign(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int b = inst.FB;
-
-	fpr.Lock(d, b);
-	if (d != b)
-	{
-		fpr.BindToRegister(d, false);
-		MOVAPD(fpr.RX(d), fpr.R(b));
-	}
-	else
-	{
-		fpr.BindToRegister(d, true);
-	}
-
-	switch (inst.SUBOP10)
-	{
-	case 40: //neg 
-		XORPD(fpr.RX(d), M((void*)&psSignBits));
-		break;
-	case 136: //nabs
-		ORPD(fpr.RX(d), M((void*)&psSignBits));
-		break;
-	case 264: //abs
-		ANDPD(fpr.RX(d), M((void*)&psAbsMask));
-		break;
-	}
-
-	fpr.UnlockAll();
-}
-
-void Jit64::ps_rsqrte(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int b = inst.FB;
-	fpr.Lock(d, b);
-	fpr.BindToRegister(d, (d == b), true);
-	SQRTPD(XMM0, fpr.R(b));
-	MOVAPD(XMM1, M((void*)&psOneOne));
-	DIVPD(XMM1, R(XMM0));
-	MOVAPD(fpr.R(d), XMM1);
-	fpr.UnlockAll();
-}
-
-//add a, b, c
-
-//mov a, b
-//add a, c
-//we need:
-/*
-psq_l
-psq_stu
-*/
-
-/*
-add a,b,a
-*/
-
-//There's still a little bit more optimization that can be squeezed out of this
-void Jit64::tri_op(int d, int a, int b, bool reversible, void (XEmitter::*op)(X64Reg, OpArg))
-{
-	fpr.Lock(d, a, b);
-
-	if (d == a)
-	{
-		fpr.BindToRegister(d, true);
-		(this->*op)(fpr.RX(d), fpr.R(b));
-	}
-	else if (d == b && reversible)
-	{
-		fpr.BindToRegister(d, true);
-		(this->*op)(fpr.RX(d), fpr.R(a));
-	}
-	else if (a != d && b != d) 
-	{
-		//sources different from d, can use rather quick solution
-		fpr.BindToRegister(d, false);
-		MOVAPD(fpr.RX(d), fpr.R(a));
-		(this->*op)(fpr.RX(d), fpr.R(b));
-	}
-	else if (b != d)
-	{
-		fpr.BindToRegister(d, false);
-		MOVAPD(XMM0, fpr.R(b));
-		MOVAPD(fpr.RX(d), fpr.R(a));
-		(this->*op)(fpr.RX(d), Gen::R(XMM0));
-	}
-	else //Other combo, must use two temps :(
-	{
-		MOVAPD(XMM0, fpr.R(a));
-		MOVAPD(XMM1, fpr.R(b));
-		fpr.BindToRegister(d, false);
-		(this->*op)(XMM0, Gen::R(XMM1));
-		MOVAPD(fpr.RX(d), Gen::R(XMM0));
-	}
-	ForceSinglePrecisionP(fpr.RX(d));
-	fpr.UnlockAll();
-}
-
-void Jit64::ps_arith(UGeckoInstruction inst)
-{		
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	switch (inst.SUBOP5)
-	{
-	case 18: tri_op(inst.FD, inst.FA, inst.FB, false, &XEmitter::DIVPD); break; //div
-	case 20: tri_op(inst.FD, inst.FA, inst.FB, false, &XEmitter::SUBPD); break; //sub 
-	case 21: tri_op(inst.FD, inst.FA, inst.FB, true,  &XEmitter::ADDPD); break; //add
-	case 23: Default(inst); break; //sel
-	case 24: Default(inst); break; //res
-	case 25: tri_op(inst.FD, inst.FA, inst.FC, true, &XEmitter::MULPD); break; //mul
-	default:
-		_assert_msg_(DYNA_REC, 0, "ps_arith WTF!!!");
-	}
-}
-
-void Jit64::ps_sum(UGeckoInstruction inst)
-{	
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	// TODO: (inst.SUBOP5 == 10) breaks Sonic Colours (black screen) 
-	if (inst.Rc || (inst.SUBOP5 == 10)) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int a = inst.FA;
-	int b = inst.FB;
-	int c = inst.FC;
-	fpr.Lock(a,b,c,d);
-	fpr.BindToRegister(d, d == a || d == b || d == c, true);
-	switch (inst.SUBOP5)
-	{
-	case 10:
-		// Do the sum in upper subregisters, merge uppers
-		MOVDDUP(XMM0, fpr.R(a));
-		MOVAPD(XMM1, fpr.R(b));
-		ADDPD(XMM0, R(XMM1));
-		UNPCKHPD(XMM0, fpr.R(c)); //merge
-		MOVAPD(fpr.R(d), XMM0);
-		break;
-	case 11:
-		// Do the sum in lower subregisters, merge lowers
-		MOVAPD(XMM0, fpr.R(a));
-		MOVAPD(XMM1, fpr.R(b));
-		SHUFPD(XMM1, R(XMM1), 5); // copy higher to lower
-		ADDPD(XMM0, R(XMM1)); // sum lowers
-		MOVAPD(XMM1, fpr.R(c));  
-		UNPCKLPD(XMM1, R(XMM0)); // merge
-		MOVAPD(fpr.R(d), XMM1);
-		break;
-	default:
-		PanicAlert("ps_sum WTF!!!");
-	}
-	ForceSinglePrecisionP(fpr.RX(d));
-	fpr.UnlockAll();
-}
-
-
-void Jit64::ps_muls(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int a = inst.FA;
-	int c = inst.FC;
-	fpr.Lock(a, c, d);
-	fpr.BindToRegister(d, d == a || d == c, true);
-	switch (inst.SUBOP5)
-	{
-	case 12:
-		// Single multiply scalar high
-		// TODO - faster version for when regs are different
-		MOVAPD(XMM0, fpr.R(a));
-		MOVDDUP(XMM1, fpr.R(c));
-		MULPD(XMM0, R(XMM1));
-		MOVAPD(fpr.R(d), XMM0);
-		break;
-	case 13:
-		// TODO - faster version for when regs are different
-		MOVAPD(XMM0, fpr.R(a));
-		MOVAPD(XMM1, fpr.R(c));
-		SHUFPD(XMM1, R(XMM1), 3); // copy higher to lower
-		MULPD(XMM0, R(XMM1));
-		MOVAPD(fpr.R(d), XMM0);
-		break;
-	default:
-		PanicAlert("ps_muls WTF!!!");
-	}
-	ForceSinglePrecisionP(fpr.RX(d));
-	fpr.UnlockAll();
-}
-
-
-//TODO: find easy cases and optimize them, do a breakout like ps_arith
-void Jit64::ps_mergeXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int d = inst.FD;
-	int a = inst.FA;
-	int b = inst.FB;
-	fpr.Lock(a,b,d);
-
-	MOVAPD(XMM0, fpr.R(a));
-	switch (inst.SUBOP10)
-	{
-	case 528: 
-		UNPCKLPD(XMM0, fpr.R(b)); //unpck is faster than shuf
-		break; //00
-	case 560:
-		SHUFPD(XMM0, fpr.R(b), 2); //must use shuf here
-		break; //01
-	case 592:
-		SHUFPD(XMM0, fpr.R(b), 1);
-		break; //10
-	case 624:
-		UNPCKHPD(XMM0, fpr.R(b));
-		break; //11
-	default:
-		_assert_msg_(DYNA_REC, 0, "ps_merge - invalid op");
-	}
-	fpr.BindToRegister(d, false);
-	MOVAPD(fpr.RX(d), Gen::R(XMM0));
-	fpr.UnlockAll();
-}
-
-
-//TODO: add optimized cases
-void Jit64::ps_maddXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	int a = inst.FA;
-	int b = inst.FB;
-	int c = inst.FC;
-	int d = inst.FD;
-	fpr.Lock(a,b,c,d);
-
-	MOVAPD(XMM0, fpr.R(a));
-	switch (inst.SUBOP5)
-	{
-	case 14: //madds0
-		MOVDDUP(XMM1, fpr.R(c));
-		MULPD(XMM0, R(XMM1));
-		ADDPD(XMM0, fpr.R(b));
-		break;
-	case 15: //madds1
-		MOVAPD(XMM1, fpr.R(c));
-		SHUFPD(XMM1, R(XMM1), 3); // copy higher to lower
-		MULPD(XMM0, R(XMM1));
-		ADDPD(XMM0, fpr.R(b));
-		break;
-	case 28: //msub
-		MULPD(XMM0, fpr.R(c));
-		SUBPD(XMM0, fpr.R(b));
-		break;
-	case 29: //madd
-		MULPD(XMM0, fpr.R(c));
-		ADDPD(XMM0, fpr.R(b));
-		break;
-	case 30: //nmsub
-		MULPD(XMM0, fpr.R(c));
-		SUBPD(XMM0, fpr.R(b));
-		XORPD(XMM0, M((void*)&psSignBits));
-		break;
-	case 31: //nmadd
-		MULPD(XMM0, fpr.R(c));
-		ADDPD(XMM0, fpr.R(b));
-		XORPD(XMM0, M((void*)&psSignBits));
-		break;
-	default:
-		_assert_msg_(DYNA_REC, 0, "ps_maddXX WTF!!!");
-		//Default(inst);
-		//fpr.UnlockAll();
-		return;
-	}
-	fpr.BindToRegister(d, false);
-	MOVAPD(fpr.RX(d), Gen::R(XMM0));
-	ForceSinglePrecisionP(fpr.RX(d));
-	fpr.UnlockAll();
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
deleted file mode 100644
index 9829f06d93..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../../CoreTiming.h"
-#include "../../HW/SystemTimers.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "HW/ProcessorInterface.h"
-
-void Jit64::mtspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-	int d = inst.RD;
-
-	switch (iIndex)
-	{
-	case SPR_LR:
-	case SPR_CTR:
-	case SPR_XER:
-		// These are safe to do the easy way, see the bottom of this function.
-		break;
-
-	case SPR_GQR0:
-	case SPR_GQR0 + 1:
-	case SPR_GQR0 + 2:
-	case SPR_GQR0 + 3:
-	case SPR_GQR0 + 4:
-	case SPR_GQR0 + 5:
-	case SPR_GQR0 + 6:
-	case SPR_GQR0 + 7:
-		// Prevent recompiler from compiling in old quantizer values.
-		// If the value changed, destroy all blocks using this quantizer
-		// This will create a little bit of block churn, but hopefully not too bad.
-		{
-			/*
-			MOV(32, R(EAX), M(&PowerPC::ppcState.spr[iIndex]));  // Load old value
-			CMP(32, R(EAX), gpr.R(inst.RD));
-			FixupBranch skip_destroy = J_CC(CC_E, false);
-			int gqr = iIndex - SPR_GQR0;
-			ABI_CallFunctionC(ProtectFunction(&Jit64::DestroyBlocksWithFlag, 1), (u32)BLOCK_USE_GQR0 << gqr);
-			SetJumpTarget(skip_destroy);*/
-		}
-		break;
-		// TODO - break block if quantizers are written to.
-	default:
-		Default(inst);
-		return;
-	}
-
-	// OK, this is easy.
-	if (!gpr.R(d).IsImm())
-	{
-		gpr.Lock(d);
-		gpr.BindToRegister(d, true, false);
-	}
-	MOV(32, M(&PowerPC::ppcState.spr[iIndex]), gpr.R(d));
-	gpr.UnlockAll();
-}
-
-void Jit64::mfspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-	int d = inst.RD;
-	switch (iIndex)
-	{
-	case SPR_WPAR:
-	case SPR_DEC:
-	case SPR_TL:
-	case SPR_TU:
-	case SPR_PMC1:
-	case SPR_PMC2:
-	case SPR_PMC3:
-	case SPR_PMC4:
-		Default(inst);
-		return;
-	default:
-		gpr.Lock(d);
-		gpr.BindToRegister(d, false);
-		MOV(32, gpr.R(d), M(&PowerPC::ppcState.spr[iIndex]));
-		gpr.UnlockAll();
-		break;
-	}
-}
-
-void Jit64::mtmsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
- 	// Don't interpret this, if we do we get thrown out
-	//JITDISABLE(bJITSystemRegistersOff)
-	if (!gpr.R(inst.RS).IsImm())
-	{
-		gpr.Lock(inst.RS);
-		gpr.BindToRegister(inst.RS, true, false);
-	}
-	MOV(32, M(&MSR), gpr.R(inst.RS));
-	gpr.UnlockAll();
-	gpr.Flush(FLUSH_ALL);
-	fpr.Flush(FLUSH_ALL);
-
-	// If some exceptions are pending and EE are now enabled, force checking
-	// external exceptions when going out of mtmsr in order to execute delayed
-	// interrupts as soon as possible.
-	TEST(32, M(&MSR), Imm32(0x8000));
-	FixupBranch eeDisabled = J_CC(CC_Z);
-
-	TEST(32, M((void*)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT | EXCEPTION_PERFORMANCE_MONITOR | EXCEPTION_DECREMENTER));
-	FixupBranch noExceptionsPending = J_CC(CC_Z);
-
-	// Check if a CP interrupt is waiting and keep the GPU emulation in sync (issue 4336)
-	TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP));
-	FixupBranch cpInt = J_CC(CC_NZ);
-
-	MOV(32, M(&PC), Imm32(js.compilerPC + 4));
-	WriteExternalExceptionExit();
-
-	SetJumpTarget(cpInt);
-	SetJumpTarget(noExceptionsPending);
-	SetJumpTarget(eeDisabled);
-
-	WriteExit(js.compilerPC + 4, 0);
-
-	js.firstFPInstructionFound = false;
-}
-
-void Jit64::mfmsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	//Privileged?
-	gpr.Lock(inst.RD);
-	gpr.BindToRegister(inst.RD, false, true);
-	MOV(32, gpr.R(inst.RD), M(&MSR));
-	gpr.UnlockAll();
-}
-
-void Jit64::mftb(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	mfspr(inst);
-}
-
-void Jit64::mfcr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	// USES_CR
-	int d = inst.RD;
-	gpr.Lock(d);
-	gpr.KillImmediate(d, false, true);
-	MOV(8, R(EAX), M(&PowerPC::ppcState.cr_fast[0]));
-
-	for (int i = 1; i < 8; i++)
-	{
-		SHL(32, R(EAX), Imm8(4));
-		OR(8, R(EAX), M(&PowerPC::ppcState.cr_fast[i]));
-	}
-
-	MOV(32, gpr.R(d), R(EAX));
-	gpr.UnlockAll();
-}
-
-void Jit64::mtcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	// USES_CR
-	u32 crm = inst.CRM;
-	if (crm != 0)
-	{
-		if (gpr.R(inst.RS).IsImm())
-		{
-			for (int i = 0; i < 8; i++)
-			{
-				if ((crm & (0x80 >> i)) != 0)
-				{
-					u8 newcr = (gpr.R(inst.RS).offset >> (28 - (i * 4))) & 0xF;
-					MOV(8, M(&PowerPC::ppcState.cr_fast[i]), Imm8(newcr));
-				}
-			}
-		}
-		else
-		{
-			gpr.Lock(inst.RS);
-			gpr.BindToRegister(inst.RS, true, false);
-			for (int i = 0; i < 8; i++)
-			{
-				if ((crm & (0x80 >> i)) != 0)
-				{
-					MOV(32, R(EAX), gpr.R(inst.RS));
-					SHR(32, R(EAX), Imm8(28 - (i * 4)));
-					AND(32, R(EAX), Imm32(0xF));
-					MOV(8, M(&PowerPC::ppcState.cr_fast[i]), R(EAX));
-				}
-			}
-			gpr.UnlockAll();
-		}
-	}
-}
-
-void Jit64::mcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	// USES_CR
-	if (inst.CRFS != inst.CRFD)
-	{
-		MOV(8, R(EAX), M(&PowerPC::ppcState.cr_fast[inst.CRFS]));
-		MOV(8, M(&PowerPC::ppcState.cr_fast[inst.CRFD]), R(EAX));
-	}
-}
-
-void Jit64::mcrxr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	// USES_CR
-
-	// Copy XER[0-3] into CR[inst.CRFD]
-	MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER]));
-	SHR(32, R(EAX), Imm8(28));
-	MOV(8, M(&PowerPC::ppcState.cr_fast[inst.CRFD]), R(EAX));
-
-	// Clear XER[0-3]
-	AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(0x0FFFFFFF));
-}
-
-void Jit64::crXXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	_dbg_assert_msg_(DYNA_REC, inst.OPCD == 19, "Invalid crXXX");
-
-	// USES_CR 
-
-	// Get bit CRBA in EAX aligned with bit CRBD
-	int shiftA = (inst.CRBD & 3) - (inst.CRBA & 3);
-	MOV(8, R(EAX), M(&PowerPC::ppcState.cr_fast[inst.CRBA >> 2]));
-	if (shiftA < 0)
-		SHL(8, R(EAX), Imm8(-shiftA));
-	else if (shiftA > 0)
-		SHR(8, R(EAX), Imm8(shiftA));
-
-	// Get bit CRBB in ECX aligned with bit CRBD
-	gpr.FlushLockX(ECX);
-	int shiftB = (inst.CRBD & 3) - (inst.CRBB & 3);
-	MOV(8, R(ECX), M(&PowerPC::ppcState.cr_fast[inst.CRBB >> 2]));
-	if (shiftB < 0)
-		SHL(8, R(ECX), Imm8(-shiftB));
-	else if (shiftB > 0)
-		SHR(8, R(ECX), Imm8(shiftB));
-
-	// Compute combined bit
-	switch(inst.SUBOP10)
-	{
-	case 33:	// crnor
-		OR(8, R(EAX), R(ECX));
-		NOT(8, R(EAX));
-		break;
-
-	case 129:	// crandc
-		NOT(8, R(ECX));
-		AND(8, R(EAX), R(ECX));
-		break;
-
-	case 193:	// crxor
-		XOR(8, R(EAX), R(ECX));
-		break;
-
-	case 225:	// crnand
-		AND(8, R(EAX), R(ECX));
-		NOT(8, R(EAX));
-		break;
-
-	case 257:	// crand
-		AND(8, R(EAX), R(ECX));
-		break;
-
-	case 289:	// creqv
-		XOR(8, R(EAX), R(ECX));
-		NOT(8, R(EAX));
-		break;
-
-	case 417:	// crorc
-		NOT(8, R(ECX));
-		OR(8, R(EAX), R(ECX));
-		break;
-
-	case 449:	// cror
-		OR(8, R(EAX), R(ECX));
-		break;
-	}
-
-	// Store result bit in CRBD
-	AND(8, R(EAX), Imm8(0x8 >> (inst.CRBD & 3)));
-	AND(8, M(&PowerPC::ppcState.cr_fast[inst.CRBD >> 2]), Imm8(~(0x8 >> (inst.CRBD & 3))));
-	OR(8, M(&PowerPC::ppcState.cr_fast[inst.CRBD >> 2]), R(EAX));
-
-	gpr.UnlockAllX();
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
deleted file mode 100644
index 82beace052..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
+++ /dev/null
@@ -1,1348 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-/*
-
-IR implementation comments:
-This file implements code generation for a new IR-based JIT. The idea of
-the IR is that as much as possible, it strips away the complexities
-of the PPC instruction set into a simpler instruction set.  In its current
-form, the semantics are very simple: each instruction does its calculation
-and performs its side effects in order.  For an instruction with a result,
-the instruction also represents the returned value.  This works quite
-simply because jumps within a block are not allowed.
-
-The IR treats loads and stores to PPC registers as separate steps from actual
-calculations.  This allows the instruction set to be significantly simpler,
-because one PPC instruction can be mapped to multiple IR instructions.  It
-also allows optimizing out dead register stores: this reduces register
-pressure and allows dead code elimination to completely remove instructions
-which produce unused values, or the carry flag of srawx.
-
-The actual IR representation uses a few tricks I picked up from nanojit:
-each instruction is a single 32-bit integer, the operands are 8-bit offsets
-back from the current instruction, and there's a special Tramp instruction
-to reference operands that are too far away to reference otherwise.
-
-The first step of code generation is producing the IR; this is roughly
-equivalent to all of code generation in the previous code. In addition
-to storing the IR, some optimizations occur in this step: the primary
-optimizations are that redundant register loads/stores are eliminated,
-and constant-folding is done.
-
-The second step is a quick pass over the IL to figure out liveness: this
-information is used both for dead code elimination and to find the last
-use of an instruction, which is allowed to destroy the value.
-
-The third step is the actual code generation: this just goes through each
-instruction and generates code.  Dead code elimination works in this step,
-by simply skipping unused instructions.  The register allocator is a dumb,
-greedy allocator: at the moment, it's really a bit too dumb, but it's
-actually not as bad as it looks: unless a block is relatively long, spills
-are rarely needed.  ECX is used as a scratch register: requiring a scratch
-register isn't ideal, but the register allocator is too dumb to handle
-instructions that need a specific register at the moment.
-
-In addition to the optimizations that are deeply tied to the IR,
-I've implemented one additional trick: fast memory for 32-bit machines.
-This works off of the observation that loads and stores can be classified
-at runtime: any particular load instruction will always load similar addresses,
-and any store will store to similar addresses.  Using this observation, every
-block is JIT-ed twice: the first time, the block includes extra code to 
-instrument the loads.  Then, at the end of the block, it jumps back into the JIT
-to recompile itself.  The second recompilation looks at the address of each load
-and store, and bakes the information into the generated code.  This allows removing
-the overhead for both the mask and the branch normally required for loads on 32-bit
-machines.  This optimization isn't completely safe: it depends on a guarantee which
-isn't made by the PPC instruction set.  That said, it's reliable enough that games
-work without any fallback, and it's a large performance boost.  Also, if it turns
-out it isn't completely reliable, we can use a solution using segments which is
-similar to the 64-bit fast memory implementation.
-
-The speed with this JIT is better than I expected, but not at much as I hoped...
-on the test I've been working on (which bounded by JIT performance and doesn't
-use any floating-point), it's roughly 25% faster than the current JIT, with the
-edge over the current JIT mostly due to the fast memory optimization.
-
-Update on perf:
-I've been doing a bit more tweaking for a small perf improvement (in the 
-range of 5-10%).  That said, it's getting to the point where I'm simply
-not seeing potential for improvements to codegen, at least for long,
-straightforward blocks.  For one long block that's at the top of my samples,
-I've managed to get the bloat% (number of instructions compared to PPC
-equivalent) down to 225%, and I can't really see it going down much further.
-It looks like the most promising paths to further improvement for pure
-integer code are more aggresively combining blocks and dead condition
-register elimination, which should be very helpful for small blocks.
-
-TODO (in no particular order):
-JIT for misc remaining FP instructions
-JIT for bcctrx
-Misc optimizations for FP instructions
-Inter-block dead register elimination; this seems likely to have large
-	performance benefits, although I'm not completely sure.
-Inter-block inlining; also likely to have large performance benefits.
-	The tricky parts are deciding which blocks to inline, and that the
-	IR can't really deal with branches whose destination is in the
-	the middle of a generated block.
-Specialized slw/srw/sraw; I think there are some tricks that could
-	have a non-trivial effect, and there are significantly shorter
-	implementations for 64-bit involving abusing 64-bit shifts.
-64-bit compat (it should only be a few tweaks to register allocation and
-	the load/store code)
-Scheduling to reduce register pressure: PowerPC	compilers like to push
-	uses far away from definitions, but it's rather unfriendly to modern
-	x86 processors, which are short on registers and extremely good at
-	instruction reordering.
-Common subexpression elimination
-Optimize load/store of sum using complex addressing (partially implemented)
-Loop optimizations (loop-carried registers, LICM)
-Code refactoring/cleanup
-Investigate performance of the JIT itself; this doesn't affect
-	framerates significantly, but it does take a visible amount
-	of time for a complicated piece of code like a video decoder
-	to compile.
-Fix profiled loads/stores to work safely.  On 32-bit, one solution is to
-	use a spare segment register, and expand the backpatch solution
-	to work in all the relevant situations.  On 64-bit, the existing
-	fast memory solution should basically work.  An alternative
-	would be to figure out a heuristic for what loads actually
-	vary their "type", and special-case them.
-
-*/
-
-#ifdef _MSC_VER
-#pragma warning(disable:4146)   // unary minus operator applied to unsigned type, result still unsigned
-#endif
-
-#include <algorithm>
-#include <memory>
-#include <ctime>
-#include <set>
-#include "IR.h"
-#include "../PPCTables.h"
-#include "../../CoreTiming.h"
-#include "Thunk.h"
-#include "../../HW/Memmap.h"
-#include "JitILAsm.h"
-#include "JitIL.h"
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-using namespace Gen;
-
-namespace IREmitter {
-
-InstLoc IRBuilder::EmitZeroOp(unsigned Opcode, unsigned extra = 0) {
-	InstLoc curIndex = &InstList[InstList.size()];
-	InstList.push_back(Opcode | (extra << 8));
-	MarkUsed.push_back(false);
-	return curIndex;
-}
-
-InstLoc IRBuilder::EmitUOp(unsigned Opcode, InstLoc Op1, unsigned extra) {
-	InstLoc curIndex = &InstList[InstList.size()];
-	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
-	if (backOp1 >= 256) {
-		InstList.push_back(Tramp | backOp1 << 8);
-		MarkUsed.push_back(false);
-		backOp1 = 0;
-		curIndex++;
-	}
-	InstList.push_back(Opcode | (backOp1 << 8) | (extra << 16));
-	MarkUsed.push_back(false);
-	return curIndex;
-}
-
-InstLoc IRBuilder::EmitBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, unsigned extra) {
-	InstLoc curIndex = &InstList[InstList.size()];
-	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
-	if (backOp1 >= 255) {
-		InstList.push_back(Tramp | backOp1 << 8);
-		MarkUsed.push_back(false);
-		backOp1 = 0;
-		curIndex++;
-	}
-	unsigned backOp2 = (s32)(curIndex - 1 - Op2);
-	if (backOp2 >= 256) {
-		InstList.push_back(Tramp | backOp2 << 8);
-		MarkUsed.push_back(false);
-		backOp2 = 0;
-		backOp1++;
-		curIndex++;
-	}
-	InstList.push_back(Opcode | (backOp1 << 8) | (backOp2 << 16) | (extra << 24));
-	MarkUsed.push_back(false);
-	return curIndex;
-}
-
-#if 0
-InstLoc IRBuilder::EmitTriOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, InstLoc Op3) {
-	InstLoc curIndex = &InstList[InstList.size()];
-	unsigned backOp1 = curIndex - 1 - Op1;
-	if (backOp1 >= 254) {
-		InstList.push_back(Tramp | backOp1 << 8);
-		MarkUsed.push_back(false);
-		backOp1 = 0;
-		curIndex++;
-	}
-	unsigned backOp2 = curIndex - 1 - Op2;
-	if (backOp2 >= 255) {
-		InstList.push_back((Tramp | backOp2 << 8));
-		MarkUsed.push_back(false);
-		backOp2 = 0;
-		backOp1++;
-		curIndex++;
-	}
-	unsigned backOp3 = curIndex - 1 - Op3;
-	if (backOp3 >= 256) {
-		InstList.push_back(Tramp | (backOp3 << 8));
-		MarkUsed.push_back(false);
-		backOp3 = 0;
-		backOp2++;
-		backOp1++;
-		curIndex++;
-	}
-	InstList.push_back(Opcode | (backOp1 << 8) | (backOp2 << 16) | (backOp3 << 24));
-	MarkUsed.push_back(false);
-	return curIndex;
-}
-#endif
-
-unsigned IRBuilder::ComputeKnownZeroBits(InstLoc I) const {
-	switch (getOpcode(*I)) {
-	case Load8:
-		return 0xFFFFFF00;
-	case Or:
-		return ComputeKnownZeroBits(getOp1(I)) &
-		       ComputeKnownZeroBits(getOp2(I));
-	case And:
-		return ComputeKnownZeroBits(getOp1(I)) |
-		       ComputeKnownZeroBits(getOp2(I));
-	case Shl:
-		if (isImm(*getOp2(I))) {
-			unsigned samt = GetImmValue(getOp2(I)) & 31;
-			return (ComputeKnownZeroBits(getOp1(I)) << samt) |
-			        ~(-1U << samt);
-		}
-		return 0;
-	case Shrl:
-		if (isImm(*getOp2(I))) {
-			unsigned samt = GetImmValue(getOp2(I)) & 31;
-			return (ComputeKnownZeroBits(getOp1(I)) >> samt) |
-			        ~(-1U >> samt);
-		}
-		return 0;
-	case Rol:
-		if (isImm(*getOp2(I))) {
-			return _rotl(ComputeKnownZeroBits(getOp1(I)),
-			             GetImmValue(getOp2(I)));
-		}
-	default:
-		return 0;
-	}
-}
-
-InstLoc IRBuilder::FoldZeroOp(unsigned Opcode, unsigned extra) {
-	if (Opcode == LoadGReg) {
-		// Reg load folding: if we already loaded the value,
-		// load it again
-		if (!GRegCache[extra])
-			GRegCache[extra] = EmitZeroOp(LoadGReg, extra);
-		return GRegCache[extra];
-	}
-	if (Opcode == LoadFReg) {
-		// Reg load folding: if we already loaded the value,
-		// load it again
-		if (!FRegCache[extra])
-			FRegCache[extra] = EmitZeroOp(LoadFReg, extra);
-		return FRegCache[extra];
-	}
-	if (Opcode == LoadFRegDENToZero) {
-		FRegCacheStore[extra] = 0; // prevent previous store operation from zapping
-		FRegCache[extra] = EmitZeroOp(LoadFRegDENToZero, extra);
-		return FRegCache[extra];
-	}
-	if (Opcode == LoadCarry) {
-		if (!CarryCache)
-			CarryCache = EmitZeroOp(LoadCarry, extra);
-		return CarryCache;
-	}
-	if (Opcode == LoadCR) {
-		if (!CRCache[extra])
-			CRCache[extra] = EmitZeroOp(LoadCR, extra);
-		return CRCache[extra];
-	}
-	if (Opcode == LoadCTR) {
-		if (!CTRCache)
-			CTRCache = EmitZeroOp(LoadCTR, extra);
-		return CTRCache;
-	}
-
-	return EmitZeroOp(Opcode, extra);
-}
-
-InstLoc IRBuilder::FoldUOp(unsigned Opcode, InstLoc Op1, unsigned extra) {
-	if (Opcode == StoreGReg) {
-		// Reg store folding: save the value for load folding.
-		// If there's a previous store, zap it because it's dead.
-		GRegCache[extra] = Op1;
-		if (GRegCacheStore[extra]) {
-			*GRegCacheStore[extra] = 0;
-		}
-		GRegCacheStore[extra] = EmitUOp(StoreGReg, Op1, extra);
-		return GRegCacheStore[extra];
-	}
-	if (Opcode == StoreFReg) {
-		FRegCache[extra] = Op1;
-		if (FRegCacheStore[extra]) {
-			*FRegCacheStore[extra] = 0;
-		}
-		FRegCacheStore[extra] = EmitUOp(StoreFReg, Op1, extra);
-		return FRegCacheStore[extra];
-	}
-	if (Opcode == StoreCarry) {
-		CarryCache = Op1;
-		if (CarryCacheStore) {
-			*CarryCacheStore = 0;
-		}
-		CarryCacheStore = EmitUOp(StoreCarry, Op1, extra);
-		return CarryCacheStore;
-	}
-	if (Opcode == StoreCR) {
-		CRCache[extra] = Op1;
-		if (CRCacheStore[extra]) {
-			*CRCacheStore[extra] = 0;
-		}
-		CRCacheStore[extra] = EmitUOp(StoreCR, Op1, extra);
-		return CRCacheStore[extra];
-	}
-	if (Opcode == StoreCTR) {
-		CTRCache = Op1;
-		if (CTRCacheStore) {
-			*CTRCacheStore = 0;
-		}
-		CTRCacheStore = EmitUOp(StoreCTR, Op1, extra);
-		return CTRCacheStore;
-	}
-	if (Opcode == CompactMRegToPacked) {
-		if (getOpcode(*Op1) == ExpandPackedToMReg)
-			return getOp1(Op1);
-	}
-	if (Opcode == DoubleToSingle) {
-		if (getOpcode(*Op1) == DupSingleToMReg)
-			return getOp1(Op1);
-		if (getOpcode(*Op1) >= FDMul && getOpcode(*Op1) <= FDSub) {
-			InstLoc OOp1 = getOp1(Op1), OOp2 = getOp2(Op1);
-			if (getOpcode(*OOp1) == DupSingleToMReg &&
-			    getOpcode(*OOp2) == DupSingleToMReg) {
-				if (getOpcode(*Op1) == FDMul) {
-					return FoldBiOp(FSMul, getOp1(OOp1), getOp2(OOp2));
-				} else if (getOpcode(*Op1) == FDAdd) {
-					return FoldBiOp(FSAdd, getOp1(OOp1), getOp2(OOp2));
-				} else if (getOpcode(*Op1) == FDSub) {
-					return FoldBiOp(FSSub, getOp1(OOp1), getOp2(OOp2));
-				}
-			}
-		}
-	}
-	if (Opcode == Not) {
-		if (getOpcode(*Op1) == Not) {
-			return getOp1(Op1);
-		}
-	}
-
-	return EmitUOp(Opcode, Op1, extra);
-}
-
-// Fold Add opcode. Some rules are ported from LLVM
-InstLoc IRBuilder::FoldAdd(InstLoc Op1, InstLoc Op2) {
-	simplifyCommutative(Add, Op1, Op2);
-
-	// i0 + i1 => (i0 + i1)
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst(GetImmValue(Op1) + GetImmValue(Op2));
-	}
-
-	// x + 0 => x
-	if (isImm(*Op2) && GetImmValue(Op2) == 0) {
-		return Op1;
-	}
-
-	// x + (y - x) --> y
-	if (getOpcode(*Op2) == Sub && isSameValue(Op1, getOp2(Op2))) {
-		return getOp1(Op2);
-	}
-
-	// (x - y) + y => x
-	if (getOpcode(*Op1) == Sub && isSameValue(getOp2(Op1), Op2)) {
-		return getOp1(Op1);
-	}
-
-	if (InstLoc negOp1 = isNeg(Op1)) {
-		//// TODO: Test the folding below
-		//// -A + -B  -->  -(A + B)
-		//if (InstLoc negOp2 = isNeg(Op2)) {
-		//	return FoldSub(EmitIntConst(0), FoldAdd(negOp1, negOp2));
-		//}
-
-		// -A + B  -->  B - A
-		return FoldSub(Op2, negOp1);
-	}
-
-	// A + -B  -->  A - B
-	if (InstLoc negOp2 = isNeg(Op2)) {
-		return FoldSub(Op1, negOp2);
-	}
-
-	// (x * i0) + x => x * (i0 + 1)
-	if (getOpcode(*Op1) == Mul && isImm(*getOp2(Op1)) && isSameValue(getOp1(Op1), Op2)) {
-		return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + 1));
-	}
-
-	//// TODO: Test the folding below
-	//// (x * i0) + (x * i1) => x * (i0 + i1)
-	//if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul && isSameValue(getOp1(Op1), getOp1(Op2)) && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2))) {
-	//	return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + GetImmValue(getOp2(Op2))));
-	//}
-
-	// x + x * i0 => x * (i0 + 1)
-	if (getOpcode(*Op2) == Mul && isImm(*getOp2(Op2)) && isSameValue(Op1, getOp1(Op2))) {
-		return FoldMul(Op1, EmitIntConst(GetImmValue(getOp2(Op2)) + 1));
-	}
-
-	// w * x + y * z => w * (x + z) iff w == y
-	if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul) {
-		InstLoc w = getOp1(Op1);
-		InstLoc x = getOp2(Op1);
-		InstLoc y = getOp1(Op2);
-		InstLoc z = getOp2(Op2);
-
-		if (!isSameValue(w, y)) {
-			if (isSameValue(w, z)) {
-				std::swap(y, z);
-			} else if (isSameValue(y, x)) {
-				std::swap(w, x);
-			} else if (isSameValue(x, z)) {
-				std::swap(y, z);
-				std::swap(w, x);
-			}
-		}
-
-		if (isSameValue(w, y)) {
-			return FoldMul(w, FoldAdd(x, z));
-		}
-	}
-
-	return EmitBiOp(Add, Op1, Op2);
-}
-
-// Fold Sub opcode. Some rules are ported from LLVM
-InstLoc IRBuilder::FoldSub(InstLoc Op1, InstLoc Op2) {
-	// (x - x) => 0
-	if (isSameValue(Op1, Op2)) {
-		return EmitIntConst(0);
-	}
-
-	// x - (-A) => x + A
-	if (InstLoc negOp2 = isNeg(Op2)) {
-		return FoldAdd(Op1, negOp2);
-	}
-
-	// (x - i0) => x + -i0
-	if (isImm(*Op2)) {
-		return FoldAdd(Op1, EmitIntConst(-GetImmValue(Op2)));
-	}
-
-	if (getOpcode(*Op2) == Add) {
-		// x - (x + y) => -y
-		if (isSameValue(Op1, getOp1(Op2))) {
-			return FoldSub(EmitIntConst(0), getOp2(Op2));
-		}
-
-		// x - (y + x) => -y
-		if (isSameValue(Op1, getOp2(Op2))) {
-			return FoldSub(EmitIntConst(0), getOp1(Op2));
-		}
-
-		// i0 - (x + i1) => (i0 - i1) - x
-		if (isImm(*Op1) && isImm(*getOp2(Op2))) {
-			return FoldSub(EmitIntConst(GetImmValue(Op1) - GetImmValue(getOp2(Op2))), getOp1(Op2));
-		}
-	}
-
-	//// TODO: Test the folding below
-	//// 0 - (C << X)  -> (-C << X)
-	//if (isImm(*Op1) && GetImmValue(Op1) == 0 && getOpcode(*Op2) == Shl && isImm(*getOp1(Op2))) {
-	//	return FoldShl(EmitIntConst(-GetImmValue(getOp1(Op2))), getOp2(Op2));
-	//}
-
-	//// TODO: Test the folding below
-	//// x - x * i0 = x * (1 - i0)
-	//if (getOpcode(*Op2) == Mul && isImm(*getOp2(Op2)) && isSameValue(Op1, getOp1(Op2))) {
-	//	return FoldMul(Op1, EmitIntConst(1 - GetImmValue(getOp2(Op2))));
-	//}
-
-	if (getOpcode(*Op1) == Add) {
-		// (x + y) - x => y
-		if (isSameValue(getOp1(Op1), Op2)) {
-			return getOp2(Op1);
-		}
-
-		// (x + y) - y => x
-		if (isSameValue(getOp2(Op1), Op2)) {
-			return getOp1(Op1);
-		}
-	}
-
-	//if (getOpcode(*Op1) == Sub) {
-	//	// TODO: Test the folding below
-	//	// (x - y) - x => -y
-	//	if (isSameValue(getOp1(Op1), Op2)) {
-	//		return FoldSub(EmitIntConst(0), getOp2(Op1));
-	//	}
-	//}
-
-	if (getOpcode(*Op1) == Mul) {
-		// x * i0 - x => x * (i0 - 1)
-		if (isImm(*getOp2(Op1)) && isSameValue(getOp1(Op1), Op2)) {
-			return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) - 1));
-		}
-
-		//// TODO: Test the folding below
-		//// x * i0 - x * i1 => x * (i0 - i1)
-		//if (getOpcode(*Op2) == Mul && isSameValue(getOp1(Op1), getOp1(Op2)) && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2))) {
-		//	return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) + GetImmValue(getOp2(Op2))));
-		//}
-	}
-
-	// (x + i0) - (y + i1) => (x - y) + (i0 - i1)
-	if (getOpcode(*Op1) == Add && getOpcode(*Op2) == Add && isImm(*getOp2(Op1)) && isImm(*getOp2(Op2))) {
-		return FoldAdd(FoldSub(getOp1(Op1), getOp1(Op2)), EmitIntConst(GetImmValue(getOp2(Op1)) - GetImmValue(getOp2(Op2))));
-	}
-
-	// w * x - y * z => w * (x - z) iff w == y
-	if (getOpcode(*Op1) == Mul && getOpcode(*Op2) == Mul) {
-		InstLoc w = getOp1(Op1);
-		InstLoc x = getOp2(Op1);
-		InstLoc y = getOp1(Op2);
-		InstLoc z = getOp2(Op2);
-
-		if (!isSameValue(w, y)) {
-			if (isSameValue(w, z)) {
-				std::swap(y, z);
-			} else if (isSameValue(y, x)) {
-				std::swap(w, x);
-			} else if (isSameValue(x, z)) {
-				std::swap(y, z);
-				std::swap(w, x);
-			}
-		}
-
-		if (isSameValue(w, y)) {
-			return FoldMul(w, FoldSub(x, z));
-		}
-	}
-
-	return EmitBiOp(Sub, Op1, Op2);
-}
-
-// Fold Mul opcode. Some rules are ported from LLVM
-InstLoc IRBuilder::FoldMul(InstLoc Op1, InstLoc Op2) {
-	simplifyCommutative(Mul, Op1, Op2);
-
-	// i0 * i1 => (i0 * i1)
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst(GetImmValue(Op1) * GetImmValue(Op2));
-	}
-
-	// (x << i0) * i1 => x * (i1 << i0)
-	if (getOpcode(*Op1) == Shl && isImm(*getOp2(Op1)) && isImm(*Op2)) {
-		return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(Op2) << GetImmValue(getOp2(Op1))));
-	}
-
-	if (isImm(*Op2)) {
-		const unsigned imm = GetImmValue(Op2);
-
-		// x * 0 => 0
-		if (imm == 0) {
-			return EmitIntConst(0);
-		}
-
-		// x * -1 => 0 - x
-		if (imm == -1U) {
-			return FoldSub(EmitIntConst(0), Op1);
-		}
-		
-		for (unsigned i0 = 0; i0 < 30; ++i0) {
-			// x * (1 << i0) => x << i0
-			// One "shl" is faster than one "imul".
-			if (imm == (1U << i0)) {
-				return FoldShl(Op1, EmitIntConst(i0));
-			}
-		}
-	}
-
-	// (x + i0) * i1 => x * i1 + i0 * i1
-	// The later format can be folded by other rules, again.
-	if (getOpcode(*Op1) == Add && isImm(*getOp2(Op1)) && isImm(*Op2)) {
-		return FoldAdd(FoldMul(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) * GetImmValue(Op2)));
-	}
-
-	//// TODO: Test the folding below
-	//// -X * -Y => X * Y
-	//if (InstLoc negOp1 = isNeg(Op1)) {
-	//	if (InstLoc negOp2 = isNeg(Op2)) {
-	//		return FoldMul(negOp1, negOp2);
-	//	}
-	//}
-
-	//// TODO: Test the folding below
-	//// x * (1 << y) => x << y
-	//if (getOpcode(*Op2) == Shl && isImm(*getOp1(Op2)) && GetImmValue(getOp1(Op2)) == 1) {
-	//	return FoldShl(Op1, getOp2(Op2));
-	//}
-
-	//// TODO: Test the folding below
-	//// (1 << y) * x => x << y
-	//if (getOpcode(*Op1) == Shl && isImm(*getOp1(Op1)) && GetImmValue(getOp1(Op1)) == 1) {
-	//	return FoldShl(Op2, getOp2(Op1));
-	//}
-
-	// x * y (where y is 0 or 1) => (0 - y) & x
-	if (ComputeKnownZeroBits(Op2) == -2U) {
-		return FoldAnd(FoldSub(EmitIntConst(0), Op2), Op1);
-	}
-
-	// x * y (where y is 0 or 1) => (0 - x) & y
-	if (ComputeKnownZeroBits(Op1) == -2U) {
-		return FoldAnd(FoldSub(EmitIntConst(0), Op1), Op2);
-	}
-
-	return EmitBiOp(Mul, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldMulHighUnsigned(InstLoc Op1, InstLoc Op2) {
-	// (i0 * i1) >> 32
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst((u32)(((u64)GetImmValue(Op1) * (u64)GetImmValue(Op2)) >> 32));
-	}
-
-	if (isImm(*Op1) && !isImm(*Op2)) {
-		return FoldMulHighUnsigned(Op2, Op1);
-	}
-
-	if (isImm(*Op2)) {
-		const unsigned imm = GetImmValue(Op2);
-
-		// (x * 0) >> 32 => 0
-		if (imm == 0) {
-			return EmitIntConst(0);
-		}
-
-		for (unsigned i0 = 0; i0 < 30; ++i0) {
-			// (x * (1 << i0)) => x >> (32 - i0)
-			// One "shl" is faster than one "imul".
-			if (imm == (1U << i0)) {
-				return FoldShrl(Op1, EmitIntConst(32 - i0));
-			}
-		}
-	}
-
-	return EmitBiOp(MulHighUnsigned, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldAnd(InstLoc Op1, InstLoc Op2) {
-	simplifyCommutative(And, Op1, Op2);
-
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst(GetImmValue(Op1) & GetImmValue(Op2));
-	}
-	if (isImm(*Op2)) {
-		if (!GetImmValue(Op2)) return EmitIntConst(0);
-		if (GetImmValue(Op2) == -1U) return Op1;
-		if (getOpcode(*Op1) == And && isImm(*getOp2(Op1))) {
-			unsigned RHS = GetImmValue(Op2) &
-				       GetImmValue(getOp2(Op1));
-			return FoldAnd(getOp1(Op1), EmitIntConst(RHS));
-		} else if (getOpcode(*Op1) == Rol && isImm(*getOp2(Op1))) {
-			unsigned shiftMask1 = -1U << (GetImmValue(getOp2(Op1)) & 31);
-			if (GetImmValue(Op2) == shiftMask1)
-				return FoldShl(getOp1(Op1), getOp2(Op1));
-			unsigned shiftAmt2 = ((32 - GetImmValue(getOp2(Op1))) & 31);
-			unsigned shiftMask2 = -1U >> shiftAmt2;
-			if (GetImmValue(Op2) == shiftMask2) {
-				return FoldShrl(getOp1(Op1), EmitIntConst(shiftAmt2));
-			}
-		}
-		if (!(~ComputeKnownZeroBits(Op1) & ~GetImmValue(Op2))) {
-			return Op1;
-		}
-
-		//if (getOpcode(*Op1) == Xor || getOpcode(*Op1) == Or) {
-		//	// TODO: Test the folding below
-		//	// (x op y) & z => (x & z) op y if (y & z) == 0
-		//	if ((~ComputeKnownZeroBits(getOp2(Op1)) & ~ComputeKnownZeroBits(Op2)) == 0) {
-		//		return FoldBiOp(getOpcode(*Op1), FoldAnd(getOp1(Op1), Op2), getOp2(Op1));
-		//	}
-
-		//	// TODO: Test the folding below
-		//	// (x op y) & z => (y & z) op x if (x & z) == 0
-		//	if ((~ComputeKnownZeroBits(getOp1(Op1)) & ~ComputeKnownZeroBits(Op2)) == 0) {
-		//		return FoldBiOp(getOpcode(*Op1), FoldAnd(getOp2(Op1), Op2), getOp1(Op1));
-		//	}
-		//}
-	}
-
-	//// TODO: Test the folding below
-	//// (x >> z) & (y >> z) => (x & y) >> z
-	//if (getOpcode(*Op1) == Shrl && getOpcode(*Op2) == Shrl && isSameValue(getOp2(Op1), getOp2(Op2))) {
-	//	return FoldShl(FoldAnd(getOp1(Op1), getOp2(Op1)), getOp2(Op1));
-	//}
-
-	//// TODO: Test the folding below
-	//// ((A | N) + B) & AndRHS -> (A + B) & AndRHS iff N&AndRHS == 0
-	//// ((A ^ N) + B) & AndRHS -> (A + B) & AndRHS iff N&AndRHS == 0
-	//// ((A | N) - B) & AndRHS -> (A - B) & AndRHS iff N&AndRHS == 0
-	//// ((A ^ N) - B) & AndRHS -> (A - B) & AndRHS iff N&AndRHS == 0
-	//if ((getOpcode(*Op1) == Add || getOpcode(*Op1) == Sub) &&
-	//	(getOpcode(*getOp1(Op1)) == Or || getOpcode(*getOp1(Op1)) == Xor))
-	//{
-	//	const InstLoc A = getOp1(getOp1(Op1));
-	//	const InstLoc N = getOp2(getOp1(Op1));
-	//	const InstLoc B = getOp2(Op1);
-	//	const InstLoc AndRHS = Op2;
-	//	if ((~ComputeKnownZeroBits(N) & ~ComputeKnownZeroBits(AndRHS)) == 0) {
-	//		return FoldAnd(FoldBiOp(getOpcode(*Op1), A, B), AndRHS);
-	//	}
-	//}
-
-	//// TODO: Test the folding below
-	//// (~A & ~B) == (~(A | B)) - De Morgan's Law
-	//if (InstLoc notOp1 = isNot(Op1)) {
-	//	if (InstLoc notOp2 = isNot(Op2)) {
-	//		return FoldXor(EmitIntConst(-1U), FoldOr(notOp1, notOp2));
-	//	}
-	//}
-
-	//// TODO: Test the folding below
-	//// (X^C)|Y -> (X|Y)^C iff Y&C == 0
-	//if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1)) && (~ComputeKnownZeroBits(Op2) & GetImmValue(getOp2(Op1))) == 0) {
-	//	return FoldXor(FoldOr(getOp1(Op1), Op2), getOp2(Op1));
-	//}
-
-	if (Op1 == Op2) return Op1;
-
-	return EmitBiOp(And, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldOr(InstLoc Op1, InstLoc Op2) {
-	simplifyCommutative(Or, Op1, Op2);
-
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst(GetImmValue(Op1) | GetImmValue(Op2));
-	}
-	if (isImm(*Op2)) {
-		if (!GetImmValue(Op2)) return Op1;
-		if (GetImmValue(Op2) == -1U) return EmitIntConst(-1U);
-		if (getOpcode(*Op1) == Or && isImm(*getOp2(Op1))) {
-			unsigned RHS = GetImmValue(Op2) |
-				       GetImmValue(getOp2(Op1));
-			return FoldOr(getOp1(Op1), EmitIntConst(RHS));
-		}
-
-		// (X & C1) | C2 --> (X | C2) & (C1|C2)
-		// iff (C1 & C2) == 0.
-		if (getOpcode(*Op1) == And && isImm(*getOp2(Op1)) && (GetImmValue(getOp2(Op1)) & GetImmValue(Op2)) == 0) {
-			return FoldAnd(FoldOr(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) | GetImmValue(Op2)));
-		}
-
-		// (X ^ C1) | C2 --> (X | C2) ^ (C1&~C2)
-		if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1)) && isImm(*Op2)) {
-			return FoldXor(FoldOr(getOp1(Op1), Op2), EmitIntConst(GetImmValue(getOp2(Op1)) & ~GetImmValue(Op2)));
-		}
-	}
-
-	// (~A | ~B) == (~(A & B)) - De Morgan's Law
-	if (getOpcode(*Op1) == Not && getOpcode(*Op2) == Not) {
-		return EmitNot(FoldAnd(getOp1(Op1), getOp1(Op2)));
-	}
-
-	if (Op1 == Op2) return Op1;
-
-	return EmitBiOp(Or, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldXor(InstLoc Op1, InstLoc Op2) {
-	simplifyCommutative(Xor, Op1, Op2);
-
-	if (isImm(*Op1) && isImm(*Op2)) {
-		return EmitIntConst(GetImmValue(Op1) ^ GetImmValue(Op2));
-	}
-	if (isImm(*Op2)) {
-		if (!GetImmValue(Op2)) return Op1;
-		if (GetImmValue(Op2) == 0xFFFFFFFFU) {
-			return EmitNot(Op1);
-		}
-		if (getOpcode(*Op1) == Xor && isImm(*getOp2(Op1))) {
-			unsigned RHS = GetImmValue(Op2) ^
-				       GetImmValue(getOp2(Op1));
-			return FoldXor(getOp1(Op1), EmitIntConst(RHS));
-		}
-	}
-
-	if (Op1 == Op2) return EmitIntConst(0);
-
-	return EmitBiOp(Xor, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldShl(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op2)) {
-		// Shl x 0 => x
-		if (!GetImmValue(Op2)) {
-			return Op1;
-		}
-
-		if (isImm(*Op1))
-			return EmitIntConst(GetImmValue(Op1) << (GetImmValue(Op2) & 31));
-
-		// ((x * i0) << i1) == x * (i0 << i1)
-		if (getOpcode(*Op1) == Mul && isImm(*getOp2(Op1))) {
-			return FoldMul(getOp1(Op1), EmitIntConst(GetImmValue(getOp2(Op1)) << GetImmValue(Op2)));
-		}
-	}
-
-	// 0 << x => 0
-	if (isImm(*Op1) && GetImmValue(Op1) == 0) {
-		return EmitIntConst(0);
-	}
-
-	return EmitBiOp(Shl, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldShrl(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op2)) {
-		if (isImm(*Op1))
-			return EmitIntConst(GetImmValue(Op1) >> (GetImmValue(Op2) & 31));
-	}
-	return EmitBiOp(Shrl, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldRol(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op2)) {
-		if (isImm(*Op1))
-			return EmitIntConst(_rotl(GetImmValue(Op1),
-					          GetImmValue(Op2)));
-		if (!(GetImmValue(Op2) & 31)) return Op1;
-	}
-	return EmitBiOp(Rol, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldBranchCond(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op1)) {
-		if (GetImmValue(Op1))
-			return EmitBranchUncond(Op2);
-		return 0;
-	}
-	if (getOpcode(*Op1) == And &&
-	    isImm(*getOp2(Op1)) &&
-	    getOpcode(*getOp1(Op1)) == ICmpCRSigned) {
-		unsigned branchValue = GetImmValue(getOp2(Op1));
-		if (branchValue == 2)
-			return FoldBranchCond(EmitICmpEq(getOp1(getOp1(Op1)),
-					      getOp2(getOp1(Op1))), Op2);
-		if (branchValue == 4)
-			return FoldBranchCond(EmitICmpSgt(getOp1(getOp1(Op1)),
-					      getOp2(getOp1(Op1))), Op2);
-		if (branchValue == 8)
-			return FoldBranchCond(EmitICmpSlt(getOp1(getOp1(Op1)),
-					      getOp2(getOp1(Op1))), Op2);
-	}
-	if (getOpcode(*Op1) == Xor &&
-	    isImm(*getOp2(Op1))) {
-		InstLoc XOp1 = getOp1(Op1);
-		unsigned branchValue = GetImmValue(getOp2(Op1));
-		if (getOpcode(*XOp1) == And &&
-		    isImm(*getOp2(XOp1)) &&
-		    getOpcode(*getOp1(XOp1)) == ICmpCRSigned) {
-			unsigned innerBranchValue = 
-				GetImmValue(getOp2(XOp1));
-			if (branchValue == innerBranchValue) {
-				if (branchValue == 2)
-					return FoldBranchCond(EmitICmpNe(getOp1(getOp1(XOp1)),
-						      getOp2(getOp1(XOp1))), Op2);
-				if (branchValue == 4)
-					return FoldBranchCond(EmitICmpSle(getOp1(getOp1(XOp1)),
-						      getOp2(getOp1(XOp1))), Op2);
-				if (branchValue == 8)
-					return FoldBranchCond(EmitICmpSge(getOp1(getOp1(XOp1)),
-						      getOp2(getOp1(XOp1))), Op2);
-			}
-		}
-	}
-	return EmitBiOp(BranchCond, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldIdleBranch(InstLoc Op1, InstLoc Op2) {
-	return EmitBiOp(
-		IdleBranch,
-		EmitICmpEq(getOp1(getOp1(Op1)),
-		getOp2(getOp1(Op1))), Op2
-		);
-}
-
-InstLoc IRBuilder::FoldICmp(unsigned Opcode, InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op1)) {
-		if (isImm(*Op2)) {
-			unsigned result = 0;
-			switch (Opcode) {
-			case ICmpEq:
-				result = GetImmValue(Op1) == GetImmValue(Op2);
-				break;
-			case ICmpNe:
-				result = GetImmValue(Op1) != GetImmValue(Op2);
-				break;
-			case ICmpUgt:
-				result = GetImmValue(Op1) > GetImmValue(Op2);
-				break;
-			case ICmpUlt:
-				result = GetImmValue(Op1) < GetImmValue(Op2);
-				break;
-			case ICmpUge:
-				result = GetImmValue(Op1) >= GetImmValue(Op2);
-				break;
-			case ICmpUle:
-				result = GetImmValue(Op1) <= GetImmValue(Op2);
-				break;
-			case ICmpSgt:
-				result = (signed)GetImmValue(Op1) >
-					 (signed)GetImmValue(Op2);
-				break;
-			case ICmpSlt:
-				result = (signed)GetImmValue(Op1) <
-					 (signed)GetImmValue(Op2);
-				break;
-			case ICmpSge:
-				result = (signed)GetImmValue(Op1) >=
-					 (signed)GetImmValue(Op2);
-				break;
-			case ICmpSle:
-				result = (signed)GetImmValue(Op1) <=
-					 (signed)GetImmValue(Op2);
-				break;
-			}
-			return EmitIntConst(result);
-		}
-		switch (Opcode) {
-		case ICmpEq:
-			return FoldICmp(ICmpEq, Op2, Op1);
-		case ICmpNe:
-			return FoldICmp(ICmpNe, Op2, Op1);
-		case ICmpUlt:
-			return FoldICmp(ICmpUgt, Op2, Op1);
-		case ICmpUgt:
-			return FoldICmp(ICmpUlt, Op2, Op1);
-		case ICmpUle:
-			return FoldICmp(ICmpUge, Op2, Op1);
-		case ICmpUge:
-			return FoldICmp(ICmpUle, Op2, Op1);
-		case ICmpSlt:
-			return FoldICmp(ICmpSgt, Op2, Op1);
-		case ICmpSgt:
-			return FoldICmp(ICmpSlt, Op2, Op1);
-		case ICmpSle:
-			return FoldICmp(ICmpSge, Op2, Op1);
-		case ICmpSge:
-			return FoldICmp(ICmpSle, Op2, Op1);
-		}
-	}
-	return EmitBiOp(Opcode, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldICmpCRSigned(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op1)) {
-		if (isImm(*Op2)) {
-			int c1 = (int)GetImmValue(Op1),
-			    c2 = (int)GetImmValue(Op2),
-			    result;
-			if (c1 == c2)
-				result = 2;
-			else if (c1 > c2)
-				result = 4;
-			else
-				result = 8;
-			return EmitIntConst(result);
-		}
-	}
-	return EmitBiOp(ICmpCRSigned, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldICmpCRUnsigned(InstLoc Op1, InstLoc Op2) {
-	if (isImm(*Op1)) {
-		if (isImm(*Op2)) {
-			unsigned int c1 = GetImmValue(Op1),
-			             c2 = GetImmValue(Op2),
-			             result;
-			if (c1 == c2)
-				result = 2;
-			else if (c1 > c2)
-				result = 4;
-			else
-				result = 8;
-			return EmitIntConst(result);
-		}
-	}
-	return EmitBiOp(ICmpCRUnsigned, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldInterpreterFallback(InstLoc Op1, InstLoc Op2) {
-	for (unsigned i = 0; i < 32; i++) {
-		GRegCache[i] = 0;
-		GRegCacheStore[i] = 0;
-		FRegCache[i] = 0;
-		FRegCacheStore[i] = 0;
-	}
-	CarryCache = 0;
-	CarryCacheStore = 0;
-	for (unsigned i = 0; i < 8; i++) {
-		CRCache[i] = 0;
-		CRCacheStore[i] = 0;
-	}
-	CTRCache = 0;
-	CTRCacheStore = 0;	
-	return EmitBiOp(InterpreterFallback, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldDoubleBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2) {
-	if (getOpcode(*Op1) == InsertDoubleInMReg) {
-		return FoldDoubleBiOp(Opcode, getOp1(Op1), Op2);
-	}
-
-	if (getOpcode(*Op2) == InsertDoubleInMReg) {
-		return FoldDoubleBiOp(Opcode, Op1, getOp1(Op2));
-	}
-
-	return EmitBiOp(Opcode, Op1, Op2);
-}
-
-InstLoc IRBuilder::FoldBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, unsigned extra) {
-	switch (Opcode) {
-		case Add: return FoldAdd(Op1, Op2);
-		case Sub: return FoldSub(Op1, Op2);
-		case Mul: return FoldMul(Op1, Op2);
-		case MulHighUnsigned: return FoldMulHighUnsigned(Op1, Op2);
-		case And: return FoldAnd(Op1, Op2);
-		case Or: return FoldOr(Op1, Op2);
-		case Xor: return FoldXor(Op1, Op2);
-		case Shl: return FoldShl(Op1, Op2);
-		case Shrl: return FoldShrl(Op1, Op2);
-		case Rol: return FoldRol(Op1, Op2);
-		case BranchCond: return FoldBranchCond(Op1, Op2);
-		case IdleBranch: return FoldIdleBranch(Op1, Op2);
-		case ICmpEq: case ICmpNe:
-		case ICmpUgt: case ICmpUlt: case ICmpUge: case ICmpUle:
-		case ICmpSgt: case ICmpSlt: case ICmpSge: case ICmpSle:
-			return FoldICmp(Opcode, Op1, Op2);
-		case ICmpCRSigned: return FoldICmpCRSigned(Op1, Op2);
-		case ICmpCRUnsigned: return FoldICmpCRUnsigned(Op1, Op2);
-		case InterpreterFallback: return FoldInterpreterFallback(Op1, Op2);
-		case FDMul: case FDAdd: case FDSub: return FoldDoubleBiOp(Opcode, Op1, Op2);
-		default: return EmitBiOp(Opcode, Op1, Op2, extra);
-	}
-}
-
-InstLoc IRBuilder::EmitIntConst(unsigned value) {
-	InstLoc curIndex = &InstList[InstList.size()];
-	InstList.push_back(CInt32 | ((unsigned int)ConstList.size() << 8));
-	MarkUsed.push_back(false);
-	ConstList.push_back(value);
-	return curIndex;
-}
-
-unsigned IRBuilder::GetImmValue(InstLoc I) const {
-	return ConstList[*I >> 8];
-}
-
-void IRBuilder::SetMarkUsed(InstLoc I) {
-	const unsigned i = (unsigned)(I - &InstList[0]);
-	MarkUsed[i] = true;
-}
-
-bool IRBuilder::IsMarkUsed(InstLoc I) const {
-	const unsigned i = (unsigned)(I - &InstList[0]);
-	return MarkUsed[i];
-}
-
-unsigned IRBuilder::isSameValue(InstLoc Op1, InstLoc Op2) const {
-	if (Op1 == Op2) {
-		return true;
-	}
-
-	if (isImm(*Op1) && isImm(*Op2) && GetImmValue(Op1) == GetImmValue(Op2)) {
-		return true;
-	}
-
-	if (getNumberOfOperands(Op1) == 2 && getOpcode(*Op1) != StorePaired && getOpcode(*Op1) == getOpcode(*Op2) &&
-		isSameValue(getOp1(Op1), getOp1(Op2)) && isSameValue(getOp2(Op1), getOp2(Op2)))
-	{
-		return true;
-	}
-
-	return false;
-}
-
-// Assign a complexity or rank value to Inst
-// Ported from InstructionCombining.cpp in LLVM
-// 0 -> undef
-// 1 -> Nop, Const
-// 2 -> ZeroOp
-// 3 -> UOp
-// 4 -> BiOp
-unsigned IRBuilder::getComplexity(InstLoc I) const {
-	const unsigned Opcode = getOpcode(*I);
-	if (Opcode == Nop || Opcode == CInt16 || Opcode == CInt32) {
-		return 1;
-	}
-
-	const unsigned numberOfOperands = getNumberOfOperands(I);
-	if (numberOfOperands == -1U) {
-		return 0;
-	}
-
-	return numberOfOperands + 2;
-}
-
-
-unsigned IRBuilder::getNumberOfOperands(InstLoc I) const {
-	static unsigned numberOfOperands[256];
-	static bool initialized = false;
-	if (!initialized) {
-		initialized = true;
-		std::fill_n(numberOfOperands, sizeof(numberOfOperands) / sizeof(numberOfOperands[0]), -1U);
-
-		numberOfOperands[Nop] = 0;
-		numberOfOperands[CInt16] = 0;
-		numberOfOperands[CInt32] = 0;
-
-		static unsigned ZeroOp[] = {LoadCR, LoadLink, LoadMSR, LoadGReg, LoadCTR, InterpreterBranch, LoadCarry, RFIExit, LoadFReg, LoadFRegDENToZero, LoadGQR, Int3, };
-		static unsigned UOp[] = {StoreLink, BranchUncond, StoreCR, StoreMSR, StoreFPRF, StoreGReg, StoreCTR, Load8, Load16, Load32, SExt16, SExt8, Cntlzw, Not, StoreCarry, SystemCall, ShortIdleLoop, LoadSingle, LoadDouble, LoadPaired, StoreFReg, DupSingleToMReg, DupSingleToPacked, ExpandPackedToMReg, CompactMRegToPacked, FSNeg, FSRSqrt, FDNeg, FPDup0, FPDup1, FPNeg, DoubleToSingle, StoreGQR, StoreSRR, };
-		static unsigned BiOp[] = {BranchCond, IdleBranch, And, Xor, Sub, Or, Add, Mul, Rol, Shl, Shrl, Sarl, ICmpEq, ICmpNe, ICmpUgt, ICmpUlt, ICmpSgt, ICmpSlt, ICmpSge, ICmpSle, Store8, Store16, Store32, ICmpCRSigned, ICmpCRUnsigned, InterpreterFallback, StoreSingle, StoreDouble, StorePaired, InsertDoubleInMReg, FSMul, FSAdd, FSSub, FDMul, FDAdd, FDSub, FPAdd, FPMul, FPSub, FPMerge00, FPMerge01, FPMerge10, FPMerge11, FDCmpCR, };
-		for (size_t i = 0; i < sizeof(ZeroOp) / sizeof(ZeroOp[0]); ++i) {
-			numberOfOperands[ZeroOp[i]] = 0;
-		}
-		for (size_t i = 0; i < sizeof(UOp) / sizeof(UOp[0]); ++i) {
-			numberOfOperands[UOp[i]] = 1;
-		}
-		for (size_t i = 0; i < sizeof(BiOp) / sizeof(BiOp[0]); ++i) {
-			numberOfOperands[BiOp[i]] = 2;
-		}
-	}
-
-	return numberOfOperands[getOpcode(*I)];
-}
-
-// Performs a few simplifications for commutative operators
-// Ported from InstructionCombining.cpp in LLVM
-void IRBuilder::simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2) {
-	// Order operands such that they are listed from right (least complex) to
-	// left (most complex).  This puts constants before unary operators before
-	// binary operators.
-	if (getComplexity(Op1) < getComplexity(Op2)) {
-		std::swap(Op1, Op2);
-	}
-
-	// Is this associative?
-	switch (Opcode) {
-		case Add:
-		case Mul:
-		case And:
-		case Or:
-		case Xor:
-			break;
-		default:
-			return;
-	}
-
-	// (V op C1) op C2 => V + (C1 + C2)
-	if (getOpcode(*Op1) == Opcode && isImm(*getOp2(Op1)) && isImm(*Op2)) {
-		const InstLoc Op1Old = Op1;
-		const InstLoc Op2Old = Op2;
-		Op1 = getOp1(Op1Old);
-		Op2 = FoldBiOp(Opcode, getOp2(Op1Old), Op2Old);
-	}
-
-	// ((V1 op C1) op (V2 op C2)) => ((V1 op V2) op (C1 op C2))
-	// Transform: (op (op V1, C1), (op V2, C2)) ==> (op (op V1, V2), (op C1,C2))
-	if (getOpcode(*Op1) == Opcode && isImm(*getOp2(Op1)) && getOpcode(*Op2) == Opcode && isImm(*getOp2(Op2))) {
-		const InstLoc Op1Old = Op1;
-		const InstLoc Op2Old = Op2;
-		Op1 = FoldBiOp(Opcode, getOp1(Op1Old), getOp1(Op2Old));
-		Op2 = FoldBiOp(Opcode, getOp2(Op1Old), getOp2(Op2Old));
-	}
-
-	// FIXME: Following code has a bug.
-	// ((w op x) op (y op z)) => (((w op x) op y) op z)
-	/*
-	if (getOpcode(*Op1) == Opcode && getOpcode(*Op2) == Opcode) {
-		// Sort the operands where the complexities will be descending order.
-		std::pair<unsigned, InstLoc> ops[4];
-		ops[0] = std::make_pair(getComplexity(getOp1(Op1)), getOp1(Op1));
-		ops[1] = std::make_pair(getComplexity(getOp2(Op1)), getOp2(Op1));
-		ops[2] = std::make_pair(getComplexity(getOp1(Op2)), getOp1(Op2));
-		ops[3] = std::make_pair(getComplexity(getOp2(Op2)), getOp2(Op2));
-		std::sort(ops, ops + 4, std::greater<std::pair<unsigned, InstLoc> >());
-
-		Op1 = FoldBiOp(Opcode, FoldBiOp(Opcode, ops[0].second, ops[1].second), ops[2].second);
-		Op2 = ops[3].second;
-	}
-	*/
-}
-
-bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const {
-	return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op2)) == 0;
-}
-
-// Returns I' if I == (0 - I')
-InstLoc IRBuilder::isNeg(InstLoc I) const {
-	if (getOpcode(*I) == Sub && isImm(*getOp1(I)) && GetImmValue(getOp1(I)) == 0) {
-		return getOp2(I);
-	}
-
-	return NULL;
-}
-
-// TODO: Move the following code to a separated file.
-struct Writer
-{
-	File::IOFile file;
-	Writer() : file(NULL)
-	{
-		char buffer[1024];
-		sprintf(buffer, "JitIL_IR_%d.txt", (int)time(NULL));
-		file.Open(buffer, "w");
-		setvbuf(file.GetHandle(), NULL, _IOFBF, 1024 * 1024);
-	}
-
-	virtual ~Writer() {}
-};
-
-static std::auto_ptr<Writer> writer;
-
-static const std::string opcodeNames[] = {
-	"Nop", "LoadGReg", "LoadLink", "LoadCR", "LoadCarry", "LoadCTR", 
-	"LoadMSR", "LoadGQR", "SExt8", "SExt16", "BSwap32", "BSwap16", "Cntlzw", 
-	"Not", "Load8", "Load16", "Load32", "BranchUncond", "StoreGReg", 
-	"StoreCR", "StoreLink", "StoreCarry", "StoreCTR", "StoreMSR", "StoreFPRF", 
-	"StoreGQR", "StoreSRR", "InterpreterFallback", "Add", "Mul", "And", "Or", 
-	"Xor", "MulHighUnsigned", "Sub", "Shl", "Shrl", "Sarl", "Rol", 
-	"ICmpCRSigned", "ICmpCRUnsigned", "ICmpEq", "ICmpNe", "ICmpUgt", 
-	"ICmpUlt", "ICmpUge", "ICmpUle", "ICmpSgt", "ICmpSlt", "ICmpSge", 
-	"ICmpSle", "Store8", "Store16", "Store32", "BranchCond", "FResult_Start", 
-	"LoadSingle", "LoadDouble", "LoadPaired", "DoubleToSingle", 
-	"DupSingleToMReg", "DupSingleToPacked", "InsertDoubleInMReg", 
-	"ExpandPackedToMReg", "CompactMRegToPacked", "LoadFReg", 
-	"LoadFRegDENToZero", "FSMul", "FSAdd", "FSSub", "FSNeg", "FSRSqrt", 
-	"FPAdd", "FPMul", "FPSub", "FPNeg", "FDMul", "FDAdd", "FDSub", "FDNeg", 
-	"FPMerge00", "FPMerge01", "FPMerge10", "FPMerge11", "FPDup0", "FPDup1", 
-	"FResult_End", "StorePaired", "StoreSingle", "StoreDouble", "StoreFReg", 
-	"FDCmpCR", "CInt16", "CInt32", "SystemCall", "RFIExit", 
-	"InterpreterBranch", "IdleBranch", "ShortIdleLoop", 
-	"FPExceptionCheckStart", "FPExceptionCheckEnd", "ISIException", "ExtExceptionCheck",
-	"Tramp", "BlockStart", "BlockEnd", "Int3",
-};
-static const unsigned alwaysUsedList[] = {
-	InterpreterFallback, StoreGReg, StoreCR, StoreLink, StoreCTR, StoreMSR,
-	StoreGQR, StoreSRR, StoreCarry, StoreFPRF, Load8, Load16, Load32, Store8,
-	Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR,
-	BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop,
-	SystemCall, InterpreterBranch, RFIExit, FPExceptionCheck,
-	DSIExceptionCheck, ISIException, ExtExceptionCheck, BreakPointCheck,
-	Int3, Tramp, Nop
-};
-static const unsigned extra8RegList[] = {
-	LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero,
-};
-static const unsigned extra16RegList[] = {
-	StoreGReg, StoreCR, StoreGQR, StoreSRR, LoadPaired, StoreFReg,
-};
-static const unsigned extra24RegList[] = {
-	StorePaired,
-};
-
-static const std::set<unsigned> alwaysUseds(alwaysUsedList, alwaysUsedList + sizeof(alwaysUsedList) / sizeof(alwaysUsedList[0]));
-static const std::set<unsigned> extra8Regs(extra8RegList, extra8RegList + sizeof(extra8RegList) / sizeof(extra8RegList[0]));
-static const std::set<unsigned> extra16Regs(extra16RegList, extra16RegList + sizeof(extra16RegList) / sizeof(extra16RegList[0]));
-static const std::set<unsigned> extra24Regs(extra24RegList, extra24RegList + sizeof(extra24RegList) / sizeof(extra24RegList[0]));
-
-void IRBuilder::WriteToFile(u64 codeHash) {
-	_assert_(sizeof(opcodeNames) / sizeof(opcodeNames[0]) == Int3 + 1);
-
-	if (!writer.get()) {
-		writer = std::auto_ptr<Writer>(new Writer);
-	}
-
-	FILE* const file = writer->file.GetHandle();
-	fprintf(file, "\ncode hash:%016llx\n", codeHash);
-
-	const InstLoc lastCurReadPtr = curReadPtr;
-	StartForwardPass();
-	const unsigned numInsts = getNumInsts();
-	for (unsigned int i = 0; i < numInsts; ++i) {
-		const InstLoc I = ReadForward();
-		const unsigned opcode = getOpcode(*I);
-		const bool thisUsed = IsMarkUsed(I) ||
-			alwaysUseds.find(opcode) != alwaysUseds.end();
-
-		// Line number
-		fprintf(file, "%4d", i);
-
-		if (!thisUsed) {
-			fprintf(file, "%*c", 32, ' ');
-		}
-
-		// Opcode
-		const std::string& opcodeName = opcodeNames[opcode];
-		fprintf(file, " %-20s", opcodeName.c_str());
-		const unsigned numberOfOperands = getNumberOfOperands(I);
-
-		// Op1
-		if (numberOfOperands >= 1) {
-			const IREmitter::InstLoc inst = getOp1(I);
-			if (isImm(*inst)) {
-				fprintf(file, " 0x%08x", GetImmValue(inst));
-			} else {
-				fprintf(file, " %10u", i - (unsigned int)(I - inst));
-			}
-		}
-
-		// Op2
-		if (numberOfOperands >= 2) {
-			const IREmitter::InstLoc inst = getOp2(I);
-			if (isImm(*inst)) {
-				fprintf(file, " 0x%08x", GetImmValue(inst));
-			} else {
-				fprintf(file, " %10u", i - (unsigned int)(I - inst));
-			}
-		}
-
-		if (extra8Regs.count(opcode)) {
-			fprintf(file, " R%d", *I >> 8);
-		}
-		if (extra16Regs.count(opcode)) {
-			fprintf(file, " R%d", *I >> 16);
-		}
-		if (extra24Regs.count(opcode)) {
-			fprintf(file, " R%d", *I >> 24);
-		}
-
-		if (opcode == CInt32 || opcode == CInt16) {
-			fprintf(file, " 0x%08x", GetImmValue(I));
-		}
-
-		fprintf(file, "\n");
-	}
-
-	curReadPtr = lastCurReadPtr;
-}
-
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
deleted file mode 100644
index cce9c3ae3c..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
+++ /dev/null
@@ -1,594 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef IR_H
-#define IR_H
-
-#include "x64Emitter.h"
-#include <vector>
-
-namespace IREmitter {
-enum Opcode {
-	Nop = 0,
-
-	// "Zero-operand" operators
-	// Register load operators
-	LoadGReg,
-	LoadLink,
-	LoadCR,
-	LoadCarry,
-	LoadCTR,
-	LoadMSR,
-	LoadGQR,
-
-	// Unary operators
-	// Integer unary operators
-	SExt8,
-	SExt16,
-	BSwap32,
-	BSwap16,
-	Cntlzw, // Count leading zeros
-	Not,
-	Load8,  // These loads zext
-	Load16,
-	Load32,
-	// Branches
-	BranchUncond,
-	// Register store operators
-	StoreGReg,
-	StoreCR,
-	StoreLink,
-	StoreCarry,
-	StoreCTR,
-	StoreMSR,
-	StoreFPRF,
-	StoreGQR,
-	StoreSRR,
-	// Arbitrary interpreter instruction
-	InterpreterFallback,
-
-	// Binary operators
-	// Commutative integer operators
-	Add,
-	Mul,
-	And,
-	Or,
-	Xor,
-	// Non-commutative integer operators
-	MulHighUnsigned,
-	Sub,
-	Shl,  // Note that shifts ignore bits above the bottom 5
-	Shrl,
-	Sarl,
-	Rol,
-	ICmpCRSigned,   // CR for signed int compare
-	ICmpCRUnsigned, // CR for unsigned int compare
-	ICmpEq,         // One if equal, zero otherwise
-	ICmpNe,
-	ICmpUgt,	// One if op1 > op2, zero otherwise
-	ICmpUlt,
-	ICmpUge,
-	ICmpUle,
-	ICmpSgt,	// One if op1 > op2, zero otherwise
-	ICmpSlt,
-	ICmpSge,
-	ICmpSle,	// Opposite of sgt
-	// Memory store operators
-	Store8,
-	Store16,
-	Store32,
-	BranchCond,
-	// Floating-point
-	// There are three floating-point formats: single, double,
-	// and packed.  For any operation where the format of the
-	// operand isn't known, the ForceTo* operations are used;
-	// these are folded into the appropriate conversion
-	// (or no conversion) depending on the type of the operand.
-	// The "mreg" format is a pair of doubles; this is the
-	// most general possible represenation which is used
-	// in the register state.
-	// This might seem like overkill, but the semantics require
-	// having the different formats.
-	// FIXME: Check the accuracy of the mapping:
-	// 1. Is paired arithmetic always rounded to single-precision
-	//    first, or does it do double-to-single like the
-	//    single-precision instructions?
-	// 2. The implementation of madd is slightly off, and
-	//    the implementation of fmuls is very slightly off;
-	//    likely nothing cares, though.
-	FResult_Start,
-	LoadSingle,
-	LoadDouble,
-	LoadPaired, // This handles quantizers itself
-	DoubleToSingle,
-	DupSingleToMReg,
-	DupSingleToPacked,
-	InsertDoubleInMReg,
-	ExpandPackedToMReg,
-	CompactMRegToPacked,
-	LoadFReg,
-	LoadFRegDENToZero,
-	FSMul,
-	FSAdd,
-	FSSub,
-	FSNeg,
-	FSRSqrt,
-	FPAdd,
-	FPMul,
-	FPSub,
-	FPNeg,
-	FDMul,
-	FDAdd,
-	FDSub,
-	FDNeg,
-	FPMerge00,
-	FPMerge01,
-	FPMerge10,
-	FPMerge11,
-	FPDup0,
-	FPDup1,
-	FResult_End,
-	StorePaired,
-	StoreSingle,
-	StoreDouble,
-	StoreFReg,
-	FDCmpCR,
-
-	// "Trinary" operators
-	// FIXME: Need to change representation!
-	//Select,       // Equivalent to C "Op1 ? Op2 : Op3"
-
-	// Integer constants
-	CInt16,
-	CInt32,
-
-	// Funny PPC "branches"
-	SystemCall,
-	RFIExit,
-	InterpreterBranch,
-
-	IdleBranch,	   // branch operation belonging to idle loop
-	ShortIdleLoop, // Idle loop seen in homebrew like wii mahjong,
-		       // just a branch
-
-	// used for exception checking, at least until someone
-	// has a better idea of integrating it
-	FPExceptionCheck, DSIExceptionCheck,
-	ISIException, ExtExceptionCheck, BreakPointCheck,
-	// "Opcode" representing a register too far away to
-	// reference directly; this is a size optimization
-	Tramp,
-	// "Opcode"s representing the start and end
-	BlockStart, BlockEnd,
-
-	// used for debugging
-	Int3
-};
-
-typedef unsigned Inst;
-typedef Inst* InstLoc;
-
-unsigned inline getOpcode(Inst i) {
-	return i & 255;
-}
-
-unsigned inline isImm(Inst i) {
-	return getOpcode(i) >= CInt16 && getOpcode(i) <= CInt32;
-}
-
-unsigned inline isICmp(Inst i) {
-	return getOpcode(i) >= ICmpEq && getOpcode(i) <= ICmpSle;
-}
-
-unsigned inline isFResult(Inst i) {
-	return getOpcode(i) > FResult_Start && 
-	       getOpcode(i) < FResult_End;
-}
-
-InstLoc inline getOp1(InstLoc i) {
-	i = i - 1 - ((*i >> 8) & 255);
-	if (getOpcode(*i) == Tramp) {
-		i = i - 1 - (*i >> 8);
-	}
-	return i;
-}
-
-InstLoc inline getOp2(InstLoc i) {
-	i = i - 1 - ((*i >> 16) & 255);
-	if (getOpcode(*i) == Tramp) {
-		i = i - 1 - (*i >> 8);
-	}
-	return i;
-}
-
-class IRBuilder {
-private:
-	InstLoc EmitZeroOp(unsigned Opcode, unsigned extra);
-	InstLoc EmitUOp(unsigned OpCode, InstLoc Op1,
-			unsigned extra = 0);
-	InstLoc EmitBiOp(unsigned OpCode, InstLoc Op1, InstLoc Op2,
-			 unsigned extra = 0);
-
-	InstLoc FoldAdd(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldSub(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldMul(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldMulHighUnsigned(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldAnd(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldOr(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldRol(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldShl(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldShrl(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldXor(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldBranchCond(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldIdleBranch(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldICmp(unsigned Opcode, InstLoc Op1, InstLoc Op2);
-	InstLoc FoldICmpCRSigned(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldICmpCRUnsigned(InstLoc Op1, InstLoc Op2);
-	InstLoc FoldDoubleBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2);
-
-	InstLoc FoldInterpreterFallback(InstLoc Op1, InstLoc Op2);
-
-	InstLoc FoldZeroOp(unsigned Opcode, unsigned extra);
-	InstLoc FoldUOp(unsigned OpCode, InstLoc Op1,
-			unsigned extra = 0);
-	InstLoc FoldBiOp(unsigned OpCode, InstLoc Op1, InstLoc Op2,
-			 unsigned extra = 0);
-
-	unsigned ComputeKnownZeroBits(InstLoc I) const;
-
-public:
-	InstLoc EmitIntConst(unsigned value);
-	InstLoc EmitStoreLink(InstLoc val) {
-		return FoldUOp(StoreLink, val);
-	}
-	InstLoc EmitBranchUncond(InstLoc val) {
-		return FoldUOp(BranchUncond, val);
-	}
-	InstLoc EmitBranchCond(InstLoc check, InstLoc dest) {
-		return FoldBiOp(BranchCond, check, dest);
-	}
-	InstLoc EmitIdleBranch(InstLoc check, InstLoc dest) {
-		return FoldBiOp(IdleBranch, check, dest);
-	}
-	InstLoc EmitLoadCR(unsigned crreg) {
-		return FoldZeroOp(LoadCR, crreg);
-	}
-	InstLoc EmitStoreCR(InstLoc value, unsigned crreg) {
-		return FoldUOp(StoreCR, value, crreg);
-	}
-	InstLoc EmitLoadLink() {
-		return FoldZeroOp(LoadLink, 0);
-	}
-	InstLoc EmitLoadMSR() {
-		return FoldZeroOp(LoadMSR, 0);
-	}
-	InstLoc EmitStoreMSR(InstLoc val, InstLoc pc) {
-		return FoldBiOp(StoreMSR, val, pc);
-	}
-	InstLoc EmitStoreFPRF(InstLoc value) {
-		return FoldUOp(StoreFPRF, value);
-	}
-	InstLoc EmitLoadGReg(unsigned reg) {
-		return FoldZeroOp(LoadGReg, reg);
-	}
-	InstLoc EmitStoreGReg(InstLoc value, unsigned reg) {
-		return FoldUOp(StoreGReg, value, reg);
-	}
-	InstLoc EmitNot(InstLoc op1) {
-		return FoldUOp(Not, op1);
-	}
-	InstLoc EmitAnd(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(And, op1, op2);
-	}
-	InstLoc EmitXor(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Xor, op1, op2);
-	}
-	InstLoc EmitSub(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Sub, op1, op2);
-	}
-	InstLoc EmitOr(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Or, op1, op2);
-	}
-	InstLoc EmitAdd(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Add, op1, op2);
-	}
-	InstLoc EmitMul(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Mul, op1, op2);
-	}
-	InstLoc EmitMulHighUnsigned(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(MulHighUnsigned, op1, op2);
-	}
-	InstLoc EmitRol(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Rol, op1, op2);
-	}
-	InstLoc EmitShl(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Shl, op1, op2);
-	}
-	InstLoc EmitShrl(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Shrl, op1, op2);
-	}
-	InstLoc EmitSarl(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Sarl, op1, op2);
-	}
-	InstLoc EmitLoadCTR() {
-		return FoldZeroOp(LoadCTR, 0);
-	}
-	InstLoc EmitStoreCTR(InstLoc op1) {
-		return FoldUOp(StoreCTR, op1);
-	}
-	InstLoc EmitICmpEq(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpEq, op1, op2);
-	}
-	InstLoc EmitICmpNe(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpNe, op1, op2);
-	}
-	InstLoc EmitICmpUgt(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpUgt, op1, op2);
-	}
-	InstLoc EmitICmpUlt(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpUlt, op1, op2);
-	}
-	InstLoc EmitICmpSgt(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpSgt, op1, op2);
-	}
-	InstLoc EmitICmpSlt(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpSlt, op1, op2);
-	}
-	InstLoc EmitICmpSge(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpSge, op1, op2);
-	}
-	InstLoc EmitICmpSle(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpSle, op1, op2);
-	}
-	InstLoc EmitLoad8(InstLoc op1) {
-		return FoldUOp(Load8, op1);
-	}
-	InstLoc EmitLoad16(InstLoc op1) {
-		return FoldUOp(Load16, op1);
-	}
-	InstLoc EmitLoad32(InstLoc op1) {
-		return FoldUOp(Load32, op1);
-	}
-	InstLoc EmitStore8(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Store8, op1, op2);
-	}
-	InstLoc EmitStore16(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Store16, op1, op2);
-	}
-	InstLoc EmitStore32(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(Store32, op1, op2);
-	}
-	InstLoc EmitSExt16(InstLoc op1) {
-		return FoldUOp(SExt16, op1);
-	}
-	InstLoc EmitSExt8(InstLoc op1) {
-		return FoldUOp(SExt8, op1);
-	}
-	InstLoc EmitCntlzw(InstLoc op1) {
-		return FoldUOp(Cntlzw, op1);
-	}
-	InstLoc EmitICmpCRSigned(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpCRSigned, op1, op2);
-	}
-	InstLoc EmitICmpCRUnsigned(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(ICmpCRUnsigned, op1, op2);
-	}
-	InstLoc EmitInterpreterFallback(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(InterpreterFallback, op1, op2);
-	}
-	InstLoc EmitInterpreterBranch() {
-		return FoldZeroOp(InterpreterBranch, 0);
-	}
-	InstLoc EmitLoadCarry() {
-		return FoldZeroOp(LoadCarry, 0);
-	}
-	InstLoc EmitStoreCarry(InstLoc op1) {
-		return FoldUOp(StoreCarry, op1);
-	}
-	InstLoc EmitSystemCall(InstLoc pc) {
-		return FoldUOp(SystemCall, pc);
-	}
-	InstLoc EmitFPExceptionCheck(InstLoc pc) {
-		return EmitUOp(FPExceptionCheck, pc);
-	}
-	InstLoc EmitDSIExceptionCheck(InstLoc pc) {
-		return EmitUOp(DSIExceptionCheck, pc);
-	}
-	InstLoc EmitISIException(InstLoc dest) {
-		return EmitUOp(ISIException, dest);
-	}
-	InstLoc EmitExtExceptionCheck(InstLoc pc) {
-		return EmitUOp(ExtExceptionCheck, pc);
-	}
-	InstLoc EmitBreakPointCheck(InstLoc pc) {
-		return EmitUOp(BreakPointCheck, pc);
-	}
-	InstLoc EmitRFIExit() {
-		return FoldZeroOp(RFIExit, 0);
-	}		
-	InstLoc EmitShortIdleLoop(InstLoc pc) {
-		return FoldUOp(ShortIdleLoop, pc);
-	}
-	InstLoc EmitLoadSingle(InstLoc addr) {
-		return FoldUOp(LoadSingle, addr);
-	}
-	InstLoc EmitLoadDouble(InstLoc addr) {
-		return FoldUOp(LoadDouble, addr);
-	}
-	InstLoc EmitLoadPaired(InstLoc addr, unsigned quantReg) {
-		return FoldUOp(LoadPaired, addr, quantReg);
-	}
-	InstLoc EmitStoreSingle(InstLoc value, InstLoc addr) {
-		return FoldBiOp(StoreSingle, value, addr);
-	}
-	InstLoc EmitStoreDouble(InstLoc value, InstLoc addr) {
-		return FoldBiOp(StoreDouble, value, addr);
-	}
-	InstLoc EmitStorePaired(InstLoc value, InstLoc addr, unsigned quantReg) {
-		return FoldBiOp(StorePaired, value, addr, quantReg);
-	}
-	InstLoc EmitLoadFReg(unsigned freg) {
-		return FoldZeroOp(LoadFReg, freg);
-	}
-	InstLoc EmitLoadFRegDENToZero(unsigned freg) {
-		return FoldZeroOp(LoadFRegDENToZero, freg);
-	}
-	InstLoc EmitStoreFReg(InstLoc val, unsigned freg) {
-		return FoldUOp(StoreFReg, val, freg);
-	}
-	InstLoc EmitDupSingleToMReg(InstLoc val) {
-		return FoldUOp(DupSingleToMReg, val);
-	}
-	InstLoc EmitDupSingleToPacked(InstLoc val) {
-		return FoldUOp(DupSingleToPacked, val);
-	}
-	InstLoc EmitInsertDoubleInMReg(InstLoc val, InstLoc reg) {
-		return FoldBiOp(InsertDoubleInMReg, val, reg);
-	}
-	InstLoc EmitExpandPackedToMReg(InstLoc val) {
-		return FoldUOp(ExpandPackedToMReg, val);
-	}
-	InstLoc EmitCompactMRegToPacked(InstLoc val) {
-		return FoldUOp(CompactMRegToPacked, val);
-	}
-	InstLoc EmitFSMul(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FSMul, op1, op2);
-	}
-	InstLoc EmitFSAdd(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FSAdd, op1, op2);
-	}
-	InstLoc EmitFSSub(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FSSub, op1, op2);
-	}
-	InstLoc EmitFSNeg(InstLoc op1) {
-		return FoldUOp(FSNeg, op1);
-	}
-	InstLoc EmitFSRSqrt(InstLoc op1) {
-		return FoldUOp(FSRSqrt, op1);
-	}
-	InstLoc EmitFDMul(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FDMul, op1, op2);
-	}
-	InstLoc EmitFDAdd(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FDAdd, op1, op2);
-	}
-	InstLoc EmitFDSub(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FDSub, op1, op2);
-	}
-	InstLoc EmitFDNeg(InstLoc op1) {
-		return FoldUOp(FDNeg, op1);
-	}
-	InstLoc EmitFPAdd(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPAdd, op1, op2);
-	}
-	InstLoc EmitFPMul(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPMul, op1, op2);
-	}
-	InstLoc EmitFPSub(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPSub, op1, op2);
-	}
-	InstLoc EmitFPMerge00(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPMerge00, op1, op2);
-	}
-	InstLoc EmitFPMerge01(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPMerge01, op1, op2);
-	}
-	InstLoc EmitFPMerge10(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPMerge10, op1, op2);
-	}
-	InstLoc EmitFPMerge11(InstLoc op1, InstLoc op2) {
-		return FoldBiOp(FPMerge11, op1, op2);
-	}
-	InstLoc EmitFPDup0(InstLoc op1) {
-		return FoldUOp(FPDup0, op1);
-	}
-	InstLoc EmitFPDup1(InstLoc op1) {
-		return FoldUOp(FPDup1, op1);
-	}
-	InstLoc EmitFPNeg(InstLoc op1) {
-		return FoldUOp(FPNeg, op1);
-	}
-	InstLoc EmitDoubleToSingle(InstLoc op1) {
-		return FoldUOp(DoubleToSingle, op1);
-	}
-	InstLoc EmitFDCmpCR(InstLoc op1, InstLoc op2, int ordered) {
-		return FoldBiOp(FDCmpCR, op1, op2, ordered);
-	}
-	InstLoc EmitLoadGQR(unsigned gqr) {
-		return FoldZeroOp(LoadGQR, gqr);
-	}
-	InstLoc EmitStoreGQR(InstLoc op1, unsigned gqr) {
-		return FoldUOp(StoreGQR, op1, gqr);
-	}
-	InstLoc EmitStoreSRR(InstLoc op1, unsigned srr) {
-		return FoldUOp(StoreSRR, op1, srr);
-	}
-	InstLoc EmitINT3()
-	{
-		return FoldZeroOp(Int3, 0);
-	}
-
-	void StartBackPass() { curReadPtr = &InstList[InstList.size()]; }
-	void StartForwardPass() { curReadPtr = &InstList[0]; }
-	InstLoc ReadForward() { return curReadPtr++; }
-	InstLoc ReadBackward() { return --curReadPtr; }
-	InstLoc getFirstInst() { return &InstList[0]; }
-	unsigned int getNumInsts() { return (unsigned int)InstList.size(); }
-	unsigned int ReadInst(InstLoc I) { return *I; }
-	unsigned int GetImmValue(InstLoc I) const;
-	void SetMarkUsed(InstLoc I);
-	bool IsMarkUsed(InstLoc I) const;
-	void WriteToFile(u64 codeHash);
-
-	void Reset() {
-		InstList.clear();
-		InstList.reserve(100000);
-		MarkUsed.clear();
-		MarkUsed.reserve(100000);
-		for (unsigned i = 0; i < 32; i++) {
-			GRegCache[i] = 0;
-			GRegCacheStore[i] = 0;
-			FRegCache[i] = 0;
-			FRegCacheStore[i] = 0;
-		}
-		CarryCache = 0;
-		CarryCacheStore = 0;
-		for (unsigned i = 0; i < 8; i++) {
-			CRCache[i] = 0;
-			CRCacheStore[i] = 0;
-		}
-		CTRCache = 0;
-		CTRCacheStore = 0;
-	}
-
-	IRBuilder() { Reset(); }
-
-private:
-	IRBuilder(IRBuilder&); // DO NOT IMPLEMENT
-	unsigned isSameValue(InstLoc Op1, InstLoc Op2) const;
-	unsigned getComplexity(InstLoc I) const;
-	unsigned getNumberOfOperands(InstLoc I) const;
-	void simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2);
-	bool maskedValueIsZero(InstLoc Op1, InstLoc Op2) const;
-	InstLoc isNeg(InstLoc I) const;
-
-	std::vector<Inst> InstList; // FIXME: We must ensure this is continuous!
-	std::vector<bool> MarkUsed;	// Used for IRWriter
-	std::vector<unsigned> ConstList;
-	InstLoc curReadPtr;
-	InstLoc GRegCache[32];
-	InstLoc GRegCacheStore[32];
-	InstLoc FRegCache[32];
-	InstLoc FRegCacheStore[32];
-	InstLoc CarryCache;
-	InstLoc CarryCacheStore;
-	InstLoc CTRCache;
-	InstLoc CTRCacheStore;
-	InstLoc CRCache[8];
-	InstLoc CRCacheStore[8];
-};
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
deleted file mode 100644
index 78bf1db57c..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
+++ /dev/null
@@ -1,2005 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-/*
-For a more general explanation of the IR, see IR.cpp.
-
-X86 codegen is a backward pass followed by a forward pass.
-
-The first pass to actually doing codegen is a liveness analysis pass.
-Liveness is important for two reasons: one, it lets us do dead code
-elimination, which results both from earlier folding, PPC
-instructions with unused parts like srawx, and just random strangeness.
-The other bit is that is allows us to identify the last instruction to
-use a value: this is absolutely essential for register allocation
-because it the allocator needs to be able to free unused registers.
-In addition, this allows eliminating redundant mov instructions in a lot
-of cases.
-
-The register allocation is linear scan allocation.
-*/
-
-#ifdef _MSC_VER
-#pragma warning(disable:4146)   // unary minus operator applied to unsigned type, result still unsigned
-#endif
-
-#include "IR.h"
-#include "../PPCTables.h"
-#include "../../CoreTiming.h"
-#include "Thunk.h"
-#include "../../HW/Memmap.h"
-#include "JitILAsm.h"
-#include "JitIL.h"
-#include "../../HW/GPFifo.h"
-#include "../../ConfigManager.h"
-#include "x64Emitter.h"
-#include "../../../../Common/Src/CPUDetect.h"
-#include "MathUtil.h"
-#include "../../Core.h"
-#include "HW/ProcessorInterface.h"
-
-static ThunkManager thunks;
-
-using namespace IREmitter;
-using namespace Gen;
-
-static const unsigned int MAX_NUMBER_OF_REGS = 16;
-
-struct RegInfo {
-	JitIL *Jit;
-	IRBuilder* Build;
-	InstLoc FirstI;
-	std::vector<unsigned> IInfo;
-	std::vector<InstLoc> lastUsed;
-	InstLoc regs[MAX_NUMBER_OF_REGS];
-	InstLoc fregs[MAX_NUMBER_OF_REGS];
-	unsigned numSpills;
-	unsigned numFSpills;
-	bool MakeProfile;
-	bool UseProfile;
-	unsigned numProfiledLoads;
-	unsigned exitNumber;
-
-	RegInfo(JitIL* j, InstLoc f, unsigned insts) : Jit(j), FirstI(f), IInfo(insts), lastUsed(insts) {
-		for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++) {
-			regs[i] = 0;
-			fregs[i] = 0;
-		}
-		numSpills = 0;
-		numFSpills = 0;
-		numProfiledLoads = 0;
-		exitNumber = 0;
-		MakeProfile = UseProfile = false;
-	}
-
-	private:
-		RegInfo(RegInfo&); // DO NOT IMPLEMENT
-};
-
-static void regMarkUse(RegInfo& R, InstLoc I, InstLoc Op, unsigned OpNum) {
-	unsigned& info = R.IInfo[Op - R.FirstI];
-	if (info == 0) R.IInfo[I - R.FirstI] |= 1 << (OpNum + 1);
-	if (info < 2) info++;
-	R.lastUsed[Op - R.FirstI] = max(R.lastUsed[Op - R.FirstI], I);
-}
-
-static unsigned regReadUse(RegInfo& R, InstLoc I) {
-	return R.IInfo[I - R.FirstI] & 3;
-}
-
-static unsigned SlotSet[1000];
-static unsigned ProfiledLoads[1000];
-static u8 GC_ALIGNED16(FSlotSet[16*1000]);
-
-static OpArg regLocForSlot(RegInfo& RI, unsigned slot) {
-	return M(&SlotSet[slot - 1]);
-}
-
-static unsigned regCreateSpill(RegInfo& RI, InstLoc I) {
-	unsigned newSpill = ++RI.numSpills;
-	RI.IInfo[I - RI.FirstI] |= newSpill << 16;
-	return newSpill;
-}
-
-static unsigned regGetSpill(RegInfo& RI, InstLoc I) {
-	return RI.IInfo[I - RI.FirstI] >> 16;
-}
-
-static void regSpill(RegInfo& RI, X64Reg reg) {
-	if (!RI.regs[reg]) return;
-	unsigned slot = regGetSpill(RI, RI.regs[reg]);
-	if (!slot) {
-		slot = regCreateSpill(RI, RI.regs[reg]);
-		RI.Jit->MOV(32, regLocForSlot(RI, slot), R(reg));
-	}
-	RI.regs[reg] = 0;
-}
-
-static OpArg fregLocForSlot(RegInfo& RI, unsigned slot) {
-	return M(&FSlotSet[slot*16]);
-}
-
-static unsigned fregCreateSpill(RegInfo& RI, InstLoc I) {
-	unsigned newSpill = ++RI.numFSpills;
-	RI.IInfo[I - RI.FirstI] |= newSpill << 16;
-	return newSpill;
-}
-
-static unsigned fregGetSpill(RegInfo& RI, InstLoc I) {
-	return RI.IInfo[I - RI.FirstI] >> 16;
-}
-
-static void fregSpill(RegInfo& RI, X64Reg reg) {
-	if (!RI.fregs[reg]) return;
-	unsigned slot = fregGetSpill(RI, RI.fregs[reg]);
-	if (!slot) {
-		slot = fregCreateSpill(RI, RI.fregs[reg]);
-		RI.Jit->MOVAPD(fregLocForSlot(RI, slot), reg);
-	}
-	RI.fregs[reg] = 0;
-}
-
-// ECX is scratch, so we don't allocate it
-#ifdef _M_X64
-
-// 64-bit - calling conventions differ between linux & windows, so...
-#ifdef _WIN32
-static const X64Reg RegAllocOrder[] = {RSI, RDI, R12, R13, R14, R8, R9, R10, R11};
-#else
-static const X64Reg RegAllocOrder[] = {RBP, R12, R13, R14, R8, R9, R10, R11};
-#endif
-static const int RegAllocSize = sizeof(RegAllocOrder) / sizeof(X64Reg);
-static const X64Reg FRegAllocOrder[] = {XMM6, XMM7, XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, XMM2, XMM3, XMM4, XMM5};
-static const int FRegAllocSize = sizeof(FRegAllocOrder) / sizeof(X64Reg);
-
-#else
-
-// 32-bit
-static const X64Reg RegAllocOrder[] = {EDI, ESI, EBP, EBX, EDX, EAX};
-static const int RegAllocSize = sizeof(RegAllocOrder) / sizeof(X64Reg);
-static const X64Reg FRegAllocOrder[] = {XMM2, XMM3, XMM4, XMM5, XMM6, XMM7};
-static const int FRegAllocSize = sizeof(FRegAllocOrder) / sizeof(X64Reg);
-
-#endif
-
-static X64Reg regFindFreeReg(RegInfo& RI) {
-	for (int i = 0; i < RegAllocSize; i++)
-		if (RI.regs[RegAllocOrder[i]] == 0)
-			return RegAllocOrder[i];
-
-	int bestIndex = -1;
-	InstLoc bestEnd = 0;
-	for (int i = 0; i < RegAllocSize; ++i) {
-		const InstLoc start = RI.regs[RegAllocOrder[i]];
-		const InstLoc end = RI.lastUsed[start - RI.FirstI];
-		if (bestEnd < end) {
-			bestEnd = end;
-			bestIndex = i;
-		}
-	}
-
-	X64Reg reg = RegAllocOrder[bestIndex];
-	regSpill(RI, reg);
-	return reg;
-}
-
-static X64Reg fregFindFreeReg(RegInfo& RI) {
-	for (int i = 0; i < FRegAllocSize; i++)
-		if (RI.fregs[FRegAllocOrder[i]] == 0)
-			return FRegAllocOrder[i];
-
-	int bestIndex = -1;
-	InstLoc bestEnd = 0;
-	for (int i = 0; i < FRegAllocSize; ++i) {
-		const InstLoc start = RI.fregs[FRegAllocOrder[i]];
-		const InstLoc end = RI.lastUsed[start - RI.FirstI];
-		if (bestEnd < end) {
-			bestEnd = end;
-			bestIndex = i;
-		}
-	}
-
-	X64Reg reg = FRegAllocOrder[bestIndex];
-	fregSpill(RI, reg);
-	return reg;
-}
-
-static OpArg regLocForInst(RegInfo& RI, InstLoc I) {
-	for (int i = 0; i < RegAllocSize; i++)
-		if (RI.regs[RegAllocOrder[i]] == I)
-			return R(RegAllocOrder[i]);
-
-	if (regGetSpill(RI, I) == 0)
-		PanicAlert("Retrieving unknown spill slot?!");
-	return regLocForSlot(RI, regGetSpill(RI, I));
-}
-
-static OpArg fregLocForInst(RegInfo& RI, InstLoc I) {
-	for (int i = 0; i < FRegAllocSize; i++)
-		if (RI.fregs[FRegAllocOrder[i]] == I)
-			return R(FRegAllocOrder[i]);
-
-	if (fregGetSpill(RI, I) == 0)
-		PanicAlert("Retrieving unknown spill slot?!");
-	return fregLocForSlot(RI, fregGetSpill(RI, I));
-}
-
-static void regClearInst(RegInfo& RI, InstLoc I) {
-	for (int i = 0; i < RegAllocSize; i++)
-		if (RI.regs[RegAllocOrder[i]] == I)
-			RI.regs[RegAllocOrder[i]] = 0;
-}
-
-static void fregClearInst(RegInfo& RI, InstLoc I) {
-	for (int i = 0; i < FRegAllocSize; i++)
-		if (RI.fregs[FRegAllocOrder[i]] == I)
-			RI.fregs[FRegAllocOrder[i]] = 0;
-}
-
-static X64Reg regEnsureInReg(RegInfo& RI, InstLoc I) {
-	OpArg loc = regLocForInst(RI, I);
-	if (!loc.IsSimpleReg()) {
-		X64Reg newReg = regFindFreeReg(RI);
-		RI.Jit->MOV(32, R(newReg), loc);
-		loc = R(newReg);
-	}
-	return loc.GetSimpleReg();
-}
-
-static X64Reg fregEnsureInReg(RegInfo& RI, InstLoc I) {
-	OpArg loc = fregLocForInst(RI, I);
-	if (!loc.IsSimpleReg()) {
-		X64Reg newReg = fregFindFreeReg(RI);
-		RI.Jit->MOVAPD(newReg, loc);
-		loc = R(newReg);
-	}
-	return loc.GetSimpleReg();
-}
-
-static void regSpillCallerSaved(RegInfo& RI) {
-#ifdef _M_IX86
-	// 32-bit
-	regSpill(RI, EDX);
-	regSpill(RI, ECX);
-	regSpill(RI, EAX);
-#else
-	// 64-bit
-	regSpill(RI, RCX);
-	regSpill(RI, RDX);
-	regSpill(RI, RSI); 
-	regSpill(RI, RDI);
-	regSpill(RI, R8);
-	regSpill(RI, R9);
-	regSpill(RI, R10);
-	regSpill(RI, R11);
-#endif
-}
-
-static X64Reg regUReg(RegInfo& RI, InstLoc I) {
-	const OpArg loc = regLocForInst(RI, getOp1(I));
-	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg()) {
-		return loc.GetSimpleReg();
-	}
-	return regFindFreeReg(RI);
-}
-
-// Recycle the register if the lifetime of op1 register ends at I.
-static X64Reg fregURegWithoutMov(RegInfo& RI, InstLoc I) {
-	const OpArg loc = fregLocForInst(RI, getOp1(I));
-	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg()) {
-		return loc.GetSimpleReg();
-	}
-	return fregFindFreeReg(RI);
-}
-
-static X64Reg fregURegWithMov(RegInfo& RI, InstLoc I) {
-	const OpArg loc = fregLocForInst(RI, getOp1(I));
-	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg()) {
-		return loc.GetSimpleReg();
-	}
-	X64Reg reg = fregFindFreeReg(RI);
-	RI.Jit->MOVAPD(reg, loc);
-	return reg;
-}
-
-// Recycle the register if the lifetime of op1 register ends at I.
-static X64Reg fregBinLHSRegWithMov(RegInfo& RI, InstLoc I) {
-	const OpArg loc = fregLocForInst(RI, getOp1(I));
-	if ((RI.IInfo[I - RI.FirstI] & 4) && loc.IsSimpleReg()) {
-		return loc.GetSimpleReg();
-	}
-	X64Reg reg = fregFindFreeReg(RI);
-	RI.Jit->MOVAPD(reg, loc);
-	return reg;
-}
-
-// Recycle the register if the lifetime of op2 register ends at I.
-static X64Reg fregBinRHSRegWithMov(RegInfo& RI, InstLoc I) {
-	const OpArg loc = fregLocForInst(RI, getOp2(I));
-	if ((RI.IInfo[I - RI.FirstI] & 8) && loc.IsSimpleReg()) {
-		return loc.GetSimpleReg();
-	}
-	X64Reg reg = fregFindFreeReg(RI);
-	RI.Jit->MOVAPD(reg, loc);
-	return reg;
-}
-
-// If the lifetime of the register used by an operand ends at I,
-// return the register. Otherwise return a free register.
-static X64Reg regBinReg(RegInfo& RI, InstLoc I) {
-	// FIXME: When regLocForInst() is extracted as a local variable,
-	//        "Retrieving unknown spill slot?!" is shown.
-	if ((RI.IInfo[I - RI.FirstI] & 4) &&
-		regLocForInst(RI, getOp1(I)).IsSimpleReg()) {
-		return regLocForInst(RI, getOp1(I)).GetSimpleReg();
-	} else if ((RI.IInfo[I - RI.FirstI] & 8) &&
-		regLocForInst(RI, getOp2(I)).IsSimpleReg()) {
-		return regLocForInst(RI, getOp2(I)).GetSimpleReg();
-	}
-	return regFindFreeReg(RI);
-}
-
-static X64Reg regBinLHSReg(RegInfo& RI, InstLoc I) {
-	if (RI.IInfo[I - RI.FirstI] & 4) {
-		return regEnsureInReg(RI, getOp1(I));
-	}
-	X64Reg reg = regFindFreeReg(RI);
-	RI.Jit->MOV(32, R(reg), regLocForInst(RI, getOp1(I)));
-	return reg;
-}
-
-static void regNormalRegClear(RegInfo& RI, InstLoc I) {
-	if (RI.IInfo[I - RI.FirstI] & 4)
-		regClearInst(RI, getOp1(I));
-	if (RI.IInfo[I - RI.FirstI] & 8)
-		regClearInst(RI, getOp2(I));
-}
-
-static void fregNormalRegClear(RegInfo& RI, InstLoc I) {
-	if (RI.IInfo[I - RI.FirstI] & 4)
-		fregClearInst(RI, getOp1(I));
-	if (RI.IInfo[I - RI.FirstI] & 8)
-		fregClearInst(RI, getOp2(I));
-}
-
-static void regEmitBinInst(RegInfo& RI, InstLoc I,
-			   void (JitIL::*op)(int, const OpArg&,
-			                     const OpArg&),
-			   bool commutable = false) {
-	X64Reg reg;
-	bool commuted = false;
-	if (RI.IInfo[I - RI.FirstI] & 4) {
-		reg = regEnsureInReg(RI, getOp1(I));
-	} else if (commutable && (RI.IInfo[I - RI.FirstI] & 8)) {
-		reg = regEnsureInReg(RI, getOp2(I));
-		commuted = true;
-	} else {
-		reg = regFindFreeReg(RI);
-		RI.Jit->MOV(32, R(reg), regLocForInst(RI, getOp1(I)));
-	}
-	if (isImm(*getOp2(I))) {
-		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
-		if (RHS + 128 < 256) {
-			(RI.Jit->*op)(32, R(reg), Imm8(RHS));
-		} else {
-			(RI.Jit->*op)(32, R(reg), Imm32(RHS));
-		}
-	} else if (commuted) {
-		(RI.Jit->*op)(32, R(reg), regLocForInst(RI, getOp1(I)));
-	} else {
-		(RI.Jit->*op)(32, R(reg), regLocForInst(RI, getOp2(I)));
-	}
-	RI.regs[reg] = I;
-	regNormalRegClear(RI, I);
-}
-
-static void fregEmitBinInst(RegInfo& RI, InstLoc I,
-			    void (JitIL::*op)(X64Reg, OpArg)) {
-	X64Reg reg;
-	if (RI.IInfo[I - RI.FirstI] & 4) {
-		reg = fregEnsureInReg(RI, getOp1(I));
-	} else {
-		reg = fregFindFreeReg(RI);
-		RI.Jit->MOVAPD(reg, fregLocForInst(RI, getOp1(I)));
-	}
-	(RI.Jit->*op)(reg, fregLocForInst(RI, getOp2(I)));
-	RI.fregs[reg] = I;
-	fregNormalRegClear(RI, I);
-}
-
-// Mark and calculation routines for profiled load/store addresses
-// Could be extended to unprofiled addresses.
-static void regMarkMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, unsigned OpNum) {
-	if (isImm(*AI)) {
-		unsigned addr = RI.Build->GetImmValue(AI);	
-		if (Memory::IsRAMAddress(addr))
-			return;
-	}
-	if (getOpcode(*AI) == Add && isImm(*getOp2(AI))) {
-		regMarkUse(RI, I, getOp1(AI), OpNum);
-		return;
-	}
-	regMarkUse(RI, I, AI, OpNum);
-}
-
-static void regClearDeadMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, unsigned OpNum) {
-	if (!(RI.IInfo[I - RI.FirstI] & (2 << OpNum)))
-		return;
-	if (isImm(*AI)) {
-		unsigned addr = RI.Build->GetImmValue(AI);	
-		if (Memory::IsRAMAddress(addr)) {
-			return;
-		}
-	}
-	InstLoc AddrBase;
-	if (getOpcode(*AI) == Add && isImm(*getOp2(AI))) {
-		AddrBase = getOp1(AI);
-	} else {
-		AddrBase = AI;
-	}
-	regClearInst(RI, AddrBase);
-}
-
-// in 64-bit build, this returns a completely bizarre address sometimes!
-static OpArg regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI,
-				unsigned OpNum,	unsigned Size, X64Reg* dest,
-				bool Profiled,
-				unsigned ProfileOffset = 0) {
-	if (isImm(*AI)) {
-		unsigned addr = RI.Build->GetImmValue(AI);	
-		if (Memory::IsRAMAddress(addr)) {
-			if (dest)
-				*dest = regFindFreeReg(RI);
-#ifdef _M_IX86
-			// 32-bit
-			if (Profiled) 
-				return M((void*)((u8*)Memory::base + (addr & Memory::MEMVIEW32_MASK)));
-			return M((void*)addr);
-#else
-			// 64-bit
-			if (Profiled) {
-				RI.Jit->LEA(32, EAX, M((void*)(u64)addr));
-				return MComplex(RBX, EAX, SCALE_1, 0);
-			}
-			return M((void*)(u64)addr);
-#endif
-		}
-	}
-	unsigned offset;
-	InstLoc AddrBase;
-	if (getOpcode(*AI) == Add && isImm(*getOp2(AI))) {
-		offset = RI.Build->GetImmValue(getOp2(AI));
-		AddrBase = getOp1(AI);
-	} else {
-		offset = 0;
-		AddrBase = AI;
-	}
-	X64Reg baseReg;
-	// Ok, this stuff needs a comment or three :P -ector
-	if (RI.IInfo[I - RI.FirstI] & (2 << OpNum)) {
-		baseReg = regEnsureInReg(RI, AddrBase);
-		regClearInst(RI, AddrBase);
-		if (dest)
-			*dest = baseReg;
-	} else if (dest) {
-		X64Reg reg = regFindFreeReg(RI);
-		const OpArg loc = regLocForInst(RI, AddrBase);
-		if (!loc.IsSimpleReg()) {
-			RI.Jit->MOV(32, R(reg), loc);
-			baseReg = reg;
-		} else {
-			baseReg = loc.GetSimpleReg();
-		}
-		*dest = reg;
-	} else {
-		baseReg = regEnsureInReg(RI, AddrBase);
-	}
-
-	if (Profiled) {
-		// (Profiled mode isn't the default, at least for the moment)
-#ifdef _M_IX86
-		return MDisp(baseReg, (u32)Memory::base + offset + ProfileOffset);
-#else
-		RI.Jit->LEA(32, EAX, MDisp(baseReg, offset));
-		return MComplex(RBX, EAX, SCALE_1, 0);
-#endif
-	}
-	return MDisp(baseReg, offset);
-}
-
-static void regEmitMemLoad(RegInfo& RI, InstLoc I, unsigned Size) {
-	if (RI.UseProfile) {
-		unsigned curLoad = ProfiledLoads[RI.numProfiledLoads++];
-		if (!(curLoad & 0x0C000000)) {
-			X64Reg reg;
-			OpArg addr = regBuildMemAddress(RI, I, getOp1(I), 1,
-							Size, &reg, true,
-							-(curLoad & 0xC0000000));
-			RI.Jit->MOVZX(32, Size, reg, addr);
-			RI.Jit->BSWAP(Size, reg);
-			if (regReadUse(RI, I))
-				RI.regs[reg] = I;
-			return;
-		} 
-	}
-	X64Reg reg;
-	OpArg addr = regBuildMemAddress(RI, I, getOp1(I), 1, Size, &reg, false);
-	RI.Jit->LEA(32, ECX, addr);
-	if (RI.MakeProfile) {
-		RI.Jit->MOV(32, M(&ProfiledLoads[RI.numProfiledLoads++]), R(ECX));
-	}
-	u32 mem_mask = 0;
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU || SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack)
-		mem_mask = 0x20000000;
-
-	RI.Jit->TEST(32, R(ECX), Imm32(0x0C000000 | mem_mask));
-	FixupBranch argh = RI.Jit->J_CC(CC_Z);
-
-	// Slow safe read using Memory::Read_Ux routines
-#ifdef _M_IX86  // we don't allocate EAX on x64 so no reason to save it.
-	if (reg != EAX) {
-		RI.Jit->PUSH(32, R(EAX));
-	}
-#endif
-	switch (Size)
-	{
-	case 32: RI.Jit->ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U32, 1), ECX); break;
-	case 16: RI.Jit->ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U16_ZX, 1), ECX); break;
-	case 8:  RI.Jit->ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U8_ZX, 1), ECX);  break;
-	}
-	if (reg != EAX) {
-		RI.Jit->MOV(32, R(reg), R(EAX));
-#ifdef _M_IX86
-		RI.Jit->POP(32, R(EAX));
-#endif
-	}
-	FixupBranch arg2 = RI.Jit->J();
-	RI.Jit->SetJumpTarget(argh);
-	RI.Jit->UnsafeLoadRegToReg(ECX, reg, Size, 0, false);
-	RI.Jit->SetJumpTarget(arg2);
-	if (regReadUse(RI, I))
-		RI.regs[reg] = I;
-}
-
-static OpArg regSwappedImmForConst(RegInfo& RI, InstLoc I, unsigned Size) {
-	unsigned imm = RI.Build->GetImmValue(I);
-	if (Size == 32) {
-		imm = Common::swap32(imm);
-		return Imm32(imm);
-	} else if (Size == 16) {
-		imm = Common::swap16(imm);
-		return Imm16(imm);
-	} else {
-		return Imm8(imm);
-	}
-}
-
-static OpArg regImmForConst(RegInfo& RI, InstLoc I, unsigned Size) {
-	unsigned imm = RI.Build->GetImmValue(I);
-	if (Size == 32) {
-		return Imm32(imm);
-	} else if (Size == 16) {
-		return Imm16(imm);
-	} else {
-		return Imm8(imm);
-	}
-}
-
-static void regEmitMemStore(RegInfo& RI, InstLoc I, unsigned Size) {
-	if (RI.UseProfile) {
-		unsigned curStore = ProfiledLoads[RI.numProfiledLoads++];
-		if (!(curStore & 0x0C000000)) {
-			OpArg addr = regBuildMemAddress(RI, I, getOp2(I), 2,
-							Size, 0, true,
-							-(curStore & 0xC0000000));
-			if (isImm(*getOp1(I))) {
-				RI.Jit->MOV(Size, addr, regSwappedImmForConst(RI, getOp1(I), Size));
-			} else {
-				RI.Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-				RI.Jit->BSWAP(Size, ECX);
-				RI.Jit->MOV(Size, addr, R(ECX));
-			}
-			if (RI.IInfo[I - RI.FirstI] & 4)
-				regClearInst(RI, getOp1(I));
-			return;
-		} else if ((curStore & 0xFFFFF000) == 0xCC008000) {
-			regSpill(RI, EAX);
-			if (isImm(*getOp1(I))) {
-				RI.Jit->MOV(Size, R(ECX), regSwappedImmForConst(RI, getOp1(I), Size));
-			} else { 
-				RI.Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-				RI.Jit->BSWAP(Size, ECX);
-			}
-			RI.Jit->MOV(32, R(EAX), M(&GPFifo::m_gatherPipeCount));
-			RI.Jit->MOV(Size, MDisp(EAX, (u32)(u64)GPFifo::m_gatherPipe), R(ECX));
-			RI.Jit->ADD(32, R(EAX), Imm8(Size >> 3));
-			RI.Jit->MOV(32, M(&GPFifo::m_gatherPipeCount), R(EAX));
-			RI.Jit->js.fifoBytesThisBlock += Size >> 3;
-			if (RI.IInfo[I - RI.FirstI] & 4)
-				regClearInst(RI, getOp1(I));
-			regClearDeadMemAddress(RI, I, getOp2(I), 2);
-			return;
-		}
-	}
-	OpArg addr = regBuildMemAddress(RI, I, getOp2(I), 2, Size, 0, false);
-	RI.Jit->LEA(32, ECX, addr);
-	regSpill(RI, EAX);
-	if (isImm(*getOp1(I))) {
-		RI.Jit->MOV(Size, R(EAX), regImmForConst(RI, getOp1(I), Size));
-	} else {
-		RI.Jit->MOV(32, R(EAX), regLocForInst(RI, getOp1(I)));
-	}
-	if (RI.MakeProfile) {
-		RI.Jit->MOV(32, M(&ProfiledLoads[RI.numProfiledLoads++]), R(ECX));
-	}
-	RI.Jit->SafeWriteRegToReg(EAX, ECX, Size, 0);
-	if (RI.IInfo[I - RI.FirstI] & 4)
-		regClearInst(RI, getOp1(I));
-}
-
-static void regEmitShiftInst(RegInfo& RI, InstLoc I, void (JitIL::*op)(int, OpArg, OpArg))
-{
-	X64Reg reg = regBinLHSReg(RI, I);
-	if (isImm(*getOp2(I))) {
-		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
-		(RI.Jit->*op)(32, R(reg), Imm8(RHS));
-		RI.regs[reg] = I;
-		return;
-	}
-	RI.Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-	(RI.Jit->*op)(32, R(reg), R(ECX));
-	RI.regs[reg] = I;
-	regNormalRegClear(RI, I);
-}
-
-static void regStoreInstToConstLoc(RegInfo& RI, unsigned width, InstLoc I, void* loc) {
-	if (width != 32) {
-		PanicAlert("Not implemented!");
-		return;
-	}
-	if (isImm(*I)) {
-		RI.Jit->MOV(32, M(loc), Imm32(RI.Build->GetImmValue(I)));
-		return;
-	}
-	X64Reg reg = regEnsureInReg(RI, I);
-	RI.Jit->MOV(32, M(loc), R(reg));
-}
-
-static void regEmitCmp(RegInfo& RI, InstLoc I) {
-	if (isImm(*getOp2(I))) {
-		unsigned RHS = RI.Build->GetImmValue(getOp2(I));
-		RI.Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm32(RHS));
-	} else {
-		X64Reg reg = regEnsureInReg(RI, getOp1(I));
-		RI.Jit->CMP(32, R(reg), regLocForInst(RI, getOp2(I)));
-	}
-}
-
-static void regEmitICmpInst(RegInfo& RI, InstLoc I, CCFlags flag) {
-	regEmitCmp(RI, I);
-	RI.Jit->SETcc(flag, R(ECX)); // Caution: SETCC uses 8-bit regs!
-	X64Reg reg = regBinReg(RI, I);
-	RI.Jit->MOVZX(32, 8, reg, R(ECX));
-	RI.regs[reg] = I;
-	regNormalRegClear(RI, I);
-}
-
-static void regWriteExit(RegInfo& RI, InstLoc dest) {
-	if (RI.MakeProfile) {
-		if (isImm(*dest)) {
-			RI.Jit->MOV(32, M(&PC), Imm32(RI.Build->GetImmValue(dest)));
-		} else {
-			RI.Jit->MOV(32, R(EAX), regLocForInst(RI, dest));
-			RI.Jit->MOV(32, M(&PC), R(EAX));
-		}
-		RI.Jit->Cleanup();
-		RI.Jit->SUB(32, M(&CoreTiming::downcount), Imm32(RI.Jit->js.downcountAmount));
-		RI.Jit->JMP(((JitIL *)jit)->asm_routines.doReJit, true);
-		return;
-	}
-	if (isImm(*dest)) {
-		RI.Jit->WriteExit(RI.Build->GetImmValue(dest), RI.exitNumber++);
-	} else {
-		RI.Jit->WriteExitDestInOpArg(regLocForInst(RI, dest));
-	}
-}
-
-// Helper function to check floating point exceptions
-static double GC_ALIGNED16(isSNANTemp[2][2]);
-static bool checkIsSNAN() {
-	return MathUtil::IsSNAN(isSNANTemp[0][0]) || MathUtil::IsSNAN(isSNANTemp[1][0]);
-}
-
-static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool MakeProfile) {
-	//printf("Writing block: %x\n", js.blockStart);
-	RegInfo RI(Jit, ibuild->getFirstInst(), ibuild->getNumInsts());
-	RI.Build = ibuild;
-	RI.UseProfile = UseProfile;
-	RI.MakeProfile = MakeProfile;
-	// Pass to compute liveness
-	ibuild->StartBackPass();
-	for (unsigned int index = (unsigned int)RI.IInfo.size() - 1; index != -1U; --index) {
-		InstLoc I = ibuild->ReadBackward();
-		unsigned int op = getOpcode(*I);
-		bool thisUsed = regReadUse(RI, I) ? true : false;
-		switch (op) {
-		default:
-			PanicAlert("Unexpected inst!");
-		case Nop:
-		case CInt16:
-		case CInt32:
-		case LoadGReg:
-		case LoadLink:
-		case LoadCR:
-		case LoadCarry:
-		case LoadCTR:
-		case LoadMSR:
-		case LoadFReg:
-		case LoadFRegDENToZero:
-		case LoadGQR:
-		case BlockEnd:
-		case BlockStart:
-		case InterpreterFallback:
-		case SystemCall:
-		case RFIExit:
-		case InterpreterBranch:		
-		case ShortIdleLoop:
-		case FPExceptionCheck:
-		case DSIExceptionCheck:
-		case ISIException:
-		case ExtExceptionCheck:
-		case BreakPointCheck:
-		case Int3:
-		case Tramp:
-			// No liveness effects
-			break;
-		case SExt8:
-		case SExt16:
-		case BSwap32:
-		case BSwap16:
-		case Cntlzw:
-		case Not:
-		case DupSingleToMReg:
-		case DoubleToSingle:
-		case ExpandPackedToMReg:
-		case CompactMRegToPacked:
-		case FPNeg:
-		case FPDup0:
-		case FPDup1:
-		case FSNeg:
-		case FDNeg:
-			if (thisUsed)
-				regMarkUse(RI, I, getOp1(I), 1);
-			break;
-		case Load8:
-		case Load16:
-		case Load32:
-			regMarkMemAddress(RI, I, getOp1(I), 1);
-			break;
-		case LoadDouble:
-		case LoadSingle:
-		case LoadPaired:
-			if (thisUsed)
-				regMarkUse(RI, I, getOp1(I), 1);
-			break;
-		case StoreCR:
-		case StoreCarry:
-		case StoreFPRF:
-			regMarkUse(RI, I, getOp1(I), 1);
-			break;
-		case StoreGReg:
-		case StoreLink:
-		case StoreCTR:
-		case StoreMSR:
-		case StoreGQR:
-		case StoreSRR:
-		case StoreFReg:
-			if (!isImm(*getOp1(I)))
-				regMarkUse(RI, I, getOp1(I), 1);
-			break;
-		case Add:
-		case Sub:
-		case And:
-		case Or:
-		case Xor:
-		case Mul:
-		case MulHighUnsigned:
-		case Rol:
-		case Shl:
-		case Shrl:
-		case Sarl:
-		case ICmpCRUnsigned:
-		case ICmpCRSigned:
-		case ICmpEq:
-		case ICmpNe:
-		case ICmpUgt:
-		case ICmpUlt:
-		case ICmpUge:
-		case ICmpUle:
-		case ICmpSgt:
-		case ICmpSlt:
-		case ICmpSge:
-		case ICmpSle:
-		case FSMul:
-		case FSAdd:
-		case FSSub:
-		case FSRSqrt:
-		case FDMul:
-		case FDAdd:
-		case FDSub:
-		case FPAdd:
-		case FPMul:
-		case FPSub:
-		case FPMerge00:
-		case FPMerge01:
-		case FPMerge10:
-		case FPMerge11:
-		case FDCmpCR:
-		case InsertDoubleInMReg:
-			if (thisUsed) {
-				regMarkUse(RI, I, getOp1(I), 1);
-				if (!isImm(*getOp2(I)))
-					regMarkUse(RI, I, getOp2(I), 2);
-			}
-			break;
-		case Store8:
-		case Store16:
-		case Store32:
-			if (!isImm(*getOp1(I)))
-				regMarkUse(RI, I, getOp1(I), 1);
-			regMarkMemAddress(RI, I, getOp2(I), 2);
-			break;
-		case StoreSingle:
-		case StoreDouble:
-		case StorePaired:
-			regMarkUse(RI, I, getOp1(I), 1);
-			regMarkUse(RI, I, getOp2(I), 2);
-			break;
-		case BranchUncond:
-			if (!isImm(*getOp1(I)))
-				regMarkUse(RI, I, getOp1(I), 1);
-			break;
-		case IdleBranch:
-			regMarkUse(RI, I, getOp1(getOp1(I)), 1);
-			break;						 
-		case BranchCond: {
-			if (isICmp(*getOp1(I)) &&
-			    isImm(*getOp2(getOp1(I)))) {
-				regMarkUse(RI, I, getOp1(getOp1(I)), 1);
-			} else {
-				regMarkUse(RI, I, getOp1(I), 1);
-			}
-			if (!isImm(*getOp2(I)))
-				regMarkUse(RI, I, getOp2(I), 2);
-			break;
-		}
-		}
-	}
-
-	ibuild->StartForwardPass();
-	for (unsigned i = 0; i != RI.IInfo.size(); i++) {
-		InstLoc I = ibuild->ReadForward();
-		bool thisUsed = regReadUse(RI, I) ? true : false;
-		if (thisUsed) {
-			// Needed for IR Writer
-			ibuild->SetMarkUsed(I);
-		}
-
-		switch (getOpcode(*I)) {
-		case InterpreterFallback: {
-			unsigned InstCode = ibuild->GetImmValue(getOp1(I));
-			unsigned InstLoc = ibuild->GetImmValue(getOp2(I));
-			// There really shouldn't be anything live across an
-			// interpreter call at the moment, but optimizing interpreter
-			// calls isn't completely out of the question...
-			regSpillCallerSaved(RI);
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->MOV(32, M(&NPC), Imm32(InstLoc+4));
-			Jit->ABI_CallFunctionC((void*)GetInterpreterOp(InstCode),
-					       InstCode);
-			break;
-		}
-		case LoadGReg: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			unsigned ppcreg = *I >> 8;
-			Jit->MOV(32, R(reg), M(&PowerPC::ppcState.gpr[ppcreg]));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadCR: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			unsigned ppcreg = *I >> 8;
-			Jit->MOVZX(32, 8, reg, M(&PowerPC::ppcState.cr_fast[ppcreg]));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadCTR: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			Jit->MOV(32, R(reg), M(&CTR));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadLink: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			Jit->MOV(32, R(reg), M(&LR));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadMSR: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			Jit->MOV(32, R(reg), M(&MSR));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadGQR: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			unsigned gqr = *I >> 8;
-			Jit->MOV(32, R(reg), M(&GQR(gqr)));
-			RI.regs[reg] = I;
-			break;
-		}
-		case LoadCarry: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			Jit->MOV(32, R(reg), M(&PowerPC::ppcState.spr[SPR_XER]));
-			Jit->SHR(32, R(reg), Imm8(29));
-			Jit->AND(32, R(reg), Imm8(1));
-			RI.regs[reg] = I;
-			break;
-		}
-		case StoreGReg: {
-			unsigned ppcreg = *I >> 16;
-			regStoreInstToConstLoc(RI, 32, getOp1(I),
-					       &PowerPC::ppcState.gpr[ppcreg]);
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreCR: {
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-			unsigned ppcreg = *I >> 16;
-			// CAUTION: uses 8-bit reg!
-			Jit->MOV(8, M(&PowerPC::ppcState.cr_fast[ppcreg]), R(ECX));
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreLink: {
-			regStoreInstToConstLoc(RI, 32, getOp1(I), &LR);
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreCTR: {
-			regStoreInstToConstLoc(RI, 32, getOp1(I), &CTR);
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreMSR: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp2(I));
-			regStoreInstToConstLoc(RI, 32, getOp1(I), &MSR);
-			regNormalRegClear(RI, I);
-
-			// If some exceptions are pending and EE are now enabled, force checking
-			// external exceptions when going out of mtmsr in order to execute delayed
-			// interrupts as soon as possible.
-			Jit->MOV(32, R(EAX), M(&MSR));
-			Jit->TEST(32, R(EAX), Imm32(0x8000));
-			FixupBranch eeDisabled = Jit->J_CC(CC_Z);
-
-			Jit->MOV(32, R(EAX), M((void*)&PowerPC::ppcState.Exceptions));
-			Jit->TEST(32, R(EAX), R(EAX));
-			FixupBranch noExceptionsPending = Jit->J_CC(CC_Z);
-
-			Jit->MOV(32, M(&PC), Imm32(InstLoc + 4));
-			Jit->WriteExceptionExit(); // TODO: Implement WriteExternalExceptionExit for JitIL
-
-			Jit->SetJumpTarget(eeDisabled);
-			Jit->SetJumpTarget(noExceptionsPending);
-			break;
-		}
-		case StoreGQR: {
-			unsigned gqr = *I >> 16;
-			regStoreInstToConstLoc(RI, 32, getOp1(I), &GQR(gqr));
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreSRR: {
-			unsigned srr = *I >> 16;
-			regStoreInstToConstLoc(RI, 32, getOp1(I),
-					&PowerPC::ppcState.spr[SPR_SRR0+srr]);
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreCarry: {
-			Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm8(0));
-			FixupBranch nocarry = Jit->J_CC(CC_Z);
-			Jit->JitSetCA();
-			FixupBranch cont = Jit->J();
-			Jit->SetJumpTarget(nocarry);
-			Jit->JitClearCA();
-			Jit->SetJumpTarget(cont);
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreFPRF: {
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-			Jit->AND(32, R(ECX), Imm8(0x1F));
-			Jit->SHL(32, R(ECX), Imm8(12));
-			Jit->AND(32, M(&FPSCR), Imm32(~(0x1F << 12)));
-			Jit->OR(32, M(&FPSCR), R(ECX));
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case Load8: {
-			regEmitMemLoad(RI, I, 8);
-			break;
-		}
-		case Load16: {
-			regEmitMemLoad(RI, I, 16);
-			break;
-		}
-		case Load32: {
-			regEmitMemLoad(RI, I, 32);
-			break;
-		}
-		case Store8: {
-			regEmitMemStore(RI, I, 8);
-			break;
-		}
-		case Store16: {
-			regEmitMemStore(RI, I, 16);
-			break;
-		}
-		case Store32: {
-			regEmitMemStore(RI, I, 32);
-			break;
-		}
-		case SExt8: {
-			if (!thisUsed) break;
-			X64Reg reg = regUReg(RI, I);
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-			Jit->MOVSX(32, 8, reg, R(ECX));
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case SExt16: {
-			if (!thisUsed) break;
-			X64Reg reg = regUReg(RI, I);
-			Jit->MOVSX(32, 16, reg, regLocForInst(RI, getOp1(I)));
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case Cntlzw: {
-			if (!thisUsed) break;
-			X64Reg reg = regUReg(RI, I);
-			Jit->MOV(32, R(ECX), Imm32(63));
-			Jit->BSR(32, reg, regLocForInst(RI, getOp1(I)));
-			Jit->CMOVcc(32, reg, R(ECX), CC_Z);
-			Jit->XOR(32, R(reg), Imm8(31));
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case Not: {
-			if (!thisUsed) break;
-			X64Reg reg = regBinLHSReg(RI, I);
-			Jit->NOT(32, R(reg));
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case And: {
-			if (!thisUsed) break;
-			regEmitBinInst(RI, I, &JitIL::AND, true);
-			break;
-		}
-		case Xor: {
-			if (!thisUsed) break;
-			regEmitBinInst(RI, I, &JitIL::XOR, true);
-			break;
-		}
-		case Sub: {
-			if (!thisUsed) break;
-			regEmitBinInst(RI, I, &JitIL::SUB);
-			break;
-		}
-		case Or: {
-			if (!thisUsed) break;
-			regEmitBinInst(RI, I, &JitIL::OR, true);
-			break;
-		}
-		case Add: {
-			if (!thisUsed) break;
-			regEmitBinInst(RI, I, &JitIL::ADD, true);
-			break;
-		}
-		case Mul: {
-			if (!thisUsed) break;
-			// FIXME: Use three-address capability of IMUL!
-			X64Reg reg = regBinLHSReg(RI, I);
-			if (isImm(*getOp2(I))) {
-				unsigned RHS = RI.Build->GetImmValue(getOp2(I));
-				if (RHS + 128 < 256) {
-					Jit->IMUL(32, reg, Imm8(RHS));
-				} else {
-					Jit->IMUL(32, reg, Imm32(RHS));
-				}
-			} else {
-				Jit->IMUL(32, reg, regLocForInst(RI, getOp2(I)));
-			}
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case MulHighUnsigned: {
-			if (!thisUsed) break;
-			regSpill(RI, EAX);
-			regSpill(RI, EDX);
-			X64Reg reg = regBinReg(RI, I);
-			if (isImm(*getOp2(I))) {
-				unsigned RHS = RI.Build->GetImmValue(getOp2(I));
-				Jit->MOV(32, R(EAX), Imm32(RHS));
-			} else {
-				Jit->MOV(32, R(EAX), regLocForInst(RI, getOp2(I)));
-			}
-			Jit->MUL(32, regLocForInst(RI, getOp1(I)));
-			Jit->MOV(32, R(reg), R(EDX));
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case Rol: {
-			if (!thisUsed) break;
-			regEmitShiftInst(RI, I, &JitIL::ROL);
-			break;
-		}
-		case Shl: {
-			if (!thisUsed) break;
-			regEmitShiftInst(RI, I, &JitIL::SHL);
-			break;
-		}
-		case Shrl: {
-			if (!thisUsed) break;
-			regEmitShiftInst(RI, I, &JitIL::SHR);
-			break;
-		}
-		case Sarl: {
-			if (!thisUsed) break;
-			regEmitShiftInst(RI, I, &JitIL::SAR);
-			break;
-		}
-		case ICmpEq: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_E);
-			break;
-		}
-		case ICmpNe: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_NE);
-			break;
-		}
-		case ICmpUgt: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_A);
-			break;
-		}
-		case ICmpUlt: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_B);
-			break;
-		}
-		case ICmpUge: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_AE);
-			break;
-		}
-		case ICmpUle: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_BE);
-			break;
-		}
-		case ICmpSgt: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_G);
-			break;
-		}
-		case ICmpSlt: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_L);
-			break;
-		}
-		case ICmpSge: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_GE);
-			break;
-		}
-		case ICmpSle: {
-			if (!thisUsed) break;
-			regEmitICmpInst(RI, I, CC_LE);
-			break;
-		}
-		case ICmpCRUnsigned: {
-			if (!thisUsed) break;
-			regEmitCmp(RI, I);
-			X64Reg reg = regBinReg(RI, I);
-			FixupBranch pLesser  = Jit->J_CC(CC_B);
-			FixupBranch pGreater = Jit->J_CC(CC_A);
-			Jit->MOV(32, R(reg), Imm32(0x2)); // _x86Reg == 0
-			FixupBranch continue1 = Jit->J();
-			Jit->SetJumpTarget(pGreater);
-			Jit->MOV(32, R(reg), Imm32(0x4)); // _x86Reg > 0
-			FixupBranch continue2 = Jit->J();
-			Jit->SetJumpTarget(pLesser);
-			Jit->MOV(32, R(reg), Imm32(0x8)); // _x86Reg < 0
-			Jit->SetJumpTarget(continue1);
-			Jit->SetJumpTarget(continue2);
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case ICmpCRSigned: {
-			if (!thisUsed) break;
-			regEmitCmp(RI, I);
-			X64Reg reg = regBinReg(RI, I);
-			FixupBranch pLesser  = Jit->J_CC(CC_L);
-			FixupBranch pGreater = Jit->J_CC(CC_G);
-			Jit->MOV(32, R(reg), Imm32(0x2)); // _x86Reg == 0
-			FixupBranch continue1 = Jit->J();
-			Jit->SetJumpTarget(pGreater);
-			Jit->MOV(32, R(reg), Imm32(0x4)); // _x86Reg > 0
-			FixupBranch continue2 = Jit->J();
-			Jit->SetJumpTarget(pLesser);
-			Jit->MOV(32, R(reg), Imm32(0x8)); // _x86Reg < 0
-			Jit->SetJumpTarget(continue1);
-			Jit->SetJumpTarget(continue2);
-			RI.regs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case LoadSingle: {
-			if (!thisUsed) break;
-			X64Reg reg = fregFindFreeReg(RI);
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-			RI.Jit->UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-			Jit->MOVD_xmm(reg, R(ECX));
-			RI.fregs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case LoadDouble: {
-			if (!thisUsed) break;
-			X64Reg reg = fregFindFreeReg(RI);
-			if (cpu_info.bSSSE3) {
-				static const u32 GC_ALIGNED16(maskSwapa64_1[4]) = 
-				{0x04050607L, 0x00010203L, 0xFFFFFFFFL, 0xFFFFFFFFL};
-#ifdef _M_X64
-				// TODO: Remove regEnsureInReg() and use ECX
-				X64Reg address = regEnsureInReg(RI, getOp1(I));
-				Jit->MOVQ_xmm(reg, MComplex(RBX, address, SCALE_1, 0));
-#else
-				X64Reg address = regBinLHSReg(RI, I);
-				Jit->AND(32, R(address), Imm32(Memory::MEMVIEW32_MASK));
-				Jit->MOVQ_xmm(reg, MDisp(address, (u32)Memory::base));
-#endif
-				Jit->PSHUFB(reg, M((void*)maskSwapa64_1));
-			} else {
-				const OpArg loc = regLocForInst(RI, getOp1(I));
-				Jit->MOV(32, R(ECX), loc);
-				Jit->ADD(32, R(ECX), Imm8(4));
-				RI.Jit->UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-				Jit->MOVD_xmm(reg, R(ECX));
-				Jit->MOV(32, R(ECX), loc);
-				RI.Jit->UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-				Jit->MOVD_xmm(XMM0, R(ECX));
-				Jit->PUNPCKLDQ(reg, R(XMM0));
-			}
-			RI.fregs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case LoadPaired: {
-			if (!thisUsed) break;
-			regSpill(RI, EAX);
-			regSpill(RI, EDX);
-			X64Reg reg = fregFindFreeReg(RI);
-			// The lower 3 bits is for GQR index. The next 1 bit is for inst.W
-			unsigned int quantreg = (*I >> 16) & 0x7;
-			unsigned int w = *I >> 19;
-			Jit->MOVZX(32, 16, EAX, M(((char *)&GQR(quantreg)) + 2));
-			Jit->MOVZX(32, 8, EDX, R(AL));
-			Jit->OR(32, R(EDX), Imm8(w << 3));
-#ifdef _M_IX86
-			int addr_scale = SCALE_4;
-#else
-			int addr_scale = SCALE_8;
-#endif
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp1(I)));
-			Jit->ABI_AlignStack(0);
-			Jit->CALLptr(MScaled(EDX, addr_scale, (u32)(u64)(((JitIL *)jit)->asm_routines.pairedLoadQuantized)));
-			Jit->ABI_RestoreStack(0);
-			Jit->MOVAPD(reg, R(XMM0));
-			RI.fregs[reg] = I;
-			regNormalRegClear(RI, I);
-			break;
-		}
-		case StoreSingle: {
-			regSpill(RI, EAX);
-			const OpArg loc1 = fregLocForInst(RI, getOp1(I));
-			if (loc1.IsSimpleReg()) {
-				Jit->MOVD_xmm(R(EAX), loc1.GetSimpleReg());
-			} else {
-				Jit->MOV(32, R(EAX), loc1);
-			}
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-			RI.Jit->SafeWriteRegToReg(EAX, ECX, 32, 0);
-			if (RI.IInfo[I - RI.FirstI] & 4)
-				fregClearInst(RI, getOp1(I));
-			if (RI.IInfo[I - RI.FirstI] & 8)
-				regClearInst(RI, getOp2(I));
-			break;
-		}
-		case StoreDouble: {
-			regSpill(RI, EAX);
-			// Please fix the following code
-			// if SafeWriteRegToReg() is modified.
-			u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
-			if (Core::g_CoreStartupParameter.bMMU ||
-				Core::g_CoreStartupParameter.iTLBHack) {
-				mem_mask |= Memory::ADDR_MASK_MEM1;
-			}
-#ifdef ENABLE_MEM_CHECK
-			if (Core::g_CoreStartupParameter.bEnableDebugging)
-			{
-				mem_mask |= Memory::EXRAM_MASK;
-			}
-#endif
-			Jit->TEST(32, regLocForInst(RI, getOp2(I)), Imm32(mem_mask));
-			FixupBranch safe = Jit->J_CC(CC_NZ);
-				// Fast routine
-				if (cpu_info.bSSSE3) {
-					static const u32 GC_ALIGNED16(maskSwapa64_1[4]) = 
-					{0x04050607L, 0x00010203L, 0xFFFFFFFFL, 0xFFFFFFFFL};
-
-					X64Reg value = fregBinLHSRegWithMov(RI, I);
-					Jit->PSHUFB(value, M((void*)maskSwapa64_1));
-					Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-#ifdef _M_X64
-					Jit->MOVQ_xmm(MComplex(RBX, ECX, SCALE_1, 0), value);
-#else
-					Jit->AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-					Jit->MOVQ_xmm(MDisp(ECX, (u32)Memory::base), value);
-#endif
-				} else {
-					regSpill(RI, EAX);
-					OpArg loc = fregLocForInst(RI, getOp1(I));
-					if (!loc.IsSimpleReg() || !(RI.IInfo[I - RI.FirstI] & 4)) {
-						Jit->MOVAPD(XMM0, loc);
-						loc = R(XMM0);
-					}
-					Jit->MOVD_xmm(R(EAX), loc.GetSimpleReg());
-					Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-					RI.Jit->UnsafeWriteRegToReg(EAX, ECX, 32, 4);
-
-					Jit->PSRLQ(loc.GetSimpleReg(), 32);
-					Jit->MOVD_xmm(R(EAX), loc.GetSimpleReg());
-					Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-					RI.Jit->UnsafeWriteRegToReg(EAX, ECX, 32, 0);
-				}
-			FixupBranch exit = Jit->J(true);
-			Jit->SetJumpTarget(safe);
-				// Safe but slow routine
-				OpArg value = fregLocForInst(RI, getOp1(I));
-				OpArg address = regLocForInst(RI, getOp2(I));
-				Jit->MOVAPD(XMM0, value);
-				Jit->PSRLQ(XMM0, 32);
-				Jit->MOVD_xmm(R(EAX), XMM0);
-				Jit->MOV(32, R(ECX), address);
-				RI.Jit->SafeWriteRegToReg(EAX, ECX, 32, 0);
-
-				Jit->MOVAPD(XMM0, value);
-				Jit->MOVD_xmm(R(EAX), XMM0);
-				Jit->MOV(32, R(ECX), address);
-				RI.Jit->SafeWriteRegToReg(EAX, ECX, 32, 4);
-			Jit->SetJumpTarget(exit);
-
-			if (RI.IInfo[I - RI.FirstI] & 4)
-				fregClearInst(RI, getOp1(I));
-			if (RI.IInfo[I - RI.FirstI] & 8)
-				regClearInst(RI, getOp2(I));
-			break;
-		}
-		case StorePaired: {
-			regSpill(RI, EAX);
-			regSpill(RI, EDX);
-			u32 quantreg = *I >> 24;
-			Jit->MOVZX(32, 16, EAX, M(&PowerPC::ppcState.spr[SPR_GQR0 + quantreg]));
-			Jit->MOVZX(32, 8, EDX, R(AL));
-#ifdef _M_IX86
-			int addr_scale = SCALE_4;
-#else
-			int addr_scale = SCALE_8;
-#endif
-			Jit->MOV(32, R(ECX), regLocForInst(RI, getOp2(I)));
-			Jit->MOVAPD(XMM0, fregLocForInst(RI, getOp1(I)));
-			Jit->ABI_AlignStack(0);
-			Jit->CALLptr(MScaled(EDX, addr_scale, (u32)(u64)(((JitIL *)jit)->asm_routines.pairedStoreQuantized)));
-			Jit->ABI_RestoreStack(0);
-			if (RI.IInfo[I - RI.FirstI] & 4)
-				fregClearInst(RI, getOp1(I));
-			if (RI.IInfo[I - RI.FirstI] & 8)
-				regClearInst(RI, getOp2(I));
-			break;
-		}
-		case DupSingleToMReg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithoutMov(RI, I);
-			Jit->CVTSS2SD(reg, fregLocForInst(RI, getOp1(I)));
-			Jit->MOVDDUP(reg, R(reg));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case InsertDoubleInMReg: {
-			if (!thisUsed) break;
-			// r[0] = op1[0]; r[1] = op2[1];
-
-			// TODO: Optimize the case that the register of op1 can be
-			//       recycled. (SHUFPD may not be so fast.)
-			X64Reg reg = fregBinRHSRegWithMov(RI, I);
-			OpArg loc1 = fregLocForInst(RI, getOp1(I));
-			if (loc1.IsSimpleReg()) {
-				Jit->MOVSD(reg, loc1);
-			} else {
-				// If op1 is in FSlotSet, we have to mov loc1 to XMM0
-				// before MOVSD/MOVSS.
-				// Because register<->memory transfer with MOVSD/MOVSS
-				// clears upper 64/96-bits of the destination register.
-				Jit->MOVAPD(XMM0, loc1);
-				Jit->MOVSD(reg, R(XMM0));
-			}
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case ExpandPackedToMReg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithoutMov(RI, I);
-			Jit->CVTPS2PD(reg, fregLocForInst(RI, getOp1(I)));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case CompactMRegToPacked: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithoutMov(RI, I);
-			Jit->CVTPD2PS(reg, fregLocForInst(RI, getOp1(I)));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FSNeg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithMov(RI, I);
-			static const u32 GC_ALIGNED16(ssSignBits[4]) = 
-				{0x80000000};
-			Jit->PXOR(reg, M((void*)&ssSignBits));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FDNeg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithMov(RI, I);
-			static const u64 GC_ALIGNED16(ssSignBits[2]) = 
-				{0x8000000000000000ULL};
-			Jit->PXOR(reg, M((void*)&ssSignBits));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPNeg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithMov(RI, I);
-			static const u32 GC_ALIGNED16(psSignBits[4]) = 
-				{0x80000000, 0x80000000};
-			Jit->PXOR(reg, M((void*)&psSignBits));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPDup0: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithMov(RI, I);
-			Jit->PUNPCKLDQ(reg, R(reg));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPDup1: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithMov(RI, I);
-			Jit->SHUFPS(reg, R(reg), 0xE5);
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case LoadFReg: {
-			if (!thisUsed) break;
-			X64Reg reg = fregFindFreeReg(RI);
-			unsigned ppcreg = *I >> 8;
-			Jit->MOVAPD(reg, M(&PowerPC::ppcState.ps[ppcreg]));
-			RI.fregs[reg] = I;
-			break;
-		}	    
-		case LoadFRegDENToZero: {
-			if (!thisUsed) break;
-			X64Reg reg = fregFindFreeReg(RI);
-			unsigned ppcreg = *I >> 8;
-			char *p = (char*)&(PowerPC::ppcState.ps[ppcreg][0]);
-			Jit->MOV(32, R(ECX), M(p+4));
-			Jit->AND(32, R(ECX), Imm32(0x7ff00000));
-			Jit->CMP(32, R(ECX), Imm32(0x38000000));
-			FixupBranch ok = Jit->J_CC(CC_AE);
-			Jit->AND(32, M(p+4), Imm32(0x80000000));
-			Jit->MOV(32, M(p), Imm32(0));
-			Jit->SetJumpTarget(ok);
-			Jit->MOVAPD(reg, M(&PowerPC::ppcState.ps[ppcreg]));
-			RI.fregs[reg] = I;
-			break;
-		}
-		case StoreFReg: {
-			unsigned ppcreg = *I >> 16;
-			Jit->MOVAPD(M(&PowerPC::ppcState.ps[ppcreg]),
-				      fregEnsureInReg(RI, getOp1(I)));
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case DoubleToSingle: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithoutMov(RI, I);
-			Jit->CVTSD2SS(reg, fregLocForInst(RI, getOp1(I)));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FSMul: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::MULSS);
-			break;
-		}
-		case FSAdd: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::ADDSS);
-			break;
-		}
-		case FSSub: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::SUBSS);
-			break;
-		}
-		case FSRSqrt: {
-			if (!thisUsed) break;
-			X64Reg reg = fregURegWithoutMov(RI, I);
-			Jit->RSQRTSS(reg, fregLocForInst(RI, getOp1(I)));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FDMul: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::MULSD);
-			break;
-		}
-		case FDAdd: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::ADDSD);
-			break;
-		}
-		case FDSub: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::SUBSD);
-			break;
-		}
-		case FDCmpCR: {
-			const u32 ordered = *I >> 24;
-			X64Reg destreg = regFindFreeReg(RI);
-			// TODO: Remove an extra MOVSD if loc1.IsSimpleReg()
-			OpArg loc1 = fregLocForInst(RI, getOp1(I));
-			OpArg loc2 = fregLocForInst(RI, getOp2(I));
-			Jit->MOVSD(XMM0, loc1);
-			Jit->UCOMISD(XMM0, loc2);
-			FixupBranch pNan     = Jit->J_CC(CC_P);
-			FixupBranch pEqual   = Jit->J_CC(CC_Z);
-			FixupBranch pLesser  = Jit->J_CC(CC_C);
-			// Greater
-			Jit->MOV(32, R(destreg), Imm32(0x4));
-			FixupBranch continue1 = Jit->J();
-			// NaN
-			Jit->SetJumpTarget(pNan);
-			Jit->MOV(32, R(destreg), Imm32(0x1));
-
-			static const u32 FPSCR_VE = (u32)1 << (31 - 24);
-			static const u32 FPSCR_VXVC = (u32)1 << (31 - 12);
-			static const u32 FPSCR_VXSNAN = (u32)1 << (31 - 7);
-			static const u32 FPSCR_FX = (u32)1 << (31 - 0);
-
-			if (ordered) {
-				// fcmpo
-				// TODO: Optimize the following code if slow.
-				//       SNAN check may not be needed
-				//       because it does not happen so much.
-				Jit->MOVSD(M(isSNANTemp[0]), XMM0);
-				if (loc2.IsSimpleReg()) {
-					Jit->MOVSD(M(isSNANTemp[1]), loc2.GetSimpleReg());
-				} else {
-					Jit->MOVSD(XMM0, loc2);
-					Jit->MOVSD(M(isSNANTemp[1]), XMM0);
-				}
-				Jit->ABI_CallFunction((void*)checkIsSNAN);
-				Jit->TEST(8, R(EAX), R(EAX));
-				FixupBranch ok = Jit->J_CC(CC_Z);
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_VXSNAN)); // FPSCR.Hex |= mask;
-					Jit->TEST(32, M(&FPSCR), Imm32(FPSCR_VE));
-					FixupBranch finish0 = Jit->J_CC(CC_NZ);
-						Jit->OR(32, M(&FPSCR), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
-						FixupBranch finish1 = Jit->J();
-				Jit->SetJumpTarget(ok);
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
-				Jit->SetJumpTarget(finish0);
-				Jit->SetJumpTarget(finish1);
-			} else {
-				// fcmpu
-				// TODO: Optimize the following code if slow
-				Jit->MOVSD(M(isSNANTemp[0]), XMM0);
-				if (loc2.IsSimpleReg()) {
-					Jit->MOVSD(M(isSNANTemp[1]), loc2.GetSimpleReg());
-				} else {
-					Jit->MOVSD(XMM0, loc2);
-					Jit->MOVSD(M(isSNANTemp[1]), XMM0);
-				}
-				Jit->ABI_CallFunction((void*)checkIsSNAN);
-				Jit->TEST(8, R(EAX), R(EAX));
-				FixupBranch finish = Jit->J_CC(CC_Z);
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_FX)); // FPSCR.FX = 1;
-					Jit->OR(32, M(&FPSCR), Imm32(FPSCR_VXVC)); // FPSCR.Hex |= mask;
-				Jit->SetJumpTarget(finish);
-			}
-
-			FixupBranch continue2 = Jit->J();
-			// Equal
-			Jit->SetJumpTarget(pEqual);
-			Jit->MOV(32, R(destreg), Imm32(0x2));
-			FixupBranch continue3 = Jit->J();
-			// Less
-			Jit->SetJumpTarget(pLesser);
-			Jit->MOV(32, R(destreg), Imm32(0x8));
-			Jit->SetJumpTarget(continue1);
-			Jit->SetJumpTarget(continue2);
-			Jit->SetJumpTarget(continue3);
-			RI.regs[destreg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPAdd: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::ADDPS);
-			break;
-		}
-		case FPMul: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::MULPS);
-			break;
-		}
-		case FPSub: {
-			if (!thisUsed) break;
-			fregEmitBinInst(RI, I, &JitIL::SUBPS);
-			break;
-		}
-		case FPMerge00: {
-			// r[0] = op1[0]; r[1] = op2[0];
-			if (!thisUsed) break;
-			// TODO: Optimize the case that the register of only op2 can be
-			//       recycled.
-			X64Reg reg = fregBinLHSRegWithMov(RI, I);
-			Jit->PUNPCKLDQ(reg, fregLocForInst(RI, getOp2(I)));
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPMerge01: {
-			// r[0] = op1[0]; r[1] = op2[1];
-			if (!thisUsed) break;
-			// TODO: Optimize the case that the register of only op1 can be
-			//       recycled.
-			X64Reg reg = fregBinRHSRegWithMov(RI, I);
-			OpArg loc1 = fregLocForInst(RI, getOp1(I));
-			if (loc1.IsSimpleReg()) {
-				Jit->MOVSS(reg, loc1);
-			} else {
-				Jit->MOVAPD(XMM0, loc1);
-				Jit->MOVSS(reg, R(XMM0));
-			}
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPMerge10: {
-			// r[0] = op1[1]; r[1] = op2[0];
-			if (!thisUsed) break;
-			// TODO: Optimize the case that the register of only op2 can be
-			//       recycled.
-			X64Reg reg = fregBinLHSRegWithMov(RI, I);
-			OpArg loc2 = fregLocForInst(RI, getOp2(I));
-			if (loc2.IsSimpleReg()) {
-				Jit->MOVSS(reg, loc2);
-			} else {
-				Jit->MOVAPD(XMM0, loc2);
-				Jit->MOVSS(reg, R(XMM0));
-			}
-			Jit->SHUFPS(reg, R(reg), 0xF1);
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case FPMerge11: {
-			// r[0] = op1[1]; r[1] = op2[1];
-			if (!thisUsed) break;
-			// TODO: Optimize the case that the register of only op2 can be
-			//       recycled.
-			X64Reg reg = fregBinLHSRegWithMov(RI, I);
-			// TODO: Check whether the following code works
-			//       when the op1 is in the FSlotSet
-			Jit->PUNPCKLDQ(reg, fregLocForInst(RI, getOp2(I)));
-			Jit->SHUFPD(reg, R(reg), 0x1);
-			RI.fregs[reg] = I;
-			fregNormalRegClear(RI, I);
-			break;
-		}
-		case CInt32:
-		case CInt16: {
-			if (!thisUsed) break;
-			X64Reg reg = regFindFreeReg(RI);
-			Jit->MOV(32, R(reg), Imm32(ibuild->GetImmValue(I)));
-			RI.regs[reg] = I;
-			break;
-		}
-		case BlockStart:
-		case BlockEnd:
-			break;
-
-		case IdleBranch: {			
-			Jit->CMP(32, regLocForInst(RI, getOp1(getOp1(I))),
-					 Imm32(RI.Build->GetImmValue(getOp2(getOp1(I)))));			
-			FixupBranch cont = Jit->J_CC(CC_NE);
-
-			RI.Jit->Cleanup(); // is it needed?			
-			Jit->ABI_CallFunction((void *)&PowerPC::OnIdleIL);
-			
-			Jit->MOV(32, M(&PC), Imm32(ibuild->GetImmValue( getOp2(I) )));
-			Jit->JMP(((JitIL *)jit)->asm_routines.testExceptions, true);
-
-			Jit->SetJumpTarget(cont);
-			if (RI.IInfo[I - RI.FirstI] & 4)
-					regClearInst(RI, getOp1(getOp1(I)));
-			if (RI.IInfo[I - RI.FirstI] & 8)
-				regClearInst(RI, getOp2(I));
-			break;
-		}
-
-		case BranchCond: {
-			if (isICmp(*getOp1(I)) &&
-			    isImm(*getOp2(getOp1(I)))) {
-				Jit->CMP(32, regLocForInst(RI, getOp1(getOp1(I))),
-					 Imm32(RI.Build->GetImmValue(getOp2(getOp1(I)))));
-				CCFlags flag;
-				switch (getOpcode(*getOp1(I))) {
-					case ICmpEq: flag = CC_NE; break;
-					case ICmpNe: flag = CC_E; break;
-					case ICmpUgt: flag = CC_BE; break;
-					case ICmpUlt: flag = CC_AE; break;
-					case ICmpUge: flag = CC_L; break;
-					case ICmpUle: flag = CC_A; break;
-					case ICmpSgt: flag = CC_LE; break;
-					case ICmpSlt: flag = CC_GE; break;
-					case ICmpSge: flag = CC_L; break;
-					case ICmpSle: flag = CC_G; break;
-					default: PanicAlert("cmpXX"); flag = CC_O; break;
-				}
-				FixupBranch cont = Jit->J_CC(flag);
-				regWriteExit(RI, getOp2(I));
-				Jit->SetJumpTarget(cont);
-				if (RI.IInfo[I - RI.FirstI] & 4)
-					regClearInst(RI, getOp1(getOp1(I)));
-			} else {
-				Jit->CMP(32, regLocForInst(RI, getOp1(I)), Imm8(0));
-				FixupBranch cont = Jit->J_CC(CC_Z);
-				regWriteExit(RI, getOp2(I));
-				Jit->SetJumpTarget(cont);
-				if (RI.IInfo[I - RI.FirstI] & 4)
-					regClearInst(RI, getOp1(I));
-			}
-			if (RI.IInfo[I - RI.FirstI] & 8)
-				regClearInst(RI, getOp2(I));
-			break;
-		}
-		case BranchUncond: {
-			regWriteExit(RI, getOp1(I));
-			regNormalRegClear(RI, I);
-			break;
-		}		
-		case ShortIdleLoop: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-			Jit->ABI_CallFunction((void *)&CoreTiming::Idle);
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->JMP(((JitIL *)jit)->asm_routines.testExceptions, true);
-			break;
-		}
-		case SystemCall: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-			Jit->LOCK();
-			Jit->OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_SYSCALL));
-			Jit->MOV(32, M(&PC), Imm32(InstLoc + 4));
-			Jit->WriteExceptionExit();
-			break;
-		}
-		case InterpreterBranch: {
-			Jit->MOV(32, R(EAX), M(&NPC));
-			Jit->WriteExitDestInOpArg(R(EAX));
-			break;
-		}
-		case RFIExit: {
-			// See Interpreter rfi for details
-			const u32 mask = 0x87C0FFFF;
-			// MSR = (MSR & ~mask) | (SRR1 & mask);
-			Jit->MOV(32, R(EAX), M(&MSR));
-			Jit->MOV(32, R(ECX), M(&SRR1));
-			Jit->AND(32, R(EAX), Imm32(~mask));
-			Jit->AND(32, R(ECX), Imm32(mask));
-			Jit->OR(32, R(EAX), R(ECX));       
-			// MSR &= 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
-			Jit->AND(32, R(EAX), Imm32(0xFFFBFFFF));
-			Jit->MOV(32, M(&MSR), R(EAX));
-			// NPC = SRR0; 
-			Jit->MOV(32, R(EAX), M(&SRR0));
-			Jit->WriteRfiExitDestInOpArg(R(EAX));
-			break;
-		}
-		case FPExceptionCheck: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-			//This instruction uses FPU - needs to add FP exception bailout
-			Jit->TEST(32, M(&PowerPC::ppcState.msr), Imm32(1 << 13)); // Test FP enabled bit
-			FixupBranch b1 = Jit->J_CC(CC_NZ);
-
-			// If a FPU exception occurs, the exception handler will read
-			// from PC.  Update PC with the latest value in case that happens.
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->SUB(32, M(&CoreTiming::downcount), Jit->js.downcountAmount > 127 ? Imm32(Jit->js.downcountAmount) : Imm8(Jit->js.downcountAmount)); 
-			Jit->JMP(Jit->asm_routines.fpException, true);
-			Jit->SetJumpTarget(b1);
-			break;
-		}
-		case DSIExceptionCheck: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-			Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_DSI));
-			FixupBranch noMemException = Jit->J_CC(CC_Z);
-
-			// If a memory exception occurs, the exception handler will read
-			// from PC.  Update PC with the latest value in case that happens.
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->WriteExceptionExit();
-			Jit->SetJumpTarget(noMemException);
-			break;
-		}
-		case ISIException: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-
-			// Address of instruction could not be translated
-			Jit->MOV(32, M(&NPC), Imm32(InstLoc));
-			Jit->OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI));
-
-			// Remove the invalid instruction from the icache, forcing a recompile
-#ifdef _M_IX86
-			if (InstLoc & JIT_ICACHE_VMEM_BIT)
-				Jit->MOV(32, M((jit->GetBlockCache()->GetICacheVMEM() + (InstLoc & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-			else if (InstLoc & JIT_ICACHE_EXRAM_BIT)
-				Jit->MOV(32, M((jit->GetBlockCache()->GetICacheEx() + (InstLoc & JIT_ICACHEEX_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-			else
-				Jit->MOV(32, M((jit->GetBlockCache()->GetICache() + (InstLoc & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD));
-
-#else
-			if (InstLoc & JIT_ICACHE_VMEM_BIT)
-				Jit->MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheVMEM() + (InstLoc & JIT_ICACHE_MASK)));
-			else if (InstLoc & JIT_ICACHE_EXRAM_BIT)
-				Jit->MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheEx() + (InstLoc & JIT_ICACHEEX_MASK)));
-			else
-				Jit->MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICache() + (InstLoc & JIT_ICACHE_MASK)));
-			Jit->MOV(32, MatR(RAX), Imm32(JIT_ICACHE_INVALID_WORD));
-#endif
-			Jit->WriteExceptionExit();
-			break;
-		}
-		case ExtExceptionCheck: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-
-			Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT));
-			FixupBranch clearInt = Jit->J_CC(CC_NZ);
-			Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
-			FixupBranch noExtException = Jit->J_CC(CC_Z);
-			Jit->TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000));
-			FixupBranch noExtIntEnable = Jit->J_CC(CC_Z);
-			Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH));
-			FixupBranch noCPInt = Jit->J_CC(CC_Z);
-
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->WriteExceptionExit();
-
-			Jit->SetJumpTarget(noCPInt);
-			Jit->SetJumpTarget(noExtIntEnable);
-			Jit->SetJumpTarget(noExtException);
-			Jit->SetJumpTarget(clearInt);
-			break;
-		}
-		case BreakPointCheck: {
-			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
-
-			Jit->MOV(32, M(&PC), Imm32(InstLoc));
-			Jit->ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
-			Jit->TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-			FixupBranch noBreakpoint = Jit->J_CC(CC_Z);
-			Jit->WriteExit(InstLoc, 0);
-			Jit->SetJumpTarget(noBreakpoint);
-			break;
-		}
-		case Int3: {
-			Jit->INT3();
-			break;
-		}
-		case Tramp: break;
-		case Nop: break;
-		default:
-			PanicAlert("Unknown JIT instruction; aborting!");
-			exit(1);
-		}
-	}
-
-	for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++) {
-		if (RI.regs[i]) {
-			// Start a game in Burnout 2 to get this. Or animal crossing.
-			PanicAlert("Incomplete cleanup! (regs)");
-			exit(1);
-		}
-		if (RI.fregs[i]) {
-			PanicAlert("Incomplete cleanup! (fregs)");
-			exit(1);
-		}
-	}
-
-	//if (!RI.MakeProfile && RI.numSpills)
-	//	printf("Block: %x, numspills %d\n", Jit->js.blockStart, RI.numSpills);
-	
-	Jit->WriteExit(jit->js.curBlock->exitAddress[0], 0);
-	Jit->UD2();
-}
-
-void JitIL::WriteCode() {
-	DoWriteCode(&ibuild, this, false, SConfig::GetInstance().m_LocalCoreStartupParameter.bJITProfiledReJIT);
-}
-
-void ProfiledReJit() {
-	JitIL *jitil = (JitIL *)jit;
-	jitil->SetCodePtr(jitil->js.rewriteStart);
-	DoWriteCode(&jitil->ibuild, jitil, true, false);
-	jitil->js.curBlock->codeSize = (int)(jitil->GetCodePtr() - jitil->js.rewriteStart);
-	jitil->GetBlockCache()->FinalizeBlock(jitil->js.curBlock->blockNum, jitil->jo.enableBlocklink,
-	jitil->js.curBlock->normalEntry);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
deleted file mode 100644
index 4b04415add..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
+++ /dev/null
@@ -1,729 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-#include "../../HLE/HLE.h"
-#include "../../Core.h"
-#include "../../PatchEngine.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
-#include "../PowerPC.h"
-#include "../Profiler.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
-#include "../JitCommon/JitCache.h"
-#include "JitIL.h"
-#include "JitILAsm.h"
-#include "JitIL_Tables.h"
-
-using namespace Gen;
-using namespace PowerPC;
-
-// Dolphin's PowerPC->x86 JIT dynamic recompiler
-// (Nearly) all code by ector (hrydgard)
-// Features:
-// * x86 & x64 support, lots of shared code.
-// * Basic block linking
-// * Fast dispatcher
-
-// Unfeatures:
-// * Does not recompile all instructions - sometimes falls back to inserting a CALL to the corresponding Interpreter function.
-
-// Various notes below
-
-// Register allocation
-//   RAX - Generic quicktemp register
-//   RBX - point to base of memory map
-//   RSI RDI R12 R13 R14 R15 - free for allocation
-//   RCX RDX R8 R9 R10 R11 - allocate in emergencies. These need to be flushed before functions are called.
-//   RSP - stack pointer, do not generally use, very dangerous
-//   RBP - ?
-
-// IMPORTANT:
-// Make sure that all generated code and all emulator state sits under the 2GB boundary so that
-// RIP addressing can be used easily. Windows will always allocate static code under the 2GB boundary.
-// Also make sure to use VirtualAlloc and specify EXECUTE permission.
-
-// Open questions
-// * Should there be any statically allocated registers? r3, r4, r5, r8, r0 come to mind.. maybe sp
-// * Does it make sense to finish off the remaining non-jitted instructions? Seems we are hitting diminishing returns.
-
-// Other considerations
-//
-// Many instructions have shorter forms for EAX. However, I believe their performance boost
-// will be as small to be negligible, so I haven't dirtied up the code with that. AMD recommends it in their
-// optimization manuals, though.
-//
-// We support block linking. Reserve space at the exits of every block for a full 5-byte jmp. Save 16-bit offsets 
-// from the starts of each block, marking the exits so that they can be nicely patched at any time.
-//
-// Blocks do NOT use call/ret, they only jmp to each other and to the dispatcher when necessary.
-//
-// All blocks that can be precompiled will be precompiled. Code will be memory protected - any write will mark
-// the region as non-compilable, and all links to the page will be torn out and replaced with dispatcher jmps.
-//
-// Alternatively, icbi instruction SHOULD mark where we can't compile
-//
-// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
-// expensive anyway since we need to return to dispatcher, except when they can be predicted).
-
-// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
-//       Somewhat fixed by disabling idle skipping when certain interrupts are enabled
-//       This is no permanent reliable fix
-// TODO: Zeldas go whacko when you hang the gfx thread
-
-// Idea - Accurate exception handling
-// Compute register state at a certain instruction by running the JIT in "dry mode", and stopping at the right place.
-// Not likely to be done :P
-
-
-// Optimization Ideas -
-/*
-  * Assume SP is in main RAM (in Wii mode too?) - partly done
-  * Assume all floating point loads and double precision loads+stores are to/from main ram
-    (single precision can be used in write gather pipe, specialized fast check added)
-  * AMD only - use movaps instead of movapd when loading ps from memory?
-  * HLE functions like floorf, sin, memcpy, etc - they can be much faster
-  * ABI optimizations - drop F0-F13 on blr, for example. Watch out for context switching.
-    CR2-CR4 are non-volatile, rest of CR is volatile -> dropped on blr.
-	R5-R12 are volatile -> dropped on blr.
-  * classic inlining across calls.
-  
-Low hanging fruit:
-stfd -- guaranteed in memory
-cmpl
-mulli
-stfs
-stwu
-lb/stzx
-
-bcx - optimize!
-bcctr
-stfs
-psq_st
-addx
-orx
-rlwimix
-fcmpo
-DSP_UpdateARAMDMA
-lfd
-stwu
-cntlzwx
-bcctrx
-WriteBigEData
-
-TODO
-lha
-srawx
-addic_rc
-addex
-subfcx
-subfex
-
-fmaddx
-fmulx
-faddx
-fnegx
-frspx
-frsqrtex
-ps_sum0
-ps_muls0
-ps_adds1
-
-*/
-
-
-// For profiling
-#include <time.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <intrin.h>
-#else
-#include <memory>
-#include <stdint.h>
-static inline uint64_t __rdtsc()
-{
-	uint32_t lo, hi;
-#ifdef _LP64
-	__asm__ __volatile__ ("xorl %%eax,%%eax \n cpuid"
-			::: "%rax", "%rbx", "%rcx", "%rdx");
-	__asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
-	return (uint64_t)hi << 32 | lo;
-#else
-	__asm__ __volatile__ (
-			"xor	%%eax,%%eax;"
-			"push	%%ebx;"
-			"cpuid;"
-			"pop	%%ebx;"
-			::: "%eax", "%ecx", "%edx");
-	__asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
-#endif
-	return (uint64_t)hi << 32 | lo;
-}
-#endif
-
-namespace JitILProfiler
-{
-	struct Block
-	{
-		u32 index;
-		u64 codeHash;
-		u64 totalElapsed;
-		u64 numberOfCalls;
-		Block() : index(0), codeHash(0), totalElapsed(0), numberOfCalls(0) { }
-	};
-	static std::vector<Block> blocks;
-	static u32 blockIndex;
-	static u64 beginTime;
-	static Block& Add(u64 codeHash)
-	{
-		const u32 _blockIndex = (u32)blocks.size();
-		blocks.push_back(Block());
-		Block& block = blocks.back();
-		block.index = _blockIndex;
-		block.codeHash = codeHash;
-		return block;
-	}
-	// These functions need to be static because they are called with
-	// ABI_CallFunction().
-	static void Begin(u32 index)
-	{
-		blockIndex = index;
-		beginTime = __rdtsc();
-	}
-	static void End()
-	{
-		const u64 endTime = __rdtsc();
-		const u64 duration = endTime - beginTime;
-		Block& block = blocks[blockIndex];
-		block.totalElapsed += duration;
-		++block.numberOfCalls;
-	}
-	struct JitILProfilerFinalizer
-	{
-		virtual ~JitILProfilerFinalizer()
-		{
-			char buffer[1024];
-			sprintf(buffer, "JitIL_profiling_%d.csv", (int)time(NULL));
-			File::IOFile file(buffer, "w");
-			setvbuf(file.GetHandle(), NULL, _IOFBF, 1024 * 1024);
-			fprintf(file.GetHandle(), "code hash,total elapsed,number of calls,elapsed per call\n");
-			for (std::vector<Block>::iterator it = blocks.begin(), itEnd = blocks.end(); it != itEnd; ++it)
-			{
-				const u64 codeHash = it->codeHash;
-				const u64 totalElapsed = it->totalElapsed;
-				const u64 numberOfCalls = it->numberOfCalls;
-				const double elapsedPerCall = totalElapsed / (double)numberOfCalls;
-				fprintf(file.GetHandle(), "%016llx,%lld,%lld,%f\n", codeHash, totalElapsed, numberOfCalls, elapsedPerCall);
-			}
-		}
-	};
-	std::auto_ptr<JitILProfilerFinalizer> finalizer;
-	static void Init()
-	{
-		finalizer = std::auto_ptr<JitILProfilerFinalizer>(new JitILProfilerFinalizer);
-	}
-	static void Shutdown()
-	{
-		finalizer.reset();
-	}
-};
-
-static int CODE_SIZE = 1024*1024*32;
-
-namespace CPUCompare
-{
-	extern u32 m_BlockStart;
-}
-
-void JitIL::Init()
-{
-	jo.optimizeStack = true;
-
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		jo.enableBlocklink = false;
-		Core::g_CoreStartupParameter.bSkipIdle = false;
-	}
-	else
-	{
-		if (!Core::g_CoreStartupParameter.bJITBlockLinking)
-			jo.enableBlocklink = false;
-		else
-			// Speed boost, but not 100% safe
-			jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU;
-	}
-
-	jo.fpAccurateFcmp = false;
-	jo.optimizeGatherPipe = true;
-	jo.fastInterrupts = false;
-	jo.accurateSinglePrecision = false;
-	js.memcheck = Core::g_CoreStartupParameter.bMMU;
-
-	trampolines.Init();
-	AllocCodeSpace(CODE_SIZE);
-
-	blocks.Init();
-	asm_routines.Init();
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		JitILProfiler::Init();
-	}
-}
-
-void JitIL::ClearCache()
-{
-	blocks.Clear();
-	trampolines.ClearCodeSpace();
-	ClearCodeSpace();
-}
-
-void JitIL::Shutdown()
-{
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		JitILProfiler::Shutdown();
-	}
-
-	FreeCodeSpace();
-
-	blocks.Shutdown();
-	trampolines.Shutdown();
-	asm_routines.Shutdown();
-}
-
-
-void JitIL::WriteCallInterpreter(UGeckoInstruction inst)
-{
-	if (js.isLastInstruction)
-	{
-		MOV(32, M(&PC), Imm32(js.compilerPC));
-		MOV(32, M(&NPC), Imm32(js.compilerPC + 4));
-	}
-	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
-	ABI_CallFunctionC((void*)instr, inst.hex);
-	if (js.isLastInstruction)
-	{
-		MOV(32, R(EAX), M(&NPC));
-		WriteRfiExitDestInOpArg(R(EAX));
-	}
-}
-
-void JitIL::unknown_instruction(UGeckoInstruction inst)
-{
-	//	CCPU::Break();
-	PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex);
-}
-
-void JitIL::Default(UGeckoInstruction _inst)
-{
-	ibuild.EmitInterpreterFallback(
-		ibuild.EmitIntConst(_inst.hex),
-		ibuild.EmitIntConst(js.compilerPC));
-}
-
-void JitIL::HLEFunction(UGeckoInstruction _inst)
-{
-	ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex);
-	MOV(32, R(EAX), M(&NPC));
-	WriteExitDestInOpArg(R(EAX));
-}
-
-void JitIL::DoNothing(UGeckoInstruction _inst)
-{
-	// Yup, just don't do anything.
-}
-
-static const bool ImHereDebug = false;
-static const bool ImHereLog = false;
-static std::map<u32, int> been_here;
-
-static void ImHere()
-{
-	static File::IOFile f;
-	if (ImHereLog)
-	{
-		if (!f)
-		{
-#ifdef _M_X64
-			f.Open("log64.txt", "w");
-#else
-			f.Open("log32.txt", "w");
-#endif
-		}
-		fprintf(f.GetHandle(), "%08x r0: %08x r5: %08x r6: %08x\n", PC, PowerPC::ppcState.gpr[0],
-			PowerPC::ppcState.gpr[5], PowerPC::ppcState.gpr[6]);
-		f.Flush();
-	}
-	if (been_here.find(PC) != been_here.end()) {
-		been_here.find(PC)->second++;
-		if ((been_here.find(PC)->second) & 1023)
-			return;
-	}
-	DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR);
-	//		printf("I'm here - PC = %08x , LR = %08x", PC, LR);
-	been_here[PC] = 1;
-}
-
-void JitIL::Cleanup()
-{
-	if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0)
-	{
-		ABI_CallFunction((void *)&GPFifo::CheckGatherPipe);
-	}
-
-	// SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time.
-	if (MMCR0.Hex || MMCR1.Hex)
-		ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
-}
-
-void JitIL::WriteExit(u32 destination, int exit_num)
-{
-	Cleanup();
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		ABI_CallFunction((void *)JitILProfiler::End);
-	}
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-
-	//If nobody has taken care of this yet (this can be removed when all branches are done)
-	JitBlock *b = js.curBlock;
-	b->exitAddress[exit_num] = destination;
-	b->exitPtrs[exit_num] = GetWritableCodePtr();
-	
-	// Link opportunity!
-	int block = blocks.GetBlockNumberFromStartAddress(destination);
-	if (block >= 0 && jo.enableBlocklink) 
-	{
-		// It exists! Joy of joy!
-		JMP(blocks.GetBlock(block)->checkedEntry, true);
-		b->linkStatus[exit_num] = true;
-	}
-	else 
-	{
-		MOV(32, M(&PC), Imm32(destination));
-		JMP(asm_routines.dispatcher, true);
-	}
-}
-
-void JitIL::WriteExitDestInOpArg(const Gen::OpArg& arg)
-{
-	MOV(32, M(&PC), arg);
-	Cleanup();
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		ABI_CallFunction((void *)JitILProfiler::End);
-	}
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.dispatcher, true);
-}
-
-void JitIL::WriteRfiExitDestInOpArg(const Gen::OpArg& arg)
-{
-	MOV(32, M(&PC), arg);
-	Cleanup();
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		ABI_CallFunction((void *)JitILProfiler::End);
-	}
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.testExceptions, true);
-}
-
-void JitIL::WriteExceptionExit()
-{
-	Cleanup();
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
-		ABI_CallFunction((void *)JitILProfiler::End);
-	}
-	SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); 
-	JMP(asm_routines.testExceptions, true);
-}
-
-void STACKALIGN JitIL::Run()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-	//Will return when PowerPC::state changes
-}
-
-void JitIL::SingleStep()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-}
-
-void JitIL::Trace()
-{
-	char regs[500] = "";
-	char fregs[750] = "";
-
-#ifdef JIT_LOG_GPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
-		strncat(regs, reg, 500);
-	}
-#endif
-
-#ifdef JIT_LOG_FPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "f%02d: %016x ", i, riPS0(i));
-		strncat(fregs, reg, 750);
-	}
-#endif	
-
-	DEBUG_LOG(DYNA_REC, "JITIL PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", 
-		PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], 
-		PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, 
-		PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs);
-}
-
-void STACKALIGN JitIL::Jit(u32 em_address)
-{
-	if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || Core::g_CoreStartupParameter.bJITNoBlockCache)
-	{
-		ClearCache();
-	}
-	int block_num = blocks.AllocateBlock(em_address);
-	JitBlock *b = blocks.GetBlock(block_num);
-	blocks.FinalizeBlock(block_num, jo.enableBlocklink, DoJit(em_address, &code_buffer, b));
-}
-
-const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b)
-{
-	int blockSize = code_buf->GetSize();
-
-	// Memory exception on instruction fetch
-	bool memory_exception = false;
-
-	// A broken block is a block that does not end in a branch
-	bool broken_block = false;
-
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		// Comment out the following to disable breakpoints (speed-up)
-		if (!Profiler::g_ProfileBlocks)
-		{
-			if (GetState() == CPU_STEPPING)
-				blockSize = 1;
-			Trace();
-		}
-	}
-
-	if (em_address == 0)
-	{
-		// Memory exception occurred during instruction fetch
-		memory_exception = true;
-	}
-
-	if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT))
-	{
-		if (!Memory::TranslateAddress(em_address, Memory::FLAG_OPCODE))
-		{
-			// Memory exception occurred during instruction fetch
-			memory_exception = true;
-		}
-	}
-
-	int size = 0;
-	js.isLastInstruction = false;
-	js.blockStart = em_address;
-	js.fifoBytesThisBlock = 0;
-	js.curBlock = b;
-	js.cancel = false;
-	jit->js.numLoadStoreInst = 0;
-	jit->js.numFloatingPointInst = 0;
-
-	// Analyze the block, collect all instructions it is made of (including inlining,
-	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
-	b->exitAddress[0] = em_address;
-	u32 merged_addresses[32];
-	const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]);
-	int size_of_merged_addresses = 0;
-	if (!memory_exception)
-	{
-		// If there is a memory exception inside a block (broken_block==true), compile up to that instruction.
-		b->exitAddress[0] = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses);
-	}
-	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
-
-	const u8 *start = AlignCode4(); // TODO: Test if this or AlignCode16 make a difference from GetCodePtr
-	b->checkedEntry = start;
-	b->runCount = 0;
-
-	// Downcount flag check. The last block decremented downcounter, and the flag should still be available.
-	FixupBranch skip = J_CC(CC_NBE);
-	MOV(32, M(&PC), Imm32(js.blockStart));
-	JMP(asm_routines.doTiming, true);  // downcount hit zero - go doTiming.
-	SetJumpTarget(skip);
-
-	const u8 *normalEntry = GetCodePtr();
-	b->normalEntry = normalEntry;
-	
-	if (ImHereDebug)
-		ABI_CallFunction((void *)&ImHere); // Used to get a trace of the last few blocks before a crash, sometimes VERY useful
-
-	if (js.fpa.any)
-	{
-		// This block uses FPU - needs to add FP exception bailout
-		TEST(32, M(&PowerPC::ppcState.msr), Imm32(1 << 13)); //Test FP enabled bit
-		FixupBranch b1 = J_CC(CC_NZ);
-		MOV(32, M(&PC), Imm32(js.blockStart));
-		JMP(asm_routines.fpException, true);
-		SetJumpTarget(b1);
-	}
-
-	js.rewriteStart = (u8*)GetCodePtr();
-
-	u64 codeHash = -1;
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling ||
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILOutputIR)
-	{
-		// For profiling and IR Writer
-		for (int i = 0; i < (int)size; i++)
-		{
-			const u64 inst = ops[i].inst.hex;
-			// Ported from boost::hash
-			codeHash ^= inst + (codeHash << 6) + (codeHash >> 2);
-		}
-	}
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling)
-	{
-		JitILProfiler::Block& block = JitILProfiler::Add(codeHash);
-		ABI_CallFunctionC((void *)JitILProfiler::Begin, block.index);
-	}
-
-	// Start up IR builder (structure that collects the
-	// instruction processed by the JIT routines)
-	ibuild.Reset();
-
-	js.downcountAmount = 0;
-	if (!Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		for (int i = 0; i < size_of_merged_addresses; ++i)
-		{
-			const u32 address = merged_addresses[i];
-			js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);
-		}
-	}
-
-	// Translate instructions
-	for (int i = 0; i < (int)size; i++)
-	{
-		js.compilerPC = ops[i].address;
-		js.op = &ops[i];
-		js.instructionNumber = i;
-		const GekkoOPInfo *opinfo = GetOpInfo(ops[i].inst);
-		js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
-
-		if (i == (int)size - 1)
-		{
-			js.isLastInstruction = true;
-			js.next_inst = 0;
-		}
-		else
-		{
-			// help peephole optimizations
-			js.next_inst = ops[i + 1].inst;
-			js.next_compilerPC = ops[i + 1].address;
-		}
-
-		u32 function = HLE::GetFunctionIndex(ops[i].address);
-		if (function != 0)
-		{
-			int type = HLE::GetFunctionTypeByIndex(function);
-			if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE)
-			{
-				int flags = HLE::GetFunctionFlagsByIndex(function);
-				if (HLE::IsEnabled(flags))
-				{
-					HLEFunction(function);
-					if (type == HLE::HLE_HOOK_REPLACE)
-					{
-						MOV(32, R(EAX), M(&NPC));
-						jit->js.downcountAmount += jit->js.st.numCycles;
-						WriteExitDestInOpArg(R(EAX));
-						break;
-					}
-				}
-			}
-		}
-
-		if (!ops[i].skip)
-		{
-			if (js.memcheck && (opinfo->flags & FL_USE_FPU))
-			{
-				ibuild.EmitFPExceptionCheck(ibuild.EmitIntConst(ops[i].address));
-			}
-
-			if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end())
-			{
-				ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address));
-			}
-
-			if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
-			{
-				ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address));
-			}
-
-			JitILTables::CompileInstruction(ops[i]);
-
-			if (js.memcheck && (opinfo->flags & FL_LOADSTORE))
-			{
-				ibuild.EmitDSIExceptionCheck(ibuild.EmitIntConst(ops[i].address));
-			}
-
-			if (opinfo->flags & FL_LOADSTORE)
-				++jit->js.numLoadStoreInst;
-
-			if (opinfo->flags & FL_USE_FPU)
-				++jit->js.numFloatingPointInst;
-		}
-	}
-
-	u32 function = HLE::GetFunctionIndex(jit->js.blockStart);
-	if (function != 0)
-	{
-		int type = HLE::GetFunctionTypeByIndex(function);
-		if (type == HLE::HLE_HOOK_END)
-		{
-			int flags = HLE::GetFunctionFlagsByIndex(function);
-			if (HLE::IsEnabled(flags))
-			{
-				HLEFunction(function);
-			}
-		}
-	}
-
-	if (memory_exception)
-	{
-		ibuild.EmitISIException(ibuild.EmitIntConst(em_address));
-	}
-
-	// Perform actual code generation
-	WriteCode();
-
-	b->codeSize = (u32)(GetCodePtr() - normalEntry);
-	b->originalSize = size;
-
-#ifdef JIT_LOG_X86
-	LogGeneratedX86(size, code_buf, normalEntry, b);
-#endif
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILOutputIR)
-	{
-		ibuild.WriteToFile(codeHash);
-	}
-
-	return normalEntry;
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
deleted file mode 100644
index 30371311a3..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// ========================
-// See comments in Jit.cpp.
-// ========================
-
-// Mystery: Capcom vs SNK 800aa278
-
-// CR flags approach:
-//   * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3".
-//   * All flag altering instructions flush this
-//   * A flush simply does a conditional write to the appropriate CRx.
-//   * If flag available, branch code can become absolutely trivial.
-
-#ifndef _JITIL_H
-#define _JITIL_H
-
-#include "../PPCAnalyst.h"
-#include "../JitCommon/JitBase.h"
-#include "../JitCommon/JitCache.h"
-#include "../JitCommon/JitBackpatch.h"
-#include "../JitCommon/Jit_Util.h"
-#include "x64Emitter.h"
-#include "x64Analyzer.h"
-#include "IR.h"
-#include "../JitCommon/JitBase.h"
-#include "JitILAsm.h"
-
-// #define INSTRUCTION_START Default(inst); return;
-// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
-#define INSTRUCTION_START
-
-#define JITDISABLE(setting) \
-	if (Core::g_CoreStartupParameter.bJITOff || \
-		Core::g_CoreStartupParameter.setting) \
-		{Default(inst); return;}
-
-#ifdef _M_X64
-#define DISABLE64 \
-	{Default(inst); return;}
-#else
-#define DISABLE64
-#endif
-
-class JitIL : public Jitx86Base
-{
-private:
-
-
-	// The default code buffer. We keep it around to not have to alloc/dealloc a
-	// large chunk of memory for each recompiled block.
-	PPCAnalyst::CodeBuffer code_buffer;
-
-public:
-	JitILAsmRoutineManager asm_routines;
-
-	JitIL() : code_buffer(32000) {}
-	~JitIL() {}
-
-	IREmitter::IRBuilder ibuild;
-
-	// Initialization, etc
-
-	void Init();
-	void Shutdown();
-
-	// Jit!
-
-	void Jit(u32 em_address);
-	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
-
-	void Trace();
-
-	void ClearCache();
-	const u8 *GetDispatcher() {
-		return asm_routines.dispatcher;  // asm_routines.dispatcher
-	}
-	const CommonAsmRoutines *GetAsmRoutines() {
-		return &asm_routines;
-	}
-
-	const char *GetName() {
-#ifdef _M_X64
-		return "JIT64IL";
-#else
-		return "JIT32IL";
-#endif
-	}
-
-	// Run!
-
-	void Run();
-	void SingleStep();
-
-	// Utilities for use by opcodes
-
-	void WriteExit(u32 destination, int exit_num);
-	void WriteExitDestInOpArg(const Gen::OpArg& arg);
-	void WriteExceptionExit();
-	void WriteRfiExitDestInOpArg(const Gen::OpArg& arg);
-	void WriteCallInterpreter(UGeckoInstruction _inst);
-	void Cleanup();
-	
-	void WriteToConstRamAddress(int accessSize, const Gen::OpArg& arg, u32 address);
-	void WriteFloatToConstRamAddress(const Gen::X64Reg& xmm_reg, u32 address);
-	void GenerateCarry(Gen::X64Reg temp_reg);
-
-	void tri_op(int d, int a, int b, bool reversible, void (Gen::XEmitter::*op)(Gen::X64Reg, Gen::OpArg));
-	typedef u32 (*Operation)(u32 a, u32 b);
-	void regimmop(int d, int a, bool binary, u32 value, Operation doop, void (Gen::XEmitter::*op)(int, const Gen::OpArg&, const Gen::OpArg&), bool Rc = false, bool carry = false);
-	void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (Gen::XEmitter::*op)(Gen::X64Reg, Gen::OpArg));
-
-	void WriteCode();
-
-	// OPCODES
-	void unknown_instruction(UGeckoInstruction _inst);
-	void Default(UGeckoInstruction _inst);
-	void DoNothing(UGeckoInstruction _inst);
-	void HLEFunction(UGeckoInstruction _inst);
-
-	void DynaRunTable4(UGeckoInstruction _inst);
-	void DynaRunTable19(UGeckoInstruction _inst);
-	void DynaRunTable31(UGeckoInstruction _inst);
-	void DynaRunTable59(UGeckoInstruction _inst);
-	void DynaRunTable63(UGeckoInstruction _inst);
-
-	void addx(UGeckoInstruction inst);
-	void boolX(UGeckoInstruction inst);
-	void mulli(UGeckoInstruction inst);
-	void mulhwux(UGeckoInstruction inst);
-	void mullwx(UGeckoInstruction inst);
-	void divwux(UGeckoInstruction inst);
-	void srawix(UGeckoInstruction inst);
-	void srawx(UGeckoInstruction inst);
-	void addex(UGeckoInstruction inst);
-	void addzex(UGeckoInstruction inst);
-
-	void extsbx(UGeckoInstruction inst);
-	void extshx(UGeckoInstruction inst);
-
-	void sc(UGeckoInstruction _inst);
-	void rfi(UGeckoInstruction _inst);
-
-	void bx(UGeckoInstruction inst);
-	void bclrx(UGeckoInstruction _inst);
-	void bcctrx(UGeckoInstruction _inst);
-	void bcx(UGeckoInstruction inst);
-
-	void mtspr(UGeckoInstruction inst);
-	void mfspr(UGeckoInstruction inst);
-	void mtmsr(UGeckoInstruction inst);
-	void mfmsr(UGeckoInstruction inst);
-	void mftb(UGeckoInstruction inst);
-	void mtcrf(UGeckoInstruction inst);
-	void mfcr(UGeckoInstruction inst);
-	void mcrf(UGeckoInstruction inst);
-	void crXX(UGeckoInstruction inst);
-
-	void reg_imm(UGeckoInstruction inst);
-
-	void ps_sel(UGeckoInstruction inst);
-	void ps_mr(UGeckoInstruction inst);
-	void ps_sign(UGeckoInstruction inst); //aggregate
-	void ps_arith(UGeckoInstruction inst); //aggregate
-	void ps_mergeXX(UGeckoInstruction inst);
-	void ps_maddXX(UGeckoInstruction inst);
-	void ps_rsqrte(UGeckoInstruction inst);
-	void ps_sum(UGeckoInstruction inst);
-	void ps_muls(UGeckoInstruction inst);
-
-	void fp_arith_s(UGeckoInstruction inst);
-
-	void fcmpx(UGeckoInstruction inst);
-	void fmrx(UGeckoInstruction inst);
-
-	void cmpXX(UGeckoInstruction inst);
-
-	void cntlzwx(UGeckoInstruction inst);
-
-	void lfs(UGeckoInstruction inst);
-	void lfd(UGeckoInstruction inst);
-	void stfd(UGeckoInstruction inst);
-	void stfs(UGeckoInstruction inst);
-	void stfsx(UGeckoInstruction inst);
-	void psq_l(UGeckoInstruction inst);
-	void psq_st(UGeckoInstruction inst);
-
-	void fmaddXX(UGeckoInstruction inst);
-	void fsign(UGeckoInstruction inst);
-	void stX(UGeckoInstruction inst); //stw sth stb
-	void lXz(UGeckoInstruction inst);
-	void lbzu(UGeckoInstruction inst);
-	void lha(UGeckoInstruction inst);
-	void rlwinmx(UGeckoInstruction inst);
-	void rlwimix(UGeckoInstruction inst);
-	void rlwnmx(UGeckoInstruction inst);
-	void negx(UGeckoInstruction inst);
-	void slwx(UGeckoInstruction inst);
-	void srwx(UGeckoInstruction inst);
-	void dcbst(UGeckoInstruction inst);
-	void dcbz(UGeckoInstruction inst);
-	void lfsx(UGeckoInstruction inst);
-
-	void subfic(UGeckoInstruction inst);
-	void subfcx(UGeckoInstruction inst);
-	void subfx(UGeckoInstruction inst);
-	void subfex(UGeckoInstruction inst);
-
-	void lXzx(UGeckoInstruction inst);
-	void lhax(UGeckoInstruction inst);
-
-	void stXx(UGeckoInstruction inst);
-
-	void lmw(UGeckoInstruction inst);
-	void stmw(UGeckoInstruction inst);
-
-	void icbi(UGeckoInstruction inst);
-};
-
-void Jit(u32 em_address);
-
-void ProfiledReJit();
-
-#endif  // _JITIL_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
deleted file mode 100644
index 15786980fa..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "x64ABI.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
-
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "MemoryUtil.h"
-#include "CPUDetect.h"
-
-#include "x64ABI.h"
-#include "Thunk.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-using namespace Gen;
-
-//static int temp32; // unused?
-
-//TODO - make an option
-//#if _DEBUG
-static bool enableDebug = false; 
-//#else
-//		bool enableDebug = false; 
-//#endif
-
-//static bool enableStatistics = false; // unused?
-
-//GLOBAL STATIC ALLOCATIONS x86
-//EAX - ubiquitous scratch register - EVERYBODY scratches this
-
-//GLOBAL STATIC ALLOCATIONS x64
-//EAX - ubiquitous scratch register - EVERYBODY scratches this
-//RBX - Base pointer of memory
-//R15 - Pointer to array of block pointers 
-
-JitILAsmRoutineManager jitil_asm_routines;
-
-// PLAN: no more block numbers - crazy opcodes just contain offset within
-// dynarec buffer
-// At this offset - 4, there is an int specifying the block number.
-
-void JitILAsmRoutineManager::Generate()
-{
-	enterCode = AlignCode16();
-	ABI_PushAllCalleeSavedRegsAndAdjustStack();
-#ifndef _M_IX86
-	// Two statically allocated registers.
-	MOV(64, R(RBX), Imm64((u64)Memory::base));
-	MOV(64, R(R15), Imm64((u64)jit->GetBlockCache()->GetCodePointers())); //It's below 2GB so 32 bits are good enough
-#endif
-//	INT3();
-
-	const u8 *outer_loop = GetCodePtr();
-		ABI_CallFunction(reinterpret_cast<void *>(&CoreTiming::Advance));
-		FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time
-	
-		dispatcher = GetCodePtr();
-			//This is the place for CPUCompare!
-
-			//The result of slice decrement should be in flags if somebody jumped here
-			FixupBranch bail = J_CC(CC_BE, true);
-
-			if (Core::g_CoreStartupParameter.bEnableDebugging)
-			{
-				TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING));
-				FixupBranch notStepping = J_CC(CC_Z);
-				ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckBreakPoints));
-				TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-				FixupBranch noBreakpoint = J_CC(CC_Z);
-				ABI_PopAllCalleeSavedRegsAndAdjustStack();
-				RET();
-				SetJumpTarget(noBreakpoint);
-				SetJumpTarget(notStepping);
-			}
-
-			SetJumpTarget(skipToRealDispatch);
-
-			dispatcherNoCheck = GetCodePtr();
-			MOV(32, R(EAX), M(&PowerPC::ppcState.pc));
-			dispatcherPcInEAX = GetCodePtr();
-
-#ifdef JIT_UNLIMITED_ICACHE
-			u32 mask = 0;
-			FixupBranch no_mem;
-			FixupBranch exit_mem;
-			FixupBranch exit_vmem;
-			if (Core::g_CoreStartupParameter.bWii)
-				mask = JIT_ICACHE_EXRAM_BIT;
-			if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-				mask |= JIT_ICACHE_VMEM_BIT;
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				TEST(32, R(EAX), Imm32(mask));
-				no_mem = J_CC(CC_NZ);
-			}
-			AND(32, R(EAX), Imm32(JIT_ICACHE_MASK));
-#ifdef _M_IX86
-			MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICache()));
-#else
-			MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICache()));
-			MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				exit_mem = J();
-				SetJumpTarget(no_mem);
-			}
-			if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			{
-				TEST(32, R(EAX), Imm32(JIT_ICACHE_VMEM_BIT));
-				FixupBranch no_vmem = J_CC(CC_Z);
-				AND(32, R(EAX), Imm32(JIT_ICACHE_MASK));
-#ifdef _M_IX86
-				MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICacheVMEM()));
-#else
-				MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICacheVMEM()));
-				MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-				if (Core::g_CoreStartupParameter.bWii) exit_vmem = J();
-				SetJumpTarget(no_vmem);
-			}
-			if (Core::g_CoreStartupParameter.bWii)
-			{
-				TEST(32, R(EAX), Imm32(JIT_ICACHE_EXRAM_BIT));
-				FixupBranch no_exram = J_CC(CC_Z);
-				AND(32, R(EAX), Imm32(JIT_ICACHEEX_MASK));
-#ifdef _M_IX86
-				MOV(32, R(EAX), MDisp(EAX, (u32)jit->GetBlockCache()->GetICacheEx()));
-#else
-				MOV(64, R(RSI), Imm64((u64)jit->GetBlockCache()->GetICacheEx()));
-				MOV(32, R(EAX), MComplex(RSI, EAX, SCALE_1, 0));
-#endif
-				SetJumpTarget(no_exram);
-			}
-			if (Core::g_CoreStartupParameter.bWii || Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-				SetJumpTarget(exit_mem);
-			if (Core::g_CoreStartupParameter.bWii && (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack))
-				SetJumpTarget(exit_vmem);
-#else
-#ifdef _M_IX86
-			AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-			MOV(32, R(EBX), Imm32((u32)Memory::base));
-			MOV(32, R(EAX), MComplex(EBX, EAX, SCALE_1, 0));
-#else
-			MOV(32, R(EAX), MComplex(RBX, RAX, SCALE_1, 0));
-#endif
-#endif
-
-			TEST(32, R(EAX), Imm32(0xFC));
-			FixupBranch notfound = J_CC(CC_NZ);
-				BSWAP(32, EAX);
-				//IDEA - we have 26 bits, why not just use offsets from base of code?
-				if (enableDebug)
-				{
-					ADD(32, M(&PowerPC::ppcState.DebugCount), Imm8(1));
-				}
-				//grab from list and jump to it
-#ifdef _M_IX86
-				MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
-				JMPptr(MComplex(EDX, EAX, 4, 0));
-#else
-				JMPptr(MComplex(R15, RAX, 8, 0));
-#endif
-			SetJumpTarget(notfound);
-
-			//Ok, no block, let's jit
-#ifdef _M_IX86
-			ABI_AlignStack(4);
-			PUSH(32, M(&PowerPC::ppcState.pc));
-			CALL(reinterpret_cast<void *>(&Jit));
-			ABI_RestoreStack(4);
-#else
-			MOV(32, R(ABI_PARAM1), M(&PowerPC::ppcState.pc));
-			CALL((void *)&Jit);
-#endif
-			JMP(dispatcherNoCheck); // no point in special casing this
-
-			//FP blocks test for FPU available, jump here if false
-			fpException = AlignCode4(); 
-			MOV(32, R(EAX), M(&PC));
-			MOV(32, M(&NPC), R(EAX));
-			LOCK();
-			OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
-			ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
-			MOV(32, R(EAX), M(&NPC));
-			MOV(32, M(&PC), R(EAX));
-			JMP(dispatcher, true);
-
-		SetJumpTarget(bail);
-		doTiming = GetCodePtr();
-
-		ABI_CallFunction(reinterpret_cast<void *>(&CoreTiming::Advance));
-		
-		testExceptions = GetCodePtr();
-		MOV(32, R(EAX), M(&PC));
-		MOV(32, M(&NPC), R(EAX));
-		ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
-		MOV(32, R(EAX), M(&NPC));
-		MOV(32, M(&PC), R(EAX));
-		
-		TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF));
-		J_CC(CC_Z, outer_loop, true);
-	//Landing pad for drec space
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	RET();
-
-	breakpointBailout = GetCodePtr();
-	//Landing pad for drec space
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	RET();
-
-	GenerateCommon();
-}
-
-void JitILAsmRoutineManager::GenerateCommon()
-{
-	fifoDirectWrite8 = AlignCode4();
-	GenFifoWrite(8);
-	fifoDirectWrite16 = AlignCode4();
-	GenFifoWrite(16);
-	fifoDirectWrite32 = AlignCode4();
-	GenFifoWrite(32);
-	fifoDirectWriteFloat = AlignCode4();
-	GenFifoFloatWrite();
-	fifoDirectWriteXmm64 = AlignCode4();
-	GenFifoXmm64Write();
-
-	doReJit = AlignCode4();
-	ABI_AlignStack(0);
-	CALL(reinterpret_cast<void *>(&ProfiledReJit));
-	ABI_RestoreStack(0);
-	SUB(32, M(&CoreTiming::downcount), Imm8(0));
-	JMP(dispatcher, true);
-
-	GenQuantizedLoads();
-	GenQuantizedStores();
-	GenQuantizedSingleStores();
-
-	//CMPSD(R(XMM0), M(&zero), 
-	// TODO
-
-	// Fast write routines - special case the most common hardware write
-	// TODO: use this.
-	// Even in x86, the param values will be in the right registers.
-	/*
-	const u8 *fastMemWrite8 = AlignCode16();
-	CMP(32, R(ABI_PARAM2), Imm32(0xCC008000));
-	FixupBranch skip_fast_write = J_CC(CC_NE, false);
-	MOV(32, EAX, M(&m_gatherPipeCount));
-	MOV(8, MDisp(EAX, (u32)&m_gatherPipe), ABI_PARAM1);
-	ADD(32, 1, M(&m_gatherPipeCount));
-	RET();
-	SetJumpTarget(skip_fast_write);
-	CALL((void *)&Memory::Write_U8);*/
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h
deleted file mode 100644
index 8222e897c3..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JITASM_H
-#define _JITASM_H
-
-#include "x64Emitter.h"
-#include "../JitCommon/JitAsmCommon.h"
-
-// In Dolphin, we don't use inline assembly. Instead, we generate all machine-near
-// code at runtime. In the case of fixed code like this, after writing it, we write
-// protect the memory, essentially making it work just like precompiled code.
-
-// There are some advantages to this approach:
-//   1) No need to setup an external assembler in the build.
-//   2) Cross platform, as long as it's x86/x64.
-//   3) Can optimize code at runtime for the specific CPU model.
-// There aren't really any disadvantages other than having to maintain a x86 emitter,
-// which we have to do anyway :)
-// 
-// To add a new asm routine, just add another const here, and add the code to Generate.
-// Also, possibly increase the size of the code buffer.
-
-class JitILAsmRoutineManager : public CommonAsmRoutines
-{
-private:
-	void Generate();
-	void GenerateCommon();
-
-public:
-	void Init() {
-		AllocCodeSpace(8192);
-		Generate();
-		WriteProtect();
-	}
-
-	void Shutdown() {
-		FreeCodeSpace();
-	}
-
-	const u8 *doReJit;
-};
-
-extern JitILAsmRoutineManager jitil_asm_routines;
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp
deleted file mode 100644
index d0ea86225d..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../ConfigManager.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-#include "../../HW/Memmap.h"
-
-// The branches are known good, or at least reasonably good.
-// No need for a disable-mechanism.
-
-// If defined, clears CR0 at blr and bl-s. If the assumption that
-// flags never carry over between functions holds, then the task for 
-// an optimizer becomes much easier.
-
-// #define ACID_TEST
-
-// Zelda and many more games seem to pass the Acid Test. 
-
-//#define NORMALBRANCH_START Default(inst); ibuild.EmitInterpreterBranch(); return;
-#define NORMALBRANCH_START
-
-using namespace Gen;
-
-void JitIL::sc(UGeckoInstruction inst)
-{
-	ibuild.EmitSystemCall(ibuild.EmitIntConst(js.compilerPC));
-}
-
-void JitIL::rfi(UGeckoInstruction inst)
-{
-	ibuild.EmitRFIExit();
-}
-
-void JitIL::bx(UGeckoInstruction inst)
-{
-	NORMALBRANCH_START
-	INSTRUCTION_START;
-
-	// We must always process the following sentence
-	// even if the blocks are merged by PPCAnalyst::Flatten().
-	if (inst.LK)
-		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
-
-	// If this is not the last instruction of a block,
-	// we will skip the rest process.
-	// Because PPCAnalyst::Flatten() merged the blocks.
-	if (!js.isLastInstruction) {
-		return;
-	}
-
-	u32 destination;
-	if (inst.AA)
-		destination = SignExt26(inst.LI << 2);
-	else
-		destination = js.compilerPC + SignExt26(inst.LI << 2);
-
-	if (destination == js.compilerPC) {
-		ibuild.EmitShortIdleLoop(ibuild.EmitIntConst(js.compilerPC));
-		return;
-	}
-
-	ibuild.EmitBranchUncond(ibuild.EmitIntConst(destination));
-}
-
-static IREmitter::InstLoc TestBranch(IREmitter::IRBuilder& ibuild, UGeckoInstruction inst) {
-	IREmitter::InstLoc CRTest = 0, CTRTest = 0;
-	if ((inst.BO & 16) == 0)  // Test a CR bit
-	{
-		IREmitter::InstLoc CRReg = ibuild.EmitLoadCR(inst.BI >> 2);
-		IREmitter::InstLoc CRCmp = ibuild.EmitIntConst(8 >> (inst.BI & 3));
-		CRTest = ibuild.EmitAnd(CRReg, CRCmp);
-		if (!(inst.BO & 8))
-			CRTest = ibuild.EmitXor(CRCmp, CRTest);
-	}
-
-	if ((inst.BO & 4) == 0) {
-		IREmitter::InstLoc c = ibuild.EmitLoadCTR();
-		c = ibuild.EmitSub(c, ibuild.EmitIntConst(1));
-		ibuild.EmitStoreCTR(c);
-		if (inst.BO & 2) {
-			CTRTest = ibuild.EmitICmpEq(c,
-					ibuild.EmitIntConst(0));
-		} else {
-			CTRTest = c;
-		}
-	}
-
-	IREmitter::InstLoc Test = CRTest;
-	if (CTRTest) {
-		if (Test)
-			Test = ibuild.EmitAnd(Test, CTRTest);
-		else
-			Test = CTRTest;
-	}
-
-	if (!Test) {
-		Test = ibuild.EmitIntConst(1);
-	}
-	return Test;
-}
-
-void JitIL::bcx(UGeckoInstruction inst)
-{
-	NORMALBRANCH_START
-	if (inst.LK)
-		ibuild.EmitStoreLink(
-			ibuild.EmitIntConst(js.compilerPC + 4));
-
-	IREmitter::InstLoc Test = TestBranch(ibuild, inst);
-
-	u32 destination;
-	if(inst.AA)
-		destination = SignExt16(inst.BD << 2);
-	else
-		destination = js.compilerPC + SignExt16(inst.BD << 2);
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
-		inst.hex == 0x4182fff8 &&			
-		(Memory::ReadUnchecked_U32(js.compilerPC - 8) & 0xFFFF0000) == 0x800D0000 &&
-		(Memory::ReadUnchecked_U32(js.compilerPC - 4) == 0x28000000 ||
-		(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC - 4) == 0x2C000000)) 
-		)
-	{			
-		ibuild.EmitIdleBranch(Test, ibuild.EmitIntConst(destination));
-	}
-	else
-	{
-		ibuild.EmitBranchCond(Test, ibuild.EmitIntConst(destination));
-	}
-	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
-}
-
-void JitIL::bcctrx(UGeckoInstruction inst)
-{
-	NORMALBRANCH_START
-	if ((inst.BO & 4) == 0) {
-		IREmitter::InstLoc c = ibuild.EmitLoadCTR();
-		c = ibuild.EmitSub(c, ibuild.EmitIntConst(1));
-		ibuild.EmitStoreCTR(c);
-	}
-	IREmitter::InstLoc test;
-	if ((inst.BO & 16) == 0)  // Test a CR bit
-	{
-		IREmitter::InstLoc CRReg = ibuild.EmitLoadCR(inst.BI >> 2);
-		IREmitter::InstLoc CRCmp = ibuild.EmitIntConst(8 >> (inst.BI & 3));
-		test = ibuild.EmitAnd(CRReg, CRCmp);
-		if (!(inst.BO & 8))
-			test = ibuild.EmitXor(test, CRCmp);
-	} else {
-		test = ibuild.EmitIntConst(1);
-	}
-	test = ibuild.EmitICmpEq(test, ibuild.EmitIntConst(0));
-	ibuild.EmitBranchCond(test, ibuild.EmitIntConst(js.compilerPC + 4));
-
-	IREmitter::InstLoc destination = ibuild.EmitLoadCTR();
-	destination = ibuild.EmitAnd(destination, ibuild.EmitIntConst(-4));
-	if (inst.LK)
-		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
-	ibuild.EmitBranchUncond(destination);
-}
-
-void JitIL::bclrx(UGeckoInstruction inst)
-{
-	NORMALBRANCH_START
-
-	if (!js.isLastInstruction &&
-		(inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) {
-		if (inst.LK)
-			ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
-		return;
-	}
-
-	if (inst.hex == 0x4e800020) {
-		ibuild.EmitBranchUncond(ibuild.EmitLoadLink());
-		return;
-	}
-	IREmitter::InstLoc test = TestBranch(ibuild, inst);
-	test = ibuild.EmitICmpEq(test, ibuild.EmitIntConst(0));
-	ibuild.EmitBranchCond(test, ibuild.EmitIntConst(js.compilerPC + 4));
-
-	IREmitter::InstLoc destination = ibuild.EmitLoadLink();
-	destination = ibuild.EmitAnd(destination, ibuild.EmitIntConst(-4));
-	if (inst.LK)
-		ibuild.EmitStoreLink(ibuild.EmitIntConst(js.compilerPC + 4));
-	ibuild.EmitBranchUncond(destination);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
deleted file mode 100644
index 6277933e4e..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "JitIL.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-void JitIL::fp_arith_s(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc || (inst.SUBOP5 != 25 && inst.SUBOP5 != 20 &&
-	                inst.SUBOP5 != 21 && inst.SUBOP5 != 26)) {
-		Default(inst); return;
-	}
-	// Only the interpreter has "proper" support for (some) FP flags
-	if (inst.SUBOP5 == 25 && Core::g_CoreStartupParameter.bEnableFPRF) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
-	switch (inst.SUBOP5)
-	{
-	case 20: //sub
-		val = ibuild.EmitFDSub(val, ibuild.EmitLoadFReg(inst.FB));
-		break;
-	case 21: //add
-		val = ibuild.EmitFDAdd(val, ibuild.EmitLoadFReg(inst.FB));
-		break;
-	case 25: //mul
-		val = ibuild.EmitFDMul(val, ibuild.EmitLoadFReg(inst.FC));
-		break;
-	case 26: //rsqrte
-		val = ibuild.EmitLoadFReg(inst.FB);
-		val = ibuild.EmitDoubleToSingle(val);
-		val = ibuild.EmitFSRSqrt(val);
-		val = ibuild.EmitDupSingleToMReg(val);
-		break;
-	default:
-		_assert_msg_(DYNA_REC, 0, "fp_arith_s WTF!!!");
-	}
-
-	if (inst.OPCD == 59) {
-		val = ibuild.EmitDoubleToSingle(val);
-		val = ibuild.EmitDupSingleToMReg(val);
-	} else {
-		val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
-	}
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-void JitIL::fmaddXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	// Only the interpreter has "proper" support for (some) FP flags
-	if (inst.SUBOP5 == 29 && Core::g_CoreStartupParameter.bEnableFPRF) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA);
-	val = ibuild.EmitFDMul(val, ibuild.EmitLoadFReg(inst.FC));
-	if (inst.SUBOP5 & 1)
-		val = ibuild.EmitFDAdd(val, ibuild.EmitLoadFReg(inst.FB));
-	else
-		val = ibuild.EmitFDSub(val, ibuild.EmitLoadFReg(inst.FB));
-	if (inst.SUBOP5 & 2)
-		val = ibuild.EmitFDNeg(val);
-	if (inst.OPCD == 59) {
-		val = ibuild.EmitDoubleToSingle(val);
-		val = ibuild.EmitDupSingleToMReg(val);
-	} else {
-		val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
-	}
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-void JitIL::fmrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FB);
-	val = ibuild.EmitInsertDoubleInMReg(val, ibuild.EmitLoadFReg(inst.FD));
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-void JitIL::fcmpx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	IREmitter::InstLoc lhs, rhs, res;
-	lhs = ibuild.EmitLoadFReg(inst.FA);
-	rhs = ibuild.EmitLoadFReg(inst.FB);
-	int ordered = (inst.SUBOP10 == 32) ? 1 : 0;
-	res = ibuild.EmitFDCmpCR(lhs, rhs, ordered);
-	ibuild.EmitStoreFPRF(res);
-	ibuild.EmitStoreCR(res, inst.CRFD);
-}
-
-void JitIL::fsign(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	Default(inst);
-	return;
-
-	// TODO
-	switch (inst.SUBOP10) {
-	case 40:  // fnegx
-		break;
-	case 264: // fabsx
-		break;
-	case 136: // fnabs
-		break;
-	default:
-		PanicAlert("fsign bleh");
-		break;
-	}
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp
deleted file mode 100644
index 4ff8361dab..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp
+++ /dev/null
@@ -1,514 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifdef _MSC_VER
-#pragma warning(disable:4146)  // unary minus operator applied to unsigned type, result still unsigned
-#endif
-
-#include "../../Core.h" // include "Common.h", "CoreParameter.h", SCoreStartupParameter
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-static void ComputeRC(IREmitter::IRBuilder& ibuild,
-		      IREmitter::InstLoc val) {
-	IREmitter::InstLoc res =
-		ibuild.EmitICmpCRSigned(val, ibuild.EmitIntConst(0));
-	ibuild.EmitStoreCR(res, 0);
-}
-
-void JitIL::reg_imm(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int d = inst.RD, a = inst.RA, s = inst.RS;
-	IREmitter::InstLoc val, test, c;
-	switch (inst.OPCD)
-	{
-	case 14: //addi
-		val = ibuild.EmitIntConst(inst.SIMM_16);
-		if (a)
-			val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), val);
-		ibuild.EmitStoreGReg(val, d);
-		break;
-	case 15: //addis
-		val = ibuild.EmitIntConst(inst.SIMM_16 << 16);
-		if (a)
-			val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), val);
-		ibuild.EmitStoreGReg(val, d);
-		break;
-	case 24: //ori
-		val = ibuild.EmitIntConst(inst.UIMM);
-		val = ibuild.EmitOr(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		break;
-	case 25: //oris
-		val = ibuild.EmitIntConst(inst.UIMM << 16);
-		val = ibuild.EmitOr(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		break;
-	case 28: //andi
-		val = ibuild.EmitIntConst(inst.UIMM);
-		val = ibuild.EmitAnd(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		ComputeRC(ibuild, val);
-		break;
-	case 29: //andis
-		val = ibuild.EmitIntConst(inst.UIMM << 16);
-		val = ibuild.EmitAnd(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		ComputeRC(ibuild, val);
-		break;
-	case 26: //xori
-		val = ibuild.EmitIntConst(inst.UIMM);
-		val = ibuild.EmitXor(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		break;
-	case 27: //xoris
-		val = ibuild.EmitIntConst(inst.UIMM << 16);
-		val = ibuild.EmitXor(ibuild.EmitLoadGReg(s), val);
-		ibuild.EmitStoreGReg(val, a);
-		break;
-	case 12: //addic
-	case 13: //addic_rc
-		c = ibuild.EmitIntConst(inst.SIMM_16);
-		val = ibuild.EmitAdd(ibuild.EmitLoadGReg(a), c);
-		ibuild.EmitStoreGReg(val, d);
-		test = ibuild.EmitICmpUgt(c, val);
-		ibuild.EmitStoreCarry(test);
-		if (inst.OPCD == 13)
-			ComputeRC(ibuild, val);
-		break;
-	default:
-		Default(inst);
-		break;
-	}
-}
-
-void JitIL::cmpXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc lhs, rhs, res;
-	lhs = ibuild.EmitLoadGReg(inst.RA);
-	if (inst.OPCD == 31) {
-		rhs = ibuild.EmitLoadGReg(inst.RB);
-		if (inst.SUBOP10 == 32) {
-			res = ibuild.EmitICmpCRUnsigned(lhs, rhs);
-		} else {
-			res = ibuild.EmitICmpCRSigned(lhs, rhs);
-		}
-	} else if (inst.OPCD == 10) {
-		rhs = ibuild.EmitIntConst(inst.UIMM);
-		res = ibuild.EmitICmpCRUnsigned(lhs, rhs);
-	} else { // inst.OPCD == 11
-		rhs = ibuild.EmitIntConst(inst.SIMM_16);
-		res = ibuild.EmitICmpCRSigned(lhs, rhs);
-	}
-	js.downcountAmount++; //TODO: should this be somewhere else?
-	
-	ibuild.EmitStoreCR(res, inst.CRFD);
-}
-
-void JitIL::boolX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	IREmitter::InstLoc a = NULL;
-	IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS);
-	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
-
-	// FIXME: Some instructions does not work well in NSMBW, MP2, etc.
-	//        Refer JitIL_Tables.cpp.
-	if (inst.SUBOP10 == 28) /* andx */
-	{
-		a = ibuild.EmitAnd(s, b);
-	}
-	else if (inst.SUBOP10 == 476) /* nandx */
-	{
-		a = ibuild.EmitNot(ibuild.EmitAnd(s, b));
-	}
-	else if (inst.SUBOP10 == 60) /* andcx */
-	{
-		a = ibuild.EmitAnd(s, ibuild.EmitNot(b));
-	}
-	else if (inst.SUBOP10 == 444) /* orx */
-	{
-		a = ibuild.EmitOr(s, b);
-	}
-	else if (inst.SUBOP10 == 124) /* norx */
-	{
-		a = ibuild.EmitNot(ibuild.EmitOr(s, b));
-	}
-	else if (inst.SUBOP10 == 412) /* orcx */
-	{
-		a = ibuild.EmitOr(s, ibuild.EmitNot(b));
-	}
-	else if (inst.SUBOP10 == 316) /* xorx */
-	{
-		a = ibuild.EmitXor(s, b);
-	}
-	else if (inst.SUBOP10 == 284) /* eqvx */
-	{
-		a = ibuild.EmitNot(ibuild.EmitXor(s, b));
-	}
-	else
-	{
-		PanicAlert("WTF!");
-	}
-
-	ibuild.EmitStoreGReg(a, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, a);
-}
-
-void JitIL::extsbx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitSExt8(val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::extshx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitSExt16(val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::subfic(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc nota, lhs, val, test;
-	nota = ibuild.EmitXor(ibuild.EmitLoadGReg(inst.RA),
-			      ibuild.EmitIntConst(-1));
-	if (inst.SIMM_16 == -1) {
-		val = nota;
-		test = ibuild.EmitIntConst(1);
-	} else {
-		lhs = ibuild.EmitIntConst(inst.SIMM_16 + 1);
-		val = ibuild.EmitAdd(nota, lhs);
-		test = ibuild.EmitICmpUgt(lhs, val);
-	}
-	ibuild.EmitStoreGReg(val, inst.RD);
-	ibuild.EmitStoreCarry(test);
-}
-
-void JitIL::subfcx(UGeckoInstruction inst) 
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	if (inst.OE) PanicAlert("OE: subfcx");
-	IREmitter::InstLoc val, test, lhs, rhs;
-	lhs = ibuild.EmitLoadGReg(inst.RB);
-	rhs = ibuild.EmitLoadGReg(inst.RA);
-	val = ibuild.EmitSub(lhs, rhs);
-	ibuild.EmitStoreGReg(val, inst.RD);
-	test = ibuild.EmitICmpEq(rhs, ibuild.EmitIntConst(0));
-	test = ibuild.EmitOr(test, ibuild.EmitICmpUgt(lhs, val));
-	ibuild.EmitStoreCarry(test);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::subfex(UGeckoInstruction inst) 
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	if (inst.OE) PanicAlert("OE: subfex");
-	IREmitter::InstLoc val, test, lhs, rhs, carry;
-	rhs = ibuild.EmitLoadGReg(inst.RA);
-	carry = ibuild.EmitLoadCarry();
-	rhs = ibuild.EmitXor(rhs, ibuild.EmitIntConst(-1));
-	rhs = ibuild.EmitAdd(rhs, carry);
-	test = ibuild.EmitICmpEq(rhs, ibuild.EmitIntConst(0));
-	test = ibuild.EmitAnd(test, carry);
-	lhs = ibuild.EmitLoadGReg(inst.RB);
-	val = ibuild.EmitAdd(lhs, rhs);
-	ibuild.EmitStoreGReg(val, inst.RD);
-	test = ibuild.EmitOr(test, ibuild.EmitICmpUgt(lhs, val));
-	ibuild.EmitStoreCarry(test);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::subfx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	if (inst.OE) PanicAlert("OE: subfx");
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
-	val = ibuild.EmitSub(val, ibuild.EmitLoadGReg(inst.RA));
-	ibuild.EmitStoreGReg(val, inst.RD);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::mulli(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA);
-	val = ibuild.EmitMul(val, ibuild.EmitIntConst(inst.SIMM_16));
-	ibuild.EmitStoreGReg(val, inst.RD);
-}
-
-void JitIL::mullwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
-	val = ibuild.EmitMul(ibuild.EmitLoadGReg(inst.RA), val);
-	ibuild.EmitStoreGReg(val, inst.RD);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::mulhwux(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA);
-	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
-	IREmitter::InstLoc d = ibuild.EmitMulHighUnsigned(a, b);
-	ibuild.EmitStoreGReg(d, inst.RD);
-	if (inst.Rc)
-		ComputeRC(ibuild, d);
-}
-
-// skipped some of the special handling in here - if we get crashes, let the interpreter handle this op
-void JitIL::divwux(UGeckoInstruction inst) {
-	Default(inst); return;
-#if 0
-	int a = inst.RA, b = inst.RB, d = inst.RD;
-	gpr.FlushLockX(EDX);
-	gpr.Lock(a, b, d);
-	if (d != a && d != b) {
-		gpr.LoadToX64(d, false, true);
-	} else {
-		gpr.LoadToX64(d, true, true);
-	}
-	MOV(32, R(EAX), gpr.R(a));
-	XOR(32, R(EDX), R(EDX));
-	gpr.KillImmediate(b);
-	DIV(32, gpr.R(b));
-	MOV(32, gpr.R(d), R(EAX));
-	gpr.UnlockAll();
-	gpr.UnlockAllX();
-	if (inst.Rc) {
-		CALL((u8*)asm_routines.computeRc);
-	}
-#endif
-}
-
-void JitIL::addx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RB);
-	val = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), val);
-	ibuild.EmitStoreGReg(val, inst.RD);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::addzex(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc lhs = ibuild.EmitLoadGReg(inst.RA),
-	                   val, newcarry;
-	val = ibuild.EmitAdd(lhs, ibuild.EmitLoadCarry());
-	ibuild.EmitStoreGReg(val, inst.RD);
-	newcarry = ibuild.EmitICmpUlt(val, lhs);
-	ibuild.EmitStoreCarry(newcarry);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::addex(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	IREmitter::InstLoc a = ibuild.EmitLoadGReg(inst.RA);
-	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);
-
-	IREmitter::InstLoc ab = ibuild.EmitAdd(a, b);
-	IREmitter::InstLoc new_carry = ibuild.EmitICmpUlt(ab, a);
-
-	IREmitter::InstLoc previous_carry = ibuild.EmitLoadCarry();
-	IREmitter::InstLoc abc = ibuild.EmitAdd(ab, previous_carry);
-	new_carry = ibuild.EmitOr(new_carry, ibuild.EmitICmpUlt(abc, ab));
-
-	ibuild.EmitStoreGReg(abc, inst.RD);
-	ibuild.EmitStoreCarry(new_carry);
-
-	if (inst.OE) PanicAlert("OE: addex");
-	if (inst.Rc)
-		ComputeRC(ibuild, abc);
-}
-
-void JitIL::rlwinmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	unsigned mask = Helper_Mask(inst.MB, inst.ME);
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH));
-	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-
-void JitIL::rlwimix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	unsigned mask = Helper_Mask(inst.MB, inst.ME);
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitRol(val, ibuild.EmitIntConst(inst.SH));
-	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
-	IREmitter::InstLoc ival = ibuild.EmitLoadGReg(inst.RA);
-	ival = ibuild.EmitAnd(ival, ibuild.EmitIntConst(~mask));
-	val = ibuild.EmitOr(ival, val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::rlwnmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	unsigned int mask = Helper_Mask(inst.MB, inst.ME);
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitRol(val, ibuild.EmitLoadGReg(inst.RB));
-	val = ibuild.EmitAnd(val, ibuild.EmitIntConst(mask));
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::negx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RA);
-	val = ibuild.EmitSub(ibuild.EmitIntConst(0), val);
-	ibuild.EmitStoreGReg(val, inst.RD);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::srwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS),
-		           samt = ibuild.EmitLoadGReg(inst.RB),
-		           corr;
-	// FIXME: We can do better with a cmov
-	// FIXME: We can do better on 64-bit
-	val = ibuild.EmitShrl(val, samt);
-	corr = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
-	corr = ibuild.EmitSarl(corr, ibuild.EmitIntConst(31));
-	corr = ibuild.EmitXor(corr, ibuild.EmitIntConst(-1));
-	val = ibuild.EmitAnd(corr, val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::slwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS),
-		           samt = ibuild.EmitLoadGReg(inst.RB),
-		           corr;
-	// FIXME: We can do better with a cmov
-	// FIXME: We can do better on 64-bit
-	val = ibuild.EmitShl(val, samt);
-	corr = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
-	corr = ibuild.EmitSarl(corr, ibuild.EmitIntConst(31));
-	corr = ibuild.EmitXor(corr, ibuild.EmitIntConst(-1));
-	val = ibuild.EmitAnd(corr, val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::srawx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	// FIXME: We can do a lot better on 64-bit
-	IREmitter::InstLoc val, samt, mask, mask2, test;
-	val = ibuild.EmitLoadGReg(inst.RS);
-	samt = ibuild.EmitLoadGReg(inst.RB);
-	mask = ibuild.EmitIntConst(-1);
-	val = ibuild.EmitSarl(val, samt);
-	mask = ibuild.EmitShl(mask, samt);
-	samt = ibuild.EmitShl(samt, ibuild.EmitIntConst(26));
-	samt = ibuild.EmitSarl(samt, ibuild.EmitIntConst(31));
-	samt = ibuild.EmitAnd(samt, ibuild.EmitIntConst(31));
-	val = ibuild.EmitSarl(val, samt);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	mask = ibuild.EmitShl(mask, samt);
-	mask2 = ibuild.EmitAnd(mask, ibuild.EmitIntConst(0x7FFFFFFF));
-	test = ibuild.EmitOr(val, mask2);
-	test = ibuild.EmitICmpUgt(test, mask);
-	ibuild.EmitStoreCarry(test);
-	
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-void JitIL::srawix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS), test;
-	val = ibuild.EmitSarl(val, ibuild.EmitIntConst(inst.SH));
-	ibuild.EmitStoreGReg(val, inst.RA);
-	unsigned int mask = -1u << inst.SH;
-	test = ibuild.EmitOr(val, ibuild.EmitIntConst(mask & 0x7FFFFFFF));
-	test = ibuild.EmitICmpUgt(test, ibuild.EmitIntConst(mask));
-	
-	ibuild.EmitStoreCarry(test);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
-
-// count leading zeroes
-void JitIL::cntlzwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	IREmitter::InstLoc val = ibuild.EmitLoadGReg(inst.RS);
-	val = ibuild.EmitCntlzw(val);
-	ibuild.EmitStoreGReg(val, inst.RA);
-	if (inst.Rc)
-		ComputeRC(ibuild, val);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
deleted file mode 100644
index 98b6726227..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-void JitIL::lhax(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
-	val = ibuild.EmitSExt16(val);
-	ibuild.EmitStoreGReg(val, inst.RD);
-}
-
-void JitIL::lXz(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.OPCD & 1)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	IREmitter::InstLoc val;
-	switch (inst.OPCD & ~0x1)
-	{
-	case 32: val = ibuild.EmitLoad32(addr); break; //lwz	
-	case 40: val = ibuild.EmitLoad16(addr); break; //lhz
-	case 34: val = ibuild.EmitLoad8(addr);  break; //lbz
-	default: PanicAlert("lXz: invalid access size"); val = 0; break;
-	}
-	ibuild.EmitStoreGReg(val, inst.RD);
-}
-
-void JitIL::lbzu(UGeckoInstruction inst) {
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	const IREmitter::InstLoc uAddress = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), ibuild.EmitIntConst((int)inst.SIMM_16));
-	const IREmitter::InstLoc temp = ibuild.EmitLoad8(uAddress);
-	ibuild.EmitStoreGReg(temp, inst.RD);
-	ibuild.EmitStoreGReg(uAddress, inst.RA);
-}
-
-void JitIL::lha(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr =
-		ibuild.EmitIntConst((s32)(s16)inst.SIMM_16);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	IREmitter::InstLoc val = ibuild.EmitLoad16(addr);
-	val = ibuild.EmitSExt16(val);
-	ibuild.EmitStoreGReg(val, inst.RD);
-}
-
-void JitIL::lXzx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB);
-	if (inst.RA) {
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-		if (inst.SUBOP10 & 32)
-			ibuild.EmitStoreGReg(addr, inst.RA);
-	}
-	IREmitter::InstLoc val;
-	switch (inst.SUBOP10 & ~32)
-	{
-	default: PanicAlert("lXzx: invalid access size");
-	case 23:  val = ibuild.EmitLoad32(addr); break; //lwzx
-	case 279: val = ibuild.EmitLoad16(addr); break; //lhzx
-	case 87:  val = ibuild.EmitLoad8(addr);  break; //lbzx
-	}
-	ibuild.EmitStoreGReg(val, inst.RD);
-}
-
-void JitIL::dcbst(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	// If the dcbst instruction is preceded by dcbt, it is flushing a prefetched
-	// memory location.  Do not invalidate the JIT cache in this case as the memory
-	// will be the same.
-	// dcbt = 0x7c00022c
-	if ((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c)
-	{
-		Default(inst); return;
-	}
-}
-
-// Zero cache line.
-void JitIL::dcbz(UGeckoInstruction inst)
-{
-	Default(inst); return;
-
-	// TODO!
-#if 0
-	if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		{Default(inst); return;} // turn off from debugger	
-	INSTRUCTION_START;
-		MOV(32, R(EAX), gpr.R(inst.RB));
-	if (inst.RA)
-		ADD(32, R(EAX), gpr.R(inst.RA));
-	AND(32, R(EAX), Imm32(~31));
-	XORPD(XMM0, R(XMM0));
-#ifdef _M_X64
-	MOVAPS(MComplex(EBX, EAX, SCALE_1, 0), XMM0);
-	MOVAPS(MComplex(EBX, EAX, SCALE_1, 16), XMM0);
-#else
-	AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-	MOVAPS(MDisp(EAX, (u32)Memory::base), XMM0);
-	MOVAPS(MDisp(EAX, (u32)Memory::base + 16), XMM0);
-#endif
-#endif
-}
-
-void JitIL::stX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16),
-			   value = ibuild.EmitLoadGReg(inst.RS);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(ibuild.EmitLoadGReg(inst.RA), addr);
-	if (inst.OPCD & 1)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	switch (inst.OPCD & ~1)
-	{
-	case 36: ibuild.EmitStore32(value, addr); break; //stw
-	case 44: ibuild.EmitStore16(value, addr); break; //sth
-	case 38: ibuild.EmitStore8(value, addr); break;  //stb
-	default: _assert_msg_(DYNA_REC, 0, "AWETKLJASDLKF"); return;
-	}
-}
-
-void JitIL::stXx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB),
-			   value = ibuild.EmitLoadGReg(inst.RS);
-	addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.SUBOP10 & 32)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	switch (inst.SUBOP10 & ~32)
-	{
-	case 151: ibuild.EmitStore32(value, addr); break; //stw
-	case 407: ibuild.EmitStore16(value, addr); break; //sth
-	case 215: ibuild.EmitStore8(value, addr); break;  //stb
-	default: _assert_msg_(DYNA_REC, 0, "AWETKLJASDLKF"); return;
-	}
-}
-
-// A few games use these heavily in video codecs. (GFZP01 @ 0x80020E18)
-void JitIL::lmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	for (int i = inst.RD; i < 32; i++)
-	{
-		IREmitter::InstLoc val = ibuild.EmitLoad32(addr);
-		ibuild.EmitStoreGReg(val, i);
-		addr = ibuild.EmitAdd(addr, ibuild.EmitIntConst(4));
-	}
-}
-
-void JitIL::stmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	for (int i = inst.RD; i < 32; i++)
-	{
-		IREmitter::InstLoc val = ibuild.EmitLoadGReg(i);
-		ibuild.EmitStore32(val, addr);
-		addr = ibuild.EmitAdd(addr, ibuild.EmitIntConst(4));
-	}
-}
-
-void JitIL::icbi(UGeckoInstruction inst)
-{
-	Default(inst);
-	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
deleted file mode 100644
index c2bcc4baa1..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
-
-#include "Common.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h" // include "Common.h", "CoreParameter.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-// TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common,
-// and pshufb could help a lot.
-// Also add hacks for things like lfs/stfs the same reg consecutively, that is, simple memory moves.
-
-void JitIL::lfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val;
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	val = ibuild.EmitDupSingleToMReg(ibuild.EmitLoadSingle(addr));
-	ibuild.EmitStoreFReg(val, inst.RD);
-	return;
-}
-
-
-void JitIL::lfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16), val;
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	val = ibuild.EmitLoadFReg(inst.RD);
-	val = ibuild.EmitInsertDoubleInMReg(ibuild.EmitLoadDouble(addr), val);
-	ibuild.EmitStoreFReg(val, inst.RD);
-	return;
-}
-
-
-void JitIL::stfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16),
-			   val  = ibuild.EmitLoadFReg(inst.RS);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.OPCD & 1)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	ibuild.EmitStoreDouble(val, addr);
-	return;
-}
-
-
-void JitIL::stfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_16),
-			   val  = ibuild.EmitLoadFReg(inst.RS);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.OPCD & 1)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	val = ibuild.EmitDoubleToSingle(val);
-	ibuild.EmitStoreSingle(val, addr);
-	return;
-}
-
-
-void JitIL::stfsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB),
-			   val  = ibuild.EmitLoadFReg(inst.RS);
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	val = ibuild.EmitDoubleToSingle(val);
-	ibuild.EmitStoreSingle(val, addr);
-	return;
-}
-
-
-void JitIL::lfsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	if (js.memcheck) { Default(inst); return; }
-	IREmitter::InstLoc addr = ibuild.EmitLoadGReg(inst.RB), val;
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	val = ibuild.EmitDupSingleToMReg(ibuild.EmitLoadSingle(addr));
-	ibuild.EmitStoreFReg(val, inst.RD);
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
deleted file mode 100644
index 33b81623c1..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "Thunk.h"
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "JitIL.h"
-#include "JitILAsm.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-void JitIL::psq_st(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-	if (js.memcheck) { Default(inst); return; }
-	if (inst.W) {Default(inst); return;}
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val;
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.OPCD == 61)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	val = ibuild.EmitLoadFReg(inst.RS);
-	val = ibuild.EmitCompactMRegToPacked(val);
-	ibuild.EmitStorePaired(val, addr, inst.I);
-}
-
-void JitIL::psq_l(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-	if (js.memcheck) { Default(inst); return; }
-	if (inst.W) {Default(inst); return;}
-	IREmitter::InstLoc addr = ibuild.EmitIntConst(inst.SIMM_12), val;
-	if (inst.RA)
-		addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA));
-	if (inst.OPCD == 57)
-		ibuild.EmitStoreGReg(addr, inst.RA);
-	val = ibuild.EmitLoadPaired(addr, inst.I | (inst.W << 3));	// The lower 3 bits is for GQR index. The next 1 bit is for inst.W
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.RD);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp
deleted file mode 100644
index fcbb26a3c2..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "../../HW/GPFifo.h"
-
-#include "JitIL.h"
-
-void JitIL::ps_mr(UGeckoInstruction inst)
-{
-	Default(inst); return;
-}
-
-void JitIL::ps_sel(UGeckoInstruction inst)
-{
-	Default(inst); return;
-}
-
-void JitIL::ps_sign(UGeckoInstruction inst)
-{
-	Default(inst); return;
-}
-
-void JitIL::ps_rsqrte(UGeckoInstruction inst)
-{
-	Default(inst); return;
-}
-
-void JitIL::ps_arith(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc || (inst.SUBOP5 != 21 && inst.SUBOP5 != 20 && inst.SUBOP5 != 25)) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA), rhs;
-	if (inst.SUBOP5 == 25)
-		rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-	else
-		rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-	val = ibuild.EmitCompactMRegToPacked(val);
-	
-	switch (inst.SUBOP5)
-	{
-	case 20:
-		val = ibuild.EmitFPSub(val, rhs);
-		break;
-	case 21:
-		val = ibuild.EmitFPAdd(val, rhs);
-		break;
-	case 25:
-		val = ibuild.EmitFPMul(val, rhs);
-	}
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-void JitIL::ps_sum(UGeckoInstruction inst)
-{
-	// TODO: This operation strikes me as a bit strange...
-	// perhaps we can optimize it depending on the users?
-	// TODO: ps_sum breaks Sonic Colours (black screen) 
-	Default(inst); return;
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc || inst.SUBOP5 != 10) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA), temp;
-	val = ibuild.EmitCompactMRegToPacked(val);
-	val = ibuild.EmitFPDup0(val);
-	temp = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-	val = ibuild.EmitFPAdd(val, temp);
-	temp = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-	val = ibuild.EmitFPMerge11(val, temp);
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-
-void JitIL::ps_muls(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA),
-	                   rhs = ibuild.EmitLoadFReg(inst.FC);
-
-	val = ibuild.EmitCompactMRegToPacked(val);
-	rhs = ibuild.EmitCompactMRegToPacked(rhs);
-
-	if (inst.SUBOP5 == 12)
-		rhs = ibuild.EmitFPDup0(rhs);
-	else
-		rhs = ibuild.EmitFPDup1(rhs);
-
-	val = ibuild.EmitFPMul(val, rhs);
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-
-//TODO: find easy cases and optimize them, do a breakout like ps_arith
-void JitIL::ps_mergeXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-
-	IREmitter::InstLoc val = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FA)),
-			   rhs = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-
-	switch (inst.SUBOP10)
-	{
-	case 528: 
-		val = ibuild.EmitFPMerge00(val, rhs);
-		break; //00
-	case 560:
-		val = ibuild.EmitFPMerge01(val, rhs);
-		break; //01
-	case 592:
-		val = ibuild.EmitFPMerge10(val, rhs);
-		break; //10
-	case 624:
-		val = ibuild.EmitFPMerge11(val, rhs);
-		break; //11
-	default:
-		_assert_msg_(DYNA_REC, 0, "ps_merge - invalid op");
-	}
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
-
-
-void JitIL::ps_maddXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	
-	IREmitter::InstLoc val = ibuild.EmitLoadFReg(inst.FA), op2, op3;
-	val = ibuild.EmitCompactMRegToPacked(val);
-	switch (inst.SUBOP5)
-	{
-	case 14: {//madds0
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		op2 = ibuild.EmitFPDup0(op2);
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPAdd(val, op3);
-		break;
-	}
-	case 15: {//madds1
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		op2 = ibuild.EmitFPDup1(op2);
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPAdd(val, op3);
-		break;
-	}
-	case 28: {//msub
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPSub(val, op3);
-		break;
-	}
-	case 29: {//madd
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPAdd(val, op3);
-		break;
-	}
-	case 30: {//nmsub
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPSub(val, op3);
-		val = ibuild.EmitFPNeg(val);
-		break;
-	}
-	case 31: {//nmadd
-		op2 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FC));
-		val = ibuild.EmitFPMul(val, op2);
-		op3 = ibuild.EmitCompactMRegToPacked(ibuild.EmitLoadFReg(inst.FB));
-		val = ibuild.EmitFPAdd(val, op3);
-		val = ibuild.EmitFPNeg(val);
-		break;
-	}
-	}
-	val = ibuild.EmitExpandPackedToMReg(val);
-	ibuild.EmitStoreFReg(val, inst.FD);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
deleted file mode 100644
index cb3ab91b32..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "../../Core.h"
-#include "../../CoreTiming.h"
-#include "../../HW/SystemTimers.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-
-#include "JitIL.h"
-
-//#define INSTRUCTION_START Default(inst); return;
-#define INSTRUCTION_START
-
-void JitIL::mtspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-		JITDISABLE(bJITSystemRegistersOff)
-		u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-	switch(iIndex) {
-		case SPR_TL:
-		case SPR_TU:
-			Default(inst);
-			return;
-		case SPR_LR:
-			ibuild.EmitStoreLink(ibuild.EmitLoadGReg(inst.RD));
-			return;
-		case SPR_CTR:
-			ibuild.EmitStoreCTR(ibuild.EmitLoadGReg(inst.RD));
-			return;
-		case SPR_GQR0:
-		case SPR_GQR0 + 1:
-		case SPR_GQR0 + 2:
-		case SPR_GQR0 + 3:
-		case SPR_GQR0 + 4:
-		case SPR_GQR0 + 5:
-		case SPR_GQR0 + 6:
-		case SPR_GQR0 + 7:
-			ibuild.EmitStoreGQR(ibuild.EmitLoadGReg(inst.RD), iIndex - SPR_GQR0);
-			return;
-		case SPR_SRR0:
-		case SPR_SRR1:
-			ibuild.EmitStoreSRR(ibuild.EmitLoadGReg(inst.RD), iIndex - SPR_SRR0);
-			return;
-		default:
-			Default(inst);
-			return;
-	}
-}
-
-void JitIL::mfspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-		JITDISABLE(bJITSystemRegistersOff)
-		u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-	switch (iIndex)
-	{
-	case SPR_TL:
-	case SPR_TU:
-		Default(inst);
-		return;
-	case SPR_LR:
-		ibuild.EmitStoreGReg(ibuild.EmitLoadLink(), inst.RD);
-		return;
-	case SPR_CTR:
-		ibuild.EmitStoreGReg(ibuild.EmitLoadCTR(), inst.RD);
-		return;
-	case SPR_GQR0:
-	case SPR_GQR0 + 1:
-	case SPR_GQR0 + 2:
-	case SPR_GQR0 + 3:
-	case SPR_GQR0 + 4:
-	case SPR_GQR0 + 5:
-	case SPR_GQR0 + 6:
-	case SPR_GQR0 + 7:
-		ibuild.EmitStoreGReg(ibuild.EmitLoadGQR(iIndex - SPR_GQR0), inst.RD);
-		return;
-	default:
-		Default(inst);
-		return;
-	}
-}
-
-
-// =======================================================================================
-// Don't interpret this, if we do we get thrown out
-// --------------
-void JitIL::mtmsr(UGeckoInstruction inst)
-{
-	ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS), ibuild.EmitIntConst(js.compilerPC));
-	ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4));
-}
-// ==============
-
-
-void JitIL::mfmsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-		JITDISABLE(bJITSystemRegistersOff)
-		ibuild.EmitStoreGReg(ibuild.EmitLoadMSR(), inst.RD);
-}
-
-void JitIL::mftb(UGeckoInstruction inst)
-{
-	INSTRUCTION_START;
-	JITDISABLE(bJITSystemRegistersOff)
-		mfspr(inst);
-}
-
-void JitIL::mfcr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START;
-	JITDISABLE(bJITSystemRegistersOff)
-
-	IREmitter::InstLoc d = ibuild.EmitIntConst(0);
-	for (int i = 0; i < 8; ++i)
-	{
-		d = ibuild.EmitShl(d, ibuild.EmitIntConst(4));
-		d = ibuild.EmitOr(d, ibuild.EmitLoadCR(i));
-	}
-	ibuild.EmitStoreGReg(d, inst.RD);
-}
-
-void JitIL::mtcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START;
-	JITDISABLE(bJITSystemRegistersOff)
-
-	IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS);
-	for (int i = 0; i < 8; ++i)
-	{
-		if (inst.CRM & (0x80 >> i))
-		{
-			IREmitter::InstLoc value;
-			value = ibuild.EmitShrl(s, ibuild.EmitIntConst(28 - i * 4));
-			value = ibuild.EmitAnd(value, ibuild.EmitIntConst(0xF));
-			ibuild.EmitStoreCR(value, i);
-		}
-	}
-}
-
-void JitIL::mcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	if (inst.CRFS != inst.CRFD)
-	{
-		ibuild.EmitStoreCR(ibuild.EmitLoadCR(inst.CRFS), inst.CRFD);
-	}
-}
-
-void JitIL::crXX(UGeckoInstruction inst)
-{
-	// Ported from Jit_SystemRegister.cpp
-
-	// Get bit CRBA in EAX aligned with bit CRBD
-	const int shiftA = (inst.CRBD & 3) - (inst.CRBA & 3);
-	IREmitter::InstLoc eax = ibuild.EmitLoadCR(inst.CRBA >> 2);
-	if (shiftA < 0)
-		eax = ibuild.EmitShl(eax, ibuild.EmitIntConst(-shiftA));
-	else if (shiftA > 0)
-		eax = ibuild.EmitShrl(eax, ibuild.EmitIntConst(shiftA));
-
-	// Get bit CRBB in ECX aligned with bit CRBD
-	const int shiftB = (inst.CRBD & 3) - (inst.CRBB & 3);
-	IREmitter::InstLoc ecx = ibuild.EmitLoadCR(inst.CRBB >> 2);
-	if (shiftB < 0)
-		ecx = ibuild.EmitShl(ecx, ibuild.EmitIntConst(-shiftB));
-	else if (shiftB > 0)
-		ecx = ibuild.EmitShrl(ecx, ibuild.EmitIntConst(shiftB));
-
-	// Compute combined bit
-	const unsigned subop = inst.SUBOP10;
-	switch (subop) {
-		case 257:
-			// crand
-			eax = ibuild.EmitAnd(eax, ecx);	
-			break;
-		case 129:
-			// crandc
-			ecx = ibuild.EmitNot(ecx);
-			eax = ibuild.EmitAnd(eax, ecx);	
-			break;
-		case 289:
-			// creqv
-			eax = ibuild.EmitXor(eax, ecx);
-			eax = ibuild.EmitNot(eax);
-			break;
-		case 225:
-			// crnand
-			eax = ibuild.EmitAnd(eax, ecx);
-			eax = ibuild.EmitNot(eax);
-			break;
-		case 33:
-			// crnor
-			eax = ibuild.EmitOr(eax, ecx);
-			eax = ibuild.EmitNot(eax);
-			break;
-		case 449:
-			// cror
-			eax = ibuild.EmitOr(eax, ecx);
-			break;
-		case 417:
-			// crorc
-			ecx = ibuild.EmitNot(ecx);
-			eax = ibuild.EmitOr(eax, ecx);
-			break;
-		case 193:
-			// crxor
-			eax = ibuild.EmitXor(eax, ecx);
-			break;
-		default:
-			PanicAlert("crXX: invalid instruction");
-			break;
-	}
-
-	// Store result bit in CRBD
-	eax = ibuild.EmitAnd(eax, ibuild.EmitIntConst(0x8 >> (inst.CRBD & 3)));
-	IREmitter::InstLoc bd = ibuild.EmitLoadCR(inst.CRBD >> 2);
-	bd = ibuild.EmitAnd(bd, ibuild.EmitIntConst(~(0x8 >> (inst.CRBD & 3))));
-	bd = ibuild.EmitOr(bd, eax);
-	ibuild.EmitStoreCR(bd, inst.CRBD >> 2);
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
deleted file mode 100644
index 7ca1ad5a53..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "JitIL_Tables.h"
-
-// Should be moved in to the Jit class
-typedef void (JitIL::*_Instruction) (UGeckoInstruction instCode);
-
-static _Instruction dynaOpTable[64];
-static _Instruction dynaOpTable4[1024];
-static _Instruction dynaOpTable19[1024];
-static _Instruction dynaOpTable31[1024];
-static _Instruction dynaOpTable59[32];
-static _Instruction dynaOpTable63[1024];
-
-void JitIL::DynaRunTable4(UGeckoInstruction _inst)  {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);}
-void JitIL::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);}
-void JitIL::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);}
-void JitIL::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);}
-void JitIL::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);}
-
-
-
-struct GekkoOPTemplate
-{
-	int opcode;
-	_Instruction Inst;
-	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
-};
-
-static GekkoOPTemplate primarytable[] = 
-{
-	{4,  &JitIL::DynaRunTable4}, //"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0}},
-	{19, &JitIL::DynaRunTable19}, //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}},
-	{31, &JitIL::DynaRunTable31}, //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}},
-	{59, &JitIL::DynaRunTable59}, //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}},
-	{63, &JitIL::DynaRunTable63}, //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}},
-
-	{16, &JitIL::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{18, &JitIL::bx}, //"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-
-	{1,  &JitIL::HLEFunction}, //"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{2,  &JitIL::Default}, //"DynaBlock",   OPTYPE_SYSTEM, 0}},
-	{3,  &JitIL::Default}, //"twi",         OPTYPE_SYSTEM, 0}},
-	{17, &JitIL::sc}, //"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
-
-	{7,  &JitIL::mulli}, //"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}},
-	{8,  &JitIL::subfic}, //"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A |	FL_SET_CA}},
-	{10, &JitIL::cmpXX}, //"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{11, &JitIL::cmpXX}, //"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{12, &JitIL::reg_imm}, //"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}},
-	{13, &JitIL::reg_imm}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}},
-	{14, &JitIL::reg_imm}, //"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-	{15, &JitIL::reg_imm}, //"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-
-	{20, &JitIL::rlwimix}, //"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}},
-	{21, &JitIL::rlwinmx}, //"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{23, &JitIL::rlwnmx}, //"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
-
-	{24, &JitIL::reg_imm}, //"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{25, &JitIL::reg_imm}, //"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{26, &JitIL::reg_imm}, //"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{27, &JitIL::reg_imm}, //"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{28, &JitIL::reg_imm}, //"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-	{29, &JitIL::reg_imm}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-
-	{32, &JitIL::lXz}, //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{33, &JitIL::lXz}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{34, &JitIL::lXz}, //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{35, &JitIL::lbzu}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{40, &JitIL::lXz}, //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{41, &JitIL::lXz}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{42, &JitIL::lha}, //"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{43, &JitIL::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-
-	{44, &JitIL::stX}, //"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{45, &JitIL::stX}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{36, &JitIL::stX}, //"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{37, &JitIL::stX}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{38, &JitIL::stX}, //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{39, &JitIL::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-
-	{46, &JitIL::lmw}, //"lmw",   OPTYPE_SYSTEM, FL_EVIL, 10}},
-	{47, &JitIL::stmw}, //"stmw",  OPTYPE_SYSTEM, FL_EVIL, 10}},
-
-	{48, &JitIL::lfs}, //"lfs",  OPTYPE_LOADFP, FL_IN_A}},
-	{49, &JitIL::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-	{50, &JitIL::lfd}, //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
-	{51, &JitIL::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-
-	{52, &JitIL::stfs}, //"stfs",  OPTYPE_STOREFP, FL_IN_A}},
-	{53, &JitIL::stfs}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-	{54, &JitIL::stfd}, //"stfd",  OPTYPE_STOREFP, FL_IN_A}},
-	{55, &JitIL::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-
-	{56, &JitIL::psq_l}, //"psq_l",   OPTYPE_PS, FL_IN_A}},
-	{57, &JitIL::psq_l}, //"psq_lu",  OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-	{60, &JitIL::psq_st}, //"psq_st",  OPTYPE_PS, FL_IN_A}},
-	{61, &JitIL::psq_st}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-
-	//missing: 0, 5, 6, 9, 22, 30, 62, 58
-	{0,  &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{5,  &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{6,  &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{9,  &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{22, &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{30, &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{62, &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{58, &JitIL::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-};
-
-static GekkoOPTemplate table4[] = 
-{    //SUBOP10
-	{0,    &JitIL::Default}, //"ps_cmpu0",   OPTYPE_PS, FL_SET_CRn}},
-	{32,   &JitIL::Default}, //"ps_cmpo0",   OPTYPE_PS, FL_SET_CRn}},
-	{40,   &JitIL::ps_sign}, //"ps_neg",     OPTYPE_PS, FL_RC_BIT}},
-	{136,  &JitIL::ps_sign}, //"ps_nabs",    OPTYPE_PS, FL_RC_BIT}},
-	{264,  &JitIL::ps_sign}, //"ps_abs",     OPTYPE_PS, FL_RC_BIT}},
-	{64,   &JitIL::Default}, //"ps_cmpu1",   OPTYPE_PS, FL_RC_BIT}},
-	{72,   &JitIL::ps_mr}, //"ps_mr",      OPTYPE_PS, FL_RC_BIT}},
-	{96,   &JitIL::Default}, //"ps_cmpo1",   OPTYPE_PS, FL_RC_BIT}},
-	{528,  &JitIL::ps_mergeXX}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}},
-	{560,  &JitIL::ps_mergeXX}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}},
-	{592,  &JitIL::ps_mergeXX}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}},
-	{624,  &JitIL::ps_mergeXX}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}},
-
-	{1014, &JitIL::Default}, //"dcbz_l",     OPTYPE_SYSTEM, 0}},
-};		
-
-static GekkoOPTemplate table4_2[] = 
-{
-	{10, &JitIL::ps_sum}, //"ps_sum0",   OPTYPE_PS, 0}},
-	{11, &JitIL::ps_sum}, //"ps_sum1",   OPTYPE_PS, 0}},
-	{12, &JitIL::ps_muls}, //"ps_muls0",  OPTYPE_PS, 0}},
-	{13, &JitIL::ps_muls}, //"ps_muls1",  OPTYPE_PS, 0}},
-	{14, &JitIL::ps_maddXX}, //"ps_madds0", OPTYPE_PS, 0}},
-	{15, &JitIL::ps_maddXX}, //"ps_madds1", OPTYPE_PS, 0}},
-	{18, &JitIL::ps_arith}, //"ps_div",    OPTYPE_PS, 0, 16}},
-	{20, &JitIL::ps_arith}, //"ps_sub",    OPTYPE_PS, 0}},
-	{21, &JitIL::ps_arith}, //"ps_add",    OPTYPE_PS, 0}},
-	{23, &JitIL::ps_sel}, //"ps_sel",    OPTYPE_PS, 0}},
-	{24, &JitIL::Default}, //"ps_res",    OPTYPE_PS, 0}},
-	{25, &JitIL::ps_arith}, //"ps_mul",    OPTYPE_PS, 0}},
-	{26, &JitIL::ps_rsqrte}, //"ps_rsqrte", OPTYPE_PS, 0, 1}},
-	{28, &JitIL::ps_maddXX}, //"ps_msub",   OPTYPE_PS, 0}},
-	{29, &JitIL::ps_maddXX}, //"ps_madd",   OPTYPE_PS, 0}},
-	{30, &JitIL::ps_maddXX}, //"ps_nmsub",  OPTYPE_PS, 0}},
-	{31, &JitIL::ps_maddXX}, //"ps_nmadd",  OPTYPE_PS, 0}},
-};
-
-
-static GekkoOPTemplate table4_3[] = 
-{
-	{6,  &JitIL::Default}, //"psq_lx",   OPTYPE_PS, 0}},
-	{7,  &JitIL::Default}, //"psq_stx",  OPTYPE_PS, 0}},
-	{38, &JitIL::Default}, //"psq_lux",  OPTYPE_PS, 0}},
-	{39, &JitIL::Default}, //"psq_stux", OPTYPE_PS, 0}}, 
-};
-
-static GekkoOPTemplate table19[] = 
-{
-	{528, &JitIL::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{16,  &JitIL::bclrx}, //"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{257, &JitIL::crXX}, //"crand",  OPTYPE_CR, FL_EVIL}},
-	{129, &JitIL::crXX}, //"crandc", OPTYPE_CR, FL_EVIL}},
-	{289, &JitIL::crXX}, //"creqv",  OPTYPE_CR, FL_EVIL}},
-	{225, &JitIL::crXX}, //"crnand", OPTYPE_CR, FL_EVIL}},
-	{33,  &JitIL::crXX}, //"crnor",  OPTYPE_CR, FL_EVIL}},
-	{449, &JitIL::crXX}, //"cror",   OPTYPE_CR, FL_EVIL}},
-	{417, &JitIL::crXX}, //"crorc",  OPTYPE_CR, FL_EVIL}},
-	{193, &JitIL::crXX}, //"crxor",  OPTYPE_CR, FL_EVIL}},
-												   
-	{150, &JitIL::DoNothing}, //"isync",  OPTYPE_ICACHE, FL_EVIL}},
-	{0,   &JitIL::mcrf}, //"mcrf",   OPTYPE_SYSTEM, FL_EVIL}},
-												   
-	{50,  &JitIL::rfi}, //"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}},
-	{18,  &JitIL::Default}, //"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}}
-};
-
-
-static GekkoOPTemplate table31[] = 
-{
-	{28,  &JitIL::boolX}, //"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{60,  &JitIL::boolX}, //"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{444, &JitIL::boolX}, //"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{124, &JitIL::boolX}, //"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{316, &JitIL::boolX}, //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{412, &JitIL::boolX}, //"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{476, &JitIL::boolX}, //"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{284, &JitIL::boolX}, //"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{0,   &JitIL::cmpXX}, //"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{32,  &JitIL::cmpXX}, //"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{26,  &JitIL::cntlzwx}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{922, &JitIL::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{954, &JitIL::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{536, &JitIL::srwx}, //"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{792, &JitIL::srawx}, //"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{824, &JitIL::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{24,  &JitIL::slwx}, //"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-
-	{54,   &JitIL::dcbst}, //"dcbst",  OPTYPE_DCACHE, 0, 4}},
-	{86,   &JitIL::Default}, //"dcbf",   OPTYPE_DCACHE, 0, 4}},
-	{246,  &JitIL::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}},
-	{278,  &JitIL::DoNothing}, //"dcbt",   OPTYPE_DCACHE, 0, 1}},
-	{470,  &JitIL::Default}, //"dcbi",   OPTYPE_DCACHE, 0, 4}},
-	{758,  &JitIL::DoNothing}, //"dcba",   OPTYPE_DCACHE, 0, 4}},
-	{1014, &JitIL::dcbz}, //"dcbz",   OPTYPE_DCACHE, 0, 4}},
-	//load word
-	{23,  &JitIL::lXzx}, //"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{55,  &JitIL::lXzx}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword
-	{279, &JitIL::lXzx}, //"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{311, &JitIL::lXzx}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword signextend
-	{343, &JitIL::lhax}, //"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{375, &JitIL::Default}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte
-	{87,  &JitIL::lXzx}, //"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{119, &JitIL::lXzx}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte reverse
-	{534, &JitIL::Default}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{790, &JitIL::Default}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-
-	// Conditional load/store (Wii SMP)
-	{150, &JitIL::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}},
-	{20,  &JitIL::Default}, //"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}},
-
-	//load string (interpret these)
-	{533, &JitIL::Default}, //"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}},
-	{597, &JitIL::Default}, //"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}},
-
-	//store word
-	{151, &JitIL::stXx}, //"stwx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{183, &JitIL::stXx}, //"stwux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store halfword
-	{407, &JitIL::stXx}, //"sthx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{439, &JitIL::stXx}, //"sthux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store byte
-	{215, &JitIL::stXx}, //"stbx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{247, &JitIL::stXx}, //"stbux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store bytereverse
-	{662, &JitIL::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{918, &JitIL::Default}, //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}},
-
-	{661, &JitIL::Default}, //"stswx",  OPTYPE_STORE, FL_EVIL}},
-	{725, &JitIL::Default}, //"stswi",  OPTYPE_STORE, FL_EVIL}},
-
-	// fp load/store	
-	{535, &JitIL::lfsx}, //"lfsx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{567, &JitIL::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-	{599, &JitIL::Default}, //"lfdx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{631, &JitIL::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-
-	{663, &JitIL::stfsx}, //"stfsx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{695, &JitIL::Default}, //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{727, &JitIL::Default}, //"stfdx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{759, &JitIL::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{983, &JitIL::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-
-	{19,  &JitIL::mfcr}, //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
-	{83,  &JitIL::mfmsr}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
-	{144, &JitIL::mtcrf}, //"mtcrf",  OPTYPE_SYSTEM, 0}},
-	{146, &JitIL::mtmsr}, //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{210, &JitIL::Default}, //"mtsr",   OPTYPE_SYSTEM, 0}},
-	{242, &JitIL::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}},
-	{339, &JitIL::mfspr}, //"mfspr",  OPTYPE_SPR, FL_OUT_D}},
-	{467, &JitIL::mtspr}, //"mtspr",  OPTYPE_SPR, 0, 2}},
-	{371, &JitIL::mftb}, //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
-	{512, &JitIL::Default}, //"mcrxr",  OPTYPE_SYSTEM, 0}},
-	{595, &JitIL::Default}, //"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2}},
-	{659, &JitIL::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}},
-
-	{4,   &JitIL::Default}, //"tw",     OPTYPE_SYSTEM, 0, 1}},
-	{598, &JitIL::DoNothing}, //"sync",   OPTYPE_SYSTEM, 0, 2}},
-	{982, &JitIL::icbi}, //"icbi",   OPTYPE_SYSTEM, FL_ENDBLOCK, 3}},
-
-	// Unused instructions on GC
-	{310, &JitIL::Default}, //"eciwx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{438, &JitIL::Default}, //"ecowx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{854, &JitIL::Default}, //"eieio",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{306, &JitIL::Default}, //"tlbie",   OPTYPE_SYSTEM, 0}},
-	{370, &JitIL::Default}, //"tlbia",   OPTYPE_SYSTEM, 0}},
-	{566, &JitIL::Default}, //"tlbsync", OPTYPE_SYSTEM, 0}},
-};
-
-static GekkoOPTemplate table31_2[] = 
-{	
-	{266,  &JitIL::addx}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{778,  &JitIL::addx}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{10,   &JitIL::Default}, //"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{522,  &JitIL::Default}, //"addcox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{138,  &JitIL::addex}, //"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{650,  &JitIL::addex}, //"addeox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{234,  &JitIL::Default}, //"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{202,  &JitIL::addzex}, //"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{491,  &JitIL::Default}, //"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{1003, &JitIL::Default}, //"divwox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{459,  &JitIL::divwux}, //"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{971,  &JitIL::divwux}, //"divwuox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{75,   &JitIL::Default}, //"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{11,   &JitIL::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{235,  &JitIL::mullwx}, //"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{747,  &JitIL::mullwx}, //"mullwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{104,  &JitIL::negx}, //"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{40,   &JitIL::subfx}, //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{552,  &JitIL::subfx}, //"subox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{8,    &JitIL::subfcx}, //"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{520,  &JitIL::subfcx}, //"subfcox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{136,  &JitIL::subfex}, //"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{232,  &JitIL::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{200,  &JitIL::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-};
-
-static GekkoOPTemplate table59[] = 
-{
-	{18, &JitIL::Default},       //{"fdivsx",   OPTYPE_FPU, FL_RC_BIT_F, 16}}, 
-	{20, &JitIL::fp_arith_s}, //"fsubsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{21, &JitIL::fp_arith_s}, //"faddsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-//	{22, &JitIL::Default}, //"fsqrtsx",  OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko
-	{24, &JitIL::Default}, //"fresx",    OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{25, &JitIL::fp_arith_s}, //"fmulsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{28, &JitIL::fmaddXX}, //"fmsubsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{29, &JitIL::fmaddXX}, //"fmaddsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{30, &JitIL::fmaddXX}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{31, &JitIL::fmaddXX}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-};							    
-
-static GekkoOPTemplate table63[] = 
-{
-	{264, &JitIL::fsign},   //"fabsx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{32,  &JitIL::fcmpx},   //"fcmpo",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{0,   &JitIL::fcmpx},   //"fcmpu",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{14,  &JitIL::Default}, //"fctiwx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{15,  &JitIL::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}},
-	{72,  &JitIL::fmrx},    //"fmrx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{136, &JitIL::fsign},   //"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{40,  &JitIL::fsign},   //"fnegx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{12,  &JitIL::Default}, //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
-
-	{64,  &JitIL::Default}, //"mcrfs",   OPTYPE_SYSTEMFP, 0}},
-	{583, &JitIL::Default}, //"mffsx",   OPTYPE_SYSTEMFP, 0}},
-	{70,  &JitIL::Default}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}},
-	{38,  &JitIL::Default}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}},
-	{134, &JitIL::Default}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}},
-	{711, &JitIL::Default}, //"mtfsfx",  OPTYPE_SYSTEMFP, 0, 2}},
-};
-
-static GekkoOPTemplate table63_2[] = 
-{
-	{18, &JitIL::Default}, //"fdivx",    OPTYPE_FPU, FL_RC_BIT_F, 30}},
-	{20, &JitIL::Default}, //"fsubx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{21, &JitIL::Default}, //"faddx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{22, &JitIL::Default}, //"fsqrtx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{23, &JitIL::Default}, //"fselx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{25, &JitIL::fp_arith_s}, //"fmulx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{26, &JitIL::fp_arith_s}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}},
-	{28, &JitIL::fmaddXX}, //"fmsubx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{29, &JitIL::fmaddXX}, //"fmaddx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{30, &JitIL::fmaddXX}, //"fnmsubx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{31, &JitIL::fmaddXX}, //"fnmaddx",  OPTYPE_FPU, FL_RC_BIT_F}},
-};
-
-namespace JitILTables
-{
-
-void CompileInstruction(PPCAnalyst::CodeOp & op)
-{
-	JitIL *jitil = (JitIL *)jit;
-	(jitil->*dynaOpTable[op.inst.OPCD])(op.inst);
-	GekkoOPInfo *info = op.opinfo;
-	if (info) {
-#ifdef OPLOG
-		if (!strcmp(info->opname, OP_TO_LOG)){  ///"mcrfs"
-			rsplocations.push_back(jit.js.compilerPC);
-		}
-#endif
-		info->compileCount++;
-		info->lastUse = jit->js.compilerPC;
-	} else {
-		PanicAlert("Tried to compile illegal (or unknown) instruction %08x, at %08x", op.inst.hex, jit->js.compilerPC);
-	}
-}
-
-void InitTables()
-{
-	// once initialized, tables are read-only
-	static bool initialized = false;
-	if (initialized)
-		return;
-
-	//clear
-	for (int i = 0; i < 32; i++) 
-	{
-		dynaOpTable59[i] = &JitIL::unknown_instruction;
-	}
-
-	for (int i = 0; i < 1024; i++)
-	{
-		dynaOpTable4 [i] = &JitIL::unknown_instruction;
-		dynaOpTable19[i] = &JitIL::unknown_instruction;
-		dynaOpTable31[i] = &JitIL::unknown_instruction;
-		dynaOpTable63[i] = &JitIL::unknown_instruction;	
-	}
-
-	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
-	{
-		dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_2[j].opcode;
-			dynaOpTable4[op] = table4_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < 16; i++)
-	{
-		int fill = i << 6;
-		for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_3[j].opcode;
-			dynaOpTable4[op] = table4_3[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table4[i].opcode;
-		dynaOpTable4[op] = table4[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table31[i].opcode;
-		dynaOpTable31[op] = table31[i].Inst;
-	}
-
-	for (int i = 0; i < 1; i++)
-	{
-		int fill = i << 9;
-		for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table31_2[j].opcode;
-			dynaOpTable31[op] = table31_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table19[i].opcode;
-		dynaOpTable19[op] = table19[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table59[i].opcode;
-		dynaOpTable59[op] = table59[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table63[i].opcode;
-		dynaOpTable63[op] = table63[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table63_2[j].opcode;
-			dynaOpTable63[op] = table63_2[j].Inst;
-		}
-	}
-
-	initialized = true;
-}
-
-}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h
deleted file mode 100644
index 7225bf8abc..0000000000
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef JITIL_TABLES_H
-#define JITIL_TABLES_H
-
-#include "../Gekko.h"
-#include "../PPCTables.h"
-#include "../Jit64IL/JitIL.h"
-
-namespace JitILTables
-{
-	void CompileInstruction(PPCAnalyst::CodeOp & op);
-	void InitTables();
-}
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
deleted file mode 100644
index c7cdb81d21..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <map>
-
-#include "Common.h"
-#include "../../HLE/HLE.h"
-#include "../../Core.h"
-#include "../../PatchEngine.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
-#include "../PowerPC.h"
-#include "../Profiler.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
-#include "Jit.h"
-#include "JitArm_Tables.h"
-#include "ArmEmitter.h"
-#include "../JitInterface.h"
-
-using namespace ArmGen;
-using namespace PowerPC;
-
-static int CODE_SIZE = 1024*1024*32;
-namespace CPUCompare
-{
-	extern u32 m_BlockStart;
-}
-
-void JitArm::Init()
-{
-	AllocCodeSpace(CODE_SIZE);
-	blocks.Init();
-	asm_routines.Init();
-	gpr.Init(this);
-	fpr.Init(this);
-	jo.enableBlocklink = true;
-	jo.optimizeGatherPipe = true;
-}
-
-void JitArm::ClearCache() 
-{
-	ClearCodeSpace();
-	blocks.Clear();
-}
-
-void JitArm::Shutdown()
-{
-	FreeCodeSpace();
-	blocks.Shutdown();
-	asm_routines.Shutdown();
-}
-
-// This is only called by Default() in this file. It will execute an instruction with the interpreter functions.
-void JitArm::WriteCallInterpreter(UGeckoInstruction inst)
-{
-	gpr.Flush();
-	fpr.Flush();
-	Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
-	MOVI2R(R0, inst.hex);
-	MOVI2R(R12, (u32)instr);
-	BL(R12);
-}
-void JitArm::unknown_instruction(UGeckoInstruction inst)
-{
-	PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex);
-}
-
-void JitArm::Default(UGeckoInstruction _inst)
-{
-	WriteCallInterpreter(_inst.hex);
-}
-
-void JitArm::HLEFunction(UGeckoInstruction _inst)
-{
-	gpr.Flush();
-	fpr.Flush();
-	MOVI2R(R0, js.compilerPC);
-	MOVI2R(R1, _inst.hex);
-	QuickCallFunction(R14, (void*)&HLE::Execute); 
-	ARMReg rA = gpr.GetReg();
-	LDR(rA, R9, PPCSTATE_OFF(npc));
-	WriteExitDestInR(rA);
-}
-
-void JitArm::DoNothing(UGeckoInstruction _inst)
-{
-	// Yup, just don't do anything.
-}
-
-static const bool ImHereDebug = false;
-static const bool ImHereLog = false;
-static std::map<u32, int> been_here;
-
-static void ImHere()
-{
-	static File::IOFile f;
-	if (ImHereLog)
-	{
-		if (!f)
-		{
-			f.Open("log32.txt", "w");
-		}
-		fprintf(f.GetHandle(), "%08x\n", PC);
-	}
-	if (been_here.find(PC) != been_here.end())
-	{
-		been_here.find(PC)->second++;
-		if ((been_here.find(PC)->second) & 1023)
-			return;
-	}
-	DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR);
-	been_here[PC] = 1;
-}
-
-void JitArm::Cleanup()
-{
-	if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0)
-	{
-		PUSH(4, R0, R1, R2, R3);
-		QuickCallFunction(R14, (void*)&GPFifo::CheckGatherPipe);
-		POP(4, R0, R1, R2, R3);
-	}
-}
-void JitArm::DoDownCount()
-{
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	MOVI2R(rA, (u32)&CoreTiming::downcount);
-	LDR(rB, rA);
-	if(js.downcountAmount < 255) // We can enlarge this if we used rotations
-	{
-		SUBS(rB, rB, js.downcountAmount);
-		STR(rB, rA);
-	}
-	else
-	{
-		ARMReg rC = gpr.GetReg(false);
-		MOVI2R(rC, js.downcountAmount);
-		SUBS(rB, rB, rC);
-		STR(rB, rA);
-	}
-	gpr.Unlock(rA, rB);
-}
-void JitArm::WriteExitDestInR(ARMReg Reg) 
-{
-	STR(Reg, R9, PPCSTATE_OFF(pc));
-	Cleanup();
-	DoDownCount();
-	MOVI2R(Reg, (u32)asm_routines.dispatcher);
-	B(Reg);
-	gpr.Unlock(Reg);
-}
-void JitArm::WriteRfiExitDestInR(ARMReg Reg) 
-{
-	STR(Reg, R9, PPCSTATE_OFF(pc));
-	Cleanup();
-	DoDownCount();
-
-	MOVI2R(Reg, (u32)asm_routines.testExceptions);
-	B(Reg);
-	gpr.Unlock(Reg); // This was locked in the instruction beforehand
-}
-void JitArm::WriteExceptionExit()
-{
-	ARMReg A = gpr.GetReg(false);
-	Cleanup();
-	DoDownCount();
-
-	MOVI2R(A, (u32)asm_routines.testExceptions);
-	B(A);
-}
-void JitArm::WriteExit(u32 destination, int exit_num)
-{
-	Cleanup();
-
-	DoDownCount(); 
-	//If nobody has taken care of this yet (this can be removed when all branches are done)
-	JitBlock *b = js.curBlock;
-	b->exitAddress[exit_num] = destination;
-	b->exitPtrs[exit_num] = GetWritableCodePtr();
-	
-	// Link opportunity!
-	int block = blocks.GetBlockNumberFromStartAddress(destination);
-	if (block >= 0 && jo.enableBlocklink) 
-	{
-		// It exists! Joy of joy!
-		B(blocks.GetBlock(block)->checkedEntry);
-		b->linkStatus[exit_num] = true;
-	}
-	else 
-	{
-		ARMReg A = gpr.GetReg(false);
-		MOVI2R(A, destination);
-		STR(A, R9, PPCSTATE_OFF(pc));
-		MOVI2R(A, (u32)asm_routines.dispatcher);
-		B(A);	
-	}
-}
-
-void STACKALIGN JitArm::Run()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-}
-
-void JitArm::SingleStep()
-{
-	CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
-	pExecAddr();
-}
-
-void JitArm::Trace()
-{
-	char regs[500] = "";
-	char fregs[750] = "";
-
-#ifdef JIT_LOG_GPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
-		strncat(regs, reg, 500);
-	}
-#endif
-
-#ifdef JIT_LOG_FPR
-	for (int i = 0; i < 32; i++)
-	{
-		char reg[50];
-		sprintf(reg, "f%02d: %016x ", i, riPS0(i));
-		strncat(fregs, reg, 750);
-	}
-#endif	
-
-	DEBUG_LOG(DYNA_REC, "JITARM PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", 
-		PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], 
-		PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, 
-		PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs);
-}
-
-void JitArm::PrintDebug(UGeckoInstruction inst, u32 level)
-{
-	if (level > 0)
-	printf("Start: %08x OP '%s' Info\n", (u32)GetCodePtr(),  PPCTables::GetInstructionName(inst));
-	if (level > 1)
-	{
-		GekkoOPInfo* Info = GetOpInfo(inst.hex);
-		printf("\tOuts\n");
-		if (Info->flags & FL_OUT_A)
-			printf("\t-OUT_A: %x\n", inst.RA);
-		if(Info->flags & FL_OUT_D)
-			printf("\t-OUT_D: %x\n", inst.RD);
-		printf("\tIns\n");
-		// A, AO, B, C, S
-		if(Info->flags & FL_IN_A)
-			printf("\t-IN_A: %x\n", inst.RA);
-		if(Info->flags & FL_IN_A0)
-			printf("\t-IN_A0: %x\n", inst.RA);
-		if(Info->flags & FL_IN_B)
-			printf("\t-IN_B: %x\n", inst.RB);
-		if(Info->flags & FL_IN_C)
-			printf("\t-IN_C: %x\n", inst.RC);
-		if(Info->flags & FL_IN_S)
-			printf("\t-IN_S: %x\n", inst.RS);
-	}
-}
-
-void STACKALIGN JitArm::Jit(u32 em_address)
-{
-	if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || Core::g_CoreStartupParameter.bJITNoBlockCache)
-	{
-		ClearCache();
-	}
-
-	int block_num = blocks.AllocateBlock(PowerPC::ppcState.pc);
-	JitBlock *b = blocks.GetBlock(block_num);
-	const u8* BlockPtr = DoJit(PowerPC::ppcState.pc, &code_buffer, b);
-	blocks.FinalizeBlock(block_num, jo.enableBlocklink, BlockPtr);
-}
-void JitArm::Break(UGeckoInstruction inst)
-{
-	ERROR_LOG(DYNA_REC, "%s called a Break instruction!", PPCTables::GetInstructionName(inst));
-	BKPT(0x4444);
-}
-
-const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b)
-{
-	int blockSize = code_buf->GetSize();
-	// Memory exception on instruction fetch
-	bool memory_exception = false;
-
-	// A broken block is a block that does not end in a branch
-	bool broken_block = false;
-
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		// Comment out the following to disable breakpoints (speed-up)
-		blockSize = 1;
-		broken_block = true;
-		Trace();
-	}
-
-	if (em_address == 0)
-	{
-		Core::SetState(Core::CORE_PAUSE);
-		PanicAlert("ERROR: Compiling at 0. LR=%08x CTR=%08x", LR, CTR);
-	}
-
-	if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT))
-	{
-		if (!Memory::TranslateAddress(em_address, Memory::FLAG_OPCODE))
-		{
-			// Memory exception occurred during instruction fetch
-			memory_exception = true;
-		}
-	}
-
-
-	int size = 0;
-	js.isLastInstruction = false;
-	js.blockStart = em_address;
-	js.fifoBytesThisBlock = 0;
-	js.curBlock = b;
-	js.block_flags = 0;
-	js.cancel = false;
-
-	// Analyze the block, collect all instructions it is made of (including inlining,
-	// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
-	u32 nextPC = em_address;
-	u32 merged_addresses[32];
-	const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]);
-	int size_of_merged_addresses = 0;
-	if (!memory_exception)
-	{
-		// If there is a memory exception inside a block (broken_block==true), compile up to that instruction.
-		nextPC = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses);
-	}
-	PPCAnalyst::CodeOp *ops = code_buf->codebuffer;
-
-	const u8 *start = GetCodePtr(); 
-	b->checkedEntry = start;
-	b->runCount = 0;
-
-	// Downcount flag check, Only valid for linked blocks
-	{
-		SetCC(CC_MI);
-		ARMReg rA = gpr.GetReg(false);
-		MOVI2R(rA, js.blockStart);
-		STR(rA, R9, PPCSTATE_OFF(pc));
-		MOVI2R(rA, (u32)asm_routines.doTiming);
-		B(rA);
-		SetCC();
-	}
-
-	const u8 *normalEntry = GetCodePtr();
-	b->normalEntry = normalEntry;
-
-	if(ImHereDebug)
-		QuickCallFunction(R14, (void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful
-
-	if (js.fpa.any)
-	{
-		// This block uses FPU - needs to add FP exception bailout
-		ARMReg A = gpr.GetReg();
-		ARMReg C = gpr.GetReg();
-		Operand2 Shift(2, 10); // 1 << 13
-		MOVI2R(C, js.blockStart); // R3
-		LDR(A, R9, PPCSTATE_OFF(msr));
-		TST(A, Shift);
-		SetCC(CC_EQ);
-		STR(C, R9, PPCSTATE_OFF(pc));
-		MOVI2R(A, (u32)asm_routines.fpException);
-		B(A);
-		SetCC();
-		gpr.Unlock(A, C);	
-	}
-	// Conditionally add profiling code.
-	if (Profiler::g_ProfileBlocks) {
-		ARMReg rA = gpr.GetReg();
-		ARMReg rB = gpr.GetReg();
-		MOVI2R(rA, (u32)&b->runCount); // Load in to register
-		LDR(rB, rA); // Load the actual value in to R11.
-		ADD(rB, rB, 1); // Add one to the value
-		STR(rB, rA); // Now store it back in the memory location 
-		// get start tic
-		PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart);
-		gpr.Unlock(rA, rB);
-	}
-	gpr.Start(js.gpa);
-	fpr.Start(js.fpa);
-	js.downcountAmount = 0;
-	if (!Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		for (int i = 0; i < size_of_merged_addresses; ++i)
-		{
-			const u32 address = merged_addresses[i];
-			js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);
-		}
-	}
-
-	js.skipnext = false;
-	js.blockSize = size;
-	js.compilerPC = nextPC;
-	// Translate instructions
-	for (int i = 0; i < (int)size; i++)
-	{
-		js.compilerPC = ops[i].address;
-		js.op = &ops[i];
-		js.instructionNumber = i;
-		const GekkoOPInfo *opinfo = ops[i].opinfo;
-		js.downcountAmount += (opinfo->numCyclesMinusOne + 1);
-
-		if (i == (int)size - 1)
-		{
-			// WARNING - cmp->branch merging will screw this up.
-			js.isLastInstruction = true;
-			js.next_inst = 0;
-			if (Profiler::g_ProfileBlocks) {
-				// CAUTION!!! push on stack regs you use, do your stuff, then pop
-				PROFILER_VPUSH;
-				// get end tic
-				PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop);
-				// tic counter += (end tic - start tic)
-				PROFILER_ADD_DIFF_LARGE_INTEGER(&b->ticCounter, &b->ticStop, &b->ticStart);
-				PROFILER_VPOP;
-			}
-		}
-		else
-		{
-			// help peephole optimizations
-			js.next_inst = ops[i + 1].inst;
-			js.next_compilerPC = ops[i + 1].address;
-		}
-		if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32)
-		{
-			js.fifoBytesThisBlock -= 32;
-			PUSH(4, R0, R1, R2, R3);
-			QuickCallFunction(R14, (void*)&GPFifo::CheckGatherPipe);
-			POP(4, R0, R1, R2, R3);
-		}
-		if (Core::g_CoreStartupParameter.bEnableDebugging)
-		{
-			// Add run count
-			static const u64 One = 1;
-			ARMReg RA = gpr.GetReg();
-			ARMReg RB = gpr.GetReg();
-			ARMReg VA = fpr.GetReg();
-			ARMReg VB = fpr.GetReg();
-			MOVI2R(RA, (u32)&opinfo->runCount);
-			MOVI2R(RB, (u32)&One);
-			VLDR(VA, RA, 0);
-			VLDR(VB, RB, 0);
-			NEONXEmitter nemit(this);
-			nemit.VADD(I_64, VA, VA, VB);
-			VSTR(VA, RA, 0);
-			gpr.Unlock(RA, RB);
-			fpr.Unlock(VA);
-			fpr.Unlock(VB);
-		}
-		if (!ops[i].skip)
-		{
-				PrintDebug(ops[i].inst, 0);
-				if (js.memcheck && (opinfo->flags & FL_USE_FPU))
-				{
-					// Don't do this yet
-					BKPT(0x7777);
-				}
-				JitArmTables::CompileInstruction(ops[i]);
-				fpr.Flush();
-				if (js.memcheck && (opinfo->flags & FL_LOADSTORE))
-				{
-					// Don't do this yet
-					BKPT(0x666);
-				}
-		}
-	}
-	if (memory_exception)
-		BKPT(0x500);
-	if	(broken_block)
-	{
-		printf("Broken Block going to 0x%08x\n", nextPC);
-		WriteExit(nextPC, 0);
-	}
-	
-	b->flags = js.block_flags;
-	b->codeSize = (u32)(GetCodePtr() - normalEntry);
-	b->originalSize = size;
-	FlushIcache();
-	return start;
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
deleted file mode 100644
index e4bf7d6941..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// ========================
-// See comments in Jit.cpp.
-// ========================
-
-// Mystery: Capcom vs SNK 800aa278
-
-// CR flags approach:
-//   * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3".
-//   * All flag altering instructions flush this
-//   * A flush simply does a conditional write to the appropriate CRx.
-//   * If flag available, branch code can become absolutely trivial.
-
-// Settings
-// ----------
-#ifndef _JITARM_H
-#define _JITARM_H
-#include "../CPUCoreBase.h"
-#include "../PPCAnalyst.h"
-#include "JitArmCache.h"
-#include "JitRegCache.h"
-#include "JitFPRCache.h"
-#include "JitAsm.h"
-#include "../JitCommon/JitBase.h"
-
-// Use these to control the instruction selection
-// #define INSTRUCTION_START Default(inst); return;
-// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
-#define INSTRUCTION_START
-#define JITDISABLE(setting) \
-	if (Core::g_CoreStartupParameter.bJITOff || \
-	Core::g_CoreStartupParameter.setting) \
-	{Default(inst); return;}
-#define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) 
-class JitArm : public JitBase, public ArmGen::ARMXCodeBlock 
-{
-private:
-	JitArmBlockCache blocks;
-
-	JitArmAsmRoutineManager asm_routines;
-
-	// TODO: Make arm specific versions of these, shouldn't be too hard to
-	// make it so we allocate some space at the start(?) of code generation
-	// and keep the registers in a cache. Will burn this bridge when we get to
-	// it.
-	ArmRegCache gpr;
-	ArmFPRCache fpr;
-
-	PPCAnalyst::CodeBuffer code_buffer;
-	void DoDownCount();
-
-	void PrintDebug(UGeckoInstruction inst, u32 level);
-
-	void Helper_UpdateCR1(ARMReg value);	
-
-	void SetFPException(ARMReg Reg, u32 Exception);
-public:
-	JitArm() : code_buffer(32000) {}
-	~JitArm() {}
-
-	void Init();
-	void Shutdown();
-
-	// Jit!
-
-	void Jit(u32 em_address);
-	const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b);
-	
-	JitBaseBlockCache *GetBlockCache() { return &blocks; }
-
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx);
-
-	bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
-
-	void Trace();
-
-	void ClearCache();
-
-	const u8 *GetDispatcher() {
-		return asm_routines.dispatcher; 
-	}
-	CommonAsmRoutinesBase *GetAsmRoutines() {
-		return &asm_routines; 
-	}
-
-	const char *GetName() {
-		return "JITARM";
-	}
-	// Run!
-
-	void Run();
-	void SingleStep();
-
-	// Utilities for use by opcodes
-
-	void WriteExit(u32 destination, int exit_num);
-	void WriteExitDestInR(ARMReg Reg);
-	void WriteRfiExitDestInR(ARMReg Reg);
-	void WriteExceptionExit();
-	void WriteCallInterpreter(UGeckoInstruction _inst);
-	void Cleanup();
-
-	void GenerateRC(int cr = 0);
-	void ComputeRC(int cr = 0);
-	void ComputeRC(s32 value, int cr);
-
-	void ComputeCarry();
-	void ComputeCarry(bool Carry);
-	void GetCarryAndClear(ARMReg reg);
-	void FinalizeCarry(ARMReg reg);
-
-	// TODO: This shouldn't be here
-	void UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset);
-	void SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 offsetReg, int accessSize, s32 offset);
-
-	void UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset);
-	void SafeLoadToReg(bool fastmem, u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse);
-
-
-	// OPCODES
-	void unknown_instruction(UGeckoInstruction _inst);
-	void Default(UGeckoInstruction _inst);
-	void DoNothing(UGeckoInstruction _inst);
-	void HLEFunction(UGeckoInstruction _inst);
-
-	void DynaRunTable4(UGeckoInstruction _inst);
-	void DynaRunTable19(UGeckoInstruction _inst);
-	void DynaRunTable31(UGeckoInstruction _inst);
-	void DynaRunTable59(UGeckoInstruction _inst);
-	void DynaRunTable63(UGeckoInstruction _inst);
-
-	// Breakin shit
-	void Break(UGeckoInstruction _inst);
-	// Branch
-	void bx(UGeckoInstruction _inst);
-	void bcx(UGeckoInstruction _inst);
-	void bclrx(UGeckoInstruction _inst);
-	void sc(UGeckoInstruction _inst);
-	void rfi(UGeckoInstruction _inst);
-	void bcctrx(UGeckoInstruction _inst);
-		
-	// Integer
-	void arith(UGeckoInstruction _inst);
-
-	void addex(UGeckoInstruction _inst);
-	void cntlzwx(UGeckoInstruction _inst);
-	void cmp (UGeckoInstruction _inst);
-	void cmpi(UGeckoInstruction _inst);
-	void cmpl(UGeckoInstruction _inst);
-	void cmpli(UGeckoInstruction _inst);
-	void negx(UGeckoInstruction _inst);
-	void mulhwux(UGeckoInstruction _inst);
-	void rlwimix(UGeckoInstruction _inst);
-	void rlwinmx(UGeckoInstruction _inst);
-	void rlwnmx(UGeckoInstruction _inst);
-	void srawix(UGeckoInstruction _inst);
-	void extshx(UGeckoInstruction inst);
-	void extsbx(UGeckoInstruction inst);
-
-	// System Registers
-	void mtmsr(UGeckoInstruction _inst);
-	void mfmsr(UGeckoInstruction _inst);
-	void mtspr(UGeckoInstruction _inst);
-	void mfspr(UGeckoInstruction _inst);
-	void mftb(UGeckoInstruction _inst);
-	void crXXX(UGeckoInstruction _inst);
-	void mcrf(UGeckoInstruction _inst);
-	void mfcr(UGeckoInstruction _inst);
-	void mtcrf(UGeckoInstruction _inst);
-	void mtsr(UGeckoInstruction _inst);
-	void mfsr(UGeckoInstruction _inst);
-	void mcrxr(UGeckoInstruction _inst);
-
-	// LoadStore
-	void stX(UGeckoInstruction _inst);
-	void lXX(UGeckoInstruction _inst);
-	void lmw(UGeckoInstruction _inst);
-	void stmw(UGeckoInstruction _inst);
-
-	void icbi(UGeckoInstruction _inst);
-	void dcbst(UGeckoInstruction _inst);
-
-	// Floating point
-	void fabsx(UGeckoInstruction _inst);
-	void fnabsx(UGeckoInstruction _inst);
-	void fnegx(UGeckoInstruction _inst);
-	void faddsx(UGeckoInstruction _inst);
-	void faddx(UGeckoInstruction _inst);
-	void fsubsx(UGeckoInstruction _inst);
-	void fsubx(UGeckoInstruction _inst);
-	void fmulsx(UGeckoInstruction _inst);
-	void fmulx(UGeckoInstruction _inst);
-	void fmrx(UGeckoInstruction _inst);
-	void fmaddsx(UGeckoInstruction _inst);
-	void fmaddx(UGeckoInstruction _inst);
-	void fctiwzx(UGeckoInstruction _inst);
-	void fcmpo(UGeckoInstruction _inst);
-	void fcmpu(UGeckoInstruction _inst);
-
-	// Floating point loadStore
-	void lfs(UGeckoInstruction _inst);
-	void lfsu(UGeckoInstruction _inst);
-	void lfsx(UGeckoInstruction _inst);
-	void lfd(UGeckoInstruction _inst);
-	void lfdu(UGeckoInstruction _inst);
-	void stfs(UGeckoInstruction _inst);
-	void stfsu(UGeckoInstruction _inst);
-	void stfd(UGeckoInstruction _inst);
-	void stfdu(UGeckoInstruction _inst);
-
-	// Paired Singles
-	void ps_add(UGeckoInstruction _inst);
-	void ps_sum0(UGeckoInstruction _inst);
-	void ps_sum1(UGeckoInstruction _inst);
-	void ps_madd(UGeckoInstruction _inst);
-	void ps_nmadd(UGeckoInstruction _inst);
-	void ps_msub(UGeckoInstruction _inst);
-	void ps_nmsub(UGeckoInstruction _inst);
-	void ps_madds0(UGeckoInstruction _inst);
-	void ps_madds1(UGeckoInstruction _inst);
-	void ps_sub(UGeckoInstruction _inst);
-	void ps_mul(UGeckoInstruction _inst);
-	void ps_muls0(UGeckoInstruction _inst);
-	void ps_muls1(UGeckoInstruction _inst);
-	void ps_merge00(UGeckoInstruction _inst);
-	void ps_merge01(UGeckoInstruction _inst);
-	void ps_merge10(UGeckoInstruction _inst);
-	void ps_merge11(UGeckoInstruction _inst);
-	void ps_mr(UGeckoInstruction _inst);
-	void ps_neg(UGeckoInstruction _inst);
-	void ps_abs(UGeckoInstruction _inst);
-	void ps_nabs(UGeckoInstruction _inst);
-	void ps_rsqrte(UGeckoInstruction _inst);
-	void ps_sel(UGeckoInstruction _inst);
-
-	// LoadStore paired
-	void psq_l(UGeckoInstruction _inst);
-	void psq_st(UGeckoInstruction _inst);
-
-};
-
-#endif // _JIT64_H
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
deleted file mode 100644
index 82956364de..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// Enable define below to enable oprofile integration. For this to work,
-// it requires at least oprofile version 0.9.4, and changing the build
-// system to link the Dolphin executable against libopagent.  Since the
-// dependency is a little inconvenient and this is possibly a slight
-// performance hit, it's not enabled by default, but it's useful for
-// locating performance issues.
-
-#include "../JitInterface.h"
-#include "Jit.h"
-#include "JitArmCache.h"
-
-
-using namespace ArmGen;
-
-	void JitArmBlockCache::WriteLinkBlock(u8* location, const u8* address)
-	{
-		ARMXEmitter emit(location);
-		emit.B(address);
-		emit.FlushIcache();
-	}
-	void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address)
-	{
-		ARMXEmitter emit((u8 *)location);
-		emit.MOVI2R(R11, address);
-		emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher);
-		emit.STR(R11, R9, PPCSTATE_OFF(pc));
-		emit.B(R12);
-		emit.FlushIcache();
-	}
-
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h
deleted file mode 100644
index 103947d5ad..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _JITARMCACHE_H
-#define _JITARMCACHE_H
-
-#include "../JitCommon/JitCache.h"
-
-
-typedef void (*CompiledCode)();
-
-class JitArmBlockCache : public JitBaseBlockCache
-{
-private:
-	void WriteLinkBlock(u8* location, const u8* address);
-	void WriteDestroyBlock(const u8* location, u32 address);
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
deleted file mode 100644
index d051dae726..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <string>
-
-#include "Common.h"
-
-#include "../../HW/Memmap.h"
-#include "Jit.h"
-#include "../JitCommon/JitBackpatch.h"
-#include "StringUtil.h"
-
-// This generates some fairly heavy trampolines, but:
-// 1) It's really necessary. We don't know anything about the context.
-// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be 
-//    that many of them in a typical program/game.
-bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store)
-{
-	u8 op = (inst >> 20) & 0xFF;
-	rD = (ARMReg)((inst >> 12) & 0xF);
-
-	switch (op)
-	{
-		case 0x58: // STR
-		{
-			Store = true;
-			accessSize = 32;
-		}
-		break;
-		case 0x59: // LDR
-		{
-			Store = false;
-			accessSize = 32;
-		}
-		break;
-		case 0x1D: // LDRH
-		{
-			Store = false;
-			accessSize = 16;
-		}
-		break;
-		case 0x45 + 0x18: // LDRB
-		{
-			Store = false;
-			accessSize = 8;
-		}
-		break;
-		case 0x5C: // STRB
-		{
-			Store = true;
-			accessSize = 8;
-		}
-		break;
-		case 0x1C: // STRH
-		{
-			Store = true;
-			accessSize = 16;
-		}
-		break;
-		default:
-			printf("Op is 0x%02x\n", op);
-			return false;
-	}
-	return true;
-}
-const u8 *JitArm::BackPatch(u8 *codePtr, u32, void *ctx_void)
-{
-	// TODO: This ctx needs to be filled with our information
-	CONTEXT *ctx = (CONTEXT *)ctx_void;
-	
-	// We need to get the destination register before we start
-	u32 Value = *(u32*)codePtr;
-	ARMReg rD;
-	u8 accessSize;
-	bool Store;
-
-	if (!DisamLoadStore(Value, rD, accessSize, Store))
-	{
-		printf("Invalid backpatch at location 0x%08x(0x%08x)\n", ctx->reg_pc, Value);
-		exit(0);
-	}
-
-	if (Store)
-	{
-		const u32 ARMREGOFFSET = 4 * 5;
-		ARMXEmitter emitter(codePtr - ARMREGOFFSET);
-		switch (accessSize)
-		{
-			case 8: // 8bit
-				emitter.MOVI2R(R14, (u32)&Memory::Write_U8, false); // 1-2
-				return 0;
-			break;
-			case 16: // 16bit
-				emitter.MOVI2R(R14, (u32)&Memory::Write_U16, false); // 1-2
-				return 0;
-			break;
-			case 32: // 32bit
-				emitter.MOVI2R(R14, (u32)&Memory::Write_U32, false); // 1-2
-			break;
-		}
-		emitter.PUSH(4, R0, R1, R2, R3); // 3
-		emitter.MOV(R0, rD); // Value - 4
-		emitter.MOV(R1, R10); // Addr- 5 
-		emitter.BL(R14); // 6
-		emitter.POP(4, R0, R1, R2, R3); // 7
-		u32 newPC = ctx->reg_pc - (ARMREGOFFSET + 4 * 4);
-		ctx->reg_pc = newPC;
-		emitter.FlushIcache();
-		return codePtr;
-	}
-	else
-	{
-		const u32 ARMREGOFFSET = 4 * 4;
-		ARMXEmitter emitter(codePtr - ARMREGOFFSET);
-		switch (accessSize)
-		{
-			case 8: // 8bit
-				emitter.MOVI2R(R14, (u32)&Memory::Read_U8, false); // 2	
-			break;
-			case 16: // 16bit
-				emitter.MOVI2R(R14, (u32)&Memory::Read_U16, false); // 2	
-			break;
-			case 32: // 32bit
-				emitter.MOVI2R(R14, (u32)&Memory::Read_U32, false); // 2	
-			break;
-		}
-		emitter.PUSH(4, R0, R1, R2, R3); // 3
-		emitter.MOV(R0, R10); // 4
-		emitter.BL(R14); // 5
-		emitter.MOV(R14, R0); // 6
-		emitter.POP(4, R0, R1, R2, R3); // 7
-		emitter.MOV(rD, R14); // 8
-		ctx->reg_pc -= ARMREGOFFSET + (4 * 4);
-		emitter.FlushIcache();
-		return codePtr;
-	}
-	return 0;
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp
deleted file mode 100644
index b6bde154af..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-// The branches are known good, or at least reasonably good.
-// No need for a disable-mechanism.
-
-// If defined, clears CR0 at blr and bl-s. If the assumption that
-// flags never carry over between functions holds, then the task for 
-// an optimizer becomes much easier.
-
-// #define ACID_TEST
-
-// Zelda and many more games seem to pass the Acid Test. 
-
-
-using namespace ArmGen;
-void JitArm::sc(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush();
-	fpr.Flush();
-
-	ARMReg rA = gpr.GetReg();
-	MOVI2R(rA, js.compilerPC + 4);
-	STR(rA, R9, PPCSTATE_OFF(pc));
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	ORR(rA, rA, EXCEPTION_SYSCALL);
-	STR(rA, R9, PPCSTATE_OFF(Exceptions));
-	gpr.Unlock(rA);
-
-	WriteExceptionExit();
-}
-
-void JitArm::rfi(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush();
-	fpr.Flush();
-	
- 	// See Interpreter rfi for details
-	const u32 mask = 0x87C0FFFF;
-		const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13]
-	// MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13;
-	// R0 = MSR location
-	// R1 = MSR contents
-	// R2 = Mask
-	// R3 = Mask
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg rC = gpr.GetReg();
-	ARMReg rD = gpr.GetReg();
-	MOVI2R(rB, (~mask) & clearMSR13);
-	MOVI2R(rC, mask & clearMSR13);
-
-	LDR(rD, R9, PPCSTATE_OFF(msr));
-
-	AND(rD, rD, rB); // rD = Masked MSR
-
-	LDR(rB, R9, PPCSTATE_OFF(spr[SPR_SRR1])); // rB contains SRR1 here
-
-	AND(rB, rB, rC); // rB contains masked SRR1 here
-	ORR(rB, rD, rB); // rB = Masked MSR OR masked SRR1
-
-	STR(rB, R9, PPCSTATE_OFF(msr)); // STR rB in to rA
-
-	LDR(rA, R9, PPCSTATE_OFF(spr[SPR_SRR0]));
-	
-	gpr.Unlock(rB, rC, rD);
-	WriteRfiExitDestInR(rA); // rA gets unlocked here
-	//AND(32, M(&MSR), Imm32((~mask) & clearMSR13));
-	//MOV(32, R(EAX), M(&SRR1));
-	//AND(32, R(EAX), Imm32(mask & clearMSR13));
-	//OR(32, M(&MSR), R(EAX));
-	// NPC = SRR0;
-	//MOV(32, R(EAX), M(&SRR0));
-	//WriteRfiExitDestInEAX();
-}
-
-void JitArm::bx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-	// We must always process the following sentence
-	// even if the blocks are merged by PPCAnalyst::Flatten().
-	if (inst.LK)
-	{
-		ARMReg rA = gpr.GetReg(false);
-		u32 Jumpto = js.compilerPC + 4;
-		MOVI2R(rA, Jumpto);
-		STR(rA, R9, PPCSTATE_OFF(spr[SPR_LR]));
-		//ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4);
-	}
-	// If this is not the last instruction of a block,
-	// we will skip the rest process.
-	// Because PPCAnalyst::Flatten() merged the blocks.
-	if (!js.isLastInstruction) {
-		return;
-	}
-
-	gpr.Flush();
-	fpr.Flush();
-
-	u32 destination;
-	if (inst.AA)
-		destination = SignExt26(inst.LI << 2);
-	else
-		destination = js.compilerPC + SignExt26(inst.LI << 2);
-	#ifdef ACID_TEST
-		// TODO: Not implemented yet.
-		//if (inst.LK)
-		//AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000)));
-	#endif
- 	if (destination == js.compilerPC)
-	{
- 		//PanicAlert("Idle loop detected at %08x", destination);
-		//	CALL(ProtectFunction(&CoreTiming::Idle, 0));
-		//	JMP(Asm::testExceptions, true);
-		// make idle loops go faster
-		js.downcountAmount += 8;
-	}
-	WriteExit(destination, 0);
-}
-
-void JitArm::bcx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-	// USES_CR
-	_assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block");
-
-	gpr.Flush();
-	fpr.Flush();
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	FixupBranch pCTRDontBranch;
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
-	{
-		LDR(rB, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-		SUBS(rB, rB, 1);
-		STR(rB, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-			
-		//SUB(32, M(&CTR), Imm8(1));
-		if (inst.BO & BO_BRANCH_IF_CTR_0)
-			pCTRDontBranch = B_CC(CC_NEQ);
-		else
-			pCTRDontBranch = B_CC(CC_EQ);
-	}
-
-	FixupBranch pConditionDontBranch;
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
-	{
-		LDRB(rA, R9, PPCSTATE_OFF(cr_fast) + (inst.BI >> 2));
-		TST(rA, 8 >> (inst.BI & 3));
-
-		//TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3)));
-		if (inst.BO & BO_BRANCH_IF_TRUE)  // Conditional branch 
-			pConditionDontBranch = B_CC(CC_EQ); // Zero
-		else
-			pConditionDontBranch = B_CC(CC_NEQ); // Not Zero
-	}
-	if (inst.LK)
-	{
-		u32 Jumpto = js.compilerPC + 4;
-		MOVI2R(rB, Jumpto);
-		STR(rB, R9, PPCSTATE_OFF(spr[SPR_LR]));
-		//ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); // Careful, destroys R14, R12
-	}
-	gpr.Unlock(rA, rB);
-
-	u32 destination;
-	if(inst.AA)
-		destination = SignExt16(inst.BD << 2);
-	else
-		destination = js.compilerPC + SignExt16(inst.BD << 2);
-	WriteExit(destination, 0);
-
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
-		SetJumpTarget( pConditionDontBranch );
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
-		SetJumpTarget( pCTRDontBranch );
-
-	WriteExit(js.compilerPC + 4, 1);
-}
-void JitArm::bcctrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-
-	gpr.Flush();
-	fpr.Flush();
-
-	// bcctrx doesn't decrement and/or test CTR
-	_dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!");
-
-	if (inst.BO_2 & BO_DONT_CHECK_CONDITION)
-	{
-		// BO_2 == 1z1zz -> b always
-
-		//NPC = CTR & 0xfffffffc;
-		ARMReg rA = gpr.GetReg();
-
-		if(inst.LK_3)
-		{
-			u32 Jumpto = js.compilerPC + 4;
-			MOVI2R(rA, Jumpto);
-			STR(rA, R9, PPCSTATE_OFF(spr[SPR_LR]));
-			// ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4);
-		}
-		LDR(rA, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-		BIC(rA, rA, 0x3);
-		WriteExitDestInR(rA);
-	}
-	else
-	{
-		// Rare condition seen in (just some versions of?) Nintendo's NES Emulator
-
-		// BO_2 == 001zy -> b if false
-		// BO_2 == 011zy -> b if true
-		ARMReg rA = gpr.GetReg();
-		ARMReg rB = gpr.GetReg();
-		
-		LDRB(rA, R9, PPCSTATE_OFF(cr_fast) + (inst.BI >> 2));
-		TST(rA, 8 >> (inst.BI & 3));
-		CCFlags branch;
-		if (inst.BO_2 & BO_BRANCH_IF_TRUE)
-			branch = CC_EQ;
-		else
-			branch = CC_NEQ;
-		FixupBranch b = B_CC(branch);
-
-		LDR(rA, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-		BIC(rA, rA, 0x3);
-
-		if (inst.LK_3){
-			u32 Jumpto = js.compilerPC + 4;
-			MOVI2R(rB, Jumpto);
-			STR(rB, R9, PPCSTATE_OFF(spr[SPR_LR]));
-			//ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4);
-		}
-		gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR
-		WriteExitDestInR(rA);
-
-		SetJumpTarget(b);
-		WriteExit(js.compilerPC + 4, 1);
-	}
-}
-void JitArm::bclrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITBranchOff)
-	if (!js.isLastInstruction &&
-		(inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) {
-		if (inst.LK)
-		{
-			ARMReg rA = gpr.GetReg(false);
-			u32 Jumpto = js.compilerPC + 4;
-			MOVI2R(rA, Jumpto);
-			STR(rA, R9, PPCSTATE_OFF(spr[SPR_LR]));
-			// ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4);
-		}
-		return;
-	}
-	gpr.Flush();
-	fpr.Flush();
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	FixupBranch pCTRDontBranch;
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
-	{
-		LDR(rB, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-		SUBS(rB, rB, 1);
-		STR(rB, R9, PPCSTATE_OFF(spr[SPR_CTR]));
-			
-		//SUB(32, M(&CTR), Imm8(1));
-		if (inst.BO & BO_BRANCH_IF_CTR_0)
-			pCTRDontBranch = B_CC(CC_NEQ);
-		else
-			pCTRDontBranch = B_CC(CC_EQ);
-	}
-
-	FixupBranch pConditionDontBranch;
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)  // Test a CR bit
-	{
-		LDRB(rA, R9, PPCSTATE_OFF(cr_fast) + (inst.BI >> 2));
-		TST(rA, 8 >> (inst.BI & 3));
-		//TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3)));
-		if (inst.BO & BO_BRANCH_IF_TRUE)  // Conditional branch 
-			pConditionDontBranch = B_CC(CC_EQ); // Zero
-		else
-			pConditionDontBranch = B_CC(CC_NEQ); // Not Zero
-	}
-
-	// This below line can be used to prove that blr "eats flags" in practice.
-	// This observation will let us do a lot of fun observations.
-	#ifdef ACID_TEST
-		// TODO: Not yet implemented
-		//	AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000)));
-	#endif
-
-	//MOV(32, R(EAX), M(&LR));	
-	//AND(32, R(EAX), Imm32(0xFFFFFFFC));
-	LDR(rA, R9, PPCSTATE_OFF(spr[SPR_LR]));
-	BIC(rA, rA, 0x3);
-	if (inst.LK){
-		u32 Jumpto = js.compilerPC + 4;
-		MOVI2R(rB, Jumpto);
-		STR(rB, R9, PPCSTATE_OFF(spr[SPR_LR]));
-		//ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4);
-	}
-	gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR
-	WriteExitDestInR(rA);
-
-	if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
-		SetJumpTarget( pConditionDontBranch );
-	if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
-		SetJumpTarget( pCTRDontBranch );
-	WriteExit(js.compilerPC + 4, 1);
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h
deleted file mode 100644
index c186ae9696..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FPUtils.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-#include "../Interpreter/Interpreter_FPUtils.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitFPRCache.h"
-#include "JitAsm.h"
-
-static const double minmaxFloat[2] = {-(double)0x80000000, (double)0x7FFFFFFF};
-static const double doublenum = 0xfff8000000000000ull;
-
-// Exception masks
-static Operand2 FRFIMask(5, 0x8); // 0x60000
-static Operand2 FIMask(2, 8); // 0x20000
-static Operand2 FRMask(4, 8); // 0x40000
-static Operand2 FXMask(2, 1); // 0x80000000
-static Operand2 VEMask(0x40, 0); // 0x40
-
-static Operand2 XXException(2, 4); // 0x2000000
-static Operand2 CVIException(1, 0xC); // 0x100 
-static Operand2 NANException(1, 4); // 0x1000000
-static Operand2 VXVCException(8, 8); // 0x80000
-static Operand2 ZXException(1, 3); // 0x4000000
-static Operand2 VXSQRTException(2, 5); // 0x200
-
-inline void JitArm::SetFPException(ARMReg Reg, u32 Exception)
-{
-	Operand2 *ExceptionMask;
-	switch(Exception)
-	{
-		case FPSCR_VXCVI:
-			ExceptionMask = &CVIException;
-		break;
-		case FPSCR_XX:
-			ExceptionMask = &XXException;
-		break;
-		case FPSCR_VXSNAN:
-			ExceptionMask = &NANException;
-		break;
-		case FPSCR_VXVC:
-			ExceptionMask = &VXVCException;
-		break;
-		case FPSCR_ZX:
-			ExceptionMask = &ZXException;
-		break;
-		case FPSCR_VXSQRT:
-			ExceptionMask = &VXSQRTException;
-		break;
-		default:
-			_assert_msg_(DYNA_REC, false, "Passed unsupported FPexception: 0x%08x", Exception);
-			return;
-		break;
-	}
-	ARMReg rB = gpr.GetReg();
-	MOV(rB, Reg);
-	ORR(Reg, Reg, *ExceptionMask);
-	CMP(rB, Reg);
-	SetCC(CC_NEQ);
-	ORR(Reg, Reg, FXMask); // If exception is set, set exception bit	
-	SetCC();
-	BIC(Reg, Reg, FRFIMask);
-	gpr.Unlock(rB);
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
deleted file mode 100644
index c3e46b83f2..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../ConfigManager.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-#include "../../HW/Memmap.h"
-#include "JitArm_FPUtils.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitFPRCache.h"
-#include "JitAsm.h"
-
-void JitArm::Helper_UpdateCR1(ARMReg value)
-{
-	// Should just update exception flags, not do any compares.
-	PanicAlert("CR1");
-}
-
-void JitArm::fctiwzx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	u32 b = inst.FB;
-	u32 d = inst.FD;
-
-	ARMReg vB = fpr.R0(b);
-	ARMReg vD = fpr.R0(d);
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-	ARMReg V2 = fpr.GetReg();
-	
-	ARMReg rA = gpr.GetReg();
-	ARMReg fpscrReg = gpr.GetReg();
-
-	FixupBranch DoneMax, DoneMin;
-	LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	MOVI2R(rA, (u32)minmaxFloat);
-
-	// Check if greater than max float
-	{
-		VLDR(V0, rA, 8); // Load Max
-		VCMPE(vB, V0);
-		VMRS(_PC); // Loads in to APSR
-		FixupBranch noException = B_CC(CC_LE);
-		VMOV(vD, V0); // Set to max
-		SetFPException(fpscrReg, FPSCR_VXCVI);
-		DoneMax = B();
-		SetJumpTarget(noException);
-	}
-	// Check if less than min float
-	{
-		VLDR(V0, rA, 0);
-		VCMPE(vB, V0);
-		VMRS(_PC);
-		FixupBranch noException = B_CC(CC_GE);
-		VMOV(vD, V0);
-		SetFPException(fpscrReg, FPSCR_VXCVI);
-		DoneMin = B();
-		SetJumpTarget(noException);
-	}
-	// Within ranges, convert to integer
-	VCVT(vD, vB, TO_INT | IS_SIGNED | ROUND_TO_ZERO); 
-	VCMPE(vD, vB);
-	VMRS(_PC);
-
-	SetCC(CC_EQ);
-		BIC(fpscrReg, fpscrReg, FRFIMask);
-		FixupBranch DoneEqual = B();
-	SetCC();
-	SetFPException(fpscrReg, FPSCR_XX);	
-	ORR(fpscrReg, fpscrReg, FIMask);
-	VABS(V1, vB);
-	VABS(V2, vD);
-	VCMPE(V2, V1);
-	VMRS(_PC);
-	SetCC(CC_GT);
-		ORR(fpscrReg, fpscrReg, FRMask);
-	SetCC();
-	SetJumpTarget(DoneEqual);
-
-	SetJumpTarget(DoneMax);
-	SetJumpTarget(DoneMin);
-
-	MOVI2R(rA, (u32)&doublenum);
-	VLDR(V0, rA, 0);
-	NEONXEmitter nemit(this);
-	nemit.VORR(vD, vD, V0);
-
-	if (inst.Rc) Helper_UpdateCR1(vD);
-
-	STR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	gpr.Unlock(rA);
-	gpr.Unlock(fpscrReg);
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-	fpr.Unlock(V2);
-}
-
-void JitArm::fcmpo(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	u32 a = inst.FA, b = inst.FB;
-	int cr = inst.CRFD;
-
-	ARMReg vA = fpr.R0(a);
-	ARMReg vB = fpr.R0(b);
-	ARMReg fpscrReg = gpr.GetReg();
-	ARMReg crReg = gpr.GetReg();
-	Operand2 FPRFMask(0x1F, 0xA); // 0x1F000
-	Operand2 LessThan(0x8, 0xA); // 0x8000
-	Operand2 GreaterThan(0x4, 0xA); // 0x4000
-	Operand2 EqualTo(0x2, 0xA); // 0x2000
-	Operand2 NANRes(0x1, 0xA); // 0x1000
-	FixupBranch Done1, Done2, Done3;
-	LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	BIC(fpscrReg, fpscrReg, FPRFMask);
-
-	VCMPE(vA, vB);
-	VMRS(_PC);
-	SetCC(CC_LT);
-		ORR(fpscrReg, fpscrReg, LessThan);	
-		MOV(crReg,  8);
-		Done1 = B();
-	SetCC(CC_GT);
-		ORR(fpscrReg, fpscrReg, GreaterThan);	
-		MOV(crReg,  4);
-		Done2 = B();
-	SetCC(CC_EQ);
-		ORR(fpscrReg, fpscrReg, EqualTo);	
-		MOV(crReg,  2);
-		Done3 = B();
-	SetCC();
-	
-	ORR(fpscrReg, fpscrReg, NANRes);	
-	MOV(crReg,  1);
-	
-	VCMPE(vA, vA);
-	VMRS(_PC);
-	FixupBranch NanA = B_CC(CC_NEQ);	
-	VCMPE(vB, vB);
-	VMRS(_PC);
-	FixupBranch NanB = B_CC(CC_NEQ);
-	
-	SetFPException(fpscrReg, FPSCR_VXVC);
-	FixupBranch Done4 = B();
-
-	SetJumpTarget(NanA);
-	SetJumpTarget(NanB);
-
-	SetFPException(fpscrReg, FPSCR_VXSNAN);
-	
-	TST(fpscrReg, VEMask);
-	
-	FixupBranch noVXVC = B_CC(CC_NEQ);
-	SetFPException(fpscrReg, FPSCR_VXVC);
-
-	SetJumpTarget(noVXVC);
-	SetJumpTarget(Done1);
-	SetJumpTarget(Done2);
-	SetJumpTarget(Done3);
-	SetJumpTarget(Done4);
-	STRB(crReg, R9, PPCSTATE_OFF(cr_fast) + cr);
-	STR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	gpr.Unlock(fpscrReg, crReg);
-}
-
-void JitArm::fcmpu(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	u32 a = inst.FA, b = inst.FB;
-	int cr = inst.CRFD;
-
-	ARMReg vA = fpr.R0(a);
-	ARMReg vB = fpr.R0(b);
-	ARMReg fpscrReg = gpr.GetReg();
-	ARMReg crReg = gpr.GetReg();
-	Operand2 FPRFMask(0x1F, 0xA); // 0x1F000
-	Operand2 LessThan(0x8, 0xA); // 0x8000
-	Operand2 GreaterThan(0x4, 0xA); // 0x4000
-	Operand2 EqualTo(0x2, 0xA); // 0x2000
-	Operand2 NANRes(0x1, 0xA); // 0x1000
-	FixupBranch Done1, Done2, Done3;
-	LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	BIC(fpscrReg, fpscrReg, FPRFMask);
-
-	VCMPE(vA, vB);
-	VMRS(_PC);
-	SetCC(CC_LT);
-		ORR(fpscrReg, fpscrReg, LessThan);	
-		MOV(crReg,  8);
-		Done1 = B();
-	SetCC(CC_GT);
-		ORR(fpscrReg, fpscrReg, GreaterThan);	
-		MOV(crReg,  4);
-		Done2 = B();
-	SetCC(CC_EQ);
-		ORR(fpscrReg, fpscrReg, EqualTo);	
-		MOV(crReg,  2);
-		Done3 = B();
-	SetCC();
-	
-	ORR(fpscrReg, fpscrReg, NANRes);	
-	MOV(crReg,  1);
-	
-	VCMPE(vA, vA);
-	VMRS(_PC);
-	FixupBranch NanA = B_CC(CC_NEQ);	
-	VCMPE(vB, vB);
-	VMRS(_PC);
-	FixupBranch NanB = B_CC(CC_NEQ);
-	FixupBranch Done4 = B();
-
-	SetJumpTarget(NanA);
-	SetJumpTarget(NanB);
-
-	SetFPException(fpscrReg, FPSCR_VXSNAN);
-	
-	SetJumpTarget(Done1);
-	SetJumpTarget(Done2);
-	SetJumpTarget(Done3);
-	SetJumpTarget(Done4);
-	STRB(crReg, R9, PPCSTATE_OFF(cr_fast) + cr);
-	STR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	gpr.Unlock(fpscrReg, crReg);
-}
-
-void JitArm::fabsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VABS(vD, vB);
-
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::fnabsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VABS(vD, vB);
-	VNEG(vD, vD);
-
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::fnegx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VNEG(vD, vB);
-
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::faddsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD0 = fpr.R0(inst.FD, false);
-	ARMReg vD1 = fpr.R1(inst.FD, false);
-
-	VADD(vD0, vA, vB);
-	VMOV(vD1, vD0);
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
-
-void JitArm::faddx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VADD(vD, vA, vB);
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::fsubsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD0 = fpr.R0(inst.FD, false);
-	ARMReg vD1 = fpr.R1(inst.FD, false);
-
-	VSUB(vD0, vA, vB);
-	VMOV(vD1, vD0);
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
-
-void JitArm::fsubx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VSUB(vD, vA, vB);
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::fmulsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-	
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vC = fpr.R0(inst.FC);
-	ARMReg vD0 = fpr.R0(inst.FD, false);
-	ARMReg vD1 = fpr.R1(inst.FD, false);
-
-	VMUL(vD0, vA, vC);
-	VMOV(vD1, vD0);
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
-void JitArm::fmulx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vA = fpr.R0(inst.FA);
-	ARMReg vC = fpr.R0(inst.FC);
-	ARMReg vD0 = fpr.R0(inst.FD, false);
-
-	VMUL(vD0, vA, vC);
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
-void JitArm::fmrx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	ARMReg vB = fpr.R0(inst.FB);
-	ARMReg vD = fpr.R0(inst.FD, false);
-
-	VMOV(vD, vB);
-	
-	if (inst.Rc) Helper_UpdateCR1(vD);
-}
-
-void JitArm::fmaddsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-
-	VMOV(V0, vB0);
-	
-	VMLA(V0, vA0, vC0);
-
-	VMOV(vD0, V0);
-	VMOV(vD1, V0);
-
-	fpr.Unlock(V0);
-
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
-
-void JitArm::fmaddx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITFloatingPointOff)
-
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vD0 = fpr.R0(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-
-	VMOV(V0, vB0);
-	
-	VMLA(V0, vA0, vC0);
-
-	VMOV(vD0, V0);
-
-	fpr.Unlock(V0);
-
-	if (inst.Rc) Helper_UpdateCR1(vD0);
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
deleted file mode 100644
index 3aeea58e50..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
+++ /dev/null
@@ -1,878 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-extern u32 Helper_Mask(u8 mb, u8 me);
-
-// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers.
-// Jit64 ComputerRC is signed
-// JIT64 GenerateRC is unsigned
-void JitArm::GenerateRC(int cr) {
-	ARMReg rB = gpr.GetReg();
-
-	MOV(rB, 0x4); // Result > 0
-	SetCC(CC_EQ); MOV(rB, 0x2); // Result == 0
-	SetCC(CC_MI); MOV(rB, 0x8); // Result < 0
-	SetCC();
-
-	STRB(rB, R9, PPCSTATE_OFF(cr_fast) + cr);
-	gpr.Unlock(rB);
-}
-void JitArm::ComputeRC(int cr) {
-	ARMReg rB = gpr.GetReg();
-
-	MOV(rB, 0x2); // Result == 0
-	SetCC(CC_LT); MOV(rB, 0x8); // Result < 0
-	SetCC(CC_GT); MOV(rB, 0x4); // Result > 0
-	SetCC();
-
-	STRB(rB, R9, PPCSTATE_OFF(cr_fast) + cr);
-	gpr.Unlock(rB);
-}
-void JitArm::ComputeRC(s32 value, int cr) {
-	ARMReg rB = gpr.GetReg();
-
-	if (value < 0)
-		MOV(rB, 0x8);
-	else if (value > 0)
-		MOV(rB, 0x4);
-	else
-		MOV(rB, 0x2);
-
-	STRB(rB, R9, PPCSTATE_OFF(cr_fast) + cr);
-	gpr.Unlock(rB);
-}
-
-void JitArm::ComputeCarry()
-{
-	ARMReg tmp = gpr.GetReg();
-	Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-	LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	SetCC(CC_CS);
-	ORR(tmp, tmp, mask);
-	SetCC(CC_CC);
-	BIC(tmp, tmp, mask);
-	SetCC();
-	STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	gpr.Unlock(tmp);
-}
-void JitArm::ComputeCarry(bool Carry)
-{
-	ARMReg tmp = gpr.GetReg();
-	Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-	LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	if (Carry)
-		ORR(tmp, tmp, mask);
-	else
-		BIC(tmp, tmp, mask);
-	STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	gpr.Unlock(tmp);
-
-}
-
-void JitArm::GetCarryAndClear(ARMReg reg)
-{
-	ARMReg tmp = gpr.GetReg();
-	Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-	LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	AND(reg, tmp, mask);
-	BIC(tmp, tmp, mask);
-	STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	gpr.Unlock(tmp);
-}
-
-void JitArm::FinalizeCarry(ARMReg reg)
-{
-	ARMReg tmp = gpr.GetReg();
-	Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-	SetCC(CC_CS);
-	ORR(reg, reg, mask);
-	SetCC();
-	LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	ORR(tmp, tmp, reg);
-	STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	gpr.Unlock(tmp);
-}
-
-u32 Add(u32 a, u32 b) {return a + b;}
-u32 Sub(u32 a, u32 b) {return a - b;}
-u32 Mul(u32 a, u32 b) {return a * b;}
-u32 Or (u32 a, u32 b) {return a | b;}
-u32 And(u32 a, u32 b) {return a & b;}
-u32 Xor(u32 a, u32 b) {return a ^ b;}
-
-void JitArm::arith(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	u32 a = inst.RA, b = inst.RB, d = inst.RD, s = inst.RS;
-	ARMReg RA, RB, RD, RS;
-	bool isImm[2] = {false, false}; // Arg1 & Arg2
-	u32 Imm[2] = {0, 0};
-	bool Rc = false;
-	bool carry = false;
-	bool isUnsigned = false;
-	bool shiftedImm = false;
-	
-	switch (inst.OPCD)
-	{
-		case 7: // mulli
-			if (gpr.IsImm(a))
-			{
-				isImm[0] = true;
-				Imm[0] = gpr.GetImm(a);
-			}
-			isImm[1] = true;
-			Imm[1] = inst.SIMM_16;
-		break;
-		case 13: // addic_rc
-			Rc = true;
-		case 12: // addic
-			if (gpr.IsImm(a))
-			{
-				isImm[0] = true;
-				Imm[0] = gpr.GetImm(a);
-			}
-			isImm[1] = true;
-			Imm[1] = inst.SIMM_16;
-			carry = true;
-		break;
-		case 15: // addis
-			shiftedImm = true;	
-		case 14: // addi
-			if (a)
-			{
-				if (gpr.IsImm(a))
-				{
-					isImm[0] = true;
-					Imm[0] = gpr.GetImm(a);
-				}
-			}
-			else
-			{
-				isImm[0] = true;
-				Imm[0] = 0;
-			}
-			isImm[1] = true;
-			Imm[1] = inst.SIMM_16 << (shiftedImm ? 16 : 0); 
-		break;
-		case 25: // oris
-			shiftedImm = true;
-		case 24: // ori
-			if (gpr.IsImm(s))
-			{
-				isImm[0] = true;
-				Imm[0] = gpr.GetImm(s);
-			}
-			isImm[1] = true;
-			Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); 
-		break;
-		case 27: // xoris
-			shiftedImm = true;
-		case 26: // xori
-			if (gpr.IsImm(s))
-			{
-				isImm[0] = true;
-				Imm[0] = gpr.GetImm(s);
-			}
-			isImm[1] = true;
-			Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); 
-		break;
-		case 29: // andis_rc
-			shiftedImm = true;
-		case 28: // andi_rc
-			if (gpr.IsImm(s))
-			{
-				isImm[0] = true;
-				Imm[0] = gpr.GetImm(s);
-			}
-			isImm[1] = true;
-			Imm[1] = inst.UIMM << (shiftedImm ? 16 : 0); 
-			Rc = true;
-		break;
-
-		case 31: // addcx, addx, subfx
-			switch(inst.SUBOP10)
-			{
-				case 24: // slwx
-				case 28: // andx
-				case 60: // andcx
-				case 124: // norx 
-				case 284: // eqvx
-				case 316: // xorx
-				case 412: // orcx 
-				case 444: // orx
-				case 476: // nandx
-				case 536: // srwx 
-				case 792: // srawx
-					if (gpr.IsImm(s))
-					{
-						isImm[0] = true;
-						Imm[0] = gpr.GetImm(s);
-					}
-					if (gpr.IsImm(b))
-					{
-						isImm[1] = true;
-						Imm[1] = gpr.GetImm(b);
-					}
-					Rc = inst.Rc;
-				break;
-
-				case 10: // addcx
-					carry = true;
-				case 40: // subfx
-					isUnsigned = true;
-				case 235: // mullwx
-				case 266:
-				case 747: // mullwox
-				case 778: // both addx
-					if (gpr.IsImm(a))
-					{
-						isImm[0] = true;
-						Imm[0] = gpr.GetImm(a);
-					}
-					if (gpr.IsImm(b))
-					{
-						isImm[1] = true;
-						Imm[1] = gpr.GetImm(b);
-					}
-					Rc = inst.Rc;
-				break;
-			}
-		break;
-		default:
-			WARN_LOG(DYNA_REC, "Unkown OPCD %d with arith function", inst.OPCD);
-			Default(inst); return;
-		break;
-	}
-	if (isImm[0] && isImm[1]) // Immediate propagation
-	{
-		bool hasCarry = false;
-		u32 dest = d;
-		switch(inst.OPCD)
-		{
-			case 7:
-				gpr.SetImmediate(d, Mul(Imm[0], Imm[1]));
-			break;
-			case 12:
-			case 13:
-				gpr.SetImmediate(d, Add(Imm[0], Imm[1]));
-				hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]);
-			break;
-			case 14:
-			case 15:
-				gpr.SetImmediate(d, Add(Imm[0], Imm[1]));
-				hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]);
-			break;
-			case 24:
-			case 25:
-				gpr.SetImmediate(a, Or(Imm[0], Imm[1]));
-				dest = a;
-			break;
-			case 26:
-			case 27:
-				gpr.SetImmediate(a, Xor(Imm[0], Imm[1]));
-				dest = a;
-			break;
-			case 28:
-			case 29:
-				gpr.SetImmediate(a, And(Imm[0], Imm[1]));
-				dest = a;
-			break;
-			case 31: // addcx, addx, subfx
-				switch(inst.SUBOP10)
-				{
-					case 24:
-						gpr.SetImmediate(a, Imm[0] << Imm[1]);
-						dest = a;
-					break;
-					case 28:
-						gpr.SetImmediate(a, And(Imm[0], Imm[1]));
-						dest = a;
-					break;
-					case 40: // subfx
-						gpr.SetImmediate(d, Sub(Imm[1], Imm[0]));
-					break;
-					case 60:
-						gpr.SetImmediate(a, And(Imm[1], ~Imm[0]));
-						dest = a;
-					break;
-					case 124:
-						gpr.SetImmediate(a, ~Or(Imm[0], Imm[1]));
-						dest = a;
-					break;
-					case 747:
-					case 235:
-						gpr.SetImmediate(d, Mul(Imm[0], Imm[1]));
-					break;
-					case 284:
-						gpr.SetImmediate(a, ~Xor(Imm[0], Imm[1]));
-						dest = a;
-					break;
-					case 316:
-						gpr.SetImmediate(a, Xor(Imm[0], Imm[1]));
-						dest = a;
-					break;
-					case 412:
-						gpr.SetImmediate(a, Or(Imm[0], ~Imm[1]));
-						dest = a;
-					break;
-					case 444:
-						gpr.SetImmediate(a, Or(Imm[0], Imm[1]));
-						dest = a;
-					break;
-					case 476:
-						gpr.SetImmediate(a, ~And(Imm[1], Imm[0]));
-						dest = a;
-					break;
-					case 536:
-						gpr.SetImmediate(a, Imm[0] >> Imm[1]);
-						dest = a;
-					break;
-					case 792:
-						gpr.SetImmediate(a, ((s32)Imm[0]) >> Imm[1]);
-						dest = a;
-					break;
-					case 10: // addcx
-					case 266:
-					case 778: // both addx
-						gpr.SetImmediate(d, Add(Imm[0], Imm[1]));
-						hasCarry = Interpreter::Helper_Carry(Imm[0], Imm[1]);
-					break;
-				}
-			break;
-		}
-		if (carry) ComputeCarry(hasCarry); 
-		if (Rc) ComputeRC(gpr.GetImm(dest), 0);
-		return;
-	}
-	// One or the other isn't a IMM
-	switch(inst.OPCD)
-	{
-		case 7:
-		{
-			ARMReg rA = gpr.GetReg();
-			RD = gpr.R(d);
-			RA = gpr.R(a);
-			MOVI2R(rA, Imm[1]);
-			MUL(RD, RA, rA);
-			gpr.Unlock(rA);
-		}
-		break;
-		case 12:
-		case 13:
-		{
-			ARMReg rA = gpr.GetReg();
-			RD = gpr.R(d);
-			RA = gpr.R(a);
-			MOVI2R(rA, Imm[1]);
-			ADDS(RD, RA, rA);
-			gpr.Unlock(rA);
-		}
-		break;
-		case 14:
-		case 15: // Arg2 is always Imm
-			if (!isImm[0])
-			{
-				ARMReg rA = gpr.GetReg();
-				RD = gpr.R(d);
-				RA = gpr.R(a);
-				MOVI2R(rA, Imm[1]);
-				ADD(RD, RA, rA);
-				gpr.Unlock(rA);
-			}
-			else
-				gpr.SetImmediate(d, Imm[1]);
-		break;
-		case 24:
-		case 25:
-		{
-			ARMReg rA = gpr.GetReg();
-			RS = gpr.R(s);
-			RA = gpr.R(a);
-			MOVI2R(rA, Imm[1]);
-			ORR(RA, RS, rA);
-			gpr.Unlock(rA);
-		}
-		break;
-		case 26:
-		case 27:
-		{
-			ARMReg rA = gpr.GetReg();
-			RS = gpr.R(s);
-			RA = gpr.R(a);
-			MOVI2R(rA, Imm[1]);
-			EOR(RA, RS, rA);
-			gpr.Unlock(rA);
-		}
-
-		break;
-		case 28:
-		case 29:
-		{
-			ARMReg rA = gpr.GetReg();
-			RS = gpr.R(s);
-			RA = gpr.R(a);
-			MOVI2R(rA, Imm[1]);
-			ANDS(RA, RS, rA);
-			gpr.Unlock(rA);
-		}
-		break;
-		case 31: 
-			switch(inst.SUBOP10)
-			{
-				case 24:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					LSLS(RA, RS, RB);
-				break;
-				case 28:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					ANDS(RA, RS, RB);
-				break;
-				case 40: // subfx
-					RD = gpr.R(d);
-					RA = gpr.R(a);
-					RB = gpr.R(b);
-					SUBS(RD, RB, RA);
-				break;
-				case 60:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					BICS(RA, RS, RB);
-				break;
-				case 124:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					ORR(RA, RS, RB);
-					MVNS(RA, RA);
-				break;
-				case 747:
-				case 235:
-					RD = gpr.R(d);
-					RA = gpr.R(a);
-					RB = gpr.R(b);
-					MULS(RD, RA, RB);
-				break;
-				case 284:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					EOR(RA, RS, RB);
-					MVNS(RA, RA);
-				break;
-				case 316:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					EORS(RA, RS, RB);
-				break;
-				case 412:
-				{
-					ARMReg rA = gpr.GetReg();
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					MVN(rA, RB);
-					ORRS(RA, RS, rA);
-					gpr.Unlock(rA);
-				}
-				break;
-				case 444:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					ORRS(RA, RS, RB);
-				break;
-				case 476:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					AND(RA, RS, RB);
-					MVNS(RA, RA);
-				break;
-				case 536:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					LSRS(RA,  RS, RB);	
-				break;
-				case 792:
-					RA = gpr.R(a);
-					RS = gpr.R(s);
-					RB = gpr.R(b);
-					ASRS(RA,  RS, RB);	
-				break;
-				case 10: // addcx
-				case 266:
-				case 778: // both addx
-					RD = gpr.R(d);
-					RA = gpr.R(a);
-					RB = gpr.R(b);
-					ADDS(RD, RA, RB);
-				break;
-			}
-		break;
-	}
-	if (carry) ComputeCarry();
-	if (Rc) isUnsigned ? GenerateRC() : ComputeRC();
-}
-
-void JitArm::addex(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 a = inst.RA, b = inst.RB, d = inst.RD;
-	Default(inst); return;
-	ARMReg RA = gpr.R(a);
-	ARMReg RB = gpr.R(b);
-	ARMReg RD = gpr.R(d);
-	ARMReg rA = gpr.GetReg();
-	GetCarryAndClear(rA);
-	ADDS(RD, RA, RB);
-	FinalizeCarry(rA);
-	if (inst.Rc) ComputeRC();
-	gpr.Unlock(rA);
-}
-
-void JitArm::cntlzwx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 a = inst.RA, s = inst.RS;
-	
-	ARMReg RA = gpr.R(a);
-	ARMReg RS = gpr.R(s);
-	CLZ(RA, RS);
-	if (inst.Rc)
-	{
-		CMP(RA, 0);
-		ComputeRC();
-	}
-}
-
-void JitArm::mulhwux(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	u32 a = inst.RA, b = inst.RB, d = inst.RD;
-
-	ARMReg RA = gpr.R(a);
-	ARMReg RB = gpr.R(b);
-	ARMReg RD = gpr.R(d);
-	ARMReg rA = gpr.GetReg(false);
-	UMULLS(rA, RD, RA, RB);
-	if (inst.Rc) ComputeRC();
-}
-
-void JitArm::extshx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 a = inst.RA, s = inst.RS;
-
-	if (gpr.IsImm(s))
-	{
-		gpr.SetImmediate(a, (u32)(s32)(s16)gpr.GetImm(s));
-		if (inst.Rc) ComputeRC(gpr.GetImm(a), 0); 
-		return;
-	}
-	ARMReg rA = gpr.R(a);
-	ARMReg rS = gpr.R(s);
-	SXTH(rA, rS);
-	if (inst.Rc){
-		CMP(rA, 0);
-		ComputeRC();
-	}
-}
-void JitArm::extsbx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 a = inst.RA, s = inst.RS;
-
-	if (gpr.IsImm(s))
-	{
-		gpr.SetImmediate(a, (u32)(s32)(s8)gpr.GetImm(s));
-		if (inst.Rc) ComputeRC(gpr.GetImm(a), 0); 
-		return;
-	}
-	ARMReg rA = gpr.R(a);
-	ARMReg rS = gpr.R(s);
-	SXTB(rA, rS);
-	if (inst.Rc){
-		CMP(rA, 0);
-		ComputeRC();
-	}
-}
-void JitArm::cmp (UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	int crf = inst.CRFD;
-	u32 a = inst.RA, b = inst.RB;
-
-	if (gpr.IsImm(a) && gpr.IsImm(b))
-	{
-		ComputeRC((s32)gpr.GetImm(a) - (s32)gpr.GetImm(b), crf); 
-		return;
-	}
-
-	ARMReg RA = gpr.R(a);
-	ARMReg RB = gpr.R(b);
-	CMP(RA, RB);
-
-	ComputeRC(crf);
-}
-void JitArm::cmpi(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	u32 a = inst.RA;
-	int crf = inst.CRFD;
-	if (gpr.IsImm(a))
-		ComputeRC((s32)gpr.GetImm(a) - inst.SIMM_16, crf);
-	else
-	{
-		ARMReg RA = gpr.R(a);
-		if (inst.SIMM_16 >= 0 && inst.SIMM_16 < 256)
-			CMP(RA, inst.SIMM_16);
-		else
-		{
-			ARMReg rA = gpr.GetReg();
-			MOVI2R(rA, inst.SIMM_16);
-			CMP(RA, rA);
-			gpr.Unlock(rA);
-		}
-		ComputeRC(crf);
-	}
-}
-void JitArm::cmpl(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg RB = gpr.R(inst.RB);
-	ARMReg rA = gpr.GetReg();
-	int crf = inst.CRFD;
-
-	CMP(RA, RB);
-	// Unsigned GenerateRC()
-	
-	MOV(rA, 0x2); // Result == 0
-	SetCC(CC_LO); MOV(rA, 0x8); // Result < 0
-	SetCC(CC_HI); MOV(rA, 0x4); // Result > 0
-	SetCC();
-
-	STRB(rA, R9, PPCSTATE_OFF(cr_fast) + crf);
-	gpr.Unlock(rA);
-}
-
-void JitArm::cmpli(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg rA = gpr.GetReg();
-	int crf = inst.CRFD;
-	u32 uimm = (u32)inst.UIMM;
-	if (uimm < 256)
-	{
-		CMP(RA, uimm);
-	}
-	else
-	{
-		MOVI2R(rA, (u32)inst.UIMM);
-		CMP(RA, rA);
-	}
-	// Unsigned GenerateRC()
-	
-	MOV(rA, 0x2); // Result == 0
-	SetCC(CC_LO); MOV(rA, 0x8); // Result < 0
-	SetCC(CC_HI); MOV(rA, 0x4); // Result > 0
-	SetCC();
-
-	STRB(rA, R9, PPCSTATE_OFF(cr_fast) + crf);
-	gpr.Unlock(rA);
-
-}
-
-void JitArm::negx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg RD = gpr.R(inst.RD);
-
-	RSBS(RD, RA, 0);
-	if (inst.Rc)
-	{
-		GenerateRC();
-	}
-	if (inst.OE)
-	{
-		BKPT(0x333);
-		//GenerateOverflow();
-	}
-}
-void JitArm::rlwimix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	u32 mask = Helper_Mask(inst.MB,inst.ME);
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg RS = gpr.R(inst.RS);
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	MOVI2R(rA, mask);
-
-	Operand2 Shift(RS, ST_ROR, 32 - inst.SH); // This rotates left, while ARM has only rotate right, so swap it.
-	if (inst.Rc)
-	{
-		BIC (rB, RA, rA); // RA & ~mask
-		AND (rA, rA, Shift);
-		ORRS(RA, rB, rA);
-		GenerateRC();	
-	}
-	else
-	{
-		BIC (rB, RA, rA); // RA & ~mask
-		AND (rA, rA, Shift);
-		ORR(RA, rB, rA);
-	}
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::rlwinmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	u32 mask = Helper_Mask(inst.MB,inst.ME);
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg RS = gpr.R(inst.RS);
-	ARMReg rA = gpr.GetReg();
-	MOVI2R(rA, mask);
-
-	Operand2 Shift(RS, ST_ROR, 32 - inst.SH); // This rotates left, while ARM has only rotate right, so swap it.
-	if (inst.Rc)
-	{
-		ANDS(RA, rA, Shift);
-		GenerateRC();	
-	}
-	else
-		AND (RA, rA, Shift);
-	gpr.Unlock(rA);
-
-	//m_GPR[inst.RA] = _rotl(m_GPR[inst.RS],inst.SH) & mask;
-}
-void JitArm::rlwnmx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-
-	u32 mask = Helper_Mask(inst.MB,inst.ME);
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg RS = gpr.R(inst.RS);
-	ARMReg RB = gpr.R(inst.RB);
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	MOVI2R(rA, mask);
-
-	// PPC rotates left, ARM rotates right. Swap it
-	MOV(rB, 32);
-	SUB(rB, rB, RB);
-
-	Operand2 Shift(RS, ST_ROR, rB); // Register shifted register	
-	if (inst.Rc)
-	{
-		ANDS(RA, rA, Shift);
-		GenerateRC();	
-	}
-	else
-		AND (RA, rA, Shift);
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::srawix(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITIntegerOff)
-	int a = inst.RA;
-	int s = inst.RS;
-	int amount = inst.SH;
-
-	if (amount != 0)
-	{
-		ARMReg RA = gpr.R(a);
-		ARMReg RS = gpr.R(s);
-		ARMReg tmp = gpr.GetReg();
-		Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-		
-		MOV(tmp, RS);
-		ASRS(RA, RS, amount);
-		if (inst.Rc)
-			GenerateRC();
-		LSL(tmp, tmp, 32 - amount);
-		TST(tmp, RA);
-
-		LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-		BIC(tmp, tmp, mask);
-		SetCC(CC_NEQ);
-		ORR(tmp, tmp, mask);
-		SetCC();
-		STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-		gpr.Unlock(tmp);
-	}
-	else
-	{
-		ARMReg RA = gpr.R(a);
-		ARMReg RS = gpr.R(s);
-		MOV(RA, RS);
-
-		ARMReg tmp = gpr.GetReg();
-		Operand2 mask = Operand2(2, 2); // XER_CA_MASK
-		LDR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-		BIC(tmp, tmp, mask);
-		STR(tmp, R9, PPCSTATE_OFF(spr[SPR_XER]));
-		gpr.Unlock(tmp);
-
-	}
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
deleted file mode 100644
index f5296a17d3..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
+++ /dev/null
@@ -1,537 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../ConfigManager.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-#include "../../HW/Memmap.h"
-
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-void JitArm::UnsafeStoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset)
-{
-	// All this gets replaced on backpatch
-	Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK)
-	BIC(dest, dest, mask); // 1
-	MOVI2R(R14, (u32)Memory::base, false); // 2-3
-	ADD(dest, dest, R14); // 4
-	switch (accessSize)
-	{
-		case 32:
-			REV(value, value); // 5
-		break;
-		case 16:
-			REV16(value, value);
-		break;
-		case 8:
-			NOP(1);
-		break;
-	}
-	switch (accessSize)
-	{
-		case 32:
-			STR(value, dest); // 6
-		break;
-		case 16:
-			STRH(value, dest);
-		break;
-		case 8:
-			STRB(value, dest);
-		break;
-	}
-	NOP(1); // 7
-}
-
-void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, int accessSize, s32 offset)
-{
-	if (Core::g_CoreStartupParameter.bFastmem && fastmem)
-	{
-		ARMReg RA;
-		ARMReg RB;
-		ARMReg RS = gpr.R(value);
-
-		if (dest != -1)
-			RA = gpr.R(dest);
-
-		if (regOffset != -1)
-		{
-			RB = gpr.R(regOffset);
-			MOV(R10, RB);
-			NOP(1);
-		}
-		else
-			MOVI2R(R10, (u32)offset, false);
-
-		if (dest != -1)
-			ADD(R10, R10, RA);
-		else
-			NOP(1);
-
-		MOV(R12, RS);
-		UnsafeStoreFromReg(R10, R12, accessSize, 0);
-		return;
-	}
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg rC = gpr.GetReg();
-	ARMReg RA;
-	ARMReg RB;
-	if (dest != -1)
-		RA = gpr.R(dest);
-	if (regOffset != -1)
-		RB = gpr.R(regOffset);
-	ARMReg RS = gpr.R(value);
-	switch(accessSize)
-	{
-		case 32:
-			MOVI2R(rA, (u32)&Memory::Write_U32);	
-		break;
-		case 16:
-			MOVI2R(rA, (u32)&Memory::Write_U16);	
-		break;
-		case 8:
-			MOVI2R(rA, (u32)&Memory::Write_U8);	
-		break;
-	}
-	MOV(rB, RS);
-	if (regOffset == -1)
-		MOVI2R(rC, offset);
-	else
-		MOV(rC, RB);
-	if (dest != -1)
-		ADD(rC, rC, RA);
-
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	MOV(R1, rC);
-	BL(rA);
-	POP(4, R0, R1, R2, R3);
-	gpr.Unlock(rA, rB, rC);
-}
-
-void JitArm::stX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	u32 a = inst.RA, b = inst.RB, s = inst.RS;
-	s32 offset = inst.SIMM_16;
-	u32 accessSize = 0;
-	s32 regOffset = -1;
-	bool zeroA = true;
-	bool update = false;
-	bool fastmem = false;
-	switch(inst.OPCD)
-	{
-		case 45: // sthu
-			update = true;
-		case 44: // sth
-			accessSize = 16;
-		break;
-		case 31:
-			switch (inst.SUBOP10)
-			{
-				case 183: // stwux
-					zeroA = false;
-					update = true;
-				case 151: // stwx
-					fastmem = true;
-					accessSize = 32;
-					regOffset = b;
-				break;
-				case 247: // stbux
-					zeroA = false;
-					update = true;
-				case 215: // stbx
-					accessSize = 8;
-					regOffset = b;
-				break;
-				case 439: // sthux
-					zeroA = false;
-					update = true;
-				case 407: // sthx
-					accessSize = 16;
-					regOffset = b;
-				break;
-			}
-		break;
-		case 37: // stwu
-			update = true;
-		case 36: // stw
-			fastmem = true;
-			accessSize = 32;
-		break;
-		case 39: // stbu
-			update = true;
-		case 38: // stb
-			accessSize = 8;
-		break;
-	}
-	SafeStoreFromReg(fastmem, zeroA ? a ? a : -1 : a, s, regOffset, accessSize, offset); 
-	if (update)
-	{
-		ARMReg rA = gpr.GetReg();
-		ARMReg RB;
-		ARMReg RA = gpr.R(a);
-		if (regOffset != -1)
-			RB = gpr.R(regOffset);
-		// Check for DSI exception prior to writing back address
-		LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-		CMP(rA, EXCEPTION_DSI);
-		FixupBranch DoNotWrite = B_CC(CC_EQ);
-		if (a)
-		{
-			if (regOffset == -1)
-				MOVI2R(rA, offset);
-			else
-				MOV(rA, RB);
-			ADD(RA, RA, rA);
-		}
-		else
-			if (regOffset == -1)
-				MOVI2R(RA, (u32)offset);
-			else
-				MOV(RA, RB);
-		SetJumpTarget(DoNotWrite);
-		gpr.Unlock(rA);
-	}
-}
-
-void JitArm::UnsafeLoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset)
-{
-	ARMReg rA = gpr.GetReg();
-	MOVI2R(rA, offset, false); // -3
-	ADD(addr, addr, rA); // - 1
-
-	// All this gets replaced on backpatch
-	Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK)
-	BIC(addr, addr, mask); // 1
-	MOVI2R(rA, (u32)Memory::base, false); // 2-3
-	ADD(addr, addr, rA); // 4
-	switch (accessSize)
-	{
-		case 32:
-			LDR(dest, addr); // 5
-		break;
-		case 16:
-			LDRH(dest, addr);
-		break;
-		case 8:
-			LDRB(dest, addr);
-		break;
-	}
-	switch (accessSize)
-	{
-		case 32:
-			REV(dest, dest); // 6
-		break;
-		case 16:
-			REV16(dest, dest);
-		break;
-		case 8:
-			NOP(1);
-		break;
-
-	}
-	NOP(2); // 7-8
-	gpr.Unlock(rA);
-}
-
-void JitArm::SafeLoadToReg(bool fastmem, u32 dest, s32 addr, s32 offsetReg, int accessSize, s32 offset, bool signExtend, bool reverse)
-{
-	ARMReg RD = gpr.R(dest);
-	if (Core::g_CoreStartupParameter.bFastmem && fastmem)
-	{
-		if (addr != -1)
-			MOV(R10, gpr.R(addr));
-		else
-			MOV(R10, 0);
-		
-		UnsafeLoadToReg(RD, R10, accessSize, offset);	
-		return;
-	}
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	if (offsetReg == -1)
-		MOVI2R(rA, offset);
-	else
-		MOV(rA, gpr.R(offsetReg));
-
-	if (addr != -1)
-		ADD(rA, rA, gpr.R(addr));
-	
-	switch (accessSize)
-	{
-		case 8:
-			MOVI2R(rB, (u32)&Memory::Read_U8);	
-		break;
-		case 16:
-			MOVI2R(rB, (u32)&Memory::Read_U16);	
-		break;
-		case 32:
-			MOVI2R(rB, (u32)&Memory::Read_U32);	
-		break;
-	}
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rA);
-	BL(rB);
-	MOV(rA, R0);
-	POP(4, R0, R1, R2, R3);
-	MOV(RD, rA);
-	if (signExtend) // Only on 16 loads
-		SXTH(RD, RD);
-	if (reverse)
-	{
-		if (accessSize == 32)
-			REV(RD, RD);
-		else if (accessSize == 16)
-			REV16(RD, RD);
-	}
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::lXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	u32 a = inst.RA, b = inst.RB, d = inst.RD;
-	s32 offset = inst.SIMM_16;
-	u32 accessSize = 0;
-	s32 offsetReg = -1;
-	bool zeroA = true;
-	bool update = false;	
-	bool signExtend = false;
-	bool reverse = false;
-	bool fastmem = false;
-
-	switch(inst.OPCD)
-	{
-		case 31:
-			switch(inst.SUBOP10)
-			{
-				case 55: // lwzux
-					zeroA = false;
-					update = true;
-				case 23: // lwzx
-					accessSize = 32;
-					offsetReg = b; 
-				break;
-				case 119: //lbzux
-					zeroA = false;
-					update = true;
-				case 87: // lbzx
-					accessSize = 8;
-					offsetReg = b;
-				break;
-				case 311: // lhzux
-					zeroA = false;
-					update = true;
-				case 279: // lhzx
-					accessSize = 16;
-					offsetReg = b;
-				break;
-				case 375: // lhaux
-					zeroA = false;
-					update = true;
-				case 343: // lhax
-					accessSize = 16;
-					signExtend = true;
-					offsetReg = b;
-				break;
-				case 534: // lwbrx
-					accessSize = 32;
-					reverse = true;
-				break;
-				case 790: // lhbrx
-					accessSize = 16;
-					reverse = true;
-				break;
-			}
-		break;
-		case 33: // lwzu
-			zeroA = false;
-			update = true;
-		case 32: // lwz
-			fastmem = true;
-			accessSize = 32;
-		break;
-		case 35: // lbzu
-			zeroA = false;
-			update = true;
-		case 34: // lbz
-			fastmem = true;
-			accessSize = 8;
-		break;
-		case 41: // lhzu
-			zeroA = false;
-			update = true;
-		case 40: // lhz
-			fastmem = true;
-			accessSize = 16;
-		break;
-		case 43: // lhau
-			zeroA = false;
-			update = true;
-		case 42: // lha
-			signExtend = true;
-			accessSize = 16;
-		break;
-	}
-	
-	// Check for exception before loading
-	ARMReg rA = gpr.GetReg(false);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-
-	SafeLoadToReg(fastmem, d, zeroA ? a ? a : -1 : a, offsetReg, accessSize, offset, signExtend, reverse);
-	
-	if (update)
-	{
-		rA = gpr.GetReg(false);
-		ARMReg RA = gpr.R(a);
-		if (offsetReg == -1)
-			MOVI2R(rA, offset);	
-		else
-			MOV(RA, gpr.R(offsetReg));
-		ADD(RA, RA, rA);
-	}
-
-	SetJumpTarget(DoNotLoad);
-	
-	// LWZ idle skipping
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
-		inst.OPCD == 32 &&
-		(inst.hex & 0xFFFF0000) == 0x800D0000 &&
-		(Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 ||
-		(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) &&
-		Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8)
-	{
-		ARMReg RD = gpr.R(d);
-		gpr.Flush();
-		fpr.Flush();
-		
-		// if it's still 0, we can wait until the next event
-		TST(RD, RD);
-		FixupBranch noIdle = B_CC(CC_NEQ);
-		rA = gpr.GetReg();	
-		
-		MOVI2R(rA, (u32)&PowerPC::OnIdle);
-		MOVI2R(R0, PowerPC::ppcState.gpr[a] + (s32)(s16)inst.SIMM_16); 
-		BL(rA);
-
-		gpr.Unlock(rA);
-		WriteExceptionExit();
-
-		SetJumpTarget(noIdle);
-
-		//js.compilerPC += 8;
-		return;
-	}
-
-}
-
-// Some games use this heavily in video codecs
-// We make the assumption that this pulls from main RAM at /all/ times
-void JitArm::lmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (!Core::g_CoreStartupParameter.bFastmem){
-		Default(inst); return;
-	}
-
-	u32 a = inst.RA;
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	MOVI2R(rA, inst.SIMM_16);
-	if (a)
-		ADD(rA, rA, gpr.R(a));
-	Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK)
-	BIC(rA, rA, mask); // 3
-	MOVI2R(rB, (u32)Memory::base, false); // 4-5
-	ADD(rA, rA, rB); // 6
-
-	for (int i = inst.RD; i < 32; i++)
-	{
-		ARMReg RX = gpr.R(i);
-		LDR(RX, rA, (i - inst.RD) * 4);
-		REV(RX, RX);
-	}
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::stmw(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-	if (!Core::g_CoreStartupParameter.bFastmem){
-		Default(inst); return;
-	}
-
-	u32 a = inst.RA;
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg rC = gpr.GetReg();
-	MOVI2R(rA, inst.SIMM_16);
-	if (a)
-		ADD(rA, rA, gpr.R(a));
-	Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK)
-	BIC(rA, rA, mask); // 3
-	MOVI2R(rB, (u32)Memory::base, false); // 4-5
-	ADD(rA, rA, rB); // 6
-
-	for (int i = inst.RD; i < 32; i++)
-	{
-		ARMReg RX = gpr.R(i);
-		REV(rC, RX);
-		STR(rC, rA, (i - inst.RD) * 4);
-	}
-	gpr.Unlock(rA, rB, rC);
-}
-void JitArm::dcbst(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreOff)
-
-	// If the dcbst instruction is preceded by dcbt, it is flushing a prefetched
-	// memory location.  Do not invalidate the JIT cache in this case as the memory
-	// will be the same.
-	// dcbt = 0x7c00022c
-	if ((Memory::ReadUnchecked_U32(js.compilerPC - 4) & 0x7c00022c) != 0x7c00022c)
-	{
-		Default(inst); return;
-	}
-}
-void JitArm::icbi(UGeckoInstruction inst)
-{
-	Default(inst);
-	WriteExit(js.compilerPC + 4, 0);
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
deleted file mode 100644
index c9f42ebd36..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../ConfigManager.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-#include "../../HW/Memmap.h"
-
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitFPRCache.h"
-#include "JitAsm.h"
-
-void JitArm::lfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	ARMReg v0 = fpr.R0(inst.FD);
-	ARMReg v1 = fpr.R1(inst.FD);
-
-	if (inst.RA)
-	{
-		MOVI2R(rB, inst.SIMM_16);
-		ARMReg RA = gpr.R(inst.RA);
-		ADD(rB, rB, RA);
-	}
-	else
-		MOVI2R(rB, (u32)inst.SIMM_16);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-
-	MOVI2R(rA, (u32)&Memory::Read_U32);	
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	BL(rA);
-
-	VMOV(S0, R0);	
-
-	VCVT(v0, S0, 0);
-	VCVT(v1, S0, 0);
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-	SetJumpTarget(DoNotLoad);
-}
-void JitArm::lfsu(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	ARMReg v0 = fpr.R0(inst.FD);
-	ARMReg v1 = fpr.R1(inst.FD);
-
-	MOVI2R(rB, inst.SIMM_16);
-	ADD(rB, rB, RA);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-
-	MOVI2R(rA, (u32)&Memory::Read_U32);	
-
-	MOV(RA, rB);
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	BL(rA);
-
-	VMOV(S0, R0);
-
-	VCVT(v0, S0, 0);
-	VCVT(v1, S0, 0);
-	POP(4, R0, R1, R2, R3);
-	
-
-	gpr.Unlock(rA, rB);
-	SetJumpTarget(DoNotLoad);
-}
-
-void JitArm::lfsx(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	ARMReg RB = gpr.R(inst.RB);
-	ARMReg v0 = fpr.R0(inst.FD);
-	ARMReg v1 = fpr.R1(inst.FD);
-	
-	if (inst.RA)
-		ADD(rB, RB, gpr.R(inst.RA));
-	else
-		MOV(rB, RB);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-	
-	MOVI2R(rA, (u32)&Memory::Read_U32);	
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	BL(rA);
-
-	VMOV(S0, R0);	
-	VCVT(v0, S0, 0);
-	VCVT(v1, S0, 0);
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-	SetJumpTarget(DoNotLoad);
-}
-
-void JitArm::lfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	ARMReg v0 = fpr.R0(inst.FD);
-
-	if (inst.RA)
-	{
-		MOVI2R(rB, inst.SIMM_16);
-		ARMReg RA = gpr.R(inst.RA);
-		ADD(rB, rB, RA);
-	}
-	else
-		MOVI2R(rB, (u32)inst.SIMM_16);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-
-	MOVI2R(rA, (u32)&Memory::Read_F64);	
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	BL(rA);
-
-#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1
-	VMOV(v0, R0);
-#else
-	VMOV(v0, D0);
-#endif
-
-	POP(4, R0, R1, R2, R3);
-
-	gpr.Unlock(rA, rB);
-	SetJumpTarget(DoNotLoad);
-}
-
-void JitArm::lfdu(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-
-	ARMReg v0 = fpr.R0(inst.FD);
-
-	MOVI2R(rB, inst.SIMM_16);
-	ADD(rB, rB, RA);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	FixupBranch DoNotLoad = B_CC(CC_EQ);
-
-	MOVI2R(rA, (u32)&Memory::Read_F64);	
-	MOV(RA, rB);
-
-	PUSH(4, R0, R1, R2, R3);
-	MOV(R0, rB);
-	BL(rA);
-
-#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1
-	VMOV(v0, R0);
-#else
-	VMOV(v0, D0);
-#endif
-
-	POP(4, R0, R1, R2, R3);
-
-	gpr.Unlock(rA, rB);
-	SetJumpTarget(DoNotLoad);
-}
-
-void JitArm::stfs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg v0 = fpr.R0(inst.FS);
-	VCVT(S0, v0, 0);
-	
-	if (inst.RA)
-	{
-		MOVI2R(rB, inst.SIMM_16);
-		ARMReg RA = gpr.R(inst.RA);
-		ADD(rB, rB, RA);
-	}
-	else
-		MOVI2R(rB, (u32)inst.SIMM_16);
-
-	
-	MOVI2R(rA, (u32)&Memory::Write_U32);	
-	PUSH(4, R0, R1, R2, R3);
-	VMOV(R0, S0);
-	MOV(R1, rB);
-
-	BL(rA);
-
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::stfsu(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg RA = gpr.R(inst.RA);
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg v0 = fpr.R0(inst.FS);
-	VCVT(S0, v0, 0);
-	
-	MOVI2R(rB, inst.SIMM_16);
-	ADD(rB, rB, RA);
-
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	
-	SetCC(CC_NEQ);
-	MOV(RA, rB);
-	SetCC();
-
-	MOVI2R(rA, (u32)&Memory::Write_U32);	
-	PUSH(4, R0, R1, R2, R3);
-	VMOV(R0, S0);
-	MOV(R1, rB);
-
-	BL(rA);
-
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::stfd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg v0 = fpr.R0(inst.FS);
-	
-	if (inst.RA)
-	{
-		MOVI2R(rB, inst.SIMM_16);
-		ARMReg RA = gpr.R(inst.RA);
-		ADD(rB, rB, RA);
-	}
-	else
-		MOVI2R(rB, (u32)inst.SIMM_16);
-
-	
-	MOVI2R(rA, (u32)&Memory::Write_F64);	
-	PUSH(4, R0, R1, R2, R3);
-#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1
-	VMOV(R0, v0);
-	MOV(R2, rB);
-#else
-	VMOV(D0, v0);
-	MOV(R0, rB);
-#endif
-
-	BL(rA);
-
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::stfdu(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStoreFloatingOff)
-	ARMReg RA = gpr.R(inst.RA);
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	ARMReg v0 = fpr.R0(inst.FS);
-	
-	MOVI2R(rB, inst.SIMM_16);
-	ADD(rB, rB, RA);
-	
-	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
-	CMP(rA, EXCEPTION_DSI);
-	
-	SetCC(CC_NEQ);
-	MOV(RA, rB);
-	SetCC();
-
-	MOVI2R(rA, (u32)&Memory::Write_F64);	
-	PUSH(4, R0, R1, R2, R3);
-#if !defined(__ARM_PCS_VFP) // SoftFP returns in R0 and R1
-	VMOV(R0, v0);
-	MOV(R2, rB);
-#else
-	VMOV(D0, v0);
-	MOV(R0, rB);
-#endif
-
-	BL(rA);
-
-	POP(4, R0, R1, R2, R3);
-	
-	gpr.Unlock(rA, rB);
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp
deleted file mode 100644
index bae9042dd0..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStorePaired.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-void JitArm::psq_l(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-
-	bool update = inst.OPCD == 57;
-	s32 offset = inst.SIMM_12;
-
-	// R12 contains scale
-	// R11 contains type
-	// R10 is the ADDR
-	if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; }
-	
-	LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
-	UBFX(R12, R11, 16, 3); // Type
-	LSL(R12, R12, 2);
-	UBFX(R11, R11, 24, 6); // Scale
-	LSL(R11, R11, 2);
-
-	MOVI2R(R10, (u32)offset);
-	if (inst.RA || update) // Always uses the register on update
-		ADD(R10, R10, gpr.R(inst.RA));
-	if (update)
-		MOV(gpr.R(inst.RA), R10);
-	MOVI2R(R14, (u32)asm_routines.pairedLoadQuantized);
-	ADD(R14, R14, R12);
-	LDR(R14, R14, inst.W ? 8 * 4 : 0);
-
-	// Values returned in S0, S1
-	BL(R14); // Jump to the quantizer Load
-
-	ARMReg vD0 = fpr.R0(inst.RS, false);
-	ARMReg vD1 = fpr.R1(inst.RS, false);
-	VCVT(vD0, S0, 0);
-	if (!inst.W)
-		VCVT(vD1, S1, 0);
-	else
-		MOVI2F(vD1, 1.0f, INVALID_REG); // No need for temp reg with 1.0f
-}
-
-void JitArm::psq_st(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITLoadStorePairedOff)
-
-	bool update = inst.OPCD == 61;
-	s32 offset = inst.SIMM_12;
-	
-	// R12 contains scale
-	// R11 contains type
-	// R10 is the ADDR
-	if (js.memcheck || !Core::g_CoreStartupParameter.bFastmem) { Default(inst); return; }
-
-	LDR(R11, R9, PPCSTATE_OFF(spr[SPR_GQR0 + inst.I]));
-	UBFX(R12, R11, 0, 3); // Type
-	LSL(R12, R12, 2);
-	UBFX(R11, R11, 8, 6); // Scale
-	LSL(R11, R11, 2);
-
-	if (inst.RA || update) // Always uses the register on update
-	{
-		MOVI2R(R14, offset);
-		ADD(R10, gpr.R(inst.RA), R14);
-	}
-	else
-		MOVI2R(R10, (u32)offset);
-
-	if (update)
-		MOV(gpr.R(inst.RA), R10);
-	MOVI2R(R14, (u32)asm_routines.pairedStoreQuantized);
-	ADD(R14, R14, R12);
-	LDR(R14, R14, inst.W ? 8 * 4 : 0);
-
-	ARMReg vD0 = fpr.R0(inst.RS);
-	VCVT(S0, vD0, 0);
-
-	if (!inst.W)
-	{
-		ARMReg vD1 = fpr.R1(inst.RS);
-		VCVT(S1, vD1, 0);
-	}
-	// floats passed through D0
-	BL(R14); // Jump to the quantizer Store
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp
deleted file mode 100644
index 983e788707..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Paired.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-#include "JitArm_FPUtils.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-void JitArm::ps_rsqrte(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	ARMReg fpscrReg = gpr.GetReg();
-	ARMReg V0 = D1;
-	ARMReg rA = gpr.GetReg();
-
-	MOVI2R(fpscrReg, (u32)&PPC_NAN);
-	VLDR(V0, fpscrReg, 0);
-	LDR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-
-	VCMP(vB0);
-	VMRS(_PC);
-	FixupBranch Less0 = B_CC(CC_LT);
-		VMOV(vD0, V0);	
-		SetFPException(fpscrReg, FPSCR_VXSQRT);
-		FixupBranch SkipOrr0 = B();
-	SetJumpTarget(Less0);
-	SetCC(CC_EQ);
-		ORR(rA, rA, 1);
-	SetCC();
-	SetJumpTarget(SkipOrr0);
-
-	VCMP(vB1);
-	VMRS(_PC);
-	FixupBranch Less1 = B_CC(CC_LT);
-		VMOV(vD1, V0);
-		SetFPException(fpscrReg, FPSCR_VXSQRT);
-		FixupBranch SkipOrr1 = B();
-	SetJumpTarget(Less1);
-	SetCC(CC_EQ);
-		ORR(rA, rA, 2);
-	SetCC();
-	SetJumpTarget(SkipOrr1);
-
-	CMP(rA, 0);
-	FixupBranch noException = B_CC(CC_EQ);
-	SetFPException(fpscrReg, FPSCR_ZX);
-	SetJumpTarget(noException);
-	
-	VCVT(S0, vB0, 0);
-	VCVT(S1, vB1, 0);
-
-	NEONXEmitter nemit(this);
-	nemit.VRSQRTE(F_32, D0, D0);
-	VCVT(vD0, S0, 0);
-	VCVT(vD1, S1, 0);
-
-	STR(fpscrReg, R9, PPCSTATE_OFF(fpscr));
-	gpr.Unlock(fpscrReg, rA);
-}
-
-void JitArm::ps_sel(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	
-	VCMP(vA0);
-	VMRS(_PC);
-
-	FixupBranch GT0 = B_CC(CC_GE);
-	VMOV(vD0, vB0);
-	FixupBranch EQ0 = B();
-	SetJumpTarget(GT0);
-	VMOV(vD0, vC0);
-	SetJumpTarget(EQ0);
-
-	VCMP(vA1);
-	VMRS(_PC);
-	FixupBranch GT1 = B_CC(CC_GE);
-	VMOV(vD1, vB1);
-	FixupBranch EQ1 = B();
-	SetJumpTarget(GT1);
-	VMOV(vD1, vC1);
-	SetJumpTarget(EQ1);
-}
-
-void JitArm::ps_add(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	
-	VADD(vD0, vA0, vB0);
-	VADD(vD1, vA1, vB1);
-}
-
-void JitArm::ps_nmadd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC1);
-	VADD(vD0, V0, vB0);
-	VADD(vD1, V1, vB1);
-	VNEG(vD0, vD0);
-	VNEG(vD1, vD1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_madd(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC1);
-	VADD(vD0, V0, vB0);
-	VADD(vD1, V1, vB1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_nmsub(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC1);
-	VSUB(vD0, V0, vB0);
-	VSUB(vD1, V1, vB1);
-	VNEG(vD0, vD0);
-	VNEG(vD1, vD1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_msub(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC1);
-	VSUB(vD0, V0, vB0);
-	VSUB(vD1, V1, vB1);
-	
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_madds0(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-	
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC0);
-
-	VADD(vD0, V0, vB0);
-	VADD(vD1, V1, vB1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_madds1(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-	VMUL(V0, vA0, vC1);
-	VMUL(V1, vA1, vC1);
-	VADD(vD0, V0, vB0);
-	VADD(vD1, V1, vB1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-void JitArm::ps_sum0(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	
-	VADD(vD0, vA0, vB1);
-	VMOV(vD1, vC1);
-		
-}
-
-void JitArm::ps_sum1(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, b = inst.FB, c = inst.FC, d = inst.FD;
-
-	if (inst.Rc) {
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	
-	VMOV(vD0, vC0);
-	VADD(vD1, vA0, vB1);
-}
-
-
-void JitArm::ps_sub(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	VSUB(vD0, vA0, vB0);
-	VSUB(vD1, vA1, vB1);
-}
-
-void JitArm::ps_mul(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, c = inst.FC, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	VMUL(vD0, vA0, vC0);
-	VMUL(vD1, vA1, vC1);
-}
-
-void JitArm::ps_muls0(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, c = inst.FC, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vC0 = fpr.R0(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-
-	VMUL(V0, vA0, vC0);
-	VMUL(V1, vA1, vC0);
-	VMOV(vD0, V0);
-	VMOV(vD1, V1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_muls1(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-
-	u32 a = inst.FA, c = inst.FC, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vC1 = fpr.R1(c);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	ARMReg V0 = fpr.GetReg();
-	ARMReg V1 = fpr.GetReg();
-
-
-	VMUL(V0, vA0, vC1);
-	VMUL(V1, vA1, vC1);
-	VMOV(vD0, V0);
-	VMOV(vD1, V1);
-
-	fpr.Unlock(V0);
-	fpr.Unlock(V1);
-}
-
-void JitArm::ps_merge00(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-
-	VMOV(vD1, vB0);
-	VMOV(vD0, vA0);
-}
-
-void JitArm::ps_merge01(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vA0 = fpr.R0(a);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	VMOV(vD0, vA0);
-	VMOV(vD1, vB1);
-}
-
-void JitArm::ps_merge10(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	ARMReg V0 = fpr.GetReg();
-	
-	VMOV(V0, vB0);
-	VMOV(vD0, vA1);
-	VMOV(vD1, V0);
-
-	fpr.Unlock(V0);
-}
-
-void JitArm::ps_merge11(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 a = inst.FA, b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vA1 = fpr.R1(a);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	VMOV(vD0, vA1);
-	VMOV(vD1, vB1);
-}
-
-void JitArm::ps_mr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	VMOV(vD0, vB0);
-	VMOV(vD1, vB1);
-}
-
-void JitArm::ps_neg(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	VNEG(vD0, vB0);
-	VNEG(vD1, vB1);
-}
-
-void JitArm::ps_abs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	VABS(vD0, vB0);
-	VABS(vD1, vB1);
-}
-
-void JitArm::ps_nabs(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITPairedOff)
-	u32 b = inst.FB, d = inst.FD;
-	if (inst.Rc){
-		Default(inst); return;
-	}
-
-	ARMReg vB0 = fpr.R0(b);
-	ARMReg vB1 = fpr.R1(b);
-	ARMReg vD0 = fpr.R0(d, false);
-	ARMReg vD1 = fpr.R1(d, false);
-	
-	VABS(vD0, vB0);
-	VNEG(vD0, vD0);
-	VABS(vD1, vB1);
-	VNEG(vD1, vD1);
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
deleted file mode 100644
index 7056441856..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#include "Common.h"
-#include "Thunk.h"
-
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "ArmEmitter.h"
-
-#include "Jit.h"
-#include "JitRegCache.h"
-#include "JitAsm.h"
-
-void JitArm::mtspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-
-	switch (iIndex)
-	{
-	case SPR_LR:
-	case SPR_CTR:
-	case SPR_XER:
-	case SPR_GQR0:
-	case SPR_GQR0 + 1:
-	case SPR_GQR0 + 2:
-	case SPR_GQR0 + 3:
-	case SPR_GQR0 + 4:
-	case SPR_GQR0 + 5:
-	case SPR_GQR0 + 6:
-	case SPR_GQR0 + 7:
-		// These are safe to do the easy way, see the bottom of this function.
-		break;
-
-	default:
-		Default(inst);
-		return;
-	}
-
-	// OK, this is easy.
-	ARMReg RD = gpr.R(inst.RD);
-	STR(RD, R9,  PPCSTATE_OFF(spr) + iIndex * 4);
-}
-void JitArm::mftb(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	mfspr(inst);
-}
-void JitArm::mfspr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-	switch (iIndex)
-	{
-	case SPR_WPAR:
-	case SPR_DEC:
-	case SPR_TL:
-	case SPR_TU:
-		Default(inst);
-		return;
-	default:
-		ARMReg RD = gpr.R(inst.RD);
-		LDR(RD, R9, PPCSTATE_OFF(spr) + iIndex * 4);
-		break;
-	}
-}
-
-void JitArm::mfcr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	// USES_CR
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	int d = inst.RD;
-	LDRB(rA, R9, PPCSTATE_OFF(cr_fast[0]));
-
-	for (int i = 1; i < 8; i++)
-	{
-		LDRB(rB, R9, PPCSTATE_OFF(cr_fast[i]));
-		LSL(rA, rA, 4);
-		ORR(rA, rA, rB);
-	}
-	MOV(gpr.R(d), rA);
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::mtcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	ARMReg rA = gpr.GetReg();
-
-	// USES_CR
-	u32 crm = inst.CRM;
-	if (crm != 0)
-	{
-		if (gpr.IsImm(inst.RS))
-		{
-			for (int i = 0; i < 8; i++)
-			{
-				if ((crm & (0x80 >> i)) != 0)
-				{
-					u8 newcr = (gpr.GetImm(inst.RS) >> (28 - (i * 4))) & 0xF;
-					MOV(rA, newcr);
-					STRB(rA, R9, PPCSTATE_OFF(cr_fast[i]));
-				}
-			}
-		}
-		else
-		{
-			ARMReg rB = gpr.GetReg();
-			MOV(rA, gpr.R(inst.RS));
-			for (int i = 0; i < 8; i++)
-			{
-				if ((crm & (0x80 >> i)) != 0)
-				{
-					UBFX(rB, rA, 28 - (i * 4), 4); 
-					STRB(rB, R9, PPCSTATE_OFF(cr_fast[i]));
-				}
-			}
-			gpr.Unlock(rB);
-		}
-	}
-	gpr.Unlock(rA);
-}
-
-void JitArm::mtsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(sr[inst.SR]));
-}
-
-void JitArm::mfsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-
-	LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(sr[inst.SR]));
-}
-void JitArm::mcrxr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	// Copy XER[0-3] into CR[inst.CRFD]
-	LDR(rA, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	MOV(rB, rA);
-	LSR(rA, rA, 28);
-	STRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFD]));
-
-	// Clear XER[0-3]
-	Operand2 Top4(0xF, 2);
-	BIC(rB, rB, Top4);
-	STR(rB, R9, PPCSTATE_OFF(spr[SPR_XER]));
-	gpr.Unlock(rA, rB);
-}
-
-void JitArm::mtmsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
- 	// Don't interpret this, if we do we get thrown out
-	//JITDISABLE(bJITSystemRegistersOff)
-	
-	STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(msr));
-	
-	gpr.Flush();
-	fpr.Flush();
-
-	WriteExit(js.compilerPC + 4, 0);
-}
-
-void JitArm::mfmsr(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	
-	LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr));
-}
-
-void JitArm::mcrf(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	ARMReg rA = gpr.GetReg();
-
-	if (inst.CRFS != inst.CRFD)
-	{
-		LDRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFS]));
-		STRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRFD]));
-	}
-	gpr.Unlock(rA);
-}
-
-void JitArm::crXXX(UGeckoInstruction inst)
-{
-	INSTRUCTION_START
-	JITDISABLE(bJITSystemRegistersOff)
-	
-	ARMReg rA = gpr.GetReg();
-	ARMReg rB = gpr.GetReg();
-	// Get bit CRBA aligned with bit CRBD
-	LDRB(rA, R9, PPCSTATE_OFF(cr_fast[inst.CRBA >> 2]));
-	int shiftA = (inst.CRBD & 3) - (inst.CRBA & 3);
-	if (shiftA < 0)
-		LSL(rA, rA, -shiftA);
-	else if (shiftA > 0)
-		LSR(rA, rA, shiftA);
-	
-	// Get bit CRBB aligned with bit CRBD
-	int shiftB = (inst.CRBD & 3) - (inst.CRBB & 3);
-	LDRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBB >> 2]));
-	if (shiftB < 0)
-		LSL(rB, rB, -shiftB);
-	else if (shiftB > 0)
-		LSR(rB, rB, shiftB);
-	
-	// Compute combined bit
-	switch(inst.SUBOP10)
-	{
-	case 33:	// crnor
-		ORR(rA, rA, rB);
-		MVN(rA, rA);
-		break;
-
-	case 129:	// crandc
-		MVN(rB, rB);
-		AND(rA, rA, rB);
-		break;
-
-	case 193:	// crxor
-		EOR(rA, rA, rB);
-		break;
-
-	case 225:	// crnand
-		AND(rA, rA, rB);
-		MVN(rA, rA);
-		break;
-
-	case 257:	// crand
-		AND(rA, rA, rB);
-		break;
-
-	case 289:	// creqv
-		EOR(rA, rA, rB);
-		MVN(rA, rA);
-		break;
-
-	case 417:	// crorc
-		MVN(rA, rA);
-		ORR(rA, rA, rB);
-		break;
-
-	case 449:	// cror
-		ORR(rA, rA, rB);
-		break;
-	}
-	// Store result bit in CRBD
-	AND(rA, rA, 0x8 >> (inst.CRBD & 3));
-	LDRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBD >> 2]));
-	BIC(rB, rB, 0x8 >> (inst.CRBD & 3));	
-	ORR(rB, rB, rA);
-	STRB(rB, R9, PPCSTATE_OFF(cr_fast[inst.CRBD >> 2]));
-	gpr.Unlock(rA, rB);
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
deleted file mode 100644
index 675907d199..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Jit.h"
-#include "../JitInterface.h"
-#include "JitArm_Tables.h"
-
-// Should be moved in to the Jit class
-typedef void (JitArm::*_Instruction) (UGeckoInstruction instCode);
-
-static _Instruction dynaOpTable[64];
-static _Instruction dynaOpTable4[1024];
-static _Instruction dynaOpTable19[1024];
-static _Instruction dynaOpTable31[1024];
-static _Instruction dynaOpTable59[32];
-static _Instruction dynaOpTable63[1024];
-
-void JitArm::DynaRunTable4(UGeckoInstruction _inst)  {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);}
-void JitArm::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);}
-void JitArm::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);}
-void JitArm::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);}
-void JitArm::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);}
-
-struct GekkoOPTemplate
-{
-	int opcode;
-	_Instruction Inst;
-	//GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
-};
-
-static GekkoOPTemplate primarytable[] = 
-{
-	{4,  &JitArm::DynaRunTable4}, //"RunTable4",  OPTYPE_SUBTABLE | (4<<24), 0}},
-	{19, &JitArm::DynaRunTable19}, //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}},
-	{31, &JitArm::DynaRunTable31}, //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}},
-	{59, &JitArm::DynaRunTable59}, //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}},
-	{63, &JitArm::DynaRunTable63}, //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}},
-
-	{16, &JitArm::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{18, &JitArm::bx}, //"bx",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-
-	{1,  &JitArm::HLEFunction}, //"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{2,  &JitArm::Default}, //"DynaBlock",   OPTYPE_SYSTEM, 0}},
-	{3,  &JitArm::Break}, //"twi",         OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{17, &JitArm::sc}, //"sc",          OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
-
-	{7,  &JitArm::arith}, //"mulli",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}},
-	{8,  &JitArm::Default}, //"subfic",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_A |	FL_SET_CA}},
-	{10, &JitArm::cmpli}, //"cmpli",    OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{11, &JitArm::cmpi}, //"cmpi",     OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}},
-	{12, &JitArm::arith}, //"addic",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}},
-	{13, &JitArm::arith}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}},
-	{14, &JitArm::arith}, //"addi",     OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-	{15, &JitArm::arith}, //"addis",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}},
-
-	{20, &JitArm::rlwimix}, //"rlwimix",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}},
-	{21, &JitArm::rlwinmx}, //"rlwinmx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{23, &JitArm::rlwnmx}, //"rlwnmx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}},
-
-	{24, &JitArm::arith}, //"ori",      OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{25, &JitArm::arith}, //"oris",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{26, &JitArm::arith}, //"xori",     OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{27, &JitArm::arith}, //"xoris",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}},
-	{28, &JitArm::arith}, //"andi_rc",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-	{29, &JitArm::arith}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}},
-
-	{32, &JitArm::lXX}, //"lwz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{33, &JitArm::lXX}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{34, &JitArm::lXX}, //"lbz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{35, &JitArm::lXX}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{40, &JitArm::lXX}, //"lhz",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{41, &JitArm::lXX}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-	{42, &JitArm::lXX}, //"lha",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A}},
-	{43, &JitArm::lXX}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}},
-
-	{44, &JitArm::stX}, //"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{45, &JitArm::stX}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{36, &JitArm::stX}, //"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{37, &JitArm::stX}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{38, &JitArm::stX}, //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
-	{39, &JitArm::stX}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-
-	{46, &JitArm::lmw}, //"lmw",   OPTYPE_SYSTEM, FL_EVIL, 10}},
-	{47, &JitArm::stmw}, //"stmw",  OPTYPE_SYSTEM, FL_EVIL, 10}},
-
-	{48, &JitArm::lfs}, //"lfs",  OPTYPE_LOADFP, FL_IN_A}},
-	{49, &JitArm::lfsu}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-	{50, &JitArm::lfd}, //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
-	{51, &JitArm::lfdu}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-
-	{52, &JitArm::stfs}, //"stfs",  OPTYPE_STOREFP, FL_IN_A}},
-	{53, &JitArm::stfsu}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-	{54, &JitArm::stfd}, //"stfd",  OPTYPE_STOREFP, FL_IN_A}},
-	{55, &JitArm::stfdu}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}},
-
-	{56, &JitArm::psq_l}, //"psq_l",   OPTYPE_PS, FL_IN_A}},
-	{57, &JitArm::psq_l}, //"psq_lu",  OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-	{60, &JitArm::psq_st}, //"psq_st",  OPTYPE_PS, FL_IN_A}},
-	{61, &JitArm::psq_st}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}},
-
-	//missing: 0, 5, 6, 9, 22, 30, 62, 58
-	{0,  &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{5,  &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{6,  &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{9,  &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{22, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{30, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{62, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-	{58, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}},
-};
-
-static GekkoOPTemplate table4[] = 
-{    //SUBOP10
-	{0,    &JitArm::Default}, //"ps_cmpu0",   OPTYPE_PS, FL_SET_CRn}},
-	{32,   &JitArm::Default}, //"ps_cmpo0",   OPTYPE_PS, FL_SET_CRn}},
-	{40,   &JitArm::ps_neg}, //"ps_neg",     OPTYPE_PS, FL_RC_BIT}},
-	{136,  &JitArm::ps_nabs}, //"ps_nabs",    OPTYPE_PS, FL_RC_BIT}},
-	{264,  &JitArm::ps_abs}, //"ps_abs",     OPTYPE_PS, FL_RC_BIT}},
-	{64,   &JitArm::Default}, //"ps_cmpu1",   OPTYPE_PS, FL_RC_BIT}},
-	{72,   &JitArm::ps_mr}, //"ps_mr",      OPTYPE_PS, FL_RC_BIT}},
-	{96,   &JitArm::Default}, //"ps_cmpo1",   OPTYPE_PS, FL_RC_BIT}},
-	{528,  &JitArm::ps_merge00}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}},
-	{560,  &JitArm::ps_merge01}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}},
-	{592,  &JitArm::ps_merge10}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}},
-	{624,  &JitArm::ps_merge11}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}},
-
-	{1014, &JitArm::Default}, //"dcbz_l",     OPTYPE_SYSTEM, 0}},
-};		
-
-static GekkoOPTemplate table4_2[] = 
-{
-	{10, &JitArm::ps_sum0}, //"ps_sum0",   OPTYPE_PS, 0}},
-	{11, &JitArm::ps_sum1}, //"ps_sum1",   OPTYPE_PS, 0}},
-	{12, &JitArm::ps_muls0}, //"ps_muls0",  OPTYPE_PS, 0}},
-	{13, &JitArm::ps_muls1}, //"ps_muls1",  OPTYPE_PS, 0}},
-	{14, &JitArm::ps_madds0}, //"ps_madds0", OPTYPE_PS, 0}},
-	{15, &JitArm::ps_madds1}, //"ps_madds1", OPTYPE_PS, 0}},
-	{18, &JitArm::Default}, //"ps_div",    OPTYPE_PS, 0, 16}},
-	{20, &JitArm::ps_sub}, //"ps_sub",    OPTYPE_PS, 0}},
-	{21, &JitArm::ps_add}, //"ps_add",    OPTYPE_PS, 0}},
-	{23, &JitArm::ps_sel}, //"ps_sel",    OPTYPE_PS, 0}},
-	{24, &JitArm::Default}, //"ps_res",    OPTYPE_PS, 0}},
-	{25, &JitArm::ps_mul}, //"ps_mul",    OPTYPE_PS, 0}},
-	{26, &JitArm::ps_rsqrte}, //"ps_rsqrte", OPTYPE_PS, 0, 1}},
-	{28, &JitArm::ps_msub}, //"ps_msub",   OPTYPE_PS, 0}},
-	{29, &JitArm::ps_madd}, //"ps_madd",   OPTYPE_PS, 0}},
-	{30, &JitArm::ps_nmsub}, //"ps_nmsub",  OPTYPE_PS, 0}},
-	{31, &JitArm::ps_nmadd}, //"ps_nmadd",  OPTYPE_PS, 0}},
-};
-
-
-static GekkoOPTemplate table4_3[] = 
-{
-	{6,  &JitArm::Default}, //"psq_lx",   OPTYPE_PS, 0}},
-	{7,  &JitArm::Default}, //"psq_stx",  OPTYPE_PS, 0}},
-	{38, &JitArm::Default}, //"psq_lux",  OPTYPE_PS, 0}},
-	{39, &JitArm::Default}, //"psq_stux", OPTYPE_PS, 0}}, 
-};
-
-static GekkoOPTemplate table19[] = 
-{
-	{528, &JitArm::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{16,  &JitArm::bclrx}, //"bclrx",  OPTYPE_BRANCH, FL_ENDBLOCK}},
-	{257, &JitArm::crXXX}, //"crand",  OPTYPE_CR, FL_EVIL}},
-	{129, &JitArm::crXXX}, //"crandc", OPTYPE_CR, FL_EVIL}},
-	{289, &JitArm::crXXX}, //"creqv",  OPTYPE_CR, FL_EVIL}},
-	{225, &JitArm::crXXX}, //"crnand", OPTYPE_CR, FL_EVIL}},
-	{33,  &JitArm::crXXX}, //"crnor",  OPTYPE_CR, FL_EVIL}},
-	{449, &JitArm::crXXX}, //"cror",   OPTYPE_CR, FL_EVIL}},
-	{417, &JitArm::crXXX}, //"crorc",  OPTYPE_CR, FL_EVIL}},
-	{193, &JitArm::crXXX}, //"crxor",  OPTYPE_CR, FL_EVIL}},
-												   
-	{150, &JitArm::DoNothing}, //"isync",  OPTYPE_ICACHE, FL_EVIL}},
-	{0,   &JitArm::mcrf}, //"mcrf",   OPTYPE_SYSTEM, FL_EVIL}},
-												   
-	{50,  &JitArm::rfi}, //"rfi",    OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}},
-	{18,  &JitArm::Break}, //"rfid",   OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}}
-};
-
-
-static GekkoOPTemplate table31[] = 
-{
-	{28,  &JitArm::arith}, //"andx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{60,  &JitArm::arith}, //"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{444, &JitArm::arith}, //"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{124, &JitArm::arith}, //"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{316, &JitArm::arith}, //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{412, &JitArm::arith}, //"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{476, &JitArm::arith}, //"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{284, &JitArm::arith}, //"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{0,   &JitArm::cmp}, //"cmp",    OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{32,  &JitArm::cmpl}, //"cmpl",   OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}},
-	{26,  &JitArm::cntlzwx}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{922, &JitArm::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{954, &JitArm::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}},
-	{536, &JitArm::arith}, //"srwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{792, &JitArm::arith}, //"srawx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{824, &JitArm::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-	{24,  &JitArm::arith}, //"slwx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}},
-
-	{54,   &JitArm::dcbst}, //"dcbst",  OPTYPE_DCACHE, 0, 4}},
-	{86,   &JitArm::Default}, //"dcbf",   OPTYPE_DCACHE, 0, 4}},
-	{246,  &JitArm::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}},
-	{278,  &JitArm::DoNothing}, //"dcbt",   OPTYPE_DCACHE, 0, 1}},
-	{470,  &JitArm::Default}, //"dcbi",   OPTYPE_DCACHE, 0, 4}},
-	{758,  &JitArm::DoNothing}, //"dcba",   OPTYPE_DCACHE, 0, 4}},
-	{1014, &JitArm::Default}, //"dcbz",   OPTYPE_DCACHE, 0, 4}},
-
-	//load word
-	{23,  &JitArm::lXX}, //"lwzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{55,  &JitArm::lXX}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword
-	{279, &JitArm::lXX}, //"lhzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{311, &JitArm::lXX}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load halfword signextend
-	{343, &JitArm::lXX}, //"lhax",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{375, &JitArm::lXX}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte
-	{87,  &JitArm::lXX}, //"lbzx",  OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{119, &JitArm::lXX}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//load byte reverse
-	{534, &JitArm::lXX}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-	{790, &JitArm::lXX}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}},
-
-	// Conditional load/store (Wii SMP)
-	{150, &JitArm::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}},
-	{20,  &JitArm::Default}, //"lwarx",  OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}},
-
-	//load string (interpret these)
-	{533, &JitArm::Default}, //"lswx",  OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}},
-	{597, &JitArm::Default}, //"lswi",  OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}},
-
-	//store word
-	{151, &JitArm::stX}, //"stwx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{183, &JitArm::stX}, //"stwux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store halfword
-	{407, &JitArm::stX}, //"sthx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{439, &JitArm::stX}, //"sthux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store byte
-	{215, &JitArm::stX}, //"stbx",   OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{247, &JitArm::stX}, //"stbux",  OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}},
-
-	//store bytereverse
-	{662, &JitArm::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}},
-	{918, &JitArm::Default}, //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}},
-
-	{661, &JitArm::Default}, //"stswx",  OPTYPE_STORE, FL_EVIL}},
-	{725, &JitArm::Default}, //"stswi",  OPTYPE_STORE, FL_EVIL}},
-
-	// fp load/store	
-	{535, &JitArm::lfsx}, //"lfsx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{567, &JitArm::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-	{599, &JitArm::Default}, //"lfdx",  OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}},
-	{631, &JitArm::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}},
-
-	{663, &JitArm::Default}, //"stfsx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{695, &JitArm::Default}, //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{727, &JitArm::Default}, //"stfdx",  OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-	{759, &JitArm::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}},
-	{983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
-
-	{19,  &JitArm::mfcr}, //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
-	{83,  &JitArm::mfmsr}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
-	{144, &JitArm::mtcrf}, //"mtcrf",  OPTYPE_SYSTEM, 0}},
-	{146, &JitArm::mtmsr}, //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
-	{210, &JitArm::mtsr}, //"mtsr",   OPTYPE_SYSTEM, 0}},
-	{242, &JitArm::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}},
-	{339, &JitArm::mfspr}, //"mfspr",  OPTYPE_SPR, FL_OUT_D}},
-	{467, &JitArm::mtspr}, //"mtspr",  OPTYPE_SPR, 0, 2}},
-	{371, &JitArm::mftb}, //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
-	{512, &JitArm::mcrxr}, //"mcrxr",  OPTYPE_SYSTEM, 0}},
-	{595, &JitArm::mfsr}, //"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2}},
-	{659, &JitArm::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}},
-
-	{4,   &JitArm::Break}, //"tw",     OPTYPE_SYSTEM, FL_ENDBLOCK, 1}},
-	{598, &JitArm::DoNothing}, //"sync",   OPTYPE_SYSTEM, 0, 2}},
-	{982, &JitArm::icbi}, //"icbi",   OPTYPE_SYSTEM, FL_ENDBLOCK, 3}},
-
-	// Unused instructions on GC
-	{310, &JitArm::Default}, //"eciwx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{438, &JitArm::Default}, //"ecowx",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{854, &JitArm::Default}, //"eieio",   OPTYPE_INTEGER, FL_RC_BIT}},
-	{306, &JitArm::Default}, //"tlbie",   OPTYPE_SYSTEM, 0}},
-	{370, &JitArm::Default}, //"tlbia",   OPTYPE_SYSTEM, 0}},
-	{566, &JitArm::Default}, //"tlbsync", OPTYPE_SYSTEM, 0}},
-};
-
-static GekkoOPTemplate table31_2[] = 
-{	
-	{266,  &JitArm::arith}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{778,  &JitArm::arith}, //"addx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{10,   &JitArm::arith}, //"addcx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{138,  &JitArm::addex}, //"addex",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{234,  &JitArm::Default}, //"addmex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{202,  &JitArm::Default}, //"addzex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{491,  &JitArm::Default}, //"divwx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{1003, &JitArm::Default}, //"divwox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{459,  &JitArm::Default}, //"divwux",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{971,  &JitArm::Default}, //"divwuox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}},
-	{75,   &JitArm::Default}, //"mulhwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{11,   &JitArm::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{235,  &JitArm::arith}, //"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{747,  &JitArm::arith}, //"mullwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
-	{104,  &JitArm::negx}, //"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{40,   &JitArm::arith}, //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{552,  &JitArm::arith}, //"subox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{8,    &JitArm::Default}, //"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
-	{136,  &JitArm::Default}, //"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{232,  &JitArm::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-	{200,  &JitArm::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},
-};
-
-static GekkoOPTemplate table59[] = 
-{
-	{18, &JitArm::Default},       //{"fdivsx",   OPTYPE_FPU, FL_RC_BIT_F, 16}}, 
-	{20, &JitArm::fsubsx}, //"fsubsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{21, &JitArm::faddsx}, //"faddsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-//	{22, &JitArm::Default}, //"fsqrtsx",  OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko
-	{24, &JitArm::Default}, //"fresx",    OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{25, &JitArm::fmulsx}, //"fmulsx",   OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{28, &JitArm::Default}, //"fmsubsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{29, &JitArm::fmaddsx}, //"fmaddsx",  OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{30, &JitArm::Default}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-	{31, &JitArm::Default}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, 
-};							    
-
-static GekkoOPTemplate table63[] = 
-{
-	{264, &JitArm::fabsx},   //"fabsx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{32,  &JitArm::fcmpo},   //"fcmpo",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{0,   &JitArm::fcmpu},   //"fcmpu",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{14,  &JitArm::Default}, //"fctiwx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{15,  &JitArm::fctiwzx}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}},
-	{72,  &JitArm::fmrx},    //"fmrx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{136, &JitArm::fnabsx},   //"fnabsx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{40,  &JitArm::fnegx},   //"fnegx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{12,  &JitArm::Default}, //"frspx",   OPTYPE_FPU, FL_RC_BIT_F}},
-
-	{64,  &JitArm::Default}, //"mcrfs",   OPTYPE_SYSTEMFP, 0}},
-	{583, &JitArm::Default}, //"mffsx",   OPTYPE_SYSTEMFP, 0}},
-	{70,  &JitArm::Default}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}},
-	{38,  &JitArm::Default}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}},
-	{134, &JitArm::Default}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}},
-	{711, &JitArm::Default}, //"mtfsfx",  OPTYPE_SYSTEMFP, 0, 2}},
-};
-
-static GekkoOPTemplate table63_2[] = 
-{
-	{18, &JitArm::Default}, //"fdivx",    OPTYPE_FPU, FL_RC_BIT_F, 30}},
-	{20, &JitArm::fsubx}, //"fsubx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{21, &JitArm::faddx}, //"faddx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{22, &JitArm::Default}, //"fsqrtx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{23, &JitArm::Default}, //"fselx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{25, &JitArm::fmulx}, //"fmulx",    OPTYPE_FPU, FL_RC_BIT_F}},
-	{26, &JitArm::Default}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}},
-	{28, &JitArm::Default}, //"fmsubx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{29, &JitArm::fmaddx}, //"fmaddx",   OPTYPE_FPU, FL_RC_BIT_F}},
-	{30, &JitArm::Default}, //"fnmsubx",  OPTYPE_FPU, FL_RC_BIT_F}},
-	{31, &JitArm::Default}, //"fnmaddx",  OPTYPE_FPU, FL_RC_BIT_F}},
-};
-
-
-namespace JitArmTables
-{
-
-void CompileInstruction(PPCAnalyst::CodeOp & op)
-{
-	JitArm *jitarm = (JitArm *)jit;
-	(jitarm->*dynaOpTable[op.inst.OPCD])(op.inst);
-	GekkoOPInfo *info = op.opinfo;
-	if (info) {
-#ifdef OPLOG
-		if (!strcmp(info->opname, OP_TO_LOG)){  ///"mcrfs"
-			rsplocations.push_back(jit.js.compilerPC);
-		}
-#endif
-		info->compileCount++;
-		info->lastUse = jit->js.compilerPC;
-	}
-}
-
-void InitTables()
-{
-	// once initialized, tables are read-only
-	static bool initialized = false;
-	if (initialized)
-		return;
-
-	//clear
-	for (int i = 0; i < 32; i++) 
-	{
-		dynaOpTable59[i] = &JitArm::unknown_instruction;
-	}
-
-	for (int i = 0; i < 1024; i++)
-	{
-		dynaOpTable4 [i] = &JitArm::unknown_instruction;
-		dynaOpTable19[i] = &JitArm::unknown_instruction;
-		dynaOpTable31[i] = &JitArm::unknown_instruction;
-		dynaOpTable63[i] = &JitArm::unknown_instruction;	
-	}
-
-	for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++)
-	{
-		dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_2[j].opcode;
-			dynaOpTable4[op] = table4_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < 16; i++)
-	{
-		int fill = i << 6;
-		for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill+table4_3[j].opcode;
-			dynaOpTable4[op] = table4_3[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table4[i].opcode;
-		dynaOpTable4[op] = table4[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table31[i].opcode;
-		dynaOpTable31[op] = table31[i].Inst;
-	}
-
-	for (int i = 0; i < 1; i++)
-	{
-		int fill = i << 9;
-		for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table31_2[j].opcode;
-			dynaOpTable31[op] = table31_2[j].Inst;
-		}
-	}
-
-	for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table19[i].opcode;
-		dynaOpTable19[op] = table19[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table59[i].opcode;
-		dynaOpTable59[op] = table59[i].Inst;
-	}
-
-	for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++)
-	{
-		int op = table63[i].opcode;
-		dynaOpTable63[op] = table63[i].Inst;
-	}
-
-	for (int i = 0; i < 32; i++)
-	{
-		int fill = i << 5;
-		for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++)
-		{
-			int op = fill + table63_2[j].opcode;
-			dynaOpTable63[op] = table63_2[j].Inst;
-		}
-	}
-
-	initialized = true;
-
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h
deleted file mode 100644
index 4904ce3984..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef JITARM_TABLES_H
-#define JITARM_TABLES_H
-
-#include "../Gekko.h"
-#include "../PPCTables.h"
-
-namespace JitArmTables
-{
-	void CompileInstruction(PPCAnalyst::CodeOp & op);
-	void InitTables();
-}
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp
deleted file mode 100644
index d20ff66397..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-
-#include "../../HW/Memmap.h"
-
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "MemoryUtil.h"
-
-#include "Jit.h"
-#include "../JitCommon/JitCache.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-#include "JitAsm.h"
-#include "ArmEmitter.h"
-
-using namespace ArmGen;
-
-//TODO - make an option
-//#if _DEBUG
-//	bool enableDebug = false; 
-//#else
-//	bool enableDebug = false; 
-//#endif
-
-JitArmAsmRoutineManager asm_routines;
-
-static const float GC_ALIGNED16(m_quantizeTableS[]) =
-{
-	(1 <<  0),	(1 <<  1),	(1 <<  2),	(1 <<  3),
-	(1 <<  4),	(1 <<  5),	(1 <<  6),	(1 <<  7),
-	(1 <<  8),	(1 <<  9),	(1 << 10),	(1 << 11),
-	(1 << 12),	(1 << 13),	(1 << 14),	(1 << 15),
-	(1 << 16),	(1 << 17),	(1 << 18),	(1 << 19),
-	(1 << 20),	(1 << 21),	(1 << 22),	(1 << 23),
-	(1 << 24),	(1 << 25),	(1 << 26),	(1 << 27),
-	(1 << 28),	(1 << 29),	(1 << 30),	(1 << 31),
-	1.0 / (1ULL << 32),	1.0 / (1 << 31),	1.0 / (1 << 30),	1.0 / (1 << 29),
-	1.0 / (1 << 28),	1.0 / (1 << 27),	1.0 / (1 << 26),	1.0 / (1 << 25),
-	1.0 / (1 << 24),	1.0 / (1 << 23),	1.0 / (1 << 22),	1.0 / (1 << 21),
-	1.0 / (1 << 20),	1.0 / (1 << 19),	1.0 / (1 << 18),	1.0 / (1 << 17),
-	1.0 / (1 << 16),	1.0 / (1 << 15),	1.0 / (1 << 14),	1.0 / (1 << 13),
-	1.0 / (1 << 12),	1.0 / (1 << 11),	1.0 / (1 << 10),	1.0 / (1 <<  9),
-	1.0 / (1 <<  8),	1.0 / (1 <<  7),	1.0 / (1 <<  6),	1.0 / (1 <<  5),
-	1.0 / (1 <<  4),	1.0 / (1 <<  3),	1.0 / (1 <<  2),	1.0 / (1 <<  1),
-}; 
-
-static const float GC_ALIGNED16(m_dequantizeTableS[]) =
-{
-	1.0 / (1 <<  0),	1.0 / (1 <<  1),	1.0 / (1 <<  2),	1.0 / (1 <<  3),
-	1.0 / (1 <<  4),	1.0 / (1 <<  5),	1.0 / (1 <<  6),	1.0 / (1 <<  7),
-	1.0 / (1 <<  8),	1.0 / (1 <<  9),	1.0 / (1 << 10),	1.0 / (1 << 11),
-	1.0 / (1 << 12),	1.0 / (1 << 13),	1.0 / (1 << 14),	1.0 / (1 << 15),
-	1.0 / (1 << 16),	1.0 / (1 << 17),	1.0 / (1 << 18),	1.0 / (1 << 19),
-	1.0 / (1 << 20),	1.0 / (1 << 21),	1.0 / (1 << 22),	1.0 / (1 << 23),
-	1.0 / (1 << 24),	1.0 / (1 << 25),	1.0 / (1 << 26),	1.0 / (1 << 27),
-	1.0 / (1 << 28),	1.0 / (1 << 29),	1.0 / (1 << 30),	1.0 / (1 << 31),
-	(1ULL << 32),	(1 << 31),		(1 << 30),		(1 << 29),
-	(1 << 28),		(1 << 27),		(1 << 26),		(1 << 25),
-	(1 << 24),		(1 << 23),		(1 << 22),		(1 << 21),
-	(1 << 20),		(1 << 19),		(1 << 18),		(1 << 17),
-	(1 << 16),		(1 << 15),		(1 << 14),		(1 << 13),
-	(1 << 12),		(1 << 11),		(1 << 10),		(1 <<  9),
-	(1 <<  8),		(1 <<  7),		(1 <<  6),		(1 <<  5),
-	(1 <<  4),		(1 <<  3),		(1 <<  2),		(1 <<  1),
-}; 
-
-static void WriteDual32(u32 value1, u32 value2, u32 address)
-{
-	Memory::Write_U32(value1, address);
-	Memory::Write_U32(value2, address + 4);
-}
-
-static void WriteDual16(u32 value1, u32 value2, u32 address)
-{
-	Memory::Write_U16(value1, address);
-	Memory::Write_U16(value2, address + 2);
-}
-
-static void WriteDual8(u32 value1, u32 value2, u32 address)
-{
-	Memory::Write_U8(value1, address);
-	Memory::Write_U8(value2, address + 1);
-}
-
-void JitArmAsmRoutineManager::Generate()
-{
-	enterCode = GetCodePtr();
-	PUSH(9, R4, R5, R6, R7, R8, R9, R10, R11, _LR);
-	// Take care to 8-byte align stack for function calls.
-	// We are misaligned here because of an odd number of args for PUSH.
-	// It's not like x86 where you need to account for an extra 4 bytes
-	// consumed by CALL.
-	SUB(_SP, _SP, 4);
-
-	MOVI2R(R0, (u32)&CoreTiming::downcount);
-	MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]);
-
-	FixupBranch skipToRealDispatcher = B();
-	dispatcher = GetCodePtr();	
-		printf("Dispatcher is %p\n", dispatcher);
-
-		// Downcount Check	
-		// The result of slice decrementation should be in flags if somebody jumped here
-		// IMPORTANT - We jump on negative, not carry!!!
-		FixupBranch bail = B_CC(CC_MI);
-
-		SetJumpTarget(skipToRealDispatcher); 
-		dispatcherNoCheck = GetCodePtr();
-
-		// This block of code gets the address of the compiled block of code
-		// It runs though to the compiling portion if it isn't found
-			LDR(R12, R9, PPCSTATE_OFF(pc));// Load the current PC into R12
-
-			Operand2 iCacheMask = Operand2(0xE, 2); // JIT_ICACHE_MASK
-			BIC(R12, R12, iCacheMask); // R12 contains PC & JIT_ICACHE_MASK here.
-
-			MOVI2R(R14, (u32)jit->GetBlockCache()->GetICache());
-
-			LDR(R12, R14, R12); // R12 contains iCache[PC & JIT_ICACHE_MASK] here
-			// R12 Confirmed this is the correct iCache Location loaded.
-			TST(R12, 0xFC); // Test  to see if it is a JIT block.
-
-			SetCC(CC_EQ);
-				// Success, it is our Jitblock.
-				MOVI2R(R14, (u32)jit->GetBlockCache()->GetCodePointers());
-				// LDR R14 right here to get CodePointers()[0] pointer.
-				REV(R12, R12); // Reversing this gives us our JITblock.
-				LSL(R12, R12, 2); // Multiply by four because address locations are u32 in size 
-				LDR(R14, R14, R12); // Load the block address in to R14 
-
-				B(R14);
-				// No need to jump anywhere after here, the block will go back to dispatcher start
-			SetCC();
-
-		// If we get to this point, that means that we don't have the block cached to execute
-		// So call ArmJit to compile the block and then execute it.
-		MOVI2R(R14, (u32)&Jit);	
-		BL(R14);
-			
-		B(dispatcherNoCheck);
-
-		// fpException()
-		// Floating Point Exception Check, Jumped to if false
-		fpException = GetCodePtr();
-			LDR(R0, R9, PPCSTATE_OFF(Exceptions));
-			ORR(R0, R0, EXCEPTION_FPU_UNAVAILABLE);
-			STR(R0, R9, PPCSTATE_OFF(Exceptions));
-				QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions);
-			LDR(R0, R9, PPCSTATE_OFF(npc));
-			STR(R0, R9, PPCSTATE_OFF(pc));
-		B(dispatcher);
-
-		SetJumpTarget(bail);
-		doTiming = GetCodePtr();			
-		// XXX: In JIT64, Advance() gets called /after/ the exception checking
-		// once it jumps back to the start of outerLoop 
-		QuickCallFunction(R14, (void*)&CoreTiming::Advance);
-
-		// Does exception checking 
-		testExceptions = GetCodePtr();
-			LDR(R0, R9, PPCSTATE_OFF(pc));
-			STR(R0, R9, PPCSTATE_OFF(npc));
-				QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions);
-			LDR(R0, R9, PPCSTATE_OFF(npc));
-			STR(R0, R9, PPCSTATE_OFF(pc));
-		// Check the state pointer to see if we are exiting
-		// Gets checked on every exception check
-			MOVI2R(R0, (u32)PowerPC::GetStatePtr());
-			MVN(R1, 0);
-			LDR(R0, R0);
-			TST(R0, R1);
-			FixupBranch Exit = B_CC(CC_NEQ);
-
-	B(dispatcher);
-	
-	SetJumpTarget(Exit);
-
-	ADD(_SP, _SP, 4);
-
-	POP(9, R4, R5, R6, R7, R8, R9, R10, R11, _PC);  // Returns
-	
-	GenerateCommon();
-
-	FlushIcache();
-}
-
-void JitArmAsmRoutineManager::GenerateCommon()
-{
-	// R14 is LR
-	// R12 is scratch
-	// R11 is scale
-	// R10 is the address
-	Operand2 mask(3, 1); // ~(Memory::MEMVIEW32_MASK)
-	Operand2 arghmask(3, 3); // 0x0C000000 
-	NEONXEmitter nemit(this);
-
-	const u8* loadPairedIllegal = GetCodePtr();
-	BKPT(0x10);
-
-	const u8* loadPairedFloatTwo = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-
-		nemit.VLD1(I_32, D0, R10);
-		nemit.VREV32(I_8, D0, D0);
-		
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedFloatOne = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-
-		nemit.VLD1(I_32, D0, R10);
-		nemit.VREV32(I_8, D0, D0);
-		
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedU8Two = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-
-		LDRH(R12, R10);
-		SXTB(R12, R12);
-		VMOV(S0, R12);
-
-		LDRH(R12, R10, 2);
-		SXTB(R12, R12);
-		VMOV(S1, R12);
-		
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT);
-		VCVT(S1, S1, TO_FLOAT);
-
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-			
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedU8One = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRB(R12, R10);
-		SXTB(R12, R12);
-		VMOV(S0, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-	
-		VCVT(S0, S0, TO_FLOAT);
-
-		VMUL(S0, S0, S2);
-
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedS8Two = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRH(R12, R10);
-		SXTB(R12, R12);
-		VMOV(S0, R12);
-
-		LDRH(R12, R10, 2);
-		SXTB(R12, R12);
-		VMOV(S1, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT | IS_SIGNED);
-		VCVT(S1, S1, TO_FLOAT | IS_SIGNED);
-
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-		
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedS8One = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRB(R12, R10);
-		SXTB(R12, R12);
-		VMOV(S0, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT | IS_SIGNED);
-
-		VMUL(S0, S0, S2);
-
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedU16Two = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRH(R12, R10);
-		REV16(R12, R12);
-		SXTH(R12, R12);
-		VMOV(S0, R12);
-
-		LDRH(R12, R10, 2);
-		REV16(R12, R12);
-		SXTH(R12, R12);
-		VMOV(S1, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT);
-		VCVT(S1, S1, TO_FLOAT);
-
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedU16One = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRH(R12, R10);
-		REV16(R12, R12);
-		VMOV(S0, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT);
-
-		VMUL(S0, S0, S2);
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedS16Two = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		LDRH(R12, R10);
-		REV16(R12, R12);
-		SXTH(R12, R12);
-		VMOV(S0, R12);
-
-		LDRH(R12, R10, 2);
-		REV16(R12, R12);
-		SXTH(R12, R12);
-		VMOV(S1, R12);
-
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		VCVT(S0, S0, TO_FLOAT | IS_SIGNED);
-		VCVT(S1, S1, TO_FLOAT | IS_SIGNED);
-
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-
-		MOV(_PC, _LR);
-	}
-	const u8* loadPairedS16One = GetCodePtr();
-	{
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-
-		LDRH(R12, R10);
-		
-		MOVI2R(R10, (u32)&m_dequantizeTableS);
-		ADD(R10, R10, R11);
-		VLDR(S2, R10, 0);
-		
-		REV16(R12, R12);
-		SXTH(R12, R12);
-		VMOV(S0, R12);
-		VCVT(S0, S0, TO_FLOAT | IS_SIGNED);
-
-		VMUL(S0, S0, S2);
-		MOV(_PC, _LR);
-	}
-
-	pairedLoadQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
-	ReserveCodeSpace(16 * sizeof(u8*));
-
-	pairedLoadQuantized[0] = loadPairedFloatTwo;
-	pairedLoadQuantized[1] = loadPairedIllegal;
-	pairedLoadQuantized[2] = loadPairedIllegal;
-	pairedLoadQuantized[3] = loadPairedIllegal;
-	pairedLoadQuantized[4] = loadPairedU8Two;
-	pairedLoadQuantized[5] = loadPairedU16Two;
-	pairedLoadQuantized[6] = loadPairedS8Two;
-	pairedLoadQuantized[7] = loadPairedS16Two;
-
-	pairedLoadQuantized[8] = loadPairedFloatOne;
-	pairedLoadQuantized[9] = loadPairedIllegal;
-	pairedLoadQuantized[10] = loadPairedIllegal;
-	pairedLoadQuantized[11] = loadPairedIllegal;
-	pairedLoadQuantized[12] = loadPairedU8One;
-	pairedLoadQuantized[13] = loadPairedU16One;
-	pairedLoadQuantized[14] = loadPairedS8One;
-	pairedLoadQuantized[15] = loadPairedS16One;
-
-	// Stores
-	const u8* storePairedIllegal = GetCodePtr();
-		BKPT(0x21);
-	const u8* storePairedFloat = GetCodePtr();
-	{
-		TST(R10, arghmask);
-		FixupBranch argh = B_CC(CC_NEQ);
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-
-		nemit.VREV32(I_8, D0, D0);
-		nemit.VST1(I_32, D0, R10);
-		MOV(_PC, _LR);
-
-		SetJumpTarget(argh);
-
-		PUSH(5, R0, R1, R2, R3, _LR);
-		VMOV(R0, S0);
-		VMOV(R1, S1);
-		MOV(R2, R10);
-		MOVI2R(R12, (u32)&WriteDual32);
-		BL(R12);
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-	const u8* storePairedU8 = GetCodePtr();
-	const u8* storePairedS8 = GetCodePtr();
-	{
-		// R10 is the addr
-		// R11 is the scale
-		// R12 is scratch
-		// S0, S1 is the values
-		PUSH(5, R0, R1, R2, R3, _LR);
-		
-		MOVI2R(R12, (u32)&m_quantizeTableS);
-		ADD(R12, R12, R11);	
-		VLDR(S2, R12, 0);
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-
-		VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); 
-		VCVT(S1, S1, TO_INT | ROUND_TO_ZERO); 
-		
-		VMOV(R0, S0);
-		VMOV(R1, S1);
-		MOV(R2, R10);
-		MOVI2R(R12, (u32)&WriteDual8);
-		BL(R12);
-		
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-	const u8* storePairedU16 = GetCodePtr();
-	const u8* storePairedS16 = GetCodePtr();
-	{
-		PUSH(5, R0, R1, R2, R3, _LR);
-
-		MOVI2R(R12, (u32)&m_quantizeTableS);
-		ADD(R12, R12, R11);	
-		VLDR(S2, R12, 0);
-		VMUL(S0, S0, S2);
-		VMUL(S1, S1, S2);
-
-		VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); 
-		VCVT(S1, S1, TO_INT | ROUND_TO_ZERO); 
-		
-		VMOV(R0, S0);
-		VMOV(R1, S1);
-		MOV(R2, R10);
-		MOVI2R(R12, (u32)&WriteDual16);
-		BL(R12);
-		
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-	const u8* storeSingleIllegal = GetCodePtr();
-	BKPT(0x27);
-	const u8* storeSingleFloat = GetCodePtr();
-	{
-		TST(R10, arghmask);
-		FixupBranch argh = B_CC(CC_NEQ);
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-	
-		VMOV(R12, S0);
-		REV(R12, R12);
-		STR(R12, R10); 
-		MOV(_PC, _LR);
-
-		SetJumpTarget(argh);
-
-		PUSH(5, R0, R1, R2, R3, _LR);
-		VMOV(R0, S0);
-		MOV(R1, R10);
-		MOVI2R(R10, (u32)&Memory::Write_U32);
-		BL(R10);
-
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-	const u8* storeSingleU8 = GetCodePtr();  // Used by MKWii
-	const u8* storeSingleS8 = GetCodePtr();
-	{
-		MOVI2R(R12, (u32)&m_quantizeTableS);
-		ADD(R12, R12, R11);	
-		VLDR(S2, R12, 0);
-		VMUL(S0, S0, S2);
-
-		TST(R10, arghmask);
-		FixupBranch argh = B_CC(CC_NEQ);
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-			
-		VCVT(S0, S0, TO_INT | ROUND_TO_ZERO);
-		VMOV(R12, S0);
-		STRB(R12, R10); 
-		MOV(_PC, _LR);
-
-		SetJumpTarget(argh);
-
-		PUSH(5, R0, R1, R2, R3, _LR);
-		VMOV(R0, S0);
-		MOV(R1, R10);
-		MOVI2R(R10, (u32)&Memory::Write_U8);
-		BL(R10);
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-	const u8* storeSingleU16 = GetCodePtr();  // Used by MKWii
-	const u8* storeSingleS16 = GetCodePtr();
-	{
-		MOVI2R(R12, (u32)&m_quantizeTableS);
-		ADD(R12, R12, R11);	
-		VLDR(S2, R12, 0);
-		VMUL(S0, S0, S2);
-
-		TST(R10, arghmask);
-		FixupBranch argh = B_CC(CC_NEQ);
-		BIC(R10, R10, mask);
-		MOVI2R(R12, (u32)Memory::base);
-		ADD(R10, R10, R12);
-		
-		VCVT(S0, S0, TO_INT | ROUND_TO_ZERO);
-		VMOV(R12, S0);
-		REV16(R12, R12);
-		STRH(R12, R10); 
-		MOV(_PC, _LR);
-
-		SetJumpTarget(argh);
-
-		PUSH(5, R0, R1, R2, R3, _LR);
-		VMOV(R0, S0);
-		MOV(R1, R10);
-		MOVI2R(R10, (u32)&Memory::Write_U16);
-		BL(R10);
-
-		POP(5, R0, R1, R2, R3, _PC);
-	}
-
-	pairedStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
-	ReserveCodeSpace(16 * sizeof(u8*));
-
-	pairedStoreQuantized[0] = storePairedFloat;
-	pairedStoreQuantized[1] = storePairedIllegal;
-	pairedStoreQuantized[2] = storePairedIllegal;
-	pairedStoreQuantized[3] = storePairedIllegal;
-	pairedStoreQuantized[4] = storePairedU8;
-	pairedStoreQuantized[5] = storePairedU16;
-	pairedStoreQuantized[6] = storePairedS8;
-	pairedStoreQuantized[7] = storePairedS16;
-
-	pairedStoreQuantized[8] = storeSingleFloat;
-	pairedStoreQuantized[9] = storeSingleIllegal;
-	pairedStoreQuantized[10] = storeSingleIllegal;
-	pairedStoreQuantized[11] = storeSingleIllegal;
-	pairedStoreQuantized[12] = storeSingleU8;
-	pairedStoreQuantized[13] = storeSingleU16;
-	pairedStoreQuantized[14] = storeSingleS8;
-	pairedStoreQuantized[15] = storeSingleS16;
-
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h
deleted file mode 100644
index 9a61e9e653..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _JITARMASM_H
-#define _JITARMASM_H
-#include "ArmEmitter.h"
-#include "../JitCommon/JitAsmCommon.h"
-using namespace ArmGen;
-class JitArmAsmRoutineManager : public CommonAsmRoutinesBase, public ARMXCodeBlock 
-{
-private:
-	void Generate();
-	void GenerateCommon();
-
-public:
-	void Init() {
-		AllocCodeSpace(8192);
-		Generate();
-		WriteProtect();
-	}
-
-	void Shutdown() {
-		FreeCodeSpace();
-	}
-};
-
-extern JitArmAsmRoutineManager asm_routines;
-
-#endif  // _JIT64ASM_H
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp
deleted file mode 100644
index 27363112fc..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Jit.h"
-#include "JitFPRCache.h"
-
-ArmFPRCache::ArmFPRCache()
-{
-	emit = 0;
-}
-
-void ArmFPRCache::Init(ARMXEmitter *emitter)
-{
-	emit = emitter;
-	ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG);
-	ARMReg *Regs = GetAllocationOrder(NUMARMREG);
-
-	for(u8 a = 0; a < NUMPPCREG; ++a)
-	{
-		ArmCRegs[a].PPCReg = 33;
-		ArmCRegs[a].Reg = PPCRegs[a];
-		ArmCRegs[a].LastLoad = 0;
-		ArmCRegs[a].PS1 = false;
-	}
-	for(u8 a = 0; a < NUMARMREG; ++a)
-	{
-		ArmRegs[a].Reg = Regs[a];
-		ArmRegs[a].free = true;
-	}
-}
-
-void ArmFPRCache::Start(PPCAnalyst::BlockRegStats &stats)
-{
-}
-
-ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count)
-{
-	// This will return us the allocation order of the registers we can use on
-	// the ppc side.
-	static ARMReg allocationOrder[] = 
-	{
-		D4, D5, D6, D7, D8, D9, D10, D11, D12, D13,
-		D14, D15, D16,  D17, D18, D19, D20, D21, D22,
-		D23, D24, D25, D26, D27, D28, D29, D30, D31
-	};
-	count = sizeof(allocationOrder) / sizeof(const int);
-	return allocationOrder;
-}
-ARMReg *ArmFPRCache::GetAllocationOrder(int &count)
-{
-	// This will return us the allocation order of the registers we can use on
-	// the host side.
-	static ARMReg allocationOrder[] = 
-	{
-		D0, D1, D2, D3
-	};
-	count = sizeof(allocationOrder) / sizeof(const int);
-	return allocationOrder;
-}
-
-ARMReg ArmFPRCache::GetReg(bool AutoLock)
-{
-	for(u8 a = 0; a < NUMARMREG; ++a)
-		if(ArmRegs[a].free)
-		{
-			// Alright, this one is free
-			if (AutoLock)
-				ArmRegs[a].free = false;
-			return ArmRegs[a].Reg;
-		}
-	// Uh Oh, we have all them locked....
-	_assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb");
-	return D31;
-}
-void ArmFPRCache::Unlock(ARMReg V0)
-{
-	for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum)
-	{
-		if(ArmRegs[RegNum].Reg == V0)
-		{
-			_assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked");
-			ArmRegs[RegNum].free = true;
-		}
-	}
-}
-u32 ArmFPRCache::GetLeastUsedRegister(bool increment)
-{
-	u32 HighestUsed = 0;
-	u8 lastRegIndex = 0;
-	for(u8 a = 0; a < NUMPPCREG; ++a){
-		if (increment)
-			++ArmCRegs[a].LastLoad;
-		if (ArmCRegs[a].LastLoad > HighestUsed)
-		{
-			HighestUsed = ArmCRegs[a].LastLoad;
-			lastRegIndex = a;
-		}
-	}
-	return lastRegIndex;
-}
-bool ArmFPRCache::FindFreeRegister(u32 &regindex)
-{
-	for (u8 a = 0; a < NUMPPCREG; ++a)
-		if (ArmCRegs[a].PPCReg == 33)
-		{
-			regindex = a;
-			return true;
-		}
-	return false;
-}
-
-ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad)
-{
-	u32 lastRegIndex = GetLeastUsedRegister(true);
-	
-	if (_regs[preg][PS1].GetType() != REG_NOTLOADED)
-	{
-		u8 a = _regs[preg][PS1].GetRegIndex();
-		ArmCRegs[a].LastLoad = 0;
-		return ArmCRegs[a].Reg;
-	}
-
-	u32 regindex;
-	if (FindFreeRegister(regindex))
-	{
-		s16 offset = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0);
-
-		ArmCRegs[regindex].PPCReg = preg;
-		ArmCRegs[regindex].LastLoad = 0;
-		ArmCRegs[regindex].PS1 = PS1;
-
-		_regs[preg][PS1].LoadToReg(regindex);
-		emit->VLDR(ArmCRegs[regindex].Reg, R9, offset);
-		return ArmCRegs[regindex].Reg;
-	}
-	
-	// Alright, we couldn't get a free space, dump that least used register
-	s16 offsetOld = PPCSTATE_OFF(ps) + (ArmCRegs[lastRegIndex].PPCReg * 16) + (ArmCRegs[lastRegIndex].PS1 ? 8 : 0);
-	s16 offsetNew = PPCSTATE_OFF(ps) + (preg * 16) + (PS1 ? 8 : 0);
-
-	emit->VSTR(ArmCRegs[lastRegIndex].Reg, R9, offsetOld);
-
-	_regs[ArmCRegs[lastRegIndex].PPCReg][ArmCRegs[lastRegIndex].PS1].Flush();
-	
-	ArmCRegs[lastRegIndex].PPCReg = preg;
-	ArmCRegs[lastRegIndex].LastLoad = 0;
-	ArmCRegs[lastRegIndex].PS1 = PS1;
-
-	_regs[preg][PS1].LoadToReg(lastRegIndex);
-	emit->VLDR(ArmCRegs[lastRegIndex].Reg, R9, offsetNew);
-	return ArmCRegs[lastRegIndex].Reg;		 
-}
-
-ARMReg ArmFPRCache::R0(u32 preg, bool preLoad)
-{
-	return GetPPCReg(preg, false, preLoad);
-}
-
-ARMReg ArmFPRCache::R1(u32 preg, bool preLoad)
-{
-	return GetPPCReg(preg, true, preLoad);
-}
-
-void ArmFPRCache::Flush()
-{
-	for (u8 a = 0; a < 32; ++a)
-	{
-		if (_regs[a][0].GetType() != REG_NOTLOADED)
-		{
-			s16 offset =  PPCSTATE_OFF(ps) + (a * 16);
-			u32 regindex = _regs[a][0].GetRegIndex();
-			emit->VSTR(ArmCRegs[regindex].Reg, R9, offset);
-
-			ArmCRegs[regindex].PPCReg = 33;
-			ArmCRegs[regindex].LastLoad = 0;
-			_regs[a][0].Flush();
-		}
-		if (_regs[a][1].GetType() != REG_NOTLOADED)
-		{
-			s16 offset =  PPCSTATE_OFF(ps) + (a * 16) + 8;
-			u32 regindex = _regs[a][1].GetRegIndex();
-			emit->VSTR(ArmCRegs[regindex].Reg, R9, offset);
-
-			ArmCRegs[regindex].PPCReg = 33;
-			ArmCRegs[regindex].LastLoad = 0;
-			_regs[a][1].Flush();
-		}
-	}
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h
deleted file mode 100644
index 10a3520d56..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _JITARMFPRCACHE_H
-#define _JITARMFPRCACHE_H
-
-#include "ArmEmitter.h"
-#include "../Gekko.h"
-#include "../PPCAnalyst.h"
-#include "JitRegCache.h"
-
-#define ARMFPUREGS 32
-using namespace ArmGen;
-
-class ArmFPRCache
-{
-private:
-	OpArg _regs[32][2]; // One for each FPR reg
-	JRCPPC ArmCRegs[ARMFPUREGS];
-	JRCReg ArmRegs[ARMFPUREGS]; 
-	
-	int NUMPPCREG;
-	int NUMARMREG;
-
-	ARMReg *GetAllocationOrder(int &count);
-	ARMReg *GetPPCAllocationOrder(int &count);
-
-	ARMReg GetPPCReg(u32 preg, bool PS1, bool preLoad);
-
-	u32 GetLeastUsedRegister(bool increment); 
-	bool FindFreeRegister(u32 &regindex); 
-protected:
-	ARMXEmitter *emit;
-	
-public:
-	ArmFPRCache();
-	~ArmFPRCache() {}
-
-	void Init(ARMXEmitter *emitter);
-	void Start(PPCAnalyst::BlockRegStats &stats);
-
-	void SetEmitter(ARMXEmitter *emitter) {emit = emitter;}
-	
-	ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use.
-	void Unlock(ARMReg V0);
-	void Flush();
-	ARMReg R0(u32 preg, bool preLoad = true); // Returns a cached register
-	ARMReg R1(u32 preg, bool preLoad = true);
-};
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp
deleted file mode 100644
index 562770e367..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Jit.h"
-#include "JitRegCache.h"
-
-ArmRegCache::ArmRegCache()
-{
-	emit = 0;
-}
-
-void ArmRegCache::Init(ARMXEmitter *emitter)
-{
-	emit = emitter;
-	ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG);
-	ARMReg *Regs = GetAllocationOrder(NUMARMREG);
-
-	for(u8 a = 0; a < NUMPPCREG; ++a)
-	{
-		ArmCRegs[a].PPCReg = 33;
-		ArmCRegs[a].Reg = PPCRegs[a];
-		ArmCRegs[a].LastLoad = 0;
-	}
-	for(u8 a = 0; a < NUMARMREG; ++a)
-	{
-		ArmRegs[a].Reg = Regs[a];
-		ArmRegs[a].free = true;
-	}
-}
-void ArmRegCache::Start(PPCAnalyst::BlockRegStats &stats)
-{
-}
-
-ARMReg *ArmRegCache::GetPPCAllocationOrder(int &count)
-{
-	// This will return us the allocation order of the registers we can use on
-	// the ppc side.
-	static ARMReg allocationOrder[] = 
-	{
-		R0, R1, R2, R3, R4, R5, R6, R7, R8
-	};
-	count = sizeof(allocationOrder) / sizeof(const int);
-	return allocationOrder;
-}
-ARMReg *ArmRegCache::GetAllocationOrder(int &count)
-{
-	// This will return us the allocation order of the registers we can use on
-	// the host side.
-	static ARMReg allocationOrder[] = 
-	{
-		R14, R12, R11, R10
-	};
-	count = sizeof(allocationOrder) / sizeof(const int);
-	return allocationOrder;
-}
-
-ARMReg ArmRegCache::GetReg(bool AutoLock)
-{
-	for(u8 a = 0; a < NUMARMREG; ++a)
-		if(ArmRegs[a].free)
-		{
-			// Alright, this one is free
-			if (AutoLock)
-				ArmRegs[a].free = false;
-			return ArmRegs[a].Reg;
-		}
-	// Uh Oh, we have all them locked....
-	_assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb");
-	return R0;
-}
-
-void ArmRegCache::Unlock(ARMReg R0, ARMReg R1, ARMReg R2, ARMReg R3)
-{
-	for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum)
-	{
-		if(ArmRegs[RegNum].Reg == R0)
-		{
-			_assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked");
-			ArmRegs[RegNum].free = true;
-		}
-		if( R1 != INVALID_REG && ArmRegs[RegNum].Reg == R1) ArmRegs[RegNum].free = true;
-		if( R2 != INVALID_REG && ArmRegs[RegNum].Reg == R2) ArmRegs[RegNum].free = true;
-		if( R3 != INVALID_REG && ArmRegs[RegNum].Reg == R3) ArmRegs[RegNum].free = true;
-	}
-}
-u32 ArmRegCache::GetLeastUsedRegister(bool increment)
-{
-	u32 HighestUsed = 0;
-	u8 lastRegIndex = 0;
-	for(u8 a = 0; a < NUMPPCREG; ++a){
-		if (increment)
-			++ArmCRegs[a].LastLoad;
-		if (ArmCRegs[a].LastLoad > HighestUsed)
-		{
-			HighestUsed = ArmCRegs[a].LastLoad;
-			lastRegIndex = a;
-		}
-	}
-	return lastRegIndex;
-}
-bool ArmRegCache::FindFreeRegister(u32 &regindex)
-{
-	for (u8 a = 0; a < NUMPPCREG; ++a)
-		if (ArmCRegs[a].PPCReg == 33)
-		{
-			regindex = a;
-			return true;
-		}
-	return false;
-}
-
-ARMReg ArmRegCache::R(u32 preg)
-{	
-	if (regs[preg].GetType() == REG_IMM)
-		return BindToRegister(preg);
-
-	u32 lastRegIndex = GetLeastUsedRegister(true);
-
-	// Check if already Loaded
-	if(regs[preg].GetType() == REG_REG)
-	{
-		u8 a = regs[preg].GetRegIndex();
-		ArmCRegs[a].LastLoad = 0;
-		return ArmCRegs[a].Reg;
-	}
-	
-	// Check if we have a free register
-	u32 regindex;
-	if (FindFreeRegister(regindex))
-	{
-		emit->LDR(ArmCRegs[regindex].Reg, R9, PPCSTATE_OFF(gpr) + preg * 4);
-		ArmCRegs[regindex].PPCReg = preg;
-		ArmCRegs[regindex].LastLoad = 0;
-
-		regs[preg].LoadToReg(regindex);
-		return ArmCRegs[regindex].Reg;
-	}
-
-	// Alright, we couldn't get a free space, dump that least used register
-	emit->STR(ArmCRegs[lastRegIndex].Reg, R9, PPCSTATE_OFF(gpr) + ArmCRegs[lastRegIndex].PPCReg * 4);
-	emit->LDR(ArmCRegs[lastRegIndex].Reg, R9, PPCSTATE_OFF(gpr) + preg * 4);
-
-	regs[ArmCRegs[lastRegIndex].PPCReg].Flush();
-
-	ArmCRegs[lastRegIndex].PPCReg = preg;
-	ArmCRegs[lastRegIndex].LastLoad = 0;
-	
-	regs[preg].LoadToReg(lastRegIndex);
-
-	return ArmCRegs[lastRegIndex].Reg;		 
-}
-
-ARMReg ArmRegCache::BindToRegister(u32 preg)
-{
-	_assert_msg_(DYNA_REC, regs[preg].GetType() == REG_IMM, "Can't BindToRegister with a REG");
-	u32 lastRegIndex = GetLeastUsedRegister(false);
-	u32 freeRegIndex;
-	if (FindFreeRegister(freeRegIndex))
-	{
-		emit->MOVI2R(ArmCRegs[freeRegIndex].Reg, regs[preg].GetImm());
-		ArmCRegs[freeRegIndex].PPCReg = preg;
-		ArmCRegs[freeRegIndex].LastLoad = 0;
-		regs[preg].LoadToReg(freeRegIndex);
-		return ArmCRegs[freeRegIndex].Reg;
-	}
-	else
-	{
-		emit->STR(ArmCRegs[lastRegIndex].Reg, R9, PPCSTATE_OFF(gpr) + ArmCRegs[lastRegIndex].PPCReg * 4);
-		emit->MOVI2R(ArmCRegs[lastRegIndex].Reg, regs[preg].GetImm());
-
-		regs[ArmCRegs[lastRegIndex].PPCReg].Flush();
-
-		ArmCRegs[lastRegIndex].PPCReg = preg;
-		ArmCRegs[lastRegIndex].LastLoad = 0;
-
-		regs[preg].LoadToReg(lastRegIndex);
-		return ArmCRegs[lastRegIndex].Reg;
-	}
-}
-
-void ArmRegCache::SetImmediate(u32 preg, u32 imm)
-{
-	if (regs[preg].GetType() == REG_REG)
-	{
-		// Dump real reg at this point
-		u32 regindex = regs[preg].GetRegIndex();
-		ArmCRegs[regindex].PPCReg = 33;
-		ArmCRegs[regindex].LastLoad = 0;
-	}
-	regs[preg].LoadToImm(imm);
-}
-
-void ArmRegCache::Flush()
-{
-	for (u8 a = 0; a < 32; ++a)
-	{
-		if (regs[a].GetType() == REG_IMM)
-			BindToRegister(a);	
-		if (regs[a].GetType() == REG_REG)
-		{
-			u32 regindex = regs[a].GetRegIndex();
-			emit->STR(ArmCRegs[regindex].Reg, R9, PPCSTATE_OFF(gpr) + a * 4);
-			ArmCRegs[regindex].PPCReg = 33;
-			ArmCRegs[regindex].LastLoad = 0;
-		}
-		
-		regs[a].Flush();
-	}
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h
deleted file mode 100644
index d41af42d6e..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _JITARMREGCACHE_H
-#define _JITARMREGCACHE_H
-
-#include "ArmEmitter.h"
-#include "../Gekko.h"
-#include "../PPCAnalyst.h"
-
-using namespace ArmGen;
-// This ARM Register cache actually pre loads the most used registers before
-// the block to increase speed since every memory load requires two
-// instructions to load it. We are going to use R0-RMAX as registers for the
-// use of PPC Registers.
-// Allocation order as follows
-#define ARMREGS 16
-// Allocate R0 to R9 for PPC first.
-// For General registers on the host side, start with R14 and go down as we go
-// R13 is reserved for our stack pointer, don't ever use that. Unless you save
-// it
-// So we have R14, R12, R11, R10 to work with instructions
-
-enum RegType
-{
-	REG_NOTLOADED = 0,
-	REG_REG, // Reg type is register
-	REG_IMM, // Reg is really a IMM
-	REG_AWAY, // Bound to a register, but not preloaded
-};
-
-class OpArg 
-{
-	private:
-	RegType m_type; // store type
-	u8 m_reg; // index to register
-	u32 m_value; // IMM value
-
-	public:
-	OpArg()
-	{
-		m_type = REG_NOTLOADED;
-		m_reg = 33;
-		m_value = 0;
-	}
-	
-	RegType GetType()
-	{
-		return m_type;
-	}
-
-	u8 GetRegIndex()
-	{
-		return m_reg;
-	}
-	u32 GetImm()
-	{
-		return m_value;
-	}
-	void LoadToAway(u8 reg)
-	{
-		m_type = REG_AWAY;
-		m_reg = reg;
-	}
-	void LoadToReg(u8 reg)
-	{
-		m_type = REG_REG;
-		m_reg = reg;
-	}
-	void LoadToImm(u32 imm)
-	{
-		m_type = REG_IMM;
-		m_value = imm;
-	}
-	void Flush()
-	{
-		m_type = REG_NOTLOADED;
-	}
-};
-
-struct JRCPPC
-{
-	u32 PPCReg; // Tied to which PPC Register
-	bool PS1;
-	ARMReg Reg; // Tied to which ARM Register
-	u32 LastLoad;
-};
-struct JRCReg
-{
-	ARMReg Reg; // Which reg this is.
-	bool free;
-};
-class ArmRegCache
-{
-private:
-	OpArg regs[32];
-	JRCPPC ArmCRegs[ARMREGS];
-	JRCReg ArmRegs[ARMREGS]; // Four registers remaining
-
-	int NUMPPCREG;
-	int NUMARMREG;
-
-	ARMReg *GetAllocationOrder(int &count);
-	ARMReg *GetPPCAllocationOrder(int &count);
-	
-	u32 GetLeastUsedRegister(bool increment);
-	bool FindFreeRegister(u32 &regindex);
-protected:
-	ARMXEmitter *emit;
-	
-public:
-	ArmRegCache();
-	~ArmRegCache() {}
-
-	void Init(ARMXEmitter *emitter);
-	void Start(PPCAnalyst::BlockRegStats &stats);
-	
-	ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use.
-	void Unlock(ARMReg R0, ARMReg R1 = INVALID_REG, ARMReg R2 = INVALID_REG, ARMReg R3 =
-	INVALID_REG);
-	void Flush();
-	ARMReg R(u32 preg); // Returns a cached register
-	bool IsImm(u32 preg) { return regs[preg].GetType() == REG_IMM; }
-	u32 GetImm(u32 preg) { return regs[preg].GetImm(); }
-	void SetImmediate(u32 preg, u32 imm); 
-	ARMReg BindToRegister(u32 preg);
-};
-
-
-
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
deleted file mode 100644
index 5187ef1478..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "x64ABI.h"
-#include "Thunk.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
-
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "MemoryUtil.h"
-
-#include "x64ABI.h"
-#include "../JitCommon/JitCache.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-#include "JitAsmCommon.h"
-#include "JitBase.h"
-
-using namespace Gen;
-
-static int temp32;
-
-void CommonAsmRoutines::GenFifoWrite(int size) 
-{
-	// Assume value in ABI_PARAM1
-	PUSH(ESI);
-	if (size != 32)
-		PUSH(EDX);
-	BSWAP(size, ABI_PARAM1);
-	MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
-	MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
-	if (size != 32) {
-		MOV(32, R(EDX), R(ABI_PARAM1));
-		MOV(size, MComplex(RAX, RSI, 1, 0), R(EDX));
-	} else {
-		MOV(size, MComplex(RAX, RSI, 1, 0), R(ABI_PARAM1));
-	}
-	ADD(32, R(ESI), Imm8(size >> 3));
-	MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI));
-	if (size != 32)
-		POP(EDX);
-	POP(ESI);
-	RET();
-}
-
-void CommonAsmRoutines::GenFifoFloatWrite() 
-{
-	// Assume value in XMM0
-	PUSH(ESI);
-	PUSH(EDX);
-	MOVSS(M(&temp32), XMM0);
-	MOV(32, R(EDX), M(&temp32));
-	BSWAP(32, EDX);
-	MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
-	MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
-	MOV(32, MComplex(RAX, RSI, 1, 0), R(EDX));
-	ADD(32, R(ESI), Imm8(4));
-	MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI));
-	POP(EDX);
-	POP(ESI);
-	RET();
-}
-
-void CommonAsmRoutines::GenFifoXmm64Write() 
-{
-	// Assume value in XMM0. Assume pre-byteswapped (unlike the others here!)
-	PUSH(ESI);
-	MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
-	MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
-	MOVQ_xmm(MComplex(RAX, RSI, 1, 0), XMM0);
-	ADD(32, R(ESI), Imm8(8));
-	MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI));
-	POP(ESI);
-	RET();
-}
-
-// Safe + Fast Quantizers, originally from JITIL by magumagu
-
-static const u8 GC_ALIGNED16(pbswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-static const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15};
-
-static const float GC_ALIGNED16(m_quantizeTableS[]) =
-{
-	(1 <<  0),	(1 <<  1),	(1 <<  2),	(1 <<  3),
-	(1 <<  4),	(1 <<  5),	(1 <<  6),	(1 <<  7),
-	(1 <<  8),	(1 <<  9),	(1 << 10),	(1 << 11),
-	(1 << 12),	(1 << 13),	(1 << 14),	(1 << 15),
-	(1 << 16),	(1 << 17),	(1 << 18),	(1 << 19),
-	(1 << 20),	(1 << 21),	(1 << 22),	(1 << 23),
-	(1 << 24),	(1 << 25),	(1 << 26),	(1 << 27),
-	(1 << 28),	(1 << 29),	(1 << 30),	(1 << 31),
-	1.0 / (1ULL << 32),	1.0 / (1 << 31),	1.0 / (1 << 30),	1.0 / (1 << 29),
-	1.0 / (1 << 28),	1.0 / (1 << 27),	1.0 / (1 << 26),	1.0 / (1 << 25),
-	1.0 / (1 << 24),	1.0 / (1 << 23),	1.0 / (1 << 22),	1.0 / (1 << 21),
-	1.0 / (1 << 20),	1.0 / (1 << 19),	1.0 / (1 << 18),	1.0 / (1 << 17),
-	1.0 / (1 << 16),	1.0 / (1 << 15),	1.0 / (1 << 14),	1.0 / (1 << 13),
-	1.0 / (1 << 12),	1.0 / (1 << 11),	1.0 / (1 << 10),	1.0 / (1 <<  9),
-	1.0 / (1 <<  8),	1.0 / (1 <<  7),	1.0 / (1 <<  6),	1.0 / (1 <<  5),
-	1.0 / (1 <<  4),	1.0 / (1 <<  3),	1.0 / (1 <<  2),	1.0 / (1 <<  1),
-}; 
-
-static const float GC_ALIGNED16(m_dequantizeTableS[]) =
-{
-	1.0 / (1 <<  0),	1.0 / (1 <<  1),	1.0 / (1 <<  2),	1.0 / (1 <<  3),
-	1.0 / (1 <<  4),	1.0 / (1 <<  5),	1.0 / (1 <<  6),	1.0 / (1 <<  7),
-	1.0 / (1 <<  8),	1.0 / (1 <<  9),	1.0 / (1 << 10),	1.0 / (1 << 11),
-	1.0 / (1 << 12),	1.0 / (1 << 13),	1.0 / (1 << 14),	1.0 / (1 << 15),
-	1.0 / (1 << 16),	1.0 / (1 << 17),	1.0 / (1 << 18),	1.0 / (1 << 19),
-	1.0 / (1 << 20),	1.0 / (1 << 21),	1.0 / (1 << 22),	1.0 / (1 << 23),
-	1.0 / (1 << 24),	1.0 / (1 << 25),	1.0 / (1 << 26),	1.0 / (1 << 27),
-	1.0 / (1 << 28),	1.0 / (1 << 29),	1.0 / (1 << 30),	1.0 / (1 << 31),
-	(1ULL << 32),	(1 << 31),		(1 << 30),		(1 << 29),
-	(1 << 28),		(1 << 27),		(1 << 26),		(1 << 25),
-	(1 << 24),		(1 << 23),		(1 << 22),		(1 << 21),
-	(1 << 20),		(1 << 19),		(1 << 18),		(1 << 17),
-	(1 << 16),		(1 << 15),		(1 << 14),		(1 << 13),
-	(1 << 12),		(1 << 11),		(1 << 10),		(1 <<  9),
-	(1 <<  8),		(1 <<  7),		(1 <<  6),		(1 <<  5),
-	(1 <<  4),		(1 <<  3),		(1 <<  2),		(1 <<  1),
-};  
-
-static float GC_ALIGNED16(psTemp[4]);
-
-static const float GC_ALIGNED16(m_65535) = 65535.0f;
-static const float GC_ALIGNED16(m_32767) = 32767.0f;
-static const float GC_ALIGNED16(m_m32768) = -32768.0f;
-static const float GC_ALIGNED16(m_255) = 255.0f;
-static const float GC_ALIGNED16(m_127) = 127.0f;
-static const float GC_ALIGNED16(m_m128) = -128.0f;
-
-static const float GC_ALIGNED16(m_one[]) = {1.0f, 0.0f, 0.0f, 0.0f};
-
-#define QUANTIZE_OVERFLOW_SAFE
-
-// according to Intel Docs CVTPS2DQ writes 0x80000000 if the source floating point value is out of int32 range
-// while it's OK for large negatives, it isn't for positives
-// I don't know whether the overflow actually happens in any games
-// but it potentially can cause problems, so we need some clamping
-
-#ifdef _M_X64
-// TODO(ector): Improve 64-bit version
-static void WriteDual32(u64 value, u32 address)
-{
-	Memory::Write_U32((u32)(value >> 32), address);
-	Memory::Write_U32((u32)value, address + 4);
-}
-#endif
-
-// See comment in header for in/outs.
-void CommonAsmRoutines::GenQuantizedStores() {
-	const u8* storePairedIllegal = AlignCode4();
-	UD2();
-	const u8* storePairedFloat = AlignCode4();
-
-#ifdef _M_X64
-	SHUFPS(XMM0, R(XMM0), 1);
-	MOVQ_xmm(M(&psTemp[0]), XMM0);
-	MOV(64, R(RAX), M(&psTemp[0]));
-	TEST(32, R(ECX), Imm32(0x0C000000));
-	FixupBranch too_complex = J_CC(CC_NZ);
-	BSWAP(64, RAX);
-	MOV(64, MComplex(RBX, RCX, SCALE_1, 0), R(RAX));
-	FixupBranch skip_complex = J();
-	SetJumpTarget(too_complex);
-	ABI_CallFunctionRR(thunks.ProtectFunction((void *)&WriteDual32, 2), RAX, RCX); 
-	SetJumpTarget(skip_complex);
-	RET();
-#else
-	MOVQ_xmm(M(&psTemp[0]), XMM0);
-	TEST(32, R(ECX), Imm32(0x0C000000));
-	FixupBranch argh = J_CC(CC_NZ);
-	MOV(32, R(EAX), M(&psTemp));
-	BSWAP(32, EAX);
-	AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-	MOV(32, MDisp(ECX, (u32)Memory::base), R(EAX));
-	MOV(32, R(EAX), M(((char*)&psTemp) + 4));
-	BSWAP(32, EAX);
-	MOV(32, MDisp(ECX, 4+(u32)Memory::base), R(EAX));
-	FixupBranch arg2 = J();
-	SetJumpTarget(argh);
-	MOV(32, R(EAX), M(((char*)&psTemp)));
-	ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX); 
-	MOV(32, R(EAX), M(((char*)&psTemp)+4));
-	ADD(32, R(ECX), Imm32(4));
-	ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U32, 2), EAX, ECX); 
-	SetJumpTarget(arg2);
-	RET();
-#endif
-
-	const u8* storePairedU8 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-#ifdef QUANTIZE_OVERFLOW_SAFE
-	MOVSS(XMM1, M((void *)&m_65535));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MINPS(XMM0, R(XMM1));
-#endif
-	CVTTPS2DQ(XMM0, R(XMM0));
-	PACKSSDW(XMM0, R(XMM0));
-	PACKUSWB(XMM0, R(XMM0));
-	MOVD_xmm(R(EAX), XMM0);
-	SafeWriteRegToReg(AX, ECX, 16, 0, false);
-	
-	RET();
-
-	const u8* storePairedS8 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-#ifdef QUANTIZE_OVERFLOW_SAFE	
-	MOVSS(XMM1, M((void *)&m_65535));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MINPS(XMM0, R(XMM1));
-#endif
-	CVTTPS2DQ(XMM0, R(XMM0));
-	PACKSSDW(XMM0, R(XMM0));
-	PACKSSWB(XMM0, R(XMM0));
-	MOVD_xmm(R(EAX), XMM0);
-
-	SafeWriteRegToReg(AX, ECX, 16, 0, false);
-	
-	RET();
-
-	const u8* storePairedU16 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-
-	// PACKUSDW is available only in SSE4	
-	PXOR(XMM1, R(XMM1));
-	MAXPS(XMM0, R(XMM1));
-	MOVSS(XMM1, M((void *)&m_65535));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MINPS(XMM0, R(XMM1));
-
-	CVTTPS2DQ(XMM0, R(XMM0));
-	MOVQ_xmm(M(psTemp), XMM0);
-	// place ps[0] into the higher word, ps[1] into the lower
-	// so no need in ROL after BSWAP
-	MOVZX(32, 16, EAX, M((char*)psTemp + 0));
-	SHL(32, R(EAX), Imm8(16));
-	MOV(16, R(AX), M((char*)psTemp + 4));
-
-	BSWAP(32, EAX);
-	SafeWriteRegToReg(EAX, ECX, 32, 0, false);
-	
-	RET();
-
-	const u8* storePairedS16 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	// SHUFPS or UNPCKLPS might be a better choice here. The last one might just be an alias though.
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-#ifdef QUANTIZE_OVERFLOW_SAFE	
-	MOVSS(XMM1, M((void *)&m_65535));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MINPS(XMM0, R(XMM1));
-#endif
-	CVTTPS2DQ(XMM0, R(XMM0));
-	PACKSSDW(XMM0, R(XMM0));
-	MOVD_xmm(R(EAX), XMM0);
-	BSWAP(32, EAX);
-	ROL(32, R(EAX), Imm8(16));
-	SafeWriteRegToReg(EAX, ECX, 32, 0, false);
-	
-	RET();
-
-	pairedStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
-	ReserveCodeSpace(8 * sizeof(u8*));
-
-	pairedStoreQuantized[0] = storePairedFloat;
-	pairedStoreQuantized[1] = storePairedIllegal;
-	pairedStoreQuantized[2] = storePairedIllegal;
-	pairedStoreQuantized[3] = storePairedIllegal;
-	pairedStoreQuantized[4] = storePairedU8;
-	pairedStoreQuantized[5] = storePairedU16;
-	pairedStoreQuantized[6] = storePairedS8;
-	pairedStoreQuantized[7] = storePairedS16;
-}
-
-// See comment in header for in/outs.
-void CommonAsmRoutines::GenQuantizedSingleStores() {
-	const u8* storeSingleIllegal = AlignCode4();
-	UD2();
-
-	// Easy!
-	const u8* storeSingleFloat = AlignCode4();
-	SafeWriteFloatToReg(XMM0, ECX);
-	RET();
-	/*
-	if (cpu_info.bSSSE3) {
-		PSHUFB(XMM0, M((void *)pbswapShuffle2x4));
-		// TODO: SafeWriteFloat
-		MOVSS(M(&psTemp[0]), XMM0);
-		MOV(32, R(EAX), M(&psTemp[0]));
-		SafeWriteRegToReg(EAX, ECX, 32, 0, false);
-	} else {
-		MOVSS(M(&psTemp[0]), XMM0);
-		MOV(32, R(EAX), M(&psTemp[0]));
-		SafeWriteRegToReg(EAX, ECX, 32, 0, true);
-	}*/
-
-	const u8* storeSingleU8 = AlignCode4();  // Used by MKWii
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	PXOR(XMM1, R(XMM1));
-	MAXSS(XMM0, R(XMM1));
-	MINSS(XMM0, M((void *)&m_255));
-	CVTTSS2SI(EAX, R(XMM0));
-	SafeWriteRegToReg(AL, ECX, 8, 0, true);
-	RET();
-
-	const u8* storeSingleS8 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	MAXSS(XMM0, M((void *)&m_m128));
-	MINSS(XMM0, M((void *)&m_127));
-	CVTTSS2SI(EAX, R(XMM0));
-	SafeWriteRegToReg(AL, ECX, 8, 0, true);
-	RET();
-
-	const u8* storeSingleU16 = AlignCode4();  // Used by MKWii
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	PXOR(XMM1, R(XMM1));
-	MAXSS(XMM0, R(XMM1));
-	MINSS(XMM0, M((void *)&m_65535));
-	CVTTSS2SI(EAX, R(XMM0));
-	SafeWriteRegToReg(EAX, ECX, 16, 0, true);
-	RET();
-
-	const u8* storeSingleS16 = AlignCode4();
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_quantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	MAXSS(XMM0, M((void *)&m_m32768));
-	MINSS(XMM0, M((void *)&m_32767));
-	CVTTSS2SI(EAX, R(XMM0));
-	SafeWriteRegToReg(EAX, ECX, 16, 0, true);
-	RET();
-
-	singleStoreQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
-	ReserveCodeSpace(8 * sizeof(u8*));
-
-	singleStoreQuantized[0] = storeSingleFloat;
-	singleStoreQuantized[1] = storeSingleIllegal;
-	singleStoreQuantized[2] = storeSingleIllegal;
-	singleStoreQuantized[3] = storeSingleIllegal;
-	singleStoreQuantized[4] = storeSingleU8;
-	singleStoreQuantized[5] = storeSingleU16;
-	singleStoreQuantized[6] = storeSingleS8;
-	singleStoreQuantized[7] = storeSingleS16;
-}
-
-void CommonAsmRoutines::GenQuantizedLoads() {
-	const u8* loadPairedIllegal = AlignCode4();
-	UD2();
-
-	const u8* loadPairedFloatTwo = AlignCode4();
-	if (cpu_info.bSSSE3) {
-#ifdef _M_X64
-		MOVQ_xmm(XMM0, MComplex(RBX, RCX, 1, 0));
-#else
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVQ_xmm(XMM0, MDisp(ECX, (u32)Memory::base));
-#endif
-		PSHUFB(XMM0, M((void *)pbswapShuffle2x4));
-	} else {
-#ifdef _M_X64
-		MOV(64, R(RCX), MComplex(RBX, RCX, 1, 0));
-		BSWAP(64, RCX);
-		ROL(64, R(RCX), Imm8(32));
-		MOVQ_xmm(XMM0, R(RCX));
-#else
-#if 0
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVQ_xmm(XMM0, MDisp(ECX, (u32)Memory::base));
-		PXOR(XMM1, R(XMM1));
-		PSHUFLW(XMM0, R(XMM0), 0xB1);
-		MOVAPD(XMM1, R(XMM0));
-		PSRLW(XMM0, 8);
-		PSLLW(XMM1, 8);
-		POR(XMM0, R(XMM1));
-#else
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOV(32, R(EAX), MDisp(ECX, (u32)Memory::base));
-		BSWAP(32, EAX);
-		MOV(32, M(&psTemp[0]), R(RAX));
-		MOV(32, R(EAX), MDisp(ECX, (u32)Memory::base + 4));
-		BSWAP(32, EAX);
-		MOV(32, M(((float *)&psTemp[0]) + 1), R(RAX));
-		MOVQ_xmm(XMM0, M(&psTemp[0]));
-#endif
-#endif
-	}
-	RET();
-
-	const u8* loadPairedFloatOne = AlignCode4();
-	if (cpu_info.bSSSE3) {
-#ifdef _M_X64
-		MOVD_xmm(XMM0, MComplex(RBX, RCX, 1, 0));
-#else
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVD_xmm(XMM0, MDisp(ECX, (u32)Memory::base));
-#endif
-		PSHUFB(XMM0, M((void *)pbswapShuffle1x4));
-		UNPCKLPS(XMM0, M((void*)m_one));
-	} else {
-#ifdef _M_X64
-		MOV(32, R(RCX), MComplex(RBX, RCX, 1, 0));
-		BSWAP(32, RCX);
-		MOVD_xmm(XMM0, R(RCX));
-		UNPCKLPS(XMM0, M((void*)m_one));
-#else
-		AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK));
-		MOV(32, R(EAX), MDisp(ECX, (u32)Memory::base));
-		BSWAP(32, EAX);
-		MOVD_xmm(XMM0, R(EAX));
-		UNPCKLPS(XMM0, M((void*)m_one));
-#endif
-	}
-	RET();
-
-	const u8* loadPairedU8Two = AlignCode4();
-	UnsafeLoadRegToRegNoSwap(ECX, ECX, 16, 0);
-	MOVD_xmm(XMM0, R(ECX));
-	PXOR(XMM1, R(XMM1));
-	PUNPCKLBW(XMM0, R(XMM1));
-	PUNPCKLWD(XMM0, R(XMM1));
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-	RET();
-
-	const u8* loadPairedU8One = AlignCode4();
-	UnsafeLoadRegToRegNoSwap(ECX, ECX, 8, 0);	// ECX = 0x000000xx
-	MOVD_xmm(XMM0, R(ECX));
-	CVTDQ2PS(XMM0, R(XMM0));	// Is CVTSI2SS better?
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	UNPCKLPS(XMM0, M((void*)m_one));
-	RET();
-
-	const u8* loadPairedS8Two = AlignCode4();
-	UnsafeLoadRegToRegNoSwap(ECX, ECX, 16, 0);
-	MOVD_xmm(XMM0, R(ECX));
-	PUNPCKLBW(XMM0, R(XMM0));
-	PUNPCKLWD(XMM0, R(XMM0));
-	PSRAD(XMM0, 24);
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-	RET();
-
-	const u8* loadPairedS8One = AlignCode4();
-	UnsafeLoadRegToRegNoSwap(ECX, ECX, 8, 0);
-	SHL(32, R(ECX), Imm8(24));
-	SAR(32, R(ECX), Imm8(24));
-	MOVD_xmm(XMM0, R(ECX));
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	UNPCKLPS(XMM0, M((void*)m_one));
-	RET();
-
-	const u8* loadPairedU16Two = AlignCode4();
-	UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-	ROL(32, R(ECX), Imm8(16));
-	MOVD_xmm(XMM0, R(ECX));
-	PXOR(XMM1, R(XMM1));
-	PUNPCKLWD(XMM0, R(XMM1));
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-	RET();
-
-	const u8* loadPairedU16One = AlignCode4();
-	UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-	SHR(32, R(ECX), Imm8(16));
-	MOVD_xmm(XMM0, R(ECX));
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	UNPCKLPS(XMM0, M((void*)m_one));
-	RET();
-
-	const u8* loadPairedS16Two = AlignCode4();
-	UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-	ROL(32, R(ECX), Imm8(16));
-	MOVD_xmm(XMM0, R(ECX));
-	PUNPCKLWD(XMM0, R(XMM0));
-	PSRAD(XMM0, 16);
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	AND(32, R(EAX), Imm32(0xFC));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	PUNPCKLDQ(XMM1, R(XMM1));
-	MULPS(XMM0, R(XMM1));
-	RET();
-
-	const u8* loadPairedS16One = AlignCode4();
-	UnsafeLoadRegToReg(ECX, ECX, 32, 0, false);
-	SAR(32, R(ECX), Imm8(16));
-	MOVD_xmm(XMM0, R(ECX));
-	CVTDQ2PS(XMM0, R(XMM0));
-	SHR(32, R(EAX), Imm8(6));
-	AND(32, R(EAX), Imm32(0xFC));
-	MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS));
-	MULSS(XMM0, R(XMM1));
-	UNPCKLPS(XMM0, M((void*)m_one));
-	RET();
-
-	pairedLoadQuantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16()));
-	ReserveCodeSpace(16 * sizeof(u8*));
-
-	pairedLoadQuantized[0] = loadPairedFloatTwo;
-	pairedLoadQuantized[1] = loadPairedIllegal;
-	pairedLoadQuantized[2] = loadPairedIllegal;
-	pairedLoadQuantized[3] = loadPairedIllegal;
-	pairedLoadQuantized[4] = loadPairedU8Two;
-	pairedLoadQuantized[5] = loadPairedU16Two;
-	pairedLoadQuantized[6] = loadPairedS8Two;
-	pairedLoadQuantized[7] = loadPairedS16Two;
-
-	pairedLoadQuantized[8] = loadPairedFloatOne;
-	pairedLoadQuantized[9] = loadPairedIllegal;
-	pairedLoadQuantized[10] = loadPairedIllegal;
-	pairedLoadQuantized[11] = loadPairedIllegal;
-	pairedLoadQuantized[12] = loadPairedU8One;
-	pairedLoadQuantized[13] = loadPairedU16One;
-	pairedLoadQuantized[14] = loadPairedS8One;
-	pairedLoadQuantized[15] = loadPairedS16One;
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
deleted file mode 100644
index 58d7c5fe6e..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JITASMCOMMON_H
-#define _JITASMCOMMON_H
-
-#include "../JitCommon/Jit_Util.h"
-#include "Thunk.h"
-
-class CommonAsmRoutinesBase  {
-public:
-
-	const u8 *fifoDirectWrite8;
-	const u8 *fifoDirectWrite16;
-	const u8 *fifoDirectWrite32;
-	const u8 *fifoDirectWriteFloat;
-	const u8 *fifoDirectWriteXmm64;
-
-	const u8 *enterCode;
-
-	const u8 *outerLoop;
-	const u8 *dispatcher;
-	const u8 *dispatcherNoCheck;
-	const u8 *dispatcherPcInEAX;
-
-	const u8 *fpException;
-	const u8 *testExceptions;
-	const u8 *testExternalExceptions;
-	const u8 *dispatchPcInEAX;
-	const u8 *doTiming;
-
-	const u8 *breakpointBailout;
-
-	// In: array index: GQR to use.
-	// In: ECX: Address to read from.
-	// Out: XMM0: Bottom two 32-bit slots hold the read value,
-	//            converted to a pair of floats.
-	// Trashes: EAX ECX EDX
-	const u8 **pairedLoadQuantized;
-
-	// In: array index: GQR to use.
-	// In: ECX: Address to write to.
-	// In: XMM0: Bottom two 32-bit slots hold the pair of floats to be written.
-	// Out: Nothing.
-	// Trashes: EAX ECX EDX
-	const u8 **pairedStoreQuantized;
-
-	// In: array index: GQR to use.
-	// In: ECX: Address to write to.
-	// In: XMM0: Bottom 32-bit slot holds the float to be written.
-	const u8 **singleStoreQuantized;
-
-};
-
-class CommonAsmRoutines : public CommonAsmRoutinesBase, public EmuCodeBlock
-{
-protected:
-	void GenQuantizedLoads();
-	void GenQuantizedStores();
-	void GenQuantizedSingleStores();
-
-public:
-	void GenFifoWrite(int size);
-	void GenFifoXmm64Write();
-	void GenFifoFloatWrite();
-
-private:
-	ThunkManager thunks;
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
deleted file mode 100644
index 506435284e..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-
-#include "Common.h"
-#include "disasm.h"
-#include "../JitCommon/JitBase.h"
-#include "../JitCommon/JitBackpatch.h"
-
-#include "../../HW/Memmap.h"
-
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "Thunk.h"
-#include "x64Analyzer.h"
-
-#include "StringUtil.h"
-#ifdef _WIN32
-	#include <windows.h>
-#endif
-
-
-using namespace Gen;
-
-extern u8 *trampolineCodePtr;
-
-#ifdef _M_X64
-static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) {
-	u64 code_addr = (u64)codePtr;
-	disassembler disasm;
-	char disbuf[256];
-	memset(disbuf, 0, 256);
-#ifdef _M_IX86
-	disasm.disasm32(0, code_addr, codePtr, disbuf);
-#else
-	disasm.disasm64(0, code_addr, codePtr, disbuf);
-#endif
-	PanicAlert("%s\n\n"
-		"Error encountered accessing emulated address %08x.\n"
-		"Culprit instruction: \n%s\nat %#llx",
-		text.c_str(), emAddress, disbuf, code_addr);
-	return;
-}
-#endif
-
-void TrampolineCache::Init()
-{
-	AllocCodeSpace(1024 * 1024);
-}
-
-void TrampolineCache::Shutdown()
-{
-	FreeCodeSpace();
-}
-
-// Extremely simplistic - just generate the requested trampoline. May reuse them in the future.
-const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info)
-{
-	if (GetSpaceLeft() < 1024)
-		PanicAlert("Trampoline cache full");
-
-	const u8 *trampoline = GetCodePtr();
-#ifdef _M_X64
-	X64Reg addrReg = (X64Reg)info.scaledReg;
-	X64Reg dataReg = (X64Reg)info.regOperandReg;
-
-	// It's a read. Easy.
-	ABI_PushAllCallerSavedRegsAndAdjustStack();
-	if (addrReg != ABI_PARAM1)
-		MOV(32, R(ABI_PARAM1), R((X64Reg)addrReg));
-	if (info.displacement) {
-		ADD(32, R(ABI_PARAM1), Imm32(info.displacement));
-	}
-	switch (info.operandSize)
-	{
-	case 4:
-		CALL(thunks.ProtectFunction((void *)&Memory::Read_U32, 1));
-		break;
-	case 2:
-		CALL(thunks.ProtectFunction((void *)&Memory::Read_U16, 1));
-		SHL(32, R(EAX), Imm8(16));
-		break;
-	case 1:
-		CALL(thunks.ProtectFunction((void *)&Memory::Read_U8, 1));
-		break;
-	}
-
-	ABI_PopAllCallerSavedRegsAndAdjustStack();
-
-	if (dataReg != EAX)
-	{
-		MOV(32, R(dataReg), R(EAX));
-	}
-
-	RET();
-#endif
-	return trampoline;
-}
-
-// Extremely simplistic - just generate the requested trampoline. May reuse them in the future.
-const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info)
-{
-	if (GetSpaceLeft() < 1024)
-		PanicAlert("Trampoline cache full");
-
-	const u8 *trampoline = GetCodePtr();
-
-#ifdef _M_X64
-	X64Reg dataReg = (X64Reg)info.regOperandReg;
-	if (dataReg != EAX)
-		PanicAlert("Backpatch write - not through EAX");
-
-	X64Reg addrReg = (X64Reg)info.scaledReg;
-
-	// It's a write. Yay. Remember that we don't have to be super efficient since it's "just" a 
-	// hardware access - we can take shortcuts.
-	//if (emAddress == 0xCC008000)
-	//	PanicAlert("Caught a FIFO write");
-	CMP(32, R(addrReg), Imm32(0xCC008000));
-	FixupBranch skip_fast = J_CC(CC_NE, false);
-	MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
-	CALL((void*)jit->GetAsmRoutines()->fifoDirectWrite32);
-	RET();
-	SetJumpTarget(skip_fast);
-	ABI_PushAllCallerSavedRegsAndAdjustStack();
-
-	if (addrReg != ABI_PARAM1)
-	{
-		MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
-		MOV(32, R(ABI_PARAM2), R((X64Reg)addrReg));
-	}
-	else
-	{
-		MOV(32, R(ABI_PARAM2), R((X64Reg)addrReg));
-		MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
-	}
-
-	if (info.displacement)
-	{
-		ADD(32, R(ABI_PARAM2), Imm32(info.displacement));
-	}
-
-	switch (info.operandSize)
-	{
-	case 4:
-		CALL(thunks.ProtectFunction((void *)&Memory::Write_U32, 2));
-		break;
-	}
-	ABI_PopAllCallerSavedRegsAndAdjustStack();
-	RET();
-#endif
-
-	return trampoline;
-}
-
-
-// This generates some fairly heavy trampolines, but:
-// 1) It's really necessary. We don't know anything about the context.
-// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be 
-//    that many of them in a typical program/game.
-const u8 *Jitx86Base::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void)
-{
-#ifdef _M_X64
-	CONTEXT *ctx = (CONTEXT *)ctx_void;
-
-	if (!jit->IsInCodeSpace(codePtr))
-		return 0;  // this will become a regular crash real soon after this
-	
-	InstructionInfo info;
-	if (!DisassembleMov(codePtr, &info)) {
-		BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress);
-	}
-
-	if (info.otherReg != RBX)
-		PanicAlert("BackPatch : Base reg not RBX."
-		           "\n\nAttempted to access %08x.", emAddress);
-
-	if (!info.isMemoryWrite)
-	{
-		XEmitter emitter(codePtr);
-		int bswapNopCount;
-		// Check the following BSWAP for REX byte
-		if ((codePtr[info.instructionSize] & 0xF0) == 0x40)
-			bswapNopCount = 3;
-		else
-			bswapNopCount = 2;
-		const u8 *trampoline = trampolines.GetReadTrampoline(info);
-		emitter.CALL((void *)trampoline);
-		emitter.NOP((int)info.instructionSize + bswapNopCount - 5);
-		return codePtr;
-	}
-	else
-	{
-		PanicAlert("BackPatch : Currently only supporting reads."
-		           "\n\nAttempted to write to %08x.", emAddress);
-
-		// TODO: special case FIFO writes. Also, support 32-bit mode.
-		// Also, debug this so that it actually works correctly :P
-		XEmitter emitter(codePtr - 2);
-		// We know it's EAX so the BSWAP before will be two byte. Overwrite it.
-		const u8 *trampoline = trampolines.GetWriteTrampoline(info);
-		emitter.CALL((void *)trampoline);
-		emitter.NOP((int)info.instructionSize - 3);
-		if (info.instructionSize < 3)
-			PanicAlert("Instruction too small");
-		// We entered here with a BSWAP-ed EAX. We'll have to swap it back.
-		ctx->Rax = Common::swap32((u32)ctx->Rax);
-		return codePtr - 2;
-	}
-	return 0;
-#else
-	return 0;
-#endif
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
deleted file mode 100644
index a8f204b1e1..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JITBACKPATCH_H
-#define _JITBACKPATCH_H
-
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64Analyzer.h"
-#include "Thunk.h"
-
-// Declarations and definitions
-// ----------
-
-// void Jit(u32 em_address);
-
-#ifndef _WIN32
-
-	// A bit of a hack to get things building under linux. We manually fill in this structure as needed
-	// from the real context.
-	struct CONTEXT
-	{
-	#ifdef _M_ARM
-		u32 reg_pc;
-	#else
-	#ifdef _M_X64
-		u64 Rip;
-		u64 Rax;
-	#else
-		u32 Eip;
-		u32 Eax;
-	#endif 
-	#endif
-	};
-
-#endif
-
-#if defined(_M_ARM)
-#define CONTEXT_PC(ctx) ((ctx)->reg_pc)
-#elif defined(_M_X64)
-#define CONTEXT_PC(ctx) ((ctx)->Rip)
-#else
-#define CONTEXT_PC(ctx) ((ctx)->Eip)
-#endif
-
-class TrampolineCache : public Gen::XCodeBlock
-{
-public:
-	void Init();
-	void Shutdown();
-
-	const u8 *GetReadTrampoline(const InstructionInfo &info);
-	const u8 *GetWriteTrampoline(const InstructionInfo &info);
-private:
-	ThunkManager thunks;
-};
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
deleted file mode 100644
index 46644f2fc9..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <sstream>
-
-#include "JitBase.h"
-#include "PowerPCDisasm.h"
-#include "disasm.h"
-
-JitBase *jit;
-
-void Jit(u32 em_address)
-{
-	jit->Jit(em_address);
-}
-
-u32 Helper_Mask(u8 mb, u8 me)
-{
-	return (((mb > me) ?
-		~(((u32)-1 >> mb) ^ ((me >= 31) ? 0 : (u32) -1 >> (me + 1)))
-		:
-		(((u32)-1 >> mb) ^ ((me >= 31) ? 0 : (u32) -1 >> (me + 1))))
-		);
-}
-
-void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *normalEntry, JitBlock *b)
-{
-	char pDis[1000] = "";
-
-	for (int i = 0; i < size; i++)
-	{
-		char temp[256] = "";
-		const PPCAnalyst::CodeOp &op = code_buffer->codebuffer[i];
-		DisassembleGekko(op.inst.hex, op.address, temp, 256);
-		sprintf(pDis, "%08x %s", op.address, temp);
-		DEBUG_LOG(DYNA_REC,"IR_X86 PPC: %s\n", pDis);
-	}	
-
-	disassembler x64disasm;
-	x64disasm.set_syntax_intel();
-
-	u64 disasmPtr = (u64)normalEntry;
-	const u8 *end = normalEntry + b->codeSize;
-
-	while ((u8*)disasmPtr < end)
-	{
-		char sptr[1000] = "";
-#ifdef _M_X64
-		disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
-#else
-		disasmPtr += x64disasm.disasm32(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
-#endif
-		DEBUG_LOG(DYNA_REC,"IR_X86 x86: %s", sptr);
-	}
-
-	if (b->codeSize <= 250)
-	{
-		std::stringstream ss;
-		ss << std::hex;
-		for (u8 i = 0; i <= b->codeSize; i++)
-		{
-			ss.width(2);
-			ss.fill('0');
-			ss << (u32)*(normalEntry + i);
-		}
-		DEBUG_LOG(DYNA_REC,"IR_X86 bin: %s\n\n\n", ss.str().c_str());
-	}
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
deleted file mode 100644
index a5f7bd62be..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JITBASE_H
-#define _JITBASE_H
-
-//#define JIT_LOG_X86     // Enables logging of the generated x86 code
-//#define JIT_LOG_GPR     // Enables logging of the PPC general purpose regs
-//#define JIT_LOG_FPR     // Enables logging of the PPC floating point regs
-
-#include "../CPUCoreBase.h"
-#include "JitCache.h"
-#include "Jit_Util.h"  // for EmuCodeBlock
-#include "JitBackpatch.h"  // for EmuCodeBlock
-#include "JitAsmCommon.h"
-
-#include <set>
-
-#define JIT_OPCODE 0
-
-class JitBase : public CPUCoreBase
-{
-protected:
-	struct JitOptions
-	{
-		bool optimizeStack;
-		bool enableBlocklink;
-		bool fpAccurateFcmp;
-		bool optimizeGatherPipe;
-		bool fastInterrupts;
-		bool accurateSinglePrecision;
-	};
-	struct JitState
-	{
-		u32 compilerPC;
-		u32 next_compilerPC;
-		u32 blockStart;
-		bool cancel;
-		UGeckoInstruction next_inst;  // for easy peephole opt.
-		int blockSize;
-		int instructionNumber;
-		int downcountAmount;
-		u32 numLoadStoreInst;
-		u32 numFloatingPointInst;
-
-		bool firstFPInstructionFound;
-		bool isLastInstruction;
-		bool forceUnsafeLoad;
-		bool memcheck;
-		bool skipnext;
-		bool broken_block;
-		int block_flags;
-
-		int fifoBytesThisBlock;
-
-		PPCAnalyst::BlockStats st;
-		PPCAnalyst::BlockRegStats gpa;
-		PPCAnalyst::BlockRegStats fpa;
-		PPCAnalyst::CodeOp *op;
-		u8* rewriteStart;
-
-		JitBlock *curBlock;
-
-		std::set<u32> fifoWriteAddresses;
-	};
-
-public:
-	// This should probably be removed from public:
-	JitOptions jo;
-	JitState js;
-	
-	virtual JitBaseBlockCache *GetBlockCache() = 0;
-
-	virtual void Jit(u32 em_address) = 0;
-
-	virtual	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0;
-
-	virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0;
-
-	virtual bool IsInCodeSpace(u8 *ptr) = 0;
-};
-
-class Jitx86Base : public JitBase, public EmuCodeBlock
-{
-protected:
-	JitBlockCache blocks;
-	TrampolineCache trampolines;	
-public:
-	JitBlockCache *GetBlockCache() { return &blocks; }
-	
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx);
-
-	bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
-};
-
-extern JitBase *jit;
-
-void Jit(u32 em_address);
-
-// Merged routines that should be moved somewhere better
-u32 Helper_Mask(u8 mb, u8 me);
-void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *normalEntry, JitBlock *b);
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
deleted file mode 100644
index 7923fbf274..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Enable define below to enable oprofile integration. For this to work,
-// it requires at least oprofile version 0.9.4, and changing the build
-// system to link the Dolphin executable against libopagent.  Since the
-// dependency is a little inconvenient and this is possibly a slight
-// performance hit, it's not enabled by default, but it's useful for
-// locating performance issues.
-
-#include "Common.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "../../Core.h"
-#include "MemoryUtil.h"
-
-#include "../../HW/Memmap.h"
-#include "../JitInterface.h"
-#include "../../CoreTiming.h"
-
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-
-#include "JitCache.h"
-#include "JitBase.h"
-
-#include "disasm.h"
-
-#if defined USE_OPROFILE && USE_OPROFILE
-#include <opagent.h>
-
-op_agent_t agent;
-#endif
-
-#if defined USE_VTUNE
-#include <jitprofiling.h>
-#pragma comment(lib, "libittnotify.lib")
-#pragma comment(lib, "jitprofiling.lib")
-#endif
-
-using namespace Gen;
-
-#define INVALID_EXIT 0xFFFFFFFF
-
-bool JitBlock::ContainsAddress(u32 em_address)
-{
-	// WARNING - THIS DOES NOT WORK WITH INLINING ENABLED.
-	return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize);
-}
-
-	bool JitBaseBlockCache::IsFull() const 
-	{
-		return GetNumBlocks() >= MAX_NUM_BLOCKS - 1;
-	}
-
-	void JitBaseBlockCache::Init()
-	{
-		MAX_NUM_BLOCKS = 65536*2;
-
-#if defined USE_OPROFILE && USE_OPROFILE
-		agent = op_open_agent();
-#endif
-		blocks = new JitBlock[MAX_NUM_BLOCKS];
-		blockCodePointers = new const u8*[MAX_NUM_BLOCKS];
-#ifdef JIT_UNLIMITED_ICACHE
-		if (iCache == 0 && iCacheEx == 0 && iCacheVMEM == 0)
-		{
-			iCache = new u8[JIT_ICACHE_SIZE];
-			iCacheEx = new u8[JIT_ICACHEEX_SIZE];
-			iCacheVMEM = new u8[JIT_ICACHE_SIZE];
-		}
-		else
-		{
-			PanicAlert("JitBaseBlockCache::Init() - iCache is already initialized");
-		}
-		if (iCache == 0 || iCacheEx == 0 || iCacheVMEM == 0)
-		{
-			PanicAlert("JitBaseBlockCache::Init() - unable to allocate iCache");
-		}
-		memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE);
-		memset(iCacheEx, JIT_ICACHE_INVALID_BYTE, JIT_ICACHEEX_SIZE);
-		memset(iCacheVMEM, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE);
-#endif
-		Clear();
-	}
-
-	void JitBaseBlockCache::Shutdown()
-	{
-		delete[] blocks;
-		delete[] blockCodePointers;
-#ifdef JIT_UNLIMITED_ICACHE		
-		if (iCache != 0)
-			delete[] iCache;
-		iCache = 0;
-		if (iCacheEx != 0)
-			delete[] iCacheEx;
-		iCacheEx = 0;
-		if (iCacheVMEM != 0)
-			delete[] iCacheVMEM;
-		iCacheVMEM = 0;
-#endif
-		blocks = 0;
-		blockCodePointers = 0;
-		num_blocks = 0;
-#if defined USE_OPROFILE && USE_OPROFILE
-		op_close_agent(agent);
-#endif
-
-#ifdef USE_VTUNE
-		iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, NULL);
-#endif
-	}
-	
-	// This clears the JIT cache. It's called from JitCache.cpp when the JIT cache
-	// is full and when saving and loading states.
-	void JitBaseBlockCache::Clear()
-	{
-#if defined(_DEBUG) || defined(DEBUGFAST)
-		if (IsFull())
-			Core::DisplayMessage("Clearing block cache.", 3000);
-		else
-			Core::DisplayMessage("Clearing code cache.", 3000);
-#endif
-
-		for (int i = 0; i < num_blocks; i++)
-		{
-			DestroyBlock(i, false);
-		}
-		links_to.clear();
-		block_map.clear();
-		valid_block.reset();
-		num_blocks = 0;
-		memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS);
-	}
-
-	void JitBaseBlockCache::ClearSafe()
-	{
-#ifdef JIT_UNLIMITED_ICACHE
-		memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE);
-		memset(iCacheEx, JIT_ICACHE_INVALID_BYTE, JIT_ICACHEEX_SIZE);
-		memset(iCacheVMEM, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE);
-#endif
-	}
-
-	/*void JitBaseBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag)
-	{
-		for (int i = 0; i < num_blocks; i++)
-		{
-			if (blocks[i].flags & death_flag)
-			{
-				DestroyBlock(i, false);
-			}
-		}
-	}*/
-
-	void JitBaseBlockCache::Reset()
-	{
-		Shutdown();
-		Init();
-	}
-
-	JitBlock *JitBaseBlockCache::GetBlock(int no)
-	{
-		return &blocks[no];
-	}
-
-	int JitBaseBlockCache::GetNumBlocks() const
-	{
-		return num_blocks;
-	}
-
-	bool JitBaseBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const
-	{
-		// check if any endpoint is inside the other range
-		if ((s1 >= s2 && s1 <= e2) ||
-			(e1 >= s2 && e1 <= e2) ||
-			(s2 >= s1 && s2 <= e1) ||
-			(e2 >= s1 && e2 <= e1)) 
-			return true;
-		else
-			return false;
-	}
-
-	int JitBaseBlockCache::AllocateBlock(u32 em_address)
-	{
-		JitBlock &b = blocks[num_blocks];
-		b.invalid = false;
-		b.originalAddress = em_address;
-		b.exitAddress[0] = INVALID_EXIT;
-		b.exitAddress[1] = INVALID_EXIT;
-		b.exitPtrs[0] = 0;
-		b.exitPtrs[1] = 0;
-		b.linkStatus[0] = false;
-		b.linkStatus[1] = false;
-		b.blockNum = num_blocks;
-		num_blocks++; //commit the current block
-		return num_blocks - 1;
-	}
-
-	void JitBaseBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr)
-	{
-		blockCodePointers[block_num] = code_ptr;
-		JitBlock &b = blocks[block_num];
-		b.originalFirstOpcode = JitInterface::Read_Opcode_JIT(b.originalAddress);
-		JitInterface::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num);
-
-		// Convert the logical address to a physical address for the block map
-		u32 pAddr = b.originalAddress & 0x1FFFFFFF;
-
-		for (u32 i = 0; i < (b.originalSize + 7) / 8; ++i)
-			valid_block[pAddr / 32 + i] = true;
-
-		block_map[std::make_pair(pAddr + 4 * b.originalSize - 1, pAddr)] = block_num;
-		if (block_link)
-		{
-			for (int i = 0; i < 2; i++)
-			{
-				if (b.exitAddress[i] != INVALID_EXIT) 
-					links_to.insert(std::pair<u32, int>(b.exitAddress[i], block_num));
-			}
-			
-			LinkBlock(block_num);
-			LinkBlockExits(block_num);
-		}
-
-#if defined USE_OPROFILE && USE_OPROFILE
-		char buf[100];
-		sprintf(buf, "EmuCode%x", b.originalAddress);
-		const u8* blockStart = blockCodePointers[block_num];
-		op_write_native_code(agent, buf, (uint64_t)blockStart,
-		                     blockStart, b.codeSize);
-#endif
-
-#ifdef USE_VTUNE
-		sprintf(b.blockName, "EmuCode_0x%08x", b.originalAddress);
-
-		iJIT_Method_Load jmethod = {0};
-		jmethod.method_id = iJIT_GetNewMethodID();
-		jmethod.class_file_name = "";
-		jmethod.source_file_name = __FILE__;
-		jmethod.method_load_address = (void*)blockCodePointers[block_num];
-		jmethod.method_size = b.codeSize;
-		jmethod.line_number_size = 0;
-		jmethod.method_name = b.blockName;
-		iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED, (void*)&jmethod);
-#endif
-	}
-
-	const u8 **JitBaseBlockCache::GetCodePointers()
-	{
-		return blockCodePointers;
-	}
-
-#ifdef JIT_UNLIMITED_ICACHE
-	u8* JitBaseBlockCache::GetICache()
-	{
-		return iCache;
-	}
-
-	u8* JitBaseBlockCache::GetICacheEx()
-	{
-		return iCacheEx;
-	}
-
-	u8* JitBaseBlockCache::GetICacheVMEM()
-	{
-		return iCacheVMEM;
-	}
-#endif
-
-	int JitBaseBlockCache::GetBlockNumberFromStartAddress(u32 addr)
-	{
-		if (!blocks)
-			return -1;		
-#ifdef JIT_UNLIMITED_ICACHE
-		u32 inst;
-		if (addr & JIT_ICACHE_VMEM_BIT)
-		{
-			inst = *(u32*)(iCacheVMEM + (addr & JIT_ICACHE_MASK));
-		}
-		else if (addr & JIT_ICACHE_EXRAM_BIT)
-		{
-			inst = *(u32*)(iCacheEx + (addr & JIT_ICACHEEX_MASK));
-		}
-		else
-		{
-			inst = *(u32*)(iCache + (addr & JIT_ICACHE_MASK));
-		}
-		inst = Common::swap32(inst);
-#else
-		u32 inst = Memory::ReadFast32(addr);
-#endif
-		if (inst & 0xfc000000) // definitely not a JIT block
-			return -1;
-		if ((int)inst >= num_blocks)
-			return -1;
-		if (blocks[inst].originalAddress != addr)
-			return -1;		
-		return inst;
-	}
-
-	void JitBaseBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector<int> *block_numbers)
-	{
-		for (int i = 0; i < num_blocks; i++)
-			if (blocks[i].ContainsAddress(em_address))
-				block_numbers->push_back(i);
-	}
-
-	u32 JitBaseBlockCache::GetOriginalFirstOp(int block_num)
-	{
-		if (block_num >= num_blocks)
-		{
-			//PanicAlert("JitBaseBlockCache::GetOriginalFirstOp - block_num = %u is out of range", block_num);
-			return block_num;
-		}
-		return blocks[block_num].originalFirstOpcode;
-	}
-
-	CompiledCode JitBaseBlockCache::GetCompiledCodeFromBlock(int block_num)
-	{		
-		return (CompiledCode)blockCodePointers[block_num];
-	}
-
-	//Block linker
-	//Make sure to have as many blocks as possible compiled before calling this
-	//It's O(N), so it's fast :)
-	//Can be faster by doing a queue for blocks to link up, and only process those
-	//Should probably be done
-
-	void JitBaseBlockCache::LinkBlockExits(int i)
-	{
-		JitBlock &b = blocks[i];
-		if (b.invalid)
-		{
-			// This block is dead. Don't relink it.
-			return;
-		}
-		for (int e = 0; e < 2; e++)
-		{
-			if (b.exitAddress[e] != INVALID_EXIT && !b.linkStatus[e])
-			{
-				int destinationBlock = GetBlockNumberFromStartAddress(b.exitAddress[e]);
-				if (destinationBlock != -1)
-				{
-					WriteLinkBlock(b.exitPtrs[e], blocks[destinationBlock].checkedEntry);
-					b.linkStatus[e] = true;
-				}
-			}
-		}
-	}
-
-	using namespace std;
-
-	void JitBaseBlockCache::LinkBlock(int i)
-	{
-		LinkBlockExits(i);
-		JitBlock &b = blocks[i];
-		pair<multimap<u32, int>::iterator, multimap<u32, int>::iterator> ppp;
-		// equal_range(b) returns pair<iterator,iterator> representing the range
-		// of element with key b
-		ppp = links_to.equal_range(b.originalAddress);
-		if (ppp.first == ppp.second)
-			return;
-		for (multimap<u32, int>::iterator iter = ppp.first; iter != ppp.second; ++iter) {
-			// PanicAlert("Linking block %i to block %i", iter->second, i);
-			LinkBlockExits(iter->second);
-		}
-	}
-
-	void JitBaseBlockCache::UnlinkBlock(int i)
-	{
-		JitBlock &b = blocks[i];
-		pair<multimap<u32, int>::iterator, multimap<u32, int>::iterator> ppp;
-		ppp = links_to.equal_range(b.originalAddress);
-		if (ppp.first == ppp.second)
-			return;
-		for (multimap<u32, int>::iterator iter = ppp.first; iter != ppp.second; ++iter) {
-			JitBlock &sourceBlock = blocks[iter->second];
-			for (int e = 0; e < 2; e++)
-			{
-				if (sourceBlock.exitAddress[e] == b.originalAddress)
-					sourceBlock.linkStatus[e] = false;
-			}
-		}
-	}
-
-	void JitBaseBlockCache::DestroyBlock(int block_num, bool invalidate)
-	{
-		if (block_num < 0 || block_num >= num_blocks)
-		{
-			PanicAlert("DestroyBlock: Invalid block number %d", block_num);
-			return;
-		}
-		JitBlock &b = blocks[block_num];
-		if (b.invalid)
-		{
-			if (invalidate)
-				PanicAlert("Invalidating invalid block %d", block_num);
-			return;
-		}
-		b.invalid = true;
-#ifdef JIT_UNLIMITED_ICACHE
-		JitInterface::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD);
-#else
-		if (Memory::ReadFast32(b.originalAddress) == block_num)
-			Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress);
-#endif
-
-		UnlinkBlock(block_num);
-
-		// Send anyone who tries to run this block back to the dispatcher.
-		// Not entirely ideal, but .. pretty good.
-		// Spurious entrances from previously linked blocks can only come through checkedEntry
-		WriteDestroyBlock(b.checkedEntry, b.originalAddress);
-	}
-
-	void JitBaseBlockCache::InvalidateICache(u32 address, const u32 length)
-	{
-		// Convert the logical address to a physical address for the block map
-		u32 pAddr = address & 0x1FFFFFFF;
-
-		// Optimize the common case of length == 32 which is used by Interpreter::dcb*
-		bool destroy_block = true;
-		if (length == 32)
-	{
-			if (!valid_block[pAddr / 32])
-				destroy_block = false;
-			else
-				valid_block[pAddr / 32] = false;
-		}
-
-		// destroy JIT blocks
-		// !! this works correctly under assumption that any two overlapping blocks end at the same address
-		if (destroy_block)
-		{
-			std::map<pair<u32,u32>, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1;
-			while (it2 != block_map.end() && it2->first.second < pAddr + length)
-		{
-#ifdef JIT_UNLIMITED_ICACHE
-				JitBlock &b = blocks[it2->second];
-				if (b.originalAddress & JIT_ICACHE_VMEM_BIT)
-				{
-					u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK;
-					memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4);
-				}
-				else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT)
-				{
-					u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK;
-					memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4);
-				}
-				else
-				{
-					u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK;
-					memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4);
-				}
-#endif
-				DestroyBlock(it2->second, true);
-				it2++;
-			}
-			if (it1 != it2)
-			{
-				block_map.erase(it1, it2);
-			}
-		}
-
-#ifdef JIT_UNLIMITED_ICACHE
-		// invalidate iCache.
-		// icbi can be called with any address, so we should check
-		if ((address & ~JIT_ICACHE_MASK) != 0x80000000 && (address & ~JIT_ICACHE_MASK) != 0x00000000 &&
-			(address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area
-			(address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (address & ~JIT_ICACHEEX_MASK) != 0x10000000)
-		{
-			return;
-		}
-		if (address & JIT_ICACHE_VMEM_BIT)
-		{
-			u32 cacheaddr = address & JIT_ICACHE_MASK;
-			memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length);
-		}
-		else if (address & JIT_ICACHE_EXRAM_BIT)
-		{
-			u32 cacheaddr = address & JIT_ICACHEEX_MASK;
-			memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length);
-		}
-		else
-		{
-			u32 cacheaddr = address & JIT_ICACHE_MASK;
-			memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length);
-		}
-#endif
-	}
-	void JitBlockCache::WriteLinkBlock(u8* location, const u8* address)
-	{
-		XEmitter emit(location);
-		emit.JMP(address, true);
-	}
-	void JitBlockCache::WriteDestroyBlock(const u8* location, u32 address)
-	{
-		XEmitter emit((u8 *)location);
-		emit.MOV(32, M(&PC), Imm32(address));
-		emit.JMP(jit->GetAsmRoutines()->dispatcher, true);
-	}
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
deleted file mode 100644
index a09eb3ebba..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _JITCACHE_H
-#define _JITCACHE_H
-
-#include <bitset>
-#include <map>
-#include <vector>
-
-#include "../Gekko.h"
-#include "../PPCAnalyst.h"
-
-// Define this in order to get VTune profile support for the Jit generated code.
-// Add the VTune include/lib directories to the project directories to get this to build.
-// #define USE_VTUNE
-
-// emulate CPU with unlimited instruction cache
-// the only way to invalidate a region is the "icbi" instruction
-#define JIT_UNLIMITED_ICACHE
-
-#define JIT_ICACHE_SIZE 0x2000000
-#define JIT_ICACHE_MASK 0x1ffffff
-#define JIT_ICACHEEX_SIZE 0x4000000
-#define JIT_ICACHEEX_MASK 0x3ffffff
-#define JIT_ICACHE_EXRAM_BIT 0x10000000
-#define JIT_ICACHE_VMEM_BIT 0x20000000
-// this corresponds to opcode 5 which is invalid in PowerPC
-#define JIT_ICACHE_INVALID_BYTE 0x14
-#define JIT_ICACHE_INVALID_WORD 0x14141414
-
-struct JitBlock
-{
-	const u8 *checkedEntry;
-	const u8 *normalEntry;
-
-	u8 *exitPtrs[2];     // to be able to rewrite the exit jum
-	u32 exitAddress[2];  // 0xFFFFFFFF == unknown
-
-	u32 originalAddress;
-	u32 originalFirstOpcode; //to be able to restore
-	u32 codeSize; 
-	u32 originalSize;
-	int runCount;  // for profiling.
-	int blockNum;
-	int flags;
-
-	bool invalid;
-	bool linkStatus[2];
-	bool ContainsAddress(u32 em_address);
-
-#ifdef _WIN32
-	// we don't really need to save start and stop
-	// TODO (mb2): ticStart and ticStop -> "local var" mean "in block" ... low priority ;)
-	u64 ticStart;		// for profiling - time.
-	u64 ticStop;		// for profiling - time.
-	u64 ticCounter;	// for profiling - time.
-#endif
-
-#ifdef USE_VTUNE
-	char blockName[32];
-#endif
-};
-
-typedef void (*CompiledCode)();
-
-
-class JitBaseBlockCache
-{
-	const u8 **blockCodePointers;
-	JitBlock *blocks;
-	int num_blocks;
-	std::multimap<u32, int> links_to;
-	std::map<std::pair<u32,u32>, u32> block_map; // (end_addr, start_addr) -> number
-	std::bitset<0x20000000 / 32> valid_block;
-#ifdef JIT_UNLIMITED_ICACHE
-	u8 *iCache;
-	u8 *iCacheEx;
-	u8 *iCacheVMEM;
-#endif
-	int MAX_NUM_BLOCKS;
-
-	bool RangeIntersect(int s1, int e1, int s2, int e2) const;
-	void LinkBlockExits(int i);
-	void LinkBlock(int i);
-	void UnlinkBlock(int i);
-	
-	// Virtual for overloaded
-	virtual void WriteLinkBlock(u8* location, const u8* address) = 0;
-	virtual void WriteDestroyBlock(const u8* location, u32 address) = 0;
-
-public:
-	JitBaseBlockCache() :
-		blockCodePointers(0), blocks(0), num_blocks(0),
-#ifdef JIT_UNLIMITED_ICACHE	
-		iCache(0), iCacheEx(0), iCacheVMEM(0), 
-#endif
-		MAX_NUM_BLOCKS(0) { }
-	int AllocateBlock(u32 em_address);
-	void FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr);
-
-	void Clear();
-	void ClearSafe();
-	void Init();
-	void Shutdown();
-	void Reset();
-
-	bool IsFull() const;
-
-	// Code Cache
-	JitBlock *GetBlock(int block_num);
-	int GetNumBlocks() const;
-	const u8 **GetCodePointers();
-#ifdef JIT_UNLIMITED_ICACHE
-	u8 *GetICache();
-	u8 *GetICacheEx();
-	u8 *GetICacheVMEM();
-#endif
-
-	// Fast way to get a block. Only works on the first ppc instruction of a block.
-	int GetBlockNumberFromStartAddress(u32 em_address);
-
-	// slower, but can get numbers from within blocks, not just the first instruction.
-	// WARNING! WILL NOT WORK WITH INLINING ENABLED (not yet a feature but will be soon)
-	// Returns a list of block numbers - only one block can start at a particular address, but they CAN overlap.
-	// This one is slow so should only be used for one-shots from the debugger UI, not for anything during runtime.
-	void GetBlockNumbersFromAddress(u32 em_address, std::vector<int> *block_numbers);
-
-	u32 GetOriginalFirstOp(int block_num);
-	CompiledCode GetCompiledCodeFromBlock(int block_num);
-
-	// DOES NOT WORK CORRECTLY WITH INLINING
-	void InvalidateICache(u32 address, const u32 length);
-	void DestroyBlock(int block_num, bool invalidate);
-
-	// Not currently used
-	//void DestroyBlocksWithFlag(BlockFlag death_flag);
-};
-
-// x86 BlockCache
-class JitBlockCache : public JitBaseBlockCache
-{
-private:
-	void WriteLinkBlock(u8* location, const u8* address);
-	void WriteDestroyBlock(const u8* location, u32 address);
-};
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
deleted file mode 100644
index 18c8044385..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thunk.h"
-
-#include "CPUDetect.h"
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "JitBase.h"
-#include "Jit_Util.h"
-
-using namespace Gen;
-
-static const u8 GC_ALIGNED16(pbswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-static u32 GC_ALIGNED16(float_buffer);
-
-void EmuCodeBlock::UnsafeLoadRegToReg(X64Reg reg_addr, X64Reg reg_value, int accessSize, s32 offset, bool signExtend)
-{
-#ifdef _M_X64
-	MOVZX(32, accessSize, reg_value, MComplex(RBX, reg_addr, SCALE_1, offset));
-#else
-	AND(32, R(reg_addr), Imm32(Memory::MEMVIEW32_MASK));
-	MOVZX(32, accessSize, reg_value, MDisp(reg_addr, (u32)Memory::base + offset));
-#endif
-	if (accessSize == 32)
-	{
-		BSWAP(32, reg_value);
-	}
-	else if (accessSize == 16)
-	{
-		BSWAP(32, reg_value);
-		if (signExtend)
-			SAR(32, R(reg_value), Imm8(16));
-		else
-			SHR(32, R(reg_value), Imm8(16));
-	}
-	else if (signExtend)
-	{
-		// TODO: bake 8-bit into the original load.
-		MOVSX(32, accessSize, reg_value, R(reg_value));
-	}
-}
-
-void EmuCodeBlock::UnsafeLoadRegToRegNoSwap(X64Reg reg_addr, X64Reg reg_value, int accessSize, s32 offset)
-{
-#ifdef _M_X64
-	MOVZX(32, accessSize, reg_value, MComplex(RBX, reg_addr, SCALE_1, offset));
-#else
-	AND(32, R(reg_addr), Imm32(Memory::MEMVIEW32_MASK));
-	MOVZX(32, accessSize, reg_value, MDisp(reg_addr, (u32)Memory::base + offset));
-#endif
-}
-
-void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend)
-{
-#ifdef _M_X64
-	if (opAddress.IsSimpleReg())
-	{
-		MOVZX(32, accessSize, EAX, MComplex(RBX, opAddress.GetSimpleReg(), SCALE_1, offset));
-	}
-	else
-	{
-		MOV(32, R(EAX), opAddress);
-		MOVZX(32, accessSize, EAX, MComplex(RBX, EAX, SCALE_1, offset));
-	}
-#else
-	if (opAddress.IsImm())
-	{
-		MOVZX(32, accessSize, EAX, M(Memory::base + (((u32)opAddress.offset + offset) & Memory::MEMVIEW32_MASK)));
-	}
-	else
-	{
-		if (!opAddress.IsSimpleReg(EAX))
-			MOV(32, R(EAX), opAddress);
-		AND(32, R(EAX), Imm32(Memory::MEMVIEW32_MASK));
-		MOVZX(32, accessSize, EAX, MDisp(EAX, (u32)Memory::base + offset));
-	}
-#endif
-
-	// Add a 2 bytes NOP to have some space for the backpatching
-	if (accessSize == 8)
-		NOP(2);
-
-	if (accessSize == 32)
-	{
-		BSWAP(32, EAX);
-	}
-	else if (accessSize == 16)
-	{
-		BSWAP(32, EAX);
-		if (signExtend)
-			SAR(32, R(EAX), Imm8(16));
-		else
-			SHR(32, R(EAX), Imm8(16));
-	}
-	else if (signExtend)
-	{
-		// TODO: bake 8-bit into the original load.
-		MOVSX(32, accessSize, EAX, R(EAX));
-	}
-}
-
-void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend)
-{
-#if defined(_M_X64)
-#ifdef ENABLE_MEM_CHECK
-	if (!Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging && Core::g_CoreStartupParameter.bFastmem)
-#else
-	if (!Core::g_CoreStartupParameter.bMMU && Core::g_CoreStartupParameter.bFastmem)
-#endif
-	{
-		UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend);
-	}
-	else
-#endif
-	{
-		u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
-		if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-		{
-			mem_mask |= Memory::ADDR_MASK_MEM1;
-		}
-
-#ifdef ENABLE_MEM_CHECK
-		if (Core::g_CoreStartupParameter.bEnableDebugging)
-		{
-			mem_mask |= Memory::EXRAM_MASK;
-		}
-#endif
-
-		if (opAddress.IsImm())
-		{
-			u32 address = (u32)opAddress.offset + offset;
-			if ((address & mem_mask) == 0)
-			{
-				UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend);
-			}
-			else
-			{
-				switch (accessSize)
-				{
-				case 32: ABI_CallFunctionC(thunks.ProtectFunction((void *)&Memory::Read_U32, 1), address); break;
-				case 16: ABI_CallFunctionC(thunks.ProtectFunction((void *)&Memory::Read_U16_ZX, 1), address); break;
-				case 8:  ABI_CallFunctionC(thunks.ProtectFunction((void *)&Memory::Read_U8_ZX, 1), address); break;
-				}
-				if (signExtend && accessSize < 32)
-				{
-					// Need to sign extend values coming from the Read_U* functions.
-					MOVSX(32, accessSize, EAX, R(EAX));
-				}
-			}
-		}
-		else
-		{
-			if (offset)
-			{
-				MOV(32, R(EAX), opAddress);
-				ADD(32, R(EAX), Imm32(offset));
-				TEST(32, R(EAX), Imm32(mem_mask));
-				FixupBranch fast = J_CC(CC_Z);
-
-				switch (accessSize)
-				{
-				case 32: ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U32, 1), EAX); break;
-				case 16: ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U16_ZX, 1), EAX); break;
-				case 8:  ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U8_ZX, 1), EAX);  break;
-				}
-				if (signExtend && accessSize < 32)
-				{
-					// Need to sign extend values coming from the Read_U* functions.
-					MOVSX(32, accessSize, EAX, R(EAX));
-				}
-
-				FixupBranch exit = J();
-				SetJumpTarget(fast);
-				UnsafeLoadToEAX(R(EAX), accessSize, 0, signExtend);
-				SetJumpTarget(exit);
-			}
-			else
-			{
-				TEST(32, opAddress, Imm32(mem_mask));
-				FixupBranch fast = J_CC(CC_Z);
-
-				switch (accessSize)
-				{
-				case 32: ABI_CallFunctionA(thunks.ProtectFunction((void *)&Memory::Read_U32, 1), opAddress); break;
-				case 16: ABI_CallFunctionA(thunks.ProtectFunction((void *)&Memory::Read_U16_ZX, 1), opAddress); break;
-				case 8:  ABI_CallFunctionA(thunks.ProtectFunction((void *)&Memory::Read_U8_ZX, 1), opAddress);  break;
-				}
-				if (signExtend && accessSize < 32)
-				{
-					// Need to sign extend values coming from the Read_U* functions.
-					MOVSX(32, accessSize, EAX, R(EAX));
-				}
-
-				FixupBranch exit = J();
-				SetJumpTarget(fast);
-				UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend);
-				SetJumpTarget(exit);
-			}
-		}
-	}
-}
-
-void EmuCodeBlock::UnsafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int accessSize, s32 offset, bool swap)
-{
-	if (accessSize == 8 && reg_value >= 4) {
-		PanicAlert("WARNING: likely incorrect use of UnsafeWriteRegToReg!");
-	}
-	if (swap) BSWAP(accessSize, reg_value);
-#ifdef _M_X64
-	MOV(accessSize, MComplex(RBX, reg_addr, SCALE_1, offset), R(reg_value));
-#else
-	AND(32, R(reg_addr), Imm32(Memory::MEMVIEW32_MASK));
-	MOV(accessSize, MDisp(reg_addr, (u32)Memory::base + offset), R(reg_value));
-#endif
-}
-
-// Destroys both arg registers
-void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int accessSize, s32 offset, bool swap)
-{
-	if (offset)
-		ADD(32, R(reg_addr), Imm32((u32)offset));
-
-	u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
-
-	if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-	{
-		mem_mask |= Memory::ADDR_MASK_MEM1;
-	}
-
-#ifdef ENABLE_MEM_CHECK
-	if (Core::g_CoreStartupParameter.bEnableDebugging)
-	{
-		mem_mask |= Memory::EXRAM_MASK;
-	}
-#endif
-
-	TEST(32, R(reg_addr), Imm32(mem_mask));
-	FixupBranch fast = J_CC(CC_Z);
-	MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-	switch (accessSize)
-	{
-	case 32: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), 2), reg_value, reg_addr); break;
-	case 16: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), 2), reg_value, reg_addr); break;
-	case 8:  ABI_CallFunctionRR(thunks.ProtectFunction((void *)&Memory::Write_U8, 2), reg_value, reg_addr);  break;
-	}
-	FixupBranch exit = J();
-	SetJumpTarget(fast);
-	UnsafeWriteRegToReg(reg_value, reg_addr, accessSize, 0, swap);
-	SetJumpTarget(exit);
-}
-
-void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr)
-{
-	if (false && cpu_info.bSSSE3) {
-		// This path should be faster but for some reason it causes errors so I've disabled it.
-		u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
-
-		if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-			mem_mask |= Memory::ADDR_MASK_MEM1;
-
-#ifdef ENABLE_MEM_CHECK
-		if (Core::g_CoreStartupParameter.bEnableDebugging)
-			mem_mask |= Memory::EXRAM_MASK;
-#endif
-		TEST(32, R(reg_addr), Imm32(mem_mask));
-		FixupBranch argh = J_CC(CC_Z);
-		MOVSS(M(&float_buffer), xmm_value);
-		MOV(32, R(EAX), M(&float_buffer));
-		BSWAP(32, EAX);
-		MOV(32, M(&PC), Imm32(jit->js.compilerPC)); // Helps external systems know which instruction triggered the write
-		ABI_CallFunctionRR(thunks.ProtectFunction(((void *)&Memory::Write_U32), 2), EAX, reg_addr);
-		FixupBranch arg2 = J();
-		SetJumpTarget(argh);
-		PSHUFB(xmm_value, M((void *)pbswapShuffle1x4));
-#ifdef _M_X64
-		MOVD_xmm(MComplex(RBX, reg_addr, SCALE_1, 0), xmm_value);
-#else
-		AND(32, R(reg_addr), Imm32(Memory::MEMVIEW32_MASK));
-		MOVD_xmm(MDisp(reg_addr, (u32)Memory::base), xmm_value);
-#endif
-		SetJumpTarget(arg2);
-	} else {
-		MOVSS(M(&float_buffer), xmm_value);
-		MOV(32, R(EAX), M(&float_buffer));
-		SafeWriteRegToReg(EAX, reg_addr, 32, 0, true);
-	}
-}
-
-void EmuCodeBlock::WriteToConstRamAddress(int accessSize, const Gen::OpArg& arg, u32 address)
-{
-#ifdef _M_X64
- 	MOV(accessSize, MDisp(RBX, address & 0x3FFFFFFF), arg);
-#else
-	MOV(accessSize, M((void*)(Memory::base + (address & Memory::MEMVIEW32_MASK))), arg);
-#endif
-}
-
-void EmuCodeBlock::WriteFloatToConstRamAddress(const Gen::X64Reg& xmm_reg, u32 address)
-{
-#ifdef _M_X64
-	MOV(32, R(RAX), Imm32(address));
-	MOVSS(MComplex(RBX, RAX, 1, 0), xmm_reg);
-#else
-	MOVSS(M((void*)((u32)Memory::base + (address & Memory::MEMVIEW32_MASK))), xmm_reg);
-#endif
-}
-
-void EmuCodeBlock::ForceSinglePrecisionS(X64Reg xmm) {
-	// Most games don't need these. Zelda requires it though - some platforms get stuck without them.
-	if (jit->jo.accurateSinglePrecision)
-	{
-		CVTSD2SS(xmm, R(xmm));
-		CVTSS2SD(xmm, R(xmm));
-	}
-}
-
-void EmuCodeBlock::ForceSinglePrecisionP(X64Reg xmm) {
-	// Most games don't need these. Zelda requires it though - some platforms get stuck without them.
-	if (jit->jo.accurateSinglePrecision)
-	{
-		CVTPD2PS(xmm, R(xmm));
-		CVTPS2PD(xmm, R(xmm));
-	}
-}
-
-void EmuCodeBlock::JitClearCA()
-{
-	AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK)); //XER.CA = 0
-}
-
-void EmuCodeBlock::JitSetCA()
-{
-	OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_CA_MASK)); //XER.CA = 1
-}
-
-void EmuCodeBlock::JitClearCAOV(bool oe)
-{
-	if (oe)
-		AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK & ~XER_OV_MASK)); //XER.CA, XER.OV = 0
-	else
-		AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK)); //XER.CA = 0
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
deleted file mode 100644
index 7708ab8598..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included./
-
-#ifndef _JITUTIL_H
-#define _JITUTIL_H
-
-#include "x64Emitter.h"
-#include "Thunk.h"
-
-// Like XCodeBlock but has some utilities for memory access.
-class EmuCodeBlock : public Gen::XCodeBlock {
-public:
-	void UnsafeLoadRegToReg(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset = 0, bool signExtend = false);
-	void UnsafeLoadRegToRegNoSwap(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset);
-	void UnsafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset = 0, bool swap = true);
-	void UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend);
-	void SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend);
-	void SafeWriteRegToReg(Gen::X64Reg reg_value, Gen::X64Reg reg_addr, int accessSize, s32 offset, bool swap = true);
-
-	// Trashes both inputs and EAX.
-	void SafeWriteFloatToReg(Gen::X64Reg xmm_value, Gen::X64Reg reg_addr);
-
-	void WriteToConstRamAddress(int accessSize, const Gen::OpArg& arg, u32 address);
-	void WriteFloatToConstRamAddress(const Gen::X64Reg& xmm_reg, u32 address);
-	void JitClearCA();
-	void JitSetCA();
-	void JitClearCAOV(bool oe);
-
-	void ForceSinglePrecisionS(Gen::X64Reg xmm);
-	void ForceSinglePrecisionP(Gen::X64Reg xmm);
-protected:
-	ThunkManager thunks;
-};
-
-#endif  // _JITUTIL_H
diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.cpp b/Source/Core/Core/Src/PowerPC/JitInterface.cpp
deleted file mode 100644
index 787ffebb6e..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitInterface.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "JitInterface.h"
-#include "JitCommon/JitBase.h"
-
-#ifndef _M_GENERIC
-#include "Jit64IL/JitIL.h"
-#include "Jit64/Jit.h"
-#include "Jit64/Jit64_Tables.h"
-#include "Jit64IL/JitIL_Tables.h"
-#endif
-
-#ifdef _M_ARM
-#include "JitArm32/Jit.h"
-#include "JitArm32/JitArm_Tables.h"
-#endif
-
-#include "Profiler.h"
-#include "PPCSymbolDB.h"
-#include "HW/Memmap.h"
-#include "ConfigManager.h"
-
-bool bFakeVMEM = false;
-bool bMMU = false;
-
-namespace JitInterface
-{
-	void DoState(PointerWrap &p)
-	{
-		if (jit && p.GetMode() == PointerWrap::MODE_READ)
-			jit->GetBlockCache()->ClearSafe();
-	}
-	CPUCoreBase *InitJitCore(int core)
-	{
-		bFakeVMEM = SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack == 1;
-		bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
-	
-		CPUCoreBase *ptr = NULL;
-		switch(core)
-		{
-			#ifndef _M_GENERIC
-			case 1:
-			{
-				ptr = new Jit64();
-				break;
-			}
-			case 2:
-			{
-				ptr = new JitIL();
-				break;
-			}
-			#endif
-			#ifdef _M_ARM
-			case 3:
-			{
-				ptr = new JitArm();
-				break;
-			}
-			#endif
-			default:
-			{
-				PanicAlert("Unrecognizable cpu_core: %d", core);
-				jit = NULL;
-				return NULL;
-				break;
-			}
-		}
-		jit = static_cast<JitBase*>(ptr);
-		jit->Init();
-		return ptr;
-	}
-	void InitTables(int core)
-	{
-		switch(core)
-		{
-			#ifndef _M_GENERIC
-			case 1:
-			{
-				Jit64Tables::InitTables();
-				break;
-			}
-			case 2:
-			{
-				JitILTables::InitTables();
-				break;
-			}
-			#endif
-			#ifdef _M_ARM
-			case 3:
-			{
-				JitArmTables::InitTables();
-				break;
-			}
-			#endif
-			default:
-			{
-				PanicAlert("Unrecognizable cpu_core: %d", core);
-				break;
-			}
-		}
-	}
-	CPUCoreBase *GetCore()
-	{
-		return jit;
-	}
-
-	void WriteProfileResults(const char *filename)
-	{
-		// Can't really do this with no jit core available
-		#ifndef _M_GENERIC
-		
-		std::vector<BlockStat> stats;
-		stats.reserve(jit->GetBlockCache()->GetNumBlocks());
-		u64 cost_sum = 0;
-	#ifdef _WIN32
-		u64 timecost_sum = 0;
-		u64 countsPerSec;
-		QueryPerformanceFrequency((LARGE_INTEGER *)&countsPerSec);
-	#endif
-		for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++)
-		{
-			const JitBlock *block = jit->GetBlockCache()->GetBlock(i);
-			// Rough heuristic.  Mem instructions should cost more.
-			u64 cost = block->originalSize * (block->runCount / 4);
-	#ifdef _WIN32
-			u64 timecost = block->ticCounter;
-	#endif
-			// Todo: tweak.
-			if (block->runCount >= 1)
-				stats.push_back(BlockStat(i, cost));
-			cost_sum += cost;
-	#ifdef _WIN32
-			timecost_sum += timecost;
-	#endif
-		}
-
-		sort(stats.begin(), stats.end());
-		File::IOFile f(filename, "w");
-		if (!f)
-		{
-			PanicAlert("Failed to open %s", filename);
-			return;
-		}
-		fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n");
-		for (unsigned int i = 0; i < stats.size(); i++)
-		{
-			const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum);
-			if (block)
-			{
-				std::string name = g_symbolDB.GetDescription(block->originalAddress);
-				double percent = 100.0 * (double)stats[i].cost / (double)cost_sum;
-	#ifdef _WIN32 
-				double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum;
-				fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", 
-						block->originalAddress, name.c_str(), stats[i].cost,
-						block->ticCounter, percent, timePercent,
-						(double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize);
-	#else
-				fprintf(f.GetHandle(), "%08x\t%s\t%llu\t???\t%.2lf\t???\t???\t%i\n", 
-						block->originalAddress, name.c_str(), stats[i].cost,  percent, block->codeSize);
-	#endif
-			}
-		}
-		#endif
-	}
-	bool IsInCodeSpace(u8 *ptr)
-	{
-		return jit->IsInCodeSpace(ptr);
-	}
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx)
-	{
-		return jit->BackPatch(codePtr, em_address, ctx);
-	}
-
-	void ClearCache()
-	{
-		if (jit)
-			jit->ClearCache();
-	}
-	void ClearSafe()
-	{
-		if (jit)
-			jit->GetBlockCache()->ClearSafe();
-	}
-
-	void InvalidateICache(u32 address, u32 size)
-	{
-		if (jit)
-			jit->GetBlockCache()->InvalidateICache(address, size);
-	}
-
-
-	// Memory functions
-	u32 Read_Opcode_JIT_Uncached(const u32 _Address)
-	{
-		u8* iCache;
-		u32 addr;
-		if (_Address & JIT_ICACHE_VMEM_BIT)
-		{
-			iCache = jit->GetBlockCache()->GetICacheVMEM();
-			addr = _Address & JIT_ICACHE_MASK;
-		}
-		else if (_Address & JIT_ICACHE_EXRAM_BIT)
-		{
-			iCache = jit->GetBlockCache()->GetICacheEx();
-			addr = _Address & JIT_ICACHEEX_MASK;
-		}
-		else
-		{
-			iCache = jit->GetBlockCache()->GetICache();
-			addr = _Address & JIT_ICACHE_MASK;
-		}
-		u32 inst = *(u32*)(iCache + addr);
-		if (inst == JIT_ICACHE_INVALID_WORD)
-		{
-			u32 cache_block_start = addr & ~0x1f;
-			u32 mem_block_start = _Address & ~0x1f;
-			u8 *pMem = Memory::GetPointer(mem_block_start);
-			memcpy(iCache + cache_block_start, pMem, 32);
-			inst = *(u32*)(iCache + addr);
-		}
-		inst = Common::swap32(inst);
-
-		if ((inst & 0xfc000000) == 0)
-		{
-			inst = jit->GetBlockCache()->GetOriginalFirstOp(inst);
-		}
-
-		return inst;
-	}
-
-	u32 Read_Opcode_JIT(u32 _Address)
-	{
-	#ifdef FAST_ICACHE	
-		if (bMMU && !bFakeVMEM && (_Address & Memory::ADDR_MASK_MEM1))
-		{
-			_Address = Memory::TranslateAddress(_Address, Memory::FLAG_OPCODE);
-			if (_Address == 0)
-			{
-				return 0;
-			}
-		}
-		u32 inst = 0;
-
-		// Bypass the icache for the external interrupt exception handler
-		if ( (_Address & 0x0FFFFF00) == 0x00000500 )
-			inst = Read_Opcode_JIT_Uncached(_Address);
-		else
-			inst = PowerPC::ppcState.iCache.ReadInstruction(_Address);
-	#else
-		u32 inst = Memory::ReadUnchecked_U32(_Address);
-	#endif
-		return inst;
-	}
-
-	// The following function is deprecated in favour of FAST_ICACHE
-	u32 Read_Opcode_JIT_LC(const u32 _Address)
-	{
-	#ifdef JIT_UNLIMITED_ICACHE	
-		if ((_Address & ~JIT_ICACHE_MASK) != 0x80000000 && (_Address & ~JIT_ICACHE_MASK) != 0x00000000 &&
-			(_Address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area
-			(_Address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (_Address & ~JIT_ICACHEEX_MASK) != 0x10000000)
-		{
-			PanicAlertT("iCacheJIT: Reading Opcode from %x. Please report.", _Address);
-			ERROR_LOG(MEMMAP, "iCacheJIT: Reading Opcode from %x. Please report.", _Address);
-			return 0;
-		}
-		u8* iCache;
-		u32 addr;
-		if (_Address & JIT_ICACHE_VMEM_BIT)
-		{		
-			iCache = jit->GetBlockCache()->GetICacheVMEM();
-			addr = _Address & JIT_ICACHE_MASK;
-		}
-		else if (_Address & JIT_ICACHE_EXRAM_BIT)
-		{		
-			iCache = jit->GetBlockCache()->GetICacheEx();
-			addr = _Address & JIT_ICACHEEX_MASK;
-		}
-		else
-		{
-			iCache = jit->GetBlockCache()->GetICache();
-			addr = _Address & JIT_ICACHE_MASK;
-		}
-		u32 inst = *(u32*)(iCache + addr);
-		if (inst == JIT_ICACHE_INVALID_WORD)
-			inst = Memory::ReadUnchecked_U32(_Address);
-		else
-			inst = Common::swap32(inst);
-	#else
-		u32 inst = Memory::ReadUnchecked_U32(_Address);
-	#endif
-		if ((inst & 0xfc000000) == 0)
-		{
-			inst = jit->GetBlockCache()->GetOriginalFirstOp(inst);
-		}	
-		return inst;
-	}
-
-	// WARNING! No checks!
-	// We assume that _Address is cached
-	void Write_Opcode_JIT(const u32 _Address, const u32 _Value)
-	{
-	#ifdef JIT_UNLIMITED_ICACHE
-		if (_Address & JIT_ICACHE_VMEM_BIT)
-		{
-			*(u32*)(jit->GetBlockCache()->GetICacheVMEM() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value);		
-		}
-		else if (_Address & JIT_ICACHE_EXRAM_BIT)
-		{
-			*(u32*)(jit->GetBlockCache()->GetICacheEx() + (_Address & JIT_ICACHEEX_MASK)) = Common::swap32(_Value);		
-		}
-		else
-			*(u32*)(jit->GetBlockCache()->GetICache() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value);
-	#else
-		Memory::WriteUnchecked_U32(_Value, _Address);
-	#endif	
-	}
-
-	
-	void Shutdown()
-	{
-		if (jit)
-		{
-			jit->Shutdown();
-			delete jit;
-			jit = NULL;
-		}
-	}
-}
diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.h b/Source/Core/Core/Src/PowerPC/JitInterface.h
deleted file mode 100644
index a0b7d62291..0000000000
--- a/Source/Core/Core/Src/PowerPC/JitInterface.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "ChunkFile.h"
-#include "CPUCoreBase.h"
-
-namespace JitInterface
-{
-	void DoState(PointerWrap &p);
-	
-	CPUCoreBase *InitJitCore(int core);
-	void InitTables(int core);
-	CPUCoreBase *GetCore();
-
-	// Debugging
-	void WriteProfileResults(const char *filename);
-
-	// Memory Utilities
-	bool IsInCodeSpace(u8 *ptr);
-	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx);
-
-	// used by JIT to read instructions
-	u32 Read_Opcode_JIT(const u32 _Address);
-	// used by JIT. uses iCacheJIT. Reads in the "Locked cache" mode
-	u32 Read_Opcode_JIT_LC(const u32 _Address);
-	void Write_Opcode_JIT(const u32 _Address, const u32 _Value);
-
-	// Clearing CodeCache
-	void ClearCache();
-	
-	void ClearSafe();
-
-	void InvalidateICache(u32 address, u32 size);
-	
-	void Shutdown();
-}
-extern bool bFakeVMEM;
-extern bool bMMU;
-
diff --git a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp
deleted file mode 100644
index 89aaf33eb2..0000000000
--- a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp
+++ /dev/null
@@ -1,21857 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Gekko related unions, structs, ...
-
-#include "LUT_frsqrtex.h"
-
-const unsigned int frsqrtex_lut[65536] = {
-	0x69FA0000, 0x69F8A600, 0x69F74C00,
-	0x69F5F200, 0x69F49800, 0x69F33E00,
-	0x69F1E400, 0x69F08A00, 0x69EF3000,
-	0x69EDD600, 0x69EC7C00, 0x69EB2200,
-	0x69E9C800, 0x69E86E00, 0x69E71400,
-	0x69E5BA00, 0x69E46000, 0x69E30600,
-	0x69E1AC00, 0x69E05200, 0x69DEF800,
-	0x69DD9E00, 0x69DC4400, 0x69DAEA00,
-	0x69D99000, 0x69D83600, 0x69D6DC00,
-	0x69D58200, 0x69D42800, 0x69D2CE00,
-	0x69D17400, 0x69D01A00, 0x69CEC000,
-	0x69CD6600, 0x69CC0C00, 0x69CAB200,
-	0x69C95800, 0x69C7FE00, 0x69C6A400,
-	0x69C54A00, 0x69C3F000, 0x69C29600,
-	0x69C13C00, 0x69BFE200, 0x69BE8800,
-	0x69BD2E00, 0x69BBD400, 0x69BA7A00,
-	0x69B92000, 0x69B7C600, 0x69B66C00,
-	0x69B51200, 0x69B3B800, 0x69B25E00,
-	0x69B10400, 0x69AFAA00, 0x69AE5000,
-	0x69ACF600, 0x69AB9C00, 0x69AA4200,
-	0x69A8E800, 0x69A78E00, 0x69A63400,
-	0x69A4DA00, 0x69A38000, 0x69A22600,
-	0x69A0CC00, 0x699F7200, 0x699E1800,
-	0x699CBE00, 0x699B6400, 0x699A0A00,
-	0x6998B000, 0x69975600, 0x6995FC00,
-	0x6994A200, 0x69934800, 0x6991EE00,
-	0x69909400, 0x698F3A00, 0x698DE000,
-	0x698C8600, 0x698B2C00, 0x6989D200,
-	0x69887800, 0x69871E00, 0x6985C400,
-	0x69846A00, 0x69831000, 0x6981B600,
-	0x69805C00, 0x697F0200, 0x697DA800,
-	0x697C4E00, 0x697AF400, 0x69799A00,
-	0x69784000, 0x6976E600, 0x69758C00,
-	0x69743200, 0x6972D800, 0x69717E00,
-	0x69702400, 0x696ECA00, 0x696D7000,
-	0x696C1600, 0x696ABC00, 0x69696200,
-	0x69680800, 0x6966AE00, 0x69655400,
-	0x6963FA00, 0x6962A000, 0x69614600,
-	0x695FEC00, 0x695E9200, 0x695D3800,
-	0x695BDE00, 0x695A8400, 0x69592A00,
-	0x6957D000, 0x69567600, 0x69551C00,
-	0x6953C200, 0x69526800, 0x69510E00,
-	0x694FB400, 0x694E5A00, 0x694D0000,
-	0x694BA600, 0x694A4C00, 0x6948F200,
-	0x69479800, 0x69463E00, 0x6944E400,
-	0x69438A00, 0x69423000, 0x6940D600,
-	0x693F7C00, 0x693E2200, 0x693CC800,
-	0x693B6E00, 0x693A1400, 0x6938BA00,
-	0x69376000, 0x69360600, 0x6934AC00,
-	0x69335200, 0x6931F800, 0x69309E00,
-	0x692F4400, 0x692DEA00, 0x692C9000,
-	0x692B3600, 0x6929DC00, 0x69288200,
-	0x69272800, 0x6925CE00, 0x69247400,
-	0x69231A00, 0x6921C000, 0x69206600,
-	0x691F0C00, 0x691DB200, 0x691C5800,
-	0x691AFE00, 0x6919A400, 0x69184A00,
-	0x6916F000, 0x69159600, 0x69143C00,
-	0x6912E200, 0x69118800, 0x69102E00,
-	0x690ED400, 0x690D7A00, 0x690C2000,
-	0x690AC600, 0x69096C00, 0x69081200,
-	0x6906B800, 0x69055E00, 0x69040400,
-	0x6902AA00, 0x69015000, 0x68FFF600,
-	0x68FE9C00, 0x68FD4200, 0x68FBE800,
-	0x68FA8E00, 0x68F93400, 0x68F7DA00,
-	0x68F68000, 0x68F52600, 0x68F3CC00,
-	0x68F27200, 0x68F11800, 0x68EFBE00,
-	0x68EE6400, 0x68ED0A00, 0x68EBB000,
-	0x68EA5600, 0x68E8FC00, 0x68E7A200,
-	0x68E64800, 0x68E4EE00, 0x68E39400,
-	0x68E23A00, 0x68E0E000, 0x68DF8600,
-	0x68DE2C00, 0x68DCD200, 0x68DB7800,
-	0x68DA1E00, 0x68D8C400, 0x68D76A00,
-	0x68D61000, 0x68D4B600, 0x68D35C00,
-	0x68D20200, 0x68D0A800, 0x68CF4E00,
-	0x68CDF400, 0x68CC9A00, 0x68CB4000,
-	0x68C9E600, 0x68C88C00, 0x68C73200,
-	0x68C5D800, 0x68C47E00, 0x68C32400,
-	0x68C1CA00, 0x68C07000, 0x68BF1600,
-	0x68BDBC00, 0x68BC6200, 0x68BB0800,
-	0x68B9AE00, 0x68B85400, 0x68B6FA00,
-	0x68B5A000, 0x68B44600, 0x68B2EC00,
-	0x68B19200, 0x68B03800, 0x68AEDE00,
-	0x68AD8400, 0x68AC2A00, 0x68AAD000,
-	0x68A97600, 0x68A81C00, 0x68A6C200,
-	0x68A56800, 0x68A40E00, 0x68A2B400,
-	0x68A15A00, 0x68A00000, 0x689EA600,
-	0x689D4C00, 0x689BF200, 0x689A9800,
-	0x68993E00, 0x6897E400, 0x68968A00,
-	0x68953000, 0x6893D600, 0x68927C00,
-	0x68912200, 0x688FC800, 0x688E6E00,
-	0x688D1400, 0x688BBA00, 0x688A6000,
-	0x68890600, 0x6887AC00, 0x68865200,
-	0x6884F800, 0x68839E00, 0x68824400,
-	0x6880EA00, 0x687F9000, 0x687E3600,
-	0x687CDC00, 0x687B8200, 0x687A2800,
-	0x6878CE00, 0x68777400, 0x68761A00,
-	0x6874C000, 0x68736600, 0x68720C00,
-	0x6870B200, 0x686F5800, 0x686DFE00,
-	0x686CA400, 0x686B4A00, 0x6869F000,
-	0x68689600, 0x68673C00, 0x6865E200,
-	0x68648800, 0x68632E00, 0x6861D400,
-	0x68607A00, 0x685F2000, 0x685DC600,
-	0x685C6C00, 0x685B1200, 0x6859B800,
-	0x68585E00, 0x68570400, 0x6855AA00,
-	0x68545000, 0x6852F600, 0x68519C00,
-	0x68504200, 0x684EE800, 0x684D8E00,
-	0x684C3400, 0x684ADA00, 0x68498000,
-	0x68482600, 0x6846CC00, 0x68457200,
-	0x68441800, 0x6842BE00, 0x68416400,
-	0x68400A00, 0x683EB000, 0x683D5600,
-	0x683BFC00, 0x683AA200, 0x68394800,
-	0x6837EE00, 0x68369400, 0x68353A00,
-	0x6833E000, 0x68328600, 0x68312C00,
-	0x682FD200, 0x682E7800, 0x682D1E00,
-	0x682BC400, 0x682A6A00, 0x68291000,
-	0x6827B600, 0x68265C00, 0x68250200,
-	0x6823A800, 0x68224E00, 0x6820F400,
-	0x681F9A00, 0x681E4000, 0x681CE600,
-	0x681B8C00, 0x681A3200, 0x6818D800,
-	0x68177E00, 0x68162400, 0x6814CA00,
-	0x68137000, 0x68121600, 0x6810BC00,
-	0x680F6200, 0x680E0800, 0x680CAE00,
-	0x680B5400, 0x6809FA00, 0x6808A000,
-	0x68074600, 0x6805EC00, 0x68049200,
-	0x68033800, 0x6801DE00, 0x68008400,
-	0x67FF2A00, 0x67FDD000, 0x67FC7600,
-	0x67FB1C00, 0x67F9C200, 0x67F86800,
-	0x67F70E00, 0x67F5B400, 0x67F45A00,
-	0x67F30000, 0x67F1A600, 0x67F04C00,
-	0x67EEF200, 0x67ED9800, 0x67EC3E00,
-	0x67EAE400, 0x67E98A00, 0x67E83000,
-	0x67E6D600, 0x67E57C00, 0x67E42200,
-	0x67E2C800, 0x67E16E00, 0x67E01400,
-	0x67DEBA00, 0x67DD6000, 0x67DC0600,
-	0x67DAAC00, 0x67D95200, 0x67D7F800,
-	0x67D69E00, 0x67D54400, 0x67D3EA00,
-	0x67D29000, 0x67D13600, 0x67CFDC00,
-	0x67CE8200, 0x67CD2800, 0x67CBCE00,
-	0x67CA7400, 0x67C91A00, 0x67C7C000,
-	0x67C66600, 0x67C50C00, 0x67C3B200,
-	0x67C25800, 0x67C0FE00, 0x67BFA400,
-	0x67BE4A00, 0x67BCF000, 0x67BB9600,
-	0x67BA3C00, 0x67B8E200, 0x67B78800,
-	0x67B62E00, 0x67B4D400, 0x67B37A00,
-	0x67B22000, 0x67B0C600, 0x67AF6C00,
-	0x67AE1200, 0x67ACB800, 0x67AB5E00,
-	0x67AA0400, 0x67A8AA00, 0x67A75000,
-	0x67A5F600, 0x67A49C00, 0x67A34200,
-	0x67A1E800, 0x67A08E00, 0x679F3400,
-	0x679DDA00, 0x679C8000, 0x679B2600,
-	0x6799CC00, 0x67987200, 0x67971800,
-	0x6795BE00, 0x67946400, 0x67930A00,
-	0x6791B000, 0x67905600, 0x678EFC00,
-	0x678DA200, 0x678C4800, 0x678AEE00,
-	0x67899400, 0x67883A00, 0x6786E000,
-	0x67858600, 0x67842C00, 0x6782D200,
-	0x67817800, 0x67801E00, 0x677EC400,
-	0x677D6A00, 0x677C1000, 0x677AB600,
-	0x67795C00, 0x67780200, 0x6776A800,
-	0x67754E00, 0x6773F400, 0x67729A00,
-	0x67714000, 0x676FE600, 0x676E8C00,
-	0x676D3200, 0x676BD800, 0x676A7E00,
-	0x67692400, 0x6767CA00, 0x67667000,
-	0x67651600, 0x6763BC00, 0x67626200,
-	0x67610800, 0x675FAE00, 0x675E5400,
-	0x675CFA00, 0x675BA000, 0x675A4600,
-	0x6758EC00, 0x67579200, 0x67563800,
-	0x6754DE00, 0x67538400, 0x67522A00,
-	0x6750D000, 0x674F7600, 0x674E1C00,
-	0x674CC200, 0x674B6800, 0x674A0E00,
-	0x6748B400, 0x67475A00, 0x67460000,
-	0x6744A600, 0x67434C00, 0x6741F200,
-	0x67409800, 0x673F3E00, 0x673DE400,
-	0x673C8A00, 0x673B3000, 0x6739D600,
-	0x67387C00, 0x67372200, 0x6735C800,
-	0x67346E00, 0x67331400, 0x6731BA00,
-	0x67306000, 0x672F0600, 0x672DAC00,
-	0x672C5200, 0x672AF800, 0x67299E00,
-	0x67284400, 0x6726EA00, 0x67259000,
-	0x67243600, 0x6722DC00, 0x67218200,
-	0x67202800, 0x671ECE00, 0x671D7400,
-	0x671C1A00, 0x671AC000, 0x67196600,
-	0x67180C00, 0x6716B200, 0x67155800,
-	0x6713FE00, 0x6712A400, 0x67114A00,
-	0x670FF000, 0x670E9600, 0x670D3C00,
-	0x670BE200, 0x670A8800, 0x67092E00,
-	0x6707D400, 0x67067A00, 0x67052000,
-	0x6703C600, 0x67026C00, 0x67011200,
-	0x66FFB800, 0x66FE5E00, 0x66FD0400,
-	0x66FBAA00, 0x66FA5000, 0x66F8F600,
-	0x66F79C00, 0x66F64200, 0x66F4E800,
-	0x66F38E00, 0x66F23400, 0x66F0DA00,
-	0x66EF8000, 0x66EE2600, 0x66ECCC00,
-	0x66EB7200, 0x66EA1800, 0x66E8BE00,
-	0x66E76400, 0x66E60A00, 0x66E4B000,
-	0x66E35600, 0x66E1FC00, 0x66E0A200,
-	0x66DF4800, 0x66DDEE00, 0x66DC9400,
-	0x66DB3A00, 0x66D9E000, 0x66D88600,
-	0x66D72C00, 0x66D5D200, 0x66D47800,
-	0x66D31E00, 0x66D1C400, 0x66D06A00,
-	0x66CF1000, 0x66CDB600, 0x66CC5C00,
-	0x66CB0200, 0x66C9A800, 0x66C84E00,
-	0x66C6F400, 0x66C59A00, 0x66C44000,
-	0x66C2E600, 0x66C18C00, 0x66C03200,
-	0x66BED800, 0x66BD7E00, 0x66BC2400,
-	0x66BACA00, 0x66B97000, 0x66B81600,
-	0x66B6BC00, 0x66B56200, 0x66B40800,
-	0x66B2AE00, 0x66B15400, 0x66AFFA00,
-	0x66AEA000, 0x66AD4600, 0x66ABEC00,
-	0x66AA9200, 0x66A93800, 0x66A7DE00,
-	0x66A68400, 0x66A52A00, 0x66A3D000,
-	0x66A27600, 0x66A11C00, 0x669FC200,
-	0x669E6800, 0x669D0E00, 0x669BB400,
-	0x669A5A00, 0x66990000, 0x6697A600,
-	0x66964C00, 0x6694F200, 0x66939800,
-	0x66923E00, 0x6690E400, 0x668F8A00,
-	0x668E3000, 0x668CD600, 0x668B7C00,
-	0x668A2200, 0x6688C800, 0x66876E00,
-	0x66861400, 0x6684BA00, 0x66836000,
-	0x66820600, 0x6680AC00, 0x667F5200,
-	0x667DF800, 0x667C9E00, 0x667B4400,
-	0x6679EA00, 0x66789000, 0x66773600,
-	0x6675DC00, 0x66748200, 0x66732800,
-	0x6671CE00, 0x66707400, 0x666F1A00,
-	0x666DC000, 0x666C6600, 0x666B0C00,
-	0x6669B200, 0x66685800, 0x6666FE00,
-	0x6665A400, 0x66644A00, 0x6662F000,
-	0x66619600, 0x66603C00, 0x665EE200,
-	0x665D8800, 0x665C2E00, 0x665AD400,
-	0x66597A00, 0x66582000, 0x6656C600,
-	0x66556C00, 0x66541200, 0x6652B800,
-	0x66515E00, 0x66500400, 0x664EAA00,
-	0x664D5000, 0x664BF600, 0x664A9C00,
-	0x66494200, 0x6647E800, 0x66468E00,
-	0x66453400, 0x6643DA00, 0x66428000,
-	0x66412600, 0x663FCC00, 0x663E7200,
-	0x663D1800, 0x663BBE00, 0x663A6400,
-	0x66390A00, 0x6637B000, 0x66365600,
-	0x6634FC00, 0x6633A200, 0x66324800,
-	0x6630EE00, 0x662F9400, 0x662E3A00,
-	0x662CE000, 0x662B8600, 0x662A2C00,
-	0x6628D200, 0x66277800, 0x66261E00,
-	0x6624C400, 0x66236A00, 0x66221000,
-	0x6620B600, 0x661F5C00, 0x661E0200,
-	0x661CA800, 0x661B4E00, 0x6619F400,
-	0x66189A00, 0x66174000, 0x6615E600,
-	0x66148C00, 0x66133200, 0x6611D800,
-	0x66107E00, 0x660F2400, 0x660DCA00,
-	0x660C7000, 0x660B1600, 0x6609BC00,
-	0x66086200, 0x66070800, 0x6605AE00,
-	0x66045400, 0x6602FA00, 0x6601A000,
-	0x66004600, 0x65FEEC00, 0x65FD9200,
-	0x65FC3800, 0x65FADE00, 0x65F98400,
-	0x65F82A00, 0x65F6D000, 0x65F57600,
-	0x65F41C00, 0x65F2C200, 0x65F16800,
-	0x65F00E00, 0x65EEB400, 0x65ED5A00,
-	0x65EC0000, 0x65EAA600, 0x65E94C00,
-	0x65E7F200, 0x65E69800, 0x65E53E00,
-	0x65E3E400, 0x65E28A00, 0x65E13000,
-	0x65DFD600, 0x65DE7C00, 0x65DD2200,
-	0x65DBC800, 0x65DA6E00, 0x65D91400,
-	0x65D7BA00, 0x65D66000, 0x65D50600,
-	0x65D3AC00, 0x65D25200, 0x65D0F800,
-	0x65CF9E00, 0x65CE4400, 0x65CCEA00,
-	0x65CB9000, 0x65CA3600, 0x65C8DC00,
-	0x65C78200, 0x65C62800, 0x65C4CE00,
-	0x65C37400, 0x65C21A00, 0x65C0C000,
-	0x65BF6600, 0x65BE0C00, 0x65BCB200,
-	0x65BB5800, 0x65B9FE00, 0x65B8A400,
-	0x65B74A00, 0x65B5F000, 0x65B49600,
-	0x65B33C00, 0x65B1E200, 0x65B08800,
-	0x65AF2E00, 0x65ADD400, 0x65AC7A00,
-	0x65AB2000, 0x65A9C600, 0x65A86C00,
-	0x65A71200, 0x65A5B800, 0x65A45E00,
-	0x65A30400, 0x65A1AA00, 0x65A05000,
-	0x659EF600, 0x659D9C00, 0x659C4200,
-	0x659AE800, 0x65998E00, 0x65983400,
-	0x6596DA00, 0x65958000, 0x65942600,
-	0x6592CC00, 0x65917200, 0x65901800,
-	0x658EBE00, 0x658D6400, 0x658C0A00,
-	0x658AB000, 0x65895600, 0x6587FC00,
-	0x6586A200, 0x65854800, 0x6583EE00,
-	0x65829400, 0x65813A00, 0x657FE000,
-	0x657E8600, 0x657D2C00, 0x657BD200,
-	0x657A7800, 0x65791E00, 0x6577C400,
-	0x65766A00, 0x65751000, 0x6573B600,
-	0x65725C00, 0x65710200, 0x656FA800,
-	0x656E4E00, 0x656CF400, 0x656B9A00,
-	0x656A4000, 0x6568E600, 0x65678C00,
-	0x65663200, 0x6564D800, 0x65637E00,
-	0x65622400, 0x6560CA00, 0x655F7000,
-	0x655E1600, 0x655CBC00, 0x655B6200,
-	0x655A0800, 0x6558AE00, 0x65575400,
-	0x6555FA00, 0x6554A000, 0x65534600,
-	0x6551EC00, 0x65509200, 0x654F3800,
-	0x654DDE00, 0x654C8400, 0x654B2A00,
-	0x6549D000, 0x65487600, 0x65471C00,
-	0x6545C200, 0x65446800, 0x65430E00,
-	0x6541B400, 0x65405A00, 0x653F0000,
-	0x653DA600, 0x653C4C00, 0x653AF200,
-	0x65399800, 0x65383E00, 0x6536E400,
-	0x65358A00, 0x65343000, 0x6532D600,
-	0x65317C00, 0x65302200, 0x652EC800,
-	0x652D6E00, 0x652C1400, 0x652ABA00,
-	0x65296000, 0x65280600, 0x6526AC00,
-	0x65255200, 0x6523F800, 0x65229E00,
-	0x65214400, 0x651FEA00, 0x651E9000,
-	0x651D3600, 0x651BDC00, 0x651A8200,
-	0x65192800, 0x6517CE00, 0x65167400,
-	0x65151A00, 0x6513C000, 0x65126600,
-	0x65110C00, 0x650FB200, 0x650E5800,
-	0x650CFE00, 0x650BA400, 0x650A4A00,
-	0x6508F000, 0x65079600, 0x65063C00,
-	0x6504E200, 0x65038800, 0x65022E00,
-	0x6500D400, 0x64FF7A00, 0x64FE2000,
-	0x64FCC600, 0x64FB6C00, 0x64FA1200,
-	0x64F8B800, 0x64F75E00, 0x64F60400,
-	0x64F4AA00, 0x64F35000, 0x64F1F600,
-	0x64F09C00, 0x64EF4200, 0x64EDE800,
-	0x64EC8E00, 0x64EB3400, 0x64E9DA00,
-	0x64E88000, 0x64E72600, 0x64E5CC00,
-	0x64E47200, 0x64E31800, 0x64E1BE00,
-	0x64E06400, 0x64DF0A00, 0x64DDB000,
-	0x64DC5600, 0x64DAFC00, 0x64D9A200,
-	0x64D84800, 0x64D6EE00, 0x64D59400,
-	0x64D43A00, 0x64D2E000, 0x64D18600,
-	0x64D02C00, 0x64CED200, 0x64CD7800,
-	0x64CC1E00, 0x64CAC400, 0x64C96A00,
-	0x64C81000, 0x64C6B600, 0x64C55C00,
-	0x64C40200, 0x64C2A800, 0x64C14E00,
-	0x64BFF400, 0x64BE9A00, 0x64BD4000,
-	0x64BBE600, 0x64BA8C00, 0x64B93200,
-	0x64B7D800, 0x64B67E00, 0x64B52400,
-	0x64B3CA00, 0x64B27000, 0x64B11600,
-	0x64AFBC00, 0x64AE6200, 0x64AD0800,
-	0x64ABAE00, 0x64AA5400, 0x64A8FA00,
-	0x64A7A000, 0x64A64600, 0x64A4EC00,
-	0x64A39200, 0x64A23800, 0x64A0DE00,
-	0x649F8400, 0x649E2A00, 0x649CD000,
-	0x649B7600, 0x649A1C00, 0x6498C200,
-	0x64976800, 0x64960E00, 0x6494B400,
-	0x64935A00, 0x64920000, 0x6490A600,
-	0x648F4C00, 0x648DF200, 0x648C9800,
-	0x648B3E00, 0x6489E400, 0x64888A00,
-	0x64873000, 0x6485D600, 0x64847C00,
-	0x64832200, 0x6481C800, 0x64806E00,
-	0x647F1400, 0x647DBA00, 0x647C6000,
-	0x647B0600, 0x6479AC00, 0x64785200,
-	0x6476F800, 0x64759E00, 0x64744400,
-	0x6472EA00, 0x64719000, 0x64703600,
-	0x646EDC00, 0x646D8200, 0x646C2800,
-	0x646ACE00, 0x64697400, 0x64681A00,
-	0x6466C000, 0x64656600, 0x64640C00,
-	0x6462B200, 0x64615800, 0x645FFE00,
-	0x645EA400, 0x645D4A00, 0x645BF000,
-	0x645A9600, 0x64593C00, 0x6457E200,
-	0x64568800, 0x64552E00, 0x6453D400,
-	0x64527A00, 0x64512000, 0x644FC600,
-	0x644E6C00, 0x644D1200, 0x644BB800,
-	0x644A5E00, 0x64490400, 0x6447AA00,
-	0x64465000, 0x6444F600, 0x64439C00,
-	0x64424200, 0x6440E800, 0x643F8E00,
-	0x643E3400, 0x643CDA00, 0x643B8000,
-	0x643A2600, 0x6438CC00, 0x64377200,
-	0x64361800, 0x6434BE00, 0x64336400,
-	0x64320A00, 0x6430B000, 0x642F5600,
-	0x642DFC00, 0x642CA200, 0x642B4800,
-	0x6429EE00, 0x64289400, 0x64273A00,
-	0x6425E000, 0x64248600, 0x64232C00,
-	0x6421D200, 0x64207800, 0x641F1E00,
-	0x641DC400, 0x641C6A00, 0x641B1000,
-	0x6419B600, 0x64185C00, 0x64170200,
-	0x6415A800, 0x64144E00, 0x6412F400,
-	0x64119A00, 0x64104000, 0x640EE600,
-	0x640D8C00, 0x640C3200, 0x640AD800,
-	0x64097E00, 0x64082400, 0x6406CA00,
-	0x64057000, 0x64041600, 0x6402BC00,
-	0x64016200, 0x64000800, 0x63FEAE00,
-	0x63FD5400, 0x63FBFA00, 0x63FAA000,
-	0x63F94600, 0x63F7EC00, 0x63F69200,
-	0x63F53800, 0x63F3DE00, 0x63F28400,
-	0x63F12A00, 0x63EFD000, 0x63EE7600,
-	0x63ED1C00, 0x63EBC200, 0x63EA6800,
-	0x63E90E00, 0x63E7B400, 0x63E65A00,
-	0x63E50000, 0x63E3A600, 0x63E24C00,
-	0x63E0F200, 0x63DF9800, 0x63DE3E00,
-	0x63DCE400, 0x63DB8A00, 0x63DA3000,
-	0x63D8D600, 0x63D77C00, 0x63D62200,
-	0x63D4C800, 0x63D36E00, 0x63D21400,
-	0x63D0BA00, 0x63CF6000, 0x63CE0600,
-	0x63CCAC00, 0x63CB5200, 0x63C9F800,
-	0x63C89E00, 0x63C74400, 0x63C5EA00,
-	0x63C49000, 0x63C33600, 0x63C1DC00,
-	0x63C08200, 0x63BF2800, 0x63BDCE00,
-	0x63BC7400, 0x63BB1A00, 0x63B9C000,
-	0x63B86600, 0x63B70C00, 0x63B5B200,
-	0x63B45800, 0x63B2FE00, 0x63B1A400,
-	0x63B04A00, 0x63AEF000, 0x63AD9600,
-	0x63AC3C00, 0x63AAE200, 0x63A98800,
-	0x63A82E00, 0x63A6D400, 0x63A57A00,
-	0x63A42000, 0x63A2C600, 0x63A16C00,
-	0x63A01200, 0x639EB800, 0x639D5E00,
-	0x639C0400, 0x639AAA00, 0x63995000,
-	0x6397F600, 0x63969C00, 0x63954200,
-	0x6393E800, 0x63928E00, 0x63913400,
-	0x638FDA00, 0x638E8000, 0x638D2600,
-	0x638BCC00, 0x638A7200, 0x63891800,
-	0x6387BE00, 0x63866400, 0x63850A00,
-	0x6383B000, 0x63825600, 0x6380FC00,
-	0x637FA200, 0x637E4800, 0x637CEE00,
-	0x637B9400, 0x637A3A00, 0x6378E000,
-	0x63778600, 0x63762C00, 0x6374D200,
-	0x63737800, 0x63721E00, 0x6370C400,
-	0x636F6A00, 0x636E1000, 0x636CB600,
-	0x636B5C00, 0x636A0200, 0x6368A800,
-	0x63674E00, 0x6365F400, 0x63649A00,
-	0x63634000, 0x6361E600, 0x63608C00,
-	0x635F3200, 0x635DD800, 0x635C7E00,
-	0x635B2400, 0x6359CA00, 0x63587000,
-	0x63571600, 0x6355BC00, 0x63546200,
-	0x63530800, 0x6351AE00, 0x63505400,
-	0x634EFA00, 0x634DA000, 0x634C4600,
-	0x634AEC00, 0x63499200, 0x63483800,
-	0x6346DE00, 0x63458400, 0x63442A00,
-	0x6342D000, 0x63417600, 0x63401C00,
-	0x633EC200, 0x633D6800, 0x633C0E00,
-	0x633AB400, 0x63395A00, 0x63380000,
-	0x6336A600, 0x63354C00, 0x6333F200,
-	0x63329800, 0x63313E00, 0x632FE400,
-	0x632E8A00, 0x632D3000, 0x632BD600,
-	0x632A7C00, 0x63292200, 0x6327C800,
-	0x63266E00, 0x63251400, 0x6323BA00,
-	0x63226000, 0x63210600, 0x631FAC00,
-	0x631E5200, 0x631CF800, 0x631B9E00,
-	0x631A4400, 0x6318EA00, 0x63179000,
-	0x63163600, 0x6314DC00, 0x63138200,
-	0x63122800, 0x6310CE00, 0x630F7400,
-	0x630E1A00, 0x630CC000, 0x630B6600,
-	0x630A0C00, 0x6308B200, 0x63075800,
-	0x6305FE00, 0x6304A400, 0x63034A00,
-	0x6301F000, 0x63009600, 0x62FF3C00,
-	0x62FDE200, 0x62FC8800, 0x62FB2E00,
-	0x62F9D400, 0x62F87A00, 0x62F72000,
-	0x62F5C600, 0x62F46C00, 0x62F31200,
-	0x62F1B800, 0x62F05E00, 0x62EF0400,
-	0x62EDAA00, 0x62EC5000, 0x62EAF600,
-	0x62E99C00, 0x62E84200, 0x62E6E800,
-	0x62E58E00, 0x62E43400, 0x62E2DA00,
-	0x62E18000, 0x62E02600, 0x62DECC00,
-	0x62DD7200, 0x62DC1800, 0x62DABE00,
-	0x62D96400, 0x62D80A00, 0x62D6B000,
-	0x62D55600, 0x62D3FC00, 0x62D2A200,
-	0x62D14800, 0x62CFEE00, 0x62CE9400,
-	0x62CD3A00, 0x62CBE000, 0x62CA8600,
-	0x62C92C00, 0x62C7D200, 0x62C67800,
-	0x62C51E00, 0x62C3C400, 0x62C26A00,
-	0x62C11000, 0x62BFB600, 0x62BE5C00,
-	0x62BD0200, 0x62BBA800, 0x62BA4E00,
-	0x62B8F400, 0x62B79A00, 0x62B64000,
-	0x62B4E600, 0x62B38C00, 0x62B23200,
-	0x62B0D800, 0x62AF7E00, 0x62AE2400,
-	0x62ACCA00, 0x62AB7000, 0x62AA1600,
-	0x62A8BC00, 0x62A76200, 0x62A60800,
-	0x62A4AE00, 0x62A35400, 0x62A1FA00,
-	0x62A0A000, 0x629F4600, 0x629DEC00,
-	0x629C9200, 0x629B3800, 0x6299DE00,
-	0x62988400, 0x62972A00, 0x6295D000,
-	0x62947600, 0x62931C00, 0x6291C200,
-	0x62906800, 0x628F0E00, 0x628DB400,
-	0x628C5A00, 0x628B0000, 0x6289A600,
-	0x62884C00, 0x6286F200, 0x62859800,
-	0x62843E00, 0x6282E400, 0x62818A00,
-	0x62803000, 0x627ED600, 0x627D7C00,
-	0x627C2200, 0x627AC800, 0x62796E00,
-	0x62781400, 0x6276BA00, 0x62756000,
-	0x62740600, 0x6272AC00, 0x62715200,
-	0x626FF800, 0x626E9E00, 0x626D4400,
-	0x626BEA00, 0x626A9000, 0x62693600,
-	0x6267DC00, 0x62668200, 0x62652800,
-	0x6263CE00, 0x62627400, 0x62611A00,
-	0x625FC000, 0x625E6600, 0x625D0C00,
-	0x625BB200, 0x625A5800, 0x6258FE00,
-	0x6257A400, 0x62564A00, 0x6254F000,
-	0x62539600, 0x62523C00, 0x6250E200,
-	0x624F8800, 0x624E2E00, 0x624CD400,
-	0x624B7A00, 0x624A2000, 0x6248C600,
-	0x62476C00, 0x62461200, 0x6244B800,
-	0x62435E00, 0x62420400, 0x6240AA00,
-	0x623F5000, 0x623DF600, 0x623C9C00,
-	0x623B4200, 0x6239E800, 0x62388E00,
-	0x62373400, 0x6235DA00, 0x62348000,
-	0x62332600, 0x6231CC00, 0x62307200,
-	0x622F1800, 0x622DBE00, 0x622C6400,
-	0x622B0A00, 0x6229B000, 0x62285600,
-	0x6226FC00, 0x6225A200, 0x62244800,
-	0x6222EE00, 0x62219400, 0x62203A00,
-	0x621EE000, 0x621D8600, 0x621C2C00,
-	0x621AD200, 0x62197800, 0x62181E00,
-	0x6216C400, 0x62156A00, 0x62141000,
-	0x6212B600, 0x62115C00, 0x62100200,
-	0x620EA800, 0x620D4E00, 0x620BF400,
-	0x620A9A00, 0x62094000, 0x6207E600,
-	0x62068C00, 0x62053200, 0x6203D800,
-	0x62027E00, 0x62012400, 0x61FFCA00,
-	0x61FE7000, 0x61FD1600, 0x61FBBC00,
-	0x61FA6200, 0x61F90800, 0x61F7AE00,
-	0x61F65400, 0x61F4FA00, 0x61F3A000,
-	0x61F24600, 0x61F0EC00, 0x61EF9200,
-	0x61EE3800, 0x61ECDE00, 0x61EB8400,
-	0x61EA2A00, 0x61E8D000, 0x61E77600,
-	0x61E61C00, 0x61E4C200, 0x61E36800,
-	0x61E20E00, 0x61E0B400, 0x61DF5A00,
-	0x61DE0000, 0x61DCA600, 0x61DB4C00,
-	0x61D9F200, 0x61D89800, 0x61D73E00,
-	0x61D5E400, 0x61D48A00, 0x61D33000,
-	0x61D1D600, 0x61D07C00, 0x61CF2200,
-	0x61CDC800, 0x61CC6E00, 0x61CB1400,
-	0x61C9BA00, 0x61C86000, 0x61C70600,
-	0x61C5AC00, 0x61C45200, 0x61C2F800,
-	0x61C19E00, 0x61C04400, 0x61BEEA00,
-	0x61BD9000, 0x61BC3600, 0x61BADC00,
-	0x61B98200, 0x61B82800, 0x61B6CE00,
-	0x61B57400, 0x61B41A00, 0x61B2C000,
-	0x61B16600, 0x61B00C00, 0x61AEB200,
-	0x61AD5800, 0x61ABFE00, 0x61AAA400,
-	0x61A94A00, 0x61A7F000, 0x61A69600,
-	0x61A53C00, 0x61A3E200, 0x61A28800,
-	0x61A12E00, 0x619FD400, 0x619E7A00,
-	0x619D2000, 0x619BC600, 0x619A6C00,
-	0x61991200, 0x6197B800, 0x61965E00,
-	0x61950400, 0x6193AA00, 0x61925000,
-	0x6190F600, 0x618F9C00, 0x618E4200,
-	0x618CE800, 0x618B8E00, 0x618A3400,
-	0x6188DA00, 0x61878000, 0x61862600,
-	0x6184CC00, 0x61837200, 0x61821800,
-	0x6180BE00, 0x617F6400, 0x617E0A00,
-	0x617CB000, 0x617B5600, 0x6179FC00,
-	0x6178A200, 0x61774800, 0x6175EE00,
-	0x61749400, 0x61733A00, 0x6171E000,
-	0x61708600, 0x616F2C00, 0x616DD200,
-	0x616C7800, 0x616B1E00, 0x6169C400,
-	0x61686A00, 0x61671000, 0x6165B600,
-	0x61645C00, 0x61630200, 0x6161A800,
-	0x61604E00, 0x615EF400, 0x615D9A00,
-	0x615C4000, 0x615AE600, 0x61598C00,
-	0x61583200, 0x6156D800, 0x61557E00,
-	0x61542400, 0x6152CA00, 0x61517000,
-	0x61501600, 0x614EBC00, 0x614D6200,
-	0x614C0800, 0x614AAE00, 0x61495400,
-	0x6147FA00, 0x6146A000, 0x61454600,
-	0x6143EC00, 0x61429200, 0x61413800,
-	0x613FDE00, 0x613E8400, 0x613D2A00,
-	0x613BD000, 0x613A7600, 0x61391C00,
-	0x6137C200, 0x61366800, 0x61350E00,
-	0x6133B400, 0x61325A00, 0x61310000,
-	0x612FA600, 0x612E4C00, 0x612CF200,
-	0x612B9800, 0x612A3E00, 0x6128E400,
-	0x61278A00, 0x61263000, 0x6124D600,
-	0x61237C00, 0x61222200, 0x6120C800,
-	0x611F6E00, 0x611E1400, 0x611CBA00,
-	0x611B6000, 0x611A0600, 0x6118AC00,
-	0x61175200, 0x6115F800, 0x61149E00,
-	0x61134400, 0x6111EA00, 0x61109000,
-	0x610F3600, 0x610DDC00, 0x610C8200,
-	0x610B2800, 0x6109CE00, 0x61087400,
-	0x61071A00, 0x6105C000, 0x61046600,
-	0x61030C00, 0x6101B200, 0x61005800,
-	0x60FEFE00, 0x60FDA400, 0x60FC4A00,
-	0x60FAF000, 0x60F99600, 0x60F83C00,
-	0x60F6E200, 0x60F58800, 0x60F42E00,
-	0x60F2D400, 0x60F17A00, 0x60F02000,
-	0x60EEC600, 0x60ED6C00, 0x60EC1200,
-	0x60EAB800, 0x60E95E00, 0x60E80400,
-	0x60E6AA00, 0x60E55000, 0x60E3F600,
-	0x60E29C00, 0x60E14200, 0x60DFE800,
-	0x60DE8E00, 0x60DD3400, 0x60DBDA00,
-	0x60DA8000, 0x60D92600, 0x60D7CC00,
-	0x60D67200, 0x60D51800, 0x60D3BE00,
-	0x60D26400, 0x60D10A00, 0x60CFB000,
-	0x60CE5600, 0x60CCFC00, 0x60CBA200,
-	0x60CA4800, 0x60C8EE00, 0x60C79400,
-	0x60C63A00, 0x60C4E000, 0x60C38600,
-	0x60C22C00, 0x60C0D200, 0x60BF7800,
-	0x60BE1E00, 0x60BCC400, 0x60BB6A00,
-	0x60BA1000, 0x60B8B600, 0x60B75C00,
-	0x60B60200, 0x60B4A800, 0x60B34E00,
-	0x60B1F400, 0x60B09A00, 0x60AF4000,
-	0x60ADE600, 0x60AC8C00, 0x60AB3200,
-	0x60A9D800, 0x60A87E00, 0x60A72400,
-	0x60A5CA00, 0x60A47000, 0x60A31600,
-	0x60A1BC00, 0x60A06200, 0x609F0800,
-	0x609DAE00, 0x609C5400, 0x609AFA00,
-	0x6099A000, 0x60984600, 0x6096EC00,
-	0x60959200, 0x60943800, 0x6092DE00,
-	0x60918400, 0x60902A00, 0x608ED000,
-	0x608D7600, 0x608C1C00, 0x608AC200,
-	0x60896800, 0x60880E00, 0x6086B400,
-	0x60855A00, 0x60840000, 0x6082A600,
-	0x60814C00, 0x607FF200, 0x607E9800,
-	0x607D3E00, 0x607BE400, 0x607A8A00,
-	0x60793000, 0x6077D600, 0x60767C00,
-	0x60752200, 0x6073C800, 0x60726E00,
-	0x60711400, 0x606FBA00, 0x606E6000,
-	0x606D0600, 0x606BAC00, 0x606A5200,
-	0x6068F800, 0x60679E00, 0x60664400,
-	0x6064EA00, 0x60639000, 0x60623600,
-	0x6060DC00, 0x605F8200, 0x605E2800,
-	0x605CCE00, 0x605B7400, 0x605A1A00,
-	0x6058C000, 0x60576600, 0x60560C00,
-	0x6054B200, 0x60535800, 0x6051FE00,
-	0x6050A400, 0x604F4A00, 0x604DF000,
-	0x604C9600, 0x604B3C00, 0x6049E200,
-	0x60488800, 0x60472E00, 0x6045D400,
-	0x60447A00, 0x60432000, 0x6041C600,
-	0x60406C00, 0x603F1200, 0x603DB800,
-	0x603C5E00, 0x603B0400, 0x6039AA00,
-	0x60385000, 0x6036F600, 0x60359C00,
-	0x60344200, 0x6032E800, 0x60318E00,
-	0x60303400, 0x602EDA00, 0x602D8000,
-	0x602C2600, 0x602ACC00, 0x60297200,
-	0x60281800, 0x6026BE00, 0x60256400,
-	0x60240A00, 0x6022B000, 0x60215600,
-	0x601FFC00, 0x601EA200, 0x601D4800,
-	0x601BEE00, 0x601A9400, 0x60193A00,
-	0x6017E000, 0x60168600, 0x60152C00,
-	0x6013D200, 0x60127800, 0x60111E00,
-	0x600FC400, 0x600E6A00, 0x600D1000,
-	0x600BB600, 0x600A5C00, 0x60090200,
-	0x6007A800, 0x60064E00, 0x6004F400,
-	0x60039A00, 0x60024000, 0x6000E600,
-	0x5FFF8C00, 0x5FFE3200, 0x5FFCD800,
-	0x5FFB7E00, 0x5FFA2400, 0x5FF8CA00,
-	0x5FF77000, 0x5FF61600, 0x5FF4BC00,
-	0x5FF36200, 0x5FF20800, 0x5FF0AE00,
-	0x5FEF5400, 0x5FEDFA00, 0x5FECA000,
-	0x5FEB4600, 0x5FE9EC00, 0x5FE89200,
-	0x5FE73800, 0x5FE5DE00, 0x5FE48400,
-	0x5FE32A00, 0x5FE1D000, 0x5FE07600,
-	0x5FDF1C00, 0x5FDDC200, 0x5FDC6800,
-	0x5FDB0E00, 0x5FD9B400, 0x5FD85A00,
-	0x5FD70000, 0x5FD5A600, 0x5FD44C00,
-	0x5FD2F200, 0x5FD19800, 0x5FD03E00,
-	0x5FCEE400, 0x5FCD8A00, 0x5FCC3000,
-	0x5FCAD600, 0x5FC97C00, 0x5FC82200,
-	0x5FC6C800, 0x5FC56E00, 0x5FC41400,
-	0x5FC2BA00, 0x5FC16000, 0x5FC00600,
-	0x5FBEAC00, 0x5FBD5200, 0x5FBBF800,
-	0x5FBA9E00, 0x5FB94400, 0x5FB7EA00,
-	0x5FB69000, 0x5FB53600, 0x5FB3DC00,
-	0x5FB28200, 0x5FB12800, 0x5FAFCE00,
-	0x5FAE7400, 0x5FAD1A00, 0x5FABC000,
-	0x5FAA6600, 0x5FA90C00, 0x5FA7B200,
-	0x5FA65800, 0x5FA4FE00, 0x5FA3A400,
-	0x5FA24A00, 0x5FA0F000, 0x5F9F9600,
-	0x5F9E3C00, 0x5F9CE200, 0x5F9B8800,
-	0x5F9A2E00, 0x5F98D400, 0x5F977A00,
-	0x5F962000, 0x5F94C600, 0x5F936C00,
-	0x5F921200, 0x5F90B800, 0x5F8F5E00,
-	0x5F8E0400, 0x5F8CAA00, 0x5F8B5000,
-	0x5F89F600, 0x5F889C00, 0x5F874200,
-	0x5F85E800, 0x5F848E00, 0x5F833400,
-	0x5F81DA00, 0x5F808000, 0x5F7F2600,
-	0x5F7DCC00, 0x5F7C7200, 0x5F7B1800,
-	0x5F79BE00, 0x5F786400, 0x5F770A00,
-	0x5F75B000, 0x5F745600, 0x5F72FC00,
-	0x5F71A200, 0x5F704800, 0x5F6EEE00,
-	0x5F6D9400, 0x5F6C3A00, 0x5F6AE000,
-	0x5F698600, 0x5F682C00, 0x5F66D200,
-	0x5F657800, 0x5F641E00, 0x5F62C400,
-	0x5F616A00, 0x5F601000, 0x5F5EB600,
-	0x5F5D5C00, 0x5F5C0200, 0x5F5AA800,
-	0x5F594E00, 0x5F57F400, 0x5F569A00,
-	0x5F554000, 0x5F53E600, 0x5F528C00,
-	0x5F513200, 0x5F4FD800, 0x5F4E7E00,
-	0x5F4D2400, 0x5F4BCA00, 0x5F4A7000,
-	0x5F491600, 0x5F47BC00, 0x5F466200,
-	0x5F450800, 0x5F43AE00, 0x5F425400,
-	0x5F40FA00, 0x5F3FA000, 0x5F3E4600,
-	0x5F3CEC00, 0x5F3B9200, 0x5F3A3800,
-	0x5F38DE00, 0x5F378400, 0x5F362A00,
-	0x5F34D000, 0x5F337600, 0x5F321C00,
-	0x5F30C200, 0x5F2F6800, 0x5F2E0E00,
-	0x5F2CB400, 0x5F2B5A00, 0x5F2E0000,
-	0x5F2CC340, 0x5F2B8680, 0x5F2A49C0,
-	0x5F290D00, 0x5F27D040, 0x5F269380,
-	0x5F2556C0, 0x5F241A00, 0x5F22DD40,
-	0x5F21A080, 0x5F2063C0, 0x5F1F2700,
-	0x5F1DEA40, 0x5F1CAD80, 0x5F1B70C0,
-	0x5F1A3400, 0x5F18F740, 0x5F17BA80,
-	0x5F167DC0, 0x5F154100, 0x5F140440,
-	0x5F12C780, 0x5F118AC0, 0x5F104E00,
-	0x5F0F1140, 0x5F0DD480, 0x5F0C97C0,
-	0x5F0B5B00, 0x5F0A1E40, 0x5F08E180,
-	0x5F07A4C0, 0x5F066800, 0x5F052B40,
-	0x5F03EE80, 0x5F02B1C0, 0x5F017500,
-	0x5F003840, 0x5EFEFB80, 0x5EFDBEC0,
-	0x5EFC8200, 0x5EFB4540, 0x5EFA0880,
-	0x5EF8CBC0, 0x5EF78F00, 0x5EF65240,
-	0x5EF51580, 0x5EF3D8C0, 0x5EF29C00,
-	0x5EF15F40, 0x5EF02280, 0x5EEEE5C0,
-	0x5EEDA900, 0x5EEC6C40, 0x5EEB2F80,
-	0x5EE9F2C0, 0x5EE8B600, 0x5EE77940,
-	0x5EE63C80, 0x5EE4FFC0, 0x5EE3C300,
-	0x5EE28640, 0x5EE14980, 0x5EE00CC0,
-	0x5EDED000, 0x5EDD9340, 0x5EDC5680,
-	0x5EDB19C0, 0x5ED9DD00, 0x5ED8A040,
-	0x5ED76380, 0x5ED626C0, 0x5ED4EA00,
-	0x5ED3AD40, 0x5ED27080, 0x5ED133C0,
-	0x5ECFF700, 0x5ECEBA40, 0x5ECD7D80,
-	0x5ECC40C0, 0x5ECB0400, 0x5EC9C740,
-	0x5EC88A80, 0x5EC74DC0, 0x5EC61100,
-	0x5EC4D440, 0x5EC39780, 0x5EC25AC0,
-	0x5EC11E00, 0x5EBFE140, 0x5EBEA480,
-	0x5EBD67C0, 0x5EBC2B00, 0x5EBAEE40,
-	0x5EB9B180, 0x5EB874C0, 0x5EB73800,
-	0x5EB5FB40, 0x5EB4BE80, 0x5EB381C0,
-	0x5EB24500, 0x5EB10840, 0x5EAFCB80,
-	0x5EAE8EC0, 0x5EAD5200, 0x5EAC1540,
-	0x5EAAD880, 0x5EA99BC0, 0x5EA85F00,
-	0x5EA72240, 0x5EA5E580, 0x5EA4A8C0,
-	0x5EA36C00, 0x5EA22F40, 0x5EA0F280,
-	0x5E9FB5C0, 0x5E9E7900, 0x5E9D3C40,
-	0x5E9BFF80, 0x5E9AC2C0, 0x5E998600,
-	0x5E984940, 0x5E970C80, 0x5E95CFC0,
-	0x5E949300, 0x5E935640, 0x5E921980,
-	0x5E90DCC0, 0x5E8FA000, 0x5E8E6340,
-	0x5E8D2680, 0x5E8BE9C0, 0x5E8AAD00,
-	0x5E897040, 0x5E883380, 0x5E86F6C0,
-	0x5E85BA00, 0x5E847D40, 0x5E834080,
-	0x5E8203C0, 0x5E80C700, 0x5E7F8A40,
-	0x5E7E4D80, 0x5E7D10C0, 0x5E7BD400,
-	0x5E7A9740, 0x5E795A80, 0x5E781DC0,
-	0x5E76E100, 0x5E75A440, 0x5E746780,
-	0x5E732AC0, 0x5E71EE00, 0x5E70B140,
-	0x5E6F7480, 0x5E6E37C0, 0x5E6CFB00,
-	0x5E6BBE40, 0x5E6A8180, 0x5E6944C0,
-	0x5E680800, 0x5E66CB40, 0x5E658E80,
-	0x5E6451C0, 0x5E631500, 0x5E61D840,
-	0x5E609B80, 0x5E5F5EC0, 0x5E5E2200,
-	0x5E5CE540, 0x5E5BA880, 0x5E5A6BC0,
-	0x5E592F00, 0x5E57F240, 0x5E56B580,
-	0x5E5578C0, 0x5E543C00, 0x5E52FF40,
-	0x5E51C280, 0x5E5085C0, 0x5E4F4900,
-	0x5E4E0C40, 0x5E4CCF80, 0x5E4B92C0,
-	0x5E4A5600, 0x5E491940, 0x5E47DC80,
-	0x5E469FC0, 0x5E456300, 0x5E442640,
-	0x5E42E980, 0x5E41ACC0, 0x5E407000,
-	0x5E3F3340, 0x5E3DF680, 0x5E3CB9C0,
-	0x5E3B7D00, 0x5E3A4040, 0x5E390380,
-	0x5E37C6C0, 0x5E368A00, 0x5E354D40,
-	0x5E341080, 0x5E32D3C0, 0x5E319700,
-	0x5E305A40, 0x5E2F1D80, 0x5E2DE0C0,
-	0x5E2CA400, 0x5E2B6740, 0x5E2A2A80,
-	0x5E28EDC0, 0x5E27B100, 0x5E267440,
-	0x5E253780, 0x5E23FAC0, 0x5E22BE00,
-	0x5E218140, 0x5E204480, 0x5E1F07C0,
-	0x5E1DCB00, 0x5E1C8E40, 0x5E1B5180,
-	0x5E1A14C0, 0x5E18D800, 0x5E179B40,
-	0x5E165E80, 0x5E1521C0, 0x5E13E500,
-	0x5E12A840, 0x5E116B80, 0x5E102EC0,
-	0x5E0EF200, 0x5E0DB540, 0x5E0C7880,
-	0x5E0B3BC0, 0x5E09FF00, 0x5E08C240,
-	0x5E078580, 0x5E0648C0, 0x5E050C00,
-	0x5E03CF40, 0x5E029280, 0x5E0155C0,
-	0x5E001900, 0x5DFEDC40, 0x5DFD9F80,
-	0x5DFC62C0, 0x5DFB2600, 0x5DF9E940,
-	0x5DF8AC80, 0x5DF76FC0, 0x5DF63300,
-	0x5DF4F640, 0x5DF3B980, 0x5DF27CC0,
-	0x5DF14000, 0x5DF00340, 0x5DEEC680,
-	0x5DED89C0, 0x5DEC4D00, 0x5DEB1040,
-	0x5DE9D380, 0x5DE896C0, 0x5DE75A00,
-	0x5DE61D40, 0x5DE4E080, 0x5DE3A3C0,
-	0x5DE26700, 0x5DE12A40, 0x5DDFED80,
-	0x5DDEB0C0, 0x5DDD7400, 0x5DDC3740,
-	0x5DDAFA80, 0x5DD9BDC0, 0x5DD88100,
-	0x5DD74440, 0x5DD60780, 0x5DD4CAC0,
-	0x5DD38E00, 0x5DD25140, 0x5DD11480,
-	0x5DCFD7C0, 0x5DCE9B00, 0x5DCD5E40,
-	0x5DCC2180, 0x5DCAE4C0, 0x5DC9A800,
-	0x5DC86B40, 0x5DC72E80, 0x5DC5F1C0,
-	0x5DC4B500, 0x5DC37840, 0x5DC23B80,
-	0x5DC0FEC0, 0x5DBFC200, 0x5DBE8540,
-	0x5DBD4880, 0x5DBC0BC0, 0x5DBACF00,
-	0x5DB99240, 0x5DB85580, 0x5DB718C0,
-	0x5DB5DC00, 0x5DB49F40, 0x5DB36280,
-	0x5DB225C0, 0x5DB0E900, 0x5DAFAC40,
-	0x5DAE6F80, 0x5DAD32C0, 0x5DABF600,
-	0x5DAAB940, 0x5DA97C80, 0x5DA83FC0,
-	0x5DA70300, 0x5DA5C640, 0x5DA48980,
-	0x5DA34CC0, 0x5DA21000, 0x5DA0D340,
-	0x5D9F9680, 0x5D9E59C0, 0x5D9D1D00,
-	0x5D9BE040, 0x5D9AA380, 0x5D9966C0,
-	0x5D982A00, 0x5D96ED40, 0x5D95B080,
-	0x5D9473C0, 0x5D933700, 0x5D91FA40,
-	0x5D90BD80, 0x5D8F80C0, 0x5D8E4400,
-	0x5D8D0740, 0x5D8BCA80, 0x5D8A8DC0,
-	0x5D895100, 0x5D881440, 0x5D86D780,
-	0x5D859AC0, 0x5D845E00, 0x5D832140,
-	0x5D81E480, 0x5D80A7C0, 0x5D7F6B00,
-	0x5D7E2E40, 0x5D7CF180, 0x5D7BB4C0,
-	0x5D7A7800, 0x5D793B40, 0x5D77FE80,
-	0x5D76C1C0, 0x5D758500, 0x5D744840,
-	0x5D730B80, 0x5D71CEC0, 0x5D709200,
-	0x5D6F5540, 0x5D6E1880, 0x5D6CDBC0,
-	0x5D6B9F00, 0x5D6A6240, 0x5D692580,
-	0x5D67E8C0, 0x5D66AC00, 0x5D656F40,
-	0x5D643280, 0x5D62F5C0, 0x5D61B900,
-	0x5D607C40, 0x5D5F3F80, 0x5D5E02C0,
-	0x5D5CC600, 0x5D5B8940, 0x5D5A4C80,
-	0x5D590FC0, 0x5D57D300, 0x5D569640,
-	0x5D555980, 0x5D541CC0, 0x5D52E000,
-	0x5D51A340, 0x5D506680, 0x5D4F29C0,
-	0x5D4DED00, 0x5D4CB040, 0x5D4B7380,
-	0x5D4A36C0, 0x5D48FA00, 0x5D47BD40,
-	0x5D468080, 0x5D4543C0, 0x5D440700,
-	0x5D42CA40, 0x5D418D80, 0x5D4050C0,
-	0x5D3F1400, 0x5D3DD740, 0x5D3C9A80,
-	0x5D3B5DC0, 0x5D3A2100, 0x5D38E440,
-	0x5D37A780, 0x5D366AC0, 0x5D352E00,
-	0x5D33F140, 0x5D32B480, 0x5D3177C0,
-	0x5D303B00, 0x5D2EFE40, 0x5D2DC180,
-	0x5D2C84C0, 0x5D2B4800, 0x5D2A0B40,
-	0x5D28CE80, 0x5D2791C0, 0x5D265500,
-	0x5D251840, 0x5D23DB80, 0x5D229EC0,
-	0x5D216200, 0x5D202540, 0x5D1EE880,
-	0x5D1DABC0, 0x5D1C6F00, 0x5D1B3240,
-	0x5D19F580, 0x5D18B8C0, 0x5D177C00,
-	0x5D163F40, 0x5D150280, 0x5D13C5C0,
-	0x5D128900, 0x5D114C40, 0x5D100F80,
-	0x5D0ED2C0, 0x5D0D9600, 0x5D0C5940,
-	0x5D0B1C80, 0x5D09DFC0, 0x5D08A300,
-	0x5D076640, 0x5D062980, 0x5D04ECC0,
-	0x5D03B000, 0x5D027340, 0x5D013680,
-	0x5CFFF9C0, 0x5CFEBD00, 0x5CFD8040,
-	0x5CFC4380, 0x5CFB06C0, 0x5CF9CA00,
-	0x5CF88D40, 0x5CF75080, 0x5CF613C0,
-	0x5CF4D700, 0x5CF39A40, 0x5CF25D80,
-	0x5CF120C0, 0x5CEFE400, 0x5CEEA740,
-	0x5CED6A80, 0x5CEC2DC0, 0x5CEAF100,
-	0x5CE9B440, 0x5CE87780, 0x5CE73AC0,
-	0x5CE5FE00, 0x5CE4C140, 0x5CE38480,
-	0x5CE247C0, 0x5CE10B00, 0x5CDFCE40,
-	0x5CDE9180, 0x5CDD54C0, 0x5CDC1800,
-	0x5CDADB40, 0x5CD99E80, 0x5CD861C0,
-	0x5CD72500, 0x5CD5E840, 0x5CD4AB80,
-	0x5CD36EC0, 0x5CD23200, 0x5CD0F540,
-	0x5CCFB880, 0x5CCE7BC0, 0x5CCD3F00,
-	0x5CCC0240, 0x5CCAC580, 0x5CC988C0,
-	0x5CC84C00, 0x5CC70F40, 0x5CC5D280,
-	0x5CC495C0, 0x5CC35900, 0x5CC21C40,
-	0x5CC0DF80, 0x5CBFA2C0, 0x5CBE6600,
-	0x5CBD2940, 0x5CBBEC80, 0x5CBAAFC0,
-	0x5CB97300, 0x5CB83640, 0x5CB6F980,
-	0x5CB5BCC0, 0x5CB48000, 0x5CB34340,
-	0x5CB20680, 0x5CB0C9C0, 0x5CAF8D00,
-	0x5CAE5040, 0x5CAD1380, 0x5CABD6C0,
-	0x5CAA9A00, 0x5CA95D40, 0x5CA82080,
-	0x5CA6E3C0, 0x5CA5A700, 0x5CA46A40,
-	0x5CA32D80, 0x5CA1F0C0, 0x5CA0B400,
-	0x5C9F7740, 0x5C9E3A80, 0x5C9CFDC0,
-	0x5C9BC100, 0x5C9A8440, 0x5C994780,
-	0x5C980AC0, 0x5C96CE00, 0x5C959140,
-	0x5C945480, 0x5C9317C0, 0x5C91DB00,
-	0x5C909E40, 0x5C8F6180, 0x5C8E24C0,
-	0x5C8CE800, 0x5C8BAB40, 0x5C8A6E80,
-	0x5C8931C0, 0x5C87F500, 0x5C86B840,
-	0x5C857B80, 0x5C843EC0, 0x5C830200,
-	0x5C81C540, 0x5C808880, 0x5C7F4BC0,
-	0x5C7E0F00, 0x5C7CD240, 0x5C7B9580,
-	0x5C7A58C0, 0x5C791C00, 0x5C77DF40,
-	0x5C76A280, 0x5C7565C0, 0x5C742900,
-	0x5C72EC40, 0x5C71AF80, 0x5C7072C0,
-	0x5C6F3600, 0x5C6DF940, 0x5C6CBC80,
-	0x5C6B7FC0, 0x5C6A4300, 0x5C690640,
-	0x5C67C980, 0x5C668CC0, 0x5C655000,
-	0x5C641340, 0x5C62D680, 0x5C6199C0,
-	0x5C605D00, 0x5C5F2040, 0x5C5DE380,
-	0x5C5CA6C0, 0x5C5B6A00, 0x5C5A2D40,
-	0x5C58F080, 0x5C57B3C0, 0x5C567700,
-	0x5C553A40, 0x5C53FD80, 0x5C52C0C0,
-	0x5C518400, 0x5C504740, 0x5C4F0A80,
-	0x5C4DCDC0, 0x5C4C9100, 0x5C4B5440,
-	0x5C4A1780, 0x5C48DAC0, 0x5C479E00,
-	0x5C466140, 0x5C452480, 0x5C43E7C0,
-	0x5C42AB00, 0x5C416E40, 0x5C403180,
-	0x5C3EF4C0, 0x5C3DB800, 0x5C3C7B40,
-	0x5C3B3E80, 0x5C3A01C0, 0x5C38C500,
-	0x5C378840, 0x5C364B80, 0x5C350EC0,
-	0x5C33D200, 0x5C329540, 0x5C315880,
-	0x5C301BC0, 0x5C2EDF00, 0x5C2DA240,
-	0x5C2C6580, 0x5C2B28C0, 0x5C29EC00,
-	0x5C28AF40, 0x5C277280, 0x5C2635C0,
-	0x5C24F900, 0x5C23BC40, 0x5C227F80,
-	0x5C2142C0, 0x5C200600, 0x5C1EC940,
-	0x5C1D8C80, 0x5C1C4FC0, 0x5C1B1300,
-	0x5C19D640, 0x5C189980, 0x5C175CC0,
-	0x5C162000, 0x5C14E340, 0x5C13A680,
-	0x5C1269C0, 0x5C112D00, 0x5C0FF040,
-	0x5C0EB380, 0x5C0D76C0, 0x5C0C3A00,
-	0x5C0AFD40, 0x5C09C080, 0x5C0883C0,
-	0x5C074700, 0x5C060A40, 0x5C04CD80,
-	0x5C0390C0, 0x5C025400, 0x5C011740,
-	0x5BFFDA80, 0x5BFE9DC0, 0x5BFD6100,
-	0x5BFC2440, 0x5BFAE780, 0x5BF9AAC0,
-	0x5BF86E00, 0x5BF73140, 0x5BF5F480,
-	0x5BF4B7C0, 0x5BF37B00, 0x5BF23E40,
-	0x5BF10180, 0x5BEFC4C0, 0x5BEE8800,
-	0x5BED4B40, 0x5BEC0E80, 0x5BEAD1C0,
-	0x5BE99500, 0x5BE85840, 0x5BE71B80,
-	0x5BE5DEC0, 0x5BE4A200, 0x5BE36540,
-	0x5BE22880, 0x5BE0EBC0, 0x5BDFAF00,
-	0x5BDE7240, 0x5BDD3580, 0x5BDBF8C0,
-	0x5BDABC00, 0x5BD97F40, 0x5BD84280,
-	0x5BD705C0, 0x5BD5C900, 0x5BD48C40,
-	0x5BD34F80, 0x5BD212C0, 0x5BD0D600,
-	0x5BCF9940, 0x5BCE5C80, 0x5BCD1FC0,
-	0x5BCBE300, 0x5BCAA640, 0x5BC96980,
-	0x5BC82CC0, 0x5BC6F000, 0x5BC5B340,
-	0x5BC47680, 0x5BC339C0, 0x5BC1FD00,
-	0x5BC0C040, 0x5BBF8380, 0x5BBE46C0,
-	0x5BBD0A00, 0x5BBBCD40, 0x5BBA9080,
-	0x5BB953C0, 0x5BB81700, 0x5BB6DA40,
-	0x5BB59D80, 0x5BB460C0, 0x5BB32400,
-	0x5BB1E740, 0x5BB0AA80, 0x5BAF6DC0,
-	0x5BAE3100, 0x5BACF440, 0x5BABB780,
-	0x5BAA7AC0, 0x5BA93E00, 0x5BA80140,
-	0x5BA6C480, 0x5BA587C0, 0x5BA44B00,
-	0x5BA30E40, 0x5BA1D180, 0x5BA094C0,
-	0x5B9F5800, 0x5B9E1B40, 0x5B9CDE80,
-	0x5B9BA1C0, 0x5B9A6500, 0x5B992840,
-	0x5B97EB80, 0x5B96AEC0, 0x5B957200,
-	0x5B943540, 0x5B92F880, 0x5B91BBC0,
-	0x5B907F00, 0x5B8F4240, 0x5B8E0580,
-	0x5B8CC8C0, 0x5B8B8C00, 0x5B8A4F40,
-	0x5B891280, 0x5B87D5C0, 0x5B869900,
-	0x5B855C40, 0x5B841F80, 0x5B82E2C0,
-	0x5B81A600, 0x5B806940, 0x5B7F2C80,
-	0x5B7DEFC0, 0x5B7CB300, 0x5B7B7640,
-	0x5B7A3980, 0x5B78FCC0, 0x5B77C000,
-	0x5B768340, 0x5B754680, 0x5B7409C0,
-	0x5B72CD00, 0x5B719040, 0x5B705380,
-	0x5B6F16C0, 0x5B6DDA00, 0x5B6C9D40,
-	0x5B6B6080, 0x5B6A23C0, 0x5B68E700,
-	0x5B67AA40, 0x5B666D80, 0x5B6530C0,
-	0x5B63F400, 0x5B62B740, 0x5B617A80,
-	0x5B603DC0, 0x5B5F0100, 0x5B5DC440,
-	0x5B5C8780, 0x5B5B4AC0, 0x5B5A0E00,
-	0x5B58D140, 0x5B579480, 0x5B5657C0,
-	0x5B551B00, 0x5B53DE40, 0x5B52A180,
-	0x5B5164C0, 0x5B502800, 0x5B4EEB40,
-	0x5B4DAE80, 0x5B4C71C0, 0x5B4B3500,
-	0x5B49F840, 0x5B48BB80, 0x5B477EC0,
-	0x5B464200, 0x5B450540, 0x5B43C880,
-	0x5B428BC0, 0x5B414F00, 0x5B401240,
-	0x5B3ED580, 0x5B3D98C0, 0x5B3C5C00,
-	0x5B3B1F40, 0x5B39E280, 0x5B38A5C0,
-	0x5B376900, 0x5B362C40, 0x5B34EF80,
-	0x5B33B2C0, 0x5B327600, 0x5B313940,
-	0x5B2FFC80, 0x5B2EBFC0, 0x5B2D8300,
-	0x5B2C4640, 0x5B2B0980, 0x5B29CCC0,
-	0x5B289000, 0x5B275340, 0x5B261680,
-	0x5B24D9C0, 0x5B239D00, 0x5B226040,
-	0x5B212380, 0x5B1FE6C0, 0x5B1EAA00,
-	0x5B1D6D40, 0x5B1C3080, 0x5B1AF3C0,
-	0x5B19B700, 0x5B187A40, 0x5B173D80,
-	0x5B1600C0, 0x5B14C400, 0x5B138740,
-	0x5B124A80, 0x5B110DC0, 0x5B0FD100,
-	0x5B0E9440, 0x5B0D5780, 0x5B0C1AC0,
-	0x5B0ADE00, 0x5B09A140, 0x5B086480,
-	0x5B0727C0, 0x5B05EB00, 0x5B04AE40,
-	0x5B037180, 0x5B0234C0, 0x5B00F800,
-	0x5AFFBB40, 0x5AFE7E80, 0x5AFD41C0,
-	0x5AFC0500, 0x5AFAC840, 0x5AF98B80,
-	0x5AF84EC0, 0x5AF71200, 0x5AF5D540,
-	0x5AF49880, 0x5AF35BC0, 0x5AF21F00,
-	0x5AF0E240, 0x5AEFA580, 0x5AEE68C0,
-	0x5AED2C00, 0x5AEBEF40, 0x5AEAB280,
-	0x5AE975C0, 0x5AE83900, 0x5AE6FC40,
-	0x5AE5BF80, 0x5AE482C0, 0x5AE34600,
-	0x5AE20940, 0x5AE0CC80, 0x5ADF8FC0,
-	0x5ADE5300, 0x5ADD1640, 0x5ADBD980,
-	0x5ADA9CC0, 0x5AD96000, 0x5AD82340,
-	0x5AD6E680, 0x5AD5A9C0, 0x5AD46D00,
-	0x5AD33040, 0x5AD1F380, 0x5AD0B6C0,
-	0x5ACF7A00, 0x5ACE3D40, 0x5ACD0080,
-	0x5ACBC3C0, 0x5ACA8700, 0x5AC94A40,
-	0x5AC80D80, 0x5AC6D0C0, 0x5AC59400,
-	0x5AC45740, 0x5AC31A80, 0x5AC1DDC0,
-	0x5AC0A100, 0x5ABF6440, 0x5ABE2780,
-	0x5ABCEAC0, 0x5ABBAE00, 0x5ABA7140,
-	0x5AB93480, 0x5AB7F7C0, 0x5AB6BB00,
-	0x5AB57E40, 0x5AB44180, 0x5AB304C0,
-	0x5AB1C800, 0x5AB08B40, 0x5AAF4E80,
-	0x5AAE11C0, 0x5AACD500, 0x5AAB9840,
-	0x5AAA5B80, 0x5AA91EC0, 0x5AA7E200,
-	0x5AA6A540, 0x5AA56880, 0x5AA42BC0,
-	0x5AA2EF00, 0x5AA1B240, 0x5AA07580,
-	0x5A9F38C0, 0x5A9DFC00, 0x5A9CBF40,
-	0x5A9B8280, 0x5A9A45C0, 0x5A990900,
-	0x5A97CC40, 0x5A968F80, 0x5A9552C0,
-	0x5A941600, 0x5A92D940, 0x5A919C80,
-	0x5A905FC0, 0x5A8F2300, 0x5A8DE640,
-	0x5A8CA980, 0x5A8B6CC0, 0x5A8A3000,
-	0x5A88F340, 0x5A87B680, 0x5A8679C0,
-	0x5A853D00, 0x5A840040, 0x5A82C380,
-	0x5A8186C0, 0x5A804A00, 0x5A7F0D40,
-	0x5A7DD080, 0x5A7C93C0, 0x5A7B5700,
-	0x5A7A1A40, 0x5A78DD80, 0x5A77A0C0,
-	0x5A766400, 0x5A752740, 0x5A73EA80,
-	0x5A72ADC0, 0x5A717100, 0x5A703440,
-	0x5A6EF780, 0x5A6DBAC0, 0x5A6C7E00,
-	0x5A6B4140, 0x5A6A0480, 0x5A68C7C0,
-	0x5A678B00, 0x5A664E40, 0x5A651180,
-	0x5A63D4C0, 0x5A629800, 0x5A615B40,
-	0x5A601E80, 0x5A5EE1C0, 0x5A5DA500,
-	0x5A5C6840, 0x5A5B2B80, 0x5A59EEC0,
-	0x5A58B200, 0x5A577540, 0x5A563880,
-	0x5A54FBC0, 0x5A53BF00, 0x5A528240,
-	0x5A514580, 0x5A5008C0, 0x5A4ECC00,
-	0x5A4D8F40, 0x5A4C5280, 0x5A4B15C0,
-	0x5A49D900, 0x5A489C40, 0x5A475F80,
-	0x5A4622C0, 0x5A44E600, 0x5A43A940,
-	0x5A426C80, 0x5A412FC0, 0x5A3FF300,
-	0x5A3EB640, 0x5A3D7980, 0x5A3C3CC0,
-	0x5A3B0000, 0x5A39C340, 0x5A388680,
-	0x5A3749C0, 0x5A360D00, 0x5A34D040,
-	0x5A339380, 0x5A3256C0, 0x5A311A00,
-	0x5A2FDD40, 0x5A2EA080, 0x5A2D63C0,
-	0x5A2C2700, 0x5A2AEA40, 0x5A29AD80,
-	0x5A2870C0, 0x5A273400, 0x5A25F740,
-	0x5A24BA80, 0x5A237DC0, 0x5A224100,
-	0x5A210440, 0x5A1FC780, 0x5A1E8AC0,
-	0x5A1D4E00, 0x5A1C1140, 0x5A1AD480,
-	0x5A1997C0, 0x5A185B00, 0x5A171E40,
-	0x5A15E180, 0x5A14A4C0, 0x5A136800,
-	0x5A122B40, 0x5A10EE80, 0x5A0FB1C0,
-	0x5A0E7500, 0x5A0D3840, 0x5A0BFB80,
-	0x5A0ABEC0, 0x5A098200, 0x5A084540,
-	0x5A070880, 0x5A05CBC0, 0x5A048F00,
-	0x5A035240, 0x5A021580, 0x5A00D8C0,
-	0x59FF9C00, 0x59FE5F40, 0x59FD2280,
-	0x59FBE5C0, 0x59FAA900, 0x59F96C40,
-	0x59F82F80, 0x59F6F2C0, 0x59F5B600,
-	0x59F47940, 0x59F33C80, 0x59F1FFC0,
-	0x59F0C300, 0x59EF8640, 0x59EE4980,
-	0x59ED0CC0, 0x59EBD000, 0x59EA9340,
-	0x59E95680, 0x59E819C0, 0x59E6DD00,
-	0x59E5A040, 0x59E46380, 0x59E326C0,
-	0x59E1EA00, 0x59E0AD40, 0x59DF7080,
-	0x59DE33C0, 0x59DCF700, 0x59DBBA40,
-	0x59DA7D80, 0x59D940C0, 0x59D80400,
-	0x59D6C740, 0x59D58A80, 0x59D44DC0,
-	0x59D31100, 0x59D1D440, 0x59D09780,
-	0x59CF5AC0, 0x59CE1E00, 0x59CCE140,
-	0x59CBA480, 0x59CA67C0, 0x59C92B00,
-	0x59C7EE40, 0x59C6B180, 0x59C574C0,
-	0x59C43800, 0x59C2FB40, 0x59C1BE80,
-	0x59C081C0, 0x59BF4500, 0x59BE0840,
-	0x59BCCB80, 0x59BB8EC0, 0x59BA5200,
-	0x59B91540, 0x59B7D880, 0x59B69BC0,
-	0x59B55F00, 0x59B42240, 0x59B2E580,
-	0x59B1A8C0, 0x59B06C00, 0x59AF2F40,
-	0x59ADF280, 0x59ACB5C0, 0x59AB7900,
-	0x59AA3C40, 0x59A8FF80, 0x59A7C2C0,
-	0x59A68600, 0x59A54940, 0x59A40C80,
-	0x59A2CFC0, 0x59A19300, 0x59A05640,
-	0x599F1980, 0x599DDCC0, 0x599CA000,
-	0x599B6340, 0x599A2680, 0x5998E9C0,
-	0x5997AD00, 0x59967040, 0x59953380,
-	0x5993F6C0, 0x5992BA00, 0x59917D40,
-	0x59904080, 0x598F03C0, 0x598DC700,
-	0x598C8A40, 0x598B4D80, 0x598A10C0,
-	0x5988D400, 0x59879740, 0x59865A80,
-	0x59851DC0, 0x5983E100, 0x5982A440,
-	0x59816780, 0x59802AC0, 0x597EEE00,
-	0x597DB140, 0x597C7480, 0x597B37C0,
-	0x5979FB00, 0x5978BE40, 0x59778180,
-	0x597644C0, 0x59750800, 0x5973CB40,
-	0x59728E80, 0x597151C0, 0x59701500,
-	0x596ED840, 0x596D9B80, 0x596C5EC0,
-	0x596B2200, 0x5969E540, 0x5968A880,
-	0x59676BC0, 0x59662F00, 0x5964F240,
-	0x5963B580, 0x596278C0, 0x59613C00,
-	0x595FFF40, 0x595EC280, 0x595D85C0,
-	0x595C4900, 0x595B0C40, 0x5959CF80,
-	0x595892C0, 0x59575600, 0x59561940,
-	0x5954DC80, 0x59539FC0, 0x59526300,
-	0x59512640, 0x594FE980, 0x594EACC0,
-	0x594D7000, 0x594C3340, 0x594AF680,
-	0x5949B9C0, 0x59487D00, 0x59474040,
-	0x59460380, 0x5944C6C0, 0x59438A00,
-	0x59424D40, 0x59411080, 0x593FD3C0,
-	0x593E9700, 0x593D5A40, 0x593C1D80,
-	0x593AE0C0, 0x5939A400, 0x59386740,
-	0x59372A80, 0x5935EDC0, 0x5934B100,
-	0x59337440, 0x59323780, 0x5930FAC0,
-	0x592FBE00, 0x592E8140, 0x592D4480,
-	0x592C07C0, 0x592ACB00, 0x59298E40,
-	0x59285180, 0x592714C0, 0x5925D800,
-	0x59249B40, 0x59235E80, 0x592221C0,
-	0x5920E500, 0x591FA840, 0x591E6B80,
-	0x591D2EC0, 0x591BF200, 0x591AB540,
-	0x59197880, 0x59183BC0, 0x5916FF00,
-	0x5915C240, 0x59148580, 0x591348C0,
-	0x59120C00, 0x5910CF40, 0x590F9280,
-	0x590E55C0, 0x590D1900, 0x590BDC40,
-	0x590A9F80, 0x590962C0, 0x59082600,
-	0x5906E940, 0x5905AC80, 0x59046FC0,
-	0x59033300, 0x5901F640, 0x5900B980,
-	0x58FF7CC0, 0x58FE4000, 0x58FD0340,
-	0x58FBC680, 0x58FA89C0, 0x58F94D00,
-	0x58F81040, 0x58F6D380, 0x58F596C0,
-	0x58F45A00, 0x58F31D40, 0x58F1E080,
-	0x58F0A3C0, 0x58EF6700, 0x58EE2A40,
-	0x58ECED80, 0x58EBB0C0, 0x58EA7400,
-	0x58E93740, 0x58E7FA80, 0x58E6BDC0,
-	0x58E58100, 0x58E44440, 0x58E30780,
-	0x58E1CAC0, 0x58E08E00, 0x58DF5140,
-	0x58DE1480, 0x58DCD7C0, 0x58DB9B00,
-	0x58DA5E40, 0x58D92180, 0x58D7E4C0,
-	0x58D6A800, 0x58D56B40, 0x58D42E80,
-	0x58D2F1C0, 0x58D1B500, 0x58D07840,
-	0x58CF3B80, 0x58CDFEC0, 0x58CCC200,
-	0x58CB8540, 0x58CA4880, 0x58C90BC0,
-	0x58C7CF00, 0x58C69240, 0x58C55580,
-	0x58C418C0, 0x58C2DC00, 0x58C19F40,
-	0x58C06280, 0x58BF25C0, 0x58BDE900,
-	0x58BCAC40, 0x58BB6F80, 0x58BA32C0,
-	0x58B8F600, 0x58B7B940, 0x58B67C80,
-	0x58B53FC0, 0x58B40300, 0x58B2C640,
-	0x58B18980, 0x58B04CC0, 0x58AF1000,
-	0x58ADD340, 0x58AC9680, 0x58AB59C0,
-	0x58AA1D00, 0x58A8E040, 0x58A7A380,
-	0x58A666C0, 0x58A52A00, 0x58A3ED40,
-	0x58A2B080, 0x58A173C0, 0x58A03700,
-	0x589EFA40, 0x589DBD80, 0x589C80C0,
-	0x589B4400, 0x589A0740, 0x5898CA80,
-	0x58978DC0, 0x58965100, 0x58951440,
-	0x5893D780, 0x58929AC0, 0x58915E00,
-	0x58902140, 0x588EE480, 0x588DA7C0,
-	0x588C6B00, 0x588B2E40, 0x5889F180,
-	0x5888B4C0, 0x58877800, 0x58863B40,
-	0x5884FE80, 0x5883C1C0, 0x58828500,
-	0x58814840, 0x58800B80, 0x587ECEC0,
-	0x587D9200, 0x587C5540, 0x587B1880,
-	0x5879DBC0, 0x58789F00, 0x58776240,
-	0x58762580, 0x5874E8C0, 0x5873AC00,
-	0x58726F40, 0x58713280, 0x586FF5C0,
-	0x586EB900, 0x586D7C40, 0x586C3F80,
-	0x586B02C0, 0x5869C600, 0x58688940,
-	0x58674C80, 0x58660FC0, 0x5864D300,
-	0x58639640, 0x58625980, 0x58611CC0,
-	0x585FE000, 0x585EA340, 0x585D6680,
-	0x585C29C0, 0x585AED00, 0x5859B040,
-	0x58587380, 0x585736C0, 0x5855FA00,
-	0x5854BD40, 0x58538080, 0x585243C0,
-	0x58510700, 0x584FCA40, 0x584E8D80,
-	0x584D50C0, 0x584C1400, 0x584AD740,
-	0x58499A80, 0x58485DC0, 0x58472100,
-	0x5845E440, 0x5844A780, 0x58436AC0,
-	0x58422E00, 0x5840F140, 0x583FB480,
-	0x583E77C0, 0x583D3B00, 0x583BFE40,
-	0x583AC180, 0x583984C0, 0x58384800,
-	0x58370B40, 0x5835CE80, 0x583491C0,
-	0x58335500, 0x58321840, 0x5830DB80,
-	0x582F9EC0, 0x582E6200, 0x582D2540,
-	0x582BE880, 0x582AABC0, 0x58296F00,
-	0x58283240, 0x5826F580, 0x5825B8C0,
-	0x58247C00, 0x58233F40, 0x58220280,
-	0x5820C5C0, 0x581F8900, 0x581E4C40,
-	0x581D0F80, 0x581BD2C0, 0x581A9600,
-	0x58195940, 0x58181C80, 0x5816DFC0,
-	0x5815A300, 0x58146640, 0x58132980,
-	0x5811ECC0, 0x5810B000, 0x580F7340,
-	0x580E3680, 0x580CF9C0, 0x580BBD00,
-	0x580A8040, 0x58094380, 0x580806C0,
-	0x5806CA00, 0x58058D40, 0x58045080,
-	0x580313C0, 0x5801D700, 0x58009A40,
-	0x57FF5D80, 0x57FE20C0, 0x57FCE400,
-	0x57FBA740, 0x57FA6A80, 0x57F92DC0,
-	0x57F7F100, 0x57F6B440, 0x57F57780,
-	0x57F43AC0, 0x57F2FE00, 0x57F1C140,
-	0x57F08480, 0x57EF47C0, 0x57EE0B00,
-	0x57ECCE40, 0x57EB9180, 0x57EA54C0,
-	0x57E91800, 0x57E7DB40, 0x57E69E80,
-	0x57E561C0, 0x57E42500, 0x57E2E840,
-	0x57E1AB80, 0x57E06EC0, 0x57DF3200,
-	0x57DDF540, 0x57DCB880, 0x57DB7BC0,
-	0x57DA3F00, 0x57D90240, 0x57D7C580,
-	0x57D688C0, 0x57D54C00, 0x57D40F40,
-	0x57D2D280, 0x57D195C0, 0x57D05900,
-	0x57CF1C40, 0x57CDDF80, 0x57CCA2C0,
-	0x57CB6600, 0x57CA2940, 0x57C8EC80,
-	0x57C7AFC0, 0x57C67300, 0x57C53640,
-	0x57C3F980, 0x57C2BCC0, 0x57C18000,
-	0x57C04340, 0x57BF0680, 0x57BDC9C0,
-	0x57BC8D00, 0x57BB5040, 0x57BA1380,
-	0x57B8D6C0, 0x57B79A00, 0x57B65D40,
-	0x57B52080, 0x57B3E3C0, 0x57B2A700,
-	0x57B16A40, 0x57B02D80, 0x57AEF0C0,
-	0x57ADB400, 0x57AC7740, 0x57AB3A80,
-	0x57A9FDC0, 0x57A8C100, 0x57A78440,
-	0x57A64780, 0x57A50AC0, 0x57A3CE00,
-	0x57A29140, 0x57A15480, 0x57A017C0,
-	0x579EDB00, 0x579D9E40, 0x579C6180,
-	0x579B24C0, 0x5799E800, 0x5798AB40,
-	0x57976E80, 0x579631C0, 0x5794F500,
-	0x5793B840, 0x57927B80, 0x57913EC0,
-	0x57900200, 0x578EC540, 0x578D8880,
-	0x578C4BC0, 0x578B0F00, 0x5789D240,
-	0x57889580, 0x578758C0, 0x57861C00,
-	0x5784DF40, 0x5783A280, 0x578265C0,
-	0x57812900, 0x577FEC40, 0x577EAF80,
-	0x577D72C0, 0x577C3600, 0x577AF940,
-	0x5779BC80, 0x57787FC0, 0x57774300,
-	0x57760640, 0x5774C980, 0x57738CC0,
-	0x57725000, 0x57711340, 0x576FD680,
-	0x576E99C0, 0x576D5D00, 0x576C2040,
-	0x576AE380, 0x5769A6C0, 0x57686A00,
-	0x57672D40, 0x5765F080, 0x5764B3C0,
-	0x57637700, 0x57623A40, 0x5760FD80,
-	0x575FC0C0, 0x575E8400, 0x575D4740,
-	0x575C0A80, 0x575ACDC0, 0x57599100,
-	0x57585440, 0x57571780, 0x5755DAC0,
-	0x57549E00, 0x57536140, 0x57522480,
-	0x5750E7C0, 0x574FAB00, 0x574E6E40,
-	0x574D3180, 0x574BF4C0, 0x574AB800,
-	0x57497B40, 0x57483E80, 0x574701C0,
-	0x5745C500, 0x57448840, 0x57434B80,
-	0x57420EC0, 0x5740D200, 0x573F9540,
-	0x573E5880, 0x573D1BC0, 0x573BDF00,
-	0x573AA240, 0x57396580, 0x573828C0,
-	0x5736EC00, 0x5735AF40, 0x57347280,
-	0x573335C0, 0x5731F900, 0x5730BC40,
-	0x572F7F80, 0x572E42C0, 0x572D0600,
-	0x572BC940, 0x572A8C80, 0x57294FC0,
-	0x57281300, 0x5726D640, 0x57259980,
-	0x57245CC0, 0x57232000, 0x5721E340,
-	0x5720A680, 0x571F69C0, 0x571E2D00,
-	0x571CF040, 0x571BB380, 0x571A76C0,
-	0x57193A00, 0x5717FD40, 0x5716C080,
-	0x571583C0, 0x57144700, 0x57130A40,
-	0x5711CD80, 0x571090C0, 0x570F5400,
-	0x570E1740, 0x570CDA80, 0x570B9DC0,
-	0x570A6100, 0x57092440, 0x5707E780,
-	0x5706AAC0, 0x57056E00, 0x57043140,
-	0x5702F480, 0x5701B7C0, 0x57007B00,
-	0x56FF3E40, 0x56FE0180, 0x56FCC4C0,
-	0x56FB8800, 0x56FA4B40, 0x56F90E80,
-	0x56F7D1C0, 0x56F69500, 0x56F55840,
-	0x56F41B80, 0x56F2DEC0, 0x56F1A200,
-	0x56F06540, 0x56EF2880, 0x56EDEBC0,
-	0x56ECAF00, 0x56EB7240, 0x56EA3580,
-	0x56E8F8C0, 0x56E7BC00, 0x56E67F40,
-	0x56E54280, 0x56E405C0, 0x56E2C900,
-	0x56E18C40, 0x56E04F80, 0x56DF12C0,
-	0x56DDD600, 0x56DC9940, 0x56DB5C80,
-	0x56DA1FC0, 0x56D8E300, 0x56D7A640,
-	0x56D66980, 0x56D52CC0, 0x56D3F000,
-	0x56D2B340, 0x56D17680, 0x56D039C0,
-	0x56CEFD00, 0x56CDC040, 0x56CC8380,
-	0x56CB46C0, 0x56CA0A00, 0x56C8CD40,
-	0x56C79080, 0x56C653C0, 0x56C51700,
-	0x56C3DA40, 0x56C29D80, 0x56C160C0,
-	0x56C02400, 0x56BEE740, 0x56BDAA80,
-	0x56BC6DC0, 0x56BB3100, 0x56B9F440,
-	0x56B8B780, 0x56B77AC0, 0x56B63E00,
-	0x56B50140, 0x56B3C480, 0x56B287C0,
-	0x56B14B00, 0x56B00E40, 0x56AED180,
-	0x56AD94C0, 0x56AC5800, 0x56AB1B40,
-	0x56A9DE80, 0x56A8A1C0, 0x56A76500,
-	0x56A62840, 0x56A4EB80, 0x56A3AEC0,
-	0x56A27200, 0x56A13540, 0x569FF880,
-	0x569EBBC0, 0x569D7F00, 0x569C4240,
-	0x569B0580, 0x5699C8C0, 0x56988C00,
-	0x56974F40, 0x56961280, 0x5694D5C0,
-	0x56939900, 0x56925C40, 0x56911F80,
-	0x568FE2C0, 0x568EA600, 0x568D6940,
-	0x568C2C80, 0x568AEFC0, 0x5689B300,
-	0x56887640, 0x56873980, 0x5685FCC0,
-	0x5684C000, 0x56838340, 0x56824680,
-	0x568109C0, 0x567FCD00, 0x567E9040,
-	0x567D5380, 0x567C16C0, 0x567ADA00,
-	0x56799D40, 0x56786080, 0x567723C0,
-	0x5675E700, 0x5674AA40, 0x56736D80,
-	0x567230C0, 0x5670F400, 0x566FB740,
-	0x566E7A80, 0x566D3DC0, 0x566C0100,
-	0x566AC440, 0x56698780, 0x56684AC0,
-	0x56670E00, 0x5665D140, 0x56649480,
-	0x566357C0, 0x56621B00, 0x5660DE40,
-	0x565FA180, 0x565E64C0, 0x565D2800,
-	0x565BEB40, 0x565AAE80, 0x565971C0,
-	0x56583500, 0x5656F840, 0x5655BB80,
-	0x56547EC0, 0x56534200, 0x56520540,
-	0x5650C880, 0x564F8BC0, 0x564E4F00,
-	0x564D1240, 0x564BD580, 0x564A98C0,
-	0x56495C00, 0x56481F40, 0x5646E280,
-	0x5645A5C0, 0x56446900, 0x56432C40,
-	0x5641EF80, 0x5640B2C0, 0x563F7600,
-	0x563E3940, 0x563CFC80, 0x563BBFC0,
-	0x563A8300, 0x56394640, 0x56380980,
-	0x5636CCC0, 0x56359000, 0x56345340,
-	0x56331680, 0x5631D9C0, 0x56309D00,
-	0x562F6040, 0x562E2380, 0x562CE6C0,
-	0x562BAA00, 0x562A6D40, 0x56293080,
-	0x5627F3C0, 0x5626B700, 0x56257A40,
-	0x56243D80, 0x562300C0, 0x5621C400,
-	0x56208740, 0x561F4A80, 0x561E0DC0,
-	0x561CD100, 0x561B9440, 0x561A5780,
-	0x56191AC0, 0x5617DE00, 0x5616A140,
-	0x56156480, 0x561427C0, 0x5612EB00,
-	0x5611AE40, 0x56107180, 0x560F34C0,
-	0x560DF800, 0x560CBB40, 0x560B7E80,
-	0x560A41C0, 0x56090500, 0x5607C840,
-	0x56068B80, 0x56054EC0, 0x56041200,
-	0x5602D540, 0x56019880, 0x56005BC0,
-	0x55FF1F00, 0x55FDE240, 0x55FCA580,
-	0x55FB68C0, 0x55FA2C00, 0x55F8EF40,
-	0x55F7B280, 0x55F675C0, 0x55F53900,
-	0x55F3FC40, 0x55F2BF80, 0x55F182C0,
-	0x55F04600, 0x55EF0940, 0x55EDCC80,
-	0x55EC8FC0, 0x55EB5300, 0x55EA1640,
-	0x55E8D980, 0x55E79CC0, 0x55E66000,
-	0x55E52340, 0x55E3E680, 0x55E2A9C0,
-	0x55E16D00, 0x55E03040, 0x55DEF380,
-	0x55DDB6C0, 0x55DC7A00, 0x55DB3D40,
-	0x55DA0080, 0x55D8C3C0, 0x55D78700,
-	0x55D64A40, 0x55D50D80, 0x55D3D0C0,
-	0x55D29400, 0x55D15740, 0x55D01A80,
-	0x55CEDDC0, 0x55CDA100, 0x55CC6440,
-	0x55CB2780, 0x55C9EAC0, 0x55C8AE00,
-	0x55C77140, 0x55C63480, 0x55C4F7C0,
-	0x55C3BB00, 0x55C27E40, 0x55C14180,
-	0x55C004C0, 0x55BEC800, 0x55BD8B40,
-	0x55BC4E80, 0x55BB11C0, 0x55B9D500,
-	0x55B89840, 0x55B75B80, 0x55B61EC0,
-	0x55B4E200, 0x55B3A540, 0x55B26880,
-	0x55B12BC0, 0x55AFEF00, 0x55AEB240,
-	0x55AD7580, 0x55AC38C0, 0x55AAFC00,
-	0x55A9BF40, 0x55A88280, 0x55A745C0,
-	0x55A60900, 0x55A4CC40, 0x55A38F80,
-	0x55A252C0, 0x55A11600, 0x559FD940,
-	0x559E9C80, 0x559D5FC0, 0x559C2300,
-	0x559AE640, 0x5599A980, 0x55986CC0,
-	0x55973000, 0x5595F340, 0x5594B680,
-	0x559379C0, 0x55923D00, 0x55910040,
-	0x558FC380, 0x558E86C0, 0x558D4A00,
-	0x558C0D40, 0x558AD080, 0x558993C0,
-	0x55885700, 0x55871A40, 0x5585DD80,
-	0x5584A0C0, 0x55836400, 0x55822740,
-	0x5580EA80, 0x557FADC0, 0x557E7100,
-	0x557D3440, 0x557BF780, 0x557ABAC0,
-	0x55797E00, 0x55784140, 0x55770480,
-	0x5575C7C0, 0x55748B00, 0x55734E40,
-	0x55721180, 0x5570D4C0, 0x556F9800,
-	0x556E5B40, 0x556D1E80, 0x556BE1C0,
-	0x556AA500, 0x55696840, 0x55682B80,
-	0x5566EEC0, 0x5565B200, 0x55647540,
-	0x55633880, 0x5561FBC0, 0x5560BF00,
-	0x555F8240, 0x555E4580, 0x555D08C0,
-	0x555BCC00, 0x555A8F40, 0x55595280,
-	0x555815C0, 0x5556D900, 0x55559C40,
-	0x55545F80, 0x555322C0, 0x5551E600,
-	0x5550A940, 0x554F6C80, 0x554E2FC0,
-	0x554CF300, 0x554BB640, 0x554A7980,
-	0x55493CC0, 0x554A0000, 0x5548DCC0,
-	0x5547B980, 0x55469640, 0x55457300,
-	0x55444FC0, 0x55432C80, 0x55420940,
-	0x5540E600, 0x553FC2C0, 0x553E9F80,
-	0x553D7C40, 0x553C5900, 0x553B35C0,
-	0x553A1280, 0x5538EF40, 0x5537CC00,
-	0x5536A8C0, 0x55358580, 0x55346240,
-	0x55333F00, 0x55321BC0, 0x5530F880,
-	0x552FD540, 0x552EB200, 0x552D8EC0,
-	0x552C6B80, 0x552B4840, 0x552A2500,
-	0x552901C0, 0x5527DE80, 0x5526BB40,
-	0x55259800, 0x552474C0, 0x55235180,
-	0x55222E40, 0x55210B00, 0x551FE7C0,
-	0x551EC480, 0x551DA140, 0x551C7E00,
-	0x551B5AC0, 0x551A3780, 0x55191440,
-	0x5517F100, 0x5516CDC0, 0x5515AA80,
-	0x55148740, 0x55136400, 0x551240C0,
-	0x55111D80, 0x550FFA40, 0x550ED700,
-	0x550DB3C0, 0x550C9080, 0x550B6D40,
-	0x550A4A00, 0x550926C0, 0x55080380,
-	0x5506E040, 0x5505BD00, 0x550499C0,
-	0x55037680, 0x55025340, 0x55013000,
-	0x55000CC0, 0x54FEE980, 0x54FDC640,
-	0x54FCA300, 0x54FB7FC0, 0x54FA5C80,
-	0x54F93940, 0x54F81600, 0x54F6F2C0,
-	0x54F5CF80, 0x54F4AC40, 0x54F38900,
-	0x54F265C0, 0x54F14280, 0x54F01F40,
-	0x54EEFC00, 0x54EDD8C0, 0x54ECB580,
-	0x54EB9240, 0x54EA6F00, 0x54E94BC0,
-	0x54E82880, 0x54E70540, 0x54E5E200,
-	0x54E4BEC0, 0x54E39B80, 0x54E27840,
-	0x54E15500, 0x54E031C0, 0x54DF0E80,
-	0x54DDEB40, 0x54DCC800, 0x54DBA4C0,
-	0x54DA8180, 0x54D95E40, 0x54D83B00,
-	0x54D717C0, 0x54D5F480, 0x54D4D140,
-	0x54D3AE00, 0x54D28AC0, 0x54D16780,
-	0x54D04440, 0x54CF2100, 0x54CDFDC0,
-	0x54CCDA80, 0x54CBB740, 0x54CA9400,
-	0x54C970C0, 0x54C84D80, 0x54C72A40,
-	0x54C60700, 0x54C4E3C0, 0x54C3C080,
-	0x54C29D40, 0x54C17A00, 0x54C056C0,
-	0x54BF3380, 0x54BE1040, 0x54BCED00,
-	0x54BBC9C0, 0x54BAA680, 0x54B98340,
-	0x54B86000, 0x54B73CC0, 0x54B61980,
-	0x54B4F640, 0x54B3D300, 0x54B2AFC0,
-	0x54B18C80, 0x54B06940, 0x54AF4600,
-	0x54AE22C0, 0x54ACFF80, 0x54ABDC40,
-	0x54AAB900, 0x54A995C0, 0x54A87280,
-	0x54A74F40, 0x54A62C00, 0x54A508C0,
-	0x54A3E580, 0x54A2C240, 0x54A19F00,
-	0x54A07BC0, 0x549F5880, 0x549E3540,
-	0x549D1200, 0x549BEEC0, 0x549ACB80,
-	0x5499A840, 0x54988500, 0x549761C0,
-	0x54963E80, 0x54951B40, 0x5493F800,
-	0x5492D4C0, 0x5491B180, 0x54908E40,
-	0x548F6B00, 0x548E47C0, 0x548D2480,
-	0x548C0140, 0x548ADE00, 0x5489BAC0,
-	0x54889780, 0x54877440, 0x54865100,
-	0x54852DC0, 0x54840A80, 0x5482E740,
-	0x5481C400, 0x5480A0C0, 0x547F7D80,
-	0x547E5A40, 0x547D3700, 0x547C13C0,
-	0x547AF080, 0x5479CD40, 0x5478AA00,
-	0x547786C0, 0x54766380, 0x54754040,
-	0x54741D00, 0x5472F9C0, 0x5471D680,
-	0x5470B340, 0x546F9000, 0x546E6CC0,
-	0x546D4980, 0x546C2640, 0x546B0300,
-	0x5469DFC0, 0x5468BC80, 0x54679940,
-	0x54667600, 0x546552C0, 0x54642F80,
-	0x54630C40, 0x5461E900, 0x5460C5C0,
-	0x545FA280, 0x545E7F40, 0x545D5C00,
-	0x545C38C0, 0x545B1580, 0x5459F240,
-	0x5458CF00, 0x5457ABC0, 0x54568880,
-	0x54556540, 0x54544200, 0x54531EC0,
-	0x5451FB80, 0x5450D840, 0x544FB500,
-	0x544E91C0, 0x544D6E80, 0x544C4B40,
-	0x544B2800, 0x544A04C0, 0x5448E180,
-	0x5447BE40, 0x54469B00, 0x544577C0,
-	0x54445480, 0x54433140, 0x54420E00,
-	0x5440EAC0, 0x543FC780, 0x543EA440,
-	0x543D8100, 0x543C5DC0, 0x543B3A80,
-	0x543A1740, 0x5438F400, 0x5437D0C0,
-	0x5436AD80, 0x54358A40, 0x54346700,
-	0x543343C0, 0x54322080, 0x5430FD40,
-	0x542FDA00, 0x542EB6C0, 0x542D9380,
-	0x542C7040, 0x542B4D00, 0x542A29C0,
-	0x54290680, 0x5427E340, 0x5426C000,
-	0x54259CC0, 0x54247980, 0x54235640,
-	0x54223300, 0x54210FC0, 0x541FEC80,
-	0x541EC940, 0x541DA600, 0x541C82C0,
-	0x541B5F80, 0x541A3C40, 0x54191900,
-	0x5417F5C0, 0x5416D280, 0x5415AF40,
-	0x54148C00, 0x541368C0, 0x54124580,
-	0x54112240, 0x540FFF00, 0x540EDBC0,
-	0x540DB880, 0x540C9540, 0x540B7200,
-	0x540A4EC0, 0x54092B80, 0x54080840,
-	0x5406E500, 0x5405C1C0, 0x54049E80,
-	0x54037B40, 0x54025800, 0x540134C0,
-	0x54001180, 0x53FEEE40, 0x53FDCB00,
-	0x53FCA7C0, 0x53FB8480, 0x53FA6140,
-	0x53F93E00, 0x53F81AC0, 0x53F6F780,
-	0x53F5D440, 0x53F4B100, 0x53F38DC0,
-	0x53F26A80, 0x53F14740, 0x53F02400,
-	0x53EF00C0, 0x53EDDD80, 0x53ECBA40,
-	0x53EB9700, 0x53EA73C0, 0x53E95080,
-	0x53E82D40, 0x53E70A00, 0x53E5E6C0,
-	0x53E4C380, 0x53E3A040, 0x53E27D00,
-	0x53E159C0, 0x53E03680, 0x53DF1340,
-	0x53DDF000, 0x53DCCCC0, 0x53DBA980,
-	0x53DA8640, 0x53D96300, 0x53D83FC0,
-	0x53D71C80, 0x53D5F940, 0x53D4D600,
-	0x53D3B2C0, 0x53D28F80, 0x53D16C40,
-	0x53D04900, 0x53CF25C0, 0x53CE0280,
-	0x53CCDF40, 0x53CBBC00, 0x53CA98C0,
-	0x53C97580, 0x53C85240, 0x53C72F00,
-	0x53C60BC0, 0x53C4E880, 0x53C3C540,
-	0x53C2A200, 0x53C17EC0, 0x53C05B80,
-	0x53BF3840, 0x53BE1500, 0x53BCF1C0,
-	0x53BBCE80, 0x53BAAB40, 0x53B98800,
-	0x53B864C0, 0x53B74180, 0x53B61E40,
-	0x53B4FB00, 0x53B3D7C0, 0x53B2B480,
-	0x53B19140, 0x53B06E00, 0x53AF4AC0,
-	0x53AE2780, 0x53AD0440, 0x53ABE100,
-	0x53AABDC0, 0x53A99A80, 0x53A87740,
-	0x53A75400, 0x53A630C0, 0x53A50D80,
-	0x53A3EA40, 0x53A2C700, 0x53A1A3C0,
-	0x53A08080, 0x539F5D40, 0x539E3A00,
-	0x539D16C0, 0x539BF380, 0x539AD040,
-	0x5399AD00, 0x539889C0, 0x53976680,
-	0x53964340, 0x53952000, 0x5393FCC0,
-	0x5392D980, 0x5391B640, 0x53909300,
-	0x538F6FC0, 0x538E4C80, 0x538D2940,
-	0x538C0600, 0x538AE2C0, 0x5389BF80,
-	0x53889C40, 0x53877900, 0x538655C0,
-	0x53853280, 0x53840F40, 0x5382EC00,
-	0x5381C8C0, 0x5380A580, 0x537F8240,
-	0x537E5F00, 0x537D3BC0, 0x537C1880,
-	0x537AF540, 0x5379D200, 0x5378AEC0,
-	0x53778B80, 0x53766840, 0x53754500,
-	0x537421C0, 0x5372FE80, 0x5371DB40,
-	0x5370B800, 0x536F94C0, 0x536E7180,
-	0x536D4E40, 0x536C2B00, 0x536B07C0,
-	0x5369E480, 0x5368C140, 0x53679E00,
-	0x53667AC0, 0x53655780, 0x53643440,
-	0x53631100, 0x5361EDC0, 0x5360CA80,
-	0x535FA740, 0x535E8400, 0x535D60C0,
-	0x535C3D80, 0x535B1A40, 0x5359F700,
-	0x5358D3C0, 0x5357B080, 0x53568D40,
-	0x53556A00, 0x535446C0, 0x53532380,
-	0x53520040, 0x5350DD00, 0x534FB9C0,
-	0x534E9680, 0x534D7340, 0x534C5000,
-	0x534B2CC0, 0x534A0980, 0x5348E640,
-	0x5347C300, 0x53469FC0, 0x53457C80,
-	0x53445940, 0x53433600, 0x534212C0,
-	0x5340EF80, 0x533FCC40, 0x533EA900,
-	0x533D85C0, 0x533C6280, 0x533B3F40,
-	0x533A1C00, 0x5338F8C0, 0x5337D580,
-	0x5336B240, 0x53358F00, 0x53346BC0,
-	0x53334880, 0x53322540, 0x53310200,
-	0x532FDEC0, 0x532EBB80, 0x532D9840,
-	0x532C7500, 0x532B51C0, 0x532A2E80,
-	0x53290B40, 0x5327E800, 0x5326C4C0,
-	0x5325A180, 0x53247E40, 0x53235B00,
-	0x532237C0, 0x53211480, 0x531FF140,
-	0x531ECE00, 0x531DAAC0, 0x531C8780,
-	0x531B6440, 0x531A4100, 0x53191DC0,
-	0x5317FA80, 0x5316D740, 0x5315B400,
-	0x531490C0, 0x53136D80, 0x53124A40,
-	0x53112700, 0x531003C0, 0x530EE080,
-	0x530DBD40, 0x530C9A00, 0x530B76C0,
-	0x530A5380, 0x53093040, 0x53080D00,
-	0x5306E9C0, 0x5305C680, 0x5304A340,
-	0x53038000, 0x53025CC0, 0x53013980,
-	0x53001640, 0x52FEF300, 0x52FDCFC0,
-	0x52FCAC80, 0x52FB8940, 0x52FA6600,
-	0x52F942C0, 0x52F81F80, 0x52F6FC40,
-	0x52F5D900, 0x52F4B5C0, 0x52F39280,
-	0x52F26F40, 0x52F14C00, 0x52F028C0,
-	0x52EF0580, 0x52EDE240, 0x52ECBF00,
-	0x52EB9BC0, 0x52EA7880, 0x52E95540,
-	0x52E83200, 0x52E70EC0, 0x52E5EB80,
-	0x52E4C840, 0x52E3A500, 0x52E281C0,
-	0x52E15E80, 0x52E03B40, 0x52DF1800,
-	0x52DDF4C0, 0x52DCD180, 0x52DBAE40,
-	0x52DA8B00, 0x52D967C0, 0x52D84480,
-	0x52D72140, 0x52D5FE00, 0x52D4DAC0,
-	0x52D3B780, 0x52D29440, 0x52D17100,
-	0x52D04DC0, 0x52CF2A80, 0x52CE0740,
-	0x52CCE400, 0x52CBC0C0, 0x52CA9D80,
-	0x52C97A40, 0x52C85700, 0x52C733C0,
-	0x52C61080, 0x52C4ED40, 0x52C3CA00,
-	0x52C2A6C0, 0x52C18380, 0x52C06040,
-	0x52BF3D00, 0x52BE19C0, 0x52BCF680,
-	0x52BBD340, 0x52BAB000, 0x52B98CC0,
-	0x52B86980, 0x52B74640, 0x52B62300,
-	0x52B4FFC0, 0x52B3DC80, 0x52B2B940,
-	0x52B19600, 0x52B072C0, 0x52AF4F80,
-	0x52AE2C40, 0x52AD0900, 0x52ABE5C0,
-	0x52AAC280, 0x52A99F40, 0x52A87C00,
-	0x52A758C0, 0x52A63580, 0x52A51240,
-	0x52A3EF00, 0x52A2CBC0, 0x52A1A880,
-	0x52A08540, 0x529F6200, 0x529E3EC0,
-	0x529D1B80, 0x529BF840, 0x529AD500,
-	0x5299B1C0, 0x52988E80, 0x52976B40,
-	0x52964800, 0x529524C0, 0x52940180,
-	0x5292DE40, 0x5291BB00, 0x529097C0,
-	0x528F7480, 0x528E5140, 0x528D2E00,
-	0x528C0AC0, 0x528AE780, 0x5289C440,
-	0x5288A100, 0x52877DC0, 0x52865A80,
-	0x52853740, 0x52841400, 0x5282F0C0,
-	0x5281CD80, 0x5280AA40, 0x527F8700,
-	0x527E63C0, 0x527D4080, 0x527C1D40,
-	0x527AFA00, 0x5279D6C0, 0x5278B380,
-	0x52779040, 0x52766D00, 0x527549C0,
-	0x52742680, 0x52730340, 0x5271E000,
-	0x5270BCC0, 0x526F9980, 0x526E7640,
-	0x526D5300, 0x526C2FC0, 0x526B0C80,
-	0x5269E940, 0x5268C600, 0x5267A2C0,
-	0x52667F80, 0x52655C40, 0x52643900,
-	0x526315C0, 0x5261F280, 0x5260CF40,
-	0x525FAC00, 0x525E88C0, 0x525D6580,
-	0x525C4240, 0x525B1F00, 0x5259FBC0,
-	0x5258D880, 0x5257B540, 0x52569200,
-	0x52556EC0, 0x52544B80, 0x52532840,
-	0x52520500, 0x5250E1C0, 0x524FBE80,
-	0x524E9B40, 0x524D7800, 0x524C54C0,
-	0x524B3180, 0x524A0E40, 0x5248EB00,
-	0x5247C7C0, 0x5246A480, 0x52458140,
-	0x52445E00, 0x52433AC0, 0x52421780,
-	0x5240F440, 0x523FD100, 0x523EADC0,
-	0x523D8A80, 0x523C6740, 0x523B4400,
-	0x523A20C0, 0x5238FD80, 0x5237DA40,
-	0x5236B700, 0x523593C0, 0x52347080,
-	0x52334D40, 0x52322A00, 0x523106C0,
-	0x522FE380, 0x522EC040, 0x522D9D00,
-	0x522C79C0, 0x522B5680, 0x522A3340,
-	0x52291000, 0x5227ECC0, 0x5226C980,
-	0x5225A640, 0x52248300, 0x52235FC0,
-	0x52223C80, 0x52211940, 0x521FF600,
-	0x521ED2C0, 0x521DAF80, 0x521C8C40,
-	0x521B6900, 0x521A45C0, 0x52192280,
-	0x5217FF40, 0x5216DC00, 0x5215B8C0,
-	0x52149580, 0x52137240, 0x52124F00,
-	0x52112BC0, 0x52100880, 0x520EE540,
-	0x520DC200, 0x520C9EC0, 0x520B7B80,
-	0x520A5840, 0x52093500, 0x520811C0,
-	0x5206EE80, 0x5205CB40, 0x5204A800,
-	0x520384C0, 0x52026180, 0x52013E40,
-	0x52001B00, 0x51FEF7C0, 0x51FDD480,
-	0x51FCB140, 0x51FB8E00, 0x51FA6AC0,
-	0x51F94780, 0x51F82440, 0x51F70100,
-	0x51F5DDC0, 0x51F4BA80, 0x51F39740,
-	0x51F27400, 0x51F150C0, 0x51F02D80,
-	0x51EF0A40, 0x51EDE700, 0x51ECC3C0,
-	0x51EBA080, 0x51EA7D40, 0x51E95A00,
-	0x51E836C0, 0x51E71380, 0x51E5F040,
-	0x51E4CD00, 0x51E3A9C0, 0x51E28680,
-	0x51E16340, 0x51E04000, 0x51DF1CC0,
-	0x51DDF980, 0x51DCD640, 0x51DBB300,
-	0x51DA8FC0, 0x51D96C80, 0x51D84940,
-	0x51D72600, 0x51D602C0, 0x51D4DF80,
-	0x51D3BC40, 0x51D29900, 0x51D175C0,
-	0x51D05280, 0x51CF2F40, 0x51CE0C00,
-	0x51CCE8C0, 0x51CBC580, 0x51CAA240,
-	0x51C97F00, 0x51C85BC0, 0x51C73880,
-	0x51C61540, 0x51C4F200, 0x51C3CEC0,
-	0x51C2AB80, 0x51C18840, 0x51C06500,
-	0x51BF41C0, 0x51BE1E80, 0x51BCFB40,
-	0x51BBD800, 0x51BAB4C0, 0x51B99180,
-	0x51B86E40, 0x51B74B00, 0x51B627C0,
-	0x51B50480, 0x51B3E140, 0x51B2BE00,
-	0x51B19AC0, 0x51B07780, 0x51AF5440,
-	0x51AE3100, 0x51AD0DC0, 0x51ABEA80,
-	0x51AAC740, 0x51A9A400, 0x51A880C0,
-	0x51A75D80, 0x51A63A40, 0x51A51700,
-	0x51A3F3C0, 0x51A2D080, 0x51A1AD40,
-	0x51A08A00, 0x519F66C0, 0x519E4380,
-	0x519D2040, 0x519BFD00, 0x519AD9C0,
-	0x5199B680, 0x51989340, 0x51977000,
-	0x51964CC0, 0x51952980, 0x51940640,
-	0x5192E300, 0x5191BFC0, 0x51909C80,
-	0x518F7940, 0x518E5600, 0x518D32C0,
-	0x518C0F80, 0x518AEC40, 0x5189C900,
-	0x5188A5C0, 0x51878280, 0x51865F40,
-	0x51853C00, 0x518418C0, 0x5182F580,
-	0x5181D240, 0x5180AF00, 0x517F8BC0,
-	0x517E6880, 0x517D4540, 0x517C2200,
-	0x517AFEC0, 0x5179DB80, 0x5178B840,
-	0x51779500, 0x517671C0, 0x51754E80,
-	0x51742B40, 0x51730800, 0x5171E4C0,
-	0x5170C180, 0x516F9E40, 0x516E7B00,
-	0x516D57C0, 0x516C3480, 0x516B1140,
-	0x5169EE00, 0x5168CAC0, 0x5167A780,
-	0x51668440, 0x51656100, 0x51643DC0,
-	0x51631A80, 0x5161F740, 0x5160D400,
-	0x515FB0C0, 0x515E8D80, 0x515D6A40,
-	0x515C4700, 0x515B23C0, 0x515A0080,
-	0x5158DD40, 0x5157BA00, 0x515696C0,
-	0x51557380, 0x51545040, 0x51532D00,
-	0x515209C0, 0x5150E680, 0x514FC340,
-	0x514EA000, 0x514D7CC0, 0x514C5980,
-	0x514B3640, 0x514A1300, 0x5148EFC0,
-	0x5147CC80, 0x5146A940, 0x51458600,
-	0x514462C0, 0x51433F80, 0x51421C40,
-	0x5140F900, 0x513FD5C0, 0x513EB280,
-	0x513D8F40, 0x513C6C00, 0x513B48C0,
-	0x513A2580, 0x51390240, 0x5137DF00,
-	0x5136BBC0, 0x51359880, 0x51347540,
-	0x51335200, 0x51322EC0, 0x51310B80,
-	0x512FE840, 0x512EC500, 0x512DA1C0,
-	0x512C7E80, 0x512B5B40, 0x512A3800,
-	0x512914C0, 0x5127F180, 0x5126CE40,
-	0x5125AB00, 0x512487C0, 0x51236480,
-	0x51224140, 0x51211E00, 0x511FFAC0,
-	0x511ED780, 0x511DB440, 0x511C9100,
-	0x511B6DC0, 0x511A4A80, 0x51192740,
-	0x51180400, 0x5116E0C0, 0x5115BD80,
-	0x51149A40, 0x51137700, 0x511253C0,
-	0x51113080, 0x51100D40, 0x510EEA00,
-	0x510DC6C0, 0x510CA380, 0x510B8040,
-	0x510A5D00, 0x510939C0, 0x51081680,
-	0x5106F340, 0x5105D000, 0x5104ACC0,
-	0x51038980, 0x51026640, 0x51014300,
-	0x51001FC0, 0x50FEFC80, 0x50FDD940,
-	0x50FCB600, 0x50FB92C0, 0x50FA6F80,
-	0x50F94C40, 0x50F82900, 0x50F705C0,
-	0x50F5E280, 0x50F4BF40, 0x50F39C00,
-	0x50F278C0, 0x50F15580, 0x50F03240,
-	0x50EF0F00, 0x50EDEBC0, 0x50ECC880,
-	0x50EBA540, 0x50EA8200, 0x50E95EC0,
-	0x50E83B80, 0x50E71840, 0x50E5F500,
-	0x50E4D1C0, 0x50E3AE80, 0x50E28B40,
-	0x50E16800, 0x50E044C0, 0x50DF2180,
-	0x50DDFE40, 0x50DCDB00, 0x50DBB7C0,
-	0x50DA9480, 0x50D97140, 0x50D84E00,
-	0x50D72AC0, 0x50D60780, 0x50D4E440,
-	0x50D3C100, 0x50D29DC0, 0x50D17A80,
-	0x50D05740, 0x50CF3400, 0x50CE10C0,
-	0x50CCED80, 0x50CBCA40, 0x50CAA700,
-	0x50C983C0, 0x50C86080, 0x50C73D40,
-	0x50C61A00, 0x50C4F6C0, 0x50C3D380,
-	0x50C2B040, 0x50C18D00, 0x50C069C0,
-	0x50BF4680, 0x50BE2340, 0x50BD0000,
-	0x50BBDCC0, 0x50BAB980, 0x50B99640,
-	0x50B87300, 0x50B74FC0, 0x50B62C80,
-	0x50B50940, 0x50B3E600, 0x50B2C2C0,
-	0x50B19F80, 0x50B07C40, 0x50AF5900,
-	0x50AE35C0, 0x50AD1280, 0x50ABEF40,
-	0x50AACC00, 0x50A9A8C0, 0x50A88580,
-	0x50A76240, 0x50A63F00, 0x50A51BC0,
-	0x50A3F880, 0x50A2D540, 0x50A1B200,
-	0x50A08EC0, 0x509F6B80, 0x509E4840,
-	0x509D2500, 0x509C01C0, 0x509ADE80,
-	0x5099BB40, 0x50989800, 0x509774C0,
-	0x50965180, 0x50952E40, 0x50940B00,
-	0x5092E7C0, 0x5091C480, 0x5090A140,
-	0x508F7E00, 0x508E5AC0, 0x508D3780,
-	0x508C1440, 0x508AF100, 0x5089CDC0,
-	0x5088AA80, 0x50878740, 0x50866400,
-	0x508540C0, 0x50841D80, 0x5082FA40,
-	0x5081D700, 0x5080B3C0, 0x507F9080,
-	0x507E6D40, 0x507D4A00, 0x507C26C0,
-	0x507B0380, 0x5079E040, 0x5078BD00,
-	0x507799C0, 0x50767680, 0x50755340,
-	0x50743000, 0x50730CC0, 0x5071E980,
-	0x5070C640, 0x506FA300, 0x506E7FC0,
-	0x506D5C80, 0x506C3940, 0x506B1600,
-	0x5069F2C0, 0x5068CF80, 0x5067AC40,
-	0x50668900, 0x506565C0, 0x50644280,
-	0x50631F40, 0x5061FC00, 0x5060D8C0,
-	0x505FB580, 0x505E9240, 0x505D6F00,
-	0x505C4BC0, 0x505B2880, 0x505A0540,
-	0x5058E200, 0x5057BEC0, 0x50569B80,
-	0x50557840, 0x50545500, 0x505331C0,
-	0x50520E80, 0x5050EB40, 0x504FC800,
-	0x504EA4C0, 0x504D8180, 0x504C5E40,
-	0x504B3B00, 0x504A17C0, 0x5048F480,
-	0x5047D140, 0x5046AE00, 0x50458AC0,
-	0x50446780, 0x50434440, 0x50422100,
-	0x5040FDC0, 0x503FDA80, 0x503EB740,
-	0x503D9400, 0x503C70C0, 0x503B4D80,
-	0x503A2A40, 0x50390700, 0x5037E3C0,
-	0x5036C080, 0x50359D40, 0x50347A00,
-	0x503356C0, 0x50323380, 0x50311040,
-	0x502FED00, 0x502EC9C0, 0x502DA680,
-	0x502C8340, 0x502B6000, 0x502A3CC0,
-	0x50291980, 0x5027F640, 0x5026D300,
-	0x5025AFC0, 0x50248C80, 0x50236940,
-	0x50224600, 0x502122C0, 0x501FFF80,
-	0x501EDC40, 0x501DB900, 0x501C95C0,
-	0x501B7280, 0x501A4F40, 0x50192C00,
-	0x501808C0, 0x5016E580, 0x5015C240,
-	0x50149F00, 0x50137BC0, 0x50125880,
-	0x50113540, 0x50101200, 0x500EEEC0,
-	0x500DCB80, 0x500CA840, 0x500B8500,
-	0x500A61C0, 0x50093E80, 0x50081B40,
-	0x5006F800, 0x5005D4C0, 0x5004B180,
-	0x50038E40, 0x50026B00, 0x500147C0,
-	0x50002480, 0x4FFF0140, 0x4FFDDE00,
-	0x4FFCBAC0, 0x4FFB9780, 0x4FFA7440,
-	0x4FF95100, 0x4FF82DC0, 0x4FF70A80,
-	0x4FF5E740, 0x4FF4C400, 0x4FF3A0C0,
-	0x4FF27D80, 0x4FF15A40, 0x4FF03700,
-	0x4FEF13C0, 0x4FEDF080, 0x4FECCD40,
-	0x4FEBAA00, 0x4FEA86C0, 0x4FE96380,
-	0x4FE84040, 0x4FE71D00, 0x4FE5F9C0,
-	0x4FE4D680, 0x4FE3B340, 0x4FE29000,
-	0x4FE16CC0, 0x4FE04980, 0x4FDF2640,
-	0x4FDE0300, 0x4FDCDFC0, 0x4FDBBC80,
-	0x4FDA9940, 0x4FD97600, 0x4FD852C0,
-	0x4FD72F80, 0x4FD60C40, 0x4FD4E900,
-	0x4FD3C5C0, 0x4FD2A280, 0x4FD17F40,
-	0x4FD05C00, 0x4FCF38C0, 0x4FCE1580,
-	0x4FCCF240, 0x4FCBCF00, 0x4FCAABC0,
-	0x4FC98880, 0x4FC86540, 0x4FC74200,
-	0x4FC61EC0, 0x4FC4FB80, 0x4FC3D840,
-	0x4FC2B500, 0x4FC191C0, 0x4FC06E80,
-	0x4FBF4B40, 0x4FBE2800, 0x4FBD04C0,
-	0x4FBBE180, 0x4FBABE40, 0x4FB99B00,
-	0x4FB877C0, 0x4FB75480, 0x4FB63140,
-	0x4FB50E00, 0x4FB3EAC0, 0x4FB2C780,
-	0x4FB1A440, 0x4FB08100, 0x4FAF5DC0,
-	0x4FAE3A80, 0x4FAD1740, 0x4FABF400,
-	0x4FAAD0C0, 0x4FA9AD80, 0x4FA88A40,
-	0x4FA76700, 0x4FA643C0, 0x4FA52080,
-	0x4FA3FD40, 0x4FA2DA00, 0x4FA1B6C0,
-	0x4FA09380, 0x4F9F7040, 0x4F9E4D00,
-	0x4F9D29C0, 0x4F9C0680, 0x4F9AE340,
-	0x4F99C000, 0x4F989CC0, 0x4F977980,
-	0x4F965640, 0x4F953300, 0x4F940FC0,
-	0x4F92EC80, 0x4F91C940, 0x4F90A600,
-	0x4F8F82C0, 0x4F8E5F80, 0x4F8D3C40,
-	0x4F8C1900, 0x4F8AF5C0, 0x4F89D280,
-	0x4F88AF40, 0x4F878C00, 0x4F8668C0,
-	0x4F854580, 0x4F842240, 0x4F82FF00,
-	0x4F81DBC0, 0x4F80B880, 0x4F7F9540,
-	0x4F7E7200, 0x4F7D4EC0, 0x4F7C2B80,
-	0x4F7B0840, 0x4F79E500, 0x4F78C1C0,
-	0x4F779E80, 0x4F767B40, 0x4F755800,
-	0x4F7434C0, 0x4F731180, 0x4F71EE40,
-	0x4F70CB00, 0x4F6FA7C0, 0x4F6E8480,
-	0x4F6D6140, 0x4F6C3E00, 0x4F6B1AC0,
-	0x4F69F780, 0x4F68D440, 0x4F67B100,
-	0x4F668DC0, 0x4F656A80, 0x4F644740,
-	0x4F632400, 0x4F6200C0, 0x4F60DD80,
-	0x4F5FBA40, 0x4F5E9700, 0x4F5D73C0,
-	0x4F5C5080, 0x4F5B2D40, 0x4F5A0A00,
-	0x4F58E6C0, 0x4F57C380, 0x4F56A040,
-	0x4F557D00, 0x4F5459C0, 0x4F533680,
-	0x4F521340, 0x4F50F000, 0x4F4FCCC0,
-	0x4F4EA980, 0x4F4D8640, 0x4F4C6300,
-	0x4F4B3FC0, 0x4F4A1C80, 0x4F48F940,
-	0x4F47D600, 0x4F46B2C0, 0x4F458F80,
-	0x4F446C40, 0x4F434900, 0x4F4225C0,
-	0x4F410280, 0x4F3FDF40, 0x4F3EBC00,
-	0x4F3D98C0, 0x4F3C7580, 0x4F3B5240,
-	0x4F3A2F00, 0x4F390BC0, 0x4F37E880,
-	0x4F36C540, 0x4F35A200, 0x4F347EC0,
-	0x4F335B80, 0x4F323840, 0x4F311500,
-	0x4F2FF1C0, 0x4F2ECE80, 0x4F2DAB40,
-	0x4F2C8800, 0x4F2B64C0, 0x4F2A4180,
-	0x4F291E40, 0x4F27FB00, 0x4F26D7C0,
-	0x4F25B480, 0x4F249140, 0x4F236E00,
-	0x4F224AC0, 0x4F212780, 0x4F200440,
-	0x4F1EE100, 0x4F1DBDC0, 0x4F1C9A80,
-	0x4F1B7740, 0x4F1A5400, 0x4F1930C0,
-	0x4F180D80, 0x4F16EA40, 0x4F15C700,
-	0x4F14A3C0, 0x4F138080, 0x4F125D40,
-	0x4F113A00, 0x4F1016C0, 0x4F0EF380,
-	0x4F0DD040, 0x4F0CAD00, 0x4F0B89C0,
-	0x4F0A6680, 0x4F094340, 0x4F082000,
-	0x4F06FCC0, 0x4F05D980, 0x4F04B640,
-	0x4F039300, 0x4F026FC0, 0x4F014C80,
-	0x4F002940, 0x4EFF0600, 0x4EFDE2C0,
-	0x4EFCBF80, 0x4EFB9C40, 0x4EFA7900,
-	0x4EF955C0, 0x4EF83280, 0x4EF70F40,
-	0x4EF5EC00, 0x4EF4C8C0, 0x4EF3A580,
-	0x4EF28240, 0x4EF15F00, 0x4EF03BC0,
-	0x4EEF1880, 0x4EEDF540, 0x4EECD200,
-	0x4EEBAEC0, 0x4EEA8B80, 0x4EE96840,
-	0x4EE84500, 0x4EE721C0, 0x4EE5FE80,
-	0x4EE4DB40, 0x4EE3B800, 0x4EE294C0,
-	0x4EE17180, 0x4EE04E40, 0x4EDF2B00,
-	0x4EDE07C0, 0x4EDCE480, 0x4EDBC140,
-	0x4EDA9E00, 0x4ED97AC0, 0x4ED85780,
-	0x4ED73440, 0x4ED61100, 0x4ED4EDC0,
-	0x4ED3CA80, 0x4ED2A740, 0x4ED18400,
-	0x4ED060C0, 0x4ECF3D80, 0x4ECE1A40,
-	0x4ECCF700, 0x4ECBD3C0, 0x4ECAB080,
-	0x4EC98D40, 0x4EC86A00, 0x4EC746C0,
-	0x4EC62380, 0x4EC50040, 0x4EC3DD00,
-	0x4EC2B9C0, 0x4EC19680, 0x4EC07340,
-	0x4EBF5000, 0x4EBE2CC0, 0x4EBD0980,
-	0x4EBBE640, 0x4EBAC300, 0x4EB99FC0,
-	0x4EB87C80, 0x4EB75940, 0x4EB63600,
-	0x4EB512C0, 0x4EB3EF80, 0x4EB2CC40,
-	0x4EB1A900, 0x4EB085C0, 0x4EAF6280,
-	0x4EAE3F40, 0x4EAD1C00, 0x4EABF8C0,
-	0x4EAAD580, 0x4EA9B240, 0x4EA88F00,
-	0x4EA76BC0, 0x4EA64880, 0x4EA52540,
-	0x4EA40200, 0x4EA2DEC0, 0x4EA1BB80,
-	0x4EA09840, 0x4E9F7500, 0x4E9E51C0,
-	0x4E9D2E80, 0x4E9C0B40, 0x4E9AE800,
-	0x4E99C4C0, 0x4E98A180, 0x4E977E40,
-	0x4E965B00, 0x4E9537C0, 0x4E941480,
-	0x4E92F140, 0x4E91CE00, 0x4E90AAC0,
-	0x4E8F8780, 0x4E8E6440, 0x4E8D4100,
-	0x4E8C1DC0, 0x4E8AFA80, 0x4E89D740,
-	0x4E88B400, 0x4E8790C0, 0x4E866D80,
-	0x4E854A40, 0x4E842700, 0x4E8303C0,
-	0x4E81E080, 0x4E80BD40, 0x4E7F9A00,
-	0x4E7E76C0, 0x4E7D5380, 0x4E7C3040,
-	0x4E7B0D00, 0x4E79E9C0, 0x4E78C680,
-	0x4E77A340, 0x4E768000, 0x4E755CC0,
-	0x4E743980, 0x4E731640, 0x4E71F300,
-	0x4E70CFC0, 0x4E6FAC80, 0x4E6E8940,
-	0x4E6D6600, 0x4E6C42C0, 0x4E6B1F80,
-	0x4E69FC40, 0x4E68D900, 0x4E67B5C0,
-	0x4E669280, 0x4E656F40, 0x4E644C00,
-	0x4E6328C0, 0x4E620580, 0x4E60E240,
-	0x4E5FBF00, 0x4E5E9BC0, 0x4E5D7880,
-	0x4E5C5540, 0x4E5B3200, 0x4E5A0EC0,
-	0x4E58EB80, 0x4E57C840, 0x4E56A500,
-	0x4E5581C0, 0x4E545E80, 0x4E533B40,
-	0x4E521800, 0x4E50F4C0, 0x4E4FD180,
-	0x4E4EAE40, 0x4E4D8B00, 0x4E4C67C0,
-	0x4E4B4480, 0x4E4A2140, 0x4E48FE00,
-	0x4E47DAC0, 0x4E46B780, 0x4E459440,
-	0x4E447100, 0x4E434DC0, 0x4E422A80,
-	0x4E410740, 0x4E3FE400, 0x4E3EC0C0,
-	0x4E3D9D80, 0x4E3C7A40, 0x4E3B5700,
-	0x4E3A33C0, 0x4E391080, 0x4E37ED40,
-	0x4E36CA00, 0x4E35A6C0, 0x4E348380,
-	0x4E336040, 0x4E323D00, 0x4E3119C0,
-	0x4E2FF680, 0x4E2ED340, 0x4E2DB000,
-	0x4E2C8CC0, 0x4E2B6980, 0x4E2A4640,
-	0x4E292300, 0x4E27FFC0, 0x4E26DC80,
-	0x4E25B940, 0x4E249600, 0x4E2372C0,
-	0x4E224F80, 0x4E212C40, 0x4E200900,
-	0x4E1EE5C0, 0x4E1DC280, 0x4E1C9F40,
-	0x4E1B7C00, 0x4E1A58C0, 0x4E193580,
-	0x4E181240, 0x4E16EF00, 0x4E15CBC0,
-	0x4E14A880, 0x4E138540, 0x4E126200,
-	0x4E113EC0, 0x4E101B80, 0x4E0EF840,
-	0x4E0DD500, 0x4E0CB1C0, 0x4E0B8E80,
-	0x4E0A6B40, 0x4E094800, 0x4E0824C0,
-	0x4E070180, 0x4E05DE40, 0x4E04BB00,
-	0x4E0397C0, 0x4E027480, 0x4E015140,
-	0x4E002E00, 0x4DFF0AC0, 0x4DFDE780,
-	0x4DFCC440, 0x4DFBA100, 0x4DFA7DC0,
-	0x4DF95A80, 0x4DF83740, 0x4DF71400,
-	0x4DF5F0C0, 0x4DF4CD80, 0x4DF3AA40,
-	0x4DF28700, 0x4DF163C0, 0x4DF04080,
-	0x4DEF1D40, 0x4DEDFA00, 0x4DECD6C0,
-	0x4DEBB380, 0x4DEA9040, 0x4DE96D00,
-	0x4DE849C0, 0x4DE72680, 0x4DE60340,
-	0x4DE4E000, 0x4DE3BCC0, 0x4DE29980,
-	0x4DE17640, 0x4DE05300, 0x4DDF2FC0,
-	0x4DDE0C80, 0x4DDCE940, 0x4DDBC600,
-	0x4DDAA2C0, 0x4DD97F80, 0x4DD85C40,
-	0x4DD73900, 0x4DD615C0, 0x4DD4F280,
-	0x4DD3CF40, 0x4DD2AC00, 0x4DD188C0,
-	0x4DD06580, 0x4DCF4240, 0x4DCE1F00,
-	0x4DCCFBC0, 0x4DCBD880, 0x4DCAB540,
-	0x4DC99200, 0x4DC86EC0, 0x4DC74B80,
-	0x4DC62840, 0x4DC50500, 0x4DC3E1C0,
-	0x4DC2BE80, 0x4DC19B40, 0x4DC07800,
-	0x4DBF54C0, 0x4DBE3180, 0x4DBD0E40,
-	0x4DBBEB00, 0x4DBAC7C0, 0x4DB9A480,
-	0x4DB88140, 0x4DB75E00, 0x4DB63AC0,
-	0x4DB51780, 0x4DB3F440, 0x4DB2D100,
-	0x4DB1ADC0, 0x4DB08A80, 0x4DAF6740,
-	0x4DAE4400, 0x4DAD20C0, 0x4DABFD80,
-	0x4DAADA40, 0x4DA9B700, 0x4DA893C0,
-	0x4DA77080, 0x4DA64D40, 0x4DA52A00,
-	0x4DA406C0, 0x4DA2E380, 0x4DA1C040,
-	0x4DA09D00, 0x4D9F79C0, 0x4D9E5680,
-	0x4D9D3340, 0x4D9C1000, 0x4D9AECC0,
-	0x4D99C980, 0x4D98A640, 0x4D978300,
-	0x4D965FC0, 0x4D953C80, 0x4D941940,
-	0x4D92F600, 0x4D91D2C0, 0x4D90AF80,
-	0x4D8F8C40, 0x4D8E6900, 0x4D8D45C0,
-	0x4D8C2280, 0x4D8AFF40, 0x4D89DC00,
-	0x4D88B8C0, 0x4D879580, 0x4D867240,
-	0x4D854F00, 0x4D842BC0, 0x4D830880,
-	0x4D81E540, 0x4D80C200, 0x4D7F9EC0,
-	0x4D7E7B80, 0x4D7D5840, 0x4D7C3500,
-	0x4D7B11C0, 0x4D79EE80, 0x4D78CB40,
-	0x4D77A800, 0x4D7684C0, 0x4D756180,
-	0x4D743E40, 0x4D731B00, 0x4D71F7C0,
-	0x4D70D480, 0x4D6FB140, 0x4D6E8E00,
-	0x4D6D6AC0, 0x4D6C4780, 0x4D6B2440,
-	0x4D6A0100, 0x4D68DDC0, 0x4D67BA80,
-	0x4D669740, 0x4D657400, 0x4D6450C0,
-	0x4D632D80, 0x4D620A40, 0x4D60E700,
-	0x4D5FC3C0, 0x4D5EA080, 0x4D5D7D40,
-	0x4D5C5A00, 0x4D5B36C0, 0x4D5A1380,
-	0x4D58F040, 0x4D57CD00, 0x4D56A9C0,
-	0x4D558680, 0x4D546340, 0x4D534000,
-	0x4D521CC0, 0x4D50F980, 0x4D4FD640,
-	0x4D4EB300, 0x4D4D8FC0, 0x4D4C6C80,
-	0x4D4B4940, 0x4D4A2600, 0x4D4902C0,
-	0x4D47DF80, 0x4D46BC40, 0x4D459900,
-	0x4D4475C0, 0x4D435280, 0x4D422F40,
-	0x4D410C00, 0x4D3FE8C0, 0x4D3EC580,
-	0x4D3DA240, 0x4D3C7F00, 0x4D3B5BC0,
-	0x4D3A3880, 0x4D391540, 0x4D37F200,
-	0x4D36CEC0, 0x4D35AB80, 0x4D348840,
-	0x4D336500, 0x4D3241C0, 0x4D311E80,
-	0x4D2FFB40, 0x4D2ED800, 0x4D2DB4C0,
-	0x4D2C9180, 0x4D2B6E40, 0x4D2A4B00,
-	0x4D2927C0, 0x4D280480, 0x4D26E140,
-	0x4D25BE00, 0x4D249AC0, 0x4D237780,
-	0x4D225440, 0x4D213100, 0x4D200DC0,
-	0x4D1EEA80, 0x4D1DC740, 0x4D1CA400,
-	0x4D1B80C0, 0x4D1A5D80, 0x4D193A40,
-	0x4D181700, 0x4D16F3C0, 0x4D15D080,
-	0x4D14AD40, 0x4D138A00, 0x4D1266C0,
-	0x4D114380, 0x4D102040, 0x4D0EFD00,
-	0x4D0DD9C0, 0x4D0CB680, 0x4D0B9340,
-	0x4D0A7000, 0x4D094CC0, 0x4D082980,
-	0x4D070640, 0x4D05E300, 0x4D04BFC0,
-	0x4D039C80, 0x4D027940, 0x4D015600,
-	0x4D0032C0, 0x4CFF0F80, 0x4CFDEC40,
-	0x4CFCC900, 0x4CFBA5C0, 0x4CFA8280,
-	0x4CF95F40, 0x4CF83C00, 0x4CF718C0,
-	0x4CF5F580, 0x4CF4D240, 0x4CF3AF00,
-	0x4CF28BC0, 0x4CF16880, 0x4CF04540,
-	0x4CEF2200, 0x4CEDFEC0, 0x4CECDB80,
-	0x4CEBB840, 0x4CEA9500, 0x4CE971C0,
-	0x4CE84E80, 0x4CE72B40, 0x4CE60800,
-	0x4CE4E4C0, 0x4CE3C180, 0x4CE29E40,
-	0x4CE17B00, 0x4CE057C0, 0x4CDF3480,
-	0x4CDE1140, 0x4CDCEE00, 0x4CDBCAC0,
-	0x4CDAA780, 0x4CD98440, 0x4CD86100,
-	0x4CD73DC0, 0x4CD61A80, 0x4CD4F740,
-	0x4CD3D400, 0x4CD2B0C0, 0x4CD18D80,
-	0x4CD06A40, 0x4CCF4700, 0x4CCE23C0,
-	0x4CCD0080, 0x4CCBDD40, 0x4CCABA00,
-	0x4CC996C0, 0x4CC87380, 0x4CC75040,
-	0x4CC62D00, 0x4CC509C0, 0x4CC3E680,
-	0x4CC2C340, 0x4CC1A000, 0x4CC07CC0,
-	0x4CBF5980, 0x4CBE3640, 0x4CBD1300,
-	0x4CBBEFC0, 0x4CBACC80, 0x4CB9A940,
-	0x4CB88600, 0x4CB762C0, 0x4CB63F80,
-	0x4CB51C40, 0x4CB3F900, 0x4CB2D5C0,
-	0x4CB1B280, 0x4CB08F40, 0x4CAF6C00,
-	0x4CAE48C0, 0x4CAD2580, 0x4CAC0240,
-	0x4CAADF00, 0x4CA9BBC0, 0x4CA89880,
-	0x4CA77540, 0x4CA65200, 0x4CA52EC0,
-	0x4CA40B80, 0x4CA2E840, 0x4CA1C500,
-	0x4CA0A1C0, 0x4C9F7E80, 0x4C9E5B40,
-	0x4C9D3800, 0x4C9C14C0, 0x4C9AF180,
-	0x4C99CE40, 0x4C98AB00, 0x4C9787C0,
-	0x4C966480, 0x4C954140, 0x4C941E00,
-	0x4C92FAC0, 0x4C91D780, 0x4C90B440,
-	0x4C8F9100, 0x4C8E6DC0, 0x4C8D4A80,
-	0x4C8C2740, 0x4C8B0400, 0x4C89E0C0,
-	0x4C88BD80, 0x4C879A40, 0x4C867700,
-	0x4C8553C0, 0x4C843080, 0x4C830D40,
-	0x4C81EA00, 0x4C80C6C0, 0x4C7FA380,
-	0x4C7E8040, 0x4C7D5D00, 0x4C7C39C0,
-	0x4C7B1680, 0x4C79F340, 0x4C78D000,
-	0x4C77ACC0, 0x4C768980, 0x4C756640,
-	0x4C744300, 0x4C731FC0, 0x4C71FC80,
-	0x4C70D940, 0x4C6FB600, 0x4C6E92C0,
-	0x4C6D6F80, 0x4C6C4C40, 0x4C6B2900,
-	0x4C6A05C0, 0x4C68E280, 0x4C67BF40,
-	0x4C669C00, 0x4C6578C0, 0x4C645580,
-	0x4C633240, 0x4C620F00, 0x4C60EBC0,
-	0x4C5FC880, 0x4C5EA540, 0x4C5D8200,
-	0x4C5C5EC0, 0x4C5B3B80, 0x4C5A1840,
-	0x4C58F500, 0x4C57D1C0, 0x4C56AE80,
-	0x4C558B40, 0x4C546800, 0x4C5344C0,
-	0x4C522180, 0x4C50FE40, 0x4C4FDB00,
-	0x4C4EB7C0, 0x4C4D9480, 0x4C4C7140,
-	0x4C4B4E00, 0x4C4A2AC0, 0x4C490780,
-	0x4C47E440, 0x4C46C100, 0x4C459DC0,
-	0x4C447A80, 0x4C435740, 0x4C423400,
-	0x4C4110C0, 0x4C3FED80, 0x4C3ECA40,
-	0x4C3DA700, 0x4C3C83C0, 0x4C3B6080,
-	0x4C3A3D40, 0x4C391A00, 0x4C37F6C0,
-	0x4C36D380, 0x4C35B040, 0x4C348D00,
-	0x4C3369C0, 0x4C324680, 0x4C312340,
-	0x4C300000, 0x4C2EF2C0, 0x4C2DE580,
-	0x4C2CD840, 0x4C2BCB00, 0x4C2ABDC0,
-	0x4C29B080, 0x4C28A340, 0x4C279600,
-	0x4C2688C0, 0x4C257B80, 0x4C246E40,
-	0x4C236100, 0x4C2253C0, 0x4C214680,
-	0x4C203940, 0x4C1F2C00, 0x4C1E1EC0,
-	0x4C1D1180, 0x4C1C0440, 0x4C1AF700,
-	0x4C19E9C0, 0x4C18DC80, 0x4C17CF40,
-	0x4C16C200, 0x4C15B4C0, 0x4C14A780,
-	0x4C139A40, 0x4C128D00, 0x4C117FC0,
-	0x4C107280, 0x4C0F6540, 0x4C0E5800,
-	0x4C0D4AC0, 0x4C0C3D80, 0x4C0B3040,
-	0x4C0A2300, 0x4C0915C0, 0x4C080880,
-	0x4C06FB40, 0x4C05EE00, 0x4C04E0C0,
-	0x4C03D380, 0x4C02C640, 0x4C01B900,
-	0x4C00ABC0, 0x4BFF9E80, 0x4BFE9140,
-	0x4BFD8400, 0x4BFC76C0, 0x4BFB6980,
-	0x4BFA5C40, 0x4BF94F00, 0x4BF841C0,
-	0x4BF73480, 0x4BF62740, 0x4BF51A00,
-	0x4BF40CC0, 0x4BF2FF80, 0x4BF1F240,
-	0x4BF0E500, 0x4BEFD7C0, 0x4BEECA80,
-	0x4BEDBD40, 0x4BECB000, 0x4BEBA2C0,
-	0x4BEA9580, 0x4BE98840, 0x4BE87B00,
-	0x4BE76DC0, 0x4BE66080, 0x4BE55340,
-	0x4BE44600, 0x4BE338C0, 0x4BE22B80,
-	0x4BE11E40, 0x4BE01100, 0x4BDF03C0,
-	0x4BDDF680, 0x4BDCE940, 0x4BDBDC00,
-	0x4BDACEC0, 0x4BD9C180, 0x4BD8B440,
-	0x4BD7A700, 0x4BD699C0, 0x4BD58C80,
-	0x4BD47F40, 0x4BD37200, 0x4BD264C0,
-	0x4BD15780, 0x4BD04A40, 0x4BCF3D00,
-	0x4BCE2FC0, 0x4BCD2280, 0x4BCC1540,
-	0x4BCB0800, 0x4BC9FAC0, 0x4BC8ED80,
-	0x4BC7E040, 0x4BC6D300, 0x4BC5C5C0,
-	0x4BC4B880, 0x4BC3AB40, 0x4BC29E00,
-	0x4BC190C0, 0x4BC08380, 0x4BBF7640,
-	0x4BBE6900, 0x4BBD5BC0, 0x4BBC4E80,
-	0x4BBB4140, 0x4BBA3400, 0x4BB926C0,
-	0x4BB81980, 0x4BB70C40, 0x4BB5FF00,
-	0x4BB4F1C0, 0x4BB3E480, 0x4BB2D740,
-	0x4BB1CA00, 0x4BB0BCC0, 0x4BAFAF80,
-	0x4BAEA240, 0x4BAD9500, 0x4BAC87C0,
-	0x4BAB7A80, 0x4BAA6D40, 0x4BA96000,
-	0x4BA852C0, 0x4BA74580, 0x4BA63840,
-	0x4BA52B00, 0x4BA41DC0, 0x4BA31080,
-	0x4BA20340, 0x4BA0F600, 0x4B9FE8C0,
-	0x4B9EDB80, 0x4B9DCE40, 0x4B9CC100,
-	0x4B9BB3C0, 0x4B9AA680, 0x4B999940,
-	0x4B988C00, 0x4B977EC0, 0x4B967180,
-	0x4B956440, 0x4B945700, 0x4B9349C0,
-	0x4B923C80, 0x4B912F40, 0x4B902200,
-	0x4B8F14C0, 0x4B8E0780, 0x4B8CFA40,
-	0x4B8BED00, 0x4B8ADFC0, 0x4B89D280,
-	0x4B88C540, 0x4B87B800, 0x4B86AAC0,
-	0x4B859D80, 0x4B849040, 0x4B838300,
-	0x4B8275C0, 0x4B816880, 0x4B805B40,
-	0x4B7F4E00, 0x4B7E40C0, 0x4B7D3380,
-	0x4B7C2640, 0x4B7B1900, 0x4B7A0BC0,
-	0x4B78FE80, 0x4B77F140, 0x4B76E400,
-	0x4B75D6C0, 0x4B74C980, 0x4B73BC40,
-	0x4B72AF00, 0x4B71A1C0, 0x4B709480,
-	0x4B6F8740, 0x4B6E7A00, 0x4B6D6CC0,
-	0x4B6C5F80, 0x4B6B5240, 0x4B6A4500,
-	0x4B6937C0, 0x4B682A80, 0x4B671D40,
-	0x4B661000, 0x4B6502C0, 0x4B63F580,
-	0x4B62E840, 0x4B61DB00, 0x4B60CDC0,
-	0x4B5FC080, 0x4B5EB340, 0x4B5DA600,
-	0x4B5C98C0, 0x4B5B8B80, 0x4B5A7E40,
-	0x4B597100, 0x4B5863C0, 0x4B575680,
-	0x4B564940, 0x4B553C00, 0x4B542EC0,
-	0x4B532180, 0x4B521440, 0x4B510700,
-	0x4B4FF9C0, 0x4B4EEC80, 0x4B4DDF40,
-	0x4B4CD200, 0x4B4BC4C0, 0x4B4AB780,
-	0x4B49AA40, 0x4B489D00, 0x4B478FC0,
-	0x4B468280, 0x4B457540, 0x4B446800,
-	0x4B435AC0, 0x4B424D80, 0x4B414040,
-	0x4B403300, 0x4B3F25C0, 0x4B3E1880,
-	0x4B3D0B40, 0x4B3BFE00, 0x4B3AF0C0,
-	0x4B39E380, 0x4B38D640, 0x4B37C900,
-	0x4B36BBC0, 0x4B35AE80, 0x4B34A140,
-	0x4B339400, 0x4B3286C0, 0x4B317980,
-	0x4B306C40, 0x4B2F5F00, 0x4B2E51C0,
-	0x4B2D4480, 0x4B2C3740, 0x4B2B2A00,
-	0x4B2A1CC0, 0x4B290F80, 0x4B280240,
-	0x4B26F500, 0x4B25E7C0, 0x4B24DA80,
-	0x4B23CD40, 0x4B22C000, 0x4B21B2C0,
-	0x4B20A580, 0x4B1F9840, 0x4B1E8B00,
-	0x4B1D7DC0, 0x4B1C7080, 0x4B1B6340,
-	0x4B1A5600, 0x4B1948C0, 0x4B183B80,
-	0x4B172E40, 0x4B162100, 0x4B1513C0,
-	0x4B140680, 0x4B12F940, 0x4B11EC00,
-	0x4B10DEC0, 0x4B0FD180, 0x4B0EC440,
-	0x4B0DB700, 0x4B0CA9C0, 0x4B0B9C80,
-	0x4B0A8F40, 0x4B098200, 0x4B0874C0,
-	0x4B076780, 0x4B065A40, 0x4B054D00,
-	0x4B043FC0, 0x4B033280, 0x4B022540,
-	0x4B011800, 0x4B000AC0, 0x4AFEFD80,
-	0x4AFDF040, 0x4AFCE300, 0x4AFBD5C0,
-	0x4AFAC880, 0x4AF9BB40, 0x4AF8AE00,
-	0x4AF7A0C0, 0x4AF69380, 0x4AF58640,
-	0x4AF47900, 0x4AF36BC0, 0x4AF25E80,
-	0x4AF15140, 0x4AF04400, 0x4AEF36C0,
-	0x4AEE2980, 0x4AED1C40, 0x4AEC0F00,
-	0x4AEB01C0, 0x4AE9F480, 0x4AE8E740,
-	0x4AE7DA00, 0x4AE6CCC0, 0x4AE5BF80,
-	0x4AE4B240, 0x4AE3A500, 0x4AE297C0,
-	0x4AE18A80, 0x4AE07D40, 0x4ADF7000,
-	0x4ADE62C0, 0x4ADD5580, 0x4ADC4840,
-	0x4ADB3B00, 0x4ADA2DC0, 0x4AD92080,
-	0x4AD81340, 0x4AD70600, 0x4AD5F8C0,
-	0x4AD4EB80, 0x4AD3DE40, 0x4AD2D100,
-	0x4AD1C3C0, 0x4AD0B680, 0x4ACFA940,
-	0x4ACE9C00, 0x4ACD8EC0, 0x4ACC8180,
-	0x4ACB7440, 0x4ACA6700, 0x4AC959C0,
-	0x4AC84C80, 0x4AC73F40, 0x4AC63200,
-	0x4AC524C0, 0x4AC41780, 0x4AC30A40,
-	0x4AC1FD00, 0x4AC0EFC0, 0x4ABFE280,
-	0x4ABED540, 0x4ABDC800, 0x4ABCBAC0,
-	0x4ABBAD80, 0x4ABAA040, 0x4AB99300,
-	0x4AB885C0, 0x4AB77880, 0x4AB66B40,
-	0x4AB55E00, 0x4AB450C0, 0x4AB34380,
-	0x4AB23640, 0x4AB12900, 0x4AB01BC0,
-	0x4AAF0E80, 0x4AAE0140, 0x4AACF400,
-	0x4AABE6C0, 0x4AAAD980, 0x4AA9CC40,
-	0x4AA8BF00, 0x4AA7B1C0, 0x4AA6A480,
-	0x4AA59740, 0x4AA48A00, 0x4AA37CC0,
-	0x4AA26F80, 0x4AA16240, 0x4AA05500,
-	0x4A9F47C0, 0x4A9E3A80, 0x4A9D2D40,
-	0x4A9C2000, 0x4A9B12C0, 0x4A9A0580,
-	0x4A98F840, 0x4A97EB00, 0x4A96DDC0,
-	0x4A95D080, 0x4A94C340, 0x4A93B600,
-	0x4A92A8C0, 0x4A919B80, 0x4A908E40,
-	0x4A8F8100, 0x4A8E73C0, 0x4A8D6680,
-	0x4A8C5940, 0x4A8B4C00, 0x4A8A3EC0,
-	0x4A893180, 0x4A882440, 0x4A871700,
-	0x4A8609C0, 0x4A84FC80, 0x4A83EF40,
-	0x4A82E200, 0x4A81D4C0, 0x4A80C780,
-	0x4A7FBA40, 0x4A7EAD00, 0x4A7D9FC0,
-	0x4A7C9280, 0x4A7B8540, 0x4A7A7800,
-	0x4A796AC0, 0x4A785D80, 0x4A775040,
-	0x4A764300, 0x4A7535C0, 0x4A742880,
-	0x4A731B40, 0x4A720E00, 0x4A7100C0,
-	0x4A6FF380, 0x4A6EE640, 0x4A6DD900,
-	0x4A6CCBC0, 0x4A6BBE80, 0x4A6AB140,
-	0x4A69A400, 0x4A6896C0, 0x4A678980,
-	0x4A667C40, 0x4A656F00, 0x4A6461C0,
-	0x4A635480, 0x4A624740, 0x4A613A00,
-	0x4A602CC0, 0x4A5F1F80, 0x4A5E1240,
-	0x4A5D0500, 0x4A5BF7C0, 0x4A5AEA80,
-	0x4A59DD40, 0x4A58D000, 0x4A57C2C0,
-	0x4A56B580, 0x4A55A840, 0x4A549B00,
-	0x4A538DC0, 0x4A528080, 0x4A517340,
-	0x4A506600, 0x4A4F58C0, 0x4A4E4B80,
-	0x4A4D3E40, 0x4A4C3100, 0x4A4B23C0,
-	0x4A4A1680, 0x4A490940, 0x4A47FC00,
-	0x4A46EEC0, 0x4A45E180, 0x4A44D440,
-	0x4A43C700, 0x4A42B9C0, 0x4A41AC80,
-	0x4A409F40, 0x4A3F9200, 0x4A3E84C0,
-	0x4A3D7780, 0x4A3C6A40, 0x4A3B5D00,
-	0x4A3A4FC0, 0x4A394280, 0x4A383540,
-	0x4A372800, 0x4A361AC0, 0x4A350D80,
-	0x4A340040, 0x4A32F300, 0x4A31E5C0,
-	0x4A30D880, 0x4A2FCB40, 0x4A2EBE00,
-	0x4A2DB0C0, 0x4A2CA380, 0x4A2B9640,
-	0x4A2A8900, 0x4A297BC0, 0x4A286E80,
-	0x4A276140, 0x4A265400, 0x4A2546C0,
-	0x4A243980, 0x4A232C40, 0x4A221F00,
-	0x4A2111C0, 0x4A200480, 0x4A1EF740,
-	0x4A1DEA00, 0x4A1CDCC0, 0x4A1BCF80,
-	0x4A1AC240, 0x4A19B500, 0x4A18A7C0,
-	0x4A179A80, 0x4A168D40, 0x4A158000,
-	0x4A1472C0, 0x4A136580, 0x4A125840,
-	0x4A114B00, 0x4A103DC0, 0x4A0F3080,
-	0x4A0E2340, 0x4A0D1600, 0x4A0C08C0,
-	0x4A0AFB80, 0x4A09EE40, 0x4A08E100,
-	0x4A07D3C0, 0x4A06C680, 0x4A05B940,
-	0x4A04AC00, 0x4A039EC0, 0x4A029180,
-	0x4A018440, 0x4A007700, 0x49FF69C0,
-	0x49FE5C80, 0x49FD4F40, 0x49FC4200,
-	0x49FB34C0, 0x49FA2780, 0x49F91A40,
-	0x49F80D00, 0x49F6FFC0, 0x49F5F280,
-	0x49F4E540, 0x49F3D800, 0x49F2CAC0,
-	0x49F1BD80, 0x49F0B040, 0x49EFA300,
-	0x49EE95C0, 0x49ED8880, 0x49EC7B40,
-	0x49EB6E00, 0x49EA60C0, 0x49E95380,
-	0x49E84640, 0x49E73900, 0x49E62BC0,
-	0x49E51E80, 0x49E41140, 0x49E30400,
-	0x49E1F6C0, 0x49E0E980, 0x49DFDC40,
-	0x49DECF00, 0x49DDC1C0, 0x49DCB480,
-	0x49DBA740, 0x49DA9A00, 0x49D98CC0,
-	0x49D87F80, 0x49D77240, 0x49D66500,
-	0x49D557C0, 0x49D44A80, 0x49D33D40,
-	0x49D23000, 0x49D122C0, 0x49D01580,
-	0x49CF0840, 0x49CDFB00, 0x49CCEDC0,
-	0x49CBE080, 0x49CAD340, 0x49C9C600,
-	0x49C8B8C0, 0x49C7AB80, 0x49C69E40,
-	0x49C59100, 0x49C483C0, 0x49C37680,
-	0x49C26940, 0x49C15C00, 0x49C04EC0,
-	0x49BF4180, 0x49BE3440, 0x49BD2700,
-	0x49BC19C0, 0x49BB0C80, 0x49B9FF40,
-	0x49B8F200, 0x49B7E4C0, 0x49B6D780,
-	0x49B5CA40, 0x49B4BD00, 0x49B3AFC0,
-	0x49B2A280, 0x49B19540, 0x49B08800,
-	0x49AF7AC0, 0x49AE6D80, 0x49AD6040,
-	0x49AC5300, 0x49AB45C0, 0x49AA3880,
-	0x49A92B40, 0x49A81E00, 0x49A710C0,
-	0x49A60380, 0x49A4F640, 0x49A3E900,
-	0x49A2DBC0, 0x49A1CE80, 0x49A0C140,
-	0x499FB400, 0x499EA6C0, 0x499D9980,
-	0x499C8C40, 0x499B7F00, 0x499A71C0,
-	0x49996480, 0x49985740, 0x49974A00,
-	0x49963CC0, 0x49952F80, 0x49942240,
-	0x49931500, 0x499207C0, 0x4990FA80,
-	0x498FED40, 0x498EE000, 0x498DD2C0,
-	0x498CC580, 0x498BB840, 0x498AAB00,
-	0x49899DC0, 0x49889080, 0x49878340,
-	0x49867600, 0x498568C0, 0x49845B80,
-	0x49834E40, 0x49824100, 0x498133C0,
-	0x49802680, 0x497F1940, 0x497E0C00,
-	0x497CFEC0, 0x497BF180, 0x497AE440,
-	0x4979D700, 0x4978C9C0, 0x4977BC80,
-	0x4976AF40, 0x4975A200, 0x497494C0,
-	0x49738780, 0x49727A40, 0x49716D00,
-	0x49705FC0, 0x496F5280, 0x496E4540,
-	0x496D3800, 0x496C2AC0, 0x496B1D80,
-	0x496A1040, 0x49690300, 0x4967F5C0,
-	0x4966E880, 0x4965DB40, 0x4964CE00,
-	0x4963C0C0, 0x4962B380, 0x4961A640,
-	0x49609900, 0x495F8BC0, 0x495E7E80,
-	0x495D7140, 0x495C6400, 0x495B56C0,
-	0x495A4980, 0x49593C40, 0x49582F00,
-	0x495721C0, 0x49561480, 0x49550740,
-	0x4953FA00, 0x4952ECC0, 0x4951DF80,
-	0x4950D240, 0x494FC500, 0x494EB7C0,
-	0x494DAA80, 0x494C9D40, 0x494B9000,
-	0x494A82C0, 0x49497580, 0x49486840,
-	0x49475B00, 0x49464DC0, 0x49454080,
-	0x49443340, 0x49432600, 0x494218C0,
-	0x49410B80, 0x493FFE40, 0x493EF100,
-	0x493DE3C0, 0x493CD680, 0x493BC940,
-	0x493ABC00, 0x4939AEC0, 0x4938A180,
-	0x49379440, 0x49368700, 0x493579C0,
-	0x49346C80, 0x49335F40, 0x49325200,
-	0x493144C0, 0x49303780, 0x492F2A40,
-	0x492E1D00, 0x492D0FC0, 0x492C0280,
-	0x492AF540, 0x4929E800, 0x4928DAC0,
-	0x4927CD80, 0x4926C040, 0x4925B300,
-	0x4924A5C0, 0x49239880, 0x49228B40,
-	0x49217E00, 0x492070C0, 0x491F6380,
-	0x491E5640, 0x491D4900, 0x491C3BC0,
-	0x491B2E80, 0x491A2140, 0x49191400,
-	0x491806C0, 0x4916F980, 0x4915EC40,
-	0x4914DF00, 0x4913D1C0, 0x4912C480,
-	0x4911B740, 0x4910AA00, 0x490F9CC0,
-	0x490E8F80, 0x490D8240, 0x490C7500,
-	0x490B67C0, 0x490A5A80, 0x49094D40,
-	0x49084000, 0x490732C0, 0x49062580,
-	0x49051840, 0x49040B00, 0x4902FDC0,
-	0x4901F080, 0x4900E340, 0x48FFD600,
-	0x48FEC8C0, 0x48FDBB80, 0x48FCAE40,
-	0x48FBA100, 0x48FA93C0, 0x48F98680,
-	0x48F87940, 0x48F76C00, 0x48F65EC0,
-	0x48F55180, 0x48F44440, 0x48F33700,
-	0x48F229C0, 0x48F11C80, 0x48F00F40,
-	0x48EF0200, 0x48EDF4C0, 0x48ECE780,
-	0x48EBDA40, 0x48EACD00, 0x48E9BFC0,
-	0x48E8B280, 0x48E7A540, 0x48E69800,
-	0x48E58AC0, 0x48E47D80, 0x48E37040,
-	0x48E26300, 0x48E155C0, 0x48E04880,
-	0x48DF3B40, 0x48DE2E00, 0x48DD20C0,
-	0x48DC1380, 0x48DB0640, 0x48D9F900,
-	0x48D8EBC0, 0x48D7DE80, 0x48D6D140,
-	0x48D5C400, 0x48D4B6C0, 0x48D3A980,
-	0x48D29C40, 0x48D18F00, 0x48D081C0,
-	0x48CF7480, 0x48CE6740, 0x48CD5A00,
-	0x48CC4CC0, 0x48CB3F80, 0x48CA3240,
-	0x48C92500, 0x48C817C0, 0x48C70A80,
-	0x48C5FD40, 0x48C4F000, 0x48C3E2C0,
-	0x48C2D580, 0x48C1C840, 0x48C0BB00,
-	0x48BFADC0, 0x48BEA080, 0x48BD9340,
-	0x48BC8600, 0x48BB78C0, 0x48BA6B80,
-	0x48B95E40, 0x48B85100, 0x48B743C0,
-	0x48B63680, 0x48B52940, 0x48B41C00,
-	0x48B30EC0, 0x48B20180, 0x48B0F440,
-	0x48AFE700, 0x48AED9C0, 0x48ADCC80,
-	0x48ACBF40, 0x48ABB200, 0x48AAA4C0,
-	0x48A99780, 0x48A88A40, 0x48A77D00,
-	0x48A66FC0, 0x48A56280, 0x48A45540,
-	0x48A34800, 0x48A23AC0, 0x48A12D80,
-	0x48A02040, 0x489F1300, 0x489E05C0,
-	0x489CF880, 0x489BEB40, 0x489ADE00,
-	0x4899D0C0, 0x4898C380, 0x4897B640,
-	0x4896A900, 0x48959BC0, 0x48948E80,
-	0x48938140, 0x48927400, 0x489166C0,
-	0x48905980, 0x488F4C40, 0x488E3F00,
-	0x488D31C0, 0x488C2480, 0x488B1740,
-	0x488A0A00, 0x4888FCC0, 0x4887EF80,
-	0x4886E240, 0x4885D500, 0x4884C7C0,
-	0x4883BA80, 0x4882AD40, 0x4881A000,
-	0x488092C0, 0x487F8580, 0x487E7840,
-	0x487D6B00, 0x487C5DC0, 0x487B5080,
-	0x487A4340, 0x48793600, 0x487828C0,
-	0x48771B80, 0x48760E40, 0x48750100,
-	0x4873F3C0, 0x4872E680, 0x4871D940,
-	0x4870CC00, 0x486FBEC0, 0x486EB180,
-	0x486DA440, 0x486C9700, 0x486B89C0,
-	0x486A7C80, 0x48696F40, 0x48686200,
-	0x486754C0, 0x48664780, 0x48653A40,
-	0x48642D00, 0x48631FC0, 0x48621280,
-	0x48610540, 0x485FF800, 0x485EEAC0,
-	0x485DDD80, 0x485CD040, 0x485BC300,
-	0x485AB5C0, 0x4859A880, 0x48589B40,
-	0x48578E00, 0x485680C0, 0x48557380,
-	0x48546640, 0x48535900, 0x48524BC0,
-	0x48513E80, 0x48503140, 0x484F2400,
-	0x484E16C0, 0x484D0980, 0x484BFC40,
-	0x484AEF00, 0x4849E1C0, 0x4848D480,
-	0x4847C740, 0x4846BA00, 0x4845ACC0,
-	0x48449F80, 0x48439240, 0x48428500,
-	0x484177C0, 0x48406A80, 0x483F5D40,
-	0x483E5000, 0x483D42C0, 0x483C3580,
-	0x483B2840, 0x483A1B00, 0x48390DC0,
-	0x48380080, 0x4836F340, 0x4835E600,
-	0x4834D8C0, 0x4833CB80, 0x4832BE40,
-	0x4831B100, 0x4830A3C0, 0x482F9680,
-	0x482E8940, 0x482D7C00, 0x482C6EC0,
-	0x482B6180, 0x482A5440, 0x48294700,
-	0x482839C0, 0x48272C80, 0x48261F40,
-	0x48251200, 0x482404C0, 0x4822F780,
-	0x4821EA40, 0x4820DD00, 0x481FCFC0,
-	0x481EC280, 0x481DB540, 0x481CA800,
-	0x481B9AC0, 0x481A8D80, 0x48198040,
-	0x48187300, 0x481765C0, 0x48165880,
-	0x48154B40, 0x48143E00, 0x481330C0,
-	0x48122380, 0x48111640, 0x48100900,
-	0x480EFBC0, 0x480DEE80, 0x480CE140,
-	0x480BD400, 0x480AC6C0, 0x4809B980,
-	0x4808AC40, 0x48079F00, 0x480691C0,
-	0x48058480, 0x48047740, 0x48036A00,
-	0x48025CC0, 0x48014F80, 0x48004240,
-	0x47FF3500, 0x47FE27C0, 0x47FD1A80,
-	0x47FC0D40, 0x47FB0000, 0x47F9F2C0,
-	0x47F8E580, 0x47F7D840, 0x47F6CB00,
-	0x47F5BDC0, 0x47F4B080, 0x47F3A340,
-	0x47F29600, 0x47F188C0, 0x47F07B80,
-	0x47EF6E40, 0x47EE6100, 0x47ED53C0,
-	0x47EC4680, 0x47EB3940, 0x47EA2C00,
-	0x47E91EC0, 0x47E81180, 0x47E70440,
-	0x47E5F700, 0x47E4E9C0, 0x47E3DC80,
-	0x47E2CF40, 0x47E1C200, 0x47E0B4C0,
-	0x47DFA780, 0x47DE9A40, 0x47DD8D00,
-	0x47DC7FC0, 0x47DB7280, 0x47DA6540,
-	0x47D95800, 0x47D84AC0, 0x47D73D80,
-	0x47D63040, 0x47D52300, 0x47D415C0,
-	0x47D30880, 0x47D1FB40, 0x47D0EE00,
-	0x47CFE0C0, 0x47CED380, 0x47CDC640,
-	0x47CCB900, 0x47CBABC0, 0x47CA9E80,
-	0x47C99140, 0x47C88400, 0x47C776C0,
-	0x47C66980, 0x47C55C40, 0x47C44F00,
-	0x47C341C0, 0x47C23480, 0x47C12740,
-	0x47C01A00, 0x47BF0CC0, 0x47BDFF80,
-	0x47BCF240, 0x47BBE500, 0x47BAD7C0,
-	0x47B9CA80, 0x47B8BD40, 0x47B7B000,
-	0x47B6A2C0, 0x47B59580, 0x47B48840,
-	0x47B37B00, 0x47B26DC0, 0x47B16080,
-	0x47B05340, 0x47AF4600, 0x47AE38C0,
-	0x47AD2B80, 0x47AC1E40, 0x47AB1100,
-	0x47AA03C0, 0x47A8F680, 0x47A7E940,
-	0x47A6DC00, 0x47A5CEC0, 0x47A4C180,
-	0x47A3B440, 0x47A2A700, 0x47A199C0,
-	0x47A08C80, 0x479F7F40, 0x479E7200,
-	0x479D64C0, 0x479C5780, 0x479B4A40,
-	0x479A3D00, 0x47992FC0, 0x47982280,
-	0x47971540, 0x47960800, 0x4794FAC0,
-	0x4793ED80, 0x4792E040, 0x4791D300,
-	0x4790C5C0, 0x478FB880, 0x478EAB40,
-	0x478D9E00, 0x478C90C0, 0x478B8380,
-	0x478A7640, 0x47896900, 0x47885BC0,
-	0x47874E80, 0x47864140, 0x47853400,
-	0x478426C0, 0x47831980, 0x47820C40,
-	0x4780FF00, 0x477FF1C0, 0x477EE480,
-	0x477DD740, 0x477CCA00, 0x477BBCC0,
-	0x477AAF80, 0x4779A240, 0x47789500,
-	0x477787C0, 0x47767A80, 0x47756D40,
-	0x47746000, 0x477352C0, 0x47724580,
-	0x47713840, 0x47702B00, 0x476F1DC0,
-	0x476E1080, 0x476D0340, 0x476BF600,
-	0x476AE8C0, 0x4769DB80, 0x4768CE40,
-	0x4767C100, 0x4766B3C0, 0x4765A680,
-	0x47649940, 0x47638C00, 0x47627EC0,
-	0x47617180, 0x47606440, 0x475F5700,
-	0x475E49C0, 0x475D3C80, 0x475C2F40,
-	0x475B2200, 0x475A14C0, 0x47590780,
-	0x4757FA40, 0x4756ED00, 0x4755DFC0,
-	0x4754D280, 0x4753C540, 0x4752B800,
-	0x4751AAC0, 0x47509D80, 0x474F9040,
-	0x474E8300, 0x474D75C0, 0x474C6880,
-	0x474B5B40, 0x474A4E00, 0x474940C0,
-	0x47483380, 0x47472640, 0x47461900,
-	0x47450BC0, 0x4743FE80, 0x4742F140,
-	0x4741E400, 0x4740D6C0, 0x473FC980,
-	0x473EBC40, 0x473DAF00, 0x473CA1C0,
-	0x473B9480, 0x473A8740, 0x47397A00,
-	0x47386CC0, 0x47375F80, 0x47365240,
-	0x47354500, 0x473437C0, 0x47332A80,
-	0x47321D40, 0x47311000, 0x473002C0,
-	0x472EF580, 0x472DE840, 0x472CDB00,
-	0x472BCDC0, 0x472AC080, 0x4729B340,
-	0x4728A600, 0x472798C0, 0x47268B80,
-	0x47257E40, 0x47247100, 0x472363C0,
-	0x47225680, 0x47214940, 0x47203C00,
-	0x471F2EC0, 0x471E2180, 0x471D1440,
-	0x471C0700, 0x471AF9C0, 0x4719EC80,
-	0x4718DF40, 0x4717D200, 0x4716C4C0,
-	0x4715B780, 0x4714AA40, 0x47139D00,
-	0x47128FC0, 0x47118280, 0x47107540,
-	0x470F6800, 0x470E5AC0, 0x470D4D80,
-	0x470C4040, 0x470B3300, 0x470A25C0,
-	0x47091880, 0x47080B40, 0x4706FE00,
-	0x4705F0C0, 0x4704E380, 0x4703D640,
-	0x4702C900, 0x4701BBC0, 0x4700AE80,
-	0x46FFA140, 0x46FE9400, 0x46FD86C0,
-	0x46FC7980, 0x46FB6C40, 0x46FA5F00,
-	0x46F951C0, 0x46F84480, 0x46F73740,
-	0x46F62A00, 0x46F51CC0, 0x46F40F80,
-	0x46F30240, 0x46F1F500, 0x46F0E7C0,
-	0x46EFDA80, 0x46EECD40, 0x46EDC000,
-	0x46ECB2C0, 0x46EBA580, 0x46EA9840,
-	0x46E98B00, 0x46E87DC0, 0x46E77080,
-	0x46E66340, 0x46E55600, 0x46E448C0,
-	0x46E33B80, 0x46E22E40, 0x46E12100,
-	0x46E013C0, 0x46DF0680, 0x46DDF940,
-	0x46DCEC00, 0x46DBDEC0, 0x46DAD180,
-	0x46D9C440, 0x46D8B700, 0x46D7A9C0,
-	0x46D69C80, 0x46D58F40, 0x46D48200,
-	0x46D374C0, 0x46D26780, 0x46D15A40,
-	0x46D04D00, 0x46CF3FC0, 0x46CE3280,
-	0x46CD2540, 0x46CC1800, 0x46CB0AC0,
-	0x46C9FD80, 0x46C8F040, 0x46C7E300,
-	0x46C6D5C0, 0x46C5C880, 0x46C4BB40,
-	0x46C3AE00, 0x46C2A0C0, 0x46C19380,
-	0x46C08640, 0x46BF7900, 0x46BE6BC0,
-	0x46BD5E80, 0x46BC5140, 0x46BB4400,
-	0x46BA36C0, 0x46B92980, 0x46B81C40,
-	0x46B70F00, 0x46B601C0, 0x46B4F480,
-	0x46B3E740, 0x46B2DA00, 0x46B1CCC0,
-	0x46B0BF80, 0x46AFB240, 0x46AEA500,
-	0x46AD97C0, 0x46AC8A80, 0x46AB7D40,
-	0x46AA7000, 0x46A962C0, 0x46A85580,
-	0x46A74840, 0x46A63B00, 0x46A52DC0,
-	0x46A42080, 0x46A31340, 0x46A20600,
-	0x46A0F8C0, 0x469FEB80, 0x469EDE40,
-	0x469DD100, 0x469CC3C0, 0x469BB680,
-	0x469AA940, 0x46999C00, 0x46988EC0,
-	0x46978180, 0x46967440, 0x46956700,
-	0x469459C0, 0x46934C80, 0x46923F40,
-	0x46913200, 0x469024C0, 0x468F1780,
-	0x468E0A40, 0x468CFD00, 0x468BEFC0,
-	0x468AE280, 0x4689D540, 0x4688C800,
-	0x4687BAC0, 0x4686AD80, 0x4685A040,
-	0x46849300, 0x468385C0, 0x46827880,
-	0x46816B40, 0x46805E00, 0x467F50C0,
-	0x467E4380, 0x467D3640, 0x467C2900,
-	0x467B1BC0, 0x467A0E80, 0x46790140,
-	0x4677F400, 0x4676E6C0, 0x4675D980,
-	0x4674CC40, 0x4673BF00, 0x4672B1C0,
-	0x4671A480, 0x46709740, 0x466F8A00,
-	0x466E7CC0, 0x466D6F80, 0x466C6240,
-	0x466B5500, 0x466A47C0, 0x46693A80,
-	0x46682D40, 0x46672000, 0x466612C0,
-	0x46650580, 0x4663F840, 0x4662EB00,
-	0x4661DDC0, 0x4660D080, 0x465FC340,
-	0x465EB600, 0x465DA8C0, 0x465C9B80,
-	0x465B8E40, 0x465A8100, 0x465973C0,
-	0x46586680, 0x46575940, 0x46564C00,
-	0x46553EC0, 0x46543180, 0x46532440,
-	0x46521700, 0x465109C0, 0x464FFC80,
-	0x464EEF40, 0x464DE200, 0x464CD4C0,
-	0x464BC780, 0x464ABA40, 0x4649AD00,
-	0x46489FC0, 0x46479280, 0x46468540,
-	0x46457800, 0x46446AC0, 0x46435D80,
-	0x46425040, 0x46414300, 0x464035C0,
-	0x463F2880, 0x463E1B40, 0x463D0E00,
-	0x463C00C0, 0x463AF380, 0x4639E640,
-	0x4638D900, 0x4637CBC0, 0x4636BE80,
-	0x4635B140, 0x4634A400, 0x463396C0,
-	0x46328980, 0x46317C40, 0x46306F00,
-	0x462F61C0, 0x462E5480, 0x462D4740,
-	0x462C3A00, 0x462B2CC0, 0x462A1F80,
-	0x46291240, 0x46280500, 0x4626F7C0,
-	0x4625EA80, 0x4624DD40, 0x4623D000,
-	0x4622C2C0, 0x4621B580, 0x4620A840,
-	0x461F9B00, 0x461E8DC0, 0x461D8080,
-	0x461C7340, 0x461B6600, 0x461A58C0,
-	0x46194B80, 0x46183E40, 0x46173100,
-	0x461623C0, 0x46151680, 0x46140940,
-	0x4612FC00, 0x4611EEC0, 0x4610E180,
-	0x460FD440, 0x460EC700, 0x460DB9C0,
-	0x460CAC80, 0x460B9F40, 0x460A9200,
-	0x460984C0, 0x46087780, 0x46076A40,
-	0x46065D00, 0x46054FC0, 0x46044280,
-	0x46033540, 0x46022800, 0x46011AC0,
-	0x46000D80, 0x45FF0040, 0x45FDF300,
-	0x45FCE5C0, 0x45FBD880, 0x45FACB40,
-	0x45F9BE00, 0x45F8B0C0, 0x45F7A380,
-	0x45F69640, 0x45F58900, 0x45F47BC0,
-	0x45F36E80, 0x45F26140, 0x45F15400,
-	0x45F046C0, 0x45EF3980, 0x45EE2C40,
-	0x45ED1F00, 0x45EC11C0, 0x45EB0480,
-	0x45E9F740, 0x45E8EA00, 0x45E7DCC0,
-	0x45E6CF80, 0x45E5C240, 0x45E4B500,
-	0x45E3A7C0, 0x45E29A80, 0x45E18D40,
-	0x45E08000, 0x45DF72C0, 0x45DE6580,
-	0x45DD5840, 0x45DC4B00, 0x45DB3DC0,
-	0x45DA3080, 0x45D92340, 0x45D81600,
-	0x45D708C0, 0x45D5FB80, 0x45D4EE40,
-	0x45D3E100, 0x45D2D3C0, 0x45D1C680,
-	0x45D0B940, 0x45CFAC00, 0x45CE9EC0,
-	0x45CD9180, 0x45CC8440, 0x45CB7700,
-	0x45CA69C0, 0x45C95C80, 0x45C84F40,
-	0x45C74200, 0x45C634C0, 0x45C52780,
-	0x45C41A40, 0x45C30D00, 0x45C1FFC0,
-	0x45C0F280, 0x45BFE540, 0x45BED800,
-	0x45BDCAC0, 0x45BCBD80, 0x45BBB040,
-	0x45BAA300, 0x45B995C0, 0x45B88880,
-	0x45B77B40, 0x45B66E00, 0x45B560C0,
-	0x45B45380, 0x45B34640, 0x45B23900,
-	0x45B12BC0, 0x45B01E80, 0x45AF1140,
-	0x45AE0400, 0x45ACF6C0, 0x45ABE980,
-	0x45AADC40, 0x45A9CF00, 0x45A8C1C0,
-	0x45A7B480, 0x45A6A740, 0x45A59A00,
-	0x45A48CC0, 0x45A37F80, 0x45A27240,
-	0x45A16500, 0x45A057C0, 0x459F4A80,
-	0x459E3D40, 0x459D3000, 0x459C22C0,
-	0x459B1580, 0x459A0840, 0x4598FB00,
-	0x4597EDC0, 0x4596E080, 0x4595D340,
-	0x4594C600, 0x4593B8C0, 0x4592AB80,
-	0x45919E40, 0x45909100, 0x458F83C0,
-	0x458E7680, 0x458D6940, 0x458C5C00,
-	0x458B4EC0, 0x458A4180, 0x45893440,
-	0x45882700, 0x458719C0, 0x45860C80,
-	0x4584FF40, 0x4583F200, 0x4582E4C0,
-	0x4581D780, 0x4580CA40, 0x457FBD00,
-	0x457EAFC0, 0x457DA280, 0x457C9540,
-	0x457B8800, 0x457A7AC0, 0x45796D80,
-	0x45786040, 0x45775300, 0x457645C0,
-	0x45753880, 0x45742B40, 0x45731E00,
-	0x457210C0, 0x45710380, 0x456FF640,
-	0x456EE900, 0x456DDBC0, 0x456CCE80,
-	0x456BC140, 0x456AB400, 0x4569A6C0,
-	0x45689980, 0x45678C40, 0x45667F00,
-	0x456571C0, 0x45646480, 0x45635740,
-	0x45624A00, 0x45613CC0, 0x45602F80,
-	0x455F2240, 0x455E1500, 0x455D07C0,
-	0x455BFA80, 0x455AED40, 0x4559E000,
-	0x4558D2C0, 0x4557C580, 0x4556B840,
-	0x4555AB00, 0x45549DC0, 0x45539080,
-	0x45528340, 0x45517600, 0x455068C0,
-	0x454F5B80, 0x454E4E40, 0x454D4100,
-	0x454C33C0, 0x454B2680, 0x454A1940,
-	0x45490C00, 0x4547FEC0, 0x4546F180,
-	0x4545E440, 0x4544D700, 0x4543C9C0,
-	0x4542BC80, 0x4541AF40, 0x4540A200,
-	0x453F94C0, 0x453E8780, 0x453D7A40,
-	0x453C6D00, 0x453B5FC0, 0x453A5280,
-	0x45394540, 0x45383800, 0x45372AC0,
-	0x45361D80, 0x45351040, 0x45340300,
-	0x4532F5C0, 0x4531E880, 0x4530DB40,
-	0x452FCE00, 0x452EC0C0, 0x452DB380,
-	0x452CA640, 0x452B9900, 0x452A8BC0,
-	0x45297E80, 0x45287140, 0x45276400,
-	0x452656C0, 0x45254980, 0x45243C40,
-	0x45232F00, 0x452221C0, 0x45211480,
-	0x45200740, 0x451EFA00, 0x451DECC0,
-	0x451CDF80, 0x451BD240, 0x451AC500,
-	0x4519B7C0, 0x4518AA80, 0x45179D40,
-	0x45169000, 0x451582C0, 0x45147580,
-	0x45136840, 0x45125B00, 0x45114DC0,
-	0x45104080, 0x450F3340, 0x450E2600,
-	0x450D18C0, 0x450C0B80, 0x450AFE40,
-	0x4509F100, 0x4508E3C0, 0x4507D680,
-	0x4506C940, 0x4505BC00, 0x4504AEC0,
-	0x4503A180, 0x45029440, 0x45018700,
-	0x450079C0, 0x44FF6C80, 0x44FE5F40,
-	0x44FD5200, 0x44FC44C0, 0x44FB3780,
-	0x44FA2A40, 0x44F91D00, 0x44F80FC0,
-	0x44F70280, 0x44F5F540, 0x44F4E800,
-	0x44F3DAC0, 0x44F2CD80, 0x44F1C040,
-	0x44F0B300, 0x44EFA5C0, 0x44EE9880,
-	0x44ED8B40, 0x44EC7E00, 0x44EB70C0,
-	0x44EA6380, 0x44E95640, 0x44E84900,
-	0x44E73BC0, 0x44E62E80, 0x44E52140,
-	0x44E41400, 0x44E306C0, 0x44E1F980,
-	0x44E0EC40, 0x44DFDF00, 0x44DED1C0,
-	0x44DDC480, 0x44DCB740, 0x44DBAA00,
-	0x44DA9CC0, 0x44D98F80, 0x44D88240,
-	0x44D77500, 0x44D667C0, 0x44D55A80,
-	0x44D44D40, 0x44D34000, 0x44D232C0,
-	0x44D12580, 0x44D01840, 0x44CF0B00,
-	0x44CDFDC0, 0x44CCF080, 0x44CBE340,
-	0x44CAD600, 0x44C9C8C0, 0x44C8BB80,
-	0x44C7AE40, 0x44C6A100, 0x44C593C0,
-	0x44C48680, 0x44C37940, 0x44C26C00,
-	0x44C15EC0, 0x44C05180, 0x44BF4440,
-	0x44BE3700, 0x44BD29C0, 0x44BC1C80,
-	0x44BB0F40, 0x44BA0200, 0x44B8F4C0,
-	0x44B7E780, 0x44B6DA40, 0x44B5CD00,
-	0x44B4BFC0, 0x44B3B280, 0x44B2A540,
-	0x44B19800, 0x44B08AC0, 0x44AF7D80,
-	0x44AE7040, 0x44AD6300, 0x44AC55C0,
-	0x44AB4880, 0x44AA3B40, 0x44A92E00,
-	0x44A820C0, 0x44A71380, 0x44A60640,
-	0x44A4F900, 0x44A3EBC0, 0x44A2DE80,
-	0x44A1D140, 0x44A0C400, 0x449FB6C0,
-	0x449EA980, 0x449D9C40, 0x449C8F00,
-	0x449B81C0, 0x449A7480, 0x44996740,
-	0x44985A00, 0x44974CC0, 0x44963F80,
-	0x44953240, 0x44942500, 0x449317C0,
-	0x44920A80, 0x4490FD40, 0x448FF000,
-	0x448EE2C0, 0x448DD580, 0x448CC840,
-	0x448BBB00, 0x448AADC0, 0x4489A080,
-	0x44889340, 0x44878600, 0x448678C0,
-	0x44856B80, 0x44845E40, 0x44835100,
-	0x448243C0, 0x44813680, 0x44802940,
-	0x447F1C00, 0x447E0EC0, 0x447D0180,
-	0x447BF440, 0x447AE700, 0x4479D9C0,
-	0x4478CC80, 0x4477BF40, 0x4476B200,
-	0x4475A4C0, 0x44749780, 0x44738A40,
-	0x44727D00, 0x44716FC0, 0x44706280,
-	0x446F5540, 0x446E4800, 0x446D3AC0,
-	0x446C2D80, 0x446B2040, 0x446A1300,
-	0x446905C0, 0x4467F880, 0x4466EB40,
-	0x4465DE00, 0x4464D0C0, 0x4463C380,
-	0x4462B640, 0x4461A900, 0x44609BC0,
-	0x445F8E80, 0x445E8140, 0x445D7400,
-	0x445C66C0, 0x445B5980, 0x445A4C40,
-	0x44593F00, 0x445831C0, 0x44572480,
-	0x44561740, 0x44550A00, 0x4453FCC0,
-	0x4452EF80, 0x4451E240, 0x4450D500,
-	0x444FC7C0, 0x444EBA80, 0x444DAD40,
-	0x444CA000, 0x444B92C0, 0x444A8580,
-	0x44497840, 0x44486B00, 0x44475DC0,
-	0x44465080, 0x44454340, 0x44443600,
-	0x444328C0, 0x44421B80, 0x44410E40,
-	0x44400100, 0x443EF3C0, 0x443DE680,
-	0x443CD940, 0x443BCC00, 0x443ABEC0,
-	0x4439B180, 0x4438A440, 0x44379700,
-	0x443689C0, 0x44357C80, 0x44346F40,
-	0x44336200, 0x443254C0, 0x44314780,
-	0x44303A40, 0x442F2D00, 0x442E1FC0,
-	0x442D1280, 0x442C0540, 0x442AF800,
-	0x4429EAC0, 0x4428DD80, 0x4427D040,
-	0x4426C300, 0x4425B5C0, 0x4424A880,
-	0x44239B40, 0x44228E00, 0x442180C0,
-	0x44207380, 0x441F6640, 0x441E5900,
-	0x441D4BC0, 0x441C3E80, 0x441B3140,
-	0x441A2400, 0x441916C0, 0x44180980,
-	0x4416FC40, 0x4415EF00, 0x4414E1C0,
-	0x4413D480, 0x4412C740, 0x4411BA00,
-	0x4410ACC0, 0x440F9F80, 0x440E9240,
-	0x440D8500, 0x440C77C0, 0x440B6A80,
-	0x440A5D40, 0x44095000, 0x440842C0,
-	0x44073580, 0x44062840, 0x44051B00,
-	0x44040DC0, 0x44030080, 0x4401F340,
-	0x4400E600, 0x43FFD8C0, 0x43FECB80,
-	0x43FDBE40, 0x43FCB100, 0x43FBA3C0,
-	0x43FA9680, 0x43F98940, 0x43F87C00,
-	0x43F76EC0, 0x43F66180, 0x43F55440,
-	0x43F44700, 0x43F339C0, 0x43F22C80,
-	0x43F11F40, 0x43F01200, 0x43EF04C0,
-	0x43EDF780, 0x43ECEA40, 0x43EBDD00,
-	0x43EACFC0, 0x43E9C280, 0x43E8B540,
-	0x43E7A800, 0x43E69AC0, 0x43E58D80,
-	0x43E48040, 0x43E37300, 0x43E265C0,
-	0x43E15880, 0x43E04B40, 0x43DF3E00,
-	0x43DE30C0, 0x43DD2380, 0x43DC1640,
-	0x43DB0900, 0x43D9FBC0, 0x43D8EE80,
-	0x43D7E140, 0x43D6D400, 0x43D5C6C0,
-	0x43D4B980, 0x43D3AC40, 0x43D29F00,
-	0x43D191C0, 0x43D08480, 0x43CF7740,
-	0x43CE6A00, 0x43CD5CC0, 0x43CC4F80,
-	0x43CB4240, 0x43CA3500, 0x43C927C0,
-	0x43C81A80, 0x43C70D40, 0x43C80000,
-	0x43C70640, 0x43C60C80, 0x43C512C0,
-	0x43C41900, 0x43C31F40, 0x43C22580,
-	0x43C12BC0, 0x43C03200, 0x43BF3840,
-	0x43BE3E80, 0x43BD44C0, 0x43BC4B00,
-	0x43BB5140, 0x43BA5780, 0x43B95DC0,
-	0x43B86400, 0x43B76A40, 0x43B67080,
-	0x43B576C0, 0x43B47D00, 0x43B38340,
-	0x43B28980, 0x43B18FC0, 0x43B09600,
-	0x43AF9C40, 0x43AEA280, 0x43ADA8C0,
-	0x43ACAF00, 0x43ABB540, 0x43AABB80,
-	0x43A9C1C0, 0x43A8C800, 0x43A7CE40,
-	0x43A6D480, 0x43A5DAC0, 0x43A4E100,
-	0x43A3E740, 0x43A2ED80, 0x43A1F3C0,
-	0x43A0FA00, 0x43A00040, 0x439F0680,
-	0x439E0CC0, 0x439D1300, 0x439C1940,
-	0x439B1F80, 0x439A25C0, 0x43992C00,
-	0x43983240, 0x43973880, 0x43963EC0,
-	0x43954500, 0x43944B40, 0x43935180,
-	0x439257C0, 0x43915E00, 0x43906440,
-	0x438F6A80, 0x438E70C0, 0x438D7700,
-	0x438C7D40, 0x438B8380, 0x438A89C0,
-	0x43899000, 0x43889640, 0x43879C80,
-	0x4386A2C0, 0x4385A900, 0x4384AF40,
-	0x4383B580, 0x4382BBC0, 0x4381C200,
-	0x4380C840, 0x437FCE80, 0x437ED4C0,
-	0x437DDB00, 0x437CE140, 0x437BE780,
-	0x437AEDC0, 0x4379F400, 0x4378FA40,
-	0x43780080, 0x437706C0, 0x43760D00,
-	0x43751340, 0x43741980, 0x43731FC0,
-	0x43722600, 0x43712C40, 0x43703280,
-	0x436F38C0, 0x436E3F00, 0x436D4540,
-	0x436C4B80, 0x436B51C0, 0x436A5800,
-	0x43695E40, 0x43686480, 0x43676AC0,
-	0x43667100, 0x43657740, 0x43647D80,
-	0x436383C0, 0x43628A00, 0x43619040,
-	0x43609680, 0x435F9CC0, 0x435EA300,
-	0x435DA940, 0x435CAF80, 0x435BB5C0,
-	0x435ABC00, 0x4359C240, 0x4358C880,
-	0x4357CEC0, 0x4356D500, 0x4355DB40,
-	0x4354E180, 0x4353E7C0, 0x4352EE00,
-	0x4351F440, 0x4350FA80, 0x435000C0,
-	0x434F0700, 0x434E0D40, 0x434D1380,
-	0x434C19C0, 0x434B2000, 0x434A2640,
-	0x43492C80, 0x434832C0, 0x43473900,
-	0x43463F40, 0x43454580, 0x43444BC0,
-	0x43435200, 0x43425840, 0x43415E80,
-	0x434064C0, 0x433F6B00, 0x433E7140,
-	0x433D7780, 0x433C7DC0, 0x433B8400,
-	0x433A8A40, 0x43399080, 0x433896C0,
-	0x43379D00, 0x4336A340, 0x4335A980,
-	0x4334AFC0, 0x4333B600, 0x4332BC40,
-	0x4331C280, 0x4330C8C0, 0x432FCF00,
-	0x432ED540, 0x432DDB80, 0x432CE1C0,
-	0x432BE800, 0x432AEE40, 0x4329F480,
-	0x4328FAC0, 0x43280100, 0x43270740,
-	0x43260D80, 0x432513C0, 0x43241A00,
-	0x43232040, 0x43222680, 0x43212CC0,
-	0x43203300, 0x431F3940, 0x431E3F80,
-	0x431D45C0, 0x431C4C00, 0x431B5240,
-	0x431A5880, 0x43195EC0, 0x43186500,
-	0x43176B40, 0x43167180, 0x431577C0,
-	0x43147E00, 0x43138440, 0x43128A80,
-	0x431190C0, 0x43109700, 0x430F9D40,
-	0x430EA380, 0x430DA9C0, 0x430CB000,
-	0x430BB640, 0x430ABC80, 0x4309C2C0,
-	0x4308C900, 0x4307CF40, 0x4306D580,
-	0x4305DBC0, 0x4304E200, 0x4303E840,
-	0x4302EE80, 0x4301F4C0, 0x4300FB00,
-	0x43000140, 0x42FF0780, 0x42FE0DC0,
-	0x42FD1400, 0x42FC1A40, 0x42FB2080,
-	0x42FA26C0, 0x42F92D00, 0x42F83340,
-	0x42F73980, 0x42F63FC0, 0x42F54600,
-	0x42F44C40, 0x42F35280, 0x42F258C0,
-	0x42F15F00, 0x42F06540, 0x42EF6B80,
-	0x42EE71C0, 0x42ED7800, 0x42EC7E40,
-	0x42EB8480, 0x42EA8AC0, 0x42E99100,
-	0x42E89740, 0x42E79D80, 0x42E6A3C0,
-	0x42E5AA00, 0x42E4B040, 0x42E3B680,
-	0x42E2BCC0, 0x42E1C300, 0x42E0C940,
-	0x42DFCF80, 0x42DED5C0, 0x42DDDC00,
-	0x42DCE240, 0x42DBE880, 0x42DAEEC0,
-	0x42D9F500, 0x42D8FB40, 0x42D80180,
-	0x42D707C0, 0x42D60E00, 0x42D51440,
-	0x42D41A80, 0x42D320C0, 0x42D22700,
-	0x42D12D40, 0x42D03380, 0x42CF39C0,
-	0x42CE4000, 0x42CD4640, 0x42CC4C80,
-	0x42CB52C0, 0x42CA5900, 0x42C95F40,
-	0x42C86580, 0x42C76BC0, 0x42C67200,
-	0x42C57840, 0x42C47E80, 0x42C384C0,
-	0x42C28B00, 0x42C19140, 0x42C09780,
-	0x42BF9DC0, 0x42BEA400, 0x42BDAA40,
-	0x42BCB080, 0x42BBB6C0, 0x42BABD00,
-	0x42B9C340, 0x42B8C980, 0x42B7CFC0,
-	0x42B6D600, 0x42B5DC40, 0x42B4E280,
-	0x42B3E8C0, 0x42B2EF00, 0x42B1F540,
-	0x42B0FB80, 0x42B001C0, 0x42AF0800,
-	0x42AE0E40, 0x42AD1480, 0x42AC1AC0,
-	0x42AB2100, 0x42AA2740, 0x42A92D80,
-	0x42A833C0, 0x42A73A00, 0x42A64040,
-	0x42A54680, 0x42A44CC0, 0x42A35300,
-	0x42A25940, 0x42A15F80, 0x42A065C0,
-	0x429F6C00, 0x429E7240, 0x429D7880,
-	0x429C7EC0, 0x429B8500, 0x429A8B40,
-	0x42999180, 0x429897C0, 0x42979E00,
-	0x4296A440, 0x4295AA80, 0x4294B0C0,
-	0x4293B700, 0x4292BD40, 0x4291C380,
-	0x4290C9C0, 0x428FD000, 0x428ED640,
-	0x428DDC80, 0x428CE2C0, 0x428BE900,
-	0x428AEF40, 0x4289F580, 0x4288FBC0,
-	0x42880200, 0x42870840, 0x42860E80,
-	0x428514C0, 0x42841B00, 0x42832140,
-	0x42822780, 0x42812DC0, 0x42803400,
-	0x427F3A40, 0x427E4080, 0x427D46C0,
-	0x427C4D00, 0x427B5340, 0x427A5980,
-	0x42795FC0, 0x42786600, 0x42776C40,
-	0x42767280, 0x427578C0, 0x42747F00,
-	0x42738540, 0x42728B80, 0x427191C0,
-	0x42709800, 0x426F9E40, 0x426EA480,
-	0x426DAAC0, 0x426CB100, 0x426BB740,
-	0x426ABD80, 0x4269C3C0, 0x4268CA00,
-	0x4267D040, 0x4266D680, 0x4265DCC0,
-	0x4264E300, 0x4263E940, 0x4262EF80,
-	0x4261F5C0, 0x4260FC00, 0x42600240,
-	0x425F0880, 0x425E0EC0, 0x425D1500,
-	0x425C1B40, 0x425B2180, 0x425A27C0,
-	0x42592E00, 0x42583440, 0x42573A80,
-	0x425640C0, 0x42554700, 0x42544D40,
-	0x42535380, 0x425259C0, 0x42516000,
-	0x42506640, 0x424F6C80, 0x424E72C0,
-	0x424D7900, 0x424C7F40, 0x424B8580,
-	0x424A8BC0, 0x42499200, 0x42489840,
-	0x42479E80, 0x4246A4C0, 0x4245AB00,
-	0x4244B140, 0x4243B780, 0x4242BDC0,
-	0x4241C400, 0x4240CA40, 0x423FD080,
-	0x423ED6C0, 0x423DDD00, 0x423CE340,
-	0x423BE980, 0x423AEFC0, 0x4239F600,
-	0x4238FC40, 0x42380280, 0x423708C0,
-	0x42360F00, 0x42351540, 0x42341B80,
-	0x423321C0, 0x42322800, 0x42312E40,
-	0x42303480, 0x422F3AC0, 0x422E4100,
-	0x422D4740, 0x422C4D80, 0x422B53C0,
-	0x422A5A00, 0x42296040, 0x42286680,
-	0x42276CC0, 0x42267300, 0x42257940,
-	0x42247F80, 0x422385C0, 0x42228C00,
-	0x42219240, 0x42209880, 0x421F9EC0,
-	0x421EA500, 0x421DAB40, 0x421CB180,
-	0x421BB7C0, 0x421ABE00, 0x4219C440,
-	0x4218CA80, 0x4217D0C0, 0x4216D700,
-	0x4215DD40, 0x4214E380, 0x4213E9C0,
-	0x4212F000, 0x4211F640, 0x4210FC80,
-	0x421002C0, 0x420F0900, 0x420E0F40,
-	0x420D1580, 0x420C1BC0, 0x420B2200,
-	0x420A2840, 0x42092E80, 0x420834C0,
-	0x42073B00, 0x42064140, 0x42054780,
-	0x42044DC0, 0x42035400, 0x42025A40,
-	0x42016080, 0x420066C0, 0x41FF6D00,
-	0x41FE7340, 0x41FD7980, 0x41FC7FC0,
-	0x41FB8600, 0x41FA8C40, 0x41F99280,
-	0x41F898C0, 0x41F79F00, 0x41F6A540,
-	0x41F5AB80, 0x41F4B1C0, 0x41F3B800,
-	0x41F2BE40, 0x41F1C480, 0x41F0CAC0,
-	0x41EFD100, 0x41EED740, 0x41EDDD80,
-	0x41ECE3C0, 0x41EBEA00, 0x41EAF040,
-	0x41E9F680, 0x41E8FCC0, 0x41E80300,
-	0x41E70940, 0x41E60F80, 0x41E515C0,
-	0x41E41C00, 0x41E32240, 0x41E22880,
-	0x41E12EC0, 0x41E03500, 0x41DF3B40,
-	0x41DE4180, 0x41DD47C0, 0x41DC4E00,
-	0x41DB5440, 0x41DA5A80, 0x41D960C0,
-	0x41D86700, 0x41D76D40, 0x41D67380,
-	0x41D579C0, 0x41D48000, 0x41D38640,
-	0x41D28C80, 0x41D192C0, 0x41D09900,
-	0x41CF9F40, 0x41CEA580, 0x41CDABC0,
-	0x41CCB200, 0x41CBB840, 0x41CABE80,
-	0x41C9C4C0, 0x41C8CB00, 0x41C7D140,
-	0x41C6D780, 0x41C5DDC0, 0x41C4E400,
-	0x41C3EA40, 0x41C2F080, 0x41C1F6C0,
-	0x41C0FD00, 0x41C00340, 0x41BF0980,
-	0x41BE0FC0, 0x41BD1600, 0x41BC1C40,
-	0x41BB2280, 0x41BA28C0, 0x41B92F00,
-	0x41B83540, 0x41B73B80, 0x41B641C0,
-	0x41B54800, 0x41B44E40, 0x41B35480,
-	0x41B25AC0, 0x41B16100, 0x41B06740,
-	0x41AF6D80, 0x41AE73C0, 0x41AD7A00,
-	0x41AC8040, 0x41AB8680, 0x41AA8CC0,
-	0x41A99300, 0x41A89940, 0x41A79F80,
-	0x41A6A5C0, 0x41A5AC00, 0x41A4B240,
-	0x41A3B880, 0x41A2BEC0, 0x41A1C500,
-	0x41A0CB40, 0x419FD180, 0x419ED7C0,
-	0x419DDE00, 0x419CE440, 0x419BEA80,
-	0x419AF0C0, 0x4199F700, 0x4198FD40,
-	0x41980380, 0x419709C0, 0x41961000,
-	0x41951640, 0x41941C80, 0x419322C0,
-	0x41922900, 0x41912F40, 0x41903580,
-	0x418F3BC0, 0x418E4200, 0x418D4840,
-	0x418C4E80, 0x418B54C0, 0x418A5B00,
-	0x41896140, 0x41886780, 0x41876DC0,
-	0x41867400, 0x41857A40, 0x41848080,
-	0x418386C0, 0x41828D00, 0x41819340,
-	0x41809980, 0x417F9FC0, 0x417EA600,
-	0x417DAC40, 0x417CB280, 0x417BB8C0,
-	0x417ABF00, 0x4179C540, 0x4178CB80,
-	0x4177D1C0, 0x4176D800, 0x4175DE40,
-	0x4174E480, 0x4173EAC0, 0x4172F100,
-	0x4171F740, 0x4170FD80, 0x417003C0,
-	0x416F0A00, 0x416E1040, 0x416D1680,
-	0x416C1CC0, 0x416B2300, 0x416A2940,
-	0x41692F80, 0x416835C0, 0x41673C00,
-	0x41664240, 0x41654880, 0x41644EC0,
-	0x41635500, 0x41625B40, 0x41616180,
-	0x416067C0, 0x415F6E00, 0x415E7440,
-	0x415D7A80, 0x415C80C0, 0x415B8700,
-	0x415A8D40, 0x41599380, 0x415899C0,
-	0x4157A000, 0x4156A640, 0x4155AC80,
-	0x4154B2C0, 0x4153B900, 0x4152BF40,
-	0x4151C580, 0x4150CBC0, 0x414FD200,
-	0x414ED840, 0x414DDE80, 0x414CE4C0,
-	0x414BEB00, 0x414AF140, 0x4149F780,
-	0x4148FDC0, 0x41480400, 0x41470A40,
-	0x41461080, 0x414516C0, 0x41441D00,
-	0x41432340, 0x41422980, 0x41412FC0,
-	0x41403600, 0x413F3C40, 0x413E4280,
-	0x413D48C0, 0x413C4F00, 0x413B5540,
-	0x413A5B80, 0x413961C0, 0x41386800,
-	0x41376E40, 0x41367480, 0x41357AC0,
-	0x41348100, 0x41338740, 0x41328D80,
-	0x413193C0, 0x41309A00, 0x412FA040,
-	0x412EA680, 0x412DACC0, 0x412CB300,
-	0x412BB940, 0x412ABF80, 0x4129C5C0,
-	0x4128CC00, 0x4127D240, 0x4126D880,
-	0x4125DEC0, 0x4124E500, 0x4123EB40,
-	0x4122F180, 0x4121F7C0, 0x4120FE00,
-	0x41200440, 0x411F0A80, 0x411E10C0,
-	0x411D1700, 0x411C1D40, 0x411B2380,
-	0x411A29C0, 0x41193000, 0x41183640,
-	0x41173C80, 0x411642C0, 0x41154900,
-	0x41144F40, 0x41135580, 0x41125BC0,
-	0x41116200, 0x41106840, 0x410F6E80,
-	0x410E74C0, 0x410D7B00, 0x410C8140,
-	0x410B8780, 0x410A8DC0, 0x41099400,
-	0x41089A40, 0x4107A080, 0x4106A6C0,
-	0x4105AD00, 0x4104B340, 0x4103B980,
-	0x4102BFC0, 0x4101C600, 0x4100CC40,
-	0x40FFD280, 0x40FED8C0, 0x40FDDF00,
-	0x40FCE540, 0x40FBEB80, 0x40FAF1C0,
-	0x40F9F800, 0x40F8FE40, 0x40F80480,
-	0x40F70AC0, 0x40F61100, 0x40F51740,
-	0x40F41D80, 0x40F323C0, 0x40F22A00,
-	0x40F13040, 0x40F03680, 0x40EF3CC0,
-	0x40EE4300, 0x40ED4940, 0x40EC4F80,
-	0x40EB55C0, 0x40EA5C00, 0x40E96240,
-	0x40E86880, 0x40E76EC0, 0x40E67500,
-	0x40E57B40, 0x40E48180, 0x40E387C0,
-	0x40E28E00, 0x40E19440, 0x40E09A80,
-	0x40DFA0C0, 0x40DEA700, 0x40DDAD40,
-	0x40DCB380, 0x40DBB9C0, 0x40DAC000,
-	0x40D9C640, 0x40D8CC80, 0x40D7D2C0,
-	0x40D6D900, 0x40D5DF40, 0x40D4E580,
-	0x40D3EBC0, 0x40D2F200, 0x40D1F840,
-	0x40D0FE80, 0x40D004C0, 0x40CF0B00,
-	0x40CE1140, 0x40CD1780, 0x40CC1DC0,
-	0x40CB2400, 0x40CA2A40, 0x40C93080,
-	0x40C836C0, 0x40C73D00, 0x40C64340,
-	0x40C54980, 0x40C44FC0, 0x40C35600,
-	0x40C25C40, 0x40C16280, 0x40C068C0,
-	0x40BF6F00, 0x40BE7540, 0x40BD7B80,
-	0x40BC81C0, 0x40BB8800, 0x40BA8E40,
-	0x40B99480, 0x40B89AC0, 0x40B7A100,
-	0x40B6A740, 0x40B5AD80, 0x40B4B3C0,
-	0x40B3BA00, 0x40B2C040, 0x40B1C680,
-	0x40B0CCC0, 0x40AFD300, 0x40AED940,
-	0x40ADDF80, 0x40ACE5C0, 0x40ABEC00,
-	0x40AAF240, 0x40A9F880, 0x40A8FEC0,
-	0x40A80500, 0x40A70B40, 0x40A61180,
-	0x40A517C0, 0x40A41E00, 0x40A32440,
-	0x40A22A80, 0x40A130C0, 0x40A03700,
-	0x409F3D40, 0x409E4380, 0x409D49C0,
-	0x409C5000, 0x409B5640, 0x409A5C80,
-	0x409962C0, 0x40986900, 0x40976F40,
-	0x40967580, 0x40957BC0, 0x40948200,
-	0x40938840, 0x40928E80, 0x409194C0,
-	0x40909B00, 0x408FA140, 0x408EA780,
-	0x408DADC0, 0x408CB400, 0x408BBA40,
-	0x408AC080, 0x4089C6C0, 0x4088CD00,
-	0x4087D340, 0x4086D980, 0x4085DFC0,
-	0x4084E600, 0x4083EC40, 0x4082F280,
-	0x4081F8C0, 0x4080FF00, 0x40800540,
-	0x407F0B80, 0x407E11C0, 0x407D1800,
-	0x407C1E40, 0x407B2480, 0x407A2AC0,
-	0x40793100, 0x40783740, 0x40773D80,
-	0x407643C0, 0x40754A00, 0x40745040,
-	0x40735680, 0x40725CC0, 0x40716300,
-	0x40706940, 0x406F6F80, 0x406E75C0,
-	0x406D7C00, 0x406C8240, 0x406B8880,
-	0x406A8EC0, 0x40699500, 0x40689B40,
-	0x4067A180, 0x4066A7C0, 0x4065AE00,
-	0x4064B440, 0x4063BA80, 0x4062C0C0,
-	0x4061C700, 0x4060CD40, 0x405FD380,
-	0x405ED9C0, 0x405DE000, 0x405CE640,
-	0x405BEC80, 0x405AF2C0, 0x4059F900,
-	0x4058FF40, 0x40580580, 0x40570BC0,
-	0x40561200, 0x40551840, 0x40541E80,
-	0x405324C0, 0x40522B00, 0x40513140,
-	0x40503780, 0x404F3DC0, 0x404E4400,
-	0x404D4A40, 0x404C5080, 0x404B56C0,
-	0x404A5D00, 0x40496340, 0x40486980,
-	0x40476FC0, 0x40467600, 0x40457C40,
-	0x40448280, 0x404388C0, 0x40428F00,
-	0x40419540, 0x40409B80, 0x403FA1C0,
-	0x403EA800, 0x403DAE40, 0x403CB480,
-	0x403BBAC0, 0x403AC100, 0x4039C740,
-	0x4038CD80, 0x4037D3C0, 0x4036DA00,
-	0x4035E040, 0x4034E680, 0x4033ECC0,
-	0x4032F300, 0x4031F940, 0x4030FF80,
-	0x403005C0, 0x402F0C00, 0x402E1240,
-	0x402D1880, 0x402C1EC0, 0x402B2500,
-	0x402A2B40, 0x40293180, 0x402837C0,
-	0x40273E00, 0x40264440, 0x40254A80,
-	0x402450C0, 0x40235700, 0x40225D40,
-	0x40216380, 0x402069C0, 0x401F7000,
-	0x401E7640, 0x401D7C80, 0x401C82C0,
-	0x401B8900, 0x401A8F40, 0x40199580,
-	0x40189BC0, 0x4017A200, 0x4016A840,
-	0x4015AE80, 0x4014B4C0, 0x4013BB00,
-	0x4012C140, 0x4011C780, 0x4010CDC0,
-	0x400FD400, 0x400EDA40, 0x400DE080,
-	0x400CE6C0, 0x400BED00, 0x400AF340,
-	0x4009F980, 0x4008FFC0, 0x40080600,
-	0x40070C40, 0x40061280, 0x400518C0,
-	0x40041F00, 0x40032540, 0x40022B80,
-	0x400131C0, 0x40003800, 0x3FFF3E40,
-	0x3FFE4480, 0x3FFD4AC0, 0x3FFC5100,
-	0x3FFB5740, 0x3FFA5D80, 0x3FF963C0,
-	0x3FF86A00, 0x3FF77040, 0x3FF67680,
-	0x3FF57CC0, 0x3FF48300, 0x3FF38940,
-	0x3FF28F80, 0x3FF195C0, 0x3FF09C00,
-	0x3FEFA240, 0x3FEEA880, 0x3FEDAEC0,
-	0x3FECB500, 0x3FEBBB40, 0x3FEAC180,
-	0x3FE9C7C0, 0x3FE8CE00, 0x3FE7D440,
-	0x3FE6DA80, 0x3FE5E0C0, 0x3FE4E700,
-	0x3FE3ED40, 0x3FE2F380, 0x3FE1F9C0,
-	0x3FE10000, 0x3FE00640, 0x3FDF0C80,
-	0x3FDE12C0, 0x3FDD1900, 0x3FDC1F40,
-	0x3FDB2580, 0x3FDA2BC0, 0x3FD93200,
-	0x3FD83840, 0x3FD73E80, 0x3FD644C0,
-	0x3FD54B00, 0x3FD45140, 0x3FD35780,
-	0x3FD25DC0, 0x3FD16400, 0x3FD06A40,
-	0x3FCF7080, 0x3FCE76C0, 0x3FCD7D00,
-	0x3FCC8340, 0x3FCB8980, 0x3FCA8FC0,
-	0x3FC99600, 0x3FC89C40, 0x3FC7A280,
-	0x3FC6A8C0, 0x3FC5AF00, 0x3FC4B540,
-	0x3FC3BB80, 0x3FC2C1C0, 0x3FC1C800,
-	0x3FC0CE40, 0x3FBFD480, 0x3FBEDAC0,
-	0x3FBDE100, 0x3FBCE740, 0x3FBBED80,
-	0x3FBAF3C0, 0x3FB9FA00, 0x3FB90040,
-	0x3FB80680, 0x3FB70CC0, 0x3FB61300,
-	0x3FB51940, 0x3FB41F80, 0x3FB325C0,
-	0x3FB22C00, 0x3FB13240, 0x3FB03880,
-	0x3FAF3EC0, 0x3FAE4500, 0x3FAD4B40,
-	0x3FAC5180, 0x3FAB57C0, 0x3FAA5E00,
-	0x3FA96440, 0x3FA86A80, 0x3FA770C0,
-	0x3FA67700, 0x3FA57D40, 0x3FA48380,
-	0x3FA389C0, 0x3FA29000, 0x3FA19640,
-	0x3FA09C80, 0x3F9FA2C0, 0x3F9EA900,
-	0x3F9DAF40, 0x3F9CB580, 0x3F9BBBC0,
-	0x3F9AC200, 0x3F99C840, 0x3F98CE80,
-	0x3F97D4C0, 0x3F96DB00, 0x3F95E140,
-	0x3F94E780, 0x3F93EDC0, 0x3F92F400,
-	0x3F91FA40, 0x3F910080, 0x3F9006C0,
-	0x3F8F0D00, 0x3F8E1340, 0x3F8D1980,
-	0x3F8C1FC0, 0x3F8B2600, 0x3F8A2C40,
-	0x3F893280, 0x3F8838C0, 0x3F873F00,
-	0x3F864540, 0x3F854B80, 0x3F8451C0,
-	0x3F835800, 0x3F825E40, 0x3F816480,
-	0x3F806AC0, 0x3F7F7100, 0x3F7E7740,
-	0x3F7D7D80, 0x3F7C83C0, 0x3F7B8A00,
-	0x3F7A9040, 0x3F799680, 0x3F789CC0,
-	0x3F77A300, 0x3F76A940, 0x3F75AF80,
-	0x3F74B5C0, 0x3F73BC00, 0x3F72C240,
-	0x3F71C880, 0x3F70CEC0, 0x3F6FD500,
-	0x3F6EDB40, 0x3F6DE180, 0x3F6CE7C0,
-	0x3F6BEE00, 0x3F6AF440, 0x3F69FA80,
-	0x3F6900C0, 0x3F680700, 0x3F670D40,
-	0x3F661380, 0x3F6519C0, 0x3F642000,
-	0x3F632640, 0x3F622C80, 0x3F6132C0,
-	0x3F603900, 0x3F5F3F40, 0x3F5E4580,
-	0x3F5D4BC0, 0x3F5C5200, 0x3F5B5840,
-	0x3F5A5E80, 0x3F5964C0, 0x3F586B00,
-	0x3F577140, 0x3F567780, 0x3F557DC0,
-	0x3F548400, 0x3F538A40, 0x3F529080,
-	0x3F5196C0, 0x3F509D00, 0x3F4FA340,
-	0x3F4EA980, 0x3F4DAFC0, 0x3F4CB600,
-	0x3F4BBC40, 0x3F4AC280, 0x3F49C8C0,
-	0x3F48CF00, 0x3F47D540, 0x3F46DB80,
-	0x3F45E1C0, 0x3F44E800, 0x3F43EE40,
-	0x3F42F480, 0x3F41FAC0, 0x3F410100,
-	0x3F400740, 0x3F3F0D80, 0x3F3E13C0,
-	0x3F3D1A00, 0x3F3C2040, 0x3F3B2680,
-	0x3F3A2CC0, 0x3F393300, 0x3F383940,
-	0x3F373F80, 0x3F3645C0, 0x3F354C00,
-	0x3F345240, 0x3F335880, 0x3F325EC0,
-	0x3F316500, 0x3F306B40, 0x3F2F7180,
-	0x3F2E77C0, 0x3F2D7E00, 0x3F2C8440,
-	0x3F2B8A80, 0x3F2A90C0, 0x3F299700,
-	0x3F289D40, 0x3F27A380, 0x3F26A9C0,
-	0x3F25B000, 0x3F24B640, 0x3F23BC80,
-	0x3F22C2C0, 0x3F21C900, 0x3F20CF40,
-	0x3F1FD580, 0x3F1EDBC0, 0x3F1DE200,
-	0x3F1CE840, 0x3F1BEE80, 0x3F1AF4C0,
-	0x3F19FB00, 0x3F190140, 0x3F180780,
-	0x3F170DC0, 0x3F161400, 0x3F151A40,
-	0x3F142080, 0x3F1326C0, 0x3F122D00,
-	0x3F113340, 0x3F103980, 0x3F0F3FC0,
-	0x3F0E4600, 0x3F0D4C40, 0x3F0C5280,
-	0x3F0B58C0, 0x3F0A5F00, 0x3F096540,
-	0x3F086B80, 0x3F0771C0, 0x3F067800,
-	0x3F057E40, 0x3F048480, 0x3F038AC0,
-	0x3F029100, 0x3F019740, 0x3F009D80,
-	0x3EFFA3C0, 0x3EFEAA00, 0x3EFDB040,
-	0x3EFCB680, 0x3EFBBCC0, 0x3EFAC300,
-	0x3EF9C940, 0x3EF8CF80, 0x3EF7D5C0,
-	0x3EF6DC00, 0x3EF5E240, 0x3EF4E880,
-	0x3EF3EEC0, 0x3EF2F500, 0x3EF1FB40,
-	0x3EF10180, 0x3EF007C0, 0x3EEF0E00,
-	0x3EEE1440, 0x3EED1A80, 0x3EEC20C0,
-	0x3EEB2700, 0x3EEA2D40, 0x3EE93380,
-	0x3EE839C0, 0x3EE74000, 0x3EE64640,
-	0x3EE54C80, 0x3EE452C0, 0x3EE35900,
-	0x3EE25F40, 0x3EE16580, 0x3EE06BC0,
-	0x3EDF7200, 0x3EDE7840, 0x3EDD7E80,
-	0x3EDC84C0, 0x3EDB8B00, 0x3EDA9140,
-	0x3ED99780, 0x3ED89DC0, 0x3ED7A400,
-	0x3ED6AA40, 0x3ED5B080, 0x3ED4B6C0,
-	0x3ED3BD00, 0x3ED2C340, 0x3ED1C980,
-	0x3ED0CFC0, 0x3ECFD600, 0x3ECEDC40,
-	0x3ECDE280, 0x3ECCE8C0, 0x3ECBEF00,
-	0x3ECAF540, 0x3EC9FB80, 0x3EC901C0,
-	0x3EC80800, 0x3EC70E40, 0x3EC61480,
-	0x3EC51AC0, 0x3EC42100, 0x3EC32740,
-	0x3EC22D80, 0x3EC133C0, 0x3EC03A00,
-	0x3EBF4040, 0x3EBE4680, 0x3EBD4CC0,
-	0x3EBC5300, 0x3EBB5940, 0x3EBA5F80,
-	0x3EB965C0, 0x3EB86C00, 0x3EB77240,
-	0x3EB67880, 0x3EB57EC0, 0x3EB48500,
-	0x3EB38B40, 0x3EB29180, 0x3EB197C0,
-	0x3EB09E00, 0x3EAFA440, 0x3EAEAA80,
-	0x3EADB0C0, 0x3EACB700, 0x3EABBD40,
-	0x3EAAC380, 0x3EA9C9C0, 0x3EA8D000,
-	0x3EA7D640, 0x3EA6DC80, 0x3EA5E2C0,
-	0x3EA4E900, 0x3EA3EF40, 0x3EA2F580,
-	0x3EA1FBC0, 0x3EA10200, 0x3EA00840,
-	0x3E9F0E80, 0x3E9E14C0, 0x3E9D1B00,
-	0x3E9C2140, 0x3E9B2780, 0x3E9A2DC0,
-	0x3E993400, 0x3E983A40, 0x3E974080,
-	0x3E9646C0, 0x3E954D00, 0x3E945340,
-	0x3E935980, 0x3E925FC0, 0x3E916600,
-	0x3E906C40, 0x3E8F7280, 0x3E8E78C0,
-	0x3E8D7F00, 0x3E8C8540, 0x3E8B8B80,
-	0x3E8A91C0, 0x3E899800, 0x3E889E40,
-	0x3E87A480, 0x3E86AAC0, 0x3E85B100,
-	0x3E84B740, 0x3E83BD80, 0x3E82C3C0,
-	0x3E81CA00, 0x3E80D040, 0x3E7FD680,
-	0x3E7EDCC0, 0x3E7DE300, 0x3E7CE940,
-	0x3E7BEF80, 0x3E7AF5C0, 0x3E79FC00,
-	0x3E790240, 0x3E780880, 0x3E770EC0,
-	0x3E761500, 0x3E751B40, 0x3E742180,
-	0x3E7327C0, 0x3E722E00, 0x3E713440,
-	0x3E703A80, 0x3E6F40C0, 0x3E6E4700,
-	0x3E6D4D40, 0x3E6C5380, 0x3E6B59C0,
-	0x3E6A6000, 0x3E696640, 0x3E686C80,
-	0x3E6772C0, 0x3E667900, 0x3E657F40,
-	0x3E648580, 0x3E638BC0, 0x3E629200,
-	0x3E619840, 0x3E609E80, 0x3E5FA4C0,
-	0x3E5EAB00, 0x3E5DB140, 0x3E5CB780,
-	0x3E5BBDC0, 0x3E5AC400, 0x3E59CA40,
-	0x3E58D080, 0x3E57D6C0, 0x3E56DD00,
-	0x3E55E340, 0x3E54E980, 0x3E53EFC0,
-	0x3E52F600, 0x3E51FC40, 0x3E510280,
-	0x3E5008C0, 0x3E4F0F00, 0x3E4E1540,
-	0x3E4D1B80, 0x3E4C21C0, 0x3E4B2800,
-	0x3E4A2E40, 0x3E493480, 0x3E483AC0,
-	0x3E474100, 0x3E464740, 0x3E454D80,
-	0x3E4453C0, 0x3E435A00, 0x3E426040,
-	0x3E416680, 0x3E406CC0, 0x3E3F7300,
-	0x3E3E7940, 0x3E3D7F80, 0x3E3C85C0,
-	0x3E3B8C00, 0x3E3A9240, 0x3E399880,
-	0x3E389EC0, 0x3E37A500, 0x3E36AB40,
-	0x3E35B180, 0x3E34B7C0, 0x3E33BE00,
-	0x3E32C440, 0x3E31CA80, 0x3E30D0C0,
-	0x3E2FD700, 0x3E2EDD40, 0x3E2DE380,
-	0x3E2CE9C0, 0x3E2BF000, 0x3E2AF640,
-	0x3E29FC80, 0x3E2902C0, 0x3E280900,
-	0x3E270F40, 0x3E261580, 0x3E251BC0,
-	0x3E242200, 0x3E232840, 0x3E222E80,
-	0x3E2134C0, 0x3E203B00, 0x3E1F4140,
-	0x3E1E4780, 0x3E1D4DC0, 0x3E1C5400,
-	0x3E1B5A40, 0x3E1A6080, 0x3E1966C0,
-	0x3E186D00, 0x3E177340, 0x3E167980,
-	0x3E157FC0, 0x3E148600, 0x3E138C40,
-	0x3E129280, 0x3E1198C0, 0x3E109F00,
-	0x3E0FA540, 0x3E0EAB80, 0x3E0DB1C0,
-	0x3E0CB800, 0x3E0BBE40, 0x3E0AC480,
-	0x3E09CAC0, 0x3E08D100, 0x3E07D740,
-	0x3E06DD80, 0x3E05E3C0, 0x3E04EA00,
-	0x3E03F040, 0x3E02F680, 0x3E01FCC0,
-	0x3E010300, 0x3E000940, 0x3DFF0F80,
-	0x3DFE15C0, 0x3DFD1C00, 0x3DFC2240,
-	0x3DFB2880, 0x3DFA2EC0, 0x3DF93500,
-	0x3DF83B40, 0x3DF74180, 0x3DF647C0,
-	0x3DF54E00, 0x3DF45440, 0x3DF35A80,
-	0x3DF260C0, 0x3DF16700, 0x3DF06D40,
-	0x3DEF7380, 0x3DEE79C0, 0x3DED8000,
-	0x3DEC8640, 0x3DEB8C80, 0x3DEA92C0,
-	0x3DE99900, 0x3DE89F40, 0x3DE7A580,
-	0x3DE6ABC0, 0x3DE5B200, 0x3DE4B840,
-	0x3DE3BE80, 0x3DE2C4C0, 0x3DE1CB00,
-	0x3DE0D140, 0x3DDFD780, 0x3DDEDDC0,
-	0x3DDDE400, 0x3DDCEA40, 0x3DDBF080,
-	0x3DDAF6C0, 0x3DD9FD00, 0x3DD90340,
-	0x3DD80980, 0x3DD70FC0, 0x3DD61600,
-	0x3DD51C40, 0x3DD42280, 0x3DD328C0,
-	0x3DD22F00, 0x3DD13540, 0x3DD03B80,
-	0x3DCF41C0, 0x3DCE4800, 0x3DCD4E40,
-	0x3DCC5480, 0x3DCB5AC0, 0x3DCA6100,
-	0x3DC96740, 0x3DC86D80, 0x3DC773C0,
-	0x3DC67A00, 0x3DC58040, 0x3DC48680,
-	0x3DC38CC0, 0x3DC29300, 0x3DC19940,
-	0x3DC09F80, 0x3DBFA5C0, 0x3DBEAC00,
-	0x3DBDB240, 0x3DBCB880, 0x3DBBBEC0,
-	0x3DBAC500, 0x3DB9CB40, 0x3DB8D180,
-	0x3DB7D7C0, 0x3DB6DE00, 0x3DB5E440,
-	0x3DB4EA80, 0x3DB3F0C0, 0x3DB2F700,
-	0x3DB1FD40, 0x3DB10380, 0x3DB009C0,
-	0x3DAF1000, 0x3DAE1640, 0x3DAD1C80,
-	0x3DAC22C0, 0x3DAB2900, 0x3DAA2F40,
-	0x3DA93580, 0x3DA83BC0, 0x3DA74200,
-	0x3DA64840, 0x3DA54E80, 0x3DA454C0,
-	0x3DA35B00, 0x3DA26140, 0x3DA16780,
-	0x3DA06DC0, 0x3D9F7400, 0x3D9E7A40,
-	0x3D9D8080, 0x3D9C86C0, 0x3D9B8D00,
-	0x3D9A9340, 0x3D999980, 0x3D989FC0,
-	0x3D97A600, 0x3D96AC40, 0x3D95B280,
-	0x3D94B8C0, 0x3D93BF00, 0x3D92C540,
-	0x3D91CB80, 0x3D90D1C0, 0x3D8FD800,
-	0x3D8EDE40, 0x3D8DE480, 0x3D8CEAC0,
-	0x3D8BF100, 0x3D8AF740, 0x3D89FD80,
-	0x3D8903C0, 0x3D880A00, 0x3D871040,
-	0x3D861680, 0x3D851CC0, 0x3D842300,
-	0x3D832940, 0x3D822F80, 0x3D8135C0,
-	0x3D803C00, 0x3D7F4240, 0x3D7E4880,
-	0x3D7D4EC0, 0x3D7C5500, 0x3D7B5B40,
-	0x3D7A6180, 0x3D7967C0, 0x3D786E00,
-	0x3D777440, 0x3D767A80, 0x3D7580C0,
-	0x3D748700, 0x3D738D40, 0x3D729380,
-	0x3D7199C0, 0x3D70A000, 0x3D6FA640,
-	0x3D6EAC80, 0x3D6DB2C0, 0x3D6CB900,
-	0x3D6BBF40, 0x3D6AC580, 0x3D69CBC0,
-	0x3D68D200, 0x3D67D840, 0x3D66DE80,
-	0x3D65E4C0, 0x3D64EB00, 0x3D63F140,
-	0x3D62F780, 0x3D61FDC0, 0x3D610400,
-	0x3D600A40, 0x3D5F1080, 0x3D5E16C0,
-	0x3D5D1D00, 0x3D5C2340, 0x3D5B2980,
-	0x3D5A2FC0, 0x3D593600, 0x3D583C40,
-	0x3D574280, 0x3D5648C0, 0x3D554F00,
-	0x3D545540, 0x3D535B80, 0x3D5261C0,
-	0x3D516800, 0x3D506E40, 0x3D4F7480,
-	0x3D4E7AC0, 0x3D4D8100, 0x3D4C8740,
-	0x3D4B8D80, 0x3D4A93C0, 0x3D499A00,
-	0x3D48A040, 0x3D47A680, 0x3D46ACC0,
-	0x3D45B300, 0x3D44B940, 0x3D43BF80,
-	0x3D42C5C0, 0x3D41CC00, 0x3D40D240,
-	0x3D3FD880, 0x3D3EDEC0, 0x3D3DE500,
-	0x3D3CEB40, 0x3D3BF180, 0x3D3AF7C0,
-	0x3D39FE00, 0x3D390440, 0x3D380A80,
-	0x3D3710C0, 0x3D361700, 0x3D351D40,
-	0x3D342380, 0x3D3329C0, 0x3D323000,
-	0x3D313640, 0x3D303C80, 0x3D2F42C0,
-	0x3D2E4900, 0x3D2D4F40, 0x3D2C5580,
-	0x3D2B5BC0, 0x3D2A6200, 0x3D296840,
-	0x3D286E80, 0x3D2774C0, 0x3D267B00,
-	0x3D258140, 0x3D248780, 0x3D238DC0,
-	0x3D229400, 0x3D219A40, 0x3D20A080,
-	0x3D1FA6C0, 0x3D1EAD00, 0x3D1DB340,
-	0x3D1CB980, 0x3D1BBFC0, 0x3D1AC600,
-	0x3D19CC40, 0x3D18D280, 0x3D17D8C0,
-	0x3D16DF00, 0x3D15E540, 0x3D14EB80,
-	0x3D13F1C0, 0x3D12F800, 0x3D11FE40,
-	0x3D110480, 0x3D100AC0, 0x3D0F1100,
-	0x3D0E1740, 0x3D0D1D80, 0x3D0C23C0,
-	0x3D0B2A00, 0x3D0A3040, 0x3D093680,
-	0x3D083CC0, 0x3D074300, 0x3D064940,
-	0x3D054F80, 0x3D0455C0, 0x3D035C00,
-	0x3D026240, 0x3D016880, 0x3D006EC0,
-	0x3CFF7500, 0x3CFE7B40, 0x3CFD8180,
-	0x3CFC87C0, 0x3CFB8E00, 0x3CFA9440,
-	0x3CF99A80, 0x3CF8A0C0, 0x3CF7A700,
-	0x3CF6AD40, 0x3CF5B380, 0x3CF4B9C0,
-	0x3CF3C000, 0x3CF2C640, 0x3CF1CC80,
-	0x3CF0D2C0, 0x3CEFD900, 0x3CEEDF40,
-	0x3CEDE580, 0x3CECEBC0, 0x3CEBF200,
-	0x3CEAF840, 0x3CE9FE80, 0x3CE904C0,
-	0x3CE80B00, 0x3CE71140, 0x3CE61780,
-	0x3CE51DC0, 0x3CE42400, 0x3CE32A40,
-	0x3CE23080, 0x3CE136C0, 0x3CE03D00,
-	0x3CDF4340, 0x3CDE4980, 0x3CDD4FC0,
-	0x3CDC5600, 0x3CDB5C40, 0x3CDA6280,
-	0x3CD968C0, 0x3CD86F00, 0x3CD77540,
-	0x3CD67B80, 0x3CD581C0, 0x3CD48800,
-	0x3CD38E40, 0x3CD29480, 0x3CD19AC0,
-	0x3CD0A100, 0x3CCFA740, 0x3CCEAD80,
-	0x3CCDB3C0, 0x3CCCBA00, 0x3CCBC040,
-	0x3CCAC680, 0x3CC9CCC0, 0x3CC8D300,
-	0x3CC7D940, 0x3CC6DF80, 0x3CC5E5C0,
-	0x3CC4EC00, 0x3CC3F240, 0x3CC2F880,
-	0x3CC1FEC0, 0x3CC10500, 0x3CC00B40,
-	0x3CBF1180, 0x3CBE17C0, 0x3CBD1E00,
-	0x3CBC2440, 0x3CBB2A80, 0x3CBA30C0,
-	0x3CB93700, 0x3CB83D40, 0x3CB74380,
-	0x3CB649C0, 0x3CB55000, 0x3CB45640,
-	0x3CB35C80, 0x3CB262C0, 0x3CB16900,
-	0x3CB06F40, 0x3CAF7580, 0x3CAE7BC0,
-	0x3CAD8200, 0x3CAC8840, 0x3CAB8E80,
-	0x3CAA94C0, 0x3CA99B00, 0x3CA8A140,
-	0x3CA7A780, 0x3CA6ADC0, 0x3CA5B400,
-	0x3CA4BA40, 0x3CA3C080, 0x3CA2C6C0,
-	0x3CA1CD00, 0x3CA0D340, 0x3C9FD980,
-	0x3C9EDFC0, 0x3C9DE600, 0x3C9CEC40,
-	0x3C9BF280, 0x3C9AF8C0, 0x3C99FF00,
-	0x3C990540, 0x3C980B80, 0x3C9711C0,
-	0x3C961800, 0x3C951E40, 0x3C942480,
-	0x3C932AC0, 0x3C923100, 0x3C913740,
-	0x3C903D80, 0x3C8F43C0, 0x3C8E4A00,
-	0x3C8D5040, 0x3C8C5680, 0x3C8B5CC0,
-	0x3C8A6300, 0x3C896940, 0x3C886F80,
-	0x3C8775C0, 0x3C867C00, 0x3C858240,
-	0x3C848880, 0x3C838EC0, 0x3C829500,
-	0x3C819B40, 0x3C80A180, 0x3C7FA7C0,
-	0x3C7EAE00, 0x3C7DB440, 0x3C7CBA80,
-	0x3C7BC0C0, 0x3C7AC700, 0x3C79CD40,
-	0x3C78D380, 0x3C77D9C0, 0x3C76E000,
-	0x3C75E640, 0x3C74EC80, 0x3C73F2C0,
-	0x3C72F900, 0x3C71FF40, 0x3C710580,
-	0x3C700BC0, 0x3C6F1200, 0x3C6E1840,
-	0x3C6D1E80, 0x3C6C24C0, 0x3C6B2B00,
-	0x3C6A3140, 0x3C693780, 0x3C683DC0,
-	0x3C674400, 0x3C664A40, 0x3C655080,
-	0x3C6456C0, 0x3C635D00, 0x3C626340,
-	0x3C616980, 0x3C606FC0, 0x3C5F7600,
-	0x3C5E7C40, 0x3C5D8280, 0x3C5C88C0,
-	0x3C5B8F00, 0x3C5A9540, 0x3C599B80,
-	0x3C58A1C0, 0x3C57A800, 0x3C56AE40,
-	0x3C55B480, 0x3C54BAC0, 0x3C53C100,
-	0x3C52C740, 0x3C51CD80, 0x3C50D3C0,
-	0x3C4FDA00, 0x3C4EE040, 0x3C4DE680,
-	0x3C4CECC0, 0x3C4BF300, 0x3C4AF940,
-	0x3C49FF80, 0x3C4905C0, 0x3C480C00,
-	0x3C471240, 0x3C461880, 0x3C451EC0,
-	0x3C442500, 0x3C432B40, 0x3C423180,
-	0x3C4137C0, 0x3C403E00, 0x3C3F4440,
-	0x3C3E4A80, 0x3C3D50C0, 0x3C3C5700,
-	0x3C3B5D40, 0x3C3A6380, 0x3C3969C0,
-	0x3C387000, 0x3C377640, 0x3C367C80,
-	0x3C3582C0, 0x3C348900, 0x3C338F40,
-	0x3C329580, 0x3C319BC0, 0x3C30A200,
-	0x3C2FA840, 0x3C2EAE80, 0x3C2DB4C0,
-	0x3C2CBB00, 0x3C2BC140, 0x3C2AC780,
-	0x3C29CDC0, 0x3C28D400, 0x3C27DA40,
-	0x3C26E080, 0x3C25E6C0, 0x3C24ED00,
-	0x3C23F340, 0x3C22F980, 0x3C21FFC0,
-	0x3C210600, 0x3C200C40, 0x3C1F1280,
-	0x3C1E18C0, 0x3C1D1F00, 0x3C1C2540,
-	0x3C1B2B80, 0x3C1A31C0, 0x3C193800,
-	0x3C183E40, 0x3C174480, 0x3C164AC0,
-	0x3C155100, 0x3C145740, 0x3C135D80,
-	0x3C1263C0, 0x3C116A00, 0x3C107040,
-	0x3C0F7680, 0x3C0E7CC0, 0x3C0D8300,
-	0x3C0C8940, 0x3C0B8F80, 0x3C0A95C0,
-	0x3C099C00, 0x3C08A240, 0x3C07A880,
-	0x3C06AEC0, 0x3C05B500, 0x3C04BB40,
-	0x3C03C180, 0x3C02C7C0, 0x3C01CE00,
-	0x3C00D440, 0x3BFFDA80, 0x3BFEE0C0,
-	0x3BFDE700, 0x3BFCED40, 0x3BFBF380,
-	0x3BFAF9C0, 0x3BFC0000, 0x3BFB1780,
-	0x3BFA2F00, 0x3BF94680, 0x3BF85E00,
-	0x3BF77580, 0x3BF68D00, 0x3BF5A480,
-	0x3BF4BC00, 0x3BF3D380, 0x3BF2EB00,
-	0x3BF20280, 0x3BF11A00, 0x3BF03180,
-	0x3BEF4900, 0x3BEE6080, 0x3BED7800,
-	0x3BEC8F80, 0x3BEBA700, 0x3BEABE80,
-	0x3BE9D600, 0x3BE8ED80, 0x3BE80500,
-	0x3BE71C80, 0x3BE63400, 0x3BE54B80,
-	0x3BE46300, 0x3BE37A80, 0x3BE29200,
-	0x3BE1A980, 0x3BE0C100, 0x3BDFD880,
-	0x3BDEF000, 0x3BDE0780, 0x3BDD1F00,
-	0x3BDC3680, 0x3BDB4E00, 0x3BDA6580,
-	0x3BD97D00, 0x3BD89480, 0x3BD7AC00,
-	0x3BD6C380, 0x3BD5DB00, 0x3BD4F280,
-	0x3BD40A00, 0x3BD32180, 0x3BD23900,
-	0x3BD15080, 0x3BD06800, 0x3BCF7F80,
-	0x3BCE9700, 0x3BCDAE80, 0x3BCCC600,
-	0x3BCBDD80, 0x3BCAF500, 0x3BCA0C80,
-	0x3BC92400, 0x3BC83B80, 0x3BC75300,
-	0x3BC66A80, 0x3BC58200, 0x3BC49980,
-	0x3BC3B100, 0x3BC2C880, 0x3BC1E000,
-	0x3BC0F780, 0x3BC00F00, 0x3BBF2680,
-	0x3BBE3E00, 0x3BBD5580, 0x3BBC6D00,
-	0x3BBB8480, 0x3BBA9C00, 0x3BB9B380,
-	0x3BB8CB00, 0x3BB7E280, 0x3BB6FA00,
-	0x3BB61180, 0x3BB52900, 0x3BB44080,
-	0x3BB35800, 0x3BB26F80, 0x3BB18700,
-	0x3BB09E80, 0x3BAFB600, 0x3BAECD80,
-	0x3BADE500, 0x3BACFC80, 0x3BAC1400,
-	0x3BAB2B80, 0x3BAA4300, 0x3BA95A80,
-	0x3BA87200, 0x3BA78980, 0x3BA6A100,
-	0x3BA5B880, 0x3BA4D000, 0x3BA3E780,
-	0x3BA2FF00, 0x3BA21680, 0x3BA12E00,
-	0x3BA04580, 0x3B9F5D00, 0x3B9E7480,
-	0x3B9D8C00, 0x3B9CA380, 0x3B9BBB00,
-	0x3B9AD280, 0x3B99EA00, 0x3B990180,
-	0x3B981900, 0x3B973080, 0x3B964800,
-	0x3B955F80, 0x3B947700, 0x3B938E80,
-	0x3B92A600, 0x3B91BD80, 0x3B90D500,
-	0x3B8FEC80, 0x3B8F0400, 0x3B8E1B80,
-	0x3B8D3300, 0x3B8C4A80, 0x3B8B6200,
-	0x3B8A7980, 0x3B899100, 0x3B88A880,
-	0x3B87C000, 0x3B86D780, 0x3B85EF00,
-	0x3B850680, 0x3B841E00, 0x3B833580,
-	0x3B824D00, 0x3B816480, 0x3B807C00,
-	0x3B7F9380, 0x3B7EAB00, 0x3B7DC280,
-	0x3B7CDA00, 0x3B7BF180, 0x3B7B0900,
-	0x3B7A2080, 0x3B793800, 0x3B784F80,
-	0x3B776700, 0x3B767E80, 0x3B759600,
-	0x3B74AD80, 0x3B73C500, 0x3B72DC80,
-	0x3B71F400, 0x3B710B80, 0x3B702300,
-	0x3B6F3A80, 0x3B6E5200, 0x3B6D6980,
-	0x3B6C8100, 0x3B6B9880, 0x3B6AB000,
-	0x3B69C780, 0x3B68DF00, 0x3B67F680,
-	0x3B670E00, 0x3B662580, 0x3B653D00,
-	0x3B645480, 0x3B636C00, 0x3B628380,
-	0x3B619B00, 0x3B60B280, 0x3B5FCA00,
-	0x3B5EE180, 0x3B5DF900, 0x3B5D1080,
-	0x3B5C2800, 0x3B5B3F80, 0x3B5A5700,
-	0x3B596E80, 0x3B588600, 0x3B579D80,
-	0x3B56B500, 0x3B55CC80, 0x3B54E400,
-	0x3B53FB80, 0x3B531300, 0x3B522A80,
-	0x3B514200, 0x3B505980, 0x3B4F7100,
-	0x3B4E8880, 0x3B4DA000, 0x3B4CB780,
-	0x3B4BCF00, 0x3B4AE680, 0x3B49FE00,
-	0x3B491580, 0x3B482D00, 0x3B474480,
-	0x3B465C00, 0x3B457380, 0x3B448B00,
-	0x3B43A280, 0x3B42BA00, 0x3B41D180,
-	0x3B40E900, 0x3B400080, 0x3B3F1800,
-	0x3B3E2F80, 0x3B3D4700, 0x3B3C5E80,
-	0x3B3B7600, 0x3B3A8D80, 0x3B39A500,
-	0x3B38BC80, 0x3B37D400, 0x3B36EB80,
-	0x3B360300, 0x3B351A80, 0x3B343200,
-	0x3B334980, 0x3B326100, 0x3B317880,
-	0x3B309000, 0x3B2FA780, 0x3B2EBF00,
-	0x3B2DD680, 0x3B2CEE00, 0x3B2C0580,
-	0x3B2B1D00, 0x3B2A3480, 0x3B294C00,
-	0x3B286380, 0x3B277B00, 0x3B269280,
-	0x3B25AA00, 0x3B24C180, 0x3B23D900,
-	0x3B22F080, 0x3B220800, 0x3B211F80,
-	0x3B203700, 0x3B1F4E80, 0x3B1E6600,
-	0x3B1D7D80, 0x3B1C9500, 0x3B1BAC80,
-	0x3B1AC400, 0x3B19DB80, 0x3B18F300,
-	0x3B180A80, 0x3B172200, 0x3B163980,
-	0x3B155100, 0x3B146880, 0x3B138000,
-	0x3B129780, 0x3B11AF00, 0x3B10C680,
-	0x3B0FDE00, 0x3B0EF580, 0x3B0E0D00,
-	0x3B0D2480, 0x3B0C3C00, 0x3B0B5380,
-	0x3B0A6B00, 0x3B098280, 0x3B089A00,
-	0x3B07B180, 0x3B06C900, 0x3B05E080,
-	0x3B04F800, 0x3B040F80, 0x3B032700,
-	0x3B023E80, 0x3B015600, 0x3B006D80,
-	0x3AFF8500, 0x3AFE9C80, 0x3AFDB400,
-	0x3AFCCB80, 0x3AFBE300, 0x3AFAFA80,
-	0x3AFA1200, 0x3AF92980, 0x3AF84100,
-	0x3AF75880, 0x3AF67000, 0x3AF58780,
-	0x3AF49F00, 0x3AF3B680, 0x3AF2CE00,
-	0x3AF1E580, 0x3AF0FD00, 0x3AF01480,
-	0x3AEF2C00, 0x3AEE4380, 0x3AED5B00,
-	0x3AEC7280, 0x3AEB8A00, 0x3AEAA180,
-	0x3AE9B900, 0x3AE8D080, 0x3AE7E800,
-	0x3AE6FF80, 0x3AE61700, 0x3AE52E80,
-	0x3AE44600, 0x3AE35D80, 0x3AE27500,
-	0x3AE18C80, 0x3AE0A400, 0x3ADFBB80,
-	0x3ADED300, 0x3ADDEA80, 0x3ADD0200,
-	0x3ADC1980, 0x3ADB3100, 0x3ADA4880,
-	0x3AD96000, 0x3AD87780, 0x3AD78F00,
-	0x3AD6A680, 0x3AD5BE00, 0x3AD4D580,
-	0x3AD3ED00, 0x3AD30480, 0x3AD21C00,
-	0x3AD13380, 0x3AD04B00, 0x3ACF6280,
-	0x3ACE7A00, 0x3ACD9180, 0x3ACCA900,
-	0x3ACBC080, 0x3ACAD800, 0x3AC9EF80,
-	0x3AC90700, 0x3AC81E80, 0x3AC73600,
-	0x3AC64D80, 0x3AC56500, 0x3AC47C80,
-	0x3AC39400, 0x3AC2AB80, 0x3AC1C300,
-	0x3AC0DA80, 0x3ABFF200, 0x3ABF0980,
-	0x3ABE2100, 0x3ABD3880, 0x3ABC5000,
-	0x3ABB6780, 0x3ABA7F00, 0x3AB99680,
-	0x3AB8AE00, 0x3AB7C580, 0x3AB6DD00,
-	0x3AB5F480, 0x3AB50C00, 0x3AB42380,
-	0x3AB33B00, 0x3AB25280, 0x3AB16A00,
-	0x3AB08180, 0x3AAF9900, 0x3AAEB080,
-	0x3AADC800, 0x3AACDF80, 0x3AABF700,
-	0x3AAB0E80, 0x3AAA2600, 0x3AA93D80,
-	0x3AA85500, 0x3AA76C80, 0x3AA68400,
-	0x3AA59B80, 0x3AA4B300, 0x3AA3CA80,
-	0x3AA2E200, 0x3AA1F980, 0x3AA11100,
-	0x3AA02880, 0x3A9F4000, 0x3A9E5780,
-	0x3A9D6F00, 0x3A9C8680, 0x3A9B9E00,
-	0x3A9AB580, 0x3A99CD00, 0x3A98E480,
-	0x3A97FC00, 0x3A971380, 0x3A962B00,
-	0x3A954280, 0x3A945A00, 0x3A937180,
-	0x3A928900, 0x3A91A080, 0x3A90B800,
-	0x3A8FCF80, 0x3A8EE700, 0x3A8DFE80,
-	0x3A8D1600, 0x3A8C2D80, 0x3A8B4500,
-	0x3A8A5C80, 0x3A897400, 0x3A888B80,
-	0x3A87A300, 0x3A86BA80, 0x3A85D200,
-	0x3A84E980, 0x3A840100, 0x3A831880,
-	0x3A823000, 0x3A814780, 0x3A805F00,
-	0x3A7F7680, 0x3A7E8E00, 0x3A7DA580,
-	0x3A7CBD00, 0x3A7BD480, 0x3A7AEC00,
-	0x3A7A0380, 0x3A791B00, 0x3A783280,
-	0x3A774A00, 0x3A766180, 0x3A757900,
-	0x3A749080, 0x3A73A800, 0x3A72BF80,
-	0x3A71D700, 0x3A70EE80, 0x3A700600,
-	0x3A6F1D80, 0x3A6E3500, 0x3A6D4C80,
-	0x3A6C6400, 0x3A6B7B80, 0x3A6A9300,
-	0x3A69AA80, 0x3A68C200, 0x3A67D980,
-	0x3A66F100, 0x3A660880, 0x3A652000,
-	0x3A643780, 0x3A634F00, 0x3A626680,
-	0x3A617E00, 0x3A609580, 0x3A5FAD00,
-	0x3A5EC480, 0x3A5DDC00, 0x3A5CF380,
-	0x3A5C0B00, 0x3A5B2280, 0x3A5A3A00,
-	0x3A595180, 0x3A586900, 0x3A578080,
-	0x3A569800, 0x3A55AF80, 0x3A54C700,
-	0x3A53DE80, 0x3A52F600, 0x3A520D80,
-	0x3A512500, 0x3A503C80, 0x3A4F5400,
-	0x3A4E6B80, 0x3A4D8300, 0x3A4C9A80,
-	0x3A4BB200, 0x3A4AC980, 0x3A49E100,
-	0x3A48F880, 0x3A481000, 0x3A472780,
-	0x3A463F00, 0x3A455680, 0x3A446E00,
-	0x3A438580, 0x3A429D00, 0x3A41B480,
-	0x3A40CC00, 0x3A3FE380, 0x3A3EFB00,
-	0x3A3E1280, 0x3A3D2A00, 0x3A3C4180,
-	0x3A3B5900, 0x3A3A7080, 0x3A398800,
-	0x3A389F80, 0x3A37B700, 0x3A36CE80,
-	0x3A35E600, 0x3A34FD80, 0x3A341500,
-	0x3A332C80, 0x3A324400, 0x3A315B80,
-	0x3A307300, 0x3A2F8A80, 0x3A2EA200,
-	0x3A2DB980, 0x3A2CD100, 0x3A2BE880,
-	0x3A2B0000, 0x3A2A1780, 0x3A292F00,
-	0x3A284680, 0x3A275E00, 0x3A267580,
-	0x3A258D00, 0x3A24A480, 0x3A23BC00,
-	0x3A22D380, 0x3A21EB00, 0x3A210280,
-	0x3A201A00, 0x3A1F3180, 0x3A1E4900,
-	0x3A1D6080, 0x3A1C7800, 0x3A1B8F80,
-	0x3A1AA700, 0x3A19BE80, 0x3A18D600,
-	0x3A17ED80, 0x3A170500, 0x3A161C80,
-	0x3A153400, 0x3A144B80, 0x3A136300,
-	0x3A127A80, 0x3A119200, 0x3A10A980,
-	0x3A0FC100, 0x3A0ED880, 0x3A0DF000,
-	0x3A0D0780, 0x3A0C1F00, 0x3A0B3680,
-	0x3A0A4E00, 0x3A096580, 0x3A087D00,
-	0x3A079480, 0x3A06AC00, 0x3A05C380,
-	0x3A04DB00, 0x3A03F280, 0x3A030A00,
-	0x3A022180, 0x3A013900, 0x3A005080,
-	0x39FF6800, 0x39FE7F80, 0x39FD9700,
-	0x39FCAE80, 0x39FBC600, 0x39FADD80,
-	0x39F9F500, 0x39F90C80, 0x39F82400,
-	0x39F73B80, 0x39F65300, 0x39F56A80,
-	0x39F48200, 0x39F39980, 0x39F2B100,
-	0x39F1C880, 0x39F0E000, 0x39EFF780,
-	0x39EF0F00, 0x39EE2680, 0x39ED3E00,
-	0x39EC5580, 0x39EB6D00, 0x39EA8480,
-	0x39E99C00, 0x39E8B380, 0x39E7CB00,
-	0x39E6E280, 0x39E5FA00, 0x39E51180,
-	0x39E42900, 0x39E34080, 0x39E25800,
-	0x39E16F80, 0x39E08700, 0x39DF9E80,
-	0x39DEB600, 0x39DDCD80, 0x39DCE500,
-	0x39DBFC80, 0x39DB1400, 0x39DA2B80,
-	0x39D94300, 0x39D85A80, 0x39D77200,
-	0x39D68980, 0x39D5A100, 0x39D4B880,
-	0x39D3D000, 0x39D2E780, 0x39D1FF00,
-	0x39D11680, 0x39D02E00, 0x39CF4580,
-	0x39CE5D00, 0x39CD7480, 0x39CC8C00,
-	0x39CBA380, 0x39CABB00, 0x39C9D280,
-	0x39C8EA00, 0x39C80180, 0x39C71900,
-	0x39C63080, 0x39C54800, 0x39C45F80,
-	0x39C37700, 0x39C28E80, 0x39C1A600,
-	0x39C0BD80, 0x39BFD500, 0x39BEEC80,
-	0x39BE0400, 0x39BD1B80, 0x39BC3300,
-	0x39BB4A80, 0x39BA6200, 0x39B97980,
-	0x39B89100, 0x39B7A880, 0x39B6C000,
-	0x39B5D780, 0x39B4EF00, 0x39B40680,
-	0x39B31E00, 0x39B23580, 0x39B14D00,
-	0x39B06480, 0x39AF7C00, 0x39AE9380,
-	0x39ADAB00, 0x39ACC280, 0x39ABDA00,
-	0x39AAF180, 0x39AA0900, 0x39A92080,
-	0x39A83800, 0x39A74F80, 0x39A66700,
-	0x39A57E80, 0x39A49600, 0x39A3AD80,
-	0x39A2C500, 0x39A1DC80, 0x39A0F400,
-	0x39A00B80, 0x399F2300, 0x399E3A80,
-	0x399D5200, 0x399C6980, 0x399B8100,
-	0x399A9880, 0x3999B000, 0x3998C780,
-	0x3997DF00, 0x3996F680, 0x39960E00,
-	0x39952580, 0x39943D00, 0x39935480,
-	0x39926C00, 0x39918380, 0x39909B00,
-	0x398FB280, 0x398ECA00, 0x398DE180,
-	0x398CF900, 0x398C1080, 0x398B2800,
-	0x398A3F80, 0x39895700, 0x39886E80,
-	0x39878600, 0x39869D80, 0x3985B500,
-	0x3984CC80, 0x3983E400, 0x3982FB80,
-	0x39821300, 0x39812A80, 0x39804200,
-	0x397F5980, 0x397E7100, 0x397D8880,
-	0x397CA000, 0x397BB780, 0x397ACF00,
-	0x3979E680, 0x3978FE00, 0x39781580,
-	0x39772D00, 0x39764480, 0x39755C00,
-	0x39747380, 0x39738B00, 0x3972A280,
-	0x3971BA00, 0x3970D180, 0x396FE900,
-	0x396F0080, 0x396E1800, 0x396D2F80,
-	0x396C4700, 0x396B5E80, 0x396A7600,
-	0x39698D80, 0x3968A500, 0x3967BC80,
-	0x3966D400, 0x3965EB80, 0x39650300,
-	0x39641A80, 0x39633200, 0x39624980,
-	0x39616100, 0x39607880, 0x395F9000,
-	0x395EA780, 0x395DBF00, 0x395CD680,
-	0x395BEE00, 0x395B0580, 0x395A1D00,
-	0x39593480, 0x39584C00, 0x39576380,
-	0x39567B00, 0x39559280, 0x3954AA00,
-	0x3953C180, 0x3952D900, 0x3951F080,
-	0x39510800, 0x39501F80, 0x394F3700,
-	0x394E4E80, 0x394D6600, 0x394C7D80,
-	0x394B9500, 0x394AAC80, 0x3949C400,
-	0x3948DB80, 0x3947F300, 0x39470A80,
-	0x39462200, 0x39453980, 0x39445100,
-	0x39436880, 0x39428000, 0x39419780,
-	0x3940AF00, 0x393FC680, 0x393EDE00,
-	0x393DF580, 0x393D0D00, 0x393C2480,
-	0x393B3C00, 0x393A5380, 0x39396B00,
-	0x39388280, 0x39379A00, 0x3936B180,
-	0x3935C900, 0x3934E080, 0x3933F800,
-	0x39330F80, 0x39322700, 0x39313E80,
-	0x39305600, 0x392F6D80, 0x392E8500,
-	0x392D9C80, 0x392CB400, 0x392BCB80,
-	0x392AE300, 0x3929FA80, 0x39291200,
-	0x39282980, 0x39274100, 0x39265880,
-	0x39257000, 0x39248780, 0x39239F00,
-	0x3922B680, 0x3921CE00, 0x3920E580,
-	0x391FFD00, 0x391F1480, 0x391E2C00,
-	0x391D4380, 0x391C5B00, 0x391B7280,
-	0x391A8A00, 0x3919A180, 0x3918B900,
-	0x3917D080, 0x3916E800, 0x3915FF80,
-	0x39151700, 0x39142E80, 0x39134600,
-	0x39125D80, 0x39117500, 0x39108C80,
-	0x390FA400, 0x390EBB80, 0x390DD300,
-	0x390CEA80, 0x390C0200, 0x390B1980,
-	0x390A3100, 0x39094880, 0x39086000,
-	0x39077780, 0x39068F00, 0x3905A680,
-	0x3904BE00, 0x3903D580, 0x3902ED00,
-	0x39020480, 0x39011C00, 0x39003380,
-	0x38FF4B00, 0x38FE6280, 0x38FD7A00,
-	0x38FC9180, 0x38FBA900, 0x38FAC080,
-	0x38F9D800, 0x38F8EF80, 0x38F80700,
-	0x38F71E80, 0x38F63600, 0x38F54D80,
-	0x38F46500, 0x38F37C80, 0x38F29400,
-	0x38F1AB80, 0x38F0C300, 0x38EFDA80,
-	0x38EEF200, 0x38EE0980, 0x38ED2100,
-	0x38EC3880, 0x38EB5000, 0x38EA6780,
-	0x38E97F00, 0x38E89680, 0x38E7AE00,
-	0x38E6C580, 0x38E5DD00, 0x38E4F480,
-	0x38E40C00, 0x38E32380, 0x38E23B00,
-	0x38E15280, 0x38E06A00, 0x38DF8180,
-	0x38DE9900, 0x38DDB080, 0x38DCC800,
-	0x38DBDF80, 0x38DAF700, 0x38DA0E80,
-	0x38D92600, 0x38D83D80, 0x38D75500,
-	0x38D66C80, 0x38D58400, 0x38D49B80,
-	0x38D3B300, 0x38D2CA80, 0x38D1E200,
-	0x38D0F980, 0x38D01100, 0x38CF2880,
-	0x38CE4000, 0x38CD5780, 0x38CC6F00,
-	0x38CB8680, 0x38CA9E00, 0x38C9B580,
-	0x38C8CD00, 0x38C7E480, 0x38C6FC00,
-	0x38C61380, 0x38C52B00, 0x38C44280,
-	0x38C35A00, 0x38C27180, 0x38C18900,
-	0x38C0A080, 0x38BFB800, 0x38BECF80,
-	0x38BDE700, 0x38BCFE80, 0x38BC1600,
-	0x38BB2D80, 0x38BA4500, 0x38B95C80,
-	0x38B87400, 0x38B78B80, 0x38B6A300,
-	0x38B5BA80, 0x38B4D200, 0x38B3E980,
-	0x38B30100, 0x38B21880, 0x38B13000,
-	0x38B04780, 0x38AF5F00, 0x38AE7680,
-	0x38AD8E00, 0x38ACA580, 0x38ABBD00,
-	0x38AAD480, 0x38A9EC00, 0x38A90380,
-	0x38A81B00, 0x38A73280, 0x38A64A00,
-	0x38A56180, 0x38A47900, 0x38A39080,
-	0x38A2A800, 0x38A1BF80, 0x38A0D700,
-	0x389FEE80, 0x389F0600, 0x389E1D80,
-	0x389D3500, 0x389C4C80, 0x389B6400,
-	0x389A7B80, 0x38999300, 0x3898AA80,
-	0x3897C200, 0x3896D980, 0x3895F100,
-	0x38950880, 0x38942000, 0x38933780,
-	0x38924F00, 0x38916680, 0x38907E00,
-	0x388F9580, 0x388EAD00, 0x388DC480,
-	0x388CDC00, 0x388BF380, 0x388B0B00,
-	0x388A2280, 0x38893A00, 0x38885180,
-	0x38876900, 0x38868080, 0x38859800,
-	0x3884AF80, 0x3883C700, 0x3882DE80,
-	0x3881F600, 0x38810D80, 0x38802500,
-	0x387F3C80, 0x387E5400, 0x387D6B80,
-	0x387C8300, 0x387B9A80, 0x387AB200,
-	0x3879C980, 0x3878E100, 0x3877F880,
-	0x38771000, 0x38762780, 0x38753F00,
-	0x38745680, 0x38736E00, 0x38728580,
-	0x38719D00, 0x3870B480, 0x386FCC00,
-	0x386EE380, 0x386DFB00, 0x386D1280,
-	0x386C2A00, 0x386B4180, 0x386A5900,
-	0x38697080, 0x38688800, 0x38679F80,
-	0x3866B700, 0x3865CE80, 0x3864E600,
-	0x3863FD80, 0x38631500, 0x38622C80,
-	0x38614400, 0x38605B80, 0x385F7300,
-	0x385E8A80, 0x385DA200, 0x385CB980,
-	0x385BD100, 0x385AE880, 0x385A0000,
-	0x38591780, 0x38582F00, 0x38574680,
-	0x38565E00, 0x38557580, 0x38548D00,
-	0x3853A480, 0x3852BC00, 0x3851D380,
-	0x3850EB00, 0x38500280, 0x384F1A00,
-	0x384E3180, 0x384D4900, 0x384C6080,
-	0x384B7800, 0x384A8F80, 0x3849A700,
-	0x3848BE80, 0x3847D600, 0x3846ED80,
-	0x38460500, 0x38451C80, 0x38443400,
-	0x38434B80, 0x38426300, 0x38417A80,
-	0x38409200, 0x383FA980, 0x383EC100,
-	0x383DD880, 0x383CF000, 0x383C0780,
-	0x383B1F00, 0x383A3680, 0x38394E00,
-	0x38386580, 0x38377D00, 0x38369480,
-	0x3835AC00, 0x3834C380, 0x3833DB00,
-	0x3832F280, 0x38320A00, 0x38312180,
-	0x38303900, 0x382F5080, 0x382E6800,
-	0x382D7F80, 0x382C9700, 0x382BAE80,
-	0x382AC600, 0x3829DD80, 0x3828F500,
-	0x38280C80, 0x38272400, 0x38263B80,
-	0x38255300, 0x38246A80, 0x38238200,
-	0x38229980, 0x3821B100, 0x3820C880,
-	0x381FE000, 0x381EF780, 0x381E0F00,
-	0x381D2680, 0x381C3E00, 0x381B5580,
-	0x381A6D00, 0x38198480, 0x38189C00,
-	0x3817B380, 0x3816CB00, 0x3815E280,
-	0x3814FA00, 0x38141180, 0x38132900,
-	0x38124080, 0x38115800, 0x38106F80,
-	0x380F8700, 0x380E9E80, 0x380DB600,
-	0x380CCD80, 0x380BE500, 0x380AFC80,
-	0x380A1400, 0x38092B80, 0x38084300,
-	0x38075A80, 0x38067200, 0x38058980,
-	0x3804A100, 0x3803B880, 0x3802D000,
-	0x3801E780, 0x3800FF00, 0x38001680,
-	0x37FF2E00, 0x37FE4580, 0x37FD5D00,
-	0x37FC7480, 0x37FB8C00, 0x37FAA380,
-	0x37F9BB00, 0x37F8D280, 0x37F7EA00,
-	0x37F70180, 0x37F61900, 0x37F53080,
-	0x37F44800, 0x37F35F80, 0x37F27700,
-	0x37F18E80, 0x37F0A600, 0x37EFBD80,
-	0x37EED500, 0x37EDEC80, 0x37ED0400,
-	0x37EC1B80, 0x37EB3300, 0x37EA4A80,
-	0x37E96200, 0x37E87980, 0x37E79100,
-	0x37E6A880, 0x37E5C000, 0x37E4D780,
-	0x37E3EF00, 0x37E30680, 0x37E21E00,
-	0x37E13580, 0x37E04D00, 0x37DF6480,
-	0x37DE7C00, 0x37DD9380, 0x37DCAB00,
-	0x37DBC280, 0x37DADA00, 0x37D9F180,
-	0x37D90900, 0x37D82080, 0x37D73800,
-	0x37D64F80, 0x37D56700, 0x37D47E80,
-	0x37D39600, 0x37D2AD80, 0x37D1C500,
-	0x37D0DC80, 0x37CFF400, 0x37CF0B80,
-	0x37CE2300, 0x37CD3A80, 0x37CC5200,
-	0x37CB6980, 0x37CA8100, 0x37C99880,
-	0x37C8B000, 0x37C7C780, 0x37C6DF00,
-	0x37C5F680, 0x37C50E00, 0x37C42580,
-	0x37C33D00, 0x37C25480, 0x37C16C00,
-	0x37C08380, 0x37BF9B00, 0x37BEB280,
-	0x37BDCA00, 0x37BCE180, 0x37BBF900,
-	0x37BB1080, 0x37BA2800, 0x37B93F80,
-	0x37B85700, 0x37B76E80, 0x37B68600,
-	0x37B59D80, 0x37B4B500, 0x37B3CC80,
-	0x37B2E400, 0x37B1FB80, 0x37B11300,
-	0x37B02A80, 0x37AF4200, 0x37AE5980,
-	0x37AD7100, 0x37AC8880, 0x37ABA000,
-	0x37AAB780, 0x37A9CF00, 0x37A8E680,
-	0x37A7FE00, 0x37A71580, 0x37A62D00,
-	0x37A54480, 0x37A45C00, 0x37A37380,
-	0x37A28B00, 0x37A1A280, 0x37A0BA00,
-	0x379FD180, 0x379EE900, 0x379E0080,
-	0x379D1800, 0x379C2F80, 0x379B4700,
-	0x379A5E80, 0x37997600, 0x37988D80,
-	0x3797A500, 0x3796BC80, 0x3795D400,
-	0x3794EB80, 0x37940300, 0x37931A80,
-	0x37923200, 0x37914980, 0x37906100,
-	0x378F7880, 0x378E9000, 0x378DA780,
-	0x378CBF00, 0x378BD680, 0x378AEE00,
-	0x378A0580, 0x37891D00, 0x37883480,
-	0x37874C00, 0x37866380, 0x37857B00,
-	0x37849280, 0x3783AA00, 0x3782C180,
-	0x3781D900, 0x3780F080, 0x37800800,
-	0x377F1F80, 0x377E3700, 0x377D4E80,
-	0x377C6600, 0x377B7D80, 0x377A9500,
-	0x3779AC80, 0x3778C400, 0x3777DB80,
-	0x3776F300, 0x37760A80, 0x37752200,
-	0x37743980, 0x37735100, 0x37726880,
-	0x37718000, 0x37709780, 0x376FAF00,
-	0x376EC680, 0x376DDE00, 0x376CF580,
-	0x376C0D00, 0x376B2480, 0x376A3C00,
-	0x37695380, 0x37686B00, 0x37678280,
-	0x37669A00, 0x3765B180, 0x3764C900,
-	0x3763E080, 0x3762F800, 0x37620F80,
-	0x37612700, 0x37603E80, 0x375F5600,
-	0x375E6D80, 0x375D8500, 0x375C9C80,
-	0x375BB400, 0x375ACB80, 0x3759E300,
-	0x3758FA80, 0x37581200, 0x37572980,
-	0x37564100, 0x37555880, 0x37547000,
-	0x37538780, 0x37529F00, 0x3751B680,
-	0x3750CE00, 0x374FE580, 0x374EFD00,
-	0x374E1480, 0x374D2C00, 0x374C4380,
-	0x374B5B00, 0x374A7280, 0x37498A00,
-	0x3748A180, 0x3747B900, 0x3746D080,
-	0x3745E800, 0x3744FF80, 0x37441700,
-	0x37432E80, 0x37424600, 0x37415D80,
-	0x37407500, 0x373F8C80, 0x373EA400,
-	0x373DBB80, 0x373CD300, 0x373BEA80,
-	0x373B0200, 0x373A1980, 0x37393100,
-	0x37384880, 0x37376000, 0x37367780,
-	0x37358F00, 0x3734A680, 0x3733BE00,
-	0x3732D580, 0x3731ED00, 0x37310480,
-	0x37301C00, 0x372F3380, 0x372E4B00,
-	0x372D6280, 0x372C7A00, 0x372B9180,
-	0x372AA900, 0x3729C080, 0x3728D800,
-	0x3727EF80, 0x37270700, 0x37261E80,
-	0x37253600, 0x37244D80, 0x37236500,
-	0x37227C80, 0x37219400, 0x3720AB80,
-	0x371FC300, 0x371EDA80, 0x371DF200,
-	0x371D0980, 0x371C2100, 0x371B3880,
-	0x371A5000, 0x37196780, 0x37187F00,
-	0x37179680, 0x3716AE00, 0x3715C580,
-	0x3714DD00, 0x3713F480, 0x37130C00,
-	0x37122380, 0x37113B00, 0x37105280,
-	0x370F6A00, 0x370E8180, 0x370D9900,
-	0x370CB080, 0x370BC800, 0x370ADF80,
-	0x3709F700, 0x37090E80, 0x37082600,
-	0x37073D80, 0x37065500, 0x37056C80,
-	0x37048400, 0x37039B80, 0x3702B300,
-	0x3701CA80, 0x3700E200, 0x36FFF980,
-	0x36FF1100, 0x36FE2880, 0x36FD4000,
-	0x36FC5780, 0x36FB6F00, 0x36FA8680,
-	0x36F99E00, 0x36F8B580, 0x36F7CD00,
-	0x36F6E480, 0x36F5FC00, 0x36F51380,
-	0x36F42B00, 0x36F34280, 0x36F25A00,
-	0x36F17180, 0x36F08900, 0x36EFA080,
-	0x36EEB800, 0x36EDCF80, 0x36ECE700,
-	0x36EBFE80, 0x36EB1600, 0x36EA2D80,
-	0x36E94500, 0x36E85C80, 0x36E77400,
-	0x36E68B80, 0x36E5A300, 0x36E4BA80,
-	0x36E3D200, 0x36E2E980, 0x36E20100,
-	0x36E11880, 0x36E03000, 0x36DF4780,
-	0x36DE5F00, 0x36DD7680, 0x36DC8E00,
-	0x36DBA580, 0x36DABD00, 0x36D9D480,
-	0x36D8EC00, 0x36D80380, 0x36D71B00,
-	0x36D63280, 0x36D54A00, 0x36D46180,
-	0x36D37900, 0x36D29080, 0x36D1A800,
-	0x36D0BF80, 0x36CFD700, 0x36CEEE80,
-	0x36CE0600, 0x36CD1D80, 0x36CC3500,
-	0x36CB4C80, 0x36CA6400, 0x36C97B80,
-	0x36C89300, 0x36C7AA80, 0x36C6C200,
-	0x36C5D980, 0x36C4F100, 0x36C40880,
-	0x36C32000, 0x36C23780, 0x36C14F00,
-	0x36C06680, 0x36BF7E00, 0x36BE9580,
-	0x36BDAD00, 0x36BCC480, 0x36BBDC00,
-	0x36BAF380, 0x36BA0B00, 0x36B92280,
-	0x36B83A00, 0x36B75180, 0x36B66900,
-	0x36B58080, 0x36B49800, 0x36B3AF80,
-	0x36B2C700, 0x36B1DE80, 0x36B0F600,
-	0x36B00D80, 0x36AF2500, 0x36AE3C80,
-	0x36AD5400, 0x36AC6B80, 0x36AB8300,
-	0x36AA9A80, 0x36A9B200, 0x36A8C980,
-	0x36A7E100, 0x36A6F880, 0x36A61000,
-	0x36A52780, 0x36A43F00, 0x36A35680,
-	0x36A26E00, 0x36A18580, 0x36A09D00,
-	0x369FB480, 0x369ECC00, 0x369DE380,
-	0x369CFB00, 0x369C1280, 0x369B2A00,
-	0x369A4180, 0x36995900, 0x36987080,
-	0x36978800, 0x36969F80, 0x3695B700,
-	0x3694CE80, 0x3693E600, 0x3692FD80,
-	0x36921500, 0x36912C80, 0x36904400,
-	0x368F5B80, 0x368E7300, 0x368D8A80,
-	0x368CA200, 0x368BB980, 0x368AD100,
-	0x3689E880, 0x36890000, 0x36881780,
-	0x36872F00, 0x36864680, 0x36855E00,
-	0x36847580, 0x36838D00, 0x3682A480,
-	0x3681BC00, 0x3680D380, 0x367FEB00,
-	0x367F0280, 0x367E1A00, 0x367D3180,
-	0x367C4900, 0x367B6080, 0x367A7800,
-	0x36798F80, 0x3678A700, 0x3677BE80,
-	0x3676D600, 0x3675ED80, 0x36750500,
-	0x36741C80, 0x36733400, 0x36724B80,
-	0x36716300, 0x36707A80, 0x366F9200,
-	0x366EA980, 0x366DC100, 0x366CD880,
-	0x366BF000, 0x366B0780, 0x366A1F00,
-	0x36693680, 0x36684E00, 0x36676580,
-	0x36667D00, 0x36659480, 0x3664AC00,
-	0x3663C380, 0x3662DB00, 0x3661F280,
-	0x36610A00, 0x36602180, 0x365F3900,
-	0x365E5080, 0x365D6800, 0x365C7F80,
-	0x365B9700, 0x365AAE80, 0x3659C600,
-	0x3658DD80, 0x3657F500, 0x36570C80,
-	0x36562400, 0x36553B80, 0x36545300,
-	0x36536A80, 0x36528200, 0x36519980,
-	0x3650B100, 0x364FC880, 0x364EE000,
-	0x364DF780, 0x364D0F00, 0x364C2680,
-	0x364B3E00, 0x364A5580, 0x36496D00,
-	0x36488480, 0x36479C00, 0x3646B380,
-	0x3645CB00, 0x3644E280, 0x3643FA00,
-	0x36431180, 0x36422900, 0x36414080,
-	0x36405800, 0x363F6F80, 0x363E8700,
-	0x363D9E80, 0x363CB600, 0x363BCD80,
-	0x363AE500, 0x3639FC80, 0x36391400,
-	0x36382B80, 0x36374300, 0x36365A80,
-	0x36357200, 0x36348980, 0x3633A100,
-	0x3632B880, 0x3631D000, 0x3630E780,
-	0x362FFF00, 0x362F1680, 0x362E2E00,
-	0x362D4580, 0x362C5D00, 0x362B7480,
-	0x362A8C00, 0x3629A380, 0x3628BB00,
-	0x3627D280, 0x3626EA00, 0x36260180,
-	0x36251900, 0x36243080, 0x36234800,
-	0x36225F80, 0x36217700, 0x36208E80,
-	0x361FA600, 0x361EBD80, 0x361DD500,
-	0x361CEC80, 0x361C0400, 0x361B1B80,
-	0x361A3300, 0x36194A80, 0x36186200,
-	0x36177980, 0x36169100, 0x3615A880,
-	0x3614C000, 0x3613D780, 0x3612EF00,
-	0x36120680, 0x36111E00, 0x36103580,
-	0x360F4D00, 0x360E6480, 0x360D7C00,
-	0x360C9380, 0x360BAB00, 0x360AC280,
-	0x3609DA00, 0x3608F180, 0x36080900,
-	0x36072080, 0x36063800, 0x36054F80,
-	0x36046700, 0x36037E80, 0x36029600,
-	0x3601AD80, 0x3600C500, 0x35FFDC80,
-	0x35FEF400, 0x35FE0B80, 0x35FD2300,
-	0x35FC3A80, 0x35FB5200, 0x35FA6980,
-	0x35F98100, 0x35F89880, 0x35F7B000,
-	0x35F6C780, 0x35F5DF00, 0x35F4F680,
-	0x35F40E00, 0x35F32580, 0x35F23D00,
-	0x35F15480, 0x35F06C00, 0x35EF8380,
-	0x35EE9B00, 0x35EDB280, 0x35ECCA00,
-	0x35EBE180, 0x35EAF900, 0x35EA1080,
-	0x35E92800, 0x35E83F80, 0x35E75700,
-	0x35E66E80, 0x35E58600, 0x35E49D80,
-	0x35E3B500, 0x35E2CC80, 0x35E1E400,
-	0x35E0FB80, 0x35E01300, 0x35DF2A80,
-	0x35DE4200, 0x35DD5980, 0x35DC7100,
-	0x35DB8880, 0x35DAA000, 0x35D9B780,
-	0x35D8CF00, 0x35D7E680, 0x35D6FE00,
-	0x35D61580, 0x35D52D00, 0x35D44480,
-	0x35D35C00, 0x35D27380, 0x35D18B00,
-	0x35D0A280, 0x35CFBA00, 0x35CED180,
-	0x35CDE900, 0x35CD0080, 0x35CC1800,
-	0x35CB2F80, 0x35CA4700, 0x35C95E80,
-	0x35C87600, 0x35C78D80, 0x35C6A500,
-	0x35C5BC80, 0x35C4D400, 0x35C3EB80,
-	0x35C30300, 0x35C21A80, 0x35C13200,
-	0x35C04980, 0x35BF6100, 0x35BE7880,
-	0x35BD9000, 0x35BCA780, 0x35BBBF00,
-	0x35BAD680, 0x35B9EE00, 0x35B90580,
-	0x35B81D00, 0x35B73480, 0x35B64C00,
-	0x35B56380, 0x35B47B00, 0x35B39280,
-	0x35B2AA00, 0x35B1C180, 0x35B0D900,
-	0x35AFF080, 0x35AF0800, 0x35AE1F80,
-	0x35AD3700, 0x35AC4E80, 0x35AB6600,
-	0x35AA7D80, 0x35A99500, 0x35A8AC80,
-	0x35A7C400, 0x35A6DB80, 0x35A5F300,
-	0x35A50A80, 0x35A42200, 0x35A33980,
-	0x35A25100, 0x35A16880, 0x35A08000,
-	0x359F9780, 0x359EAF00, 0x359DC680,
-	0x359CDE00, 0x359BF580, 0x359B0D00,
-	0x359A2480, 0x35993C00, 0x35985380,
-	0x35976B00, 0x35968280, 0x35959A00,
-	0x3594B180, 0x3593C900, 0x3592E080,
-	0x3591F800, 0x35910F80, 0x35902700,
-	0x358F3E80, 0x358E5600, 0x358D6D80,
-	0x358C8500, 0x358B9C80, 0x358AB400,
-	0x3589CB80, 0x3588E300, 0x3587FA80,
-	0x35871200, 0x35862980, 0x35854100,
-	0x35845880, 0x35837000, 0x35828780,
-	0x35819F00, 0x3580B680, 0x357FCE00,
-	0x357EE580, 0x357DFD00, 0x357D1480,
-	0x357C2C00, 0x357B4380, 0x357A5B00,
-	0x35797280, 0x35788A00, 0x3577A180,
-	0x3576B900, 0x3575D080, 0x3574E800,
-	0x3573FF80, 0x35731700, 0x35722E80,
-	0x35714600, 0x35705D80, 0x356F7500,
-	0x356E8C80, 0x356DA400, 0x356CBB80,
-	0x356BD300, 0x356AEA80, 0x356A0200,
-	0x35691980, 0x35683100, 0x35674880,
-	0x35666000, 0x35657780, 0x35648F00,
-	0x3563A680, 0x3562BE00, 0x3561D580,
-	0x3560ED00, 0x35600480, 0x355F1C00,
-	0x355E3380, 0x355D4B00, 0x355C6280,
-	0x355B7A00, 0x355A9180, 0x3559A900,
-	0x3558C080, 0x3557D800, 0x3556EF80,
-	0x35560700, 0x35551E80, 0x35543600,
-	0x35534D80, 0x35526500, 0x35517C80,
-	0x35509400, 0x354FAB80, 0x354EC300,
-	0x354DDA80, 0x354CF200, 0x354C0980,
-	0x354B2100, 0x354A3880, 0x35495000,
-	0x35486780, 0x35477F00, 0x35469680,
-	0x3545AE00, 0x3544C580, 0x3543DD00,
-	0x3542F480, 0x35420C00, 0x35412380,
-	0x35403B00, 0x353F5280, 0x353E6A00,
-	0x353D8180, 0x353C9900, 0x353BB080,
-	0x353AC800, 0x3539DF80, 0x3538F700,
-	0x35380E80, 0x35372600, 0x35363D80,
-	0x35355500, 0x35346C80, 0x35338400,
-	0x35329B80, 0x3531B300, 0x3530CA80,
-	0x352FE200, 0x352EF980, 0x352E1100,
-	0x352D2880, 0x352C4000, 0x352B5780,
-	0x352A6F00, 0x35298680, 0x35289E00,
-	0x3527B580, 0x3526CD00, 0x3525E480,
-	0x3524FC00, 0x35241380, 0x35232B00,
-	0x35224280, 0x35215A00, 0x35207180,
-	0x351F8900, 0x351EA080, 0x351DB800,
-	0x351CCF80, 0x351BE700, 0x351AFE80,
-	0x351A1600, 0x35192D80, 0x35184500,
-	0x35175C80, 0x35167400, 0x35158B80,
-	0x3514A300, 0x3513BA80, 0x3512D200,
-	0x3511E980, 0x35110100, 0x35101880,
-	0x350F3000, 0x350E4780, 0x350D5F00,
-	0x350C7680, 0x350B8E00, 0x350AA580,
-	0x3509BD00, 0x3508D480, 0x3507EC00,
-	0x35070380, 0x35061B00, 0x35053280,
-	0x35044A00, 0x35036180, 0x35027900,
-	0x35019080, 0x3500A800, 0x34FFBF80,
-	0x34FED700, 0x34FDEE80, 0x34FD0600,
-	0x34FC1D80, 0x34FB3500, 0x34FA4C80,
-	0x34F96400, 0x34F87B80, 0x34F79300,
-	0x34F6AA80, 0x34F5C200, 0x34F4D980,
-	0x34F3F100, 0x34F30880, 0x34F22000,
-	0x34F13780, 0x34F04F00, 0x34EF6680,
-	0x34EE7E00, 0x34ED9580, 0x34ECAD00,
-	0x34EBC480, 0x34EADC00, 0x34E9F380,
-	0x34E90B00, 0x34E82280, 0x34E73A00,
-	0x34E65180, 0x34E56900, 0x34E48080,
-	0x34E39800, 0x34E2AF80, 0x34E1C700,
-	0x34E0DE80, 0x34DFF600, 0x34DF0D80,
-	0x34DE2500, 0x34DD3C80, 0x34DC5400,
-	0x34DB6B80, 0x34DA8300, 0x34D99A80,
-	0x34D8B200, 0x34D7C980, 0x34D6E100,
-	0x34D5F880, 0x34D51000, 0x34D42780,
-	0x34D33F00, 0x34D25680, 0x34D16E00,
-	0x34D08580, 0x34CF9D00, 0x34CEB480,
-	0x34CDCC00, 0x34CCE380, 0x34CBFB00,
-	0x34CB1280, 0x34CA2A00, 0x34C94180,
-	0x34C85900, 0x34C77080, 0x34C68800,
-	0x34C59F80, 0x34C4B700, 0x34C3CE80,
-	0x34C2E600, 0x34C1FD80, 0x34C11500,
-	0x34C02C80, 0x34BF4400, 0x34BE5B80,
-	0x34BD7300, 0x34BC8A80, 0x34BBA200,
-	0x34BAB980, 0x34B9D100, 0x34B8E880,
-	0x34B80000, 0x34B726C0, 0x34B64D80,
-	0x34B57440, 0x34B49B00, 0x34B3C1C0,
-	0x34B2E880, 0x34B20F40, 0x34B13600,
-	0x34B05CC0, 0x34AF8380, 0x34AEAA40,
-	0x34ADD100, 0x34ACF7C0, 0x34AC1E80,
-	0x34AB4540, 0x34AA6C00, 0x34A992C0,
-	0x34A8B980, 0x34A7E040, 0x34A70700,
-	0x34A62DC0, 0x34A55480, 0x34A47B40,
-	0x34A3A200, 0x34A2C8C0, 0x34A1EF80,
-	0x34A11640, 0x34A03D00, 0x349F63C0,
-	0x349E8A80, 0x349DB140, 0x349CD800,
-	0x349BFEC0, 0x349B2580, 0x349A4C40,
-	0x34997300, 0x349899C0, 0x3497C080,
-	0x3496E740, 0x34960E00, 0x349534C0,
-	0x34945B80, 0x34938240, 0x3492A900,
-	0x3491CFC0, 0x3490F680, 0x34901D40,
-	0x348F4400, 0x348E6AC0, 0x348D9180,
-	0x348CB840, 0x348BDF00, 0x348B05C0,
-	0x348A2C80, 0x34895340, 0x34887A00,
-	0x3487A0C0, 0x3486C780, 0x3485EE40,
-	0x34851500, 0x34843BC0, 0x34836280,
-	0x34828940, 0x3481B000, 0x3480D6C0,
-	0x347FFD80, 0x347F2440, 0x347E4B00,
-	0x347D71C0, 0x347C9880, 0x347BBF40,
-	0x347AE600, 0x347A0CC0, 0x34793380,
-	0x34785A40, 0x34778100, 0x3476A7C0,
-	0x3475CE80, 0x3474F540, 0x34741C00,
-	0x347342C0, 0x34726980, 0x34719040,
-	0x3470B700, 0x346FDDC0, 0x346F0480,
-	0x346E2B40, 0x346D5200, 0x346C78C0,
-	0x346B9F80, 0x346AC640, 0x3469ED00,
-	0x346913C0, 0x34683A80, 0x34676140,
-	0x34668800, 0x3465AEC0, 0x3464D580,
-	0x3463FC40, 0x34632300, 0x346249C0,
-	0x34617080, 0x34609740, 0x345FBE00,
-	0x345EE4C0, 0x345E0B80, 0x345D3240,
-	0x345C5900, 0x345B7FC0, 0x345AA680,
-	0x3459CD40, 0x3458F400, 0x34581AC0,
-	0x34574180, 0x34566840, 0x34558F00,
-	0x3454B5C0, 0x3453DC80, 0x34530340,
-	0x34522A00, 0x345150C0, 0x34507780,
-	0x344F9E40, 0x344EC500, 0x344DEBC0,
-	0x344D1280, 0x344C3940, 0x344B6000,
-	0x344A86C0, 0x3449AD80, 0x3448D440,
-	0x3447FB00, 0x344721C0, 0x34464880,
-	0x34456F40, 0x34449600, 0x3443BCC0,
-	0x3442E380, 0x34420A40, 0x34413100,
-	0x344057C0, 0x343F7E80, 0x343EA540,
-	0x343DCC00, 0x343CF2C0, 0x343C1980,
-	0x343B4040, 0x343A6700, 0x34398DC0,
-	0x3438B480, 0x3437DB40, 0x34370200,
-	0x343628C0, 0x34354F80, 0x34347640,
-	0x34339D00, 0x3432C3C0, 0x3431EA80,
-	0x34311140, 0x34303800, 0x342F5EC0,
-	0x342E8580, 0x342DAC40, 0x342CD300,
-	0x342BF9C0, 0x342B2080, 0x342A4740,
-	0x34296E00, 0x342894C0, 0x3427BB80,
-	0x3426E240, 0x34260900, 0x34252FC0,
-	0x34245680, 0x34237D40, 0x3422A400,
-	0x3421CAC0, 0x3420F180, 0x34201840,
-	0x341F3F00, 0x341E65C0, 0x341D8C80,
-	0x341CB340, 0x341BDA00, 0x341B00C0,
-	0x341A2780, 0x34194E40, 0x34187500,
-	0x34179BC0, 0x3416C280, 0x3415E940,
-	0x34151000, 0x341436C0, 0x34135D80,
-	0x34128440, 0x3411AB00, 0x3410D1C0,
-	0x340FF880, 0x340F1F40, 0x340E4600,
-	0x340D6CC0, 0x340C9380, 0x340BBA40,
-	0x340AE100, 0x340A07C0, 0x34092E80,
-	0x34085540, 0x34077C00, 0x3406A2C0,
-	0x3405C980, 0x3404F040, 0x34041700,
-	0x34033DC0, 0x34026480, 0x34018B40,
-	0x3400B200, 0x33FFD8C0, 0x33FEFF80,
-	0x33FE2640, 0x33FD4D00, 0x33FC73C0,
-	0x33FB9A80, 0x33FAC140, 0x33F9E800,
-	0x33F90EC0, 0x33F83580, 0x33F75C40,
-	0x33F68300, 0x33F5A9C0, 0x33F4D080,
-	0x33F3F740, 0x33F31E00, 0x33F244C0,
-	0x33F16B80, 0x33F09240, 0x33EFB900,
-	0x33EEDFC0, 0x33EE0680, 0x33ED2D40,
-	0x33EC5400, 0x33EB7AC0, 0x33EAA180,
-	0x33E9C840, 0x33E8EF00, 0x33E815C0,
-	0x33E73C80, 0x33E66340, 0x33E58A00,
-	0x33E4B0C0, 0x33E3D780, 0x33E2FE40,
-	0x33E22500, 0x33E14BC0, 0x33E07280,
-	0x33DF9940, 0x33DEC000, 0x33DDE6C0,
-	0x33DD0D80, 0x33DC3440, 0x33DB5B00,
-	0x33DA81C0, 0x33D9A880, 0x33D8CF40,
-	0x33D7F600, 0x33D71CC0, 0x33D64380,
-	0x33D56A40, 0x33D49100, 0x33D3B7C0,
-	0x33D2DE80, 0x33D20540, 0x33D12C00,
-	0x33D052C0, 0x33CF7980, 0x33CEA040,
-	0x33CDC700, 0x33CCEDC0, 0x33CC1480,
-	0x33CB3B40, 0x33CA6200, 0x33C988C0,
-	0x33C8AF80, 0x33C7D640, 0x33C6FD00,
-	0x33C623C0, 0x33C54A80, 0x33C47140,
-	0x33C39800, 0x33C2BEC0, 0x33C1E580,
-	0x33C10C40, 0x33C03300, 0x33BF59C0,
-	0x33BE8080, 0x33BDA740, 0x33BCCE00,
-	0x33BBF4C0, 0x33BB1B80, 0x33BA4240,
-	0x33B96900, 0x33B88FC0, 0x33B7B680,
-	0x33B6DD40, 0x33B60400, 0x33B52AC0,
-	0x33B45180, 0x33B37840, 0x33B29F00,
-	0x33B1C5C0, 0x33B0EC80, 0x33B01340,
-	0x33AF3A00, 0x33AE60C0, 0x33AD8780,
-	0x33ACAE40, 0x33ABD500, 0x33AAFBC0,
-	0x33AA2280, 0x33A94940, 0x33A87000,
-	0x33A796C0, 0x33A6BD80, 0x33A5E440,
-	0x33A50B00, 0x33A431C0, 0x33A35880,
-	0x33A27F40, 0x33A1A600, 0x33A0CCC0,
-	0x339FF380, 0x339F1A40, 0x339E4100,
-	0x339D67C0, 0x339C8E80, 0x339BB540,
-	0x339ADC00, 0x339A02C0, 0x33992980,
-	0x33985040, 0x33977700, 0x33969DC0,
-	0x3395C480, 0x3394EB40, 0x33941200,
-	0x339338C0, 0x33925F80, 0x33918640,
-	0x3390AD00, 0x338FD3C0, 0x338EFA80,
-	0x338E2140, 0x338D4800, 0x338C6EC0,
-	0x338B9580, 0x338ABC40, 0x3389E300,
-	0x338909C0, 0x33883080, 0x33875740,
-	0x33867E00, 0x3385A4C0, 0x3384CB80,
-	0x3383F240, 0x33831900, 0x33823FC0,
-	0x33816680, 0x33808D40, 0x337FB400,
-	0x337EDAC0, 0x337E0180, 0x337D2840,
-	0x337C4F00, 0x337B75C0, 0x337A9C80,
-	0x3379C340, 0x3378EA00, 0x337810C0,
-	0x33773780, 0x33765E40, 0x33758500,
-	0x3374ABC0, 0x3373D280, 0x3372F940,
-	0x33722000, 0x337146C0, 0x33706D80,
-	0x336F9440, 0x336EBB00, 0x336DE1C0,
-	0x336D0880, 0x336C2F40, 0x336B5600,
-	0x336A7CC0, 0x3369A380, 0x3368CA40,
-	0x3367F100, 0x336717C0, 0x33663E80,
-	0x33656540, 0x33648C00, 0x3363B2C0,
-	0x3362D980, 0x33620040, 0x33612700,
-	0x33604DC0, 0x335F7480, 0x335E9B40,
-	0x335DC200, 0x335CE8C0, 0x335C0F80,
-	0x335B3640, 0x335A5D00, 0x335983C0,
-	0x3358AA80, 0x3357D140, 0x3356F800,
-	0x33561EC0, 0x33554580, 0x33546C40,
-	0x33539300, 0x3352B9C0, 0x3351E080,
-	0x33510740, 0x33502E00, 0x334F54C0,
-	0x334E7B80, 0x334DA240, 0x334CC900,
-	0x334BEFC0, 0x334B1680, 0x334A3D40,
-	0x33496400, 0x33488AC0, 0x3347B180,
-	0x3346D840, 0x3345FF00, 0x334525C0,
-	0x33444C80, 0x33437340, 0x33429A00,
-	0x3341C0C0, 0x3340E780, 0x33400E40,
-	0x333F3500, 0x333E5BC0, 0x333D8280,
-	0x333CA940, 0x333BD000, 0x333AF6C0,
-	0x333A1D80, 0x33394440, 0x33386B00,
-	0x333791C0, 0x3336B880, 0x3335DF40,
-	0x33350600, 0x33342CC0, 0x33335380,
-	0x33327A40, 0x3331A100, 0x3330C7C0,
-	0x332FEE80, 0x332F1540, 0x332E3C00,
-	0x332D62C0, 0x332C8980, 0x332BB040,
-	0x332AD700, 0x3329FDC0, 0x33292480,
-	0x33284B40, 0x33277200, 0x332698C0,
-	0x3325BF80, 0x3324E640, 0x33240D00,
-	0x332333C0, 0x33225A80, 0x33218140,
-	0x3320A800, 0x331FCEC0, 0x331EF580,
-	0x331E1C40, 0x331D4300, 0x331C69C0,
-	0x331B9080, 0x331AB740, 0x3319DE00,
-	0x331904C0, 0x33182B80, 0x33175240,
-	0x33167900, 0x33159FC0, 0x3314C680,
-	0x3313ED40, 0x33131400, 0x33123AC0,
-	0x33116180, 0x33108840, 0x330FAF00,
-	0x330ED5C0, 0x330DFC80, 0x330D2340,
-	0x330C4A00, 0x330B70C0, 0x330A9780,
-	0x3309BE40, 0x3308E500, 0x33080BC0,
-	0x33073280, 0x33065940, 0x33058000,
-	0x3304A6C0, 0x3303CD80, 0x3302F440,
-	0x33021B00, 0x330141C0, 0x33006880,
-	0x32FF8F40, 0x32FEB600, 0x32FDDCC0,
-	0x32FD0380, 0x32FC2A40, 0x32FB5100,
-	0x32FA77C0, 0x32F99E80, 0x32F8C540,
-	0x32F7EC00, 0x32F712C0, 0x32F63980,
-	0x32F56040, 0x32F48700, 0x32F3ADC0,
-	0x32F2D480, 0x32F1FB40, 0x32F12200,
-	0x32F048C0, 0x32EF6F80, 0x32EE9640,
-	0x32EDBD00, 0x32ECE3C0, 0x32EC0A80,
-	0x32EB3140, 0x32EA5800, 0x32E97EC0,
-	0x32E8A580, 0x32E7CC40, 0x32E6F300,
-	0x32E619C0, 0x32E54080, 0x32E46740,
-	0x32E38E00, 0x32E2B4C0, 0x32E1DB80,
-	0x32E10240, 0x32E02900, 0x32DF4FC0,
-	0x32DE7680, 0x32DD9D40, 0x32DCC400,
-	0x32DBEAC0, 0x32DB1180, 0x32DA3840,
-	0x32D95F00, 0x32D885C0, 0x32D7AC80,
-	0x32D6D340, 0x32D5FA00, 0x32D520C0,
-	0x32D44780, 0x32D36E40, 0x32D29500,
-	0x32D1BBC0, 0x32D0E280, 0x32D00940,
-	0x32CF3000, 0x32CE56C0, 0x32CD7D80,
-	0x32CCA440, 0x32CBCB00, 0x32CAF1C0,
-	0x32CA1880, 0x32C93F40, 0x32C86600,
-	0x32C78CC0, 0x32C6B380, 0x32C5DA40,
-	0x32C50100, 0x32C427C0, 0x32C34E80,
-	0x32C27540, 0x32C19C00, 0x32C0C2C0,
-	0x32BFE980, 0x32BF1040, 0x32BE3700,
-	0x32BD5DC0, 0x32BC8480, 0x32BBAB40,
-	0x32BAD200, 0x32B9F8C0, 0x32B91F80,
-	0x32B84640, 0x32B76D00, 0x32B693C0,
-	0x32B5BA80, 0x32B4E140, 0x32B40800,
-	0x32B32EC0, 0x32B25580, 0x32B17C40,
-	0x32B0A300, 0x32AFC9C0, 0x32AEF080,
-	0x32AE1740, 0x32AD3E00, 0x32AC64C0,
-	0x32AB8B80, 0x32AAB240, 0x32A9D900,
-	0x32A8FFC0, 0x32A82680, 0x32A74D40,
-	0x32A67400, 0x32A59AC0, 0x32A4C180,
-	0x32A3E840, 0x32A30F00, 0x32A235C0,
-	0x32A15C80, 0x32A08340, 0x329FAA00,
-	0x329ED0C0, 0x329DF780, 0x329D1E40,
-	0x329C4500, 0x329B6BC0, 0x329A9280,
-	0x3299B940, 0x3298E000, 0x329806C0,
-	0x32972D80, 0x32965440, 0x32957B00,
-	0x3294A1C0, 0x3293C880, 0x3292EF40,
-	0x32921600, 0x32913CC0, 0x32906380,
-	0x328F8A40, 0x328EB100, 0x328DD7C0,
-	0x328CFE80, 0x328C2540, 0x328B4C00,
-	0x328A72C0, 0x32899980, 0x3288C040,
-	0x3287E700, 0x32870DC0, 0x32863480,
-	0x32855B40, 0x32848200, 0x3283A8C0,
-	0x3282CF80, 0x3281F640, 0x32811D00,
-	0x328043C0, 0x327F6A80, 0x327E9140,
-	0x327DB800, 0x327CDEC0, 0x327C0580,
-	0x327B2C40, 0x327A5300, 0x327979C0,
-	0x3278A080, 0x3277C740, 0x3276EE00,
-	0x327614C0, 0x32753B80, 0x32746240,
-	0x32738900, 0x3272AFC0, 0x3271D680,
-	0x3270FD40, 0x32702400, 0x326F4AC0,
-	0x326E7180, 0x326D9840, 0x326CBF00,
-	0x326BE5C0, 0x326B0C80, 0x326A3340,
-	0x32695A00, 0x326880C0, 0x3267A780,
-	0x3266CE40, 0x3265F500, 0x32651BC0,
-	0x32644280, 0x32636940, 0x32629000,
-	0x3261B6C0, 0x3260DD80, 0x32600440,
-	0x325F2B00, 0x325E51C0, 0x325D7880,
-	0x325C9F40, 0x325BC600, 0x325AECC0,
-	0x325A1380, 0x32593A40, 0x32586100,
-	0x325787C0, 0x3256AE80, 0x3255D540,
-	0x3254FC00, 0x325422C0, 0x32534980,
-	0x32527040, 0x32519700, 0x3250BDC0,
-	0x324FE480, 0x324F0B40, 0x324E3200,
-	0x324D58C0, 0x324C7F80, 0x324BA640,
-	0x324ACD00, 0x3249F3C0, 0x32491A80,
-	0x32484140, 0x32476800, 0x32468EC0,
-	0x3245B580, 0x3244DC40, 0x32440300,
-	0x324329C0, 0x32425080, 0x32417740,
-	0x32409E00, 0x323FC4C0, 0x323EEB80,
-	0x323E1240, 0x323D3900, 0x323C5FC0,
-	0x323B8680, 0x323AAD40, 0x3239D400,
-	0x3238FAC0, 0x32382180, 0x32374840,
-	0x32366F00, 0x323595C0, 0x3234BC80,
-	0x3233E340, 0x32330A00, 0x323230C0,
-	0x32315780, 0x32307E40, 0x322FA500,
-	0x322ECBC0, 0x322DF280, 0x322D1940,
-	0x322C4000, 0x322B66C0, 0x322A8D80,
-	0x3229B440, 0x3228DB00, 0x322801C0,
-	0x32272880, 0x32264F40, 0x32257600,
-	0x32249CC0, 0x3223C380, 0x3222EA40,
-	0x32221100, 0x322137C0, 0x32205E80,
-	0x321F8540, 0x321EAC00, 0x321DD2C0,
-	0x321CF980, 0x321C2040, 0x321B4700,
-	0x321A6DC0, 0x32199480, 0x3218BB40,
-	0x3217E200, 0x321708C0, 0x32162F80,
-	0x32155640, 0x32147D00, 0x3213A3C0,
-	0x3212CA80, 0x3211F140, 0x32111800,
-	0x32103EC0, 0x320F6580, 0x320E8C40,
-	0x320DB300, 0x320CD9C0, 0x320C0080,
-	0x320B2740, 0x320A4E00, 0x320974C0,
-	0x32089B80, 0x3207C240, 0x3206E900,
-	0x32060FC0, 0x32053680, 0x32045D40,
-	0x32038400, 0x3202AAC0, 0x3201D180,
-	0x3200F840, 0x32001F00, 0x31FF45C0,
-	0x31FE6C80, 0x31FD9340, 0x31FCBA00,
-	0x31FBE0C0, 0x31FB0780, 0x31FA2E40,
-	0x31F95500, 0x31F87BC0, 0x31F7A280,
-	0x31F6C940, 0x31F5F000, 0x31F516C0,
-	0x31F43D80, 0x31F36440, 0x31F28B00,
-	0x31F1B1C0, 0x31F0D880, 0x31EFFF40,
-	0x31EF2600, 0x31EE4CC0, 0x31ED7380,
-	0x31EC9A40, 0x31EBC100, 0x31EAE7C0,
-	0x31EA0E80, 0x31E93540, 0x31E85C00,
-	0x31E782C0, 0x31E6A980, 0x31E5D040,
-	0x31E4F700, 0x31E41DC0, 0x31E34480,
-	0x31E26B40, 0x31E19200, 0x31E0B8C0,
-	0x31DFDF80, 0x31DF0640, 0x31DE2D00,
-	0x31DD53C0, 0x31DC7A80, 0x31DBA140,
-	0x31DAC800, 0x31D9EEC0, 0x31D91580,
-	0x31D83C40, 0x31D76300, 0x31D689C0,
-	0x31D5B080, 0x31D4D740, 0x31D3FE00,
-	0x31D324C0, 0x31D24B80, 0x31D17240,
-	0x31D09900, 0x31CFBFC0, 0x31CEE680,
-	0x31CE0D40, 0x31CD3400, 0x31CC5AC0,
-	0x31CB8180, 0x31CAA840, 0x31C9CF00,
-	0x31C8F5C0, 0x31C81C80, 0x31C74340,
-	0x31C66A00, 0x31C590C0, 0x31C4B780,
-	0x31C3DE40, 0x31C30500, 0x31C22BC0,
-	0x31C15280, 0x31C07940, 0x31BFA000,
-	0x31BEC6C0, 0x31BDED80, 0x31BD1440,
-	0x31BC3B00, 0x31BB61C0, 0x31BA8880,
-	0x31B9AF40, 0x31B8D600, 0x31B7FCC0,
-	0x31B72380, 0x31B64A40, 0x31B57100,
-	0x31B497C0, 0x31B3BE80, 0x31B2E540,
-	0x31B20C00, 0x31B132C0, 0x31B05980,
-	0x31AF8040, 0x31AEA700, 0x31ADCDC0,
-	0x31ACF480, 0x31AC1B40, 0x31AB4200,
-	0x31AA68C0, 0x31A98F80, 0x31A8B640,
-	0x31A7DD00, 0x31A703C0, 0x31A62A80,
-	0x31A55140, 0x31A47800, 0x31A39EC0,
-	0x31A2C580, 0x31A1EC40, 0x31A11300,
-	0x31A039C0, 0x319F6080, 0x319E8740,
-	0x319DAE00, 0x319CD4C0, 0x319BFB80,
-	0x319B2240, 0x319A4900, 0x31996FC0,
-	0x31989680, 0x3197BD40, 0x3196E400,
-	0x31960AC0, 0x31953180, 0x31945840,
-	0x31937F00, 0x3192A5C0, 0x3191CC80,
-	0x3190F340, 0x31901A00, 0x318F40C0,
-	0x318E6780, 0x318D8E40, 0x318CB500,
-	0x318BDBC0, 0x318B0280, 0x318A2940,
-	0x31895000, 0x318876C0, 0x31879D80,
-	0x3186C440, 0x3185EB00, 0x318511C0,
-	0x31843880, 0x31835F40, 0x31828600,
-	0x3181ACC0, 0x3180D380, 0x317FFA40,
-	0x317F2100, 0x317E47C0, 0x317D6E80,
-	0x317C9540, 0x317BBC00, 0x317AE2C0,
-	0x317A0980, 0x31793040, 0x31785700,
-	0x31777DC0, 0x3176A480, 0x3175CB40,
-	0x3174F200, 0x317418C0, 0x31733F80,
-	0x31726640, 0x31718D00, 0x3170B3C0,
-	0x316FDA80, 0x316F0140, 0x316E2800,
-	0x316D4EC0, 0x316C7580, 0x316B9C40,
-	0x316AC300, 0x3169E9C0, 0x31691080,
-	0x31683740, 0x31675E00, 0x316684C0,
-	0x3165AB80, 0x3164D240, 0x3163F900,
-	0x31631FC0, 0x31624680, 0x31616D40,
-	0x31609400, 0x315FBAC0, 0x315EE180,
-	0x315E0840, 0x315D2F00, 0x315C55C0,
-	0x315B7C80, 0x315AA340, 0x3159CA00,
-	0x3158F0C0, 0x31581780, 0x31573E40,
-	0x31566500, 0x31558BC0, 0x3154B280,
-	0x3153D940, 0x31530000, 0x315226C0,
-	0x31514D80, 0x31507440, 0x314F9B00,
-	0x314EC1C0, 0x314DE880, 0x314D0F40,
-	0x314C3600, 0x314B5CC0, 0x314A8380,
-	0x3149AA40, 0x3148D100, 0x3147F7C0,
-	0x31471E80, 0x31464540, 0x31456C00,
-	0x314492C0, 0x3143B980, 0x3142E040,
-	0x31420700, 0x31412DC0, 0x31405480,
-	0x313F7B40, 0x313EA200, 0x313DC8C0,
-	0x313CEF80, 0x313C1640, 0x313B3D00,
-	0x313A63C0, 0x31398A80, 0x3138B140,
-	0x3137D800, 0x3136FEC0, 0x31362580,
-	0x31354C40, 0x31347300, 0x313399C0,
-	0x3132C080, 0x3131E740, 0x31310E00,
-	0x313034C0, 0x312F5B80, 0x312E8240,
-	0x312DA900, 0x312CCFC0, 0x312BF680,
-	0x312B1D40, 0x312A4400, 0x31296AC0,
-	0x31289180, 0x3127B840, 0x3126DF00,
-	0x312605C0, 0x31252C80, 0x31245340,
-	0x31237A00, 0x3122A0C0, 0x3121C780,
-	0x3120EE40, 0x31201500, 0x311F3BC0,
-	0x311E6280, 0x311D8940, 0x311CB000,
-	0x311BD6C0, 0x311AFD80, 0x311A2440,
-	0x31194B00, 0x311871C0, 0x31179880,
-	0x3116BF40, 0x3115E600, 0x31150CC0,
-	0x31143380, 0x31135A40, 0x31128100,
-	0x3111A7C0, 0x3110CE80, 0x310FF540,
-	0x310F1C00, 0x310E42C0, 0x310D6980,
-	0x310C9040, 0x310BB700, 0x310ADDC0,
-	0x310A0480, 0x31092B40, 0x31085200,
-	0x310778C0, 0x31069F80, 0x3105C640,
-	0x3104ED00, 0x310413C0, 0x31033A80,
-	0x31026140, 0x31018800, 0x3100AEC0,
-	0x30FFD580, 0x30FEFC40, 0x30FE2300,
-	0x30FD49C0, 0x30FC7080, 0x30FB9740,
-	0x30FABE00, 0x30F9E4C0, 0x30F90B80,
-	0x30F83240, 0x30F75900, 0x30F67FC0,
-	0x30F5A680, 0x30F4CD40, 0x30F3F400,
-	0x30F31AC0, 0x30F24180, 0x30F16840,
-	0x30F08F00, 0x30EFB5C0, 0x30EEDC80,
-	0x30EE0340, 0x30ED2A00, 0x30EC50C0,
-	0x30EB7780, 0x30EA9E40, 0x30E9C500,
-	0x30E8EBC0, 0x30E81280, 0x30E73940,
-	0x30E66000, 0x30E586C0, 0x30E4AD80,
-	0x30E3D440, 0x30E2FB00, 0x30E221C0,
-	0x30E14880, 0x30E06F40, 0x30DF9600,
-	0x30DEBCC0, 0x30DDE380, 0x30DD0A40,
-	0x30DC3100, 0x30DB57C0, 0x30DA7E80,
-	0x30D9A540, 0x30D8CC00, 0x30D7F2C0,
-	0x30D71980, 0x30D64040, 0x30D56700,
-	0x30D48DC0, 0x30D3B480, 0x30D2DB40,
-	0x30D20200, 0x30D128C0, 0x30D04F80,
-	0x30CF7640, 0x30CE9D00, 0x30CDC3C0,
-	0x30CCEA80, 0x30CC1140, 0x30CB3800,
-	0x30CA5EC0, 0x30C98580, 0x30C8AC40,
-	0x30C7D300, 0x30C6F9C0, 0x30C62080,
-	0x30C54740, 0x30C46E00, 0x30C394C0,
-	0x30C2BB80, 0x30C1E240, 0x30C10900,
-	0x30C02FC0, 0x30BF5680, 0x30BE7D40,
-	0x30BDA400, 0x30BCCAC0, 0x30BBF180,
-	0x30BB1840, 0x30BA3F00, 0x30B965C0,
-	0x30B88C80, 0x30B7B340, 0x30B6DA00,
-	0x30B600C0, 0x30B52780, 0x30B44E40,
-	0x30B37500, 0x30B29BC0, 0x30B1C280,
-	0x30B0E940, 0x30B01000, 0x30AF36C0,
-	0x30AE5D80, 0x30AD8440, 0x30ACAB00,
-	0x30ABD1C0, 0x30AAF880, 0x30AA1F40,
-	0x30A94600, 0x30A86CC0, 0x30A79380,
-	0x30A6BA40, 0x30A5E100, 0x30A507C0,
-	0x30A42E80, 0x30A35540, 0x30A27C00,
-	0x30A1A2C0, 0x30A0C980, 0x309FF040,
-	0x309F1700, 0x309E3DC0, 0x309D6480,
-	0x309C8B40, 0x309BB200, 0x309AD8C0,
-	0x3099FF80, 0x30992640, 0x30984D00,
-	0x309773C0, 0x30969A80, 0x3095C140,
-	0x3094E800, 0x30940EC0, 0x30933580,
-	0x30925C40, 0x30918300, 0x3090A9C0,
-	0x308FD080, 0x308EF740, 0x308E1E00,
-	0x308D44C0, 0x308C6B80, 0x308B9240,
-	0x308AB900, 0x3089DFC0, 0x30890680,
-	0x30882D40, 0x30875400, 0x30867AC0,
-	0x3085A180, 0x3084C840, 0x3083EF00,
-	0x308315C0, 0x30823C80, 0x30816340,
-	0x30808A00, 0x307FB0C0, 0x307ED780,
-	0x307DFE40, 0x307D2500, 0x307C4BC0,
-	0x307B7280, 0x307A9940, 0x3079C000,
-	0x3078E6C0, 0x30780D80, 0x30773440,
-	0x30765B00, 0x307581C0, 0x3074A880,
-	0x3073CF40, 0x3072F600, 0x30721CC0,
-	0x30714380, 0x30706A40, 0x306F9100,
-	0x306EB7C0, 0x306DDE80, 0x306D0540,
-	0x306C2C00, 0x306B52C0, 0x306A7980,
-	0x3069A040, 0x3068C700, 0x3067EDC0,
-	0x30671480, 0x30663B40, 0x30656200,
-	0x306488C0, 0x3063AF80, 0x3062D640,
-	0x3061FD00, 0x306123C0, 0x30604A80,
-	0x305F7140, 0x305E9800, 0x305DBEC0,
-	0x305CE580, 0x305C0C40, 0x305B3300,
-	0x305A59C0, 0x30598080, 0x3058A740,
-	0x3057CE00, 0x3056F4C0, 0x30561B80,
-	0x30554240, 0x30546900, 0x30538FC0,
-	0x3052B680, 0x3051DD40, 0x30510400,
-	0x30502AC0, 0x304F5180, 0x304E7840,
-	0x304D9F00, 0x304CC5C0, 0x304BEC80,
-	0x304B1340, 0x304A3A00, 0x304960C0,
-	0x30488780, 0x3047AE40, 0x3046D500,
-	0x3045FBC0, 0x30452280, 0x30444940,
-	0x30437000, 0x304296C0, 0x3041BD80,
-	0x3040E440, 0x30400B00, 0x303F31C0,
-	0x303E5880, 0x303D7F40, 0x303CA600,
-	0x303BCCC0, 0x303AF380, 0x303A1A40,
-	0x30394100, 0x303867C0, 0x30378E80,
-	0x3036B540, 0x3035DC00, 0x303502C0,
-	0x30342980, 0x30335040, 0x30327700,
-	0x30319DC0, 0x3030C480, 0x302FEB40,
-	0x302F1200, 0x302E38C0, 0x302D5F80,
-	0x302C8640, 0x302BAD00, 0x302AD3C0,
-	0x3029FA80, 0x30292140, 0x30284800,
-	0x30276EC0, 0x30269580, 0x3025BC40,
-	0x3024E300, 0x302409C0, 0x30233080,
-	0x30225740, 0x30217E00, 0x3020A4C0,
-	0x301FCB80, 0x301EF240, 0x301E1900,
-	0x301D3FC0, 0x301C6680, 0x301B8D40,
-	0x301AB400, 0x3019DAC0, 0x30190180,
-	0x30182840, 0x30174F00, 0x301675C0,
-	0x30159C80, 0x3014C340, 0x3013EA00,
-	0x301310C0, 0x30123780, 0x30115E40,
-	0x30108500, 0x300FABC0, 0x300ED280,
-	0x300DF940, 0x300D2000, 0x300C46C0,
-	0x300B6D80, 0x300A9440, 0x3009BB00,
-	0x3008E1C0, 0x30080880, 0x30072F40,
-	0x30065600, 0x30057CC0, 0x3004A380,
-	0x3003CA40, 0x3002F100, 0x300217C0,
-	0x30013E80, 0x30006540, 0x2FFF8C00,
-	0x2FFEB2C0, 0x2FFDD980, 0x2FFD0040,
-	0x2FFC2700, 0x2FFB4DC0, 0x2FFA7480,
-	0x2FF99B40, 0x2FF8C200, 0x2FF7E8C0,
-	0x2FF70F80, 0x2FF63640, 0x2FF55D00,
-	0x2FF483C0, 0x2FF3AA80, 0x2FF2D140,
-	0x2FF1F800, 0x2FF11EC0, 0x2FF04580,
-	0x2FEF6C40, 0x2FEE9300, 0x2FEDB9C0,
-	0x2FECE080, 0x2FEC0740, 0x2FEB2E00,
-	0x2FEA54C0, 0x2FE97B80, 0x2FE8A240,
-	0x2FE7C900, 0x2FE6EFC0, 0x2FE61680,
-	0x2FE53D40, 0x2FE46400, 0x2FE38AC0,
-	0x2FE2B180, 0x2FE1D840, 0x2FE0FF00,
-	0x2FE025C0, 0x2FDF4C80, 0x2FDE7340,
-	0x2FDD9A00, 0x2FDCC0C0, 0x2FDBE780,
-	0x2FDB0E40, 0x2FDA3500, 0x2FD95BC0,
-	0x2FD88280, 0x2FD7A940, 0x2FD6D000,
-	0x2FD5F6C0, 0x2FD51D80, 0x2FD44440,
-	0x2FD36B00, 0x2FD291C0, 0x2FD1B880,
-	0x2FD0DF40, 0x2FD00600, 0x2FCF2CC0,
-	0x2FCE5380, 0x2FCD7A40, 0x2FCCA100,
-	0x2FCBC7C0, 0x2FCAEE80, 0x2FCA1540,
-	0x2FC93C00, 0x2FC862C0, 0x2FC78980,
-	0x2FC6B040, 0x2FC5D700, 0x2FC4FDC0,
-	0x2FC42480, 0x2FC34B40, 0x2FC27200,
-	0x2FC198C0, 0x2FC0BF80, 0x2FBFE640,
-	0x2FBF0D00, 0x2FBE33C0, 0x2FBD5A80,
-	0x2FBC8140, 0x2FBBA800, 0x2FBACEC0,
-	0x2FB9F580, 0x2FB91C40, 0x2FB84300,
-	0x2FB769C0, 0x2FB69080, 0x2FB5B740,
-	0x2FB4DE00, 0x2FB404C0, 0x2FB32B80,
-	0x2FB25240, 0x2FB17900, 0x2FB09FC0,
-	0x2FAFC680, 0x2FAEED40, 0x2FAE1400,
-	0x2FAD3AC0, 0x2FAC6180, 0x2FAB8840,
-	0x2FAAAF00, 0x2FA9D5C0, 0x2FA8FC80,
-	0x2FA82340, 0x2FA74A00, 0x2FA670C0,
-	0x2FA59780, 0x2FA4BE40, 0x2FA3E500,
-	0x2FA30BC0, 0x2FA23280, 0x2FA15940,
-	0x2FA08000, 0x2F9FA6C0, 0x2F9ECD80,
-	0x2F9DF440, 0x2F9D1B00, 0x2F9C41C0,
-	0x2F9B6880, 0x2F9A8F40, 0x2F99B600,
-	0x2F98DCC0, 0x2F980380, 0x2F972A40,
-	0x2F965100, 0x2F9577C0, 0x2F949E80,
-	0x2F93C540, 0x2F92EC00, 0x2F9212C0,
-	0x2F913980, 0x2F906040, 0x2F8F8700,
-	0x2F8EADC0, 0x2F8DD480, 0x2F8CFB40,
-	0x2F8C2200, 0x2F8B48C0, 0x2F8A6F80,
-	0x2F899640, 0x2F88BD00, 0x2F87E3C0,
-	0x2F870A80, 0x2F863140, 0x2F855800,
-	0x2F847EC0, 0x2F83A580, 0x2F82CC40,
-	0x2F81F300, 0x2F8119C0, 0x2F804080,
-	0x2F7F6740, 0x2F7E8E00, 0x2F7DB4C0,
-	0x2F7CDB80, 0x2F7C0240, 0x2F7B2900,
-	0x2F7A4FC0, 0x2F797680, 0x2F789D40,
-	0x2F77C400, 0x2F76EAC0, 0x2F761180,
-	0x2F753840, 0x2F745F00, 0x2F7385C0,
-	0x2F72AC80, 0x2F71D340, 0x2F70FA00,
-	0x2F7020C0, 0x2F6F4780, 0x2F6E6E40,
-	0x2F6D9500, 0x2F6CBBC0, 0x2F6BE280,
-	0x2F6B0940, 0x2F6A3000, 0x2F6956C0,
-	0x2F687D80, 0x2F67A440, 0x2F66CB00,
-	0x2F65F1C0, 0x2F651880, 0x2F643F40,
-	0x2F636600, 0x2F628CC0, 0x2F61B380,
-	0x2F60DA40, 0x2F600100, 0x2F5F27C0,
-	0x2F5E4E80, 0x2F5D7540, 0x2F5C9C00,
-	0x2F5BC2C0, 0x2F5AE980, 0x2F5A1040,
-	0x2F593700, 0x2F585DC0, 0x2F578480,
-	0x2F56AB40, 0x2F55D200, 0x2F54F8C0,
-	0x2F541F80, 0x2F534640, 0x2F526D00,
-	0x2F5193C0, 0x2F50BA80, 0x2F4FE140,
-	0x2F4F0800, 0x2F4E2EC0, 0x2F4D5580,
-	0x2F4C7C40, 0x2F4BA300, 0x2F4AC9C0,
-	0x2F49F080, 0x2F491740, 0x2F483E00,
-	0x2F4764C0, 0x2F468B80, 0x2F45B240,
-	0x2F44D900, 0x2F43FFC0, 0x2F432680,
-	0x2F424D40, 0x2F417400, 0x2F409AC0,
-	0x2F3FC180, 0x2F3EE840, 0x2F3E0F00,
-	0x2F3D35C0, 0x2F3C5C80, 0x2F3B8340,
-	0x2F3AAA00, 0x2F39D0C0, 0x2F38F780,
-	0x2F381E40, 0x2F374500, 0x2F366BC0,
-	0x2F359280, 0x2F34B940, 0x2F33E000,
-	0x2F3306C0, 0x2F322D80, 0x2F315440,
-	0x2F307B00, 0x2F2FA1C0, 0x2F2EC880,
-	0x2F2DEF40, 0x2F2D1600, 0x2F2C3CC0,
-	0x2F2B6380, 0x2F2A8A40, 0x2F29B100,
-	0x2F28D7C0, 0x2F27FE80, 0x2F272540,
-	0x2F264C00, 0x2F2572C0, 0x2F249980,
-	0x2F23C040, 0x2F22E700, 0x2F220DC0,
-	0x2F213480, 0x2F205B40, 0x2F1F8200,
-	0x2F1EA8C0, 0x2F1DCF80, 0x2F1CF640,
-	0x2F1C1D00, 0x2F1B43C0, 0x2F1A6A80,
-	0x2F199140, 0x2F18B800, 0x2F17DEC0,
-	0x2F170580, 0x2F162C40, 0x2F155300,
-	0x2F1479C0, 0x2F13A080, 0x2F12C740,
-	0x2F11EE00, 0x2F1114C0, 0x2F103B80,
-	0x2F0F6240, 0x2F0E8900, 0x2F0DAFC0,
-	0x2F0CD680, 0x2F0BFD40, 0x2F0B2400,
-	0x2F0A4AC0, 0x2F097180, 0x2F089840,
-	0x2F07BF00, 0x2F06E5C0, 0x2F060C80,
-	0x2F053340, 0x2F045A00, 0x2F0380C0,
-	0x2F02A780, 0x2F01CE40, 0x2F00F500,
-	0x2F001BC0, 0x2EFF4280, 0x2EFE6940,
-	0x2EFD9000, 0x2EFCB6C0, 0x2EFBDD80,
-	0x2EFB0440, 0x2EFA2B00, 0x2EF951C0,
-	0x2EF87880, 0x2EF79F40, 0x2EF6C600,
-	0x2EF5ECC0, 0x2EF51380, 0x2EF43A40,
-	0x2EF36100, 0x2EF287C0, 0x2EF1AE80,
-	0x2EF0D540, 0x2EEFFC00, 0x2EEF22C0,
-	0x2EEE4980, 0x2EED7040, 0x2EEC9700,
-	0x2EEBBDC0, 0x2EEAE480, 0x2EEA0B40,
-	0x2EE93200, 0x2EE858C0, 0x2EE77F80,
-	0x2EE6A640, 0x2EE5CD00, 0x2EE4F3C0,
-	0x2EE41A80, 0x2EE34140, 0x2EE26800,
-	0x2EE18EC0, 0x2EE0B580, 0x2EDFDC40,
-	0x2EDF0300, 0x2EDE29C0, 0x2EDD5080,
-	0x2EDC7740, 0x2EDB9E00, 0x2EDAC4C0,
-	0x2ED9EB80, 0x2ED91240, 0x2ED83900,
-	0x2ED75FC0, 0x2ED68680, 0x2ED5AD40,
-	0x2ED4D400, 0x2ED3FAC0, 0x2ED32180,
-	0x2ED24840, 0x2ED16F00, 0x2ED095C0,
-	0x2ECFBC80, 0x2ECEE340, 0x2ECE0A00,
-	0x2ECD30C0, 0x2ECC5780, 0x2ECB7E40,
-	0x2ECAA500, 0x2EC9CBC0, 0x2EC8F280,
-	0x2EC81940, 0x2EC74000, 0x2EC666C0,
-	0x2EC58D80, 0x2EC4B440, 0x2EC3DB00,
-	0x2EC301C0, 0x2EC22880, 0x2EC14F40,
-	0x2EC07600, 0x2EBF9CC0, 0x2EBEC380,
-	0x2EBDEA40, 0x2EBD1100, 0x2EBC37C0,
-	0x2EBB5E80, 0x2EBA8540, 0x2EB9AC00,
-	0x2EB8D2C0, 0x2EB7F980, 0x2EB72040,
-	0x2EB64700, 0x2EB56DC0, 0x2EB49480,
-	0x2EB3BB40, 0x2EB2E200, 0x2EB208C0,
-	0x2EB12F80, 0x2EB05640, 0x2EAF7D00,
-	0x2EAEA3C0, 0x2EADCA80, 0x2EACF140,
-	0x2EAC1800, 0x2EAB3EC0, 0x2EAA6580,
-	0x2EA98C40, 0x2EA8B300, 0x2EA7D9C0,
-	0x2EA70080, 0x2EA62740, 0x2EA54E00,
-	0x2EA474C0, 0x2EA39B80, 0x2EA2C240,
-	0x2EA1E900, 0x2EA10FC0, 0x2EA03680,
-	0x2E9F5D40, 0x2E9E8400, 0x2E9DAAC0,
-	0x2E9CD180, 0x2E9BF840, 0x2E9B1F00,
-	0x2E9A45C0, 0x2E996C80, 0x2E989340,
-	0x2E97BA00, 0x2E96E0C0, 0x2E960780,
-	0x2E952E40, 0x2E945500, 0x2E937BC0,
-	0x2E92A280, 0x2E91C940, 0x2E90F000,
-	0x2E9016C0, 0x2E8F3D80, 0x2E8E6440,
-	0x2E8D8B00, 0x2E8CB1C0, 0x2E8BD880,
-	0x2E8AFF40, 0x2E8A2600, 0x2E894CC0,
-	0x2E887380, 0x2E879A40, 0x2E86C100,
-	0x2E85E7C0, 0x2E850E80, 0x2E843540,
-	0x2E835C00, 0x2E8282C0, 0x2E81A980,
-	0x2E80D040, 0x2E7FF700, 0x2E7F1DC0,
-	0x2E7E4480, 0x2E7D6B40, 0x2E7C9200,
-	0x2E7BB8C0, 0x2E7ADF80, 0x2E7A0640,
-	0x2E792D00, 0x2E7853C0, 0x2E777A80,
-	0x2E76A140, 0x2E75C800, 0x2E74EEC0,
-	0x2E741580, 0x2E733C40, 0x2E726300,
-	0x2E7189C0, 0x2E70B080, 0x2E6FD740,
-	0x2E6EFE00, 0x2E6E24C0, 0x2E6D4B80,
-	0x2E6C7240, 0x2E6B9900, 0x2E6ABFC0,
-	0x2E69E680, 0x2E690D40, 0x2E683400,
-	0x2E675AC0, 0x2E668180, 0x2E65A840,
-	0x2E64CF00, 0x2E63F5C0, 0x2E631C80,
-	0x2E624340, 0x2E616A00, 0x2E6090C0,
-	0x2E5FB780, 0x2E5EDE40, 0x2E5E0500,
-	0x2E5D2BC0, 0x2E5C5280, 0x2E5B7940,
-	0x2E5AA000, 0x2E59C6C0, 0x2E58ED80,
-	0x2E581440, 0x2E573B00, 0x2E5661C0,
-	0x2E558880, 0x2E54AF40, 0x2E53D600,
-	0x2E52FCC0, 0x2E522380, 0x2E514A40,
-	0x2E507100, 0x2E4F97C0, 0x2E4EBE80,
-	0x2E4DE540, 0x2E4D0C00, 0x2E4C32C0,
-	0x2E4B5980, 0x2E4A8040, 0x2E49A700,
-	0x2E48CDC0, 0x2E47F480, 0x2E471B40,
-	0x2E464200, 0x2E4568C0, 0x2E448F80,
-	0x2E43B640, 0x2E42DD00, 0x2E4203C0,
-	0x2E412A80, 0x2E405140, 0x2E3F7800,
-	0x2E3E9EC0, 0x2E3DC580, 0x2E3CEC40,
-	0x2E3C1300, 0x2E3B39C0, 0x2E3A6080,
-	0x2E398740, 0x2E38AE00, 0x2E37D4C0,
-	0x2E36FB80, 0x2E362240, 0x2E354900,
-	0x2E346FC0, 0x2E339680, 0x2E32BD40,
-	0x2E31E400, 0x2E310AC0, 0x2E303180,
-	0x2E2F5840, 0x2E2E7F00, 0x2E2DA5C0,
-	0x2E2CCC80, 0x2E2BF340, 0x2E2B1A00,
-	0x2E2A40C0, 0x2E296780, 0x2E288E40,
-	0x2E27B500, 0x2E26DBC0, 0x2E260280,
-	0x2E252940, 0x2E245000, 0x2E2376C0,
-	0x2E229D80, 0x2E21C440, 0x2E20EB00,
-	0x2E2011C0, 0x2E1F3880, 0x2E1E5F40,
-	0x2E1D8600, 0x2E1CACC0, 0x2E1BD380,
-	0x2E1AFA40, 0x2E1A2100, 0x2E1947C0,
-	0x2E186E80, 0x2E179540, 0x2E16BC00,
-	0x2E15E2C0, 0x2E150980, 0x2E143040,
-	0x2E135700, 0x2E127DC0, 0x2E11A480,
-	0x2E10CB40, 0x2E0FF200, 0x2E0F18C0,
-	0x2E0E3F80, 0x2E0D6640, 0x2E0C8D00,
-	0x2E0BB3C0, 0x2E0ADA80, 0x2E0A0140,
-	0x2E092800, 0x2E084EC0, 0x2E077580,
-	0x2E069C40, 0x2E05C300, 0x2E04E9C0,
-	0x2E041080, 0x2E033740, 0x2E025E00,
-	0x2E0184C0, 0x2E00AB80, 0x2DFFD240,
-	0x2DFEF900, 0x2DFE1FC0, 0x2DFD4680,
-	0x2DFC6D40, 0x2DFB9400, 0x2DFABAC0,
-	0x2DF9E180, 0x2DF90840, 0x2DF82F00,
-	0x2DF755C0, 0x2DF67C80, 0x2DF5A340,
-	0x2DF4CA00, 0x2DF3F0C0, 0x2DF31780,
-	0x2DF23E40, 0x2DF16500, 0x2DF08BC0,
-	0x2DEFB280, 0x2DEED940, 0x2DF00000,
-	0x2DEF3480, 0x2DEE6900, 0x2DED9D80,
-	0x2DECD200, 0x2DEC0680, 0x2DEB3B00,
-	0x2DEA6F80, 0x2DE9A400, 0x2DE8D880,
-	0x2DE80D00, 0x2DE74180, 0x2DE67600,
-	0x2DE5AA80, 0x2DE4DF00, 0x2DE41380,
-	0x2DE34800, 0x2DE27C80, 0x2DE1B100,
-	0x2DE0E580, 0x2DE01A00, 0x2DDF4E80,
-	0x2DDE8300, 0x2DDDB780, 0x2DDCEC00,
-	0x2DDC2080, 0x2DDB5500, 0x2DDA8980,
-	0x2DD9BE00, 0x2DD8F280, 0x2DD82700,
-	0x2DD75B80, 0x2DD69000, 0x2DD5C480,
-	0x2DD4F900, 0x2DD42D80, 0x2DD36200,
-	0x2DD29680, 0x2DD1CB00, 0x2DD0FF80,
-	0x2DD03400, 0x2DCF6880, 0x2DCE9D00,
-	0x2DCDD180, 0x2DCD0600, 0x2DCC3A80,
-	0x2DCB6F00, 0x2DCAA380, 0x2DC9D800,
-	0x2DC90C80, 0x2DC84100, 0x2DC77580,
-	0x2DC6AA00, 0x2DC5DE80, 0x2DC51300,
-	0x2DC44780, 0x2DC37C00, 0x2DC2B080,
-	0x2DC1E500, 0x2DC11980, 0x2DC04E00,
-	0x2DBF8280, 0x2DBEB700, 0x2DBDEB80,
-	0x2DBD2000, 0x2DBC5480, 0x2DBB8900,
-	0x2DBABD80, 0x2DB9F200, 0x2DB92680,
-	0x2DB85B00, 0x2DB78F80, 0x2DB6C400,
-	0x2DB5F880, 0x2DB52D00, 0x2DB46180,
-	0x2DB39600, 0x2DB2CA80, 0x2DB1FF00,
-	0x2DB13380, 0x2DB06800, 0x2DAF9C80,
-	0x2DAED100, 0x2DAE0580, 0x2DAD3A00,
-	0x2DAC6E80, 0x2DABA300, 0x2DAAD780,
-	0x2DAA0C00, 0x2DA94080, 0x2DA87500,
-	0x2DA7A980, 0x2DA6DE00, 0x2DA61280,
-	0x2DA54700, 0x2DA47B80, 0x2DA3B000,
-	0x2DA2E480, 0x2DA21900, 0x2DA14D80,
-	0x2DA08200, 0x2D9FB680, 0x2D9EEB00,
-	0x2D9E1F80, 0x2D9D5400, 0x2D9C8880,
-	0x2D9BBD00, 0x2D9AF180, 0x2D9A2600,
-	0x2D995A80, 0x2D988F00, 0x2D97C380,
-	0x2D96F800, 0x2D962C80, 0x2D956100,
-	0x2D949580, 0x2D93CA00, 0x2D92FE80,
-	0x2D923300, 0x2D916780, 0x2D909C00,
-	0x2D8FD080, 0x2D8F0500, 0x2D8E3980,
-	0x2D8D6E00, 0x2D8CA280, 0x2D8BD700,
-	0x2D8B0B80, 0x2D8A4000, 0x2D897480,
-	0x2D88A900, 0x2D87DD80, 0x2D871200,
-	0x2D864680, 0x2D857B00, 0x2D84AF80,
-	0x2D83E400, 0x2D831880, 0x2D824D00,
-	0x2D818180, 0x2D80B600, 0x2D7FEA80,
-	0x2D7F1F00, 0x2D7E5380, 0x2D7D8800,
-	0x2D7CBC80, 0x2D7BF100, 0x2D7B2580,
-	0x2D7A5A00, 0x2D798E80, 0x2D78C300,
-	0x2D77F780, 0x2D772C00, 0x2D766080,
-	0x2D759500, 0x2D74C980, 0x2D73FE00,
-	0x2D733280, 0x2D726700, 0x2D719B80,
-	0x2D70D000, 0x2D700480, 0x2D6F3900,
-	0x2D6E6D80, 0x2D6DA200, 0x2D6CD680,
-	0x2D6C0B00, 0x2D6B3F80, 0x2D6A7400,
-	0x2D69A880, 0x2D68DD00, 0x2D681180,
-	0x2D674600, 0x2D667A80, 0x2D65AF00,
-	0x2D64E380, 0x2D641800, 0x2D634C80,
-	0x2D628100, 0x2D61B580, 0x2D60EA00,
-	0x2D601E80, 0x2D5F5300, 0x2D5E8780,
-	0x2D5DBC00, 0x2D5CF080, 0x2D5C2500,
-	0x2D5B5980, 0x2D5A8E00, 0x2D59C280,
-	0x2D58F700, 0x2D582B80, 0x2D576000,
-	0x2D569480, 0x2D55C900, 0x2D54FD80,
-	0x2D543200, 0x2D536680, 0x2D529B00,
-	0x2D51CF80, 0x2D510400, 0x2D503880,
-	0x2D4F6D00, 0x2D4EA180, 0x2D4DD600,
-	0x2D4D0A80, 0x2D4C3F00, 0x2D4B7380,
-	0x2D4AA800, 0x2D49DC80, 0x2D491100,
-	0x2D484580, 0x2D477A00, 0x2D46AE80,
-	0x2D45E300, 0x2D451780, 0x2D444C00,
-	0x2D438080, 0x2D42B500, 0x2D41E980,
-	0x2D411E00, 0x2D405280, 0x2D3F8700,
-	0x2D3EBB80, 0x2D3DF000, 0x2D3D2480,
-	0x2D3C5900, 0x2D3B8D80, 0x2D3AC200,
-	0x2D39F680, 0x2D392B00, 0x2D385F80,
-	0x2D379400, 0x2D36C880, 0x2D35FD00,
-	0x2D353180, 0x2D346600, 0x2D339A80,
-	0x2D32CF00, 0x2D320380, 0x2D313800,
-	0x2D306C80, 0x2D2FA100, 0x2D2ED580,
-	0x2D2E0A00, 0x2D2D3E80, 0x2D2C7300,
-	0x2D2BA780, 0x2D2ADC00, 0x2D2A1080,
-	0x2D294500, 0x2D287980, 0x2D27AE00,
-	0x2D26E280, 0x2D261700, 0x2D254B80,
-	0x2D248000, 0x2D23B480, 0x2D22E900,
-	0x2D221D80, 0x2D215200, 0x2D208680,
-	0x2D1FBB00, 0x2D1EEF80, 0x2D1E2400,
-	0x2D1D5880, 0x2D1C8D00, 0x2D1BC180,
-	0x2D1AF600, 0x2D1A2A80, 0x2D195F00,
-	0x2D189380, 0x2D17C800, 0x2D16FC80,
-	0x2D163100, 0x2D156580, 0x2D149A00,
-	0x2D13CE80, 0x2D130300, 0x2D123780,
-	0x2D116C00, 0x2D10A080, 0x2D0FD500,
-	0x2D0F0980, 0x2D0E3E00, 0x2D0D7280,
-	0x2D0CA700, 0x2D0BDB80, 0x2D0B1000,
-	0x2D0A4480, 0x2D097900, 0x2D08AD80,
-	0x2D07E200, 0x2D071680, 0x2D064B00,
-	0x2D057F80, 0x2D04B400, 0x2D03E880,
-	0x2D031D00, 0x2D025180, 0x2D018600,
-	0x2D00BA80, 0x2CFFEF00, 0x2CFF2380,
-	0x2CFE5800, 0x2CFD8C80, 0x2CFCC100,
-	0x2CFBF580, 0x2CFB2A00, 0x2CFA5E80,
-	0x2CF99300, 0x2CF8C780, 0x2CF7FC00,
-	0x2CF73080, 0x2CF66500, 0x2CF59980,
-	0x2CF4CE00, 0x2CF40280, 0x2CF33700,
-	0x2CF26B80, 0x2CF1A000, 0x2CF0D480,
-	0x2CF00900, 0x2CEF3D80, 0x2CEE7200,
-	0x2CEDA680, 0x2CECDB00, 0x2CEC0F80,
-	0x2CEB4400, 0x2CEA7880, 0x2CE9AD00,
-	0x2CE8E180, 0x2CE81600, 0x2CE74A80,
-	0x2CE67F00, 0x2CE5B380, 0x2CE4E800,
-	0x2CE41C80, 0x2CE35100, 0x2CE28580,
-	0x2CE1BA00, 0x2CE0EE80, 0x2CE02300,
-	0x2CDF5780, 0x2CDE8C00, 0x2CDDC080,
-	0x2CDCF500, 0x2CDC2980, 0x2CDB5E00,
-	0x2CDA9280, 0x2CD9C700, 0x2CD8FB80,
-	0x2CD83000, 0x2CD76480, 0x2CD69900,
-	0x2CD5CD80, 0x2CD50200, 0x2CD43680,
-	0x2CD36B00, 0x2CD29F80, 0x2CD1D400,
-	0x2CD10880, 0x2CD03D00, 0x2CCF7180,
-	0x2CCEA600, 0x2CCDDA80, 0x2CCD0F00,
-	0x2CCC4380, 0x2CCB7800, 0x2CCAAC80,
-	0x2CC9E100, 0x2CC91580, 0x2CC84A00,
-	0x2CC77E80, 0x2CC6B300, 0x2CC5E780,
-	0x2CC51C00, 0x2CC45080, 0x2CC38500,
-	0x2CC2B980, 0x2CC1EE00, 0x2CC12280,
-	0x2CC05700, 0x2CBF8B80, 0x2CBEC000,
-	0x2CBDF480, 0x2CBD2900, 0x2CBC5D80,
-	0x2CBB9200, 0x2CBAC680, 0x2CB9FB00,
-	0x2CB92F80, 0x2CB86400, 0x2CB79880,
-	0x2CB6CD00, 0x2CB60180, 0x2CB53600,
-	0x2CB46A80, 0x2CB39F00, 0x2CB2D380,
-	0x2CB20800, 0x2CB13C80, 0x2CB07100,
-	0x2CAFA580, 0x2CAEDA00, 0x2CAE0E80,
-	0x2CAD4300, 0x2CAC7780, 0x2CABAC00,
-	0x2CAAE080, 0x2CAA1500, 0x2CA94980,
-	0x2CA87E00, 0x2CA7B280, 0x2CA6E700,
-	0x2CA61B80, 0x2CA55000, 0x2CA48480,
-	0x2CA3B900, 0x2CA2ED80, 0x2CA22200,
-	0x2CA15680, 0x2CA08B00, 0x2C9FBF80,
-	0x2C9EF400, 0x2C9E2880, 0x2C9D5D00,
-	0x2C9C9180, 0x2C9BC600, 0x2C9AFA80,
-	0x2C9A2F00, 0x2C996380, 0x2C989800,
-	0x2C97CC80, 0x2C970100, 0x2C963580,
-	0x2C956A00, 0x2C949E80, 0x2C93D300,
-	0x2C930780, 0x2C923C00, 0x2C917080,
-	0x2C90A500, 0x2C8FD980, 0x2C8F0E00,
-	0x2C8E4280, 0x2C8D7700, 0x2C8CAB80,
-	0x2C8BE000, 0x2C8B1480, 0x2C8A4900,
-	0x2C897D80, 0x2C88B200, 0x2C87E680,
-	0x2C871B00, 0x2C864F80, 0x2C858400,
-	0x2C84B880, 0x2C83ED00, 0x2C832180,
-	0x2C825600, 0x2C818A80, 0x2C80BF00,
-	0x2C7FF380, 0x2C7F2800, 0x2C7E5C80,
-	0x2C7D9100, 0x2C7CC580, 0x2C7BFA00,
-	0x2C7B2E80, 0x2C7A6300, 0x2C799780,
-	0x2C78CC00, 0x2C780080, 0x2C773500,
-	0x2C766980, 0x2C759E00, 0x2C74D280,
-	0x2C740700, 0x2C733B80, 0x2C727000,
-	0x2C71A480, 0x2C70D900, 0x2C700D80,
-	0x2C6F4200, 0x2C6E7680, 0x2C6DAB00,
-	0x2C6CDF80, 0x2C6C1400, 0x2C6B4880,
-	0x2C6A7D00, 0x2C69B180, 0x2C68E600,
-	0x2C681A80, 0x2C674F00, 0x2C668380,
-	0x2C65B800, 0x2C64EC80, 0x2C642100,
-	0x2C635580, 0x2C628A00, 0x2C61BE80,
-	0x2C60F300, 0x2C602780, 0x2C5F5C00,
-	0x2C5E9080, 0x2C5DC500, 0x2C5CF980,
-	0x2C5C2E00, 0x2C5B6280, 0x2C5A9700,
-	0x2C59CB80, 0x2C590000, 0x2C583480,
-	0x2C576900, 0x2C569D80, 0x2C55D200,
-	0x2C550680, 0x2C543B00, 0x2C536F80,
-	0x2C52A400, 0x2C51D880, 0x2C510D00,
-	0x2C504180, 0x2C4F7600, 0x2C4EAA80,
-	0x2C4DDF00, 0x2C4D1380, 0x2C4C4800,
-	0x2C4B7C80, 0x2C4AB100, 0x2C49E580,
-	0x2C491A00, 0x2C484E80, 0x2C478300,
-	0x2C46B780, 0x2C45EC00, 0x2C452080,
-	0x2C445500, 0x2C438980, 0x2C42BE00,
-	0x2C41F280, 0x2C412700, 0x2C405B80,
-	0x2C3F9000, 0x2C3EC480, 0x2C3DF900,
-	0x2C3D2D80, 0x2C3C6200, 0x2C3B9680,
-	0x2C3ACB00, 0x2C39FF80, 0x2C393400,
-	0x2C386880, 0x2C379D00, 0x2C36D180,
-	0x2C360600, 0x2C353A80, 0x2C346F00,
-	0x2C33A380, 0x2C32D800, 0x2C320C80,
-	0x2C314100, 0x2C307580, 0x2C2FAA00,
-	0x2C2EDE80, 0x2C2E1300, 0x2C2D4780,
-	0x2C2C7C00, 0x2C2BB080, 0x2C2AE500,
-	0x2C2A1980, 0x2C294E00, 0x2C288280,
-	0x2C27B700, 0x2C26EB80, 0x2C262000,
-	0x2C255480, 0x2C248900, 0x2C23BD80,
-	0x2C22F200, 0x2C222680, 0x2C215B00,
-	0x2C208F80, 0x2C1FC400, 0x2C1EF880,
-	0x2C1E2D00, 0x2C1D6180, 0x2C1C9600,
-	0x2C1BCA80, 0x2C1AFF00, 0x2C1A3380,
-	0x2C196800, 0x2C189C80, 0x2C17D100,
-	0x2C170580, 0x2C163A00, 0x2C156E80,
-	0x2C14A300, 0x2C13D780, 0x2C130C00,
-	0x2C124080, 0x2C117500, 0x2C10A980,
-	0x2C0FDE00, 0x2C0F1280, 0x2C0E4700,
-	0x2C0D7B80, 0x2C0CB000, 0x2C0BE480,
-	0x2C0B1900, 0x2C0A4D80, 0x2C098200,
-	0x2C08B680, 0x2C07EB00, 0x2C071F80,
-	0x2C065400, 0x2C058880, 0x2C04BD00,
-	0x2C03F180, 0x2C032600, 0x2C025A80,
-	0x2C018F00, 0x2C00C380, 0x2BFFF800,
-	0x2BFF2C80, 0x2BFE6100, 0x2BFD9580,
-	0x2BFCCA00, 0x2BFBFE80, 0x2BFB3300,
-	0x2BFA6780, 0x2BF99C00, 0x2BF8D080,
-	0x2BF80500, 0x2BF73980, 0x2BF66E00,
-	0x2BF5A280, 0x2BF4D700, 0x2BF40B80,
-	0x2BF34000, 0x2BF27480, 0x2BF1A900,
-	0x2BF0DD80, 0x2BF01200, 0x2BEF4680,
-	0x2BEE7B00, 0x2BEDAF80, 0x2BECE400,
-	0x2BEC1880, 0x2BEB4D00, 0x2BEA8180,
-	0x2BE9B600, 0x2BE8EA80, 0x2BE81F00,
-	0x2BE75380, 0x2BE68800, 0x2BE5BC80,
-	0x2BE4F100, 0x2BE42580, 0x2BE35A00,
-	0x2BE28E80, 0x2BE1C300, 0x2BE0F780,
-	0x2BE02C00, 0x2BDF6080, 0x2BDE9500,
-	0x2BDDC980, 0x2BDCFE00, 0x2BDC3280,
-	0x2BDB6700, 0x2BDA9B80, 0x2BD9D000,
-	0x2BD90480, 0x2BD83900, 0x2BD76D80,
-	0x2BD6A200, 0x2BD5D680, 0x2BD50B00,
-	0x2BD43F80, 0x2BD37400, 0x2BD2A880,
-	0x2BD1DD00, 0x2BD11180, 0x2BD04600,
-	0x2BCF7A80, 0x2BCEAF00, 0x2BCDE380,
-	0x2BCD1800, 0x2BCC4C80, 0x2BCB8100,
-	0x2BCAB580, 0x2BC9EA00, 0x2BC91E80,
-	0x2BC85300, 0x2BC78780, 0x2BC6BC00,
-	0x2BC5F080, 0x2BC52500, 0x2BC45980,
-	0x2BC38E00, 0x2BC2C280, 0x2BC1F700,
-	0x2BC12B80, 0x2BC06000, 0x2BBF9480,
-	0x2BBEC900, 0x2BBDFD80, 0x2BBD3200,
-	0x2BBC6680, 0x2BBB9B00, 0x2BBACF80,
-	0x2BBA0400, 0x2BB93880, 0x2BB86D00,
-	0x2BB7A180, 0x2BB6D600, 0x2BB60A80,
-	0x2BB53F00, 0x2BB47380, 0x2BB3A800,
-	0x2BB2DC80, 0x2BB21100, 0x2BB14580,
-	0x2BB07A00, 0x2BAFAE80, 0x2BAEE300,
-	0x2BAE1780, 0x2BAD4C00, 0x2BAC8080,
-	0x2BABB500, 0x2BAAE980, 0x2BAA1E00,
-	0x2BA95280, 0x2BA88700, 0x2BA7BB80,
-	0x2BA6F000, 0x2BA62480, 0x2BA55900,
-	0x2BA48D80, 0x2BA3C200, 0x2BA2F680,
-	0x2BA22B00, 0x2BA15F80, 0x2BA09400,
-	0x2B9FC880, 0x2B9EFD00, 0x2B9E3180,
-	0x2B9D6600, 0x2B9C9A80, 0x2B9BCF00,
-	0x2B9B0380, 0x2B9A3800, 0x2B996C80,
-	0x2B98A100, 0x2B97D580, 0x2B970A00,
-	0x2B963E80, 0x2B957300, 0x2B94A780,
-	0x2B93DC00, 0x2B931080, 0x2B924500,
-	0x2B917980, 0x2B90AE00, 0x2B8FE280,
-	0x2B8F1700, 0x2B8E4B80, 0x2B8D8000,
-	0x2B8CB480, 0x2B8BE900, 0x2B8B1D80,
-	0x2B8A5200, 0x2B898680, 0x2B88BB00,
-	0x2B87EF80, 0x2B872400, 0x2B865880,
-	0x2B858D00, 0x2B84C180, 0x2B83F600,
-	0x2B832A80, 0x2B825F00, 0x2B819380,
-	0x2B80C800, 0x2B7FFC80, 0x2B7F3100,
-	0x2B7E6580, 0x2B7D9A00, 0x2B7CCE80,
-	0x2B7C0300, 0x2B7B3780, 0x2B7A6C00,
-	0x2B79A080, 0x2B78D500, 0x2B780980,
-	0x2B773E00, 0x2B767280, 0x2B75A700,
-	0x2B74DB80, 0x2B741000, 0x2B734480,
-	0x2B727900, 0x2B71AD80, 0x2B70E200,
-	0x2B701680, 0x2B6F4B00, 0x2B6E7F80,
-	0x2B6DB400, 0x2B6CE880, 0x2B6C1D00,
-	0x2B6B5180, 0x2B6A8600, 0x2B69BA80,
-	0x2B68EF00, 0x2B682380, 0x2B675800,
-	0x2B668C80, 0x2B65C100, 0x2B64F580,
-	0x2B642A00, 0x2B635E80, 0x2B629300,
-	0x2B61C780, 0x2B60FC00, 0x2B603080,
-	0x2B5F6500, 0x2B5E9980, 0x2B5DCE00,
-	0x2B5D0280, 0x2B5C3700, 0x2B5B6B80,
-	0x2B5AA000, 0x2B59D480, 0x2B590900,
-	0x2B583D80, 0x2B577200, 0x2B56A680,
-	0x2B55DB00, 0x2B550F80, 0x2B544400,
-	0x2B537880, 0x2B52AD00, 0x2B51E180,
-	0x2B511600, 0x2B504A80, 0x2B4F7F00,
-	0x2B4EB380, 0x2B4DE800, 0x2B4D1C80,
-	0x2B4C5100, 0x2B4B8580, 0x2B4ABA00,
-	0x2B49EE80, 0x2B492300, 0x2B485780,
-	0x2B478C00, 0x2B46C080, 0x2B45F500,
-	0x2B452980, 0x2B445E00, 0x2B439280,
-	0x2B42C700, 0x2B41FB80, 0x2B413000,
-	0x2B406480, 0x2B3F9900, 0x2B3ECD80,
-	0x2B3E0200, 0x2B3D3680, 0x2B3C6B00,
-	0x2B3B9F80, 0x2B3AD400, 0x2B3A0880,
-	0x2B393D00, 0x2B387180, 0x2B37A600,
-	0x2B36DA80, 0x2B360F00, 0x2B354380,
-	0x2B347800, 0x2B33AC80, 0x2B32E100,
-	0x2B321580, 0x2B314A00, 0x2B307E80,
-	0x2B2FB300, 0x2B2EE780, 0x2B2E1C00,
-	0x2B2D5080, 0x2B2C8500, 0x2B2BB980,
-	0x2B2AEE00, 0x2B2A2280, 0x2B295700,
-	0x2B288B80, 0x2B27C000, 0x2B26F480,
-	0x2B262900, 0x2B255D80, 0x2B249200,
-	0x2B23C680, 0x2B22FB00, 0x2B222F80,
-	0x2B216400, 0x2B209880, 0x2B1FCD00,
-	0x2B1F0180, 0x2B1E3600, 0x2B1D6A80,
-	0x2B1C9F00, 0x2B1BD380, 0x2B1B0800,
-	0x2B1A3C80, 0x2B197100, 0x2B18A580,
-	0x2B17DA00, 0x2B170E80, 0x2B164300,
-	0x2B157780, 0x2B14AC00, 0x2B13E080,
-	0x2B131500, 0x2B124980, 0x2B117E00,
-	0x2B10B280, 0x2B0FE700, 0x2B0F1B80,
-	0x2B0E5000, 0x2B0D8480, 0x2B0CB900,
-	0x2B0BED80, 0x2B0B2200, 0x2B0A5680,
-	0x2B098B00, 0x2B08BF80, 0x2B07F400,
-	0x2B072880, 0x2B065D00, 0x2B059180,
-	0x2B04C600, 0x2B03FA80, 0x2B032F00,
-	0x2B026380, 0x2B019800, 0x2B00CC80,
-	0x2B000100, 0x2AFF3580, 0x2AFE6A00,
-	0x2AFD9E80, 0x2AFCD300, 0x2AFC0780,
-	0x2AFB3C00, 0x2AFA7080, 0x2AF9A500,
-	0x2AF8D980, 0x2AF80E00, 0x2AF74280,
-	0x2AF67700, 0x2AF5AB80, 0x2AF4E000,
-	0x2AF41480, 0x2AF34900, 0x2AF27D80,
-	0x2AF1B200, 0x2AF0E680, 0x2AF01B00,
-	0x2AEF4F80, 0x2AEE8400, 0x2AEDB880,
-	0x2AECED00, 0x2AEC2180, 0x2AEB5600,
-	0x2AEA8A80, 0x2AE9BF00, 0x2AE8F380,
-	0x2AE82800, 0x2AE75C80, 0x2AE69100,
-	0x2AE5C580, 0x2AE4FA00, 0x2AE42E80,
-	0x2AE36300, 0x2AE29780, 0x2AE1CC00,
-	0x2AE10080, 0x2AE03500, 0x2ADF6980,
-	0x2ADE9E00, 0x2ADDD280, 0x2ADD0700,
-	0x2ADC3B80, 0x2ADB7000, 0x2ADAA480,
-	0x2AD9D900, 0x2AD90D80, 0x2AD84200,
-	0x2AD77680, 0x2AD6AB00, 0x2AD5DF80,
-	0x2AD51400, 0x2AD44880, 0x2AD37D00,
-	0x2AD2B180, 0x2AD1E600, 0x2AD11A80,
-	0x2AD04F00, 0x2ACF8380, 0x2ACEB800,
-	0x2ACDEC80, 0x2ACD2100, 0x2ACC5580,
-	0x2ACB8A00, 0x2ACABE80, 0x2AC9F300,
-	0x2AC92780, 0x2AC85C00, 0x2AC79080,
-	0x2AC6C500, 0x2AC5F980, 0x2AC52E00,
-	0x2AC46280, 0x2AC39700, 0x2AC2CB80,
-	0x2AC20000, 0x2AC13480, 0x2AC06900,
-	0x2ABF9D80, 0x2ABED200, 0x2ABE0680,
-	0x2ABD3B00, 0x2ABC6F80, 0x2ABBA400,
-	0x2ABAD880, 0x2ABA0D00, 0x2AB94180,
-	0x2AB87600, 0x2AB7AA80, 0x2AB6DF00,
-	0x2AB61380, 0x2AB54800, 0x2AB47C80,
-	0x2AB3B100, 0x2AB2E580, 0x2AB21A00,
-	0x2AB14E80, 0x2AB08300, 0x2AAFB780,
-	0x2AAEEC00, 0x2AAE2080, 0x2AAD5500,
-	0x2AAC8980, 0x2AABBE00, 0x2AAAF280,
-	0x2AAA2700, 0x2AA95B80, 0x2AA89000,
-	0x2AA7C480, 0x2AA6F900, 0x2AA62D80,
-	0x2AA56200, 0x2AA49680, 0x2AA3CB00,
-	0x2AA2FF80, 0x2AA23400, 0x2AA16880,
-	0x2AA09D00, 0x2A9FD180, 0x2A9F0600,
-	0x2A9E3A80, 0x2A9D6F00, 0x2A9CA380,
-	0x2A9BD800, 0x2A9B0C80, 0x2A9A4100,
-	0x2A997580, 0x2A98AA00, 0x2A97DE80,
-	0x2A971300, 0x2A964780, 0x2A957C00,
-	0x2A94B080, 0x2A93E500, 0x2A931980,
-	0x2A924E00, 0x2A918280, 0x2A90B700,
-	0x2A8FEB80, 0x2A8F2000, 0x2A8E5480,
-	0x2A8D8900, 0x2A8CBD80, 0x2A8BF200,
-	0x2A8B2680, 0x2A8A5B00, 0x2A898F80,
-	0x2A88C400, 0x2A87F880, 0x2A872D00,
-	0x2A866180, 0x2A859600, 0x2A84CA80,
-	0x2A83FF00, 0x2A833380, 0x2A826800,
-	0x2A819C80, 0x2A80D100, 0x2A800580,
-	0x2A7F3A00, 0x2A7E6E80, 0x2A7DA300,
-	0x2A7CD780, 0x2A7C0C00, 0x2A7B4080,
-	0x2A7A7500, 0x2A79A980, 0x2A78DE00,
-	0x2A781280, 0x2A774700, 0x2A767B80,
-	0x2A75B000, 0x2A74E480, 0x2A741900,
-	0x2A734D80, 0x2A728200, 0x2A71B680,
-	0x2A70EB00, 0x2A701F80, 0x2A6F5400,
-	0x2A6E8880, 0x2A6DBD00, 0x2A6CF180,
-	0x2A6C2600, 0x2A6B5A80, 0x2A6A8F00,
-	0x2A69C380, 0x2A68F800, 0x2A682C80,
-	0x2A676100, 0x2A669580, 0x2A65CA00,
-	0x2A64FE80, 0x2A643300, 0x2A636780,
-	0x2A629C00, 0x2A61D080, 0x2A610500,
-	0x2A603980, 0x2A5F6E00, 0x2A5EA280,
-	0x2A5DD700, 0x2A5D0B80, 0x2A5C4000,
-	0x2A5B7480, 0x2A5AA900, 0x2A59DD80,
-	0x2A591200, 0x2A584680, 0x2A577B00,
-	0x2A56AF80, 0x2A55E400, 0x2A551880,
-	0x2A544D00, 0x2A538180, 0x2A52B600,
-	0x2A51EA80, 0x2A511F00, 0x2A505380,
-	0x2A4F8800, 0x2A4EBC80, 0x2A4DF100,
-	0x2A4D2580, 0x2A4C5A00, 0x2A4B8E80,
-	0x2A4AC300, 0x2A49F780, 0x2A492C00,
-	0x2A486080, 0x2A479500, 0x2A46C980,
-	0x2A45FE00, 0x2A453280, 0x2A446700,
-	0x2A439B80, 0x2A42D000, 0x2A420480,
-	0x2A413900, 0x2A406D80, 0x2A3FA200,
-	0x2A3ED680, 0x2A3E0B00, 0x2A3D3F80,
-	0x2A3C7400, 0x2A3BA880, 0x2A3ADD00,
-	0x2A3A1180, 0x2A394600, 0x2A387A80,
-	0x2A37AF00, 0x2A36E380, 0x2A361800,
-	0x2A354C80, 0x2A348100, 0x2A33B580,
-	0x2A32EA00, 0x2A321E80, 0x2A315300,
-	0x2A308780, 0x2A2FBC00, 0x2A2EF080,
-	0x2A2E2500, 0x2A2D5980, 0x2A2C8E00,
-	0x2A2BC280, 0x2A2AF700, 0x2A2A2B80,
-	0x2A296000, 0x2A289480, 0x2A27C900,
-	0x2A26FD80, 0x2A263200, 0x2A256680,
-	0x2A249B00, 0x2A23CF80, 0x2A230400,
-	0x2A223880, 0x2A216D00, 0x2A20A180,
-	0x2A1FD600, 0x2A1F0A80, 0x2A1E3F00,
-	0x2A1D7380, 0x2A1CA800, 0x2A1BDC80,
-	0x2A1B1100, 0x2A1A4580, 0x2A197A00,
-	0x2A18AE80, 0x2A17E300, 0x2A171780,
-	0x2A164C00, 0x2A158080, 0x2A14B500,
-	0x2A13E980, 0x2A131E00, 0x2A125280,
-	0x2A118700, 0x2A10BB80, 0x2A0FF000,
-	0x2A0F2480, 0x2A0E5900, 0x2A0D8D80,
-	0x2A0CC200, 0x2A0BF680, 0x2A0B2B00,
-	0x2A0A5F80, 0x2A099400, 0x2A08C880,
-	0x2A07FD00, 0x2A073180, 0x2A066600,
-	0x2A059A80, 0x2A04CF00, 0x2A040380,
-	0x2A033800, 0x2A026C80, 0x2A01A100,
-	0x2A00D580, 0x2A000A00, 0x29FF3E80,
-	0x29FE7300, 0x29FDA780, 0x29FCDC00,
-	0x29FC1080, 0x29FB4500, 0x29FA7980,
-	0x29F9AE00, 0x29F8E280, 0x29F81700,
-	0x29F74B80, 0x29F68000, 0x29F5B480,
-	0x29F4E900, 0x29F41D80, 0x29F35200,
-	0x29F28680, 0x29F1BB00, 0x29F0EF80,
-	0x29F02400, 0x29EF5880, 0x29EE8D00,
-	0x29EDC180, 0x29ECF600, 0x29EC2A80,
-	0x29EB5F00, 0x29EA9380, 0x29E9C800,
-	0x29E8FC80, 0x29E83100, 0x29E76580,
-	0x29E69A00, 0x29E5CE80, 0x29E50300,
-	0x29E43780, 0x29E36C00, 0x29E2A080,
-	0x29E1D500, 0x29E10980, 0x29E03E00,
-	0x29DF7280, 0x29DEA700, 0x29DDDB80,
-	0x29DD1000, 0x29DC4480, 0x29DB7900,
-	0x29DAAD80, 0x29D9E200, 0x29D91680,
-	0x29D84B00, 0x29D77F80, 0x29D6B400,
-	0x29D5E880, 0x29D51D00, 0x29D45180,
-	0x29D38600, 0x29D2BA80, 0x29D1EF00,
-	0x29D12380, 0x29D05800, 0x29CF8C80,
-	0x29CEC100, 0x29CDF580, 0x29CD2A00,
-	0x29CC5E80, 0x29CB9300, 0x29CAC780,
-	0x29C9FC00, 0x29C93080, 0x29C86500,
-	0x29C79980, 0x29C6CE00, 0x29C60280,
-	0x29C53700, 0x29C46B80, 0x29C3A000,
-	0x29C2D480, 0x29C20900, 0x29C13D80,
-	0x29C07200, 0x29BFA680, 0x29BEDB00,
-	0x29BE0F80, 0x29BD4400, 0x29BC7880,
-	0x29BBAD00, 0x29BAE180, 0x29BA1600,
-	0x29B94A80, 0x29B87F00, 0x29B7B380,
-	0x29B6E800, 0x29B61C80, 0x29B55100,
-	0x29B48580, 0x29B3BA00, 0x29B2EE80,
-	0x29B22300, 0x29B15780, 0x29B08C00,
-	0x29AFC080, 0x29AEF500, 0x29AE2980,
-	0x29AD5E00, 0x29AC9280, 0x29ABC700,
-	0x29AAFB80, 0x29AA3000, 0x29A96480,
-	0x29A89900, 0x29A7CD80, 0x29A70200,
-	0x29A63680, 0x29A56B00, 0x29A49F80,
-	0x29A3D400, 0x29A30880, 0x29A23D00,
-	0x29A17180, 0x29A0A600, 0x299FDA80,
-	0x299F0F00, 0x299E4380, 0x299D7800,
-	0x299CAC80, 0x299BE100, 0x299B1580,
-	0x299A4A00, 0x29997E80, 0x2998B300,
-	0x2997E780, 0x29971C00, 0x29965080,
-	0x29958500, 0x2994B980, 0x2993EE00,
-	0x29932280, 0x29925700, 0x29918B80,
-	0x2990C000, 0x298FF480, 0x298F2900,
-	0x298E5D80, 0x298D9200, 0x298CC680,
-	0x298BFB00, 0x298B2F80, 0x298A6400,
-	0x29899880, 0x2988CD00, 0x29880180,
-	0x29873600, 0x29866A80, 0x29859F00,
-	0x2984D380, 0x29840800, 0x29833C80,
-	0x29827100, 0x2981A580, 0x2980DA00,
-	0x29800E80, 0x297F4300, 0x297E7780,
-	0x297DAC00, 0x297CE080, 0x297C1500,
-	0x297B4980, 0x297A7E00, 0x2979B280,
-	0x2978E700, 0x29781B80, 0x29775000,
-	0x29768480, 0x2975B900, 0x2974ED80,
-	0x29742200, 0x29735680, 0x29728B00,
-	0x2971BF80, 0x2970F400, 0x29702880,
-	0x296F5D00, 0x296E9180, 0x296DC600,
-	0x296CFA80, 0x296C2F00, 0x296B6380,
-	0x296A9800, 0x2969CC80, 0x29690100,
-	0x29683580, 0x29676A00, 0x29669E80,
-	0x2965D300, 0x29650780, 0x29643C00,
-	0x29637080, 0x2962A500, 0x2961D980,
-	0x29610E00, 0x29604280, 0x295F7700,
-	0x295EAB80, 0x295DE000, 0x295D1480,
-	0x295C4900, 0x295B7D80, 0x295AB200,
-	0x2959E680, 0x29591B00, 0x29584F80,
-	0x29578400, 0x2956B880, 0x2955ED00,
-	0x29552180, 0x29545600, 0x29538A80,
-	0x2952BF00, 0x2951F380, 0x29512800,
-	0x29505C80, 0x294F9100, 0x294EC580,
-	0x294DFA00, 0x294D2E80, 0x294C6300,
-	0x294B9780, 0x294ACC00, 0x294A0080,
-	0x29493500, 0x29486980, 0x29479E00,
-	0x2946D280, 0x29460700, 0x29453B80,
-	0x29447000, 0x2943A480, 0x2942D900,
-	0x29420D80, 0x29414200, 0x29407680,
-	0x293FAB00, 0x293EDF80, 0x293E1400,
-	0x293D4880, 0x293C7D00, 0x293BB180,
-	0x293AE600, 0x293A1A80, 0x29394F00,
-	0x29388380, 0x2937B800, 0x2936EC80,
-	0x29362100, 0x29355580, 0x29348A00,
-	0x2933BE80, 0x2932F300, 0x29322780,
-	0x29315C00, 0x29309080, 0x292FC500,
-	0x292EF980, 0x292E2E00, 0x292D6280,
-	0x292C9700, 0x292BCB80, 0x292B0000,
-	0x292A3480, 0x29296900, 0x29289D80,
-	0x2927D200, 0x29270680, 0x29263B00,
-	0x29256F80, 0x2924A400, 0x2923D880,
-	0x29230D00, 0x29224180, 0x29217600,
-	0x2920AA80, 0x291FDF00, 0x291F1380,
-	0x291E4800, 0x291D7C80, 0x291CB100,
-	0x291BE580, 0x291B1A00, 0x291A4E80,
-	0x29198300, 0x2918B780, 0x2917EC00,
-	0x29172080, 0x29165500, 0x29158980,
-	0x2914BE00, 0x2913F280, 0x29132700,
-	0x29125B80, 0x29119000, 0x2910C480,
-	0x290FF900, 0x290F2D80, 0x290E6200,
-	0x290D9680, 0x290CCB00, 0x290BFF80,
-	0x290B3400, 0x290A6880, 0x29099D00,
-	0x2908D180, 0x29080600, 0x29073A80,
-	0x29066F00, 0x2905A380, 0x2904D800,
-	0x29040C80, 0x29034100, 0x29027580,
-	0x2901AA00, 0x2900DE80, 0x29001300,
-	0x28FF4780, 0x28FE7C00, 0x28FDB080,
-	0x28FCE500, 0x28FC1980, 0x28FB4E00,
-	0x28FA8280, 0x28F9B700, 0x28F8EB80,
-	0x28F82000, 0x28F75480, 0x28F68900,
-	0x28F5BD80, 0x28F4F200, 0x28F42680,
-	0x28F35B00, 0x28F28F80, 0x28F1C400,
-	0x28F0F880, 0x28F02D00, 0x28EF6180,
-	0x28EE9600, 0x28EDCA80, 0x28ECFF00,
-	0x28EC3380, 0x28EB6800, 0x28EA9C80,
-	0x28E9D100, 0x28E90580, 0x28E83A00,
-	0x28E76E80, 0x28E6A300, 0x28E5D780,
-	0x28E50C00, 0x28E44080, 0x28E37500,
-	0x28E2A980, 0x28E1DE00, 0x28E11280,
-	0x28E04700, 0x28DF7B80, 0x28DEB000,
-	0x28DDE480, 0x28DD1900, 0x28DC4D80,
-	0x28DB8200, 0x28DAB680, 0x28D9EB00,
-	0x28D91F80, 0x28D85400, 0x28D78880,
-	0x28D6BD00, 0x28D5F180, 0x28D52600,
-	0x28D45A80, 0x28D38F00, 0x28D2C380,
-	0x28D1F800, 0x28D12C80, 0x28D06100,
-	0x28CF9580, 0x28CECA00, 0x28CDFE80,
-	0x28CD3300, 0x28CC6780, 0x28CB9C00,
-	0x28CAD080, 0x28CA0500, 0x28C93980,
-	0x28C86E00, 0x28C7A280, 0x28C6D700,
-	0x28C60B80, 0x28C54000, 0x28C47480,
-	0x28C3A900, 0x28C2DD80, 0x28C21200,
-	0x28C14680, 0x28C07B00, 0x28BFAF80,
-	0x28BEE400, 0x28BE1880, 0x28BD4D00,
-	0x28BC8180, 0x28BBB600, 0x28BAEA80,
-	0x28BA1F00, 0x28B95380, 0x28B88800,
-	0x28B7BC80, 0x28B6F100, 0x28B62580,
-	0x28B55A00, 0x28B48E80, 0x28B3C300,
-	0x28B2F780, 0x28B22C00, 0x28B16080,
-	0x28B09500, 0x28AFC980, 0x28AEFE00,
-	0x28AE3280, 0x28AD6700, 0x28AC9B80,
-	0x28ABD000, 0x28AB0480, 0x28AA3900,
-	0x28A96D80, 0x28A8A200, 0x28A7D680,
-	0x28A70B00, 0x28A63F80, 0x28A57400,
-	0x28A4A880, 0x28A3DD00, 0x28A31180,
-	0x28A24600, 0x28A17A80, 0x28A0AF00,
-	0x289FE380, 0x289F1800, 0x289E4C80,
-	0x289D8100, 0x289CB580, 0x289BEA00,
-	0x289B1E80, 0x289A5300, 0x28998780,
-	0x2898BC00, 0x2897F080, 0x28972500,
-	0x28965980, 0x28958E00, 0x2894C280,
-	0x2893F700, 0x28932B80, 0x28926000,
-	0x28919480, 0x2890C900, 0x288FFD80,
-	0x288F3200, 0x288E6680, 0x288D9B00,
-	0x288CCF80, 0x288C0400, 0x288B3880,
-	0x288A6D00, 0x2889A180, 0x2888D600,
-	0x28880A80, 0x28873F00, 0x28867380,
-	0x2885A800, 0x2884DC80, 0x28841100,
-	0x28834580, 0x28827A00, 0x2881AE80,
-	0x2880E300, 0x28801780, 0x287F4C00,
-	0x287E8080, 0x287DB500, 0x287CE980,
-	0x287C1E00, 0x287B5280, 0x287A8700,
-	0x2879BB80, 0x2878F000, 0x28782480,
-	0x28775900, 0x28768D80, 0x2875C200,
-	0x2874F680, 0x28742B00, 0x28735F80,
-	0x28729400, 0x2871C880, 0x2870FD00,
-	0x28703180, 0x286F6600, 0x286E9A80,
-	0x286DCF00, 0x286D0380, 0x286C3800,
-	0x286B6C80, 0x286AA100, 0x2869D580,
-	0x28690A00, 0x28683E80, 0x28677300,
-	0x2866A780, 0x2865DC00, 0x28651080,
-	0x28644500, 0x28637980, 0x2862AE00,
-	0x2861E280, 0x28611700, 0x28604B80,
-	0x285F8000, 0x285EB480, 0x285DE900,
-	0x285D1D80, 0x285C5200, 0x285B8680,
-	0x285ABB00, 0x2859EF80, 0x28592400,
-	0x28585880, 0x28578D00, 0x2856C180,
-	0x2855F600, 0x28552A80, 0x28545F00,
-	0x28539380, 0x2852C800, 0x2851FC80,
-	0x28513100, 0x28506580, 0x284F9A00,
-	0x284ECE80, 0x284E0300, 0x284D3780,
-	0x284C6C00, 0x284BA080, 0x284AD500,
-	0x284A0980, 0x28493E00, 0x28487280,
-	0x2847A700, 0x2846DB80, 0x28461000,
-	0x28454480, 0x28447900, 0x2843AD80,
-	0x2842E200, 0x28421680, 0x28414B00,
-	0x28407F80, 0x283FB400, 0x283EE880,
-	0x283E1D00, 0x283D5180, 0x283C8600,
-	0x283BBA80, 0x283AEF00, 0x283A2380,
-	0x28395800, 0x28388C80, 0x2837C100,
-	0x2836F580, 0x28362A00, 0x28355E80,
-	0x28349300, 0x2833C780, 0x2832FC00,
-	0x28323080, 0x28316500, 0x28309980,
-	0x282FCE00, 0x282F0280, 0x282E3700,
-	0x282D6B80, 0x282CA000, 0x282BD480,
-	0x282B0900, 0x282A3D80, 0x28297200,
-	0x2828A680, 0x2827DB00, 0x28270F80,
-	0x28264400, 0x28257880, 0x2824AD00,
-	0x2823E180, 0x28231600, 0x28224A80,
-	0x28217F00, 0x2820B380, 0x281FE800,
-	0x281F1C80, 0x281E5100, 0x281D8580,
-	0x281CBA00, 0x281BEE80, 0x281B2300,
-	0x281A5780, 0x28198C00, 0x2818C080,
-	0x2817F500, 0x28172980, 0x28165E00,
-	0x28159280, 0x2814C700, 0x2813FB80,
-	0x28133000, 0x28126480, 0x28119900,
-	0x2810CD80, 0x28100200, 0x280F3680,
-	0x280E6B00, 0x280D9F80, 0x280CD400,
-	0x280C0880, 0x280B3D00, 0x280A7180,
-	0x2809A600, 0x2808DA80, 0x28080F00,
-	0x28074380, 0x28067800, 0x2805AC80,
-	0x2804E100, 0x28041580, 0x28034A00,
-	0x28027E80, 0x2801B300, 0x2800E780,
-	0x28001C00, 0x27FF5080, 0x27FE8500,
-	0x27FDB980, 0x27FCEE00, 0x27FC2280,
-	0x27FB5700, 0x27FA8B80, 0x27F9C000,
-	0x27F8F480, 0x27F82900, 0x27F75D80,
-	0x27F69200, 0x27F5C680, 0x27F4FB00,
-	0x27F42F80, 0x27F36400, 0x27F29880,
-	0x27F1CD00, 0x27F10180, 0x27F03600,
-	0x27EF6A80, 0x27EE9F00, 0x27EDD380,
-	0x27ED0800, 0x27EC3C80, 0x27EB7100,
-	0x27EAA580, 0x27E9DA00, 0x27E90E80,
-	0x27E84300, 0x27E77780, 0x27E6AC00,
-	0x27E5E080, 0x27E51500, 0x27E44980,
-	0x27E37E00, 0x27E2B280, 0x27E1E700,
-	0x27E11B80, 0x27E05000, 0x27DF8480,
-	0x27DEB900, 0x27DDED80, 0x27DD2200,
-	0x27DC5680, 0x27DB8B00, 0x27DABF80,
-	0x27D9F400, 0x27D92880, 0x27D85D00,
-	0x27D79180, 0x27D6C600, 0x27D5FA80,
-	0x27D52F00, 0x27D46380, 0x27D39800,
-	0x27D2CC80, 0x27D20100, 0x27D13580,
-	0x27D06A00, 0x27CF9E80, 0x27CED300,
-	0x27CE0780, 0x27CD3C00, 0x27CC7080,
-	0x27CBA500, 0x27CAD980, 0x27CA0E00,
-	0x27C94280, 0x27C87700, 0x27C7AB80,
-	0x27C6E000, 0x27C61480, 0x27C54900,
-	0x27C47D80, 0x27C3B200, 0x27C2E680,
-	0x27C21B00, 0x27C14F80, 0x27C08400,
-	0x27BFB880, 0x27BEED00, 0x27BE2180,
-	0x27BD5600, 0x27BC8A80, 0x27BBBF00,
-	0x27BAF380, 0x27BA2800, 0x27B95C80,
-	0x27B89100, 0x27B7C580, 0x27B6FA00,
-	0x27B62E80, 0x27B56300, 0x27B49780,
-	0x27B3CC00, 0x27B30080, 0x27B23500,
-	0x27B16980, 0x27B09E00, 0x27AFD280,
-	0x27AF0700, 0x27AE3B80, 0x27AD7000,
-	0x27ACA480, 0x27ABD900, 0x27AB0D80,
-	0x27AA4200, 0x27A97680, 0x27A8AB00,
-	0x27A7DF80, 0x27A71400, 0x27A64880,
-	0x27A57D00, 0x27A4B180, 0x27A3E600,
-	0x27A31A80, 0x27A24F00, 0x27A18380,
-	0x27A0B800, 0x279FEC80, 0x279F2100,
-	0x279E5580, 0x279D8A00, 0x279CBE80,
-	0x279BF300, 0x279B2780, 0x279A5C00,
-	0x27999080, 0x2798C500, 0x2797F980,
-	0x27972E00, 0x27966280, 0x27959700,
-	0x2794CB80, 0x27940000, 0x27934100,
-	0x27928200, 0x2791C300, 0x27910400,
-	0x27904500, 0x278F8600, 0x278EC700,
-	0x278E0800, 0x278D4900, 0x278C8A00,
-	0x278BCB00, 0x278B0C00, 0x278A4D00,
-	0x27898E00, 0x2788CF00, 0x27881000,
-	0x27875100, 0x27869200, 0x2785D300,
-	0x27851400, 0x27845500, 0x27839600,
-	0x2782D700, 0x27821800, 0x27815900,
-	0x27809A00, 0x277FDB00, 0x277F1C00,
-	0x277E5D00, 0x277D9E00, 0x277CDF00,
-	0x277C2000, 0x277B6100, 0x277AA200,
-	0x2779E300, 0x27792400, 0x27786500,
-	0x2777A600, 0x2776E700, 0x27762800,
-	0x27756900, 0x2774AA00, 0x2773EB00,
-	0x27732C00, 0x27726D00, 0x2771AE00,
-	0x2770EF00, 0x27703000, 0x276F7100,
-	0x276EB200, 0x276DF300, 0x276D3400,
-	0x276C7500, 0x276BB600, 0x276AF700,
-	0x276A3800, 0x27697900, 0x2768BA00,
-	0x2767FB00, 0x27673C00, 0x27667D00,
-	0x2765BE00, 0x2764FF00, 0x27644000,
-	0x27638100, 0x2762C200, 0x27620300,
-	0x27614400, 0x27608500, 0x275FC600,
-	0x275F0700, 0x275E4800, 0x275D8900,
-	0x275CCA00, 0x275C0B00, 0x275B4C00,
-	0x275A8D00, 0x2759CE00, 0x27590F00,
-	0x27585000, 0x27579100, 0x2756D200,
-	0x27561300, 0x27555400, 0x27549500,
-	0x2753D600, 0x27531700, 0x27525800,
-	0x27519900, 0x2750DA00, 0x27501B00,
-	0x274F5C00, 0x274E9D00, 0x274DDE00,
-	0x274D1F00, 0x274C6000, 0x274BA100,
-	0x274AE200, 0x274A2300, 0x27496400,
-	0x2748A500, 0x2747E600, 0x27472700,
-	0x27466800, 0x2745A900, 0x2744EA00,
-	0x27442B00, 0x27436C00, 0x2742AD00,
-	0x2741EE00, 0x27412F00, 0x27407000,
-	0x273FB100, 0x273EF200, 0x273E3300,
-	0x273D7400, 0x273CB500, 0x273BF600,
-	0x273B3700, 0x273A7800, 0x2739B900,
-	0x2738FA00, 0x27383B00, 0x27377C00,
-	0x2736BD00, 0x2735FE00, 0x27353F00,
-	0x27348000, 0x2733C100, 0x27330200,
-	0x27324300, 0x27318400, 0x2730C500,
-	0x27300600, 0x272F4700, 0x272E8800,
-	0x272DC900, 0x272D0A00, 0x272C4B00,
-	0x272B8C00, 0x272ACD00, 0x272A0E00,
-	0x27294F00, 0x27289000, 0x2727D100,
-	0x27271200, 0x27265300, 0x27259400,
-	0x2724D500, 0x27241600, 0x27235700,
-	0x27229800, 0x2721D900, 0x27211A00,
-	0x27205B00, 0x271F9C00, 0x271EDD00,
-	0x271E1E00, 0x271D5F00, 0x271CA000,
-	0x271BE100, 0x271B2200, 0x271A6300,
-	0x2719A400, 0x2718E500, 0x27182600,
-	0x27176700, 0x2716A800, 0x2715E900,
-	0x27152A00, 0x27146B00, 0x2713AC00,
-	0x2712ED00, 0x27122E00, 0x27116F00,
-	0x2710B000, 0x270FF100, 0x270F3200,
-	0x270E7300, 0x270DB400, 0x270CF500,
-	0x270C3600, 0x270B7700, 0x270AB800,
-	0x2709F900, 0x27093A00, 0x27087B00,
-	0x2707BC00, 0x2706FD00, 0x27063E00,
-	0x27057F00, 0x2704C000, 0x27040100,
-	0x27034200, 0x27028300, 0x2701C400,
-	0x27010500, 0x27004600, 0x26FF8700,
-	0x26FEC800, 0x26FE0900, 0x26FD4A00,
-	0x26FC8B00, 0x26FBCC00, 0x26FB0D00,
-	0x26FA4E00, 0x26F98F00, 0x26F8D000,
-	0x26F81100, 0x26F75200, 0x26F69300,
-	0x26F5D400, 0x26F51500, 0x26F45600,
-	0x26F39700, 0x26F2D800, 0x26F21900,
-	0x26F15A00, 0x26F09B00, 0x26EFDC00,
-	0x26EF1D00, 0x26EE5E00, 0x26ED9F00,
-	0x26ECE000, 0x26EC2100, 0x26EB6200,
-	0x26EAA300, 0x26E9E400, 0x26E92500,
-	0x26E86600, 0x26E7A700, 0x26E6E800,
-	0x26E62900, 0x26E56A00, 0x26E4AB00,
-	0x26E3EC00, 0x26E32D00, 0x26E26E00,
-	0x26E1AF00, 0x26E0F000, 0x26E03100,
-	0x26DF7200, 0x26DEB300, 0x26DDF400,
-	0x26DD3500, 0x26DC7600, 0x26DBB700,
-	0x26DAF800, 0x26DA3900, 0x26D97A00,
-	0x26D8BB00, 0x26D7FC00, 0x26D73D00,
-	0x26D67E00, 0x26D5BF00, 0x26D50000,
-	0x26D44100, 0x26D38200, 0x26D2C300,
-	0x26D20400, 0x26D14500, 0x26D08600,
-	0x26CFC700, 0x26CF0800, 0x26CE4900,
-	0x26CD8A00, 0x26CCCB00, 0x26CC0C00,
-	0x26CB4D00, 0x26CA8E00, 0x26C9CF00,
-	0x26C91000, 0x26C85100, 0x26C79200,
-	0x26C6D300, 0x26C61400, 0x26C55500,
-	0x26C49600, 0x26C3D700, 0x26C31800,
-	0x26C25900, 0x26C19A00, 0x26C0DB00,
-	0x26C01C00, 0x26BF5D00, 0x26BE9E00,
-	0x26BDDF00, 0x26BD2000, 0x26BC6100,
-	0x26BBA200, 0x26BAE300, 0x26BA2400,
-	0x26B96500, 0x26B8A600, 0x26B7E700,
-	0x26B72800, 0x26B66900, 0x26B5AA00,
-	0x26B4EB00, 0x26B42C00, 0x26B36D00,
-	0x26B2AE00, 0x26B1EF00, 0x26B13000,
-	0x26B07100, 0x26AFB200, 0x26AEF300,
-	0x26AE3400, 0x26AD7500, 0x26ACB600,
-	0x26ABF700, 0x26AB3800, 0x26AA7900,
-	0x26A9BA00, 0x26A8FB00, 0x26A83C00,
-	0x26A77D00, 0x26A6BE00, 0x26A5FF00,
-	0x26A54000, 0x26A48100, 0x26A3C200,
-	0x26A30300, 0x26A24400, 0x26A18500,
-	0x26A0C600, 0x26A00700, 0x269F4800,
-	0x269E8900, 0x269DCA00, 0x269D0B00,
-	0x269C4C00, 0x269B8D00, 0x269ACE00,
-	0x269A0F00, 0x26995000, 0x26989100,
-	0x2697D200, 0x26971300, 0x26965400,
-	0x26959500, 0x2694D600, 0x26941700,
-	0x26935800, 0x26929900, 0x2691DA00,
-	0x26911B00, 0x26905C00, 0x268F9D00,
-	0x268EDE00, 0x268E1F00, 0x268D6000,
-	0x268CA100, 0x268BE200, 0x268B2300,
-	0x268A6400, 0x2689A500, 0x2688E600,
-	0x26882700, 0x26876800, 0x2686A900,
-	0x2685EA00, 0x26852B00, 0x26846C00,
-	0x2683AD00, 0x2682EE00, 0x26822F00,
-	0x26817000, 0x2680B100, 0x267FF200,
-	0x267F3300, 0x267E7400, 0x267DB500,
-	0x267CF600, 0x267C3700, 0x267B7800,
-	0x267AB900, 0x2679FA00, 0x26793B00,
-	0x26787C00, 0x2677BD00, 0x2676FE00,
-	0x26763F00, 0x26758000, 0x2674C100,
-	0x26740200, 0x26734300, 0x26728400,
-	0x2671C500, 0x26710600, 0x26704700,
-	0x266F8800, 0x266EC900, 0x266E0A00,
-	0x266D4B00, 0x266C8C00, 0x266BCD00,
-	0x266B0E00, 0x266A4F00, 0x26699000,
-	0x2668D100, 0x26681200, 0x26675300,
-	0x26669400, 0x2665D500, 0x26651600,
-	0x26645700, 0x26639800, 0x2662D900,
-	0x26621A00, 0x26615B00, 0x26609C00,
-	0x265FDD00, 0x265F1E00, 0x265E5F00,
-	0x265DA000, 0x265CE100, 0x265C2200,
-	0x265B6300, 0x265AA400, 0x2659E500,
-	0x26592600, 0x26586700, 0x2657A800,
-	0x2656E900, 0x26562A00, 0x26556B00,
-	0x2654AC00, 0x2653ED00, 0x26532E00,
-	0x26526F00, 0x2651B000, 0x2650F100,
-	0x26503200, 0x264F7300, 0x264EB400,
-	0x264DF500, 0x264D3600, 0x264C7700,
-	0x264BB800, 0x264AF900, 0x264A3A00,
-	0x26497B00, 0x2648BC00, 0x2647FD00,
-	0x26473E00, 0x26467F00, 0x2645C000,
-	0x26450100, 0x26444200, 0x26438300,
-	0x2642C400, 0x26420500, 0x26414600,
-	0x26408700, 0x263FC800, 0x263F0900,
-	0x263E4A00, 0x263D8B00, 0x263CCC00,
-	0x263C0D00, 0x263B4E00, 0x263A8F00,
-	0x2639D000, 0x26391100, 0x26385200,
-	0x26379300, 0x2636D400, 0x26361500,
-	0x26355600, 0x26349700, 0x2633D800,
-	0x26331900, 0x26325A00, 0x26319B00,
-	0x2630DC00, 0x26301D00, 0x262F5E00,
-	0x262E9F00, 0x262DE000, 0x262D2100,
-	0x262C6200, 0x262BA300, 0x262AE400,
-	0x262A2500, 0x26296600, 0x2628A700,
-	0x2627E800, 0x26272900, 0x26266A00,
-	0x2625AB00, 0x2624EC00, 0x26242D00,
-	0x26236E00, 0x2622AF00, 0x2621F000,
-	0x26213100, 0x26207200, 0x261FB300,
-	0x261EF400, 0x261E3500, 0x261D7600,
-	0x261CB700, 0x261BF800, 0x261B3900,
-	0x261A7A00, 0x2619BB00, 0x2618FC00,
-	0x26183D00, 0x26177E00, 0x2616BF00,
-	0x26160000, 0x26154100, 0x26148200,
-	0x2613C300, 0x26130400, 0x26124500,
-	0x26118600, 0x2610C700, 0x26100800,
-	0x260F4900, 0x260E8A00, 0x260DCB00,
-	0x260D0C00, 0x260C4D00, 0x260B8E00,
-	0x260ACF00, 0x260A1000, 0x26095100,
-	0x26089200, 0x2607D300, 0x26071400,
-	0x26065500, 0x26059600, 0x2604D700,
-	0x26041800, 0x26035900, 0x26029A00,
-	0x2601DB00, 0x26011C00, 0x26005D00,
-	0x25FF9E00, 0x25FEDF00, 0x25FE2000,
-	0x25FD6100, 0x25FCA200, 0x25FBE300,
-	0x25FB2400, 0x25FA6500, 0x25F9A600,
-	0x25F8E700, 0x25F82800, 0x25F76900,
-	0x25F6AA00, 0x25F5EB00, 0x25F52C00,
-	0x25F46D00, 0x25F3AE00, 0x25F2EF00,
-	0x25F23000, 0x25F17100, 0x25F0B200,
-	0x25EFF300, 0x25EF3400, 0x25EE7500,
-	0x25EDB600, 0x25ECF700, 0x25EC3800,
-	0x25EB7900, 0x25EABA00, 0x25E9FB00,
-	0x25E93C00, 0x25E87D00, 0x25E7BE00,
-	0x25E6FF00, 0x25E64000, 0x25E58100,
-	0x25E4C200, 0x25E40300, 0x25E34400,
-	0x25E28500, 0x25E1C600, 0x25E10700,
-	0x25E04800, 0x25DF8900, 0x25DECA00,
-	0x25DE0B00, 0x25DD4C00, 0x25DC8D00,
-	0x25DBCE00, 0x25DB0F00, 0x25DA5000,
-	0x25D99100, 0x25D8D200, 0x25D81300,
-	0x25D75400, 0x25D69500, 0x25D5D600,
-	0x25D51700, 0x25D45800, 0x25D39900,
-	0x25D2DA00, 0x25D21B00, 0x25D15C00,
-	0x25D09D00, 0x25CFDE00, 0x25CF1F00,
-	0x25CE6000, 0x25CDA100, 0x25CCE200,
-	0x25CC2300, 0x25CB6400, 0x25CAA500,
-	0x25C9E600, 0x25C92700, 0x25C86800,
-	0x25C7A900, 0x25C6EA00, 0x25C62B00,
-	0x25C56C00, 0x25C4AD00, 0x25C3EE00,
-	0x25C32F00, 0x25C27000, 0x25C1B100,
-	0x25C0F200, 0x25C03300, 0x25BF7400,
-	0x25BEB500, 0x25BDF600, 0x25BD3700,
-	0x25BC7800, 0x25BBB900, 0x25BAFA00,
-	0x25BA3B00, 0x25B97C00, 0x25B8BD00,
-	0x25B7FE00, 0x25B73F00, 0x25B68000,
-	0x25B5C100, 0x25B50200, 0x25B44300,
-	0x25B38400, 0x25B2C500, 0x25B20600,
-	0x25B14700, 0x25B08800, 0x25AFC900,
-	0x25AF0A00, 0x25AE4B00, 0x25AD8C00,
-	0x25ACCD00, 0x25AC0E00, 0x25AB4F00,
-	0x25AA9000, 0x25A9D100, 0x25A91200,
-	0x25A85300, 0x25A79400, 0x25A6D500,
-	0x25A61600, 0x25A55700, 0x25A49800,
-	0x25A3D900, 0x25A31A00, 0x25A25B00,
-	0x25A19C00, 0x25A0DD00, 0x25A01E00,
-	0x259F5F00, 0x259EA000, 0x259DE100,
-	0x259D2200, 0x259C6300, 0x259BA400,
-	0x259AE500, 0x259A2600, 0x25996700,
-	0x2598A800, 0x2597E900, 0x25972A00,
-	0x25966B00, 0x2595AC00, 0x2594ED00,
-	0x25942E00, 0x25936F00, 0x2592B000,
-	0x2591F100, 0x25913200, 0x25907300,
-	0x258FB400, 0x258EF500, 0x258E3600,
-	0x258D7700, 0x258CB800, 0x258BF900,
-	0x258B3A00, 0x258A7B00, 0x2589BC00,
-	0x2588FD00, 0x25883E00, 0x25877F00,
-	0x2586C000, 0x25860100, 0x25854200,
-	0x25848300, 0x2583C400, 0x25830500,
-	0x25824600, 0x25818700, 0x2580C800,
-	0x25800900, 0x257F4A00, 0x257E8B00,
-	0x257DCC00, 0x257D0D00, 0x257C4E00,
-	0x257B8F00, 0x257AD000, 0x257A1100,
-	0x25795200, 0x25789300, 0x2577D400,
-	0x25771500, 0x25765600, 0x25759700,
-	0x2574D800, 0x25741900, 0x25735A00,
-	0x25729B00, 0x2571DC00, 0x25711D00,
-	0x25705E00, 0x256F9F00, 0x256EE000,
-	0x256E2100, 0x256D6200, 0x256CA300,
-	0x256BE400, 0x256B2500, 0x256A6600,
-	0x2569A700, 0x2568E800, 0x25682900,
-	0x25676A00, 0x2566AB00, 0x2565EC00,
-	0x25652D00, 0x25646E00, 0x2563AF00,
-	0x2562F000, 0x25623100, 0x25617200,
-	0x2560B300, 0x255FF400, 0x255F3500,
-	0x255E7600, 0x255DB700, 0x255CF800,
-	0x255C3900, 0x255B7A00, 0x255ABB00,
-	0x2559FC00, 0x25593D00, 0x25587E00,
-	0x2557BF00, 0x25570000, 0x25564100,
-	0x25558200, 0x2554C300, 0x25540400,
-	0x25534500, 0x25528600, 0x2551C700,
-	0x25510800, 0x25504900, 0x254F8A00,
-	0x254ECB00, 0x254E0C00, 0x254D4D00,
-	0x254C8E00, 0x254BCF00, 0x254B1000,
-	0x254A5100, 0x25499200, 0x2548D300,
-	0x25481400, 0x25475500, 0x25469600,
-	0x2545D700, 0x25451800, 0x25445900,
-	0x25439A00, 0x2542DB00, 0x25421C00,
-	0x25415D00, 0x25409E00, 0x253FDF00,
-	0x253F2000, 0x253E6100, 0x253DA200,
-	0x253CE300, 0x253C2400, 0x253B6500,
-	0x253AA600, 0x2539E700, 0x25392800,
-	0x25386900, 0x2537AA00, 0x2536EB00,
-	0x25362C00, 0x25356D00, 0x2534AE00,
-	0x2533EF00, 0x25333000, 0x25327100,
-	0x2531B200, 0x2530F300, 0x25303400,
-	0x252F7500, 0x252EB600, 0x252DF700,
-	0x252D3800, 0x252C7900, 0x252BBA00,
-	0x252AFB00, 0x252A3C00, 0x25297D00,
-	0x2528BE00, 0x2527FF00, 0x25274000,
-	0x25268100, 0x2525C200, 0x25250300,
-	0x25244400, 0x25238500, 0x2522C600,
-	0x25220700, 0x25214800, 0x25208900,
-	0x251FCA00, 0x251F0B00, 0x251E4C00,
-	0x251D8D00, 0x251CCE00, 0x251C0F00,
-	0x251B5000, 0x251A9100, 0x2519D200,
-	0x25191300, 0x25185400, 0x25179500,
-	0x2516D600, 0x25161700, 0x25155800,
-	0x25149900, 0x2513DA00, 0x25131B00,
-	0x25125C00, 0x25119D00, 0x2510DE00,
-	0x25101F00, 0x250F6000, 0x250EA100,
-	0x250DE200, 0x250D2300, 0x250C6400,
-	0x250BA500, 0x250AE600, 0x250A2700,
-	0x25096800, 0x2508A900, 0x2507EA00,
-	0x25072B00, 0x25066C00, 0x2505AD00,
-	0x2504EE00, 0x25042F00, 0x25037000,
-	0x2502B100, 0x2501F200, 0x25013300,
-	0x25007400, 0x24FFB500, 0x24FEF600,
-	0x24FE3700, 0x24FD7800, 0x24FCB900,
-	0x24FBFA00, 0x24FB3B00, 0x24FA7C00,
-	0x24F9BD00, 0x24F8FE00, 0x24F83F00,
-	0x24F78000, 0x24F6C100, 0x24F60200,
-	0x24F54300, 0x24F48400, 0x24F3C500,
-	0x24F30600, 0x24F24700, 0x24F18800,
-	0x24F0C900, 0x24F00A00, 0x24EF4B00,
-	0x24EE8C00, 0x24EDCD00, 0x24ED0E00,
-	0x24EC4F00, 0x24EB9000, 0x24EAD100,
-	0x24EA1200, 0x24E95300, 0x24E89400,
-	0x24E7D500, 0x24E71600, 0x24E65700,
-	0x24E59800, 0x24E4D900, 0x24E41A00,
-	0x24E35B00, 0x24E29C00, 0x24E1DD00,
-	0x24E11E00, 0x24E05F00, 0x24DFA000,
-	0x24DEE100, 0x24DE2200, 0x24DD6300,
-	0x24DCA400, 0x24DBE500, 0x24DB2600,
-	0x24DA6700, 0x24D9A800, 0x24D8E900,
-	0x24D82A00, 0x24D76B00, 0x24D6AC00,
-	0x24D5ED00, 0x24D52E00, 0x24D46F00,
-	0x24D3B000, 0x24D2F100, 0x24D23200,
-	0x24D17300, 0x24D0B400, 0x24CFF500,
-	0x24CF3600, 0x24CE7700, 0x24CDB800,
-	0x24CCF900, 0x24CC3A00, 0x24CB7B00,
-	0x24CABC00, 0x24C9FD00, 0x24C93E00,
-	0x24C87F00, 0x24C7C000, 0x24C70100,
-	0x24C64200, 0x24C58300, 0x24C4C400,
-	0x24C40500, 0x24C34600, 0x24C28700,
-	0x24C1C800, 0x24C10900, 0x24C04A00,
-	0x24BF8B00, 0x24BECC00, 0x24BE0D00,
-	0x24BD4E00, 0x24BC8F00, 0x24BBD000,
-	0x24BB1100, 0x24BA5200, 0x24B99300,
-	0x24B8D400, 0x24B81500, 0x24B75600,
-	0x24B69700, 0x24B5D800, 0x24B51900,
-	0x24B45A00, 0x24B39B00, 0x24B2DC00,
-	0x24B21D00, 0x24B15E00, 0x24B09F00,
-	0x24AFE000, 0x24AF2100, 0x24AE6200,
-	0x24ADA300, 0x24ACE400, 0x24AC2500,
-	0x24AB6600, 0x24AAA700, 0x24A9E800,
-	0x24A92900, 0x24A86A00, 0x24A7AB00,
-	0x24A6EC00, 0x24A62D00, 0x24A56E00,
-	0x24A4AF00, 0x24A3F000, 0x24A33100,
-	0x24A27200, 0x24A1B300, 0x24A0F400,
-	0x24A03500, 0x249F7600, 0x249EB700,
-	0x249DF800, 0x249D3900, 0x249C7A00,
-	0x249BBB00, 0x249AFC00, 0x249A3D00,
-	0x24997E00, 0x2498BF00, 0x24980000,
-	0x24974100, 0x24968200, 0x2495C300,
-	0x24950400, 0x24944500, 0x24938600,
-	0x2492C700, 0x24920800, 0x24914900,
-	0x24908A00, 0x248FCB00, 0x248F0C00,
-	0x248E4D00, 0x248D8E00, 0x248CCF00,
-	0x248C1000, 0x248B5100, 0x248A9200,
-	0x2489D300, 0x24891400, 0x24885500,
-	0x24879600, 0x2486D700, 0x24861800,
-	0x24855900, 0x24849A00, 0x2483DB00,
-	0x24831C00, 0x24825D00, 0x24819E00,
-	0x2480DF00, 0x24802000, 0x247F6100,
-	0x247EA200, 0x247DE300, 0x247D2400,
-	0x247C6500, 0x247BA600, 0x247AE700,
-	0x247A2800, 0x24796900, 0x2478AA00,
-	0x2477EB00, 0x24772C00, 0x24766D00,
-	0x2475AE00, 0x2474EF00, 0x24743000,
-	0x24737100, 0x2472B200, 0x2471F300,
-	0x24713400, 0x24707500, 0x246FB600,
-	0x246EF700, 0x246E3800, 0x246D7900,
-	0x246CBA00, 0x246BFB00, 0x246B3C00,
-	0x246A7D00, 0x2469BE00, 0x2468FF00,
-	0x24684000, 0x24678100, 0x2466C200,
-	0x24660300, 0x24654400, 0x24648500,
-	0x2463C600, 0x24630700, 0x24624800,
-	0x24618900, 0x2460CA00, 0x24600B00,
-	0x245F4C00, 0x245E8D00, 0x245DCE00,
-	0x245D0F00, 0x245C5000, 0x245B9100,
-	0x245AD200, 0x245A1300, 0x24595400,
-	0x24589500, 0x2457D600, 0x24571700,
-	0x24565800, 0x24559900, 0x2454DA00,
-	0x24541B00, 0x24535C00, 0x24529D00,
-	0x2451DE00, 0x24511F00, 0x24506000,
-	0x244FA100, 0x244EE200, 0x244E2300,
-	0x244D6400, 0x244CA500, 0x244BE600,
-	0x244B2700, 0x244A6800, 0x2449A900,
-	0x2448EA00, 0x24482B00, 0x24476C00,
-	0x2446AD00, 0x2445EE00, 0x24452F00,
-	0x24447000, 0x2443B100, 0x2442F200,
-	0x24423300, 0x24417400, 0x2440B500,
-	0x243FF600, 0x243F3700, 0x243E7800,
-	0x243DB900, 0x243CFA00, 0x243C3B00,
-	0x243B7C00, 0x243ABD00, 0x2439FE00,
-	0x24393F00, 0x24388000, 0x2437C100,
-	0x24370200, 0x24364300, 0x24358400,
-	0x2434C500, 0x24340600, 0x24334700,
-	0x24328800, 0x2431C900, 0x24310A00,
-	0x24304B00, 0x242F8C00, 0x242ECD00,
-	0x242E0E00, 0x242D4F00, 0x242C9000,
-	0x242BD100, 0x242B1200, 0x242A5300,
-	0x24299400, 0x2428D500, 0x24281600,
-	0x24275700, 0x24269800, 0x2425D900,
-	0x24251A00, 0x24245B00, 0x24239C00,
-	0x2422DD00, 0x24221E00, 0x24215F00,
-	0x2420A000, 0x241FE100, 0x241F2200,
-	0x241E6300, 0x241DA400, 0x241CE500,
-	0x241C2600, 0x241B6700, 0x241AA800,
-	0x2419E900, 0x24192A00, 0x24186B00,
-	0x2417AC00, 0x2416ED00, 0x24162E00,
-	0x24156F00, 0x2414B000, 0x2413F100,
-	0x24133200, 0x24127300, 0x2411B400,
-	0x2410F500, 0x24103600, 0x240F7700,
-	0x240EB800, 0x240DF900, 0x240D3A00,
-	0x240C7B00, 0x240BBC00, 0x240AFD00,
-	0x240A3E00, 0x24097F00, 0x2408C000,
-	0x24080100, 0x24074200, 0x24068300,
-	0x2405C400, 0x24050500, 0x24044600,
-	0x24038700, 0x2402C800, 0x24020900,
-	0x24014A00, 0x24008B00, 0x23FFCC00,
-	0x23FF0D00, 0x23FE4E00, 0x23FD8F00,
-	0x23FCD000, 0x23FC1100, 0x23FB5200,
-	0x23FA9300, 0x23F9D400, 0x23F91500,
-	0x23F85600, 0x23F79700, 0x23F6D800,
-	0x23F61900, 0x23F55A00, 0x23F49B00,
-	0x23F3DC00, 0x23F31D00, 0x23F25E00,
-	0x23F19F00, 0x23F0E000, 0x23F02100,
-	0x23EF6200, 0x23EEA300, 0x23EDE400,
-	0x23ED2500, 0x23EC6600, 0x23EBA700,
-	0x23EAE800, 0x23EA2900, 0x23E96A00,
-	0x23E8AB00, 0x23E7EC00, 0x23E72D00,
-	0x23E66E00, 0x23E5AF00, 0x23E4F000,
-	0x23E43100, 0x23E37200, 0x23E2B300,
-	0x23E1F400, 0x23E13500, 0x23E07600,
-	0x23DFB700, 0x23DEF800, 0x23DE3900,
-	0x23DD7A00, 0x23DCBB00, 0x23DBFC00,
-	0x23DB3D00, 0x23DA7E00, 0x23D9BF00,
-	0x23D90000, 0x23D84100, 0x23D78200,
-	0x23D6C300, 0x23D60400, 0x23D54500,
-	0x23D48600, 0x23D3C700, 0x23D30800,
-	0x23D24900, 0x23D18A00, 0x23D0CB00,
-	0x23D00C00, 0x23CF4D00, 0x23CE8E00,
-	0x23CDCF00, 0x23CD1000, 0x23CC5100,
-	0x23CB9200, 0x23CAD300, 0x23CA1400,
-	0x23C95500, 0x23C89600, 0x23C7D700,
-	0x23C71800, 0x23C65900, 0x23C59A00,
-	0x23C4DB00, 0x23C41C00, 0x23C35D00,
-	0x23C29E00, 0x23C1DF00, 0x23C12000,
-	0x23C06100, 0x23BFA200, 0x23BEE300,
-	0x23BE2400, 0x23BD6500, 0x23BCA600,
-	0x23BBE700, 0x23BB2800, 0x23BA6900,
-	0x23B9AA00, 0x23B8EB00, 0x23B82C00,
-	0x23B76D00, 0x23B6AE00, 0x23B5EF00,
-	0x23B53000, 0x23B47100, 0x23B3B200,
-	0x23B2F300, 0x23B23400, 0x23B17500,
-	0x23B0B600, 0x23AFF700, 0x23AF3800,
-	0x23AE7900, 0x23ADBA00, 0x23ACFB00,
-	0x23AC3C00, 0x23AB7D00, 0x23AABE00,
-	0x23A9FF00, 0x23A94000, 0x23A88100,
-	0x23A7C200, 0x23A70300, 0x23A64400,
-	0x23A58500, 0x23A4C600, 0x23A40700,
-	0x23A34800, 0x23A28900, 0x23A1CA00,
-	0x23A10B00, 0x23A04C00, 0x239F8D00,
-	0x239ECE00, 0x239E0F00, 0x239D5000,
-	0x239C9100, 0x239BD200, 0x239B1300,
-	0x239A5400, 0x23999500, 0x2398D600,
-	0x23981700, 0x23975800, 0x23969900,
-	0x2395DA00, 0x23951B00, 0x23945C00,
-	0x23939D00, 0x2392DE00, 0x23921F00,
-	0x23916000, 0x2390A100, 0x238FE200,
-	0x238F2300, 0x238E6400, 0x238DA500,
-	0x238CE600, 0x238C2700, 0x238B6800,
-	0x238AA900, 0x2389EA00, 0x23892B00,
-	0x23886C00, 0x2387AD00, 0x2386EE00,
-	0x23862F00, 0x23857000, 0x2384B100,
-	0x2383F200, 0x23833300, 0x23827400,
-	0x2381B500, 0x2380F600, 0x23803700,
-	0x237F7800, 0x237EB900, 0x237DFA00,
-	0x237D3B00, 0x237C7C00, 0x237BBD00,
-	0x237AFE00, 0x237A3F00, 0x23798000,
-	0x2378C100, 0x23780200, 0x23774300,
-	0x23768400, 0x2375C500, 0x23750600,
-	0x23744700, 0x23738800, 0x2372C900,
-	0x23720A00, 0x23714B00, 0x23708C00,
-	0x236FCD00, 0x236F0E00, 0x236E4F00,
-	0x236D9000, 0x236CD100, 0x236C1200,
-	0x236B5300, 0x236A9400, 0x2369D500,
-	0x23691600, 0x23685700, 0x23679800,
-	0x2366D900, 0x23661A00, 0x23655B00,
-	0x23649C00, 0x2363DD00, 0x23631E00,
-	0x23625F00, 0x2361A000, 0x2360E100,
-	0x23602200, 0x235F6300, 0x235EA400,
-	0x235DE500, 0x235D2600, 0x235C6700,
-	0x235BA800, 0x235AE900, 0x235A2A00,
-	0x23596B00, 0x2358AC00, 0x2357ED00,
-	0x23572E00, 0x23566F00, 0x2355B000,
-	0x2354F100, 0x23543200, 0x23537300,
-	0x2352B400, 0x2351F500, 0x23513600,
-	0x23507700, 0x234FB800, 0x234EF900,
-	0x234E3A00, 0x234D7B00, 0x234CBC00,
-	0x234BFD00, 0x234B3E00, 0x234A7F00,
-	0x2349C000, 0x23490100, 0x23484200,
-	0x23478300, 0x2346C400, 0x23460500,
-	0x23454600, 0x23448700, 0x2343C800,
-	0x23430900, 0x23424A00, 0x23418B00,
-	0x2340CC00, 0x23400D00, 0x233F4E00,
-	0x233E8F00, 0x233DD000, 0x233D1100,
-	0x233C5200, 0x233B9300, 0x233AD400,
-	0x233A1500, 0x23395600, 0x23389700,
-	0x2337D800, 0x23371900, 0x23365A00,
-	0x23359B00, 0x2334DC00, 0x23341D00,
-	0x23335E00, 0x23329F00, 0x2331E000,
-	0x23312100, 0x23306200, 0x232FA300,
-	0x232EE400, 0x232E2500, 0x232D6600,
-	0x232CA700, 0x232BE800, 0x232B2900,
-	0x232A6A00, 0x2329AB00, 0x2328EC00,
-	0x23282D00, 0x23276E00, 0x2326AF00,
-	0x2325F000, 0x23253100, 0x23247200,
-	0x2323B300, 0x2322F400, 0x23223500,
-	0x23217600, 0x2320B700, 0x231FF800,
-	0x231F3900, 0x231E7A00, 0x231DBB00,
-	0x231CFC00, 0x231C3D00, 0x231B7E00,
-	0x231ABF00, 0x231A0000, 0x23194100,
-	0x23188200, 0x2317C300, 0x23170400,
-	0x23164500, 0x23158600, 0x2314C700,
-	0x23140800, 0x23134900, 0x23128A00,
-	0x2311CB00, 0x23110C00, 0x23104D00,
-	0x230F8E00, 0x230ECF00, 0x230E1000,
-	0x230D5100, 0x230C9200, 0x230BD300,
-	0x230B1400, 0x230A5500, 0x23099600,
-	0x2308D700, 0x23081800, 0x23075900,
-	0x23069A00, 0x2305DB00, 0x23051C00,
-	0x23045D00, 0x23039E00, 0x2302DF00,
-	0x23022000, 0x23016100, 0x2300A200,
-	0x22FFE300, 0x22FF2400, 0x22FE6500,
-	0x22FDA600, 0x22FCE700, 0x22FC2800,
-	0x22FB6900, 0x22FAAA00, 0x22F9EB00,
-	0x22F92C00, 0x22F86D00, 0x22F7AE00,
-	0x22F6EF00, 0x22F63000, 0x22F57100,
-	0x22F4B200, 0x22F3F300, 0x22F33400,
-	0x22F27500, 0x22F1B600, 0x22F0F700,
-	0x22F03800, 0x22EF7900, 0x22EEBA00,
-	0x22EDFB00, 0x22ED3C00, 0x22EC7D00,
-	0x22EBBE00, 0x22EAFF00, 0x22EA4000,
-	0x22E98100, 0x22E8C200, 0x22E80300,
-	0x22E74400, 0x22E68500, 0x22E5C600,
-	0x22E50700, 0x22E44800, 0x22E38900,
-	0x22E2CA00, 0x22E20B00, 0x22E14C00,
-	0x22E08D00, 0x22DFCE00, 0x22DF0F00,
-	0x22DE5000, 0x22DD9100, 0x22DCD200,
-	0x22DC1300, 0x22DB5400, 0x22DA9500,
-	0x22D9D600, 0x22D91700, 0x22D85800,
-	0x22D79900, 0x22D6DA00, 0x22D61B00,
-	0x22D55C00, 0x22D49D00, 0x22D3DE00,
-	0x22D31F00, 0x22D26000, 0x22D1A100,
-	0x22D0E200, 0x22D02300, 0x22CF6400,
-	0x22CEA500, 0x22CDE600, 0x22CD2700,
-	0x22CC6800, 0x22CBA900, 0x22CAEA00,
-	0x22CA2B00, 0x22C96C00, 0x22C8AD00,
-	0x22C7EE00, 0x22C72F00, 0x22C67000,
-	0x22C5B100, 0x22C4F200, 0x22C43300,
-	0x22C37400, 0x22C2B500, 0x22C1F600,
-	0x22C13700, 0x22C07800, 0x22BFB900,
-	0x22BEFA00, 0x22BE3B00, 0x22BD7C00,
-	0x22BCBD00, 0x22BBFE00, 0x22BB3F00,
-	0x22BA8000, 0x22B9C100, 0x22B90200,
-	0x22B84300, 0x22B78400, 0x22B6C500,
-	0x22B60600, 0x22B54700, 0x22B48800,
-	0x22B3C900, 0x22B30A00, 0x22B24B00,
-	0x22B18C00, 0x22B0CD00, 0x22B00E00,
-	0x22AF4F00, 0x22AE9000, 0x22ADD100,
-	0x22AD1200, 0x22AC5300, 0x22AB9400,
-	0x22AAD500, 0x22AA1600, 0x22A95700,
-	0x22A89800, 0x22A7D900, 0x22A71A00,
-	0x22A65B00, 0x22A59C00, 0x22A4DD00,
-	0x22A41E00, 0x22A35F00, 0x22A2A000,
-	0x22A1E100, 0x22A12200, 0x22A06300,
-	0x229FA400, 0x229EE500, 0x229E2600,
-	0x229D6700, 0x229CA800, 0x229BE900,
-	0x229B2A00, 0x229A6B00, 0x2299AC00,
-	0x2298ED00, 0x22982E00, 0x22976F00,
-	0x2296B000, 0x2295F100, 0x22953200,
-	0x22947300, 0x2293B400, 0x2292F500,
-	0x22923600, 0x22917700, 0x2290B800,
-	0x228FF900, 0x228F3A00, 0x228E7B00,
-	0x228DBC00, 0x228CFD00, 0x228C3E00,
-	0x228B7F00, 0x228AC000, 0x228A0100,
-	0x22894200, 0x22888300, 0x2287C400,
-	0x22870500, 0x22864600, 0x22858700,
-	0x2284C800, 0x22840900, 0x22834A00,
-	0x22828B00, 0x2281CC00, 0x22810D00,
-	0x22804E00, 0x227F8F00, 0x227ED000,
-	0x227E1100, 0x227D5200, 0x227C9300,
-	0x227BD400, 0x227B1500, 0x227A5600,
-	0x22799700, 0x2278D800, 0x22781900,
-	0x22775A00, 0x22769B00, 0x2275DC00,
-	0x22751D00, 0x22745E00, 0x22739F00,
-	0x2272E000, 0x22722100, 0x22716200,
-	0x2270A300, 0x226FE400, 0x226F2500,
-	0x226E6600, 0x226DA700, 0x226CE800,
-	0x226C2900, 0x226B6A00, 0x226AAB00,
-	0x2269EC00, 0x22692D00, 0x22686E00,
-	0x2267AF00, 0x2266F000, 0x22663100,
-	0x22657200, 0x2264B300, 0x2263F400,
-	0x22633500, 0x22627600, 0x2261B700,
-	0x2260F800, 0x22603900, 0x225F7A00,
-	0x225EBB00, 0x225DFC00, 0x225D3D00,
-	0x225C7E00, 0x225BBF00, 0x225B0000,
-	0x225A4100, 0x22598200, 0x2258C300,
-	0x22580400, 0x22574500, 0x22568600,
-	0x2255C700, 0x22550800, 0x22544900,
-	0x22538A00, 0x2252CB00, 0x22520C00,
-	0x22514D00, 0x22508E00, 0x224FCF00,
-	0x224F1000, 0x224E5100, 0x224D9200,
-	0x224CD300, 0x224C1400, 0x224B5500,
-	0x224A9600, 0x2249D700, 0x22491800,
-	0x22485900, 0x22479A00, 0x2246DB00,
-	0x22461C00, 0x22455D00, 0x22449E00,
-	0x2243DF00, 0x22432000, 0x22426100,
-	0x2241A200, 0x2240E300, 0x22402400,
-	0x223F6500, 0x223EA600, 0x223DE700,
-	0x223D2800, 0x223C6900, 0x223BAA00,
-	0x223AEB00, 0x223A2C00, 0x22396D00,
-	0x2238AE00, 0x2237EF00, 0x22373000,
-	0x22367100, 0x2235B200, 0x2234F300,
-	0x22343400, 0x22337500, 0x2232B600,
-	0x2231F700, 0x22313800, 0x22307900,
-	0x222FBA00, 0x222EFB00, 0x222E3C00,
-	0x222D7D00, 0x222CBE00, 0x222BFF00,
-	0x222B4000, 0x222A8100, 0x2229C200,
-	0x22290300, 0x22284400, 0x22278500,
-	0x2226C600, 0x22260700, 0x22254800,
-	0x22248900, 0x2223CA00, 0x22230B00,
-	0x22224C00, 0x22218D00, 0x2220CE00,
-	0x22200F00, 0x221F5000, 0x221E9100,
-	0x221DD200, 0x221D1300, 0x221C5400,
-	0x221B9500, 0x221AD600, 0x221A1700,
-	0x22195800, 0x22189900, 0x2217DA00,
-	0x22171B00, 0x22165C00, 0x22159D00,
-	0x2214DE00, 0x22141F00, 0x22136000,
-	0x2212A100, 0x2211E200, 0x22112300,
-	0x22106400, 0x220FA500, 0x220EE600,
-	0x220E2700, 0x220D6800, 0x220CA900,
-	0x220BEA00, 0x220B2B00, 0x220A6C00,
-	0x2209AD00, 0x2208EE00, 0x22082F00,
-	0x22077000, 0x2206B100, 0x2205F200,
-	0x22053300, 0x22047400, 0x2203B500,
-	0x2202F600, 0x22023700, 0x22017800,
-	0x2200B900, 0x21FFFA00, 0x21FF3B00,
-	0x21FE7C00, 0x21FDBD00, 0x21FCFE00,
-	0x21FC3F00, 0x21FB8000, 0x21FAC100,
-	0x21FA0200, 0x21F94300, 0x21F88400,
-	0x21F7C500, 0x21F70600, 0x21F64700,
-	0x21F58800, 0x21F4C900, 0x21F40A00,
-	0x21F34B00, 0x21F28C00, 0x21F1CD00,
-	0x21F10E00, 0x21F04F00, 0x21EF9000,
-	0x21EED100, 0x21EE1200, 0x21ED5300,
-	0x21EC9400, 0x21EBD500, 0x21EB1600,
-	0x21EA5700, 0x21E99800, 0x21E8D900,
-	0x21E81A00, 0x21E75B00, 0x21E69C00,
-	0x21E5DD00, 0x21E51E00, 0x21E45F00,
-	0x21E3A000, 0x21E2E100, 0x21E22200,
-	0x21E16300, 0x21E0A400, 0x21DFE500,
-	0x21DF2600, 0x21DE6700, 0x21DDA800,
-	0x21DCE900, 0x21DC2A00, 0x21DB6B00,
-	0x21DAAC00, 0x21D9ED00, 0x21D92E00,
-	0x21D86F00, 0x21D7B000, 0x21D6F100,
-	0x21D63200, 0x21D57300, 0x21D4B400,
-	0x21D3F500, 0x21D33600, 0x21D27700,
-	0x21D1B800, 0x21D0F900, 0x21D03A00,
-	0x21CF7B00, 0x21CEBC00, 0x21CDFD00,
-	0x21CD3E00, 0x21CC7F00, 0x21CBC000,
-	0x21CB0100, 0x21CA4200, 0x21C98300,
-	0x21C8C400, 0x21C80500, 0x21C74600,
-	0x21C68700, 0x21C5C800, 0x21C50900,
-	0x21C44A00, 0x21C38B00, 0x21C2CC00,
-	0x21C20D00, 0x21C14E00, 0x21C08F00,
-	0x21BFD000, 0x21BF1100, 0x21BE5200,
-	0x21BD9300, 0x21BCD400, 0x21BC1500,
-	0x21BB5600, 0x21BA9700, 0x21B9D800,
-	0x21B91900, 0x21B85A00, 0x21B79B00,
-	0x21B6DC00, 0x21B61D00, 0x21B55E00,
-	0x21B49F00, 0x21B3E000, 0x21B32100,
-	0x21B26200, 0x21B1A300, 0x21B0E400,
-	0x21B02500, 0x21AF6600, 0x21AEA700,
-	0x21ADE800, 0x21AD2900, 0x21AC6A00,
-	0x21ABAB00, 0x21AAEC00, 0x21AA2D00,
-	0x21A96E00, 0x21A8AF00, 0x21A7F000,
-	0x21A73100, 0x21A67200, 0x21A5B300,
-	0x21A4F400, 0x21A43500, 0x21A37600,
-	0x21A2B700, 0x21A1F800, 0x21A13900,
-	0x21A07A00, 0x219FBB00, 0x219EFC00,
-	0x219E3D00, 0x219D7E00, 0x219CBF00,
-	0x219C0000, 0x219B4C00, 0x219A9800,
-	0x2199E400, 0x21993000, 0x21987C00,
-	0x2197C800, 0x21971400, 0x21966000,
-	0x2195AC00, 0x2194F800, 0x21944400,
-	0x21939000, 0x2192DC00, 0x21922800,
-	0x21917400, 0x2190C000, 0x21900C00,
-	0x218F5800, 0x218EA400, 0x218DF000,
-	0x218D3C00, 0x218C8800, 0x218BD400,
-	0x218B2000, 0x218A6C00, 0x2189B800,
-	0x21890400, 0x21885000, 0x21879C00,
-	0x2186E800, 0x21863400, 0x21858000,
-	0x2184CC00, 0x21841800, 0x21836400,
-	0x2182B000, 0x2181FC00, 0x21814800,
-	0x21809400, 0x217FE000, 0x217F2C00,
-	0x217E7800, 0x217DC400, 0x217D1000,
-	0x217C5C00, 0x217BA800, 0x217AF400,
-	0x217A4000, 0x21798C00, 0x2178D800,
-	0x21782400, 0x21777000, 0x2176BC00,
-	0x21760800, 0x21755400, 0x2174A000,
-	0x2173EC00, 0x21733800, 0x21728400,
-	0x2171D000, 0x21711C00, 0x21706800,
-	0x216FB400, 0x216F0000, 0x216E4C00,
-	0x216D9800, 0x216CE400, 0x216C3000,
-	0x216B7C00, 0x216AC800, 0x216A1400,
-	0x21696000, 0x2168AC00, 0x2167F800,
-	0x21674400, 0x21669000, 0x2165DC00,
-	0x21652800, 0x21647400, 0x2163C000,
-	0x21630C00, 0x21625800, 0x2161A400,
-	0x2160F000, 0x21603C00, 0x215F8800,
-	0x215ED400, 0x215E2000, 0x215D6C00,
-	0x215CB800, 0x215C0400, 0x215B5000,
-	0x215A9C00, 0x2159E800, 0x21593400,
-	0x21588000, 0x2157CC00, 0x21571800,
-	0x21566400, 0x2155B000, 0x2154FC00,
-	0x21544800, 0x21539400, 0x2152E000,
-	0x21522C00, 0x21517800, 0x2150C400,
-	0x21501000, 0x214F5C00, 0x214EA800,
-	0x214DF400, 0x214D4000, 0x214C8C00,
-	0x214BD800, 0x214B2400, 0x214A7000,
-	0x2149BC00, 0x21490800, 0x21485400,
-	0x2147A000, 0x2146EC00, 0x21463800,
-	0x21458400, 0x2144D000, 0x21441C00,
-	0x21436800, 0x2142B400, 0x21420000,
-	0x21414C00, 0x21409800, 0x213FE400,
-	0x213F3000, 0x213E7C00, 0x213DC800,
-	0x213D1400, 0x213C6000, 0x213BAC00,
-	0x213AF800, 0x213A4400, 0x21399000,
-	0x2138DC00, 0x21382800, 0x21377400,
-	0x2136C000, 0x21360C00, 0x21355800,
-	0x2134A400, 0x2133F000, 0x21333C00,
-	0x21328800, 0x2131D400, 0x21312000,
-	0x21306C00, 0x212FB800, 0x212F0400,
-	0x212E5000, 0x212D9C00, 0x212CE800,
-	0x212C3400, 0x212B8000, 0x212ACC00,
-	0x212A1800, 0x21296400, 0x2128B000,
-	0x2127FC00, 0x21274800, 0x21269400,
-	0x2125E000, 0x21252C00, 0x21247800,
-	0x2123C400, 0x21231000, 0x21225C00,
-	0x2121A800, 0x2120F400, 0x21204000,
-	0x211F8C00, 0x211ED800, 0x211E2400,
-	0x211D7000, 0x211CBC00, 0x211C0800,
-	0x211B5400, 0x211AA000, 0x2119EC00,
-	0x21193800, 0x21188400, 0x2117D000,
-	0x21171C00, 0x21166800, 0x2115B400,
-	0x21150000, 0x21144C00, 0x21139800,
-	0x2112E400, 0x21123000, 0x21117C00,
-	0x2110C800, 0x21101400, 0x210F6000,
-	0x210EAC00, 0x210DF800, 0x210D4400,
-	0x210C9000, 0x210BDC00, 0x210B2800,
-	0x210A7400, 0x2109C000, 0x21090C00,
-	0x21085800, 0x2107A400, 0x2106F000,
-	0x21063C00, 0x21058800, 0x2104D400,
-	0x21042000, 0x21036C00, 0x2102B800,
-	0x21020400, 0x21015000, 0x21009C00,
-	0x20FFE800, 0x20FF3400, 0x20FE8000,
-	0x20FDCC00, 0x20FD1800, 0x20FC6400,
-	0x20FBB000, 0x20FAFC00, 0x20FA4800,
-	0x20F99400, 0x20F8E000, 0x20F82C00,
-	0x20F77800, 0x20F6C400, 0x20F61000,
-	0x20F55C00, 0x20F4A800, 0x20F3F400,
-	0x20F34000, 0x20F28C00, 0x20F1D800,
-	0x20F12400, 0x20F07000, 0x20EFBC00,
-	0x20EF0800, 0x20EE5400, 0x20EDA000,
-	0x20ECEC00, 0x20EC3800, 0x20EB8400,
-	0x20EAD000, 0x20EA1C00, 0x20E96800,
-	0x20E8B400, 0x20E80000, 0x20E74C00,
-	0x20E69800, 0x20E5E400, 0x20E53000,
-	0x20E47C00, 0x20E3C800, 0x20E31400,
-	0x20E26000, 0x20E1AC00, 0x20E0F800,
-	0x20E04400, 0x20DF9000, 0x20DEDC00,
-	0x20DE2800, 0x20DD7400, 0x20DCC000,
-	0x20DC0C00, 0x20DB5800, 0x20DAA400,
-	0x20D9F000, 0x20D93C00, 0x20D88800,
-	0x20D7D400, 0x20D72000, 0x20D66C00,
-	0x20D5B800, 0x20D50400, 0x20D45000,
-	0x20D39C00, 0x20D2E800, 0x20D23400,
-	0x20D18000, 0x20D0CC00, 0x20D01800,
-	0x20CF6400, 0x20CEB000, 0x20CDFC00,
-	0x20CD4800, 0x20CC9400, 0x20CBE000,
-	0x20CB2C00, 0x20CA7800, 0x20C9C400,
-	0x20C91000, 0x20C85C00, 0x20C7A800,
-	0x20C6F400, 0x20C64000, 0x20C58C00,
-	0x20C4D800, 0x20C42400, 0x20C37000,
-	0x20C2BC00, 0x20C20800, 0x20C15400,
-	0x20C0A000, 0x20BFEC00, 0x20BF3800,
-	0x20BE8400, 0x20BDD000, 0x20BD1C00,
-	0x20BC6800, 0x20BBB400, 0x20BB0000,
-	0x20BA4C00, 0x20B99800, 0x20B8E400,
-	0x20B83000, 0x20B77C00, 0x20B6C800,
-	0x20B61400, 0x20B56000, 0x20B4AC00,
-	0x20B3F800, 0x20B34400, 0x20B29000,
-	0x20B1DC00, 0x20B12800, 0x20B07400,
-	0x20AFC000, 0x20AF0C00, 0x20AE5800,
-	0x20ADA400, 0x20ACF000, 0x20AC3C00,
-	0x20AB8800, 0x20AAD400, 0x20AA2000,
-	0x20A96C00, 0x20A8B800, 0x20A80400,
-	0x20A75000, 0x20A69C00, 0x20A5E800,
-	0x20A53400, 0x20A48000, 0x20A3CC00,
-	0x20A31800, 0x20A26400, 0x20A1B000,
-	0x20A0FC00, 0x20A04800, 0x209F9400,
-	0x209EE000, 0x209E2C00, 0x209D7800,
-	0x209CC400, 0x209C1000, 0x209B5C00,
-	0x209AA800, 0x2099F400, 0x20994000,
-	0x20988C00, 0x2097D800, 0x20972400,
-	0x20967000, 0x2095BC00, 0x20950800,
-	0x20945400, 0x2093A000, 0x2092EC00,
-	0x20923800, 0x20918400, 0x2090D000,
-	0x20901C00, 0x208F6800, 0x208EB400,
-	0x208E0000, 0x208D4C00, 0x208C9800,
-	0x208BE400, 0x208B3000, 0x208A7C00,
-	0x2089C800, 0x20891400, 0x20886000,
-	0x2087AC00, 0x2086F800, 0x20864400,
-	0x20859000, 0x2084DC00, 0x20842800,
-	0x20837400, 0x2082C000, 0x20820C00,
-	0x20815800, 0x2080A400, 0x207FF000,
-	0x207F3C00, 0x207E8800, 0x207DD400,
-	0x207D2000, 0x207C6C00, 0x207BB800,
-	0x207B0400, 0x207A5000, 0x20799C00,
-	0x2078E800, 0x20783400, 0x20778000,
-	0x2076CC00, 0x20761800, 0x20756400,
-	0x2074B000, 0x2073FC00, 0x20734800,
-	0x20729400, 0x2071E000, 0x20712C00,
-	0x20707800, 0x206FC400, 0x206F1000,
-	0x206E5C00, 0x206DA800, 0x206CF400,
-	0x206C4000, 0x206B8C00, 0x206AD800,
-	0x206A2400, 0x20697000, 0x2068BC00,
-	0x20680800, 0x20675400, 0x2066A000,
-	0x2065EC00, 0x20653800, 0x20648400,
-	0x2063D000, 0x20631C00, 0x20626800,
-	0x2061B400, 0x20610000, 0x20604C00,
-	0x205F9800, 0x205EE400, 0x205E3000,
-	0x205D7C00, 0x205CC800, 0x205C1400,
-	0x205B6000, 0x205AAC00, 0x2059F800,
-	0x20594400, 0x20589000, 0x2057DC00,
-	0x20572800, 0x20567400, 0x2055C000,
-	0x20550C00, 0x20545800, 0x2053A400,
-	0x2052F000, 0x20523C00, 0x20518800,
-	0x2050D400, 0x20502000, 0x204F6C00,
-	0x204EB800, 0x204E0400, 0x204D5000,
-	0x204C9C00, 0x204BE800, 0x204B3400,
-	0x204A8000, 0x2049CC00, 0x20491800,
-	0x20486400, 0x2047B000, 0x2046FC00,
-	0x20464800, 0x20459400, 0x2044E000,
-	0x20442C00, 0x20437800, 0x2042C400,
-	0x20421000, 0x20415C00, 0x2040A800,
-	0x203FF400, 0x203F4000, 0x203E8C00,
-	0x203DD800, 0x203D2400, 0x203C7000,
-	0x203BBC00, 0x203B0800, 0x203A5400,
-	0x2039A000, 0x2038EC00, 0x20383800,
-	0x20378400, 0x2036D000, 0x20361C00,
-	0x20356800, 0x2034B400, 0x20340000,
-	0x20334C00, 0x20329800, 0x2031E400,
-	0x20313000, 0x20307C00, 0x202FC800,
-	0x202F1400, 0x202E6000, 0x202DAC00,
-	0x202CF800, 0x202C4400, 0x202B9000,
-	0x202ADC00, 0x202A2800, 0x20297400,
-	0x2028C000, 0x20280C00, 0x20275800,
-	0x2026A400, 0x2025F000, 0x20253C00,
-	0x20248800, 0x2023D400, 0x20232000,
-	0x20226C00, 0x2021B800, 0x20210400,
-	0x20205000, 0x201F9C00, 0x201EE800,
-	0x201E3400, 0x201D8000, 0x201CCC00,
-	0x201C1800, 0x201B6400, 0x201AB000,
-	0x2019FC00, 0x20194800, 0x20189400,
-	0x2017E000, 0x20172C00, 0x20167800,
-	0x2015C400, 0x20151000, 0x20145C00,
-	0x2013A800, 0x2012F400, 0x20124000,
-	0x20118C00, 0x2010D800, 0x20102400,
-	0x200F7000, 0x200EBC00, 0x200E0800,
-	0x200D5400, 0x200CA000, 0x200BEC00,
-	0x200B3800, 0x200A8400, 0x2009D000,
-	0x20091C00, 0x20086800, 0x2007B400,
-	0x20070000, 0x20064C00, 0x20059800,
-	0x2004E400, 0x20043000, 0x20037C00,
-	0x2002C800, 0x20021400, 0x20016000,
-	0x2000AC00, 0x1FFFF800, 0x1FFF4400,
-	0x1FFE9000, 0x1FFDDC00, 0x1FFD2800,
-	0x1FFC7400, 0x1FFBC000, 0x1FFB0C00,
-	0x1FFA5800, 0x1FF9A400, 0x1FF8F000,
-	0x1FF83C00, 0x1FF78800, 0x1FF6D400,
-	0x1FF62000, 0x1FF56C00, 0x1FF4B800,
-	0x1FF40400, 0x1FF35000, 0x1FF29C00,
-	0x1FF1E800, 0x1FF13400, 0x1FF08000,
-	0x1FEFCC00, 0x1FEF1800, 0x1FEE6400,
-	0x1FEDB000, 0x1FECFC00, 0x1FEC4800,
-	0x1FEB9400, 0x1FEAE000, 0x1FEA2C00,
-	0x1FE97800, 0x1FE8C400, 0x1FE81000,
-	0x1FE75C00, 0x1FE6A800, 0x1FE5F400,
-	0x1FE54000, 0x1FE48C00, 0x1FE3D800,
-	0x1FE32400, 0x1FE27000, 0x1FE1BC00,
-	0x1FE10800, 0x1FE05400, 0x1FDFA000,
-	0x1FDEEC00, 0x1FDE3800, 0x1FDD8400,
-	0x1FDCD000, 0x1FDC1C00, 0x1FDB6800,
-	0x1FDAB400, 0x1FDA0000, 0x1FD94C00,
-	0x1FD89800, 0x1FD7E400, 0x1FD73000,
-	0x1FD67C00, 0x1FD5C800, 0x1FD51400,
-	0x1FD46000, 0x1FD3AC00, 0x1FD2F800,
-	0x1FD24400, 0x1FD19000, 0x1FD0DC00,
-	0x1FD02800, 0x1FCF7400, 0x1FCEC000,
-	0x1FCE0C00, 0x1FCD5800, 0x1FCCA400,
-	0x1FCBF000, 0x1FCB3C00, 0x1FCA8800,
-	0x1FC9D400, 0x1FC92000, 0x1FC86C00,
-	0x1FC7B800, 0x1FC70400, 0x1FC65000,
-	0x1FC59C00, 0x1FC4E800, 0x1FC43400,
-	0x1FC38000, 0x1FC2CC00, 0x1FC21800,
-	0x1FC16400, 0x1FC0B000, 0x1FBFFC00,
-	0x1FBF4800, 0x1FBE9400, 0x1FBDE000,
-	0x1FBD2C00, 0x1FBC7800, 0x1FBBC400,
-	0x1FBB1000, 0x1FBA5C00, 0x1FB9A800,
-	0x1FB8F400, 0x1FB84000, 0x1FB78C00,
-	0x1FB6D800, 0x1FB62400, 0x1FB57000,
-	0x1FB4BC00, 0x1FB40800, 0x1FB35400,
-	0x1FB2A000, 0x1FB1EC00, 0x1FB13800,
-	0x1FB08400, 0x1FAFD000, 0x1FAF1C00,
-	0x1FAE6800, 0x1FADB400, 0x1FAD0000,
-	0x1FAC4C00, 0x1FAB9800, 0x1FAAE400,
-	0x1FAA3000, 0x1FA97C00, 0x1FA8C800,
-	0x1FA81400, 0x1FA76000, 0x1FA6AC00,
-	0x1FA5F800, 0x1FA54400, 0x1FA49000,
-	0x1FA3DC00, 0x1FA32800, 0x1FA27400,
-	0x1FA1C000, 0x1FA10C00, 0x1FA05800,
-	0x1F9FA400, 0x1F9EF000, 0x1F9E3C00,
-	0x1F9D8800, 0x1F9CD400, 0x1F9C2000,
-	0x1F9B6C00, 0x1F9AB800, 0x1F9A0400,
-	0x1F995000, 0x1F989C00, 0x1F97E800,
-	0x1F973400, 0x1F968000, 0x1F95CC00,
-	0x1F951800, 0x1F946400, 0x1F93B000,
-	0x1F92FC00, 0x1F924800, 0x1F919400,
-	0x1F90E000, 0x1F902C00, 0x1F8F7800,
-	0x1F8EC400, 0x1F8E1000, 0x1F8D5C00,
-	0x1F8CA800, 0x1F8BF400, 0x1F8B4000,
-	0x1F8A8C00, 0x1F89D800, 0x1F892400,
-	0x1F887000, 0x1F87BC00, 0x1F870800,
-	0x1F865400, 0x1F85A000, 0x1F84EC00,
-	0x1F843800, 0x1F838400, 0x1F82D000,
-	0x1F821C00, 0x1F816800, 0x1F80B400,
-	0x1F800000, 0x1F7F4C00, 0x1F7E9800,
-	0x1F7DE400, 0x1F7D3000, 0x1F7C7C00,
-	0x1F7BC800, 0x1F7B1400, 0x1F7A6000,
-	0x1F79AC00, 0x1F78F800, 0x1F784400,
-	0x1F779000, 0x1F76DC00, 0x1F762800,
-	0x1F757400, 0x1F74C000, 0x1F740C00,
-	0x1F735800, 0x1F72A400, 0x1F71F000,
-	0x1F713C00, 0x1F708800, 0x1F6FD400,
-	0x1F6F2000, 0x1F6E6C00, 0x1F6DB800,
-	0x1F6D0400, 0x1F6C5000, 0x1F6B9C00,
-	0x1F6AE800, 0x1F6A3400, 0x1F698000,
-	0x1F68CC00, 0x1F681800, 0x1F676400,
-	0x1F66B000, 0x1F65FC00, 0x1F654800,
-	0x1F649400, 0x1F63E000, 0x1F632C00,
-	0x1F627800, 0x1F61C400, 0x1F611000,
-	0x1F605C00, 0x1F5FA800, 0x1F5EF400,
-	0x1F5E4000, 0x1F5D8C00, 0x1F5CD800,
-	0x1F5C2400, 0x1F5B7000, 0x1F5ABC00,
-	0x1F5A0800, 0x1F595400, 0x1F58A000,
-	0x1F57EC00, 0x1F573800, 0x1F568400,
-	0x1F55D000, 0x1F551C00, 0x1F546800,
-	0x1F53B400, 0x1F530000, 0x1F524C00,
-	0x1F519800, 0x1F50E400, 0x1F503000,
-	0x1F4F7C00, 0x1F4EC800, 0x1F4E1400,
-	0x1F4D6000, 0x1F4CAC00, 0x1F4BF800,
-	0x1F4B4400, 0x1F4A9000, 0x1F49DC00,
-	0x1F492800, 0x1F487400, 0x1F47C000,
-	0x1F470C00, 0x1F465800, 0x1F45A400,
-	0x1F44F000, 0x1F443C00, 0x1F438800,
-	0x1F42D400, 0x1F422000, 0x1F416C00,
-	0x1F40B800, 0x1F400400, 0x1F3F5000,
-	0x1F3E9C00, 0x1F3DE800, 0x1F3D3400,
-	0x1F3C8000, 0x1F3BCC00, 0x1F3B1800,
-	0x1F3A6400, 0x1F39B000, 0x1F38FC00,
-	0x1F384800, 0x1F379400, 0x1F36E000,
-	0x1F362C00, 0x1F357800, 0x1F34C400,
-	0x1F341000, 0x1F335C00, 0x1F32A800,
-	0x1F31F400, 0x1F314000, 0x1F308C00,
-	0x1F2FD800, 0x1F2F2400, 0x1F2E7000,
-	0x1F2DBC00, 0x1F2D0800, 0x1F2C5400,
-	0x1F2BA000, 0x1F2AEC00, 0x1F2A3800,
-	0x1F298400, 0x1F28D000, 0x1F281C00,
-	0x1F276800, 0x1F26B400, 0x1F260000,
-	0x1F254C00, 0x1F249800, 0x1F23E400,
-	0x1F233000, 0x1F227C00, 0x1F21C800,
-	0x1F211400, 0x1F206000, 0x1F1FAC00,
-	0x1F1EF800, 0x1F1E4400, 0x1F1D9000,
-	0x1F1CDC00, 0x1F1C2800, 0x1F1B7400,
-	0x1F1AC000, 0x1F1A0C00, 0x1F195800,
-	0x1F18A400, 0x1F17F000, 0x1F173C00,
-	0x1F168800, 0x1F15D400, 0x1F152000,
-	0x1F146C00, 0x1F13B800, 0x1F130400,
-	0x1F125000, 0x1F119C00, 0x1F10E800,
-	0x1F103400, 0x1F0F8000, 0x1F0ECC00,
-	0x1F0E1800, 0x1F0D6400, 0x1F0CB000,
-	0x1F0BFC00, 0x1F0B4800, 0x1F0A9400,
-	0x1F09E000, 0x1F092C00, 0x1F087800,
-	0x1F07C400, 0x1F071000, 0x1F065C00,
-	0x1F05A800, 0x1F04F400, 0x1F044000,
-	0x1F038C00, 0x1F02D800, 0x1F022400,
-	0x1F017000, 0x1F00BC00, 0x1F000800,
-	0x1EFF5400, 0x1EFEA000, 0x1EFDEC00,
-	0x1EFD3800, 0x1EFC8400, 0x1EFBD000,
-	0x1EFB1C00, 0x1EFA6800, 0x1EF9B400,
-	0x1EF90000, 0x1EF84C00, 0x1EF79800,
-	0x1EF6E400, 0x1EF63000, 0x1EF57C00,
-	0x1EF4C800, 0x1EF41400, 0x1EF36000,
-	0x1EF2AC00, 0x1EF1F800, 0x1EF14400,
-	0x1EF09000, 0x1EEFDC00, 0x1EEF2800,
-	0x1EEE7400, 0x1EEDC000, 0x1EED0C00,
-	0x1EEC5800, 0x1EEBA400, 0x1EEAF000,
-	0x1EEA3C00, 0x1EE98800, 0x1EE8D400,
-	0x1EE82000, 0x1EE76C00, 0x1EE6B800,
-	0x1EE60400, 0x1EE55000, 0x1EE49C00,
-	0x1EE3E800, 0x1EE33400, 0x1EE28000,
-	0x1EE1CC00, 0x1EE11800, 0x1EE06400,
-	0x1EDFB000, 0x1EDEFC00, 0x1EDE4800,
-	0x1EDD9400, 0x1EDCE000, 0x1EDC2C00,
-	0x1EDB7800, 0x1EDAC400, 0x1EDA1000,
-	0x1ED95C00, 0x1ED8A800, 0x1ED7F400,
-	0x1ED74000, 0x1ED68C00, 0x1ED5D800,
-	0x1ED52400, 0x1ED47000, 0x1ED3BC00,
-	0x1ED30800, 0x1ED25400, 0x1ED1A000,
-	0x1ED0EC00, 0x1ED03800, 0x1ECF8400,
-	0x1ECED000, 0x1ECE1C00, 0x1ECD6800,
-	0x1ECCB400, 0x1ECC0000, 0x1ECB4C00,
-	0x1ECA9800, 0x1EC9E400, 0x1EC93000,
-	0x1EC87C00, 0x1EC7C800, 0x1EC71400,
-	0x1EC66000, 0x1EC5AC00, 0x1EC4F800,
-	0x1EC44400, 0x1EC39000, 0x1EC2DC00,
-	0x1EC22800, 0x1EC17400, 0x1EC0C000,
-	0x1EC00C00, 0x1EBF5800, 0x1EBEA400,
-	0x1EBDF000, 0x1EBD3C00, 0x1EBC8800,
-	0x1EBBD400, 0x1EBB2000, 0x1EBA6C00,
-	0x1EB9B800, 0x1EB90400, 0x1EB85000,
-	0x1EB79C00, 0x1EB6E800, 0x1EB63400,
-	0x1EB58000, 0x1EB4CC00, 0x1EB41800,
-	0x1EB36400, 0x1EB2B000, 0x1EB1FC00,
-	0x1EB14800, 0x1EB09400, 0x1EAFE000,
-	0x1EAF2C00, 0x1EAE7800, 0x1EADC400,
-	0x1EAD1000, 0x1EAC5C00, 0x1EABA800,
-	0x1EAAF400, 0x1EAA4000, 0x1EA98C00,
-	0x1EA8D800, 0x1EA82400, 0x1EA77000,
-	0x1EA6BC00, 0x1EA60800, 0x1EA55400,
-	0x1EA4A000, 0x1EA3EC00, 0x1EA33800,
-	0x1EA28400, 0x1EA1D000, 0x1EA11C00,
-	0x1EA06800, 0x1E9FB400, 0x1E9F0000,
-	0x1E9E4C00, 0x1E9D9800, 0x1E9CE400,
-	0x1E9C3000, 0x1E9B7C00, 0x1E9AC800,
-	0x1E9A1400, 0x1E996000, 0x1E98AC00,
-	0x1E97F800, 0x1E974400, 0x1E969000,
-	0x1E95DC00, 0x1E952800, 0x1E947400,
-	0x1E93C000, 0x1E930C00, 0x1E925800,
-	0x1E91A400, 0x1E90F000, 0x1E903C00,
-	0x1E8F8800, 0x1E8ED400, 0x1E8E2000,
-	0x1E8D6C00, 0x1E8CB800, 0x1E8C0400,
-	0x1E8B5000, 0x1E8A9C00, 0x1E89E800,
-	0x1E893400, 0x1E888000, 0x1E87CC00,
-	0x1E871800, 0x1E866400, 0x1E85B000,
-	0x1E84FC00, 0x1E844800, 0x1E839400,
-	0x1E82E000, 0x1E822C00, 0x1E817800,
-	0x1E80C400, 0x1E801000, 0x1E7F5C00,
-	0x1E7EA800, 0x1E7DF400, 0x1E7D4000,
-	0x1E7C8C00, 0x1E7BD800, 0x1E7B2400,
-	0x1E7A7000, 0x1E79BC00, 0x1E790800,
-	0x1E785400, 0x1E77A000, 0x1E76EC00,
-	0x1E763800, 0x1E758400, 0x1E74D000,
-	0x1E741C00, 0x1E736800, 0x1E72B400,
-	0x1E720000, 0x1E714C00, 0x1E709800,
-	0x1E6FE400, 0x1E6F3000, 0x1E6E7C00,
-	0x1E6DC800, 0x1E6D1400, 0x1E6C6000,
-	0x1E6BAC00, 0x1E6AF800, 0x1E6A4400,
-	0x1E699000, 0x1E68DC00, 0x1E682800,
-	0x1E677400, 0x1E66C000, 0x1E660C00,
-	0x1E655800, 0x1E64A400, 0x1E63F000,
-	0x1E633C00, 0x1E628800, 0x1E61D400,
-	0x1E612000, 0x1E606C00, 0x1E5FB800,
-	0x1E5F0400, 0x1E5E5000, 0x1E5D9C00,
-	0x1E5CE800, 0x1E5C3400, 0x1E5B8000,
-	0x1E5ACC00, 0x1E5A1800, 0x1E596400,
-	0x1E58B000, 0x1E57FC00, 0x1E574800,
-	0x1E569400, 0x1E55E000, 0x1E552C00,
-	0x1E547800, 0x1E53C400, 0x1E531000,
-	0x1E525C00, 0x1E51A800, 0x1E50F400,
-	0x1E504000, 0x1E4F8C00, 0x1E4ED800,
-	0x1E4E2400, 0x1E4D7000, 0x1E4CBC00,
-	0x1E4C0800, 0x1E4B5400, 0x1E4AA000,
-	0x1E49EC00, 0x1E493800, 0x1E488400,
-	0x1E47D000, 0x1E471C00, 0x1E466800,
-	0x1E45B400, 0x1E450000, 0x1E444C00,
-	0x1E439800, 0x1E42E400, 0x1E423000,
-	0x1E417C00, 0x1E40C800, 0x1E401400,
-	0x1E3F6000, 0x1E3EAC00, 0x1E3DF800,
-	0x1E3D4400, 0x1E3C9000, 0x1E3BDC00,
-	0x1E3B2800, 0x1E3A7400, 0x1E39C000,
-	0x1E390C00, 0x1E385800, 0x1E37A400,
-	0x1E36F000, 0x1E363C00, 0x1E358800,
-	0x1E34D400, 0x1E342000, 0x1E336C00,
-	0x1E32B800, 0x1E320400, 0x1E315000,
-	0x1E309C00, 0x1E2FE800, 0x1E2F3400,
-	0x1E2E8000, 0x1E2DCC00, 0x1E2D1800,
-	0x1E2C6400, 0x1E2BB000, 0x1E2AFC00,
-	0x1E2A4800, 0x1E299400, 0x1E28E000,
-	0x1E282C00, 0x1E277800, 0x1E26C400,
-	0x1E261000, 0x1E255C00, 0x1E24A800,
-	0x1E23F400, 0x1E234000, 0x1E228C00,
-	0x1E21D800, 0x1E212400, 0x1E207000,
-	0x1E1FBC00, 0x1E1F0800, 0x1E1E5400,
-	0x1E1DA000, 0x1E1CEC00, 0x1E1C3800,
-	0x1E1B8400, 0x1E1AD000, 0x1E1A1C00,
-	0x1E196800, 0x1E18B400, 0x1E180000,
-	0x1E174C00, 0x1E169800, 0x1E15E400,
-	0x1E153000, 0x1E147C00, 0x1E13C800,
-	0x1E131400, 0x1E126000, 0x1E11AC00,
-	0x1E10F800, 0x1E104400, 0x1E0F9000,
-	0x1E0EDC00, 0x1E0E2800, 0x1E0D7400,
-	0x1E0CC000, 0x1E0C0C00, 0x1E0B5800,
-	0x1E0AA400, 0x1E09F000, 0x1E093C00,
-	0x1E088800, 0x1E07D400, 0x1E072000,
-	0x1E066C00, 0x1E05B800, 0x1E050400,
-	0x1E045000, 0x1E039C00, 0x1E02E800,
-	0x1E023400, 0x1E018000, 0x1E00CC00,
-	0x1E001800, 0x1DFF6400, 0x1DFEB000,
-	0x1DFDFC00, 0x1DFD4800, 0x1DFC9400,
-	0x1DFBE000, 0x1DFB2C00, 0x1DFA7800,
-	0x1DF9C400, 0x1DF91000, 0x1DF85C00,
-	0x1DF7A800, 0x1DF6F400, 0x1DF64000,
-	0x1DF58C00, 0x1DF4D800, 0x1DF42400,
-	0x1DF37000, 0x1DF2BC00, 0x1DF20800,
-	0x1DF15400, 0x1DF0A000, 0x1DEFEC00,
-	0x1DEF3800, 0x1DEE8400, 0x1DEDD000,
-	0x1DED1C00, 0x1DEC6800, 0x1DEBB400,
-	0x1DEB0000, 0x1DEA4C00, 0x1DE99800,
-	0x1DE8E400, 0x1DE83000, 0x1DE77C00,
-	0x1DE6C800, 0x1DE61400, 0x1DE56000,
-	0x1DE4AC00, 0x1DE3F800, 0x1DE34400,
-	0x1DE29000, 0x1DE1DC00, 0x1DE12800,
-	0x1DE07400, 0x1DDFC000, 0x1DDF0C00,
-	0x1DDE5800, 0x1DDDA400, 0x1DDCF000,
-	0x1DDC3C00, 0x1DDB8800, 0x1DDAD400,
-	0x1DDA2000, 0x1DD96C00, 0x1DD8B800,
-	0x1DD80400, 0x1DD75000, 0x1DD69C00,
-	0x1DD5E800, 0x1DD53400, 0x1DD48000,
-	0x1DD3CC00, 0x1DD31800, 0x1DD26400,
-	0x1DD1B000, 0x1DD0FC00, 0x1DD04800,
-	0x1DCF9400, 0x1DCEE000, 0x1DCE2C00,
-	0x1DCD7800, 0x1DCCC400, 0x1DCC1000,
-	0x1DCB5C00, 0x1DCAA800, 0x1DC9F400,
-	0x1DC94000, 0x1DC88C00, 0x1DC7D800,
-	0x1DC72400, 0x1DC67000, 0x1DC5BC00,
-	0x1DC50800, 0x1DC45400, 0x1DC3A000,
-	0x1DC2EC00, 0x1DC23800, 0x1DC18400,
-	0x1DC0D000, 0x1DC01C00, 0x1DBF6800,
-	0x1DBEB400, 0x1DBE0000, 0x1DBD4C00,
-	0x1DBC9800, 0x1DBBE400, 0x1DBB3000,
-	0x1DBA7C00, 0x1DB9C800, 0x1DB91400,
-	0x1DB86000, 0x1DB7AC00, 0x1DB6F800,
-	0x1DB64400, 0x1DB59000, 0x1DB4DC00,
-	0x1DB42800, 0x1DB37400, 0x1DB2C000,
-	0x1DB20C00, 0x1DB15800, 0x1DB0A400,
-	0x1DAFF000, 0x1DAF3C00, 0x1DAE8800,
-	0x1DADD400, 0x1DAD2000, 0x1DAC6C00,
-	0x1DABB800, 0x1DAB0400, 0x1DAA5000,
-	0x1DA99C00, 0x1DA8E800, 0x1DA83400,
-	0x1DA78000, 0x1DA6CC00, 0x1DA61800,
-	0x1DA56400, 0x1DA4B000, 0x1DA3FC00,
-	0x1DA34800, 0x1DA29400, 0x1DA1E000,
-	0x1DA12C00, 0x1DA07800, 0x1D9FC400,
-	0x1D9F1000, 0x1D9E5C00, 0x1D9DA800,
-	0x1D9CF400, 0x1D9C4000, 0x1D9B8C00,
-	0x1D9AD800, 0x1D9A2400, 0x1D997000,
-	0x1D98BC00, 0x1D980800, 0x1D975400,
-	0x1D96A000, 0x1D95EC00, 0x1D953800,
-	0x1D948400, 0x1D93D000, 0x1D931C00,
-	0x1D926800, 0x1D91B400, 0x1D910000,
-	0x1D904C00, 0x1D8F9800, 0x1D8EE400,
-	0x1D8E3000, 0x1D8D7C00, 0x1D8CC800,
-	0x1D8C1400, 0x1D8B6000, 0x1D8AAC00,
-	0x1D89F800, 0x1D894400, 0x1D889000,
-	0x1D87DC00, 0x1D872800, 0x1D867400,
-	0x1D85C000, 0x1D850C00, 0x1D845800,
-	0x1D83A400, 0x1D82F000, 0x1D823C00,
-	0x1D818800, 0x1D80D400, 0x1D802000,
-	0x1D7F6C00, 0x1D7EB800, 0x1D7E0400,
-	0x1D7D5000, 0x1D7C9C00, 0x1D7BE800,
-	0x1D7B3400, 0x1D7A8000, 0x1D79CC00,
-	0x1D791800, 0x1D786400, 0x1D77B000,
-	0x1D76FC00, 0x1D764800, 0x1D759400,
-	0x1D74E000, 0x1D742C00, 0x1D737800,
-	0x1D72C400, 0x1D721000, 0x1D715C00,
-	0x1D70A800, 0x1D6FF400, 0x1D6F4000,
-	0x1D6E8C00, 0x1D6DD800, 0x1D6D2400,
-	0x1D6C7000, 0x1D6BBC00, 0x1D6B0800,
-	0x1D6A5400, 0x1D69A000, 0x1D68EC00,
-	0x1D683800, 0x1D678400, 0x1D66D000,
-	0x1D661C00, 0x1D656800, 0x1D64B400,
-	0x1D640000, 0x1D634C00, 0x1D629800,
-	0x1D61E400, 0x1D613000, 0x1D607C00,
-	0x1D5FC800, 0x1D5F1400, 0x1D5E6000,
-	0x1D5DAC00, 0x1D5CF800, 0x1D5C4400,
-	0x1D5B9000, 0x1D5ADC00, 0x1D5A2800,
-	0x1D597400, 0x1D58C000, 0x1D580C00,
-	0x1D575800, 0x1D56A400, 0x1D55F000,
-	0x1D553C00, 0x1D548800, 0x1D53D400,
-	0x1D532000, 0x1D526C00, 0x1D51B800,
-	0x1D510400, 0x1D505000, 0x1D4F9C00,
-	0x1D4EE800, 0x1D4E3400, 0x1D4D8000,
-	0x1D4CCC00, 0x1D4C1800, 0x1D4B6400,
-	0x1D4AB000, 0x1D49FC00, 0x1D494800,
-	0x1D489400, 0x1D47E000, 0x1D472C00,
-	0x1D467800, 0x1D45C400, 0x1D451000,
-	0x1D445C00, 0x1D43A800, 0x1D42F400,
-	0x1D424000, 0x1D418C00, 0x1D40D800,
-	0x1D402400, 0x1D3F7000, 0x1D3EBC00,
-	0x1D3E0800, 0x1D3D5400, 0x1D3CA000,
-	0x1D3BEC00, 0x1D3B3800, 0x1D3A8400,
-	0x1D39D000, 0x1D391C00, 0x1D386800,
-	0x1D37B400, 0x1D370000, 0x1D364C00,
-	0x1D359800, 0x1D34E400, 0x1D343000,
-	0x1D337C00, 0x1D32C800, 0x1D321400,
-	0x1D316000, 0x1D30AC00, 0x1D2FF800,
-	0x1D2F4400, 0x1D2E9000, 0x1D2DDC00,
-	0x1D2D2800, 0x1D2C7400, 0x1D2BC000,
-	0x1D2B0C00, 0x1D2A5800, 0x1D29A400,
-	0x1D28F000, 0x1D283C00, 0x1D278800,
-	0x1D26D400, 0x1D262000, 0x1D256C00,
-	0x1D24B800, 0x1D240400, 0x1D235000,
-	0x1D229C00, 0x1D21E800, 0x1D213400,
-	0x1D208000, 0x1D1FCC00, 0x1D1F1800,
-	0x1D1E6400, 0x1D1DB000, 0x1D1CFC00,
-	0x1D1C4800, 0x1D1B9400, 0x1D1AE000,
-	0x1D1A2C00, 0x1D197800, 0x1D18C400,
-	0x1D181000, 0x1D175C00, 0x1D16A800,
-	0x1D15F400, 0x1D154000, 0x1D148C00,
-	0x1D13D800, 0x1D132400, 0x1D127000,
-	0x1D11BC00, 0x1D110800, 0x1D105400,
-	0x1D0FA000, 0x1D0EEC00, 0x1D0E3800,
-	0x1D0D8400, 0x1D0CD000, 0x1D0C1C00,
-	0x1D0B6800, 0x1D0AB400, 0x1D0A0000,
-	0x1D094C00, 0x1D089800, 0x1D07E400,
-	0x1D073000, 0x1D067C00, 0x1D05C800,
-	0x1D051400, 0x1D046000, 0x1D03AC00,
-	0x1D02F800, 0x1D024400, 0x1D019000,
-	0x1D00DC00, 0x1D002800, 0x1CFF7400,
-	0x1CFEC000, 0x1CFE0C00, 0x1CFD5800,
-	0x1CFCA400, 0x1CFBF000, 0x1CFB3C00,
-	0x1CFA8800, 0x1CF9D400, 0x1CF92000,
-	0x1CF86C00, 0x1CF7B800, 0x1CF70400,
-	0x1CF65000, 0x1CF59C00, 0x1CF4E800,
-	0x1CF43400, 0x1CF38000, 0x1CF2CC00,
-	0x1CF21800, 0x1CF16400, 0x1CF0B000,
-	0x1CEFFC00, 0x1CEF4800, 0x1CEE9400,
-	0x1CEDE000, 0x1CED2C00, 0x1CEC7800,
-	0x1CEBC400, 0x1CEB1000, 0x1CEA5C00,
-	0x1CE9A800, 0x1CE8F400, 0x1CE84000,
-	0x1CE78C00, 0x1CE6D800, 0x1CE62400,
-	0x1CE57000, 0x1CE4BC00, 0x1CE40800,
-	0x1CE35400, 0x1CE2A000, 0x1CE1EC00,
-	0x1CE13800, 0x1CE08400, 0x1CDFD000,
-	0x1CDF1C00, 0x1CDE6800, 0x1CDDB400,
-	0x1CDD0000, 0x1CDC4C00, 0x1CDB9800,
-	0x1CDAE400, 0x1CDA3000, 0x1CD97C00,
-	0x1CD8C800, 0x1CD81400, 0x1CD76000,
-	0x1CD6AC00, 0x1CD5F800, 0x1CD54400,
-	0x1CD49000, 0x1CD3DC00, 0x1CD32800,
-	0x1CD27400, 0x1CD1C000, 0x1CD10C00,
-	0x1CD05800, 0x1CCFA400, 0x1CCEF000,
-	0x1CCE3C00, 0x1CCD8800, 0x1CCCD400,
-	0x1CCC2000, 0x1CCB6C00, 0x1CCAB800,
-	0x1CCA0400, 0x1CC95000, 0x1CC89C00,
-	0x1CC7E800, 0x1CC73400, 0x1CC68000,
-	0x1CC5CC00, 0x1CC51800, 0x1CC46400,
-	0x1CC3B000, 0x1CC2FC00, 0x1CC24800,
-	0x1CC19400, 0x1CC0E000, 0x1CC02C00,
-	0x1CBF7800, 0x1CBEC400, 0x1CBE1000,
-	0x1CBD5C00, 0x1CBCA800, 0x1CBBF400,
-	0x1CBB4000, 0x1CBA8C00, 0x1CB9D800,
-	0x1CB92400, 0x1CB87000, 0x1CB7BC00,
-	0x1CB70800, 0x1CB65400, 0x1CB5A000,
-	0x1CB4EC00, 0x1CB43800, 0x1CB38400,
-	0x1CB2D000, 0x1CB21C00, 0x1CB16800,
-	0x1CB0B400, 0x1CB00000, 0x1CAF4C00,
-	0x1CAE9800, 0x1CADE400, 0x1CAD3000,
-	0x1CAC7C00, 0x1CABC800, 0x1CAB1400,
-	0x1CAA6000, 0x1CA9AC00, 0x1CA8F800,
-	0x1CA84400, 0x1CA79000, 0x1CA6DC00,
-	0x1CA62800, 0x1CA57400, 0x1CA4C000,
-	0x1CA40C00, 0x1CA35800, 0x1CA2A400,
-	0x1CA1F000, 0x1CA13C00, 0x1CA08800,
-	0x1C9FD400, 0x1C9F2000, 0x1C9E6C00,
-	0x1C9DB800, 0x1C9D0400, 0x1C9C5000,
-	0x1C9B9C00, 0x1C9AE800, 0x1C9A3400,
-	0x1C998000, 0x1C98CC00, 0x1C981800,
-	0x1C976400, 0x1C96B000, 0x1C95FC00,
-	0x1C954800, 0x1C949400, 0x1C93E000,
-	0x1C932C00, 0x1C927800, 0x1C91C400,
-	0x1C911000, 0x1C905C00, 0x1C8FA800,
-	0x1C8EF400, 0x1C8E4000, 0x1C8D8C00,
-	0x1C8CD800, 0x1C8C2400, 0x1C8B7000,
-	0x1C8ABC00, 0x1C8A0800, 0x1C895400,
-	0x1C88A000, 0x1C87EC00, 0x1C873800,
-	0x1C868400, 0x1C85D000, 0x1C851C00,
-	0x1C846800, 0x1C83B400, 0x1C830000,
-	0x1C824C00, 0x1C819800, 0x1C80E400,
-	0x1C803000, 0x1C7F7C00, 0x1C7EC800,
-	0x1C7E1400, 0x1C7D6000, 0x1C7CAC00,
-	0x1C7BF800, 0x1C7B4400, 0x1C7A9000,
-	0x1C79DC00, 0x1C792800, 0x1C787400,
-	0x1C77C000, 0x1C770C00, 0x1C765800,
-	0x1C75A400, 0x1C74F000, 0x1C743C00,
-	0x1C738800, 0x1C72D400, 0x1C722000,
-	0x1C716C00, 0x1C70B800, 0x1C700400,
-	0x1C6F5000, 0x1C6E9C00, 0x1C6DE800,
-	0x1C6D3400, 0x1C6C8000, 0x1C6BCC00,
-	0x1C6B1800, 0x1C6A6400, 0x1C69B000,
-	0x1C68FC00, 0x1C684800, 0x1C679400,
-	0x1C66E000, 0x1C662C00, 0x1C657800,
-	0x1C64C400, 0x1C641000, 0x1C635C00,
-	0x1C62A800, 0x1C61F400, 0x1C614000,
-	0x1C608C00, 0x1C5FD800, 0x1C5F2400,
-	0x1C5E7000, 0x1C5DBC00, 0x1C5D0800,
-	0x1C5C5400, 0x1C5BA000, 0x1C5AEC00,
-	0x1C5A3800, 0x1C598400, 0x1C58D000,
-	0x1C581C00, 0x1C576800, 0x1C56B400,
-	0x1C560000, 0x1C554C00, 0x1C549800,
-	0x1C53E400, 0x1C533000, 0x1C527C00,
-	0x1C51C800, 0x1C511400, 0x1C506000,
-	0x1C4FAC00, 0x1C4EF800, 0x1C4E4400,
-	0x1C4D9000, 0x1C4CDC00, 0x1C4C2800,
-	0x1C4B7400, 0x1C4AC000, 0x1C4A0C00,
-	0x1C495800, 0x1C48A400, 0x1C47F000,
-	0x1C473C00, 0x1C468800, 0x1C45D400,
-	0x1C452000, 0x1C446C00, 0x1C43B800,
-	0x1C430400, 0x1C425000, 0x1C419C00,
-	0x1C40E800, 0x1C403400, 0x1C3F8000,
-	0x1C3ECC00, 0x1C3E1800, 0x1C3D6400,
-	0x1C3CB000, 0x1C3BFC00, 0x1C3B4800,
-	0x1C3A9400, 0x1C39E000, 0x1C392C00,
-	0x1C387800, 0x1C37C400, 0x1C371000,
-	0x1C365C00, 0x1C35A800, 0x1C34F400,
-	0x1C344000, 0x1C338C00, 0x1C32D800,
-	0x1C322400, 0x1C317000, 0x1C30BC00,
-	0x1C300800, 0x1C2F5400, 0x1C2EA000,
-	0x1C2DEC00, 0x1C2D3800, 0x1C2C8400,
-	0x1C2BD000, 0x1C2B1C00, 0x1C2A6800,
-	0x1C29B400, 0x1C290000, 0x1C284C00,
-	0x1C279800, 0x1C26E400, 0x1C263000,
-	0x1C257C00, 0x1C24C800, 0x1C241400,
-	0x1C236000, 0x1C22AC00, 0x1C21F800,
-	0x1C214400, 0x1C209000, 0x1C1FDC00,
-	0x1C1F2800, 0x1C1E7400, 0x1C1DC000,
-	0x1C1D0C00, 0x1C1C5800, 0x1C1BA400,
-	0x1C1AF000, 0x1C1A3C00, 0x1C198800,
-	0x1C18D400, 0x1C182000, 0x1C176C00,
-	0x1C16B800, 0x1C160400, 0x1C155000,
-	0x1C149C00, 0x1C13E800, 0x1C133400,
-	0x1C128000, 0x1C11CC00, 0x1C111800,
-	0x1C106400, 0x1C0FB000, 0x1C0EFC00,
-	0x1C0E4800, 0x1C0D9400, 0x1C0CE000,
-	0x1C0C2C00, 0x1C0B7800, 0x1C0AC400,
-	0x1C0A1000, 0x1C095C00, 0x1C08A800,
-	0x1C07F400, 0x1C074000, 0x1C068C00,
-	0x1C05D800, 0x1C052400, 0x1C047000,
-	0x1C03BC00, 0x1C030800, 0x1C025400,
-	0x1C01A000, 0x1C00EC00, 0x1C003800,
-	0x1BFF8400, 0x1BFED000, 0x1BFE1C00,
-	0x1BFD6800, 0x1BFCB400, 0x1BFC0000,
-	0x1BFB5600, 0x1BFAAC00, 0x1BFA0200,
-	0x1BF95800, 0x1BF8AE00, 0x1BF80400,
-	0x1BF75A00, 0x1BF6B000, 0x1BF60600,
-	0x1BF55C00, 0x1BF4B200, 0x1BF40800,
-	0x1BF35E00, 0x1BF2B400, 0x1BF20A00,
-	0x1BF16000, 0x1BF0B600, 0x1BF00C00,
-	0x1BEF6200, 0x1BEEB800, 0x1BEE0E00,
-	0x1BED6400, 0x1BECBA00, 0x1BEC1000,
-	0x1BEB6600, 0x1BEABC00, 0x1BEA1200,
-	0x1BE96800, 0x1BE8BE00, 0x1BE81400,
-	0x1BE76A00, 0x1BE6C000, 0x1BE61600,
-	0x1BE56C00, 0x1BE4C200, 0x1BE41800,
-	0x1BE36E00, 0x1BE2C400, 0x1BE21A00,
-	0x1BE17000, 0x1BE0C600, 0x1BE01C00,
-	0x1BDF7200, 0x1BDEC800, 0x1BDE1E00,
-	0x1BDD7400, 0x1BDCCA00, 0x1BDC2000,
-	0x1BDB7600, 0x1BDACC00, 0x1BDA2200,
-	0x1BD97800, 0x1BD8CE00, 0x1BD82400,
-	0x1BD77A00, 0x1BD6D000, 0x1BD62600,
-	0x1BD57C00, 0x1BD4D200, 0x1BD42800,
-	0x1BD37E00, 0x1BD2D400, 0x1BD22A00,
-	0x1BD18000, 0x1BD0D600, 0x1BD02C00,
-	0x1BCF8200, 0x1BCED800, 0x1BCE2E00,
-	0x1BCD8400, 0x1BCCDA00, 0x1BCC3000,
-	0x1BCB8600, 0x1BCADC00, 0x1BCA3200,
-	0x1BC98800, 0x1BC8DE00, 0x1BC83400,
-	0x1BC78A00, 0x1BC6E000, 0x1BC63600,
-	0x1BC58C00, 0x1BC4E200, 0x1BC43800,
-	0x1BC38E00, 0x1BC2E400, 0x1BC23A00,
-	0x1BC19000, 0x1BC0E600, 0x1BC03C00,
-	0x1BBF9200, 0x1BBEE800, 0x1BBE3E00,
-	0x1BBD9400, 0x1BBCEA00, 0x1BBC4000,
-	0x1BBB9600, 0x1BBAEC00, 0x1BBA4200,
-	0x1BB99800, 0x1BB8EE00, 0x1BB84400,
-	0x1BB79A00, 0x1BB6F000, 0x1BB64600,
-	0x1BB59C00, 0x1BB4F200, 0x1BB44800,
-	0x1BB39E00, 0x1BB2F400, 0x1BB24A00,
-	0x1BB1A000, 0x1BB0F600, 0x1BB04C00,
-	0x1BAFA200, 0x1BAEF800, 0x1BAE4E00,
-	0x1BADA400, 0x1BACFA00, 0x1BAC5000,
-	0x1BABA600, 0x1BAAFC00, 0x1BAA5200,
-	0x1BA9A800, 0x1BA8FE00, 0x1BA85400,
-	0x1BA7AA00, 0x1BA70000, 0x1BA65600,
-	0x1BA5AC00, 0x1BA50200, 0x1BA45800,
-	0x1BA3AE00, 0x1BA30400, 0x1BA25A00,
-	0x1BA1B000, 0x1BA10600, 0x1BA05C00,
-	0x1B9FB200, 0x1B9F0800, 0x1B9E5E00,
-	0x1B9DB400, 0x1B9D0A00, 0x1B9C6000,
-	0x1B9BB600, 0x1B9B0C00, 0x1B9A6200,
-	0x1B99B800, 0x1B990E00, 0x1B986400,
-	0x1B97BA00, 0x1B971000, 0x1B966600,
-	0x1B95BC00, 0x1B951200, 0x1B946800,
-	0x1B93BE00, 0x1B931400, 0x1B926A00,
-	0x1B91C000, 0x1B911600, 0x1B906C00,
-	0x1B8FC200, 0x1B8F1800, 0x1B8E6E00,
-	0x1B8DC400, 0x1B8D1A00, 0x1B8C7000,
-	0x1B8BC600, 0x1B8B1C00, 0x1B8A7200,
-	0x1B89C800, 0x1B891E00, 0x1B887400,
-	0x1B87CA00, 0x1B872000, 0x1B867600,
-	0x1B85CC00, 0x1B852200, 0x1B847800,
-	0x1B83CE00, 0x1B832400, 0x1B827A00,
-	0x1B81D000, 0x1B812600, 0x1B807C00,
-	0x1B7FD200, 0x1B7F2800, 0x1B7E7E00,
-	0x1B7DD400, 0x1B7D2A00, 0x1B7C8000,
-	0x1B7BD600, 0x1B7B2C00, 0x1B7A8200,
-	0x1B79D800, 0x1B792E00, 0x1B788400,
-	0x1B77DA00, 0x1B773000, 0x1B768600,
-	0x1B75DC00, 0x1B753200, 0x1B748800,
-	0x1B73DE00, 0x1B733400, 0x1B728A00,
-	0x1B71E000, 0x1B713600, 0x1B708C00,
-	0x1B6FE200, 0x1B6F3800, 0x1B6E8E00,
-	0x1B6DE400, 0x1B6D3A00, 0x1B6C9000,
-	0x1B6BE600, 0x1B6B3C00, 0x1B6A9200,
-	0x1B69E800, 0x1B693E00, 0x1B689400,
-	0x1B67EA00, 0x1B674000, 0x1B669600,
-	0x1B65EC00, 0x1B654200, 0x1B649800,
-	0x1B63EE00, 0x1B634400, 0x1B629A00,
-	0x1B61F000, 0x1B614600, 0x1B609C00,
-	0x1B5FF200, 0x1B5F4800, 0x1B5E9E00,
-	0x1B5DF400, 0x1B5D4A00, 0x1B5CA000,
-	0x1B5BF600, 0x1B5B4C00, 0x1B5AA200,
-	0x1B59F800, 0x1B594E00, 0x1B58A400,
-	0x1B57FA00, 0x1B575000, 0x1B56A600,
-	0x1B55FC00, 0x1B555200, 0x1B54A800,
-	0x1B53FE00, 0x1B535400, 0x1B52AA00,
-	0x1B520000, 0x1B515600, 0x1B50AC00,
-	0x1B500200, 0x1B4F5800, 0x1B4EAE00,
-	0x1B4E0400, 0x1B4D5A00, 0x1B4CB000,
-	0x1B4C0600, 0x1B4B5C00, 0x1B4AB200,
-	0x1B4A0800, 0x1B495E00, 0x1B48B400,
-	0x1B480A00, 0x1B476000, 0x1B46B600,
-	0x1B460C00, 0x1B456200, 0x1B44B800,
-	0x1B440E00, 0x1B436400, 0x1B42BA00,
-	0x1B421000, 0x1B416600, 0x1B40BC00,
-	0x1B401200, 0x1B3F6800, 0x1B3EBE00,
-	0x1B3E1400, 0x1B3D6A00, 0x1B3CC000,
-	0x1B3C1600, 0x1B3B6C00, 0x1B3AC200,
-	0x1B3A1800, 0x1B396E00, 0x1B38C400,
-	0x1B381A00, 0x1B377000, 0x1B36C600,
-	0x1B361C00, 0x1B357200, 0x1B34C800,
-	0x1B341E00, 0x1B337400, 0x1B32CA00,
-	0x1B322000, 0x1B317600, 0x1B30CC00,
-	0x1B302200, 0x1B2F7800, 0x1B2ECE00,
-	0x1B2E2400, 0x1B2D7A00, 0x1B2CD000,
-	0x1B2C2600, 0x1B2B7C00, 0x1B2AD200,
-	0x1B2A2800, 0x1B297E00, 0x1B28D400,
-	0x1B282A00, 0x1B278000, 0x1B26D600,
-	0x1B262C00, 0x1B258200, 0x1B24D800,
-	0x1B242E00, 0x1B238400, 0x1B22DA00,
-	0x1B223000, 0x1B218600, 0x1B20DC00,
-	0x1B203200, 0x1B1F8800, 0x1B1EDE00,
-	0x1B1E3400, 0x1B1D8A00, 0x1B1CE000,
-	0x1B1C3600, 0x1B1B8C00, 0x1B1AE200,
-	0x1B1A3800, 0x1B198E00, 0x1B18E400,
-	0x1B183A00, 0x1B179000, 0x1B16E600,
-	0x1B163C00, 0x1B159200, 0x1B14E800,
-	0x1B143E00, 0x1B139400, 0x1B12EA00,
-	0x1B124000, 0x1B119600, 0x1B10EC00,
-	0x1B104200, 0x1B0F9800, 0x1B0EEE00,
-	0x1B0E4400, 0x1B0D9A00, 0x1B0CF000,
-	0x1B0C4600, 0x1B0B9C00, 0x1B0AF200,
-	0x1B0A4800, 0x1B099E00, 0x1B08F400,
-	0x1B084A00, 0x1B07A000, 0x1B06F600,
-	0x1B064C00, 0x1B05A200, 0x1B04F800,
-	0x1B044E00, 0x1B03A400, 0x1B02FA00,
-	0x1B025000, 0x1B01A600, 0x1B00FC00,
-	0x1B005200, 0x1AFFA800, 0x1AFEFE00,
-	0x1AFE5400, 0x1AFDAA00, 0x1AFD0000,
-	0x1AFC5600, 0x1AFBAC00, 0x1AFB0200,
-	0x1AFA5800, 0x1AF9AE00, 0x1AF90400,
-	0x1AF85A00, 0x1AF7B000, 0x1AF70600,
-	0x1AF65C00, 0x1AF5B200, 0x1AF50800,
-	0x1AF45E00, 0x1AF3B400, 0x1AF30A00,
-	0x1AF26000, 0x1AF1B600, 0x1AF10C00,
-	0x1AF06200, 0x1AEFB800, 0x1AEF0E00,
-	0x1AEE6400, 0x1AEDBA00, 0x1AED1000,
-	0x1AEC6600, 0x1AEBBC00, 0x1AEB1200,
-	0x1AEA6800, 0x1AE9BE00, 0x1AE91400,
-	0x1AE86A00, 0x1AE7C000, 0x1AE71600,
-	0x1AE66C00, 0x1AE5C200, 0x1AE51800,
-	0x1AE46E00, 0x1AE3C400, 0x1AE31A00,
-	0x1AE27000, 0x1AE1C600, 0x1AE11C00,
-	0x1AE07200, 0x1ADFC800, 0x1ADF1E00,
-	0x1ADE7400, 0x1ADDCA00, 0x1ADD2000,
-	0x1ADC7600, 0x1ADBCC00, 0x1ADB2200,
-	0x1ADA7800, 0x1AD9CE00, 0x1AD92400,
-	0x1AD87A00, 0x1AD7D000, 0x1AD72600,
-	0x1AD67C00, 0x1AD5D200, 0x1AD52800,
-	0x1AD47E00, 0x1AD3D400, 0x1AD32A00,
-	0x1AD28000, 0x1AD1D600, 0x1AD12C00,
-	0x1AD08200, 0x1ACFD800, 0x1ACF2E00,
-	0x1ACE8400, 0x1ACDDA00, 0x1ACD3000,
-	0x1ACC8600, 0x1ACBDC00, 0x1ACB3200,
-	0x1ACA8800, 0x1AC9DE00, 0x1AC93400,
-	0x1AC88A00, 0x1AC7E000, 0x1AC73600,
-	0x1AC68C00, 0x1AC5E200, 0x1AC53800,
-	0x1AC48E00, 0x1AC3E400, 0x1AC33A00,
-	0x1AC29000, 0x1AC1E600, 0x1AC13C00,
-	0x1AC09200, 0x1ABFE800, 0x1ABF3E00,
-	0x1ABE9400, 0x1ABDEA00, 0x1ABD4000,
-	0x1ABC9600, 0x1ABBEC00, 0x1ABB4200,
-	0x1ABA9800, 0x1AB9EE00, 0x1AB94400,
-	0x1AB89A00, 0x1AB7F000, 0x1AB74600,
-	0x1AB69C00, 0x1AB5F200, 0x1AB54800,
-	0x1AB49E00, 0x1AB3F400, 0x1AB34A00,
-	0x1AB2A000, 0x1AB1F600, 0x1AB14C00,
-	0x1AB0A200, 0x1AAFF800, 0x1AAF4E00,
-	0x1AAEA400, 0x1AADFA00, 0x1AAD5000,
-	0x1AACA600, 0x1AABFC00, 0x1AAB5200,
-	0x1AAAA800, 0x1AA9FE00, 0x1AA95400,
-	0x1AA8AA00, 0x1AA80000, 0x1AA75600,
-	0x1AA6AC00, 0x1AA60200, 0x1AA55800,
-	0x1AA4AE00, 0x1AA40400, 0x1AA35A00,
-	0x1AA2B000, 0x1AA20600, 0x1AA15C00,
-	0x1AA0B200, 0x1AA00800, 0x1A9F5E00,
-	0x1A9EB400, 0x1A9E0A00, 0x1A9D6000,
-	0x1A9CB600, 0x1A9C0C00, 0x1A9B6200,
-	0x1A9AB800, 0x1A9A0E00, 0x1A996400,
-	0x1A98BA00, 0x1A981000, 0x1A976600,
-	0x1A96BC00, 0x1A961200, 0x1A956800,
-	0x1A94BE00, 0x1A941400, 0x1A936A00,
-	0x1A92C000, 0x1A921600, 0x1A916C00,
-	0x1A90C200, 0x1A901800, 0x1A8F6E00,
-	0x1A8EC400, 0x1A8E1A00, 0x1A8D7000,
-	0x1A8CC600, 0x1A8C1C00, 0x1A8B7200,
-	0x1A8AC800, 0x1A8A1E00, 0x1A897400,
-	0x1A88CA00, 0x1A882000, 0x1A877600,
-	0x1A86CC00, 0x1A862200, 0x1A857800,
-	0x1A84CE00, 0x1A842400, 0x1A837A00,
-	0x1A82D000, 0x1A822600, 0x1A817C00,
-	0x1A80D200, 0x1A802800, 0x1A7F7E00,
-	0x1A7ED400, 0x1A7E2A00, 0x1A7D8000,
-	0x1A7CD600, 0x1A7C2C00, 0x1A7B8200,
-	0x1A7AD800, 0x1A7A2E00, 0x1A798400,
-	0x1A78DA00, 0x1A783000, 0x1A778600,
-	0x1A76DC00, 0x1A763200, 0x1A758800,
-	0x1A74DE00, 0x1A743400, 0x1A738A00,
-	0x1A72E000, 0x1A723600, 0x1A718C00,
-	0x1A70E200, 0x1A703800, 0x1A6F8E00,
-	0x1A6EE400, 0x1A6E3A00, 0x1A6D9000,
-	0x1A6CE600, 0x1A6C3C00, 0x1A6B9200,
-	0x1A6AE800, 0x1A6A3E00, 0x1A699400,
-	0x1A68EA00, 0x1A684000, 0x1A679600,
-	0x1A66EC00, 0x1A664200, 0x1A659800,
-	0x1A64EE00, 0x1A644400, 0x1A639A00,
-	0x1A62F000, 0x1A624600, 0x1A619C00,
-	0x1A60F200, 0x1A604800, 0x1A5F9E00,
-	0x1A5EF400, 0x1A5E4A00, 0x1A5DA000,
-	0x1A5CF600, 0x1A5C4C00, 0x1A5BA200,
-	0x1A5AF800, 0x1A5A4E00, 0x1A59A400,
-	0x1A58FA00, 0x1A585000, 0x1A57A600,
-	0x1A56FC00, 0x1A565200, 0x1A55A800,
-	0x1A54FE00, 0x1A545400, 0x1A53AA00,
-	0x1A530000, 0x1A525600, 0x1A51AC00,
-	0x1A510200, 0x1A505800, 0x1A4FAE00,
-	0x1A4F0400, 0x1A4E5A00, 0x1A4DB000,
-	0x1A4D0600, 0x1A4C5C00, 0x1A4BB200,
-	0x1A4B0800, 0x1A4A5E00, 0x1A49B400,
-	0x1A490A00, 0x1A486000, 0x1A47B600,
-	0x1A470C00, 0x1A466200, 0x1A45B800,
-	0x1A450E00, 0x1A446400, 0x1A43BA00,
-	0x1A431000, 0x1A426600, 0x1A41BC00,
-	0x1A411200, 0x1A406800, 0x1A3FBE00,
-	0x1A3F1400, 0x1A3E6A00, 0x1A3DC000,
-	0x1A3D1600, 0x1A3C6C00, 0x1A3BC200,
-	0x1A3B1800, 0x1A3A6E00, 0x1A39C400,
-	0x1A391A00, 0x1A387000, 0x1A37C600,
-	0x1A371C00, 0x1A367200, 0x1A35C800,
-	0x1A351E00, 0x1A347400, 0x1A33CA00,
-	0x1A332000, 0x1A327600, 0x1A31CC00,
-	0x1A312200, 0x1A307800, 0x1A2FCE00,
-	0x1A2F2400, 0x1A2E7A00, 0x1A2DD000,
-	0x1A2D2600, 0x1A2C7C00, 0x1A2BD200,
-	0x1A2B2800, 0x1A2A7E00, 0x1A29D400,
-	0x1A292A00, 0x1A288000, 0x1A27D600,
-	0x1A272C00, 0x1A268200, 0x1A25D800,
-	0x1A252E00, 0x1A248400, 0x1A23DA00,
-	0x1A233000, 0x1A228600, 0x1A21DC00,
-	0x1A213200, 0x1A208800, 0x1A1FDE00,
-	0x1A1F3400, 0x1A1E8A00, 0x1A1DE000,
-	0x1A1D3600, 0x1A1C8C00, 0x1A1BE200,
-	0x1A1B3800, 0x1A1A8E00, 0x1A19E400,
-	0x1A193A00, 0x1A189000, 0x1A17E600,
-	0x1A173C00, 0x1A169200, 0x1A15E800,
-	0x1A153E00, 0x1A149400, 0x1A13EA00,
-	0x1A134000, 0x1A129600, 0x1A11EC00,
-	0x1A114200, 0x1A109800, 0x1A0FEE00,
-	0x1A0F4400, 0x1A0E9A00, 0x1A0DF000,
-	0x1A0D4600, 0x1A0C9C00, 0x1A0BF200,
-	0x1A0B4800, 0x1A0A9E00, 0x1A09F400,
-	0x1A094A00, 0x1A08A000, 0x1A07F600,
-	0x1A074C00, 0x1A06A200, 0x1A05F800,
-	0x1A054E00, 0x1A04A400, 0x1A03FA00,
-	0x1A035000, 0x1A02A600, 0x1A01FC00,
-	0x1A015200, 0x1A00A800, 0x19FFFE00,
-	0x19FF5400, 0x19FEAA00, 0x19FE0000,
-	0x19FD5600, 0x19FCAC00, 0x19FC0200,
-	0x19FB5800, 0x19FAAE00, 0x19FA0400,
-	0x19F95A00, 0x19F8B000, 0x19F80600,
-	0x19F75C00, 0x19F6B200, 0x19F60800,
-	0x19F55E00, 0x19F4B400, 0x19F40A00,
-	0x19F36000, 0x19F2B600, 0x19F20C00,
-	0x19F16200, 0x19F0B800, 0x19F00E00,
-	0x19EF6400, 0x19EEBA00, 0x19EE1000,
-	0x19ED6600, 0x19ECBC00, 0x19EC1200,
-	0x19EB6800, 0x19EABE00, 0x19EA1400,
-	0x19E96A00, 0x19E8C000, 0x19E81600,
-	0x19E76C00, 0x19E6C200, 0x19E61800,
-	0x19E56E00, 0x19E4C400, 0x19E41A00,
-	0x19E37000, 0x19E2C600, 0x19E21C00,
-	0x19E17200, 0x19E0C800, 0x19E01E00,
-	0x19DF7400, 0x19DECA00, 0x19DE2000,
-	0x19DD7600, 0x19DCCC00, 0x19DC2200,
-	0x19DB7800, 0x19DACE00, 0x19DA2400,
-	0x19D97A00, 0x19D8D000, 0x19D82600,
-	0x19D77C00, 0x19D6D200, 0x19D62800,
-	0x19D57E00, 0x19D4D400, 0x19D42A00,
-	0x19D38000, 0x19D2D600, 0x19D22C00,
-	0x19D18200, 0x19D0D800, 0x19D02E00,
-	0x19CF8400, 0x19CEDA00, 0x19CE3000,
-	0x19CD8600, 0x19CCDC00, 0x19CC3200,
-	0x19CB8800, 0x19CADE00, 0x19CA3400,
-	0x19C98A00, 0x19C8E000, 0x19C83600,
-	0x19C78C00, 0x19C6E200, 0x19C63800,
-	0x19C58E00, 0x19C4E400, 0x19C43A00,
-	0x19C39000, 0x19C2E600, 0x19C23C00,
-	0x19C19200, 0x19C0E800, 0x19C03E00,
-	0x19BF9400, 0x19BEEA00, 0x19BE4000,
-	0x19BD9600, 0x19BCEC00, 0x19BC4200,
-	0x19BB9800, 0x19BAEE00, 0x19BA4400,
-	0x19B99A00, 0x19B8F000, 0x19B84600,
-	0x19B79C00, 0x19B6F200, 0x19B64800,
-	0x19B59E00, 0x19B4F400, 0x19B44A00,
-	0x19B3A000, 0x19B2F600, 0x19B24C00,
-	0x19B1A200, 0x19B0F800, 0x19B04E00,
-	0x19AFA400, 0x19AEFA00, 0x19AE5000,
-	0x19ADA600, 0x19ACFC00, 0x19AC5200,
-	0x19ABA800, 0x19AAFE00, 0x19AA5400,
-	0x19A9AA00, 0x19A90000, 0x19A85600,
-	0x19A7AC00, 0x19A70200, 0x19A65800,
-	0x19A5AE00, 0x19A50400, 0x19A45A00,
-	0x19A3B000, 0x19A30600, 0x19A25C00,
-	0x19A1B200, 0x19A10800, 0x19A05E00,
-	0x199FB400, 0x199F0A00, 0x199E6000,
-	0x199DB600, 0x199D0C00, 0x199C6200,
-	0x199BB800, 0x199B0E00, 0x199A6400,
-	0x1999BA00, 0x19991000, 0x19986600,
-	0x1997BC00, 0x19971200, 0x19966800,
-	0x1995BE00, 0x19951400, 0x19946A00,
-	0x1993C000, 0x19931600, 0x19926C00,
-	0x1991C200, 0x19911800, 0x19906E00,
-	0x198FC400, 0x198F1A00, 0x198E7000,
-	0x198DC600, 0x198D1C00, 0x198C7200,
-	0x198BC800, 0x198B1E00, 0x198A7400,
-	0x1989CA00, 0x19892000, 0x19887600,
-	0x1987CC00, 0x19872200, 0x19867800,
-	0x1985CE00, 0x19852400, 0x19847A00,
-	0x1983D000, 0x19832600, 0x19827C00,
-	0x1981D200, 0x19812800, 0x19807E00,
-	0x197FD400, 0x197F2A00, 0x197E8000,
-	0x197DD600, 0x197D2C00, 0x197C8200,
-	0x197BD800, 0x197B2E00, 0x197A8400,
-	0x1979DA00, 0x19793000, 0x19788600,
-	0x1977DC00, 0x19773200, 0x19768800,
-	0x1975DE00, 0x19753400, 0x19748A00,
-	0x1973E000, 0x19733600, 0x19728C00,
-	0x1971E200, 0x19713800, 0x19708E00,
-	0x196FE400, 0x196F3A00, 0x196E9000,
-	0x196DE600, 0x196D3C00, 0x196C9200,
-	0x196BE800, 0x196B3E00, 0x196A9400,
-	0x1969EA00, 0x19694000, 0x19689600,
-	0x1967EC00, 0x19674200, 0x19669800,
-	0x1965EE00, 0x19654400, 0x19649A00,
-	0x1963F000, 0x19634600, 0x19629C00,
-	0x1961F200, 0x19614800, 0x19609E00,
-	0x195FF400, 0x195F4A00, 0x195EA000,
-	0x195DF600, 0x195D4C00, 0x195CA200,
-	0x195BF800, 0x195B4E00, 0x195AA400,
-	0x1959FA00, 0x19595000, 0x1958A600,
-	0x1957FC00, 0x19575200, 0x1956A800,
-	0x1955FE00, 0x19555400, 0x1954AA00,
-	0x19540000, 0x19535600, 0x1952AC00,
-	0x19520200, 0x19515800, 0x1950AE00,
-	0x19500400, 0x194F5A00, 0x194EB000,
-	0x194E0600, 0x194D5C00, 0x194CB200,
-	0x194C0800, 0x194B5E00, 0x194AB400,
-	0x194A0A00, 0x19496000, 0x1948B600,
-	0x19480C00, 0x19476200, 0x1946B800,
-	0x19460E00, 0x19456400, 0x1944BA00,
-	0x19441000, 0x19436600, 0x1942BC00,
-	0x19421200, 0x19416800, 0x1940BE00,
-	0x19401400, 0x193F6A00, 0x193EC000,
-	0x193E1600, 0x193D6C00, 0x193CC200,
-	0x193C1800, 0x193B6E00, 0x193AC400,
-	0x193A1A00, 0x19397000, 0x1938C600,
-	0x19381C00, 0x19377200, 0x1936C800,
-	0x19361E00, 0x19357400, 0x1934CA00,
-	0x19342000, 0x19337600, 0x1932CC00,
-	0x19322200, 0x19317800, 0x1930CE00,
-	0x19302400, 0x192F7A00, 0x192ED000,
-	0x192E2600, 0x192D7C00, 0x192CD200,
-	0x192C2800, 0x192B7E00, 0x192AD400,
-	0x192A2A00, 0x19298000, 0x1928D600,
-	0x19282C00, 0x19278200, 0x1926D800,
-	0x19262E00, 0x19258400, 0x1924DA00,
-	0x19243000, 0x19238600, 0x1922DC00,
-	0x19223200, 0x19218800, 0x1920DE00,
-	0x19203400, 0x191F8A00, 0x191EE000,
-	0x191E3600, 0x191D8C00, 0x191CE200,
-	0x191C3800, 0x191B8E00, 0x191AE400,
-	0x191A3A00, 0x19199000, 0x1918E600,
-	0x19183C00, 0x19179200, 0x1916E800,
-	0x19163E00, 0x19159400, 0x1914EA00,
-	0x19144000, 0x19139600, 0x1912EC00,
-	0x19124200, 0x19119800, 0x1910EE00,
-	0x19104400, 0x190F9A00, 0x190EF000,
-	0x190E4600, 0x190D9C00, 0x190CF200,
-	0x190C4800, 0x190B9E00, 0x190AF400,
-	0x190A4A00, 0x1909A000, 0x1908F600,
-	0x19084C00, 0x1907A200, 0x1906F800,
-	0x19064E00, 0x1905A400, 0x1904FA00,
-	0x19045000, 0x1903A600, 0x1902FC00,
-	0x19025200, 0x1901A800, 0x1900FE00,
-	0x19005400, 0x18FFAA00, 0x18FF0000,
-	0x18FE5600, 0x18FDAC00, 0x18FD0200,
-	0x18FC5800, 0x18FBAE00, 0x18FB0400,
-	0x18FA5A00, 0x18F9B000, 0x18F90600,
-	0x18F85C00, 0x18F7B200, 0x18F70800,
-	0x18F65E00, 0x18F5B400, 0x18F50A00,
-	0x18F46000, 0x18F3B600, 0x18F30C00,
-	0x18F26200, 0x18F1B800, 0x18F10E00,
-	0x18F06400, 0x18EFBA00, 0x18EF1000,
-	0x18EE6600, 0x18EDBC00, 0x18ED1200,
-	0x18EC6800, 0x18EBBE00, 0x18EB1400,
-	0x18EA6A00, 0x18E9C000, 0x18E91600,
-	0x18E86C00, 0x18E7C200, 0x18E71800,
-	0x18E66E00, 0x18E5C400, 0x18E51A00,
-	0x18E47000, 0x18E3C600, 0x18E31C00,
-	0x18E27200, 0x18E1C800, 0x18E11E00,
-	0x18E07400, 0x18DFCA00, 0x18DF2000,
-	0x18DE7600, 0x18DDCC00, 0x18DD2200,
-	0x18DC7800, 0x18DBCE00, 0x18DB2400,
-	0x18DA7A00, 0x18D9D000, 0x18D92600,
-	0x18D87C00, 0x18D7D200, 0x18D72800,
-	0x18D67E00, 0x18D5D400, 0x18D52A00,
-	0x18D48000, 0x18D3D600, 0x18D32C00,
-	0x18D28200, 0x18D1D800, 0x18D12E00,
-	0x18D08400, 0x18CFDA00, 0x18CF3000,
-	0x18CE8600, 0x18CDDC00, 0x18CD3200,
-	0x18CC8800, 0x18CBDE00, 0x18CB3400,
-	0x18CA8A00, 0x18C9E000, 0x18C93600,
-	0x18C88C00, 0x18C7E200, 0x18C73800,
-	0x18C68E00, 0x18C5E400, 0x18C53A00,
-	0x18C49000, 0x18C3E600, 0x18C33C00,
-	0x18C29200, 0x18C1E800, 0x18C13E00,
-	0x18C09400, 0x18BFEA00, 0x18BF4000,
-	0x18BE9600, 0x18BDEC00, 0x18BD4200,
-	0x18BC9800, 0x18BBEE00, 0x18BB4400,
-	0x18BA9A00, 0x18B9F000, 0x18B94600,
-	0x18B89C00, 0x18B7F200, 0x18B74800,
-	0x18B69E00, 0x18B5F400, 0x18B54A00,
-	0x18B4A000, 0x18B3F600, 0x18B34C00,
-	0x18B2A200, 0x18B1F800, 0x18B14E00,
-	0x18B0A400, 0x18AFFA00, 0x18AF5000,
-	0x18AEA600, 0x18ADFC00, 0x18AD5200,
-	0x18ACA800, 0x18ABFE00, 0x18AB5400,
-	0x18AAAA00, 0x18AA0000, 0x18A95600,
-	0x18A8AC00, 0x18A80200, 0x18A75800,
-	0x18A6AE00, 0x18A60400, 0x18A55A00,
-	0x18A4B000, 0x18A40600, 0x18A35C00,
-	0x18A2B200, 0x18A20800, 0x18A15E00,
-	0x18A0B400, 0x18A00A00, 0x189F6000,
-	0x189EB600, 0x189E0C00, 0x189D6200,
-	0x189CB800, 0x189C0E00, 0x189B6400,
-	0x189ABA00, 0x189A1000, 0x18996600,
-	0x1898BC00, 0x18981200, 0x18976800,
-	0x1896BE00, 0x18961400, 0x18956A00,
-	0x1894C000, 0x18941600, 0x18936C00,
-	0x1892C200, 0x18921800, 0x18916E00,
-	0x1890C400, 0x18901A00, 0x188F7000,
-	0x188EC600, 0x188E1C00, 0x188D7200,
-	0x188CC800, 0x188C1E00, 0x188B7400,
-	0x188ACA00, 0x188A2000, 0x18897600,
-	0x1888CC00, 0x18882200, 0x18877800,
-	0x1886CE00, 0x18862400, 0x18857A00,
-	0x1884D000, 0x18842600, 0x18837C00,
-	0x1882D200, 0x18822800, 0x18817E00,
-	0x1880D400, 0x18802A00, 0x187F8000,
-	0x187ED600, 0x187E2C00, 0x187D8200,
-	0x187CD800, 0x187C2E00, 0x187B8400,
-	0x187ADA00, 0x187A3000, 0x18798600,
-	0x1878DC00, 0x18783200, 0x18778800,
-	0x1876DE00, 0x18763400, 0x18758A00,
-	0x1874E000, 0x18743600, 0x18738C00,
-	0x1872E200, 0x18723800, 0x18718E00,
-	0x1870E400, 0x18703A00, 0x186F9000,
-	0x186EE600, 0x186E3C00, 0x186D9200,
-	0x186CE800, 0x186C3E00, 0x186B9400,
-	0x186AEA00, 0x186A4000, 0x18699600,
-	0x1868EC00, 0x18684200, 0x18679800,
-	0x1866EE00, 0x18664400, 0x18659A00,
-	0x1864F000, 0x18644600, 0x18639C00,
-	0x1862F200, 0x18624800, 0x18619E00,
-	0x1860F400, 0x18604A00, 0x185FA000,
-	0x185EF600, 0x185E4C00, 0x185DA200,
-	0x185CF800, 0x185C4E00, 0x185BA400,
-	0x185AFA00, 0x185A5000, 0x1859A600,
-	0x1858FC00, 0x18585200, 0x1857A800,
-	0x1856FE00, 0x18565400, 0x1855AA00,
-	0x18550000, 0x18545600, 0x1853AC00,
-	0x18530200, 0x18525800, 0x1851AE00,
-	0x18510400, 0x18505A00, 0x184FB000,
-	0x184F0600, 0x184E5C00, 0x184DB200,
-	0x184D0800, 0x184C5E00, 0x184BB400,
-	0x184B0A00, 0x184A6000, 0x1849B600,
-	0x18490C00, 0x18486200, 0x1847B800,
-	0x18470E00, 0x18466400, 0x1845BA00,
-	0x18451000, 0x18446600, 0x1843BC00,
-	0x18431200, 0x18426800, 0x1841BE00,
-	0x18411400, 0x18406A00, 0x183FC000,
-	0x183F1600, 0x183E6C00, 0x183DC200,
-	0x183D1800, 0x183C6E00, 0x183BC400,
-	0x183B1A00, 0x183A7000, 0x1839C600,
-	0x18391C00, 0x18387200, 0x1837C800,
-	0x18371E00, 0x18367400, 0x1835CA00,
-	0x18352000, 0x18347600, 0x1833CC00,
-	0x18332200, 0x18327800, 0x1831CE00,
-	0x18312400, 0x18307A00, 0x182FD000,
-	0x182F2600, 0x182E7C00, 0x182DD200,
-	0x182D2800, 0x182C7E00, 0x182BD400,
-	0x182B2A00, 0x182A8000, 0x1829D600,
-	0x18292C00, 0x18288200, 0x1827D800,
-	0x18272E00, 0x18268400, 0x1825DA00,
-	0x18253000, 0x18248600, 0x1823DC00,
-	0x18233200, 0x18228800, 0x1821DE00,
-	0x18213400, 0x18208A00, 0x181FE000,
-	0x181F3600, 0x181E8C00, 0x181DE200,
-	0x181D3800, 0x181C8E00, 0x181BE400,
-	0x181B3A00, 0x181A9000, 0x1819E600,
-	0x18193C00, 0x18189200, 0x1817E800,
-	0x18173E00, 0x18169400, 0x1815EA00,
-	0x18154000, 0x18149600, 0x1813EC00,
-	0x18134200, 0x18129800, 0x1811EE00,
-	0x18114400, 0x18109A00, 0x180FF000,
-	0x180F4600, 0x180E9C00, 0x180DF200,
-	0x180D4800, 0x180C9E00, 0x180BF400,
-	0x180B4A00, 0x180AA000, 0x1809F600,
-	0x18094C00, 0x1808A200, 0x1807F800,
-	0x18074E00, 0x1806A400, 0x1805FA00,
-	0x18055000, 0x1804A600, 0x1803FC00,
-	0x18035200, 0x1802A800, 0x1801FE00,
-	0x18015400, 0x1800AA00, 0x18000000,
-	0x17FF5600, 0x17FEAC00, 0x17FE0200,
-	0x17FD5800, 0x17FCAE00, 0x17FC0400,
-	0x17FB5A00, 0x17FAB000, 0x17FA0600,
-	0x17F95C00, 0x17F8B200, 0x17F80800,
-	0x17F75E00, 0x17F6B400, 0x17F60A00,
-	0x17F56000, 0x17F4B600, 0x17F40C00,
-	0x17F36200, 0x17F2B800, 0x17F20E00,
-	0x17F16400, 0x17F0BA00, 0x17F01000,
-	0x17EF6600, 0x17EEBC00, 0x17EE1200,
-	0x17ED6800, 0x17ECBE00, 0x17EC1400,
-	0x17EB6A00, 0x17EAC000, 0x17EA1600,
-	0x17E96C00, 0x17E8C200, 0x17E81800,
-	0x17E76E00, 0x17E6C400, 0x17E61A00,
-	0x17E57000, 0x17E4C600, 0x17E41C00,
-	0x17E37200, 0x17E2C800, 0x17E21E00,
-	0x17E17400, 0x17E0CA00, 0x17E02000,
-	0x17DF7600, 0x17DECC00, 0x17DE2200,
-	0x17DD7800, 0x17DCCE00, 0x17DC2400,
-	0x17DB7A00, 0x17DAD000, 0x17DA2600,
-	0x17D97C00, 0x17D8D200, 0x17D82800,
-	0x17D77E00, 0x17D6D400, 0x17D62A00,
-	0x17D58000, 0x17D4D600, 0x17D42C00,
-	0x17D38200, 0x17D2D800, 0x17D22E00,
-	0x17D18400, 0x17D0DA00, 0x17D03000,
-	0x17CF8600, 0x17CEDC00, 0x17CE3200,
-	0x17CD8800, 0x17CCDE00, 0x17CC3400,
-	0x17CB8A00, 0x17CAE000, 0x17CA3600,
-	0x17C98C00, 0x17C8E200, 0x17C83800,
-	0x17C78E00, 0x17C6E400, 0x17C63A00,
-	0x17C59000, 0x17C4E600, 0x17C43C00,
-	0x17C39200, 0x17C2E800, 0x17C23E00,
-	0x17C19400, 0x17C0EA00, 0x17C04000,
-	0x17BF9600, 0x17BEEC00, 0x17BE4200,
-	0x17BD9800, 0x17BCEE00, 0x17BC4400,
-	0x17BB9A00, 0x17BAF000, 0x17BA4600,
-	0x17B99C00, 0x17B8F200, 0x17B84800,
-	0x17B79E00, 0x17B6F400, 0x17B64A00,
-	0x17B5A000, 0x17B4F600, 0x17B44C00,
-	0x17B3A200, 0x17B2F800, 0x17B24E00,
-	0x17B1A400, 0x17B0FA00, 0x17B05000,
-	0x17AFA600, 0x17AEFC00, 0x17AE5200,
-	0x17ADA800, 0x17ACFE00, 0x17AC5400,
-	0x17ABAA00, 0x17AB0000, 0x17AA5600,
-	0x17A9AC00, 0x17A90200, 0x17A85800,
-	0x17A7AE00, 0x17A70400, 0x17A65A00,
-	0x17A5B000, 0x17A50600, 0x17A45C00,
-	0x17A3B200, 0x17A30800, 0x17A25E00,
-	0x17A1B400, 0x17A10A00, 0x17A06000,
-	0x179FB600, 0x179F0C00, 0x179E6200,
-	0x179DB800, 0x179D0E00, 0x179C6400,
-	0x179BBA00, 0x179B1000, 0x179A6600,
-	0x1799BC00, 0x17991200, 0x17986800,
-	0x1797BE00, 0x17971400, 0x17966A00,
-	0x1795C000, 0x17951600, 0x17946C00,
-	0x1793C200, 0x17931800, 0x17926E00,
-	0x1791C400, 0x17911A00, 0x17907000,
-	0x178FC600, 0x178F1C00, 0x178E7200,
-	0x178DC800, 0x178D1E00, 0x178C7400,
-	0x178BCA00, 0x178B2000, 0x178A7600,
-	0x1789CC00, 0x17892200, 0x17887800,
-	0x1787CE00, 0x17872400, 0x17867A00,
-	0x1785D000, 0x17852600, 0x17847C00,
-	0x1783D200, 0x17832800, 0x17827E00,
-	0x1781D400, 0x17812A00, 0x17808000,
-	0x177FD600, 0x177F2C00, 0x177E8200,
-	0x177DD800, 0x177D2E00, 0x177C8400,
-	0x177BDA00, 0x177B3000, 0x177A8600,
-	0x1779DC00, 0x17793200, 0x17788800,
-	0x1777DE00, 0x17773400, 0x17768A00,
-	0x1775E000, 0x17753600, 0x17748C00,
-	0x1773E200, 0x17733800, 0x17728E00,
-	0x1771E400, 0x17713A00, 0x17709000,
-	0x176FE600, 0x176F3C00, 0x176E9200,
-	0x176DE800, 0x176D3E00, 0x176C9400,
-	0x176BEA00, 0x176B4000, 0x176A9600,
-	0x1769EC00, 0x17694200, 0x17689800,
-	0x1767EE00, 0x17674400, 0x17669A00,
-	0x1765F000, 0x17654600, 0x17649C00,
-	0x1763F200, 0x17634800, 0x17629E00,
-	0x1761F400, 0x17614A00, 0x1760A000,
-	0x175FF600, 0x175F4C00, 0x175EA200,
-	0x175DF800, 0x175D4E00, 0x175CA400,
-	0x175BFA00, 0x175B5000, 0x175AA600,
-	0x1759FC00, 0x17595200, 0x1758A800,
-	0x1757FE00, 0x17575400, 0x1756AA00,
-	0x17560000, 0x17555600, 0x1754AC00,
-	0x17540200, 0x17535800, 0x1752AE00,
-	0x17520400, 0x17515A00, 0x1750B000,
-	0x17500600, 0x174F5C00, 0x174EB200,
-	0x174E0800, 0x174D5E00, 0x174CB400,
-	0x174C0A00, 0x174B6000, 0x174AB600,
-	0x174A0C00, 0x17496200, 0x1748B800,
-	0x17480E00, 0x17476400, 0x1746BA00,
-	0x17461000, 0x17456600, 0x1744BC00,
-	0x17441200, 0x17436800, 0x1742BE00,
-	0x17421400, 0x17416A00, 0x1740C000,
-	0x17401600, 0x173F6C00, 0x173EC200,
-	0x173E1800, 0x173D6E00, 0x173CC400,
-	0x173C1A00, 0x173B7000, 0x173AC600,
-	0x173A1C00, 0x17397200, 0x1738C800,
-	0x17381E00, 0x17377400, 0x1736CA00,
-	0x17362000, 0x17357600, 0x1734CC00,
-	0x17342200, 0x17337800, 0x1732CE00,
-	0x17322400, 0x17317A00, 0x1730D000,
-	0x17302600, 0x172F7C00, 0x172ED200,
-	0x172E2800, 0x172D7E00, 0x172CD400,
-	0x172C2A00, 0x172B8000, 0x172AD600,
-	0x172A2C00, 0x17298200, 0x1728D800,
-	0x17282E00, 0x17278400, 0x1726DA00,
-	0x17263000, 0x17258600, 0x1724DC00,
-	0x17243200, 0x17238800, 0x1722DE00,
-	0x17223400, 0x17218A00, 0x1720E000,
-	0x17203600, 0x171F8C00, 0x171EE200,
-	0x171E3800, 0x171D8E00, 0x171CE400,
-	0x171C3A00, 0x171B9000, 0x171AE600,
-	0x171A3C00, 0x17199200, 0x1718E800,
-	0x17183E00, 0x17179400, 0x1716EA00,
-	0x17164000, 0x17159600, 0x1714EC00,
-	0x17144200, 0x17139800, 0x1712EE00,
-	0x17124400, 0x17119A00, 0x1710F000,
-	0x17104600, 0x170F9C00, 0x170EF200,
-	0x170E4800, 0x170D9E00, 0x170CF400,
-	0x170C4A00, 0x170BA000, 0x170AF600,
-	0x170A4C00, 0x1709A200, 0x1708F800,
-	0x17084E00, 0x1707A400, 0x1706FA00,
-	0x17065000, 0x1705A600, 0x1704FC00,
-	0x17045200, 0x1703A800, 0x1702FE00,
-	0x17025400, 0x1701AA00, 0x17010000,
-	0x17005600, 0x16FFAC00, 0x16FF0200,
-	0x16FE5800, 0x16FDAE00, 0x16FD0400,
-	0x16FC5A00, 0x16FBB000, 0x16FB0600,
-	0x16FA5C00, 0x16F9B200, 0x16F90800,
-	0x16F85E00, 0x16F7B400, 0x16F70A00,
-	0x16F66000, 0x16F5B600, 0x16F50C00,
-	0x16F46200, 0x16F3B800, 0x16F30E00,
-	0x16F26400, 0x16F1BA00, 0x16F11000,
-	0x16F06600, 0x16EFBC00, 0x16EF1200,
-	0x16EE6800, 0x16EDBE00, 0x16ED1400,
-	0x16EC6A00, 0x16EBC000, 0x16EB1600,
-	0x16EA6C00, 0x16E9C200, 0x16E91800,
-	0x16E86E00, 0x16E7C400, 0x16E71A00,
-	0x16E67000, 0x16E5C600, 0x16E51C00,
-	0x16E47200, 0x16E3C800, 0x16E31E00,
-	0x16E27400, 0x16E1CA00, 0x16E12000,
-	0x16E07600, 0x16DFCC00, 0x16DF2200,
-	0x16DE7800, 0x16DDCE00, 0x16DD2400,
-	0x16DC7A00, 0x16DBD000, 0x16DB2600,
-	0x16DA7C00, 0x16D9D200, 0x16D92800,
-	0x16D87E00, 0x16D7D400, 0x16D72A00,
-	0x16D68000, 0x16D5D600, 0x16D52C00,
-	0x16D48200, 0x16D3D800, 0x16D32E00,
-	0x16D28400, 0x16D1DA00, 0x16D13000,
-	0x16D08600, 0x16CFDC00, 0x16CF3200,
-	0x16CE8800, 0x16CDDE00, 0x16CD3400,
-	0x16CC8A00, 0x16CBE000, 0x16CB3600,
-	0x16CA8C00, 0x16C9E200, 0x16C93800,
-	0x16C88E00, 0x16C7E400, 0x16C73A00,
-	0x16C69000, 0x16C5E600, 0x16C53C00,
-	0x16C49200, 0x16C3E800, 0x16C33E00,
-	0x16C29400, 0x16C1EA00, 0x16C14000,
-	0x16C09600, 0x16BFEC00, 0x16BF4200,
-	0x16BE9800, 0x16BDEE00, 0x16BD4400,
-	0x16BC9A00, 0x16BBF000, 0x16BB4600,
-	0x16BA9C00, 0x16B9F200, 0x16B94800,
-	0x16B89E00, 0x16B7F400, 0x16B74A00,
-	0x16B6A000, 0x16B5F600, 0x16B54C00,
-	0x16B4A200, 0x16B3F800, 0x16B34E00,
-	0x16B2A400, 0x16B1FA00, 0x16B15000,
-	0x16B0A600, 0x16AFFC00, 0x16AF5200,
-	0x16AEA800, 0x16ADFE00, 0x16AD5400,
-	0x16ACAA00, 0x16AE0000, 0x16AD5F40,
-	0x16ACBE80, 0x16AC1DC0, 0x16AB7D00,
-	0x16AADC40, 0x16AA3B80, 0x16A99AC0,
-	0x16A8FA00, 0x16A85940, 0x16A7B880,
-	0x16A717C0, 0x16A67700, 0x16A5D640,
-	0x16A53580, 0x16A494C0, 0x16A3F400,
-	0x16A35340, 0x16A2B280, 0x16A211C0,
-	0x16A17100, 0x16A0D040, 0x16A02F80,
-	0x169F8EC0, 0x169EEE00, 0x169E4D40,
-	0x169DAC80, 0x169D0BC0, 0x169C6B00,
-	0x169BCA40, 0x169B2980, 0x169A88C0,
-	0x1699E800, 0x16994740, 0x1698A680,
-	0x169805C0, 0x16976500, 0x1696C440,
-	0x16962380, 0x169582C0, 0x1694E200,
-	0x16944140, 0x1693A080, 0x1692FFC0,
-	0x16925F00, 0x1691BE40, 0x16911D80,
-	0x16907CC0, 0x168FDC00, 0x168F3B40,
-	0x168E9A80, 0x168DF9C0, 0x168D5900,
-	0x168CB840, 0x168C1780, 0x168B76C0,
-	0x168AD600, 0x168A3540, 0x16899480,
-	0x1688F3C0, 0x16885300, 0x1687B240,
-	0x16871180, 0x168670C0, 0x1685D000,
-	0x16852F40, 0x16848E80, 0x1683EDC0,
-	0x16834D00, 0x1682AC40, 0x16820B80,
-	0x16816AC0, 0x1680CA00, 0x16802940,
-	0x167F8880, 0x167EE7C0, 0x167E4700,
-	0x167DA640, 0x167D0580, 0x167C64C0,
-	0x167BC400, 0x167B2340, 0x167A8280,
-	0x1679E1C0, 0x16794100, 0x1678A040,
-	0x1677FF80, 0x16775EC0, 0x1676BE00,
-	0x16761D40, 0x16757C80, 0x1674DBC0,
-	0x16743B00, 0x16739A40, 0x1672F980,
-	0x167258C0, 0x1671B800, 0x16711740,
-	0x16707680, 0x166FD5C0, 0x166F3500,
-	0x166E9440, 0x166DF380, 0x166D52C0,
-	0x166CB200, 0x166C1140, 0x166B7080,
-	0x166ACFC0, 0x166A2F00, 0x16698E40,
-	0x1668ED80, 0x16684CC0, 0x1667AC00,
-	0x16670B40, 0x16666A80, 0x1665C9C0,
-	0x16652900, 0x16648840, 0x1663E780,
-	0x166346C0, 0x1662A600, 0x16620540,
-	0x16616480, 0x1660C3C0, 0x16602300,
-	0x165F8240, 0x165EE180, 0x165E40C0,
-	0x165DA000, 0x165CFF40, 0x165C5E80,
-	0x165BBDC0, 0x165B1D00, 0x165A7C40,
-	0x1659DB80, 0x16593AC0, 0x16589A00,
-	0x1657F940, 0x16575880, 0x1656B7C0,
-	0x16561700, 0x16557640, 0x1654D580,
-	0x165434C0, 0x16539400, 0x1652F340,
-	0x16525280, 0x1651B1C0, 0x16511100,
-	0x16507040, 0x164FCF80, 0x164F2EC0,
-	0x164E8E00, 0x164DED40, 0x164D4C80,
-	0x164CABC0, 0x164C0B00, 0x164B6A40,
-	0x164AC980, 0x164A28C0, 0x16498800,
-	0x1648E740, 0x16484680, 0x1647A5C0,
-	0x16470500, 0x16466440, 0x1645C380,
-	0x164522C0, 0x16448200, 0x1643E140,
-	0x16434080, 0x16429FC0, 0x1641FF00,
-	0x16415E40, 0x1640BD80, 0x16401CC0,
-	0x163F7C00, 0x163EDB40, 0x163E3A80,
-	0x163D99C0, 0x163CF900, 0x163C5840,
-	0x163BB780, 0x163B16C0, 0x163A7600,
-	0x1639D540, 0x16393480, 0x163893C0,
-	0x1637F300, 0x16375240, 0x1636B180,
-	0x163610C0, 0x16357000, 0x1634CF40,
-	0x16342E80, 0x16338DC0, 0x1632ED00,
-	0x16324C40, 0x1631AB80, 0x16310AC0,
-	0x16306A00, 0x162FC940, 0x162F2880,
-	0x162E87C0, 0x162DE700, 0x162D4640,
-	0x162CA580, 0x162C04C0, 0x162B6400,
-	0x162AC340, 0x162A2280, 0x162981C0,
-	0x1628E100, 0x16284040, 0x16279F80,
-	0x1626FEC0, 0x16265E00, 0x1625BD40,
-	0x16251C80, 0x16247BC0, 0x1623DB00,
-	0x16233A40, 0x16229980, 0x1621F8C0,
-	0x16215800, 0x1620B740, 0x16201680,
-	0x161F75C0, 0x161ED500, 0x161E3440,
-	0x161D9380, 0x161CF2C0, 0x161C5200,
-	0x161BB140, 0x161B1080, 0x161A6FC0,
-	0x1619CF00, 0x16192E40, 0x16188D80,
-	0x1617ECC0, 0x16174C00, 0x1616AB40,
-	0x16160A80, 0x161569C0, 0x1614C900,
-	0x16142840, 0x16138780, 0x1612E6C0,
-	0x16124600, 0x1611A540, 0x16110480,
-	0x161063C0, 0x160FC300, 0x160F2240,
-	0x160E8180, 0x160DE0C0, 0x160D4000,
-	0x160C9F40, 0x160BFE80, 0x160B5DC0,
-	0x160ABD00, 0x160A1C40, 0x16097B80,
-	0x1608DAC0, 0x16083A00, 0x16079940,
-	0x1606F880, 0x160657C0, 0x1605B700,
-	0x16051640, 0x16047580, 0x1603D4C0,
-	0x16033400, 0x16029340, 0x1601F280,
-	0x160151C0, 0x1600B100, 0x16001040,
-	0x15FF6F80, 0x15FECEC0, 0x15FE2E00,
-	0x15FD8D40, 0x15FCEC80, 0x15FC4BC0,
-	0x15FBAB00, 0x15FB0A40, 0x15FA6980,
-	0x15F9C8C0, 0x15F92800, 0x15F88740,
-	0x15F7E680, 0x15F745C0, 0x15F6A500,
-	0x15F60440, 0x15F56380, 0x15F4C2C0,
-	0x15F42200, 0x15F38140, 0x15F2E080,
-	0x15F23FC0, 0x15F19F00, 0x15F0FE40,
-	0x15F05D80, 0x15EFBCC0, 0x15EF1C00,
-	0x15EE7B40, 0x15EDDA80, 0x15ED39C0,
-	0x15EC9900, 0x15EBF840, 0x15EB5780,
-	0x15EAB6C0, 0x15EA1600, 0x15E97540,
-	0x15E8D480, 0x15E833C0, 0x15E79300,
-	0x15E6F240, 0x15E65180, 0x15E5B0C0,
-	0x15E51000, 0x15E46F40, 0x15E3CE80,
-	0x15E32DC0, 0x15E28D00, 0x15E1EC40,
-	0x15E14B80, 0x15E0AAC0, 0x15E00A00,
-	0x15DF6940, 0x15DEC880, 0x15DE27C0,
-	0x15DD8700, 0x15DCE640, 0x15DC4580,
-	0x15DBA4C0, 0x15DB0400, 0x15DA6340,
-	0x15D9C280, 0x15D921C0, 0x15D88100,
-	0x15D7E040, 0x15D73F80, 0x15D69EC0,
-	0x15D5FE00, 0x15D55D40, 0x15D4BC80,
-	0x15D41BC0, 0x15D37B00, 0x15D2DA40,
-	0x15D23980, 0x15D198C0, 0x15D0F800,
-	0x15D05740, 0x15CFB680, 0x15CF15C0,
-	0x15CE7500, 0x15CDD440, 0x15CD3380,
-	0x15CC92C0, 0x15CBF200, 0x15CB5140,
-	0x15CAB080, 0x15CA0FC0, 0x15C96F00,
-	0x15C8CE40, 0x15C82D80, 0x15C78CC0,
-	0x15C6EC00, 0x15C64B40, 0x15C5AA80,
-	0x15C509C0, 0x15C46900, 0x15C3C840,
-	0x15C32780, 0x15C286C0, 0x15C1E600,
-	0x15C14540, 0x15C0A480, 0x15C003C0,
-	0x15BF6300, 0x15BEC240, 0x15BE2180,
-	0x15BD80C0, 0x15BCE000, 0x15BC3F40,
-	0x15BB9E80, 0x15BAFDC0, 0x15BA5D00,
-	0x15B9BC40, 0x15B91B80, 0x15B87AC0,
-	0x15B7DA00, 0x15B73940, 0x15B69880,
-	0x15B5F7C0, 0x15B55700, 0x15B4B640,
-	0x15B41580, 0x15B374C0, 0x15B2D400,
-	0x15B23340, 0x15B19280, 0x15B0F1C0,
-	0x15B05100, 0x15AFB040, 0x15AF0F80,
-	0x15AE6EC0, 0x15ADCE00, 0x15AD2D40,
-	0x15AC8C80, 0x15ABEBC0, 0x15AB4B00,
-	0x15AAAA40, 0x15AA0980, 0x15A968C0,
-	0x15A8C800, 0x15A82740, 0x15A78680,
-	0x15A6E5C0, 0x15A64500, 0x15A5A440,
-	0x15A50380, 0x15A462C0, 0x15A3C200,
-	0x15A32140, 0x15A28080, 0x15A1DFC0,
-	0x15A13F00, 0x15A09E40, 0x159FFD80,
-	0x159F5CC0, 0x159EBC00, 0x159E1B40,
-	0x159D7A80, 0x159CD9C0, 0x159C3900,
-	0x159B9840, 0x159AF780, 0x159A56C0,
-	0x1599B600, 0x15991540, 0x15987480,
-	0x1597D3C0, 0x15973300, 0x15969240,
-	0x1595F180, 0x159550C0, 0x1594B000,
-	0x15940F40, 0x15936E80, 0x1592CDC0,
-	0x15922D00, 0x15918C40, 0x1590EB80,
-	0x15904AC0, 0x158FAA00, 0x158F0940,
-	0x158E6880, 0x158DC7C0, 0x158D2700,
-	0x158C8640, 0x158BE580, 0x158B44C0,
-	0x158AA400, 0x158A0340, 0x15896280,
-	0x1588C1C0, 0x15882100, 0x15878040,
-	0x1586DF80, 0x15863EC0, 0x15859E00,
-	0x1584FD40, 0x15845C80, 0x1583BBC0,
-	0x15831B00, 0x15827A40, 0x1581D980,
-	0x158138C0, 0x15809800, 0x157FF740,
-	0x157F5680, 0x157EB5C0, 0x157E1500,
-	0x157D7440, 0x157CD380, 0x157C32C0,
-	0x157B9200, 0x157AF140, 0x157A5080,
-	0x1579AFC0, 0x15790F00, 0x15786E40,
-	0x1577CD80, 0x15772CC0, 0x15768C00,
-	0x1575EB40, 0x15754A80, 0x1574A9C0,
-	0x15740900, 0x15736840, 0x1572C780,
-	0x157226C0, 0x15718600, 0x1570E540,
-	0x15704480, 0x156FA3C0, 0x156F0300,
-	0x156E6240, 0x156DC180, 0x156D20C0,
-	0x156C8000, 0x156BDF40, 0x156B3E80,
-	0x156A9DC0, 0x1569FD00, 0x15695C40,
-	0x1568BB80, 0x15681AC0, 0x15677A00,
-	0x1566D940, 0x15663880, 0x156597C0,
-	0x1564F700, 0x15645640, 0x1563B580,
-	0x156314C0, 0x15627400, 0x1561D340,
-	0x15613280, 0x156091C0, 0x155FF100,
-	0x155F5040, 0x155EAF80, 0x155E0EC0,
-	0x155D6E00, 0x155CCD40, 0x155C2C80,
-	0x155B8BC0, 0x155AEB00, 0x155A4A40,
-	0x1559A980, 0x155908C0, 0x15586800,
-	0x1557C740, 0x15572680, 0x155685C0,
-	0x1555E500, 0x15554440, 0x1554A380,
-	0x155402C0, 0x15536200, 0x1552C140,
-	0x15522080, 0x15517FC0, 0x1550DF00,
-	0x15503E40, 0x154F9D80, 0x154EFCC0,
-	0x154E5C00, 0x154DBB40, 0x154D1A80,
-	0x154C79C0, 0x154BD900, 0x154B3840,
-	0x154A9780, 0x1549F6C0, 0x15495600,
-	0x1548B540, 0x15481480, 0x154773C0,
-	0x1546D300, 0x15463240, 0x15459180,
-	0x1544F0C0, 0x15445000, 0x1543AF40,
-	0x15430E80, 0x15426DC0, 0x1541CD00,
-	0x15412C40, 0x15408B80, 0x153FEAC0,
-	0x153F4A00, 0x153EA940, 0x153E0880,
-	0x153D67C0, 0x153CC700, 0x153C2640,
-	0x153B8580, 0x153AE4C0, 0x153A4400,
-	0x1539A340, 0x15390280, 0x153861C0,
-	0x1537C100, 0x15372040, 0x15367F80,
-	0x1535DEC0, 0x15353E00, 0x15349D40,
-	0x1533FC80, 0x15335BC0, 0x1532BB00,
-	0x15321A40, 0x15317980, 0x1530D8C0,
-	0x15303800, 0x152F9740, 0x152EF680,
-	0x152E55C0, 0x152DB500, 0x152D1440,
-	0x152C7380, 0x152BD2C0, 0x152B3200,
-	0x152A9140, 0x1529F080, 0x15294FC0,
-	0x1528AF00, 0x15280E40, 0x15276D80,
-	0x1526CCC0, 0x15262C00, 0x15258B40,
-	0x1524EA80, 0x152449C0, 0x1523A900,
-	0x15230840, 0x15226780, 0x1521C6C0,
-	0x15212600, 0x15208540, 0x151FE480,
-	0x151F43C0, 0x151EA300, 0x151E0240,
-	0x151D6180, 0x151CC0C0, 0x151C2000,
-	0x151B7F40, 0x151ADE80, 0x151A3DC0,
-	0x15199D00, 0x1518FC40, 0x15185B80,
-	0x1517BAC0, 0x15171A00, 0x15167940,
-	0x1515D880, 0x151537C0, 0x15149700,
-	0x1513F640, 0x15135580, 0x1512B4C0,
-	0x15121400, 0x15117340, 0x1510D280,
-	0x151031C0, 0x150F9100, 0x150EF040,
-	0x150E4F80, 0x150DAEC0, 0x150D0E00,
-	0x150C6D40, 0x150BCC80, 0x150B2BC0,
-	0x150A8B00, 0x1509EA40, 0x15094980,
-	0x1508A8C0, 0x15080800, 0x15076740,
-	0x1506C680, 0x150625C0, 0x15058500,
-	0x1504E440, 0x15044380, 0x1503A2C0,
-	0x15030200, 0x15026140, 0x1501C080,
-	0x15011FC0, 0x15007F00, 0x14FFDE40,
-	0x14FF3D80, 0x14FE9CC0, 0x14FDFC00,
-	0x14FD5B40, 0x14FCBA80, 0x14FC19C0,
-	0x14FB7900, 0x14FAD840, 0x14FA3780,
-	0x14F996C0, 0x14F8F600, 0x14F85540,
-	0x14F7B480, 0x14F713C0, 0x14F67300,
-	0x14F5D240, 0x14F53180, 0x14F490C0,
-	0x14F3F000, 0x14F34F40, 0x14F2AE80,
-	0x14F20DC0, 0x14F16D00, 0x14F0CC40,
-	0x14F02B80, 0x14EF8AC0, 0x14EEEA00,
-	0x14EE4940, 0x14EDA880, 0x14ED07C0,
-	0x14EC6700, 0x14EBC640, 0x14EB2580,
-	0x14EA84C0, 0x14E9E400, 0x14E94340,
-	0x14E8A280, 0x14E801C0, 0x14E76100,
-	0x14E6C040, 0x14E61F80, 0x14E57EC0,
-	0x14E4DE00, 0x14E43D40, 0x14E39C80,
-	0x14E2FBC0, 0x14E25B00, 0x14E1BA40,
-	0x14E11980, 0x14E078C0, 0x14DFD800,
-	0x14DF3740, 0x14DE9680, 0x14DDF5C0,
-	0x14DD5500, 0x14DCB440, 0x14DC1380,
-	0x14DB72C0, 0x14DAD200, 0x14DA3140,
-	0x14D99080, 0x14D8EFC0, 0x14D84F00,
-	0x14D7AE40, 0x14D70D80, 0x14D66CC0,
-	0x14D5CC00, 0x14D52B40, 0x14D48A80,
-	0x14D3E9C0, 0x14D34900, 0x14D2A840,
-	0x14D20780, 0x14D166C0, 0x14D0C600,
-	0x14D02540, 0x14CF8480, 0x14CEE3C0,
-	0x14CE4300, 0x14CDA240, 0x14CD0180,
-	0x14CC60C0, 0x14CBC000, 0x14CB1F40,
-	0x14CA7E80, 0x14C9DDC0, 0x14C93D00,
-	0x14C89C40, 0x14C7FB80, 0x14C75AC0,
-	0x14C6BA00, 0x14C61940, 0x14C57880,
-	0x14C4D7C0, 0x14C43700, 0x14C39640,
-	0x14C2F580, 0x14C254C0, 0x14C1B400,
-	0x14C11340, 0x14C07280, 0x14BFD1C0,
-	0x14BF3100, 0x14BE9040, 0x14BDEF80,
-	0x14BD4EC0, 0x14BCAE00, 0x14BC0D40,
-	0x14BB6C80, 0x14BACBC0, 0x14BA2B00,
-	0x14B98A40, 0x14B8E980, 0x14B848C0,
-	0x14B7A800, 0x14B70740, 0x14B66680,
-	0x14B5C5C0, 0x14B52500, 0x14B48440,
-	0x14B3E380, 0x14B342C0, 0x14B2A200,
-	0x14B20140, 0x14B16080, 0x14B0BFC0,
-	0x14B01F00, 0x14AF7E40, 0x14AEDD80,
-	0x14AE3CC0, 0x14AD9C00, 0x14ACFB40,
-	0x14AC5A80, 0x14ABB9C0, 0x14AB1900,
-	0x14AA7840, 0x14A9D780, 0x14A936C0,
-	0x14A89600, 0x14A7F540, 0x14A75480,
-	0x14A6B3C0, 0x14A61300, 0x14A57240,
-	0x14A4D180, 0x14A430C0, 0x14A39000,
-	0x14A2EF40, 0x14A24E80, 0x14A1ADC0,
-	0x14A10D00, 0x14A06C40, 0x149FCB80,
-	0x149F2AC0, 0x149E8A00, 0x149DE940,
-	0x149D4880, 0x149CA7C0, 0x149C0700,
-	0x149B6640, 0x149AC580, 0x149A24C0,
-	0x14998400, 0x1498E340, 0x14984280,
-	0x1497A1C0, 0x14970100, 0x14966040,
-	0x1495BF80, 0x14951EC0, 0x14947E00,
-	0x1493DD40, 0x14933C80, 0x14929BC0,
-	0x1491FB00, 0x14915A40, 0x1490B980,
-	0x149018C0, 0x148F7800, 0x148ED740,
-	0x148E3680, 0x148D95C0, 0x148CF500,
-	0x148C5440, 0x148BB380, 0x148B12C0,
-	0x148A7200, 0x1489D140, 0x14893080,
-	0x14888FC0, 0x1487EF00, 0x14874E40,
-	0x1486AD80, 0x14860CC0, 0x14856C00,
-	0x1484CB40, 0x14842A80, 0x148389C0,
-	0x1482E900, 0x14824840, 0x1481A780,
-	0x148106C0, 0x14806600, 0x147FC540,
-	0x147F2480, 0x147E83C0, 0x147DE300,
-	0x147D4240, 0x147CA180, 0x147C00C0,
-	0x147B6000, 0x147ABF40, 0x147A1E80,
-	0x14797DC0, 0x1478DD00, 0x14783C40,
-	0x14779B80, 0x1476FAC0, 0x14765A00,
-	0x1475B940, 0x14751880, 0x147477C0,
-	0x1473D700, 0x14733640, 0x14729580,
-	0x1471F4C0, 0x14715400, 0x1470B340,
-	0x14701280, 0x146F71C0, 0x146ED100,
-	0x146E3040, 0x146D8F80, 0x146CEEC0,
-	0x146C4E00, 0x146BAD40, 0x146B0C80,
-	0x146A6BC0, 0x1469CB00, 0x14692A40,
-	0x14688980, 0x1467E8C0, 0x14674800,
-	0x1466A740, 0x14660680, 0x146565C0,
-	0x1464C500, 0x14642440, 0x14638380,
-	0x1462E2C0, 0x14624200, 0x1461A140,
-	0x14610080, 0x14605FC0, 0x145FBF00,
-	0x145F1E40, 0x145E7D80, 0x145DDCC0,
-	0x145D3C00, 0x145C9B40, 0x145BFA80,
-	0x145B59C0, 0x145AB900, 0x145A1840,
-	0x14597780, 0x1458D6C0, 0x14583600,
-	0x14579540, 0x1456F480, 0x145653C0,
-	0x1455B300, 0x14551240, 0x14547180,
-	0x1453D0C0, 0x14533000, 0x14528F40,
-	0x1451EE80, 0x14514DC0, 0x1450AD00,
-	0x14500C40, 0x144F6B80, 0x144ECAC0,
-	0x144E2A00, 0x144D8940, 0x144CE880,
-	0x144C47C0, 0x144BA700, 0x144B0640,
-	0x144A6580, 0x1449C4C0, 0x14492400,
-	0x14488340, 0x1447E280, 0x144741C0,
-	0x1446A100, 0x14460040, 0x14455F80,
-	0x1444BEC0, 0x14441E00, 0x14437D40,
-	0x1442DC80, 0x14423BC0, 0x14419B00,
-	0x1440FA40, 0x14405980, 0x143FB8C0,
-	0x143F1800, 0x143E7740, 0x143DD680,
-	0x143D35C0, 0x143C9500, 0x143BF440,
-	0x143B5380, 0x143AB2C0, 0x143A1200,
-	0x14397140, 0x1438D080, 0x14382FC0,
-	0x14378F00, 0x1436EE40, 0x14364D80,
-	0x1435ACC0, 0x14350C00, 0x14346B40,
-	0x1433CA80, 0x143329C0, 0x14328900,
-	0x1431E840, 0x14314780, 0x1430A6C0,
-	0x14300600, 0x142F6540, 0x142EC480,
-	0x142E23C0, 0x142D8300, 0x142CE240,
-	0x142C4180, 0x142BA0C0, 0x142B0000,
-	0x142A5F40, 0x1429BE80, 0x14291DC0,
-	0x14287D00, 0x1427DC40, 0x14273B80,
-	0x14269AC0, 0x1425FA00, 0x14255940,
-	0x1424B880, 0x142417C0, 0x14237700,
-	0x1422D640, 0x14223580, 0x142194C0,
-	0x1420F400, 0x14205340, 0x141FB280,
-	0x141F11C0, 0x141E7100, 0x141DD040,
-	0x141D2F80, 0x141C8EC0, 0x141BEE00,
-	0x141B4D40, 0x141AAC80, 0x141A0BC0,
-	0x14196B00, 0x1418CA40, 0x14182980,
-	0x141788C0, 0x1416E800, 0x14164740,
-	0x1415A680, 0x141505C0, 0x14146500,
-	0x1413C440, 0x14132380, 0x141282C0,
-	0x1411E200, 0x14114140, 0x1410A080,
-	0x140FFFC0, 0x140F5F00, 0x140EBE40,
-	0x140E1D80, 0x140D7CC0, 0x140CDC00,
-	0x140C3B40, 0x140B9A80, 0x140AF9C0,
-	0x140A5900, 0x1409B840, 0x14091780,
-	0x140876C0, 0x1407D600, 0x14073540,
-	0x14069480, 0x1405F3C0, 0x14055300,
-	0x1404B240, 0x14041180, 0x140370C0,
-	0x1402D000, 0x14022F40, 0x14018E80,
-	0x1400EDC0, 0x14004D00, 0x13FFAC40,
-	0x13FF0B80, 0x13FE6AC0, 0x13FDCA00,
-	0x13FD2940, 0x13FC8880, 0x13FBE7C0,
-	0x13FB4700, 0x13FAA640, 0x13FA0580,
-	0x13F964C0, 0x13F8C400, 0x13F82340,
-	0x13F78280, 0x13F6E1C0, 0x13F64100,
-	0x13F5A040, 0x13F4FF80, 0x13F45EC0,
-	0x13F3BE00, 0x13F31D40, 0x13F27C80,
-	0x13F1DBC0, 0x13F13B00, 0x13F09A40,
-	0x13EFF980, 0x13EF58C0, 0x13EEB800,
-	0x13EE1740, 0x13ED7680, 0x13ECD5C0,
-	0x13EC3500, 0x13EB9440, 0x13EAF380,
-	0x13EA52C0, 0x13E9B200, 0x13E91140,
-	0x13E87080, 0x13E7CFC0, 0x13E72F00,
-	0x13E68E40, 0x13E5ED80, 0x13E54CC0,
-	0x13E4AC00, 0x13E40B40, 0x13E36A80,
-	0x13E2C9C0, 0x13E22900, 0x13E18840,
-	0x13E0E780, 0x13E046C0, 0x13DFA600,
-	0x13DF0540, 0x13DE6480, 0x13DDC3C0,
-	0x13DD2300, 0x13DC8240, 0x13DBE180,
-	0x13DB40C0, 0x13DAA000, 0x13D9FF40,
-	0x13D95E80, 0x13D8BDC0, 0x13D81D00,
-	0x13D77C40, 0x13D6DB80, 0x13D63AC0,
-	0x13D59A00, 0x13D4F940, 0x13D45880,
-	0x13D3B7C0, 0x13D31700, 0x13D27640,
-	0x13D1D580, 0x13D134C0, 0x13D09400,
-	0x13CFF340, 0x13CF5280, 0x13CEB1C0,
-	0x13CE1100, 0x13CD7040, 0x13CCCF80,
-	0x13CC2EC0, 0x13CB8E00, 0x13CAED40,
-	0x13CA4C80, 0x13C9ABC0, 0x13C90B00,
-	0x13C86A40, 0x13C7C980, 0x13C728C0,
-	0x13C68800, 0x13C5E740, 0x13C54680,
-	0x13C4A5C0, 0x13C40500, 0x13C36440,
-	0x13C2C380, 0x13C222C0, 0x13C18200,
-	0x13C0E140, 0x13C04080, 0x13BF9FC0,
-	0x13BEFF00, 0x13BE5E40, 0x13BDBD80,
-	0x13BD1CC0, 0x13BC7C00, 0x13BBDB40,
-	0x13BB3A80, 0x13BA99C0, 0x13B9F900,
-	0x13B95840, 0x13B8B780, 0x13B816C0,
-	0x13B77600, 0x13B6D540, 0x13B63480,
-	0x13B593C0, 0x13B4F300, 0x13B45240,
-	0x13B3B180, 0x13B310C0, 0x13B27000,
-	0x13B1CF40, 0x13B12E80, 0x13B08DC0,
-	0x13AFED00, 0x13AF4C40, 0x13AEAB80,
-	0x13AE0AC0, 0x13AD6A00, 0x13ACC940,
-	0x13AC2880, 0x13AB87C0, 0x13AAE700,
-	0x13AA4640, 0x13A9A580, 0x13A904C0,
-	0x13A86400, 0x13A7C340, 0x13A72280,
-	0x13A681C0, 0x13A5E100, 0x13A54040,
-	0x13A49F80, 0x13A3FEC0, 0x13A35E00,
-	0x13A2BD40, 0x13A21C80, 0x13A17BC0,
-	0x13A0DB00, 0x13A03A40, 0x139F9980,
-	0x139EF8C0, 0x139E5800, 0x139DB740,
-	0x139D1680, 0x139C75C0, 0x139BD500,
-	0x139B3440, 0x139A9380, 0x1399F2C0,
-	0x13995200, 0x1398B140, 0x13981080,
-	0x13976FC0, 0x1396CF00, 0x13962E40,
-	0x13958D80, 0x1394ECC0, 0x13944C00,
-	0x1393AB40, 0x13930A80, 0x139269C0,
-	0x1391C900, 0x13912840, 0x13908780,
-	0x138FE6C0, 0x138F4600, 0x138EA540,
-	0x138E0480, 0x138D63C0, 0x138CC300,
-	0x138C2240, 0x138B8180, 0x138AE0C0,
-	0x138A4000, 0x13899F40, 0x1388FE80,
-	0x13885DC0, 0x1387BD00, 0x13871C40,
-	0x13867B80, 0x1385DAC0, 0x13853A00,
-	0x13849940, 0x1383F880, 0x138357C0,
-	0x1382B700, 0x13821640, 0x13817580,
-	0x1380D4C0, 0x13803400, 0x137F9340,
-	0x137EF280, 0x137E51C0, 0x137DB100,
-	0x137D1040, 0x137C6F80, 0x137BCEC0,
-	0x137B2E00, 0x137A8D40, 0x1379EC80,
-	0x13794BC0, 0x1378AB00, 0x13780A40,
-	0x13776980, 0x1376C8C0, 0x13762800,
-	0x13758740, 0x1374E680, 0x137445C0,
-	0x1373A500, 0x13730440, 0x13726380,
-	0x1371C2C0, 0x13712200, 0x13708140,
-	0x136FE080, 0x136F3FC0, 0x136E9F00,
-	0x136DFE40, 0x136D5D80, 0x136CBCC0,
-	0x136C1C00, 0x136B7B40, 0x136ADA80,
-	0x136A39C0, 0x13699900, 0x1368F840,
-	0x13685780, 0x1367B6C0, 0x13671600,
-	0x13667540, 0x1365D480, 0x136533C0,
-	0x13649300, 0x1363F240, 0x13635180,
-	0x1362B0C0, 0x13621000, 0x13616F40,
-	0x1360CE80, 0x13602DC0, 0x135F8D00,
-	0x135EEC40, 0x135E4B80, 0x135DAAC0,
-	0x135D0A00, 0x135C6940, 0x135BC880,
-	0x135B27C0, 0x135A8700, 0x1359E640,
-	0x13594580, 0x1358A4C0, 0x13580400,
-	0x13576340, 0x1356C280, 0x135621C0,
-	0x13558100, 0x1354E040, 0x13543F80,
-	0x13539EC0, 0x1352FE00, 0x13525D40,
-	0x1351BC80, 0x13511BC0, 0x13507B00,
-	0x134FDA40, 0x134F3980, 0x134E98C0,
-	0x134DF800, 0x134D5740, 0x134CB680,
-	0x134C15C0, 0x134B7500, 0x134AD440,
-	0x134A3380, 0x134992C0, 0x1348F200,
-	0x13485140, 0x1347B080, 0x13470FC0,
-	0x13466F00, 0x1345CE40, 0x13452D80,
-	0x13448CC0, 0x1343EC00, 0x13434B40,
-	0x1342AA80, 0x134209C0, 0x13416900,
-	0x1340C840, 0x13402780, 0x133F86C0,
-	0x133EE600, 0x133E4540, 0x133DA480,
-	0x133D03C0, 0x133C6300, 0x133BC240,
-	0x133B2180, 0x133A80C0, 0x1339E000,
-	0x13393F40, 0x13389E80, 0x1337FDC0,
-	0x13375D00, 0x1336BC40, 0x13361B80,
-	0x13357AC0, 0x1334DA00, 0x13343940,
-	0x13339880, 0x1332F7C0, 0x13325700,
-	0x1331B640, 0x13311580, 0x133074C0,
-	0x132FD400, 0x132F3340, 0x132E9280,
-	0x132DF1C0, 0x132D5100, 0x132CB040,
-	0x132C0F80, 0x132B6EC0, 0x132ACE00,
-	0x132A2D40, 0x13298C80, 0x1328EBC0,
-	0x13284B00, 0x1327AA40, 0x13270980,
-	0x132668C0, 0x1325C800, 0x13252740,
-	0x13248680, 0x1323E5C0, 0x13234500,
-	0x1322A440, 0x13220380, 0x132162C0,
-	0x1320C200, 0x13202140, 0x131F8080,
-	0x131EDFC0, 0x131E3F00, 0x131D9E40,
-	0x131CFD80, 0x131C5CC0, 0x131BBC00,
-	0x131B1B40, 0x131A7A80, 0x1319D9C0,
-	0x13193900, 0x13189840, 0x1317F780,
-	0x131756C0, 0x1316B600, 0x13161540,
-	0x13157480, 0x1314D3C0, 0x13143300,
-	0x13139240, 0x1312F180, 0x131250C0,
-	0x1311B000, 0x13110F40, 0x13106E80,
-	0x130FCDC0, 0x130F2D00, 0x130E8C40,
-	0x130DEB80, 0x130D4AC0, 0x130CAA00,
-	0x130C0940, 0x130B6880, 0x130AC7C0,
-	0x130A2700, 0x13098640, 0x1308E580,
-	0x130844C0, 0x1307A400, 0x13070340,
-	0x13066280, 0x1305C1C0, 0x13052100,
-	0x13048040, 0x1303DF80, 0x13033EC0,
-	0x13029E00, 0x1301FD40, 0x13015C80,
-	0x1300BBC0, 0x13001B00, 0x12FF7A40,
-	0x12FED980, 0x12FE38C0, 0x12FD9800,
-	0x12FCF740, 0x12FC5680, 0x12FBB5C0,
-	0x12FB1500, 0x12FA7440, 0x12F9D380,
-	0x12F932C0, 0x12F89200, 0x12F7F140,
-	0x12F75080, 0x12F6AFC0, 0x12F60F00,
-	0x12F56E40, 0x12F4CD80, 0x12F42CC0,
-	0x12F38C00, 0x12F2EB40, 0x12F24A80,
-	0x12F1A9C0, 0x12F10900, 0x12F06840,
-	0x12EFC780, 0x12EF26C0, 0x12EE8600,
-	0x12EDE540, 0x12ED4480, 0x12ECA3C0,
-	0x12EC0300, 0x12EB6240, 0x12EAC180,
-	0x12EA20C0, 0x12E98000, 0x12E8DF40,
-	0x12E83E80, 0x12E79DC0, 0x12E6FD00,
-	0x12E65C40, 0x12E5BB80, 0x12E51AC0,
-	0x12E47A00, 0x12E3D940, 0x12E33880,
-	0x12E297C0, 0x12E1F700, 0x12E15640,
-	0x12E0B580, 0x12E014C0, 0x12DF7400,
-	0x12DED340, 0x12DE3280, 0x12DD91C0,
-	0x12DCF100, 0x12DC5040, 0x12DBAF80,
-	0x12DB0EC0, 0x12DA6E00, 0x12D9CD40,
-	0x12D92C80, 0x12D88BC0, 0x12D7EB00,
-	0x12D74A40, 0x12D6A980, 0x12D608C0,
-	0x12D56800, 0x12D4C740, 0x12D42680,
-	0x12D385C0, 0x12D2E500, 0x12D24440,
-	0x12D1A380, 0x12D102C0, 0x12D06200,
-	0x12CFC140, 0x12CF2080, 0x12CE7FC0,
-	0x12CDDF00, 0x12CD3E40, 0x12CC9D80,
-	0x12CBFCC0, 0x12CB5C00, 0x12CABB40,
-	0x12CA1A80, 0x12C979C0, 0x12C8D900,
-	0x12C83840, 0x12C79780, 0x12C6F6C0,
-	0x12C65600, 0x12C5B540, 0x12C51480,
-	0x12C473C0, 0x12C3D300, 0x12C33240,
-	0x12C29180, 0x12C1F0C0, 0x12C15000,
-	0x12C0AF40, 0x12C00E80, 0x12BF6DC0,
-	0x12BECD00, 0x12BE2C40, 0x12BD8B80,
-	0x12BCEAC0, 0x12BC4A00, 0x12BBA940,
-	0x12BB0880, 0x12BA67C0, 0x12B9C700,
-	0x12B92640, 0x12B88580, 0x12B7E4C0,
-	0x12B74400, 0x12B6A340, 0x12B60280,
-	0x12B561C0, 0x12B4C100, 0x12B42040,
-	0x12B37F80, 0x12B2DEC0, 0x12B23E00,
-	0x12B19D40, 0x12B0FC80, 0x12B05BC0,
-	0x12AFBB00, 0x12AF1A40, 0x12AE7980,
-	0x12ADD8C0, 0x12AD3800, 0x12AC9740,
-	0x12ABF680, 0x12AB55C0, 0x12AAB500,
-	0x12AA1440, 0x12A97380, 0x12A8D2C0,
-	0x12A83200, 0x12A79140, 0x12A6F080,
-	0x12A64FC0, 0x12A5AF00, 0x12A50E40,
-	0x12A46D80, 0x12A3CCC0, 0x12A32C00,
-	0x12A28B40, 0x12A1EA80, 0x12A149C0,
-	0x12A0A900, 0x12A00840, 0x129F6780,
-	0x129EC6C0, 0x129E2600, 0x129D8540,
-	0x129CE480, 0x129C43C0, 0x129BA300,
-	0x129B0240, 0x129A6180, 0x1299C0C0,
-	0x12992000, 0x12987F40, 0x1297DE80,
-	0x12973DC0, 0x12969D00, 0x1295FC40,
-	0x12955B80, 0x1294BAC0, 0x12941A00,
-	0x12937940, 0x1292D880, 0x129237C0,
-	0x12919700, 0x1290F640, 0x12905580,
-	0x128FB4C0, 0x128F1400, 0x128E7340,
-	0x128DD280, 0x128D31C0, 0x128C9100,
-	0x128BF040, 0x128B4F80, 0x128AAEC0,
-	0x128A0E00, 0x12896D40, 0x1288CC80,
-	0x12882BC0, 0x12878B00, 0x1286EA40,
-	0x12864980, 0x1285A8C0, 0x12850800,
-	0x12846740, 0x1283C680, 0x128325C0,
-	0x12828500, 0x1281E440, 0x12814380,
-	0x1280A2C0, 0x12800200, 0x127F6140,
-	0x127EC080, 0x127E1FC0, 0x127D7F00,
-	0x127CDE40, 0x127C3D80, 0x127B9CC0,
-	0x127AFC00, 0x127A5B40, 0x1279BA80,
-	0x127919C0, 0x12787900, 0x1277D840,
-	0x12773780, 0x127696C0, 0x1275F600,
-	0x12755540, 0x1274B480, 0x127413C0,
-	0x12737300, 0x1272D240, 0x12723180,
-	0x127190C0, 0x1270F000, 0x12704F40,
-	0x126FAE80, 0x126F0DC0, 0x126E6D00,
-	0x126DCC40, 0x126D2B80, 0x126C8AC0,
-	0x126BEA00, 0x126B4940, 0x126AA880,
-	0x126A07C0, 0x12696700, 0x1268C640,
-	0x12682580, 0x126784C0, 0x1266E400,
-	0x12664340, 0x1265A280, 0x126501C0,
-	0x12646100, 0x1263C040, 0x12631F80,
-	0x12627EC0, 0x1261DE00, 0x12613D40,
-	0x12609C80, 0x125FFBC0, 0x125F5B00,
-	0x125EBA40, 0x125E1980, 0x125D78C0,
-	0x125CD800, 0x125C3740, 0x125B9680,
-	0x125AF5C0, 0x125A5500, 0x1259B440,
-	0x12591380, 0x125872C0, 0x1257D200,
-	0x12573140, 0x12569080, 0x1255EFC0,
-	0x12554F00, 0x1254AE40, 0x12540D80,
-	0x12536CC0, 0x1252CC00, 0x12522B40,
-	0x12518A80, 0x1250E9C0, 0x12504900,
-	0x124FA840, 0x124F0780, 0x124E66C0,
-	0x124DC600, 0x124D2540, 0x124C8480,
-	0x124BE3C0, 0x124B4300, 0x124AA240,
-	0x124A0180, 0x124960C0, 0x1248C000,
-	0x12481F40, 0x12477E80, 0x1246DDC0,
-	0x12463D00, 0x12459C40, 0x1244FB80,
-	0x12445AC0, 0x1243BA00, 0x12431940,
-	0x12427880, 0x1241D7C0, 0x12413700,
-	0x12409640, 0x123FF580, 0x123F54C0,
-	0x123EB400, 0x123E1340, 0x123D7280,
-	0x123CD1C0, 0x123C3100, 0x123B9040,
-	0x123AEF80, 0x123A4EC0, 0x1239AE00,
-	0x12390D40, 0x12386C80, 0x1237CBC0,
-	0x12372B00, 0x12368A40, 0x1235E980,
-	0x123548C0, 0x1234A800, 0x12340740,
-	0x12336680, 0x1232C5C0, 0x12322500,
-	0x12318440, 0x1230E380, 0x123042C0,
-	0x122FA200, 0x122F0140, 0x122E6080,
-	0x122DBFC0, 0x122D1F00, 0x122C7E40,
-	0x122BDD80, 0x122B3CC0, 0x122A9C00,
-	0x1229FB40, 0x12295A80, 0x1228B9C0,
-	0x12281900, 0x12277840, 0x1226D780,
-	0x122636C0, 0x12259600, 0x1224F540,
-	0x12245480, 0x1223B3C0, 0x12231300,
-	0x12227240, 0x1221D180, 0x122130C0,
-	0x12209000, 0x121FEF40, 0x121F4E80,
-	0x121EADC0, 0x121E0D00, 0x121D6C40,
-	0x121CCB80, 0x121C2AC0, 0x121B8A00,
-	0x121AE940, 0x121A4880, 0x1219A7C0,
-	0x12190700, 0x12186640, 0x1217C580,
-	0x121724C0, 0x12168400, 0x1215E340,
-	0x12154280, 0x1214A1C0, 0x12140100,
-	0x12136040, 0x1212BF80, 0x12121EC0,
-	0x12117E00, 0x1210DD40, 0x12103C80,
-	0x120F9BC0, 0x120EFB00, 0x120E5A40,
-	0x120DB980, 0x120D18C0, 0x120C7800,
-	0x120BD740, 0x120B3680, 0x120A95C0,
-	0x1209F500, 0x12095440, 0x1208B380,
-	0x120812C0, 0x12077200, 0x1206D140,
-	0x12063080, 0x12058FC0, 0x1204EF00,
-	0x12044E40, 0x1203AD80, 0x12030CC0,
-	0x12026C00, 0x1201CB40, 0x12012A80,
-	0x120089C0, 0x11FFE900, 0x11FF4840,
-	0x11FEA780, 0x11FE06C0, 0x11FD6600,
-	0x11FCC540, 0x11FC2480, 0x11FB83C0,
-	0x11FAE300, 0x11FA4240, 0x11F9A180,
-	0x11F900C0, 0x11F86000, 0x11F7BF40,
-	0x11F71E80, 0x11F67DC0, 0x11F5DD00,
-	0x11F53C40, 0x11F49B80, 0x11F3FAC0,
-	0x11F35A00, 0x11F2B940, 0x11F21880,
-	0x11F177C0, 0x11F0D700, 0x11F03640,
-	0x11EF9580, 0x11EEF4C0, 0x11EE5400,
-	0x11EDB340, 0x11ED1280, 0x11EC71C0,
-	0x11EBD100, 0x11EB3040, 0x11EA8F80,
-	0x11E9EEC0, 0x11E94E00, 0x11E8AD40,
-	0x11E80C80, 0x11E76BC0, 0x11E6CB00,
-	0x11E62A40, 0x11E58980, 0x11E4E8C0,
-	0x11E44800, 0x11E3A740, 0x11E30680,
-	0x11E265C0, 0x11E1C500, 0x11E12440,
-	0x11E08380, 0x11DFE2C0, 0x11DF4200,
-	0x11DEA140, 0x11DE0080, 0x11DD5FC0,
-	0x11DCBF00, 0x11DC1E40, 0x11DB7D80,
-	0x11DADCC0, 0x11DA3C00, 0x11D99B40,
-	0x11D8FA80, 0x11D859C0, 0x11D7B900,
-	0x11D71840, 0x11D67780, 0x11D5D6C0,
-	0x11D53600, 0x11D49540, 0x11D3F480,
-	0x11D353C0, 0x11D2B300, 0x11D21240,
-	0x11D17180, 0x11D0D0C0, 0x11D03000,
-	0x11CF8F40, 0x11CEEE80, 0x11CE4DC0,
-	0x11CDAD00, 0x11CD0C40, 0x11CC6B80,
-	0x11CBCAC0, 0x11CB2A00, 0x11CA8940,
-	0x11C9E880, 0x11C947C0, 0x11C8A700,
-	0x11C80640, 0x11C76580, 0x11C6C4C0,
-	0x11C62400, 0x11C58340, 0x11C4E280,
-	0x11C441C0, 0x11C3A100, 0x11C30040,
-	0x11C25F80, 0x11C1BEC0, 0x11C11E00,
-	0x11C07D40, 0x11BFDC80, 0x11BF3BC0,
-	0x11BE9B00, 0x11BDFA40, 0x11BD5980,
-	0x11BCB8C0, 0x11BC1800, 0x11BB7740,
-	0x11BAD680, 0x11BA35C0, 0x11B99500,
-	0x11B8F440, 0x11B85380, 0x11B7B2C0,
-	0x11B71200, 0x11B67140, 0x11B5D080,
-	0x11B52FC0, 0x11B48F00, 0x11B3EE40,
-	0x11B34D80, 0x11B2ACC0, 0x11B20C00,
-	0x11B16B40, 0x11B0CA80, 0x11B029C0,
-	0x11AF8900, 0x11AEE840, 0x11AE4780,
-	0x11ADA6C0, 0x11AD0600, 0x11AC6540,
-	0x11ABC480, 0x11AB23C0, 0x11AA8300,
-	0x11A9E240, 0x11A94180, 0x11A8A0C0,
-	0x11A80000, 0x11A767C0, 0x11A6CF80,
-	0x11A63740, 0x11A59F00, 0x11A506C0,
-	0x11A46E80, 0x11A3D640, 0x11A33E00,
-	0x11A2A5C0, 0x11A20D80, 0x11A17540,
-	0x11A0DD00, 0x11A044C0, 0x119FAC80,
-	0x119F1440, 0x119E7C00, 0x119DE3C0,
-	0x119D4B80, 0x119CB340, 0x119C1B00,
-	0x119B82C0, 0x119AEA80, 0x119A5240,
-	0x1199BA00, 0x119921C0, 0x11988980,
-	0x1197F140, 0x11975900, 0x1196C0C0,
-	0x11962880, 0x11959040, 0x1194F800,
-	0x11945FC0, 0x1193C780, 0x11932F40,
-	0x11929700, 0x1191FEC0, 0x11916680,
-	0x1190CE40, 0x11903600, 0x118F9DC0,
-	0x118F0580, 0x118E6D40, 0x118DD500,
-	0x118D3CC0, 0x118CA480, 0x118C0C40,
-	0x118B7400, 0x118ADBC0, 0x118A4380,
-	0x1189AB40, 0x11891300, 0x11887AC0,
-	0x1187E280, 0x11874A40, 0x1186B200,
-	0x118619C0, 0x11858180, 0x1184E940,
-	0x11845100, 0x1183B8C0, 0x11832080,
-	0x11828840, 0x1181F000, 0x118157C0,
-	0x1180BF80, 0x11802740, 0x117F8F00,
-	0x117EF6C0, 0x117E5E80, 0x117DC640,
-	0x117D2E00, 0x117C95C0, 0x117BFD80,
-	0x117B6540, 0x117ACD00, 0x117A34C0,
-	0x11799C80, 0x11790440, 0x11786C00,
-	0x1177D3C0, 0x11773B80, 0x1176A340,
-	0x11760B00, 0x117572C0, 0x1174DA80,
-	0x11744240, 0x1173AA00, 0x117311C0,
-	0x11727980, 0x1171E140, 0x11714900,
-	0x1170B0C0, 0x11701880, 0x116F8040,
-	0x116EE800, 0x116E4FC0, 0x116DB780,
-	0x116D1F40, 0x116C8700, 0x116BEEC0,
-	0x116B5680, 0x116ABE40, 0x116A2600,
-	0x11698DC0, 0x1168F580, 0x11685D40,
-	0x1167C500, 0x11672CC0, 0x11669480,
-	0x1165FC40, 0x11656400, 0x1164CBC0,
-	0x11643380, 0x11639B40, 0x11630300,
-	0x11626AC0, 0x1161D280, 0x11613A40,
-	0x1160A200, 0x116009C0, 0x115F7180,
-	0x115ED940, 0x115E4100, 0x115DA8C0,
-	0x115D1080, 0x115C7840, 0x115BE000,
-	0x115B47C0, 0x115AAF80, 0x115A1740,
-	0x11597F00, 0x1158E6C0, 0x11584E80,
-	0x1157B640, 0x11571E00, 0x115685C0,
-	0x1155ED80, 0x11555540, 0x1154BD00,
-	0x115424C0, 0x11538C80, 0x1152F440,
-	0x11525C00, 0x1151C3C0, 0x11512B80,
-	0x11509340, 0x114FFB00, 0x114F62C0,
-	0x114ECA80, 0x114E3240, 0x114D9A00,
-	0x114D01C0, 0x114C6980, 0x114BD140,
-	0x114B3900, 0x114AA0C0, 0x114A0880,
-	0x11497040, 0x1148D800, 0x11483FC0,
-	0x1147A780, 0x11470F40, 0x11467700,
-	0x1145DEC0, 0x11454680, 0x1144AE40,
-	0x11441600, 0x11437DC0, 0x1142E580,
-	0x11424D40, 0x1141B500, 0x11411CC0,
-	0x11408480, 0x113FEC40, 0x113F5400,
-	0x113EBBC0, 0x113E2380, 0x113D8B40,
-	0x113CF300, 0x113C5AC0, 0x113BC280,
-	0x113B2A40, 0x113A9200, 0x1139F9C0,
-	0x11396180, 0x1138C940, 0x11383100,
-	0x113798C0, 0x11370080, 0x11366840,
-	0x1135D000, 0x113537C0, 0x11349F80,
-	0x11340740, 0x11336F00, 0x1132D6C0,
-	0x11323E80, 0x1131A640, 0x11310E00,
-	0x113075C0, 0x112FDD80, 0x112F4540,
-	0x112EAD00, 0x112E14C0, 0x112D7C80,
-	0x112CE440, 0x112C4C00, 0x112BB3C0,
-	0x112B1B80, 0x112A8340, 0x1129EB00,
-	0x112952C0, 0x1128BA80, 0x11282240,
-	0x11278A00, 0x1126F1C0, 0x11265980,
-	0x1125C140, 0x11252900, 0x112490C0,
-	0x1123F880, 0x11236040, 0x1122C800,
-	0x11222FC0, 0x11219780, 0x1120FF40,
-	0x11206700, 0x111FCEC0, 0x111F3680,
-	0x111E9E40, 0x111E0600, 0x111D6DC0,
-	0x111CD580, 0x111C3D40, 0x111BA500,
-	0x111B0CC0, 0x111A7480, 0x1119DC40,
-	0x11194400, 0x1118ABC0, 0x11181380,
-	0x11177B40, 0x1116E300, 0x11164AC0,
-	0x1115B280, 0x11151A40, 0x11148200,
-	0x1113E9C0, 0x11135180, 0x1112B940,
-	0x11122100, 0x111188C0, 0x1110F080,
-	0x11105840, 0x110FC000, 0x110F27C0,
-	0x110E8F80, 0x110DF740, 0x110D5F00,
-	0x110CC6C0, 0x110C2E80, 0x110B9640,
-	0x110AFE00, 0x110A65C0, 0x1109CD80,
-	0x11093540, 0x11089D00, 0x110804C0,
-	0x11076C80, 0x1106D440, 0x11063C00,
-	0x1105A3C0, 0x11050B80, 0x11047340,
-	0x1103DB00, 0x110342C0, 0x1102AA80,
-	0x11021240, 0x11017A00, 0x1100E1C0,
-	0x11004980, 0x10FFB140, 0x10FF1900,
-	0x10FE80C0, 0x10FDE880, 0x10FD5040,
-	0x10FCB800, 0x10FC1FC0, 0x10FB8780,
-	0x10FAEF40, 0x10FA5700, 0x10F9BEC0,
-	0x10F92680, 0x10F88E40, 0x10F7F600,
-	0x10F75DC0, 0x10F6C580, 0x10F62D40,
-	0x10F59500, 0x10F4FCC0, 0x10F46480,
-	0x10F3CC40, 0x10F33400, 0x10F29BC0,
-	0x10F20380, 0x10F16B40, 0x10F0D300,
-	0x10F03AC0, 0x10EFA280, 0x10EF0A40,
-	0x10EE7200, 0x10EDD9C0, 0x10ED4180,
-	0x10ECA940, 0x10EC1100, 0x10EB78C0,
-	0x10EAE080, 0x10EA4840, 0x10E9B000,
-	0x10E917C0, 0x10E87F80, 0x10E7E740,
-	0x10E74F00, 0x10E6B6C0, 0x10E61E80,
-	0x10E58640, 0x10E4EE00, 0x10E455C0,
-	0x10E3BD80, 0x10E32540, 0x10E28D00,
-	0x10E1F4C0, 0x10E15C80, 0x10E0C440,
-	0x10E02C00, 0x10DF93C0, 0x10DEFB80,
-	0x10DE6340, 0x10DDCB00, 0x10DD32C0,
-	0x10DC9A80, 0x10DC0240, 0x10DB6A00,
-	0x10DAD1C0, 0x10DA3980, 0x10D9A140,
-	0x10D90900, 0x10D870C0, 0x10D7D880,
-	0x10D74040, 0x10D6A800, 0x10D60FC0,
-	0x10D57780, 0x10D4DF40, 0x10D44700,
-	0x10D3AEC0, 0x10D31680, 0x10D27E40,
-	0x10D1E600, 0x10D14DC0, 0x10D0B580,
-	0x10D01D40, 0x10CF8500, 0x10CEECC0,
-	0x10CE5480, 0x10CDBC40, 0x10CD2400,
-	0x10CC8BC0, 0x10CBF380, 0x10CB5B40,
-	0x10CAC300, 0x10CA2AC0, 0x10C99280,
-	0x10C8FA40, 0x10C86200, 0x10C7C9C0,
-	0x10C73180, 0x10C69940, 0x10C60100,
-	0x10C568C0, 0x10C4D080, 0x10C43840,
-	0x10C3A000, 0x10C307C0, 0x10C26F80,
-	0x10C1D740, 0x10C13F00, 0x10C0A6C0,
-	0x10C00E80, 0x10BF7640, 0x10BEDE00,
-	0x10BE45C0, 0x10BDAD80, 0x10BD1540,
-	0x10BC7D00, 0x10BBE4C0, 0x10BB4C80,
-	0x10BAB440, 0x10BA1C00, 0x10B983C0,
-	0x10B8EB80, 0x10B85340, 0x10B7BB00,
-	0x10B722C0, 0x10B68A80, 0x10B5F240,
-	0x10B55A00, 0x10B4C1C0, 0x10B42980,
-	0x10B39140, 0x10B2F900, 0x10B260C0,
-	0x10B1C880, 0x10B13040, 0x10B09800,
-	0x10AFFFC0, 0x10AF6780, 0x10AECF40,
-	0x10AE3700, 0x10AD9EC0, 0x10AD0680,
-	0x10AC6E40, 0x10ABD600, 0x10AB3DC0,
-	0x10AAA580, 0x10AA0D40, 0x10A97500,
-	0x10A8DCC0, 0x10A84480, 0x10A7AC40,
-	0x10A71400, 0x10A67BC0, 0x10A5E380,
-	0x10A54B40, 0x10A4B300, 0x10A41AC0,
-	0x10A38280, 0x10A2EA40, 0x10A25200,
-	0x10A1B9C0, 0x10A12180, 0x10A08940,
-	0x109FF100, 0x109F58C0, 0x109EC080,
-	0x109E2840, 0x109D9000, 0x109CF7C0,
-	0x109C5F80, 0x109BC740, 0x109B2F00,
-	0x109A96C0, 0x1099FE80, 0x10996640,
-	0x1098CE00, 0x109835C0, 0x10979D80,
-	0x10970540, 0x10966D00, 0x1095D4C0,
-	0x10953C80, 0x1094A440, 0x10940C00,
-	0x109373C0, 0x1092DB80, 0x10924340,
-	0x1091AB00, 0x109112C0, 0x10907A80,
-	0x108FE240, 0x108F4A00, 0x108EB1C0,
-	0x108E1980, 0x108D8140, 0x108CE900,
-	0x108C50C0, 0x108BB880, 0x108B2040,
-	0x108A8800, 0x1089EFC0, 0x10895780,
-	0x1088BF40, 0x10882700, 0x10878EC0,
-	0x1086F680, 0x10865E40, 0x1085C600,
-	0x10852DC0, 0x10849580, 0x1083FD40,
-	0x10836500, 0x1082CCC0, 0x10823480,
-	0x10819C40, 0x10810400, 0x10806BC0,
-	0x107FD380, 0x107F3B40, 0x107EA300,
-	0x107E0AC0, 0x107D7280, 0x107CDA40,
-	0x107C4200, 0x107BA9C0, 0x107B1180,
-	0x107A7940, 0x1079E100, 0x107948C0,
-	0x1078B080, 0x10781840, 0x10778000,
-	0x1076E7C0, 0x10764F80, 0x1075B740,
-	0x10751F00, 0x107486C0, 0x1073EE80,
-	0x10735640, 0x1072BE00, 0x107225C0,
-	0x10718D80, 0x1070F540, 0x10705D00,
-	0x106FC4C0, 0x106F2C80, 0x106E9440,
-	0x106DFC00, 0x106D63C0, 0x106CCB80,
-	0x106C3340, 0x106B9B00, 0x106B02C0,
-	0x106A6A80, 0x1069D240, 0x10693A00,
-	0x1068A1C0, 0x10680980, 0x10677140,
-	0x1066D900, 0x106640C0, 0x1065A880,
-	0x10651040, 0x10647800, 0x1063DFC0,
-	0x10634780, 0x1062AF40, 0x10621700,
-	0x10617EC0, 0x1060E680, 0x10604E40,
-	0x105FB600, 0x105F1DC0, 0x105E8580,
-	0x105DED40, 0x105D5500, 0x105CBCC0,
-	0x105C2480, 0x105B8C40, 0x105AF400,
-	0x105A5BC0, 0x1059C380, 0x10592B40,
-	0x10589300, 0x1057FAC0, 0x10576280,
-	0x1056CA40, 0x10563200, 0x105599C0,
-	0x10550180, 0x10546940, 0x1053D100,
-	0x105338C0, 0x1052A080, 0x10520840,
-	0x10517000, 0x1050D7C0, 0x10503F80,
-	0x104FA740, 0x104F0F00, 0x104E76C0,
-	0x104DDE80, 0x104D4640, 0x104CAE00,
-	0x104C15C0, 0x104B7D80, 0x104AE540,
-	0x104A4D00, 0x1049B4C0, 0x10491C80,
-	0x10488440, 0x1047EC00, 0x104753C0,
-	0x1046BB80, 0x10462340, 0x10458B00,
-	0x1044F2C0, 0x10445A80, 0x1043C240,
-	0x10432A00, 0x104291C0, 0x1041F980,
-	0x10416140, 0x1040C900, 0x104030C0,
-	0x103F9880, 0x103F0040, 0x103E6800,
-	0x103DCFC0, 0x103D3780, 0x103C9F40,
-	0x103C0700, 0x103B6EC0, 0x103AD680,
-	0x103A3E40, 0x1039A600, 0x10390DC0,
-	0x10387580, 0x1037DD40, 0x10374500,
-	0x1036ACC0, 0x10361480, 0x10357C40,
-	0x1034E400, 0x10344BC0, 0x1033B380,
-	0x10331B40, 0x10328300, 0x1031EAC0,
-	0x10315280, 0x1030BA40, 0x10302200,
-	0x102F89C0, 0x102EF180, 0x102E5940,
-	0x102DC100, 0x102D28C0, 0x102C9080,
-	0x102BF840, 0x102B6000, 0x102AC7C0,
-	0x102A2F80, 0x10299740, 0x1028FF00,
-	0x102866C0, 0x1027CE80, 0x10273640,
-	0x10269E00, 0x102605C0, 0x10256D80,
-	0x1024D540, 0x10243D00, 0x1023A4C0,
-	0x10230C80, 0x10227440, 0x1021DC00,
-	0x102143C0, 0x1020AB80, 0x10201340,
-	0x101F7B00, 0x101EE2C0, 0x101E4A80,
-	0x101DB240, 0x101D1A00, 0x101C81C0,
-	0x101BE980, 0x101B5140, 0x101AB900,
-	0x101A20C0, 0x10198880, 0x1018F040,
-	0x10185800, 0x1017BFC0, 0x10172780,
-	0x10168F40, 0x1015F700, 0x10155EC0,
-	0x1014C680, 0x10142E40, 0x10139600,
-	0x1012FDC0, 0x10126580, 0x1011CD40,
-	0x10113500, 0x10109CC0, 0x10100480,
-	0x100F6C40, 0x100ED400, 0x100E3BC0,
-	0x100DA380, 0x100D0B40, 0x100C7300,
-	0x100BDAC0, 0x100B4280, 0x100AAA40,
-	0x100A1200, 0x100979C0, 0x1008E180,
-	0x10084940, 0x1007B100, 0x100718C0,
-	0x10068080, 0x1005E840, 0x10055000,
-	0x1004B7C0, 0x10041F80, 0x10038740,
-	0x1002EF00, 0x100256C0, 0x1001BE80,
-	0x10012640, 0x10008E00, 0x0FFFF5C0,
-	0x0FFF5D80, 0x0FFEC540, 0x0FFE2D00,
-	0x0FFD94C0, 0x0FFCFC80, 0x0FFC6440,
-	0x0FFBCC00, 0x0FFB33C0, 0x0FFA9B80,
-	0x0FFA0340, 0x0FF96B00, 0x0FF8D2C0,
-	0x0FF83A80, 0x0FF7A240, 0x0FF70A00,
-	0x0FF671C0, 0x0FF5D980, 0x0FF54140,
-	0x0FF4A900, 0x0FF410C0, 0x0FF37880,
-	0x0FF2E040, 0x0FF24800, 0x0FF1AFC0,
-	0x0FF11780, 0x0FF07F40, 0x0FEFE700,
-	0x0FEF4EC0, 0x0FEEB680, 0x0FEE1E40,
-	0x0FED8600, 0x0FECEDC0, 0x0FEC5580,
-	0x0FEBBD40, 0x0FEB2500, 0x0FEA8CC0,
-	0x0FE9F480, 0x0FE95C40, 0x0FE8C400,
-	0x0FE82BC0, 0x0FE79380, 0x0FE6FB40,
-	0x0FE66300, 0x0FE5CAC0, 0x0FE53280,
-	0x0FE49A40, 0x0FE40200, 0x0FE369C0,
-	0x0FE2D180, 0x0FE23940, 0x0FE1A100,
-	0x0FE108C0, 0x0FE07080, 0x0FDFD840,
-	0x0FDF4000, 0x0FDEA7C0, 0x0FDE0F80,
-	0x0FDD7740, 0x0FDCDF00, 0x0FDC46C0,
-	0x0FDBAE80, 0x0FDB1640, 0x0FDA7E00,
-	0x0FD9E5C0, 0x0FD94D80, 0x0FD8B540,
-	0x0FD81D00, 0x0FD784C0, 0x0FD6EC80,
-	0x0FD65440, 0x0FD5BC00, 0x0FD523C0,
-	0x0FD48B80, 0x0FD3F340, 0x0FD35B00,
-	0x0FD2C2C0, 0x0FD22A80, 0x0FD19240,
-	0x0FD0FA00, 0x0FD061C0, 0x0FCFC980,
-	0x0FCF3140, 0x0FCE9900, 0x0FCE00C0,
-	0x0FCD6880, 0x0FCCD040, 0x0FCC3800,
-	0x0FCB9FC0, 0x0FCB0780, 0x0FCA6F40,
-	0x0FC9D700, 0x0FC93EC0, 0x0FC8A680,
-	0x0FC80E40, 0x0FC77600, 0x0FC6DDC0,
-	0x0FC64580, 0x0FC5AD40, 0x0FC51500,
-	0x0FC47CC0, 0x0FC3E480, 0x0FC34C40,
-	0x0FC2B400, 0x0FC21BC0, 0x0FC18380,
-	0x0FC0EB40, 0x0FC05300, 0x0FBFBAC0,
-	0x0FBF2280, 0x0FBE8A40, 0x0FBDF200,
-	0x0FBD59C0, 0x0FBCC180, 0x0FBC2940,
-	0x0FBB9100, 0x0FBAF8C0, 0x0FBA6080,
-	0x0FB9C840, 0x0FB93000, 0x0FB897C0,
-	0x0FB7FF80, 0x0FB76740, 0x0FB6CF00,
-	0x0FB636C0, 0x0FB59E80, 0x0FB50640,
-	0x0FB46E00, 0x0FB3D5C0, 0x0FB33D80,
-	0x0FB2A540, 0x0FB20D00, 0x0FB174C0,
-	0x0FB0DC80, 0x0FB04440, 0x0FAFAC00,
-	0x0FAF13C0, 0x0FAE7B80, 0x0FADE340,
-	0x0FAD4B00, 0x0FACB2C0, 0x0FAC1A80,
-	0x0FAB8240, 0x0FAAEA00, 0x0FAA51C0,
-	0x0FA9B980, 0x0FA92140, 0x0FA88900,
-	0x0FA7F0C0, 0x0FA75880, 0x0FA6C040,
-	0x0FA62800, 0x0FA58FC0, 0x0FA4F780,
-	0x0FA45F40, 0x0FA3C700, 0x0FA32EC0,
-	0x0FA29680, 0x0FA1FE40, 0x0FA16600,
-	0x0FA0CDC0, 0x0FA03580, 0x0F9F9D40,
-	0x0F9F0500, 0x0F9E6CC0, 0x0F9DD480,
-	0x0F9D3C40, 0x0F9CA400, 0x0F9C0BC0,
-	0x0F9B7380, 0x0F9ADB40, 0x0F9A4300,
-	0x0F99AAC0, 0x0F991280, 0x0F987A40,
-	0x0F97E200, 0x0F9749C0, 0x0F96B180,
-	0x0F961940, 0x0F958100, 0x0F94E8C0,
-	0x0F945080, 0x0F93B840, 0x0F932000,
-	0x0F9287C0, 0x0F91EF80, 0x0F915740,
-	0x0F90BF00, 0x0F9026C0, 0x0F8F8E80,
-	0x0F8EF640, 0x0F8E5E00, 0x0F8DC5C0,
-	0x0F8D2D80, 0x0F8C9540, 0x0F8BFD00,
-	0x0F8B64C0, 0x0F8ACC80, 0x0F8A3440,
-	0x0F899C00, 0x0F8903C0, 0x0F886B80,
-	0x0F87D340, 0x0F873B00, 0x0F86A2C0,
-	0x0F860A80, 0x0F857240, 0x0F84DA00,
-	0x0F8441C0, 0x0F83A980, 0x0F831140,
-	0x0F827900, 0x0F81E0C0, 0x0F814880,
-	0x0F80B040, 0x0F801800, 0x0F7F7FC0,
-	0x0F7EE780, 0x0F7E4F40, 0x0F7DB700,
-	0x0F7D1EC0, 0x0F7C8680, 0x0F7BEE40,
-	0x0F7B5600, 0x0F7ABDC0, 0x0F7A2580,
-	0x0F798D40, 0x0F78F500, 0x0F785CC0,
-	0x0F77C480, 0x0F772C40, 0x0F769400,
-	0x0F75FBC0, 0x0F756380, 0x0F74CB40,
-	0x0F743300, 0x0F739AC0, 0x0F730280,
-	0x0F726A40, 0x0F71D200, 0x0F7139C0,
-	0x0F70A180, 0x0F700940, 0x0F6F7100,
-	0x0F6ED8C0, 0x0F6E4080, 0x0F6DA840,
-	0x0F6D1000, 0x0F6C77C0, 0x0F6BDF80,
-	0x0F6B4740, 0x0F6AAF00, 0x0F6A16C0,
-	0x0F697E80, 0x0F68E640, 0x0F684E00,
-	0x0F67B5C0, 0x0F671D80, 0x0F668540,
-	0x0F65ED00, 0x0F6554C0, 0x0F64BC80,
-	0x0F642440, 0x0F638C00, 0x0F62F3C0,
-	0x0F625B80, 0x0F61C340, 0x0F612B00,
-	0x0F6092C0, 0x0F5FFA80, 0x0F5F6240,
-	0x0F5ECA00, 0x0F5E31C0, 0x0F5D9980,
-	0x0F5D0140, 0x0F5C6900, 0x0F5BD0C0,
-	0x0F5B3880, 0x0F5AA040, 0x0F5A0800,
-	0x0F596FC0, 0x0F58D780, 0x0F583F40,
-	0x0F57A700, 0x0F570EC0, 0x0F567680,
-	0x0F55DE40, 0x0F554600, 0x0F54ADC0,
-	0x0F541580, 0x0F537D40, 0x0F52E500,
-	0x0F524CC0, 0x0F51B480, 0x0F511C40,
-	0x0F508400, 0x0F4FEBC0, 0x0F4F5380,
-	0x0F4EBB40, 0x0F4E2300, 0x0F4D8AC0,
-	0x0F4CF280, 0x0F4C5A40, 0x0F4BC200,
-	0x0F4B29C0, 0x0F4A9180, 0x0F49F940,
-	0x0F496100, 0x0F48C8C0, 0x0F483080,
-	0x0F479840, 0x0F470000, 0x0F4667C0,
-	0x0F45CF80, 0x0F453740, 0x0F449F00,
-	0x0F4406C0, 0x0F436E80, 0x0F42D640,
-	0x0F423E00, 0x0F41A5C0, 0x0F410D80,
-	0x0F407540, 0x0F3FDD00, 0x0F3F44C0,
-	0x0F3EAC80, 0x0F3E1440, 0x0F3D7C00,
-	0x0F3CE3C0, 0x0F3C4B80, 0x0F3BB340,
-	0x0F3B1B00, 0x0F3A82C0, 0x0F39EA80,
-	0x0F395240, 0x0F38BA00, 0x0F3821C0,
-	0x0F378980, 0x0F36F140, 0x0F365900,
-	0x0F35C0C0, 0x0F352880, 0x0F349040,
-	0x0F33F800, 0x0F335FC0, 0x0F32C780,
-	0x0F322F40, 0x0F319700, 0x0F30FEC0,
-	0x0F306680, 0x0F2FCE40, 0x0F2F3600,
-	0x0F2E9DC0, 0x0F2E0580, 0x0F2D6D40,
-	0x0F2CD500, 0x0F2C3CC0, 0x0F2BA480,
-	0x0F2B0C40, 0x0F2A7400, 0x0F29DBC0,
-	0x0F294380, 0x0F28AB40, 0x0F281300,
-	0x0F277AC0, 0x0F26E280, 0x0F264A40,
-	0x0F25B200, 0x0F2519C0, 0x0F248180,
-	0x0F23E940, 0x0F235100, 0x0F22B8C0,
-	0x0F222080, 0x0F218840, 0x0F20F000,
-	0x0F2057C0, 0x0F1FBF80, 0x0F1F2740,
-	0x0F1E8F00, 0x0F1DF6C0, 0x0F1D5E80,
-	0x0F1CC640, 0x0F1C2E00, 0x0F1B95C0,
-	0x0F1AFD80, 0x0F1A6540, 0x0F19CD00,
-	0x0F1934C0, 0x0F189C80, 0x0F180440,
-	0x0F176C00, 0x0F16D3C0, 0x0F163B80,
-	0x0F15A340, 0x0F150B00, 0x0F1472C0,
-	0x0F13DA80, 0x0F134240, 0x0F12AA00,
-	0x0F1211C0, 0x0F117980, 0x0F10E140,
-	0x0F104900, 0x0F0FB0C0, 0x0F0F1880,
-	0x0F0E8040, 0x0F0DE800, 0x0F0D4FC0,
-	0x0F0CB780, 0x0F0C1F40, 0x0F0B8700,
-	0x0F0AEEC0, 0x0F0A5680, 0x0F09BE40,
-	0x0F092600, 0x0F088DC0, 0x0F07F580,
-	0x0F075D40, 0x0F06C500, 0x0F062CC0,
-	0x0F059480, 0x0F04FC40, 0x0F046400,
-	0x0F03CBC0, 0x0F033380, 0x0F029B40,
-	0x0F020300, 0x0F016AC0, 0x0F00D280,
-	0x0F003A40, 0x0EFFA200, 0x0EFF09C0,
-	0x0EFE7180, 0x0EFDD940, 0x0EFD4100,
-	0x0EFCA8C0, 0x0EFC1080, 0x0EFB7840,
-	0x0EFAE000, 0x0EFA47C0, 0x0EF9AF80,
-	0x0EF91740, 0x0EF87F00, 0x0EF7E6C0,
-	0x0EF74E80, 0x0EF6B640, 0x0EF61E00,
-	0x0EF585C0, 0x0EF4ED80, 0x0EF45540,
-	0x0EF3BD00, 0x0EF324C0, 0x0EF28C80,
-	0x0EF1F440, 0x0EF15C00, 0x0EF0C3C0,
-	0x0EF02B80, 0x0EEF9340, 0x0EEEFB00,
-	0x0EEE62C0, 0x0EEDCA80, 0x0EED3240,
-	0x0EEC9A00, 0x0EEC01C0, 0x0EEB6980,
-	0x0EEAD140, 0x0EEA3900, 0x0EE9A0C0,
-	0x0EE90880, 0x0EE87040, 0x0EE7D800,
-	0x0EE73FC0, 0x0EE6A780, 0x0EE60F40,
-	0x0EE57700, 0x0EE4DEC0, 0x0EE44680,
-	0x0EE3AE40, 0x0EE31600, 0x0EE27DC0,
-	0x0EE1E580, 0x0EE14D40, 0x0EE0B500,
-	0x0EE01CC0, 0x0EDF8480, 0x0EDEEC40,
-	0x0EDE5400, 0x0EDDBBC0, 0x0EDD2380,
-	0x0EDC8B40, 0x0EDBF300, 0x0EDB5AC0,
-	0x0EDAC280, 0x0EDA2A40, 0x0ED99200,
-	0x0ED8F9C0, 0x0ED86180, 0x0ED7C940,
-	0x0ED73100, 0x0ED698C0, 0x0ED60080,
-	0x0ED56840, 0x0ED4D000, 0x0ED437C0,
-	0x0ED39F80, 0x0ED30740, 0x0ED26F00,
-	0x0ED1D6C0, 0x0ED13E80, 0x0ED0A640,
-	0x0ED00E00, 0x0ECF75C0, 0x0ECEDD80,
-	0x0ECE4540, 0x0ECDAD00, 0x0ECD14C0,
-	0x0ECC7C80, 0x0ECBE440, 0x0ECB4C00,
-	0x0ECAB3C0, 0x0ECA1B80, 0x0EC98340,
-	0x0EC8EB00, 0x0EC852C0, 0x0EC7BA80,
-	0x0EC72240, 0x0EC68A00, 0x0EC5F1C0,
-	0x0EC55980, 0x0EC4C140, 0x0EC42900,
-	0x0EC390C0, 0x0EC2F880, 0x0EC26040,
-	0x0EC1C800, 0x0EC12FC0, 0x0EC09780,
-	0x0EBFFF40, 0x0EBF6700, 0x0EBECEC0,
-	0x0EBE3680, 0x0EBD9E40, 0x0EBD0600,
-	0x0EBC6DC0, 0x0EBBD580, 0x0EBB3D40,
-	0x0EBAA500, 0x0EBA0CC0, 0x0EB97480,
-	0x0EB8DC40, 0x0EB84400, 0x0EB7ABC0,
-	0x0EB71380, 0x0EB67B40, 0x0EB5E300,
-	0x0EB54AC0, 0x0EB4B280, 0x0EB41A40,
-	0x0EB38200, 0x0EB2E9C0, 0x0EB25180,
-	0x0EB1B940, 0x0EB12100, 0x0EB088C0,
-	0x0EAFF080, 0x0EAF5840, 0x0EAEC000,
-	0x0EAE27C0, 0x0EAD8F80, 0x0EACF740,
-	0x0EAC5F00, 0x0EABC6C0, 0x0EAB2E80,
-	0x0EAA9640, 0x0EA9FE00, 0x0EA965C0,
-	0x0EA8CD80, 0x0EA83540, 0x0EA79D00,
-	0x0EA704C0, 0x0EA66C80, 0x0EA5D440,
-	0x0EA53C00, 0x0EA4A3C0, 0x0EA40B80,
-	0x0EA37340, 0x0EA2DB00, 0x0EA242C0,
-	0x0EA1AA80, 0x0EA11240, 0x0EA07A00,
-	0x0E9FE1C0, 0x0E9F4980, 0x0E9EB140,
-	0x0E9E1900, 0x0E9D80C0, 0x0E9CE880,
-	0x0E9C5040, 0x0E9BB800, 0x0E9B1FC0,
-	0x0E9A8780, 0x0E99EF40, 0x0E995700,
-	0x0E98BEC0, 0x0E982680, 0x0E978E40,
-	0x0E96F600, 0x0E965DC0, 0x0E95C580,
-	0x0E952D40, 0x0E949500, 0x0E93FCC0,
-	0x0E936480, 0x0E92CC40, 0x0E923400,
-	0x0E919BC0, 0x0E910380, 0x0E906B40,
-	0x0E8FD300, 0x0E8F3AC0, 0x0E8EA280,
-	0x0E8E0A40, 0x0E8D7200, 0x0E8CD9C0,
-	0x0E8C4180, 0x0E8BA940, 0x0E8B1100,
-	0x0E8A78C0, 0x0E89E080, 0x0E894840,
-	0x0E88B000, 0x0E8817C0, 0x0E877F80,
-	0x0E86E740, 0x0E864F00, 0x0E85B6C0,
-	0x0E851E80, 0x0E848640, 0x0E83EE00,
-	0x0E8355C0, 0x0E82BD80, 0x0E822540,
-	0x0E818D00, 0x0E80F4C0, 0x0E805C80,
-	0x0E7FC440, 0x0E7F2C00, 0x0E7E93C0,
-	0x0E7DFB80, 0x0E7D6340, 0x0E7CCB00,
-	0x0E7C32C0, 0x0E7B9A80, 0x0E7B0240,
-	0x0E7A6A00, 0x0E79D1C0, 0x0E793980,
-	0x0E78A140, 0x0E780900, 0x0E7770C0,
-	0x0E76D880, 0x0E764040, 0x0E75A800,
-	0x0E750FC0, 0x0E747780, 0x0E73DF40,
-	0x0E734700, 0x0E72AEC0, 0x0E721680,
-	0x0E717E40, 0x0E70E600, 0x0E704DC0,
-	0x0E6FB580, 0x0E6F1D40, 0x0E6E8500,
-	0x0E6DECC0, 0x0E6D5480, 0x0E6CBC40,
-	0x0E6C2400, 0x0E6B8BC0, 0x0E6AF380,
-	0x0E6A5B40, 0x0E69C300, 0x0E692AC0,
-	0x0E689280, 0x0E67FA40, 0x0E676200,
-	0x0E66C9C0, 0x0E663180, 0x0E659940,
-	0x0E650100, 0x0E6468C0, 0x0E63D080,
-	0x0E633840, 0x0E62A000, 0x0E6207C0,
-	0x0E616F80, 0x0E60D740, 0x0E603F00,
-	0x0E5FA6C0, 0x0E5F0E80, 0x0E5E7640,
-	0x0E5DDE00, 0x0E5D45C0, 0x0E5CAD80,
-	0x0E5C1540, 0x0E5B7D00, 0x0E5AE4C0,
-	0x0E5A4C80, 0x0E59B440, 0x0E591C00,
-	0x0E5883C0, 0x0E57EB80, 0x0E575340,
-	0x0E56BB00, 0x0E5622C0, 0x0E558A80,
-	0x0E54F240, 0x0E545A00, 0x0E53C1C0,
-	0x0E532980, 0x0E529140, 0x0E51F900,
-	0x0E5160C0, 0x0E50C880, 0x0E503040,
-	0x0E4F9800, 0x0E4EFFC0, 0x0E4E6780,
-	0x0E4DCF40, 0x0E4D3700, 0x0E4C9EC0,
-	0x0E4C0680, 0x0E4B6E40, 0x0E4AD600,
-	0x0E4A3DC0, 0x0E49A580, 0x0E490D40,
-	0x0E487500, 0x0E47DCC0, 0x0E474480,
-	0x0E46AC40, 0x0E461400, 0x0E457BC0,
-	0x0E44E380, 0x0E444B40, 0x0E43B300,
-	0x0E431AC0, 0x0E428280, 0x0E41EA40,
-	0x0E415200, 0x0E40B9C0, 0x0E402180,
-	0x0E3F8940, 0x0E3EF100, 0x0E3E58C0,
-	0x0E3DC080, 0x0E3D2840, 0x0E3C9000,
-	0x0E3BF7C0, 0x0E3B5F80, 0x0E3AC740,
-	0x0E3A2F00, 0x0E3996C0, 0x0E38FE80,
-	0x0E386640, 0x0E37CE00, 0x0E3735C0,
-	0x0E369D80, 0x0E360540, 0x0E356D00,
-	0x0E34D4C0, 0x0E343C80, 0x0E33A440,
-	0x0E330C00, 0x0E3273C0, 0x0E31DB80,
-	0x0E314340, 0x0E30AB00, 0x0E3012C0,
-	0x0E2F7A80, 0x0E2EE240, 0x0E2E4A00,
-	0x0E2DB1C0, 0x0E2D1980, 0x0E2C8140,
-	0x0E2BE900, 0x0E2B50C0, 0x0E2AB880,
-	0x0E2A2040, 0x0E298800, 0x0E28EFC0,
-	0x0E285780, 0x0E27BF40, 0x0E272700,
-	0x0E268EC0, 0x0E25F680, 0x0E255E40,
-	0x0E24C600, 0x0E242DC0, 0x0E239580,
-	0x0E22FD40, 0x0E226500, 0x0E21CCC0,
-	0x0E213480, 0x0E209C40, 0x0E200400,
-	0x0E1F6BC0, 0x0E1ED380, 0x0E1E3B40,
-	0x0E1DA300, 0x0E1D0AC0, 0x0E1C7280,
-	0x0E1BDA40, 0x0E1B4200, 0x0E1AA9C0,
-	0x0E1A1180, 0x0E197940, 0x0E18E100,
-	0x0E1848C0, 0x0E17B080, 0x0E171840,
-	0x0E168000, 0x0E15E7C0, 0x0E154F80,
-	0x0E14B740, 0x0E141F00, 0x0E1386C0,
-	0x0E12EE80, 0x0E125640, 0x0E11BE00,
-	0x0E1125C0, 0x0E108D80, 0x0E0FF540,
-	0x0E0F5D00, 0x0E0EC4C0, 0x0E0E2C80,
-	0x0E0D9440, 0x0E0CFC00, 0x0E0C63C0,
-	0x0E0BCB80, 0x0E0B3340, 0x0E0A9B00,
-	0x0E0A02C0, 0x0E096A80, 0x0E08D240,
-	0x0E083A00, 0x0E07A1C0, 0x0E070980,
-	0x0E067140, 0x0E05D900, 0x0E0540C0,
-	0x0E04A880, 0x0E041040, 0x0E037800,
-	0x0E02DFC0, 0x0E024780, 0x0E01AF40,
-	0x0E011700, 0x0E007EC0, 0x0DFFE680,
-	0x0DFF4E40, 0x0DFEB600, 0x0DFE1DC0,
-	0x0DFD8580, 0x0DFCED40, 0x0DFC5500,
-	0x0DFBBCC0, 0x0DFB2480, 0x0DFA8C40,
-	0x0DF9F400, 0x0DF95BC0, 0x0DF8C380,
-	0x0DF82B40, 0x0DF79300, 0x0DF6FAC0,
-	0x0DF66280, 0x0DF5CA40, 0x0DF53200,
-	0x0DF499C0, 0x0DF40180, 0x0DF36940,
-	0x0DF2D100, 0x0DF238C0, 0x0DF1A080,
-	0x0DF10840, 0x0DF07000, 0x0DEFD7C0,
-	0x0DEF3F80, 0x0DEEA740, 0x0DEE0F00,
-	0x0DED76C0, 0x0DECDE80, 0x0DEC4640,
-	0x0DEBAE00, 0x0DEB15C0, 0x0DEA7D80,
-	0x0DE9E540, 0x0DE94D00, 0x0DE8B4C0,
-	0x0DE81C80, 0x0DE78440, 0x0DE6EC00,
-	0x0DE653C0, 0x0DE5BB80, 0x0DE52340,
-	0x0DE48B00, 0x0DE3F2C0, 0x0DE35A80,
-	0x0DE2C240, 0x0DE22A00, 0x0DE191C0,
-	0x0DE0F980, 0x0DE06140, 0x0DDFC900,
-	0x0DDF30C0, 0x0DDE9880, 0x0DDE0040,
-	0x0DDD6800, 0x0DDCCFC0, 0x0DDC3780,
-	0x0DDB9F40, 0x0DDB0700, 0x0DDA6EC0,
-	0x0DD9D680, 0x0DD93E40, 0x0DD8A600,
-	0x0DD80DC0, 0x0DD77580, 0x0DD6DD40,
-	0x0DD64500, 0x0DD5ACC0, 0x0DD51480,
-	0x0DD47C40, 0x0DD3E400, 0x0DD34BC0,
-	0x0DD2B380, 0x0DD21B40, 0x0DD18300,
-	0x0DD0EAC0, 0x0DD05280, 0x0DCFBA40,
-	0x0DCF2200, 0x0DCE89C0, 0x0DCDF180,
-	0x0DCD5940, 0x0DCCC100, 0x0DCC28C0,
-	0x0DCB9080, 0x0DCAF840, 0x0DCA6000,
-	0x0DC9C7C0, 0x0DC92F80, 0x0DC89740,
-	0x0DC7FF00, 0x0DC766C0, 0x0DC6CE80,
-	0x0DC63640, 0x0DC59E00, 0x0DC505C0,
-	0x0DC46D80, 0x0DC3D540, 0x0DC33D00,
-	0x0DC2A4C0, 0x0DC20C80, 0x0DC17440,
-	0x0DC0DC00, 0x0DC043C0, 0x0DBFAB80,
-	0x0DBF1340, 0x0DBE7B00, 0x0DBDE2C0,
-	0x0DBD4A80, 0x0DBCB240, 0x0DBC1A00,
-	0x0DBB81C0, 0x0DBAE980, 0x0DBA5140,
-	0x0DB9B900, 0x0DB920C0, 0x0DB88880,
-	0x0DB7F040, 0x0DB75800, 0x0DB6BFC0,
-	0x0DB62780, 0x0DB58F40, 0x0DB4F700,
-	0x0DB45EC0, 0x0DB3C680, 0x0DB32E40,
-	0x0DB29600, 0x0DB1FDC0, 0x0DB16580,
-	0x0DB0CD40, 0x0DB03500, 0x0DAF9CC0,
-	0x0DAF0480, 0x0DAE6C40, 0x0DADD400,
-	0x0DAD3BC0, 0x0DACA380, 0x0DAC0B40,
-	0x0DAB7300, 0x0DAADAC0, 0x0DAA4280,
-	0x0DA9AA40, 0x0DA91200, 0x0DA879C0,
-	0x0DA7E180, 0x0DA74940, 0x0DA6B100,
-	0x0DA618C0, 0x0DA58080, 0x0DA4E840,
-	0x0DA45000, 0x0DA3B7C0, 0x0DA31F80,
-	0x0DA28740, 0x0DA1EF00, 0x0DA156C0,
-	0x0DA0BE80, 0x0DA02640, 0x0D9F8E00,
-	0x0D9EF5C0, 0x0D9E5D80, 0x0D9DC540,
-	0x0D9D2D00, 0x0D9C94C0, 0x0D9BFC80,
-	0x0D9B6440, 0x0D9ACC00, 0x0D9A33C0,
-	0x0D999B80, 0x0D990340, 0x0D986B00,
-	0x0D97D2C0, 0x0D973A80, 0x0D96A240,
-	0x0D960A00, 0x0D9571C0, 0x0D94D980,
-	0x0D944140, 0x0D93A900, 0x0D9310C0,
-	0x0D927880, 0x0D91E040, 0x0D914800,
-	0x0D90AFC0, 0x0D901780, 0x0D8F7F40,
-	0x0D8EE700, 0x0D8E4EC0, 0x0D8DB680,
-	0x0D8D1E40, 0x0D8C8600, 0x0D8BEDC0,
-	0x0D8B5580, 0x0D8ABD40, 0x0D8A2500,
-	0x0D898CC0, 0x0D88F480, 0x0D885C40,
-	0x0D87C400, 0x0D872BC0, 0x0D869380,
-	0x0D85FB40, 0x0D856300, 0x0D84CAC0,
-	0x0D843280, 0x0D839A40, 0x0D830200,
-	0x0D8269C0, 0x0D81D180, 0x0D813940,
-	0x0D80A100, 0x0D8008C0, 0x0D7F7080,
-	0x0D7ED840, 0x0D7E4000, 0x0D7DA7C0,
-	0x0D7D0F80, 0x0D7C7740, 0x0D7BDF00,
-	0x0D7B46C0, 0x0D7AAE80, 0x0D7A1640,
-	0x0D797E00, 0x0D78E5C0, 0x0D784D80,
-	0x0D77B540, 0x0D771D00, 0x0D7684C0,
-	0x0D75EC80, 0x0D755440, 0x0D74BC00,
-	0x0D7423C0, 0x0D738B80, 0x0D72F340,
-	0x0D725B00, 0x0D71C2C0, 0x0D712A80,
-	0x0D709240, 0x0D6FFA00, 0x0D6F61C0,
-	0x0D6EC980, 0x0D6E3140, 0x0D6D9900,
-	0x0D6D00C0, 0x0D6C6880, 0x0D6BD040,
-	0x0D6B3800, 0x0D6A9FC0, 0x0D6A0780,
-	0x0D696F40, 0x0D68D700, 0x0D683EC0,
-	0x0D67A680, 0x0D670E40, 0x0D667600,
-	0x0D65DDC0, 0x0D654580, 0x0D64AD40,
-	0x0D641500, 0x0D637CC0, 0x0D62E480,
-	0x0D624C40, 0x0D61B400, 0x0D611BC0,
-	0x0D608380, 0x0D5FEB40, 0x0D5F5300,
-	0x0D5EBAC0, 0x0D5E2280, 0x0D5D8A40,
-	0x0D5CF200, 0x0D5C59C0, 0x0D5BC180,
-	0x0D5B2940, 0x0D5A9100, 0x0D59F8C0,
-	0x0D596080, 0x0D58C840, 0x0D583000,
-	0x0D5797C0, 0x0D56FF80, 0x0D566740,
-	0x0D55CF00, 0x0D5536C0, 0x0D549E80,
-	0x0D540640, 0x0D536E00, 0x0D52D5C0,
-	0x0D523D80, 0x0D51A540, 0x0D510D00,
-	0x0D5074C0, 0x0D4FDC80, 0x0D4F4440,
-	0x0D4EAC00, 0x0D4E13C0, 0x0D4D7B80,
-	0x0D4CE340, 0x0D4C4B00, 0x0D4BB2C0,
-	0x0D4B1A80, 0x0D4A8240, 0x0D49EA00,
-	0x0D4951C0, 0x0D48B980, 0x0D482140,
-	0x0D478900, 0x0D46F0C0, 0x0D465880,
-	0x0D45C040, 0x0D452800, 0x0D448FC0,
-	0x0D43F780, 0x0D435F40, 0x0D42C700,
-	0x0D422EC0, 0x0D419680, 0x0D40FE40,
-	0x0D406600, 0x0D3FCDC0, 0x0D3F3580,
-	0x0D3E9D40, 0x0D3E0500, 0x0D3D6CC0,
-	0x0D3CD480, 0x0D3C3C40, 0x0D3BA400,
-	0x0D3B0BC0, 0x0D3A7380, 0x0D39DB40,
-	0x0D394300, 0x0D38AAC0, 0x0D381280,
-	0x0D377A40, 0x0D36E200, 0x0D3649C0,
-	0x0D35B180, 0x0D351940, 0x0D348100,
-	0x0D33E8C0, 0x0D335080, 0x0D32B840,
-	0x0D322000, 0x0D3187C0, 0x0D30EF80,
-	0x0D305740, 0x0D2FBF00, 0x0D2F26C0,
-	0x0D2E8E80, 0x0D2DF640, 0x0D2D5E00,
-	0x0D2CC5C0, 0x0D2C2D80, 0x0D2B9540,
-	0x0D2AFD00, 0x0D2A64C0, 0x0D29CC80,
-	0x0D293440, 0x0D289C00, 0x0D2803C0,
-	0x0D276B80, 0x0D26D340, 0x0D263B00,
-	0x0D25A2C0, 0x0D250A80, 0x0D247240,
-	0x0D23DA00, 0x0D2341C0, 0x0D22A980,
-	0x0D221140, 0x0D217900, 0x0D20E0C0,
-	0x0D204880, 0x0D1FB040, 0x0D1F1800,
-	0x0D1E7FC0, 0x0D1DE780, 0x0D1D4F40,
-	0x0D1CB700, 0x0D1C1EC0, 0x0D1B8680,
-	0x0D1AEE40, 0x0D1A5600, 0x0D19BDC0,
-	0x0D192580, 0x0D188D40, 0x0D17F500,
-	0x0D175CC0, 0x0D16C480, 0x0D162C40,
-	0x0D159400, 0x0D14FBC0, 0x0D146380,
-	0x0D13CB40, 0x0D133300, 0x0D129AC0,
-	0x0D120280, 0x0D116A40, 0x0D10D200,
-	0x0D1039C0, 0x0D0FA180, 0x0D0F0940,
-	0x0D0E7100, 0x0D0DD8C0, 0x0D0D4080,
-	0x0D0CA840, 0x0D0C1000, 0x0D0B77C0,
-	0x0D0ADF80, 0x0D0A4740, 0x0D09AF00,
-	0x0D0916C0, 0x0D087E80, 0x0D07E640,
-	0x0D074E00, 0x0D06B5C0, 0x0D061D80,
-	0x0D058540, 0x0D04ED00, 0x0D0454C0,
-	0x0D03BC80, 0x0D032440, 0x0D028C00,
-	0x0D01F3C0, 0x0D015B80, 0x0D00C340,
-	0x0D002B00, 0x0CFF92C0, 0x0CFEFA80,
-	0x0CFE6240, 0x0CFDCA00, 0x0CFD31C0,
-	0x0CFC9980, 0x0CFC0140, 0x0CFB6900,
-	0x0CFAD0C0, 0x0CFA3880, 0x0CF9A040,
-	0x0CF90800, 0x0CF86FC0, 0x0CF7D780,
-	0x0CF73F40, 0x0CF6A700, 0x0CF60EC0,
-	0x0CF57680, 0x0CF4DE40, 0x0CF44600,
-	0x0CF3ADC0, 0x0CF31580, 0x0CF27D40,
-	0x0CF1E500, 0x0CF14CC0, 0x0CF0B480,
-	0x0CF01C40, 0x0CEF8400, 0x0CEEEBC0,
-	0x0CEE5380, 0x0CEDBB40, 0x0CED2300,
-	0x0CEC8AC0, 0x0CEBF280, 0x0CEB5A40,
-	0x0CEAC200, 0x0CEA29C0, 0x0CE99180,
-	0x0CE8F940, 0x0CE86100, 0x0CE7C8C0,
-	0x0CE73080, 0x0CE69840, 0x0CE60000,
-	0x0CE56F40, 0x0CE4DE80, 0x0CE44DC0,
-	0x0CE3BD00, 0x0CE32C40, 0x0CE29B80,
-	0x0CE20AC0, 0x0CE17A00, 0x0CE0E940,
-	0x0CE05880, 0x0CDFC7C0, 0x0CDF3700,
-	0x0CDEA640, 0x0CDE1580, 0x0CDD84C0,
-	0x0CDCF400, 0x0CDC6340, 0x0CDBD280,
-	0x0CDB41C0, 0x0CDAB100, 0x0CDA2040,
-	0x0CD98F80, 0x0CD8FEC0, 0x0CD86E00,
-	0x0CD7DD40, 0x0CD74C80, 0x0CD6BBC0,
-	0x0CD62B00, 0x0CD59A40, 0x0CD50980,
-	0x0CD478C0, 0x0CD3E800, 0x0CD35740,
-	0x0CD2C680, 0x0CD235C0, 0x0CD1A500,
-	0x0CD11440, 0x0CD08380, 0x0CCFF2C0,
-	0x0CCF6200, 0x0CCED140, 0x0CCE4080,
-	0x0CCDAFC0, 0x0CCD1F00, 0x0CCC8E40,
-	0x0CCBFD80, 0x0CCB6CC0, 0x0CCADC00,
-	0x0CCA4B40, 0x0CC9BA80, 0x0CC929C0,
-	0x0CC89900, 0x0CC80840, 0x0CC77780,
-	0x0CC6E6C0, 0x0CC65600, 0x0CC5C540,
-	0x0CC53480, 0x0CC4A3C0, 0x0CC41300,
-	0x0CC38240, 0x0CC2F180, 0x0CC260C0,
-	0x0CC1D000, 0x0CC13F40, 0x0CC0AE80,
-	0x0CC01DC0, 0x0CBF8D00, 0x0CBEFC40,
-	0x0CBE6B80, 0x0CBDDAC0, 0x0CBD4A00,
-	0x0CBCB940, 0x0CBC2880, 0x0CBB97C0,
-	0x0CBB0700, 0x0CBA7640, 0x0CB9E580,
-	0x0CB954C0, 0x0CB8C400, 0x0CB83340,
-	0x0CB7A280, 0x0CB711C0, 0x0CB68100,
-	0x0CB5F040, 0x0CB55F80, 0x0CB4CEC0,
-	0x0CB43E00, 0x0CB3AD40, 0x0CB31C80,
-	0x0CB28BC0, 0x0CB1FB00, 0x0CB16A40,
-	0x0CB0D980, 0x0CB048C0, 0x0CAFB800,
-	0x0CAF2740, 0x0CAE9680, 0x0CAE05C0,
-	0x0CAD7500, 0x0CACE440, 0x0CAC5380,
-	0x0CABC2C0, 0x0CAB3200, 0x0CAAA140,
-	0x0CAA1080, 0x0CA97FC0, 0x0CA8EF00,
-	0x0CA85E40, 0x0CA7CD80, 0x0CA73CC0,
-	0x0CA6AC00, 0x0CA61B40, 0x0CA58A80,
-	0x0CA4F9C0, 0x0CA46900, 0x0CA3D840,
-	0x0CA34780, 0x0CA2B6C0, 0x0CA22600,
-	0x0CA19540, 0x0CA10480, 0x0CA073C0,
-	0x0C9FE300, 0x0C9F5240, 0x0C9EC180,
-	0x0C9E30C0, 0x0C9DA000, 0x0C9D0F40,
-	0x0C9C7E80, 0x0C9BEDC0, 0x0C9B5D00,
-	0x0C9ACC40, 0x0C9A3B80, 0x0C99AAC0,
-	0x0C991A00, 0x0C988940, 0x0C97F880,
-	0x0C9767C0, 0x0C96D700, 0x0C964640,
-	0x0C95B580, 0x0C9524C0, 0x0C949400,
-	0x0C940340, 0x0C937280, 0x0C92E1C0,
-	0x0C925100, 0x0C91C040, 0x0C912F80,
-	0x0C909EC0, 0x0C900E00, 0x0C8F7D40,
-	0x0C8EEC80, 0x0C8E5BC0, 0x0C8DCB00,
-	0x0C8D3A40, 0x0C8CA980, 0x0C8C18C0,
-	0x0C8B8800, 0x0C8AF740, 0x0C8A6680,
-	0x0C89D5C0, 0x0C894500, 0x0C88B440,
-	0x0C882380, 0x0C8792C0, 0x0C870200,
-	0x0C867140, 0x0C85E080, 0x0C854FC0,
-	0x0C84BF00, 0x0C842E40, 0x0C839D80,
-	0x0C830CC0, 0x0C827C00, 0x0C81EB40,
-	0x0C815A80, 0x0C80C9C0, 0x0C803900,
-	0x0C7FA840, 0x0C7F1780, 0x0C7E86C0,
-	0x0C7DF600, 0x0C7D6540, 0x0C7CD480,
-	0x0C7C43C0, 0x0C7BB300, 0x0C7B2240,
-	0x0C7A9180, 0x0C7A00C0, 0x0C797000,
-	0x0C78DF40, 0x0C784E80, 0x0C77BDC0,
-	0x0C772D00, 0x0C769C40, 0x0C760B80,
-	0x0C757AC0, 0x0C74EA00, 0x0C745940,
-	0x0C73C880, 0x0C7337C0, 0x0C72A700,
-	0x0C721640, 0x0C718580, 0x0C70F4C0,
-	0x0C706400, 0x0C6FD340, 0x0C6F4280,
-	0x0C6EB1C0, 0x0C6E2100, 0x0C6D9040,
-	0x0C6CFF80, 0x0C6C6EC0, 0x0C6BDE00,
-	0x0C6B4D40, 0x0C6ABC80, 0x0C6A2BC0,
-	0x0C699B00, 0x0C690A40, 0x0C687980,
-	0x0C67E8C0, 0x0C675800, 0x0C66C740,
-	0x0C663680, 0x0C65A5C0, 0x0C651500,
-	0x0C648440, 0x0C63F380, 0x0C6362C0,
-	0x0C62D200, 0x0C624140, 0x0C61B080,
-	0x0C611FC0, 0x0C608F00, 0x0C5FFE40,
-	0x0C5F6D80, 0x0C5EDCC0, 0x0C5E4C00,
-	0x0C5DBB40, 0x0C5D2A80, 0x0C5C99C0,
-	0x0C5C0900, 0x0C5B7840, 0x0C5AE780,
-	0x0C5A56C0, 0x0C59C600, 0x0C593540,
-	0x0C58A480, 0x0C5813C0, 0x0C578300,
-	0x0C56F240, 0x0C566180, 0x0C55D0C0,
-	0x0C554000, 0x0C54AF40, 0x0C541E80,
-	0x0C538DC0, 0x0C52FD00, 0x0C526C40,
-	0x0C51DB80, 0x0C514AC0, 0x0C50BA00,
-	0x0C502940, 0x0C4F9880, 0x0C4F07C0,
-	0x0C4E7700, 0x0C4DE640, 0x0C4D5580,
-	0x0C4CC4C0, 0x0C4C3400, 0x0C4BA340,
-	0x0C4B1280, 0x0C4A81C0, 0x0C49F100,
-	0x0C496040, 0x0C48CF80, 0x0C483EC0,
-	0x0C47AE00, 0x0C471D40, 0x0C468C80,
-	0x0C45FBC0, 0x0C456B00, 0x0C44DA40,
-	0x0C444980, 0x0C43B8C0, 0x0C432800,
-	0x0C429740, 0x0C420680, 0x0C4175C0,
-	0x0C40E500, 0x0C405440, 0x0C3FC380,
-	0x0C3F32C0, 0x0C3EA200, 0x0C3E1140,
-	0x0C3D8080, 0x0C3CEFC0, 0x0C3C5F00,
-	0x0C3BCE40, 0x0C3B3D80, 0x0C3AACC0,
-	0x0C3A1C00, 0x0C398B40, 0x0C38FA80,
-	0x0C3869C0, 0x0C37D900, 0x0C374840,
-	0x0C36B780, 0x0C3626C0, 0x0C359600,
-	0x0C350540, 0x0C347480, 0x0C33E3C0,
-	0x0C335300, 0x0C32C240, 0x0C323180,
-	0x0C31A0C0, 0x0C311000, 0x0C307F40,
-	0x0C2FEE80, 0x0C2F5DC0, 0x0C2ECD00,
-	0x0C2E3C40, 0x0C2DAB80, 0x0C2D1AC0,
-	0x0C2C8A00, 0x0C2BF940, 0x0C2B6880,
-	0x0C2AD7C0, 0x0C2A4700, 0x0C29B640,
-	0x0C292580, 0x0C2894C0, 0x0C280400,
-	0x0C277340, 0x0C26E280, 0x0C2651C0,
-	0x0C25C100, 0x0C253040, 0x0C249F80,
-	0x0C240EC0, 0x0C237E00, 0x0C22ED40,
-	0x0C225C80, 0x0C21CBC0, 0x0C213B00,
-	0x0C20AA40, 0x0C201980, 0x0C1F88C0,
-	0x0C1EF800, 0x0C1E6740, 0x0C1DD680,
-	0x0C1D45C0, 0x0C1CB500, 0x0C1C2440,
-	0x0C1B9380, 0x0C1B02C0, 0x0C1A7200,
-	0x0C19E140, 0x0C195080, 0x0C18BFC0,
-	0x0C182F00, 0x0C179E40, 0x0C170D80,
-	0x0C167CC0, 0x0C15EC00, 0x0C155B40,
-	0x0C14CA80, 0x0C1439C0, 0x0C13A900,
-	0x0C131840, 0x0C128780, 0x0C11F6C0,
-	0x0C116600, 0x0C10D540, 0x0C104480,
-	0x0C0FB3C0, 0x0C0F2300, 0x0C0E9240,
-	0x0C0E0180, 0x0C0D70C0, 0x0C0CE000,
-	0x0C0C4F40, 0x0C0BBE80, 0x0C0B2DC0,
-	0x0C0A9D00, 0x0C0A0C40, 0x0C097B80,
-	0x0C08EAC0, 0x0C085A00, 0x0C07C940,
-	0x0C073880, 0x0C06A7C0, 0x0C061700,
-	0x0C058640, 0x0C04F580, 0x0C0464C0,
-	0x0C03D400, 0x0C034340, 0x0C02B280,
-	0x0C0221C0, 0x0C019100, 0x0C010040,
-	0x0C006F80, 0x0BFFDEC0, 0x0BFF4E00,
-	0x0BFEBD40, 0x0BFE2C80, 0x0BFD9BC0,
-	0x0BFD0B00, 0x0BFC7A40, 0x0BFBE980,
-	0x0BFB58C0, 0x0BFAC800, 0x0BFA3740,
-	0x0BF9A680, 0x0BF915C0, 0x0BF88500,
-	0x0BF7F440, 0x0BF76380, 0x0BF6D2C0,
-	0x0BF64200, 0x0BF5B140, 0x0BF52080,
-	0x0BF48FC0, 0x0BF3FF00, 0x0BF36E40,
-	0x0BF2DD80, 0x0BF24CC0, 0x0BF1BC00,
-	0x0BF12B40, 0x0BF09A80, 0x0BF009C0,
-	0x0BEF7900, 0x0BEEE840, 0x0BEE5780,
-	0x0BEDC6C0, 0x0BED3600, 0x0BECA540,
-	0x0BEC1480, 0x0BEB83C0, 0x0BEAF300,
-	0x0BEA6240, 0x0BE9D180, 0x0BE940C0,
-	0x0BE8B000, 0x0BE81F40, 0x0BE78E80,
-	0x0BE6FDC0, 0x0BE66D00, 0x0BE5DC40,
-	0x0BE54B80, 0x0BE4BAC0, 0x0BE42A00,
-	0x0BE39940, 0x0BE30880, 0x0BE277C0,
-	0x0BE1E700, 0x0BE15640, 0x0BE0C580,
-	0x0BE034C0, 0x0BDFA400, 0x0BDF1340,
-	0x0BDE8280, 0x0BDDF1C0, 0x0BDD6100,
-	0x0BDCD040, 0x0BDC3F80, 0x0BDBAEC0,
-	0x0BDB1E00, 0x0BDA8D40, 0x0BD9FC80,
-	0x0BD96BC0, 0x0BD8DB00, 0x0BD84A40,
-	0x0BD7B980, 0x0BD728C0, 0x0BD69800,
-	0x0BD60740, 0x0BD57680, 0x0BD4E5C0,
-	0x0BD45500, 0x0BD3C440, 0x0BD33380,
-	0x0BD2A2C0, 0x0BD21200, 0x0BD18140,
-	0x0BD0F080, 0x0BD05FC0, 0x0BCFCF00,
-	0x0BCF3E40, 0x0BCEAD80, 0x0BCE1CC0,
-	0x0BCD8C00, 0x0BCCFB40, 0x0BCC6A80,
-	0x0BCBD9C0, 0x0BCB4900, 0x0BCAB840,
-	0x0BCA2780, 0x0BC996C0, 0x0BC90600,
-	0x0BC87540, 0x0BC7E480, 0x0BC753C0,
-	0x0BC6C300, 0x0BC63240, 0x0BC5A180,
-	0x0BC510C0, 0x0BC48000, 0x0BC3EF40,
-	0x0BC35E80, 0x0BC2CDC0, 0x0BC23D00,
-	0x0BC1AC40, 0x0BC11B80, 0x0BC08AC0,
-	0x0BBFFA00, 0x0BBF6940, 0x0BBED880,
-	0x0BBE47C0, 0x0BBDB700, 0x0BBD2640,
-	0x0BBC9580, 0x0BBC04C0, 0x0BBB7400,
-	0x0BBAE340, 0x0BBA5280, 0x0BB9C1C0,
-	0x0BB93100, 0x0BB8A040, 0x0BB80F80,
-	0x0BB77EC0, 0x0BB6EE00, 0x0BB65D40,
-	0x0BB5CC80, 0x0BB53BC0, 0x0BB4AB00,
-	0x0BB41A40, 0x0BB38980, 0x0BB2F8C0,
-	0x0BB26800, 0x0BB1D740, 0x0BB14680,
-	0x0BB0B5C0, 0x0BB02500, 0x0BAF9440,
-	0x0BAF0380, 0x0BAE72C0, 0x0BADE200,
-	0x0BAD5140, 0x0BACC080, 0x0BAC2FC0,
-	0x0BAB9F00, 0x0BAB0E40, 0x0BAA7D80,
-	0x0BA9ECC0, 0x0BA95C00, 0x0BA8CB40,
-	0x0BA83A80, 0x0BA7A9C0, 0x0BA71900,
-	0x0BA68840, 0x0BA5F780, 0x0BA566C0,
-	0x0BA4D600, 0x0BA44540, 0x0BA3B480,
-	0x0BA323C0, 0x0BA29300, 0x0BA20240,
-	0x0BA17180, 0x0BA0E0C0, 0x0BA05000,
-	0x0B9FBF40, 0x0B9F2E80, 0x0B9E9DC0,
-	0x0B9E0D00, 0x0B9D7C40, 0x0B9CEB80,
-	0x0B9C5AC0, 0x0B9BCA00, 0x0B9B3940,
-	0x0B9AA880, 0x0B9A17C0, 0x0B998700,
-	0x0B98F640, 0x0B986580, 0x0B97D4C0,
-	0x0B974400, 0x0B96B340, 0x0B962280,
-	0x0B9591C0, 0x0B950100, 0x0B947040,
-	0x0B93DF80, 0x0B934EC0, 0x0B92BE00,
-	0x0B922D40, 0x0B919C80, 0x0B910BC0,
-	0x0B907B00, 0x0B8FEA40, 0x0B8F5980,
-	0x0B8EC8C0, 0x0B8E3800, 0x0B8DA740,
-	0x0B8D1680, 0x0B8C85C0, 0x0B8BF500,
-	0x0B8B6440, 0x0B8AD380, 0x0B8A42C0,
-	0x0B89B200, 0x0B892140, 0x0B889080,
-	0x0B87FFC0, 0x0B876F00, 0x0B86DE40,
-	0x0B864D80, 0x0B85BCC0, 0x0B852C00,
-	0x0B849B40, 0x0B840A80, 0x0B8379C0,
-	0x0B82E900, 0x0B825840, 0x0B81C780,
-	0x0B8136C0, 0x0B80A600, 0x0B801540,
-	0x0B7F8480, 0x0B7EF3C0, 0x0B7E6300,
-	0x0B7DD240, 0x0B7D4180, 0x0B7CB0C0,
-	0x0B7C2000, 0x0B7B8F40, 0x0B7AFE80,
-	0x0B7A6DC0, 0x0B79DD00, 0x0B794C40,
-	0x0B78BB80, 0x0B782AC0, 0x0B779A00,
-	0x0B770940, 0x0B767880, 0x0B75E7C0,
-	0x0B755700, 0x0B74C640, 0x0B743580,
-	0x0B73A4C0, 0x0B731400, 0x0B728340,
-	0x0B71F280, 0x0B7161C0, 0x0B70D100,
-	0x0B704040, 0x0B6FAF80, 0x0B6F1EC0,
-	0x0B6E8E00, 0x0B6DFD40, 0x0B6D6C80,
-	0x0B6CDBC0, 0x0B6C4B00, 0x0B6BBA40,
-	0x0B6B2980, 0x0B6A98C0, 0x0B6A0800,
-	0x0B697740, 0x0B68E680, 0x0B6855C0,
-	0x0B67C500, 0x0B673440, 0x0B66A380,
-	0x0B6612C0, 0x0B658200, 0x0B64F140,
-	0x0B646080, 0x0B63CFC0, 0x0B633F00,
-	0x0B62AE40, 0x0B621D80, 0x0B618CC0,
-	0x0B60FC00, 0x0B606B40, 0x0B5FDA80,
-	0x0B5F49C0, 0x0B5EB900, 0x0B5E2840,
-	0x0B5D9780, 0x0B5D06C0, 0x0B5C7600,
-	0x0B5BE540, 0x0B5B5480, 0x0B5AC3C0,
-	0x0B5A3300, 0x0B59A240, 0x0B591180,
-	0x0B5880C0, 0x0B57F000, 0x0B575F40,
-	0x0B56CE80, 0x0B563DC0, 0x0B55AD00,
-	0x0B551C40, 0x0B548B80, 0x0B53FAC0,
-	0x0B536A00, 0x0B52D940, 0x0B524880,
-	0x0B51B7C0, 0x0B512700, 0x0B509640,
-	0x0B500580, 0x0B4F74C0, 0x0B4EE400,
-	0x0B4E5340, 0x0B4DC280, 0x0B4D31C0,
-	0x0B4CA100, 0x0B4C1040, 0x0B4B7F80,
-	0x0B4AEEC0, 0x0B4A5E00, 0x0B49CD40,
-	0x0B493C80, 0x0B48ABC0, 0x0B481B00,
-	0x0B478A40, 0x0B46F980, 0x0B4668C0,
-	0x0B45D800, 0x0B454740, 0x0B44B680,
-	0x0B4425C0, 0x0B439500, 0x0B430440,
-	0x0B427380, 0x0B41E2C0, 0x0B415200,
-	0x0B40C140, 0x0B403080, 0x0B3F9FC0,
-	0x0B3F0F00, 0x0B3E7E40, 0x0B3DED80,
-	0x0B3D5CC0, 0x0B3CCC00, 0x0B3C3B40,
-	0x0B3BAA80, 0x0B3B19C0, 0x0B3A8900,
-	0x0B39F840, 0x0B396780, 0x0B38D6C0,
-	0x0B384600, 0x0B37B540, 0x0B372480,
-	0x0B3693C0, 0x0B360300, 0x0B357240,
-	0x0B34E180, 0x0B3450C0, 0x0B33C000,
-	0x0B332F40, 0x0B329E80, 0x0B320DC0,
-	0x0B317D00, 0x0B30EC40, 0x0B305B80,
-	0x0B2FCAC0, 0x0B2F3A00, 0x0B2EA940,
-	0x0B2E1880, 0x0B2D87C0, 0x0B2CF700,
-	0x0B2C6640, 0x0B2BD580, 0x0B2B44C0,
-	0x0B2AB400, 0x0B2A2340, 0x0B299280,
-	0x0B2901C0, 0x0B287100, 0x0B27E040,
-	0x0B274F80, 0x0B26BEC0, 0x0B262E00,
-	0x0B259D40, 0x0B250C80, 0x0B247BC0,
-	0x0B23EB00, 0x0B235A40, 0x0B22C980,
-	0x0B2238C0, 0x0B21A800, 0x0B211740,
-	0x0B208680, 0x0B1FF5C0, 0x0B1F6500,
-	0x0B1ED440, 0x0B1E4380, 0x0B1DB2C0,
-	0x0B1D2200, 0x0B1C9140, 0x0B1C0080,
-	0x0B1B6FC0, 0x0B1ADF00, 0x0B1A4E40,
-	0x0B19BD80, 0x0B192CC0, 0x0B189C00,
-	0x0B180B40, 0x0B177A80, 0x0B16E9C0,
-	0x0B165900, 0x0B15C840, 0x0B153780,
-	0x0B14A6C0, 0x0B141600, 0x0B138540,
-	0x0B12F480, 0x0B1263C0, 0x0B11D300,
-	0x0B114240, 0x0B10B180, 0x0B1020C0,
-	0x0B0F9000, 0x0B0EFF40, 0x0B0E6E80,
-	0x0B0DDDC0, 0x0B0D4D00, 0x0B0CBC40,
-	0x0B0C2B80, 0x0B0B9AC0, 0x0B0B0A00,
-	0x0B0A7940, 0x0B09E880, 0x0B0957C0,
-	0x0B08C700, 0x0B083640, 0x0B07A580,
-	0x0B0714C0, 0x0B068400, 0x0B05F340,
-	0x0B056280, 0x0B04D1C0, 0x0B044100,
-	0x0B03B040, 0x0B031F80, 0x0B028EC0,
-	0x0B01FE00, 0x0B016D40, 0x0B00DC80,
-	0x0B004BC0, 0x0AFFBB00, 0x0AFF2A40,
-	0x0AFE9980, 0x0AFE08C0, 0x0AFD7800,
-	0x0AFCE740, 0x0AFC5680, 0x0AFBC5C0,
-	0x0AFB3500, 0x0AFAA440, 0x0AFA1380,
-	0x0AF982C0, 0x0AF8F200, 0x0AF86140,
-	0x0AF7D080, 0x0AF73FC0, 0x0AF6AF00,
-	0x0AF61E40, 0x0AF58D80, 0x0AF4FCC0,
-	0x0AF46C00, 0x0AF3DB40, 0x0AF34A80,
-	0x0AF2B9C0, 0x0AF22900, 0x0AF19840,
-	0x0AF10780, 0x0AF076C0, 0x0AEFE600,
-	0x0AEF5540, 0x0AEEC480, 0x0AEE33C0,
-	0x0AEDA300, 0x0AED1240, 0x0AEC8180,
-	0x0AEBF0C0, 0x0AEB6000, 0x0AEACF40,
-	0x0AEA3E80, 0x0AE9ADC0, 0x0AE91D00,
-	0x0AE88C40, 0x0AE7FB80, 0x0AE76AC0,
-	0x0AE6DA00, 0x0AE64940, 0x0AE5B880,
-	0x0AE527C0, 0x0AE49700, 0x0AE40640,
-	0x0AE37580, 0x0AE2E4C0, 0x0AE25400,
-	0x0AE1C340, 0x0AE13280, 0x0AE0A1C0,
-	0x0AE01100, 0x0ADF8040, 0x0ADEEF80,
-	0x0ADE5EC0, 0x0ADDCE00, 0x0ADD3D40,
-	0x0ADCAC80, 0x0ADC1BC0, 0x0ADB8B00,
-	0x0ADAFA40, 0x0ADA6980, 0x0AD9D8C0,
-	0x0AD94800, 0x0AD8B740, 0x0AD82680,
-	0x0AD795C0, 0x0AD70500, 0x0AD67440,
-	0x0AD5E380, 0x0AD552C0, 0x0AD4C200,
-	0x0AD43140, 0x0AD3A080, 0x0AD30FC0,
-	0x0AD27F00, 0x0AD1EE40, 0x0AD15D80,
-	0x0AD0CCC0, 0x0AD03C00, 0x0ACFAB40,
-	0x0ACF1A80, 0x0ACE89C0, 0x0ACDF900,
-	0x0ACD6840, 0x0ACCD780, 0x0ACC46C0,
-	0x0ACBB600, 0x0ACB2540, 0x0ACA9480,
-	0x0ACA03C0, 0x0AC97300, 0x0AC8E240,
-	0x0AC85180, 0x0AC7C0C0, 0x0AC73000,
-	0x0AC69F40, 0x0AC60E80, 0x0AC57DC0,
-	0x0AC4ED00, 0x0AC45C40, 0x0AC3CB80,
-	0x0AC33AC0, 0x0AC2AA00, 0x0AC21940,
-	0x0AC18880, 0x0AC0F7C0, 0x0AC06700,
-	0x0ABFD640, 0x0ABF4580, 0x0ABEB4C0,
-	0x0ABE2400, 0x0ABD9340, 0x0ABD0280,
-	0x0ABC71C0, 0x0ABBE100, 0x0ABB5040,
-	0x0ABABF80, 0x0ABA2EC0, 0x0AB99E00,
-	0x0AB90D40, 0x0AB87C80, 0x0AB7EBC0,
-	0x0AB75B00, 0x0AB6CA40, 0x0AB63980,
-	0x0AB5A8C0, 0x0AB51800, 0x0AB48740,
-	0x0AB3F680, 0x0AB365C0, 0x0AB2D500,
-	0x0AB24440, 0x0AB1B380, 0x0AB122C0,
-	0x0AB09200, 0x0AB00140, 0x0AAF7080,
-	0x0AAEDFC0, 0x0AAE4F00, 0x0AADBE40,
-	0x0AAD2D80, 0x0AAC9CC0, 0x0AAC0C00,
-	0x0AAB7B40, 0x0AAAEA80, 0x0AAA59C0,
-	0x0AA9C900, 0x0AA93840, 0x0AA8A780,
-	0x0AA816C0, 0x0AA78600, 0x0AA6F540,
-	0x0AA66480, 0x0AA5D3C0, 0x0AA54300,
-	0x0AA4B240, 0x0AA42180, 0x0AA390C0,
-	0x0AA30000, 0x0AA26F40, 0x0AA1DE80,
-	0x0AA14DC0, 0x0AA0BD00, 0x0AA02C40,
-	0x0A9F9B80, 0x0A9F0AC0, 0x0A9E7A00,
-	0x0A9DE940, 0x0A9D5880, 0x0A9CC7C0,
-	0x0A9C3700, 0x0A9BA640, 0x0A9B1580,
-	0x0A9A84C0, 0x0A99F400, 0x0A996340,
-	0x0A98D280, 0x0A9841C0, 0x0A97B100,
-	0x0A972040, 0x0A968F80, 0x0A95FEC0,
-	0x0A956E00, 0x0A94DD40, 0x0A944C80,
-	0x0A93BBC0, 0x0A932B00, 0x0A929A40,
-	0x0A920980, 0x0A9178C0, 0x0A90E800,
-	0x0A905740, 0x0A8FC680, 0x0A8F35C0,
-	0x0A8EA500, 0x0A8E1440, 0x0A8D8380,
-	0x0A8CF2C0, 0x0A8C6200, 0x0A8BD140,
-	0x0A8B4080, 0x0A8AAFC0, 0x0A8A1F00,
-	0x0A898E40, 0x0A88FD80, 0x0A886CC0,
-	0x0A87DC00, 0x0A874B40, 0x0A86BA80,
-	0x0A8629C0, 0x0A859900, 0x0A850840,
-	0x0A847780, 0x0A83E6C0, 0x0A835600,
-	0x0A82C540, 0x0A823480, 0x0A81A3C0,
-	0x0A811300, 0x0A808240, 0x0A7FF180,
-	0x0A7F60C0, 0x0A7ED000, 0x0A7E3F40,
-	0x0A7DAE80, 0x0A7D1DC0, 0x0A7C8D00,
-	0x0A7BFC40, 0x0A7B6B80, 0x0A7ADAC0,
-	0x0A7A4A00, 0x0A79B940, 0x0A792880,
-	0x0A7897C0, 0x0A780700, 0x0A777640,
-	0x0A76E580, 0x0A7654C0, 0x0A75C400,
-	0x0A753340, 0x0A74A280, 0x0A7411C0,
-	0x0A738100, 0x0A72F040, 0x0A725F80,
-	0x0A71CEC0, 0x0A713E00, 0x0A70AD40,
-	0x0A701C80, 0x0A6F8BC0, 0x0A6EFB00,
-	0x0A6E6A40, 0x0A6DD980, 0x0A6D48C0,
-	0x0A6CB800, 0x0A6C2740, 0x0A6B9680,
-	0x0A6B05C0, 0x0A6A7500, 0x0A69E440,
-	0x0A695380, 0x0A68C2C0, 0x0A683200,
-	0x0A67A140, 0x0A671080, 0x0A667FC0,
-	0x0A65EF00, 0x0A655E40, 0x0A64CD80,
-	0x0A643CC0, 0x0A63AC00, 0x0A631B40,
-	0x0A628A80, 0x0A61F9C0, 0x0A616900,
-	0x0A60D840, 0x0A604780, 0x0A5FB6C0,
-	0x0A5F2600, 0x0A5E9540, 0x0A5E0480,
-	0x0A5D73C0, 0x0A5CE300, 0x0A5C5240,
-	0x0A5BC180, 0x0A5B30C0, 0x0A5AA000,
-	0x0A5A0F40, 0x0A597E80, 0x0A58EDC0,
-	0x0A585D00, 0x0A57CC40, 0x0A573B80,
-	0x0A56AAC0, 0x0A561A00, 0x0A558940,
-	0x0A54F880, 0x0A5467C0, 0x0A53D700,
-	0x0A534640, 0x0A52B580, 0x0A5224C0,
-	0x0A519400, 0x0A510340, 0x0A507280,
-	0x0A4FE1C0, 0x0A4F5100, 0x0A4EC040,
-	0x0A4E2F80, 0x0A4D9EC0, 0x0A4D0E00,
-	0x0A4C7D40, 0x0A4BEC80, 0x0A4B5BC0,
-	0x0A4ACB00, 0x0A4A3A40, 0x0A49A980,
-	0x0A4918C0, 0x0A488800, 0x0A47F740,
-	0x0A476680, 0x0A46D5C0, 0x0A464500,
-	0x0A45B440, 0x0A452380, 0x0A4492C0,
-	0x0A440200, 0x0A437140, 0x0A42E080,
-	0x0A424FC0, 0x0A41BF00, 0x0A412E40,
-	0x0A409D80, 0x0A400CC0, 0x0A3F7C00,
-	0x0A3EEB40, 0x0A3E5A80, 0x0A3DC9C0,
-	0x0A3D3900, 0x0A3CA840, 0x0A3C1780,
-	0x0A3B86C0, 0x0A3AF600, 0x0A3A6540,
-	0x0A39D480, 0x0A3943C0, 0x0A38B300,
-	0x0A382240, 0x0A379180, 0x0A3700C0,
-	0x0A367000, 0x0A35DF40, 0x0A354E80,
-	0x0A34BDC0, 0x0A342D00, 0x0A339C40,
-	0x0A330B80, 0x0A327AC0, 0x0A31EA00,
-	0x0A315940, 0x0A30C880, 0x0A3037C0,
-	0x0A2FA700, 0x0A2F1640, 0x0A2E8580,
-	0x0A2DF4C0, 0x0A2D6400, 0x0A2CD340,
-	0x0A2C4280, 0x0A2BB1C0, 0x0A2B2100,
-	0x0A2A9040, 0x0A29FF80, 0x0A296EC0,
-	0x0A28DE00, 0x0A284D40, 0x0A27BC80,
-	0x0A272BC0, 0x0A269B00, 0x0A260A40,
-	0x0A257980, 0x0A24E8C0, 0x0A245800,
-	0x0A23C740, 0x0A233680, 0x0A22A5C0,
-	0x0A221500, 0x0A218440, 0x0A20F380,
-	0x0A2062C0, 0x0A1FD200, 0x0A1F4140,
-	0x0A1EB080, 0x0A1E1FC0, 0x0A1D8F00,
-	0x0A1CFE40, 0x0A1C6D80, 0x0A1BDCC0,
-	0x0A1B4C00, 0x0A1ABB40, 0x0A1A2A80,
-	0x0A1999C0, 0x0A190900, 0x0A187840,
-	0x0A17E780, 0x0A1756C0, 0x0A16C600,
-	0x0A163540, 0x0A15A480, 0x0A1513C0,
-	0x0A148300, 0x0A13F240, 0x0A136180,
-	0x0A12D0C0, 0x0A124000, 0x0A11AF40,
-	0x0A111E80, 0x0A108DC0, 0x0A0FFD00,
-	0x0A0F6C40, 0x0A0EDB80, 0x0A0E4AC0,
-	0x0A0DBA00, 0x0A0D2940, 0x0A0C9880,
-	0x0A0C07C0, 0x0A0B7700, 0x0A0AE640,
-	0x0A0A5580, 0x0A09C4C0, 0x0A093400,
-	0x0A08A340, 0x0A081280, 0x0A0781C0,
-	0x0A06F100, 0x0A066040, 0x0A05CF80,
-	0x0A053EC0, 0x0A04AE00, 0x0A041D40,
-	0x0A038C80, 0x0A02FBC0, 0x0A026B00,
-	0x0A01DA40, 0x0A014980, 0x0A00B8C0,
-	0x0A002800, 0x09FF9740, 0x09FF0680,
-	0x09FE75C0, 0x09FDE500, 0x09FD5440,
-	0x09FCC380, 0x09FC32C0, 0x09FBA200,
-	0x09FB1140, 0x09FA8080, 0x09F9EFC0,
-	0x09F95F00, 0x09F8CE40, 0x09F83D80,
-	0x09F7ACC0, 0x09F71C00, 0x09F68B40,
-	0x09F5FA80, 0x09F569C0, 0x09F4D900,
-	0x09F44840, 0x09F3B780, 0x09F326C0,
-	0x09F29600, 0x09F20540, 0x09F17480,
-	0x09F0E3C0, 0x09F05300, 0x09EFC240,
-	0x09EF3180, 0x09EEA0C0, 0x09EE1000,
-	0x09ED7F40, 0x09ECEE80, 0x09EC5DC0,
-	0x09EBCD00, 0x09EB3C40, 0x09EAAB80,
-	0x09EA1AC0, 0x09E98A00, 0x09E8F940,
-	0x09E86880, 0x09E7D7C0, 0x09E74700,
-	0x09E6B640, 0x09E62580, 0x09E594C0,
-	0x09E50400, 0x09E47340, 0x09E3E280,
-	0x09E351C0, 0x09E2C100, 0x09E23040,
-	0x09E19F80, 0x09E10EC0, 0x09E07E00,
-	0x09DFED40, 0x09DF5C80, 0x09DECBC0,
-	0x09DE3B00, 0x09DDAA40, 0x09DD1980,
-	0x09DC88C0, 0x09DBF800, 0x09DB6740,
-	0x09DAD680, 0x09DA45C0, 0x09D9B500,
-	0x09D92440, 0x09D89380, 0x09D802C0,
-	0x09D77200, 0x09D6E140, 0x09D65080,
-	0x09D5BFC0, 0x09D52F00, 0x09D49E40,
-	0x09D40D80, 0x09D37CC0, 0x09D2EC00,
-	0x09D25B40, 0x09D1CA80, 0x09D139C0,
-	0x09D0A900, 0x09D01840, 0x09CF8780,
-	0x09CEF6C0, 0x09CE6600, 0x09CDD540,
-	0x09CD4480, 0x09CCB3C0, 0x09CC2300,
-	0x09CB9240, 0x09CB0180, 0x09CA70C0,
-	0x09C9E000, 0x09C94F40, 0x09C8BE80,
-	0x09C82DC0, 0x09C79D00, 0x09C70C40,
-	0x09C67B80, 0x09C5EAC0, 0x09C55A00,
-	0x09C4C940, 0x09C43880, 0x09C3A7C0,
-	0x09C31700, 0x09C28640, 0x09C1F580,
-	0x09C164C0, 0x09C0D400, 0x09C04340,
-	0x09BFB280, 0x09BF21C0, 0x09BE9100,
-	0x09BE0040, 0x09BD6F80, 0x09BCDEC0,
-	0x09BC4E00, 0x09BBBD40, 0x09BB2C80,
-	0x09BA9BC0, 0x09BA0B00, 0x09B97A40,
-	0x09B8E980, 0x09B858C0, 0x09B7C800,
-	0x09B73740, 0x09B6A680, 0x09B615C0,
-	0x09B58500, 0x09B4F440, 0x09B46380,
-	0x09B3D2C0, 0x09B34200, 0x09B2B140,
-	0x09B22080, 0x09B18FC0, 0x09B0FF00,
-	0x09B06E40, 0x09AFDD80, 0x09AF4CC0,
-	0x09AEBC00, 0x09AE2B40, 0x09AD9A80,
-	0x09AD09C0, 0x09AC7900, 0x09ABE840,
-	0x09AB5780, 0x09AAC6C0, 0x09AA3600,
-	0x09A9A540, 0x09A91480, 0x09A883C0,
-	0x09A7F300, 0x09A76240, 0x09A6D180,
-	0x09A640C0, 0x09A5B000, 0x09A51F40,
-	0x09A48E80, 0x09A3FDC0, 0x09A36D00,
-	0x09A2DC40, 0x09A24B80, 0x09A1BAC0,
-	0x09A12A00, 0x09A09940, 0x09A00880,
-	0x099F77C0, 0x099EE700, 0x099E5640,
-	0x099DC580, 0x099D34C0, 0x099CA400,
-	0x099C1340, 0x099B8280, 0x099AF1C0,
-	0x099A6100, 0x0999D040, 0x09993F80,
-	0x0998AEC0, 0x09981E00, 0x09978D40,
-	0x0996FC80, 0x09966BC0, 0x0995DB00,
-	0x09954A40, 0x0994B980, 0x099428C0,
-	0x09939800, 0x09930740, 0x09927680,
-	0x0991E5C0, 0x09915500, 0x0990C440,
-	0x09903380, 0x098FA2C0, 0x098F1200,
-	0x098E8140, 0x098DF080, 0x098D5FC0,
-	0x098CCF00, 0x098C3E40, 0x098BAD80,
-	0x098B1CC0, 0x098A8C00, 0x0989FB40,
-	0x09896A80, 0x0988D9C0, 0x09884900,
-	0x0987B840, 0x09872780, 0x098696C0,
-	0x09860600, 0x09857540, 0x0984E480,
-	0x098453C0, 0x0983C300, 0x09833240,
-	0x0982A180, 0x098210C0, 0x09818000,
-	0x0980EF40, 0x09805E80, 0x097FCDC0,
-	0x097F3D00, 0x097EAC40, 0x097E1B80,
-	0x097D8AC0, 0x097CFA00, 0x097C6940,
-	0x097BD880, 0x097B47C0, 0x097AB700,
-	0x097A2640, 0x09799580, 0x097904C0,
-	0x09787400, 0x0977E340, 0x09775280,
-	0x0976C1C0, 0x09763100, 0x0975A040,
-	0x09750F80, 0x09747EC0, 0x0973EE00,
-	0x09735D40, 0x0972CC80, 0x09723BC0,
-	0x0971AB00, 0x09711A40, 0x09708980,
-	0x096FF8C0, 0x096F6800, 0x096ED740,
-	0x096E4680, 0x096DB5C0, 0x096D2500,
-	0x096C9440, 0x096C0380, 0x096B72C0,
-	0x096AE200, 0x096A5140, 0x0969C080,
-	0x09692FC0, 0x09689F00, 0x09680E40,
-	0x09677D80, 0x0966ECC0, 0x09665C00,
-	0x0965CB40, 0x09653A80, 0x0964A9C0,
-	0x09641900, 0x09638840, 0x0962F780,
-	0x096266C0, 0x0961D600, 0x09614540,
-	0x0960B480, 0x096023C0, 0x095F9300,
-	0x095F0240, 0x095E7180, 0x095DE0C0,
-	0x095D5000, 0x095CBF40, 0x095C2E80,
-	0x095B9DC0, 0x095B0D00, 0x095A7C40,
-	0x0959EB80, 0x09595AC0, 0x0958CA00,
-	0x09583940, 0x0957A880, 0x095717C0,
-	0x09568700, 0x0955F640, 0x09556580,
-	0x0954D4C0, 0x09544400, 0x0953B340,
-	0x09532280, 0x095291C0, 0x09520100,
-	0x09517040, 0x0950DF80, 0x09504EC0,
-	0x094FBE00, 0x094F2D40, 0x094E9C80,
-	0x094E0BC0, 0x094D7B00, 0x094CEA40,
-	0x094C5980, 0x094BC8C0, 0x094B3800,
-	0x094AA740, 0x094A1680, 0x094985C0,
-	0x0948F500, 0x09486440, 0x0947D380,
-	0x094742C0, 0x0946B200, 0x09462140,
-	0x09459080, 0x0944FFC0, 0x09446F00,
-	0x0943DE40, 0x09434D80, 0x0942BCC0,
-	0x09422C00, 0x09419B40, 0x09410A80,
-	0x094079C0, 0x093FE900, 0x093F5840,
-	0x093EC780, 0x093E36C0, 0x093DA600,
-	0x093D1540, 0x093C8480, 0x093BF3C0,
-	0x093B6300, 0x093AD240, 0x093A4180,
-	0x0939B0C0, 0x09392000, 0x09388F40,
-	0x0937FE80, 0x09376DC0, 0x0936DD00,
-	0x09364C40, 0x0935BB80, 0x09352AC0,
-	0x09349A00, 0x09340940, 0x09337880,
-	0x0932E7C0, 0x09325700, 0x0931C640,
-	0x09313580, 0x0930A4C0, 0x09301400,
-	0x092F8340, 0x092EF280, 0x092E61C0,
-	0x092DD100, 0x092D4040, 0x092CAF80,
-	0x092C1EC0, 0x092B8E00, 0x092AFD40,
-	0x092A6C80, 0x0929DBC0, 0x09294B00,
-	0x0928BA40, 0x09282980, 0x092798C0,
-	0x09270800, 0x09267740, 0x0925E680,
-	0x092555C0, 0x0924C500, 0x09243440,
-	0x0923A380, 0x092312C0, 0x09228200,
-	0x0921F140, 0x09216080, 0x0920CFC0,
-	0x09203F00, 0x091FAE40, 0x091F1D80,
-	0x091E8CC0, 0x091DFC00, 0x091D6B40,
-	0x091CDA80, 0x091C49C0, 0x091BB900,
-	0x091B2840, 0x091A9780, 0x091A06C0,
-	0x09197600, 0x0918E540, 0x09185480,
-	0x0917C3C0, 0x09173300, 0x0916A240,
-	0x09161180, 0x091580C0, 0x0914F000,
-	0x09145F40, 0x0913CE80, 0x09133DC0,
-	0x0912AD00, 0x09121C40, 0x09118B80,
-	0x0910FAC0, 0x09106A00, 0x090FD940,
-	0x090F4880, 0x090EB7C0, 0x090E2700,
-	0x090D9640, 0x090D0580, 0x090C74C0,
-	0x090BE400, 0x090B5340, 0x090AC280,
-	0x090A31C0, 0x0909A100, 0x09091040,
-	0x09087F80, 0x0907EEC0, 0x09075E00,
-	0x0906CD40, 0x09063C80, 0x0905ABC0,
-	0x09051B00, 0x09048A40, 0x0903F980,
-	0x090368C0, 0x0902D800, 0x09024740,
-	0x0901B680, 0x090125C0, 0x09009500,
-	0x09000440, 0x08FF7380, 0x08FEE2C0,
-	0x08FE5200, 0x08FDC140, 0x08FD3080,
-	0x08FC9FC0, 0x08FC0F00, 0x08FB7E40,
-	0x08FAED80, 0x08FA5CC0, 0x08F9CC00,
-	0x08F93B40, 0x08F8AA80, 0x08F819C0,
-	0x08F78900, 0x08F6F840, 0x08F66780,
-	0x08F5D6C0, 0x08F54600, 0x08F4B540,
-	0x08F42480, 0x08F393C0, 0x08F30300,
-	0x08F27240, 0x08F1E180, 0x08F150C0,
-	0x08F0C000, 0x08F02F40, 0x08EF9E80,
-	0x08EF0DC0, 0x08EE7D00, 0x08EDEC40,
-	0x08ED5B80, 0x08ECCAC0, 0x08EC3A00,
-	0x08EBA940, 0x08EB1880, 0x08EA87C0,
-	0x08E9F700, 0x08E96640, 0x08E8D580,
-	0x08E844C0, 0x08E7B400, 0x08E72340,
-	0x08E69280, 0x08E601C0, 0x08E57100,
-	0x08E4E040, 0x08E44F80, 0x08E3BEC0,
-	0x08E32E00, 0x08E29D40, 0x08E20C80,
-	0x08E17BC0, 0x08E0EB00, 0x08E05A40,
-	0x08DFC980, 0x08DF38C0, 0x08DEA800,
-	0x08DE1740, 0x08DD8680, 0x08DCF5C0,
-	0x08DC6500, 0x08DBD440, 0x08DB4380,
-	0x08DAB2C0, 0x08DA2200, 0x08D99140,
-	0x08D90080, 0x08D86FC0, 0x08D7DF00,
-	0x08D74E40, 0x08D6BD80, 0x08D62CC0,
-	0x08D59C00, 0x08D50B40, 0x08D47A80,
-	0x08D3E9C0, 0x08D35900, 0x08D2C840,
-	0x08D23780, 0x08D1A6C0, 0x08D11600,
-	0x08D08540, 0x08CFF480, 0x08CF63C0,
-	0x08CED300, 0x08CE4240, 0x08CDB180,
-	0x08CD20C0, 0x08CC9000, 0x08CBFF40,
-	0x08CB6E80, 0x08CADDC0, 0x08CA4D00,
-	0x08C9BC40, 0x08C92B80, 0x08C89AC0,
-	0x08C80A00, 0x08C77940, 0x08C6E880,
-	0x08C657C0, 0x08C5C700, 0x08C53640,
-	0x08C4A580, 0x08C414C0, 0x08C38400,
-	0x08C2F340, 0x08C26280, 0x08C1D1C0,
-	0x08C14100, 0x08C0B040, 0x08C01F80,
-	0x08BF8EC0, 0x08BEFE00, 0x08BE6D40,
-	0x08BDDC80, 0x08BD4BC0, 0x08BCBB00,
-	0x08BC2A40, 0x08BB9980, 0x08BB08C0,
-	0x08BA7800, 0x08B9E740, 0x08B95680,
-	0x08B8C5C0, 0x08B83500, 0x08B7A440,
-	0x08B71380, 0x08B682C0, 0x08B5F200,
-	0x08B56140, 0x08B4D080, 0x08B43FC0,
-	0x08B3AF00, 0x08B31E40, 0x08B28D80,
-	0x08B1FCC0, 0x08B16C00, 0x08B0DB40,
-	0x08B04A80, 0x08AFB9C0, 0x08AF2900,
-	0x08AE9840, 0x08AE0780, 0x08AD76C0,
-	0x08ACE600, 0x08AC5540, 0x08ABC480,
-	0x08AB33C0, 0x08AAA300, 0x08AA1240,
-	0x08A98180, 0x08A8F0C0, 0x08A86000,
-	0x08A7CF40, 0x08A73E80, 0x08A6ADC0,
-	0x08A61D00, 0x08A58C40, 0x08A4FB80,
-	0x08A46AC0, 0x08A3DA00, 0x08A34940,
-	0x08A2B880, 0x08A227C0, 0x08A19700,
-	0x08A10640, 0x08A07580, 0x089FE4C0,
-	0x089F5400, 0x089EC340, 0x089E3280,
-	0x089DA1C0, 0x089D1100, 0x089C8040,
-	0x089BEF80, 0x089B5EC0, 0x089ACE00,
-	0x089A3D40, 0x0899AC80, 0x08991BC0,
-	0x08988B00, 0x0897FA40, 0x08976980,
-	0x0896D8C0, 0x08964800, 0x0895B740,
-	0x08952680, 0x089495C0, 0x08940500,
-	0x08937440, 0x0892E380, 0x089252C0,
-	0x0891C200, 0x08913140, 0x0890A080,
-	0x08900FC0, 0x088F7F00, 0x088EEE40,
-	0x088E5D80, 0x088DCCC0, 0x088D3C00,
-	0x088CAB40, 0x088C1A80, 0x088B89C0,
-	0x088AF900, 0x088A6840, 0x0889D780,
-	0x088946C0, 0x0888B600, 0x08882540,
-	0x08879480, 0x088703C0, 0x08867300,
-	0x0885E240, 0x08855180, 0x0884C0C0,
-	0x08843000, 0x08839F40, 0x08830E80,
-	0x08827DC0, 0x0881ED00, 0x08815C40,
-	0x0880CB80, 0x08803AC0, 0x087FAA00,
-	0x087F1940, 0x087E8880, 0x087DF7C0,
-	0x087D6700, 0x087CD640, 0x087C4580,
-	0x087BB4C0, 0x087B2400, 0x087A9340,
-	0x087A0280, 0x087971C0, 0x0878E100,
-	0x08785040, 0x0877BF80, 0x08772EC0,
-	0x08769E00, 0x08760D40, 0x08757C80,
-	0x0874EBC0, 0x08745B00, 0x0873CA40,
-	0x08733980, 0x0872A8C0, 0x08721800,
-	0x08718740, 0x0870F680, 0x087065C0,
-	0x086FD500, 0x086F4440, 0x086EB380,
-	0x086E22C0, 0x086D9200, 0x086D0140,
-	0x086C7080, 0x086BDFC0, 0x086B4F00,
-	0x086ABE40, 0x086A2D80, 0x08699CC0,
-	0x08690C00, 0x08687B40, 0x0867EA80,
-	0x086759C0, 0x0866C900, 0x08663840,
-	0x0865A780, 0x086516C0, 0x08648600,
-	0x0863F540, 0x08636480, 0x0862D3C0,
-	0x08624300, 0x0861B240, 0x08612180,
-	0x086090C0, 0x08620000, 0x08617680,
-	0x0860ED00, 0x08606380, 0x085FDA00,
-	0x085F5080, 0x085EC700, 0x085E3D80,
-	0x085DB400, 0x085D2A80, 0x085CA100,
-	0x085C1780, 0x085B8E00, 0x085B0480,
-	0x085A7B00, 0x0859F180, 0x08596800,
-	0x0858DE80, 0x08585500, 0x0857CB80,
-	0x08574200, 0x0856B880, 0x08562F00,
-	0x0855A580, 0x08551C00, 0x08549280,
-	0x08540900, 0x08537F80, 0x0852F600,
-	0x08526C80, 0x0851E300, 0x08515980,
-	0x0850D000, 0x08504680, 0x084FBD00,
-	0x084F3380, 0x084EAA00, 0x084E2080,
-	0x084D9700, 0x084D0D80, 0x084C8400,
-	0x084BFA80, 0x084B7100, 0x084AE780,
-	0x084A5E00, 0x0849D480, 0x08494B00,
-	0x0848C180, 0x08483800, 0x0847AE80,
-	0x08472500, 0x08469B80, 0x08461200,
-	0x08458880, 0x0844FF00, 0x08447580,
-	0x0843EC00, 0x08436280, 0x0842D900,
-	0x08424F80, 0x0841C600, 0x08413C80,
-	0x0840B300, 0x08402980, 0x083FA000,
-	0x083F1680, 0x083E8D00, 0x083E0380,
-	0x083D7A00, 0x083CF080, 0x083C6700,
-	0x083BDD80, 0x083B5400, 0x083ACA80,
-	0x083A4100, 0x0839B780, 0x08392E00,
-	0x0838A480, 0x08381B00, 0x08379180,
-	0x08370800, 0x08367E80, 0x0835F500,
-	0x08356B80, 0x0834E200, 0x08345880,
-	0x0833CF00, 0x08334580, 0x0832BC00,
-	0x08323280, 0x0831A900, 0x08311F80,
-	0x08309600, 0x08300C80, 0x082F8300,
-	0x082EF980, 0x082E7000, 0x082DE680,
-	0x082D5D00, 0x082CD380, 0x082C4A00,
-	0x082BC080, 0x082B3700, 0x082AAD80,
-	0x082A2400, 0x08299A80, 0x08291100,
-	0x08288780, 0x0827FE00, 0x08277480,
-	0x0826EB00, 0x08266180, 0x0825D800,
-	0x08254E80, 0x0824C500, 0x08243B80,
-	0x0823B200, 0x08232880, 0x08229F00,
-	0x08221580, 0x08218C00, 0x08210280,
-	0x08207900, 0x081FEF80, 0x081F6600,
-	0x081EDC80, 0x081E5300, 0x081DC980,
-	0x081D4000, 0x081CB680, 0x081C2D00,
-	0x081BA380, 0x081B1A00, 0x081A9080,
-	0x081A0700, 0x08197D80, 0x0818F400,
-	0x08186A80, 0x0817E100, 0x08175780,
-	0x0816CE00, 0x08164480, 0x0815BB00,
-	0x08153180, 0x0814A800, 0x08141E80,
-	0x08139500, 0x08130B80, 0x08128200,
-	0x0811F880, 0x08116F00, 0x0810E580,
-	0x08105C00, 0x080FD280, 0x080F4900,
-	0x080EBF80, 0x080E3600, 0x080DAC80,
-	0x080D2300, 0x080C9980, 0x080C1000,
-	0x080B8680, 0x080AFD00, 0x080A7380,
-	0x0809EA00, 0x08096080, 0x0808D700,
-	0x08084D80, 0x0807C400, 0x08073A80,
-	0x0806B100, 0x08062780, 0x08059E00,
-	0x08051480, 0x08048B00, 0x08040180,
-	0x08037800, 0x0802EE80, 0x08026500,
-	0x0801DB80, 0x08015200, 0x0800C880,
-	0x08003F00, 0x07FFB580, 0x07FF2C00,
-	0x07FEA280, 0x07FE1900, 0x07FD8F80,
-	0x07FD0600, 0x07FC7C80, 0x07FBF300,
-	0x07FB6980, 0x07FAE000, 0x07FA5680,
-	0x07F9CD00, 0x07F94380, 0x07F8BA00,
-	0x07F83080, 0x07F7A700, 0x07F71D80,
-	0x07F69400, 0x07F60A80, 0x07F58100,
-	0x07F4F780, 0x07F46E00, 0x07F3E480,
-	0x07F35B00, 0x07F2D180, 0x07F24800,
-	0x07F1BE80, 0x07F13500, 0x07F0AB80,
-	0x07F02200, 0x07EF9880, 0x07EF0F00,
-	0x07EE8580, 0x07EDFC00, 0x07ED7280,
-	0x07ECE900, 0x07EC5F80, 0x07EBD600,
-	0x07EB4C80, 0x07EAC300, 0x07EA3980,
-	0x07E9B000, 0x07E92680, 0x07E89D00,
-	0x07E81380, 0x07E78A00, 0x07E70080,
-	0x07E67700, 0x07E5ED80, 0x07E56400,
-	0x07E4DA80, 0x07E45100, 0x07E3C780,
-	0x07E33E00, 0x07E2B480, 0x07E22B00,
-	0x07E1A180, 0x07E11800, 0x07E08E80,
-	0x07E00500, 0x07DF7B80, 0x07DEF200,
-	0x07DE6880, 0x07DDDF00, 0x07DD5580,
-	0x07DCCC00, 0x07DC4280, 0x07DBB900,
-	0x07DB2F80, 0x07DAA600, 0x07DA1C80,
-	0x07D99300, 0x07D90980, 0x07D88000,
-	0x07D7F680, 0x07D76D00, 0x07D6E380,
-	0x07D65A00, 0x07D5D080, 0x07D54700,
-	0x07D4BD80, 0x07D43400, 0x07D3AA80,
-	0x07D32100, 0x07D29780, 0x07D20E00,
-	0x07D18480, 0x07D0FB00, 0x07D07180,
-	0x07CFE800, 0x07CF5E80, 0x07CED500,
-	0x07CE4B80, 0x07CDC200, 0x07CD3880,
-	0x07CCAF00, 0x07CC2580, 0x07CB9C00,
-	0x07CB1280, 0x07CA8900, 0x07C9FF80,
-	0x07C97600, 0x07C8EC80, 0x07C86300,
-	0x07C7D980, 0x07C75000, 0x07C6C680,
-	0x07C63D00, 0x07C5B380, 0x07C52A00,
-	0x07C4A080, 0x07C41700, 0x07C38D80,
-	0x07C30400, 0x07C27A80, 0x07C1F100,
-	0x07C16780, 0x07C0DE00, 0x07C05480,
-	0x07BFCB00, 0x07BF4180, 0x07BEB800,
-	0x07BE2E80, 0x07BDA500, 0x07BD1B80,
-	0x07BC9200, 0x07BC0880, 0x07BB7F00,
-	0x07BAF580, 0x07BA6C00, 0x07B9E280,
-	0x07B95900, 0x07B8CF80, 0x07B84600,
-	0x07B7BC80, 0x07B73300, 0x07B6A980,
-	0x07B62000, 0x07B59680, 0x07B50D00,
-	0x07B48380, 0x07B3FA00, 0x07B37080,
-	0x07B2E700, 0x07B25D80, 0x07B1D400,
-	0x07B14A80, 0x07B0C100, 0x07B03780,
-	0x07AFAE00, 0x07AF2480, 0x07AE9B00,
-	0x07AE1180, 0x07AD8800, 0x07ACFE80,
-	0x07AC7500, 0x07ABEB80, 0x07AB6200,
-	0x07AAD880, 0x07AA4F00, 0x07A9C580,
-	0x07A93C00, 0x07A8B280, 0x07A82900,
-	0x07A79F80, 0x07A71600, 0x07A68C80,
-	0x07A60300, 0x07A57980, 0x07A4F000,
-	0x07A46680, 0x07A3DD00, 0x07A35380,
-	0x07A2CA00, 0x07A24080, 0x07A1B700,
-	0x07A12D80, 0x07A0A400, 0x07A01A80,
-	0x079F9100, 0x079F0780, 0x079E7E00,
-	0x079DF480, 0x079D6B00, 0x079CE180,
-	0x079C5800, 0x079BCE80, 0x079B4500,
-	0x079ABB80, 0x079A3200, 0x0799A880,
-	0x07991F00, 0x07989580, 0x07980C00,
-	0x07978280, 0x0796F900, 0x07966F80,
-	0x0795E600, 0x07955C80, 0x0794D300,
-	0x07944980, 0x0793C000, 0x07933680,
-	0x0792AD00, 0x07922380, 0x07919A00,
-	0x07911080, 0x07908700, 0x078FFD80,
-	0x078F7400, 0x078EEA80, 0x078E6100,
-	0x078DD780, 0x078D4E00, 0x078CC480,
-	0x078C3B00, 0x078BB180, 0x078B2800,
-	0x078A9E80, 0x078A1500, 0x07898B80,
-	0x07890200, 0x07887880, 0x0787EF00,
-	0x07876580, 0x0786DC00, 0x07865280,
-	0x0785C900, 0x07853F80, 0x0784B600,
-	0x07842C80, 0x0783A300, 0x07831980,
-	0x07829000, 0x07820680, 0x07817D00,
-	0x0780F380, 0x07806A00, 0x077FE080,
-	0x077F5700, 0x077ECD80, 0x077E4400,
-	0x077DBA80, 0x077D3100, 0x077CA780,
-	0x077C1E00, 0x077B9480, 0x077B0B00,
-	0x077A8180, 0x0779F800, 0x07796E80,
-	0x0778E500, 0x07785B80, 0x0777D200,
-	0x07774880, 0x0776BF00, 0x07763580,
-	0x0775AC00, 0x07752280, 0x07749900,
-	0x07740F80, 0x07738600, 0x0772FC80,
-	0x07727300, 0x0771E980, 0x07716000,
-	0x0770D680, 0x07704D00, 0x076FC380,
-	0x076F3A00, 0x076EB080, 0x076E2700,
-	0x076D9D80, 0x076D1400, 0x076C8A80,
-	0x076C0100, 0x076B7780, 0x076AEE00,
-	0x076A6480, 0x0769DB00, 0x07695180,
-	0x0768C800, 0x07683E80, 0x0767B500,
-	0x07672B80, 0x0766A200, 0x07661880,
-	0x07658F00, 0x07650580, 0x07647C00,
-	0x0763F280, 0x07636900, 0x0762DF80,
-	0x07625600, 0x0761CC80, 0x07614300,
-	0x0760B980, 0x07603000, 0x075FA680,
-	0x075F1D00, 0x075E9380, 0x075E0A00,
-	0x075D8080, 0x075CF700, 0x075C6D80,
-	0x075BE400, 0x075B5A80, 0x075AD100,
-	0x075A4780, 0x0759BE00, 0x07593480,
-	0x0758AB00, 0x07582180, 0x07579800,
-	0x07570E80, 0x07568500, 0x0755FB80,
-	0x07557200, 0x0754E880, 0x07545F00,
-	0x0753D580, 0x07534C00, 0x0752C280,
-	0x07523900, 0x0751AF80, 0x07512600,
-	0x07509C80, 0x07501300, 0x074F8980,
-	0x074F0000, 0x074E7680, 0x074DED00,
-	0x074D6380, 0x074CDA00, 0x074C5080,
-	0x074BC700, 0x074B3D80, 0x074AB400,
-	0x074A2A80, 0x0749A100, 0x07491780,
-	0x07488E00, 0x07480480, 0x07477B00,
-	0x0746F180, 0x07466800, 0x0745DE80,
-	0x07455500, 0x0744CB80, 0x07444200,
-	0x0743B880, 0x07432F00, 0x0742A580,
-	0x07421C00, 0x07419280, 0x07410900,
-	0x07407F80, 0x073FF600, 0x073F6C80,
-	0x073EE300, 0x073E5980, 0x073DD000,
-	0x073D4680, 0x073CBD00, 0x073C3380,
-	0x073BAA00, 0x073B2080, 0x073A9700,
-	0x073A0D80, 0x07398400, 0x0738FA80,
-	0x07387100, 0x0737E780, 0x07375E00,
-	0x0736D480, 0x07364B00, 0x0735C180,
-	0x07353800, 0x0734AE80, 0x07342500,
-	0x07339B80, 0x07331200, 0x07328880,
-	0x0731FF00, 0x07317580, 0x0730EC00,
-	0x07306280, 0x072FD900, 0x072F4F80,
-	0x072EC600, 0x072E3C80, 0x072DB300,
-	0x072D2980, 0x072CA000, 0x072C1680,
-	0x072B8D00, 0x072B0380, 0x072A7A00,
-	0x0729F080, 0x07296700, 0x0728DD80,
-	0x07285400, 0x0727CA80, 0x07274100,
-	0x0726B780, 0x07262E00, 0x0725A480,
-	0x07251B00, 0x07249180, 0x07240800,
-	0x07237E80, 0x0722F500, 0x07226B80,
-	0x0721E200, 0x07215880, 0x0720CF00,
-	0x07204580, 0x071FBC00, 0x071F3280,
-	0x071EA900, 0x071E1F80, 0x071D9600,
-	0x071D0C80, 0x071C8300, 0x071BF980,
-	0x071B7000, 0x071AE680, 0x071A5D00,
-	0x0719D380, 0x07194A00, 0x0718C080,
-	0x07183700, 0x0717AD80, 0x07172400,
-	0x07169A80, 0x07161100, 0x07158780,
-	0x0714FE00, 0x07147480, 0x0713EB00,
-	0x07136180, 0x0712D800, 0x07124E80,
-	0x0711C500, 0x07113B80, 0x0710B200,
-	0x07102880, 0x070F9F00, 0x070F1580,
-	0x070E8C00, 0x070E0280, 0x070D7900,
-	0x070CEF80, 0x070C6600, 0x070BDC80,
-	0x070B5300, 0x070AC980, 0x070A4000,
-	0x0709B680, 0x07092D00, 0x0708A380,
-	0x07081A00, 0x07079080, 0x07070700,
-	0x07067D80, 0x0705F400, 0x07056A80,
-	0x0704E100, 0x07045780, 0x0703CE00,
-	0x07034480, 0x0702BB00, 0x07023180,
-	0x0701A800, 0x07011E80, 0x07009500,
-	0x07000B80, 0x06FF8200, 0x06FEF880,
-	0x06FE6F00, 0x06FDE580, 0x06FD5C00,
-	0x06FCD280, 0x06FC4900, 0x06FBBF80,
-	0x06FB3600, 0x06FAAC80, 0x06FA2300,
-	0x06F99980, 0x06F91000, 0x06F88680,
-	0x06F7FD00, 0x06F77380, 0x06F6EA00,
-	0x06F66080, 0x06F5D700, 0x06F54D80,
-	0x06F4C400, 0x06F43A80, 0x06F3B100,
-	0x06F32780, 0x06F29E00, 0x06F21480,
-	0x06F18B00, 0x06F10180, 0x06F07800,
-	0x06EFEE80, 0x06EF6500, 0x06EEDB80,
-	0x06EE5200, 0x06EDC880, 0x06ED3F00,
-	0x06ECB580, 0x06EC2C00, 0x06EBA280,
-	0x06EB1900, 0x06EA8F80, 0x06EA0600,
-	0x06E97C80, 0x06E8F300, 0x06E86980,
-	0x06E7E000, 0x06E75680, 0x06E6CD00,
-	0x06E64380, 0x06E5BA00, 0x06E53080,
-	0x06E4A700, 0x06E41D80, 0x06E39400,
-	0x06E30A80, 0x06E28100, 0x06E1F780,
-	0x06E16E00, 0x06E0E480, 0x06E05B00,
-	0x06DFD180, 0x06DF4800, 0x06DEBE80,
-	0x06DE3500, 0x06DDAB80, 0x06DD2200,
-	0x06DC9880, 0x06DC0F00, 0x06DB8580,
-	0x06DAFC00, 0x06DA7280, 0x06D9E900,
-	0x06D95F80, 0x06D8D600, 0x06D84C80,
-	0x06D7C300, 0x06D73980, 0x06D6B000,
-	0x06D62680, 0x06D59D00, 0x06D51380,
-	0x06D48A00, 0x06D40080, 0x06D37700,
-	0x06D2ED80, 0x06D26400, 0x06D1DA80,
-	0x06D15100, 0x06D0C780, 0x06D03E00,
-	0x06CFB480, 0x06CF2B00, 0x06CEA180,
-	0x06CE1800, 0x06CD8E80, 0x06CD0500,
-	0x06CC7B80, 0x06CBF200, 0x06CB6880,
-	0x06CADF00, 0x06CA5580, 0x06C9CC00,
-	0x06C94280, 0x06C8B900, 0x06C82F80,
-	0x06C7A600, 0x06C71C80, 0x06C69300,
-	0x06C60980, 0x06C58000, 0x06C4F680,
-	0x06C46D00, 0x06C3E380, 0x06C35A00,
-	0x06C2D080, 0x06C24700, 0x06C1BD80,
-	0x06C13400, 0x06C0AA80, 0x06C02100,
-	0x06BF9780, 0x06BF0E00, 0x06BE8480,
-	0x06BDFB00, 0x06BD7180, 0x06BCE800,
-	0x06BC5E80, 0x06BBD500, 0x06BB4B80,
-	0x06BAC200, 0x06BA3880, 0x06B9AF00,
-	0x06B92580, 0x06B89C00, 0x06B81280,
-	0x06B78900, 0x06B6FF80, 0x06B67600,
-	0x06B5EC80, 0x06B56300, 0x06B4D980,
-	0x06B45000, 0x06B3C680, 0x06B33D00,
-	0x06B2B380, 0x06B22A00, 0x06B1A080,
-	0x06B11700, 0x06B08D80, 0x06B00400,
-	0x06AF7A80, 0x06AEF100, 0x06AE6780,
-	0x06ADDE00, 0x06AD5480, 0x06ACCB00,
-	0x06AC4180, 0x06ABB800, 0x06AB2E80,
-	0x06AAA500, 0x06AA1B80, 0x06A99200,
-	0x06A90880, 0x06A87F00, 0x06A7F580,
-	0x06A76C00, 0x06A6E280, 0x06A65900,
-	0x06A5CF80, 0x06A54600, 0x06A4BC80,
-	0x06A43300, 0x06A3A980, 0x06A32000,
-	0x06A29680, 0x06A20D00, 0x06A18380,
-	0x06A0FA00, 0x06A07080, 0x069FE700,
-	0x069F5D80, 0x069ED400, 0x069E4A80,
-	0x069DC100, 0x069D3780, 0x069CAE00,
-	0x069C2480, 0x069B9B00, 0x069B1180,
-	0x069A8800, 0x0699FE80, 0x06997500,
-	0x0698EB80, 0x06986200, 0x0697D880,
-	0x06974F00, 0x0696C580, 0x06963C00,
-	0x0695B280, 0x06952900, 0x06949F80,
-	0x06941600, 0x06938C80, 0x06930300,
-	0x06927980, 0x0691F000, 0x06916680,
-	0x0690DD00, 0x06905380, 0x068FCA00,
-	0x068F4080, 0x068EB700, 0x068E2D80,
-	0x068DA400, 0x068D1A80, 0x068C9100,
-	0x068C0780, 0x068B7E00, 0x068AF480,
-	0x068A6B00, 0x0689E180, 0x06895800,
-	0x0688CE80, 0x06884500, 0x0687BB80,
-	0x06873200, 0x0686A880, 0x06861F00,
-	0x06859580, 0x06850C00, 0x06848280,
-	0x0683F900, 0x06836F80, 0x0682E600,
-	0x06825C80, 0x0681D300, 0x06814980,
-	0x0680C000, 0x06803680, 0x067FAD00,
-	0x067F2380, 0x067E9A00, 0x067E1080,
-	0x067D8700, 0x067CFD80, 0x067C7400,
-	0x067BEA80, 0x067B6100, 0x067AD780,
-	0x067A4E00, 0x0679C480, 0x06793B00,
-	0x0678B180, 0x06782800, 0x06779E80,
-	0x06771500, 0x06768B80, 0x06760200,
-	0x06757880, 0x0674EF00, 0x06746580,
-	0x0673DC00, 0x06735280, 0x0672C900,
-	0x06723F80, 0x0671B600, 0x06712C80,
-	0x0670A300, 0x06701980, 0x066F9000,
-	0x066F0680, 0x066E7D00, 0x066DF380,
-	0x066D6A00, 0x066CE080, 0x066C5700,
-	0x066BCD80, 0x066B4400, 0x066ABA80,
-	0x066A3100, 0x0669A780, 0x06691E00,
-	0x06689480, 0x06680B00, 0x06678180,
-	0x0666F800, 0x06666E80, 0x0665E500,
-	0x06655B80, 0x0664D200, 0x06644880,
-	0x0663BF00, 0x06633580, 0x0662AC00,
-	0x06622280, 0x06619900, 0x06610F80,
-	0x06608600, 0x065FFC80, 0x065F7300,
-	0x065EE980, 0x065E6000, 0x065DD680,
-	0x065D4D00, 0x065CC380, 0x065C3A00,
-	0x065BB080, 0x065B2700, 0x065A9D80,
-	0x065A1400, 0x06598A80, 0x06590100,
-	0x06587780, 0x0657EE00, 0x06576480,
-	0x0656DB00, 0x06565180, 0x0655C800,
-	0x06553E80, 0x0654B500, 0x06542B80,
-	0x0653A200, 0x06531880, 0x06528F00,
-	0x06520580, 0x06517C00, 0x0650F280,
-	0x06506900, 0x064FDF80, 0x064F5600,
-	0x064ECC80, 0x064E4300, 0x064DB980,
-	0x064D3000, 0x064CA680, 0x064C1D00,
-	0x064B9380, 0x064B0A00, 0x064A8080,
-	0x0649F700, 0x06496D80, 0x0648E400,
-	0x06485A80, 0x0647D100, 0x06474780,
-	0x0646BE00, 0x06463480, 0x0645AB00,
-	0x06452180, 0x06449800, 0x06440E80,
-	0x06438500, 0x0642FB80, 0x06427200,
-	0x0641E880, 0x06415F00, 0x0640D580,
-	0x06404C00, 0x063FC280, 0x063F3900,
-	0x063EAF80, 0x063E2600, 0x063D9C80,
-	0x063D1300, 0x063C8980, 0x063C0000,
-	0x063B7680, 0x063AED00, 0x063A6380,
-	0x0639DA00, 0x06395080, 0x0638C700,
-	0x06383D80, 0x0637B400, 0x06372A80,
-	0x0636A100, 0x06361780, 0x06358E00,
-	0x06350480, 0x06347B00, 0x0633F180,
-	0x06336800, 0x0632DE80, 0x06325500,
-	0x0631CB80, 0x06314200, 0x0630B880,
-	0x06302F00, 0x062FA580, 0x062F1C00,
-	0x062E9280, 0x062E0900, 0x062D7F80,
-	0x062CF600, 0x062C6C80, 0x062BE300,
-	0x062B5980, 0x062AD000, 0x062A4680,
-	0x0629BD00, 0x06293380, 0x0628AA00,
-	0x06282080, 0x06279700, 0x06270D80,
-	0x06268400, 0x0625FA80, 0x06257100,
-	0x0624E780, 0x06245E00, 0x0623D480,
-	0x06234B00, 0x0622C180, 0x06223800,
-	0x0621AE80, 0x06212500, 0x06209B80,
-	0x06201200, 0x061F8880, 0x061EFF00,
-	0x061E7580, 0x061DEC00, 0x061D6280,
-	0x061CD900, 0x061C4F80, 0x061BC600,
-	0x061B3C80, 0x061AB300, 0x061A2980,
-	0x0619A000, 0x06191680, 0x06188D00,
-	0x06180380, 0x06177A00, 0x0616F080,
-	0x06166700, 0x0615DD80, 0x06155400,
-	0x0614CA80, 0x06144100, 0x0613B780,
-	0x06132E00, 0x0612A480, 0x06121B00,
-	0x06119180, 0x06110800, 0x06107E80,
-	0x060FF500, 0x060F6B80, 0x060EE200,
-	0x060E5880, 0x060DCF00, 0x060D4580,
-	0x060CBC00, 0x060C3280, 0x060BA900,
-	0x060B1F80, 0x060A9600, 0x060A0C80,
-	0x06098300, 0x0608F980, 0x06087000,
-	0x0607E680, 0x06075D00, 0x0606D380,
-	0x06064A00, 0x0605C080, 0x06053700,
-	0x0604AD80, 0x06042400, 0x06039A80,
-	0x06031100, 0x06028780, 0x0601FE00,
-	0x06017480, 0x0600EB00, 0x06006180,
-	0x05FFD800, 0x05FF4E80, 0x05FEC500,
-	0x05FE3B80, 0x05FDB200, 0x05FD2880,
-	0x05FC9F00, 0x05FC1580, 0x05FB8C00,
-	0x05FB0280, 0x05FA7900, 0x05F9EF80,
-	0x05F96600, 0x05F8DC80, 0x05F85300,
-	0x05F7C980, 0x05F74000, 0x05F6B680,
-	0x05F62D00, 0x05F5A380, 0x05F51A00,
-	0x05F49080, 0x05F40700, 0x05F37D80,
-	0x05F2F400, 0x05F26A80, 0x05F1E100,
-	0x05F15780, 0x05F0CE00, 0x05F04480,
-	0x05EFBB00, 0x05EF3180, 0x05EEA800,
-	0x05EE1E80, 0x05ED9500, 0x05ED0B80,
-	0x05EC8200, 0x05EBF880, 0x05EB6F00,
-	0x05EAE580, 0x05EA5C00, 0x05E9D280,
-	0x05E94900, 0x05E8BF80, 0x05E83600,
-	0x05E7AC80, 0x05E72300, 0x05E69980,
-	0x05E61000, 0x05E58680, 0x05E4FD00,
-	0x05E47380, 0x05E3EA00, 0x05E36080,
-	0x05E2D700, 0x05E24D80, 0x05E1C400,
-	0x05E13A80, 0x05E0B100, 0x05E02780,
-	0x05DF9E00, 0x05DF1480, 0x05DE8B00,
-	0x05DE0180, 0x05DD7800, 0x05DCEE80,
-	0x05DC6500, 0x05DBDB80, 0x05DB5200,
-	0x05DAC880, 0x05DA3F00, 0x05D9B580,
-	0x05D92C00, 0x05D8A280, 0x05D81900,
-	0x05D78F80, 0x05D70600, 0x05D67C80,
-	0x05D5F300, 0x05D56980, 0x05D4E000,
-	0x05D45680, 0x05D3CD00, 0x05D34380,
-	0x05D2BA00, 0x05D23080, 0x05D1A700,
-	0x05D11D80, 0x05D09400, 0x05D00A80,
-	0x05CF8100, 0x05CEF780, 0x05CE6E00,
-	0x05CDE480, 0x05CD5B00, 0x05CCD180,
-	0x05CC4800, 0x05CBBE80, 0x05CB3500,
-	0x05CAAB80, 0x05CA2200, 0x05C99880,
-	0x05C90F00, 0x05C88580, 0x05C7FC00,
-	0x05C77280, 0x05C6E900, 0x05C65F80,
-	0x05C5D600, 0x05C54C80, 0x05C4C300,
-	0x05C43980, 0x05C3B000, 0x05C32680,
-	0x05C29D00, 0x05C21380, 0x05C18A00,
-	0x05C10080, 0x05C07700, 0x05BFED80,
-	0x05BF6400, 0x05BEDA80, 0x05BE5100,
-	0x05BDC780, 0x05BD3E00, 0x05BCB480,
-	0x05BC2B00, 0x05BBA180, 0x05BB1800,
-	0x05BA8E80, 0x05BA0500, 0x05B97B80,
-	0x05B8F200, 0x05B86880, 0x05B7DF00,
-	0x05B75580, 0x05B6CC00, 0x05B64280,
-	0x05B5B900, 0x05B52F80, 0x05B4A600,
-	0x05B41C80, 0x05B39300, 0x05B30980,
-	0x05B28000, 0x05B1F680, 0x05B16D00,
-	0x05B0E380, 0x05B05A00, 0x05AFD080,
-	0x05AF4700, 0x05AEBD80, 0x05AE3400,
-	0x05ADAA80, 0x05AD2100, 0x05AC9780,
-	0x05AC0E00, 0x05AB8480, 0x05AAFB00,
-	0x05AA7180, 0x05A9E800, 0x05A95E80,
-	0x05A8D500, 0x05A84B80, 0x05A7C200,
-	0x05A73880, 0x05A6AF00, 0x05A62580,
-	0x05A59C00, 0x05A51280, 0x05A48900,
-	0x05A3FF80, 0x05A37600, 0x05A2EC80,
-	0x05A26300, 0x05A1D980, 0x05A15000,
-	0x05A0C680, 0x05A03D00, 0x059FB380,
-	0x059F2A00, 0x059EA080, 0x059E1700,
-	0x059D8D80, 0x059D0400, 0x059C7A80,
-	0x059BF100, 0x059B6780, 0x059ADE00,
-	0x059A5480, 0x0599CB00, 0x05994180,
-	0x0598B800, 0x05982E80, 0x0597A500,
-	0x05971B80, 0x05969200, 0x05960880,
-	0x05957F00, 0x0594F580, 0x05946C00,
-	0x0593E280, 0x05935900, 0x0592CF80,
-	0x05924600, 0x0591BC80, 0x05913300,
-	0x0590A980, 0x05902000, 0x058F9680,
-	0x058F0D00, 0x058E8380, 0x058DFA00,
-	0x058D7080, 0x058CE700, 0x058C5D80,
-	0x058BD400, 0x058B4A80, 0x058AC100,
-	0x058A3780, 0x0589AE00, 0x05892480,
-	0x05889B00, 0x05881180, 0x05878800,
-	0x0586FE80, 0x05867500, 0x0585EB80,
-	0x05856200, 0x0584D880, 0x05844F00,
-	0x0583C580, 0x05833C00, 0x0582B280,
-	0x05822900, 0x05819F80, 0x05811600,
-	0x05808C80, 0x05800300, 0x057F7980,
-	0x057EF000, 0x057E6680, 0x057DDD00,
-	0x057D5380, 0x057CCA00, 0x057C4080,
-	0x057BB700, 0x057B2D80, 0x057AA400,
-	0x057A1A80, 0x05799100, 0x05790780,
-	0x05787E00, 0x0577F480, 0x05776B00,
-	0x0576E180, 0x05765800, 0x0575CE80,
-	0x05754500, 0x0574BB80, 0x05743200,
-	0x0573A880, 0x05731F00, 0x05729580,
-	0x05720C00, 0x05718280, 0x0570F900,
-	0x05706F80, 0x056FE600, 0x056F5C80,
-	0x056ED300, 0x056E4980, 0x056DC000,
-	0x056D3680, 0x056CAD00, 0x056C2380,
-	0x056B9A00, 0x056B1080, 0x056A8700,
-	0x0569FD80, 0x05697400, 0x0568EA80,
-	0x05686100, 0x0567D780, 0x05674E00,
-	0x0566C480, 0x05663B00, 0x0565B180,
-	0x05652800, 0x05649E80, 0x05641500,
-	0x05638B80, 0x05630200, 0x05627880,
-	0x0561EF00, 0x05616580, 0x0560DC00,
-	0x05605280, 0x055FC900, 0x055F3F80,
-	0x055EB600, 0x055E2C80, 0x055DA300,
-	0x055D1980, 0x055C9000, 0x055C0680,
-	0x055B7D00, 0x055AF380, 0x055A6A00,
-	0x0559E080, 0x05595700, 0x0558CD80,
-	0x05584400, 0x0557BA80, 0x05573100,
-	0x0556A780, 0x05561E00, 0x05559480,
-	0x05550B00, 0x05548180, 0x0553F800,
-	0x05536E80, 0x0552E500, 0x05525B80,
-	0x0551D200, 0x05514880, 0x0550BF00,
-	0x05503580, 0x054FAC00, 0x054F2280,
-	0x054E9900, 0x054E0F80, 0x054D8600,
-	0x054CFC80, 0x054C7300, 0x054BE980,
-	0x054B6000, 0x054AD680, 0x054A4D00,
-	0x0549C380, 0x05493A00, 0x0548B080,
-	0x05482700, 0x05479D80, 0x05471400,
-	0x05468A80, 0x05460100, 0x05457780,
-	0x0544EE00, 0x05446480, 0x0543DB00,
-	0x05435180, 0x0542C800, 0x05423E80,
-	0x0541B500, 0x05412B80, 0x0540A200,
-	0x05401880, 0x053F8F00, 0x053F0580,
-	0x053E7C00, 0x053DF280, 0x053D6900,
-	0x053CDF80, 0x053C5600, 0x053BCC80,
-	0x053B4300, 0x053AB980, 0x053A3000,
-	0x0539A680, 0x05391D00, 0x05389380,
-	0x05380A00, 0x05378080, 0x0536F700,
-	0x05366D80, 0x0535E400, 0x05355A80,
-	0x0534D100, 0x05344780, 0x0533BE00,
-	0x05333480, 0x0532AB00, 0x05322180,
-	0x05319800, 0x05310E80, 0x05308500,
-	0x052FFB80, 0x052F7200, 0x052EE880,
-	0x052E5F00, 0x052DD580, 0x052D4C00,
-	0x052CC280, 0x052C3900, 0x052BAF80,
-	0x052B2600, 0x052A9C80, 0x052A1300,
-	0x05298980, 0x05290000, 0x05287680,
-	0x0527ED00, 0x05276380, 0x0526DA00,
-	0x05265080, 0x0525C700, 0x05253D80,
-	0x0524B400, 0x05242A80, 0x0523A100,
-	0x05231780, 0x05228E00, 0x05220480,
-	0x05217B00, 0x0520F180, 0x05206800,
-	0x051FDE80, 0x051F5500, 0x051ECB80,
-	0x051E4200, 0x051DB880, 0x051D2F00,
-	0x051CA580, 0x051C1C00, 0x051B9280,
-	0x051B0900, 0x051A7F80, 0x0519F600,
-	0x05196C80, 0x0518E300, 0x05185980,
-	0x0517D000, 0x05174680, 0x0516BD00,
-	0x05163380, 0x0515AA00, 0x05152080,
-	0x05149700, 0x05140D80, 0x05138400,
-	0x0512FA80, 0x05127100, 0x0511E780,
-	0x05115E00, 0x0510D480, 0x05104B00,
-	0x050FC180, 0x050F3800, 0x050EAE80,
-	0x050E2500, 0x050D9B80, 0x050D1200,
-	0x050C8880, 0x050BFF00, 0x050B7580,
-	0x050AEC00, 0x050A6280, 0x0509D900,
-	0x05094F80, 0x0508C600, 0x05083C80,
-	0x0507B300, 0x05072980, 0x0506A000,
-	0x05061680, 0x05058D00, 0x05050380,
-	0x05047A00, 0x0503F080, 0x05036700,
-	0x0502DD80, 0x05025400, 0x0501CA80,
-	0x05014100, 0x0500B780, 0x05002E00,
-	0x04FFA480, 0x04FF1B00, 0x04FE9180,
-	0x04FE0800, 0x04FD7E80, 0x04FCF500,
-	0x04FC6B80, 0x04FBE200, 0x04FB5880,
-	0x04FACF00, 0x04FA4580, 0x04F9BC00,
-	0x04F93280, 0x04F8A900, 0x04F81F80,
-	0x04F79600, 0x04F70C80, 0x04F68300,
-	0x04F5F980, 0x04F57000, 0x04F4E680,
-	0x04F45D00, 0x04F3D380, 0x04F34A00,
-	0x04F2C080, 0x04F23700, 0x04F1AD80,
-	0x04F12400, 0x04F09A80, 0x04F01100,
-	0x04EF8780, 0x04EEFE00, 0x04EE7480,
-	0x04EDEB00, 0x04ED6180, 0x04ECD800,
-	0x04EC4E80, 0x04EBC500, 0x04EB3B80,
-	0x04EAB200, 0x04EA2880, 0x04E99F00,
-	0x04E91580, 0x04E88C00, 0x04E80280,
-	0x04E77900, 0x04E6EF80, 0x04E66600,
-	0x04E5DC80, 0x04E55300, 0x04E4C980,
-	0x04E44000, 0x04E3B680, 0x04E32D00,
-	0x04E2A380, 0x04E21A00, 0x04E19080,
-	0x04E10700, 0x04E07D80, 0x04DFF400,
-	0x04DF6A80, 0x04DEE100, 0x04DE5780,
-	0x04DDCE00, 0x04DD4480, 0x04DCBB00,
-	0x04DC3180, 0x04DBA800, 0x04DB1E80,
-	0x04DA9500, 0x04DA0B80, 0x04D98200,
-	0x04D8F880, 0x04D86F00, 0x04D7E580,
-	0x04D75C00, 0x04D6D280, 0x04D64900,
-	0x04D5BF80, 0x04D53600, 0x04D4AC80,
-	0x04D42300, 0x04D39980, 0x04D31000,
-	0x04D28680, 0x04D1FD00, 0x04D17380,
-	0x04D0EA00, 0x04D06080, 0x04CFD700,
-	0x04CF4D80, 0x04CEC400, 0x04CE3A80,
-	0x04CDB100, 0x04CD2780, 0x04CC9E00,
-	0x04CC1480, 0x04CB8B00, 0x04CB0180,
-	0x04CA7800, 0x04C9EE80, 0x04C96500,
-	0x04C8DB80, 0x04C85200, 0x04C7C880,
-	0x04C73F00, 0x04C6B580, 0x04C62C00,
-	0x04C5A280, 0x04C51900, 0x04C48F80,
-	0x04C40600, 0x04C37C80, 0x04C2F300,
-	0x04C26980, 0x04C1E000, 0x04C15680,
-	0x04C0CD00, 0x04C04380, 0x04BFBA00,
-	0x04BF3080, 0x04BEA700, 0x04BE1D80,
-	0x04BD9400, 0x04BD0A80, 0x04BC8100,
-	0x04BBF780, 0x04BB6E00, 0x04BAE480,
-	0x04BA5B00, 0x04B9D180, 0x04B94800,
-	0x04B8BE80, 0x04B83500, 0x04B7AB80,
-	0x04B72200, 0x04B69880, 0x04B60F00,
-	0x04B58580, 0x04B4FC00, 0x04B47280,
-	0x04B3E900, 0x04B35F80, 0x04B2D600,
-	0x04B24C80, 0x04B1C300, 0x04B13980,
-	0x04B0B000, 0x04B02680, 0x04AF9D00,
-	0x04AF1380, 0x04AE8A00, 0x04AE0080,
-	0x04AD7700, 0x04ACED80, 0x04AC6400,
-	0x04ABDA80, 0x04AB5100, 0x04AAC780,
-	0x04AA3E00, 0x04A9B480, 0x04A92B00,
-	0x04A8A180, 0x04A81800, 0x04A78E80,
-	0x04A70500, 0x04A67B80, 0x04A5F200,
-	0x04A56880, 0x04A4DF00, 0x04A45580,
-	0x04A3CC00, 0x04A34280, 0x04A2B900,
-	0x04A22F80, 0x04A1A600, 0x04A11C80,
-	0x04A09300, 0x04A00980, 0x049F8000,
-	0x049EF680, 0x049E6D00, 0x049DE380,
-	0x049D5A00, 0x049CD080, 0x049C4700,
-	0x049BBD80, 0x049B3400, 0x049AAA80,
-	0x049A2100, 0x04999780, 0x04990E00,
-	0x04988480, 0x0497FB00, 0x04977180,
-	0x0496E800, 0x04965E80, 0x0495D500,
-	0x04954B80, 0x0494C200, 0x04943880,
-	0x0493AF00, 0x04932580, 0x04929C00,
-	0x04921280, 0x04918900, 0x0490FF80,
-	0x04907600, 0x048FEC80, 0x048F6300,
-	0x048ED980, 0x048E5000, 0x048DC680,
-	0x048D3D00, 0x048CB380, 0x048C2A00,
-	0x048BA080, 0x048B1700, 0x048A8D80,
-	0x048A0400, 0x04897A80, 0x0488F100,
-	0x04886780, 0x0487DE00, 0x04875480,
-	0x0486CB00, 0x04864180, 0x0485B800,
-	0x04852E80, 0x0484A500, 0x04841B80,
-	0x04839200, 0x04830880, 0x04827F00,
-	0x0481F580, 0x04816C00, 0x0480E280,
-	0x04805900, 0x047FCF80, 0x047F4600,
-	0x047EBC80, 0x047E3300, 0x047DA980,
-	0x047D2000, 0x047C9680, 0x047C0D00,
-	0x047B8380, 0x047AFA00, 0x047A7080,
-	0x0479E700, 0x04795D80, 0x0478D400,
-	0x04784A80, 0x0477C100, 0x04773780,
-	0x0476AE00, 0x04762480, 0x04759B00,
-	0x04751180, 0x04748800, 0x0473FE80,
-	0x04737500, 0x0472EB80, 0x04726200,
-	0x0471D880, 0x04714F00, 0x0470C580,
-	0x04703C00, 0x046FB280, 0x046F2900,
-	0x046E9F80, 0x046E1600, 0x046D8C80,
-	0x046D0300, 0x046C7980, 0x046BF000,
-	0x046B6680, 0x046ADD00, 0x046A5380,
-	0x0469CA00, 0x04694080, 0x0468B700,
-	0x04682D80, 0x0467A400, 0x04671A80,
-	0x04669100, 0x04660780, 0x04657E00,
-	0x0464F480, 0x04646B00, 0x0463E180,
-	0x04635800, 0x0462CE80, 0x04624500,
-	0x0461BB80, 0x04613200, 0x0460A880,
-	0x04601F00, 0x045F9580, 0x045F0C00,
-	0x045E8280, 0x045DF900, 0x045D6F80,
-	0x045CE600, 0x045C5C80, 0x045BD300,
-	0x045B4980, 0x045AC000, 0x045A3680,
-	0x0459AD00, 0x04592380, 0x04589A00,
-	0x04581080, 0x04578700, 0x0456FD80,
-	0x04567400, 0x0455EA80, 0x04556100,
-	0x0454D780, 0x04544E00, 0x0453C480,
-	0x04533B00, 0x0452B180, 0x04522800,
-	0x04519E80, 0x04511500, 0x04508B80,
-	0x04500200, 0x044F7880, 0x044EEF00,
-	0x044E6580, 0x044DDC00, 0x044D5280,
-	0x044CC900, 0x044C3F80, 0x044BB600,
-	0x044B2C80, 0x044AA300, 0x044A1980,
-	0x04499000, 0x04490680, 0x04487D00,
-	0x0447F380, 0x04476A00, 0x0446E080,
-	0x04465700, 0x0445CD80, 0x04454400,
-	0x0444BA80, 0x04443100, 0x0443A780,
-	0x04431E00, 0x04429480, 0x04420B00,
-	0x04418180, 0x0440F800, 0x04406E80,
-	0x043FE500, 0x043F5B80, 0x043ED200,
-	0x043E4880, 0x043DBF00, 0x043D3580,
-	0x043CAC00, 0x043C2280, 0x043B9900,
-	0x043B0F80, 0x043A8600, 0x0439FC80,
-	0x04397300, 0x0438E980, 0x04386000,
-	0x0437D680, 0x04374D00, 0x0436C380,
-	0x04363A00, 0x0435B080, 0x04352700,
-	0x04349D80, 0x04341400, 0x04338A80,
-	0x04330100, 0x04327780, 0x0431EE00,
-	0x04316480, 0x0430DB00, 0x04305180,
-	0x042FC800, 0x042F3E80, 0x042EB500,
-	0x042E2B80, 0x042DA200, 0x042D1880,
-	0x042C8F00, 0x042C0580, 0x042B7C00,
-	0x042AF280, 0x042A6900, 0x0429DF80,
-	0x04295600, 0x0428CC80, 0x04284300,
-	0x0427B980, 0x04273000, 0x0426A680,
-	0x04261D00, 0x04259380, 0x04250A00,
-	0x04248080, 0x0423F700, 0x04236D80,
-	0x0422E400, 0x04225A80, 0x0421D100,
-	0x04214780, 0x0420BE00, 0x04203480,
-	0x041FAB00, 0x041F2180, 0x041E9800,
-	0x041E0E80, 0x041D8500, 0x041CFB80,
-	0x041C7200, 0x041BE880, 0x041B5F00,
-	0x041AD580, 0x041A4C00, 0x0419C280,
-	0x04193900, 0x0418AF80, 0x04182600,
-	0x04179C80, 0x04171300, 0x04168980,
-	0x04160000, 0x04157D40, 0x0414FA80,
-	0x041477C0, 0x0413F500, 0x04137240,
-	0x0412EF80, 0x04126CC0, 0x0411EA00,
-	0x04116740, 0x0410E480, 0x041061C0,
-	0x040FDF00, 0x040F5C40, 0x040ED980,
-	0x040E56C0, 0x040DD400, 0x040D5140,
-	0x040CCE80, 0x040C4BC0, 0x040BC900,
-	0x040B4640, 0x040AC380, 0x040A40C0,
-	0x0409BE00, 0x04093B40, 0x0408B880,
-	0x040835C0, 0x0407B300, 0x04073040,
-	0x0406AD80, 0x04062AC0, 0x0405A800,
-	0x04052540, 0x0404A280, 0x04041FC0,
-	0x04039D00, 0x04031A40, 0x04029780,
-	0x040214C0, 0x04019200, 0x04010F40,
-	0x04008C80, 0x040009C0, 0x03FF8700,
-	0x03FF0440, 0x03FE8180, 0x03FDFEC0,
-	0x03FD7C00, 0x03FCF940, 0x03FC7680,
-	0x03FBF3C0, 0x03FB7100, 0x03FAEE40,
-	0x03FA6B80, 0x03F9E8C0, 0x03F96600,
-	0x03F8E340, 0x03F86080, 0x03F7DDC0,
-	0x03F75B00, 0x03F6D840, 0x03F65580,
-	0x03F5D2C0, 0x03F55000, 0x03F4CD40,
-	0x03F44A80, 0x03F3C7C0, 0x03F34500,
-	0x03F2C240, 0x03F23F80, 0x03F1BCC0,
-	0x03F13A00, 0x03F0B740, 0x03F03480,
-	0x03EFB1C0, 0x03EF2F00, 0x03EEAC40,
-	0x03EE2980, 0x03EDA6C0, 0x03ED2400,
-	0x03ECA140, 0x03EC1E80, 0x03EB9BC0,
-	0x03EB1900, 0x03EA9640, 0x03EA1380,
-	0x03E990C0, 0x03E90E00, 0x03E88B40,
-	0x03E80880, 0x03E785C0, 0x03E70300,
-	0x03E68040, 0x03E5FD80, 0x03E57AC0,
-	0x03E4F800, 0x03E47540, 0x03E3F280,
-	0x03E36FC0, 0x03E2ED00, 0x03E26A40,
-	0x03E1E780, 0x03E164C0, 0x03E0E200,
-	0x03E05F40, 0x03DFDC80, 0x03DF59C0,
-	0x03DED700, 0x03DE5440, 0x03DDD180,
-	0x03DD4EC0, 0x03DCCC00, 0x03DC4940,
-	0x03DBC680, 0x03DB43C0, 0x03DAC100,
-	0x03DA3E40, 0x03D9BB80, 0x03D938C0,
-	0x03D8B600, 0x03D83340, 0x03D7B080,
-	0x03D72DC0, 0x03D6AB00, 0x03D62840,
-	0x03D5A580, 0x03D522C0, 0x03D4A000,
-	0x03D41D40, 0x03D39A80, 0x03D317C0,
-	0x03D29500, 0x03D21240, 0x03D18F80,
-	0x03D10CC0, 0x03D08A00, 0x03D00740,
-	0x03CF8480, 0x03CF01C0, 0x03CE7F00,
-	0x03CDFC40, 0x03CD7980, 0x03CCF6C0,
-	0x03CC7400, 0x03CBF140, 0x03CB6E80,
-	0x03CAEBC0, 0x03CA6900, 0x03C9E640,
-	0x03C96380, 0x03C8E0C0, 0x03C85E00,
-	0x03C7DB40, 0x03C75880, 0x03C6D5C0,
-	0x03C65300, 0x03C5D040, 0x03C54D80,
-	0x03C4CAC0, 0x03C44800, 0x03C3C540,
-	0x03C34280, 0x03C2BFC0, 0x03C23D00,
-	0x03C1BA40, 0x03C13780, 0x03C0B4C0,
-	0x03C03200, 0x03BFAF40, 0x03BF2C80,
-	0x03BEA9C0, 0x03BE2700, 0x03BDA440,
-	0x03BD2180, 0x03BC9EC0, 0x03BC1C00,
-	0x03BB9940, 0x03BB1680, 0x03BA93C0,
-	0x03BA1100, 0x03B98E40, 0x03B90B80,
-	0x03B888C0, 0x03B80600, 0x03B78340,
-	0x03B70080, 0x03B67DC0, 0x03B5FB00,
-	0x03B57840, 0x03B4F580, 0x03B472C0,
-	0x03B3F000, 0x03B36D40, 0x03B2EA80,
-	0x03B267C0, 0x03B1E500, 0x03B16240,
-	0x03B0DF80, 0x03B05CC0, 0x03AFDA00,
-	0x03AF5740, 0x03AED480, 0x03AE51C0,
-	0x03ADCF00, 0x03AD4C40, 0x03ACC980,
-	0x03AC46C0, 0x03ABC400, 0x03AB4140,
-	0x03AABE80, 0x03AA3BC0, 0x03A9B900,
-	0x03A93640, 0x03A8B380, 0x03A830C0,
-	0x03A7AE00, 0x03A72B40, 0x03A6A880,
-	0x03A625C0, 0x03A5A300, 0x03A52040,
-	0x03A49D80, 0x03A41AC0, 0x03A39800,
-	0x03A31540, 0x03A29280, 0x03A20FC0,
-	0x03A18D00, 0x03A10A40, 0x03A08780,
-	0x03A004C0, 0x039F8200, 0x039EFF40,
-	0x039E7C80, 0x039DF9C0, 0x039D7700,
-	0x039CF440, 0x039C7180, 0x039BEEC0,
-	0x039B6C00, 0x039AE940, 0x039A6680,
-	0x0399E3C0, 0x03996100, 0x0398DE40,
-	0x03985B80, 0x0397D8C0, 0x03975600,
-	0x0396D340, 0x03965080, 0x0395CDC0,
-	0x03954B00, 0x0394C840, 0x03944580,
-	0x0393C2C0, 0x03934000, 0x0392BD40,
-	0x03923A80, 0x0391B7C0, 0x03913500,
-	0x0390B240, 0x03902F80, 0x038FACC0,
-	0x038F2A00, 0x038EA740, 0x038E2480,
-	0x038DA1C0, 0x038D1F00, 0x038C9C40,
-	0x038C1980, 0x038B96C0, 0x038B1400,
-	0x038A9140, 0x038A0E80, 0x03898BC0,
-	0x03890900, 0x03888640, 0x03880380,
-	0x038780C0, 0x0386FE00, 0x03867B40,
-	0x0385F880, 0x038575C0, 0x0384F300,
-	0x03847040, 0x0383ED80, 0x03836AC0,
-	0x0382E800, 0x03826540, 0x0381E280,
-	0x03815FC0, 0x0380DD00, 0x03805A40,
-	0x037FD780, 0x037F54C0, 0x037ED200,
-	0x037E4F40, 0x037DCC80, 0x037D49C0,
-	0x037CC700, 0x037C4440, 0x037BC180,
-	0x037B3EC0, 0x037ABC00, 0x037A3940,
-	0x0379B680, 0x037933C0, 0x0378B100,
-	0x03782E40, 0x0377AB80, 0x037728C0,
-	0x0376A600, 0x03762340, 0x0375A080,
-	0x03751DC0, 0x03749B00, 0x03741840,
-	0x03739580, 0x037312C0, 0x03729000,
-	0x03720D40, 0x03718A80, 0x037107C0,
-	0x03708500, 0x03700240, 0x036F7F80,
-	0x036EFCC0, 0x036E7A00, 0x036DF740,
-	0x036D7480, 0x036CF1C0, 0x036C6F00,
-	0x036BEC40, 0x036B6980, 0x036AE6C0,
-	0x036A6400, 0x0369E140, 0x03695E80,
-	0x0368DBC0, 0x03685900, 0x0367D640,
-	0x03675380, 0x0366D0C0, 0x03664E00,
-	0x0365CB40, 0x03654880, 0x0364C5C0,
-	0x03644300, 0x0363C040, 0x03633D80,
-	0x0362BAC0, 0x03623800, 0x0361B540,
-	0x03613280, 0x0360AFC0, 0x03602D00,
-	0x035FAA40, 0x035F2780, 0x035EA4C0,
-	0x035E2200, 0x035D9F40, 0x035D1C80,
-	0x035C99C0, 0x035C1700, 0x035B9440,
-	0x035B1180, 0x035A8EC0, 0x035A0C00,
-	0x03598940, 0x03590680, 0x035883C0,
-	0x03580100, 0x03577E40, 0x0356FB80,
-	0x035678C0, 0x0355F600, 0x03557340,
-	0x0354F080, 0x03546DC0, 0x0353EB00,
-	0x03536840, 0x0352E580, 0x035262C0,
-	0x0351E000, 0x03515D40, 0x0350DA80,
-	0x035057C0, 0x034FD500, 0x034F5240,
-	0x034ECF80, 0x034E4CC0, 0x034DCA00,
-	0x034D4740, 0x034CC480, 0x034C41C0,
-	0x034BBF00, 0x034B3C40, 0x034AB980,
-	0x034A36C0, 0x0349B400, 0x03493140,
-	0x0348AE80, 0x03482BC0, 0x0347A900,
-	0x03472640, 0x0346A380, 0x034620C0,
-	0x03459E00, 0x03451B40, 0x03449880,
-	0x034415C0, 0x03439300, 0x03431040,
-	0x03428D80, 0x03420AC0, 0x03418800,
-	0x03410540, 0x03408280, 0x033FFFC0,
-	0x033F7D00, 0x033EFA40, 0x033E7780,
-	0x033DF4C0, 0x033D7200, 0x033CEF40,
-	0x033C6C80, 0x033BE9C0, 0x033B6700,
-	0x033AE440, 0x033A6180, 0x0339DEC0,
-	0x03395C00, 0x0338D940, 0x03385680,
-	0x0337D3C0, 0x03375100, 0x0336CE40,
-	0x03364B80, 0x0335C8C0, 0x03354600,
-	0x0334C340, 0x03344080, 0x0333BDC0,
-	0x03333B00, 0x0332B840, 0x03323580,
-	0x0331B2C0, 0x03313000, 0x0330AD40,
-	0x03302A80, 0x032FA7C0, 0x032F2500,
-	0x032EA240, 0x032E1F80, 0x032D9CC0,
-	0x032D1A00, 0x032C9740, 0x032C1480,
-	0x032B91C0, 0x032B0F00, 0x032A8C40,
-	0x032A0980, 0x032986C0, 0x03290400,
-	0x03288140, 0x0327FE80, 0x03277BC0,
-	0x0326F900, 0x03267640, 0x0325F380,
-	0x032570C0, 0x0324EE00, 0x03246B40,
-	0x0323E880, 0x032365C0, 0x0322E300,
-	0x03226040, 0x0321DD80, 0x03215AC0,
-	0x0320D800, 0x03205540, 0x031FD280,
-	0x031F4FC0, 0x031ECD00, 0x031E4A40,
-	0x031DC780, 0x031D44C0, 0x031CC200,
-	0x031C3F40, 0x031BBC80, 0x031B39C0,
-	0x031AB700, 0x031A3440, 0x0319B180,
-	0x03192EC0, 0x0318AC00, 0x03182940,
-	0x0317A680, 0x031723C0, 0x0316A100,
-	0x03161E40, 0x03159B80, 0x031518C0,
-	0x03149600, 0x03141340, 0x03139080,
-	0x03130DC0, 0x03128B00, 0x03120840,
-	0x03118580, 0x031102C0, 0x03108000,
-	0x030FFD40, 0x030F7A80, 0x030EF7C0,
-	0x030E7500, 0x030DF240, 0x030D6F80,
-	0x030CECC0, 0x030C6A00, 0x030BE740,
-	0x030B6480, 0x030AE1C0, 0x030A5F00,
-	0x0309DC40, 0x03095980, 0x0308D6C0,
-	0x03085400, 0x0307D140, 0x03074E80,
-	0x0306CBC0, 0x03064900, 0x0305C640,
-	0x03054380, 0x0304C0C0, 0x03043E00,
-	0x0303BB40, 0x03033880, 0x0302B5C0,
-	0x03023300, 0x0301B040, 0x03012D80,
-	0x0300AAC0, 0x03002800, 0x02FFA540,
-	0x02FF2280, 0x02FE9FC0, 0x02FE1D00,
-	0x02FD9A40, 0x02FD1780, 0x02FC94C0,
-	0x02FC1200, 0x02FB8F40, 0x02FB0C80,
-	0x02FA89C0, 0x02FA0700, 0x02F98440,
-	0x02F90180, 0x02F87EC0, 0x02F7FC00,
-	0x02F77940, 0x02F6F680, 0x02F673C0,
-	0x02F5F100, 0x02F56E40, 0x02F4EB80,
-	0x02F468C0, 0x02F3E600, 0x02F36340,
-	0x02F2E080, 0x02F25DC0, 0x02F1DB00,
-	0x02F15840, 0x02F0D580, 0x02F052C0,
-	0x02EFD000, 0x02EF4D40, 0x02EECA80,
-	0x02EE47C0, 0x02EDC500, 0x02ED4240,
-	0x02ECBF80, 0x02EC3CC0, 0x02EBBA00,
-	0x02EB3740, 0x02EAB480, 0x02EA31C0,
-	0x02E9AF00, 0x02E92C40, 0x02E8A980,
-	0x02E826C0, 0x02E7A400, 0x02E72140,
-	0x02E69E80, 0x02E61BC0, 0x02E59900,
-	0x02E51640, 0x02E49380, 0x02E410C0,
-	0x02E38E00, 0x02E30B40, 0x02E28880,
-	0x02E205C0, 0x02E18300, 0x02E10040,
-	0x02E07D80, 0x02DFFAC0, 0x02DF7800,
-	0x02DEF540, 0x02DE7280, 0x02DDEFC0,
-	0x02DD6D00, 0x02DCEA40, 0x02DC6780,
-	0x02DBE4C0, 0x02DB6200, 0x02DADF40,
-	0x02DA5C80, 0x02D9D9C0, 0x02D95700,
-	0x02D8D440, 0x02D85180, 0x02D7CEC0,
-	0x02D74C00, 0x02D6C940, 0x02D64680,
-	0x02D5C3C0, 0x02D54100, 0x02D4BE40,
-	0x02D43B80, 0x02D3B8C0, 0x02D33600,
-	0x02D2B340, 0x02D23080, 0x02D1ADC0,
-	0x02D12B00, 0x02D0A840, 0x02D02580,
-	0x02CFA2C0, 0x02CF2000, 0x02CE9D40,
-	0x02CE1A80, 0x02CD97C0, 0x02CD1500,
-	0x02CC9240, 0x02CC0F80, 0x02CB8CC0,
-	0x02CB0A00, 0x02CA8740, 0x02CA0480,
-	0x02C981C0, 0x02C8FF00, 0x02C87C40,
-	0x02C7F980, 0x02C776C0, 0x02C6F400,
-	0x02C67140, 0x02C5EE80, 0x02C56BC0,
-	0x02C4E900, 0x02C46640, 0x02C3E380,
-	0x02C360C0, 0x02C2DE00, 0x02C25B40,
-	0x02C1D880, 0x02C155C0, 0x02C0D300,
-	0x02C05040, 0x02BFCD80, 0x02BF4AC0,
-	0x02BEC800, 0x02BE4540, 0x02BDC280,
-	0x02BD3FC0, 0x02BCBD00, 0x02BC3A40,
-	0x02BBB780, 0x02BB34C0, 0x02BAB200,
-	0x02BA2F40, 0x02B9AC80, 0x02B929C0,
-	0x02B8A700, 0x02B82440, 0x02B7A180,
-	0x02B71EC0, 0x02B69C00, 0x02B61940,
-	0x02B59680, 0x02B513C0, 0x02B49100,
-	0x02B40E40, 0x02B38B80, 0x02B308C0,
-	0x02B28600, 0x02B20340, 0x02B18080,
-	0x02B0FDC0, 0x02B07B00, 0x02AFF840,
-	0x02AF7580, 0x02AEF2C0, 0x02AE7000,
-	0x02ADED40, 0x02AD6A80, 0x02ACE7C0,
-	0x02AC6500, 0x02ABE240, 0x02AB5F80,
-	0x02AADCC0, 0x02AA5A00, 0x02A9D740,
-	0x02A95480, 0x02A8D1C0, 0x02A84F00,
-	0x02A7CC40, 0x02A74980, 0x02A6C6C0,
-	0x02A64400, 0x02A5C140, 0x02A53E80,
-	0x02A4BBC0, 0x02A43900, 0x02A3B640,
-	0x02A33380, 0x02A2B0C0, 0x02A22E00,
-	0x02A1AB40, 0x02A12880, 0x02A0A5C0,
-	0x02A02300, 0x029FA040, 0x029F1D80,
-	0x029E9AC0, 0x029E1800, 0x029D9540,
-	0x029D1280, 0x029C8FC0, 0x029C0D00,
-	0x029B8A40, 0x029B0780, 0x029A84C0,
-	0x029A0200, 0x02997F40, 0x0298FC80,
-	0x029879C0, 0x0297F700, 0x02977440,
-	0x0296F180, 0x02966EC0, 0x0295EC00,
-	0x02956940, 0x0294E680, 0x029463C0,
-	0x0293E100, 0x02935E40, 0x0292DB80,
-	0x029258C0, 0x0291D600, 0x02915340,
-	0x0290D080, 0x02904DC0, 0x028FCB00,
-	0x028F4840, 0x028EC580, 0x028E42C0,
-	0x028DC000, 0x028D3D40, 0x028CBA80,
-	0x028C37C0, 0x028BB500, 0x028B3240,
-	0x028AAF80, 0x028A2CC0, 0x0289AA00,
-	0x02892740, 0x0288A480, 0x028821C0,
-	0x02879F00, 0x02871C40, 0x02869980,
-	0x028616C0, 0x02859400, 0x02851140,
-	0x02848E80, 0x02840BC0, 0x02838900,
-	0x02830640, 0x02828380, 0x028200C0,
-	0x02817E00, 0x0280FB40, 0x02807880,
-	0x027FF5C0, 0x027F7300, 0x027EF040,
-	0x027E6D80, 0x027DEAC0, 0x027D6800,
-	0x027CE540, 0x027C6280, 0x027BDFC0,
-	0x027B5D00, 0x027ADA40, 0x027A5780,
-	0x0279D4C0, 0x02795200, 0x0278CF40,
-	0x02784C80, 0x0277C9C0, 0x02774700,
-	0x0276C440, 0x02764180, 0x0275BEC0,
-	0x02753C00, 0x0274B940, 0x02743680,
-	0x0273B3C0, 0x02733100, 0x0272AE40,
-	0x02722B80, 0x0271A8C0, 0x02712600,
-	0x0270A340, 0x02702080, 0x026F9DC0,
-	0x026F1B00, 0x026E9840, 0x026E1580,
-	0x026D92C0, 0x026D1000, 0x026C8D40,
-	0x026C0A80, 0x026B87C0, 0x026B0500,
-	0x026A8240, 0x0269FF80, 0x02697CC0,
-	0x0268FA00, 0x02687740, 0x0267F480,
-	0x026771C0, 0x0266EF00, 0x02666C40,
-	0x0265E980, 0x026566C0, 0x0264E400,
-	0x02646140, 0x0263DE80, 0x02635BC0,
-	0x0262D900, 0x02625640, 0x0261D380,
-	0x026150C0, 0x0260CE00, 0x02604B40,
-	0x025FC880, 0x025F45C0, 0x025EC300,
-	0x025E4040, 0x025DBD80, 0x025D3AC0,
-	0x025CB800, 0x025C3540, 0x025BB280,
-	0x025B2FC0, 0x025AAD00, 0x025A2A40,
-	0x0259A780, 0x025924C0, 0x0258A200,
-	0x02581F40, 0x02579C80, 0x025719C0,
-	0x02569700, 0x02561440, 0x02559180,
-	0x02550EC0, 0x02548C00, 0x02540940,
-	0x02538680, 0x025303C0, 0x02528100,
-	0x0251FE40, 0x02517B80, 0x0250F8C0,
-	0x02507600, 0x024FF340, 0x024F7080,
-	0x024EEDC0, 0x024E6B00, 0x024DE840,
-	0x024D6580, 0x024CE2C0, 0x024C6000,
-	0x024BDD40, 0x024B5A80, 0x024AD7C0,
-	0x024A5500, 0x0249D240, 0x02494F80,
-	0x0248CCC0, 0x02484A00, 0x0247C740,
-	0x02474480, 0x0246C1C0, 0x02463F00,
-	0x0245BC40, 0x02453980, 0x0244B6C0,
-	0x02443400, 0x0243B140, 0x02432E80,
-	0x0242ABC0, 0x02422900, 0x0241A640,
-	0x02412380, 0x0240A0C0, 0x02401E00,
-	0x023F9B40, 0x023F1880, 0x023E95C0,
-	0x023E1300, 0x023D9040, 0x023D0D80,
-	0x023C8AC0, 0x023C0800, 0x023B8540,
-	0x023B0280, 0x023A7FC0, 0x0239FD00,
-	0x02397A40, 0x0238F780, 0x023874C0,
-	0x0237F200, 0x02376F40, 0x0236EC80,
-	0x023669C0, 0x0235E700, 0x02356440,
-	0x0234E180, 0x02345EC0, 0x0233DC00,
-	0x02335940, 0x0232D680, 0x023253C0,
-	0x0231D100, 0x02314E40, 0x0230CB80,
-	0x023048C0, 0x022FC600, 0x022F4340,
-	0x022EC080, 0x022E3DC0, 0x022DBB00,
-	0x022D3840, 0x022CB580, 0x022C32C0,
-	0x022BB000, 0x022B2D40, 0x022AAA80,
-	0x022A27C0, 0x0229A500, 0x02292240,
-	0x02289F80, 0x02281CC0, 0x02279A00,
-	0x02271740, 0x02269480, 0x022611C0,
-	0x02258F00, 0x02250C40, 0x02248980,
-	0x022406C0, 0x02238400, 0x02230140,
-	0x02227E80, 0x0221FBC0, 0x02217900,
-	0x0220F640, 0x02207380, 0x021FF0C0,
-	0x021F6E00, 0x021EEB40, 0x021E6880,
-	0x021DE5C0, 0x021D6300, 0x021CE040,
-	0x021C5D80, 0x021BDAC0, 0x021B5800,
-	0x021AD540, 0x021A5280, 0x0219CFC0,
-	0x02194D00, 0x0218CA40, 0x02184780,
-	0x0217C4C0, 0x02174200, 0x0216BF40,
-	0x02163C80, 0x0215B9C0, 0x02153700,
-	0x0214B440, 0x02143180, 0x0213AEC0,
-	0x02132C00, 0x0212A940, 0x02122680,
-	0x0211A3C0, 0x02112100, 0x02109E40,
-	0x02101B80, 0x020F98C0, 0x020F1600,
-	0x020E9340, 0x020E1080, 0x020D8DC0,
-	0x020D0B00, 0x020C8840, 0x020C0580,
-	0x020B82C0, 0x020B0000, 0x020A7D40,
-	0x0209FA80, 0x020977C0, 0x0208F500,
-	0x02087240, 0x0207EF80, 0x02076CC0,
-	0x0206EA00, 0x02066740, 0x0205E480,
-	0x020561C0, 0x0204DF00, 0x02045C40,
-	0x0203D980, 0x020356C0, 0x0202D400,
-	0x02025140, 0x0201CE80, 0x02014BC0,
-	0x0200C900, 0x02004640, 0x01FFC380,
-	0x01FF40C0, 0x01FEBE00, 0x01FE3B40,
-	0x01FDB880, 0x01FD35C0, 0x01FCB300,
-	0x01FC3040, 0x01FBAD80, 0x01FB2AC0,
-	0x01FAA800, 0x01FA2540, 0x01F9A280,
-	0x01F91FC0, 0x01F89D00, 0x01F81A40,
-	0x01F79780, 0x01F714C0, 0x01F69200,
-	0x01F60F40, 0x01F58C80, 0x01F509C0,
-	0x01F48700, 0x01F40440, 0x01F38180,
-	0x01F2FEC0, 0x01F27C00, 0x01F1F940,
-	0x01F17680, 0x01F0F3C0, 0x01F07100,
-	0x01EFEE40, 0x01EF6B80, 0x01EEE8C0,
-	0x01EE6600, 0x01EDE340, 0x01ED6080,
-	0x01ECDDC0, 0x01EC5B00, 0x01EBD840,
-	0x01EB5580, 0x01EAD2C0, 0x01EA5000,
-	0x01E9CD40, 0x01E94A80, 0x01E8C7C0,
-	0x01E84500, 0x01E7C240, 0x01E73F80,
-	0x01E6BCC0, 0x01E63A00, 0x01E5B740,
-	0x01E53480, 0x01E4B1C0, 0x01E42F00,
-	0x01E3AC40, 0x01E32980, 0x01E2A6C0,
-	0x01E22400, 0x01E1A140, 0x01E11E80,
-	0x01E09BC0, 0x01E01900, 0x01DF9640,
-	0x01DF1380, 0x01DE90C0, 0x01DE0E00,
-	0x01DD8B40, 0x01DD0880, 0x01DC85C0,
-	0x01DC0300, 0x01DB8040, 0x01DAFD80,
-	0x01DA7AC0, 0x01D9F800, 0x01D97540,
-	0x01D8F280, 0x01D86FC0, 0x01D7ED00,
-	0x01D76A40, 0x01D6E780, 0x01D664C0,
-	0x01D5E200, 0x01D55F40, 0x01D4DC80,
-	0x01D459C0, 0x01D3D700, 0x01D35440,
-	0x01D2D180, 0x01D24EC0, 0x01D1CC00,
-	0x01D14940, 0x01D0C680, 0x01D043C0,
-	0x01CFC100, 0x01CF3E40, 0x01CEBB80,
-	0x01CE38C0, 0x01CDB600, 0x01CD3340,
-	0x01CCB080, 0x01CC2DC0, 0x01CBAB00,
-	0x01CB2840, 0x01CAA580, 0x01CA22C0,
-	0x01C9A000, 0x01C91D40, 0x01C89A80,
-	0x01C817C0, 0x01C79500, 0x01C71240,
-	0x01C68F80, 0x01C60CC0, 0x01C58A00,
-	0x01C50740, 0x01C48480, 0x01C401C0,
-	0x01C37F00, 0x01C2FC40, 0x01C27980,
-	0x01C1F6C0, 0x01C17400, 0x01C0F140,
-	0x01C06E80, 0x01BFEBC0, 0x01BF6900,
-	0x01BEE640, 0x01BE6380, 0x01BDE0C0,
-	0x01BD5E00, 0x01BCDB40, 0x01BC5880,
-	0x01BBD5C0, 0x01BB5300, 0x01BAD040,
-	0x01BA4D80, 0x01B9CAC0, 0x01B94800,
-	0x01B8C540, 0x01B84280, 0x01B7BFC0,
-	0x01B73D00, 0x01B6BA40, 0x01B63780,
-	0x01B5B4C0, 0x01B53200, 0x01B4AF40,
-	0x01B42C80, 0x01B3A9C0, 0x01B32700,
-	0x01B2A440, 0x01B22180, 0x01B19EC0,
-	0x01B11C00, 0x01B09940, 0x01B01680,
-	0x01AF93C0, 0x01AF1100, 0x01AE8E40,
-	0x01AE0B80, 0x01AD88C0, 0x01AD0600,
-	0x01AC8340, 0x01AC0080, 0x01AB7DC0,
-	0x01AAFB00, 0x01AA7840, 0x01A9F580,
-	0x01A972C0, 0x01A8F000, 0x01A86D40,
-	0x01A7EA80, 0x01A767C0, 0x01A6E500,
-	0x01A66240, 0x01A5DF80, 0x01A55CC0,
-	0x01A4DA00, 0x01A45740, 0x01A3D480,
-	0x01A351C0, 0x01A2CF00, 0x01A24C40,
-	0x01A1C980, 0x01A146C0, 0x01A0C400,
-	0x01A04140, 0x019FBE80, 0x019F3BC0,
-	0x019EB900, 0x019E3640, 0x019DB380,
-	0x019D30C0, 0x019CAE00, 0x019C2B40,
-	0x019BA880, 0x019B25C0, 0x019AA300,
-	0x019A2040, 0x01999D80, 0x01991AC0,
-	0x01989800, 0x01981540, 0x01979280,
-	0x01970FC0, 0x01968D00, 0x01960A40,
-	0x01958780, 0x019504C0, 0x01948200,
-	0x0193FF40, 0x01937C80, 0x0192F9C0,
-	0x01927700, 0x0191F440, 0x01917180,
-	0x0190EEC0, 0x01906C00, 0x018FE940,
-	0x018F6680, 0x018EE3C0, 0x018E6100,
-	0x018DDE40, 0x018D5B80, 0x018CD8C0,
-	0x018C5600, 0x018BD340, 0x018B5080,
-	0x018ACDC0, 0x018A4B00, 0x0189C840,
-	0x01894580, 0x0188C2C0, 0x01884000,
-	0x0187BD40, 0x01873A80, 0x0186B7C0,
-	0x01863500, 0x0185B240, 0x01852F80,
-	0x0184ACC0, 0x01842A00, 0x0183A740,
-	0x01832480, 0x0182A1C0, 0x01821F00,
-	0x01819C40, 0x01811980, 0x018096C0,
-	0x01801400, 0x017F9140, 0x017F0E80,
-	0x017E8BC0, 0x017E0900, 0x017D8640,
-	0x017D0380, 0x017C80C0, 0x017BFE00,
-	0x017B7B40, 0x017AF880, 0x017A75C0,
-	0x0179F300, 0x01797040, 0x0178ED80,
-	0x01786AC0, 0x0177E800, 0x01776540,
-	0x0176E280, 0x01765FC0, 0x0175DD00,
-	0x01755A40, 0x0174D780, 0x017454C0,
-	0x0173D200, 0x01734F40, 0x0172CC80,
-	0x017249C0, 0x0171C700, 0x01714440,
-	0x0170C180, 0x01703EC0, 0x016FBC00,
-	0x016F3940, 0x016EB680, 0x016E33C0,
-	0x016DB100, 0x016D2E40, 0x016CAB80,
-	0x016C28C0, 0x016BA600, 0x016B2340,
-	0x016AA080, 0x016A1DC0, 0x01699B00,
-	0x01691840, 0x01689580, 0x016812C0,
-	0x01679000, 0x01670D40, 0x01668A80,
-	0x016607C0, 0x01658500, 0x01650240,
-	0x01647F80, 0x0163FCC0, 0x01637A00,
-	0x0162F740, 0x01627480, 0x0161F1C0,
-	0x01616F00, 0x0160EC40, 0x01606980,
-	0x015FE6C0, 0x015F6400, 0x015EE140,
-	0x015E5E80, 0x015DDBC0, 0x015D5900,
-	0x015CD640, 0x015C5380, 0x015BD0C0,
-	0x015B4E00, 0x015ACB40, 0x015A4880,
-	0x0159C5C0, 0x01594300, 0x0158C040,
-	0x01583D80, 0x0157BAC0, 0x01573800,
-	0x0156B540, 0x01563280, 0x0155AFC0,
-	0x01552D00, 0x0154AA40, 0x01542780,
-	0x0153A4C0, 0x01532200, 0x01529F40,
-	0x01521C80, 0x015199C0, 0x01511700,
-	0x01509440, 0x01501180, 0x014F8EC0,
-	0x014F0C00, 0x014E8940, 0x014E0680,
-	0x014D83C0, 0x014D0100, 0x014C7E40,
-	0x014BFB80, 0x014B78C0, 0x014AF600,
-	0x014A7340, 0x0149F080, 0x01496DC0,
-	0x0148EB00, 0x01486840, 0x0147E580,
-	0x014762C0, 0x0146E000, 0x01465D40,
-	0x0145DA80, 0x014557C0, 0x0144D500,
-	0x01445240, 0x0143CF80, 0x01434CC0,
-	0x0142CA00, 0x01424740, 0x0141C480,
-	0x014141C0, 0x0140BF00, 0x01403C40,
-	0x013FB980, 0x013F36C0, 0x013EB400,
-	0x013E3140, 0x013DAE80, 0x013D2BC0,
-	0x013CA900, 0x013C2640, 0x013BA380,
-	0x013B20C0, 0x013A9E00, 0x013A1B40,
-	0x01399880, 0x013915C0, 0x01389300,
-	0x01381040, 0x01378D80, 0x01370AC0,
-	0x01368800, 0x01360540, 0x01358280,
-	0x0134FFC0, 0x01347D00, 0x0133FA40,
-	0x01337780, 0x0132F4C0, 0x01327200,
-	0x0131EF40, 0x01316C80, 0x0130E9C0,
-	0x01306700, 0x012FE440, 0x012F6180,
-	0x012EDEC0, 0x012E5C00, 0x012DD940,
-	0x012D5680, 0x012CD3C0, 0x012C5100,
-	0x012BCE40, 0x012B4B80, 0x012AC8C0,
-	0x012A4600, 0x0129C340, 0x01294080,
-	0x0128BDC0, 0x01283B00, 0x0127B840,
-	0x01273580, 0x0126B2C0, 0x01263000,
-	0x0125AD40, 0x01252A80, 0x0124A7C0,
-	0x01242500, 0x0123A240, 0x01231F80,
-	0x01229CC0, 0x01221A00, 0x01219740,
-	0x01211480, 0x012091C0, 0x01200F00,
-	0x011F8C40, 0x011F0980, 0x011E86C0,
-	0x011E0400, 0x011D8140, 0x011CFE80,
-	0x011C7BC0, 0x011BF900, 0x011B7640,
-	0x011AF380, 0x011A70C0, 0x0119EE00,
-	0x01196B40, 0x0118E880, 0x011865C0,
-	0x0117E300, 0x01176040, 0x0116DD80,
-	0x01165AC0, 0x0115D800, 0x01155540,
-	0x0114D280, 0x01144FC0, 0x0113CD00,
-	0x01134A40, 0x0112C780, 0x011244C0,
-	0x0111C200, 0x01113F40, 0x0110BC80,
-	0x011039C0, 0x010FB700, 0x010F3440,
-	0x010EB180, 0x010E2EC0, 0x010DAC00,
-	0x010D2940, 0x010CA680, 0x010C23C0,
-	0x010BA100, 0x010B1E40, 0x010A9B80,
-	0x010A18C0, 0x01099600, 0x01091340,
-	0x01089080, 0x01080DC0, 0x01078B00,
-	0x01070840, 0x01068580, 0x010602C0,
-	0x01058000, 0x0104FD40, 0x01047A80,
-	0x0103F7C0, 0x01037500, 0x0102F240,
-	0x01026F80, 0x0101ECC0, 0x01016A00,
-	0x0100E740, 0x01006480, 0x00FFE1C0,
-	0x00FF5F00, 0x00FEDC40, 0x00FE5980,
-	0x00FDD6C0, 0x00FD5400, 0x00FCD140,
-	0x00FC4E80, 0x00FBCBC0, 0x00FB4900,
-	0x00FAC640, 0x00FA4380, 0x00F9C0C0,
-	0x00F93E00, 0x00F8BB40, 0x00F83880,
-	0x00F7B5C0, 0x00F73300, 0x00F6B040,
-	0x00F62D80, 0x00F5AAC0, 0x00F52800,
-	0x00F4A540, 0x00F42280, 0x00F39FC0,
-	0x00F31D00, 0x00F29A40, 0x00F21780,
-	0x00F194C0, 0x00F11200, 0x00F08F40,
-	0x00F00C80, 0x00EF89C0, 0x00EF0700,
-	0x00EE8440, 0x00EE0180, 0x00ED7EC0,
-	0x00ECFC00, 0x00EC7940, 0x00EBF680,
-	0x00EB73C0, 0x00EAF100, 0x00EA6E40,
-	0x00E9EB80, 0x00E968C0, 0x00E8E600,
-	0x00E86340, 0x00E7E080, 0x00E75DC0,
-	0x00E6DB00, 0x00E65840, 0x00E5D580,
-	0x00E552C0, 0x00E4D000, 0x00E44D40,
-	0x00E3CA80, 0x00E347C0, 0x00E2C500,
-	0x00E24240, 0x00E1BF80, 0x00E13CC0,
-	0x00E0BA00, 0x00E03740, 0x00DFB480,
-	0x00DF31C0, 0x00DEAF00, 0x00DE2C40,
-	0x00DDA980, 0x00DD26C0, 0x00DCA400,
-	0x00DC2140, 0x00DB9E80, 0x00DB1BC0,
-	0x00DA9900, 0x00DA1640, 0x00D99380,
-	0x00D910C0, 0x00D88E00, 0x00D80B40,
-	0x00D78880, 0x00D705C0, 0x00D68300,
-	0x00D60040, 0x00D57D80, 0x00D4FAC0,
-	0x00D47800, 0x00D3F540, 0x00D37280,
-	0x00D2EFC0, 0x00D26D00, 0x00D1EA40,
-	0x00D16780, 0x00D0E4C0, 0x00D06200,
-	0x00CFDF40, 0x00CF5C80, 0x00CED9C0,
-	0x00CE5700, 0x00CDD440, 0x00CD5180,
-	0x00CCCEC0, 0x00CC4C00, 0x00CBC940,
-	0x00CB4680, 0x00CAC3C0, 0x00CA4100,
-	0x00C9BE40, 0x00C93B80, 0x00C8B8C0,
-	0x00C83600, 0x00C7B340, 0x00C73080,
-	0x00C6ADC0, 0x00C62B00, 0x00C5A840,
-	0x00C52580, 0x00C4A2C0, 0x00C42000,
-	0x00C39D40, 0x00C31A80, 0x00C297C0,
-	0x00C21500, 0x00C19240, 0x00C10F80,
-	0x00C08CC0, 0x00C00A00, 0x00BF8740,
-	0x00BF0480, 0x00BE81C0, 0x00BDFF00,
-	0x00BD7C40, 0x00BCF980, 0x00BC76C0,
-	0x00BBF400, 0x00BB7140, 0x00BAEE80,
-	0x00BA6BC0, 0x00B9E900, 0x00B96640,
-	0x00B8E380, 0x00B860C0, 0x00B7DE00,
-	0x00B75B40, 0x00B6D880, 0x00B655C0,
-	0x00B5D300, 0x00B55040, 0x00B4CD80,
-	0x00B44AC0, 0x00B3C800, 0x00B34540,
-	0x00B2C280, 0x00B23FC0, 0x00B1BD00,
-	0x00B13A40, 0x00B0B780, 0x00B034C0,
-	0x00AFB200, 0x00AF2F40, 0x00AEAC80,
-	0x00AE29C0, 0x00ADA700, 0x00AD2440,
-	0x00ACA180, 0x00AC1EC0, 0x00AB9C00,
-	0x00AB1940, 0x00AA9680, 0x00AA13C0,
-	0x00A99100, 0x00A90E40, 0x00A88B80,
-	0x00A808C0, 0x00A78600, 0x00A70340,
-	0x00A68080, 0x00A5FDC0, 0x00A57B00,
-	0x00A4F840, 0x00A47580, 0x00A3F2C0,
-	0x00A37000, 0x00A2ED40, 0x00A26A80,
-	0x00A1E7C0, 0x00A16500, 0x00A0E240,
-	0x00A05F80, 0x009FDCC0, 0x009F5A00,
-	0x009ED740, 0x009E5480, 0x009DD1C0,
-	0x009D4F00, 0x009CCC40, 0x009C4980,
-	0x009BC6C0, 0x009B4400, 0x009AC140,
-	0x009A3E80, 0x0099BBC0, 0x00993900,
-	0x0098B640, 0x00983380, 0x0097B0C0,
-	0x00972E00, 0x0096AB40, 0x00962880,
-	0x0095A5C0, 0x00952300, 0x0094A040,
-	0x00941D80, 0x00939AC0, 0x00931800,
-	0x00929540, 0x00921280, 0x00918FC0,
-	0x00910D00, 0x00908A40, 0x00900780,
-	0x008F84C0, 0x008F0200, 0x008E7F40,
-	0x008DFC80, 0x008D79C0, 0x008CF700,
-	0x008C7440, 0x008BF180, 0x008B6EC0,
-	0x008AEC00, 0x008A6940, 0x0089E680,
-	0x008963C0, 0x0088E100, 0x00885E40,
-	0x0087DB80, 0x008758C0, 0x0086D600,
-	0x00865340, 0x0085D080, 0x00854DC0,
-	0x0084CB00, 0x00844840, 0x0083C580,
-	0x008342C0, 0x0082C000, 0x00823D40,
-	0x0081BA80, 0x008137C0, 0x0080B500,
-	0x00803240, 0x007FAF80, 0x007F2CC0,
-	0x007EAA00, 0x007E2740, 0x007DA480,
-	0x007D21C0, 0x007C9F00, 0x007C1C40,
-	0x007B9980, 0x007B16C0, 0x007A9400,
-	0x007A1140, 0x00798E80, 0x00790BC0,
-	0x00788900, 0x00780640, 0x00778380,
-	0x007700C0, 0x00767E00, 0x0075FB40,
-	0x00757880, 0x0074F5C0, 0x00747300,
-	0x0073F040, 0x00736D80, 0x0072EAC0,
-	0x00726800, 0x0071E540, 0x00716280,
-	0x0070DFC0, 0x00705D00, 0x006FDA40,
-	0x006F5780, 0x006ED4C0, 0x006E5200,
-	0x006DCF40, 0x006D4C80, 0x006CC9C0,
-	0x006C4700, 0x006BC440, 0x006B4180,
-	0x006ABEC0, 0x006A3C00, 0x0069B940,
-	0x00693680, 0x0068B3C0, 0x00683100,
-	0x0067AE40, 0x00672B80, 0x0066A8C0,
-	0x00662600, 0x0065A340, 0x00652080,
-	0x00649DC0, 0x00641B00, 0x00639840,
-	0x00631580, 0x006292C0, 0x00621000,
-	0x00618D40, 0x00610A80, 0x006087C0,
-	0x00600500, 0x005F8240, 0x005EFF80,
-	0x005E7CC0, 0x005DFA00, 0x005D7740,
-	0x005CF480, 0x005C71C0, 0x005BEF00,
-	0x005B6C40, 0x005AE980, 0x005A66C0,
-	0x0059E400, 0x00596140, 0x0058DE80,
-	0x00585BC0, 0x0057D900, 0x00575640,
-	0x0056D380, 0x005650C0, 0x0055CE00,
-	0x00554B40, 0x0054C880, 0x005445C0,
-	0x0053C300, 0x00534040, 0x0052BD80,
-	0x00523AC0, 0x0051B800, 0x00513540,
-	0x0050B280, 0x00502FC0, 0x004FAD00,
-	0x004F2A40, 0x004EA780, 0x004E24C0,
-	0x004DA200, 0x004D1F40, 0x004C9C80,
-	0x004C19C0, 0x004B9700, 0x004B1440,
-	0x004A9180, 0x004A0EC0, 0x00498C00,
-	0x00490940, 0x00488680, 0x004803C0,
-	0x00478100, 0x0046FE40, 0x00467B80,
-	0x0045F8C0, 0x00457600, 0x0044F340,
-	0x00447080, 0x0043EDC0, 0x00436B00,
-	0x0042E840, 0x00426580, 0x0041E2C0,
-	0x00416000, 0x0040DD40, 0x00405A80,
-	0x003FD7C0, 0x003F5500, 0x003ED240,
-	0x003E4F80, 0x003DCCC0, 0x003D4A00,
-	0x003CC740, 0x003C4480, 0x003BC1C0,
-	0x003B3F00, 0x003ABC40, 0x003A3980,
-	0x0039B6C0, 0x00393400, 0x0038B140,
-	0x00382E80, 0x0037ABC0, 0x00372900,
-	0x0036A640, 0x00362380, 0x0035A0C0,
-	0x00351E00, 0x00349B40, 0x00341880,
-	0x003395C0, 0x00331300, 0x00329040,
-	0x00320D80, 0x00318AC0, 0x00310800,
-	0x00308540, 0x00300280, 0x002F7FC0,
-	0x002EFD00, 0x002E7A40, 0x002DF780,
-	0x002D74C0, 0x002CF200, 0x002C6F40,
-	0x002BEC80, 0x002B69C0, 0x002AE700,
-	0x002A6440, 0x0029E180, 0x00295EC0,
-	0x0028DC00, 0x00285940, 0x0027D680,
-	0x002753C0, 0x0026D100, 0x00264E40,
-	0x0025CB80, 0x002548C0, 0x0024C600,
-	0x00244340, 0x0023C080, 0x00233DC0,
-	0x0022BB00, 0x00223840, 0x0021B580,
-	0x002132C0, 0x0020B000, 0x00202D40,
-	0x001FAA80, 0x001F27C0, 0x001EA500,
-	0x001E2240, 0x001D9F80, 0x001D1CC0,
-	0x001C9A00, 0x001C1740, 0x001B9480,
-	0x001B11C0, 0x001A8F00, 0x001A0C40,
-	0x00198980, 0x001906C0, 0x00188400,
-	0x00180140, 0x00177E80, 0x0016FBC0,
-	0x00167900, 0x0015F640, 0x00157380,
-	0x0014F0C0, 0x00146E00, 0x0013EB40,
-	0x00136880, 0x0012E5C0, 0x00126300,
-	0x0011E040, 0x00115D80, 0x0010DAC0,
-	0x00105800, 0x000FD540, 0x000F5280,
-	0x000ECFC0, 0x000E4D00, 0x000DCA40,
-	0x000D4780, 0x000CC4C0, 0x000C4200,
-	0x000BBF40, 0x000B3C80, 0x000AB9C0,
-	0x000A3700, 0x0009B440, 0x00093180,
-	0x0008AEC0, 0x00082C00, 0x0007A940,
-	0x00072680, 0x0006A3C0, 0x00062100,
-	0x00059E40, 0x00051B80, 0x000498C0,
-	0x00041600, 0x00039340, 0x00031080,
-	0x00028DC0, 0x00020B00, 0x00018840,
-	0x00010580, 0x000082C0, 0xFFE80000,
-	0xFFE61700, 0xFFE42E00, 0xFFE24500,
-	0xFFE05C00, 0xFFDE7300, 0xFFDC8A00,
-	0xFFDAA100, 0xFFD8B800, 0xFFD6CF00,
-	0xFFD4E600, 0xFFD2FD00, 0xFFD11400,
-	0xFFCF2B00, 0xFFCD4200, 0xFFCB5900,
-	0xFFC97000, 0xFFC78700, 0xFFC59E00,
-	0xFFC3B500, 0xFFC1CC00, 0xFFBFE300,
-	0xFFBDFA00, 0xFFBC1100, 0xFFBA2800,
-	0xFFB83F00, 0xFFB65600, 0xFFB46D00,
-	0xFFB28400, 0xFFB09B00, 0xFFAEB200,
-	0xFFACC900, 0xFFAAE000, 0xFFA8F700,
-	0xFFA70E00, 0xFFA52500, 0xFFA33C00,
-	0xFFA15300, 0xFF9F6A00, 0xFF9D8100,
-	0xFF9B9800, 0xFF99AF00, 0xFF97C600,
-	0xFF95DD00, 0xFF93F400, 0xFF920B00,
-	0xFF902200, 0xFF8E3900, 0xFF8C5000,
-	0xFF8A6700, 0xFF887E00, 0xFF869500,
-	0xFF84AC00, 0xFF82C300, 0xFF80DA00,
-	0xFF7EF100, 0xFF7D0800, 0xFF7B1F00,
-	0xFF793600, 0xFF774D00, 0xFF756400,
-	0xFF737B00, 0xFF719200, 0xFF6FA900,
-	0xFF6DC000, 0xFF6BD700, 0xFF69EE00,
-	0xFF680500, 0xFF661C00, 0xFF643300,
-	0xFF624A00, 0xFF606100, 0xFF5E7800,
-	0xFF5C8F00, 0xFF5AA600, 0xFF58BD00,
-	0xFF56D400, 0xFF54EB00, 0xFF530200,
-	0xFF511900, 0xFF4F3000, 0xFF4D4700,
-	0xFF4B5E00, 0xFF497500, 0xFF478C00,
-	0xFF45A300, 0xFF43BA00, 0xFF41D100,
-	0xFF3FE800, 0xFF3DFF00, 0xFF3C1600,
-	0xFF3A2D00, 0xFF384400, 0xFF365B00,
-	0xFF347200, 0xFF328900, 0xFF30A000,
-	0xFF2EB700, 0xFF2CCE00, 0xFF2AE500,
-	0xFF28FC00, 0xFF271300, 0xFF252A00,
-	0xFF234100, 0xFF215800, 0xFF1F6F00,
-	0xFF1D8600, 0xFF1B9D00, 0xFF19B400,
-	0xFF17CB00, 0xFF15E200, 0xFF13F900,
-	0xFF121000, 0xFF102700, 0xFF0E3E00,
-	0xFF0C5500, 0xFF0A6C00, 0xFF088300,
-	0xFF069A00, 0xFF04B100, 0xFF02C800,
-	0xFF00DF00, 0xFEFEF600, 0xFEFD0D00,
-	0xFEFB2400, 0xFEF93B00, 0xFEF75200,
-	0xFEF56900, 0xFEF38000, 0xFEF19700,
-	0xFEEFAE00, 0xFEEDC500, 0xFEEBDC00,
-	0xFEE9F300, 0xFEE80A00, 0xFEE62100,
-	0xFEE43800, 0xFEE24F00, 0xFEE06600,
-	0xFEDE7D00, 0xFEDC9400, 0xFEDAAB00,
-	0xFED8C200, 0xFED6D900, 0xFED4F000,
-	0xFED30700, 0xFED11E00, 0xFECF3500,
-	0xFECD4C00, 0xFECB6300, 0xFEC97A00,
-	0xFEC79100, 0xFEC5A800, 0xFEC3BF00,
-	0xFEC1D600, 0xFEBFED00, 0xFEBE0400,
-	0xFEBC1B00, 0xFEBA3200, 0xFEB84900,
-	0xFEB66000, 0xFEB47700, 0xFEB28E00,
-	0xFEB0A500, 0xFEAEBC00, 0xFEACD300,
-	0xFEAAEA00, 0xFEA90100, 0xFEA71800,
-	0xFEA52F00, 0xFEA34600, 0xFEA15D00,
-	0xFE9F7400, 0xFE9D8B00, 0xFE9BA200,
-	0xFE99B900, 0xFE97D000, 0xFE95E700,
-	0xFE93FE00, 0xFE921500, 0xFE902C00,
-	0xFE8E4300, 0xFE8C5A00, 0xFE8A7100,
-	0xFE888800, 0xFE869F00, 0xFE84B600,
-	0xFE82CD00, 0xFE80E400, 0xFE7EFB00,
-	0xFE7D1200, 0xFE7B2900, 0xFE794000,
-	0xFE775700, 0xFE756E00, 0xFE738500,
-	0xFE719C00, 0xFE6FB300, 0xFE6DCA00,
-	0xFE6BE100, 0xFE69F800, 0xFE680F00,
-	0xFE662600, 0xFE643D00, 0xFE625400,
-	0xFE606B00, 0xFE5E8200, 0xFE5C9900,
-	0xFE5AB000, 0xFE58C700, 0xFE56DE00,
-	0xFE54F500, 0xFE530C00, 0xFE512300,
-	0xFE4F3A00, 0xFE4D5100, 0xFE4B6800,
-	0xFE497F00, 0xFE479600, 0xFE45AD00,
-	0xFE43C400, 0xFE41DB00, 0xFE3FF200,
-	0xFE3E0900, 0xFE3C2000, 0xFE3A3700,
-	0xFE384E00, 0xFE366500, 0xFE347C00,
-	0xFE329300, 0xFE30AA00, 0xFE2EC100,
-	0xFE2CD800, 0xFE2AEF00, 0xFE290600,
-	0xFE271D00, 0xFE253400, 0xFE234B00,
-	0xFE216200, 0xFE1F7900, 0xFE1D9000,
-	0xFE1BA700, 0xFE19BE00, 0xFE17D500,
-	0xFE15EC00, 0xFE140300, 0xFE121A00,
-	0xFE103100, 0xFE0E4800, 0xFE0C5F00,
-	0xFE0A7600, 0xFE088D00, 0xFE06A400,
-	0xFE04BB00, 0xFE02D200, 0xFE00E900,
-	0xFDFF0000, 0xFDFD1700, 0xFDFB2E00,
-	0xFDF94500, 0xFDF75C00, 0xFDF57300,
-	0xFDF38A00, 0xFDF1A100, 0xFDEFB800,
-	0xFDEDCF00, 0xFDEBE600, 0xFDE9FD00,
-	0xFDE81400, 0xFDE62B00, 0xFDE44200,
-	0xFDE25900, 0xFDE07000, 0xFDDE8700,
-	0xFDDC9E00, 0xFDDAB500, 0xFDD8CC00,
-	0xFDD6E300, 0xFDD4FA00, 0xFDD31100,
-	0xFDD12800, 0xFDCF3F00, 0xFDCD5600,
-	0xFDCB6D00, 0xFDC98400, 0xFDC79B00,
-	0xFDC5B200, 0xFDC3C900, 0xFDC1E000,
-	0xFDBFF700, 0xFDBE0E00, 0xFDBC2500,
-	0xFDBA3C00, 0xFDB85300, 0xFDB66A00,
-	0xFDB48100, 0xFDB29800, 0xFDB0AF00,
-	0xFDAEC600, 0xFDACDD00, 0xFDAAF400,
-	0xFDA90B00, 0xFDA72200, 0xFDA53900,
-	0xFDA35000, 0xFDA16700, 0xFD9F7E00,
-	0xFD9D9500, 0xFD9BAC00, 0xFD99C300,
-	0xFD97DA00, 0xFD95F100, 0xFD940800,
-	0xFD921F00, 0xFD903600, 0xFD8E4D00,
-	0xFD8C6400, 0xFD8A7B00, 0xFD889200,
-	0xFD86A900, 0xFD84C000, 0xFD82D700,
-	0xFD80EE00, 0xFD7F0500, 0xFD7D1C00,
-	0xFD7B3300, 0xFD794A00, 0xFD776100,
-	0xFD757800, 0xFD738F00, 0xFD71A600,
-	0xFD6FBD00, 0xFD6DD400, 0xFD6BEB00,
-	0xFD6A0200, 0xFD681900, 0xFD663000,
-	0xFD644700, 0xFD625E00, 0xFD607500,
-	0xFD5E8C00, 0xFD5CA300, 0xFD5ABA00,
-	0xFD58D100, 0xFD56E800, 0xFD54FF00,
-	0xFD531600, 0xFD512D00, 0xFD4F4400,
-	0xFD4D5B00, 0xFD4B7200, 0xFD498900,
-	0xFD47A000, 0xFD45B700, 0xFD43CE00,
-	0xFD41E500, 0xFD3FFC00, 0xFD3E1300,
-	0xFD3C2A00, 0xFD3A4100, 0xFD385800,
-	0xFD366F00, 0xFD348600, 0xFD329D00,
-	0xFD30B400, 0xFD2ECB00, 0xFD2CE200,
-	0xFD2AF900, 0xFD291000, 0xFD272700,
-	0xFD253E00, 0xFD235500, 0xFD216C00,
-	0xFD1F8300, 0xFD1D9A00, 0xFD1BB100,
-	0xFD19C800, 0xFD17DF00, 0xFD15F600,
-	0xFD140D00, 0xFD122400, 0xFD103B00,
-	0xFD0E5200, 0xFD0C6900, 0xFD0A8000,
-	0xFD089700, 0xFD06AE00, 0xFD04C500,
-	0xFD02DC00, 0xFD00F300, 0xFCFF0A00,
-	0xFCFD2100, 0xFCFB3800, 0xFCF94F00,
-	0xFCF76600, 0xFCF57D00, 0xFCF39400,
-	0xFCF1AB00, 0xFCEFC200, 0xFCEDD900,
-	0xFCEBF000, 0xFCEA0700, 0xFCE81E00,
-	0xFCE63500, 0xFCE44C00, 0xFCE26300,
-	0xFCE07A00, 0xFCDE9100, 0xFCDCA800,
-	0xFCDABF00, 0xFCD8D600, 0xFCD6ED00,
-	0xFCD50400, 0xFCD31B00, 0xFCD13200,
-	0xFCCF4900, 0xFCCD6000, 0xFCCB7700,
-	0xFCC98E00, 0xFCC7A500, 0xFCC5BC00,
-	0xFCC3D300, 0xFCC1EA00, 0xFCC00100,
-	0xFCBE1800, 0xFCBC2F00, 0xFCBA4600,
-	0xFCB85D00, 0xFCB67400, 0xFCB48B00,
-	0xFCB2A200, 0xFCB0B900, 0xFCAED000,
-	0xFCACE700, 0xFCAAFE00, 0xFCA91500,
-	0xFCA72C00, 0xFCA54300, 0xFCA35A00,
-	0xFCA17100, 0xFC9F8800, 0xFC9D9F00,
-	0xFC9BB600, 0xFC99CD00, 0xFC97E400,
-	0xFC95FB00, 0xFC941200, 0xFC922900,
-	0xFC904000, 0xFC8E5700, 0xFC8C6E00,
-	0xFC8A8500, 0xFC889C00, 0xFC86B300,
-	0xFC84CA00, 0xFC82E100, 0xFC80F800,
-	0xFC7F0F00, 0xFC7D2600, 0xFC7B3D00,
-	0xFC795400, 0xFC776B00, 0xFC758200,
-	0xFC739900, 0xFC71B000, 0xFC6FC700,
-	0xFC6DDE00, 0xFC6BF500, 0xFC6A0C00,
-	0xFC682300, 0xFC663A00, 0xFC645100,
-	0xFC626800, 0xFC607F00, 0xFC5E9600,
-	0xFC5CAD00, 0xFC5AC400, 0xFC58DB00,
-	0xFC56F200, 0xFC550900, 0xFC532000,
-	0xFC513700, 0xFC4F4E00, 0xFC4D6500,
-	0xFC4B7C00, 0xFC499300, 0xFC47AA00,
-	0xFC45C100, 0xFC43D800, 0xFC41EF00,
-	0xFC400600, 0xFC3E1D00, 0xFC3C3400,
-	0xFC3A4B00, 0xFC386200, 0xFC367900,
-	0xFC349000, 0xFC32A700, 0xFC30BE00,
-	0xFC2ED500, 0xFC2CEC00, 0xFC2B0300,
-	0xFC291A00, 0xFC273100, 0xFC254800,
-	0xFC235F00, 0xFC217600, 0xFC1F8D00,
-	0xFC1DA400, 0xFC1BBB00, 0xFC19D200,
-	0xFC17E900, 0xFC160000, 0xFC141700,
-	0xFC122E00, 0xFC104500, 0xFC0E5C00,
-	0xFC0C7300, 0xFC0A8A00, 0xFC08A100,
-	0xFC06B800, 0xFC04CF00, 0xFC02E600,
-	0xFC00FD00, 0xFBFF1400, 0xFBFD2B00,
-	0xFBFB4200, 0xFBF95900, 0xFBF77000,
-	0xFBF58700, 0xFBF39E00, 0xFBF1B500,
-	0xFBEFCC00, 0xFBEDE300, 0xFBEBFA00,
-	0xFBEA1100, 0xFBE82800, 0xFBE63F00,
-	0xFBE45600, 0xFBE26D00, 0xFBE08400,
-	0xFBDE9B00, 0xFBDCB200, 0xFBDAC900,
-	0xFBD8E000, 0xFBD6F700, 0xFBD50E00,
-	0xFBD32500, 0xFBD13C00, 0xFBCF5300,
-	0xFBCD6A00, 0xFBCB8100, 0xFBC99800,
-	0xFBC7AF00, 0xFBC5C600, 0xFBC3DD00,
-	0xFBC1F400, 0xFBC00B00, 0xFBBE2200,
-	0xFBBC3900, 0xFBBA5000, 0xFBB86700,
-	0xFBB67E00, 0xFBB49500, 0xFBB2AC00,
-	0xFBB0C300, 0xFBAEDA00, 0xFBACF100,
-	0xFBAB0800, 0xFBA91F00, 0xFBA73600,
-	0xFBA54D00, 0xFBA36400, 0xFBA17B00,
-	0xFB9F9200, 0xFB9DA900, 0xFB9BC000,
-	0xFB99D700, 0xFB97EE00, 0xFB960500,
-	0xFB941C00, 0xFB923300, 0xFB904A00,
-	0xFB8E6100, 0xFB8C7800, 0xFB8A8F00,
-	0xFB88A600, 0xFB86BD00, 0xFB84D400,
-	0xFB82EB00, 0xFB810200, 0xFB7F1900,
-	0xFB7D3000, 0xFB7B4700, 0xFB795E00,
-	0xFB777500, 0xFB758C00, 0xFB73A300,
-	0xFB71BA00, 0xFB6FD100, 0xFB6DE800,
-	0xFB6BFF00, 0xFB6A1600, 0xFB682D00,
-	0xFB664400, 0xFB645B00, 0xFB627200,
-	0xFB608900, 0xFB5EA000, 0xFB5CB700,
-	0xFB5ACE00, 0xFB58E500, 0xFB56FC00,
-	0xFB551300, 0xFB532A00, 0xFB514100,
-	0xFB4F5800, 0xFB4D6F00, 0xFB4B8600,
-	0xFB499D00, 0xFB47B400, 0xFB45CB00,
-	0xFB43E200, 0xFB41F900, 0xFB401000,
-	0xFB3E2700, 0xFB3C3E00, 0xFB3A5500,
-	0xFB386C00, 0xFB368300, 0xFB349A00,
-	0xFB32B100, 0xFB30C800, 0xFB2EDF00,
-	0xFB2CF600, 0xFB2B0D00, 0xFB292400,
-	0xFB273B00, 0xFB255200, 0xFB236900,
-	0xFB218000, 0xFB1F9700, 0xFB1DAE00,
-	0xFB1BC500, 0xFB19DC00, 0xFB17F300,
-	0xFB160A00, 0xFB142100, 0xFB123800,
-	0xFB104F00, 0xFB0E6600, 0xFB0C7D00,
-	0xFB0A9400, 0xFB08AB00, 0xFB06C200,
-	0xFB04D900, 0xFB02F000, 0xFB010700,
-	0xFAFF1E00, 0xFAFD3500, 0xFAFB4C00,
-	0xFAF96300, 0xFAF77A00, 0xFAF59100,
-	0xFAF3A800, 0xFAF1BF00, 0xFAEFD600,
-	0xFAEDED00, 0xFAEC0400, 0xFAEA1B00,
-	0xFAE83200, 0xFAE64900, 0xFAE46000,
-	0xFAE27700, 0xFAE08E00, 0xFADEA500,
-	0xFADCBC00, 0xFADAD300, 0xFAD8EA00,
-	0xFAD70100, 0xFAD51800, 0xFAD32F00,
-	0xFAD14600, 0xFACF5D00, 0xFACD7400,
-	0xFACB8B00, 0xFAC9A200, 0xFAC7B900,
-	0xFAC5D000, 0xFAC3E700, 0xFAC1FE00,
-	0xFAC01500, 0xFABE2C00, 0xFABC4300,
-	0xFABA5A00, 0xFAB87100, 0xFAB68800,
-	0xFAB49F00, 0xFAB2B600, 0xFAB0CD00,
-	0xFAAEE400, 0xFAACFB00, 0xFAAB1200,
-	0xFAA92900, 0xFAA74000, 0xFAA55700,
-	0xFAA36E00, 0xFAA18500, 0xFA9F9C00,
-	0xFA9DB300, 0xFA9BCA00, 0xFA99E100,
-	0xFA97F800, 0xFA960F00, 0xFA942600,
-	0xFA923D00, 0xFA905400, 0xFA8E6B00,
-	0xFA8C8200, 0xFA8A9900, 0xFA88B000,
-	0xFA86C700, 0xFA84DE00, 0xFA82F500,
-	0xFA810C00, 0xFA7F2300, 0xFA7D3A00,
-	0xFA7B5100, 0xFA796800, 0xFA777F00,
-	0xFA759600, 0xFA73AD00, 0xFA71C400,
-	0xFA6FDB00, 0xFA6DF200, 0xFA6C0900,
-	0xFA6A2000, 0xFA683700, 0xFA664E00,
-	0xFA646500, 0xFA627C00, 0xFA609300,
-	0xFA5EAA00, 0xFA5CC100, 0xFA5AD800,
-	0xFA58EF00, 0xFA570600, 0xFA551D00,
-	0xFA533400, 0xFA514B00, 0xFA4F6200,
-	0xFA4D7900, 0xFA4B9000, 0xFA49A700,
-	0xFA47BE00, 0xFA45D500, 0xFA43EC00,
-	0xFA420300, 0xFA401A00, 0xFA3E3100,
-	0xFA3C4800, 0xFA3A5F00, 0xFA387600,
-	0xFA368D00, 0xFA34A400, 0xFA32BB00,
-	0xFA30D200, 0xFA2EE900, 0xFA2D0000,
-	0xFA2B1700, 0xFA292E00, 0xFA274500,
-	0xFA255C00, 0xFA237300, 0xFA218A00,
-	0xFA1FA100, 0xFA1DB800, 0xFA1BCF00,
-	0xFA19E600, 0xFA17FD00, 0xFA161400,
-	0xFA142B00, 0xFA124200, 0xFA105900,
-	0xFA0E7000, 0xFA0C8700, 0xFA0A9E00,
-	0xFA08B500, 0xFA06CC00, 0xFA04E300,
-	0xFA02FA00, 0xFA011100, 0xF9FF2800,
-	0xF9FD3F00, 0xF9FB5600, 0xF9F96D00,
-	0xF9F78400, 0xF9F59B00, 0xF9F3B200,
-	0xF9F1C900, 0xF9EFE000, 0xF9EDF700,
-	0xF9EC0E00, 0xF9EA2500, 0xF9E83C00,
-	0xF9E65300, 0xF9E46A00, 0xF9E28100,
-	0xF9E09800, 0xF9DEAF00, 0xF9DCC600,
-	0xF9DADD00, 0xF9D8F400, 0xF9D70B00,
-	0xF9D52200, 0xF9D33900, 0xF9D15000,
-	0xF9CF6700, 0xF9CD7E00, 0xF9CB9500,
-	0xF9C9AC00, 0xF9C7C300, 0xF9C5DA00,
-	0xF9C3F100, 0xF9C20800, 0xF9C01F00,
-	0xF9BE3600, 0xF9BC4D00, 0xF9BA6400,
-	0xF9B87B00, 0xF9B69200, 0xF9B4A900,
-	0xF9B2C000, 0xF9B0D700, 0xF9AEEE00,
-	0xF9AD0500, 0xF9AB1C00, 0xF9A93300,
-	0xF9A74A00, 0xF9A56100, 0xF9A37800,
-	0xF9A18F00, 0xF99FA600, 0xF99DBD00,
-	0xF99BD400, 0xF999EB00, 0xF9980200,
-	0xF9961900, 0xF9943000, 0xF9924700,
-	0xF9905E00, 0xF98E7500, 0xF98C8C00,
-	0xF98AA300, 0xF988BA00, 0xF986D100,
-	0xF984E800, 0xF982FF00, 0xF9811600,
-	0xF97F2D00, 0xF97D4400, 0xF97B5B00,
-	0xF9797200, 0xF9778900, 0xF975A000,
-	0xF973B700, 0xF971CE00, 0xF96FE500,
-	0xF96DFC00, 0xF96C1300, 0xF96A2A00,
-	0xF9684100, 0xF9665800, 0xF9646F00,
-	0xF9628600, 0xF9609D00, 0xF95EB400,
-	0xF95CCB00, 0xF95AE200, 0xF958F900,
-	0xF9571000, 0xF9552700, 0xF9533E00,
-	0xF9515500, 0xF94F6C00, 0xF94D8300,
-	0xF94B9A00, 0xF949B100, 0xF947C800,
-	0xF945DF00, 0xF943F600, 0xF9420D00,
-	0xF9402400, 0xF93E3B00, 0xF93C5200,
-	0xF93A6900, 0xF9388000, 0xF9369700,
-	0xF934AE00, 0xF932C500, 0xF930DC00,
-	0xF92EF300, 0xF92D0A00, 0xF92B2100,
-	0xF9293800, 0xF9274F00, 0xF9256600,
-	0xF9237D00, 0xF9219400, 0xF91FAB00,
-	0xF91DC200, 0xF91BD900, 0xF919F000,
-	0xF9180700, 0xF9161E00, 0xF9143500,
-	0xF9124C00, 0xF9106300, 0xF90E7A00,
-	0xF90C9100, 0xF90AA800, 0xF908BF00,
-	0xF906D600, 0xF904ED00, 0xF9030400,
-	0xF9011B00, 0xF8FF3200, 0xF8FD4900,
-	0xF8FB6000, 0xF8F97700, 0xF8F78E00,
-	0xF8F5A500, 0xF8F3BC00, 0xF8F1D300,
-	0xF8EFEA00, 0xF8EE0100, 0xF8EC1800,
-	0xF8EA2F00, 0xF8E84600, 0xF8E65D00,
-	0xF8E47400, 0xF8E28B00, 0xF8E0A200,
-	0xF8DEB900, 0xF8DCD000, 0xF8DAE700,
-	0xF8D8FE00, 0xF8D71500, 0xF8D52C00,
-	0xF8D34300, 0xF8D15A00, 0xF8CF7100,
-	0xF8CD8800, 0xF8CB9F00, 0xF8C9B600,
-	0xF8C7CD00, 0xF8C5E400, 0xF8C3FB00,
-	0xF8C21200, 0xF8C02900, 0xF8BE4000,
-	0xF8BC5700, 0xF8BA6E00, 0xF8B88500,
-	0xF8B69C00, 0xF8B4B300, 0xF8B2CA00,
-	0xF8B0E100, 0xF8AEF800, 0xF8AD0F00,
-	0xF8AB2600, 0xF8A93D00, 0xF8A75400,
-	0xF8A56B00, 0xF8A38200, 0xF8A19900,
-	0xF89FB000, 0xF89DC700, 0xF89BDE00,
-	0xF899F500, 0xF8980C00, 0xF8962300,
-	0xF8943A00, 0xF8925100, 0xF8906800,
-	0xF88E7F00, 0xF88C9600, 0xF88AAD00,
-	0xF888C400, 0xF886DB00, 0xF884F200,
-	0xF8830900, 0xF8812000, 0xF87F3700,
-	0xF87D4E00, 0xF87B6500, 0xF8797C00,
-	0xF8779300, 0xF875AA00, 0xF873C100,
-	0xF871D800, 0xF86FEF00, 0xF86E0600,
-	0xF86C1D00, 0xF86A3400, 0xF8684B00,
-	0xF8666200, 0xF8647900, 0xF8629000,
-	0xF860A700, 0xF85EBE00, 0xF85CD500,
-	0xF85AEC00, 0xF8590300, 0xF8571A00,
-	0xF8553100, 0xF8534800, 0xF8515F00,
-	0xF84F7600, 0xF84D8D00, 0xF84BA400,
-	0xF849BB00, 0xF847D200, 0xF845E900,
-	0xF8440000, 0xF8421700, 0xF8402E00,
-	0xF83E4500, 0xF83C5C00, 0xF83A7300,
-	0xF8388A00, 0xF836A100, 0xF834B800,
-	0xF832CF00, 0xF830E600, 0xF82EFD00,
-	0xF82D1400, 0xF82B2B00, 0xF8294200,
-	0xF8275900, 0xF8257000, 0xF8238700,
-	0xF8219E00, 0xF81FB500, 0xF81DCC00,
-	0xF81BE300, 0xF819FA00, 0xF8181100,
-	0xF8162800, 0xF8143F00, 0xF8125600,
-	0xF8106D00, 0xF80E8400, 0xF80C9B00,
-	0xF80AB200, 0xF808C900, 0xF806E000,
-	0xF804F700, 0xF8030E00, 0xF8012500,
-	0xF7FF3C00, 0xF7FD5300, 0xF7FB6A00,
-	0xF7F98100, 0xF7F79800, 0xF7F5AF00,
-	0xF7F3C600, 0xF7F1DD00, 0xF7EFF400,
-	0xF7EE0B00, 0xF7EC2200, 0xF7EA3900,
-	0xF7E85000, 0xF7E66700, 0xF7E47E00,
-	0xF7E29500, 0xF7E0AC00, 0xF7DEC300,
-	0xF7DCDA00, 0xF7DAF100, 0xF7D90800,
-	0xF7D71F00, 0xF7D53600, 0xF7D34D00,
-	0xF7D16400, 0xF7CF7B00, 0xF7CD9200,
-	0xF7CBA900, 0xF7C9C000, 0xF7C7D700,
-	0xF7C5EE00, 0xF7C40500, 0xF7C21C00,
-	0xF7C03300, 0xF7BE4A00, 0xF7BC6100,
-	0xF7BA7800, 0xF7B88F00, 0xF7B6A600,
-	0xF7B4BD00, 0xF7B2D400, 0xF7B0EB00,
-	0xF7AF0200, 0xF7AD1900, 0xF7AB3000,
-	0xF7A94700, 0xF7A75E00, 0xF7A57500,
-	0xF7A38C00, 0xF7A1A300, 0xF79FBA00,
-	0xF79DD100, 0xF79BE800, 0xF799FF00,
-	0xF7981600, 0xF7962D00, 0xF7944400,
-	0xF7925B00, 0xF7907200, 0xF78E8900,
-	0xF78CA000, 0xF78AB700, 0xF788CE00,
-	0xF786E500, 0xF784FC00, 0xF7831300,
-	0xF7812A00, 0xF77F4100, 0xF77D5800,
-	0xF77B6F00, 0xF7798600, 0xF7779D00,
-	0xF775B400, 0xF773CB00, 0xF771E200,
-	0xF76FF900, 0xF76E1000, 0xF76C2700,
-	0xF76A3E00, 0xF7685500, 0xF7666C00,
-	0xF7648300, 0xF7629A00, 0xF760B100,
-	0xF75EC800, 0xF75CDF00, 0xF75AF600,
-	0xF7590D00, 0xF7572400, 0xF7553B00,
-	0xF7535200, 0xF7516900, 0xF74F8000,
-	0xF74D9700, 0xF74BAE00, 0xF749C500,
-	0xF747DC00, 0xF745F300, 0xF7440A00,
-	0xF7422100, 0xF7403800, 0xF73E4F00,
-	0xF73C6600, 0xF73A7D00, 0xF7389400,
-	0xF736AB00, 0xF734C200, 0xF732D900,
-	0xF730F000, 0xF72F0700, 0xF72D1E00,
-	0xF72B3500, 0xF7294C00, 0xF7276300,
-	0xF7257A00, 0xF7239100, 0xF721A800,
-	0xF71FBF00, 0xF71DD600, 0xF71BED00,
-	0xF71A0400, 0xF7181B00, 0xF7163200,
-	0xF7144900, 0xF7126000, 0xF7107700,
-	0xF70E8E00, 0xF70CA500, 0xF70ABC00,
-	0xF708D300, 0xF706EA00, 0xF7050100,
-	0xF7031800, 0xF7012F00, 0xF6FF4600,
-	0xF6FD5D00, 0xF6FB7400, 0xF6F98B00,
-	0xF6F7A200, 0xF6F5B900, 0xF6F3D000,
-	0xF6F1E700, 0xF6EFFE00, 0xF6EE1500,
-	0xF6EC2C00, 0xF6EA4300, 0xF6E85A00,
-	0xF6E67100, 0xF6E48800, 0xF6E29F00,
-	0xF6E0B600, 0xF6DECD00, 0xF6DCE400,
-	0xF6DAFB00, 0xF6D91200, 0xF6D72900,
-	0xF6D54000, 0xF6D35700, 0xF6D16E00,
-	0xF6CF8500, 0xF6CD9C00, 0xF6CBB300,
-	0xF6C9CA00, 0xF6C7E100, 0xF6C5F800,
-	0xF6C40F00, 0xF6C22600, 0xF6C03D00,
-	0xF6BE5400, 0xF6BC6B00, 0xF6BA8200,
-	0xF6B89900, 0xF6B6B000, 0xF6B4C700,
-	0xF6B2DE00, 0xF6B0F500, 0xF6AF0C00,
-	0xF6AD2300, 0xF6AB3A00, 0xF6A95100,
-	0xF6A76800, 0xF6A57F00, 0xF6A39600,
-	0xF6A1AD00, 0xF69FC400, 0xF69DDB00,
-	0xF69BF200, 0xF69A0900, 0xF6982000,
-	0xF6963700, 0xF6944E00, 0xF6926500,
-	0xF6907C00, 0xF68E9300, 0xF68CAA00,
-	0xF68AC100, 0xF688D800, 0xF686EF00,
-	0xF6850600, 0xF6831D00, 0xF6813400,
-	0xF67F4B00, 0xF67D6200, 0xF67B7900,
-	0xF6799000, 0xF677A700, 0xF675BE00,
-	0xF673D500, 0xF671EC00, 0xF6700300,
-	0xF66E1A00, 0xF66C3100, 0xF66A4800,
-	0xF6685F00, 0xF6667600, 0xF6648D00,
-	0xF662A400, 0xF660BB00, 0xF65ED200,
-	0xF65CE900, 0xF65B0000, 0xF6591700,
-	0xF6572E00, 0xF6554500, 0xF6535C00,
-	0xF6517300, 0xF64F8A00, 0xF64DA100,
-	0xF64BB800, 0xF649CF00, 0xF647E600,
-	0xF645FD00, 0xF6441400, 0xF6422B00,
-	0xF6404200, 0xF63E5900, 0xF63C7000,
-	0xF63A8700, 0xF6389E00, 0xF636B500,
-	0xF634CC00, 0xF632E300, 0xF630FA00,
-	0xF62F1100, 0xF62D2800, 0xF62B3F00,
-	0xF6295600, 0xF6276D00, 0xF6258400,
-	0xF6239B00, 0xF621B200, 0xF61FC900,
-	0xF61DE000, 0xF61BF700, 0xF61A0E00,
-	0xF6182500, 0xF6163C00, 0xF6145300,
-	0xF6126A00, 0xF6108100, 0xF60E9800,
-	0xF60CAF00, 0xF60AC600, 0xF608DD00,
-	0xF606F400, 0xF6050B00, 0xF6032200,
-	0xF6013900, 0xF5FF5000, 0xF5FD6700,
-	0xF5FB7E00, 0xF5F99500, 0xF5F7AC00,
-	0xF5F5C300, 0xF5F3DA00, 0xF5F1F100,
-	0xF5F00800, 0xF5EE1F00, 0xF5EC3600,
-	0xF5EA4D00, 0xF5E86400, 0xF5E67B00,
-	0xF5E49200, 0xF5E2A900, 0xF5E0C000,
-	0xF5DED700, 0xF5DCEE00, 0xF5DB0500,
-	0xF5D91C00, 0xF5D73300, 0xF5D54A00,
-	0xF5D36100, 0xF5D17800, 0xF5CF8F00,
-	0xF5CDA600, 0xF5CBBD00, 0xF5C9D400,
-	0xF5C7EB00, 0xF5C60200, 0xF5C41900,
-	0xF5C23000, 0xF5C04700, 0xF5BE5E00,
-	0xF5BC7500, 0xF5BA8C00, 0xF5B8A300,
-	0xF5B6BA00, 0xF5B4D100, 0xF5B2E800,
-	0xF5B0FF00, 0xF5AF1600, 0xF5AD2D00,
-	0xF5AB4400, 0xF5A95B00, 0xF5A77200,
-	0xF5A58900, 0xF5A3A000, 0xF5A1B700,
-	0xF59FCE00, 0xF59DE500, 0xF59BFC00,
-	0xF59A1300, 0xF5982A00, 0xF5964100,
-	0xF5945800, 0xF5926F00, 0xF5908600,
-	0xF58E9D00, 0xF58CB400, 0xF58ACB00,
-	0xF588E200, 0xF586F900, 0xF5851000,
-	0xF5832700, 0xF5813E00, 0xF57F5500,
-	0xF57D6C00, 0xF57B8300, 0xF5799A00,
-	0xF577B100, 0xF575C800, 0xF573DF00,
-	0xF571F600, 0xF5700D00, 0xF56E2400,
-	0xF56C3B00, 0xF56A5200, 0xF5686900,
-	0xF5668000, 0xF5649700, 0xF562AE00,
-	0xF560C500, 0xF55EDC00, 0xF55CF300,
-	0xF55B0A00, 0xF5592100, 0xF5573800,
-	0xF5554F00, 0xF5536600, 0xF5517D00,
-	0xF54F9400, 0xF54DAB00, 0xF54BC200,
-	0xF549D900, 0xF547F000, 0xF5460700,
-	0xF5441E00, 0xF5423500, 0xF5404C00,
-	0xF53E6300, 0xF53C7A00, 0xF53A9100,
-	0xF538A800, 0xF536BF00, 0xF534D600,
-	0xF532ED00, 0xF5310400, 0xF52F1B00,
-	0xF52D3200, 0xF52B4900, 0xF5296000,
-	0xF5277700, 0xF5258E00, 0xF523A500,
-	0xF521BC00, 0xF51FD300, 0xF51DEA00,
-	0xF51C0100, 0xF51A1800, 0xF5182F00,
-	0xF5164600, 0xF5145D00, 0xF5127400,
-	0xF5108B00, 0xF50EA200, 0xF50CB900,
-	0xF50AD000, 0xF508E700, 0xF506FE00,
-	0xF5051500, 0xF5032C00, 0xF5014300,
-	0xF4FF5A00, 0xF4FD7100, 0xF4FB8800,
-	0xF4F99F00, 0xF4F7B600, 0xF4F5CD00,
-	0xF4F3E400, 0xF4F1FB00, 0xF4F01200,
-	0xF4EE2900, 0xF4EC4000, 0xF4EA5700,
-	0xF4E86E00, 0xF4E68500, 0xF4E49C00,
-	0xF4E2B300, 0xF4E0CA00, 0xF4DEE100,
-	0xF4DCF800, 0xF4DB0F00, 0xF4D92600,
-	0xF4D73D00, 0xF4D55400, 0xF4D36B00,
-	0xF4D18200, 0xF4CF9900, 0xF4CDB000,
-	0xF4CBC700, 0xF4C9DE00, 0xF4C7F500,
-	0xF4C60C00, 0xF4C42300, 0xF4C23A00,
-	0xF4C05100, 0xF4BE6800, 0xF4BC7F00,
-	0xF4BA9600, 0xF4B8AD00, 0xF4B6C400,
-	0xF4B4DB00, 0xF4B2F200, 0xF4B10900,
-	0xF4AF2000, 0xF4AD3700, 0xF4AB4E00,
-	0xF4A96500, 0xF4A77C00, 0xF4A59300,
-	0xF4A3AA00, 0xF4A1C100, 0xF49FD800,
-	0xF49DEF00, 0xF49C0600, 0xF49A1D00,
-	0xF4983400, 0xF4964B00, 0xF4946200,
-	0xF4927900, 0xF4909000, 0xF48EA700,
-	0xF48CBE00, 0xF48AD500, 0xF488EC00,
-	0xF4870300, 0xF4851A00, 0xF4833100,
-	0xF4814800, 0xF47F5F00, 0xF47D7600,
-	0xF47B8D00, 0xF479A400, 0xF477BB00,
-	0xF475D200, 0xF473E900, 0xF4720000,
-	0xF4701700, 0xF46E2E00, 0xF46C4500,
-	0xF46A5C00, 0xF4687300, 0xF4668A00,
-	0xF464A100, 0xF462B800, 0xF460CF00,
-	0xF45EE600, 0xF45CFD00, 0xF45B1400,
-	0xF4592B00, 0xF4574200, 0xF4555900,
-	0xF4537000, 0xF4518700, 0xF44F9E00,
-	0xF44DB500, 0xF44BCC00, 0xF449E300,
-	0xF447FA00, 0xF4461100, 0xF4442800,
-	0xF4423F00, 0xF4405600, 0xF43E6D00,
-	0xF43C8400, 0xF43A9B00, 0xF438B200,
-	0xF436C900, 0xF434E000, 0xF432F700,
-	0xF4310E00, 0xF42F2500, 0xF42D3C00,
-	0xF42B5300, 0xF4296A00, 0xF4278100,
-	0xF4259800, 0xF423AF00, 0xF421C600,
-	0xF41FDD00, 0xF41DF400, 0xF41C0B00,
-	0xF41A2200, 0xF4183900, 0xF4165000,
-	0xF4146700, 0xF4127E00, 0xF4109500,
-	0xF40EAC00, 0xF40CC300, 0xF40ADA00,
-	0xF408F100, 0xF4070800, 0xF4051F00,
-	0xF4033600, 0xF4014D00, 0xF3FF6400,
-	0xF3FD7B00, 0xF3FB9200, 0xF3F9A900,
-	0xF3F7C000, 0xF3F5D700, 0xF3F3EE00,
-	0xF3F20500, 0xF3F01C00, 0xF3EE3300,
-	0xF3EC4A00, 0xF3EA6100, 0xF3E87800,
-	0xF3E68F00, 0xF3E4A600, 0xF3E2BD00,
-	0xF3E0D400, 0xF3DEEB00, 0xF3DD0200,
-	0xF3DB1900, 0xF3D93000, 0xF3D74700,
-	0xF3D55E00, 0xF3D37500, 0xF3D18C00,
-	0xF3CFA300, 0xF3CDBA00, 0xF3CBD100,
-	0xF3C9E800, 0xF3C7FF00, 0xF3C61600,
-	0xF3C42D00, 0xF3C24400, 0xF3C05B00,
-	0xF3BE7200, 0xF3BC8900, 0xF3BAA000,
-	0xF3B8B700, 0xF3B6CE00, 0xF3B4E500,
-	0xF3B2FC00, 0xF3B11300, 0xF3AF2A00,
-	0xF3AD4100, 0xF3AB5800, 0xF3A96F00,
-	0xF3A78600, 0xF3A59D00, 0xF3A3B400,
-	0xF3A1CB00, 0xF39FE200, 0xF39DF900,
-	0xF39C1000, 0xF39A2700, 0xF3983E00,
-	0xF3965500, 0xF3946C00, 0xF3928300,
-	0xF3909A00, 0xF38EB100, 0xF38CC800,
-	0xF38ADF00, 0xF388F600, 0xF3870D00,
-	0xF3852400, 0xF3833B00, 0xF3815200,
-	0xF37F6900, 0xF37D8000, 0xF37B9700,
-	0xF379AE00, 0xF377C500, 0xF375DC00,
-	0xF373F300, 0xF3720A00, 0xF3702100,
-	0xF36E3800, 0xF36C4F00, 0xF36A6600,
-	0xF3687D00, 0xF3669400, 0xF364AB00,
-	0xF362C200, 0xF360D900, 0xF35EF000,
-	0xF35D0700, 0xF35B1E00, 0xF3593500,
-	0xF3574C00, 0xF3556300, 0xF3537A00,
-	0xF3519100, 0xF34FA800, 0xF34DBF00,
-	0xF34BD600, 0xF349ED00, 0xF3480400,
-	0xF3461B00, 0xF3443200, 0xF3424900,
-	0xF3406000, 0xF33E7700, 0xF33C8E00,
-	0xF33AA500, 0xF338BC00, 0xF336D300,
-	0xF334EA00, 0xF3330100, 0xF3311800,
-	0xF32F2F00, 0xF32D4600, 0xF32B5D00,
-	0xF3297400, 0xF3278B00, 0xF325A200,
-	0xF323B900, 0xF321D000, 0xF31FE700,
-	0xF31DFE00, 0xF31C1500, 0xF31A2C00,
-	0xF3184300, 0xF3165A00, 0xF3147100,
-	0xF3128800, 0xF3109F00, 0xF30EB600,
-	0xF30CCD00, 0xF30AE400, 0xF308FB00,
-	0xF3071200, 0xF3052900, 0xF3034000,
-	0xF3015700, 0xF2FF6E00, 0xF2FD8500,
-	0xF2FB9C00, 0xF2F9B300, 0xF2F7CA00,
-	0xF2F5E100, 0xF2F3F800, 0xF2F20F00,
-	0xF2F02600, 0xF2EE3D00, 0xF2EC5400,
-	0xF2EA6B00, 0xF2E88200, 0xF2E69900,
-	0xF2E4B000, 0xF2E2C700, 0xF2E0DE00,
-	0xF2DEF500, 0xF2DD0C00, 0xF2DB2300,
-	0xF2D93A00, 0xF2D75100, 0xF2D56800,
-	0xF2D37F00, 0xF2D19600, 0xF2CFAD00,
-	0xF2CDC400, 0xF2CBDB00, 0xF2C9F200,
-	0xF2C80900, 0xF2C62000, 0xF2C43700,
-	0xF2C24E00, 0xF2C06500, 0xF2BE7C00,
-	0xF2BC9300, 0xF2BAAA00, 0xF2B8C100,
-	0xF2B6D800, 0xF2B4EF00, 0xF2B30600,
-	0xF2B11D00, 0xF2AF3400, 0xF2AD4B00,
-	0xF2AB6200, 0xF2A97900, 0xF2A79000,
-	0xF2A5A700, 0xF2A3BE00, 0xF2A1D500,
-	0xF29FEC00, 0xF29E0300, 0xF29C1A00,
-	0xF29A3100, 0xF2984800, 0xF2965F00,
-	0xF2947600, 0xF2928D00, 0xF290A400,
-	0xF28EBB00, 0xF28CD200, 0xF28AE900,
-	0xF2890000, 0xF2871700, 0xF2852E00,
-	0xF2834500, 0xF2815C00, 0xF27F7300,
-	0xF27D8A00, 0xF27BA100, 0xF279B800,
-	0xF277CF00, 0xF275E600, 0xF273FD00,
-	0xF2721400, 0xF2702B00, 0xF26E4200,
-	0xF26C5900, 0xF26A7000, 0xF2688700,
-	0xF2669E00, 0xF264B500, 0xF262CC00,
-	0xF260E300, 0xF25EFA00, 0xF25D1100,
-	0xF25B2800, 0xF2593F00, 0xF2575600,
-	0xF2556D00, 0xF2538400, 0xF2519B00,
-	0xF24FB200, 0xF24DC900, 0xF24BE000,
-	0xF249F700, 0xF2480E00, 0xF2462500,
-	0xF2443C00, 0xF2425300, 0xF2406A00,
-	0xF23E8100, 0xF23C9800, 0xF23AAF00,
-	0xF238C600, 0xF236DD00, 0xF234F400,
-	0xF2330B00, 0xF2312200, 0xF22F3900,
-	0xF22D5000, 0xF22B6700, 0xF2297E00,
-	0xF2279500, 0xF225AC00, 0xF223C300,
-	0xF221DA00, 0xF21FF100, 0xF21E0800,
-	0xF21C1F00, 0xF21A3600, 0xF2184D00,
-	0xF2166400, 0xF2147B00, 0xF2129200,
-	0xF210A900, 0xF20EC000, 0xF20CD700,
-	0xF20AEE00, 0xF2090500, 0xF2071C00,
-	0xF2053300, 0xF2034A00, 0xF2016100,
-	0xF1FF7800, 0xF1FD8F00, 0xF1FBA600,
-	0xF1F9BD00, 0xF1F7D400, 0xF1F5EB00,
-	0xF1F40200, 0xF1F21900, 0xF1F03000,
-	0xF1EE4700, 0xF1EC5E00, 0xF1EA7500,
-	0xF1E88C00, 0xF1E6A300, 0xF1E4BA00,
-	0xF1E2D100, 0xF1E0E800, 0xF1DEFF00,
-	0xF1DD1600, 0xF1DB2D00, 0xF1D94400,
-	0xF1D75B00, 0xF1D57200, 0xF1D38900,
-	0xF1D1A000, 0xF1CFB700, 0xF1CDCE00,
-	0xF1CBE500, 0xF1C9FC00, 0xF1C81300,
-	0xF1C62A00, 0xF1C44100, 0xF1C25800,
-	0xF1C06F00, 0xF1BE8600, 0xF1BC9D00,
-	0xF1BAB400, 0xF1B8CB00, 0xF1B6E200,
-	0xF1B4F900, 0xF1B31000, 0xF1B12700,
-	0xF1AF3E00, 0xF1AD5500, 0xF1AB6C00,
-	0xF1A98300, 0xF1A79A00, 0xF1A5B100,
-	0xF1A3C800, 0xF1A1DF00, 0xF19FF600,
-	0xF19E0D00, 0xF19C2400, 0xF19A3B00,
-	0xF1985200, 0xF1966900, 0xF1948000,
-	0xF1929700, 0xF190AE00, 0xF18EC500,
-	0xF18CDC00, 0xF18AF300, 0xF1890A00,
-	0xF1872100, 0xF1853800, 0xF1834F00,
-	0xF1816600, 0xF17F7D00, 0xF17D9400,
-	0xF17BAB00, 0xF179C200, 0xF177D900,
-	0xF175F000, 0xF1740700, 0xF1721E00,
-	0xF1703500, 0xF16E4C00, 0xF16C6300,
-	0xF16A7A00, 0xF1689100, 0xF166A800,
-	0xF164BF00, 0xF162D600, 0xF160ED00,
-	0xF15F0400, 0xF15D1B00, 0xF15B3200,
-	0xF1594900, 0xF1576000, 0xF1557700,
-	0xF1538E00, 0xF151A500, 0xF14FBC00,
-	0xF14DD300, 0xF14BEA00, 0xF14A0100,
-	0xF1481800, 0xF1462F00, 0xF1444600,
-	0xF1425D00, 0xF1407400, 0xF13E8B00,
-	0xF13CA200, 0xF13AB900, 0xF138D000,
-	0xF136E700, 0xF134FE00, 0xF1331500,
-	0xF1312C00, 0xF12F4300, 0xF12D5A00,
-	0xF12B7100, 0xF1298800, 0xF1279F00,
-	0xF125B600, 0xF123CD00, 0xF121E400,
-	0xF11FFB00, 0xF11E1200, 0xF11C2900,
-	0xF11A4000, 0xF1185700, 0xF1166E00,
-	0xF1148500, 0xF1129C00, 0xF110B300,
-	0xF10ECA00, 0xF10CE100, 0xF10AF800,
-	0xF1090F00, 0xF1072600, 0xF1053D00,
-	0xF1035400, 0xF1016B00, 0xF0FF8200,
-	0xF0FD9900, 0xF0FBB000, 0xF0F9C700,
-	0xF0F7DE00, 0xF0F5F500, 0xF0F40C00,
-	0xF0F22300, 0xF0F03A00, 0xF0EE5100,
-	0xF0EC6800, 0xF0EA7F00, 0xF0E89600,
-	0xF0E6AD00, 0xF0E4C400, 0xF0E2DB00,
-	0xF0E0F200, 0xF0DF0900, 0xF0DD2000,
-	0xF0DB3700, 0xF0D94E00, 0xF0D76500,
-	0xF0D57C00, 0xF0D39300, 0xF0D1AA00,
-	0xF0CFC100, 0xF0CDD800, 0xF0CBEF00,
-	0xF0CA0600, 0xF0C81D00, 0xF0C63400,
-	0xF0C44B00, 0xF0C26200, 0xF0C07900,
-	0xF0BE9000, 0xF0BCA700, 0xF0BABE00,
-	0xF0B8D500, 0xF0B6EC00, 0xF0B50300,
-	0xF0B31A00, 0xF0B13100, 0xF0AF4800,
-	0xF0AD5F00, 0xF0AB7600, 0xF0A98D00,
-	0xF0A7A400, 0xF0A5BB00, 0xF0A3D200,
-	0xF0A1E900, 0xF0A40000, 0xF0A24000,
-	0xF0A08000, 0xF09EC000, 0xF09D0000,
-	0xF09B4000, 0xF0998000, 0xF097C000,
-	0xF0960000, 0xF0944000, 0xF0928000,
-	0xF090C000, 0xF08F0000, 0xF08D4000,
-	0xF08B8000, 0xF089C000, 0xF0880000,
-	0xF0864000, 0xF0848000, 0xF082C000,
-	0xF0810000, 0xF07F4000, 0xF07D8000,
-	0xF07BC000, 0xF07A0000, 0xF0784000,
-	0xF0768000, 0xF074C000, 0xF0730000,
-	0xF0714000, 0xF06F8000, 0xF06DC000,
-	0xF06C0000, 0xF06A4000, 0xF0688000,
-	0xF066C000, 0xF0650000, 0xF0634000,
-	0xF0618000, 0xF05FC000, 0xF05E0000,
-	0xF05C4000, 0xF05A8000, 0xF058C000,
-	0xF0570000, 0xF0554000, 0xF0538000,
-	0xF051C000, 0xF0500000, 0xF04E4000,
-	0xF04C8000, 0xF04AC000, 0xF0490000,
-	0xF0474000, 0xF0458000, 0xF043C000,
-	0xF0420000, 0xF0404000, 0xF03E8000,
-	0xF03CC000, 0xF03B0000, 0xF0394000,
-	0xF0378000, 0xF035C000, 0xF0340000,
-	0xF0324000, 0xF0308000, 0xF02EC000,
-	0xF02D0000, 0xF02B4000, 0xF0298000,
-	0xF027C000, 0xF0260000, 0xF0244000,
-	0xF0228000, 0xF020C000, 0xF01F0000,
-	0xF01D4000, 0xF01B8000, 0xF019C000,
-	0xF0180000, 0xF0164000, 0xF0148000,
-	0xF012C000, 0xF0110000, 0xF00F4000,
-	0xF00D8000, 0xF00BC000, 0xF00A0000,
-	0xF0084000, 0xF0068000, 0xF004C000,
-	0xF0030000, 0xF0014000, 0xEFFF8000,
-	0xEFFDC000, 0xEFFC0000, 0xEFFA4000,
-	0xEFF88000, 0xEFF6C000, 0xEFF50000,
-	0xEFF34000, 0xEFF18000, 0xEFEFC000,
-	0xEFEE0000, 0xEFEC4000, 0xEFEA8000,
-	0xEFE8C000, 0xEFE70000, 0xEFE54000,
-	0xEFE38000, 0xEFE1C000, 0xEFE00000,
-	0xEFDE4000, 0xEFDC8000, 0xEFDAC000,
-	0xEFD90000, 0xEFD74000, 0xEFD58000,
-	0xEFD3C000, 0xEFD20000, 0xEFD04000,
-	0xEFCE8000, 0xEFCCC000, 0xEFCB0000,
-	0xEFC94000, 0xEFC78000, 0xEFC5C000,
-	0xEFC40000, 0xEFC24000, 0xEFC08000,
-	0xEFBEC000, 0xEFBD0000, 0xEFBB4000,
-	0xEFB98000, 0xEFB7C000, 0xEFB60000,
-	0xEFB44000, 0xEFB28000, 0xEFB0C000,
-	0xEFAF0000, 0xEFAD4000, 0xEFAB8000,
-	0xEFA9C000, 0xEFA80000, 0xEFA64000,
-	0xEFA48000, 0xEFA2C000, 0xEFA10000,
-	0xEF9F4000, 0xEF9D8000, 0xEF9BC000,
-	0xEF9A0000, 0xEF984000, 0xEF968000,
-	0xEF94C000, 0xEF930000, 0xEF914000,
-	0xEF8F8000, 0xEF8DC000, 0xEF8C0000,
-	0xEF8A4000, 0xEF888000, 0xEF86C000,
-	0xEF850000, 0xEF834000, 0xEF818000,
-	0xEF7FC000, 0xEF7E0000, 0xEF7C4000,
-	0xEF7A8000, 0xEF78C000, 0xEF770000,
-	0xEF754000, 0xEF738000, 0xEF71C000,
-	0xEF700000, 0xEF6E4000, 0xEF6C8000,
-	0xEF6AC000, 0xEF690000, 0xEF674000,
-	0xEF658000, 0xEF63C000, 0xEF620000,
-	0xEF604000, 0xEF5E8000, 0xEF5CC000,
-	0xEF5B0000, 0xEF594000, 0xEF578000,
-	0xEF55C000, 0xEF540000, 0xEF524000,
-	0xEF508000, 0xEF4EC000, 0xEF4D0000,
-	0xEF4B4000, 0xEF498000, 0xEF47C000,
-	0xEF460000, 0xEF444000, 0xEF428000,
-	0xEF40C000, 0xEF3F0000, 0xEF3D4000,
-	0xEF3B8000, 0xEF39C000, 0xEF380000,
-	0xEF364000, 0xEF348000, 0xEF32C000,
-	0xEF310000, 0xEF2F4000, 0xEF2D8000,
-	0xEF2BC000, 0xEF2A0000, 0xEF284000,
-	0xEF268000, 0xEF24C000, 0xEF230000,
-	0xEF214000, 0xEF1F8000, 0xEF1DC000,
-	0xEF1C0000, 0xEF1A4000, 0xEF188000,
-	0xEF16C000, 0xEF150000, 0xEF134000,
-	0xEF118000, 0xEF0FC000, 0xEF0E0000,
-	0xEF0C4000, 0xEF0A8000, 0xEF08C000,
-	0xEF070000, 0xEF054000, 0xEF038000,
-	0xEF01C000, 0xEF000000, 0xEEFE4000,
-	0xEEFC8000, 0xEEFAC000, 0xEEF90000,
-	0xEEF74000, 0xEEF58000, 0xEEF3C000,
-	0xEEF20000, 0xEEF04000, 0xEEEE8000,
-	0xEEECC000, 0xEEEB0000, 0xEEE94000,
-	0xEEE78000, 0xEEE5C000, 0xEEE40000,
-	0xEEE24000, 0xEEE08000, 0xEEDEC000,
-	0xEEDD0000, 0xEEDB4000, 0xEED98000,
-	0xEED7C000, 0xEED60000, 0xEED44000,
-	0xEED28000, 0xEED0C000, 0xEECF0000,
-	0xEECD4000, 0xEECB8000, 0xEEC9C000,
-	0xEEC80000, 0xEEC64000, 0xEEC48000,
-	0xEEC2C000, 0xEEC10000, 0xEEBF4000,
-	0xEEBD8000, 0xEEBBC000, 0xEEBA0000,
-	0xEEB84000, 0xEEB68000, 0xEEB4C000,
-	0xEEB30000, 0xEEB14000, 0xEEAF8000,
-	0xEEADC000, 0xEEAC0000, 0xEEAA4000,
-	0xEEA88000, 0xEEA6C000, 0xEEA50000,
-	0xEEA34000, 0xEEA18000, 0xEE9FC000,
-	0xEE9E0000, 0xEE9C4000, 0xEE9A8000,
-	0xEE98C000, 0xEE970000, 0xEE954000,
-	0xEE938000, 0xEE91C000, 0xEE900000,
-	0xEE8E4000, 0xEE8C8000, 0xEE8AC000,
-	0xEE890000, 0xEE874000, 0xEE858000,
-	0xEE83C000, 0xEE820000, 0xEE804000,
-	0xEE7E8000, 0xEE7CC000, 0xEE7B0000,
-	0xEE794000, 0xEE778000, 0xEE75C000,
-	0xEE740000, 0xEE724000, 0xEE708000,
-	0xEE6EC000, 0xEE6D0000, 0xEE6B4000,
-	0xEE698000, 0xEE67C000, 0xEE660000,
-	0xEE644000, 0xEE628000, 0xEE60C000,
-	0xEE5F0000, 0xEE5D4000, 0xEE5B8000,
-	0xEE59C000, 0xEE580000, 0xEE564000,
-	0xEE548000, 0xEE52C000, 0xEE510000,
-	0xEE4F4000, 0xEE4D8000, 0xEE4BC000,
-	0xEE4A0000, 0xEE484000, 0xEE468000,
-	0xEE44C000, 0xEE430000, 0xEE414000,
-	0xEE3F8000, 0xEE3DC000, 0xEE3C0000,
-	0xEE3A4000, 0xEE388000, 0xEE36C000,
-	0xEE350000, 0xEE334000, 0xEE318000,
-	0xEE2FC000, 0xEE2E0000, 0xEE2C4000,
-	0xEE2A8000, 0xEE28C000, 0xEE270000,
-	0xEE254000, 0xEE238000, 0xEE21C000,
-	0xEE200000, 0xEE1E4000, 0xEE1C8000,
-	0xEE1AC000, 0xEE190000, 0xEE174000,
-	0xEE158000, 0xEE13C000, 0xEE120000,
-	0xEE104000, 0xEE0E8000, 0xEE0CC000,
-	0xEE0B0000, 0xEE094000, 0xEE078000,
-	0xEE05C000, 0xEE040000, 0xEE024000,
-	0xEE008000, 0xEDFEC000, 0xEDFD0000,
-	0xEDFB4000, 0xEDF98000, 0xEDF7C000,
-	0xEDF60000, 0xEDF44000, 0xEDF28000,
-	0xEDF0C000, 0xEDEF0000, 0xEDED4000,
-	0xEDEB8000, 0xEDE9C000, 0xEDE80000,
-	0xEDE64000, 0xEDE48000, 0xEDE2C000,
-	0xEDE10000, 0xEDDF4000, 0xEDDD8000,
-	0xEDDBC000, 0xEDDA0000, 0xEDD84000,
-	0xEDD68000, 0xEDD4C000, 0xEDD30000,
-	0xEDD14000, 0xEDCF8000, 0xEDCDC000,
-	0xEDCC0000, 0xEDCA4000, 0xEDC88000,
-	0xEDC6C000, 0xEDC50000, 0xEDC34000,
-	0xEDC18000, 0xEDBFC000, 0xEDBE0000,
-	0xEDBC4000, 0xEDBA8000, 0xEDB8C000,
-	0xEDB70000, 0xEDB54000, 0xEDB38000,
-	0xEDB1C000, 0xEDB00000, 0xEDAE4000,
-	0xEDAC8000, 0xEDAAC000, 0xEDA90000,
-	0xEDA74000, 0xEDA58000, 0xEDA3C000,
-	0xEDA20000, 0xEDA04000, 0xED9E8000,
-	0xED9CC000, 0xED9B0000, 0xED994000,
-	0xED978000, 0xED95C000, 0xED940000,
-	0xED924000, 0xED908000, 0xED8EC000,
-	0xED8D0000, 0xED8B4000, 0xED898000,
-	0xED87C000, 0xED860000, 0xED844000,
-	0xED828000, 0xED80C000, 0xED7F0000,
-	0xED7D4000, 0xED7B8000, 0xED79C000,
-	0xED780000, 0xED764000, 0xED748000,
-	0xED72C000, 0xED710000, 0xED6F4000,
-	0xED6D8000, 0xED6BC000, 0xED6A0000,
-	0xED684000, 0xED668000, 0xED64C000,
-	0xED630000, 0xED614000, 0xED5F8000,
-	0xED5DC000, 0xED5C0000, 0xED5A4000,
-	0xED588000, 0xED56C000, 0xED550000,
-	0xED534000, 0xED518000, 0xED4FC000,
-	0xED4E0000, 0xED4C4000, 0xED4A8000,
-	0xED48C000, 0xED470000, 0xED454000,
-	0xED438000, 0xED41C000, 0xED400000,
-	0xED3E4000, 0xED3C8000, 0xED3AC000,
-	0xED390000, 0xED374000, 0xED358000,
-	0xED33C000, 0xED320000, 0xED304000,
-	0xED2E8000, 0xED2CC000, 0xED2B0000,
-	0xED294000, 0xED278000, 0xED25C000,
-	0xED240000, 0xED224000, 0xED208000,
-	0xED1EC000, 0xED1D0000, 0xED1B4000,
-	0xED198000, 0xED17C000, 0xED160000,
-	0xED144000, 0xED128000, 0xED10C000,
-	0xED0F0000, 0xED0D4000, 0xED0B8000,
-	0xED09C000, 0xED080000, 0xED064000,
-	0xED048000, 0xED02C000, 0xED010000,
-	0xECFF4000, 0xECFD8000, 0xECFBC000,
-	0xECFA0000, 0xECF84000, 0xECF68000,
-	0xECF4C000, 0xECF30000, 0xECF14000,
-	0xECEF8000, 0xECEDC000, 0xECEC0000,
-	0xECEA4000, 0xECE88000, 0xECE6C000,
-	0xECE50000, 0xECE34000, 0xECE18000,
-	0xECDFC000, 0xECDE0000, 0xECDC4000,
-	0xECDA8000, 0xECD8C000, 0xECD70000,
-	0xECD54000, 0xECD38000, 0xECD1C000,
-	0xECD00000, 0xECCE4000, 0xECCC8000,
-	0xECCAC000, 0xECC90000, 0xECC74000,
-	0xECC58000, 0xECC3C000, 0xECC20000,
-	0xECC04000, 0xECBE8000, 0xECBCC000,
-	0xECBB0000, 0xECB94000, 0xECB78000,
-	0xECB5C000, 0xECB40000, 0xECB24000,
-	0xECB08000, 0xECAEC000, 0xECAD0000,
-	0xECAB4000, 0xECA98000, 0xECA7C000,
-	0xECA60000, 0xECA44000, 0xECA28000,
-	0xECA0C000, 0xEC9F0000, 0xEC9D4000,
-	0xEC9B8000, 0xEC99C000, 0xEC980000,
-	0xEC964000, 0xEC948000, 0xEC92C000,
-	0xEC910000, 0xEC8F4000, 0xEC8D8000,
-	0xEC8BC000, 0xEC8A0000, 0xEC884000,
-	0xEC868000, 0xEC84C000, 0xEC830000,
-	0xEC814000, 0xEC7F8000, 0xEC7DC000,
-	0xEC7C0000, 0xEC7A4000, 0xEC788000,
-	0xEC76C000, 0xEC750000, 0xEC734000,
-	0xEC718000, 0xEC6FC000, 0xEC6E0000,
-	0xEC6C4000, 0xEC6A8000, 0xEC68C000,
-	0xEC670000, 0xEC654000, 0xEC638000,
-	0xEC61C000, 0xEC600000, 0xEC5E4000,
-	0xEC5C8000, 0xEC5AC000, 0xEC590000,
-	0xEC574000, 0xEC558000, 0xEC53C000,
-	0xEC520000, 0xEC504000, 0xEC4E8000,
-	0xEC4CC000, 0xEC4B0000, 0xEC494000,
-	0xEC478000, 0xEC45C000, 0xEC440000,
-	0xEC424000, 0xEC408000, 0xEC3EC000,
-	0xEC3D0000, 0xEC3B4000, 0xEC398000,
-	0xEC37C000, 0xEC360000, 0xEC344000,
-	0xEC328000, 0xEC30C000, 0xEC2F0000,
-	0xEC2D4000, 0xEC2B8000, 0xEC29C000,
-	0xEC280000, 0xEC264000, 0xEC248000,
-	0xEC22C000, 0xEC210000, 0xEC1F4000,
-	0xEC1D8000, 0xEC1BC000, 0xEC1A0000,
-	0xEC184000, 0xEC168000, 0xEC14C000,
-	0xEC130000, 0xEC114000, 0xEC0F8000,
-	0xEC0DC000, 0xEC0C0000, 0xEC0A4000,
-	0xEC088000, 0xEC06C000, 0xEC050000,
-	0xEC034000, 0xEC018000, 0xEBFFC000,
-	0xEBFE0000, 0xEBFC4000, 0xEBFA8000,
-	0xEBF8C000, 0xEBF70000, 0xEBF54000,
-	0xEBF38000, 0xEBF1C000, 0xEBF00000,
-	0xEBEE4000, 0xEBEC8000, 0xEBEAC000,
-	0xEBE90000, 0xEBE74000, 0xEBE58000,
-	0xEBE3C000, 0xEBE20000, 0xEBE04000,
-	0xEBDE8000, 0xEBDCC000, 0xEBDB0000,
-	0xEBD94000, 0xEBD78000, 0xEBD5C000,
-	0xEBD40000, 0xEBD24000, 0xEBD08000,
-	0xEBCEC000, 0xEBCD0000, 0xEBCB4000,
-	0xEBC98000, 0xEBC7C000, 0xEBC60000,
-	0xEBC44000, 0xEBC28000, 0xEBC0C000,
-	0xEBBF0000, 0xEBBD4000, 0xEBBB8000,
-	0xEBB9C000, 0xEBB80000, 0xEBB64000,
-	0xEBB48000, 0xEBB2C000, 0xEBB10000,
-	0xEBAF4000, 0xEBAD8000, 0xEBABC000,
-	0xEBAA0000, 0xEBA84000, 0xEBA68000,
-	0xEBA4C000, 0xEBA30000, 0xEBA14000,
-	0xEB9F8000, 0xEB9DC000, 0xEB9C0000,
-	0xEB9A4000, 0xEB988000, 0xEB96C000,
-	0xEB950000, 0xEB934000, 0xEB918000,
-	0xEB8FC000, 0xEB8E0000, 0xEB8C4000,
-	0xEB8A8000, 0xEB88C000, 0xEB870000,
-	0xEB854000, 0xEB838000, 0xEB81C000,
-	0xEB800000, 0xEB7E4000, 0xEB7C8000,
-	0xEB7AC000, 0xEB790000, 0xEB774000,
-	0xEB758000, 0xEB73C000, 0xEB720000,
-	0xEB704000, 0xEB6E8000, 0xEB6CC000,
-	0xEB6B0000, 0xEB694000, 0xEB678000,
-	0xEB65C000, 0xEB640000, 0xEB624000,
-	0xEB608000, 0xEB5EC000, 0xEB5D0000,
-	0xEB5B4000, 0xEB598000, 0xEB57C000,
-	0xEB560000, 0xEB544000, 0xEB528000,
-	0xEB50C000, 0xEB4F0000, 0xEB4D4000,
-	0xEB4B8000, 0xEB49C000, 0xEB480000,
-	0xEB464000, 0xEB448000, 0xEB42C000,
-	0xEB410000, 0xEB3F4000, 0xEB3D8000,
-	0xEB3BC000, 0xEB3A0000, 0xEB384000,
-	0xEB368000, 0xEB34C000, 0xEB330000,
-	0xEB314000, 0xEB2F8000, 0xEB2DC000,
-	0xEB2C0000, 0xEB2A4000, 0xEB288000,
-	0xEB26C000, 0xEB250000, 0xEB234000,
-	0xEB218000, 0xEB1FC000, 0xEB1E0000,
-	0xEB1C4000, 0xEB1A8000, 0xEB18C000,
-	0xEB170000, 0xEB154000, 0xEB138000,
-	0xEB11C000, 0xEB100000, 0xEB0E4000,
-	0xEB0C8000, 0xEB0AC000, 0xEB090000,
-	0xEB074000, 0xEB058000, 0xEB03C000,
-	0xEB020000, 0xEB004000, 0xEAFE8000,
-	0xEAFCC000, 0xEAFB0000, 0xEAF94000,
-	0xEAF78000, 0xEAF5C000, 0xEAF40000,
-	0xEAF24000, 0xEAF08000, 0xEAEEC000,
-	0xEAED0000, 0xEAEB4000, 0xEAE98000,
-	0xEAE7C000, 0xEAE60000, 0xEAE44000,
-	0xEAE28000, 0xEAE0C000, 0xEADF0000,
-	0xEADD4000, 0xEADB8000, 0xEAD9C000,
-	0xEAD80000, 0xEAD64000, 0xEAD48000,
-	0xEAD2C000, 0xEAD10000, 0xEACF4000,
-	0xEACD8000, 0xEACBC000, 0xEACA0000,
-	0xEAC84000, 0xEAC68000, 0xEAC4C000,
-	0xEAC30000, 0xEAC14000, 0xEABF8000,
-	0xEABDC000, 0xEABC0000, 0xEABA4000,
-	0xEAB88000, 0xEAB6C000, 0xEAB50000,
-	0xEAB34000, 0xEAB18000, 0xEAAFC000,
-	0xEAAE0000, 0xEAAC4000, 0xEAAA8000,
-	0xEAA8C000, 0xEAA70000, 0xEAA54000,
-	0xEAA38000, 0xEAA1C000, 0xEAA00000,
-	0xEA9E4000, 0xEA9C8000, 0xEA9AC000,
-	0xEA990000, 0xEA974000, 0xEA958000,
-	0xEA93C000, 0xEA920000, 0xEA904000,
-	0xEA8E8000, 0xEA8CC000, 0xEA8B0000,
-	0xEA894000, 0xEA878000, 0xEA85C000,
-	0xEA840000, 0xEA824000, 0xEA808000,
-	0xEA7EC000, 0xEA7D0000, 0xEA7B4000,
-	0xEA798000, 0xEA77C000, 0xEA760000,
-	0xEA744000, 0xEA728000, 0xEA70C000,
-	0xEA6F0000, 0xEA6D4000, 0xEA6B8000,
-	0xEA69C000, 0xEA680000, 0xEA664000,
-	0xEA648000, 0xEA62C000, 0xEA610000,
-	0xEA5F4000, 0xEA5D8000, 0xEA5BC000,
-	0xEA5A0000, 0xEA584000, 0xEA568000,
-	0xEA54C000, 0xEA530000, 0xEA514000,
-	0xEA4F8000, 0xEA4DC000, 0xEA4C0000,
-	0xEA4A4000, 0xEA488000, 0xEA46C000,
-	0xEA450000, 0xEA434000, 0xEA418000,
-	0xEA3FC000, 0xEA3E0000, 0xEA3C4000,
-	0xEA3A8000, 0xEA38C000, 0xEA370000,
-	0xEA354000, 0xEA338000, 0xEA31C000,
-	0xEA300000, 0xEA2E4000, 0xEA2C8000,
-	0xEA2AC000, 0xEA290000, 0xEA274000,
-	0xEA258000, 0xEA23C000, 0xEA220000,
-	0xEA204000, 0xEA1E8000, 0xEA1CC000,
-	0xEA1B0000, 0xEA194000, 0xEA178000,
-	0xEA15C000, 0xEA140000, 0xEA124000,
-	0xEA108000, 0xEA0EC000, 0xEA0D0000,
-	0xEA0B4000, 0xEA098000, 0xEA07C000,
-	0xEA060000, 0xEA044000, 0xEA028000,
-	0xEA00C000, 0xE9FF0000, 0xE9FD4000,
-	0xE9FB8000, 0xE9F9C000, 0xE9F80000,
-	0xE9F64000, 0xE9F48000, 0xE9F2C000,
-	0xE9F10000, 0xE9EF4000, 0xE9ED8000,
-	0xE9EBC000, 0xE9EA0000, 0xE9E84000,
-	0xE9E68000, 0xE9E4C000, 0xE9E30000,
-	0xE9E14000, 0xE9DF8000, 0xE9DDC000,
-	0xE9DC0000, 0xE9DA4000, 0xE9D88000,
-	0xE9D6C000, 0xE9D50000, 0xE9D34000,
-	0xE9D18000, 0xE9CFC000, 0xE9CE0000,
-	0xE9CC4000, 0xE9CA8000, 0xE9C8C000,
-	0xE9C70000, 0xE9C54000, 0xE9C38000,
-	0xE9C1C000, 0xE9C00000, 0xE9BE4000,
-	0xE9BC8000, 0xE9BAC000, 0xE9B90000,
-	0xE9B74000, 0xE9B58000, 0xE9B3C000,
-	0xE9B20000, 0xE9B04000, 0xE9AE8000,
-	0xE9ACC000, 0xE9AB0000, 0xE9A94000,
-	0xE9A78000, 0xE9A5C000, 0xE9A40000,
-	0xE9A24000, 0xE9A08000, 0xE99EC000,
-	0xE99D0000, 0xE99B4000, 0xE9998000,
-	0xE997C000, 0xE9960000, 0xE9944000,
-	0xE9928000, 0xE990C000, 0xE98F0000,
-	0xE98D4000, 0xE98B8000, 0xE989C000,
-	0xE9880000, 0xE9864000, 0xE9848000,
-	0xE982C000, 0xE9810000, 0xE97F4000,
-	0xE97D8000, 0xE97BC000, 0xE97A0000,
-	0xE9784000, 0xE9768000, 0xE974C000,
-	0xE9730000, 0xE9714000, 0xE96F8000,
-	0xE96DC000, 0xE96C0000, 0xE96A4000,
-	0xE9688000, 0xE966C000, 0xE9650000,
-	0xE9634000, 0xE9618000, 0xE95FC000,
-	0xE95E0000, 0xE95C4000, 0xE95A8000,
-	0xE958C000, 0xE9570000, 0xE9554000,
-	0xE9538000, 0xE951C000, 0xE9500000,
-	0xE94E4000, 0xE94C8000, 0xE94AC000,
-	0xE9490000, 0xE9474000, 0xE9458000,
-	0xE943C000, 0xE9420000, 0xE9404000,
-	0xE93E8000, 0xE93CC000, 0xE93B0000,
-	0xE9394000, 0xE9378000, 0xE935C000,
-	0xE9340000, 0xE9324000, 0xE9308000,
-	0xE92EC000, 0xE92D0000, 0xE92B4000,
-	0xE9298000, 0xE927C000, 0xE9260000,
-	0xE9244000, 0xE9228000, 0xE920C000,
-	0xE91F0000, 0xE91D4000, 0xE91B8000,
-	0xE919C000, 0xE9180000, 0xE9164000,
-	0xE9148000, 0xE912C000, 0xE9110000,
-	0xE90F4000, 0xE90D8000, 0xE90BC000,
-	0xE90A0000, 0xE9084000, 0xE9068000,
-	0xE904C000, 0xE9030000, 0xE9014000,
-	0xE8FF8000, 0xE8FDC000, 0xE8FC0000,
-	0xE8FA4000, 0xE8F88000, 0xE8F6C000,
-	0xE8F50000, 0xE8F34000, 0xE8F18000,
-	0xE8EFC000, 0xE8EE0000, 0xE8EC4000,
-	0xE8EA8000, 0xE8E8C000, 0xE8E70000,
-	0xE8E54000, 0xE8E38000, 0xE8E1C000,
-	0xE8E00000, 0xE8DE4000, 0xE8DC8000,
-	0xE8DAC000, 0xE8D90000, 0xE8D74000,
-	0xE8D58000, 0xE8D3C000, 0xE8D20000,
-	0xE8D04000, 0xE8CE8000, 0xE8CCC000,
-	0xE8CB0000, 0xE8C94000, 0xE8C78000,
-	0xE8C5C000, 0xE8C40000, 0xE8C24000,
-	0xE8C08000, 0xE8BEC000, 0xE8BD0000,
-	0xE8BB4000, 0xE8B98000, 0xE8B7C000,
-	0xE8B60000, 0xE8B44000, 0xE8B28000,
-	0xE8B0C000, 0xE8AF0000, 0xE8AD4000,
-	0xE8AB8000, 0xE8A9C000, 0xE8A80000,
-	0xE8A64000, 0xE8A48000, 0xE8A2C000,
-	0xE8A10000, 0xE89F4000, 0xE89D8000,
-	0xE89BC000, 0xE89A0000, 0xE8984000,
-	0xE8968000, 0xE894C000, 0xE8930000,
-	0xE8914000, 0xE88F8000, 0xE88DC000,
-	0xE88C0000, 0xE88A4000, 0xE8888000,
-	0xE886C000, 0xE8850000, 0xE8834000,
-	0xE8818000, 0xE87FC000, 0xE87E0000,
-	0xE87C4000, 0xE87A8000, 0xE878C000,
-	0xE8770000, 0xE8754000, 0xE8738000,
-	0xE871C000, 0xE8700000, 0xE86E4000,
-	0xE86C8000, 0xE86AC000, 0xE8690000,
-	0xE8674000, 0xE8658000, 0xE863C000,
-	0xE8620000, 0xE8604000, 0xE85E8000,
-	0xE85CC000, 0xE85B0000, 0xE8594000,
-	0xE8578000, 0xE855C000, 0xE8540000,
-	0xE8524000, 0xE8508000, 0xE84EC000,
-	0xE84D0000, 0xE84B4000, 0xE8498000,
-	0xE847C000, 0xE8460000, 0xE8444000,
-	0xE8428000, 0xE840C000, 0xE83F0000,
-	0xE83D4000, 0xE83B8000, 0xE839C000,
-	0xE8380000, 0xE8364000, 0xE8348000,
-	0xE832C000, 0xE8310000, 0xE82F4000,
-	0xE82D8000, 0xE82BC000, 0xE82A0000,
-	0xE8284000, 0xE8268000, 0xE824C000,
-	0xE8230000, 0xE8214000, 0xE81F8000,
-	0xE81DC000, 0xE81C0000, 0xE81A4000,
-	0xE8188000, 0xE816C000, 0xE8150000,
-	0xE8134000, 0xE8118000, 0xE80FC000,
-	0xE80E0000, 0xE80C4000, 0xE80A8000,
-	0xE808C000, 0xE8070000, 0xE8054000,
-	0xE8038000, 0xE801C000, 0xE8000000,
-	0xE7FE4000, 0xE7FC8000, 0xE7FAC000,
-	0xE7F90000, 0xE7F74000, 0xE7F58000,
-	0xE7F3C000, 0xE7F20000, 0xE7F04000,
-	0xE7EE8000, 0xE7ECC000, 0xE7EB0000,
-	0xE7E94000, 0xE7E78000, 0xE7E5C000,
-	0xE7E40000, 0xE7E24000, 0xE7E08000,
-	0xE7DEC000, 0xE7DD0000, 0xE7DB4000,
-	0xE7D98000, 0xE7D7C000, 0xE7D60000,
-	0xE7D44000, 0xE7D28000, 0xE7D0C000,
-	0xE7CF0000, 0xE7CD4000, 0xE7CB8000,
-	0xE7C9C000, 0xE7C80000, 0xE7C64000,
-	0xE7C48000, 0xE7C2C000, 0xE7C10000,
-	0xE7BF4000, 0xE7BD8000, 0xE7BBC000,
-	0xE7BA0000, 0xE7B84000, 0xE7B68000,
-	0xE7B4C000, 0xE7B30000, 0xE7B14000,
-	0xE7AF8000, 0xE7ADC000, 0xE7AC0000,
-	0xE7AA4000, 0xE7A88000, 0xE7A6C000,
-	0xE7A50000, 0xE7A34000, 0xE7A18000,
-	0xE79FC000, 0xE79E0000, 0xE79C4000,
-	0xE79A8000, 0xE798C000, 0xE7970000,
-	0xE7954000, 0xE7938000, 0xE791C000,
-	0xE7900000, 0xE78E4000, 0xE78C8000,
-	0xE78AC000, 0xE7890000, 0xE7874000,
-	0xE7858000, 0xE783C000, 0xE7820000,
-	0xE7804000, 0xE77E8000, 0xE77CC000,
-	0xE77B0000, 0xE7794000, 0xE7778000,
-	0xE775C000, 0xE7740000, 0xE7724000,
-	0xE7708000, 0xE76EC000, 0xE76D0000,
-	0xE76B4000, 0xE7698000, 0xE767C000,
-	0xE7660000, 0xE7644000, 0xE7628000,
-	0xE760C000, 0xE75F0000, 0xE75D4000,
-	0xE75B8000, 0xE759C000, 0xE7580000,
-	0xE7564000, 0xE7548000, 0xE752C000,
-	0xE7510000, 0xE74F4000, 0xE74D8000,
-	0xE74BC000, 0xE74A0000, 0xE7484000,
-	0xE7468000, 0xE744C000, 0xE7430000,
-	0xE7414000, 0xE73F8000, 0xE73DC000,
-	0xE73C0000, 0xE73A4000, 0xE7388000,
-	0xE736C000, 0xE7350000, 0xE7334000,
-	0xE7318000, 0xE72FC000, 0xE72E0000,
-	0xE72C4000, 0xE72A8000, 0xE728C000,
-	0xE7270000, 0xE7254000, 0xE7238000,
-	0xE721C000, 0xE7200000, 0xE71E4000,
-	0xE71C8000, 0xE71AC000, 0xE7190000,
-	0xE7174000, 0xE7158000, 0xE713C000,
-	0xE7120000, 0xE7104000, 0xE70E8000,
-	0xE70CC000, 0xE70B0000, 0xE7094000,
-	0xE7078000, 0xE705C000, 0xE7040000,
-	0xE7024000, 0xE7008000, 0xE6FEC000,
-	0xE6FD0000, 0xE6FB4000, 0xE6F98000,
-	0xE6F7C000, 0xE6F60000, 0xE6F44000,
-	0xE6F28000, 0xE6F0C000, 0xE6EF0000,
-	0xE6ED4000, 0xE6EB8000, 0xE6E9C000,
-	0xE6E80000, 0xE6E64000, 0xE6E48000,
-	0xE6E2C000, 0xE6E10000, 0xE6DF4000,
-	0xE6DD8000, 0xE6DBC000, 0xE6DA0000,
-	0xE6D84000, 0xE6D68000, 0xE6D4C000,
-	0xE6D30000, 0xE6D14000, 0xE6CF8000,
-	0xE6CDC000, 0xE6CC0000, 0xE6CA4000,
-	0xE6C88000, 0xE6C6C000, 0xE6C50000,
-	0xE6C34000, 0xE6C18000, 0xE6BFC000,
-	0xE6BE0000, 0xE6BC4000, 0xE6BA8000,
-	0xE6B8C000, 0xE6B70000, 0xE6B54000,
-	0xE6B38000, 0xE6B1C000, 0xE6B00000,
-	0xE6AE4000, 0xE6AC8000, 0xE6AAC000,
-	0xE6A90000, 0xE6A74000, 0xE6A58000,
-	0xE6A3C000, 0xE6A20000, 0xE6A04000,
-	0xE69E8000, 0xE69CC000, 0xE69B0000,
-	0xE6994000, 0xE6978000, 0xE695C000,
-	0xE6940000, 0xE6924000, 0xE6908000,
-	0xE68EC000, 0xE68D0000, 0xE68B4000,
-	0xE6898000, 0xE687C000, 0xE6860000,
-	0xE6844000, 0xE6828000, 0xE680C000,
-	0xE67F0000, 0xE67D4000, 0xE67B8000,
-	0xE679C000, 0xE6780000, 0xE6764000,
-	0xE6748000, 0xE672C000, 0xE6710000,
-	0xE66F4000, 0xE66D8000, 0xE66BC000,
-	0xE66A0000, 0xE6684000, 0xE6668000,
-	0xE664C000, 0xE6630000, 0xE6614000,
-	0xE65F8000, 0xE65DC000, 0xE65C0000,
-	0xE65A4000, 0xE6588000, 0xE656C000,
-	0xE6550000, 0xE6534000, 0xE6518000,
-	0xE64FC000, 0xE64E0000, 0xE64C4000,
-	0xE64A8000, 0xE648C000, 0xE6470000,
-	0xE6454000, 0xE6438000, 0xE641C000,
-	0xE6400000, 0xE63E4000, 0xE63C8000,
-	0xE63AC000, 0xE6390000, 0xE6374000,
-	0xE6358000, 0xE633C000, 0xE6320000,
-	0xE6304000, 0xE62E8000, 0xE62CC000,
-	0xE62B0000, 0xE6294000, 0xE6278000,
-	0xE625C000, 0xE6240000, 0xE6224000,
-	0xE6208000, 0xE61EC000, 0xE61D0000,
-	0xE61B4000, 0xE6198000, 0xE617C000,
-	0xE6160000, 0xE6144000, 0xE6128000,
-	0xE610C000, 0xE60F0000, 0xE60D4000,
-	0xE60B8000, 0xE609C000, 0xE6080000,
-	0xE6064000, 0xE6048000, 0xE602C000,
-	0xE6010000, 0xE5FF4000, 0xE5FD8000,
-	0xE5FBC000, 0xE5FA0000, 0xE5F84000,
-	0xE5F68000, 0xE5F4C000, 0xE5F30000,
-	0xE5F14000, 0xE5EF8000, 0xE5EDC000,
-	0xE5EC0000, 0xE5EA4000, 0xE5E88000,
-	0xE5E6C000, 0xE5E50000, 0xE5E34000,
-	0xE5E18000, 0xE5DFC000, 0xE5DE0000,
-	0xE5DC4000, 0xE5DA8000, 0xE5D8C000,
-	0xE5D70000, 0xE5D54000, 0xE5D38000,
-	0xE5D1C000, 0xE5D00000, 0xE5CE4000,
-	0xE5CC8000, 0xE5CAC000, 0xE5C90000,
-	0xE5C74000, 0xE5C58000, 0xE5C3C000,
-	0xE5C20000, 0xE5C04000, 0xE5BE8000,
-	0xE5BCC000, 0xE5BB0000, 0xE5B94000,
-	0xE5B78000, 0xE5B5C000, 0xE5B40000,
-	0xE5B24000, 0xE5B08000, 0xE5AEC000,
-	0xE5AD0000, 0xE5AB4000, 0xE5A98000,
-	0xE5A7C000, 0xE5A60000, 0xE5A44000,
-	0xE5A28000, 0xE5A0C000, 0xE59F0000,
-	0xE59D4000, 0xE59B8000, 0xE599C000,
-	0xE5980000, 0xE5964000, 0xE5948000,
-	0xE592C000, 0xE5910000, 0xE58F4000,
-	0xE58D8000, 0xE58BC000, 0xE58A0000,
-	0xE5884000, 0xE5868000, 0xE584C000,
-	0xE5830000, 0xE5814000, 0xE57F8000,
-	0xE57DC000, 0xE57C0000, 0xE57A4000,
-	0xE5788000, 0xE576C000, 0xE5750000,
-	0xE5734000, 0xE5718000, 0xE56FC000,
-	0xE56E0000, 0xE56C4000, 0xE56A8000,
-	0xE568C000, 0xE5670000, 0xE5654000,
-	0xE5638000, 0xE561C000, 0xE5600000,
-	0xE55E4000, 0xE55C8000, 0xE55AC000,
-	0xE5590000, 0xE5574000, 0xE5558000,
-	0xE553C000, 0xE5520000, 0xE5504000,
-	0xE54E8000, 0xE54CC000, 0xE54B0000,
-	0xE5494000, 0xE5478000, 0xE545C000,
-	0xE5440000, 0xE5424000, 0xE5408000,
-	0xE53EC000, 0xE53D0000, 0xE53B4000,
-	0xE5398000, 0xE537C000, 0xE5360000,
-	0xE5344000, 0xE5328000, 0xE530C000,
-	0xE52F0000, 0xE52D4000, 0xE52B8000,
-	0xE529C000, 0xE5280000, 0xE5264000,
-	0xE5248000, 0xE522C000, 0xE5210000,
-	0xE51F4000, 0xE51D8000, 0xE51BC000,
-	0xE51A0000, 0xE5184000, 0xE5168000,
-	0xE514C000, 0xE5130000, 0xE5114000,
-	0xE50F8000, 0xE50DC000, 0xE50C0000,
-	0xE50A4000, 0xE5088000, 0xE506C000,
-	0xE5050000, 0xE5034000, 0xE5018000,
-	0xE4FFC000, 0xE4FE0000, 0xE4FC4000,
-	0xE4FA8000, 0xE4F8C000, 0xE4F70000,
-	0xE4F54000, 0xE4F38000, 0xE4F1C000,
-	0xE4F00000, 0xE4EE4000, 0xE4EC8000,
-	0xE4EAC000, 0xE4E90000, 0xE4E74000,
-	0xE4E58000, 0xE4E3C000, 0xE4E20000,
-	0xE4E04000, 0xE4DE8000, 0xE4DCC000,
-	0xE4DB0000, 0xE4D94000, 0xE4D78000,
-	0xE4D5C000, 0xE4D40000, 0xE4D24000,
-	0xE4D08000, 0xE4CEC000, 0xE4CD0000,
-	0xE4CB4000, 0xE4C98000, 0xE4C7C000,
-	0xE4C60000, 0xE4C44000, 0xE4C28000,
-	0xE4C0C000, 0xE4BF0000, 0xE4BD4000,
-	0xE4BB8000, 0xE4B9C000, 0xE4B80000,
-	0xE4B64000, 0xE4B48000, 0xE4B2C000,
-	0xE4B10000, 0xE4AF4000, 0xE4AD8000,
-	0xE4ABC000, 0xE4AA0000, 0xE4A84000,
-	0xE4A68000, 0xE4A4C000, 0xE4A30000,
-	0xE4A14000, 0xE49F8000, 0xE49DC000,
-	0xE49C0000, 0xE49A4000, 0xE4988000,
-	0xE496C000, 0xE4950000, 0xE4934000,
-	0xE4918000, 0xE48FC000, 0xE48E0000,
-	0xE48C4000, 0xE48A8000, 0xE488C000,
-	0xE4870000, 0xE4854000, 0xE4838000,
-	0xE481C000, 0xE4800000, 0xE47E4000,
-	0xE47C8000, 0xE47AC000, 0xE4790000,
-	0xE4774000, 0xE4758000, 0xE473C000,
-	0xE4720000, 0xE4704000, 0xE46E8000,
-	0xE46CC000, 0xE46B0000, 0xE4694000,
-	0xE4678000, 0xE465C000, 0xE4640000,
-	0xE4624000, 0xE4608000, 0xE45EC000,
-	0xE45D0000, 0xE45B4000, 0xE4598000,
-	0xE457C000, 0xE4560000, 0xE4544000,
-	0xE4528000, 0xE450C000, 0xE44F0000,
-	0xE44D4000, 0xE44B8000, 0xE449C000,
-	0xE4480000, 0xE4464000, 0xE4448000,
-	0xE442C000, 0xE4410000, 0xE43F4000,
-	0xE43D8000, 0xE43BC000, 0xE43A0000,
-	0xE4384000, 0xE4368000, 0xE434C000,
-	0xE4330000, 0xE4314000, 0xE42F8000,
-	0xE42DC000, 0xE42C0000, 0xE42A4000,
-	0xE4288000, 0xE426C000, 0xE4250000,
-	0xE4234000, 0xE4218000, 0xE41FC000,
-	0xE41E0000, 0xE41C4000, 0xE41A8000,
-	0xE418C000, 0xE4170000, 0xE4154000,
-	0xE4138000, 0xE411C000, 0xE4100000,
-	0xE40E4000, 0xE40C8000, 0xE40AC000,
-	0xE4090000, 0xE4074000, 0xE4058000,
-	0xE403C000, 0xE4020000, 0xE4004000,
-	0xE3FE8000, 0xE3FCC000, 0xE3FB0000,
-	0xE3F94000, 0xE3F78000, 0xE3F5C000,
-	0xE3F40000, 0xE3F24000, 0xE3F08000,
-	0xE3EEC000, 0xE3ED0000, 0xE3EB4000,
-	0xE3E98000, 0xE3E7C000, 0xE3E60000,
-	0xE3E44000, 0xE3E28000, 0xE3E0C000,
-	0xE3DF0000, 0xE3DD4000, 0xE3DB8000,
-	0xE3D9C000, 0xE3D80000, 0xE3D64000,
-	0xE3D48000, 0xE3D2C000, 0xE3D10000,
-	0xE3CF4000, 0xE3CD8000, 0xE3CBC000,
-	0xE3CA0000, 0xE3C84000, 0xE3C68000,
-	0xE3C4C000, 0xE3C30000, 0xE3C14000,
-	0xE3BF8000, 0xE3BDC000, 0xE3BC0000,
-	0xE3BA4000, 0xE3B88000, 0xE3B6C000,
-	0xE3B50000, 0xE3B34000, 0xE3B18000,
-	0xE3AFC000, 0xE3AE0000, 0xE3AC4000,
-	0xE3AA8000, 0xE3A8C000, 0xE3A70000,
-	0xE3A54000, 0xE3A38000, 0xE3A1C000,
-	0xE3A00000, 0xE39E4000, 0xE39C8000,
-	0xE39AC000, 0xE3990000, 0xE3974000,
-	0xE3958000, 0xE393C000, 0xE3920000,
-	0xE3904000, 0xE38E8000, 0xE38CC000,
-	0xE38B0000, 0xE3894000, 0xE3878000,
-	0xE385C000, 0xE3840000, 0xE3824000,
-	0xE3808000, 0xE37EC000, 0xE37D0000,
-	0xE37B4000, 0xE3798000, 0xE377C000,
-	0xE3760000, 0xE3744000, 0xE3728000,
-	0xE370C000, 0xE36F0000, 0xE36D4000,
-	0xE36B8000, 0xE369C000, 0xE3680000,
-	0xE3664000, 0xE3648000, 0xE362C000,
-	0xE3610000, 0xE35F4000, 0xE35D8000,
-	0xE35BC000, 0xE35A0000, 0xE3584000,
-	0xE3568000, 0xE354C000, 0xE3530000,
-	0xE3514000, 0xE34F8000, 0xE34DC000,
-	0xE34C0000, 0xE34A4000, 0xE3488000,
-	0xE346C000, 0xE3450000, 0xE3434000,
-	0xE3418000, 0xE33FC000, 0xE33E0000,
-	0xE33C4000, 0xE33A8000, 0xE338C000,
-	0xE3370000, 0xE3354000, 0xE3338000,
-	0xE331C000, 0xE3300000, 0xE32E4000,
-	0xE32C8000, 0xE32AC000, 0xE3290000,
-	0xE3274000, 0xE3258000, 0xE323C000,
-	0xE3220000, 0xE3204000, 0xE31E8000,
-	0xE31CC000, 0xE31B0000, 0xE3194000,
-	0xE3178000, 0xE315C000, 0xE3140000,
-	0xE3124000, 0xE3108000, 0xE30EC000,
-	0xE30D0000, 0xE30B4000, 0xE3098000,
-	0xE307C000, 0xE3060000, 0xE3044000,
-	0xE3028000, 0xE300C000, 0xE2FF0000,
-	0xE2FD4000, 0xE2FB8000, 0xE2F9C000,
-	0xE2F80000, 0xE2F64000, 0xE2F48000,
-	0xE2F2C000, 0xE2F10000, 0xE2EF4000,
-	0xE2ED8000, 0xE2EBC000, 0xE2EA0000,
-	0xE2E84000, 0xE2E68000, 0xE2E4C000,
-	0xE2E30000, 0xE2E14000, 0xE2DF8000,
-	0xE2DDC000, 0xE2DC0000, 0xE2DA4000,
-	0xE2D88000, 0xE2D6C000, 0xE2D50000,
-	0xE2D34000, 0xE2D18000, 0xE2CFC000,
-	0xE2CE0000, 0xE2CC4000, 0xE2CA8000,
-	0xE2C8C000, 0xE2C70000, 0xE2C54000,
-	0xE2C38000, 0xE2C1C000, 0xE2C00000,
-	0xE2BE4000, 0xE2BC8000, 0xE2BAC000,
-	0xE2B90000, 0xE2B74000, 0xE2B58000,
-	0xE2B3C000, 0xE2B20000, 0xE2B04000,
-	0xE2AE8000, 0xE2ACC000, 0xE2AB0000,
-	0xE2A94000, 0xE2A78000, 0xE2A5C000,
-	0xE2A80000, 0xE2A66400, 0xE2A4C800,
-	0xE2A32C00, 0xE2A19000, 0xE29FF400,
-	0xE29E5800, 0xE29CBC00, 0xE29B2000,
-	0xE2998400, 0xE297E800, 0xE2964C00,
-	0xE294B000, 0xE2931400, 0xE2917800,
-	0xE28FDC00, 0xE28E4000, 0xE28CA400,
-	0xE28B0800, 0xE2896C00, 0xE287D000,
-	0xE2863400, 0xE2849800, 0xE282FC00,
-	0xE2816000, 0xE27FC400, 0xE27E2800,
-	0xE27C8C00, 0xE27AF000, 0xE2795400,
-	0xE277B800, 0xE2761C00, 0xE2748000,
-	0xE272E400, 0xE2714800, 0xE26FAC00,
-	0xE26E1000, 0xE26C7400, 0xE26AD800,
-	0xE2693C00, 0xE267A000, 0xE2660400,
-	0xE2646800, 0xE262CC00, 0xE2613000,
-	0xE25F9400, 0xE25DF800, 0xE25C5C00,
-	0xE25AC000, 0xE2592400, 0xE2578800,
-	0xE255EC00, 0xE2545000, 0xE252B400,
-	0xE2511800, 0xE24F7C00, 0xE24DE000,
-	0xE24C4400, 0xE24AA800, 0xE2490C00,
-	0xE2477000, 0xE245D400, 0xE2443800,
-	0xE2429C00, 0xE2410000, 0xE23F6400,
-	0xE23DC800, 0xE23C2C00, 0xE23A9000,
-	0xE238F400, 0xE2375800, 0xE235BC00,
-	0xE2342000, 0xE2328400, 0xE230E800,
-	0xE22F4C00, 0xE22DB000, 0xE22C1400,
-	0xE22A7800, 0xE228DC00, 0xE2274000,
-	0xE225A400, 0xE2240800, 0xE2226C00,
-	0xE220D000, 0xE21F3400, 0xE21D9800,
-	0xE21BFC00, 0xE21A6000, 0xE218C400,
-	0xE2172800, 0xE2158C00, 0xE213F000,
-	0xE2125400, 0xE210B800, 0xE20F1C00,
-	0xE20D8000, 0xE20BE400, 0xE20A4800,
-	0xE208AC00, 0xE2071000, 0xE2057400,
-	0xE203D800, 0xE2023C00, 0xE200A000,
-	0xE1FF0400, 0xE1FD6800, 0xE1FBCC00,
-	0xE1FA3000, 0xE1F89400, 0xE1F6F800,
-	0xE1F55C00, 0xE1F3C000, 0xE1F22400,
-	0xE1F08800, 0xE1EEEC00, 0xE1ED5000,
-	0xE1EBB400, 0xE1EA1800, 0xE1E87C00,
-	0xE1E6E000, 0xE1E54400, 0xE1E3A800,
-	0xE1E20C00, 0xE1E07000, 0xE1DED400,
-	0xE1DD3800, 0xE1DB9C00, 0xE1DA0000,
-	0xE1D86400, 0xE1D6C800, 0xE1D52C00,
-	0xE1D39000, 0xE1D1F400, 0xE1D05800,
-	0xE1CEBC00, 0xE1CD2000, 0xE1CB8400,
-	0xE1C9E800, 0xE1C84C00, 0xE1C6B000,
-	0xE1C51400, 0xE1C37800, 0xE1C1DC00,
-	0xE1C04000, 0xE1BEA400, 0xE1BD0800,
-	0xE1BB6C00, 0xE1B9D000, 0xE1B83400,
-	0xE1B69800, 0xE1B4FC00, 0xE1B36000,
-	0xE1B1C400, 0xE1B02800, 0xE1AE8C00,
-	0xE1ACF000, 0xE1AB5400, 0xE1A9B800,
-	0xE1A81C00, 0xE1A68000, 0xE1A4E400,
-	0xE1A34800, 0xE1A1AC00, 0xE1A01000,
-	0xE19E7400, 0xE19CD800, 0xE19B3C00,
-	0xE199A000, 0xE1980400, 0xE1966800,
-	0xE194CC00, 0xE1933000, 0xE1919400,
-	0xE18FF800, 0xE18E5C00, 0xE18CC000,
-	0xE18B2400, 0xE1898800, 0xE187EC00,
-	0xE1865000, 0xE184B400, 0xE1831800,
-	0xE1817C00, 0xE17FE000, 0xE17E4400,
-	0xE17CA800, 0xE17B0C00, 0xE1797000,
-	0xE177D400, 0xE1763800, 0xE1749C00,
-	0xE1730000, 0xE1716400, 0xE16FC800,
-	0xE16E2C00, 0xE16C9000, 0xE16AF400,
-	0xE1695800, 0xE167BC00, 0xE1662000,
-	0xE1648400, 0xE162E800, 0xE1614C00,
-	0xE15FB000, 0xE15E1400, 0xE15C7800,
-	0xE15ADC00, 0xE1594000, 0xE157A400,
-	0xE1560800, 0xE1546C00, 0xE152D000,
-	0xE1513400, 0xE14F9800, 0xE14DFC00,
-	0xE14C6000, 0xE14AC400, 0xE1492800,
-	0xE1478C00, 0xE145F000, 0xE1445400,
-	0xE142B800, 0xE1411C00, 0xE13F8000,
-	0xE13DE400, 0xE13C4800, 0xE13AAC00,
-	0xE1391000, 0xE1377400, 0xE135D800,
-	0xE1343C00, 0xE132A000, 0xE1310400,
-	0xE12F6800, 0xE12DCC00, 0xE12C3000,
-	0xE12A9400, 0xE128F800, 0xE1275C00,
-	0xE125C000, 0xE1242400, 0xE1228800,
-	0xE120EC00, 0xE11F5000, 0xE11DB400,
-	0xE11C1800, 0xE11A7C00, 0xE118E000,
-	0xE1174400, 0xE115A800, 0xE1140C00,
-	0xE1127000, 0xE110D400, 0xE10F3800,
-	0xE10D9C00, 0xE10C0000, 0xE10A6400,
-	0xE108C800, 0xE1072C00, 0xE1059000,
-	0xE103F400, 0xE1025800, 0xE100BC00,
-	0xE0FF2000, 0xE0FD8400, 0xE0FBE800,
-	0xE0FA4C00, 0xE0F8B000, 0xE0F71400,
-	0xE0F57800, 0xE0F3DC00, 0xE0F24000,
-	0xE0F0A400, 0xE0EF0800, 0xE0ED6C00,
-	0xE0EBD000, 0xE0EA3400, 0xE0E89800,
-	0xE0E6FC00, 0xE0E56000, 0xE0E3C400,
-	0xE0E22800, 0xE0E08C00, 0xE0DEF000,
-	0xE0DD5400, 0xE0DBB800, 0xE0DA1C00,
-	0xE0D88000, 0xE0D6E400, 0xE0D54800,
-	0xE0D3AC00, 0xE0D21000, 0xE0D07400,
-	0xE0CED800, 0xE0CD3C00, 0xE0CBA000,
-	0xE0CA0400, 0xE0C86800, 0xE0C6CC00,
-	0xE0C53000, 0xE0C39400, 0xE0C1F800,
-	0xE0C05C00, 0xE0BEC000, 0xE0BD2400,
-	0xE0BB8800, 0xE0B9EC00, 0xE0B85000,
-	0xE0B6B400, 0xE0B51800, 0xE0B37C00,
-	0xE0B1E000, 0xE0B04400, 0xE0AEA800,
-	0xE0AD0C00, 0xE0AB7000, 0xE0A9D400,
-	0xE0A83800, 0xE0A69C00, 0xE0A50000,
-	0xE0A36400, 0xE0A1C800, 0xE0A02C00,
-	0xE09E9000, 0xE09CF400, 0xE09B5800,
-	0xE099BC00, 0xE0982000, 0xE0968400,
-	0xE094E800, 0xE0934C00, 0xE091B000,
-	0xE0901400, 0xE08E7800, 0xE08CDC00,
-	0xE08B4000, 0xE089A400, 0xE0880800,
-	0xE0866C00, 0xE084D000, 0xE0833400,
-	0xE0819800, 0xE07FFC00, 0xE07E6000,
-	0xE07CC400, 0xE07B2800, 0xE0798C00,
-	0xE077F000, 0xE0765400, 0xE074B800,
-	0xE0731C00, 0xE0718000, 0xE06FE400,
-	0xE06E4800, 0xE06CAC00, 0xE06B1000,
-	0xE0697400, 0xE067D800, 0xE0663C00,
-	0xE064A000, 0xE0630400, 0xE0616800,
-	0xE05FCC00, 0xE05E3000, 0xE05C9400,
-	0xE05AF800, 0xE0595C00, 0xE057C000,
-	0xE0562400, 0xE0548800, 0xE052EC00,
-	0xE0515000, 0xE04FB400, 0xE04E1800,
-	0xE04C7C00, 0xE04AE000, 0xE0494400,
-	0xE047A800, 0xE0460C00, 0xE0447000,
-	0xE042D400, 0xE0413800, 0xE03F9C00,
-	0xE03E0000, 0xE03C6400, 0xE03AC800,
-	0xE0392C00, 0xE0379000, 0xE035F400,
-	0xE0345800, 0xE032BC00, 0xE0312000,
-	0xE02F8400, 0xE02DE800, 0xE02C4C00,
-	0xE02AB000, 0xE0291400, 0xE0277800,
-	0xE025DC00, 0xE0244000, 0xE022A400,
-	0xE0210800, 0xE01F6C00, 0xE01DD000,
-	0xE01C3400, 0xE01A9800, 0xE018FC00,
-	0xE0176000, 0xE015C400, 0xE0142800,
-	0xE0128C00, 0xE010F000, 0xE00F5400,
-	0xE00DB800, 0xE00C1C00, 0xE00A8000,
-	0xE008E400, 0xE0074800, 0xE005AC00,
-	0xE0041000, 0xE0027400, 0xE000D800,
-	0xDFFF3C00, 0xDFFDA000, 0xDFFC0400,
-	0xDFFA6800, 0xDFF8CC00, 0xDFF73000,
-	0xDFF59400, 0xDFF3F800, 0xDFF25C00,
-	0xDFF0C000, 0xDFEF2400, 0xDFED8800,
-	0xDFEBEC00, 0xDFEA5000, 0xDFE8B400,
-	0xDFE71800, 0xDFE57C00, 0xDFE3E000,
-	0xDFE24400, 0xDFE0A800, 0xDFDF0C00,
-	0xDFDD7000, 0xDFDBD400, 0xDFDA3800,
-	0xDFD89C00, 0xDFD70000, 0xDFD56400,
-	0xDFD3C800, 0xDFD22C00, 0xDFD09000,
-	0xDFCEF400, 0xDFCD5800, 0xDFCBBC00,
-	0xDFCA2000, 0xDFC88400, 0xDFC6E800,
-	0xDFC54C00, 0xDFC3B000, 0xDFC21400,
-	0xDFC07800, 0xDFBEDC00, 0xDFBD4000,
-	0xDFBBA400, 0xDFBA0800, 0xDFB86C00,
-	0xDFB6D000, 0xDFB53400, 0xDFB39800,
-	0xDFB1FC00, 0xDFB06000, 0xDFAEC400,
-	0xDFAD2800, 0xDFAB8C00, 0xDFA9F000,
-	0xDFA85400, 0xDFA6B800, 0xDFA51C00,
-	0xDFA38000, 0xDFA1E400, 0xDFA04800,
-	0xDF9EAC00, 0xDF9D1000, 0xDF9B7400,
-	0xDF99D800, 0xDF983C00, 0xDF96A000,
-	0xDF950400, 0xDF936800, 0xDF91CC00,
-	0xDF903000, 0xDF8E9400, 0xDF8CF800,
-	0xDF8B5C00, 0xDF89C000, 0xDF882400,
-	0xDF868800, 0xDF84EC00, 0xDF835000,
-	0xDF81B400, 0xDF801800, 0xDF7E7C00,
-	0xDF7CE000, 0xDF7B4400, 0xDF79A800,
-	0xDF780C00, 0xDF767000, 0xDF74D400,
-	0xDF733800, 0xDF719C00, 0xDF700000,
-	0xDF6E6400, 0xDF6CC800, 0xDF6B2C00,
-	0xDF699000, 0xDF67F400, 0xDF665800,
-	0xDF64BC00, 0xDF632000, 0xDF618400,
-	0xDF5FE800, 0xDF5E4C00, 0xDF5CB000,
-	0xDF5B1400, 0xDF597800, 0xDF57DC00,
-	0xDF564000, 0xDF54A400, 0xDF530800,
-	0xDF516C00, 0xDF4FD000, 0xDF4E3400,
-	0xDF4C9800, 0xDF4AFC00, 0xDF496000,
-	0xDF47C400, 0xDF462800, 0xDF448C00,
-	0xDF42F000, 0xDF415400, 0xDF3FB800,
-	0xDF3E1C00, 0xDF3C8000, 0xDF3AE400,
-	0xDF394800, 0xDF37AC00, 0xDF361000,
-	0xDF347400, 0xDF32D800, 0xDF313C00,
-	0xDF2FA000, 0xDF2E0400, 0xDF2C6800,
-	0xDF2ACC00, 0xDF293000, 0xDF279400,
-	0xDF25F800, 0xDF245C00, 0xDF22C000,
-	0xDF212400, 0xDF1F8800, 0xDF1DEC00,
-	0xDF1C5000, 0xDF1AB400, 0xDF191800,
-	0xDF177C00, 0xDF15E000, 0xDF144400,
-	0xDF12A800, 0xDF110C00, 0xDF0F7000,
-	0xDF0DD400, 0xDF0C3800, 0xDF0A9C00,
-	0xDF090000, 0xDF076400, 0xDF05C800,
-	0xDF042C00, 0xDF029000, 0xDF00F400,
-	0xDEFF5800, 0xDEFDBC00, 0xDEFC2000,
-	0xDEFA8400, 0xDEF8E800, 0xDEF74C00,
-	0xDEF5B000, 0xDEF41400, 0xDEF27800,
-	0xDEF0DC00, 0xDEEF4000, 0xDEEDA400,
-	0xDEEC0800, 0xDEEA6C00, 0xDEE8D000,
-	0xDEE73400, 0xDEE59800, 0xDEE3FC00,
-	0xDEE26000, 0xDEE0C400, 0xDEDF2800,
-	0xDEDD8C00, 0xDEDBF000, 0xDEDA5400,
-	0xDED8B800, 0xDED71C00, 0xDED58000,
-	0xDED3E400, 0xDED24800, 0xDED0AC00,
-	0xDECF1000, 0xDECD7400, 0xDECBD800,
-	0xDECA3C00, 0xDEC8A000, 0xDEC70400,
-	0xDEC56800, 0xDEC3CC00, 0xDEC23000,
-	0xDEC09400, 0xDEBEF800, 0xDEBD5C00,
-	0xDEBBC000, 0xDEBA2400, 0xDEB88800,
-	0xDEB6EC00, 0xDEB55000, 0xDEB3B400,
-	0xDEB21800, 0xDEB07C00, 0xDEAEE000,
-	0xDEAD4400, 0xDEABA800, 0xDEAA0C00,
-	0xDEA87000, 0xDEA6D400, 0xDEA53800,
-	0xDEA39C00, 0xDEA20000, 0xDEA06400,
-	0xDE9EC800, 0xDE9D2C00, 0xDE9B9000,
-	0xDE99F400, 0xDE985800, 0xDE96BC00,
-	0xDE952000, 0xDE938400, 0xDE91E800,
-	0xDE904C00, 0xDE8EB000, 0xDE8D1400,
-	0xDE8B7800, 0xDE89DC00, 0xDE884000,
-	0xDE86A400, 0xDE850800, 0xDE836C00,
-	0xDE81D000, 0xDE803400, 0xDE7E9800,
-	0xDE7CFC00, 0xDE7B6000, 0xDE79C400,
-	0xDE782800, 0xDE768C00, 0xDE74F000,
-	0xDE735400, 0xDE71B800, 0xDE701C00,
-	0xDE6E8000, 0xDE6CE400, 0xDE6B4800,
-	0xDE69AC00, 0xDE681000, 0xDE667400,
-	0xDE64D800, 0xDE633C00, 0xDE61A000,
-	0xDE600400, 0xDE5E6800, 0xDE5CCC00,
-	0xDE5B3000, 0xDE599400, 0xDE57F800,
-	0xDE565C00, 0xDE54C000, 0xDE532400,
-	0xDE518800, 0xDE4FEC00, 0xDE4E5000,
-	0xDE4CB400, 0xDE4B1800, 0xDE497C00,
-	0xDE47E000, 0xDE464400, 0xDE44A800,
-	0xDE430C00, 0xDE417000, 0xDE3FD400,
-	0xDE3E3800, 0xDE3C9C00, 0xDE3B0000,
-	0xDE396400, 0xDE37C800, 0xDE362C00,
-	0xDE349000, 0xDE32F400, 0xDE315800,
-	0xDE2FBC00, 0xDE2E2000, 0xDE2C8400,
-	0xDE2AE800, 0xDE294C00, 0xDE27B000,
-	0xDE261400, 0xDE247800, 0xDE22DC00,
-	0xDE214000, 0xDE1FA400, 0xDE1E0800,
-	0xDE1C6C00, 0xDE1AD000, 0xDE193400,
-	0xDE179800, 0xDE15FC00, 0xDE146000,
-	0xDE12C400, 0xDE112800, 0xDE0F8C00,
-	0xDE0DF000, 0xDE0C5400, 0xDE0AB800,
-	0xDE091C00, 0xDE078000, 0xDE05E400,
-	0xDE044800, 0xDE02AC00, 0xDE011000,
-	0xDDFF7400, 0xDDFDD800, 0xDDFC3C00,
-	0xDDFAA000, 0xDDF90400, 0xDDF76800,
-	0xDDF5CC00, 0xDDF43000, 0xDDF29400,
-	0xDDF0F800, 0xDDEF5C00, 0xDDEDC000,
-	0xDDEC2400, 0xDDEA8800, 0xDDE8EC00,
-	0xDDE75000, 0xDDE5B400, 0xDDE41800,
-	0xDDE27C00, 0xDDE0E000, 0xDDDF4400,
-	0xDDDDA800, 0xDDDC0C00, 0xDDDA7000,
-	0xDDD8D400, 0xDDD73800, 0xDDD59C00,
-	0xDDD40000, 0xDDD26400, 0xDDD0C800,
-	0xDDCF2C00, 0xDDCD9000, 0xDDCBF400,
-	0xDDCA5800, 0xDDC8BC00, 0xDDC72000,
-	0xDDC58400, 0xDDC3E800, 0xDDC24C00,
-	0xDDC0B000, 0xDDBF1400, 0xDDBD7800,
-	0xDDBBDC00, 0xDDBA4000, 0xDDB8A400,
-	0xDDB70800, 0xDDB56C00, 0xDDB3D000,
-	0xDDB23400, 0xDDB09800, 0xDDAEFC00,
-	0xDDAD6000, 0xDDABC400, 0xDDAA2800,
-	0xDDA88C00, 0xDDA6F000, 0xDDA55400,
-	0xDDA3B800, 0xDDA21C00, 0xDDA08000,
-	0xDD9EE400, 0xDD9D4800, 0xDD9BAC00,
-	0xDD9A1000, 0xDD987400, 0xDD96D800,
-	0xDD953C00, 0xDD93A000, 0xDD920400,
-	0xDD906800, 0xDD8ECC00, 0xDD8D3000,
-	0xDD8B9400, 0xDD89F800, 0xDD885C00,
-	0xDD86C000, 0xDD852400, 0xDD838800,
-	0xDD81EC00, 0xDD805000, 0xDD7EB400,
-	0xDD7D1800, 0xDD7B7C00, 0xDD79E000,
-	0xDD784400, 0xDD76A800, 0xDD750C00,
-	0xDD737000, 0xDD71D400, 0xDD703800,
-	0xDD6E9C00, 0xDD6D0000, 0xDD6B6400,
-	0xDD69C800, 0xDD682C00, 0xDD669000,
-	0xDD64F400, 0xDD635800, 0xDD61BC00,
-	0xDD602000, 0xDD5E8400, 0xDD5CE800,
-	0xDD5B4C00, 0xDD59B000, 0xDD581400,
-	0xDD567800, 0xDD54DC00, 0xDD534000,
-	0xDD51A400, 0xDD500800, 0xDD4E6C00,
-	0xDD4CD000, 0xDD4B3400, 0xDD499800,
-	0xDD47FC00, 0xDD466000, 0xDD44C400,
-	0xDD432800, 0xDD418C00, 0xDD3FF000,
-	0xDD3E5400, 0xDD3CB800, 0xDD3B1C00,
-	0xDD398000, 0xDD37E400, 0xDD364800,
-	0xDD34AC00, 0xDD331000, 0xDD317400,
-	0xDD2FD800, 0xDD2E3C00, 0xDD2CA000,
-	0xDD2B0400, 0xDD296800, 0xDD27CC00,
-	0xDD263000, 0xDD249400, 0xDD22F800,
-	0xDD215C00, 0xDD1FC000, 0xDD1E2400,
-	0xDD1C8800, 0xDD1AEC00, 0xDD195000,
-	0xDD17B400, 0xDD161800, 0xDD147C00,
-	0xDD12E000, 0xDD114400, 0xDD0FA800,
-	0xDD0E0C00, 0xDD0C7000, 0xDD0AD400,
-	0xDD093800, 0xDD079C00, 0xDD060000,
-	0xDD046400, 0xDD02C800, 0xDD012C00,
-	0xDCFF9000, 0xDCFDF400, 0xDCFC5800,
-	0xDCFABC00, 0xDCF92000, 0xDCF78400,
-	0xDCF5E800, 0xDCF44C00, 0xDCF2B000,
-	0xDCF11400, 0xDCEF7800, 0xDCEDDC00,
-	0xDCEC4000, 0xDCEAA400, 0xDCE90800,
-	0xDCE76C00, 0xDCE5D000, 0xDCE43400,
-	0xDCE29800, 0xDCE0FC00, 0xDCDF6000,
-	0xDCDDC400, 0xDCDC2800, 0xDCDA8C00,
-	0xDCD8F000, 0xDCD75400, 0xDCD5B800,
-	0xDCD41C00, 0xDCD28000, 0xDCD0E400,
-	0xDCCF4800, 0xDCCDAC00, 0xDCCC1000,
-	0xDCCA7400, 0xDCC8D800, 0xDCC73C00,
-	0xDCC5A000, 0xDCC40400, 0xDCC26800,
-	0xDCC0CC00, 0xDCBF3000, 0xDCBD9400,
-	0xDCBBF800, 0xDCBA5C00, 0xDCB8C000,
-	0xDCB72400, 0xDCB58800, 0xDCB3EC00,
-	0xDCB25000, 0xDCB0B400, 0xDCAF1800,
-	0xDCAD7C00, 0xDCABE000, 0xDCAA4400,
-	0xDCA8A800, 0xDCA70C00, 0xDCA57000,
-	0xDCA3D400, 0xDCA23800, 0xDCA09C00,
-	0xDC9F0000, 0xDC9D6400, 0xDC9BC800,
-	0xDC9A2C00, 0xDC989000, 0xDC96F400,
-	0xDC955800, 0xDC93BC00, 0xDC922000,
-	0xDC908400, 0xDC8EE800, 0xDC8D4C00,
-	0xDC8BB000, 0xDC8A1400, 0xDC887800,
-	0xDC86DC00, 0xDC854000, 0xDC83A400,
-	0xDC820800, 0xDC806C00, 0xDC7ED000,
-	0xDC7D3400, 0xDC7B9800, 0xDC79FC00,
-	0xDC786000, 0xDC76C400, 0xDC752800,
-	0xDC738C00, 0xDC71F000, 0xDC705400,
-	0xDC6EB800, 0xDC6D1C00, 0xDC6B8000,
-	0xDC69E400, 0xDC684800, 0xDC66AC00,
-	0xDC651000, 0xDC637400, 0xDC61D800,
-	0xDC603C00, 0xDC5EA000, 0xDC5D0400,
-	0xDC5B6800, 0xDC59CC00, 0xDC583000,
-	0xDC569400, 0xDC54F800, 0xDC535C00,
-	0xDC51C000, 0xDC502400, 0xDC4E8800,
-	0xDC4CEC00, 0xDC4B5000, 0xDC49B400,
-	0xDC481800, 0xDC467C00, 0xDC44E000,
-	0xDC434400, 0xDC41A800, 0xDC400C00,
-	0xDC3E7000, 0xDC3CD400, 0xDC3B3800,
-	0xDC399C00, 0xDC380000, 0xDC366400,
-	0xDC34C800, 0xDC332C00, 0xDC319000,
-	0xDC2FF400, 0xDC2E5800, 0xDC2CBC00,
-	0xDC2B2000, 0xDC298400, 0xDC27E800,
-	0xDC264C00, 0xDC24B000, 0xDC231400,
-	0xDC217800, 0xDC1FDC00, 0xDC1E4000,
-	0xDC1CA400, 0xDC1B0800, 0xDC196C00,
-	0xDC17D000, 0xDC163400, 0xDC149800,
-	0xDC12FC00, 0xDC116000, 0xDC0FC400,
-	0xDC0E2800, 0xDC0C8C00, 0xDC0AF000,
-	0xDC095400, 0xDC07B800, 0xDC061C00,
-	0xDC048000, 0xDC02E400, 0xDC014800,
-	0xDBFFAC00, 0xDBFE1000, 0xDBFC7400,
-	0xDBFAD800, 0xDBF93C00, 0xDBF7A000,
-	0xDBF60400, 0xDBF46800, 0xDBF2CC00,
-	0xDBF13000, 0xDBEF9400, 0xDBEDF800,
-	0xDBEC5C00, 0xDBEAC000, 0xDBE92400,
-	0xDBE78800, 0xDBE5EC00, 0xDBE45000,
-	0xDBE2B400, 0xDBE11800, 0xDBDF7C00,
-	0xDBDDE000, 0xDBDC4400, 0xDBDAA800,
-	0xDBD90C00, 0xDBD77000, 0xDBD5D400,
-	0xDBD43800, 0xDBD29C00, 0xDBD10000,
-	0xDBCF6400, 0xDBCDC800, 0xDBCC2C00,
-	0xDBCA9000, 0xDBC8F400, 0xDBC75800,
-	0xDBC5BC00, 0xDBC42000, 0xDBC28400,
-	0xDBC0E800, 0xDBBF4C00, 0xDBBDB000,
-	0xDBBC1400, 0xDBBA7800, 0xDBB8DC00,
-	0xDBB74000, 0xDBB5A400, 0xDBB40800,
-	0xDBB26C00, 0xDBB0D000, 0xDBAF3400,
-	0xDBAD9800, 0xDBABFC00, 0xDBAA6000,
-	0xDBA8C400, 0xDBA72800, 0xDBA58C00,
-	0xDBA3F000, 0xDBA25400, 0xDBA0B800,
-	0xDB9F1C00, 0xDB9D8000, 0xDB9BE400,
-	0xDB9A4800, 0xDB98AC00, 0xDB971000,
-	0xDB957400, 0xDB93D800, 0xDB923C00,
-	0xDB90A000, 0xDB8F0400, 0xDB8D6800,
-	0xDB8BCC00, 0xDB8A3000, 0xDB889400,
-	0xDB86F800, 0xDB855C00, 0xDB83C000,
-	0xDB822400, 0xDB808800, 0xDB7EEC00,
-	0xDB7D5000, 0xDB7BB400, 0xDB7A1800,
-	0xDB787C00, 0xDB76E000, 0xDB754400,
-	0xDB73A800, 0xDB720C00, 0xDB707000,
-	0xDB6ED400, 0xDB6D3800, 0xDB6B9C00,
-	0xDB6A0000, 0xDB686400, 0xDB66C800,
-	0xDB652C00, 0xDB639000, 0xDB61F400,
-	0xDB605800, 0xDB5EBC00, 0xDB5D2000,
-	0xDB5B8400, 0xDB59E800, 0xDB584C00,
-	0xDB56B000, 0xDB551400, 0xDB537800,
-	0xDB51DC00, 0xDB504000, 0xDB4EA400,
-	0xDB4D0800, 0xDB4B6C00, 0xDB49D000,
-	0xDB483400, 0xDB469800, 0xDB44FC00,
-	0xDB436000, 0xDB41C400, 0xDB402800,
-	0xDB3E8C00, 0xDB3CF000, 0xDB3B5400,
-	0xDB39B800, 0xDB381C00, 0xDB368000,
-	0xDB34E400, 0xDB334800, 0xDB31AC00,
-	0xDB301000, 0xDB2E7400, 0xDB2CD800,
-	0xDB2B3C00, 0xDB29A000, 0xDB280400,
-	0xDB266800, 0xDB24CC00, 0xDB233000,
-	0xDB219400, 0xDB1FF800, 0xDB1E5C00,
-	0xDB1CC000, 0xDB1B2400, 0xDB198800,
-	0xDB17EC00, 0xDB165000, 0xDB14B400,
-	0xDB131800, 0xDB117C00, 0xDB0FE000,
-	0xDB0E4400, 0xDB0CA800, 0xDB0B0C00,
-	0xDB097000, 0xDB07D400, 0xDB063800,
-	0xDB049C00, 0xDB030000, 0xDB016400,
-	0xDAFFC800, 0xDAFE2C00, 0xDAFC9000,
-	0xDAFAF400, 0xDAF95800, 0xDAF7BC00,
-	0xDAF62000, 0xDAF48400, 0xDAF2E800,
-	0xDAF14C00, 0xDAEFB000, 0xDAEE1400,
-	0xDAEC7800, 0xDAEADC00, 0xDAE94000,
-	0xDAE7A400, 0xDAE60800, 0xDAE46C00,
-	0xDAE2D000, 0xDAE13400, 0xDADF9800,
-	0xDADDFC00, 0xDADC6000, 0xDADAC400,
-	0xDAD92800, 0xDAD78C00, 0xDAD5F000,
-	0xDAD45400, 0xDAD2B800, 0xDAD11C00,
-	0xDACF8000, 0xDACDE400, 0xDACC4800,
-	0xDACAAC00, 0xDAC91000, 0xDAC77400,
-	0xDAC5D800, 0xDAC43C00, 0xDAC2A000,
-	0xDAC10400, 0xDABF6800, 0xDABDCC00,
-	0xDABC3000, 0xDABA9400, 0xDAB8F800,
-	0xDAB75C00, 0xDAB5C000, 0xDAB42400,
-	0xDAB28800, 0xDAB0EC00, 0xDAAF5000,
-	0xDAADB400, 0xDAAC1800, 0xDAAA7C00,
-	0xDAA8E000, 0xDAA74400, 0xDAA5A800,
-	0xDAA40C00, 0xDAA27000, 0xDAA0D400,
-	0xDA9F3800, 0xDA9D9C00, 0xDA9C0000,
-	0xDA9A6400, 0xDA98C800, 0xDA972C00,
-	0xDA959000, 0xDA93F400, 0xDA925800,
-	0xDA90BC00, 0xDA8F2000, 0xDA8D8400,
-	0xDA8BE800, 0xDA8A4C00, 0xDA88B000,
-	0xDA871400, 0xDA857800, 0xDA83DC00,
-	0xDA824000, 0xDA80A400, 0xDA7F0800,
-	0xDA7D6C00, 0xDA7BD000, 0xDA7A3400,
-	0xDA789800, 0xDA76FC00, 0xDA756000,
-	0xDA73C400, 0xDA722800, 0xDA708C00,
-	0xDA6EF000, 0xDA6D5400, 0xDA6BB800,
-	0xDA6A1C00, 0xDA688000, 0xDA66E400,
-	0xDA654800, 0xDA63AC00, 0xDA621000,
-	0xDA607400, 0xDA5ED800, 0xDA5D3C00,
-	0xDA5BA000, 0xDA5A0400, 0xDA586800,
-	0xDA56CC00, 0xDA553000, 0xDA539400,
-	0xDA51F800, 0xDA505C00, 0xDA4EC000,
-	0xDA4D2400, 0xDA4B8800, 0xDA49EC00,
-	0xDA485000, 0xDA46B400, 0xDA451800,
-	0xDA437C00, 0xDA41E000, 0xDA404400,
-	0xDA3EA800, 0xDA3D0C00, 0xDA3B7000,
-	0xDA39D400, 0xDA383800, 0xDA369C00,
-	0xDA350000, 0xDA336400, 0xDA31C800,
-	0xDA302C00, 0xDA2E9000, 0xDA2CF400,
-	0xDA2B5800, 0xDA29BC00, 0xDA282000,
-	0xDA268400, 0xDA24E800, 0xDA234C00,
-	0xDA21B000, 0xDA201400, 0xDA1E7800,
-	0xDA1CDC00, 0xDA1B4000, 0xDA19A400,
-	0xDA180800, 0xDA166C00, 0xDA14D000,
-	0xDA133400, 0xDA119800, 0xDA0FFC00,
-	0xDA0E6000, 0xDA0CC400, 0xDA0B2800,
-	0xDA098C00, 0xDA07F000, 0xDA065400,
-	0xDA04B800, 0xDA031C00, 0xDA018000,
-	0xD9FFE400, 0xD9FE4800, 0xD9FCAC00,
-	0xD9FB1000, 0xD9F97400, 0xD9F7D800,
-	0xD9F63C00, 0xD9F4A000, 0xD9F30400,
-	0xD9F16800, 0xD9EFCC00, 0xD9EE3000,
-	0xD9EC9400, 0xD9EAF800, 0xD9E95C00,
-	0xD9E7C000, 0xD9E62400, 0xD9E48800,
-	0xD9E2EC00, 0xD9E15000, 0xD9DFB400,
-	0xD9DE1800, 0xD9DC7C00, 0xD9DAE000,
-	0xD9D94400, 0xD9D7A800, 0xD9D60C00,
-	0xD9D47000, 0xD9D2D400, 0xD9D13800,
-	0xD9CF9C00, 0xD9CE0000, 0xD9CC6400,
-	0xD9CAC800, 0xD9C92C00, 0xD9C79000,
-	0xD9C5F400, 0xD9C45800, 0xD9C2BC00,
-	0xD9C12000, 0xD9BF8400, 0xD9BDE800,
-	0xD9BC4C00, 0xD9BAB000, 0xD9B91400,
-	0xD9B77800, 0xD9B5DC00, 0xD9B44000,
-	0xD9B2A400, 0xD9B10800, 0xD9AF6C00,
-	0xD9ADD000, 0xD9AC3400, 0xD9AA9800,
-	0xD9A8FC00, 0xD9A76000, 0xD9A5C400,
-	0xD9A42800, 0xD9A28C00, 0xD9A0F000,
-	0xD99F5400, 0xD99DB800, 0xD99C1C00,
-	0xD99A8000, 0xD998E400, 0xD9974800,
-	0xD995AC00, 0xD9941000, 0xD9927400,
-	0xD990D800, 0xD98F3C00, 0xD98DA000,
-	0xD98C0400, 0xD98A6800, 0xD988CC00,
-	0xD9873000, 0xD9859400, 0xD983F800,
-	0xD9825C00, 0xD980C000, 0xD97F2400,
-	0xD97D8800, 0xD97BEC00, 0xD97A5000,
-	0xD978B400, 0xD9771800, 0xD9757C00,
-	0xD973E000, 0xD9724400, 0xD970A800,
-	0xD96F0C00, 0xD96D7000, 0xD96BD400,
-	0xD96A3800, 0xD9689C00, 0xD9670000,
-	0xD9656400, 0xD963C800, 0xD9622C00,
-	0xD9609000, 0xD95EF400, 0xD95D5800,
-	0xD95BBC00, 0xD95A2000, 0xD9588400,
-	0xD956E800, 0xD9554C00, 0xD953B000,
-	0xD9521400, 0xD9507800, 0xD94EDC00,
-	0xD94D4000, 0xD94BA400, 0xD94A0800,
-	0xD9486C00, 0xD946D000, 0xD9453400,
-	0xD9439800, 0xD941FC00, 0xD9406000,
-	0xD93EC400, 0xD93D2800, 0xD93B8C00,
-	0xD939F000, 0xD9385400, 0xD936B800,
-	0xD9351C00, 0xD9338000, 0xD931E400,
-	0xD9304800, 0xD92EAC00, 0xD92D1000,
-	0xD92B7400, 0xD929D800, 0xD9283C00,
-	0xD926A000, 0xD9250400, 0xD9236800,
-	0xD921CC00, 0xD9203000, 0xD91E9400,
-	0xD91CF800, 0xD91B5C00, 0xD919C000,
-	0xD9182400, 0xD9168800, 0xD914EC00,
-	0xD9135000, 0xD911B400, 0xD9101800,
-	0xD90E7C00, 0xD90CE000, 0xD90B4400,
-	0xD909A800, 0xD9080C00, 0xD9067000,
-	0xD904D400, 0xD9033800, 0xD9019C00,
-	0xD9000000, 0xD8FE6400, 0xD8FCC800,
-	0xD8FB2C00, 0xD8F99000, 0xD8F7F400,
-	0xD8F65800, 0xD8F4BC00, 0xD8F32000,
-	0xD8F18400, 0xD8EFE800, 0xD8EE4C00,
-	0xD8ECB000, 0xD8EB1400, 0xD8E97800,
-	0xD8E7DC00, 0xD8E64000, 0xD8E4A400,
-	0xD8E30800, 0xD8E16C00, 0xD8DFD000,
-	0xD8DE3400, 0xD8DC9800, 0xD8DAFC00,
-	0xD8D96000, 0xD8D7C400, 0xD8D62800,
-	0xD8D48C00, 0xD8D2F000, 0xD8D15400,
-	0xD8CFB800, 0xD8CE1C00, 0xD8CC8000,
-	0xD8CAE400, 0xD8C94800, 0xD8C7AC00,
-	0xD8C61000, 0xD8C47400, 0xD8C2D800,
-	0xD8C13C00, 0xD8BFA000, 0xD8BE0400,
-	0xD8BC6800, 0xD8BACC00, 0xD8B93000,
-	0xD8B79400, 0xD8B5F800, 0xD8B45C00,
-	0xD8B2C000, 0xD8B12400, 0xD8AF8800,
-	0xD8ADEC00, 0xD8AC5000, 0xD8AAB400,
-	0xD8A91800, 0xD8A77C00, 0xD8A5E000,
-	0xD8A44400, 0xD8A2A800, 0xD8A10C00,
-	0xD89F7000, 0xD89DD400, 0xD89C3800,
-	0xD89A9C00, 0xD8990000, 0xD8976400,
-	0xD895C800, 0xD8942C00, 0xD8929000,
-	0xD890F400, 0xD88F5800, 0xD88DBC00,
-	0xD88C2000, 0xD88A8400, 0xD888E800,
-	0xD8874C00, 0xD885B000, 0xD8841400,
-	0xD8827800, 0xD880DC00, 0xD87F4000,
-	0xD87DA400, 0xD87C0800, 0xD87A6C00,
-	0xD878D000, 0xD8773400, 0xD8759800,
-	0xD873FC00, 0xD8726000, 0xD870C400,
-	0xD86F2800, 0xD86D8C00, 0xD86BF000,
-	0xD86A5400, 0xD868B800, 0xD8671C00,
-	0xD8658000, 0xD863E400, 0xD8624800,
-	0xD860AC00, 0xD85F1000, 0xD85D7400,
-	0xD85BD800, 0xD85A3C00, 0xD858A000,
-	0xD8570400, 0xD8556800, 0xD853CC00,
-	0xD8523000, 0xD8509400, 0xD84EF800,
-	0xD84D5C00, 0xD84BC000, 0xD84A2400,
-	0xD8488800, 0xD846EC00, 0xD8455000,
-	0xD843B400, 0xD8421800, 0xD8407C00,
-	0xD83EE000, 0xD83D4400, 0xD83BA800,
-	0xD83A0C00, 0xD8387000, 0xD836D400,
-	0xD8353800, 0xD8339C00, 0xD8320000,
-	0xD8306400, 0xD82EC800, 0xD82D2C00,
-	0xD82B9000, 0xD829F400, 0xD8285800,
-	0xD826BC00, 0xD8252000, 0xD8238400,
-	0xD821E800, 0xD8204C00, 0xD81EB000,
-	0xD81D1400, 0xD81B7800, 0xD819DC00,
-	0xD8184000, 0xD816A400, 0xD8150800,
-	0xD8136C00, 0xD811D000, 0xD8103400,
-	0xD80E9800, 0xD80CFC00, 0xD80B6000,
-	0xD809C400, 0xD8082800, 0xD8068C00,
-	0xD804F000, 0xD8035400, 0xD801B800,
-	0xD8001C00, 0xD7FE8000, 0xD7FCE400,
-	0xD7FB4800, 0xD7F9AC00, 0xD7F81000,
-	0xD7F67400, 0xD7F4D800, 0xD7F33C00,
-	0xD7F1A000, 0xD7F00400, 0xD7EE6800,
-	0xD7ECCC00, 0xD7EB3000, 0xD7E99400,
-	0xD7E7F800, 0xD7E65C00, 0xD7E4C000,
-	0xD7E32400, 0xD7E18800, 0xD7DFEC00,
-	0xD7DE5000, 0xD7DCB400, 0xD7DB1800,
-	0xD7D97C00, 0xD7D7E000, 0xD7D64400,
-	0xD7D4A800, 0xD7D30C00, 0xD7D17000,
-	0xD7CFD400, 0xD7CE3800, 0xD7CC9C00,
-	0xD7CB0000, 0xD7C96400, 0xD7C7C800,
-	0xD7C62C00, 0xD7C49000, 0xD7C2F400,
-	0xD7C15800, 0xD7BFBC00, 0xD7BE2000,
-	0xD7BC8400, 0xD7BAE800, 0xD7B94C00,
-	0xD7B7B000, 0xD7B61400, 0xD7B47800,
-	0xD7B2DC00, 0xD7B14000, 0xD7AFA400,
-	0xD7AE0800, 0xD7AC6C00, 0xD7AAD000,
-	0xD7A93400, 0xD7A79800, 0xD7A5FC00,
-	0xD7A46000, 0xD7A2C400, 0xD7A12800,
-	0xD79F8C00, 0xD79DF000, 0xD79C5400,
-	0xD79AB800, 0xD7991C00, 0xD7978000,
-	0xD795E400, 0xD7944800, 0xD792AC00,
-	0xD7911000, 0xD78F7400, 0xD78DD800,
-	0xD78C3C00, 0xD78AA000, 0xD7890400,
-	0xD7876800, 0xD785CC00, 0xD7843000,
-	0xD7829400, 0xD780F800, 0xD77F5C00,
-	0xD77DC000, 0xD77C2400, 0xD77A8800,
-	0xD778EC00, 0xD7775000, 0xD775B400,
-	0xD7741800, 0xD7727C00, 0xD770E000,
-	0xD76F4400, 0xD76DA800, 0xD76C0C00,
-	0xD76A7000, 0xD768D400, 0xD7673800,
-	0xD7659C00, 0xD7640000, 0xD7626400,
-	0xD760C800, 0xD75F2C00, 0xD75D9000,
-	0xD75BF400, 0xD75A5800, 0xD758BC00,
-	0xD7572000, 0xD7558400, 0xD753E800,
-	0xD7524C00, 0xD750B000, 0xD74F1400,
-	0xD74D7800, 0xD74BDC00, 0xD74A4000,
-	0xD748A400, 0xD7470800, 0xD7456C00,
-	0xD743D000, 0xD7423400, 0xD7409800,
-	0xD73EFC00, 0xD73D6000, 0xD73BC400,
-	0xD73A2800, 0xD7388C00, 0xD736F000,
-	0xD7355400, 0xD733B800, 0xD7321C00,
-	0xD7308000, 0xD72EE400, 0xD72D4800,
-	0xD72BAC00, 0xD72A1000, 0xD7287400,
-	0xD726D800, 0xD7253C00, 0xD723A000,
-	0xD7220400, 0xD7206800, 0xD71ECC00,
-	0xD71D3000, 0xD71B9400, 0xD719F800,
-	0xD7185C00, 0xD716C000, 0xD7152400,
-	0xD7138800, 0xD711EC00, 0xD7105000,
-	0xD70EB400, 0xD70D1800, 0xD70B7C00,
-	0xD709E000, 0xD7084400, 0xD706A800,
-	0xD7050C00, 0xD7037000, 0xD701D400,
-	0xD7003800, 0xD6FE9C00, 0xD6FD0000,
-	0xD6FB6400, 0xD6F9C800, 0xD6F82C00,
-	0xD6F69000, 0xD6F4F400, 0xD6F35800,
-	0xD6F1BC00, 0xD6F02000, 0xD6EE8400,
-	0xD6ECE800, 0xD6EB4C00, 0xD6E9B000,
-	0xD6E81400, 0xD6E67800, 0xD6E4DC00,
-	0xD6E34000, 0xD6E1A400, 0xD6E00800,
-	0xD6DE6C00, 0xD6DCD000, 0xD6DB3400,
-	0xD6D99800, 0xD6D7FC00, 0xD6D66000,
-	0xD6D4C400, 0xD6D32800, 0xD6D18C00,
-	0xD6CFF000, 0xD6CE5400, 0xD6CCB800,
-	0xD6CB1C00, 0xD6C98000, 0xD6C7E400,
-	0xD6C64800, 0xD6C4AC00, 0xD6C31000,
-	0xD6C17400, 0xD6BFD800, 0xD6BE3C00,
-	0xD6BCA000, 0xD6BB0400, 0xD6B96800,
-	0xD6B7CC00, 0xD6B63000, 0xD6B49400,
-	0xD6B2F800, 0xD6B15C00, 0xD6AFC000,
-	0xD6AE2400, 0xD6AC8800, 0xD6AAEC00,
-	0xD6A95000, 0xD6A7B400, 0xD6A61800,
-	0xD6A47C00, 0xD6A2E000, 0xD6A14400,
-	0xD69FA800, 0xD69E0C00, 0xD69C7000,
-	0xD69AD400, 0xD6993800, 0xD6979C00,
-	0xD6960000, 0xD6946400, 0xD692C800,
-	0xD6912C00, 0xD68F9000, 0xD68DF400,
-	0xD68C5800, 0xD68ABC00, 0xD6892000,
-	0xD6878400, 0xD685E800, 0xD6844C00,
-	0xD682B000, 0xD6811400, 0xD67F7800,
-	0xD67DDC00, 0xD67C4000, 0xD67AA400,
-	0xD6790800, 0xD6776C00, 0xD675D000,
-	0xD6743400, 0xD6729800, 0xD670FC00,
-	0xD66F6000, 0xD66DC400, 0xD66C2800,
-	0xD66A8C00, 0xD668F000, 0xD6675400,
-	0xD665B800, 0xD6641C00, 0xD6628000,
-	0xD660E400, 0xD65F4800, 0xD65DAC00,
-	0xD65C1000, 0xD65A7400, 0xD658D800,
-	0xD6573C00, 0xD655A000, 0xD6540400,
-	0xD6526800, 0xD650CC00, 0xD64F3000,
-	0xD64D9400, 0xD64BF800, 0xD64A5C00,
-	0xD648C000, 0xD6472400, 0xD6458800,
-	0xD643EC00, 0xD6425000, 0xD640B400,
-	0xD63F1800, 0xD63D7C00, 0xD63BE000,
-	0xD63A4400, 0xD638A800, 0xD6370C00,
-	0xD6357000, 0xD633D400, 0xD6323800,
-	0xD6309C00, 0xD62F0000, 0xD62D6400,
-	0xD62BC800, 0xD62A2C00, 0xD6289000,
-	0xD626F400, 0xD6255800, 0xD623BC00,
-	0xD6222000, 0xD6208400, 0xD61EE800,
-	0xD61D4C00, 0xD61BB000, 0xD61A1400,
-	0xD6187800, 0xD616DC00, 0xD6154000,
-	0xD613A400, 0xD6120800, 0xD6106C00,
-	0xD60ED000, 0xD60D3400, 0xD60B9800,
-	0xD609FC00, 0xD6086000, 0xD606C400,
-	0xD6052800, 0xD6038C00, 0xD601F000,
-	0xD6005400, 0xD5FEB800, 0xD5FD1C00,
-	0xD5FB8000, 0xD5F9E400, 0xD5F84800,
-	0xD5F6AC00, 0xD5F51000, 0xD5F37400,
-	0xD5F1D800, 0xD5F03C00, 0xD5EEA000,
-	0xD5ED0400, 0xD5EB6800, 0xD5E9CC00,
-	0xD5E83000, 0xD5E69400, 0xD5E4F800,
-	0xD5E35C00, 0xD5E1C000, 0xD5E02400,
-	0xD5DE8800, 0xD5DCEC00, 0xD5DB5000,
-	0xD5D9B400, 0xD5D81800, 0xD5D67C00,
-	0xD5D4E000, 0xD5D34400, 0xD5D1A800,
-	0xD5D00C00, 0xD5CE7000, 0xD5CCD400,
-	0xD5CB3800, 0xD5C99C00, 0xD5C80000,
-	0xD5C68380, 0xD5C50700, 0xD5C38A80,
-	0xD5C20E00, 0xD5C09180, 0xD5BF1500,
-	0xD5BD9880, 0xD5BC1C00, 0xD5BA9F80,
-	0xD5B92300, 0xD5B7A680, 0xD5B62A00,
-	0xD5B4AD80, 0xD5B33100, 0xD5B1B480,
-	0xD5B03800, 0xD5AEBB80, 0xD5AD3F00,
-	0xD5ABC280, 0xD5AA4600, 0xD5A8C980,
-	0xD5A74D00, 0xD5A5D080, 0xD5A45400,
-	0xD5A2D780, 0xD5A15B00, 0xD59FDE80,
-	0xD59E6200, 0xD59CE580, 0xD59B6900,
-	0xD599EC80, 0xD5987000, 0xD596F380,
-	0xD5957700, 0xD593FA80, 0xD5927E00,
-	0xD5910180, 0xD58F8500, 0xD58E0880,
-	0xD58C8C00, 0xD58B0F80, 0xD5899300,
-	0xD5881680, 0xD5869A00, 0xD5851D80,
-	0xD583A100, 0xD5822480, 0xD580A800,
-	0xD57F2B80, 0xD57DAF00, 0xD57C3280,
-	0xD57AB600, 0xD5793980, 0xD577BD00,
-	0xD5764080, 0xD574C400, 0xD5734780,
-	0xD571CB00, 0xD5704E80, 0xD56ED200,
-	0xD56D5580, 0xD56BD900, 0xD56A5C80,
-	0xD568E000, 0xD5676380, 0xD565E700,
-	0xD5646A80, 0xD562EE00, 0xD5617180,
-	0xD55FF500, 0xD55E7880, 0xD55CFC00,
-	0xD55B7F80, 0xD55A0300, 0xD5588680,
-	0xD5570A00, 0xD5558D80, 0xD5541100,
-	0xD5529480, 0xD5511800, 0xD54F9B80,
-	0xD54E1F00, 0xD54CA280, 0xD54B2600,
-	0xD549A980, 0xD5482D00, 0xD546B080,
-	0xD5453400, 0xD543B780, 0xD5423B00,
-	0xD540BE80, 0xD53F4200, 0xD53DC580,
-	0xD53C4900, 0xD53ACC80, 0xD5395000,
-	0xD537D380, 0xD5365700, 0xD534DA80,
-	0xD5335E00, 0xD531E180, 0xD5306500,
-	0xD52EE880, 0xD52D6C00, 0xD52BEF80,
-	0xD52A7300, 0xD528F680, 0xD5277A00,
-	0xD525FD80, 0xD5248100, 0xD5230480,
-	0xD5218800, 0xD5200B80, 0xD51E8F00,
-	0xD51D1280, 0xD51B9600, 0xD51A1980,
-	0xD5189D00, 0xD5172080, 0xD515A400,
-	0xD5142780, 0xD512AB00, 0xD5112E80,
-	0xD50FB200, 0xD50E3580, 0xD50CB900,
-	0xD50B3C80, 0xD509C000, 0xD5084380,
-	0xD506C700, 0xD5054A80, 0xD503CE00,
-	0xD5025180, 0xD500D500, 0xD4FF5880,
-	0xD4FDDC00, 0xD4FC5F80, 0xD4FAE300,
-	0xD4F96680, 0xD4F7EA00, 0xD4F66D80,
-	0xD4F4F100, 0xD4F37480, 0xD4F1F800,
-	0xD4F07B80, 0xD4EEFF00, 0xD4ED8280,
-	0xD4EC0600, 0xD4EA8980, 0xD4E90D00,
-	0xD4E79080, 0xD4E61400, 0xD4E49780,
-	0xD4E31B00, 0xD4E19E80, 0xD4E02200,
-	0xD4DEA580, 0xD4DD2900, 0xD4DBAC80,
-	0xD4DA3000, 0xD4D8B380, 0xD4D73700,
-	0xD4D5BA80, 0xD4D43E00, 0xD4D2C180,
-	0xD4D14500, 0xD4CFC880, 0xD4CE4C00,
-	0xD4CCCF80, 0xD4CB5300, 0xD4C9D680,
-	0xD4C85A00, 0xD4C6DD80, 0xD4C56100,
-	0xD4C3E480, 0xD4C26800, 0xD4C0EB80,
-	0xD4BF6F00, 0xD4BDF280, 0xD4BC7600,
-	0xD4BAF980, 0xD4B97D00, 0xD4B80080,
-	0xD4B68400, 0xD4B50780, 0xD4B38B00,
-	0xD4B20E80, 0xD4B09200, 0xD4AF1580,
-	0xD4AD9900, 0xD4AC1C80, 0xD4AAA000,
-	0xD4A92380, 0xD4A7A700, 0xD4A62A80,
-	0xD4A4AE00, 0xD4A33180, 0xD4A1B500,
-	0xD4A03880, 0xD49EBC00, 0xD49D3F80,
-	0xD49BC300, 0xD49A4680, 0xD498CA00,
-	0xD4974D80, 0xD495D100, 0xD4945480,
-	0xD492D800, 0xD4915B80, 0xD48FDF00,
-	0xD48E6280, 0xD48CE600, 0xD48B6980,
-	0xD489ED00, 0xD4887080, 0xD486F400,
-	0xD4857780, 0xD483FB00, 0xD4827E80,
-	0xD4810200, 0xD47F8580, 0xD47E0900,
-	0xD47C8C80, 0xD47B1000, 0xD4799380,
-	0xD4781700, 0xD4769A80, 0xD4751E00,
-	0xD473A180, 0xD4722500, 0xD470A880,
-	0xD46F2C00, 0xD46DAF80, 0xD46C3300,
-	0xD46AB680, 0xD4693A00, 0xD467BD80,
-	0xD4664100, 0xD464C480, 0xD4634800,
-	0xD461CB80, 0xD4604F00, 0xD45ED280,
-	0xD45D5600, 0xD45BD980, 0xD45A5D00,
-	0xD458E080, 0xD4576400, 0xD455E780,
-	0xD4546B00, 0xD452EE80, 0xD4517200,
-	0xD44FF580, 0xD44E7900, 0xD44CFC80,
-	0xD44B8000, 0xD44A0380, 0xD4488700,
-	0xD4470A80, 0xD4458E00, 0xD4441180,
-	0xD4429500, 0xD4411880, 0xD43F9C00,
-	0xD43E1F80, 0xD43CA300, 0xD43B2680,
-	0xD439AA00, 0xD4382D80, 0xD436B100,
-	0xD4353480, 0xD433B800, 0xD4323B80,
-	0xD430BF00, 0xD42F4280, 0xD42DC600,
-	0xD42C4980, 0xD42ACD00, 0xD4295080,
-	0xD427D400, 0xD4265780, 0xD424DB00,
-	0xD4235E80, 0xD421E200, 0xD4206580,
-	0xD41EE900, 0xD41D6C80, 0xD41BF000,
-	0xD41A7380, 0xD418F700, 0xD4177A80,
-	0xD415FE00, 0xD4148180, 0xD4130500,
-	0xD4118880, 0xD4100C00, 0xD40E8F80,
-	0xD40D1300, 0xD40B9680, 0xD40A1A00,
-	0xD4089D80, 0xD4072100, 0xD405A480,
-	0xD4042800, 0xD402AB80, 0xD4012F00,
-	0xD3FFB280, 0xD3FE3600, 0xD3FCB980,
-	0xD3FB3D00, 0xD3F9C080, 0xD3F84400,
-	0xD3F6C780, 0xD3F54B00, 0xD3F3CE80,
-	0xD3F25200, 0xD3F0D580, 0xD3EF5900,
-	0xD3EDDC80, 0xD3EC6000, 0xD3EAE380,
-	0xD3E96700, 0xD3E7EA80, 0xD3E66E00,
-	0xD3E4F180, 0xD3E37500, 0xD3E1F880,
-	0xD3E07C00, 0xD3DEFF80, 0xD3DD8300,
-	0xD3DC0680, 0xD3DA8A00, 0xD3D90D80,
-	0xD3D79100, 0xD3D61480, 0xD3D49800,
-	0xD3D31B80, 0xD3D19F00, 0xD3D02280,
-	0xD3CEA600, 0xD3CD2980, 0xD3CBAD00,
-	0xD3CA3080, 0xD3C8B400, 0xD3C73780,
-	0xD3C5BB00, 0xD3C43E80, 0xD3C2C200,
-	0xD3C14580, 0xD3BFC900, 0xD3BE4C80,
-	0xD3BCD000, 0xD3BB5380, 0xD3B9D700,
-	0xD3B85A80, 0xD3B6DE00, 0xD3B56180,
-	0xD3B3E500, 0xD3B26880, 0xD3B0EC00,
-	0xD3AF6F80, 0xD3ADF300, 0xD3AC7680,
-	0xD3AAFA00, 0xD3A97D80, 0xD3A80100,
-	0xD3A68480, 0xD3A50800, 0xD3A38B80,
-	0xD3A20F00, 0xD3A09280, 0xD39F1600,
-	0xD39D9980, 0xD39C1D00, 0xD39AA080,
-	0xD3992400, 0xD397A780, 0xD3962B00,
-	0xD394AE80, 0xD3933200, 0xD391B580,
-	0xD3903900, 0xD38EBC80, 0xD38D4000,
-	0xD38BC380, 0xD38A4700, 0xD388CA80,
-	0xD3874E00, 0xD385D180, 0xD3845500,
-	0xD382D880, 0xD3815C00, 0xD37FDF80,
-	0xD37E6300, 0xD37CE680, 0xD37B6A00,
-	0xD379ED80, 0xD3787100, 0xD376F480,
-	0xD3757800, 0xD373FB80, 0xD3727F00,
-	0xD3710280, 0xD36F8600, 0xD36E0980,
-	0xD36C8D00, 0xD36B1080, 0xD3699400,
-	0xD3681780, 0xD3669B00, 0xD3651E80,
-	0xD363A200, 0xD3622580, 0xD360A900,
-	0xD35F2C80, 0xD35DB000, 0xD35C3380,
-	0xD35AB700, 0xD3593A80, 0xD357BE00,
-	0xD3564180, 0xD354C500, 0xD3534880,
-	0xD351CC00, 0xD3504F80, 0xD34ED300,
-	0xD34D5680, 0xD34BDA00, 0xD34A5D80,
-	0xD348E100, 0xD3476480, 0xD345E800,
-	0xD3446B80, 0xD342EF00, 0xD3417280,
-	0xD33FF600, 0xD33E7980, 0xD33CFD00,
-	0xD33B8080, 0xD33A0400, 0xD3388780,
-	0xD3370B00, 0xD3358E80, 0xD3341200,
-	0xD3329580, 0xD3311900, 0xD32F9C80,
-	0xD32E2000, 0xD32CA380, 0xD32B2700,
-	0xD329AA80, 0xD3282E00, 0xD326B180,
-	0xD3253500, 0xD323B880, 0xD3223C00,
-	0xD320BF80, 0xD31F4300, 0xD31DC680,
-	0xD31C4A00, 0xD31ACD80, 0xD3195100,
-	0xD317D480, 0xD3165800, 0xD314DB80,
-	0xD3135F00, 0xD311E280, 0xD3106600,
-	0xD30EE980, 0xD30D6D00, 0xD30BF080,
-	0xD30A7400, 0xD308F780, 0xD3077B00,
-	0xD305FE80, 0xD3048200, 0xD3030580,
-	0xD3018900, 0xD3000C80, 0xD2FE9000,
-	0xD2FD1380, 0xD2FB9700, 0xD2FA1A80,
-	0xD2F89E00, 0xD2F72180, 0xD2F5A500,
-	0xD2F42880, 0xD2F2AC00, 0xD2F12F80,
-	0xD2EFB300, 0xD2EE3680, 0xD2ECBA00,
-	0xD2EB3D80, 0xD2E9C100, 0xD2E84480,
-	0xD2E6C800, 0xD2E54B80, 0xD2E3CF00,
-	0xD2E25280, 0xD2E0D600, 0xD2DF5980,
-	0xD2DDDD00, 0xD2DC6080, 0xD2DAE400,
-	0xD2D96780, 0xD2D7EB00, 0xD2D66E80,
-	0xD2D4F200, 0xD2D37580, 0xD2D1F900,
-	0xD2D07C80, 0xD2CF0000, 0xD2CD8380,
-	0xD2CC0700, 0xD2CA8A80, 0xD2C90E00,
-	0xD2C79180, 0xD2C61500, 0xD2C49880,
-	0xD2C31C00, 0xD2C19F80, 0xD2C02300,
-	0xD2BEA680, 0xD2BD2A00, 0xD2BBAD80,
-	0xD2BA3100, 0xD2B8B480, 0xD2B73800,
-	0xD2B5BB80, 0xD2B43F00, 0xD2B2C280,
-	0xD2B14600, 0xD2AFC980, 0xD2AE4D00,
-	0xD2ACD080, 0xD2AB5400, 0xD2A9D780,
-	0xD2A85B00, 0xD2A6DE80, 0xD2A56200,
-	0xD2A3E580, 0xD2A26900, 0xD2A0EC80,
-	0xD29F7000, 0xD29DF380, 0xD29C7700,
-	0xD29AFA80, 0xD2997E00, 0xD2980180,
-	0xD2968500, 0xD2950880, 0xD2938C00,
-	0xD2920F80, 0xD2909300, 0xD28F1680,
-	0xD28D9A00, 0xD28C1D80, 0xD28AA100,
-	0xD2892480, 0xD287A800, 0xD2862B80,
-	0xD284AF00, 0xD2833280, 0xD281B600,
-	0xD2803980, 0xD27EBD00, 0xD27D4080,
-	0xD27BC400, 0xD27A4780, 0xD278CB00,
-	0xD2774E80, 0xD275D200, 0xD2745580,
-	0xD272D900, 0xD2715C80, 0xD26FE000,
-	0xD26E6380, 0xD26CE700, 0xD26B6A80,
-	0xD269EE00, 0xD2687180, 0xD266F500,
-	0xD2657880, 0xD263FC00, 0xD2627F80,
-	0xD2610300, 0xD25F8680, 0xD25E0A00,
-	0xD25C8D80, 0xD25B1100, 0xD2599480,
-	0xD2581800, 0xD2569B80, 0xD2551F00,
-	0xD253A280, 0xD2522600, 0xD250A980,
-	0xD24F2D00, 0xD24DB080, 0xD24C3400,
-	0xD24AB780, 0xD2493B00, 0xD247BE80,
-	0xD2464200, 0xD244C580, 0xD2434900,
-	0xD241CC80, 0xD2405000, 0xD23ED380,
-	0xD23D5700, 0xD23BDA80, 0xD23A5E00,
-	0xD238E180, 0xD2376500, 0xD235E880,
-	0xD2346C00, 0xD232EF80, 0xD2317300,
-	0xD22FF680, 0xD22E7A00, 0xD22CFD80,
-	0xD22B8100, 0xD22A0480, 0xD2288800,
-	0xD2270B80, 0xD2258F00, 0xD2241280,
-	0xD2229600, 0xD2211980, 0xD21F9D00,
-	0xD21E2080, 0xD21CA400, 0xD21B2780,
-	0xD219AB00, 0xD2182E80, 0xD216B200,
-	0xD2153580, 0xD213B900, 0xD2123C80,
-	0xD210C000, 0xD20F4380, 0xD20DC700,
-	0xD20C4A80, 0xD20ACE00, 0xD2095180,
-	0xD207D500, 0xD2065880, 0xD204DC00,
-	0xD2035F80, 0xD201E300, 0xD2006680,
-	0xD1FEEA00, 0xD1FD6D80, 0xD1FBF100,
-	0xD1FA7480, 0xD1F8F800, 0xD1F77B80,
-	0xD1F5FF00, 0xD1F48280, 0xD1F30600,
-	0xD1F18980, 0xD1F00D00, 0xD1EE9080,
-	0xD1ED1400, 0xD1EB9780, 0xD1EA1B00,
-	0xD1E89E80, 0xD1E72200, 0xD1E5A580,
-	0xD1E42900, 0xD1E2AC80, 0xD1E13000,
-	0xD1DFB380, 0xD1DE3700, 0xD1DCBA80,
-	0xD1DB3E00, 0xD1D9C180, 0xD1D84500,
-	0xD1D6C880, 0xD1D54C00, 0xD1D3CF80,
-	0xD1D25300, 0xD1D0D680, 0xD1CF5A00,
-	0xD1CDDD80, 0xD1CC6100, 0xD1CAE480,
-	0xD1C96800, 0xD1C7EB80, 0xD1C66F00,
-	0xD1C4F280, 0xD1C37600, 0xD1C1F980,
-	0xD1C07D00, 0xD1BF0080, 0xD1BD8400,
-	0xD1BC0780, 0xD1BA8B00, 0xD1B90E80,
-	0xD1B79200, 0xD1B61580, 0xD1B49900,
-	0xD1B31C80, 0xD1B1A000, 0xD1B02380,
-	0xD1AEA700, 0xD1AD2A80, 0xD1ABAE00,
-	0xD1AA3180, 0xD1A8B500, 0xD1A73880,
-	0xD1A5BC00, 0xD1A43F80, 0xD1A2C300,
-	0xD1A14680, 0xD19FCA00, 0xD19E4D80,
-	0xD19CD100, 0xD19B5480, 0xD199D800,
-	0xD1985B80, 0xD196DF00, 0xD1956280,
-	0xD193E600, 0xD1926980, 0xD190ED00,
-	0xD18F7080, 0xD18DF400, 0xD18C7780,
-	0xD18AFB00, 0xD1897E80, 0xD1880200,
-	0xD1868580, 0xD1850900, 0xD1838C80,
-	0xD1821000, 0xD1809380, 0xD17F1700,
-	0xD17D9A80, 0xD17C1E00, 0xD17AA180,
-	0xD1792500, 0xD177A880, 0xD1762C00,
-	0xD174AF80, 0xD1733300, 0xD171B680,
-	0xD1703A00, 0xD16EBD80, 0xD16D4100,
-	0xD16BC480, 0xD16A4800, 0xD168CB80,
-	0xD1674F00, 0xD165D280, 0xD1645600,
-	0xD162D980, 0xD1615D00, 0xD15FE080,
-	0xD15E6400, 0xD15CE780, 0xD15B6B00,
-	0xD159EE80, 0xD1587200, 0xD156F580,
-	0xD1557900, 0xD153FC80, 0xD1528000,
-	0xD1510380, 0xD14F8700, 0xD14E0A80,
-	0xD14C8E00, 0xD14B1180, 0xD1499500,
-	0xD1481880, 0xD1469C00, 0xD1451F80,
-	0xD143A300, 0xD1422680, 0xD140AA00,
-	0xD13F2D80, 0xD13DB100, 0xD13C3480,
-	0xD13AB800, 0xD1393B80, 0xD137BF00,
-	0xD1364280, 0xD134C600, 0xD1334980,
-	0xD131CD00, 0xD1305080, 0xD12ED400,
-	0xD12D5780, 0xD12BDB00, 0xD12A5E80,
-	0xD128E200, 0xD1276580, 0xD125E900,
-	0xD1246C80, 0xD122F000, 0xD1217380,
-	0xD11FF700, 0xD11E7A80, 0xD11CFE00,
-	0xD11B8180, 0xD11A0500, 0xD1188880,
-	0xD1170C00, 0xD1158F80, 0xD1141300,
-	0xD1129680, 0xD1111A00, 0xD10F9D80,
-	0xD10E2100, 0xD10CA480, 0xD10B2800,
-	0xD109AB80, 0xD1082F00, 0xD106B280,
-	0xD1053600, 0xD103B980, 0xD1023D00,
-	0xD100C080, 0xD0FF4400, 0xD0FDC780,
-	0xD0FC4B00, 0xD0FACE80, 0xD0F95200,
-	0xD0F7D580, 0xD0F65900, 0xD0F4DC80,
-	0xD0F36000, 0xD0F1E380, 0xD0F06700,
-	0xD0EEEA80, 0xD0ED6E00, 0xD0EBF180,
-	0xD0EA7500, 0xD0E8F880, 0xD0E77C00,
-	0xD0E5FF80, 0xD0E48300, 0xD0E30680,
-	0xD0E18A00, 0xD0E00D80, 0xD0DE9100,
-	0xD0DD1480, 0xD0DB9800, 0xD0DA1B80,
-	0xD0D89F00, 0xD0D72280, 0xD0D5A600,
-	0xD0D42980, 0xD0D2AD00, 0xD0D13080,
-	0xD0CFB400, 0xD0CE3780, 0xD0CCBB00,
-	0xD0CB3E80, 0xD0C9C200, 0xD0C84580,
-	0xD0C6C900, 0xD0C54C80, 0xD0C3D000,
-	0xD0C25380, 0xD0C0D700, 0xD0BF5A80,
-	0xD0BDDE00, 0xD0BC6180, 0xD0BAE500,
-	0xD0B96880, 0xD0B7EC00, 0xD0B66F80,
-	0xD0B4F300, 0xD0B37680, 0xD0B1FA00,
-	0xD0B07D80, 0xD0AF0100, 0xD0AD8480,
-	0xD0AC0800, 0xD0AA8B80, 0xD0A90F00,
-	0xD0A79280, 0xD0A61600, 0xD0A49980,
-	0xD0A31D00, 0xD0A1A080, 0xD0A02400,
-	0xD09EA780, 0xD09D2B00, 0xD09BAE80,
-	0xD09A3200, 0xD098B580, 0xD0973900,
-	0xD095BC80, 0xD0944000, 0xD092C380,
-	0xD0914700, 0xD08FCA80, 0xD08E4E00,
-	0xD08CD180, 0xD08B5500, 0xD089D880,
-	0xD0885C00, 0xD086DF80, 0xD0856300,
-	0xD083E680, 0xD0826A00, 0xD080ED80,
-	0xD07F7100, 0xD07DF480, 0xD07C7800,
-	0xD07AFB80, 0xD0797F00, 0xD0780280,
-	0xD0768600, 0xD0750980, 0xD0738D00,
-	0xD0721080, 0xD0709400, 0xD06F1780,
-	0xD06D9B00, 0xD06C1E80, 0xD06AA200,
-	0xD0692580, 0xD067A900, 0xD0662C80,
-	0xD064B000, 0xD0633380, 0xD061B700,
-	0xD0603A80, 0xD05EBE00, 0xD05D4180,
-	0xD05BC500, 0xD05A4880, 0xD058CC00,
-	0xD0574F80, 0xD055D300, 0xD0545680,
-	0xD052DA00, 0xD0515D80, 0xD04FE100,
-	0xD04E6480, 0xD04CE800, 0xD04B6B80,
-	0xD049EF00, 0xD0487280, 0xD046F600,
-	0xD0457980, 0xD043FD00, 0xD0428080,
-	0xD0410400, 0xD03F8780, 0xD03E0B00,
-	0xD03C8E80, 0xD03B1200, 0xD0399580,
-	0xD0381900, 0xD0369C80, 0xD0352000,
-	0xD033A380, 0xD0322700, 0xD030AA80,
-	0xD02F2E00, 0xD02DB180, 0xD02C3500,
-	0xD02AB880, 0xD0293C00, 0xD027BF80,
-	0xD0264300, 0xD024C680, 0xD0234A00,
-	0xD021CD80, 0xD0205100, 0xD01ED480,
-	0xD01D5800, 0xD01BDB80, 0xD01A5F00,
-	0xD018E280, 0xD0176600, 0xD015E980,
-	0xD0146D00, 0xD012F080, 0xD0117400,
-	0xD00FF780, 0xD00E7B00, 0xD00CFE80,
-	0xD00B8200, 0xD00A0580, 0xD0088900,
-	0xD0070C80, 0xD0059000, 0xD0041380,
-	0xD0029700, 0xD0011A80, 0xCFFF9E00,
-	0xCFFE2180, 0xCFFCA500, 0xCFFB2880,
-	0xCFF9AC00, 0xCFF82F80, 0xCFF6B300,
-	0xCFF53680, 0xCFF3BA00, 0xCFF23D80,
-	0xCFF0C100, 0xCFEF4480, 0xCFEDC800,
-	0xCFEC4B80, 0xCFEACF00, 0xCFE95280,
-	0xCFE7D600, 0xCFE65980, 0xCFE4DD00,
-	0xCFE36080, 0xCFE1E400, 0xCFE06780,
-	0xCFDEEB00, 0xCFDD6E80, 0xCFDBF200,
-	0xCFDA7580, 0xCFD8F900, 0xCFD77C80,
-	0xCFD60000, 0xCFD48380, 0xCFD30700,
-	0xCFD18A80, 0xCFD00E00, 0xCFCE9180,
-	0xCFCD1500, 0xCFCB9880, 0xCFCA1C00,
-	0xCFC89F80, 0xCFC72300, 0xCFC5A680,
-	0xCFC42A00, 0xCFC2AD80, 0xCFC13100,
-	0xCFBFB480, 0xCFBE3800, 0xCFBCBB80,
-	0xCFBB3F00, 0xCFB9C280, 0xCFB84600,
-	0xCFB6C980, 0xCFB54D00, 0xCFB3D080,
-	0xCFB25400, 0xCFB0D780, 0xCFAF5B00,
-	0xCFADDE80, 0xCFAC6200, 0xCFAAE580,
-	0xCFA96900, 0xCFA7EC80, 0xCFA67000,
-	0xCFA4F380, 0xCFA37700, 0xCFA1FA80,
-	0xCFA07E00, 0xCF9F0180, 0xCF9D8500,
-	0xCF9C0880, 0xCF9A8C00, 0xCF990F80,
-	0xCF979300, 0xCF961680, 0xCF949A00,
-	0xCF931D80, 0xCF91A100, 0xCF902480,
-	0xCF8EA800, 0xCF8D2B80, 0xCF8BAF00,
-	0xCF8A3280, 0xCF88B600, 0xCF873980,
-	0xCF85BD00, 0xCF844080, 0xCF82C400,
-	0xCF814780, 0xCF7FCB00, 0xCF7E4E80,
-	0xCF7CD200, 0xCF7B5580, 0xCF79D900,
-	0xCF785C80, 0xCF76E000, 0xCF756380,
-	0xCF73E700, 0xCF726A80, 0xCF70EE00,
-	0xCF6F7180, 0xCF6DF500, 0xCF6C7880,
-	0xCF6AFC00, 0xCF697F80, 0xCF680300,
-	0xCF668680, 0xCF650A00, 0xCF638D80,
-	0xCF621100, 0xCF609480, 0xCF5F1800,
-	0xCF5D9B80, 0xCF5C1F00, 0xCF5AA280,
-	0xCF592600, 0xCF57A980, 0xCF562D00,
-	0xCF54B080, 0xCF533400, 0xCF51B780,
-	0xCF503B00, 0xCF4EBE80, 0xCF4D4200,
-	0xCF4BC580, 0xCF4A4900, 0xCF48CC80,
-	0xCF475000, 0xCF45D380, 0xCF445700,
-	0xCF42DA80, 0xCF415E00, 0xCF3FE180,
-	0xCF3E6500, 0xCF3CE880, 0xCF3B6C00,
-	0xCF39EF80, 0xCF387300, 0xCF36F680,
-	0xCF357A00, 0xCF33FD80, 0xCF328100,
-	0xCF310480, 0xCF2F8800, 0xCF2E0B80,
-	0xCF2C8F00, 0xCF2B1280, 0xCF299600,
-	0xCF281980, 0xCF269D00, 0xCF252080,
-	0xCF23A400, 0xCF222780, 0xCF20AB00,
-	0xCF1F2E80, 0xCF1DB200, 0xCF1C3580,
-	0xCF1AB900, 0xCF193C80, 0xCF17C000,
-	0xCF164380, 0xCF14C700, 0xCF134A80,
-	0xCF11CE00, 0xCF105180, 0xCF0ED500,
-	0xCF0D5880, 0xCF0BDC00, 0xCF0A5F80,
-	0xCF08E300, 0xCF076680, 0xCF05EA00,
-	0xCF046D80, 0xCF02F100, 0xCF017480,
-	0xCEFFF800, 0xCEFE7B80, 0xCEFCFF00,
-	0xCEFB8280, 0xCEFA0600, 0xCEF88980,
-	0xCEF70D00, 0xCEF59080, 0xCEF41400,
-	0xCEF29780, 0xCEF11B00, 0xCEEF9E80,
-	0xCEEE2200, 0xCEECA580, 0xCEEB2900,
-	0xCEE9AC80, 0xCEE83000, 0xCEE6B380,
-	0xCEE53700, 0xCEE3BA80, 0xCEE23E00,
-	0xCEE0C180, 0xCEDF4500, 0xCEDDC880,
-	0xCEDC4C00, 0xCEDACF80, 0xCED95300,
-	0xCED7D680, 0xCED65A00, 0xCED4DD80,
-	0xCED36100, 0xCED1E480, 0xCED06800,
-	0xCECEEB80, 0xCECD6F00, 0xCECBF280,
-	0xCECA7600, 0xCEC8F980, 0xCEC77D00,
-	0xCEC60080, 0xCEC48400, 0xCEC30780,
-	0xCEC18B00, 0xCEC00E80, 0xCEBE9200,
-	0xCEBD1580, 0xCEBB9900, 0xCEBA1C80,
-	0xCEB8A000, 0xCEB72380, 0xCEB5A700,
-	0xCEB42A80, 0xCEB2AE00, 0xCEB13180,
-	0xCEAFB500, 0xCEAE3880, 0xCEACBC00,
-	0xCEAB3F80, 0xCEA9C300, 0xCEA84680,
-	0xCEA6CA00, 0xCEA54D80, 0xCEA3D100,
-	0xCEA25480, 0xCEA0D800, 0xCE9F5B80,
-	0xCE9DDF00, 0xCE9C6280, 0xCE9AE600,
-	0xCE996980, 0xCE97ED00, 0xCE967080,
-	0xCE94F400, 0xCE937780, 0xCE91FB00,
-	0xCE907E80, 0xCE8F0200, 0xCE8D8580,
-	0xCE8C0900, 0xCE8A8C80, 0xCE891000,
-	0xCE879380, 0xCE861700, 0xCE849A80,
-	0xCE831E00, 0xCE81A180, 0xCE802500,
-	0xCE7EA880, 0xCE7D2C00, 0xCE7BAF80,
-	0xCE7A3300, 0xCE78B680, 0xCE773A00,
-	0xCE75BD80, 0xCE744100, 0xCE72C480,
-	0xCE714800, 0xCE6FCB80, 0xCE6E4F00,
-	0xCE6CD280, 0xCE6B5600, 0xCE69D980,
-	0xCE685D00, 0xCE66E080, 0xCE656400,
-	0xCE63E780, 0xCE626B00, 0xCE60EE80,
-	0xCE5F7200, 0xCE5DF580, 0xCE5C7900,
-	0xCE5AFC80, 0xCE598000, 0xCE580380,
-	0xCE568700, 0xCE550A80, 0xCE538E00,
-	0xCE521180, 0xCE509500, 0xCE4F1880,
-	0xCE4D9C00, 0xCE4C1F80, 0xCE4AA300,
-	0xCE492680, 0xCE47AA00, 0xCE462D80,
-	0xCE44B100, 0xCE433480, 0xCE41B800,
-	0xCE403B80, 0xCE3EBF00, 0xCE3D4280,
-	0xCE3BC600, 0xCE3A4980, 0xCE38CD00,
-	0xCE375080, 0xCE35D400, 0xCE345780,
-	0xCE32DB00, 0xCE315E80, 0xCE2FE200,
-	0xCE2E6580, 0xCE2CE900, 0xCE2B6C80,
-	0xCE29F000, 0xCE287380, 0xCE26F700,
-	0xCE257A80, 0xCE23FE00, 0xCE228180,
-	0xCE210500, 0xCE1F8880, 0xCE1E0C00,
-	0xCE1C8F80, 0xCE1B1300, 0xCE199680,
-	0xCE181A00, 0xCE169D80, 0xCE152100,
-	0xCE13A480, 0xCE122800, 0xCE10AB80,
-	0xCE0F2F00, 0xCE0DB280, 0xCE0C3600,
-	0xCE0AB980, 0xCE093D00, 0xCE07C080,
-	0xCE064400, 0xCE04C780, 0xCE034B00,
-	0xCE01CE80, 0xCE005200, 0xCDFED580,
-	0xCDFD5900, 0xCDFBDC80, 0xCDFA6000,
-	0xCDF8E380, 0xCDF76700, 0xCDF5EA80,
-	0xCDF46E00, 0xCDF2F180, 0xCDF17500,
-	0xCDEFF880, 0xCDEE7C00, 0xCDECFF80,
-	0xCDEB8300, 0xCDEA0680, 0xCDE88A00,
-	0xCDE70D80, 0xCDE59100, 0xCDE41480,
-	0xCDE29800, 0xCDE11B80, 0xCDDF9F00,
-	0xCDDE2280, 0xCDDCA600, 0xCDDB2980,
-	0xCDD9AD00, 0xCDD83080, 0xCDD6B400,
-	0xCDD53780, 0xCDD3BB00, 0xCDD23E80,
-	0xCDD0C200, 0xCDCF4580, 0xCDCDC900,
-	0xCDCC4C80, 0xCDCAD000, 0xCDC95380,
-	0xCDC7D700, 0xCDC65A80, 0xCDC4DE00,
-	0xCDC36180, 0xCDC1E500, 0xCDC06880,
-	0xCDBEEC00, 0xCDBD6F80, 0xCDBBF300,
-	0xCDBA7680, 0xCDB8FA00, 0xCDB77D80,
-	0xCDB60100, 0xCDB48480, 0xCDB30800,
-	0xCDB18B80, 0xCDB00F00, 0xCDAE9280,
-	0xCDAD1600, 0xCDAB9980, 0xCDAA1D00,
-	0xCDA8A080, 0xCDA72400, 0xCDA5A780,
-	0xCDA42B00, 0xCDA2AE80, 0xCDA13200,
-	0xCD9FB580, 0xCD9E3900, 0xCD9CBC80,
-	0xCD9B4000, 0xCD99C380, 0xCD984700,
-	0xCD96CA80, 0xCD954E00, 0xCD93D180,
-	0xCD925500, 0xCD90D880, 0xCD8F5C00,
-	0xCD8DDF80, 0xCD8C6300, 0xCD8AE680,
-	0xCD896A00, 0xCD87ED80, 0xCD867100,
-	0xCD84F480, 0xCD837800, 0xCD81FB80,
-	0xCD807F00, 0xCD7F0280, 0xCD7D8600,
-	0xCD7C0980, 0xCD7A8D00, 0xCD791080,
-	0xCD779400, 0xCD761780, 0xCD749B00,
-	0xCD731E80, 0xCD71A200, 0xCD702580,
-	0xCD6EA900, 0xCD6D2C80, 0xCD6BB000,
-	0xCD6A3380, 0xCD68B700, 0xCD673A80,
-	0xCD65BE00, 0xCD644180, 0xCD62C500,
-	0xCD614880, 0xCD5FCC00, 0xCD5E4F80,
-	0xCD5CD300, 0xCD5B5680, 0xCD59DA00,
-	0xCD585D80, 0xCD56E100, 0xCD556480,
-	0xCD53E800, 0xCD526B80, 0xCD50EF00,
-	0xCD4F7280, 0xCD4DF600, 0xCD4C7980,
-	0xCD4AFD00, 0xCD498080, 0xCD480400,
-	0xCD468780, 0xCD450B00, 0xCD438E80,
-	0xCD421200, 0xCD409580, 0xCD3F1900,
-	0xCD3D9C80, 0xCD3C2000, 0xCD3AA380,
-	0xCD392700, 0xCD37AA80, 0xCD362E00,
-	0xCD34B180, 0xCD333500, 0xCD31B880,
-	0xCD303C00, 0xCD2EBF80, 0xCD2D4300,
-	0xCD2BC680, 0xCD2A4A00, 0xCD28CD80,
-	0xCD275100, 0xCD25D480, 0xCD245800,
-	0xCD22DB80, 0xCD215F00, 0xCD1FE280,
-	0xCD1E6600, 0xCD1CE980, 0xCD1B6D00,
-	0xCD19F080, 0xCD187400, 0xCD16F780,
-	0xCD157B00, 0xCD13FE80, 0xCD128200,
-	0xCD110580, 0xCD0F8900, 0xCD0E0C80,
-	0xCD0C9000, 0xCD0B1380, 0xCD099700,
-	0xCD081A80, 0xCD069E00, 0xCD052180,
-	0xCD03A500, 0xCD022880, 0xCD00AC00,
-	0xCCFF2F80, 0xCCFDB300, 0xCCFC3680,
-	0xCCFABA00, 0xCCF93D80, 0xCCF7C100,
-	0xCCF64480, 0xCCF4C800, 0xCCF34B80,
-	0xCCF1CF00, 0xCCF05280, 0xCCEED600,
-	0xCCED5980, 0xCCEBDD00, 0xCCEA6080,
-	0xCCE8E400, 0xCCE76780, 0xCCE5EB00,
-	0xCCE46E80, 0xCCE2F200, 0xCCE17580,
-	0xCCDFF900, 0xCCDE7C80, 0xCCDD0000,
-	0xCCDB8380, 0xCCDA0700, 0xCCD88A80,
-	0xCCD70E00, 0xCCD59180, 0xCCD41500,
-	0xCCD29880, 0xCCD11C00, 0xCCCF9F80,
-	0xCCCE2300, 0xCCCCA680, 0xCCCB2A00,
-	0xCCC9AD80, 0xCCC83100, 0xCCC6B480,
-	0xCCC53800, 0xCCC3BB80, 0xCCC23F00,
-	0xCCC0C280, 0xCCBF4600, 0xCCBDC980,
-	0xCCBC4D00, 0xCCBAD080, 0xCCB95400,
-	0xCCB7D780, 0xCCB65B00, 0xCCB4DE80,
-	0xCCB36200, 0xCCB1E580, 0xCCB06900,
-	0xCCAEEC80, 0xCCAD7000, 0xCCABF380,
-	0xCCAA7700, 0xCCA8FA80, 0xCCA77E00,
-	0xCCA60180, 0xCCA48500, 0xCCA30880,
-	0xCCA18C00, 0xCCA00F80, 0xCC9E9300,
-	0xCC9D1680, 0xCC9B9A00, 0xCC9A1D80,
-	0xCC98A100, 0xCC972480, 0xCC95A800,
-	0xCC942B80, 0xCC92AF00, 0xCC913280,
-	0xCC8FB600, 0xCC8E3980, 0xCC8CBD00,
-	0xCC8B4080, 0xCC89C400, 0xCC884780,
-	0xCC86CB00, 0xCC854E80, 0xCC83D200,
-	0xCC825580, 0xCC80D900, 0xCC7F5C80,
-	0xCC7DE000, 0xCC7C6380, 0xCC7AE700,
-	0xCC796A80, 0xCC77EE00, 0xCC767180,
-	0xCC74F500, 0xCC737880, 0xCC71FC00,
-	0xCC707F80, 0xCC6F0300, 0xCC6D8680,
-	0xCC6C0A00, 0xCC6A8D80, 0xCC691100,
-	0xCC679480, 0xCC661800, 0xCC649B80,
-	0xCC631F00, 0xCC61A280, 0xCC602600,
-	0xCC5EA980, 0xCC5D2D00, 0xCC5BB080,
-	0xCC5A3400, 0xCC58B780, 0xCC573B00,
-	0xCC55BE80, 0xCC544200, 0xCC52C580,
-	0xCC514900, 0xCC4FCC80, 0xCC4E5000,
-	0xCC4CD380, 0xCC4B5700, 0xCC49DA80,
-	0xCC485E00, 0xCC46E180, 0xCC456500,
-	0xCC43E880, 0xCC426C00, 0xCC40EF80,
-	0xCC3F7300, 0xCC3DF680, 0xCC3C7A00,
-	0xCC3AFD80, 0xCC398100, 0xCC380480,
-	0xCC368800, 0xCC350B80, 0xCC338F00,
-	0xCC321280, 0xCC309600, 0xCC2F1980,
-	0xCC2D9D00, 0xCC2C2080, 0xCC2AA400,
-	0xCC292780, 0xCC27AB00, 0xCC262E80,
-	0xCC24B200, 0xCC233580, 0xCC21B900,
-	0xCC203C80, 0xCC1EC000, 0xCC1D4380,
-	0xCC1BC700, 0xCC1A4A80, 0xCC18CE00,
-	0xCC175180, 0xCC15D500, 0xCC145880,
-	0xCC12DC00, 0xCC115F80, 0xCC0FE300,
-	0xCC0E6680, 0xCC0CEA00, 0xCC0B6D80,
-	0xCC09F100, 0xCC087480, 0xCC06F800,
-	0xCC057B80, 0xCC03FF00, 0xCC028280,
-	0xCC010600, 0xCBFF8980, 0xCBFE0D00,
-	0xCBFC9080, 0xCBFB1400, 0xCBF99780,
-	0xCBF81B00, 0xCBF69E80, 0xCBF52200,
-	0xCBF3A580, 0xCBF22900, 0xCBF0AC80,
-	0xCBEF3000, 0xCBEDB380, 0xCBEC3700,
-	0xCBEABA80, 0xCBE93E00, 0xCBE7C180,
-	0xCBE64500, 0xCBE4C880, 0xCBE34C00,
-	0xCBE1CF80, 0xCBE05300, 0xCBDED680,
-	0xCBDD5A00, 0xCBDBDD80, 0xCBDA6100,
-	0xCBD8E480, 0xCBD76800, 0xCBD5EB80,
-	0xCBD46F00, 0xCBD2F280, 0xCBD17600,
-	0xCBCFF980, 0xCBCE7D00, 0xCBCD0080,
-	0xCBCB8400, 0xCBCA0780, 0xCBC88B00,
-	0xCBC70E80, 0xCBC59200, 0xCBC41580,
-	0xCBC29900, 0xCBC11C80, 0xCBBFA000,
-	0xCBBE2380, 0xCBBCA700, 0xCBBB2A80,
-	0xCBB9AE00, 0xCBB83180, 0xCBB6B500,
-	0xCBB53880, 0xCBB3BC00, 0xCBB23F80,
-	0xCBB0C300, 0xCBAF4680, 0xCBADCA00,
-	0xCBAC4D80, 0xCBAAD100, 0xCBA95480,
-	0xCBA7D800, 0xCBA65B80, 0xCBA4DF00,
-	0xCBA36280, 0xCBA1E600, 0xCBA06980,
-	0xCB9EED00, 0xCB9D7080, 0xCB9BF400,
-	0xCB9A7780, 0xCB98FB00, 0xCB977E80,
-	0xCB960200, 0xCB948580, 0xCB930900,
-	0xCB918C80, 0xCB901000, 0xCB8E9380,
-	0xCB8D1700, 0xCB8B9A80, 0xCB8A1E00,
-	0xCB88A180, 0xCB872500, 0xCB85A880,
-	0xCB842C00, 0xCB82AF80, 0xCB813300,
-	0xCB7FB680, 0xCB7E3A00, 0xCB7CBD80,
-	0xCB7B4100, 0xCB79C480, 0xCB784800,
-	0xCB76CB80, 0xCB754F00, 0xCB73D280,
-	0xCB725600, 0xCB70D980, 0xCB6F5D00,
-	0xCB6DE080, 0xCB6C6400, 0xCB6AE780,
-	0xCB696B00, 0xCB67EE80, 0xCB667200,
-	0xCB64F580, 0xCB637900, 0xCB61FC80,
-	0xCB608000, 0xCB5F0380, 0xCB5D8700,
-	0xCB5C0A80, 0xCB5A8E00, 0xCB591180,
-	0xCB579500, 0xCB561880, 0xCB549C00,
-	0xCB531F80, 0xCB51A300, 0xCB502680,
-	0xCB4EAA00, 0xCB4D2D80, 0xCB4BB100,
-	0xCB4A3480, 0xCB48B800, 0xCB473B80,
-	0xCB45BF00, 0xCB444280, 0xCB42C600,
-	0xCB414980, 0xCB3FCD00, 0xCB3E5080,
-	0xCB3CD400, 0xCB3B5780, 0xCB39DB00,
-	0xCB385E80, 0xCB36E200, 0xCB356580,
-	0xCB33E900, 0xCB326C80, 0xCB30F000,
-	0xCB2F7380, 0xCB2DF700, 0xCB2C7A80,
-	0xCB2AFE00, 0xCB298180, 0xCB280500,
-	0xCB268880, 0xCB250C00, 0xCB238F80,
-	0xCB221300, 0xCB209680, 0xCB1F1A00,
-	0xCB1D9D80, 0xCB1C2100, 0xCB1AA480,
-	0xCB192800, 0xCB17AB80, 0xCB162F00,
-	0xCB14B280, 0xCB133600, 0xCB11B980,
-	0xCB103D00, 0xCB0EC080, 0xCB0D4400,
-	0xCB0BC780, 0xCB0A4B00, 0xCB08CE80,
-	0xCB075200, 0xCB05D580, 0xCB045900,
-	0xCB02DC80, 0xCB016000, 0xCAFFE380,
-	0xCAFE6700, 0xCAFCEA80, 0xCAFB6E00,
-	0xCAF9F180, 0xCAF87500, 0xCAF6F880,
-	0xCAF57C00, 0xCAF3FF80, 0xCAF28300,
-	0xCAF10680, 0xCAEF8A00, 0xCAEE0D80,
-	0xCAEC9100, 0xCAEB1480, 0xCAE99800,
-	0xCAE81B80, 0xCAE69F00, 0xCAE52280,
-	0xCAE3A600, 0xCAE22980, 0xCAE0AD00,
-	0xCADF3080, 0xCADDB400, 0xCADC3780,
-	0xCADABB00, 0xCAD93E80, 0xCAD7C200,
-	0xCAD64580, 0xCAD4C900, 0xCAD34C80,
-	0xCAD1D000, 0xCAD05380, 0xCACED700,
-	0xCACD5A80, 0xCACBDE00, 0xCACA6180,
-	0xCAC8E500, 0xCAC76880, 0xCAC5EC00,
-	0xCAC46F80, 0xCAC2F300, 0xCAC17680,
-	0xCABFFA00, 0xCABE7D80, 0xCABD0100,
-	0xCABB8480, 0xCABA0800, 0xCAB88B80,
-	0xCAB70F00, 0xCAB59280, 0xCAB41600,
-	0xCAB29980, 0xCAB11D00, 0xCAAFA080,
-	0xCAAE2400, 0xCAACA780, 0xCAAB2B00,
-	0xCAA9AE80, 0xCAA83200, 0xCAA6B580,
-	0xCAA53900, 0xCAA3BC80, 0xCAA24000,
-	0xCAA0C380, 0xCA9F4700, 0xCA9DCA80,
-	0xCA9C4E00, 0xCA9AD180, 0xCA995500,
-	0xCA97D880, 0xCA965C00, 0xCA94DF80,
-	0xCA936300, 0xCA91E680, 0xCA906A00,
-	0xCA8EED80, 0xCA8D7100, 0xCA8BF480,
-	0xCA8A7800, 0xCA88FB80, 0xCA877F00,
-	0xCA860280, 0xCA848600, 0xCA830980,
-	0xCA818D00, 0xCA801080, 0xCA7E9400,
-	0xCA7D1780, 0xCA7B9B00, 0xCA7A1E80,
-	0xCA78A200, 0xCA772580, 0xCA75A900,
-	0xCA742C80, 0xCA72B000, 0xCA713380,
-	0xCA6FB700, 0xCA6E3A80, 0xCA6CBE00,
-	0xCA6B4180, 0xCA69C500, 0xCA684880,
-	0xCA66CC00, 0xCA654F80, 0xCA63D300,
-	0xCA625680, 0xCA60DA00, 0xCA5F5D80,
-	0xCA5DE100, 0xCA5C6480, 0xCA5AE800,
-	0xCA596B80, 0xCA57EF00, 0xCA567280,
-	0xCA54F600, 0xCA537980, 0xCA51FD00,
-	0xCA508080, 0xCA4F0400, 0xCA4D8780,
-	0xCA4C0B00, 0xCA4A8E80, 0xCA491200,
-	0xCA479580, 0xCA461900, 0xCA449C80,
-	0xCA432000, 0xCA41A380, 0xCA402700,
-	0xCA3EAA80, 0xCA3D2E00, 0xCA3BB180,
-	0xCA3A3500, 0xCA38B880, 0xCA373C00,
-	0xCA35BF80, 0xCA344300, 0xCA32C680,
-	0xCA314A00, 0xCA2FCD80, 0xCA2E5100,
-	0xCA2CD480, 0xCA2B5800, 0xCA29DB80,
-	0xCA285F00, 0xCA26E280, 0xCA256600,
-	0xCA23E980, 0xCA226D00, 0xCA20F080,
-	0xCA1F7400, 0xCA1DF780, 0xCA1C7B00,
-	0xCA1AFE80, 0xCA198200, 0xCA180580,
-	0xCA168900, 0xCA150C80, 0xCA139000,
-	0xCA121380, 0xCA109700, 0xCA0F1A80,
-	0xCA0D9E00, 0xCA0C2180, 0xCA0AA500,
-	0xCA092880, 0xCA07AC00, 0xCA062F80,
-	0xCA04B300, 0xCA033680, 0xCA01BA00,
-	0xCA003D80, 0xC9FEC100, 0xC9FD4480,
-	0xC9FBC800, 0xC9FA4B80, 0xC9F8CF00,
-	0xC9F75280, 0xC9F5D600, 0xC9F45980,
-	0xC9F2DD00, 0xC9F16080, 0xC9EFE400,
-	0xC9EE6780, 0xC9ECEB00, 0xC9EB6E80,
-	0xC9E9F200, 0xC9E87580, 0xC9E6F900,
-	0xC9E57C80, 0xC9E40000, 0xC9E29F00,
-	0xC9E13E00, 0xC9DFDD00, 0xC9DE7C00,
-	0xC9DD1B00, 0xC9DBBA00, 0xC9DA5900,
-	0xC9D8F800, 0xC9D79700, 0xC9D63600,
-	0xC9D4D500, 0xC9D37400, 0xC9D21300,
-	0xC9D0B200, 0xC9CF5100, 0xC9CDF000,
-	0xC9CC8F00, 0xC9CB2E00, 0xC9C9CD00,
-	0xC9C86C00, 0xC9C70B00, 0xC9C5AA00,
-	0xC9C44900, 0xC9C2E800, 0xC9C18700,
-	0xC9C02600, 0xC9BEC500, 0xC9BD6400,
-	0xC9BC0300, 0xC9BAA200, 0xC9B94100,
-	0xC9B7E000, 0xC9B67F00, 0xC9B51E00,
-	0xC9B3BD00, 0xC9B25C00, 0xC9B0FB00,
-	0xC9AF9A00, 0xC9AE3900, 0xC9ACD800,
-	0xC9AB7700, 0xC9AA1600, 0xC9A8B500,
-	0xC9A75400, 0xC9A5F300, 0xC9A49200,
-	0xC9A33100, 0xC9A1D000, 0xC9A06F00,
-	0xC99F0E00, 0xC99DAD00, 0xC99C4C00,
-	0xC99AEB00, 0xC9998A00, 0xC9982900,
-	0xC996C800, 0xC9956700, 0xC9940600,
-	0xC992A500, 0xC9914400, 0xC98FE300,
-	0xC98E8200, 0xC98D2100, 0xC98BC000,
-	0xC98A5F00, 0xC988FE00, 0xC9879D00,
-	0xC9863C00, 0xC984DB00, 0xC9837A00,
-	0xC9821900, 0xC980B800, 0xC97F5700,
-	0xC97DF600, 0xC97C9500, 0xC97B3400,
-	0xC979D300, 0xC9787200, 0xC9771100,
-	0xC975B000, 0xC9744F00, 0xC972EE00,
-	0xC9718D00, 0xC9702C00, 0xC96ECB00,
-	0xC96D6A00, 0xC96C0900, 0xC96AA800,
-	0xC9694700, 0xC967E600, 0xC9668500,
-	0xC9652400, 0xC963C300, 0xC9626200,
-	0xC9610100, 0xC95FA000, 0xC95E3F00,
-	0xC95CDE00, 0xC95B7D00, 0xC95A1C00,
-	0xC958BB00, 0xC9575A00, 0xC955F900,
-	0xC9549800, 0xC9533700, 0xC951D600,
-	0xC9507500, 0xC94F1400, 0xC94DB300,
-	0xC94C5200, 0xC94AF100, 0xC9499000,
-	0xC9482F00, 0xC946CE00, 0xC9456D00,
-	0xC9440C00, 0xC942AB00, 0xC9414A00,
-	0xC93FE900, 0xC93E8800, 0xC93D2700,
-	0xC93BC600, 0xC93A6500, 0xC9390400,
-	0xC937A300, 0xC9364200, 0xC934E100,
-	0xC9338000, 0xC9321F00, 0xC930BE00,
-	0xC92F5D00, 0xC92DFC00, 0xC92C9B00,
-	0xC92B3A00, 0xC929D900, 0xC9287800,
-	0xC9271700, 0xC925B600, 0xC9245500,
-	0xC922F400, 0xC9219300, 0xC9203200,
-	0xC91ED100, 0xC91D7000, 0xC91C0F00,
-	0xC91AAE00, 0xC9194D00, 0xC917EC00,
-	0xC9168B00, 0xC9152A00, 0xC913C900,
-	0xC9126800, 0xC9110700, 0xC90FA600,
-	0xC90E4500, 0xC90CE400, 0xC90B8300,
-	0xC90A2200, 0xC908C100, 0xC9076000,
-	0xC905FF00, 0xC9049E00, 0xC9033D00,
-	0xC901DC00, 0xC9007B00, 0xC8FF1A00,
-	0xC8FDB900, 0xC8FC5800, 0xC8FAF700,
-	0xC8F99600, 0xC8F83500, 0xC8F6D400,
-	0xC8F57300, 0xC8F41200, 0xC8F2B100,
-	0xC8F15000, 0xC8EFEF00, 0xC8EE8E00,
-	0xC8ED2D00, 0xC8EBCC00, 0xC8EA6B00,
-	0xC8E90A00, 0xC8E7A900, 0xC8E64800,
-	0xC8E4E700, 0xC8E38600, 0xC8E22500,
-	0xC8E0C400, 0xC8DF6300, 0xC8DE0200,
-	0xC8DCA100, 0xC8DB4000, 0xC8D9DF00,
-	0xC8D87E00, 0xC8D71D00, 0xC8D5BC00,
-	0xC8D45B00, 0xC8D2FA00, 0xC8D19900,
-	0xC8D03800, 0xC8CED700, 0xC8CD7600,
-	0xC8CC1500, 0xC8CAB400, 0xC8C95300,
-	0xC8C7F200, 0xC8C69100, 0xC8C53000,
-	0xC8C3CF00, 0xC8C26E00, 0xC8C10D00,
-	0xC8BFAC00, 0xC8BE4B00, 0xC8BCEA00,
-	0xC8BB8900, 0xC8BA2800, 0xC8B8C700,
-	0xC8B76600, 0xC8B60500, 0xC8B4A400,
-	0xC8B34300, 0xC8B1E200, 0xC8B08100,
-	0xC8AF2000, 0xC8ADBF00, 0xC8AC5E00,
-	0xC8AAFD00, 0xC8A99C00, 0xC8A83B00,
-	0xC8A6DA00, 0xC8A57900, 0xC8A41800,
-	0xC8A2B700, 0xC8A15600, 0xC89FF500,
-	0xC89E9400, 0xC89D3300, 0xC89BD200,
-	0xC89A7100, 0xC8991000, 0xC897AF00,
-	0xC8964E00, 0xC894ED00, 0xC8938C00,
-	0xC8922B00, 0xC890CA00, 0xC88F6900,
-	0xC88E0800, 0xC88CA700, 0xC88B4600,
-	0xC889E500, 0xC8888400, 0xC8872300,
-	0xC885C200, 0xC8846100, 0xC8830000,
-	0xC8819F00, 0xC8803E00, 0xC87EDD00,
-	0xC87D7C00, 0xC87C1B00, 0xC87ABA00,
-	0xC8795900, 0xC877F800, 0xC8769700,
-	0xC8753600, 0xC873D500, 0xC8727400,
-	0xC8711300, 0xC86FB200, 0xC86E5100,
-	0xC86CF000, 0xC86B8F00, 0xC86A2E00,
-	0xC868CD00, 0xC8676C00, 0xC8660B00,
-	0xC864AA00, 0xC8634900, 0xC861E800,
-	0xC8608700, 0xC85F2600, 0xC85DC500,
-	0xC85C6400, 0xC85B0300, 0xC859A200,
-	0xC8584100, 0xC856E000, 0xC8557F00,
-	0xC8541E00, 0xC852BD00, 0xC8515C00,
-	0xC84FFB00, 0xC84E9A00, 0xC84D3900,
-	0xC84BD800, 0xC84A7700, 0xC8491600,
-	0xC847B500, 0xC8465400, 0xC844F300,
-	0xC8439200, 0xC8423100, 0xC840D000,
-	0xC83F6F00, 0xC83E0E00, 0xC83CAD00,
-	0xC83B4C00, 0xC839EB00, 0xC8388A00,
-	0xC8372900, 0xC835C800, 0xC8346700,
-	0xC8330600, 0xC831A500, 0xC8304400,
-	0xC82EE300, 0xC82D8200, 0xC82C2100,
-	0xC82AC000, 0xC8295F00, 0xC827FE00,
-	0xC8269D00, 0xC8253C00, 0xC823DB00,
-	0xC8227A00, 0xC8211900, 0xC81FB800,
-	0xC81E5700, 0xC81CF600, 0xC81B9500,
-	0xC81A3400, 0xC818D300, 0xC8177200,
-	0xC8161100, 0xC814B000, 0xC8134F00,
-	0xC811EE00, 0xC8108D00, 0xC80F2C00,
-	0xC80DCB00, 0xC80C6A00, 0xC80B0900,
-	0xC809A800, 0xC8084700, 0xC806E600,
-	0xC8058500, 0xC8042400, 0xC802C300,
-	0xC8016200, 0xC8000100, 0xC7FEA000,
-	0xC7FD3F00, 0xC7FBDE00, 0xC7FA7D00,
-	0xC7F91C00, 0xC7F7BB00, 0xC7F65A00,
-	0xC7F4F900, 0xC7F39800, 0xC7F23700,
-	0xC7F0D600, 0xC7EF7500, 0xC7EE1400,
-	0xC7ECB300, 0xC7EB5200, 0xC7E9F100,
-	0xC7E89000, 0xC7E72F00, 0xC7E5CE00,
-	0xC7E46D00, 0xC7E30C00, 0xC7E1AB00,
-	0xC7E04A00, 0xC7DEE900, 0xC7DD8800,
-	0xC7DC2700, 0xC7DAC600, 0xC7D96500,
-	0xC7D80400, 0xC7D6A300, 0xC7D54200,
-	0xC7D3E100, 0xC7D28000, 0xC7D11F00,
-	0xC7CFBE00, 0xC7CE5D00, 0xC7CCFC00,
-	0xC7CB9B00, 0xC7CA3A00, 0xC7C8D900,
-	0xC7C77800, 0xC7C61700, 0xC7C4B600,
-	0xC7C35500, 0xC7C1F400, 0xC7C09300,
-	0xC7BF3200, 0xC7BDD100, 0xC7BC7000,
-	0xC7BB0F00, 0xC7B9AE00, 0xC7B84D00,
-	0xC7B6EC00, 0xC7B58B00, 0xC7B42A00,
-	0xC7B2C900, 0xC7B16800, 0xC7B00700,
-	0xC7AEA600, 0xC7AD4500, 0xC7ABE400,
-	0xC7AA8300, 0xC7A92200, 0xC7A7C100,
-	0xC7A66000, 0xC7A4FF00, 0xC7A39E00,
-	0xC7A23D00, 0xC7A0DC00, 0xC79F7B00,
-	0xC79E1A00, 0xC79CB900, 0xC79B5800,
-	0xC799F700, 0xC7989600, 0xC7973500,
-	0xC795D400, 0xC7947300, 0xC7931200,
-	0xC791B100, 0xC7905000, 0xC78EEF00,
-	0xC78D8E00, 0xC78C2D00, 0xC78ACC00,
-	0xC7896B00, 0xC7880A00, 0xC786A900,
-	0xC7854800, 0xC783E700, 0xC7828600,
-	0xC7812500, 0xC77FC400, 0xC77E6300,
-	0xC77D0200, 0xC77BA100, 0xC77A4000,
-	0xC778DF00, 0xC7777E00, 0xC7761D00,
-	0xC774BC00, 0xC7735B00, 0xC771FA00,
-	0xC7709900, 0xC76F3800, 0xC76DD700,
-	0xC76C7600, 0xC76B1500, 0xC769B400,
-	0xC7685300, 0xC766F200, 0xC7659100,
-	0xC7643000, 0xC762CF00, 0xC7616E00,
-	0xC7600D00, 0xC75EAC00, 0xC75D4B00,
-	0xC75BEA00, 0xC75A8900, 0xC7592800,
-	0xC757C700, 0xC7566600, 0xC7550500,
-	0xC753A400, 0xC7524300, 0xC750E200,
-	0xC74F8100, 0xC74E2000, 0xC74CBF00,
-	0xC74B5E00, 0xC749FD00, 0xC7489C00,
-	0xC7473B00, 0xC745DA00, 0xC7447900,
-	0xC7431800, 0xC741B700, 0xC7405600,
-	0xC73EF500, 0xC73D9400, 0xC73C3300,
-	0xC73AD200, 0xC7397100, 0xC7381000,
-	0xC736AF00, 0xC7354E00, 0xC733ED00,
-	0xC7328C00, 0xC7312B00, 0xC72FCA00,
-	0xC72E6900, 0xC72D0800, 0xC72BA700,
-	0xC72A4600, 0xC728E500, 0xC7278400,
-	0xC7262300, 0xC724C200, 0xC7236100,
-	0xC7220000, 0xC7209F00, 0xC71F3E00,
-	0xC71DDD00, 0xC71C7C00, 0xC71B1B00,
-	0xC719BA00, 0xC7185900, 0xC716F800,
-	0xC7159700, 0xC7143600, 0xC712D500,
-	0xC7117400, 0xC7101300, 0xC70EB200,
-	0xC70D5100, 0xC70BF000, 0xC70A8F00,
-	0xC7092E00, 0xC707CD00, 0xC7066C00,
-	0xC7050B00, 0xC703AA00, 0xC7024900,
-	0xC700E800, 0xC6FF8700, 0xC6FE2600,
-	0xC6FCC500, 0xC6FB6400, 0xC6FA0300,
-	0xC6F8A200, 0xC6F74100, 0xC6F5E000,
-	0xC6F47F00, 0xC6F31E00, 0xC6F1BD00,
-	0xC6F05C00, 0xC6EEFB00, 0xC6ED9A00,
-	0xC6EC3900, 0xC6EAD800, 0xC6E97700,
-	0xC6E81600, 0xC6E6B500, 0xC6E55400,
-	0xC6E3F300, 0xC6E29200, 0xC6E13100,
-	0xC6DFD000, 0xC6DE6F00, 0xC6DD0E00,
-	0xC6DBAD00, 0xC6DA4C00, 0xC6D8EB00,
-	0xC6D78A00, 0xC6D62900, 0xC6D4C800,
-	0xC6D36700, 0xC6D20600, 0xC6D0A500,
-	0xC6CF4400, 0xC6CDE300, 0xC6CC8200,
-	0xC6CB2100, 0xC6C9C000, 0xC6C85F00,
-	0xC6C6FE00, 0xC6C59D00, 0xC6C43C00,
-	0xC6C2DB00, 0xC6C17A00, 0xC6C01900,
-	0xC6BEB800, 0xC6BD5700, 0xC6BBF600,
-	0xC6BA9500, 0xC6B93400, 0xC6B7D300,
-	0xC6B67200, 0xC6B51100, 0xC6B3B000,
-	0xC6B24F00, 0xC6B0EE00, 0xC6AF8D00,
-	0xC6AE2C00, 0xC6ACCB00, 0xC6AB6A00,
-	0xC6AA0900, 0xC6A8A800, 0xC6A74700,
-	0xC6A5E600, 0xC6A48500, 0xC6A32400,
-	0xC6A1C300, 0xC6A06200, 0xC69F0100,
-	0xC69DA000, 0xC69C3F00, 0xC69ADE00,
-	0xC6997D00, 0xC6981C00, 0xC696BB00,
-	0xC6955A00, 0xC693F900, 0xC6929800,
-	0xC6913700, 0xC68FD600, 0xC68E7500,
-	0xC68D1400, 0xC68BB300, 0xC68A5200,
-	0xC688F100, 0xC6879000, 0xC6862F00,
-	0xC684CE00, 0xC6836D00, 0xC6820C00,
-	0xC680AB00, 0xC67F4A00, 0xC67DE900,
-	0xC67C8800, 0xC67B2700, 0xC679C600,
-	0xC6786500, 0xC6770400, 0xC675A300,
-	0xC6744200, 0xC672E100, 0xC6718000,
-	0xC6701F00, 0xC66EBE00, 0xC66D5D00,
-	0xC66BFC00, 0xC66A9B00, 0xC6693A00,
-	0xC667D900, 0xC6667800, 0xC6651700,
-	0xC663B600, 0xC6625500, 0xC660F400,
-	0xC65F9300, 0xC65E3200, 0xC65CD100,
-	0xC65B7000, 0xC65A0F00, 0xC658AE00,
-	0xC6574D00, 0xC655EC00, 0xC6548B00,
-	0xC6532A00, 0xC651C900, 0xC6506800,
-	0xC64F0700, 0xC64DA600, 0xC64C4500,
-	0xC64AE400, 0xC6498300, 0xC6482200,
-	0xC646C100, 0xC6456000, 0xC643FF00,
-	0xC6429E00, 0xC6413D00, 0xC63FDC00,
-	0xC63E7B00, 0xC63D1A00, 0xC63BB900,
-	0xC63A5800, 0xC638F700, 0xC6379600,
-	0xC6363500, 0xC634D400, 0xC6337300,
-	0xC6321200, 0xC630B100, 0xC62F5000,
-	0xC62DEF00, 0xC62C8E00, 0xC62B2D00,
-	0xC629CC00, 0xC6286B00, 0xC6270A00,
-	0xC625A900, 0xC6244800, 0xC622E700,
-	0xC6218600, 0xC6202500, 0xC61EC400,
-	0xC61D6300, 0xC61C0200, 0xC61AA100,
-	0xC6194000, 0xC617DF00, 0xC6167E00,
-	0xC6151D00, 0xC613BC00, 0xC6125B00,
-	0xC610FA00, 0xC60F9900, 0xC60E3800,
-	0xC60CD700, 0xC60B7600, 0xC60A1500,
-	0xC608B400, 0xC6075300, 0xC605F200,
-	0xC6049100, 0xC6033000, 0xC601CF00,
-	0xC6006E00, 0xC5FF0D00, 0xC5FDAC00,
-	0xC5FC4B00, 0xC5FAEA00, 0xC5F98900,
-	0xC5F82800, 0xC5F6C700, 0xC5F56600,
-	0xC5F40500, 0xC5F2A400, 0xC5F14300,
-	0xC5EFE200, 0xC5EE8100, 0xC5ED2000,
-	0xC5EBBF00, 0xC5EA5E00, 0xC5E8FD00,
-	0xC5E79C00, 0xC5E63B00, 0xC5E4DA00,
-	0xC5E37900, 0xC5E21800, 0xC5E0B700,
-	0xC5DF5600, 0xC5DDF500, 0xC5DC9400,
-	0xC5DB3300, 0xC5D9D200, 0xC5D87100,
-	0xC5D71000, 0xC5D5AF00, 0xC5D44E00,
-	0xC5D2ED00, 0xC5D18C00, 0xC5D02B00,
-	0xC5CECA00, 0xC5CD6900, 0xC5CC0800,
-	0xC5CAA700, 0xC5C94600, 0xC5C7E500,
-	0xC5C68400, 0xC5C52300, 0xC5C3C200,
-	0xC5C26100, 0xC5C10000, 0xC5BF9F00,
-	0xC5BE3E00, 0xC5BCDD00, 0xC5BB7C00,
-	0xC5BA1B00, 0xC5B8BA00, 0xC5B75900,
-	0xC5B5F800, 0xC5B49700, 0xC5B33600,
-	0xC5B1D500, 0xC5B07400, 0xC5AF1300,
-	0xC5ADB200, 0xC5AC5100, 0xC5AAF000,
-	0xC5A98F00, 0xC5A82E00, 0xC5A6CD00,
-	0xC5A56C00, 0xC5A40B00, 0xC5A2AA00,
-	0xC5A14900, 0xC59FE800, 0xC59E8700,
-	0xC59D2600, 0xC59BC500, 0xC59A6400,
-	0xC5990300, 0xC597A200, 0xC5964100,
-	0xC594E000, 0xC5937F00, 0xC5921E00,
-	0xC590BD00, 0xC58F5C00, 0xC58DFB00,
-	0xC58C9A00, 0xC58B3900, 0xC589D800,
-	0xC5887700, 0xC5871600, 0xC585B500,
-	0xC5845400, 0xC582F300, 0xC5819200,
-	0xC5803100, 0xC57ED000, 0xC57D6F00,
-	0xC57C0E00, 0xC57AAD00, 0xC5794C00,
-	0xC577EB00, 0xC5768A00, 0xC5752900,
-	0xC573C800, 0xC5726700, 0xC5710600,
-	0xC56FA500, 0xC56E4400, 0xC56CE300,
-	0xC56B8200, 0xC56A2100, 0xC568C000,
-	0xC5675F00, 0xC565FE00, 0xC5649D00,
-	0xC5633C00, 0xC561DB00, 0xC5607A00,
-	0xC55F1900, 0xC55DB800, 0xC55C5700,
-	0xC55AF600, 0xC5599500, 0xC5583400,
-	0xC556D300, 0xC5557200, 0xC5541100,
-	0xC552B000, 0xC5514F00, 0xC54FEE00,
-	0xC54E8D00, 0xC54D2C00, 0xC54BCB00,
-	0xC54A6A00, 0xC5490900, 0xC547A800,
-	0xC5464700, 0xC544E600, 0xC5438500,
-	0xC5422400, 0xC540C300, 0xC53F6200,
-	0xC53E0100, 0xC53CA000, 0xC53B3F00,
-	0xC539DE00, 0xC5387D00, 0xC5371C00,
-	0xC535BB00, 0xC5345A00, 0xC532F900,
-	0xC5319800, 0xC5303700, 0xC52ED600,
-	0xC52D7500, 0xC52C1400, 0xC52AB300,
-	0xC5295200, 0xC527F100, 0xC5269000,
-	0xC5252F00, 0xC523CE00, 0xC5226D00,
-	0xC5210C00, 0xC51FAB00, 0xC51E4A00,
-	0xC51CE900, 0xC51B8800, 0xC51A2700,
-	0xC518C600, 0xC5176500, 0xC5160400,
-	0xC514A300, 0xC5134200, 0xC511E100,
-	0xC5108000, 0xC50F1F00, 0xC50DBE00,
-	0xC50C5D00, 0xC50AFC00, 0xC5099B00,
-	0xC5083A00, 0xC506D900, 0xC5057800,
-	0xC5041700, 0xC502B600, 0xC5015500,
-	0xC4FFF400, 0xC4FE9300, 0xC4FD3200,
-	0xC4FBD100, 0xC4FA7000, 0xC4F90F00,
-	0xC4F7AE00, 0xC4F64D00, 0xC4F4EC00,
-	0xC4F38B00, 0xC4F22A00, 0xC4F0C900,
-	0xC4EF6800, 0xC4EE0700, 0xC4ECA600,
-	0xC4EB4500, 0xC4E9E400, 0xC4E88300,
-	0xC4E72200, 0xC4E5C100, 0xC4E46000,
-	0xC4E2FF00, 0xC4E19E00, 0xC4E03D00,
-	0xC4DEDC00, 0xC4DD7B00, 0xC4DC1A00,
-	0xC4DAB900, 0xC4D95800, 0xC4D7F700,
-	0xC4D69600, 0xC4D53500, 0xC4D3D400,
-	0xC4D27300, 0xC4D11200, 0xC4CFB100,
-	0xC4CE5000, 0xC4CCEF00, 0xC4CB8E00,
-	0xC4CA2D00, 0xC4C8CC00, 0xC4C76B00,
-	0xC4C60A00, 0xC4C4A900, 0xC4C34800,
-	0xC4C1E700, 0xC4C08600, 0xC4BF2500,
-	0xC4BDC400, 0xC4BC6300, 0xC4BB0200,
-	0xC4B9A100, 0xC4B84000, 0xC4B6DF00,
-	0xC4B57E00, 0xC4B41D00, 0xC4B2BC00,
-	0xC4B15B00, 0xC4AFFA00, 0xC4AE9900,
-	0xC4AD3800, 0xC4ABD700, 0xC4AA7600,
-	0xC4A91500, 0xC4A7B400, 0xC4A65300,
-	0xC4A4F200, 0xC4A39100, 0xC4A23000,
-	0xC4A0CF00, 0xC49F6E00, 0xC49E0D00,
-	0xC49CAC00, 0xC49B4B00, 0xC499EA00,
-	0xC4988900, 0xC4972800, 0xC495C700,
-	0xC4946600, 0xC4930500, 0xC491A400,
-	0xC4904300, 0xC48EE200, 0xC48D8100,
-	0xC48C2000, 0xC48ABF00, 0xC4895E00,
-	0xC487FD00, 0xC4869C00, 0xC4853B00,
-	0xC483DA00, 0xC4827900, 0xC4811800,
-	0xC47FB700, 0xC47E5600, 0xC47CF500,
-	0xC47B9400, 0xC47A3300, 0xC478D200,
-	0xC4777100, 0xC4761000, 0xC474AF00,
-	0xC4734E00, 0xC471ED00, 0xC4708C00,
-	0xC46F2B00, 0xC46DCA00, 0xC46C6900,
-	0xC46B0800, 0xC469A700, 0xC4684600,
-	0xC466E500, 0xC4658400, 0xC4642300,
-	0xC462C200, 0xC4616100, 0xC4600000,
-	0xC45E9F00, 0xC45D3E00, 0xC45BDD00,
-	0xC45A7C00, 0xC4591B00, 0xC457BA00,
-	0xC4565900, 0xC454F800, 0xC4539700,
-	0xC4523600, 0xC450D500, 0xC44F7400,
-	0xC44E1300, 0xC44CB200, 0xC44B5100,
-	0xC449F000, 0xC4488F00, 0xC4472E00,
-	0xC445CD00, 0xC4446C00, 0xC4430B00,
-	0xC441AA00, 0xC4404900, 0xC43EE800,
-	0xC43D8700, 0xC43C2600, 0xC43AC500,
-	0xC4396400, 0xC4380300, 0xC436A200,
-	0xC4354100, 0xC433E000, 0xC4327F00,
-	0xC4311E00, 0xC42FBD00, 0xC42E5C00,
-	0xC42CFB00, 0xC42B9A00, 0xC42A3900,
-	0xC428D800, 0xC4277700, 0xC4261600,
-	0xC424B500, 0xC4235400, 0xC421F300,
-	0xC4209200, 0xC41F3100, 0xC41DD000,
-	0xC41C6F00, 0xC41B0E00, 0xC419AD00,
-	0xC4184C00, 0xC416EB00, 0xC4158A00,
-	0xC4142900, 0xC412C800, 0xC4116700,
-	0xC4100600, 0xC40EA500, 0xC40D4400,
-	0xC40BE300, 0xC40A8200, 0xC4092100,
-	0xC407C000, 0xC4065F00, 0xC404FE00,
-	0xC4039D00, 0xC4023C00, 0xC400DB00,
-	0xC3FF7A00, 0xC3FE1900, 0xC3FCB800,
-	0xC3FB5700, 0xC3F9F600, 0xC3F89500,
-	0xC3F73400, 0xC3F5D300, 0xC3F47200,
-	0xC3F31100, 0xC3F1B000, 0xC3F04F00,
-	0xC3EEEE00, 0xC3ED8D00, 0xC3EC2C00,
-	0xC3EACB00, 0xC3E96A00, 0xC3E80900,
-	0xC3E6A800, 0xC3E54700, 0xC3E3E600,
-	0xC3E28500, 0xC3E12400, 0xC3DFC300,
-	0xC3DE6200, 0xC3DD0100, 0xC3DBA000,
-	0xC3DA3F00, 0xC3D8DE00, 0xC3D77D00,
-	0xC3D61C00, 0xC3D4BB00, 0xC3D35A00,
-	0xC3D1F900, 0xC3D09800, 0xC3CF3700,
-	0xC3CDD600, 0xC3CC7500, 0xC3CB1400,
-	0xC3C9B300, 0xC3C85200, 0xC3C6F100,
-	0xC3C59000, 0xC3C42F00, 0xC3C2CE00,
-	0xC3C16D00, 0xC3C00C00, 0xC3BEAB00,
-	0xC3BD4A00, 0xC3BBE900, 0xC3BA8800,
-	0xC3B92700, 0xC3B7C600, 0xC3B66500,
-	0xC3B50400, 0xC3B3A300, 0xC3B24200,
-	0xC3B0E100, 0xC3AF8000, 0xC3AE1F00,
-	0xC3ACBE00, 0xC3AB5D00, 0xC3A9FC00,
-	0xC3A89B00, 0xC3A73A00, 0xC3A5D900,
-	0xC3A47800, 0xC3A31700, 0xC3A1B600,
-	0xC3A05500, 0xC39EF400, 0xC39D9300,
-	0xC39C3200, 0xC39AD100, 0xC3997000,
-	0xC3980F00, 0xC396AE00, 0xC3954D00,
-	0xC393EC00, 0xC3928B00, 0xC3912A00,
-	0xC38FC900, 0xC38E6800, 0xC38D0700,
-	0xC38BA600, 0xC38A4500, 0xC388E400,
-	0xC3878300, 0xC3862200, 0xC384C100,
-	0xC3836000, 0xC381FF00, 0xC3809E00,
-	0xC37F3D00, 0xC37DDC00, 0xC37C7B00,
-	0xC37B1A00, 0xC379B900, 0xC3785800,
-	0xC376F700, 0xC3759600, 0xC3743500,
-	0xC372D400, 0xC3717300, 0xC3701200,
-	0xC36EB100, 0xC36D5000, 0xC36BEF00,
-	0xC36A8E00, 0xC3692D00, 0xC367CC00,
-	0xC3666B00, 0xC3650A00, 0xC363A900,
-	0xC3624800, 0xC360E700, 0xC35F8600,
-	0xC35E2500, 0xC35CC400, 0xC35B6300,
-	0xC35A0200, 0xC358A100, 0xC3574000,
-	0xC355DF00, 0xC3547E00, 0xC3531D00,
-	0xC351BC00, 0xC3505B00, 0xC34EFA00,
-	0xC34D9900, 0xC34C3800, 0xC34AD700,
-	0xC3497600, 0xC3481500, 0xC346B400,
-	0xC3455300, 0xC343F200, 0xC3429100,
-	0xC3413000, 0xC33FCF00, 0xC33E6E00,
-	0xC33D0D00, 0xC33BAC00, 0xC33A4B00,
-	0xC338EA00, 0xC3378900, 0xC3362800,
-	0xC334C700, 0xC3336600, 0xC3320500,
-	0xC330A400, 0xC32F4300, 0xC32DE200,
-	0xC32C8100, 0xC32B2000, 0xC329BF00,
-	0xC3285E00, 0xC326FD00, 0xC3259C00,
-	0xC3243B00, 0xC322DA00, 0xC3217900,
-	0xC3201800, 0xC31EB700, 0xC31D5600,
-	0xC31BF500, 0xC31A9400, 0xC3193300,
-	0xC317D200, 0xC3167100, 0xC3151000,
-	0xC313AF00, 0xC3124E00, 0xC310ED00,
-	0xC30F8C00, 0xC30E2B00, 0xC30CCA00,
-	0xC30B6900, 0xC30A0800, 0xC308A700,
-	0xC3074600, 0xC305E500, 0xC3048400,
-	0xC3032300, 0xC301C200, 0xC3006100,
-	0xC2FF0000, 0xC2FD9F00, 0xC2FC3E00,
-	0xC2FADD00, 0xC2F97C00, 0xC2F81B00,
-	0xC2F6BA00, 0xC2F55900, 0xC2F3F800,
-	0xC2F29700, 0xC2F13600, 0xC2EFD500,
-	0xC2EE7400, 0xC2ED1300, 0xC2EBB200,
-	0xC2EA5100, 0xC2E8F000, 0xC2E78F00,
-	0xC2E62E00, 0xC2E4CD00, 0xC2E36C00,
-	0xC2E20B00, 0xC2E0AA00, 0xC2DF4900,
-	0xC2DDE800, 0xC2DC8700, 0xC2DB2600,
-	0xC2D9C500, 0xC2D86400, 0xC2D70300,
-	0xC2D5A200, 0xC2D44100, 0xC2D2E000,
-	0xC2D17F00, 0xC2D01E00, 0xC2CEBD00,
-	0xC2CD5C00, 0xC2CBFB00, 0xC2CA9A00,
-	0xC2C93900, 0xC2C7D800, 0xC2C67700,
-	0xC2C51600, 0xC2C3B500, 0xC2C25400,
-	0xC2C0F300, 0xC2BF9200, 0xC2BE3100,
-	0xC2BCD000, 0xC2BB6F00, 0xC2BA0E00,
-	0xC2B8AD00, 0xC2B74C00, 0xC2B5EB00,
-	0xC2B48A00, 0xC2B32900, 0xC2B1C800,
-	0xC2B06700, 0xC2AF0600, 0xC2ADA500,
-	0xC2AC4400, 0xC2AAE300, 0xC2A98200,
-	0xC2A82100, 0xC2A6C000, 0xC2A55F00,
-	0xC2A3FE00, 0xC2A29D00, 0xC2A13C00,
-	0xC29FDB00, 0xC29E7A00, 0xC29D1900,
-	0xC29BB800, 0xC29A5700, 0xC298F600,
-	0xC2979500, 0xC2963400, 0xC294D300,
-	0xC2937200, 0xC2921100, 0xC290B000,
-	0xC28F4F00, 0xC28DEE00, 0xC28C8D00,
-	0xC28B2C00, 0xC289CB00, 0xC2886A00,
-	0xC2870900, 0xC285A800, 0xC2844700,
-	0xC282E600, 0xC2818500, 0xC2802400,
-	0xC27EC300, 0xC27D6200, 0xC27C0100,
-	0xC27AA000, 0xC2793F00, 0xC277DE00,
-	0xC2767D00, 0xC2751C00, 0xC273BB00,
-	0xC2725A00, 0xC270F900, 0xC26F9800,
-	0xC26E3700, 0xC26CD600, 0xC26B7500,
-	0xC26A1400, 0xC268B300, 0xC2675200,
-	0xC265F100, 0xC2649000, 0xC2632F00,
-	0xC261CE00, 0xC2606D00, 0xC25F0C00,
-	0xC25DAB00, 0xC25C4A00, 0xC25AE900,
-	0xC2598800, 0xC2582700, 0xC256C600,
-	0xC2556500, 0xC2540400, 0xC252A300,
-	0xC2514200, 0xC24FE100, 0xC24E8000,
-	0xC24D1F00, 0xC24BBE00, 0xC24A5D00,
-	0xC248FC00, 0xC2479B00, 0xC2463A00,
-	0xC244D900, 0xC2437800, 0xC2421700,
-	0xC240B600, 0xC23F5500, 0xC23DF400,
-	0xC23C9300, 0xC23B3200, 0xC239D100,
-	0xC2387000, 0xC2370F00, 0xC235AE00,
-	0xC2344D00, 0xC232EC00, 0xC2318B00,
-	0xC2302A00, 0xC22EC900, 0xC22D6800,
-	0xC22C0700, 0xC22AA600, 0xC2294500,
-	0xC227E400, 0xC2268300, 0xC2252200,
-	0xC223C100, 0xC2226000, 0xC220FF00,
-	0xC21F9E00, 0xC21E3D00, 0xC21CDC00,
-	0xC21B7B00, 0xC21A1A00, 0xC218B900,
-	0xC2175800, 0xC215F700, 0xC2149600,
-	0xC2133500, 0xC211D400, 0xC2107300,
-	0xC20F1200, 0xC20DB100, 0xC20C5000,
-	0xC20AEF00, 0xC2098E00, 0xC2082D00,
-	0xC206CC00, 0xC2056B00, 0xC2040A00,
-	0xC202A900, 0xC2014800, 0xC1FFE700,
-	0xC1FE8600, 0xC1FD2500, 0xC1FBC400,
-	0xC1FA6300, 0xC1F90200, 0xC1F7A100,
-	0xC1F64000, 0xC1F4DF00, 0xC1F37E00,
-	0xC1F21D00, 0xC1F0BC00, 0xC1EF5B00,
-	0xC1EDFA00, 0xC1EC9900, 0xC1EB3800,
-	0xC1E9D700, 0xC1E87600, 0xC1E71500,
-	0xC1E5B400, 0xC1E45300, 0xC1E2F200,
-	0xC1E19100, 0xC1E03000, 0xC1DECF00,
-	0xC1DD6E00, 0xC1DC0D00, 0xC1DAAC00,
-	0xC1D94B00, 0xC1D7EA00, 0xC1D68900,
-	0xC1D52800, 0xC1D3C700, 0xC1D26600,
-	0xC1D10500, 0xC1CFA400, 0xC1CE4300,
-	0xC1CCE200, 0xC1CB8100, 0xC1CA2000,
-	0xC1C8BF00, 0xC1C75E00, 0xC1C5FD00,
-	0xC1C49C00, 0xC1C33B00, 0xC1C1DA00,
-	0xC1C07900, 0xC1BF1800, 0xC1BDB700,
-	0xC1BC5600, 0xC1BAF500, 0xC1B99400,
-	0xC1B83300, 0xC1B6D200, 0xC1B57100,
-	0xC1B41000, 0xC1B2AF00, 0xC1B14E00,
-	0xC1AFED00, 0xC1AE8C00, 0xC1AD2B00,
-	0xC1ABCA00, 0xC1AA6900, 0xC1A90800,
-	0xC1A7A700, 0xC1A64600, 0xC1A4E500,
-	0xC1A38400, 0xC1A22300, 0xC1A0C200,
-	0xC19F6100, 0xC19E0000, 0xC19C9F00,
-	0xC19B3E00, 0xC199DD00, 0xC1987C00,
-	0xC1971B00, 0xC195BA00, 0xC1945900,
-	0xC192F800, 0xC1919700, 0xC1903600,
-	0xC18ED500, 0xC18D7400, 0xC18C1300,
-	0xC18AB200, 0xC1895100, 0xC187F000,
-	0xC1868F00, 0xC1852E00, 0xC183CD00,
-	0xC1826C00, 0xC1810B00, 0xC17FAA00,
-	0xC17E4900, 0xC17CE800, 0xC17B8700,
-	0xC17A2600, 0xC178C500, 0xC1776400,
-	0xC1760300, 0xC174A200, 0xC1734100,
-	0xC171E000, 0xC1707F00, 0xC16F1E00,
-	0xC16DBD00, 0xC16C5C00, 0xC16AFB00,
-	0xC1699A00, 0xC1683900, 0xC166D800,
-	0xC1657700, 0xC1641600, 0xC162B500,
-	0xC1615400, 0xC15FF300, 0xC15E9200,
-	0xC15D3100, 0xC15BD000, 0xC15A6F00,
-	0xC1590E00, 0xC157AD00, 0xC1564C00,
-	0xC154EB00, 0xC1538A00, 0xC1522900,
-	0xC150C800, 0xC14F6700, 0xC14E0600,
-	0xC14CA500, 0xC14B4400, 0xC149E300,
-	0xC1488200, 0xC1472100, 0xC145C000,
-	0xC1445F00, 0xC142FE00, 0xC1419D00,
-	0xC1403C00, 0xC13EDB00, 0xC13D7A00,
-	0xC13C1900, 0xC13AB800, 0xC1395700,
-	0xC137F600, 0xC1369500, 0xC1353400,
-	0xC133D300, 0xC1327200, 0xC1311100,
-	0xC12FB000, 0xC12E4F00, 0xC12CEE00,
-	0xC12B8D00, 0xC12A2C00, 0xC128CB00,
-	0xC1276A00, 0xC1260900, 0xC124A800,
-	0xC1234700, 0xC121E600, 0xC1208500,
-	0xC11F2400, 0xC11DC300, 0xC11C6200,
-	0xC11B0100, 0xC119A000, 0xC1183F00,
-	0xC116DE00, 0xC1157D00, 0xC1141C00,
-	0xC112BB00, 0xC1115A00, 0xC10FF900,
-	0xC10E9800, 0xC10D3700, 0xC10BD600,
-	0xC10A7500, 0xC1091400, 0xC107B300,
-	0xC1065200, 0xC104F100, 0xC1039000,
-	0xC1022F00, 0xC100CE00, 0xC0FF6D00,
-	0xC0FE0C00, 0xC0FCAB00, 0xC0FB4A00,
-	0xC0F9E900, 0xC0F88800, 0xC0F72700,
-	0xC0F5C600, 0xC0F46500, 0xC0F30400,
-	0xC0F1A300, 0xC0F04200, 0xC0EEE100,
-	0xC0ED8000, 0xC0EC1F00, 0xC0EABE00,
-	0xC0E95D00, 0xC0E7FC00, 0xC0E69B00,
-	0xC0E53A00, 0xC0E3D900, 0xC0E27800,
-	0xC0E11700, 0xC0DFB600, 0xC0DE5500,
-	0xC0DCF400, 0xC0DB9300, 0xC0DA3200,
-	0xC0D8D100, 0xC0D77000, 0xC0D60F00,
-	0xC0D4AE00, 0xC0D34D00, 0xC0D1EC00,
-	0xC0D08B00, 0xC0CF2A00, 0xC0CDC900,
-	0xC0CC6800, 0xC0CB0700, 0xC0C9A600,
-	0xC0C84500, 0xC0C6E400, 0xC0C58300,
-	0xC0C42200, 0xC0C2C100, 0xC0C16000,
-	0xC0BFFF00, 0xC0BE9E00, 0xC0BD3D00,
-	0xC0BBDC00, 0xC0BA7B00, 0xC0B91A00,
-	0xC0B7B900, 0xC0B65800, 0xC0B4F700,
-	0xC0B39600, 0xC0B23500, 0xC0B0D400,
-	0xC0AF7300, 0xC0AE1200, 0xC0ACB100,
-	0xC0AB5000, 0xC0A9EF00, 0xC0A88E00,
-	0xC0A72D00, 0xC0A5CC00, 0xC0A46B00,
-	0xC0A30A00, 0xC0A1A900, 0xC0A04800,
-	0xC09EE700, 0xC09D8600, 0xC09C2500,
-	0xC09AC400, 0xC0996300, 0xC0980200,
-	0xC096A100, 0xC0954000, 0xC093DF00,
-	0xC0927E00, 0xC0911D00, 0xC08FBC00,
-	0xC08E5B00, 0xC08CFA00, 0xC08B9900,
-	0xC08A3800, 0xC088D700, 0xC0877600,
-	0xC0861500, 0xC084B400, 0xC0835300,
-	0xC081F200, 0xC0809100, 0xC07F3000,
-	0xC07DCF00, 0xC07C6E00, 0xC07B0D00,
-	0xC079AC00, 0xC0784B00, 0xC076EA00,
-	0xC0758900, 0xC0742800, 0xC072C700,
-	0xC0716600, 0xC0700500, 0xC06EA400,
-	0xC06D4300, 0xC06BE200, 0xC06A8100,
-	0xC0692000, 0xC067BF00, 0xC0665E00,
-	0xC064FD00, 0xC0639C00, 0xC0623B00,
-	0xC060DA00, 0xC05F7900, 0xC05E1800,
-	0xC05CB700, 0xC05B5600, 0xC059F500,
-	0xC0589400, 0xC0573300, 0xC055D200,
-	0xC0547100, 0xC0531000, 0xC051AF00,
-	0xC0504E00, 0xC04EED00, 0xC04D8C00,
-	0xC04C2B00, 0xC04ACA00, 0xC0496900,
-	0xC0480800, 0xC046A700, 0xC0454600,
-	0xC043E500, 0xC0428400, 0xC0412300,
-	0xC03FC200, 0xC03E6100, 0xC03D0000,
-	0xC03B9F00, 0xC03A3E00, 0xC038DD00,
-	0xC0377C00, 0xC0361B00, 0xC034BA00,
-	0xC0335900, 0xC031F800, 0xC0309700,
-	0xC02F3600, 0xC02DD500, 0xC02C7400,
-	0xC02B1300, 0xC029B200, 0xC0285100,
-	0xC026F000, 0xC0258F00, 0xC0242E00,
-	0xC022CD00, 0xC0216C00, 0xC0200B00,
-	0xC01EAA00, 0xC01D4900, 0xC01BE800,
-	0xC01A8700, 0xC0192600, 0xC017C500,
-	0xC0166400, 0xC0150300, 0xC013A200,
-	0xC0124100, 0xC010E000, 0xC00F7F00,
-	0xC00E1E00, 0xC00CBD00, 0xC00B5C00,
-	0xC009FB00, 0xC0089A00, 0xC0073900,
-	0xC005D800, 0xC0047700, 0xC0031600,
-	0xC001B500, 0xC0005400, 0xBFFEF300,
-	0xBFFD9200, 0xBFFC3100, 0xBFFAD000,
-	0xBFF96F00, 0xBFF80E00, 0xBFF6AD00,
-	0xBFF54C00, 0xBFF3EB00, 0xBFF28A00,
-	0xBFF12900, 0xBFEFC800, 0xBFEE6700,
-	0xBFED0600, 0xBFEBA500, 0xBFEA4400,
-	0xBFE8E300, 0xBFE78200, 0xBFE62100,
-	0xBFE4C000, 0xBFE35F00, 0xBFE1FE00,
-	0xBFE09D00, 0xBFDF3C00, 0xBFDDDB00,
-	0xBFDC7A00, 0xBFDB1900, 0xBFD9B800,
-	0xBFD85700, 0xBFD6F600, 0xBFD59500,
-	0xBFD43400, 0xBFD2D300, 0xBFD17200,
-	0xBFD01100, 0xBFCEB000, 0xBFCD4F00,
-	0xBFCBEE00, 0xBFCA8D00, 0xBFC92C00,
-	0xBFC7CB00, 0xBFC66A00, 0xBFC50900,
-	0xBFC3A800, 0xBFC24700, 0xBFC0E600,
-	0xBFBF8500, 0xBFBE2400, 0xBFBCC300,
-	0xBFBB6200, 0xBFBA0100, 0xBFB8A000,
-	0xBFB73F00, 0xBFB5DE00, 0xBFB47D00,
-	0xBFB31C00, 0xBFB1BB00, 0xBFB05A00,
-	0xBFAEF900, 0xBFAD9800, 0xBFAC3700,
-	0xBFAAD600, 0xBFA97500, 0xBFA81400,
-	0xBFA6B300, 0xBFA55200, 0xBFA3F100,
-	0xBFA29000, 0xBFA12F00, 0xBF9FCE00,
-	0xBF9E6D00, 0xBF9D0C00, 0xBF9BAB00,
-	0xBF9A4A00, 0xBF98E900, 0xBF978800,
-	0xBF962700, 0xBF94C600, 0xBF936500,
-	0xBF920400, 0xBF90A300, 0xBF8F4200,
-	0xBF8DE100, 0xBF8C8000, 0xBF8B1F00,
-	0xBF89BE00, 0xBF885D00, 0xBF86FC00,
-	0xBF859B00, 0xBF843A00, 0xBF82D900,
-	0xBF817800, 0xBF801700, 0xBF7EB600,
-	0xBF7D5500, 0xBF7BF400, 0xBF7A9300,
-	0xBF793200, 0xBF77D100, 0xBF767000,
-	0xBF750F00, 0xBF73AE00, 0xBF724D00,
-	0xBF70EC00, 0xBF6F8B00, 0xBF6E2A00,
-	0xBF6CC900, 0xBF6B6800, 0xBF6A0700,
-	0xBF68A600, 0xBF674500, 0xBF65E400,
-	0xBF648300, 0xBF632200, 0xBF61C100,
-	0xBF606000, 0xBF5EFF00, 0xBF5D9E00,
-	0xBF5C3D00, 0xBF5ADC00, 0xBF597B00,
-	0xBF581A00, 0xBF56B900, 0xBF555800,
-	0xBF53F700, 0xBF529600, 0xBF513500,
-	0xBF4FD400, 0xBF4E7300, 0xBF4D1200,
-	0xBF4BB100, 0xBF4A5000, 0xBF48EF00,
-	0xBF478E00, 0xBF462D00, 0xBF44CC00,
-	0xBF436B00, 0xBF420A00, 0xBF40A900,
-	0xBF3F4800, 0xBF3DE700, 0xBF3C8600,
-	0xBF3B2500, 0xBF39C400, 0xBF386300,
-	0xBF370200, 0xBF35A100, 0xBF344000,
-	0xBF32DF00, 0xBF317E00, 0xBF301D00,
-	0xBF2EBC00, 0xBF2D5B00, 0xBF2BFA00,
-	0xBF2A9900, 0xBF293800, 0xBF27D700,
-	0xBF267600, 0xBF251500, 0xBF23B400,
-	0xBF225300, 0xBF20F200, 0xBF1F9100,
-	0xBF1E3000, 0xBF1CCF00, 0xBF1B6E00,
-	0xBF1A0D00, 0xBF18AC00, 0xBF174B00,
-	0xBF15EA00, 0xBF148900, 0xBF132800,
-	0xBF11C700, 0xBF106600, 0xBF0F0500,
-	0xBF0DA400, 0xBF0C4300, 0xBF0AE200,
-	0xBF098100, 0xBF082000, 0xBF06BF00,
-	0xBF055E00, 0xBF03FD00, 0xBF029C00,
-	0xBF013B00, 0xBEFFDA00, 0xBEFE7900,
-	0xBEFD1800, 0xBEFBB700, 0xBEFA5600,
-	0xBEF8F500, 0xBEF79400, 0xBEF63300,
-	0xBEF4D200, 0xBEF37100, 0xBEF21000,
-	0xBEF0AF00, 0xBEEF4E00, 0xBEEDED00,
-	0xBEEC8C00, 0xBEEB2B00, 0xBEE9CA00,
-	0xBEE86900, 0xBEE70800, 0xBEE5A700,
-	0xBEE44600, 0xBEE2E500, 0xBEE18400,
-	0xBEE02300, 0xBEDEC200, 0xBEDD6100,
-	0xBEDC0000, 0xBEDAB700, 0xBED96E00,
-	0xBED82500, 0xBED6DC00, 0xBED59300,
-	0xBED44A00, 0xBED30100, 0xBED1B800,
-	0xBED06F00, 0xBECF2600, 0xBECDDD00,
-	0xBECC9400, 0xBECB4B00, 0xBECA0200,
-	0xBEC8B900, 0xBEC77000, 0xBEC62700,
-	0xBEC4DE00, 0xBEC39500, 0xBEC24C00,
-	0xBEC10300, 0xBEBFBA00, 0xBEBE7100,
-	0xBEBD2800, 0xBEBBDF00, 0xBEBA9600,
-	0xBEB94D00, 0xBEB80400, 0xBEB6BB00,
-	0xBEB57200, 0xBEB42900, 0xBEB2E000,
-	0xBEB19700, 0xBEB04E00, 0xBEAF0500,
-	0xBEADBC00, 0xBEAC7300, 0xBEAB2A00,
-	0xBEA9E100, 0xBEA89800, 0xBEA74F00,
-	0xBEA60600, 0xBEA4BD00, 0xBEA37400,
-	0xBEA22B00, 0xBEA0E200, 0xBE9F9900,
-	0xBE9E5000, 0xBE9D0700, 0xBE9BBE00,
-	0xBE9A7500, 0xBE992C00, 0xBE97E300,
-	0xBE969A00, 0xBE955100, 0xBE940800,
-	0xBE92BF00, 0xBE917600, 0xBE902D00,
-	0xBE8EE400, 0xBE8D9B00, 0xBE8C5200,
-	0xBE8B0900, 0xBE89C000, 0xBE887700,
-	0xBE872E00, 0xBE85E500, 0xBE849C00,
-	0xBE835300, 0xBE820A00, 0xBE80C100,
-	0xBE7F7800, 0xBE7E2F00, 0xBE7CE600,
-	0xBE7B9D00, 0xBE7A5400, 0xBE790B00,
-	0xBE77C200, 0xBE767900, 0xBE753000,
-	0xBE73E700, 0xBE729E00, 0xBE715500,
-	0xBE700C00, 0xBE6EC300, 0xBE6D7A00,
-	0xBE6C3100, 0xBE6AE800, 0xBE699F00,
-	0xBE685600, 0xBE670D00, 0xBE65C400,
-	0xBE647B00, 0xBE633200, 0xBE61E900,
-	0xBE60A000, 0xBE5F5700, 0xBE5E0E00,
-	0xBE5CC500, 0xBE5B7C00, 0xBE5A3300,
-	0xBE58EA00, 0xBE57A100, 0xBE565800,
-	0xBE550F00, 0xBE53C600, 0xBE527D00,
-	0xBE513400, 0xBE4FEB00, 0xBE4EA200,
-	0xBE4D5900, 0xBE4C1000, 0xBE4AC700,
-	0xBE497E00, 0xBE483500, 0xBE46EC00,
-	0xBE45A300, 0xBE445A00, 0xBE431100,
-	0xBE41C800, 0xBE407F00, 0xBE3F3600,
-	0xBE3DED00, 0xBE3CA400, 0xBE3B5B00,
-	0xBE3A1200, 0xBE38C900, 0xBE378000,
-	0xBE363700, 0xBE34EE00, 0xBE33A500,
-	0xBE325C00, 0xBE311300, 0xBE2FCA00,
-	0xBE2E8100, 0xBE2D3800, 0xBE2BEF00,
-	0xBE2AA600, 0xBE295D00, 0xBE281400,
-	0xBE26CB00, 0xBE258200, 0xBE243900,
-	0xBE22F000, 0xBE21A700, 0xBE205E00,
-	0xBE1F1500, 0xBE1DCC00, 0xBE1C8300,
-	0xBE1B3A00, 0xBE19F100, 0xBE18A800,
-	0xBE175F00, 0xBE161600, 0xBE14CD00,
-	0xBE138400, 0xBE123B00, 0xBE10F200,
-	0xBE0FA900, 0xBE0E6000, 0xBE0D1700,
-	0xBE0BCE00, 0xBE0A8500, 0xBE093C00,
-	0xBE07F300, 0xBE06AA00, 0xBE056100,
-	0xBE041800, 0xBE02CF00, 0xBE018600,
-	0xBE003D00, 0xBDFEF400, 0xBDFDAB00,
-	0xBDFC6200, 0xBDFB1900, 0xBDF9D000,
-	0xBDF88700, 0xBDF73E00, 0xBDF5F500,
-	0xBDF4AC00, 0xBDF36300, 0xBDF21A00,
-	0xBDF0D100, 0xBDEF8800, 0xBDEE3F00,
-	0xBDECF600, 0xBDEBAD00, 0xBDEA6400,
-	0xBDE91B00, 0xBDE7D200, 0xBDE68900,
-	0xBDE54000, 0xBDE3F700, 0xBDE2AE00,
-	0xBDE16500, 0xBDE01C00, 0xBDDED300,
-	0xBDDD8A00, 0xBDDC4100, 0xBDDAF800,
-	0xBDD9AF00, 0xBDD86600, 0xBDD71D00,
-	0xBDD5D400, 0xBDD48B00, 0xBDD34200,
-	0xBDD1F900, 0xBDD0B000, 0xBDCF6700,
-	0xBDCE1E00, 0xBDCCD500, 0xBDCB8C00,
-	0xBDCA4300, 0xBDC8FA00, 0xBDC7B100,
-	0xBDC66800, 0xBDC51F00, 0xBDC3D600,
-	0xBDC28D00, 0xBDC14400, 0xBDBFFB00,
-	0xBDBEB200, 0xBDBD6900, 0xBDBC2000,
-	0xBDBAD700, 0xBDB98E00, 0xBDB84500,
-	0xBDB6FC00, 0xBDB5B300, 0xBDB46A00,
-	0xBDB32100, 0xBDB1D800, 0xBDB08F00,
-	0xBDAF4600, 0xBDADFD00, 0xBDACB400,
-	0xBDAB6B00, 0xBDAA2200, 0xBDA8D900,
-	0xBDA79000, 0xBDA64700, 0xBDA4FE00,
-	0xBDA3B500, 0xBDA26C00, 0xBDA12300,
-	0xBD9FDA00, 0xBD9E9100, 0xBD9D4800,
-	0xBD9BFF00, 0xBD9AB600, 0xBD996D00,
-	0xBD982400, 0xBD96DB00, 0xBD959200,
-	0xBD944900, 0xBD930000, 0xBD91B700,
-	0xBD906E00, 0xBD8F2500, 0xBD8DDC00,
-	0xBD8C9300, 0xBD8B4A00, 0xBD8A0100,
-	0xBD88B800, 0xBD876F00, 0xBD862600,
-	0xBD84DD00, 0xBD839400, 0xBD824B00,
-	0xBD810200, 0xBD7FB900, 0xBD7E7000,
-	0xBD7D2700, 0xBD7BDE00, 0xBD7A9500,
-	0xBD794C00, 0xBD780300, 0xBD76BA00,
-	0xBD757100, 0xBD742800, 0xBD72DF00,
-	0xBD719600, 0xBD704D00, 0xBD6F0400,
-	0xBD6DBB00, 0xBD6C7200, 0xBD6B2900,
-	0xBD69E000, 0xBD689700, 0xBD674E00,
-	0xBD660500, 0xBD64BC00, 0xBD637300,
-	0xBD622A00, 0xBD60E100, 0xBD5F9800,
-	0xBD5E4F00, 0xBD5D0600, 0xBD5BBD00,
-	0xBD5A7400, 0xBD592B00, 0xBD57E200,
-	0xBD569900, 0xBD555000, 0xBD540700,
-	0xBD52BE00, 0xBD517500, 0xBD502C00,
-	0xBD4EE300, 0xBD4D9A00, 0xBD4C5100,
-	0xBD4B0800, 0xBD49BF00, 0xBD487600,
-	0xBD472D00, 0xBD45E400, 0xBD449B00,
-	0xBD435200, 0xBD420900, 0xBD40C000,
-	0xBD3F7700, 0xBD3E2E00, 0xBD3CE500,
-	0xBD3B9C00, 0xBD3A5300, 0xBD390A00,
-	0xBD37C100, 0xBD367800, 0xBD352F00,
-	0xBD33E600, 0xBD329D00, 0xBD315400,
-	0xBD300B00, 0xBD2EC200, 0xBD2D7900,
-	0xBD2C3000, 0xBD2AE700, 0xBD299E00,
-	0xBD285500, 0xBD270C00, 0xBD25C300,
-	0xBD247A00, 0xBD233100, 0xBD21E800,
-	0xBD209F00, 0xBD1F5600, 0xBD1E0D00,
-	0xBD1CC400, 0xBD1B7B00, 0xBD1A3200,
-	0xBD18E900, 0xBD17A000, 0xBD165700,
-	0xBD150E00, 0xBD13C500, 0xBD127C00,
-	0xBD113300, 0xBD0FEA00, 0xBD0EA100,
-	0xBD0D5800, 0xBD0C0F00, 0xBD0AC600,
-	0xBD097D00, 0xBD083400, 0xBD06EB00,
-	0xBD05A200, 0xBD045900, 0xBD031000,
-	0xBD01C700, 0xBD007E00, 0xBCFF3500,
-	0xBCFDEC00, 0xBCFCA300, 0xBCFB5A00,
-	0xBCFA1100, 0xBCF8C800, 0xBCF77F00,
-	0xBCF63600, 0xBCF4ED00, 0xBCF3A400,
-	0xBCF25B00, 0xBCF11200, 0xBCEFC900,
-	0xBCEE8000, 0xBCED3700, 0xBCEBEE00,
-	0xBCEAA500, 0xBCE95C00, 0xBCE81300,
-	0xBCE6CA00, 0xBCE58100, 0xBCE43800,
-	0xBCE2EF00, 0xBCE1A600, 0xBCE05D00,
-	0xBCDF1400, 0xBCDDCB00, 0xBCDC8200,
-	0xBCDB3900, 0xBCD9F000, 0xBCD8A700,
-	0xBCD75E00, 0xBCD61500, 0xBCD4CC00,
-	0xBCD38300, 0xBCD23A00, 0xBCD0F100,
-	0xBCCFA800, 0xBCCE5F00, 0xBCCD1600,
-	0xBCCBCD00, 0xBCCA8400, 0xBCC93B00,
-	0xBCC7F200, 0xBCC6A900, 0xBCC56000,
-	0xBCC41700, 0xBCC2CE00, 0xBCC18500,
-	0xBCC03C00, 0xBCBEF300, 0xBCBDAA00,
-	0xBCBC6100, 0xBCBB1800, 0xBCB9CF00,
-	0xBCB88600, 0xBCB73D00, 0xBCB5F400,
-	0xBCB4AB00, 0xBCB36200, 0xBCB21900,
-	0xBCB0D000, 0xBCAF8700, 0xBCAE3E00,
-	0xBCACF500, 0xBCABAC00, 0xBCAA6300,
-	0xBCA91A00, 0xBCA7D100, 0xBCA68800,
-	0xBCA53F00, 0xBCA3F600, 0xBCA2AD00,
-	0xBCA16400, 0xBCA01B00, 0xBC9ED200,
-	0xBC9D8900, 0xBC9C4000, 0xBC9AF700,
-	0xBC99AE00, 0xBC986500, 0xBC971C00,
-	0xBC95D300, 0xBC948A00, 0xBC934100,
-	0xBC91F800, 0xBC90AF00, 0xBC8F6600,
-	0xBC8E1D00, 0xBC8CD400, 0xBC8B8B00,
-	0xBC8A4200, 0xBC88F900, 0xBC87B000,
-	0xBC866700, 0xBC851E00, 0xBC83D500,
-	0xBC828C00, 0xBC814300, 0xBC7FFA00,
-	0xBC7EB100, 0xBC7D6800, 0xBC7C1F00,
-	0xBC7AD600, 0xBC798D00, 0xBC784400,
-	0xBC76FB00, 0xBC75B200, 0xBC746900,
-	0xBC732000, 0xBC71D700, 0xBC708E00,
-	0xBC6F4500, 0xBC6DFC00, 0xBC6CB300,
-	0xBC6B6A00, 0xBC6A2100, 0xBC68D800,
-	0xBC678F00, 0xBC664600, 0xBC64FD00,
-	0xBC63B400, 0xBC626B00, 0xBC612200,
-	0xBC5FD900, 0xBC5E9000, 0xBC5D4700,
-	0xBC5BFE00, 0xBC5AB500, 0xBC596C00,
-	0xBC582300, 0xBC56DA00, 0xBC559100,
-	0xBC544800, 0xBC52FF00, 0xBC51B600,
-	0xBC506D00, 0xBC4F2400, 0xBC4DDB00,
-	0xBC4C9200, 0xBC4B4900, 0xBC4A0000,
-	0xBC48B700, 0xBC476E00, 0xBC462500,
-	0xBC44DC00, 0xBC439300, 0xBC424A00,
-	0xBC410100, 0xBC3FB800, 0xBC3E6F00,
-	0xBC3D2600, 0xBC3BDD00, 0xBC3A9400,
-	0xBC394B00, 0xBC380200, 0xBC36B900,
-	0xBC357000, 0xBC342700, 0xBC32DE00,
-	0xBC319500, 0xBC304C00, 0xBC2F0300,
-	0xBC2DBA00, 0xBC2C7100, 0xBC2B2800,
-	0xBC29DF00, 0xBC289600, 0xBC274D00,
-	0xBC260400, 0xBC24BB00, 0xBC237200,
-	0xBC222900, 0xBC20E000, 0xBC1F9700,
-	0xBC1E4E00, 0xBC1D0500, 0xBC1BBC00,
-	0xBC1A7300, 0xBC192A00, 0xBC17E100,
-	0xBC169800, 0xBC154F00, 0xBC140600,
-	0xBC12BD00, 0xBC117400, 0xBC102B00,
-	0xBC0EE200, 0xBC0D9900, 0xBC0C5000,
-	0xBC0B0700, 0xBC09BE00, 0xBC087500,
-	0xBC072C00, 0xBC05E300, 0xBC049A00,
-	0xBC035100, 0xBC020800, 0xBC00BF00,
-	0xBBFF7600, 0xBBFE2D00, 0xBBFCE400,
-	0xBBFB9B00, 0xBBFA5200, 0xBBF90900,
-	0xBBF7C000, 0xBBF67700, 0xBBF52E00,
-	0xBBF3E500, 0xBBF29C00, 0xBBF15300,
-	0xBBF00A00, 0xBBEEC100, 0xBBED7800,
-	0xBBEC2F00, 0xBBEAE600, 0xBBE99D00,
-	0xBBE85400, 0xBBE70B00, 0xBBE5C200,
-	0xBBE47900, 0xBBE33000, 0xBBE1E700,
-	0xBBE09E00, 0xBBDF5500, 0xBBDE0C00,
-	0xBBDCC300, 0xBBDB7A00, 0xBBDA3100,
-	0xBBD8E800, 0xBBD79F00, 0xBBD65600,
-	0xBBD50D00, 0xBBD3C400, 0xBBD27B00,
-	0xBBD13200, 0xBBCFE900, 0xBBCEA000,
-	0xBBCD5700, 0xBBCC0E00, 0xBBCAC500,
-	0xBBC97C00, 0xBBC83300, 0xBBC6EA00,
-	0xBBC5A100, 0xBBC45800, 0xBBC30F00,
-	0xBBC1C600, 0xBBC07D00, 0xBBBF3400,
-	0xBBBDEB00, 0xBBBCA200, 0xBBBB5900,
-	0xBBBA1000, 0xBBB8C700, 0xBBB77E00,
-	0xBBB63500, 0xBBB4EC00, 0xBBB3A300,
-	0xBBB25A00, 0xBBB11100, 0xBBAFC800,
-	0xBBAE7F00, 0xBBAD3600, 0xBBABED00,
-	0xBBAAA400, 0xBBA95B00, 0xBBA81200,
-	0xBBA6C900, 0xBBA58000, 0xBBA43700,
-	0xBBA2EE00, 0xBBA1A500, 0xBBA05C00,
-	0xBB9F1300, 0xBB9DCA00, 0xBB9C8100,
-	0xBB9B3800, 0xBB99EF00, 0xBB98A600,
-	0xBB975D00, 0xBB961400, 0xBB94CB00,
-	0xBB938200, 0xBB923900, 0xBB90F000,
-	0xBB8FA700, 0xBB8E5E00, 0xBB8D1500,
-	0xBB8BCC00, 0xBB8A8300, 0xBB893A00,
-	0xBB87F100, 0xBB86A800, 0xBB855F00,
-	0xBB841600, 0xBB82CD00, 0xBB818400,
-	0xBB803B00, 0xBB7EF200, 0xBB7DA900,
-	0xBB7C6000, 0xBB7B1700, 0xBB79CE00,
-	0xBB788500, 0xBB773C00, 0xBB75F300,
-	0xBB74AA00, 0xBB736100, 0xBB721800,
-	0xBB70CF00, 0xBB6F8600, 0xBB6E3D00,
-	0xBB6CF400, 0xBB6BAB00, 0xBB6A6200,
-	0xBB691900, 0xBB67D000, 0xBB668700,
-	0xBB653E00, 0xBB63F500, 0xBB62AC00,
-	0xBB616300, 0xBB601A00, 0xBB5ED100,
-	0xBB5D8800, 0xBB5C3F00, 0xBB5AF600,
-	0xBB59AD00, 0xBB586400, 0xBB571B00,
-	0xBB55D200, 0xBB548900, 0xBB534000,
-	0xBB51F700, 0xBB50AE00, 0xBB4F6500,
-	0xBB4E1C00, 0xBB4CD300, 0xBB4B8A00,
-	0xBB4A4100, 0xBB48F800, 0xBB47AF00,
-	0xBB466600, 0xBB451D00, 0xBB43D400,
-	0xBB428B00, 0xBB414200, 0xBB3FF900,
-	0xBB3EB000, 0xBB3D6700, 0xBB3C1E00,
-	0xBB3AD500, 0xBB398C00, 0xBB384300,
-	0xBB36FA00, 0xBB35B100, 0xBB346800,
-	0xBB331F00, 0xBB31D600, 0xBB308D00,
-	0xBB2F4400, 0xBB2DFB00, 0xBB2CB200,
-	0xBB2B6900, 0xBB2A2000, 0xBB28D700,
-	0xBB278E00, 0xBB264500, 0xBB24FC00,
-	0xBB23B300, 0xBB226A00, 0xBB212100,
-	0xBB1FD800, 0xBB1E8F00, 0xBB1D4600,
-	0xBB1BFD00, 0xBB1AB400, 0xBB196B00,
-	0xBB182200, 0xBB16D900, 0xBB159000,
-	0xBB144700, 0xBB12FE00, 0xBB11B500,
-	0xBB106C00, 0xBB0F2300, 0xBB0DDA00,
-	0xBB0C9100, 0xBB0B4800, 0xBB09FF00,
-	0xBB08B600, 0xBB076D00, 0xBB062400,
-	0xBB04DB00, 0xBB039200, 0xBB024900,
-	0xBB010000, 0xBAFFB700, 0xBAFE6E00,
-	0xBAFD2500, 0xBAFBDC00, 0xBAFA9300,
-	0xBAF94A00, 0xBAF80100, 0xBAF6B800,
-	0xBAF56F00, 0xBAF42600, 0xBAF2DD00,
-	0xBAF19400, 0xBAF04B00, 0xBAEF0200,
-	0xBAEDB900, 0xBAEC7000, 0xBAEB2700,
-	0xBAE9DE00, 0xBAE89500, 0xBAE74C00,
-	0xBAE60300, 0xBAE4BA00, 0xBAE37100,
-	0xBAE22800, 0xBAE0DF00, 0xBADF9600,
-	0xBADE4D00, 0xBADD0400, 0xBADBBB00,
-	0xBADA7200, 0xBAD92900, 0xBAD7E000,
-	0xBAD69700, 0xBAD54E00, 0xBAD40500,
-	0xBAD2BC00, 0xBAD17300, 0xBAD02A00,
-	0xBACEE100, 0xBACD9800, 0xBACC4F00,
-	0xBACB0600, 0xBAC9BD00, 0xBAC87400,
-	0xBAC72B00, 0xBAC5E200, 0xBAC49900,
-	0xBAC35000, 0xBAC20700, 0xBAC0BE00,
-	0xBABF7500, 0xBABE2C00, 0xBABCE300,
-	0xBABB9A00, 0xBABA5100, 0xBAB90800,
-	0xBAB7BF00, 0xBAB67600, 0xBAB52D00,
-	0xBAB3E400, 0xBAB29B00, 0xBAB15200,
-	0xBAB00900, 0xBAAEC000, 0xBAAD7700,
-	0xBAAC2E00, 0xBAAAE500, 0xBAA99C00,
-	0xBAA85300, 0xBAA70A00, 0xBAA5C100,
-	0xBAA47800, 0xBAA32F00, 0xBAA1E600,
-	0xBAA09D00, 0xBA9F5400, 0xBA9E0B00,
-	0xBA9CC200, 0xBA9B7900, 0xBA9A3000,
-	0xBA98E700, 0xBA979E00, 0xBA965500,
-	0xBA950C00, 0xBA93C300, 0xBA927A00,
-	0xBA913100, 0xBA8FE800, 0xBA8E9F00,
-	0xBA8D5600, 0xBA8C0D00, 0xBA8AC400,
-	0xBA897B00, 0xBA883200, 0xBA86E900,
-	0xBA85A000, 0xBA845700, 0xBA830E00,
-	0xBA81C500, 0xBA807C00, 0xBA7F3300,
-	0xBA7DEA00, 0xBA7CA100, 0xBA7B5800,
-	0xBA7A0F00, 0xBA78C600, 0xBA777D00,
-	0xBA763400, 0xBA74EB00, 0xBA73A200,
-	0xBA725900, 0xBA711000, 0xBA6FC700,
-	0xBA6E7E00, 0xBA6D3500, 0xBA6BEC00,
-	0xBA6AA300, 0xBA695A00, 0xBA681100,
-	0xBA66C800, 0xBA657F00, 0xBA643600,
-	0xBA62ED00, 0xBA61A400, 0xBA605B00,
-	0xBA5F1200, 0xBA5DC900, 0xBA5C8000,
-	0xBA5B3700, 0xBA59EE00, 0xBA58A500,
-	0xBA575C00, 0xBA561300, 0xBA54CA00,
-	0xBA538100, 0xBA523800, 0xBA50EF00,
-	0xBA4FA600, 0xBA4E5D00, 0xBA4D1400,
-	0xBA4BCB00, 0xBA4A8200, 0xBA493900,
-	0xBA47F000, 0xBA46A700, 0xBA455E00,
-	0xBA441500, 0xBA42CC00, 0xBA418300,
-	0xBA403A00, 0xBA3EF100, 0xBA3DA800,
-	0xBA3C5F00, 0xBA3B1600, 0xBA39CD00,
-	0xBA388400, 0xBA373B00, 0xBA35F200,
-	0xBA34A900, 0xBA336000, 0xBA321700,
-	0xBA30CE00, 0xBA2F8500, 0xBA2E3C00,
-	0xBA2CF300, 0xBA2BAA00, 0xBA2A6100,
-	0xBA291800, 0xBA27CF00, 0xBA268600,
-	0xBA253D00, 0xBA23F400, 0xBA22AB00,
-	0xBA216200, 0xBA201900, 0xBA1ED000,
-	0xBA1D8700, 0xBA1C3E00, 0xBA1AF500,
-	0xBA19AC00, 0xBA186300, 0xBA171A00,
-	0xBA15D100, 0xBA148800, 0xBA133F00,
-	0xBA11F600, 0xBA10AD00, 0xBA0F6400,
-	0xBA0E1B00, 0xBA0CD200, 0xBA0B8900,
-	0xBA0A4000, 0xBA08F700, 0xBA07AE00,
-	0xBA066500, 0xBA051C00, 0xBA03D300,
-	0xBA028A00, 0xBA014100, 0xB9FFF800,
-	0xB9FEAF00, 0xB9FD6600, 0xB9FC1D00,
-	0xB9FAD400, 0xB9F98B00, 0xB9F84200,
-	0xB9F6F900, 0xB9F5B000, 0xB9F46700,
-	0xB9F31E00, 0xB9F1D500, 0xB9F08C00,
-	0xB9EF4300, 0xB9EDFA00, 0xB9ECB100,
-	0xB9EB6800, 0xB9EA1F00, 0xB9E8D600,
-	0xB9E78D00, 0xB9E64400, 0xB9E4FB00,
-	0xB9E3B200, 0xB9E26900, 0xB9E12000,
-	0xB9DFD700, 0xB9DE8E00, 0xB9DD4500,
-	0xB9DBFC00, 0xB9DAB300, 0xB9D96A00,
-	0xB9D82100, 0xB9D6D800, 0xB9D58F00,
-	0xB9D44600, 0xB9D2FD00, 0xB9D1B400,
-	0xB9D06B00, 0xB9CF2200, 0xB9CDD900,
-	0xB9CC9000, 0xB9CB4700, 0xB9C9FE00,
-	0xB9C8B500, 0xB9C76C00, 0xB9C62300,
-	0xB9C4DA00, 0xB9C39100, 0xB9C24800,
-	0xB9C0FF00, 0xB9BFB600, 0xB9BE6D00,
-	0xB9BD2400, 0xB9BBDB00, 0xB9BA9200,
-	0xB9B94900, 0xB9B80000, 0xB9B6B700,
-	0xB9B56E00, 0xB9B42500, 0xB9B2DC00,
-	0xB9B19300, 0xB9B04A00, 0xB9AF0100,
-	0xB9ADB800, 0xB9AC6F00, 0xB9AB2600,
-	0xB9A9DD00, 0xB9A89400, 0xB9A74B00,
-	0xB9A60200, 0xB9A4B900, 0xB9A37000,
-	0xB9A22700, 0xB9A0DE00, 0xB99F9500,
-	0xB99E4C00, 0xB99D0300, 0xB99BBA00,
-	0xB99A7100, 0xB9992800, 0xB997DF00,
-	0xB9969600, 0xB9954D00, 0xB9940400,
-	0xB992BB00, 0xB9917200, 0xB9902900,
-	0xB98EE000, 0xB98D9700, 0xB98C4E00,
-	0xB98B0500, 0xB989BC00, 0xB9887300,
-	0xB9872A00, 0xB985E100, 0xB9849800,
-	0xB9834F00, 0xB9820600, 0xB980BD00,
-	0xB97F7400, 0xB97E2B00, 0xB97CE200,
-	0xB97B9900, 0xB97A5000, 0xB9790700,
-	0xB977BE00, 0xB9767500, 0xB9752C00,
-	0xB973E300, 0xB9729A00, 0xB9715100,
-	0xB9700800, 0xB96EBF00, 0xB96D7600,
-	0xB96C2D00, 0xB96AE400, 0xB9699B00,
-	0xB9685200, 0xB9670900, 0xB965C000,
-	0xB9647700, 0xB9632E00, 0xB961E500,
-	0xB9609C00, 0xB95F5300, 0xB95E0A00,
-	0xB95CC100, 0xB95B7800, 0xB95A2F00,
-	0xB958E600, 0xB9579D00, 0xB9565400,
-	0xB9550B00, 0xB953C200, 0xB9527900,
-	0xB9513000, 0xB94FE700, 0xB94E9E00,
-	0xB94D5500, 0xB94C0C00, 0xB94AC300,
-	0xB9497A00, 0xB9483100, 0xB946E800,
-	0xB9459F00, 0xB9445600, 0xB9430D00,
-	0xB941C400, 0xB9407B00, 0xB93F3200,
-	0xB93DE900, 0xB93CA000, 0xB93B5700,
-	0xB93A0E00, 0xB938C500, 0xB9377C00,
-	0xB9363300, 0xB934EA00, 0xB933A100,
-	0xB9325800, 0xB9310F00, 0xB92FC600,
-	0xB92E7D00, 0xB92D3400, 0xB92BEB00,
-	0xB92AA200, 0xB9295900, 0xB9281000,
-	0xB926C700, 0xB9257E00, 0xB9243500,
-	0xB922EC00, 0xB921A300, 0xB9205A00,
-	0xB91F1100, 0xB91DC800, 0xB91C7F00,
-	0xB91B3600, 0xB919ED00, 0xB918A400,
-	0xB9175B00, 0xB9161200, 0xB914C900,
-	0xB9138000, 0xB9123700, 0xB910EE00,
-	0xB90FA500, 0xB90E5C00, 0xB90D1300,
-	0xB90BCA00, 0xB90A8100, 0xB9093800,
-	0xB907EF00, 0xB906A600, 0xB9055D00,
-	0xB9041400, 0xB902CB00, 0xB9018200,
-	0xB9003900, 0xB8FEF000, 0xB8FDA700,
-	0xB8FC5E00, 0xB8FB1500, 0xB8F9CC00,
-	0xB8F88300, 0xB8F73A00, 0xB8F5F100,
-	0xB8F4A800, 0xB8F35F00, 0xB8F21600,
-	0xB8F0CD00, 0xB8EF8400, 0xB8EE3B00,
-	0xB8ECF200, 0xB8EBA900, 0xB8EA6000,
-	0xB8E91700, 0xB8E7CE00, 0xB8E68500,
-	0xB8E53C00, 0xB8E3F300, 0xB8E2AA00,
-	0xB8E16100, 0xB8E01800, 0xB8DECF00,
-	0xB8DD8600, 0xB8DC3D00, 0xB8DAF400,
-	0xB8D9AB00, 0xB8D86200, 0xB8D71900,
-	0xB8D5D000, 0xB8D48700, 0xB8D33E00,
-	0xB8D1F500, 0xB8D0AC00, 0xB8CF6300,
-	0xB8CE1A00, 0xB8CCD100, 0xB8CB8800,
-	0xB8CA3F00, 0xB8C8F600, 0xB8C7AD00,
-	0xB8C66400, 0xB8C51B00, 0xB8C3D200,
-	0xB8C28900, 0xB8C14000, 0xB8BFF700,
-	0xB8BEAE00, 0xB8BD6500, 0xB8BC1C00,
-	0xB8BAD300, 0xB8B98A00, 0xB8B84100,
-	0xB8B6F800, 0xB8B5AF00, 0xB8B46600,
-	0xB8B31D00, 0xB8B1D400, 0xB8B08B00,
-	0xB8AF4200, 0xB8ADF900, 0xB8ACB000,
-	0xB8AB6700, 0xB8AA1E00, 0xB8A8D500,
-	0xB8A78C00, 0xB8A64300, 0xB8A4FA00,
-	0xB8A3B100, 0xB8A26800, 0xB8A11F00,
-	0xB89FD600, 0xB89E8D00, 0xB89D4400,
-	0xB89BFB00, 0xB89AB200, 0xB8996900,
-	0xB8982000, 0xB896D700, 0xB8958E00,
-	0xB8944500, 0xB892FC00, 0xB891B300,
-	0xB8906A00, 0xB88F2100, 0xB88DD800,
-	0xB88C8F00, 0xB88B4600, 0xB889FD00,
-	0xB888B400, 0xB8876B00, 0xB8862200,
-	0xB884D900, 0xB8839000, 0xB8824700,
-	0xB880FE00, 0xB87FB500, 0xB87E6C00,
-	0xB87D2300, 0xB87BDA00, 0xB87A9100,
-	0xB8794800, 0xB877FF00, 0xB876B600,
-	0xB8756D00, 0xB8742400, 0xB872DB00,
-	0xB8719200, 0xB8704900, 0xB86F0000,
-	0xB86DB700, 0xB86C6E00, 0xB86B2500,
-	0xB869DC00, 0xB8689300, 0xB8674A00,
-	0xB8660100, 0xB864B800, 0xB8636F00,
-	0xB8622600, 0xB860DD00, 0xB85F9400,
-	0xB85E4B00, 0xB85D0200, 0xB85BB900,
-	0xB85A7000, 0xB8592700, 0xB857DE00,
-	0xB8569500, 0xB8554C00, 0xB8540300,
-	0xB852BA00, 0xB8517100, 0xB8502800,
-	0xB84EDF00, 0xB84D9600, 0xB84C4D00,
-	0xB84B0400, 0xB849BB00, 0xB8487200,
-	0xB8472900, 0xB845E000, 0xB8449700,
-	0xB8434E00, 0xB8420500, 0xB840BC00,
-	0xB83F7300, 0xB83E2A00, 0xB83CE100,
-	0xB83B9800, 0xB83A4F00, 0xB8390600,
-	0xB837BD00, 0xB8367400, 0xB8352B00,
-	0xB833E200, 0xB8329900, 0xB8315000,
-	0xB8300700, 0xB82EBE00, 0xB82D7500,
-	0xB82C2C00, 0xB82AE300, 0xB8299A00,
-	0xB8285100, 0xB8270800, 0xB825BF00,
-	0xB8247600, 0xB8232D00, 0xB821E400,
-	0xB8209B00, 0xB81F5200, 0xB81E0900,
-	0xB81CC000, 0xB81B7700, 0xB81A2E00,
-	0xB818E500, 0xB8179C00, 0xB8165300,
-	0xB8150A00, 0xB813C100, 0xB8127800,
-	0xB8112F00, 0xB80FE600, 0xB80E9D00,
-	0xB80D5400, 0xB80C0B00, 0xB80AC200,
-	0xB8097900, 0xB8083000, 0xB806E700,
-	0xB8059E00, 0xB8045500, 0xB8030C00,
-	0xB801C300, 0xB8007A00, 0xB7FF3100,
-	0xB7FDE800, 0xB7FC9F00, 0xB7FB5600,
-	0xB7FA0D00, 0xB7F8C400, 0xB7F77B00,
-	0xB7F63200, 0xB7F4E900, 0xB7F3A000,
-	0xB7F25700, 0xB7F10E00, 0xB7EFC500,
-	0xB7EE7C00, 0xB7ED3300, 0xB7EBEA00,
-	0xB7EAA100, 0xB7E95800, 0xB7E80F00,
-	0xB7E6C600, 0xB7E57D00, 0xB7E43400,
-	0xB7E2EB00, 0xB7E1A200, 0xB7E05900,
-	0xB7DF1000, 0xB7DDC700, 0xB7DC7E00,
-	0xB7DB3500, 0xB7D9EC00, 0xB7D8A300,
-	0xB7D75A00, 0xB7D61100, 0xB7D4C800,
-	0xB7D37F00, 0xB7D23600, 0xB7D0ED00,
-	0xB7CFA400, 0xB7CE5B00, 0xB7CD1200,
-	0xB7CBC900, 0xB7CA8000, 0xB7C93700,
-	0xB7C7EE00, 0xB7C6A500, 0xB7C55C00,
-	0xB7C41300, 0xB7C2CA00, 0xB7C18100,
-	0xB7C03800, 0xB7BEEF00, 0xB7BDA600,
-	0xB7BC5D00, 0xB7BB1400, 0xB7B9CB00,
-	0xB7B88200, 0xB7B73900, 0xB7B5F000,
-	0xB7B4A700, 0xB7B35E00, 0xB7B21500,
-	0xB7B0CC00, 0xB7AF8300, 0xB7AE3A00,
-	0xB7ACF100, 0xB7ABA800, 0xB7AA5F00,
-	0xB7A91600, 0xB7A7CD00, 0xB7A68400,
-	0xB7A53B00, 0xB7A3F200, 0xB7A2A900,
-	0xB7A16000, 0xB7A01700, 0xB79ECE00,
-	0xB79D8500, 0xB79C3C00, 0xB79AF300,
-	0xB799AA00, 0xB7986100, 0xB7971800,
-	0xB795CF00, 0xB7948600, 0xB7933D00,
-	0xB791F400, 0xB790AB00, 0xB78F6200,
-	0xB78E1900, 0xB78CD000, 0xB78B8700,
-	0xB78A3E00, 0xB788F500, 0xB787AC00,
-	0xB7866300, 0xB7851A00, 0xB783D100,
-	0xB7828800, 0xB7813F00, 0xB77FF600,
-	0xB77EAD00, 0xB77D6400, 0xB77C1B00,
-	0xB77AD200, 0xB7798900, 0xB7784000,
-	0xB776F700, 0xB775AE00, 0xB7746500,
-	0xB7731C00, 0xB771D300, 0xB7708A00,
-	0xB76F4100, 0xB76DF800, 0xB76CAF00,
-	0xB76B6600, 0xB76A1D00, 0xB768D400,
-	0xB7678B00, 0xB7664200, 0xB764F900,
-	0xB763B000, 0xB7626700, 0xB7611E00,
-	0xB75FD500, 0xB75E8C00, 0xB75D4300,
-	0xB75BFA00, 0xB75AB100, 0xB7596800,
-	0xB7581F00, 0xB756D600, 0xB7558D00,
-	0xB7544400, 0xB752FB00, 0xB751B200,
-	0xB7506900, 0xB74F2000, 0xB74DD700,
-	0xB74C8E00, 0xB74B4500, 0xB749FC00,
-	0xB748B300, 0xB7476A00, 0xB7462100,
-	0xB744D800, 0xB7438F00, 0xB7424600,
-	0xB740FD00, 0xB73FB400, 0xB73E6B00,
-	0xB73D2200, 0xB73BD900, 0xB73A9000,
-	0xB7394700, 0xB737FE00, 0xB736B500,
-	0xB7356C00, 0xB7342300, 0xB732DA00,
-	0xB7319100, 0xB7304800, 0xB72EFF00,
-	0xB72DB600, 0xB72C6D00, 0xB72B2400,
-	0xB729DB00, 0xB7289200, 0xB7274900,
-	0xB7260000, 0xB724B700, 0xB7236E00,
-	0xB7222500, 0xB720DC00, 0xB71F9300,
-	0xB71E4A00, 0xB71D0100, 0xB71BB800,
-	0xB71A6F00, 0xB7192600, 0xB717DD00,
-	0xB7169400, 0xB7154B00, 0xB7140200,
-	0xB712B900, 0xB7117000, 0xB7102700,
-	0xB70EDE00, 0xB70D9500, 0xB70C4C00,
-	0xB70B0300, 0xB709BA00, 0xB7087100,
-	0xB7072800, 0xB705DF00, 0xB7049600,
-	0xB7034D00, 0xB7020400, 0xB700BB00,
-	0xB6FF7200, 0xB6FE2900, 0xB6FCE000,
-	0xB6FB9700, 0xB6FA4E00, 0xB6F90500,
-	0xB6F7BC00, 0xB6F67300, 0xB6F52A00,
-	0xB6F3E100, 0xB6F29800, 0xB6F14F00,
-	0xB6F00600, 0xB6EEBD00, 0xB6ED7400,
-	0xB6EC2B00, 0xB6EAE200, 0xB6E99900,
-	0xB6E85000, 0xB6E70700, 0xB6E5BE00,
-	0xB6E47500, 0xB6E32C00, 0xB6E1E300,
-	0xB6E09A00, 0xB6DF5100, 0xB6DE0800,
-	0xB6DCBF00, 0xB6DB7600, 0xB6DA2D00,
-	0xB6D8E400, 0xB6D79B00, 0xB6D65200,
-	0xB6D50900, 0xB6D3C000, 0xB6D27700,
-	0xB6D12E00, 0xB6CFE500, 0xB6CE9C00,
-	0xB6CD5300, 0xB6CC0A00, 0xB6CAC100,
-	0xB6C97800, 0xB6C82F00, 0xB6C6E600,
-	0xB6C59D00, 0xB6C45400, 0xB6C30B00,
-	0xB6C1C200, 0xB6C07900, 0xB6BF3000,
-	0xB6BDE700, 0xB6BC9E00, 0xB6BB5500,
-	0xB6BA0C00, 0xB6B8C300, 0xB6B77A00,
-	0xB6B63100, 0xB6B4E800, 0xB6B39F00,
-	0xB6B25600, 0xB6B10D00, 0xB6AFC400,
-	0xB6AE7B00, 0xB6AD3200, 0xB6ABE900,
-	0xB6AAA000, 0xB6A95700, 0xB6A80E00,
-	0xB6A6C500, 0xB6A57C00, 0xB6A43300,
-	0xB6A2EA00, 0xB6A1A100, 0xB6A05800,
-	0xB69F0F00, 0xB69DC600, 0xB69C7D00,
-	0xB69B3400, 0xB699EB00, 0xB698A200,
-	0xB6975900, 0xB6961000, 0xB694C700,
-	0xB6937E00, 0xB6923500, 0xB690EC00,
-	0xB68FA300, 0xB68E5A00, 0xB68D1100,
-	0xB68BC800, 0xB68A7F00, 0xB6893600,
-	0xB687ED00, 0xB686A400, 0xB6855B00,
-	0xB6841200, 0xB682C900, 0xB6818000,
-	0xB6803700, 0xB67EEE00, 0xB67DA500,
-	0xB67C5C00, 0xB67B1300, 0xB679CA00,
-	0xB6788100, 0xB6773800, 0xB675EF00,
-	0xB674A600, 0xB6735D00, 0xB6721400,
-	0xB670CB00, 0xB66F8200, 0xB66E3900,
-	0xB66CF000, 0xB66BA700, 0xB66A5E00,
-	0xB6691500, 0xB667CC00, 0xB6668300,
-	0xB6653A00, 0xB663F100, 0xB662A800,
-	0xB6615F00, 0xB6601600, 0xB65ECD00,
-	0xB65D8400, 0xB65C3B00, 0xB65AF200,
-	0xB659A900, 0xB6586000, 0xB6571700,
-	0xB655CE00, 0xB6548500, 0xB6533C00,
-	0xB651F300, 0xB650AA00, 0xB64F6100,
-	0xB64E1800, 0xB64CCF00, 0xB64B8600,
-	0xB64A3D00, 0xB648F400, 0xB647AB00,
-	0xB6466200, 0xB6451900, 0xB643D000,
-	0xB6428700, 0xB6413E00, 0xB63FF500,
-	0xB63EAC00, 0xB63D6300, 0xB63C1A00,
-	0xB63AD100, 0xB6398800, 0xB6383F00,
-	0xB636F600, 0xB635AD00, 0xB6346400,
-	0xB6331B00, 0xB631D200, 0xB6308900,
-	0xB62F4000, 0xB62DF700, 0xB62CAE00,
-	0xB62B6500, 0xB62A1C00, 0xB628D300,
-	0xB6278A00, 0xB6264100, 0xB624F800,
-	0xB623AF00, 0xB6226600, 0xB6211D00,
-	0xB61FD400, 0xB61E8B00, 0xB61D4200,
-	0xB61BF900, 0xB61AB000, 0xB6196700,
-	0xB6181E00, 0xB616D500, 0xB6158C00,
-	0xB6144300, 0xB612FA00, 0xB611B100,
-	0xB6106800, 0xB60F1F00, 0xB60DD600,
-	0xB60C8D00, 0xB60B4400, 0xB609FB00,
-	0xB608B200, 0xB6076900, 0xB6062000,
-	0xB604D700, 0xB6038E00, 0xB6024500,
-	0xB600FC00, 0xB5FFB300, 0xB5FE6A00,
-	0xB5FD2100, 0xB5FBD800, 0xB5FA8F00,
-	0xB5F94600, 0xB5F7FD00, 0xB5F6B400,
-	0xB5F56B00, 0xB5F42200, 0xB5F2D900,
-	0xB5F19000, 0xB5F04700, 0xB5EEFE00,
-	0xB5EDB500, 0xB5EC6C00, 0xB5EB2300,
-	0xB5E9DA00, 0xB5E89100, 0xB5E74800,
-	0xB5E5FF00, 0xB5E4B600, 0xB5E36D00,
-	0xB5E22400, 0xB5E0DB00, 0xB5DF9200,
-	0xB5DE4900, 0xB5DD0000, 0xB5DBB700,
-	0xB5DA6E00, 0xB5D92500, 0xB5D7DC00,
-	0xB5D69300, 0xB5D54A00, 0xB5D40100,
-	0xB5D2B800, 0xB5D16F00, 0xB5D02600,
-	0xB5CEDD00, 0xB5CD9400, 0xB5CC4B00,
-	0xB5CB0200, 0xB5C9B900, 0xB5C87000,
-	0xB5C72700, 0xB5C5DE00, 0xB5C49500,
-	0xB5C34C00, 0xB5C20300, 0xB5C0BA00,
-	0xB5BF7100, 0xB5BE2800, 0xB5BCDF00,
-	0xB5BB9600, 0xB5BA4D00, 0xB5B90400,
-	0xB5B7BB00, 0xB5B67200, 0xB5B52900,
-	0xB5B3E000, 0xB5B29700, 0xB5B14E00,
-	0xB5B00500, 0xB5AEBC00, 0xB5AD7300,
-	0xB5AC2A00, 0xB5AAE100, 0xB5A99800,
-	0xB5A84F00, 0xB5A70600, 0xB5A5BD00,
-	0xB5A47400, 0xB5A32B00, 0xB5A1E200,
-	0xB5A09900, 0xB59F5000, 0xB59E0700,
-	0xB59CBE00, 0xB59B7500, 0xB59A2C00,
-	0xB598E300, 0xB5979A00, 0xB5965100,
-	0xB5950800, 0xB593BF00, 0xB5927600,
-	0xB5912D00, 0xB58FE400, 0xB58E9B00,
-	0xB58D5200, 0xB58C0900, 0xB58AC000,
-	0xB5897700, 0xB5882E00, 0xB586E500,
-	0xB5859C00, 0xB5845300, 0xB5830A00,
-	0xB581C100, 0xB5807800, 0xB57F2F00,
-	0xB57DE600, 0xB57C9D00, 0xB57B5400,
-	0xB57A0B00, 0xB578C200, 0xB5777900,
-	0xB5763000, 0xB574E700, 0xB5739E00,
-	0xB5725500, 0xB5710C00, 0xB56FC300,
-	0xB56E7A00, 0xB56D3100, 0xB56BE800,
-	0xB56A9F00, 0xB5695600, 0xB5680D00,
-	0xB566C400, 0xB5657B00, 0xB5643200,
-	0xB562E900, 0xB561A000, 0xB5605700,
-	0xB55F0E00, 0xB55DC500, 0xB55C7C00,
-	0xB55B3300, 0xB559EA00, 0xB558A100,
-	0xB5575800, 0xB5560F00, 0xB554C600,
-	0xB5537D00, 0xB5523400, 0xB550EB00,
-	0xB54FA200, 0xB54E5900, 0xB54D1000,
-	0xB54BC700, 0xB54A7E00, 0xB5493500,
-	0xB547EC00, 0xB546A300, 0xB5455A00,
-	0xB5441100, 0xB542C800, 0xB5417F00,
-	0xB5403600, 0xB53EED00, 0xB53DA400,
-	0xB53C5B00, 0xB53B1200, 0xB539C900,
-	0xB5388000, 0xB5373700, 0xB535EE00,
-	0xB534A500, 0xB5335C00, 0xB5321300,
-	0xB530CA00, 0xB52F8100, 0xB52E3800,
-	0xB52CEF00, 0xB52BA600, 0xB52A5D00,
-	0xB5291400, 0xB527CB00, 0xB5268200,
-	0xB5253900, 0xB523F000, 0xB522A700,
-	0xB5215E00, 0xB5201500, 0xB51ECC00,
-	0xB51D8300, 0xB51C3A00, 0xB51AF100,
-	0xB519A800, 0xB5185F00, 0xB5171600,
-	0xB515CD00, 0xB5148400, 0xB5133B00,
-	0xB511F200, 0xB510A900, 0xB50F6000,
-	0xB50E1700, 0xB50CCE00, 0xB50B8500,
-	0xB50A3C00, 0xB508F300, 0xB507AA00,
-	0xB5066100, 0xB5051800, 0xB503CF00,
-	0xB5028600, 0xB5013D00, 0xB4FFF400,
-	0xB4FEAB00, 0xB4FD6200, 0xB4FC1900,
-	0xB4FAD000, 0xB4F98700, 0xB4F83E00,
-	0xB4F6F500, 0xB4F5AC00, 0xB4F46300,
-	0xB4F31A00, 0xB4F1D100, 0xB4F08800,
-	0xB4EF3F00, 0xB4EDF600, 0xB4ECAD00,
-	0xB4EB6400, 0xB4EA1B00, 0xB4E8D200,
-	0xB4E78900, 0xB4E64000, 0xB4E4F700,
-	0xB4E3AE00, 0xB4E26500, 0xB4E11C00,
-	0xB4DFD300, 0xB4DE8A00, 0xB4DD4100,
-	0xB4DBF800, 0xB4DAAF00, 0xB4D96600,
-	0xB4D81D00, 0xB4D6D400, 0xB4D58B00,
-	0xB4D44200, 0xB4D2F900, 0xB4D1B000,
-	0xB4D06700, 0xB4CF1E00, 0xB4CDD500,
-	0xB4CC8C00, 0xB4CB4300, 0xB4C9FA00,
-	0xB4C8B100, 0xB4C76800, 0xB4C61F00,
-	0xB4C4D600, 0xB4C38D00, 0xB4C24400,
-	0xB4C0FB00, 0xB4BFB200, 0xB4BE6900,
-	0xB4BD2000, 0xB4BBD700, 0xB4BA8E00,
-	0xB4B94500, 0xB4B7FC00, 0xB4B6B300,
-	0xB4B56A00, 0xB4B42100, 0xB4B2D800,
-	0xB4B18F00, 0xB4B04600, 0xB4AEFD00,
-	0xB4ADB400, 0xB4AC6B00, 0xB4AB2200,
-	0xB4A9D900, 0xB4A89000, 0xB4A74700,
-	0xB4A5FE00, 0xB4A4B500, 0xB4A36C00,
-	0xB4A22300, 0xB4A0DA00, 0xB49F9100,
-	0xB49E4800, 0xB49CFF00, 0xB49BB600,
-	0xB49A6D00, 0xB4992400, 0xB497DB00,
-	0xB4969200, 0xB4954900, 0xB4980000,
-	0xB496CD00, 0xB4959A00, 0xB4946700,
-	0xB4933400, 0xB4920100, 0xB490CE00,
-	0xB48F9B00, 0xB48E6800, 0xB48D3500,
-	0xB48C0200, 0xB48ACF00, 0xB4899C00,
-	0xB4886900, 0xB4873600, 0xB4860300,
-	0xB484D000, 0xB4839D00, 0xB4826A00,
-	0xB4813700, 0xB4800400, 0xB47ED100,
-	0xB47D9E00, 0xB47C6B00, 0xB47B3800,
-	0xB47A0500, 0xB478D200, 0xB4779F00,
-	0xB4766C00, 0xB4753900, 0xB4740600,
-	0xB472D300, 0xB471A000, 0xB4706D00,
-	0xB46F3A00, 0xB46E0700, 0xB46CD400,
-	0xB46BA100, 0xB46A6E00, 0xB4693B00,
-	0xB4680800, 0xB466D500, 0xB465A200,
-	0xB4646F00, 0xB4633C00, 0xB4620900,
-	0xB460D600, 0xB45FA300, 0xB45E7000,
-	0xB45D3D00, 0xB45C0A00, 0xB45AD700,
-	0xB459A400, 0xB4587100, 0xB4573E00,
-	0xB4560B00, 0xB454D800, 0xB453A500,
-	0xB4527200, 0xB4513F00, 0xB4500C00,
-	0xB44ED900, 0xB44DA600, 0xB44C7300,
-	0xB44B4000, 0xB44A0D00, 0xB448DA00,
-	0xB447A700, 0xB4467400, 0xB4454100,
-	0xB4440E00, 0xB442DB00, 0xB441A800,
-	0xB4407500, 0xB43F4200, 0xB43E0F00,
-	0xB43CDC00, 0xB43BA900, 0xB43A7600,
-	0xB4394300, 0xB4381000, 0xB436DD00,
-	0xB435AA00, 0xB4347700, 0xB4334400,
-	0xB4321100, 0xB430DE00, 0xB42FAB00,
-	0xB42E7800, 0xB42D4500, 0xB42C1200,
-	0xB42ADF00, 0xB429AC00, 0xB4287900,
-	0xB4274600, 0xB4261300, 0xB424E000,
-	0xB423AD00, 0xB4227A00, 0xB4214700,
-	0xB4201400, 0xB41EE100, 0xB41DAE00,
-	0xB41C7B00, 0xB41B4800, 0xB41A1500,
-	0xB418E200, 0xB417AF00, 0xB4167C00,
-	0xB4154900, 0xB4141600, 0xB412E300,
-	0xB411B000, 0xB4107D00, 0xB40F4A00,
-	0xB40E1700, 0xB40CE400, 0xB40BB100,
-	0xB40A7E00, 0xB4094B00, 0xB4081800,
-	0xB406E500, 0xB405B200, 0xB4047F00,
-	0xB4034C00, 0xB4021900, 0xB400E600,
-	0xB3FFB300, 0xB3FE8000, 0xB3FD4D00,
-	0xB3FC1A00, 0xB3FAE700, 0xB3F9B400,
-	0xB3F88100, 0xB3F74E00, 0xB3F61B00,
-	0xB3F4E800, 0xB3F3B500, 0xB3F28200,
-	0xB3F14F00, 0xB3F01C00, 0xB3EEE900,
-	0xB3EDB600, 0xB3EC8300, 0xB3EB5000,
-	0xB3EA1D00, 0xB3E8EA00, 0xB3E7B700,
-	0xB3E68400, 0xB3E55100, 0xB3E41E00,
-	0xB3E2EB00, 0xB3E1B800, 0xB3E08500,
-	0xB3DF5200, 0xB3DE1F00, 0xB3DCEC00,
-	0xB3DBB900, 0xB3DA8600, 0xB3D95300,
-	0xB3D82000, 0xB3D6ED00, 0xB3D5BA00,
-	0xB3D48700, 0xB3D35400, 0xB3D22100,
-	0xB3D0EE00, 0xB3CFBB00, 0xB3CE8800,
-	0xB3CD5500, 0xB3CC2200, 0xB3CAEF00,
-	0xB3C9BC00, 0xB3C88900, 0xB3C75600,
-	0xB3C62300, 0xB3C4F000, 0xB3C3BD00,
-	0xB3C28A00, 0xB3C15700, 0xB3C02400,
-	0xB3BEF100, 0xB3BDBE00, 0xB3BC8B00,
-	0xB3BB5800, 0xB3BA2500, 0xB3B8F200,
-	0xB3B7BF00, 0xB3B68C00, 0xB3B55900,
-	0xB3B42600, 0xB3B2F300, 0xB3B1C000,
-	0xB3B08D00, 0xB3AF5A00, 0xB3AE2700,
-	0xB3ACF400, 0xB3ABC100, 0xB3AA8E00,
-	0xB3A95B00, 0xB3A82800, 0xB3A6F500,
-	0xB3A5C200, 0xB3A48F00, 0xB3A35C00,
-	0xB3A22900, 0xB3A0F600, 0xB39FC300,
-	0xB39E9000, 0xB39D5D00, 0xB39C2A00,
-	0xB39AF700, 0xB399C400, 0xB3989100,
-	0xB3975E00, 0xB3962B00, 0xB394F800,
-	0xB393C500, 0xB3929200, 0xB3915F00,
-	0xB3902C00, 0xB38EF900, 0xB38DC600,
-	0xB38C9300, 0xB38B6000, 0xB38A2D00,
-	0xB388FA00, 0xB387C700, 0xB3869400,
-	0xB3856100, 0xB3842E00, 0xB382FB00,
-	0xB381C800, 0xB3809500, 0xB37F6200,
-	0xB37E2F00, 0xB37CFC00, 0xB37BC900,
-	0xB37A9600, 0xB3796300, 0xB3783000,
-	0xB376FD00, 0xB375CA00, 0xB3749700,
-	0xB3736400, 0xB3723100, 0xB370FE00,
-	0xB36FCB00, 0xB36E9800, 0xB36D6500,
-	0xB36C3200, 0xB36AFF00, 0xB369CC00,
-	0xB3689900, 0xB3676600, 0xB3663300,
-	0xB3650000, 0xB363CD00, 0xB3629A00,
-	0xB3616700, 0xB3603400, 0xB35F0100,
-	0xB35DCE00, 0xB35C9B00, 0xB35B6800,
-	0xB35A3500, 0xB3590200, 0xB357CF00,
-	0xB3569C00, 0xB3556900, 0xB3543600,
-	0xB3530300, 0xB351D000, 0xB3509D00,
-	0xB34F6A00, 0xB34E3700, 0xB34D0400,
-	0xB34BD100, 0xB34A9E00, 0xB3496B00,
-	0xB3483800, 0xB3470500, 0xB345D200,
-	0xB3449F00, 0xB3436C00, 0xB3423900,
-	0xB3410600, 0xB33FD300, 0xB33EA000,
-	0xB33D6D00, 0xB33C3A00, 0xB33B0700,
-	0xB339D400, 0xB338A100, 0xB3376E00,
-	0xB3363B00, 0xB3350800, 0xB333D500,
-	0xB332A200, 0xB3316F00, 0xB3303C00,
-	0xB32F0900, 0xB32DD600, 0xB32CA300,
-	0xB32B7000, 0xB32A3D00, 0xB3290A00,
-	0xB327D700, 0xB326A400, 0xB3257100,
-	0xB3243E00, 0xB3230B00, 0xB321D800,
-	0xB320A500, 0xB31F7200, 0xB31E3F00,
-	0xB31D0C00, 0xB31BD900, 0xB31AA600,
-	0xB3197300, 0xB3184000, 0xB3170D00,
-	0xB315DA00, 0xB314A700, 0xB3137400,
-	0xB3124100, 0xB3110E00, 0xB30FDB00,
-	0xB30EA800, 0xB30D7500, 0xB30C4200,
-	0xB30B0F00, 0xB309DC00, 0xB308A900,
-	0xB3077600, 0xB3064300, 0xB3051000,
-	0xB303DD00, 0xB302AA00, 0xB3017700,
-	0xB3004400, 0xB2FF1100, 0xB2FDDE00,
-	0xB2FCAB00, 0xB2FB7800, 0xB2FA4500,
-	0xB2F91200, 0xB2F7DF00, 0xB2F6AC00,
-	0xB2F57900, 0xB2F44600, 0xB2F31300,
-	0xB2F1E000, 0xB2F0AD00, 0xB2EF7A00,
-	0xB2EE4700, 0xB2ED1400, 0xB2EBE100,
-	0xB2EAAE00, 0xB2E97B00, 0xB2E84800,
-	0xB2E71500, 0xB2E5E200, 0xB2E4AF00,
-	0xB2E37C00, 0xB2E24900, 0xB2E11600,
-	0xB2DFE300, 0xB2DEB000, 0xB2DD7D00,
-	0xB2DC4A00, 0xB2DB1700, 0xB2D9E400,
-	0xB2D8B100, 0xB2D77E00, 0xB2D64B00,
-	0xB2D51800, 0xB2D3E500, 0xB2D2B200,
-	0xB2D17F00, 0xB2D04C00, 0xB2CF1900,
-	0xB2CDE600, 0xB2CCB300, 0xB2CB8000,
-	0xB2CA4D00, 0xB2C91A00, 0xB2C7E700,
-	0xB2C6B400, 0xB2C58100, 0xB2C44E00,
-	0xB2C31B00, 0xB2C1E800, 0xB2C0B500,
-	0xB2BF8200, 0xB2BE4F00, 0xB2BD1C00,
-	0xB2BBE900, 0xB2BAB600, 0xB2B98300,
-	0xB2B85000, 0xB2B71D00, 0xB2B5EA00,
-	0xB2B4B700, 0xB2B38400, 0xB2B25100,
-	0xB2B11E00, 0xB2AFEB00, 0xB2AEB800,
-	0xB2AD8500, 0xB2AC5200, 0xB2AB1F00,
-	0xB2A9EC00, 0xB2A8B900, 0xB2A78600,
-	0xB2A65300, 0xB2A52000, 0xB2A3ED00,
-	0xB2A2BA00, 0xB2A18700, 0xB2A05400,
-	0xB29F2100, 0xB29DEE00, 0xB29CBB00,
-	0xB29B8800, 0xB29A5500, 0xB2992200,
-	0xB297EF00, 0xB296BC00, 0xB2958900,
-	0xB2945600, 0xB2932300, 0xB291F000,
-	0xB290BD00, 0xB28F8A00, 0xB28E5700,
-	0xB28D2400, 0xB28BF100, 0xB28ABE00,
-	0xB2898B00, 0xB2885800, 0xB2872500,
-	0xB285F200, 0xB284BF00, 0xB2838C00,
-	0xB2825900, 0xB2812600, 0xB27FF300,
-	0xB27EC000, 0xB27D8D00, 0xB27C5A00,
-	0xB27B2700, 0xB279F400, 0xB278C100,
-	0xB2778E00, 0xB2765B00, 0xB2752800,
-	0xB273F500, 0xB272C200, 0xB2718F00,
-	0xB2705C00, 0xB26F2900, 0xB26DF600,
-	0xB26CC300, 0xB26B9000, 0xB26A5D00,
-	0xB2692A00, 0xB267F700, 0xB266C400,
-	0xB2659100, 0xB2645E00, 0xB2632B00,
-	0xB261F800, 0xB260C500, 0xB25F9200,
-	0xB25E5F00, 0xB25D2C00, 0xB25BF900,
-	0xB25AC600, 0xB2599300, 0xB2586000,
-	0xB2572D00, 0xB255FA00, 0xB254C700,
-	0xB2539400, 0xB2526100, 0xB2512E00,
-	0xB24FFB00, 0xB24EC800, 0xB24D9500,
-	0xB24C6200, 0xB24B2F00, 0xB249FC00,
-	0xB248C900, 0xB2479600, 0xB2466300,
-	0xB2453000, 0xB243FD00, 0xB242CA00,
-	0xB2419700, 0xB2406400, 0xB23F3100,
-	0xB23DFE00, 0xB23CCB00, 0xB23B9800,
-	0xB23A6500, 0xB2393200, 0xB237FF00,
-	0xB236CC00, 0xB2359900, 0xB2346600,
-	0xB2333300, 0xB2320000, 0xB230CD00,
-	0xB22F9A00, 0xB22E6700, 0xB22D3400,
-	0xB22C0100, 0xB22ACE00, 0xB2299B00,
-	0xB2286800, 0xB2273500, 0xB2260200,
-	0xB224CF00, 0xB2239C00, 0xB2226900,
-	0xB2213600, 0xB2200300, 0xB21ED000,
-	0xB21D9D00, 0xB21C6A00, 0xB21B3700,
-	0xB21A0400, 0xB218D100, 0xB2179E00,
-	0xB2166B00, 0xB2153800, 0xB2140500,
-	0xB212D200, 0xB2119F00, 0xB2106C00,
-	0xB20F3900, 0xB20E0600, 0xB20CD300,
-	0xB20BA000, 0xB20A6D00, 0xB2093A00,
-	0xB2080700, 0xB206D400, 0xB205A100,
-	0xB2046E00, 0xB2033B00, 0xB2020800,
-	0xB200D500, 0xB1FFA200, 0xB1FE6F00,
-	0xB1FD3C00, 0xB1FC0900, 0xB1FAD600,
-	0xB1F9A300, 0xB1F87000, 0xB1F73D00,
-	0xB1F60A00, 0xB1F4D700, 0xB1F3A400,
-	0xB1F27100, 0xB1F13E00, 0xB1F00B00,
-	0xB1EED800, 0xB1EDA500, 0xB1EC7200,
-	0xB1EB3F00, 0xB1EA0C00, 0xB1E8D900,
-	0xB1E7A600, 0xB1E67300, 0xB1E54000,
-	0xB1E40D00, 0xB1E2DA00, 0xB1E1A700,
-	0xB1E07400, 0xB1DF4100, 0xB1DE0E00,
-	0xB1DCDB00, 0xB1DBA800, 0xB1DA7500,
-	0xB1D94200, 0xB1D80F00, 0xB1D6DC00,
-	0xB1D5A900, 0xB1D47600, 0xB1D34300,
-	0xB1D21000, 0xB1D0DD00, 0xB1CFAA00,
-	0xB1CE7700, 0xB1CD4400, 0xB1CC1100,
-	0xB1CADE00, 0xB1C9AB00, 0xB1C87800,
-	0xB1C74500, 0xB1C61200, 0xB1C4DF00,
-	0xB1C3AC00, 0xB1C27900, 0xB1C14600,
-	0xB1C01300, 0xB1BEE000, 0xB1BDAD00,
-	0xB1BC7A00, 0xB1BB4700, 0xB1BA1400,
-	0xB1B8E100, 0xB1B7AE00, 0xB1B67B00,
-	0xB1B54800, 0xB1B41500, 0xB1B2E200,
-	0xB1B1AF00, 0xB1B07C00, 0xB1AF4900,
-	0xB1AE1600, 0xB1ACE300, 0xB1ABB000,
-	0xB1AA7D00, 0xB1A94A00, 0xB1A81700,
-	0xB1A6E400, 0xB1A5B100, 0xB1A47E00,
-	0xB1A34B00, 0xB1A21800, 0xB1A0E500,
-	0xB19FB200, 0xB19E7F00, 0xB19D4C00,
-	0xB19C1900, 0xB19AE600, 0xB199B300,
-	0xB1988000, 0xB1974D00, 0xB1961A00,
-	0xB194E700, 0xB193B400, 0xB1928100,
-	0xB1914E00, 0xB1901B00, 0xB18EE800,
-	0xB18DB500, 0xB18C8200, 0xB18B4F00,
-	0xB18A1C00, 0xB188E900, 0xB187B600,
-	0xB1868300, 0xB1855000, 0xB1841D00,
-	0xB182EA00, 0xB181B700, 0xB1808400,
-	0xB17F5100, 0xB17E1E00, 0xB17CEB00,
-	0xB17BB800, 0xB17A8500, 0xB1795200,
-	0xB1781F00, 0xB176EC00, 0xB175B900,
-	0xB1748600, 0xB1735300, 0xB1722000,
-	0xB170ED00, 0xB16FBA00, 0xB16E8700,
-	0xB16D5400, 0xB16C2100, 0xB16AEE00,
-	0xB169BB00, 0xB1688800, 0xB1675500,
-	0xB1662200, 0xB164EF00, 0xB163BC00,
-	0xB1628900, 0xB1615600, 0xB1602300,
-	0xB15EF000, 0xB15DBD00, 0xB15C8A00,
-	0xB15B5700, 0xB15A2400, 0xB158F100,
-	0xB157BE00, 0xB1568B00, 0xB1555800,
-	0xB1542500, 0xB152F200, 0xB151BF00,
-	0xB1508C00, 0xB14F5900, 0xB14E2600,
-	0xB14CF300, 0xB14BC000, 0xB14A8D00,
-	0xB1495A00, 0xB1482700, 0xB146F400,
-	0xB145C100, 0xB1448E00, 0xB1435B00,
-	0xB1422800, 0xB140F500, 0xB13FC200,
-	0xB13E8F00, 0xB13D5C00, 0xB13C2900,
-	0xB13AF600, 0xB139C300, 0xB1389000,
-	0xB1375D00, 0xB1362A00, 0xB134F700,
-	0xB133C400, 0xB1329100, 0xB1315E00,
-	0xB1302B00, 0xB12EF800, 0xB12DC500,
-	0xB12C9200, 0xB12B5F00, 0xB12A2C00,
-	0xB128F900, 0xB127C600, 0xB1269300,
-	0xB1256000, 0xB1242D00, 0xB122FA00,
-	0xB121C700, 0xB1209400, 0xB11F6100,
-	0xB11E2E00, 0xB11CFB00, 0xB11BC800,
-	0xB11A9500, 0xB1196200, 0xB1182F00,
-	0xB116FC00, 0xB115C900, 0xB1149600,
-	0xB1136300, 0xB1123000, 0xB110FD00,
-	0xB10FCA00, 0xB10E9700, 0xB10D6400,
-	0xB10C3100, 0xB10AFE00, 0xB109CB00,
-	0xB1089800, 0xB1076500, 0xB1063200,
-	0xB104FF00, 0xB103CC00, 0xB1029900,
-	0xB1016600, 0xB1003300, 0xB0FF0000,
-	0xB0FDCD00, 0xB0FC9A00, 0xB0FB6700,
-	0xB0FA3400, 0xB0F90100, 0xB0F7CE00,
-	0xB0F69B00, 0xB0F56800, 0xB0F43500,
-	0xB0F30200, 0xB0F1CF00, 0xB0F09C00,
-	0xB0EF6900, 0xB0EE3600, 0xB0ED0300,
-	0xB0EBD000, 0xB0EA9D00, 0xB0E96A00,
-	0xB0E83700, 0xB0E70400, 0xB0E5D100,
-	0xB0E49E00, 0xB0E36B00, 0xB0E23800,
-	0xB0E10500, 0xB0DFD200, 0xB0DE9F00,
-	0xB0DD6C00, 0xB0DC3900, 0xB0DB0600,
-	0xB0D9D300, 0xB0D8A000, 0xB0D76D00,
-	0xB0D63A00, 0xB0D50700, 0xB0D3D400,
-	0xB0D2A100, 0xB0D16E00, 0xB0D03B00,
-	0xB0CF0800, 0xB0CDD500, 0xB0CCA200,
-	0xB0CB6F00, 0xB0CA3C00, 0xB0C90900,
-	0xB0C7D600, 0xB0C6A300, 0xB0C57000,
-	0xB0C43D00, 0xB0C30A00, 0xB0C1D700,
-	0xB0C0A400, 0xB0BF7100, 0xB0BE3E00,
-	0xB0BD0B00, 0xB0BBD800, 0xB0BAA500,
-	0xB0B97200, 0xB0B83F00, 0xB0B70C00,
-	0xB0B5D900, 0xB0B4A600, 0xB0B37300,
-	0xB0B24000, 0xB0B10D00, 0xB0AFDA00,
-	0xB0AEA700, 0xB0AD7400, 0xB0AC4100,
-	0xB0AB0E00, 0xB0A9DB00, 0xB0A8A800,
-	0xB0A77500, 0xB0A64200, 0xB0A50F00,
-	0xB0A3DC00, 0xB0A2A900, 0xB0A17600,
-	0xB0A04300, 0xB09F1000, 0xB09DDD00,
-	0xB09CAA00, 0xB09B7700, 0xB09A4400,
-	0xB0991100, 0xB097DE00, 0xB096AB00,
-	0xB0957800, 0xB0944500, 0xB0931200,
-	0xB091DF00, 0xB090AC00, 0xB08F7900,
-	0xB08E4600, 0xB08D1300, 0xB08BE000,
-	0xB08AAD00, 0xB0897A00, 0xB0884700,
-	0xB0871400, 0xB085E100, 0xB084AE00,
-	0xB0837B00, 0xB0824800, 0xB0811500,
-	0xB07FE200, 0xB07EAF00, 0xB07D7C00,
-	0xB07C4900, 0xB07B1600, 0xB079E300,
-	0xB078B000, 0xB0777D00, 0xB0764A00,
-	0xB0751700, 0xB073E400, 0xB072B100,
-	0xB0717E00, 0xB0704B00, 0xB06F1800,
-	0xB06DE500, 0xB06CB200, 0xB06B7F00,
-	0xB06A4C00, 0xB0691900, 0xB067E600,
-	0xB066B300, 0xB0658000, 0xB0644D00,
-	0xB0631A00, 0xB061E700, 0xB060B400,
-	0xB05F8100, 0xB05E4E00, 0xB05D1B00,
-	0xB05BE800, 0xB05AB500, 0xB0598200,
-	0xB0584F00, 0xB0571C00, 0xB055E900,
-	0xB054B600, 0xB0538300, 0xB0525000,
-	0xB0511D00, 0xB04FEA00, 0xB04EB700,
-	0xB04D8400, 0xB04C5100, 0xB04B1E00,
-	0xB049EB00, 0xB048B800, 0xB0478500,
-	0xB0465200, 0xB0451F00, 0xB043EC00,
-	0xB042B900, 0xB0418600, 0xB0405300,
-	0xB03F2000, 0xB03DED00, 0xB03CBA00,
-	0xB03B8700, 0xB03A5400, 0xB0392100,
-	0xB037EE00, 0xB036BB00, 0xB0358800,
-	0xB0345500, 0xB0332200, 0xB031EF00,
-	0xB030BC00, 0xB02F8900, 0xB02E5600,
-	0xB02D2300, 0xB02BF000, 0xB02ABD00,
-	0xB0298A00, 0xB0285700, 0xB0272400,
-	0xB025F100, 0xB024BE00, 0xB0238B00,
-	0xB0225800, 0xB0212500, 0xB01FF200,
-	0xB01EBF00, 0xB01D8C00, 0xB01C5900,
-	0xB01B2600, 0xB019F300, 0xB018C000,
-	0xB0178D00, 0xB0165A00, 0xB0152700,
-	0xB013F400, 0xB012C100, 0xB0118E00,
-	0xB0105B00, 0xB00F2800, 0xB00DF500,
-	0xB00CC200, 0xB00B8F00, 0xB00A5C00,
-	0xB0092900, 0xB007F600, 0xB006C300,
-	0xB0059000, 0xB0045D00, 0xB0032A00,
-	0xB001F700, 0xB000C400, 0xAFFF9100,
-	0xAFFE5E00, 0xAFFD2B00, 0xAFFBF800,
-	0xAFFAC500, 0xAFF99200, 0xAFF85F00,
-	0xAFF72C00, 0xAFF5F900, 0xAFF4C600,
-	0xAFF39300, 0xAFF26000, 0xAFF12D00,
-	0xAFEFFA00, 0xAFEEC700, 0xAFED9400,
-	0xAFEC6100, 0xAFEB2E00, 0xAFE9FB00,
-	0xAFE8C800, 0xAFE79500, 0xAFE66200,
-	0xAFE52F00, 0xAFE3FC00, 0xAFE2C900,
-	0xAFE19600, 0xAFE06300, 0xAFDF3000,
-	0xAFDDFD00, 0xAFDCCA00, 0xAFDB9700,
-	0xAFDA6400, 0xAFD93100, 0xAFD7FE00,
-	0xAFD6CB00, 0xAFD59800, 0xAFD46500,
-	0xAFD33200, 0xAFD1FF00, 0xAFD0CC00,
-	0xAFCF9900, 0xAFCE6600, 0xAFCD3300,
-	0xAFCC0000, 0xAFCACD00, 0xAFC99A00,
-	0xAFC86700, 0xAFC73400, 0xAFC60100,
-	0xAFC4CE00, 0xAFC39B00, 0xAFC26800,
-	0xAFC13500, 0xAFC00200, 0xAFBECF00,
-	0xAFBD9C00, 0xAFBC6900, 0xAFBB3600,
-	0xAFBA0300, 0xAFB8D000, 0xAFB79D00,
-	0xAFB66A00, 0xAFB53700, 0xAFB40400,
-	0xAFB2D100, 0xAFB19E00, 0xAFB06B00,
-	0xAFAF3800, 0xAFAE0500, 0xAFACD200,
-	0xAFAB9F00, 0xAFAA6C00, 0xAFA93900,
-	0xAFA80600, 0xAFA6D300, 0xAFA5A000,
-	0xAFA46D00, 0xAFA33A00, 0xAFA20700,
-	0xAFA0D400, 0xAF9FA100, 0xAF9E6E00,
-	0xAF9D3B00, 0xAF9C0800, 0xAF9AD500,
-	0xAF99A200, 0xAF986F00, 0xAF973C00,
-	0xAF960900, 0xAF94D600, 0xAF93A300,
-	0xAF927000, 0xAF913D00, 0xAF900A00,
-	0xAF8ED700, 0xAF8DA400, 0xAF8C7100,
-	0xAF8B3E00, 0xAF8A0B00, 0xAF88D800,
-	0xAF87A500, 0xAF867200, 0xAF853F00,
-	0xAF840C00, 0xAF82D900, 0xAF81A600,
-	0xAF807300, 0xAF7F4000, 0xAF7E0D00,
-	0xAF7CDA00, 0xAF7BA700, 0xAF7A7400,
-	0xAF794100, 0xAF780E00, 0xAF76DB00,
-	0xAF75A800, 0xAF747500, 0xAF734200,
-	0xAF720F00, 0xAF70DC00, 0xAF6FA900,
-	0xAF6E7600, 0xAF6D4300, 0xAF6C1000,
-	0xAF6ADD00, 0xAF69AA00, 0xAF687700,
-	0xAF674400, 0xAF661100, 0xAF64DE00,
-	0xAF63AB00, 0xAF627800, 0xAF614500,
-	0xAF601200, 0xAF5EDF00, 0xAF5DAC00,
-	0xAF5C7900, 0xAF5B4600, 0xAF5A1300,
-	0xAF58E000, 0xAF57AD00, 0xAF567A00,
-	0xAF554700, 0xAF541400, 0xAF52E100,
-	0xAF51AE00, 0xAF507B00, 0xAF4F4800,
-	0xAF4E1500, 0xAF4CE200, 0xAF4BAF00,
-	0xAF4A7C00, 0xAF494900, 0xAF481600,
-	0xAF46E300, 0xAF45B000, 0xAF447D00,
-	0xAF434A00, 0xAF421700, 0xAF40E400,
-	0xAF3FB100, 0xAF3E7E00, 0xAF3D4B00,
-	0xAF3C1800, 0xAF3AE500, 0xAF39B200,
-	0xAF387F00, 0xAF374C00, 0xAF361900,
-	0xAF34E600, 0xAF33B300, 0xAF328000,
-	0xAF314D00, 0xAF301A00, 0xAF2EE700,
-	0xAF2DB400, 0xAF2C8100, 0xAF2B4E00,
-	0xAF2A1B00, 0xAF28E800, 0xAF27B500,
-	0xAF268200, 0xAF254F00, 0xAF241C00,
-	0xAF22E900, 0xAF21B600, 0xAF208300,
-	0xAF1F5000, 0xAF1E1D00, 0xAF1CEA00,
-	0xAF1BB700, 0xAF1A8400, 0xAF195100,
-	0xAF181E00, 0xAF16EB00, 0xAF15B800,
-	0xAF148500, 0xAF135200, 0xAF121F00,
-	0xAF10EC00, 0xAF0FB900, 0xAF0E8600,
-	0xAF0D5300, 0xAF0C2000, 0xAF0AED00,
-	0xAF09BA00, 0xAF088700, 0xAF075400,
-	0xAF062100, 0xAF04EE00, 0xAF03BB00,
-	0xAF028800, 0xAF015500, 0xAF002200,
-	0xAEFEEF00, 0xAEFDBC00, 0xAEFC8900,
-	0xAEFB5600, 0xAEFA2300, 0xAEF8F000,
-	0xAEF7BD00, 0xAEF68A00, 0xAEF55700,
-	0xAEF42400, 0xAEF2F100, 0xAEF1BE00,
-	0xAEF08B00, 0xAEEF5800, 0xAEEE2500,
-	0xAEECF200, 0xAEEBBF00, 0xAEEA8C00,
-	0xAEE95900, 0xAEE82600, 0xAEE6F300,
-	0xAEE5C000, 0xAEE48D00, 0xAEE35A00,
-	0xAEE22700, 0xAEE0F400, 0xAEDFC100,
-	0xAEDE8E00, 0xAEDD5B00, 0xAEDC2800,
-	0xAEDAF500, 0xAED9C200, 0xAED88F00,
-	0xAED75C00, 0xAED62900, 0xAED4F600,
-	0xAED3C300, 0xAED29000, 0xAED15D00,
-	0xAED02A00, 0xAECEF700, 0xAECDC400,
-	0xAECC9100, 0xAECB5E00, 0xAECA2B00,
-	0xAEC8F800, 0xAEC7C500, 0xAEC69200,
-	0xAEC55F00, 0xAEC42C00, 0xAEC2F900,
-	0xAEC1C600, 0xAEC09300, 0xAEBF6000,
-	0xAEBE2D00, 0xAEBCFA00, 0xAEBBC700,
-	0xAEBA9400, 0xAEB96100, 0xAEB82E00,
-	0xAEB6FB00, 0xAEB5C800, 0xAEB49500,
-	0xAEB36200, 0xAEB22F00, 0xAEB0FC00,
-	0xAEAFC900, 0xAEAE9600, 0xAEAD6300,
-	0xAEAC3000, 0xAEAAFD00, 0xAEA9CA00,
-	0xAEA89700, 0xAEA76400, 0xAEA63100,
-	0xAEA4FE00, 0xAEA3CB00, 0xAEA29800,
-	0xAEA16500, 0xAEA03200, 0xAE9EFF00,
-	0xAE9DCC00, 0xAE9C9900, 0xAE9B6600,
-	0xAE9A3300, 0xAE990000, 0xAE97CD00,
-	0xAE969A00, 0xAE956700, 0xAE943400,
-	0xAE930100, 0xAE91CE00, 0xAE909B00,
-	0xAE8F6800, 0xAE8E3500, 0xAE8D0200,
-	0xAE8BCF00, 0xAE8A9C00, 0xAE896900,
-	0xAE883600, 0xAE870300, 0xAE85D000,
-	0xAE849D00, 0xAE836A00, 0xAE823700,
-	0xAE810400, 0xAE7FD100, 0xAE7E9E00,
-	0xAE7D6B00, 0xAE7C3800, 0xAE7B0500,
-	0xAE79D200, 0xAE789F00, 0xAE776C00,
-	0xAE763900, 0xAE750600, 0xAE73D300,
-	0xAE72A000, 0xAE716D00, 0xAE703A00,
-	0xAE6F0700, 0xAE6DD400, 0xAE6CA100,
-	0xAE6B6E00, 0xAE6A3B00, 0xAE690800,
-	0xAE67D500, 0xAE66A200, 0xAE656F00,
-	0xAE643C00, 0xAE630900, 0xAE61D600,
-	0xAE60A300, 0xAE5F7000, 0xAE5E3D00,
-	0xAE5D0A00, 0xAE5BD700, 0xAE5AA400,
-	0xAE597100, 0xAE583E00, 0xAE570B00,
-	0xAE55D800, 0xAE54A500, 0xAE537200,
-	0xAE523F00, 0xAE510C00, 0xAE4FD900,
-	0xAE4EA600, 0xAE4D7300, 0xAE4C4000,
-	0xAE4B0D00, 0xAE49DA00, 0xAE48A700,
-	0xAE477400, 0xAE464100, 0xAE450E00,
-	0xAE43DB00, 0xAE42A800, 0xAE417500,
-	0xAE404200, 0xAE3F0F00, 0xAE3DDC00,
-	0xAE3CA900, 0xAE3B7600, 0xAE3A4300,
-	0xAE391000, 0xAE37DD00, 0xAE36AA00,
-	0xAE357700, 0xAE344400, 0xAE331100,
-	0xAE31DE00, 0xAE30AB00, 0xAE2F7800,
-	0xAE2E4500, 0xAE2D1200, 0xAE2BDF00,
-	0xAE2AAC00, 0xAE297900, 0xAE284600,
-	0xAE271300, 0xAE25E000, 0xAE24AD00,
-	0xAE237A00, 0xAE224700, 0xAE211400,
-	0xAE1FE100, 0xAE1EAE00, 0xAE1D7B00,
-	0xAE1C4800, 0xAE1B1500, 0xAE19E200,
-	0xAE18AF00, 0xAE177C00, 0xAE164900,
-	0xAE151600, 0xAE13E300, 0xAE12B000,
-	0xAE117D00, 0xAE104A00, 0xAE0F1700,
-	0xAE0DE400, 0xAE0CB100, 0xAE0B7E00,
-	0xAE0A4B00, 0xAE091800, 0xAE07E500,
-	0xAE06B200, 0xAE057F00, 0xAE044C00,
-	0xAE031900, 0xAE01E600, 0xAE00B300,
-	0xADFF8000, 0xADFE4D00, 0xADFD1A00,
-	0xADFBE700, 0xADFAB400, 0xADF98100,
-	0xADF84E00, 0xADF71B00, 0xADF5E800,
-	0xADF4B500, 0xADF38200, 0xADF24F00,
-	0xADF11C00, 0xADEFE900, 0xADEEB600,
-	0xADED8300, 0xADEC5000, 0xADEB1D00,
-	0xADE9EA00, 0xADE8B700, 0xADE78400,
-	0xADE65100, 0xADE51E00, 0xADE3EB00,
-	0xADE2B800, 0xADE18500, 0xADE05200,
-	0xADDF1F00, 0xADDDEC00, 0xADDCB900,
-	0xADDB8600, 0xADDA5300, 0xADD92000,
-	0xADD7ED00, 0xADD6BA00, 0xADD58700,
-	0xADD45400, 0xADD32100, 0xADD1EE00,
-	0xADD0BB00, 0xADCF8800, 0xADCE5500,
-	0xADCD2200, 0xADCBEF00, 0xADCABC00,
-	0xADC98900, 0xADC85600, 0xADC72300,
-	0xADC5F000, 0xADC4BD00, 0xADC38A00,
-	0xADC25700, 0xADC12400, 0xADBFF100,
-	0xADBEBE00, 0xADBD8B00, 0xADBC5800,
-	0xADBB2500, 0xADB9F200, 0xADB8BF00,
-	0xADB78C00, 0xADB65900, 0xADB52600,
-	0xADB3F300, 0xADB2C000, 0xADB18D00,
-	0xADB05A00, 0xADAF2700, 0xADADF400,
-	0xADACC100, 0xADAB8E00, 0xADAA5B00,
-	0xADA92800, 0xADA7F500, 0xADA6C200,
-	0xADA58F00, 0xADA45C00, 0xADA32900,
-	0xADA1F600, 0xADA0C300, 0xAD9F9000,
-	0xAD9E5D00, 0xAD9D2A00, 0xAD9BF700,
-	0xAD9AC400, 0xAD999100, 0xAD985E00,
-	0xAD972B00, 0xAD95F800, 0xAD94C500,
-	0xAD939200, 0xAD925F00, 0xAD912C00,
-	0xAD8FF900, 0xAD8EC600, 0xAD8D9300,
-	0xAD8C6000, 0xAD8B2D00, 0xAD89FA00,
-	0xAD88C700, 0xAD879400, 0xAD866100,
-	0xAD852E00, 0xAD83FB00, 0xAD82C800,
-	0xAD819500, 0xAD806200, 0xAD7F2F00,
-	0xAD7DFC00, 0xAD7CC900, 0xAD7B9600,
-	0xAD7A6300, 0xAD793000, 0xAD77FD00,
-	0xAD76CA00, 0xAD759700, 0xAD746400,
-	0xAD733100, 0xAD71FE00, 0xAD70CB00,
-	0xAD6F9800, 0xAD6E6500, 0xAD6D3200,
-	0xAD6BFF00, 0xAD6ACC00, 0xAD699900,
-	0xAD686600, 0xAD673300, 0xAD660000,
-	0xAD64CD00, 0xAD639A00, 0xAD626700,
-	0xAD613400, 0xAD600100, 0xAD5ECE00,
-	0xAD5D9B00, 0xAD5C6800, 0xAD5B3500,
-	0xAD5A0200, 0xAD58CF00, 0xAD579C00,
-	0xAD566900, 0xAD553600, 0xAD540300,
-	0xAD52D000, 0xAD519D00, 0xAD506A00,
-	0xAD4F3700, 0xAD4E0400, 0xAD4CD100,
-	0xAD4B9E00, 0xAD4A6B00, 0xAD493800,
-	0xAD480500, 0xAD46D200, 0xAD459F00,
-	0xAD446C00, 0xAD433900, 0xAD420600,
-	0xAD40D300, 0xAD3FA000, 0xAD3E6D00,
-	0xAD3D3A00, 0xAD3C0700, 0xAD3AD400,
-	0xAD39A100, 0xAD386E00, 0xAD373B00,
-	0xAD360800, 0xAD34D500, 0xAD33A200,
-	0xAD326F00, 0xAD313C00, 0xAD300900,
-	0xAD2ED600, 0xAD2DA300, 0xAD2C7000,
-	0xAD2B3D00, 0xAD2A0A00, 0xAD28D700,
-	0xAD27A400, 0xAD267100, 0xAD253E00,
-	0xAD240B00, 0xAD22D800, 0xAD21A500,
-	0xAD207200, 0xAD1F3F00, 0xAD1E0C00,
-	0xAD1CD900, 0xAD1BA600, 0xAD1A7300,
-	0xAD194000, 0xAD180D00, 0xAD16DA00,
-	0xAD15A700, 0xAD147400, 0xAD134100,
-	0xAD120E00, 0xAD10DB00, 0xAD0FA800,
-	0xAD0E7500, 0xAD0D4200, 0xAD0C0F00,
-	0xAD0ADC00, 0xAD09A900, 0xAD087600,
-	0xAD074300, 0xAD061000, 0xAD04DD00,
-	0xAD03AA00, 0xAD027700, 0xAD014400,
-	0xAD001100, 0xACFEDE00, 0xACFDAB00,
-	0xACFC7800, 0xACFB4500, 0xACFA1200,
-	0xACF8DF00, 0xACF7AC00, 0xACF67900,
-	0xACF54600, 0xACF41300, 0xACF2E000,
-	0xACF1AD00, 0xACF07A00, 0xACEF4700,
-	0xACEE1400, 0xACECE100, 0xACEBAE00,
-	0xACEA7B00, 0xACE94800, 0xACE81500,
-	0xACE6E200, 0xACE5AF00, 0xACE47C00,
-	0xACE34900, 0xACE21600, 0xACE0E300,
-	0xACDFB000, 0xACDE7D00, 0xACDD4A00,
-	0xACDC1700, 0xACDAE400, 0xACD9B100,
-	0xACD87E00, 0xACD74B00, 0xACD61800,
-	0xACD4E500, 0xACD3B200, 0xACD27F00,
-	0xACD14C00, 0xACD01900, 0xACCEE600,
-	0xACCDB300, 0xACCC8000, 0xACCB4D00,
-	0xACCA1A00, 0xACC8E700, 0xACC7B400,
-	0xACC68100, 0xACC54E00, 0xACC41B00,
-	0xACC2E800, 0xACC1B500, 0xACC08200,
-	0xACBF4F00, 0xACBE1C00, 0xACBCE900,
-	0xACBBB600, 0xACBA8300, 0xACB95000,
-	0xACB81D00, 0xACB6EA00, 0xACB5B700,
-	0xACB48400, 0xACB35100, 0xACB21E00,
-	0xACB0EB00, 0xACAFB800, 0xACAE8500,
-	0xACAD5200, 0xACAC1F00, 0xACAAEC00,
-	0xACA9B900, 0xACA88600, 0xACA75300,
-	0xACA62000, 0xACA4ED00, 0xACA3BA00,
-	0xACA28700, 0xACA15400, 0xACA02100,
-	0xAC9EEE00, 0xAC9DBB00, 0xAC9C8800,
-	0xAC9B5500, 0xAC9A2200, 0xAC98EF00,
-	0xAC97BC00, 0xAC968900, 0xAC955600,
-	0xAC942300, 0xAC92F000, 0xAC91BD00,
-	0xAC908A00, 0xAC8F5700, 0xAC8E2400,
-	0xAC8CF100, 0xAC8BBE00, 0xAC8A8B00,
-	0xAC895800, 0xAC882500, 0xAC86F200,
-	0xAC85BF00, 0xAC848C00, 0xAC835900,
-	0xAC822600, 0xAC80F300, 0xAC7FC000,
-	0xAC7E8D00, 0xAC7D5A00, 0xAC7C2700,
-	0xAC7AF400, 0xAC79C100, 0xAC788E00,
-	0xAC775B00, 0xAC762800, 0xAC74F500,
-	0xAC73C200, 0xAC728F00, 0xAC715C00,
-	0xAC702900, 0xAC6EF600, 0xAC6DC300,
-	0xAC6C9000, 0xAC6B5D00, 0xAC6A2A00,
-	0xAC68F700, 0xAC67C400, 0xAC669100,
-	0xAC655E00, 0xAC642B00, 0xAC62F800,
-	0xAC61C500, 0xAC609200, 0xAC5F5F00,
-	0xAC5E2C00, 0xAC5CF900, 0xAC5BC600,
-	0xAC5A9300, 0xAC596000, 0xAC582D00,
-	0xAC56FA00, 0xAC55C700, 0xAC549400,
-	0xAC536100, 0xAC522E00, 0xAC50FB00,
-	0xAC4FC800, 0xAC4E9500, 0xAC4D6200,
-	0xAC4C2F00, 0xAC4AFC00, 0xAC49C900,
-	0xAC489600, 0xAC476300, 0xAC463000,
-	0xAC44FD00, 0xAC43CA00, 0xAC429700,
-	0xAC416400, 0xAC403100, 0xAC3EFE00,
-	0xAC3DCB00, 0xAC3C9800, 0xAC3B6500,
-	0xAC3A3200, 0xAC38FF00, 0xAC37CC00,
-	0xAC369900, 0xAC356600, 0xAC343300,
-	0xAC330000, 0xAC31CD00, 0xAC309A00,
-	0xAC2F6700, 0xAC2E3400, 0xAC2D0100,
-	0xAC2BCE00, 0xAC2A9B00, 0xAC296800,
-	0xAC283500, 0xAC270200, 0xAC25CF00,
-	0xAC249C00, 0xAC236900, 0xAC223600,
-	0xAC210300, 0xAC1FD000, 0xAC1E9D00,
-	0xAC1D6A00, 0xAC1C3700, 0xAC1B0400,
-	0xAC19D100, 0xAC189E00, 0xAC176B00,
-	0xAC163800, 0xAC150500, 0xAC13D200,
-	0xAC129F00, 0xAC116C00, 0xAC103900,
-	0xAC0F0600, 0xAC0DD300, 0xAC0CA000,
-	0xAC0B6D00, 0xAC0A3A00, 0xAC090700,
-	0xAC07D400, 0xAC06A100, 0xAC056E00,
-	0xAC043B00, 0xAC030800, 0xAC01D500,
-	0xAC00A200, 0xABFF6F00, 0xABFE3C00,
-	0xABFD0900, 0xABFBD600, 0xABFAA300,
-	0xABF97000, 0xABF83D00, 0xABF70A00,
-	0xABF5D700, 0xABF4A400, 0xABF37100,
-	0xABF23E00, 0xABF10B00, 0xABEFD800,
-	0xABEEA500, 0xABED7200, 0xABEC3F00,
-	0xABEB0C00, 0xABE9D900, 0xABE8A600,
-	0xABE77300, 0xABE64000, 0xABE50D00,
-	0xABE3DA00, 0xABE2A700, 0xABE17400,
-	0xABE04100, 0xABDF0E00, 0xABDDDB00,
-	0xABDCA800, 0xABDB7500, 0xABDA4200,
-	0xABD90F00, 0xABD7DC00, 0xABD6A900,
-	0xABD57600, 0xABD44300, 0xABD31000,
-	0xABD1DD00, 0xABD0AA00, 0xABCF7700,
-	0xABCE4400, 0xABCD1100, 0xABCBDE00,
-	0xABCAAB00, 0xABC97800, 0xABC84500,
-	0xABC71200, 0xABC5DF00, 0xABC4AC00,
-	0xABC37900, 0xABC24600, 0xABC11300,
-	0xABBFE000, 0xABBEAD00, 0xABBD7A00,
-	0xABBC4700, 0xABBB1400, 0xABB9E100,
-	0xABB8AE00, 0xABB77B00, 0xABB64800,
-	0xABB51500, 0xABB3E200, 0xABB2AF00,
-	0xABB17C00, 0xABB04900, 0xABAF1600,
-	0xABADE300, 0xABACB000, 0xABAB7D00,
-	0xABAA4A00, 0xABA91700, 0xABA7E400,
-	0xABA6B100, 0xABA57E00, 0xABA44B00,
-	0xABA31800, 0xABA1E500, 0xABA0B200,
-	0xAB9F7F00, 0xAB9E4C00, 0xAB9D1900,
-	0xAB9BE600, 0xAB9AB300, 0xAB998000,
-	0xAB984D00, 0xAB971A00, 0xAB95E700,
-	0xAB94B400, 0xAB938100, 0xAB924E00,
-	0xAB911B00, 0xAB8FE800, 0xAB8EB500,
-	0xAB8D8200, 0xAB8C4F00, 0xAB8B1C00,
-	0xAB89E900, 0xAB88B600, 0xAB878300,
-	0xAB865000, 0xAB851D00, 0xAB83EA00,
-	0xAB82B700, 0xAB818400, 0xAB805100,
-	0xAB7F1E00, 0xAB7DEB00, 0xAB7CB800,
-	0xAB7B8500, 0xAB7A5200, 0xAB791F00,
-	0xAB77EC00, 0xAB76B900, 0xAB758600,
-	0xAB745300, 0xAB732000, 0xAB71ED00,
-	0xAB70BA00, 0xAB6F8700, 0xAB6E5400,
-	0xAB6D2100, 0xAB6BEE00, 0xAB6ABB00,
-	0xAB698800, 0xAB685500, 0xAB672200,
-	0xAB65EF00, 0xAB64BC00, 0xAB638900,
-	0xAB625600, 0xAB612300, 0xAB5FF000,
-	0xAB5EBD00, 0xAB5D8A00, 0xAB5C5700,
-	0xAB5B2400, 0xAB59F100, 0xAB58BE00,
-	0xAB578B00, 0xAB565800, 0xAB552500,
-	0xAB53F200, 0xAB52BF00, 0xAB518C00,
-	0xAB505900, 0xAB4F2600, 0xAB4DF300,
-	0xAB4CC000, 0xAB4B8D00, 0xAB4A5A00,
-	0xAB492700, 0xAB47F400, 0xAB46C100,
-	0xAB458E00, 0xAB445B00, 0xAB432800,
-	0xAB41F500, 0xAB40C200, 0xAB3F8F00,
-	0xAB3E5C00, 0xAB3D2900, 0xAB3BF600,
-	0xAB3AC300, 0xAB399000, 0xAB385D00,
-	0xAB372A00, 0xAB35F700, 0xAB34C400,
-	0xAB339100, 0xAB325E00, 0xAB312B00,
-	0xAB2FF800, 0xAB2EC500, 0xAB2D9200,
-	0xAB2C5F00, 0xAB2B2C00, 0xAB29F900,
-	0xAB28C600, 0xAB279300, 0xAB266000,
-	0xAB252D00, 0xAB23FA00, 0xAB22C700,
-	0xAB219400, 0xAB206100, 0xAB1F2E00,
-	0xAB1DFB00, 0xAB1CC800, 0xAB1B9500,
-	0xAB1A6200, 0xAB192F00, 0xAB17FC00,
-	0xAB16C900, 0xAB159600, 0xAB146300,
-	0xAB133000, 0xAB11FD00, 0xAB10CA00,
-	0xAB0F9700, 0xAB0E6400, 0xAB0D3100,
-	0xAB0BFE00, 0xAB0ACB00, 0xAB099800,
-	0xAB086500, 0xAB073200, 0xAB05FF00,
-	0xAB04CC00, 0xAB039900, 0xAB026600,
-	0xAB013300, 0xAB000000, 0xAAFEE080,
-	0xAAFDC100, 0xAAFCA180, 0xAAFB8200,
-	0xAAFA6280, 0xAAF94300, 0xAAF82380,
-	0xAAF70400, 0xAAF5E480, 0xAAF4C500,
-	0xAAF3A580, 0xAAF28600, 0xAAF16680,
-	0xAAF04700, 0xAAEF2780, 0xAAEE0800,
-	0xAAECE880, 0xAAEBC900, 0xAAEAA980,
-	0xAAE98A00, 0xAAE86A80, 0xAAE74B00,
-	0xAAE62B80, 0xAAE50C00, 0xAAE3EC80,
-	0xAAE2CD00, 0xAAE1AD80, 0xAAE08E00,
-	0xAADF6E80, 0xAADE4F00, 0xAADD2F80,
-	0xAADC1000, 0xAADAF080, 0xAAD9D100,
-	0xAAD8B180, 0xAAD79200, 0xAAD67280,
-	0xAAD55300, 0xAAD43380, 0xAAD31400,
-	0xAAD1F480, 0xAAD0D500, 0xAACFB580,
-	0xAACE9600, 0xAACD7680, 0xAACC5700,
-	0xAACB3780, 0xAACA1800, 0xAAC8F880,
-	0xAAC7D900, 0xAAC6B980, 0xAAC59A00,
-	0xAAC47A80, 0xAAC35B00, 0xAAC23B80,
-	0xAAC11C00, 0xAABFFC80, 0xAABEDD00,
-	0xAABDBD80, 0xAABC9E00, 0xAABB7E80,
-	0xAABA5F00, 0xAAB93F80, 0xAAB82000,
-	0xAAB70080, 0xAAB5E100, 0xAAB4C180,
-	0xAAB3A200, 0xAAB28280, 0xAAB16300,
-	0xAAB04380, 0xAAAF2400, 0xAAAE0480,
-	0xAAACE500, 0xAAABC580, 0xAAAAA600,
-	0xAAA98680, 0xAAA86700, 0xAAA74780,
-	0xAAA62800, 0xAAA50880, 0xAAA3E900,
-	0xAAA2C980, 0xAAA1AA00, 0xAAA08A80,
-	0xAA9F6B00, 0xAA9E4B80, 0xAA9D2C00,
-	0xAA9C0C80, 0xAA9AED00, 0xAA99CD80,
-	0xAA98AE00, 0xAA978E80, 0xAA966F00,
-	0xAA954F80, 0xAA943000, 0xAA931080,
-	0xAA91F100, 0xAA90D180, 0xAA8FB200,
-	0xAA8E9280, 0xAA8D7300, 0xAA8C5380,
-	0xAA8B3400, 0xAA8A1480, 0xAA88F500,
-	0xAA87D580, 0xAA86B600, 0xAA859680,
-	0xAA847700, 0xAA835780, 0xAA823800,
-	0xAA811880, 0xAA7FF900, 0xAA7ED980,
-	0xAA7DBA00, 0xAA7C9A80, 0xAA7B7B00,
-	0xAA7A5B80, 0xAA793C00, 0xAA781C80,
-	0xAA76FD00, 0xAA75DD80, 0xAA74BE00,
-	0xAA739E80, 0xAA727F00, 0xAA715F80,
-	0xAA704000, 0xAA6F2080, 0xAA6E0100,
-	0xAA6CE180, 0xAA6BC200, 0xAA6AA280,
-	0xAA698300, 0xAA686380, 0xAA674400,
-	0xAA662480, 0xAA650500, 0xAA63E580,
-	0xAA62C600, 0xAA61A680, 0xAA608700,
-	0xAA5F6780, 0xAA5E4800, 0xAA5D2880,
-	0xAA5C0900, 0xAA5AE980, 0xAA59CA00,
-	0xAA58AA80, 0xAA578B00, 0xAA566B80,
-	0xAA554C00, 0xAA542C80, 0xAA530D00,
-	0xAA51ED80, 0xAA50CE00, 0xAA4FAE80,
-	0xAA4E8F00, 0xAA4D6F80, 0xAA4C5000,
-	0xAA4B3080, 0xAA4A1100, 0xAA48F180,
-	0xAA47D200, 0xAA46B280, 0xAA459300,
-	0xAA447380, 0xAA435400, 0xAA423480,
-	0xAA411500, 0xAA3FF580, 0xAA3ED600,
-	0xAA3DB680, 0xAA3C9700, 0xAA3B7780,
-	0xAA3A5800, 0xAA393880, 0xAA381900,
-	0xAA36F980, 0xAA35DA00, 0xAA34BA80,
-	0xAA339B00, 0xAA327B80, 0xAA315C00,
-	0xAA303C80, 0xAA2F1D00, 0xAA2DFD80,
-	0xAA2CDE00, 0xAA2BBE80, 0xAA2A9F00,
-	0xAA297F80, 0xAA286000, 0xAA274080,
-	0xAA262100, 0xAA250180, 0xAA23E200,
-	0xAA22C280, 0xAA21A300, 0xAA208380,
-	0xAA1F6400, 0xAA1E4480, 0xAA1D2500,
-	0xAA1C0580, 0xAA1AE600, 0xAA19C680,
-	0xAA18A700, 0xAA178780, 0xAA166800,
-	0xAA154880, 0xAA142900, 0xAA130980,
-	0xAA11EA00, 0xAA10CA80, 0xAA0FAB00,
-	0xAA0E8B80, 0xAA0D6C00, 0xAA0C4C80,
-	0xAA0B2D00, 0xAA0A0D80, 0xAA08EE00,
-	0xAA07CE80, 0xAA06AF00, 0xAA058F80,
-	0xAA047000, 0xAA035080, 0xAA023100,
-	0xAA011180, 0xA9FFF200, 0xA9FED280,
-	0xA9FDB300, 0xA9FC9380, 0xA9FB7400,
-	0xA9FA5480, 0xA9F93500, 0xA9F81580,
-	0xA9F6F600, 0xA9F5D680, 0xA9F4B700,
-	0xA9F39780, 0xA9F27800, 0xA9F15880,
-	0xA9F03900, 0xA9EF1980, 0xA9EDFA00,
-	0xA9ECDA80, 0xA9EBBB00, 0xA9EA9B80,
-	0xA9E97C00, 0xA9E85C80, 0xA9E73D00,
-	0xA9E61D80, 0xA9E4FE00, 0xA9E3DE80,
-	0xA9E2BF00, 0xA9E19F80, 0xA9E08000,
-	0xA9DF6080, 0xA9DE4100, 0xA9DD2180,
-	0xA9DC0200, 0xA9DAE280, 0xA9D9C300,
-	0xA9D8A380, 0xA9D78400, 0xA9D66480,
-	0xA9D54500, 0xA9D42580, 0xA9D30600,
-	0xA9D1E680, 0xA9D0C700, 0xA9CFA780,
-	0xA9CE8800, 0xA9CD6880, 0xA9CC4900,
-	0xA9CB2980, 0xA9CA0A00, 0xA9C8EA80,
-	0xA9C7CB00, 0xA9C6AB80, 0xA9C58C00,
-	0xA9C46C80, 0xA9C34D00, 0xA9C22D80,
-	0xA9C10E00, 0xA9BFEE80, 0xA9BECF00,
-	0xA9BDAF80, 0xA9BC9000, 0xA9BB7080,
-	0xA9BA5100, 0xA9B93180, 0xA9B81200,
-	0xA9B6F280, 0xA9B5D300, 0xA9B4B380,
-	0xA9B39400, 0xA9B27480, 0xA9B15500,
-	0xA9B03580, 0xA9AF1600, 0xA9ADF680,
-	0xA9ACD700, 0xA9ABB780, 0xA9AA9800,
-	0xA9A97880, 0xA9A85900, 0xA9A73980,
-	0xA9A61A00, 0xA9A4FA80, 0xA9A3DB00,
-	0xA9A2BB80, 0xA9A19C00, 0xA9A07C80,
-	0xA99F5D00, 0xA99E3D80, 0xA99D1E00,
-	0xA99BFE80, 0xA99ADF00, 0xA999BF80,
-	0xA998A000, 0xA9978080, 0xA9966100,
-	0xA9954180, 0xA9942200, 0xA9930280,
-	0xA991E300, 0xA990C380, 0xA98FA400,
-	0xA98E8480, 0xA98D6500, 0xA98C4580,
-	0xA98B2600, 0xA98A0680, 0xA988E700,
-	0xA987C780, 0xA986A800, 0xA9858880,
-	0xA9846900, 0xA9834980, 0xA9822A00,
-	0xA9810A80, 0xA97FEB00, 0xA97ECB80,
-	0xA97DAC00, 0xA97C8C80, 0xA97B6D00,
-	0xA97A4D80, 0xA9792E00, 0xA9780E80,
-	0xA976EF00, 0xA975CF80, 0xA974B000,
-	0xA9739080, 0xA9727100, 0xA9715180,
-	0xA9703200, 0xA96F1280, 0xA96DF300,
-	0xA96CD380, 0xA96BB400, 0xA96A9480,
-	0xA9697500, 0xA9685580, 0xA9673600,
-	0xA9661680, 0xA964F700, 0xA963D780,
-	0xA962B800, 0xA9619880, 0xA9607900,
-	0xA95F5980, 0xA95E3A00, 0xA95D1A80,
-	0xA95BFB00, 0xA95ADB80, 0xA959BC00,
-	0xA9589C80, 0xA9577D00, 0xA9565D80,
-	0xA9553E00, 0xA9541E80, 0xA952FF00,
-	0xA951DF80, 0xA950C000, 0xA94FA080,
-	0xA94E8100, 0xA94D6180, 0xA94C4200,
-	0xA94B2280, 0xA94A0300, 0xA948E380,
-	0xA947C400, 0xA946A480, 0xA9458500,
-	0xA9446580, 0xA9434600, 0xA9422680,
-	0xA9410700, 0xA93FE780, 0xA93EC800,
-	0xA93DA880, 0xA93C8900, 0xA93B6980,
-	0xA93A4A00, 0xA9392A80, 0xA9380B00,
-	0xA936EB80, 0xA935CC00, 0xA934AC80,
-	0xA9338D00, 0xA9326D80, 0xA9314E00,
-	0xA9302E80, 0xA92F0F00, 0xA92DEF80,
-	0xA92CD000, 0xA92BB080, 0xA92A9100,
-	0xA9297180, 0xA9285200, 0xA9273280,
-	0xA9261300, 0xA924F380, 0xA923D400,
-	0xA922B480, 0xA9219500, 0xA9207580,
-	0xA91F5600, 0xA91E3680, 0xA91D1700,
-	0xA91BF780, 0xA91AD800, 0xA919B880,
-	0xA9189900, 0xA9177980, 0xA9165A00,
-	0xA9153A80, 0xA9141B00, 0xA912FB80,
-	0xA911DC00, 0xA910BC80, 0xA90F9D00,
-	0xA90E7D80, 0xA90D5E00, 0xA90C3E80,
-	0xA90B1F00, 0xA909FF80, 0xA908E000,
-	0xA907C080, 0xA906A100, 0xA9058180,
-	0xA9046200, 0xA9034280, 0xA9022300,
-	0xA9010380, 0xA8FFE400, 0xA8FEC480,
-	0xA8FDA500, 0xA8FC8580, 0xA8FB6600,
-	0xA8FA4680, 0xA8F92700, 0xA8F80780,
-	0xA8F6E800, 0xA8F5C880, 0xA8F4A900,
-	0xA8F38980, 0xA8F26A00, 0xA8F14A80,
-	0xA8F02B00, 0xA8EF0B80, 0xA8EDEC00,
-	0xA8ECCC80, 0xA8EBAD00, 0xA8EA8D80,
-	0xA8E96E00, 0xA8E84E80, 0xA8E72F00,
-	0xA8E60F80, 0xA8E4F000, 0xA8E3D080,
-	0xA8E2B100, 0xA8E19180, 0xA8E07200,
-	0xA8DF5280, 0xA8DE3300, 0xA8DD1380,
-	0xA8DBF400, 0xA8DAD480, 0xA8D9B500,
-	0xA8D89580, 0xA8D77600, 0xA8D65680,
-	0xA8D53700, 0xA8D41780, 0xA8D2F800,
-	0xA8D1D880, 0xA8D0B900, 0xA8CF9980,
-	0xA8CE7A00, 0xA8CD5A80, 0xA8CC3B00,
-	0xA8CB1B80, 0xA8C9FC00, 0xA8C8DC80,
-	0xA8C7BD00, 0xA8C69D80, 0xA8C57E00,
-	0xA8C45E80, 0xA8C33F00, 0xA8C21F80,
-	0xA8C10000, 0xA8BFE080, 0xA8BEC100,
-	0xA8BDA180, 0xA8BC8200, 0xA8BB6280,
-	0xA8BA4300, 0xA8B92380, 0xA8B80400,
-	0xA8B6E480, 0xA8B5C500, 0xA8B4A580,
-	0xA8B38600, 0xA8B26680, 0xA8B14700,
-	0xA8B02780, 0xA8AF0800, 0xA8ADE880,
-	0xA8ACC900, 0xA8ABA980, 0xA8AA8A00,
-	0xA8A96A80, 0xA8A84B00, 0xA8A72B80,
-	0xA8A60C00, 0xA8A4EC80, 0xA8A3CD00,
-	0xA8A2AD80, 0xA8A18E00, 0xA8A06E80,
-	0xA89F4F00, 0xA89E2F80, 0xA89D1000,
-	0xA89BF080, 0xA89AD100, 0xA899B180,
-	0xA8989200, 0xA8977280, 0xA8965300,
-	0xA8953380, 0xA8941400, 0xA892F480,
-	0xA891D500, 0xA890B580, 0xA88F9600,
-	0xA88E7680, 0xA88D5700, 0xA88C3780,
-	0xA88B1800, 0xA889F880, 0xA888D900,
-	0xA887B980, 0xA8869A00, 0xA8857A80,
-	0xA8845B00, 0xA8833B80, 0xA8821C00,
-	0xA880FC80, 0xA87FDD00, 0xA87EBD80,
-	0xA87D9E00, 0xA87C7E80, 0xA87B5F00,
-	0xA87A3F80, 0xA8792000, 0xA8780080,
-	0xA876E100, 0xA875C180, 0xA874A200,
-	0xA8738280, 0xA8726300, 0xA8714380,
-	0xA8702400, 0xA86F0480, 0xA86DE500,
-	0xA86CC580, 0xA86BA600, 0xA86A8680,
-	0xA8696700, 0xA8684780, 0xA8672800,
-	0xA8660880, 0xA864E900, 0xA863C980,
-	0xA862AA00, 0xA8618A80, 0xA8606B00,
-	0xA85F4B80, 0xA85E2C00, 0xA85D0C80,
-	0xA85BED00, 0xA85ACD80, 0xA859AE00,
-	0xA8588E80, 0xA8576F00, 0xA8564F80,
-	0xA8553000, 0xA8541080, 0xA852F100,
-	0xA851D180, 0xA850B200, 0xA84F9280,
-	0xA84E7300, 0xA84D5380, 0xA84C3400,
-	0xA84B1480, 0xA849F500, 0xA848D580,
-	0xA847B600, 0xA8469680, 0xA8457700,
-	0xA8445780, 0xA8433800, 0xA8421880,
-	0xA840F900, 0xA83FD980, 0xA83EBA00,
-	0xA83D9A80, 0xA83C7B00, 0xA83B5B80,
-	0xA83A3C00, 0xA8391C80, 0xA837FD00,
-	0xA836DD80, 0xA835BE00, 0xA8349E80,
-	0xA8337F00, 0xA8325F80, 0xA8314000,
-	0xA8302080, 0xA82F0100, 0xA82DE180,
-	0xA82CC200, 0xA82BA280, 0xA82A8300,
-	0xA8296380, 0xA8284400, 0xA8272480,
-	0xA8260500, 0xA824E580, 0xA823C600,
-	0xA822A680, 0xA8218700, 0xA8206780,
-	0xA81F4800, 0xA81E2880, 0xA81D0900,
-	0xA81BE980, 0xA81ACA00, 0xA819AA80,
-	0xA8188B00, 0xA8176B80, 0xA8164C00,
-	0xA8152C80, 0xA8140D00, 0xA812ED80,
-	0xA811CE00, 0xA810AE80, 0xA80F8F00,
-	0xA80E6F80, 0xA80D5000, 0xA80C3080,
-	0xA80B1100, 0xA809F180, 0xA808D200,
-	0xA807B280, 0xA8069300, 0xA8057380,
-	0xA8045400, 0xA8033480, 0xA8021500,
-	0xA800F580, 0xA7FFD600, 0xA7FEB680,
-	0xA7FD9700, 0xA7FC7780, 0xA7FB5800,
-	0xA7FA3880, 0xA7F91900, 0xA7F7F980,
-	0xA7F6DA00, 0xA7F5BA80, 0xA7F49B00,
-	0xA7F37B80, 0xA7F25C00, 0xA7F13C80,
-	0xA7F01D00, 0xA7EEFD80, 0xA7EDDE00,
-	0xA7ECBE80, 0xA7EB9F00, 0xA7EA7F80,
-	0xA7E96000, 0xA7E84080, 0xA7E72100,
-	0xA7E60180, 0xA7E4E200, 0xA7E3C280,
-	0xA7E2A300, 0xA7E18380, 0xA7E06400,
-	0xA7DF4480, 0xA7DE2500, 0xA7DD0580,
-	0xA7DBE600, 0xA7DAC680, 0xA7D9A700,
-	0xA7D88780, 0xA7D76800, 0xA7D64880,
-	0xA7D52900, 0xA7D40980, 0xA7D2EA00,
-	0xA7D1CA80, 0xA7D0AB00, 0xA7CF8B80,
-	0xA7CE6C00, 0xA7CD4C80, 0xA7CC2D00,
-	0xA7CB0D80, 0xA7C9EE00, 0xA7C8CE80,
-	0xA7C7AF00, 0xA7C68F80, 0xA7C57000,
-	0xA7C45080, 0xA7C33100, 0xA7C21180,
-	0xA7C0F200, 0xA7BFD280, 0xA7BEB300,
-	0xA7BD9380, 0xA7BC7400, 0xA7BB5480,
-	0xA7BA3500, 0xA7B91580, 0xA7B7F600,
-	0xA7B6D680, 0xA7B5B700, 0xA7B49780,
-	0xA7B37800, 0xA7B25880, 0xA7B13900,
-	0xA7B01980, 0xA7AEFA00, 0xA7ADDA80,
-	0xA7ACBB00, 0xA7AB9B80, 0xA7AA7C00,
-	0xA7A95C80, 0xA7A83D00, 0xA7A71D80,
-	0xA7A5FE00, 0xA7A4DE80, 0xA7A3BF00,
-	0xA7A29F80, 0xA7A18000, 0xA7A06080,
-	0xA79F4100, 0xA79E2180, 0xA79D0200,
-	0xA79BE280, 0xA79AC300, 0xA799A380,
-	0xA7988400, 0xA7976480, 0xA7964500,
-	0xA7952580, 0xA7940600, 0xA792E680,
-	0xA791C700, 0xA790A780, 0xA78F8800,
-	0xA78E6880, 0xA78D4900, 0xA78C2980,
-	0xA78B0A00, 0xA789EA80, 0xA788CB00,
-	0xA787AB80, 0xA7868C00, 0xA7856C80,
-	0xA7844D00, 0xA7832D80, 0xA7820E00,
-	0xA780EE80, 0xA77FCF00, 0xA77EAF80,
-	0xA77D9000, 0xA77C7080, 0xA77B5100,
-	0xA77A3180, 0xA7791200, 0xA777F280,
-	0xA776D300, 0xA775B380, 0xA7749400,
-	0xA7737480, 0xA7725500, 0xA7713580,
-	0xA7701600, 0xA76EF680, 0xA76DD700,
-	0xA76CB780, 0xA76B9800, 0xA76A7880,
-	0xA7695900, 0xA7683980, 0xA7671A00,
-	0xA765FA80, 0xA764DB00, 0xA763BB80,
-	0xA7629C00, 0xA7617C80, 0xA7605D00,
-	0xA75F3D80, 0xA75E1E00, 0xA75CFE80,
-	0xA75BDF00, 0xA75ABF80, 0xA759A000,
-	0xA7588080, 0xA7576100, 0xA7564180,
-	0xA7552200, 0xA7540280, 0xA752E300,
-	0xA751C380, 0xA750A400, 0xA74F8480,
-	0xA74E6500, 0xA74D4580, 0xA74C2600,
-	0xA74B0680, 0xA749E700, 0xA748C780,
-	0xA747A800, 0xA7468880, 0xA7456900,
-	0xA7444980, 0xA7432A00, 0xA7420A80,
-	0xA740EB00, 0xA73FCB80, 0xA73EAC00,
-	0xA73D8C80, 0xA73C6D00, 0xA73B4D80,
-	0xA73A2E00, 0xA7390E80, 0xA737EF00,
-	0xA736CF80, 0xA735B000, 0xA7349080,
-	0xA7337100, 0xA7325180, 0xA7313200,
-	0xA7301280, 0xA72EF300, 0xA72DD380,
-	0xA72CB400, 0xA72B9480, 0xA72A7500,
-	0xA7295580, 0xA7283600, 0xA7271680,
-	0xA725F700, 0xA724D780, 0xA723B800,
-	0xA7229880, 0xA7217900, 0xA7205980,
-	0xA71F3A00, 0xA71E1A80, 0xA71CFB00,
-	0xA71BDB80, 0xA71ABC00, 0xA7199C80,
-	0xA7187D00, 0xA7175D80, 0xA7163E00,
-	0xA7151E80, 0xA713FF00, 0xA712DF80,
-	0xA711C000, 0xA710A080, 0xA70F8100,
-	0xA70E6180, 0xA70D4200, 0xA70C2280,
-	0xA70B0300, 0xA709E380, 0xA708C400,
-	0xA707A480, 0xA7068500, 0xA7056580,
-	0xA7044600, 0xA7032680, 0xA7020700,
-	0xA700E780, 0xA6FFC800, 0xA6FEA880,
-	0xA6FD8900, 0xA6FC6980, 0xA6FB4A00,
-	0xA6FA2A80, 0xA6F90B00, 0xA6F7EB80,
-	0xA6F6CC00, 0xA6F5AC80, 0xA6F48D00,
-	0xA6F36D80, 0xA6F24E00, 0xA6F12E80,
-	0xA6F00F00, 0xA6EEEF80, 0xA6EDD000,
-	0xA6ECB080, 0xA6EB9100, 0xA6EA7180,
-	0xA6E95200, 0xA6E83280, 0xA6E71300,
-	0xA6E5F380, 0xA6E4D400, 0xA6E3B480,
-	0xA6E29500, 0xA6E17580, 0xA6E05600,
-	0xA6DF3680, 0xA6DE1700, 0xA6DCF780,
-	0xA6DBD800, 0xA6DAB880, 0xA6D99900,
-	0xA6D87980, 0xA6D75A00, 0xA6D63A80,
-	0xA6D51B00, 0xA6D3FB80, 0xA6D2DC00,
-	0xA6D1BC80, 0xA6D09D00, 0xA6CF7D80,
-	0xA6CE5E00, 0xA6CD3E80, 0xA6CC1F00,
-	0xA6CAFF80, 0xA6C9E000, 0xA6C8C080,
-	0xA6C7A100, 0xA6C68180, 0xA6C56200,
-	0xA6C44280, 0xA6C32300, 0xA6C20380,
-	0xA6C0E400, 0xA6BFC480, 0xA6BEA500,
-	0xA6BD8580, 0xA6BC6600, 0xA6BB4680,
-	0xA6BA2700, 0xA6B90780, 0xA6B7E800,
-	0xA6B6C880, 0xA6B5A900, 0xA6B48980,
-	0xA6B36A00, 0xA6B24A80, 0xA6B12B00,
-	0xA6B00B80, 0xA6AEEC00, 0xA6ADCC80,
-	0xA6ACAD00, 0xA6AB8D80, 0xA6AA6E00,
-	0xA6A94E80, 0xA6A82F00, 0xA6A70F80,
-	0xA6A5F000, 0xA6A4D080, 0xA6A3B100,
-	0xA6A29180, 0xA6A17200, 0xA6A05280,
-	0xA69F3300, 0xA69E1380, 0xA69CF400,
-	0xA69BD480, 0xA69AB500, 0xA6999580,
-	0xA6987600, 0xA6975680, 0xA6963700,
-	0xA6951780, 0xA693F800, 0xA692D880,
-	0xA691B900, 0xA6909980, 0xA68F7A00,
-	0xA68E5A80, 0xA68D3B00, 0xA68C1B80,
-	0xA68AFC00, 0xA689DC80, 0xA688BD00,
-	0xA6879D80, 0xA6867E00, 0xA6855E80,
-	0xA6843F00, 0xA6831F80, 0xA6820000,
-	0xA680E080, 0xA67FC100, 0xA67EA180,
-	0xA67D8200, 0xA67C6280, 0xA67B4300,
-	0xA67A2380, 0xA6790400, 0xA677E480,
-	0xA676C500, 0xA675A580, 0xA6748600,
-	0xA6736680, 0xA6724700, 0xA6712780,
-	0xA6700800, 0xA66EE880, 0xA66DC900,
-	0xA66CA980, 0xA66B8A00, 0xA66A6A80,
-	0xA6694B00, 0xA6682B80, 0xA6670C00,
-	0xA665EC80, 0xA664CD00, 0xA663AD80,
-	0xA6628E00, 0xA6616E80, 0xA6604F00,
-	0xA65F2F80, 0xA65E1000, 0xA65CF080,
-	0xA65BD100, 0xA65AB180, 0xA6599200,
-	0xA6587280, 0xA6575300, 0xA6563380,
-	0xA6551400, 0xA653F480, 0xA652D500,
-	0xA651B580, 0xA6509600, 0xA64F7680,
-	0xA64E5700, 0xA64D3780, 0xA64C1800,
-	0xA64AF880, 0xA649D900, 0xA648B980,
-	0xA6479A00, 0xA6467A80, 0xA6455B00,
-	0xA6443B80, 0xA6431C00, 0xA641FC80,
-	0xA640DD00, 0xA63FBD80, 0xA63E9E00,
-	0xA63D7E80, 0xA63C5F00, 0xA63B3F80,
-	0xA63A2000, 0xA6390080, 0xA637E100,
-	0xA636C180, 0xA635A200, 0xA6348280,
-	0xA6336300, 0xA6324380, 0xA6312400,
-	0xA6300480, 0xA62EE500, 0xA62DC580,
-	0xA62CA600, 0xA62B8680, 0xA62A6700,
-	0xA6294780, 0xA6282800, 0xA6270880,
-	0xA625E900, 0xA624C980, 0xA623AA00,
-	0xA6228A80, 0xA6216B00, 0xA6204B80,
-	0xA61F2C00, 0xA61E0C80, 0xA61CED00,
-	0xA61BCD80, 0xA61AAE00, 0xA6198E80,
-	0xA6186F00, 0xA6174F80, 0xA6163000,
-	0xA6151080, 0xA613F100, 0xA612D180,
-	0xA611B200, 0xA6109280, 0xA60F7300,
-	0xA60E5380, 0xA60D3400, 0xA60C1480,
-	0xA60AF500, 0xA609D580, 0xA608B600,
-	0xA6079680, 0xA6067700, 0xA6055780,
-	0xA6043800, 0xA6031880, 0xA601F900,
-	0xA600D980, 0xA5FFBA00, 0xA5FE9A80,
-	0xA5FD7B00, 0xA5FC5B80, 0xA5FB3C00,
-	0xA5FA1C80, 0xA5F8FD00, 0xA5F7DD80,
-	0xA5F6BE00, 0xA5F59E80, 0xA5F47F00,
-	0xA5F35F80, 0xA5F24000, 0xA5F12080,
-	0xA5F00100, 0xA5EEE180, 0xA5EDC200,
-	0xA5ECA280, 0xA5EB8300, 0xA5EA6380,
-	0xA5E94400, 0xA5E82480, 0xA5E70500,
-	0xA5E5E580, 0xA5E4C600, 0xA5E3A680,
-	0xA5E28700, 0xA5E16780, 0xA5E04800,
-	0xA5DF2880, 0xA5DE0900, 0xA5DCE980,
-	0xA5DBCA00, 0xA5DAAA80, 0xA5D98B00,
-	0xA5D86B80, 0xA5D74C00, 0xA5D62C80,
-	0xA5D50D00, 0xA5D3ED80, 0xA5D2CE00,
-	0xA5D1AE80, 0xA5D08F00, 0xA5CF6F80,
-	0xA5CE5000, 0xA5CD3080, 0xA5CC1100,
-	0xA5CAF180, 0xA5C9D200, 0xA5C8B280,
-	0xA5C79300, 0xA5C67380, 0xA5C55400,
-	0xA5C43480, 0xA5C31500, 0xA5C1F580,
-	0xA5C0D600, 0xA5BFB680, 0xA5BE9700,
-	0xA5BD7780, 0xA5BC5800, 0xA5BB3880,
-	0xA5BA1900, 0xA5B8F980, 0xA5B7DA00,
-	0xA5B6BA80, 0xA5B59B00, 0xA5B47B80,
-	0xA5B35C00, 0xA5B23C80, 0xA5B11D00,
-	0xA5AFFD80, 0xA5AEDE00, 0xA5ADBE80,
-	0xA5AC9F00, 0xA5AB7F80, 0xA5AA6000,
-	0xA5A94080, 0xA5A82100, 0xA5A70180,
-	0xA5A5E200, 0xA5A4C280, 0xA5A3A300,
-	0xA5A28380, 0xA5A16400, 0xA5A04480,
-	0xA59F2500, 0xA59E0580, 0xA59CE600,
-	0xA59BC680, 0xA59AA700, 0xA5998780,
-	0xA5986800, 0xA5974880, 0xA5962900,
-	0xA5950980, 0xA593EA00, 0xA592CA80,
-	0xA591AB00, 0xA5908B80, 0xA58F6C00,
-	0xA58E4C80, 0xA58D2D00, 0xA58C0D80,
-	0xA58AEE00, 0xA589CE80, 0xA588AF00,
-	0xA5878F80, 0xA5867000, 0xA5855080,
-	0xA5843100, 0xA5831180, 0xA581F200,
-	0xA580D280, 0xA57FB300, 0xA57E9380,
-	0xA57D7400, 0xA57C5480, 0xA57B3500,
-	0xA57A1580, 0xA578F600, 0xA577D680,
-	0xA576B700, 0xA5759780, 0xA5747800,
-	0xA5735880, 0xA5723900, 0xA5711980,
-	0xA56FFA00, 0xA56EDA80, 0xA56DBB00,
-	0xA56C9B80, 0xA56B7C00, 0xA56A5C80,
-	0xA5693D00, 0xA5681D80, 0xA566FE00,
-	0xA565DE80, 0xA564BF00, 0xA5639F80,
-	0xA5628000, 0xA5616080, 0xA5604100,
-	0xA55F2180, 0xA55E0200, 0xA55CE280,
-	0xA55BC300, 0xA55AA380, 0xA5598400,
-	0xA5586480, 0xA5574500, 0xA5562580,
-	0xA5550600, 0xA553E680, 0xA552C700,
-	0xA551A780, 0xA5508800, 0xA54F6880,
-	0xA54E4900, 0xA54D2980, 0xA54C0A00,
-	0xA54AEA80, 0xA549CB00, 0xA548AB80,
-	0xA5478C00, 0xA5466C80, 0xA5454D00,
-	0xA5442D80, 0xA5430E00, 0xA541EE80,
-	0xA540CF00, 0xA53FAF80, 0xA53E9000,
-	0xA53D7080, 0xA53C5100, 0xA53B3180,
-	0xA53A1200, 0xA538F280, 0xA537D300,
-	0xA536B380, 0xA5359400, 0xA5347480,
-	0xA5335500, 0xA5323580, 0xA5311600,
-	0xA52FF680, 0xA52ED700, 0xA52DB780,
-	0xA52C9800, 0xA52B7880, 0xA52A5900,
-	0xA5293980, 0xA5281A00, 0xA526FA80,
-	0xA525DB00, 0xA524BB80, 0xA5239C00,
-	0xA5227C80, 0xA5215D00, 0xA5203D80,
-	0xA51F1E00, 0xA51DFE80, 0xA51CDF00,
-	0xA51BBF80, 0xA51AA000, 0xA5198080,
-	0xA5186100, 0xA5174180, 0xA5162200,
-	0xA5150280, 0xA513E300, 0xA512C380,
-	0xA511A400, 0xA5108480, 0xA50F6500,
-	0xA50E4580, 0xA50D2600, 0xA50C0680,
-	0xA50AE700, 0xA509C780, 0xA508A800,
-	0xA5078880, 0xA5066900, 0xA5054980,
-	0xA5042A00, 0xA5030A80, 0xA501EB00,
-	0xA500CB80, 0xA4FFAC00, 0xA4FE8C80,
-	0xA4FD6D00, 0xA4FC4D80, 0xA4FB2E00,
-	0xA4FA0E80, 0xA4F8EF00, 0xA4F7CF80,
-	0xA4F6B000, 0xA4F59080, 0xA4F47100,
-	0xA4F35180, 0xA4F23200, 0xA4F11280,
-	0xA4EFF300, 0xA4EED380, 0xA4EDB400,
-	0xA4EC9480, 0xA4EB7500, 0xA4EA5580,
-	0xA4E93600, 0xA4E81680, 0xA4E6F700,
-	0xA4E5D780, 0xA4E4B800, 0xA4E39880,
-	0xA4E27900, 0xA4E15980, 0xA4E03A00,
-	0xA4DF1A80, 0xA4DDFB00, 0xA4DCDB80,
-	0xA4DBBC00, 0xA4DA9C80, 0xA4D97D00,
-	0xA4D85D80, 0xA4D73E00, 0xA4D61E80,
-	0xA4D4FF00, 0xA4D3DF80, 0xA4D2C000,
-	0xA4D1A080, 0xA4D08100, 0xA4CF6180,
-	0xA4CE4200, 0xA4CD2280, 0xA4CC0300,
-	0xA4CAE380, 0xA4C9C400, 0xA4C8A480,
-	0xA4C78500, 0xA4C66580, 0xA4C54600,
-	0xA4C42680, 0xA4C30700, 0xA4C1E780,
-	0xA4C0C800, 0xA4BFA880, 0xA4BE8900,
-	0xA4BD6980, 0xA4BC4A00, 0xA4BB2A80,
-	0xA4BA0B00, 0xA4B8EB80, 0xA4B7CC00,
-	0xA4B6AC80, 0xA4B58D00, 0xA4B46D80,
-	0xA4B34E00, 0xA4B22E80, 0xA4B10F00,
-	0xA4AFEF80, 0xA4AED000, 0xA4ADB080,
-	0xA4AC9100, 0xA4AB7180, 0xA4AA5200,
-	0xA4A93280, 0xA4A81300, 0xA4A6F380,
-	0xA4A5D400, 0xA4A4B480, 0xA4A39500,
-	0xA4A27580, 0xA4A15600, 0xA4A03680,
-	0xA49F1700, 0xA49DF780, 0xA49CD800,
-	0xA49BB880, 0xA49A9900, 0xA4997980,
-	0xA4985A00, 0xA4973A80, 0xA4961B00,
-	0xA494FB80, 0xA493DC00, 0xA492BC80,
-	0xA4919D00, 0xA4907D80, 0xA48F5E00,
-	0xA48E3E80, 0xA48D1F00, 0xA48BFF80,
-	0xA48AE000, 0xA489C080, 0xA488A100,
-	0xA4878180, 0xA4866200, 0xA4854280,
-	0xA4842300, 0xA4830380, 0xA481E400,
-	0xA480C480, 0xA47FA500, 0xA47E8580,
-	0xA47D6600, 0xA47C4680, 0xA47B2700,
-	0xA47A0780, 0xA478E800, 0xA477C880,
-	0xA476A900, 0xA4758980, 0xA4746A00,
-	0xA4734A80, 0xA4722B00, 0xA4710B80,
-	0xA46FEC00, 0xA46ECC80, 0xA46DAD00,
-	0xA46C8D80, 0xA46B6E00, 0xA46A4E80,
-	0xA4692F00, 0xA4680F80, 0xA466F000,
-	0xA465D080, 0xA464B100, 0xA4639180,
-	0xA4627200, 0xA4615280, 0xA4603300,
-	0xA45F1380, 0xA45DF400, 0xA45CD480,
-	0xA45BB500, 0xA45A9580, 0xA4597600,
-	0xA4585680, 0xA4573700, 0xA4561780,
-	0xA454F800, 0xA453D880, 0xA452B900,
-	0xA4519980, 0xA4507A00, 0xA44F5A80,
-	0xA44E3B00, 0xA44D1B80, 0xA44BFC00,
-	0xA44ADC80, 0xA449BD00, 0xA4489D80,
-	0xA4477E00, 0xA4465E80, 0xA4453F00,
-	0xA4441F80, 0xA4430000, 0xA441E080,
-	0xA440C100, 0xA43FA180, 0xA43E8200,
-	0xA43D6280, 0xA43C4300, 0xA43B2380,
-	0xA43A0400, 0xA438E480, 0xA437C500,
-	0xA436A580, 0xA4358600, 0xA4346680,
-	0xA4334700, 0xA4322780, 0xA4310800,
-	0xA42FE880, 0xA42EC900, 0xA42DA980,
-	0xA42C8A00, 0xA42B6A80, 0xA42A4B00,
-	0xA4292B80, 0xA4280C00, 0xA426EC80,
-	0xA425CD00, 0xA424AD80, 0xA4238E00,
-	0xA4226E80, 0xA4214F00, 0xA4202F80,
-	0xA41F1000, 0xA41DF080, 0xA41CD100,
-	0xA41BB180, 0xA41A9200, 0xA4197280,
-	0xA4185300, 0xA4173380, 0xA4161400,
-	0xA414F480, 0xA413D500, 0xA412B580,
-	0xA4119600, 0xA4107680, 0xA40F5700,
-	0xA40E3780, 0xA40D1800, 0xA40BF880,
-	0xA40AD900, 0xA409B980, 0xA4089A00,
-	0xA4077A80, 0xA4065B00, 0xA4053B80,
-	0xA4041C00, 0xA402FC80, 0xA401DD00,
-	0xA400BD80, 0xA3FF9E00, 0xA3FE7E80,
-	0xA3FD5F00, 0xA3FC3F80, 0xA3FB2000,
-	0xA3FA0080, 0xA3F8E100, 0xA3F7C180,
-	0xA3F6A200, 0xA3F58280, 0xA3F46300,
-	0xA3F34380, 0xA3F22400, 0xA3F10480,
-	0xA3EFE500, 0xA3EEC580, 0xA3EDA600,
-	0xA3EC8680, 0xA3EB6700, 0xA3EA4780,
-	0xA3E92800, 0xA3E80880, 0xA3E6E900,
-	0xA3E5C980, 0xA3E4AA00, 0xA3E38A80,
-	0xA3E26B00, 0xA3E14B80, 0xA3E02C00,
-	0xA3DF0C80, 0xA3DDED00, 0xA3DCCD80,
-	0xA3DBAE00, 0xA3DA8E80, 0xA3D96F00,
-	0xA3D84F80, 0xA3D73000, 0xA3D61080,
-	0xA3D4F100, 0xA3D3D180, 0xA3D2B200,
-	0xA3D19280, 0xA3D07300, 0xA3CF5380,
-	0xA3CE3400, 0xA3CD1480, 0xA3CBF500,
-	0xA3CAD580, 0xA3C9B600, 0xA3C89680,
-	0xA3C77700, 0xA3C65780, 0xA3C53800,
-	0xA3C41880, 0xA3C2F900, 0xA3C1D980,
-	0xA3C0BA00, 0xA3BF9A80, 0xA3BE7B00,
-	0xA3BD5B80, 0xA3BC3C00, 0xA3BB1C80,
-	0xA3B9FD00, 0xA3B8DD80, 0xA3B7BE00,
-	0xA3B69E80, 0xA3B57F00, 0xA3B45F80,
-	0xA3B34000, 0xA3B22080, 0xA3B10100,
-	0xA3AFE180, 0xA3AEC200, 0xA3ADA280,
-	0xA3AC8300, 0xA3AB6380, 0xA3AA4400,
-	0xA3A92480, 0xA3A80500, 0xA3A6E580,
-	0xA3A5C600, 0xA3A4A680, 0xA3A38700,
-	0xA3A26780, 0xA3A14800, 0xA3A02880,
-	0xA39F0900, 0xA39DE980, 0xA39CCA00,
-	0xA39BAA80, 0xA39A8B00, 0xA3996B80,
-	0xA3984C00, 0xA3972C80, 0xA3960D00,
-	0xA394ED80, 0xA393CE00, 0xA392AE80,
-	0xA3918F00, 0xA3906F80, 0xA38F5000,
-	0xA38E3080, 0xA38D1100, 0xA38BF180,
-	0xA38AD200, 0xA389B280, 0xA3889300,
-	0xA3877380, 0xA3865400, 0xA3853480,
-	0xA3841500, 0xA382F580, 0xA381D600,
-	0xA380B680, 0xA37F9700, 0xA37E7780,
-	0xA37D5800, 0xA37C3880, 0xA37B1900,
-	0xA379F980, 0xA378DA00, 0xA377BA80,
-	0xA3769B00, 0xA3757B80, 0xA3745C00,
-	0xA3733C80, 0xA3721D00, 0xA370FD80,
-	0xA36FDE00, 0xA36EBE80, 0xA36D9F00,
-	0xA36C7F80, 0xA36B6000, 0xA36A4080,
-	0xA3692100, 0xA3680180, 0xA366E200,
-	0xA365C280, 0xA364A300, 0xA3638380,
-	0xA3626400, 0xA3614480, 0xA3602500,
-	0xA35F0580, 0xA35DE600, 0xA35CC680,
-	0xA35BA700, 0xA35A8780, 0xA3596800,
-	0xA3584880, 0xA3572900, 0xA3560980,
-	0xA354EA00, 0xA353CA80, 0xA352AB00,
-	0xA3518B80, 0xA3506C00, 0xA34F4C80,
-	0xA34E2D00, 0xA34D0D80, 0xA34BEE00,
-	0xA34ACE80, 0xA349AF00, 0xA3488F80,
-	0xA3477000, 0xA3465080, 0xA3453100,
-	0xA3441180, 0xA342F200, 0xA341D280,
-	0xA340B300, 0xA33F9380, 0xA33E7400,
-	0xA33D5480, 0xA33C3500, 0xA33B1580,
-	0xA339F600, 0xA338D680, 0xA337B700,
-	0xA3369780, 0xA3357800, 0xA3345880,
-	0xA3333900, 0xA3321980, 0xA330FA00,
-	0xA32FDA80, 0xA32EBB00, 0xA32D9B80,
-	0xA32C7C00, 0xA32B5C80, 0xA32A3D00,
-	0xA3291D80, 0xA327FE00, 0xA326DE80,
-	0xA325BF00, 0xA3249F80, 0xA3238000,
-	0xA3226080, 0xA3214100, 0xA3202180,
-	0xA31F0200, 0xA31DE280, 0xA31CC300,
-	0xA31BA380, 0xA31A8400, 0xA3196480,
-	0xA3184500, 0xA3172580, 0xA3160600,
-	0xA314E680, 0xA313C700, 0xA312A780,
-	0xA3118800, 0xA3106880, 0xA30F4900,
-	0xA30E2980, 0xA30D0A00, 0xA30BEA80,
-	0xA30ACB00, 0xA309AB80, 0xA3088C00,
-	0xA3076C80, 0xA3064D00, 0xA3052D80,
-	0xA3040E00, 0xA302EE80, 0xA301CF00,
-	0xA300AF80, 0xA2FF9000, 0xA2FE7080,
-	0xA2FD5100, 0xA2FC3180, 0xA2FB1200,
-	0xA2F9F280, 0xA2F8D300, 0xA2F7B380,
-	0xA2F69400, 0xA2F57480, 0xA2F45500,
-	0xA2F33580, 0xA2F21600, 0xA2F0F680,
-	0xA2EFD700, 0xA2EEB780, 0xA2ED9800,
-	0xA2EC7880, 0xA2EB5900, 0xA2EA3980,
-	0xA2E91A00, 0xA2E7FA80, 0xA2E6DB00,
-	0xA2E5BB80, 0xA2E49C00, 0xA2E37C80,
-	0xA2E25D00, 0xA2E13D80, 0xA2E01E00,
-	0xA2DEFE80, 0xA2DDDF00, 0xA2DCBF80,
-	0xA2DBA000, 0xA2DA8080, 0xA2D96100,
-	0xA2D84180, 0xA2D72200, 0xA2D60280,
-	0xA2D4E300, 0xA2D3C380, 0xA2D2A400,
-	0xA2D18480, 0xA2D06500, 0xA2CF4580,
-	0xA2CE2600, 0xA2CD0680, 0xA2CBE700,
-	0xA2CAC780, 0xA2C9A800, 0xA2C88880,
-	0xA2C76900, 0xA2C64980, 0xA2C52A00,
-	0xA2C40A80, 0xA2C2EB00, 0xA2C1CB80,
-	0xA2C0AC00, 0xA2BF8C80, 0xA2BE6D00,
-	0xA2BD4D80, 0xA2BC2E00, 0xA2BB0E80,
-	0xA2B9EF00, 0xA2B8CF80, 0xA2B7B000,
-	0xA2B69080, 0xA2B57100, 0xA2B45180,
-	0xA2B33200, 0xA2B21280, 0xA2B0F300,
-	0xA2AFD380, 0xA2AEB400, 0xA2AD9480,
-	0xA2AC7500, 0xA2AB5580, 0xA2AA3600,
-	0xA2A91680, 0xA2A7F700, 0xA2A6D780,
-	0xA2A5B800, 0xA2A49880, 0xA2A37900,
-	0xA2A25980, 0xA2A13A00, 0xA2A01A80,
-	0xA29EFB00, 0xA29DDB80, 0xA29CBC00,
-	0xA29B9C80, 0xA29A7D00, 0xA2995D80,
-	0xA2983E00, 0xA2971E80, 0xA295FF00,
-	0xA294DF80, 0xA293C000, 0xA292A080,
-	0xA2918100, 0xA2906180, 0xA28F4200,
-	0xA28E2280, 0xA28D0300, 0xA28BE380,
-	0xA28AC400, 0xA289A480, 0xA2888500,
-	0xA2876580, 0xA2864600, 0xA2852680,
-	0xA2840700, 0xA282E780, 0xA281C800,
-	0xA280A880, 0xA27F8900, 0xA27E6980,
-	0xA27D4A00, 0xA27C2A80, 0xA27B0B00,
-	0xA279EB80, 0xA278CC00, 0xA277AC80,
-	0xA2768D00, 0xA2756D80, 0xA2744E00,
-	0xA2732E80, 0xA2720F00, 0xA270EF80,
-	0xA26FD000, 0xA26EB080, 0xA26D9100,
-	0xA26C7180, 0xA26B5200, 0xA26A3280,
-	0xA2691300, 0xA267F380, 0xA266D400,
-	0xA265B480, 0xA2649500, 0xA2637580,
-	0xA2625600, 0xA2613680, 0xA2601700,
-	0xA25EF780, 0xA25DD800, 0xA25CB880,
-	0xA25B9900, 0xA25A7980, 0xA2595A00,
-	0xA2583A80, 0xA2571B00, 0xA255FB80,
-	0xA254DC00, 0xA253BC80, 0xA2529D00,
-	0xA2517D80, 0xA2505E00, 0xA24F3E80,
-	0xA24E1F00, 0xA24CFF80, 0xA24BE000,
-	0xA24AC080, 0xA249A100, 0xA2488180,
-	0xA2476200, 0xA2464280, 0xA2452300,
-	0xA2440380, 0xA242E400, 0xA241C480,
-	0xA240A500, 0xA23F8580, 0xA23E6600,
-	0xA23D4680, 0xA23C2700, 0xA23B0780,
-	0xA239E800, 0xA238C880, 0xA237A900,
-	0xA2368980, 0xA2356A00, 0xA2344A80,
-	0xA2332B00, 0xA2320B80, 0xA230EC00,
-	0xA22FCC80, 0xA22EAD00, 0xA22D8D80,
-	0xA22C6E00, 0xA22B4E80, 0xA22A2F00,
-	0xA2290F80, 0xA227F000, 0xA226D080,
-	0xA225B100, 0xA2249180, 0xA2237200,
-	0xA2225280, 0xA2213300, 0xA2201380,
-	0xA21EF400, 0xA21DD480, 0xA21CB500,
-	0xA21B9580, 0xA21A7600, 0xA2195680,
-	0xA2183700, 0xA2171780, 0xA215F800,
-	0xA214D880, 0xA213B900, 0xA2129980,
-	0xA2117A00, 0xA2105A80, 0xA20F3B00,
-	0xA20E1B80, 0xA20CFC00, 0xA20BDC80,
-	0xA20ABD00, 0xA2099D80, 0xA2087E00,
-	0xA2075E80, 0xA2063F00, 0xA2051F80,
-	0xA2040000, 0xA202F180, 0xA201E300,
-	0xA200D480, 0xA1FFC600, 0xA1FEB780,
-	0xA1FDA900, 0xA1FC9A80, 0xA1FB8C00,
-	0xA1FA7D80, 0xA1F96F00, 0xA1F86080,
-	0xA1F75200, 0xA1F64380, 0xA1F53500,
-	0xA1F42680, 0xA1F31800, 0xA1F20980,
-	0xA1F0FB00, 0xA1EFEC80, 0xA1EEDE00,
-	0xA1EDCF80, 0xA1ECC100, 0xA1EBB280,
-	0xA1EAA400, 0xA1E99580, 0xA1E88700,
-	0xA1E77880, 0xA1E66A00, 0xA1E55B80,
-	0xA1E44D00, 0xA1E33E80, 0xA1E23000,
-	0xA1E12180, 0xA1E01300, 0xA1DF0480,
-	0xA1DDF600, 0xA1DCE780, 0xA1DBD900,
-	0xA1DACA80, 0xA1D9BC00, 0xA1D8AD80,
-	0xA1D79F00, 0xA1D69080, 0xA1D58200,
-	0xA1D47380, 0xA1D36500, 0xA1D25680,
-	0xA1D14800, 0xA1D03980, 0xA1CF2B00,
-	0xA1CE1C80, 0xA1CD0E00, 0xA1CBFF80,
-	0xA1CAF100, 0xA1C9E280, 0xA1C8D400,
-	0xA1C7C580, 0xA1C6B700, 0xA1C5A880,
-	0xA1C49A00, 0xA1C38B80, 0xA1C27D00,
-	0xA1C16E80, 0xA1C06000, 0xA1BF5180,
-	0xA1BE4300, 0xA1BD3480, 0xA1BC2600,
-	0xA1BB1780, 0xA1BA0900, 0xA1B8FA80,
-	0xA1B7EC00, 0xA1B6DD80, 0xA1B5CF00,
-	0xA1B4C080, 0xA1B3B200, 0xA1B2A380,
-	0xA1B19500, 0xA1B08680, 0xA1AF7800,
-	0xA1AE6980, 0xA1AD5B00, 0xA1AC4C80,
-	0xA1AB3E00, 0xA1AA2F80, 0xA1A92100,
-	0xA1A81280, 0xA1A70400, 0xA1A5F580,
-	0xA1A4E700, 0xA1A3D880, 0xA1A2CA00,
-	0xA1A1BB80, 0xA1A0AD00, 0xA19F9E80,
-	0xA19E9000, 0xA19D8180, 0xA19C7300,
-	0xA19B6480, 0xA19A5600, 0xA1994780,
-	0xA1983900, 0xA1972A80, 0xA1961C00,
-	0xA1950D80, 0xA193FF00, 0xA192F080,
-	0xA191E200, 0xA190D380, 0xA18FC500,
-	0xA18EB680, 0xA18DA800, 0xA18C9980,
-	0xA18B8B00, 0xA18A7C80, 0xA1896E00,
-	0xA1885F80, 0xA1875100, 0xA1864280,
-	0xA1853400, 0xA1842580, 0xA1831700,
-	0xA1820880, 0xA180FA00, 0xA17FEB80,
-	0xA17EDD00, 0xA17DCE80, 0xA17CC000,
-	0xA17BB180, 0xA17AA300, 0xA1799480,
-	0xA1788600, 0xA1777780, 0xA1766900,
-	0xA1755A80, 0xA1744C00, 0xA1733D80,
-	0xA1722F00, 0xA1712080, 0xA1701200,
-	0xA16F0380, 0xA16DF500, 0xA16CE680,
-	0xA16BD800, 0xA16AC980, 0xA169BB00,
-	0xA168AC80, 0xA1679E00, 0xA1668F80,
-	0xA1658100, 0xA1647280, 0xA1636400,
-	0xA1625580, 0xA1614700, 0xA1603880,
-	0xA15F2A00, 0xA15E1B80, 0xA15D0D00,
-	0xA15BFE80, 0xA15AF000, 0xA159E180,
-	0xA158D300, 0xA157C480, 0xA156B600,
-	0xA155A780, 0xA1549900, 0xA1538A80,
-	0xA1527C00, 0xA1516D80, 0xA1505F00,
-	0xA14F5080, 0xA14E4200, 0xA14D3380,
-	0xA14C2500, 0xA14B1680, 0xA14A0800,
-	0xA148F980, 0xA147EB00, 0xA146DC80,
-	0xA145CE00, 0xA144BF80, 0xA143B100,
-	0xA142A280, 0xA1419400, 0xA1408580,
-	0xA13F7700, 0xA13E6880, 0xA13D5A00,
-	0xA13C4B80, 0xA13B3D00, 0xA13A2E80,
-	0xA1392000, 0xA1381180, 0xA1370300,
-	0xA135F480, 0xA134E600, 0xA133D780,
-	0xA132C900, 0xA131BA80, 0xA130AC00,
-	0xA12F9D80, 0xA12E8F00, 0xA12D8080,
-	0xA12C7200, 0xA12B6380, 0xA12A5500,
-	0xA1294680, 0xA1283800, 0xA1272980,
-	0xA1261B00, 0xA1250C80, 0xA123FE00,
-	0xA122EF80, 0xA121E100, 0xA120D280,
-	0xA11FC400, 0xA11EB580, 0xA11DA700,
-	0xA11C9880, 0xA11B8A00, 0xA11A7B80,
-	0xA1196D00, 0xA1185E80, 0xA1175000,
-	0xA1164180, 0xA1153300, 0xA1142480,
-	0xA1131600, 0xA1120780, 0xA110F900,
-	0xA10FEA80, 0xA10EDC00, 0xA10DCD80,
-	0xA10CBF00, 0xA10BB080, 0xA10AA200,
-	0xA1099380, 0xA1088500, 0xA1077680,
-	0xA1066800, 0xA1055980, 0xA1044B00,
-	0xA1033C80, 0xA1022E00, 0xA1011F80,
-	0xA1001100, 0xA0FF0280, 0xA0FDF400,
-	0xA0FCE580, 0xA0FBD700, 0xA0FAC880,
-	0xA0F9BA00, 0xA0F8AB80, 0xA0F79D00,
-	0xA0F68E80, 0xA0F58000, 0xA0F47180,
-	0xA0F36300, 0xA0F25480, 0xA0F14600,
-	0xA0F03780, 0xA0EF2900, 0xA0EE1A80,
-	0xA0ED0C00, 0xA0EBFD80, 0xA0EAEF00,
-	0xA0E9E080, 0xA0E8D200, 0xA0E7C380,
-	0xA0E6B500, 0xA0E5A680, 0xA0E49800,
-	0xA0E38980, 0xA0E27B00, 0xA0E16C80,
-	0xA0E05E00, 0xA0DF4F80, 0xA0DE4100,
-	0xA0DD3280, 0xA0DC2400, 0xA0DB1580,
-	0xA0DA0700, 0xA0D8F880, 0xA0D7EA00,
-	0xA0D6DB80, 0xA0D5CD00, 0xA0D4BE80,
-	0xA0D3B000, 0xA0D2A180, 0xA0D19300,
-	0xA0D08480, 0xA0CF7600, 0xA0CE6780,
-	0xA0CD5900, 0xA0CC4A80, 0xA0CB3C00,
-	0xA0CA2D80, 0xA0C91F00, 0xA0C81080,
-	0xA0C70200, 0xA0C5F380, 0xA0C4E500,
-	0xA0C3D680, 0xA0C2C800, 0xA0C1B980,
-	0xA0C0AB00, 0xA0BF9C80, 0xA0BE8E00,
-	0xA0BD7F80, 0xA0BC7100, 0xA0BB6280,
-	0xA0BA5400, 0xA0B94580, 0xA0B83700,
-	0xA0B72880, 0xA0B61A00, 0xA0B50B80,
-	0xA0B3FD00, 0xA0B2EE80, 0xA0B1E000,
-	0xA0B0D180, 0xA0AFC300, 0xA0AEB480,
-	0xA0ADA600, 0xA0AC9780, 0xA0AB8900,
-	0xA0AA7A80, 0xA0A96C00, 0xA0A85D80,
-	0xA0A74F00, 0xA0A64080, 0xA0A53200,
-	0xA0A42380, 0xA0A31500, 0xA0A20680,
-	0xA0A0F800, 0xA09FE980, 0xA09EDB00,
-	0xA09DCC80, 0xA09CBE00, 0xA09BAF80,
-	0xA09AA100, 0xA0999280, 0xA0988400,
-	0xA0977580, 0xA0966700, 0xA0955880,
-	0xA0944A00, 0xA0933B80, 0xA0922D00,
-	0xA0911E80, 0xA0901000, 0xA08F0180,
-	0xA08DF300, 0xA08CE480, 0xA08BD600,
-	0xA08AC780, 0xA089B900, 0xA088AA80,
-	0xA0879C00, 0xA0868D80, 0xA0857F00,
-	0xA0847080, 0xA0836200, 0xA0825380,
-	0xA0814500, 0xA0803680, 0xA07F2800,
-	0xA07E1980, 0xA07D0B00, 0xA07BFC80,
-	0xA07AEE00, 0xA079DF80, 0xA078D100,
-	0xA077C280, 0xA076B400, 0xA075A580,
-	0xA0749700, 0xA0738880, 0xA0727A00,
-	0xA0716B80, 0xA0705D00, 0xA06F4E80,
-	0xA06E4000, 0xA06D3180, 0xA06C2300,
-	0xA06B1480, 0xA06A0600, 0xA068F780,
-	0xA067E900, 0xA066DA80, 0xA065CC00,
-	0xA064BD80, 0xA063AF00, 0xA062A080,
-	0xA0619200, 0xA0608380, 0xA05F7500,
-	0xA05E6680, 0xA05D5800, 0xA05C4980,
-	0xA05B3B00, 0xA05A2C80, 0xA0591E00,
-	0xA0580F80, 0xA0570100, 0xA055F280,
-	0xA054E400, 0xA053D580, 0xA052C700,
-	0xA051B880, 0xA050AA00, 0xA04F9B80,
-	0xA04E8D00, 0xA04D7E80, 0xA04C7000,
-	0xA04B6180, 0xA04A5300, 0xA0494480,
-	0xA0483600, 0xA0472780, 0xA0461900,
-	0xA0450A80, 0xA043FC00, 0xA042ED80,
-	0xA041DF00, 0xA040D080, 0xA03FC200,
-	0xA03EB380, 0xA03DA500, 0xA03C9680,
-	0xA03B8800, 0xA03A7980, 0xA0396B00,
-	0xA0385C80, 0xA0374E00, 0xA0363F80,
-	0xA0353100, 0xA0342280, 0xA0331400,
-	0xA0320580, 0xA030F700, 0xA02FE880,
-	0xA02EDA00, 0xA02DCB80, 0xA02CBD00,
-	0xA02BAE80, 0xA02AA000, 0xA0299180,
-	0xA0288300, 0xA0277480, 0xA0266600,
-	0xA0255780, 0xA0244900, 0xA0233A80,
-	0xA0222C00, 0xA0211D80, 0xA0200F00,
-	0xA01F0080, 0xA01DF200, 0xA01CE380,
-	0xA01BD500, 0xA01AC680, 0xA019B800,
-	0xA018A980, 0xA0179B00, 0xA0168C80,
-	0xA0157E00, 0xA0146F80, 0xA0136100,
-	0xA0125280, 0xA0114400, 0xA0103580,
-	0xA00F2700, 0xA00E1880, 0xA00D0A00,
-	0xA00BFB80, 0xA00AED00, 0xA009DE80,
-	0xA008D000, 0xA007C180, 0xA006B300,
-	0xA005A480, 0xA0049600, 0xA0038780,
-	0xA0027900, 0xA0016A80, 0xA0005C00,
-	0x9FFF4D80, 0x9FFE3F00, 0x9FFD3080,
-	0x9FFC2200, 0x9FFB1380, 0x9FFA0500,
-	0x9FF8F680, 0x9FF7E800, 0x9FF6D980,
-	0x9FF5CB00, 0x9FF4BC80, 0x9FF3AE00,
-	0x9FF29F80, 0x9FF19100, 0x9FF08280,
-	0x9FEF7400, 0x9FEE6580, 0x9FED5700,
-	0x9FEC4880, 0x9FEB3A00, 0x9FEA2B80,
-	0x9FE91D00, 0x9FE80E80, 0x9FE70000,
-	0x9FE5F180, 0x9FE4E300, 0x9FE3D480,
-	0x9FE2C600, 0x9FE1B780, 0x9FE0A900,
-	0x9FDF9A80, 0x9FDE8C00, 0x9FDD7D80,
-	0x9FDC6F00, 0x9FDB6080, 0x9FDA5200,
-	0x9FD94380, 0x9FD83500, 0x9FD72680,
-	0x9FD61800, 0x9FD50980, 0x9FD3FB00,
-	0x9FD2EC80, 0x9FD1DE00, 0x9FD0CF80,
-	0x9FCFC100, 0x9FCEB280, 0x9FCDA400,
-	0x9FCC9580, 0x9FCB8700, 0x9FCA7880,
-	0x9FC96A00, 0x9FC85B80, 0x9FC74D00,
-	0x9FC63E80, 0x9FC53000, 0x9FC42180,
-	0x9FC31300, 0x9FC20480, 0x9FC0F600,
-	0x9FBFE780, 0x9FBED900, 0x9FBDCA80,
-	0x9FBCBC00, 0x9FBBAD80, 0x9FBA9F00,
-	0x9FB99080, 0x9FB88200, 0x9FB77380,
-	0x9FB66500, 0x9FB55680, 0x9FB44800,
-	0x9FB33980, 0x9FB22B00, 0x9FB11C80,
-	0x9FB00E00, 0x9FAEFF80, 0x9FADF100,
-	0x9FACE280, 0x9FABD400, 0x9FAAC580,
-	0x9FA9B700, 0x9FA8A880, 0x9FA79A00,
-	0x9FA68B80, 0x9FA57D00, 0x9FA46E80,
-	0x9FA36000, 0x9FA25180, 0x9FA14300,
-	0x9FA03480, 0x9F9F2600, 0x9F9E1780,
-	0x9F9D0900, 0x9F9BFA80, 0x9F9AEC00,
-	0x9F99DD80, 0x9F98CF00, 0x9F97C080,
-	0x9F96B200, 0x9F95A380, 0x9F949500,
-	0x9F938680, 0x9F927800, 0x9F916980,
-	0x9F905B00, 0x9F8F4C80, 0x9F8E3E00,
-	0x9F8D2F80, 0x9F8C2100, 0x9F8B1280,
-	0x9F8A0400, 0x9F88F580, 0x9F87E700,
-	0x9F86D880, 0x9F85CA00, 0x9F84BB80,
-	0x9F83AD00, 0x9F829E80, 0x9F819000,
-	0x9F808180, 0x9F7F7300, 0x9F7E6480,
-	0x9F7D5600, 0x9F7C4780, 0x9F7B3900,
-	0x9F7A2A80, 0x9F791C00, 0x9F780D80,
-	0x9F76FF00, 0x9F75F080, 0x9F74E200,
-	0x9F73D380, 0x9F72C500, 0x9F71B680,
-	0x9F70A800, 0x9F6F9980, 0x9F6E8B00,
-	0x9F6D7C80, 0x9F6C6E00, 0x9F6B5F80,
-	0x9F6A5100, 0x9F694280, 0x9F683400,
-	0x9F672580, 0x9F661700, 0x9F650880,
-	0x9F63FA00, 0x9F62EB80, 0x9F61DD00,
-	0x9F60CE80, 0x9F5FC000, 0x9F5EB180,
-	0x9F5DA300, 0x9F5C9480, 0x9F5B8600,
-	0x9F5A7780, 0x9F596900, 0x9F585A80,
-	0x9F574C00, 0x9F563D80, 0x9F552F00,
-	0x9F542080, 0x9F531200, 0x9F520380,
-	0x9F50F500, 0x9F4FE680, 0x9F4ED800,
-	0x9F4DC980, 0x9F4CBB00, 0x9F4BAC80,
-	0x9F4A9E00, 0x9F498F80, 0x9F488100,
-	0x9F477280, 0x9F466400, 0x9F455580,
-	0x9F444700, 0x9F433880, 0x9F422A00,
-	0x9F411B80, 0x9F400D00, 0x9F3EFE80,
-	0x9F3DF000, 0x9F3CE180, 0x9F3BD300,
-	0x9F3AC480, 0x9F39B600, 0x9F38A780,
-	0x9F379900, 0x9F368A80, 0x9F357C00,
-	0x9F346D80, 0x9F335F00, 0x9F325080,
-	0x9F314200, 0x9F303380, 0x9F2F2500,
-	0x9F2E1680, 0x9F2D0800, 0x9F2BF980,
-	0x9F2AEB00, 0x9F29DC80, 0x9F28CE00,
-	0x9F27BF80, 0x9F26B100, 0x9F25A280,
-	0x9F249400, 0x9F238580, 0x9F227700,
-	0x9F216880, 0x9F205A00, 0x9F1F4B80,
-	0x9F1E3D00, 0x9F1D2E80, 0x9F1C2000,
-	0x9F1B1180, 0x9F1A0300, 0x9F18F480,
-	0x9F17E600, 0x9F16D780, 0x9F15C900,
-	0x9F14BA80, 0x9F13AC00, 0x9F129D80,
-	0x9F118F00, 0x9F108080, 0x9F0F7200,
-	0x9F0E6380, 0x9F0D5500, 0x9F0C4680,
-	0x9F0B3800, 0x9F0A2980, 0x9F091B00,
-	0x9F080C80, 0x9F06FE00, 0x9F05EF80,
-	0x9F04E100, 0x9F03D280, 0x9F02C400,
-	0x9F01B580, 0x9F00A700, 0x9EFF9880,
-	0x9EFE8A00, 0x9EFD7B80, 0x9EFC6D00,
-	0x9EFB5E80, 0x9EFA5000, 0x9EF94180,
-	0x9EF83300, 0x9EF72480, 0x9EF61600,
-	0x9EF50780, 0x9EF3F900, 0x9EF2EA80,
-	0x9EF1DC00, 0x9EF0CD80, 0x9EEFBF00,
-	0x9EEEB080, 0x9EEDA200, 0x9EEC9380,
-	0x9EEB8500, 0x9EEA7680, 0x9EE96800,
-	0x9EE85980, 0x9EE74B00, 0x9EE63C80,
-	0x9EE52E00, 0x9EE41F80, 0x9EE31100,
-	0x9EE20280, 0x9EE0F400, 0x9EDFE580,
-	0x9EDED700, 0x9EDDC880, 0x9EDCBA00,
-	0x9EDBAB80, 0x9EDA9D00, 0x9ED98E80,
-	0x9ED88000, 0x9ED77180, 0x9ED66300,
-	0x9ED55480, 0x9ED44600, 0x9ED33780,
-	0x9ED22900, 0x9ED11A80, 0x9ED00C00,
-	0x9ECEFD80, 0x9ECDEF00, 0x9ECCE080,
-	0x9ECBD200, 0x9ECAC380, 0x9EC9B500,
-	0x9EC8A680, 0x9EC79800, 0x9EC68980,
-	0x9EC57B00, 0x9EC46C80, 0x9EC35E00,
-	0x9EC24F80, 0x9EC14100, 0x9EC03280,
-	0x9EBF2400, 0x9EBE1580, 0x9EBD0700,
-	0x9EBBF880, 0x9EBAEA00, 0x9EB9DB80,
-	0x9EB8CD00, 0x9EB7BE80, 0x9EB6B000,
-	0x9EB5A180, 0x9EB49300, 0x9EB38480,
-	0x9EB27600, 0x9EB16780, 0x9EB05900,
-	0x9EAF4A80, 0x9EAE3C00, 0x9EAD2D80,
-	0x9EAC1F00, 0x9EAB1080, 0x9EAA0200,
-	0x9EA8F380, 0x9EA7E500, 0x9EA6D680,
-	0x9EA5C800, 0x9EA4B980, 0x9EA3AB00,
-	0x9EA29C80, 0x9EA18E00, 0x9EA07F80,
-	0x9E9F7100, 0x9E9E6280, 0x9E9D5400,
-	0x9E9C4580, 0x9E9B3700, 0x9E9A2880,
-	0x9E991A00, 0x9E980B80, 0x9E96FD00,
-	0x9E95EE80, 0x9E94E000, 0x9E93D180,
-	0x9E92C300, 0x9E91B480, 0x9E90A600,
-	0x9E8F9780, 0x9E8E8900, 0x9E8D7A80,
-	0x9E8C6C00, 0x9E8B5D80, 0x9E8A4F00,
-	0x9E894080, 0x9E883200, 0x9E872380,
-	0x9E861500, 0x9E850680, 0x9E83F800,
-	0x9E82E980, 0x9E81DB00, 0x9E80CC80,
-	0x9E7FBE00, 0x9E7EAF80, 0x9E7DA100,
-	0x9E7C9280, 0x9E7B8400, 0x9E7A7580,
-	0x9E796700, 0x9E785880, 0x9E774A00,
-	0x9E763B80, 0x9E752D00, 0x9E741E80,
-	0x9E731000, 0x9E720180, 0x9E70F300,
-	0x9E6FE480, 0x9E6ED600, 0x9E6DC780,
-	0x9E6CB900, 0x9E6BAA80, 0x9E6A9C00,
-	0x9E698D80, 0x9E687F00, 0x9E677080,
-	0x9E666200, 0x9E655380, 0x9E644500,
-	0x9E633680, 0x9E622800, 0x9E611980,
-	0x9E600B00, 0x9E5EFC80, 0x9E5DEE00,
-	0x9E5CDF80, 0x9E5BD100, 0x9E5AC280,
-	0x9E59B400, 0x9E58A580, 0x9E579700,
-	0x9E568880, 0x9E557A00, 0x9E546B80,
-	0x9E535D00, 0x9E524E80, 0x9E514000,
-	0x9E503180, 0x9E4F2300, 0x9E4E1480,
-	0x9E4D0600, 0x9E4BF780, 0x9E4AE900,
-	0x9E49DA80, 0x9E48CC00, 0x9E47BD80,
-	0x9E46AF00, 0x9E45A080, 0x9E449200,
-	0x9E438380, 0x9E427500, 0x9E416680,
-	0x9E405800, 0x9E3F4980, 0x9E3E3B00,
-	0x9E3D2C80, 0x9E3C1E00, 0x9E3B0F80,
-	0x9E3A0100, 0x9E38F280, 0x9E37E400,
-	0x9E36D580, 0x9E35C700, 0x9E34B880,
-	0x9E33AA00, 0x9E329B80, 0x9E318D00,
-	0x9E307E80, 0x9E2F7000, 0x9E2E6180,
-	0x9E2D5300, 0x9E2C4480, 0x9E2B3600,
-	0x9E2A2780, 0x9E291900, 0x9E280A80,
-	0x9E26FC00, 0x9E25ED80, 0x9E24DF00,
-	0x9E23D080, 0x9E22C200, 0x9E21B380,
-	0x9E20A500, 0x9E1F9680, 0x9E1E8800,
-	0x9E1D7980, 0x9E1C6B00, 0x9E1B5C80,
-	0x9E1A4E00, 0x9E193F80, 0x9E183100,
-	0x9E172280, 0x9E161400, 0x9E150580,
-	0x9E13F700, 0x9E12E880, 0x9E11DA00,
-	0x9E10CB80, 0x9E0FBD00, 0x9E0EAE80,
-	0x9E0DA000, 0x9E0C9180, 0x9E0B8300,
-	0x9E0A7480, 0x9E096600, 0x9E085780,
-	0x9E074900, 0x9E063A80, 0x9E052C00,
-	0x9E041D80, 0x9E030F00, 0x9E020080,
-	0x9E00F200, 0x9DFFE380, 0x9DFED500,
-	0x9DFDC680, 0x9DFCB800, 0x9DFBA980,
-	0x9DFA9B00, 0x9DF98C80, 0x9DF87E00,
-	0x9DF76F80, 0x9DF66100, 0x9DF55280,
-	0x9DF44400, 0x9DF33580, 0x9DF22700,
-	0x9DF11880, 0x9DF00A00, 0x9DEEFB80,
-	0x9DEDED00, 0x9DECDE80, 0x9DEBD000,
-	0x9DEAC180, 0x9DE9B300, 0x9DE8A480,
-	0x9DE79600, 0x9DE68780, 0x9DE57900,
-	0x9DE46A80, 0x9DE35C00, 0x9DE24D80,
-	0x9DE13F00, 0x9DE03080, 0x9DDF2200,
-	0x9DDE1380, 0x9DDD0500, 0x9DDBF680,
-	0x9DDAE800, 0x9DD9D980, 0x9DD8CB00,
-	0x9DD7BC80, 0x9DD6AE00, 0x9DD59F80,
-	0x9DD49100, 0x9DD38280, 0x9DD27400,
-	0x9DD16580, 0x9DD05700, 0x9DCF4880,
-	0x9DCE3A00, 0x9DCD2B80, 0x9DCC1D00,
-	0x9DCB0E80, 0x9DCA0000, 0x9DC8F180,
-	0x9DC7E300, 0x9DC6D480, 0x9DC5C600,
-	0x9DC4B780, 0x9DC3A900, 0x9DC29A80,
-	0x9DC18C00, 0x9DC07D80, 0x9DBF6F00,
-	0x9DBE6080, 0x9DBD5200, 0x9DBC4380,
-	0x9DBB3500, 0x9DBA2680, 0x9DB91800,
-	0x9DB80980, 0x9DB6FB00, 0x9DB5EC80,
-	0x9DB4DE00, 0x9DB3CF80, 0x9DB2C100,
-	0x9DB1B280, 0x9DB0A400, 0x9DAF9580,
-	0x9DAE8700, 0x9DAD7880, 0x9DAC6A00,
-	0x9DAB5B80, 0x9DAA4D00, 0x9DA93E80,
-	0x9DA83000, 0x9DA72180, 0x9DA61300,
-	0x9DA50480, 0x9DA3F600, 0x9DA2E780,
-	0x9DA1D900, 0x9DA0CA80, 0x9D9FBC00,
-	0x9D9EAD80, 0x9D9D9F00, 0x9D9C9080,
-	0x9D9B8200, 0x9D9A7380, 0x9D996500,
-	0x9D985680, 0x9D974800, 0x9D963980,
-	0x9D952B00, 0x9D941C80, 0x9D930E00,
-	0x9D91FF80, 0x9D90F100, 0x9D8FE280,
-	0x9D8ED400, 0x9D8DC580, 0x9D8CB700,
-	0x9D8BA880, 0x9D8A9A00, 0x9D898B80,
-	0x9D887D00, 0x9D876E80, 0x9D866000,
-	0x9D855180, 0x9D844300, 0x9D833480,
-	0x9D822600, 0x9D811780, 0x9D800900,
-	0x9D7EFA80, 0x9D7DEC00, 0x9D7CDD80,
-	0x9D7BCF00, 0x9D7AC080, 0x9D79B200,
-	0x9D78A380, 0x9D779500, 0x9D768680,
-	0x9D757800, 0x9D746980, 0x9D735B00,
-	0x9D724C80, 0x9D713E00, 0x9D702F80,
-	0x9D6F2100, 0x9D6E1280, 0x9D6D0400,
-	0x9D6BF580, 0x9D6AE700, 0x9D69D880,
-	0x9D68CA00, 0x9D67BB80, 0x9D66AD00,
-	0x9D659E80, 0x9D649000, 0x9D638180,
-	0x9D627300, 0x9D616480, 0x9D605600,
-	0x9D5F4780, 0x9D5E3900, 0x9D5D2A80,
-	0x9D5C1C00, 0x9D5B0D80, 0x9D59FF00,
-	0x9D58F080, 0x9D57E200, 0x9D56D380,
-	0x9D55C500, 0x9D54B680, 0x9D53A800,
-	0x9D529980, 0x9D518B00, 0x9D507C80,
-	0x9D4F6E00, 0x9D4E5F80, 0x9D4D5100,
-	0x9D4C4280, 0x9D4B3400, 0x9D4A2580,
-	0x9D491700, 0x9D480880, 0x9D46FA00,
-	0x9D45EB80, 0x9D44DD00, 0x9D43CE80,
-	0x9D42C000, 0x9D41B180, 0x9D40A300,
-	0x9D3F9480, 0x9D3E8600, 0x9D3D7780,
-	0x9D3C6900, 0x9D3B5A80, 0x9D3A4C00,
-	0x9D393D80, 0x9D382F00, 0x9D372080,
-	0x9D361200, 0x9D350380, 0x9D33F500,
-	0x9D32E680, 0x9D31D800, 0x9D30C980,
-	0x9D2FBB00, 0x9D2EAC80, 0x9D2D9E00,
-	0x9D2C8F80, 0x9D2B8100, 0x9D2A7280,
-	0x9D296400, 0x9D285580, 0x9D274700,
-	0x9D263880, 0x9D252A00, 0x9D241B80,
-	0x9D230D00, 0x9D21FE80, 0x9D20F000,
-	0x9D1FE180, 0x9D1ED300, 0x9D1DC480,
-	0x9D1CB600, 0x9D1BA780, 0x9D1A9900,
-	0x9D198A80, 0x9D187C00, 0x9D176D80,
-	0x9D165F00, 0x9D155080, 0x9D144200,
-	0x9D133380, 0x9D122500, 0x9D111680,
-	0x9D100800, 0x9D0EF980, 0x9D0DEB00,
-	0x9D0CDC80, 0x9D0BCE00, 0x9D0ABF80,
-	0x9D09B100, 0x9D08A280, 0x9D079400,
-	0x9D068580, 0x9D057700, 0x9D046880,
-	0x9D035A00, 0x9D024B80, 0x9D013D00,
-	0x9D002E80, 0x9CFF2000, 0x9CFE1180,
-	0x9CFD0300, 0x9CFBF480, 0x9CFAE600,
-	0x9CF9D780, 0x9CF8C900, 0x9CF7BA80,
-	0x9CF6AC00, 0x9CF59D80, 0x9CF48F00,
-	0x9CF38080, 0x9CF27200, 0x9CF16380,
-	0x9CF05500, 0x9CEF4680, 0x9CEE3800,
-	0x9CED2980, 0x9CEC1B00, 0x9CEB0C80,
-	0x9CE9FE00, 0x9CE8EF80, 0x9CE7E100,
-	0x9CE6D280, 0x9CE5C400, 0x9CE4B580,
-	0x9CE3A700, 0x9CE29880, 0x9CE18A00,
-	0x9CE07B80, 0x9CDF6D00, 0x9CDE5E80,
-	0x9CDD5000, 0x9CDC4180, 0x9CDB3300,
-	0x9CDA2480, 0x9CD91600, 0x9CD80780,
-	0x9CD6F900, 0x9CD5EA80, 0x9CD4DC00,
-	0x9CD3CD80, 0x9CD2BF00, 0x9CD1B080,
-	0x9CD0A200, 0x9CCF9380, 0x9CCE8500,
-	0x9CCD7680, 0x9CCC6800, 0x9CCB5980,
-	0x9CCA4B00, 0x9CC93C80, 0x9CC82E00,
-	0x9CC71F80, 0x9CC61100, 0x9CC50280,
-	0x9CC3F400, 0x9CC2E580, 0x9CC1D700,
-	0x9CC0C880, 0x9CBFBA00, 0x9CBEAB80,
-	0x9CBD9D00, 0x9CBC8E80, 0x9CBB8000,
-	0x9CBA7180, 0x9CB96300, 0x9CB85480,
-	0x9CB74600, 0x9CB63780, 0x9CB52900,
-	0x9CB41A80, 0x9CB30C00, 0x9CB1FD80,
-	0x9CB0EF00, 0x9CAFE080, 0x9CAED200,
-	0x9CADC380, 0x9CACB500, 0x9CABA680,
-	0x9CAA9800, 0x9CA98980, 0x9CA87B00,
-	0x9CA76C80, 0x9CA65E00, 0x9CA54F80,
-	0x9CA44100, 0x9CA33280, 0x9CA22400,
-	0x9CA11580, 0x9CA00700, 0x9C9EF880,
-	0x9C9DEA00, 0x9C9CDB80, 0x9C9BCD00,
-	0x9C9ABE80, 0x9C99B000, 0x9C98A180,
-	0x9C979300, 0x9C968480, 0x9C957600,
-	0x9C946780, 0x9C935900, 0x9C924A80,
-	0x9C913C00, 0x9C902D80, 0x9C8F1F00,
-	0x9C8E1080, 0x9C8D0200, 0x9C8BF380,
-	0x9C8AE500, 0x9C89D680, 0x9C88C800,
-	0x9C87B980, 0x9C86AB00, 0x9C859C80,
-	0x9C848E00, 0x9C837F80, 0x9C827100,
-	0x9C816280, 0x9C805400, 0x9C7F4580,
-	0x9C7E3700, 0x9C7D2880, 0x9C7C1A00,
-	0x9C7B0B80, 0x9C79FD00, 0x9C78EE80,
-	0x9C77E000, 0x9C76D180, 0x9C75C300,
-	0x9C74B480, 0x9C73A600, 0x9C729780,
-	0x9C718900, 0x9C707A80, 0x9C6F6C00,
-	0x9C6E5D80, 0x9C6D4F00, 0x9C6C4080,
-	0x9C6B3200, 0x9C6A2380, 0x9C691500,
-	0x9C680680, 0x9C66F800, 0x9C65E980,
-	0x9C64DB00, 0x9C63CC80, 0x9C62BE00,
-	0x9C61AF80, 0x9C60A100, 0x9C5F9280,
-	0x9C5E8400, 0x9C5D7580, 0x9C5C6700,
-	0x9C5B5880, 0x9C5A4A00, 0x9C593B80,
-	0x9C582D00, 0x9C571E80, 0x9C561000,
-	0x9C550180, 0x9C53F300, 0x9C52E480,
-	0x9C51D600, 0x9C50C780, 0x9C4FB900,
-	0x9C4EAA80, 0x9C4D9C00, 0x9C4C8D80,
-	0x9C4B7F00, 0x9C4A7080, 0x9C496200,
-	0x9C485380, 0x9C474500, 0x9C463680,
-	0x9C452800, 0x9C441980, 0x9C430B00,
-	0x9C41FC80, 0x9C40EE00, 0x9C3FDF80,
-	0x9C3ED100, 0x9C3DC280, 0x9C3CB400,
-	0x9C3BA580, 0x9C3A9700, 0x9C398880,
-	0x9C387A00, 0x9C376B80, 0x9C365D00,
-	0x9C354E80, 0x9C344000, 0x9C333180,
-	0x9C322300, 0x9C311480, 0x9C300600,
-	0x9C2EF780, 0x9C2DE900, 0x9C2CDA80,
-	0x9C2BCC00, 0x9C2ABD80, 0x9C29AF00,
-	0x9C28A080, 0x9C279200, 0x9C268380,
-	0x9C257500, 0x9C246680, 0x9C235800,
-	0x9C224980, 0x9C213B00, 0x9C202C80,
-	0x9C1F1E00, 0x9C1E0F80, 0x9C1D0100,
-	0x9C1BF280, 0x9C1AE400, 0x9C19D580,
-	0x9C18C700, 0x9C17B880, 0x9C16AA00,
-	0x9C159B80, 0x9C148D00, 0x9C137E80,
-	0x9C127000, 0x9C116180, 0x9C105300,
-	0x9C0F4480, 0x9C0E3600, 0x9C0D2780,
-	0x9C0C1900, 0x9C0B0A80, 0x9C09FC00,
-	0x9C08ED80, 0x9C07DF00, 0x9C06D080,
-	0x9C05C200, 0x9C04B380, 0x9C03A500,
-	0x9C029680, 0x9C018800, 0x9C007980,
-	0x9BFF6B00, 0x9BFE5C80, 0x9BFD4E00,
-	0x9BFC3F80, 0x9BFB3100, 0x9BFA2280,
-	0x9BF91400, 0x9BF80580, 0x9BF6F700,
-	0x9BF5E880, 0x9BF4DA00, 0x9BF3CB80,
-	0x9BF2BD00, 0x9BF1AE80, 0x9BF0A000,
-	0x9BEF9180, 0x9BEE8300, 0x9BED7480,
-	0x9BEC6600, 0x9BEB5780, 0x9BEA4900,
-	0x9BE93A80, 0x9BE82C00, 0x9BE71D80,
-	0x9BE60F00, 0x9BE50080, 0x9BE3F200,
-	0x9BE2E380, 0x9BE1D500, 0x9BE0C680,
-	0x9BDFB800, 0x9BDEA980, 0x9BDD9B00,
-	0x9BDC8C80, 0x9BDB7E00, 0x9BDA6F80,
-	0x9BD96100, 0x9BD85280, 0x9BD74400,
-	0x9BD63580, 0x9BD52700, 0x9BD41880,
-	0x9BD30A00, 0x9BD1FB80, 0x9BD0ED00,
-	0x9BCFDE80, 0x9BCED000, 0x9BCDC180,
-	0x9BCCB300, 0x9BCBA480, 0x9BCA9600,
-	0x9BC98780, 0x9BC87900, 0x9BC76A80,
-	0x9BC65C00, 0x9BC54D80, 0x9BC43F00,
-	0x9BC33080, 0x9BC22200, 0x9BC11380,
-	0x9BC00500, 0x9BBEF680, 0x9BBDE800,
-	0x9BBCD980, 0x9BBBCB00, 0x9BBABC80,
-	0x9BB9AE00, 0x9BB89F80, 0x9BB79100,
-	0x9BB68280, 0x9BB57400, 0x9BB46580,
-	0x9BB35700, 0x9BB24880, 0x9BB13A00,
-	0x9BB02B80, 0x9BAF1D00, 0x9BAE0E80,
-	0x9BAD0000, 0x9BABF180, 0x9BAAE300,
-	0x9BA9D480, 0x9BA8C600, 0x9BA7B780,
-	0x9BA6A900, 0x9BA59A80, 0x9BA48C00,
-	0x9BA37D80, 0x9BA26F00, 0x9BA16080,
-	0x9BA05200, 0x9B9F4380, 0x9B9E3500,
-	0x9B9D2680, 0x9B9C1800, 0x9B9B0980,
-	0x9B99FB00, 0x9B98EC80, 0x9B97DE00,
-	0x9B96CF80, 0x9B95C100, 0x9B94B280,
-	0x9B93A400, 0x9B929580, 0x9B918700,
-	0x9B907880, 0x9B8F6A00, 0x9B8E5B80,
-	0x9B8D4D00, 0x9B8C3E80, 0x9B8B3000,
-	0x9B8A2180, 0x9B891300, 0x9B880480,
-	0x9B86F600, 0x9B85E780, 0x9B84D900,
-	0x9B83CA80, 0x9B82BC00, 0x9B81AD80,
-	0x9B809F00, 0x9B7F9080, 0x9B7E8200,
-	0x9B7D7380, 0x9B7C6500, 0x9B7B5680,
-	0x9B7A4800, 0x9B793980, 0x9B782B00,
-	0x9B771C80, 0x9B760E00, 0x9B74FF80,
-	0x9B73F100, 0x9B72E280, 0x9B71D400,
-	0x9B70C580, 0x9B6FB700, 0x9B6EA880,
-	0x9B6D9A00, 0x9B6C8B80, 0x9B6B7D00,
-	0x9B6A6E80, 0x9B696000, 0x9B685180,
-	0x9B674300, 0x9B663480, 0x9B652600,
-	0x9B641780, 0x9B630900, 0x9B61FA80,
-	0x9B60EC00, 0x9B5FDD80, 0x9B5ECF00,
-	0x9B5DC080, 0x9B5CB200, 0x9B5BA380,
-	0x9B5A9500, 0x9B598680, 0x9B587800,
-	0x9B576980, 0x9B565B00, 0x9B554C80,
-	0x9B543E00, 0x9B532F80, 0x9B522100,
-	0x9B511280, 0x9B500400, 0x9B4EF580,
-	0x9B4DE700, 0x9B4CD880, 0x9B4BCA00,
-	0x9B4ABB80, 0x9B49AD00, 0x9B489E80,
-	0x9B479000, 0x9B468180, 0x9B457300,
-	0x9B446480, 0x9B435600, 0x9B424780,
-	0x9B413900, 0x9B402A80, 0x9B3F1C00,
-	0x9B3E0D80, 0x9B3CFF00, 0x9B3BF080,
-	0x9B3AE200, 0x9B39D380, 0x9B38C500,
-	0x9B37B680, 0x9B36A800, 0x9B359980,
-	0x9B348B00, 0x9B337C80, 0x9B326E00,
-	0x9B315F80, 0x9B305100, 0x9B2F4280,
-	0x9B2E3400, 0x9B2D2580, 0x9B2C1700,
-	0x9B2B0880, 0x9B29FA00, 0x9B28EB80,
-	0x9B27DD00, 0x9B26CE80, 0x9B25C000,
-	0x9B24B180, 0x9B23A300, 0x9B229480,
-	0x9B218600, 0x9B207780, 0x9B1F6900,
-	0x9B1E5A80, 0x9B1D4C00, 0x9B1C3D80,
-	0x9B1B2F00, 0x9B1A2080, 0x9B191200,
-	0x9B180380, 0x9B16F500, 0x9B15E680,
-	0x9B14D800, 0x9B13C980, 0x9B12BB00,
-	0x9B11AC80, 0x9B109E00, 0x9B0F8F80,
-	0x9B0E8100, 0x9B0D7280, 0x9B0C6400,
-	0x9B0B5580, 0x9B0A4700, 0x9B093880,
-	0x9B082A00, 0x9B071B80, 0x9B060D00,
-	0x9B04FE80, 0x9B03F000, 0x9B02E180,
-	0x9B01D300, 0x9B00C480, 0x9AFFB600,
-	0x9AFEA780, 0x9AFD9900, 0x9AFC8A80,
-	0x9AFB7C00, 0x9AFA6D80, 0x9AF95F00,
-	0x9AF85080, 0x9AF74200, 0x9AF63380,
-	0x9AF52500, 0x9AF41680, 0x9AF30800,
-	0x9AF1F980, 0x9AF0EB00, 0x9AEFDC80,
-	0x9AEECE00, 0x9AEDBF80, 0x9AECB100,
-	0x9AEBA280, 0x9AEA9400, 0x9AE98580,
-	0x9AE87700, 0x9AE76880, 0x9AE65A00,
-	0x9AE54B80, 0x9AE43D00, 0x9AE32E80,
-	0x9AE22000, 0x9AE11180, 0x9AE00300,
-	0x9ADEF480, 0x9ADDE600, 0x9ADCD780,
-	0x9ADBC900, 0x9ADABA80, 0x9AD9AC00,
-	0x9AD89D80, 0x9AD78F00, 0x9AD68080,
-	0x9AD57200, 0x9AD46380, 0x9AD35500,
-	0x9AD24680, 0x9AD13800, 0x9AD02980,
-	0x9ACF1B00, 0x9ACE0C80, 0x9ACCFE00,
-	0x9ACBEF80, 0x9ACAE100, 0x9AC9D280,
-	0x9AC8C400, 0x9AC7B580, 0x9AC6A700,
-	0x9AC59880, 0x9AC48A00, 0x9AC37B80,
-	0x9AC26D00, 0x9AC15E80, 0x9AC05000,
-	0x9ABF4180, 0x9ABE3300, 0x9ABD2480,
-	0x9ABC1600, 0x9ABB0780, 0x9AB9F900,
-	0x9AB8EA80, 0x9AB7DC00, 0x9AB6CD80,
-	0x9AB5BF00, 0x9AB4B080, 0x9AB3A200,
-	0x9AB29380, 0x9AB18500, 0x9AB07680,
-	0x9AAF6800, 0x9AAE5980, 0x9AAD4B00,
-	0x9AAC3C80, 0x9AAB2E00, 0x9AAA1F80,
-	0x9AA91100, 0x9AA80280, 0x9AA6F400,
-	0x9AA5E580, 0x9AA4D700, 0x9AA3C880,
-	0x9AA2BA00, 0x9AA1AB80, 0x9AA09D00,
-	0x9A9F8E80, 0x9A9E8000, 0x9A9D7180,
-	0x9A9C6300, 0x9A9B5480, 0x9A9A4600,
-	0x9A993780, 0x9A982900, 0x9A971A80,
-	0x9A960C00, 0x9A94FD80, 0x9A93EF00,
-	0x9A92E080, 0x9A91D200, 0x9A90C380,
-	0x9A8FB500, 0x9A8EA680, 0x9A8D9800,
-	0x9A8C8980, 0x9A8B7B00, 0x9A8A6C80,
-	0x9A895E00, 0x9A884F80, 0x9A874100,
-	0x9A863280, 0x9A852400, 0x9A841580,
-	0x9A830700, 0x9A81F880, 0x9A80EA00,
-	0x9A7FDB80, 0x9A7ECD00, 0x9A7DBE80,
-	0x9A7CB000, 0x9A7BA180, 0x9A7A9300,
-	0x9A798480, 0x9A787600, 0x9A776780,
-	0x9A765900, 0x9A754A80, 0x9A743C00,
-	0x9A732D80, 0x9A721F00, 0x9A711080,
-	0x9A700200, 0x9A6EF380, 0x9A6DE500,
-	0x9A6CD680, 0x9A6BC800, 0x9A6AB980,
-	0x9A69AB00, 0x9A689C80, 0x9A678E00,
-	0x9A667F80, 0x9A657100, 0x9A646280,
-	0x9A635400, 0x9A624580, 0x9A613700,
-	0x9A602880, 0x9A5F1A00, 0x9A5E0B80,
-	0x9A5CFD00, 0x9A5BEE80, 0x9A5AE000,
-	0x9A59D180, 0x9A58C300, 0x9A57B480,
-	0x9A56A600, 0x9A559780, 0x9A548900,
-	0x9A537A80, 0x9A526C00, 0x9A515D80,
-	0x9A504F00, 0x9A4F4080, 0x9A4E3200,
-	0x9A4D2380, 0x9A4C1500, 0x9A4B0680,
-	0x9A49F800, 0x9A48E980, 0x9A47DB00,
-	0x9A46CC80, 0x9A45BE00, 0x9A44AF80,
-	0x9A43A100, 0x9A429280, 0x9A418400,
-	0x9A407580, 0x9A3F6700, 0x9A3E5880,
-	0x9A3D4A00, 0x9A3C3B80, 0x9A3B2D00,
-	0x9A3A1E80, 0x9A391000, 0x9A380180,
-	0x9A36F300, 0x9A35E480, 0x9A34D600,
-	0x9A33C780, 0x9A32B900, 0x9A31AA80,
-	0x9A309C00, 0x9A2F8D80, 0x9A2E7F00,
-	0x9A2D7080, 0x9A2C6200, 0x9A2B5380,
-	0x9A2A4500, 0x9A293680, 0x9A282800,
-	0x9A271980, 0x9A260B00, 0x9A24FC80,
-	0x9A23EE00, 0x9A22DF80, 0x9A21D100,
-	0x9A20C280, 0x9A1FB400, 0x9A1EA580,
-	0x9A1D9700, 0x9A1C8880, 0x9A1B7A00,
-	0x9A1A6B80, 0x9A195D00, 0x9A184E80,
-	0x9A174000, 0x9A163180, 0x9A152300,
-	0x9A141480, 0x9A130600, 0x9A11F780,
-	0x9A10E900, 0x9A0FDA80, 0x9A0ECC00,
-	0x9A0DBD80, 0x9A0CAF00, 0x9A0BA080,
-	0x9A0A9200, 0x9A098380, 0x9A087500,
-	0x9A076680, 0x9A065800, 0x9A054980,
-	0x9A043B00, 0x9A032C80, 0x9A021E00,
-	0x9A010F80, 0x9A000100, 0x99FEF280,
-	0x99FDE400, 0x99FCD580, 0x99FBC700,
-	0x99FAB880, 0x99F9AA00, 0x99F89B80,
-	0x99F78D00, 0x99F67E80, 0x99F57000,
-	0x99F46180, 0x99F35300, 0x99F24480,
-	0x99F13600, 0x99F02780, 0x99EF1900,
-	0x99EE0A80, 0x99ECFC00, 0x99EBED80,
-	0x99EADF00, 0x99E9D080, 0x99E8C200,
-	0x99E7B380, 0x99E6A500, 0x99E59680,
-	0x99E48800, 0x99E37980, 0x99E26B00,
-	0x99E15C80, 0x99E04E00, 0x99DF3F80,
-	0x99DE3100, 0x99DD2280, 0x99DC1400,
-	0x99DB0580, 0x99D9F700, 0x99D8E880,
-	0x99D7DA00, 0x99D6CB80, 0x99D5BD00,
-	0x99D4AE80, 0x99D3A000, 0x99D29180,
-	0x99D18300, 0x99D07480, 0x99CF6600,
-	0x99CE5780, 0x99CD4900, 0x99CC3A80,
-	0x99CB2C00, 0x99CA1D80, 0x99C90F00,
-	0x99C80080, 0x99C6F200, 0x99C5E380,
-	0x99C4D500, 0x99C3C680, 0x99C2B800,
-	0x99C1A980, 0x99C09B00, 0x99BF8C80,
-	0x99BE7E00, 0x99BD6F80, 0x99BC6100,
-	0x99BB5280, 0x99BA4400, 0x99B93580,
-	0x99B82700, 0x99B71880, 0x99B60A00,
-	0x99B4FB80, 0x99B3ED00, 0x99B2DE80,
-	0x99B1D000, 0x99B0C180, 0x99AFB300,
-	0x99AEA480, 0x99AD9600, 0x99AC8780,
-	0x99AB7900, 0x99AA6A80, 0x99A95C00,
-	0x99A84D80, 0x99A73F00, 0x99A63080,
-	0x99A52200, 0x99A41380, 0x99A30500,
-	0x99A1F680, 0x99A0E800, 0x999FD980,
-	0x999ECB00, 0x999DBC80, 0x999CAE00,
-	0x999B9F80, 0x999A9100, 0x99998280,
-	0x99987400, 0x99976580, 0x99965700,
-	0x99954880, 0x99943A00, 0x99932B80,
-	0x99921D00, 0x99910E80, 0x99940000,
-	0x99930180, 0x99920300, 0x99910480,
-	0x99900600, 0x998F0780, 0x998E0900,
-	0x998D0A80, 0x998C0C00, 0x998B0D80,
-	0x998A0F00, 0x99891080, 0x99881200,
-	0x99871380, 0x99861500, 0x99851680,
-	0x99841800, 0x99831980, 0x99821B00,
-	0x99811C80, 0x99801E00, 0x997F1F80,
-	0x997E2100, 0x997D2280, 0x997C2400,
-	0x997B2580, 0x997A2700, 0x99792880,
-	0x99782A00, 0x99772B80, 0x99762D00,
-	0x99752E80, 0x99743000, 0x99733180,
-	0x99723300, 0x99713480, 0x99703600,
-	0x996F3780, 0x996E3900, 0x996D3A80,
-	0x996C3C00, 0x996B3D80, 0x996A3F00,
-	0x99694080, 0x99684200, 0x99674380,
-	0x99664500, 0x99654680, 0x99644800,
-	0x99634980, 0x99624B00, 0x99614C80,
-	0x99604E00, 0x995F4F80, 0x995E5100,
-	0x995D5280, 0x995C5400, 0x995B5580,
-	0x995A5700, 0x99595880, 0x99585A00,
-	0x99575B80, 0x99565D00, 0x99555E80,
-	0x99546000, 0x99536180, 0x99526300,
-	0x99516480, 0x99506600, 0x994F6780,
-	0x994E6900, 0x994D6A80, 0x994C6C00,
-	0x994B6D80, 0x994A6F00, 0x99497080,
-	0x99487200, 0x99477380, 0x99467500,
-	0x99457680, 0x99447800, 0x99437980,
-	0x99427B00, 0x99417C80, 0x99407E00,
-	0x993F7F80, 0x993E8100, 0x993D8280,
-	0x993C8400, 0x993B8580, 0x993A8700,
-	0x99398880, 0x99388A00, 0x99378B80,
-	0x99368D00, 0x99358E80, 0x99349000,
-	0x99339180, 0x99329300, 0x99319480,
-	0x99309600, 0x992F9780, 0x992E9900,
-	0x992D9A80, 0x992C9C00, 0x992B9D80,
-	0x992A9F00, 0x9929A080, 0x9928A200,
-	0x9927A380, 0x9926A500, 0x9925A680,
-	0x9924A800, 0x9923A980, 0x9922AB00,
-	0x9921AC80, 0x9920AE00, 0x991FAF80,
-	0x991EB100, 0x991DB280, 0x991CB400,
-	0x991BB580, 0x991AB700, 0x9919B880,
-	0x9918BA00, 0x9917BB80, 0x9916BD00,
-	0x9915BE80, 0x9914C000, 0x9913C180,
-	0x9912C300, 0x9911C480, 0x9910C600,
-	0x990FC780, 0x990EC900, 0x990DCA80,
-	0x990CCC00, 0x990BCD80, 0x990ACF00,
-	0x9909D080, 0x9908D200, 0x9907D380,
-	0x9906D500, 0x9905D680, 0x9904D800,
-	0x9903D980, 0x9902DB00, 0x9901DC80,
-	0x9900DE00, 0x98FFDF80, 0x98FEE100,
-	0x98FDE280, 0x98FCE400, 0x98FBE580,
-	0x98FAE700, 0x98F9E880, 0x98F8EA00,
-	0x98F7EB80, 0x98F6ED00, 0x98F5EE80,
-	0x98F4F000, 0x98F3F180, 0x98F2F300,
-	0x98F1F480, 0x98F0F600, 0x98EFF780,
-	0x98EEF900, 0x98EDFA80, 0x98ECFC00,
-	0x98EBFD80, 0x98EAFF00, 0x98EA0080,
-	0x98E90200, 0x98E80380, 0x98E70500,
-	0x98E60680, 0x98E50800, 0x98E40980,
-	0x98E30B00, 0x98E20C80, 0x98E10E00,
-	0x98E00F80, 0x98DF1100, 0x98DE1280,
-	0x98DD1400, 0x98DC1580, 0x98DB1700,
-	0x98DA1880, 0x98D91A00, 0x98D81B80,
-	0x98D71D00, 0x98D61E80, 0x98D52000,
-	0x98D42180, 0x98D32300, 0x98D22480,
-	0x98D12600, 0x98D02780, 0x98CF2900,
-	0x98CE2A80, 0x98CD2C00, 0x98CC2D80,
-	0x98CB2F00, 0x98CA3080, 0x98C93200,
-	0x98C83380, 0x98C73500, 0x98C63680,
-	0x98C53800, 0x98C43980, 0x98C33B00,
-	0x98C23C80, 0x98C13E00, 0x98C03F80,
-	0x98BF4100, 0x98BE4280, 0x98BD4400,
-	0x98BC4580, 0x98BB4700, 0x98BA4880,
-	0x98B94A00, 0x98B84B80, 0x98B74D00,
-	0x98B64E80, 0x98B55000, 0x98B45180,
-	0x98B35300, 0x98B25480, 0x98B15600,
-	0x98B05780, 0x98AF5900, 0x98AE5A80,
-	0x98AD5C00, 0x98AC5D80, 0x98AB5F00,
-	0x98AA6080, 0x98A96200, 0x98A86380,
-	0x98A76500, 0x98A66680, 0x98A56800,
-	0x98A46980, 0x98A36B00, 0x98A26C80,
-	0x98A16E00, 0x98A06F80, 0x989F7100,
-	0x989E7280, 0x989D7400, 0x989C7580,
-	0x989B7700, 0x989A7880, 0x98997A00,
-	0x98987B80, 0x98977D00, 0x98967E80,
-	0x98958000, 0x98948180, 0x98938300,
-	0x98928480, 0x98918600, 0x98908780,
-	0x988F8900, 0x988E8A80, 0x988D8C00,
-	0x988C8D80, 0x988B8F00, 0x988A9080,
-	0x98899200, 0x98889380, 0x98879500,
-	0x98869680, 0x98859800, 0x98849980,
-	0x98839B00, 0x98829C80, 0x98819E00,
-	0x98809F80, 0x987FA100, 0x987EA280,
-	0x987DA400, 0x987CA580, 0x987BA700,
-	0x987AA880, 0x9879AA00, 0x9878AB80,
-	0x9877AD00, 0x9876AE80, 0x9875B000,
-	0x9874B180, 0x9873B300, 0x9872B480,
-	0x9871B600, 0x9870B780, 0x986FB900,
-	0x986EBA80, 0x986DBC00, 0x986CBD80,
-	0x986BBF00, 0x986AC080, 0x9869C200,
-	0x9868C380, 0x9867C500, 0x9866C680,
-	0x9865C800, 0x9864C980, 0x9863CB00,
-	0x9862CC80, 0x9861CE00, 0x9860CF80,
-	0x985FD100, 0x985ED280, 0x985DD400,
-	0x985CD580, 0x985BD700, 0x985AD880,
-	0x9859DA00, 0x9858DB80, 0x9857DD00,
-	0x9856DE80, 0x9855E000, 0x9854E180,
-	0x9853E300, 0x9852E480, 0x9851E600,
-	0x9850E780, 0x984FE900, 0x984EEA80,
-	0x984DEC00, 0x984CED80, 0x984BEF00,
-	0x984AF080, 0x9849F200, 0x9848F380,
-	0x9847F500, 0x9846F680, 0x9845F800,
-	0x9844F980, 0x9843FB00, 0x9842FC80,
-	0x9841FE00, 0x9840FF80, 0x98400100,
-	0x983F0280, 0x983E0400, 0x983D0580,
-	0x983C0700, 0x983B0880, 0x983A0A00,
-	0x98390B80, 0x98380D00, 0x98370E80,
-	0x98361000, 0x98351180, 0x98341300,
-	0x98331480, 0x98321600, 0x98311780,
-	0x98301900, 0x982F1A80, 0x982E1C00,
-	0x982D1D80, 0x982C1F00, 0x982B2080,
-	0x982A2200, 0x98292380, 0x98282500,
-	0x98272680, 0x98262800, 0x98252980,
-	0x98242B00, 0x98232C80, 0x98222E00,
-	0x98212F80, 0x98203100, 0x981F3280,
-	0x981E3400, 0x981D3580, 0x981C3700,
-	0x981B3880, 0x981A3A00, 0x98193B80,
-	0x98183D00, 0x98173E80, 0x98164000,
-	0x98154180, 0x98144300, 0x98134480,
-	0x98124600, 0x98114780, 0x98104900,
-	0x980F4A80, 0x980E4C00, 0x980D4D80,
-	0x980C4F00, 0x980B5080, 0x980A5200,
-	0x98095380, 0x98085500, 0x98075680,
-	0x98065800, 0x98055980, 0x98045B00,
-	0x98035C80, 0x98025E00, 0x98015F80,
-	0x98006100, 0x97FF6280, 0x97FE6400,
-	0x97FD6580, 0x97FC6700, 0x97FB6880,
-	0x97FA6A00, 0x97F96B80, 0x97F86D00,
-	0x97F76E80, 0x97F67000, 0x97F57180,
-	0x97F47300, 0x97F37480, 0x97F27600,
-	0x97F17780, 0x97F07900, 0x97EF7A80,
-	0x97EE7C00, 0x97ED7D80, 0x97EC7F00,
-	0x97EB8080, 0x97EA8200, 0x97E98380,
-	0x97E88500, 0x97E78680, 0x97E68800,
-	0x97E58980, 0x97E48B00, 0x97E38C80,
-	0x97E28E00, 0x97E18F80, 0x97E09100,
-	0x97DF9280, 0x97DE9400, 0x97DD9580,
-	0x97DC9700, 0x97DB9880, 0x97DA9A00,
-	0x97D99B80, 0x97D89D00, 0x97D79E80,
-	0x97D6A000, 0x97D5A180, 0x97D4A300,
-	0x97D3A480, 0x97D2A600, 0x97D1A780,
-	0x97D0A900, 0x97CFAA80, 0x97CEAC00,
-	0x97CDAD80, 0x97CCAF00, 0x97CBB080,
-	0x97CAB200, 0x97C9B380, 0x97C8B500,
-	0x97C7B680, 0x97C6B800, 0x97C5B980,
-	0x97C4BB00, 0x97C3BC80, 0x97C2BE00,
-	0x97C1BF80, 0x97C0C100, 0x97BFC280,
-	0x97BEC400, 0x97BDC580, 0x97BCC700,
-	0x97BBC880, 0x97BACA00, 0x97B9CB80,
-	0x97B8CD00, 0x97B7CE80, 0x97B6D000,
-	0x97B5D180, 0x97B4D300, 0x97B3D480,
-	0x97B2D600, 0x97B1D780, 0x97B0D900,
-	0x97AFDA80, 0x97AEDC00, 0x97ADDD80,
-	0x97ACDF00, 0x97ABE080, 0x97AAE200,
-	0x97A9E380, 0x97A8E500, 0x97A7E680,
-	0x97A6E800, 0x97A5E980, 0x97A4EB00,
-	0x97A3EC80, 0x97A2EE00, 0x97A1EF80,
-	0x97A0F100, 0x979FF280, 0x979EF400,
-	0x979DF580, 0x979CF700, 0x979BF880,
-	0x979AFA00, 0x9799FB80, 0x9798FD00,
-	0x9797FE80, 0x97970000, 0x97960180,
-	0x97950300, 0x97940480, 0x97930600,
-	0x97920780, 0x97910900, 0x97900A80,
-	0x978F0C00, 0x978E0D80, 0x978D0F00,
-	0x978C1080, 0x978B1200, 0x978A1380,
-	0x97891500, 0x97881680, 0x97871800,
-	0x97861980, 0x97851B00, 0x97841C80,
-	0x97831E00, 0x97821F80, 0x97812100,
-	0x97802280, 0x977F2400, 0x977E2580,
-	0x977D2700, 0x977C2880, 0x977B2A00,
-	0x977A2B80, 0x97792D00, 0x97782E80,
-	0x97773000, 0x97763180, 0x97753300,
-	0x97743480, 0x97733600, 0x97723780,
-	0x97713900, 0x97703A80, 0x976F3C00,
-	0x976E3D80, 0x976D3F00, 0x976C4080,
-	0x976B4200, 0x976A4380, 0x97694500,
-	0x97684680, 0x97674800, 0x97664980,
-	0x97654B00, 0x97644C80, 0x97634E00,
-	0x97624F80, 0x97615100, 0x97605280,
-	0x975F5400, 0x975E5580, 0x975D5700,
-	0x975C5880, 0x975B5A00, 0x975A5B80,
-	0x97595D00, 0x97585E80, 0x97576000,
-	0x97566180, 0x97556300, 0x97546480,
-	0x97536600, 0x97526780, 0x97516900,
-	0x97506A80, 0x974F6C00, 0x974E6D80,
-	0x974D6F00, 0x974C7080, 0x974B7200,
-	0x974A7380, 0x97497500, 0x97487680,
-	0x97477800, 0x97467980, 0x97457B00,
-	0x97447C80, 0x97437E00, 0x97427F80,
-	0x97418100, 0x97408280, 0x973F8400,
-	0x973E8580, 0x973D8700, 0x973C8880,
-	0x973B8A00, 0x973A8B80, 0x97398D00,
-	0x97388E80, 0x97379000, 0x97369180,
-	0x97359300, 0x97349480, 0x97339600,
-	0x97329780, 0x97319900, 0x97309A80,
-	0x972F9C00, 0x972E9D80, 0x972D9F00,
-	0x972CA080, 0x972BA200, 0x972AA380,
-	0x9729A500, 0x9728A680, 0x9727A800,
-	0x9726A980, 0x9725AB00, 0x9724AC80,
-	0x9723AE00, 0x9722AF80, 0x9721B100,
-	0x9720B280, 0x971FB400, 0x971EB580,
-	0x971DB700, 0x971CB880, 0x971BBA00,
-	0x971ABB80, 0x9719BD00, 0x9718BE80,
-	0x9717C000, 0x9716C180, 0x9715C300,
-	0x9714C480, 0x9713C600, 0x9712C780,
-	0x9711C900, 0x9710CA80, 0x970FCC00,
-	0x970ECD80, 0x970DCF00, 0x970CD080,
-	0x970BD200, 0x970AD380, 0x9709D500,
-	0x9708D680, 0x9707D800, 0x9706D980,
-	0x9705DB00, 0x9704DC80, 0x9703DE00,
-	0x9702DF80, 0x9701E100, 0x9700E280,
-	0x96FFE400, 0x96FEE580, 0x96FDE700,
-	0x96FCE880, 0x96FBEA00, 0x96FAEB80,
-	0x96F9ED00, 0x96F8EE80, 0x96F7F000,
-	0x96F6F180, 0x96F5F300, 0x96F4F480,
-	0x96F3F600, 0x96F2F780, 0x96F1F900,
-	0x96F0FA80, 0x96EFFC00, 0x96EEFD80,
-	0x96EDFF00, 0x96ED0080, 0x96EC0200,
-	0x96EB0380, 0x96EA0500, 0x96E90680,
-	0x96E80800, 0x96E70980, 0x96E60B00,
-	0x96E50C80, 0x96E40E00, 0x96E30F80,
-	0x96E21100, 0x96E11280, 0x96E01400,
-	0x96DF1580, 0x96DE1700, 0x96DD1880,
-	0x96DC1A00, 0x96DB1B80, 0x96DA1D00,
-	0x96D91E80, 0x96D82000, 0x96D72180,
-	0x96D62300, 0x96D52480, 0x96D42600,
-	0x96D32780, 0x96D22900, 0x96D12A80,
-	0x96D02C00, 0x96CF2D80, 0x96CE2F00,
-	0x96CD3080, 0x96CC3200, 0x96CB3380,
-	0x96CA3500, 0x96C93680, 0x96C83800,
-	0x96C73980, 0x96C63B00, 0x96C53C80,
-	0x96C43E00, 0x96C33F80, 0x96C24100,
-	0x96C14280, 0x96C04400, 0x96BF4580,
-	0x96BE4700, 0x96BD4880, 0x96BC4A00,
-	0x96BB4B80, 0x96BA4D00, 0x96B94E80,
-	0x96B85000, 0x96B75180, 0x96B65300,
-	0x96B55480, 0x96B45600, 0x96B35780,
-	0x96B25900, 0x96B15A80, 0x96B05C00,
-	0x96AF5D80, 0x96AE5F00, 0x96AD6080,
-	0x96AC6200, 0x96AB6380, 0x96AA6500,
-	0x96A96680, 0x96A86800, 0x96A76980,
-	0x96A66B00, 0x96A56C80, 0x96A46E00,
-	0x96A36F80, 0x96A27100, 0x96A17280,
-	0x96A07400, 0x969F7580, 0x969E7700,
-	0x969D7880, 0x969C7A00, 0x969B7B80,
-	0x969A7D00, 0x96997E80, 0x96988000,
-	0x96978180, 0x96968300, 0x96958480,
-	0x96948600, 0x96938780, 0x96928900,
-	0x96918A80, 0x96908C00, 0x968F8D80,
-	0x968E8F00, 0x968D9080, 0x968C9200,
-	0x968B9380, 0x968A9500, 0x96899680,
-	0x96889800, 0x96879980, 0x96869B00,
-	0x96859C80, 0x96849E00, 0x96839F80,
-	0x9682A100, 0x9681A280, 0x9680A400,
-	0x967FA580, 0x967EA700, 0x967DA880,
-	0x967CAA00, 0x967BAB80, 0x967AAD00,
-	0x9679AE80, 0x9678B000, 0x9677B180,
-	0x9676B300, 0x9675B480, 0x9674B600,
-	0x9673B780, 0x9672B900, 0x9671BA80,
-	0x9670BC00, 0x966FBD80, 0x966EBF00,
-	0x966DC080, 0x966CC200, 0x966BC380,
-	0x966AC500, 0x9669C680, 0x9668C800,
-	0x9667C980, 0x9666CB00, 0x9665CC80,
-	0x9664CE00, 0x9663CF80, 0x9662D100,
-	0x9661D280, 0x9660D400, 0x965FD580,
-	0x965ED700, 0x965DD880, 0x965CDA00,
-	0x965BDB80, 0x965ADD00, 0x9659DE80,
-	0x9658E000, 0x9657E180, 0x9656E300,
-	0x9655E480, 0x9654E600, 0x9653E780,
-	0x9652E900, 0x9651EA80, 0x9650EC00,
-	0x964FED80, 0x964EEF00, 0x964DF080,
-	0x964CF200, 0x964BF380, 0x964AF500,
-	0x9649F680, 0x9648F800, 0x9647F980,
-	0x9646FB00, 0x9645FC80, 0x9644FE00,
-	0x9643FF80, 0x96430100, 0x96420280,
-	0x96410400, 0x96400580, 0x963F0700,
-	0x963E0880, 0x963D0A00, 0x963C0B80,
-	0x963B0D00, 0x963A0E80, 0x96391000,
-	0x96381180, 0x96371300, 0x96361480,
-	0x96351600, 0x96341780, 0x96331900,
-	0x96321A80, 0x96311C00, 0x96301D80,
-	0x962F1F00, 0x962E2080, 0x962D2200,
-	0x962C2380, 0x962B2500, 0x962A2680,
-	0x96292800, 0x96282980, 0x96272B00,
-	0x96262C80, 0x96252E00, 0x96242F80,
-	0x96233100, 0x96223280, 0x96213400,
-	0x96203580, 0x961F3700, 0x961E3880,
-	0x961D3A00, 0x961C3B80, 0x961B3D00,
-	0x961A3E80, 0x96194000, 0x96184180,
-	0x96174300, 0x96164480, 0x96154600,
-	0x96144780, 0x96134900, 0x96124A80,
-	0x96114C00, 0x96104D80, 0x960F4F00,
-	0x960E5080, 0x960D5200, 0x960C5380,
-	0x960B5500, 0x960A5680, 0x96095800,
-	0x96085980, 0x96075B00, 0x96065C80,
-	0x96055E00, 0x96045F80, 0x96036100,
-	0x96026280, 0x96016400, 0x96006580,
-	0x95FF6700, 0x95FE6880, 0x95FD6A00,
-	0x95FC6B80, 0x95FB6D00, 0x95FA6E80,
-	0x95F97000, 0x95F87180, 0x95F77300,
-	0x95F67480, 0x95F57600, 0x95F47780,
-	0x95F37900, 0x95F27A80, 0x95F17C00,
-	0x95F07D80, 0x95EF7F00, 0x95EE8080,
-	0x95ED8200, 0x95EC8380, 0x95EB8500,
-	0x95EA8680, 0x95E98800, 0x95E88980,
-	0x95E78B00, 0x95E68C80, 0x95E58E00,
-	0x95E48F80, 0x95E39100, 0x95E29280,
-	0x95E19400, 0x95E09580, 0x95DF9700,
-	0x95DE9880, 0x95DD9A00, 0x95DC9B80,
-	0x95DB9D00, 0x95DA9E80, 0x95D9A000,
-	0x95D8A180, 0x95D7A300, 0x95D6A480,
-	0x95D5A600, 0x95D4A780, 0x95D3A900,
-	0x95D2AA80, 0x95D1AC00, 0x95D0AD80,
-	0x95CFAF00, 0x95CEB080, 0x95CDB200,
-	0x95CCB380, 0x95CBB500, 0x95CAB680,
-	0x95C9B800, 0x95C8B980, 0x95C7BB00,
-	0x95C6BC80, 0x95C5BE00, 0x95C4BF80,
-	0x95C3C100, 0x95C2C280, 0x95C1C400,
-	0x95C0C580, 0x95BFC700, 0x95BEC880,
-	0x95BDCA00, 0x95BCCB80, 0x95BBCD00,
-	0x95BACE80, 0x95B9D000, 0x95B8D180,
-	0x95B7D300, 0x95B6D480, 0x95B5D600,
-	0x95B4D780, 0x95B3D900, 0x95B2DA80,
-	0x95B1DC00, 0x95B0DD80, 0x95AFDF00,
-	0x95AEE080, 0x95ADE200, 0x95ACE380,
-	0x95ABE500, 0x95AAE680, 0x95A9E800,
-	0x95A8E980, 0x95A7EB00, 0x95A6EC80,
-	0x95A5EE00, 0x95A4EF80, 0x95A3F100,
-	0x95A2F280, 0x95A1F400, 0x95A0F580,
-	0x959FF700, 0x959EF880, 0x959DFA00,
-	0x959CFB80, 0x959BFD00, 0x959AFE80,
-	0x959A0000, 0x95990180, 0x95980300,
-	0x95970480, 0x95960600, 0x95950780,
-	0x95940900, 0x95930A80, 0x95920C00,
-	0x95910D80, 0x95900F00, 0x958F1080,
-	0x958E1200, 0x958D1380, 0x958C1500,
-	0x958B1680, 0x958A1800, 0x95891980,
-	0x95881B00, 0x95871C80, 0x95861E00,
-	0x95851F80, 0x95842100, 0x95832280,
-	0x95822400, 0x95812580, 0x95802700,
-	0x957F2880, 0x957E2A00, 0x957D2B80,
-	0x957C2D00, 0x957B2E80, 0x957A3000,
-	0x95793180, 0x95783300, 0x95773480,
-	0x95763600, 0x95753780, 0x95743900,
-	0x95733A80, 0x95723C00, 0x95713D80,
-	0x95703F00, 0x956F4080, 0x956E4200,
-	0x956D4380, 0x956C4500, 0x956B4680,
-	0x956A4800, 0x95694980, 0x95684B00,
-	0x95674C80, 0x95664E00, 0x95654F80,
-	0x95645100, 0x95635280, 0x95625400,
-	0x95615580, 0x95605700, 0x955F5880,
-	0x955E5A00, 0x955D5B80, 0x955C5D00,
-	0x955B5E80, 0x955A6000, 0x95596180,
-	0x95586300, 0x95576480, 0x95566600,
-	0x95556780, 0x95546900, 0x95536A80,
-	0x95526C00, 0x95516D80, 0x95506F00,
-	0x954F7080, 0x954E7200, 0x954D7380,
-	0x954C7500, 0x954B7680, 0x954A7800,
-	0x95497980, 0x95487B00, 0x95477C80,
-	0x95467E00, 0x95457F80, 0x95448100,
-	0x95438280, 0x95428400, 0x95418580,
-	0x95408700, 0x953F8880, 0x953E8A00,
-	0x953D8B80, 0x953C8D00, 0x953B8E80,
-	0x953A9000, 0x95399180, 0x95389300,
-	0x95379480, 0x95369600, 0x95359780,
-	0x95349900, 0x95339A80, 0x95329C00,
-	0x95319D80, 0x95309F00, 0x952FA080,
-	0x952EA200, 0x952DA380, 0x952CA500,
-	0x952BA680, 0x952AA800, 0x9529A980,
-	0x9528AB00, 0x9527AC80, 0x9526AE00,
-	0x9525AF80, 0x9524B100, 0x9523B280,
-	0x9522B400, 0x9521B580, 0x9520B700,
-	0x951FB880, 0x951EBA00, 0x951DBB80,
-	0x951CBD00, 0x951BBE80, 0x951AC000,
-	0x9519C180, 0x9518C300, 0x9517C480,
-	0x9516C600, 0x9515C780, 0x9514C900,
-	0x9513CA80, 0x9512CC00, 0x9511CD80,
-	0x9510CF00, 0x950FD080, 0x950ED200,
-	0x950DD380, 0x950CD500, 0x950BD680,
-	0x950AD800, 0x9509D980, 0x9508DB00,
-	0x9507DC80, 0x9506DE00, 0x9505DF80,
-	0x9504E100, 0x9503E280, 0x9502E400,
-	0x9501E580, 0x9500E700, 0x94FFE880,
-	0x94FEEA00, 0x94FDEB80, 0x94FCED00,
-	0x94FBEE80, 0x94FAF000, 0x94F9F180,
-	0x94F8F300, 0x94F7F480, 0x94F6F600,
-	0x94F5F780, 0x94F4F900, 0x94F3FA80,
-	0x94F2FC00, 0x94F1FD80, 0x94F0FF00,
-	0x94F00080, 0x94EF0200, 0x94EE0380,
-	0x94ED0500, 0x94EC0680, 0x94EB0800,
-	0x94EA0980, 0x94E90B00, 0x94E80C80,
-	0x94E70E00, 0x94E60F80, 0x94E51100,
-	0x94E41280, 0x94E31400, 0x94E21580,
-	0x94E11700, 0x94E01880, 0x94DF1A00,
-	0x94DE1B80, 0x94DD1D00, 0x94DC1E80,
-	0x94DB2000, 0x94DA2180, 0x94D92300,
-	0x94D82480, 0x94D72600, 0x94D62780,
-	0x94D52900, 0x94D42A80, 0x94D32C00,
-	0x94D22D80, 0x94D12F00, 0x94D03080,
-	0x94CF3200, 0x94CE3380, 0x94CD3500,
-	0x94CC3680, 0x94CB3800, 0x94CA3980,
-	0x94C93B00, 0x94C83C80, 0x94C73E00,
-	0x94C63F80, 0x94C54100, 0x94C44280,
-	0x94C34400, 0x94C24580, 0x94C14700,
-	0x94C04880, 0x94BF4A00, 0x94BE4B80,
-	0x94BD4D00, 0x94BC4E80, 0x94BB5000,
-	0x94BA5180, 0x94B95300, 0x94B85480,
-	0x94B75600, 0x94B65780, 0x94B55900,
-	0x94B45A80, 0x94B35C00, 0x94B25D80,
-	0x94B15F00, 0x94B06080, 0x94AF6200,
-	0x94AE6380, 0x94AD6500, 0x94AC6680,
-	0x94AB6800, 0x94AA6980, 0x94A96B00,
-	0x94A86C80, 0x94A76E00, 0x94A66F80,
-	0x94A57100, 0x94A47280, 0x94A37400,
-	0x94A27580, 0x94A17700, 0x94A07880,
-	0x949F7A00, 0x949E7B80, 0x949D7D00,
-	0x949C7E80, 0x949B8000, 0x949A8180,
-	0x94998300, 0x94988480, 0x94978600,
-	0x94968780, 0x94958900, 0x94948A80,
-	0x94938C00, 0x94928D80, 0x94918F00,
-	0x94909080, 0x948F9200, 0x948E9380,
-	0x948D9500, 0x948C9680, 0x948B9800,
-	0x948A9980, 0x94899B00, 0x94889C80,
-	0x94879E00, 0x94869F80, 0x9485A100,
-	0x9484A280, 0x9483A400, 0x9482A580,
-	0x9481A700, 0x9480A880, 0x947FAA00,
-	0x947EAB80, 0x947DAD00, 0x947CAE80,
-	0x947BB000, 0x947AB180, 0x9479B300,
-	0x9478B480, 0x9477B600, 0x9476B780,
-	0x9475B900, 0x9474BA80, 0x9473BC00,
-	0x9472BD80, 0x9471BF00, 0x9470C080,
-	0x946FC200, 0x946EC380, 0x946DC500,
-	0x946CC680, 0x946BC800, 0x946AC980,
-	0x9469CB00, 0x9468CC80, 0x9467CE00,
-	0x9466CF80, 0x9465D100, 0x9464D280,
-	0x9463D400, 0x9462D580, 0x9461D700,
-	0x9460D880, 0x945FDA00, 0x945EDB80,
-	0x945DDD00, 0x945CDE80, 0x945BE000,
-	0x945AE180, 0x9459E300, 0x9458E480,
-	0x9457E600, 0x9456E780, 0x9455E900,
-	0x9454EA80, 0x9453EC00, 0x9452ED80,
-	0x9451EF00, 0x9450F080, 0x944FF200,
-	0x944EF380, 0x944DF500, 0x944CF680,
-	0x944BF800, 0x944AF980, 0x9449FB00,
-	0x9448FC80, 0x9447FE00, 0x9446FF80,
-	0x94460100, 0x94450280, 0x94440400,
-	0x94430580, 0x94420700, 0x94410880,
-	0x94400A00, 0x943F0B80, 0x943E0D00,
-	0x943D0E80, 0x943C1000, 0x943B1180,
-	0x943A1300, 0x94391480, 0x94381600,
-	0x94371780, 0x94361900, 0x94351A80,
-	0x94341C00, 0x94331D80, 0x94321F00,
-	0x94312080, 0x94302200, 0x942F2380,
-	0x942E2500, 0x942D2680, 0x942C2800,
-	0x942B2980, 0x942A2B00, 0x94292C80,
-	0x94282E00, 0x94272F80, 0x94263100,
-	0x94253280, 0x94243400, 0x94233580,
-	0x94223700, 0x94213880, 0x94203A00,
-	0x941F3B80, 0x941E3D00, 0x941D3E80,
-	0x941C4000, 0x941B4180, 0x941A4300,
-	0x94194480, 0x94184600, 0x94174780,
-	0x94164900, 0x94154A80, 0x94144C00,
-	0x94134D80, 0x94124F00, 0x94115080,
-	0x94105200, 0x940F5380, 0x940E5500,
-	0x940D5680, 0x940C5800, 0x940B5980,
-	0x940A5B00, 0x94095C80, 0x94085E00,
-	0x94075F80, 0x94066100, 0x94056280,
-	0x94046400, 0x94036580, 0x94026700,
-	0x94016880, 0x94006A00, 0x93FF6B80,
-	0x93FE6D00, 0x93FD6E80, 0x93FC7000,
-	0x93FB7180, 0x93FA7300, 0x93F97480,
-	0x93F87600, 0x93F77780, 0x93F67900,
-	0x93F57A80, 0x93F47C00, 0x93F37D80,
-	0x93F27F00, 0x93F18080, 0x93F08200,
-	0x93EF8380, 0x93EE8500, 0x93ED8680,
-	0x93EC8800, 0x93EB8980, 0x93EA8B00,
-	0x93E98C80, 0x93E88E00, 0x93E78F80,
-	0x93E69100, 0x93E59280, 0x93E49400,
-	0x93E39580, 0x93E29700, 0x93E19880,
-	0x93E09A00, 0x93DF9B80, 0x93DE9D00,
-	0x93DD9E80, 0x93DCA000, 0x93DBA180,
-	0x93DAA300, 0x93D9A480, 0x93D8A600,
-	0x93D7A780, 0x93D6A900, 0x93D5AA80,
-	0x93D4AC00, 0x93D3AD80, 0x93D2AF00,
-	0x93D1B080, 0x93D0B200, 0x93CFB380,
-	0x93CEB500, 0x93CDB680, 0x93CCB800,
-	0x93CBB980, 0x93CABB00, 0x93C9BC80,
-	0x93C8BE00, 0x93C7BF80, 0x93C6C100,
-	0x93C5C280, 0x93C4C400, 0x93C3C580,
-	0x93C2C700, 0x93C1C880, 0x93C0CA00,
-	0x93BFCB80, 0x93BECD00, 0x93BDCE80,
-	0x93BCD000, 0x93BBD180, 0x93BAD300,
-	0x93B9D480, 0x93B8D600, 0x93B7D780,
-	0x93B6D900, 0x93B5DA80, 0x93B4DC00,
-	0x93B3DD80, 0x93B2DF00, 0x93B1E080,
-	0x93B0E200, 0x93AFE380, 0x93AEE500,
-	0x93ADE680, 0x93ACE800, 0x93ABE980,
-	0x93AAEB00, 0x93A9EC80, 0x93A8EE00,
-	0x93A7EF80, 0x93A6F100, 0x93A5F280,
-	0x93A4F400, 0x93A3F580, 0x93A2F700,
-	0x93A1F880, 0x93A0FA00, 0x939FFB80,
-	0x939EFD00, 0x939DFE80, 0x939D0000,
-	0x939C0180, 0x939B0300, 0x939A0480,
-	0x93990600, 0x93980780, 0x93970900,
-	0x93960A80, 0x93950C00, 0x93940D80,
-	0x93930F00, 0x93921080, 0x93911200,
-	0x93901380, 0x938F1500, 0x938E1680,
-	0x938D1800, 0x938C1980, 0x938B1B00,
-	0x938A1C80, 0x93891E00, 0x93881F80,
-	0x93872100, 0x93862280, 0x93852400,
-	0x93842580, 0x93832700, 0x93822880,
-	0x93812A00, 0x93802B80, 0x937F2D00,
-	0x937E2E80, 0x937D3000, 0x937C3180,
-	0x937B3300, 0x937A3480, 0x93793600,
-	0x93783780, 0x93773900, 0x93763A80,
-	0x93753C00, 0x93743D80, 0x93733F00,
-	0x93724080, 0x93714200, 0x93704380,
-	0x936F4500, 0x936E4680, 0x936D4800,
-	0x936C4980, 0x936B4B00, 0x936A4C80,
-	0x93694E00, 0x93684F80, 0x93675100,
-	0x93665280, 0x93655400, 0x93645580,
-	0x93635700, 0x93625880, 0x93615A00,
-	0x93605B80, 0x935F5D00, 0x935E5E80,
-	0x935D6000, 0x935C6180, 0x935B6300,
-	0x935A6480, 0x93596600, 0x93586780,
-	0x93576900, 0x93566A80, 0x93556C00,
-	0x93546D80, 0x93536F00, 0x93527080,
-	0x93517200, 0x93507380, 0x934F7500,
-	0x934E7680, 0x934D7800, 0x934C7980,
-	0x934B7B00, 0x934A7C80, 0x93497E00,
-	0x93487F80, 0x93478100, 0x93468280,
-	0x93458400, 0x93448580, 0x93438700,
-	0x93428880, 0x93418A00, 0x93408B80,
-	0x933F8D00, 0x933E8E80, 0x933D9000,
-	0x933C9180, 0x933B9300, 0x933A9480,
-	0x93399600, 0x93389780, 0x93379900,
-	0x93369A80, 0x93359C00, 0x93349D80,
-	0x93339F00, 0x9332A080, 0x9331A200,
-	0x9330A380, 0x932FA500, 0x932EA680,
-	0x932DA800, 0x932CA980, 0x932BAB00,
-	0x932AAC80, 0x9329AE00, 0x9328AF80,
-	0x9327B100, 0x9326B280, 0x9325B400,
-	0x9324B580, 0x9323B700, 0x9322B880,
-	0x9321BA00, 0x9320BB80, 0x931FBD00,
-	0x931EBE80, 0x931DC000, 0x931CC180,
-	0x931BC300, 0x931AC480, 0x9319C600,
-	0x9318C780, 0x9317C900, 0x9316CA80,
-	0x9315CC00, 0x9314CD80, 0x9313CF00,
-	0x9312D080, 0x9311D200, 0x9310D380,
-	0x930FD500, 0x930ED680, 0x930DD800,
-	0x930CD980, 0x930BDB00, 0x930ADC80,
-	0x9309DE00, 0x9308DF80, 0x9307E100,
-	0x9306E280, 0x9305E400, 0x9304E580,
-	0x9303E700, 0x9302E880, 0x9301EA00,
-	0x9300EB80, 0x92FFED00, 0x92FEEE80,
-	0x92FDF000, 0x92FCF180, 0x92FBF300,
-	0x92FAF480, 0x92F9F600, 0x92F8F780,
-	0x92F7F900, 0x92F6FA80, 0x92F5FC00,
-	0x92F4FD80, 0x92F3FF00, 0x92F30080,
-	0x92F20200, 0x92F10380, 0x92F00500,
-	0x92EF0680, 0x92EE0800, 0x92ED0980,
-	0x92EC0B00, 0x92EB0C80, 0x92EA0E00,
-	0x92E90F80, 0x92E81100, 0x92E71280,
-	0x92E61400, 0x92E51580, 0x92E41700,
-	0x92E31880, 0x92E21A00, 0x92E11B80,
-	0x92E01D00, 0x92DF1E80, 0x92DE2000,
-	0x92DD2180, 0x92DC2300, 0x92DB2480,
-	0x92DA2600, 0x92D92780, 0x92D82900,
-	0x92D72A80, 0x92D62C00, 0x92D52D80,
-	0x92D42F00, 0x92D33080, 0x92D23200,
-	0x92D13380, 0x92D03500, 0x92CF3680,
-	0x92CE3800, 0x92CD3980, 0x92CC3B00,
-	0x92CB3C80, 0x92CA3E00, 0x92C93F80,
-	0x92C84100, 0x92C74280, 0x92C64400,
-	0x92C54580, 0x92C44700, 0x92C34880,
-	0x92C24A00, 0x92C14B80, 0x92C04D00,
-	0x92BF4E80, 0x92BE5000, 0x92BD5180,
-	0x92BC5300, 0x92BB5480, 0x92BA5600,
-	0x92B95780, 0x92B85900, 0x92B75A80,
-	0x92B65C00, 0x92B55D80, 0x92B45F00,
-	0x92B36080, 0x92B26200, 0x92B16380,
-	0x92B06500, 0x92AF6680, 0x92AE6800,
-	0x92AD6980, 0x92AC6B00, 0x92AB6C80,
-	0x92AA6E00, 0x92A96F80, 0x92A87100,
-	0x92A77280, 0x92A67400, 0x92A57580,
-	0x92A47700, 0x92A37880, 0x92A27A00,
-	0x92A17B80, 0x92A07D00, 0x929F7E80,
-	0x929E8000, 0x929D8180, 0x929C8300,
-	0x929B8480, 0x929A8600, 0x92998780,
-	0x92988900, 0x92978A80, 0x92968C00,
-	0x92958D80, 0x92948F00, 0x92939080,
-	0x92929200, 0x92919380, 0x92909500,
-	0x928F9680, 0x928E9800, 0x928D9980,
-	0x928C9B00, 0x928B9C80, 0x928A9E00,
-	0x92899F80, 0x9288A100, 0x9287A280,
-	0x9286A400, 0x9285A580, 0x9284A700,
-	0x9283A880, 0x9282AA00, 0x9281AB80,
-	0x9280AD00, 0x927FAE80, 0x927EB000,
-	0x927DB180, 0x927CB300, 0x927BB480,
-	0x927AB600, 0x9279B780, 0x9278B900,
-	0x9277BA80, 0x9276BC00, 0x9275BD80,
-	0x9274BF00, 0x9273C080, 0x9272C200,
-	0x9271C380, 0x9270C500, 0x926FC680,
-	0x926EC800, 0x926DC980, 0x926CCB00,
-	0x926BCC80, 0x926ACE00, 0x9269CF80,
-	0x9268D100, 0x9267D280, 0x9266D400,
-	0x9265D580, 0x9264D700, 0x9263D880,
-	0x9262DA00, 0x9261DB80, 0x9260DD00,
-	0x925FDE80, 0x925EE000, 0x925DE180,
-	0x925CE300, 0x925BE480, 0x925AE600,
-	0x9259E780, 0x9258E900, 0x9257EA80,
-	0x9256EC00, 0x9255ED80, 0x9254EF00,
-	0x9253F080, 0x9252F200, 0x9251F380,
-	0x9250F500, 0x924FF680, 0x924EF800,
-	0x924DF980, 0x924CFB00, 0x924BFC80,
-	0x924AFE00, 0x9249FF80, 0x92490100,
-	0x92480280, 0x92470400, 0x92460580,
-	0x92450700, 0x92440880, 0x92430A00,
-	0x92420B80, 0x92410D00, 0x92400E80,
-	0x923F1000, 0x923E1180, 0x923D1300,
-	0x923C1480, 0x923B1600, 0x923A1780,
-	0x92391900, 0x92381A80, 0x92371C00,
-	0x92361D80, 0x92351F00, 0x92342080,
-	0x92332200, 0x92322380, 0x92312500,
-	0x92302680, 0x922F2800, 0x922E2980,
-	0x922D2B00, 0x922C2C80, 0x922B2E00,
-	0x922A2F80, 0x92293100, 0x92283280,
-	0x92273400, 0x92263580, 0x92253700,
-	0x92243880, 0x92233A00, 0x92223B80,
-	0x92213D00, 0x92203E80, 0x921F4000,
-	0x921E4180, 0x921D4300, 0x921C4480,
-	0x921B4600, 0x921A4780, 0x92194900,
-	0x92184A80, 0x92174C00, 0x92164D80,
-	0x92154F00, 0x92145080, 0x92135200,
-	0x92125380, 0x92115500, 0x92105680,
-	0x920F5800, 0x920E5980, 0x920D5B00,
-	0x920C5C80, 0x920B5E00, 0x920A5F80,
-	0x92096100, 0x92086280, 0x92076400,
-	0x92066580, 0x92056700, 0x92046880,
-	0x92036A00, 0x92026B80, 0x92016D00,
-	0x92006E80, 0x91FF7000, 0x91FE7180,
-	0x91FD7300, 0x91FC7480, 0x91FB7600,
-	0x91FA7780, 0x91F97900, 0x91F87A80,
-	0x91F77C00, 0x91F67D80, 0x91F57F00,
-	0x91F48080, 0x91F38200, 0x91F28380,
-	0x91F18500, 0x91F08680, 0x91EF8800,
-	0x91EE8980, 0x91ED8B00, 0x91EC8C80,
-	0x91EB8E00, 0x91EA8F80, 0x91E99100,
-	0x91E89280, 0x91E79400, 0x91E69580,
-	0x91E59700, 0x91E49880, 0x91E39A00,
-	0x91E29B80, 0x91E19D00, 0x91E09E80,
-	0x91DFA000, 0x91DEA180, 0x91DDA300,
-	0x91DCA480, 0x91DBA600, 0x91DAA780,
-	0x91D9A900, 0x91D8AA80, 0x91D7AC00,
-	0x91D6AD80, 0x91D5AF00, 0x91D4B080,
-	0x91D3B200, 0x91D2B380, 0x91D1B500,
-	0x91D0B680, 0x91CFB800, 0x91CEB980,
-	0x91CDBB00, 0x91CCBC80, 0x91CBBE00,
-	0x91CABF80, 0x91C9C100, 0x91C8C280,
-	0x91C7C400, 0x91C6C580, 0x91C5C700,
-	0x91C4C880, 0x91C3CA00, 0x91C2CB80,
-	0x91C1CD00, 0x91C0CE80, 0x91BFD000,
-	0x91BED180, 0x91BDD300, 0x91BCD480,
-	0x91BBD600, 0x91BAD780, 0x91B9D900,
-	0x91B8DA80, 0x91B7DC00, 0x91B6DD80,
-	0x91B5DF00, 0x91B4E080, 0x91B3E200,
-	0x91B2E380, 0x91B1E500, 0x91B0E680,
-	0x91AFE800, 0x91AEE980, 0x91ADEB00,
-	0x91ACEC80, 0x91ABEE00, 0x91AAEF80,
-	0x91A9F100, 0x91A8F280, 0x91A7F400,
-	0x91A6F580, 0x91A5F700, 0x91A4F880,
-	0x91A3FA00, 0x91A2FB80, 0x91A1FD00,
-	0x91A0FE80, 0x91A00000, 0x919F0F80,
-	0x919E1F00, 0x919D2E80, 0x919C3E00,
-	0x919B4D80, 0x919A5D00, 0x91996C80,
-	0x91987C00, 0x91978B80, 0x91969B00,
-	0x9195AA80, 0x9194BA00, 0x9193C980,
-	0x9192D900, 0x9191E880, 0x9190F800,
-	0x91900780, 0x918F1700, 0x918E2680,
-	0x918D3600, 0x918C4580, 0x918B5500,
-	0x918A6480, 0x91897400, 0x91888380,
-	0x91879300, 0x9186A280, 0x9185B200,
-	0x9184C180, 0x9183D100, 0x9182E080,
-	0x9181F000, 0x9180FF80, 0x91800F00,
-	0x917F1E80, 0x917E2E00, 0x917D3D80,
-	0x917C4D00, 0x917B5C80, 0x917A6C00,
-	0x91797B80, 0x91788B00, 0x91779A80,
-	0x9176AA00, 0x9175B980, 0x9174C900,
-	0x9173D880, 0x9172E800, 0x9171F780,
-	0x91710700, 0x91701680, 0x916F2600,
-	0x916E3580, 0x916D4500, 0x916C5480,
-	0x916B6400, 0x916A7380, 0x91698300,
-	0x91689280, 0x9167A200, 0x9166B180,
-	0x9165C100, 0x9164D080, 0x9163E000,
-	0x9162EF80, 0x9161FF00, 0x91610E80,
-	0x91601E00, 0x915F2D80, 0x915E3D00,
-	0x915D4C80, 0x915C5C00, 0x915B6B80,
-	0x915A7B00, 0x91598A80, 0x91589A00,
-	0x9157A980, 0x9156B900, 0x9155C880,
-	0x9154D800, 0x9153E780, 0x9152F700,
-	0x91520680, 0x91511600, 0x91502580,
-	0x914F3500, 0x914E4480, 0x914D5400,
-	0x914C6380, 0x914B7300, 0x914A8280,
-	0x91499200, 0x9148A180, 0x9147B100,
-	0x9146C080, 0x9145D000, 0x9144DF80,
-	0x9143EF00, 0x9142FE80, 0x91420E00,
-	0x91411D80, 0x91402D00, 0x913F3C80,
-	0x913E4C00, 0x913D5B80, 0x913C6B00,
-	0x913B7A80, 0x913A8A00, 0x91399980,
-	0x9138A900, 0x9137B880, 0x9136C800,
-	0x9135D780, 0x9134E700, 0x9133F680,
-	0x91330600, 0x91321580, 0x91312500,
-	0x91303480, 0x912F4400, 0x912E5380,
-	0x912D6300, 0x912C7280, 0x912B8200,
-	0x912A9180, 0x9129A100, 0x9128B080,
-	0x9127C000, 0x9126CF80, 0x9125DF00,
-	0x9124EE80, 0x9123FE00, 0x91230D80,
-	0x91221D00, 0x91212C80, 0x91203C00,
-	0x911F4B80, 0x911E5B00, 0x911D6A80,
-	0x911C7A00, 0x911B8980, 0x911A9900,
-	0x9119A880, 0x9118B800, 0x9117C780,
-	0x9116D700, 0x9115E680, 0x9114F600,
-	0x91140580, 0x91131500, 0x91122480,
-	0x91113400, 0x91104380, 0x910F5300,
-	0x910E6280, 0x910D7200, 0x910C8180,
-	0x910B9100, 0x910AA080, 0x9109B000,
-	0x9108BF80, 0x9107CF00, 0x9106DE80,
-	0x9105EE00, 0x9104FD80, 0x91040D00,
-	0x91031C80, 0x91022C00, 0x91013B80,
-	0x91004B00, 0x90FF5A80, 0x90FE6A00,
-	0x90FD7980, 0x90FC8900, 0x90FB9880,
-	0x90FAA800, 0x90F9B780, 0x90F8C700,
-	0x90F7D680, 0x90F6E600, 0x90F5F580,
-	0x90F50500, 0x90F41480, 0x90F32400,
-	0x90F23380, 0x90F14300, 0x90F05280,
-	0x90EF6200, 0x90EE7180, 0x90ED8100,
-	0x90EC9080, 0x90EBA000, 0x90EAAF80,
-	0x90E9BF00, 0x90E8CE80, 0x90E7DE00,
-	0x90E6ED80, 0x90E5FD00, 0x90E50C80,
-	0x90E41C00, 0x90E32B80, 0x90E23B00,
-	0x90E14A80, 0x90E05A00, 0x90DF6980,
-	0x90DE7900, 0x90DD8880, 0x90DC9800,
-	0x90DBA780, 0x90DAB700, 0x90D9C680,
-	0x90D8D600, 0x90D7E580, 0x90D6F500,
-	0x90D60480, 0x90D51400, 0x90D42380,
-	0x90D33300, 0x90D24280, 0x90D15200,
-	0x90D06180, 0x90CF7100, 0x90CE8080,
-	0x90CD9000, 0x90CC9F80, 0x90CBAF00,
-	0x90CABE80, 0x90C9CE00, 0x90C8DD80,
-	0x90C7ED00, 0x90C6FC80, 0x90C60C00,
-	0x90C51B80, 0x90C42B00, 0x90C33A80,
-	0x90C24A00, 0x90C15980, 0x90C06900,
-	0x90BF7880, 0x90BE8800, 0x90BD9780,
-	0x90BCA700, 0x90BBB680, 0x90BAC600,
-	0x90B9D580, 0x90B8E500, 0x90B7F480,
-	0x90B70400, 0x90B61380, 0x90B52300,
-	0x90B43280, 0x90B34200, 0x90B25180,
-	0x90B16100, 0x90B07080, 0x90AF8000,
-	0x90AE8F80, 0x90AD9F00, 0x90ACAE80,
-	0x90ABBE00, 0x90AACD80, 0x90A9DD00,
-	0x90A8EC80, 0x90A7FC00, 0x90A70B80,
-	0x90A61B00, 0x90A52A80, 0x90A43A00,
-	0x90A34980, 0x90A25900, 0x90A16880,
-	0x90A07800, 0x909F8780, 0x909E9700,
-	0x909DA680, 0x909CB600, 0x909BC580,
-	0x909AD500, 0x9099E480, 0x9098F400,
-	0x90980380, 0x90971300, 0x90962280,
-	0x90953200, 0x90944180, 0x90935100,
-	0x90926080, 0x90917000, 0x90907F80,
-	0x908F8F00, 0x908E9E80, 0x908DAE00,
-	0x908CBD80, 0x908BCD00, 0x908ADC80,
-	0x9089EC00, 0x9088FB80, 0x90880B00,
-	0x90871A80, 0x90862A00, 0x90853980,
-	0x90844900, 0x90835880, 0x90826800,
-	0x90817780, 0x90808700, 0x907F9680,
-	0x907EA600, 0x907DB580, 0x907CC500,
-	0x907BD480, 0x907AE400, 0x9079F380,
-	0x90790300, 0x90781280, 0x90772200,
-	0x90763180, 0x90754100, 0x90745080,
-	0x90736000, 0x90726F80, 0x90717F00,
-	0x90708E80, 0x906F9E00, 0x906EAD80,
-	0x906DBD00, 0x906CCC80, 0x906BDC00,
-	0x906AEB80, 0x9069FB00, 0x90690A80,
-	0x90681A00, 0x90672980, 0x90663900,
-	0x90654880, 0x90645800, 0x90636780,
-	0x90627700, 0x90618680, 0x90609600,
-	0x905FA580, 0x905EB500, 0x905DC480,
-	0x905CD400, 0x905BE380, 0x905AF300,
-	0x905A0280, 0x90591200, 0x90582180,
-	0x90573100, 0x90564080, 0x90555000,
-	0x90545F80, 0x90536F00, 0x90527E80,
-	0x90518E00, 0x90509D80, 0x904FAD00,
-	0x904EBC80, 0x904DCC00, 0x904CDB80,
-	0x904BEB00, 0x904AFA80, 0x904A0A00,
-	0x90491980, 0x90482900, 0x90473880,
-	0x90464800, 0x90455780, 0x90446700,
-	0x90437680, 0x90428600, 0x90419580,
-	0x9040A500, 0x903FB480, 0x903EC400,
-	0x903DD380, 0x903CE300, 0x903BF280,
-	0x903B0200, 0x903A1180, 0x90392100,
-	0x90383080, 0x90374000, 0x90364F80,
-	0x90355F00, 0x90346E80, 0x90337E00,
-	0x90328D80, 0x90319D00, 0x9030AC80,
-	0x902FBC00, 0x902ECB80, 0x902DDB00,
-	0x902CEA80, 0x902BFA00, 0x902B0980,
-	0x902A1900, 0x90292880, 0x90283800,
-	0x90274780, 0x90265700, 0x90256680,
-	0x90247600, 0x90238580, 0x90229500,
-	0x9021A480, 0x9020B400, 0x901FC380,
-	0x901ED300, 0x901DE280, 0x901CF200,
-	0x901C0180, 0x901B1100, 0x901A2080,
-	0x90193000, 0x90183F80, 0x90174F00,
-	0x90165E80, 0x90156E00, 0x90147D80,
-	0x90138D00, 0x90129C80, 0x9011AC00,
-	0x9010BB80, 0x900FCB00, 0x900EDA80,
-	0x900DEA00, 0x900CF980, 0x900C0900,
-	0x900B1880, 0x900A2800, 0x90093780,
-	0x90084700, 0x90075680, 0x90066600,
-	0x90057580, 0x90048500, 0x90039480,
-	0x9002A400, 0x9001B380, 0x9000C300,
-	0x8FFFD280, 0x8FFEE200, 0x8FFDF180,
-	0x8FFD0100, 0x8FFC1080, 0x8FFB2000,
-	0x8FFA2F80, 0x8FF93F00, 0x8FF84E80,
-	0x8FF75E00, 0x8FF66D80, 0x8FF57D00,
-	0x8FF48C80, 0x8FF39C00, 0x8FF2AB80,
-	0x8FF1BB00, 0x8FF0CA80, 0x8FEFDA00,
-	0x8FEEE980, 0x8FEDF900, 0x8FED0880,
-	0x8FEC1800, 0x8FEB2780, 0x8FEA3700,
-	0x8FE94680, 0x8FE85600, 0x8FE76580,
-	0x8FE67500, 0x8FE58480, 0x8FE49400,
-	0x8FE3A380, 0x8FE2B300, 0x8FE1C280,
-	0x8FE0D200, 0x8FDFE180, 0x8FDEF100,
-	0x8FDE0080, 0x8FDD1000, 0x8FDC1F80,
-	0x8FDB2F00, 0x8FDA3E80, 0x8FD94E00,
-	0x8FD85D80, 0x8FD76D00, 0x8FD67C80,
-	0x8FD58C00, 0x8FD49B80, 0x8FD3AB00,
-	0x8FD2BA80, 0x8FD1CA00, 0x8FD0D980,
-	0x8FCFE900, 0x8FCEF880, 0x8FCE0800,
-	0x8FCD1780, 0x8FCC2700, 0x8FCB3680,
-	0x8FCA4600, 0x8FC95580, 0x8FC86500,
-	0x8FC77480, 0x8FC68400, 0x8FC59380,
-	0x8FC4A300, 0x8FC3B280, 0x8FC2C200,
-	0x8FC1D180, 0x8FC0E100, 0x8FBFF080,
-	0x8FBF0000, 0x8FBE0F80, 0x8FBD1F00,
-	0x8FBC2E80, 0x8FBB3E00, 0x8FBA4D80,
-	0x8FB95D00, 0x8FB86C80, 0x8FB77C00,
-	0x8FB68B80, 0x8FB59B00, 0x8FB4AA80,
-	0x8FB3BA00, 0x8FB2C980, 0x8FB1D900,
-	0x8FB0E880, 0x8FAFF800, 0x8FAF0780,
-	0x8FAE1700, 0x8FAD2680, 0x8FAC3600,
-	0x8FAB4580, 0x8FAA5500, 0x8FA96480,
-	0x8FA87400, 0x8FA78380, 0x8FA69300,
-	0x8FA5A280, 0x8FA4B200, 0x8FA3C180,
-	0x8FA2D100, 0x8FA1E080, 0x8FA0F000,
-	0x8F9FFF80, 0x8F9F0F00, 0x8F9E1E80,
-	0x8F9D2E00, 0x8F9C3D80, 0x8F9B4D00,
-	0x8F9A5C80, 0x8F996C00, 0x8F987B80,
-	0x8F978B00, 0x8F969A80, 0x8F95AA00,
-	0x8F94B980, 0x8F93C900, 0x8F92D880,
-	0x8F91E800, 0x8F90F780, 0x8F900700,
-	0x8F8F1680, 0x8F8E2600, 0x8F8D3580,
-	0x8F8C4500, 0x8F8B5480, 0x8F8A6400,
-	0x8F897380, 0x8F888300, 0x8F879280,
-	0x8F86A200, 0x8F85B180, 0x8F84C100,
-	0x8F83D080, 0x8F82E000, 0x8F81EF80,
-	0x8F80FF00, 0x8F800E80, 0x8F7F1E00,
-	0x8F7E2D80, 0x8F7D3D00, 0x8F7C4C80,
-	0x8F7B5C00, 0x8F7A6B80, 0x8F797B00,
-	0x8F788A80, 0x8F779A00, 0x8F76A980,
-	0x8F75B900, 0x8F74C880, 0x8F73D800,
-	0x8F72E780, 0x8F71F700, 0x8F710680,
-	0x8F701600, 0x8F6F2580, 0x8F6E3500,
-	0x8F6D4480, 0x8F6C5400, 0x8F6B6380,
-	0x8F6A7300, 0x8F698280, 0x8F689200,
-	0x8F67A180, 0x8F66B100, 0x8F65C080,
-	0x8F64D000, 0x8F63DF80, 0x8F62EF00,
-	0x8F61FE80, 0x8F610E00, 0x8F601D80,
-	0x8F5F2D00, 0x8F5E3C80, 0x8F5D4C00,
-	0x8F5C5B80, 0x8F5B6B00, 0x8F5A7A80,
-	0x8F598A00, 0x8F589980, 0x8F57A900,
-	0x8F56B880, 0x8F55C800, 0x8F54D780,
-	0x8F53E700, 0x8F52F680, 0x8F520600,
-	0x8F511580, 0x8F502500, 0x8F4F3480,
-	0x8F4E4400, 0x8F4D5380, 0x8F4C6300,
-	0x8F4B7280, 0x8F4A8200, 0x8F499180,
-	0x8F48A100, 0x8F47B080, 0x8F46C000,
-	0x8F45CF80, 0x8F44DF00, 0x8F43EE80,
-	0x8F42FE00, 0x8F420D80, 0x8F411D00,
-	0x8F402C80, 0x8F3F3C00, 0x8F3E4B80,
-	0x8F3D5B00, 0x8F3C6A80, 0x8F3B7A00,
-	0x8F3A8980, 0x8F399900, 0x8F38A880,
-	0x8F37B800, 0x8F36C780, 0x8F35D700,
-	0x8F34E680, 0x8F33F600, 0x8F330580,
-	0x8F321500, 0x8F312480, 0x8F303400,
-	0x8F2F4380, 0x8F2E5300, 0x8F2D6280,
-	0x8F2C7200, 0x8F2B8180, 0x8F2A9100,
-	0x8F29A080, 0x8F28B000, 0x8F27BF80,
-	0x8F26CF00, 0x8F25DE80, 0x8F24EE00,
-	0x8F23FD80, 0x8F230D00, 0x8F221C80,
-	0x8F212C00, 0x8F203B80, 0x8F1F4B00,
-	0x8F1E5A80, 0x8F1D6A00, 0x8F1C7980,
-	0x8F1B8900, 0x8F1A9880, 0x8F19A800,
-	0x8F18B780, 0x8F17C700, 0x8F16D680,
-	0x8F15E600, 0x8F14F580, 0x8F140500,
-	0x8F131480, 0x8F122400, 0x8F113380,
-	0x8F104300, 0x8F0F5280, 0x8F0E6200,
-	0x8F0D7180, 0x8F0C8100, 0x8F0B9080,
-	0x8F0AA000, 0x8F09AF80, 0x8F08BF00,
-	0x8F07CE80, 0x8F06DE00, 0x8F05ED80,
-	0x8F04FD00, 0x8F040C80, 0x8F031C00,
-	0x8F022B80, 0x8F013B00, 0x8F004A80,
-	0x8EFF5A00, 0x8EFE6980, 0x8EFD7900,
-	0x8EFC8880, 0x8EFB9800, 0x8EFAA780,
-	0x8EF9B700, 0x8EF8C680, 0x8EF7D600,
-	0x8EF6E580, 0x8EF5F500, 0x8EF50480,
-	0x8EF41400, 0x8EF32380, 0x8EF23300,
-	0x8EF14280, 0x8EF05200, 0x8EEF6180,
-	0x8EEE7100, 0x8EED8080, 0x8EEC9000,
-	0x8EEB9F80, 0x8EEAAF00, 0x8EE9BE80,
-	0x8EE8CE00, 0x8EE7DD80, 0x8EE6ED00,
-	0x8EE5FC80, 0x8EE50C00, 0x8EE41B80,
-	0x8EE32B00, 0x8EE23A80, 0x8EE14A00,
-	0x8EE05980, 0x8EDF6900, 0x8EDE7880,
-	0x8EDD8800, 0x8EDC9780, 0x8EDBA700,
-	0x8EDAB680, 0x8ED9C600, 0x8ED8D580,
-	0x8ED7E500, 0x8ED6F480, 0x8ED60400,
-	0x8ED51380, 0x8ED42300, 0x8ED33280,
-	0x8ED24200, 0x8ED15180, 0x8ED06100,
-	0x8ECF7080, 0x8ECE8000, 0x8ECD8F80,
-	0x8ECC9F00, 0x8ECBAE80, 0x8ECABE00,
-	0x8EC9CD80, 0x8EC8DD00, 0x8EC7EC80,
-	0x8EC6FC00, 0x8EC60B80, 0x8EC51B00,
-	0x8EC42A80, 0x8EC33A00, 0x8EC24980,
-	0x8EC15900, 0x8EC06880, 0x8EBF7800,
-	0x8EBE8780, 0x8EBD9700, 0x8EBCA680,
-	0x8EBBB600, 0x8EBAC580, 0x8EB9D500,
-	0x8EB8E480, 0x8EB7F400, 0x8EB70380,
-	0x8EB61300, 0x8EB52280, 0x8EB43200,
-	0x8EB34180, 0x8EB25100, 0x8EB16080,
-	0x8EB07000, 0x8EAF7F80, 0x8EAE8F00,
-	0x8EAD9E80, 0x8EACAE00, 0x8EABBD80,
-	0x8EAACD00, 0x8EA9DC80, 0x8EA8EC00,
-	0x8EA7FB80, 0x8EA70B00, 0x8EA61A80,
-	0x8EA52A00, 0x8EA43980, 0x8EA34900,
-	0x8EA25880, 0x8EA16800, 0x8EA07780,
-	0x8E9F8700, 0x8E9E9680, 0x8E9DA600,
-	0x8E9CB580, 0x8E9BC500, 0x8E9AD480,
-	0x8E99E400, 0x8E98F380, 0x8E980300,
-	0x8E971280, 0x8E962200, 0x8E953180,
-	0x8E944100, 0x8E935080, 0x8E926000,
-	0x8E916F80, 0x8E907F00, 0x8E8F8E80,
-	0x8E8E9E00, 0x8E8DAD80, 0x8E8CBD00,
-	0x8E8BCC80, 0x8E8ADC00, 0x8E89EB80,
-	0x8E88FB00, 0x8E880A80, 0x8E871A00,
-	0x8E862980, 0x8E853900, 0x8E844880,
-	0x8E835800, 0x8E826780, 0x8E817700,
-	0x8E808680, 0x8E7F9600, 0x8E7EA580,
-	0x8E7DB500, 0x8E7CC480, 0x8E7BD400,
-	0x8E7AE380, 0x8E79F300, 0x8E790280,
-	0x8E781200, 0x8E772180, 0x8E763100,
-	0x8E754080, 0x8E745000, 0x8E735F80,
-	0x8E726F00, 0x8E717E80, 0x8E708E00,
-	0x8E6F9D80, 0x8E6EAD00, 0x8E6DBC80,
-	0x8E6CCC00, 0x8E6BDB80, 0x8E6AEB00,
-	0x8E69FA80, 0x8E690A00, 0x8E681980,
-	0x8E672900, 0x8E663880, 0x8E654800,
-	0x8E645780, 0x8E636700, 0x8E627680,
-	0x8E618600, 0x8E609580, 0x8E5FA500,
-	0x8E5EB480, 0x8E5DC400, 0x8E5CD380,
-	0x8E5BE300, 0x8E5AF280, 0x8E5A0200,
-	0x8E591180, 0x8E582100, 0x8E573080,
-	0x8E564000, 0x8E554F80, 0x8E545F00,
-	0x8E536E80, 0x8E527E00, 0x8E518D80,
-	0x8E509D00, 0x8E4FAC80, 0x8E4EBC00,
-	0x8E4DCB80, 0x8E4CDB00, 0x8E4BEA80,
-	0x8E4AFA00, 0x8E4A0980, 0x8E491900,
-	0x8E482880, 0x8E473800, 0x8E464780,
-	0x8E455700, 0x8E446680, 0x8E437600,
-	0x8E428580, 0x8E419500, 0x8E40A480,
-	0x8E3FB400, 0x8E3EC380, 0x8E3DD300,
-	0x8E3CE280, 0x8E3BF200, 0x8E3B0180,
-	0x8E3A1100, 0x8E392080, 0x8E383000,
-	0x8E373F80, 0x8E364F00, 0x8E355E80,
-	0x8E346E00, 0x8E337D80, 0x8E328D00,
-	0x8E319C80, 0x8E30AC00, 0x8E2FBB80,
-	0x8E2ECB00, 0x8E2DDA80, 0x8E2CEA00,
-	0x8E2BF980, 0x8E2B0900, 0x8E2A1880,
-	0x8E292800, 0x8E283780, 0x8E274700,
-	0x8E265680, 0x8E256600, 0x8E247580,
-	0x8E238500, 0x8E229480, 0x8E21A400,
-	0x8E20B380, 0x8E1FC300, 0x8E1ED280,
-	0x8E1DE200, 0x8E1CF180, 0x8E1C0100,
-	0x8E1B1080, 0x8E1A2000, 0x8E192F80,
-	0x8E183F00, 0x8E174E80, 0x8E165E00,
-	0x8E156D80, 0x8E147D00, 0x8E138C80,
-	0x8E129C00, 0x8E11AB80, 0x8E10BB00,
-	0x8E0FCA80, 0x8E0EDA00, 0x8E0DE980,
-	0x8E0CF900, 0x8E0C0880, 0x8E0B1800,
-	0x8E0A2780, 0x8E093700, 0x8E084680,
-	0x8E075600, 0x8E066580, 0x8E057500,
-	0x8E048480, 0x8E039400, 0x8E02A380,
-	0x8E01B300, 0x8E00C280, 0x8DFFD200,
-	0x8DFEE180, 0x8DFDF100, 0x8DFD0080,
-	0x8DFC1000, 0x8DFB1F80, 0x8DFA2F00,
-	0x8DF93E80, 0x8DF84E00, 0x8DF75D80,
-	0x8DF66D00, 0x8DF57C80, 0x8DF48C00,
-	0x8DF39B80, 0x8DF2AB00, 0x8DF1BA80,
-	0x8DF0CA00, 0x8DEFD980, 0x8DEEE900,
-	0x8DEDF880, 0x8DED0800, 0x8DEC1780,
-	0x8DEB2700, 0x8DEA3680, 0x8DE94600,
-	0x8DE85580, 0x8DE76500, 0x8DE67480,
-	0x8DE58400, 0x8DE49380, 0x8DE3A300,
-	0x8DE2B280, 0x8DE1C200, 0x8DE0D180,
-	0x8DDFE100, 0x8DDEF080, 0x8DDE0000,
-	0x8DDD0F80, 0x8DDC1F00, 0x8DDB2E80,
-	0x8DDA3E00, 0x8DD94D80, 0x8DD85D00,
-	0x8DD76C80, 0x8DD67C00, 0x8DD58B80,
-	0x8DD49B00, 0x8DD3AA80, 0x8DD2BA00,
-	0x8DD1C980, 0x8DD0D900, 0x8DCFE880,
-	0x8DCEF800, 0x8DCE0780, 0x8DCD1700,
-	0x8DCC2680, 0x8DCB3600, 0x8DCA4580,
-	0x8DC95500, 0x8DC86480, 0x8DC77400,
-	0x8DC68380, 0x8DC59300, 0x8DC4A280,
-	0x8DC3B200, 0x8DC2C180, 0x8DC1D100,
-	0x8DC0E080, 0x8DBFF000, 0x8DBEFF80,
-	0x8DBE0F00, 0x8DBD1E80, 0x8DBC2E00,
-	0x8DBB3D80, 0x8DBA4D00, 0x8DB95C80,
-	0x8DB86C00, 0x8DB77B80, 0x8DB68B00,
-	0x8DB59A80, 0x8DB4AA00, 0x8DB3B980,
-	0x8DB2C900, 0x8DB1D880, 0x8DB0E800,
-	0x8DAFF780, 0x8DAF0700, 0x8DAE1680,
-	0x8DAD2600, 0x8DAC3580, 0x8DAB4500,
-	0x8DAA5480, 0x8DA96400, 0x8DA87380,
-	0x8DA78300, 0x8DA69280, 0x8DA5A200,
-	0x8DA4B180, 0x8DA3C100, 0x8DA2D080,
-	0x8DA1E000, 0x8DA0EF80, 0x8D9FFF00,
-	0x8D9F0E80, 0x8D9E1E00, 0x8D9D2D80,
-	0x8D9C3D00, 0x8D9B4C80, 0x8D9A5C00,
-	0x8D996B80, 0x8D987B00, 0x8D978A80,
-	0x8D969A00, 0x8D95A980, 0x8D94B900,
-	0x8D93C880, 0x8D92D800, 0x8D91E780,
-	0x8D90F700, 0x8D900680, 0x8D8F1600,
-	0x8D8E2580, 0x8D8D3500, 0x8D8C4480,
-	0x8D8B5400, 0x8D8A6380, 0x8D897300,
-	0x8D888280, 0x8D879200, 0x8D86A180,
-	0x8D85B100, 0x8D84C080, 0x8D83D000,
-	0x8D82DF80, 0x8D81EF00, 0x8D80FE80,
-	0x8D800E00, 0x8D7F1D80, 0x8D7E2D00,
-	0x8D7D3C80, 0x8D7C4C00, 0x8D7B5B80,
-	0x8D7A6B00, 0x8D797A80, 0x8D788A00,
-	0x8D779980, 0x8D76A900, 0x8D75B880,
-	0x8D74C800, 0x8D73D780, 0x8D72E700,
-	0x8D71F680, 0x8D710600, 0x8D701580,
-	0x8D6F2500, 0x8D6E3480, 0x8D6D4400,
-	0x8D6C5380, 0x8D6B6300, 0x8D6A7280,
-	0x8D698200, 0x8D689180, 0x8D67A100,
-	0x8D66B080, 0x8D65C000, 0x8D64CF80,
-	0x8D63DF00, 0x8D62EE80, 0x8D61FE00,
-	0x8D610D80, 0x8D601D00, 0x8D5F2C80,
-	0x8D5E3C00, 0x8D5D4B80, 0x8D5C5B00,
-	0x8D5B6A80, 0x8D5A7A00, 0x8D598980,
-	0x8D589900, 0x8D57A880, 0x8D56B800,
-	0x8D55C780, 0x8D54D700, 0x8D53E680,
-	0x8D52F600, 0x8D520580, 0x8D511500,
-	0x8D502480, 0x8D4F3400, 0x8D4E4380,
-	0x8D4D5300, 0x8D4C6280, 0x8D4B7200,
-	0x8D4A8180, 0x8D499100, 0x8D48A080,
-	0x8D47B000, 0x8D46BF80, 0x8D45CF00,
-	0x8D44DE80, 0x8D43EE00, 0x8D42FD80,
-	0x8D420D00, 0x8D411C80, 0x8D402C00,
-	0x8D3F3B80, 0x8D3E4B00, 0x8D3D5A80,
-	0x8D3C6A00, 0x8D3B7980, 0x8D3A8900,
-	0x8D399880, 0x8D38A800, 0x8D37B780,
-	0x8D36C700, 0x8D35D680, 0x8D34E600,
-	0x8D33F580, 0x8D330500, 0x8D321480,
-	0x8D312400, 0x8D303380, 0x8D2F4300,
-	0x8D2E5280, 0x8D2D6200, 0x8D2C7180,
-	0x8D2B8100, 0x8D2A9080, 0x8D29A000,
-	0x8D28AF80, 0x8D27BF00, 0x8D26CE80,
-	0x8D25DE00, 0x8D24ED80, 0x8D23FD00,
-	0x8D230C80, 0x8D221C00, 0x8D212B80,
-	0x8D203B00, 0x8D1F4A80, 0x8D1E5A00,
-	0x8D1D6980, 0x8D1C7900, 0x8D1B8880,
-	0x8D1A9800, 0x8D19A780, 0x8D18B700,
-	0x8D17C680, 0x8D16D600, 0x8D15E580,
-	0x8D14F500, 0x8D140480, 0x8D131400,
-	0x8D122380, 0x8D113300, 0x8D104280,
-	0x8D0F5200, 0x8D0E6180, 0x8D0D7100,
-	0x8D0C8080, 0x8D0B9000, 0x8D0A9F80,
-	0x8D09AF00, 0x8D08BE80, 0x8D07CE00,
-	0x8D06DD80, 0x8D05ED00, 0x8D04FC80,
-	0x8D040C00, 0x8D031B80, 0x8D022B00,
-	0x8D013A80, 0x8D004A00, 0x8CFF5980,
-	0x8CFE6900, 0x8CFD7880, 0x8CFC8800,
-	0x8CFB9780, 0x8CFAA700, 0x8CF9B680,
-	0x8CF8C600, 0x8CF7D580, 0x8CF6E500,
-	0x8CF5F480, 0x8CF50400, 0x8CF41380,
-	0x8CF32300, 0x8CF23280, 0x8CF14200,
-	0x8CF05180, 0x8CEF6100, 0x8CEE7080,
-	0x8CED8000, 0x8CEC8F80, 0x8CEB9F00,
-	0x8CEAAE80, 0x8CE9BE00, 0x8CE8CD80,
-	0x8CE7DD00, 0x8CE6EC80, 0x8CE5FC00,
-	0x8CE50B80, 0x8CE41B00, 0x8CE32A80,
-	0x8CE23A00, 0x8CE14980, 0x8CE05900,
-	0x8CDF6880, 0x8CDE7800, 0x8CDD8780,
-	0x8CDC9700, 0x8CDBA680, 0x8CDAB600,
-	0x8CD9C580, 0x8CD8D500, 0x8CD7E480,
-	0x8CD6F400, 0x8CD60380, 0x8CD51300,
-	0x8CD42280, 0x8CD33200, 0x8CD24180,
-	0x8CD15100, 0x8CD06080, 0x8CCF7000,
-	0x8CCE7F80, 0x8CCD8F00, 0x8CCC9E80,
-	0x8CCBAE00, 0x8CCABD80, 0x8CC9CD00,
-	0x8CC8DC80, 0x8CC7EC00, 0x8CC6FB80,
-	0x8CC60B00, 0x8CC51A80, 0x8CC42A00,
-	0x8CC33980, 0x8CC24900, 0x8CC15880,
-	0x8CC06800, 0x8CBF7780, 0x8CBE8700,
-	0x8CBD9680, 0x8CBCA600, 0x8CBBB580,
-	0x8CBAC500, 0x8CB9D480, 0x8CB8E400,
-	0x8CB7F380, 0x8CB70300, 0x8CB61280,
-	0x8CB52200, 0x8CB43180, 0x8CB34100,
-	0x8CB25080, 0x8CB16000, 0x8CB06F80,
-	0x8CAF7F00, 0x8CAE8E80, 0x8CAD9E00,
-	0x8CACAD80, 0x8CABBD00, 0x8CAACC80,
-	0x8CA9DC00, 0x8CA8EB80, 0x8CA7FB00,
-	0x8CA70A80, 0x8CA61A00, 0x8CA52980,
-	0x8CA43900, 0x8CA34880, 0x8CA25800,
-	0x8CA16780, 0x8CA07700, 0x8C9F8680,
-	0x8C9E9600, 0x8C9DA580, 0x8C9CB500,
-	0x8C9BC480, 0x8C9AD400, 0x8C99E380,
-	0x8C98F300, 0x8C980280, 0x8C971200,
-	0x8C962180, 0x8C953100, 0x8C944080,
-	0x8C935000, 0x8C925F80, 0x8C916F00,
-	0x8C907E80, 0x8C8F8E00, 0x8C8E9D80,
-	0x8C8DAD00, 0x8C8CBC80, 0x8C8BCC00,
-	0x8C8ADB80, 0x8C89EB00, 0x8C88FA80,
-	0x8C880A00, 0x8C871980, 0x8C862900,
-	0x8C853880, 0x8C844800, 0x8C835780,
-	0x8C826700, 0x8C817680, 0x8C808600,
-	0x8C7F9580, 0x8C7EA500, 0x8C7DB480,
-	0x8C7CC400, 0x8C7BD380, 0x8C7AE300,
-	0x8C79F280, 0x8C790200, 0x8C781180,
-	0x8C772100, 0x8C763080, 0x8C754000,
-	0x8C744F80, 0x8C735F00, 0x8C726E80,
-	0x8C717E00, 0x8C708D80, 0x8C6F9D00,
-	0x8C6EAC80, 0x8C6DBC00, 0x8C6CCB80,
-	0x8C6BDB00, 0x8C6AEA80, 0x8C69FA00,
-	0x8C690980, 0x8C681900, 0x8C672880,
-	0x8C663800, 0x8C654780, 0x8C645700,
-	0x8C636680, 0x8C627600, 0x8C618580,
-	0x8C609500, 0x8C5FA480, 0x8C5EB400,
-	0x8C5DC380, 0x8C5CD300, 0x8C5BE280,
-	0x8C5AF200, 0x8C5A0180, 0x8C591100,
-	0x8C582080, 0x8C573000, 0x8C563F80,
-	0x8C554F00, 0x8C545E80, 0x8C536E00,
-	0x8C527D80, 0x8C518D00, 0x8C509C80,
-	0x8C4FAC00, 0x8C4EBB80, 0x8C4DCB00,
-	0x8C4CDA80, 0x8C4BEA00, 0x8C4AF980,
-	0x8C4A0900, 0x8C491880, 0x8C482800,
-	0x8C473780, 0x8C464700, 0x8C455680,
-	0x8C446600, 0x8C437580, 0x8C428500,
-	0x8C419480, 0x8C40A400, 0x8C3FB380,
-	0x8C3EC300, 0x8C3DD280, 0x8C3CE200,
-	0x8C3BF180, 0x8C3B0100, 0x8C3A1080,
-	0x8C392000, 0x8C382F80, 0x8C373F00,
-	0x8C364E80, 0x8C355E00, 0x8C346D80,
-	0x8C337D00, 0x8C328C80, 0x8C319C00,
-	0x8C30AB80, 0x8C2FBB00, 0x8C2ECA80,
-	0x8C2DDA00, 0x8C2CE980, 0x8C2BF900,
-	0x8C2B0880, 0x8C2A1800, 0x8C292780,
-	0x8C283700, 0x8C274680, 0x8C265600,
-	0x8C256580, 0x8C247500, 0x8C238480,
-	0x8C229400, 0x8C21A380, 0x8C20B300,
-	0x8C1FC280, 0x8C1ED200, 0x8C1DE180,
-	0x8C1CF100, 0x8C1C0080, 0x8C1B1000,
-	0x8C1A1F80, 0x8C192F00, 0x8C183E80,
-	0x8C174E00, 0x8C165D80, 0x8C156D00,
-	0x8C147C80, 0x8C138C00, 0x8C129B80,
-	0x8C11AB00, 0x8C10BA80, 0x8C0FCA00,
-	0x8C0ED980, 0x8C0DE900, 0x8C0CF880,
-	0x8C0C0800, 0x8C0B1780, 0x8C0A2700,
-	0x8C093680, 0x8C084600, 0x8C075580,
-	0x8C066500, 0x8C057480, 0x8C048400,
-	0x8C039380, 0x8C02A300, 0x8C01B280,
-	0x8C00C200, 0x8BFFD180, 0x8BFEE100,
-	0x8BFDF080, 0x8BFD0000, 0x8BFC0F80,
-	0x8BFB1F00, 0x8BFA2E80, 0x8BF93E00,
-	0x8BF84D80, 0x8BF75D00, 0x8BF66C80,
-	0x8BF57C00, 0x8BF48B80, 0x8BF39B00,
-	0x8BF2AA80, 0x8BF1BA00, 0x8BF0C980,
-	0x8BEFD900, 0x8BEEE880, 0x8BEDF800,
-	0x8BED0780, 0x8BEC1700, 0x8BEB2680,
-	0x8BEA3600, 0x8BE94580, 0x8BE85500,
-	0x8BE76480, 0x8BE67400, 0x8BE58380,
-	0x8BE49300, 0x8BE3A280, 0x8BE2B200,
-	0x8BE1C180, 0x8BE0D100, 0x8BDFE080,
-	0x8BDEF000, 0x8BDDFF80, 0x8BDD0F00,
-	0x8BDC1E80, 0x8BDB2E00, 0x8BDA3D80,
-	0x8BD94D00, 0x8BD85C80, 0x8BD76C00,
-	0x8BD67B80, 0x8BD58B00, 0x8BD49A80,
-	0x8BD3AA00, 0x8BD2B980, 0x8BD1C900,
-	0x8BD0D880, 0x8BCFE800, 0x8BCEF780,
-	0x8BCE0700, 0x8BCD1680, 0x8BCC2600,
-	0x8BCB3580, 0x8BCA4500, 0x8BC95480,
-	0x8BC86400, 0x8BC77380, 0x8BC68300,
-	0x8BC59280, 0x8BC4A200, 0x8BC3B180,
-	0x8BC2C100, 0x8BC1D080, 0x8BC0E000,
-	0x8BBFEF80, 0x8BBEFF00, 0x8BBE0E80,
-	0x8BBD1E00, 0x8BBC2D80, 0x8BBB3D00,
-	0x8BBA4C80, 0x8BB95C00, 0x8BB86B80,
-	0x8BB77B00, 0x8BB68A80, 0x8BB59A00,
-	0x8BB4A980, 0x8BB3B900, 0x8BB2C880,
-	0x8BB1D800, 0x8BB0E780, 0x8BAFF700,
-	0x8BAF0680, 0x8BAE1600, 0x8BAD2580,
-	0x8BAC3500, 0x8BAB4480, 0x8BAA5400,
-	0x8BA96380, 0x8BA87300, 0x8BA78280,
-	0x8BA69200, 0x8BA5A180, 0x8BA4B100,
-	0x8BA3C080, 0x8BA2D000, 0x8BA1DF80,
-	0x8BA0EF00, 0x8B9FFE80, 0x8B9F0E00,
-	0x8B9E1D80, 0x8B9D2D00, 0x8B9C3C80,
-	0x8B9B4C00, 0x8B9A5B80, 0x8B996B00,
-	0x8B987A80, 0x8B978A00, 0x8B969980,
-	0x8B95A900, 0x8B94B880, 0x8B93C800,
-	0x8B92D780, 0x8B91E700, 0x8B90F680,
-	0x8B900600, 0x8B8F1580, 0x8B8E2500,
-	0x8B8D3480, 0x8B8C4400, 0x8B8B5380,
-	0x8B8A6300, 0x8B897280, 0x8B888200,
-	0x8B879180, 0x8B86A100, 0x8B85B080,
-	0x8B84C000, 0x8B83CF80, 0x8B82DF00,
-	0x8B81EE80, 0x8B80FE00, 0x8B800D80,
-	0x8B7F1D00, 0x8B7E2C80, 0x8B7D3C00,
-	0x8B7C4B80, 0x8B7B5B00, 0x8B7A6A80,
-	0x8B797A00, 0x8B788980, 0x8B779900,
-	0x8B76A880, 0x8B75B800, 0x8B74C780,
-	0x8B73D700, 0x8B72E680, 0x8B71F600,
-	0x8B710580, 0x8B701500, 0x8B6F2480,
-	0x8B6E3400, 0x8B6D4380, 0x8B6C5300,
-	0x8B6B6280, 0x8B6A7200, 0x8B698180,
-	0x8B689100, 0x8B67A080, 0x8B66B000,
-	0x8B65BF80, 0x8B64CF00, 0x8B63DE80,
-	0x8B62EE00, 0x8B61FD80, 0x8B610D00,
-	0x8B601C80, 0x8B5F2C00, 0x8B5E3B80,
-	0x8B5D4B00, 0x8B5C5A80, 0x8B5B6A00,
-	0x8B5A7980, 0x8B598900, 0x8B589880,
-	0x8B57A800, 0x8B56B780, 0x8B55C700,
-	0x8B54D680, 0x8B53E600, 0x8B52F580,
-	0x8B520500, 0x8B511480, 0x8B502400,
-	0x8B4F3380, 0x8B4E4300, 0x8B4D5280,
-	0x8B4C6200, 0x8B4B7180, 0x8B4A8100,
-	0x8B499080, 0x8B48A000, 0x8B47AF80,
-	0x8B46BF00, 0x8B45CE80, 0x8B44DE00,
-	0x8B43ED80, 0x8B42FD00, 0x8B420C80,
-	0x8B411C00, 0x8B402B80, 0x8B3F3B00,
-	0x8B3E4A80, 0x8B3D5A00, 0x8B3C6980,
-	0x8B3B7900, 0x8B3A8880, 0x8B399800,
-	0x8B38A780, 0x8B37B700, 0x8B36C680,
-	0x8B35D600, 0x8B34E580, 0x8B33F500,
-	0x8B330480, 0x8B321400, 0x8B312380,
-	0x8B303300, 0x8B2F4280, 0x8B2E5200,
-	0x8B2D6180, 0x8B2C7100, 0x8B2B8080,
-	0x8B2A9000, 0x8B299F80, 0x8B28AF00,
-	0x8B27BE80, 0x8B26CE00, 0x8B25DD80,
-	0x8B24ED00, 0x8B23FC80, 0x8B230C00,
-	0x8B221B80, 0x8B212B00, 0x8B203A80,
-	0x8B1F4A00, 0x8B1E5980, 0x8B1D6900,
-	0x8B1C7880, 0x8B1B8800, 0x8B1A9780,
-	0x8B19A700, 0x8B18B680, 0x8B17C600,
-	0x8B16D580, 0x8B15E500, 0x8B14F480,
-	0x8B140400, 0x8B131380, 0x8B122300,
-	0x8B113280, 0x8B104200, 0x8B0F5180,
-	0x8B0E6100, 0x8B0D7080, 0x8B0C8000,
-	0x8B0B8F80, 0x8B0A9F00, 0x8B09AE80,
-	0x8B08BE00, 0x8B07CD80, 0x8B06DD00,
-	0x8B05EC80, 0x8B04FC00, 0x8B040B80,
-	0x8B031B00, 0x8B022A80, 0x8B013A00,
-	0x8B004980, 0x8AFF5900, 0x8AFE6880,
-	0x8AFD7800, 0x8AFC8780, 0x8AFB9700,
-	0x8AFAA680, 0x8AF9B600, 0x8AF8C580,
-	0x8AF7D500, 0x8AF6E480, 0x8AF5F400,
-	0x8AF50380, 0x8AF41300, 0x8AF32280,
-	0x8AF23200, 0x8AF14180, 0x8AF05100,
-	0x8AEF6080, 0x8AEE7000, 0x8AED7F80,
-	0x8AEC8F00, 0x8AEB9E80, 0x8AEAAE00,
-	0x8AE9BD80, 0x8AE8CD00, 0x8AE7DC80,
-	0x8AE6EC00, 0x8AE5FB80, 0x8AE50B00,
-	0x8AE41A80, 0x8AE32A00, 0x8AE23980,
-	0x8AE14900, 0x8AE05880, 0x8ADF6800,
-	0x8ADE7780, 0x8ADD8700, 0x8ADC9680,
-	0x8ADBA600, 0x8ADAB580, 0x8AD9C500,
-	0x8AD8D480, 0x8AD7E400, 0x8AD6F380,
-	0x8AD60300, 0x8AD51280, 0x8AD42200,
-	0x8AD33180, 0x8AD24100, 0x8AD15080,
-	0x8AD06000, 0x8ACF6F80, 0x8ACE7F00,
-	0x8ACD8E80, 0x8ACC9E00, 0x8ACBAD80,
-	0x8ACABD00, 0x8AC9CC80, 0x8AC8DC00,
-	0x8AC7EB80, 0x8AC6FB00, 0x8AC60A80,
-	0x8AC51A00, 0x8AC42980, 0x8AC33900,
-	0x8AC24880, 0x8AC15800, 0x8AC06780,
-	0x8ABF7700, 0x8ABE8680, 0x8ABD9600,
-	0x8ABCA580, 0x8ABBB500, 0x8ABAC480,
-	0x8AB9D400, 0x8AB8E380, 0x8AB7F300,
-	0x8AB70280, 0x8AB61200, 0x8AB52180,
-	0x8AB43100, 0x8AB34080, 0x8AB25000,
-	0x8AB15F80, 0x8AB06F00, 0x8AAF7E80,
-	0x8AAE8E00, 0x8AAD9D80, 0x8AACAD00,
-	0x8AABBC80, 0x8AAACC00, 0x8AA9DB80,
-	0x8AA8EB00, 0x8AA7FA80, 0x8AA70A00,
-	0x8AA61980, 0x8AA52900, 0x8AA43880,
-	0x8AA34800, 0x8AA25780, 0x8AA16700,
-	0x8AA07680, 0x8A9F8600, 0x8A9E9580,
-	0x8A9DA500, 0x8A9CB480, 0x8A9BC400,
-	0x8A9AD380, 0x8A99E300, 0x8A98F280,
-	0x8A980200, 0x8A971180, 0x8A962100,
-	0x8A953080, 0x8A944000, 0x8A934F80,
-	0x8A925F00, 0x8A916E80, 0x8A907E00,
-	0x8A8F8D80, 0x8A8E9D00, 0x8A8DAC80,
-	0x8A8CBC00, 0x8A8BCB80, 0x8A8ADB00,
-	0x8A89EA80, 0x8A88FA00, 0x8A880980,
-	0x8A871900, 0x8A862880, 0x8A853800,
-	0x8A844780, 0x8A835700, 0x8A826680,
-	0x8A817600, 0x8A808580, 0x8A7F9500,
-	0x8A7EA480, 0x8A7DB400, 0x8A7CC380,
-	0x8A7BD300, 0x8A7AE280, 0x8A79F200,
-	0x8A790180, 0x8A781100, 0x8A772080,
-	0x8A763000, 0x8A753F80, 0x8A744F00,
-	0x8A735E80, 0x8A726E00, 0x8A717D80,
-	0x8A708D00, 0x8A6F9C80, 0x8A6EAC00,
-	0x8A6DBB80, 0x8A6CCB00, 0x8A6BDA80,
-	0x8A6AEA00, 0x8A69F980, 0x8A690900,
-	0x8A681880, 0x8A672800, 0x8A663780,
-	0x8A654700, 0x8A645680, 0x8A636600,
-	0x8A627580, 0x8A618500, 0x8A609480,
-	0x8A5FA400, 0x8A5EB380, 0x8A5DC300,
-	0x8A5CD280, 0x8A5BE200, 0x8A5AF180,
-	0x8A5A0100, 0x8A591080, 0x8A582000,
-	0x8A572F80, 0x8A563F00, 0x8A554E80,
-	0x8A545E00, 0x8A536D80, 0x8A527D00,
-	0x8A518C80, 0x8A509C00, 0x8A4FAB80,
-	0x8A4EBB00, 0x8A4DCA80, 0x8A4CDA00,
-	0x8A4BE980, 0x8A4AF900, 0x8A4A0880,
-	0x8A491800, 0x8A482780, 0x8A473700,
-	0x8A464680, 0x8A455600, 0x8A446580,
-	0x8A437500, 0x8A428480, 0x8A419400,
-	0x8A40A380, 0x8A3FB300, 0x8A3EC280,
-	0x8A3DD200, 0x8A3CE180, 0x8A3BF100,
-	0x8A3B0080, 0x8A3A1000, 0x8A391F80,
-	0x8A382F00, 0x8A373E80, 0x8A364E00,
-	0x8A355D80, 0x8A346D00, 0x8A337C80,
-	0x8A328C00, 0x8A319B80, 0x8A30AB00,
-	0x8A2FBA80, 0x8A2ECA00, 0x8A2DD980,
-	0x8A2CE900, 0x8A2BF880, 0x8A2B0800,
-	0x8A2A1780, 0x8A292700, 0x8A283680,
-	0x8A274600, 0x8A265580, 0x8A256500,
-	0x8A247480, 0x8A238400, 0x8A229380,
-	0x8A21A300, 0x8A20B280, 0x8A1FC200,
-	0x8A1ED180, 0x8A1DE100, 0x8A1CF080,
-	0x8A1C0000, 0x8A1B1C80, 0x8A1A3900,
-	0x8A195580, 0x8A187200, 0x8A178E80,
-	0x8A16AB00, 0x8A15C780, 0x8A14E400,
-	0x8A140080, 0x8A131D00, 0x8A123980,
-	0x8A115600, 0x8A107280, 0x8A0F8F00,
-	0x8A0EAB80, 0x8A0DC800, 0x8A0CE480,
-	0x8A0C0100, 0x8A0B1D80, 0x8A0A3A00,
-	0x8A095680, 0x8A087300, 0x8A078F80,
-	0x8A06AC00, 0x8A05C880, 0x8A04E500,
-	0x8A040180, 0x8A031E00, 0x8A023A80,
-	0x8A015700, 0x8A007380, 0x89FF9000,
-	0x89FEAC80, 0x89FDC900, 0x89FCE580,
-	0x89FC0200, 0x89FB1E80, 0x89FA3B00,
-	0x89F95780, 0x89F87400, 0x89F79080,
-	0x89F6AD00, 0x89F5C980, 0x89F4E600,
-	0x89F40280, 0x89F31F00, 0x89F23B80,
-	0x89F15800, 0x89F07480, 0x89EF9100,
-	0x89EEAD80, 0x89EDCA00, 0x89ECE680,
-	0x89EC0300, 0x89EB1F80, 0x89EA3C00,
-	0x89E95880, 0x89E87500, 0x89E79180,
-	0x89E6AE00, 0x89E5CA80, 0x89E4E700,
-	0x89E40380, 0x89E32000, 0x89E23C80,
-	0x89E15900, 0x89E07580, 0x89DF9200,
-	0x89DEAE80, 0x89DDCB00, 0x89DCE780,
-	0x89DC0400, 0x89DB2080, 0x89DA3D00,
-	0x89D95980, 0x89D87600, 0x89D79280,
-	0x89D6AF00, 0x89D5CB80, 0x89D4E800,
-	0x89D40480, 0x89D32100, 0x89D23D80,
-	0x89D15A00, 0x89D07680, 0x89CF9300,
-	0x89CEAF80, 0x89CDCC00, 0x89CCE880,
-	0x89CC0500, 0x89CB2180, 0x89CA3E00,
-	0x89C95A80, 0x89C87700, 0x89C79380,
-	0x89C6B000, 0x89C5CC80, 0x89C4E900,
-	0x89C40580, 0x89C32200, 0x89C23E80,
-	0x89C15B00, 0x89C07780, 0x89BF9400,
-	0x89BEB080, 0x89BDCD00, 0x89BCE980,
-	0x89BC0600, 0x89BB2280, 0x89BA3F00,
-	0x89B95B80, 0x89B87800, 0x89B79480,
-	0x89B6B100, 0x89B5CD80, 0x89B4EA00,
-	0x89B40680, 0x89B32300, 0x89B23F80,
-	0x89B15C00, 0x89B07880, 0x89AF9500,
-	0x89AEB180, 0x89ADCE00, 0x89ACEA80,
-	0x89AC0700, 0x89AB2380, 0x89AA4000,
-	0x89A95C80, 0x89A87900, 0x89A79580,
-	0x89A6B200, 0x89A5CE80, 0x89A4EB00,
-	0x89A40780, 0x89A32400, 0x89A24080,
-	0x89A15D00, 0x89A07980, 0x899F9600,
-	0x899EB280, 0x899DCF00, 0x899CEB80,
-	0x899C0800, 0x899B2480, 0x899A4100,
-	0x89995D80, 0x89987A00, 0x89979680,
-	0x8996B300, 0x8995CF80, 0x8994EC00,
-	0x89940880, 0x89932500, 0x89924180,
-	0x89915E00, 0x89907A80, 0x898F9700,
-	0x898EB380, 0x898DD000, 0x898CEC80,
-	0x898C0900, 0x898B2580, 0x898A4200,
-	0x89895E80, 0x89887B00, 0x89879780,
-	0x8986B400, 0x8985D080, 0x8984ED00,
-	0x89840980, 0x89832600, 0x89824280,
-	0x89815F00, 0x89807B80, 0x897F9800,
-	0x897EB480, 0x897DD100, 0x897CED80,
-	0x897C0A00, 0x897B2680, 0x897A4300,
-	0x89795F80, 0x89787C00, 0x89779880,
-	0x8976B500, 0x8975D180, 0x8974EE00,
-	0x89740A80, 0x89732700, 0x89724380,
-	0x89716000, 0x89707C80, 0x896F9900,
-	0x896EB580, 0x896DD200, 0x896CEE80,
-	0x896C0B00, 0x896B2780, 0x896A4400,
-	0x89696080, 0x89687D00, 0x89679980,
-	0x8966B600, 0x8965D280, 0x8964EF00,
-	0x89640B80, 0x89632800, 0x89624480,
-	0x89616100, 0x89607D80, 0x895F9A00,
-	0x895EB680, 0x895DD300, 0x895CEF80,
-	0x895C0C00, 0x895B2880, 0x895A4500,
-	0x89596180, 0x89587E00, 0x89579A80,
-	0x8956B700, 0x8955D380, 0x8954F000,
-	0x89540C80, 0x89532900, 0x89524580,
-	0x89516200, 0x89507E80, 0x894F9B00,
-	0x894EB780, 0x894DD400, 0x894CF080,
-	0x894C0D00, 0x894B2980, 0x894A4600,
-	0x89496280, 0x89487F00, 0x89479B80,
-	0x8946B800, 0x8945D480, 0x8944F100,
-	0x89440D80, 0x89432A00, 0x89424680,
-	0x89416300, 0x89407F80, 0x893F9C00,
-	0x893EB880, 0x893DD500, 0x893CF180,
-	0x893C0E00, 0x893B2A80, 0x893A4700,
-	0x89396380, 0x89388000, 0x89379C80,
-	0x8936B900, 0x8935D580, 0x8934F200,
-	0x89340E80, 0x89332B00, 0x89324780,
-	0x89316400, 0x89308080, 0x892F9D00,
-	0x892EB980, 0x892DD600, 0x892CF280,
-	0x892C0F00, 0x892B2B80, 0x892A4800,
-	0x89296480, 0x89288100, 0x89279D80,
-	0x8926BA00, 0x8925D680, 0x8924F300,
-	0x89240F80, 0x89232C00, 0x89224880,
-	0x89216500, 0x89208180, 0x891F9E00,
-	0x891EBA80, 0x891DD700, 0x891CF380,
-	0x891C1000, 0x891B2C80, 0x891A4900,
-	0x89196580, 0x89188200, 0x89179E80,
-	0x8916BB00, 0x8915D780, 0x8914F400,
-	0x89141080, 0x89132D00, 0x89124980,
-	0x89116600, 0x89108280, 0x890F9F00,
-	0x890EBB80, 0x890DD800, 0x890CF480,
-	0x890C1100, 0x890B2D80, 0x890A4A00,
-	0x89096680, 0x89088300, 0x89079F80,
-	0x8906BC00, 0x8905D880, 0x8904F500,
-	0x89041180, 0x89032E00, 0x89024A80,
-	0x89016700, 0x89008380, 0x88FFA000,
-	0x88FEBC80, 0x88FDD900, 0x88FCF580,
-	0x88FC1200, 0x88FB2E80, 0x88FA4B00,
-	0x88F96780, 0x88F88400, 0x88F7A080,
-	0x88F6BD00, 0x88F5D980, 0x88F4F600,
-	0x88F41280, 0x88F32F00, 0x88F24B80,
-	0x88F16800, 0x88F08480, 0x88EFA100,
-	0x88EEBD80, 0x88EDDA00, 0x88ECF680,
-	0x88EC1300, 0x88EB2F80, 0x88EA4C00,
-	0x88E96880, 0x88E88500, 0x88E7A180,
-	0x88E6BE00, 0x88E5DA80, 0x88E4F700,
-	0x88E41380, 0x88E33000, 0x88E24C80,
-	0x88E16900, 0x88E08580, 0x88DFA200,
-	0x88DEBE80, 0x88DDDB00, 0x88DCF780,
-	0x88DC1400, 0x88DB3080, 0x88DA4D00,
-	0x88D96980, 0x88D88600, 0x88D7A280,
-	0x88D6BF00, 0x88D5DB80, 0x88D4F800,
-	0x88D41480, 0x88D33100, 0x88D24D80,
-	0x88D16A00, 0x88D08680, 0x88CFA300,
-	0x88CEBF80, 0x88CDDC00, 0x88CCF880,
-	0x88CC1500, 0x88CB3180, 0x88CA4E00,
-	0x88C96A80, 0x88C88700, 0x88C7A380,
-	0x88C6C000, 0x88C5DC80, 0x88C4F900,
-	0x88C41580, 0x88C33200, 0x88C24E80,
-	0x88C16B00, 0x88C08780, 0x88BFA400,
-	0x88BEC080, 0x88BDDD00, 0x88BCF980,
-	0x88BC1600, 0x88BB3280, 0x88BA4F00,
-	0x88B96B80, 0x88B88800, 0x88B7A480,
-	0x88B6C100, 0x88B5DD80, 0x88B4FA00,
-	0x88B41680, 0x88B33300, 0x88B24F80,
-	0x88B16C00, 0x88B08880, 0x88AFA500,
-	0x88AEC180, 0x88ADDE00, 0x88ACFA80,
-	0x88AC1700, 0x88AB3380, 0x88AA5000,
-	0x88A96C80, 0x88A88900, 0x88A7A580,
-	0x88A6C200, 0x88A5DE80, 0x88A4FB00,
-	0x88A41780, 0x88A33400, 0x88A25080,
-	0x88A16D00, 0x88A08980, 0x889FA600,
-	0x889EC280, 0x889DDF00, 0x889CFB80,
-	0x889C1800, 0x889B3480, 0x889A5100,
-	0x88996D80, 0x88988A00, 0x8897A680,
-	0x8896C300, 0x8895DF80, 0x8894FC00,
-	0x88941880, 0x88933500, 0x88925180,
-	0x88916E00, 0x88908A80, 0x888FA700,
-	0x888EC380, 0x888DE000, 0x888CFC80,
-	0x888C1900, 0x888B3580, 0x888A5200,
-	0x88896E80, 0x88888B00, 0x8887A780,
-	0x8886C400, 0x8885E080, 0x8884FD00,
-	0x88841980, 0x88833600, 0x88825280,
-	0x88816F00, 0x88808B80, 0x887FA800,
-	0x887EC480, 0x887DE100, 0x887CFD80,
-	0x887C1A00, 0x887B3680, 0x887A5300,
-	0x88796F80, 0x88788C00, 0x8877A880,
-	0x8876C500, 0x8875E180, 0x8874FE00,
-	0x88741A80, 0x88733700, 0x88725380,
-	0x88717000, 0x88708C80, 0x886FA900,
-	0x886EC580, 0x886DE200, 0x886CFE80,
-	0x886C1B00, 0x886B3780, 0x886A5400,
-	0x88697080, 0x88688D00, 0x8867A980,
-	0x8866C600, 0x8865E280, 0x8864FF00,
-	0x88641B80, 0x88633800, 0x88625480,
-	0x88617100, 0x88608D80, 0x885FAA00,
-	0x885EC680, 0x885DE300, 0x885CFF80,
-	0x885C1C00, 0x885B3880, 0x885A5500,
-	0x88597180, 0x88588E00, 0x8857AA80,
-	0x8856C700, 0x8855E380, 0x88550000,
-	0x88541C80, 0x88533900, 0x88525580,
-	0x88517200, 0x88508E80, 0x884FAB00,
-	0x884EC780, 0x884DE400, 0x884D0080,
-	0x884C1D00, 0x884B3980, 0x884A5600,
-	0x88497280, 0x88488F00, 0x8847AB80,
-	0x8846C800, 0x8845E480, 0x88450100,
-	0x88441D80, 0x88433A00, 0x88425680,
-	0x88417300, 0x88408F80, 0x883FAC00,
-	0x883EC880, 0x883DE500, 0x883D0180,
-	0x883C1E00, 0x883B3A80, 0x883A5700,
-	0x88397380, 0x88389000, 0x8837AC80,
-	0x8836C900, 0x8835E580, 0x88350200,
-	0x88341E80, 0x88333B00, 0x88325780,
-	0x88317400, 0x88309080, 0x882FAD00,
-	0x882EC980, 0x882DE600, 0x882D0280,
-	0x882C1F00, 0x882B3B80, 0x882A5800,
-	0x88297480, 0x88289100, 0x8827AD80,
-	0x8826CA00, 0x8825E680, 0x88250300,
-	0x88241F80, 0x88233C00, 0x88225880,
-	0x88217500, 0x88209180, 0x881FAE00,
-	0x881ECA80, 0x881DE700, 0x881D0380,
-	0x881C2000, 0x881B3C80, 0x881A5900,
-	0x88197580, 0x88189200, 0x8817AE80,
-	0x8816CB00, 0x8815E780, 0x88150400,
-	0x88142080, 0x88133D00, 0x88125980,
-	0x88117600, 0x88109280, 0x880FAF00,
-	0x880ECB80, 0x880DE800, 0x880D0480,
-	0x880C2100, 0x880B3D80, 0x880A5A00,
-	0x88097680, 0x88089300, 0x8807AF80,
-	0x8806CC00, 0x8805E880, 0x88050500,
-	0x88042180, 0x88033E00, 0x88025A80,
-	0x88017700, 0x88009380, 0x87FFB000,
-	0x87FECC80, 0x87FDE900, 0x87FD0580,
-	0x87FC2200, 0x87FB3E80, 0x87FA5B00,
-	0x87F97780, 0x87F89400, 0x87F7B080,
-	0x87F6CD00, 0x87F5E980, 0x87F50600,
-	0x87F42280, 0x87F33F00, 0x87F25B80,
-	0x87F17800, 0x87F09480, 0x87EFB100,
-	0x87EECD80, 0x87EDEA00, 0x87ED0680,
-	0x87EC2300, 0x87EB3F80, 0x87EA5C00,
-	0x87E97880, 0x87E89500, 0x87E7B180,
-	0x87E6CE00, 0x87E5EA80, 0x87E50700,
-	0x87E42380, 0x87E34000, 0x87E25C80,
-	0x87E17900, 0x87E09580, 0x87DFB200,
-	0x87DECE80, 0x87DDEB00, 0x87DD0780,
-	0x87DC2400, 0x87DB4080, 0x87DA5D00,
-	0x87D97980, 0x87D89600, 0x87D7B280,
-	0x87D6CF00, 0x87D5EB80, 0x87D50800,
-	0x87D42480, 0x87D34100, 0x87D25D80,
-	0x87D17A00, 0x87D09680, 0x87CFB300,
-	0x87CECF80, 0x87CDEC00, 0x87CD0880,
-	0x87CC2500, 0x87CB4180, 0x87CA5E00,
-	0x87C97A80, 0x87C89700, 0x87C7B380,
-	0x87C6D000, 0x87C5EC80, 0x87C50900,
-	0x87C42580, 0x87C34200, 0x87C25E80,
-	0x87C17B00, 0x87C09780, 0x87BFB400,
-	0x87BED080, 0x87BDED00, 0x87BD0980,
-	0x87BC2600, 0x87BB4280, 0x87BA5F00,
-	0x87B97B80, 0x87B89800, 0x87B7B480,
-	0x87B6D100, 0x87B5ED80, 0x87B50A00,
-	0x87B42680, 0x87B34300, 0x87B25F80,
-	0x87B17C00, 0x87B09880, 0x87AFB500,
-	0x87AED180, 0x87ADEE00, 0x87AD0A80,
-	0x87AC2700, 0x87AB4380, 0x87AA6000,
-	0x87A97C80, 0x87A89900, 0x87A7B580,
-	0x87A6D200, 0x87A5EE80, 0x87A50B00,
-	0x87A42780, 0x87A34400, 0x87A26080,
-	0x87A17D00, 0x87A09980, 0x879FB600,
-	0x879ED280, 0x879DEF00, 0x879D0B80,
-	0x879C2800, 0x879B4480, 0x879A6100,
-	0x87997D80, 0x87989A00, 0x8797B680,
-	0x8796D300, 0x8795EF80, 0x87950C00,
-	0x87942880, 0x87934500, 0x87926180,
-	0x87917E00, 0x87909A80, 0x878FB700,
-	0x878ED380, 0x878DF000, 0x878D0C80,
-	0x878C2900, 0x878B4580, 0x878A6200,
-	0x87897E80, 0x87889B00, 0x8787B780,
-	0x8786D400, 0x8785F080, 0x87850D00,
-	0x87842980, 0x87834600, 0x87826280,
-	0x87817F00, 0x87809B80, 0x877FB800,
-	0x877ED480, 0x877DF100, 0x877D0D80,
-	0x877C2A00, 0x877B4680, 0x877A6300,
-	0x87797F80, 0x87789C00, 0x8777B880,
-	0x8776D500, 0x8775F180, 0x87750E00,
-	0x87742A80, 0x87734700, 0x87726380,
-	0x87718000, 0x87709C80, 0x876FB900,
-	0x876ED580, 0x876DF200, 0x876D0E80,
-	0x876C2B00, 0x876B4780, 0x876A6400,
-	0x87698080, 0x87689D00, 0x8767B980,
-	0x8766D600, 0x8765F280, 0x87650F00,
-	0x87642B80, 0x87634800, 0x87626480,
-	0x87618100, 0x87609D80, 0x875FBA00,
-	0x875ED680, 0x875DF300, 0x875D0F80,
-	0x875C2C00, 0x875B4880, 0x875A6500,
-	0x87598180, 0x87589E00, 0x8757BA80,
-	0x8756D700, 0x8755F380, 0x87551000,
-	0x87542C80, 0x87534900, 0x87526580,
-	0x87518200, 0x87509E80, 0x874FBB00,
-	0x874ED780, 0x874DF400, 0x874D1080,
-	0x874C2D00, 0x874B4980, 0x874A6600,
-	0x87498280, 0x87489F00, 0x8747BB80,
-	0x8746D800, 0x8745F480, 0x87451100,
-	0x87442D80, 0x87434A00, 0x87426680,
-	0x87418300, 0x87409F80, 0x873FBC00,
-	0x873ED880, 0x873DF500, 0x873D1180,
-	0x873C2E00, 0x873B4A80, 0x873A6700,
-	0x87398380, 0x8738A000, 0x8737BC80,
-	0x8736D900, 0x8735F580, 0x87351200,
-	0x87342E80, 0x87334B00, 0x87326780,
-	0x87318400, 0x8730A080, 0x872FBD00,
-	0x872ED980, 0x872DF600, 0x872D1280,
-	0x872C2F00, 0x872B4B80, 0x872A6800,
-	0x87298480, 0x8728A100, 0x8727BD80,
-	0x8726DA00, 0x8725F680, 0x87251300,
-	0x87242F80, 0x87234C00, 0x87226880,
-	0x87218500, 0x8720A180, 0x871FBE00,
-	0x871EDA80, 0x871DF700, 0x871D1380,
-	0x871C3000, 0x871B4C80, 0x871A6900,
-	0x87198580, 0x8718A200, 0x8717BE80,
-	0x8716DB00, 0x8715F780, 0x87151400,
-	0x87143080, 0x87134D00, 0x87126980,
-	0x87118600, 0x8710A280, 0x870FBF00,
-	0x870EDB80, 0x870DF800, 0x870D1480,
-	0x870C3100, 0x870B4D80, 0x870A6A00,
-	0x87098680, 0x8708A300, 0x8707BF80,
-	0x8706DC00, 0x8705F880, 0x87051500,
-	0x87043180, 0x87034E00, 0x87026A80,
-	0x87018700, 0x8700A380, 0x86FFC000,
-	0x86FEDC80, 0x86FDF900, 0x86FD1580,
-	0x86FC3200, 0x86FB4E80, 0x86FA6B00,
-	0x86F98780, 0x86F8A400, 0x86F7C080,
-	0x86F6DD00, 0x86F5F980, 0x86F51600,
-	0x86F43280, 0x86F34F00, 0x86F26B80,
-	0x86F18800, 0x86F0A480, 0x86EFC100,
-	0x86EEDD80, 0x86EDFA00, 0x86ED1680,
-	0x86EC3300, 0x86EB4F80, 0x86EA6C00,
-	0x86E98880, 0x86E8A500, 0x86E7C180,
-	0x86E6DE00, 0x86E5FA80, 0x86E51700,
-	0x86E43380, 0x86E35000, 0x86E26C80,
-	0x86E18900, 0x86E0A580, 0x86DFC200,
-	0x86DEDE80, 0x86DDFB00, 0x86DD1780,
-	0x86DC3400, 0x86DB5080, 0x86DA6D00,
-	0x86D98980, 0x86D8A600, 0x86D7C280,
-	0x86D6DF00, 0x86D5FB80, 0x86D51800,
-	0x86D43480, 0x86D35100, 0x86D26D80,
-	0x86D18A00, 0x86D0A680, 0x86CFC300,
-	0x86CEDF80, 0x86CDFC00, 0x86CD1880,
-	0x86CC3500, 0x86CB5180, 0x86CA6E00,
-	0x86C98A80, 0x86C8A700, 0x86C7C380,
-	0x86C6E000, 0x86C5FC80, 0x86C51900,
-	0x86C43580, 0x86C35200, 0x86C26E80,
-	0x86C18B00, 0x86C0A780, 0x86BFC400,
-	0x86BEE080, 0x86BDFD00, 0x86BD1980,
-	0x86BC3600, 0x86BB5280, 0x86BA6F00,
-	0x86B98B80, 0x86B8A800, 0x86B7C480,
-	0x86B6E100, 0x86B5FD80, 0x86B51A00,
-	0x86B43680, 0x86B35300, 0x86B26F80,
-	0x86B18C00, 0x86B0A880, 0x86AFC500,
-	0x86AEE180, 0x86ADFE00, 0x86AD1A80,
-	0x86AC3700, 0x86AB5380, 0x86AA7000,
-	0x86A98C80, 0x86A8A900, 0x86A7C580,
-	0x86A6E200, 0x86A5FE80, 0x86A51B00,
-	0x86A43780, 0x86A35400, 0x86A27080,
-	0x86A18D00, 0x86A0A980, 0x869FC600,
-	0x869EE280, 0x869DFF00, 0x869D1B80,
-	0x869C3800, 0x869B5480, 0x869A7100,
-	0x86998D80, 0x8698AA00, 0x8697C680,
-	0x8696E300, 0x8695FF80, 0x86951C00,
-	0x86943880, 0x86935500, 0x86927180,
-	0x86918E00, 0x8690AA80, 0x868FC700,
-	0x868EE380, 0x868E0000, 0x868D1C80,
-	0x868C3900, 0x868B5580, 0x868A7200,
-	0x86898E80, 0x8688AB00, 0x8687C780,
-	0x8686E400, 0x86860080, 0x86851D00,
-	0x86843980, 0x86835600, 0x86827280,
-	0x86818F00, 0x8680AB80, 0x867FC800,
-	0x867EE480, 0x867E0100, 0x867D1D80,
-	0x867C3A00, 0x867B5680, 0x867A7300,
-	0x86798F80, 0x8678AC00, 0x8677C880,
-	0x8676E500, 0x86760180, 0x86751E00,
-	0x86743A80, 0x86735700, 0x86727380,
-	0x86719000, 0x8670AC80, 0x866FC900,
-	0x866EE580, 0x866E0200, 0x866D1E80,
-	0x866C3B00, 0x866B5780, 0x866A7400,
-	0x86699080, 0x8668AD00, 0x8667C980,
-	0x8666E600, 0x86660280, 0x86651F00,
-	0x86643B80, 0x86635800, 0x86627480,
-	0x86619100, 0x8660AD80, 0x865FCA00,
-	0x865EE680, 0x865E0300, 0x865D1F80,
-	0x865C3C00, 0x865B5880, 0x865A7500,
-	0x86599180, 0x8658AE00, 0x8657CA80,
-	0x8656E700, 0x86560380, 0x86552000,
-	0x86543C80, 0x86535900, 0x86527580,
-	0x86519200, 0x8650AE80, 0x864FCB00,
-	0x864EE780, 0x864E0400, 0x864D2080,
-	0x864C3D00, 0x864B5980, 0x864A7600,
-	0x86499280, 0x8648AF00, 0x8647CB80,
-	0x8646E800, 0x86460480, 0x86452100,
-	0x86443D80, 0x86435A00, 0x86427680,
-	0x86419300, 0x8640AF80, 0x863FCC00,
-	0x863EE880, 0x863E0500, 0x863D2180,
-	0x863C3E00, 0x863B5A80, 0x863A7700,
-	0x86399380, 0x8638B000, 0x8637CC80,
-	0x8636E900, 0x86360580, 0x86352200,
-	0x86343E80, 0x86335B00, 0x86327780,
-	0x86319400, 0x8630B080, 0x862FCD00,
-	0x862EE980, 0x862E0600, 0x862D2280,
-	0x862C3F00, 0x862B5B80, 0x862A7800,
-	0x86299480, 0x8628B100, 0x8627CD80,
-	0x8626EA00, 0x86260680, 0x86252300,
-	0x86243F80, 0x86235C00, 0x86227880,
-	0x86219500, 0x8620B180, 0x861FCE00,
-	0x861EEA80, 0x861E0700, 0x861D2380,
-	0x861C4000, 0x861B5C80, 0x861A7900,
-	0x86199580, 0x8618B200, 0x8617CE80,
-	0x8616EB00, 0x86160780, 0x86152400,
-	0x86144080, 0x86135D00, 0x86127980,
-	0x86119600, 0x8610B280, 0x860FCF00,
-	0x860EEB80, 0x860E0800, 0x860D2480,
-	0x860C4100, 0x860B5D80, 0x860A7A00,
-	0x86099680, 0x8608B300, 0x8607CF80,
-	0x8606EC00, 0x86060880, 0x86052500,
-	0x86044180, 0x86035E00, 0x86027A80,
-	0x86019700, 0x8600B380, 0x85FFD000,
-	0x85FEEC80, 0x85FE0900, 0x85FD2580,
-	0x85FC4200, 0x85FB5E80, 0x85FA7B00,
-	0x85F99780, 0x85F8B400, 0x85F7D080,
-	0x85F6ED00, 0x85F60980, 0x85F52600,
-	0x85F44280, 0x85F35F00, 0x85F27B80,
-	0x85F19800, 0x85F0B480, 0x85EFD100,
-	0x85EEED80, 0x85EE0A00, 0x85ED2680,
-	0x85EC4300, 0x85EB5F80, 0x85EA7C00,
-	0x85E99880, 0x85E8B500, 0x85E7D180,
-	0x85E6EE00, 0x85E60A80, 0x85E52700,
-	0x85E44380, 0x85E36000, 0x85E27C80,
-	0x85E19900, 0x85E0B580, 0x85DFD200,
-	0x85DEEE80, 0x85DE0B00, 0x85DD2780,
-	0x85DC4400, 0x85DB6080, 0x85DA7D00,
-	0x85D99980, 0x85D8B600, 0x85D7D280,
-	0x85D6EF00, 0x85D60B80, 0x85D52800,
-	0x85D44480, 0x85D36100, 0x85D27D80,
-	0x85D19A00, 0x85D0B680, 0x85CFD300,
-	0x85CEEF80, 0x85CE0C00, 0x85CD2880,
-	0x85CC4500, 0x85CB6180, 0x85CA7E00,
-	0x85C99A80, 0x85C8B700, 0x85C7D380,
-	0x85C6F000, 0x85C60C80, 0x85C52900,
-	0x85C44580, 0x85C36200, 0x85C27E80,
-	0x85C19B00, 0x85C0B780, 0x85BFD400,
-	0x85BEF080, 0x85BE0D00, 0x85BD2980,
-	0x85BC4600, 0x85BB6280, 0x85BA7F00,
-	0x85B99B80, 0x85B8B800, 0x85B7D480,
-	0x85B6F100, 0x85B60D80, 0x85B52A00,
-	0x85B44680, 0x85B36300, 0x85B27F80,
-	0x85B19C00, 0x85B0B880, 0x85AFD500,
-	0x85AEF180, 0x85AE0E00, 0x85AD2A80,
-	0x85AC4700, 0x85AB6380, 0x85AA8000,
-	0x85A99C80, 0x85A8B900, 0x85A7D580,
-	0x85A6F200, 0x85A60E80, 0x85A52B00,
-	0x85A44780, 0x85A36400, 0x85A28080,
-	0x85A19D00, 0x85A0B980, 0x859FD600,
-	0x859EF280, 0x859E0F00, 0x859D2B80,
-	0x859C4800, 0x859B6480, 0x859A8100,
-	0x85999D80, 0x8598BA00, 0x8597D680,
-	0x8596F300, 0x85960F80, 0x85952C00,
-	0x85944880, 0x85936500, 0x85928180,
-	0x85919E00, 0x8590BA80, 0x858FD700,
-	0x858EF380, 0x858E1000, 0x858D2C80,
-	0x858C4900, 0x858B6580, 0x858A8200,
-	0x85899E80, 0x8588BB00, 0x8587D780,
-	0x8586F400, 0x85861080, 0x85852D00,
-	0x85844980, 0x85836600, 0x85828280,
-	0x85819F00, 0x8580BB80, 0x857FD800,
-	0x857EF480, 0x857E1100, 0x857D2D80,
-	0x857C4A00, 0x857B6680, 0x857A8300,
-	0x85799F80, 0x8578BC00, 0x8577D880,
-	0x8576F500, 0x85761180, 0x85752E00,
-	0x85744A80, 0x85736700, 0x85728380,
-	0x8571A000, 0x8570BC80, 0x856FD900,
-	0x856EF580, 0x856E1200, 0x856D2E80,
-	0x856C4B00, 0x856B6780, 0x856A8400,
-	0x8569A080, 0x8568BD00, 0x8567D980,
-	0x8566F600, 0x85661280, 0x85652F00,
-	0x85644B80, 0x85636800, 0x85628480,
-	0x8561A100, 0x8560BD80, 0x855FDA00,
-	0x855EF680, 0x855E1300, 0x855D2F80,
-	0x855C4C00, 0x855B6880, 0x855A8500,
-	0x8559A180, 0x8558BE00, 0x8557DA80,
-	0x8556F700, 0x85561380, 0x85553000,
-	0x85544C80, 0x85536900, 0x85528580,
-	0x8551A200, 0x8550BE80, 0x854FDB00,
-	0x854EF780, 0x854E1400, 0x854D3080,
-	0x854C4D00, 0x854B6980, 0x854A8600,
-	0x8549A280, 0x8548BF00, 0x8547DB80,
-	0x8546F800, 0x85461480, 0x85453100,
-	0x85444D80, 0x85436A00, 0x85428680,
-	0x8541A300, 0x8540BF80, 0x853FDC00,
-	0x853EF880, 0x853E1500, 0x853D3180,
-	0x853C4E00, 0x853B6A80, 0x853A8700,
-	0x8539A380, 0x8538C000, 0x8537DC80,
-	0x8536F900, 0x85361580, 0x85353200,
-	0x85344E80, 0x85336B00, 0x85328780,
-	0x8531A400, 0x8530C080, 0x852FDD00,
-	0x852EF980, 0x852E1600, 0x852D3280,
-	0x852C4F00, 0x852B6B80, 0x852A8800,
-	0x8529A480, 0x8528C100, 0x8527DD80,
-	0x8526FA00, 0x85261680, 0x85253300,
-	0x85244F80, 0x85236C00, 0x85228880,
-	0x8521A500, 0x8520C180, 0x851FDE00,
-	0x851EFA80, 0x851E1700, 0x851D3380,
-	0x851C5000, 0x851B6C80, 0x851A8900,
-	0x8519A580, 0x8518C200, 0x8517DE80,
-	0x8516FB00, 0x85161780, 0x85153400,
-	0x85145080, 0x85136D00, 0x85128980,
-	0x8511A600, 0x8510C280, 0x850FDF00,
-	0x850EFB80, 0x850E1800, 0x850D3480,
-	0x850C5100, 0x850B6D80, 0x850A8A00,
-	0x8509A680, 0x8508C300, 0x8507DF80,
-	0x8506FC00, 0x85061880, 0x85053500,
-	0x85045180, 0x85036E00, 0x85028A80,
-	0x8501A700, 0x8500C380, 0x84FFE000,
-	0x84FEFC80, 0x84FE1900, 0x84FD3580,
-	0x84FC5200, 0x84FB6E80, 0x84FA8B00,
-	0x84F9A780, 0x84F8C400, 0x84F7E080,
-	0x84F6FD00, 0x84F61980, 0x84F53600,
-	0x84F45280, 0x84F36F00, 0x84F28B80,
-	0x84F1A800, 0x84F0C480, 0x84EFE100,
-	0x84EEFD80, 0x84EE1A00, 0x84ED3680,
-	0x84EC5300, 0x84EB6F80, 0x84EA8C00,
-	0x84E9A880, 0x84E8C500, 0x84E7E180,
-	0x84E6FE00, 0x84E61A80, 0x84E53700,
-	0x84E45380, 0x84E37000, 0x84E28C80,
-	0x84E1A900, 0x84E0C580, 0x84DFE200,
-	0x84DEFE80, 0x84DE1B00, 0x84DD3780,
-	0x84DC5400, 0x84DB7080, 0x84DA8D00,
-	0x84D9A980, 0x84D8C600, 0x84D7E280,
-	0x84D6FF00, 0x84D61B80, 0x84D53800,
-	0x84D45480, 0x84D37100, 0x84D28D80,
-	0x84D1AA00, 0x84D0C680, 0x84CFE300,
-	0x84CEFF80, 0x84CE1C00, 0x84CD3880,
-	0x84CC5500, 0x84CB7180, 0x84CA8E00,
-	0x84C9AA80, 0x84C8C700, 0x84C7E380,
-	0x84C70000, 0x84C61C80, 0x84C53900,
-	0x84C45580, 0x84C37200, 0x84C28E80,
-	0x84C1AB00, 0x84C0C780, 0x84BFE400,
-	0x84BF0080, 0x84BE1D00, 0x84BD3980,
-	0x84BC5600, 0x84BB7280, 0x84BA8F00,
-	0x84B9AB80, 0x84B8C800, 0x84B7E480,
-	0x84B70100, 0x84B61D80, 0x84B53A00,
-	0x84B45680, 0x84B37300, 0x84B28F80,
-	0x84B1AC00, 0x84B0C880, 0x84AFE500,
-	0x84AF0180, 0x84AE1E00, 0x84AD3A80,
-	0x84AC5700, 0x84AB7380, 0x84AA9000,
-	0x84A9AC80, 0x84A8C900, 0x84A7E580,
-	0x84A70200, 0x84A61E80, 0x84A53B00,
-	0x84A45780, 0x84A37400, 0x84A29080,
-	0x84A1AD00, 0x84A0C980, 0x849FE600,
-	0x849F0280, 0x849E1F00, 0x849D3B80,
-	0x849C5800, 0x849B7480, 0x849A9100,
-	0x8499AD80, 0x8498CA00, 0x8497E680,
-	0x84970300, 0x84961F80, 0x84953C00,
-	0x84945880, 0x84937500, 0x84929180,
-	0x8491AE00, 0x8490CA80, 0x848FE700,
-	0x848F0380, 0x848E2000, 0x848D3C80,
-	0x848C5900, 0x848B7580, 0x848A9200,
-	0x8489AE80, 0x8488CB00, 0x8487E780,
-	0x84870400, 0x84862080, 0x84853D00,
-	0x84845980, 0x84837600, 0x84829280,
-	0x8481AF00, 0x8480CB80, 0x847FE800,
-	0x847F0480, 0x847E2100, 0x847D3D80,
-	0x847C5A00, 0x847B7680, 0x847A9300,
-	0x8479AF80, 0x8478CC00, 0x8477E880,
-	0x84770500, 0x84762180, 0x84753E00,
-	0x84745A80, 0x84737700, 0x84729380,
-	0x8471B000, 0x8470CC80, 0x846FE900,
-	0x846F0580, 0x846E2200, 0x846D3E80,
-	0x846C5B00, 0x846B7780, 0x846A9400,
-	0x8469B080, 0x8468CD00, 0x8467E980,
-	0x84670600, 0x84662280, 0x84653F00,
-	0x84645B80, 0x84637800, 0x84629480,
-	0x8461B100, 0x8460CD80, 0x845FEA00,
-	0x845F0680, 0x845E2300, 0x845D3F80,
-	0x845C5C00, 0x845B7880, 0x845A9500,
-	0x8459B180, 0x8458CE00, 0x8457EA80,
-	0x84570700, 0x84562380, 0x84554000,
-	0x84545C80, 0x84537900, 0x84529580,
-	0x8451B200, 0x8450CE80, 0x844FEB00,
-	0x844F0780, 0x844E2400, 0x844D4080,
-	0x844C5D00, 0x844B7980, 0x844A9600,
-	0x8449B280, 0x8448CF00, 0x8447EB80,
-	0x84470800, 0x84462480, 0x84454100,
-	0x84445D80, 0x84437A00, 0x84429680,
-	0x8441B300, 0x8440CF80, 0x843FEC00,
-	0x843F0880, 0x843E2500, 0x843D4180,
-	0x843C5E00, 0x843B7A80, 0x843A9700,
-	0x8439B380, 0x8438D000, 0x8437EC80,
-	0x84370900, 0x84362580, 0x84354200,
-	0x84345E80, 0x84337B00, 0x84329780,
-	0x8431B400, 0x8430D080, 0x842FED00,
-	0x842F0980, 0x842E2600, 0x842D4280,
-	0x842C5F00, 0x842B7B80, 0x842A9800,
-	0x8429B480, 0x8428D100, 0x8427ED80,
-	0x84270A00, 0x84262680, 0x84254300,
-	0x84245F80, 0x84237C00, 0x84229880,
-	0x8421B500, 0x8420D180, 0x841FEE00,
-	0x841F0A80, 0x841E2700, 0x841D4380,
-	0x841C6000, 0x841B7C80, 0x841A9900,
-	0x8419B580, 0x8418D200, 0x8417EE80,
-	0x84170B00, 0x84162780, 0x84154400,
-	0x84146080, 0x84137D00, 0x84129980,
-	0x8411B600, 0x8410D280, 0x840FEF00,
-	0x840F0B80, 0x840E2800, 0x840D4480,
-	0x840C6100, 0x840B7D80, 0x840A9A00,
-	0x8409B680, 0x8408D300, 0x8407EF80,
-	0x84070C00, 0x84062880, 0x84054500,
-	0x84046180, 0x84037E00, 0x84029A80,
-	0x8401B700, 0x8400D380, 0x83FFF000,
-	0x83FF0C80, 0x83FE2900, 0x83FD4580,
-	0x83FC6200, 0x83FB7E80, 0x83FA9B00,
-	0x83F9B780, 0x83F8D400, 0x83F7F080,
-	0x83F70D00, 0x83F62980, 0x83F54600,
-	0x83F46280, 0x83F37F00, 0x83F29B80,
-	0x83F1B800, 0x83F0D480, 0x83EFF100,
-	0x83EF0D80, 0x83EE2A00, 0x83ED4680,
-	0x83EC6300, 0x83EB7F80, 0x83EA9C00,
-	0x83E9B880, 0x83E8D500, 0x83E7F180,
-	0x83E70E00, 0x83E62A80, 0x83E54700,
-	0x83E46380, 0x83E38000, 0x83E29C80,
-	0x83E1B900, 0x83E0D580, 0x83DFF200,
-	0x83DF0E80, 0x83DE2B00, 0x83DD4780,
-	0x83DC6400, 0x83DB8080, 0x83DA9D00,
-	0x83D9B980, 0x83D8D600, 0x83D7F280,
-	0x83D70F00, 0x83D62B80, 0x83D54800,
-	0x83D46480, 0x83D38100, 0x83D29D80,
-	0x83D1BA00, 0x83D0D680, 0x83CFF300,
-	0x83CF0F80, 0x83CE2C00, 0x83CD4880,
-	0x83CC6500, 0x83CB8180, 0x83CA9E00,
-	0x83C9BA80, 0x83C8D700, 0x83C7F380,
-	0x83C71000, 0x83C62C80, 0x83C54900,
-	0x83C46580, 0x83C38200, 0x83C29E80,
-	0x83C1BB00, 0x83C0D780, 0x83BFF400,
-	0x83BF1080, 0x83BE2D00, 0x83BD4980,
-	0x83BC6600, 0x83BB8280, 0x83BA9F00,
-	0x83B9BB80, 0x83B8D800, 0x83B7F480,
-	0x83B71100, 0x83B62D80, 0x83B54A00,
-	0x83B46680, 0x83B38300, 0x83B29F80,
-	0x83B1BC00, 0x83B0D880, 0x83AFF500,
-	0x83AF1180, 0x83AE2E00, 0x83AD4A80,
-	0x83AC6700, 0x83AB8380, 0x83AAA000,
-	0x83A9BC80, 0x83A8D900, 0x83A7F580,
-	0x83A71200, 0x83A62E80, 0x83A54B00,
-	0x83A46780, 0x83A38400, 0x83A2A080,
-	0x83A1BD00, 0x83A0D980, 0x839FF600,
-	0x839F1280, 0x839E2F00, 0x839D4B80,
-	0x839C6800, 0x839B8480, 0x839AA100,
-	0x8399BD80, 0x8398DA00, 0x8397F680,
-	0x83971300, 0x83962F80, 0x83954C00,
-	0x83946880, 0x83938500, 0x8392A180,
-	0x8391BE00, 0x8390DA80, 0x838FF700,
-	0x838F1380, 0x838E3000, 0x838D4C80,
-	0x838C6900, 0x838B8580, 0x838AA200,
-	0x8389BE80, 0x8388DB00, 0x8387F780,
-	0x83871400, 0x83863080, 0x83854D00,
-	0x83846980, 0x83838600, 0x8382A280,
-	0x8381BF00, 0x8380DB80, 0x837FF800,
-	0x837F1480, 0x837E3100, 0x837D4D80,
-	0x837C6A00, 0x837B8680, 0x837AA300,
-	0x8379BF80, 0x8378DC00, 0x8377F880,
-	0x83771500, 0x83763180, 0x83754E00,
-	0x83746A80, 0x83738700, 0x8372A380,
-	0x8371C000, 0x8370DC80, 0x836FF900,
-	0x836F1580, 0x836E3200, 0x836D4E80,
-	0x836C6B00, 0x836B8780, 0x836AA400,
-	0x8369C080, 0x8368DD00, 0x8367F980,
-	0x83671600, 0x83663280, 0x83654F00,
-	0x83646B80, 0x83638800, 0x8362A480,
-	0x8361C100, 0x8360DD80, 0x835FFA00,
-	0x835F1680, 0x835E3300, 0x835D4F80,
-	0x835C6C00, 0x835B8880, 0x835AA500,
-	0x8359C180, 0x8358DE00, 0x8357FA80,
-	0x83571700, 0x83563380, 0x83555000,
-	0x83546C80, 0x83538900, 0x8352A580,
-	0x8351C200, 0x8350DE80, 0x834FFB00,
-	0x834F1780, 0x834E3400, 0x834D5080,
-	0x834C6D00, 0x834B8980, 0x834AA600,
-	0x8349C280, 0x8348DF00, 0x8347FB80,
-	0x83471800, 0x83463480, 0x83455100,
-	0x83446D80, 0x83438A00, 0x8342A680,
-	0x8341C300, 0x8340DF80, 0x833FFC00,
-	0x833F1880, 0x833E3500, 0x833D5180,
-	0x833C6E00, 0x833B8A80, 0x833AA700,
-	0x8339C380, 0x8338E000, 0x8337FC80,
-	0x83371900, 0x83363580, 0x83355200,
-	0x83346E80, 0x83338B00, 0x8332A780,
-	0x8331C400, 0x8330E080, 0x832FFD00,
-	0x832F1980, 0x832E3600, 0x832D5280,
-	0x832C6F00, 0x832B8B80, 0x832AA800,
-	0x8329C480, 0x8328E100, 0x8327FD80,
-	0x83271A00, 0x83263680, 0x83255300,
-	0x83246F80, 0x83238C00, 0x8322A880,
-	0x8321C500, 0x8320E180, 0x831FFE00,
-	0x831F1A80, 0x831E3700, 0x831D5380,
-	0x831C7000, 0x831B8C80, 0x831AA900,
-	0x8319C580, 0x8318E200, 0x8317FE80,
-	0x83171B00, 0x83163780, 0x83155400,
-	0x83147080, 0x83138D00, 0x8312A980,
-	0x8311C600, 0x8310E280, 0x830FFF00,
-	0x830F1B80, 0x830E3800, 0x830D5480,
-	0x830C7100, 0x830B8D80, 0x830AAA00,
-	0x8309C680, 0x8308E300, 0x8307FF80,
-	0x83071C00, 0x83063880, 0x83055500,
-	0x83047180, 0x83038E00, 0x8302AA80,
-	0x8301C700, 0x8300E380, 0x83040000,
-	0x83032880, 0x83025100, 0x83017980,
-	0x8300A200, 0x82FFCA80, 0x82FEF300,
-	0x82FE1B80, 0x82FD4400, 0x82FC6C80,
-	0x82FB9500, 0x82FABD80, 0x82F9E600,
-	0x82F90E80, 0x82F83700, 0x82F75F80,
-	0x82F68800, 0x82F5B080, 0x82F4D900,
-	0x82F40180, 0x82F32A00, 0x82F25280,
-	0x82F17B00, 0x82F0A380, 0x82EFCC00,
-	0x82EEF480, 0x82EE1D00, 0x82ED4580,
-	0x82EC6E00, 0x82EB9680, 0x82EABF00,
-	0x82E9E780, 0x82E91000, 0x82E83880,
-	0x82E76100, 0x82E68980, 0x82E5B200,
-	0x82E4DA80, 0x82E40300, 0x82E32B80,
-	0x82E25400, 0x82E17C80, 0x82E0A500,
-	0x82DFCD80, 0x82DEF600, 0x82DE1E80,
-	0x82DD4700, 0x82DC6F80, 0x82DB9800,
-	0x82DAC080, 0x82D9E900, 0x82D91180,
-	0x82D83A00, 0x82D76280, 0x82D68B00,
-	0x82D5B380, 0x82D4DC00, 0x82D40480,
-	0x82D32D00, 0x82D25580, 0x82D17E00,
-	0x82D0A680, 0x82CFCF00, 0x82CEF780,
-	0x82CE2000, 0x82CD4880, 0x82CC7100,
-	0x82CB9980, 0x82CAC200, 0x82C9EA80,
-	0x82C91300, 0x82C83B80, 0x82C76400,
-	0x82C68C80, 0x82C5B500, 0x82C4DD80,
-	0x82C40600, 0x82C32E80, 0x82C25700,
-	0x82C17F80, 0x82C0A800, 0x82BFD080,
-	0x82BEF900, 0x82BE2180, 0x82BD4A00,
-	0x82BC7280, 0x82BB9B00, 0x82BAC380,
-	0x82B9EC00, 0x82B91480, 0x82B83D00,
-	0x82B76580, 0x82B68E00, 0x82B5B680,
-	0x82B4DF00, 0x82B40780, 0x82B33000,
-	0x82B25880, 0x82B18100, 0x82B0A980,
-	0x82AFD200, 0x82AEFA80, 0x82AE2300,
-	0x82AD4B80, 0x82AC7400, 0x82AB9C80,
-	0x82AAC500, 0x82A9ED80, 0x82A91600,
-	0x82A83E80, 0x82A76700, 0x82A68F80,
-	0x82A5B800, 0x82A4E080, 0x82A40900,
-	0x82A33180, 0x82A25A00, 0x82A18280,
-	0x82A0AB00, 0x829FD380, 0x829EFC00,
-	0x829E2480, 0x829D4D00, 0x829C7580,
-	0x829B9E00, 0x829AC680, 0x8299EF00,
-	0x82991780, 0x82984000, 0x82976880,
-	0x82969100, 0x8295B980, 0x8294E200,
-	0x82940A80, 0x82933300, 0x82925B80,
-	0x82918400, 0x8290AC80, 0x828FD500,
-	0x828EFD80, 0x828E2600, 0x828D4E80,
-	0x828C7700, 0x828B9F80, 0x828AC800,
-	0x8289F080, 0x82891900, 0x82884180,
-	0x82876A00, 0x82869280, 0x8285BB00,
-	0x8284E380, 0x82840C00, 0x82833480,
-	0x82825D00, 0x82818580, 0x8280AE00,
-	0x827FD680, 0x827EFF00, 0x827E2780,
-	0x827D5000, 0x827C7880, 0x827BA100,
-	0x827AC980, 0x8279F200, 0x82791A80,
-	0x82784300, 0x82776B80, 0x82769400,
-	0x8275BC80, 0x8274E500, 0x82740D80,
-	0x82733600, 0x82725E80, 0x82718700,
-	0x8270AF80, 0x826FD800, 0x826F0080,
-	0x826E2900, 0x826D5180, 0x826C7A00,
-	0x826BA280, 0x826ACB00, 0x8269F380,
-	0x82691C00, 0x82684480, 0x82676D00,
-	0x82669580, 0x8265BE00, 0x8264E680,
-	0x82640F00, 0x82633780, 0x82626000,
-	0x82618880, 0x8260B100, 0x825FD980,
-	0x825F0200, 0x825E2A80, 0x825D5300,
-	0x825C7B80, 0x825BA400, 0x825ACC80,
-	0x8259F500, 0x82591D80, 0x82584600,
-	0x82576E80, 0x82569700, 0x8255BF80,
-	0x8254E800, 0x82541080, 0x82533900,
-	0x82526180, 0x82518A00, 0x8250B280,
-	0x824FDB00, 0x824F0380, 0x824E2C00,
-	0x824D5480, 0x824C7D00, 0x824BA580,
-	0x824ACE00, 0x8249F680, 0x82491F00,
-	0x82484780, 0x82477000, 0x82469880,
-	0x8245C100, 0x8244E980, 0x82441200,
-	0x82433A80, 0x82426300, 0x82418B80,
-	0x8240B400, 0x823FDC80, 0x823F0500,
-	0x823E2D80, 0x823D5600, 0x823C7E80,
-	0x823BA700, 0x823ACF80, 0x8239F800,
-	0x82392080, 0x82384900, 0x82377180,
-	0x82369A00, 0x8235C280, 0x8234EB00,
-	0x82341380, 0x82333C00, 0x82326480,
-	0x82318D00, 0x8230B580, 0x822FDE00,
-	0x822F0680, 0x822E2F00, 0x822D5780,
-	0x822C8000, 0x822BA880, 0x822AD100,
-	0x8229F980, 0x82292200, 0x82284A80,
-	0x82277300, 0x82269B80, 0x8225C400,
-	0x8224EC80, 0x82241500, 0x82233D80,
-	0x82226600, 0x82218E80, 0x8220B700,
-	0x821FDF80, 0x821F0800, 0x821E3080,
-	0x821D5900, 0x821C8180, 0x821BAA00,
-	0x821AD280, 0x8219FB00, 0x82192380,
-	0x82184C00, 0x82177480, 0x82169D00,
-	0x8215C580, 0x8214EE00, 0x82141680,
-	0x82133F00, 0x82126780, 0x82119000,
-	0x8210B880, 0x820FE100, 0x820F0980,
-	0x820E3200, 0x820D5A80, 0x820C8300,
-	0x820BAB80, 0x820AD400, 0x8209FC80,
-	0x82092500, 0x82084D80, 0x82077600,
-	0x82069E80, 0x8205C700, 0x8204EF80,
-	0x82041800, 0x82034080, 0x82026900,
-	0x82019180, 0x8200BA00, 0x81FFE280,
-	0x81FF0B00, 0x81FE3380, 0x81FD5C00,
-	0x81FC8480, 0x81FBAD00, 0x81FAD580,
-	0x81F9FE00, 0x81F92680, 0x81F84F00,
-	0x81F77780, 0x81F6A000, 0x81F5C880,
-	0x81F4F100, 0x81F41980, 0x81F34200,
-	0x81F26A80, 0x81F19300, 0x81F0BB80,
-	0x81EFE400, 0x81EF0C80, 0x81EE3500,
-	0x81ED5D80, 0x81EC8600, 0x81EBAE80,
-	0x81EAD700, 0x81E9FF80, 0x81E92800,
-	0x81E85080, 0x81E77900, 0x81E6A180,
-	0x81E5CA00, 0x81E4F280, 0x81E41B00,
-	0x81E34380, 0x81E26C00, 0x81E19480,
-	0x81E0BD00, 0x81DFE580, 0x81DF0E00,
-	0x81DE3680, 0x81DD5F00, 0x81DC8780,
-	0x81DBB000, 0x81DAD880, 0x81DA0100,
-	0x81D92980, 0x81D85200, 0x81D77A80,
-	0x81D6A300, 0x81D5CB80, 0x81D4F400,
-	0x81D41C80, 0x81D34500, 0x81D26D80,
-	0x81D19600, 0x81D0BE80, 0x81CFE700,
-	0x81CF0F80, 0x81CE3800, 0x81CD6080,
-	0x81CC8900, 0x81CBB180, 0x81CADA00,
-	0x81CA0280, 0x81C92B00, 0x81C85380,
-	0x81C77C00, 0x81C6A480, 0x81C5CD00,
-	0x81C4F580, 0x81C41E00, 0x81C34680,
-	0x81C26F00, 0x81C19780, 0x81C0C000,
-	0x81BFE880, 0x81BF1100, 0x81BE3980,
-	0x81BD6200, 0x81BC8A80, 0x81BBB300,
-	0x81BADB80, 0x81BA0400, 0x81B92C80,
-	0x81B85500, 0x81B77D80, 0x81B6A600,
-	0x81B5CE80, 0x81B4F700, 0x81B41F80,
-	0x81B34800, 0x81B27080, 0x81B19900,
-	0x81B0C180, 0x81AFEA00, 0x81AF1280,
-	0x81AE3B00, 0x81AD6380, 0x81AC8C00,
-	0x81ABB480, 0x81AADD00, 0x81AA0580,
-	0x81A92E00, 0x81A85680, 0x81A77F00,
-	0x81A6A780, 0x81A5D000, 0x81A4F880,
-	0x81A42100, 0x81A34980, 0x81A27200,
-	0x81A19A80, 0x81A0C300, 0x819FEB80,
-	0x819F1400, 0x819E3C80, 0x819D6500,
-	0x819C8D80, 0x819BB600, 0x819ADE80,
-	0x819A0700, 0x81992F80, 0x81985800,
-	0x81978080, 0x8196A900, 0x8195D180,
-	0x8194FA00, 0x81942280, 0x81934B00,
-	0x81927380, 0x81919C00, 0x8190C480,
-	0x818FED00, 0x818F1580, 0x818E3E00,
-	0x818D6680, 0x818C8F00, 0x818BB780,
-	0x818AE000, 0x818A0880, 0x81893100,
-	0x81885980, 0x81878200, 0x8186AA80,
-	0x8185D300, 0x8184FB80, 0x81842400,
-	0x81834C80, 0x81827500, 0x81819D80,
-	0x8180C600, 0x817FEE80, 0x817F1700,
-	0x817E3F80, 0x817D6800, 0x817C9080,
-	0x817BB900, 0x817AE180, 0x817A0A00,
-	0x81793280, 0x81785B00, 0x81778380,
-	0x8176AC00, 0x8175D480, 0x8174FD00,
-	0x81742580, 0x81734E00, 0x81727680,
-	0x81719F00, 0x8170C780, 0x816FF000,
-	0x816F1880, 0x816E4100, 0x816D6980,
-	0x816C9200, 0x816BBA80, 0x816AE300,
-	0x816A0B80, 0x81693400, 0x81685C80,
-	0x81678500, 0x8166AD80, 0x8165D600,
-	0x8164FE80, 0x81642700, 0x81634F80,
-	0x81627800, 0x8161A080, 0x8160C900,
-	0x815FF180, 0x815F1A00, 0x815E4280,
-	0x815D6B00, 0x815C9380, 0x815BBC00,
-	0x815AE480, 0x815A0D00, 0x81593580,
-	0x81585E00, 0x81578680, 0x8156AF00,
-	0x8155D780, 0x81550000, 0x81542880,
-	0x81535100, 0x81527980, 0x8151A200,
-	0x8150CA80, 0x814FF300, 0x814F1B80,
-	0x814E4400, 0x814D6C80, 0x814C9500,
-	0x814BBD80, 0x814AE600, 0x814A0E80,
-	0x81493700, 0x81485F80, 0x81478800,
-	0x8146B080, 0x8145D900, 0x81450180,
-	0x81442A00, 0x81435280, 0x81427B00,
-	0x8141A380, 0x8140CC00, 0x813FF480,
-	0x813F1D00, 0x813E4580, 0x813D6E00,
-	0x813C9680, 0x813BBF00, 0x813AE780,
-	0x813A1000, 0x81393880, 0x81386100,
-	0x81378980, 0x8136B200, 0x8135DA80,
-	0x81350300, 0x81342B80, 0x81335400,
-	0x81327C80, 0x8131A500, 0x8130CD80,
-	0x812FF600, 0x812F1E80, 0x812E4700,
-	0x812D6F80, 0x812C9800, 0x812BC080,
-	0x812AE900, 0x812A1180, 0x81293A00,
-	0x81286280, 0x81278B00, 0x8126B380,
-	0x8125DC00, 0x81250480, 0x81242D00,
-	0x81235580, 0x81227E00, 0x8121A680,
-	0x8120CF00, 0x811FF780, 0x811F2000,
-	0x811E4880, 0x811D7100, 0x811C9980,
-	0x811BC200, 0x811AEA80, 0x811A1300,
-	0x81193B80, 0x81186400, 0x81178C80,
-	0x8116B500, 0x8115DD80, 0x81150600,
-	0x81142E80, 0x81135700, 0x81127F80,
-	0x8111A800, 0x8110D080, 0x810FF900,
-	0x810F2180, 0x810E4A00, 0x810D7280,
-	0x810C9B00, 0x810BC380, 0x810AEC00,
-	0x810A1480, 0x81093D00, 0x81086580,
-	0x81078E00, 0x8106B680, 0x8105DF00,
-	0x81050780, 0x81043000, 0x81035880,
-	0x81028100, 0x8101A980, 0x8100D200,
-	0x80FFFA80, 0x80FF2300, 0x80FE4B80,
-	0x80FD7400, 0x80FC9C80, 0x80FBC500,
-	0x80FAED80, 0x80FA1600, 0x80F93E80,
-	0x80F86700, 0x80F78F80, 0x80F6B800,
-	0x80F5E080, 0x80F50900, 0x80F43180,
-	0x80F35A00, 0x80F28280, 0x80F1AB00,
-	0x80F0D380, 0x80EFFC00, 0x80EF2480,
-	0x80EE4D00, 0x80ED7580, 0x80EC9E00,
-	0x80EBC680, 0x80EAEF00, 0x80EA1780,
-	0x80E94000, 0x80E86880, 0x80E79100,
-	0x80E6B980, 0x80E5E200, 0x80E50A80,
-	0x80E43300, 0x80E35B80, 0x80E28400,
-	0x80E1AC80, 0x80E0D500, 0x80DFFD80,
-	0x80DF2600, 0x80DE4E80, 0x80DD7700,
-	0x80DC9F80, 0x80DBC800, 0x80DAF080,
-	0x80DA1900, 0x80D94180, 0x80D86A00,
-	0x80D79280, 0x80D6BB00, 0x80D5E380,
-	0x80D50C00, 0x80D43480, 0x80D35D00,
-	0x80D28580, 0x80D1AE00, 0x80D0D680,
-	0x80CFFF00, 0x80CF2780, 0x80CE5000,
-	0x80CD7880, 0x80CCA100, 0x80CBC980,
-	0x80CAF200, 0x80CA1A80, 0x80C94300,
-	0x80C86B80, 0x80C79400, 0x80C6BC80,
-	0x80C5E500, 0x80C50D80, 0x80C43600,
-	0x80C35E80, 0x80C28700, 0x80C1AF80,
-	0x80C0D800, 0x80C00080, 0x80BF2900,
-	0x80BE5180, 0x80BD7A00, 0x80BCA280,
-	0x80BBCB00, 0x80BAF380, 0x80BA1C00,
-	0x80B94480, 0x80B86D00, 0x80B79580,
-	0x80B6BE00, 0x80B5E680, 0x80B50F00,
-	0x80B43780, 0x80B36000, 0x80B28880,
-	0x80B1B100, 0x80B0D980, 0x80B00200,
-	0x80AF2A80, 0x80AE5300, 0x80AD7B80,
-	0x80ACA400, 0x80ABCC80, 0x80AAF500,
-	0x80AA1D80, 0x80A94600, 0x80A86E80,
-	0x80A79700, 0x80A6BF80, 0x80A5E800,
-	0x80A51080, 0x80A43900, 0x80A36180,
-	0x80A28A00, 0x80A1B280, 0x80A0DB00,
-	0x80A00380, 0x809F2C00, 0x809E5480,
-	0x809D7D00, 0x809CA580, 0x809BCE00,
-	0x809AF680, 0x809A1F00, 0x80994780,
-	0x80987000, 0x80979880, 0x8096C100,
-	0x8095E980, 0x80951200, 0x80943A80,
-	0x80936300, 0x80928B80, 0x8091B400,
-	0x8090DC80, 0x80900500, 0x808F2D80,
-	0x808E5600, 0x808D7E80, 0x808CA700,
-	0x808BCF80, 0x808AF800, 0x808A2080,
-	0x80894900, 0x80887180, 0x80879A00,
-	0x8086C280, 0x8085EB00, 0x80851380,
-	0x80843C00, 0x80836480, 0x80828D00,
-	0x8081B580, 0x8080DE00, 0x80800680,
-	0x807F2F00, 0x807E5780, 0x807D8000,
-	0x807CA880, 0x807BD100, 0x807AF980,
-	0x807A2200, 0x80794A80, 0x80787300,
-	0x80779B80, 0x8076C400, 0x8075EC80,
-	0x80751500, 0x80743D80, 0x80736600,
-	0x80728E80, 0x8071B700, 0x8070DF80,
-	0x80700800, 0x806F3080, 0x806E5900,
-	0x806D8180, 0x806CAA00, 0x806BD280,
-	0x806AFB00, 0x806A2380, 0x80694C00,
-	0x80687480, 0x80679D00, 0x8066C580,
-	0x8065EE00, 0x80651680, 0x80643F00,
-	0x80636780, 0x80629000, 0x8061B880,
-	0x8060E100, 0x80600980, 0x805F3200,
-	0x805E5A80, 0x805D8300, 0x805CAB80,
-	0x805BD400, 0x805AFC80, 0x805A2500,
-	0x80594D80, 0x80587600, 0x80579E80,
-	0x8056C700, 0x8055EF80, 0x80551800,
-	0x80544080, 0x80536900, 0x80529180,
-	0x8051BA00, 0x8050E280, 0x80500B00,
-	0x804F3380, 0x804E5C00, 0x804D8480,
-	0x804CAD00, 0x804BD580, 0x804AFE00,
-	0x804A2680, 0x80494F00, 0x80487780,
-	0x8047A000, 0x8046C880, 0x8045F100,
-	0x80451980, 0x80444200, 0x80436A80,
-	0x80429300, 0x8041BB80, 0x8040E400,
-	0x80400C80, 0x803F3500, 0x803E5D80,
-	0x803D8600, 0x803CAE80, 0x803BD700,
-	0x803AFF80, 0x803A2800, 0x80395080,
-	0x80387900, 0x8037A180, 0x8036CA00,
-	0x8035F280, 0x80351B00, 0x80344380,
-	0x80336C00, 0x80329480, 0x8031BD00,
-	0x8030E580, 0x80300E00, 0x802F3680,
-	0x802E5F00, 0x802D8780, 0x802CB000,
-	0x802BD880, 0x802B0100, 0x802A2980,
-	0x80295200, 0x80287A80, 0x8027A300,
-	0x8026CB80, 0x8025F400, 0x80251C80,
-	0x80244500, 0x80236D80, 0x80229600,
-	0x8021BE80, 0x8020E700, 0x80200F80,
-	0x801F3800, 0x801E6080, 0x801D8900,
-	0x801CB180, 0x801BDA00, 0x801B0280,
-	0x801A2B00, 0x80195380, 0x80187C00,
-	0x8017A480, 0x8016CD00, 0x8015F580,
-	0x80151E00, 0x80144680, 0x80136F00,
-	0x80129780, 0x8011C000, 0x8010E880,
-	0x80101100, 0x800F3980, 0x800E6200,
-	0x800D8A80, 0x800CB300, 0x800BDB80,
-	0x800B0400, 0x800A2C80, 0x80095500,
-	0x80087D80, 0x8007A600, 0x8006CE80,
-	0x8005F700, 0x80051F80, 0x80044800,
-	0x80037080, 0x80029900, 0x8001C180,
-	0x8000EA00, 0x80001280, 0x7FFF3B00,
-	0x7FFE6380, 0x7FFD8C00, 0x7FFCB480,
-	0x7FFBDD00, 0x7FFB0580, 0x7FFA2E00,
-	0x7FF95680, 0x7FF87F00, 0x7FF7A780,
-	0x7FF6D000, 0x7FF5F880, 0x7FF52100,
-	0x7FF44980, 0x7FF37200, 0x7FF29A80,
-	0x7FF1C300, 0x7FF0EB80, 0x7FF01400,
-	0x7FEF3C80, 0x7FEE6500, 0x7FED8D80,
-	0x7FECB600, 0x7FEBDE80, 0x7FEB0700,
-	0x7FEA2F80, 0x7FE95800, 0x7FE88080,
-	0x7FE7A900, 0x7FE6D180, 0x7FE5FA00,
-	0x7FE52280, 0x7FE44B00, 0x7FE37380,
-	0x7FE29C00, 0x7FE1C480, 0x7FE0ED00,
-	0x7FE01580, 0x7FDF3E00, 0x7FDE6680,
-	0x7FDD8F00, 0x7FDCB780, 0x7FDBE000,
-	0x7FDB0880, 0x7FDA3100, 0x7FD95980,
-	0x7FD88200, 0x7FD7AA80, 0x7FD6D300,
-	0x7FD5FB80, 0x7FD52400, 0x7FD44C80,
-	0x7FD37500, 0x7FD29D80, 0x7FD1C600,
-	0x7FD0EE80, 0x7FD01700, 0x7FCF3F80,
-	0x7FCE6800, 0x7FCD9080, 0x7FCCB900,
-	0x7FCBE180, 0x7FCB0A00, 0x7FCA3280,
-	0x7FC95B00, 0x7FC88380, 0x7FC7AC00,
-	0x7FC6D480, 0x7FC5FD00, 0x7FC52580,
-	0x7FC44E00, 0x7FC37680, 0x7FC29F00,
-	0x7FC1C780, 0x7FC0F000, 0x7FC01880,
-	0x7FBF4100, 0x7FBE6980, 0x7FBD9200,
-	0x7FBCBA80, 0x7FBBE300, 0x7FBB0B80,
-	0x7FBA3400, 0x7FB95C80, 0x7FB88500,
-	0x7FB7AD80, 0x7FB6D600, 0x7FB5FE80,
-	0x7FB52700, 0x7FB44F80, 0x7FB37800,
-	0x7FB2A080, 0x7FB1C900, 0x7FB0F180,
-	0x7FB01A00, 0x7FAF4280, 0x7FAE6B00,
-	0x7FAD9380, 0x7FACBC00, 0x7FABE480,
-	0x7FAB0D00, 0x7FAA3580, 0x7FA95E00,
-	0x7FA88680, 0x7FA7AF00, 0x7FA6D780,
-	0x7FA60000, 0x7FA52880, 0x7FA45100,
-	0x7FA37980, 0x7FA2A200, 0x7FA1CA80,
-	0x7FA0F300, 0x7FA01B80, 0x7F9F4400,
-	0x7F9E6C80, 0x7F9D9500, 0x7F9CBD80,
-	0x7F9BE600, 0x7F9B0E80, 0x7F9A3700,
-	0x7F995F80, 0x7F988800, 0x7F97B080,
-	0x7F96D900, 0x7F960180, 0x7F952A00,
-	0x7F945280, 0x7F937B00, 0x7F92A380,
-	0x7F91CC00, 0x7F90F480, 0x7F901D00,
-	0x7F8F4580, 0x7F8E6E00, 0x7F8D9680,
-	0x7F8CBF00, 0x7F8BE780, 0x7F8B1000,
-	0x7F8A3880, 0x7F896100, 0x7F888980,
-	0x7F87B200, 0x7F86DA80, 0x7F860300,
-	0x7F852B80, 0x7F845400, 0x7F837C80,
-	0x7F82A500, 0x7F81CD80, 0x7F80F600,
-	0x7F801E80, 0x7F7F4700, 0x7F7E6F80,
-	0x7F7D9800, 0x7F7CC080, 0x7F7BE900,
-	0x7F7B1180, 0x7F7A3A00, 0x7F796280,
-	0x7F788B00, 0x7F77B380, 0x7F76DC00,
-	0x7F760480, 0x7F752D00, 0x7F745580,
-	0x7F737E00, 0x7F72A680, 0x7F71CF00,
-	0x7F70F780, 0x7F702000, 0x7F6F4880,
-	0x7F6E7100, 0x7F6D9980, 0x7F6CC200,
-	0x7F6BEA80, 0x7F6B1300, 0x7F6A3B80,
-	0x7F696400, 0x7F688C80, 0x7F67B500,
-	0x7F66DD80, 0x7F660600, 0x7F652E80,
-	0x7F645700, 0x7F637F80, 0x7F62A800,
-	0x7F61D080, 0x7F60F900, 0x7F602180,
-	0x7F5F4A00, 0x7F5E7280, 0x7F5D9B00,
-	0x7F5CC380, 0x7F5BEC00, 0x7F5B1480,
-	0x7F5A3D00, 0x7F596580, 0x7F588E00,
-	0x7F57B680, 0x7F56DF00, 0x7F560780,
-	0x7F553000, 0x7F545880, 0x7F538100,
-	0x7F52A980, 0x7F51D200, 0x7F50FA80,
-	0x7F502300, 0x7F4F4B80, 0x7F4E7400,
-	0x7F4D9C80, 0x7F4CC500, 0x7F4BED80,
-	0x7F4B1600, 0x7F4A3E80, 0x7F496700,
-	0x7F488F80, 0x7F47B800, 0x7F46E080,
-	0x7F460900, 0x7F453180, 0x7F445A00,
-	0x7F438280, 0x7F42AB00, 0x7F41D380,
-	0x7F40FC00, 0x7F402480, 0x7F3F4D00,
-	0x7F3E7580, 0x7F3D9E00, 0x7F3CC680,
-	0x7F3BEF00, 0x7F3B1780, 0x7F3A4000,
-	0x7F396880, 0x7F389100, 0x7F37B980,
-	0x7F36E200, 0x7F360A80, 0x7F353300,
-	0x7F345B80, 0x7F338400, 0x7F32AC80,
-	0x7F31D500, 0x7F30FD80, 0x7F302600,
-	0x7F2F4E80, 0x7F2E7700, 0x7F2D9F80,
-	0x7F2CC800, 0x7F2BF080, 0x7F2B1900,
-	0x7F2A4180, 0x7F296A00, 0x7F289280,
-	0x7F27BB00, 0x7F26E380, 0x7F260C00,
-	0x7F253480, 0x7F245D00, 0x7F238580,
-	0x7F22AE00, 0x7F21D680, 0x7F20FF00,
-	0x7F202780, 0x7F1F5000, 0x7F1E7880,
-	0x7F1DA100, 0x7F1CC980, 0x7F1BF200,
-	0x7F1B1A80, 0x7F1A4300, 0x7F196B80,
-	0x7F189400, 0x7F17BC80, 0x7F16E500,
-	0x7F160D80, 0x7F153600, 0x7F145E80,
-	0x7F138700, 0x7F12AF80, 0x7F11D800,
-	0x7F110080, 0x7F102900, 0x7F0F5180,
-	0x7F0E7A00, 0x7F0DA280, 0x7F0CCB00,
-	0x7F0BF380, 0x7F0B1C00, 0x7F0A4480,
-	0x7F096D00, 0x7F089580, 0x7F07BE00,
-	0x7F06E680, 0x7F060F00, 0x7F053780,
-	0x7F046000, 0x7F038880, 0x7F02B100,
-	0x7F01D980, 0x7F010200, 0x7F002A80,
-	0x7EFF5300, 0x7EFE7B80, 0x7EFDA400,
-	0x7EFCCC80, 0x7EFBF500, 0x7EFB1D80,
-	0x7EFA4600, 0x7EF96E80, 0x7EF89700,
-	0x7EF7BF80, 0x7EF6E800, 0x7EF61080,
-	0x7EF53900, 0x7EF46180, 0x7EF38A00,
-	0x7EF2B280, 0x7EF1DB00, 0x7EF10380,
-	0x7EF02C00, 0x7EEF5480, 0x7EEE7D00,
-	0x7EEDA580, 0x7EECCE00, 0x7EEBF680,
-	0x7EEB1F00, 0x7EEA4780, 0x7EE97000,
-	0x7EE89880, 0x7EE7C100, 0x7EE6E980,
-	0x7EE61200, 0x7EE53A80, 0x7EE46300,
-	0x7EE38B80, 0x7EE2B400, 0x7EE1DC80,
-	0x7EE10500, 0x7EE02D80, 0x7EDF5600,
-	0x7EDE7E80, 0x7EDDA700, 0x7EDCCF80,
-	0x7EDBF800, 0x7EDB2080, 0x7EDA4900,
-	0x7ED97180, 0x7ED89A00, 0x7ED7C280,
-	0x7ED6EB00, 0x7ED61380, 0x7ED53C00,
-	0x7ED46480, 0x7ED38D00, 0x7ED2B580,
-	0x7ED1DE00, 0x7ED10680, 0x7ED02F00,
-	0x7ECF5780, 0x7ECE8000, 0x7ECDA880,
-	0x7ECCD100, 0x7ECBF980, 0x7ECB2200,
-	0x7ECA4A80, 0x7EC97300, 0x7EC89B80,
-	0x7EC7C400, 0x7EC6EC80, 0x7EC61500,
-	0x7EC53D80, 0x7EC46600, 0x7EC38E80,
-	0x7EC2B700, 0x7EC1DF80, 0x7EC10800,
-	0x7EC03080, 0x7EBF5900, 0x7EBE8180,
-	0x7EBDAA00, 0x7EBCD280, 0x7EBBFB00,
-	0x7EBB2380, 0x7EBA4C00, 0x7EB97480,
-	0x7EB89D00, 0x7EB7C580, 0x7EB6EE00,
-	0x7EB61680, 0x7EB53F00, 0x7EB46780,
-	0x7EB39000, 0x7EB2B880, 0x7EB1E100,
-	0x7EB10980, 0x7EB03200, 0x7EAF5A80,
-	0x7EAE8300, 0x7EADAB80, 0x7EACD400,
-	0x7EABFC80, 0x7EAB2500, 0x7EAA4D80,
-	0x7EA97600, 0x7EA89E80, 0x7EA7C700,
-	0x7EA6EF80, 0x7EA61800, 0x7EA54080,
-	0x7EA46900, 0x7EA39180, 0x7EA2BA00,
-	0x7EA1E280, 0x7EA10B00, 0x7EA03380,
-	0x7E9F5C00, 0x7E9E8480, 0x7E9DAD00,
-	0x7E9CD580, 0x7E9BFE00, 0x7E9B2680,
-	0x7E9A4F00, 0x7E997780, 0x7E98A000,
-	0x7E97C880, 0x7E96F100, 0x7E961980,
-	0x7E954200, 0x7E946A80, 0x7E939300,
-	0x7E92BB80, 0x7E91E400, 0x7E910C80,
-	0x7E903500, 0x7E8F5D80, 0x7E8E8600,
-	0x7E8DAE80, 0x7E8CD700, 0x7E8BFF80,
-	0x7E8B2800, 0x7E8A5080, 0x7E897900,
-	0x7E88A180, 0x7E87CA00, 0x7E86F280,
-	0x7E861B00, 0x7E854380, 0x7E846C00,
-	0x7E839480, 0x7E82BD00, 0x7E81E580,
-	0x7E810E00, 0x7E803680, 0x7E7F5F00,
-	0x7E7E8780, 0x7E7DB000, 0x7E7CD880,
-	0x7E7C0100, 0x7E7B2980, 0x7E7A5200,
-	0x7E797A80, 0x7E78A300, 0x7E77CB80,
-	0x7E76F400, 0x7E761C80, 0x7E754500,
-	0x7E746D80, 0x7E739600, 0x7E72BE80,
-	0x7E71E700, 0x7E710F80, 0x7E703800,
-	0x7E6F6080, 0x7E6E8900, 0x7E6DB180,
-	0x7E6CDA00, 0x7E6C0280, 0x7E6B2B00,
-	0x7E6A5380, 0x7E697C00, 0x7E68A480,
-	0x7E67CD00, 0x7E66F580, 0x7E661E00,
-	0x7E654680, 0x7E646F00, 0x7E639780,
-	0x7E62C000, 0x7E61E880, 0x7E611100,
-	0x7E603980, 0x7E5F6200, 0x7E5E8A80,
-	0x7E5DB300, 0x7E5CDB80, 0x7E5C0400,
-	0x7E5B2C80, 0x7E5A5500, 0x7E597D80,
-	0x7E58A600, 0x7E57CE80, 0x7E56F700,
-	0x7E561F80, 0x7E554800, 0x7E547080,
-	0x7E539900, 0x7E52C180, 0x7E51EA00,
-	0x7E511280, 0x7E503B00, 0x7E4F6380,
-	0x7E4E8C00, 0x7E4DB480, 0x7E4CDD00,
-	0x7E4C0580, 0x7E4B2E00, 0x7E4A5680,
-	0x7E497F00, 0x7E48A780, 0x7E47D000,
-	0x7E46F880, 0x7E462100, 0x7E454980,
-	0x7E447200, 0x7E439A80, 0x7E42C300,
-	0x7E41EB80, 0x7E411400, 0x7E403C80,
-	0x7E3F6500, 0x7E3E8D80, 0x7E3DB600,
-	0x7E3CDE80, 0x7E3C0700, 0x7E3B2F80,
-	0x7E3A5800, 0x7E398080, 0x7E38A900,
-	0x7E37D180, 0x7E36FA00, 0x7E362280,
-	0x7E354B00, 0x7E347380, 0x7E339C00,
-	0x7E32C480, 0x7E31ED00, 0x7E311580,
-	0x7E303E00, 0x7E2F6680, 0x7E2E8F00,
-	0x7E2DB780, 0x7E2CE000, 0x7E2C0880,
-	0x7E2B3100, 0x7E2A5980, 0x7E298200,
-	0x7E28AA80, 0x7E27D300, 0x7E26FB80,
-	0x7E262400, 0x7E254C80, 0x7E247500,
-	0x7E239D80, 0x7E22C600, 0x7E21EE80,
-	0x7E211700, 0x7E203F80, 0x7E1F6800,
-	0x7E1E9080, 0x7E1DB900, 0x7E1CE180,
-	0x7E1C0A00, 0x7E1B3280, 0x7E1A5B00,
-	0x7E198380, 0x7E18AC00, 0x7E17D480,
-	0x7E16FD00, 0x7E162580, 0x7E154E00,
-	0x7E147680, 0x7E139F00, 0x7E12C780,
-	0x7E11F000, 0x7E111880, 0x7E104100,
-	0x7E0F6980, 0x7E0E9200, 0x7E0DBA80,
-	0x7E0CE300, 0x7E0C0B80, 0x7E0B3400,
-	0x7E0A5C80, 0x7E098500, 0x7E08AD80,
-	0x7E07D600, 0x7E06FE80, 0x7E062700,
-	0x7E054F80, 0x7E047800, 0x7E03A080,
-	0x7E02C900, 0x7E01F180, 0x7E011A00,
-	0x7E004280, 0x7DFF6B00, 0x7DFE9380,
-	0x7DFDBC00, 0x7DFCE480, 0x7DFC0D00,
-	0x7DFB3580, 0x7DFA5E00, 0x7DF98680,
-	0x7DF8AF00, 0x7DF7D780, 0x7DF70000,
-	0x7DF62880, 0x7DF55100, 0x7DF47980,
-	0x7DF3A200, 0x7DF2CA80, 0x7DF1F300,
-	0x7DF11B80, 0x7DF04400, 0x7DEF6C80,
-	0x7DEE9500, 0x7DEDBD80, 0x7DECE600,
-	0x7DEC0E80, 0x7DEB3700, 0x7DEA5F80,
-	0x7DE98800, 0x7DE8B080, 0x7DE7D900,
-	0x7DE70180, 0x7DE62A00, 0x7DE55280,
-	0x7DE47B00, 0x7DE3A380, 0x7DE2CC00,
-	0x7DE1F480, 0x7DE11D00, 0x7DE04580,
-	0x7DDF6E00, 0x7DDE9680, 0x7DDDBF00,
-	0x7DDCE780, 0x7DDC1000, 0x7DDB3880,
-	0x7DDA6100, 0x7DD98980, 0x7DD8B200,
-	0x7DD7DA80, 0x7DD70300, 0x7DD62B80,
-	0x7DD55400, 0x7DD47C80, 0x7DD3A500,
-	0x7DD2CD80, 0x7DD1F600, 0x7DD11E80,
-	0x7DD04700, 0x7DCF6F80, 0x7DCE9800,
-	0x7DCDC080, 0x7DCCE900, 0x7DCC1180,
-	0x7DCB3A00, 0x7DCA6280, 0x7DC98B00,
-	0x7DC8B380, 0x7DC7DC00, 0x7DC70480,
-	0x7DC62D00, 0x7DC55580, 0x7DC47E00,
-	0x7DC3A680, 0x7DC2CF00, 0x7DC1F780,
-	0x7DC12000, 0x7DC04880, 0x7DBF7100,
-	0x7DBE9980, 0x7DBDC200, 0x7DBCEA80,
-	0x7DBC1300, 0x7DBB3B80, 0x7DBA6400,
-	0x7DB98C80, 0x7DB8B500, 0x7DB7DD80,
-	0x7DB70600, 0x7DB62E80, 0x7DB55700,
-	0x7DB47F80, 0x7DB3A800, 0x7DB2D080,
-	0x7DB1F900, 0x7DB12180, 0x7DB04A00,
-	0x7DAF7280, 0x7DAE9B00, 0x7DADC380,
-	0x7DACEC00, 0x7DAC1480, 0x7DAB3D00,
-	0x7DAA6580, 0x7DA98E00, 0x7DA8B680,
-	0x7DA7DF00, 0x7DA70780, 0x7DA63000,
-	0x7DA55880, 0x7DA48100, 0x7DA3A980,
-	0x7DA2D200, 0x7DA1FA80, 0x7DA12300,
-	0x7DA04B80, 0x7D9F7400, 0x7D9E9C80,
-	0x7D9DC500, 0x7D9CED80, 0x7D9C1600,
-	0x7D9B3E80, 0x7D9A6700, 0x7D998F80,
-	0x7D98B800, 0x7D97E080, 0x7D970900,
-	0x7D963180, 0x7D955A00, 0x7D948280,
-	0x7D93AB00, 0x7D92D380, 0x7D91FC00,
-	0x7D912480, 0x7D904D00, 0x7D8F7580,
-	0x7D8E9E00, 0x7D8DC680, 0x7D8CEF00,
-	0x7D8C1780, 0x7D8B4000, 0x7D8A6880,
-	0x7D899100, 0x7D88B980, 0x7D87E200,
-	0x7D870A80, 0x7D863300, 0x7D855B80,
-	0x7D848400, 0x7D83AC80, 0x7D82D500,
-	0x7D81FD80, 0x7D812600, 0x7D804E80,
-	0x7D7F7700, 0x7D7E9F80, 0x7D7DC800,
-	0x7D7CF080, 0x7D7C1900, 0x7D7B4180,
-	0x7D7A6A00, 0x7D799280, 0x7D78BB00,
-	0x7D77E380, 0x7D770C00, 0x7D763480,
-	0x7D755D00, 0x7D748580, 0x7D73AE00,
-	0x7D72D680, 0x7D71FF00, 0x7D712780,
-	0x7D705000, 0x7D6F7880, 0x7D6EA100,
-	0x7D6DC980, 0x7D6CF200, 0x7D6C1A80,
-	0x7D6B4300, 0x7D6A6B80, 0x7D699400,
-	0x7D68BC80, 0x7D67E500, 0x7D670D80,
-	0x7D663600, 0x7D655E80, 0x7D648700,
-	0x7D63AF80, 0x7D62D800, 0x7D620080,
-	0x7D612900, 0x7D605180, 0x7D5F7A00,
-	0x7D5EA280, 0x7D5DCB00, 0x7D5CF380,
-	0x7D5C1C00, 0x7D5B4480, 0x7D5A6D00,
-	0x7D599580, 0x7D58BE00, 0x7D57E680,
-	0x7D570F00, 0x7D563780, 0x7D556000,
-	0x7D548880, 0x7D53B100, 0x7D52D980,
-	0x7D520200, 0x7D512A80, 0x7D505300,
-	0x7D4F7B80, 0x7D4EA400, 0x7D4DCC80,
-	0x7D4CF500, 0x7D4C1D80, 0x7D4B4600,
-	0x7D4A6E80, 0x7D499700, 0x7D48BF80,
-	0x7D47E800, 0x7D471080, 0x7D463900,
-	0x7D456180, 0x7D448A00, 0x7D43B280,
-	0x7D42DB00, 0x7D420380, 0x7D412C00,
-	0x7D405480, 0x7D3F7D00, 0x7D3EA580,
-	0x7D3DCE00, 0x7D3CF680, 0x7D3C1F00,
-	0x7D3B4780, 0x7D3A7000, 0x7D399880,
-	0x7D38C100, 0x7D37E980, 0x7D371200,
-	0x7D363A80, 0x7D356300, 0x7D348B80,
-	0x7D33B400, 0x7D32DC80, 0x7D320500,
-	0x7D312D80, 0x7D305600, 0x7D2F7E80,
-	0x7D2EA700, 0x7D2DCF80, 0x7D2CF800,
-	0x7D2C2080, 0x7D2B4900, 0x7D2A7180,
-	0x7D299A00, 0x7D28C280, 0x7D27EB00,
-	0x7D271380, 0x7D263C00, 0x7D256480,
-	0x7D248D00, 0x7D23B580, 0x7D22DE00,
-	0x7D220680, 0x7D212F00, 0x7D205780,
-	0x7D1F8000, 0x7D1EA880, 0x7D1DD100,
-	0x7D1CF980, 0x7D1C2200, 0x7D1B4A80,
-	0x7D1A7300, 0x7D199B80, 0x7D18C400,
-	0x7D17EC80, 0x7D171500, 0x7D163D80,
-	0x7D156600, 0x7D148E80, 0x7D13B700,
-	0x7D12DF80, 0x7D120800, 0x7D113080,
-	0x7D105900, 0x7D0F8180, 0x7D0EAA00,
-	0x7D0DD280, 0x7D0CFB00, 0x7D0C2380,
-	0x7D0B4C00, 0x7D0A7480, 0x7D099D00,
-	0x7D08C580, 0x7D07EE00, 0x7D071680,
-	0x7D063F00, 0x7D056780, 0x7D049000,
-	0x7D03B880, 0x7D02E100, 0x7D020980,
-	0x7D013200, 0x7D005A80, 0x7CFF8300,
-	0x7CFEAB80, 0x7CFDD400, 0x7CFCFC80,
-	0x7CFC2500, 0x7CFB4D80, 0x7CFA7600,
-	0x7CF99E80, 0x7CF8C700, 0x7CF7EF80,
-	0x7CF71800, 0x7CF64080, 0x7CF56900,
-	0x7CF49180, 0x7CF3BA00, 0x7CF2E280,
-	0x7CF20B00, 0x7CF13380, 0x7CF05C00,
-	0x7CEF8480, 0x7CEEAD00, 0x7CEDD580,
-	0x7CECFE00, 0x7CEC2680, 0x7CEB4F00,
-	0x7CEA7780, 0x7CE9A000, 0x7CE8C880,
-	0x7CE7F100, 0x7CE71980, 0x7CE64200,
-	0x7CE56A80, 0x7CE49300, 0x7CE3BB80,
-	0x7CE2E400, 0x7CE20C80, 0x7CE13500,
-	0x7CE05D80, 0x7CDF8600, 0x7CDEAE80,
-	0x7CDDD700, 0x7CDCFF80, 0x7CDC2800,
-	0x7CDB5080, 0x7CDA7900, 0x7CD9A180,
-	0x7CD8CA00, 0x7CD7F280, 0x7CD71B00,
-	0x7CD64380, 0x7CD56C00, 0x7CD49480,
-	0x7CD3BD00, 0x7CD2E580, 0x7CD20E00,
-	0x7CD13680, 0x7CD05F00, 0x7CCF8780,
-	0x7CCEB000, 0x7CCDD880, 0x7CCD0100,
-	0x7CCC2980, 0x7CCB5200, 0x7CCA7A80,
-	0x7CC9A300, 0x7CC8CB80, 0x7CC7F400,
-	0x7CC71C80, 0x7CC64500, 0x7CC56D80,
-	0x7CC49600, 0x7CC3BE80, 0x7CC2E700,
-	0x7CC20F80, 0x7CC13800, 0x7CC06080,
-	0x7CBF8900, 0x7CBEB180, 0x7CBDDA00,
-	0x7CBD0280, 0x7CBC2B00, 0x7CBB5380,
-	0x7CBA7C00, 0x7CB9A480, 0x7CB8CD00,
-	0x7CB7F580, 0x7CB71E00, 0x7CB64680,
-	0x7CB56F00, 0x7CB49780, 0x7CB3C000,
-	0x7CB2E880, 0x7CB21100, 0x7CB13980,
-	0x7CB06200, 0x7CAF8A80, 0x7CAEB300,
-	0x7CADDB80, 0x7CAD0400, 0x7CAC2C80,
-	0x7CAB5500, 0x7CAA7D80, 0x7CA9A600,
-	0x7CA8CE80, 0x7CA7F700, 0x7CA71F80,
-	0x7CA64800, 0x7CA57080, 0x7CA49900,
-	0x7CA3C180, 0x7CA2EA00, 0x7CA21280,
-	0x7CA13B00, 0x7CA06380, 0x7C9F8C00,
-	0x7C9EB480, 0x7C9DDD00, 0x7C9D0580,
-	0x7C9C2E00, 0x7C9B5680, 0x7C9A7F00,
-	0x7C99A780, 0x7C98D000, 0x7C97F880,
-	0x7C972100, 0x7C964980, 0x7C957200,
-	0x7C949A80, 0x7C93C300, 0x7C92EB80,
-	0x7C921400, 0x7C913C80, 0x7C906500,
-	0x7C8F8D80, 0x7C8EB600, 0x7C8DDE80,
-	0x7C8D0700, 0x7C8C2F80, 0x7C8B5800,
-	0x7C8A8080, 0x7C89A900, 0x7C88D180,
-	0x7C87FA00, 0x7C872280, 0x7C864B00,
-	0x7C857380, 0x7C849C00, 0x7C83C480,
-	0x7C82ED00, 0x7C821580, 0x7C813E00,
-	0x7C806680, 0x7C7F8F00, 0x7C7EB780,
-	0x7C7DE000, 0x7C7D0880, 0x7C7C3100,
-	0x7C7B5980, 0x7C7A8200, 0x7C79AA80,
-	0x7C78D300, 0x7C77FB80, 0x7C772400,
-	0x7C764C80, 0x7C757500, 0x7C749D80,
-	0x7C73C600, 0x7C72EE80, 0x7C721700,
-	0x7C713F80, 0x7C706800, 0x7C6F9080,
-	0x7C6EB900, 0x7C6DE180, 0x7C6D0A00,
-	0x7C6C3280, 0x7C6B5B00, 0x7C6A8380,
-	0x7C69AC00, 0x7C68D480, 0x7C67FD00,
-	0x7C672580, 0x7C664E00, 0x7C657680,
-	0x7C649F00, 0x7C63C780, 0x7C62F000,
-	0x7C621880, 0x7C614100, 0x7C606980,
-	0x7C5F9200, 0x7C5EBA80, 0x7C5DE300,
-	0x7C5D0B80, 0x7C5C3400, 0x7C5B5C80,
-	0x7C5A8500, 0x7C59AD80, 0x7C58D600,
-	0x7C57FE80, 0x7C572700, 0x7C564F80,
-	0x7C557800, 0x7C54A080, 0x7C53C900,
-	0x7C52F180, 0x7C521A00, 0x7C514280,
-	0x7C506B00, 0x7C4F9380, 0x7C4EBC00,
-	0x7C4DE480, 0x7C4D0D00, 0x7C4C3580,
-	0x7C4B5E00, 0x7C4A8680, 0x7C49AF00,
-	0x7C48D780, 0x7C480000, 0x7C473380,
-	0x7C466700, 0x7C459A80, 0x7C44CE00,
-	0x7C440180, 0x7C433500, 0x7C426880,
-	0x7C419C00, 0x7C40CF80, 0x7C400300,
-	0x7C3F3680, 0x7C3E6A00, 0x7C3D9D80,
-	0x7C3CD100, 0x7C3C0480, 0x7C3B3800,
-	0x7C3A6B80, 0x7C399F00, 0x7C38D280,
-	0x7C380600, 0x7C373980, 0x7C366D00,
-	0x7C35A080, 0x7C34D400, 0x7C340780,
-	0x7C333B00, 0x7C326E80, 0x7C31A200,
-	0x7C30D580, 0x7C300900, 0x7C2F3C80,
-	0x7C2E7000, 0x7C2DA380, 0x7C2CD700,
-	0x7C2C0A80, 0x7C2B3E00, 0x7C2A7180,
-	0x7C29A500, 0x7C28D880, 0x7C280C00,
-	0x7C273F80, 0x7C267300, 0x7C25A680,
-	0x7C24DA00, 0x7C240D80, 0x7C234100,
-	0x7C227480, 0x7C21A800, 0x7C20DB80,
-	0x7C200F00, 0x7C1F4280, 0x7C1E7600,
-	0x7C1DA980, 0x7C1CDD00, 0x7C1C1080,
-	0x7C1B4400, 0x7C1A7780, 0x7C19AB00,
-	0x7C18DE80, 0x7C181200, 0x7C174580,
-	0x7C167900, 0x7C15AC80, 0x7C14E000,
-	0x7C141380, 0x7C134700, 0x7C127A80,
-	0x7C11AE00, 0x7C10E180, 0x7C101500,
-	0x7C0F4880, 0x7C0E7C00, 0x7C0DAF80,
-	0x7C0CE300, 0x7C0C1680, 0x7C0B4A00,
-	0x7C0A7D80, 0x7C09B100, 0x7C08E480,
-	0x7C081800, 0x7C074B80, 0x7C067F00,
-	0x7C05B280, 0x7C04E600, 0x7C041980,
-	0x7C034D00, 0x7C028080, 0x7C01B400,
-	0x7C00E780, 0x7C001B00, 0x7BFF4E80,
-	0x7BFE8200, 0x7BFDB580, 0x7BFCE900,
-	0x7BFC1C80, 0x7BFB5000, 0x7BFA8380,
-	0x7BF9B700, 0x7BF8EA80, 0x7BF81E00,
-	0x7BF75180, 0x7BF68500, 0x7BF5B880,
-	0x7BF4EC00, 0x7BF41F80, 0x7BF35300,
-	0x7BF28680, 0x7BF1BA00, 0x7BF0ED80,
-	0x7BF02100, 0x7BEF5480, 0x7BEE8800,
-	0x7BEDBB80, 0x7BECEF00, 0x7BEC2280,
-	0x7BEB5600, 0x7BEA8980, 0x7BE9BD00,
-	0x7BE8F080, 0x7BE82400, 0x7BE75780,
-	0x7BE68B00, 0x7BE5BE80, 0x7BE4F200,
-	0x7BE42580, 0x7BE35900, 0x7BE28C80,
-	0x7BE1C000, 0x7BE0F380, 0x7BE02700,
-	0x7BDF5A80, 0x7BDE8E00, 0x7BDDC180,
-	0x7BDCF500, 0x7BDC2880, 0x7BDB5C00,
-	0x7BDA8F80, 0x7BD9C300, 0x7BD8F680,
-	0x7BD82A00, 0x7BD75D80, 0x7BD69100,
-	0x7BD5C480, 0x7BD4F800, 0x7BD42B80,
-	0x7BD35F00, 0x7BD29280, 0x7BD1C600,
-	0x7BD0F980, 0x7BD02D00, 0x7BCF6080,
-	0x7BCE9400, 0x7BCDC780, 0x7BCCFB00,
-	0x7BCC2E80, 0x7BCB6200, 0x7BCA9580,
-	0x7BC9C900, 0x7BC8FC80, 0x7BC83000,
-	0x7BC76380, 0x7BC69700, 0x7BC5CA80,
-	0x7BC4FE00, 0x7BC43180, 0x7BC36500,
-	0x7BC29880, 0x7BC1CC00, 0x7BC0FF80,
-	0x7BC03300, 0x7BBF6680, 0x7BBE9A00,
-	0x7BBDCD80, 0x7BBD0100, 0x7BBC3480,
-	0x7BBB6800, 0x7BBA9B80, 0x7BB9CF00,
-	0x7BB90280, 0x7BB83600, 0x7BB76980,
-	0x7BB69D00, 0x7BB5D080, 0x7BB50400,
-	0x7BB43780, 0x7BB36B00, 0x7BB29E80,
-	0x7BB1D200, 0x7BB10580, 0x7BB03900,
-	0x7BAF6C80, 0x7BAEA000, 0x7BADD380,
-	0x7BAD0700, 0x7BAC3A80, 0x7BAB6E00,
-	0x7BAAA180, 0x7BA9D500, 0x7BA90880,
-	0x7BA83C00, 0x7BA76F80, 0x7BA6A300,
-	0x7BA5D680, 0x7BA50A00, 0x7BA43D80,
-	0x7BA37100, 0x7BA2A480, 0x7BA1D800,
-	0x7BA10B80, 0x7BA03F00, 0x7B9F7280,
-	0x7B9EA600, 0x7B9DD980, 0x7B9D0D00,
-	0x7B9C4080, 0x7B9B7400, 0x7B9AA780,
-	0x7B99DB00, 0x7B990E80, 0x7B984200,
-	0x7B977580, 0x7B96A900, 0x7B95DC80,
-	0x7B951000, 0x7B944380, 0x7B937700,
-	0x7B92AA80, 0x7B91DE00, 0x7B911180,
-	0x7B904500, 0x7B8F7880, 0x7B8EAC00,
-	0x7B8DDF80, 0x7B8D1300, 0x7B8C4680,
-	0x7B8B7A00, 0x7B8AAD80, 0x7B89E100,
-	0x7B891480, 0x7B884800, 0x7B877B80,
-	0x7B86AF00, 0x7B85E280, 0x7B851600,
-	0x7B844980, 0x7B837D00, 0x7B82B080,
-	0x7B81E400, 0x7B811780, 0x7B804B00,
-	0x7B7F7E80, 0x7B7EB200, 0x7B7DE580,
-	0x7B7D1900, 0x7B7C4C80, 0x7B7B8000,
-	0x7B7AB380, 0x7B79E700, 0x7B791A80,
-	0x7B784E00, 0x7B778180, 0x7B76B500,
-	0x7B75E880, 0x7B751C00, 0x7B744F80,
-	0x7B738300, 0x7B72B680, 0x7B71EA00,
-	0x7B711D80, 0x7B705100, 0x7B6F8480,
-	0x7B6EB800, 0x7B6DEB80, 0x7B6D1F00,
-	0x7B6C5280, 0x7B6B8600, 0x7B6AB980,
-	0x7B69ED00, 0x7B692080, 0x7B685400,
-	0x7B678780, 0x7B66BB00, 0x7B65EE80,
-	0x7B652200, 0x7B645580, 0x7B638900,
-	0x7B62BC80, 0x7B61F000, 0x7B612380,
-	0x7B605700, 0x7B5F8A80, 0x7B5EBE00,
-	0x7B5DF180, 0x7B5D2500, 0x7B5C5880,
-	0x7B5B8C00, 0x7B5ABF80, 0x7B59F300,
-	0x7B592680, 0x7B585A00, 0x7B578D80,
-	0x7B56C100, 0x7B55F480, 0x7B552800,
-	0x7B545B80, 0x7B538F00, 0x7B52C280,
-	0x7B51F600, 0x7B512980, 0x7B505D00,
-	0x7B4F9080, 0x7B4EC400, 0x7B4DF780,
-	0x7B4D2B00, 0x7B4C5E80, 0x7B4B9200,
-	0x7B4AC580, 0x7B49F900, 0x7B492C80,
-	0x7B486000, 0x7B479380, 0x7B46C700,
-	0x7B45FA80, 0x7B452E00, 0x7B446180,
-	0x7B439500, 0x7B42C880, 0x7B41FC00,
-	0x7B412F80, 0x7B406300, 0x7B3F9680,
-	0x7B3ECA00, 0x7B3DFD80, 0x7B3D3100,
-	0x7B3C6480, 0x7B3B9800, 0x7B3ACB80,
-	0x7B39FF00, 0x7B393280, 0x7B386600,
-	0x7B379980, 0x7B36CD00, 0x7B360080,
-	0x7B353400, 0x7B346780, 0x7B339B00,
-	0x7B32CE80, 0x7B320200, 0x7B313580,
-	0x7B306900, 0x7B2F9C80, 0x7B2ED000,
-	0x7B2E0380, 0x7B2D3700, 0x7B2C6A80,
-	0x7B2B9E00, 0x7B2AD180, 0x7B2A0500,
-	0x7B293880, 0x7B286C00, 0x7B279F80,
-	0x7B26D300, 0x7B260680, 0x7B253A00,
-	0x7B246D80, 0x7B23A100, 0x7B22D480,
-	0x7B220800, 0x7B213B80, 0x7B206F00,
-	0x7B1FA280, 0x7B1ED600, 0x7B1E0980,
-	0x7B1D3D00, 0x7B1C7080, 0x7B1BA400,
-	0x7B1AD780, 0x7B1A0B00, 0x7B193E80,
-	0x7B187200, 0x7B17A580, 0x7B16D900,
-	0x7B160C80, 0x7B154000, 0x7B147380,
-	0x7B13A700, 0x7B12DA80, 0x7B120E00,
-	0x7B114180, 0x7B107500, 0x7B0FA880,
-	0x7B0EDC00, 0x7B0E0F80, 0x7B0D4300,
-	0x7B0C7680, 0x7B0BAA00, 0x7B0ADD80,
-	0x7B0A1100, 0x7B094480, 0x7B087800,
-	0x7B07AB80, 0x7B06DF00, 0x7B061280,
-	0x7B054600, 0x7B047980, 0x7B03AD00,
-	0x7B02E080, 0x7B021400, 0x7B014780,
-	0x7B007B00, 0x7AFFAE80, 0x7AFEE200,
-	0x7AFE1580, 0x7AFD4900, 0x7AFC7C80,
-	0x7AFBB000, 0x7AFAE380, 0x7AFA1700,
-	0x7AF94A80, 0x7AF87E00, 0x7AF7B180,
-	0x7AF6E500, 0x7AF61880, 0x7AF54C00,
-	0x7AF47F80, 0x7AF3B300, 0x7AF2E680,
-	0x7AF21A00, 0x7AF14D80, 0x7AF08100,
-	0x7AEFB480, 0x7AEEE800, 0x7AEE1B80,
-	0x7AED4F00, 0x7AEC8280, 0x7AEBB600,
-	0x7AEAE980, 0x7AEA1D00, 0x7AE95080,
-	0x7AE88400, 0x7AE7B780, 0x7AE6EB00,
-	0x7AE61E80, 0x7AE55200, 0x7AE48580,
-	0x7AE3B900, 0x7AE2EC80, 0x7AE22000,
-	0x7AE15380, 0x7AE08700, 0x7ADFBA80,
-	0x7ADEEE00, 0x7ADE2180, 0x7ADD5500,
-	0x7ADC8880, 0x7ADBBC00, 0x7ADAEF80,
-	0x7ADA2300, 0x7AD95680, 0x7AD88A00,
-	0x7AD7BD80, 0x7AD6F100, 0x7AD62480,
-	0x7AD55800, 0x7AD48B80, 0x7AD3BF00,
-	0x7AD2F280, 0x7AD22600, 0x7AD15980,
-	0x7AD08D00, 0x7ACFC080, 0x7ACEF400,
-	0x7ACE2780, 0x7ACD5B00, 0x7ACC8E80,
-	0x7ACBC200, 0x7ACAF580, 0x7ACA2900,
-	0x7AC95C80, 0x7AC89000, 0x7AC7C380,
-	0x7AC6F700, 0x7AC62A80, 0x7AC55E00,
-	0x7AC49180, 0x7AC3C500, 0x7AC2F880,
-	0x7AC22C00, 0x7AC15F80, 0x7AC09300,
-	0x7ABFC680, 0x7ABEFA00, 0x7ABE2D80,
-	0x7ABD6100, 0x7ABC9480, 0x7ABBC800,
-	0x7ABAFB80, 0x7ABA2F00, 0x7AB96280,
-	0x7AB89600, 0x7AB7C980, 0x7AB6FD00,
-	0x7AB63080, 0x7AB56400, 0x7AB49780,
-	0x7AB3CB00, 0x7AB2FE80, 0x7AB23200,
-	0x7AB16580, 0x7AB09900, 0x7AAFCC80,
-	0x7AAF0000, 0x7AAE3380, 0x7AAD6700,
-	0x7AAC9A80, 0x7AABCE00, 0x7AAB0180,
-	0x7AAA3500, 0x7AA96880, 0x7AA89C00,
-	0x7AA7CF80, 0x7AA70300, 0x7AA63680,
-	0x7AA56A00, 0x7AA49D80, 0x7AA3D100,
-	0x7AA30480, 0x7AA23800, 0x7AA16B80,
-	0x7AA09F00, 0x7A9FD280, 0x7A9F0600,
-	0x7A9E3980, 0x7A9D6D00, 0x7A9CA080,
-	0x7A9BD400, 0x7A9B0780, 0x7A9A3B00,
-	0x7A996E80, 0x7A98A200, 0x7A97D580,
-	0x7A970900, 0x7A963C80, 0x7A957000,
-	0x7A94A380, 0x7A93D700, 0x7A930A80,
-	0x7A923E00, 0x7A917180, 0x7A90A500,
-	0x7A8FD880, 0x7A8F0C00, 0x7A8E3F80,
-	0x7A8D7300, 0x7A8CA680, 0x7A8BDA00,
-	0x7A8B0D80, 0x7A8A4100, 0x7A897480,
-	0x7A88A800, 0x7A87DB80, 0x7A870F00,
-	0x7A864280, 0x7A857600, 0x7A84A980,
-	0x7A83DD00, 0x7A831080, 0x7A824400,
-	0x7A817780, 0x7A80AB00, 0x7A7FDE80,
-	0x7A7F1200, 0x7A7E4580, 0x7A7D7900,
-	0x7A7CAC80, 0x7A7BE000, 0x7A7B1380,
-	0x7A7A4700, 0x7A797A80, 0x7A78AE00,
-	0x7A77E180, 0x7A771500, 0x7A764880,
-	0x7A757C00, 0x7A74AF80, 0x7A73E300,
-	0x7A731680, 0x7A724A00, 0x7A717D80,
-	0x7A70B100, 0x7A6FE480, 0x7A6F1800,
-	0x7A6E4B80, 0x7A6D7F00, 0x7A6CB280,
-	0x7A6BE600, 0x7A6B1980, 0x7A6A4D00,
-	0x7A698080, 0x7A68B400, 0x7A67E780,
-	0x7A671B00, 0x7A664E80, 0x7A658200,
-	0x7A64B580, 0x7A63E900, 0x7A631C80,
-	0x7A625000, 0x7A618380, 0x7A60B700,
-	0x7A5FEA80, 0x7A5F1E00, 0x7A5E5180,
-	0x7A5D8500, 0x7A5CB880, 0x7A5BEC00,
-	0x7A5B1F80, 0x7A5A5300, 0x7A598680,
-	0x7A58BA00, 0x7A57ED80, 0x7A572100,
-	0x7A565480, 0x7A558800, 0x7A54BB80,
-	0x7A53EF00, 0x7A532280, 0x7A525600,
-	0x7A518980, 0x7A50BD00, 0x7A4FF080,
-	0x7A4F2400, 0x7A4E5780, 0x7A4D8B00,
-	0x7A4CBE80, 0x7A4BF200, 0x7A4B2580,
-	0x7A4A5900, 0x7A498C80, 0x7A48C000,
-	0x7A47F380, 0x7A472700, 0x7A465A80,
-	0x7A458E00, 0x7A44C180, 0x7A43F500,
-	0x7A432880, 0x7A425C00, 0x7A418F80,
-	0x7A40C300, 0x7A3FF680, 0x7A3F2A00,
-	0x7A3E5D80, 0x7A3D9100, 0x7A3CC480,
-	0x7A3BF800, 0x7A3B2B80, 0x7A3A5F00,
-	0x7A399280, 0x7A38C600, 0x7A37F980,
-	0x7A372D00, 0x7A366080, 0x7A359400,
-	0x7A34C780, 0x7A33FB00, 0x7A332E80,
-	0x7A326200, 0x7A319580, 0x7A30C900,
-	0x7A2FFC80, 0x7A2F3000, 0x7A2E6380,
-	0x7A2D9700, 0x7A2CCA80, 0x7A2BFE00,
-	0x7A2B3180, 0x7A2A6500, 0x7A299880,
-	0x7A28CC00, 0x7A27FF80, 0x7A273300,
-	0x7A266680, 0x7A259A00, 0x7A24CD80,
-	0x7A240100, 0x7A233480, 0x7A226800,
-	0x7A219B80, 0x7A20CF00, 0x7A200280,
-	0x7A1F3600, 0x7A1E6980, 0x7A1D9D00,
-	0x7A1CD080, 0x7A1C0400, 0x7A1B3780,
-	0x7A1A6B00, 0x7A199E80, 0x7A18D200,
-	0x7A180580, 0x7A173900, 0x7A166C80,
-	0x7A15A000, 0x7A14D380, 0x7A140700,
-	0x7A133A80, 0x7A126E00, 0x7A11A180,
-	0x7A10D500, 0x7A100880, 0x7A0F3C00,
-	0x7A0E6F80, 0x7A0DA300, 0x7A0CD680,
-	0x7A0C0A00, 0x7A0B3D80, 0x7A0A7100,
-	0x7A09A480, 0x7A08D800, 0x7A080B80,
-	0x7A073F00, 0x7A067280, 0x7A05A600,
-	0x7A04D980, 0x7A040D00, 0x7A034080,
-	0x7A027400, 0x7A01A780, 0x7A00DB00,
-	0x7A000E80, 0x79FF4200, 0x79FE7580,
-	0x79FDA900, 0x79FCDC80, 0x79FC1000,
-	0x79FB4380, 0x79FA7700, 0x79F9AA80,
-	0x79F8DE00, 0x79F81180, 0x79F74500,
-	0x79F67880, 0x79F5AC00, 0x79F4DF80,
-	0x79F41300, 0x79F34680, 0x79F27A00,
-	0x79F1AD80, 0x79F0E100, 0x79F01480,
-	0x79EF4800, 0x79EE7B80, 0x79EDAF00,
-	0x79ECE280, 0x79EC1600, 0x79EB4980,
-	0x79EA7D00, 0x79E9B080, 0x79E8E400,
-	0x79E81780, 0x79E74B00, 0x79E67E80,
-	0x79E5B200, 0x79E4E580, 0x79E41900,
-	0x79E34C80, 0x79E28000, 0x79E1B380,
-	0x79E0E700, 0x79E01A80, 0x79DF4E00,
-	0x79DE8180, 0x79DDB500, 0x79DCE880,
-	0x79DC1C00, 0x79DB4F80, 0x79DA8300,
-	0x79D9B680, 0x79D8EA00, 0x79D81D80,
-	0x79D75100, 0x79D68480, 0x79D5B800,
-	0x79D4EB80, 0x79D41F00, 0x79D35280,
-	0x79D28600, 0x79D1B980, 0x79D0ED00,
-	0x79D02080, 0x79CF5400, 0x79CE8780,
-	0x79CDBB00, 0x79CCEE80, 0x79CC2200,
-	0x79CB5580, 0x79CA8900, 0x79C9BC80,
-	0x79C8F000, 0x79C82380, 0x79C75700,
-	0x79C68A80, 0x79C5BE00, 0x79C4F180,
-	0x79C42500, 0x79C35880, 0x79C28C00,
-	0x79C1BF80, 0x79C0F300, 0x79C02680,
-	0x79BF5A00, 0x79BE8D80, 0x79BDC100,
-	0x79BCF480, 0x79BC2800, 0x79BB5B80,
-	0x79BA8F00, 0x79B9C280, 0x79B8F600,
-	0x79B82980, 0x79B75D00, 0x79B69080,
-	0x79B5C400, 0x79B4F780, 0x79B42B00,
-	0x79B35E80, 0x79B29200, 0x79B1C580,
-	0x79B0F900, 0x79B02C80, 0x79AF6000,
-	0x79AE9380, 0x79ADC700, 0x79ACFA80,
-	0x79AC2E00, 0x79AB6180, 0x79AA9500,
-	0x79A9C880, 0x79A8FC00, 0x79A82F80,
-	0x79A76300, 0x79A69680, 0x79A5CA00,
-	0x79A4FD80, 0x79A43100, 0x79A36480,
-	0x79A29800, 0x79A1CB80, 0x79A0FF00,
-	0x79A03280, 0x799F6600, 0x799E9980,
-	0x799DCD00, 0x799D0080, 0x799C3400,
-	0x799B6780, 0x799A9B00, 0x7999CE80,
-	0x79990200, 0x79983580, 0x79976900,
-	0x79969C80, 0x7995D000, 0x79950380,
-	0x79943700, 0x79936A80, 0x79929E00,
-	0x7991D180, 0x79910500, 0x79903880,
-	0x798F6C00, 0x798E9F80, 0x798DD300,
-	0x798D0680, 0x798C3A00, 0x798B6D80,
-	0x798AA100, 0x7989D480, 0x79890800,
-	0x79883B80, 0x79876F00, 0x7986A280,
-	0x7985D600, 0x79850980, 0x79843D00,
-	0x79837080, 0x7982A400, 0x7981D780,
-	0x79810B00, 0x79803E80, 0x797F7200,
-	0x797EA580, 0x797DD900, 0x797D0C80,
-	0x797C4000, 0x797B7380, 0x797AA700,
-	0x7979DA80, 0x79790E00, 0x79784180,
-	0x79777500, 0x7976A880, 0x7975DC00,
-	0x79750F80, 0x79744300, 0x79737680,
-	0x7972AA00, 0x7971DD80, 0x79711100,
-	0x79704480, 0x796F7800, 0x796EAB80,
-	0x796DDF00, 0x796D1280, 0x796C4600,
-	0x796B7980, 0x796AAD00, 0x7969E080,
-	0x79691400, 0x79684780, 0x79677B00,
-	0x7966AE80, 0x7965E200, 0x79651580,
-	0x79644900, 0x79637C80, 0x7962B000,
-	0x7961E380, 0x79611700, 0x79604A80,
-	0x795F7E00, 0x795EB180, 0x795DE500,
-	0x795D1880, 0x795C4C00, 0x795B7F80,
-	0x795AB300, 0x7959E680, 0x79591A00,
-	0x79584D80, 0x79578100, 0x7956B480,
-	0x7955E800, 0x79551B80, 0x79544F00,
-	0x79538280, 0x7952B600, 0x7951E980,
-	0x79511D00, 0x79505080, 0x794F8400,
-	0x794EB780, 0x794DEB00, 0x794D1E80,
-	0x794C5200, 0x794B8580, 0x794AB900,
-	0x7949EC80, 0x79492000, 0x79485380,
-	0x79478700, 0x7946BA80, 0x7945EE00,
-	0x79452180, 0x79445500, 0x79438880,
-	0x7942BC00, 0x7941EF80, 0x79412300,
-	0x79405680, 0x793F8A00, 0x793EBD80,
-	0x793DF100, 0x793D2480, 0x793C5800,
-	0x793B8B80, 0x793ABF00, 0x7939F280,
-	0x79392600, 0x79385980, 0x79378D00,
-	0x7936C080, 0x7935F400, 0x79352780,
-	0x79345B00, 0x79338E80, 0x7932C200,
-	0x7931F580, 0x79312900, 0x79305C80,
-	0x792F9000, 0x792EC380, 0x792DF700,
-	0x792D2A80, 0x792C5E00, 0x792B9180,
-	0x792AC500, 0x7929F880, 0x79292C00,
-	0x79285F80, 0x79279300, 0x7926C680,
-	0x7925FA00, 0x79252D80, 0x79246100,
-	0x79239480, 0x7922C800, 0x7921FB80,
-	0x79212F00, 0x79206280, 0x791F9600,
-	0x791EC980, 0x791DFD00, 0x791D3080,
-	0x791C6400, 0x791B9780, 0x791ACB00,
-	0x7919FE80, 0x79193200, 0x79186580,
-	0x79179900, 0x7916CC80, 0x79160000,
-	0x79153380, 0x79146700, 0x79139A80,
-	0x7912CE00, 0x79120180, 0x79113500,
-	0x79106880, 0x790F9C00, 0x790ECF80,
-	0x790E0300, 0x790D3680, 0x790C6A00,
-	0x790B9D80, 0x790AD100, 0x790A0480,
-	0x79093800, 0x79086B80, 0x79079F00,
-	0x7906D280, 0x79060600, 0x79053980,
-	0x79046D00, 0x7903A080, 0x7902D400,
-	0x79020780, 0x79013B00, 0x79006E80,
-	0x78FFA200, 0x78FED580, 0x78FE0900,
-	0x78FD3C80, 0x78FC7000, 0x78FBA380,
-	0x78FAD700, 0x78FA0A80, 0x78F93E00,
-	0x78F87180, 0x78F7A500, 0x78F6D880,
-	0x78F60C00, 0x78F53F80, 0x78F47300,
-	0x78F3A680, 0x78F2DA00, 0x78F20D80,
-	0x78F14100, 0x78F07480, 0x78EFA800,
-	0x78EEDB80, 0x78EE0F00, 0x78ED4280,
-	0x78EC7600, 0x78EBA980, 0x78EADD00,
-	0x78EA1080, 0x78E94400, 0x78E87780,
-	0x78E7AB00, 0x78E6DE80, 0x78E61200,
-	0x78E54580, 0x78E47900, 0x78E3AC80,
-	0x78E2E000, 0x78E21380, 0x78E14700,
-	0x78E07A80, 0x78DFAE00, 0x78DEE180,
-	0x78DE1500, 0x78DD4880, 0x78DC7C00,
-	0x78DBAF80, 0x78DAE300, 0x78DA1680,
-	0x78D94A00, 0x78D87D80, 0x78D7B100,
-	0x78D6E480, 0x78D61800, 0x78D54B80,
-	0x78D47F00, 0x78D3B280, 0x78D2E600,
-	0x78D21980, 0x78D14D00, 0x78D08080,
-	0x78CFB400, 0x78CEE780, 0x78CE1B00,
-	0x78CD4E80, 0x78CC8200, 0x78CBB580,
-	0x78CAE900, 0x78CA1C80, 0x78C95000,
-	0x78C88380, 0x78C7B700, 0x78C6EA80,
-	0x78C61E00, 0x78C55180, 0x78C48500,
-	0x78C3B880, 0x78C2EC00, 0x78C21F80,
-	0x78C15300, 0x78C08680, 0x78BFBA00,
-	0x78BEED80, 0x78BE2100, 0x78BD5480,
-	0x78BC8800, 0x78BBBB80, 0x78BAEF00,
-	0x78BA2280, 0x78B95600, 0x78B88980,
-	0x78B7BD00, 0x78B6F080, 0x78B62400,
-	0x78B55780, 0x78B48B00, 0x78B3BE80,
-	0x78B2F200, 0x78B22580, 0x78B15900,
-	0x78B08C80, 0x78AFC000, 0x78AEF380,
-	0x78AE2700, 0x78AD5A80, 0x78AC8E00,
-	0x78ABC180, 0x78AAF500, 0x78AA2880,
-	0x78A95C00, 0x78A88F80, 0x78A7C300,
-	0x78A6F680, 0x78A62A00, 0x78A55D80,
-	0x78A49100, 0x78A3C480, 0x78A2F800,
-	0x78A22B80, 0x78A15F00, 0x78A09280,
-	0x789FC600, 0x789EF980, 0x789E2D00,
-	0x789D6080, 0x789C9400, 0x789BC780,
-	0x789AFB00, 0x789A2E80, 0x78996200,
-	0x78989580, 0x7897C900, 0x7896FC80,
-	0x78963000, 0x78956380, 0x78949700,
-	0x7893CA80, 0x7892FE00, 0x78923180,
-	0x78916500, 0x78909880, 0x788FCC00,
-	0x788EFF80, 0x788E3300, 0x788D6680,
-	0x788C9A00, 0x788BCD80, 0x788B0100,
-	0x788A3480, 0x78896800, 0x78889B80,
-	0x7887CF00, 0x78870280, 0x78863600,
-	0x78856980, 0x78849D00, 0x7883D080,
-	0x78830400, 0x78823780, 0x78816B00,
-	0x78809E80, 0x787FD200, 0x787F0580,
-	0x787E3900, 0x787D6C80, 0x787CA000,
-	0x787BD380, 0x787B0700, 0x787A3A80,
-	0x78796E00, 0x7878A180, 0x7877D500,
-	0x78770880, 0x78763C00, 0x78756F80,
-	0x7874A300, 0x7873D680, 0x78730A00,
-	0x78723D80, 0x78717100, 0x7870A480,
-	0x786FD800, 0x786F0B80, 0x786E3F00,
-	0x786D7280, 0x786CA600, 0x786BD980,
-	0x786B0D00, 0x786A4080, 0x78697400,
-	0x7868A780, 0x7867DB00, 0x78670E80,
-	0x78664200, 0x78657580, 0x7864A900,
-	0x7863DC80, 0x78631000, 0x78624380,
-	0x78617700, 0x7860AA80, 0x785FDE00,
-	0x785F1180, 0x785E4500, 0x785D7880,
-	0x785CAC00, 0x785BDF80, 0x785B1300,
-	0x785A4680, 0x78597A00, 0x7858AD80,
-	0x7857E100, 0x78571480, 0x78564800,
-	0x78557B80, 0x7854AF00, 0x7853E280,
-	0x78531600, 0x78524980, 0x78517D00,
-	0x7850B080, 0x784FE400, 0x784F1780,
-	0x784E4B00, 0x784D7E80, 0x784CB200,
-	0x784BE580, 0x784B1900, 0x784A4C80,
-	0x78498000, 0x7848B380, 0x7847E700,
-	0x78471A80, 0x78464E00, 0x78458180,
-	0x7844B500, 0x7843E880, 0x78431C00,
-	0x78424F80, 0x78418300, 0x7840B680,
-	0x783FEA00, 0x783F1D80, 0x783E5100,
-	0x783D8480, 0x783CB800, 0x783BEB80,
-	0x783B1F00, 0x783A5280, 0x78398600,
-	0x7838B980, 0x7837ED00, 0x78372080,
-	0x78365400, 0x78358780, 0x7834BB00,
-	0x7833EE80, 0x78332200, 0x78325580,
-	0x78318900, 0x7830BC80, 0x782FF000,
-	0x782F2380, 0x782E5700, 0x782D8A80,
-	0x782CBE00, 0x782BF180, 0x782B2500,
-	0x782A5880, 0x78298C00, 0x7828BF80,
-	0x7827F300, 0x78272680, 0x78265A00,
-	0x78258D80, 0x7824C100, 0x7823F480,
-	0x78232800, 0x78225B80, 0x78218F00,
-	0x7820C280, 0x781FF600, 0x781F2980,
-	0x781E5D00, 0x781D9080, 0x781CC400,
-	0x781BF780, 0x781B2B00, 0x781A5E80,
-	0x78199200, 0x7818C580, 0x7817F900,
-	0x78172C80, 0x78166000, 0x78159380,
-	0x7814C700, 0x7813FA80, 0x78132E00,
-	0x78126180, 0x78119500, 0x7810C880,
-	0x780FFC00, 0x780F2F80, 0x780E6300,
-	0x780D9680, 0x780CCA00, 0x780BFD80,
-	0x780B3100, 0x780A6480, 0x78099800,
-	0x7808CB80, 0x7807FF00, 0x78073280,
-	0x78066600, 0x78059980, 0x7804CD00,
-	0x78040080, 0x78033400, 0x78026780,
-	0x78019B00, 0x7800CE80, 0x78000200,
-	0x77FF3580, 0x77FE6900, 0x77FD9C80,
-	0x77FCD000, 0x77FC0380, 0x77FB3700,
-	0x77FA6A80, 0x77F99E00, 0x77F8D180,
-	0x77F80500, 0x77F73880, 0x77F66C00,
-	0x77F59F80, 0x77F4D300, 0x77F40680,
-	0x77F33A00, 0x77F26D80, 0x77F1A100,
-	0x77F0D480, 0x77F00800, 0x77EF3B80,
-	0x77EE6F00, 0x77EDA280, 0x77ECD600,
-	0x77EC0980, 0x77EB3D00, 0x77EA7080,
-	0x77E9A400, 0x77E8D780, 0x77E80B00,
-	0x77E73E80, 0x77E67200, 0x77E5A580,
-	0x77E4D900, 0x77E40C80, 0x77E34000,
-	0x77E27380, 0x77E1A700, 0x77E0DA80,
-	0x77E00E00, 0x77DF4180, 0x77DE7500,
-	0x77DDA880, 0x77DCDC00, 0x77DC0F80,
-	0x77DB4300, 0x77DA7680, 0x77D9AA00,
-	0x77D8DD80, 0x77D81100, 0x77D74480,
-	0x77D67800, 0x77D5AB80, 0x77D4DF00,
-	0x77D41280, 0x77D34600, 0x77D27980,
-	0x77D1AD00, 0x77D0E080, 0x77D01400,
-	0x77CF4780, 0x77CE7B00, 0x77CDAE80,
-	0x77CCE200, 0x77CC1580, 0x77CB4900,
-	0x77CA7C80, 0x77C9B000, 0x77C8E380,
-	0x77C81700, 0x77C74A80, 0x77C67E00,
-	0x77C5B180, 0x77C4E500, 0x77C41880,
-	0x77C34C00, 0x77C27F80, 0x77C1B300,
-	0x77C0E680, 0x77C01A00, 0x77BF4D80,
-	0x77BE8100, 0x77BDB480, 0x77BCE800,
-	0x77BC1B80, 0x77BB4F00, 0x77BA8280,
-	0x77B9B600, 0x77B8E980, 0x77B81D00,
-	0x77B75080, 0x77B68400, 0x77B5B780,
-	0x77B4EB00, 0x77B41E80, 0x77B35200,
-	0x77B28580, 0x77B1B900, 0x77B0EC80,
-	0x77B02000, 0x77AF5380, 0x77AE8700,
-	0x77ADBA80, 0x77ACEE00, 0x77AC2180,
-	0x77AB5500, 0x77AA8880, 0x77A9BC00,
-	0x77A8EF80, 0x77A82300, 0x77A75680,
-	0x77A68A00, 0x77A5BD80, 0x77A4F100,
-	0x77A42480, 0x77A35800, 0x77A28B80,
-	0x77A1BF00, 0x77A0F280, 0x77A02600,
-	0x779F5980, 0x779E8D00, 0x779DC080,
-	0x779CF400, 0x779C2780, 0x779B5B00,
-	0x779A8E80, 0x7799C200, 0x7798F580,
-	0x77982900, 0x77975C80, 0x77969000,
-	0x7795C380, 0x7794F700, 0x77942A80,
-	0x77935E00, 0x77929180, 0x7791C500,
-	0x7790F880, 0x77902C00, 0x778F5F80,
-	0x778E9300, 0x778DC680, 0x778CFA00,
-	0x778C2D80, 0x778B6100, 0x778A9480,
-	0x7789C800, 0x7788FB80, 0x77882F00,
-	0x77876280, 0x77869600, 0x7785C980,
-	0x7784FD00, 0x77843080, 0x77836400,
-	0x77829780, 0x7781CB00, 0x7780FE80,
-	0x77803200, 0x777F6580, 0x777E9900,
-	0x777DCC80, 0x777D0000, 0x777C3380,
-	0x777B6700, 0x777A9A80, 0x7779CE00,
-	0x77790180, 0x77783500, 0x77776880,
-	0x77769C00, 0x7775CF80, 0x77750300,
-	0x77743680, 0x77736A00, 0x77729D80,
-	0x7771D100, 0x77710480, 0x77703800,
-	0x776F6B80, 0x776E9F00, 0x776DD280,
-	0x776D0600, 0x776C3980, 0x776B6D00,
-	0x776AA080, 0x7769D400, 0x77690780,
-	0x77683B00, 0x77676E80, 0x7766A200,
-	0x7765D580, 0x77650900, 0x77643C80,
-	0x77637000, 0x7762A380, 0x7761D700,
-	0x77610A80, 0x77603E00, 0x775F7180,
-	0x775EA500, 0x775DD880, 0x775D0C00,
-	0x775C3F80, 0x775B7300, 0x775AA680,
-	0x7759DA00, 0x77590D80, 0x77584100,
-	0x77577480, 0x7756A800, 0x7755DB80,
-	0x77550F00, 0x77544280, 0x77537600,
-	0x7752A980, 0x7751DD00, 0x77511080,
-	0x77504400, 0x774F7780, 0x774EAB00,
-	0x774DDE80, 0x774D1200, 0x774C4580,
-	0x774B7900, 0x774AAC80, 0x7749E000,
-	0x77491380, 0x77484700, 0x77477A80,
-	0x7746AE00, 0x7745E180, 0x77451500,
-	0x77444880, 0x77437C00, 0x7742AF80,
-	0x7741E300, 0x77411680, 0x77404A00,
-	0x773F7D80, 0x773EB100, 0x773DE480,
-	0x773D1800, 0x773C4B80, 0x773B7F00,
-	0x773AB280, 0x7739E600, 0x77391980,
-	0x77384D00, 0x77378080, 0x7736B400,
-	0x7735E780, 0x77351B00, 0x77344E80,
-	0x77338200, 0x7732B580, 0x7731E900,
-	0x77311C80, 0x77305000, 0x772F8380,
-	0x772EB700, 0x772DEA80, 0x772D1E00,
-	0x772C5180, 0x772B8500, 0x772AB880,
-	0x7729EC00, 0x77291F80, 0x77285300,
-	0x77278680, 0x7726BA00, 0x7725ED80,
-	0x77252100, 0x77245480, 0x77238800,
-	0x7722BB80, 0x7721EF00, 0x77212280,
-	0x77205600, 0x771F8980, 0x771EBD00,
-	0x771DF080, 0x771D2400, 0x771C5780,
-	0x771B8B00, 0x771ABE80, 0x7719F200,
-	0x77192580, 0x77185900, 0x77178C80,
-	0x7716C000, 0x7715F380, 0x77152700,
-	0x77145A80, 0x77138E00, 0x7712C180,
-	0x7711F500, 0x77112880, 0x77105C00,
-	0x770F8F80, 0x770EC300, 0x770DF680,
-	0x770D2A00, 0x770C5D80, 0x770B9100,
-	0x770AC480, 0x7709F800, 0x77092B80,
-	0x77085F00, 0x77079280, 0x7706C600,
-	0x7705F980, 0x77052D00, 0x77046080,
-	0x77039400, 0x7702C780, 0x7701FB00,
-	0x77012E80, 0x77006200, 0x76FF9580,
-	0x76FEC900, 0x76FDFC80, 0x76FD3000,
-	0x76FC6380, 0x76FB9700, 0x76FACA80,
-	0x76F9FE00, 0x76F93180, 0x76F86500,
-	0x76F79880, 0x76F6CC00, 0x76F5FF80,
-	0x76F53300, 0x76F46680, 0x76F39A00,
-	0x76F2CD80, 0x76F20100, 0x76F13480,
-	0x76F06800, 0x76EF9B80, 0x76EECF00,
-	0x76EE0280, 0x76ED3600, 0x76EC6980,
-	0x76EB9D00, 0x76EAD080, 0x76EA0400,
-	0x76E93780, 0x76E86B00, 0x76E79E80,
-	0x76E6D200, 0x76E60580, 0x76E53900,
-	0x76E46C80, 0x76E3A000, 0x76E2D380,
-	0x76E20700, 0x76E13A80, 0x76E06E00,
-	0x76DFA180, 0x76DED500, 0x76DE0880,
-	0x76DD3C00, 0x76DC6F80, 0x76DBA300,
-	0x76DAD680, 0x76DA0A00, 0x76D93D80,
-	0x76D87100, 0x76D7A480, 0x76D6D800,
-	0x76D60B80, 0x76D53F00, 0x76D47280,
-	0x76D3A600, 0x76D2D980, 0x76D20D00,
-	0x76D14080, 0x76D07400, 0x76CFA780,
-	0x76CEDB00, 0x76CE0E80, 0x76CD4200,
-	0x76CC7580, 0x76CBA900, 0x76CADC80,
-	0x76CA1000, 0x76C94380, 0x76C87700,
-	0x76C7AA80, 0x76C6DE00, 0x76C61180,
-	0x76C54500, 0x76C47880, 0x76C3AC00,
-	0x76C2DF80, 0x76C21300, 0x76C14680,
-	0x76C07A00, 0x76BFAD80, 0x76BEE100,
-	0x76BE1480, 0x76BD4800, 0x76BC7B80,
-	0x76BBAF00, 0x76BAE280, 0x76BA1600,
-	0x76B94980, 0x76B87D00, 0x76B7B080,
-	0x76B6E400, 0x76B61780, 0x76B54B00,
-	0x76B47E80, 0x76B3B200, 0x76B2E580,
-	0x76B21900, 0x76B14C80, 0x76B08000,
-	0x76AFB380, 0x76AEE700, 0x76AE1A80,
-	0x76AD4E00, 0x76AC8180, 0x76ABB500,
-	0x76AAE880, 0x76AA1C00, 0x76A94F80,
-	0x76A88300, 0x76A7B680, 0x76A6EA00,
-	0x76A61D80, 0x76A55100, 0x76A48480,
-	0x76A3B800, 0x76A2EB80, 0x76A21F00,
-	0x76A15280, 0x76A08600, 0x769FB980,
-	0x769EED00, 0x769E2080, 0x769D5400,
-	0x769C8780, 0x769BBB00, 0x769AEE80,
-	0x769A2200, 0x76995580, 0x76988900,
-	0x7697BC80, 0x7696F000, 0x76962380,
-	0x76955700, 0x76948A80, 0x7693BE00,
-	0x7692F180, 0x76922500, 0x76915880,
-	0x76908C00, 0x768FBF80, 0x768EF300,
-	0x768E2680, 0x768D5A00, 0x768C8D80,
-	0x768BC100, 0x768AF480, 0x768A2800,
-	0x76895B80, 0x76888F00, 0x7687C280,
-	0x7686F600, 0x76862980, 0x76855D00,
-	0x76849080, 0x7683C400, 0x7682F780,
-	0x76822B00, 0x76815E80, 0x76809200,
-	0x767FC580, 0x767EF900, 0x767E2C80,
-	0x767D6000, 0x767C9380, 0x767BC700,
-	0x767AFA80, 0x767A2E00, 0x76796180,
-	0x76789500, 0x7677C880, 0x7676FC00,
-	0x76762F80, 0x76756300, 0x76749680,
-	0x7673CA00, 0x7672FD80, 0x76723100,
-	0x76716480, 0x76709800, 0x766FCB80,
-	0x766EFF00, 0x766E3280, 0x766D6600,
-	0x766C9980, 0x766BCD00, 0x766B0080,
-	0x766A3400, 0x76696780, 0x76689B00,
-	0x7667CE80, 0x76670200, 0x76663580,
-	0x76656900, 0x76649C80, 0x7663D000,
-	0x76630380, 0x76623700, 0x76616A80,
-	0x76609E00, 0x765FD180, 0x765F0500,
-	0x765E3880, 0x765D6C00, 0x765C9F80,
-	0x765BD300, 0x765B0680, 0x765A3A00,
-	0x76596D80, 0x7658A100, 0x7657D480,
-	0x76570800, 0x76563B80, 0x76556F00,
-	0x7654A280, 0x7653D600, 0x76530980,
-	0x76523D00, 0x76517080, 0x7650A400,
-	0x764FD780, 0x764F0B00, 0x764E3E80,
-	0x764D7200, 0x764CA580, 0x764BD900,
-	0x764B0C80, 0x764A4000, 0x76497380,
-	0x7648A700, 0x7647DA80, 0x76470E00,
-	0x76464180, 0x76457500, 0x7644A880,
-	0x7643DC00, 0x76430F80, 0x76424300,
-	0x76417680, 0x7640AA00, 0x763FDD80,
-	0x763F1100, 0x763E4480, 0x763D7800,
-	0x763CAB80, 0x763BDF00, 0x763B1280,
-	0x763A4600, 0x76397980, 0x7638AD00,
-	0x7637E080, 0x76371400, 0x76364780,
-	0x76357B00, 0x7634AE80, 0x7633E200,
-	0x76331580, 0x76324900, 0x76317C80,
-	0x7630B000, 0x762FE380, 0x762F1700,
-	0x762E4A80, 0x762D7E00, 0x762CB180,
-	0x762BE500, 0x762B1880, 0x762A4C00,
-	0x76297F80, 0x7628B300, 0x7627E680,
-	0x76271A00, 0x76264D80, 0x76258100,
-	0x7624B480, 0x7623E800, 0x76231B80,
-	0x76224F00, 0x76218280, 0x7620B600,
-	0x761FE980, 0x761F1D00, 0x761E5080,
-	0x761D8400, 0x761CB780, 0x761BEB00,
-	0x761B1E80, 0x761A5200, 0x76198580,
-	0x7618B900, 0x7617EC80, 0x76172000,
-	0x76165380, 0x76158700, 0x7614BA80,
-	0x7613EE00, 0x76132180, 0x76125500,
-	0x76118880, 0x7610BC00, 0x760FEF80,
-	0x760F2300, 0x760E5680, 0x760D8A00,
-	0x760CBD80, 0x760BF100, 0x760B2480,
-	0x760A5800, 0x76098B80, 0x7608BF00,
-	0x7607F280, 0x76072600, 0x76065980,
-	0x76058D00, 0x7604C080, 0x7603F400,
-	0x76032780, 0x76025B00, 0x76018E80,
-	0x7600C200, 0x75FFF580, 0x75FF2900,
-	0x75FE5C80, 0x75FD9000, 0x75FCC380,
-	0x75FBF700, 0x75FB2A80, 0x75FA5E00,
-	0x75F99180, 0x75F8C500, 0x75F7F880,
-	0x75F72C00, 0x75F65F80, 0x75F59300,
-	0x75F4C680, 0x75F3FA00, 0x75F32D80,
-	0x75F26100, 0x75F19480, 0x75F0C800,
-	0x75EFFB80, 0x75EF2F00, 0x75EE6280,
-	0x75ED9600, 0x75ECC980, 0x75EBFD00,
-	0x75EB3080, 0x75EA6400, 0x75E99780,
-	0x75E8CB00, 0x75E7FE80, 0x75E73200,
-	0x75E66580, 0x75E59900, 0x75E4CC80,
-	0x75E40000, 0x75E33D80, 0x75E27B00,
-	0x75E1B880, 0x75E0F600, 0x75E03380,
-	0x75DF7100, 0x75DEAE80, 0x75DDEC00,
-	0x75DD2980, 0x75DC6700, 0x75DBA480,
-	0x75DAE200, 0x75DA1F80, 0x75D95D00,
-	0x75D89A80, 0x75D7D800, 0x75D71580,
-	0x75D65300, 0x75D59080, 0x75D4CE00,
-	0x75D40B80, 0x75D34900, 0x75D28680,
-	0x75D1C400, 0x75D10180, 0x75D03F00,
-	0x75CF7C80, 0x75CEBA00, 0x75CDF780,
-	0x75CD3500, 0x75CC7280, 0x75CBB000,
-	0x75CAED80, 0x75CA2B00, 0x75C96880,
-	0x75C8A600, 0x75C7E380, 0x75C72100,
-	0x75C65E80, 0x75C59C00, 0x75C4D980,
-	0x75C41700, 0x75C35480, 0x75C29200,
-	0x75C1CF80, 0x75C10D00, 0x75C04A80,
-	0x75BF8800, 0x75BEC580, 0x75BE0300,
-	0x75BD4080, 0x75BC7E00, 0x75BBBB80,
-	0x75BAF900, 0x75BA3680, 0x75B97400,
-	0x75B8B180, 0x75B7EF00, 0x75B72C80,
-	0x75B66A00, 0x75B5A780, 0x75B4E500,
-	0x75B42280, 0x75B36000, 0x75B29D80,
-	0x75B1DB00, 0x75B11880, 0x75B05600,
-	0x75AF9380, 0x75AED100, 0x75AE0E80,
-	0x75AD4C00, 0x75AC8980, 0x75ABC700,
-	0x75AB0480, 0x75AA4200, 0x75A97F80,
-	0x75A8BD00, 0x75A7FA80, 0x75A73800,
-	0x75A67580, 0x75A5B300, 0x75A4F080,
-	0x75A42E00, 0x75A36B80, 0x75A2A900,
-	0x75A1E680, 0x75A12400, 0x75A06180,
-	0x759F9F00, 0x759EDC80, 0x759E1A00,
-	0x759D5780, 0x759C9500, 0x759BD280,
-	0x759B1000, 0x759A4D80, 0x75998B00,
-	0x7598C880, 0x75980600, 0x75974380,
-	0x75968100, 0x7595BE80, 0x7594FC00,
-	0x75943980, 0x75937700, 0x7592B480,
-	0x7591F200, 0x75912F80, 0x75906D00,
-	0x758FAA80, 0x758EE800, 0x758E2580,
-	0x758D6300, 0x758CA080, 0x758BDE00,
-	0x758B1B80, 0x758A5900, 0x75899680,
-	0x7588D400, 0x75881180, 0x75874F00,
-	0x75868C80, 0x7585CA00, 0x75850780,
-	0x75844500, 0x75838280, 0x7582C000,
-	0x7581FD80, 0x75813B00, 0x75807880,
-	0x757FB600, 0x757EF380, 0x757E3100,
-	0x757D6E80, 0x757CAC00, 0x757BE980,
-	0x757B2700, 0x757A6480, 0x7579A200,
-	0x7578DF80, 0x75781D00, 0x75775A80,
-	0x75769800, 0x7575D580, 0x75751300,
-	0x75745080, 0x75738E00, 0x7572CB80,
-	0x75720900, 0x75714680, 0x75708400,
-	0x756FC180, 0x756EFF00, 0x756E3C80,
-	0x756D7A00, 0x756CB780, 0x756BF500,
-	0x756B3280, 0x756A7000, 0x7569AD80,
-	0x7568EB00, 0x75682880, 0x75676600,
-	0x7566A380, 0x7565E100, 0x75651E80,
-	0x75645C00, 0x75639980, 0x7562D700,
-	0x75621480, 0x75615200, 0x75608F80,
-	0x755FCD00, 0x755F0A80, 0x755E4800,
-	0x755D8580, 0x755CC300, 0x755C0080,
-	0x755B3E00, 0x755A7B80, 0x7559B900,
-	0x7558F680, 0x75583400, 0x75577180,
-	0x7556AF00, 0x7555EC80, 0x75552A00,
-	0x75546780, 0x7553A500, 0x7552E280,
-	0x75522000, 0x75515D80, 0x75509B00,
-	0x754FD880, 0x754F1600, 0x754E5380,
-	0x754D9100, 0x754CCE80, 0x754C0C00,
-	0x754B4980, 0x754A8700, 0x7549C480,
-	0x75490200, 0x75483F80, 0x75477D00,
-	0x7546BA80, 0x7545F800, 0x75453580,
-	0x75447300, 0x7543B080, 0x7542EE00,
-	0x75422B80, 0x75416900, 0x7540A680,
-	0x753FE400, 0x753F2180, 0x753E5F00,
-	0x753D9C80, 0x753CDA00, 0x753C1780,
-	0x753B5500, 0x753A9280, 0x7539D000,
-	0x75390D80, 0x75384B00, 0x75378880,
-	0x7536C600, 0x75360380, 0x75354100,
-	0x75347E80, 0x7533BC00, 0x7532F980,
-	0x75323700, 0x75317480, 0x7530B200,
-	0x752FEF80, 0x752F2D00, 0x752E6A80,
-	0x752DA800, 0x752CE580, 0x752C2300,
-	0x752B6080, 0x752A9E00, 0x7529DB80,
-	0x75291900, 0x75285680, 0x75279400,
-	0x7526D180, 0x75260F00, 0x75254C80,
-	0x75248A00, 0x7523C780, 0x75230500,
-	0x75224280, 0x75218000, 0x7520BD80,
-	0x751FFB00, 0x751F3880, 0x751E7600,
-	0x751DB380, 0x751CF100, 0x751C2E80,
-	0x751B6C00, 0x751AA980, 0x7519E700,
-	0x75192480, 0x75186200, 0x75179F80,
-	0x7516DD00, 0x75161A80, 0x75155800,
-	0x75149580, 0x7513D300, 0x75131080,
-	0x75124E00, 0x75118B80, 0x7510C900,
-	0x75100680, 0x750F4400, 0x750E8180,
-	0x750DBF00, 0x750CFC80, 0x750C3A00,
-	0x750B7780, 0x750AB500, 0x7509F280,
-	0x75093000, 0x75086D80, 0x7507AB00,
-	0x7506E880, 0x75062600, 0x75056380,
-	0x7504A100, 0x7503DE80, 0x75031C00,
-	0x75025980, 0x75019700, 0x7500D480,
-	0x75001200, 0x74FF4F80, 0x74FE8D00,
-	0x74FDCA80, 0x74FD0800, 0x74FC4580,
-	0x74FB8300, 0x74FAC080, 0x74F9FE00,
-	0x74F93B80, 0x74F87900, 0x74F7B680,
-	0x74F6F400, 0x74F63180, 0x74F56F00,
-	0x74F4AC80, 0x74F3EA00, 0x74F32780,
-	0x74F26500, 0x74F1A280, 0x74F0E000,
-	0x74F01D80, 0x74EF5B00, 0x74EE9880,
-	0x74EDD600, 0x74ED1380, 0x74EC5100,
-	0x74EB8E80, 0x74EACC00, 0x74EA0980,
-	0x74E94700, 0x74E88480, 0x74E7C200,
-	0x74E6FF80, 0x74E63D00, 0x74E57A80,
-	0x74E4B800, 0x74E3F580, 0x74E33300,
-	0x74E27080, 0x74E1AE00, 0x74E0EB80,
-	0x74E02900, 0x74DF6680, 0x74DEA400,
-	0x74DDE180, 0x74DD1F00, 0x74DC5C80,
-	0x74DB9A00, 0x74DAD780, 0x74DA1500,
-	0x74D95280, 0x74D89000, 0x74D7CD80,
-	0x74D70B00, 0x74D64880, 0x74D58600,
-	0x74D4C380, 0x74D40100, 0x74D33E80,
-	0x74D27C00, 0x74D1B980, 0x74D0F700,
-	0x74D03480, 0x74CF7200, 0x74CEAF80,
-	0x74CDED00, 0x74CD2A80, 0x74CC6800,
-	0x74CBA580, 0x74CAE300, 0x74CA2080,
-	0x74C95E00, 0x74C89B80, 0x74C7D900,
-	0x74C71680, 0x74C65400, 0x74C59180,
-	0x74C4CF00, 0x74C40C80, 0x74C34A00,
-	0x74C28780, 0x74C1C500, 0x74C10280,
-	0x74C04000, 0x74BF7D80, 0x74BEBB00,
-	0x74BDF880, 0x74BD3600, 0x74BC7380,
-	0x74BBB100, 0x74BAEE80, 0x74BA2C00,
-	0x74B96980, 0x74B8A700, 0x74B7E480,
-	0x74B72200, 0x74B65F80, 0x74B59D00,
-	0x74B4DA80, 0x74B41800, 0x74B35580,
-	0x74B29300, 0x74B1D080, 0x74B10E00,
-	0x74B04B80, 0x74AF8900, 0x74AEC680,
-	0x74AE0400, 0x74AD4180, 0x74AC7F00,
-	0x74ABBC80, 0x74AAFA00, 0x74AA3780,
-	0x74A97500, 0x74A8B280, 0x74A7F000,
-	0x74A72D80, 0x74A66B00, 0x74A5A880,
-	0x74A4E600, 0x74A42380, 0x74A36100,
-	0x74A29E80, 0x74A1DC00, 0x74A11980,
-	0x74A05700, 0x749F9480, 0x749ED200,
-	0x749E0F80, 0x749D4D00, 0x749C8A80,
-	0x749BC800, 0x749B0580, 0x749A4300,
-	0x74998080, 0x7498BE00, 0x7497FB80,
-	0x74973900, 0x74967680, 0x7495B400,
-	0x7494F180, 0x74942F00, 0x74936C80,
-	0x7492AA00, 0x7491E780, 0x74912500,
-	0x74906280, 0x748FA000, 0x748EDD80,
-	0x748E1B00, 0x748D5880, 0x748C9600,
-	0x748BD380, 0x748B1100, 0x748A4E80,
-	0x74898C00, 0x7488C980, 0x74880700,
-	0x74874480, 0x74868200, 0x7485BF80,
-	0x7484FD00, 0x74843A80, 0x74837800,
-	0x7482B580, 0x7481F300, 0x74813080,
-	0x74806E00, 0x747FAB80, 0x747EE900,
-	0x747E2680, 0x747D6400, 0x747CA180,
-	0x747BDF00, 0x747B1C80, 0x747A5A00,
-	0x74799780, 0x7478D500, 0x74781280,
-	0x74775000, 0x74768D80, 0x7475CB00,
-	0x74750880, 0x74744600, 0x74738380,
-	0x7472C100, 0x7471FE80, 0x74713C00,
-	0x74707980, 0x746FB700, 0x746EF480,
-	0x746E3200, 0x746D6F80, 0x746CAD00,
-	0x746BEA80, 0x746B2800, 0x746A6580,
-	0x7469A300, 0x7468E080, 0x74681E00,
-	0x74675B80, 0x74669900, 0x7465D680,
-	0x74651400, 0x74645180, 0x74638F00,
-	0x7462CC80, 0x74620A00, 0x74614780,
-	0x74608500, 0x745FC280, 0x745F0000,
-	0x745E3D80, 0x745D7B00, 0x745CB880,
-	0x745BF600, 0x745B3380, 0x745A7100,
-	0x7459AE80, 0x7458EC00, 0x74582980,
-	0x74576700, 0x7456A480, 0x7455E200,
-	0x74551F80, 0x74545D00, 0x74539A80,
-	0x7452D800, 0x74521580, 0x74515300,
-	0x74509080, 0x744FCE00, 0x744F0B80,
-	0x744E4900, 0x744D8680, 0x744CC400,
-	0x744C0180, 0x744B3F00, 0x744A7C80,
-	0x7449BA00, 0x7448F780, 0x74483500,
-	0x74477280, 0x7446B000, 0x7445ED80,
-	0x74452B00, 0x74446880, 0x7443A600,
-	0x7442E380, 0x74422100, 0x74415E80,
-	0x74409C00, 0x743FD980, 0x743F1700,
-	0x743E5480, 0x743D9200, 0x743CCF80,
-	0x743C0D00, 0x743B4A80, 0x743A8800,
-	0x7439C580, 0x74390300, 0x74384080,
-	0x74377E00, 0x7436BB80, 0x7435F900,
-	0x74353680, 0x74347400, 0x7433B180,
-	0x7432EF00, 0x74322C80, 0x74316A00,
-	0x7430A780, 0x742FE500, 0x742F2280,
-	0x742E6000, 0x742D9D80, 0x742CDB00,
-	0x742C1880, 0x742B5600, 0x742A9380,
-	0x7429D100, 0x74290E80, 0x74284C00,
-	0x74278980, 0x7426C700, 0x74260480,
-	0x74254200, 0x74247F80, 0x7423BD00,
-	0x7422FA80, 0x74223800, 0x74217580,
-	0x7420B300, 0x741FF080, 0x741F2E00,
-	0x741E6B80, 0x741DA900, 0x741CE680,
-	0x741C2400, 0x741B6180, 0x741A9F00,
-	0x7419DC80, 0x74191A00, 0x74185780,
-	0x74179500, 0x7416D280, 0x74161000,
-	0x74154D80, 0x74148B00, 0x7413C880,
-	0x74130600, 0x74124380, 0x74118100,
-	0x7410BE80, 0x740FFC00, 0x740F3980,
-	0x740E7700, 0x740DB480, 0x740CF200,
-	0x740C2F80, 0x740B6D00, 0x740AAA80,
-	0x7409E800, 0x74092580, 0x74086300,
-	0x7407A080, 0x7406DE00, 0x74061B80,
-	0x74055900, 0x74049680, 0x7403D400,
-	0x74031180, 0x74024F00, 0x74018C80,
-	0x7400CA00, 0x74000780, 0x73FF4500,
-	0x73FE8280, 0x73FDC000, 0x73FCFD80,
-	0x73FC3B00, 0x73FB7880, 0x73FAB600,
-	0x73F9F380, 0x73F93100, 0x73F86E80,
-	0x73F7AC00, 0x73F6E980, 0x73F62700,
-	0x73F56480, 0x73F4A200, 0x73F3DF80,
-	0x73F31D00, 0x73F25A80, 0x73F19800,
-	0x73F0D580, 0x73F01300, 0x73EF5080,
-	0x73EE8E00, 0x73EDCB80, 0x73ED0900,
-	0x73EC4680, 0x73EB8400, 0x73EAC180,
-	0x73E9FF00, 0x73E93C80, 0x73E87A00,
-	0x73E7B780, 0x73E6F500, 0x73E63280,
-	0x73E57000, 0x73E4AD80, 0x73E3EB00,
-	0x73E32880, 0x73E26600, 0x73E1A380,
-	0x73E0E100, 0x73E01E80, 0x73DF5C00,
-	0x73DE9980, 0x73DDD700, 0x73DD1480,
-	0x73DC5200, 0x73DB8F80, 0x73DACD00,
-	0x73DA0A80, 0x73D94800, 0x73D88580,
-	0x73D7C300, 0x73D70080, 0x73D63E00,
-	0x73D57B80, 0x73D4B900, 0x73D3F680,
-	0x73D33400, 0x73D27180, 0x73D1AF00,
-	0x73D0EC80, 0x73D02A00, 0x73CF6780,
-	0x73CEA500, 0x73CDE280, 0x73CD2000,
-	0x73CC5D80, 0x73CB9B00, 0x73CAD880,
-	0x73CA1600, 0x73C95380, 0x73C89100,
-	0x73C7CE80, 0x73C70C00, 0x73C64980,
-	0x73C58700, 0x73C4C480, 0x73C40200,
-	0x73C33F80, 0x73C27D00, 0x73C1BA80,
-	0x73C0F800, 0x73C03580, 0x73BF7300,
-	0x73BEB080, 0x73BDEE00, 0x73BD2B80,
-	0x73BC6900, 0x73BBA680, 0x73BAE400,
-	0x73BA2180, 0x73B95F00, 0x73B89C80,
-	0x73B7DA00, 0x73B71780, 0x73B65500,
-	0x73B59280, 0x73B4D000, 0x73B40D80,
-	0x73B34B00, 0x73B28880, 0x73B1C600,
-	0x73B10380, 0x73B04100, 0x73AF7E80,
-	0x73AEBC00, 0x73ADF980, 0x73AD3700,
-	0x73AC7480, 0x73ABB200, 0x73AAEF80,
-	0x73AA2D00, 0x73A96A80, 0x73A8A800,
-	0x73A7E580, 0x73A72300, 0x73A66080,
-	0x73A59E00, 0x73A4DB80, 0x73A41900,
-	0x73A35680, 0x73A29400, 0x73A1D180,
-	0x73A10F00, 0x73A04C80, 0x739F8A00,
-	0x739EC780, 0x739E0500, 0x739D4280,
-	0x739C8000, 0x739BBD80, 0x739AFB00,
-	0x739A3880, 0x73997600, 0x7398B380,
-	0x7397F100, 0x73972E80, 0x73966C00,
-	0x7395A980, 0x7394E700, 0x73942480,
-	0x73936200, 0x73929F80, 0x7391DD00,
-	0x73911A80, 0x73905800, 0x738F9580,
-	0x738ED300, 0x738E1080, 0x738D4E00,
-	0x738C8B80, 0x738BC900, 0x738B0680,
-	0x738A4400, 0x73898180, 0x7388BF00,
-	0x7387FC80, 0x73873A00, 0x73867780,
-	0x7385B500, 0x7384F280, 0x73843000,
-	0x73836D80, 0x7382AB00, 0x7381E880,
-	0x73812600, 0x73806380, 0x737FA100,
-	0x737EDE80, 0x737E1C00, 0x737D5980,
-	0x737C9700, 0x737BD480, 0x737B1200,
-	0x737A4F80, 0x73798D00, 0x7378CA80,
-	0x73780800, 0x73774580, 0x73768300,
-	0x7375C080, 0x7374FE00, 0x73743B80,
-	0x73737900, 0x7372B680, 0x7371F400,
-	0x73713180, 0x73706F00, 0x736FAC80,
-	0x736EEA00, 0x736E2780, 0x736D6500,
-	0x736CA280, 0x736BE000, 0x736B1D80,
-	0x736A5B00, 0x73699880, 0x7368D600,
-	0x73681380, 0x73675100, 0x73668E80,
-	0x7365CC00, 0x73650980, 0x73644700,
-	0x73638480, 0x7362C200, 0x7361FF80,
-	0x73613D00, 0x73607A80, 0x735FB800,
-	0x735EF580, 0x735E3300, 0x735D7080,
-	0x735CAE00, 0x735BEB80, 0x735B2900,
-	0x735A6680, 0x7359A400, 0x7358E180,
-	0x73581F00, 0x73575C80, 0x73569A00,
-	0x7355D780, 0x73551500, 0x73545280,
-	0x73539000, 0x7352CD80, 0x73520B00,
-	0x73514880, 0x73508600, 0x734FC380,
-	0x734F0100, 0x734E3E80, 0x734D7C00,
-	0x734CB980, 0x734BF700, 0x734B3480,
-	0x734A7200, 0x7349AF80, 0x7348ED00,
-	0x73482A80, 0x73476800, 0x7346A580,
-	0x7345E300, 0x73452080, 0x73445E00,
-	0x73439B80, 0x7342D900, 0x73421680,
-	0x73415400, 0x73409180, 0x733FCF00,
-	0x733F0C80, 0x733E4A00, 0x733D8780,
-	0x733CC500, 0x733C0280, 0x733B4000,
-	0x733A7D80, 0x7339BB00, 0x7338F880,
-	0x73383600, 0x73377380, 0x7336B100,
-	0x7335EE80, 0x73352C00, 0x73346980,
-	0x7333A700, 0x7332E480, 0x73322200,
-	0x73315F80, 0x73309D00, 0x732FDA80,
-	0x732F1800, 0x732E5580, 0x732D9300,
-	0x732CD080, 0x732C0E00, 0x732B4B80,
-	0x732A8900, 0x7329C680, 0x73290400,
-	0x73284180, 0x73277F00, 0x7326BC80,
-	0x7325FA00, 0x73253780, 0x73247500,
-	0x7323B280, 0x7322F000, 0x73222D80,
-	0x73216B00, 0x7320A880, 0x731FE600,
-	0x731F2380, 0x731E6100, 0x731D9E80,
-	0x731CDC00, 0x731C1980, 0x731B5700,
-	0x731A9480, 0x7319D200, 0x73190F80,
-	0x73184D00, 0x73178A80, 0x7316C800,
-	0x73160580, 0x73154300, 0x73148080,
-	0x7313BE00, 0x7312FB80, 0x73123900,
-	0x73117680, 0x7310B400, 0x730FF180,
-	0x730F2F00, 0x730E6C80, 0x730DAA00,
-	0x730CE780, 0x730C2500, 0x730B6280,
-	0x730AA000, 0x7309DD80, 0x73091B00,
-	0x73085880, 0x73079600, 0x7306D380,
-	0x73061100, 0x73054E80, 0x73048C00,
-	0x7303C980, 0x73030700, 0x73024480,
-	0x73018200, 0x7300BF80, 0x72FFFD00,
-	0x72FF3A80, 0x72FE7800, 0x72FDB580,
-	0x72FCF300, 0x72FC3080, 0x72FB6E00,
-	0x72FAAB80, 0x72F9E900, 0x72F92680,
-	0x72F86400, 0x72F7A180, 0x72F6DF00,
-	0x72F61C80, 0x72F55A00, 0x72F49780,
-	0x72F3D500, 0x72F31280, 0x72F25000,
-	0x72F18D80, 0x72F0CB00, 0x72F00880,
-	0x72EF4600, 0x72EE8380, 0x72EDC100,
-	0x72ECFE80, 0x72EC3C00, 0x72EB7980,
-	0x72EAB700, 0x72E9F480, 0x72E93200,
-	0x72E86F80, 0x72E7AD00, 0x72E6EA80,
-	0x72E62800, 0x72E56580, 0x72E4A300,
-	0x72E3E080, 0x72E31E00, 0x72E25B80,
-	0x72E19900, 0x72E0D680, 0x72E01400,
-	0x72DF5180, 0x72DE8F00, 0x72DDCC80,
-	0x72DD0A00, 0x72DC4780, 0x72DB8500,
-	0x72DAC280, 0x72DA0000, 0x72D93D80,
-	0x72D87B00, 0x72D7B880, 0x72D6F600,
-	0x72D63380, 0x72D57100, 0x72D4AE80,
-	0x72D3EC00, 0x72D32980, 0x72D26700,
-	0x72D1A480, 0x72D0E200, 0x72D01F80,
-	0x72CF5D00, 0x72CE9A80, 0x72CDD800,
-	0x72CD1580, 0x72CC5300, 0x72CB9080,
-	0x72CACE00, 0x72CA0B80, 0x72C94900,
-	0x72C88680, 0x72C7C400, 0x72C70180,
-	0x72C63F00, 0x72C57C80, 0x72C4BA00,
-	0x72C3F780, 0x72C33500, 0x72C27280,
-	0x72C1B000, 0x72C0ED80, 0x72C02B00,
-	0x72BF6880, 0x72BEA600, 0x72BDE380,
-	0x72BD2100, 0x72BC5E80, 0x72BB9C00,
-	0x72BAD980, 0x72BA1700, 0x72B95480,
-	0x72B89200, 0x72B7CF80, 0x72B70D00,
-	0x72B64A80, 0x72B58800, 0x72B4C580,
-	0x72B40300, 0x72B34080, 0x72B27E00,
-	0x72B1BB80, 0x72B0F900, 0x72B03680,
-	0x72AF7400, 0x72AEB180, 0x72ADEF00,
-	0x72AD2C80, 0x72AC6A00, 0x72ABA780,
-	0x72AAE500, 0x72AA2280, 0x72A96000,
-	0x72A89D80, 0x72A7DB00, 0x72A71880,
-	0x72A65600, 0x72A59380, 0x72A4D100,
-	0x72A40E80, 0x72A34C00, 0x72A28980,
-	0x72A1C700, 0x72A10480, 0x72A04200,
-	0x729F7F80, 0x729EBD00, 0x729DFA80,
-	0x729D3800, 0x729C7580, 0x729BB300,
-	0x729AF080, 0x729A2E00, 0x72996B80,
-	0x7298A900, 0x7297E680, 0x72972400,
-	0x72966180, 0x72959F00, 0x7294DC80,
-	0x72941A00, 0x72935780, 0x72929500,
-	0x7291D280, 0x72911000, 0x72904D80,
-	0x728F8B00, 0x728EC880, 0x728E0600,
-	0x728D4380, 0x728C8100, 0x728BBE80,
-	0x728AFC00, 0x728A3980, 0x72897700,
-	0x7288B480, 0x7287F200, 0x72872F80,
-	0x72866D00, 0x7285AA80, 0x7284E800,
-	0x72842580, 0x72836300, 0x7282A080,
-	0x7281DE00, 0x72811B80, 0x72805900,
-	0x727F9680, 0x727ED400, 0x727E1180,
-	0x727D4F00, 0x727C8C80, 0x727BCA00,
-	0x727B0780, 0x727A4500, 0x72798280,
-	0x7278C000, 0x7277FD80, 0x72773B00,
-	0x72767880, 0x7275B600, 0x7274F380,
-	0x72743100, 0x72736E80, 0x7272AC00,
-	0x7271E980, 0x72712700, 0x72706480,
-	0x726FA200, 0x726EDF80, 0x726E1D00,
-	0x726D5A80, 0x726C9800, 0x726BD580,
-	0x726B1300, 0x726A5080, 0x72698E00,
-	0x7268CB80, 0x72680900, 0x72674680,
-	0x72668400, 0x7265C180, 0x7264FF00,
-	0x72643C80, 0x72637A00, 0x7262B780,
-	0x7261F500, 0x72613280, 0x72607000,
-	0x725FAD80, 0x725EEB00, 0x725E2880,
-	0x725D6600, 0x725CA380, 0x725BE100,
-	0x725B1E80, 0x725A5C00, 0x72599980,
-	0x7258D700, 0x72581480, 0x72575200,
-	0x72568F80, 0x7255CD00, 0x72550A80,
-	0x72544800, 0x72538580, 0x7252C300,
-	0x72520080, 0x72513E00, 0x72507B80,
-	0x724FB900, 0x724EF680, 0x724E3400,
-	0x724D7180, 0x724CAF00, 0x724BEC80,
-	0x724B2A00, 0x724A6780, 0x7249A500,
-	0x7248E280, 0x72482000, 0x72475D80,
-	0x72469B00, 0x7245D880, 0x72451600,
-	0x72445380, 0x72439100, 0x7242CE80,
-	0x72420C00, 0x72414980, 0x72408700,
-	0x723FC480, 0x723F0200, 0x723E3F80,
-	0x723D7D00, 0x723CBA80, 0x723BF800,
-	0x723B3580, 0x723A7300, 0x7239B080,
-	0x7238EE00, 0x72382B80, 0x72376900,
-	0x7236A680, 0x7235E400, 0x72352180,
-	0x72345F00, 0x72339C80, 0x7232DA00,
-	0x72321780, 0x72315500, 0x72309280,
-	0x722FD000, 0x722F0D80, 0x722E4B00,
-	0x722D8880, 0x722CC600, 0x722C0380,
-	0x722B4100, 0x722A7E80, 0x7229BC00,
-	0x7228F980, 0x72283700, 0x72277480,
-	0x7226B200, 0x7225EF80, 0x72252D00,
-	0x72246A80, 0x7223A800, 0x7222E580,
-	0x72222300, 0x72216080, 0x72209E00,
-	0x721FDB80, 0x721F1900, 0x721E5680,
-	0x721D9400, 0x721CD180, 0x721C0F00,
-	0x721B4C80, 0x721A8A00, 0x7219C780,
-	0x72190500, 0x72184280, 0x72178000,
-	0x7216BD80, 0x7215FB00, 0x72153880,
-	0x72147600, 0x7213B380, 0x7212F100,
-	0x72122E80, 0x72116C00, 0x7210A980,
-	0x720FE700, 0x720F2480, 0x720E6200,
-	0x720D9F80, 0x720CDD00, 0x720C1A80,
-	0x720B5800, 0x720A9580, 0x7209D300,
-	0x72091080, 0x72084E00, 0x72078B80,
-	0x7206C900, 0x72060680, 0x72054400,
-	0x72048180, 0x7203BF00, 0x7202FC80,
-	0x72023A00, 0x72017780, 0x7200B500,
-	0x71FFF280, 0x71FF3000, 0x71FE6D80,
-	0x71FDAB00, 0x71FCE880, 0x71FC2600,
-	0x71FB6380, 0x71FAA100, 0x71F9DE80,
-	0x71F91C00, 0x71F85980, 0x71F79700,
-	0x71F6D480, 0x71F61200, 0x71F54F80,
-	0x71F48D00, 0x71F3CA80, 0x71F30800,
-	0x71F24580, 0x71F18300, 0x71F0C080,
-	0x71EFFE00, 0x71EF3B80, 0x71EE7900,
-	0x71EDB680, 0x71ECF400, 0x71EC3180,
-	0x71EB6F00, 0x71EAAC80, 0x71E9EA00,
-	0x71E92780, 0x71E86500, 0x71E7A280,
-	0x71E6E000, 0x71E61D80, 0x71E55B00,
-	0x71E49880, 0x71E3D600, 0x71E31380,
-	0x71E25100, 0x71E18E80, 0x71E0CC00,
-	0x71E00980, 0x71DF4700, 0x71DE8480,
-	0x71DDC200, 0x71DCFF80, 0x71DC3D00,
-	0x71DB7A80, 0x71DAB800, 0x71D9F580,
-	0x71D93300, 0x71D87080, 0x71D7AE00,
-	0x71D6EB80, 0x71D62900, 0x71D56680,
-	0x71D4A400, 0x71D3E180, 0x71D31F00,
-	0x71D25C80, 0x71D19A00, 0x71D0D780,
-	0x71D01500, 0x71CF5280, 0x71CE9000,
-	0x71CDCD80, 0x71CD0B00, 0x71CC4880,
-	0x71CB8600, 0x71CAC380, 0x71CA0100,
-	0x71C93E80, 0x71C87C00, 0x71C7B980,
-	0x71C6F700, 0x71C63480, 0x71C57200,
-	0x71C4AF80, 0x71C3ED00, 0x71C32A80,
-	0x71C26800, 0x71C1A580, 0x71C0E300,
-	0x71C02080, 0x71BF5E00, 0x71BE9B80,
-	0x71BDD900, 0x71BD1680, 0x71BC5400,
-	0x71BB9180, 0x71BACF00, 0x71BA0C80,
-	0x71B94A00, 0x71B88780, 0x71B7C500,
-	0x71B70280, 0x71B64000, 0x71B57D80,
-	0x71B4BB00, 0x71B3F880, 0x71B33600,
-	0x71B27380, 0x71B1B100, 0x71B0EE80,
-	0x71B02C00, 0x71AF6980, 0x71AEA700,
-	0x71ADE480, 0x71AD2200, 0x71AC5F80,
-	0x71AB9D00, 0x71AADA80, 0x71AA1800,
-	0x71A95580, 0x71A89300, 0x71A7D080,
-	0x71A70E00, 0x71A64B80, 0x71A58900,
-	0x71A4C680, 0x71A40400, 0x71A34180,
-	0x71A27F00, 0x71A1BC80, 0x71A0FA00,
-	0x71A03780, 0x719F7500, 0x719EB280,
-	0x719DF000, 0x719D2D80, 0x719C6B00,
-	0x719BA880, 0x719AE600, 0x719A2380,
-	0x71996100, 0x71989E80, 0x7197DC00,
-	0x71971980, 0x71965700, 0x71959480,
-	0x7194D200, 0x71940F80, 0x71934D00,
-	0x71928A80, 0x7191C800, 0x71910580,
-	0x71904300, 0x718F8080, 0x718EBE00,
-	0x718DFB80, 0x718D3900, 0x718C7680,
-	0x718BB400, 0x718AF180, 0x718A2F00,
-	0x71896C80, 0x7188AA00, 0x7187E780,
-	0x71872500, 0x71866280, 0x7185A000,
-	0x7184DD80, 0x71841B00, 0x71835880,
-	0x71829600, 0x7181D380, 0x71811100,
-	0x71804E80, 0x717F8C00, 0x717EC980,
-	0x717E0700, 0x717D4480, 0x717C8200,
-	0x717BBF80, 0x717AFD00, 0x717A3A80,
-	0x71797800, 0x7178B580, 0x7177F300,
-	0x71773080, 0x71766E00, 0x7175AB80,
-	0x7174E900, 0x71742680, 0x71736400,
-	0x7172A180, 0x7171DF00, 0x71711C80,
-	0x71705A00, 0x716F9780, 0x716ED500,
-	0x716E1280, 0x716D5000, 0x716C8D80,
-	0x716BCB00, 0x716B0880, 0x716A4600,
-	0x71698380, 0x7168C100, 0x7167FE80,
-	0x71673C00, 0x71667980, 0x7165B700,
-	0x7164F480, 0x71643200, 0x71636F80,
-	0x7162AD00, 0x7161EA80, 0x71612800,
-	0x71606580, 0x715FA300, 0x715EE080,
-	0x715E1E00, 0x715D5B80, 0x715C9900,
-	0x715BD680, 0x715B1400, 0x715A5180,
-	0x71598F00, 0x7158CC80, 0x71580A00,
-	0x71574780, 0x71568500, 0x7155C280,
-	0x71550000, 0x71543D80, 0x71537B00,
-	0x7152B880, 0x7151F600, 0x71513380,
-	0x71507100, 0x714FAE80, 0x714EEC00,
-	0x714E2980, 0x714D6700, 0x714CA480,
-	0x714BE200, 0x714B1F80, 0x714A5D00,
-	0x71499A80, 0x7148D800, 0x71481580,
-	0x71475300, 0x71469080, 0x7145CE00,
-	0x71450B80, 0x71444900, 0x71438680,
-	0x7142C400, 0x71420180, 0x71413F00,
-	0x71407C80, 0x713FBA00, 0x713EF780,
-	0x713E3500, 0x713D7280, 0x713CB000,
-	0x713BED80, 0x713B2B00, 0x713A6880,
-	0x7139A600, 0x7138E380, 0x71382100,
-	0x71375E80, 0x71369C00, 0x7135D980,
-	0x71351700, 0x71345480, 0x71339200,
-	0x7132CF80, 0x71320D00, 0x71314A80,
-	0x71308800, 0x712FC580, 0x712F0300,
-	0x712E4080, 0x712D7E00, 0x712CBB80,
-	0x712BF900, 0x712B3680, 0x712A7400,
-	0x7129B180, 0x7128EF00, 0x71282C80,
-	0x71276A00, 0x7126A780, 0x7125E500,
-	0x71252280, 0x71246000, 0x71239D80,
-	0x7122DB00, 0x71221880, 0x71215600,
-	0x71209380, 0x711FD100, 0x711F0E80,
-	0x711E4C00, 0x711D8980, 0x711CC700,
-	0x711C0480, 0x711B4200, 0x711A7F80,
-	0x7119BD00, 0x7118FA80, 0x71183800,
-	0x71177580, 0x7116B300, 0x7115F080,
-	0x71152E00, 0x71146B80, 0x7113A900,
-	0x7112E680, 0x71122400, 0x71116180,
-	0x71109F00, 0x710FDC80, 0x710F1A00,
-	0x710E5780, 0x710D9500, 0x710CD280,
-	0x710C1000, 0x710B4D80, 0x710A8B00,
-	0x7109C880, 0x71090600, 0x71084380,
-	0x71078100, 0x7106BE80, 0x7105FC00,
-	0x71053980, 0x71047700, 0x7103B480,
-	0x7102F200, 0x71022F80, 0x71016D00,
-	0x7100AA80, 0x70FFE800, 0x70FF2580,
-	0x70FE6300, 0x70FDA080, 0x70FCDE00,
-	0x70FC1B80, 0x70FB5900, 0x70FA9680,
-	0x70F9D400, 0x70F91180, 0x70F84F00,
-	0x70F78C80, 0x70F6CA00, 0x70F60780,
-	0x70F54500, 0x70F48280, 0x70F3C000,
-	0x70F2FD80, 0x70F23B00, 0x70F17880,
-	0x70F0B600, 0x70EFF380, 0x70EF3100,
-	0x70EE6E80, 0x70EDAC00, 0x70ECE980,
-	0x70EC2700, 0x70EB6480, 0x70EAA200,
-	0x70E9DF80, 0x70E91D00, 0x70E85A80,
-	0x70E79800, 0x70E6D580, 0x70E61300,
-	0x70E55080, 0x70E48E00, 0x70E3CB80,
-	0x70E30900, 0x70E24680, 0x70E18400,
-	0x70E0C180, 0x70DFFF00, 0x70DF3C80,
-	0x70DE7A00, 0x70DDB780, 0x70DCF500,
-	0x70DC3280, 0x70DB7000, 0x70DAAD80,
-	0x70D9EB00, 0x70D92880, 0x70D86600,
-	0x70D7A380, 0x70D6E100, 0x70D61E80,
-	0x70D55C00, 0x70D49980, 0x70D3D700,
-	0x70D31480, 0x70D25200, 0x70D18F80,
-	0x70D0CD00, 0x70D00A80, 0x70CF4800,
-	0x70CE8580, 0x70CDC300, 0x70CD0080,
-	0x70CC3E00, 0x70CB7B80, 0x70CAB900,
-	0x70C9F680, 0x70C93400, 0x70C87180,
-	0x70C7AF00, 0x70C6EC80, 0x70C62A00,
-	0x70C56780, 0x70C4A500, 0x70C3E280,
-	0x70C32000, 0x70C25D80, 0x70C19B00,
-	0x70C0D880, 0x70C01600, 0x70BF5380,
-	0x70BE9100, 0x70BDCE80, 0x70BD0C00,
-	0x70BC4980, 0x70BB8700, 0x70BAC480,
-	0x70BA0200, 0x70B93F80, 0x70B87D00,
-	0x70B7BA80, 0x70B6F800, 0x70B63580,
-	0x70B57300, 0x70B4B080, 0x70B3EE00,
-	0x70B32B80, 0x70B26900, 0x70B1A680,
-	0x70B0E400, 0x70B02180, 0x70AF5F00,
-	0x70AE9C80, 0x70ADDA00, 0x70AD1780,
-	0x70AC5500, 0x70AB9280, 0x70AAD000,
-	0x70AA0D80, 0x70A94B00, 0x70A88880,
-	0x70A7C600, 0x70A70380, 0x70A64100,
-	0x70A57E80, 0x70A4BC00, 0x70A3F980,
-	0x70A33700, 0x70A27480, 0x70A1B200,
-	0x70A0EF80, 0x70A02D00, 0x709F6A80,
-	0x709EA800, 0x709DE580, 0x709D2300,
-	0x709C6080, 0x709B9E00, 0x709ADB80,
-	0x709A1900, 0x70995680, 0x70989400,
-	0x7097D180, 0x70970F00, 0x70964C80,
-	0x70958A00, 0x7094C780, 0x70940500,
-	0x70934280, 0x70928000, 0x7091BD80,
-	0x7090FB00, 0x70903880, 0x708F7600,
-	0x708EB380, 0x708DF100, 0x708D2E80,
-	0x708C6C00, 0x708BA980, 0x708AE700,
-	0x708A2480, 0x70896200, 0x70889F80,
-	0x7087DD00, 0x70871A80, 0x70865800,
-	0x70859580, 0x7084D300, 0x70841080,
-	0x70834E00, 0x70828B80, 0x7081C900,
-	0x70810680, 0x70804400, 0x707F8180,
-	0x707EBF00, 0x707DFC80, 0x707D3A00,
-	0x707C7780, 0x707BB500, 0x707AF280,
-	0x707A3000, 0x70796D80, 0x7078AB00,
-	0x7077E880, 0x70772600, 0x70766380,
-	0x7075A100, 0x7074DE80, 0x70741C00,
-	0x70735980, 0x70729700, 0x7071D480,
-	0x70711200, 0x70704F80, 0x706F8D00,
-	0x706ECA80, 0x706E0800, 0x706D4580,
-	0x706C8300, 0x706BC080, 0x706AFE00,
-	0x706A3B80, 0x70697900, 0x7068B680,
-	0x7067F400, 0x70673180, 0x70666F00,
-	0x7065AC80, 0x7064EA00, 0x70642780,
-	0x70636500, 0x7062A280, 0x7061E000,
-	0x70611D80, 0x70605B00, 0x705F9880,
-	0x705ED600, 0x705E1380, 0x705D5100,
-	0x705C8E80, 0x705BCC00, 0x705B0980,
-	0x705A4700, 0x70598480, 0x7058C200,
-	0x7057FF80, 0x70573D00, 0x70567A80,
-	0x7055B800, 0x7054F580, 0x70543300,
-	0x70537080, 0x7052AE00, 0x7051EB80,
-	0x70512900, 0x70506680, 0x704FA400,
-	0x704EE180, 0x704E1F00, 0x704D5C80,
-	0x704C9A00, 0x704BD780, 0x704B1500,
-	0x704A5280, 0x70499000, 0x7048CD80,
-	0x70480B00, 0x70474880, 0x70468600,
-	0x7045C380, 0x70450100, 0x70443E80,
-	0x70437C00, 0x7042B980, 0x7041F700,
-	0x70413480, 0x70407200, 0x703FAF80,
-	0x703EED00, 0x703E2A80, 0x703D6800,
-	0x703CA580, 0x703BE300, 0x703B2080,
-	0x703A5E00, 0x70399B80, 0x7038D900,
-	0x70381680, 0x70375400, 0x70369180,
-	0x7035CF00, 0x70350C80, 0x70344A00,
-	0x70338780, 0x7032C500, 0x70320280,
-	0x70314000, 0x70307D80, 0x702FBB00,
-	0x702EF880, 0x702E3600, 0x702D7380,
-	0x702CB100, 0x702BEE80, 0x702B2C00,
-	0x702A6980, 0x7029A700, 0x7028E480,
-	0x70282200, 0x70275F80, 0x70269D00,
-	0x7025DA80, 0x70251800, 0x70245580,
-	0x70239300, 0x7022D080, 0x70220E00,
-	0x70214B80, 0x70208900, 0x701FC680,
-	0x701F0400, 0x701E4180, 0x701D7F00,
-	0x701CBC80, 0x701BFA00, 0x701B3780,
-	0x701A7500, 0x7019B280, 0x7018F000,
-	0x70182D80, 0x70176B00, 0x7016A880,
-	0x7015E600, 0x70152380, 0x70146100,
-	0x70139E80, 0x7012DC00, 0x70121980,
-	0x70115700, 0x70109480, 0x700FD200,
-	0x700F0F80, 0x700E4D00, 0x700D8A80,
-	0x700CC800, 0x700C0580, 0x700B4300,
-	0x700A8080, 0x7009BE00, 0x7008FB80,
-	0x70083900, 0x70077680, 0x7006B400,
-	0x7005F180, 0x70052F00, 0x70046C80,
-	0x7003AA00, 0x7002E780, 0x70022500,
-	0x70016280, 0x7000A000, 0x6FFFDD80,
-	0x6FFF1B00, 0x6FFE5880, 0x6FFD9600,
-	0x6FFCD380, 0x6FFC1100, 0x6FFB4E80,
-	0x6FFA8C00, 0x6FF9C980, 0x6FF90700,
-	0x6FF84480, 0x6FF78200, 0x6FF6BF80,
-	0x6FF5FD00, 0x6FF53A80, 0x6FF47800,
-	0x6FF3B580, 0x6FF2F300, 0x6FF23080,
-	0x6FF16E00, 0x6FF0AB80, 0x6FEFE900,
-	0x6FEF2680, 0x6FEE6400, 0x6FEDA180,
-	0x6FECDF00, 0x6FEC1C80, 0x6FEB5A00,
-	0x6FEA9780, 0x6FE9D500, 0x6FE91280,
-	0x6FE85000, 0x6FE78D80, 0x6FE6CB00,
-	0x6FE60880, 0x6FE54600, 0x6FE48380,
-	0x6FE3C100, 0x6FE2FE80, 0x6FE23C00,
-	0x6FE17980, 0x6FE0B700, 0x6FDFF480,
-	0x6FDF3200, 0x6FDE6F80, 0x6FDDAD00,
-	0x6FDCEA80, 0x6FDC2800, 0x6FDB6580,
-	0x6FDAA300, 0x6FD9E080, 0x6FD91E00,
-	0x6FD85B80, 0x6FD79900, 0x6FD6D680,
-	0x6FD61400, 0x6FD55180, 0x6FD48F00,
-	0x6FD3CC80, 0x6FD30A00, 0x6FD24780,
-	0x6FD18500, 0x6FD0C280, 0x6FD00000,
-	0x6FCF4680, 0x6FCE8D00, 0x6FCDD380,
-	0x6FCD1A00, 0x6FCC6080, 0x6FCBA700,
-	0x6FCAED80, 0x6FCA3400, 0x6FC97A80,
-	0x6FC8C100, 0x6FC80780, 0x6FC74E00,
-	0x6FC69480, 0x6FC5DB00, 0x6FC52180,
-	0x6FC46800, 0x6FC3AE80, 0x6FC2F500,
-	0x6FC23B80, 0x6FC18200, 0x6FC0C880,
-	0x6FC00F00, 0x6FBF5580, 0x6FBE9C00,
-	0x6FBDE280, 0x6FBD2900, 0x6FBC6F80,
-	0x6FBBB600, 0x6FBAFC80, 0x6FBA4300,
-	0x6FB98980, 0x6FB8D000, 0x6FB81680,
-	0x6FB75D00, 0x6FB6A380, 0x6FB5EA00,
-	0x6FB53080, 0x6FB47700, 0x6FB3BD80,
-	0x6FB30400, 0x6FB24A80, 0x6FB19100,
-	0x6FB0D780, 0x6FB01E00, 0x6FAF6480,
-	0x6FAEAB00, 0x6FADF180, 0x6FAD3800,
-	0x6FAC7E80, 0x6FABC500, 0x6FAB0B80,
-	0x6FAA5200, 0x6FA99880, 0x6FA8DF00,
-	0x6FA82580, 0x6FA76C00, 0x6FA6B280,
-	0x6FA5F900, 0x6FA53F80, 0x6FA48600,
-	0x6FA3CC80, 0x6FA31300, 0x6FA25980,
-	0x6FA1A000, 0x6FA0E680, 0x6FA02D00,
-	0x6F9F7380, 0x6F9EBA00, 0x6F9E0080,
-	0x6F9D4700, 0x6F9C8D80, 0x6F9BD400,
-	0x6F9B1A80, 0x6F9A6100, 0x6F99A780,
-	0x6F98EE00, 0x6F983480, 0x6F977B00,
-	0x6F96C180, 0x6F960800, 0x6F954E80,
-	0x6F949500, 0x6F93DB80, 0x6F932200,
-	0x6F926880, 0x6F91AF00, 0x6F90F580,
-	0x6F903C00, 0x6F8F8280, 0x6F8EC900,
-	0x6F8E0F80, 0x6F8D5600, 0x6F8C9C80,
-	0x6F8BE300, 0x6F8B2980, 0x6F8A7000,
-	0x6F89B680, 0x6F88FD00, 0x6F884380,
-	0x6F878A00, 0x6F86D080, 0x6F861700,
-	0x6F855D80, 0x6F84A400, 0x6F83EA80,
-	0x6F833100, 0x6F827780, 0x6F81BE00,
-	0x6F810480, 0x6F804B00, 0x6F7F9180,
-	0x6F7ED800, 0x6F7E1E80, 0x6F7D6500,
-	0x6F7CAB80, 0x6F7BF200, 0x6F7B3880,
-	0x6F7A7F00, 0x6F79C580, 0x6F790C00,
-	0x6F785280, 0x6F779900, 0x6F76DF80,
-	0x6F762600, 0x6F756C80, 0x6F74B300,
-	0x6F73F980, 0x6F734000, 0x6F728680,
-	0x6F71CD00, 0x6F711380, 0x6F705A00,
-	0x6F6FA080, 0x6F6EE700, 0x6F6E2D80,
-	0x6F6D7400, 0x6F6CBA80, 0x6F6C0100,
-	0x6F6B4780, 0x6F6A8E00, 0x6F69D480,
-	0x6F691B00, 0x6F686180, 0x6F67A800,
-	0x6F66EE80, 0x6F663500, 0x6F657B80,
-	0x6F64C200, 0x6F640880, 0x6F634F00,
-	0x6F629580, 0x6F61DC00, 0x6F612280,
-	0x6F606900, 0x6F5FAF80, 0x6F5EF600,
-	0x6F5E3C80, 0x6F5D8300, 0x6F5CC980,
-	0x6F5C1000, 0x6F5B5680, 0x6F5A9D00,
-	0x6F59E380, 0x6F592A00, 0x6F587080,
-	0x6F57B700, 0x6F56FD80, 0x6F564400,
-	0x6F558A80, 0x6F54D100, 0x6F541780,
-	0x6F535E00, 0x6F52A480, 0x6F51EB00,
-	0x6F513180, 0x6F507800, 0x6F4FBE80,
-	0x6F4F0500, 0x6F4E4B80, 0x6F4D9200,
-	0x6F4CD880, 0x6F4C1F00, 0x6F4B6580,
-	0x6F4AAC00, 0x6F49F280, 0x6F493900,
-	0x6F487F80, 0x6F47C600, 0x6F470C80,
-	0x6F465300, 0x6F459980, 0x6F44E000,
-	0x6F442680, 0x6F436D00, 0x6F42B380,
-	0x6F41FA00, 0x6F414080, 0x6F408700,
-	0x6F3FCD80, 0x6F3F1400, 0x6F3E5A80,
-	0x6F3DA100, 0x6F3CE780, 0x6F3C2E00,
-	0x6F3B7480, 0x6F3ABB00, 0x6F3A0180,
-	0x6F394800, 0x6F388E80, 0x6F37D500,
-	0x6F371B80, 0x6F366200, 0x6F35A880,
-	0x6F34EF00, 0x6F343580, 0x6F337C00,
-	0x6F32C280, 0x6F320900, 0x6F314F80,
-	0x6F309600, 0x6F2FDC80, 0x6F2F2300,
-	0x6F2E6980, 0x6F2DB000, 0x6F2CF680,
-	0x6F2C3D00, 0x6F2B8380, 0x6F2ACA00,
-	0x6F2A1080, 0x6F295700, 0x6F289D80,
-	0x6F27E400, 0x6F272A80, 0x6F267100,
-	0x6F25B780, 0x6F24FE00, 0x6F244480,
-	0x6F238B00, 0x6F22D180, 0x6F221800,
-	0x6F215E80, 0x6F20A500, 0x6F1FEB80,
-	0x6F1F3200, 0x6F1E7880, 0x6F1DBF00,
-	0x6F1D0580, 0x6F1C4C00, 0x6F1B9280,
-	0x6F1AD900, 0x6F1A1F80, 0x6F196600,
-	0x6F18AC80, 0x6F17F300, 0x6F173980,
-	0x6F168000, 0x6F15C680, 0x6F150D00,
-	0x6F145380, 0x6F139A00, 0x6F12E080,
-	0x6F122700, 0x6F116D80, 0x6F10B400,
-	0x6F0FFA80, 0x6F0F4100, 0x6F0E8780,
-	0x6F0DCE00, 0x6F0D1480, 0x6F0C5B00,
-	0x6F0BA180, 0x6F0AE800, 0x6F0A2E80,
-	0x6F097500, 0x6F08BB80, 0x6F080200,
-	0x6F074880, 0x6F068F00, 0x6F05D580,
-	0x6F051C00, 0x6F046280, 0x6F03A900,
-	0x6F02EF80, 0x6F023600, 0x6F017C80,
-	0x6F00C300, 0x6F000980, 0x6EFF5000,
-	0x6EFE9680, 0x6EFDDD00, 0x6EFD2380,
-	0x6EFC6A00, 0x6EFBB080, 0x6EFAF700,
-	0x6EFA3D80, 0x6EF98400, 0x6EF8CA80,
-	0x6EF81100, 0x6EF75780, 0x6EF69E00,
-	0x6EF5E480, 0x6EF52B00, 0x6EF47180,
-	0x6EF3B800, 0x6EF2FE80, 0x6EF24500,
-	0x6EF18B80, 0x6EF0D200, 0x6EF01880,
-	0x6EEF5F00, 0x6EEEA580, 0x6EEDEC00,
-	0x6EED3280, 0x6EEC7900, 0x6EEBBF80,
-	0x6EEB0600, 0x6EEA4C80, 0x6EE99300,
-	0x6EE8D980, 0x6EE82000, 0x6EE76680,
-	0x6EE6AD00, 0x6EE5F380, 0x6EE53A00,
-	0x6EE48080, 0x6EE3C700, 0x6EE30D80,
-	0x6EE25400, 0x6EE19A80, 0x6EE0E100,
-	0x6EE02780, 0x6EDF6E00, 0x6EDEB480,
-	0x6EDDFB00, 0x6EDD4180, 0x6EDC8800,
-	0x6EDBCE80, 0x6EDB1500, 0x6EDA5B80,
-	0x6ED9A200, 0x6ED8E880, 0x6ED82F00,
-	0x6ED77580, 0x6ED6BC00, 0x6ED60280,
-	0x6ED54900, 0x6ED48F80, 0x6ED3D600,
-	0x6ED31C80, 0x6ED26300, 0x6ED1A980,
-	0x6ED0F000, 0x6ED03680, 0x6ECF7D00,
-	0x6ECEC380, 0x6ECE0A00, 0x6ECD5080,
-	0x6ECC9700, 0x6ECBDD80, 0x6ECB2400,
-	0x6ECA6A80, 0x6EC9B100, 0x6EC8F780,
-	0x6EC83E00, 0x6EC78480, 0x6EC6CB00,
-	0x6EC61180, 0x6EC55800, 0x6EC49E80,
-	0x6EC3E500, 0x6EC32B80, 0x6EC27200,
-	0x6EC1B880, 0x6EC0FF00, 0x6EC04580,
-	0x6EBF8C00, 0x6EBED280, 0x6EBE1900,
-	0x6EBD5F80, 0x6EBCA600, 0x6EBBEC80,
-	0x6EBB3300, 0x6EBA7980, 0x6EB9C000,
-	0x6EB90680, 0x6EB84D00, 0x6EB79380,
-	0x6EB6DA00, 0x6EB62080, 0x6EB56700,
-	0x6EB4AD80, 0x6EB3F400, 0x6EB33A80,
-	0x6EB28100, 0x6EB1C780, 0x6EB10E00,
-	0x6EB05480, 0x6EAF9B00, 0x6EAEE180,
-	0x6EAE2800, 0x6EAD6E80, 0x6EACB500,
-	0x6EABFB80, 0x6EAB4200, 0x6EAA8880,
-	0x6EA9CF00, 0x6EA91580, 0x6EA85C00,
-	0x6EA7A280, 0x6EA6E900, 0x6EA62F80,
-	0x6EA57600, 0x6EA4BC80, 0x6EA40300,
-	0x6EA34980, 0x6EA29000, 0x6EA1D680,
-	0x6EA11D00, 0x6EA06380, 0x6E9FAA00,
-	0x6E9EF080, 0x6E9E3700, 0x6E9D7D80,
-	0x6E9CC400, 0x6E9C0A80, 0x6E9B5100,
-	0x6E9A9780, 0x6E99DE00, 0x6E992480,
-	0x6E986B00, 0x6E97B180, 0x6E96F800,
-	0x6E963E80, 0x6E958500, 0x6E94CB80,
-	0x6E941200, 0x6E935880, 0x6E929F00,
-	0x6E91E580, 0x6E912C00, 0x6E907280,
-	0x6E8FB900, 0x6E8EFF80, 0x6E8E4600,
-	0x6E8D8C80, 0x6E8CD300, 0x6E8C1980,
-	0x6E8B6000, 0x6E8AA680, 0x6E89ED00,
-	0x6E893380, 0x6E887A00, 0x6E87C080,
-	0x6E870700, 0x6E864D80, 0x6E859400,
-	0x6E84DA80, 0x6E842100, 0x6E836780,
-	0x6E82AE00, 0x6E81F480, 0x6E813B00,
-	0x6E808180, 0x6E7FC800, 0x6E7F0E80,
-	0x6E7E5500, 0x6E7D9B80, 0x6E7CE200,
-	0x6E7C2880, 0x6E7B6F00, 0x6E7AB580,
-	0x6E79FC00, 0x6E794280, 0x6E788900,
-	0x6E77CF80, 0x6E771600, 0x6E765C80,
-	0x6E75A300, 0x6E74E980, 0x6E743000,
-	0x6E737680, 0x6E72BD00, 0x6E720380,
-	0x6E714A00, 0x6E709080, 0x6E6FD700,
-	0x6E6F1D80, 0x6E6E6400, 0x6E6DAA80,
-	0x6E6CF100, 0x6E6C3780, 0x6E6B7E00,
-	0x6E6AC480, 0x6E6A0B00, 0x6E695180,
-	0x6E689800, 0x6E67DE80, 0x6E672500,
-	0x6E666B80, 0x6E65B200, 0x6E64F880,
-	0x6E643F00, 0x6E638580, 0x6E62CC00,
-	0x6E621280, 0x6E615900, 0x6E609F80,
-	0x6E5FE600, 0x6E5F2C80, 0x6E5E7300,
-	0x6E5DB980, 0x6E5D0000, 0x6E5C4680,
-	0x6E5B8D00, 0x6E5AD380, 0x6E5A1A00,
-	0x6E596080, 0x6E58A700, 0x6E57ED80,
-	0x6E573400, 0x6E567A80, 0x6E55C100,
-	0x6E550780, 0x6E544E00, 0x6E539480,
-	0x6E52DB00, 0x6E522180, 0x6E516800,
-	0x6E50AE80, 0x6E4FF500, 0x6E4F3B80,
-	0x6E4E8200, 0x6E4DC880, 0x6E4D0F00,
-	0x6E4C5580, 0x6E4B9C00, 0x6E4AE280,
-	0x6E4A2900, 0x6E496F80, 0x6E48B600,
-	0x6E47FC80, 0x6E474300, 0x6E468980,
-	0x6E45D000, 0x6E451680, 0x6E445D00,
-	0x6E43A380, 0x6E42EA00, 0x6E423080,
-	0x6E417700, 0x6E40BD80, 0x6E400400,
-	0x6E3F4A80, 0x6E3E9100, 0x6E3DD780,
-	0x6E3D1E00, 0x6E3C6480, 0x6E3BAB00,
-	0x6E3AF180, 0x6E3A3800, 0x6E397E80,
-	0x6E38C500, 0x6E380B80, 0x6E375200,
-	0x6E369880, 0x6E35DF00, 0x6E352580,
-	0x6E346C00, 0x6E33B280, 0x6E32F900,
-	0x6E323F80, 0x6E318600, 0x6E30CC80,
-	0x6E301300, 0x6E2F5980, 0x6E2EA000,
-	0x6E2DE680, 0x6E2D2D00, 0x6E2C7380,
-	0x6E2BBA00, 0x6E2B0080, 0x6E2A4700,
-	0x6E298D80, 0x6E28D400, 0x6E281A80,
-	0x6E276100, 0x6E26A780, 0x6E25EE00,
-	0x6E253480, 0x6E247B00, 0x6E23C180,
-	0x6E230800, 0x6E224E80, 0x6E219500,
-	0x6E20DB80, 0x6E202200, 0x6E1F6880,
-	0x6E1EAF00, 0x6E1DF580, 0x6E1D3C00,
-	0x6E1C8280, 0x6E1BC900, 0x6E1B0F80,
-	0x6E1A5600, 0x6E199C80, 0x6E18E300,
-	0x6E182980, 0x6E177000, 0x6E16B680,
-	0x6E15FD00, 0x6E154380, 0x6E148A00,
-	0x6E13D080, 0x6E131700, 0x6E125D80,
-	0x6E11A400, 0x6E10EA80, 0x6E103100,
-	0x6E0F7780, 0x6E0EBE00, 0x6E0E0480,
-	0x6E0D4B00, 0x6E0C9180, 0x6E0BD800,
-	0x6E0B1E80, 0x6E0A6500, 0x6E09AB80,
-	0x6E08F200, 0x6E083880, 0x6E077F00,
-	0x6E06C580, 0x6E060C00, 0x6E055280,
-	0x6E049900, 0x6E03DF80, 0x6E032600,
-	0x6E026C80, 0x6E01B300, 0x6E00F980,
-	0x6E004000, 0x6DFF8680, 0x6DFECD00,
-	0x6DFE1380, 0x6DFD5A00, 0x6DFCA080,
-	0x6DFBE700, 0x6DFB2D80, 0x6DFA7400,
-	0x6DF9BA80, 0x6DF90100, 0x6DF84780,
-	0x6DF78E00, 0x6DF6D480, 0x6DF61B00,
-	0x6DF56180, 0x6DF4A800, 0x6DF3EE80,
-	0x6DF33500, 0x6DF27B80, 0x6DF1C200,
-	0x6DF10880, 0x6DF04F00, 0x6DEF9580,
-	0x6DEEDC00, 0x6DEE2280, 0x6DED6900,
-	0x6DECAF80, 0x6DEBF600, 0x6DEB3C80,
-	0x6DEA8300, 0x6DE9C980, 0x6DE91000,
-	0x6DE85680, 0x6DE79D00, 0x6DE6E380,
-	0x6DE62A00, 0x6DE57080, 0x6DE4B700,
-	0x6DE3FD80, 0x6DE34400, 0x6DE28A80,
-	0x6DE1D100, 0x6DE11780, 0x6DE05E00,
-	0x6DDFA480, 0x6DDEEB00, 0x6DDE3180,
-	0x6DDD7800, 0x6DDCBE80, 0x6DDC0500,
-	0x6DDB4B80, 0x6DDA9200, 0x6DD9D880,
-	0x6DD91F00, 0x6DD86580, 0x6DD7AC00,
-	0x6DD6F280, 0x6DD63900, 0x6DD57F80,
-	0x6DD4C600, 0x6DD40C80, 0x6DD35300,
-	0x6DD29980, 0x6DD1E000, 0x6DD12680,
-	0x6DD06D00, 0x6DCFB380, 0x6DCEFA00,
-	0x6DCE4080, 0x6DCD8700, 0x6DCCCD80,
-	0x6DCC1400, 0x6DCB5A80, 0x6DCAA100,
-	0x6DC9E780, 0x6DC92E00, 0x6DC87480,
-	0x6DC7BB00, 0x6DC70180, 0x6DC64800,
-	0x6DC58E80, 0x6DC4D500, 0x6DC41B80,
-	0x6DC36200, 0x6DC2A880, 0x6DC1EF00,
-	0x6DC13580, 0x6DC07C00, 0x6DBFC280,
-	0x6DBF0900, 0x6DBE4F80, 0x6DBD9600,
-	0x6DBCDC80, 0x6DBC2300, 0x6DBB6980,
-	0x6DBAB000, 0x6DB9F680, 0x6DB93D00,
-	0x6DB88380, 0x6DB7CA00, 0x6DB71080,
-	0x6DB65700, 0x6DB59D80, 0x6DB4E400,
-	0x6DB42A80, 0x6DB37100, 0x6DB2B780,
-	0x6DB1FE00, 0x6DB14480, 0x6DB08B00,
-	0x6DAFD180, 0x6DAF1800, 0x6DAE5E80,
-	0x6DADA500, 0x6DACEB80, 0x6DAC3200,
-	0x6DAB7880, 0x6DAABF00, 0x6DAA0580,
-	0x6DA94C00, 0x6DA89280, 0x6DA7D900,
-	0x6DA71F80, 0x6DA66600, 0x6DA5AC80,
-	0x6DA4F300, 0x6DA43980, 0x6DA38000,
-	0x6DA2C680, 0x6DA20D00, 0x6DA15380,
-	0x6DA09A00, 0x6D9FE080, 0x6D9F2700,
-	0x6D9E6D80, 0x6D9DB400, 0x6D9CFA80,
-	0x6D9C4100, 0x6D9B8780, 0x6D9ACE00,
-	0x6D9A1480, 0x6D995B00, 0x6D98A180,
-	0x6D97E800, 0x6D972E80, 0x6D967500,
-	0x6D95BB80, 0x6D950200, 0x6D944880,
-	0x6D938F00, 0x6D92D580, 0x6D921C00,
-	0x6D916280, 0x6D90A900, 0x6D8FEF80,
-	0x6D8F3600, 0x6D8E7C80, 0x6D8DC300,
-	0x6D8D0980, 0x6D8C5000, 0x6D8B9680,
-	0x6D8ADD00, 0x6D8A2380, 0x6D896A00,
-	0x6D88B080, 0x6D87F700, 0x6D873D80,
-	0x6D868400, 0x6D85CA80, 0x6D851100,
-	0x6D845780, 0x6D839E00, 0x6D82E480,
-	0x6D822B00, 0x6D817180, 0x6D80B800,
-	0x6D7FFE80, 0x6D7F4500, 0x6D7E8B80,
-	0x6D7DD200, 0x6D7D1880, 0x6D7C5F00,
-	0x6D7BA580, 0x6D7AEC00, 0x6D7A3280,
-	0x6D797900, 0x6D78BF80, 0x6D780600,
-	0x6D774C80, 0x6D769300, 0x6D75D980,
-	0x6D752000, 0x6D746680, 0x6D73AD00,
-	0x6D72F380, 0x6D723A00, 0x6D718080,
-	0x6D70C700, 0x6D700D80, 0x6D6F5400,
-	0x6D6E9A80, 0x6D6DE100, 0x6D6D2780,
-	0x6D6C6E00, 0x6D6BB480, 0x6D6AFB00,
-	0x6D6A4180, 0x6D698800, 0x6D68CE80,
-	0x6D681500, 0x6D675B80, 0x6D66A200,
-	0x6D65E880, 0x6D652F00, 0x6D647580,
-	0x6D63BC00, 0x6D630280, 0x6D624900,
-	0x6D618F80, 0x6D60D600, 0x6D601C80,
-	0x6D5F6300, 0x6D5EA980, 0x6D5DF000,
-	0x6D5D3680, 0x6D5C7D00, 0x6D5BC380,
-	0x6D5B0A00, 0x6D5A5080, 0x6D599700,
-	0x6D58DD80, 0x6D582400, 0x6D576A80,
-	0x6D56B100, 0x6D55F780, 0x6D553E00,
-	0x6D548480, 0x6D53CB00, 0x6D531180,
-	0x6D525800, 0x6D519E80, 0x6D50E500,
-	0x6D502B80, 0x6D4F7200, 0x6D4EB880,
-	0x6D4DFF00, 0x6D4D4580, 0x6D4C8C00,
-	0x6D4BD280, 0x6D4B1900, 0x6D4A5F80,
-	0x6D49A600, 0x6D48EC80, 0x6D483300,
-	0x6D477980, 0x6D46C000, 0x6D460680,
-	0x6D454D00, 0x6D449380, 0x6D43DA00,
-	0x6D432080, 0x6D426700, 0x6D41AD80,
-	0x6D40F400, 0x6D403A80, 0x6D3F8100,
-	0x6D3EC780, 0x6D3E0E00, 0x6D3D5480,
-	0x6D3C9B00, 0x6D3BE180, 0x6D3B2800,
-	0x6D3A6E80, 0x6D39B500, 0x6D38FB80,
-	0x6D384200, 0x6D378880, 0x6D36CF00,
-	0x6D361580, 0x6D355C00, 0x6D34A280,
-	0x6D33E900, 0x6D332F80, 0x6D327600,
-	0x6D31BC80, 0x6D310300, 0x6D304980,
-	0x6D2F9000, 0x6D2ED680, 0x6D2E1D00,
-	0x6D2D6380, 0x6D2CAA00, 0x6D2BF080,
-	0x6D2B3700, 0x6D2A7D80, 0x6D29C400,
-	0x6D290A80, 0x6D285100, 0x6D279780,
-	0x6D26DE00, 0x6D262480, 0x6D256B00,
-	0x6D24B180, 0x6D23F800, 0x6D233E80,
-	0x6D228500, 0x6D21CB80, 0x6D211200,
-	0x6D205880, 0x6D1F9F00, 0x6D1EE580,
-	0x6D1E2C00, 0x6D1D7280, 0x6D1CB900,
-	0x6D1BFF80, 0x6D1B4600, 0x6D1A8C80,
-	0x6D19D300, 0x6D191980, 0x6D186000,
-	0x6D17A680, 0x6D16ED00, 0x6D163380,
-	0x6D157A00, 0x6D14C080, 0x6D140700,
-	0x6D134D80, 0x6D129400, 0x6D11DA80,
-	0x6D112100, 0x6D106780, 0x6D0FAE00,
-	0x6D0EF480, 0x6D0E3B00, 0x6D0D8180,
-	0x6D0CC800, 0x6D0C0E80, 0x6D0B5500,
-	0x6D0A9B80, 0x6D09E200, 0x6D092880,
-	0x6D086F00, 0x6D07B580, 0x6D06FC00,
-	0x6D064280, 0x6D058900, 0x6D04CF80,
-	0x6D041600, 0x6D035C80, 0x6D02A300,
-	0x6D01E980, 0x6D013000, 0x6D007680,
-	0x6CFFBD00, 0x6CFF0380, 0x6CFE4A00,
-	0x6CFD9080, 0x6CFCD700, 0x6CFC1D80,
-	0x6CFB6400, 0x6CFAAA80, 0x6CF9F100,
-	0x6CF93780, 0x6CF87E00, 0x6CF7C480,
-	0x6CF70B00, 0x6CF65180, 0x6CF59800,
-	0x6CF4DE80, 0x6CF42500, 0x6CF36B80,
-	0x6CF2B200, 0x6CF1F880, 0x6CF13F00,
-	0x6CF08580, 0x6CEFCC00, 0x6CEF1280,
-	0x6CEE5900, 0x6CED9F80, 0x6CECE600,
-	0x6CEC2C80, 0x6CEB7300, 0x6CEAB980,
-	0x6CEA0000, 0x6CE94680, 0x6CE88D00,
-	0x6CE7D380, 0x6CE71A00, 0x6CE66080,
-	0x6CE5A700, 0x6CE4ED80, 0x6CE43400,
-	0x6CE37A80, 0x6CE2C100, 0x6CE20780,
-	0x6CE14E00, 0x6CE09480, 0x6CDFDB00,
-	0x6CDF2180, 0x6CDE6800, 0x6CDDAE80,
-	0x6CDCF500, 0x6CDC3B80, 0x6CDB8200,
-	0x6CDAC880, 0x6CDA0F00, 0x6CD95580,
-	0x6CD89C00, 0x6CD7E280, 0x6CD72900,
-	0x6CD66F80, 0x6CD5B600, 0x6CD4FC80,
-	0x6CD44300, 0x6CD38980, 0x6CD2D000,
-	0x6CD21680, 0x6CD15D00, 0x6CD0A380,
-	0x6CCFEA00, 0x6CCF3080, 0x6CCE7700,
-	0x6CCDBD80, 0x6CCD0400, 0x6CCC4A80,
-	0x6CCB9100, 0x6CCAD780, 0x6CCA1E00,
-	0x6CC96480, 0x6CC8AB00, 0x6CC7F180,
-	0x6CC73800, 0x6CC67E80, 0x6CC5C500,
-	0x6CC50B80, 0x6CC45200, 0x6CC39880,
-	0x6CC2DF00, 0x6CC22580, 0x6CC16C00,
-	0x6CC0B280, 0x6CBFF900, 0x6CBF3F80,
-	0x6CBE8600, 0x6CBDCC80, 0x6CBD1300,
-	0x6CBC5980, 0x6CBBA000, 0x6CBAE680,
-	0x6CBA2D00, 0x6CB97380, 0x6CB8BA00,
-	0x6CB80080, 0x6CB74700, 0x6CB68D80,
-	0x6CB5D400, 0x6CB51A80, 0x6CB46100,
-	0x6CB3A780, 0x6CB2EE00, 0x6CB23480,
-	0x6CB17B00, 0x6CB0C180, 0x6CB00800,
-	0x6CAF4E80, 0x6CAE9500, 0x6CADDB80,
-	0x6CAD2200, 0x6CAC6880, 0x6CABAF00,
-	0x6CAAF580, 0x6CAA3C00, 0x6CA98280,
-	0x6CA8C900, 0x6CA80F80, 0x6CA75600,
-	0x6CA69C80, 0x6CA5E300, 0x6CA52980,
-	0x6CA47000, 0x6CA3B680, 0x6CA2FD00,
-	0x6CA24380, 0x6CA18A00, 0x6CA0D080,
-	0x6CA01700, 0x6C9F5D80, 0x6C9EA400,
-	0x6C9DEA80, 0x6C9D3100, 0x6C9C7780,
-	0x6C9BBE00, 0x6C9B0480, 0x6C9A4B00,
-	0x6C999180, 0x6C98D800, 0x6C981E80,
-	0x6C976500, 0x6C96AB80, 0x6C95F200,
-	0x6C953880, 0x6C947F00, 0x6C93C580,
-	0x6C930C00, 0x6C925280, 0x6C919900,
-	0x6C90DF80, 0x6C902600, 0x6C8F6C80,
-	0x6C8EB300, 0x6C8DF980, 0x6C8D4000,
-	0x6C8C8680, 0x6C8BCD00, 0x6C8B1380,
-	0x6C8A5A00, 0x6C89A080, 0x6C88E700,
-	0x6C882D80, 0x6C877400, 0x6C86BA80,
-	0x6C860100, 0x6C854780, 0x6C848E00,
-	0x6C83D480, 0x6C831B00, 0x6C826180,
-	0x6C81A800, 0x6C80EE80, 0x6C803500,
-	0x6C7F7B80, 0x6C7EC200, 0x6C7E0880,
-	0x6C7D4F00, 0x6C7C9580, 0x6C7BDC00,
-	0x6C7B2280, 0x6C7A6900, 0x6C79AF80,
-	0x6C78F600, 0x6C783C80, 0x6C778300,
-	0x6C76C980, 0x6C761000, 0x6C755680,
-	0x6C749D00, 0x6C73E380, 0x6C732A00,
-	0x6C727080, 0x6C71B700, 0x6C70FD80,
-	0x6C704400, 0x6C6F8A80, 0x6C6ED100,
-	0x6C6E1780, 0x6C6D5E00, 0x6C6CA480,
-	0x6C6BEB00, 0x6C6B3180, 0x6C6A7800,
-	0x6C69BE80, 0x6C690500, 0x6C684B80,
-	0x6C679200, 0x6C66D880, 0x6C661F00,
-	0x6C656580, 0x6C64AC00, 0x6C63F280,
-	0x6C633900, 0x6C627F80, 0x6C61C600,
-	0x6C610C80, 0x6C605300, 0x6C5F9980,
-	0x6C5EE000, 0x6C5E2680, 0x6C5D6D00,
-	0x6C5CB380, 0x6C5BFA00, 0x6C5B4080,
-	0x6C5A8700, 0x6C59CD80, 0x6C591400,
-	0x6C585A80, 0x6C57A100, 0x6C56E780,
-	0x6C562E00, 0x6C557480, 0x6C54BB00,
-	0x6C540180, 0x6C534800, 0x6C528E80,
-	0x6C51D500, 0x6C511B80, 0x6C506200,
-	0x6C4FA880, 0x6C4EEF00, 0x6C4E3580,
-	0x6C4D7C00, 0x6C4CC280, 0x6C4C0900,
-	0x6C4B4F80, 0x6C4A9600, 0x6C49DC80,
-	0x6C492300, 0x6C486980, 0x6C47B000,
-	0x6C46F680, 0x6C463D00, 0x6C458380,
-	0x6C44CA00, 0x6C441080, 0x6C435700,
-	0x6C429D80, 0x6C41E400, 0x6C412A80,
-	0x6C407100, 0x6C3FB780, 0x6C3EFE00,
-	0x6C3E4480, 0x6C3D8B00, 0x6C3CD180,
-	0x6C3C1800, 0x6C3B5E80, 0x6C3AA500,
-	0x6C39EB80, 0x6C393200, 0x6C387880,
-	0x6C37BF00, 0x6C370580, 0x6C364C00,
-	0x6C359280, 0x6C34D900, 0x6C341F80,
-	0x6C336600, 0x6C32AC80, 0x6C31F300,
-	0x6C313980, 0x6C308000, 0x6C2FC680,
-	0x6C2F0D00, 0x6C2E5380, 0x6C2D9A00,
-	0x6C2CE080, 0x6C2C2700, 0x6C2B6D80,
-	0x6C2AB400, 0x6C29FA80, 0x6C294100,
-	0x6C288780, 0x6C27CE00, 0x6C271480,
-	0x6C265B00, 0x6C25A180, 0x6C24E800,
-	0x6C242E80, 0x6C237500, 0x6C22BB80,
-	0x6C220200, 0x6C214880, 0x6C208F00,
-	0x6C1FD580, 0x6C1F1C00, 0x6C1E6280,
-	0x6C1DA900, 0x6C1CEF80, 0x6C1C3600,
-	0x6C1B7C80, 0x6C1AC300, 0x6C1A0980,
-	0x6C195000, 0x6C189680, 0x6C17DD00,
-	0x6C172380, 0x6C166A00, 0x6C15B080,
-	0x6C14F700, 0x6C143D80, 0x6C138400,
-	0x6C12CA80, 0x6C121100, 0x6C115780,
-	0x6C109E00, 0x6C0FE480, 0x6C0F2B00,
-	0x6C0E7180, 0x6C0DB800, 0x6C0CFE80,
-	0x6C0C4500, 0x6C0B8B80, 0x6C0AD200,
-	0x6C0A1880, 0x6C095F00, 0x6C08A580,
-	0x6C07EC00, 0x6C073280, 0x6C067900,
-	0x6C05BF80, 0x6C050600, 0x6C044C80,
-	0x6C039300, 0x6C02D980, 0x6C022000,
-	0x6C016680, 0x6C00AD00, 0x6BFFF380,
-	0x6BFF3A00, 0x6BFE8080, 0x6BFDC700,
-	0x6BFD0D80, 0x6BFC5400, 0x6BFB9A80,
-	0x6BFAE100, 0x6BFA2780, 0x6BF96E00,
-	0x6BF8B480, 0x6BF7FB00, 0x6BF74180,
-	0x6BF68800, 0x6BF5CE80, 0x6BF51500,
-	0x6BF45B80, 0x6BF3A200, 0x6BF2E880,
-	0x6BF22F00, 0x6BF17580, 0x6BF0BC00,
-	0x6BF00280, 0x6BEF4900, 0x6BEE8F80,
-	0x6BEDD600, 0x6BED1C80, 0x6BEC6300,
-	0x6BEBA980, 0x6BEAF000, 0x6BEA3680,
-	0x6BE97D00, 0x6BE8C380, 0x6BE80A00,
-	0x6BE75080, 0x6BE69700, 0x6BE5DD80,
-	0x6BE52400, 0x6BE46A80, 0x6BE3B100,
-	0x6BE2F780, 0x6BE23E00, 0x6BE18480,
-	0x6BE0CB00, 0x6BE01180, 0x6BDF5800,
-	0x6BDE9E80, 0x6BDDE500, 0x6BDD2B80,
-	0x6BDC7200, 0x6BDBB880, 0x6BDAFF00,
-	0x6BDA4580, 0x6BD98C00, 0x6BD8D280,
-	0x6BD81900, 0x6BD75F80, 0x6BD6A600,
-	0x6BD5EC80, 0x6BD53300, 0x6BD47980,
-	0x6BD3C000, 0x6BD30680, 0x6BD24D00,
-	0x6BD19380, 0x6BD0DA00, 0x6BD02080,
-	0x6BCF6700, 0x6BCEAD80, 0x6BCDF400,
-	0x6BCD3A80, 0x6BCC8100, 0x6BCBC780,
-	0x6BCB0E00, 0x6BCA5480, 0x6BC99B00,
-	0x6BC8E180, 0x6BC82800, 0x6BC76E80,
-	0x6BC6B500, 0x6BC5FB80, 0x6BC54200,
-	0x6BC48880, 0x6BC3CF00, 0x6BC31580,
-	0x6BC25C00, 0x6BC1A280, 0x6BC0E900,
-	0x6BC02F80, 0x6BBF7600, 0x6BBEBC80,
-	0x6BBE0300, 0x6BBD4980, 0x6BBC9000,
-	0x6BBBD680, 0x6BBB1D00, 0x6BBA6380,
-	0x6BB9AA00, 0x6BB8F080, 0x6BB83700,
-	0x6BB77D80, 0x6BB6C400, 0x6BB60A80,
-	0x6BB55100, 0x6BB49780, 0x6BB3DE00,
-	0x6BB32480, 0x6BB26B00, 0x6BB1B180,
-	0x6BB0F800, 0x6BB03E80, 0x6BAF8500,
-	0x6BAECB80, 0x6BAE1200, 0x6BAD5880,
-	0x6BAC9F00, 0x6BABE580, 0x6BAB2C00,
-	0x6BAA7280, 0x6BA9B900, 0x6BA8FF80,
-	0x6BA84600, 0x6BA78C80, 0x6BA6D300,
-	0x6BA61980, 0x6BA56000, 0x6BA4A680,
-	0x6BA3ED00, 0x6BA33380, 0x6BA27A00,
-	0x6BA1C080, 0x6BA10700, 0x6BA04D80,
-	0x6B9F9400, 0x6B9EDA80, 0x6B9E2100,
-	0x6B9D6780, 0x6B9CAE00, 0x6B9BF480,
-	0x6B9B3B00, 0x6B9A8180, 0x6B99C800,
-	0x6B990E80, 0x6B985500, 0x6B979B80,
-	0x6B96E200, 0x6B962880, 0x6B956F00,
-	0x6B94B580, 0x6B93FC00, 0x6B934280,
-	0x6B928900, 0x6B91CF80, 0x6B911600,
-	0x6B905C80, 0x6B8FA300, 0x6B8EE980,
-	0x6B8E3000, 0x6B8D7680, 0x6B8CBD00,
-	0x6B8C0380, 0x6B8B4A00, 0x6B8A9080,
-	0x6B89D700, 0x6B891D80, 0x6B886400,
-	0x6B87AA80, 0x6B86F100, 0x6B863780,
-	0x6B857E00, 0x6B84C480, 0x6B840B00,
-	0x6B835180, 0x6B829800, 0x6B81DE80,
-	0x6B812500, 0x6B806B80, 0x6B7FB200,
-	0x6B7EF880, 0x6B7E3F00, 0x6B7D8580,
-	0x6B7CCC00, 0x6B7C1280, 0x6B7B5900,
-	0x6B7A9F80, 0x6B79E600, 0x6B792C80,
-	0x6B787300, 0x6B77B980, 0x6B770000,
-	0x6B764680, 0x6B758D00, 0x6B74D380,
-	0x6B741A00, 0x6B736080, 0x6B72A700,
-	0x6B71ED80, 0x6B713400, 0x6B707A80,
-	0x6B6FC100, 0x6B6F0780, 0x6B6E4E00,
-	0x6B6D9480, 0x6B6CDB00, 0x6B6C2180,
-	0x6B6B6800, 0x6B6AAE80, 0x6B69F500,
-	0x6B693B80, 0x6B688200, 0x6B67C880,
-	0x6B670F00, 0x6B665580, 0x6B659C00,
-	0x6B64E280, 0x6B642900, 0x6B636F80,
-	0x6B62B600, 0x6B61FC80, 0x6B614300,
-	0x6B608980, 0x6B5FD000, 0x6B5F1680,
-	0x6B5E5D00, 0x6B5DA380, 0x6B5CEA00,
-	0x6B5C3080, 0x6B5B7700, 0x6B5ABD80,
-	0x6B5A0400, 0x6B594A80, 0x6B589100,
-	0x6B57D780, 0x6B571E00, 0x6B566480,
-	0x6B55AB00, 0x6B54F180, 0x6B543800,
-	0x6B537E80, 0x6B52C500, 0x6B520B80,
-	0x6B515200, 0x6B509880, 0x6B4FDF00,
-	0x6B4F2580, 0x6B4E6C00, 0x6B4DB280,
-	0x6B4CF900, 0x6B4C3F80, 0x6B4B8600,
-	0x6B4ACC80, 0x6B4A1300, 0x6B495980,
-	0x6B48A000, 0x6B47E680, 0x6B472D00,
-	0x6B467380, 0x6B45BA00, 0x6B450080,
-	0x6B444700, 0x6B438D80, 0x6B42D400,
-	0x6B421A80, 0x6B416100, 0x6B40A780,
-	0x6B3FEE00, 0x6B3F3480, 0x6B3E7B00,
-	0x6B3DC180, 0x6B3D0800, 0x6B3C4E80,
-	0x6B3B9500, 0x6B3ADB80, 0x6B3A2200,
-	0x6B396880, 0x6B38AF00, 0x6B37F580,
-	0x6B373C00, 0x6B368280, 0x6B35C900,
-	0x6B350F80, 0x6B345600, 0x6B339C80,
-	0x6B32E300, 0x6B322980, 0x6B317000,
-	0x6B30B680, 0x6B2FFD00, 0x6B2F4380,
-	0x6B2E8A00, 0x6B2DD080, 0x6B2D1700,
-	0x6B2C5D80, 0x6B2BA400, 0x6B2AEA80,
-	0x6B2A3100, 0x6B297780, 0x6B28BE00,
-	0x6B280480, 0x6B274B00, 0x6B269180,
-	0x6B25D800, 0x6B251E80, 0x6B246500,
-	0x6B23AB80, 0x6B22F200, 0x6B223880,
-	0x6B217F00, 0x6B20C580, 0x6B200C00,
-	0x6B1F5280, 0x6B1E9900, 0x6B1DDF80,
-	0x6B1D2600, 0x6B1C6C80, 0x6B1BB300,
-	0x6B1AF980, 0x6B1A4000, 0x6B198680,
-	0x6B18CD00, 0x6B181380, 0x6B175A00,
-	0x6B16A080, 0x6B15E700, 0x6B152D80,
-	0x6B147400, 0x6B13BA80, 0x6B130100,
-	0x6B124780, 0x6B118E00, 0x6B10D480,
-	0x6B101B00, 0x6B0F6180, 0x6B0EA800,
-	0x6B0DEE80, 0x6B0D3500, 0x6B0C7B80,
-	0x6B0BC200, 0x6B0B0880, 0x6B0A4F00,
-	0x6B099580, 0x6B08DC00, 0x6B082280,
-	0x6B076900, 0x6B06AF80, 0x6B05F600,
-	0x6B053C80, 0x6B048300, 0x6B03C980,
-	0x6B031000, 0x6B025680, 0x6B019D00,
-	0x6B00E380, 0x6B002A00, 0x6AFF7080,
-	0x6AFEB700, 0x6AFDFD80, 0x6AFD4400,
-	0x6AFC8A80, 0x6AFBD100, 0x6AFB1780,
-	0x6AFA5E00, 0x6AF9A480, 0x6AF8EB00,
-	0x6AF83180, 0x6AF77800, 0x6AF6BE80,
-	0x6AF60500, 0x6AF54B80, 0x6AF49200,
-	0x6AF3D880, 0x6AF31F00, 0x6AF26580,
-	0x6AF1AC00, 0x6AF0F280, 0x6AF03900,
-	0x6AEF7F80, 0x6AEEC600, 0x6AEE0C80,
-	0x6AED5300, 0x6AEC9980, 0x6AEBE000,
-	0x6AEB2680, 0x6AEA6D00, 0x6AE9B380,
-	0x6AE8FA00, 0x6AE84080, 0x6AE78700,
-	0x6AE6CD80, 0x6AE61400, 0x6AE55A80,
-	0x6AE4A100, 0x6AE3E780, 0x6AE32E00,
-	0x6AE27480, 0x6AE1BB00, 0x6AE10180,
-	0x6AE04800, 0x6ADF8E80, 0x6ADED500,
-	0x6ADE1B80, 0x6ADD6200, 0x6ADCA880,
-	0x6ADBEF00, 0x6ADB3580, 0x6ADA7C00,
-	0x6AD9C280, 0x6AD90900, 0x6AD84F80,
-	0x6AD79600, 0x6AD6DC80, 0x6AD62300,
-	0x6AD56980, 0x6AD4B000, 0x6AD3F680,
-	0x6AD33D00, 0x6AD28380, 0x6AD1CA00,
-	0x6AD11080, 0x6AD05700, 0x6ACF9D80,
-	0x6ACEE400, 0x6ACE2A80, 0x6ACD7100,
-	0x6ACCB780, 0x6ACBFE00, 0x6ACB4480,
-	0x6ACA8B00, 0x6AC9D180, 0x6AC91800,
-	0x6AC85E80, 0x6AC7A500, 0x6AC6EB80,
-	0x6AC63200, 0x6AC57880, 0x6AC4BF00,
-	0x6AC40580, 0x6AC34C00, 0x6AC29280,
-	0x6AC1D900, 0x6AC11F80, 0x6AC06600,
-	0x6ABFAC80, 0x6ABEF300, 0x6ABE3980,
-	0x6ABD8000, 0x6ABCC680, 0x6ABC0D00,
-	0x6ABB5380, 0x6ABA9A00, 0x6AB9E080,
-	0x6AB92700, 0x6AB86D80, 0x6AB7B400,
-	0x6AB6FA80, 0x6AB64100, 0x6AB58780,
-	0x6AB4CE00, 0x6AB41480, 0x6AB35B00,
-	0x6AB2A180, 0x6AB1E800, 0x6AB12E80,
-	0x6AB07500, 0x6AAFBB80, 0x6AAF0200,
-	0x6AAE4880, 0x6AAD8F00, 0x6AACD580,
-	0x6AAC1C00, 0x6AAB6280, 0x6AAAA900,
-	0x6AA9EF80, 0x6AA93600, 0x6AA87C80,
-	0x6AA7C300, 0x6AA70980, 0x6AA65000,
-	0x6AA59680, 0x6AA4DD00, 0x6AA42380,
-	0x6AA36A00, 0x6AA2B080, 0x6AA1F700,
-	0x6AA13D80, 0x6AA08400, 0x6A9FCA80,
-	0x6A9F1100, 0x6A9E5780, 0x6A9D9E00,
-	0x6A9CE480, 0x6A9C2B00, 0x6A9B7180,
-	0x6A9AB800, 0x6A99FE80, 0x6A994500,
-	0x6A988B80, 0x6A97D200, 0x6A971880,
-	0x6A965F00, 0x6A95A580, 0x6A94EC00,
-	0x6A943280, 0x6A937900, 0x6A92BF80,
-	0x6A920600, 0x6A914C80, 0x6A909300,
-	0x6A8FD980, 0x6A8F2000, 0x6A8E6680,
-	0x6A8DAD00, 0x6A8CF380, 0x6A8C3A00,
-	0x6A8B8080, 0x6A8AC700, 0x6A8A0D80,
-	0x6A895400, 0x6A889A80, 0x6A87E100,
-	0x6A872780, 0x6A866E00, 0x6A85B480,
-	0x6A84FB00, 0x6A844180, 0x6A838800,
-	0x6A82CE80, 0x6A821500, 0x6A815B80,
-	0x6A80A200, 0x6A7FE880, 0x6A7F2F00,
-	0x6A7E7580, 0x6A7DBC00, 0x6A7D0280,
-	0x6A7C4900, 0x6A7B8F80, 0x6A7AD600,
-	0x6A7A1C80, 0x6A796300, 0x6A78A980,
-	0x6A77F000, 0x6A773680, 0x6A767D00,
-	0x6A75C380, 0x6A750A00, 0x6A745080,
-	0x6A739700, 0x6A72DD80, 0x6A722400,
-	0x6A716A80, 0x6A70B100, 0x6A6FF780,
-	0x6A6F3E00, 0x6A6E8480, 0x6A6DCB00,
-	0x6A6D1180, 0x6A6C5800, 0x6A6B9E80,
-	0x6A6AE500, 0x6A6A2B80, 0x6A697200,
-	0x6A68B880, 0x6A67FF00, 0x6A674580,
-	0x6A668C00, 0x6A65D280, 0x6A651900,
-	0x6A645F80, 0x6A63A600, 0x6A62EC80,
-	0x6A623300, 0x6A617980, 0x6A60C000,
-	0x6A600680, 0x6A5F4D00, 0x6A5E9380,
-	0x6A5DDA00, 0x6A5D2080, 0x6A5C6700,
-	0x6A5BAD80, 0x6A5AF400, 0x6A5A3A80,
-	0x6A598100, 0x6A58C780, 0x6A580E00,
-	0x6A575480, 0x6A569B00, 0x6A55E180,
-	0x6A552800, 0x6A546E80, 0x6A53B500,
-	0x6A52FB80, 0x6A524200, 0x6A518880,
-	0x6A50CF00, 0x6A501580, 0x6A4F5C00,
-	0x6A4EA280, 0x6A4DE900, 0x6A4D2F80,
-	0x6A4C7600, 0x6A4BBC80, 0x6A4B0300,
-	0x6A4A4980, 0x6A499000, 0x6A48D680,
-	0x6A481D00, 0x6A476380, 0x6A46AA00,
-	0x6A45F080, 0x6A453700, 0x6A447D80,
-	0x6A43C400, 0x6A430A80, 0x6A425100,
-	0x6A419780, 0x6A40DE00, 0x6A402480,
-	0x6A3F6B00, 0x6A3EB180, 0x6A3DF800,
-	0x6A3D3E80, 0x6A3C8500, 0x6A3BCB80,
-	0x6A3B1200, 0x6A3A5880, 0x6A399F00,
-	0x6A38E580, 0x6A382C00, 0x6A377280,
-	0x6A36B900, 0x6A35FF80, 0x6A354600,
-	0x6A348C80, 0x6A33D300, 0x6A331980,
-	0x6A326000, 0x6A31A680, 0x6A30ED00,
-	0x6A303380, 0x6A2F7A00, 0x6A2EC080,
-	0x6A2E0700, 0x6A2D4D80, 0x6A2C9400,
-	0x6A2BDA80, 0x6A2B2100, 0x6A2A6780,
-	0x6A29AE00, 0x6A28F480, 0x6A283B00,
-	0x6A278180, 0x6A26C800, 0x6A260E80,
-	0x6A255500, 0x6A249B80, 0x6A23E200,
-	0x6A232880, 0x6A226F00, 0x6A21B580,
-	0x6A20FC00, 0x6A204280, 0x6A1F8900,
-	0x6A1ECF80, 0x6A1E1600, 0x6A1D5C80,
-	0x6A1CA300, 0x6A1BE980, 0x6A1B3000,
-	0x6A1A7680, 0x6A19BD00, 0x6A190380,
-	0x6A184A00, 0x6A179080, 0x6A16D700,
-	0x6A161D80, 0x6A156400, 0x6A14AA80,
-	0x6A13F100, 0x6A133780, 0x6A127E00,
-	0x6A11C480, 0x6A110B00, 0x6A105180,
-	0x6A0F9800, 0x6A0EDE80, 0x6A0E2500,
-	0x6A0D6B80, 0x6A0CB200, 0x6A0BF880,
-	0x6A0B3F00, 0x6A0A8580, 0x6A09CC00,
-	0x6A091280, 0x6A085900, 0x6A079F80,
-	0x6A06E600, 0x6A062C80, 0x6A057300,
-	0x6A04B980
-};
diff --git a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h
deleted file mode 100644
index 4785eda56f..0000000000
--- a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Gekko related unions, structs, ...
-
-#ifndef _LUT_frsqrtex_h_
-#define _LUT_frsqrtex_h_
-
-extern const unsigned int frsqrtex_lut[65536];
-
-#endif //_LUT_frsqrtex_h_
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
deleted file mode 100644
index 8299bc0b82..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-#include <queue>
-
-#include "StringUtil.h"
-#include "Interpreter/Interpreter.h"
-#include "../HW/Memmap.h"
-#include "JitInterface.h"
-#include "PPCTables.h"
-#include "PPCSymbolDB.h"
-#include "SignatureDB.h"
-#include "PPCAnalyst.h"
-#include "../ConfigManager.h"
-#include "../GeckoCode.h"
-
-// Analyzes PowerPC code in memory to find functions
-// After running, for each function we will know what functions it calls
-// and what functions calls it. That is, we will have an incomplete call graph,
-// but only missing indirect branches.
-
-// The results of this analysis is displayed in the code browsing sections at the bottom left
-// of the disassembly window (debugger).
-
-// It is also useful for finding function boundaries so that we can find, fingerprint and detect library functions.
-// We don't do this much currently. Only for the special case Super Monkey Ball.
-
-namespace PPCAnalyst {
-
-using namespace std;
-
-static const int CODEBUFFER_SIZE = 32000;
-// 0 does not perform block merging
-static const int FUNCTION_FOLLOWING_THRESHOLD = 16;
-
-CodeBuffer::CodeBuffer(int size)
-{
-	codebuffer = new PPCAnalyst::CodeOp[size];
-	size_ = size;
-}
-
-CodeBuffer::~CodeBuffer()
-{
-	delete[] codebuffer;
-}
-
-void AnalyzeFunction2(Symbol &func);
-u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc);
-
-#define INVALID_TARGET ((u32)-1)
-
-u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc)
-{
-	switch (instr.OPCD)
-	{
-	case 18://branch instruction
-		{
-			u32 target = SignExt26(instr.LI<<2);
-			if (!instr.AA)
-				target += pc;
-
-			return target;
-		}
-	default:
-		return INVALID_TARGET;
-	}
-}
-
-//To find the size of each found function, scan
-//forward until we hit blr. In the meantime, collect information
-//about which functions this function calls.
-//Also collect which internal branch goes the farthest
-//If any one goes farther than the blr, assume that there is more than
-//one blr, and keep scanning.
-
-bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size)
-{
-	if (!func.name.size())
-		func.name = StringFromFormat("zz_%07x_", startAddr & 0x0FFFFFF);
-	if (func.analyzed >= 1)
-		return true;  // No error, just already did it.
-
-	func.calls.clear();
-	func.callers.clear();
-	func.size = 0;
-	func.flags = FFLAG_LEAF;
-	u32 addr = startAddr; 
-	
-	u32 farthestInternalBranchTarget = startAddr;
-	int numInternalBranches = 0;
-	while (true)
-	{
-		func.size += 4;
-		if (func.size >= CODEBUFFER_SIZE * 4) //weird
-			return false;
-		
-		UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr);
-		if (max_size && func.size > max_size)
-		{
-			func.address = startAddr;
-			func.analyzed = 1;
-			func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
-			if (numInternalBranches == 0)
-				func.flags |= FFLAG_STRAIGHT;
-			return true;
-		}
-		if (PPCTables::IsValidInstruction(instr))
-		{
-			if (instr.hex == 0x4e800020) //4e800021 is blrl, not the end of a function
-			{
-				//BLR
-				if (farthestInternalBranchTarget > addr)
-				{
-					//bah, not this one, continue..
-				}
-				else
-				{
-					//a final blr!
-					//We're done! Looks like we have a neat valid function. Perfect.
-					//Let's calc the checksum and get outta here
-					func.address = startAddr;
-					func.analyzed = 1;
-					func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
-					if (numInternalBranches == 0)
-						func.flags |= FFLAG_STRAIGHT;
-					return true;
-				}
-			}
-			/*
-			else if ((instr.hex & 0xFC000000) == (0x4b000000 & 0xFC000000) && !instr.LK) {
-				u32 target = addr + SignExt26(instr.LI << 2);
-				if (target < startAddr || (max_size && target > max_size+startAddr))
-				{
-					//block ends by branching away. We're done!
-					func.size *= 4; // into bytes
-					func.address = startAddr;
-					func.analyzed = 1;
-					func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
-					if (numInternalBranches == 0)
-						func.flags |= FFLAG_STRAIGHT;
-					return true;
-				}
-			}*/
-			else if (instr.hex == 0x4e800021 || instr.hex == 0x4e800420 || instr.hex == 0x4e800421)
-			{
-				func.flags &= ~FFLAG_LEAF;
-				func.flags |= FFLAG_EVIL;
-			}
-			else if (instr.hex == 0x4c000064)
-			{
-				func.flags &= ~FFLAG_LEAF;
-				func.flags |= FFLAG_RFI;
-			}
-			else 
-			{
-				if (instr.OPCD == 16)
-				{
-					u32 target = SignExt16(instr.BD << 2);
-					
-					if (!instr.AA)
-						target += addr;
-
-					if (target > farthestInternalBranchTarget && !instr.LK)
-					{
-						farthestInternalBranchTarget = target;
-					}
-					numInternalBranches++;
-				}
-				else
-				{
-					u32 target = EvaluateBranchTarget(instr, addr);
-					if (target != INVALID_TARGET && instr.LK)
-					{
-						//we found a branch-n-link!
-						func.calls.push_back(SCall(target,addr));
-						func.flags &= ~FFLAG_LEAF;
-					}
-				}
-			}
-		}
-		else
-		{
-			return false;
-		}
-		addr += 4;
-	}
-}
-
-
-// Second pass analysis, done after the first pass is done for all functions
-// so we have more information to work with
-void AnalyzeFunction2(Symbol *func)
-{
-	u32 flags = func->flags;
-
-	bool nonleafcall = false;
-	for (size_t i = 0; i < func->calls.size(); i++)
-	{
-		SCall c = func->calls[i];
-		Symbol *called_func = g_symbolDB.GetSymbolFromAddr(c.function);
-		if (called_func && (called_func->flags & FFLAG_LEAF) == 0)
-		{
-			nonleafcall = true;
-			break;
-		}
-	}
-
-	if (nonleafcall && !(flags & FFLAG_EVIL) && !(flags & FFLAG_RFI))
-		flags |= FFLAG_ONLYCALLSNICELEAFS;
-
-	func->flags = flags;
-}
-
-// IMPORTANT - CURRENTLY ASSUMES THAT A IS A COMPARE
-bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b)
-{
-	const GekkoOPInfo *b_info = b.opinfo;
-	int b_flags = b_info->flags;
-	if (b_flags & (FL_SET_CRx | FL_ENDBLOCK | FL_TIMER | FL_EVIL))
-		return false;
-	if ((b_flags & (FL_RC_BIT | FL_RC_BIT_F)) && (b.inst.hex & 1))
-		return false;
-
-	switch (b.inst.OPCD)
-	{
-	case 16:
-	case 18:
-		//branches. Do not swap.
-	case 17: //sc
-	case 46: //lmw
-	case 19: //table19 - lots of tricky stuff
-		return false;
-	}
-
-	// For now, only integer ops acceptable. Any instruction which can raise an
-	// interrupt is *not* a possible swap candidate: see [1] for an example of
-	// a crash caused by this error.
-	//
-	// [1] https://code.google.com/p/dolphin-emu/issues/detail?id=5864#c7
-	if (b_info->type != OPTYPE_INTEGER)
-		return false;
-
-	// Check that we have no register collisions.
-	// That is, check that none of b's outputs matches any of a's inputs,
-	// and that none of a's outputs matches any of b's inputs.
-	// The latter does not apply if a is a cmp, of course, but doesn't hurt to check.
-	for (int j = 0; j < 3; j++)
-	{
-		int regInA = a.regsIn[j];
-		int regInB = b.regsIn[j];
-		if (regInA >= 0 && 
-			(b.regsOut[0] == regInA ||
-			 b.regsOut[1] == regInA))
-		{
-			// reg collision! don't swap
-			return false;
-		}
-		if (regInB >= 0 &&
-			(a.regsOut[0] == regInB ||
-			 a.regsOut[1] == regInB))
-		{
-			// reg collision! don't swap
-			return false;
-		}
-	}
-
-	return true;
-}
-
-// Does not yet perform inlining - although there are plans for that.
-// Returns the exit address of the next PC
-u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
-			BlockRegStats *fpa, bool &broken_block, CodeBuffer *buffer,
-			int blockSize, u32* merged_addresses,
-			int capacity_of_merged_addresses, int& size_of_merged_addresses)
-{
-	if (capacity_of_merged_addresses < FUNCTION_FOLLOWING_THRESHOLD) {
-		PanicAlert("Capacity of merged_addresses is too small!");
-	}
-	std::fill_n(merged_addresses, capacity_of_merged_addresses, 0);
-	merged_addresses[0] = address;
-	size_of_merged_addresses = 1;
-
-	memset(st, 0, sizeof(*st));
-	
-	// Disabled the following optimization in preference of FAST_ICACHE
-	//UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4);
-	//if (previnst.hex == 0x4e800020)
-	//	st->isFirstBlockOfFunction = true;
-
-	gpa->any = true;
-	fpa->any = false;
-	
-	for (int i = 0; i < 32; i++)
-	{
-		gpa->firstRead[i]  = -1;
-		gpa->firstWrite[i] = -1;
-		gpa->numReads[i] = 0;
-		gpa->numWrites[i] = 0;
-	}
-
-	u32 blockstart = address;
-	int maxsize = blockSize;
-
-	int num_inst = 0;
-	int numFollows = 0;
-	int numCycles = 0;
-
-	CodeOp *code = buffer->codebuffer;
-	bool foundExit = false;
-
-	u32 returnAddress = 0;
-
-	// Used for Gecko CST1 code. (See GeckoCode/GeckoCode.h)
-	// We use std::queue but it is not so slow
-	// because cst1_instructions does not allocate memory so many times.
-	std::queue<UGeckoInstruction> cst1_instructions;
-	const std::map<u32, std::vector<u32> >& inserted_asm_codes =
-		Gecko::GetInsertedAsmCodes();
-
-	// Do analysis of the code, look for dependencies etc
-	int numSystemInstructions = 0;
-	for (int i = 0; i < maxsize; i++)
-	{
-		UGeckoInstruction inst;
-
-		if (!cst1_instructions.empty())
-		{
-			// If the Gecko CST1 instruction queue is not empty,
-			// we consume the first instruction.
-			inst = UGeckoInstruction(cst1_instructions.front());
-			cst1_instructions.pop();
-			address -= 4;
-
-		}
-		else
-		{
-			// If the address is the insertion point of Gecko CST1 code,
-			// we push the code into the instruction queue and
-			// consume the first instruction.
-			std::map<u32, std::vector<u32> >::const_iterator it =
-				inserted_asm_codes.find(address);
-			if (it != inserted_asm_codes.end())
-			{
-				const std::vector<u32>& codes = it->second;
-				for (std::vector<u32>::const_iterator itCur = codes.begin(),
-					itEnd = codes.end(); itCur != itEnd; ++itCur)
-				{
-					cst1_instructions.push(*itCur);
-				}
-				inst = UGeckoInstruction(cst1_instructions.front());
-				cst1_instructions.pop();
-
-			}
-			else
-			{
-				inst = JitInterface::Read_Opcode_JIT(address);
-			}
-		}
-		
-		if (inst.hex != 0)
-		{
-			num_inst++;
-			memset(&code[i], 0, sizeof(CodeOp));
-			GekkoOPInfo *opinfo = GetOpInfo(inst);
-			code[i].opinfo = opinfo;
-			// FIXME: code[i].address may not be correct due to CST1 code.
-			code[i].address = address;
-			code[i].inst = inst;
-			code[i].branchTo = -1;
-			code[i].branchToIndex = -1;
-			code[i].skip = false;
-			numCycles += opinfo->numCyclesMinusOne + 1;
-
-			code[i].wantsCR0 = false;
-			code[i].wantsCR1 = false;
-			code[i].wantsPS1 = false;
-
-			int flags = opinfo->flags;
-
-			if (flags & FL_USE_FPU)
-				fpa->any = true;
-
-			if (flags & FL_TIMER)
-				gpa->anyTimer = true;
-
-			// Does the instruction output CR0?
-			if (flags & FL_RC_BIT)
-				code[i].outputCR0 = inst.hex & 1; //todo fix
-			else if ((flags & FL_SET_CRn) && inst.CRFD == 0)
-				code[i].outputCR0 = true;
-			else
-				code[i].outputCR0 = (flags & FL_SET_CR0) ? true : false;
-
-			// Does the instruction output CR1?
-			if (flags & FL_RC_BIT_F)
-				code[i].outputCR1 = inst.hex & 1; //todo fix
-			else if ((flags & FL_SET_CRn) && inst.CRFD == 1)
-				code[i].outputCR1 = true;
-			else
-				code[i].outputCR1 = (flags & FL_SET_CR1) ? true : false;
-
-			int numOut = 0;
-			int numIn = 0;
-			if (flags & FL_OUT_A)
-			{
-				code[i].regsOut[numOut++] = inst.RA;
-				gpa->SetOutputRegister(inst.RA, i);
-			}
-			if (flags & FL_OUT_D)
-			{
-				code[i].regsOut[numOut++] = inst.RD;
-				gpa->SetOutputRegister(inst.RD, i);
-			}
-			if (flags & FL_OUT_S)
-			{
-				code[i].regsOut[numOut++] = inst.RS;
-				gpa->SetOutputRegister(inst.RS, i);
-			}
-			if ((flags & FL_IN_A) || ((flags & FL_IN_A0) && inst.RA != 0))
-			{
-				code[i].regsIn[numIn++] = inst.RA;
-				gpa->SetInputRegister(inst.RA, i);
-			}
-			if (flags & FL_IN_B)
-			{
-				code[i].regsIn[numIn++] = inst.RB;
-				gpa->SetInputRegister(inst.RB, i);
-			}
-			if (flags & FL_IN_C)
-			{
-				code[i].regsIn[numIn++] = inst.RC;
-				gpa->SetInputRegister(inst.RC, i);
-			}
-			if (flags & FL_IN_S)
-			{
-				code[i].regsIn[numIn++] = inst.RS;
-				gpa->SetInputRegister(inst.RS, i);
-			}
-
-			// Set remaining register slots as unused (-1)
-			for (int j = numIn; j < 3; j++)
-				code[i].regsIn[j] = -1;
-			for (int j = numOut; j < 2; j++)
-				code[i].regsOut[j] = -1;
-			for (int j = 0; j < 3; j++)
-				code[i].fregsIn[j] = -1;
-			code[i].fregOut = -1;
-
-			switch (opinfo->type) 
-			{
-			case OPTYPE_INTEGER:
-			case OPTYPE_LOAD:
-			case OPTYPE_STORE:
-			case OPTYPE_LOADFP:
-			case OPTYPE_STOREFP:
-				break;
-			case OPTYPE_FPU:
-				break;
-			case OPTYPE_BRANCH:
-				if (code[i].inst.hex == 0x4e800020)
-				{
-					// For analysis purposes, we can assume that blr eats flags.
-					code[i].outputCR0 = true;
-					code[i].outputCR1 = true;
-				}
-				break;
-			case OPTYPE_SYSTEM:
-			case OPTYPE_SYSTEMFP:
-				numSystemInstructions++;
-				break;
-			}
-
-			bool follow = false;
-			u32 destination = 0;
-			if (inst.OPCD == 18 && blockSize > 1)
-			{
-				//Is bx - should we inline? yes!
-				if (inst.AA)
-					destination = SignExt26(inst.LI << 2);
-				else
-					destination = address + SignExt26(inst.LI << 2);
-				if (destination != blockstart)
-					follow = true;
-			}
-			else if (inst.OPCD == 19 && inst.SUBOP10 == 16 &&
-				(inst.BO & (1 << 4)) && (inst.BO & (1 << 2)) &&
-				returnAddress != 0)
-			{
-				// bclrx with unconditional branch = return
-				follow = true;
-				destination = returnAddress;
-				returnAddress = 0;
-
-				if (inst.LK)
-					returnAddress = address + 4;
-			}
-			else if (inst.OPCD == 31 && inst.SUBOP10 == 467)
-			{
-				// mtspr
-				const u32 index = (inst.SPRU << 5) | (inst.SPRL & 0x1F);
-				if (index == SPR_LR) {
-					// We give up to follow the return address
-					// because we have to check the register usage.
-					returnAddress = 0;
-				}
-			}
-
-			if (follow)
-				numFollows++;
-			// TODO: Find the optimal value for FUNCTION_FOLLOWING_THRESHOLD.
-			//       If it is small, the performance will be down.
-			//       If it is big, the size of generated code will be big and
-			//       cache clearning will happen many times.
-			// TODO: Investivate the reason why
-			//       "0" is fastest in some games, MP2 for example.
-			if (numFollows > FUNCTION_FOLLOWING_THRESHOLD)
-				follow = false;
-
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMergeBlocks) {
-				follow = false;
-			}
-
-			if (!follow)
-			{
-				if (opinfo->flags & FL_ENDBLOCK) //right now we stop early
-				{
-					foundExit = true;
-					break;
-				}
-				address += 4;
-			}
-			else
-			{
-				// We don't "code[i].skip = true" here
-				// because bx may store a certain value to the link register.
-				// Instead, we skip a part of bx in Jit**::bx().
-				address = destination;
-				merged_addresses[size_of_merged_addresses++] = address;
-			}
-		}
-		else
-		{
-			// ISI exception or other critical memory exception occurred (game over)
-			break;
-		}
-	}
-	st->numCycles = numCycles;
-
-	// Instruction Reordering Pass
-	if (num_inst > 1)
-	{
-		// Bubble down compares towards branches, so that they can be merged.
-		// -2: -1 for the pair, -1 for not swapping with the final instruction which is probably the branch.
-		for (int i = 0; i < num_inst - 2; i++)
-		{
-			CodeOp &a = code[i];
-			CodeOp &b = code[i + 1];
-			// All integer compares can be reordered.
-			if ((a.inst.OPCD == 10 || a.inst.OPCD == 11) ||
-				(a.inst.OPCD == 31 && (a.inst.SUBOP10 == 0 || a.inst.SUBOP10 == 32)))
-			{
-				// Got a compare instruction.
-				if (CanSwapAdjacentOps(a, b)) {
-					// Alright, let's bubble it down!
-					CodeOp c = a;
-					a = b;
-					b = c;
-				}
-			}
-		}
-	}
-
-	if (!foundExit && num_inst > 0)
-	{
-		// A broken block is a block that does not end in a branch
-		broken_block = true;
-	}
-	
-	// Scan for CR0 dependency
-	// assume next block wants CR0 to be safe
-	bool wantsCR0 = true;
-	bool wantsCR1 = true;
-	bool wantsPS1 = true;
-	for (int i = num_inst - 1; i >= 0; i--)
-	{
-		if (code[i].outputCR0)
-			wantsCR0 = false;
-		if (code[i].outputCR1)
-			wantsCR1 = false;
-		if (code[i].outputPS1)
-			wantsPS1 = false;
-		wantsCR0 |= code[i].wantsCR0;
-		wantsCR1 |= code[i].wantsCR1;
-		wantsPS1 |= code[i].wantsPS1;
-		code[i].wantsCR0 = wantsCR0;
-		code[i].wantsCR1 = wantsCR1;
-		code[i].wantsPS1 = wantsPS1;
-	}
-
-	*realsize = num_inst;
-	// ...
-	return address;
-}
-
-
-// Most functions that are relevant to analyze should be
-// called by another function. Therefore, let's scan the 
-// entire space for bl operations and find what functions
-// get called. 
-void FindFunctionsFromBranches(u32 startAddr, u32 endAddr, SymbolDB *func_db)
-{
-	for (u32 addr = startAddr; addr < endAddr; addr+=4)
-	{
-		UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr);
-
-		if (PPCTables::IsValidInstruction(instr))
-		{
-			switch (instr.OPCD)
-			{
-			case 18://branch instruction
-				{
-					if (instr.LK) //bl
-					{
-						u32 target = SignExt26(instr.LI << 2);
-						if (!instr.AA)
-							target += addr;
-						if (Memory::IsRAMAddress(target))
-						{
-							func_db->AddFunction(target);
-						}
-					}
-				}
-				break;
-			default:
-				break;
-			}
-		}
-	}
-}
-
-void FindFunctionsAfterBLR(PPCSymbolDB *func_db)
-{
-	vector<u32> funcAddrs;
-
-	for (PPCSymbolDB::XFuncMap::iterator iter = func_db->GetIterator(); iter != func_db->End(); ++iter)
-		funcAddrs.push_back(iter->second.address + iter->second.size);
-
-	for (vector<u32>::iterator iter = funcAddrs.begin(); iter != funcAddrs.end(); ++iter)
-	{
-		u32 location = *iter;
-		while (true)
-		{
-			if (PPCTables::IsValidInstruction(Memory::Read_Instruction(location)))
-			{
-				//check if this function is already mapped	
-				Symbol *f = func_db->AddFunction(location);
-				if (!f)
-					break;
-				else
-					location += f->size;
-			}
-			else
-				break;
-		}
-	}
-}
-
-void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db)
-{
-	//Step 1: Find all functions
-	FindFunctionsFromBranches(startAddr, endAddr, func_db);
-	FindFunctionsAfterBLR(func_db);
-
-	//Step 2: 
-	func_db->FillInCallers();
-
-	int numLeafs = 0, numNice = 0, numUnNice = 0;
-	int numTimer = 0, numRFI = 0, numStraightLeaf = 0;
-	int leafSize = 0, niceSize = 0, unniceSize = 0;
-	for (PPCSymbolDB::XFuncMap::iterator iter = func_db->GetIterator(); iter != func_db->End(); ++iter)
-	{
-		if (iter->second.address == 4)
-		{
-			WARN_LOG(OSHLE, "Weird function");
-			continue;
-		}
-		AnalyzeFunction2(&(iter->second));
-		Symbol &f = iter->second;
-		if (f.name.substr(0, 3) == "zzz")
-		{
-			if (f.flags & FFLAG_LEAF)
-				f.name += "_leaf";
-			if (f.flags & FFLAG_STRAIGHT)
-				f.name += "_straight";
-		}
-		if (f.flags & FFLAG_LEAF)
-		{
-			numLeafs++;
-			leafSize += f.size;
-		}
-		else if (f.flags & FFLAG_ONLYCALLSNICELEAFS)
-		{
-			numNice++;
-			niceSize += f.size;
-		}
-		else
-		{
-			numUnNice++;
-			unniceSize += f.size;
-		}
-
-		if (f.flags & FFLAG_TIMERINSTRUCTIONS)
-			numTimer++;
-		if (f.flags & FFLAG_RFI)
-			numRFI++;
-		if ((f.flags & FFLAG_STRAIGHT) && (f.flags & FFLAG_LEAF))
-			numStraightLeaf++;
-	}
-	if (numLeafs == 0) 
-		leafSize = 0;
-	else
-		leafSize /= numLeafs;
-
-	if (numNice == 0)
-		niceSize = 0;
-	else
-		niceSize /= numNice;
-
-	if (numUnNice == 0)
-		unniceSize = 0;
-	else
-		unniceSize /= numUnNice;
-
-	INFO_LOG(OSHLE, "Functions analyzed. %i leafs, %i nice, %i unnice."
-		"%i timer, %i rfi. %i are branchless leafs.", numLeafs,
-		numNice, numUnNice, numTimer, numRFI, numStraightLeaf);
-	INFO_LOG(OSHLE, "Average size: %i (leaf), %i (nice), %i(unnice)",
-		leafSize, niceSize, unniceSize);
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
deleted file mode 100644
index e184486f3e..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PPCANALYST_H
-#define _PPCANALYST_H
-
-#include <vector>
-#include <map>
-
-#include <string>
-
-#include "Common.h"
-#include "Gekko.h"
-#include "PPCTables.h"
-
-class PPCSymbolDB;
-struct Symbol;
-
-namespace PPCAnalyst
-{
-
-struct CodeOp //16B
-{
-	UGeckoInstruction inst;
-	GekkoOPInfo * opinfo;
-	u32 address;
-	u32 branchTo; //if 0, not a branch
-	int branchToIndex; //index of target block
-	s8 regsOut[2];
-	s8 regsIn[3];
-	s8 fregOut;
-	s8 fregsIn[3];
-	bool isBranchTarget;
-	bool wantsCR0;
-	bool wantsCR1;
-	bool wantsPS1;
-	bool outputCR0;
-	bool outputCR1;
-	bool outputPS1;
-	bool skip;  // followed BL-s for example
-};
-
-struct BlockStats
-{
-	bool isFirstBlockOfFunction;
-	bool isLastBlockOfFunction;
-	int numCycles;
-};
-
-struct BlockRegStats
-{
-	short firstRead[32];
-	short firstWrite[32];
-	short lastRead[32];
-	short lastWrite[32];
-	short numReads[32];
-	short numWrites[32];
-
-	bool any;
-	bool anyTimer;
-
-	int GetTotalNumAccesses(int reg) {return numReads[reg] + numWrites[reg];}
-	int GetUseRange(int reg) {
-		return max(lastRead[reg], lastWrite[reg]) - 
-			   min(firstRead[reg], firstWrite[reg]);}
-
-	inline void SetInputRegister(int reg, short opindex) {
-		if (firstRead[reg] == -1)
-			firstRead[reg] = (short)(opindex);
-		lastRead[reg] = (short)(opindex);
-		numReads[reg]++;
-	}
-
-	inline void SetOutputRegister(int reg, short opindex) {
-		if (firstWrite[reg] == -1)
-			firstWrite[reg] = (short)(opindex);
-		lastWrite[reg] = (short)(opindex);
-		numWrites[reg]++;
-	}
-};
-
-
-class CodeBuffer
-{
-	int size_;
-public:
-	CodeBuffer(int size);
-	~CodeBuffer();
-
-	int GetSize() const { return size_; }
-
-	PPCAnalyst::CodeOp *codebuffer;
-
-
-};
-
-u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
-			BlockRegStats *fpa, bool &broken_block, CodeBuffer *buffer,
-			int blockSize, u32* merged_addresses,
-			int capacity_of_merged_addresses, int& size_of_merged_addresses);
-void LogFunctionCall(u32 addr);
-void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db);
-bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size = 0);
-
-}  // namespace
-
-#endif
-
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
deleted file mode 100644
index 4ead232b18..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "PPCCache.h"
-#include "../HW/Memmap.h"
-#include "PowerPC.h"
-#include "JitCommon/JitBase.h"
-#include "JitCommon/JitCache.h"
-#include "JitInterface.h"
-
-namespace PowerPC
-{
-
-	const u32 plru_mask[8] = {11,11,19,19,37,37,69,69};
-	const u32 plru_value[8] = {11,3,17,1,36,4,64,0};
-
-	InstructionCache::InstructionCache()
-	{
-		for (u32 m = 0; m < 0xff; m++)
-		{
-			u32 w = 0;
-			while (m & (1<<w)) w++;
-			way_from_valid[m] = w;
-		}
-
-		for (u32 m = 0; m < 128; m++)
-		{
-			u32 b[7];
-			for (int i = 0; i < 7; i++) b[i] = m & (1<<i);
-			u32 w;
-			if (b[0])
-				if (b[2])
-					if (b[6])
-						w = 7;
-					else
-						w = 6;
-				else
-					if (b[5])
-						w = 5;
-					else
-						w = 4;
-			else
-				if (b[1])
-					if (b[4])
-						w = 3;
-					else
-						w = 2;
-				else
-					if (b[3])
-						w = 1;
-					else
-						w = 0;
-			way_from_plru[m] = w;
-		}
-	}
-
-	void InstructionCache::Reset()
-	{
-		memset(valid, 0, sizeof(valid));
-		memset(plru, 0, sizeof(plru));
-#ifdef FAST_ICACHE
-		memset(lookup_table, 0xff, sizeof(lookup_table));
-		memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex));
-		memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem));
-#endif
-		JitInterface::ClearSafe();
-	}
-
-	void InstructionCache::Init()
-	{
-		memset(data, 0, sizeof(data));
-		memset(tags, 0, sizeof(tags));
-		memset(way_from_valid, 0, sizeof(way_from_valid));
-		memset(way_from_plru, 0, sizeof(way_from_plru));
-		
-		Reset();
-	}
-
-	void InstructionCache::Invalidate(u32 addr)
-	{
-		if (!HID0.ICE)
-			return;
-		// invalidates the whole set
-		u32 set = (addr >> 5) & 0x7f;
-#ifdef FAST_ICACHE
-		for (int i = 0; i < 8; i++)
-			if (valid[set] & (1<<i))
-			{
-				if (tags[set][i] & (ICACHE_VMEM_BIT >> 12))
-					lookup_table_vmem[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
-				else if (tags[set][i] & (ICACHE_EXRAM_BIT >> 12))
-					lookup_table_ex[((tags[set][i] << 7) | set) & 0x1fffff] = 0xff;
-				else
-					lookup_table[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
-			}
-#endif
-		valid[set] = 0;
-		JitInterface::InvalidateICache(addr & ~0x1f, 32);
-	}
-
-	u32 InstructionCache::ReadInstruction(u32 addr)
-	{		
-		if (!HID0.ICE) // instruction cache is disabled
-			return Memory::ReadUnchecked_U32(addr);
-		u32 set = (addr >> 5) & 0x7f;
-		u32 tag = addr >> 12;
-#ifdef FAST_ICACHE
-		u32 t;
-		if (addr & ICACHE_VMEM_BIT)
-		{
-			t = lookup_table_vmem[(addr>>5) & 0xfffff];
-		}
-		else if (addr & ICACHE_EXRAM_BIT)
-		{
-			t = lookup_table_ex[(addr>>5) & 0x1fffff];
-		}
-		else
-		{
-			t = lookup_table[(addr>>5) & 0xfffff];
-		}
-#else
-		u32 t = 0xff;
-		for (u32 i = 0; i < 8; i++)
-			if (tags[set][i] == tag && (valid[set] & (1<<i)))
-			{
-				t = i;
-				break;
-			}
-#endif
-		if (t == 0xff) // load to the cache
-		{
-			if (HID0.ILOCK) // instruction cache is locked
-				return Memory::ReadUnchecked_U32(addr);
-			// select a way
-			if (valid[set] != 0xff)
-				t = way_from_valid[valid[set]];
-			else
-				t = way_from_plru[plru[set]];
-			// load
-			u8 *p = Memory::GetPointer(addr & ~0x1f);
-			memcpy(data[set][t], p, 32);
-#ifdef FAST_ICACHE
-			if (valid[set] & (1<<t))
-			{
-				if (tags[set][t] & (ICACHE_VMEM_BIT >> 12))
-					lookup_table_vmem[((tags[set][t] << 7) | set) & 0xfffff] = 0xff;
-				else if (tags[set][t] & (ICACHE_EXRAM_BIT >> 12))
-					lookup_table_ex[((tags[set][t] << 7) | set) & 0x1fffff] = 0xff;
-				else
-					lookup_table[((tags[set][t] << 7) | set) & 0xfffff] = 0xff;
-			}
-
-			if (addr & ICACHE_VMEM_BIT)
-				lookup_table_vmem[(addr>>5) & 0xfffff] = t;
-			else if (addr & ICACHE_EXRAM_BIT)
-				lookup_table_ex[(addr>>5) & 0x1fffff] = t;
-			else
-				lookup_table[(addr>>5) & 0xfffff] = t;
-#endif
-			tags[set][t] = tag;
-			valid[set] |= 1<<t;
-		}
-		// update plru
-		plru[set] = (plru[set] & ~plru_mask[t]) | plru_value[t];
-		u32 res = Common::swap32(data[set][t][(addr>>2)&7]);
-		return res;
-	}
-
-}
diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp
deleted file mode 100644
index e9f821eeed..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#include "../HW/Memmap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../Host.h"
-#include "StringUtil.h"
-#include "PPCSymbolDB.h"
-#include "SignatureDB.h"
-#include "PPCAnalyst.h"
-
-PPCSymbolDB g_symbolDB;
-
-PPCSymbolDB::PPCSymbolDB()
-{
-	// Get access to the disasm() fgnction
-	debugger = &PowerPC::debug_interface;
-}
-
-PPCSymbolDB::~PPCSymbolDB()
-{
-}
-
-// Adds the function to the list, unless it's already there
-Symbol *PPCSymbolDB::AddFunction(u32 startAddr)
-{
-	if (startAddr < 0x80000010)
-		return 0;
-	XFuncMap::iterator iter = functions.find(startAddr);
-	if (iter != functions.end())
-	{
-		// it's already in the list
-		return 0;
-	}
-	else
-	{
-		Symbol tempFunc; //the current one we're working on
-		u32 targetEnd = PPCAnalyst::AnalyzeFunction(startAddr, tempFunc);
-		if (targetEnd == 0)
-			return 0;  //found a dud :(
-		//LOG(OSHLE, "Symbol found at %08x", startAddr);
-		functions[startAddr] = tempFunc;
-		tempFunc.type = Symbol::SYMBOL_FUNCTION;
-		checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
-		return &functions[startAddr];
-	}
-}
-
-void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type)
-{
-	XFuncMap::iterator iter = functions.find(startAddr);
-	if (iter != functions.end())
-	{
-		// already got it, let's just update name, checksum & size to be sure.
-		Symbol *tempfunc = &iter->second;
-		tempfunc->name = name;
-		tempfunc->hash = SignatureDB::ComputeCodeChecksum(startAddr, startAddr + size);
-		tempfunc->type = type;
-		tempfunc->size = size;
-	}
-	else
-	{
-		// new symbol. run analyze.
-		Symbol tf;
-		tf.name = name;
-		tf.type = type;
-		tf.address = startAddr;
-		if (tf.type == Symbol::SYMBOL_FUNCTION) {
-			PPCAnalyst::AnalyzeFunction(startAddr, tf, size);
-			checksumToFunction[tf.hash] = &(functions[startAddr]);
-		}
-		tf.size = size;
-		functions[startAddr] = tf;
-	}
-}
-
-Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr)
-{
-	if (!Memory::IsRAMAddress(addr))
-		return 0;
-
-	XFuncMap::iterator it = functions.find(addr);
-	if (it != functions.end())
-	{
-		return &it->second;
-	}
-	else
-	{
-		for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-		{
-			if (addr >= iter->second.address && addr < iter->second.address + iter->second.size)
-				return &iter->second;
-		}
-	}
-	return 0;
-}
-
-const char *PPCSymbolDB::GetDescription(u32 addr)
-{
-	Symbol *symbol = GetSymbolFromAddr(addr);
-	if (symbol)
-		return symbol->name.c_str();
-	else
-		return " --- ";
-}
-
-void PPCSymbolDB::FillInCallers()
-{
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-	{
-		iter->second.callers.clear();
-	}
-
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
-	{
-		Symbol &f = iter->second;
-		for (size_t i = 0; i < f.calls.size(); i++)
-		{
-			SCall NewCall(iter->first, f.calls[i].callAddress);
-			u32 FunctionAddress = f.calls[i].function;
-
-			XFuncMap::iterator FuncIterator = functions.find(FunctionAddress);
-			if (FuncIterator != functions.end())
-			{
-				Symbol& rCalledFunction = FuncIterator->second;
-				rCalledFunction.callers.push_back(NewCall);
-			}
-			else
-			{
-				//LOG(OSHLE, "FillInCallers tries to fill data in an unknown function 0x%08x.", FunctionAddress);
-				// TODO - analyze the function instead.
-			}
-		}
-	}
-}
-
-void PPCSymbolDB::PrintCalls(u32 funcAddr) const
-{
-	XFuncMap::const_iterator iter = functions.find(funcAddr);
-	if (iter != functions.end())
-	{
-		const Symbol &f = iter->second;
-		INFO_LOG(OSHLE, "The function %s at %08x calls:", f.name.c_str(), f.address);
-		for (std::vector<SCall>::const_iterator fiter = f.calls.begin(); fiter!=f.calls.end(); ++fiter)
-		{
-			XFuncMap::const_iterator n = functions.find(fiter->function);
-			if (n != functions.end())
-			{
-				INFO_LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
-			}
-		}
-	}
-	else
-	{
-		WARN_LOG(CONSOLE, "Symbol does not exist");
-	}
-}
-
-void PPCSymbolDB::PrintCallers(u32 funcAddr) const
-{
-	XFuncMap::const_iterator iter = functions.find(funcAddr);
-	if (iter != functions.end())
-	{
-		const Symbol &f = iter->second;
-		INFO_LOG(CONSOLE,"The function %s at %08x is called by:",f.name.c_str(),f.address);
-		for (std::vector<SCall>::const_iterator fiter = f.callers.begin(); fiter != f.callers.end(); ++fiter)
-		{
-			XFuncMap::const_iterator n = functions.find(fiter->function);
-			if (n != functions.end())
-			{
-				INFO_LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
-			}
-		}
-	}
-}
-
-void PPCSymbolDB::LogFunctionCall(u32 addr)
-{
-	//u32 from = PC;
-	XFuncMap::iterator iter = functions.find(addr);
-	if (iter != functions.end())
-	{
-		Symbol &f = iter->second;
-		f.numCalls++;
-	}
-}
-
-// This one can load both leftover map files on game discs (like Zelda), and mapfiles
-// produced by SaveSymbolMap below.
-bool PPCSymbolDB::LoadMap(const char *filename)
-{
-	File::IOFile f(filename, "r");
-	if (!f)
-		return false;
-
-	bool started = false;
-
-	char line[512];
-	while (fgets(line, 512, f.GetHandle()))
-	{
-		if (strlen(line) < 4)
-			continue;
-
-		char temp[256];
-		sscanf(line, "%s", temp);
-
-		if (strcmp(temp, "UNUSED")==0) continue;
-		if (strcmp(temp, ".text")==0)  {started = true; continue;};
-		if (strcmp(temp, ".init")==0)  {started = true; continue;};
-		if (strcmp(temp, "Starting")==0) continue;
-		if (strcmp(temp, "extab")==0) continue;
-		if (strcmp(temp, ".ctors")==0) break; //uh?
-		if (strcmp(temp, ".dtors")==0) break;
-		if (strcmp(temp, ".rodata")==0) continue;
-		if (strcmp(temp, ".data")==0) continue;
-		if (strcmp(temp, ".sbss")==0) continue;
-		if (strcmp(temp, ".sdata")==0) continue;
-		if (strcmp(temp, ".sdata2")==0) continue;
-		if (strcmp(temp, "address")==0)  continue;
-		if (strcmp(temp, "-----------------------")==0)  continue;
-		if (strcmp(temp, ".sbss2")==0) break;
-		if (temp[1] == ']') continue;
-
-		if (!started) continue;
-
-		u32 address, vaddress, size, unknown;
-		char name[512];
-		sscanf(line, "%08x %08x %08x %i %s", &address, &size, &vaddress, &unknown, name);
-
-		const char *namepos = strstr(line, name);
-		if (namepos != 0) //would be odd if not :P
-			strcpy(name, namepos);
-		name[strlen(name) - 1] = 0;
-
-		// we want the function names only .... TODO: or do we really? aren't we wasting information here?
-		for (size_t i = 0; i < strlen(name); i++)
-		{
-			if (name[i] == ' ') name[i] = 0x00;
-			if (name[i] == '(') name[i] = 0x00;
-		}
-
-		// Check if this is a valid entry.
-		if (strcmp(name, ".text") != 0 || strcmp(name, ".init") != 0 || strlen(name) > 0)
-		{
-			AddKnownSymbol(vaddress | 0x80000000, size, name); // ST_FUNCTION
-		}
-	}
-
-	Index();
-	return true;
-}
-
-
-// ===================================================
-/* Save the map file and save a code file */
-// ----------------
-bool PPCSymbolDB::SaveMap(const char *filename, bool WithCodes) const
-{
-	// Format the name for the codes version
-	std::string mapFile = filename;
-	if (WithCodes) mapFile = mapFile.substr(0, mapFile.find_last_of(".")) + "_code.map";
-
-	// Check size
-	const int wxYES_NO = 0x00000002 | 0x00000008;
-	if (functions.size() == 0)
-	{
-		if(!AskYesNo(StringFromFormat(
-			"No symbol names are generated. Do you want to replace '%s' with a blank file?",
-			mapFile.c_str()).c_str(), "Confirm", wxYES_NO)) return false;
-	}
-	if (WithCodes) Host_UpdateStatusBar("Saving code, please stand by ...");
-
-	// Make a file
-	File::IOFile f(mapFile, "w");
-	if (!f)
-		return false;
-
-	// --------------------------------------------------------------------
-	// Walk through every code row
-	// -------------------------
-	fprintf(f.GetHandle(), ".text\n"); // Write ".text" at the top
-	XFuncMap::const_iterator itr = functions.begin();
-	u32 LastAddress = 0x80004000;
-	std::string LastSymbolName;
-	while (itr != functions.end())
-	{
-		// Save a map file
-		const Symbol &rSymbol = itr->second;
-		if (!WithCodes)
-		{
-			fprintf(f.GetHandle(),"%08x %08x %08x %i %s\n", rSymbol.address, rSymbol.size, rSymbol.address,
-			0, rSymbol.name.c_str());
-			++itr;
-		}
-
-		// Save a code file
-		else
-		{
-			// Get the current and next address
-			LastAddress = rSymbol.address;
-			LastSymbolName = rSymbol.name;	
-			++itr;
-
-			/* To make nice straight lines we fill out the name with spaces, we also cut off
-			   all names longer than 25 letters */
-			std::string TempSym;
-			for (u32 i = 0; i < 25; i++)
-			{
-				if (i < LastSymbolName.size())
-					TempSym += LastSymbolName[i];
-				else
-					TempSym += " ";
-			}
-
-			// We currently skip the last block because we don't know how long it goes
-			int space;
-			if (itr != functions.end())
-				space = itr->second.address - LastAddress;
-			else
-				space = 0;
-			
-			for (int i = 0; i < space; i += 4)
-			{
-				int Address = LastAddress + i;
-				char disasm[256];
-				debugger->disasm(Address, disasm, 256);
-				fprintf(f.GetHandle(),"%08x %i %20s %s\n", Address, 0, TempSym.c_str(), disasm);
-			}
-			// Write a blank line after each block
-			fprintf(f.GetHandle(), "\n");
-		}
-	}
-	// ---------------
-	Host_UpdateStatusBar(StringFromFormat("Saved %s", mapFile.c_str()).c_str());
-
-	return true;
-}
-// ===========
diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
deleted file mode 100644
index 40d606ae97..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include <map>
-#include <string>
-#include <vector>
-#include "../Debugger/PPCDebugInterface.h"
-
-#include "SymbolDB.h"
-
-// This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later.
-class PPCSymbolDB : public SymbolDB
-{
-private:
-	DebugInterface* debugger;
-
-public:
-	typedef void (*functionGetterCallback)(Symbol *f);
-	
-	PPCSymbolDB();
-	~PPCSymbolDB();
-
-	Symbol *AddFunction(u32 startAddr);
-	void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION);
-
-	Symbol *GetSymbolFromAddr(u32 addr);
-
-	const char *GetDescription(u32 addr);
-
-	void FillInCallers();
-
-	bool LoadMap(const char *filename);
-	bool SaveMap(const char *filename, bool WithCodes = false) const;
-
-	void PrintCalls(u32 funcAddr) const;
-	void PrintCallers(u32 funcAddr) const;
-	void LogFunctionCall(u32 addr);
-};
-
-extern PPCSymbolDB g_symbolDB;
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp
deleted file mode 100644
index 6599a58d4f..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-#include <vector>
-
-#include "Common.h"
-#include "PPCTables.h"
-#include "StringUtil.h"
-#include "FileUtil.h"
-#include "Interpreter/Interpreter.h"
-#include "Interpreter/Interpreter_Tables.h"
-#include "JitInterface.h"
-
-struct op_inf
-{
-	const char *name;
-	int count;
-	bool operator < (const op_inf &o) const
-	{
-		return count > o.count;
-	}
-};
- GekkoOPInfo *m_infoTable[64];
- GekkoOPInfo *m_infoTable4[1024];
- GekkoOPInfo *m_infoTable19[1024];
- GekkoOPInfo *m_infoTable31[1024];
- GekkoOPInfo *m_infoTable59[32];
- GekkoOPInfo *m_infoTable63[1024];
-
- GekkoOPInfo *m_allInstructions[512];
- int m_numInstructions;
-
-GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
-{
-	GekkoOPInfo *info = m_infoTable[_inst.OPCD];
-	if ((info->type & 0xFFFFFF) == OPTYPE_SUBTABLE)
-	{
-		int table = info->type>>24;
-		switch(table) 
-		{
-		case 4:  return m_infoTable4[_inst.SUBOP10];
-		case 19: return m_infoTable19[_inst.SUBOP10];
-		case 31: return m_infoTable31[_inst.SUBOP10];
-		case 59: return m_infoTable59[_inst.SUBOP5];
-		case 63: return m_infoTable63[_inst.SUBOP10];
-		default:
-			_assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC);
-			return 0;
-		}
-	}
-	else
-	{
-		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
-		{
-			_assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC);
-			return 0;
-		}
-		return m_infoTable[_inst.OPCD];
-	}
-}
-
-Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst)
-{
-	const GekkoOPInfo *info = m_infoTable[_inst.OPCD];
-	if ((info->type & 0xFFFFFF) == OPTYPE_SUBTABLE)
-	{
-		int table = info->type>>24;
-		switch(table) 
-		{
-		case 4:  return Interpreter::m_opTable4[_inst.SUBOP10];
-		case 19: return Interpreter::m_opTable19[_inst.SUBOP10];
-		case 31: return Interpreter::m_opTable31[_inst.SUBOP10];
-		case 59: return Interpreter::m_opTable59[_inst.SUBOP5];
-		case 63: return Interpreter::m_opTable63[_inst.SUBOP10];
-		default:
-			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid subtable op %08x @ %08x", _inst.hex, PC);
-			return 0;
-		}
-	}
-	else
-	{
-		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
-		{
-			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid op %08x @ %08x", _inst.hex, PC);
-			return 0;
-		}
-		return Interpreter::m_opTable[_inst.OPCD];
-	}
-}
-namespace PPCTables
-{
-
-bool UsesFPU(UGeckoInstruction _inst)
-{
-	switch (_inst.OPCD)
-	{
-	case 04:	// PS
-		return _inst.SUBOP10 != 1014;
-
-	case 48:	// lfs
-	case 49:	// lfsu
-	case 50:	// lfd
-	case 51:	// lfdu
-	case 52:	// stfs
-	case 53:	// stfsu
-	case 54:	// stfd
-	case 55:	// stfdu
-	case 56:	// psq_l
-	case 57:	// psq_lu
-
-	case 59:	// FPU-sgl
-	case 60:	// psq_st
-	case 61:	// psq_stu
-	case 63:	// FPU-dbl
-		return true;
-
-	case 31:
-		switch (_inst.SUBOP10)
-		{
-		case 535:
-		case 567:
-		case 599:
-		case 631:
-		case 663:
-		case 695:
-		case 727:
-		case 759:
-		case 983:
-			return true;
-		default:
-			return false;
-		}
-	default:
-		return false;
-	}
-}
-
-void InitTables(int cpu_core)
-{
-	// Interpreter ALWAYS needs to be initialized
-	InterpreterTables::InitTables();
-	switch (cpu_core)
-	{
-	case 0:
-		{
-			// Interpreter
-			break;
-		}
-	default:
-		{
-			JitInterface::InitTables(cpu_core);
-			break;
-		}
-	}
-}
-
-#define OPLOG
-#define OP_TO_LOG "mtfsb0x"
-
-#ifdef OPLOG
-namespace {
-	std::vector<u32> rsplocations;
-}
-#endif
-
-const char *GetInstructionName(UGeckoInstruction _inst)
-{
-	const GekkoOPInfo *info = GetOpInfo(_inst);
-	return info ? info->opname : 0;
-}
-
-bool IsValidInstruction(UGeckoInstruction _inst)
-{
-	const GekkoOPInfo *info = GetOpInfo(_inst);
-	return info != 0;
-}
-
-void CountInstruction(UGeckoInstruction _inst)
-{
-	GekkoOPInfo *info = GetOpInfo(_inst);
-	if (info)
-		info->runCount++;
-}
-
-void PrintInstructionRunCounts()
-{
-	std::vector<op_inf> temp;
-	for (int i = 0; i < m_numInstructions; i++)
-	{
-		op_inf x;
-		x.name = m_allInstructions[i]->opname;
-		x.count = m_allInstructions[i]->runCount;
-		temp.push_back(x);
-	}
-	std::sort(temp.begin(), temp.end());
-	for (int i = 0; i < m_numInstructions; i++)
-	{
-		if (temp[i].count == 0) 
-			break;
-		DEBUG_LOG(POWERPC, "%s : %i", temp[i].name,temp[i].count);
-		//PanicAlert("%s : %i", temp[i].name,temp[i].count);
-	}
-}
-
-void LogCompiledInstructions()
-{
-	static unsigned int time = 0;
-
-	File::IOFile f(StringFromFormat("%sinst_log%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
-	for (int i = 0; i < m_numInstructions; i++)
-	{
-		if (m_allInstructions[i]->compileCount > 0)
-		{
-			fprintf(f.GetHandle(), "%s\t%i\t%lld\t%08x\n", m_allInstructions[i]->opname,
-				m_allInstructions[i]->compileCount, m_allInstructions[i]->runCount, m_allInstructions[i]->lastUse);
-		}
-	}
-
-	f.Open(StringFromFormat("%sinst_not%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
-	for (int i = 0; i < m_numInstructions; i++)
-	{
-		if (m_allInstructions[i]->compileCount == 0)
-		{
-			fprintf(f.GetHandle(), "%s\t%i\t%lld\n", m_allInstructions[i]->opname,
-				m_allInstructions[i]->compileCount, m_allInstructions[i]->runCount);
-		}
-	}
-
-#ifdef OPLOG
-	f.Open(StringFromFormat("%s" OP_TO_LOG "_at.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
-	for (size_t i = 0; i < rsplocations.size(); i++)
-	{
-		fprintf(f.GetHandle(), OP_TO_LOG ": %08x\n", rsplocations[i]);
-	}
-#endif
-
-	++time;
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.h b/Source/Core/Core/Src/PowerPC/PPCTables.h
deleted file mode 100644
index 4a32f5515c..0000000000
--- a/Source/Core/Core/Src/PowerPC/PPCTables.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PPCTABLES_H
-#define _PPCTABLES_H
-
-#include "Gekko.h"
-#include "Interpreter/Interpreter.h"
-
-enum
-{
-	FL_SET_CR0 = (1<<0), //  
-	FL_SET_CR1 = (1<<1), //
-	FL_SET_CRn = (1<<2), //
-	FL_SET_CRx = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn, //
-	FL_SET_CA  = (1<<3), //	carry
-	FL_READ_CA = (1<<4), //	carry
-	FL_RC_BIT =  (1<<5),
-	FL_RC_BIT_F = (1<<6),
-	FL_ENDBLOCK = (1<<7),
-	FL_IN_A = (1<<8),
-	FL_IN_A0 = (1<<9),
-	FL_IN_B = (1<<10),
-	FL_IN_C = (1<<11),
-	FL_IN_S = (1<<12),
-	FL_IN_AB = FL_IN_A | FL_IN_B,
-	FL_IN_SB = FL_IN_S | FL_IN_B,
-	FL_IN_A0B = FL_IN_A0 | FL_IN_B,
-	FL_IN_A0BC = FL_IN_A0 | FL_IN_B | FL_IN_C,
-	FL_OUT_D = (1<<13),
-	FL_OUT_S = FL_OUT_D,
-	FL_OUT_A = (1<<14),
-	FL_OUT_AD = FL_OUT_A | FL_OUT_D,
-	FL_TIMER =    (1<<15),
-	FL_CHECKEXCEPTIONS = (1<<16),
-	FL_EVIL = (1<<17),
-	FL_USE_FPU = (1<<18),
-	FL_LOADSTORE = (1<<19),
-};
-
-enum
-{
-	OPTYPE_INVALID ,
-	OPTYPE_SUBTABLE,
-	OPTYPE_INTEGER ,
-	OPTYPE_CR      ,
-	OPTYPE_SPR     ,
-	OPTYPE_SYSTEM  ,
-	OPTYPE_SYSTEMFP,
-	OPTYPE_LOAD    ,
-	OPTYPE_STORE   ,
-	OPTYPE_LOADFP  ,
-	OPTYPE_STOREFP ,
-	OPTYPE_FPU     ,
-	OPTYPE_PS      ,
-	OPTYPE_DCACHE  ,
-	OPTYPE_ICACHE  ,
-	OPTYPE_BRANCH  ,
-	OPTYPE_UNKNOWN ,
-};
-
-enum {
-	OPCD_HLEFUNCTION = 1,
-	OPCD_COMPILEDBLOCK = 2,
-	OPCD_BCx = 16,
-	OPCD_SC = 17,
-	OPCD_Bx = 18,
-};
-
-enum {
-	OP_BLR = 0x4e800020,
-};
-struct GekkoOPInfo
-{
-	const char *opname;
-	int type;
-	int flags;
-	int numCyclesMinusOne;
-	u64 runCount;
-	int compileCount;
-	u32 lastUse;
-};
-extern GekkoOPInfo *m_infoTable[64];
-extern GekkoOPInfo *m_infoTable4[1024];
-extern GekkoOPInfo *m_infoTable19[1024];
-extern GekkoOPInfo *m_infoTable31[1024];
-extern GekkoOPInfo *m_infoTable59[32];
-extern GekkoOPInfo *m_infoTable63[1024];
-
-extern GekkoOPInfo *m_allInstructions[512];
-
-extern int m_numInstructions;
-
-GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst);
-Interpreter::_interpreterInstruction GetInterpreterOp(UGeckoInstruction _inst);
-
-class cJit64;
-
-namespace PPCTables
-{
-
-void InitTables(int cpu_core);
-bool IsValidInstruction(UGeckoInstruction _instCode);
-bool UsesFPU(UGeckoInstruction _inst);
-
-void CountInstruction(UGeckoInstruction _inst);
-void PrintInstructionRunCounts();
-void LogCompiledInstructions();
-const char *GetInstructionName(UGeckoInstruction _inst);
-
-}  // namespace
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
deleted file mode 100644
index b082960175..0000000000
--- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <float.h>
-
-#include "Common.h"
-#include "Atomic.h"
-#include "MathUtil.h"
-#include "ChunkFile.h"
-
-#include "../HW/Memmap.h"
-#include "../HW/CPU.h"
-#include "../Core.h"
-#include "../CoreTiming.h"
-#include "../HW/SystemTimers.h"
-
-#include "Interpreter/Interpreter.h"
-#include "PowerPC.h"
-#include "PPCTables.h"
-#include "CPUCoreBase.h"
-#include "JitInterface.h"
-
-#include "../Host.h"
-#include "HW/EXI.h"
-
-CPUCoreBase *cpu_core_base;
-
-namespace PowerPC
-{
-
-// STATE_TO_SAVE
-PowerPCState GC_ALIGNED16(ppcState);
-volatile CPUState state = CPU_STEPPING;
-
-Interpreter * const interpreter = Interpreter::getInstance();
-CoreMode mode;
-
-BreakPoints breakpoints;
-MemChecks memchecks;
-PPCDebugInterface debug_interface;
-
-void CompactCR()
-{
-	u32 new_cr = ppcState.cr_fast[0] << 28;
-	for (int i = 1; i < 8; i++)
-	{
-		new_cr |= ppcState.cr_fast[i] << (28 - i * 4);
-	}
-	ppcState.cr = new_cr;
-}
-
-void ExpandCR()
-{
-	for (int i = 0; i < 8; i++)
-	{
-		ppcState.cr_fast[i] = (ppcState.cr >> (28 - i * 4)) & 0xF;
-	}
-}
-
-void DoState(PointerWrap &p)
-{
-	// some of this code has been disabled, because
-	// it changes registers even in MODE_MEASURE (which is suspicious and seems like it could cause desyncs)
-	// and because the values it's changing have been added to CoreTiming::DoState, so it might conflict to mess with them here.
-
-//	rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer();
-//	*((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :)
-
-	p.DoPOD(ppcState);
-
-//	SystemTimers::DecrementerSet();
-//	SystemTimers::TimeBaseSet();
-
-	JitInterface::DoState(p);
-}
-
-void ResetRegisters()
-{
-	memset(ppcState.ps, 0, sizeof(ppcState.ps));
-	memset(ppcState.gpr, 0, sizeof(ppcState.gpr));
-	memset(ppcState.spr, 0, sizeof(ppcState.spr));
-	/*
-	0x00080200 = lonestar 2.0
-	0x00088202 = lonestar 2.2
-	0x70000100 = gekko 1.0
-	0x00080100 = gekko 2.0
-	0x00083203 = gekko 2.3a
-	0x00083213 = gekko 2.3b
-	0x00083204 = gekko 2.4
-	0x00083214 = gekko 2.4e (8SE) - retail HW2
-	*/
-	ppcState.spr[SPR_PVR] = 0x00083214;
-	ppcState.spr[SPR_HID1] = 0x80000000; // We're running at 3x the bus clock
-	ppcState.spr[SPR_ECID_U] = 0x0d96e200;
-	ppcState.spr[SPR_ECID_M] = 0x1840c00d;
-	ppcState.spr[SPR_ECID_L] = 0x82bb08e8;
-
-	ppcState.cr = 0;
-	ppcState.fpscr = 0;
-	ppcState.pc = 0;
-	ppcState.npc = 0;
-	ppcState.Exceptions = 0;
-	((u64*)(&ppcState.cr_fast[0]))[0] = 0;
-
-	TL = 0;
-	TU = 0;
-	SystemTimers::TimeBaseSet();
-
-	// MSR should be 0x40, but we don't emulate BS1, so it would never be turned off :}
-	ppcState.msr = 0;
-	rDEC = 0xFFFFFFFF;
-	SystemTimers::DecrementerSet();
-}
-
-void Init(int cpu_core)
-{
-	FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53);
-
-	memset(ppcState.mojs, 0, sizeof(ppcState.mojs));
-	memset(ppcState.sr, 0, sizeof(ppcState.sr));
-	ppcState.DebugCount = 0;
-	ppcState.dtlb_last = 0;
-	ppcState.dtlb_last = 0;
-	memset(ppcState.dtlb_va, 0, sizeof(ppcState.dtlb_va));
-	memset(ppcState.dtlb_pa, 0, sizeof(ppcState.dtlb_pa));
-	ppcState.itlb_last = 0;
-	memset(ppcState.itlb_va, 0, sizeof(ppcState.itlb_va));
-	memset(ppcState.itlb_pa, 0, sizeof(ppcState.itlb_pa));
-	ppcState.pagetable_base = 0;
-	ppcState.pagetable_hashmask = 0;
-
-	ResetRegisters();
-	PPCTables::InitTables(cpu_core);
-
-	// We initialize the interpreter because
-	// it is used on boot and code window independently.
-	interpreter->Init();
-
-	switch (cpu_core)
-	{
-		case 0:
-		{
-			cpu_core_base = interpreter;
-			break;
-		}
-		default:
-			cpu_core_base = JitInterface::InitJitCore(cpu_core);
-			if (!cpu_core_base) // Handle Situations where JIT core isn't available
-			{
-				WARN_LOG(POWERPC, "Jit core %d not available. Defaulting to interpreter.", cpu_core);
-				cpu_core_base = interpreter;
-			}
-		break;
-	}
-
-	if (cpu_core_base != interpreter)
-	{
-		mode = MODE_JIT;
-	}
-	else
-	{
-		mode = MODE_INTERPRETER;
-	}
-	state = CPU_STEPPING;
-
-	ppcState.iCache.Init();
-}
-
-void Shutdown()
-{
-	JitInterface::Shutdown();
-	interpreter->Shutdown();
-	cpu_core_base = NULL;
-	state = CPU_POWERDOWN;
-}
-
-CoreMode GetMode()
-{
-	return mode;
-}
-
-void SetMode(CoreMode new_mode)
-{
-	if (new_mode == mode)
-		return;  // We don't need to do anything.
-
-	mode = new_mode;
-
-	switch (mode)
-	{
-	case MODE_INTERPRETER:  // Switching from JIT to interpreter
-		cpu_core_base = interpreter;
-		break;
-
-	case MODE_JIT:  // Switching from interpreter to JIT.
-		// Don't really need to do much. It'll work, the cache will refill itself.
-		cpu_core_base = JitInterface::GetCore();
-		if (!cpu_core_base) // Has a chance to not get a working JIT core if one isn't active on host
-			cpu_core_base = interpreter;
-		break;
-	}
-}
-
-void SingleStep() 
-{
-	cpu_core_base->SingleStep();
-}
-
-void RunLoop()
-{
-	state = CPU_RUNNING;
-	cpu_core_base->Run();
-	Host_UpdateDisasmDialog();
-}
-
-CPUState GetState()
-{
-	return state;
-}
-
-volatile CPUState *GetStatePtr()
-{
-	return &state;
-}
-
-void Start()
-{
-	state = CPU_RUNNING;
-	Host_UpdateDisasmDialog();
-}
-
-void Pause()
-{
-	state = CPU_STEPPING;
-	Host_UpdateDisasmDialog();
-}
-
-void Stop()
-{
-	state = CPU_POWERDOWN;
-	Host_UpdateDisasmDialog();
-}
-
-void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst)
-{
-	switch (MMCR0.PMC1SELECT)
-	{
-	case 0: // No change
-		break;
-	case 1: // Processor cycles
-		PowerPC::ppcState.spr[SPR_PMC1] += cycles;
-		break;
-	default:
-		break;
-	}
-
-	switch (MMCR0.PMC2SELECT)
-	{
-	case 0: // No change
-		break;
-	case 1: // Processor cycles
-		PowerPC::ppcState.spr[SPR_PMC2] += cycles;
-		break;
-	case 11: // Number of loads and stores completed
-		PowerPC::ppcState.spr[SPR_PMC2] += num_load_stores;
-		break;
-	default:
-		break;
-	}
-
-	switch (MMCR1.PMC3SELECT)
-	{
-	case 0: // No change
-		break;
-	case 1: // Processor cycles
-		PowerPC::ppcState.spr[SPR_PMC3] += cycles;
-		break;
-	case 11: // Number of FPU instructions completed
-		PowerPC::ppcState.spr[SPR_PMC3] += num_fp_inst;
-		break;
-	default:
-		break;
-	}
-
-	switch (MMCR1.PMC4SELECT)
-	{
-	case 0: // No change
-		break;
-	case 1: // Processor cycles
-		PowerPC::ppcState.spr[SPR_PMC4] += cycles;
-		break;
-	default:
-		break;
-	}
-
-	if ((MMCR0.PMC1INTCONTROL && (PowerPC::ppcState.spr[SPR_PMC1] & 0x80000000) != 0) ||
-		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC2] & 0x80000000) != 0) ||
-		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC3] & 0x80000000) != 0) ||
-		(MMCR0.PMCINTCONTROL && (PowerPC::ppcState.spr[SPR_PMC4] & 0x80000000) != 0))
-		PowerPC::ppcState.Exceptions |= EXCEPTION_PERFORMANCE_MONITOR;
-}
-
-void CheckExceptions()
-{
-	// Make sure we are checking against the latest EXI status. This is required
-	// for devices which interrupt frequently, such as the gc mic
-	ExpansionInterface::UpdateInterrupts();
-
-	// Read volatile data once
-	u32 exceptions = ppcState.Exceptions;
-
-	// Example procedure:
-	// set SRR0 to either PC or NPC
-	//SRR0 = NPC;
-	// save specified MSR bits
-	//SRR1 = MSR & 0x87C0FFFF;
-	// copy ILE bit to LE
-	//MSR |= (MSR >> 16) & 1;
-	// clear MSR as specified
-	//MSR &= ~0x04EF36; // 0x04FF36 also clears ME (only for machine check exception)
-	// set to exception type entry point
-	//NPC = 0x00000x00;
-
-	if (exceptions & EXCEPTION_ISI)
-	{
-		SRR0 = NPC;
-		// Page fault occurred
-		SRR1 = (MSR & 0x87C0FFFF) | (1 << 30);
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000400;
-
-		INFO_LOG(POWERPC, "EXCEPTION_ISI");
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_ISI);
-	}
-	else if (exceptions & EXCEPTION_PROGRAM)
-	{
-		SRR0 = PC;
-		// say that it's a trap exception
-		SRR1 = (MSR & 0x87C0FFFF) | 0x20000;
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000700;
-
-		INFO_LOG(POWERPC, "EXCEPTION_PROGRAM");
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PROGRAM);
-	} 
-	else if (exceptions & EXCEPTION_SYSCALL)
-	{
-		SRR0 = NPC;
-		SRR1 = MSR & 0x87C0FFFF;
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000C00;
-
-		INFO_LOG(POWERPC, "EXCEPTION_SYSCALL (PC=%08x)", PC);
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_SYSCALL);
-	}
-	else if (exceptions & EXCEPTION_FPU_UNAVAILABLE)
-	{			
-		//This happens a lot - Gamecube OS uses deferred FPU context switching
-		SRR0 = PC;	// re-execute the instruction
-		SRR1 = MSR & 0x87C0FFFF;
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000800;
-
-		INFO_LOG(POWERPC, "EXCEPTION_FPU_UNAVAILABLE");
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_FPU_UNAVAILABLE);
-	}
-	else if (exceptions & EXCEPTION_DSI)
-	{
-		SRR0 = PC;
-		SRR1 = MSR & 0x87C0FFFF;
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000300;
-		//DSISR and DAR regs are changed in GenerateDSIException()
-
-		INFO_LOG(POWERPC, "EXCEPTION_DSI");
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DSI);
-	} 
-	else if (exceptions & EXCEPTION_ALIGNMENT)
-	{
-		//This never happens ATM
-		// perhaps we can get dcb* instructions to use this :p
-		SRR0 = PC;
-		SRR1 = MSR & 0x87C0FFFF;
-		MSR |= (MSR >> 16) & 1;
-		MSR &= ~0x04EF36;
-		PC = NPC = 0x00000600;
-
-		//TODO crazy amount of DSISR options to check out
-
-		INFO_LOG(POWERPC, "EXCEPTION_ALIGNMENT");
-		Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_ALIGNMENT);
-	}
-
-	// EXTERNAL INTERRUPT
-	else if (MSR & 0x0008000) //hacky...the exception shouldn't be generated if EE isn't set...
-	{
-		if (exceptions & EXCEPTION_EXTERNAL_INT)
-		{
-			// Pokemon gets this "too early", it hasn't a handler yet
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000500;
-
-			INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT);
-
-			_dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???");
-		}
-		else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
-		{
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000F00;
-
-			INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PERFORMANCE_MONITOR);
-		}
-		else if (exceptions & EXCEPTION_DECREMENTER)
-		{
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000900;
-
-			INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DECREMENTER);
-		}
-	}
-}
-
-void CheckExternalExceptions()
-{
-	// Read volatile data once
-	u32 exceptions = ppcState.Exceptions;
-
-	// EXTERNAL INTERRUPT
-	if (MSR & 0x0008000) //hacky...the exception shouldn't be generated if EE isn't set...
-	{
-		if (exceptions & EXCEPTION_EXTERNAL_INT)
-		{
-			// Pokemon gets this "too early", it hasn't a handler yet
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000500;
-
-			INFO_LOG(POWERPC, "EXCEPTION_EXTERNAL_INT");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_EXTERNAL_INT);
-
-			_dbg_assert_msg_(POWERPC, (SRR1 & 0x02) != 0, "EXTERNAL_INT unrecoverable???");
-		}
-		else if (exceptions & EXCEPTION_PERFORMANCE_MONITOR)
-		{
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000F00;
-
-			INFO_LOG(POWERPC, "EXCEPTION_PERFORMANCE_MONITOR");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_PERFORMANCE_MONITOR);
-		}
-		else if (exceptions & EXCEPTION_DECREMENTER)
-		{
-			SRR0 = NPC;
-			SRR1 = MSR & 0x87C0FFFF;
-			MSR |= (MSR >> 16) & 1;
-			MSR &= ~0x04EF36;
-			PC = NPC = 0x00000900;
-
-			INFO_LOG(POWERPC, "EXCEPTION_DECREMENTER");
-			Common::AtomicAnd(ppcState.Exceptions, ~EXCEPTION_DECREMENTER);
-		}
-		else
-		{
-			_dbg_assert_msg_(POWERPC, 0, "Unknown EXT interrupt: Exceptions == %08x", exceptions);
-			ERROR_LOG(POWERPC, "Unknown EXTERNAL INTERRUPT exception: Exceptions == %08x", exceptions);
-		}
-	}
-}
-
-void CheckBreakPoints()
-{
-	if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
-	{
-		PowerPC::Pause();
-		if (PowerPC::breakpoints.IsTempBreakPoint(PC))
-			PowerPC::breakpoints.Remove(PC);
-	}
-}
-
-void OnIdle(u32 _uThreadAddr)
-{
-	u32 nextThread = Memory::Read_U32(_uThreadAddr);
-	//do idle skipping
-	if (nextThread == 0)
-		CoreTiming::Idle();
-}
-
-void OnIdleIL()
-{
-	CoreTiming::Idle();
-}
-
-}  // namespace
-
-
-// FPSCR update functions
-
-void UpdateFPRF(double dvalue)
-{
-	FPSCR.FPRF = MathUtil::ClassifyDouble(dvalue);
-	//if (FPSCR.FPRF == 0x11)
-	//	PanicAlert("QNAN alert");
-}
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h
deleted file mode 100644
index 82c912d213..0000000000
--- a/Source/Core/Core/Src/PowerPC/PowerPC.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _POWERPC_H
-#define _POWERPC_H
-
-#include "Common.h"
-#include "CPUCoreBase.h"
-#include "Gekko.h"
-#include "BreakPoints.h"
-#include "../Debugger/PPCDebugInterface.h"
-#include "PPCCache.h"
-
-class PointerWrap;
-
-extern CPUCoreBase *cpu_core_base;
-
-namespace PowerPC
-{
-
-enum CoreMode
-{
-	MODE_INTERPRETER,
-	MODE_JIT,
-};
-
-// This contains the entire state of the emulated PowerPC "Gekko" CPU.
-struct GC_ALIGNED64(PowerPCState)
-{
-	u32 mojs[128];  // Try to isolate the regs from other variables in the cache.
-	u32 gpr[32];    // General purpose registers. r1 = stack pointer.
-
-	// The paired singles are strange : PS0 is stored in the full 64 bits of each FPR
-	// but ps calculations are only done in 32-bit precision, and PS1 is only 32 bits.
-	// Since we want to use SIMD, SSE2 is the only viable alternative - 2x double.
-	u64 ps[32][2];
-
-	u32 pc;     // program counter
-	u32 npc;
-
-	u32 cr;            // flags
-	u8 cr_fast[8];     // Possibly reorder to 0, 2, 4, 8, 1, 3, 5, 7 so that we can make Compact and Expand super fast?
-
-	u32 msr;    // machine specific register
-	u32 fpscr;  // floating point flags/status bits
-
-	// Exception management.
-	volatile u32 Exceptions;
-
-	u32 sr[16];  // Segment registers.
-
-	u32 DebugCount;
-	
-	// special purpose registers - controls quantizers, DMA, and lots of other misc extensions.
-	// also for power management, but we don't care about that.
-	u32 spr[1024];
-
-	u32 dtlb_last;
-	u32 dtlb_va[128];
-	u32 dtlb_pa[128];
-
-	u32 itlb_last;
-	u32 itlb_va[128];
-	u32 itlb_pa[128];
-
-	u32 pagetable_base;
-	u32 pagetable_hashmask;
-
-	InstructionCache iCache;
-};
-
-enum CPUState
-{
-	CPU_RUNNING = 0,
-	CPU_STEPPING = 2,
-	CPU_POWERDOWN = 3,
-};
-
-extern PowerPCState ppcState;
-
-extern BreakPoints breakpoints;
-extern MemChecks memchecks;
-extern PPCDebugInterface debug_interface;
-
-void Init(int cpu_core);
-void Shutdown();
-void DoState(PointerWrap &p);
-
-CoreMode GetMode();
-void SetMode(CoreMode _coreType);
-
-void SingleStep();	
-void CheckExceptions();
-void CheckExternalExceptions();
-void CheckBreakPoints();
-void RunLoop();
-void Start();
-void Pause();
-void Stop();
-CPUState GetState();
-volatile CPUState *GetStatePtr();  // this oddity is here instead of an extern declaration to easily be able to find all direct accesses throughout the code.
-
-void CompactCR();
-void ExpandCR();
-
-void OnIdle(u32 _uThreadAddr);
-void OnIdleIL();
-
-void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst);
-
-	// Easy register access macros.
-#define HID0 ((UReg_HID0&)PowerPC::ppcState.spr[SPR_HID0])
-#define HID2 ((UReg_HID2&)PowerPC::ppcState.spr[SPR_HID2])
-#define HID4 ((UReg_HID4&)PowerPC::ppcState.spr[SPR_HID4])
-#define DMAU  (*(UReg_DMAU*)&PowerPC::ppcState.spr[SPR_DMAU])
-#define DMAL  (*(UReg_DMAL*)&PowerPC::ppcState.spr[SPR_DMAL])
-#define MMCR0 ((UReg_MMCR0&)PowerPC::ppcState.spr[SPR_MMCR0])
-#define MMCR1 ((UReg_MMCR1&)PowerPC::ppcState.spr[SPR_MMCR1])
-#define PC     PowerPC::ppcState.pc
-#define NPC    PowerPC::ppcState.npc
-#define FPSCR  ((UReg_FPSCR&)PowerPC::ppcState.fpscr)
-#define MSR    PowerPC::ppcState.msr
-#define GPR(n) PowerPC::ppcState.gpr[n]
-
-#define rGPR PowerPC::ppcState.gpr
-#define rSPR(i) PowerPC::ppcState.spr[i]
-#define LR     PowerPC::ppcState.spr[SPR_LR]
-#define CTR    PowerPC::ppcState.spr[SPR_CTR]
-#define rDEC    PowerPC::ppcState.spr[SPR_DEC]
-#define SRR0   PowerPC::ppcState.spr[SPR_SRR0]
-#define SRR1   PowerPC::ppcState.spr[SPR_SRR1]
-#define SPRG0  PowerPC::ppcState.spr[SPR_SPRG0]	
-#define SPRG1  PowerPC::ppcState.spr[SPR_SPRG1]
-#define SPRG2  PowerPC::ppcState.spr[SPR_SPRG2]
-#define SPRG3  PowerPC::ppcState.spr[SPR_SPRG3]
-#define GQR(x) PowerPC::ppcState.spr[SPR_GQR0+x]
-#define TL	   PowerPC::ppcState.spr[SPR_TL]
-#define TU	   PowerPC::ppcState.spr[SPR_TU]
-
-#define rPS0(i)	(*(double*)(&PowerPC::ppcState.ps[i][0]))
-#define rPS1(i) (*(double*)(&PowerPC::ppcState.ps[i][1]))
-
-#define riPS0(i) (*(u64*)(&PowerPC::ppcState.ps[i][0]))
-#define riPS1(i) (*(u64*)(&PowerPC::ppcState.ps[i][1]))
-
-}  // namespace
-
-// Fast CR system - store them in single bytes instead of nibbles to not have to
-// mask/shift them out.
-
-// These are intended to stay fast, probably become faster, and are not likely to slow down much if at all.
-inline void SetCRField(int cr_field, int value) {
-	PowerPC::ppcState.cr_fast[cr_field] = value;
-}
-
-inline u32 GetCRField(int cr_field) {
-	return PowerPC::ppcState.cr_fast[cr_field];
-}
-
-inline u32 GetCRBit(int bit) {
-	return (PowerPC::ppcState.cr_fast[bit >> 2] >> (3 - (bit & 3))) & 1;
-}
-
-inline void SetCRBit(int bit, int value) {
-	if (value & 1)
-		PowerPC::ppcState.cr_fast[bit >> 2] |= 0x8 >> (bit & 3);
-	else
-		PowerPC::ppcState.cr_fast[bit >> 2] &= ~(0x8 >> (bit & 3));
-}
-
-// SetCR and GetCR are fairly slow. Should be avoided if possible.
-inline void SetCR(u32 new_cr) {
-	PowerPC::ppcState.cr = new_cr;
-	PowerPC::ExpandCR();
-}
-
-inline u32 GetCR() {
-	PowerPC::CompactCR();
-	return PowerPC::ppcState.cr;
-}
-
-// SetCarry/GetCarry may speed up soon.
-inline void SetCarry(int ca) {
-	((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]).CA = ca;
-}
-
-inline int GetCarry() {
-	return ((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]).CA;
-}
-
-inline UReg_XER GetXER() {
-	return ((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]);
-}
-
-inline void SetXER(UReg_XER new_xer) {
-	((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]) = new_xer;
-}
-
-inline int GetXER_SO() {
-	return ((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]).SO;
-}
-
-inline void SetXER_SO(int value) {
-	((UReg_XER&)PowerPC::ppcState.spr[SPR_XER]).SO = value;
-}
-
-void UpdateFPRF(double dvalue);
-
-#endif
diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp
deleted file mode 100644
index 77da606e52..0000000000
--- a/Source/Core/Core/Src/PowerPC/Profiler.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "JitInterface.h"
-
-namespace Profiler
-{
-
-bool g_ProfileBlocks;
-bool g_ProfileInstructions;
-
-void WriteProfileResults(const char *filename)
-{
-	JitInterface::WriteProfileResults(filename);
-}
-
-}  // namespace
diff --git a/Source/Core/Core/Src/PowerPC/Profiler.h b/Source/Core/Core/Src/PowerPC/Profiler.h
deleted file mode 100644
index b15d911a97..0000000000
--- a/Source/Core/Core/Src/PowerPC/Profiler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _PROFILER_H
-#define _PROFILER_H
-
-#ifdef _WIN32
-
-#ifdef _M_IX86
-#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt)		\
-					LEA(32, EAX, M(pt)); PUSH(EAX);	\
-					CALL(QueryPerformanceCounter)
-// TODO: r64 way
-// asm write : (u64) dt += t1-t0 
-#define PROFILER_ADD_DIFF_LARGE_INTEGER(pdt, pt1, pt0)	\
-					MOV(32, R(EAX), M(pt1));	\
-					SUB(32, R(EAX), M(pt0));	\
-					MOV(32, R(ECX), M(((u8*)pt1) + 4));	\
-					SBB(32, R(ECX), M(((u8*)pt0) + 4));	\
-					ADD(32, R(EAX), M(pdt));	\
-					MOV(32, R(EDX), M(((u8*)pdt) + 4));	\
-					ADC(32, R(EDX), R(ECX));			\
-					MOV(32, M(pdt), R(EAX));	\
-					MOV(32, M(((u8*)pdt) + 4), R(EDX))
-
-#define PROFILER_VPUSH	PUSH(EAX);PUSH(ECX);PUSH(EDX)
-#define PROFILER_VPOP	POP(EDX);POP(ECX);POP(EAX)
-
-#else
-
-#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) 
-#define PROFILER_ADD_DIFF_LARGE_INTEGER(pdt, pt1, pt0) 
-#define PROFILER_VPUSH
-#define PROFILER_VPOP
-#endif
-
-#else
-// TODO
-#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) 
-#define PROFILER_ADD_DIFF_LARGE_INTEGER(pdt, pt1, pt0) 
-#define PROFILER_VPUSH
-#define PROFILER_VPOP
-#endif
-
-struct BlockStat
-{
-	BlockStat(int bn, u64 c) : blockNum(bn), cost(c) {}
-	int blockNum;
-	u64 cost;
-
-	bool operator <(const BlockStat &other) const
-	{ return cost > other.cost; }
-};
-
-namespace Profiler
-{
-extern bool g_ProfileBlocks;
-extern bool g_ProfileInstructions;
-
-void WriteProfileResults(const char *filename);
-}
-
-#endif  // _PROFILER_H
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp
deleted file mode 100644
index 1292f1e6c3..0000000000
--- a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "PPCAnalyst.h"
-#include "../HW/Memmap.h"
-#include "FileUtil.h"
-
-#include "SignatureDB.h"
-#include "PPCSymbolDB.h"
-
-namespace {
-
-// On-disk format for SignatureDB entries.
-struct FuncDesc
-{
-	u32 checkSum;
-	u32 size;
-	char name[128];
-};
-
-}  // namespace
-
-bool SignatureDB::Load(const char *filename)
-{
-	File::IOFile f(filename, "rb");
-	if (!f)
-		return false;
-	u32 fcount = 0;
-	f.ReadArray(&fcount, 1);
-	for (size_t i = 0; i < fcount; i++)
-	{
-		FuncDesc temp;
-		memset(&temp, 0, sizeof(temp));
-
-		f.ReadArray(&temp, 1);
-		temp.name[sizeof(temp.name)-1] = 0;
-
-		DBFunc dbf;
-		dbf.name = temp.name;
-		dbf.size = temp.size;
-		database[temp.checkSum] = dbf;
-	}
-
-	return true;
-}
-
-bool SignatureDB::Save(const char *filename)
-{
-	File::IOFile f(filename, "wb");
-	if (!f)
-	{
-		ERROR_LOG(OSHLE, "Database save failed");
-		return false;
-	}
-	u32 fcount = (u32)database.size();
-	f.WriteArray(&fcount, 1);
-	for (FuncDB::const_iterator iter = database.begin(); iter != database.end(); ++iter)
-	{
-		FuncDesc temp;
-		memset(&temp, 0, sizeof(temp));
-		temp.checkSum = iter->first;
-		temp.size = iter->second.size;
-		strncpy(temp.name, iter->second.name.c_str(), 127);
-		f.WriteArray(&temp, 1);
-	}
-
-	INFO_LOG(OSHLE, "Database save successful");
-	return true;
-}
-
-//Adds a known function to the hash database
-u32 SignatureDB::Add(u32 startAddr, u32 size, const char *name)
-{
-	u32 hash = ComputeCodeChecksum(startAddr, startAddr + size);
-
-	DBFunc temp_dbfunc;
-	temp_dbfunc.size = size;
-	temp_dbfunc.name = name;
-
-	FuncDB::iterator iter = database.find(hash);
-	if (iter == database.end())
-		database[hash] = temp_dbfunc;
-	return hash;
-}
-
-void SignatureDB::List()
-{
-	for (FuncDB::iterator iter = database.begin(); iter != database.end(); ++iter)
-	{
-		INFO_LOG(OSHLE, "%s : %i bytes, hash = %08x", iter->second.name.c_str(), iter->second.size, iter->first);
-	}
-	INFO_LOG(OSHLE, "%lu functions known in current database.",
-		(unsigned long)database.size());
-}
-
-void SignatureDB::Clear()
-{
-	database.clear();
-}
-
-void SignatureDB::Apply(PPCSymbolDB *symbol_db)
-{
-	for (FuncDB::const_iterator iter = database.begin(); iter != database.end(); ++iter)
-	{
-		u32 hash = iter->first;
-		Symbol *function = symbol_db->GetSymbolFromHash(hash);
-		if (function)
-		{
-			// Found the function. Let's rename it according to the symbol file.
-			if (iter->second.size == (unsigned int)function->size)
-			{
-				function->name = iter->second.name;
-				INFO_LOG(OSHLE, "Found %s at %08x (size: %08x)!", iter->second.name.c_str(), function->address, function->size);
-			}
-			else 
-			{
-				function->name = iter->second.name;
-				ERROR_LOG(OSHLE, "Wrong size! Found %s at %08x (size: %08x instead of %08x)!", iter->second.name.c_str(), function->address, function->size, iter->second.size);
-			}
-		}
-	}
-	symbol_db->Index();
-}
-
-void SignatureDB::Initialize(PPCSymbolDB *symbol_db, const char *prefix)
-{
-	std::string prefix_str(prefix);
-	for (PPCSymbolDB::XFuncMap::const_iterator iter = symbol_db->GetConstIterator(); iter != symbol_db->End(); ++iter)
-	{
-		if ((iter->second.name.substr(0, prefix_str.size()) == prefix_str) || prefix_str.empty())
-		{
-			DBFunc temp_dbfunc;
-			temp_dbfunc.name = iter->second.name;
-			temp_dbfunc.size = iter->second.size;
-			database[iter->second.hash] = temp_dbfunc;
-		}
-	}
-}
-
-/*static*/ u32 SignatureDB::ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd)
-{
-	u32 sum = 0;
-	for (u32 offset = offsetStart; offset <= offsetEnd; offset += 4) 
-	{
-		u32 opcode = Memory::Read_Instruction(offset);
-		u32 op = opcode & 0xFC000000; 
-		u32 op2 = 0;
-		u32 op3 = 0;
-		u32 auxop = op >> 26;
-		switch (auxop) 
-		{
-		case 4: //PS instructions
-			op2 = opcode & 0x0000003F;
-			switch ( op2 ) 
-			{
-			case 0:
-			case 8:
-			case 16:
-			case 21:
-			case 22:
-				op3 = opcode & 0x000007C0;
-			}
-			break;
-
-		case 7: //addi muli etc
-		case 8:
-		case 10:
-		case 11:
-		case 12:
-		case 13:
-		case 14:
-		case 15:
-			op2 = opcode & 0x03FF0000;
-			break;
-		
-		case 19: // MCRF??
-		case 31: //integer
-		case 63: //fpu
-			op2 = opcode & 0x000007FF;
-			break;
-		case 59: //fpu
-			op2 = opcode & 0x0000003F;
-			if (op2 < 16)
-				op3 = opcode & 0x000007C0;
-			break;
-		default:
-			if (auxop >= 32  && auxop < 56)
-				op2 = opcode & 0x03FF0000;
-			break;
-		}
-		// Checksum only uses opcode, not opcode data, because opcode data changes 
-		// in all compilations, but opcodes don't!
-		sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) );
-		sum = sum ^ (op | op2 | op3);
-	}
-	return sum;
-}
-
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.h b/Source/Core/Core/Src/PowerPC/SignatureDB.h
deleted file mode 100644
index 181a76ce38..0000000000
--- a/Source/Core/Core/Src/PowerPC/SignatureDB.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include <map>
-#include <string>
-
-// You're not meant to keep around SignatureDB objects persistently. Use 'em, throw them away.
-
-class PPCSymbolDB;
-
-class SignatureDB
-{
-	struct DBFunc
-	{
-		std::string name;
-		u32 size;
-		DBFunc() : size(0)
-		{
-		}
-	};
-
-	// Map from signature to function. We store the DB in this map because it optimizes the
-	// most common operation - lookup. We don't care about ordering anyway.
-	typedef std::map<u32, DBFunc> FuncDB;
-	FuncDB database;
-
-public:
-	// Returns the hash.
-	u32 Add(u32 startAddr, u32 size, const char *name);
-
-	bool Load(const char *filename);  // Does not clear. Remember to clear first if that's what you want.
-	bool Save(const char *filename);
-	void Clean(const char *prefix);
-	void Clear();
-	void List();
-	
-	void Initialize(PPCSymbolDB *func_db, const char *prefix = "");
-	void Apply(PPCSymbolDB *func_db);
-
-	static u32 ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd);
-};
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
deleted file mode 100644
index 24647c143a..0000000000
--- a/Source/Core/Core/Src/State.cpp
+++ /dev/null
@@ -1,638 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Timer.h"
-#include "State.h"
-#include "Core.h"
-#include "ConfigManager.h"
-#include "StringUtil.h"
-#include "Thread.h"
-#include "CoreTiming.h"
-#include "Movie.h"
-#include "HW/Wiimote.h"
-#include "HW/DSP.h"
-#include "HW/HW.h"
-#include "HW/CPU.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "VideoBackendBase.h"
-
-#include <lzo/lzo1x.h>
-#include "HW/Memmap.h"
-#include "HW/VideoInterface.h"
-#include "HW/SystemTimers.h"
-
-namespace State
-{
-
-#if defined(__LZO_STRICT_16BIT)
-static const u32 IN_LEN = 8 * 1024u;
-#elif defined(LZO_ARCH_I086) && !defined(LZO_HAVE_MM_HUGE_ARRAY)
-static const u32 IN_LEN = 60 * 1024u;
-#else
-static const u32 IN_LEN = 128 * 1024u;
-#endif
-
-static const u32 OUT_LEN = IN_LEN + (IN_LEN / 16) + 64 + 3;
-
-static unsigned char __LZO_MMODEL out[OUT_LEN];
-
-#define HEAP_ALLOC(var, size) \
-	lzo_align_t __LZO_MMODEL var[((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t)]
-
-static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS);
-
-static std::string g_last_filename;
-
-static CallbackFunc g_onAfterLoadCb = NULL;
-
-// Temporary undo state buffer
-static std::vector<u8> g_undo_load_buffer;
-static std::vector<u8> g_current_buffer;
-static int g_loadDepth = 0;
-
-static std::mutex g_cs_undo_load_buffer;
-static std::mutex g_cs_current_buffer;
-static Common::Event g_compressAndDumpStateSyncEvent;
-
-static std::thread g_save_thread;
-
-// Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 20;
-
-enum
-{
-	STATE_NONE = 0,
-	STATE_SAVE = 1,
-	STATE_LOAD = 2,
-};
-
-static bool g_use_compression = true;
-
-void EnableCompression(bool compression)
-{
-	g_use_compression = compression;
-}
-
-void DoState(PointerWrap &p)
-{
-	u32 version = STATE_VERSION;
-	{
-		static const u32 COOKIE_BASE = 0xBAADBABE;
-		u32 cookie = version + COOKIE_BASE;
-		p.Do(cookie);
-		version = cookie - COOKIE_BASE;
-	}
-
-	if (version != STATE_VERSION)
-	{
-		// if the version doesn't match, fail.
-		// this will trigger a message like "Can't load state from other revisions"
-		// we could use the version numbers to maintain some level of backward compatibility, but currently don't.
-		p.SetMode(PointerWrap::MODE_MEASURE);
-		return;
-	}
-
-	p.DoMarker("Version");
-
-	// Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM
-	g_video_backend->DoState(p);
-	p.DoMarker("video_backend");
-
-	if (Core::g_CoreStartupParameter.bWii)
-		Wiimote::DoState(p.GetPPtr(), p.GetMode());
-	p.DoMarker("Wiimote");
-
-	PowerPC::DoState(p);
-	p.DoMarker("PowerPC");
-	HW::DoState(p);
-	p.DoMarker("HW");
-	CoreTiming::DoState(p);
-	p.DoMarker("CoreTiming");
-	Movie::DoState(p);
-	p.DoMarker("Movie");
-}
-
-void LoadFromBuffer(std::vector<u8>& buffer)
-{
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-	u8* ptr = &buffer[0];
-	PointerWrap p(&ptr, PointerWrap::MODE_READ);
-	DoState(p);
-
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-void SaveToBuffer(std::vector<u8>& buffer)
-{
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-	u8* ptr = NULL;
-	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
-
-	DoState(p);
-	const size_t buffer_size = reinterpret_cast<size_t>(ptr);
-	buffer.resize(buffer_size);
-	
-	ptr = &buffer[0];
-	p.SetMode(PointerWrap::MODE_WRITE);
-	DoState(p);
-
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-void VerifyBuffer(std::vector<u8>& buffer)
-{
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-	u8* ptr = &buffer[0];
-	PointerWrap p(&ptr, PointerWrap::MODE_VERIFY);
-	DoState(p);
-
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-// return state number not in map
-int GetEmptySlot(std::map<double, int> m)
-{
-	for (int i = 1; i <= (int)NUM_STATES; i++)
-	{
-		bool found = false;
-		for (std::map<double, int>::iterator it = m.begin(); it != m.end(); it++)
-		{
-			if (it->second == i)
-			{
-				found = true;
-				break;
-			}
-		}
-		if (!found) return i;
-	}
-	return -1;
-}
-
-static std::string MakeStateFilename(int number);
-
-// read state timestamps
-std::map<double, int> GetSavedStates()
-{
-	StateHeader header;
-	std::map<double, int> m;
-	for (int i = 1; i <= (int)NUM_STATES; i++)
-	{
-		if (File::Exists(MakeStateFilename(i)))
-		{
-			if (ReadHeader(MakeStateFilename(i), header))
-			{
-				double d = Common::Timer::GetDoubleTime() - header.time;
-				// increase time until unique value is obtained
-				while (m.find(d) != m.end()) d += .001;
-				m.insert(std::pair<double,int>(d, i));
-			}
-		}
-	}
-	return m;
-}
-
-struct CompressAndDumpState_args
-{
-	std::vector<u8>* buffer_vector;
-	std::mutex* buffer_mutex;
-	std::string filename;
-	bool wait;
-};
-
-void CompressAndDumpState(CompressAndDumpState_args save_args)
-{
-	std::lock_guard<std::mutex> lk(*save_args.buffer_mutex);
-	if (!save_args.wait)
-		g_compressAndDumpStateSyncEvent.Set();
-
-	const u8* const buffer_data = &(*(save_args.buffer_vector))[0];
-	const size_t buffer_size = (save_args.buffer_vector)->size();
-	std::string& filename = save_args.filename;
-
-	// For easy debugging
-	Common::SetCurrentThreadName("SaveState thread");
-
-	// Moving to last overwritten save-state
-	if (File::Exists(filename))
-	{
-		if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"))
-			File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"));
-		if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"))
-			File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"));
-
-		if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"))
-			Core::DisplayMessage("Failed to move previous state to state undo backup", 1000);
-		else 
-			File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm");
-	}
-
-	if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState())
-		Movie::SaveRecording((filename + ".dtm").c_str());
-	else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput())
-		File::Delete(filename + ".dtm");
-
-	File::IOFile f(filename, "wb");
-	if (!f)
-	{
-		Core::DisplayMessage("Could not save state", 2000);
-		g_compressAndDumpStateSyncEvent.Set();
-		return;
-	}
-
-	// Setting up the header
-	StateHeader header;
-	memcpy(header.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), 6);
-	header.size = g_use_compression ? buffer_size : 0;
-	header.time = Common::Timer::GetDoubleTime();
-
-	f.WriteArray(&header, 1);
-
-	if (0 != header.size)	// non-zero header size means the state is compressed
-	{
-		lzo_uint i = 0;
-		while (true)
-		{
-			lzo_uint32 cur_len = 0;
-			lzo_uint out_len = 0;
-
-			if ((i + IN_LEN) >= buffer_size)
-				cur_len = buffer_size - i;
-			else
-				cur_len = IN_LEN;
-
-			if (lzo1x_1_compress(buffer_data + i, cur_len, out, &out_len, wrkmem) != LZO_E_OK)
-				PanicAlertT("Internal LZO Error - compression failed");
-
-			// The size of the data to write is 'out_len'
-			f.WriteArray((lzo_uint32*)&out_len, 1);
-			f.WriteBytes(out, out_len);
-
-			if (cur_len != IN_LEN)
-				break;
-
-			i += cur_len;
-		}
-	}
-	else	// uncompressed
-	{
-		f.WriteBytes(buffer_data, buffer_size);
-	}
-
-	Core::DisplayMessage(StringFromFormat("Saved State to %s",
-		filename.c_str()).c_str(), 2000);
-	g_compressAndDumpStateSyncEvent.Set();
-}
-
-void SaveAs(const std::string& filename, bool wait)
-{
-	// Pause the core while we save the state
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-	// Measure the size of the buffer.
-	u8 *ptr = NULL;
-	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
-	DoState(p);
-	const size_t buffer_size = reinterpret_cast<size_t>(ptr);
-
-	// Then actually do the write.
-	{
-		std::lock_guard<std::mutex> lk(g_cs_current_buffer);
-		g_current_buffer.resize(buffer_size);
-		ptr = &g_current_buffer[0];
-		p.SetMode(PointerWrap::MODE_WRITE);
-		DoState(p);
-	}
-
-	if (p.GetMode() == PointerWrap::MODE_WRITE)
-	{
-		Core::DisplayMessage("Saving State...", 1000);
-
-		CompressAndDumpState_args save_args;
-		save_args.buffer_vector = &g_current_buffer;
-		save_args.buffer_mutex = &g_cs_current_buffer;
-		save_args.filename = filename;
-		save_args.wait = wait;
-
-		Flush();
-		g_save_thread = std::thread(CompressAndDumpState, save_args);
-		g_compressAndDumpStateSyncEvent.Wait();
-
-		g_last_filename = filename;
-	}
-	else
-	{
-		// someone aborted the save by changing the mode?
-		Core::DisplayMessage("Unable to Save : Internal DoState Error", 4000);
-	}
-
-	// Resume the core and disable stepping
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-bool ReadHeader(const std::string filename, StateHeader& header)
-{
-	Flush();
-	File::IOFile f(filename, "rb");
-	if (!f)
-	{
-		Core::DisplayMessage("State not found", 2000);
-		return false;
-	}
-
-	f.ReadArray(&header, 1);
-	return true;
-}
-
-void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
-{
-	Flush();
-	File::IOFile f(filename, "rb");
-	if (!f)
-	{
-		Core::DisplayMessage("State not found", 2000);
-		return;
-	}
-
-	StateHeader header;
-	f.ReadArray(&header, 1);
-	
-	if (memcmp(SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), header.gameID, 6)) 
-	{
-		Core::DisplayMessage(StringFromFormat("State belongs to a different game (ID %.*s)",
-			6, header.gameID), 2000);
-		return;
-	}
-
-	std::vector<u8> buffer;
-
-	if (0 != header.size)	// non-zero size means the state is compressed
-	{
-		Core::DisplayMessage("Decompressing State...", 500);
-
-		buffer.resize(header.size);
-
-		lzo_uint i = 0;
-		while (true)
-		{
-			lzo_uint32 cur_len = 0;  // number of bytes to read
-			lzo_uint new_len = 0;  // number of bytes to write
-
-			if (!f.ReadArray(&cur_len, 1))
-				break;
-
-			f.ReadBytes(out, cur_len);
-			const int res = lzo1x_decompress(out, cur_len, &buffer[i], &new_len, NULL);
-			if (res != LZO_E_OK)
-			{
-				// This doesn't seem to happen anymore.
-				PanicAlertT("Internal LZO Error - decompression failed (%d) (%li, %li) \n"
-					"Try loading the state again", res, i, new_len);
-				return;
-			}
-	
-			i += new_len;
-		}
-	}
-	else	// uncompressed
-	{
-		const size_t size = (size_t)(f.GetSize() - sizeof(StateHeader));
-		buffer.resize(size);
-
-		if (!f.ReadBytes(&buffer[0], size))
-		{
-			PanicAlert("wtf? reading bytes: %i", (int)size);
-			return;
-		}
-	}
-
-	// all good
-	ret_data.swap(buffer);
-}
-
-void LoadAs(const std::string& filename)
-{
-	// Stop the core while we load the state
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-#if defined _DEBUG && defined _WIN32
-	// we use _CRTDBG_DELAY_FREE_MEM_DF (as a speed hack?),
-	// but it was causing us to leak gigantic amounts of memory here,
-	// enough that only a few savestates could be loaded before crashing,
-	// so let's disable it temporarily.
-	int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-	if (g_loadDepth == 0)
-		_CrtSetDbgFlag(tmpflag & ~_CRTDBG_DELAY_FREE_MEM_DF);
-#endif
-
-	g_loadDepth++;
-
-	// Save temp buffer for undo load state
-	if (!Movie::IsJustStartingRecordingInputFromSaveState())
-	{
-		std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
-		SaveToBuffer(g_undo_load_buffer);
-		if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
-			Movie::SaveRecording("undo.dtm");
-		else if (File::Exists("undo.dtm"))
-			File::Delete("undo.dtm");
-	}
-
-	bool loaded = false;
-	bool loadedSuccessfully = false;
-
-	// brackets here are so buffer gets freed ASAP
-	{
-		std::vector<u8> buffer;
-		LoadFileStateData(filename, buffer);
-
-		if (!buffer.empty())
-		{
-			u8 *ptr = &buffer[0];
-			PointerWrap p(&ptr, PointerWrap::MODE_READ);
-			DoState(p);
-			loaded = true;
-			loadedSuccessfully = (p.GetMode() == PointerWrap::MODE_READ);
-		}
-	}
-
-	if (loaded)
-	{
-		if (loadedSuccessfully)
-		{
-			Core::DisplayMessage(StringFromFormat("Loaded state from %s", filename.c_str()).c_str(), 2000);
-			if (File::Exists(filename + ".dtm"))
-				Movie::LoadInput((filename + ".dtm").c_str());
-			else if (!Movie::IsJustStartingRecordingInputFromSaveState() && !Movie::IsJustStartingPlayingInputFromSaveState())
-				Movie::EndPlayInput(false);
-		}
-		else
-		{
-			// failed to load
-			Core::DisplayMessage("Unable to Load : Can't load state from other revisions !", 4000);
-
-			// since we could be in an inconsistent state now (and might crash or whatever), undo.
-			if (g_loadDepth < 2)
-				UndoLoadState();
-		}
-	}
-
-	if (g_onAfterLoadCb)
-		g_onAfterLoadCb();
-
-	g_loadDepth--;
-
-#if defined _DEBUG && defined _WIN32
-	// restore _CRTDBG_DELAY_FREE_MEM_DF
-	if (g_loadDepth == 0)
-		_CrtSetDbgFlag(tmpflag);
-#endif
-
-	// resume dat core
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-void SetOnAfterLoadCallback(CallbackFunc callback)
-{
-	g_onAfterLoadCb = callback;
-}
-
-void VerifyAt(const std::string& filename)
-{
-	bool wasUnpaused = Core::PauseAndLock(true);
-
-	std::vector<u8> buffer;
-	LoadFileStateData(filename, buffer);
-
-	if (!buffer.empty())
-	{
-		u8 *ptr = &buffer[0];
-		PointerWrap p(&ptr, PointerWrap::MODE_VERIFY);
-		DoState(p);
-
-		if (p.GetMode() == PointerWrap::MODE_VERIFY)
-			Core::DisplayMessage(StringFromFormat("Verified state at %s", filename.c_str()).c_str(), 2000);
-		else
-			Core::DisplayMessage("Unable to Verify : Can't verify state from other revisions !", 4000);
-	}
-
-	Core::PauseAndLock(false, wasUnpaused);
-}
-
-
-void Init()
-{
-	if (lzo_init() != LZO_E_OK)
-		PanicAlertT("Internal LZO Error - lzo_init() failed");
-}
-
-void Shutdown()
-{
-	Flush();
-
-	// swapping with an empty vector, rather than clear()ing
-	// this gives a better guarantee to free the allocated memory right NOW (as opposed to, actually, never)
-	{
-		std::lock_guard<std::mutex> lk(g_cs_current_buffer);
-		std::vector<u8>().swap(g_current_buffer);
-	}
-
-	{
-		std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
-		std::vector<u8>().swap(g_undo_load_buffer);
-	}
-}
-
-static std::string MakeStateFilename(int number)
-{
-	return StringFromFormat("%s%s.s%02i", File::GetUserPath(D_STATESAVES_IDX).c_str(),
-		SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), number);
-}
-
-void Save(int slot, bool wait)
-{
-	SaveAs(MakeStateFilename(slot), wait);
-}
-
-void Load(int slot)
-{
-	LoadAs(MakeStateFilename(slot));
-}
-
-void Verify(int slot)
-{
-	VerifyAt(MakeStateFilename(slot));
-}
-
-void LoadLastSaved(int i)
-{
-	std::map<double, int> savedStates = GetSavedStates();
-
-	if (i > (int)savedStates.size())
-		Core::DisplayMessage("State doesn't exist", 2000);
-	else
-	{
-		std::map<double, int>::iterator it = savedStates.begin();
-		std::advance(it, i-1);
-		Load(it->second);
-	}
-}
-
-// must wait for state to be written because it must know if all slots are taken
-void SaveFirstSaved()
-{
-	std::map<double, int> savedStates = GetSavedStates();
-
-	// save to an empty slot
-	if (savedStates.size() < NUM_STATES)
-		Save(GetEmptySlot(savedStates), true);
-	// overwrite the oldest state
-	else
-	{
-		std::map<double, int>::iterator it = savedStates.begin();
-		std::advance(it, savedStates.size()-1);
-		Save(it->second, true);
-	}
-}
-
-void Flush()
-{
-	// If already saving state, wait for it to finish
-	if (g_save_thread.joinable())
-		g_save_thread.join();
-}
-
-// Load the last state before loading the state
-void UndoLoadState()
-{
-	std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
-	if (!g_undo_load_buffer.empty())
-	{
-		if (File::Exists("undo.dtm") || (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()))
-		{
-			LoadFromBuffer(g_undo_load_buffer);
-			if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
-				Movie::LoadInput("undo.dtm");
-		}
-		else
-		{
-			PanicAlert("No undo.dtm found, aborting undo load state to prevent movie desyncs");
-		}
-	}
-	else
-	{
-		PanicAlert("There is nothing to undo!");
-	}
-}
-
-// Load the state that the last save state overwritten on
-void UndoSaveState()
-{
-		LoadAs((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav").c_str());
-}
-
-} // namespace State
diff --git a/Source/Core/Core/Src/Tracer.cpp b/Source/Core/Core/Src/Tracer.cpp
deleted file mode 100644
index a57d40b006..0000000000
--- a/Source/Core/Core/Src/Tracer.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdlib.h>
-
-#include "Common.h"
-#include "Tracer.h"
-#include "FileUtil.h"
-
-#include "Host.h"
-
-#include "PowerPC/PowerPC.h"
-
-namespace Core {
-
-File::IOFile tracefile;
-
-bool bReadTrace = false;
-bool bWriteTrace = false;
-
-void StartTrace(bool write)
-{
-	if (write)
-	{
-		tracefile.Open("L:\\trace.dat", "wb");
-		bReadTrace = false;
-		bWriteTrace = true;
-	}
-	else
-	{
-		tracefile.Open("L:\\trace.dat", "rb");
-		bReadTrace = true;
-		bWriteTrace = false;
-	}
-}
-
-void StopTrace()
-{
-	tracefile.Close();
-}
-
-static int stateSize = 32*4;// + 32*16 + 6*4;
-
-int SyncTrace()
-{
-	if (bWriteTrace)
-	{
-		tracefile.WriteBytes(&PowerPC::ppcState, stateSize);
-		tracefile.Flush();
-		return 1;
-	}
-	if (bReadTrace)
-	{
-		PowerPC::PowerPCState state;
-		if (!tracefile.ReadBytes(&state, stateSize))
-			return 1;
-
-		bool difference = false;
-		for (int i=0; i<32; i++)
-		{
-			if (PowerPC::ppcState.gpr[i] != state.gpr[i])
-			{
-				DEBUG_LOG(POWERPC, "DIFFERENCE - r%i (local %08x, remote %08x)", i, PowerPC::ppcState.gpr[i], state.gpr[i]);
-				difference = true;
-			}
-		}
-/*
-		for (int i=0; i<32; i++)
-		{
-			for (int j=0; j<2; j++)
-			{
-				if (PowerPC::ppcState.ps[i][j] != state.ps[i][j])
-				{
-					LOG(GEKKO, "DIFFERENCE - ps%i_%i (local %f, remote %f)", i, j, PowerPC::ppcState.ps[i][j], state.ps[i][j]);
-					difference = true;
-				}
-			}
-		}*/
-		/*
-		if (GetCR() != state.cr)
-		{
-			LOG(GEKKO, "DIFFERENCE - CR (local %08x, remote %08x)", PowerPC::ppcState.cr, state.cr);
-			difference = true;
-		}
-		if (PowerPC::ppcState.pc != state.pc)
-		{
-			LOG(GEKKO, "DIFFERENCE - PC (local %08x, remote %08x)", PowerPC::ppcState.pc, state.pc);
-			difference = true;
-		}
-		if (PowerPC::ppcState.npc != state.npc)
-		{
-			LOG(GEKKO, "DIFFERENCE - NPC (local %08x, remote %08x)", PowerPC::ppcState.npc, state.npc);
-			difference = true;
-		}
-		if (PowerPC::ppcState.msr != state.msr)
-		{
-			LOG(GEKKO, "DIFFERENCE - MSR (local %08x, remote %08x)", PowerPC::ppcState.msr, state.msr);
-			difference = true;
-		}
-		if (PowerPC::ppcState.fpscr != state.fpscr)
-		{
-			LOG(GEKKO, "DIFFERENCE - FPSCR (local %08x, remote %08x)", PowerPC::ppcState.fpscr, state.fpscr);
-			difference = true;
-		}
-*/
-		if (difference)
-		{
-			Host_UpdateLogDisplay();
-			//Also show drec compare window here
-			//CDynaViewDlg::Show(true);
-			//CDynaViewDlg::ViewAddr(m_BlockStart);
-			//CDynaViewDlg::Show(true);
-			//PanicAlert("Hang on");
-			//Sleep(INFINITE);
-			return 0;
-		}
-		else
-		{
-			return 1;
-			//LOG(GEKKO, "No difference!");
-		}
-	}
-	return 1;
-
-}
-
-} // end of namespace Core
diff --git a/Source/Core/Core/Src/Tracer.h b/Source/Core/Core/Src/Tracer.h
deleted file mode 100644
index 8f06a8966b..0000000000
--- a/Source/Core/Core/Src/Tracer.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TRACER_H_
-#define _TRACER_H_
-
-
-#endif
-
diff --git a/Source/Core/Core/Src/VolumeHandler.cpp b/Source/Core/Core/Src/VolumeHandler.cpp
deleted file mode 100644
index 19058cd354..0000000000
--- a/Source/Core/Core/Src/VolumeHandler.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VolumeHandler.h"
-#include "VolumeCreator.h"
-
-namespace VolumeHandler
-{
-
-DiscIO::IVolume* g_pVolume = NULL;
-
-DiscIO::IVolume *GetVolume()
-{
-	return g_pVolume;
-}
-
-void EjectVolume() 
-{
-	if (g_pVolume)
-	{
-		// This code looks scary. Can the try/catch stuff be removed?
-		// This cause a "Unhandled exception ... Access violation
-		// reading location ..." after you have started and stopped two
-		// or three games
-		delete g_pVolume;
-		g_pVolume = NULL;
-	}
-}
-
-bool SetVolumeName(const std::string& _rFullPath)
-{
-	if (g_pVolume)
-	{
-		delete g_pVolume;
-		g_pVolume = NULL;
-	}
-
-	g_pVolume = DiscIO::CreateVolumeFromFilename(_rFullPath);
-
-	return (g_pVolume != NULL);
-}
-
-void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
-{
-	if (g_pVolume)
-	{
-		delete g_pVolume;
-		g_pVolume = NULL;
-	}
-
-	g_pVolume = DiscIO::CreateVolumeFromDirectory(_rFullPath, _bIsWii, _rApploader, _rDOL);
-}
-
-u32 Read32(u64 _Offset)
-{
-	if (g_pVolume != NULL)
-	{
-		u32 Temp;
-		g_pVolume->Read(_Offset, 4, (u8*)&Temp);
-		return Common::swap32(Temp);
-	}
-	return 0;
-}
-
-bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
-{
-	if (g_pVolume != NULL && ptr)
-	{
-		g_pVolume->Read(_dwOffset, _dwLength, ptr);
-		return true;
-	}
-	return false;
-}
-
-bool RAWReadToPtr( u8* ptr, u64 _dwOffset, u64 _dwLength )
-{
-	if (g_pVolume != NULL && ptr)
-	{
-		g_pVolume->RAWRead(_dwOffset, _dwLength, ptr);
-		return true;
-	}
-	return false;
-}
-
-bool IsValid()
-{
-	return (g_pVolume != NULL);
-}
-
-bool IsWii()
-{
-	if (g_pVolume)
-		return IsVolumeWiiDisc(g_pVolume);
-
-	return false;
-}
-
-} // end of namespace VolumeHandler
diff --git a/Source/Core/Core/Src/VolumeHandler.h b/Source/Core/Core/Src/VolumeHandler.h
deleted file mode 100644
index 11387d115c..0000000000
--- a/Source/Core/Core/Src/VolumeHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// Disc volume handler. It's here because Wii discs can consist of multiple volumes.
-// GC discs are seen as one big volume.
-
-#ifndef _VOLUMEHANDLER_H_
-#define _VOLUMEHANDLER_H_
-
-#include <string>
-#include "CommonTypes.h"
-#include "Volume.h"
-
-namespace VolumeHandler
-{
-
-bool SetVolumeName(const std::string& _rFullPath);
-void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = "");
-
-u32 Read32(u64 _Offset);
-bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength);
-bool RAWReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength);
-
-bool IsValid();
-bool IsWii();
-
-DiscIO::IVolume *GetVolume();
-
-void EjectVolume();
-
-} // end of namespace VolumeHandler
-
-#endif
diff --git a/Source/Core/Core/Src/ec_wii.h b/Source/Core/Core/Src/ec_wii.h
deleted file mode 100644
index 969b3b53df..0000000000
--- a/Source/Core/Core/Src/ec_wii.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Based off of twintig http://git.infradead.org/?p=users/segher/wii.git
-// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
-// Licensed under the terms of the GNU GPL, version 2
-// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
-/*
- *
- * Structs for keys.bin taken from:
- *
- *	mini - a Free Software replacement for the Nintendo/BroadOn IOS.
- *	crypto hardware support
- *
- * Copyright (C) 2008, 2009	Haxx Enterprises <bushing@gmail.com>
- * Copyright (C) 2008, 2009	Sven Peter <svenpeter@gmail.com>
- * Copyright (C) 2008, 2009	Hector Martin "marcan" <marcan@marcansoft.com>
- *
- * # This code is licensed to you under the terms of the GNU GPL, version 2;
- * # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
- */
-
-#ifndef _ECWII_H
-#define _ECWII_H
-
-#include "Common.h"
-
-void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
-void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id);
-
-void make_blanksig_ec_cert(u8 *cert_out, const char *signer, const char *name, const u8 *private_key, u32 key_id);
-void get_shared_secret(u8* shared_secret_out, u8* remote_public_key, const u8* NG_priv);
-
-
-
-class EcWii
-{
-public:
-	EcWii();
-	~EcWii();
-	static EcWii& GetInstance();
-	u32 getNgId() 			{return Common::swap32(BootMiiKeysBin.ng_id);}
-	u32 getNgKeyId() 		{return Common::swap32(BootMiiKeysBin.ng_key_id);}
-	const u8* getNgPriv() 	{return BootMiiKeysBin.ng_priv;}
-	const u8* getNgSig() 	{return BootMiiKeysBin.ng_sig;};
-private:
-	void InitDefaults();
-
-	#pragma pack(push,1)
-	typedef struct
-	{
-		u8 boot2version;
-		u8 unknown1;
-		u8 unknown2;
-		u8 pad;
-		u32 update_tag;
-		u16 checksum;
-	}
-#ifndef _WIN32
-	__attribute__((packed))
-#endif
-	eep_ctr_t;
-
-	struct
-	{
-		u8 creator				[0x100]; // 0x000
-		u8 boot1_hash			[ 0x14]; // 0x100
-		u8 common_key			[ 0x10]; // 0x114
-		u32 ng_id; 						 // 0x124
-		union {
-			struct {
-				u8 ng_priv		[ 0x1e]; // 0x128
-				u8 pad1			[ 0x12];
-			};
-			struct {
-				u8 pad2			[ 0x1c];
-				u8 nand_hmac	[ 0x14]; //0x144
-			};
-		};
-		u8 nand_key				[ 0x10]; //0x158
-		u8 rng_key				[ 0x10]; //0x168
-		u32 unk1;						 //0x178
-		u32 unk2;						 //0x17C
-		u8 eeprom_pad			[ 0x80]; //0x180
-
-		u32 ms_id;						 //0x200
-		u32 ca_id;						 //0x204
-		u32 ng_key_id;					 //0x208
-		u8 ng_sig				[ 0x3c]; //0x20c
-		eep_ctr_t counters		[ 0x02]; //0x248
-		u8 fill					[ 0x18]; //0x25c
-		u8 korean_key			[ 0x10]; //0x274
-		u8 pad3					[ 0x74]; //0x284
-		u16 prng_seed			[ 0x02]; //0x2F8
-		u8 pad4					[ 0x04]; //0x2FC
-
-		u8 crack_pad			[0x100]; //0x300
-
-	}
-
-	#ifndef _WIN32
-	__attribute__((packed))
-	#endif
-
-	BootMiiKeysBin;
-
-	#pragma pack(pop)
-
-};
-
-#endif
diff --git a/Source/Core/Core/Src/stdafx.cpp b/Source/Core/Core/Src/stdafx.cpp
deleted file mode 100644
index b602b39925..0000000000
--- a/Source/Core/Core/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
diff --git a/Source/Core/Core/Src/stdafx.h b/Source/Core/Core/Src/stdafx.h
deleted file mode 100644
index ef9e560412..0000000000
--- a/Source/Core/Core/Src/stdafx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp
deleted file mode 100644
index 9d854238d5..0000000000
--- a/Source/Core/Core/Src/x64MemTools.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <stdio.h>
-#include <signal.h>
-#ifndef ANDROID
-#include <sys/ucontext.h>   // Look in here for the context definition.
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <mach/mach.h>
-#include <mach/message.h>
-#include "Thread.h"
-#endif
-
-#ifdef __APPLE__
-#define CREG_RAX(ctx) (*(ctx))->__ss.__rax
-#define CREG_RIP(ctx) (*(ctx))->__ss.__rip
-#define CREG_EAX(ctx) (*(ctx))->__ss.__eax
-#define CREG_EIP(ctx) (*(ctx))->__ss.__eip
-#elif defined __FreeBSD__
-#define CREG_RAX(ctx) (ctx)->mc_rax
-#define CREG_RIP(ctx) (ctx)->mc_rip
-#define CREG_EAX(ctx) (ctx)->mc_eax
-#define CREG_EIP(ctx) (ctx)->mc_eip
-#elif defined __linux__
-#define CREG_RAX(ctx) (ctx)->gregs[REG_RAX]
-#define CREG_RIP(ctx) (ctx)->gregs[REG_RIP]
-#define CREG_EAX(ctx) (ctx)->gregs[REG_EAX]
-#define CREG_EIP(ctx) (ctx)->gregs[REG_EIP]
-#elif defined __NetBSD__
-#define CREG_RAX(ctx) (ctx)->__gregs[_REG_RAX]
-#define CREG_RIP(ctx) (ctx)->__gregs[_REG_RIP]
-#define CREG_EAX(ctx) (ctx)->__gregs[_REG_EAX]
-#define CREG_EIP(ctx) (ctx)->__gregs[_REG_EIP]
-#endif
-
-#include <vector>
-
-#include "Common.h"
-#include "MemTools.h"
-#include "HW/Memmap.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitInterface.h"
-#ifndef _M_GENERIC
-#include "PowerPC/JitCommon/JitBase.h"
-#endif
-#include "x64Analyzer.h"
-
-namespace EMM
-{
-
-#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__
-#include <execinfo.h>
-void print_trace(const char * msg)
-{
-	void *array[100];
-	size_t size;
-	char **strings;
-	size_t i;
-
-	size = backtrace(array, 100);
-	strings = backtrace_symbols(array, size);
-	printf("%s Obtained %u stack frames.\n", msg, (unsigned int)size);
-	for (i = 0; i < size; i++)
-		printf("--> %s\n", strings[i]);
-	free(strings);
-}
-#endif
-
-bool DoFault(u64 bad_address, CONTEXT *ctx)
-{
-	if (!JitInterface::IsInCodeSpace((u8*) CONTEXT_PC(ctx)))
-	{
-		// Let's not prevent debugging.
-		return false;
-	}
-
-	u64 memspace_bottom = (u64)Memory::base;
-	u64 memspace_top = memspace_bottom +
-#ifdef _M_X64
-		0x100000000ULL;
-#else
-		0x40000000;
-#endif
-
-	if (bad_address < memspace_bottom || bad_address >= memspace_top) {
-		return false;
-	}
-	u32 em_address = (u32)(bad_address - memspace_bottom);
-	const u8 *new_pc = jit->BackPatch((u8*) CONTEXT_PC(ctx), em_address, ctx);
-	if (new_pc)
-	{
-		CONTEXT_PC(ctx) = (u64) new_pc;
-	}
-
-	return true;
-}
-
-#ifdef _WIN32
-
-LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
-{
-	switch (pPtrs->ExceptionRecord->ExceptionCode)
-	{
-	case EXCEPTION_ACCESS_VIOLATION:
-		{
-			int accessType = (int)pPtrs->ExceptionRecord->ExceptionInformation[0];
-			if (accessType == 8) //Rule out DEP
-			{
-				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
-			}
-
-			//Where in the x86 code are we?
-			PVOID codeAddr = pPtrs->ExceptionRecord->ExceptionAddress;
-			unsigned char *codePtr = (unsigned char*)codeAddr;
-			u64 badAddress = (u64)pPtrs->ExceptionRecord->ExceptionInformation[1];
-			CONTEXT *ctx = pPtrs->ContextRecord;
-
-			if (DoFault(badAddress, ctx))
-			{
-				return (DWORD)EXCEPTION_CONTINUE_EXECUTION;
-			}
-			else
-			{
-				// Let's not prevent debugging.
-				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
-			}
-
-		}
-
-	case EXCEPTION_STACK_OVERFLOW:
-		MessageBox(0, _T("Stack overflow!"), 0,0);
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	case EXCEPTION_ILLEGAL_INSTRUCTION:
-		//No SSE support? Or simply bad codegen?
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	case EXCEPTION_PRIV_INSTRUCTION:
-		//okay, dynarec codegen is obviously broken.
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	case EXCEPTION_IN_PAGE_ERROR:
-		//okay, something went seriously wrong, out of memory?
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	case EXCEPTION_BREAKPOINT:
-		//might want to do something fun with this one day?
-		return EXCEPTION_CONTINUE_SEARCH;
-
-	default:
-		return EXCEPTION_CONTINUE_SEARCH;
-	}
-}
-
-void InstallExceptionHandler()
-{
-#ifdef _M_X64
-	// Make sure this is only called once per process execution
-	// Instead, could make a Uninstall function, but whatever..
-	static bool handlerInstalled = false;
-	if (handlerInstalled)
-		return;
-
-	AddVectoredExceptionHandler(TRUE, Handler);
-	handlerInstalled = true;
-#endif
-}
-
-#elif defined(__APPLE__)
-
-void CheckKR(const char* name, kern_return_t kr)
-{
-	if (kr)
-	{
-		PanicAlertT("%s failed: kr=%x", name, kr);
-	}
-}
-
-#ifdef _M_X64
-void ExceptionThread(mach_port_t port)
-{
-	Common::SetCurrentThreadName("Mach exception thread");
-	#pragma pack(4)
-	struct
-	{
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		int64_t code[2];
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[x86_THREAD_STATE64_COUNT];
-		mach_msg_trailer_t trailer;
-	} msg_in;
-
-	struct
-	{
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[x86_THREAD_STATE64_COUNT];
-	} msg_out;
-	#pragma pack()
-	memset(&msg_in, 0xee, sizeof(msg_in));
-	memset(&msg_out, 0xee, sizeof(msg_out));
-	mach_msg_header_t *send_msg = NULL;
-	mach_msg_size_t send_size = 0;
-	mach_msg_option_t option = MACH_RCV_MSG;
-	while (1)
-	{
-		// If this isn't the first run, send the reply message.  Then, receive
-		// a message: either a mach_exception_raise_state RPC due to
-		// thread_set_exception_ports, or MACH_NOTIFY_NO_SENDERS due to
-		// mach_port_request_notification.
-		CheckKR("mach_msg_overwrite", mach_msg_overwrite(send_msg, option, send_size, sizeof(msg_in), port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL, &msg_in.Head, 0));
-
-		if (msg_in.Head.msgh_id == MACH_NOTIFY_NO_SENDERS)
-		{
-			// the other thread exited
-			mach_port_destroy(mach_task_self(), port);
-			return;
-		}
-
-		if (msg_in.Head.msgh_id != 2406)
-		{
-			PanicAlertT("unknown message received");
-			return;
-		}
-
-		if (msg_in.flavor != x86_THREAD_STATE64)
-		{
-			PanicAlertT("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64);
-			return;
-		}
-
-		x86_thread_state64_t *state = (x86_thread_state64_t *) msg_in.old_state;
-		CONTEXT fake_ctx;
-		fake_ctx.Rax = state->__rax;
-		fake_ctx.Rip = state->__rip;
-
-		bool ok = DoFault(msg_in.code[1], &fake_ctx);
-
-		state->__rax = fake_ctx.Rax;
-		state->__rip = fake_ctx.Rip;
-
-		// Set up the reply.
-		msg_out.Head.msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(msg_in.Head.msgh_bits), 0);
-		msg_out.Head.msgh_remote_port = msg_in.Head.msgh_remote_port;
-		msg_out.Head.msgh_local_port = MACH_PORT_NULL;
-		msg_out.Head.msgh_id = msg_in.Head.msgh_id + 100;
-		msg_out.NDR = msg_in.NDR;
-		if (ok)
-		{
-			msg_out.RetCode = KERN_SUCCESS;
-			msg_out.flavor = x86_THREAD_STATE64;
-			msg_out.new_stateCnt = x86_THREAD_STATE64_COUNT;
-			memcpy(msg_out.new_state, msg_in.old_state, x86_THREAD_STATE64_COUNT * sizeof(natural_t));
-		}
-		else
-		{
-			// Pass the exception to the next handler (debugger or crash).
-			msg_out.RetCode = KERN_FAILURE;
-			msg_out.flavor = 0;
-			msg_out.new_stateCnt = 0;
-		}
-		msg_out.Head.msgh_size = offsetof(typeof(msg_out), new_state) + msg_out.new_stateCnt * sizeof(natural_t);
-
-		send_msg = &msg_out.Head;
-		send_size = msg_out.Head.msgh_size;
-		option |= MACH_SEND_MSG;
-	}
-}
-#endif
-
-void InstallExceptionHandler()
-{
-#ifdef _M_IX86
-	PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it.");
-#else
-	mach_port_t port;
-	CheckKR("mach_port_allocate", mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &port));
-	std::thread exc_thread(ExceptionThread, port);
-	exc_thread.detach();
-	// Obtain a send right for thread_set_exception_ports to copy...
-	CheckKR("mach_port_insert_right", mach_port_insert_right(mach_task_self(), port, port, MACH_MSG_TYPE_MAKE_SEND));
-	// Mach tries the following exception ports in order: thread, task, host.
-	// Debuggers set the task port, so we grab the thread port.
-	CheckKR("thread_set_exception_ports", thread_set_exception_ports(mach_thread_self(), EXC_MASK_BAD_ACCESS, port, EXCEPTION_STATE | MACH_EXCEPTION_CODES, x86_THREAD_STATE64));
-	// ...and get rid of our copy so that MACH_NOTIFY_NO_SENDERS works.
-	CheckKR("mach_port_mod_refs", mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, -1));
-	mach_port_t previous;
-	CheckKR("mach_port_request_notification", mach_port_request_notification(mach_task_self(), port, MACH_NOTIFY_NO_SENDERS, 0, port, MACH_MSG_TYPE_MAKE_SEND_ONCE, &previous));
-#endif
-}
-
-#elif !defined(ANDROID)
-
-void sigsegv_handler(int sig, siginfo_t *info, void *raw_context)
-{
-#ifndef _M_GENERIC
-	if (sig != SIGSEGV)
-	{
-		// We are not interested in other signals - handle it as usual.
-		return;
-	}
-	ucontext_t *context = (ucontext_t *)raw_context;
-	int sicode = info->si_code;
-	if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR)
-	{
-		// Huh? Return.
-		return;
-	}
-	u64 bad_address = (u64)info->si_addr;
-
-	// Get all the information we can out of the context.
-	mcontext_t *ctx = &context->uc_mcontext;
-	CONTEXT fake_ctx;
-#ifdef _M_X64
-	fake_ctx.Rax = CREG_RAX(ctx);
-	fake_ctx.Rip = CREG_RIP(ctx);
-#else
-	fake_ctx.Eax = CREG_EAX(ctx);
-	fake_ctx.Eip = CREG_EIP(ctx);
-#endif
-	// assume it's not a write
-	if (DoFault(bad_address, &fake_ctx))
-	{
-#ifdef _M_X64
-		CREG_RAX(ctx) = fake_ctx.Rax;
-		CREG_RIP(ctx) = fake_ctx.Rip;
-#else
-		CREG_EAX(ctx) = fake_ctx.Eax;
-		CREG_EIP(ctx) = fake_ctx.Eip;
-#endif
-	}
-	else
-	{
-		// retry and crash
-		signal(SIGSEGV, SIG_DFL);
-	}
-#endif
-}
-
-void InstallExceptionHandler()
-{
-#ifdef _M_IX86
-	PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it.");
-#else
-	struct sigaction sa;
-	sa.sa_handler = 0;
-	sa.sa_sigaction = &sigsegv_handler;
-	sa.sa_flags = SA_SIGINFO;
-	sigemptyset(&sa.sa_mask);
-	sigaction(SIGSEGV, &sa, NULL);
-#endif
-}
-
-#endif
-
-}  // namespace
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
new file mode 100644
index 0000000000..d53cba084e
--- /dev/null
+++ b/Source/Core/Core/State.cpp
@@ -0,0 +1,701 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <mutex>
+#include <string>
+#include <thread>
+#include <lzo/lzo1x.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Movie.h"
+#include "Core/State.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/HW.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#include "VideoCommon/AVIDump.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace State
+{
+
+#if defined(__LZO_STRICT_16BIT)
+static const u32 IN_LEN = 8 * 1024u;
+#elif defined(LZO_ARCH_I086) && !defined(LZO_HAVE_MM_HUGE_ARRAY)
+static const u32 IN_LEN = 60 * 1024u;
+#else
+static const u32 IN_LEN = 128 * 1024u;
+#endif
+
+static const u32 OUT_LEN = IN_LEN + (IN_LEN / 16) + 64 + 3;
+
+static unsigned char __LZO_MMODEL out[OUT_LEN];
+
+#define HEAP_ALLOC(var, size) \
+	lzo_align_t __LZO_MMODEL var[((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t)]
+
+static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS);
+
+static std::string g_last_filename;
+
+static CallbackFunc g_onAfterLoadCb = nullptr;
+
+// Temporary undo state buffer
+static std::vector<u8> g_undo_load_buffer;
+static std::vector<u8> g_current_buffer;
+static int g_loadDepth = 0;
+
+static std::mutex g_cs_undo_load_buffer;
+static std::mutex g_cs_current_buffer;
+static Common::Event g_compressAndDumpStateSyncEvent;
+
+static std::thread g_save_thread;
+
+// Don't forget to increase this after doing changes on the savestate system
+static const u32 STATE_VERSION = 44; // Last changed in PR 2464
+
+// Maps savestate versions to Dolphin versions.
+// Versions after 42 don't need to be added to this list,
+// beacuse they save the exact Dolphin version to savestates.
+static const std::map<u32, std::pair<std::string, std::string>> s_old_versions =
+{
+	// The 16 -> 17 change modified the size of StateHeader,
+	// so version older than that can't even be decompressed anymore
+	{ 17, { "3.5-1311", "3.5-1364" } },
+	{ 18, { "3.5-1366", "3.5-1371" } },
+	{ 19, { "3.5-1372", "3.5-1408" } },
+	{ 20, { "3.5-1409", "4.0-704" } },
+	{ 21, { "4.0-705", "4.0-889" } },
+	{ 22, { "4.0-905", "4.0-1871" } },
+	{ 23, { "4.0-1873", "4.0-1900" } },
+	{ 24, { "4.0-1902", "4.0-1919" } },
+	{ 25, { "4.0-1921", "4.0-1936" } },
+	{ 26, { "4.0-1939", "4.0-1959" } },
+	{ 27, { "4.0-1961", "4.0-2018" } },
+	{ 28, { "4.0-2020", "4.0-2291" } },
+	{ 29, { "4.0-2293", "4.0-2360" } },
+	{ 30, { "4.0-2362", "4.0-2628" } },
+	{ 31, { "4.0-2632", "4.0-3331" } },
+	{ 32, { "4.0-3334", "4.0-3340" } },
+	{ 33, { "4.0-3342", "4.0-3373" } },
+	{ 34, { "4.0-3376", "4.0-3402" } },
+	{ 35, { "4.0-3409", "4.0-3603" } },
+	{ 36, { "4.0-3610", "4.0-4480" } },
+	{ 37, { "4.0-4484", "4.0-4943" } },
+	{ 38, { "4.0-4963", "4.0-5267" } },
+	{ 39, { "4.0-5279", "4.0-5525" } },
+	{ 40, { "4.0-5531", "4.0-5809" } },
+	{ 41, { "4.0-5811", "4.0-5923" } },
+	{ 42, { "4.0-5925", "4.0-5946" } }
+};
+
+enum
+{
+	STATE_NONE = 0,
+	STATE_SAVE = 1,
+	STATE_LOAD = 2,
+};
+
+static bool g_use_compression = true;
+
+void EnableCompression(bool compression)
+{
+	g_use_compression = compression;
+}
+
+static std::string DoState(PointerWrap& p)
+{
+	u32 version = STATE_VERSION;
+	{
+		static const u32 COOKIE_BASE = 0xBAADBABE;
+		u32 cookie = version + COOKIE_BASE;
+		p.Do(cookie);
+		version = cookie - COOKIE_BASE;
+	}
+
+	std::string version_created_by = scm_rev_str;
+	if (version > 42)
+		p.Do(version_created_by);
+	else
+		version_created_by.clear();
+
+	if (version != STATE_VERSION)
+	{
+		if (version_created_by.empty() && s_old_versions.count(version))
+		{
+			// The savestate is from an old version that doesn't
+			// save the Dolphin version number to savestates, but
+			// by looking up the savestate version number, it is possible
+			// to know approximately which Dolphin version was used.
+
+			std::pair<std::string, std::string> version_range = s_old_versions.find(version)->second;
+			std::string oldest_version = version_range.first;
+			std::string newest_version = version_range.second;
+
+			version_created_by = "Dolphin " + oldest_version + " - " + newest_version;
+		}
+
+		// because the version doesn't match, fail.
+		// this will trigger an OSD message like "Can't load state from other revisions"
+		// we could use the version numbers to maintain some level of backward compatibility, but currently don't.
+		p.SetMode(PointerWrap::MODE_MEASURE);
+		return version_created_by;
+	}
+
+	p.DoMarker("Version");
+
+	// Begin with video backend, so that it gets a chance to clear its caches and writeback modified things to RAM
+	g_video_backend->DoState(p);
+	p.DoMarker("video_backend");
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+		Wiimote::DoState(p.GetPPtr(), p.GetMode());
+	p.DoMarker("Wiimote");
+
+	PowerPC::DoState(p);
+	p.DoMarker("PowerPC");
+	HW::DoState(p);
+	p.DoMarker("HW");
+	CoreTiming::DoState(p);
+	p.DoMarker("CoreTiming");
+	Movie::DoState(p);
+	p.DoMarker("Movie");
+
+#if defined(HAVE_LIBAV) || defined (WIN32)
+	AVIDump::DoState();
+#endif
+
+	return version_created_by;
+}
+
+void LoadFromBuffer(std::vector<u8>& buffer)
+{
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	u8* ptr = &buffer[0];
+	PointerWrap p(&ptr, PointerWrap::MODE_READ);
+	DoState(p);
+
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+void SaveToBuffer(std::vector<u8>& buffer)
+{
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	u8* ptr = nullptr;
+	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
+
+	DoState(p);
+	const size_t buffer_size = reinterpret_cast<size_t>(ptr);
+	buffer.resize(buffer_size);
+
+	ptr = &buffer[0];
+	p.SetMode(PointerWrap::MODE_WRITE);
+	DoState(p);
+
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+void VerifyBuffer(std::vector<u8>& buffer)
+{
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	u8* ptr = &buffer[0];
+	PointerWrap p(&ptr, PointerWrap::MODE_VERIFY);
+	DoState(p);
+
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+// return state number not in map
+static int GetEmptySlot(std::map<double, int> m)
+{
+	for (int i = 1; i <= (int)NUM_STATES; i++)
+	{
+		bool found = false;
+		for (auto& p : m)
+		{
+			if (p.second == i)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (!found)
+			return i;
+	}
+	return -1;
+}
+
+static std::string MakeStateFilename(int number);
+
+// read state timestamps
+static std::map<double, int> GetSavedStates()
+{
+	StateHeader header;
+	std::map<double, int> m;
+	for (int i = 1; i <= (int)NUM_STATES; i++)
+	{
+		std::string filename = MakeStateFilename(i);
+		if (File::Exists(filename))
+		{
+			if (ReadHeader(filename, header))
+			{
+				double d = Common::Timer::GetDoubleTime() - header.time;
+				// increase time until unique value is obtained
+				while (m.find(d) != m.end()) d += .001;
+				m.insert(std::pair<double,int>(d, i));
+			}
+		}
+	}
+	return m;
+}
+
+struct CompressAndDumpState_args
+{
+	std::vector<u8>* buffer_vector;
+	std::mutex* buffer_mutex;
+	std::string filename;
+	bool wait;
+};
+
+static void CompressAndDumpState(CompressAndDumpState_args save_args)
+{
+	std::lock_guard<std::mutex> lk(*save_args.buffer_mutex);
+	if (!save_args.wait)
+		g_compressAndDumpStateSyncEvent.Set();
+
+	const u8* const buffer_data = &(*(save_args.buffer_vector))[0];
+	const size_t buffer_size = (save_args.buffer_vector)->size();
+	std::string& filename = save_args.filename;
+
+	// For easy debugging
+	Common::SetCurrentThreadName("SaveState thread");
+
+	// Moving to last overwritten save-state
+	if (File::Exists(filename))
+	{
+		if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"))
+			File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"));
+		if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"))
+			File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"));
+
+		if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"))
+			Core::DisplayMessage("Failed to move previous state to state undo backup", 1000);
+		else
+			File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm");
+	}
+
+	if ((Movie::IsMovieActive()) && !Movie::IsJustStartingRecordingInputFromSaveState())
+		Movie::SaveRecording(filename + ".dtm");
+	else if (!Movie::IsMovieActive())
+		File::Delete(filename + ".dtm");
+
+	File::IOFile f(filename, "wb");
+	if (!f)
+	{
+		Core::DisplayMessage("Could not save state", 2000);
+		g_compressAndDumpStateSyncEvent.Set();
+		return;
+	}
+
+	// Setting up the header
+	StateHeader header;
+	memcpy(header.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), 6);
+	header.size = g_use_compression ? (u32)buffer_size : 0;
+	header.time = Common::Timer::GetDoubleTime();
+
+	f.WriteArray(&header, 1);
+
+	if (header.size != 0) // non-zero header size means the state is compressed
+	{
+		lzo_uint i = 0;
+		while (true)
+		{
+			lzo_uint32 cur_len = 0;
+			lzo_uint out_len = 0;
+
+			if ((i + IN_LEN) >= buffer_size)
+			{
+				cur_len = (lzo_uint32)(buffer_size - i);
+			}
+			else
+			{
+				cur_len = IN_LEN;
+			}
+
+			if (lzo1x_1_compress(buffer_data + i, cur_len, out, &out_len, wrkmem) != LZO_E_OK)
+				PanicAlertT("Internal LZO Error - compression failed");
+
+			// The size of the data to write is 'out_len'
+			f.WriteArray((lzo_uint32*)&out_len, 1);
+			f.WriteBytes(out, out_len);
+
+			if (cur_len != IN_LEN)
+				break;
+
+			i += cur_len;
+		}
+	}
+	else // uncompressed
+	{
+		f.WriteBytes(buffer_data, buffer_size);
+	}
+
+	Core::DisplayMessage(StringFromFormat("Saved State to %s", filename.c_str()), 2000);
+	g_compressAndDumpStateSyncEvent.Set();
+}
+
+void SaveAs(const std::string& filename, bool wait)
+{
+	// Pause the core while we save the state
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	// Measure the size of the buffer.
+	u8 *ptr = nullptr;
+	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
+	DoState(p);
+	const size_t buffer_size = reinterpret_cast<size_t>(ptr);
+
+	// Then actually do the write.
+	{
+		std::lock_guard<std::mutex> lk(g_cs_current_buffer);
+		g_current_buffer.resize(buffer_size);
+		ptr = &g_current_buffer[0];
+		p.SetMode(PointerWrap::MODE_WRITE);
+		DoState(p);
+	}
+
+	if (p.GetMode() == PointerWrap::MODE_WRITE)
+	{
+		Core::DisplayMessage("Saving State...", 1000);
+
+		CompressAndDumpState_args save_args;
+		save_args.buffer_vector = &g_current_buffer;
+		save_args.buffer_mutex = &g_cs_current_buffer;
+		save_args.filename = filename;
+		save_args.wait = wait;
+
+		Flush();
+		g_save_thread = std::thread(CompressAndDumpState, save_args);
+		g_compressAndDumpStateSyncEvent.Wait();
+
+		g_last_filename = filename;
+	}
+	else
+	{
+		// someone aborted the save by changing the mode?
+		Core::DisplayMessage("Unable to save: Internal DoState Error", 4000);
+	}
+
+	// Resume the core and disable stepping
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+bool ReadHeader(const std::string& filename, StateHeader& header)
+{
+	Flush();
+	File::IOFile f(filename, "rb");
+	if (!f)
+	{
+		Core::DisplayMessage("State not found", 2000);
+		return false;
+	}
+
+	f.ReadArray(&header, 1);
+	return true;
+}
+
+static void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
+{
+	Flush();
+	File::IOFile f(filename, "rb");
+	if (!f)
+	{
+		Core::DisplayMessage("State not found", 2000);
+		return;
+	}
+
+	StateHeader header;
+	f.ReadArray(&header, 1);
+
+	if (memcmp(SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), header.gameID, 6))
+	{
+		Core::DisplayMessage(StringFromFormat("State belongs to a different game (ID %.*s)",
+			6, header.gameID), 2000);
+		return;
+	}
+
+	std::vector<u8> buffer;
+
+	if (header.size != 0) // non-zero size means the state is compressed
+	{
+		Core::DisplayMessage("Decompressing State...", 500);
+
+		buffer.resize(header.size);
+
+		lzo_uint i = 0;
+		while (true)
+		{
+			lzo_uint32 cur_len = 0;  // number of bytes to read
+			lzo_uint new_len = 0;  // number of bytes to write
+
+			if (!f.ReadArray(&cur_len, 1))
+				break;
+
+			f.ReadBytes(out, cur_len);
+			const int res = lzo1x_decompress(out, cur_len, &buffer[i], &new_len, nullptr);
+			if (res != LZO_E_OK)
+			{
+				// This doesn't seem to happen anymore.
+				PanicAlertT("Internal LZO Error - decompression failed (%d) (%li, %li) \n"
+					"Try loading the state again", res, i, new_len);
+				return;
+			}
+
+			i += new_len;
+		}
+	}
+	else // uncompressed
+	{
+		const size_t size = (size_t)(f.GetSize() - sizeof(StateHeader));
+		buffer.resize(size);
+
+		if (!f.ReadBytes(&buffer[0], size))
+		{
+			PanicAlert("wtf? reading bytes: %i", (int)size);
+			return;
+		}
+	}
+
+	// all good
+	ret_data.swap(buffer);
+}
+
+void LoadAs(const std::string& filename)
+{
+	if (!Core::IsRunning())
+		return;
+
+	// Stop the core while we load the state
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	g_loadDepth++;
+
+	// Save temp buffer for undo load state
+	if (!Movie::IsJustStartingRecordingInputFromSaveState())
+	{
+		std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
+		SaveToBuffer(g_undo_load_buffer);
+		if (Movie::IsMovieActive())
+			Movie::SaveRecording(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm");
+		else if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) +"undo.dtm"))
+			File::Delete(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm");
+	}
+
+	bool loaded = false;
+	bool loadedSuccessfully = false;
+	std::string version_created_by;
+
+	// brackets here are so buffer gets freed ASAP
+	{
+		std::vector<u8> buffer;
+		LoadFileStateData(filename, buffer);
+
+		if (!buffer.empty())
+		{
+			u8 *ptr = &buffer[0];
+			PointerWrap p(&ptr, PointerWrap::MODE_READ);
+			version_created_by = DoState(p);
+			loaded = true;
+			loadedSuccessfully = (p.GetMode() == PointerWrap::MODE_READ);
+		}
+	}
+
+	if (loaded)
+	{
+		if (loadedSuccessfully)
+		{
+			Core::DisplayMessage(StringFromFormat("Loaded state from %s", filename.c_str()), 2000);
+			if (File::Exists(filename + ".dtm"))
+				Movie::LoadInput(filename + ".dtm");
+			else if (!Movie::IsJustStartingRecordingInputFromSaveState() && !Movie::IsJustStartingPlayingInputFromSaveState())
+				Movie::EndPlayInput(false);
+		}
+		else
+		{
+			// failed to load
+			Core::DisplayMessage("Unable to load: Can't load state from other versions!", 4000);
+			if (!version_created_by.empty())
+				Core::DisplayMessage("The savestate was created using " + version_created_by, 4000);
+
+			// since we could be in an inconsistent state now (and might crash or whatever), undo.
+			if (g_loadDepth < 2)
+				UndoLoadState();
+		}
+	}
+
+	if (g_onAfterLoadCb)
+		g_onAfterLoadCb();
+
+	g_loadDepth--;
+
+	// resume dat core
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+void SetOnAfterLoadCallback(CallbackFunc callback)
+{
+	g_onAfterLoadCb = callback;
+}
+
+void VerifyAt(const std::string& filename)
+{
+	bool wasUnpaused = Core::PauseAndLock(true);
+
+	std::vector<u8> buffer;
+	LoadFileStateData(filename, buffer);
+
+	if (!buffer.empty())
+	{
+		u8 *ptr = &buffer[0];
+		PointerWrap p(&ptr, PointerWrap::MODE_VERIFY);
+		DoState(p);
+
+		if (p.GetMode() == PointerWrap::MODE_VERIFY)
+			Core::DisplayMessage(StringFromFormat("Verified state at %s", filename.c_str()), 2000);
+		else
+			Core::DisplayMessage("Unable to Verify : Can't verify state from other revisions !", 4000);
+	}
+
+	Core::PauseAndLock(false, wasUnpaused);
+}
+
+
+void Init()
+{
+	if (lzo_init() != LZO_E_OK)
+		PanicAlertT("Internal LZO Error - lzo_init() failed");
+}
+
+void Shutdown()
+{
+	Flush();
+
+	// swapping with an empty vector, rather than clear()ing
+	// this gives a better guarantee to free the allocated memory right NOW (as opposed to, actually, never)
+	{
+		std::lock_guard<std::mutex> lk(g_cs_current_buffer);
+		std::vector<u8>().swap(g_current_buffer);
+	}
+
+	{
+		std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
+		std::vector<u8>().swap(g_undo_load_buffer);
+	}
+}
+
+static std::string MakeStateFilename(int number)
+{
+	return StringFromFormat("%s%s.s%02i", File::GetUserPath(D_STATESAVES_IDX).c_str(),
+		SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), number);
+}
+
+void Save(int slot, bool wait)
+{
+	SaveAs(MakeStateFilename(slot), wait);
+}
+
+void Load(int slot)
+{
+	LoadAs(MakeStateFilename(slot));
+}
+
+void Verify(int slot)
+{
+	VerifyAt(MakeStateFilename(slot));
+}
+
+void LoadLastSaved(int i)
+{
+	std::map<double, int> savedStates = GetSavedStates();
+
+	if (i > (int)savedStates.size())
+		Core::DisplayMessage("State doesn't exist", 2000);
+	else
+	{
+		std::map<double, int>::iterator it = savedStates.begin();
+		std::advance(it, i-1);
+		Load(it->second);
+	}
+}
+
+// must wait for state to be written because it must know if all slots are taken
+void SaveFirstSaved()
+{
+	std::map<double, int> savedStates = GetSavedStates();
+
+	// save to an empty slot
+	if (savedStates.size() < NUM_STATES)
+		Save(GetEmptySlot(savedStates), true);
+	// overwrite the oldest state
+	else
+	{
+		std::map<double, int>::iterator it = savedStates.begin();
+		std::advance(it, savedStates.size()-1);
+		Save(it->second, true);
+	}
+}
+
+void Flush()
+{
+	// If already saving state, wait for it to finish
+	if (g_save_thread.joinable())
+		g_save_thread.join();
+}
+
+// Load the last state before loading the state
+void UndoLoadState()
+{
+	std::lock_guard<std::mutex> lk(g_cs_undo_load_buffer);
+	if (!g_undo_load_buffer.empty())
+	{
+		if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm") || (!Movie::IsMovieActive()))
+		{
+			LoadFromBuffer(g_undo_load_buffer);
+			if (Movie::IsMovieActive())
+				Movie::LoadInput(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm");
+		}
+		else
+		{
+			PanicAlertT("No undo.dtm found, aborting undo load state to prevent movie desyncs");
+		}
+	}
+	else
+	{
+		PanicAlertT("There is nothing to undo!");
+	}
+}
+
+// Load the state that the last save state overwritten on
+void UndoSaveState()
+{
+	LoadAs(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav");
+}
+
+} // namespace State
diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/State.h
similarity index 80%
rename from Source/Core/Core/Src/State.h
rename to Source/Core/Core/State.h
index 8da3a4d537..342f761697 100644
--- a/Source/Core/Core/Src/State.h
+++ b/Source/Core/Core/State.h
@@ -1,16 +1,17 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 
 // Emulator state saving support.
 
-#ifndef _STATE_H_
-#define _STATE_H_
+#pragma once
 
 #include <string>
 #include <vector>
 
+#include "Common/CommonTypes.h"
+
 namespace State
 {
 
@@ -30,11 +31,11 @@ void Shutdown();
 
 void EnableCompression(bool compression);
 
-bool ReadHeader(const std::string filename, StateHeader& header);
+bool ReadHeader(const std::string& filename, StateHeader& header);
 
 // These don't happen instantly - they get scheduled as events.
-// ...But only if we're not in the main cpu thread.
-//    If we're in the main cpu thread then they run immediately instead
+// ...But only if we're not in the main CPU thread.
+//    If we're in the main CPU thread then they run immediately instead
 //    because some things (like Lua) need them to run immediately.
 // Slots from 0-99.
 void Save(int slot, bool wait = false);
@@ -62,5 +63,3 @@ typedef void(*CallbackFunc)(void);
 void SetOnAfterLoadCallback(CallbackFunc callback);
 
 }
-
-#endif
diff --git a/Source/Core/Core/Src/ec_wii.cpp b/Source/Core/Core/ec_wii.cpp
similarity index 79%
rename from Source/Core/Core/Src/ec_wii.cpp
rename to Source/Core/Core/ec_wii.cpp
index 5a68cc6fb5..d786d8fe75 100644
--- a/Source/Core/Core/Src/ec_wii.cpp
+++ b/Source/Core/Core/ec_wii.cpp
@@ -1,5 +1,5 @@
 // Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 // Based off of twintig http://git.infradead.org/?p=users/segher/wii.git
@@ -7,14 +7,15 @@
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-#include <stdio.h>
+#include <cstdio>
 #include <string.h>
-#include "Common.h"
-#include "Crypto/aes.h"
-#include "polarssl/sha1.h"
-#include "Crypto/tools.h"
-#include "FileUtil.h"
-#include "ec_wii.h"
+
+#include <polarssl/sha1.h>
+
+#include "Common/FileUtil.h"
+#include "Common/Crypto/ec.h"
+
+#include "Core/ec_wii.h"
 
 static u32 default_NG_id = 0x0403AC68;
 static u32 default_NG_key_id = 0x6AAB8C59;
@@ -41,12 +42,12 @@ static u8 default_NG_sig[] = {
 // NG_key_id is the device-unique key_id to use
 // NG_priv is the device-unique private key to use
 // NG_sig is the device-unique signature blob (from issuer) to use
-// if NG_priv iis NULL or NG_sig is NULL or NG_id is 0 or NG_key_id is 0, default values
+// if NG_priv iis nullptr or NG_sig is nullptr or NG_id is 0 or NG_key_id is 0, default values
 // will be used for all of them
 void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig)
 {
 	char name[64];
-	if ((NG_id==0)||(NG_key_id==0)||(NG_priv==NULL)||(NG_sig==NULL))
+	if ((NG_id == 0) || (NG_key_id == 0) || (NG_priv == nullptr) || (NG_sig == nullptr))
 	{
 		NG_id = default_NG_id;
 		NG_key_id = default_NG_key_id;
@@ -69,7 +70,7 @@ void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, c
 // data_size is the length of the buffer
 // NG_priv is the device-unique private key to use
 // NG_id is the device-unique id to use
-// if NG_priv is NULL or NG_id is 0, it will use builtin defaults
+// if NG_priv is nullptr or NG_id is 0, it will use builtin defaults
 void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id)
 {
 	u8 hash[20];
@@ -77,7 +78,7 @@ void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u
 	char signer[64];
 	char name[64];
 
-	if ((NG_id==0)||(NG_priv == NULL))
+	if ((NG_id == 0) || (NG_priv == nullptr))
 	{
 		NG_priv = default_NG_priv;
 		NG_id = default_NG_id;
@@ -90,14 +91,14 @@ void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u
 	// get_rand_bytes(ap_priv, 0x1e);
 	// ap_priv[0] &= 1;
 
-	memset(ap_cert_out+4, 0, 60);
+	memset(ap_cert_out + 4, 0, 60);
 
 	sprintf(signer, "Root-CA00000001-MS00000002-NG%08x", NG_id);
-	sprintf(name, "AP%08x%08x", (u32)(title_id>>32), (u32)(title_id&0xffffffff));
+	sprintf(name, "AP%08x%08x", (u32)(title_id >> 32), (u32)(title_id & 0xffffffff));
 	make_blanksig_ec_cert(ap_cert_out, signer, name, ap_priv, 0);
 
 	sha1(ap_cert_out + 0x80, 0x100, hash);
-	generate_ecdsa(ap_cert_out+4, ap_cert_out+34, NG_priv, hash);
+	generate_ecdsa(ap_cert_out + 4, ap_cert_out + 34, NG_priv, hash);
 
 	sha1(data, data_size, hash);
 	generate_ecdsa(sig_out, sig_out + 30, ap_priv, hash);
@@ -115,31 +116,10 @@ void make_blanksig_ec_cert(u8 *cert_out, const char *signer, const char *name, c
 	ec_priv_to_pub(private_key, cert_out + 0x108);
 }
 
-
-// get_shared_secret
-
-// shared_secret_out is a pointer to 0x3c long buffer
-// remote_public_key is a pointer to the remote party's public key (0x3c bytes)
-// NG_priv is the device-unique private key to use
-// if NG_priv is NULL, default builtin will be used
-void get_shared_secret(u8* shared_secret_out, u8* remote_public_key, u8* NG_priv)
-{
-	if (NG_priv==NULL)
-	{
-		NG_priv = default_NG_priv;
-	}
-
-	// required point_mul in Source/Core/Common/Src/Crypto/ec.cpp
-	// to be made non-static
-
-	point_mul(shared_secret_out, NG_priv, remote_public_key);
-
-}
-
 EcWii::EcWii()
 {
 	bool init = true;
-	std::string keys_path = File::GetUserPath(D_WIIUSER_IDX) + "keys.bin";
+	std::string keys_path = File::GetUserPath(D_WIIROOT_IDX) + "/keys.bin";
 	if (File::Exists(keys_path))
 	{
 		File::IOFile keys_f(keys_path, "rb");
diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h
new file mode 100644
index 0000000000..03d563cc36
--- /dev/null
+++ b/Source/Core/Core/ec_wii.h
@@ -0,0 +1,113 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Based off of twintig http://git.infradead.org/?p=users/segher/wii.git
+// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
+// Licensed under the terms of the GNU GPL, version 2
+// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+/*
+ *
+ * Structs for keys.bin taken from:
+ *
+ * mini - a Free Software replacement for the Nintendo/BroadOn IOS.
+ * crypto hardware support
+ *
+ * Copyright (C) 2008, 2009 Haxx Enterprises <bushing@gmail.com>
+ * Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com>
+ * Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com>
+ *
+ * # This code is licensed to you under the terms of the GNU GPL, version 2;
+ * # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+ */
+
+#pragma once
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+
+void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
+void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id);
+
+void make_blanksig_ec_cert(u8 *cert_out, const char *signer, const char *name, const u8 *private_key, u32 key_id);
+
+
+class EcWii
+{
+public:
+	EcWii();
+	~EcWii();
+	static EcWii& GetInstance();
+	u32 getNgId()         {return Common::swap32(BootMiiKeysBin.ng_id);}
+	u32 getNgKeyId()      {return Common::swap32(BootMiiKeysBin.ng_key_id);}
+	const u8* getNgPriv() {return BootMiiKeysBin.ng_priv;}
+	const u8* getNgSig()  {return BootMiiKeysBin.ng_sig;}
+private:
+	void InitDefaults();
+
+	#pragma pack(push,1)
+	typedef struct
+	{
+		u8 boot2version;
+		u8 unknown1;
+		u8 unknown2;
+		u8 pad;
+		u32 update_tag;
+		u16 checksum;
+	}
+#ifndef _WIN32
+	__attribute__((packed))
+#endif
+	eep_ctr_t;
+
+	struct
+	{
+		u8 creator              [0x100]; // 0x000
+		u8 boot1_hash           [ 0x14]; // 0x100
+		u8 common_key           [ 0x10]; // 0x114
+		u32 ng_id;                       // 0x124
+		union
+		{
+			struct
+			{
+				u8 ng_priv      [ 0x1e]; // 0x128
+				u8 pad1         [ 0x12];
+			};
+
+			struct
+			{
+				u8 pad2         [ 0x1c];
+				u8 nand_hmac    [ 0x14]; //0x144
+			};
+		};
+		u8 nand_key             [ 0x10]; //0x158
+		u8 rng_key              [ 0x10]; //0x168
+		u32 unk1;                        //0x178
+		u32 unk2;                        //0x17C
+		u8 eeprom_pad           [ 0x80]; //0x180
+
+		u32 ms_id;                       //0x200
+		u32 ca_id;                       //0x204
+		u32 ng_key_id;                   //0x208
+		u8 ng_sig               [ 0x3c]; //0x20c
+		eep_ctr_t counters      [ 0x02]; //0x248
+		u8 fill                 [ 0x18]; //0x25c
+		u8 korean_key           [ 0x10]; //0x274
+		u8 pad3                 [ 0x74]; //0x284
+		u16 prng_seed           [ 0x02]; //0x2F8
+		u8 pad4                 [ 0x04]; //0x2FC
+
+		u8 crack_pad            [0x100]; //0x300
+
+	}
+
+	#ifndef _WIN32
+	__attribute__((packed))
+	#endif
+
+	BootMiiKeysBin;
+
+	#pragma pack(pop)
+
+};
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp
new file mode 100644
index 0000000000..19cb36d8b3
--- /dev/null
+++ b/Source/Core/DiscIO/Blob.cpp
@@ -0,0 +1,142 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstring>
+#include <string>
+
+#include "Common/CDUtils.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+
+#include "DiscIO/Blob.h"
+#include "DiscIO/CISOBlob.h"
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/DriveBlob.h"
+#include "DiscIO/FileBlob.h"
+#include "DiscIO/WbfsBlob.h"
+
+namespace DiscIO
+{
+
+// Provides caching and split-operation-to-block-operations facilities.
+// Used for compressed blob reading and direct drive reading.
+
+void SectorReader::SetSectorSize(int blocksize)
+{
+	for (int i = 0; i < CACHE_SIZE; i++)
+	{
+		m_cache[i] = new u8[blocksize];
+		m_cache_tags[i] = (u64)(s64) - 1;
+	}
+	m_blocksize = blocksize;
+}
+
+SectorReader::~SectorReader()
+{
+	for (u8*& block : m_cache)
+	{
+		delete [] block;
+	}
+}
+
+const u8 *SectorReader::GetBlockData(u64 block_num)
+{
+	// TODO : Expand usage of the cache to more than one block :P
+	if (m_cache_tags[0] == block_num)
+	{
+		return m_cache[0];
+	}
+	else
+	{
+		GetBlock(block_num, m_cache[0]);
+		m_cache_tags[0] = block_num;
+		return m_cache[0];
+	}
+}
+
+bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
+{
+	u64 startingBlock = offset / m_blocksize;
+	u64 remain = size;
+
+	int positionInBlock = (int)(offset % m_blocksize);
+	u64 block = startingBlock;
+
+	while (remain > 0)
+	{
+		// Check if we are ready to do a large block read. > instead of >= so we don't bother if remain is only one block.
+		if (positionInBlock == 0 && remain > (u64)m_blocksize)
+		{
+			u64 num_blocks = remain / m_blocksize;
+			ReadMultipleAlignedBlocks(block, num_blocks, out_ptr);
+			block += num_blocks;
+			out_ptr += num_blocks * m_blocksize;
+			remain -= num_blocks * m_blocksize;
+			continue;
+		}
+
+		u32 toCopy = m_blocksize - positionInBlock;
+		if (toCopy >= remain)
+		{
+			const u8* data = GetBlockData(block);
+			if (!data)
+				return false;
+
+			// Yay, we are done!
+			memcpy(out_ptr, data + positionInBlock, (size_t)remain);
+			return true;
+		}
+		else
+		{
+			const u8* data = GetBlockData(block);
+			if (!data)
+				return false;
+
+			memcpy(out_ptr, data + positionInBlock, toCopy);
+			out_ptr += toCopy;
+			remain -= toCopy;
+			positionInBlock = 0;
+			block++;
+		}
+	}
+
+	return true;
+}
+
+bool SectorReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr)
+{
+	for (u64 i = 0; i < num_blocks; i++)
+	{
+		const u8 *data = GetBlockData(block_num + i);
+		if (!data)
+			return false;
+		memcpy(out_ptr + i * m_blocksize, data, m_blocksize);
+	}
+
+	return true;
+}
+
+IBlobReader* CreateBlobReader(const std::string& filename)
+{
+	if (cdio_is_cdrom(filename))
+		return DriveReader::Create(filename);
+
+	if (!File::Exists(filename))
+		return nullptr;
+
+	if (IsWbfsBlob(filename))
+		return WbfsFileReader::Create(filename);
+
+	if (IsCompressedBlob(filename))
+		return CompressedBlobReader::Create(filename);
+
+	if (IsCISOBlob(filename))
+		return CISOFileReader::Create(filename);
+
+	// Still here? Assume plain file - since we know it exists due to the File::Exists check above.
+	return PlainFileReader::Create(filename);
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
new file mode 100644
index 0000000000..54ef5580c2
--- /dev/null
+++ b/Source/Core/DiscIO/Blob.h
@@ -0,0 +1,76 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// BLOB
+
+// Blobs in Dolphin are read only Binary Large OBjects. For example, a typical DVD image.
+// Often, you may want to store these things in a highly compressed format, but still
+// allow random access. Or you may store them on an odd device, like raw on a DVD.
+
+// Always read your BLOBs using an interface returned by CreateBlobReader(). It will
+// detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and
+// automatically do the right thing.
+
+#include <string>
+#include "Common/CommonTypes.h"
+
+namespace DiscIO
+{
+
+class IBlobReader
+{
+public:
+	virtual ~IBlobReader() {}
+
+	virtual u64 GetRawSize() const  = 0;
+	virtual u64 GetDataSize() const = 0;
+	// NOT thread-safe - can't call this from multiple threads.
+	virtual bool Read(u64 offset, u64 size, u8* out_ptr) = 0;
+
+protected:
+	IBlobReader() {}
+};
+
+
+// Provides caching and split-operation-to-block-operations facilities.
+// Used for compressed blob reading and direct drive reading.
+// Currently only uses a single entry cache.
+// Multi-block reads are not cached.
+class SectorReader : public IBlobReader
+{
+public:
+	virtual ~SectorReader();
+
+	// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
+	const u8 *GetBlockData(u64 block_num);
+	virtual bool Read(u64 offset, u64 size, u8 *out_ptr) override;
+	friend class DriveReader;
+
+protected:
+	void SetSectorSize(int blocksize);
+	virtual void GetBlock(u64 block_num, u8 *out) = 0;
+	// This one is uncached. The default implementation is to simply call GetBlockData multiple times and memcpy.
+	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr);
+
+private:
+	enum { CACHE_SIZE = 32 };
+	int m_blocksize;
+	u8* m_cache[CACHE_SIZE];
+	u64 m_cache_tags[CACHE_SIZE];
+	int m_cache_age[CACHE_SIZE];
+};
+
+// Factory function - examines the path to choose the right type of IBlobReader, and returns one.
+IBlobReader* CreateBlobReader(const std::string& filename);
+
+typedef bool (*CompressCB)(const std::string& text, float percent, void* arg);
+
+bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u32 sub_type = 0, int sector_size = 16384,
+		CompressCB callback = nullptr, void *arg = nullptr);
+bool DecompressBlobToFile(const std::string& infile, const std::string& outfile,
+		CompressCB callback = nullptr, void *arg = nullptr);
+
+}  // namespace
diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp
new file mode 100644
index 0000000000..fa9b30e2f5
--- /dev/null
+++ b/Source/Core/DiscIO/CISOBlob.cpp
@@ -0,0 +1,96 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstdio>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/CISOBlob.h"
+
+namespace DiscIO
+{
+
+static const char CISO_MAGIC[] = "CISO";
+
+CISOFileReader::CISOFileReader(std::FILE* file)
+	: m_file(file)
+{
+	m_size = m_file.GetSize();
+
+	CISOHeader header;
+	m_file.ReadArray(&header, 1);
+
+	m_block_size = header.block_size;
+
+	MapType count = 0;
+	for (u32 idx = 0; idx < CISO_MAP_SIZE; ++idx)
+		m_ciso_map[idx] = (1 == header.map[idx]) ? count++ : UNUSED_BLOCK_ID;
+}
+
+CISOFileReader* CISOFileReader::Create(const std::string& filename)
+{
+	if (IsCISOBlob(filename))
+	{
+		File::IOFile f(filename, "rb");
+		return new CISOFileReader(f.ReleaseHandle());
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+u64 CISOFileReader::GetDataSize() const
+{
+	return GetRawSize();
+}
+
+u64 CISOFileReader::GetRawSize() const
+{
+	return m_size;
+}
+
+bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
+{
+	while (nbytes != 0)
+	{
+		u64 const block = offset / m_block_size;
+		u64 const data_offset = offset % m_block_size;
+		u64 const bytes_to_read = std::min(m_block_size - data_offset, nbytes);
+
+		if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block])
+		{
+			// calculate the base address
+			u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset;
+
+			if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
+			{
+				m_file.Clear();
+				return false;
+			}
+		}
+		else
+		{
+			std::fill_n(out_ptr, bytes_to_read, 0);
+		}
+
+		out_ptr += bytes_to_read;
+		offset  += bytes_to_read;
+		nbytes  -= bytes_to_read;
+	}
+
+	return true;
+}
+
+bool IsCISOBlob(const std::string& filename)
+{
+	File::IOFile f(filename, "rb");
+
+	CISOHeader header;
+	return (f.ReadArray(&header, 1) &&
+		std::equal(header.magic, header.magic + sizeof(header.magic), CISO_MAGIC));
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h
new file mode 100644
index 0000000000..7a4638ecd7
--- /dev/null
+++ b/Source/Core/DiscIO/CISOBlob.h
@@ -0,0 +1,55 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdio>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+
+namespace DiscIO
+{
+
+bool IsCISOBlob(const std::string& filename);
+
+static const u32 CISO_HEADER_SIZE = 0x8000;
+static const u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4;
+
+struct CISOHeader
+{
+	// "CISO"
+	char magic[4];
+
+	// little endian
+	u32 block_size;
+
+	// 0=unused, 1=used, others=invalid
+	u8 map[CISO_MAP_SIZE];
+};
+
+class CISOFileReader : public IBlobReader
+{
+public:
+	static CISOFileReader* Create(const std::string& filename);
+
+	u64 GetDataSize() const override;
+	u64 GetRawSize() const override;
+	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
+
+private:
+	CISOFileReader(std::FILE* file);
+
+	typedef u16 MapType;
+	static const MapType UNUSED_BLOCK_ID = -1;
+
+	File::IOFile m_file;
+	u64 m_size;
+	u32 m_block_size;
+	MapType m_ciso_map[CISO_MAP_SIZE];
+};
+
+}  // namespace
diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
index 01e15a374f..e9f20ffe8d 100644
--- a/Source/Core/DiscIO/CMakeLists.txt
+++ b/Source/Core/DiscIO/CMakeLists.txt
@@ -1,25 +1,20 @@
-set(SRCS	Src/BannerLoader.cpp
-			Src/BannerLoaderGC.cpp
-			Src/BannerLoaderWii.cpp
-			Src/Blob.cpp
-			Src/CISOBlob.cpp
-			Src/WbfsBlob.cpp
-			Src/CompressedBlob.cpp
-			Src/DiscScrubber.cpp
-			Src/DriveBlob.cpp
-			Src/FileBlob.cpp
-			Src/FileHandlerARC.cpp
-			Src/FileMonitor.cpp
-			Src/FileSystemGCWii.cpp
-			Src/Filesystem.cpp
-			Src/NANDContentLoader.cpp
-			Src/VolumeCommon.cpp
-			Src/VolumeCreator.cpp
-			Src/VolumeDirectory.cpp
-			Src/VolumeGC.cpp
-			Src/VolumeWad.cpp
-			Src/VolumeWiiCrypted.cpp
-			Src/WiiWad.cpp)
+set(SRCS	Blob.cpp
+			CISOBlob.cpp
+			WbfsBlob.cpp
+			CompressedBlob.cpp
+			DiscScrubber.cpp
+			DriveBlob.cpp
+			FileBlob.cpp
+			FileMonitor.cpp
+			FileSystemGCWii.cpp
+			Filesystem.cpp
+			NANDContentLoader.cpp
+			VolumeCommon.cpp
+			VolumeCreator.cpp
+			VolumeDirectory.cpp
+			VolumeGC.cpp
+			VolumeWad.cpp
+			VolumeWiiCrypted.cpp
+			WiiWad.cpp)
 
-add_library(discio STATIC ${SRCS})
-target_link_libraries(discio common)
+add_dolphin_library(discio "${SRCS}" "")
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
new file mode 100644
index 0000000000..04304b7613
--- /dev/null
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -0,0 +1,411 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _WIN32
+#include <io.h>
+#include <windows.h>
+#endif
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <vector>
+#include <zlib.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/DiscScrubber.h"
+
+
+namespace DiscIO
+{
+
+CompressedBlobReader::CompressedBlobReader(const std::string& filename) : m_file_name(filename)
+{
+	m_file.Open(filename, "rb");
+	m_file_size = File::GetSize(filename);
+	m_file.ReadArray(&m_header, 1);
+
+	SetSectorSize(m_header.block_size);
+
+	// cache block pointers and hashes
+	m_block_pointers = new u64[m_header.num_blocks];
+	m_file.ReadArray(m_block_pointers, m_header.num_blocks);
+	m_hashes = new u32[m_header.num_blocks];
+	m_file.ReadArray(m_hashes, m_header.num_blocks);
+
+	m_data_offset = (sizeof(CompressedBlobHeader))
+	              + (sizeof(u64)) * m_header.num_blocks  // skip block pointers
+	              + (sizeof(u32)) * m_header.num_blocks; // skip hashes
+
+	// A compressed block is never ever longer than a decompressed block, so just header.block_size should be fine.
+	// I still add some safety margin.
+	m_zlib_buffer_size = m_header.block_size + 64;
+	m_zlib_buffer = new u8[m_zlib_buffer_size];
+	memset(m_zlib_buffer, 0, m_zlib_buffer_size);
+}
+
+CompressedBlobReader* CompressedBlobReader::Create(const std::string& filename)
+{
+	if (IsCompressedBlob(filename))
+		return new CompressedBlobReader(filename);
+	else
+		return nullptr;
+}
+
+CompressedBlobReader::~CompressedBlobReader()
+{
+	delete [] m_zlib_buffer;
+	delete [] m_block_pointers;
+	delete [] m_hashes;
+}
+
+// IMPORTANT: Calling this function invalidates all earlier pointers gotten from this function.
+u64 CompressedBlobReader::GetBlockCompressedSize(u64 block_num) const
+{
+	u64 start = m_block_pointers[block_num];
+	if (block_num < m_header.num_blocks - 1)
+		return m_block_pointers[block_num + 1] - start;
+	else if (block_num == m_header.num_blocks - 1)
+		return m_header.compressed_data_size - start;
+	else
+		PanicAlert("GetBlockCompressedSize - illegal block number %i", (int)block_num);
+	return 0;
+}
+
+void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
+{
+	bool uncompressed = false;
+	u32 comp_block_size = (u32)GetBlockCompressedSize(block_num);
+	u64 offset = m_block_pointers[block_num] + m_data_offset;
+
+	if (offset & (1ULL << 63))
+	{
+		if (comp_block_size != m_header.block_size)
+			PanicAlert("Uncompressed block with wrong size");
+		uncompressed = true;
+		offset &= ~(1ULL << 63);
+	}
+
+	// clear unused part of zlib buffer. maybe this can be deleted when it works fully.
+	memset(m_zlib_buffer + comp_block_size, 0, m_zlib_buffer_size - comp_block_size);
+
+	m_file.Seek(offset, SEEK_SET);
+	m_file.ReadBytes(m_zlib_buffer, comp_block_size);
+
+	u8* source = m_zlib_buffer;
+	u8* dest = out_ptr;
+
+	// First, check hash.
+	u32 block_hash = HashAdler32(source, comp_block_size);
+	if (block_hash != m_hashes[block_num])
+		PanicAlertT("The disc image \"%s\" is corrupt.\n"
+		            "Hash of block %" PRIu64 " is %08x instead of %08x.",
+		            m_file_name.c_str(),
+		            block_num, block_hash, m_hashes[block_num]);
+
+	if (uncompressed)
+	{
+		memcpy(dest, source, comp_block_size);
+	}
+	else
+	{
+		z_stream z;
+		memset(&z, 0, sizeof(z));
+		z.next_in  = source;
+		z.avail_in = comp_block_size;
+		if (z.avail_in > m_header.block_size)
+		{
+			PanicAlert("We have a problem");
+		}
+		z.next_out  = dest;
+		z.avail_out = m_header.block_size;
+		inflateInit(&z);
+		int status = inflate(&z, Z_FULL_FLUSH);
+		u32 uncomp_size = m_header.block_size - z.avail_out;
+		if (status != Z_STREAM_END)
+		{
+			// this seem to fire wrongly from time to time
+			// to be sure, don't use compressed isos :P
+			PanicAlert("Failure reading block %" PRIu64 " - out of data and not at end.", block_num);
+		}
+		inflateEnd(&z);
+		if (uncomp_size != m_header.block_size)
+			PanicAlert("Wrong block size");
+	}
+}
+
+bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u32 sub_type,
+						int block_size, CompressCB callback, void* arg)
+{
+	bool scrubbing = false;
+
+	if (IsCompressedBlob(infile))
+	{
+		PanicAlertT("\"%s\" is already compressed! Cannot compress it further.", infile.c_str());
+		return false;
+	}
+
+	File::IOFile inf(infile, "rb");
+	if (!inf)
+	{
+		PanicAlertT("Failed to open the input file \"%s\".", infile.c_str());
+		return false;
+	}
+
+	File::IOFile f(outfile, "wb");
+	if (!f)
+	{
+		PanicAlertT("Failed to open the output file \"%s\".\n"
+		            "Check that you have permissions to write the target folder and that the media can be written.",
+		            outfile.c_str());
+		return false;
+	}
+
+	if (sub_type == 1)
+	{
+		if (!DiscScrubber::SetupScrub(infile, block_size))
+		{
+			PanicAlertT("\"%s\" failed to be scrubbed. Probably the image is corrupt.", infile.c_str());
+			return false;
+		}
+
+		scrubbing = true;
+	}
+
+	z_stream z = {};
+	if (deflateInit(&z, 9) != Z_OK)
+	{
+		DiscScrubber::Cleanup();
+		return false;
+	}
+
+	callback("Files opened, ready to compress.", 0, arg);
+
+	CompressedBlobHeader header;
+	header.magic_cookie = kBlobCookie;
+	header.sub_type   = sub_type;
+	header.block_size = block_size;
+	header.data_size  = File::GetSize(infile);
+
+	// round upwards!
+	header.num_blocks = (u32)((header.data_size + (block_size - 1)) / block_size);
+
+	u64* offsets = new u64[header.num_blocks];
+	u32* hashes = new u32[header.num_blocks];
+	u8* out_buf = new u8[block_size];
+	u8* in_buf = new u8[block_size];
+
+	// seek past the header (we will write it at the end)
+	f.Seek(sizeof(CompressedBlobHeader), SEEK_CUR);
+	// seek past the offset and hash tables (we will write them at the end)
+	f.Seek((sizeof(u64) + sizeof(u32)) * header.num_blocks, SEEK_CUR);
+
+	// Now we are ready to write compressed data!
+	u64 position = 0;
+	int num_compressed = 0;
+	int num_stored = 0;
+	int progress_monitor = std::max<int>(1, header.num_blocks / 1000);
+	bool success = true;
+
+	for (u32 i = 0; i < header.num_blocks; i++)
+	{
+		if (i % progress_monitor == 0)
+		{
+			const u64 inpos = inf.Tell();
+			int ratio = 0;
+			if (inpos != 0)
+				ratio = (int)(100 * position / inpos);
+
+			std::string temp = StringFromFormat("%i of %i blocks. Compression ratio %i%%", i, header.num_blocks, ratio);
+			bool was_cancelled = !callback(temp, (float)i / (float)header.num_blocks, arg);
+			if (was_cancelled)
+			{
+				success = false;
+				break;
+			}
+		}
+
+		offsets[i] = position;
+
+		size_t read_bytes;
+		if (scrubbing)
+			read_bytes = DiscScrubber::GetNextBlock(inf, in_buf);
+		else
+			inf.ReadArray(in_buf, header.block_size, &read_bytes);
+		if (read_bytes < header.block_size)
+			std::fill(in_buf + read_bytes, in_buf + header.block_size, 0);
+
+		int retval = deflateReset(&z);
+		z.next_in   = in_buf;
+		z.avail_in  = header.block_size;
+		z.next_out  = out_buf;
+		z.avail_out = block_size;
+
+		if (retval != Z_OK)
+		{
+			ERROR_LOG(DISCIO, "Deflate failed");
+			success = false;
+			break;
+		}
+
+		int status = deflate(&z, Z_FINISH);
+		int comp_size = block_size - z.avail_out;
+
+		u8* write_buf;
+		int write_size;
+		if ((status != Z_STREAM_END) || (z.avail_out < 10))
+		{
+			//PanicAlert("%i %i Store %i", i*block_size, position, comp_size);
+			// let's store uncompressed
+			write_buf = in_buf;
+			offsets[i] |= 0x8000000000000000ULL;
+			write_size = block_size;
+			num_stored++;
+		}
+		else
+		{
+			// let's store compressed
+			//PanicAlert("Comp %i to %i", block_size, comp_size);
+			write_buf = out_buf;
+			write_size = comp_size;
+			num_compressed++;
+		}
+
+		if (!f.WriteBytes(write_buf, write_size))
+		{
+			PanicAlertT(
+				"Failed to write the output file \"%s\".\n"
+				"Check that you have enough space available on the target drive.",
+				outfile.c_str());
+			success = false;
+			break;
+		}
+
+		position += write_size;
+
+		hashes[i] = HashAdler32(write_buf, write_size);
+	}
+
+	header.compressed_data_size = position;
+
+	if (!success)
+	{
+		// Remove the incomplete output file.
+		f.Close();
+		File::Delete(outfile);
+	}
+	else
+	{
+		// Okay, go back and fill in headers
+		f.Seek(0, SEEK_SET);
+		f.WriteArray(&header, 1);
+		f.WriteArray(offsets, header.num_blocks);
+		f.WriteArray(hashes, header.num_blocks);
+	}
+
+	// Cleanup
+	delete[] in_buf;
+	delete[] out_buf;
+	delete[] offsets;
+	delete[] hashes;
+
+	deflateEnd(&z);
+	DiscScrubber::Cleanup();
+
+	if (success)
+	{
+		callback("Done compressing disc image.", 1.0f, arg);
+	}
+	return success;
+}
+
+bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, CompressCB callback, void* arg)
+{
+	if (!IsCompressedBlob(infile))
+	{
+		PanicAlertT("File not compressed");
+		return false;
+	}
+
+	std::unique_ptr<CompressedBlobReader> reader(CompressedBlobReader::Create(infile));
+	if (!reader)
+	{
+		PanicAlertT("Failed to open the input file \"%s\".", infile.c_str());
+		return false;
+	}
+
+	File::IOFile f(outfile, "wb");
+	if (!f)
+	{
+		PanicAlertT(
+			"Failed to open the output file \"%s\".\n"
+			"Check that you have permissions to write the target folder and that the media can be written.",
+			outfile.c_str());
+		return false;
+	}
+
+	const CompressedBlobHeader &header = reader->GetHeader();
+	static const size_t BUFFER_BLOCKS = 32;
+	size_t buffer_size = header.block_size * BUFFER_BLOCKS;
+	size_t last_buffer_size = header.block_size * (header.num_blocks % BUFFER_BLOCKS);
+	std::vector<u8> buffer(buffer_size);
+	u32 num_buffers = (header.num_blocks + BUFFER_BLOCKS - 1) / BUFFER_BLOCKS;
+	int progress_monitor = std::max<int>(1, num_buffers / 100);
+	bool success = true;
+
+	for (u64 i = 0; i < num_buffers; i++)
+	{
+		if (i % progress_monitor == 0)
+		{
+			bool was_cancelled = !callback("Unpacking", (float)i / (float)num_buffers, arg);
+			if (was_cancelled)
+			{
+				success = false;
+				break;
+			}
+		}
+		const size_t sz = i == num_buffers - 1 ? last_buffer_size : buffer_size;
+		reader->Read(i * buffer_size, sz, buffer.data());
+		if (!f.WriteBytes(buffer.data(), sz))
+		{
+			PanicAlertT(
+				"Failed to write the output file \"%s\".\n"
+				"Check that you have enough space available on the target drive.",
+				outfile.c_str());
+			success = false;
+			break;
+		}
+	}
+
+	if (!success)
+	{
+		// Remove the incomplete output file.
+		f.Close();
+		File::Delete(outfile);
+	}
+	else
+	{
+		f.Resize(header.data_size);
+	}
+
+	return true;
+}
+
+bool IsCompressedBlob(const std::string& filename)
+{
+	File::IOFile f(filename, "rb");
+
+	CompressedBlobHeader header;
+	return f.ReadArray(&header, 1) && (header.magic_cookie == kBlobCookie);
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h
new file mode 100644
index 0000000000..7157f805b3
--- /dev/null
+++ b/Source/Core/DiscIO/CompressedBlob.h
@@ -0,0 +1,70 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// WARNING Code not big-endian safe.
+
+// To create new compressed BLOBs, use CompressFileToBlob.
+
+// File format
+// * Header
+// * [Block Pointers interleaved with block hashes (hash of decompressed data)]
+// * [Data]
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+
+namespace DiscIO
+{
+
+bool IsCompressedBlob(const std::string& filename);
+
+const u32 kBlobCookie = 0xB10BC001;
+
+// A blob file structure:
+// BlobHeader
+// u64 offsetsToBlocks[n], top bit specifies whether the block is compressed, or not.
+// compressed data
+
+// Blocks that won't compress to less than 97% of the original size are stored as-is.
+struct CompressedBlobHeader // 32 bytes
+{
+	u32 magic_cookie; //0xB10BB10B
+	u32 sub_type; // GC image, whatever
+	u64 compressed_data_size;
+	u64 data_size;
+	u32 block_size;
+	u32 num_blocks;
+};
+
+class CompressedBlobReader : public SectorReader
+{
+public:
+	static CompressedBlobReader* Create(const std::string& filename);
+	~CompressedBlobReader();
+	const CompressedBlobHeader &GetHeader() const { return m_header; }
+	u64 GetDataSize() const override { return m_header.data_size; }
+	u64 GetRawSize() const override { return m_file_size; }
+	u64 GetBlockCompressedSize(u64 block_num) const;
+	void GetBlock(u64 block_num, u8* out_ptr) override;
+private:
+	CompressedBlobReader(const std::string& filename);
+
+	CompressedBlobHeader m_header;
+	u64* m_block_pointers;
+	u32* m_hashes;
+	int m_data_offset;
+	File::IOFile m_file;
+	u64 m_file_size;
+	u8* m_zlib_buffer;
+	int m_zlib_buffer_size;
+	std::string m_file_name;
+};
+
+}  // namespace
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj
index 4830666296..b0a9ef63fd 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj
+++ b/Source/Core/DiscIO/DiscIO.vcxproj
@@ -1,233 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{B6398059-EBB6-4C34-B547-95F365B71FF4}</ProjectGuid>
-    <RootNamespace>DiscIO</RootNamespace>
+    <ProjectGuid>{160BDC25-5626-4B0D-BDD8-2953D9777FB5}</ProjectGuid>
   </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </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'">
+  <ImportGroup 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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\zlib;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Src\BannerLoader.h" />
-    <ClInclude Include="Src\BannerLoaderGC.h" />
-    <ClInclude Include="Src\BannerLoaderWii.h" />
-    <ClInclude Include="Src\Blob.h" />
-    <ClInclude Include="Src\CISOBlob.h" />
-    <ClInclude Include="Src\WbfsBlob.h" />
-    <ClInclude Include="Src\CompressedBlob.h" />
-    <ClInclude Include="Src\DiscScrubber.h" />
-    <ClInclude Include="Src\DriveBlob.h" />
-    <ClInclude Include="Src\FileBlob.h" />
-    <ClInclude Include="Src\FileHandlerARC.h" />
-    <ClInclude Include="Src\FileMonitor.h" />
-    <ClInclude Include="Src\Filesystem.h" />
-    <ClInclude Include="Src\FileSystemGCWii.h" />
-    <ClInclude Include="Src\NANDContentLoader.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Volume.h" />
-    <ClInclude Include="Src\VolumeCreator.h" />
-    <ClInclude Include="Src\VolumeDirectory.h" />
-    <ClInclude Include="Src\VolumeGC.h" />
-    <ClInclude Include="Src\VolumeWad.h" />
-    <ClInclude Include="Src\VolumeWiiCrypted.h" />
-    <ClInclude Include="Src\WiiWad.h" />
+    <ClCompile Include="Blob.cpp" />
+    <ClCompile Include="CISOBlob.cpp" />
+    <ClCompile Include="CompressedBlob.cpp" />
+    <ClCompile Include="DiscScrubber.cpp" />
+    <ClCompile Include="DriveBlob.cpp" />
+    <ClCompile Include="FileBlob.cpp" />
+    <ClCompile Include="FileMonitor.cpp" />
+    <ClCompile Include="Filesystem.cpp" />
+    <ClCompile Include="FileSystemGCWii.cpp" />
+    <ClCompile Include="NANDContentLoader.cpp" />
+    <ClCompile Include="VolumeCommon.cpp" />
+    <ClCompile Include="VolumeCreator.cpp" />
+    <ClCompile Include="VolumeDirectory.cpp" />
+    <ClCompile Include="VolumeGC.cpp" />
+    <ClCompile Include="VolumeWad.cpp" />
+    <ClCompile Include="VolumeWiiCrypted.cpp" />
+    <ClCompile Include="WbfsBlob.cpp" />
+    <ClCompile Include="WiiWad.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\BannerLoader.cpp" />
-    <ClCompile Include="Src\BannerLoaderGC.cpp" />
-    <ClCompile Include="Src\BannerLoaderWii.cpp" />
-    <ClCompile Include="Src\Blob.cpp" />
-    <ClCompile Include="Src\CISOBlob.cpp" />
-    <ClCompile Include="Src\WbfsBlob.cpp" />
-    <ClCompile Include="Src\CompressedBlob.cpp" />
-    <ClCompile Include="Src\DiscScrubber.cpp" />
-    <ClCompile Include="Src\DriveBlob.cpp" />
-    <ClCompile Include="Src\FileBlob.cpp" />
-    <ClCompile Include="Src\FileHandlerARC.cpp" />
-    <ClCompile Include="Src\FileMonitor.cpp" />
-    <ClCompile Include="Src\Filesystem.cpp" />
-    <ClCompile Include="Src\FileSystemGCWii.cpp" />
-    <ClCompile Include="Src\NANDContentLoader.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeCommon.cpp" />
-    <ClCompile Include="Src\VolumeCreator.cpp" />
-    <ClCompile Include="Src\VolumeDirectory.cpp" />
-    <ClCompile Include="Src\VolumeGC.cpp" />
-    <ClCompile Include="Src\VolumeWad.cpp" />
-    <ClCompile Include="Src\VolumeWiiCrypted.cpp" />
-    <ClCompile Include="Src\WiiWad.cpp" />
+    <ClInclude Include="Blob.h" />
+    <ClInclude Include="CISOBlob.h" />
+    <ClInclude Include="CompressedBlob.h" />
+    <ClInclude Include="DiscScrubber.h" />
+    <ClInclude Include="DriveBlob.h" />
+    <ClInclude Include="FileBlob.h" />
+    <ClInclude Include="FileMonitor.h" />
+    <ClInclude Include="Filesystem.h" />
+    <ClInclude Include="FileSystemGCWii.h" />
+    <ClInclude Include="NANDContentLoader.h" />
+    <ClInclude Include="Volume.h" />
+    <ClInclude Include="VolumeCreator.h" />
+    <ClInclude Include="VolumeDirectory.h" />
+    <ClInclude Include="VolumeGC.h" />
+    <ClInclude Include="VolumeWad.h" />
+    <ClInclude Include="VolumeWiiCrypted.h" />
+    <ClInclude Include="WbfsBlob.h" />
+    <ClInclude Include="WiiWad.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj">
+      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters
index 105d3ffc47..3d27813cba 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj.filters
+++ b/Source/Core/DiscIO/DiscIO.vcxproj.filters
@@ -1,164 +1,138 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\Blob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\CISOBlob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\WbfsBlob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\CompressedBlob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DriveBlob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FileBlob.cpp">
-      <Filter>Volume\Blob</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FileMonitor.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeCommon.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeCreator.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeDirectory.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeGC.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeWad.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VolumeWiiCrypted.cpp">
-      <Filter>Volume</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\WiiWad.cpp">
-      <Filter>NAND</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NANDContentLoader.cpp">
-      <Filter>NAND</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Filesystem.cpp">
-      <Filter>FileSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FileSystemGCWii.cpp">
-      <Filter>FileSystem</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BannerLoader.cpp">
-      <Filter>FileHandler</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BannerLoaderGC.cpp">
-      <Filter>FileHandler</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BannerLoaderWii.cpp">
-      <Filter>FileHandler</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FileHandlerARC.cpp">
-      <Filter>FileHandler</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\DiscScrubber.cpp">
-      <Filter>DiscScrubber</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\CISOBlob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\WbfsBlob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Blob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\CompressedBlob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DriveBlob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FileBlob.h">
-      <Filter>Volume\Blob</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FileMonitor.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Volume.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VolumeWiiCrypted.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VolumeCreator.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VolumeDirectory.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VolumeGC.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VolumeWad.h">
-      <Filter>Volume</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\WiiWad.h">
-      <Filter>NAND</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\NANDContentLoader.h">
-      <Filter>NAND</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FileSystemGCWii.h">
-      <Filter>FileSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Filesystem.h">
-      <Filter>FileSystem</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BannerLoaderWii.h">
-      <Filter>FileHandler</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BannerLoader.h">
-      <Filter>FileHandler</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BannerLoaderGC.h">
-      <Filter>FileHandler</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FileHandlerARC.h">
-      <Filter>FileHandler</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DiscScrubber.h">
-      <Filter>DiscScrubber</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="DiscScrubber">
-      <UniqueIdentifier>{46b8b594-1da4-4941-9d3e-3057ac8c251f}</UniqueIdentifier>
+      <UniqueIdentifier>{3873659a-9a30-4a58-af9e-8dad7d7eb627}</UniqueIdentifier>
     </Filter>
     <Filter Include="FileHandler">
-      <UniqueIdentifier>{96aa6fd2-a1d1-40c4-9235-50f342f32bf1}</UniqueIdentifier>
+      <UniqueIdentifier>{324d4b72-d25b-4c83-bd61-6c9e85e59895}</UniqueIdentifier>
     </Filter>
     <Filter Include="FileSystem">
-      <UniqueIdentifier>{62cd3276-4116-4e3c-93ea-a170676fd84f}</UniqueIdentifier>
+      <UniqueIdentifier>{bd7dbc22-b233-4f82-a369-034f04133b73}</UniqueIdentifier>
     </Filter>
     <Filter Include="NAND">
-      <UniqueIdentifier>{60157ced-f762-4521-be00-79a26744a11a}</UniqueIdentifier>
+      <UniqueIdentifier>{0a2c0bb1-2948-4dfb-9216-77410c39a42c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Volume">
-      <UniqueIdentifier>{45ea663e-bcf3-4ff8-9c97-0f7cfc6ab60e}</UniqueIdentifier>
+      <UniqueIdentifier>{cbce645c-943c-4a94-8be0-8ad529b5c825}</UniqueIdentifier>
     </Filter>
     <Filter Include="Volume\Blob">
-      <UniqueIdentifier>{7bbe1cf7-ab2c-4f01-9e60-a9c8767b4dce}</UniqueIdentifier>
+      <UniqueIdentifier>{3d2fc224-a486-4975-a617-d19f4439702b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="DiscScrubber.cpp">
+      <Filter>DiscScrubber</Filter>
+    </ClCompile>
+    <ClCompile Include="Filesystem.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="FileSystemGCWii.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="WiiWad.cpp">
+      <Filter>NAND</Filter>
+    </ClCompile>
+    <ClCompile Include="NANDContentLoader.cpp">
+      <Filter>NAND</Filter>
+    </ClCompile>
+    <ClCompile Include="Blob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="CISOBlob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="CompressedBlob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="DriveBlob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="FileBlob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="WbfsBlob.cpp">
+      <Filter>Volume\Blob</Filter>
+    </ClCompile>
+    <ClCompile Include="FileMonitor.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeCommon.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeCreator.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeDirectory.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeGC.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeWad.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+    <ClCompile Include="VolumeWiiCrypted.cpp">
+      <Filter>Volume</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="DiscScrubber.h">
+      <Filter>DiscScrubber</Filter>
+    </ClInclude>
+    <ClInclude Include="Filesystem.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="FileSystemGCWii.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="WiiWad.h">
+      <Filter>NAND</Filter>
+    </ClInclude>
+    <ClInclude Include="NANDContentLoader.h">
+      <Filter>NAND</Filter>
+    </ClInclude>
+    <ClInclude Include="Blob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="CISOBlob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="CompressedBlob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="DriveBlob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="FileBlob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="WbfsBlob.h">
+      <Filter>Volume\Blob</Filter>
+    </ClInclude>
+    <ClInclude Include="FileMonitor.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="Volume.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="VolumeCreator.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="VolumeDirectory.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="VolumeGC.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="VolumeWad.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+    <ClInclude Include="VolumeWiiCrypted.h">
+      <Filter>Volume</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
new file mode 100644
index 0000000000..581efc6190
--- /dev/null
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -0,0 +1,350 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/DiscScrubber.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+
+namespace DiscIO
+{
+
+namespace DiscScrubber
+{
+
+#define CLUSTER_SIZE 0x8000
+
+static u8* m_FreeTable = nullptr;
+static u64 m_FileSize;
+static u64 m_BlockCount;
+static u32 m_BlockSize;
+static int m_BlocksPerCluster;
+static bool m_isScrubbing = false;
+
+static std::string m_Filename;
+static IVolume* m_Disc = nullptr;
+
+struct SPartitionHeader
+{
+	u8* Ticket[0x2a4];
+	u32 TMDSize;
+	u64 TMDOffset;
+	u32 CertChainSize;
+	u64 CertChainOffset;
+	// H3Size is always 0x18000
+	u64 H3Offset;
+	u64 DataOffset;
+	u64 DataSize;
+	// TMD would be here
+	u64 DOLOffset;
+	u64 DOLSize;
+	u64 FSTOffset;
+	u64 FSTSize;
+	u32 ApploaderSize;
+	u32 ApploaderTrailerSize;
+};
+struct SPartition
+{
+	u32 GroupNumber;
+	u32 Number;
+	u64 Offset;
+	u32 Type;
+	SPartitionHeader Header;
+};
+struct SPartitionGroup
+{
+	u32 numPartitions;
+	u64 PartitionsOffset;
+	std::vector<SPartition> PartitionsVec;
+};
+static SPartitionGroup PartitionGroup[4];
+
+
+void MarkAsUsed(u64 _Offset, u64 _Size);
+void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size);
+void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer, bool _Decrypt);
+void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer, bool _Decrypt);
+bool ParseDisc();
+bool ParsePartitionData(SPartition& _rPartition);
+u32 GetDOLSize(u64 _DOLOffset);
+
+
+bool SetupScrub(const std::string& filename, int block_size)
+{
+	bool success = true;
+	m_Filename = filename;
+	m_BlockSize = block_size;
+
+	if (CLUSTER_SIZE % m_BlockSize != 0)
+	{
+		ERROR_LOG(DISCIO, "Block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize);
+		return false;
+	}
+
+	m_BlocksPerCluster = CLUSTER_SIZE / m_BlockSize;
+
+	m_Disc = CreateVolumeFromFilename(filename);
+	m_FileSize = m_Disc->GetSize();
+
+	u32 numClusters = (u32)(m_FileSize / CLUSTER_SIZE);
+
+	// Warn if not DVD5 or DVD9 size
+	if (numClusters != 0x23048 && numClusters != 0x46090)
+		WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename.c_str(), numClusters);
+
+	// Table of free blocks
+	m_FreeTable = new u8[numClusters];
+	std::fill(m_FreeTable, m_FreeTable + numClusters, 1);
+
+	// Fill out table of free blocks
+	success = ParseDisc();
+	// Done with it; need it closed for the next part
+	delete m_Disc;
+	m_Disc = nullptr;
+	m_BlockCount = 0;
+
+	// Let's not touch the file if we've failed up to here :p
+	if (!success)
+		Cleanup();
+
+	m_isScrubbing = success;
+	return success;
+}
+
+size_t GetNextBlock(File::IOFile& in, u8* buffer)
+{
+	u64 CurrentOffset = m_BlockCount * m_BlockSize;
+	u64 i = CurrentOffset / CLUSTER_SIZE;
+
+	size_t ReadBytes = 0;
+	if (m_isScrubbing && m_FreeTable[i])
+	{
+		DEBUG_LOG(DISCIO, "Freeing 0x%016" PRIx64, CurrentOffset);
+		std::fill(buffer, buffer + m_BlockSize, 0xFF);
+		in.Seek(m_BlockSize, SEEK_CUR);
+		ReadBytes = m_BlockSize;
+	}
+	else
+	{
+		DEBUG_LOG(DISCIO, "Used    0x%016" PRIx64, CurrentOffset);
+		in.ReadArray(buffer, m_BlockSize, &ReadBytes);
+	}
+
+	m_BlockCount++;
+	return ReadBytes;
+}
+
+void Cleanup()
+{
+	if (m_FreeTable) delete[] m_FreeTable;
+	m_FreeTable = nullptr;
+	m_FileSize = 0;
+	m_BlockCount = 0;
+	m_BlockSize = 0;
+	m_BlocksPerCluster = 0;
+	m_isScrubbing = false;
+}
+
+void MarkAsUsed(u64 _Offset, u64 _Size)
+{
+	u64 CurrentOffset = _Offset;
+	u64 EndOffset = CurrentOffset + _Size;
+
+	DEBUG_LOG(DISCIO, "Marking 0x%016" PRIx64 " - 0x%016" PRIx64 " as used", _Offset, EndOffset);
+
+	while ((CurrentOffset < EndOffset) && (CurrentOffset < m_FileSize))
+	{
+		m_FreeTable[CurrentOffset / CLUSTER_SIZE] = 0;
+		CurrentOffset += CLUSTER_SIZE;
+	}
+}
+// Compensate for 0x400(SHA-1) per 0x8000(cluster)
+void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size)
+{
+	u64 Offset;
+	u64 Size;
+
+	Offset = _Offset / 0x7c00;
+	Offset = Offset * CLUSTER_SIZE;
+	Offset += _PartitionDataOffset;
+
+	Size = _Size / 0x7c00;
+	Size = (Size + 1) * CLUSTER_SIZE;
+
+	// Add on the offset in the first block for the case where data straddles blocks
+	Size += _Offset % 0x7c00;
+
+	MarkAsUsed(Offset, Size);
+}
+
+// Helper functions for reading the BE volume
+void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer, bool _Decrypt)
+{
+	m_Disc->Read(_Offset, _Length, (u8*)&_Buffer, _Decrypt);
+	_Buffer = Common::swap32(_Buffer);
+}
+void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer, bool _Decrypt)
+{
+	m_Disc->Read(_Offset, _Length, (u8*)&_Buffer, _Decrypt);
+	_Buffer = Common::swap32((u32)_Buffer);
+	_Buffer <<= 2;
+}
+
+bool ParseDisc()
+{
+	// Mark the header as used - it's mostly 0s anyways
+	MarkAsUsed(0, 0x50000);
+
+	for (int x = 0; x < 4; x++)
+	{
+		ReadFromVolume(0x40000 + (x * 8) + 0, 4, PartitionGroup[x].numPartitions, false);
+		ReadFromVolume(0x40000 + (x * 8) + 4, 4, PartitionGroup[x].PartitionsOffset, false);
+
+		// Read all partitions
+		for (u32 i = 0; i < PartitionGroup[x].numPartitions; i++)
+		{
+			SPartition Partition;
+
+			Partition.GroupNumber = x;
+			Partition.Number = i;
+
+			ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 0, 4, Partition.Offset, false);
+			ReadFromVolume(PartitionGroup[x].PartitionsOffset + (i * 8) + 4, 4, Partition.Type, false);
+
+			ReadFromVolume(Partition.Offset + 0x2a4, 4, Partition.Header.TMDSize, false);
+			ReadFromVolume(Partition.Offset + 0x2a8, 4, Partition.Header.TMDOffset, false);
+			ReadFromVolume(Partition.Offset + 0x2ac, 4, Partition.Header.CertChainSize, false);
+			ReadFromVolume(Partition.Offset + 0x2b0, 4, Partition.Header.CertChainOffset, false);
+			ReadFromVolume(Partition.Offset + 0x2b4, 4, Partition.Header.H3Offset, false);
+			ReadFromVolume(Partition.Offset + 0x2b8, 4, Partition.Header.DataOffset, false);
+			ReadFromVolume(Partition.Offset + 0x2bc, 4, Partition.Header.DataSize, false);
+
+			PartitionGroup[x].PartitionsVec.push_back(Partition);
+		}
+
+		for (auto& rPartition : PartitionGroup[x].PartitionsVec)
+		{
+			const SPartitionHeader& rHeader = rPartition.Header;
+
+			MarkAsUsed(rPartition.Offset, 0x2c0);
+
+			MarkAsUsed(rPartition.Offset + rHeader.TMDOffset, rHeader.TMDSize);
+			MarkAsUsed(rPartition.Offset + rHeader.CertChainOffset, rHeader.CertChainSize);
+			MarkAsUsed(rPartition.Offset + rHeader.H3Offset, 0x18000);
+			// This would mark the whole (encrypted) data area
+			// we need to parse FST and other crap to find what's free within it!
+			//MarkAsUsed(rPartition.Offset + rHeader.DataOffset, rHeader.DataSize);
+
+			// Parse Data! This is where the big gain is
+			if (!ParsePartitionData(rPartition))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+// Operations dealing with encrypted space are done here - the volume is swapped to allow this
+bool ParsePartitionData(SPartition& _rPartition)
+{
+	bool ParsedOK = true;
+
+	// Switch out the main volume temporarily
+	IVolume *OldVolume = m_Disc;
+
+	// Ready some stuff
+	m_Disc = CreateVolumeFromFilename(m_Filename, _rPartition.GroupNumber, _rPartition.Number);
+	std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc));
+
+	if (!filesystem)
+	{
+		ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number);
+		ParsedOK = false;
+	}
+	else
+	{
+		// Mark things as used which are not in the filesystem
+		// Header, Header Information, Apploader
+		ReadFromVolume(0x2440 + 0x14, 4, _rPartition.Header.ApploaderSize, true);
+		ReadFromVolume(0x2440 + 0x18, 4, _rPartition.Header.ApploaderTrailerSize, true);
+		MarkAsUsedE(_rPartition.Offset
+			+ _rPartition.Header.DataOffset
+			, 0
+			, 0x2440
+			+ _rPartition.Header.ApploaderSize
+			+ _rPartition.Header.ApploaderTrailerSize);
+
+		// DOL
+		ReadFromVolume(0x420, 4, _rPartition.Header.DOLOffset, true);
+		_rPartition.Header.DOLSize = GetDOLSize(_rPartition.Header.DOLOffset);
+		MarkAsUsedE(_rPartition.Offset
+			+ _rPartition.Header.DataOffset
+			, _rPartition.Header.DOLOffset
+			, _rPartition.Header.DOLSize);
+
+		// FST
+		ReadFromVolume(0x424, 4, _rPartition.Header.FSTOffset, true);
+		ReadFromVolume(0x428, 4, _rPartition.Header.FSTSize, true);
+		MarkAsUsedE(_rPartition.Offset
+			+ _rPartition.Header.DataOffset
+			, _rPartition.Header.FSTOffset
+			, _rPartition.Header.FSTSize);
+
+		// Go through the filesystem and mark entries as used
+		for (SFileInfo file : filesystem->GetFileList())
+		{
+			DEBUG_LOG(DISCIO, file.m_FullPath.empty() ? "/" : file.m_FullPath.c_str());
+			// Just 1byte for directory? - it will end up reserving a cluster this way
+			if (file.m_NameOffset & 0x1000000)
+				MarkAsUsedE(_rPartition.Offset + _rPartition.Header.DataOffset, file.m_Offset, 1);
+			else
+				MarkAsUsedE(_rPartition.Offset + _rPartition.Header.DataOffset, file.m_Offset, file.m_FileSize);
+		}
+	}
+
+	// Swap back
+	delete m_Disc;
+	m_Disc = OldVolume;
+
+	return ParsedOK;
+}
+
+u32 GetDOLSize(u64 _DOLOffset)
+{
+	u32 offset = 0, size = 0, max = 0;
+
+	// Iterate through the 7 code segments
+	for (u8 i = 0; i < 7; i++)
+	{
+		ReadFromVolume(_DOLOffset + 0x00 + i * 4, 4, offset, true);
+		ReadFromVolume(_DOLOffset + 0x90 + i * 4, 4, size, true);
+		if (offset + size > max)
+			max = offset + size;
+	}
+
+	// Iterate through the 11 data segments
+	for (u8 i = 0; i < 11; i++)
+	{
+		ReadFromVolume(_DOLOffset + 0x1c + i * 4, 4, offset, true);
+		ReadFromVolume(_DOLOffset + 0xac + i * 4, 4, size, true);
+		if (offset + size > max)
+			max = offset + size;
+	}
+
+	return max;
+}
+
+} // namespace DiscScrubber
+
+} // namespace DiscIO
diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h
new file mode 100644
index 0000000000..b03dfc1bc5
--- /dev/null
+++ b/Source/Core/DiscIO/DiscScrubber.h
@@ -0,0 +1,33 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// DiscScrubber removes the garbage data from discs (currently Wii only) which
+// is on the disc due to encryption
+
+// It could be adapted to GameCube discs, but the gain is most likely negligible,
+// and having 1:1 backups of discs is always nice when they are reasonably sized
+
+// Note: the technique is inspired by Wiiscrubber, but much simpler - intentionally :)
+
+#pragma once
+
+#include <string>
+#include "Common/CommonTypes.h"
+
+namespace File { class IOFile; }
+
+namespace DiscIO
+{
+
+namespace DiscScrubber
+{
+
+bool SetupScrub(const std::string& filename, int block_size);
+size_t GetNextBlock(File::IOFile& in, u8* buffer);
+void Cleanup();
+
+} // namespace DiscScrubber
+
+} // namespace DiscIO
diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp
new file mode 100644
index 0000000000..3f0b073945
--- /dev/null
+++ b/Source/Core/DiscIO/DriveBlob.cpp
@@ -0,0 +1,138 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <cstring>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/DriveBlob.h"
+
+#ifdef _WIN32
+#include "Common/StringUtil.h"
+#endif
+
+namespace DiscIO
+{
+
+DriveReader::DriveReader(const std::string& drive)
+{
+#ifdef _WIN32
+	SectorReader::SetSectorSize(2048);
+	auto const path = UTF8ToTStr(std::string("\\\\.\\") + drive);
+	m_disc_handle = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+	                           nullptr, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, nullptr);
+	if (m_disc_handle != INVALID_HANDLE_VALUE)
+	{
+		// Do a test read to make sure everything is OK, since it seems you can get
+		// handles to empty drives.
+		DWORD not_used;
+		u8 *buffer = new u8[m_blocksize];
+		if (!ReadFile(m_disc_handle, buffer, m_blocksize, (LPDWORD)&not_used, nullptr))
+		{
+			delete [] buffer;
+			// OK, something is wrong.
+			CloseHandle(m_disc_handle);
+			m_disc_handle = INVALID_HANDLE_VALUE;
+			return;
+		}
+		delete [] buffer;
+
+	#ifdef _LOCKDRIVE // Do we want to lock the drive?
+		// Lock the compact disc in the CD-ROM drive to prevent accidental
+		// removal while reading from it.
+		m_lock_cdrom.PreventMediaRemoval = TRUE;
+		DeviceIoControl(m_disc_handle, IOCTL_CDROM_MEDIA_REMOVAL,
+		                &m_lock_cdrom, sizeof(m_lock_cdrom), nullptr,
+		                0, &dwNotUsed, nullptr);
+	#endif
+#else
+	SectorReader::SetSectorSize(2048);
+	m_file.Open(drive, "rb");
+	if (m_file)
+	{
+#endif
+	}
+	else
+	{
+		NOTICE_LOG(DISCIO, "Load from DVD backup failed or no disc in drive %s", drive.c_str());
+	}
+}
+
+DriveReader::~DriveReader()
+{
+#ifdef _WIN32
+#ifdef _LOCKDRIVE // Do we want to lock the drive?
+	// Unlock the disc in the CD-ROM drive.
+	m_lock_cdrom.PreventMediaRemoval = FALSE;
+	DeviceIoControl (m_disc_handle, IOCTL_CDROM_MEDIA_REMOVAL,
+		&m_lock_cdrom, sizeof(m_lock_cdrom), nullptr,
+		0, &dwNotUsed, nullptr);
+#endif
+	if (m_disc_handle != INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(m_disc_handle);
+		m_disc_handle = INVALID_HANDLE_VALUE;
+	}
+#else
+	m_file.Close();
+#endif
+}
+
+DriveReader* DriveReader::Create(const std::string& drive)
+{
+	DriveReader* reader = new DriveReader(drive);
+
+	if (!reader->IsOK())
+	{
+		delete reader;
+		return nullptr;
+	}
+
+	return reader;
+}
+
+void DriveReader::GetBlock(u64 block_num, u8* out_ptr)
+{
+	u8* const lpSector = new u8[m_blocksize];
+#ifdef _WIN32
+	u32 NotUsed;
+	u64 offset = m_blocksize * block_num;
+	LONG off_low = (LONG)offset & 0xFFFFFFFF;
+	LONG off_high = (LONG)(offset >> 32);
+	SetFilePointer(m_disc_handle, off_low, &off_high, FILE_BEGIN);
+	if (!ReadFile(m_disc_handle, lpSector, m_blocksize, (LPDWORD)&NotUsed, nullptr))
+		PanicAlertT("Disc Read Error");
+#else
+	m_file.Seek(m_blocksize * block_num, SEEK_SET);
+	m_file.ReadBytes(lpSector, m_blocksize);
+#endif
+	memcpy(out_ptr, lpSector, m_blocksize);
+	delete[] lpSector;
+}
+
+bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8* out_ptr)
+{
+#ifdef _WIN32
+	u32 NotUsed;
+	u64 offset = m_blocksize * block_num;
+	LONG off_low = (LONG)offset & 0xFFFFFFFF;
+	LONG off_high = (LONG)(offset >> 32);
+	SetFilePointer(m_disc_handle, off_low, &off_high, FILE_BEGIN);
+	if (!ReadFile(m_disc_handle, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, nullptr))
+	{
+		PanicAlertT("Disc Read Error");
+		return false;
+	}
+#else
+	fseeko(m_file.GetHandle(), (m_blocksize * block_num), SEEK_SET);
+	if (fread(out_ptr, 1, (m_blocksize * num_blocks), m_file.GetHandle()) != (m_blocksize * num_blocks))
+		return false;
+#endif
+	return true;
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h
new file mode 100644
index 0000000000..2c46e5b225
--- /dev/null
+++ b/Source/Core/DiscIO/DriveBlob.h
@@ -0,0 +1,46 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#include <winioctl.h>
+#endif
+
+namespace DiscIO
+{
+
+class DriveReader : public SectorReader
+{
+public:
+	static DriveReader* Create(const std::string& drive);
+	~DriveReader();
+	u64 GetDataSize() const override { return m_size; }
+	u64 GetRawSize() const override { return m_size; }
+
+	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override;
+
+private:
+	DriveReader(const std::string& drive);
+	void GetBlock(u64 block_num, u8 *out_ptr) override;
+
+#ifdef _WIN32
+	HANDLE m_disc_handle;
+	PREVENT_MEDIA_REMOVAL m_lock_cdrom;
+	bool IsOK() { return m_disc_handle != INVALID_HANDLE_VALUE; }
+#else
+	File::IOFile m_file;
+	bool IsOK() { return m_file != nullptr; }
+#endif
+	s64 m_size;
+};
+
+}  // namespace
diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp
new file mode 100644
index 0000000000..3e702d650c
--- /dev/null
+++ b/Source/Core/DiscIO/FileBlob.cpp
@@ -0,0 +1,39 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include "DiscIO/FileBlob.h"
+
+namespace DiscIO
+{
+
+PlainFileReader::PlainFileReader(std::FILE* file)
+	: m_file(file)
+{
+	m_size = m_file.GetSize();
+}
+
+PlainFileReader* PlainFileReader::Create(const std::string& filename)
+{
+	File::IOFile f(filename, "rb");
+	if (f)
+		return new PlainFileReader(f.ReleaseHandle());
+	else
+		return nullptr;
+}
+
+bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
+{
+	if (m_file.Seek(offset, SEEK_SET) && m_file.ReadBytes(out_ptr, nbytes))
+	{
+		return true;
+	}
+	else
+	{
+		m_file.Clear();
+		return false;
+	}
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h
new file mode 100644
index 0000000000..92135de2af
--- /dev/null
+++ b/Source/Core/DiscIO/FileBlob.h
@@ -0,0 +1,33 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstdio>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+
+namespace DiscIO
+{
+
+class PlainFileReader : public IBlobReader
+{
+public:
+	static PlainFileReader* Create(const std::string& filename);
+
+	u64 GetDataSize() const override { return m_size; }
+	u64 GetRawSize() const override { return m_size; }
+	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
+
+private:
+	PlainFileReader(std::FILE* file);
+
+	File::IOFile m_file;
+	s64 m_size;
+};
+
+}  // namespace
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp
new file mode 100644
index 0000000000..0583d17a44
--- /dev/null
+++ b/Source/Core/DiscIO/FileMonitor.cpp
@@ -0,0 +1,170 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cctype>
+#include <cstring>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Boot/Boot.h"
+
+#include "DiscIO/FileMonitor.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+
+namespace FileMon
+{
+
+static DiscIO::IVolume *OpenISO = nullptr;
+static DiscIO::IFileSystem *pFileSystem = nullptr;
+static std::string ISOFile = "", CurrentFile = "";
+static bool FileAccess = true;
+
+// Filtered files
+bool IsSoundFile(const std::string& filename)
+{
+	std::string extension;
+	SplitPath(filename, nullptr, nullptr, &extension);
+	std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
+
+	static std::unordered_set<std::string> extensions = {
+		".adp",   // 1080 Avalanche, Crash Bandicoot, etc.
+		".adx",   // Sonic Adventure 2 Battle, etc.
+		".afc",   // Zelda WW
+		".ast",   // Zelda TP, Mario Kart
+		".brstm", // Wii Sports, Wario Land, etc.
+		".dsp",   // Metroid Prime
+		".hps",   // SSB Melee
+		".ogg",   // Tony Hawk's Underground 2
+		".sad",   // Disaster
+		".snd",   // Tales of Symphonia
+		".song",  // Tales of Symphonia
+		".ssm",   // Custom Robo, Kirby Air Ride, etc.
+		".str",   // Harry Potter & the Sorcerer's Stone
+	};
+
+	return extensions.find(extension) != extensions.end();
+}
+
+
+// Read the file system
+void ReadFileSystem(const std::string& filename)
+{
+	// Should have an actual Shutdown procedure or something
+	if (OpenISO != nullptr)
+	{
+		delete OpenISO;
+		OpenISO = nullptr;
+	}
+	if (pFileSystem != nullptr)
+	{
+		delete pFileSystem;
+		pFileSystem = nullptr;
+	}
+
+	OpenISO = DiscIO::CreateVolumeFromFilename(filename);
+	if (!OpenISO)
+		return;
+
+	if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_WAD)
+	{
+		pFileSystem = DiscIO::CreateFileSystem(OpenISO);
+
+		if (!pFileSystem)
+			return;
+	}
+
+	FileAccess = true;
+}
+
+// Logs a file if it passes a few checks
+void CheckFile(const std::string& file, u64 size)
+{
+	// Don't do anything if the log is unselected
+	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON, LogTypes::LWARNING))
+		return;
+	// Do nothing if we found the same file again
+	if (CurrentFile == file)
+		return;
+
+	if (size > 0)
+		size = (size / 1000);
+
+	std::string str = StringFromFormat("%s kB %s", ThousandSeparate(size, 7).c_str(), file.c_str());
+	if (IsSoundFile(file))
+	{
+		INFO_LOG(FILEMON, "%s", str.c_str());
+	}
+	else
+	{
+		WARN_LOG(FILEMON, "%s", str.c_str());
+	}
+
+	// Update the current file
+	CurrentFile = file;
+}
+
+
+// Find the filename
+void FindFilename(u64 offset)
+{
+	// Don't do anything if a game is not running
+	if (Core::GetState() != Core::CORE_RUN)
+		return;
+
+	// Or if the log is unselected
+	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON, LogTypes::LWARNING))
+		return;
+
+	// Or if we don't have file access
+	if (!FileAccess)
+		return;
+
+	if (!pFileSystem || ISOFile != SConfig::GetInstance().m_LastFilename)
+	{
+		FileAccess = false;
+		ReadFileSystem(SConfig::GetInstance().m_LastFilename);
+		ISOFile = SConfig::GetInstance().m_LastFilename;
+		INFO_LOG(FILEMON, "Opening '%s'", ISOFile.c_str());
+		return;
+	}
+
+	const std::string filename = pFileSystem->GetFileName(offset);
+
+	if (filename.empty())
+		return;
+
+	CheckFile(filename, pFileSystem->GetFileSize(filename));
+}
+
+void Close()
+{
+	if (OpenISO != nullptr)
+	{
+		delete OpenISO;
+		OpenISO = nullptr;
+	}
+
+	if (pFileSystem != nullptr)
+	{
+		delete pFileSystem;
+		pFileSystem = nullptr;
+	}
+
+	ISOFile = "";
+	CurrentFile = "";
+	FileAccess = true;
+}
+
+
+} // FileMon
diff --git a/Source/Core/DiscIO/FileMonitor.h b/Source/Core/DiscIO/FileMonitor.h
new file mode 100644
index 0000000000..38ece7265b
--- /dev/null
+++ b/Source/Core/DiscIO/FileMonitor.h
@@ -0,0 +1,20 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+namespace FileMon
+{
+
+bool IsSoundFile(const std::string& filename);
+void ReadFileSystem(const std::string& file);
+void CheckFile(const std::string& file, u64 size);
+void FindFilename(u64 offset);
+void Close();
+
+}
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp
new file mode 100644
index 0000000000..cd6f815629
--- /dev/null
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@@ -0,0 +1,325 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstddef>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/FileSystemGCWii.h"
+#include "DiscIO/Volume.h"
+
+namespace DiscIO
+{
+CFileSystemGCWii::CFileSystemGCWii(const IVolume *_rVolume)
+	: IFileSystem(_rVolume)
+	, m_Initialized(false)
+	, m_Valid(false)
+	, m_Wii(false)
+{
+	m_Valid = DetectFileSystem();
+}
+
+CFileSystemGCWii::~CFileSystemGCWii()
+{
+	m_FileInfoVector.clear();
+}
+
+u64 CFileSystemGCWii::GetFileSize(const std::string& _rFullPath)
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
+
+	if (pFileInfo != nullptr && !pFileInfo->IsDirectory())
+		return pFileInfo->m_FileSize;
+
+	return 0;
+}
+
+const std::string CFileSystemGCWii::GetFileName(u64 _Address)
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	for (auto& fileInfo : m_FileInfoVector)
+	{
+		if ((fileInfo.m_Offset <= _Address) &&
+		    ((fileInfo.m_Offset + fileInfo.m_FileSize) > _Address))
+		{
+			return fileInfo.m_FullPath;
+		}
+	}
+
+	return "";
+}
+
+u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile)
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
+	if (pFileInfo == nullptr)
+		return 0;
+
+	if (_OffsetInFile >= pFileInfo->m_FileSize)
+		return 0;
+
+	u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile);
+
+	DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 " Size: %" PRIx64,
+	          read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize);
+
+	m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_Wii);
+	return read_length;
+}
+
+bool CFileSystemGCWii::ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename)
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
+
+	if (!pFileInfo)
+		return false;
+
+	u64 remainingSize = pFileInfo->m_FileSize;
+	u64 fileOffset = pFileInfo->m_Offset;
+
+	File::IOFile f(_rExportFilename, "wb");
+	if (!f)
+		return false;
+
+	bool result = true;
+
+	while (remainingSize)
+	{
+		// Limit read size to 128 MB
+		size_t readSize = (size_t)std::min(remainingSize, (u64)0x08000000);
+
+		std::vector<u8> buffer(readSize);
+
+		result = m_rVolume->Read(fileOffset, readSize, &buffer[0], m_Wii);
+
+		if (!result)
+			break;
+
+		f.WriteBytes(&buffer[0], readSize);
+
+		remainingSize -= readSize;
+		fileOffset += readSize;
+	}
+
+	return result;
+}
+
+bool CFileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const
+{
+	u32 AppSize = m_rVolume->Read32(0x2440 + 0x14, m_Wii); // apploader size
+	AppSize    += m_rVolume->Read32(0x2440 + 0x18, m_Wii); // + trailer size
+	AppSize    += 0x20;                                    // + header size
+	DEBUG_LOG(DISCIO,"AppSize -> %x", AppSize);
+
+	std::vector<u8> buffer(AppSize);
+	if (m_rVolume->Read(0x2440, AppSize, &buffer[0], m_Wii))
+	{
+		std::string exportName(_rExportFolder + "/apploader.img");
+
+		File::IOFile AppFile(exportName, "wb");
+		if (AppFile)
+		{
+			AppFile.WriteBytes(&buffer[0], AppSize);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+u32 CFileSystemGCWii::GetBootDOLSize() const
+{
+	u32 DolOffset = m_rVolume->Read32(0x420, m_Wii) << GetOffsetShift();
+	u32 DolSize = 0, offset = 0, size = 0;
+
+	// Iterate through the 7 code segments
+	for (u8 i = 0; i < 7; i++)
+	{
+		offset = m_rVolume->Read32(DolOffset + 0x00 + i * 4, m_Wii);
+		size   = m_rVolume->Read32(DolOffset + 0x90 + i * 4, m_Wii);
+		if (offset + size > DolSize)
+			DolSize = offset + size;
+	}
+
+	// Iterate through the 11 data segments
+	for (u8 i = 0; i < 11; i++)
+	{
+		offset = m_rVolume->Read32(DolOffset + 0x1c + i * 4, m_Wii);
+		size   = m_rVolume->Read32(DolOffset + 0xac + i * 4, m_Wii);
+		if (offset + size > DolSize)
+			DolSize = offset + size;
+	}
+	return DolSize;
+}
+
+bool CFileSystemGCWii::GetBootDOL(u8* &buffer, u32 DolSize) const
+{
+	u32 DolOffset = m_rVolume->Read32(0x420, m_Wii) << GetOffsetShift();
+	return m_rVolume->Read(DolOffset, DolSize, buffer, m_Wii);
+}
+
+bool CFileSystemGCWii::ExportDOL(const std::string& _rExportFolder) const
+{
+	u32 DolOffset = m_rVolume->Read32(0x420, m_Wii) << GetOffsetShift();
+	u32 DolSize = GetBootDOLSize();
+
+	std::vector<u8> buffer(DolSize);
+	if (m_rVolume->Read(DolOffset, DolSize, &buffer[0], m_Wii))
+	{
+		std::string exportName(_rExportFolder + "/boot.dol");
+
+		File::IOFile DolFile(exportName, "wb");
+		if (DolFile)
+		{
+			DolFile.WriteBytes(&buffer[0], DolSize);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+std::string CFileSystemGCWii::GetStringFromOffset(u64 _Offset) const
+{
+	std::string data(255, 0x00);
+	m_rVolume->Read(_Offset, data.size(), (u8*)&data[0], m_Wii);
+	data.erase(std::find(data.begin(), data.end(), 0x00), data.end());
+
+	// TODO: Should we really always use SHIFT-JIS?
+	// It makes some filenames in Pikmin (NTSC-U) sane, but is it correct?
+	return SHIFTJISToUTF8(data);
+}
+
+const std::vector<SFileInfo>& CFileSystemGCWii::GetFileList()
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	return m_FileInfoVector;
+}
+
+const SFileInfo* CFileSystemGCWii::FindFileInfo(const std::string& _rFullPath)
+{
+	if (!m_Initialized)
+		InitFileSystem();
+
+	for (auto& fileInfo : m_FileInfoVector)
+	{
+		if (!strcasecmp(fileInfo.m_FullPath.c_str(), _rFullPath.c_str()))
+			return &fileInfo;
+	}
+
+	return nullptr;
+}
+
+bool CFileSystemGCWii::DetectFileSystem()
+{
+	if (m_rVolume->Read32(0x18, false) == 0x5D1C9EA3)
+	{
+		m_Wii = true;
+		return true;
+	}
+	else if (m_rVolume->Read32(0x1c, false) == 0xC2339F3D)
+	{
+		m_Wii = false;
+		return true;
+	}
+
+	return false;
+}
+
+void CFileSystemGCWii::InitFileSystem()
+{
+	m_Initialized = true;
+	u32 const shift = GetOffsetShift();
+
+	// read the whole FST
+	u64 FSTOffset = static_cast<u64>(m_rVolume->Read32(0x424, m_Wii)) << shift;
+	// u32 FSTSize     = Read32(0x428);
+	// u32 FSTMaxSize  = Read32(0x42C);
+
+
+	// read all fileinfos
+	SFileInfo Root
+	{
+		m_rVolume->Read32(FSTOffset + 0x0, m_Wii),
+		static_cast<u64>(FSTOffset + 0x4) << shift,
+		m_rVolume->Read32(FSTOffset + 0x8, m_Wii)
+	};
+
+	if (!Root.IsDirectory())
+		return;
+
+	if (m_FileInfoVector.size())
+		PanicAlert("Wtf?");
+	u64 NameTableOffset = FSTOffset;
+
+	m_FileInfoVector.reserve((size_t)Root.m_FileSize);
+	for (u32 i = 0; i < Root.m_FileSize; i++)
+	{
+		u64 const read_offset = FSTOffset + (i * 0xC);
+		u64 const name_offset = m_rVolume->Read32(read_offset + 0x0, m_Wii);
+		u64 const offset = static_cast<u64>(m_rVolume->Read32(read_offset + 0x4, m_Wii)) << shift;
+		u64 const size = m_rVolume->Read32(read_offset + 0x8, m_Wii);
+		m_FileInfoVector.emplace_back(name_offset, offset, size);
+		NameTableOffset += 0xC;
+	}
+
+	BuildFilenames(1, m_FileInfoVector.size(), "", NameTableOffset);
+}
+
+size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const std::string& _szDirectory, u64 _NameTableOffset)
+{
+	size_t CurrentIndex = _FirstIndex;
+
+	while (CurrentIndex < _LastIndex)
+	{
+		SFileInfo& rFileInfo = m_FileInfoVector[CurrentIndex];
+		u64 const uOffset = _NameTableOffset + (rFileInfo.m_NameOffset & 0xFFFFFF);
+		std::string const offset_str { GetStringFromOffset(uOffset) };
+		bool const is_dir = rFileInfo.IsDirectory();
+		rFileInfo.m_FullPath.reserve(_szDirectory.size() + offset_str.size());
+
+		rFileInfo.m_FullPath.append(_szDirectory.data(), _szDirectory.size())
+		                    .append(offset_str.data(), offset_str.size())
+		                    .append("/", size_t(is_dir));
+
+		if (!is_dir)
+		{
+			++CurrentIndex;
+			continue;
+		}
+
+		// check next index
+		CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _NameTableOffset);
+	}
+
+	return CurrentIndex;
+}
+
+u32 CFileSystemGCWii::GetOffsetShift() const
+{
+	return m_Wii ? 2 : 0;
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h
new file mode 100644
index 0000000000..0112b695ef
--- /dev/null
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Filesystem.h"
+
+namespace DiscIO
+{
+
+class IVolume;
+
+class CFileSystemGCWii : public IFileSystem
+{
+public:
+	CFileSystemGCWii(const IVolume* _rVolume);
+	virtual ~CFileSystemGCWii();
+	virtual bool IsValid() const override { return m_Valid; }
+	virtual u64 GetFileSize(const std::string& _rFullPath) override;
+	virtual const std::vector<SFileInfo>& GetFileList() override;
+	virtual const std::string GetFileName(u64 _Address) override;
+	virtual u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override;
+	virtual bool ExportFile(const std::string& _rFullPath, const std::string&_rExportFilename) override;
+	virtual bool ExportApploader(const std::string& _rExportFolder) const override;
+	virtual bool ExportDOL(const std::string& _rExportFolder) const override;
+	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const override;
+	virtual u32 GetBootDOLSize() const override;
+
+private:
+	bool m_Initialized;
+	bool m_Valid;
+	bool m_Wii;
+	std::vector<SFileInfo> m_FileInfoVector;
+
+	std::string GetStringFromOffset(u64 _Offset) const;
+	const SFileInfo* FindFileInfo(const std::string& _rFullPath);
+	bool DetectFileSystem();
+	void InitFileSystem();
+	size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const std::string& _szDirectory, u64 _NameTableOffset);
+	u32 GetOffsetShift() const;
+};
+
+} // namespace
diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp
new file mode 100644
index 0000000000..c723569088
--- /dev/null
+++ b/Source/Core/DiscIO/Filesystem.cpp
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/FileSystemGCWii.h"
+
+namespace DiscIO
+{
+
+IFileSystem::IFileSystem(const IVolume *_rVolume)
+	: m_rVolume(_rVolume)
+{}
+
+
+IFileSystem::~IFileSystem()
+{}
+
+
+IFileSystem* CreateFileSystem(const IVolume* _rVolume)
+{
+	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
+
+	if (!pFileSystem)
+		return nullptr;
+
+	if (!pFileSystem->IsValid())
+	{
+		delete pFileSystem;
+		pFileSystem = nullptr;
+	}
+
+	return pFileSystem;
+}
+
+} // namespace
diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h
new file mode 100644
index 0000000000..1f3e73f3ef
--- /dev/null
+++ b/Source/Core/DiscIO/Filesystem.h
@@ -0,0 +1,63 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+namespace DiscIO
+{
+
+class IVolume;
+
+// file info of an FST entry
+struct SFileInfo
+{
+	u64 m_NameOffset = 0u;
+	u64 m_Offset = 0u;
+	u64 m_FileSize = 0u;
+	std::string m_FullPath;
+
+	bool IsDirectory() const { return (m_NameOffset & 0xFF000000) != 0; }
+
+	SFileInfo(u64 name_offset, u64 offset, u64 filesize) :
+		m_NameOffset(name_offset),
+		m_Offset(offset),
+		m_FileSize(filesize)
+	{ }
+
+	SFileInfo (SFileInfo const&) = default;
+	SFileInfo () = default;
+};
+
+class IFileSystem
+{
+public:
+	IFileSystem(const IVolume *_rVolume);
+
+	virtual ~IFileSystem();
+	virtual bool IsValid() const = 0;
+	virtual const std::vector<SFileInfo>& GetFileList() = 0;
+	virtual u64 GetFileSize(const std::string& _rFullPath) = 0;
+	virtual u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile = 0) = 0;
+	virtual bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) = 0;
+	virtual bool ExportApploader(const std::string& _rExportFolder) const = 0;
+	virtual bool ExportDOL(const std::string& _rExportFolder) const = 0;
+	virtual const std::string GetFileName(u64 _Address) = 0;
+	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const = 0;
+	virtual u32 GetBootDOLSize() const = 0;
+
+	virtual const IVolume *GetVolume() const { return m_rVolume; }
+protected:
+	const IVolume *m_rVolume;
+};
+
+IFileSystem* CreateFileSystem(const IVolume *_rVolume);
+
+} // namespace
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
new file mode 100644
index 0000000000..c59bc8079e
--- /dev/null
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -0,0 +1,523 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <functional>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+#include <polarssl/aes.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/WiiWad.h"
+
+namespace DiscIO
+{
+
+CSharedContent::CSharedContent()
+{
+	UpdateLocation();
+}
+
+void CSharedContent::UpdateLocation()
+{
+	m_Elements.clear();
+	m_lastID = 0;
+	m_contentMap = StringFromFormat("%s/shared1/content.map", File::GetUserPath(D_WIIROOT_IDX).c_str());
+
+	File::IOFile pFile(m_contentMap, "rb");
+	SElement Element;
+	while (pFile.ReadArray(&Element, 1))
+	{
+		m_Elements.push_back(Element);
+		m_lastID++;
+	}
+}
+
+CSharedContent::~CSharedContent()
+{}
+
+std::string CSharedContent::GetFilenameFromSHA1(const u8* _pHash)
+{
+	for (auto& Element : m_Elements)
+	{
+		if (memcmp(_pHash, Element.SHA1Hash, 20) == 0)
+		{
+			return StringFromFormat("%s/shared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIROOT_IDX).c_str(),
+			    Element.FileName[0], Element.FileName[1], Element.FileName[2], Element.FileName[3],
+			    Element.FileName[4], Element.FileName[5], Element.FileName[6], Element.FileName[7]);
+		}
+	}
+	return "unk";
+}
+
+std::string CSharedContent::AddSharedContent(const u8* _pHash)
+{
+	std::string filename = GetFilenameFromSHA1(_pHash);
+
+	if (strcasecmp(filename.c_str(), "unk") == 0)
+	{
+		std::string id = StringFromFormat("%08x", m_lastID);
+		SElement Element;
+		memcpy(Element.FileName, id.c_str(), 8);
+		memcpy(Element.SHA1Hash, _pHash, 20);
+		m_Elements.push_back(Element);
+
+		File::CreateFullPath(m_contentMap);
+
+		File::IOFile pFile(m_contentMap, "ab");
+		pFile.WriteArray(&Element, 1);
+
+		filename = StringFromFormat("%s/shared1/%s.app", File::GetUserPath(D_WIIROOT_IDX).c_str(), id.c_str());
+		m_lastID++;
+	}
+
+	return filename;
+}
+
+
+// this classes must be created by the CNANDContentManager
+class CNANDContentLoader : public INANDContentLoader
+{
+public:
+	CNANDContentLoader(const std::string& _rName);
+	virtual ~CNANDContentLoader();
+
+	bool IsValid() const override { return m_Valid; }
+	void RemoveTitle() const override;
+	u64 GetTitleID() const override  { return m_TitleID; }
+	u16 GetIosVersion() const override { return m_IosVersion; }
+	u32 GetBootIndex() const override  { return m_BootIndex; }
+	size_t GetContentSize() const override { return m_Content.size(); }
+	const SNANDContent* GetContentByIndex(int _Index) const override;
+	const u8* GetTMDView() const override { return m_TMDView; }
+	const u8* GetTMDHeader() const override { return m_TMDHeader; }
+	u32 GetTIKSize() const override { return m_TIKSize; }
+	const u8* GetTIK() const override { return m_TIK; }
+
+	const std::vector<SNANDContent>& GetContent() const override { return m_Content; }
+
+	u16 GetTitleVersion() const override {return m_TitleVersion;}
+	u16 GetNumEntries() const override {return m_numEntries;}
+	DiscIO::IVolume::ECountry GetCountry() const override;
+	u8 GetCountryChar() const override {return m_Country; }
+
+private:
+	bool m_Valid;
+	bool m_isWAD;
+	std::string m_Path;
+	u64 m_TitleID;
+	u16 m_IosVersion;
+	u32 m_BootIndex;
+	u16 m_numEntries;
+	u16 m_TitleVersion;
+	u8 m_TMDView[TMD_VIEW_SIZE];
+	u8 m_TMDHeader[TMD_HEADER_SIZE];
+	u32 m_TIKSize;
+	u8* m_TIK;
+	u8 m_Country;
+
+	std::vector<SNANDContent> m_Content;
+
+
+	bool Initialize(const std::string& _rName);
+
+	void AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest);
+
+	void GetKeyFromTicket(u8* pTicket, u8* pTicketKey);
+};
+
+
+CNANDContentLoader::CNANDContentLoader(const std::string& _rName)
+	: m_Valid(false)
+	, m_isWAD(false)
+	, m_TitleID(-1)
+	, m_IosVersion(0x09)
+	, m_BootIndex(-1)
+	, m_TIKSize(0)
+	, m_TIK(nullptr)
+{
+	m_Valid = Initialize(_rName);
+}
+
+CNANDContentLoader::~CNANDContentLoader()
+{
+	for (auto& content : m_Content)
+	{
+		delete [] content.m_pData;
+	}
+	m_Content.clear();
+	if (m_TIK)
+	{
+		delete []m_TIK;
+		m_TIK = nullptr;
+	}
+}
+
+const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
+{
+	for (auto& Content : m_Content)
+	{
+		if (Content.m_Index == _Index)
+		{
+			return &Content;
+		}
+	}
+	return nullptr;
+}
+
+bool CNANDContentLoader::Initialize(const std::string& _rName)
+{
+	if (_rName.empty())
+		return false;
+	m_Path = _rName;
+	WiiWAD Wad(_rName);
+	u8* pDataApp = nullptr;
+	u8* pTMD = nullptr;
+	u8 DecryptTitleKey[16];
+	u8 IV[16];
+	if (Wad.IsValid())
+	{
+		m_isWAD = true;
+		m_TIKSize = Wad.GetTicketSize();
+		m_TIK = new u8[m_TIKSize];
+		memcpy(m_TIK, Wad.GetTicket(), m_TIKSize);
+		GetKeyFromTicket(m_TIK, DecryptTitleKey);
+		u32 pTMDSize = Wad.GetTMDSize();
+		pTMD = new u8[pTMDSize];
+		memcpy(pTMD, Wad.GetTMD(), pTMDSize);
+		pDataApp = Wad.GetDataApp();
+	}
+	else
+	{
+		std::string TMDFileName(m_Path);
+
+		if ('/' == *TMDFileName.rbegin())
+			TMDFileName += "title.tmd";
+		else
+			m_Path = TMDFileName.substr(0, TMDFileName.find("title.tmd"));
+
+		File::IOFile pTMDFile(TMDFileName, "rb");
+		if (!pTMDFile)
+		{
+			WARN_LOG(DISCIO, "CreateFromDirectory: error opening %s", TMDFileName.c_str());
+			return false;
+		}
+		u32 pTMDSize = (u32)File::GetSize(TMDFileName);
+		pTMD = new u8[pTMDSize];
+		pTMDFile.ReadBytes(pTMD, (size_t)pTMDSize);
+		pTMDFile.Close();
+	}
+
+	memcpy(m_TMDView, pTMD + 0x180, TMD_VIEW_SIZE);
+	memcpy(m_TMDHeader, pTMD, TMD_HEADER_SIZE);
+
+
+	m_TitleVersion = Common::swap16(pTMD + 0x01dc);
+	m_numEntries = Common::swap16(pTMD + 0x01de);
+	m_BootIndex = Common::swap16(pTMD + 0x01e0);
+	m_TitleID = Common::swap64(pTMD + 0x018c);
+	m_IosVersion = Common::swap16(pTMD + 0x018a);
+	m_Country = *(u8*)&m_TitleID;
+	if (m_Country == 2) // SYSMENU
+		m_Country = GetSysMenuRegion(m_TitleVersion);
+
+	m_Content.resize(m_numEntries);
+
+
+	for (u32 i=0; i < m_numEntries; i++)
+	{
+		SNANDContent& rContent = m_Content[i];
+
+		rContent.m_ContentID = Common::swap32(pTMD + 0x01e4 + 0x24*i);
+		rContent.m_Index = Common::swap16(pTMD + 0x01e8 + 0x24*i);
+		rContent.m_Type = Common::swap16(pTMD + 0x01ea + 0x24*i);
+		rContent.m_Size = (u32)Common::swap64(pTMD + 0x01ec + 0x24*i);
+		memcpy(rContent.m_SHA1Hash, pTMD + 0x01f4 + 0x24*i, 20);
+		memcpy(rContent.m_Header, pTMD + 0x01e4 + 0x24*i, 36);
+
+		if (m_isWAD)
+		{
+			u32 RoundedSize = ROUND_UP(rContent.m_Size, 0x40);
+			rContent.m_pData = new u8[RoundedSize];
+
+			memset(IV, 0, sizeof IV);
+			memcpy(IV, pTMD + 0x01e8 + 0x24*i, 2);
+			AESDecode(DecryptTitleKey, IV, pDataApp, RoundedSize, rContent.m_pData);
+
+			pDataApp += RoundedSize;
+			continue;
+		}
+
+		rContent.m_pData = nullptr;
+
+		if (rContent.m_Type & 0x8000)  // shared app
+			rContent.m_Filename = CSharedContent::AccessInstance().GetFilenameFromSHA1(rContent.m_SHA1Hash);
+		else
+			rContent.m_Filename = StringFromFormat("%s/%08x.app", m_Path.c_str(), rContent.m_ContentID);
+
+		// Be graceful about incorrect TMDs.
+		if (File::Exists(rContent.m_Filename))
+			rContent.m_Size = (u32) File::GetSize(rContent.m_Filename);
+	}
+
+	delete [] pTMD;
+	return true;
+}
+void CNANDContentLoader::AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest)
+{
+	aes_context AES_ctx;
+
+	aes_setkey_dec(&AES_ctx, _pKey, 128);
+	aes_crypt_cbc(&AES_ctx, AES_DECRYPT, _Size, _IV, _pSrc, _pDest);
+}
+
+void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)
+{
+	u8 CommonKey[16] = {0xeb,0xe4,0x2a,0x22,0x5e,0x85,0x93,0xe4,0x48,0xd9,0xc5,0x45,0x73,0x81,0xaa,0xf7};
+	u8 IV[16];
+	memset(IV, 0, sizeof IV);
+	memcpy(IV, pTicket + 0x01dc, 8);
+	AESDecode(CommonKey, IV, pTicket + 0x01bf, 16, pTicketKey);
+}
+
+
+DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
+{
+	if (!IsValid())
+		return DiscIO::IVolume::COUNTRY_UNKNOWN;
+
+	return CountrySwitch(m_Country);
+}
+
+
+CNANDContentManager::~CNANDContentManager()
+{
+	for (auto& entry : m_Map)
+	{
+		delete entry.second;
+	}
+	m_Map.clear();
+}
+
+const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& _rName, bool forceReload)
+{
+	CNANDContentMap::iterator lb = m_Map.lower_bound(_rName);
+
+	if (lb == m_Map.end() || (m_Map.key_comp()(_rName, lb->first)))
+	{
+		m_Map.insert(lb, CNANDContentMap::value_type(_rName, new CNANDContentLoader(_rName)));
+	}
+	else
+	{
+		if (!lb->second->IsValid() || forceReload)
+		{
+			delete lb->second;
+			lb->second = new CNANDContentLoader(_rName);
+		}
+	}
+	return *m_Map[_rName];
+}
+
+const INANDContentLoader& CNANDContentManager::GetNANDLoader(u64 _titleId, bool forceReload)
+{
+	std::string _rName = Common::GetTitleContentPath(_titleId);
+	return GetNANDLoader(_rName, forceReload);
+}
+bool CNANDContentManager::RemoveTitle(u64 _titleID)
+{
+	if (!GetNANDLoader(_titleID).IsValid())
+		return false;
+	GetNANDLoader(_titleID).RemoveTitle();
+	return GetNANDLoader(_titleID, true).IsValid();
+}
+
+void CNANDContentLoader::RemoveTitle() const
+{
+	INFO_LOG(DISCIO, "RemoveTitle %08x/%08x", (u32)(m_TitleID >> 32), (u32)m_TitleID);
+	if (IsValid())
+	{
+		// remove TMD?
+		for (u32 i = 0; i < m_numEntries; i++)
+		{
+			if (!(m_Content[i].m_Type & 0x8000)) // skip shared apps
+			{
+				std::string filename = StringFromFormat("%s%08x.app", Common::GetTitleContentPath(m_TitleID).c_str(), m_Content[i].m_ContentID);
+				INFO_LOG(DISCIO, "Delete %s", filename.c_str());
+				File::Delete(filename);
+			}
+		}
+	}
+}
+
+cUIDsys::cUIDsys()
+{
+	UpdateLocation();
+}
+
+void cUIDsys::UpdateLocation()
+{
+	m_Elements.clear();
+	m_lastUID = 0x00001000;
+	m_uidSys = File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/sys/uid.sys";
+
+	File::IOFile pFile(m_uidSys, "rb");
+	SElement Element;
+	while (pFile.ReadArray(&Element, 1))
+	{
+		*(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
+		m_Elements.push_back(Element);
+	}
+	pFile.Close();
+
+	if (m_Elements.empty())
+	{
+		*(u64*)&(Element.titleID) = Common::swap64(TITLEID_SYSMENU);
+		*(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
+
+		File::CreateFullPath(m_uidSys);
+		pFile.Open(m_uidSys, "wb");
+		if (!pFile.WriteArray(&Element, 1))
+			ERROR_LOG(DISCIO, "Failed to write to %s", m_uidSys.c_str());
+	}
+}
+
+cUIDsys::~cUIDsys()
+{}
+
+u32 cUIDsys::GetUIDFromTitle(u64 _Title)
+{
+	for (auto& Element : m_Elements)
+	{
+		if (Common::swap64(_Title) == *(u64*)&(Element.titleID))
+		{
+			return Common::swap32(Element.UID);
+		}
+	}
+	return 0;
+}
+
+void cUIDsys::AddTitle(u64 _TitleID)
+{
+	if (GetUIDFromTitle(_TitleID))
+	{
+		INFO_LOG(DISCIO, "Title %08x%08x, already exists in uid.sys", (u32)(_TitleID >> 32), (u32)_TitleID);
+		return;
+	}
+
+	SElement Element;
+	*(u64*)&(Element.titleID) = Common::swap64(_TitleID);
+	*(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
+	m_Elements.push_back(Element);
+
+	File::CreateFullPath(m_uidSys);
+	File::IOFile pFile(m_uidSys, "ab");
+
+	if (!pFile.WriteArray(&Element, 1))
+		ERROR_LOG(DISCIO, "fwrite failed");
+}
+
+void cUIDsys::GetTitleIDs(std::vector<u64>& _TitleIDs, bool _owned)
+{
+	for (auto& Element : m_Elements)
+	{
+		if ((_owned && Common::CheckTitleTIK(Common::swap64(Element.titleID)))  ||
+			(!_owned && Common::CheckTitleTMD(Common::swap64(Element.titleID))))
+			_TitleIDs.push_back(Common::swap64(Element.titleID));
+	}
+}
+
+u64 CNANDContentManager::Install_WiiWAD(const std::string& fileName)
+{
+	if (fileName.find(".wad") == std::string::npos)
+		return 0;
+	const INANDContentLoader& ContentLoader = GetNANDLoader(fileName);
+	if (ContentLoader.IsValid() == false)
+		return 0;
+
+	u64 TitleID = ContentLoader.GetTitleID();
+
+	//copy WAD's TMD header and contents to content directory
+
+	std::string ContentPath(Common::GetTitleContentPath(TitleID));
+	std::string TMDFileName(Common::GetTMDFileName(TitleID));
+	File::CreateFullPath(TMDFileName);
+
+	File::IOFile pTMDFile(TMDFileName, "wb");
+	if (!pTMDFile)
+	{
+		PanicAlertT("WAD installation failed: error creating %s", TMDFileName.c_str());
+		return 0;
+	}
+
+	pTMDFile.WriteBytes(ContentLoader.GetTMDHeader(), INANDContentLoader::TMD_HEADER_SIZE);
+
+	for (u32 i = 0; i < ContentLoader.GetContentSize(); i++)
+	{
+		const SNANDContent& Content = ContentLoader.GetContent()[i];
+
+		pTMDFile.WriteBytes(Content.m_Header, INANDContentLoader::CONTENT_HEADER_SIZE);
+
+		std::string APPFileName;
+		if (Content.m_Type & 0x8000) //shared
+			APPFileName = CSharedContent::AccessInstance().AddSharedContent(Content.m_SHA1Hash);
+		else
+			APPFileName = StringFromFormat("%s%08x.app", ContentPath.c_str(), Content.m_ContentID);
+
+		if (!File::Exists(APPFileName))
+		{
+			File::CreateFullPath(APPFileName);
+			File::IOFile pAPPFile(APPFileName, "wb");
+			if (!pAPPFile)
+			{
+				PanicAlertT("WAD installation failed: error creating %s", APPFileName.c_str());
+				return 0;
+			}
+
+			pAPPFile.WriteBytes(Content.m_pData, Content.m_Size);
+		}
+		else
+		{
+			INFO_LOG(DISCIO, "Content %s already exists.", APPFileName.c_str());
+		}
+	}
+
+	//Extract and copy WAD's ticket to ticket directory
+	if (!Add_Ticket(TitleID, ContentLoader.GetTIK(), ContentLoader.GetTIKSize()))
+	{
+		PanicAlertT("WAD installation failed: error creating ticket");
+		return 0;
+	}
+
+	cUIDsys::AccessInstance().AddTitle(TitleID);
+
+	return TitleID;
+}
+
+bool Add_Ticket(u64 TitleID, const u8* p_tik, u32 tikSize)
+{
+	std::string TicketFileName = Common::GetTicketFileName(TitleID);
+	File::CreateFullPath(TicketFileName);
+	File::IOFile pTicketFile(TicketFileName, "wb");
+	if (!pTicketFile || !p_tik)
+	{
+		//PanicAlertT("WAD installation failed: error creating %s", TicketFileName.c_str());
+		return false;
+	}
+	return pTicketFile.WriteBytes(p_tik, tikSize);
+}
+
+} // namespace end
+
diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h
new file mode 100644
index 0000000000..8b309b13f5
--- /dev/null
+++ b/Source/Core/DiscIO/NANDContentLoader.h
@@ -0,0 +1,148 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+namespace DiscIO
+{
+	bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize);
+struct SNANDContent
+{
+	u32 m_ContentID;
+	u16 m_Index;
+	u16 m_Type;
+	u32 m_Size;
+	u8 m_SHA1Hash[20];
+	u8 m_Header[36]; //all of the above
+
+	std::string m_Filename;
+	u8* m_pData;
+};
+
+// pure virtual interface so just the NANDContentManager can create these files only
+class INANDContentLoader
+{
+public:
+
+	INANDContentLoader() {}
+
+	virtual ~INANDContentLoader()  {}
+
+	virtual bool IsValid() const = 0;
+	virtual void RemoveTitle() const = 0;
+	virtual u64 GetTitleID() const = 0;
+	virtual u16 GetIosVersion() const = 0;
+	virtual u32 GetBootIndex() const = 0;
+	virtual size_t GetContentSize() const = 0;
+	virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
+	virtual const u8* GetTMDView() const = 0;
+	virtual const u8* GetTMDHeader() const = 0;
+	virtual u32 GetTIKSize() const = 0;
+	virtual const u8* GetTIK() const = 0;
+	virtual const std::vector<SNANDContent>& GetContent() const = 0;
+	virtual u16 GetTitleVersion() const = 0;
+	virtual u16 GetNumEntries() const = 0;
+	virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
+	virtual u8 GetCountryChar() const = 0;
+
+	enum
+	{
+		TMD_VIEW_SIZE       = 0x58,
+		TMD_HEADER_SIZE     = 0x1E4,
+		CONTENT_HEADER_SIZE = 0x24,
+		TICKET_SIZE         = 0x2A4
+	};
+};
+
+
+// we open the NAND Content files too often... let's cache them
+class CNANDContentManager
+{
+public:
+	static CNANDContentManager& Access() { static CNANDContentManager instance; return instance; }
+	u64 Install_WiiWAD(const std::string& fileName);
+
+	const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
+	const INANDContentLoader& GetNANDLoader(u64 _titleId, bool forceReload = false);
+	bool RemoveTitle(u64 _titleID);
+
+private:
+	CNANDContentManager() {}
+	~CNANDContentManager();
+
+	CNANDContentManager(CNANDContentManager const&) = delete;
+	void operator=(CNANDContentManager const&) = delete;
+
+	typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
+	CNANDContentMap m_Map;
+};
+
+class CSharedContent
+{
+public:
+	static CSharedContent& AccessInstance() { static CSharedContent instance; return instance; }
+
+	std::string GetFilenameFromSHA1(const u8* _pHash);
+	std::string AddSharedContent(const u8* _pHash);
+	void UpdateLocation();
+
+private:
+	CSharedContent();
+	virtual ~CSharedContent();
+
+	CSharedContent(CSharedContent const&) = delete;
+	void operator=(CSharedContent const&) = delete;
+
+#pragma pack(push,1)
+	struct SElement
+	{
+		u8 FileName[8];
+		u8 SHA1Hash[20];
+	};
+#pragma pack(pop)
+
+	u32 m_lastID;
+	std::string m_contentMap;
+	std::vector<SElement> m_Elements;
+};
+
+class cUIDsys
+{
+public:
+	static cUIDsys& AccessInstance() { static cUIDsys instance; return instance; }
+
+	u32 GetUIDFromTitle(u64 _Title);
+	void AddTitle(u64 _Title);
+	void GetTitleIDs(std::vector<u64>& _TitleIDs, bool _owned = false);
+	void UpdateLocation();
+
+private:
+	cUIDsys();
+	virtual ~cUIDsys();
+
+	cUIDsys(cUIDsys const&) = delete;
+	void operator=(cUIDsys const&) = delete;
+
+#pragma pack(push,1)
+	struct SElement
+	{
+		u8 titleID[8];
+		u8 UID[4];
+	};
+#pragma pack(pop)
+
+	u32 m_lastUID;
+	std::string m_uidSys;
+	std::vector<SElement> m_Elements;
+};
+
+}
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
deleted file mode 100644
index 11f9697ba9..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "BannerLoader.h"
-#include "BannerLoaderWii.h"
-#include "BannerLoaderGC.h"
-
-#include "VolumeCreator.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-
-IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume)
-{
-	if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume))
-	{
-		return new CBannerLoaderWii(pVolume);
-	}
-	if (_rFileSystem.IsValid())
-	{
-		return new CBannerLoaderGC(_rFileSystem, pVolume);
-	}
-
-	return NULL;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/BannerLoader.h b/Source/Core/DiscIO/Src/BannerLoader.h
deleted file mode 100644
index 7fec9c57bd..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BANNER_LOADER_H_
-#define _BANNER_LOADER_H_
-
-#include <vector>
-#include <string>
-
-#include "Filesystem.h"
-
-namespace DiscIO
-{
-class IBannerLoader
-{
-	public:
-
-		IBannerLoader()
-		{}
-
-
-		virtual ~IBannerLoader()
-		{}
-
-
-		virtual bool IsValid() = 0;
-
-		virtual bool GetBanner(u32* _pBannerImage) = 0;
-
-		virtual std::vector<std::string> GetNames() = 0;
-		virtual std::string GetCompany() = 0;
-		virtual std::vector<std::string> GetDescriptions() = 0;
-};
-
-IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume);
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
deleted file mode 100644
index 58b79d12db..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// HyperIris: need clean code
-#include "../../Core/Src/ConfigManager.h"
-
-#include "ColorUtil.h"
-#include "BannerLoaderGC.h"
-
-namespace DiscIO
-{
-CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume)
-	: m_pBannerFile(NULL)
-	, m_IsValid(false)
-	, m_country(volume->GetCountry())
-{
-	// load the opening.bnr
-	size_t FileSize = (size_t) _rFileSystem.GetFileSize("opening.bnr");
-	if (FileSize == BNR1_SIZE || FileSize == BNR2_SIZE)
-	{
-		m_pBannerFile = new u8[FileSize];
-		if (m_pBannerFile)
-		{
-			_rFileSystem.ReadFile("opening.bnr", m_pBannerFile, FileSize);
-			m_BNRType = getBannerType();
-			if (m_BNRType == BANNER_UNKNOWN)
-				PanicAlertT("Invalid opening.bnr found in gcm:\n%s\n You may need to redump this game.",
-					_rFileSystem.GetVolume()->GetName().c_str());
-			else m_IsValid = true;
-		}
-	}
-	else WARN_LOG(DISCIO, "Invalid opening.bnr size: %0lx",
-		(unsigned long)FileSize);
-}
-
-
-CBannerLoaderGC::~CBannerLoaderGC()
-{
-	if (m_pBannerFile)
-	{
-		delete [] m_pBannerFile;
-		m_pBannerFile = NULL;
-	}
-}
-
-
-bool CBannerLoaderGC::IsValid()
-{
-	return m_IsValid;
-}
-
-bool CBannerLoaderGC::GetBanner(u32* _pBannerImage)
-{
-	if (!IsValid())
-	{
-		return false;
-	}
-
-	auto const pBanner = (DVDBanner*)m_pBannerFile;
-	decode5A3image(_pBannerImage, pBanner->image, DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT);
-
-	return true;
-}
-
-
-std::vector<std::string> CBannerLoaderGC::GetNames()
-{
-	std::vector<std::string> names;
-
-	if (!IsValid())
-	{
-		return names;
-	}
-
-	u32 name_count = 0;
-
-	// find Banner type
-	switch (m_BNRType)
-	{
-	case CBannerLoaderGC::BANNER_BNR1:
-		name_count = 1;
-		break;
-
-	case CBannerLoaderGC::BANNER_BNR2:
-		name_count = 6;
-		break;
-
-	default:
-		break;
-	}
-
-	auto const banner = reinterpret_cast<const DVDBanner*>(m_pBannerFile);
-
-	for (u32 i = 0; i != name_count; ++i)
-	{
-		auto& comment = banner->comment[i];
-
-		if (comment.longTitle[0])
-		{
-			auto& data = comment.longTitle;
-			names.push_back(GetDecodedString(data));
-		}
-		else
-		{
-			auto& data = comment.shortTitle;
-			names.push_back(GetDecodedString(data));
-		}
-	}
-	
-	return names;
-}
-
-
-std::string CBannerLoaderGC::GetCompany()
-{
-	std::string company;
-
-	if (IsValid())
-	{
-		auto const pBanner = (DVDBanner*)m_pBannerFile;
-		auto& data = pBanner->comment[0].shortMaker;
-		company = GetDecodedString(data);
-	}
-
-	return company;
-}
-
-
-std::vector<std::string> CBannerLoaderGC::GetDescriptions()
-{
-	std::vector<std::string> descriptions;
-
-	if (!IsValid())
-	{
-		return descriptions;
-	}
-
-	u32 desc_count = 0;
-
-	// find Banner type
-	switch (m_BNRType)
-	{
-	case CBannerLoaderGC::BANNER_BNR1:
-		desc_count = 1;
-		break;
-
-	// English, German, French, Spanish, Italian, Dutch
-	case CBannerLoaderGC::BANNER_BNR2:
-		desc_count = 6;
-		break;
-
-	default:
-		break;
-	}
-
-	auto banner = reinterpret_cast<const DVDBanner*>(m_pBannerFile);
-
-	for (u32 i = 0; i != desc_count; ++i)
-	{
-		auto& data = banner->comment[i].comment;
-		descriptions.push_back(GetDecodedString(data));
-	}
-
-	return descriptions;
-}
-
-
-void CBannerLoaderGC::decode5A3image(u32* dst, u16* src, int width, int height)
-{
-	for (int y = 0; y < height; y += 4)
-	{
-		for (int x = 0; x < width; x += 4)
-		{
-			for (int iy = 0; iy < 4; iy++, src += 4)
-			{
-				for (int ix = 0; ix < 4; ix++)
-				{
-					u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
-					dst[(y + iy) * width + (x + ix)] = RGBA;
-				}
-			}
-		}
-	}
-}
-
-CBannerLoaderGC::BANNER_TYPE CBannerLoaderGC::getBannerType()
-{
-	u32 bannerSignature = *(u32*)m_pBannerFile;
-	CBannerLoaderGC::BANNER_TYPE type = CBannerLoaderGC::BANNER_UNKNOWN;
-	switch (bannerSignature)
-	{
-	// "BNR1"
-	case 0x31524e42:
-		type = CBannerLoaderGC::BANNER_BNR1;
-		break;
-
-	// "BNR2"
-	case 0x32524e42:
-		type = CBannerLoaderGC::BANNER_BNR2;
-		break;
-	}
-	return type;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.h b/Source/Core/DiscIO/Src/BannerLoaderGC.h
deleted file mode 100644
index b9674feb58..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BANNER_LOADER_GC_H_
-#define _BANNER_LOADER_GC_H_
-
-#include "BannerLoader.h"
-#include "VolumeGC.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-class CBannerLoaderGC
-	: public IBannerLoader
-{
-	public:
-		CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume);
-		virtual ~CBannerLoaderGC();
-
-		virtual bool IsValid();
-
-		virtual bool GetBanner(u32* _pBannerImage);
-
-		virtual std::vector<std::string> GetNames();
-		virtual std::string GetCompany();
-		virtual std::vector<std::string> GetDescriptions();
-
-	private:
-		enum
-		{
-			DVD_BANNER_WIDTH  = 96,
-			DVD_BANNER_HEIGHT = 32
-		};
-
-		enum BANNER_TYPE
-		{
-			BANNER_UNKNOWN,
-			BANNER_BNR1,
-			BANNER_BNR2,
-		};
-
-		// Banner Comment
-		struct DVDBannerComment
-		{
-			char shortTitle[32]; // Short game title shown in IPL menu
-			char shortMaker[32]; // Short developer, publisher names shown in IPL menu
-			char longTitle[64]; // Long game title shown in IPL game start screen
-			char longMaker[64]; // Long developer, publisher names shown in IPL game start screen
-			char comment[128]; // Game description shown in IPL game start screen in two lines.
-		};
-
-		// "opening.bnr" file format for EU console
-		struct DVDBanner
-		{
-			u32 id; // 'BNR2'
-			u32 padding[7];
-			u16 image[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT]; // RGB5A3 96x32 texture image
-			DVDBannerComment comment[6]; // Comments in six languages (only 1 for BNR1 type)
-		};
-
-		static const u32 BNR1_SIZE = sizeof(DVDBanner) - sizeof(DVDBannerComment) * 5;
-		static const u32 BNR2_SIZE = sizeof(DVDBanner);
-
-		template <u32 N>
-		std::string GetDecodedString(const char (&data)[N])
-		{
-			auto const string_decoder = CVolumeGC::GetStringDecoder(m_country);
-			
-			// strnlen to trim NULLs
-			return string_decoder(std::string(data, strnlen(data, sizeof(data))));
-		}
-
-		u8* m_pBannerFile;
-		bool m_IsValid;
-		BANNER_TYPE m_BNRType;
-
-		void decode5A3image(u32* dst, u16* src, int width, int height);
-		BANNER_TYPE getBannerType();
-		
-		DiscIO::IVolume::ECountry const m_country;
-};
-
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
deleted file mode 100644
index e682ca13c6..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <algorithm>
-
-#include "Common.h"
-#include "ColorUtil.h"
-#include "BannerLoaderWii.h"
-#include "VolumeCreator.h"
-#include "FileUtil.h"
-#include "FileHandlerARC.h"
-
-namespace DiscIO
-{
-
-CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)	
-	: m_pBannerFile(NULL)
-	, m_IsValid(false)
-{
-	char Filename[260];
-	u64 TitleID;
-
-	pVolume->GetTitleID((u8*)&TitleID);
-
-	TitleID = Common::swap64(TitleID);
-
-	sprintf(Filename, "%stitle/%08x/%08x/data/banner.bin",
-		    File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID);
-
-	if (!File::Exists(Filename))
-	{
-		// TODO(XK): Finish the 'commented' code. Turns out the banner.bin
-		//           from the savefiles is very different from the banner.bin
-		//           inside opening.bnr
-#if 0
-		char bnrFilename[260], titleFolder[260];
-
-		// Creating title folder
-		sprintf(titleFolder, "%stitle/%08x/%08x/data/",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID);
-		if(!File::Exists(titleFolder))
-			File::CreateFullPath(titleFolder);
-		
-		// Extracting banner.bin from opening.bnr
-		sprintf(bnrFilename, "%stitle/%08x/%08x/data/opening.bnr",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID);
-
-		if(!_rFileSystem.ExportFile("opening.bnr", bnrFilename)) {
-			m_IsValid = false;
-			return;
-		}
-
-		CARCFile bnrArc (bnrFilename, 0x600);
-
-		if(!bnrArc.ExportFile("meta/banner.bin", Filename)) {
-			m_IsValid = false;
-			return;
-		}
-
-		// Now we have an LZ77-compressed file with a short IMD5 header
-		// TODO: Finish the job
-		
-		File::Delete(bnrFilename);
-#else
-		m_IsValid = false;
-		return;
-#endif
-	}
-
-	// load the banner.bin
-	size_t FileSize = (size_t) File::GetSize(Filename);
-
-	if (FileSize > 0)
-	{
-		m_pBannerFile = new u8[FileSize];
-		File::IOFile pFile(Filename, "rb");
-		if (pFile)
-		{
-			pFile.ReadBytes(m_pBannerFile, FileSize);
-			m_IsValid = true;
-		}
-	}
-}
-
-CBannerLoaderWii::~CBannerLoaderWii()
-{
-	if (m_pBannerFile)
-	{
-		delete [] m_pBannerFile;
-		m_pBannerFile = NULL;
-	}
-}
-
-bool CBannerLoaderWii::IsValid()
-{
-	return m_IsValid;
-}
-
-static inline u32 Average32(u32 a, u32 b) {
-	return ((a >> 1) & 0x7f7f7f7f) + ((b >> 1) & 0x7f7f7f7f);
-}
-
-static inline u32 GetPixel(u32 *buffer, unsigned int x, unsigned int y) {
-	// thanks to unsignedness, these also check for <0 automatically.
-	if (x > 191) return 0;
-	if (y > 63) return 0;
-	return buffer[y * 192 + x];
-}
-
-bool CBannerLoaderWii::GetBanner(u32* _pBannerImage)
-{
-	if (IsValid())
-	{
-		SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
-		u32* Buffer = new u32[192 * 64];
-		decode5A3image(Buffer, (u16*)pBanner->m_BannerTexture, 192, 64);
-		for (int y = 0; y < 32; y++)
-		{
-			for (int x = 0; x < 96; x++)
-			{
-				// simplified plus-shaped "gaussian"
-				u32 surround = Average32(
-					Average32(GetPixel(Buffer, x*2 - 1, y*2), GetPixel(Buffer, x*2 + 1, y*2)),
-					Average32(GetPixel(Buffer, x*2, y*2 - 1), GetPixel(Buffer, x*2, y*2 + 1)));
-				_pBannerImage[y * 96 + x] = Average32(GetPixel(Buffer, x*2, y*2), surround);
-			}
-		}
-		delete[] Buffer;
-	}
-	return true;
-}
-
-bool CBannerLoaderWii::GetStringFromComments(const CommentIndex index, std::string& result)
-{
-	if (IsValid())
-	{
-		auto const banner = reinterpret_cast<const SWiiBanner*>(m_pBannerFile);
-		auto const src_ptr = banner->m_Comment[index];
-		
-		// Trim at first NULL
-		auto const length = std::find(src_ptr, src_ptr + COMMENT_SIZE, 0x0) - src_ptr;
-		
-		std::wstring src;
-		src.resize(length);
-		std::transform(src_ptr, src_ptr + src.size(), src.begin(), (u16(&)(u16))Common::swap16);
-		result = UTF16ToUTF8(src);
-		
-		return true;
-	}
-
-	return false;
-}
-
-std::vector<std::string> CBannerLoaderWii::GetNames()
-{
-	std::vector<std::string> ret(1);
-	
-	if (!GetStringFromComments(NAME_IDX, ret[0]))
-		ret.clear();
-
-	return ret;
-}
-
-std::string CBannerLoaderWii::GetCompany()
-{
-	return "";
-}
-
-std::vector<std::string> CBannerLoaderWii::GetDescriptions()
-{
-	std::vector<std::string> result(1);
-	if (!GetStringFromComments(DESC_IDX, result[0]))
-		result.clear();
-	return result;
-}
-
-void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height)
-{
-	for (int y = 0; y < height; y += 4)
-	{
-		for (int x = 0; x < width; x += 4)
-		{
-			for (int iy = 0; iy < 4; iy++, src += 4)
-			{
-				for (int ix = 0; ix < 4; ix++)
-				{
-					u32 RGBA = ColorUtil::Decode5A3(Common::swap16(src[ix]));
-					dst[(y + iy) * width + (x + ix)] = RGBA;
-				}
-			}
-		}
-	}
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h
deleted file mode 100644
index 33a1dce6ae..0000000000
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BANNER_LOADER_WII_H_
-#define _BANNER_LOADER_WII_H_
-
-#include "BannerLoader.h"
-
-namespace DiscIO
-{
-class CBannerLoaderWii
-	: public IBannerLoader
-{
-	public:
-
-		CBannerLoaderWii(DiscIO::IVolume *pVolume);
-
-		virtual ~CBannerLoaderWii();
-
-		virtual bool IsValid();
-
-		virtual bool GetBanner(u32* _pBannerImage);
-
-		virtual std::vector<std::string> GetNames();
-		virtual std::string GetCompany();
-		virtual std::vector<std::string> GetDescriptions();
-
-	private:
-		
-		enum
-		{
-			TEXTURE_SIZE = 192 * 64 * 2,
-			ICON_SIZE = 48 * 48 * 2,
-			COMMENT_SIZE = 32
-		};
-
-		enum CommentIndex
-		{
-			NAME_IDX,
-			DESC_IDX
-		};
-
-		struct SWiiBanner
-		{
-			u32 ID;
-
-			u32 m_Flag;
-			u16 m_Speed;
-			u8  m_Unknown[22];
-
-			// Not null terminated!
-			u16 m_Comment[2][COMMENT_SIZE];
-			u8  m_BannerTexture[TEXTURE_SIZE];
-			u8  m_IconTexture[8][ICON_SIZE];
-		} ;
-
-		u8* m_pBannerFile;
-
-		bool m_IsValid;
-
-		void decode5A3image(u32* dst, u16* src, int width, int height);
-
-		bool GetStringFromComments(const CommentIndex index, std::string& s);
-};
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp
deleted file mode 100644
index ba02e98b3c..0000000000
--- a/Source/Core/DiscIO/Src/Blob.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "CDUtils.h"
-#include "Blob.h"
-#include "CompressedBlob.h"
-#include "FileBlob.h"
-#include "CISOBlob.h"
-#include "DriveBlob.h"
-#include "WbfsBlob.h"
-
-namespace DiscIO
-{
-
-// Provides caching and split-operation-to-block-operations facilities.
-// Used for compressed blob reading and direct drive reading.
-
-void SectorReader::SetSectorSize(int blocksize)
-{
-	for (int i = 0; i < CACHE_SIZE; i++)
-	{
-		cache[i] = new u8[blocksize];
-		cache_tags[i] = (u64)(s64) - 1;
-	}
-	m_blocksize = blocksize;
-}
-
-SectorReader::~SectorReader() {
-	for (int i = 0; i < CACHE_SIZE; i++)
-		delete [] cache[i];
-}
-
-const u8 *SectorReader::GetBlockData(u64 block_num)
-{
-	// TODO : Expand usage of the cache to more than one block :P
-	if (cache_tags[0] == block_num)
-	{
-		return cache[0];
-	}
-	else 
-	{
-		GetBlock(block_num, cache[0]);
-		cache_tags[0] = block_num;
-		return cache[0];
-	}
-}
-
-bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
-{
-	u64 startingBlock = offset / m_blocksize;
-	u64 remain = size;
-
-	int positionInBlock = (int)(offset % m_blocksize);
-	u64 block = startingBlock;
-
-	while (remain > 0)
-	{
-		// Check if we are ready to do a large block read. > instead of >= so we don't bother if remain is only one block.
-		if (positionInBlock == 0 && remain > (u64)m_blocksize)
-		{
-			u64 num_blocks = remain / m_blocksize;
-			ReadMultipleAlignedBlocks(block, num_blocks, out_ptr);
-			block += num_blocks;
-			out_ptr += num_blocks * m_blocksize;
-			remain -= num_blocks * m_blocksize;
-			continue;
-		}
-
-		u32 toCopy = m_blocksize - positionInBlock;
-		if (toCopy >= remain)
-		{
-			const u8* data = GetBlockData(block);
-			if (!data)
-				return false;
-
-			// Yay, we are done!
-			memcpy(out_ptr, data + positionInBlock, (size_t)remain);
-			return true;
-		}
-		else
-		{
-			const u8* data = GetBlockData(block);
-			if (!data)
-				return false;
-
-			memcpy(out_ptr, data + positionInBlock, toCopy);
-			out_ptr += toCopy;
-			remain -= toCopy;
-			positionInBlock = 0;
-			block++;
-		}
-	}
-	return true;
-}
-
-bool SectorReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr)
-{
-	for (u64 i = 0; i < num_blocks; i++)
-	{
-		const u8 *data = GetBlockData(block_num + i);
-		if (!data)
-			return false;
-		memcpy(out_ptr + i * m_blocksize, data, m_blocksize);
-	}
-	return true;
-}
-
-IBlobReader* CreateBlobReader(const char* filename)
-{
-	if (cdio_is_cdrom(std::string(filename)))
-		return DriveReader::Create(filename);
-
-	if (!File::Exists(filename))
-		return 0;
-
-	if (IsWbfsBlob(filename))
-		return WbfsFileReader::Create(filename);
-
-	if (IsCompressedBlob(filename))
-		return CompressedBlobReader::Create(filename);
-
-	if (IsCISOBlob(filename))
-		return CISOFileReader::Create(filename);
-
-	// Still here? Assume plain file - since we know it exists due to the File::Exists check above.
-	return PlainFileReader::Create(filename);
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/Blob.h b/Source/Core/DiscIO/Src/Blob.h
deleted file mode 100644
index c332257c8f..0000000000
--- a/Source/Core/DiscIO/Src/Blob.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BLOB_H
-#define _BLOB_H
-
-// BLOB
-
-// Blobs in Dolphin are read only Binary Large OBjects. For example, a typical DVD image.
-// Often, you may want to store these things in a highly compressed format, but still
-// allow random access. Or you may store them on an odd device, like raw on a DVD.
-
-// Always read your BLOBs using an interface returned by CreateBlobReader(). It will
-// detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and
-// automatically do the right thing.
-
-#include "Common.h"
-
-namespace DiscIO
-{
-
-class IBlobReader
-{
-public:
-	virtual ~IBlobReader() {}
-
-	virtual u64 GetRawSize() const  = 0;
-	virtual u64 GetDataSize() const = 0;
-	// NOT thread-safe - can't call this from multiple threads.
-	virtual bool Read(u64 offset, u64 size, u8* out_ptr) = 0;
-
-protected:
-	IBlobReader() {}
-};
-
-
-// Provides caching and split-operation-to-block-operations facilities.
-// Used for compressed blob reading and direct drive reading.
-// Currently only uses a single entry cache.
-// Multi-block reads are not cached.
-class SectorReader : public IBlobReader
-{
-private:
-	enum { CACHE_SIZE = 32 };
-	int m_blocksize;
-	u8* cache[CACHE_SIZE];
-	u64 cache_tags[CACHE_SIZE];
-	int cache_age[CACHE_SIZE];
-
-protected:
-	void SetSectorSize(int blocksize);
-	virtual void GetBlock(u64 block_num, u8 *out) = 0;
-	// This one is uncached. The default implementation is to simply call GetBlockData multiple times and memcpy.
-	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr);
-
-public:
-	virtual ~SectorReader();
-
-	// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
-	const u8 *GetBlockData(u64 block_num);
-	virtual bool Read(u64 offset, u64 size, u8 *out_ptr);
-	friend class DriveReader;
-};
-
-// Factory function - examines the path to choose the right type of IBlobReader, and returns one.
-IBlobReader* CreateBlobReader(const char *filename);
-
-typedef void (*CompressCB)(const char *text, float percent, void* arg);
-
-bool CompressFileToBlob(const char *infile, const char *outfile, u32 sub_type = 0, int sector_size = 16384,
-		CompressCB callback = 0, void *arg = 0);
-bool DecompressBlobToFile(const char *infile, const char *outfile,
-		CompressCB callback = 0, void *arg = 0);
-
-}  // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/CISOBlob.cpp b/Source/Core/DiscIO/Src/CISOBlob.cpp
deleted file mode 100644
index c4b3c60143..0000000000
--- a/Source/Core/DiscIO/Src/CISOBlob.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-#include <cmath>
-
-#include "Blob.h"
-#include "CISOBlob.h"
-
-namespace DiscIO
-{
-
-static const char CISO_MAGIC[] = "CISO";
-
-CISOFileReader::CISOFileReader(std::FILE* file)
-	: m_file(file)
-{
-	m_size = m_file.GetSize();
-	
-	CISOHeader header;
-	m_file.ReadArray(&header, 1);
-	
-	m_block_size = header.block_size;
-
-	MapType count = 0;
-	for (u32 idx = 0; idx < CISO_MAP_SIZE; idx++)
-		m_ciso_map[idx] = (1 == header.map[idx]) ? count++ : UNUSED_BLOCK_ID;
-}
-
-CISOFileReader* CISOFileReader::Create(const char* filename)
-{
-	if (IsCISOBlob(filename))
-	{
-		File::IOFile f(filename, "rb");
-		return new CISOFileReader(f.ReleaseHandle());
-	}
-	else
-		return NULL;
-}
-
-u64 CISOFileReader::GetDataSize() const
-{
-	return GetRawSize();
-}
-
-u64 CISOFileReader::GetRawSize() const
-{
-	return m_size;
-}
-
-bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
-{
-	while (nbytes != 0)
-	{
-		auto const block = offset / m_block_size;
-		auto const data_offset = offset % m_block_size;
-		
-		auto const bytes_to_read = std::min(m_block_size - data_offset, nbytes);
-		if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block])
-		{
-			// calculate the base address
-			auto const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * m_block_size + data_offset;
-
-			if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
-				return false;
-
-			out_ptr += bytes_to_read;
-			offset += bytes_to_read;
-			nbytes -= bytes_to_read;
-		}
-		else
-		{
-			std::fill_n(out_ptr, bytes_to_read, 0);
-			out_ptr += bytes_to_read;
-			offset += bytes_to_read;
-			nbytes -= bytes_to_read;
-		}
-	}
-	
-	return true;
-}
-
-bool IsCISOBlob(const char* filename)
-{
-	File::IOFile f(filename, "rb");
-
-	CISOHeader header;
-	return (f.ReadArray(&header, 1) &&
-		std::equal(header.magic, header.magic + sizeof(header.magic), CISO_MAGIC));
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/CISOBlob.h b/Source/Core/DiscIO/Src/CISOBlob.h
deleted file mode 100644
index 8c580b0ce1..0000000000
--- a/Source/Core/DiscIO/Src/CISOBlob.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CISO_BLOB_H
-#define _CISO_BLOB_H
-
-#include "Blob.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-
-bool IsCISOBlob(const char* filename);
-
-static const u32 CISO_HEADER_SIZE = 0x8000;
-static const u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4;
-
-struct CISOHeader
-{
-	// "CISO"
-	char magic[4];
-	
-	// little endian
-	u32 block_size;
-	
-	// 0=unused, 1=used, others=invalid
-	u8 map[CISO_MAP_SIZE];
-};
-
-class CISOFileReader : public IBlobReader
-{
-public:
-	static CISOFileReader* Create(const char* filename);
-
-	u64 GetDataSize() const;
-	u64 GetRawSize() const;
-	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
-
-private:
-	CISOFileReader(std::FILE* file);
-	
-	typedef u16 MapType;
-	static const MapType UNUSED_BLOCK_ID = -1;
-	
-	File::IOFile m_file;
-	u64 m_size;
-	u32 m_block_size;
-	MapType m_ciso_map[CISO_MAP_SIZE];
-};
-
-}  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
deleted file mode 100644
index b469dedc9c..0000000000
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifdef _WIN32
-#include <io.h>
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-
-#include "Common.h"
-#include "CompressedBlob.h"
-#include "DiscScrubber.h"
-#include "FileUtil.h"
-#include "Hash.h"
-
-#include "zlib.h"
-
-namespace DiscIO
-{
-
-CompressedBlobReader::CompressedBlobReader(const char *filename)
-{
-	file_name = filename;
-	m_file.Open(filename, "rb");
-	file_size = File::GetSize(filename);
-	m_file.ReadArray(&header, 1);
-
-	SetSectorSize(header.block_size);
-
-	// cache block pointers and hashes
-	block_pointers = new u64[header.num_blocks];
-	m_file.ReadArray(block_pointers, header.num_blocks);
-	hashes = new u32[header.num_blocks];
-	m_file.ReadArray(hashes, header.num_blocks);
-
-	data_offset = (sizeof(CompressedBlobHeader))
-		+ (sizeof(u64)) * header.num_blocks   // skip block pointers
-		+ (sizeof(u32)) * header.num_blocks;  // skip hashes
-
-	// A compressed block is never ever longer than a decompressed block, so just header.block_size should be fine.
-	// I still add some safety margin.
-	zlib_buffer_size = header.block_size + 64;
-	zlib_buffer = new u8[zlib_buffer_size];
-	memset(zlib_buffer, 0, zlib_buffer_size);
-}
-
-CompressedBlobReader* CompressedBlobReader::Create(const char* filename)
-{
-	if (IsCompressedBlob(filename))
-		return new CompressedBlobReader(filename);
-	else
-		return 0;
-}
-
-CompressedBlobReader::~CompressedBlobReader()
-{
-	delete [] zlib_buffer;
-	delete [] block_pointers;
-	delete [] hashes;
-}
-
-// IMPORTANT: Calling this function invalidates all earlier pointers gotten from this function.
-u64 CompressedBlobReader::GetBlockCompressedSize(u64 block_num) const
-{
-	u64 start = block_pointers[block_num];
-	if (block_num < header.num_blocks - 1)
-		return block_pointers[block_num + 1] - start;
-	else if (block_num == header.num_blocks - 1)
-		return header.compressed_data_size - start;
-	else
-		PanicAlert("GetBlockCompressedSize - illegal block number %i", (int)block_num);
-	return 0;
-}
-
-void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
-{
-	bool uncompressed = false;
-	u32 comp_block_size = (u32)GetBlockCompressedSize(block_num);
-	u64 offset = block_pointers[block_num] + data_offset;
-
-	if (offset & (1ULL << 63))
-	{
-		if (comp_block_size != header.block_size)
-			PanicAlert("Uncompressed block with wrong size");
-		uncompressed = true;
-		offset &= ~(1ULL << 63);
-	}
-
-	// clear unused part of zlib buffer. maybe this can be deleted when it works fully.
-	memset(zlib_buffer + comp_block_size, 0, zlib_buffer_size - comp_block_size);
-	
-	m_file.Seek(offset, SEEK_SET);
-	m_file.ReadBytes(zlib_buffer, comp_block_size);
-
-	u8* source = zlib_buffer;
-	u8* dest = out_ptr;
-
-	// First, check hash.
-	u32 block_hash = HashAdler32(source, comp_block_size);
-	if (block_hash != hashes[block_num])
-		PanicAlert("Hash of block %lli is %08x instead of %08x.\n"
-		           "Your ISO, %s, is corrupt.",
-		           block_num, block_hash, hashes[block_num],
-				   file_name.c_str());
-
-	if (uncompressed)
-	{
-		memcpy(dest, source, comp_block_size);
-	}
-	else
-	{
-		z_stream z;
-		memset(&z, 0, sizeof(z));
-		z.next_in  = source;
-		z.avail_in = comp_block_size;
-		if (z.avail_in > header.block_size)
-		{
-			PanicAlert("We have a problem");
-		}
-		z.next_out  = dest;
-		z.avail_out = header.block_size;
-		inflateInit(&z);
-		int status = inflate(&z, Z_FULL_FLUSH);
-		u32 uncomp_size = header.block_size - z.avail_out;
-		if (status != Z_STREAM_END)
-		{
-			// this seem to fire wrongly from time to time
-			// to be sure, don't use compressed isos :P
-			PanicAlert("Failure reading block %lli - out of data and not at end.", block_num);
-		}
-		inflateEnd(&z);
-		if (uncomp_size != header.block_size)
-			PanicAlert("Wrong block size");
-	}
-}
-
-bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
-						int block_size, CompressCB callback, void* arg)
-{
-	bool scrubbing = false;
-
-	if (IsCompressedBlob(infile))
-	{
-		PanicAlertT("%s is already compressed! Cannot compress it further.", infile);
-		return false;
-	}
-
-	if (sub_type == 1)
-	{
-		if (!DiscScrubber::SetupScrub(infile, block_size))
-		{
-			PanicAlertT("%s failed to be scrubbed. Probably the image is corrupt.", infile);
-			return false;
-		}
-
-		scrubbing = true;
-	}
-
-	File::IOFile inf(infile, "rb");
-	File::IOFile f(outfile, "wb");
-
-	if (!f || !inf)
-		return false;
-
-	callback("Files opened, ready to compress.", 0, arg);
-
-	CompressedBlobHeader header;
-	header.magic_cookie = kBlobCookie;
-	header.sub_type   = sub_type;
-	header.block_size = block_size;
-	header.data_size  = File::GetSize(infile);
-
-	// round upwards!
-	header.num_blocks = (u32)((header.data_size + (block_size - 1)) / block_size);
-
-	u64* offsets = new u64[header.num_blocks];
-	u32* hashes = new u32[header.num_blocks];
-	u8* out_buf = new u8[block_size];
-	u8* in_buf = new u8[block_size];
-
-	// seek past the header (we will write it at the end)
-	f.Seek(sizeof(CompressedBlobHeader), SEEK_CUR);
-	// seek past the offset and hash tables (we will write them at the end)
-	f.Seek((sizeof(u64) + sizeof(u32)) * header.num_blocks, SEEK_CUR);
-
-	// Now we are ready to write compressed data!
-	u64 position = 0;
-	int num_compressed = 0;
-	int num_stored = 0;
-	int progress_monitor = max<int>(1, header.num_blocks / 1000);
-
-	for (u32 i = 0; i < header.num_blocks; i++)
-	{
-		if (i % progress_monitor == 0)
-		{
-			const u64 inpos = inf.Tell();
-			int ratio = 0;
-			if (inpos != 0)
-				ratio = (int)(100 * position / inpos);
-			char temp[512];
-			sprintf(temp, "%i of %i blocks. Compression ratio %i%%", i, header.num_blocks, ratio);
-			callback(temp, (float)i / (float)header.num_blocks, arg);
-		}
-
-		offsets[i] = position;
-		// u64 start = i * header.block_size;
-		// u64 size = header.block_size;
-		std::fill(in_buf, in_buf + header.block_size, 0);
-		if (scrubbing)
-			DiscScrubber::GetNextBlock(inf, in_buf);
-		else
-			inf.ReadBytes(in_buf, header.block_size);
-		z_stream z;
-		memset(&z, 0, sizeof(z));
-		z.zalloc = Z_NULL;
-		z.zfree  = Z_NULL;
-		z.opaque = Z_NULL;
-		z.next_in   = in_buf;
-		z.avail_in  = header.block_size;
-		z.next_out  = out_buf;
-		z.avail_out = block_size;
-		int retval = deflateInit(&z, 9);
-
-		if (retval != Z_OK)
-		{
-			ERROR_LOG(DISCIO, "Deflate failed");
-			goto cleanup;
-		}
-
-		int status = deflate(&z, Z_FINISH);
-		int comp_size = block_size - z.avail_out;
-		if ((status != Z_STREAM_END) || (z.avail_out < 10))
-		{
-			//PanicAlert("%i %i Store %i", i*block_size, position, comp_size);
-			// let's store uncompressed
-			offsets[i] |= 0x8000000000000000ULL;
-			f.WriteBytes(in_buf, block_size);
-			hashes[i] = HashAdler32(in_buf, block_size);
-			position += block_size;
-			num_stored++;
-		}
-		else
-		{
-			// let's store compressed
-			//PanicAlert("Comp %i to %i", block_size, comp_size);
-			f.WriteBytes(out_buf, comp_size);
-			hashes[i] = HashAdler32(out_buf, comp_size);
-			position += comp_size;
-			num_compressed++;
-		}
-
-		deflateEnd(&z);
-	}
-
-	header.compressed_data_size = position;
-
-	// Okay, go back and fill in headers
-	f.Seek(0, SEEK_SET);
-	f.WriteArray(&header, 1);
-	f.WriteArray(offsets, header.num_blocks);
-	f.WriteArray(hashes, header.num_blocks);
-
-cleanup:
-	// Cleanup
-	delete[] in_buf;
-	delete[] out_buf;
-	delete[] offsets;
-	delete[] hashes;
-
-	DiscScrubber::Cleanup();
-	callback("Done compressing disc image.", 1.0f, arg);
-	return true;
-}
-
-bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB callback, void* arg)
-{
-	if (!IsCompressedBlob(infile))
-	{
-		PanicAlertT("File not compressed");
-		return false;
-	}
-
-	CompressedBlobReader* reader = CompressedBlobReader::Create(infile);
-	if (!reader)
-		return false;
-
-	File::IOFile f(outfile, "wb");
-	if (!f)
-	{
-		delete reader;
-		return false;
-	}
-
-	const CompressedBlobHeader &header = reader->GetHeader();
-	u8* buffer = new u8[header.block_size];
-	int progress_monitor = max<int>(1, header.num_blocks / 100);
-
-	for (u64 i = 0; i < header.num_blocks; i++)
-	{
-		if (i % progress_monitor == 0)
-		{
-			callback("Unpacking", (float)i / (float)header.num_blocks, arg);
-		}
-		reader->Read(i * header.block_size, header.block_size, buffer);
-		f.WriteBytes(buffer, header.block_size);
-	}
-
-	delete[] buffer;
-
-	f.Resize(header.data_size);
-
-	delete reader;
-
-	return true;
-}
-
-bool IsCompressedBlob(const char* filename)
-{
-	File::IOFile f(filename, "rb");
-
-	CompressedBlobHeader header;
-	return f.ReadArray(&header, 1) && (header.magic_cookie == kBlobCookie);
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.h b/Source/Core/DiscIO/Src/CompressedBlob.h
deleted file mode 100644
index 843054442f..0000000000
--- a/Source/Core/DiscIO/Src/CompressedBlob.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// WARNING Code not big-endian safe.
-
-// To create new compressed BLOBs, use CompressFileToBlob.
-
-// File format
-// * Header
-// * [Block Pointers interleaved with block hashes (hash of decompressed data)]
-// * [Data]
-
-#ifndef COMPRESSED_BLOB_H_
-#define COMPRESSED_BLOB_H_
-
-#include <string>
-
-#include "Blob.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-
-bool IsCompressedBlob(const char* filename);
-
-const u32 kBlobCookie = 0xB10BC001;
-
-// A blob file structure:
-// BlobHeader
-// u64 offsetsToBlocks[n], top bit specifies whether the block is compressed, or not.
-// compressed data
-
-// Blocks that won't compress to less than 97% of the original size are stored as-is.
-struct CompressedBlobHeader // 32 bytes
-{
-	u32 magic_cookie; //0xB10BB10B
-	u32 sub_type; // gc image, whatever
-	u64 compressed_data_size;
-	u64 data_size;
-	u32 block_size;
-	u32 num_blocks;
-};
-
-class CompressedBlobReader : public SectorReader
-{
-public:
-	static CompressedBlobReader* Create(const char *filename);
-	~CompressedBlobReader();
-	const CompressedBlobHeader &GetHeader() const { return header; }
-	u64 GetDataSize() const { return header.data_size; }
-	u64 GetRawSize() const { return file_size; }
-	u64 GetBlockCompressedSize(u64 block_num) const;
-	void GetBlock(u64 block_num, u8 *out_ptr);
-private:
-	CompressedBlobReader(const char *filename);
-
-	CompressedBlobHeader header;
-	u64 *block_pointers;
-	u32 *hashes;
-	int data_offset;
-	File::IOFile m_file;
-	u64 file_size;
-	u8 *zlib_buffer;
-	int zlib_buffer_size;
-	std::string file_name;
-};
-
-}  // namespace
-
-#endif  // COMPRESSED_BLOB_H_
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp
deleted file mode 100644
index fc4c01be31..0000000000
--- a/Source/Core/DiscIO/Src/DiscScrubber.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Filesystem.h"
-#include "VolumeCreator.h"
-#include "FileUtil.h"
-#include "DiscScrubber.h"
-
-namespace DiscIO
-{
-
-namespace DiscScrubber
-{
-
-#define	CLUSTER_SIZE 0x8000
-
-u8* m_FreeTable = NULL;
-u64 m_FileSize;
-u64 m_BlockCount;
-u32 m_BlockSize;
-int m_BlocksPerCluster;
-bool m_isScrubbing = false;
-
-std::string m_Filename;
-IVolume* m_Disc = NULL;
-
-struct SPartitionHeader
-{
-	u8* Ticket[0x2a4];
-	u32 TMDSize;
-	u64 TMDOffset;
-	u32 CertChainSize;
-	u64 CertChainOffset;
-	// H3Size is always 0x18000 
-	u64 H3Offset;
-	u64 DataOffset;
-	u64 DataSize;
-	// TMD would be here
-	u64 DOLOffset;
-	u64 DOLSize;
-	u64 FSTOffset;
-	u64 FSTSize;
-	u32 ApploaderSize;
-	u32 ApploaderTrailerSize;
-};
-struct SPartition
-{
-	u32 GroupNumber;
-	u32 Number;
-	u64 Offset;
-	u32 Type;
-	SPartitionHeader Header;
-};
-struct SPartitionGroup
-{
-	u32 numPartitions;
-	u64 PartitionsOffset;
-	std::vector<SPartition> PartitionsVec;
-};
-SPartitionGroup PartitionGroup[4];
-
-
-void MarkAsUsed(u64 _Offset, u64 _Size);
-void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size);
-void ReadFromDisc(u64 _Offset, u64 _Length, u32& _Buffer);
-void ReadFromDisc(u64 _Offset, u64 _Length, u64& _Buffer);
-void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer);
-void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer);
-bool ParseDisc();
-bool ParsePartitionData(SPartition& _rPartition);
-u32 GetDOLSize(u64 _DOLOffset);
-
-
-bool SetupScrub(const char* filename, int block_size)
-{
-	bool success = true;
-	m_Filename = std::string(filename);
-	m_BlockSize = block_size;
-
-	if (CLUSTER_SIZE % m_BlockSize != 0)
-	{
-		ERROR_LOG(DISCIO, "Block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize);
-		return false;
-	}
-
-	m_BlocksPerCluster = CLUSTER_SIZE / m_BlockSize;
-
-	m_Disc = CreateVolumeFromFilename(filename);
-	m_FileSize = m_Disc->GetSize();
-
-	u32 numClusters = (u32)(m_FileSize / CLUSTER_SIZE);
-
-	// Warn if not DVD5 or DVD9 size
-	if (numClusters != 0x23048 && numClusters != 0x46090)
-		WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename, numClusters);
-
-	// Table of free blocks
-	m_FreeTable = new u8[numClusters];
-	std::fill(m_FreeTable, m_FreeTable + numClusters, 1);
-
-	// Fill out table of free blocks
-	success = ParseDisc();
-	// Done with it; need it closed for the next part
-	delete m_Disc;
-	m_Disc = NULL;
-	m_BlockCount = 0;
-
-	// Let's not touch the file if we've failed up to here :p
-	if (!success)
-		Cleanup();
-
-	m_isScrubbing = success;
-	return success;
-}
-
-void GetNextBlock(File::IOFile& in, u8* buffer)
-{
-	u64 CurrentOffset = m_BlockCount * m_BlockSize;
-	u64 i = CurrentOffset / CLUSTER_SIZE;
-
-	if (m_isScrubbing && m_FreeTable[i])
-	{
-		DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset);
-		std::fill(buffer, buffer + m_BlockSize, 0xFF);
-		in.Seek(m_BlockSize, SEEK_CUR);
-	}
-	else
-	{
-		DEBUG_LOG(DISCIO, "Used    0x%016llx", CurrentOffset);
-		in.ReadBytes(buffer, m_BlockSize);
-	}
-
-	m_BlockCount++;
-}
-
-void Cleanup()
-{
-	if (m_FreeTable) delete[] m_FreeTable;
-	m_FreeTable = NULL;
-	m_FileSize = 0;
-	m_BlockCount = 0;
-	m_BlockSize = 0;
-	m_BlocksPerCluster = 0;
-	m_isScrubbing = false;
-}
-
-void MarkAsUsed(u64 _Offset, u64 _Size)
-{
-	u64 CurrentOffset = _Offset;
-	u64 EndOffset = CurrentOffset + _Size;
-
-	DEBUG_LOG(DISCIO, "Marking 0x%016llx - 0x%016llx as used", _Offset, EndOffset);
-
-	while ((CurrentOffset < EndOffset) && (CurrentOffset < m_FileSize))
-	{
-		m_FreeTable[CurrentOffset / CLUSTER_SIZE] = 0;
-		CurrentOffset += CLUSTER_SIZE;
-	}
-}
-// Compensate for 0x400(SHA-1) per 0x8000(cluster)
-void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size)
-{
-	u64 Offset;
-	u64 Size;
-
-	Offset = _Offset / 0x7c00;
-	Offset = Offset * CLUSTER_SIZE;
-	Offset += _PartitionDataOffset;
-
-	Size = _Size / 0x7c00;
-	Size = (Size + 1) * CLUSTER_SIZE;
-
-	// Add on the offset in the first block for the case where data straddles blocks
-	Size += _Offset % 0x7c00;
-
-	MarkAsUsed(Offset, Size);
-}
-
-// Helper functions for RAW reading the BE discs
-void ReadFromDisc(u64 _Offset, u64 _Length, u32& _Buffer)
-{
-	m_Disc->RAWRead(_Offset, _Length, (u8*)&_Buffer);
-	_Buffer = Common::swap32(_Buffer);
-}
-void ReadFromDisc(u64 _Offset, u64 _Length, u64& _Buffer)
-{
-	m_Disc->RAWRead(_Offset, _Length, (u8*)&_Buffer);
-	_Buffer = Common::swap32((u32)_Buffer);
-	_Buffer <<= 2;
-}
-// Helper functions for reading the BE volume
-void ReadFromVolume(u64 _Offset, u64 _Length, u32& _Buffer)
-{
-	m_Disc->Read(_Offset, _Length, (u8*)&_Buffer);
-	_Buffer = Common::swap32(_Buffer);
-}
-void ReadFromVolume(u64 _Offset, u64 _Length, u64& _Buffer)
-{
-	m_Disc->Read(_Offset, _Length, (u8*)&_Buffer);
-	_Buffer = Common::swap32((u32)_Buffer);
-	_Buffer <<= 2;
-}
-
-bool ParseDisc()
-{
-	// Mark the header as used - it's mostly 0s anyways
-	MarkAsUsed(0, 0x50000);
-
-	for (int x = 0; x < 4; x++)
-	{
-		ReadFromDisc(0x40000 + (x * 8) + 0, 4, PartitionGroup[x].numPartitions);
-		ReadFromDisc(0x40000 + (x * 8) + 4, 4, PartitionGroup[x].PartitionsOffset);
-
-		// Read all partitions
-		for (u32 i = 0; i < PartitionGroup[x].numPartitions; i++)
-		{
-			SPartition Partition;
-
-			Partition.GroupNumber = x;
-			Partition.Number = i;
-
-			ReadFromDisc(PartitionGroup[x].PartitionsOffset + (i * 8) + 0, 4, Partition.Offset);
-			ReadFromDisc(PartitionGroup[x].PartitionsOffset + (i * 8) + 4, 4, Partition.Type);
-
-			ReadFromDisc(Partition.Offset + 0x2a4, 4, Partition.Header.TMDSize);
-			ReadFromDisc(Partition.Offset + 0x2a8, 4, Partition.Header.TMDOffset);
-			ReadFromDisc(Partition.Offset + 0x2ac, 4, Partition.Header.CertChainSize);
-			ReadFromDisc(Partition.Offset + 0x2b0, 4, Partition.Header.CertChainOffset);
-			ReadFromDisc(Partition.Offset + 0x2b4, 4, Partition.Header.H3Offset);
-			ReadFromDisc(Partition.Offset + 0x2b8, 4, Partition.Header.DataOffset);
-			ReadFromDisc(Partition.Offset + 0x2bc, 4, Partition.Header.DataSize);
-
-			PartitionGroup[x].PartitionsVec.push_back(Partition);
-		}
-
-		for (size_t i = 0; i < PartitionGroup[x].PartitionsVec.size(); i++)
-		{
-			SPartition& rPartition			= PartitionGroup[x].PartitionsVec.at(i);
-			const SPartitionHeader& rHeader	= PartitionGroup[x].PartitionsVec.at(i).Header;
-
-			MarkAsUsed(rPartition.Offset, 0x2c0);
-
-			MarkAsUsed(rPartition.Offset + rHeader.TMDOffset, rHeader.TMDSize);
-			MarkAsUsed(rPartition.Offset + rHeader.CertChainOffset, rHeader.CertChainSize);
-			MarkAsUsed(rPartition.Offset + rHeader.H3Offset, 0x18000);
-			// This would mark the whole (encrypted) data area
-			// we need to parse FST and other crap to find what's free within it!
-			//MarkAsUsed(rPartition.Offset + rHeader.DataOffset, rHeader.DataSize);
-
-			// Parse Data! This is where the big gain is
-			if (!ParsePartitionData(rPartition))
-				return false;
-		}
-	}
-
-	return true;
-}
-
-// Operations dealing with encrypted space are done here - the volume is swapped to allow this
-bool ParsePartitionData(SPartition& _rPartition)
-{
-	bool ParsedOK = true;
-
-	// Switch out the main volume temporarily
-	IVolume *OldVolume = m_Disc;
-
-	// Ready some stuff
-	m_Disc = CreateVolumeFromFilename(m_Filename.c_str(), _rPartition.GroupNumber, _rPartition.Number);
-	IFileSystem *FileSystem = CreateFileSystem(m_Disc);
-
-	if (!FileSystem)
-	{
-		ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number);
-		ParsedOK = false;
-	}
-	else
-	{
-		std::vector<const SFileInfo *> Files;
-		size_t numFiles = FileSystem->GetFileList(Files);
-
-		// Mark things as used which are not in the filesystem
-		// Header, Header Information, Apploader
-		ReadFromVolume(0x2440 + 0x14, 4, _rPartition.Header.ApploaderSize);
-		ReadFromVolume(0x2440 + 0x18, 4, _rPartition.Header.ApploaderTrailerSize);
-		MarkAsUsedE(_rPartition.Offset
-			+ _rPartition.Header.DataOffset
-			, 0
-			, 0x2440
-			+ _rPartition.Header.ApploaderSize
-			+ _rPartition.Header.ApploaderTrailerSize);
-
-		// DOL
-		ReadFromVolume(0x420, 4, _rPartition.Header.DOLOffset);
-		_rPartition.Header.DOLSize = GetDOLSize(_rPartition.Header.DOLOffset);
-		MarkAsUsedE(_rPartition.Offset
-			+ _rPartition.Header.DataOffset
-			, _rPartition.Header.DOLOffset
-			, _rPartition.Header.DOLSize);
-
-		// FST
-		ReadFromVolume(0x424, 4, _rPartition.Header.FSTOffset);
-		ReadFromVolume(0x428, 4, _rPartition.Header.FSTSize);
-		MarkAsUsedE(_rPartition.Offset
-			+ _rPartition.Header.DataOffset
-			, _rPartition.Header.FSTOffset
-			, _rPartition.Header.FSTSize);
-
-		// Go through the filesystem and mark entries as used
-		for (size_t currentFile = 0; currentFile < numFiles; currentFile++)
-		{
-			DEBUG_LOG(DISCIO, "%s", currentFile ? (*Files.at(currentFile)).m_FullPath : "/");
-			// Just 1byte for directory? - it will end up reserving a cluster this way
-			if ((*Files.at(currentFile)).m_NameOffset & 0x1000000)
-				MarkAsUsedE(_rPartition.Offset
-				+ _rPartition.Header.DataOffset
-				, (*Files.at(currentFile)).m_Offset, 1);
-			else
-				MarkAsUsedE(_rPartition.Offset
-				+ _rPartition.Header.DataOffset
-				, (*Files.at(currentFile)).m_Offset, (*Files.at(currentFile)).m_FileSize);
-		}
-	}
-
-	delete FileSystem;
-
-	// Swap back
-	delete m_Disc;
-	m_Disc = OldVolume;
-
-	return ParsedOK;
-}
-
-u32 GetDOLSize(u64 _DOLOffset)
-{
-	u32 offset = 0, size = 0, max = 0;
-
-	// Iterate through the 7 code segments
-	for (u8 i = 0; i < 7; i++)
-	{
-		ReadFromVolume(_DOLOffset + 0x00 + i * 4, 4, offset);
-		ReadFromVolume(_DOLOffset + 0x90 + i * 4, 4, size);
-		if (offset + size > max)
-			max = offset + size;
-	}
-
-	// Iterate through the 11 data segments
-	for (u8 i = 0; i < 11; i++)
-	{
-		ReadFromVolume(_DOLOffset + 0x1c + i * 4, 4, offset);
-		ReadFromVolume(_DOLOffset + 0xac + i * 4, 4, size);
-		if (offset + size > max)
-			max = offset + size;
-	}
-
-	return max;
-}
-
-} // namespace DiscScrubber
-
-} // namespace DiscIO
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h
deleted file mode 100644
index 01ea1d8393..0000000000
--- a/Source/Core/DiscIO/Src/DiscScrubber.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// DiscScrubber removes the garbage data from discs (currently wii only) which
-// is on the disc due to encryption
-
-// It could be adapted to gc discs, but the gain is most likely negligible,
-// and having 1:1 backups of discs is always nice when they are reasonably sized
-
-// Note: the technique is inspired by Wiiscrubber, but much simpler - intentionally :)
-
-#ifndef DISC_SCRUBBER_H
-#define DISC_SCRUBBER_H
-
-#include "Common.h"
-#include "Blob.h"
-
-
-namespace DiscIO
-{
-
-namespace DiscScrubber
-{
-
-bool SetupScrub(const char* filename, int block_size);
-void GetNextBlock(File::IOFile& in, u8* buffer);
-void Cleanup();
-
-} // namespace DiscScrubber
-
-} // namespace DiscIO
-
-#endif  // DISC_SCRUBBER_H
diff --git a/Source/Core/DiscIO/Src/DriveBlob.cpp b/Source/Core/DiscIO/Src/DriveBlob.cpp
deleted file mode 100644
index dc2c58f066..0000000000
--- a/Source/Core/DiscIO/Src/DriveBlob.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DriveBlob.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-
-DriveReader::DriveReader(const char *drive)
-{
-#ifdef _WIN32
-	SectorReader::SetSectorSize(2048);
-	auto const path = UTF8ToTStr(std::string("\\\\.\\") + drive);
-	hDisc = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-						NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
-	if (hDisc != INVALID_HANDLE_VALUE)
-	{
-		// Do a test read to make sure everything is OK, since it seems you can get
-		// handles to empty drives.
-		DWORD not_used;
-		u8 *buffer = new u8[m_blocksize];
-		if (!ReadFile(hDisc, buffer, m_blocksize, (LPDWORD)&not_used, NULL))
-		{
-			delete [] buffer;
-			// OK, something is wrong.
-			CloseHandle(hDisc);
-			hDisc = INVALID_HANDLE_VALUE;
-			return;
-		}
-		delete [] buffer;
-		
-	#ifdef _LOCKDRIVE // Do we want to lock the drive?
-		// Lock the compact disc in the CD-ROM drive to prevent accidental
-		// removal while reading from it.
-		pmrLockCDROM.PreventMediaRemoval = TRUE;
-		DeviceIoControl(hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
-                   &pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
-                   0, &dwNotUsed, NULL);
-	#endif
-#else
-	SectorReader::SetSectorSize(2048);
-	file_.Open(drive, "rb");
-	if (file_)
-	{
-#endif
-	}
-	else
-		NOTICE_LOG(DISCIO, "Load from DVD backup failed or no disc in drive %s", drive);
-}  // DriveReader::DriveReader
-
-DriveReader::~DriveReader()
-{
-#ifdef _WIN32
-#ifdef _LOCKDRIVE // Do we want to lock the drive?
-	// Unlock the disc in the CD-ROM drive.
-	pmrLockCDROM.PreventMediaRemoval = FALSE;
-	DeviceIoControl (hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
-		&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
-		0, &dwNotUsed, NULL);
-#endif
-	if (hDisc != INVALID_HANDLE_VALUE)
-	{
-		CloseHandle(hDisc);
-		hDisc = INVALID_HANDLE_VALUE;
-	}
-#else
-	file_.Close();
-#endif	
-}
-
-DriveReader *DriveReader::Create(const char *drive)
-{
-	DriveReader *reader = new DriveReader(drive);
-	if (!reader->IsOK())
-	{
-		delete reader;
-		return 0;
-	}
-	return reader;
-}
-
-void DriveReader::GetBlock(u64 block_num, u8 *out_ptr)
-{
-	u8* const lpSector = new u8[m_blocksize];
-#ifdef _WIN32
-	u32 NotUsed;
-	u64 offset = m_blocksize * block_num;
-	LONG off_low = (LONG)offset & 0xFFFFFFFF;
-	LONG off_high = (LONG)(offset >> 32);
-	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
-	if (!ReadFile(hDisc, lpSector, m_blocksize, (LPDWORD)&NotUsed, NULL))
-		PanicAlertT("Disc Read Error");
-#else
-	file_.Seek(m_blocksize * block_num, SEEK_SET);
-	file_.ReadBytes(lpSector, m_blocksize);
-#endif
-	memcpy(out_ptr, lpSector, m_blocksize);
-	delete[] lpSector;
-}
-
-bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr)
-{
-#ifdef _WIN32
-	u32 NotUsed;
-	u64 offset = m_blocksize * block_num;
-	LONG off_low = (LONG)offset & 0xFFFFFFFF;
-	LONG off_high = (LONG)(offset >> 32);
-	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
-	if (!ReadFile(hDisc, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, NULL))
-	{
-		PanicAlertT("Disc Read Error");
-		return false;
-	}
-#else
-	fseeko(file_.GetHandle(), m_blocksize*block_num, SEEK_SET);
-	if(fread(out_ptr, 1, m_blocksize * num_blocks, file_.GetHandle()) != m_blocksize * num_blocks)
-		return false;
-#endif
-	return true;
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/DriveBlob.h b/Source/Core/DiscIO/Src/DriveBlob.h
deleted file mode 100644
index d5c13a3b15..0000000000
--- a/Source/Core/DiscIO/Src/DriveBlob.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DRIVE_BLOB_H
-#define _DRIVE_BLOB_H
-
-#include "Blob.h"
-#include "FileUtil.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include <winioctl.h>
-#endif
-
-namespace DiscIO
-{
-
-class DriveReader : public SectorReader
-{
-private:
-	DriveReader(const char *drive);
-	void GetBlock(u64 block_num, u8 *out_ptr);
-
-#ifdef _WIN32
-	HANDLE hDisc;
-	PREVENT_MEDIA_REMOVAL pmrLockCDROM;
-	bool IsOK() {return hDisc != INVALID_HANDLE_VALUE;}
-#else
-	File::IOFile file_;
-	bool IsOK() {return file_ != 0;}
-#endif
-	s64 size;
-
-public:
-	static DriveReader *Create(const char *drive);
-	~DriveReader();
-	u64 GetDataSize() const { return size; }
-	u64 GetRawSize() const { return size; }
-
-	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr);
-};
-
-}  // namespace
-
-#endif  // _DRIVE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/FileBlob.cpp b/Source/Core/DiscIO/Src/FileBlob.cpp
deleted file mode 100644
index 42ea73c78d..0000000000
--- a/Source/Core/DiscIO/Src/FileBlob.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FileBlob.h"
-
-namespace DiscIO
-{
-
-PlainFileReader::PlainFileReader(std::FILE* file)
-	: m_file(file)
-{
-	m_size = m_file.GetSize();
-}
-
-PlainFileReader* PlainFileReader::Create(const char* filename)
-{
-	File::IOFile f(filename, "rb");
-	if (f)
-		return new PlainFileReader(f.ReleaseHandle());
-	else
-		return NULL;
-}
-
-bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
-{
-	m_file.Seek(offset, SEEK_SET);
-	return m_file.ReadBytes(out_ptr, nbytes);
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/FileBlob.h b/Source/Core/DiscIO/Src/FileBlob.h
deleted file mode 100644
index 464c5daa64..0000000000
--- a/Source/Core/DiscIO/Src/FileBlob.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FILE_BLOB_H
-#define _FILE_BLOB_H
-
-#include "Blob.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-
-class PlainFileReader : public IBlobReader
-{
-	PlainFileReader(std::FILE* file);
-
-	File::IOFile m_file;
-	s64 m_size;
-
-public:
-	static PlainFileReader* Create(const char* filename);
-
-	u64 GetDataSize() const { return m_size; }
-	u64 GetRawSize() const { return m_size; }
-	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
-};
-
-}  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
deleted file mode 100644
index d295986f9e..0000000000
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "FileHandlerARC.h"
-#include "StringUtil.h"
-#include "Blob.h"
-#include "FileUtil.h"
-
-#define ARC_ID 0x55aa382d
-
-namespace DiscIO
-{
-CARCFile::CARCFile(const std::string& _rFilename)
-	: m_pBuffer(NULL)
-	, m_Initialized(false)
-{
-	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
-	if (pReader != NULL)
-	{
-		u64 FileSize = pReader->GetDataSize();
-		m_pBuffer = new u8[(u32)FileSize];
-		pReader->Read(0, FileSize, m_pBuffer);
-		delete pReader;
-
-		m_Initialized = ParseBuffer();
-	}
-}
-
-CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
-	: m_pBuffer(NULL)
-	, m_Initialized(false)
-{
-	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
-	if (pReader != NULL)
-	{
-		u64 FileSize = pReader->GetDataSize() - offset;
-		m_pBuffer = new u8[(u32)FileSize];
-		pReader->Read(offset, FileSize, m_pBuffer);
-		delete pReader;
-
-		m_Initialized = ParseBuffer();
-	}
-}
-
-CARCFile::CARCFile(const u8* _pBuffer, size_t _BufferSize)
-	: m_pBuffer(NULL)
-	, m_Initialized(false)
-{
-	m_pBuffer = new u8[_BufferSize];
-
-	if (m_pBuffer)
-	{
-		memcpy(m_pBuffer, _pBuffer, _BufferSize);
-		m_Initialized = ParseBuffer();
-	}
-}
-
-
-CARCFile::~CARCFile()
-{
-	delete [] m_pBuffer;
-}
-
-
-bool
-CARCFile::IsInitialized()
-{
-	return(m_Initialized);
-}
-
-
-size_t
-CARCFile::GetFileSize(const std::string& _rFullPath)
-{
-	if (!m_Initialized)
-	{
-		return(0);
-	}
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-
-	if (pFileInfo != NULL)
-	{
-		return((size_t) pFileInfo->m_FileSize);
-	}
-
-	return(0);
-}
-
-
-size_t
-CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)
-{
-	if (!m_Initialized)
-	{
-		return(0);
-	}
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-
-	if (pFileInfo == NULL)
-	{
-		return(0);
-	}
-
-	if (pFileInfo->m_FileSize > _MaxBufferSize)
-	{
-		return(0);
-	}
-
-	memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], (size_t)pFileInfo->m_FileSize);
-	return((size_t) pFileInfo->m_FileSize);
-}
-
-
-bool
-CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename)
-{
-	if (!m_Initialized)
-	{
-		return(false);
-	}
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-
-	if (pFileInfo == NULL)
-	{
-		return(false);
-	}
-
-	File::IOFile pFile(_rExportFilename, "wb");
-
-	return pFile.WriteBytes(&m_pBuffer[pFileInfo->m_Offset], (size_t) pFileInfo->m_FileSize);
-}
-
-
-bool
-CARCFile::ExportAllFiles(const std::string& _rFullPath)
-{
-	return(false);
-}
-
-
-bool
-CARCFile::ParseBuffer()
-{
-	// check ID
-	u32 ID = Common::swap32(*(u32*)(m_pBuffer));
-
-	if (ID != ARC_ID)
-		return false;
-
-	// read header
-	u32 FSTOffset  = Common::swap32(*(u32*)(m_pBuffer + 0x4));
-	//u32 FSTSize    = Common::swap32(*(u32*)(m_pBuffer + 0x8));
-	//u32 FileOffset = Common::swap32(*(u32*)(m_pBuffer + 0xC));
-
-	// read all file infos
-	SFileInfo Root;
-	Root.m_NameOffset = Common::swap32(*(u32*)(m_pBuffer + FSTOffset + 0x0));
-	Root.m_Offset     = Common::swap32(*(u32*)(m_pBuffer + FSTOffset + 0x4));
-	Root.m_FileSize   = Common::swap32(*(u32*)(m_pBuffer + FSTOffset + 0x8));
-
-	if (Root.IsDirectory())
-	{
-		m_FileInfoVector.resize((unsigned int)Root.m_FileSize);
-		const char* szNameTable = (char*)(m_pBuffer + FSTOffset);
-
-		for (size_t i = 0; i < m_FileInfoVector.size(); i++)
-		{
-			u8* Offset = m_pBuffer + FSTOffset + (i * 0xC);
-			m_FileInfoVector[i].m_NameOffset = Common::swap32(*(u32*)(Offset + 0x0));
-			m_FileInfoVector[i].m_Offset   = Common::swap32(*(u32*)(Offset + 0x4));
-			m_FileInfoVector[i].m_FileSize = Common::swap32(*(u32*)(Offset + 0x8));
-
-			szNameTable += 0xC;
-		}
-
-		BuildFilenames(1, m_FileInfoVector.size(), NULL, szNameTable);
-	}
-
-	return(true);
-}
-
-
-size_t
-CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, const char* _szNameTable)
-{
-	size_t CurrentIndex = _FirstIndex;
-
-	while (CurrentIndex < _LastIndex)
-	{
-		SFileInfo& rFileInfo = m_FileInfoVector[CurrentIndex];
-		int uOffset = rFileInfo.m_NameOffset & 0xFFFFFF;
-
-		// check next index
-		if (rFileInfo.IsDirectory())
-		{
-			// this is a directory, build up the new szDirectory
-			if (_szDirectory != NULL)
-			{
-				sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]);
-			}
-			else
-			{
-				sprintf(rFileInfo.m_FullPath, "%s/", &_szNameTable[uOffset]);
-			}
-
-			CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable);
-		}
-		else
-		{
-			// this is a filename
-			if (_szDirectory != NULL)
-			{
-				sprintf(rFileInfo.m_FullPath, "%s%s", _szDirectory, &_szNameTable[uOffset]);
-			}
-			else
-			{
-				sprintf(rFileInfo.m_FullPath, "%s", &_szNameTable[uOffset]);
-			}
-
-			CurrentIndex++;
-		}
-	}
-
-	return(CurrentIndex);
-}
-
-
-const SFileInfo*
-CARCFile::FindFileInfo(std::string _rFullPath) const
-{
-	for (size_t i = 0; i < m_FileInfoVector.size(); i++)
-	{
-		if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath.c_str()))
-		{
-			return(&m_FileInfoVector[i]);
-		}
-	}
-
-	return(NULL);
-}
-} // namespace
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.h b/Source/Core/DiscIO/Src/FileHandlerARC.h
deleted file mode 100644
index 9b5797e902..0000000000
--- a/Source/Core/DiscIO/Src/FileHandlerARC.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ARC_FILE_H
-#define _ARC_FILE_H
-
-#include <string>
-#include <vector>
-
-#include "Common.h"
-#include "Filesystem.h"
-
-namespace DiscIO
-{
-class CARCFile
-{
-	public:
-
-		CARCFile(const std::string& _rFilename);
-
-		CARCFile(const std::string& _rFilename, u32 offset);
-
-		CARCFile(const u8* _pBuffer, size_t _BufferSize);
-
-		virtual ~CARCFile();
-
-		bool IsInitialized();
-
-		size_t GetFileSize(const std::string& _rFullPath);
-
-		size_t ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize);
-
-		bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename);
-
-		bool ExportAllFiles(const std::string& _rFullPath);
-
-
-	private:
-
-		u8* m_pBuffer;
-
-		bool m_Initialized;
-
-		typedef std::vector<SFileInfo>CFileInfoVector;
-		CFileInfoVector m_FileInfoVector;
-
-		bool ParseBuffer();
-
-		size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, const char* _szNameTable);
-
-		const SFileInfo* FindFileInfo(std::string _rFullPath) const;
-};
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp
deleted file mode 100644
index 26a24046b5..0000000000
--- a/Source/Core/DiscIO/Src/FileMonitor.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <iostream>
-#include <vector>
-#include <string>
-#include <algorithm>
-
-
-#include "Common.h"
-#include "IniFile.h"
-#include "LogManager.h"
-
-#include "../../Core/Src/Core.h"
-#include "../../Core/Src/ConfigManager.h"
-#include "FileSystemGCWii.h"
-#include "VolumeCreator.h"
-
-namespace FileMon
-{
-
-DiscIO::IVolume *OpenISO = NULL;
-DiscIO::IFileSystem *pFileSystem = NULL;
-std::vector<const DiscIO::SFileInfo *> GCFiles;
-std::string ISOFile = "", CurrentFile = "";
-bool FileAccess = true;
-
-// Filtered files
-bool ShowSound(std::string FileName)
-{
-	std::string Ending;
-	SplitPath(FileName, NULL, NULL, &Ending);
-	std::transform(Ending.begin(),Ending.end(),Ending.begin(),::tolower);
-
-	if (
-		   (Ending == ".adp") // 1080 Avalanche, Crash Bandicoot, etc
-		|| (Ending == ".afc") // Zelda WW
-		|| (Ending == ".ast") // Zelda TP, Mario Kart
-		|| (Ending == ".dsp") // Metroid Prime
-		|| (Ending == ".hps") // SSB Melee
-
-		|| (Ending == ".brstm") // Wii Sports, Wario Land, etc
-		|| (Ending == ".sad") // Disaster
-		)
-		return true;
-
-	return false;
-}
-
-
-// Read the GC file system
-void ReadGC(std::string FileName)
-{
-	// Should have an actual Shutdown procedure or something
-	if(OpenISO != NULL)
-	{
-		delete OpenISO;
-		OpenISO = NULL;
-	}
-	if(pFileSystem != NULL)
-	{
-		delete pFileSystem;
-		pFileSystem = NULL;
-	}
-
-	// GCFiles' pointers are no longer valid after pFileSystem is cleared
-	GCFiles.clear();
-	OpenISO = DiscIO::CreateVolumeFromFilename(FileName);
-	if (!OpenISO) return;
-	if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
-	{
-		pFileSystem = DiscIO::CreateFileSystem(OpenISO);
-		if(!pFileSystem) return;
-		pFileSystem->GetFileList(GCFiles);
-	}
-	FileAccess = true;
-}
-
-// Check if we should play this file
-void CheckFile(std::string File, u64 Size)
-{
-	// Don't do anything if the log is unselected
-	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON))
-		return;
-	// Do nothing if we found the same file again
-	if (CurrentFile == File)
-		return;
-
-	if (Size > 0)
-		Size = (Size / 1000);
-
-	std::string Str = StringFromFormat("%s kB %s", ThousandSeparate(Size, 7).c_str(), File.c_str());
-	if (ShowSound(File))
-	{
-		INFO_LOG(FILEMON, "%s", Str.c_str());
-	}
-	else
-	{
-		WARN_LOG(FILEMON, "%s", Str.c_str());
-	}
-
-	// Update the current file
-	CurrentFile = File;
-}
-
-
-// Find the GC filename
-void FindFilename(u64 offset)
-{
-	// Don't do anything if a game is not running
-	if (Core::GetState() != Core::CORE_RUN)
-		return;
-
-	// Or if the log is unselected
-	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON))
-		return;
-
-	// Or if we don't have file access
-	if (!FileAccess)
-		return;
-
-	if (!pFileSystem || ISOFile != SConfig::GetInstance().m_LastFilename)
-	{
-		FileAccess = false;
-		ReadGC(SConfig::GetInstance().m_LastFilename);
-		ISOFile = SConfig::GetInstance().m_LastFilename;
-		INFO_LOG(FILEMON, "Opening '%s'", ISOFile.c_str());
-		return;
-	}
-
-	const char *fname = pFileSystem->GetFileName(offset);
-
-	// There's something wrong with the paths
-	if (!fname || (strlen(fname) == 512))
-		return;
-	
-	CheckFile(fname, pFileSystem->GetFileSize(fname));
-}
-
-void Close()
-{
-	if(OpenISO != NULL)
-	{
-		delete OpenISO;
-		OpenISO = NULL;
-	}
-
-	if(pFileSystem != NULL)
-	{
-		delete pFileSystem;
-		pFileSystem = NULL;
-	}
-
-	// GCFiles' pointers are no longer valid after pFileSystem is cleared
-	GCFiles.clear();
-
-	ISOFile = "";
-	CurrentFile = "";
-	FileAccess = true;
-}
-
-
-} // FileMon
diff --git a/Source/Core/DiscIO/Src/FileMonitor.h b/Source/Core/DiscIO/Src/FileMonitor.h
deleted file mode 100644
index 3b40332eea..0000000000
--- a/Source/Core/DiscIO/Src/FileMonitor.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <iostream> // System: For std
-
-#include "Common.h" // Common: For u64
-
-
-namespace FileMon
-{
-
-void ShowSound(std::string File);
-void ReadGC(std::string File);
-void CheckFile(std::string File, u64 Size);
-void FindFilename(u64 Offset);
-void Close();
-
-}
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
deleted file mode 100644
index 69d250e523..0000000000
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include "FileSystemGCWii.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-CFileSystemGCWii::CFileSystemGCWii(const IVolume *_rVolume)
-	: IFileSystem(_rVolume)
-	, m_Initialized(false)
-	, m_Valid(false)
-	, m_OffsetShift(0)
-{
-	m_Valid = DetectFileSystem();
-}
-
-CFileSystemGCWii::~CFileSystemGCWii()
-{
-	m_FileInfoVector.clear();
-}
-
-u64 CFileSystemGCWii::GetFileSize(const char* _rFullPath)
-{
-	if (!m_Initialized)
-		InitFileSystem();
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-
-	if (pFileInfo != NULL && !pFileInfo->IsDirectory())
-		return pFileInfo->m_FileSize;
-
-	return 0;
-}
-
-const char* CFileSystemGCWii::GetFileName(u64 _Address)
-{
-	if (!m_Initialized)
-		InitFileSystem();
-
-	for (size_t i = 0; i < m_FileInfoVector.size(); i++)
-	{
-		if ((m_FileInfoVector[i].m_Offset <= _Address) &&
-		    ((m_FileInfoVector[i].m_Offset + m_FileInfoVector[i].m_FileSize) > _Address))
-		{
-			return m_FileInfoVector[i].m_FullPath;
-		}
-	}
-
-	return 0;
-}
-
-u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)
-{
-	if (!m_Initialized)
-		InitFileSystem();
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-	if (pFileInfo == NULL)
-		return 0;
-
-	if (pFileInfo->m_FileSize > _MaxBufferSize)
-		return 0;
-
-	DEBUG_LOG(DISCIO, "Filename: %s. Offset: %llx. Size: %llx",_rFullPath,
-		pFileInfo->m_Offset, pFileInfo->m_FileSize);
-
-	m_rVolume->Read(pFileInfo->m_Offset, pFileInfo->m_FileSize, _pBuffer);
-	return pFileInfo->m_FileSize;
-}
-
-bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFilename)
-{
-	if (!m_Initialized)
-		InitFileSystem();
-
-	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-
-	if (!pFileInfo)
-		return false;
-
-	u64 remainingSize = pFileInfo->m_FileSize;
-	u64 fileOffset = pFileInfo->m_Offset;
-
-	File::IOFile f(_rExportFilename, "wb");
-	if (!f)
-		return false;
-
-	bool result = true;
-
-	while (remainingSize)
-	{
-		// Limit read size to 128 MB
-		size_t readSize = (size_t)min(remainingSize, (u64)0x08000000);
-
-		std::vector<u8> buffer(readSize);
-
-		result = m_rVolume->Read(fileOffset, readSize, &buffer[0]);
-
-		if (!result)
-			break;
-
-		f.WriteBytes(&buffer[0], readSize);
-
-		remainingSize -= readSize;
-		fileOffset += readSize;
-	}
-
-	return result;
-}
-
-bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const
-{
-	u32 AppSize = Read32(0x2440 + 0x14);// apploader size
-	AppSize += Read32(0x2440 + 0x18);	// + trailer size
-	AppSize += 0x20;					// + header size
-	DEBUG_LOG(DISCIO,"AppSize -> %x", AppSize);
-
-	std::vector<u8> buffer(AppSize);
-	if (m_rVolume->Read(0x2440, AppSize, &buffer[0]))
-	{
-		std::string exportName(_rExportFolder);
-		exportName += "/apploader.img";
-
-		File::IOFile AppFile(exportName, "wb");
-		if (AppFile)
-		{
-			AppFile.WriteBytes(&buffer[0], AppSize);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-u32 CFileSystemGCWii::GetBootDOLSize() const
-{
-	u32 DolOffset = Read32(0x420) << m_OffsetShift;
-	u32 DolSize = 0, offset = 0, size = 0;
-
-	// Iterate through the 7 code segments
-	for (u8 i = 0; i < 7; i++)
-	{
-		offset	= Read32(DolOffset + 0x00 + i * 4);
-		size	= Read32(DolOffset + 0x90 + i * 4);
-		if (offset + size > DolSize)
-			DolSize = offset + size;
-	}
-
-	// Iterate through the 11 data segments
-	for (u8 i = 0; i < 11; i++)
-	{
-		offset	= Read32(DolOffset + 0x1c + i * 4);
-		size	= Read32(DolOffset + 0xac + i * 4);
-		if (offset + size > DolSize)
-			DolSize = offset + size;
-	}
-	return DolSize;
-}
-
-bool CFileSystemGCWii::GetBootDOL(u8* &buffer, u32 DolSize) const
-{
-	u32 DolOffset = Read32(0x420) << m_OffsetShift;
-	return m_rVolume->Read(DolOffset, DolSize, buffer);
-}
-
-bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const
-{
-	u32 DolOffset = Read32(0x420) << m_OffsetShift;
-	u32 DolSize = GetBootDOLSize();
-
-	std::vector<u8> buffer(DolSize);
-	if (m_rVolume->Read(DolOffset, DolSize, &buffer[0]))
-	{
-		std::string exportName(_rExportFolder);
-		exportName += "/boot.dol";
-
-		File::IOFile DolFile(exportName, "wb");
-		if (DolFile)
-		{
-			DolFile.WriteBytes(&buffer[0], DolSize);
-			return true;
-		}
-	}
-	
-	return false;
-}
-
-u32 CFileSystemGCWii::Read32(u64 _Offset) const
-{
-	u32 Temp = 0;
-	m_rVolume->Read(_Offset, 4, (u8*)&Temp);
-	return Common::swap32(Temp);
-}
-
-std::string CFileSystemGCWii::GetStringFromOffset(u64 _Offset) const
-{
-	std::string data;
-	data.resize(255);
-	m_rVolume->Read(_Offset, data.size(), (u8*)&data[0]);
-	data.erase(std::find(data.begin(), data.end(), 0x00), data.end());
-	
-	// TODO: Should we really always use SHIFT-JIS?
-	// It makes some filenames in Pikmin (NTSC-U) sane, but is it correct?
-	return SHIFTJISToUTF8(data);
-}
-
-size_t CFileSystemGCWii::GetFileList(std::vector<const SFileInfo *> &_rFilenames)
-{	
-	if (!m_Initialized)
-		InitFileSystem();
-
-	if (_rFilenames.size())
-		PanicAlert("GetFileList : input list has contents?");
-	_rFilenames.clear();
-	_rFilenames.reserve(m_FileInfoVector.size());
-	for (size_t i = 0; i < m_FileInfoVector.size(); i++)
-		_rFilenames.push_back(&m_FileInfoVector[i]);
-	return m_FileInfoVector.size();
-}
-
-const SFileInfo* CFileSystemGCWii::FindFileInfo(const char* _rFullPath)
-{
-	if (!m_Initialized)
-		InitFileSystem();
-
-	for (size_t i = 0; i < m_FileInfoVector.size(); i++)
-	{
-		if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath))
-			return &m_FileInfoVector[i];
-	}
-
-	return NULL;
-}
-
-bool CFileSystemGCWii::DetectFileSystem()
-{
-	if (Read32(0x18) == 0x5D1C9EA3)
-	{
-		m_OffsetShift = 2; // Wii file system
-		return true;
-	}
-	else if (Read32(0x1c) == 0xC2339F3D)
-	{
-		m_OffsetShift = 0; // GC file system
-		return true;
-	}
-
-	return false;
-}
-
-void CFileSystemGCWii::InitFileSystem()
-{
-	m_Initialized = true;
-
-	// read the whole FST
-	u64 FSTOffset = (u64)Read32(0x424) << m_OffsetShift;
-	// u32 FSTSize     = Read32(0x428);
-	// u32 FSTMaxSize  = Read32(0x42C);
-
-
-	// read all fileinfos
-	SFileInfo Root;
-	Root.m_NameOffset = Read32(FSTOffset + 0x0);
-	Root.m_Offset     = (u64)Read32(FSTOffset + 0x4) << m_OffsetShift;
-	Root.m_FileSize   = Read32(FSTOffset + 0x8);
-
-	if (Root.IsDirectory())
-	{
-		if (m_FileInfoVector.size())
-			PanicAlert("Wtf?");
-		u64 NameTableOffset = FSTOffset;
-
-		m_FileInfoVector.reserve((unsigned int)Root.m_FileSize);
-		for (u32 i = 0; i < Root.m_FileSize; i++)
-		{
-			SFileInfo sfi;
-			u64 Offset = FSTOffset + (i * 0xC);
-			sfi.m_NameOffset = Read32(Offset + 0x0);
-			sfi.m_Offset     = (u64)Read32(Offset + 0x4) << m_OffsetShift;
-			sfi.m_FileSize   = Read32(Offset + 0x8);
-
-			m_FileInfoVector.push_back(sfi);
-			NameTableOffset += 0xC;
-		}
-
-		BuildFilenames(1, m_FileInfoVector.size(), NULL, NameTableOffset);
-	}
-}
-
-// Changed this stuff from C++ string to C strings for speed in debug mode. Doesn't matter in release, but
-// std::string is SLOW in debug mode.
-size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset)
-{
-	size_t CurrentIndex = _FirstIndex;
-
-	while (CurrentIndex < _LastIndex)
-	{
-		SFileInfo *rFileInfo = &m_FileInfoVector[CurrentIndex];
-		u64 uOffset = _NameTableOffset + (rFileInfo->m_NameOffset & 0xFFFFFF);
-		std::string filename = GetStringFromOffset(uOffset);
-
-		// check next index
-		if (rFileInfo->IsDirectory())
-		{
-			// this is a directory, build up the new szDirectory
-			if (_szDirectory != NULL)
-				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s/", _szDirectory, filename.c_str());
-			else
-				CharArrayFromFormat(rFileInfo->m_FullPath, "%s/", filename.c_str());
-
-			CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset);
-		}
-		else
-		{
-			// this is a filename
-			if (_szDirectory != NULL)
-				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s", _szDirectory, filename.c_str());
-			else
-				CharArrayFromFormat(rFileInfo->m_FullPath, "%s", filename.c_str());
-
-			CurrentIndex++;
-		}
-	}
-
-	return CurrentIndex;
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h
deleted file mode 100644
index 8817e44153..0000000000
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FILESYSTEM_GC_WII_H
-#define _FILESYSTEM_GC_WII_H
-
-#include <vector>
-
-#include "Filesystem.h"
-
-namespace DiscIO
-{
-
-class CFileSystemGCWii : public IFileSystem
-{
-public:
-	CFileSystemGCWii(const IVolume* _rVolume);
-	virtual ~CFileSystemGCWii();
-	virtual bool IsValid() const { return m_Valid; }
-	virtual u64 GetFileSize(const char* _rFullPath);
-	virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames);
-	virtual const char* GetFileName(u64 _Address);
-	virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize);
-	virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename);
-	virtual bool ExportApploader(const char* _rExportFolder) const;
-	virtual bool ExportDOL(const char* _rExportFolder) const;
-	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const;
-	virtual u32 GetBootDOLSize() const;
-
-private:
-	bool m_Initialized;
-	bool m_Valid;
-	u32 m_OffsetShift; // WII offsets are all shifted
-	
-	std::vector <SFileInfo> m_FileInfoVector;
-	u32 Read32(u64 _Offset) const;
-	std::string GetStringFromOffset(u64 _Offset) const;
-	const SFileInfo* FindFileInfo(const char* _rFullPath);
-	bool DetectFileSystem();
-	void InitFileSystem();
-	size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset);
-};
-
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/Filesystem.cpp b/Source/Core/DiscIO/Src/Filesystem.cpp
deleted file mode 100644
index cdf6288a54..0000000000
--- a/Source/Core/DiscIO/Src/Filesystem.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Filesystem.h"
-
-#include "VolumeCreator.h"
-#include "FileSystemGCWii.h"
-
-namespace DiscIO
-{
-
-IFileSystem::IFileSystem(const IVolume *_rVolume)
-	: m_rVolume(_rVolume)
-{}
-
-
-IFileSystem::~IFileSystem()
-{}
-
-
-IFileSystem* CreateFileSystem(const IVolume* _rVolume)
-{
-	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
-
-	if (!pFileSystem)
-		return 0;
-
-	if (!pFileSystem->IsValid())
-	{
-		delete pFileSystem;
-		pFileSystem = NULL;
-	}
-
-	return pFileSystem;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h
deleted file mode 100644
index 6995eec5fa..0000000000
--- a/Source/Core/DiscIO/Src/Filesystem.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FILESYSTEM_H
-#define _FILESYSTEM_H
-
-#include "Volume.h"
-
-namespace DiscIO
-{
-
-// file info of an FST entry
-struct SFileInfo
-{
-	u64 m_NameOffset;
-	u64 m_Offset;
-	u64 m_FileSize;
-	char m_FullPath[512];
-
-	bool IsDirectory() const { return (m_NameOffset & 0xFF000000) != 0 ? true : false; }
-
-	SFileInfo() : m_NameOffset(0), m_Offset(0), m_FileSize(0) {
-		memset(m_FullPath, 0, sizeof(m_FullPath));
-	}
-
-	SFileInfo(const SFileInfo &rhs) : m_NameOffset(rhs.m_NameOffset), 
-		m_Offset(rhs.m_Offset), m_FileSize(rhs.m_FileSize) {
-		memcpy(m_FullPath, rhs.m_FullPath, strlen(rhs.m_FullPath) + 1);
-	}
-};
-
-class IFileSystem
-{
-public:
-	IFileSystem(const IVolume *_rVolume);
-
-	virtual ~IFileSystem();
-	virtual bool IsValid() const = 0;
-	virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) = 0;
-	virtual u64 GetFileSize(const char* _rFullPath) = 0;
-	virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) = 0;
-	virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) = 0;
-	virtual bool ExportApploader(const char* _rExportFolder) const = 0;
-	virtual bool ExportDOL(const char* _rExportFolder) const = 0;
-	virtual const char* GetFileName(u64 _Address) = 0;
-	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const = 0;
-	virtual u32 GetBootDOLSize() const = 0;
-
-	virtual const IVolume *GetVolume() const { return m_rVolume; }
-protected:
-	const IVolume *m_rVolume;
-};
-
-IFileSystem* CreateFileSystem(const IVolume *_rVolume);
-
-} // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
deleted file mode 100644
index 974f8a9945..0000000000
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "NANDContentLoader.h"
-
-#include <algorithm>
-#include <cctype>
-#include "Crypto/aes.h"
-#include "MathUtil.h"
-#include "FileUtil.h"
-#include "Log.h"
-#include "WiiWad.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-CSharedContent CSharedContent::m_Instance;
-cUIDsys cUIDsys::m_Instance;
-
-
-CSharedContent::CSharedContent()
-{
-	UpdateLocation();
-}
-
-void CSharedContent::UpdateLocation()
-{
-	m_Elements.clear();
-	lastID = 0;
-	sprintf(contentMap, "%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX).c_str());
-
-	File::IOFile pFile(contentMap, "rb");
-	SElement Element;
-	while (pFile.ReadArray(&Element, 1))
-	{
-		m_Elements.push_back(Element);
-		lastID++;
-	}
-}
-
-CSharedContent::~CSharedContent()
-{}
-
-std::string CSharedContent::GetFilenameFromSHA1(const u8* _pHash)
-{
-	for (size_t i=0; i<m_Elements.size(); i++)
-	{
-		if (memcmp(_pHash, m_Elements[i].SHA1Hash, 20) == 0)
-		{
-			char szFilename[1024];
-			sprintf(szFilename,  "%sshared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIUSER_IDX).c_str(),
-				m_Elements[i].FileName[0], m_Elements[i].FileName[1], m_Elements[i].FileName[2], m_Elements[i].FileName[3],
-				m_Elements[i].FileName[4], m_Elements[i].FileName[5], m_Elements[i].FileName[6], m_Elements[i].FileName[7]);
-			return szFilename;
-		}
-	}
-	return "unk";
-}
-
-std::string CSharedContent::AddSharedContent(const u8* _pHash)
-{
-	std::string szFilename = GetFilenameFromSHA1(_pHash);
-	if (strcasecmp(szFilename.c_str(), "unk") == 0)
-	{
-		char tempFilename[1024], c_ID[9];
-		SElement Element;
-		sprintf(c_ID, "%08x", lastID);
-		memcpy(Element.FileName, c_ID, 8);
-		memcpy(Element.SHA1Hash, _pHash, 20);
-		m_Elements.push_back(Element);
-
-		File::CreateFullPath(contentMap);
-
-		File::IOFile pFile(contentMap, "ab");
-		pFile.WriteArray(&Element, 1);
-
-		sprintf(tempFilename, "%sshared1/%s.app", File::GetUserPath(D_WIIUSER_IDX).c_str(), c_ID);
-		szFilename = tempFilename;
-		lastID++;
-	}
-	return szFilename;
-}
-
-
-// this classes must be created by the CNANDContentManager
-class CNANDContentLoader : public INANDContentLoader
-{
-public:
-
-	CNANDContentLoader(const std::string& _rName);
-
-	virtual ~CNANDContentLoader();
-
-	bool IsValid() const	{ return m_Valid; }
-	void RemoveTitle(void) const;
-	u64 GetTitleID() const  { return m_TitleID; }
-	u16 GetIosVersion() const { return m_IosVersion; }
-	u32 GetBootIndex() const  { return m_BootIndex; }
-	size_t GetContentSize() const { return m_Content.size(); }
-	const SNANDContent* GetContentByIndex(int _Index) const;
-	const u8* GetTMDView() const { return m_TMDView; }
-	const u8* GetTMDHeader() const { return m_TMDHeader; }
-	u32 GetTIKSize() const { return m_TIKSize; }
-	const u8* GetTIK() const { return m_TIK; }
-
-	const std::vector<SNANDContent>& GetContent() const { return m_Content; }
-
-	u16 GetTitleVersion() const {return m_TitleVersion;}
-	u16 GetNumEntries() const {return m_numEntries;}
-	DiscIO::IVolume::ECountry GetCountry() const;
-	u8 GetCountryChar() const {return m_Country; }
-
-private:
-
-	bool m_Valid;
-	bool m_isWAD;
-	std::string m_Path;
-	u64 m_TitleID;
-	u16 m_IosVersion;
-	u32 m_BootIndex;
-	u16 m_numEntries;
-	u16 m_TitleVersion;
-	u8 m_TMDView[TMD_VIEW_SIZE];
-	u8 m_TMDHeader[TMD_HEADER_SIZE];
-	u32 m_TIKSize;
-	u8 *m_TIK;
-	u8 m_Country;
-
-	std::vector<SNANDContent> m_Content;
-
-
-	bool Initialize(const std::string& _rName);
-
-	void AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest);
-
-	void GetKeyFromTicket(u8* pTicket, u8* pTicketKey);
-};
-
-
-
-
-CNANDContentLoader::CNANDContentLoader(const std::string& _rName)
-	: m_Valid(false)
-	, m_isWAD(false)
-	, m_TitleID(-1)
-	, m_IosVersion(0x09)
-	, m_BootIndex(-1)
-	, m_TIKSize(0)
-	, m_TIK(NULL)
-{
-	m_Valid = Initialize(_rName);
-}
-
-CNANDContentLoader::~CNANDContentLoader()
-{
-	for (size_t i=0; i<m_Content.size(); i++)
-	{
-		delete [] m_Content[i].m_pData;
-	}
-	m_Content.clear();
-	if (m_TIK)
-	{
-		delete []m_TIK;
-		m_TIK = NULL;
-	}
-}
-
-const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
-{
-	for (size_t i=0; i<m_Content.size(); i++)
-	{
-		const SNANDContent* pContent = &m_Content[i];
-		if (pContent->m_Index == _Index)
-		{
-			return pContent;
-		}
-	}
-	return NULL;
-}
-
-bool CNANDContentLoader::Initialize(const std::string& _rName)
-{
-	if (_rName.empty())
-		return false;
-	m_Path = _rName;
-	WiiWAD Wad(_rName);
-	u8* pDataApp = NULL;
-	u8* pTMD = NULL;
-	u8 DecryptTitleKey[16];
-	u8 IV[16];
-	if (Wad.IsValid())
-	{
-		m_isWAD = true;
-		m_TIKSize = Wad.GetTicketSize();
-		m_TIK = new u8[m_TIKSize];
-		memcpy(m_TIK, Wad.GetTicket(), m_TIKSize);
-		GetKeyFromTicket(m_TIK, DecryptTitleKey);
-		u32 pTMDSize = Wad.GetTMDSize();
-		pTMD = new u8[pTMDSize];
-		memcpy(pTMD, Wad.GetTMD(), pTMDSize);
-		pDataApp = Wad.GetDataApp();
-	}
-	else
-	{
-		std::string TMDFileName(m_Path);
-
-		if ('/' == *TMDFileName.rbegin())
-			TMDFileName += "title.tmd";
-		else
-			m_Path = TMDFileName.substr(0, TMDFileName.find("title.tmd"));
-
-		File::IOFile pTMDFile(TMDFileName, "rb");
-		if (!pTMDFile)
-		{
-			WARN_LOG(DISCIO, "CreateFromDirectory: error opening %s",
-					 TMDFileName.c_str());
-			return false;
-		}
-		u32 pTMDSize = (u32)File::GetSize(TMDFileName);
-		pTMD = new u8[pTMDSize];
-		pTMDFile.ReadBytes(pTMD, (size_t)pTMDSize);
-		pTMDFile.Close();
-	}
-
-	memcpy(m_TMDView, pTMD + 0x180, TMD_VIEW_SIZE);
-	memcpy(m_TMDHeader, pTMD, TMD_HEADER_SIZE);
-
-
-	m_TitleVersion = Common::swap16(pTMD + 0x01dc);
-	m_numEntries = Common::swap16(pTMD + 0x01de);
-	m_BootIndex = Common::swap16(pTMD + 0x01e0);
-	m_TitleID = Common::swap64(pTMD + 0x018c);
-	m_IosVersion = Common::swap16(pTMD + 0x018a);
-	m_Country = *(u8*)&m_TitleID;
-	if (m_Country == 2) // SYSMENU
-		m_Country = GetSysMenuRegion(m_TitleVersion);
-
-	m_Content.resize(m_numEntries);
-
-
-	for (u32 i=0; i<m_numEntries; i++) 
-	{
-		SNANDContent& rContent = m_Content[i];
-				
-		rContent.m_ContentID = Common::swap32(pTMD + 0x01e4 + 0x24*i);
-		rContent.m_Index = Common::swap16(pTMD + 0x01e8 + 0x24*i);
-		rContent.m_Type = Common::swap16(pTMD + 0x01ea + 0x24*i);
-		rContent.m_Size= (u32)Common::swap64(pTMD + 0x01ec + 0x24*i);
-		memcpy(rContent.m_SHA1Hash, pTMD + 0x01f4 + 0x24*i, 20);
-		memcpy(rContent.m_Header, pTMD + 0x01e4 + 0x24*i, 36);
-
-		if (m_isWAD)
-		{
-			u32 RoundedSize = ROUND_UP(rContent.m_Size, 0x40);
-			rContent.m_pData = new u8[RoundedSize];
-		
-			memset(IV, 0, sizeof IV);
-			memcpy(IV, pTMD + 0x01e8 + 0x24*i, 2);
-			AESDecode(DecryptTitleKey, IV, pDataApp, RoundedSize, rContent.m_pData);
-
-			pDataApp += RoundedSize;
-			continue;
-		}
-
-		rContent.m_pData = NULL;
-
-		if (rContent.m_Type & 0x8000)  // shared app
-		{
-			rContent.m_Filename = CSharedContent::AccessInstance().GetFilenameFromSHA1(rContent.m_SHA1Hash);
-		}
-		else
-		{
-			rContent.m_Filename = StringFromFormat("%s/%08x.app", m_Path.c_str(), rContent.m_ContentID);
-		}
-
-		// Be graceful about incorrect tmds.
-		if (File::Exists(rContent.m_Filename))
-		{
-			rContent.m_Size = (u32) File::GetSize(rContent.m_Filename);
-		}
-	}
-
-	delete [] pTMD;
-	return true;
-}
-void CNANDContentLoader::AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest)
-{
-	AES_KEY AESKey;
-
-	AES_set_decrypt_key(_pKey, 128, &AESKey);
-	AES_cbc_encrypt(_pSrc, _pDest, _Size, &AESKey, _IV, AES_DECRYPT);
-}
-
-void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)
-{
-	u8 CommonKey[16] = {0xeb,0xe4,0x2a,0x22,0x5e,0x85,0x93,0xe4,0x48,0xd9,0xc5,0x45,0x73,0x81,0xaa,0xf7};	
-	u8 IV[16];
-	memset(IV, 0, sizeof IV);
-	memcpy(IV, pTicket + 0x01dc, 8);
-	AESDecode(CommonKey, IV, pTicket + 0x01bf, 16, pTicketKey);
-}
-
-
-DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
-{
-	if (!IsValid())
-		return DiscIO::IVolume::COUNTRY_UNKNOWN;
-
-	return CountrySwitch(m_Country);
-}
-
-
-CNANDContentManager CNANDContentManager::m_Instance;
-
-
-CNANDContentManager::~CNANDContentManager()
-{
-	CNANDContentMap::iterator itr = m_Map.begin();
-	while (itr != m_Map.end())
-	{
-		delete itr->second;
-		++itr;
-	}
-	m_Map.clear();
-}
-
-const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& _rName, bool forceReload)
-{
-	CNANDContentMap::iterator lb = m_Map.lower_bound(_rName);
-
-	if(lb == m_Map.end() || (m_Map.key_comp()(_rName, lb->first)))
-	{
-		m_Map.insert(lb, CNANDContentMap::value_type(_rName, new CNANDContentLoader(_rName)));
-	}
-	else
-	{
-		if (!lb->second->IsValid() || forceReload)
-		{
-			delete lb->second;
-			lb->second = new CNANDContentLoader(_rName);
-		}
-	}
-	return *m_Map[_rName];
-}
-
-const INANDContentLoader& CNANDContentManager::GetNANDLoader(u64 _titleId, bool forceReload)
-{
-	std::string _rName = Common::GetTitleContentPath(_titleId);
-	return GetNANDLoader(_rName, forceReload);
-}
-bool CNANDContentManager::RemoveTitle(u64 _titleID)
-{
-	if (!GetNANDLoader(_titleID).IsValid())
-		return false;
-	GetNANDLoader(_titleID).RemoveTitle();
-	return GetNANDLoader(_titleID, true).IsValid();
-}
-
-void CNANDContentLoader::RemoveTitle() const
-{
-	INFO_LOG(DISCIO, "RemoveTitle %08x/%08x", (u32)(m_TitleID >> 32), (u32)m_TitleID);
-	if(IsValid())
-	{
-		// remove tmd?
-		for (u32 i = 0; i < m_numEntries; i++)
-		{
-			char szFilename[1024];
-			if (!(m_Content[i].m_Type & 0x8000)) // skip shared apps
-			{
-				sprintf(szFilename, "%s%08x.app", Common::GetTitleContentPath(m_TitleID).c_str(), m_Content[i].m_ContentID);
-				INFO_LOG(DISCIO, "Delete %s", szFilename);
-				File::Delete(szFilename);
-			}
-		}
-	}
-}
-
-cUIDsys::cUIDsys()
-{
-	UpdateLocation();
-}
-
-void cUIDsys::UpdateLocation()
-{
-	m_Elements.clear();
-	lastUID = 0x00001000;
-	sprintf(uidSys, "%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX).c_str());
-	
-	File::IOFile pFile(uidSys, "rb");
-	SElement Element;
-	while (pFile.ReadArray(&Element, 1))
-	{
-		*(u32*)&(Element.UID) = Common::swap32(lastUID++);
-		m_Elements.push_back(Element);
-	}
-	pFile.Close();
-
-	if (m_Elements.empty())
-	{
-		*(u64*)&(Element.titleID) = Common::swap64(TITLEID_SYSMENU);
-		*(u32*)&(Element.UID) = Common::swap32(lastUID++);
-
-		File::CreateFullPath(uidSys);
-		pFile.Open(uidSys, "wb");
-		if (!pFile.WriteArray(&Element, 1))
-			ERROR_LOG(DISCIO, "Failed to write to %s", uidSys);
-	}
-}
-
-cUIDsys::~cUIDsys()
-{}
-
-u32 cUIDsys::GetUIDFromTitle(u64 _Title)
-{
-	for (size_t i=0; i<m_Elements.size(); i++)
-	{
-		if (Common::swap64(_Title) == *(u64*)&(m_Elements[i].titleID))
-		{
-			return Common::swap32(m_Elements[i].UID);
-		}
-	}
-	return 0;
-}
-
-void cUIDsys::AddTitle(u64 _TitleID)
-{
-	if (GetUIDFromTitle(_TitleID))
-	{
-		INFO_LOG(DISCIO, "Title %08x%08x, already exists in uid.sys", (u32)(_TitleID >> 32), (u32)_TitleID);
-		return;
-	}
-
-	SElement Element;
-	*(u64*)&(Element.titleID) = Common::swap64(_TitleID);
-	*(u32*)&(Element.UID) = Common::swap32(lastUID++);
-	m_Elements.push_back(Element);
-
-	File::CreateFullPath(uidSys);
-	File::IOFile pFile(uidSys, "ab");
-
-	if (!pFile.WriteArray(&Element, 1))
-		ERROR_LOG(DISCIO, "fwrite failed");
-}
-
-void cUIDsys::GetTitleIDs(std::vector<u64>& _TitleIDs, bool _owned)
-{
-	for (size_t i = 0; i < m_Elements.size(); i++)
-	{
-		if ((_owned && Common::CheckTitleTIK(Common::swap64(m_Elements[i].titleID)))  ||
-			(!_owned && Common::CheckTitleTMD(Common::swap64(m_Elements[i].titleID))))
-			_TitleIDs.push_back(Common::swap64(m_Elements[i].titleID));
-	}
-}
-
-u64 CNANDContentManager::Install_WiiWAD(std::string &fileName)
-{
-	if (fileName.find(".wad") == std::string::npos)
-		return 0;
-	const INANDContentLoader& ContentLoader = GetNANDLoader(fileName);
-	if (ContentLoader.IsValid() == false)
-		return 0;
-
-	u64 TitleID = ContentLoader.GetTitleID();
-
-	//copy WAD's tmd header and contents to content directory
-
-	std::string ContentPath(Common::GetTitleContentPath(TitleID));
-	std::string TMDFileName(Common::GetTMDFileName(TitleID));
-	File::CreateFullPath(TMDFileName);
-
-	File::IOFile pTMDFile(TMDFileName, "wb");
-	if (!pTMDFile)
-	{
-		PanicAlertT("WAD installation failed: error creating %s", TMDFileName.c_str());
-		return 0;
-	}
-
-	pTMDFile.WriteBytes(ContentLoader.GetTMDHeader(), INANDContentLoader::TMD_HEADER_SIZE);
-	
-	for (u32 i = 0; i < ContentLoader.GetContentSize(); i++)
-	{
-		const SNANDContent& Content = ContentLoader.GetContent()[i];
-
-		pTMDFile.WriteBytes(Content.m_Header, INANDContentLoader::CONTENT_HEADER_SIZE);
-
-		char APPFileName[1024];
-		if (Content.m_Type & 0x8000) //shared
-		{
-			sprintf(APPFileName, "%s", 
-				CSharedContent::AccessInstance().AddSharedContent(Content.m_SHA1Hash).c_str());
-		}
-		else
-		{
-			sprintf(APPFileName, "%s%08x.app", ContentPath.c_str(), Content.m_ContentID);
-		}
-
-		if (!File::Exists(APPFileName))
-		{
-			File::CreateFullPath(APPFileName);
-			File::IOFile pAPPFile(APPFileName, "wb");
-			if (!pAPPFile)
-			{
-				PanicAlertT("WAD installation failed: error creating %s", APPFileName);
-				return 0;
-			}
-			
-			pAPPFile.WriteBytes(Content.m_pData, Content.m_Size);
-		}
-		else
-		{
-			INFO_LOG(DISCIO, "Content %s already exists.", APPFileName);
-		}
-	}
-
-	pTMDFile.Close();
-	
-
-
-
-	//Extract and copy WAD's ticket to ticket directory
-	if (!Add_Ticket(TitleID, ContentLoader.GetTIK(), ContentLoader.GetTIKSize()))
-	{
-		PanicAlertT("WAD installation failed: error creating ticket");
-		return 0;
-	}
-
-	cUIDsys::AccessInstance().AddTitle(TitleID);
-
-
-	return TitleID;
-}
-
-bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize)
-{
-	std::string TicketFileName = Common::GetTicketFileName(TitleID);
-	File::CreateFullPath(TicketFileName);
-	File::IOFile pTicketFile(TicketFileName, "wb");
-	if (!pTicketFile || !p_tik)
-	{
-		//PanicAlertT("WAD installation failed: error creating %s", TicketFileName.c_str());
-		return false;
-	}
-	return pTicketFile.WriteBytes(p_tik, tikSize);
-}
-
-} // namespace end
-
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h
deleted file mode 100644
index 9172c85338..0000000000
--- a/Source/Core/DiscIO/Src/NANDContentLoader.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NAND_CONTENT_LOADER_H
-#define _NAND_CONTENT_LOADER_H
-
-#include <string>
-#include <vector>
-#include <map>
-
-#include "Common.h"
-#include "Blob.h"
-#include "Volume.h"
-#include "NandPaths.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-	bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize);
-struct SNANDContent
-{
-	u32 m_ContentID;
-	u16 m_Index;
-	u16 m_Type;
-	u32 m_Size;
-	u8 m_SHA1Hash[20];
-	u8 m_Header[36]; //all of the above
-
-	std::string m_Filename;
-	u8* m_pData;
-};
-
-// pure virtual interface so just the NANDContentManager can create these files only
-class INANDContentLoader
-{
-public:
-
-	INANDContentLoader() {}
-
-	virtual ~INANDContentLoader()  {}
-
-	virtual bool IsValid() const = 0;
-	virtual void RemoveTitle() const = 0;
-	virtual u64 GetTitleID() const = 0;
-	virtual u16 GetIosVersion() const = 0;
-	virtual u32 GetBootIndex() const = 0;
-	virtual size_t GetContentSize() const = 0;
-	virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
-	virtual const u8* GetTMDView() const = 0;
-	virtual const u8* GetTMDHeader() const = 0;
-	virtual u32 GetTIKSize() const = 0;
-	virtual const u8* GetTIK() const = 0;
-	virtual const std::vector<SNANDContent>& GetContent() const = 0;
-	virtual u16 GetTitleVersion() const = 0;
-	virtual u16 GetNumEntries() const = 0;
-	virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
-	virtual u8 GetCountryChar() const = 0;
-
-	enum
-	{
-		TMD_VIEW_SIZE = 0x58,
-		TMD_HEADER_SIZE = 0x1e4,
-		CONTENT_HEADER_SIZE = 0x24,
-		TICKET_SIZE = 0x2A4
-	};
-};
-
-
-// we open the NAND Content files to often... lets cache them
-class CNANDContentManager
-{
-public:
-
-	static CNANDContentManager& Access() { return m_Instance; }
-	u64 Install_WiiWAD(std::string &fileName);
-
-	const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
-	const INANDContentLoader& GetNANDLoader(u64 _titleId, bool forceReload = false);
-	bool RemoveTitle(u64 _titleID);
-private:
-
-	CNANDContentManager() {};
-
-	~CNANDContentManager();
-
-	static CNANDContentManager m_Instance;
-
-	typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
-	CNANDContentMap m_Map;
-
-};
-
-class CSharedContent
-{
-public:
-
-	static CSharedContent& AccessInstance() { return m_Instance; }
-
-	std::string GetFilenameFromSHA1(const u8* _pHash);
-	std::string AddSharedContent(const u8* _pHash);
-	void UpdateLocation();
-
-private:
-
-
-	CSharedContent();
-
-	virtual ~CSharedContent();
-
-#pragma pack(push,1)
-	struct SElement
-	{
-		u8 FileName[8];
-		u8 SHA1Hash[20];
-	};
-#pragma pack(pop)
-
-	u32 lastID;
-	char contentMap[1024];
-	std::vector<SElement> m_Elements;
-	static CSharedContent m_Instance;
-};
-
-class cUIDsys
-{
-public:
-
-	static cUIDsys& AccessInstance() { return m_Instance; }
-
-	u32 GetUIDFromTitle(u64 _Title);
-	void AddTitle(u64 _Title);
-	void GetTitleIDs(std::vector<u64>& _TitleIDs, bool _owned = false);
-	void UpdateLocation();
-private:
-
-
-	cUIDsys();
-
-	virtual ~cUIDsys();
-
-#pragma pack(push,1)
-	struct SElement
-	{
-		u8 titleID[8];
-		u8 UID[4];
-	};
-#pragma pack(pop)
-	u32 lastUID;
-	char uidSys[1024];
-	std::vector<SElement> m_Elements;
-	static cUIDsys m_Instance;
-};
-
-}
-
-#endif
diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h
deleted file mode 100644
index 454319c876..0000000000
--- a/Source/Core/DiscIO/Src/Volume.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _VOLUME_H
-#define _VOLUME_H
-
-#include <string>
-#include <vector>
-
-#include "Common.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-class IVolume
-{
-public:
-	IVolume() {}
-	virtual ~IVolume() {}
-
-	virtual bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
-	virtual bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
-	virtual bool GetTitleID(u8*) const { return false; }
-	virtual void GetTMD(u8*, u32 *_sz) const { *_sz=0; }
-	virtual std::string GetUniqueID() const = 0;
-	virtual std::string GetMakerID() const = 0;
-	virtual int GetRevision() const { return 0; }
-	// TODO: eliminate?
-	virtual std::string GetName() const;
-	virtual std::vector<std::string> GetNames() const = 0;
-	virtual u32 GetFSTSize() const = 0;
-	virtual std::string GetApploaderDate() const = 0;
-	virtual bool SupportsIntegrityCheck() const { return false; }
-	virtual bool CheckIntegrity() const { return false; }
-	virtual bool IsDiscTwo() const { return false; }
-
-	enum ECountry
-	{
-		COUNTRY_EUROPE = 0,
-		COUNTRY_FRANCE,
-		COUNTRY_RUSSIA,
-		COUNTRY_USA,
-		COUNTRY_JAPAN,
-		COUNTRY_KOREA,
-		COUNTRY_ITALY,
-		COUNTRY_TAIWAN,
-		COUNTRY_SDK,
-		COUNTRY_UNKNOWN,
-		COUNTRY_GERMANY,
-		NUMBER_OF_COUNTRIES
-	};
-
-	virtual ECountry GetCountry() const = 0;
-	virtual u64 GetSize() const = 0;
-	
-	// Size on disc (compressed size)
-	virtual u64 GetRawSize() const = 0;
-};
-
-// Generic Switch function for all volumes
-IVolume::ECountry CountrySwitch(u8 CountryCode);
-u8 GetSysMenuRegion(u16 _TitleVersion);
-
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp
deleted file mode 100644
index 07a514a2ea..0000000000
--- a/Source/Core/DiscIO/Src/VolumeCommon.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Volume.h"
-
-namespace DiscIO
-{
-IVolume::ECountry CountrySwitch(u8 CountryCode)
-{
-	switch (CountryCode) 
-	{
-		// Region free - fall through to European defaults for now
-		case 'A':
-
-		
-		// PAL
-		case 'D': // German
-			return IVolume::COUNTRY_GERMANY;
-			break;
-
-		case 'X': // Used by a couple PAL games
-		case 'Y': // German, french
-
-		case 'L': // Japanese import to PAL regions
-		case 'M': // Japanese import to PAL regions
-		case 'S': // Spanish-speaking regions
-		case 'P':
-		case 'U': // Australia 
-			return IVolume::COUNTRY_EUROPE;
-			break;
-			
-		case 'F':
-			return IVolume::COUNTRY_FRANCE;
-			break;
-			
-		case 'I':
-			return IVolume::COUNTRY_ITALY;
-			break;
-			
-		case 'R':
-			return IVolume::COUNTRY_RUSSIA;
-			break;
-
-		// NTSC
-		case 'E':
-		case 'N': // Japanese import to USA and other NTSC regions
-		case 'Z': // Prince Of Persia - The Forgotten Sands (WII)
-			return IVolume::COUNTRY_USA;
-			break;
-
-		case 'J':
-			return IVolume::COUNTRY_JAPAN;
-			break;
-
-		case 'K':
-		case 'T': // Korea with English language
-		case 'Q': // Korea with Japanese language
-			return IVolume::COUNTRY_KOREA;
-			break;
-
-		case 'O':
-			return IVolume::COUNTRY_SDK;
-			break;
-
-		case 'W':
-			return IVolume::COUNTRY_TAIWAN;
-			break;
-
-		default:
-			if (CountryCode > 'A') // Silently ignore IOS wads
-				WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode);
-			return IVolume::COUNTRY_UNKNOWN;
-			break;
-	}
-}
-
-u8 GetSysMenuRegion(u16 _TitleVersion)
-{
-	switch(_TitleVersion)
-	{
-	case 128:	case 192:	case 224:	case 256:
-	case 288:	case 352:	case 384:	case 416:
-	case 448:	case 480:	case 512:
-		return 'J';
-	case 97:	case 193:	case 225:	case 257:
-	case 289:	case 353:	case 385:	case 417:
-	case 449:	case 481:	case 513:
-		return 'E';
-	case 130:	case 162:	case 194:	case 226:
-	case 258:	case 290:	case 354:	case 386:
-	case 418:	case 450:	case 482:	case 514:
-		return 'P';
-	case 326:	case 390:	case 454:	case 486:
-	case 518:
-		return 'K';
-	default:
-		return 'A';
-	}
-}
-
-std::string IVolume::GetName() const
-{
-	auto names = GetNames();
-	if (names.empty())
-		return "";
-	else
-		return names[0];
-}
-
-}
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
deleted file mode 100644
index 6cf5ea836e..0000000000
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <vector>
-
-#include "Crypto/aes.h"
-
-#include "VolumeCreator.h"
-
-#include "Volume.h"
-#include "VolumeDirectory.h"
-#include "VolumeGC.h"
-#include "VolumeWiiCrypted.h"
-#include "VolumeWad.h"
-
-#include "Hash.h"
-#include "StringUtil.h"
-
-namespace DiscIO
-{
-enum EDiscType
-{
-	DISC_TYPE_UNK,
-	DISC_TYPE_WII,
-	DISC_TYPE_WII_CONTAINER,
-	DISC_TYPE_GC,
-	DISC_TYPE_WAD
-};
-
-#ifndef _WIN32
-struct SPartition
-{
-	u64 Offset;
-	u32 Type;
-}; //gcc 4.3 cries if it's local
-#endif
-
-class CBlobBigEndianReader
-{
-public:
-	CBlobBigEndianReader(IBlobReader& _rReader) : m_rReader(_rReader) {}
-
-	u32 Read32(u64 _Offset)
-	{
-		u32 Temp;
-		m_rReader.Read(_Offset, 4, (u8*)&Temp);
-		return(Common::swap32(Temp));
-	}
-
-private:
-	IBlobReader& m_rReader;
-};
-
-const unsigned char g_MasterKey[16] = {0xeb,0xe4,0x2a,0x22,0x5e,0x85,0x93,0xe4,0x48,0xd9,0xc5,0x45,0x73,0x81,0xaa,0xf7};
-const unsigned char g_MasterKeyK[16] = {0x63,0xb8,0x2b,0xb4,0xf4,0x61,0x4e,0x2e,0x13,0xf2,0xfe,0xfb,0xba,0x4c,0x9b,0x7e};
-
-static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum, bool Korean);
-EDiscType GetDiscType(IBlobReader& _rReader);
-
-IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup, u32 _VolumeNum)
-{
-	IBlobReader* pReader = CreateBlobReader(_rFilename.c_str());
-	if (pReader == NULL)
-		return NULL;
-
-	switch (GetDiscType(*pReader))
-	{
-		case DISC_TYPE_WII:
-		case DISC_TYPE_GC:
-			return new CVolumeGC(pReader);
-
-		case DISC_TYPE_WAD:
-			return new CVolumeWAD(pReader);
-
-		case DISC_TYPE_WII_CONTAINER:
-		{
-			u8 region;
-			pReader->Read(0x3,1,&region);
-
-			IVolume* pVolume = CreateVolumeFromCryptedWiiImage(*pReader, _PartitionGroup, 0, _VolumeNum, region == 'K');
-
-			if (pVolume == NULL)
-			{
-				delete pReader;
-			}
-
-			return pVolume;
-		}
-			break;
-
-		case DISC_TYPE_UNK:
-		default:
-			std::string Filename, ext;
-			SplitPath(_rFilename, NULL, &Filename, &ext);
-			Filename += ext;
-			NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n"
-						"Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str());
-			delete pReader;
-			return NULL;
-	}
-
-	// unreachable code
-	return NULL;
-}
-
-IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
-{
-	if (CVolumeDirectory::IsValidDirectory(_rDirectory))
-		return new CVolumeDirectory(_rDirectory, _bIsWii, _rApploader, _rDOL);
-	
-	return NULL;
-}
-
-bool IsVolumeWiiDisc(const IVolume *_rVolume)
-{
-	u32 MagicWord = 0;
-	_rVolume->Read(0x18, 4, (u8*)&MagicWord);
-
-	return (Common::swap32(MagicWord) == 0x5D1C9EA3);
-	//Gamecube 0xc2339f3d
-}
-
-bool IsVolumeWadFile(const IVolume *_rVolume)
-{
-	u32 MagicWord = 0;
-	_rVolume->Read(0x02, 4, (u8*)&MagicWord);
-
-	return (Common::swap32(MagicWord) == 0x00204973 || Common::swap32(MagicWord) == 0x00206962);
-}
-
-static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum, bool Korean)
-{
-	CBlobBigEndianReader Reader(_rReader);
-
-	u32 numPartitions = Reader.Read32(0x40000 + (_PartitionGroup * 8));
-	u64 PartitionsOffset = (u64)Reader.Read32(0x40000 + (_PartitionGroup * 8) + 4) << 2;
-
-	// Check if we're looking for a valid partition
-	if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions)
-		return NULL;
-
-	#ifdef _WIN32
-	struct SPartition
-	{
-		u64 Offset;
-		u32 Type;
-	};
-	#endif
-	struct SPartitionGroup
-	{
-		u32 numPartitions;
-		u64 PartitionsOffset;
-		std::vector<SPartition> PartitionsVec;
-	};
-	SPartitionGroup PartitionGroup[4];
-	
-	// read all partitions
-	for (u32 x = 0; x < 4; x++)
-	{
-		for (u32 i = 0; i < numPartitions; i++)
-		{
-			SPartition Partition;
-			Partition.Offset = ((u64)Reader.Read32(PartitionsOffset + (i * 8) + 0)) << 2;
-			Partition.Type   = Reader.Read32(PartitionsOffset + (i * 8) + 4);
-			PartitionGroup[x].PartitionsVec.push_back(Partition);
-		}
-	}
-
-	// return the partition type specified or number
-	// types: 0 = game, 1 = firmware update, 2 = channel installer
-	//  some partitions on ssbb use the ascii title id of the demo VC game they hold...
-	for (size_t i = 0; i < PartitionGroup[_PartitionGroup].PartitionsVec.size(); i++)
-	{
-		const SPartition& rPartition = PartitionGroup[_PartitionGroup].PartitionsVec.at(i);
-
-		if (rPartition.Type == _VolumeType || i == _VolumeNum)
-		{
-			u8 SubKey[16];
-			_rReader.Read(rPartition.Offset + 0x1bf, 16, SubKey);
-
-			u8 IV[16];
-			memset(IV, 0, 16);
-			_rReader.Read(rPartition.Offset + 0x44c, 8, IV);
-
-			AES_KEY AES_KEY;
-			AES_set_decrypt_key((Korean ? g_MasterKeyK : g_MasterKey), 128, &AES_KEY);
-
-			u8 VolumeKey[16];
-			AES_cbc_encrypt(SubKey, VolumeKey, 16, &AES_KEY, IV, AES_DECRYPT);
-
-			// -1 means the caller just wanted the partition with matching type
-			if ((int)_VolumeNum == -1 || i == _VolumeNum)
-				return new CVolumeWiiCrypted(&_rReader, rPartition.Offset, VolumeKey);
-		}
-	}
-
-	return NULL;
-}
-
-EDiscType GetDiscType(IBlobReader& _rReader)
-{
-	CBlobBigEndianReader Reader(_rReader);
-	u32 WiiMagic = Reader.Read32(0x18);
-	u32 WiiContainerMagic = Reader.Read32(0x60);
-	u32 WADMagic = Reader.Read32(0x02);
-	u32 GCMagic = Reader.Read32(0x1C);
-
-	// check for Wii
-	if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic != 0)
-		return DISC_TYPE_WII;
-	if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic == 0)
-		return DISC_TYPE_WII_CONTAINER;
-
-	// check for WAD
-	// 0x206962 for boot2 wads
-	if (WADMagic == 0x00204973 || WADMagic == 0x00206962)
-		return DISC_TYPE_WAD;
-
-	// check for GC
-	if (GCMagic == 0xC2339F3D)
-		return DISC_TYPE_GC;
-
-	WARN_LOG(DISCIO, "No known magic words found");
-	WARN_LOG(DISCIO, "Wii  offset: 0x18 value: 0x%08x", WiiMagic);
-	WARN_LOG(DISCIO, "WiiC offset: 0x60 value: 0x%08x", WiiContainerMagic);
-	WARN_LOG(DISCIO, "WAD  offset: 0x02 value: 0x%08x", WADMagic);
-	WARN_LOG(DISCIO, "GC   offset: 0x1C value: 0x%08x", GCMagic);
-
-	return DISC_TYPE_UNK;
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.h b/Source/Core/DiscIO/Src/VolumeCreator.h
deleted file mode 100644
index 1e290f3cc5..0000000000
--- a/Source/Core/DiscIO/Src/VolumeCreator.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VOLUME_CREATOR_H
-#define _VOLUME_CREATOR_H
-
-#include "Volume.h"
-
-namespace DiscIO
-{
-IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup = 0, u32 _VolumeNum = -1);
-IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = "");
-bool IsVolumeWiiDisc(const IVolume *_rVolume);
-bool IsVolumeWadFile(const IVolume *_rVolume);
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
deleted file mode 100644
index f095201aff..0000000000
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "MathUtil.h"
-#include "CommonPaths.h"
-#include "VolumeDirectory.h"
-#include "FileBlob.h"
-
-namespace DiscIO
-{
-
-CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
-								   const std::string& _rApploader, const std::string& _rDOL)
-	: m_totalNameSize(0)
-	, m_dataStartAddress(-1)
-	, m_fstSize(0)
-	, m_FSTData(NULL)
-	, m_apploaderSize(0)
-	, m_apploader(NULL)
-	, m_DOLSize(0)
-	, m_DOL(NULL)
-	, FST_ADDRESS(0)
-	, DOL_ADDRESS(0)
-{
-	m_rootDirectory = ExtractDirectoryName(_rDirectory);	
-
-	// create the default disk header
-	m_diskHeader = new u8[DISKHEADERINFO_ADDRESS];
-	memset(m_diskHeader, 0, (size_t)DISKHEADERINFO_ADDRESS);
-	SetUniqueID("AGBJ01");	
-	SetName("Default name");
-
-	if(_bIsWii)
-	{
-		SetDiskTypeWii();
-	}
-	else
-	{
-		SetDiskTypeGC();
-	}
-
-	m_diskHeaderInfo = new SDiskHeaderInfo();
-
-	// Don't load the dol if we've no apploader...
-	if (SetApploader(_rApploader))
-		SetDOL(_rDOL);
-
-	BuildFST();
-}
-
-CVolumeDirectory::~CVolumeDirectory()
-{
-	delete[] m_FSTData;
-	m_FSTData = NULL;
-
-	delete[] m_diskHeader;
-	m_diskHeader = NULL;
-
-	delete m_diskHeaderInfo;
-	m_diskHeaderInfo = NULL;
-
-	delete[] m_DOL;
-	m_DOL = NULL;
-
-	delete[] m_apploader;
-	m_apploader = NULL;
-}
-
-bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory)
-{
-	std::string directoryName = ExtractDirectoryName(_rDirectory);
-	return File::IsDirectory(directoryName);
-}
-
-bool CVolumeDirectory::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
-{
-	return false;
-}
-
-bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
-{
-	// header
-	if(_Offset < DISKHEADERINFO_ADDRESS)
-	{
-		WriteToBuffer(DISKHEADER_ADDRESS, DISKHEADERINFO_ADDRESS, m_diskHeader, _Offset, _Length, _pBuffer);
-	}
-	// header info
-	if(_Offset >= DISKHEADERINFO_ADDRESS && _Offset < APPLOADER_ADDRESS)
-	{
-		WriteToBuffer(DISKHEADERINFO_ADDRESS, sizeof(m_diskHeaderInfo), (u8*)m_diskHeaderInfo, _Offset, _Length, _pBuffer);
-	}
-	// apploader
-	if(_Offset >= APPLOADER_ADDRESS && _Offset < APPLOADER_ADDRESS + m_apploaderSize)
-	{
-		WriteToBuffer(APPLOADER_ADDRESS, m_apploaderSize, m_apploader, _Offset, _Length, _pBuffer);
-	}
-	// dol
-	if(_Offset >= DOL_ADDRESS && _Offset < DOL_ADDRESS + m_DOLSize)
-	{
-		WriteToBuffer(DOL_ADDRESS, m_DOLSize, m_DOL, _Offset, _Length, _pBuffer);
-	}
-	// fst
-	if(_Offset >= FST_ADDRESS && _Offset < m_dataStartAddress)
-	{
-		WriteToBuffer(FST_ADDRESS, m_fstSize, m_FSTData, _Offset, _Length, _pBuffer);
-	}
-	
-	if(m_virtualDisk.size() == 0)
-		return true;
-
-	// Determine which file the offset refers to
-	std::map<u64, std::string>::const_iterator fileIter = m_virtualDisk.lower_bound(_Offset);
-	if(fileIter->first > _Offset && fileIter != m_virtualDisk.begin())
-		--fileIter;
-
-	// zero fill to start of file data
-	PadToAddress(fileIter->first, _Offset, _Length, _pBuffer);
-
-	while(fileIter != m_virtualDisk.end() && _Length > 0)
-	{	
-		_dbg_assert_(DVDINTERFACE, fileIter->first <= _Offset);
-		u64 fileOffset = _Offset - fileIter->first;
-
-		PlainFileReader* reader = PlainFileReader::Create(fileIter->second.c_str());		
-		if(reader == NULL)
-			return false;
-
-		u64 fileSize = reader->GetDataSize();
-		
-		if(fileOffset < fileSize)
-		{
-			u64 fileBytes = fileSize - fileOffset;
-			if(_Length < fileBytes)
-				fileBytes = _Length;
-
-			if(!reader->Read(fileOffset, fileBytes, _pBuffer))
-				return false;
-
-			_Length -= fileBytes;
-			_pBuffer += fileBytes;
-			_Offset += fileBytes;
-		}
-
-		++fileIter;
-
-		if(fileIter != m_virtualDisk.end())
-		{
-			_dbg_assert_(DVDINTERFACE, fileIter->first >= _Offset);
-			PadToAddress(fileIter->first, _Offset, _Length, _pBuffer);
-		}
-
-		delete reader;
-	}
-	
-	return true;
-}
-
-std::string CVolumeDirectory::GetUniqueID() const
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-	
-	char buffer[7];
-	memcpy(buffer, m_diskHeader, 6);
-	buffer[6] = 0;
-
-	std::string id = buffer;
-	return id;
-}
-
-void CVolumeDirectory::SetUniqueID(std::string _ID)
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-
-	u32 length = (u32)_ID.length();
-	if(length > 6)
-		length = 6;
-
-	memcpy(m_diskHeader, _ID.c_str(), length);
-}
-
-IVolume::ECountry CVolumeDirectory::GetCountry() const
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-	
-	u8 CountryCode = m_diskHeader[3];
-
-	return CountrySwitch(CountryCode);
-}
-
-std::string CVolumeDirectory::GetMakerID() const
-{
-	return "VOID";
-}
-
-std::vector<std::string> CVolumeDirectory::GetNames() const
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-	return std::vector<std::string>(1, (char*)(m_diskHeader + 0x20));
-}
-
-void CVolumeDirectory::SetName(std::string _Name)
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-
-	u32 length = (u32)_Name.length();
-	if(length > MAX_NAME_LENGTH)
-		length = MAX_NAME_LENGTH;
-
-	memcpy(m_diskHeader + 0x20, _Name.c_str(), length);
-	m_diskHeader[length + 0x20] = 0;
-}
-
-u32 CVolumeDirectory::GetFSTSize() const
-{
-	return 0;
-}
-
-std::string CVolumeDirectory::GetApploaderDate() const
-{
-	return "VOID";
-}
-
-u64 CVolumeDirectory::GetSize() const
-{
-	return 0;
-}
-
-u64 CVolumeDirectory::GetRawSize() const
-{
-	return GetSize();
-}
-
-std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirectory)
-{
-	std::string directoryName = _rDirectory;
-
-	size_t lastSep = directoryName.find_last_of(DIR_SEP_CHR);
-
-	if(lastSep != directoryName.size() - 1)
-	{
-		// TODO: This assumes that file names will always have a dot in them
-		//	   and directory names never will; both assumptions are often
-		//	   right but in general wrong.
-		size_t extensionStart = directoryName.find_last_of('.');
-		if(extensionStart != std::string::npos && extensionStart > lastSep)
-		{
-			directoryName.resize(lastSep);
-		}
-	}
-	else
-	{
-		directoryName.resize(lastSep);
-	}
-
-	return directoryName;
-}
-
-void CVolumeDirectory::SetDiskTypeWii()
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-
-	m_diskHeader[0x18] = 0x5d;
-	m_diskHeader[0x19] = 0x1c;
-	m_diskHeader[0x1a] = 0x9e;
-	m_diskHeader[0x1b] = 0xa3;	
-	memset(m_diskHeader + 0x1c, 0, 4);
-
-	m_addressShift = 2;
-}
-
-void CVolumeDirectory::SetDiskTypeGC()
-{
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-
-	memset(m_diskHeader + 0x18, 0, 4);
-	m_diskHeader[0x1c] = 0xc2;
-	m_diskHeader[0x1d] = 0x33;
-	m_diskHeader[0x1e] = 0x9f;
-	m_diskHeader[0x1f] = 0x3d;
-
-	m_addressShift = 0;
-}
-
-bool CVolumeDirectory::SetApploader(const std::string& _rApploader)
-{
-	if (!_rApploader.empty())
-	{
-		std::string data;
-		if (!File::ReadFileToString(false, _rApploader.c_str(), data))
-		{
-			PanicAlertT("Apploader unable to load from file");
-			return false;
-		}
-		m_apploaderSize = 0x20 + Common::swap32(*(u32*)&data.data()[0x14]) + Common::swap32(*(u32*)&data.data()[0x18]);
-		if (m_apploaderSize != data.size())
-		{
-			PanicAlertT("Apploader is the wrong size...is it really an apploader?");
-			return false;
-		}
-		m_apploader = new u8[m_apploaderSize];
-		copy(data.begin(), data.end(), m_apploader);
-
-		// 32byte aligned (plus 0x20 padding)
-		DOL_ADDRESS = ROUND_UP(APPLOADER_ADDRESS + m_apploaderSize + 0x20, 0x20ull);
-		return true;
-	}
-	else
-	{
-		m_apploaderSize = 0x20;
-		m_apploader = new u8[m_apploaderSize];
-		// Make sure BS2 HLE doesn't try to run the apploader
-		*(u32*)&m_apploader[0x10] = (u32)-1;
-		return false;
-	}
-}
-
-void CVolumeDirectory::SetDOL(const std::string& _rDOL)
-{
-	if (!_rDOL.empty())
-	{
-		std::string data;
-		File::ReadFileToString(false, _rDOL.c_str(), data);
-		m_DOLSize = data.size();
-		m_DOL = new u8[m_DOLSize];
-		copy(data.begin(), data.end(), m_DOL);
-
-		Write32((u32)(DOL_ADDRESS >> m_addressShift), 0x0420, m_diskHeader);
-
-		// 32byte aligned (plus 0x20 padding)
-		FST_ADDRESS = ROUND_UP(DOL_ADDRESS + m_DOLSize + 0x20, 0x20ull);
-	}
-}
-
-void CVolumeDirectory::BuildFST()
-{
-	if(m_FSTData)
-	{
-		delete m_FSTData;
-	}
-
-	File::FSTEntry rootEntry;
-
-	// read data from physical disk to rootEntry
-	u32 totalEntries = AddDirectoryEntries(m_rootDirectory, rootEntry) + 1;
-
-	m_fstNameOffset = totalEntries * ENTRY_SIZE;	// offset in FST nameTable
-	m_fstSize = m_fstNameOffset + m_totalNameSize;
-	m_FSTData = new u8[(u32)m_fstSize];
-
-	// if FST hasn't been assigned (ie no apploader/dol setup), set to default
-	if (FST_ADDRESS == 0)
-		FST_ADDRESS = APPLOADER_ADDRESS + 0x2000;
-
-	// 4 byte aligned start of data on disk
-	m_dataStartAddress = ROUND_UP(FST_ADDRESS + m_fstSize, 0x8000ull);
-	u64 curDataAddress = m_dataStartAddress;
-
-	u32 fstOffset = 0;		// offset within FST data
-	u32 nameOffset = 0;		// offset within name table
-	u32 rootOffset = 0;		// offset of root of FST
-
-	// write root entry
-	WriteEntryData(fstOffset, DIRECTORY_ENTRY, 0, 0, totalEntries);
-
-	for(std::vector<File::FSTEntry>::iterator iter = rootEntry.children.begin(); iter != rootEntry.children.end(); ++iter)
-	{
-		WriteEntry(*iter, fstOffset, nameOffset, curDataAddress, rootOffset);
-	}
-
-	// overflow check
-	_dbg_assert_(DVDINTERFACE, nameOffset == m_totalNameSize);
-
-	// write FST size and location
-	_dbg_assert_(DVDINTERFACE, m_diskHeader);
-	Write32((u32)(FST_ADDRESS >> m_addressShift), 0x0424, m_diskHeader);
-	Write32((u32)(m_fstSize >> m_addressShift), 0x0428, m_diskHeader);
-	Write32((u32)(m_fstSize >> m_addressShift), 0x042c, m_diskHeader);
-}
-
-void CVolumeDirectory::WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, u8* _Src,
-									 u64& _Address, u64& _Length, u8*& _pBuffer) const
-{
-	if(_Length == 0)
-		return;
-
-	_dbg_assert_(DVDINTERFACE, _Address >= _SrcStartAddress);
-
-	u64 srcOffset = _Address - _SrcStartAddress;
-
-	if(srcOffset < _SrcLength)
-	{
-		u64 srcBytes = _SrcLength - srcOffset;
-		if(_Length < srcBytes)
-			srcBytes = _Length;
-
-		memcpy(_pBuffer, _Src + srcOffset, (size_t)srcBytes);
-
-		_Length -= srcBytes;
-		_pBuffer += srcBytes;
-		_Address += srcBytes;
-	}	
-}
-
-void CVolumeDirectory::PadToAddress(u64 _StartAddress, u64& _Address, u64& _Length, u8*& _pBuffer) const
-{
-	if(_StartAddress <= _Address)
-		return;
-
-	u64 padBytes = _StartAddress - _Address;
-	if(padBytes > _Length)
-		padBytes = _Length;
-
-	if(_Length > 0)
-	{
-		memset(_pBuffer, 0, (size_t)padBytes);
-		_Length -= padBytes;
-		_pBuffer += padBytes;
-		_Address += padBytes;
-	}
-}
-
-void CVolumeDirectory::Write32(u32 data, u32 offset, u8* buffer)
-{
-	buffer[offset++] = (data >> 24);
-	buffer[offset++] = (data >> 16) & 0xff;
-	buffer[offset++] = (data >> 8) & 0xff;
-	buffer[offset] = (data) & 0xff;
-}
-
-void CVolumeDirectory::WriteEntryData(u32& entryOffset, u8 type, u32 nameOffset, u64 dataOffset, u32 length)
-{
-	m_FSTData[entryOffset++] = type;
-
-	m_FSTData[entryOffset++] = (nameOffset >> 16) & 0xff;
-	m_FSTData[entryOffset++] = (nameOffset >> 8) & 0xff;
-	m_FSTData[entryOffset++] = (nameOffset) & 0xff;
-
-	Write32((u32)(dataOffset >> m_addressShift), entryOffset, m_FSTData);
-	entryOffset += 4;
-
-	Write32((u32)length, entryOffset, m_FSTData);
-	entryOffset += 4;
-}
-
-void CVolumeDirectory::WriteEntryName(u32& nameOffset, const std::string& name)
-{
-	strncpy((char*)(m_FSTData + nameOffset + m_fstNameOffset), name.c_str(), name.length() + 1);
-	
-	nameOffset += (u32)(name.length() + 1);
-}
-
-void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u32& nameOffset, u64& dataOffset, u32 parentEntryNum)
-{	
-	if(entry.isDirectory)
-	{
-		u32 myOffset = fstOffset;
-		u32 myEntryNum = myOffset / ENTRY_SIZE;
-		WriteEntryData(fstOffset, DIRECTORY_ENTRY, nameOffset, parentEntryNum, (u32)(myEntryNum + entry.size + 1));
-		WriteEntryName(nameOffset, entry.virtualName);
-
-		for(std::vector<File::FSTEntry>::const_iterator iter = entry.children.begin(); iter != entry.children.end(); ++iter)
-		{
-			WriteEntry(*iter, fstOffset, nameOffset, dataOffset, myEntryNum);
-		}
-	}
-	else
-	{
-		// put entry in FST
-		WriteEntryData(fstOffset, FILE_ENTRY, nameOffset, dataOffset, (u32)entry.size);
-		WriteEntryName(nameOffset, entry.virtualName);
-
-		// write entry to virtual disk
-		_dbg_assert_(DVDINTERFACE, m_virtualDisk.find(dataOffset) == m_virtualDisk.end());
-		m_virtualDisk.insert(make_pair(dataOffset, entry.physicalName));
-
-		// 4 byte aligned
-		dataOffset = ROUND_UP(dataOffset + entry.size, 0x8000ull);
-	}
-}
-
-static u32 ComputeNameSize(const File::FSTEntry& parentEntry)
-{
-	u32 nameSize = 0;
-	const std::vector<File::FSTEntry>& children = parentEntry.children;
-	for (std::vector<File::FSTEntry>::const_iterator it = children.begin();
-		it != children.end(); ++it)
-	{
-		const File::FSTEntry& entry = *it;
-		if (entry.isDirectory)
-		{
-			nameSize += ComputeNameSize(entry);
-		}
-		nameSize += (u32)entry.virtualName.length() + 1;
-	}
-	return nameSize;
-}
-
-u32 CVolumeDirectory::AddDirectoryEntries(const std::string& _Directory, File::FSTEntry& parentEntry)
-{
-	u32 foundEntries = ScanDirectoryTree(_Directory, parentEntry);
-	m_totalNameSize += ComputeNameSize(parentEntry);
-	return foundEntries;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.h b/Source/Core/DiscIO/Src/VolumeDirectory.h
deleted file mode 100644
index e37eb9275c..0000000000
--- a/Source/Core/DiscIO/Src/VolumeDirectory.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VOLUME_DIRECTORY
-#define _VOLUME_DIRECTORY
-
-#include "Volume.h"
-#include "Common.h"
-#include "FileUtil.h"
-#include <string>
-#include <map>
-
-//
-// --- this volume type is used for reading files directly from the hard drive ---
-//
-
-namespace DiscIO
-{
-
-class CVolumeDirectory : public IVolume
-{
-public:
-
-	CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
-		const std::string& _rApploader = "", const std::string& _rDOL = "");
-
-	~CVolumeDirectory();
-
-	static bool IsValidDirectory(const std::string& _rDirectory);
-
-	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-
-	std::string GetUniqueID() const;
-	void SetUniqueID(std::string _ID);
-
-	std::string GetMakerID() const;
-
-	std::vector<std::string> GetNames() const;
-	void SetName(std::string);
-
-	u32 GetFSTSize() const;
-
-	std::string GetApploaderDate() const;
-
-	ECountry GetCountry() const;
-
-	u64 GetSize() const;
-	u64 GetRawSize() const;
-
-	void BuildFST();
-
-private:
-	static std::string ExtractDirectoryName(const std::string& _rDirectory);
-
-	void SetDiskTypeWii();
-	void SetDiskTypeGC();
-
-	bool SetApploader(const std::string& _rApploader);
-
-	void SetDOL(const std::string& _rDOL);
-
-	// writing to read buffer
-	void WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, u8* _Src,
-					   u64& _Address, u64& _Length, u8*& _pBuffer) const;
-
-	void PadToAddress(u64 _StartAddress, u64& _Address, u64& _Length, u8*& _pBuffer) const;
-
-	void Write32(u32 data, u32 offset, u8* buffer);
-
-	// FST creation
-	void WriteEntryData(u32& entryOffset, u8 type, u32 nameOffset, u64 dataOffset, u32 length);
-	void WriteEntryName(u32& nameOffset, const std::string& name);
-	void WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u32& nameOffset, u64& dataOffset, u32 parentEntryNum);
-
-	// returns number of entries found in _Directory
-	u32 AddDirectoryEntries(const std::string& _Directory, File::FSTEntry& parentEntry);
-
-	std::string m_rootDirectory;
-
-	std::map<u64, std::string> m_virtualDisk;
-
-	u32 m_totalNameSize;
-
-	// gc has no shift, wii has 2 bit shift
-	u32 m_addressShift;
-
-	// first address on disk containing file data
-	u64 m_dataStartAddress;
-
-	u64 m_fstNameOffset;
-	u64 m_fstSize;
-	u8* m_FSTData;
-
-	u8* m_diskHeader;
-
-	#pragma pack(push, 1)
-	struct SDiskHeaderInfo 
-	{
-		u32 debug_mntr_size;
-		u32 simulated_mem_size;
-		u32 arg_offset;
-		u32 debug_flag;
-		u32 track_location;
-		u32 track_size;
-		u32 countrycode;
-		u32 unknown;
-		u32 unknown2;
-
-		// All the data is byteswapped
-		SDiskHeaderInfo() {
-			debug_mntr_size = 0;
-			simulated_mem_size = 0;
-			arg_offset = 0;
-			debug_flag = 0;
-			track_location = 0;
-			track_size = 0;
-			countrycode = 0;
-			unknown = 0;
-			unknown2 = 0;
-		}
-	};
-	#pragma pack(pop)
-	SDiskHeaderInfo* m_diskHeaderInfo;
-
-	u64 m_apploaderSize;
-	u8* m_apploader;
-
-	u64 m_DOLSize;
-	u8* m_DOL;
-
-	static const u8 ENTRY_SIZE = 0x0c;
-	static const u8 FILE_ENTRY = 0;
-	static const u8 DIRECTORY_ENTRY = 1;
-	static const u64 DISKHEADER_ADDRESS = 0;
-	static const u64 DISKHEADERINFO_ADDRESS = 0x440;
-	static const u64 APPLOADER_ADDRESS = 0x2440;
-	static const u32 MAX_NAME_LENGTH = 0x3df;
-	u64 FST_ADDRESS;
-	u64 DOL_ADDRESS;
-};
-
-} // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
deleted file mode 100644
index ba858467fc..0000000000
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
-
-#include "VolumeGC.h"
-#include "StringUtil.h"
-#include "FileMonitor.h"
-
-namespace DiscIO
-{
-CVolumeGC::CVolumeGC(IBlobReader* _pReader)
-	: m_pReader(_pReader)
-{}
-
-CVolumeGC::~CVolumeGC()
-{
-	delete m_pReader;
-	m_pReader = NULL; // I don't think this makes any difference, but anyway
-}
-
-bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
-{
-	if (m_pReader == NULL)
-		return false;
-
-	FileMon::FindFilename(_Offset);
-
-	return m_pReader->Read(_Offset, _Length, _pBuffer);
-}
-
-bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const
-{
-	return Read(_Offset, _Length, _pBuffer);
-}
-
-std::string CVolumeGC::GetUniqueID() const
-{
-	static const std::string NO_UID("NO_UID");
-	if (m_pReader == NULL)
-		return NO_UID;
-
-	char ID[7];
-
-	if (!Read(0, sizeof(ID), reinterpret_cast<u8*>(ID)))
-	{
-		PanicAlertT("Failed to read unique ID from disc image");
-		return NO_UID;
-	}
-
-	ID[6] = '\0';
-
-	return ID;
-}
-
-IVolume::ECountry CVolumeGC::GetCountry() const
-{
-	if (!m_pReader)
-		return COUNTRY_UNKNOWN;
-
-	u8 CountryCode;
-	m_pReader->Read(3, 1, &CountryCode);
-
-	return CountrySwitch(CountryCode);
-}
-
-std::string CVolumeGC::GetMakerID() const
-{
-	if (m_pReader == NULL)
-		return std::string();
-
-	char makerID[3];
-	if (!Read(0x4, 0x2, (u8*)&makerID))
-		return std::string();
-	makerID[2] = '\0';
-
-	return makerID;
-}
-
-int CVolumeGC::GetRevision() const
-{
-	if (!m_pReader)
-		return 0;
-
-	u8 Revision;
-	if (!Read(7, 1, &Revision))
-		return 0;
-
-	return Revision;
-}
-
-std::vector<std::string> CVolumeGC::GetNames() const
-{
-	std::vector<std::string> names;
-	
-	auto const string_decoder = GetStringDecoder(GetCountry());
-
-	char name[0x60 + 1] = {};
-	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)name))
-		names.push_back(string_decoder(name));
-
-	return names;
-}
-
-u32 CVolumeGC::GetFSTSize() const
-{
-	if (m_pReader == NULL)
-		return 0;
-
-	u32 size;
-	if (!Read(0x428, 0x4, (u8*)&size))
-		return 0;
-
-	return Common::swap32(size);
-}
-
-std::string CVolumeGC::GetApploaderDate() const
-{
-	if (m_pReader == NULL)
-		return std::string();
-
-	char date[16];
-	if (!Read(0x2440, 0x10, (u8*)&date))
-		return std::string();
-	// Should be 0 already, but just in case
-	date[10] = '\0';
-
-	return date;
-}
-
-u64 CVolumeGC::GetSize() const
-{
-	if (m_pReader)
-		return m_pReader->GetDataSize();
-	else
-		return 0;
-}
-
-u64 CVolumeGC::GetRawSize() const
-{
-	if (m_pReader)
-		return m_pReader->GetRawSize();
-	else
-		return 0;
-}
-
-bool CVolumeGC::IsDiscTwo() const
-{
-	bool discTwo;
-	Read(6,1, (u8*) &discTwo);
-	return discTwo;
-}
-
-auto CVolumeGC::GetStringDecoder(ECountry country) -> StringDecoder
-{
-	return (COUNTRY_JAPAN == country || COUNTRY_TAIWAN == country) ?
-		SHIFTJISToUTF8 : CP1252ToUTF8;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/VolumeGC.h b/Source/Core/DiscIO/Src/VolumeGC.h
deleted file mode 100644
index fcc7aec611..0000000000
--- a/Source/Core/DiscIO/Src/VolumeGC.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VOLUME_GC
-#define _VOLUME_GC
-
-#include "Volume.h"
-#include "Blob.h"
-
-// --- this volume type is used for GC disc images ---
-
-namespace DiscIO
-{
-class CVolumeGC	: public IVolume
-{
-public:
-	CVolumeGC(IBlobReader* _pReader);
-	~CVolumeGC();
-	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	std::string GetUniqueID() const;
-	std::string GetMakerID() const;
-	int GetRevision() const;
-	std::vector<std::string> GetNames() const;
-	u32 GetFSTSize() const;
-	std::string GetApploaderDate() const;
-	ECountry GetCountry() const;
-	u64 GetSize() const;
-	u64 GetRawSize() const;
-	bool IsDiscTwo() const;
-	
-	typedef std::string(*StringDecoder)(const std::string&);
-	
-	static StringDecoder GetStringDecoder(ECountry country);
-
-private:
-	IBlobReader* m_pReader;
-};
-
-} // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp
deleted file mode 100644
index e3356ad5b4..0000000000
--- a/Source/Core/DiscIO/Src/VolumeWad.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-#include <math.h>
-
-#include "VolumeWad.h"
-#include "StringUtil.h"
-#include "MathUtil.h"
-
-#define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40)
-
-namespace DiscIO
-{
-CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
-	: m_pReader(_pReader), OpeningBnrOffset(0), hdr_size(0), cert_size(0), tick_size(0), tmd_size(0), data_size(0)
-{
-	Read(0x00, 4, (u8*)&hdr_size);
-	Read(0x08, 4, (u8*)&cert_size);
-	Read(0x10, 4, (u8*)&tick_size);
-	Read(0x14, 4, (u8*)&tmd_size);
-	Read(0x18, 4, (u8*)&data_size);
-
-	u32 TmdOffset = ALIGN_40(hdr_size) + ALIGN_40(cert_size) + ALIGN_40(tick_size);
-	OpeningBnrOffset = TmdOffset + ALIGN_40(tmd_size) + ALIGN_40(data_size);
-	// read the last digit of the titleID in the ticket
-	Read(TmdOffset + 0x0193, 1, &m_Country);
-	if (m_Country == 2) // SYSMENU
-	{
-		u16 titlever = 0;
-		Read(TmdOffset + 0x01dc, 2, (u8*)&titlever);
-		m_Country = GetSysMenuRegion(Common::swap16(titlever));
-	}
-}
-
-CVolumeWAD::~CVolumeWAD()
-{
-	delete m_pReader;
-}
-
-bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
-{
-	if (m_pReader == NULL)
-		return false;
-
-	return m_pReader->Read(_Offset, _Length, _pBuffer);
-}
-
-IVolume::ECountry CVolumeWAD::GetCountry() const
-{
-	if (!m_pReader)
-		return COUNTRY_UNKNOWN;
-
-	return CountrySwitch(m_Country);
-}
-
-std::string CVolumeWAD::GetUniqueID() const
-{
-	std::string temp = GetMakerID();
-	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
-
-	char GameCode[8];
-	if(!Read(Offset + 0x01E0, 4, (u8*)GameCode))
-		return "0";
-
-	GameCode[4] = temp.at(0);
-	GameCode[5] = temp.at(1);
-	GameCode[6] = 0;
-
-	return GameCode;
-}
-
-std::string CVolumeWAD::GetMakerID() const
-{
-	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size) + ALIGN_40(tick_size);
-
-	char temp[3] = {1};
-	// Some weird channels use 0x0000 in place of the MakerID, so we need a check there
-	if (!Read(0x198 + Offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
-		return "00";
-
-	temp[2] = 0;
-
-	return temp;
-}
-
-bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
-{
-	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
-
-	if(!Read(Offset + 0x01DC, 8, _pBuffer))
-		return false;
-
-	return true;
-}
-
-std::vector<std::string> CVolumeWAD::GetNames() const
-{
-	std::vector<std::string> names;
-
-	u32 footer_size;
-	if (!Read(0x1C, 4, (u8*)&footer_size))
-	{
-		return names;
-	}
-	
-	footer_size = Common::swap32(footer_size);
-	
-	//Japanese, English, German, French, Spanish, Italian, Dutch, unknown, unknown, Korean
-	for (int i = 0; i != 10; ++i)
-	{
-		static const u32 string_length = 42;
-		static const u32 bytes_length = string_length * sizeof(u16);
-		
-		u16 temp[string_length];
-
-		if (footer_size < 0xF1 || !Read(0x9C + (i * bytes_length) + OpeningBnrOffset, bytes_length, (u8*)&temp))
-		{
-			names.push_back("");
-		}
-		else
-		{
-			std::wstring out_temp;
-			out_temp.resize(string_length);
-			std::transform(temp, temp + out_temp.size(), out_temp.begin(), (u16(&)(u16))Common::swap16);
-			out_temp.erase(std::find(out_temp.begin(), out_temp.end(), 0x00), out_temp.end());
-			
-			names.push_back(UTF16ToUTF8(out_temp));
-		}
-	}
-
-	return names;
-}
-
-u64 CVolumeWAD::GetSize() const
-{
-	if (m_pReader)
-		return m_pReader->GetDataSize();
-	else
-		return 0;
-}
-
-u64 CVolumeWAD::GetRawSize() const
-{
-	if (m_pReader)
-		return m_pReader->GetRawSize();
-	else
-		return 0;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/VolumeWad.h b/Source/Core/DiscIO/Src/VolumeWad.h
deleted file mode 100644
index 59edf79cd4..0000000000
--- a/Source/Core/DiscIO/Src/VolumeWad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VOLUME_WAD
-#define _VOLUME_WAD
-
-#include "Volume.h"
-#include "Blob.h"
-#include "NANDContentLoader.h"
-
-// --- this volume type is used for Wad files ---
-// Some of this code might look redundant with the CNANDContentLoader class, however,
-// We do not do any decryption here, we do raw read, so things are -Faster- 
-
-namespace DiscIO
-{
-class CVolumeWAD : public IVolume
-{
-public:
-	CVolumeWAD(IBlobReader* _pReader);
-	~CVolumeWAD();
-	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const { return false; }
-	bool GetTitleID(u8* _pBuffer) const;
-	std::string GetUniqueID() const;
-	std::string GetMakerID() const;
-	std::vector<std::string> GetNames() const;
-	u32 GetFSTSize() const					{ return 0; }
-	std::string GetApploaderDate() const	{ return "0"; }	
-	ECountry GetCountry() const;
-	u64 GetSize() const;
-	u64 GetRawSize() const;
-
-private:
-	IBlobReader* m_pReader;
-	u32 OpeningBnrOffset, hdr_size, cert_size, tick_size, tmd_size, data_size;
-	u8 m_Country;
-};
-
-} // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
deleted file mode 100644
index 51ee3d575a..0000000000
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VolumeWiiCrypted.h"
-#include "VolumeGC.h"
-#include "StringUtil.h"
-#include <polarssl/sha1.h>
-
-namespace DiscIO
-{
-
-CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
-									 const unsigned char* _pVolumeKey)
-	: m_pReader(_pReader),
-	m_pBuffer(0),
-	m_VolumeOffset(_VolumeOffset),
-	dataOffset(0x20000),
-	m_LastDecryptedBlockOffset(-1)
-{
-	AES_set_decrypt_key(_pVolumeKey, 128, &m_AES_KEY);
-	m_pBuffer = new u8[0x8000];
-}
-
-
-CVolumeWiiCrypted::~CVolumeWiiCrypted()
-{
-	delete m_pReader; // is this really our responsibility?
-	m_pReader = NULL;
-	delete[] m_pBuffer;
-	m_pBuffer = NULL;
-}
-
-bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
-{
-	// HyperIris: hack for DVDLowUnencryptedRead
-	// Medal Of Honor Heroes 2 read this DVD offset for PartitionsInfo
-	// and, PartitionsInfo is not encrypted, let's read it directly.
-	if (!m_pReader->Read(_Offset, _Length, _pBuffer))
-	{
-		return(false);
-	}
-	return true;
-}
-
-bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
-{
-	if (m_pReader == NULL)
-	{
-		return(false);
-	}
-
-	while (_Length > 0)
-	{
-		static unsigned char IV[16];
-
-		// math block offset
-		u64 Block  = _ReadOffset / 0x7C00;
-		u64 Offset = _ReadOffset % 0x7C00;
-
-		// read current block
-		if (!m_pReader->Read(m_VolumeOffset + dataOffset + Block * 0x8000, 0x8000, m_pBuffer))
-		{
-			return(false);
-		}
-
-		if (m_LastDecryptedBlockOffset != Block)
-		{
-			memcpy(IV, m_pBuffer + 0x3d0, 16);
-			AES_cbc_encrypt(m_pBuffer + 0x400, m_LastDecryptedBlock, 0x7C00, &m_AES_KEY, IV, AES_DECRYPT);
-
-			m_LastDecryptedBlockOffset = Block;
-		}
-
-		// copy the encrypted data
-		u64 MaxSizeToCopy = 0x7C00 - Offset;
-		u64 CopySize = (_Length > MaxSizeToCopy) ? MaxSizeToCopy : _Length;
-		memcpy(_pBuffer, &m_LastDecryptedBlock[Offset], (size_t)CopySize);
-
-		// increase buffers
-		_Length -= CopySize;
-		_pBuffer	+= CopySize;
-		_ReadOffset += CopySize;
-	}
-
-	return(true);
-}
-
-bool CVolumeWiiCrypted::GetTitleID(u8* _pBuffer) const
-{
-	// Tik is at m_VolumeOffset size 0x2A4
-	// TitleID offset in tik is 0x1DC
-	return RAWRead(m_VolumeOffset + 0x1DC, 8, _pBuffer);
-}
-void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
-{
-	*_sz = 0;
-	u32 tmdSz,
-		tmdAddr;
-
-	RAWRead(m_VolumeOffset + 0x2a4, sizeof(u32), (u8*)&tmdSz);
-	RAWRead(m_VolumeOffset + 0x2a8, sizeof(u32), (u8*)&tmdAddr);
-	tmdSz = Common::swap32(tmdSz);
-	tmdAddr = Common::swap32(tmdAddr) << 2;
-	RAWRead(m_VolumeOffset + tmdAddr, tmdSz, _pBuffer);
-	*_sz = tmdSz;
-}
-	
-std::string CVolumeWiiCrypted::GetUniqueID() const
-{
-	if (m_pReader == NULL)
-	{
-		return std::string();
-	}
-
-	char ID[7];
-
-	if (!Read(0, 6, (u8*)ID))
-	{
-		return std::string();
-	}
-
-	ID[6] = '\0';
-
-	return ID;
-}
-
-
-IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
-{
-	if (!m_pReader)
-		return COUNTRY_UNKNOWN;
-
-	u8 CountryCode;
-	m_pReader->Read(3, 1, &CountryCode);
-
-	return CountrySwitch(CountryCode);
-}
-
-std::string CVolumeWiiCrypted::GetMakerID() const
-{
-	if (m_pReader == NULL)
-	{
-		return std::string();
-	}
-
-	char makerID[3];
-
-	if (!Read(0x4, 0x2, (u8*)&makerID))
-	{
-		return std::string();
-	}
-	
-	makerID[2] = '\0';
-
-	return makerID;
-}
-
-std::vector<std::string> CVolumeWiiCrypted::GetNames() const
-{
-	std::vector<std::string> names;
-	
-	auto const string_decoder = CVolumeGC::GetStringDecoder(GetCountry());
-
-	char name[0xFF] = {};
-	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)&name))
-		names.push_back(string_decoder(name));
-
-	return names;
-}
-
-u32 CVolumeWiiCrypted::GetFSTSize() const
-{
-	if (m_pReader == NULL)
-	{
-		return 0;
-	}
-
-	u32 size;
-
-	if (!Read(0x428, 0x4, (u8*)&size))
-	{
-		return 0;
-	}
-
-	return size;
-}
-
-std::string CVolumeWiiCrypted::GetApploaderDate() const
-{
-	if (m_pReader == NULL)
-	{
-		return std::string();
-	}
-
-	char date[16];
-
-	if (!Read(0x2440, 0x10, (u8*)&date))
-	{
-		return std::string();
-	}
-	
-	date[10] = '\0';
-
-	return date;
-}
-
-u64 CVolumeWiiCrypted::GetSize() const
-{
-	if (m_pReader)
-	{
-		return m_pReader->GetDataSize();
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-u64 CVolumeWiiCrypted::GetRawSize() const
-{
-	if (m_pReader)
-	{
-		return m_pReader->GetRawSize();
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-bool CVolumeWiiCrypted::CheckIntegrity() const
-{
-	// Get partition data size
-	u32 partSizeDiv4;
-	RAWRead(m_VolumeOffset + 0x2BC, 4, (u8*)&partSizeDiv4);
-	u64 partDataSize = (u64)Common::swap32(partSizeDiv4) * 4;
-
-	u32 nClusters = (u32)(partDataSize / 0x8000);
-	for (u32 clusterID = 0; clusterID < nClusters; ++clusterID)
-	{
-		u64 clusterOff = m_VolumeOffset + dataOffset + (u64)clusterID * 0x8000;
-
-		// Read and decrypt the cluster metadata
-		u8 clusterMDCrypted[0x400];
-		u8 clusterMD[0x400];
-		u8 IV[16] = { 0 };
-		if (!m_pReader->Read(clusterOff, 0x400, clusterMDCrypted))
-		{
-			NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read metadata", clusterID);
-			return false;
-		}
-		AES_cbc_encrypt(clusterMDCrypted, clusterMD, 0x400, &m_AES_KEY, IV, AES_DECRYPT);
-
-		// Some clusters have invalid data and metadata because they aren't
-		// meant to be read by the game (for example, holes between files). To
-		// try to avoid reporting errors because of these clusters, we check
-		// the 0x00 paddings in the metadata.
-		//
-		// This may cause some false negatives though: some bad clusters may be
-		// skipped because they are *too* bad and are not even recognized as
-		// valid clusters. To be improved.
-		bool meaningless = false;
-		for (u32 idx = 0x26C; idx < 0x280; ++idx)
-			if (clusterMD[idx] != 0)
-				meaningless = true;
-
-		if (meaningless)
-			continue;
-
-		u8 clusterData[0x7C00];
-		if (!Read((u64)clusterID * 0x7C00, 0x7C00, clusterData))
-		{
-			NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read data", clusterID);
-			return false;
-		}
-
-		for (u32 hashID = 0; hashID < 31; ++hashID)
-		{
-			u8 hash[20];
-
-			sha1(clusterData + hashID * 0x400, 0x400, hash);
-
-			// Note that we do not use strncmp here
-			if (memcmp(hash, clusterMD + hashID * 20, 20))
-			{
-				NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: hash %d is invalid", clusterID, hashID);
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
-
-} // namespace
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h b/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
deleted file mode 100644
index 457774628e..0000000000
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VOLUME_WII_CRYPTED
-#define _VOLUME_WII_CRYPTED
-
-#include "Volume.h"
-#include "Blob.h"
-#include "Crypto/aes.h"
-
-// --- this volume type is used for encrypted Wii images ---
-
-namespace DiscIO
-{
-class CVolumeWiiCrypted	: public IVolume
-{
-public:
-	CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, const unsigned char* _pVolumeKey);
-	~CVolumeWiiCrypted();
-	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
-	bool GetTitleID(u8* _pBuffer) const;
-	void GetTMD(u8* _pBuffer, u32* _sz) const;
-	std::string GetUniqueID() const;
-	std::string GetMakerID() const;
-	std::vector<std::string> GetNames() const;
-	u32 GetFSTSize() const;
-	std::string GetApploaderDate() const;
-	ECountry GetCountry() const;
-	u64 GetSize() const;
-	u64 GetRawSize() const;
-
-	bool SupportsIntegrityCheck() const { return true; }
-	bool CheckIntegrity() const;
-
-private:
-	IBlobReader* m_pReader;
-
-	u8* m_pBuffer;
-	AES_KEY m_AES_KEY;
-
-	u64 m_VolumeOffset;
-	u64 dataOffset;
-
-	mutable u64 m_LastDecryptedBlockOffset;
-	mutable unsigned char m_LastDecryptedBlock[0x8000];
-};
-
-} // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Src/WbfsBlob.cpp b/Source/Core/DiscIO/Src/WbfsBlob.cpp
deleted file mode 100644
index f1d5a2b76a..0000000000
--- a/Source/Core/DiscIO/Src/WbfsBlob.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "WbfsBlob.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-const u64 wii_sector_size = 0x8000;
-const u64 wii_sector_count = 143432 * 2;
-const u64 wii_sector_log2 = 15;
-const u64 wii_disc_header_size = 256;
-
-static inline u64 align(u64 value, u64 bounds)
-{
-	return (value + (bounds - 1)) & (~(bounds - 1));
-}
-
-WbfsFileReader::WbfsFileReader(const char* filename)
-	: m_total_files(0), m_size(0), m_wlba_table(0), m_good(true)
-{
-	if(!filename || (strlen(filename) < 4) || !OpenFiles(filename) || !ReadHeader())
-	{
-		m_good = false;
-		return;
-	}
-
-	// Grab disc info (assume slot 0, checked in ReadHeader())
-	m_wlba_table = new u16[m_blocks_per_disc];
-	m_files[0]->file.Seek(hd_sector_size + wii_disc_header_size /*+ i * m_disc_info_size*/, SEEK_SET);
-	m_files[0]->file.ReadBytes(m_wlba_table, m_blocks_per_disc * sizeof(u16));
-}
-
-WbfsFileReader::~WbfsFileReader()
-{
-	for(u32 i = 0; i != m_files.size(); ++ i)
-	{
-		delete m_files[i];
-	}
-
-	delete[] m_wlba_table;
-}
-
-bool WbfsFileReader::OpenFiles(const char* filename)
-{
-	m_total_files = 0;
-
-	while(true)
-	{
-		file_entry* new_entry = new file_entry;
-
-		// Replace last character with index (e.g. wbfs = wbf1)
-		std::string path = filename;
-		if(0 != m_total_files)
-		{
-			path[path.length() - 1] = '0' + m_total_files;
-		}
-
-		if(!new_entry->file.Open(path, "rb"))
-		{
-			delete new_entry;
-			return 0 != m_total_files;
-		}
-
-		new_entry->base_address = m_size;
-		new_entry->size = new_entry->file.GetSize();
-		m_size += new_entry->size;
-
-		m_total_files ++;
-		m_files.push_back(new_entry);
-	}
-}
-
-bool WbfsFileReader::ReadHeader()
-{
-	m_files[0]->file.Seek(4, SEEK_SET);
-
-	// Read hd size info
-	m_files[0]->file.ReadBytes(&hd_sector_count, 4);
-	hd_sector_count = Common::swap32(hd_sector_count);
-
-	m_files[0]->file.ReadBytes(&hd_sector_shift, 1);
-	hd_sector_size = 1ull << hd_sector_shift;
-
-	if(m_size != hd_sector_count * hd_sector_size)
-	{
-		//printf("File size doesn't match expected size\n");
-		return false;
-	}
-
-	// Read wbfs cluster info
-	m_files[0]->file.ReadBytes(&wbfs_sector_shift, 1);
-	wbfs_sector_size = 1ull << wbfs_sector_shift;
-	wbfs_sector_count = m_size / wbfs_sector_size;
-
-	if(wbfs_sector_size < wii_sector_size)
-	{
-		//Setting this too low would case a very large memory allocation
-		return false;
-	}
-
-	m_blocks_per_disc = (wii_sector_count * wii_sector_size) / wbfs_sector_size;
-	m_disc_info_size = align(wii_disc_header_size + m_blocks_per_disc * 2, hd_sector_size);
-
-	// Read disc table
-	m_files[0]->file.Seek(2, SEEK_CUR);
-	m_files[0]->file.ReadBytes(disc_table, 500);
-
-	if(0 == disc_table[0])
-	{
-		//printf("Game must be in 'slot 0'\n");
-		return false;
-	}
-
-	return true;
-}
-
-bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
-{
-	while(nbytes)
-	{
-		u64 read_size = 0;
-		File::IOFile& data_file = SeekToCluster(offset, &read_size);
-		read_size = (read_size > nbytes) ? nbytes : read_size;
-
-		data_file.ReadBytes(out_ptr, read_size);
-
-		out_ptr += read_size;
-		nbytes -= read_size;
-		offset += read_size;
-	}
-
-	return true;
-}
-
-File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
-{
-	u64 base_cluster = offset >> wbfs_sector_shift;
-	if(base_cluster < m_blocks_per_disc)
-	{	
-		u64 cluster_address = wbfs_sector_size * Common::swap16(m_wlba_table[base_cluster]);
-		u64 cluster_offset = offset & (wbfs_sector_size - 1);
-		u64 final_address = cluster_address + cluster_offset;
-
-		for(u32 i = 0; i != m_total_files; i ++)
-		{	
-			if(final_address < (m_files[i]->base_address + m_files[i]->size))
-			{
-				m_files[i]->file.Seek(final_address - m_files[i]->base_address, SEEK_SET);
-				if(available)
-				{
-					u64 till_end_of_file = m_files[i]->size - (final_address - m_files[i]->base_address);
-					u64 till_end_of_sector = wbfs_sector_size - cluster_offset;
-					*available = std::min(till_end_of_file, till_end_of_sector);
-				}
-
-				return m_files[i]->file;
-			}
-		}
-	}
-
-	PanicAlert("Read beyond end of disc");
-	m_files[0]->file.Seek(0, SEEK_SET);
-	return m_files[0]->file;
-}
-
-WbfsFileReader* WbfsFileReader::Create(const char* filename)
-{
-	WbfsFileReader* reader = new WbfsFileReader(filename);
-
-	if(reader->IsGood())
-	{
-		return reader;
-	}
-	else
-	{
-		delete reader;
-		return NULL;
-	}
-}
-
-bool IsWbfsBlob(const char* filename)
-{
-	File::IOFile f(filename, "rb");
-
-	u8 magic[4] = {0, 0, 0, 0};
-	f.ReadBytes(&magic, 4);
-
-	return	(magic[0] == 'W') && 
-			(magic[1] == 'B') &&
-			(magic[2] == 'F') &&
-			(magic[3] == 'S');
-}
-
-}  // namespace
diff --git a/Source/Core/DiscIO/Src/WbfsBlob.h b/Source/Core/DiscIO/Src/WbfsBlob.h
deleted file mode 100644
index c59eb84173..0000000000
--- a/Source/Core/DiscIO/Src/WbfsBlob.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WBFS_BLOB_H
-#define _WBFS_BLOB_H
-
-#include "Blob.h"
-#include "FileUtil.h"
-
-namespace DiscIO
-{
-
-struct wbfs_head_t;
-
-class WbfsFileReader : public IBlobReader
-{
-	WbfsFileReader(const char* filename);
-	~WbfsFileReader();
-
-	bool OpenFiles(const char* filename);	
-	bool ReadHeader();
-
-	File::IOFile& SeekToCluster(u64 offset, u64* available);
-	bool IsGood() {return m_good;}
-
-
-	struct file_entry
-	{
-		File::IOFile file;
-		u64 base_address;
-		u64 size;
-	};
-
-	std::vector<file_entry*> m_files;
-
-	u32 m_total_files;
-	u64 m_size;
-
-	u64 hd_sector_size;
-	u8 hd_sector_shift;
-	u32 hd_sector_count;
-
-	u64 wbfs_sector_size;
-	u8 wbfs_sector_shift;
-	u64 wbfs_sector_count;
-	u64 m_disc_info_size;
-
-	u8 disc_table[500];
-
-	u16* m_wlba_table;
-	u64 m_blocks_per_disc;
-
-	bool m_good;
-
-public:
-	static WbfsFileReader* Create(const char* filename);
-
-	u64 GetDataSize() const { return m_size; }
-	u64 GetRawSize() const { return m_size; }
-	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
-};
-
-bool IsWbfsBlob(const char* filename);
-
-
-}  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp
deleted file mode 100644
index ed58977670..0000000000
--- a/Source/Core/DiscIO/Src/WiiWad.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "NANDContentLoader.h"
-
-#include <algorithm>
-#include <cctype> 
-#include "MathUtil.h"
-#include "FileUtil.h"
-#include "Log.h"
-#include "WiiWad.h"
-
-namespace DiscIO
-{
-
-class CBlobBigEndianReader
-{
-public:
-	CBlobBigEndianReader(DiscIO::IBlobReader& _rReader) : m_rReader(_rReader) {}
-
-	u32 Read32(u64 _Offset)
-	{
-		u32 Temp;
-		m_rReader.Read(_Offset, 4, (u8*)&Temp);
-		return(Common::swap32(Temp));
-	}
-
-private:
-	DiscIO::IBlobReader& m_rReader;
-};
-
-WiiWAD::WiiWAD(const std::string& _rName)
-{
-	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-	if (pReader == NULL || File::IsDirectory(_rName))
-	{
-		m_Valid = false;
-		if(pReader) delete pReader;
-		return;
-	}
-
-	m_Valid = ParseWAD(*pReader);
-	delete pReader;
-}
-
-WiiWAD::~WiiWAD()
-{
-	if (m_Valid)
-	{
-		delete m_pCertificateChain;
-		delete m_pTicket;
-		delete m_pTMD;
-		delete m_pDataApp;
-		delete m_pFooter;
-	}
-}
-
-u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
-{
-	if (_Size > 0)
-	{
-		u8* pTmpBuffer = new u8[_Size];
-		_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
-
-		if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
-		{
-			ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
-			PanicAlertT("WiiWAD: Could not read from file");
-		}
-		return pTmpBuffer;
-	}
-	return NULL;
-}
-
-
-bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
-{
-	CBlobBigEndianReader ReaderBig(_rReader);
-
-	// get header size	
-	u32 HeaderSize = ReaderBig.Read32(0);
-	if (HeaderSize != 0x20) 
-	{
-		_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
-		return false;
-	}
-
-	// get header 
-	u8 Header[0x20];
-	_rReader.Read(0, HeaderSize, Header);
-	u32 HeaderType = ReaderBig.Read32(0x4);
-	if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
-		return false;
-
-	m_CertificateChainSize    = ReaderBig.Read32(0x8);
-	u32 Reserved              = ReaderBig.Read32(0xC);
-	m_TicketSize              = ReaderBig.Read32(0x10);
-	m_TMDSize                 = ReaderBig.Read32(0x14);
-	m_DataAppSize             = ReaderBig.Read32(0x18);
-	m_FooterSize              = ReaderBig.Read32(0x1C);
-
-#if MAX_LOGLEVEL >= DEBUG_LEVEL
-	_dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
-#else
-	(void)Reserved;
-#endif
-
-	u32 Offset = 0x40;
-	m_pCertificateChain   = CreateWADEntry(_rReader, m_CertificateChainSize, Offset);  Offset += ROUND_UP(m_CertificateChainSize, 0x40);
-	m_pTicket             = CreateWADEntry(_rReader, m_TicketSize, Offset);            Offset += ROUND_UP(m_TicketSize, 0x40);
-	m_pTMD                = CreateWADEntry(_rReader, m_TMDSize, Offset);               Offset += ROUND_UP(m_TMDSize, 0x40);
-	m_pDataApp            = CreateWADEntry(_rReader, m_DataAppSize, Offset);           Offset += ROUND_UP(m_DataAppSize, 0x40);
-	m_pFooter             = CreateWADEntry(_rReader, m_FooterSize, Offset);            Offset += ROUND_UP(m_FooterSize, 0x40);
-
-	return true;
-}
-
-bool WiiWAD::IsWiiWAD(const std::string& _rName)
-{
-	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-	if (pReader == NULL)
-		return false;
-
-	CBlobBigEndianReader Reader(*pReader);
-	bool Result = false;
-
-	// check for wii wad
-	if (Reader.Read32(0x00) == 0x20)
-	{
-		u32 WADTYpe = Reader.Read32(0x04);
-		switch(WADTYpe)
-		{
-		case 0x49730000:
-		case 0x69620000:
-			Result = true;
-		}
-	}
-
-	delete pReader;
-
-	return Result;
-}
-
-
-
-} // namespace end
-
diff --git a/Source/Core/DiscIO/Src/stdafx.cpp b/Source/Core/DiscIO/Src/stdafx.cpp
deleted file mode 100644
index 89b047311e..0000000000
--- a/Source/Core/DiscIO/Src/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/Source/Core/DiscIO/Src/stdafx.h b/Source/Core/DiscIO/Src/stdafx.h
deleted file mode 100644
index 5d6c2c1c42..0000000000
--- a/Source/Core/DiscIO/Src/stdafx.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
-
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-// TODO: reference additional headers your program requires here
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
new file mode 100644
index 0000000000..294cf94c01
--- /dev/null
+++ b/Source/Core/DiscIO/Volume.h
@@ -0,0 +1,138 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+namespace DiscIO
+{
+class IVolume
+{
+public:
+	// Increment CACHE_REVISION if the enums below are modified (ISOFile.cpp & GameFile.cpp)
+	enum EPlatform
+	{
+		GAMECUBE_DISC = 0,
+		WII_DISC,
+		WII_WAD,
+		NUMBER_OF_PLATFORMS
+	};
+
+	enum ECountry
+	{
+		COUNTRY_EUROPE = 0,
+		COUNTRY_JAPAN,
+		COUNTRY_USA,
+		COUNTRY_AUSTRALIA,
+		COUNTRY_FRANCE,
+		COUNTRY_GERMANY,
+		COUNTRY_ITALY,
+		COUNTRY_KOREA,
+		COUNTRY_NETHERLANDS,
+		COUNTRY_RUSSIA,
+		COUNTRY_SPAIN,
+		COUNTRY_TAIWAN,
+		COUNTRY_WORLD,
+		COUNTRY_UNKNOWN,
+		NUMBER_OF_COUNTRIES
+	};
+
+	// Languages 0 - 9 match the official Wii language numbering.
+	// Languages 1 - 6 match the official GC PAL languages 0 - 5.
+	enum ELanguage
+	{
+		LANGUAGE_JAPANESE = 0,
+		LANGUAGE_ENGLISH = 1,
+		LANGUAGE_GERMAN = 2,
+		LANGUAGE_FRENCH = 3,
+		LANGUAGE_SPANISH = 4,
+		LANGUAGE_ITALIAN = 5,
+		LANGUAGE_DUTCH = 6,
+		LANGUAGE_SIMPLIFIED_CHINESE = 7,
+		LANGUAGE_TRADITIONAL_CHINESE = 8,
+		LANGUAGE_KOREAN = 9,
+		LANGUAGE_UNKNOWN
+	};
+
+	IVolume() {}
+	virtual ~IVolume() {}
+
+	// decrypt parameter must be false if not reading a Wii disc
+	virtual bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const = 0;
+	virtual u32 Read32(u64 _Offset, bool decrypt) const
+	{
+		u32 temp;
+		Read(_Offset, sizeof(u32), (u8*)&temp, decrypt);
+		return Common::swap32(temp);
+	}
+
+	virtual bool GetTitleID(u8*) const { return false; }
+	virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const
+	{
+		*_sz = 0;
+		return std::unique_ptr<u8[]>();
+	}
+	virtual std::string GetUniqueID() const = 0;
+	virtual std::string GetMakerID() const = 0;
+	virtual u16 GetRevision() const = 0;
+	virtual std::string GetInternalName() const = 0;
+	virtual std::map<ELanguage, std::string> GetNames(bool prefer_long) const = 0;
+	virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
+	virtual std::string GetCompany() const { return std::string(); }
+	virtual std::vector<u32> GetBanner(int* width, int* height) const;
+	virtual u32 GetFSTSize() const = 0;
+	virtual std::string GetApploaderDate() const = 0;
+	// 0 is the first disc, 1 is the second disc
+	virtual u8 GetDiscNumber() const { return 0; }
+
+	virtual EPlatform GetVolumeType() const = 0;
+	virtual bool SupportsIntegrityCheck() const { return false; }
+	virtual bool CheckIntegrity() const { return false; }
+	virtual bool ChangePartition(u64 offset) { return false; }
+
+	virtual ECountry GetCountry() const = 0;
+	virtual u64 GetSize() const = 0;
+
+	// Size on disc (compressed size)
+	virtual u64 GetRawSize() const = 0;
+
+protected:
+	template <u32 N>
+	std::string DecodeString(const char(&data)[N]) const
+	{
+		// strnlen to trim NULLs
+		std::string string(data, strnlen(data, sizeof(data)));
+
+		// There don't seem to be any GC discs with the country set to Taiwan...
+		// But maybe they would use Shift_JIS if they existed? Not sure
+		bool use_shift_jis = (COUNTRY_JAPAN == GetCountry() || COUNTRY_TAIWAN == GetCountry());
+
+		if (use_shift_jis)
+			return SHIFTJISToUTF8(string);
+		else
+			return CP1252ToUTF8(string);
+	}
+
+	static std::map<IVolume::ELanguage, std::string> ReadWiiNames(const std::vector<u8>& data);
+
+	static const size_t NUMBER_OF_LANGUAGES = 10;
+	static const size_t NAME_STRING_LENGTH = 42;
+	static const size_t NAME_BYTES_LENGTH = NAME_STRING_LENGTH * sizeof(u16);
+	static const size_t NAMES_TOTAL_BYTES = NAME_BYTES_LENGTH * NUMBER_OF_LANGUAGES;
+};
+
+// Generic Switch function for all volumes
+IVolume::ECountry CountrySwitch(u8 country_code);
+u8 GetSysMenuRegion(u16 _TitleVersion);
+std::string GetCompanyFromID(const std::string& company_id);
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp
new file mode 100644
index 0000000000..f5ceac8b0f
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeCommon.cpp
@@ -0,0 +1,569 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Common/ColorUtil.h"
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+#include "DiscIO/Volume.h"
+
+namespace DiscIO
+{
+
+static const unsigned int WII_BANNER_WIDTH = 192;
+static const unsigned int WII_BANNER_HEIGHT = 64;
+static const unsigned int WII_BANNER_SIZE = WII_BANNER_WIDTH * WII_BANNER_HEIGHT * 2;
+static const unsigned int WII_BANNER_OFFSET = 0xA0;
+
+std::vector<u32> IVolume::GetBanner(int* width, int* height) const
+{
+	*width = 0;
+	*height = 0;
+
+	u64 TitleID = 0;
+	GetTitleID((u8*)&TitleID);
+	TitleID = Common::swap64(TitleID);
+
+	std::string file_name = StringFromFormat("%s/title/%08x/%08x/data/banner.bin",
+		File::GetUserPath(D_WIIROOT_IDX).c_str(), (u32)(TitleID >> 32), (u32)TitleID);
+	if (!File::Exists(file_name))
+		return std::vector<u32>();
+
+	if (File::GetSize(file_name) < WII_BANNER_OFFSET + WII_BANNER_SIZE)
+		return std::vector<u32>();
+
+	File::IOFile file(file_name, "rb");
+	if (!file.Seek(WII_BANNER_OFFSET, SEEK_SET))
+		return std::vector<u32>();
+
+	std::vector<u8> banner_file(WII_BANNER_SIZE);
+	if (!file.ReadBytes(banner_file.data(), banner_file.size()))
+		return std::vector<u32>();
+
+	std::vector<u32> image_buffer(WII_BANNER_WIDTH * WII_BANNER_HEIGHT);
+	ColorUtil::decode5A3image(image_buffer.data(), (u16*)banner_file.data(), WII_BANNER_WIDTH, WII_BANNER_HEIGHT);
+
+	*width = WII_BANNER_WIDTH;
+	*height = WII_BANNER_HEIGHT;
+	return image_buffer;
+}
+
+std::map<IVolume::ELanguage, std::string> IVolume::ReadWiiNames(const std::vector<u8>& data)
+{
+	std::map<IVolume::ELanguage, std::string> names;
+	for (size_t i = 0; i < NUMBER_OF_LANGUAGES; ++i)
+	{
+		size_t name_start = NAME_BYTES_LENGTH * i;
+		size_t name_end = name_start + NAME_BYTES_LENGTH;
+		if (data.size() >= name_end)
+		{
+			u16* temp = (u16*)(data.data() + name_start);
+			std::wstring out_temp(NAME_STRING_LENGTH, '\0');
+			std::transform(temp, temp + out_temp.size(), out_temp.begin(), (u16(&)(u16))Common::swap16);
+			out_temp.erase(std::find(out_temp.begin(), out_temp.end(), 0x00), out_temp.end());
+			std::string name = UTF16ToUTF8(out_temp);
+			if (!name.empty())
+				names[(IVolume::ELanguage)i] = name;
+		}
+	}
+	return names;
+}
+
+// Increment CACHE_REVISION if the code below is modified (ISOFile.cpp & GameFile.cpp)
+IVolume::ECountry CountrySwitch(u8 country_code)
+{
+	switch (country_code)
+	{
+		// Region free - Uses European flag as placeholder
+		case 'A':
+			return IVolume::COUNTRY_WORLD;
+
+		// PAL
+		case 'D':
+			return IVolume::COUNTRY_GERMANY;
+
+		case 'X': // Used by a couple PAL games
+		case 'Y': // German, French
+		case 'L': // Japanese import to PAL regions
+		case 'M': // Japanese import to PAL regions
+		case 'P':
+			return IVolume::COUNTRY_EUROPE;
+
+		case 'U':
+			return IVolume::COUNTRY_AUSTRALIA;
+
+		case 'F':
+			return IVolume::COUNTRY_FRANCE;
+
+		case 'I':
+			return IVolume::COUNTRY_ITALY;
+
+		case 'H':
+			return IVolume::COUNTRY_NETHERLANDS;
+
+		case 'R':
+			return IVolume::COUNTRY_RUSSIA;
+
+		case 'S':
+			return IVolume::COUNTRY_SPAIN;
+
+		// NTSC
+		case 'E':
+		case 'N': // Japanese import to USA and other NTSC regions
+		case 'Z': // Prince of Persia - The Forgotten Sands (Wii)
+		case 'B': // Ufouria: The Saga (Virtual Console)
+			return IVolume::COUNTRY_USA;
+
+		case 'J':
+			return IVolume::COUNTRY_JAPAN;
+
+		case 'K':
+		case 'Q': // Korea with Japanese language
+		case 'T': // Korea with English language
+			return IVolume::COUNTRY_KOREA;
+
+		case 'W':
+			return IVolume::COUNTRY_TAIWAN;
+
+		default:
+			if (country_code > 'A') // Silently ignore IOS wads
+				WARN_LOG(DISCIO, "Unknown Country Code! %c", country_code);
+			return IVolume::COUNTRY_UNKNOWN;
+	}
+}
+
+u8 GetSysMenuRegion(u16 _TitleVersion)
+{
+	switch (_TitleVersion)
+	{
+	case 128: case 192: case 224: case 256:
+	case 288: case 352: case 384: case 416:
+	case 448: case 480: case 512:
+		return 'J';
+	case 97:  case 193: case 225: case 257:
+	case 289: case 353: case 385: case 417:
+	case 449: case 481: case 513:
+		return 'E';
+	case 130: case 162: case 194: case 226:
+	case 258: case 290: case 354: case 386:
+	case 418: case 450: case 482: case 514:
+		return 'P';
+	case 326: case 390: case 454: case 486:
+	case 518:
+		return 'K';
+	default:
+		return 'A';
+	}
+}
+
+std::string GetCompanyFromID(const std::string& company_id)
+{
+	static const std::map<std::string, std::string> companies =
+	{
+		{ "01", "Nintendo" },
+		{ "02", "Rocket Games / Ajinomoto" },
+		{ "03", "Imagineer-Zoom" },
+		{ "04", "Gray Matter" },
+		{ "05", "Zamuse" },
+		{ "06", "Falcom" },
+		{ "07", "Enix" },
+		{ "08", "Capcom" },
+		{ "09", "Hot B Co." },
+		{ "0A", "Jaleco" },
+		{ "0B", "Coconuts Japan" },
+		{ "0C", "Coconuts Japan / GX Media" },
+		{ "0D", "Micronet" },
+		{ "0E", "Technos" },
+		{ "0F", "Mebio Software" },
+		{ "0G", "Shouei System" },
+		{ "0H", "Starfish" },
+		{ "0J", "Mitsui Fudosan / Dentsu" },
+		{ "0L", "Warashi Inc." },
+		{ "0N", "Nowpro" },
+		{ "0P", "Game Village" },
+		{ "0Q", "IE Institute" },
+		{ "12", "Infocom" },
+		{ "13", "Electronic Arts Japan" },
+		{ "15", "Cobra Team" },
+		{ "16", "Human / Field" },
+		{ "17", "KOEI" },
+		{ "18", "Hudson Soft" },
+		{ "19", "S.C.P." },
+		{ "1A", "Yanoman" },
+		{ "1C", "Tecmo Products" },
+		{ "1D", "Japan Glary Business" },
+		{ "1E", "Forum / OpenSystem" },
+		{ "1F", "Virgin Games (Japan)" },
+		{ "1G", "SMDE" },
+		{ "1J", "Daikokudenki" },
+		{ "1P", "Creatures Inc." },
+		{ "1Q", "TDK Deep Impresion" },
+		{ "20", "Zoo" },
+		{ "21", "Sunsoft / Tokai Engineering" },
+		{ "22", "Planning Office Wada / VR1 Japan" },
+		{ "23", "Micro World" },
+		{ "25", "San-X" },
+		{ "26", "Enix" },
+		{ "27", "Loriciel / Electro Brain" },
+		{ "28", "Kemco Japan" },
+		{ "29", "Seta" },
+		{ "2A", "Culture Brain" },
+		{ "2C", "Palsoft" },
+		{ "2D", "Visit Co., Ltd." },
+		{ "2E", "Intec" },
+		{ "2F", "System Sacom" },
+		{ "2G", "Poppo" },
+		{ "2H", "Ubisoft Japan" },
+		{ "2J", "Media Works" },
+		{ "2K", "NEC InterChannel" },
+		{ "2L", "Tam" },
+		{ "2M", "Jordan" },
+		{ "2N", "Smilesoft / Rocket" },
+		{ "2Q", "Mediakite" },
+		{ "30", "Viacom" },
+		{ "31", "Carrozzeria" },
+		{ "32", "Dynamic" },
+		{ "34", "Magifact" },
+		{ "35", "Hect" },
+		{ "36", "Codemasters" },
+		{ "37", "Taito / GAGA Communications" },
+		{ "38", "Laguna" },
+		{ "39", "Telstar / Event / Taito " },
+		{ "3B", "Arcade Zone Ltd." },
+		{ "3C", "Entertainment International / Empire Software" },
+		{ "3D", "Loriciel" },
+		{ "3E", "Gremlin Graphics" },
+		{ "3F", "K. Amusement Leasing Co." },
+		{ "40", "Seika Corp." },
+		{ "41", "Ubisoft Entertainment" },
+		{ "42", "Sunsoft US" },
+		{ "44", "Life Fitness" },
+		{ "46", "System 3" },
+		{ "47", "Spectrum Holobyte" },
+		{ "49", "IREM" },
+		{ "4B", "Raya Systems" },
+		{ "4C", "Renovation Products" },
+		{ "4D", "Malibu Games" },
+		{ "4F", "Eidos" },
+		{ "4G", "Playmates Interactive" },
+		{ "4J", "Fox Interactive" },
+		{ "4K", "Time Warner Interactive" },
+		{ "4Q", "Disney Interactive" },
+		{ "4S", "Black Pearl" },
+		{ "4U", "Advanced Productions" },
+		{ "4X", "GT Interactive" },
+		{ "4Y", "Rare" },
+		{ "4Z", "Crave Entertainment" },
+		{ "50", "Absolute Entertainment" },
+		{ "51", "Acclaim" },
+		{ "52", "Activision" },
+		{ "53", "American Sammy" },
+		{ "54", "Take 2 Interactive / GameTek" },
+		{ "55", "Hi Tech" },
+		{ "56", "LJN Ltd." },
+		{ "58", "Mattel" },
+		{ "5A", "Mindscape / Red Orb Entertainment" },
+		{ "5B", "Romstar" },
+		{ "5C", "Taxan" },
+		{ "5D", "Midway / Tradewest" },
+		{ "5F", "American Softworks" },
+		{ "5G", "Majesco Sales Inc." },
+		{ "5H", "3DO" },
+		{ "5K", "Hasbro" },
+		{ "5L", "NewKidCo" },
+		{ "5M", "Telegames" },
+		{ "5N", "Metro3D" },
+		{ "5P", "Vatical Entertainment" },
+		{ "5Q", "LEGO Media" },
+		{ "5S", "Xicat Interactive" },
+		{ "5T", "Cryo Interactive" },
+		{ "5W", "Red Storm Entertainment" },
+		{ "5X", "Microids" },
+		{ "5Z", "Data Design / Conspiracy / Swing" },
+		{ "60", "Titus" },
+		{ "61", "Virgin Interactive" },
+		{ "62", "Maxis" },
+		{ "64", "LucasArts Entertainment" },
+		{ "67", "Ocean" },
+		{ "68", "Bethesda Softworks" },
+		{ "69", "Electronic Arts" },
+		{ "6B", "Laser Beam" },
+		{ "6E", "Elite Systems" },
+		{ "6F", "Electro Brain" },
+		{ "6G", "The Learning Company" },
+		{ "6H", "BBC" },
+		{ "6J", "Software 2000" },
+		{ "6K", "UFO Interactive Games" },
+		{ "6L", "BAM! Entertainment" },
+		{ "6M", "Studio 3" },
+		{ "6Q", "Classified Games" },
+		{ "6S", "TDK Mediactive" },
+		{ "6U", "DreamCatcher" },
+		{ "6V", "JoWood Produtions" },
+		{ "6W", "Sega" },
+		{ "6X", "Wannado Edition" },
+		{ "6Y", "LSP (Light & Shadow Prod.)" },
+		{ "6Z", "ITE Media" },
+		{ "70", "Atari (Infogrames)" },
+		{ "71", "Interplay" },
+		{ "72", "JVC (US)" },
+		{ "73", "Parker Brothers" },
+		{ "75", "Sales Curve (Storm / SCI)" },
+		{ "78", "THQ" },
+		{ "79", "Accolade" },
+		{ "7A", "Triffix Entertainment" },
+		{ "7C", "Microprose Software" },
+		{ "7D", "Sierra / Universal Interactive" },
+		{ "7F", "Kemco" },
+		{ "7G", "Rage Software" },
+		{ "7H", "Encore" },
+		{ "7J", "Zoo" },
+		{ "7K", "Kiddinx" },
+		{ "7L", "Simon & Schuster Interactive" },
+		{ "7M", "Asmik Ace Entertainment Inc." },
+		{ "7N", "Empire Interactive" },
+		{ "7Q", "Jester Interactive" },
+		{ "7S", "Rockstar Games" },
+		{ "7T", "Scholastic" },
+		{ "7U", "Ignition Entertainment" },
+		{ "7V", "Summitsoft" },
+		{ "7W", "Stadlbauer" },
+		{ "80", "Misawa" },
+		{ "81", "Teichiku" },
+		{ "82", "Namco Ltd." },
+		{ "83", "LOZC" },
+		{ "84", "KOEI" },
+		{ "86", "Tokuma Shoten Intermedia" },
+		{ "87", "Tsukuda Original" },
+		{ "88", "DATAM-Polystar" },
+		{ "8B", "Bullet-Proof Software" },
+		{ "8C", "Vic Tokai Inc." },
+		{ "8E", "Character Soft" },
+		{ "8F", "I'Max" },
+		{ "8G", "Saurus" },
+		{ "8J", "General Entertainment" },
+		{ "8N", "Success" },
+		{ "8P", "Sega Japan" },
+		{ "90", "Takara Amusement" },
+		{ "91", "Chunsoft" },
+		{ "92", "Video System / Mc O' River" },
+		{ "93", "BEC" },
+		{ "95", "Varie" },
+		{ "96", "Yonezawa / S'pal" },
+		{ "97", "Kaneko" },
+		{ "99", "Marvelous Entertainment" },
+		{ "9A", "Nichibutsu / Nihon Bussan" },
+		{ "9B", "Tecmo" },
+		{ "9C", "Imagineer" },
+		{ "9F", "Nova" },
+		{ "9G", "Take2 / Den'Z / Global Star" },
+		{ "9H", "Bottom Up" },
+		{ "9J", "Technical Group Laboratory" },
+		{ "9L", "Hasbro Japan" },
+		{ "9N", "Marvelous Entertainment" },
+		{ "9P", "Keynet Inc." },
+		{ "9Q", "Hands-On Entertainment" },
+		{ "A0", "Telenet" },
+		{ "A1", "Hori" },
+		{ "A4", "Konami" },
+		{ "A5", "K. Amusement Leasing Co." },
+		{ "A6", "Kawada" },
+		{ "A7", "Takara" },
+		{ "A9", "Technos Japan Corp." },
+		{ "AA", "JVC / Victor" },
+		{ "AC", "Toei Animation" },
+		{ "AD", "Toho" },
+		{ "AF", "Namco" },
+		{ "AG", "Media Rings Corporation" },
+		{ "AH", "J-Wing" },
+		{ "AJ", "Pioneer LDC" },
+		{ "AK", "KID" },
+		{ "AL", "Mediafactory" },
+		{ "AP", "Infogrames / Hudson" },
+		{ "AQ", "Kiratto Ludic Inc." },
+		{ "B0", "Acclaim Japan" },
+		{ "B1", "ASCII" },
+		{ "B2", "Bandai" },
+		{ "B4", "Enix" },
+		{ "B6", "HAL Laboratory" },
+		{ "B7", "SNK" },
+		{ "B9", "Pony Canyon" },
+		{ "BA", "Culture Brain" },
+		{ "BB", "Sunsoft" },
+		{ "BC", "Toshiba EMI" },
+		{ "BD", "Sony Imagesoft" },
+		{ "BF", "Sammy" },
+		{ "BG", "Magical" },
+		{ "BH", "Visco" },
+		{ "BJ", "Compile" },
+		{ "BL", "MTO Inc." },
+		{ "BN", "Sunrise Interactive" },
+		{ "BP", "Global A Entertainment" },
+		{ "BQ", "Fuuki" },
+		{ "C0", "Taito" },
+		{ "C2", "Kemco" },
+		{ "C3", "Square" },
+		{ "C4", "Tokuma Shoten" },
+		{ "C5", "Data East" },
+		{ "C6", "Tonkin House / Tokyo Shoseki" },
+		{ "C8", "Koei" },
+		{ "CA", "Konami / Ultra / Palcom" },
+		{ "CB", "NTVIC / VAP" },
+		{ "CC", "Use Co., Ltd." },
+		{ "CD", "Meldac" },
+		{ "CE", "Pony Canyon / FCI " },
+		{ "CF", "Angel / Sotsu Agency / Sunrise" },
+		{ "CG", "Yumedia / Aroma Co., Ltd" },
+		{ "CJ", "Boss" },
+		{ "CK", "Axela / Crea-Tech" },
+		{ "CL", "Sekaibunka-Sha / Sumire Kobo / Marigul Management Inc." },
+		{ "CM", "Konami Computer Entertainment Osaka" },
+		{ "CN", "NEC Interchannel" },
+		{ "CP", "Enterbrain" },
+		{ "CQ", "From Software" },
+		{ "D0", "Taito / Disco" },
+		{ "D1", "Sofel" },
+		{ "D2", "Quest / Bothtec" },
+		{ "D3", "Sigma" },
+		{ "D4", "Ask Kodansha" },
+		{ "D6", "Naxat" },
+		{ "D7", "Copya System" },
+		{ "D8", "Capcom Co., Ltd." },
+		{ "D9", "Banpresto" },
+		{ "DA", "Tomy" },
+		{ "DB", "LJN Japan" },
+		{ "DD", "NCS" },
+		{ "DE", "Human Entertainment" },
+		{ "DF", "Altron" },
+		{ "DG", "Jaleco" },
+		{ "DH", "Gaps Inc." },
+		{ "DN", "Elf" },
+		{ "DQ", "Compile Heart" },
+		{ "E0", "Jaleco" },
+		{ "E2", "Yutaka" },
+		{ "E3", "Varie" },
+		{ "E4", "T&E Soft" },
+		{ "E5", "Epoch" },
+		{ "E7", "Athena" },
+		{ "E8", "Asmik" },
+		{ "E9", "Natsume" },
+		{ "EA", "King Records" },
+		{ "EB", "Atlus" },
+		{ "EC", "Epic / Sony Records" },
+		{ "EE", "Information Global Service" },
+		{ "EG", "Chatnoir" },
+		{ "EH", "Right Stuff" },
+		{ "EL", "Spike" },
+		{ "EM", "Konami Computer Entertainment Tokyo" },
+		{ "EN", "Alphadream Corporation" },
+		{ "EP", "Sting" },
+		{ "ES", "Star-Fish" },
+		{ "F0", "A Wave" },
+		{ "F1", "Motown Software" },
+		{ "F2", "Left Field Entertainment" },
+		{ "F3", "Extreme Ent. Grp." },
+		{ "F4", "TecMagik" },
+		{ "F9", "Cybersoft" },
+		{ "FB", "Psygnosis" },
+		{ "FE", "Davidson / Western Tech." },
+		{ "FK", "The Game Factory" },
+		{ "FL", "Hip Games" },
+		{ "FM", "Aspyr" },
+		{ "FP", "Mastiff" },
+		{ "FQ", "iQue" },
+		{ "FR", "Digital Tainment Pool" },
+		{ "FS", "XS Games / Jack Of All Games" },
+		{ "FT", "Daiwon" },
+		{ "G0", "Alpha Unit" },
+		{ "G1", "PCCW Japan" },
+		{ "G2", "Yuke's Media Creations" },
+		{ "G4", "KiKi Co., Ltd." },
+		{ "G5", "Open Sesame Inc." },
+		{ "G6", "Sims" },
+		{ "G7", "Broccoli" },
+		{ "G8", "Avex" },
+		{ "G9", "D3 Publisher" },
+		{ "GB", "Konami Computer Entertainment Japan" },
+		{ "GD", "Square-Enix" },
+		{ "GE", "KSG" },
+		{ "GF", "Micott & Basara Inc." },
+		{ "GH", "Orbital Media" },
+		{ "GJ", "Detn8 Games" },
+		{ "GL", "Gameloft / Ubisoft" },
+		{ "GM", "Gamecock Media Group" },
+		{ "GN", "Oxygen Games" },
+		{ "GT", "505 Games" },
+		{ "GY", "The Game Factory" },
+		{ "H1", "Treasure" },
+		{ "H2", "Aruze" },
+		{ "H3", "Ertain" },
+		{ "H4", "SNK Playmore" },
+		{ "HF", "Level-5" },
+		{ "HJ", "Genius Products" },
+		{ "HY", "Reef Entertainment" },
+		{ "HZ", "Nordcurrent" },
+		{ "IH", "Yojigen" },
+		{ "J9", "AQ Interactive" },
+		{ "JF", "Arc System Works" },
+		{ "JJ", "Deep Silver" },
+		{ "JW", "Atari" },
+		{ "K6", "Nihon System" },
+		{ "KB", "NIS America" },
+		{ "KM", "Deep Silver" },
+		{ "KP", "Purple Hills" },
+		{ "LH", "Trend Verlag / East Entertainment" },
+		{ "LT", "Legacy Interactive" },
+		{ "MJ", "Mumbo Jumbo" },
+		{ "MR", "Mindscape" },
+		{ "MS", "Milestone / UFO Interactive" },
+		{ "MT", "Blast!" },
+		{ "N9", "Terabox" },
+		{ "NG", "Nordic Games" },
+		{ "NK", "Neko Entertainment / Diffusion / Naps team" },
+		{ "NP", "Nobilis" },
+		{ "NQ", "Namco Bandai" },
+		{ "NR", "Data Design / Destineer Studios" },
+		{ "PL", "Playlogic" },
+		{ "RM", "Rondomedia" },
+		{ "RS", "Warner Bros. Interactive Entertainment Inc." },
+		{ "RT", "RTL Games" },
+		{ "RW", "RealNetworks" },
+		{ "S5", "Southpeak Interactive" },
+		{ "SP", "Blade Interactive Studios" },
+		{ "SV", "SevenGames" },
+		{ "SZ", "Storm City" },
+		{ "TK", "Tasuke / Works" },
+		{ "TV", "Tivola" },
+		{ "UG", "Metro 3D / Data Design" },
+		{ "VN", "Valcon Games" },
+		{ "VP", "Virgin Play" },
+		{ "VZ", "Little Orbit" },
+		{ "WR", "Warner Bros. Interactive Entertainment Inc." },
+		{ "XJ", "Xseed Games" },
+		{ "XS", "Aksys Games" },
+		{ "YT", "Valcon Games" },
+		{ "Z4", "Ntreev Soft" },
+		{ "ZA", "WBA Interactive" },
+		{ "ZH", "Internal Engine" },
+		{ "ZS", "Zinkia" },
+		{ "ZW", "Judo Baby" },
+		{ "ZX", "Topware Interactive" }
+	};
+
+	auto iterator = companies.find(company_id);
+	if (iterator != companies.end())
+		return iterator->second;
+	else
+		return "";
+}
+
+}
diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp
new file mode 100644
index 0000000000..14ba411d90
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeCreator.cpp
@@ -0,0 +1,243 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include <polarssl/aes.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/VolumeDirectory.h"
+#include "DiscIO/VolumeGC.h"
+#include "DiscIO/VolumeWad.h"
+#include "DiscIO/VolumeWiiCrypted.h"
+
+
+namespace DiscIO
+{
+enum EDiscType
+{
+	DISC_TYPE_UNK,
+	DISC_TYPE_WII,
+	DISC_TYPE_WII_CONTAINER,
+	DISC_TYPE_GC,
+	DISC_TYPE_WAD
+};
+
+class CBlobBigEndianReader
+{
+public:
+	CBlobBigEndianReader(IBlobReader& _rReader) : m_rReader(_rReader) {}
+
+	u32 Read32(u64 _Offset)
+	{
+		u32 Temp;
+		m_rReader.Read(_Offset, 4, (u8*)&Temp);
+		return Common::swap32(Temp);
+	}
+	u16 Read16(u64 _Offset)
+	{
+		u16 Temp;
+		m_rReader.Read(_Offset, 2, (u8*)&Temp);
+		return Common::swap16(Temp);
+	}
+	u8 Read8(u64 _Offset)
+	{
+		u8 Temp;
+		m_rReader.Read(_Offset, 1, &Temp);
+		return Temp;
+	}
+private:
+	IBlobReader& m_rReader;
+};
+
+static const unsigned char s_master_key[16] = {
+	0xeb,0xe4,0x2a,0x22,0x5e,0x85,0x93,0xe4,
+	0x48,0xd9,0xc5,0x45,0x73,0x81,0xaa,0xf7
+};
+
+static const unsigned char s_master_key_korean[16] = {
+	0x63,0xb8,0x2b,0xb4,0xf4,0x61,0x4e,0x2e,
+	0x13,0xf2,0xfe,0xfb,0xba,0x4c,0x9b,0x7e
+};
+
+static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum);
+EDiscType GetDiscType(IBlobReader& _rReader);
+
+IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup, u32 _VolumeNum)
+{
+	IBlobReader* pReader = CreateBlobReader(_rFilename);
+	if (pReader == nullptr)
+		return nullptr;
+
+	switch (GetDiscType(*pReader))
+	{
+		case DISC_TYPE_WII:
+		case DISC_TYPE_GC:
+			return new CVolumeGC(pReader);
+
+		case DISC_TYPE_WAD:
+			return new CVolumeWAD(pReader);
+
+		case DISC_TYPE_WII_CONTAINER:
+		{
+			IVolume* pVolume = CreateVolumeFromCryptedWiiImage(*pReader, _PartitionGroup, 0, _VolumeNum);
+
+			if (pVolume == nullptr)
+			{
+				delete pReader;
+			}
+
+			return pVolume;
+		}
+
+		case DISC_TYPE_UNK:
+		default:
+			std::string Filename, ext;
+			SplitPath(_rFilename, nullptr, &Filename, &ext);
+			Filename += ext;
+			NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n"
+						"Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str());
+			delete pReader;
+	}
+
+	return nullptr;
+}
+
+IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
+{
+	if (CVolumeDirectory::IsValidDirectory(_rDirectory))
+		return new CVolumeDirectory(_rDirectory, _bIsWii, _rApploader, _rDOL);
+
+	return nullptr;
+}
+
+bool IsVolumeWadFile(const IVolume *_rVolume)
+{
+	u32 MagicWord = 0;
+	_rVolume->Read(0x02, 4, (u8*)&MagicWord, false);
+
+	return (Common::swap32(MagicWord) == 0x00204973 || Common::swap32(MagicWord) == 0x00206962);
+}
+
+void VolumeKeyForParition(IBlobReader& _rReader, u64 offset, u8* VolumeKey)
+{
+	CBlobBigEndianReader Reader(_rReader);
+
+	u8 SubKey[16];
+	_rReader.Read(offset + 0x1bf, 16, SubKey);
+
+	u8 IV[16];
+	memset(IV, 0, 16);
+	_rReader.Read(offset + 0x44c, 8, IV);
+
+	bool usingKoreanKey = false;
+	// Issue: 6813
+	// Magic value is at partition's offset + 0x1f1 (1byte)
+	// If encrypted with the Korean key, the magic value would be 1
+	// Otherwise it is zero
+	if (Reader.Read8(0x3) == 'K' && Reader.Read8(offset + 0x1f1) == 1)
+		usingKoreanKey = true;
+
+	aes_context AES_ctx;
+	aes_setkey_dec(&AES_ctx, (usingKoreanKey ? s_master_key_korean : s_master_key), 128);
+
+	aes_crypt_cbc(&AES_ctx, AES_DECRYPT, 16, IV, SubKey, VolumeKey);
+}
+
+static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum)
+{
+	CBlobBigEndianReader Reader(_rReader);
+
+	u32 numPartitions = Reader.Read32(0x40000 + (_PartitionGroup * 8));
+	u64 PartitionsOffset = (u64)Reader.Read32(0x40000 + (_PartitionGroup * 8) + 4) << 2;
+
+	// Check if we're looking for a valid partition
+	if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions)
+		return nullptr;
+
+	struct SPartition
+	{
+		u64 Offset;
+		u32 Type;
+	};
+
+	struct SPartitionGroup
+	{
+		u32 numPartitions;
+		u64 PartitionsOffset;
+		std::vector<SPartition> PartitionsVec;
+	};
+	SPartitionGroup PartitionGroup[4];
+
+	// read all partitions
+	for (SPartitionGroup& group : PartitionGroup)
+	{
+		for (u32 i = 0; i < numPartitions; i++)
+		{
+			SPartition Partition;
+			Partition.Offset = ((u64)Reader.Read32(PartitionsOffset + (i * 8) + 0)) << 2;
+			Partition.Type   = Reader.Read32(PartitionsOffset + (i * 8) + 4);
+			group.PartitionsVec.push_back(Partition);
+		}
+	}
+
+	// return the partition type specified or number
+	// types: 0 = game, 1 = firmware update, 2 = channel installer
+	//  some partitions on ssbb use the ascii title id of the demo VC game they hold...
+	for (size_t i = 0; i < PartitionGroup[_PartitionGroup].PartitionsVec.size(); i++)
+	{
+		const SPartition& rPartition = PartitionGroup[_PartitionGroup].PartitionsVec.at(i);
+
+		if ((rPartition.Type == _VolumeType && (int)_VolumeNum == -1) || i == _VolumeNum)
+		{
+			u8 VolumeKey[16];
+			VolumeKeyForParition(_rReader, rPartition.Offset, VolumeKey);
+			return new CVolumeWiiCrypted(&_rReader, rPartition.Offset, VolumeKey);
+		}
+	}
+
+	return nullptr;
+}
+
+EDiscType GetDiscType(IBlobReader& _rReader)
+{
+	CBlobBigEndianReader Reader(_rReader);
+	u32 WiiMagic = Reader.Read32(0x18);
+	u32 WiiContainerMagic = Reader.Read32(0x60);
+	u32 WADMagic = Reader.Read32(0x02);
+	u32 GCMagic = Reader.Read32(0x1C);
+
+	// check for Wii
+	if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic != 0)
+		return DISC_TYPE_WII;
+	if (WiiMagic == 0x5D1C9EA3 && WiiContainerMagic == 0)
+		return DISC_TYPE_WII_CONTAINER;
+
+	// check for WAD
+	// 0x206962 for boot2 wads
+	if (WADMagic == 0x00204973 || WADMagic == 0x00206962)
+		return DISC_TYPE_WAD;
+
+	// check for GC
+	if (GCMagic == 0xC2339F3D)
+		return DISC_TYPE_GC;
+
+	WARN_LOG(DISCIO, "No known magic words found");
+	WARN_LOG(DISCIO, "Wii  offset: 0x18 value: 0x%08x", WiiMagic);
+	WARN_LOG(DISCIO, "WiiC offset: 0x60 value: 0x%08x", WiiContainerMagic);
+	WARN_LOG(DISCIO, "WAD  offset: 0x02 value: 0x%08x", WADMagic);
+	WARN_LOG(DISCIO, "GC   offset: 0x1C value: 0x%08x", GCMagic);
+
+	return DISC_TYPE_UNK;
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/VolumeCreator.h b/Source/Core/DiscIO/VolumeCreator.h
new file mode 100644
index 0000000000..f890109ede
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeCreator.h
@@ -0,0 +1,23 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+namespace DiscIO
+{
+
+class IVolume;
+class IBlobReader;
+
+IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup = 0, u32 _VolumeNum = -1);
+IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = "");
+bool IsVolumeWiiDisc(const IVolume *_rVolume);
+bool IsVolumeWadFile(const IVolume *_rVolume);
+void VolumeKeyForParition(IBlobReader& _rReader, u64 offset, u8* VolumeKey);
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp
new file mode 100644
index 0000000000..ee22db75ab
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@@ -0,0 +1,500 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "DiscIO/FileBlob.h"
+#include "DiscIO/FileMonitor.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeDirectory.h"
+
+namespace DiscIO
+{
+
+CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
+								   const std::string& _rApploader, const std::string& _rDOL)
+	: m_totalNameSize(0)
+	, m_dataStartAddress(-1)
+	, m_diskHeader(DISKHEADERINFO_ADDRESS)
+	, m_diskHeaderInfo(new SDiskHeaderInfo())
+	, m_fst_address(0)
+	, m_dol_address(0)
+{
+	m_rootDirectory = ExtractDirectoryName(_rDirectory);
+
+	// create the default disk header
+	SetUniqueID("AGBJ01");
+	SetName("Default name");
+
+	if (_bIsWii)
+	{
+		SetDiskTypeWii();
+	}
+	else
+	{
+		SetDiskTypeGC();
+	}
+
+	// Don't load the dol if we've no apploader...
+	if (SetApploader(_rApploader))
+		SetDOL(_rDOL);
+
+	BuildFST();
+}
+
+CVolumeDirectory::~CVolumeDirectory()
+{
+}
+
+bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory)
+{
+	std::string directoryName = ExtractDirectoryName(_rDirectory);
+	return File::IsDirectory(directoryName);
+}
+
+bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const
+{
+	if (!decrypt && (_Offset + _Length >= 0x400) && m_is_wii)
+	{
+		// Fully supporting this would require re-encrypting every file that's read.
+		// Only supporting the areas that IOS allows software to read could be more feasible.
+		// Currently, only the header (up to 0x400) is supported, though we're cheating a bit
+		// with it by reading the header inside the current partition instead. Supporting the
+		// header is enough for booting games, but not for running things like the Disc Channel.
+		return false;
+	}
+
+	if (decrypt && !m_is_wii)
+		PanicAlertT("Tried to decrypt data from a non-Wii volume");
+
+	// header
+	if (_Offset < DISKHEADERINFO_ADDRESS)
+	{
+		WriteToBuffer(DISKHEADER_ADDRESS, DISKHEADERINFO_ADDRESS, m_diskHeader.data(), _Offset, _Length, _pBuffer);
+	}
+	// header info
+	if (_Offset >= DISKHEADERINFO_ADDRESS && _Offset < APPLOADER_ADDRESS)
+	{
+		WriteToBuffer(DISKHEADERINFO_ADDRESS, sizeof(m_diskHeaderInfo), (u8*)m_diskHeaderInfo.get(), _Offset, _Length, _pBuffer);
+	}
+	// apploader
+	if (_Offset >= APPLOADER_ADDRESS && _Offset < APPLOADER_ADDRESS + m_apploader.size())
+	{
+		WriteToBuffer(APPLOADER_ADDRESS, m_apploader.size(), m_apploader.data(), _Offset, _Length, _pBuffer);
+	}
+	// dol
+	if (_Offset >= m_dol_address && _Offset < m_dol_address + m_DOL.size())
+	{
+		WriteToBuffer(m_dol_address, m_DOL.size(), m_DOL.data(), _Offset, _Length, _pBuffer);
+	}
+	// fst
+	if (_Offset >= m_fst_address && _Offset < m_dataStartAddress)
+	{
+		WriteToBuffer(m_fst_address, m_FSTData.size(), m_FSTData.data(), _Offset, _Length, _pBuffer);
+	}
+
+	if (m_virtualDisk.empty())
+		return true;
+
+	// Determine which file the offset refers to
+	std::map<u64, std::string>::const_iterator fileIter = m_virtualDisk.lower_bound(_Offset);
+	if (fileIter->first > _Offset && fileIter != m_virtualDisk.begin())
+		--fileIter;
+
+	// zero fill to start of file data
+	PadToAddress(fileIter->first, _Offset, _Length, _pBuffer);
+
+	while (fileIter != m_virtualDisk.end() && _Length > 0)
+	{
+		_dbg_assert_(DVDINTERFACE, fileIter->first <= _Offset);
+		u64 fileOffset = _Offset - fileIter->first;
+		const std::string fileName = fileIter->second;
+
+		std::unique_ptr<PlainFileReader> reader(PlainFileReader::Create(fileName));
+		if (reader == nullptr)
+			return false;
+
+		u64 fileSize = reader->GetDataSize();
+
+		FileMon::CheckFile(fileName, fileSize);
+
+		if (fileOffset < fileSize)
+		{
+			u64 fileBytes = fileSize - fileOffset;
+			if (_Length < fileBytes)
+				fileBytes = _Length;
+
+			if (!reader->Read(fileOffset, fileBytes, _pBuffer))
+				return false;
+
+			_Length  -= fileBytes;
+			_pBuffer += fileBytes;
+			_Offset  += fileBytes;
+		}
+
+		++fileIter;
+
+		if (fileIter != m_virtualDisk.end())
+		{
+			_dbg_assert_(DVDINTERFACE, fileIter->first >= _Offset);
+			PadToAddress(fileIter->first, _Offset, _Length, _pBuffer);
+		}
+	}
+
+	return true;
+}
+
+std::string CVolumeDirectory::GetUniqueID() const
+{
+	static const size_t ID_LENGTH = 6;
+	return std::string(m_diskHeader.begin(), m_diskHeader.begin() + ID_LENGTH);
+}
+
+void CVolumeDirectory::SetUniqueID(const std::string& id)
+{
+	size_t length = id.length();
+	if (length > 6)
+		length = 6;
+
+	memcpy(m_diskHeader.data(), id.c_str(), length);
+}
+
+IVolume::ECountry CVolumeDirectory::GetCountry() const
+{
+	u8 country_code = m_diskHeader[3];
+
+	return CountrySwitch(country_code);
+}
+
+std::string CVolumeDirectory::GetMakerID() const
+{
+	return "VOID";
+}
+
+std::string CVolumeDirectory::GetInternalName() const
+{
+	char name[0x60];
+	if (Read(0x20, 0x60, (u8*)name, false))
+		return DecodeString(name);
+	else
+		return "";
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetNames(bool prefer_long) const
+{
+	std::map<IVolume::ELanguage, std::string> names;
+	std::string name = GetInternalName();
+	if (!name.empty())
+		names[IVolume::ELanguage::LANGUAGE_UNKNOWN] = name;
+	return names;
+}
+
+void CVolumeDirectory::SetName(const std::string& name)
+{
+	size_t length = name.length();
+	if (length > MAX_NAME_LENGTH)
+	    length = MAX_NAME_LENGTH;
+
+	memcpy(&m_diskHeader[0x20], name.c_str(), length);
+	m_diskHeader[length + 0x20] = 0;
+}
+
+u32 CVolumeDirectory::GetFSTSize() const
+{
+	return 0;
+}
+
+std::string CVolumeDirectory::GetApploaderDate() const
+{
+	return "VOID";
+}
+
+IVolume::EPlatform CVolumeDirectory::GetVolumeType() const
+{
+	return m_is_wii ? WII_DISC : GAMECUBE_DISC;
+}
+
+u64 CVolumeDirectory::GetSize() const
+{
+	return 0;
+}
+
+u64 CVolumeDirectory::GetRawSize() const
+{
+	return GetSize();
+}
+
+std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirectory)
+{
+	std::string directoryName = _rDirectory;
+
+	size_t lastSep = directoryName.find_last_of(DIR_SEP_CHR);
+
+	if (lastSep != directoryName.size() - 1)
+	{
+		// TODO: This assumes that file names will always have a dot in them
+		//       and directory names never will; both assumptions are often
+		//       right but in general wrong.
+		size_t extensionStart = directoryName.find_last_of('.');
+		if (extensionStart != std::string::npos && extensionStart > lastSep)
+		{
+			directoryName.resize(lastSep);
+		}
+	}
+	else
+	{
+		directoryName.resize(lastSep);
+	}
+
+	return directoryName;
+}
+
+void CVolumeDirectory::SetDiskTypeWii()
+{
+	m_diskHeader[0x18] = 0x5d;
+	m_diskHeader[0x19] = 0x1c;
+	m_diskHeader[0x1a] = 0x9e;
+	m_diskHeader[0x1b] = 0xa3;
+	memset(&m_diskHeader[0x1c], 0, 4);
+
+	m_is_wii = true;
+	m_addressShift = 2;
+}
+
+void CVolumeDirectory::SetDiskTypeGC()
+{
+	memset(&m_diskHeader[0x18], 0, 4);
+	m_diskHeader[0x1c] = 0xc2;
+	m_diskHeader[0x1d] = 0x33;
+	m_diskHeader[0x1e] = 0x9f;
+	m_diskHeader[0x1f] = 0x3d;
+
+	m_is_wii = false;
+	m_addressShift = 0;
+}
+
+bool CVolumeDirectory::SetApploader(const std::string& _rApploader)
+{
+	if (!_rApploader.empty())
+	{
+		std::string data;
+		if (!File::ReadFileToString(_rApploader, data))
+		{
+			PanicAlertT("Apploader unable to load from file");
+			return false;
+		}
+		size_t apploaderSize = 0x20 + Common::swap32(*(u32*)&data.data()[0x14]) + Common::swap32(*(u32*)&data.data()[0x18]);
+		if (apploaderSize != data.size())
+		{
+			PanicAlertT("Apploader is the wrong size...is it really an apploader?");
+			return false;
+		}
+		m_apploader.resize(apploaderSize);
+		std::copy(data.begin(), data.end(), m_apploader.begin());
+
+		// 32byte aligned (plus 0x20 padding)
+		m_dol_address = ROUND_UP(APPLOADER_ADDRESS + m_apploader.size() + 0x20, 0x20ull);
+		return true;
+	}
+	else
+	{
+		m_apploader.resize(0x20);
+		// Make sure BS2 HLE doesn't try to run the apploader
+		*(u32*)&m_apploader[0x10] = (u32)-1;
+		return false;
+	}
+}
+
+void CVolumeDirectory::SetDOL(const std::string& rDOL)
+{
+	if (!rDOL.empty())
+	{
+		std::string data;
+		File::ReadFileToString(rDOL, data);
+		m_DOL.resize(data.size());
+		std::copy(data.begin(), data.end(), m_DOL.begin());
+
+		Write32((u32)(m_dol_address >> m_addressShift), 0x0420, &m_diskHeader);
+
+		// 32byte aligned (plus 0x20 padding)
+		m_fst_address = ROUND_UP(m_dol_address + m_DOL.size() + 0x20, 0x20ull);
+	}
+}
+
+void CVolumeDirectory::BuildFST()
+{
+	m_FSTData.clear();
+
+	File::FSTEntry rootEntry;
+
+	// read data from physical disk to rootEntry
+	u64 totalEntries = AddDirectoryEntries(m_rootDirectory, rootEntry) + 1;
+
+	m_fstNameOffset = totalEntries * ENTRY_SIZE; // offset in FST nameTable
+	m_FSTData.resize(m_fstNameOffset + m_totalNameSize);
+
+	// if FST hasn't been assigned (ie no apploader/dol setup), set to default
+	if (m_fst_address == 0)
+		m_fst_address = APPLOADER_ADDRESS + 0x2000;
+
+	// 4 byte aligned start of data on disk
+	m_dataStartAddress = ROUND_UP(m_fst_address + m_FSTData.size(), 0x8000ull);
+	u64 curDataAddress = m_dataStartAddress;
+
+	u32 fstOffset = 0;  // Offset within FST data
+	u32 nameOffset = 0; // Offset within name table
+	u32 rootOffset = 0; // Offset of root of FST
+
+	// write root entry
+	WriteEntryData(fstOffset, DIRECTORY_ENTRY, 0, 0, totalEntries);
+
+	for (auto& entry : rootEntry.children)
+	{
+		WriteEntry(entry, fstOffset, nameOffset, curDataAddress, rootOffset);
+	}
+
+	// overflow check
+	_dbg_assert_(DVDINTERFACE, nameOffset == m_totalNameSize);
+
+	// write FST size and location
+	Write32((u32)(m_fst_address >> m_addressShift), 0x0424, &m_diskHeader);
+	Write32((u32)(m_FSTData.size() >> m_addressShift), 0x0428, &m_diskHeader);
+	Write32((u32)(m_FSTData.size() >> m_addressShift), 0x042c, &m_diskHeader);
+}
+
+void CVolumeDirectory::WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, const u8* _Src,
+									 u64& _Address, u64& _Length, u8*& _pBuffer) const
+{
+	if (_Length == 0)
+		return;
+
+	_dbg_assert_(DVDINTERFACE, _Address >= _SrcStartAddress);
+
+	u64 srcOffset = _Address - _SrcStartAddress;
+
+	if (srcOffset < _SrcLength)
+	{
+		u64 srcBytes = _SrcLength - srcOffset;
+		if (_Length < srcBytes)
+			srcBytes = _Length;
+
+		memcpy(_pBuffer, _Src + srcOffset, (size_t)srcBytes);
+
+		_Length -= srcBytes;
+		_pBuffer += srcBytes;
+		_Address += srcBytes;
+	}
+}
+
+void CVolumeDirectory::PadToAddress(u64 _StartAddress, u64& _Address, u64& _Length, u8*& _pBuffer) const
+{
+	if (_StartAddress <= _Address)
+		return;
+
+	u64 padBytes = _StartAddress - _Address;
+	if (padBytes > _Length)
+		padBytes = _Length;
+
+	if (_Length > 0)
+	{
+		memset(_pBuffer, 0, (size_t)padBytes);
+		_Length -= padBytes;
+		_pBuffer += padBytes;
+		_Address += padBytes;
+	}
+}
+
+void CVolumeDirectory::Write32(u32 data, u32 offset, std::vector<u8>* const buffer)
+{
+	(*buffer)[offset++] = (data >> 24);
+	(*buffer)[offset++] = (data >> 16) & 0xff;
+	(*buffer)[offset++] = (data >> 8) & 0xff;
+	(*buffer)[offset] = (data) & 0xff;
+}
+
+void CVolumeDirectory::WriteEntryData(u32& entryOffset, u8 type, u32 nameOffset, u64 dataOffset, u64 length)
+{
+	m_FSTData[entryOffset++] = type;
+
+	m_FSTData[entryOffset++] = (nameOffset >> 16) & 0xff;
+	m_FSTData[entryOffset++] = (nameOffset >> 8) & 0xff;
+	m_FSTData[entryOffset++] = (nameOffset) & 0xff;
+
+	Write32((u32)(dataOffset >> m_addressShift), entryOffset, &m_FSTData);
+	entryOffset += 4;
+
+	Write32((u32)length, entryOffset, &m_FSTData);
+	entryOffset += 4;
+}
+
+void CVolumeDirectory::WriteEntryName(u32& nameOffset, const std::string& name)
+{
+	strncpy((char*)&m_FSTData[nameOffset + m_fstNameOffset], name.c_str(), name.length() + 1);
+
+	nameOffset += (u32)(name.length() + 1);
+}
+
+void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u32& nameOffset, u64& dataOffset, u32 parentEntryNum)
+{
+	if (entry.isDirectory)
+	{
+		u32 myOffset = fstOffset;
+		u32 myEntryNum = myOffset / ENTRY_SIZE;
+		WriteEntryData(fstOffset, DIRECTORY_ENTRY, nameOffset, parentEntryNum, myEntryNum + entry.size + 1);
+		WriteEntryName(nameOffset, entry.virtualName);
+
+		for (const auto& child : entry.children)
+		{
+			WriteEntry(child, fstOffset, nameOffset, dataOffset, myEntryNum);
+		}
+	}
+	else
+	{
+		// put entry in FST
+		WriteEntryData(fstOffset, FILE_ENTRY, nameOffset, dataOffset, entry.size);
+		WriteEntryName(nameOffset, entry.virtualName);
+
+		// write entry to virtual disk
+		_dbg_assert_(DVDINTERFACE, m_virtualDisk.find(dataOffset) == m_virtualDisk.end());
+		m_virtualDisk.insert(make_pair(dataOffset, entry.physicalName));
+
+		// 4 byte aligned
+		dataOffset = ROUND_UP(dataOffset + entry.size, 0x8000ull);
+	}
+}
+
+static u32 ComputeNameSize(const File::FSTEntry& parentEntry)
+{
+	u32 nameSize = 0;
+	const std::vector<File::FSTEntry>& children = parentEntry.children;
+	for (auto it = children.cbegin(); it != children.cend(); ++it)
+	{
+		const File::FSTEntry& entry = *it;
+		if (entry.isDirectory)
+		{
+			nameSize += ComputeNameSize(entry);
+		}
+		nameSize += (u32)entry.virtualName.length() + 1;
+	}
+	return nameSize;
+}
+
+u64 CVolumeDirectory::AddDirectoryEntries(const std::string& _Directory, File::FSTEntry& parentEntry)
+{
+	parentEntry = File::ScanDirectoryTree(_Directory, true);
+	m_totalNameSize += ComputeNameSize(parentEntry);
+	return parentEntry.size;
+}
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h
new file mode 100644
index 0000000000..8053d209d2
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeDirectory.h
@@ -0,0 +1,149 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+namespace File { struct FSTEntry; }
+
+//
+// --- this volume type is used for reading files directly from the hard drive ---
+//
+
+namespace DiscIO
+{
+
+class CVolumeDirectory : public IVolume
+{
+public:
+
+	CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
+		const std::string& _rApploader = "", const std::string& _rDOL = "");
+
+	~CVolumeDirectory();
+
+	static bool IsValidDirectory(const std::string& _rDirectory);
+
+	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
+
+	std::string GetUniqueID() const override;
+	void SetUniqueID(const std::string& _ID);
+
+	std::string GetMakerID() const override;
+
+	u16 GetRevision() const override { return 0; }
+	std::string GetInternalName() const override;
+	std::map<IVolume::ELanguage, std::string> GetNames(bool prefer_long) const override;
+	void SetName(const std::string&);
+
+	u32 GetFSTSize() const override;
+
+	std::string GetApploaderDate() const override;
+	EPlatform GetVolumeType() const override;
+
+	ECountry GetCountry() const override;
+
+	u64 GetSize() const override;
+	u64 GetRawSize() const override;
+
+	void BuildFST();
+
+private:
+	static std::string ExtractDirectoryName(const std::string& _rDirectory);
+
+	void SetDiskTypeWii();
+	void SetDiskTypeGC();
+
+	bool SetApploader(const std::string& _rApploader);
+
+	void SetDOL(const std::string& _rDOL);
+
+	// writing to read buffer
+	void WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, const u8* _Src,
+					   u64& _Address, u64& _Length, u8*& _pBuffer) const;
+
+	void PadToAddress(u64 _StartAddress, u64& _Address, u64& _Length, u8*& _pBuffer) const;
+
+	void Write32(u32 data, u32 offset, std::vector<u8>* const buffer);
+
+	// FST creation
+	void WriteEntryData(u32& entryOffset, u8 type, u32 nameOffset, u64 dataOffset, u64 length);
+	void WriteEntryName(u32& nameOffset, const std::string& name);
+	void WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u32& nameOffset, u64& dataOffset, u32 parentEntryNum);
+
+	// returns number of entries found in _Directory
+	u64 AddDirectoryEntries(const std::string& _Directory, File::FSTEntry& parentEntry);
+
+	std::string m_rootDirectory;
+
+	std::map<u64, std::string> m_virtualDisk;
+
+	u32 m_totalNameSize;
+
+	bool m_is_wii;
+
+	// GameCube has no shift, Wii has 2 bit shift
+	u32 m_addressShift;
+
+	// first address on disk containing file data
+	u64 m_dataStartAddress;
+
+	u64 m_fstNameOffset;
+	std::vector<u8> m_FSTData;
+
+	std::vector<u8> m_diskHeader;
+
+	#pragma pack(push, 1)
+	struct SDiskHeaderInfo
+	{
+		u32 debug_mntr_size;
+		u32 simulated_mem_size;
+		u32 arg_offset;
+		u32 debug_flag;
+		u32 track_location;
+		u32 track_size;
+		u32 country_code;
+		u32 unknown;
+		u32 unknown2;
+
+		// All the data is byteswapped
+		SDiskHeaderInfo()
+		{
+			debug_mntr_size = 0;
+			simulated_mem_size = 0;
+			arg_offset = 0;
+			debug_flag = 0;
+			track_location = 0;
+			track_size = 0;
+			country_code = 0;
+			unknown = 0;
+			unknown2 = 0;
+		}
+	};
+	#pragma pack(pop)
+	std::unique_ptr<SDiskHeaderInfo> m_diskHeaderInfo;
+
+	std::vector<u8> m_apploader;
+	std::vector<u8> m_DOL;
+
+	u64 m_fst_address;
+	u64 m_dol_address;
+
+	static const u8 ENTRY_SIZE = 0x0c;
+	static const u8 FILE_ENTRY = 0;
+	static const u8 DIRECTORY_ENTRY = 1;
+	static const u64 DISKHEADER_ADDRESS = 0;
+	static const u64 DISKHEADERINFO_ADDRESS = 0x440;
+	static const u64 APPLOADER_ADDRESS = 0x2440;
+	static const u32 MAX_NAME_LENGTH = 0x3df;
+};
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
new file mode 100644
index 0000000000..6160c65b24
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -0,0 +1,304 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/ColorUtil.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/FileMonitor.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeGC.h"
+
+namespace DiscIO
+{
+CVolumeGC::CVolumeGC(IBlobReader* _pReader)
+	: m_pReader(_pReader)
+{}
+
+CVolumeGC::~CVolumeGC()
+{
+}
+
+bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const
+{
+	if (decrypt)
+		PanicAlertT("Tried to decrypt data from a non-Wii volume");
+
+	if (m_pReader == nullptr)
+		return false;
+
+	FileMon::FindFilename(_Offset);
+
+	return m_pReader->Read(_Offset, _Length, _pBuffer);
+}
+
+std::string CVolumeGC::GetUniqueID() const
+{
+	static const std::string NO_UID("NO_UID");
+	if (m_pReader == nullptr)
+		return NO_UID;
+
+	char ID[7];
+
+	if (!Read(0, sizeof(ID), reinterpret_cast<u8*>(ID)))
+	{
+		PanicAlertT("Failed to read unique ID from disc image");
+		return NO_UID;
+	}
+
+	ID[6] = '\0';
+
+	return ID;
+}
+
+IVolume::ECountry CVolumeGC::GetCountry() const
+{
+	if (!m_pReader)
+		return COUNTRY_UNKNOWN;
+
+	u8 country_code;
+	m_pReader->Read(3, 1, &country_code);
+
+	return CountrySwitch(country_code);
+}
+
+std::string CVolumeGC::GetMakerID() const
+{
+	if (m_pReader == nullptr)
+		return std::string();
+
+	char makerID[3];
+	if (!Read(0x4, 0x2, (u8*)&makerID))
+		return std::string();
+	makerID[2] = '\0';
+
+	return makerID;
+}
+
+u16 CVolumeGC::GetRevision() const
+{
+	if (!m_pReader)
+		return 0;
+
+	u8 revision;
+	if (!Read(7, 1, &revision))
+		return 0;
+
+	return revision;
+}
+
+std::string CVolumeGC::GetInternalName() const
+{
+	char name[0x60];
+	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
+		return DecodeString(name);
+	else
+		return "";
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeGC::GetNames(bool prefer_long) const
+{
+	return ReadMultiLanguageStrings(false, prefer_long);
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeGC::GetDescriptions() const
+{
+	return ReadMultiLanguageStrings(true);
+}
+
+std::string CVolumeGC::GetCompany() const
+{
+	if (!LoadBannerFile())
+		return "";
+
+	auto const pBanner = (GCBanner*)m_banner_file.data();
+	std::string company = DecodeString(pBanner->comment[0].longMaker);
+
+	if (company.empty())
+		company = DecodeString(pBanner->comment[0].shortMaker);
+
+	return company;
+}
+
+std::vector<u32> CVolumeGC::GetBanner(int* width, int* height) const
+{
+	if (!LoadBannerFile())
+	{
+		*width = 0;
+		*height = 0;
+		return std::vector<u32>();
+	}
+
+	std::vector<u32> image_buffer(GC_BANNER_WIDTH * GC_BANNER_HEIGHT);
+	auto const pBanner = (GCBanner*)m_banner_file.data();
+	ColorUtil::decode5A3image(image_buffer.data(), pBanner->image, GC_BANNER_WIDTH, GC_BANNER_HEIGHT);
+	*width = GC_BANNER_WIDTH;
+	*height = GC_BANNER_HEIGHT;
+	return image_buffer;
+}
+
+u32 CVolumeGC::GetFSTSize() const
+{
+	if (m_pReader == nullptr)
+		return 0;
+
+	u32 size;
+	if (!Read(0x428, 0x4, (u8*)&size))
+		return 0;
+
+	return Common::swap32(size);
+}
+
+std::string CVolumeGC::GetApploaderDate() const
+{
+	if (m_pReader == nullptr)
+		return std::string();
+
+	char date[16];
+	if (!Read(0x2440, 0x10, (u8*)&date))
+		return std::string();
+	// Should be 0 already, but just in case
+	date[10] = '\0';
+
+	return date;
+}
+
+u64 CVolumeGC::GetSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetDataSize();
+	else
+		return 0;
+}
+
+u64 CVolumeGC::GetRawSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetRawSize();
+	else
+		return 0;
+}
+
+u8 CVolumeGC::GetDiscNumber() const
+{
+	u8 disc_number;
+	Read(6, 1, &disc_number);
+	return disc_number;
+}
+
+IVolume::EPlatform CVolumeGC::GetVolumeType() const
+{
+	return GAMECUBE_DISC;
+}
+
+// Returns true if the loaded banner file is valid,
+// regardless of whether it was loaded by the current call
+bool CVolumeGC::LoadBannerFile() const
+{
+	// The methods ReadMultiLanguageStrings, GetCompany and GetBanner
+	// need to access the opening.bnr file. These methods are
+	// usually called one after another. The file is cached in
+	// RAM to avoid reading it from the disc several times, but
+	// if none of these methods are called, the file is never loaded.
+
+	// If opening.bnr has been loaded already, return immediately
+	if (m_banner_file_type != BANNER_NOT_LOADED)
+		return m_banner_file_type != BANNER_INVALID;
+
+	std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this));
+	size_t file_size = (size_t)file_system->GetFileSize("opening.bnr");
+	if (file_size == BNR1_SIZE || file_size == BNR2_SIZE)
+	{
+		m_banner_file.resize(file_size);
+		file_system->ReadFile("opening.bnr", m_banner_file.data(), m_banner_file.size());
+
+		u32 bannerSignature = *(u32*)m_banner_file.data();
+		if (file_size == BNR1_SIZE && bannerSignature == 0x31524e42)        // "BNR1"
+		{
+			m_banner_file_type = BANNER_BNR1;
+		}
+		else if (file_size == BNR2_SIZE && bannerSignature == 0x32524e42)   // "BNR2"
+		{
+			m_banner_file_type = BANNER_BNR2;
+		}
+		else
+		{
+			m_banner_file_type = BANNER_INVALID;
+			WARN_LOG(DISCIO, "Invalid opening.bnr. Type: %0x Size: %0lx", bannerSignature, (unsigned long)file_size);
+		}
+	}
+	else
+	{
+		m_banner_file_type = BANNER_INVALID;
+		WARN_LOG(DISCIO, "Invalid opening.bnr. Size: %0lx", (unsigned long)file_size);
+	}
+
+	return m_banner_file_type != BANNER_INVALID;
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeGC::ReadMultiLanguageStrings(bool description, bool prefer_long) const
+{
+	std::map<ELanguage, std::string> strings;
+
+	if (!LoadBannerFile())
+		return strings;
+
+	u32 number_of_languages = 0;
+	ELanguage start_language;
+	bool is_japanese = GetCountry() == ECountry::COUNTRY_JAPAN;
+
+	switch (m_banner_file_type)
+	{
+	case BANNER_BNR1:	// NTSC
+		number_of_languages = 1;
+		start_language = is_japanese ? ELanguage::LANGUAGE_JAPANESE : ELanguage::LANGUAGE_ENGLISH;
+		break;
+
+	case BANNER_BNR2:	// PAL
+		number_of_languages = 6;
+		start_language = ELanguage::LANGUAGE_ENGLISH;
+		break;
+
+	// Shouldn't happen
+	case BANNER_INVALID:
+	case BANNER_NOT_LOADED:
+		break;
+	}
+
+	auto const banner = reinterpret_cast<const GCBanner*>(m_banner_file.data());
+
+	for (u32 i = 0; i < number_of_languages; ++i)
+	{
+		GCBannerComment comment = banner->comment[i];
+		std::string string;
+
+		if (description)
+		{
+			string = DecodeString(comment.comment);
+		}
+		else // Title
+		{
+			if (prefer_long)
+				string = DecodeString(comment.longTitle);
+
+			if (string.empty())
+				string = DecodeString(comment.shortTitle);
+		}
+
+		if (!string.empty())
+			strings[(ELanguage)(start_language + i)] = string;
+	}
+
+	return strings;
+}
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
new file mode 100644
index 0000000000..35599cacf6
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -0,0 +1,87 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+// --- this volume type is used for GC disc images ---
+
+namespace DiscIO
+{
+
+class IBlobReader;
+
+class CVolumeGC : public IVolume
+{
+public:
+	CVolumeGC(IBlobReader* _pReader);
+	~CVolumeGC();
+	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
+	std::string GetUniqueID() const override;
+	std::string GetMakerID() const override;
+	u16 GetRevision() const override;
+	virtual std::string GetInternalName() const override;
+	std::map<ELanguage, std::string> GetNames(bool prefer_long) const override;
+	std::map<ELanguage, std::string> GetDescriptions() const override;
+	std::string GetCompany() const override;
+	std::vector<u32> GetBanner(int* width, int* height) const override;
+	u32 GetFSTSize() const override;
+	std::string GetApploaderDate() const override;
+	u8 GetDiscNumber() const override;
+
+	EPlatform GetVolumeType() const override;
+	ECountry GetCountry() const override;
+	u64 GetSize() const override;
+	u64 GetRawSize() const override;
+
+private:
+	bool LoadBannerFile() const;
+	std::map<ELanguage, std::string> ReadMultiLanguageStrings(bool description, bool prefer_long = true) const;
+
+	static const int GC_BANNER_WIDTH = 96;
+	static const int GC_BANNER_HEIGHT = 32;
+
+	// Banner Comment
+	struct GCBannerComment
+	{
+		char shortTitle[32]; // Short game title shown in IPL menu
+		char shortMaker[32]; // Short developer, publisher names shown in IPL menu
+		char longTitle[64];  // Long game title shown in IPL game start screen
+		char longMaker[64];  // Long developer, publisher names shown in IPL game start screen
+		char comment[128];   // Game description shown in IPL game start screen in two lines.
+	};
+
+	struct GCBanner
+	{
+		u32 id; // "BNR1" for NTSC, "BNR2" for PAL
+		u32 padding[7];
+		u16 image[GC_BANNER_WIDTH * GC_BANNER_HEIGHT]; // RGB5A3 96x32 image
+		GCBannerComment comment[6]; // Comments in six languages (only one for BNR1 type)
+	};
+
+	static const size_t BNR1_SIZE = sizeof(GCBanner) - sizeof(GCBannerComment) * 5;
+	static const size_t BNR2_SIZE = sizeof(GCBanner);
+
+	enum BannerFileType
+	{
+		BANNER_NOT_LOADED,
+		BANNER_INVALID,
+		BANNER_BNR1,
+		BANNER_BNR2
+	};
+
+	mutable BannerFileType m_banner_file_type = BANNER_NOT_LOADED;
+	mutable std::vector<u8> m_banner_file;
+
+	std::unique_ptr<IBlobReader> m_pReader;
+};
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
new file mode 100644
index 0000000000..9821e93862
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -0,0 +1,144 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeWad.h"
+
+#define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40)
+
+namespace DiscIO
+{
+CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
+	: m_pReader(_pReader), m_offset(0), m_tmd_offset(0), m_opening_bnr_offset(0),
+	m_hdr_size(0), m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0)
+{
+	// Source: http://wiibrew.org/wiki/WAD_files
+	Read(0x00, 4, (u8*)&m_hdr_size);
+	Read(0x08, 4, (u8*)&m_cert_size);
+	Read(0x10, 4, (u8*)&m_tick_size);
+	Read(0x14, 4, (u8*)&m_tmd_size);
+	Read(0x18, 4, (u8*)&m_data_size);
+
+	m_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
+	m_tmd_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
+	m_opening_bnr_offset = m_tmd_offset + ALIGN_40(m_tmd_size) + ALIGN_40(m_data_size);
+}
+
+CVolumeWAD::~CVolumeWAD()
+{
+}
+
+bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const
+{
+	if (decrypt)
+		PanicAlertT("Tried to decrypt data from a non-Wii volume");
+
+	if (m_pReader == nullptr)
+		return false;
+
+	return m_pReader->Read(_Offset, _Length, _pBuffer);
+}
+
+IVolume::ECountry CVolumeWAD::GetCountry() const
+{
+	if (!m_pReader)
+		return COUNTRY_UNKNOWN;
+
+	// read the last digit of the titleID in the ticket
+	u8 country_code;
+	Read(m_tmd_offset + 0x0193, 1, &country_code);
+
+	if (country_code == 2) // SYSMENU
+	{
+		u16 title_version = 0;
+		Read(m_tmd_offset + 0x01dc, 2, (u8*)&title_version);
+		country_code = GetSysMenuRegion(Common::swap16(title_version));
+	}
+
+	return CountrySwitch(country_code);
+}
+
+std::string CVolumeWAD::GetUniqueID() const
+{
+	std::string temp = GetMakerID();
+
+	char GameCode[8];
+	if (!Read(m_offset + 0x01E0, 4, (u8*)GameCode))
+		return "0";
+
+	GameCode[4] = temp.at(0);
+	GameCode[5] = temp.at(1);
+	GameCode[6] = 0;
+
+	return GameCode;
+}
+
+std::string CVolumeWAD::GetMakerID() const
+{
+	char temp[3] = {1};
+	// Some weird channels use 0x0000 in place of the MakerID, so we need a check there
+	if (!Read(0x198 + m_tmd_offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
+		return "00";
+
+	temp[2] = 0;
+
+	return temp;
+}
+
+bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
+{
+	if (!Read(m_offset + 0x01DC, 8, _pBuffer))
+		return false;
+
+	return true;
+}
+
+u16 CVolumeWAD::GetRevision() const
+{
+	u16 revision;
+	if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision))
+		return 0;
+
+	return Common::swap16(revision);
+}
+
+IVolume::EPlatform CVolumeWAD::GetVolumeType() const
+{
+	return WII_WAD;
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeWAD::GetNames(bool prefer_long) const
+{
+	std::vector<u8> name_data(NAMES_TOTAL_BYTES);
+	if (!Read(m_opening_bnr_offset + 0x9C, NAMES_TOTAL_BYTES, name_data.data()))
+		return std::map<IVolume::ELanguage, std::string>();
+	return ReadWiiNames(name_data);
+}
+
+u64 CVolumeWAD::GetSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetDataSize();
+	else
+		return 0;
+}
+
+u64 CVolumeWAD::GetRawSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetRawSize();
+	else
+		return 0;
+}
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
new file mode 100644
index 0000000000..16168aefad
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -0,0 +1,57 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+// --- this volume type is used for Wad files ---
+// Some of this code might look redundant with the CNANDContentLoader class, however,
+// We do not do any decryption here, we do raw read, so things are -Faster-
+
+namespace DiscIO
+{
+
+class IBlobReader;
+
+class CVolumeWAD : public IVolume
+{
+public:
+	CVolumeWAD(IBlobReader* _pReader);
+	~CVolumeWAD();
+	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
+	bool GetTitleID(u8* _pBuffer) const override;
+	std::string GetUniqueID() const override;
+	std::string GetMakerID() const override;
+	u16 GetRevision() const override;
+	std::string GetInternalName() const override { return ""; }
+	std::map<IVolume::ELanguage, std::string> GetNames(bool prefer_long) const override;
+	u32 GetFSTSize() const override { return 0; }
+	std::string GetApploaderDate() const override { return ""; }
+
+	EPlatform GetVolumeType() const override;
+
+	ECountry GetCountry() const override;
+	u64 GetSize() const override;
+	u64 GetRawSize() const override;
+
+private:
+	std::unique_ptr<IBlobReader> m_pReader;
+	u32 m_offset;
+	u32 m_tmd_offset;
+	u32 m_opening_bnr_offset;
+	u32 m_hdr_size;
+	u32 m_cert_size;
+	u32 m_tick_size;
+	u32 m_tmd_size;
+	u32 m_data_size;
+};
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
new file mode 100644
index 0000000000..ec5564f954
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -0,0 +1,334 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+#include <polarssl/aes.h>
+#include <polarssl/sha1.h>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/FileMonitor.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/VolumeGC.h"
+#include "DiscIO/VolumeWiiCrypted.h"
+
+namespace DiscIO
+{
+
+CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
+									 const unsigned char* _pVolumeKey)
+	: m_pReader(_pReader),
+	m_AES_ctx(new aes_context),
+	m_pBuffer(nullptr),
+	m_VolumeOffset(_VolumeOffset),
+	m_dataOffset(0x20000),
+	m_LastDecryptedBlockOffset(-1)
+{
+	aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128);
+	m_pBuffer = new u8[s_block_total_size];
+}
+
+bool CVolumeWiiCrypted::ChangePartition(u64 offset)
+{
+	m_VolumeOffset = offset;
+	m_LastDecryptedBlockOffset = -1;
+
+	u8 volume_key[16];
+	DiscIO::VolumeKeyForParition(*m_pReader, offset, volume_key);
+	aes_setkey_dec(m_AES_ctx.get(), volume_key, 128);
+	return true;
+}
+
+CVolumeWiiCrypted::~CVolumeWiiCrypted()
+{
+	delete[] m_pBuffer;
+	m_pBuffer = nullptr;
+}
+
+bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool decrypt) const
+{
+	if (m_pReader == nullptr)
+		return false;
+
+	if (!decrypt)
+		return m_pReader->Read(_ReadOffset, _Length, _pBuffer);
+
+	FileMon::FindFilename(_ReadOffset);
+
+	while (_Length > 0)
+	{
+		// Calculate block offset
+		u64 Block  = _ReadOffset / s_block_data_size;
+		u64 Offset = _ReadOffset % s_block_data_size;
+
+		if (m_LastDecryptedBlockOffset != Block)
+		{
+			// Read the current block
+			if (!m_pReader->Read(m_VolumeOffset + m_dataOffset + Block * s_block_total_size, s_block_total_size, m_pBuffer))
+				return false;
+
+			// Decrypt the block's data.
+			// 0x3D0 - 0x3DF in m_pBuffer will be overwritten,
+			// but that won't affect anything, because we won't
+			// use the content of m_pBuffer anymore after this
+			aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, s_block_data_size, m_pBuffer + 0x3D0,
+			              m_pBuffer + s_block_header_size, m_LastDecryptedBlock);
+			m_LastDecryptedBlockOffset = Block;
+
+			// The only thing we currently use from the 0x000 - 0x3FF part
+			// of the block is the IV (at 0x3D0), but it also contains SHA-1
+			// hashes that IOS uses to check that discs aren't tampered with.
+			// http://wiibrew.org/wiki/Wii_Disc#Encrypted
+		}
+
+		// Copy the decrypted data
+		u64 MaxSizeToCopy = s_block_data_size - Offset;
+		u64 CopySize = (_Length > MaxSizeToCopy) ? MaxSizeToCopy : _Length;
+		memcpy(_pBuffer, &m_LastDecryptedBlock[Offset], (size_t)CopySize);
+
+		// Update offsets
+		_Length     -= CopySize;
+		_pBuffer    += CopySize;
+		_ReadOffset += CopySize;
+	}
+
+	return true;
+}
+
+bool CVolumeWiiCrypted::GetTitleID(u8* _pBuffer) const
+{
+	// Tik is at m_VolumeOffset size 0x2A4
+	// TitleID offset in tik is 0x1DC
+	return Read(m_VolumeOffset + 0x1DC, 8, _pBuffer, false);
+}
+
+std::unique_ptr<u8[]> CVolumeWiiCrypted::GetTMD(u32 *size) const
+{
+	*size = 0;
+	u32 tmd_size;
+	u32 tmd_address;
+
+	Read(m_VolumeOffset + 0x2a4, sizeof(u32), (u8*)&tmd_size, false);
+	Read(m_VolumeOffset + 0x2a8, sizeof(u32), (u8*)&tmd_address, false);
+	tmd_size = Common::swap32(tmd_size);
+	tmd_address = Common::swap32(tmd_address) << 2;
+
+	if (tmd_size > 1024 * 1024 * 4)
+	{
+		// The size is checked so that a malicious or corrupt ISO
+		// can't force Dolphin to allocate up to 4 GiB of memory.
+		// 4 MiB should be much bigger than the size of TMDs and much smaller
+		// than the amount of RAM in a computer that can run Dolphin.
+		PanicAlert("TMD > 4 MiB");
+		tmd_size = 1024 * 1024 * 4;
+	}
+
+	std::unique_ptr<u8[]> buf{ new u8[tmd_size] };
+	Read(m_VolumeOffset + tmd_address, tmd_size, buf.get(), false);
+	*size = tmd_size;
+	return buf;
+}
+
+std::string CVolumeWiiCrypted::GetUniqueID() const
+{
+	if (m_pReader == nullptr)
+		return std::string();
+
+	char ID[7];
+
+	if (!Read(0, 6, (u8*)ID, false))
+		return std::string();
+
+	ID[6] = '\0';
+
+	return ID;
+}
+
+
+IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
+{
+	if (!m_pReader)
+		return COUNTRY_UNKNOWN;
+
+	u8 country_code;
+	m_pReader->Read(3, 1, &country_code);
+
+	return CountrySwitch(country_code);
+}
+
+std::string CVolumeWiiCrypted::GetMakerID() const
+{
+	if (m_pReader == nullptr)
+		return std::string();
+
+	char makerID[3];
+
+	if (!Read(0x4, 0x2, (u8*)&makerID, false))
+		return std::string();
+
+	makerID[2] = '\0';
+
+	return makerID;
+}
+
+u16 CVolumeWiiCrypted::GetRevision() const
+{
+	if (!m_pReader)
+		return 0;
+
+	u8 revision;
+	if (!m_pReader->Read(7, 1, &revision))
+		return 0;
+
+	return revision;
+}
+
+std::string CVolumeWiiCrypted::GetInternalName() const
+{
+	char name_buffer[0x60];
+	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name_buffer, false))
+		return DecodeString(name_buffer);
+
+	return "";
+}
+
+std::map<IVolume::ELanguage, std::string> CVolumeWiiCrypted::GetNames(bool prefer_long) const
+{
+	std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this));
+	std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES);
+	opening_bnr.resize(file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C));
+	return ReadWiiNames(opening_bnr);
+}
+
+u32 CVolumeWiiCrypted::GetFSTSize() const
+{
+	if (m_pReader == nullptr)
+		return 0;
+
+	u32 size;
+
+	if (!Read(0x428, 0x4, (u8*)&size, true))
+		return 0;
+
+	return Common::swap32(size);
+}
+
+std::string CVolumeWiiCrypted::GetApploaderDate() const
+{
+	if (m_pReader == nullptr)
+		return std::string();
+
+	char date[16];
+
+	if (!Read(0x2440, 0x10, (u8*)&date, true))
+		return std::string();
+
+	date[10] = '\0';
+
+	return date;
+}
+
+IVolume::EPlatform CVolumeWiiCrypted::GetVolumeType() const
+{
+	return WII_DISC;
+}
+
+u8 CVolumeWiiCrypted::GetDiscNumber() const
+{
+	u8 disc_number;
+	m_pReader->Read(6, 1, &disc_number);
+	return disc_number;
+}
+
+u64 CVolumeWiiCrypted::GetSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetDataSize();
+	else
+		return 0;
+}
+
+u64 CVolumeWiiCrypted::GetRawSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetRawSize();
+	else
+		return 0;
+}
+
+bool CVolumeWiiCrypted::CheckIntegrity() const
+{
+	// Get partition data size
+	u32 partSizeDiv4;
+	Read(m_VolumeOffset + 0x2BC, 4, (u8*)&partSizeDiv4, false);
+	u64 partDataSize = (u64)Common::swap32(partSizeDiv4) * 4;
+
+	u32 nClusters = (u32)(partDataSize / 0x8000);
+	for (u32 clusterID = 0; clusterID < nClusters; ++clusterID)
+	{
+		u64 clusterOff = m_VolumeOffset + m_dataOffset + (u64)clusterID * 0x8000;
+
+		// Read and decrypt the cluster metadata
+		u8 clusterMDCrypted[0x400];
+		u8 clusterMD[0x400];
+		u8 IV[16] = { 0 };
+		if (!m_pReader->Read(clusterOff, 0x400, clusterMDCrypted))
+		{
+			NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read metadata", clusterID);
+			return false;
+		}
+		aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, 0x400, IV, clusterMDCrypted, clusterMD);
+
+
+		// Some clusters have invalid data and metadata because they aren't
+		// meant to be read by the game (for example, holes between files). To
+		// try to avoid reporting errors because of these clusters, we check
+		// the 0x00 paddings in the metadata.
+		//
+		// This may cause some false negatives though: some bad clusters may be
+		// skipped because they are *too* bad and are not even recognized as
+		// valid clusters. To be improved.
+		bool meaningless = false;
+		for (u32 idx = 0x26C; idx < 0x280; ++idx)
+			if (clusterMD[idx] != 0)
+				meaningless = true;
+
+		if (meaningless)
+			continue;
+
+		u8 clusterData[0x7C00];
+		if (!Read((u64)clusterID * 0x7C00, 0x7C00, clusterData, true))
+		{
+			NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read data", clusterID);
+			return false;
+		}
+
+		for (u32 hashID = 0; hashID < 31; ++hashID)
+		{
+			u8 hash[20];
+
+			sha1(clusterData + hashID * 0x400, 0x400, hash);
+
+			// Note that we do not use strncmp here
+			if (memcmp(hash, clusterMD + hashID * 20, 20))
+			{
+				NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: hash %d is invalid", clusterID, hashID);
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+} // namespace
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
new file mode 100644
index 0000000000..6fd687db3d
--- /dev/null
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -0,0 +1,68 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+#include <polarssl/aes.h>
+
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+// --- this volume type is used for encrypted Wii images ---
+
+namespace DiscIO
+{
+
+class IBlobReader;
+
+class CVolumeWiiCrypted : public IVolume
+{
+public:
+	CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, const unsigned char* _pVolumeKey);
+	~CVolumeWiiCrypted();
+	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
+	bool GetTitleID(u8* _pBuffer) const override;
+	virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
+	std::string GetUniqueID() const override;
+	std::string GetMakerID() const override;
+	u16 GetRevision() const override;
+	std::string GetInternalName() const override;
+	std::map<IVolume::ELanguage, std::string> GetNames(bool prefer_long) const override;
+	u32 GetFSTSize() const override;
+	std::string GetApploaderDate() const override;
+	u8 GetDiscNumber() const override;
+
+	EPlatform GetVolumeType() const override;
+	bool SupportsIntegrityCheck() const override { return true; }
+	bool CheckIntegrity() const override;
+	bool ChangePartition(u64 offset) override;
+
+	ECountry GetCountry() const override;
+	u64 GetSize() const override;
+	u64 GetRawSize() const override;
+
+
+
+private:
+	static const unsigned int s_block_header_size = 0x0400;
+	static const unsigned int s_block_data_size   = 0x7C00;
+	static const unsigned int s_block_total_size  = s_block_header_size + s_block_data_size;
+
+	std::unique_ptr<IBlobReader> m_pReader;
+	std::unique_ptr<aes_context> m_AES_ctx;
+
+	u8* m_pBuffer;
+
+	u64 m_VolumeOffset;
+	u64 m_dataOffset;
+
+	mutable u64 m_LastDecryptedBlockOffset;
+	mutable unsigned char m_LastDecryptedBlock[s_block_data_size];
+};
+
+} // namespace
diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp
new file mode 100644
index 0000000000..ef90026621
--- /dev/null
+++ b/Source/Core/DiscIO/WbfsBlob.cpp
@@ -0,0 +1,195 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/WbfsBlob.h"
+
+namespace DiscIO
+{
+static const u64 WII_SECTOR_SIZE = 0x8000;
+static const u64 WII_SECTOR_COUNT = 143432 * 2;
+static const u64 WII_DISC_HEADER_SIZE = 256;
+
+static inline u64 align(u64 value, u64 bounds)
+{
+	return (value + (bounds - 1)) & (~(bounds - 1));
+}
+
+WbfsFileReader::WbfsFileReader(const std::string& filename)
+	: m_total_files(0), m_size(0), m_wlba_table(nullptr), m_good(true)
+{
+	if (filename.length() < 4 || !OpenFiles(filename) || !ReadHeader())
+	{
+		m_good = false;
+		return;
+	}
+
+	// Grab disc info (assume slot 0, checked in ReadHeader())
+	m_wlba_table = new u16[m_blocks_per_disc];
+	m_files[0]->file.Seek(m_hd_sector_size + WII_DISC_HEADER_SIZE /*+ i * m_disc_info_size*/, SEEK_SET);
+	m_files[0]->file.ReadBytes(m_wlba_table, m_blocks_per_disc * sizeof(u16));
+}
+
+WbfsFileReader::~WbfsFileReader()
+{
+	for (file_entry* entry : m_files)
+		delete entry;
+
+	delete[] m_wlba_table;
+}
+
+bool WbfsFileReader::OpenFiles(const std::string& filename)
+{
+	m_total_files = 0;
+
+	while (true)
+	{
+		file_entry* new_entry = new file_entry;
+
+		// Replace last character with index (e.g. wbfs = wbf1)
+		std::string path = filename;
+		if (m_total_files != 0)
+		{
+			path[path.length() - 1] = '0' + m_total_files;
+		}
+
+		if (!new_entry->file.Open(path, "rb"))
+		{
+			delete new_entry;
+			return 0 != m_total_files;
+		}
+
+		new_entry->base_address = m_size;
+		new_entry->size = new_entry->file.GetSize();
+		m_size += new_entry->size;
+
+		m_total_files++;
+		m_files.push_back(new_entry);
+	}
+}
+
+bool WbfsFileReader::ReadHeader()
+{
+	m_files[0]->file.Seek(4, SEEK_SET);
+
+	// Read hd size info
+	m_files[0]->file.ReadBytes(&m_hd_sector_count, 4);
+	m_hd_sector_count = Common::swap32(m_hd_sector_count);
+
+	m_files[0]->file.ReadBytes(&m_hd_sector_shift, 1);
+	m_hd_sector_size = 1ull << m_hd_sector_shift;
+
+	if (m_size != (m_hd_sector_count * m_hd_sector_size))
+		return false;
+
+	// Read wbfs cluster info
+	m_files[0]->file.ReadBytes(&m_wbfs_sector_shift, 1);
+	m_wbfs_sector_size = 1ull << m_wbfs_sector_shift;
+	m_wbfs_sector_count = m_size / m_wbfs_sector_size;
+
+	if (m_wbfs_sector_size < WII_SECTOR_SIZE)
+		return false;
+
+	m_blocks_per_disc = (WII_SECTOR_COUNT * WII_SECTOR_SIZE) / m_wbfs_sector_size;
+	m_disc_info_size = align(WII_DISC_HEADER_SIZE + m_blocks_per_disc * 2, m_hd_sector_size);
+
+	// Read disc table
+	m_files[0]->file.Seek(2, SEEK_CUR);
+	m_files[0]->file.ReadBytes(m_disc_table, 500);
+
+	if (m_disc_table[0] == 0)
+		return false;
+
+	return true;
+}
+
+bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
+{
+	while (nbytes)
+	{
+		u64 read_size = 0;
+		File::IOFile& data_file = SeekToCluster(offset, &read_size);
+		read_size = (read_size > nbytes) ? nbytes : read_size;
+
+		if (!data_file.ReadBytes(out_ptr, read_size))
+		{
+			data_file.Clear();
+			return false;
+		}
+
+		out_ptr += read_size;
+		nbytes -= read_size;
+		offset += read_size;
+	}
+
+	return true;
+}
+
+File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
+{
+	u64 base_cluster = (offset >> m_wbfs_sector_shift);
+	if (base_cluster < m_blocks_per_disc)
+	{
+		u64 cluster_address = m_wbfs_sector_size * Common::swap16(m_wlba_table[base_cluster]);
+		u64 cluster_offset = offset & (m_wbfs_sector_size - 1);
+		u64 final_address = cluster_address + cluster_offset;
+
+		for (u32 i = 0; i != m_total_files; i++)
+		{
+			if (final_address < (m_files[i]->base_address + m_files[i]->size))
+			{
+				m_files[i]->file.Seek(final_address - m_files[i]->base_address, SEEK_SET);
+				if (available)
+				{
+					u64 till_end_of_file = m_files[i]->size - (final_address - m_files[i]->base_address);
+					u64 till_end_of_sector = m_wbfs_sector_size - cluster_offset;
+					*available = std::min(till_end_of_file, till_end_of_sector);
+				}
+
+				return m_files[i]->file;
+			}
+		}
+	}
+
+	PanicAlert("Read beyond end of disc");
+	m_files[0]->file.Seek(0, SEEK_SET);
+	return m_files[0]->file;
+}
+
+WbfsFileReader* WbfsFileReader::Create(const std::string& filename)
+{
+	WbfsFileReader* reader = new WbfsFileReader(filename);
+
+	if (reader->IsGood())
+	{
+		return reader;
+	}
+	else
+	{
+		delete reader;
+		return nullptr;
+	}
+}
+
+bool IsWbfsBlob(const std::string& filename)
+{
+	File::IOFile f(filename, "rb");
+
+	u8 magic[4] = {0, 0, 0, 0};
+	f.ReadBytes(&magic, 4);
+
+	return (magic[0] == 'W') &&
+	       (magic[1] == 'B') &&
+	       (magic[2] == 'F') &&
+	       (magic[3] == 'S');
+}
+
+}  // namespace
diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h
new file mode 100644
index 0000000000..f0a95b170c
--- /dev/null
+++ b/Source/Core/DiscIO/WbfsBlob.h
@@ -0,0 +1,69 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "DiscIO/Blob.h"
+
+namespace DiscIO
+{
+
+class WbfsFileReader : public IBlobReader
+{
+public:
+	static WbfsFileReader* Create(const std::string& filename);
+
+	u64 GetDataSize() const override { return m_size; }
+	u64 GetRawSize() const override { return m_size; }
+	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
+
+private:
+	WbfsFileReader(const std::string& filename);
+	~WbfsFileReader();
+
+	bool OpenFiles(const std::string& filename);
+	bool ReadHeader();
+
+	File::IOFile& SeekToCluster(u64 offset, u64* available);
+	bool IsGood() {return m_good;}
+
+
+	struct file_entry
+	{
+		File::IOFile file;
+		u64 base_address;
+		u64 size;
+	};
+
+	std::vector<file_entry*> m_files;
+
+	u32 m_total_files;
+	u64 m_size;
+
+	u64 m_hd_sector_size;
+	u8 m_hd_sector_shift;
+	u32 m_hd_sector_count;
+
+	u64 m_wbfs_sector_size;
+	u8 m_wbfs_sector_shift;
+	u64 m_wbfs_sector_count;
+	u64 m_disc_info_size;
+
+	u8 m_disc_table[500];
+
+	u16* m_wlba_table;
+	u64 m_blocks_per_disc;
+
+	bool m_good;
+};
+
+bool IsWbfsBlob(const std::string& filename);
+
+
+}  // namespace
diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp
new file mode 100644
index 0000000000..f6b8574983
--- /dev/null
+++ b/Source/Core/DiscIO/WiiWad.cpp
@@ -0,0 +1,144 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#include <cstddef>
+#include <memory>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/Logging/Log.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/WiiWad.h"
+
+namespace DiscIO
+{
+
+class CBlobBigEndianReader
+{
+public:
+	CBlobBigEndianReader(DiscIO::IBlobReader& _rReader) : m_rReader(_rReader) {}
+
+	u32 Read32(u64 _Offset)
+	{
+		u32 Temp;
+		m_rReader.Read(_Offset, 4, (u8*)&Temp);
+		return(Common::swap32(Temp));
+	}
+
+private:
+	DiscIO::IBlobReader& m_rReader;
+};
+
+WiiWAD::WiiWAD(const std::string& name)
+{
+	std::unique_ptr<IBlobReader> reader(DiscIO::CreateBlobReader(name));
+	if (reader == nullptr || File::IsDirectory(name))
+	{
+		m_Valid = false;
+		return;
+	}
+
+	m_Valid = ParseWAD(*reader);
+}
+
+WiiWAD::~WiiWAD()
+{
+	if (m_Valid)
+	{
+		delete[] m_pCertificateChain;
+		delete[] m_pTicket;
+		delete[] m_pTMD;
+		delete[] m_pDataApp;
+		delete[] m_pFooter;
+	}
+}
+
+u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
+{
+	if (_Size > 0)
+	{
+		u8* pTmpBuffer = new u8[_Size];
+		_dbg_assert_msg_(BOOT, pTmpBuffer!=nullptr, "WiiWAD: Can't allocate memory for WAD entry");
+
+		if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
+		{
+			ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
+			PanicAlertT("WiiWAD: Could not read from file");
+		}
+		return pTmpBuffer;
+	}
+	return nullptr;
+}
+
+
+bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
+{
+	CBlobBigEndianReader ReaderBig(_rReader);
+
+	// get header size
+	u32 HeaderSize = ReaderBig.Read32(0);
+	if (HeaderSize != 0x20)
+	{
+		_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
+		return false;
+	}
+
+	// get header
+	u8 Header[0x20];
+	_rReader.Read(0, HeaderSize, Header);
+	u32 HeaderType = ReaderBig.Read32(0x4);
+	if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
+		return false;
+
+	m_CertificateChainSize    = ReaderBig.Read32(0x8);
+	u32 Reserved              = ReaderBig.Read32(0xC);
+	m_TicketSize              = ReaderBig.Read32(0x10);
+	m_TMDSize                 = ReaderBig.Read32(0x14);
+	m_DataAppSize             = ReaderBig.Read32(0x18);
+	m_FooterSize              = ReaderBig.Read32(0x1C);
+
+	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG)
+		_dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
+
+	u32 Offset = 0x40;
+	m_pCertificateChain   = CreateWADEntry(_rReader, m_CertificateChainSize, Offset);  Offset += ROUND_UP(m_CertificateChainSize, 0x40);
+	m_pTicket             = CreateWADEntry(_rReader, m_TicketSize, Offset);            Offset += ROUND_UP(m_TicketSize, 0x40);
+	m_pTMD                = CreateWADEntry(_rReader, m_TMDSize, Offset);               Offset += ROUND_UP(m_TMDSize, 0x40);
+	m_pDataApp            = CreateWADEntry(_rReader, m_DataAppSize, Offset);           Offset += ROUND_UP(m_DataAppSize, 0x40);
+	m_pFooter             = CreateWADEntry(_rReader, m_FooterSize, Offset);            Offset += ROUND_UP(m_FooterSize, 0x40);
+
+	return true;
+}
+
+bool WiiWAD::IsWiiWAD(const std::string& name)
+{
+	std::unique_ptr<IBlobReader> blob_reader(DiscIO::CreateBlobReader(name));
+	if (blob_reader == nullptr)
+		return false;
+
+	CBlobBigEndianReader big_endian_reader(*blob_reader);
+	bool result = false;
+
+	// check for Wii wad
+	if (big_endian_reader.Read32(0x00) == 0x20)
+	{
+		u32 wad_type = big_endian_reader.Read32(0x04);
+		switch (wad_type)
+		{
+		case 0x49730000:
+		case 0x69620000:
+			result = true;
+		}
+	}
+
+	return result;
+}
+
+
+
+} // namespace end
+
diff --git a/Source/Core/DiscIO/Src/WiiWad.h b/Source/Core/DiscIO/WiiWad.h
similarity index 84%
rename from Source/Core/DiscIO/Src/WiiWad.h
rename to Source/Core/DiscIO/WiiWad.h
index 6f75585ecf..805cc793df 100644
--- a/Source/Core/DiscIO/Src/WiiWad.h
+++ b/Source/Core/DiscIO/WiiWad.h
@@ -1,21 +1,18 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _WII_WAD_H
-#define _WII_WAD_H
+#pragma once
 
 #include <string>
-#include <vector>
-#include <map>
 
-#include "Common.h"
-#include "Blob.h"
-#include "Volume.h"
+#include "Common/CommonTypes.h"
 
 namespace DiscIO
 {
 
+class IBlobReader;
+
 class WiiWAD
 {
 public:
@@ -30,13 +27,13 @@ public:
 	u32 GetTMDSize() const { return m_TMDSize; }
 	u32 GetDataAppSize() const { return m_DataAppSize; }
 	u32 GetFooterSize() const { return m_FooterSize; }
-	
+
 	u8* GetCertificateChain() const { return m_pCertificateChain; }
 	u8* GetTicket() const { return m_pTicket; }
 	u8* GetTMD() const { return m_pTMD; }
 	u8* GetDataApp() const { return m_pDataApp; }
 	u8* GetFooter() const { return m_pFooter; }
-	
+
 	static bool IsWiiWAD(const std::string& _rName);
 
 private:
@@ -60,6 +57,3 @@ private:
 };
 
 }
-
-#endif
-
diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp
new file mode 100644
index 0000000000..c9beca3d10
--- /dev/null
+++ b/Source/Core/DolphinQt/AboutDialog.cpp
@@ -0,0 +1,31 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QDesktopServices>
+#include <QUrl>
+
+#include "ui_AboutDialog.h"
+
+#include "Common/Common.h"
+#include "Common/StdMakeUnique.h"
+
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/Utils/Utils.h"
+
+DAboutDialog::DAboutDialog(QWidget* parent_widget)
+	: QDialog(parent_widget)
+{
+	setWindowModality(Qt::WindowModal);
+	setAttribute(Qt::WA_DeleteOnClose);
+
+	m_ui = std::make_unique<Ui::DAboutDialog>();
+	m_ui->setupUi(this);
+	m_ui->label->setText(m_ui->label->text().arg(SC(scm_desc_str),
+	    SL("2014"), SC(scm_branch_str), SC(scm_rev_git_str),
+	    SL(__DATE__), SL(__TIME__)));
+}
+
+DAboutDialog::~DAboutDialog()
+{
+}
diff --git a/Source/Core/DolphinQt/AboutDialog.h b/Source/Core/DolphinQt/AboutDialog.h
new file mode 100644
index 0000000000..40f128ae7f
--- /dev/null
+++ b/Source/Core/DolphinQt/AboutDialog.h
@@ -0,0 +1,26 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <QDialog>
+
+// Predefinitions
+namespace Ui
+{
+class DAboutDialog;
+}
+
+class DAboutDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit DAboutDialog(QWidget* parent_widget = nullptr);
+	~DAboutDialog();
+
+private:
+	std::unique_ptr<Ui::DAboutDialog> m_ui;
+};
diff --git a/Source/Core/DolphinQt/AboutDialog.ui b/Source/Core/DolphinQt/AboutDialog.ui
new file mode 100644
index 0000000000..df77fa4686
--- /dev/null
+++ b/Source/Core/DolphinQt/AboutDialog.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DAboutDialog</class>
+ <widget class="QDialog" name="DAboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>504</width>
+    <height>458</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>About Dolphin</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;big&gt;&lt;b&gt;Dolphin&lt;/b&gt;&lt;/big&gt; %1&lt;br&gt;
+© 2003-%2 Dolphin Team&lt;br&gt;
+Branch: %3&lt;br&gt;
+Revision: %4&lt;br&gt;
+Compiled: %5 @ %6&lt;br&gt;
+Dolphin is a GameCube/Wii emulator, which was originally written by&lt;br&gt;F|RES and ector. Today Dolphin is an open source project with many&lt;br&gt; contributors, too many to list. If interested, just go check out &lt;a href=&quot;https://github.com/dolphin-emu/dolphin&quot;&gt;the project&lt;br&gt;page&lt;/a&gt;.&lt;br&gt;
+&lt;br&gt;
+Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik,&lt;br&gt;or9, and Hotquik for their reverse engineering and docs/demos.&lt;br&gt;
+&lt;br&gt;
+Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our&lt;br&gt; development a kickstart.&lt;br&gt;
+&lt;br&gt;
+Thanks to Frank Wille for his PowerPC disassembler, which or9 and we&lt;br&gt; modified to include Gekko specifics.&lt;br&gt;
+&lt;br&gt;
+Thanks to hcs/destop for their GC ADPCM decoder.&lt;br&gt;
+&lt;br&gt;
+We are not affiliated with Nintendo in any way. GameCube and Wii are&lt;br&gt; trademarks of Nintendo. This emulator should not be used to play games&lt;br&gt;you do not legally own.</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DAboutDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
new file mode 100644
index 0000000000..fdd8325fa7
--- /dev/null
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -0,0 +1,86 @@
+# because of generated UI files
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
+set(CMAKE_AUTOMOC ON)
+
+set(SRCS
+	AboutDialog.cpp
+	AboutDialog.h
+	Host.cpp
+	Main.cpp
+	MainWindow.cpp
+	MainWindow.h
+	SystemInfo.cpp
+	GameList/GameFile.cpp
+	GameList/GameGrid.cpp
+	GameList/GameTracker.cpp
+	GameList/GameTree.cpp
+	Utils/Resources.cpp
+	Utils/Utils.cpp
+	VideoInterface/RenderWidget.cpp
+	)
+
+set(UIS
+	AboutDialog.ui
+	MainWindow.ui
+	SystemInfo.ui
+	GameList/GameGrid.ui
+	GameList/GameTree.ui
+	)
+
+list(APPEND LIBS core uicommon)
+
+if(APPLE)
+	set(DOLPHINQT_BINARY DolphinQt)
+else()
+	set(DOLPHINQT_BINARY dolphin-emu-qt)
+endif()
+
+qt5_wrap_ui(UI_HEADERS ${UIS})
+add_executable(${DOLPHINQT_BINARY} ${SRCS} ${UI_HEADERS})
+target_link_libraries(${DOLPHINQT_BINARY} ${LIBS})
+qt5_use_modules(${DOLPHINQT_BINARY} Widgets)
+
+if(APPLE)
+	# Note: This is based on the DolphinWX version.
+
+	include(BundleUtilities)
+	set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHINQT_BINARY}.app)
+
+	# Ask for an application bundle.
+	set_target_properties(${DOLPHINQT_BINARY} PROPERTIES
+		MACOSX_BUNDLE true
+		MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+		)
+
+	# get rid of any old copies
+	file (REMOVE_RECURSE ${BUNDLE_PATH}/Contents/Resources/Sys)
+	if(NOT SKIP_POSTPROCESS_BUNDLE)
+		# Fix up the bundle after it is finished.
+		# There does not seem to be an easy way to run CMake commands post-build,
+		# so we invoke CMake again on a generated script.
+		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake "
+			include(BundleUtilities)
+			message(\"Fixing up application bundle: ${BUNDLE_PATH}\")
+			message(\"(Note: This is only necessary to produce a redistributable binary.\")
+			message(\"To skip, pass -DSKIP_POSTPROCESS_BUNDLE=1 to cmake.)\")
+			set(BU_CHMOD_BUNDLE_ITEMS ON)
+			execute_process(COMMAND ${CMAKE_SOURCE_DIR}/Tools/deploy-mac.py -p platforms/libqcocoa.dylib \"${BUNDLE_PATH}\")
+			file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys
+				DESTINATION ${BUNDLE_PATH}/Contents/Resources
+				)
+			")
+		add_custom_command(TARGET ${DOLPHINQT_BINARY} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake
+			)
+	else()
+		add_custom_command(OUTPUT ${BUNDLE_PATH}/Contents/Resources/Sys
+			COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys
+			VERBATIM
+			)
+		add_custom_target(CopyDataIntoBundleQt ALL
+			DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys
+			)
+	endif()
+endif()
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
new file mode 100644
index 0000000000..d60849aeae
--- /dev/null
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -0,0 +1,187 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}</ProjectGuid>
+    <!--
+    Enable this once wxwidgets is completely removed
+    <ProjectName>Dolphin</ProjectName>
+    -->
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+    <Import Project="..\..\VSProps\QtCompile.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <BaseAddress>0x00400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>true</FixedBaseAddress>
+      <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <!--QRC and UI files are handled automatically-->
+  <ItemGroup>
+    <QtResource Include="*.qrc" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUi Include="*.ui" />
+    <QtUi Include="GameList\*.ui" />
+  </ItemGroup>
+  <!--MOC files need to be listed. Perhaps scan for Q_OBJECT in the future? (like automoc)-->
+  <!--NOTE: When adding moc'd files, you must list the outputs in the following ItemGroup!-->
+  <ItemGroup>
+    <QtMoc Include="AboutDialog.h" />
+    <QtMoc Include="MainWindow.h" />
+    <QtMoc Include="SystemInfo.h" />
+    <QtMoc Include="VideoInterface\RenderWidget.h" />
+    <QtMoc Include="GameList\GameFile.h" />
+    <QtMoc Include="GameList\GameGrid.h" />
+    <QtMoc Include="GameList\GameTracker.h" />
+    <QtMoc Include="GameList\GameTree.h" />
+  </ItemGroup>
+  <!--TODO figure out how to get QtMoc to add outputs to ClCompile's inputs...-->
+  <ItemGroup>
+    <ClCompile Include="$(QtMocOutPrefix)AboutDialog.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)MainWindow.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)SystemInfo.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)RenderWidget.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)GameGrid.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)GameTracker.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)GameTree.cpp" />
+    <ClCompile Include="GameList\GameFile.cpp" />
+    <ClCompile Include="GameList\GameGrid.cpp" />
+    <ClCompile Include="GameList\GameTracker.cpp" />
+    <ClCompile Include="GameList\GameTree.cpp" />
+    <ClCompile Include="SystemInfo.cpp" />
+    <ClCompile Include="Utils\Resources.cpp" />
+    <ClCompile Include="Utils\Utils.cpp" />
+    <ClCompile Include="VideoInterface\RenderWidget.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDialog.cpp" />
+    <ClCompile Include="Host.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+  </ItemGroup>
+  <!--Put standard C/C++ headers here-->
+  <!--
+  <ItemGroup>
+    <ClInclude Include="Main.h" />
+  </ItemGroup>
+  -->
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
+      <Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
+      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
+      <Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
+      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
+      <Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
+      <Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
+      <Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj">
+      <Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj">
+      <Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
+      <Project>{604C8368-F34A-4D55-82C8-CC92A0C13254}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\VSProps\QtCompile.targets" />
+  </ImportGroup>
+  <!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
+  <ItemGroup>
+    <DataDirFiles Include="$(DolphinRootDir)Data\**\*.*" />
+    <ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll;$(ExternalsDir)msvcrt\$(PlatformName)\*.dll" />
+    <BinaryFiles Include="$(TargetPath)" />
+    <AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="GameList\GameFile.h" />
+    <ClInclude Include="GameList\GameGrid.h" />
+    <ClInclude Include="GameList\GameTracker.h" />
+    <ClInclude Include="GameList\GameTree.h" />
+    <ClInclude Include="Utils\Resources.h" />
+    <ClInclude Include="Utils\Utils.h" />
+    <ClInclude Include="VideoInterface\RenderWidget.h" />
+  </ItemGroup>
+  <!--Disable copying to binary dir for now on the buildbot to prevent packaging of the outputs-->
+  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(I_AM_BUILDACUS)'==''">
+    <Message Text="Copying Data directory..." Importance="High" />
+    <Copy SourceFiles="@(DataDirFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)').Ticks)" />
+    <Message Text="Copying External .dlls" Importance="High" />
+    <Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)').Ticks)" />
+    <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
+    <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.filters b/Source/Core/DolphinQt/DolphinQt.vcxproj.filters
new file mode 100644
index 0000000000..368869def9
--- /dev/null
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj.filters
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="AboutDialog.cpp" />
+    <ClCompile Include="Host.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+    <ClCompile Include="Utils\Resources.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\Utils.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="SystemInfo.cpp" />
+    <ClCompile Include="VideoInterface\RenderWidget.cpp">
+      <Filter>VideoInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)AboutDialog.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)MainWindow.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)RenderWidget.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)SystemInfo.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GameList\GameFile.cpp">
+      <Filter>GameList</Filter>
+    </ClCompile>
+    <ClCompile Include="GameList\GameGrid.cpp">
+      <Filter>GameList</Filter>
+    </ClCompile>
+    <ClCompile Include="GameList\GameTracker.cpp">
+      <Filter>GameList</Filter>
+    </ClCompile>
+    <ClCompile Include="GameList\GameTree.cpp">
+      <Filter>GameList</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)GameGrid.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)GameTracker.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)GameTree.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <QtMoc Include="AboutDialog.h" />
+    <QtMoc Include="MainWindow.h" />
+    <QtMoc Include="SystemInfo.h" />
+    <QtMoc Include="VideoInterface\RenderWidget.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUi Include="*.ui" />
+    <QtUi Include="GameList\*.ui">
+      <Filter>GameList</Filter>
+    </QtUi>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="VideoInterface">
+      <UniqueIdentifier>{2497846c-00eb-4f1c-b437-2d32eac9027c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utils">
+      <UniqueIdentifier>{730f2ae7-a686-4bc8-bb49-b4f8bd240329}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generated Files">
+      <UniqueIdentifier>{c18a1fb3-64ff-4249-b808-d73a56ea3a2d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GameList">
+      <UniqueIdentifier>{be9925db-448c-46d8-a5a3-fb957490d3ef}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Utils\Resources.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\Utils.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoInterface\RenderWidget.h">
+      <Filter>VideoInterface</Filter>
+    </ClInclude>
+    <ClInclude Include="GameList\GameFile.h">
+      <Filter>GameList</Filter>
+    </ClInclude>
+    <ClInclude Include="GameList\GameGrid.h">
+      <Filter>GameList</Filter>
+    </ClInclude>
+    <ClInclude Include="GameList\GameTracker.h">
+      <Filter>GameList</Filter>
+    </ClInclude>
+    <ClInclude Include="GameList\GameTree.h">
+      <Filter>GameList</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.user b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
new file mode 100644
index 0000000000..5804e0cf2d
--- /dev/null
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--For some stupid reason this has to be in the .user file...-->
+    <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
+    <LocalDebuggerWorkingDirectory>$(BinaryOutputDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <ShowAllFiles>false</ShowAllFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp
new file mode 100644
index 0000000000..85efd8f4e9
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameFile.cpp
@@ -0,0 +1,313 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <memory>
+
+#include <QDataStream>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/Filesystem.h"
+
+#include "DolphinQt/GameList/GameFile.h"
+#include "DolphinQt/Utils/Resources.h"
+#include "DolphinQt/Utils/Utils.h"
+
+static const u32 CACHE_REVISION = 0x00A;
+static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
+
+static QMap<DiscIO::IVolume::ELanguage, QString> ConvertLocalizedStrings(std::map<DiscIO::IVolume::ELanguage, std::string> strings)
+{
+	QMap<DiscIO::IVolume::ELanguage, QString> result;
+
+	for (auto entry : strings)
+		result.insert(entry.first, QString::fromStdString(entry.second).trimmed());
+
+	return result;
+}
+
+template<class to, class from>
+static QMap<to, QString> CastLocalizedStrings(QMap<from, QString> strings)
+{
+	QMap<to, QString> result;
+
+	auto end = strings.cend();
+	for (auto it = strings.cbegin(); it != end; ++it)
+		result.insert((to)it.key(), it.value());
+
+	return result;
+}
+
+static QString GetLanguageString(DiscIO::IVolume::ELanguage language, QMap<DiscIO::IVolume::ELanguage, QString> strings)
+{
+	if (strings.contains(language))
+		return strings.value(language);
+
+	// English tends to be a good fallback when the requested language isn't available
+	if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH)
+	{
+		if (strings.contains(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH))
+			return strings.value(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
+	}
+
+	// If English isn't available either, just pick something
+	if (!strings.empty())
+		return strings.cbegin().value();
+
+	return SL("");
+}
+
+GameFile::GameFile(const QString& fileName)
+    : m_file_name(fileName)
+{
+	bool hasBanner = false;
+
+	if (LoadFromCache())
+	{
+		m_valid = true;
+		hasBanner = true;
+	}
+	else
+	{
+		std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(fileName.toStdString()));
+
+		if (volume != nullptr)
+		{
+			m_platform = volume->GetVolumeType();
+
+			m_short_names = ConvertLocalizedStrings(volume->GetNames(false));
+			m_long_names = ConvertLocalizedStrings(volume->GetNames(true));
+			m_descriptions = ConvertLocalizedStrings(volume->GetDescriptions());
+			m_company = QString::fromStdString(volume->GetCompany());
+
+			m_country = volume->GetCountry();
+			m_file_size = volume->GetRawSize();
+			m_volume_size = volume->GetSize();
+
+			m_unique_id = QString::fromStdString(volume->GetUniqueID());
+			m_compressed = DiscIO::IsCompressedBlob(fileName.toStdString());
+			m_disc_number = volume->GetDiscNumber();
+			m_revision = volume->GetRevision();
+
+			QFileInfo info(m_file_name);
+			m_folder_name = info.absoluteDir().dirName();
+
+			int width, height;
+			std::vector<u32> buffer = volume->GetBanner(&width, &height);
+			QImage banner(width, height, QImage::Format_RGB888);
+			for (int i = 0; i < width * height; i++)
+			{
+				int x = i % width, y = i / width;
+				banner.setPixel(x, y, qRgb((buffer[i] & 0xFF0000) >> 16,
+						        (buffer[i] & 0x00FF00) >>  8,
+						        (buffer[i] & 0x0000FF) >>  0));
+			}
+
+			if (!banner.isNull())
+			{
+				hasBanner = true;
+				m_banner = QPixmap::fromImage(banner);
+			}
+
+			m_valid = true;
+			if (hasBanner)
+				SaveToCache();
+		}
+	}
+
+	if (m_company.isEmpty() && m_unique_id.size() >= 6)
+		m_company = QString::fromStdString(DiscIO::GetCompanyFromID(m_unique_id.mid(4, 2).toStdString()));
+
+	if (m_valid)
+	{
+		IniFile ini = SCoreStartupParameter::LoadGameIni(m_unique_id.toStdString(), m_revision);
+		std::string issues_temp;
+		ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state);
+		ini.GetIfExists("EmuState", "EmulationIssues", &issues_temp);
+		m_issues = QString::fromStdString(issues_temp);
+	}
+
+	if (!hasBanner)
+		m_banner = Resources::GetPixmap(Resources::BANNER_MISSING);
+}
+
+bool GameFile::LoadFromCache()
+{
+	QString filename = CreateCacheFilename();
+	if (filename.isEmpty())
+		return false;
+
+	QFile file(filename);
+	if (!file.exists())
+		return false;
+	if (!file.open(QFile::ReadOnly))
+		return false;
+
+	// Increment CACHE_REVISION if the code below is modified (GameFile.cpp)
+	QDataStream stream(&file);
+	stream.setVersion(DATASTREAM_REVISION);
+
+	u32 cache_rev;
+	stream >> cache_rev;
+	if (cache_rev != CACHE_REVISION)
+		return false;
+
+	u32 country;
+	u32 platform;
+	QMap<u8, QString> short_names;
+	QMap<u8, QString> long_names;
+	QMap<u8, QString> descriptions;
+	stream >> m_folder_name
+	       >> short_names
+	       >> long_names
+	       >> descriptions
+	       >> m_company
+	       >> m_unique_id
+	       >> m_file_size
+	       >> m_volume_size
+	       >> country
+	       >> m_banner
+	       >> m_compressed
+	       >> platform
+	       >> m_disc_number
+	       >> m_revision;
+	m_country = (DiscIO::IVolume::ECountry)country;
+	m_platform = (DiscIO::IVolume::EPlatform)platform;
+	m_short_names = CastLocalizedStrings<DiscIO::IVolume::ELanguage>(short_names);
+	m_long_names = CastLocalizedStrings<DiscIO::IVolume::ELanguage>(long_names);
+	m_descriptions = CastLocalizedStrings<DiscIO::IVolume::ELanguage>(descriptions);
+	file.close();
+	return true;
+}
+
+void GameFile::SaveToCache()
+{
+	if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
+		File::CreateDir(File::GetUserPath(D_CACHE_IDX));
+
+	QString filename = CreateCacheFilename();
+	if (filename.isEmpty())
+		return;
+	if (QFile::exists(filename))
+		QFile::remove(filename);
+
+	QFile file(filename);
+	if (!file.open(QFile::WriteOnly))
+		return;
+
+	// Increment CACHE_REVISION if the code below is modified (GameFile.cpp)
+	QDataStream stream(&file);
+	stream.setVersion(DATASTREAM_REVISION);
+	stream << CACHE_REVISION;
+
+	stream << m_folder_name
+	       << CastLocalizedStrings<u8>(m_short_names)
+	       << CastLocalizedStrings<u8>(m_long_names)
+	       << CastLocalizedStrings<u8>(m_descriptions)
+	       << m_company
+	       << m_unique_id
+	       << m_file_size
+	       << m_volume_size
+	       << (u32)m_country
+	       << m_banner
+	       << m_compressed
+	       << (u32)m_platform
+	       << m_disc_number
+	       << m_revision;
+}
+
+QString GameFile::CreateCacheFilename()
+{
+	std::string filename, pathname, extension;
+	SplitPath(m_file_name.toStdString(), &pathname, &filename, &extension);
+
+	if (filename.empty())
+		return SL(""); // must be a disc drive
+
+	// Filename.extension_HashOfFolderPath_Size.cache
+	// Append hash to prevent ISO name-clashing in different folders.
+	filename.append(StringFromFormat("%s_%x_%llx.qcache",
+		extension.c_str(), HashFletcher((const u8*)pathname.c_str(), pathname.size()),
+		(unsigned long long)File::GetSize(m_file_name.toStdString())));
+
+	QString fullname = QString::fromStdString(File::GetUserPath(D_CACHE_IDX));
+	fullname += QString::fromStdString(filename);
+	return fullname;
+}
+
+QString GameFile::GetCompany() const
+{
+	return m_company;
+}
+
+QString GameFile::GetDescription(DiscIO::IVolume::ELanguage language) const
+{
+	return GetLanguageString(language, m_descriptions);
+}
+
+QString GameFile::GetDescription() const
+{
+	bool wii = m_platform != DiscIO::IVolume::GAMECUBE_DISC;
+	return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
+}
+
+QString GameFile::GetName(bool prefer_long, DiscIO::IVolume::ELanguage language) const
+{
+	return GetLanguageString(language, prefer_long ? m_long_names : m_short_names);
+}
+
+QString GameFile::GetName(bool prefer_long) const
+{
+	bool wii = m_platform != DiscIO::IVolume::GAMECUBE_DISC;
+	QString name = GetName(prefer_long, SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
+	if (name.isEmpty())
+	{
+		// No usable name, return filename (better than nothing)
+		std::string nametemp;
+		SplitPath(m_file_name.toStdString(), nullptr, &nametemp, nullptr);
+		name = QString::fromStdString(nametemp);
+	}
+	return name;
+}
+
+const QString GameFile::GetWiiFSPath() const
+{
+	std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(m_file_name.toStdString()));
+	QString ret;
+
+	if (volume == nullptr)
+		return ret;
+
+	if (volume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC)
+	{
+		std::string path;
+		u64 title;
+
+		volume->GetTitleID((u8*)&title);
+		title = Common::swap64(title);
+
+		path = StringFromFormat("%s/title/%08x/%08x/data/", File::GetUserPath(D_WIIROOT_IDX).c_str(), (u32)(title >> 32), (u32)title);
+
+		if (!File::Exists(path))
+			File::CreateFullPath(path);
+
+		if (path[0] == '.')
+			ret = QDir::currentPath() + QString::fromStdString(path).mid((int)strlen(ROOT_DIR));
+		else
+			ret = QString::fromStdString(path);
+	}
+
+	return ret;
+}
diff --git a/Source/Core/DolphinQt/GameList/GameFile.h b/Source/Core/DolphinQt/GameList/GameFile.h
new file mode 100644
index 0000000000..30ea33d50d
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameFile.h
@@ -0,0 +1,74 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QMap>
+#include <QPixmap>
+#include <QString>
+
+#include <string>
+
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+
+class GameFile final
+{
+public:
+	GameFile(const QString& fileName);
+	GameFile(const std::string& fileName) : GameFile(QString::fromStdString(fileName)) {}
+
+	bool IsValid() const { return m_valid; }
+	QString GetFileName() { return m_file_name; }
+	QString GetFolderName() { return m_folder_name; }
+	QString GetName(bool prefer_long, DiscIO::IVolume::ELanguage language) const;
+	QString GetName(bool prefer_long) const;
+	QString GetDescription(DiscIO::IVolume::ELanguage language) const;
+	QString GetDescription() const;
+	QString GetCompany() const;
+	u16 GetRevision() const { return m_revision; }
+	const QString GetUniqueID() const { return m_unique_id; }
+	const QString GetWiiFSPath() const;
+	DiscIO::IVolume::ECountry GetCountry() const { return m_country; }
+	DiscIO::IVolume::EPlatform GetPlatform() const { return m_platform; }
+	const QString GetIssues() const { return m_issues; }
+	int GetEmuState() const { return m_emu_state; }
+	bool IsCompressed() const { return m_compressed; }
+	u64 GetFileSize() const { return m_file_size; }
+	u64 GetVolumeSize() const { return m_volume_size; }
+	// 0 is the first disc, 1 is the second disc
+	u8 GetDiscNumber() const { return m_disc_number; }
+	const QPixmap GetBitmap() const { return m_banner; }
+
+private:
+	QString m_file_name;
+	QString m_folder_name;
+
+	QMap<DiscIO::IVolume::ELanguage, QString> m_short_names;
+	QMap<DiscIO::IVolume::ELanguage, QString> m_long_names;
+	QMap<DiscIO::IVolume::ELanguage, QString> m_descriptions;
+	QString m_company;
+
+	QString m_unique_id;
+
+	QString m_issues;
+	int m_emu_state = 0;
+
+	quint64 m_file_size = 0;
+	quint64 m_volume_size = 0;
+
+	DiscIO::IVolume::ECountry m_country;
+	DiscIO::IVolume::EPlatform m_platform;
+	u16 m_revision = 0;
+
+	QPixmap m_banner;
+	bool m_valid = false;
+	bool m_compressed = false;
+	u8 m_disc_number = 0;
+
+	bool LoadFromCache();
+	void SaveToCache();
+
+	QString CreateCacheFilename();
+};
diff --git a/Source/Core/DolphinQt/GameList/GameGrid.cpp b/Source/Core/DolphinQt/GameList/GameGrid.cpp
new file mode 100644
index 0000000000..ebce076ccb
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameGrid.cpp
@@ -0,0 +1,95 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "ui_GameGrid.h"
+
+#include "Common/StdMakeUnique.h"
+
+#include "DolphinQt/GameList/GameGrid.h"
+
+// Game banner image size
+static const u32 GRID_BANNER_WIDTH = 144;
+static const u32 GRID_BANNER_HEIGHT = 48;
+
+static const u32 ICON_BANNER_WIDTH = 64;
+static const u32 ICON_BANNER_HEIGHT = 64;
+
+DGameGrid::DGameGrid(QWidget* parent_widget) :
+	QListWidget(parent_widget)
+{
+	m_ui = std::make_unique<Ui::DGameGrid>();
+	m_ui->setupUi(this);
+	SetViewStyle(STYLE_GRID);
+
+	connect(this, SIGNAL(itemActivated(QListWidgetItem*)), this, SIGNAL(StartGame()));
+}
+
+DGameGrid::~DGameGrid()
+{
+	for (QListWidgetItem* i : m_items.keys())
+		delete i;
+}
+
+GameFile* DGameGrid::SelectedGame()
+{
+	if (!selectedItems().empty())
+		return m_items.value(selectedItems().at(0));
+	else
+		return nullptr;
+}
+
+void DGameGrid::SelectGame(GameFile* game)
+{
+	if (game == nullptr)
+		return;
+	if (!selectedItems().empty())
+		selectedItems().at(0)->setSelected(false);
+	m_items.key(game)->setSelected(true);
+}
+
+void DGameGrid::SetViewStyle(GameListStyle newStyle)
+{
+	if (newStyle == STYLE_GRID)
+	{
+		m_current_style = STYLE_GRID;
+		setIconSize(QSize(GRID_BANNER_WIDTH, GRID_BANNER_HEIGHT));
+		setViewMode(QListView::IconMode);
+	}
+	else
+	{
+		m_current_style = STYLE_ICON;
+		setIconSize(QSize(ICON_BANNER_WIDTH, ICON_BANNER_HEIGHT));
+		setViewMode(QListView::ListMode);
+	}
+
+	// QListView resets this when you change the view mode, so let's set it again
+	setDragEnabled(false);
+}
+
+void DGameGrid::AddGame(GameFile* gameItem)
+{
+	if (m_items.values().contains(gameItem))
+		return;
+	m_items.values().append(gameItem);
+
+	QListWidgetItem* i = new QListWidgetItem;
+	i->setIcon(QIcon(gameItem->GetBitmap()
+		.scaled(GRID_BANNER_WIDTH, GRID_BANNER_HEIGHT, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
+	i->setText(gameItem->GetName(false));
+	if (gameItem->IsCompressed())
+		i->setTextColor(QColor("#00F"));
+
+	addItem(i);
+	m_items.insert(i, gameItem);
+}
+
+void DGameGrid::RemoveGame(GameFile* gameItem)
+{
+	if (!m_items.values().contains(gameItem))
+		return;
+
+	QListWidgetItem* i = m_items.key(gameItem);
+	m_items.remove(i);
+	delete i;
+}
diff --git a/Source/Core/DolphinQt/GameList/GameGrid.h b/Source/Core/DolphinQt/GameList/GameGrid.h
new file mode 100644
index 0000000000..50a70dc2fb
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameGrid.h
@@ -0,0 +1,44 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include <QListWidget>
+
+#include "DolphinQt/GameList/GameTracker.h"
+
+// Predefinitions
+namespace Ui
+{
+class DGameGrid;
+}
+
+class DGameGrid : public QListWidget, public AbstractGameList
+{
+	Q_OBJECT
+
+public:
+	explicit DGameGrid(QWidget* parent_widget = nullptr);
+	~DGameGrid();
+
+	// AbstractGameList stuff
+	virtual GameFile* SelectedGame();
+	virtual void SelectGame(GameFile* game);
+
+	virtual void SetViewStyle(GameListStyle newStyle);
+
+	virtual void AddGame(GameFile* gameItem);
+	virtual void RemoveGame(GameFile* gameItem);
+
+signals:
+	void StartGame();
+
+private:
+	std::unique_ptr<Ui::DGameGrid> m_ui;
+
+	QMap<QListWidgetItem*, GameFile*> m_items;
+	GameListStyle m_current_style;
+};
diff --git a/Source/Core/DolphinQt/GameList/GameGrid.ui b/Source/Core/DolphinQt/GameList/GameGrid.ui
new file mode 100644
index 0000000000..cc910ee63b
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameGrid.ui
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DGameGrid</class>
+ <widget class="QListWidget" name="DGameGrid">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>254</width>
+    <height>190</height>
+   </rect>
+  </property>
+  <property name="isWrapping" stdset="0">
+   <bool>true</bool>
+  </property>
+  <property name="resizeMode">
+   <enum>QListView::Adjust</enum>
+  </property>
+  <property name="uniformItemSizes">
+   <bool>true</bool>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp
new file mode 100644
index 0000000000..8bb41c39aa
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp
@@ -0,0 +1,238 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CDUtils.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+
+#include "DolphinQt/GameList/GameGrid.h"
+#include "DolphinQt/GameList/GameTracker.h"
+#include "DolphinQt/GameList/GameTree.h"
+
+void AbstractGameList::AddGames(QList<GameFile*> items)
+{
+	for (GameFile* o : items)
+		AddGame(o);
+}
+void AbstractGameList::RemoveGames(QList<GameFile*> items)
+{
+	for (GameFile* o : items)
+		RemoveGame(o);
+}
+
+
+DGameTracker::DGameTracker(QWidget* parent_widget)
+	: QStackedWidget(parent_widget),
+	  m_watcher(new QFileSystemWatcher(this))
+{
+	connect(m_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(ScanForGames()));
+
+	m_tree_widget = new DGameTree(this);
+	addWidget(m_tree_widget);
+	connect(m_tree_widget, SIGNAL(StartGame()), this, SIGNAL(StartGame()));
+
+	m_grid_widget = new DGameGrid(this);
+	addWidget(m_grid_widget);
+	connect(m_grid_widget, SIGNAL(StartGame()), this, SIGNAL(StartGame()));
+
+	SetViewStyle(STYLE_LIST);
+}
+
+DGameTracker::~DGameTracker()
+{
+	for (GameFile* file : m_games.values())
+		delete file;
+}
+
+void DGameTracker::SetViewStyle(GameListStyle newStyle)
+{
+	if (newStyle == m_current_style)
+		return;
+	m_current_style = newStyle;
+
+	if (newStyle == STYLE_LIST || newStyle == STYLE_TREE)
+	{
+		m_tree_widget->SelectGame(SelectedGame());
+		setCurrentWidget(m_tree_widget);
+		m_tree_widget->SetViewStyle(newStyle);
+	}
+	else
+	{
+		m_grid_widget->SelectGame(SelectedGame());
+		setCurrentWidget(m_grid_widget);
+		m_grid_widget->SetViewStyle(newStyle);
+	}
+}
+
+GameFile* DGameTracker::SelectedGame()
+{
+	if (currentWidget() == m_grid_widget)
+		return m_grid_widget->SelectedGame();
+	else
+		return m_tree_widget->SelectedGame();
+}
+
+void DGameTracker::ScanForGames()
+{
+	setDisabled(true);
+
+	delete m_watcher;
+	m_watcher = new QFileSystemWatcher(this);
+	if (SConfig::GetInstance().m_RecursiveISOFolder)
+	{
+		for (std::string dir : FindSubdirectories(SConfig::GetInstance().m_ISOFolder, /*recursive*/ true))
+			m_watcher->addPath(QString::fromStdString(dir));
+	}
+	else
+	{
+		for (std::string dir : SConfig::GetInstance().m_ISOFolder)
+			m_watcher->addPath(QString::fromStdString(dir));
+	}
+
+	std::vector<std::string> exts;
+	if (SConfig::GetInstance().m_ListGC)
+	{
+		exts.push_back("*.gcm");
+		exts.push_back("*.gcz");
+	}
+	if (SConfig::GetInstance().m_ListWii || SConfig::GetInstance().m_ListGC)
+	{
+		exts.push_back("*.iso");
+		exts.push_back("*.ciso");
+		exts.push_back("*.wbfs");
+	}
+	if (SConfig::GetInstance().m_ListWad)
+		exts.push_back("*.wad");
+
+	auto rFilenames = DoFileSearch(exts, SConfig::GetInstance().m_ISOFolder, SConfig::GetInstance().m_RecursiveISOFolder);
+	QList<GameFile*> newItems;
+	QStringList allItems;
+
+	if (!rFilenames.empty())
+	{
+		for (u32 i = 0; i < rFilenames.size(); i++)
+		{
+			std::string FileName;
+			SplitPath(rFilenames[i], nullptr, &FileName, nullptr);
+			QString NameAndPath = QString::fromStdString(rFilenames[i]);
+			allItems.append(NameAndPath);
+
+			if (m_games.keys().contains(NameAndPath))
+				continue;
+
+			GameFile* obj = new GameFile(rFilenames[i]);
+			if (obj->IsValid())
+			{
+				bool list = true;
+
+				switch (obj->GetCountry())
+				{
+					case DiscIO::IVolume::COUNTRY_AUSTRALIA:
+						if (!SConfig::GetInstance().m_ListAustralia)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_EUROPE:
+						if (!SConfig::GetInstance().m_ListPal)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_FRANCE:
+						if (!SConfig::GetInstance().m_ListFrance)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_GERMANY:
+						if (!SConfig::GetInstance().m_ListGermany)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_ITALY:
+						if (!SConfig::GetInstance().m_ListItaly)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_JAPAN:
+						if (!SConfig::GetInstance().m_ListJap)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_KOREA:
+						if (!SConfig::GetInstance().m_ListKorea)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+						if (!SConfig::GetInstance().m_ListNetherlands)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_RUSSIA:
+						if (!SConfig::GetInstance().m_ListRussia)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_SPAIN:
+						if (!SConfig::GetInstance().m_ListSpain)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_TAIWAN:
+						if (!SConfig::GetInstance().m_ListTaiwan)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_USA:
+						if (!SConfig::GetInstance().m_ListUsa)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_WORLD:
+						if (!SConfig::GetInstance().m_ListWorld)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_UNKNOWN:
+					default:
+						if (!SConfig::GetInstance().m_ListUnknown)
+							list = false;
+						break;
+				}
+
+				if (list)
+					newItems.append(obj);
+			}
+		}
+	}
+
+	// Process all the new GameFiles
+	for (GameFile* o : newItems)
+		m_games.insert(o->GetFileName(), o);
+
+	// Check for games that were removed
+	QList<GameFile*> removedGames;
+	for (QString& path : m_games.keys())
+	{
+		if (!allItems.contains(path))
+		{
+			removedGames.append(m_games.value(path));
+			m_games.remove(path);
+		}
+	}
+
+	m_tree_widget->AddGames(newItems);
+	m_grid_widget->AddGames(newItems);
+
+	m_tree_widget->RemoveGames(removedGames);
+	m_grid_widget->RemoveGames(removedGames);
+
+	for (GameFile* file : removedGames)
+		delete file;
+
+	setDisabled(false);
+}
+
+void DGameTracker::SelectLastBootedGame()
+{
+	if (!SConfig::GetInstance().m_LastFilename.empty() && File::Exists(SConfig::GetInstance().m_LastFilename))
+	{
+		QString lastfilename = QString::fromStdString(SConfig::GetInstance().m_LastFilename);
+		for (GameFile* game : m_games.values())
+		{
+			if (game->GetFileName() == lastfilename)
+			{
+				m_tree_widget->SelectGame(game);
+				break;
+			}
+		}
+	}
+}
diff --git a/Source/Core/DolphinQt/GameList/GameTracker.h b/Source/Core/DolphinQt/GameList/GameTracker.h
new file mode 100644
index 0000000000..7501874613
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameTracker.h
@@ -0,0 +1,68 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QFileSystemWatcher>
+#include <QList>
+#include <QMap>
+#include <QStackedWidget>
+
+#include "DolphinQt/GameList/GameFile.h"
+
+// Predefinitions
+class DGameGrid;
+class DGameTree;
+
+enum GameListStyle
+{
+	STYLE_LIST,
+	STYLE_TREE,
+	STYLE_GRID,
+	STYLE_ICON
+};
+
+class AbstractGameList
+{
+public:
+	virtual GameFile* SelectedGame() = 0;
+	virtual void SelectGame(GameFile* game) = 0;
+
+	virtual void SetViewStyle(GameListStyle newStyle) = 0;
+
+	virtual void AddGame(GameFile* item) = 0;
+	void AddGames(QList<GameFile*> items);
+
+	virtual void RemoveGame(GameFile* item) = 0;
+	void RemoveGames(QList<GameFile*> items);
+};
+
+class DGameTracker : public QStackedWidget
+{
+	Q_OBJECT
+
+public:
+	DGameTracker(QWidget* parent_widget = nullptr);
+	~DGameTracker();
+
+	GameListStyle ViewStyle() const { return m_current_style; }
+	void SetViewStyle(GameListStyle newStyle);
+
+	GameFile* SelectedGame();
+	void SelectLastBootedGame();
+
+signals:
+	void StartGame();
+
+public slots:
+	void ScanForGames();
+
+private:
+	QMap<QString, GameFile*> m_games;
+	QFileSystemWatcher* m_watcher;
+
+	GameListStyle m_current_style;
+	DGameGrid* m_grid_widget = nullptr;
+	DGameTree* m_tree_widget = nullptr;
+};
diff --git a/Source/Core/DolphinQt/GameList/GameTree.cpp b/Source/Core/DolphinQt/GameList/GameTree.cpp
new file mode 100644
index 0000000000..b218d6072f
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameTree.cpp
@@ -0,0 +1,168 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "ui_GameTree.h"
+
+#include "Common/StdMakeUnique.h"
+
+#include "DolphinQt/GameList/GameTree.h"
+
+#include "DolphinQt/Utils/Resources.h"
+#include "DolphinQt/Utils/Utils.h"
+
+// Game banner image size
+static const u32 BANNER_WIDTH = 96;
+static const u32 BANNER_HEIGHT = 32;
+
+DGameTree::DGameTree(QWidget* parent_widget) :
+	QTreeWidget(parent_widget)
+{
+	m_ui = std::make_unique<Ui::DGameTree>();
+	m_ui->setupUi(this);
+
+	SetViewStyle(STYLE_TREE);
+	setIconSize(QSize(BANNER_WIDTH, BANNER_HEIGHT));
+	sortByColumn(COL_TITLE, Qt::AscendingOrder);
+
+	connect(this, SIGNAL(itemActivated(QTreeWidgetItem*, int)), this, SLOT(ItemActivated(QTreeWidgetItem*)));
+}
+
+DGameTree::~DGameTree()
+{
+	int count = topLevelItemCount();
+	for (int a = 0; a < count; a++)
+		takeTopLevelItem(0);
+
+	for (QTreeWidgetItem* i : m_path_nodes.values())
+	{
+		count = i->childCount();
+		for (int a = 0; a < count; a++)
+			i->takeChild(0);
+	}
+
+	for (QTreeWidgetItem* i : m_path_nodes.values())
+		delete i;
+	for (QTreeWidgetItem* i : m_items.keys())
+		delete i;
+}
+
+void DGameTree::ResizeAllCols()
+{
+	for (int i = 0; i < columnCount(); i++)
+		resizeColumnToContents(i);
+}
+
+void DGameTree::ItemActivated(QTreeWidgetItem* item)
+{
+	if (!m_path_nodes.values().contains(item))
+		emit StartGame();
+}
+
+GameFile* DGameTree::SelectedGame()
+{
+	if (!selectedItems().empty())
+		return m_items.value(selectedItems().at(0));
+	else
+		return nullptr;
+}
+
+void DGameTree::SelectGame(GameFile* game)
+{
+	if (game == nullptr)
+		return;
+	if (!selectedItems().empty())
+		selectedItems().at(0)->setSelected(false);
+	m_items.key(game)->setSelected(true);
+}
+
+void DGameTree::SetViewStyle(GameListStyle newStyle)
+{
+	if (newStyle == STYLE_LIST)
+	{
+		m_current_style = STYLE_LIST;
+		setIndentation(0);
+		RebuildTree();
+	}
+	else
+	{
+		m_current_style = STYLE_TREE;
+		setIndentation(20);
+		RebuildTree();
+	}
+}
+
+void DGameTree::AddGame(GameFile* item)
+{
+	if (m_items.values().contains(item))
+		return;
+
+	QString folder = item->GetFolderName();
+	if (!m_path_nodes.contains(folder))
+	{
+		QTreeWidgetItem* i = new QTreeWidgetItem;
+		i->setText(0, folder);
+		m_path_nodes.insert(folder, i);
+		if (m_current_style == STYLE_TREE)
+			addTopLevelItem(i);
+	}
+
+	QTreeWidgetItem* i = new QTreeWidgetItem;
+	i->setIcon(COL_TYPE, QIcon(Resources::GetPlatformPixmap(item->GetPlatform())));
+	i->setIcon(COL_BANNER, QIcon(item->GetBitmap()));
+	i->setText(COL_TITLE, item->GetName(true));
+	i->setText(COL_DESCRIPTION, item->GetDescription());
+	i->setIcon(COL_REGION, QIcon(Resources::GetRegionPixmap(item->GetCountry())));
+	i->setText(COL_SIZE, NiceSizeFormat(item->GetFileSize()));
+	i->setIcon(COL_STATE, QIcon(Resources::GetRatingPixmap(item->GetEmuState())));
+	if (item->IsCompressed())
+	{
+		for (int col = 0; col < columnCount(); col++)
+			i->setTextColor(col, QColor("#00F"));
+	}
+	m_items.insert(i, item);
+
+	RebuildTree(); // TODO: only call this once per group of items added
+}
+
+void DGameTree::RemoveGame(GameFile* item)
+{
+	if (!m_items.values().contains(item))
+		return;
+	QTreeWidgetItem* i = m_items.key(item);
+	m_items.remove(i);
+	delete i;
+}
+
+void DGameTree::RebuildTree()
+{
+	GameFile* currentGame = SelectedGame();
+
+	int count = topLevelItemCount();
+	for (int a = 0; a < count; a++)
+		takeTopLevelItem(0);
+
+	for (QTreeWidgetItem* i : m_path_nodes.values())
+	{
+		count = i->childCount();
+		for (int a = 0; a < count; a++)
+			i->takeChild(0);
+	}
+
+	if (m_current_style == STYLE_TREE)
+	{
+		for (QTreeWidgetItem* i : m_path_nodes.values())
+			addTopLevelItem(i);
+		for (QTreeWidgetItem* i : m_items.keys())
+			m_path_nodes.value(m_items.value(i)->GetFolderName())->addChild(i);
+	}
+	else
+	{
+		for (QTreeWidgetItem* i : m_items.keys())
+			addTopLevelItem(i);
+	}
+
+	expandAll();
+	ResizeAllCols();
+	SelectGame(currentGame);
+}
diff --git a/Source/Core/DolphinQt/GameList/GameTree.h b/Source/Core/DolphinQt/GameList/GameTree.h
new file mode 100644
index 0000000000..2e379f99e7
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameTree.h
@@ -0,0 +1,62 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include <QTreeWidget>
+
+#include "DolphinQt/GameList/GameTracker.h"
+
+// Predefinitions
+namespace Ui
+{
+class DGameTree;
+}
+
+class DGameTree : public QTreeWidget, public AbstractGameList
+{
+	Q_OBJECT
+
+public:
+	explicit DGameTree(QWidget* parent_widget = nullptr);
+	~DGameTree();
+
+	// AbstractGameList stuff
+	virtual GameFile* SelectedGame();
+	virtual void SelectGame(GameFile* game);
+
+	virtual void SetViewStyle(GameListStyle newStyle);
+
+	virtual void AddGame(GameFile* item);
+	virtual void RemoveGame(GameFile* item);
+
+signals:
+	void StartGame();
+
+private slots:
+	void ItemActivated(QTreeWidgetItem* item);
+
+private:
+	enum Columns
+	{
+		COL_TYPE = 0,
+		COL_BANNER = 1,
+		COL_TITLE = 2,
+		COL_DESCRIPTION = 3,
+		COL_REGION = 4,
+		COL_SIZE = 5,
+		COL_STATE = 6
+	};
+
+	std::unique_ptr<Ui::DGameTree> m_ui;
+	GameListStyle m_current_style;
+
+	QMap<QTreeWidgetItem*, GameFile*> m_items;
+	QMap<QString, QTreeWidgetItem*> m_path_nodes;
+
+	void RebuildTree();
+	void ResizeAllCols();
+};
diff --git a/Source/Core/DolphinQt/GameList/GameTree.ui b/Source/Core/DolphinQt/GameList/GameTree.ui
new file mode 100644
index 0000000000..22b63d82c3
--- /dev/null
+++ b/Source/Core/DolphinQt/GameList/GameTree.ui
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DGameTree</class>
+ <widget class="QTreeWidget" name="DGameTree">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>396</width>
+    <height>296</height>
+   </rect>
+  </property>
+  <property name="sortingEnabled">
+   <bool>true</bool>
+  </property>
+  <column>
+   <property name="text">
+    <string>Type</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>Banner</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>Title</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>Description</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>Region</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>Size</string>
+   </property>
+  </column>
+  <column>
+   <property name="text">
+    <string>State</string>
+   </property>
+  </column>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp
new file mode 100644
index 0000000000..150c0ba88b
--- /dev/null
+++ b/Source/Core/DolphinQt/Host.cpp
@@ -0,0 +1,95 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+
+#include <QApplication>
+#include <QResizeEvent>
+
+#include "Common/MsgHandler.h"
+#include "Core/Host.h"
+
+#include "DolphinQt/MainWindow.h"
+
+void Host_Message(int id)
+{
+	// TODO
+}
+
+void Host_UpdateMainFrame()
+{
+	// TODO
+}
+
+void Host_UpdateTitle(const std::string& title)
+{
+	// TODO
+}
+
+void* Host_GetRenderHandle()
+{
+	return (void*)(g_main_window->GetRenderWidget()->winId());
+}
+
+void Host_RequestRenderWindowSize(int w, int h)
+{
+	DRenderWidget* render_widget = g_main_window->GetRenderWidget();
+	qApp->postEvent(render_widget, new QResizeEvent(QSize(w, h), render_widget->size()));
+}
+
+bool Host_RendererHasFocus()
+{
+	return g_main_window->RenderWidgetHasFocus();
+}
+
+bool Host_UIHasFocus()
+{
+	return g_main_window->isActiveWindow();
+}
+
+bool Host_RendererIsFullscreen()
+{
+	return false; // TODO
+}
+
+void Host_RequestFullscreen(bool enable)
+{
+	// TODO
+}
+
+void Host_NotifyMapLoaded()
+{
+	// TODO
+}
+
+void Host_UpdateDisasmDialog()
+{
+	// TODO
+}
+
+void Host_SetStartupDebuggingParameters()
+{
+	// TODO
+}
+
+void Host_SetWiiMoteConnectionState(int state)
+{
+	// TODO
+}
+
+void Host_ConnectWiimote(int wm_idx, bool connect)
+{
+	// TODO
+}
+
+void Host_ShowVideoConfig(void* parent, const std::string& backend_name,
+                          const std::string& config_name)
+{
+	// TODO
+}
+
+void Host_RefreshDSPDebuggerWindow()
+{
+	// TODO
+}
diff --git a/Source/Core/DolphinQt/Info.plist.in b/Source/Core/DolphinQt/Info.plist.in
new file mode 100644
index 0000000000..aa3f6cb7e2
--- /dev/null
+++ b/Source/Core/DolphinQt/Info.plist.in
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ciso</string>
+				<string>dol</string>
+				<string>elf</string>
+				<string>gcm</string>
+				<string>gcz</string>
+				<string>iso</string>
+				<string>wad</string>
+				<string>wbfs</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>Dolphin.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Nintendo GC/Wii file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>DolphinQt</string>
+	<key>CFBundleIconFile</key>
+	<string>Resources/Dolphin.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.dolphin-emu.dolphin</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>ar</string>
+		<string>ca</string>
+		<string>cs</string>
+		<string>de</string>
+		<string>el</string>
+		<string>en</string>
+		<string>es</string>
+		<string>fa</string>
+		<string>fr</string>
+		<string>he</string>
+		<string>hu</string>
+		<string>it</string>
+		<string>ja</string>
+		<string>ko</string>
+		<string>nb</string>
+		<string>nl</string>
+		<string>pl</string>
+		<string>pt</string>
+		<string>pt_BR</string>
+		<string>ru</string>
+		<string>sr</string>
+		<string>sv</string>
+		<string>tr</string>
+		<string>zh_CN</string>
+		<string>zh_TW</string>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${DOLPHIN_WC_DESCRIBE}</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${DOLPHIN_WC_REVISION}</string>
+	<key>CFBundleVersion</key>
+	<string>${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Licensed under GPL version 2</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${OSX_MIN_VERSION}</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp
new file mode 100644
index 0000000000..289fbeedc0
--- /dev/null
+++ b/Source/Core/DolphinQt/Main.cpp
@@ -0,0 +1,65 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QApplication>
+#include <QDesktopServices>
+#include <QFile>
+#include <QMessageBox>
+#include <QSysInfo>
+#include <QUrl>
+
+#include "MainWindow.h"
+
+#include "DolphinQt/Utils/Utils.h"
+#include "UICommon/UICommon.h"
+
+static bool IsOsSupported()
+{
+#ifdef Q_OS_OSX
+	return QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9;
+#elif defined(Q_OS_WIN)
+	return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) >= QSysInfo::WV_VISTA;
+#else
+	return true;
+#endif
+}
+
+static QString LowestSupportedOsVersion()
+{
+#ifdef Q_OS_OSX
+	return SL("Mac OS X 10.9");
+#elif defined(Q_OS_WIN)
+	return SL("Windows Vista SP2");
+#else
+	return SL("Unknown");
+#endif
+}
+
+int main(int argc, char* argv[])
+{
+	QApplication app(argc, argv);
+	app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+	// TODO: Add command line options
+
+	UICommon::SetUserDirectory(""); // Auto-detect user folder
+	UICommon::CreateDirectories();
+	UICommon::Init();
+
+	if (!IsOsSupported())
+	{
+		QMessageBox::critical(nullptr, QObject::tr("Unsupported OS"),
+		                      QObject::tr("Dolphin requires %1 or greater.\n"
+		                                  "Please upgrade to %1 or greater to use Dolphin.")
+		                      .arg(LowestSupportedOsVersion()));
+		return 1;
+	}
+
+	g_main_window = new DMainWindow();
+	g_main_window->show();
+
+	int retcode = app.exec();
+	delete g_main_window;
+	UICommon::Shutdown();
+	return retcode;
+}
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
new file mode 100644
index 0000000000..8cffd84e58
--- /dev/null
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -0,0 +1,370 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QActionGroup>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QUrl>
+
+#include "ui_MainWindow.h"
+
+#include "Common/StdMakeUnique.h"
+
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/ProcessorInterface.h"
+
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/SystemInfo.h"
+#include "DolphinQt/Utils/Resources.h"
+#include "DolphinQt/Utils/Utils.h"
+
+#include "VideoCommon/VideoConfig.h"
+
+// The "g_main_window" object as defined in MainWindow.h
+DMainWindow* g_main_window = nullptr;
+
+DMainWindow::DMainWindow(QWidget* parent_widget)
+	: QMainWindow(parent_widget)
+{
+	m_ui = std::make_unique<Ui::DMainWindow>();
+	m_ui->setupUi(this);
+
+	Resources::Init();
+	UpdateIcons();
+	setWindowIcon(Resources::GetIcon(Resources::DOLPHIN_LOGO));
+
+	// Create the GameList
+	m_game_tracker = new DGameTracker(this);
+	m_ui->centralWidget->addWidget(m_game_tracker);
+	m_game_tracker->ScanForGames();
+	m_game_tracker->SelectLastBootedGame();
+
+	// Setup the GameList style switching actions
+	QActionGroup* gamelistGroup = new QActionGroup(this);
+	gamelistGroup->addAction(m_ui->actionListView);
+	gamelistGroup->addAction(m_ui->actionTreeView);
+	gamelistGroup->addAction(m_ui->actionGridView);
+	gamelistGroup->addAction(m_ui->actionIconView);
+
+	// TODO: save/load this from user prefs!
+	m_ui->actionListView->setChecked(true);
+	OnGameListStyleChanged();
+
+	// Connect all the signals/slots
+	connect(this, SIGNAL(CoreStateChanged(Core::EState)), this, SLOT(OnCoreStateChanged(Core::EState)));
+
+	connect(m_ui->actionOpen, SIGNAL(triggered()), this, SLOT(OnOpen()));
+	connect(m_ui->actionBrowse, SIGNAL(triggered()), this, SLOT(OnBrowse()));
+	connect(m_ui->actionExit, SIGNAL(triggered()), this, SLOT(OnExit()));
+
+	connect(m_ui->actionListView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
+	connect(m_ui->actionTreeView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
+	connect(m_ui->actionGridView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
+	connect(m_ui->actionIconView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
+
+	connect(m_ui->actionPlay, SIGNAL(triggered()), this, SLOT(OnPlay()));
+	connect(m_ui->actionPlay_mnu, SIGNAL(triggered()), this, SLOT(OnPlay()));
+	connect(m_game_tracker, SIGNAL(StartGame()), this, SLOT(OnPlay()));
+	connect(m_ui->actionStop, SIGNAL(triggered()), this, SLOT(OnStop()));
+	connect(m_ui->actionStop_mnu, SIGNAL(triggered()), this, SLOT(OnStop()));
+	connect(m_ui->actionReset, SIGNAL(triggered()), this, SLOT(OnReset()));
+
+	connect(m_ui->actionWebsite, SIGNAL(triggered()), this, SLOT(OnOpenWebsite()));
+	connect(m_ui->actionOnlineDocs, SIGNAL(triggered()), this, SLOT(OnOpenDocs()));
+	connect(m_ui->actionGitHub, SIGNAL(triggered()), this, SLOT(OnOpenGitHub()));
+	connect(m_ui->actionSystemInfo, SIGNAL(triggered()), this, SLOT(OnOpenSystemInfo()));
+	connect(m_ui->actionAbout, SIGNAL(triggered()), this, SLOT(OnOpenAbout()));
+	connect(m_ui->actionAboutQt, SIGNAL(triggered()), this, SLOT(OnOpenAboutQt()));
+
+	// Update GUI items
+	emit CoreStateChanged(Core::CORE_UNINITIALIZED);
+
+	// Platform-specific stuff
+#ifdef Q_OS_MACX
+	m_ui->toolbar->setMovable(false);
+#endif
+}
+
+DMainWindow::~DMainWindow()
+{
+}
+
+void DMainWindow::closeEvent(QCloseEvent* ce)
+{
+	Stop();
+}
+
+// Emulation
+
+void DMainWindow::StartGame(const QString filename)
+{
+	m_render_widget = std::make_unique<DRenderWidget>();
+	m_render_widget->setWindowTitle(tr("Dolphin")); // TODO
+	m_render_widget->setWindowIcon(windowIcon());
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen)
+	{
+		m_render_widget->setWindowFlags(m_render_widget->windowFlags() | Qt::BypassWindowManagerHint);
+		g_Config.bFullscreen = !g_Config.bBorderlessFullscreen;
+		m_render_widget->showFullScreen();
+	}
+	else
+	{
+		m_ui->centralWidget->addWidget(m_render_widget.get());
+		m_ui->centralWidget->setCurrentWidget(m_render_widget.get());
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)
+		{
+			// Resize main window to fit render
+			m_render_widget->setMinimumSize(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
+				SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
+			qApp->processEvents(); // Force a redraw so the window has time to resize
+			m_render_widget->setMinimumSize(0, 0); // Allow the widget to scale down
+		}
+		m_render_widget->adjustSize();
+	}
+
+	if (!BootManager::BootCore(filename.toStdString()))
+	{
+		QMessageBox::critical(this, tr("Fatal error"), tr("Failed to init Core"), QMessageBox::Ok);
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen)
+			m_render_widget->close();
+		else
+			m_ui->centralWidget->removeWidget(m_render_widget.get());
+		m_render_widget.reset();
+	}
+	else
+	{
+		// TODO: Disable screensaver!
+		emit CoreStateChanged(Core::CORE_RUN);
+	}
+}
+
+QString DMainWindow::RequestBootFilename()
+{
+	// If a game is already selected, just return the filename
+	if (m_game_tracker->SelectedGame() != nullptr)
+			return m_game_tracker->SelectedGame()->GetFileName();
+
+	return ShowFileDialog();
+}
+
+QString DMainWindow::ShowFileDialog()
+{
+	return QFileDialog::getOpenFileName(this, tr("Open File"), QString(),
+		tr("All supported ROMs (%1);;All files (*)")
+		.arg(SL("*.gcm *.iso *.ciso *.gcz *.wbfs *.elf *.dol *.dff *.tmd *.wad")));
+}
+
+QString DMainWindow::ShowFolderDialog()
+{
+	return QFileDialog::getExistingDirectory(this, tr("Browse for a directory to add"),
+	                                         QDir::homePath(),
+	                                         QFileDialog::ShowDirsOnly);
+}
+
+void DMainWindow::DoStartPause()
+{
+	if (Core::GetState() == Core::CORE_RUN)
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		emit CoreStateChanged(Core::CORE_PAUSE);
+	}
+	else
+	{
+		Core::SetState(Core::CORE_RUN);
+		emit CoreStateChanged(Core::CORE_RUN);
+	}
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+		m_render_widget->setCursor(Qt::BlankCursor);
+}
+
+void DMainWindow::OnOpen()
+{
+	QString filename = ShowFileDialog();
+	if (!filename.isNull())
+		StartGame(filename);
+}
+
+void DMainWindow::OnBrowse()
+{
+	std::string path = ShowFolderDialog().toStdString();
+	std::vector<std::string>& iso_folder = SConfig::GetInstance().m_ISOFolder;
+	if (!path.empty())
+	{
+		auto itResult = std::find(iso_folder.begin(), iso_folder.end(), path);
+
+		if (itResult == iso_folder.end())
+		{
+			iso_folder.push_back(path);
+			SConfig::GetInstance().SaveSettings();
+		}
+	}
+	m_game_tracker->ScanForGames();
+}
+
+void DMainWindow::OnExit()
+{
+	close();
+	if (Core::GetState() == Core::CORE_UNINITIALIZED || m_isStopping)
+		return;
+	Stop();
+}
+
+void DMainWindow::OnPlay()
+{
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		DoStartPause();
+	}
+	else
+	{
+		// initialize Core and boot the game
+		QString filename = RequestBootFilename();
+		if (!filename.isNull())
+			StartGame(filename);
+	}
+}
+
+bool DMainWindow::OnStop()
+{
+	if (Core::GetState() == Core::CORE_UNINITIALIZED || m_isStopping)
+		return true;
+
+	// Ask for confirmation in case the user accidentally clicked Stop / Escape
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop)
+	{
+		// Pause emulation
+		Core::SetState(Core::CORE_PAUSE);
+		emit CoreStateChanged(Core::CORE_PAUSE);
+
+		QMessageBox::StandardButton ret = QMessageBox::question(m_render_widget.get(), tr("Please confirm..."),
+			tr("Do you want to stop the current emulation?"),
+			QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+
+		if (ret == QMessageBox::No)
+		{
+			DoStartPause();
+			return false;
+		}
+	}
+
+	return Stop();
+}
+
+bool DMainWindow::Stop()
+{
+	m_isStopping = true;
+
+	// TODO: Movie stuff
+	// TODO: Show the author/description dialog here
+
+	BootManager::Stop();
+
+	// TODO: Allow screensaver again
+	// TODO: Restore original window title
+
+	// TODO:
+	// If batch mode was specified on the command-line, exit now.
+	//if (m_bBatchMode)
+	//	Close(true);
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen)
+		m_render_widget->close();
+	else
+		m_ui->centralWidget->removeWidget(m_render_widget.get());
+	m_render_widget.reset();
+
+	emit CoreStateChanged(Core::CORE_UNINITIALIZED);
+	m_isStopping = false;
+	return true;
+}
+
+void DMainWindow::OnReset()
+{
+	// TODO: Movie needs to be reset here
+	ProcessorInterface::ResetButton_Tap();
+}
+
+void DMainWindow::OnGameListStyleChanged()
+{
+	if (m_ui->actionListView->isChecked())
+		m_game_tracker->SetViewStyle(STYLE_LIST);
+	else if (m_ui->actionTreeView->isChecked())
+		m_game_tracker->SetViewStyle(STYLE_TREE);
+	else if (m_ui->actionGridView->isChecked())
+		m_game_tracker->SetViewStyle(STYLE_GRID);
+	else if (m_ui->actionIconView->isChecked())
+		m_game_tracker->SetViewStyle(STYLE_ICON);
+}
+
+void DMainWindow::OnCoreStateChanged(Core::EState state)
+{
+	bool is_not_initialized = (state == Core::CORE_UNINITIALIZED);
+	bool is_running = (state == Core::CORE_RUN);
+	bool is_paused = (state == Core::CORE_PAUSE);
+
+	// Update the toolbar
+	m_ui->actionPlay->setEnabled(is_not_initialized || is_running || is_paused);
+	if (is_running)
+	{
+		m_ui->actionPlay->setIcon(Resources::GetIcon(Resources::TOOLBAR_PAUSE));
+		m_ui->actionPlay->setText(tr("Pause"));
+		m_ui->actionPlay_mnu->setText(tr("Pause"));
+	}
+	else if (is_paused || is_not_initialized)
+	{
+		m_ui->actionPlay->setIcon(Resources::GetIcon(Resources::TOOLBAR_PLAY));
+		m_ui->actionPlay->setText(tr("Play"));
+		m_ui->actionPlay_mnu->setText(tr("Play"));
+	}
+
+	m_ui->actionStop->setEnabled(!is_not_initialized);
+	m_ui->actionOpen->setEnabled(is_not_initialized);
+	m_game_tracker->setEnabled(is_not_initialized);
+}
+
+// Update all the icons used in DMainWindow with fresh ones from
+// "Resources". Call this function after changing the icon theme.
+void DMainWindow::UpdateIcons()
+{
+	// Play/Pause is handled in OnCoreStateChanged().
+	m_ui->actionStop->setIcon(Resources::GetIcon(Resources::TOOLBAR_STOP));
+}
+
+// Help menu
+void DMainWindow::OnOpenWebsite()
+{
+	QDesktopServices::openUrl(QUrl(SL("https://dolphin-emu.org/")));
+}
+
+void DMainWindow::OnOpenDocs()
+{
+	QDesktopServices::openUrl(QUrl(SL("https://dolphin-emu.org/docs/guides/")));
+}
+
+void DMainWindow::OnOpenGitHub()
+{
+	QDesktopServices::openUrl(QUrl(SL("https://github.com/dolphin-emu/dolphin")));
+}
+
+void DMainWindow::OnOpenSystemInfo()
+{
+	DSystemInfo* dlg = new DSystemInfo(this);
+	dlg->open();
+}
+
+void DMainWindow::OnOpenAbout()
+{
+	DAboutDialog* dlg = new DAboutDialog(this);
+	dlg->open();
+}
+
+void DMainWindow::OnOpenAboutQt()
+{
+	QApplication::aboutQt();
+}
diff --git a/Source/Core/DolphinQt/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h
new file mode 100644
index 0000000000..164e4528c5
--- /dev/null
+++ b/Source/Core/DolphinQt/MainWindow.h
@@ -0,0 +1,83 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <QMainWindow>
+
+#include "Core/Core.h"
+
+#include "DolphinQt/GameList/GameTracker.h"
+#include "DolphinQt/VideoInterface/RenderWidget.h"
+
+// Predefinitions
+namespace Ui
+{
+class DMainWindow;
+}
+
+class DMainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	explicit DMainWindow(QWidget* parent_widget = nullptr);
+	~DMainWindow();
+
+	// DRenderWidget
+	bool RenderWidgetHasFocus() const { return m_render_widget->isActiveWindow(); }
+	DRenderWidget* GetRenderWidget() { return m_render_widget.get(); }
+
+signals:
+	void CoreStateChanged(Core::EState state);
+
+public slots:
+	// Main toolbar (also used by DRenderWidget)
+	bool OnStop();
+
+private slots:
+	// Emulation
+	void StartGame(const QString filename);
+	void OnCoreStateChanged(Core::EState state);
+
+	// Main toolbar
+	void OnOpen();
+	void OnBrowse();
+	void OnExit();
+	void OnPlay();
+	void OnReset();
+
+	// View menu
+	void OnGameListStyleChanged();
+
+	// Help menu
+	void OnOpenWebsite();
+	void OnOpenDocs();
+	void OnOpenGitHub();
+	void OnOpenSystemInfo();
+	void OnOpenAbout();
+	void OnOpenAboutQt();
+
+	// Misc.
+	void UpdateIcons();
+
+private:
+	void closeEvent(QCloseEvent* ce);
+	std::unique_ptr<Ui::DMainWindow> m_ui;
+	DGameTracker* m_game_tracker;
+
+	// Emulation
+	QString RequestBootFilename();
+	QString ShowFileDialog();
+	QString ShowFolderDialog();
+	void DoStartPause();
+	bool Stop();
+
+	std::unique_ptr<DRenderWidget> m_render_widget;
+	bool m_isStopping = false;
+};
+
+// Pointer to the only instance of DMainWindow, used by Host_*
+extern DMainWindow* g_main_window;
diff --git a/Source/Core/DolphinQt/MainWindow.ui b/Source/Core/DolphinQt/MainWindow.ui
new file mode 100644
index 0000000000..966486f29f
--- /dev/null
+++ b/Source/Core/DolphinQt/MainWindow.ui
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DMainWindow</class>
+ <widget class="QMainWindow" name="DMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>990</width>
+    <height>590</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dolphin</string>
+  </property>
+  <property name="iconSize">
+   <size>
+    <width>32</width>
+    <height>32</height>
+   </size>
+  </property>
+  <property name="toolButtonStyle">
+   <enum>Qt::ToolButtonTextUnderIcon</enum>
+  </property>
+  <property name="unifiedTitleAndToolBarOnMac">
+   <bool>true</bool>
+  </property>
+  <widget class="QStackedWidget" name="centralWidget"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>990</width>
+     <height>19</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="mnuFile">
+    <property name="title">
+     <string>Fi&amp;le</string>
+    </property>
+    <addaction name="actionOpen"/>
+    <addaction name="separator"/>
+    <addaction name="actionBrowse"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <widget class="QMenu" name="mnuEmulation">
+    <property name="title">
+     <string>E&amp;mulation</string>
+    </property>
+    <addaction name="actionPlay_mnu"/>
+    <addaction name="actionStop_mnu"/>
+    <addaction name="actionReset"/>
+   </widget>
+   <widget class="QMenu" name="mnuOptions">
+    <property name="title">
+     <string>Optio&amp;ns</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="mnuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="mnuView">
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <widget class="QMenu" name="mnuListStyle">
+     <property name="title">
+      <string>&amp;List style</string>
+     </property>
+     <addaction name="actionListView"/>
+     <addaction name="actionTreeView"/>
+     <addaction name="actionGridView"/>
+     <addaction name="actionIconView"/>
+    </widget>
+    <addaction name="mnuListStyle"/>
+   </widget>
+   <widget class="QMenu" name="mnuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionWebsite"/>
+    <addaction name="actionOnlineDocs"/>
+    <addaction name="actionGitHub"/>
+    <addaction name="separator"/>
+    <addaction name="actionSystemInfo"/>
+    <addaction name="actionAbout"/>
+    <addaction name="actionAboutQt"/>
+   </widget>
+   <widget class="QMenu" name="mnuMovie">
+    <property name="title">
+     <string>Movie</string>
+    </property>
+   </widget>
+   <addaction name="mnuFile"/>
+   <addaction name="mnuView"/>
+   <addaction name="mnuEmulation"/>
+   <addaction name="mnuMovie"/>
+   <addaction name="mnuOptions"/>
+   <addaction name="mnuTools"/>
+   <addaction name="mnuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolbar">
+   <property name="windowTitle">
+    <string>Toolbar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionPlay"/>
+   <addaction name="actionStop"/>
+  </widget>
+  <action name="actionWebsite">
+   <property name="text">
+    <string>&amp;Website</string>
+   </property>
+  </action>
+  <action name="actionOnlineDocs">
+   <property name="text">
+    <string>&amp;Online Documentation</string>
+   </property>
+  </action>
+  <action name="actionGitHub">
+   <property name="text">
+    <string>&amp;GitHub Repository</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>&amp;About</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
+  </action>
+  <action name="actionOpen">
+   <property name="text">
+    <string>&amp;Open...</string>
+   </property>
+   <property name="toolTip">
+    <string>Open file...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionSystemInfo">
+   <property name="text">
+    <string>&amp;System Information</string>
+   </property>
+  </action>
+  <action name="actionPlay">
+   <property name="text">
+    <string>Play</string>
+   </property>
+  </action>
+  <action name="actionStop">
+   <property name="text">
+    <string>Stop</string>
+   </property>
+  </action>
+  <action name="actionAboutQt">
+   <property name="text">
+    <string>About &amp;Qt</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutQtRole</enum>
+   </property>
+  </action>
+  <action name="actionListView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;List view</string>
+   </property>
+  </action>
+  <action name="actionTreeView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Tree view</string>
+   </property>
+  </action>
+  <action name="actionGridView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Grid view</string>
+   </property>
+  </action>
+  <action name="actionIconView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Icon view</string>
+   </property>
+  </action>
+  <action name="actionBrowse">
+   <property name="text">
+    <string>&amp;Browse for ISOs...</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="text">
+    <string>Exit</string>
+   </property>
+  </action>
+  <action name="actionPlay_mnu">
+   <property name="text">
+    <string>&amp;Play</string>
+   </property>
+   <property name="shortcut">
+    <string>F10</string>
+   </property>
+  </action>
+  <action name="actionStop_mnu">
+   <property name="text">
+    <string>&amp;Stop</string>
+   </property>
+   <property name="shortcut">
+    <string>Esc</string>
+   </property>
+  </action>
+  <action name="actionReset">
+   <property name="text">
+    <string>&amp;Reset</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Source/Core/DolphinQt/Resources/Dolphin.icns b/Source/Core/DolphinQt/Resources/Dolphin.icns
new file mode 100644
index 0000000000..4a17b18dec
Binary files /dev/null and b/Source/Core/DolphinQt/Resources/Dolphin.icns differ
diff --git a/Source/Core/DolphinQt/SystemInfo.cpp b/Source/Core/DolphinQt/SystemInfo.cpp
new file mode 100644
index 0000000000..1d27324779
--- /dev/null
+++ b/Source/Core/DolphinQt/SystemInfo.cpp
@@ -0,0 +1,104 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QClipboard>
+#include <QPushButton>
+#include <QThread>
+
+#include "ui_SystemInfo.h"
+
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/StdMakeUnique.h"
+
+#include "DolphinQt/SystemInfo.h"
+#include "DolphinQt/Utils/Utils.h"
+
+DSystemInfo::DSystemInfo(QWidget* parent_widget) :
+	QDialog(parent_widget)
+{
+	setWindowModality(Qt::WindowModal);
+	setAttribute(Qt::WA_DeleteOnClose);
+
+	m_ui = std::make_unique<Ui::DSystemInfo>();
+	m_ui->setupUi(this);
+
+	UpdateSystemInfo();
+
+	QPushButton* btn = m_ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole);
+	connect(btn, SIGNAL(pressed()), this, SLOT(CopyPressed()));
+}
+
+DSystemInfo::~DSystemInfo()
+{
+}
+
+void DSystemInfo::CopyPressed()
+{
+	QClipboard* clipboard = QApplication::clipboard();
+	clipboard->setText(m_ui->txtSysInfo->toPlainText());
+}
+
+void DSystemInfo::UpdateSystemInfo()
+{
+	QString sysinfo;
+
+	sysinfo += SL("System\n===========================\n");
+	sysinfo += SL("OS: %1\n").arg(GetOS());
+	sysinfo += SL("CPU: %1, %2 cores\n").arg(QString::fromStdString(cpu_info.Summarize()))
+		.arg(QThread::idealThreadCount());
+
+	sysinfo += SL("\nDolphin\n===========================\n");
+	sysinfo += SL("SCM: branch %1, rev %2\n").arg(SC(scm_branch_str)).arg(SC(scm_rev_git_str));
+	sysinfo += SL("Compiled: %1, %2\n").arg(SL(__DATE__)).arg(SL(__TIME__));
+
+	sysinfo += SL("\nGUI\n===========================\n");
+	sysinfo += SL("Compiled for Qt: %1\n").arg(SL(QT_VERSION_STR));
+	sysinfo += SL("Running on Qt: %1").arg(SC(qVersion()));
+
+	m_ui->txtSysInfo->setPlainText(sysinfo);
+}
+
+QString DSystemInfo::GetOS() const
+{
+	QString ret;
+	/* DON'T REORDER WITHOUT READING Qt DOCS! */
+#if defined(Q_OS_WIN)
+	ret += SL("Windows ");
+	switch (QSysInfo::WindowsVersion) {
+	case QSysInfo::WV_VISTA: ret += SL("Vista"); break;
+	case QSysInfo::WV_WINDOWS7: ret += SL("7"); break;
+	case QSysInfo::WV_WINDOWS8: ret += SL("8"); break;
+	default: ret += SL("(unknown)"); break;
+	}
+#elif defined(Q_OS_MAC)
+	ret += SL("Mac OS X ");
+	switch (QSysInfo::MacintoshVersion) {
+	case QSysInfo::MV_10_9: ret += SL("10.9"); break;
+	default: ret += SL("(unknown)"); break;
+	}
+#elif defined(Q_OS_LINUX)
+	ret += SL("Linux");
+#elif defined(Q_OS_FREEBSD)
+	ret += SL("FreeBSD");
+#elif defined(Q_OS_OPENBSD)
+	ret += SL("OpenBSD");
+#elif defined(Q_OS_NETBSD)
+	ret += SL("NetBSD");
+#elif defined(Q_OS_BSD4)
+	ret += SL("Other BSD");
+#elif defined(Q_OS_UNIX)
+	ret += SL("Unix");
+#else
+	ret += SL("Unknown");
+#endif
+
+#if defined(Q_WS_X11) || defined(Q_OS_X11)
+	ret += SL(" X11");
+#elif defined(Q_WS_WAYLAND)
+	ret += SL(" Wayland");
+#endif
+
+	return ret;
+}
diff --git a/Source/Core/DolphinQt/SystemInfo.h b/Source/Core/DolphinQt/SystemInfo.h
new file mode 100644
index 0000000000..b7906d2b47
--- /dev/null
+++ b/Source/Core/DolphinQt/SystemInfo.h
@@ -0,0 +1,31 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <QDialog>
+
+namespace Ui
+{
+class DSystemInfo;
+}
+
+class DSystemInfo : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit DSystemInfo(QWidget* parent_widget = nullptr);
+	~DSystemInfo();
+
+private slots:
+	void CopyPressed();
+
+private:
+	std::unique_ptr<Ui::DSystemInfo> m_ui;
+
+	void UpdateSystemInfo();
+	QString GetOS() const;
+};
diff --git a/Source/Core/DolphinQt/SystemInfo.ui b/Source/Core/DolphinQt/SystemInfo.ui
new file mode 100644
index 0000000000..95506a9857
--- /dev/null
+++ b/Source/Core/DolphinQt/SystemInfo.ui
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DSystemInfo</class>
+ <widget class="QDialog" name="DSystemInfo">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>446</width>
+    <height>298</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>System Information</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QPlainTextEdit" name="txtSysInfo">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DSystemInfo</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DSystemInfo</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp
new file mode 100644
index 0000000000..30c2848235
--- /dev/null
+++ b/Source/Core/DolphinQt/Utils/Resources.cpp
@@ -0,0 +1,124 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QApplication>
+#include <QFile>
+
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+
+#include "DolphinQt/Utils/Resources.h"
+#include "DolphinQt/Utils/Utils.h"
+
+QVector<QPixmap> Resources::m_platforms;
+QVector<QPixmap> Resources::m_regions;
+QVector<QPixmap> Resources::m_ratings;
+QVector<QPixmap> Resources::m_pixmaps;
+
+// Wrapper for GetImageFilename() so you don't have to to call it directly
+#define GIFN(file) GetImageFilename(SL(file), dir)
+
+void Resources::Init()
+{
+	QString dir = QString::fromStdString(File::GetSysDirectory() + "Resources/");
+
+	m_regions.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
+	m_regions[DiscIO::IVolume::COUNTRY_JAPAN].load(GIFN("Flag_Japan"));
+	m_regions[DiscIO::IVolume::COUNTRY_EUROPE].load(GIFN("Flag_Europe"));
+	m_regions[DiscIO::IVolume::COUNTRY_USA].load(GIFN("Flag_USA"));
+
+	m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(GIFN("Flag_Australia"));
+	m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(GIFN("Flag_France"));
+	m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(GIFN("Flag_Germany"));
+	m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(GIFN("Flag_Italy"));
+	m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(GIFN("Flag_Korea"));
+	m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(GIFN("Flag_Netherlands"));
+	m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(GIFN("Flag_Russia"));
+	m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(GIFN("Flag_Spain"));
+	m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(GIFN("Flag_Taiwan"));
+	m_regions[DiscIO::IVolume::COUNTRY_WORLD].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder
+	m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(GIFN("Flag_Unknown"));
+
+	m_platforms.resize(3);
+	m_platforms[0].load(GIFN("Platform_Gamecube"));
+	m_platforms[1].load(GIFN("Platform_Wii"));
+	m_platforms[2].load(GIFN("Platform_Wad"));
+
+	m_ratings.resize(6);
+	m_ratings[0].load(GIFN("rating0"));
+	m_ratings[1].load(GIFN("rating1"));
+	m_ratings[2].load(GIFN("rating2"));
+	m_ratings[3].load(GIFN("rating3"));
+	m_ratings[4].load(GIFN("rating4"));
+	m_ratings[5].load(GIFN("rating5"));
+
+	m_pixmaps.resize(NUM_ICONS);
+	m_pixmaps[DOLPHIN_LOGO].load(GIFN("Dolphin"));
+	UpdatePixmaps();
+}
+
+void Resources::UpdatePixmaps()
+{
+	QString dir = QString::fromStdString(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
+	m_pixmaps[TOOLBAR_OPEN].load(GIFN("open"));
+	m_pixmaps[TOOLBAR_REFRESH].load(GIFN("refresh"));
+	m_pixmaps[TOOLBAR_BROWSE].load(GIFN("browse"));
+	m_pixmaps[TOOLBAR_PLAY].load(GIFN("play"));
+	m_pixmaps[TOOLBAR_STOP].load(GIFN("stop"));
+	m_pixmaps[TOOLBAR_PAUSE].load(GIFN("pause"));
+	m_pixmaps[TOOLBAR_FULLSCREEN].load(GIFN("fullscreen"));
+	m_pixmaps[TOOLBAR_SCREENSHOT].load(GIFN("screenshot"));
+	m_pixmaps[TOOLBAR_CONFIGURE].load(GIFN("config"));
+	m_pixmaps[TOOLBAR_PLUGIN_GFX].load(GIFN("graphics"));
+	m_pixmaps[TOOLBAR_PLUGIN_DSP].load(GIFN("dsp"));
+	m_pixmaps[TOOLBAR_PLUGIN_GCPAD].load(GIFN("gcpad"));
+	m_pixmaps[TOOLBAR_PLUGIN_WIIMOTE].load(GIFN("wiimote"));
+	m_pixmaps[TOOLBAR_HELP].load(GIFN("nobanner")); // TODO
+	// TODO: toolbar[MEMCARD];
+	// TODO: toolbar[HOTKEYS];
+	m_pixmaps[BANNER_MISSING].load(GIFN("nobanner"));
+}
+
+QString Resources::GetImageFilename(QString name, QString dir)
+{
+	if (qApp->devicePixelRatio() >= 2)
+	{
+		QString fileName = name;
+		fileName.prepend(dir).append(SL("@2x.png"));
+		if (QFile::exists(fileName))
+			return fileName;
+	}
+	return name.prepend(dir).append(SL(".png"));
+}
+
+QPixmap& Resources::GetRegionPixmap(DiscIO::IVolume::ECountry region)
+{
+	return m_regions[region];
+}
+
+QPixmap& Resources::GetPlatformPixmap(int console)
+{
+	if (console >= m_platforms.size() || console < 0)
+		return m_platforms[0];
+	return m_platforms[console];
+}
+
+QPixmap& Resources::GetRatingPixmap(int rating)
+{
+	if (rating >= m_ratings.size() || rating < 0)
+		return m_ratings[0];
+	return m_ratings[rating];
+}
+
+QPixmap& Resources::GetPixmap(int id)
+{
+	if (id >= m_pixmaps.size() || id < 0)
+		return m_pixmaps[0];
+	return m_pixmaps[id];
+}
+
+QIcon Resources::GetIcon(int id)
+{
+	return QIcon(GetPixmap(id));
+}
diff --git a/Source/Core/DolphinQt/Utils/Resources.h b/Source/Core/DolphinQt/Utils/Resources.h
new file mode 100644
index 0000000000..530f365e1f
--- /dev/null
+++ b/Source/Core/DolphinQt/Utils/Resources.h
@@ -0,0 +1,55 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QIcon>
+#include <QPixmap>
+#include <QVector>
+
+#include "DiscIO/Volume.h"
+
+class Resources
+{
+public:
+	static void Init();
+	static void UpdatePixmaps();
+
+	static QPixmap& GetPlatformPixmap(int console);
+	static QPixmap& GetRegionPixmap(DiscIO::IVolume::ECountry region);
+	static QPixmap& GetRatingPixmap(int rating);
+	static QPixmap& GetPixmap(int id);
+	static QIcon GetIcon(int id);
+
+	enum
+	{
+		TOOLBAR_OPEN = 0,
+		TOOLBAR_REFRESH,
+		TOOLBAR_BROWSE,
+		TOOLBAR_PLAY,
+		TOOLBAR_STOP,
+		TOOLBAR_PAUSE,
+		TOOLBAR_FULLSCREEN,
+		TOOLBAR_SCREENSHOT,
+		TOOLBAR_CONFIGURE,
+		TOOLBAR_PLUGIN_GFX,
+		TOOLBAR_PLUGIN_DSP,
+		TOOLBAR_PLUGIN_GCPAD,
+		TOOLBAR_PLUGIN_WIIMOTE,
+		TOOLBAR_HELP,
+		MEMCARD,
+		HOTKEYS,
+		DOLPHIN_LOGO,
+		BANNER_MISSING,
+		NUM_ICONS
+	};
+
+private:
+	static QVector<QPixmap> m_platforms;
+	static QVector<QPixmap> m_regions;
+	static QVector<QPixmap> m_ratings;
+	static QVector<QPixmap> m_pixmaps;
+
+	static QString GetImageFilename(QString name, QString dir);
+};
diff --git a/Source/Core/DolphinQt/Utils/Utils.cpp b/Source/Core/DolphinQt/Utils/Utils.cpp
new file mode 100644
index 0000000000..ca758c5dcd
--- /dev/null
+++ b/Source/Core/DolphinQt/Utils/Utils.cpp
@@ -0,0 +1,21 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QStringListIterator>
+
+#include "Utils.h"
+
+QString NiceSizeFormat(s64 size)
+{
+	QStringList list = { SL("KB"), SL("MB"), SL("GB"), SL("TB"), SL("PB"), SL("EB") };
+	QStringListIterator i(list);
+	QString unit = SL("b");
+	double num = size;
+	while (num >= 1024.0 && i.hasNext())
+	{
+		unit = i.next();
+		num /= 1024.0;
+	}
+	return SL("%1 %2").arg(QString::number(num, 'f', 1)).arg(unit);
+}
diff --git a/Source/Core/DolphinQt/Utils/Utils.h b/Source/Core/DolphinQt/Utils/Utils.h
new file mode 100644
index 0000000000..0d9a52a59a
--- /dev/null
+++ b/Source/Core/DolphinQt/Utils/Utils.h
@@ -0,0 +1,18 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QString>
+
+#include "Common/CommonTypes.h"
+
+// Use this to encapsulate ASCII string literals
+#define SL(str) QStringLiteral(str)
+
+// Use this to encapsulate string constants and functions that
+// return "char*"s
+#define SC(str) QString::fromLatin1(str)
+
+QString NiceSizeFormat(s64 size);
diff --git a/Source/Core/DolphinQt/VideoInterface/RenderWidget.cpp b/Source/Core/DolphinQt/VideoInterface/RenderWidget.cpp
new file mode 100644
index 0000000000..5162d2b230
--- /dev/null
+++ b/Source/Core/DolphinQt/VideoInterface/RenderWidget.cpp
@@ -0,0 +1,27 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QCloseEvent>
+#include <QMessageBox>
+
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/VideoInterface/RenderWidget.h"
+
+DRenderWidget::DRenderWidget(QWidget* parent_widget)
+	: QWidget(parent_widget)
+{
+	setAttribute(Qt::WA_NativeWindow, true);
+	setAttribute(Qt::WA_OpaquePaintEvent, true);
+	setAttribute(Qt::WA_NoSystemBackground, true);
+}
+
+void DRenderWidget::closeEvent(QCloseEvent* e)
+{
+	if (!g_main_window->OnStop())
+	{
+		e->ignore();
+		return;
+	}
+	QWidget::closeEvent(e);
+}
diff --git a/Source/Core/DolphinQt/VideoInterface/RenderWidget.h b/Source/Core/DolphinQt/VideoInterface/RenderWidget.h
new file mode 100644
index 0000000000..3f6be38ff2
--- /dev/null
+++ b/Source/Core/DolphinQt/VideoInterface/RenderWidget.h
@@ -0,0 +1,28 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QWidget>
+
+class DRenderWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	DRenderWidget(QWidget* parent_widget = nullptr);
+
+protected:
+	// Some window managers start window dragging if an "empty" window area was clicked.
+	// Prevent this by intercepting the mouse press event.
+	void mousePressEvent(QMouseEvent*) override {}
+	void paintEvent(QPaintEvent*) override {}
+
+private slots:
+	void closeEvent(QCloseEvent* e) override;
+
+signals:
+	void Closed();
+};
+
diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp
new file mode 100644
index 0000000000..00a2578d97
--- /dev/null
+++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp
@@ -0,0 +1,183 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <string>
+#include <vector>
+#include <wx/dialog.h>
+#include <wx/gbsizer.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/spinbutt.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/ActionReplay.h"
+#include "Core/ARDecrypt.h"
+#include "DolphinWX/ARCodeAddEdit.h"
+#include "DolphinWX/WxUtils.h"
+
+CARCodeAddEdit::CARCodeAddEdit(int _selection, std::vector<ActionReplay::ARCode>* _arCodes, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+	, arCodes(_arCodes)
+	, selection(_selection)
+{
+	Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this, wxID_OK);
+
+	ActionReplay::ARCode tempEntries;
+	wxString currentName = _("Insert name here...");
+
+	if (selection == wxNOT_FOUND)
+	{
+		tempEntries.name = "";
+	}
+	else
+	{
+		currentName = StrToWxStr(arCodes->at(selection).name);
+		tempEntries = arCodes->at(selection);
+	}
+
+	wxBoxSizer* sEditCheat = new wxBoxSizer(wxVERTICAL);
+	wxStaticBoxSizer* sbEntry = new wxStaticBoxSizer(wxVERTICAL, this, _("Cheat Code"));
+	wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0);
+
+	wxStaticText* EditCheatNameText = new wxStaticText(this, wxID_ANY, _("Name:"));
+	EditCheatName = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
+	EditCheatName->SetValue(currentName);
+
+	EntrySelection = new wxSpinButton(this);
+	EntrySelection->SetRange(1, std::max((int)arCodes->size(), 1));
+	EntrySelection->SetValue((int)(arCodes->size() - selection));
+	EntrySelection->Bind(wxEVT_SPIN, &CARCodeAddEdit::ChangeEntry, this);
+
+	EditCheatCode = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE);
+	UpdateTextCtrl(tempEntries);
+
+	sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER | wxALL, 5);
+	sgEntry->Add(EditCheatName,     wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 5);
+	sgEntry->Add(EntrySelection,    wxGBPosition(0, 2), wxGBSpan(2, 1), wxEXPAND | wxALL, 5);
+	sgEntry->Add(EditCheatCode,     wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 5);
+	sgEntry->AddGrowableCol(1);
+	sgEntry->AddGrowableRow(1);
+	sbEntry->Add(sgEntry, 1, wxEXPAND | wxALL);
+
+	sEditCheat->Add(sbEntry, 1, wxEXPAND | wxALL, 5);
+	sEditCheat->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxALL, 5);
+
+	SetSizerAndFit(sEditCheat);
+	SetFocus();
+}
+
+void CARCodeAddEdit::ChangeEntry(wxSpinEvent& event)
+{
+	ActionReplay::ARCode currentCode = arCodes->at((int)arCodes->size() - event.GetPosition());
+	EditCheatName->SetValue(StrToWxStr(currentCode.name));
+	UpdateTextCtrl(currentCode);
+}
+
+void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED(event))
+{
+	std::vector<ActionReplay::AREntry> decryptedLines;
+	std::vector<std::string> encryptedLines;
+
+	// Split the entered cheat into lines.
+	std::vector<std::string> userInputLines;
+	SplitString(WxStrToStr(EditCheatCode->GetValue()), '\n', userInputLines);
+
+	for (size_t i = 0; i < userInputLines.size(); i++)
+	{
+		// Make sure to ignore unneeded whitespace characters.
+		std::string line_str = StripSpaces(userInputLines[i]);
+
+		if (line_str == "")
+			continue;
+
+		// Let's parse the current line.  Is it in encrypted or decrypted form?
+		std::vector<std::string> pieces;
+		SplitString(line_str, ' ', pieces);
+
+		if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
+		{
+			// Decrypted code line.
+			u32 addr = std::stoul(pieces[0], nullptr, 16);
+			u32 value = std::stoul(pieces[1], nullptr, 16);
+
+			decryptedLines.emplace_back(addr, value);
+			continue;
+		}
+		else if (pieces.size() == 1)
+		{
+			SplitString(line_str, '-', pieces);
+
+			if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5)
+			{
+				// Encrypted code line.  We'll have to decode it later.
+				encryptedLines.push_back(pieces[0] + pieces[1] + pieces[2]);
+				continue;
+			}
+		}
+
+		// If the above-mentioned conditions weren't met, then something went wrong.
+		if (!PanicYesNoT("Unable to parse line %u of the entered AR code as a valid "
+						"encrypted or decrypted code.  Make sure you typed it correctly.\n"
+						"Would you like to ignore this line and continue parsing?", (unsigned)(i + 1)))
+		{
+			return;
+		}
+	}
+
+	// If the entered code was in encrypted form, we decode it here.
+	if (encryptedLines.size())
+	{
+		// TODO: what if both decrypted AND encrypted lines are entered into a single AR code?
+		ActionReplay::DecryptARCode(encryptedLines, decryptedLines);
+	}
+
+	// Codes with no lines appear to be deleted/hidden from the list.  Let's prevent that.
+	if (!decryptedLines.size())
+	{
+		WxUtils::ShowErrorDialog(_("The resulting decrypted AR code doesn't contain any lines."));
+		return;
+	}
+
+
+	if (selection == wxNOT_FOUND)
+	{
+		// Add a new AR cheat code.
+		ActionReplay::ARCode newCheat;
+
+		newCheat.name = WxStrToStr(EditCheatName->GetValue());
+		newCheat.ops = decryptedLines;
+		newCheat.active = true;
+
+		arCodes->push_back(newCheat);
+	}
+	else
+	{
+		// Update the currently-selected AR cheat code.
+		arCodes->at(selection).name = WxStrToStr(EditCheatName->GetValue());
+		arCodes->at(selection).ops = decryptedLines;
+	}
+
+	AcceptAndClose();
+}
+
+void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode)
+{
+	EditCheatCode->Clear();
+
+	if (arCode.name != "")
+	{
+		for (auto& op : arCode.ops)
+			EditCheatCode->AppendText(wxString::Format("%08X %08X\n", op.cmd_addr, op.value));
+	}
+	else
+	{
+		EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here..."));
+	}
+}
diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h
new file mode 100644
index 0000000000..35aa74f128
--- /dev/null
+++ b/Source/Core/DolphinWX/ARCodeAddEdit.h
@@ -0,0 +1,38 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+class wxSpinButton;
+class wxSpinEvent;
+class wxTextCtrl;
+
+namespace ActionReplay { struct ARCode; }
+
+class CARCodeAddEdit : public wxDialog
+{
+public:
+	CARCodeAddEdit(int _selection, std::vector<ActionReplay::ARCode>* _arCodes,
+		wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxString& title = _("Edit ActionReplay Code"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxDEFAULT_DIALOG_STYLE);
+
+private:
+	wxTextCtrl* EditCheatName;
+	wxSpinButton* EntrySelection;
+	wxTextCtrl* EditCheatCode;
+
+	std::vector<ActionReplay::ARCode>* arCodes;
+
+	void SaveCheatData(wxCommandEvent& event);
+	void ChangeEntry(wxSpinEvent& event);
+	void UpdateTextCtrl(ActionReplay::ARCode arCode);
+
+	int selection;
+};
diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp
new file mode 100644
index 0000000000..9b6077e02f
--- /dev/null
+++ b/Source/Core/DolphinWX/AboutDolphin.cpp
@@ -0,0 +1,141 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/bitmap.h>
+#include <wx/dialog.h>
+#include <wx/hyperlink.h>
+#include <wx/image.h>
+#include <wx/mstream.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/generic/statbmpg.h>
+
+#ifdef __APPLE__
+#import <AppKit/AppKit.h>
+#endif
+
+#include "Common/Common.h"
+#include "DolphinWX/AboutDolphin.h"
+#include "DolphinWX/resources/dolphin_logo.cpp"
+
+AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
+		const wxString &title, const wxPoint &position,
+		const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+{
+	const unsigned char* dolphin_logo_bin = dolphin_logo_png;
+	size_t dolphin_logo_size = sizeof dolphin_logo_png;
+#ifdef __APPLE__
+	double scaleFactor = 1.0;
+	if (GetContentScaleFactor() >= 2)
+	{
+		dolphin_logo_bin = dolphin_logo_2x_png;
+		dolphin_logo_size = sizeof dolphin_logo_2x_png;
+		scaleFactor = 2.0;
+	}
+#endif
+	wxMemoryInputStream istream(dolphin_logo_bin, dolphin_logo_size);
+	wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG);
+#ifdef __APPLE__
+	wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY,
+			wxBitmap(iDolphinLogo, -1, scaleFactor));
+#else
+	wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY,
+			wxBitmap(iDolphinLogo));
+#endif
+
+	const wxString DolphinText = _("Dolphin");
+	const wxString RevisionText = scm_desc_str;
+	const wxString CopyrightText = _("(c) 2003-2015+ Dolphin Team. \"GameCube\" and \"Wii\" are trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way.");
+	const wxString BranchText = wxString::Format(_("Branch: %s"), scm_branch_str);
+	const wxString BranchRevText = wxString::Format(_("Revision: %s"), scm_rev_git_str);
+	const wxString CompiledText = wxString::Format(_("Compiled: %s @ %s"), __DATE__, __TIME__);
+	const wxString CheckUpdateText = _("Check for updates: ");
+	const wxString Text = _("\n"
+		"Dolphin is a free and open-source GameCube and Wii emulator.\n"
+		"\n"
+		"This software should not be used to play games you do not legally own.\n");
+	const wxString LicenseText = _("License");
+	const wxString AuthorsText = _("Authors");
+	const wxString SupportText = _("Support");
+
+	wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText);
+	wxStaticText* const Revision = new wxStaticText(this, wxID_ANY, RevisionText);
+
+	wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText);
+	wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n" + CompiledText+"\n");
+	wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
+	wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText);
+	wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, "  |  ");
+	wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, "  |  ");
+	wxHyperlinkCtrl* const Download = new wxHyperlinkCtrl(this, wxID_ANY, "dolphin-emu.org/download", "https://dolphin-emu.org/download/");
+	wxHyperlinkCtrl* const License = new wxHyperlinkCtrl(this, wxID_ANY, LicenseText, "https://github.com/dolphin-emu/dolphin/blob/master/license.txt");
+	wxHyperlinkCtrl* const Authors = new wxHyperlinkCtrl(this, wxID_ANY, AuthorsText, "https://github.com/dolphin-emu/dolphin/graphs/contributors");
+	wxHyperlinkCtrl* const Support = new wxHyperlinkCtrl(this, wxID_ANY, SupportText, "https://forums.dolphin-emu.org/");
+
+	wxFont DolphinFont = Dolphin->GetFont();
+	wxFont RevisionFont = Revision->GetFont();
+	wxFont CopyrightFont = Copyright->GetFont();
+	wxFont BranchFont = Branch->GetFont();
+
+	DolphinFont.SetPointSize(36);
+	Dolphin->SetFont(DolphinFont);
+
+	RevisionFont.SetWeight(wxFONTWEIGHT_BOLD);
+	Revision->SetFont(RevisionFont);
+
+	BranchFont.SetPointSize(7);
+	Branch->SetFont(BranchFont);
+
+	CopyrightFont.SetPointSize(7);
+	Copyright->SetFont(CopyrightFont);
+	Copyright->SetFocus();
+
+	wxBoxSizer* const sCheckUpdates = new wxBoxSizer(wxHORIZONTAL);
+	sCheckUpdates->Add(UpdateText);
+	sCheckUpdates->Add(Download);
+
+	wxBoxSizer* const sLinks = new wxBoxSizer(wxHORIZONTAL);
+	sLinks->Add(License);
+	sLinks->Add(FirstSpacer);
+	sLinks->Add(Authors);
+	sLinks->Add(SecondSpacer);
+	sLinks->Add(Support);
+
+	wxBoxSizer* const sInfo = new wxBoxSizer(wxVERTICAL);
+	sInfo->Add(Dolphin);
+	sInfo->AddSpacer(5);
+	sInfo->Add(Revision);
+	sInfo->AddSpacer(10);
+	sInfo->Add(Branch);
+	sInfo->Add(sCheckUpdates);
+	sInfo->Add(Message);
+	sInfo->Add(sLinks);
+
+	wxBoxSizer* const sLogo = new wxBoxSizer(wxVERTICAL);
+	sLogo->AddSpacer(75);
+	sLogo->Add(sbDolphinLogo);
+	sLogo->AddSpacer(40);
+
+	wxBoxSizer* const sMainHor = new wxBoxSizer(wxHORIZONTAL);
+	sMainHor->AddSpacer(30);
+	sMainHor->Add(sLogo);
+	sMainHor->AddSpacer(30);
+	sMainHor->Add(sInfo);
+	sMainHor->AddSpacer(30);
+
+	wxBoxSizer* const sFooter = new wxBoxSizer(wxVERTICAL);
+	sFooter->AddSpacer(15);
+	sFooter->Add(Copyright, 0, wxALIGN_BOTTOM | wxALIGN_CENTER);
+	sFooter->AddSpacer(5);
+
+	wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL);
+	sMain->Add(sMainHor, 1, wxEXPAND);
+	sMain->Add(sFooter, 0, wxEXPAND);
+
+	SetSizerAndFit(sMain);
+	Center();
+	SetFocus();
+}
diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h
new file mode 100644
index 0000000000..6f40c4b632
--- /dev/null
+++ b/Source/Core/DolphinWX/AboutDolphin.h
@@ -0,0 +1,18 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+class AboutDolphin : public wxDialog
+{
+public:
+	AboutDolphin(wxWindow *parent,
+		wxWindowID id = wxID_ANY,
+		const wxString &title = _("About Dolphin"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxDEFAULT_DIALOG_STYLE);
+};
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
new file mode 100644
index 0000000000..c48ecc11a1
--- /dev/null
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -0,0 +1,238 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <unordered_map>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
+#include "DolphinWX/Android/ButtonManager.h"
+
+namespace ButtonManager
+{
+	const std::string touchScreenKey = "Touchscreen";
+	std::unordered_map<std::string, InputDevice*> m_controllers;
+	std::vector<std::string> configStrings = {
+		"InputA",
+		"InputB",
+		"InputStart",
+		"InputX",
+		"InputY",
+		"InputZ",
+		"DPadUp",
+		"DPadDown",
+		"DPadLeft",
+		"DPadRight",
+		"MainUp",
+		"MainDown",
+		"MainLeft",
+		"MainRight",
+		"CStickUp",
+		"CStickDown",
+		"CStickLeft",
+		"CStickRight",
+		"InputL",
+		"InputR"
+	};
+	std::vector<ButtonType> configTypes = {
+		BUTTON_A,
+		BUTTON_B,
+		BUTTON_START,
+		BUTTON_X,
+		BUTTON_Y,
+		BUTTON_Z,
+		BUTTON_UP,
+		BUTTON_DOWN,
+		BUTTON_LEFT,
+		BUTTON_RIGHT,
+		STICK_MAIN_UP,
+		STICK_MAIN_DOWN,
+		STICK_MAIN_LEFT,
+		STICK_MAIN_RIGHT,
+		STICK_C_UP,
+		STICK_C_DOWN,
+		STICK_C_LEFT,
+		STICK_C_RIGHT,
+		TRIGGER_L,
+		TRIGGER_R
+	};
+
+	static void AddBind(const std::string& dev, sBind *bind)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+		{
+			it->second->AddBind(bind);
+			return;
+		}
+		m_controllers[dev] = new InputDevice(dev);
+		m_controllers[dev]->AddBind(bind);
+	}
+
+	void Init()
+	{
+		// Initialize our touchScreenKey buttons
+		for (int a = 0; a < 4; ++a)
+		{
+			AddBind(touchScreenKey, new sBind(a, BUTTON_A, BIND_BUTTON, BUTTON_A, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_B, BIND_BUTTON, BUTTON_B, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_START, BIND_BUTTON, BUTTON_START, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_X, BIND_BUTTON, BUTTON_X, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_Y, BIND_BUTTON, BUTTON_Y, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_Z, BIND_BUTTON, BUTTON_Z, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_UP, BIND_BUTTON, BUTTON_UP, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_DOWN, BIND_BUTTON, BUTTON_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_LEFT, BIND_BUTTON, BUTTON_LEFT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, BUTTON_RIGHT, BIND_BUTTON, BUTTON_RIGHT, 1.0f));
+
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_UP, BIND_AXIS, STICK_MAIN_UP, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_DOWN, BIND_AXIS, STICK_MAIN_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_LEFT, BIND_AXIS, STICK_MAIN_LEFT, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_MAIN_RIGHT, BIND_AXIS, STICK_MAIN_RIGHT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_UP, BIND_AXIS, STICK_C_UP, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_DOWN, BIND_AXIS, STICK_C_DOWN, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_LEFT, BIND_AXIS, STICK_C_LEFT, -1.0f));
+			AddBind(touchScreenKey, new sBind(a, STICK_C_RIGHT, BIND_AXIS, STICK_C_RIGHT, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, TRIGGER_L, BIND_AXIS, TRIGGER_L, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, TRIGGER_R, BIND_AXIS, TRIGGER_R, 1.0f));
+		}
+		// Init our controller bindings
+		IniFile ini;
+		ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
+		for (u32 a = 0; a < configStrings.size(); ++a)
+		{
+			for (int padID = 0; padID < 4; ++padID)
+			{
+				std::ostringstream config;
+				config << configStrings[a] << "_" << padID;
+				BindType type;
+				int bindnum;
+				char dev[128];
+				bool hasbind = false;
+				char modifier = '+';
+				std::string value;
+				ini.GetOrCreateSection("Android")->Get(config.str(), &value, "None");
+				if (value == "None")
+					continue;
+				if (std::string::npos != value.find("Axis"))
+				{
+					hasbind = true;
+					type = BIND_AXIS;
+					sscanf(value.c_str(), "Device '%127[^\']'-Axis %d%c", dev, &bindnum, &modifier);
+				}
+				else if (std::string::npos != value.find("Button"))
+				{
+					hasbind = true;
+					type = BIND_BUTTON;
+					sscanf(value.c_str(), "Device '%127[^\']'-Button %d", dev, &bindnum);
+				}
+				if (hasbind)
+					AddBind(std::string(dev), new sBind(padID, configTypes[a], type, bindnum, modifier == '-' ? -1.0f : 1.0f));
+			}
+		}
+
+	}
+	bool GetButtonPressed(int padID, ButtonType button)
+	{
+		bool pressed = m_controllers[touchScreenKey]->ButtonValue(padID, button);
+
+		for (const auto& ctrl : m_controllers)
+			pressed |= ctrl.second->ButtonValue(padID, button);
+
+		return pressed;
+	}
+	float GetAxisValue(int padID, ButtonType axis)
+	{
+		float value = m_controllers[touchScreenKey]->AxisValue(padID, axis);
+		if (value == 0.0f)
+		{
+			for (const auto& ctrl : m_controllers)
+			{
+				value = ctrl.second->AxisValue(padID, axis);
+				if (value != 0.0f)
+					return value;
+			}
+		}
+		return value;
+	}
+	bool GamepadEvent(const std::string& dev, int button, int action)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+			return it->second->PressEvent(button, action);
+
+		m_controllers[dev] = new InputDevice(dev);
+		return m_controllers[dev]->PressEvent(button, action);
+	}
+	void GamepadAxisEvent(const std::string& dev, int axis, float value)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+		{
+			it->second->AxisEvent(axis, value);
+			return;
+		}
+		m_controllers[dev] = new InputDevice(dev);
+		m_controllers[dev]->AxisEvent(axis, value);
+	}
+	void Shutdown()
+	{
+		for (const auto& controller : m_controllers)
+			delete controller.second;
+		m_controllers.clear();
+	}
+
+	// InputDevice
+	bool InputDevice::PressEvent(int button, int action)
+	{
+		bool handled = false;
+		for (const auto& binding : _inputbinds)
+		{
+			if (binding.second->_bind == button)
+			{
+				if (binding.second->_bindtype == BIND_BUTTON)
+					_buttons[binding.second->_buttontype] = action == BUTTON_PRESSED ? true : false;
+				else
+					_axises[binding.second->_buttontype] = action == BUTTON_PRESSED ? 1.0f : 0.0f;
+				handled = true;
+			}
+		}
+		return handled;
+	}
+	void InputDevice::AxisEvent(int axis, float value)
+	{
+		for (const auto& binding : _inputbinds)
+		{
+			if (binding.second->_bind == axis)
+			{
+				if (binding.second->_bindtype == BIND_AXIS)
+					_axises[binding.second->_buttontype] = value;
+				else
+					_buttons[binding.second->_buttontype] = value > 0.5f ? true : false;
+			}
+		}
+	}
+	bool InputDevice::ButtonValue(int padID, ButtonType button)
+	{
+		const auto& binding = _inputbinds.find(std::make_pair(padID, button));
+		if (binding == _inputbinds.end())
+			return false;
+
+		if (binding->second->_bindtype == BIND_BUTTON)
+			return _buttons[binding->second->_buttontype];
+		else
+			return (_axises[binding->second->_buttontype] * binding->second->_neg) > 0.5f;
+	}
+	float InputDevice::AxisValue(int padID, ButtonType axis)
+	{
+		const auto& binding = _inputbinds.find(std::make_pair(padID, axis));
+		if (binding == _inputbinds.end())
+			return 0.0f;
+
+		if (binding->second->_bindtype == BIND_AXIS)
+			return _axises[binding->second->_buttontype] * binding->second->_neg;
+		else
+			return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
+	}
+}
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h
new file mode 100644
index 0000000000..12151fab03
--- /dev/null
+++ b/Source/Core/DolphinWX/Android/ButtonManager.h
@@ -0,0 +1,114 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+
+namespace ButtonManager
+{
+	enum ButtonType
+	{
+		BUTTON_A = 0,
+		BUTTON_B = 1,
+		BUTTON_START = 2,
+		BUTTON_X = 3,
+		BUTTON_Y = 4,
+		BUTTON_Z = 5,
+		BUTTON_UP = 6,
+		BUTTON_DOWN = 7,
+		BUTTON_LEFT = 8,
+		BUTTON_RIGHT = 9,
+		STICK_MAIN = 10, /* Used on Java Side */
+		STICK_MAIN_UP = 11,
+		STICK_MAIN_DOWN = 12,
+		STICK_MAIN_LEFT = 13,
+		STICK_MAIN_RIGHT = 14,
+		STICK_C = 15, /* Used on Java Side */
+		STICK_C_UP = 16,
+		STICK_C_DOWN = 17,
+		STICK_C_LEFT = 18,
+		STICK_C_RIGHT = 19,
+		TRIGGER_L = 20,
+		TRIGGER_R = 21,
+	};
+	enum ButtonState
+	{
+		BUTTON_RELEASED = 0,
+		BUTTON_PRESSED = 1
+	};
+	enum BindType
+	{
+		BIND_BUTTON = 0,
+		BIND_AXIS
+	};
+	class Button
+	{
+	private:
+		ButtonState m_state;
+	public:
+		Button() : m_state(BUTTON_RELEASED) {}
+		void SetState(ButtonState state) { m_state = state; }
+		bool Pressed() { return m_state == BUTTON_PRESSED; }
+
+		~Button() {}
+	};
+	class Axis
+	{
+	private:
+		float m_value;
+	public:
+		Axis() : m_value(0.0f) {}
+		void SetValue(float value) { m_value = value; }
+		float AxisValue() { return m_value; }
+
+		~Axis() {}
+	};
+
+	struct sBind
+	{
+		const int _padID;
+		const ButtonType _buttontype;
+		const BindType _bindtype;
+		const int _bind;
+		const float _neg;
+		sBind(int padID, ButtonType buttontype, BindType bindtype, int bind, float neg)
+			: _padID(padID), _buttontype(buttontype), _bindtype(bindtype), _bind(bind), _neg(neg)
+		{}
+	};
+
+
+	class InputDevice
+	{
+	private:
+		const std::string _dev;
+		std::map<ButtonType, bool> _buttons;
+		std::map<ButtonType, float> _axises;
+
+		// Key is padID and ButtonType
+		std::map<std::pair<int, ButtonType>, sBind*> _inputbinds;
+	public:
+		InputDevice(std::string dev)
+			: _dev(dev) {}
+		~InputDevice()
+		{
+			for (const auto& bind : _inputbinds)
+				delete bind.second;
+			_inputbinds.clear();
+		}
+		void AddBind(sBind* bind) { _inputbinds[std::make_pair(bind->_padID, bind->_buttontype)] = bind; }
+		bool PressEvent(int button, int action);
+		void AxisEvent(int axis, float value);
+		bool ButtonValue(int padID, ButtonType button);
+		float AxisValue(int padID, ButtonType axis);
+	};
+
+	void Init();
+	bool GetButtonPressed(int padID, ButtonType button);
+	float GetAxisValue(int padID, ButtonType axis);
+	bool GamepadEvent(const std::string& dev, int button, int action);
+	void GamepadAxisEvent(const std::string& dev, int axis, float value);
+	void Shutdown();
+}
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 9c7f2af3de..f378716dd2 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -1,146 +1,83 @@
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
+set(GUI_SRCS
+	ARCodeAddEdit.cpp
+	AboutDolphin.cpp
+	ControllerConfigDiag.cpp
+	Cheats/CheatSearchTab.cpp
+	Cheats/CheatsWindow.cpp
+	Cheats/CreateCodeDialog.cpp
+	Cheats/GeckoCodeDiag.cpp
+	Config/AdvancedConfigPane.cpp
+	Config/AudioConfigPane.cpp
+	Config/ConfigMain.cpp
+	Config/GameCubeConfigPane.cpp
+	Config/GeneralConfigPane.cpp
+	Config/InterfaceConfigPane.cpp
+	Config/PathConfigPane.cpp
+	Config/WiiConfigPane.cpp
+	Debugger/BreakpointDlg.cpp
+	Debugger/BreakpointView.cpp
+	Debugger/BreakpointWindow.cpp
+	Debugger/CodeView.cpp
+	Debugger/CodeWindow.cpp
+	Debugger/CodeWindowFunctions.cpp
+	Debugger/DSPDebugWindow.cpp
+	Debugger/DSPRegisterView.cpp
+	Debugger/DebuggerPanel.cpp
+	Debugger/DebuggerUIUtil.cpp
+	Debugger/JitWindow.cpp
+	Debugger/MemoryCheckDlg.cpp
+	Debugger/MemoryView.cpp
+	Debugger/MemoryWindow.cpp
+	Debugger/RegisterView.cpp
+	Debugger/RegisterWindow.cpp
+	Debugger/WatchView.cpp
+	Debugger/WatchWindow.cpp
+	NetPlay/ChangeGameDialog.cpp
+	NetPlay/NetPlaySetupFrame.cpp
+	NetPlay/NetWindow.cpp
+	NetPlay/PadMapDialog.cpp
+	FifoPlayerDlg.cpp
+	Frame.cpp
+	FrameAui.cpp
+	FrameTools.cpp
+	GameListCtrl.cpp
+	ISOFile.cpp
+	ISOProperties.cpp
+	InputConfigDiag.cpp
+	InputConfigDiagBitmaps.cpp
+	LogConfigWindow.cpp
+	LogWindow.cpp
+	Main.cpp
+	MemcardManager.cpp
+	PatchAddEdit.cpp
+	PostProcessingConfigDiag.cpp
+	SoftwareVideoConfigDialog.cpp
+	TASInputDlg.cpp
+	VideoConfigDiag.cpp
+	WXInputBase.cpp
+	WxUtils.cpp)
+
+set(NOGUI_SRCS MainNoGUI.cpp)
+
+if(USE_X11)
+	set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)
+	set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
 endif()
 
-set(LIBS	core
-			${LZO}
-			discio
-			bdisasm
-			inputcommon
-			common
-			audiocommon
-			z
-			sfml-network
-			${GTK2_LIBRARIES})
+set(WXLIBS ${wxWidgets_LIBRARIES} dl)
 
-if(NOT ANDROID)
-	if(USE_X11)
-	  set(LIBS  ${LIBS} ${X11_LIBRARIES}
-              ${XINPUT2_LIBRARIES}
-	      ${XRANDR_LIBRARIES})
-	endif()
-	if(USE_WAYLAND)
-	  set(LIBS  ${LIBS} ${WAYLAND_LIBRARIES}
-		${XKBCOMMON_LIBRARIES})
-	endif()
+list(APPEND LIBS core uicommon)
 
-	link_directories(${CMAKE_PREFIX_PATH}/lib)
-
-	if(SDL2_FOUND)
-		# Using shared SDL2
-		set(LIBS	${LIBS} ${SDL2_LIBRARY})
-	else(SDL2_FOUND)
-		if(SDL_FOUND)
-			# Using shared SDL
-			set(LIBS	${LIBS} ${SDL_LIBRARY})
-		else(SDL_FOUND)
-			# Using static SDL from Externals
-			set(LIBS	${LIBS} SDL)
-		endif()
-	endif()
-else()
-	set(LIBS ${LIBS} png iconv)
+if(ANDROID)
+	list(APPEND LIBS png)
 endif()
 
-if(LIBAV_FOUND)
-	set(LIBS	${LIBS} ${LIBAV_LIBRARIES})
-endif()
+set(ANDROID_SRCS Android/ButtonManager.cpp
+	 MainAndroid.cpp)
 
-if(wxWidgets_FOUND)
-	set(SRCS 
-				Src/ARCodeAddEdit.cpp
-				Src/AboutDolphin.cpp
-				Src/CheatsWindow.cpp
-				Src/ConfigMain.cpp
-				Src/Debugger/BreakpointDlg.cpp
-				Src/Debugger/BreakpointView.cpp
-				Src/Debugger/BreakpointWindow.cpp
-				Src/Debugger/CodeView.cpp
-				Src/Debugger/CodeWindow.cpp
-				Src/Debugger/CodeWindowFunctions.cpp
-				Src/Debugger/DSPDebugWindow.cpp
-				Src/Debugger/DSPRegisterView.cpp
-				Src/Debugger/DebuggerPanel.cpp
-				Src/Debugger/DebuggerUIUtil.cpp
-				Src/Debugger/JitWindow.cpp
-				Src/Debugger/MemoryCheckDlg.cpp
-				Src/Debugger/MemoryView.cpp
-				Src/Debugger/MemoryWindow.cpp
-				Src/Debugger/RegisterView.cpp
-				Src/Debugger/RegisterWindow.cpp
-				Src/FifoPlayerDlg.cpp
-				Src/Frame.cpp
-				Src/FrameAui.cpp
-				Src/FrameTools.cpp
-				Src/GameListCtrl.cpp
-				Src/GeckoCodeDiag.cpp
-				Src/HotkeyDlg.cpp
-				Src/ISOFile.cpp
-				Src/ISOProperties.cpp
-				Src/InputConfigDiag.cpp
-				Src/InputConfigDiagBitmaps.cpp
-				Src/LogConfigWindow.cpp
-				Src/LogWindow.cpp
-				Src/Main.cpp
-				Src/MemcardManager.cpp
-				Src/MemoryCards/WiiSaveCrypted.cpp
-				Src/NetWindow.cpp
-				Src/PHackSettings.cpp
-				Src/PatchAddEdit.cpp
-				Src/TASInputDlg.cpp
-				Src/UDPConfigDiag.cpp
-				Src/VideoConfigDiag.cpp
-				Src/WXInputBase.cpp
-				Src/WiimoteConfigDiag.cpp
-				Src/WxUtils.cpp)
-
-	set(WXLIBS ${wxWidgets_LIBRARIES})
-else()
-	if(ANDROID)
-		set(SRCS Src/Android/TextureLoader.cpp
-			 Src/Android/ButtonManager.cpp
-			 Src/MainAndroid.cpp)
-	else()
-		set(SRCS Src/MainNoGUI.cpp)
-	endif()
-endif()
-
-if(USE_EGL)
-	set(SRCS ${SRCS} Src/GLInterface/Platform.cpp
-		Src/GLInterface/EGL.cpp)	
-	if(USE_WAYLAND)
-		set(SRCS ${SRCS} Src/GLInterface/Wayland_Util.cpp)
-	endif()
-	if(USE_X11)
-		set(SRCS ${SRCS} Src/GLInterface/X11_Util.cpp)
-	endif()
-else()
-	if(WIN32)
-		set(SRCS ${SRCS} Src/GLInterface/WGL.cpp)
-	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		set(SRCS ${SRCS} Src/GLInterface/AGL.cpp)
-	else()
-		set(SRCS ${SRCS} Src/GLInterface/GLX.cpp
-			Src/GLInterface/X11_Util.cpp)
-
-	endif()
-endif()
-
-if(WIN32)
-	set(SRCS ${SRCS} Src/stdafx.cpp)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	# Link against OS X system frameworks.
-	list(APPEND LIBS
-		${APPKIT_LIBRARY}
-		${AU_LIBRARY}
-		${COREAUDIO_LIBRARY}
-		${COREFUND_LIBRARY}
-		${CORESERV_LIBRARY}
-		${IOB_LIBRARY}
-		${IOK_LIBRARY}
-		)
+if(APPLE)
 	if(wxWidgets_FOUND)
-		list(APPEND LIBS
+		list(APPEND WXLIBS
 			${APPSERV_LIBRARY}
 			${COCOA_LIBRARY}
 			)
@@ -150,29 +87,15 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	list(APPEND SRCS ${RESOURCES})
 	set_source_files_properties(${RESOURCES} PROPERTIES
 		MACOSX_PACKAGE_LOCATION Resources)
-elseif(USE_X11)
-	set(SRCS ${SRCS} Src/X11Utils.cpp)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-        ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-	set(LIBS ${LIBS} usbhid)
-endif()
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
 	set(DOLPHIN_EXE_BASE Dolphin)
 else()
 	set(DOLPHIN_EXE_BASE dolphin-emu)
 endif()
-if(wxWidgets_FOUND)
-	set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
-else()
-	set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui)
-endif()
 
-if(USE_UPNP)
-  set(LIBS  ${LIBS} miniupnpc)
-endif()
+set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
 
 include(FindGettext)
 if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
@@ -183,39 +106,36 @@ endif()
 
 if(ANDROID)
 	set(DOLPHIN_EXE main)
-	add_library(${DOLPHIN_EXE} SHARED ${SRCS})
-	target_link_libraries(${DOLPHIN_EXE} 
+	add_library(${DOLPHIN_EXE} SHARED ${SRCS} ${ANDROID_SRCS})
+	target_link_libraries(${DOLPHIN_EXE}
 	log
 	android
+	"-Wl,--no-warn-mismatch"
 	"-Wl,--whole-archive"
 	${LIBS}
 	"-Wl,--no-whole-archive"
 	)
-	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
-		set (SO_TARGET "mips")
-	endif()
-	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7-a")
-		set (SO_TARGET "armeabi-v7a")
-	endif()
-	if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv5te")
-		set (SO_TARGET "armeabi")
-	endif()
-	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
-		set (SO_TARGET "x86")
-	endif()
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET}
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/${SO_TARGET}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET}/
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
+		COMMAND cp ARGS ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/jniLibs/${ANDROID_NDK_ABI_NAME}/
 	)
-else()
-	add_executable(${DOLPHIN_EXE} ${SRCS})
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
+	)
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS -r ${CMAKE_SOURCE_DIR}/Data/Sys/Shaders ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/
+	)
+
+	set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
+elseif(wxWidgets_FOUND)
+	add_executable(${DOLPHIN_EXE} ${SRCS} ${GUI_SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
-	if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	if(APPLE)
 		include(BundleUtilities)
 		set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app)
 
@@ -225,6 +145,8 @@ else()
 			MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
 			)
 
+		# get rid of any old copies
+		file (REMOVE_RECURSE ${BUNDLE_PATH}/Contents/Resources/Sys)
 		if(NOT SKIP_POSTPROCESS_BUNDLE)
 			# Fix up the bundle after it is finished.
 			# There does not seem to be an easy way to run CMake commands post-build,
@@ -235,28 +157,23 @@ else()
 				message(\"(Note: This is only necessary to produce a redistributable binary.\")
 				message(\"To skip, pass -DSKIP_POSTPROCESS_BUNDLE=1 to cmake.)\")
 				set(BU_CHMOD_BUNDLE_ITEMS ON)
-				fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\")
+				execute_process(COMMAND ${CMAKE_SOURCE_DIR}/Tools/deploy-mac.py \"${BUNDLE_PATH}\")
+				file(INSTALL \"${CMAKE_SOURCE_DIR}/Data/Sys\"
+					DESTINATION \"${BUNDLE_PATH}/Contents/Resources\"
+					)
 				")
 			add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 				COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake
 				)
-		endif()
-
-		# Copy data files into application bundle.
-		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake "
-			file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys
-				DESTINATION ${BUNDLE_PATH}/Contents/Resources
+		else()
+			add_custom_command(OUTPUT ${BUNDLE_PATH}/Contents/Resources/Sys
+				COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys
+				VERBATIM
 				)
-			file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle \"\")
-			")
-		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle
-			COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake
-			DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys
-			VERBATIM
-			)
-		add_custom_target(CopyDataIntoBundle ALL
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle
-			)
+			add_custom_target(CopyDataIntoBundleWx ALL
+				DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys
+				)
+		endif()
 
 		if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
 			file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_translations_into_bundle.cmake "
@@ -291,7 +208,7 @@ else()
 				${CMAKE_SOURCE_DIR}/Data/Sys
 				VERBATIM
 				)
-			add_custom_target(CopyTranslationsIntoBundle ALL
+			add_custom_target(CopyTranslationsIntoBundleWx ALL
 				DEPENDS ${BUNDLE_PATH}/Contents/Resources/en.lproj
 				)
 		endif()
@@ -303,6 +220,14 @@ else()
 	else()
 		install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir})
 	endif()
+
+	set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
 endif()
 
-set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})
+if(USE_X11)
+	set(DOLPHIN_NOGUI_EXE ${DOLPHIN_EXE_BASE}-nogui)
+	add_executable(${DOLPHIN_NOGUI_EXE} ${SRCS} ${NOGUI_SRCS})
+	target_link_libraries(${DOLPHIN_NOGUI_EXE} ${LIBS})
+	set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_NOGUI_EXE})
+	install(TARGETS ${DOLPHIN_NOGUI_EXE} RUNTIME DESTINATION ${bindir})
+endif()
diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp
new file mode 100644
index 0000000000..d559e9dacd
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp
@@ -0,0 +1,313 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <array>
+#include <wx/button.h>
+#include <wx/choice.h>
+#include <wx/listbox.h>
+#include <wx/panel.h>
+#include <wx/radiobox.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/ActionReplay.h"
+#include "Core/HW/Memmap.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/CheatSearchTab.h"
+#include "DolphinWX/Cheats/CreateCodeDialog.h"
+
+namespace
+{
+	const unsigned int MAX_CHEAT_SEARCH_RESULTS_DISPLAY = 1024;
+}
+
+CheatSearchTab::CheatSearchTab(wxWindow* const parent)
+	: wxPanel(parent)
+{
+	// first scan button
+	m_btn_init_scan = new wxButton(this, wxID_ANY, _("New Scan"));
+	m_btn_init_scan->Bind(wxEVT_BUTTON, &CheatSearchTab::StartNewSearch, this);
+
+	// next scan button
+	m_btn_next_scan = new wxButton(this, wxID_ANY, _("Next Scan"));
+	m_btn_next_scan->Bind(wxEVT_BUTTON, &CheatSearchTab::FilterCheatSearchResults, this);
+	m_btn_next_scan->Disable();
+
+	// data sizes radiobox
+	std::array<wxString, 3> data_size_names = { { _("8-bit"), _("16-bit"), _("32-bit") } };
+	m_data_sizes = new wxRadioBox(this, wxID_ANY, _("Data Size"), wxDefaultPosition, wxDefaultSize, static_cast<int>(data_size_names.size()), data_size_names.data());
+
+	// Listbox for search results (shown in monospace font).
+	m_lbox_search_results = new wxListBox(this, wxID_ANY);
+	wxFont list_font = m_lbox_search_results->GetFont();
+	list_font.SetFamily(wxFONTFAMILY_TELETYPE);
+	m_lbox_search_results->SetFont(list_font);
+
+	// Result count
+	m_label_results_count = new wxStaticText(this, wxID_ANY, _("Count:"));
+
+	// create AR code button
+	wxButton* const button_cheat_search_copy_address = new wxButton(this, wxID_ANY, _("Create AR Code"));
+	button_cheat_search_copy_address->Bind(wxEVT_BUTTON, &CheatSearchTab::CreateARCode, this);
+
+	// results groupbox
+	wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results"));
+	sizer_cheat_search_results->Add(m_label_results_count, 0, wxALIGN_LEFT | wxALL, 5);
+	sizer_cheat_search_results->Add(m_lbox_search_results, 1, wxEXPAND | wxALL, 5);
+	sizer_cheat_search_results->Add(button_cheat_search_copy_address, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
+
+	// Search value radio buttons
+	m_value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, wxID_ANY, _("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+	m_value_x_radiobtn.rad_uservalue = new wxRadioButton(this, wxID_ANY, "");
+	m_value_x_radiobtn.rad_oldvalue->SetValue(true);
+
+	// search value textbox
+	m_textctrl_value_x = new wxTextCtrl(this, wxID_ANY, "0x0", wxDefaultPosition, wxSize(96, -1));
+	m_textctrl_value_x->Bind(wxEVT_SET_FOCUS, &CheatSearchTab::ApplyFocus, this);
+
+	wxBoxSizer* const sizer_cheat_filter_text = new wxBoxSizer(wxHORIZONTAL);
+	sizer_cheat_filter_text->Add(m_value_x_radiobtn.rad_uservalue, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5);
+	sizer_cheat_filter_text->Add(m_textctrl_value_x, 1, wxALIGN_CENTER_VERTICAL, 5);
+
+	// value groupbox
+	wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, _("Value"));
+	sizer_cheat_search_filter_x->Add(m_value_x_radiobtn.rad_oldvalue, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	sizer_cheat_search_filter_x->Add(sizer_cheat_filter_text, 0, wxALL | wxEXPAND, 5);
+
+	// filter types in the compare dropdown
+	static const wxString searches[] = {
+		_("Unknown"),
+		_("Not Equal"),
+		_("Equal"),
+		_("Greater Than"),
+		_("Less Than"),
+	// TODO: Implement between search.
+		//_("Between"),
+	};
+
+	m_search_type = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, sizeof(searches) / sizeof(*searches), searches);
+	m_search_type->Select(0);
+
+	wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, _("Search Filter"));
+	sizer_cheat_search_filter->Add(sizer_cheat_search_filter_x, 0, wxALL | wxEXPAND, 5);
+	sizer_cheat_search_filter->Add(m_search_type, 0, wxALL, 5);
+
+	// left sizer
+	wxBoxSizer* const sizer_left = new wxBoxSizer(wxVERTICAL);
+	sizer_left->Add(sizer_cheat_search_results, 1, wxEXPAND, 5);
+
+	// button sizer
+	wxBoxSizer* boxButtons = new wxBoxSizer(wxHORIZONTAL);
+	boxButtons->Add(m_btn_init_scan, 1, wxRIGHT, 5);
+	boxButtons->Add(m_btn_next_scan, 1);
+
+	// right sizer
+	wxBoxSizer* const sizer_right = new wxBoxSizer(wxVERTICAL);
+	sizer_right->Add(m_data_sizes, 0, wxEXPAND | wxBOTTOM, 5);
+	sizer_right->Add(sizer_cheat_search_filter, 0, wxEXPAND | wxBOTTOM, 5);
+	sizer_right->AddStretchSpacer(1);
+	sizer_right->Add(boxButtons, 0, wxTOP | wxEXPAND, 5);
+
+	// main sizer
+	wxBoxSizer* const sizer_main = new wxBoxSizer(wxHORIZONTAL);
+	sizer_main->Add(sizer_left, 1, wxEXPAND | wxALL, 5);
+	sizer_main->Add(sizer_right, 0, wxEXPAND | wxALL, 5);
+
+	SetSizerAndFit(sizer_main);
+}
+
+void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED(event))
+{
+	const u8* const memptr = Memory::m_pRAM;
+	if (memptr == nullptr)
+	{
+		WxUtils::ShowErrorDialog(_("A game is not currently running."));
+		return;
+	}
+
+	// Determine the user-selected data size for this search.
+	m_search_type_size = (1 << m_data_sizes->GetSelection());
+
+	// Set up the search results efficiently to prevent automatic re-allocations.
+	m_search_results.clear();
+	m_search_results.reserve(Memory::RAM_SIZE / m_search_type_size);
+
+	// Enable the "Next Scan" button.
+	m_btn_next_scan->Enable();
+
+	CheatSearchResult r;
+	// can I assume cheatable values will be aligned like this?
+	for (u32 addr = 0; addr != Memory::RAM_SIZE; addr += m_search_type_size)
+	{
+		r.address = addr;
+		memcpy(&r.old_value, memptr + addr, m_search_type_size);
+		m_search_results.push_back(r);
+	}
+
+	UpdateCheatSearchResultsList();
+}
+
+
+void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
+{
+	const u8* const memptr = Memory::m_pRAM;
+	if (memptr == nullptr)
+	{
+		WxUtils::ShowErrorDialog(_("A game is not currently running."));
+		return;
+	}
+
+	// Set up the sub-search results efficiently to prevent automatic re-allocations.
+	std::vector<CheatSearchResult> filtered_results;
+	filtered_results.reserve(m_search_results.size());
+
+	// Determine the selected filter
+	// 1 : equal
+	// 2 : greater-than
+	// 4 : less-than
+
+	const int filters[] = { 7, 6, 1, 2, 4 };
+	int filter_mask = filters[m_search_type->GetSelection()];
+
+	if (m_value_x_radiobtn.rad_oldvalue->GetValue()) // using old value comparison
+	{
+		for (CheatSearchResult& result : m_search_results)
+		{
+			// with big endian, can just use memcmp for ><= comparison
+			int cmp_result = memcmp(memptr + result.address, &result.old_value, m_search_type_size);
+			if (cmp_result < 0)
+				cmp_result = 4;
+			else
+				cmp_result = cmp_result ? 2 : 1;
+
+			if (cmp_result & filter_mask)
+			{
+				memcpy(&result.old_value, memptr + result.address, m_search_type_size);
+				filtered_results.push_back(result);
+			}
+		}
+	}
+	else // using user entered x value comparison
+	{
+		u32 user_x_val;
+
+		// parse the user entered x value
+		if (filter_mask != 7) // don't need the value for the "None" filter
+		{
+			unsigned long parsed_x_val = 0;
+			wxString x_val = m_textctrl_value_x->GetValue();
+
+			if (!x_val.ToULong(&parsed_x_val, 0))
+			{
+				WxUtils::ShowErrorDialog(_("You must enter a valid decimal, hexadecimal or octal value."));
+				return;
+			}
+
+			user_x_val = (u32)parsed_x_val;
+
+			// #ifdef LIL_ENDIAN :p
+			switch (m_search_type_size)
+			{
+			case 1:
+				break;
+			case 2:
+				*(u16*)&user_x_val = Common::swap16((u8*)&user_x_val);
+				break;
+			case 4:
+				user_x_val = Common::swap32(user_x_val);
+				break;
+			}
+			// #elseif BIG_ENDIAN
+			// would have to move <u32 vals (8/16bit) to start of the user_x_val for the comparisons i use below
+			// #endif
+		}
+
+		for (CheatSearchResult& result : m_search_results)
+		{
+			// with big endian, can just use memcmp for ><= comparison
+			int cmp_result = memcmp(memptr + result.address, &user_x_val, m_search_type_size);
+			if (cmp_result < 0)
+				cmp_result = 4;
+			else if (cmp_result)
+				cmp_result = 2;
+			else
+				cmp_result = 1;
+
+			if (cmp_result & filter_mask)
+			{
+				memcpy(&result.old_value, memptr + result.address, m_search_type_size);
+				filtered_results.push_back(result);
+			}
+		}
+	}
+
+	m_search_results.swap(filtered_results);
+
+	UpdateCheatSearchResultsList();
+}
+
+void CheatSearchTab::ApplyFocus(wxFocusEvent& ev)
+{
+	ev.Skip();
+	m_value_x_radiobtn.rad_uservalue->SetValue(true);
+}
+
+void CheatSearchTab::UpdateCheatSearchResultsList()
+{
+	m_lbox_search_results->Clear();
+
+	wxString count_label = wxString::Format(_("Count: %lu"),
+		(unsigned long)m_search_results.size());
+	if (m_search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
+	{
+		count_label += _(" (too many to display)");
+	}
+	else
+	{
+		for (const CheatSearchResult& result : m_search_results)
+		{
+			u32 display_value = result.old_value;
+
+			// #ifdef LIL_ENDIAN :p
+			switch (m_search_type_size)
+			{
+			case 1:
+				break;
+			case 2:
+				*(u16*)&display_value = Common::swap16((u8*)&display_value);
+				break;
+			case 4:
+				display_value = Common::swap32(display_value);
+				break;
+			}
+			// #elseif BIG_ENDIAN
+			// need to do some stuff in here (for 8 and 16bit) for bigendian
+			// #endif
+			std::string rowfmt = StringFromFormat("0x%%08X    0x%%0%uX    %%u/%%i", m_search_type_size*2);
+
+			m_lbox_search_results->Append(
+				wxString::Format(rowfmt.c_str(), result.address, display_value, display_value, display_value));
+		}
+	}
+
+	m_label_results_count->SetLabel(count_label);
+}
+
+void CheatSearchTab::CreateARCode(wxCommandEvent&)
+{
+	const int sel = m_lbox_search_results->GetSelection();
+	if (sel >= 0)
+	{
+		const u32 address = m_search_results[sel].address | ((m_search_type_size & ~1) << 24);
+
+		CreateCodeDialog arcode_dlg(this, address, ActionReplay::GetARCodes());
+		arcode_dlg.SetExtraStyle(arcode_dlg.GetExtraStyle() & ~wxWS_EX_BLOCK_EVENTS);
+		arcode_dlg.ShowModal();
+	}
+}
diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.h b/Source/Core/DolphinWX/Cheats/CheatSearchTab.h
new file mode 100644
index 0000000000..776ce44e38
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.h
@@ -0,0 +1,58 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include <wx/panel.h>
+
+class wxButton;
+class wxChoice;
+class wxFocusEvent;
+class wxListBox;
+class wxRadioBox;
+class wxRadioButton;
+class wxStaticText;
+class wxTextCtrl;
+
+class CheatSearchTab final : public wxPanel
+{
+public:
+	CheatSearchTab(wxWindow* const parent);
+
+private:
+	class CheatSearchResult final
+	{
+	public:
+		CheatSearchResult() : address(0), old_value(0) {}
+
+		u32 address;
+		u32 old_value;
+	};
+
+	std::vector<CheatSearchResult> m_search_results;
+	unsigned int m_search_type_size;
+
+	wxChoice* m_search_type;
+	wxListBox* m_lbox_search_results;
+	wxStaticText* m_label_results_count;
+	wxTextCtrl* m_textctrl_value_x;
+
+	wxButton* m_btn_init_scan;
+	wxButton* m_btn_next_scan;
+
+	wxRadioBox* m_data_sizes;
+
+	struct
+	{
+		wxRadioButton* rad_oldvalue;
+		wxRadioButton* rad_uservalue;
+	} m_value_x_radiobtn;
+
+	void UpdateCheatSearchResultsList();
+	void StartNewSearch(wxCommandEvent& event);
+	void FilterCheatSearchResults(wxCommandEvent& event);
+	void CreateARCode(wxCommandEvent&);
+	void ApplyFocus(wxFocusEvent&);
+};
diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
new file mode 100644
index 0000000000..f65b44f7d6
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
@@ -0,0 +1,279 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/checklst.h>
+#include <wx/dialog.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Core/ActionReplay.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/GeckoCode.h"
+#include "Core/GeckoCodeConfig.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/CheatSearchTab.h"
+#include "DolphinWX/Cheats/CheatsWindow.h"
+#include "DolphinWX/Cheats/CreateCodeDialog.h"
+#include "DolphinWX/Cheats/GeckoCodeDiag.h"
+
+wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
+	: wxDialog(parent, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxDIALOG_NO_PARENT)
+{
+	// Create the GUI controls
+	Init_ChildControls();
+
+	// load codes
+	UpdateGUI();
+
+	SetSize(wxSize(-1, 600));
+	Center();
+	Show();
+}
+
+wxCheatsWindow::~wxCheatsWindow()
+{
+	main_frame->g_CheatsWindow = nullptr;
+}
+
+void wxCheatsWindow::Init_ChildControls()
+{
+	// Main Notebook
+	m_notebook_main = new wxNotebook(this, wxID_ANY);
+
+	// --- Tabs ---
+	// Cheats List Tab
+	m_tab_cheats = new wxPanel(m_notebook_main, wxID_ANY);
+
+	m_checklistbox_cheats_list = new wxCheckListBox(m_tab_cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_cheat_string_list, wxLB_HSCROLL, wxDefaultValidator);
+	m_checklistbox_cheats_list->Bind(wxEVT_LISTBOX, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this);
+	m_checklistbox_cheats_list->Bind(wxEVT_CHECKLISTBOX, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this);
+
+	m_label_code_name = new wxStaticText(m_tab_cheats, wxID_ANY, _("Name: "));
+	m_groupbox_info = new wxStaticBox(m_tab_cheats, wxID_ANY, _("Code Info"));
+
+	m_label_num_codes = new wxStaticText(m_tab_cheats, wxID_ANY, _("Number Of Codes: "));
+	m_listbox_codes_list = new wxListBox(m_tab_cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, nullptr, wxLB_HSCROLL);
+
+	wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_groupbox_info, wxVERTICAL);
+	sGroupBoxInfo->Add(m_label_code_name, 0, wxALL, 5);
+	sGroupBoxInfo->Add(m_label_num_codes, 0, wxALL, 5);
+	sGroupBoxInfo->Add(m_listbox_codes_list, 1, wxALL, 5);
+
+	wxBoxSizer* sizer_tab_cheats = new wxBoxSizer(wxHORIZONTAL);
+	sizer_tab_cheats->Add(m_checklistbox_cheats_list, 1, wxEXPAND | wxTOP | wxBOTTOM | wxLEFT, 10);
+	sizer_tab_cheats->Add(sGroupBoxInfo, 0, wxALIGN_LEFT | wxEXPAND | wxALL, 5);
+
+	m_tab_cheats->SetSizerAndFit(sizer_tab_cheats);
+
+	// Cheat Search Tab
+	wxPanel* const tab_cheat_search = new CheatSearchTab(m_notebook_main);
+
+	// Log Tab
+	m_tab_log = new wxPanel(m_notebook_main, wxID_ANY);
+
+	wxButton* const button_updatelog = new wxButton(m_tab_log, wxID_ANY, _("Update"));
+	button_updatelog->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this);
+
+	m_checkbox_log_ar = new wxCheckBox(m_tab_log, wxID_ANY, _("Enable AR Logging"));
+	m_checkbox_log_ar->Bind(wxEVT_CHECKBOX, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this);
+
+	m_checkbox_log_ar->SetValue(ActionReplay::IsSelfLogging());
+	m_textctrl_log = new wxTextCtrl(m_tab_log, wxID_ANY, "", wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
+
+	wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
+	HStrip1->Add(m_checkbox_log_ar, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
+	HStrip1->Add(button_updatelog, 0, wxALL, 5);
+
+	wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL);
+	sTabLog->Add(HStrip1, 0, wxALL, 5);
+	sTabLog->Add(m_textctrl_log, 1, wxALL | wxEXPAND, 5);
+
+	m_tab_log->SetSizerAndFit(sTabLog);
+
+	// Add Tabs to Notebook
+	m_notebook_main->AddPage(m_tab_cheats, _("AR Codes"));
+	m_geckocode_panel = new Gecko::CodeConfigPanel(m_notebook_main);
+	m_notebook_main->AddPage(m_geckocode_panel, _("Gecko Codes"));
+	m_notebook_main->AddPage(tab_cheat_search, _("Cheat Search"));
+	m_notebook_main->AddPage(m_tab_log, _("Logging"));
+
+	// Button Strip
+	m_button_apply = new wxButton(this, wxID_APPLY, _("Apply"));
+	m_button_apply->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
+	wxButton* const button_cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
+	button_cancel->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
+
+	Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this);
+	Bind(UPDATE_CHEAT_LIST_EVENT, &wxCheatsWindow::OnEvent_CheatsList_Update, this);
+
+	wxStdDialogButtonSizer* const sButtons = new wxStdDialogButtonSizer();
+	sButtons->AddButton(m_button_apply);
+	sButtons->AddButton(button_cancel);
+	sButtons->Realize();
+
+	wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL);
+	sMain->Add(m_notebook_main, 1, wxEXPAND | wxALL, 5);
+	sMain->Add(sButtons, 0, wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, 5);
+	SetSizerAndFit(sMain);
+}
+
+void wxCheatsWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED(event))
+{
+	Close();
+}
+
+void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev)
+{
+	Destroy();
+}
+
+// load codes for a new ISO ID
+void wxCheatsWindow::UpdateGUI()
+{
+	// load code
+	SCoreStartupParameter parameters = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	m_gameini_default = parameters.LoadDefaultGameIni();
+	m_gameini_local = parameters.LoadLocalGameIni();
+	m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + parameters.GetUniqueID() + ".ini";
+	Load_ARCodes();
+	Load_GeckoCodes();
+
+	// enable controls
+	m_button_apply->Enable(Core::IsRunning());
+
+	wxString title = _("Cheat Manager");
+
+	// write the ISO name in the title
+	if (Core::IsRunning())
+		SetTitle(title + ": " + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + " - " + SConfig::GetInstance().m_LocalCoreStartupParameter.m_strName);
+	else
+		SetTitle(title);
+}
+
+void wxCheatsWindow::Load_ARCodes()
+{
+	using namespace ActionReplay;
+
+	m_checklistbox_cheats_list->Clear();
+
+	if (!Core::IsRunning())
+		return;
+
+	m_index_list.clear();
+	size_t size = GetCodeListSize();
+	for (size_t i = 0; i < size; i++)
+	{
+		ARCode code = GetARCode(i);
+		ARCodeIndex ind;
+		u32 index = m_checklistbox_cheats_list->Append(StrToWxStr(code.name));
+		m_checklistbox_cheats_list->Check(index, code.active);
+		ind.index = i;
+		ind.uiIndex = index;
+		m_index_list.push_back(ind);
+	}
+}
+
+void wxCheatsWindow::Load_GeckoCodes()
+{
+	m_geckocode_panel->LoadCodes(m_gameini_default, m_gameini_local, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID(), true);
+}
+
+void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED(event))
+{
+	using namespace ActionReplay;
+
+	int index = m_checklistbox_cheats_list->GetSelection();
+	for (size_t i = 0; i < m_index_list.size(); i++)
+	{
+		if ((int)m_index_list[i].uiIndex == index)
+		{
+			ARCode code = GetARCode(i);
+			m_label_code_name->SetLabel(_("Name: ") + StrToWxStr(code.name));
+
+			std::string numcodes = StringFromFormat("Number of Codes: %lu", (unsigned long)code.ops.size());
+			m_label_num_codes->SetLabel(StrToWxStr(numcodes));
+			m_listbox_codes_list->Clear();
+
+			for (const AREntry& entry : code.ops)
+			{
+				std::string ops = StringFromFormat("%08x %08x", entry.cmd_addr, entry.value);
+				m_listbox_codes_list->Append(StrToWxStr(ops));
+			}
+		}
+	}
+}
+
+void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED(event))
+{
+	int index = m_checklistbox_cheats_list->GetSelection();
+	for (const ARCodeIndex& code_index : m_index_list)
+	{
+		if ((int)code_index.uiIndex == index)
+		{
+			ActionReplay::SetARCode_IsActive(m_checklistbox_cheats_list->IsChecked(index), code_index.index);
+		}
+	}
+}
+
+void wxCheatsWindow::OnEvent_CheatsList_Update(wxCommandEvent& event)
+{
+	Load_ARCodes();
+}
+
+void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
+{
+	// Apply AR Code changes
+	for (const ARCodeIndex& code_index : m_index_list)
+	{
+		ActionReplay::SetARCode_IsActive(m_checklistbox_cheats_list->IsChecked(code_index.uiIndex), code_index.index);
+	}
+
+	// Apply Gecko Code changes
+	Gecko::SetActiveCodes(m_geckocode_panel->GetCodes());
+
+	// Save gameini, with changed gecko codes
+	if (m_gameini_local_path.size())
+	{
+		Gecko::SaveCodes(m_gameini_local, m_geckocode_panel->GetCodes());
+		m_gameini_local.Save(m_gameini_local_path);
+	}
+
+	ev.Skip();
+}
+
+void wxCheatsWindow::OnEvent_ButtonUpdateLog_Press(wxCommandEvent& WXUNUSED(event))
+{
+	m_textctrl_log->Clear();
+	for (const std::string& text : ActionReplay::GetSelfLog())
+	{
+		m_textctrl_log->AppendText(StrToWxStr(text));
+	}
+}
+
+void wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& WXUNUSED(event))
+{
+	ActionReplay::EnableSelfLogging(m_checkbox_log_ar->IsChecked());
+}
diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.h b/Source/Core/DolphinWX/Cheats/CheatsWindow.h
new file mode 100644
index 0000000000..990219cac3
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.h
@@ -0,0 +1,99 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <wx/arrstr.h>
+#include <wx/dialog.h>
+#include <wx/panel.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+
+class wxButton;
+class wxCheckBox;
+class wxCheckListBox;
+class wxCloseEvent;
+class wxListBox;
+class wxNotebook;
+class wxStaticBox;
+class wxStaticText;
+class wxTextCtrl;
+
+namespace Gecko
+{
+	class CodeConfigPanel;
+}
+
+class wxCheatsWindow final : public wxDialog
+{
+public:
+	wxCheatsWindow(wxWindow* const parent);
+	~wxCheatsWindow();
+	void UpdateGUI();
+
+private:
+	struct ARCodeIndex
+	{
+		u32 uiIndex;
+		size_t index;
+	};
+
+	// --- GUI Controls ---
+	wxButton* m_button_apply;
+	wxNotebook* m_notebook_main;
+
+	wxPanel* m_tab_cheats;
+	wxPanel* m_tab_log;
+
+	wxCheckBox* m_checkbox_log_ar;
+
+	wxStaticText* m_label_code_name;
+	wxStaticText* m_label_num_codes;
+
+	wxCheckListBox* m_checklistbox_cheats_list;
+
+	wxTextCtrl* m_textctrl_log;
+
+	wxListBox* m_listbox_codes_list;
+
+	wxStaticBox* m_groupbox_info;
+
+	wxArrayString m_cheat_string_list;
+
+	std::vector<ARCodeIndex> m_index_list;
+
+	Gecko::CodeConfigPanel* m_geckocode_panel;
+	IniFile m_gameini_default;
+	IniFile m_gameini_local;
+	std::string m_gameini_local_path;
+
+	void Init_ChildControls();
+
+	void Load_ARCodes();
+	void Load_GeckoCodes();
+
+	// --- Wx Events Handlers ---
+
+	// Close Button
+	void OnEvent_ButtonClose_Press(wxCommandEvent& event);
+	void OnEvent_Close(wxCloseEvent& ev);
+
+	// Cheats List
+	void OnEvent_CheatsList_ItemSelected(wxCommandEvent& event);
+	void OnEvent_CheatsList_ItemToggled(wxCommandEvent& event);
+	void OnEvent_CheatsList_Update(wxCommandEvent& event);
+
+	// Apply Changes Button
+	void OnEvent_ApplyChanges_Press(wxCommandEvent& event);
+
+	// Update Log Button
+	void OnEvent_ButtonUpdateLog_Press(wxCommandEvent& event);
+
+	// Enable Logging Checkbox
+	void OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& event);
+};
diff --git a/Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp
new file mode 100644
index 0000000000..5239a1817a
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp
@@ -0,0 +1,113 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Core/ActionReplay.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/CreateCodeDialog.h"
+
+// Fired when an ActionReplay code is created.
+wxDEFINE_EVENT(UPDATE_CHEAT_LIST_EVENT, wxCommandEvent);
+
+CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address, std::vector<ActionReplay::ARCode>* _arCodes)
+	: wxDialog(parent, wxID_ANY, _("Create AR Code"))
+	, m_code_address(address)
+	, arCodes(_arCodes)
+{
+	wxStaticText* const label_name = new wxStaticText(this, wxID_ANY, _("Name: "));
+	m_textctrl_name = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(256, -1));
+
+	wxStaticText* const label_code = new wxStaticText(this, wxID_ANY, _("Code: "));
+	m_textctrl_code = new wxTextCtrl(this, wxID_ANY, wxString::Format("0x%08x", address));
+	m_textctrl_code->Disable();
+
+	wxStaticText* const label_value = new wxStaticText(this, wxID_ANY, _("Value: "));
+	m_textctrl_value = new wxTextCtrl(this, wxID_ANY, "0");
+
+	m_checkbox_use_hex = new wxCheckBox(this, wxID_ANY, _("Use Hex"));
+	m_checkbox_use_hex->SetValue(true);
+
+	wxBoxSizer* const sizer_value_label = new wxBoxSizer(wxHORIZONTAL);
+	sizer_value_label->Add(label_value, 0, wxRIGHT, 5);
+	sizer_value_label->Add(m_checkbox_use_hex);
+
+	// main sizer
+	wxBoxSizer* const sizer_main = new wxBoxSizer(wxVERTICAL);
+	sizer_main->Add(label_name, 0, wxALL, 5);
+	sizer_main->Add(m_textctrl_name, 0, wxALL, 5);
+	sizer_main->Add(label_code, 0, wxALL, 5);
+	sizer_main->Add(m_textctrl_code, 0, wxALL, 5);
+	sizer_main->Add(sizer_value_label, 0, wxALL, 5);
+	sizer_main->Add(m_textctrl_value, 0, wxALL, 5);
+	sizer_main->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxALL, 5);
+
+	Bind(wxEVT_BUTTON, &CreateCodeDialog::PressOK, this, wxID_OK);
+	Bind(wxEVT_BUTTON, &CreateCodeDialog::PressCancel, this, wxID_CANCEL);
+	Bind(wxEVT_CLOSE_WINDOW, &CreateCodeDialog::OnEvent_Close, this);
+
+	SetSizerAndFit(sizer_main);
+	SetFocus();
+}
+
+void CreateCodeDialog::PressOK(wxCommandEvent& ev)
+{
+	const wxString code_name = m_textctrl_name->GetValue();
+	if (code_name.empty())
+	{
+		WxUtils::ShowErrorDialog(_("You must enter a name."));
+		return;
+	}
+
+	long code_value;
+	int base = m_checkbox_use_hex->IsChecked() ? 16 : 10;
+	if (!m_textctrl_value->GetValue().ToLong(&code_value, base))
+	{
+		WxUtils::ShowErrorDialog(_("Invalid value."));
+		return;
+	}
+
+	//wxString full_code = textctrl_code->GetValue();
+	//full_code += ' ';
+	//full_code += wxString::Format("0x%08x", code_value);
+
+	// create the new code
+	ActionReplay::ARCode new_cheat;
+	new_cheat.active = false;
+	new_cheat.name = WxStrToStr(code_name);
+	const ActionReplay::AREntry new_entry(m_code_address, code_value);
+	new_cheat.ops.push_back(new_entry);
+
+	// pretty hacky - add the code to the gameini
+	{
+	CISOProperties isoprops(SConfig::GetInstance().m_LastFilename, this);
+	// add the code to the isoproperties arcode list
+	arCodes->push_back(new_cheat);
+	// save the gameini
+	isoprops.SaveGameConfig();
+	isoprops.ActionReplayList_Load(); // loads the new arcodes
+	//ActionReplay::UpdateActiveList();
+	}
+
+	// Propagate back to the parent frame to update the cheat list.
+	GetEventHandler()->AddPendingEvent(wxCommandEvent(UPDATE_CHEAT_LIST_EVENT));
+
+	Close();
+}
+
+void CreateCodeDialog::PressCancel(wxCommandEvent& ev)
+{
+	Close();
+}
+
+void CreateCodeDialog::OnEvent_Close(wxCloseEvent& ev)
+{
+	Destroy();
+}
diff --git a/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h
new file mode 100644
index 0000000000..421157e5ae
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h
@@ -0,0 +1,34 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/ActionReplay.h"
+
+class wxCheckBox;
+class wxTextCtrl;
+
+wxDECLARE_EVENT(UPDATE_CHEAT_LIST_EVENT, wxCommandEvent);
+
+class CreateCodeDialog final : public wxDialog
+{
+public:
+	CreateCodeDialog(wxWindow* const parent, const u32 address, std::vector<ActionReplay::ARCode>* _arCodes);
+
+private:
+	const u32 m_code_address;
+	std::vector<ActionReplay::ARCode>* arCodes;
+
+	wxTextCtrl* m_textctrl_name;
+	wxTextCtrl* m_textctrl_code;
+	wxTextCtrl* m_textctrl_value;
+	wxCheckBox* m_checkbox_use_hex;
+
+	void PressOK(wxCommandEvent&);
+	void PressCancel(wxCommandEvent&);
+	void OnEvent_Close(wxCloseEvent& ev);
+};
diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp
new file mode 100644
index 0000000000..5aad07b697
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp
@@ -0,0 +1,306 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <string>
+#include <vector>
+#include <SFML/Network/Http.hpp>
+#include <wx/button.h>
+#include <wx/checklst.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/Core.h"
+#include "Core/GeckoCode.h"
+#include "Core/GeckoCodeConfig.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/GeckoCodeDiag.h"
+
+namespace Gecko
+{
+
+static const wxString wxstr_name(wxTRANSLATE("Name: ")),
+	wxstr_notes(wxTRANSLATE("Notes: ")),
+	wxstr_creator(wxTRANSLATE("Creator: "));
+
+CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
+	: wxPanel(parent)
+{
+	m_listbox_gcodes = new wxCheckListBox(this, wxID_ANY);
+	m_listbox_gcodes->Bind(wxEVT_LISTBOX, &CodeConfigPanel::UpdateInfoBox, this);
+	m_listbox_gcodes->Bind(wxEVT_CHECKLISTBOX, &CodeConfigPanel::ToggleCode, this);
+
+	m_infobox.label_name = new wxStaticText(this, wxID_ANY, wxGetTranslation(wxstr_name));
+	m_infobox.label_creator = new wxStaticText(this, wxID_ANY, wxGetTranslation(wxstr_creator));
+	m_infobox.label_notes = new wxStaticText(this, wxID_ANY, wxGetTranslation(wxstr_notes));
+	m_infobox.textctrl_notes = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1), wxTE_MULTILINE | wxTE_READONLY);
+	m_infobox.listbox_codes = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 64));
+
+	// TODO: buttons to add/edit codes
+
+	// sizers
+	wxBoxSizer* const sizer_infobox = new wxBoxSizer(wxVERTICAL);
+	sizer_infobox->Add(m_infobox.label_name, 0, wxBOTTOM, 5);
+	sizer_infobox->Add(m_infobox.label_creator, 0,  wxBOTTOM, 5);
+	sizer_infobox->Add(m_infobox.label_notes, 0, wxBOTTOM, 5);
+	sizer_infobox->Add(m_infobox.textctrl_notes, 0, wxBOTTOM | wxEXPAND, 5);
+	sizer_infobox->Add(m_infobox.listbox_codes, 1, wxEXPAND, 5);
+
+	// button sizer
+	wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL);
+	btn_download = new wxButton(this, wxID_ANY, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
+	btn_download->Disable();
+	btn_download->Bind(wxEVT_BUTTON, &CodeConfigPanel::DownloadCodes, this);
+	sizer_buttons->AddStretchSpacer(1);
+	sizer_buttons->Add(btn_download, 1, wxEXPAND);
+
+	// horizontal sizer
+	wxBoxSizer* const sizer_vert = new wxBoxSizer(wxVERTICAL);
+	sizer_vert->Add(sizer_infobox, 1, wxEXPAND);
+	sizer_vert->Add(sizer_buttons, 0, wxEXPAND | wxTOP, 5);
+
+	wxBoxSizer* const sizer_main = new wxBoxSizer(wxVERTICAL);
+	sizer_main->Add(m_listbox_gcodes, 1, wxALL | wxEXPAND, 5);
+	sizer_main->Add(sizer_vert, 0, wxALL | wxEXPAND, 5);
+
+	SetSizerAndFit(sizer_main);
+}
+
+void CodeConfigPanel::UpdateCodeList(bool checkRunning)
+{
+	// disable the button if it doesn't have an effect
+	btn_download->Enable((!checkRunning || Core::IsRunning()) && !m_gameid.empty());
+
+	m_listbox_gcodes->Clear();
+	// add the codes to the listbox
+	for (const GeckoCode& code : m_gcodes)
+	{
+		m_listbox_gcodes->Append(StrToWxStr(code.name));
+		if (code.enabled)
+		{
+			m_listbox_gcodes->Check(m_listbox_gcodes->GetCount()-1, true);
+		}
+	}
+
+	wxCommandEvent evt;
+	UpdateInfoBox(evt);
+}
+
+void CodeConfigPanel::LoadCodes(const IniFile& globalIni, const IniFile& localIni, const std::string& gameid, bool checkRunning)
+{
+	m_gameid = gameid;
+
+	m_gcodes.clear();
+	if (!checkRunning || Core::IsRunning())
+		Gecko::LoadCodes(globalIni, localIni, m_gcodes);
+
+	UpdateCodeList(checkRunning);
+}
+
+void CodeConfigPanel::ToggleCode(wxCommandEvent& evt)
+{
+	const int sel = evt.GetInt(); // this right?
+	if (sel > -1)
+		m_gcodes[sel].enabled = m_listbox_gcodes->IsChecked(sel);
+}
+
+void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&)
+{
+	m_infobox.listbox_codes->Clear();
+	const int sel = m_listbox_gcodes->GetSelection();
+
+	if (sel > -1)
+	{
+		m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name) + StrToWxStr(m_gcodes[sel].name));
+
+		// notes textctrl
+		m_infobox.textctrl_notes->Clear();
+		for (const std::string& note : m_gcodes[sel].notes)
+		{
+			m_infobox.textctrl_notes->AppendText(StrToWxStr(note));
+		}
+		m_infobox.textctrl_notes->ScrollLines(-99); // silly
+
+		m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + StrToWxStr(m_gcodes[sel].creator));
+
+		// add codes to info listbox
+		for (const GeckoCode::Code& code : m_gcodes[sel].codes)
+		{
+			m_infobox.listbox_codes->Append(wxString::Format("%08X %08X", code.address, code.data));
+		}
+	}
+	else
+	{
+		m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name));
+		m_infobox.textctrl_notes->Clear();
+		m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator));
+	}
+}
+
+void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
+{
+	if (m_gameid.empty())
+		return;
+
+	std::string gameid = m_gameid;
+
+
+	switch (m_gameid[0])
+	{
+	case 'R':
+	case 'S':
+	case 'G':
+		break;
+	default:
+	// All channels (WiiWare, VirtualConsole, etc) are identified by their first four characters
+		gameid = m_gameid.substr(0, 4);
+		break;
+	}
+
+	sf::Http::Request req;
+	req.setUri("/txt.php?txt=" + gameid);
+
+	sf::Http http;
+	http.setHost("geckocodes.org");
+
+	const sf::Http::Response resp = http.sendRequest(req, sf::seconds(5));
+
+	if (sf::Http::Response::Ok == resp.getStatus())
+	{
+		// temp vector containing parsed codes
+		std::vector<GeckoCode> gcodes;
+
+		// parse the codes
+		std::istringstream ss(resp.getBody());
+
+		std::string line;
+
+		// seek past the header, get to the first code
+		std::getline(ss, line);
+		std::getline(ss, line);
+		std::getline(ss, line);
+
+		int read_state = 0;
+		GeckoCode gcode;
+
+		while ((std::getline(ss, line).good()))
+		{
+			// Remove \r at the end of the line for files using windows line endings, std::getline only removes \n
+			line = StripSpaces(line);
+
+			if (line.empty())
+			{
+				// add the code
+				if (gcode.codes.size())
+					gcodes.push_back(gcode);
+				gcode = GeckoCode();
+				read_state = 0;
+				continue;
+			}
+
+			switch (read_state)
+			{
+				// read new code
+			case 0 :
+			{
+				std::istringstream ssline(line);
+				// stop at [ character (beginning of contributor name)
+				std::getline(ssline, gcode.name, '[');
+				gcode.name = StripSpaces(gcode.name);
+				gcode.user_defined = true;
+				// read the code creator name
+				std::getline(ssline, gcode.creator, ']');
+				read_state = 1;
+			}
+				break;
+
+				// read code lines
+			case 1 :
+			{
+				std::istringstream ssline(line);
+				std::string addr, data;
+				ssline >> addr >> data;
+				ssline.seekg(0);
+
+				// check if this line a code, silly, but the dumb txt file comment lines can start with valid hex chars :/
+				if (8 == addr.length() && 8 == data.length())
+				{
+					GeckoCode::Code new_code;
+					new_code.original_line = line;
+					ssline >> std::hex >> new_code.address >> new_code.data;
+					gcode.codes.push_back(new_code);
+				}
+				else
+				{
+					gcode.notes.push_back(line);
+					read_state = 2; // start reading comments
+				}
+
+			}
+				break;
+
+				// read comment lines
+			case 2 :
+				// append comment line
+				gcode.notes.push_back(line);
+				break;
+
+			}
+		}
+
+		// add the last code
+		if (gcode.codes.size())
+			gcodes.push_back(gcode);
+
+		if (gcodes.size())
+		{
+			unsigned long added_count = 0;
+
+			// append the codes to the code list
+			for (const GeckoCode& code : gcodes)
+			{
+				// only add codes which do not already exist
+				std::vector<GeckoCode>::const_iterator
+					existing_gcodes_iter = m_gcodes.begin(),
+					existing_gcodes_end = m_gcodes.end();
+				for (;; ++existing_gcodes_iter)
+				{
+					if (existing_gcodes_end == existing_gcodes_iter)
+					{
+						m_gcodes.push_back(code);
+						++added_count;
+						break;
+					}
+
+					// code exists
+					if (existing_gcodes_iter->Compare(code))
+						break;
+				}
+			}
+
+			wxMessageBox(wxString::Format(_("Downloaded %lu codes. (added %lu)"),
+				(unsigned long)gcodes.size(), added_count));
+
+			// refresh the list
+			UpdateCodeList();
+		}
+		else
+		{
+			wxMessageBox(_("File contained no codes."));
+		}
+	}
+	else
+	{
+		WxUtils::ShowErrorDialog(_("Failed to download codes."));
+	}
+}
+
+}
+
diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h
new file mode 100644
index 0000000000..c2ac384f3c
--- /dev/null
+++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h
@@ -0,0 +1,57 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <wx/panel.h>
+
+#include "Core/GeckoCode.h"
+
+class IniFile;
+class wxButton;
+class wxCheckListBox;
+class wxListBox;
+class wxStaticText;
+class wxTextCtrl;
+
+namespace Gecko
+{
+
+
+class CodeConfigPanel : public wxPanel
+{
+public:
+	CodeConfigPanel(wxWindow* const parent);
+
+
+	void LoadCodes(const IniFile& globalIni, const IniFile& localIni, const std::string& gameid = "", bool checkRunning = false);
+	const std::vector<GeckoCode>& GetCodes() const { return m_gcodes; }
+
+protected:
+	void UpdateInfoBox(wxCommandEvent&);
+	void ToggleCode(wxCommandEvent& evt);
+	void DownloadCodes(wxCommandEvent&);
+	//void ApplyChanges(wxCommandEvent&);
+
+	void UpdateCodeList(bool checkRunning = false);
+
+private:
+	std::vector<GeckoCode> m_gcodes;
+
+	std::string m_gameid;
+
+	// wxwidgets stuff
+	wxCheckListBox* m_listbox_gcodes;
+	struct
+	{
+		wxStaticText* label_name, *label_notes, *label_creator;
+		wxTextCtrl*   textctrl_notes;
+		wxListBox*    listbox_codes;
+	} m_infobox;
+	wxButton* btn_download;
+};
+
+}
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
new file mode 100644
index 0000000000..ebdb87a00e
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
@@ -0,0 +1,94 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include <wx/checkbox.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/stattext.h>
+
+#include "Core/ConfigManager.h"
+#include "DolphinWX/Config/AdvancedConfigPane.h"
+
+AdvancedConfigPane::AdvancedConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+}
+
+void AdvancedConfigPane::InitializeGUI()
+{
+	m_clock_override_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable CPU Clock Override"));
+	m_clock_override_slider = new wxSlider(this, wxID_ANY, 100, 0, 150, wxDefaultPosition, wxSize(200,-1));
+	m_clock_override_text = new wxStaticText(this, wxID_ANY, "");
+
+	m_clock_override_checkbox->Bind(wxEVT_CHECKBOX, &AdvancedConfigPane::OnClockOverrideCheckBoxChanged, this);
+	m_clock_override_slider->Bind(wxEVT_SLIDER, &AdvancedConfigPane::OnClockOverrideSliderChanged, this);
+
+	wxStaticText* const clock_override_description = new wxStaticText(this, wxID_ANY,
+	  _("Higher values can make variable-framerate games "
+	    "run at a higher framerate, at the expense of CPU. "
+	    "Lower values can make variable-framerate games "
+	    "run at a lower framerate, saving CPU.\n\n"
+	    "WARNING: Changing this from the default (100%) "
+	    "can and will break games and cause glitches. "
+	    "Do so at your own risk. Please do not report "
+	    "bugs that occur with a non-default clock. "));
+	clock_override_description->Wrap(400);
+
+	wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
+	clock_override_checkbox_sizer->Add(m_clock_override_checkbox);
+
+	wxBoxSizer* const clock_override_slider_sizer = new wxBoxSizer(wxHORIZONTAL);
+	clock_override_slider_sizer->Add(m_clock_override_slider, 1, wxALL, 5);
+	clock_override_slider_sizer->Add(m_clock_override_text, 1, wxALL, 5);
+
+	wxBoxSizer* const clock_override_description_sizer = new wxBoxSizer(wxHORIZONTAL);
+	clock_override_description_sizer->Add(clock_override_description, 1, wxALL, 5);
+
+	wxStaticBoxSizer* const cpu_options_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("CPU Options"));
+	cpu_options_sizer->Add(clock_override_checkbox_sizer);
+	cpu_options_sizer->Add(clock_override_slider_sizer);
+	cpu_options_sizer->Add(clock_override_description_sizer);
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(cpu_options_sizer , 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_sizer);
+}
+
+void AdvancedConfigPane::LoadGUIValues()
+{
+	int ocFactor = (int)(std::log2f(SConfig::GetInstance().m_OCFactor) * 25.f + 100.f + 0.5f);
+	bool oc_enabled = SConfig::GetInstance().m_OCEnable;
+	m_clock_override_checkbox->SetValue(oc_enabled);
+	m_clock_override_slider ->SetValue(ocFactor);
+	m_clock_override_slider->Enable(oc_enabled);
+	UpdateCPUClock();
+}
+
+void AdvancedConfigPane::OnClockOverrideCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_OCEnable = m_clock_override_checkbox->IsChecked();
+	m_clock_override_slider->Enable(SConfig::GetInstance().m_OCEnable);
+	UpdateCPUClock();
+}
+
+void AdvancedConfigPane::OnClockOverrideSliderChanged(wxCommandEvent& event)
+{
+	// Vaguely exponential scaling?
+	SConfig::GetInstance().m_OCFactor = std::exp2f((m_clock_override_slider->GetValue() - 100.f) / 25.f);
+	UpdateCPUClock();
+}
+
+void AdvancedConfigPane::UpdateCPUClock()
+{
+	bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
+	int percent = (int)(std::roundf(SConfig::GetInstance().m_OCFactor * 100.f));
+	int clock = (int)(std::roundf(SConfig::GetInstance().m_OCFactor * (wii ? 729.f : 486.f)));
+
+	m_clock_override_text->SetLabel(SConfig::GetInstance().m_OCEnable ? wxString::Format("%d %% (%d mhz)", percent, clock) : "");
+}
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
new file mode 100644
index 0000000000..3e5d7f07e0
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
@@ -0,0 +1,30 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+
+class wxCheckBox;
+class wxSlider;
+class wxStaticText;
+
+class AdvancedConfigPane final : public wxPanel
+{
+public:
+	AdvancedConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+
+	void OnClockOverrideCheckBoxChanged(wxCommandEvent&);
+	void OnClockOverrideSliderChanged(wxCommandEvent&);
+
+	void UpdateCPUClock();
+
+	wxCheckBox* m_clock_override_checkbox;
+	wxSlider* m_clock_override_slider;
+	wxStaticText* m_clock_override_text;
+};
diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.cpp b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp
new file mode 100644
index 0000000000..9e1acc66be
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp
@@ -0,0 +1,178 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/gbsizer.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+
+#include "AudioCommon/AudioCommon.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/AudioConfigPane.h"
+
+AudioConfigPane::AudioConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+	RefreshGUI();
+}
+
+void AudioConfigPane::InitializeGUI()
+{
+	m_dsp_engine_strings.Add(_("DSP HLE emulation (fast)"));
+	m_dsp_engine_strings.Add(_("DSP LLE recompiler"));
+	m_dsp_engine_strings.Add(_("DSP LLE interpreter (slow)"));
+
+	m_dsp_engine_radiobox = new wxRadioBox(this, wxID_ANY, _("DSP Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_dsp_engine_strings, 0, wxRA_SPECIFY_ROWS);
+	m_dpl2_decoder_checkbox = new wxCheckBox(this, wxID_ANY, _("Dolby Pro Logic II decoder"));
+	m_volume_slider = new wxSlider(this, wxID_ANY, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE);
+	m_volume_text = new wxStaticText(this, wxID_ANY, "");
+	m_audio_backend_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_audio_backend_strings);
+	m_audio_latency_spinctrl = new wxSpinCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 30);
+
+	m_dsp_engine_radiobox->Bind(wxEVT_RADIOBOX, &AudioConfigPane::OnDSPEngineRadioBoxChanged, this);
+	m_dpl2_decoder_checkbox->Bind(wxEVT_CHECKBOX, &AudioConfigPane::OnDPL2DecoderCheckBoxChanged, this);
+	m_volume_slider->Bind(wxEVT_SLIDER, &AudioConfigPane::OnVolumeSliderChanged, this);
+	m_audio_backend_choice->Bind(wxEVT_CHOICE, &AudioConfigPane::OnAudioBackendChanged, this);
+	m_audio_latency_spinctrl->Bind(wxEVT_SPINCTRL, &AudioConfigPane::OnLatencySpinCtrlChanged, this);
+
+	m_audio_backend_choice->SetToolTip(_("Changing this will have no effect while the emulator is running."));
+	m_audio_latency_spinctrl->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only."));
+#if defined(__APPLE__)
+	m_dpl2_decoder_checkbox->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OS X."));
+#else
+	m_dpl2_decoder_checkbox->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse backends only."));
+#endif
+
+	wxStaticBoxSizer* const dsp_engine_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Sound Settings"));
+	dsp_engine_sizer->Add(m_dsp_engine_radiobox, 0, wxALL | wxEXPAND, 5);
+	dsp_engine_sizer->Add(m_dpl2_decoder_checkbox, 0, wxALL, 5);
+
+	wxStaticBoxSizer* const volume_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Volume"));
+	volume_sizer->Add(m_volume_slider, 1, wxLEFT | wxRIGHT, 13);
+	volume_sizer->Add(m_volume_text, 0, wxALIGN_CENTER | wxALL, 5);
+
+	wxGridBagSizer* const backend_grid_sizer = new wxGridBagSizer();
+	backend_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	backend_grid_sizer->Add(m_audio_backend_choice, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5);
+	backend_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	backend_grid_sizer->Add(m_audio_latency_spinctrl, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5);
+
+	wxStaticBoxSizer* const backend_static_box_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Backend Settings"));
+	backend_static_box_sizer->Add(backend_grid_sizer, 0, wxEXPAND);
+
+	wxBoxSizer* const dsp_audio_sizer = new wxBoxSizer(wxHORIZONTAL);
+	dsp_audio_sizer->Add(dsp_engine_sizer, 1, wxEXPAND | wxALL, 5);
+	dsp_audio_sizer->Add(volume_sizer, 0, wxEXPAND | wxALL, 5);
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(dsp_audio_sizer, 0, wxALL | wxEXPAND);
+	main_sizer->Add(backend_static_box_sizer, 0, wxALL | wxEXPAND, 5);
+
+	SetSizerAndFit(main_sizer);
+}
+
+void AudioConfigPane::LoadGUIValues()
+{
+	PopulateBackendChoiceBox();
+
+	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	// Audio DSP Engine
+	if (startup_params.bDSPHLE)
+		m_dsp_engine_radiobox->SetSelection(0);
+	else
+		m_dsp_engine_radiobox->SetSelection(SConfig::GetInstance().m_DSPEnableJIT ? 1 : 2);
+
+	m_volume_slider->Enable(SupportsVolumeChanges(SConfig::GetInstance().sBackend));
+	m_volume_slider->SetValue(SConfig::GetInstance().m_Volume);
+
+	m_volume_text->SetLabel(wxString::Format("%d %%", SConfig::GetInstance().m_Volume));
+
+	m_dpl2_decoder_checkbox->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL
+		|| std::string(SConfig::GetInstance().sBackend) == BACKEND_PULSEAUDIO);
+	m_dpl2_decoder_checkbox->SetValue(startup_params.bDPL2Decoder);
+
+	m_audio_latency_spinctrl->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL);
+	m_audio_latency_spinctrl->SetValue(startup_params.iLatency);
+}
+
+void AudioConfigPane::RefreshGUI()
+{
+	if (Core::IsRunning())
+	{
+		m_audio_latency_spinctrl->Disable();
+		m_audio_backend_choice->Disable();
+		m_dpl2_decoder_checkbox->Disable();
+		m_dsp_engine_radiobox->Disable();
+	}
+}
+
+void AudioConfigPane::OnDSPEngineRadioBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = m_dsp_engine_radiobox->GetSelection() == 0;
+	SConfig::GetInstance().m_DSPEnableJIT = m_dsp_engine_radiobox->GetSelection() == 1;
+	AudioCommon::UpdateSoundStream();
+}
+
+void AudioConfigPane::OnDPL2DecoderCheckBoxChanged(wxCommandEvent&)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder = m_dpl2_decoder_checkbox->IsChecked();
+}
+
+void AudioConfigPane::OnVolumeSliderChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_Volume = m_volume_slider->GetValue();
+	AudioCommon::UpdateSoundStream();
+	m_volume_text->SetLabel(wxString::Format("%d %%", m_volume_slider->GetValue()));
+}
+
+void AudioConfigPane::OnAudioBackendChanged(wxCommandEvent& event)
+{
+	m_volume_slider->Enable(SupportsVolumeChanges(WxStrToStr(m_audio_backend_choice->GetStringSelection())));
+	m_audio_latency_spinctrl->Enable(WxStrToStr(m_audio_backend_choice->GetStringSelection()) == BACKEND_OPENAL);
+	m_dpl2_decoder_checkbox->Enable(WxStrToStr(m_audio_backend_choice->GetStringSelection()) == BACKEND_OPENAL ||
+	                                WxStrToStr(m_audio_backend_choice->GetStringSelection()) == BACKEND_PULSEAUDIO);
+
+	// Don't save the translated BACKEND_NULLSOUND string
+	SConfig::GetInstance().sBackend = m_audio_backend_choice->GetSelection() ?
+		WxStrToStr(m_audio_backend_choice->GetStringSelection()) : BACKEND_NULLSOUND;
+
+	AudioCommon::UpdateSoundStream();
+}
+
+void AudioConfigPane::OnLatencySpinCtrlChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = m_audio_latency_spinctrl->GetValue();
+}
+
+void AudioConfigPane::PopulateBackendChoiceBox()
+{
+	for (const std::string& backend : AudioCommon::GetSoundBackends())
+	{
+		m_audio_backend_choice->Append(wxGetTranslation(StrToWxStr(backend)));
+
+		int num = m_audio_backend_choice->FindString(StrToWxStr(SConfig::GetInstance().sBackend));
+		m_audio_backend_choice->SetSelection(num);
+	}
+}
+
+bool AudioConfigPane::SupportsVolumeChanges(const std::string& backend)
+{
+	//FIXME: this one should ask the backend whether it supports it.
+	//       but getting the backend from string etc. is probably
+	//       too much just to enable/disable a stupid slider...
+	return (backend == BACKEND_COREAUDIO ||
+	        backend == BACKEND_OPENAL ||
+	        backend == BACKEND_XAUDIO2);
+}
diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.h b/Source/Core/DolphinWX/Config/AudioConfigPane.h
new file mode 100644
index 0000000000..dd17919d27
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/AudioConfigPane.h
@@ -0,0 +1,46 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <wx/arrstr.h>
+#include <wx/panel.h>
+
+class wxCheckBox;
+class wxChoice;
+class wxRadioBox;
+class wxSlider;
+class wxSpinCtrl;
+class wxStaticText;
+
+class AudioConfigPane final : public wxPanel
+{
+public:
+	AudioConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+	void RefreshGUI();
+
+	void PopulateBackendChoiceBox();
+	static bool SupportsVolumeChanges(const std::string&);
+
+	void OnDSPEngineRadioBoxChanged(wxCommandEvent&);
+	void OnDPL2DecoderCheckBoxChanged(wxCommandEvent&);
+	void OnVolumeSliderChanged(wxCommandEvent&);
+	void OnAudioBackendChanged(wxCommandEvent&);
+	void OnLatencySpinCtrlChanged(wxCommandEvent&);
+
+	wxArrayString m_dsp_engine_strings;
+	wxArrayString m_audio_backend_strings;
+
+	wxRadioBox* m_dsp_engine_radiobox;
+	wxCheckBox* m_dpl2_decoder_checkbox;
+	wxSlider* m_volume_slider;
+	wxStaticText* m_volume_text;
+	wxChoice* m_audio_backend_choice;
+	wxSpinCtrl* m_audio_latency_spinctrl;
+};
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp
new file mode 100644
index 0000000000..1cd7421f65
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp
@@ -0,0 +1,107 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/AdvancedConfigPane.h"
+#include "DolphinWX/Config/AudioConfigPane.h"
+#include "DolphinWX/Config/ConfigMain.h"
+#include "DolphinWX/Config/GameCubeConfigPane.h"
+#include "DolphinWX/Config/GeneralConfigPane.h"
+#include "DolphinWX/Config/InterfaceConfigPane.h"
+#include "DolphinWX/Config/PathConfigPane.h"
+#include "DolphinWX/Config/WiiConfigPane.h"
+
+// Sent by child panes to signify that the game list should
+// be updated when this modal dialog closes.
+wxDEFINE_EVENT(wxDOLPHIN_CFG_REFRESH_LIST, wxCommandEvent);
+
+CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
+		const wxPoint& position, const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+{
+	// Control refreshing of the ISOs list
+	m_refresh_game_list_on_close = false;
+
+	Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this);
+	Bind(wxEVT_BUTTON, &CConfigMain::OnOk, this, wxID_OK);
+	Bind(wxDOLPHIN_CFG_REFRESH_LIST, &CConfigMain::OnSetRefreshGameListOnClose, this);
+
+	CreateGUIControls();
+}
+
+CConfigMain::~CConfigMain()
+{
+}
+
+void CConfigMain::SetSelectedTab(int tab)
+{
+	// TODO : this is just a quick and dirty way to do it, possible cleanup
+
+	switch (tab)
+	{
+	case ID_AUDIOPAGE:
+		Notebook->SetSelection(2);
+		break;
+	}
+}
+
+void CConfigMain::CreateGUIControls()
+{
+	// Create the notebook and pages
+	Notebook = new wxNotebook(this, ID_NOTEBOOK);
+	wxPanel* const general_pane = new GeneralConfigPane(Notebook, ID_GENERALPAGE);
+	wxPanel* const interface_pane = new InterfaceConfigPane(Notebook, ID_DISPLAYPAGE);
+	wxPanel* const audio_pane = new AudioConfigPane(Notebook, ID_AUDIOPAGE);
+	wxPanel* const gamecube_pane = new GameCubeConfigPane(Notebook, ID_GAMECUBEPAGE);
+	wxPanel* const wii_pane = new WiiConfigPane(Notebook, ID_WIIPAGE);
+	wxPanel* const path_pane = new PathConfigPane(Notebook, ID_PATHSPAGE);
+	wxPanel* const advanced_pane = new AdvancedConfigPane(Notebook, ID_ADVANCEDPAGE);
+
+	Notebook->AddPage(general_pane, _("General"));
+	Notebook->AddPage(interface_pane, _("Interface"));
+	Notebook->AddPage(audio_pane, _("Audio"));
+	Notebook->AddPage(gamecube_pane, _("GameCube"));
+	Notebook->AddPage(wii_pane, _("Wii"));
+	Notebook->AddPage(path_pane, _("Paths"));
+	Notebook->AddPage(advanced_pane, _("Advanced"));
+	if (Movie::IsMovieActive() || NetPlay::IsNetPlayRunning())
+		advanced_pane->Disable();
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
+	main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	main_sizer->SetMinSize(400, 0);
+
+	SetSizerAndFit(main_sizer);
+	Center();
+	SetFocus();
+}
+
+void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event))
+{
+	EndModal((m_refresh_game_list_on_close) ? wxID_OK : wxID_CANCEL);
+}
+
+void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event))
+{
+	Close();
+
+	// Save the config. Dolphin crashes too often to only save the settings on closing
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CConfigMain::OnSetRefreshGameListOnClose(wxCommandEvent& WXUNUSED(event))
+{
+	m_refresh_game_list_on_close = true;
+}
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.h b/Source/Core/DolphinWX/Config/ConfigMain.h
new file mode 100644
index 0000000000..931f39d17c
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/ConfigMain.h
@@ -0,0 +1,49 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+#include "Common/CommonTypes.h"
+
+class wxNotebook;
+class wxPanel;
+
+wxDECLARE_EVENT(wxDOLPHIN_CFG_REFRESH_LIST, wxCommandEvent);
+
+class CConfigMain : public wxDialog
+{
+public:
+	CConfigMain(wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxString& title = _("Dolphin Configuration"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxDEFAULT_DIALOG_STYLE);
+	virtual ~CConfigMain();
+
+	void SetSelectedTab(int tab);
+
+	enum
+	{
+		ID_NOTEBOOK = 1000,
+		ID_GENERALPAGE,
+		ID_DISPLAYPAGE,
+		ID_AUDIOPAGE,
+		ID_GAMECUBEPAGE,
+		ID_WIIPAGE,
+		ID_PATHSPAGE,
+		ID_ADVANCEDPAGE,
+	};
+
+private:
+	void CreateGUIControls();
+	void OnClose(wxCloseEvent& event);
+	void OnOk(wxCommandEvent& event);
+	void OnSetRefreshGameListOnClose(wxCommandEvent& event);
+
+	wxNotebook* Notebook;
+
+	bool m_refresh_game_list_on_close;
+};
diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp
new file mode 100644
index 0000000000..7909cf41ec
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp
@@ -0,0 +1,367 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/filedlg.h>
+#include <wx/gbsizer.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GCMemcard.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/ConfigMain.h"
+#include "DolphinWX/Config/GameCubeConfigPane.h"
+
+#define DEV_NONE_STR        _trans("<Nothing>")
+#define DEV_DUMMY_STR       _trans("Dummy")
+
+#define EXIDEV_MEMCARD_STR  _trans("Memory Card")
+#define EXIDEV_MEMDIR_STR   _trans("GCI Folder")
+#define EXIDEV_MIC_STR      _trans("Mic")
+#define EXIDEV_BBA_STR      "BBA"
+#define EXIDEV_AGP_STR      "Advance Game Port"
+#define EXIDEV_AM_BB_STR    _trans("AM-Baseboard")
+#define EXIDEV_GECKO_STR    "USBGecko"
+
+GameCubeConfigPane::GameCubeConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+	RefreshGUI();
+}
+
+void GameCubeConfigPane::InitializeGUI()
+{
+	m_ipl_language_strings.Add(_("English"));
+	m_ipl_language_strings.Add(_("German"));
+	m_ipl_language_strings.Add(_("French"));
+	m_ipl_language_strings.Add(_("Spanish"));
+	m_ipl_language_strings.Add(_("Italian"));
+	m_ipl_language_strings.Add(_("Dutch"));
+
+	m_system_lang_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ipl_language_strings);
+	m_system_lang_choice->SetToolTip(_("Sets the GameCube system language."));
+	m_system_lang_choice->Bind(wxEVT_CHOICE, &GameCubeConfigPane::OnSystemLanguageChange, this);
+
+	m_skip_bios_checkbox = new wxCheckBox(this, wxID_ANY, _("Skip BIOS"));
+	m_skip_bios_checkbox->Bind(wxEVT_CHECKBOX, &GameCubeConfigPane::OnSkipBiosCheckBoxChanged, this);
+
+	if (!File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) &&
+	    !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) &&
+	    !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) &&
+	    !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) &&
+	    !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL) &&
+	    !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL))
+	{
+		m_skip_bios_checkbox->Disable();
+		m_skip_bios_checkbox->SetToolTip(_("Put BIOS roms in User/GC/{region}."));
+	}
+
+	// Device settings
+	// EXI Devices
+	wxStaticText* GCEXIDeviceText[3] = {
+		new wxStaticText(this, wxID_ANY, _("Slot A")),
+		new wxStaticText(this, wxID_ANY, _("Slot B")),
+		new wxStaticText(this, wxID_ANY, "SP1"),
+	};
+
+	m_exi_devices[0] = new wxChoice(this, wxID_ANY);
+	m_exi_devices[0]->Bind(wxEVT_CHOICE, &GameCubeConfigPane::OnSlotAChanged, this);
+	m_exi_devices[1] = new wxChoice(this, wxID_ANY);
+	m_exi_devices[1]->Bind(wxEVT_CHOICE, &GameCubeConfigPane::OnSlotBChanged, this);
+	m_exi_devices[2] = new wxChoice(this, wxID_ANY);
+	m_exi_devices[2]->Bind(wxEVT_CHOICE, &GameCubeConfigPane::OnSP1Changed, this);
+	m_exi_devices[2]->SetToolTip(_("Serial Port 1 - This is the port which devices such as the net adapter use."));
+
+	m_memcard_path[0] = new wxButton(this, wxID_ANY, "...", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	m_memcard_path[0]->Bind(wxEVT_BUTTON, &GameCubeConfigPane::OnSlotAButtonClick, this);
+	m_memcard_path[1] = new wxButton(this, wxID_ANY, "...", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	m_memcard_path[1]->Bind(wxEVT_BUTTON, &GameCubeConfigPane::OnSlotBButtonClick, this);
+
+	// Populate the GameCube page
+	wxGridBagSizer* const sGamecubeIPLSettings = new wxGridBagSizer();
+	sGamecubeIPLSettings->Add(m_skip_bios_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
+	sGamecubeIPLSettings->Add(new wxStaticText(this, wxID_ANY, _("System Language:")),
+		wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	sGamecubeIPLSettings->Add(m_system_lang_choice, wxGBPosition(1, 1), wxDefaultSpan, wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	wxStaticBoxSizer* const sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, this, _("IPL Settings"));
+	sbGamecubeIPLSettings->Add(sGamecubeIPLSettings);
+	wxStaticBoxSizer* const sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, this, _("Device Settings"));
+	wxGridBagSizer* const sbGamecubeEXIDevSettings = new wxGridBagSizer(10, 10);
+
+	for (int i = 0; i < 3; ++i)
+	{
+		sbGamecubeEXIDevSettings->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+		sbGamecubeEXIDevSettings->Add(m_exi_devices[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2) ? 1 : 2), wxALIGN_CENTER_VERTICAL);
+
+		if (i < 2)
+			sbGamecubeEXIDevSettings->Add(m_memcard_path[i], wxGBPosition(i, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+
+		if (NetPlay::IsNetPlayRunning())
+			m_exi_devices[i]->Disable();
+	}
+	sbGamecubeDeviceSettings->Add(sbGamecubeEXIDevSettings, 0, wxALL, 5);
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(sbGamecubeIPLSettings, 0, wxEXPAND | wxALL, 5);
+	main_sizer->Add(sbGamecubeDeviceSettings, 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_sizer);
+}
+
+void GameCubeConfigPane::LoadGUIValues()
+{
+	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	m_system_lang_choice->SetSelection(startup_params.SelectedLanguage);
+	m_skip_bios_checkbox->SetValue(startup_params.bHLE_BS2);
+
+	wxArrayString slot_devices;
+	slot_devices.Add(_(DEV_NONE_STR));
+	slot_devices.Add(_(DEV_DUMMY_STR));
+	slot_devices.Add(_(EXIDEV_MEMCARD_STR));
+	slot_devices.Add(_(EXIDEV_MEMDIR_STR));
+	slot_devices.Add(_(EXIDEV_GECKO_STR));
+	slot_devices.Add(_(EXIDEV_AGP_STR));
+
+#if HAVE_PORTAUDIO
+	slot_devices.Add(_(EXIDEV_MIC_STR));
+#endif
+
+	wxArrayString sp1_devices;
+	sp1_devices.Add(_(DEV_NONE_STR));
+	sp1_devices.Add(_(DEV_DUMMY_STR));
+	sp1_devices.Add(_(EXIDEV_BBA_STR));
+	sp1_devices.Add(_(EXIDEV_AM_BB_STR));
+
+	for (int i = 0; i < 3; ++i)
+	{
+		bool isMemcard = false;
+
+		// Add strings to the wxChoice list, the third wxChoice is the SP1 slot
+		if (i == 2)
+			m_exi_devices[i]->Append(sp1_devices);
+		else
+			m_exi_devices[i]->Append(slot_devices);
+
+		switch (SConfig::GetInstance().m_EXIDevice[i])
+		{
+		case EXIDEVICE_NONE:
+			m_exi_devices[i]->SetStringSelection(slot_devices[0]);
+			break;
+		case EXIDEVICE_MEMORYCARD:
+			isMemcard = m_exi_devices[i]->SetStringSelection(slot_devices[2]);
+			break;
+		case EXIDEVICE_MEMORYCARDFOLDER:
+			m_exi_devices[i]->SetStringSelection(slot_devices[3]);
+			break;
+		case EXIDEVICE_GECKO:
+			m_exi_devices[i]->SetStringSelection(slot_devices[4]);
+			break;
+		case EXIDEVICE_AGP:
+			isMemcard = m_exi_devices[i]->SetStringSelection(slot_devices[5]);
+			break;
+		case EXIDEVICE_MIC:
+			m_exi_devices[i]->SetStringSelection(slot_devices[6]);
+			break;
+		case EXIDEVICE_ETH:
+			m_exi_devices[i]->SetStringSelection(sp1_devices[2]);
+			break;
+		case EXIDEVICE_AM_BASEBOARD:
+			m_exi_devices[i]->SetStringSelection(sp1_devices[3]);
+			break;
+		case EXIDEVICE_DUMMY:
+		default:
+			m_exi_devices[i]->SetStringSelection(slot_devices[1]);
+			break;
+		}
+
+		if (!isMemcard && i < 2)
+			m_memcard_path[i]->Disable();
+	}
+}
+
+void GameCubeConfigPane::RefreshGUI()
+{
+	if (Core::IsRunning())
+	{
+		m_system_lang_choice->Disable();
+		m_skip_bios_checkbox->Disable();
+	}
+}
+
+void GameCubeConfigPane::OnSystemLanguageChange(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage = m_system_lang_choice->GetSelection();
+
+	AddPendingEvent(wxCommandEvent(wxDOLPHIN_CFG_REFRESH_LIST));
+}
+
+void GameCubeConfigPane::OnSkipBiosCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2 = m_skip_bios_checkbox->IsChecked();
+}
+
+void GameCubeConfigPane::OnSlotAChanged(wxCommandEvent& event)
+{
+	ChooseEXIDevice(event.GetString(), 0);
+}
+
+void GameCubeConfigPane::OnSlotBChanged(wxCommandEvent& event)
+{
+	ChooseEXIDevice(event.GetString(), 1);
+}
+
+void GameCubeConfigPane::OnSP1Changed(wxCommandEvent& event)
+{
+	ChooseEXIDevice(event.GetString(), 2);
+}
+
+void GameCubeConfigPane::OnSlotAButtonClick(wxCommandEvent& event)
+{
+	ChooseSlotPath(true, SConfig::GetInstance().m_EXIDevice[0]);
+}
+
+void GameCubeConfigPane::OnSlotBButtonClick(wxCommandEvent& event)
+{
+	ChooseSlotPath(false, SConfig::GetInstance().m_EXIDevice[1]);
+}
+
+void GameCubeConfigPane::ChooseEXIDevice(const wxString& deviceName, int deviceNum)
+{
+	TEXIDevices tempType;
+
+	if (!deviceName.compare(_(EXIDEV_MEMCARD_STR)))
+		tempType = EXIDEVICE_MEMORYCARD;
+	else if (!deviceName.compare(_(EXIDEV_MEMDIR_STR)))
+		tempType = EXIDEVICE_MEMORYCARDFOLDER;
+	else if (!deviceName.compare(_(EXIDEV_MIC_STR)))
+		tempType = EXIDEVICE_MIC;
+	else if (!deviceName.compare(EXIDEV_BBA_STR))
+		tempType = EXIDEVICE_ETH;
+	else if (!deviceName.compare(EXIDEV_AGP_STR))
+		tempType = EXIDEVICE_AGP;
+	else if (!deviceName.compare(_(EXIDEV_AM_BB_STR)))
+		tempType = EXIDEVICE_AM_BASEBOARD;
+	else if (!deviceName.compare(EXIDEV_GECKO_STR))
+		tempType = EXIDEVICE_GECKO;
+	else if (!deviceName.compare(_(DEV_NONE_STR)))
+		tempType = EXIDEVICE_NONE;
+	else
+		tempType = EXIDEVICE_DUMMY;
+
+	// Gray out the memcard path button if we're not on a memcard or AGP
+	if (tempType == EXIDEVICE_MEMORYCARD || tempType == EXIDEVICE_AGP)
+		m_memcard_path[deviceNum]->Enable();
+	else if (deviceNum == 0 || deviceNum == 1)
+		m_memcard_path[deviceNum]->Disable();
+
+	SConfig::GetInstance().m_EXIDevice[deviceNum] = tempType;
+
+	if (Core::IsRunning())
+	{
+		// Change plugged device! :D
+		ExpansionInterface::ChangeDevice(
+			(deviceNum == 1) ? 1 : 0,  // SlotB is on channel 1, slotA and SP1 are on 0
+			tempType,                  // The device enum to change to
+			(deviceNum == 2) ? 2 : 0); // SP1 is device 2, slots are device 0
+	}
+}
+
+void GameCubeConfigPane::ChooseSlotPath(bool is_slot_a, TEXIDevices device_type)
+{
+	bool memcard = (device_type == EXIDEVICE_MEMORYCARD);
+	std::string path;
+	std::string cardname;
+	std::string ext;
+	std::string pathA = SConfig::GetInstance().m_strMemoryCardA;
+	std::string pathB = SConfig::GetInstance().m_strMemoryCardB;
+	if (!memcard)
+	{
+		pathA = SConfig::GetInstance().m_strGbaCartA;
+		pathB = SConfig::GetInstance().m_strGbaCartB;
+	}
+	SplitPath(is_slot_a ? pathA : pathB, &path, &cardname, &ext);
+	std::string filename = WxStrToStr(wxFileSelector(
+		_("Choose a file to open"),
+		StrToWxStr(path),
+		StrToWxStr(cardname),
+		StrToWxStr(ext),
+		memcard ? _("GameCube Memory Cards (*.raw,*.gcp)") + "|*.raw;*.gcp" : _("Game Boy Advance Carts (*.gba)") + "|*.gba"));
+
+	if (!filename.empty())
+	{
+		if (File::Exists(filename))
+		{
+			if (memcard)
+			{
+				GCMemcard memorycard(filename);
+				if (!memorycard.IsValid())
+				{
+					WxUtils::ShowErrorDialog(wxString::Format(_("Cannot use that file as a memory card.\n%s\n" \
+						"is not a valid GameCube memory card file"), filename.c_str()));
+					return;
+				}
+			}
+		}
+#ifdef _WIN32
+		if (!strncmp(File::GetExeDirectory().c_str(), filename.c_str(), File::GetExeDirectory().size()))
+		{
+			// If the Exe Directory Matches the prefix of the filename, we still need to verify
+			// that the next character is a directory separator character, otherwise we may create an invalid path
+			char next_char = filename.at(File::GetExeDirectory().size()) + 1;
+			if (next_char == '/' || next_char == '\\')
+			{
+				filename.erase(0, File::GetExeDirectory().size() + 1);
+				filename = "./" + filename;
+			}
+		}
+		std::replace(filename.begin(), filename.end(), '\\', '/');
+#endif
+
+		// also check that the path isn't used for the other memcard...
+		if (filename.compare(is_slot_a ? pathB : pathA) != 0)
+		{
+			if (memcard)
+			{
+				if (is_slot_a)
+					SConfig::GetInstance().m_strMemoryCardA = filename;
+				else
+					SConfig::GetInstance().m_strMemoryCardB = filename;
+			}
+			else
+			{
+				if (is_slot_a)
+					SConfig::GetInstance().m_strGbaCartA = filename;
+				else
+					SConfig::GetInstance().m_strGbaCartB = filename;
+			}
+
+			if (Core::IsRunning())
+			{
+				// Change memcard to the new file
+				ExpansionInterface::ChangeDevice(
+					is_slot_a ? 0 : 1, // SlotA: channel 0, SlotB channel 1
+					device_type,
+					0); // SP1 is device 2, slots are device 0
+			}
+		}
+		else
+		{
+			WxUtils::ShowErrorDialog(_("Are you trying to use the same file in both slots?"));
+		}
+	}
+}
diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
new file mode 100644
index 0000000000..874dc6ad3c
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
@@ -0,0 +1,42 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/arrstr.h>
+#include <wx/panel.h>
+
+class wxButton;
+class wxCheckBox;
+class wxChoice;
+class wxString;
+
+class GameCubeConfigPane final : public wxPanel
+{
+public:
+	GameCubeConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+	void RefreshGUI();
+
+	void OnSystemLanguageChange(wxCommandEvent&);
+	void OnSkipBiosCheckBoxChanged(wxCommandEvent&);
+	void OnSlotAChanged(wxCommandEvent&);
+	void OnSlotBChanged(wxCommandEvent&);
+	void OnSP1Changed(wxCommandEvent&);
+	void OnSlotAButtonClick(wxCommandEvent&);
+	void OnSlotBButtonClick(wxCommandEvent&);
+
+	void ChooseEXIDevice(const wxString& device_name, int device_id);
+	void ChooseSlotPath(bool is_slot_a, TEXIDevices device_type);
+
+	wxArrayString m_ipl_language_strings;
+
+	wxChoice* m_system_lang_choice;
+	wxCheckBox* m_skip_bios_checkbox;
+	wxChoice* m_exi_devices[3];
+	wxButton* m_memcard_path[2];
+};
diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp
new file mode 100644
index 0000000000..8e8fd41de9
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp
@@ -0,0 +1,159 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/event.h>
+#include <wx/menu.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/Config/GeneralConfigPane.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+
+GeneralConfigPane::GeneralConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	cpu_cores = {
+		{ 0, _("Interpreter (VERY slow)") },
+#ifdef _M_X86_64
+		{ 1, _("JIT Recompiler (recommended)") },
+		{ 2, _("JITIL Recompiler (slower, experimental)") },
+#elif defined(_M_ARM_64)
+		{ 4, _("Arm64 JIT (experimental)") },
+#endif
+	};
+
+	InitializeGUI();
+	LoadGUIValues();
+	RefreshGUI();
+}
+
+void GeneralConfigPane::InitializeGUI()
+{
+	m_frame_limit_array_string.Add(_("Off"));
+	m_frame_limit_array_string.Add(_("Auto"));
+	for (int i = 5; i <= 120; i += 5) // from 5 to 120
+		m_frame_limit_array_string.Add(wxString::Format("%i", i));
+
+	for (const CPUCore& cpu_core : cpu_cores)
+		m_cpu_engine_array_string.Add(cpu_core.name);
+
+	m_dual_core_checkbox   = new wxCheckBox(this, wxID_ANY, _("Enable Dual Core (speedup)"));
+	m_idle_skip_checkbox   = new wxCheckBox(this, wxID_ANY, _("Enable Idle Skipping (speedup)"));
+	m_cheats_checkbox      = new wxCheckBox(this, wxID_ANY, _("Enable Cheats"));
+	m_force_ntscj_checkbox = new wxCheckBox(this, wxID_ANY, _("Force Console as NTSC-J"));
+	m_frame_limit_choice   = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_frame_limit_array_string);
+	m_cpu_engine_radiobox  = new wxRadioBox(this, wxID_ANY, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_cpu_engine_array_string, 0, wxRA_SPECIFY_ROWS);
+
+	m_dual_core_checkbox->SetToolTip(_("Splits the CPU and GPU threads so they can be run on separate cores.\nProvides major speed improvements on most modern PCs, but can cause occasional crashes/glitches."));
+	m_idle_skip_checkbox->SetToolTip(_("Attempt to detect and skip wait-loops.\nIf unsure, leave this checked."));
+	m_cheats_checkbox->SetToolTip(_("Enables the use of Action Replay and Gecko cheats."));
+	m_force_ntscj_checkbox->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
+	m_frame_limit_choice->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL)."));
+
+	m_dual_core_checkbox->Bind(wxEVT_CHECKBOX, &GeneralConfigPane::OnDualCoreCheckBoxChanged, this);
+	m_idle_skip_checkbox->Bind(wxEVT_CHECKBOX, &GeneralConfigPane::OnIdleSkipCheckBoxChanged, this);
+	m_cheats_checkbox->Bind(wxEVT_CHECKBOX, &GeneralConfigPane::OnCheatCheckBoxChanged, this);
+	m_force_ntscj_checkbox->Bind(wxEVT_CHECKBOX, &GeneralConfigPane::OnForceNTSCJCheckBoxChanged, this);
+	m_frame_limit_choice->Bind(wxEVT_CHOICE, &GeneralConfigPane::OnFrameLimitChoiceChanged, this);
+	m_cpu_engine_radiobox->Bind(wxEVT_RADIOBOX, &GeneralConfigPane::OnCPUEngineRadioBoxChanged, this);
+
+	wxBoxSizer* const frame_limit_sizer = new wxBoxSizer(wxHORIZONTAL);
+	frame_limit_sizer->Add(new wxStaticText(this, wxID_ANY, _("Framelimit:")), 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	frame_limit_sizer->Add(m_frame_limit_choice, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
+
+	wxStaticBoxSizer* const basic_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Basic Settings"));
+	basic_settings_sizer->Add(m_dual_core_checkbox, 0, wxALL, 5);
+	basic_settings_sizer->Add(m_idle_skip_checkbox, 0, wxALL, 5);
+	basic_settings_sizer->Add(m_cheats_checkbox, 0, wxALL, 5);
+	basic_settings_sizer->Add(frame_limit_sizer);
+
+	wxStaticBoxSizer* const advanced_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Advanced Settings"));
+	advanced_settings_sizer->Add(m_cpu_engine_radiobox, 0, wxALL, 5);
+	advanced_settings_sizer->Add(m_force_ntscj_checkbox, 0, wxALL, 5);
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(basic_settings_sizer, 0, wxEXPAND | wxALL, 5);
+	main_sizer->Add(advanced_settings_sizer, 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_sizer);
+}
+
+void GeneralConfigPane::LoadGUIValues()
+{
+	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	m_dual_core_checkbox->SetValue(startup_params.bCPUThread);
+	m_idle_skip_checkbox->SetValue(startup_params.bSkipIdle);
+	m_cheats_checkbox->SetValue(startup_params.bEnableCheats);
+	m_force_ntscj_checkbox->SetValue(startup_params.bForceNTSCJ);
+	m_frame_limit_choice->SetSelection(SConfig::GetInstance().m_Framelimit);
+
+	for (size_t i = 0; i < cpu_cores.size(); ++i)
+	{
+		if (cpu_cores[i].CPUid == startup_params.iCPUCore)
+			m_cpu_engine_radiobox->SetSelection(i);
+	}
+}
+
+void GeneralConfigPane::RefreshGUI()
+{
+	if (Core::IsRunning())
+	{
+		m_dual_core_checkbox->Disable();
+		m_idle_skip_checkbox->Disable();
+		m_cheats_checkbox->Disable();
+		m_force_ntscj_checkbox->Disable();
+		m_cpu_engine_radiobox->Disable();
+	}
+}
+
+void GeneralConfigPane::OnDualCoreCheckBoxChanged(wxCommandEvent& event)
+{
+	if (Core::IsRunning())
+		return;
+
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = m_dual_core_checkbox->IsChecked();
+}
+
+void GeneralConfigPane::OnIdleSkipCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle = m_idle_skip_checkbox->IsChecked();
+}
+
+void GeneralConfigPane::OnCheatCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = m_cheats_checkbox->IsChecked();
+}
+
+void GeneralConfigPane::OnForceNTSCJCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = m_force_ntscj_checkbox->IsChecked();
+}
+
+void GeneralConfigPane::OnFrameLimitChoiceChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_Framelimit = m_frame_limit_choice->GetSelection();
+}
+
+void GeneralConfigPane::OnCPUEngineRadioBoxChanged(wxCommandEvent& event)
+{
+	const int selection = m_cpu_engine_radiobox->GetSelection();
+
+	if (main_frame->g_pCodeWindow)
+	{
+
+		bool using_interp = (SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore == PowerPC::CORE_INTERPRETER);
+		main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, using_interp);
+	}
+
+	SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = cpu_cores[selection].CPUid;
+}
diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.h b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
new file mode 100644
index 0000000000..f431246582
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
@@ -0,0 +1,49 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/arrstr.h>
+#include <wx/panel.h>
+
+class wxCheckBox;
+class wxChoice;
+class wxRadioBox;
+
+class GeneralConfigPane final : public wxPanel
+{
+public:
+	GeneralConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+
+	struct CPUCore
+	{
+		int CPUid;
+		wxString name;
+	};
+	std::vector<CPUCore> cpu_cores;
+	void InitializeGUI();
+	void LoadGUIValues();
+	void RefreshGUI();
+
+	void OnDualCoreCheckBoxChanged(wxCommandEvent&);
+	void OnIdleSkipCheckBoxChanged(wxCommandEvent&);
+	void OnCheatCheckBoxChanged(wxCommandEvent&);
+	void OnForceNTSCJCheckBoxChanged(wxCommandEvent&);
+	void OnFrameLimitChoiceChanged(wxCommandEvent&);
+	void OnCPUEngineRadioBoxChanged(wxCommandEvent&);
+
+	wxArrayString m_frame_limit_array_string;
+	wxArrayString m_cpu_engine_array_string;
+
+	wxCheckBox* m_dual_core_checkbox;
+	wxCheckBox* m_idle_skip_checkbox;
+	wxCheckBox* m_cheats_checkbox;
+	wxCheckBox* m_force_ntscj_checkbox;
+
+	wxChoice* m_frame_limit_choice;
+
+	wxRadioBox* m_cpu_engine_radiobox;
+};
diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
new file mode 100644
index 0000000000..a57774a8cd
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp
@@ -0,0 +1,219 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/language.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/HotkeyManager.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/InterfaceConfigPane.h"
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#include "DolphinWX/X11Utils.h"
+#endif
+
+static const wxLanguage language_ids[] =
+{
+	wxLANGUAGE_DEFAULT,
+
+	wxLANGUAGE_CATALAN,
+	wxLANGUAGE_CZECH,
+	wxLANGUAGE_GERMAN,
+	wxLANGUAGE_ENGLISH,
+	wxLANGUAGE_SPANISH,
+	wxLANGUAGE_FRENCH,
+	wxLANGUAGE_ITALIAN,
+	wxLANGUAGE_HUNGARIAN,
+	wxLANGUAGE_DUTCH,
+	wxLANGUAGE_NORWEGIAN_BOKMAL,
+	wxLANGUAGE_POLISH,
+	wxLANGUAGE_PORTUGUESE,
+	wxLANGUAGE_PORTUGUESE_BRAZILIAN,
+	wxLANGUAGE_SERBIAN,
+	wxLANGUAGE_SWEDISH,
+	wxLANGUAGE_TURKISH,
+
+	wxLANGUAGE_GREEK,
+	wxLANGUAGE_RUSSIAN,
+	wxLANGUAGE_HEBREW,
+	wxLANGUAGE_ARABIC,
+	wxLANGUAGE_FARSI,
+	wxLANGUAGE_KOREAN,
+	wxLANGUAGE_JAPANESE,
+	wxLANGUAGE_CHINESE_SIMPLIFIED,
+	wxLANGUAGE_CHINESE_TRADITIONAL,
+};
+
+InterfaceConfigPane::InterfaceConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+}
+
+void InterfaceConfigPane::InitializeGUI()
+{
+	// GUI language arrayStrings
+	// keep these in sync with the langIds array at the beginning of this file
+	m_interface_lang_strings.Add(_("<System Language>"));
+	m_interface_lang_strings.Add(L"Catal\u00E0");                                       // Catalan
+	m_interface_lang_strings.Add(L"\u010Ce\u0161tina");                                 // Czech
+	m_interface_lang_strings.Add(L"Deutsch");                                           // German
+	m_interface_lang_strings.Add(L"English");                                           // English
+	m_interface_lang_strings.Add(L"Espa\u00F1ol");                                      // Spanish
+	m_interface_lang_strings.Add(L"Fran\u00E7ais");                                     // French
+	m_interface_lang_strings.Add(L"Italiano");                                          // Italian
+	m_interface_lang_strings.Add(L"Magyar");                                            // Hungarian
+	m_interface_lang_strings.Add(L"Nederlands");                                        // Dutch
+	m_interface_lang_strings.Add(L"Norsk bokm\u00E5l");                                 // Norwegian
+	m_interface_lang_strings.Add(L"Polski");                                            // Polish
+	m_interface_lang_strings.Add(L"Portugu\u00EAs");                                    // Portuguese
+	m_interface_lang_strings.Add(L"Portugu\u00EAs (Brasil)");                           // Portuguese (Brazil)
+	m_interface_lang_strings.Add(L"Srpski");                                            // Serbian
+	m_interface_lang_strings.Add(L"Svenska");                                           // Swedish
+	m_interface_lang_strings.Add(L"T\u00FCrk\u00E7e");                                  // Turkish
+	m_interface_lang_strings.Add(L"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC");  // Greek
+	m_interface_lang_strings.Add(L"\u0420\u0443\u0441\u0441\u043A\u0438\u0439");        // Russian
+	m_interface_lang_strings.Add(L"\u05E2\u05D1\u05E8\u05D9\u05EA");                    // Hebrew
+	m_interface_lang_strings.Add(L"\u0627\u0644\u0639\u0631\u0628\u064A\u0629");        // Arabic
+	m_interface_lang_strings.Add(L"\u0641\u0627\u0631\u0633\u06CC");                    // Farsi
+	m_interface_lang_strings.Add(L"\uD55C\uAD6D\uC5B4");                                // Korean
+	m_interface_lang_strings.Add(L"\u65E5\u672C\u8A9E");                                // Japanese
+	m_interface_lang_strings.Add(L"\u7B80\u4F53\u4E2D\u6587");                          // Simplified Chinese
+	m_interface_lang_strings.Add(L"\u7E41\u9AD4\u4E2D\u6587");                          // Traditional Chinese
+
+	m_confirm_stop_checkbox     = new wxCheckBox(this, wxID_ANY, _("Confirm on Stop"));
+	m_panic_handlers_checkbox   = new wxCheckBox(this, wxID_ANY, _("Use Panic Handlers"));
+	m_osd_messages_checkbox     = new wxCheckBox(this, wxID_ANY, _("On-Screen Display Messages"));
+	m_pause_focus_lost_checkbox = new wxCheckBox(this, wxID_ANY, _("Pause on Focus Lost"));
+	m_interface_lang_choice     = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_interface_lang_strings);
+	m_theme_choice              = new wxChoice(this, wxID_ANY);
+
+	m_confirm_stop_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnConfirmStopCheckBoxChanged, this);
+	m_panic_handlers_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnPanicHandlersCheckBoxChanged, this);
+	m_osd_messages_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnOSDMessagesCheckBoxChanged, this);
+	m_pause_focus_lost_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnPauseOnFocusLostCheckBoxChanged, this);
+	m_interface_lang_choice->Bind(wxEVT_CHOICE, &InterfaceConfigPane::OnInterfaceLanguageChoiceChanged, this);
+	m_theme_choice->Bind(wxEVT_CHOICE, &InterfaceConfigPane::OnThemeSelected, this);
+
+	m_confirm_stop_checkbox->SetToolTip(_("Show a confirmation box before stopping a game."));
+	m_panic_handlers_checkbox->SetToolTip(_("Show a message box when a potentially serious error has occurred.\nDisabling this may avoid annoying and non-fatal messages, but it may result in major crashes having no explanation at all."));
+	m_osd_messages_checkbox->SetToolTip(_("Display messages over the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing."));
+	m_pause_focus_lost_checkbox->SetToolTip(_("Pauses the emulator when focus is taken away from the emulation window."));
+	m_interface_lang_choice->SetToolTip(_("Change the language of the user interface.\nRequires restart."));
+
+	wxBoxSizer* const language_sizer = new wxBoxSizer(wxHORIZONTAL);
+	language_sizer->Add(new wxStaticText(this, wxID_ANY, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	language_sizer->Add(m_interface_lang_choice, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+
+	wxBoxSizer* const theme_sizer = new wxBoxSizer(wxHORIZONTAL);
+	theme_sizer->Add(new wxStaticText(this, wxID_ANY, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	theme_sizer->Add(m_theme_choice, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	theme_sizer->AddStretchSpacer();
+
+	wxStaticBoxSizer* const main_static_box_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Interface Settings"));
+	main_static_box_sizer->Add(m_confirm_stop_checkbox, 0, wxALL, 5);
+	main_static_box_sizer->Add(m_panic_handlers_checkbox, 0, wxALL, 5);
+	main_static_box_sizer->Add(m_osd_messages_checkbox, 0, wxALL, 5);
+	main_static_box_sizer->Add(m_pause_focus_lost_checkbox, 0, wxALL, 5);
+	main_static_box_sizer->Add(theme_sizer, 0, wxEXPAND | wxALL, 5);
+	main_static_box_sizer->Add(language_sizer, 0, wxEXPAND | wxALL, 5);
+
+	wxBoxSizer* const main_box_sizer = new wxBoxSizer(wxVERTICAL);
+	main_box_sizer->Add(main_static_box_sizer, 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_box_sizer);
+}
+
+void InterfaceConfigPane::LoadGUIValues()
+{
+	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	m_confirm_stop_checkbox->SetValue(startup_params.bConfirmStop);
+	m_panic_handlers_checkbox->SetValue(startup_params.bUsePanicHandlers);
+	m_osd_messages_checkbox->SetValue(startup_params.bOnScreenDisplayMessages);
+	m_pause_focus_lost_checkbox->SetValue(SConfig::GetInstance().m_PauseOnFocusLost);
+
+	for (size_t i = 0; i < sizeof(language_ids) / sizeof(wxLanguage); i++)
+	{
+		if (language_ids [i] == SConfig::GetInstance().m_InterfaceLanguage)
+		{
+			m_interface_lang_choice->SetSelection(i);
+			break;
+		}
+	}
+
+	LoadThemes();
+}
+
+void InterfaceConfigPane::LoadThemes()
+{
+	auto sv = DoFileSearch({"*"}, {
+		File::GetUserPath(D_THEMES_IDX),
+		File::GetSysDirectory() + THEMES_DIR
+	}, /*recursive*/ false);
+	for (const std::string& filename : sv)
+	{
+		std::string name, ext;
+		SplitPath(filename, nullptr, &name, &ext);
+
+		name += ext;
+		const wxString wxname = StrToWxStr(name);
+		if (-1 == m_theme_choice->FindString(wxname))
+			m_theme_choice->Append(wxname);
+	}
+
+	m_theme_choice->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
+}
+
+void InterfaceConfigPane::OnConfirmStopCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop = m_confirm_stop_checkbox->IsChecked();
+}
+
+void InterfaceConfigPane::OnPanicHandlersCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers = m_panic_handlers_checkbox->IsChecked();
+	SetEnableAlert(m_panic_handlers_checkbox->IsChecked());
+}
+
+void InterfaceConfigPane::OnOSDMessagesCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = m_osd_messages_checkbox->IsChecked();
+}
+
+void InterfaceConfigPane::OnInterfaceLanguageChoiceChanged(wxCommandEvent& event)
+{
+	if (SConfig::GetInstance().m_InterfaceLanguage != language_ids[m_interface_lang_choice->GetSelection()])
+		SuccessAlertT("You must restart Dolphin in order for the change to take effect.");
+
+	SConfig::GetInstance().m_InterfaceLanguage = language_ids[m_interface_lang_choice->GetSelection()];
+}
+
+void InterfaceConfigPane::OnPauseOnFocusLostCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_PauseOnFocusLost = m_pause_focus_lost_checkbox->IsChecked();
+}
+
+void InterfaceConfigPane::OnThemeSelected(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = WxStrToStr(m_theme_choice->GetStringSelection());
+
+	main_frame->InitBitmaps();
+	main_frame->UpdateGameList();
+}
+
diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.h b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h
new file mode 100644
index 0000000000..6be6cb91e7
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h
@@ -0,0 +1,39 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/arrstr.h>
+#include <wx/panel.h>
+
+class wxButton;
+class wxCheckBox;
+class wxChoice;
+
+class InterfaceConfigPane final : public wxPanel
+{
+public:
+	InterfaceConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+	void LoadThemes();
+
+	void OnConfirmStopCheckBoxChanged(wxCommandEvent&);
+	void OnPanicHandlersCheckBoxChanged(wxCommandEvent&);
+	void OnOSDMessagesCheckBoxChanged(wxCommandEvent&);
+	void OnInterfaceLanguageChoiceChanged(wxCommandEvent&);
+	void OnPauseOnFocusLostCheckBoxChanged(wxCommandEvent&);
+	void OnThemeSelected(wxCommandEvent&);
+
+	wxArrayString m_interface_lang_strings;
+
+	wxCheckBox* m_confirm_stop_checkbox;
+	wxCheckBox* m_panic_handlers_checkbox;
+	wxCheckBox* m_osd_messages_checkbox;
+	wxCheckBox* m_pause_focus_lost_checkbox;
+	wxChoice* m_interface_lang_choice;
+	wxChoice* m_theme_choice;
+};
diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp
new file mode 100644
index 0000000000..efde03d64d
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/PathConfigPane.cpp
@@ -0,0 +1,196 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/dirdlg.h>
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Common/FileUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "DiscIO/NANDContentLoader.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/ConfigMain.h"
+#include "DolphinWX/Config/PathConfigPane.h"
+
+PathConfigPane::PathConfigPane(wxWindow* panel, wxWindowID id)
+	: wxPanel(panel, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+	RefreshGUI();
+}
+
+void PathConfigPane::InitializeGUI()
+{
+	m_iso_paths_listbox = new wxListBox(this, wxID_ANY);
+	m_recursive_iso_paths_checkbox = new wxCheckBox(this, wxID_ANY, _("Search Subfolders"));
+	m_add_iso_path_button = new wxButton(this, wxID_ANY, _("Add..."));
+	m_remove_iso_path_button = new wxButton(this, wxID_ANY, _("Remove"));
+	m_remove_iso_path_button->Disable();
+
+	m_default_iso_filepicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose a default ISO:"),
+		_("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") + wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad|%s", wxGetTranslation(wxALL_FILES)),
+		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN);
+	m_dvd_root_dirpicker = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
+	m_apploader_path_filepicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"),
+		_("apploader (.img)") + wxString::Format("|*.img|%s", wxGetTranslation(wxALL_FILES)),
+		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN);
+	m_nand_root_dirpicker = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Choose a NAND root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
+
+	m_iso_paths_listbox->Bind(wxEVT_LISTBOX, &PathConfigPane::OnISOPathSelectionChanged, this);
+	m_recursive_iso_paths_checkbox->Bind(wxEVT_CHECKBOX, &PathConfigPane::OnRecursiveISOCheckBoxChanged, this);
+	m_add_iso_path_button->Bind(wxEVT_BUTTON, &PathConfigPane::OnAddISOPath, this);
+	m_remove_iso_path_button->Bind(wxEVT_BUTTON, &PathConfigPane::OnRemoveISOPath, this);
+	m_default_iso_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnDefaultISOChanged, this);
+	m_dvd_root_dirpicker->Bind(wxEVT_DIRPICKER_CHANGED, &PathConfigPane::OnDVDRootChanged, this);
+	m_apploader_path_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnApploaderPathChanged, this);
+	m_nand_root_dirpicker->Bind(wxEVT_DIRPICKER_CHANGED, &PathConfigPane::OnNANDRootChanged, this);
+
+	wxBoxSizer* const iso_button_sizer = new wxBoxSizer(wxHORIZONTAL);
+	iso_button_sizer->Add(m_recursive_iso_paths_checkbox, 0, wxALL | wxALIGN_CENTER);
+	iso_button_sizer->AddStretchSpacer();
+	iso_button_sizer->Add(m_add_iso_path_button, 0, wxALL);
+	iso_button_sizer->Add(m_remove_iso_path_button, 0, wxALL);
+
+	wxStaticBoxSizer* const iso_listbox_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("ISO Directories"));
+	iso_listbox_sizer->Add(m_iso_paths_listbox, 1, wxEXPAND | wxALL, 0);
+	iso_listbox_sizer->Add(iso_button_sizer, 0, wxEXPAND | wxALL, 5);
+
+	wxGridBagSizer* const picker_sizer = new wxGridBagSizer();
+	picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Default ISO:")),
+		wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	picker_sizer->Add(m_default_iso_filepicker, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND | wxALL, 5);
+	picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("DVD Root:")),
+		wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	picker_sizer->Add(m_dvd_root_dirpicker, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND | wxALL, 5);
+	picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Apploader:")),
+		wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	picker_sizer->Add(m_apploader_path_filepicker, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND | wxALL, 5);
+	picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Wii NAND Root:")),
+		wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	picker_sizer->Add(m_nand_root_dirpicker, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND | wxALL, 5);
+	picker_sizer->AddGrowableCol(1);
+
+	// Populate the Paths page
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(iso_listbox_sizer, 1, wxEXPAND | wxALL, 5);
+	main_sizer->Add(picker_sizer, 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_sizer);
+}
+
+void PathConfigPane::LoadGUIValues()
+{
+	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	m_recursive_iso_paths_checkbox->SetValue(SConfig::GetInstance().m_RecursiveISOFolder);
+	m_default_iso_filepicker->SetPath(StrToWxStr(startup_params.m_strDefaultISO));
+	m_dvd_root_dirpicker->SetPath(StrToWxStr(startup_params.m_strDVDRoot));
+	m_apploader_path_filepicker->SetPath(StrToWxStr(startup_params.m_strApploader));
+	m_nand_root_dirpicker->SetPath(StrToWxStr(SConfig::GetInstance().m_NANDPath));
+
+	// Update selected ISO paths
+	for (const std::string& folder : SConfig::GetInstance().m_ISOFolder)
+		m_iso_paths_listbox->Append(StrToWxStr(folder));
+}
+
+void PathConfigPane::RefreshGUI()
+{
+	if (Core::IsRunning())
+		Disable();
+}
+
+void PathConfigPane::OnISOPathSelectionChanged(wxCommandEvent& event)
+{
+	m_remove_iso_path_button->Enable(m_iso_paths_listbox->GetSelection() != wxNOT_FOUND);
+}
+
+void PathConfigPane::OnRecursiveISOCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_RecursiveISOFolder = m_recursive_iso_paths_checkbox->IsChecked();
+
+	AddPendingEvent(wxCommandEvent(wxDOLPHIN_CFG_REFRESH_LIST));
+}
+
+void PathConfigPane::OnAddISOPath(wxCommandEvent& event)
+{
+	wxDirDialog dialog(this, _("Choose a directory to add"), wxGetHomeDir(),
+		wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
+
+	if (dialog.ShowModal() == wxID_OK)
+	{
+		if (m_iso_paths_listbox->FindString(dialog.GetPath()) != wxNOT_FOUND)
+		{
+			WxUtils::ShowErrorDialog(_("The chosen directory is already in the list."));
+		}
+		else
+		{
+			AddPendingEvent(wxCommandEvent(wxDOLPHIN_CFG_REFRESH_LIST));
+			m_iso_paths_listbox->Append(dialog.GetPath());
+		}
+	}
+
+	SaveISOPathChanges();
+}
+
+void PathConfigPane::OnRemoveISOPath(wxCommandEvent& event)
+{
+	AddPendingEvent(wxCommandEvent(wxDOLPHIN_CFG_REFRESH_LIST));
+	m_iso_paths_listbox->Delete(m_iso_paths_listbox->GetSelection());
+
+	// This seems to not be activated on Windows when it should be. wxw bug?
+#ifdef _WIN32
+	OnISOPathSelectionChanged(wxCommandEvent());
+#endif
+
+	SaveISOPathChanges();
+}
+
+void PathConfigPane::OnDefaultISOChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = WxStrToStr(m_default_iso_filepicker->GetPath());
+}
+
+void PathConfigPane::OnDVDRootChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDVDRoot = WxStrToStr(m_dvd_root_dirpicker->GetPath());
+}
+
+void PathConfigPane::OnApploaderPathChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strApploader = WxStrToStr(m_apploader_path_filepicker->GetPath());
+}
+
+void PathConfigPane::OnNANDRootChanged(wxCommandEvent& event)
+{
+	std::string nand_path =
+		SConfig::GetInstance().m_NANDPath =
+		WxStrToStr(m_nand_root_dirpicker->GetPath());
+
+	File::SetUserPath(D_WIIROOT_IDX, nand_path);
+	m_nand_root_dirpicker->SetPath(StrToWxStr(nand_path));
+
+	SConfig::GetInstance().m_SYSCONF->UpdateLocation();
+
+	main_frame->UpdateWiiMenuChoice();
+}
+
+void PathConfigPane::SaveISOPathChanges()
+{
+	SConfig::GetInstance().m_ISOFolder.clear();
+
+	for (unsigned int i = 0; i < m_iso_paths_listbox->GetCount(); i++)
+		SConfig::GetInstance().m_ISOFolder.push_back(WxStrToStr(m_iso_paths_listbox->GetStrings()[i]));
+}
+
diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.h b/Source/Core/DolphinWX/Config/PathConfigPane.h
new file mode 100644
index 0000000000..3c46bcc206
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/PathConfigPane.h
@@ -0,0 +1,45 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+
+class wxButton;
+class wxCheckBox;
+class wxListBox;
+class wxDirPickerCtrl;
+class wxFilePickerCtrl;
+
+class PathConfigPane final : public wxPanel
+{
+public:
+	PathConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+	void RefreshGUI();
+
+	void OnISOPathSelectionChanged(wxCommandEvent&);
+	void OnRecursiveISOCheckBoxChanged(wxCommandEvent&);
+	void OnAddISOPath(wxCommandEvent&);
+	void OnRemoveISOPath(wxCommandEvent&);
+	void OnDefaultISOChanged(wxCommandEvent&);
+	void OnDVDRootChanged(wxCommandEvent&);
+	void OnApploaderPathChanged(wxCommandEvent&);
+	void OnNANDRootChanged(wxCommandEvent&);
+
+	void SaveISOPathChanges();
+
+	wxListBox* m_iso_paths_listbox;
+	wxCheckBox* m_recursive_iso_paths_checkbox;
+	wxButton* m_add_iso_path_button;
+	wxButton* m_remove_iso_path_button;
+
+	wxDirPickerCtrl* m_dvd_root_dirpicker;
+	wxDirPickerCtrl* m_nand_root_dirpicker;
+	wxFilePickerCtrl* m_default_iso_filepicker;
+	wxFilePickerCtrl* m_apploader_path_filepicker;
+};
diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp
new file mode 100644
index 0000000000..c4d1e1fbfd
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp
@@ -0,0 +1,173 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/gbsizer.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "DiscIO/Volume.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Config/WiiConfigPane.h"
+
+WiiConfigPane::WiiConfigPane(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id)
+{
+	InitializeGUI();
+	LoadGUIValues();
+	RefreshGUI();
+}
+
+void WiiConfigPane::InitializeGUI()
+{
+	m_aspect_ratio_strings.Add("4:3");
+	m_aspect_ratio_strings.Add("16:9");
+
+	m_system_language_strings.Add(_("Japanese"));
+	m_system_language_strings.Add(_("English"));
+	m_system_language_strings.Add(_("German"));
+	m_system_language_strings.Add(_("French"));
+	m_system_language_strings.Add(_("Spanish"));
+	m_system_language_strings.Add(_("Italian"));
+	m_system_language_strings.Add(_("Dutch"));
+	m_system_language_strings.Add(_("Simplified Chinese"));
+	m_system_language_strings.Add(_("Traditional Chinese"));
+	m_system_language_strings.Add(_("Korean"));
+
+	m_screensaver_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Screen Saver"));
+	m_pal60_mode_checkbox = new wxCheckBox(this, wxID_ANY, _("Use PAL60 Mode (EuRGB60)"));
+	m_aspect_ratio_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_aspect_ratio_strings);
+	m_system_language_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_system_language_strings);
+	m_sd_card_checkbox = new wxCheckBox(this, wxID_ANY, _("Insert SD Card"));
+	m_connect_keyboard_checkbox = new wxCheckBox(this, wxID_ANY, _("Connect USB Keyboard"));
+
+	m_screensaver_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnScreenSaverCheckBoxChanged, this);
+	m_pal60_mode_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnPAL60CheckBoxChanged, this);
+	m_aspect_ratio_choice->Bind(wxEVT_CHOICE, &WiiConfigPane::OnAspectRatioChoiceChanged, this);
+	m_system_language_choice->Bind(wxEVT_CHOICE, &WiiConfigPane::OnSystemLanguageChoiceChanged, this);
+	m_sd_card_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnSDCardCheckBoxChanged, this);
+	m_connect_keyboard_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnConnectKeyboardCheckBoxChanged, this);
+
+	m_screensaver_checkbox->SetToolTip(_("Dims the screen after five minutes of inactivity."));
+	m_pal60_mode_checkbox->SetToolTip(_("Sets the Wii display mode to 60Hz (480i) instead of 50Hz (576i) for PAL games.\nMay not work for all games."));
+	m_system_language_choice->SetToolTip(_("Sets the Wii system language."));
+	m_sd_card_checkbox->SetToolTip(_("Saved to /Wii/sd.raw (default size is 128mb)"));
+	m_connect_keyboard_checkbox->SetToolTip(_("May cause slow down in Wii Menu and some games."));
+
+	wxGridBagSizer* const misc_settings_grid_sizer = new wxGridBagSizer();
+	misc_settings_grid_sizer->Add(m_screensaver_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
+	misc_settings_grid_sizer->Add(m_pal60_mode_checkbox, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
+	misc_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Aspect Ratio:")), wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	misc_settings_grid_sizer->Add(m_aspect_ratio_choice, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5);
+	misc_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("System Language:")), wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	misc_settings_grid_sizer->Add(m_system_language_choice, wxGBPosition(3, 1), wxDefaultSpan, wxALL, 5);
+
+	wxStaticBoxSizer* const misc_settings_static_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Misc Settings"));
+	misc_settings_static_sizer->Add(misc_settings_grid_sizer);
+
+	wxStaticBoxSizer* const device_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Device Settings"));
+	device_settings_sizer->Add(m_sd_card_checkbox, 0, wxALL, 5);
+	device_settings_sizer->Add(m_connect_keyboard_checkbox, 0, wxALL, 5);
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+	main_sizer->Add(misc_settings_static_sizer, 0, wxEXPAND | wxALL, 5);
+	main_sizer->Add(device_settings_sizer, 0, wxEXPAND | wxALL, 5);
+
+	SetSizer(main_sizer);
+}
+
+void WiiConfigPane::LoadGUIValues()
+{
+	m_screensaver_checkbox->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.SSV"));
+	m_pal60_mode_checkbox->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"));
+	m_aspect_ratio_choice->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.AR"));
+	m_system_language_choice->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"));
+
+	m_sd_card_checkbox->SetValue(SConfig::GetInstance().m_WiiSDCard);
+	m_connect_keyboard_checkbox->SetValue(SConfig::GetInstance().m_WiiKeyboard);
+}
+
+void WiiConfigPane::RefreshGUI()
+{
+	if (Core::IsRunning())
+	{
+		m_screensaver_checkbox->Disable();
+		m_pal60_mode_checkbox->Disable();
+		m_aspect_ratio_choice->Disable();
+		m_system_language_choice->Disable();
+	}
+}
+
+void WiiConfigPane::OnScreenSaverCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", m_screensaver_checkbox->IsChecked());
+}
+
+void WiiConfigPane::OnPAL60CheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", m_pal60_mode_checkbox->IsChecked());
+}
+
+void WiiConfigPane::OnSDCardCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_WiiSDCard = m_sd_card_checkbox->IsChecked();
+	WII_IPC_HLE_Interface::SDIO_EventNotify();
+}
+
+void WiiConfigPane::OnConnectKeyboardCheckBoxChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_WiiKeyboard = m_connect_keyboard_checkbox->IsChecked();
+}
+
+void WiiConfigPane::OnSystemLanguageChoiceChanged(wxCommandEvent& event)
+{
+	DiscIO::IVolume::ELanguage wii_system_lang = (DiscIO::IVolume::ELanguage)m_system_language_choice->GetSelection();
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.LNG", wii_system_lang);
+	u8 country_code = GetSADRCountryCode(wii_system_lang);
+
+	if (!SConfig::GetInstance().m_SYSCONF->SetArrayData("IPL.SADR", &country_code, 1))
+		WxUtils::ShowErrorDialog(_("Failed to update country code in SYSCONF"));
+}
+
+void WiiConfigPane::OnAspectRatioChoiceChanged(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.AR", m_aspect_ratio_choice->GetSelection());
+}
+
+// Change from IPL.LNG value to IPL.SADR country code.
+// http://wiibrew.org/wiki/Country_Codes
+u8 WiiConfigPane::GetSADRCountryCode(DiscIO::IVolume::ELanguage language)
+{
+	switch (language)
+	{
+	case DiscIO::IVolume::LANGUAGE_JAPANESE:
+		return 1;   // Japan
+	case DiscIO::IVolume::LANGUAGE_ENGLISH:
+		return 49;  // USA
+	case DiscIO::IVolume::LANGUAGE_GERMAN:
+		return 78;  // Germany
+	case DiscIO::IVolume::LANGUAGE_FRENCH:
+		return 77;  // France
+	case DiscIO::IVolume::LANGUAGE_SPANISH:
+		return 105; // Spain
+	case DiscIO::IVolume::LANGUAGE_ITALIAN:
+		return 83;  // Italy
+	case DiscIO::IVolume::LANGUAGE_DUTCH:
+		return 94;  // Netherlands
+	case DiscIO::IVolume::LANGUAGE_SIMPLIFIED_CHINESE:
+	case DiscIO::IVolume::LANGUAGE_TRADITIONAL_CHINESE:
+		return 157; // China
+	case DiscIO::IVolume::LANGUAGE_KOREAN:
+		return 136; // Korea
+	case DiscIO::IVolume::LANGUAGE_UNKNOWN:
+		break;
+	}
+
+	PanicAlert("Invalid language. Defaulting to Japanese.");
+	return 1;
+}
diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.h b/Source/Core/DolphinWX/Config/WiiConfigPane.h
new file mode 100644
index 0000000000..2793f6629b
--- /dev/null
+++ b/Source/Core/DolphinWX/Config/WiiConfigPane.h
@@ -0,0 +1,43 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/arrstr.h>
+#include <wx/panel.h>
+#include "Common/CommonTypes.h"
+#include "DiscIO/Volume.h"
+
+class wxCheckBox;
+class wxChoice;
+
+class WiiConfigPane final : public wxPanel
+{
+public:
+	WiiConfigPane(wxWindow* parent, wxWindowID id);
+
+private:
+	void InitializeGUI();
+	void LoadGUIValues();
+	void RefreshGUI();
+
+	void OnScreenSaverCheckBoxChanged(wxCommandEvent&);
+	void OnPAL60CheckBoxChanged(wxCommandEvent&);
+	void OnSDCardCheckBoxChanged(wxCommandEvent&);
+	void OnConnectKeyboardCheckBoxChanged(wxCommandEvent&);
+	void OnSystemLanguageChoiceChanged(wxCommandEvent&);
+	void OnAspectRatioChoiceChanged(wxCommandEvent&);
+
+	static u8 GetSADRCountryCode(DiscIO::IVolume::ELanguage language);
+
+	wxArrayString m_system_language_strings;
+	wxArrayString m_aspect_ratio_strings;
+
+	wxCheckBox* m_screensaver_checkbox;
+	wxCheckBox* m_pal60_mode_checkbox;
+	wxCheckBox* m_sd_card_checkbox;
+	wxCheckBox* m_connect_keyboard_checkbox;
+	wxChoice* m_system_language_choice;
+	wxChoice* m_aspect_ratio_choice;
+};
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
new file mode 100644
index 0000000000..7514e6e091
--- /dev/null
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -0,0 +1,573 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <array>
+#include <map>
+#include <string>
+#include <utility>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/SysConf.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HotkeyManager.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/SI.h"
+#if defined(__LIBUSB__) || defined (_WIN32)
+#include "Core/HW/SI_GCAdapter.h"
+#endif
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "DolphinWX/ControllerConfigDiag.h"
+#include "DolphinWX/InputConfigDiag.h"
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#include "DolphinWX/X11Utils.h"
+#endif
+
+wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
+
+ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
+	: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
+{
+	m_gc_pad_type_strs = {
+		_("None"),
+		_("Standard Controller"),
+		_("Steering Wheel"),
+		_("Dance Mat"),
+		_("TaruKonga (Bongos)"),
+		_("GBA"),
+		_("Keyboard"),
+		_("AM-Baseboard")
+	};
+
+	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+
+	// Combine all UI controls into their own encompassing sizer.
+	wxBoxSizer* control_sizer = new wxBoxSizer(wxVERTICAL);
+	control_sizer->Add(CreateGamecubeSizer(), 0, wxEXPAND | wxALL, 5);
+	control_sizer->Add(CreateWiimoteConfigSizer(), 0, wxEXPAND | wxALL, 5);
+
+	main_sizer->Add(control_sizer, 0, wxEXPAND);
+	main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	Bind(wxEVT_BUTTON, &ControllerConfigDiag::Save, this, wxID_OK);
+	Bind(wxEVT_BUTTON, &ControllerConfigDiag::Cancel, this, wxID_CANCEL);
+
+	SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
+	SetSizerAndFit(main_sizer);
+	Center();
+	Bind(wxEVT_ADAPTER_UPDATE, &ControllerConfigDiag::UpdateAdapter, this);
+}
+
+wxStaticBoxSizer* ControllerConfigDiag::CreateGamecubeSizer()
+{
+	wxStaticBoxSizer* const gamecube_static_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("GameCube Controllers"));
+	wxFlexGridSizer* const gamecube_flex_sizer = new wxFlexGridSizer(3, 5, 5);
+
+	wxStaticText* pad_labels[4];
+	wxChoice* pad_type_choices[4];
+
+	for (int i = 0; i < 4; i++)
+	{
+		pad_labels[i] = new wxStaticText(this, wxID_ANY, wxString::Format(_("Port %i"), i + 1));
+
+		// Create an ID for the config button.
+		const wxWindowID button_id = wxWindow::NewControlId();
+		m_gc_port_config_ids.insert(std::make_pair(button_id, i));
+		gamecube_configure_bt[i] = new wxButton(this, button_id, _("Configure"), wxDefaultPosition, wxSize(100, 25));
+		gamecube_configure_bt[i]->Bind(wxEVT_BUTTON, &ControllerConfigDiag::OnGameCubeConfigButton, this);
+
+		// Create a control ID for the choice boxes on the fly.
+		const wxWindowID choice_id = wxWindow::NewControlId();
+		m_gc_port_choice_ids.insert(std::make_pair(choice_id, i));
+
+		// Only add AM-Baseboard to the first pad.
+		if (i == 0)
+			pad_type_choices[i] = new wxChoice(this, choice_id, wxDefaultPosition, wxDefaultSize, m_gc_pad_type_strs.size(), m_gc_pad_type_strs.data());
+		else
+			pad_type_choices[i] = new wxChoice(this, choice_id, wxDefaultPosition, wxDefaultSize, m_gc_pad_type_strs.size() - 1, m_gc_pad_type_strs.data());
+
+		pad_type_choices[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnGameCubePortChanged, this);
+
+		// Disable controller type selection for certain circumstances.
+		if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive())
+			pad_type_choices[i]->Disable();
+
+		// Set the saved pad type as the default choice.
+		switch (SConfig::GetInstance().m_SIDevice[i])
+		{
+		case SIDEVICE_GC_CONTROLLER:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[1]);
+			break;
+		case SIDEVICE_GC_STEERING:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[2]);
+			break;
+		case SIDEVICE_DANCEMAT:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[3]);
+			break;
+		case SIDEVICE_GC_TARUKONGA:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[4]);
+			break;
+		case SIDEVICE_GC_GBA:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[5]);
+			gamecube_configure_bt[i]->Disable();
+			break;
+		case SIDEVICE_GC_KEYBOARD:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[6]);
+			break;
+		case SIDEVICE_AM_BASEBOARD:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[7]);
+			break;
+		default:
+			pad_type_choices[i]->SetStringSelection(m_gc_pad_type_strs[0]);
+			gamecube_configure_bt[i]->Disable();
+			break;
+		}
+
+		// Add to the sizer
+		gamecube_flex_sizer->Add(pad_labels[i], 0, wxALIGN_CENTER_VERTICAL);
+		gamecube_flex_sizer->Add(pad_type_choices[i], 0, wxALIGN_CENTER_VERTICAL);
+		gamecube_flex_sizer->Add(gamecube_configure_bt[i], 1, wxEXPAND);
+	}
+
+	gamecube_static_sizer->Add(gamecube_flex_sizer, 1, wxEXPAND, 5);
+	gamecube_static_sizer->AddSpacer(5);
+
+	wxStaticBoxSizer* const gamecube_adapter_group = new wxStaticBoxSizer(wxVERTICAL, this, _("GameCube Adapter"));
+	wxBoxSizer* const gamecube_adapter_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+	wxCheckBox* const gamecube_adapter = new wxCheckBox(this, wxID_ANY, _("Direct Connect"));
+	gamecube_adapter->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnGameCubeAdapter, this);
+
+	wxCheckBox* const gamecube_rumble = new wxCheckBox(this, wxID_ANY, _("Rumble"));
+	gamecube_rumble->SetValue(SConfig::GetInstance().m_AdapterRumble);
+	gamecube_rumble->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnAdapterRumble, this);
+
+	m_adapter_status = new wxStaticText(this, wxID_ANY, _("Adapter Not Detected"));
+
+	gamecube_adapter_group->Add(m_adapter_status, 0, wxEXPAND);
+	gamecube_adapter_sizer->Add(gamecube_adapter, 0, wxEXPAND);
+	gamecube_adapter_sizer->Add(gamecube_rumble, 0, wxEXPAND);
+	gamecube_adapter_group->Add(gamecube_adapter_sizer, 0, wxEXPAND);
+	gamecube_static_sizer->Add(gamecube_adapter_group, 0, wxEXPAND);
+
+#if defined(__LIBUSB__) || defined (_WIN32)
+	gamecube_adapter->SetValue(SConfig::GetInstance().m_GameCubeAdapter);
+	if (!SI_GCAdapter::IsDetected())
+	{
+		if (!SI_GCAdapter::IsDriverDetected())
+		{
+			m_adapter_status->SetLabelText(_("Driver Not Detected"));
+			gamecube_adapter->Disable();
+			gamecube_adapter->SetValue(false);
+		}
+	}
+	else
+	{
+		m_adapter_status->SetLabelText(_("Adapter Detected"));
+	}
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		gamecube_adapter->Disable();
+	}
+	SI_GCAdapter::SetAdapterCallback(std::bind(&ControllerConfigDiag::ScheduleAdapterUpdate, this));
+#endif
+
+	return gamecube_static_sizer;
+}
+
+void ControllerConfigDiag::ScheduleAdapterUpdate()
+{
+	wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
+}
+
+void ControllerConfigDiag::UpdateAdapter(wxCommandEvent& ev)
+{
+#if defined(__LIBUSB__) || defined (_WIN32)
+	bool unpause = Core::PauseAndLock(true);
+	if (SI_GCAdapter::IsDetected())
+		m_adapter_status->SetLabelText(_("Adapter Detected"));
+	else
+		m_adapter_status->SetLabelText(_("Adapter Not Detected"));
+	Core::PauseAndLock(false, unpause);
+#endif
+}
+
+wxStaticBoxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer()
+{
+	wxStaticText* wiimote_label[4];
+	wxChoice* wiimote_source_ch[4];
+
+	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
+	{
+		wxString wiimote_str = wxString::Format(_("Wiimote %i"), i + 1);
+
+		static const std::array<wxString, 4> src_choices = {{
+			_("None"), _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote")
+		}};
+
+		// reserve four ids, so that we can calculate the index from the ids later on
+		// Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated..
+		int source_ctrl_id =  wxWindow::NewControlId();
+		m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, i));
+
+		int config_bt_id = wxWindow::NewControlId();
+		m_wiimote_index_from_conf_bt_id.insert(std::pair<wxWindowID, unsigned int>(config_bt_id, i));
+
+		wiimote_label[i] = new wxStaticText(this, wxID_ANY, wiimote_str);
+		wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, src_choices.size(), src_choices.data());
+		wiimote_source_ch[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::SelectSource, this);
+		wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure"));
+		wiimote_configure_bt[i]->Bind(wxEVT_BUTTON, &ControllerConfigDiag::ConfigEmulatedWiimote, this);
+
+		// Disable controller type selection for certain circumstances.
+		bool wii_game_started = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii || Core::GetState() == Core::CORE_UNINITIALIZED;
+		if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || !wii_game_started)
+			wiimote_source_ch[i]->Disable();
+
+		m_orig_wiimote_sources[i] = g_wiimote_sources[i];
+		wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]);
+		if (!wii_game_started || (m_orig_wiimote_sources[i] != WIIMOTE_SRC_EMU && m_orig_wiimote_sources[i] != WIIMOTE_SRC_HYBRID))
+			wiimote_configure_bt[i]->Disable();
+	}
+
+	// "Wiimotes" layout
+	wxStaticBoxSizer* const wiimote_group = new wxStaticBoxSizer(wxVERTICAL,this, _("Wiimotes"));
+	wxBoxSizer* const wiimote_control_section = new wxBoxSizer(wxHORIZONTAL);
+	wxFlexGridSizer* const wiimote_sizer = new wxFlexGridSizer(3, 5, 5);
+	for (unsigned int i = 0; i < 4; ++i)
+	{
+		wiimote_sizer->Add(wiimote_label[i], 0, wxALIGN_CENTER_VERTICAL);
+		wiimote_sizer->Add(wiimote_source_ch[i], 0, wxALIGN_CENTER_VERTICAL);
+		wiimote_sizer->Add(wiimote_configure_bt[i]);
+	}
+	wiimote_control_section->Add(wiimote_sizer, 1, wxEXPAND, 5 );
+
+	// Disable some controls when emulation is running
+	if (Core::GetState() != Core::CORE_UNINITIALIZED && NetPlay::IsNetPlayRunning())
+	{
+		for (int i = 0; i < 4; ++i)
+		{
+			wiimote_label[i]->Disable();
+			wiimote_source_ch[i]->Disable();
+		}
+	}
+
+	wiimote_group->Add(wiimote_control_section, 0, wxEXPAND | wxALL);
+	wiimote_group->AddSpacer(5);
+	wiimote_group->Add(CreateBalanceBoardSizer(), 0, wxEXPAND | wxALL);
+	wiimote_group->AddSpacer(5);
+	wiimote_group->Add(CreateRealWiimoteSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
+	wiimote_group->AddSpacer(5);
+	wiimote_group->Add(CreateGeneralWiimoteSettingsSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
+
+	return wiimote_group;
+}
+
+wxStaticBoxSizer* ControllerConfigDiag::CreateBalanceBoardSizer()
+{
+	wxStaticBoxSizer* const bb_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Balance Board"));
+	wxFlexGridSizer* const bb_sizer = new wxFlexGridSizer(1, 5, 5);
+	int source_ctrl_id =  wxWindow::NewControlId();
+
+	m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
+
+	static const std::array<wxString, 2> src_choices = {{
+		_("None"), _("Real Balance Board")
+	}};
+
+	wxChoice* const bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, src_choices.size(), src_choices.data());
+	bb_source->Bind(wxEVT_CHOICE, &ControllerConfigDiag::SelectSource, this);
+
+	m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] = g_wiimote_sources[WIIMOTE_BALANCE_BOARD];
+	bb_source->Select(m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] ? 1 : 0);
+
+	bb_sizer->Add(bb_source, 0, wxALIGN_CENTER_VERTICAL);
+
+	bb_group->Add(bb_sizer, 1, wxEXPAND, 5);
+
+	// Disable when emulation is running.
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+		bb_source->Disable();
+
+	return bb_group;
+}
+
+wxStaticBoxSizer* ControllerConfigDiag::CreateRealWiimoteSizer()
+{
+	// "Real wiimotes" controls
+	wxButton* const refresh_btn = new wxButton(this, wxID_ANY, _("Refresh"));
+	refresh_btn->Bind(wxEVT_BUTTON, &ControllerConfigDiag::RefreshRealWiimotes, this);
+
+	wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes"));
+	wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+	if (!WiimoteReal::g_wiimote_scanner.IsReady())
+		real_wiimotes_group->Add(new wxStaticText(this, wxID_ANY, _("A supported Bluetooth device could not be found.\n"
+		                                                            "You must manually connect your Wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
+
+	wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning"));
+	continuous_scanning->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnContinuousScanning, this);
+	continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning);
+
+	real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL);
+	real_wiimotes_sizer->AddStretchSpacer(1);
+	real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5);
+
+	real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND);
+
+	return real_wiimotes_group;
+}
+
+wxStaticBoxSizer* ControllerConfigDiag::CreateGeneralWiimoteSettingsSizer()
+{
+	const wxString str[] = { _("Bottom"), _("Top") };
+	wxChoice* const WiiSensBarPos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, str);
+	wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4);
+	wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127);
+	wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
+
+	auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data"));
+	wiimote_speaker->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnEnableSpeaker, this);
+	wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker);
+
+	wxStaticText* const WiiSensBarPosText = new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:"));
+	wxStaticText* const WiiSensBarSensText = new wxStaticText(this, wxID_ANY, _("IR Sensitivity:"));
+	wxStaticText* const WiiSensBarSensMinText = new wxStaticText(this, wxID_ANY, _("Min"));
+	wxStaticText* const WiiSensBarSensMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
+	wxStaticText* const WiimoteSpkVolumeText = new wxStaticText(this, wxID_ANY, _("Speaker Volume:"));
+	wxStaticText* const WiimoteSpkVolumeMinText = new wxStaticText(this, wxID_ANY, _("Min"));
+	wxStaticText* const WiimoteSpkVolumeMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
+
+	// With some GTK themes, no minimum size will be applied - so do this manually here
+	WiiSensBarSens->SetMinSize(wxSize(100,-1));
+	WiimoteSpkVolume->SetMinSize(wxSize(100,-1));
+
+	// Disable some controls when emulation is running
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		WiiSensBarPos->Disable();
+		WiiSensBarSens->Disable();
+		WiimoteSpkVolume->Disable();
+		WiimoteMotor->Disable();
+		WiiSensBarPosText->Disable();
+		WiiSensBarSensText->Disable();
+		WiiSensBarSensMinText->Disable();
+		WiiSensBarSensMaxText->Disable();
+		WiimoteSpkVolumeText->Disable();
+		WiimoteSpkVolumeMinText->Disable();
+		WiimoteSpkVolumeMaxText->Disable();
+	}
+
+	// "General Settings" initialization
+	WiiSensBarPos->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR"));
+	WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u32>("BT.SENS"));
+	WiimoteSpkVolume->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.SPKV"));
+	WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<bool>("BT.MOT"));
+
+	WiiSensBarPos->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnSensorBarPos, this);
+	WiiSensBarSens->Bind(wxEVT_SLIDER, &ControllerConfigDiag::OnSensorBarSensitivity, this);
+	WiimoteSpkVolume->Bind(wxEVT_SLIDER, &ControllerConfigDiag::OnSpeakerVolume, this);
+	WiimoteMotor->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnMotor, this);
+
+	// "General Settings" layout
+	wxStaticBoxSizer* const general_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("General Settings"));
+	wxFlexGridSizer* const choice_sizer = new wxFlexGridSizer(2, 5, 5);
+
+	wxBoxSizer* const sensbarsens_sizer = new wxBoxSizer(wxHORIZONTAL);
+	sensbarsens_sizer->Add(WiiSensBarSensMinText, 0, wxALIGN_CENTER_VERTICAL);
+	sensbarsens_sizer->Add(WiiSensBarSens);
+	sensbarsens_sizer->Add(WiiSensBarSensMaxText, 0, wxALIGN_CENTER_VERTICAL);
+
+	wxBoxSizer* const spkvol_sizer = new wxBoxSizer(wxHORIZONTAL);
+	spkvol_sizer->Add(WiimoteSpkVolumeMinText, 0, wxALIGN_CENTER_VERTICAL);
+	spkvol_sizer->Add(WiimoteSpkVolume);
+	spkvol_sizer->Add(WiimoteSpkVolumeMaxText, 0, wxALIGN_CENTER_VERTICAL);
+
+	choice_sizer->Add(WiiSensBarPosText, 0, wxALIGN_CENTER_VERTICAL);
+	choice_sizer->Add(WiiSensBarPos);
+	choice_sizer->Add(WiiSensBarSensText, 0, wxALIGN_CENTER_VERTICAL);
+	choice_sizer->Add(sensbarsens_sizer);
+	choice_sizer->Add(WiimoteSpkVolumeText, 0, wxALIGN_CENTER_VERTICAL);
+	choice_sizer->Add(spkvol_sizer);
+
+	wxGridSizer* const general_wiimote_sizer = new wxGridSizer(1, 5, 5);
+	general_wiimote_sizer->Add(WiimoteMotor);
+	general_wiimote_sizer->Add(wiimote_speaker, 0);
+
+	general_sizer->Add(choice_sizer);
+	general_sizer->Add(general_wiimote_sizer);
+
+	return general_sizer;
+}
+
+
+void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
+{
+	InputConfig* const wiimote_plugin = Wiimote::GetConfig();
+
+	HotkeyManagerEmu::Enable(false);
+
+	InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
+	m_ConfigFrame.ShowModal();
+
+	HotkeyManagerEmu::Enable(true);
+}
+
+void ControllerConfigDiag::RefreshRealWiimotes(wxCommandEvent&)
+{
+	WiimoteReal::Refresh();
+}
+
+void ControllerConfigDiag::SelectSource(wxCommandEvent& event)
+{
+	// This needs to be changed now in order for refresh to work right.
+	// Revert if the dialog is canceled.
+	int index = m_wiimote_index_from_ctrl_id[event.GetId()];
+
+	if (index != WIIMOTE_BALANCE_BOARD)
+	{
+		WiimoteReal::ChangeWiimoteSource(index, event.GetInt());
+		if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID)
+			wiimote_configure_bt[index]->Disable();
+		else
+			wiimote_configure_bt[index]->Enable();
+	}
+	else
+	{
+		WiimoteReal::ChangeWiimoteSource(index, event.GetInt() ? WIIMOTE_SRC_REAL : WIIMOTE_SRC_NONE);
+	}
+}
+
+void ControllerConfigDiag::RevertSource()
+{
+	for (int i = 0; i < MAX_BBMOTES; ++i)
+		g_wiimote_sources[i] = m_orig_wiimote_sources[i];
+}
+
+void ControllerConfigDiag::Save(wxCommandEvent& event)
+{
+	std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + WIIMOTE_INI_NAME ".ini";
+
+	IniFile inifile;
+	inifile.Load(ini_filename);
+
+	for (unsigned int i=0; i<MAX_WIIMOTES; ++i)
+	{
+		std::string secname("Wiimote");
+		secname += (char)('1' + i);
+		IniFile::Section& sec = *inifile.GetOrCreateSection(secname);
+
+		sec.Set("Source", (int)g_wiimote_sources[i]);
+	}
+
+	std::string secname("BalanceBoard");
+	IniFile::Section& sec = *inifile.GetOrCreateSection(secname);
+	sec.Set("Source", (int)g_wiimote_sources[WIIMOTE_BALANCE_BOARD]);
+
+	inifile.Save(ini_filename);
+
+	event.Skip();
+}
+
+void ControllerConfigDiag::Cancel(wxCommandEvent& event)
+{
+	RevertSource();
+	event.Skip();
+}
+
+void ControllerConfigDiag::OnGameCubePortChanged(wxCommandEvent& event)
+{
+	const unsigned int device_num = m_gc_port_choice_ids[event.GetId()];
+	const wxString device_name = event.GetString();
+
+	SIDevices tempType;
+	if (device_name == m_gc_pad_type_strs[1])
+	{
+		tempType = SIDEVICE_GC_CONTROLLER;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else if (device_name == m_gc_pad_type_strs[2])
+	{
+		tempType = SIDEVICE_GC_STEERING;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else if (device_name == m_gc_pad_type_strs[3])
+	{
+		tempType = SIDEVICE_DANCEMAT;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else if (device_name == m_gc_pad_type_strs[4])
+	{
+		tempType = SIDEVICE_GC_TARUKONGA;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else if (device_name == m_gc_pad_type_strs[5])
+	{
+		tempType = SIDEVICE_GC_GBA;
+		gamecube_configure_bt[device_num]->Disable();
+	}
+	else if (device_name == m_gc_pad_type_strs[6])
+	{
+		tempType = SIDEVICE_GC_KEYBOARD;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else if (device_name == m_gc_pad_type_strs[7])
+	{
+		tempType = SIDEVICE_AM_BASEBOARD;
+		gamecube_configure_bt[device_num]->Enable();
+	}
+	else
+	{
+		tempType = SIDEVICE_NONE;
+		gamecube_configure_bt[device_num]->Disable();
+	}
+
+	SConfig::GetInstance().m_SIDevice[device_num] = tempType;
+
+	if (Core::IsRunning())
+		SerialInterface::ChangeDevice(tempType, device_num);
+}
+
+void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event)
+{
+	InputConfig* const pad_plugin = Pad::GetConfig();
+	InputConfig* const key_plugin = Keyboard::GetConfig();
+	const int port_num = m_gc_port_config_ids[event.GetId()];
+
+	HotkeyManagerEmu::Enable(false);
+
+	if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD)
+	{
+		InputConfigDialog m_ConfigFrame(this, *key_plugin, _("GameCube Controller Configuration"), port_num);
+		m_ConfigFrame.ShowModal();
+	}
+	else
+	{
+		InputConfigDialog m_ConfigFrame(this, *pad_plugin, _("GameCube Controller Configuration"), port_num);
+		m_ConfigFrame.ShowModal();
+	}
+
+	HotkeyManagerEmu::Enable(true);
+}
+
+ControllerConfigDiag::~ControllerConfigDiag()
+{
+#if defined(__LIBUSB__) || defined (_WIN32)
+	SI_GCAdapter::SetAdapterCallback(nullptr);
+#endif
+}
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.h b/Source/Core/DolphinWX/ControllerConfigDiag.h
new file mode 100644
index 0000000000..5fa2c0f52e
--- /dev/null
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.h
@@ -0,0 +1,107 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <map>
+#include <wx/dialog.h>
+
+#include "Common/SysConf.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/SI_GCAdapter.h"
+#include "Core/HW/Wiimote.h"
+
+class InputConfig;
+class wxButton;
+class wxStaticBoxSizer;
+
+class ControllerConfigDiag : public wxDialog
+{
+public:
+	ControllerConfigDiag(wxWindow* const parent);
+	~ControllerConfigDiag();
+
+private:
+	void RefreshRealWiimotes(wxCommandEvent& event);
+
+	void ConfigEmulatedWiimote(wxCommandEvent& event);
+
+	void SelectSource(wxCommandEvent& event);
+	void RevertSource();
+
+	void Save(wxCommandEvent& event);
+
+	void OnSensorBarPos(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_SYSCONF->SetData("BT.BAR", event.GetInt());
+		event.Skip();
+	}
+
+	void OnSensorBarSensitivity(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_SYSCONF->SetData("BT.SENS", event.GetInt());
+		event.Skip();
+	}
+
+	void OnSpeakerVolume(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_SYSCONF->SetData("BT.SPKV", event.GetInt());
+		event.Skip();
+	}
+
+	void OnMotor(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_SYSCONF->SetData("BT.MOT", event.GetInt());
+		event.Skip();
+	}
+
+	void OnContinuousScanning(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked();
+		WiimoteReal::Initialize();
+		event.Skip();
+	}
+
+	void OnEnableSpeaker(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_WiimoteEnableSpeaker = event.IsChecked();
+		event.Skip();
+	}
+
+	void OnGameCubeAdapter(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_GameCubeAdapter = event.IsChecked();
+		event.Skip();
+	}
+	void OnAdapterRumble(wxCommandEvent& event)
+	{
+		SConfig::GetInstance().m_AdapterRumble = event.IsChecked();
+	}
+
+
+	wxStaticBoxSizer* CreateGamecubeSizer();
+	wxStaticBoxSizer* CreateWiimoteConfigSizer();
+	wxStaticBoxSizer* CreateBalanceBoardSizer();
+	wxStaticBoxSizer* CreateRealWiimoteSizer();
+	wxStaticBoxSizer* CreateGeneralWiimoteSettingsSizer();
+
+	void Cancel(wxCommandEvent& event);
+	void OnGameCubePortChanged(wxCommandEvent& event);
+	void OnGameCubeConfigButton(wxCommandEvent& event);
+	void ScheduleAdapterUpdate();
+	void UpdateAdapter(wxCommandEvent& ev);
+
+	std::map<wxWindowID, unsigned int> m_gc_port_choice_ids;
+	std::map<wxWindowID, unsigned int> m_gc_port_config_ids;
+	std::array<wxString, 8> m_gc_pad_type_strs;
+
+	std::map<wxWindowID, unsigned int> m_wiimote_index_from_ctrl_id;
+	unsigned int m_orig_wiimote_sources[MAX_BBMOTES];
+
+	wxStaticText* m_adapter_status;
+	wxButton* wiimote_configure_bt[MAX_WIIMOTES];
+	wxButton* gamecube_configure_bt[4];
+	std::map<wxWindowID, unsigned int> m_wiimote_index_from_conf_bt_id;
+};
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
new file mode 100644
index 0000000000..bbef9f6a06
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
@@ -0,0 +1,51 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <wx/dialog.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointDlg.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+
+BreakPointDlg::BreakPointDlg(CBreakPointWindow *_Parent)
+	: wxDialog(_Parent, wxID_ANY, _("Add Breakpoint"))
+	, Parent(_Parent)
+{
+	Bind(wxEVT_BUTTON, &BreakPointDlg::OnOK, this, wxID_OK);
+
+	m_pEditAddress = new wxTextCtrl(this, wxID_ANY, "80000000");
+
+	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
+	sMainSizer->Add(m_pEditAddress, 0, wxEXPAND | wxALL, 5);
+	sMainSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxALL, 5);
+
+	SetSizerAndFit(sMainSizer);
+	SetFocus();
+}
+
+void BreakPointDlg::OnOK(wxCommandEvent& event)
+{
+	wxString AddressString = m_pEditAddress->GetLineText(0);
+	u32 Address = 0;
+	if (AsciiToHex(WxStrToStr(AddressString), Address))
+	{
+		PowerPC::breakpoints.Add(Address);
+		Parent->NotifyUpdate();
+		Close();
+	}
+	else
+	{
+		WxUtils::ShowErrorDialog(wxString::Format(_("The address %s is invalid."), WxStrToStr(AddressString).c_str()));
+	}
+
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.h b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h
new file mode 100644
index 0000000000..6ea0b1450a
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h
@@ -0,0 +1,22 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+class CBreakPointWindow;
+class wxTextCtrl;
+
+class BreakPointDlg : public wxDialog
+{
+public:
+	BreakPointDlg(CBreakPointWindow *_Parent);
+
+private:
+	CBreakPointWindow *Parent;
+	wxTextCtrl *m_pEditAddress;
+
+	void OnOK(wxCommandEvent& event);
+};
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp
new file mode 100644
index 0000000000..07908b6cf0
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp
@@ -0,0 +1,101 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdio>
+
+#include <wx/listctrl.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointView.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
+CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id)
+	: wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize,
+			wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING)
+{
+	SetFont(DebuggerFont);
+	Refresh();
+}
+
+void CBreakPointView::Update()
+{
+	ClearAll();
+
+	InsertColumn(0, _("Active"));
+	InsertColumn(1, _("Type"));
+	InsertColumn(2, _("Function"));
+	InsertColumn(3, _("Address"));
+	InsertColumn(4, _("Flags"));
+
+	const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();
+	for (const auto& rBP : rBreakPoints)
+	{
+		if (!rBP.bTemporary)
+		{
+			wxString breakpoint_enabled_str = StrToWxStr(rBP.bOn ? "on" : " ");
+			int item = InsertItem(0, breakpoint_enabled_str);
+			SetItem(item, 1, StrToWxStr("BP"));
+
+			Symbol *symbol = g_symbolDB.GetSymbolFromAddr(rBP.iAddress);
+			if (symbol)
+			{
+				wxString symbol_description = StrToWxStr(g_symbolDB.GetDescription(rBP.iAddress));
+				SetItem(item, 2, symbol_description);
+			}
+
+			std::string address = StringFromFormat("%08x", rBP.iAddress);
+			SetItem(item, 3, StrToWxStr(address));
+
+			SetItemData(item, rBP.iAddress);
+		}
+	}
+
+	const MemChecks::TMemChecks& rMemChecks = PowerPC::memchecks.GetMemChecks();
+	for (const auto& rMemCheck : rMemChecks)
+	{
+		wxString memcheck_on_str = StrToWxStr((rMemCheck.Break || rMemCheck.Log) ? "on" : " ");
+		int item = InsertItem(0, memcheck_on_str);
+		SetItem(item, 1, StrToWxStr("MC"));
+
+		Symbol *symbol = g_symbolDB.GetSymbolFromAddr(rMemCheck.StartAddress);
+		if (symbol)
+		{
+			wxString memcheck_start_addr = StrToWxStr(g_symbolDB.GetDescription(rMemCheck.StartAddress));
+			SetItem(item, 2, memcheck_start_addr);
+		}
+
+		std::string address_range_str = StringFromFormat("%08x to %08x", rMemCheck.StartAddress, rMemCheck.EndAddress);
+		SetItem(item, 3, StrToWxStr(address_range_str));
+
+		std::string mode;
+		if (rMemCheck.OnRead)
+			mode += 'r';
+		if (rMemCheck.OnWrite)
+			mode += 'w';
+
+		SetItem(item, 4, StrToWxStr(mode));
+
+		SetItemData(item, rMemCheck.StartAddress);
+	}
+
+	Refresh();
+}
+
+void CBreakPointView::DeleteCurrentSelection()
+{
+	int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (item >= 0)
+	{
+		u32 Address = (u32)GetItemData(item);
+		PowerPC::breakpoints.Remove(Address);
+		PowerPC::memchecks.Remove(Address);
+		Update();
+	}
+}
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Debugger/BreakpointView.h
new file mode 100644
index 0000000000..380855c5cd
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointView.h
@@ -0,0 +1,16 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/listctrl.h>
+
+class CBreakPointView : public wxListCtrl
+{
+public:
+	CBreakPointView(wxWindow* parent, const wxWindowID id);
+
+	void Update() override;
+	void DeleteCurrentSelection();
+};
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
new file mode 100644
index 0000000000..d83e473abe
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
@@ -0,0 +1,210 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/listbase.h>
+#include <wx/panel.h>
+#include <wx/aui/auibar.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointDlg.h"
+#include "DolphinWX/Debugger/BreakpointView.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/MemoryCheckDlg.h"
+
+extern "C" {
+#include "DolphinWX/resources/toolbar_add_breakpoint.c"
+#include "DolphinWX/resources/toolbar_add_memorycheck.c"
+#include "DolphinWX/resources/toolbar_debugger_delete.c"
+}
+
+class CBreakPointBar : public wxAuiToolBar
+{
+public:
+	CBreakPointBar(CBreakPointWindow* parent, const wxWindowID id)
+		: wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize,
+				wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT)
+	{
+		SetToolBitmapSize(wxSize(24, 24));
+
+		m_Bitmaps[Toolbar_Delete] = wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(16, 16));
+		m_Bitmaps[Toolbar_Add_BP] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(16, 16));
+		m_Bitmaps[Toolbar_Add_MC] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(16, 16));
+
+		AddTool(ID_DELETE, _("Delete"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnDelete, parent, ID_DELETE);
+
+		AddTool(ID_CLEAR, _("Clear"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnClear, parent, ID_CLEAR);
+
+		AddTool(ID_ADDBP, "+BP", m_Bitmaps[Toolbar_Add_BP]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP);
+
+		// Add memory breakpoints if you can use them
+		if (Memory::AreMemoryBreakpointsActivated())
+		{
+			AddTool(ID_ADDMC, "+MC", m_Bitmaps[Toolbar_Add_MC]);
+			Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC);
+		}
+
+		AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::Event_LoadAll, parent, ID_LOAD);
+
+		AddTool(ID_SAVE, _("Save"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE);
+	}
+
+private:
+
+	enum
+	{
+		Toolbar_Delete,
+		Toolbar_Add_BP,
+		Toolbar_Add_MC,
+		Num_Bitmaps
+	};
+
+	enum
+	{
+		ID_DELETE = 2000,
+		ID_CLEAR,
+		ID_ADDBP,
+		ID_ADDMC,
+		ID_LOAD,
+		ID_SAVE
+	};
+
+	wxBitmap m_Bitmaps[Num_Bitmaps];
+};
+
+CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent,
+	    wxWindowID id, const wxString& title, const wxPoint& position,
+	    const wxSize& size, long style)
+	: wxPanel(parent, id, position, size, style, title)
+	, m_pCodeWindow(_pCodeWindow)
+{
+	Bind(wxEVT_CLOSE_WINDOW, &CBreakPointWindow::OnClose, this);
+
+	m_mgr.SetManagedWindow(this);
+	m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+
+	m_BreakPointListView = new CBreakPointView(this, wxID_ANY);
+	m_BreakPointListView->Bind(wxEVT_LIST_ITEM_SELECTED, &CBreakPointWindow::OnSelectBP, this);
+
+	m_mgr.AddPane(new CBreakPointBar(this, wxID_ANY), wxAuiPaneInfo().ToolbarPane().Top().
+	              LeftDockable(true).RightDockable(true).BottomDockable(false).Floatable(false));
+	m_mgr.AddPane(m_BreakPointListView, wxAuiPaneInfo().CenterPane());
+	m_mgr.Update();
+}
+
+CBreakPointWindow::~CBreakPointWindow()
+{
+	m_mgr.UnInit();
+}
+
+void CBreakPointWindow::OnClose(wxCloseEvent& event)
+{
+	SaveAll();
+	event.Skip();
+}
+
+void CBreakPointWindow::NotifyUpdate()
+{
+	m_BreakPointListView->Update();
+}
+
+void CBreakPointWindow::OnDelete(wxCommandEvent& WXUNUSED(event))
+{
+	m_BreakPointListView->DeleteCurrentSelection();
+}
+
+// jump to begin addr
+void CBreakPointWindow::OnSelectBP(wxListEvent& event)
+{
+	long Index = event.GetIndex();
+	if (Index >= 0)
+	{
+		u32 Address = (u32)m_BreakPointListView->GetItemData(Index);
+		if (m_pCodeWindow)
+			m_pCodeWindow->JumpToAddress(Address);
+	}
+}
+
+// Clear all breakpoints and memchecks
+void CBreakPointWindow::OnClear(wxCommandEvent& WXUNUSED(event))
+{
+	PowerPC::debug_interface.ClearAllBreakpoints();
+	PowerPC::debug_interface.ClearAllMemChecks();
+
+	NotifyUpdate();
+}
+
+void CBreakPointWindow::OnAddBreakPoint(wxCommandEvent& WXUNUSED(event))
+{
+	BreakPointDlg bpDlg(this);
+	bpDlg.ShowModal();
+}
+
+void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event))
+{
+	MemoryCheckDlg memDlg(this);
+	memDlg.ShowModal();
+}
+
+void CBreakPointWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
+{
+	SaveAll();
+}
+
+void CBreakPointWindow::SaveAll()
+{
+	// simply dump all to bp/mc files in a way we can read again
+	IniFile ini;
+	ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", false);
+	ini.SetLines("BreakPoints", PowerPC::breakpoints.GetStrings());
+	ini.SetLines("MemoryChecks", PowerPC::memchecks.GetStrings());
+	ini.Save(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
+}
+
+void CBreakPointWindow::Event_LoadAll(wxCommandEvent& WXUNUSED(event))
+{
+	LoadAll();
+	return;
+}
+
+void CBreakPointWindow::LoadAll()
+{
+	IniFile ini;
+	BreakPoints::TBreakPointsStr newbps;
+	MemChecks::TMemChecksStr newmcs;
+
+	if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", false))
+	{
+		return;
+	}
+
+	if (ini.GetLines("BreakPoints", &newbps, false))
+	{
+		PowerPC::breakpoints.Clear();
+		PowerPC::breakpoints.AddFromStrings(newbps);
+	}
+
+	if (ini.GetLines("MemoryChecks", &newmcs, false))
+	{
+		PowerPC::memchecks.Clear();
+		PowerPC::memchecks.AddFromStrings(newmcs);
+	}
+
+	NotifyUpdate();
+}
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h
new file mode 100644
index 0000000000..cfdbe6ef80
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h
@@ -0,0 +1,45 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+#include <wx/aui/framemanager.h>
+
+class CBreakPointView;
+class CCodeWindow;
+class wxListEvent;
+
+class CBreakPointWindow : public wxPanel
+{
+public:
+
+	CBreakPointWindow(CCodeWindow* _pCodeWindow,
+		wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxString& title = _("Breakpoints"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxTAB_TRAVERSAL | wxBORDER_NONE);
+	~CBreakPointWindow();
+
+	void NotifyUpdate();
+
+	void OnDelete(wxCommandEvent& WXUNUSED(event));
+	void OnClear(wxCommandEvent& WXUNUSED(event));
+	void OnAddBreakPoint(wxCommandEvent& WXUNUSED(event));
+	void OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event));
+	void Event_SaveAll(wxCommandEvent& WXUNUSED(event));
+	void SaveAll();
+	void Event_LoadAll(wxCommandEvent& WXUNUSED(event));
+	void LoadAll();
+
+private:
+	wxAuiManager m_mgr;
+	CBreakPointView* m_BreakPointListView;
+	CCodeWindow* m_pCodeWindow;
+
+	void OnClose(wxCloseEvent& event);
+	void OnSelectBP(wxListEvent& event);
+};
diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp
new file mode 100644
index 0000000000..4ec232ee89
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp
@@ -0,0 +1,600 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <vector>
+#include <wx/brush.h>
+#include <wx/clipbrd.h>
+#include <wx/colour.h>
+#include <wx/dataobj.h>
+#include <wx/dcclient.h>
+#include <wx/graphics.h>
+#include <wx/menu.h>
+#include <wx/pen.h>
+#include <wx/textdlg.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/DebugInterface.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
+wxDEFINE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
+
+enum
+{
+	IDM_GOTOINMEMVIEW = 12000,
+	IDM_COPYADDRESS,
+	IDM_COPYHEX,
+	IDM_COPYCODE,
+	IDM_INSERTBLR, IDM_INSERTNOP,
+	IDM_RUNTOHERE,
+	IDM_JITRESULTS,
+	IDM_FOLLOWBRANCH,
+	IDM_RENAMESYMBOL,
+	IDM_PATCHALERT,
+	IDM_COPYFUNCTION,
+	IDM_ADDFUNCTION,
+};
+
+CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb,
+		wxWindow* parent, wxWindowID Id)
+	: wxControl(parent, Id),
+	  m_debugger(debuginterface),
+	  m_symbol_db(symboldb),
+	  m_plain(false),
+	  m_curAddress(debuginterface->GetPC()),
+	  m_align(debuginterface->GetInstructionSize(0)),
+	  m_rowHeight(13),
+	  m_selection(0),
+	  m_oldSelection(0),
+	  m_selecting(false),
+	  m_lx(-1),
+	  m_ly(-1)
+{
+	Bind(wxEVT_ERASE_BACKGROUND, &CCodeView::OnErase, this);
+	Bind(wxEVT_PAINT, &CCodeView::OnPaint, this);
+	Bind(wxEVT_MOUSEWHEEL, &CCodeView::OnScrollWheel, this);
+	Bind(wxEVT_LEFT_DOWN, &CCodeView::OnMouseDown, this);
+	Bind(wxEVT_LEFT_UP, &CCodeView::OnMouseUpL, this);
+	Bind(wxEVT_MOTION, &CCodeView::OnMouseMove, this);
+	Bind(wxEVT_RIGHT_DOWN, &CCodeView::OnMouseDown, this);
+	Bind(wxEVT_RIGHT_UP, &CCodeView::OnMouseUpR, this);
+	Bind(wxEVT_MENU, &CCodeView::OnPopupMenu, this);
+	Bind(wxEVT_SIZE, &CCodeView::OnResize, this);
+}
+
+int CCodeView::YToAddress(int y)
+{
+	wxRect rc = GetClientRect();
+	int ydiff = y - rc.height / 2 - m_rowHeight / 2;
+	ydiff = (int)(floorf((float)ydiff / (float)m_rowHeight)) + 1;
+	return m_curAddress + ydiff * m_align;
+}
+
+void CCodeView::OnMouseDown(wxMouseEvent& event)
+{
+	int x = event.m_x;
+	int y = event.m_y;
+
+	if (x > 16)
+	{
+		m_oldSelection = m_selection;
+		m_selection = YToAddress(y);
+		// SetCapture(wnd);
+		bool oldselecting = m_selecting;
+		m_selecting = true;
+
+		if (!oldselecting || (m_selection != m_oldSelection))
+			Refresh();
+	}
+	else
+	{
+		ToggleBreakpoint(YToAddress(y));
+	}
+
+	event.Skip();
+}
+
+void CCodeView::OnScrollWheel(wxMouseEvent& event)
+{
+	const bool scroll_down = (event.GetWheelRotation() < 0);
+	const int num_lines = event.GetLinesPerAction();
+
+	if (scroll_down)
+	{
+		m_curAddress += num_lines * 4;
+	}
+	else
+	{
+		m_curAddress -= num_lines * 4;
+	}
+
+	Refresh();
+	event.Skip();
+}
+
+void CCodeView::ToggleBreakpoint(u32 address)
+{
+	m_debugger->ToggleBreakpoint(address);
+	Refresh();
+
+	// Propagate back to the parent window to update the breakpoint list.
+	wxCommandEvent evt(wxEVT_HOST_COMMAND, IDM_UPDATE_BREAKPOINTS);
+	GetEventHandler()->AddPendingEvent(evt);
+}
+
+void CCodeView::OnMouseMove(wxMouseEvent& event)
+{
+	wxRect rc = GetClientRect();
+
+	if (event.m_leftDown && event.m_x > 16)
+	{
+		if (event.m_y < 0)
+		{
+			m_curAddress -= m_align;
+			Refresh();
+		}
+		else if (event.m_y > rc.height)
+		{
+			m_curAddress += m_align;
+			Refresh();
+		}
+		else
+		{
+			OnMouseDown(event);
+		}
+	}
+
+	event.Skip();
+}
+
+void CCodeView::RaiseEvent()
+{
+	wxCommandEvent ev(wxEVT_CODEVIEW_CHANGE, GetId());
+	ev.SetEventObject(this);
+	ev.SetInt(m_selection);
+	GetEventHandler()->ProcessEvent(ev);
+}
+
+void CCodeView::OnMouseUpL(wxMouseEvent& event)
+{
+	if (event.m_x > 16)
+	{
+		m_curAddress = YToAddress(event.m_y);
+		m_selecting = false;
+		Refresh();
+	}
+
+	RaiseEvent();
+	event.Skip();
+}
+
+u32 CCodeView::AddrToBranch(u32 addr)
+{
+	std::string disasm = m_debugger->Disassemble(addr);
+	size_t pos = disasm.find("->0x");
+
+	if (pos != std::string::npos)
+	{
+		std::string hex = disasm.substr(pos + 2);
+		return std::stoul(hex, nullptr, 16);
+	}
+
+	return 0;
+}
+
+void CCodeView::InsertBlrNop(int Blr)
+{
+	// Check if this address has been modified
+	int find = -1;
+	for (u32 i = 0; i < m_blrList.size(); i++)
+	{
+		if (m_blrList.at(i).address == m_selection)
+		{
+			find = i;
+			break;
+		}
+	}
+
+	// Save the old value
+	if (find >= 0)
+	{
+		m_debugger->WriteExtraMemory(0, m_blrList.at(find).oldValue, m_selection);
+		m_blrList.erase(m_blrList.begin() + find);
+	}
+	else
+	{
+		BlrStruct temp;
+		temp.address = m_selection;
+		temp.oldValue = m_debugger->ReadMemory(m_selection);
+		m_blrList.push_back(temp);
+		if (Blr == 0)
+			m_debugger->InsertBLR(m_selection, 0x4e800020);
+		else
+			m_debugger->InsertBLR(m_selection, 0x60000000);
+	}
+	Refresh();
+}
+
+void CCodeView::OnPopupMenu(wxCommandEvent& event)
+{
+#if wxUSE_CLIPBOARD
+	wxTheClipboard->Open();
+#endif
+
+	switch (event.GetId())
+	{
+		case IDM_GOTOINMEMVIEW:
+			// CMemoryDlg::Goto(selection);
+			break;
+
+#if wxUSE_CLIPBOARD
+		case IDM_COPYADDRESS:
+			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format("%08x", m_selection)));
+			break;
+
+		case IDM_COPYCODE:
+			{
+				std::string disasm = m_debugger->Disassemble(m_selection);
+				wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(disasm)));
+			}
+			break;
+
+		case IDM_COPYHEX:
+			{
+				std::string temp = StringFromFormat("%08x", m_debugger->ReadInstruction(m_selection));
+				wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
+			}
+			break;
+
+
+		case IDM_COPYFUNCTION:
+			{
+				Symbol *symbol = m_symbol_db->GetSymbolFromAddr(m_selection);
+				if (symbol)
+				{
+					std::string text;
+					text = text + symbol->name + "\r\n";
+					// we got a function
+					u32 start = symbol->address;
+					u32 end = start + symbol->size;
+					for (u32 addr = start; addr != end; addr += 4)
+					{
+						std::string disasm = m_debugger->Disassemble(addr);
+						text += StringFromFormat("%08x: ", addr) + disasm + "\r\n";
+					}
+					wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(text)));
+				}
+			}
+			break;
+#endif
+
+		case IDM_RUNTOHERE:
+			m_debugger->SetBreakpoint(m_selection);
+			m_debugger->RunToBreakpoint();
+			Refresh();
+			break;
+
+		// Insert blr or restore old value
+		case IDM_INSERTBLR:
+			InsertBlrNop(0);
+			Refresh();
+			break;
+		case IDM_INSERTNOP:
+			InsertBlrNop(1);
+			Refresh();
+			break;
+
+		case IDM_JITRESULTS:
+			{
+				// Propagate back to the parent window and tell it
+				// to flip to the JIT tab for the current address.
+				wxCommandEvent jit_event(wxEVT_HOST_COMMAND, IDM_UPDATE_JIT_PANE);
+				GetEventHandler()->AddPendingEvent(jit_event);
+			}
+			break;
+
+		case IDM_FOLLOWBRANCH:
+			{
+				u32 dest = AddrToBranch(m_selection);
+				if (dest)
+				{
+					Center(dest);
+					RaiseEvent();
+				}
+			}
+			break;
+
+		case IDM_ADDFUNCTION:
+			m_symbol_db->AddFunction(m_selection);
+			Host_NotifyMapLoaded();
+			break;
+
+		case IDM_RENAMESYMBOL:
+			{
+				Symbol *symbol = m_symbol_db->GetSymbolFromAddr(m_selection);
+				if (symbol)
+				{
+					wxTextEntryDialog input_symbol(this, _("Rename symbol:"),
+							wxGetTextFromUserPromptStr,
+							StrToWxStr(symbol->name));
+					if (input_symbol.ShowModal() == wxID_OK)
+					{
+						symbol->name = WxStrToStr(input_symbol.GetValue());
+						Refresh(); // Redraw to show the renamed symbol
+					}
+					Host_NotifyMapLoaded();
+				}
+			}
+			break;
+
+		case IDM_PATCHALERT:
+			break;
+	}
+
+#if wxUSE_CLIPBOARD
+	wxTheClipboard->Close();
+#endif
+	event.Skip();
+}
+
+void CCodeView::OnMouseUpR(wxMouseEvent& event)
+{
+	bool isSymbol = m_symbol_db->GetSymbolFromAddr(m_selection) != nullptr;
+	// popup menu
+	wxMenu menu;
+	//menu->Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
+	menu.Append(IDM_FOLLOWBRANCH, _("&Follow branch"))->Enable(AddrToBranch(m_selection) ? true : false);
+	menu.AppendSeparator();
+#if wxUSE_CLIPBOARD
+	menu.Append(IDM_COPYADDRESS, _("Copy &address"));
+	menu.Append(IDM_COPYFUNCTION, _("Copy &function"))->Enable(isSymbol);
+	menu.Append(IDM_COPYCODE, _("Copy &code line"));
+	menu.Append(IDM_COPYHEX, _("Copy &hex"));
+	menu.AppendSeparator();
+#endif
+	menu.Append(IDM_RENAMESYMBOL, _("Rename &symbol"))->Enable(isSymbol);
+	menu.AppendSeparator();
+	menu.Append(IDM_RUNTOHERE, _("&Run To Here"))->Enable(Core::IsRunning());
+	menu.Append(IDM_ADDFUNCTION, _("&Add function"))->Enable(Core::IsRunning());
+	menu.Append(IDM_JITRESULTS, _("PPC vs X86"))->Enable(Core::IsRunning());
+	menu.Append(IDM_INSERTBLR, _("Insert &blr"))->Enable(Core::IsRunning());
+	menu.Append(IDM_INSERTNOP, _("Insert &nop"))->Enable(Core::IsRunning());
+	menu.Append(IDM_PATCHALERT, _("Patch alert"))->Enable(Core::IsRunning());
+	PopupMenu(&menu);
+	event.Skip();
+}
+
+void CCodeView::OnErase(wxEraseEvent& event)
+{}
+
+void CCodeView::OnPaint(wxPaintEvent& event)
+{
+	// -------------------------
+	// General settings
+	// -------------------------
+	std::unique_ptr<wxGraphicsContext> ctx(wxGraphicsContext::Create(wxPaintDC(this)));
+	wxRect rc = GetClientRect();
+
+	ctx->SetFont(DebuggerFont, *wxBLACK);
+
+	wxDouble w,h;
+	ctx->GetTextExtent("0WJyq", &w, &h);
+
+	if (h > m_rowHeight)
+		m_rowHeight = h;
+
+	ctx->GetTextExtent("W", &w, &h);
+	int charWidth = w;
+
+	struct branch
+	{
+		int src, dst, srcAddr;
+	};
+
+	branch branches[256];
+	int numBranches = 0;
+	// TODO: Add any drawing code here...
+	int width   = rc.width;
+	int numRows = ((rc.height / m_rowHeight) / 2) + 2;
+	// ------------
+
+	// -------------------------
+	// Colors and brushes
+	// -------------------------
+
+	const wxColour bgColor = *wxWHITE;
+	wxPen nullPen(bgColor);
+	wxPen currentPen(*wxBLACK_PEN);
+	wxPen selPen(*wxGREY_PEN);
+	nullPen.SetStyle(wxTRANSPARENT);
+	currentPen.SetStyle(wxSOLID);
+	wxBrush currentBrush(*wxLIGHT_GREY_BRUSH);
+	wxBrush pcBrush(*wxGREEN_BRUSH);
+	wxBrush bpBrush(*wxRED_BRUSH);
+
+	wxBrush bgBrush(bgColor);
+	wxBrush nullBrush(bgColor);
+	nullBrush.SetStyle(wxTRANSPARENT);
+
+	ctx->SetPen(nullPen);
+	ctx->SetBrush(bgBrush);
+	ctx->DrawRectangle(0, 0, 16, rc.height);
+	ctx->DrawRectangle(0, 0, rc.width, 5);
+	// ------------
+
+	// -----------------------------
+	// Walk through all visible rows
+	// -----------------------------
+	for (int i = -numRows; i <= numRows; i++)
+	{
+		unsigned int address = m_curAddress + (i * m_align);
+
+		int rowY1 = (rc.height / 2) + (m_rowHeight * i) - (m_rowHeight / 2);
+		int rowY2 = (rc.height / 2) + (m_rowHeight * i) + (m_rowHeight / 2);
+
+		wxString temp = wxString::Format("%08x", address);
+		u32 color = m_debugger->GetColor(address);
+		wxBrush rowBrush(wxColour(color >> 16, color >> 8, color));
+		ctx->SetBrush(nullBrush);
+		ctx->SetPen(nullPen);
+		ctx->DrawRectangle(0, rowY1, 16, rowY2 - rowY1 + 2);
+
+		if (m_selecting && (address == m_selection))
+			ctx->SetPen(selPen);
+		else
+			ctx->SetPen(i == 0 ? currentPen : nullPen);
+
+		if (address == m_debugger->GetPC())
+			ctx->SetBrush(pcBrush);
+		else
+			ctx->SetBrush(rowBrush);
+
+		ctx->DrawRectangle(16, rowY1, width, rowY2 - rowY1 + 1);
+		ctx->SetBrush(currentBrush);
+		if (!m_plain)
+		{
+			// the address text is dark red
+			ctx->SetFont(DebuggerFont, wxColour("#600000"));
+			ctx->DrawText(temp, 17, rowY1);
+			ctx->SetFont(DebuggerFont, *wxBLACK);
+		}
+
+		// If running
+		if (m_debugger->IsAlive())
+		{
+			std::vector<std::string> dis;
+			SplitString(m_debugger->Disassemble(address), '\t', dis);
+			dis.resize(2);
+
+			static const size_t VALID_BRANCH_LENGTH = 10;
+			const std::string& opcode   = dis[0];
+			const std::string& operands = dis[1];
+			std::string desc;
+
+			// look for hex strings to decode branches
+			std::string hex_str;
+			size_t pos = operands.find("0x8");
+			if (pos != std::string::npos)
+			{
+				hex_str = operands.substr(pos);
+			}
+
+			if (hex_str.length() == VALID_BRANCH_LENGTH)
+			{
+				u32 offs = std::stoul(hex_str, nullptr, 16);
+
+				branches[numBranches].src = rowY1 + (m_rowHeight / 2);
+				branches[numBranches].srcAddr = (address / m_align);
+				branches[numBranches++].dst = (int)(rowY1 + ((s64)(u32)offs - (s64)(u32)address) * m_rowHeight / m_align + m_rowHeight / 2);
+				desc = StringFromFormat("-->%s", m_debugger->GetDescription(offs).c_str());
+
+				// the -> arrow illustrations are purple
+				ctx->SetFont(DebuggerFont, wxTheColourDatabase->Find("PURPLE"));
+			}
+			else
+			{
+				ctx->SetFont(DebuggerFont, *wxBLACK);
+			}
+
+			ctx->DrawText(StrToWxStr(operands), 17 + 17*charWidth, rowY1);
+			// ------------
+
+			// Show blr as its' own color
+			if (opcode == "blr")
+				ctx->SetFont(DebuggerFont, wxTheColourDatabase->Find("DARK GREEN"));
+			else
+				ctx->SetFont(DebuggerFont, wxTheColourDatabase->Find("VIOLET"));
+
+			ctx->DrawText(StrToWxStr(opcode), 17 + (m_plain ? 1*charWidth : 9*charWidth), rowY1);
+
+			if (desc.empty())
+			{
+				desc = m_debugger->GetDescription(address);
+			}
+
+			if (!m_plain)
+			{
+				ctx->SetFont(DebuggerFont, *wxBLUE);
+
+				//char temp[256];
+				//UnDecorateSymbolName(desc,temp,255,UNDNAME_COMPLETE);
+				if (!desc.empty())
+				{
+					ctx->DrawText(StrToWxStr(desc), 17 + 35 * charWidth, rowY1);
+				}
+			}
+
+			// Show red breakpoint dot
+			if (m_debugger->IsBreakpoint(address))
+			{
+				ctx->SetBrush(bpBrush);
+				ctx->DrawRectangle(2, rowY1 + 1, 11, 11);
+			}
+		}
+	} // end of for
+	// ------------
+
+	// -------------------------
+	// Colors and brushes
+	// -------------------------
+	ctx->SetPen(currentPen);
+
+	for (int i = 0; i < numBranches; i++)
+	{
+		int x = 17 + 49 * charWidth + (branches[i].srcAddr % 9) * 8;
+		MoveTo(x-2, branches[i].src);
+
+		if (branches[i].dst < rc.height + 400 && branches[i].dst > -400)
+		{
+			LineTo(ctx, x+2, branches[i].src);
+			LineTo(ctx, x+2, branches[i].dst);
+			LineTo(ctx, x-4, branches[i].dst);
+
+			MoveTo(x, branches[i].dst - 4);
+			LineTo(ctx, x-4, branches[i].dst);
+			LineTo(ctx, x+1, branches[i].dst+5);
+		}
+		//else
+		//{
+			// This can be re-enabled when there is a scrollbar or
+			// something on the codeview (the lines are too long)
+
+			//LineTo(ctx, x+4, branches[i].src);
+			//MoveTo(x+2, branches[i].dst-4);
+			//LineTo(ctx, x+6, branches[i].dst);
+			//LineTo(ctx, x+1, branches[i].dst+5);
+		//}
+
+		//LineTo(ctx, x, branches[i].dst+4);
+		//LineTo(ctx, x-2, branches[i].dst);
+	}
+	// ------------
+}
+
+void CCodeView::LineTo(std::unique_ptr<wxGraphicsContext>& ctx, int x, int y)
+{
+	std::vector<wxPoint2DDouble> points { wxPoint2DDouble(m_lx, m_ly), wxPoint2DDouble(x, y) };
+
+	ctx->DrawLines(points.size(), points.data());
+	m_lx = x;
+	m_ly = y;
+}
+
+void CCodeView::OnResize(wxSizeEvent& event)
+{
+	Refresh();
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h
new file mode 100644
index 0000000000..37993648a6
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/CodeView.h
@@ -0,0 +1,95 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#define wxUSE_XPM_IN_MSW 1
+#define USE_XPM_BITMAPS 1
+
+#include <memory>
+#include <vector>
+
+#include <wx/control.h>
+#include <wx/graphics.h>
+
+#include "Common/CommonTypes.h"
+
+wxDECLARE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
+
+class DebugInterface;
+class SymbolDB;
+class wxPaintDC;
+
+class CCodeView : public wxControl
+{
+public:
+	CCodeView(DebugInterface* debuginterface, SymbolDB *symbol_db,
+			wxWindow* parent, wxWindowID Id = wxID_ANY);
+
+	void ToggleBreakpoint(u32 address);
+
+	u32 GetSelection() const
+	{
+		return m_selection;
+	}
+
+	void Center(u32 addr)
+	{
+		m_curAddress = addr;
+		m_selection = addr;
+		Refresh();
+	}
+
+	void SetPlain()
+	{
+		m_plain = true;
+	}
+
+private:
+	void OnPaint(wxPaintEvent& event);
+	void OnErase(wxEraseEvent& event);
+	void OnScrollWheel(wxMouseEvent& event);
+	void OnMouseDown(wxMouseEvent& event);
+	void OnMouseMove(wxMouseEvent& event);
+	void OnMouseUpL(wxMouseEvent& event);
+	void OnMouseUpR(wxMouseEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+	void InsertBlrNop(int);
+
+	void RaiseEvent();
+	int YToAddress(int y);
+
+	u32 AddrToBranch(u32 addr);
+	void OnResize(wxSizeEvent& event);
+
+	void MoveTo(int x, int y)
+	{
+		m_lx = x;
+		m_ly = y;
+	}
+
+	void LineTo(std::unique_ptr<wxGraphicsContext>& dc, int x, int y);
+
+	struct BlrStruct // for IDM_INSERTBLR
+	{
+		u32 address;
+		u32 oldValue;
+	};
+	std::vector<BlrStruct> m_blrList;
+
+	DebugInterface* m_debugger;
+	SymbolDB* m_symbol_db;
+
+	bool m_plain;
+
+	int m_curAddress;
+	int m_align;
+	int m_rowHeight;
+
+	u32 m_selection;
+	u32 m_oldSelection;
+	bool m_selecting;
+
+	int m_lx, m_ly;
+};
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
new file mode 100644
index 0000000000..b6bbe2596b
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
@@ -0,0 +1,777 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <string>
+#include <vector>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/listbox.h>
+#include <wx/menu.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/textdlg.h>
+#include <wx/thread.h>
+#include <wx/toolbar.h>
+#include <wx/aui/auibar.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Host.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+extern "C"  // Bitmaps
+{
+	#include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT
+	#include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT
+}
+
+CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, CFrame *parent,
+	wxWindowID id, const wxPoint& position, const wxSize& size, long style, const wxString& name)
+	: wxPanel(parent, id, position, size, style, name)
+	, Parent(parent)
+	, m_RegisterWindow(nullptr)
+	, m_WatchWindow(nullptr)
+	, m_BreakpointWindow(nullptr)
+	, m_MemoryWindow(nullptr)
+	, m_JitWindow(nullptr)
+	, m_SoundWindow(nullptr)
+	, m_VideoWindow(nullptr)
+	, codeview(nullptr)
+{
+	InitBitmaps();
+
+	DebugInterface* di = &PowerPC::debug_interface;
+
+	codeview = new CCodeView(di, &g_symbolDB, this, wxID_ANY);
+
+	callstack = new wxListBox(this, wxID_ANY);
+	callstack->Bind(wxEVT_LISTBOX, &CCodeWindow::OnCallstackListChange, this);
+
+	symbols = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
+	symbols->Bind(wxEVT_LISTBOX, &CCodeWindow::OnSymbolListChange, this);
+
+	calls = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
+	calls->Bind(wxEVT_LISTBOX, &CCodeWindow::OnCallsListChange, this);
+
+	callers = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
+	callers->Bind(wxEVT_LISTBOX, &CCodeWindow::OnCallersListChange, this);
+
+	m_aui_toolbar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORIZONTAL | wxAUI_TB_PLAIN_BACKGROUND);
+
+	wxTextCtrl* const address_textctrl = new wxTextCtrl(m_aui_toolbar, IDM_ADDRBOX);
+	address_textctrl->Bind(wxEVT_TEXT, &CCodeWindow::OnAddrBoxChange, this);
+
+	m_aui_toolbar->AddControl(new wxStaticText(m_aui_toolbar, wxID_ANY, _("Address Search:")));
+	m_aui_toolbar->AddSpacer(5);
+	m_aui_toolbar->AddControl(address_textctrl);
+	m_aui_toolbar->Realize();
+
+	m_aui_manager.SetManagedWindow(this);
+	m_aui_manager.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+	m_aui_manager.AddPane(m_aui_toolbar, wxAuiPaneInfo().ToolbarPane().Top().Floatable(false));
+	m_aui_manager.AddPane(callstack, wxAuiPaneInfo().MinSize(150, 100).Left().CloseButton(false).Floatable(false).Caption(_("Callstack")));
+	m_aui_manager.AddPane(symbols, wxAuiPaneInfo().MinSize(150, 100).Left().CloseButton(false).Floatable(false).Caption(_("Symbols")));
+	m_aui_manager.AddPane(calls, wxAuiPaneInfo().MinSize(150, 100).Left().CloseButton(false).Floatable(false).Caption(_("Function calls")));
+	m_aui_manager.AddPane(callers, wxAuiPaneInfo().MinSize(150, 100).Left().CloseButton(false).Floatable(false).Caption(_("Function callers")));
+	m_aui_manager.AddPane(codeview, wxAuiPaneInfo().CenterPane().CloseButton(false).Floatable(false));
+	m_aui_manager.Update();
+
+	// Menu
+	Bind(wxEVT_MENU, &CCodeWindow::OnCPUMode, this, IDM_INTERPRETER, IDM_JIT_SR_OFF);
+	Bind(wxEVT_MENU, &CCodeWindow::OnChangeFont, this, IDM_FONT_PICKER);
+	Bind(wxEVT_MENU, &CCodeWindow::OnJitMenu, this, IDM_CLEAR_CODE_CACHE, IDM_SEARCH_INSTRUCTION);
+	Bind(wxEVT_MENU, &CCodeWindow::OnSymbolsMenu, this, IDM_CLEAR_SYMBOLS, IDM_PATCH_HLE_FUNCTIONS);
+	Bind(wxEVT_MENU, &CCodeWindow::OnProfilerMenu, this, IDM_PROFILE_BLOCKS, IDM_WRITE_PROFILE);
+
+	// Toolbar
+	Bind(wxEVT_MENU, &CCodeWindow::OnCodeStep, this, IDM_STEP, IDM_GOTOPC);
+
+	// Other
+	Bind(wxEVT_HOST_COMMAND, &CCodeWindow::OnHostMessage, this);
+}
+
+CCodeWindow::~CCodeWindow()
+{
+	m_aui_manager.UnInit();
+}
+
+wxMenuBar *CCodeWindow::GetMenuBar()
+{
+	return Parent->GetMenuBar();
+}
+
+wxToolBar *CCodeWindow::GetToolBar()
+{
+	return Parent->m_ToolBar;
+}
+
+// ----------
+// Events
+
+void CCodeWindow::OnHostMessage(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_NOTIFY_MAP_LOADED:
+			NotifyMapLoaded();
+			if (m_BreakpointWindow) m_BreakpointWindow->NotifyUpdate();
+			break;
+
+		case IDM_UPDATE_DISASM_DIALOG:
+			Update();
+			if (codeview) codeview->Center(PC);
+			if (m_RegisterWindow) m_RegisterWindow->NotifyUpdate();
+			if (m_WatchWindow) m_WatchWindow->NotifyUpdate();
+			break;
+
+		case IDM_UPDATE_BREAKPOINTS:
+			Update();
+			if (m_BreakpointWindow) m_BreakpointWindow->NotifyUpdate();
+			break;
+
+		case IDM_UPDATE_JIT_PANE:
+			// Check if the JIT pane is in the AUI notebook. If not, add it and switch to it.
+			if (!m_JitWindow)
+				ToggleJitWindow(true);
+			m_JitWindow->ViewAddr(codeview->GetSelection());
+			break;
+	}
+}
+
+// The Play, Stop, Step, Skip, Go to PC and Show PC buttons go here
+void CCodeWindow::OnCodeStep(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_STEP:
+			SingleStep();
+			break;
+
+		case IDM_STEPOVER:
+			StepOver();
+			break;
+
+		case IDM_STEPOUT:
+			StepOut();
+			break;
+
+		case IDM_TOGGLE_BREAKPOINT:
+			ToggleBreakpoint();
+			break;
+
+		case IDM_SKIP:
+			PC += 4;
+			Update();
+			break;
+
+		case IDM_SETPC:
+			PC = codeview->GetSelection();
+			Update();
+			break;
+
+		case IDM_GOTOPC:
+			JumpToAddress(PC);
+			break;
+	}
+
+	UpdateButtonStates();
+	// Update all toolbars in the aui manager
+	Parent->UpdateGUI();
+}
+
+bool CCodeWindow::JumpToAddress(u32 address)
+{
+	// Jump to anywhere in memory
+	if (address <= 0xFFFFFFFF)
+	{
+		codeview->Center(address);
+		UpdateLists();
+
+		return true;
+	}
+
+	return false;
+}
+
+void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
+{
+	UpdateLists();
+}
+
+void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event)
+{
+	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)m_aui_toolbar->FindControl(IDM_ADDRBOX);
+
+	// Trim leading and trailing whitespace.
+	wxString txt = pAddrCtrl->GetValue().Trim().Trim(false);
+
+	bool success = false;
+	unsigned long addr;
+	if (txt.ToULong(&addr, 16))
+	{
+		if (JumpToAddress(addr))
+			success = true;
+	}
+
+	if (success)
+		pAddrCtrl->SetBackgroundColour(wxNullColour);
+	else
+		pAddrCtrl->SetBackgroundColour(*wxRED);
+
+	pAddrCtrl->Refresh();
+
+	event.Skip();
+}
+
+void CCodeWindow::OnCallstackListChange(wxCommandEvent& event)
+{
+	int index   = callstack->GetSelection();
+	if (index >= 0)
+	{
+		u32 address = (u32)(u64)(callstack->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::OnCallersListChange(wxCommandEvent& event)
+{
+	int index = callers->GetSelection();
+	if (index >= 0)
+	{
+		u32 address = (u32)(u64)(callers->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::OnCallsListChange(wxCommandEvent& event)
+{
+	int index = calls->GetSelection();
+	if (index >= 0)
+	{
+		u32 address = (u32)(u64)(calls->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::SingleStep()
+{
+	if (CCPU::IsStepping())
+	{
+		PowerPC::breakpoints.ClearAllTemporary();
+		JitInterface::InvalidateICache(PC, 4, true);
+		CCPU::StepOpcode(&sync_event);
+		wxThread::Sleep(20);
+		// need a short wait here
+		JumpToAddress(PC);
+		Update();
+	}
+}
+
+void CCodeWindow::StepOver()
+{
+	if (CCPU::IsStepping())
+	{
+		UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC);
+		if (inst.LK)
+		{
+			PowerPC::breakpoints.ClearAllTemporary();
+			PowerPC::breakpoints.Add(PC + 4, true);
+			CCPU::EnableStepping(false);
+			JumpToAddress(PC);
+			Update();
+		}
+		else
+		{
+			SingleStep();
+		}
+
+		UpdateButtonStates();
+		// Update all toolbars in the aui manager
+		Parent->UpdateGUI();
+	}
+}
+
+void CCodeWindow::StepOut()
+{
+	if (CCPU::IsStepping())
+	{
+		PowerPC::breakpoints.ClearAllTemporary();
+
+		// Keep stepping until the next blr or timeout after one second
+		u64 timeout = SystemTimers::GetTicksPerSecond();
+		u64 steps = 0;
+		PowerPC::CoreMode oldMode = PowerPC::GetMode();
+		PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
+		UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC);
+		while (inst.hex != 0x4e800020 && steps < timeout) // check for blr
+		{
+			if (inst.LK)
+			{
+				// Step over branches
+				u32 next_pc = PC + 4;
+				while (PC != next_pc && steps < timeout)
+				{
+					PowerPC::SingleStep();
+					++steps;
+				}
+			}
+			else
+			{
+				PowerPC::SingleStep();
+				++steps;
+			}
+			inst = PowerPC::HostRead_Instruction(PC);
+		}
+
+		PowerPC::SingleStep();
+		PowerPC::SetMode(oldMode);
+
+		JumpToAddress(PC);
+		Update();
+
+		UpdateButtonStates();
+		// Update all toolbars in the aui manager
+		Parent->UpdateGUI();
+	}
+}
+
+void CCodeWindow::ToggleBreakpoint()
+{
+	if (CCPU::IsStepping())
+	{
+		if (codeview) codeview->ToggleBreakpoint(codeview->GetSelection());
+		Update();
+	}
+}
+
+void CCodeWindow::UpdateLists()
+{
+	callers->Clear();
+	u32 addr = codeview->GetSelection();
+	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
+	if (!symbol)
+		return;
+
+	for (auto& call : symbol->callers)
+	{
+		u32 caller_addr = call.callAddress;
+		Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
+		if (caller_symbol)
+		{
+			int idx = callers->Append(StrToWxStr(StringFromFormat
+						("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str()));
+			callers->SetClientData(idx, (void*)(u64)caller_addr);
+		}
+	}
+
+	calls->Clear();
+	for (auto& call : symbol->calls)
+	{
+		u32 call_addr = call.function;
+		Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
+		if (call_symbol)
+		{
+			int idx = calls->Append(StrToWxStr(StringFromFormat
+						("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str()));
+			calls->SetClientData(idx, (void*)(u64)call_addr);
+		}
+	}
+}
+
+void CCodeWindow::UpdateCallstack()
+{
+	if (Core::GetState() == Core::CORE_STOPPING) return;
+
+	callstack->Clear();
+
+	std::vector<Dolphin_Debugger::CallstackEntry> stack;
+
+	bool ret = Dolphin_Debugger::GetCallstack(stack);
+
+	for (auto& frame : stack)
+	{
+		int idx = callstack->Append(StrToWxStr(frame.Name));
+		callstack->SetClientData(idx, (void*)(u64)frame.vAddress);
+	}
+
+	if (!ret)
+		callstack->Append(StrToWxStr("invalid callstack"));
+}
+
+// Create CPU Mode menus
+void CCodeWindow::CreateMenu(const SCoreStartupParameter& core_startup_parameter, wxMenuBar *pMenuBar)
+{
+	// CPU Mode
+	wxMenu* pCoreMenu = new wxMenu;
+
+	wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _("&Interpreter core"),
+		_("This is necessary to get break points"
+		" and stepping to work as explained in the Developer Documentation. But it can be very"
+		" slow, perhaps slower than 1 fps."),
+		wxITEM_CHECK);
+	interpreter->Check(core_startup_parameter.iCPUCore == PowerPC::CORE_INTERPRETER);
+	pCoreMenu->AppendSeparator();
+
+	pCoreMenu->Append(IDM_JIT_NO_BLOCK_LINKING, _("&JIT Block Linking off"),
+		_("Provide safer execution by not linking the JIT blocks."),
+		wxITEM_CHECK);
+
+	pCoreMenu->Append(IDM_JIT_NO_BLOCK_CACHE, _("&Disable JIT Cache"),
+		_("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.\n[This option must be selected before a game is started.]"),
+		wxITEM_CHECK);
+	pCoreMenu->Append(IDM_CLEAR_CODE_CACHE, _("&Clear JIT cache"));
+
+	pCoreMenu->AppendSeparator();
+	pCoreMenu->Append(IDM_LOG_INSTRUCTIONS, _("&Log JIT instruction coverage"));
+	pCoreMenu->Append(IDM_SEARCH_INSTRUCTION, _("&Search for an op"));
+
+	pCoreMenu->AppendSeparator();
+	pCoreMenu->Append(IDM_JIT_OFF, _("&JIT off (JIT core)"),
+		_("Turn off all JIT functions, but still use the JIT core from Jit.cpp"),
+		wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LS_OFF, _("&JIT LoadStore off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LSLBZX_OFF, _("    &JIT LoadStore lbzx off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LSLXZ_OFF, _("    &JIT LoadStore lXz off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LSLWZ_OFF, _("&JIT LoadStore lwz off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LSF_OFF, _("&JIT LoadStore Floating off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_LSP_OFF, _("&JIT LoadStore Paired off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_FP_OFF, _("&JIT FloatingPoint off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_I_OFF, _("&JIT Integer off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_P_OFF, _("&JIT Paired off"),
+			wxEmptyString, wxITEM_CHECK);
+	pCoreMenu->Append(IDM_JIT_SR_OFF, _("&JIT SystemRegisters off"),
+			wxEmptyString, wxITEM_CHECK);
+
+	pMenuBar->Append(pCoreMenu, _("&JIT"));
+
+
+	// Debug Menu
+	wxMenu* pDebugMenu = new wxMenu;
+
+	pDebugMenu->Append(IDM_STEP, _("Step &Into\tF11"));
+	pDebugMenu->Append(IDM_STEPOVER, _("Step &Over\tF10"));
+	pDebugMenu->Append(IDM_STEPOUT, _("Step O&ut\tSHIFT+F11"));
+	pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _("Toggle &Breakpoint\tF9"));
+	pDebugMenu->AppendSeparator();
+
+	wxMenu* pPerspectives = new wxMenu;
+	Parent->m_SavedPerspectives = new wxMenu;
+	pDebugMenu->AppendSubMenu(pPerspectives, _("Perspectives"), _("Edit Perspectives"));
+	pPerspectives->Append(IDM_SAVE_PERSPECTIVE, _("Save perspectives"), _("Save currently-toggled perspectives"));
+	pPerspectives->Append(IDM_EDIT_PERSPECTIVES, _("Edit perspectives"), _("Toggle editing of perspectives"), wxITEM_CHECK);
+	pPerspectives->AppendSeparator();
+	pPerspectives->Append(IDM_ADD_PERSPECTIVE, _("Create new perspective"));
+	pPerspectives->AppendSubMenu(Parent->m_SavedPerspectives, _("Saved perspectives"));
+	Parent->PopulateSavedPerspectives();
+	pPerspectives->AppendSeparator();
+	wxMenu* pAddPane = new wxMenu;
+	pPerspectives->AppendSubMenu(pAddPane, _("Add new pane to"));
+	pAddPane->Append(IDM_PERSPECTIVES_ADD_PANE_TOP, _("Top"));
+	pAddPane->Append(IDM_PERSPECTIVES_ADD_PANE_BOTTOM, _("Bottom"));
+	pAddPane->Append(IDM_PERSPECTIVES_ADD_PANE_LEFT, _("Left"));
+	pAddPane->Append(IDM_PERSPECTIVES_ADD_PANE_RIGHT, _("Right"));
+	pAddPane->Append(IDM_PERSPECTIVES_ADD_PANE_CENTER, _("Center"));
+	pPerspectives->Append(IDM_TAB_SPLIT, _("Tab split"), "", wxITEM_CHECK);
+	pPerspectives->Append(IDM_NO_DOCKING, _("Disable docking"), "Disable docking of perspective panes to main window", wxITEM_CHECK);
+
+
+	pMenuBar->Append(pDebugMenu, _("&Debug"));
+
+	CreateMenuSymbols(pMenuBar);
+}
+
+void CCodeWindow::CreateMenuOptions(wxMenu* pMenu)
+{
+	wxMenuItem* boottopause = pMenu->Append(IDM_BOOT_TO_PAUSE, _("Boot to pause"),
+		_("Start the game directly instead of booting to pause"),
+		wxITEM_CHECK);
+	boottopause->Check(bBootToPause);
+
+	wxMenuItem* automaticstart = pMenu->Append(IDM_AUTOMATIC_START, _("&Automatic start"),
+		_(
+		"Automatically load the Default ISO when Dolphin starts, or the last game you loaded,"
+		" if you have not given it an elf file with the --elf command line. [This can be"
+		" convenient if you are bug-testing with a certain game and want to rebuild"
+		" and retry it several times, either with changes to Dolphin or if you are"
+		" developing a homebrew game.]"),
+		wxITEM_CHECK);
+	automaticstart->Check(bAutomaticStart);
+
+	pMenu->Append(IDM_FONT_PICKER, _("&Font..."));
+}
+
+// CPU Mode and JIT Menu
+void CCodeWindow::OnCPUMode(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_INTERPRETER:
+			PowerPC::SetMode(UseInterpreter() ? PowerPC::MODE_INTERPRETER : PowerPC::MODE_JIT);
+			break;
+		case IDM_BOOT_TO_PAUSE:
+			bBootToPause = !bBootToPause;
+			return;
+		case IDM_AUTOMATIC_START:
+			bAutomaticStart = !bAutomaticStart;
+			return;
+		case IDM_JIT_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITOff = event.IsChecked();
+			break;
+		case IDM_JIT_LS_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStoreOff = event.IsChecked();
+			break;
+		case IDM_JIT_LSLXZ_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelXzOff = event.IsChecked();
+			break;
+		case IDM_JIT_LSLWZ_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelwzOff = event.IsChecked();
+			break;
+		case IDM_JIT_LSLBZX_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorelbzxOff = event.IsChecked();
+			break;
+		case IDM_JIT_LSF_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStoreFloatingOff = event.IsChecked();
+			break;
+		case IDM_JIT_LSP_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITLoadStorePairedOff = event.IsChecked();
+			break;
+		case IDM_JIT_FP_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITFloatingPointOff = event.IsChecked();
+			break;
+		case IDM_JIT_I_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITIntegerOff = event.IsChecked();
+			break;
+		case IDM_JIT_P_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITPairedOff = event.IsChecked();
+			break;
+		case IDM_JIT_SR_OFF:
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bJITSystemRegistersOff = event.IsChecked();
+			break;
+	}
+
+	// Clear the JIT cache to enable these changes
+	JitInterface::ClearCache();
+
+	// Update
+	UpdateButtonStates();
+}
+
+void CCodeWindow::OnJitMenu(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_LOG_INSTRUCTIONS:
+			PPCTables::LogCompiledInstructions();
+			break;
+
+		case IDM_CLEAR_CODE_CACHE:
+			JitInterface::ClearCache();
+			break;
+
+		case IDM_SEARCH_INSTRUCTION:
+		{
+			wxString str = wxGetTextFromUser("", _("Op?"), wxEmptyString, this);
+			auto const wx_name = WxStrToStr(str);
+			bool found = false;
+			for (u32 addr = 0x80000000; addr < 0x80180000; addr += 4)
+			{
+				const char *name = PPCTables::GetInstructionName(PowerPC::HostRead_U32(addr));
+				if (name && (wx_name == name))
+				{
+					NOTICE_LOG(POWERPC, "Found %s at %08x", wx_name.c_str(), addr);
+					found = true;
+				}
+			}
+			if (!found)
+				NOTICE_LOG(POWERPC, "Opcode %s not found", wx_name.c_str());
+			break;
+		}
+	}
+}
+
+// Shortcuts
+bool CCodeWindow::UseInterpreter()
+{
+	return GetMenuBar()->IsChecked(IDM_INTERPRETER);
+}
+
+bool CCodeWindow::BootToPause()
+{
+	return GetMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE);
+}
+
+bool CCodeWindow::AutomaticStart()
+{
+	return GetMenuBar()->IsChecked(IDM_AUTOMATIC_START);
+}
+
+bool CCodeWindow::JITNoBlockCache()
+{
+	return GetMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_CACHE);
+}
+
+bool CCodeWindow::JITNoBlockLinking()
+{
+	return GetMenuBar()->IsChecked(IDM_JIT_NO_BLOCK_LINKING);
+}
+
+// Toolbar
+void CCodeWindow::InitBitmaps()
+{
+	// load original size 48x48
+	m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png);
+	m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_StepOut] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+
+	// scale to 24x24 for toolbar
+	for (auto& bitmap : m_Bitmaps)
+		bitmap = wxBitmap(bitmap.ConvertToImage().Scale(24, 24));
+}
+
+void CCodeWindow::PopulateToolbar(wxToolBar* toolBar)
+{
+	int w = m_Bitmaps[0].GetWidth(),
+		h = m_Bitmaps[0].GetHeight();
+
+	toolBar->SetToolBitmapSize(wxSize(w, h));
+	WxUtils::AddToolbarButton(toolBar, IDM_STEP,     _("Step"),      m_Bitmaps[Toolbar_Step],     _("Step into the next instruction"));
+	WxUtils::AddToolbarButton(toolBar, IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver], _("Step over the next instruction"));
+	WxUtils::AddToolbarButton(toolBar, IDM_STEPOUT,  _("Step Out"),  m_Bitmaps[Toolbar_StepOut],  _("Step out of the current function"));
+	WxUtils::AddToolbarButton(toolBar, IDM_SKIP,     _("Skip"),      m_Bitmaps[Toolbar_Skip],     _("Skips the next instruction completely"));
+	toolBar->AddSeparator();
+	WxUtils::AddToolbarButton(toolBar, IDM_GOTOPC,   _("Show PC"),   m_Bitmaps[Toolbar_GotoPC],   _("Go to the current instruction"));
+	WxUtils::AddToolbarButton(toolBar, IDM_SETPC,    _("Set PC"),    m_Bitmaps[Toolbar_SetPC],    _("Set the current instruction"));
+}
+
+// Update GUI
+void CCodeWindow::Update()
+{
+	if (!codeview) return;
+
+	codeview->Refresh();
+	UpdateCallstack();
+	UpdateButtonStates();
+
+	// Do not automatically show the current PC position when a breakpoint is hit or
+	// when we pause since this can be called at other times too.
+	//codeview->Center(PC);
+}
+
+void CCodeWindow::UpdateButtonStates()
+{
+	bool Initialized = (Core::GetState() != Core::CORE_UNINITIALIZED);
+	bool Pause = (Core::GetState() == Core::CORE_PAUSE);
+	bool Stepping = CCPU::IsStepping();
+	wxToolBar* ToolBar = GetToolBar();
+
+	// Toolbar
+	if (!ToolBar)
+		return;
+
+	if (!Initialized)
+	{
+		ToolBar->EnableTool(IDM_STEPOVER, false);
+		ToolBar->EnableTool(IDM_STEPOUT, false);
+		ToolBar->EnableTool(IDM_SKIP, false);
+	}
+	else
+	{
+		if (!Stepping)
+		{
+			ToolBar->EnableTool(IDM_STEPOVER, false);
+			ToolBar->EnableTool(IDM_STEPOUT, false);
+			ToolBar->EnableTool(IDM_SKIP, false);
+		}
+		else
+		{
+			ToolBar->EnableTool(IDM_STEPOVER, true);
+			ToolBar->EnableTool(IDM_STEPOUT, true);
+			ToolBar->EnableTool(IDM_SKIP, true);
+		}
+	}
+
+	ToolBar->EnableTool(IDM_STEP, Initialized && Stepping);
+	ToolBar->Realize();
+
+	// Menu bar
+	// ------------------
+	GetMenuBar()->Enable(IDM_INTERPRETER, Pause); // CPU Mode
+
+	GetMenuBar()->Enable(IDM_JIT_NO_BLOCK_CACHE, !Initialized);
+
+	GetMenuBar()->Enable(IDM_JIT_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LS_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LSLXZ_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LSLWZ_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LSLBZX_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LSF_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_LSP_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_FP_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_I_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_P_OFF, Pause);
+	GetMenuBar()->Enable(IDM_JIT_SR_OFF, Pause);
+
+	GetMenuBar()->Enable(IDM_CLEAR_CODE_CACHE, Pause); // JIT Menu
+	GetMenuBar()->Enable(IDM_SEARCH_INSTRUCTION, Initialized);
+
+	GetMenuBar()->Enable(IDM_CLEAR_SYMBOLS, Initialized); // Symbols menu
+	GetMenuBar()->Enable(IDM_SCAN_FUNCTIONS, Initialized);
+	GetMenuBar()->Enable(IDM_LOAD_MAP_FILE, Initialized);
+	GetMenuBar()->Enable(IDM_SAVEMAPFILE, Initialized);
+	GetMenuBar()->Enable(IDM_LOAD_MAP_FILE_AS, Initialized);
+	GetMenuBar()->Enable(IDM_SAVE_MAP_FILE_AS, Initialized);
+	GetMenuBar()->Enable(IDM_LOAD_BAD_MAP_FILE, Initialized);
+	GetMenuBar()->Enable(IDM_SAVE_MAP_FILE_WITH_CODES, Initialized);
+	GetMenuBar()->Enable(IDM_CREATE_SIGNATURE_FILE, Initialized);
+	GetMenuBar()->Enable(IDM_APPEND_SIGNATURE_FILE, Initialized);
+	GetMenuBar()->Enable(IDM_COMBINE_SIGNATURE_FILES, Initialized);
+	GetMenuBar()->Enable(IDM_RENAME_SYMBOLS, Initialized);
+	GetMenuBar()->Enable(IDM_USE_SIGNATURE_FILE, Initialized);
+	GetMenuBar()->Enable(IDM_PATCH_HLE_FUNCTIONS, Initialized);
+
+	// Update Fonts
+	callstack->SetFont(DebuggerFont);
+	symbols->SetFont(DebuggerFont);
+	callers->SetFont(DebuggerFont);
+	calls->SetFont(DebuggerFont);
+}
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h
new file mode 100644
index 0000000000..5be793a2dc
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h
@@ -0,0 +1,134 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/bitmap.h>
+#include <wx/panel.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "DolphinWX/Globals.h"
+
+class CFrame;
+class CRegisterWindow;
+class CWatchWindow;
+class CBreakPointWindow;
+class CMemoryWindow;
+class CJitWindow;
+class CCodeView;
+class DSPDebuggerLLE;
+class GFXDebuggerPanel;
+struct SCoreStartupParameter;
+
+class wxAuiToolBar;
+class wxListBox;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+
+class CCodeWindow : public wxPanel
+{
+public:
+	CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter,
+	            CFrame * parent,
+	            wxWindowID id = wxID_ANY,
+	            const wxPoint& pos = wxDefaultPosition,
+	            const wxSize& size = wxDefaultSize,
+	            long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
+	            const wxString& name = _("Code"));
+	~CCodeWindow();
+
+	void Load();
+	void Save();
+
+	// Parent interaction
+	CFrame *Parent;
+	wxMenuBar * GetMenuBar();
+	wxToolBar * GetToolBar();
+	wxBitmap m_Bitmaps[Toolbar_Debug_Bitmap_Max];
+
+	bool UseInterpreter();
+	bool BootToPause();
+	bool AutomaticStart();
+	bool JITNoBlockCache();
+	bool JITNoBlockLinking();
+	bool JumpToAddress(u32 address);
+
+	void Update() override;
+	void NotifyMapLoaded();
+	void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar);
+	void CreateMenuOptions(wxMenu *pMenu);
+	void CreateMenuSymbols(wxMenuBar *pMenuBar);
+	void RecreateToolbar(wxToolBar*);
+	void PopulateToolbar(wxToolBar* toolBar);
+	void UpdateButtonStates();
+	void OpenPages();
+	void UpdateManager();
+
+	// Menu bar
+	void ToggleCodeWindow(bool bShow);
+	void ToggleRegisterWindow(bool bShow);
+	void ToggleWatchWindow(bool bShow);
+	void ToggleBreakPointWindow(bool bShow);
+	void ToggleMemoryWindow(bool bShow);
+	void ToggleJitWindow(bool bShow);
+	void ToggleSoundWindow(bool bShow);
+	void ToggleVideoWindow(bool bShow);
+
+	// Sub dialogs
+	CRegisterWindow* m_RegisterWindow;
+	CWatchWindow* m_WatchWindow;
+	CBreakPointWindow* m_BreakpointWindow;
+	CMemoryWindow* m_MemoryWindow;
+	CJitWindow* m_JitWindow;
+	DSPDebuggerLLE* m_SoundWindow;
+	GFXDebuggerPanel* m_VideoWindow;
+
+	// Settings
+	bool bAutomaticStart; bool bBootToPause;
+	bool bShowOnStart[IDM_VIDEO_WINDOW - IDM_LOG_WINDOW + 1];
+	int iNbAffiliation[IDM_CODE_WINDOW - IDM_LOG_WINDOW + 1];
+
+private:
+	void OnCPUMode(wxCommandEvent& event);
+
+	void OnChangeFont(wxCommandEvent& event);
+
+	void OnCodeStep(wxCommandEvent& event);
+	void OnAddrBoxChange(wxCommandEvent& event);
+	void OnSymbolsMenu(wxCommandEvent& event);
+	void OnJitMenu(wxCommandEvent& event);
+	void OnProfilerMenu(wxCommandEvent& event);
+
+	void OnSymbolListChange(wxCommandEvent& event);
+	void OnSymbolListContextMenu(wxContextMenuEvent& event);
+	void OnCallstackListChange(wxCommandEvent& event);
+	void OnCallersListChange(wxCommandEvent& event);
+	void OnCallsListChange(wxCommandEvent& event);
+	void OnCodeViewChange(wxCommandEvent &event);
+	void OnHostMessage(wxCommandEvent& event);
+
+	// Debugger functions
+	void SingleStep();
+	void StepOver();
+	void StepOut();
+	void ToggleBreakpoint();
+
+	void UpdateLists();
+	void UpdateCallstack();
+
+	void InitBitmaps();
+
+	CCodeView* codeview;
+	wxListBox* callstack;
+	wxListBox* symbols;
+	wxListBox* callers;
+	wxListBox* calls;
+	Common::Event sync_event;
+
+	wxAuiManager  m_aui_manager;
+	wxAuiToolBar* m_aui_toolbar;
+};
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
new file mode 100644
index 0000000000..a6432edecb
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
@@ -0,0 +1,690 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <istream>
+#include <string>
+#include <utility>
+#include <vector>
+#include <wx/filedlg.h>
+#include <wx/font.h>
+#include <wx/fontdata.h>
+#include <wx/fontdlg.h>
+#include <wx/listbox.h>
+#include <wx/menu.h>
+#include <wx/mimetype.h>
+#include <wx/textdlg.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/SymbolDB.h"
+
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Boot/Boot.h"
+#include "Core/HLE/HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/SignatureDB.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerPanel.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/DSPDebugWindow.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+
+// Save and load settings
+// -----------------------------
+void CCodeWindow::Load()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	// The font to override DebuggerFont with
+	std::string fontDesc;
+
+	IniFile::Section* general = ini.GetOrCreateSection("General");
+	general->Get("DebuggerFont", &fontDesc);
+	general->Get("AutomaticStart", &bAutomaticStart, false);
+	general->Get("BootToPause", &bBootToPause, true);
+
+	if (!fontDesc.empty())
+		DebuggerFont.SetNativeFontInfoUserDesc(StrToWxStr(fontDesc));
+
+	const char* SettingName[] = {
+		"Log",
+		"LogConfig",
+		"Console",
+		"Registers",
+		"Breakpoints",
+		"Memory",
+		"JIT",
+		"Sound",
+		"Video",
+		"Code"
+	};
+
+	// Decide what windows to show
+	for (int i = 0; i <= IDM_VIDEO_WINDOW - IDM_LOG_WINDOW; i++)
+		ini.GetOrCreateSection("ShowOnStart")->Get(SettingName[i], &bShowOnStart[i], false);
+
+	// Get notebook affiliation
+	std::string section = "P - " +
+		((Parent->ActivePerspective < Parent->Perspectives.size())
+		? Parent->Perspectives[Parent->ActivePerspective].Name : "Perspective 1");
+
+	for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
+		ini.GetOrCreateSection(section)->Get(SettingName[i], &iNbAffiliation[i], 0);
+
+	// Get floating setting
+	for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
+		ini.GetOrCreateSection("Float")->Get(SettingName[i], &Parent->bFloatWindow[i], false);
+}
+
+void CCodeWindow::Save()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	IniFile::Section* general = ini.GetOrCreateSection("General");
+	general->Set("DebuggerFont", WxStrToStr(DebuggerFont.GetNativeFontInfoUserDesc()));
+	general->Set("AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATIC_START));
+	general->Set("BootToPause", GetMenuBar()->IsChecked(IDM_BOOT_TO_PAUSE));
+
+	const char* SettingName[] = {
+		"Log",
+		"LogConfig",
+		"Console",
+		"Registers",
+		"Breakpoints",
+		"Memory",
+		"JIT",
+		"Sound",
+		"Video",
+		"Code"
+	};
+
+	// Save windows settings
+	for (int i = IDM_LOG_WINDOW; i <= IDM_VIDEO_WINDOW; i++)
+		ini.GetOrCreateSection("ShowOnStart")->Set(SettingName[i - IDM_LOG_WINDOW], GetMenuBar()->IsChecked(i));
+
+	// Save notebook affiliations
+	std::string section = "P - " + Parent->Perspectives[Parent->ActivePerspective].Name;
+	for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
+		ini.GetOrCreateSection(section)->Set(SettingName[i], iNbAffiliation[i]);
+
+	// Save floating setting
+	for (int i = IDM_LOG_WINDOW_PARENT; i <= IDM_CODE_WINDOW_PARENT; i++)
+		ini.GetOrCreateSection("Float")->Set(SettingName[i - IDM_LOG_WINDOW_PARENT], !!FindWindowById(i));
+
+	ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+}
+
+// Symbols, JIT, Profiler
+// ----------------
+void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar)
+{
+	wxMenu *pSymbolsMenu = new wxMenu;
+	pSymbolsMenu->Append(IDM_CLEAR_SYMBOLS, _("&Clear symbols"),
+		_("Remove names from all functions and variables."));
+	pSymbolsMenu->Append(IDM_SCAN_FUNCTIONS, _("&Generate symbol map"),
+		_("Recognise standard functions from sys\\totaldb.dsy, and use generic zz_ names for other functions."));
+	pSymbolsMenu->AppendSeparator();
+	pSymbolsMenu->Append(IDM_LOAD_MAP_FILE, _("&Load symbol map"),
+		_("Try to load this game's function names automatically - but doesn't check .map files stored on the disc image yet."));
+	pSymbolsMenu->Append(IDM_SAVEMAPFILE, _("&Save symbol map"),
+		_("Save the function names for each address to a .map file in your user settings map folder, named after the title id."));
+	pSymbolsMenu->AppendSeparator();
+	pSymbolsMenu->Append(IDM_LOAD_MAP_FILE_AS, _("Load &other map file..."),
+		_("Load any .map file containing the function names and addresses for this game."));
+	pSymbolsMenu->Append(IDM_LOAD_BAD_MAP_FILE, _("Load &bad map file..."),
+		_("Try to load a .map file that might be from a slightly different version."));
+	pSymbolsMenu->Append(IDM_SAVE_MAP_FILE_AS, _("Save symbol map &as..."),
+		_("Save the function names and addresses for this game as a .map file. If you want to open it in IDA pro, use the .idc script."));
+	pSymbolsMenu->AppendSeparator();
+	pSymbolsMenu->Append(IDM_SAVE_MAP_FILE_WITH_CODES, _("Save code"),
+		_("Save the entire disassembled code. This may take a several seconds"
+		" and may require between 50 and 100 MB of hard drive space. It will only save code"
+		" that are in the first 4 MB of memory, if you are debugging a game that load .rel"
+		" files with code to memory you may want to increase that to perhaps 8 MB, you can do"
+		" that from SymbolDB::SaveMap().")
+		);
+
+	pSymbolsMenu->AppendSeparator();
+	pSymbolsMenu->Append(IDM_CREATE_SIGNATURE_FILE, _("&Create signature file..."),
+		_("Create a .dsy file that can be used to recognise these same functions in other games."));
+	pSymbolsMenu->Append(IDM_APPEND_SIGNATURE_FILE, _("Append to &existing signature file..."),
+		_("Add any named functions missing from a .dsy file, so it can also recognise these additional functions in other games."));
+	pSymbolsMenu->Append(IDM_COMBINE_SIGNATURE_FILES, _("Combine two signature files..."),
+		_("Make a new .dsy file which can recognise more functions, by combining two existing files. The first input file has priority."));
+	pSymbolsMenu->Append(IDM_USE_SIGNATURE_FILE, _("Apply signat&ure file..."),
+		_("Must use Generate symbol map first! Recognise names of any standard library functions used in multiple games, by loading them from a .dsy file."));
+	pSymbolsMenu->AppendSeparator();
+	pSymbolsMenu->Append(IDM_PATCH_HLE_FUNCTIONS, _("&Patch HLE functions"));
+	pSymbolsMenu->Append(IDM_RENAME_SYMBOLS, _("&Rename symbols from file..."));
+	pMenuBar->Append(pSymbolsMenu, _("&Symbols"));
+
+	wxMenu *pProfilerMenu = new wxMenu;
+	pProfilerMenu->Append(IDM_PROFILE_BLOCKS, _("&Profile blocks"), wxEmptyString, wxITEM_CHECK);
+	pProfilerMenu->AppendSeparator();
+	pProfilerMenu->Append(IDM_WRITE_PROFILE, _("&Write to profile.txt, show"));
+	pMenuBar->Append(pProfilerMenu, _("&Profiler"));
+}
+
+void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case IDM_PROFILE_BLOCKS:
+		Core::SetState(Core::CORE_PAUSE);
+		if (jit != nullptr)
+			jit->ClearCache();
+		Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILE_BLOCKS);
+		Core::SetState(Core::CORE_RUN);
+		break;
+	case IDM_WRITE_PROFILE:
+		if (Core::GetState() == Core::CORE_RUN)
+			Core::SetState(Core::CORE_PAUSE);
+
+		if (Core::GetState() == Core::CORE_PAUSE && PowerPC::GetMode() == PowerPC::MODE_JIT)
+		{
+			if (jit != nullptr)
+			{
+				std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt";
+				File::CreateFullPath(filename);
+				Profiler::WriteProfileResults(filename);
+
+				wxFileType* filetype = nullptr;
+				if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension("txt")))
+				{
+					// From extension failed, trying with MIME type now
+					if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType("text/plain")))
+						// MIME type failed, aborting mission
+						break;
+				}
+				wxString OpenCommand;
+				OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename));
+				if (!OpenCommand.IsEmpty())
+					wxExecute(OpenCommand, wxEXEC_SYNC);
+			}
+		}
+		break;
+	}
+}
+
+void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
+{
+	Parent->ClearStatusBar();
+
+	if (!Core::IsRunning()) return;
+
+	std::string existing_map_file, writable_map_file, title_id_str;
+	bool map_exists = CBoot::FindMapFile(&existing_map_file,
+	                                     &writable_map_file,
+	                                     &title_id_str);
+	switch (event.GetId())
+	{
+	case IDM_CLEAR_SYMBOLS:
+		if (!AskYesNoT("Do you want to clear the list of symbol names?")) return;
+		g_symbolDB.Clear();
+		Host_NotifyMapLoaded();
+		break;
+	case IDM_SCAN_FUNCTIONS:
+		{
+		PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB);
+		SignatureDB db;
+		if (db.Load(File::GetSysDirectory() + TOTALDB))
+		{
+			db.Apply(&g_symbolDB);
+			Parent->StatusBarMessage("Generated symbol names from '%s'", TOTALDB);
+			db.List();
+		}
+		else
+		{
+			Parent->StatusBarMessage("'%s' not found, no symbol names generated", TOTALDB);
+		}
+		// HLE::PatchFunctions();
+		// Update GUI
+		NotifyMapLoaded();
+		break;
+		}
+	case IDM_LOAD_MAP_FILE:
+		if (!map_exists)
+		{
+			g_symbolDB.Clear();
+			PPCAnalyst::FindFunctions(0x81300000, 0x81800000, &g_symbolDB);
+			SignatureDB db;
+			if (db.Load(File::GetSysDirectory() + TOTALDB))
+				db.Apply(&g_symbolDB);
+			Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", writable_map_file.c_str());
+		}
+		else
+		{
+			g_symbolDB.LoadMap(existing_map_file);
+			Parent->StatusBarMessage("Loaded symbols from '%s'", existing_map_file.c_str());
+		}
+		HLE::PatchFunctions();
+		NotifyMapLoaded();
+		break;
+	case IDM_LOAD_MAP_FILE_AS:
+		{
+			const wxString path = wxFileSelector(
+				_("Load map file"), File::GetUserPath(D_MAPS_IDX),
+				title_id_str + ".map", ".map",
+				"Dolphin Map File (*.map)|*.map|All files (*.*)|*.*",
+				wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
+
+			if (!path.IsEmpty())
+			{
+				g_symbolDB.LoadMap(WxStrToStr(path));
+				Parent->StatusBarMessage("Loaded symbols from '%s'", WxStrToStr(path).c_str());
+			}
+			HLE::PatchFunctions();
+			NotifyMapLoaded();
+		}
+		break;
+	case IDM_LOAD_BAD_MAP_FILE:
+		{
+			const wxString path = wxFileSelector(
+				_("Load bad map file"), File::GetUserPath(D_MAPS_IDX),
+				title_id_str + ".map", ".map",
+				"Dolphin Map File (*.map)|*.map|All files (*.*)|*.*",
+				wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
+
+			if (!path.IsEmpty())
+			{
+				g_symbolDB.LoadMap(WxStrToStr(path), true);
+				Parent->StatusBarMessage("Loaded symbols from '%s'", WxStrToStr(path).c_str());
+			}
+			HLE::PatchFunctions();
+			NotifyMapLoaded();
+		}
+		break;
+	case IDM_SAVEMAPFILE:
+		g_symbolDB.SaveMap(writable_map_file);
+		break;
+	case IDM_SAVE_MAP_FILE_AS:
+		{
+			const wxString path = wxFileSelector(
+				_("Save map file as"), File::GetUserPath(D_MAPS_IDX),
+				title_id_str + ".map", ".map",
+				"Dolphin Map File (*.map)|*.map|All files (*.*)|*.*",
+				wxFD_SAVE | wxFD_OVERWRITE_PROMPT, this);
+
+			if (!path.IsEmpty())
+				g_symbolDB.SaveMap(WxStrToStr(path));
+		}
+		break;
+	case IDM_SAVE_MAP_FILE_WITH_CODES:
+		g_symbolDB.SaveMap(writable_map_file, true);
+		break;
+
+	case IDM_RENAME_SYMBOLS:
+		{
+			const wxString path = wxFileSelector(
+				_("Apply signature file"), wxEmptyString,
+				wxEmptyString, wxEmptyString,
+				"Dolphin Symbol Rename File (*.sym)|*.sym",
+				wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
+
+			if (!path.IsEmpty())
+			{
+				std::ifstream f;
+				OpenFStream(f, WxStrToStr(path), std::ios_base::in);
+
+				std::string line;
+				while (std::getline(f, line))
+				{
+					if (line.length() < 12)
+						continue;
+
+					u32 address, type;
+					std::string name;
+
+					std::istringstream ss(line);
+					ss >> std::hex >> address >> std::dec >> type >> name;
+
+					Symbol *symbol = g_symbolDB.GetSymbolFromAddr(address);
+					if (symbol)
+						symbol->name = line.substr(12);
+				}
+
+				Host_NotifyMapLoaded();
+			}
+		}
+		break;
+
+	case IDM_CREATE_SIGNATURE_FILE:
+		{
+			wxTextEntryDialog input_prefix(
+				this,
+				_("Only export symbols with prefix:\n(Blank for all symbols)"),
+				wxGetTextFromUserPromptStr,
+				wxEmptyString);
+
+			if (input_prefix.ShowModal() == wxID_OK)
+			{
+				std::string prefix(WxStrToStr(input_prefix.GetValue()));
+
+				wxString path = wxFileSelector(
+					_("Save signature as"), File::GetSysDirectory(), wxEmptyString, wxEmptyString,
+					"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+					this);
+				if (!path.IsEmpty())
+				{
+					SignatureDB db;
+					db.Initialize(&g_symbolDB, prefix);
+					db.Save(WxStrToStr(path));
+					db.List();
+				}
+			}
+		}
+		break;
+	case IDM_APPEND_SIGNATURE_FILE:
+		{
+			wxTextEntryDialog input_prefix(
+				this,
+				_("Only export symbols with prefix:\n(Blank for all symbols)"),
+				wxGetTextFromUserPromptStr,
+				wxEmptyString);
+
+			if (input_prefix.ShowModal() == wxID_OK)
+			{
+				std::string prefix(WxStrToStr(input_prefix.GetValue()));
+
+				wxString path = wxFileSelector(
+					_("Append signature to"), File::GetSysDirectory(), wxEmptyString, wxEmptyString,
+					"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_SAVE,
+					this);
+				if (!path.IsEmpty())
+				{
+					SignatureDB db;
+					db.Initialize(&g_symbolDB, prefix);
+					db.List();
+					db.Load(WxStrToStr(path));
+					db.Save(WxStrToStr(path));
+					db.List();
+				}
+			}
+		}
+		break;
+	case IDM_USE_SIGNATURE_FILE:
+		{
+			wxString path = wxFileSelector(
+				_("Apply signature file"), File::GetSysDirectory(), wxEmptyString, wxEmptyString,
+				"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+				this);
+			if (!path.IsEmpty())
+			{
+				SignatureDB db;
+				db.Load(WxStrToStr(path));
+				db.Apply(&g_symbolDB);
+				db.List();
+				NotifyMapLoaded();
+			}
+		}
+		break;
+	case IDM_COMBINE_SIGNATURE_FILES:
+		{
+			wxString path1 = wxFileSelector(
+				_("Choose priority input file"), File::GetSysDirectory(), wxEmptyString, wxEmptyString,
+				"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+				this);
+			if (!path1.IsEmpty())
+			{
+				SignatureDB db;
+				wxString path2 = wxFileSelector(
+					_("Choose secondary input file"), File::GetSysDirectory(), wxEmptyString, wxEmptyString,
+					"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+					this);
+				if (!path2.IsEmpty())
+				{
+					db.Load(WxStrToStr(path2));
+					db.Load(WxStrToStr(path1));
+
+					path2 = wxFileSelector(
+						_("Save combined output file as"), File::GetSysDirectory(), wxEmptyString, ".dsy",
+						"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+						this);
+					db.Save(WxStrToStr(path2));
+					db.List();
+				}
+			}
+		}
+		break;
+	case IDM_PATCH_HLE_FUNCTIONS:
+		HLE::PatchFunctions();
+		Update();
+		break;
+	}
+}
+
+void CCodeWindow::NotifyMapLoaded()
+{
+	if (!codeview) return;
+
+	g_symbolDB.FillInCallers();
+	//symbols->Show(false); // hide it for faster filling
+	symbols->Freeze(); // HyperIris: wx style fast filling
+	symbols->Clear();
+	for (const auto& symbol : g_symbolDB.Symbols())
+	{
+		int idx = symbols->Append(StrToWxStr(symbol.second.name));
+		symbols->SetClientData(idx, (void*)&symbol.second);
+	}
+	symbols->Thaw();
+	//symbols->Show(true);
+	Update();
+}
+
+void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
+{
+	int index = symbols->GetSelection();
+	if (index >= 0)
+	{
+		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
+		if (pSymbol != nullptr)
+		{
+			if (pSymbol->type == Symbol::SYMBOL_DATA)
+			{
+				if (m_MemoryWindow)// && m_MemoryWindow->IsVisible())
+					m_MemoryWindow->JumpToAddress(pSymbol->address);
+			}
+			else
+			{
+				JumpToAddress(pSymbol->address);
+			}
+		}
+	}
+}
+
+void CCodeWindow::OnSymbolListContextMenu(wxContextMenuEvent& event)
+{
+}
+
+// Change the global DebuggerFont
+void CCodeWindow::OnChangeFont(wxCommandEvent& event)
+{
+	wxFontData data;
+	data.SetInitialFont(DebuggerFont);
+
+	wxFontDialog dialog(this, data);
+	if ( dialog.ShowModal() == wxID_OK )
+		DebuggerFont = dialog.GetFontData().GetChosenFont();
+}
+
+// Toggle windows
+
+void CCodeWindow::OpenPages()
+{
+	ToggleCodeWindow(true);
+	if (bShowOnStart[0])
+		Parent->ToggleLogWindow(true);
+	if (bShowOnStart[IDM_LOG_CONFIG_WINDOW - IDM_LOG_WINDOW])
+		Parent->ToggleLogConfigWindow(true);
+	if (bShowOnStart[IDM_REGISTER_WINDOW - IDM_LOG_WINDOW])
+		ToggleRegisterWindow(true);
+	if (bShowOnStart[IDM_WATCH_WINDOW - IDM_LOG_WINDOW])
+		ToggleWatchWindow(true);
+	if (bShowOnStart[IDM_BREAKPOINT_WINDOW - IDM_LOG_WINDOW])
+		ToggleBreakPointWindow(true);
+	if (bShowOnStart[IDM_MEMORY_WINDOW - IDM_LOG_WINDOW])
+		ToggleMemoryWindow(true);
+	if (bShowOnStart[IDM_JIT_WINDOW - IDM_LOG_WINDOW])
+		ToggleJitWindow(true);
+	if (bShowOnStart[IDM_SOUND_WINDOW - IDM_LOG_WINDOW])
+		ToggleSoundWindow(true);
+	if (bShowOnStart[IDM_VIDEO_WINDOW - IDM_LOG_WINDOW])
+		ToggleVideoWindow(true);
+}
+
+void CCodeWindow::ToggleCodeWindow(bool bShow)
+{
+	if (bShow)
+		Parent->DoAddPage(this,
+		        iNbAffiliation[IDM_CODE_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_CODE_WINDOW - IDM_LOG_WINDOW]);
+	else // Hide
+		Parent->DoRemovePage(this);
+}
+
+void CCodeWindow::ToggleRegisterWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_REGISTER_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_RegisterWindow)
+			m_RegisterWindow = new CRegisterWindow(Parent, IDM_REGISTER_WINDOW);
+		Parent->DoAddPage(m_RegisterWindow,
+		        iNbAffiliation[IDM_REGISTER_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_REGISTER_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_RegisterWindow, false);
+		m_RegisterWindow = nullptr;
+	}
+}
+
+void CCodeWindow::ToggleWatchWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_WATCH_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_WatchWindow)
+			m_WatchWindow = new CWatchWindow(Parent, IDM_WATCH_WINDOW);
+		Parent->DoAddPage(m_WatchWindow,
+		        iNbAffiliation[IDM_WATCH_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_WATCH_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_WatchWindow, false);
+		m_WatchWindow = nullptr;
+	}
+}
+
+void CCodeWindow::ToggleBreakPointWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_BREAKPOINT_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_BreakpointWindow)
+			m_BreakpointWindow = new CBreakPointWindow(this, Parent, IDM_BREAKPOINT_WINDOW);
+		Parent->DoAddPage(m_BreakpointWindow,
+		        iNbAffiliation[IDM_BREAKPOINT_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_BREAKPOINT_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_BreakpointWindow, false);
+		m_BreakpointWindow = nullptr;
+	}
+}
+
+void CCodeWindow::ToggleMemoryWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_MEMORY_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_MemoryWindow)
+			m_MemoryWindow = new CMemoryWindow(Parent, IDM_MEMORY_WINDOW);
+		Parent->DoAddPage(m_MemoryWindow,
+		        iNbAffiliation[IDM_MEMORY_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_MEMORY_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_MemoryWindow, false);
+		m_MemoryWindow = nullptr;
+	}
+}
+
+void CCodeWindow::ToggleJitWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_JIT_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_JitWindow)
+			m_JitWindow = new CJitWindow(Parent, IDM_JIT_WINDOW);
+		Parent->DoAddPage(m_JitWindow,
+		        iNbAffiliation[IDM_JIT_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_JIT_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_JitWindow, false);
+		m_JitWindow = nullptr;
+	}
+}
+
+
+void CCodeWindow::ToggleSoundWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_SOUND_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_SoundWindow)
+			m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUND_WINDOW);
+		Parent->DoAddPage(m_SoundWindow,
+		       iNbAffiliation[IDM_SOUND_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_SOUND_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_SoundWindow, false);
+		m_SoundWindow = nullptr;
+	}
+}
+
+void CCodeWindow::ToggleVideoWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_VIDEO_WINDOW)->Check(bShow);
+	if (bShow)
+	{
+		if (!m_VideoWindow)
+			m_VideoWindow = new GFXDebuggerPanel(Parent, IDM_VIDEO_WINDOW);
+		Parent->DoAddPage(m_VideoWindow,
+		        iNbAffiliation[IDM_VIDEO_WINDOW - IDM_LOG_WINDOW],
+		        Parent->bFloatWindow[IDM_VIDEO_WINDOW - IDM_LOG_WINDOW]);
+	}
+	else // Close
+	{
+		Parent->DoRemovePage(m_VideoWindow, false);
+		m_VideoWindow = nullptr;
+	}
+}
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
new file mode 100644
index 0000000000..ce65c0834c
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
@@ -0,0 +1,286 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <wx/artprov.h>
+#include <wx/listbox.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/thread.h>
+#include <wx/aui/auibar.h>
+#include <wx/aui/auibook.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
+#include "Core/Host.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/HW/DSPLLE/DSPDebugInterface.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/DSPDebugWindow.h"
+#include "DolphinWX/Debugger/DSPRegisterView.h"
+#include "DolphinWX/Debugger/MemoryView.h"
+
+static DSPDebuggerLLE* m_DebuggerFrame = nullptr;
+
+DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
+	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize,
+			wxTAB_TRAVERSAL, _("DSP LLE Debugger"))
+	, m_CachedStepCounter(-1)
+{
+	Bind(wxEVT_CLOSE_WINDOW, &DSPDebuggerLLE::OnClose, this);
+	Bind(wxEVT_MENU, &DSPDebuggerLLE::OnChangeState, this, ID_RUNTOOL, ID_SHOWPCTOOL);
+
+	m_DebuggerFrame = this;
+
+	// notify wxAUI which frame to use
+	m_mgr.SetManagedWindow(this);
+	m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+
+	m_Toolbar = new wxAuiToolBar(this, ID_TOOLBAR,
+		wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT);
+	m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"),
+		wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
+	m_Toolbar->AddTool(ID_STEPTOOL, _("Step"),
+		wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(10,10)));
+	m_Toolbar->AddTool(ID_SHOWPCTOOL, _("Show PC"),
+		wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, wxSize(10,10)));
+	m_Toolbar->AddSeparator();
+
+	m_addr_txtctrl = new wxTextCtrl(m_Toolbar, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+	m_addr_txtctrl->Bind(wxEVT_TEXT_ENTER, &DSPDebuggerLLE::OnAddrBoxChange, this);
+
+	m_Toolbar->AddControl(m_addr_txtctrl);
+	m_Toolbar->Realize();
+
+	m_SymbolList = new wxListBox(this, wxID_ANY, wxDefaultPosition,
+		wxSize(140, 100), 0, nullptr, wxLB_SORT);
+	m_SymbolList->Bind(wxEVT_LISTBOX, &DSPDebuggerLLE::OnSymbolListChange, this);
+
+	m_MainNotebook = new wxAuiNotebook(this, wxID_ANY,
+		wxDefaultPosition, wxDefaultSize,
+		wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE);
+
+	wxPanel *code_panel = new wxPanel(m_MainNotebook, wxID_ANY);
+	wxBoxSizer *code_sizer = new wxBoxSizer(wxVERTICAL);
+	m_CodeView = new CCodeView(&debug_interface, &DSPSymbols::g_dsp_symbol_db, code_panel);
+	m_CodeView->SetPlain();
+	code_sizer->Add(m_CodeView, 1, wxALL | wxEXPAND);
+	code_panel->SetSizer(code_sizer);
+	m_MainNotebook->AddPage(code_panel, _("Disassembly"), true);
+
+	wxPanel *mem_panel = new wxPanel(m_MainNotebook, wxID_ANY);
+	wxBoxSizer *mem_sizer = new wxBoxSizer(wxVERTICAL);
+	// TODO insert memViewer class
+	m_MemView = new CMemoryView(&debug_interface, mem_panel);
+	mem_sizer->Add(m_MemView, 1, wxALL | wxEXPAND);
+	mem_panel->SetSizer(mem_sizer);
+	m_MainNotebook->AddPage(mem_panel, _("Memory"));
+
+	m_Regs = new DSPRegisterView(this);
+
+	// add the panes to the manager
+	m_mgr.AddPane(m_Toolbar, wxAuiPaneInfo().
+		ToolbarPane().Top().
+		LeftDockable(false).RightDockable(false));
+
+	m_mgr.AddPane(m_SymbolList, wxAuiPaneInfo().
+		Left().CloseButton(false).
+		Caption(_("Symbols")).Dockable(true));
+
+	m_mgr.AddPane(m_MainNotebook, wxAuiPaneInfo().
+		Name("m_MainNotebook").Center().
+		CloseButton(false).MaximizeButton(true));
+
+	m_mgr.AddPane(m_Regs, wxAuiPaneInfo().Right().
+		CloseButton(false).Caption(_("Registers")).
+		Dockable(true));
+
+	UpdateState();
+
+	m_mgr.Update();
+}
+
+DSPDebuggerLLE::~DSPDebuggerLLE()
+{
+	m_mgr.UnInit();
+	m_DebuggerFrame = nullptr;
+}
+
+void DSPDebuggerLLE::OnClose(wxCloseEvent& event)
+{
+	event.Skip();
+}
+
+void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event)
+{
+	if (DSPCore_GetState() == DSPCORE_STOP)
+		return;
+
+	switch (event.GetId())
+	{
+		case ID_RUNTOOL:
+			if (DSPCore_GetState() == DSPCORE_RUNNING)
+				DSPCore_SetState(DSPCORE_STEPPING);
+			else
+				DSPCore_SetState(DSPCORE_RUNNING);
+			break;
+
+		case ID_STEPTOOL:
+			if (DSPCore_GetState() == DSPCORE_STEPPING)
+			{
+				DSPCore_Step();
+				Update();
+			}
+			break;
+
+		case ID_SHOWPCTOOL:
+			FocusOnPC();
+			break;
+	}
+
+	UpdateState();
+	m_mgr.Update();
+}
+
+void Host_RefreshDSPDebuggerWindow()
+{
+	if (m_DebuggerFrame)
+		m_DebuggerFrame->Update();
+}
+
+void DSPDebuggerLLE::Update()
+{
+#if defined __WXGTK__
+	if (!wxIsMainThread())
+		wxMutexGuiEnter();
+#endif
+	UpdateSymbolMap();
+	UpdateDisAsmListView();
+	UpdateRegisterFlags();
+	UpdateState();
+#if defined __WXGTK__
+	if (!wxIsMainThread())
+		wxMutexGuiLeave();
+#endif
+}
+
+void DSPDebuggerLLE::FocusOnPC()
+{
+	JumpToAddress(g_dsp.pc);
+}
+
+void DSPDebuggerLLE::UpdateState()
+{
+	if (DSPCore_GetState() == DSPCORE_RUNNING)
+	{
+		m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Pause"));
+		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
+			wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
+		m_Toolbar->EnableTool(ID_STEPTOOL, false);
+	}
+	else
+	{
+		m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Run"));
+		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
+			wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_OTHER, wxSize(10,10)));
+		m_Toolbar->EnableTool(ID_STEPTOOL, true);
+	}
+	m_Toolbar->Realize();
+}
+
+void DSPDebuggerLLE::UpdateDisAsmListView()
+{
+	if (m_CachedStepCounter == g_dsp.step_counter)
+		return;
+
+	// show PC
+	FocusOnPC();
+	m_CachedStepCounter = g_dsp.step_counter;
+	m_Regs->Update();
+}
+
+void DSPDebuggerLLE::UpdateSymbolMap()
+{
+	if (g_dsp.dram == nullptr)
+		return;
+
+	m_SymbolList->Freeze(); // HyperIris: wx style fast filling
+	m_SymbolList->Clear();
+	for (const auto& symbol : DSPSymbols::g_dsp_symbol_db.Symbols())
+	{
+		int idx = m_SymbolList->Append(StrToWxStr(symbol.second.name));
+		m_SymbolList->SetClientData(idx, (void*)&symbol.second);
+	}
+	m_SymbolList->Thaw();
+}
+
+void DSPDebuggerLLE::OnSymbolListChange(wxCommandEvent& event)
+{
+	int index = m_SymbolList->GetSelection();
+	if (index >= 0)
+	{
+		Symbol* pSymbol = static_cast<Symbol *>(m_SymbolList->GetClientData(index));
+		if (pSymbol != nullptr)
+		{
+			if (pSymbol->type == Symbol::SYMBOL_FUNCTION)
+			{
+				JumpToAddress(pSymbol->address);
+			}
+		}
+	}
+}
+
+void DSPDebuggerLLE::UpdateRegisterFlags()
+{
+}
+
+void DSPDebuggerLLE::OnAddrBoxChange(wxCommandEvent& event)
+{
+	wxString txt = m_addr_txtctrl->GetValue();
+
+	auto text = StripSpaces(WxStrToStr(txt));
+	if (text.size())
+	{
+		u32 addr;
+		sscanf(text.c_str(), "%04x", &addr);
+		if (JumpToAddress(addr))
+			m_addr_txtctrl->SetBackgroundColour(*wxWHITE);
+		else
+			m_addr_txtctrl->SetBackgroundColour(*wxRED);
+	}
+	event.Skip();
+}
+
+bool DSPDebuggerLLE::JumpToAddress(u16 addr)
+{
+	int page = m_MainNotebook->GetSelection();
+	if (page == 0)
+	{
+		// Center on valid instruction in IRAM/IROM
+		int new_line = DSPSymbols::Addr2Line(addr);
+		if (new_line >= 0)
+		{
+			m_CodeView->Center(new_line);
+			return true;
+		}
+	}
+	else if (page == 1)
+	{
+		// Center on any location in any valid ROM/RAM
+		int seg = addr >> 12;
+		if (seg == 0 || seg == 1 ||
+			seg == 8 || seg == 0xf)
+		{
+			m_MemView->Center(addr);
+			return true;
+		}
+	}
+
+	return false;
+}
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
new file mode 100644
index 0000000000..b3c7e6d720
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
@@ -0,0 +1,68 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/DSPLLE/DSPDebugInterface.h"
+
+class DSPRegisterView;
+class CCodeView;
+class CMemoryView;
+class wxAuiNotebook;
+class wxAuiToolBar;
+class wxListBox;
+
+class DSPDebuggerLLE : public wxPanel
+{
+public:
+	DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY);
+	virtual ~DSPDebuggerLLE();
+
+	void Update() override;
+
+private:
+	enum
+	{
+		ID_TOOLBAR = 1000,
+		ID_RUNTOOL,
+		ID_STEPTOOL,
+		ID_SHOWPCTOOL,
+	};
+
+	DSPDebugInterface debug_interface;
+	u64 m_CachedStepCounter;
+
+	// GUI updaters
+	void UpdateDisAsmListView();
+	void UpdateRegisterFlags();
+	void UpdateSymbolMap();
+	void UpdateState();
+
+	// GUI items
+	wxAuiManager m_mgr;
+	wxAuiToolBar* m_Toolbar;
+	CCodeView* m_CodeView;
+	CMemoryView* m_MemView;
+	DSPRegisterView* m_Regs;
+	wxListBox* m_SymbolList;
+	wxTextCtrl* m_addr_txtctrl;
+	wxAuiNotebook* m_MainNotebook;
+
+	void OnClose(wxCloseEvent& event);
+	void OnChangeState(wxCommandEvent& event);
+	//void OnRightClick(wxListEvent& event);
+	//void OnDoubleClick(wxListEvent& event);
+	void OnAddrBoxChange(wxCommandEvent& event);
+	void OnSymbolListChange(wxCommandEvent& event);
+
+	bool JumpToAddress(u16 addr);
+
+	void FocusOnPC();
+	//void UnselectAll();
+};
+
diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
new file mode 100644
index 0000000000..fac8e450ca
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
@@ -0,0 +1,88 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/colour.h>
+#include <wx/grid.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPTables.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DSPRegisterView.h"
+
+
+wxString CDSPRegTable::GetValue(int row, int col)
+{
+	if (row < 32) // 32 "normal" regs
+	{
+		switch (col)
+		{
+		case 0: return StrToWxStr(pdregname(row));
+		case 1: return wxString::Format("0x%04x", DSPCore_ReadRegister(row));
+		default: return wxEmptyString;
+		}
+	}
+	return wxEmptyString;
+}
+
+void CDSPRegTable::SetValue(int, int, const wxString &)
+{
+}
+
+void CDSPRegTable::UpdateCachedRegs()
+{
+	if (m_CachedCounter == g_dsp.step_counter)
+	{
+		return;
+	}
+
+	m_CachedCounter = g_dsp.step_counter;
+
+	for (int i = 0; i < 32; ++i)
+	{
+		m_CachedRegHasChanged[i] = (m_CachedRegs[i] != DSPCore_ReadRegister(i));
+		m_CachedRegs[i] = DSPCore_ReadRegister(i);
+	}
+}
+
+wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
+{
+	wxGridCellAttr *attr = new wxGridCellAttr();
+
+	attr->SetBackgroundColour(*wxWHITE);
+
+	switch (col)
+	{
+	case 1:
+		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
+		break;
+	default:
+		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+		break;
+	}
+
+	if (col == 1)
+		attr->SetTextColour(m_CachedRegHasChanged[row] ? *wxRED : *wxBLACK);
+
+	return attr;
+}
+
+DSPRegisterView::DSPRegisterView(wxWindow *parent, wxWindowID id)
+	: wxGrid(parent, id, wxDefaultPosition, wxSize(130, 120))
+{
+	m_register_table = new CDSPRegTable();
+
+	SetTable(m_register_table, true);
+	SetRowLabelSize(0);
+	SetColLabelSize(0);
+	DisableDragRowSize();
+
+	AutoSizeColumns();
+}
+
+void DSPRegisterView::Update()
+{
+	m_register_table->UpdateCachedRegs();
+	ForceRefresh();
+}
diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
new file mode 100644
index 0000000000..8a000b34c3
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
@@ -0,0 +1,46 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstring>
+#include <wx/grid.h>
+
+#include "Common/CommonTypes.h"
+
+class CDSPRegTable : public wxGridTableBase
+{
+private:
+	u64 m_CachedCounter;
+	u16 m_CachedRegs[32];
+	bool m_CachedRegHasChanged[32];
+
+	DECLARE_NO_COPY_CLASS(CDSPRegTable);
+
+public:
+	CDSPRegTable()
+	{
+		memset(m_CachedRegs, 0, sizeof(m_CachedRegs));
+		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
+	}
+
+	int GetNumberCols() override { return 2; }
+	int GetNumberRows() override { return 32; }
+	bool IsEmptyCell(int row, int col) override { return false; }
+	wxString GetValue(int row, int col) override;
+	void SetValue(int row, int col, const wxString &) override;
+	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
+	void UpdateCachedRegs();
+};
+
+class DSPRegisterView : public wxGrid
+{
+public:
+	DSPRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
+	void Update() override;
+
+private:
+	// Owned by wx. Deleted implicitly upon destruction.
+	CDSPRegTable* m_register_table;
+};
diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp
new file mode 100644
index 0000000000..095c0f9ebe
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp
@@ -0,0 +1,361 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <string>
+#include <wx/button.h>
+#include <wx/choice.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DebuggerPanel.h"
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/TextureCacheBase.h"
+
+GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position,
+									const wxSize& size, long style, const wxString &title)
+	: wxPanel(parent, id, position, size, style, title)
+{
+	g_pdebugger = this;
+
+	CreateGUIControls();
+
+	Bind(wxEVT_CLOSE_WINDOW, &GFXDebuggerPanel::OnClose, this);
+
+	LoadSettings();
+}
+
+GFXDebuggerPanel::~GFXDebuggerPanel()
+{
+	g_pdebugger = nullptr;
+	GFXDebuggerPauseFlag = false;
+}
+
+void GFXDebuggerPanel::OnClose(wxCloseEvent& event)
+{
+	// save the window position when we hide the window
+	SaveSettings();
+
+	event.Skip();
+}
+
+void GFXDebuggerPanel::SaveSettings() const
+{
+	IniFile file;
+	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	// TODO: make this work when we close the entire program too, currently on total close we get
+	// weird values, perhaps because of some conflict with the rendering window
+
+	// TODO: get the screen resolution and make limits from that
+	if (GetPosition().x < 1000 &&
+	    GetPosition().y < 1000 &&
+	    GetSize().GetWidth() < 1000 &&
+	    GetSize().GetHeight() < 1000)
+	{
+		IniFile::Section* video_window = file.GetOrCreateSection("VideoWindow");
+		video_window->Set("x", GetPosition().x);
+		video_window->Set("y", GetPosition().y);
+		video_window->Set("w", GetSize().GetWidth());
+		video_window->Set("h", GetSize().GetHeight());
+	}
+
+	file.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+}
+
+void GFXDebuggerPanel::LoadSettings()
+{
+	IniFile file;
+	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	int x = 100;
+	int y = 100;
+	int w = 100;
+	int h = 100;
+
+	IniFile::Section* video_window = file.GetOrCreateSection("VideoWindow");
+	video_window->Get("x", &x, GetPosition().x);
+	video_window->Get("y", &y, GetPosition().y);
+	video_window->Get("w", &w, GetSize().GetWidth());
+	video_window->Get("h", &h, GetSize().GetHeight());
+
+	SetSize(x, y, w, h);
+}
+
+struct PauseEventMap
+{
+	PauseEvent event;
+	const wxString ListStr;
+};
+
+static PauseEventMap* pauseEventMap;
+
+void GFXDebuggerPanel::CreateGUIControls()
+{
+	static PauseEventMap map[] = {
+		{NEXT_FRAME,                _("Frame")},
+		{NEXT_FLUSH,                _("Flush")},
+
+		{NEXT_PIXEL_SHADER_CHANGE,  _("Pixel Shader")},
+		{NEXT_VERTEX_SHADER_CHANGE, _("Vertex Shader")},
+		{NEXT_TEXTURE_CHANGE,       _("Texture")},
+		{NEXT_NEW_TEXTURE,          _("New Texture")},
+
+		{NEXT_XFB_CMD,              _("XFB Cmd")},
+		{NEXT_EFB_CMD,              _("EFB Cmd")},
+
+		{NEXT_MATRIX_CMD,           _("Matrix Cmd")},
+		{NEXT_VERTEX_CMD,           _("Vertex Cmd")},
+		{NEXT_TEXTURE_CMD,          _("Texture Cmd")},
+		{NEXT_LIGHT_CMD,            _("Light Cmd")},
+		{NEXT_FOG_CMD,              _("Fog Cmd")},
+
+		{NEXT_SET_TLUT,             _("TLUT Cmd")},
+
+		{NEXT_ERROR,                _("Error")}
+	};
+	pauseEventMap = map;
+	const int numPauseEventMap = sizeof(map)/sizeof(PauseEventMap);
+
+	// Basic settings
+	CenterOnParent();
+
+	m_pButtonPause = new wxButton(this, wxID_ANY, _("Pause"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause"));
+	m_pButtonPause->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnPauseButton, this);
+
+	m_pButtonPauseAtNext = new wxButton(this, wxID_ANY, _("Pause After"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause At Next"));
+	m_pButtonPauseAtNext->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnPauseAtNextButton, this);
+
+	m_pButtonPauseAtNextFrame = new wxButton(this, wxID_ANY, _("Go to Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Next Frame"));
+	m_pButtonPauseAtNextFrame->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnPauseAtNextFrameButton, this);
+
+	m_pButtonCont = new wxButton(this, wxID_ANY, _("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Continue"));
+	m_pButtonCont->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnContButton, this);
+
+	m_pCount = new wxTextCtrl(this, wxID_ANY, "1", wxDefaultPosition, wxSize(50,25), wxTE_RIGHT, wxDefaultValidator, _("Count"));
+
+	m_pPauseAtList = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(100,25), 0, nullptr,0,wxDefaultValidator, _("PauseAtList"));
+	for (int i=0; i<numPauseEventMap; i++)
+	{
+		m_pPauseAtList->Append(pauseEventMap[i].ListStr);
+	}
+	m_pPauseAtList->SetSelection(0);
+
+	m_pButtonDump = new wxButton(this, wxID_ANY, _("Dump"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Dump"));
+	m_pButtonDump->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnDumpButton, this);
+
+	m_pButtonUpdateScreen = new wxButton(this, wxID_ANY, _("Update Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Update Screen"));
+	m_pButtonUpdateScreen->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnUpdateScreenButton, this);
+
+	m_pButtonClearScreen = new wxButton(this, wxID_ANY, _("Clear Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Screen"));
+	m_pButtonClearScreen->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearScreenButton, this);
+
+	m_pButtonClearTextureCache = new wxButton(this, wxID_ANY, _("Clear Textures"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Textures"));
+	m_pButtonClearTextureCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearTextureCacheButton, this);
+
+	m_pButtonClearVertexShaderCache = new wxButton(this, wxID_ANY, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear V Shaders"));
+	m_pButtonClearVertexShaderCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearVertexShaderCacheButton, this);
+
+	m_pButtonClearPixelShaderCache = new wxButton(this, wxID_ANY, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear P Shaders"));
+	m_pButtonClearPixelShaderCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearPixelShaderCacheButton, this);
+
+	m_pDumpList = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(120,25), 0, nullptr, 0 ,wxDefaultValidator, _("DumpList"));
+	m_pDumpList->Insert(_("Pixel Shader"),0);
+	m_pDumpList->Append(_("Vertex Shader"));
+	m_pDumpList->Append(_("Pixel Shader Constants"));
+	m_pDumpList->Append(_("Vertex Shader Constants"));
+	m_pDumpList->Append(_("Textures"));
+	m_pDumpList->Append(_("Frame Buffer"));
+	m_pDumpList->Append(_("Geometry data"));
+	m_pDumpList->Append(_("Vertex Description"));
+	m_pDumpList->Append(_("Vertex Matrices"));
+	m_pDumpList->Append(_("Statistics"));
+	m_pDumpList->SetSelection(0);
+
+	// Layout everything on m_MainPanel
+	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
+
+	wxStaticBoxSizer* const pFlowCtrlBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Flow Control"));
+	wxBoxSizer* const pPauseAtNextSzr = new wxBoxSizer(wxHORIZONTAL);
+	pFlowCtrlBox->Add(m_pButtonPause);
+	pPauseAtNextSzr->Add(m_pButtonPauseAtNext);
+	pPauseAtNextSzr->Add(m_pCount);
+	pPauseAtNextSzr->Add(m_pPauseAtList);
+	pFlowCtrlBox->Add(pPauseAtNextSzr);
+	pFlowCtrlBox->Add(m_pButtonPauseAtNextFrame);
+	pFlowCtrlBox->Add(m_pButtonCont);
+
+	wxStaticBoxSizer* const pDebugBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Debugging"));
+	wxBoxSizer* const pDumpSzr = new wxBoxSizer(wxHORIZONTAL);
+	pDumpSzr->Add(m_pButtonDump);
+	pDumpSzr->Add(m_pDumpList);
+	pDebugBox->Add(pDumpSzr);
+	wxGridSizer* const pDbgGrid = new wxGridSizer(2, 5, 5);
+	pDbgGrid->Add(m_pButtonUpdateScreen);
+	pDbgGrid->Add(m_pButtonClearScreen);
+	pDbgGrid->Add(m_pButtonClearTextureCache);
+	pDbgGrid->Add(m_pButtonClearVertexShaderCache);
+	pDbgGrid->Add(m_pButtonClearPixelShaderCache);
+	pDebugBox->Add(pDbgGrid);
+
+	sMain->Add(pFlowCtrlBox, 0, 0, 5);
+	sMain->Add(pDebugBox, 0, 0, 5);
+	SetSizerAndFit(sMain);
+
+	OnContinue();
+}
+
+void GFXDebuggerPanel::OnPause()
+{
+	m_pButtonDump->Enable();
+	m_pDumpList->Enable();
+	m_pButtonUpdateScreen->Enable();
+	m_pButtonClearScreen->Enable();
+	m_pButtonClearTextureCache->Enable();
+	m_pButtonClearVertexShaderCache->Enable();
+	m_pButtonClearPixelShaderCache->Enable();
+}
+
+void GFXDebuggerPanel::OnContinue()
+{
+	m_pButtonDump->Disable();
+	m_pDumpList->Disable();
+	m_pButtonUpdateScreen->Disable();
+	m_pButtonClearScreen->Disable();
+	m_pButtonClearTextureCache->Disable();
+	m_pButtonClearVertexShaderCache->Disable();
+	m_pButtonClearPixelShaderCache->Disable();
+}
+
+
+// General settings
+void GFXDebuggerPanel::GeneralSettings(wxCommandEvent& event)
+{
+	SaveSettings();
+}
+
+void GFXDebuggerPanel::OnPauseButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = true;
+}
+
+void GFXDebuggerPanel::OnPauseAtNextButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = false;
+	GFXDebuggerToPauseAtNext = pauseEventMap[m_pPauseAtList->GetSelection()].event;
+	wxString val = m_pCount->GetValue();
+	long value;
+	if (val.ToLong(&value))
+		GFXDebuggerEventToPauseCount = value;
+	else
+		GFXDebuggerEventToPauseCount = 1;
+}
+
+void GFXDebuggerPanel::OnPauseAtNextFrameButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = false;
+	GFXDebuggerToPauseAtNext = NEXT_FRAME;
+	GFXDebuggerEventToPauseCount = 1;
+}
+
+void GFXDebuggerPanel::OnDumpButton(wxCommandEvent& event)
+{
+	std::string dump_path = File::GetUserPath(D_DUMP_IDX) + "Debug/" +
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID + "/";
+	if (!File::CreateFullPath(dump_path))
+		return;
+
+	switch (m_pDumpList->GetSelection())
+	{
+		case 0: // Pixel Shader
+			DumpPixelShader(dump_path);
+			break;
+
+		case 1: // Vertex Shader
+			DumpVertexShader(dump_path);
+			break;
+
+		case 2: // Pixel Shader Constants
+			DumpPixelShaderConstants(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 3: // Vertex Shader Constants
+			DumpVertexShaderConstants(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 4: // Textures
+			DumpTextures(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 5: // Frame Buffer
+			DumpFrameBuffer(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 6: // Geometry
+			DumpGeometry(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 7: // Vertex Description
+			DumpVertexDecl(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 8: // Vertex Matrices
+			DumpMatrices(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+
+		case 9: // Statistics
+			DumpStats(dump_path);
+			WxUtils::ShowErrorDialog(_("Not implemented"));
+			break;
+	}
+}
+
+void GFXDebuggerPanel::OnContButton(wxCommandEvent& event)
+{
+	GFXDebuggerToPauseAtNext = NOT_PAUSE;
+	GFXDebuggerPauseFlag = false;
+}
+
+void GFXDebuggerPanel::OnClearScreenButton(wxCommandEvent& event)
+{
+	// TODO
+	WxUtils::ShowErrorDialog(_("Not implemented"));
+}
+
+void GFXDebuggerPanel::OnClearTextureCacheButton(wxCommandEvent& event)
+{
+	TextureCache::Invalidate();
+}
+
+void GFXDebuggerPanel::OnClearVertexShaderCacheButton(wxCommandEvent& event)
+{
+	// TODO
+	WxUtils::ShowErrorDialog(_("Not implemented"));
+}
+
+void GFXDebuggerPanel::OnClearPixelShaderCacheButton(wxCommandEvent& event)
+{
+	// TODO
+	WxUtils::ShowErrorDialog(_("Not implemented"));
+}
+
+void GFXDebuggerPanel::OnUpdateScreenButton(wxCommandEvent& event)
+{
+	WxUtils::ShowErrorDialog(_("Not implemented"));
+	GFXDebuggerUpdateScreen();
+}
diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h
new file mode 100644
index 0000000000..8715c29f2c
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h
@@ -0,0 +1,78 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+#include "VideoCommon/Debugger.h"
+
+class wxButton;
+class wxChoice;
+class wxTextCtrl;
+
+class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
+{
+public:
+	GFXDebuggerPanel(wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxTAB_TRAVERSAL,
+		const wxString &title = _("GFX Debugger"));
+
+	virtual ~GFXDebuggerPanel();
+
+	void SaveSettings() const;
+	void LoadSettings();
+
+	bool bInfoLog;
+	bool bPrimLog;
+	bool bSaveTextures;
+	bool bSaveTargets;
+	bool bSaveShaders;
+
+	void OnPause() override;
+
+	// Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished
+	void OnContinue() override;
+
+private:
+	wxPanel*    m_MainPanel;
+
+	wxButton*   m_pButtonPause;
+	wxButton*   m_pButtonPauseAtNext;
+	wxButton*   m_pButtonPauseAtNextFrame;
+	wxButton*   m_pButtonCont;
+	wxChoice*   m_pPauseAtList;
+	wxButton*   m_pButtonDump;
+	wxChoice*   m_pDumpList;
+	wxButton*   m_pButtonUpdateScreen;
+	wxButton*   m_pButtonClearScreen;
+	wxButton*   m_pButtonClearTextureCache;
+	wxButton*   m_pButtonClearVertexShaderCache;
+	wxButton*   m_pButtonClearPixelShaderCache;
+	wxTextCtrl* m_pCount;
+
+	void OnClose(wxCloseEvent& event);
+	void CreateGUIControls();
+
+	void GeneralSettings(wxCommandEvent& event);
+
+	// These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occurred)
+	void OnPauseButton(wxCommandEvent& event);
+	void OnPauseAtNextButton(wxCommandEvent& event);
+
+	void OnPauseAtNextFrameButton(wxCommandEvent& event);
+	void OnDumpButton(wxCommandEvent& event);
+
+	// sets GFXDebuggerPauseFlag to false
+	void OnContButton(wxCommandEvent& event);
+
+	void OnUpdateScreenButton(wxCommandEvent& event);
+	void OnClearScreenButton(wxCommandEvent& event);
+	void OnClearTextureCacheButton(wxCommandEvent& event);
+	void OnClearVertexShaderCacheButton(wxCommandEvent& event);
+	void OnClearPixelShaderCacheButton(wxCommandEvent& event);
+	void OnCountEnter(wxCommandEvent& event);
+};
diff --git a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp
new file mode 100644
index 0000000000..e3a399aa92
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp
@@ -0,0 +1,10 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/font.h>
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
+// The default font
+wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, "monospace");
+
diff --git a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h
new file mode 100644
index 0000000000..4925749b29
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h
@@ -0,0 +1,9 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/font.h>
+
+extern wxFont DebuggerFont;
diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp
new file mode 100644
index 0000000000..a86afee4f9
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp
@@ -0,0 +1,184 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <cstring>
+#include <disasm.h>        // Bochs
+#include <sstream>
+
+#include <wx/button.h>
+#include <wx/listctrl.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/GekkoDisassembler.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+#include "UICommon/Disassembler.h"
+
+CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos,
+		const wxSize& size, long style, const wxString& name)
+: wxPanel(parent, id, pos, size, style, name)
+{
+	wxBoxSizer* sizerBig   = new wxBoxSizer(wxVERTICAL);
+	wxBoxSizer* sizerSplit = new wxBoxSizer(wxHORIZONTAL);
+	sizerSplit->Add(ppc_box = new wxTextCtrl(this, wxID_ANY, "(ppc)",
+				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
+	sizerSplit->Add(x86_box = new wxTextCtrl(this, wxID_ANY, "(x86)",
+				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
+	sizerBig->Add(block_list = new JitBlockList(this, wxID_ANY,
+				wxDefaultPosition, wxSize(100, 140),
+				wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING),
+				0, wxEXPAND);
+	sizerBig->Add(sizerSplit, 2, wxEXPAND);
+
+	sizerBig->Add(button_refresh = new wxButton(this, wxID_ANY, _("&Refresh")));
+	button_refresh->Bind(wxEVT_BUTTON, &CJitWindow::OnRefresh, this);
+
+	SetSizer(sizerBig);
+
+	sizerSplit->Fit(this);
+	sizerBig->Fit(this);
+
+#if defined(_M_X86)
+	m_disassembler.reset(GetNewDisassembler("x86"));
+#elif defined(_M_ARM_64)
+	m_disassembler.reset(GetNewDisassembler("aarch64"));
+#else
+	m_disassembler.reset(GetNewDisassembler("UNK"));
+#endif
+}
+
+void CJitWindow::OnRefresh(wxCommandEvent& /*event*/)
+{
+	block_list->Update();
+}
+
+void CJitWindow::ViewAddr(u32 em_address)
+{
+	Show(true);
+	Compare(em_address);
+	SetFocus();
+}
+
+void CJitWindow::Compare(u32 em_address)
+{
+	// Get host side code disassembly
+	u32 host_instructions_count = 0;
+	u32 host_code_size = 0;
+	std::string host_instructions_disasm;
+	host_instructions_disasm = DisassembleBlock(m_disassembler.get(), &em_address, &host_instructions_count, &host_code_size);
+
+	x86_box->SetValue(host_instructions_disasm);
+
+	// == Fill in ppc box
+	u32 ppc_addr = em_address;
+	PPCAnalyst::CodeBuffer code_buffer(32000);
+	PPCAnalyst::BlockStats st;
+	PPCAnalyst::BlockRegStats gpa;
+	PPCAnalyst::BlockRegStats fpa;
+	PPCAnalyst::CodeBlock code_block;
+	PPCAnalyst::PPCAnalyzer analyzer;
+	analyzer.SetOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE);
+
+	code_block.m_stats = &st;
+	code_block.m_gpa = &gpa;
+	code_block.m_fpa = &fpa;
+
+	if (analyzer.Analyze(ppc_addr, &code_block, &code_buffer, 32000) != 0xFFFFFFFF)
+	{
+		std::ostringstream ppc_disasm;
+		for (u32 i = 0; i < code_block.m_num_instructions; i++)
+		{
+			const PPCAnalyst::CodeOp &op = code_buffer.codebuffer[i];
+			std::string opcode = GekkoDisassembler::Disassemble(op.inst.hex, op.address);
+			ppc_disasm << std::setfill('0') << std::setw(8) << std::hex << op.address;
+			ppc_disasm << " " << opcode << std::endl;
+		}
+
+		// Add stats to the end of the ppc box since it's generally the shortest.
+		ppc_disasm << std::dec << std::endl;
+
+		// Add some generic analysis
+		if (st.isFirstBlockOfFunction)
+			ppc_disasm << "(first block of function)" << std::endl;
+		if (st.isLastBlockOfFunction)
+			ppc_disasm << "(last block of function)" << std::endl;
+
+		ppc_disasm << st.numCycles << " estimated cycles" << std::endl;
+
+		ppc_disasm << "Num instr: PPC: " << code_block.m_num_instructions
+		           << " x86: " << host_instructions_count
+		           << " (blowup: " << 100 * host_instructions_count / code_block.m_num_instructions - 100
+		           << "%)" << std::endl;
+
+		ppc_disasm << "Num bytes: PPC: " << code_block.m_num_instructions * 4
+		           << " x86: " << host_code_size
+		           << " (blowup: " << 100 * host_code_size / (4 * code_block.m_num_instructions) - 100
+		           << "%)" << std::endl;
+
+		ppc_box->SetValue(ppc_disasm.str());
+	}
+	else
+	{
+		ppc_box->SetValue(StringFromFormat("(non-code address: %08x)", em_address));
+		x86_box->SetValue("---");
+	}
+}
+
+void CJitWindow::Update()
+{
+
+}
+
+void CJitWindow::OnHostMessage(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_NOTIFY_MAP_LOADED:
+			//NotifyMapLoaded();
+			break;
+	}
+}
+
+// JitBlockList
+//================
+
+enum
+{
+	COLUMN_ADDRESS,
+	COLUMN_PPCSIZE,
+	COLUMN_X86SIZE,
+	COLUMN_NAME,
+	COLUMN_FLAGS,
+	COLUMN_NUMEXEC,
+	COLUMN_COST,  // (estimated as x86size * numexec)
+};
+
+JitBlockList::JitBlockList(wxWindow* parent, const wxWindowID id,
+		const wxPoint& pos, const wxSize& size, long style)
+	: wxListCtrl(parent, id, pos, size, style) // | wxLC_VIRTUAL)
+{
+	Init();
+}
+
+void JitBlockList::Init()
+{
+	InsertColumn(COLUMN_ADDRESS, _("Address"));
+	InsertColumn(COLUMN_PPCSIZE, _("PPC Size"));
+	InsertColumn(COLUMN_X86SIZE, _("x86 Size"));
+	InsertColumn(COLUMN_NAME, _("Symbol"));
+	InsertColumn(COLUMN_FLAGS, _("Flags"));
+	InsertColumn(COLUMN_NUMEXEC, _("NumExec"));
+	InsertColumn(COLUMN_COST, _("Cost"));
+}
+
+void JitBlockList::Update()
+{
+}
diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h
similarity index 75%
rename from Source/Core/DolphinWX/Src/Debugger/JitWindow.h
rename to Source/Core/DolphinWX/Debugger/JitWindow.h
index 3860241531..e49bbe68af 100644
--- a/Source/Core/DolphinWX/Src/Debugger/JitWindow.h
+++ b/Source/Core/DolphinWX/Debugger/JitWindow.h
@@ -1,20 +1,21 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef JITWINDOW_H_
-#define JITWINDOW_H_
+#pragma once
 
+#include <memory>
 #include <vector>
 
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
 #include <wx/listctrl.h>
-#include <wx/listbox.h>
+#include <wx/panel.h>
 
-#include "MemoryView.h"
-#include "Thread.h"
-#include "CoreParameter.h"
+#include "Common/CommonTypes.h"
+#include "UICommon/Disassembler.h"
+
+class wxButton;
+class wxListBox;
+class wxTextCtrl;
 
 class JitBlockList : public wxListCtrl
 {
@@ -22,9 +23,10 @@ class JitBlockList : public wxListCtrl
 public:
 	JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
 	void Init();
-	void Update();
+	void Update() override;
 };
 
+
 class CJitWindow : public wxPanel
 {
 public:
@@ -36,24 +38,21 @@ public:
 		const wxString& name = _("JIT block viewer"));
 
 	void ViewAddr(u32 em_address);
-	void Update();
+	void Update() override;
 
 private:
 	void OnRefresh(wxCommandEvent& /*event*/);
 	void Compare(u32 em_address);
 
 	JitBlockList* block_list;
+	std::unique_ptr<HostDisassembler> m_disassembler;
 	wxButton* button_refresh;
 	wxTextCtrl* ppc_box;
 	wxTextCtrl* x86_box;
 	wxListBox* top_instructions;
 
-	DECLARE_EVENT_TABLE()
-
 	void OnSymbolListChange(wxCommandEvent& event);
 	void OnCallstackListChange(wxCommandEvent& event);
 	void OnAddrBoxChange(wxCommandEvent& event);
 	void OnHostMessage(wxCommandEvent& event);
 };
-
-#endif /*MEMORYWINDOW_*/
diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
new file mode 100644
index 0000000000..af438c227f
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
@@ -0,0 +1,100 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/MemoryCheckDlg.h"
+
+#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, _(text))
+
+MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow *parent)
+	: wxDialog(parent, wxID_ANY, _("Memory Check"))
+	, m_parent(parent)
+{
+	Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this);
+
+	m_pEditStartAddress = new wxTextCtrl(this, wxID_ANY, "");
+	m_pEditEndAddress = new wxTextCtrl(this, wxID_ANY, "");
+	m_pWriteFlag = new wxCheckBox(this, wxID_ANY, _("Write"));
+	m_pWriteFlag->SetValue(true);
+	m_pReadFlag = new wxCheckBox(this, wxID_ANY, _("Read"));
+
+	m_log_flag = new wxCheckBox(this, wxID_ANY, _("Log"));
+	m_log_flag->SetValue(true);
+	m_break_flag = new wxCheckBox(this, wxID_ANY, _("Break"));
+
+	wxStaticBoxSizer *sAddressRangeBox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Address Range"));
+	sAddressRangeBox->Add(TEXT_BOX("Start"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
+	sAddressRangeBox->Add(m_pEditStartAddress, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10);
+	sAddressRangeBox->Add(TEXT_BOX("End"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
+	sAddressRangeBox->Add(m_pEditEndAddress, 1, wxALIGN_CENTER_VERTICAL);
+
+	wxStaticBoxSizer *sActionBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Action"));
+	sActionBox->Add(m_pWriteFlag);
+	sActionBox->Add(m_pReadFlag);
+
+	wxBoxSizer* sFlags = new wxStaticBoxSizer(wxVERTICAL, this, _("Flags"));
+	sFlags->Add(m_log_flag);
+	sFlags->Add(m_break_flag);
+
+	wxBoxSizer *sControls = new wxBoxSizer(wxHORIZONTAL);
+	sControls->Add(sAddressRangeBox, 0, wxEXPAND);
+	sControls->Add(sActionBox, 0, wxEXPAND);
+	sControls->Add(sFlags, 0, wxEXPAND);
+
+	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
+	sMainSizer->Add(sControls, 0, wxEXPAND | wxALL, 5);
+	sMainSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	SetSizerAndFit(sMainSizer);
+	SetFocus();
+}
+
+void MemoryCheckDlg::OnOK(wxCommandEvent& event)
+{
+	wxString StartAddressString = m_pEditStartAddress->GetLineText(0);
+	wxString EndAddressString = m_pEditEndAddress->GetLineText(0);
+	bool OnRead = m_pReadFlag->GetValue();
+	bool OnWrite = m_pWriteFlag->GetValue();
+	bool Log = m_log_flag->GetValue();
+	bool Break = m_break_flag->GetValue();
+
+	u32 StartAddress, EndAddress;
+	bool EndAddressOK = EndAddressString.Len() &&
+		AsciiToHex(WxStrToStr(EndAddressString), EndAddress);
+
+	if (AsciiToHex(WxStrToStr(StartAddressString), StartAddress) &&
+		(OnRead || OnWrite) && (Log || Break))
+	{
+		TMemCheck MemCheck;
+
+		if (!EndAddressOK)
+			EndAddress = StartAddress;
+
+		MemCheck.StartAddress = StartAddress;
+		MemCheck.EndAddress = EndAddress;
+		MemCheck.bRange = StartAddress != EndAddress;
+		MemCheck.OnRead = OnRead;
+		MemCheck.OnWrite = OnWrite;
+		MemCheck.Log = Log;
+		MemCheck.Break = Break;
+
+		PowerPC::memchecks.Add(MemCheck);
+		m_parent->NotifyUpdate();
+		Close();
+	}
+
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
new file mode 100644
index 0000000000..9a9581ef6b
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
@@ -0,0 +1,28 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+class CBreakPointWindow;
+class wxCheckBox;
+class wxTextCtrl;
+
+class MemoryCheckDlg : public wxDialog
+{
+public:
+	MemoryCheckDlg(CBreakPointWindow *parent);
+
+private:
+	CBreakPointWindow *m_parent;
+	wxCheckBox* m_pReadFlag;
+	wxCheckBox* m_pWriteFlag;
+	wxCheckBox* m_log_flag;
+	wxCheckBox* m_break_flag;
+	wxTextCtrl* m_pEditEndAddress;
+	wxTextCtrl* m_pEditStartAddress;
+
+	void OnOK(wxCommandEvent& event);
+};
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
new file mode 100644
index 0000000000..b5ecfa339b
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@@ -0,0 +1,423 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <string>
+#include <wx/brush.h>
+#include <wx/clipbrd.h>
+#include <wx/colour.h>
+#include <wx/control.h>
+#include <wx/dataobj.h>
+#include <wx/dcclient.h>
+#include <wx/font.h>
+#include <wx/menu.h>
+#include <wx/pen.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/DebugInterface.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/MemoryView.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+enum
+{
+	IDM_GOTOINMEMVIEW = 12000,
+	IDM_COPYADDRESS,
+	IDM_COPYHEX,
+	IDM_COPYCODE,
+	IDM_RUNTOHERE,
+	IDM_DYNARECRESULTS,
+	IDM_WATCHADDRESS,
+	IDM_TOGGLEMEMORY,
+	IDM_VIEWASFP,
+	IDM_VIEWASASCII,
+	IDM_VIEWASHEX,
+};
+
+CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent)
+	: wxControl(parent, wxID_ANY)
+	, curAddress(debuginterface->GetPC())
+	, debugger(debuginterface)
+	, align(debuginterface->GetInstructionSize(0))
+	, rowHeight(13)
+	, selection(0)
+	, oldSelection(0)
+	, selecting(false)
+	, memory(0)
+	, viewAsType(VIEWAS_FP)
+{
+	Bind(wxEVT_PAINT, &CMemoryView::OnPaint, this);
+	Bind(wxEVT_LEFT_DOWN, &CMemoryView::OnMouseDownL, this);
+	Bind(wxEVT_LEFT_UP, &CMemoryView::OnMouseUpL, this);
+	Bind(wxEVT_MOTION, &CMemoryView::OnMouseMove, this);
+	Bind(wxEVT_RIGHT_DOWN, &CMemoryView::OnMouseDownR, this);
+	Bind(wxEVT_MOUSEWHEEL, &CMemoryView::OnScrollWheel, this);
+	Bind(wxEVT_MENU, &CMemoryView::OnPopupMenu, this);
+	Bind(wxEVT_SIZE, &CMemoryView::OnResize, this);
+}
+
+int CMemoryView::YToAddress(int y)
+{
+	wxRect rc = GetClientRect();
+	int ydiff = y - rc.height / 2 - rowHeight / 2;
+	ydiff = (int)(floorf((float)ydiff / (float)rowHeight)) + 1;
+	return curAddress + ydiff * align;
+}
+
+void CMemoryView::OnMouseDownL(wxMouseEvent& event)
+{
+	int x = event.m_x;
+	int y = event.m_y;
+
+	if (x > 16)
+	{
+		oldSelection = selection;
+		selection = YToAddress(y);
+		bool oldselecting = selecting;
+		selecting = true;
+
+		if (!oldselecting || (selection != oldSelection))
+			Refresh();
+	}
+	else
+	{
+		debugger->ToggleMemCheck(YToAddress(y));
+
+		Refresh();
+
+		// Propagate back to the parent window to update the breakpoint list.
+		wxCommandEvent evt(wxEVT_HOST_COMMAND, IDM_UPDATE_BREAKPOINTS);
+		GetEventHandler()->AddPendingEvent(evt);
+	}
+
+	event.Skip();
+}
+
+void CMemoryView::OnMouseMove(wxMouseEvent& event)
+{
+	wxRect rc = GetClientRect();
+
+	if (event.m_leftDown && event.m_x > 16)
+	{
+		if (event.m_y < 0)
+		{
+			curAddress -= align;
+			Refresh();
+		}
+		else if (event.m_y > rc.height)
+		{
+			curAddress += align;
+			Refresh();
+		}
+		else
+			OnMouseDownL(event);
+	}
+
+	event.Skip();
+}
+
+void CMemoryView::OnMouseUpL(wxMouseEvent& event)
+{
+	if (event.m_x > 16)
+	{
+		curAddress = YToAddress(event.m_y);
+		selecting = false;
+		Refresh();
+	}
+
+	event.Skip();
+}
+
+void CMemoryView::OnScrollWheel(wxMouseEvent& event)
+{
+	const bool scroll_down = (event.GetWheelRotation() < 0);
+	const int num_lines = event.GetLinesPerAction();
+
+	if (scroll_down)
+	{
+		curAddress += num_lines * 4;
+	}
+	else
+	{
+		curAddress -= num_lines * 4;
+	}
+
+	Refresh();
+	event.Skip();
+}
+
+void CMemoryView::OnPopupMenu(wxCommandEvent& event)
+{
+	CFrame* main_frame = (CFrame*)(GetParent()->GetParent()->GetParent());
+	CCodeWindow* code_window = main_frame->g_pCodeWindow;
+	CWatchWindow* watch_window = code_window->m_WatchWindow;
+
+#if wxUSE_CLIPBOARD
+	wxTheClipboard->Open();
+#endif
+
+	switch (event.GetId())
+	{
+#if wxUSE_CLIPBOARD
+		case IDM_COPYADDRESS:
+			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format("%08x", selection)));
+			break;
+
+		case IDM_COPYHEX:
+			{
+			std::string temp = StringFromFormat("%08x", debugger->ReadExtraMemory(memory, selection));
+			wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
+			}
+			break;
+#endif
+
+		case IDM_WATCHADDRESS:
+			debugger->AddWatch(selection);
+			if (watch_window)
+				watch_window->NotifyUpdate();
+			Refresh();
+			break;
+
+		case IDM_TOGGLEMEMORY:
+			memory ^= 1;
+			Refresh();
+			break;
+
+		case IDM_VIEWASFP:
+			viewAsType = VIEWAS_FP;
+			Refresh();
+			break;
+
+		case IDM_VIEWASASCII:
+			viewAsType = VIEWAS_ASCII;
+			Refresh();
+			break;
+		case IDM_VIEWASHEX:
+			viewAsType = VIEWAS_HEX;
+			Refresh();
+			break;
+	}
+
+#if wxUSE_CLIPBOARD
+	wxTheClipboard->Close();
+#endif
+	event.Skip();
+}
+
+void CMemoryView::OnMouseDownR(wxMouseEvent& event)
+{
+	// popup menu
+	wxMenu menu;
+	//menu.Append(IDM_GOTOINMEMVIEW, _("&Goto in mem view"));
+#if wxUSE_CLIPBOARD
+	menu.Append(IDM_COPYADDRESS, _("Copy &address"));
+	menu.Append(IDM_COPYHEX, _("Copy &hex"));
+#endif
+	menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
+	menu.Append(IDM_TOGGLEMEMORY, _("Toggle &memory"));
+
+	wxMenu* viewAsSubMenu = new wxMenu;
+	viewAsSubMenu->Append(IDM_VIEWASFP, _("FP value"));
+	viewAsSubMenu->Append(IDM_VIEWASASCII, "ASCII");
+	viewAsSubMenu->Append(IDM_VIEWASHEX, _("Hex"));
+	menu.AppendSubMenu(viewAsSubMenu, _("View As:"));
+
+	PopupMenu(&menu);
+}
+
+void CMemoryView::OnPaint(wxPaintEvent& event)
+{
+	wxPaintDC dc(this);
+	wxRect rc = GetClientRect();
+	wxFont hFont("Courier");
+	hFont.SetFamily(wxFONTFAMILY_TELETYPE);
+
+	wxCoord w,h;
+	dc.GetTextExtent("0WJyq", &w, &h, nullptr, nullptr, &hFont);
+	if (h > rowHeight)
+		rowHeight = h;
+	dc.GetTextExtent("0WJyq", &w, &h, nullptr, nullptr, &DebuggerFont);
+	if (h > rowHeight)
+		rowHeight = h;
+
+	if (viewAsType==VIEWAS_HEX)
+		dc.SetFont(hFont);
+	else
+		dc.SetFont(DebuggerFont);
+
+	dc.GetTextExtent("W", &w, &h);
+	int fontSize = w;
+	int textPlacement = 17 + 9 * fontSize;
+
+	// TODO: Add any drawing code here...
+	int width   = rc.width;
+	int numRows = (rc.height / rowHeight) / 2 + 2;
+	dc.SetBackgroundMode(wxTRANSPARENT);
+	const wxColour bgColor = *wxWHITE;
+	wxPen nullPen(bgColor);
+	wxPen currentPen(*wxBLACK_PEN);
+	wxPen selPen(*wxGREY_PEN);
+	nullPen.SetStyle(wxTRANSPARENT);
+
+	wxBrush currentBrush(*wxLIGHT_GREY_BRUSH);
+	wxBrush pcBrush(*wxGREEN_BRUSH);
+	wxBrush mcBrush(*wxBLUE_BRUSH);
+	wxBrush bgBrush(bgColor);
+	wxBrush nullBrush(bgColor);
+	nullBrush.SetStyle(wxTRANSPARENT);
+
+	dc.SetPen(nullPen);
+	dc.SetBrush(bgBrush);
+	dc.DrawRectangle(0, 0, 16, rc.height);
+	dc.DrawRectangle(0, 0, rc.width, 5+8);
+
+	// TODO - clean up this freaking mess!!!!!
+	for (int row = -numRows; row <= numRows; row++)
+	{
+		unsigned int address = curAddress + row * align;
+
+		int rowY1 = rc.height / 2 + rowHeight * row - rowHeight / 2;
+		int rowY2 = rc.height / 2 + rowHeight * row + rowHeight / 2;
+
+		wxString temp = wxString::Format("%08x", address);
+		u32 col = debugger->GetColor(address);
+		wxBrush rowBrush(wxColour(col >> 16, col >> 8, col));
+		dc.SetBrush(nullBrush);
+		dc.SetPen(nullPen);
+		dc.DrawRectangle(0, rowY1, 16, rowY2);
+
+		if (selecting && (address == selection))
+			dc.SetPen(selPen);
+		else
+			dc.SetPen(row == 0 ? currentPen : nullPen);
+
+		if (address == debugger->GetPC())
+			dc.SetBrush(pcBrush);
+		else
+			dc.SetBrush(rowBrush);
+
+		dc.DrawRectangle(16, rowY1, width, rowY2 - 1);
+		dc.SetBrush(currentBrush);
+		dc.SetTextForeground("#600000"); // Dark red
+		dc.DrawText(temp, 17, rowY1);
+
+		if (viewAsType != VIEWAS_HEX)
+		{
+			char mem[256];
+			debugger->GetRawMemoryString(memory, address, mem, 256);
+			dc.SetTextForeground(wxTheColourDatabase->Find("NAVY"));
+			dc.DrawText(StrToWxStr(mem), 17+fontSize*(8), rowY1);
+			dc.SetTextForeground(*wxBLACK);
+		}
+
+		if (!PowerPC::HostIsRAMAddress(address))
+			continue;
+
+		if (debugger->IsAlive())
+		{
+			std::string dis;
+			u32 mem_data = debugger->ReadExtraMemory(memory, address);
+
+			if (viewAsType == VIEWAS_FP)
+			{
+				float flt = *(float *)(&mem_data);
+				dis = StringFromFormat("f: %f", flt);
+			}
+			else if (viewAsType == VIEWAS_ASCII)
+			{
+				u32 a[4] = {
+					(mem_data & 0xff000000) >> 24,
+					(mem_data & 0xff0000) >> 16,
+					(mem_data & 0xff00) >> 8,
+					(mem_data & 0xff)
+				};
+
+				for (auto& word : a)
+				{
+					if (word == '\0')
+						word = ' ';
+				}
+
+				dis = StringFromFormat("%c%c%c%c", a[0], a[1], a[2], a[3]);
+			}
+			else if (viewAsType == VIEWAS_HEX)
+			{
+				u32 mema[8] = {
+					debugger->ReadExtraMemory(memory, address),
+					debugger->ReadExtraMemory(memory, address+4),
+					debugger->ReadExtraMemory(memory, address+8),
+					debugger->ReadExtraMemory(memory, address+12),
+					debugger->ReadExtraMemory(memory, address+16),
+					debugger->ReadExtraMemory(memory, address+20),
+					debugger->ReadExtraMemory(memory, address+24),
+					debugger->ReadExtraMemory(memory, address+28)
+				};
+
+				for (auto& word : mema)
+				{
+					switch (dataType)
+					{
+					case 0:
+						dis += StringFromFormat(" %02X %02X %02X %02X",
+							((word & 0xff000000) >> 24) & 0xFF,
+							((word & 0xff0000) >> 16) & 0xFF,
+							((word & 0xff00) >> 8) & 0xFF,
+							word & 0xff);
+						break;
+					case 1:
+						dis += StringFromFormat(" %02X%02X %02X%02X",
+							((word & 0xff000000) >> 24) & 0xFF,
+							((word & 0xff0000) >> 16) & 0xFF,
+							((word & 0xff00) >> 8) & 0xFF,
+							word & 0xff);
+						break;
+					case 2:
+						dis += StringFromFormat(" %02X%02X%02X%02X",
+							((word & 0xff000000) >> 24) & 0xFF,
+							((word & 0xff0000) >> 16) & 0xFF,
+							((word & 0xff00) >> 8) & 0xFF,
+							word & 0xff);
+						break;
+					}
+				}
+			}
+			else
+			{
+				dis = "INVALID VIEWAS TYPE";
+			}
+
+			if (viewAsType != VIEWAS_HEX)
+				dc.DrawText(StrToWxStr(dis), textPlacement + fontSize*(8 + 8), rowY1);
+			else
+				dc.DrawText(StrToWxStr(dis), textPlacement, rowY1);
+
+			dc.SetTextForeground(*wxBLUE);
+
+			std::string desc = debugger->GetDescription(address);
+			if (!desc.empty())
+				dc.DrawText(StrToWxStr(desc), 17+fontSize*((8+8+8+30)*2), rowY1);
+
+			// Show blue memory check dot
+			if (debugger->IsMemCheck(address))
+			{
+				dc.SetBrush(mcBrush);
+				dc.DrawRectangle(8, rowY1 + 1, 11, 11);
+			}
+		}
+	}
+
+	dc.SetPen(currentPen);
+}
+
+void CMemoryView::OnResize(wxSizeEvent& event)
+{
+	Refresh();
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h
new file mode 100644
index 0000000000..00108285d9
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.h
@@ -0,0 +1,59 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/control.h>
+#include "Common/CommonTypes.h"
+
+class DebugInterface;
+
+class CMemoryView : public wxControl
+{
+public:
+	CMemoryView(DebugInterface* debuginterface, wxWindow* parent);
+
+	u32 GetSelection() const { return selection ; }
+	int GetMemoryType() const { return memory; }
+
+	void Center(u32 addr)
+	{
+		curAddress = addr;
+		Refresh();
+	}
+	int dataType;   // u8,u16,u32
+	int curAddress; // Will be accessed by parent
+
+private:
+	void OnPaint(wxPaintEvent& event);
+	void OnMouseDownL(wxMouseEvent& event);
+	void OnMouseMove(wxMouseEvent& event);
+	void OnMouseUpL(wxMouseEvent& event);
+	void OnMouseDownR(wxMouseEvent& event);
+	void OnScrollWheel(wxMouseEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+
+	int YToAddress(int y);
+	void OnResize(wxSizeEvent& event);
+
+	DebugInterface* debugger;
+
+	int align;
+	int rowHeight;
+
+	u32 selection;
+	u32 oldSelection;
+	bool selecting;
+
+	int memory;
+
+	enum EViewAsType
+	{
+		VIEWAS_ASCII = 0,
+		VIEWAS_FP,
+		VIEWAS_HEX,
+	};
+
+	EViewAsType viewAsType;
+};
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
new file mode 100644
index 0000000000..f08b8103f6
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
@@ -0,0 +1,444 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreParameter.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/MemoryView.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+
+enum
+{
+	IDM_MEM_ADDRBOX,
+	IDM_SYMBOLLIST,
+	IDM_SETVALBUTTON,
+	IDM_DUMP_MEMORY,
+	IDM_DUMP_MEM2,
+	IDM_DUMP_FAKEVMEM,
+	IDM_VALBOX,
+	IDM_U8,
+	IDM_U16,
+	IDM_U32,
+	IDM_SEARCH,
+	IDM_ASCII,
+	IDM_HEX
+};
+
+BEGIN_EVENT_TABLE(CMemoryWindow, wxPanel)
+	EVT_TEXT(IDM_MEM_ADDRBOX,       CMemoryWindow::OnAddrBoxChange)
+	EVT_TEXT_ENTER(IDM_VALBOX,      CMemoryWindow::SetMemoryValueFromValBox)
+	EVT_LISTBOX(IDM_SYMBOLLIST,     CMemoryWindow::OnSymbolListChange)
+	EVT_HOST_COMMAND(wxID_ANY,      CMemoryWindow::OnHostMessage)
+	EVT_BUTTON(IDM_SETVALBUTTON,    CMemoryWindow::SetMemoryValue)
+	EVT_BUTTON(IDM_DUMP_MEMORY,     CMemoryWindow::OnDumpMemory)
+	EVT_BUTTON(IDM_DUMP_MEM2,       CMemoryWindow::OnDumpMem2)
+	EVT_BUTTON(IDM_DUMP_FAKEVMEM,   CMemoryWindow::OnDumpFakeVMEM)
+	EVT_CHECKBOX(IDM_U8,            CMemoryWindow::U8)
+	EVT_CHECKBOX(IDM_U16,           CMemoryWindow::U16)
+	EVT_CHECKBOX(IDM_U32,           CMemoryWindow::U32)
+	EVT_BUTTON(IDM_SEARCH,          CMemoryWindow::onSearch)
+	EVT_CHECKBOX(IDM_ASCII,         CMemoryWindow::onAscii)
+	EVT_CHECKBOX(IDM_HEX,           CMemoryWindow::onHex)
+END_EVENT_TABLE()
+
+CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
+		const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+	: wxPanel(parent, id, pos, size, style, name)
+{
+	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer* sizerRight = new wxBoxSizer(wxVERTICAL);
+	// Didn't see anything useful in the left part
+	//wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);
+
+	DebugInterface* di = &PowerPC::debug_interface;
+
+	//symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition,
+	//      wxSize(20, 100), 0, nullptr, wxLB_SORT);
+	//sizerLeft->Add(symbols, 1, wxEXPAND);
+	memview = new CMemoryView(di, this);
+	memview->dataType = 0;
+	//sizerBig->Add(sizerLeft, 1, wxEXPAND);
+	sizerBig->Add(memview, 20, wxEXPAND);
+	sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
+	sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, ""));
+	sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, "", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER));
+	sizerRight->Add(new wxButton(this, IDM_SETVALBUTTON, _("Set Value")));
+
+	sizerRight->AddSpacer(5);
+	sizerRight->Add(new wxButton(this, IDM_DUMP_MEMORY, _("Dump MRAM")));
+	sizerRight->Add(new wxButton(this, IDM_DUMP_MEM2, _("Dump EXRAM")));
+
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU)
+		sizerRight->Add(new wxButton(this, IDM_DUMP_FAKEVMEM, _("Dump FakeVMEM")));
+
+	wxStaticBoxSizer* sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search"));
+
+	sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _("Search")));
+	sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, "Ascii "));
+	sizerSearchType->Add(chkHex = new wxCheckBox(this, IDM_HEX, _("Hex")));
+	sizerRight->Add(sizerSearchType);
+	wxStaticBoxSizer* sizerDataTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Data Type"));
+
+	sizerDataTypes->SetMinSize(74, 40);
+	sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, "U8"));
+	sizerDataTypes->Add(chk16 = new wxCheckBox(this, IDM_U16, "U16"));
+	sizerDataTypes->Add(chk32 = new wxCheckBox(this, IDM_U32, "U32"));
+	sizerRight->Add(sizerDataTypes);
+	SetSizer(sizerBig);
+	chkHex->SetValue(1); //Set defaults
+	chk8->SetValue(1);
+
+	//sizerLeft->Fit(this);
+	sizerRight->Fit(this);
+	sizerBig->Fit(this);
+}
+
+void CMemoryWindow::Save(IniFile& ini) const
+{
+	// Prevent these bad values that can happen after a crash or hanging
+	if (GetPosition().x != -32000 && GetPosition().y != -32000)
+	{
+		IniFile::Section* mem_window = ini.GetOrCreateSection("MemoryWindow");
+		mem_window->Set("x", GetPosition().x);
+		mem_window->Set("y", GetPosition().y);
+		mem_window->Set("w", GetSize().GetWidth());
+		mem_window->Set("h", GetSize().GetHeight());
+	}
+}
+
+void CMemoryWindow::Load(IniFile& ini)
+{
+	int x, y, w, h;
+
+	IniFile::Section* mem_window = ini.GetOrCreateSection("MemoryWindow");
+	mem_window->Get("x", &x, GetPosition().x);
+	mem_window->Get("y", &y, GetPosition().y);
+	mem_window->Get("w", &w, GetSize().GetWidth());
+	mem_window->Get("h", &h, GetSize().GetHeight());
+
+	SetSize(x, y, w, h);
+}
+
+void CMemoryWindow::JumpToAddress(u32 _Address)
+{
+	memview->Center(_Address);
+}
+
+void CMemoryWindow::SetMemoryValueFromValBox(wxCommandEvent& event)
+{
+	SetMemoryValue(event);
+	valbox->SetFocus();
+
+}
+
+void CMemoryWindow::SetMemoryValue(wxCommandEvent& event)
+{
+	if (!Memory::IsInitialized())
+	{
+		WxUtils::ShowErrorDialog(_("Cannot set uninitialized memory."));
+		return;
+	}
+
+	std::string str_addr = WxStrToStr(addrbox->GetValue());
+	std::string str_val = WxStrToStr(valbox->GetValue());
+	u32 addr;
+	u32 val;
+
+	if (!TryParse(std::string("0x") + str_addr, &addr))
+	{
+		WxUtils::ShowErrorDialog(wxString::Format(_("Invalid address: %s"), str_addr.c_str()));
+		return;
+	}
+
+	if (!TryParse(std::string("0x") + str_val, &val))
+	{
+		WxUtils::ShowErrorDialog(wxString::Format(_("Invalid value: %s"), str_val.c_str()));
+		return;
+	}
+
+	PowerPC::HostWrite_U32(val, addr);
+	memview->Refresh();
+}
+
+void CMemoryWindow::OnAddrBoxChange(wxCommandEvent& event)
+{
+	wxString txt = addrbox->GetValue();
+	if (txt.size())
+	{
+		u32 addr;
+		sscanf(WxStrToStr(txt).c_str(), "%08x", &addr);
+		memview->Center(addr & ~3);
+	}
+
+	event.Skip();
+}
+
+void CMemoryWindow::Update()
+{
+	memview->Refresh();
+	memview->Center(PC);
+}
+
+void CMemoryWindow::NotifyMapLoaded()
+{
+	symbols->Show(false); // hide it for faster filling
+	symbols->Clear();
+#if 0
+	#ifdef _WIN32
+	const FunctionDB::XFuncMap &syms = g_symbolDB.Symbols();
+	for (FuntionDB::XFuncMap::iterator iter = syms.begin(); iter != syms.end(); ++iter)
+	{
+	int idx = symbols->Append(iter->second.name.c_str());
+	symbols->SetClientData(idx, (void*)&iter->second);
+	}
+	#endif
+#endif
+	symbols->Show(true);
+	Update();
+}
+
+void CMemoryWindow::OnSymbolListChange(wxCommandEvent& event)
+{
+	int index = symbols->GetSelection();
+	if (index >= 0)
+	{
+		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
+		if (pSymbol != nullptr)
+		{
+			memview->Center(pSymbol->address);
+		}
+	}
+}
+
+void CMemoryWindow::OnHostMessage(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+		case IDM_NOTIFY_MAP_LOADED:
+			NotifyMapLoaded();
+			break;
+	}
+}
+
+static void DumpArray(const std::string& filename, const u8* data, size_t length)
+{
+	if (data)
+	{
+		File::IOFile f(filename, "wb");
+		f.WriteBytes(data, length);
+	}
+}
+
+// Write mram to file
+void CMemoryWindow::OnDumpMemory( wxCommandEvent& event )
+{
+	DumpArray(File::GetUserPath(F_RAMDUMP_IDX), Memory::m_pRAM, Memory::REALRAM_SIZE);
+}
+
+// Write exram (aram or mem2) to file
+void CMemoryWindow::OnDumpMem2( wxCommandEvent& event )
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		DumpArray(File::GetUserPath(F_ARAMDUMP_IDX), Memory::m_pEXRAM, Memory::EXRAM_SIZE);
+	}
+	else
+	{
+		DumpArray(File::GetUserPath(F_ARAMDUMP_IDX), DSP::GetARAMPtr(), DSP::ARAM_SIZE);
+	}
+}
+
+// Write fake vmem to file
+void CMemoryWindow::OnDumpFakeVMEM( wxCommandEvent& event )
+{
+	DumpArray(File::GetUserPath(F_FAKEVMEMDUMP_IDX), Memory::m_pFakeVMEM, Memory::FAKEVMEM_SIZE);
+}
+
+void CMemoryWindow::U8(wxCommandEvent& event)
+{
+	chk16->SetValue(0);
+	chk32->SetValue(0);
+	memview->dataType = 0;
+	memview->Refresh();
+}
+
+void CMemoryWindow::U16(wxCommandEvent& event)
+{
+	chk8->SetValue(0);
+	chk32->SetValue(0);
+	memview->dataType = 1;
+	memview->Refresh();
+}
+
+void CMemoryWindow::U32(wxCommandEvent& event)
+{
+	chk16->SetValue(0);
+	chk8->SetValue(0);
+	memview->dataType = 2;
+	memview->Refresh();
+}
+
+void CMemoryWindow::onSearch(wxCommandEvent& event)
+{
+	u8* TheRAM = nullptr;
+	u32 szRAM = 0;
+	switch (memview->GetMemoryType())
+	{
+	case 0:
+	default:
+		if (Memory::m_pRAM)
+		{
+			TheRAM = Memory::m_pRAM;
+			szRAM = Memory::REALRAM_SIZE;
+		}
+		break;
+	case 1:
+		{
+			u8* aram = DSP::GetARAMPtr();
+			if (aram)
+			{
+				TheRAM = aram;
+				szRAM = DSP::ARAM_SIZE;
+			}
+		}
+		break;
+	}
+	//Now we have memory to look in
+	//Are we looking for ASCII string, or hex?
+	//memview->cu
+	wxString rawData = valbox->GetValue();
+	std::vector<u8> Dest; //May need a better name
+	u32 size = 0;
+	int pad = rawData.size()%2; //If it's uneven
+	unsigned int i = 0;
+	long count = 0;
+	char copy[3] = {0};
+	long newsize = 0;
+	unsigned char *tmp2 = nullptr;
+	char* tmpstr = nullptr;
+
+	if (chkHex->GetValue())
+	{
+		//We are looking for hex
+		//If it's uneven
+		size = (rawData.size()/2) + pad;
+		Dest.resize(size+32);
+		newsize = rawData.size();
+
+		if (pad)
+		{
+			tmpstr = new char[newsize + 2];
+			memset(tmpstr, 0, newsize + 2);
+			tmpstr[0] = '0';
+		}
+		else
+		{
+			tmpstr = new char[newsize + 1];
+			memset(tmpstr, 0, newsize + 1);
+		}
+		strcat(tmpstr, WxStrToStr(rawData).c_str());
+		tmp2 = &Dest.front();
+		count = 0;
+		for (i = 0; i < strlen(tmpstr); i++)
+		{
+			copy[0] = tmpstr[i];
+			copy[1] = tmpstr[i+1];
+			copy[2] = 0;
+			int tmpint;
+			sscanf(copy, "%02x", &tmpint);
+			tmp2[count++] = tmpint;
+			// Dest[count] should now be the hex of what the two chars were!
+			// Also should add a check to make sure it's A-F only
+			//sscanf(copy, "%02x", &tmp2[count++]);
+			i += 1;
+		}
+		delete[] tmpstr;
+	}
+	else
+	{
+		//Looking for an ascii string
+		size = rawData.size();
+		Dest.resize(size+1);
+		tmpstr = new char[size+1];
+
+		tmp2 = &Dest.front();
+		sprintf(tmpstr, "%s", WxStrToStr(rawData).c_str());
+
+		for (i = 0; i < size; i++)
+			tmp2[i] = tmpstr[i];
+
+		delete[] tmpstr;
+	}
+
+	if (size)
+	{
+		unsigned char* pnt = &Dest.front();
+		unsigned int k = 0;
+		//grab
+		wxString txt = addrbox->GetValue();
+		u32 addr = 0;
+		if (txt.size())
+		{
+			sscanf(WxStrToStr(txt).c_str(), "%08x", &addr);
+		}
+		i = addr+4;
+		for ( ; i < szRAM; ++i)
+		{
+			for (k = 0; k < size; ++k)
+			{
+				if (i + k > szRAM) break;
+				if (k > size) break;
+				if (pnt[k] != TheRAM[i+k])
+				{
+					k = 0;
+					break;
+				}
+			}
+			if (k == size)
+			{
+				//Match was found
+				wxMessageBox(_("A match was found. Placing viewer at the offset."));
+				addrbox->SetValue(wxString::Format("%08x", i));
+				//memview->curAddress = i;
+				//memview->Refresh();
+				OnAddrBoxChange(event);
+				return;
+			}
+		}
+		wxMessageBox(_("No match was found."));
+	}
+}
+
+void CMemoryWindow::onAscii(wxCommandEvent& event)
+{
+	chkHex->SetValue(0);
+}
+
+void CMemoryWindow::onHex(wxCommandEvent& event)
+{
+	chkAscii->SetValue(0);
+}
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
new file mode 100644
index 0000000000..177cbb0bae
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
@@ -0,0 +1,67 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+#include "Common/CommonTypes.h"
+
+class CMemoryView;
+class IniFile;
+class wxButton;
+class wxCheckBox;
+class wxListBox;
+class wxTextCtrl;
+
+class CMemoryWindow : public wxPanel
+{
+public:
+	CMemoryWindow(wxWindow* parent,
+	              wxWindowID id = wxID_ANY,
+	              const wxPoint& pos = wxDefaultPosition,
+	              const wxSize& size = wxDefaultSize,
+	              long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
+	              const wxString& name = _("Memory"));
+
+	void Save(IniFile& _IniFile) const;
+	void Load(IniFile& _IniFile);
+
+	void Update() override;
+	void NotifyMapLoaded();
+
+	void JumpToAddress(u32 _Address);
+
+private:
+	DECLARE_EVENT_TABLE()
+
+	void U8(wxCommandEvent& event);
+	void U16(wxCommandEvent& event);
+	void U32(wxCommandEvent& event);
+	void onSearch(wxCommandEvent& event);
+	void onAscii(wxCommandEvent& event);
+	void onHex(wxCommandEvent& event);
+	void OnSymbolListChange(wxCommandEvent& event);
+	void OnCallstackListChange(wxCommandEvent& event);
+	void OnAddrBoxChange(wxCommandEvent& event);
+	void OnHostMessage(wxCommandEvent& event);
+	void SetMemoryValueFromValBox(wxCommandEvent& event);
+	void SetMemoryValue(wxCommandEvent& event);
+	void OnDumpMemory(wxCommandEvent& event);
+	void OnDumpMem2(wxCommandEvent& event);
+	void OnDumpFakeVMEM(wxCommandEvent& event);
+
+	wxCheckBox* chk8;
+	wxCheckBox* chk16;
+	wxCheckBox* chk32;
+	wxButton*   btnSearch;
+	wxCheckBox* chkAscii;
+	wxCheckBox* chkHex;
+
+	CMemoryView* memview;
+	wxListBox* symbols;
+
+	wxButton* buttonGo;
+	wxTextCtrl* addrbox;
+	wxTextCtrl* valbox;
+};
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp
new file mode 100644
index 0000000000..9f29b032ba
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp
@@ -0,0 +1,296 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/colour.h>
+#include <wx/grid.h>
+#include <wx/menu.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/GekkoDisassembler.h"
+#include "Common/StringUtil.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+#include "DolphinWX/Debugger/RegisterView.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+// F-zero 80005e60 wtf??
+
+enum
+{
+	IDM_WATCHADDRESS,
+	IDM_VIEWMEMORY,
+};
+
+static const char *special_reg_names[] = {
+	"PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause", "DSISR", "DAR", "PT hashmask"
+};
+
+static u32 GetSpecialRegValue(int reg)
+{
+	switch (reg)
+	{
+	case 0: return PowerPC::ppcState.pc;
+	case 1: return PowerPC::ppcState.spr[SPR_LR];
+	case 2: return PowerPC::ppcState.spr[SPR_CTR];
+	case 3: return GetCR();
+	case 4: return PowerPC::ppcState.fpscr;
+	case 5: return PowerPC::ppcState.msr;
+	case 6: return PowerPC::ppcState.spr[SPR_SRR0];
+	case 7: return PowerPC::ppcState.spr[SPR_SRR1];
+	case 8: return PowerPC::ppcState.Exceptions;
+	case 9: return ProcessorInterface::GetMask();
+	case 10: return ProcessorInterface::GetCause();
+	case 11: return PowerPC::ppcState.spr[SPR_DSISR];
+	case 12: return PowerPC::ppcState.spr[SPR_DAR];
+	case 13: return (PowerPC::ppcState.pagetable_hashmask << 6) | PowerPC::ppcState.pagetable_base;
+	default: return 0;
+	}
+}
+
+static wxString GetValueByRowCol(int row, int col)
+{
+	if (row < 32)
+	{
+		switch (col)
+		{
+		case 0: return StrToWxStr(GekkoDisassembler::GetGPRName(row));
+		case 1: return wxString::Format("%08x", GPR(row));
+		case 2: return StrToWxStr(GekkoDisassembler::GetFPRName(row));
+		case 3: return wxString::Format("%016llx", riPS0(row));
+		case 4: return wxString::Format("%016llx", riPS1(row));
+		case 5:
+		{
+			if (row < 4)
+				return wxString::Format("DBAT%01d", row);
+
+			if (row < 8)
+				return wxString::Format("IBAT%01d", row - 4);
+
+			if (row < 12)
+				return wxString::Format("DBAT%01d", row - 4);
+
+			if (row < 16)
+				return wxString::Format("IBAT%01d", row - 8);
+
+			break;
+		}
+		case 6:
+		{
+			if (row < 4)
+				return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_DBAT0U + row * 2] << 32 | PowerPC::ppcState.spr[SPR_DBAT0L + row * 2]);
+
+			if (row < 8)
+				return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_IBAT0U + (row - 4) * 2] << 32 | PowerPC::ppcState.spr[SPR_IBAT0L + (row - 4) * 2]);
+
+			if (row < 12)
+				return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_DBAT4U + (row - 12) * 2] << 32 | PowerPC::ppcState.spr[SPR_DBAT4L + (row - 12) * 2]);
+
+			if (row < 16)
+				return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_IBAT4U + (row - 16) * 2] << 32 | PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]);
+
+			break;
+		}
+		case 7:
+		{
+			if (row < 16)
+				return wxString::Format("SR%02d", row);
+
+			break;
+		}
+		case 8:
+		{
+			if (row < 16)
+				return wxString::Format("%08x", PowerPC::ppcState.sr[row]);
+
+			break;
+		}
+		default: return wxEmptyString;
+		}
+	}
+	else
+	{
+		if (row - 32 < NUM_SPECIALS)
+		{
+			switch (col)
+			{
+			case 0: return StrToWxStr(special_reg_names[row - 32]);
+			case 1: return wxString::Format("%08x", GetSpecialRegValue(row - 32));
+			default: return wxEmptyString;
+			}
+		}
+	}
+	return wxEmptyString;
+}
+
+wxString CRegTable::GetValue(int row, int col)
+{
+	return GetValueByRowCol(row, col);
+}
+
+static void SetSpecialRegValue(int reg, u32 value)
+{
+	switch (reg)
+	{
+	case 0: PowerPC::ppcState.pc = value; break;
+	case 1: PowerPC::ppcState.spr[SPR_LR] = value; break;
+	case 2: PowerPC::ppcState.spr[SPR_CTR] = value; break;
+	case 3: SetCR(value); break;
+	case 4: PowerPC::ppcState.fpscr = value; break;
+	case 5: PowerPC::ppcState.msr = value; break;
+	case 6: PowerPC::ppcState.spr[SPR_SRR0] = value; break;
+	case 7: PowerPC::ppcState.spr[SPR_SRR1] = value; break;
+	case 8: PowerPC::ppcState.Exceptions = value; break;
+	// Should we just change the value, or use ProcessorInterface::SetInterrupt() to make the system aware?
+	// case 9: return ProcessorInterface::GetMask();
+	// case 10: return ProcessorInterface::GetCause();
+	case 11: PowerPC::ppcState.spr[SPR_DSISR] = value; break;
+	case 12: PowerPC::ppcState.spr[SPR_DAR] = value; break;
+	//case 13: (PowerPC::ppcState.pagetable_hashmask << 6) | PowerPC::ppcState.pagetable_base;
+	default: return;
+	}
+}
+
+void CRegTable::SetValue(int row, int col, const wxString& strNewVal)
+{
+	u32 newVal = 0;
+	if (TryParse("0x" + WxStrToStr(strNewVal), &newVal))
+	{
+		if (row < 32)
+		{
+			if (col == 1)
+				GPR(row) = newVal;
+			else if (col == 3)
+				riPS0(row) = newVal;
+			else if (col == 4)
+				riPS1(row) = newVal;
+		}
+		else
+		{
+			if ((row - 32 < NUM_SPECIALS) && (col == 1))
+			{
+				SetSpecialRegValue(row - 32, newVal);
+			}
+		}
+	}
+}
+
+void CRegTable::UpdateCachedRegs()
+{
+	for (int i = 0; i < 32; ++i)
+	{
+		m_CachedRegHasChanged[i] = (m_CachedRegs[i] != GPR(i));
+		m_CachedRegs[i] = GPR(i);
+
+		m_CachedFRegHasChanged[i][0] = (m_CachedFRegs[i][0] != riPS0(i));
+		m_CachedFRegs[i][0] = riPS0(i);
+		m_CachedFRegHasChanged[i][1] = (m_CachedFRegs[i][1] != riPS1(i));
+		m_CachedFRegs[i][1] = riPS1(i);
+	}
+	for (int i = 0; i < NUM_SPECIALS; ++i)
+	{
+		m_CachedSpecialRegHasChanged[i] = (m_CachedSpecialRegs[i] != GetSpecialRegValue(i));
+		m_CachedSpecialRegs[i] = GetSpecialRegValue(i);
+	}
+}
+
+wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
+{
+	wxGridCellAttr *attr = new wxGridCellAttr();
+
+	attr->SetBackgroundColour(*wxWHITE);
+	attr->SetFont(DebuggerFont);
+
+	switch (col)
+	{
+	case 1:
+		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
+		break;
+	case 3:
+	case 4:
+		attr->SetAlignment(wxALIGN_RIGHT, wxALIGN_CENTER);
+		break;
+	default:
+		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+		break;
+	}
+
+	bool red = false;
+	switch (col)
+	{
+	case 1: red = row < 32 ? m_CachedRegHasChanged[row] : m_CachedSpecialRegHasChanged[row-32]; break;
+	case 3:
+	case 4: red = row < 32 ? m_CachedFRegHasChanged[row][col-3] : false; break;
+	}
+
+	attr->SetTextColour(red ? *wxRED : *wxBLACK);
+	return attr;
+}
+
+CRegisterView::CRegisterView(wxWindow *parent, wxWindowID id)
+	: wxGrid(parent, id)
+{
+	m_register_table = new CRegTable();
+
+	SetTable(m_register_table, true);
+	SetRowLabelSize(0);
+	SetColLabelSize(0);
+	DisableDragRowSize();
+
+	Bind(wxEVT_GRID_CELL_RIGHT_CLICK, &CRegisterView::OnMouseDownR, this);
+	Bind(wxEVT_MENU, &CRegisterView::OnPopupMenu, this);
+
+	AutoSizeColumns();
+}
+
+void CRegisterView::Update()
+{
+	m_register_table->UpdateCachedRegs();
+	ForceRefresh();
+}
+
+void CRegisterView::OnMouseDownR(wxGridEvent& event)
+{
+	// popup menu
+	int row = event.GetRow();
+	int col = event.GetCol();
+
+	wxString strNewVal = GetValueByRowCol(row, col);
+	TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress);
+
+	wxMenu menu;
+	menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
+	menu.Append(IDM_VIEWMEMORY, _("View &memory"));
+	PopupMenu(&menu);
+}
+
+void CRegisterView::OnPopupMenu(wxCommandEvent& event)
+{
+	CFrame* main_frame = (CFrame*)(GetParent()->GetParent());
+	CCodeWindow* code_window = main_frame->g_pCodeWindow;
+	CWatchWindow* watch_window = code_window->m_WatchWindow;
+	CMemoryWindow* memory_window = code_window->m_MemoryWindow;
+
+	switch (event.GetId())
+	{
+	case IDM_WATCHADDRESS:
+		PowerPC::watches.Add(m_selectedAddress);
+		if (watch_window)
+			watch_window->NotifyUpdate();
+		Refresh();
+		break;
+	case IDM_VIEWMEMORY:
+		if (memory_window)
+			memory_window->JumpToAddress(m_selectedAddress);
+		Refresh();
+		break;
+	}
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h
new file mode 100644
index 0000000000..96d03e11c7
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.h
@@ -0,0 +1,78 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstring>
+#include <wx/grid.h>
+
+#include "Common/CommonTypes.h"
+
+// New register view:
+// R0  0x8000000    F0   0.0000       F0_PS1 0.0000
+// R1  0x8000000    F1   0.0000       F1_PS1 0.0000
+// R31  0x8000000   F31  0.0000      F31_PS1 0.0000
+// PC  (specials)
+// LR
+// CTR
+// CR0-7
+// FPSCR
+// MSR
+// SRR0
+// SRR1
+// Exceptions
+// Interrupt Mask (PI)
+// Interrupt Cause(PI)
+
+#define NUM_SPECIALS 14
+
+class CRegTable : public wxGridTableBase
+{
+
+public:
+
+	CRegTable()
+	{
+		memset(m_CachedRegs, 0, sizeof(m_CachedRegs));
+		memset(m_CachedSpecialRegs, 0, sizeof(m_CachedSpecialRegs));
+		memset(m_CachedFRegs, 0, sizeof(m_CachedFRegs));
+		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
+		memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged));
+		memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged));
+	}
+
+	int GetNumberCols() override { return 9; }
+	int GetNumberRows() override { return 32 + NUM_SPECIALS; }
+	bool IsEmptyCell(int row, int col) override { return row > 31 && col > 2; }
+	wxString GetValue(int row, int col) override;
+	void SetValue(int row, int col, const wxString &) override;
+	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
+	void UpdateCachedRegs();
+
+private:
+	u32 m_CachedRegs[32];
+	u32 m_CachedSpecialRegs[NUM_SPECIALS];
+	u64 m_CachedFRegs[32][2];
+	bool m_CachedRegHasChanged[32];
+	bool m_CachedSpecialRegHasChanged[NUM_SPECIALS];
+	bool m_CachedFRegHasChanged[32][2];
+
+	DECLARE_NO_COPY_CLASS(CRegTable);
+};
+
+class CRegisterView : public wxGrid
+{
+public:
+	CRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
+	void Update() override;
+
+private:
+	void OnMouseDownR(wxGridEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+
+	u32 m_selectedAddress = 0;
+
+	// Owned by wx. Deleted implicitly upon destruction.
+	CRegTable* m_register_table;
+};
diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp
new file mode 100644
index 0000000000..f9ec364204
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Debugger/RegisterView.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
+
+CRegisterWindow::CRegisterWindow(wxWindow* parent, wxWindowID id,
+		const wxPoint& position, const wxSize& size,
+		long style, const wxString& name)
+	: wxPanel(parent, id, position, size, style, name)
+	, m_GPRGridView(nullptr)
+{
+	CreateGUIControls();
+}
+
+void CRegisterWindow::CreateGUIControls()
+{
+	wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL);
+	m_GPRGridView = new CRegisterView(this);
+	sGrid->Add(m_GPRGridView, 1, wxGROW);
+	SetSizer(sGrid);
+
+	NotifyUpdate();
+}
+
+void CRegisterWindow::NotifyUpdate()
+{
+	if (m_GPRGridView != nullptr)
+		m_GPRGridView->Update();
+}
diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.h b/Source/Core/DolphinWX/Debugger/RegisterWindow.h
new file mode 100644
index 0000000000..c7518639d2
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+
+class CRegisterView;
+
+class CRegisterWindow : public wxPanel
+{
+public:
+	CRegisterWindow(wxWindow* parent,
+			wxWindowID id = wxID_ANY,
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize,
+			long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+			const wxString& name = _("Registers"));
+
+	void NotifyUpdate();
+
+private:
+	CRegisterView* m_GPRGridView;
+	void CreateGUIControls();
+};
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp
new file mode 100644
index 0000000000..be5c5dad64
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp
@@ -0,0 +1,306 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/colour.h>
+#include <wx/grid.h>
+#include <wx/menu.h>
+
+#include "Common/GekkoDisassembler.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+#include "DolphinWX/Debugger/RegisterView.h"
+#include "DolphinWX/Debugger/WatchView.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+enum
+{
+	IDM_DELETEWATCH = 1,
+	IDM_ADDMEMCHECK,
+	IDM_VIEWMEMORY,
+};
+
+
+static std::string GetWatchName(int count)
+{
+	return PowerPC::watches.GetWatches().at(count - 1).name;
+}
+
+static u32 GetWatchAddr(int count)
+{
+	return PowerPC::watches.GetWatches().at(count - 1).iAddress;
+}
+
+static u32 GetWatchValue(int count)
+{
+	return PowerPC::HostRead_U32(GetWatchAddr(count));
+}
+
+static void AddWatchAddr(int count, u32 value)
+{
+	PowerPC::watches.Add(value);
+}
+
+static void UpdateWatchAddr(int count, u32 value)
+{
+	PowerPC::watches.Update(count - 1, value);
+}
+
+static void SetWatchName(int count, const std::string& value)
+{
+	if ((count - 1) < (int)PowerPC::watches.GetWatches().size())
+	{
+		PowerPC::watches.UpdateName(count - 1, value);
+	}
+	else
+	{
+		PowerPC::watches.Add(0);
+		PowerPC::watches.UpdateName(PowerPC::watches.GetWatches().size() - 1, value);
+	}
+}
+
+static void SetWatchValue(int count, u32 value)
+{
+	PowerPC::HostWrite_U32(value, GetWatchAddr(count));
+}
+
+static wxString GetValueByRowCol(int row, int col)
+{
+	if (row == 0)
+	{
+		// Column Labels
+		switch (col)
+		{
+		case 0: return _("Label");
+		case 1: return _("Address");
+		case 2: return _("Hexadecimal");
+		case 3: return _("Decimal");
+		case 4: return _("String");
+		default: return wxEmptyString;
+		}
+	}
+	else if (row <= (int)PowerPC::watches.GetWatches().size())
+	{
+		if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+		{
+			switch (col)
+			{
+			case 0: return wxString::Format("%s", GetWatchName(row));
+			case 1: return wxString::Format("%08x", GetWatchAddr(row));
+			case 2: return wxString::Format("%08x", GetWatchValue(row));
+			case 3: return wxString::Format("%u", GetWatchValue(row));
+			case 4:
+			{
+				u32 addr = GetWatchAddr(row);
+				if (PowerPC::HostIsRAMAddress(addr))
+					return PowerPC::HostGetString(addr, 32).c_str();
+				else
+					return wxEmptyString;
+			}
+			default: return wxEmptyString;
+			}
+		}
+	}
+	return wxEmptyString;
+}
+
+wxString CWatchTable::GetValue(int row, int col)
+{
+	return GetValueByRowCol(row, col);
+}
+
+void CWatchTable::SetValue(int row, int col, const wxString& strNewVal)
+{
+	u32 newVal = 0;
+	if (col == 0 || TryParse("0x" + WxStrToStr(strNewVal), &newVal))
+	{
+		if (row > 0)
+		{
+			switch (col)
+			{
+			case 0:
+			{
+				SetWatchName(row, std::string(WxStrToStr(strNewVal)));
+				break;
+			}
+			case 1:
+			{
+				if (row > (int)PowerPC::watches.GetWatches().size())
+				{
+					AddWatchAddr(row, newVal);
+					row = (int)PowerPC::watches.GetWatches().size();
+				}
+				else
+				{
+					UpdateWatchAddr(row, newVal);
+				}
+				break;
+			}
+			case 2:
+			{
+				SetWatchValue(row, newVal);
+				break;
+			}
+			default:
+				break;
+			}
+		}
+	}
+}
+
+void CWatchTable::UpdateWatch()
+{
+	for (int i = 0; i < (int)PowerPC::watches.GetWatches().size(); ++i)
+	{
+		m_CachedWatchHasChanged[i] = (m_CachedWatch[i] != GetWatchValue(i + 1));
+		m_CachedWatch[i] = GetWatchValue(i + 1);
+	}
+}
+
+wxGridCellAttr* CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
+{
+	wxGridCellAttr* attr = new wxGridCellAttr();
+
+	attr->SetBackgroundColour(*wxWHITE);
+	attr->SetFont(DebuggerFont);
+
+	switch (col)
+	{
+	case 1:
+		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+		break;
+	case 3:
+	case 4:
+		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+		break;
+	default:
+		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
+		break;
+	}
+
+	if (row == 0)
+	{
+		attr->SetReadOnly(true);
+		attr->SetBackgroundColour(*wxBLACK);
+		attr->SetTextColour(*wxWHITE);
+	}
+	else
+	{
+		bool red = false;
+		if (col == 1)
+			red = m_CachedWatchHasChanged[row];
+
+		attr->SetTextColour(red ? *wxRED : *wxBLACK);
+
+		if (row > (int)(PowerPC::watches.GetWatches().size() + 1) || (PowerPC::GetState() == PowerPC::CPU_POWERDOWN))
+		{
+			attr->SetReadOnly(true);
+			attr->SetBackgroundColour(*wxLIGHT_GREY);
+		}
+	}
+
+	return attr;
+}
+
+CWatchView::CWatchView(wxWindow* parent, wxWindowID id)
+	: wxGrid(parent, id)
+{
+	m_watch_table = new CWatchTable();
+
+	SetTable(m_watch_table, true);
+	SetRowLabelSize(0);
+	SetColLabelSize(0);
+	DisableDragRowSize();
+
+	Bind(wxEVT_GRID_CELL_RIGHT_CLICK, &CWatchView::OnMouseDownR, this);
+	Bind(wxEVT_MENU, &CWatchView::OnPopupMenu, this);
+}
+
+void CWatchView::Update()
+{
+	if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+	{
+		m_watch_table->UpdateWatch();
+		ForceRefresh();
+	}
+}
+
+void CWatchView::OnMouseDownR(wxGridEvent& event)
+{
+	// popup menu
+	int row = event.GetRow();
+	int col = event.GetCol();
+
+	m_selectedRow = row;
+
+	if (col == 1 || col == 2)
+	{
+		wxString strNewVal = GetValueByRowCol(row, col);
+		TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress);
+	}
+
+	wxMenu menu;
+	if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1))
+		menu.Append(IDM_DELETEWATCH, _("&Delete watch"));
+
+	if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1) && (col == 1 || col == 2))
+	{
+#ifdef ENABLE_MEM_CHECK
+		menu.Append(IDM_ADDMEMCHECK, _("Add memory &breakpoint"));
+#endif
+		menu.Append(IDM_VIEWMEMORY, _("View &memory"));
+	}
+	PopupMenu(&menu);
+}
+
+void CWatchView::OnPopupMenu(wxCommandEvent& event)
+{
+	CFrame* main_frame = (CFrame*)(GetParent()->GetParent());
+	CCodeWindow* code_window = main_frame->g_pCodeWindow;
+	CWatchWindow* watch_window = code_window->m_WatchWindow;
+	CMemoryWindow* memory_window = code_window->m_MemoryWindow;
+	CBreakPointWindow* breakpoint_window = code_window->m_BreakpointWindow;
+
+	wxString strNewVal;
+	TMemCheck MemCheck;
+
+	switch (event.GetId())
+	{
+	case IDM_DELETEWATCH:
+		strNewVal = GetValueByRowCol(m_selectedRow, 1);
+		if (TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress))
+		{
+			PowerPC::watches.Remove(m_selectedAddress);
+			if (watch_window)
+				watch_window->NotifyUpdate();
+			Refresh();
+		}
+		break;
+	case IDM_ADDMEMCHECK:
+		MemCheck.StartAddress = m_selectedAddress;
+		MemCheck.EndAddress = m_selectedAddress;
+		MemCheck.bRange = false;
+		MemCheck.OnRead = true;
+		MemCheck.OnWrite = true;
+		MemCheck.Log = true;
+		MemCheck.Break = true;
+		PowerPC::memchecks.Add(MemCheck);
+
+		if (breakpoint_window)
+			breakpoint_window->NotifyUpdate();
+		Refresh();
+		break;
+	case IDM_VIEWMEMORY:
+		if (memory_window)
+			memory_window->JumpToAddress(m_selectedAddress);
+		Refresh();
+		break;
+	}
+	event.Skip();
+}
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.h b/Source/Core/DolphinWX/Debugger/WatchView.h
new file mode 100644
index 0000000000..2a8ebab2a9
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/WatchView.h
@@ -0,0 +1,52 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <string>
+#include <wx/grid.h>
+
+#include "Common/CommonTypes.h"
+
+class CWatchTable : public wxGridTableBase
+{
+	enum
+	{
+		MAX_SPECIALS = 256,
+	};
+
+public:
+	CWatchTable()
+	{
+	}
+
+	int GetNumberCols() override { return 5; }
+	int GetNumberRows() override { return MAX_SPECIALS; }
+	wxString GetValue(int row, int col) override;
+	void SetValue(int row, int col, const wxString&) override;
+	wxGridCellAttr* GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
+	void UpdateWatch();
+
+private:
+	std::array<u32, MAX_SPECIALS> m_CachedWatch;
+	std::array<bool, MAX_SPECIALS> m_CachedWatchHasChanged;
+
+	DECLARE_NO_COPY_CLASS(CWatchTable);
+};
+
+class CWatchView : public wxGrid
+{
+public:
+	CWatchView(wxWindow* parent, wxWindowID id = wxID_ANY);
+	void Update() override;
+
+private:
+	void OnMouseDownR(wxGridEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+
+	u32 m_selectedAddress = 0;
+	u32 m_selectedRow = 0;
+	CWatchTable* m_watch_table;
+};
diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.cpp b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp
new file mode 100644
index 0000000000..e32847b1e7
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/WatchWindow.cpp
@@ -0,0 +1,121 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+
+#include <wx/bitmap.h>
+#include <wx/panel.h>
+#include <wx/aui/auibar.h>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/WatchView.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+
+extern "C" {
+#include "DolphinWX/resources/toolbar_debugger_delete.c"
+}
+
+class CWatchToolbar : public wxAuiToolBar
+{
+public:
+CWatchToolbar(CWatchWindow* parent, const wxWindowID id)
+	: wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize,
+			wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT)
+{
+	SetToolBitmapSize(wxSize(16, 16));
+
+	m_Bitmaps[Toolbar_File] = wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(16, 16));
+
+	AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_File]);
+	Bind(wxEVT_TOOL, &CWatchWindow::Event_LoadAll, parent, ID_LOAD);
+
+	AddTool(ID_SAVE, _("Save"), m_Bitmaps[Toolbar_File]);
+	Bind(wxEVT_TOOL, &CWatchWindow::Event_SaveAll, parent, ID_SAVE);
+}
+
+private:
+
+	enum
+	{
+		Toolbar_File,
+		Num_Bitmaps
+	};
+
+	enum
+	{
+		ID_LOAD,
+		ID_SAVE
+	};
+
+	wxBitmap m_Bitmaps[Num_Bitmaps];
+};
+
+CWatchWindow::CWatchWindow(wxWindow* parent, wxWindowID id,
+		const wxPoint& position, const wxSize& size,
+		long style, const wxString& name)
+	: wxPanel(parent, id, position, size, style, name)
+	, m_GPRGridView(nullptr)
+{
+	m_mgr.SetManagedWindow(this);
+	m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+
+	m_GPRGridView = new CWatchView(this);
+
+	m_mgr.AddPane(new CWatchToolbar(this, wxID_ANY), wxAuiPaneInfo().ToolbarPane().Top().
+		LeftDockable(true).RightDockable(true).BottomDockable(false).Floatable(false));
+	m_mgr.AddPane(m_GPRGridView, wxAuiPaneInfo().CenterPane());
+	m_mgr.Update();
+}
+
+CWatchWindow::~CWatchWindow()
+{
+	m_mgr.UnInit();
+}
+
+void CWatchWindow::NotifyUpdate()
+{
+	if (m_GPRGridView != nullptr)
+		m_GPRGridView->Update();
+}
+
+void CWatchWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
+{
+	SaveAll();
+}
+
+void CWatchWindow::SaveAll()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", false);
+	ini.SetLines("Watches", PowerPC::watches.GetStrings());
+	ini.Save(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
+}
+
+void CWatchWindow::Event_LoadAll(wxCommandEvent& WXUNUSED(event))
+{
+	LoadAll();
+}
+
+void CWatchWindow::LoadAll()
+{
+	IniFile ini;
+	Watches::TWatchesStr watches;
+
+	if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", false))
+	{
+		return;
+	}
+
+	if (ini.GetLines("Watches", &watches, false))
+	{
+		PowerPC::watches.Clear();
+		PowerPC::watches.AddFromStrings(watches);
+	}
+
+	NotifyUpdate();
+}
diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.h b/Source/Core/DolphinWX/Debugger/WatchWindow.h
new file mode 100644
index 0000000000..07b8fd6b2a
--- /dev/null
+++ b/Source/Core/DolphinWX/Debugger/WatchWindow.h
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+#include <wx/aui/framemanager.h>
+
+class CWatchView;
+
+class CWatchWindow : public wxPanel
+{
+public:
+	CWatchWindow(wxWindow* parent,
+	             wxWindowID id = wxID_ANY,
+	             const wxPoint& pos = wxDefaultPosition,
+	             const wxSize& size = wxDefaultSize,
+	             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+	             const wxString& name = _("Watch"));
+	~CWatchWindow();
+
+	void NotifyUpdate();
+	void Event_SaveAll(wxCommandEvent& WXUNUSED(event));
+	void SaveAll();
+	void Event_LoadAll(wxCommandEvent& WXUNUSED(event));
+	void LoadAll();
+
+private:
+	void CreateGUIControls();
+
+	wxAuiManager m_mgr;
+
+	// Owned by wx. Deleted implicitly upon destruction.
+	CWatchView* m_GPRGridView;
+};
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj
deleted file mode 100644
index 5b0c8dac88..0000000000
--- a/Source/Core/DolphinWX/Dolphin.vcxproj
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{1B099EF8-6F87-47A2-A3E7-898A24584F49}</ProjectGuid>
-    <RootNamespace>Dolphin</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <TargetName>$(ProjectName)DF</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <TargetName>$(ProjectName)DF</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>
-      </OpenMPSupport>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>
-      </OpenMPSupport>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-    <ResourceCompile>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
-echo Copying External .dlls
-xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\AboutDolphin.cpp" />
-    <ClCompile Include="Src\ARCodeAddEdit.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
-    <ClCompile Include="Src\CheatsWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeView.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
-    <ClCompile Include="Src\ConfigMain.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
-    <ClCompile Include="Src\FifoPlayerDlg.cpp" />
-    <ClCompile Include="Src\Frame.cpp" />
-    <ClCompile Include="Src\FrameAui.cpp" />
-    <ClCompile Include="Src\FrameTools.cpp" />
-    <ClCompile Include="Src\GameListCtrl.cpp" />
-    <ClCompile Include="Src\GeckoCodeDiag.cpp" />
-    <ClCompile Include="Src\HotkeyDlg.cpp" />
-    <ClCompile Include="Src\InputConfigDiag.cpp" />
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
-    <ClCompile Include="Src\ISOFile.cpp" />
-    <ClCompile Include="Src\ISOProperties.cpp" />
-    <ClCompile Include="Src\Debugger\JitWindow.cpp" />
-    <ClCompile Include="Src\LogConfigWindow.cpp" />
-    <ClCompile Include="Src\LogWindow.cpp" />
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp" />
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryView.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
-    <ClCompile Include="Src\NetWindow.cpp" />
-    <ClCompile Include="Src\PatchAddEdit.cpp" />
-    <ClCompile Include="Src\PHackSettings.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterView.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
-    <ClCompile Include="Src\GLInterface\WGL.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp" />
-    <ClCompile Include="Src\UDPConfigDiag.cpp" />
-    <ClCompile Include="Src\VideoConfigDiag.cpp" />
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="Src\AboutDolphin.h" />
-    <ClInclude Include="Src\ARCodeAddEdit.h" />
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h" />
-    <ClInclude Include="Src\Debugger\BreakpointView.h" />
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h" />
-    <ClInclude Include="Src\CheatsWindow.h" />
-    <ClInclude Include="Src\Debugger\CodeView.h" />
-    <ClInclude Include="Src\Debugger\CodeWindow.h" />
-    <ClInclude Include="Src\ConfigMain.h" />
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h" />
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h" />
-    <ClInclude Include="Src\FifoPlayerDlg.h" />
-    <ClInclude Include="Src\Frame.h" />
-    <ClInclude Include="Src\GameListCtrl.h" />
-    <ClInclude Include="Src\GeckoCodeDiag.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\HotkeyDlg.h" />
-    <ClInclude Include="Src\InputConfigDiag.h" />
-    <ClInclude Include="Src\ISOFile.h" />
-    <ClInclude Include="Src\ISOProperties.h" />
-    <ClInclude Include="Src\Debugger\JitWindow.h" />
-    <ClInclude Include="Src\LogConfigWindow.h" />
-    <ClInclude Include="Src\LogWindow.h" />
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\MemcardManager.h" />
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
-    <ClInclude Include="Src\Debugger\MemoryView.h" />
-    <ClInclude Include="Src\Debugger\MemoryWindow.h" />
-    <ClInclude Include="Src\NetWindow.h" />
-    <ClInclude Include="Src\PatchAddEdit.h" />
-    <ClInclude Include="Src\PHackSettings.h" />
-    <ClInclude Include="Src\Debugger\RegisterView.h" />
-    <ClInclude Include="Src\Debugger\RegisterWindow.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TASInputDlg.h" />
-    <ClInclude Include="Src\UDPConfigDiag.h" />
-    <ClInclude Include="Src\VideoConfigDiag.h" />
-    <ClInclude Include="Src\WiimoteConfigDiag.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
-    <ClInclude Include="Src\GLInterface.h" />
-    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
-    <ClInclude Include="Src\GLInterface\WGL.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\Installer\Dolphin.ico" />
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\libpng\png\png.vcxproj">
-      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
-      <Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\miniupnpc\miniupnpc.vcxproj">
-      <Project>{a680190d-0764-485b-9cf3-a82c5edd5715}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
-      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
-      <Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
-      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj">
-      <Project>{9a4c733c-bade-4ac6-b58a-6e274395e90e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj">
-      <Project>{dc7d7af4-ce47-49e8-8b63-265cb6233a49}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj">
-      <Project>{1909cd2d-1707-456f-86ca-0df42a727c99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj">
-      <Project>{9e9da440-e9ad-413c-b648-91030e792211}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
-      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Core\Core.vcxproj">
-      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
-      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\InputCommon\InputCommon.vcxproj">
-      <Project>{b39ac394-5db5-4da9-9d98-09d46ca3701f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DolphinWX.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters
deleted file mode 100644
index 6c1f530015..0000000000
--- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
-      <Filter>GUI\Saves</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetWindow.cpp">
-      <Filter>GUI\NetPlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\InputConfigDiag.cpp">
-      <Filter>GUI\InputConfig</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp">
-      <Filter>GUI\InputConfig</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\AboutDolphin.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ARCodeAddEdit.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\CheatsWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ConfigMain.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Frame.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FrameAui.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FrameTools.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GameListCtrl.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCodeDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HotkeyDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ISOProperties.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\LogWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PatchAddEdit.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\UDPConfigDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ISOFile.cpp">
-      <Filter>Misc</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PHackSettings.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VideoConfigDiag.cpp">
-      <Filter>GUI\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
-      <Filter>GUI\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\JitWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\LogConfigWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayerDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GLInterface\WGL.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
-      <Filter>GUI\Saves</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\NetWindow.h">
-      <Filter>GUI\NetPlay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\InputConfigDiag.h">
-      <Filter>GUI\InputConfig</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ARCodeAddEdit.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\AboutDolphin.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ConfigMain.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\CheatsWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCodeDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Frame.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GameListCtrl.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Globals.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HotkeyDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ISOProperties.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LogWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\MemcardManager.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PatchAddEdit.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\UDPConfigDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\WiimoteConfigDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ISOFile.h">
-      <Filter>Misc</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Resources</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PHackSettings.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VideoConfigDiag.h">
-      <Filter>GUI\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h">
-      <Filter>GUI\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\JitWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LogConfigWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayerDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TASInputDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GLInterface.h" />
-    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
-    <ClInclude Include="Src\GLInterface\WGL.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="..\..\..\Installer\Dolphin.ico">
-      <Filter>Resources</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="GUI">
-      <UniqueIdentifier>{2f20d058-1119-4738-bda8-90fe900e8d69}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\InputConfig">
-      <UniqueIdentifier>{70eb2f12-fab7-4953-8ad1-a981837c3a7e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\NetPlay">
-      <UniqueIdentifier>{38fc863a-0392-4c5d-ab28-7fe1f70e8a70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Saves">
-      <UniqueIdentifier>{3727fb17-2efd-43ce-b71f-d110f0f40474}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Misc">
-      <UniqueIdentifier>{0721c9ae-4d49-49d6-997b-3731f8ab64cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resources">
-      <UniqueIdentifier>{9dd3ef96-b03a-4c14-9d35-6a4850acd430}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Debugger">
-      <UniqueIdentifier>{8ab1ce40-f5e7-47b8-9706-59c924af4eaa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Video">
-      <UniqueIdentifier>{ff5180be-244f-4c0e-8a35-bd4bffb6a343}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DolphinWX.rc">
-      <Filter>Resources</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.user b/Source/Core/DolphinWX/Dolphin.vcxproj.user
deleted file mode 100644
index ac67ec629b..0000000000
--- a/Source/Core/DolphinWX/Dolphin.vcxproj.user
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
new file mode 100644
index 0000000000..3ecb72fa13
--- /dev/null
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -0,0 +1,249 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{47411FDB-1BF2-48D0-AB4E-C7C41160F898}</ProjectGuid>
+    <ProjectName>Dolphin</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <Link>
+      <BaseAddress>0x00400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>true</FixedBaseAddress>
+      <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDolphin.cpp" />
+    <ClCompile Include="ARCodeAddEdit.cpp" />
+    <ClCompile Include="Cheats\CheatSearchTab.cpp" />
+    <ClCompile Include="Cheats\CheatsWindow.cpp" />
+    <ClCompile Include="Cheats\CreateCodeDialog.cpp" />
+    <ClCompile Include="Cheats\GeckoCodeDiag.cpp" />
+    <ClCompile Include="Config\AdvancedConfigPane.cpp" />
+    <ClCompile Include="Config\AudioConfigPane.cpp" />
+    <ClCompile Include="Config\ConfigMain.cpp" />
+    <ClCompile Include="Config\GameCubeConfigPane.cpp" />
+    <ClCompile Include="Config\GeneralConfigPane.cpp" />
+    <ClCompile Include="Config\InterfaceConfigPane.cpp" />
+    <ClCompile Include="Config\PathConfigPane.cpp" />
+    <ClCompile Include="Config\WiiConfigPane.cpp" />
+    <ClCompile Include="Debugger\BreakpointDlg.cpp" />
+    <ClCompile Include="Debugger\BreakpointView.cpp" />
+    <ClCompile Include="Debugger\BreakpointWindow.cpp" />
+    <ClCompile Include="Debugger\CodeView.cpp" />
+    <ClCompile Include="Debugger\CodeWindow.cpp" />
+    <ClCompile Include="Debugger\CodeWindowFunctions.cpp" />
+    <ClCompile Include="Debugger\DebuggerPanel.cpp" />
+    <ClCompile Include="Debugger\DebuggerUIUtil.cpp" />
+    <ClCompile Include="Debugger\DSPDebugWindow.cpp" />
+    <ClCompile Include="Debugger\DSPRegisterView.cpp" />
+    <ClCompile Include="Debugger\JitWindow.cpp" />
+    <ClCompile Include="Debugger\MemoryCheckDlg.cpp" />
+    <ClCompile Include="Debugger\MemoryView.cpp" />
+    <ClCompile Include="Debugger\MemoryWindow.cpp" />
+    <ClCompile Include="Debugger\RegisterView.cpp" />
+    <ClCompile Include="Debugger\RegisterWindow.cpp" />
+    <ClCompile Include="Debugger\WatchView.cpp" />
+    <ClCompile Include="Debugger\WatchWindow.cpp" />
+    <ClCompile Include="NetPlay\ChangeGameDialog.cpp" />
+    <ClCompile Include="NetPlay\NetPlaySetupFrame.cpp" />
+    <ClCompile Include="NetPlay\NetWindow.cpp" />
+    <ClCompile Include="FifoPlayerDlg.cpp" />
+    <ClCompile Include="Frame.cpp" />
+    <ClCompile Include="FrameAui.cpp" />
+    <ClCompile Include="FrameTools.cpp" />
+    <ClCompile Include="GameListCtrl.cpp" />
+    <ClCompile Include="InputConfigDiag.cpp" />
+    <ClCompile Include="InputConfigDiagBitmaps.cpp" />
+    <ClCompile Include="ISOFile.cpp" />
+    <ClCompile Include="ISOProperties.cpp" />
+    <ClCompile Include="LogConfigWindow.cpp" />
+    <ClCompile Include="LogWindow.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainNoGUI.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="MemcardManager.cpp" />
+    <ClCompile Include="NetPlay\PadMapDialog.cpp" />
+    <ClCompile Include="PatchAddEdit.cpp" />
+    <ClCompile Include="SoftwareVideoConfigDialog.cpp" />
+    <ClCompile Include="TASInputDlg.cpp" />
+    <ClCompile Include="VideoConfigDiag.cpp" />
+    <ClCompile Include="PostProcessingConfigDiag.cpp" />
+    <ClCompile Include="ControllerConfigDiag.cpp" />
+    <ClCompile Include="WXInputBase.cpp" />
+    <ClCompile Include="WxUtils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Config\AdvancedConfigPane.h" />
+    <ClInclude Include="Config\AudioConfigPane.h" />
+    <ClInclude Include="Config\GameCubeConfigPane.h" />
+    <ClInclude Include="Config\GeneralConfigPane.h" />
+    <ClInclude Include="Config\InterfaceConfigPane.h" />
+    <ClInclude Include="Config\PathConfigPane.h" />
+    <ClInclude Include="Config\WiiConfigPane.h" />
+    <ClInclude Include="NetPlay\ChangeGameDialog.h" />
+    <ClInclude Include="NetPlay\NetPlaySetupFrame.h" />
+    <ClInclude Include="NetPlay\PadMapDialog.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="AboutDolphin.h" />
+    <ClInclude Include="ARCodeAddEdit.h" />
+    <ClInclude Include="Cheats\CheatSearchTab.h" />
+    <ClInclude Include="Cheats\CheatsWindow.h" />
+    <ClInclude Include="Cheats\CreateCodeDialog.h" />
+    <ClInclude Include="Cheats\GeckoCodeDiag.h" />
+    <ClInclude Include="Config\ConfigMain.h" />
+    <ClInclude Include="Debugger\BreakpointDlg.h" />
+    <ClInclude Include="Debugger\BreakpointView.h" />
+    <ClInclude Include="Debugger\BreakpointWindow.h" />
+    <ClInclude Include="Debugger\CodeView.h" />
+    <ClInclude Include="Debugger\CodeWindow.h" />
+    <ClInclude Include="Debugger\DebuggerPanel.h" />
+    <ClInclude Include="Debugger\DebuggerUIUtil.h" />
+    <ClInclude Include="Debugger\DSPDebugWindow.h" />
+    <ClInclude Include="Debugger\DSPRegisterView.h" />
+    <ClInclude Include="Debugger\JitWindow.h" />
+    <ClInclude Include="Debugger\MemoryCheckDlg.h" />
+    <ClInclude Include="Debugger\MemoryView.h" />
+    <ClInclude Include="Debugger\MemoryWindow.h" />
+    <ClInclude Include="Debugger\RegisterView.h" />
+    <ClInclude Include="Debugger\RegisterWindow.h" />
+    <ClInclude Include="Debugger\WatchView.h" />
+    <ClInclude Include="Debugger\WatchWindow.h" />
+    <ClInclude Include="NetPlay\NetWindow.h" />
+    <ClInclude Include="FifoPlayerDlg.h" />
+    <ClInclude Include="Frame.h" />
+    <ClInclude Include="GameListCtrl.h" />
+    <ClInclude Include="Globals.h" />
+    <ClInclude Include="InputConfigDiag.h" />
+    <ClInclude Include="ISOFile.h" />
+    <ClInclude Include="ISOProperties.h" />
+    <ClInclude Include="LogConfigWindow.h" />
+    <ClInclude Include="LogWindow.h" />
+    <ClInclude Include="Main.h" />
+    <ClInclude Include="MemcardManager.h" />
+    <ClInclude Include="PatchAddEdit.h" />
+    <ClInclude Include="SoftwareVideoConfigDialog.h" />
+    <ClInclude Include="TASInputDlg.h" />
+    <ClInclude Include="VideoConfigDiag.h" />
+    <ClInclude Include="PostProcessingConfigDiag.h" />
+    <ClInclude Include="ControllerConfigDiag.h" />
+    <ClInclude Include="WXInputBase.h" />
+    <ClInclude Include="WxUtils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DolphinWX.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="$(CoreDir)..\..\Installer\Dolphin.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
+      <Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
+      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)wxWidgets3\build\msw\wx_base.vcxproj">
+      <Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
+      <Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
+      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
+      <Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
+      <Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
+      <Project>{604C8368-F34A-4D55-82C8-CC92A0C13254}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
+      <Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj">
+      <Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj">
+      <Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
+  <ItemGroup>
+    <DataDirFiles Include="$(DolphinRootDir)Data\**\*.*" />
+    <ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll;$(ExternalsDir)msvcrt\$(PlatformName)\*.dll" />
+    <BinaryFiles Include="$(TargetPath)" />
+    <AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
+  </ItemGroup>
+  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
+    <Message Text="Copying Data directory..." Importance="High" />
+    <Copy SourceFiles="@(DataDirFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)').Ticks)" />
+    <Message Text="Copying External .dlls" Importance="High" />
+    <Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)').Ticks)" />
+    <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
+    <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
new file mode 100644
index 0000000000..87fb5df32a
--- /dev/null
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="GUI">
+      <UniqueIdentifier>{0c0288ac-1168-4534-b3d3-051b9981f842}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Cheats">
+      <UniqueIdentifier>{20acf084-7e31-4b1e-beec-b99bac38a681}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Debugger">
+      <UniqueIdentifier>{ef70fd67-8f30-467a-8af0-ea0d48837f04}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\InputConfig">
+      <UniqueIdentifier>{d0d9afb4-2b02-45c4-b6fc-91b9ae53a18c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\NetPlay">
+      <UniqueIdentifier>{fb02111e-3fe2-4ded-a594-7a56048f97b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Video">
+      <UniqueIdentifier>{80626e3b-e13b-41c3-bd63-4ef1faf92924}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Misc">
+      <UniqueIdentifier>{4352dc64-398e-4a96-ba4a-824dffa2004c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{d6bc4dd6-06ed-46ad-b327-04afb26e10ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Config">
+      <UniqueIdentifier>{9d8b4144-f335-4fa4-b995-852533298474}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainNoGUI.cpp" />
+    <ClCompile Include="WXInputBase.cpp" />
+    <ClCompile Include="WxUtils.cpp" />
+    <ClCompile Include="Cheats\CheatsWindow.cpp">
+      <Filter>GUI\Cheats</Filter>
+    </ClCompile>
+    <ClCompile Include="Cheats\CreateCodeDialog.cpp">
+      <Filter>GUI\Cheats</Filter>
+    </ClCompile>
+    <ClCompile Include="Cheats\CheatSearchTab.cpp">
+      <Filter>GUI\Cheats</Filter>
+    </ClCompile>
+    <ClCompile Include="Cheats\GeckoCodeDiag.cpp">
+      <Filter>GUI\Cheats</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\BreakpointDlg.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\BreakpointView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\BreakpointWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\CodeView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\CodeWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\CodeWindowFunctions.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\DebuggerUIUtil.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\MemoryView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\MemoryCheckDlg.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\DSPDebugWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\DSPRegisterView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\JitWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\MemoryWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\RegisterView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\RegisterWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\WatchView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\WatchWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="NetPlay\NetWindow.cpp">
+      <Filter>GUI\NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="InputConfigDiag.cpp">
+      <Filter>GUI\InputConfig</Filter>
+    </ClCompile>
+    <ClCompile Include="InputConfigDiagBitmaps.cpp">
+      <Filter>GUI\InputConfig</Filter>
+    </ClCompile>
+    <ClCompile Include="Debugger\DebuggerPanel.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="PostProcessingConfigDiag.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="VideoConfigDiag.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="ISOFile.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="AboutDolphin.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="ARCodeAddEdit.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="FifoPlayerDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Frame.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="FrameAui.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="FrameTools.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="GameListCtrl.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="ISOProperties.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="LogConfigWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="LogWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="MemcardManager.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="PatchAddEdit.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="TASInputDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="SoftwareVideoConfigDialog.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerConfigDiag.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\ConfigMain.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\GeneralConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\InterfaceConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\AudioConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\GameCubeConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\WiiConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\PathConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\AdvancedConfigPane.cpp">
+      <Filter>GUI\Config</Filter>
+    </ClCompile>
+    <ClCompile Include="NetPlay\NetPlaySetupFrame.cpp">
+      <Filter>GUI\NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="NetPlay\ChangeGameDialog.cpp">
+      <Filter>GUI\NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="NetPlay\PadMapDialog.cpp">
+      <Filter>GUI\NetPlay</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Main.h" />
+    <ClInclude Include="WXInputBase.h" />
+    <ClInclude Include="WxUtils.h" />
+    <ClInclude Include="Cheats\CheatSearchTab.h">
+      <Filter>GUI\Cheats</Filter>
+    </ClInclude>
+    <ClInclude Include="Cheats\CheatsWindow.h">
+      <Filter>GUI\Cheats</Filter>
+    </ClInclude>
+    <ClInclude Include="Cheats\CreateCodeDialog.h">
+      <Filter>GUI\Cheats</Filter>
+    </ClInclude>
+    <ClInclude Include="Cheats\GeckoCodeDiag.h">
+      <Filter>GUI\Cheats</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\BreakpointDlg.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\BreakpointView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\BreakpointWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\CodeView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\CodeWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\DebuggerUIUtil.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\MemoryView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\MemoryCheckDlg.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\DSPDebugWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\DSPRegisterView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\JitWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\MemoryWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\RegisterView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\RegisterWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\WatchView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\WatchWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="NetPlay\NetWindow.h">
+      <Filter>GUI\NetPlay</Filter>
+    </ClInclude>
+    <ClInclude Include="InputConfigDiag.h">
+      <Filter>GUI\InputConfig</Filter>
+    </ClInclude>
+    <ClInclude Include="Debugger\DebuggerPanel.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="PostProcessingConfigDiag.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoConfigDiag.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="ISOFile.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Resources</Filter>
+    </ClInclude>
+    <ClInclude Include="AboutDolphin.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="ARCodeAddEdit.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="FifoPlayerDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Frame.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="GameListCtrl.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Globals.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="ISOProperties.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="LogConfigWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="LogWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="MemcardManager.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="PatchAddEdit.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="TASInputDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="SoftwareVideoConfigDialog.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerConfigDiag.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\ConfigMain.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\GeneralConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\InterfaceConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\AudioConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\GameCubeConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\WiiConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\PathConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\AdvancedConfigPane.h">
+      <Filter>GUI\Config</Filter>
+    </ClInclude>
+    <ClInclude Include="NetPlay\NetPlaySetupFrame.h">
+      <Filter>GUI\NetPlay</Filter>
+    </ClInclude>
+    <ClInclude Include="NetPlay\ChangeGameDialog.h">
+      <Filter>GUI\NetPlay</Filter>
+    </ClInclude>
+    <ClInclude Include="NetPlay\PadMapDialog.h">
+      <Filter>GUI\NetPlay</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DolphinWX.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="$(CoreDir)..\..\Installer\Dolphin.ico" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.user b/Source/Core/DolphinWX/DolphinWX.vcxproj.user
new file mode 100644
index 0000000000..aa15c4df30
--- /dev/null
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--For some stupid reason this has to be in the .user file...-->
+    <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
+    <LocalDebuggerWorkingDirectory>$(BinaryOutputDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp
new file mode 100644
index 0000000000..0ab444c7c8
--- /dev/null
+++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp
@@ -0,0 +1,999 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cstddef>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
+#include <wx/dialog.h>
+#include <wx/filedlg.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/spinbutt.h>
+#include <wx/spinctrl.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "DolphinWX/FifoPlayerDlg.h"
+#include "DolphinWX/WxUtils.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/OpcodeDecoding.h"
+
+wxDEFINE_EVENT(RECORDING_FINISHED_EVENT, wxCommandEvent);
+wxDEFINE_EVENT(FRAME_WRITTEN_EVENT, wxCommandEvent);
+
+static std::recursive_mutex sMutex;
+wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = nullptr;
+
+FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) :
+	wxDialog(parent, wxID_ANY, _("FIFO Player")),
+	m_search_result_idx(0), m_FramesToRecord(1)
+{
+	CreateGUIControls();
+
+	sMutex.lock();
+	m_EvtHandler = GetEventHandler();
+	sMutex.unlock();
+
+	FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
+	FifoPlayer::GetInstance().SetFrameWrittenCallback(FrameWritten);
+}
+
+FifoPlayerDlg::~FifoPlayerDlg()
+{
+	FifoPlayer::GetInstance().SetFrameWrittenCallback(nullptr);
+
+	sMutex.lock();
+	m_EvtHandler = nullptr;
+	sMutex.unlock();
+}
+
+void FifoPlayerDlg::CreateGUIControls()
+{
+	wxBoxSizer* sMain;
+	sMain = new wxBoxSizer(wxVERTICAL);
+
+	m_Notebook = new wxNotebook(this, wxID_ANY);
+
+	{
+	m_PlayPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+	wxBoxSizer* sPlayPage;
+	sPlayPage = new wxBoxSizer(wxVERTICAL);
+
+	wxStaticBoxSizer* sPlayInfo;
+	sPlayInfo = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("File Info")), wxVERTICAL);
+
+	m_NumFramesLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString);
+	m_NumFramesLabel->Wrap(-1);
+	sPlayInfo->Add(m_NumFramesLabel, 0, wxALL, 5);
+
+	m_CurrentFrameLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString);
+	m_CurrentFrameLabel->Wrap(-1);
+	sPlayInfo->Add(m_CurrentFrameLabel, 0, wxALL, 5);
+
+	m_NumObjectsLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString);
+	m_NumObjectsLabel->Wrap(-1);
+	sPlayInfo->Add(m_NumObjectsLabel, 0, wxALL, 5);
+
+	sPlayPage->Add(sPlayInfo, 1, wxEXPAND, 5);
+
+	wxStaticBoxSizer* sFrameRange;
+	sFrameRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Frame Range")), wxHORIZONTAL);
+
+	m_FrameFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"));
+	m_FrameFromLabel->Wrap(-1);
+	sFrameRange->Add(m_FrameFromLabel, 0, wxALL, 5);
+
+	m_FrameFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10, 0);
+	sFrameRange->Add(m_FrameFromCtrl, 0, wxALL, 5);
+
+	m_FrameToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"));
+	m_FrameToLabel->Wrap(-1);
+	sFrameRange->Add(m_FrameToLabel, 0, wxALL, 5);
+
+	m_FrameToCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1, -1), wxSP_ARROW_KEYS, 0, 10, 0);
+	sFrameRange->Add(m_FrameToCtrl, 0, wxALL, 5);
+
+	sPlayPage->Add(sFrameRange, 0, wxEXPAND, 5);
+
+	wxStaticBoxSizer* sObjectRange;
+	sObjectRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Object Range")), wxHORIZONTAL);
+
+	m_ObjectFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"));
+	m_ObjectFromLabel->Wrap(-1);
+	sObjectRange->Add(m_ObjectFromLabel, 0, wxALL, 5);
+
+	m_ObjectFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
+	sObjectRange->Add(m_ObjectFromCtrl, 0, wxALL, 5);
+
+	m_ObjectToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"));
+	m_ObjectToLabel->Wrap(-1);
+	sObjectRange->Add(m_ObjectToLabel, 0, wxALL, 5);
+
+	m_ObjectToCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
+	sObjectRange->Add(m_ObjectToCtrl, 0, wxALL, 5);
+
+	sPlayPage->Add(sObjectRange, 0, wxEXPAND, 5);
+
+	wxStaticBoxSizer* sPlayOptions;
+	sPlayOptions = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Playback Options")), wxVERTICAL);
+
+	m_EarlyMemoryUpdates = new wxCheckBox(m_PlayPage, wxID_ANY, _("Early Memory Updates"));
+	sPlayOptions->Add(m_EarlyMemoryUpdates, 0, wxALL, 5);
+
+	sPlayPage->Add(sPlayOptions, 0, wxEXPAND, 5);
+	sPlayPage->AddStretchSpacer();
+
+	m_PlayPage->SetSizer(sPlayPage);
+	m_PlayPage->Layout();
+	sPlayPage->Fit(m_PlayPage);
+	m_Notebook->AddPage(m_PlayPage, _("Play"), true);
+	}
+
+	{
+	m_RecordPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+	wxBoxSizer* sRecordPage;
+	sRecordPage = new wxBoxSizer(wxVERTICAL);
+
+	wxStaticBoxSizer* sRecordInfo;
+	sRecordInfo = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Info")), wxVERTICAL);
+
+	m_RecordingFifoSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString);
+	m_RecordingFifoSizeLabel->Wrap(-1);
+	sRecordInfo->Add(m_RecordingFifoSizeLabel, 0, wxALL, 5);
+
+	m_RecordingMemSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString);
+	m_RecordingMemSizeLabel->Wrap(-1);
+	sRecordInfo->Add(m_RecordingMemSizeLabel, 0, wxALL, 5);
+
+	m_RecordingFramesLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString);
+	m_RecordingFramesLabel->Wrap(-1);
+	sRecordInfo->Add(m_RecordingFramesLabel, 0, wxALL, 5);
+
+	sRecordPage->Add(sRecordInfo, 0, wxEXPAND, 5);
+
+	wxBoxSizer* sRecordButtons;
+	sRecordButtons = new wxBoxSizer(wxHORIZONTAL);
+
+	m_RecordStop = new wxButton(m_RecordPage, wxID_ANY, _("Record"));
+	sRecordButtons->Add(m_RecordStop, 0, wxALL, 5);
+
+	m_Save = new wxButton(m_RecordPage, wxID_ANY, _("Save"));
+	sRecordButtons->Add(m_Save, 0, wxALL, 5);
+
+	sRecordPage->Add(sRecordButtons, 0, wxEXPAND, 5);
+
+	wxStaticBoxSizer* sRecordingOptions;
+	sRecordingOptions = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Options")), wxHORIZONTAL);
+
+	m_FramesToRecordLabel = new wxStaticText(m_RecordPage, wxID_ANY, _("Frames To Record"));
+	m_FramesToRecordLabel->Wrap(-1);
+	sRecordingOptions->Add(m_FramesToRecordLabel, 0, wxALL, 5);
+
+	wxString initialNum = wxString::Format("%d", m_FramesToRecord);
+	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, initialNum, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 1);
+	sRecordingOptions->Add(m_FramesToRecordCtrl, 0, wxALL, 5);
+
+	sRecordPage->Add(sRecordingOptions, 0, wxEXPAND, 5);
+	sRecordPage->AddStretchSpacer();
+
+	m_RecordPage->SetSizer(sRecordPage);
+	m_RecordPage->Layout();
+	sRecordPage->Fit(m_RecordPage);
+	m_Notebook->AddPage(m_RecordPage, _("Record"), false);
+	}
+
+	// Analyze page
+	{
+	m_AnalyzePage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+	wxBoxSizer* sAnalyzePage;
+	sAnalyzePage = new wxBoxSizer(wxVERTICAL);
+
+	wxStaticBoxSizer* sFrameInfoSizer;
+	sFrameInfoSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame Info")), wxVERTICAL);
+
+	wxBoxSizer* sListsSizer = new wxBoxSizer(wxHORIZONTAL);
+
+	m_framesList = new wxListBox(m_AnalyzePage, wxID_ANY);
+	m_framesList->SetMinSize(wxSize(100, 250));
+	sListsSizer->Add(m_framesList, 0, wxALL, 5);
+
+	m_objectsList = new wxListBox(m_AnalyzePage, wxID_ANY);
+	m_objectsList->SetMinSize(wxSize(110, 250));
+	sListsSizer->Add(m_objectsList, 0, wxALL, 5);
+
+	m_objectCmdList = new wxListBox(m_AnalyzePage, wxID_ANY);
+	m_objectCmdList->SetMinSize(wxSize(175, 250));
+	sListsSizer->Add(m_objectCmdList, 0, wxALL, 5);
+
+	sFrameInfoSizer->Add(sListsSizer, 0, wxALL, 5);
+
+	m_objectCmdInfo = new wxStaticText(m_AnalyzePage, wxID_ANY, wxString());
+	sFrameInfoSizer->Add(m_objectCmdInfo, 0, wxALL, 5);
+
+	sAnalyzePage->Add(sFrameInfoSizer, 0, wxEXPAND, 5);
+
+	wxStaticBoxSizer* sSearchSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Search current Object")), wxVERTICAL);
+
+	wxBoxSizer* sSearchField = new wxBoxSizer(wxHORIZONTAL);
+
+	sSearchField->Add(new wxStaticText(m_AnalyzePage, wxID_ANY, _("Search for hex Value:")), 0, wxALIGN_CENTER_VERTICAL, 5);
+	// TODO: ugh, wxValidator sucks - but we should use it anyway.
+	m_searchField = new wxTextCtrl(m_AnalyzePage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+	m_numResultsText = new wxStaticText(m_AnalyzePage, wxID_ANY, wxEmptyString);
+
+	sSearchField->Add(m_searchField, 0, wxALL, 5);
+	sSearchField->Add(m_numResultsText, 0, wxALIGN_CENTER_VERTICAL, 5);
+
+	wxBoxSizer* sSearchButtons = new wxBoxSizer(wxHORIZONTAL);
+
+	m_beginSearch = new wxButton(m_AnalyzePage, wxID_ANY, _("Search"));
+	m_findNext = new wxButton(m_AnalyzePage, wxID_ANY, _("Find next"));
+	m_findPrevious = new wxButton(m_AnalyzePage, wxID_ANY, _("Find previous"));
+
+	ResetSearch();
+
+	sSearchButtons->Add(m_beginSearch, 0, wxALL, 5);
+	sSearchButtons->Add(m_findNext, 0, wxALL, 5);
+	sSearchButtons->Add(m_findPrevious, 0, wxALL, 5);
+
+	sSearchSizer->Add(sSearchField, 0, wxEXPAND, 5);
+	sSearchSizer->Add(sSearchButtons, 0, wxEXPAND, 5);
+
+	sAnalyzePage->Add(sSearchSizer, 0, wxEXPAND, 5);
+	sAnalyzePage->AddStretchSpacer();
+
+	m_AnalyzePage->SetSizer(sAnalyzePage);
+	m_AnalyzePage->Layout();
+	sAnalyzePage->Fit(m_AnalyzePage);
+	m_Notebook->AddPage(m_AnalyzePage, _("Analyze"), false);
+	}
+
+	sMain->Add(m_Notebook, 1, wxEXPAND | wxALL, 5);
+
+	wxBoxSizer* sButtons;
+	sButtons = new wxBoxSizer(wxHORIZONTAL);
+
+	wxBoxSizer* sCloseButtonExpander;
+	sCloseButtonExpander = new wxBoxSizer(wxHORIZONTAL);
+
+	sButtons->Add(sCloseButtonExpander, 1, wxEXPAND, 5);
+
+	m_Close = new wxButton(this, wxID_ANY, _("Close"));
+	sButtons->Add(m_Close, 0, wxALL, 5);
+
+	sMain->Add(sButtons, 0, wxEXPAND, 5);
+
+	SetSizer(sMain);
+	Layout();
+	sMain->Fit(this);
+
+	Center(wxBOTH);
+
+	// Connect Events
+	Bind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this);
+	m_FrameFromCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameFrom, this);
+	m_FrameToCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameTo, this);
+	m_ObjectFromCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectFrom, this);
+	m_ObjectToCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectTo, this);
+	m_EarlyMemoryUpdates->Bind(wxEVT_CHECKBOX, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
+	m_RecordStop->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnRecordStop, this);
+	m_Save->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnSaveFile, this);
+	m_FramesToRecordCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnNumFramesToRecord, this);
+	Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnCloseClick, this);
+
+	m_framesList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
+	m_objectsList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
+	m_objectCmdList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
+
+	m_beginSearch->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnBeginSearch, this);
+	m_findNext->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnFindNextClick, this);
+	m_findPrevious->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnFindPreviousClick, this);
+
+	m_searchField->Bind(wxEVT_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this);
+	m_searchField->Bind(wxEVT_TEXT, &FifoPlayerDlg::OnSearchFieldTextChanged, this);
+
+	// Setup command copying
+	wxAcceleratorEntry entry;
+	entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY);
+	wxAcceleratorTable accel(1, &entry);
+	m_objectCmdList->SetAcceleratorTable(accel);
+	m_objectCmdList->Bind(wxEVT_MENU, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY);
+
+	Bind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this);
+	Bind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this);
+
+	Show();
+}
+
+void FifoPlayerDlg::OnPaint(wxPaintEvent& event)
+{
+	UpdatePlayGui();
+	UpdateRecorderGui();
+	UpdateAnalyzerGui();
+
+	event.Skip();
+}
+
+void FifoPlayerDlg::OnFrameFrom(wxSpinEvent& event)
+{
+	FifoPlayer &player = FifoPlayer::GetInstance();
+
+	player.SetFrameRangeStart(event.GetPosition());
+
+	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
+	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());
+}
+
+void FifoPlayerDlg::OnFrameTo(wxSpinEvent& event)
+{
+	FifoPlayer &player = FifoPlayer::GetInstance();
+	player.SetFrameRangeEnd(event.GetPosition());
+
+	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
+	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());
+}
+
+void FifoPlayerDlg::OnObjectFrom(wxSpinEvent& event)
+{
+	FifoPlayer::GetInstance().SetObjectRangeStart(event.GetPosition());
+}
+
+void FifoPlayerDlg::OnObjectTo(wxSpinEvent& event)
+{
+	FifoPlayer::GetInstance().SetObjectRangeEnd(event.GetPosition());
+}
+
+void FifoPlayerDlg::OnCheckEarlyMemoryUpdates(wxCommandEvent& event)
+{
+	FifoPlayer::GetInstance().SetEarlyMemoryUpdates(event.IsChecked());
+}
+
+void FifoPlayerDlg::OnSaveFile(wxCommandEvent& WXUNUSED(event))
+{
+	// Pointer to the file data that was created as a result of recording.
+	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
+
+	if (file)
+	{
+		// Bring up a save file dialog. The location the user chooses will be assigned to this variable.
+		wxString path = wxSaveFileSelector(_("Dolphin FIFO"), "dff", wxEmptyString, this);
+
+		// Has a valid file path
+		if (!path.empty())
+		{
+			// Attempt to save the file to the path the user chose
+			wxBeginBusyCursor();
+			bool result = file->Save(WxStrToStr(path));
+			wxEndBusyCursor();
+
+			// Wasn't able to save the file, shit's whack, yo.
+			if (!result)
+				WxUtils::ShowErrorDialog(_("Error saving file."));
+		}
+	}
+}
+
+void FifoPlayerDlg::OnRecordStop(wxCommandEvent& WXUNUSED(event))
+{
+	FifoRecorder& recorder = FifoRecorder::GetInstance();
+
+	// Recorder is still recording
+	if (recorder.IsRecording())
+	{
+		// Then stop recording
+		recorder.StopRecording();
+
+		// and change the button label accordingly.
+		m_RecordStop->SetLabel(_("Record"));
+	}
+	else // Recorder is actually about to start recording
+	{
+		// So start recording
+		recorder.StartRecording(m_FramesToRecord, RecordingFinished);
+
+		// and change the button label accordingly.
+		m_RecordStop->SetLabel(_("Stop"));
+	}
+}
+
+void FifoPlayerDlg::OnNumFramesToRecord(wxSpinEvent& event)
+{
+	m_FramesToRecord = event.GetPosition();
+
+	// Entering 0 frames in the control indicates infinite frames to record
+	// The fifo recorder takes any value < 0 to be infinite frames
+	if (m_FramesToRecord < 1)
+		m_FramesToRecord = -1;
+}
+
+void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event)
+{
+	wxString str_search_val = m_searchField->GetValue();
+
+	if (m_framesList->GetSelection() == -1)
+		return;
+
+	// TODO: Limited to even str lengths...
+	if (!str_search_val.empty() && str_search_val.length() % 2)
+	{
+		m_numResultsText->SetLabel(_("Invalid search string (only even string lengths supported)"));
+		return;
+	}
+
+	unsigned int const val_length = str_search_val.length() / 2;
+	std::vector<u8> search_val(val_length);
+	for (unsigned int i = 0; i < val_length; ++i)
+	{
+		wxString char_str = str_search_val.Mid(2*i, 2);
+		unsigned long val = 0;
+		if (!char_str.ToULong(&val, 16))
+		{
+			m_numResultsText->SetLabel(_("Invalid search string (couldn't convert to number)"));
+			return;
+		}
+		search_val[i] = (u8)val;
+	}
+	search_results.clear();
+
+	int const frame_idx = m_framesList->GetSelection();
+	FifoPlayer& player = FifoPlayer::GetInstance();
+	const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
+	const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
+
+	// TODO: Support searching through the last object... How do we know were the cmd data ends?
+	// TODO: Support searching for bit patterns
+	int obj_idx = m_objectsList->GetSelection();
+	if (obj_idx == -1)
+	{
+		m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)"));
+		return;
+	}
+
+	const u8* const start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]];
+	const u8* const end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx + 1]];
+
+	for (const u8* ptr = start_ptr; ptr < end_ptr - val_length + 1; ++ptr)
+	{
+		if (std::equal(search_val.begin(), search_val.end(), ptr))
+		{
+			SearchResult result;
+			result.frame_idx = frame_idx;
+
+			result.obj_idx = m_objectsList->GetSelection();
+			result.cmd_idx = 0;
+			for (unsigned int cmd_idx = 1; cmd_idx < m_objectCmdOffsets.size(); ++cmd_idx)
+			{
+				if (ptr < start_ptr + m_objectCmdOffsets[cmd_idx])
+				{
+					result.cmd_idx = cmd_idx - 1;
+					break;
+				}
+			}
+			search_results.push_back(result);
+		}
+	}
+
+	ChangeSearchResult(0);
+	m_beginSearch->Disable();
+	m_numResultsText->SetLabel(wxString::Format(_("Found %u results for \'"), (u32)search_results.size()) + m_searchField->GetValue() + "\'");
+}
+
+void FifoPlayerDlg::OnSearchFieldTextChanged(wxCommandEvent& event)
+{
+	ResetSearch();
+}
+
+void FifoPlayerDlg::OnFindNextClick(wxCommandEvent& event)
+{
+	int cur_cmd_index = m_objectCmdList->GetSelection();
+	if (cur_cmd_index == -1)
+	{
+		ChangeSearchResult(0);
+		return;
+	}
+
+	for (auto it = search_results.begin(); it != search_results.end(); ++it)
+	{
+		if (it->cmd_idx > cur_cmd_index)
+		{
+			ChangeSearchResult(it - search_results.begin());
+			return;
+		}
+	}
+}
+
+void FifoPlayerDlg::OnFindPreviousClick(wxCommandEvent& event)
+{
+	int cur_cmd_index = m_objectCmdList->GetSelection();
+	if (cur_cmd_index == -1)
+	{
+		ChangeSearchResult(search_results.size() - 1);
+		return;
+	}
+
+	for (auto it = search_results.rbegin(); it != search_results.rend(); ++it)
+	{
+		if (it->cmd_idx < cur_cmd_index)
+		{
+			ChangeSearchResult(search_results.size() - 1 - (it - search_results.rbegin()));
+			return;
+		}
+	}
+}
+
+void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
+{
+	if (result_idx < search_results.size()) // if index is valid
+	{
+		m_search_result_idx = result_idx;
+		int prev_frame = m_framesList->GetSelection();
+		int prev_obj = m_objectsList->GetSelection();
+		int prev_cmd = m_objectCmdList->GetSelection();
+		m_framesList->SetSelection(search_results[result_idx].frame_idx);
+		m_objectsList->SetSelection(search_results[result_idx].obj_idx);
+		m_objectCmdList->SetSelection(search_results[result_idx].cmd_idx);
+
+		wxCommandEvent ev(wxEVT_LISTBOX);
+		if (prev_frame != m_framesList->GetSelection())
+		{
+			ev.SetInt(m_framesList->GetSelection());
+			OnFrameListSelectionChanged(ev);
+		}
+		if (prev_obj != m_objectsList->GetSelection())
+		{
+			ev.SetInt(m_objectsList->GetSelection());
+			OnObjectListSelectionChanged(ev);
+		}
+		if (prev_cmd != m_objectCmdList->GetSelection())
+		{
+			ev.SetInt(m_objectCmdList->GetSelection());
+			OnObjectCmdListSelectionChanged(ev);
+		}
+
+		m_findNext->Enable(result_idx + 1 < search_results.size());
+		m_findPrevious->Enable(result_idx != 0);
+	}
+	else if (search_results.size())
+	{
+		ChangeSearchResult(search_results.size() - 1);
+	}
+}
+
+void FifoPlayerDlg::ResetSearch()
+{
+	m_beginSearch->Enable(m_searchField->GetLineLength(0) > 0);
+	m_findNext->Disable();
+	m_findPrevious->Disable();
+
+	search_results.clear();
+}
+
+void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
+{
+	FifoPlayer& player = FifoPlayer::GetInstance();
+
+	m_objectsList->Clear();
+	if (event.GetInt() != -1)
+	{
+		size_t num_objects = player.GetAnalyzedFrameInfo(event.GetInt()).objectStarts.size();
+		for (size_t i = 0; i < num_objects; ++i)
+			m_objectsList->Append(wxString::Format("Object %u", (u32)i));
+	}
+
+	// Update object list
+	wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
+	ev.SetInt(-1);
+	OnObjectListSelectionChanged(ev);
+
+	ResetSearch();
+}
+
+void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
+{
+	FifoPlayer& player = FifoPlayer::GetInstance();
+
+	int frame_idx = m_framesList->GetSelection();
+	int object_idx = event.GetInt();
+
+	m_objectCmdList->Clear();
+	m_objectCmdOffsets.clear();
+	if (frame_idx != -1 && object_idx != -1)
+	{
+		const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
+		const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
+		const u8* objectdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx]];
+		const u8* objectdata_end = &fifo_frame.fifoData[frame.objectEnds[object_idx]];
+		u8* objectdata = (u8*)objectdata_start;
+		const int obj_offset = objectdata_start - &fifo_frame.fifoData[frame.objectStarts[0]];
+
+		int cmd = *objectdata++;
+		int stream_size = Common::swap16(objectdata);
+		objectdata += 2;
+		wxString newLabel = wxString::Format("%08X:  %02X %04X  ", obj_offset, cmd, stream_size);
+		if (stream_size && ((objectdata_end - objectdata) % stream_size))
+			newLabel += _("NOTE: Stream size doesn't match actual data length\n");
+
+		while (objectdata < objectdata_end)
+		{
+			newLabel += wxString::Format("%02X", *objectdata++);
+		}
+		m_objectCmdList->Append(newLabel);
+		m_objectCmdOffsets.push_back(0);
+
+
+		// Between objectdata_end and next_objdata_start, there are register setting commands
+		if (object_idx + 1 < (int)frame.objectStarts.size())
+		{
+			const u8* next_objdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx+1]];
+			while (objectdata < next_objdata_start)
+			{
+				m_objectCmdOffsets.push_back(objectdata - objectdata_start);
+				int new_offset = objectdata - &fifo_frame.fifoData[frame.objectStarts[0]];
+				int command = *objectdata++;
+				switch (command)
+				{
+				case GX_NOP:
+					newLabel = "NOP";
+					break;
+
+				case 0x44:
+					newLabel = "0x44";
+					break;
+
+				case GX_CMD_INVL_VC:
+					newLabel = "GX_CMD_INVL_VC";
+					break;
+
+				case GX_LOAD_CP_REG:
+					{
+						u32 cmd2 = *objectdata++;
+						u32 value = Common::swap32(objectdata);
+						objectdata += 4;
+
+						newLabel = wxString::Format("CP  %02X  %08X", cmd2, value);
+					}
+					break;
+
+				case GX_LOAD_XF_REG:
+					{
+						u32 cmd2 = Common::swap32(objectdata);
+						objectdata += 4;
+
+						u8 streamSize = ((cmd2 >> 16) & 15) + 1;
+
+						const u8* stream_start = objectdata;
+						const u8* stream_end = stream_start + streamSize * 4;
+
+						newLabel = wxString::Format("XF  %08X  ", cmd2);
+						while (objectdata < stream_end)
+						{
+							newLabel += wxString::Format("%02X", *objectdata++);
+
+							if (((objectdata - stream_start) % 4) == 0)
+								newLabel += " ";
+						}
+					}
+					break;
+
+				case GX_LOAD_INDX_A:
+				case GX_LOAD_INDX_B:
+				case GX_LOAD_INDX_C:
+				case GX_LOAD_INDX_D:
+					objectdata += 4;
+					newLabel = wxString::Format("LOAD INDX %s", (command == GX_LOAD_INDX_A) ? "A" :
+					                                            (command == GX_LOAD_INDX_B) ? "B" :
+					                                            (command == GX_LOAD_INDX_C) ? "C" : "D");
+					break;
+
+				case GX_CMD_CALL_DL:
+					// The recorder should have expanded display lists into the fifo stream and skipped the call to start them
+					// That is done to make it easier to track where memory is updated
+					_assert_(false);
+					objectdata += 8;
+					newLabel = wxString::Format("CALL DL");
+					break;
+
+				case GX_LOAD_BP_REG:
+					{
+						u32 cmd2 = Common::swap32(objectdata);
+						objectdata += 4;
+						newLabel = wxString::Format("BP  %02X %06X", cmd2 >> 24, cmd2 & 0xFFFFFF);
+					}
+					break;
+
+				default:
+					newLabel = _("Unexpected 0x80 call? Aborting...");
+					objectdata = (u8*)next_objdata_start;
+					break;
+				}
+				newLabel = wxString::Format("%08X:  ", new_offset) + newLabel;
+				m_objectCmdList->Append(newLabel);
+			}
+		}
+	}
+	// Update command list
+	wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
+	ev.SetInt(-1);
+	OnObjectCmdListSelectionChanged(ev);
+
+	ResetSearch();
+}
+
+void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event)
+{
+	const int frame_idx = m_framesList->GetSelection();
+	const int object_idx = m_objectsList->GetSelection();
+
+	if (event.GetInt() == -1 || frame_idx == -1 || object_idx == -1)
+	{
+		m_objectCmdInfo->SetLabel(wxEmptyString);
+		return;
+	}
+
+	FifoPlayer& player = FifoPlayer::GetInstance();
+	const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
+	const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
+	const u8* cmddata = &fifo_frame.fifoData[frame.objectStarts[object_idx]] + m_objectCmdOffsets[event.GetInt()];
+
+	// TODO: Not sure whether we should bother translating the descriptions
+	wxString newLabel;
+	if (*cmddata == GX_LOAD_BP_REG)
+	{
+		std::string name;
+		std::string desc;
+		GetBPRegInfo(cmddata + 1, &name, &desc);
+
+		newLabel = _("BP register ");
+		newLabel += (name.empty()) ? wxString::Format(_("UNKNOWN_%02X"), *(cmddata + 1)) : StrToWxStr(name);
+		newLabel += ":\n";
+
+		if (desc.empty())
+			newLabel += _("No description available");
+		else
+			newLabel += StrToWxStr(desc);
+	}
+	else if (*cmddata == GX_LOAD_CP_REG)
+	{
+		newLabel = _("CP register ");
+	}
+	else if (*cmddata == GX_LOAD_XF_REG)
+	{
+		newLabel = _("XF register ");
+	}
+	else
+	{
+		newLabel = _("No description available");
+	}
+
+	m_objectCmdInfo->SetLabel(newLabel);
+	Layout();
+	Fit();
+}
+
+void FifoPlayerDlg::OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event))
+{
+	if (wxTheClipboard->Open())
+	{
+		wxTheClipboard->SetData(new wxTextDataObject(m_objectCmdList->GetStringSelection()));
+		wxTheClipboard->Close();
+	}
+}
+
+void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event))
+{
+	Hide();
+}
+
+void FifoPlayerDlg::OnRecordingFinished(wxEvent&)
+{
+	m_RecordStop->SetLabel(_("Record"));
+	m_RecordStop->Enable();
+
+	UpdateRecorderGui();
+}
+
+void FifoPlayerDlg::OnFrameWritten(wxEvent&)
+{
+	m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel());
+	m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel());
+}
+
+void FifoPlayerDlg::UpdatePlayGui()
+{
+	m_NumFramesLabel->SetLabel(CreateFileFrameCountLabel());
+	m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel());
+	m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel());
+
+	FifoPlayer &player = FifoPlayer::GetInstance();
+	FifoDataFile *file = player.GetFile();
+	u32 frameCount = 0;
+	if (file)
+		frameCount = file->GetFrameCount();
+
+	m_FrameFromCtrl->SetRange(0, frameCount);
+	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
+
+	m_FrameToCtrl->SetRange(0, frameCount);
+	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());
+
+	m_ObjectFromCtrl->SetValue(player.GetObjectRangeStart());
+	m_ObjectToCtrl->SetValue(player.GetObjectRangeEnd());
+}
+
+void FifoPlayerDlg::UpdateRecorderGui()
+{
+	m_RecordingFifoSizeLabel->SetLabel(CreateRecordingFifoSizeLabel());
+	m_RecordingMemSizeLabel->SetLabel(CreateRecordingMemSizeLabel());
+	m_RecordingFramesLabel->SetLabel(CreateRecordingFrameCountLabel());
+	m_Save->Enable(GetSaveButtonEnabled());
+}
+
+void FifoPlayerDlg::UpdateAnalyzerGui()
+{
+	FifoPlayer &player = FifoPlayer::GetInstance();
+	FifoDataFile* file = player.GetFile();
+
+	size_t num_frames = (file) ? player.GetFile()->GetFrameCount() : 0U;
+	if (m_framesList->GetCount() != num_frames)
+	{
+		m_framesList->Clear();
+
+		for (size_t i = 0; i < num_frames; ++i)
+		{
+			m_framesList->Append(wxString::Format("Frame %u", (u32)i));
+		}
+
+		wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
+		ev.SetInt(-1);
+		OnFrameListSelectionChanged(ev);
+	}
+}
+
+wxString FifoPlayerDlg::CreateFileFrameCountLabel() const
+{
+	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
+
+	if (file)
+		return CreateIntegerLabel(file->GetFrameCount(), _("Frame"));
+
+	return _("No file loaded");
+}
+
+wxString FifoPlayerDlg::CreateCurrentFrameLabel() const
+{
+	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
+
+	if (file)
+		return _("Frame ") + wxString::Format("%u", FifoPlayer::GetInstance().GetCurrentFrameNum());
+
+	return wxEmptyString;
+}
+
+wxString FifoPlayerDlg::CreateFileObjectCountLabel() const
+{
+	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
+
+	if (file)
+		return CreateIntegerLabel(FifoPlayer::GetInstance().GetFrameObjectCount(), _("Object"));
+
+	return wxEmptyString;
+}
+
+wxString FifoPlayerDlg::CreateRecordingFifoSizeLabel() const
+{
+	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
+
+	if (file)
+	{
+		size_t fifoBytes = 0;
+		for (size_t i = 0; i < file->GetFrameCount(); ++i)
+			fifoBytes += file->GetFrame(i).fifoDataSize;
+
+		return CreateIntegerLabel(fifoBytes, _("FIFO Byte"));
+	}
+
+	return _("No recorded file");
+}
+
+wxString FifoPlayerDlg::CreateRecordingMemSizeLabel() const
+{
+	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
+
+	if (file)
+	{
+		size_t memBytes = 0;
+		for (size_t frameNum = 0; frameNum < file->GetFrameCount(); ++frameNum)
+		{
+			const std::vector<MemoryUpdate>& memUpdates = file->GetFrame(frameNum).memoryUpdates;
+			for (auto& memUpdate : memUpdates)
+				memBytes += memUpdate.size;
+		}
+
+		return CreateIntegerLabel(memBytes, _("Memory Byte"));
+	}
+
+	return wxEmptyString;
+}
+
+wxString FifoPlayerDlg::CreateRecordingFrameCountLabel() const
+{
+	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
+
+	if (file)
+	{
+		size_t numFrames = file->GetFrameCount();
+		return CreateIntegerLabel(numFrames, _("Frame"));
+	}
+
+	return wxEmptyString;
+}
+
+wxString FifoPlayerDlg::CreateIntegerLabel(size_t size, const wxString& label) const
+{
+	wxString postfix;
+	if (size != 1)
+		postfix = _("s");
+
+	return wxString::Format("%u ", (u32)size) + label + postfix;
+}
+
+bool FifoPlayerDlg::GetSaveButtonEnabled() const
+{
+	return (FifoRecorder::GetInstance().GetRecordedFile() != nullptr);
+}
+
+void FifoPlayerDlg::RecordingFinished()
+{
+	sMutex.lock();
+
+	if (m_EvtHandler)
+	{
+		wxCommandEvent event(RECORDING_FINISHED_EVENT);
+		m_EvtHandler->AddPendingEvent(event);
+	}
+
+	sMutex.unlock();
+}
+
+void FifoPlayerDlg::FileLoaded()
+{
+	sMutex.lock();
+
+	if (m_EvtHandler)
+	{
+		wxPaintEvent event;
+		m_EvtHandler->AddPendingEvent(event);
+	}
+
+	sMutex.unlock();
+}
+
+void FifoPlayerDlg::FrameWritten()
+{
+	sMutex.lock();
+
+	if (m_EvtHandler)
+	{
+		wxCommandEvent event(FRAME_WRITTEN_EVENT);
+		m_EvtHandler->AddPendingEvent(event);
+	}
+
+	sMutex.unlock();
+}
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h
similarity index 76%
rename from Source/Core/DolphinWX/Src/FifoPlayerDlg.h
rename to Source/Core/DolphinWX/FifoPlayerDlg.h
index 6f4a8074b9..3eb535a468 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
+++ b/Source/Core/DolphinWX/FifoPlayerDlg.h
@@ -1,16 +1,25 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef __FIFO_PLAYER_DLG_h__
-#define __FIFO_PLAYER_DLG_h__
+#pragma once
 
+#include <cstddef>
 #include <vector>
-#include <wx/wx.h>
-#include <wx/notebook.h>
+#include <wx/dialog.h>
 
+#include "Common/CommonTypes.h"
+
+class wxButton;
+class wxCheckBox;
+class wxListBox;
+class wxNotebook;
+class wxPaintEvent;
+class wxPanel;
 class wxSpinCtrl;
 class wxSpinEvent;
+class wxStaticText;
+class wxTextCtrl;
 
 class FifoPlayerDlg : public wxDialog
 {
@@ -21,16 +30,16 @@ public:
 private:
 	void CreateGUIControls();
 
-	void OnPaint( wxPaintEvent& event );
-	void OnFrameFrom( wxSpinEvent& event );
-	void OnFrameTo( wxSpinEvent& event );
-	void OnObjectFrom( wxSpinEvent& event );
-	void OnObjectTo( wxSpinEvent& event );
-	void OnCheckEarlyMemoryUpdates( wxCommandEvent& event );
-	void OnRecordStop( wxCommandEvent& event );
-	void OnSaveFile( wxCommandEvent& event );	
-	void OnNumFramesToRecord( wxSpinEvent& event );
-	void OnCloseClick( wxCommandEvent& event );
+	void OnPaint(wxPaintEvent& event);
+	void OnFrameFrom(wxSpinEvent& event);
+	void OnFrameTo(wxSpinEvent& event);
+	void OnObjectFrom(wxSpinEvent& event);
+	void OnObjectTo(wxSpinEvent& event);
+	void OnCheckEarlyMemoryUpdates(wxCommandEvent& event);
+	void OnRecordStop(wxCommandEvent& event);
+	void OnSaveFile(wxCommandEvent& event);
+	void OnNumFramesToRecord(wxSpinEvent& event);
+	void OnCloseClick(wxCommandEvent& event);
 
 	void OnBeginSearch(wxCommandEvent& event);
 	void OnFindNextClick(wxCommandEvent& event);
@@ -57,7 +66,7 @@ private:
 	wxString CreateRecordingFifoSizeLabel() const;
 	wxString CreateRecordingMemSizeLabel() const;
 	wxString CreateRecordingFrameCountLabel() const;
-	wxString CreateIntegerLabel(int size, const wxString& label) const;
+	wxString CreateIntegerLabel(size_t size, const wxString& label) const;
 
 	bool GetSaveButtonEnabled() const;
 
@@ -116,4 +125,3 @@ private:
 
 	s32 m_FramesToRecord;
 };
-#endif
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
new file mode 100644
index 0000000000..b41cdbb461
--- /dev/null
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -0,0 +1,1475 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef __APPLE__
+#include <Cocoa/Cocoa.h>
+#endif
+
+#include <cstddef>
+#include <fstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include <wx/filename.h>
+#include <wx/frame.h>
+#include <wx/icon.h>
+#include <wx/listbase.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/statusbr.h>
+#include <wx/textctrl.h>
+#include <wx/thread.h>
+#include <wx/aui/auibook.h>
+#include <wx/aui/framemanager.h>
+
+#include "AudioCommon/AudioCommon.h"
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Thread.h"
+#include "Common/Logging/ConsoleListener.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/HotkeyManager.h"
+#include "Core/Movie.h"
+#include "Core/State.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/Wiimote.h"
+
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/TASInputDlg.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+
+#include "InputCommon/GCPadStatus.h"
+
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+// Resources
+
+extern "C" {
+#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon
+};
+
+int g_saveSlot = 1;
+
+#if defined(HAVE_X11) && HAVE_X11
+// X11Utils nastiness that's only used here
+namespace X11Utils {
+
+Window XWindowFromHandle(void *Handle)
+{
+	return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle)));
+}
+
+Display *XDisplayFromHandle(void *Handle)
+{
+	return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle)));
+}
+
+}
+#endif
+
+CRenderFrame::CRenderFrame(wxFrame* parent, wxWindowID id, const wxString& title,
+		const wxPoint& pos, const wxSize& size, long style)
+	: wxFrame(parent, id, title, pos, size, style)
+{
+	// Give it an icon
+	wxIcon IconTemp;
+	IconTemp.CopyFromBitmap(wxGetBitmapFromMemory(Dolphin_png));
+	SetIcon(IconTemp);
+
+	DragAcceptFiles(true);
+	Bind(wxEVT_DROP_FILES, &CRenderFrame::OnDropFiles, this);
+}
+
+void CRenderFrame::OnDropFiles(wxDropFilesEvent& event)
+{
+	if (event.GetNumberOfFiles() != 1)
+		return;
+	if (File::IsDirectory(WxStrToStr(event.GetFiles()[0])))
+		return;
+
+	wxFileName file = event.GetFiles()[0];
+	const std::string filepath = WxStrToStr(file.GetFullPath());
+
+	if (file.GetExt() == "dtm")
+	{
+		if (Core::IsRunning())
+			return;
+
+		if (!Movie::IsReadOnly())
+		{
+			// let's make the read-only flag consistent at the start of a movie.
+			Movie::SetReadOnly(true);
+			main_frame->GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(true);
+		}
+
+		if (Movie::PlayInput(filepath))
+			main_frame->BootGame("");
+	}
+	else if (!Core::IsRunning())
+	{
+		main_frame->BootGame(filepath);
+	}
+	else if (IsValidSavestateDropped(filepath) && Core::IsRunning())
+	{
+		State::LoadAs(filepath);
+	}
+	else
+	{
+		DVDInterface::ChangeDisc(filepath);
+	}
+}
+
+bool CRenderFrame::IsValidSavestateDropped(const std::string& filepath)
+{
+	const int game_id_length = 6;
+	std::ifstream file(filepath, std::ios::in | std::ios::binary);
+
+	if (!file)
+		return false;
+
+	std::string internal_game_id(game_id_length, ' ');
+	file.read(&internal_game_id[0], game_id_length);
+
+	return internal_game_id == SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID();
+}
+
+#ifdef _WIN32
+WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+	switch (nMsg)
+	{
+		case WM_SYSCOMMAND:
+			switch (wParam)
+			{
+				case SC_SCREENSAVE:
+				case SC_MONITORPOWER:
+					if (Core::GetState() == Core::CORE_RUN && SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
+						break;
+				default:
+					return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
+			}
+			break;
+
+		case WM_USER:
+			switch (wParam)
+			{
+			case WM_USER_STOP:
+				main_frame->DoStop();
+				break;
+
+			case WM_USER_SETCURSOR:
+				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
+					main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN)
+					SetCursor(wxCURSOR_BLANK);
+				else
+					SetCursor(wxNullCursor);
+				break;
+			}
+			break;
+
+		case WM_CLOSE:
+			// Let Core finish initializing before accepting any WM_CLOSE messages
+			if (!Core::IsRunning()) break;
+			// Use default action otherwise
+
+		default:
+			// By default let wxWidgets do what it normally does with this event
+			return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
+	}
+	return 0;
+}
+#endif
+
+bool CRenderFrame::ShowFullScreen(bool show, long style)
+{
+#if defined WIN32
+	if (show && !g_Config.bBorderlessFullscreen)
+	{
+		// OpenGL requires the pop-up style to activate exclusive mode.
+		SetWindowStyle((GetWindowStyle() & ~wxDEFAULT_FRAME_STYLE) | wxPOPUP_WINDOW);
+
+		// Some backends don't support exclusive fullscreen, so we
+		// can't tell exactly when exclusive mode is activated.
+		if (!g_Config.backend_info.bSupportsExclusiveFullscreen)
+			OSD::AddMessage("Enabled exclusive fullscreen.");
+	}
+#endif
+
+	bool result = wxTopLevelWindow::ShowFullScreen(show, style);
+
+#if defined WIN32
+	if (!show)
+	{
+		// Restore the default style.
+		SetWindowStyle((GetWindowStyle() & ~wxPOPUP_WINDOW) | wxDEFAULT_FRAME_STYLE);
+	}
+#endif
+
+	return result;
+}
+
+// event tables
+// Notice that wxID_HELP will be processed for the 'About' menu and the toolbar
+// help button.
+
+wxDEFINE_EVENT(wxEVT_HOST_COMMAND, wxCommandEvent);
+
+BEGIN_EVENT_TABLE(CFrame, CRenderFrame)
+
+// Menu bar
+EVT_MENU(wxID_OPEN, CFrame::OnOpen)
+EVT_MENU(wxID_EXIT, CFrame::OnQuit)
+EVT_MENU(IDM_HELP_WEBSITE, CFrame::OnHelp)
+EVT_MENU(IDM_HELP_ONLINE_DOCS, CFrame::OnHelp)
+EVT_MENU(IDM_HELP_GITHUB, CFrame::OnHelp)
+EVT_MENU(wxID_ABOUT, CFrame::OnHelp)
+EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
+EVT_MENU(IDM_PLAY, CFrame::OnPlay)
+EVT_MENU(IDM_STOP, CFrame::OnStop)
+EVT_MENU(IDM_RESET, CFrame::OnReset)
+EVT_MENU(IDM_RECORD, CFrame::OnRecord)
+EVT_MENU(IDM_PLAY_RECORD, CFrame::OnPlayRecording)
+EVT_MENU(IDM_RECORD_EXPORT, CFrame::OnRecordExport)
+EVT_MENU(IDM_RECORD_READ_ONLY, CFrame::OnRecordReadOnly)
+EVT_MENU(IDM_TAS_INPUT, CFrame::OnTASInput)
+EVT_MENU(IDM_TOGGLE_PAUSE_MOVIE, CFrame::OnTogglePauseMovie)
+EVT_MENU(IDM_SHOW_LAG, CFrame::OnShowLag)
+EVT_MENU(IDM_SHOW_FRAME_COUNT, CFrame::OnShowFrameCount)
+EVT_MENU(IDM_SHOW_INPUT_DISPLAY, CFrame::OnShowInputDisplay)
+EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
+EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
+EVT_MENU(IDM_TOGGLE_DUMP_FRAMES, CFrame::OnToggleDumpFrames)
+EVT_MENU(IDM_TOGGLE_DUMP_AUDIO, CFrame::OnToggleDumpAudio)
+EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
+EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX)
+EVT_MENU(IDM_CONFIG_AUDIO, CFrame::OnConfigAudio)
+EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers)
+EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey)
+
+EVT_MENU(IDM_SAVE_PERSPECTIVE, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_EDIT_PERSPECTIVES, CFrame::OnPerspectiveMenu)
+// Drop down
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE_TOP, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE_BOTTOM, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE_LEFT, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE_RIGHT, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE_CENTER, CFrame::OnPerspectiveMenu)
+EVT_MENU_RANGE(IDM_PERSPECTIVES_0, IDM_PERSPECTIVES_100, CFrame::OnSelectPerspective)
+EVT_MENU(IDM_ADD_PERSPECTIVE, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_TAB_SPLIT, CFrame::OnPerspectiveMenu)
+EVT_MENU(IDM_NO_DOCKING, CFrame::OnPerspectiveMenu)
+// Drop down float
+EVT_MENU_RANGE(IDM_FLOAT_LOG_WINDOW, IDM_FLOAT_CODE_WINDOW, CFrame::OnFloatWindow)
+
+EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
+EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
+EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
+EVT_MENU(IDM_IMPORT_SAVE, CFrame::OnImportSave)
+EVT_MENU(IDM_EXPORT_ALL_SAVE, CFrame::OnExportAllSaves)
+EVT_MENU(IDM_CHEATS, CFrame::OnShowCheatsWindow)
+EVT_MENU(IDM_CHANGE_DISC, CFrame::OnChangeDisc)
+EVT_MENU(IDM_MENU_INSTALL_WAD, CFrame::OnInstallWAD)
+EVT_MENU(IDM_LIST_INSTALL_WAD, CFrame::OnInstallWAD)
+EVT_MENU(IDM_LOAD_WII_MENU, CFrame::OnLoadWiiMenu)
+EVT_MENU(IDM_FIFOPLAYER, CFrame::OnFifoPlayer)
+
+EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
+EVT_MENU(IDM_TOGGLE_DUAL_CORE, CFrame::OnToggleDualCore)
+EVT_MENU(IDM_TOGGLE_SKIP_IDLE, CFrame::OnToggleSkipIdle)
+EVT_MENU(IDM_TOGGLE_TOOLBAR, CFrame::OnToggleToolbar)
+EVT_MENU(IDM_TOGGLE_STATUSBAR, CFrame::OnToggleStatusbar)
+EVT_MENU_RANGE(IDM_LOG_WINDOW, IDM_VIDEO_WINDOW, CFrame::OnToggleWindow)
+EVT_MENU_RANGE(IDM_SHOW_SYSTEM, IDM_SHOW_STATE, CFrame::OnChangeColumnsVisible)
+
+EVT_MENU(IDM_PURGE_CACHE, CFrame::GameListChanged)
+
+EVT_MENU(IDM_SAVE_FIRST_STATE, CFrame::OnSaveFirstState)
+EVT_MENU(IDM_UNDO_LOAD_STATE, CFrame::OnUndoLoadState)
+EVT_MENU(IDM_UNDO_SAVE_STATE, CFrame::OnUndoSaveState)
+EVT_MENU(IDM_LOAD_STATE_FILE, CFrame::OnLoadStateFromFile)
+EVT_MENU(IDM_SAVE_STATE_FILE, CFrame::OnSaveStateToFile)
+EVT_MENU(IDM_SAVE_SELECTED_SLOT, CFrame::OnSaveCurrentSlot)
+EVT_MENU(IDM_LOAD_SELECTED_SLOT, CFrame::OnLoadCurrentSlot)
+
+EVT_MENU_RANGE(IDM_LOAD_SLOT_1, IDM_LOAD_SLOT_10, CFrame::OnLoadState)
+EVT_MENU_RANGE(IDM_LOAD_LAST_1, IDM_LOAD_LAST_8, CFrame::OnLoadLastState)
+EVT_MENU_RANGE(IDM_SAVE_SLOT_1, IDM_SAVE_SLOT_10, CFrame::OnSaveState)
+EVT_MENU_RANGE(IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_10, CFrame::OnSelectSlot)
+EVT_MENU_RANGE(IDM_FRAME_SKIP_0, IDM_FRAME_SKIP_9, CFrame::OnFrameSkip)
+EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
+EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote)
+EVT_MENU_RANGE(IDM_LIST_WAD, IDM_LIST_DRIVES, CFrame::GameListChanged)
+
+// Other
+EVT_ACTIVATE(CFrame::OnActive)
+EVT_CLOSE(CFrame::OnClose)
+EVT_SIZE(CFrame::OnResize)
+EVT_MOVE(CFrame::OnMove)
+EVT_HOST_COMMAND(wxID_ANY, CFrame::OnHostMessage)
+
+EVT_AUI_PANE_CLOSE(CFrame::OnPaneClose)
+EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, CFrame::OnNotebookPageClose)
+EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, CFrame::OnAllowNotebookDnD)
+EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, CFrame::OnNotebookPageChanged)
+EVT_AUINOTEBOOK_TAB_RIGHT_UP(wxID_ANY, CFrame::OnTab)
+
+// Post events to child panels
+EVT_MENU_RANGE(IDM_INTERPRETER, IDM_ADDRBOX, CFrame::PostEvent)
+EVT_TEXT(IDM_ADDRBOX, CFrame::PostEvent)
+
+END_EVENT_TABLE()
+
+// ---------------
+// Creation and close, quit functions
+
+
+bool CFrame::InitControllers()
+{
+	if (!g_controller_interface.IsInit())
+	{
+#if defined(HAVE_X11) && HAVE_X11
+		Window win = X11Utils::XWindowFromHandle(GetHandle());
+		Pad::Initialize(reinterpret_cast<void*>(win));
+		Keyboard::Initialize(reinterpret_cast<void*>(win));
+		Wiimote::Initialize(reinterpret_cast<void*>(win));
+		HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(win));
+#else
+		Pad::Initialize(reinterpret_cast<void*>(GetHandle()));
+		Keyboard::Initialize(reinterpret_cast<void*>(GetHandle()));
+		Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
+		HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(GetHandle()));
+#endif
+		return true;
+	}
+	return false;
+}
+
+CFrame::CFrame(wxFrame* parent,
+		wxWindowID id,
+		const wxString& title,
+		const wxPoint& pos,
+		const wxSize& size,
+		bool _UseDebugger,
+		bool _BatchMode,
+		bool ShowLogWindow,
+		long style)
+	: CRenderFrame(parent, id, title, pos, size, style)
+	, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr)
+	, m_SavedPerspectives(nullptr), m_ToolBar(nullptr)
+	, m_GameListCtrl(nullptr), m_Panel(nullptr)
+	, m_RenderFrame(nullptr), m_RenderParent(nullptr)
+	, m_LogWindow(nullptr), m_LogConfigWindow(nullptr)
+	, m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger)
+	, m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
+	, m_bGameLoading(false), m_bClosing(false), m_confirmStop(false), m_menubar_shadow(nullptr)
+{
+	for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
+		bFloatWindow[i] = false;
+
+	if (ShowLogWindow)
+		SConfig::GetInstance().m_InterfaceLogWindow = true;
+
+	// Start debugging maximized
+	if (UseDebugger)
+		this->Maximize(true);
+
+	// Debugger class
+	if (UseDebugger)
+	{
+		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, this, IDM_CODE_WINDOW);
+		LoadIniPerspectives();
+		g_pCodeWindow->Load();
+	}
+
+	// Create toolbar bitmaps
+	InitBitmaps();
+
+	// Give it a status bar
+	SetStatusBar(CreateStatusBar(2, wxST_SIZEGRIP, ID_STATUSBAR));
+	if (!SConfig::GetInstance().m_InterfaceStatusbar)
+		GetStatusBar()->Hide();
+
+	// Give it a menu bar
+	wxMenuBar* menubar_active = CreateMenu();
+	SetMenuBar(menubar_active);
+	// Create a menubar to service requests while the real menubar is hidden from the screen
+	m_menubar_shadow = CreateMenu();
+
+	// ---------------
+	// Main panel
+	// This panel is the parent for rendering and it holds the gamelistctrl
+	m_Panel = new wxPanel(this, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
+
+	m_GameListCtrl = new CGameListCtrl(m_Panel, wxID_ANY,
+	        wxDefaultPosition, wxDefaultSize,
+	        wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT);
+	m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrlItemActivated, this);
+
+	wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL);
+	sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL);
+	m_Panel->SetSizer(sizerPanel);
+	// ---------------
+
+	// Manager
+	m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+
+	m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
+			.Name("Pane 0").Caption("Pane 0").PaneBorder(false)
+			.CaptionVisible(false).Layer(0).Center().Show());
+	if (!g_pCodeWindow)
+		m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
+				.Name("Pane 1").Caption(_("Logging")).CaptionVisible(true)
+				.Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide());
+	AuiFullscreen = m_Mgr->SavePerspective();
+
+	// Create toolbar
+	RecreateToolbar();
+	if (!SConfig::GetInstance().m_InterfaceToolbar) DoToggleToolbar(false);
+
+	m_LogWindow = new CLogWindow(this, IDM_LOG_WINDOW);
+	m_LogWindow->Hide();
+	m_LogWindow->Disable();
+
+	for (int i = 0; i < 8; ++i)
+		g_TASInputDlg[i] = new TASInputDlg(this);
+
+	Movie::SetGCInputManip(GCTASManipFunction);
+	Movie::SetWiiInputManip(WiiTASManipFunction);
+
+	State::SetOnAfterLoadCallback(OnAfterLoadCallback);
+	Core::SetOnStoppedCallback(OnStoppedCallback);
+
+	// Setup perspectives
+	if (g_pCodeWindow)
+	{
+		// Load perspective
+		DoLoadPerspective();
+	}
+	else
+	{
+		if (SConfig::GetInstance().m_InterfaceLogWindow)
+			ToggleLogWindow(true);
+		if (SConfig::GetInstance().m_InterfaceLogConfigWindow)
+			ToggleLogConfigWindow(true);
+	}
+
+	// Show window
+	Show();
+
+	// Commit
+	m_Mgr->Update();
+
+	#ifdef _WIN32
+		SetToolTip("");
+		GetToolTip()->SetAutoPop(25000);
+	#endif
+
+	#if defined(HAVE_XRANDR) && HAVE_XRANDR
+		m_XRRConfig = new X11Utils::XRRConfiguration(X11Utils::XDisplayFromHandle(GetHandle()),
+				X11Utils::XWindowFromHandle(GetHandle()));
+	#endif
+
+	// -------------------------
+	// Connect event handlers
+
+	m_Mgr->Bind(wxEVT_AUI_RENDER, &CFrame::OnManagerResize, this);
+	// ----------
+
+	// Update controls
+	UpdateGUI();
+	if (g_pCodeWindow)
+		g_pCodeWindow->UpdateButtonStates();
+
+	// check if game is running
+	InitControllers();
+
+	m_poll_hotkey_timer.SetOwner(this);
+	Bind(wxEVT_TIMER, &CFrame::PollHotkeys, this);
+	m_poll_hotkey_timer.Start(1000 / 60, wxTIMER_CONTINUOUS);
+}
+// Destructor
+CFrame::~CFrame()
+{
+	Wiimote::Shutdown();
+	Keyboard::Shutdown();
+	Pad::Shutdown();
+	HotkeyManagerEmu::Shutdown();
+
+	drives.clear();
+
+	#if defined(HAVE_XRANDR) && HAVE_XRANDR
+		delete m_XRRConfig;
+	#endif
+
+	ClosePages();
+
+	delete m_Mgr;
+
+	// This object is owned by us, not wxw
+	m_menubar_shadow->Destroy();
+	m_menubar_shadow = nullptr;
+}
+
+bool CFrame::RendererIsFullscreen()
+{
+	bool fullscreen = false;
+
+	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
+	{
+		fullscreen = m_RenderFrame->IsFullScreen();
+	}
+
+#if defined(__APPLE__)
+	if (m_RenderFrame != nullptr)
+	{
+		NSView *view = (NSView *) m_RenderFrame->GetHandle();
+		NSWindow *window = [view window];
+
+		fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask);
+	}
+#endif
+
+	return fullscreen;
+}
+
+void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
+{
+	Close(true);
+}
+
+// --------
+// Events
+void CFrame::OnActive(wxActivateEvent& event)
+{
+	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
+	{
+		if (event.GetActive() && event.GetEventObject() == m_RenderFrame)
+		{
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+				m_RenderParent->SetFocus();
+
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
+					Core::GetState() == Core::CORE_RUN)
+				m_RenderParent->SetCursor(wxCURSOR_BLANK);
+		}
+		else
+		{
+			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+				m_RenderParent->SetCursor(wxNullCursor);
+		}
+	}
+	event.Skip();
+}
+
+void CFrame::OnClose(wxCloseEvent& event)
+{
+	m_bClosing = true;
+
+	// Before closing the window we need to shut down the emulation core.
+	// We'll try to close this window again once that is done.
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		DoStop();
+		if (event.CanVeto())
+		{
+			event.Veto();
+		}
+		return;
+	}
+
+	// Stop Dolphin from saving the minimized Xpos and Ypos
+	if (main_frame->IsIconized())
+		main_frame->Iconize(false);
+
+	// Don't forget the skip or the window won't be destroyed
+	event.Skip();
+
+	// Save GUI settings
+	if (g_pCodeWindow)
+	{
+		SaveIniPerspectives();
+	}
+	else
+	{
+		// Close the log window now so that its settings are saved
+		if (m_LogWindow)
+			m_LogWindow->Close();
+		m_LogWindow = nullptr;
+	}
+
+
+	// Uninit
+	m_Mgr->UnInit();
+}
+
+// Post events
+
+// Warning: This may cause an endless loop if the event is propagated back to its parent
+void CFrame::PostEvent(wxCommandEvent& event)
+{
+	if (g_pCodeWindow &&
+		event.GetId() >= IDM_INTERPRETER &&
+		event.GetId() <= IDM_ADDRBOX)
+	{
+		event.StopPropagation();
+		g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
+	}
+	else
+	{
+		event.Skip();
+	}
+}
+
+void CFrame::OnMove(wxMoveEvent& event)
+{
+	event.Skip();
+
+	if (!IsMaximized() &&
+		!(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()))
+	{
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iPosX = GetPosition().x;
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iPosY = GetPosition().y;
+	}
+}
+
+void CFrame::OnResize(wxSizeEvent& event)
+{
+	event.Skip();
+
+	if (!IsMaximized() &&
+		!(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()) &&
+		!(Core::GetState() != Core::CORE_UNINITIALIZED &&
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize))
+	{
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth = GetSize().GetWidth();
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight = GetSize().GetHeight();
+	}
+
+	// Make sure the logger pane is a sane size
+	if (!g_pCodeWindow && m_LogWindow && m_Mgr->GetPane("Pane 1").IsShown() &&
+			!m_Mgr->GetPane("Pane 1").IsFloating() &&
+			(m_LogWindow->x > GetClientRect().GetWidth() ||
+			 m_LogWindow->y > GetClientRect().GetHeight()))
+		ShowResizePane();
+}
+
+// Host messages
+
+#ifdef _WIN32
+WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+	if (WM_SYSCOMMAND == nMsg && (SC_SCREENSAVE == wParam || SC_MONITORPOWER == wParam))
+	{
+		return 0;
+	}
+	else if (nMsg == WM_QUERYENDSESSION)
+	{
+		// Indicate that the application will be able to close
+		return 1;
+	}
+	else if (nMsg == WM_ENDSESSION)
+	{
+		// Actually trigger the close now
+		Close(true);
+		return 0;
+	}
+	else
+	{
+		return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
+	}
+}
+#endif
+
+void CFrame::UpdateTitle(const std::string &str)
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+	    SConfig::GetInstance().m_InterfaceStatusbar)
+	{
+		GetStatusBar()->SetStatusText(str, 0);
+		m_RenderFrame->SetTitle(scm_rev_str);
+	}
+	else
+	{
+		std::string titleStr = StringFromFormat("%s | %s", scm_rev_str, str.c_str());
+		m_RenderFrame->SetTitle(titleStr);
+	}
+}
+
+void CFrame::OnHostMessage(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case IDM_UPDATE_GUI:
+		UpdateGUI();
+		break;
+
+	case IDM_UPDATE_STATUS_BAR:
+		if (GetStatusBar() != nullptr)
+			GetStatusBar()->SetStatusText(event.GetString(), event.GetInt());
+		break;
+
+	case IDM_UPDATE_TITLE:
+		UpdateTitle(WxStrToStr(event.GetString()));
+		break;
+
+	case IDM_WINDOW_SIZE_REQUEST:
+		{
+			std::pair<int, int> *win_size = (std::pair<int, int> *)(event.GetClientData());
+			OnRenderWindowSizeRequest(win_size->first, win_size->second);
+			delete win_size;
+		}
+		break;
+
+	case IDM_FULLSCREEN_REQUEST:
+		{
+			bool enable_fullscreen = event.GetInt() == 0 ? false : true;
+			ToggleDisplayMode(enable_fullscreen);
+			if (m_RenderFrame != nullptr)
+				m_RenderFrame->ShowFullScreen(enable_fullscreen);
+
+			// If the stop dialog initiated this fullscreen switch then we need
+			// to pause the emulator after we've completed the switch.
+			// TODO: Allow the renderer to switch fullscreen modes while paused.
+			if (m_confirmStop)
+				Core::SetState(Core::CORE_PAUSE);
+		}
+		break;
+
+	case WM_USER_CREATE:
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+			m_RenderParent->SetCursor(wxCURSOR_BLANK);
+		break;
+
+#ifdef __WXGTK__
+	case IDM_PANIC:
+		{
+			wxString caption = event.GetString().BeforeFirst(':');
+			wxString text = event.GetString().AfterFirst(':');
+			bPanicResult = (wxYES == wxMessageBox(text,
+						caption, event.GetInt() ? wxYES_NO : wxOK, wxWindow::FindFocus()));
+			panic_event.Set();
+		}
+		break;
+#endif
+
+	case WM_USER_STOP:
+		DoStop();
+		break;
+
+	case IDM_STOPPED:
+		OnStopped();
+		break;
+	}
+}
+
+void CFrame::OnRenderWindowSizeRequest(int width, int height)
+{
+	if (!Core::IsRunning() ||
+			!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize ||
+			RendererIsFullscreen() || m_RenderFrame->IsMaximized())
+		return;
+
+	int old_width, old_height, log_width = 0, log_height = 0;
+	m_RenderFrame->GetClientSize(&old_width, &old_height);
+
+	// Add space for the log/console/debugger window
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+			(SConfig::GetInstance().m_InterfaceLogWindow ||
+			 SConfig::GetInstance().m_InterfaceLogConfigWindow) &&
+			!m_Mgr->GetPane("Pane 1").IsFloating())
+	{
+		switch (m_Mgr->GetPane("Pane 1").dock_direction)
+		{
+			case wxAUI_DOCK_LEFT:
+			case wxAUI_DOCK_RIGHT:
+				log_width = m_Mgr->GetPane("Pane 1").rect.GetWidth();
+				break;
+			case wxAUI_DOCK_TOP:
+			case wxAUI_DOCK_BOTTOM:
+				log_height = m_Mgr->GetPane("Pane 1").rect.GetHeight();
+				break;
+		}
+	}
+
+	if (old_width != width + log_width || old_height != height + log_height)
+		m_RenderFrame->SetClientSize(width + log_width, height + log_height);
+}
+
+bool CFrame::RendererHasFocus()
+{
+	if (m_RenderParent == nullptr)
+		return false;
+#ifdef _WIN32
+	HWND window = GetForegroundWindow();
+	if (window == nullptr)
+		return false;
+
+	if (m_RenderFrame->GetHWND() == window)
+		return true;
+#else
+	wxWindow *window = wxWindow::FindFocus();
+	if (window == nullptr)
+		return false;
+	// Why these different cases?
+	if (m_RenderParent == window ||
+	    m_RenderParent == window->GetParent() ||
+	    m_RenderParent->GetParent() == window->GetParent())
+	{
+		return true;
+	}
+#endif
+	return false;
+}
+
+bool CFrame::UIHasFocus()
+{
+	// UIHasFocus should return true any time any one of our UI
+	// windows has the focus, including any dialogs or other windows.
+	//
+	// wxWindow::FindFocus() returns the current wxWindow which has
+	// focus. If it's not one of our windows, then it will return
+	// null.
+
+	wxWindow *focusWindow = wxWindow::FindFocus();
+	return (focusWindow != nullptr);
+}
+
+void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
+{
+	// Show all platforms and regions if...
+	// 1. All platforms are set to hide
+	// 2. All Regions are set to hide
+	// Otherwise call BootGame to either...
+	// 1. Boot the selected iso
+	// 2. Boot the default or last loaded iso.
+	// 3. Call BrowseForDirectory if the gamelist is empty
+	if (!m_GameListCtrl->GetISO(0) &&
+		!((SConfig::GetInstance().m_ListGC &&
+		SConfig::GetInstance().m_ListWii &&
+		SConfig::GetInstance().m_ListWad) &&
+		(SConfig::GetInstance().m_ListJap &&
+		SConfig::GetInstance().m_ListUsa  &&
+		SConfig::GetInstance().m_ListPal  &&
+		SConfig::GetInstance().m_ListAustralia &&
+		SConfig::GetInstance().m_ListFrance &&
+		SConfig::GetInstance().m_ListGermany &&
+		SConfig::GetInstance().m_ListItaly &&
+		SConfig::GetInstance().m_ListKorea &&
+		SConfig::GetInstance().m_ListNetherlands &&
+		SConfig::GetInstance().m_ListRussia &&
+		SConfig::GetInstance().m_ListSpain &&
+		SConfig::GetInstance().m_ListTaiwan &&
+		SConfig::GetInstance().m_ListWorld &&
+		SConfig::GetInstance().m_ListUnknown)))
+	{
+		SConfig::GetInstance().m_ListGC =
+		SConfig::GetInstance().m_ListWii =
+		SConfig::GetInstance().m_ListWad =
+		SConfig::GetInstance().m_ListJap =
+		SConfig::GetInstance().m_ListUsa =
+		SConfig::GetInstance().m_ListPal =
+		SConfig::GetInstance().m_ListAustralia =
+		SConfig::GetInstance().m_ListFrance =
+		SConfig::GetInstance().m_ListGermany =
+		SConfig::GetInstance().m_ListItaly =
+		SConfig::GetInstance().m_ListKorea =
+		SConfig::GetInstance().m_ListNetherlands =
+		SConfig::GetInstance().m_ListRussia =
+		SConfig::GetInstance().m_ListSpain =
+		SConfig::GetInstance().m_ListTaiwan =
+		SConfig::GetInstance().m_ListWorld =
+		SConfig::GetInstance().m_ListUnknown = true;
+
+		GetMenuBar()->FindItem(IDM_LIST_GC)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_WII)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_WAD)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_JAP)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_USA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_PAL)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_RUSSIA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_SPAIN)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_TAIWAN)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_WORLD)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_UNKNOWN)->Check(true);
+
+		m_GameListCtrl->Update();
+	}
+	else if (!m_GameListCtrl->GetISO(0))
+	{
+		m_GameListCtrl->BrowseForDirectory();
+	}
+	else
+	{
+		// Game started by double click
+		BootGame("");
+	}
+}
+
+static bool IsHotkey(int id, bool held = false)
+{
+	return HotkeyManagerEmu::IsPressed(id, held);
+}
+
+int GetCmdForHotkey(unsigned int key)
+{
+	switch (key)
+	{
+	case HK_OPEN: return wxID_OPEN;
+	case HK_CHANGE_DISC: return IDM_CHANGE_DISC;
+	case HK_REFRESH_LIST: return wxID_REFRESH;
+	case HK_PLAY_PAUSE: return IDM_PLAY;
+	case HK_STOP: return IDM_STOP;
+	case HK_RESET: return IDM_RESET;
+	case HK_FRAME_ADVANCE: return IDM_FRAMESTEP;
+	case HK_START_RECORDING: return IDM_RECORD;
+	case HK_PLAY_RECORDING: return IDM_PLAY_RECORD;
+	case HK_EXPORT_RECORDING: return IDM_RECORD_EXPORT;
+	case HK_READ_ONLY_MODE: return IDM_RECORD_READ_ONLY;
+	case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN;
+	case HK_SCREENSHOT: return IDM_SCREENSHOT;
+	case HK_EXIT: return wxID_EXIT;
+
+	case HK_WIIMOTE1_CONNECT: return IDM_CONNECT_WIIMOTE1;
+	case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2;
+	case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3;
+	case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4;
+	case HK_BALANCEBOARD_CONNECT: return IDM_CONNECT_BALANCEBOARD;
+
+	case HK_LOAD_STATE_SLOT_1: return IDM_LOAD_SLOT_1;
+	case HK_LOAD_STATE_SLOT_2: return IDM_LOAD_SLOT_2;
+	case HK_LOAD_STATE_SLOT_3: return IDM_LOAD_SLOT_3;
+	case HK_LOAD_STATE_SLOT_4: return IDM_LOAD_SLOT_4;
+	case HK_LOAD_STATE_SLOT_5: return IDM_LOAD_SLOT_5;
+	case HK_LOAD_STATE_SLOT_6: return IDM_LOAD_SLOT_6;
+	case HK_LOAD_STATE_SLOT_7: return IDM_LOAD_SLOT_7;
+	case HK_LOAD_STATE_SLOT_8: return IDM_LOAD_SLOT_8;
+	case HK_LOAD_STATE_SLOT_9: return IDM_LOAD_SLOT_9;
+	case HK_LOAD_STATE_SLOT_10: return IDM_LOAD_SLOT_10;
+
+	case HK_SAVE_STATE_SLOT_1: return IDM_SAVE_SLOT_1;
+	case HK_SAVE_STATE_SLOT_2: return IDM_SAVE_SLOT_2;
+	case HK_SAVE_STATE_SLOT_3: return IDM_SAVE_SLOT_3;
+	case HK_SAVE_STATE_SLOT_4: return IDM_SAVE_SLOT_4;
+	case HK_SAVE_STATE_SLOT_5: return IDM_SAVE_SLOT_5;
+	case HK_SAVE_STATE_SLOT_6: return IDM_SAVE_SLOT_6;
+	case HK_SAVE_STATE_SLOT_7: return IDM_SAVE_SLOT_7;
+	case HK_SAVE_STATE_SLOT_8: return IDM_SAVE_SLOT_8;
+	case HK_SAVE_STATE_SLOT_9: return IDM_SAVE_SLOT_9;
+	case HK_SAVE_STATE_SLOT_10: return IDM_SAVE_SLOT_10;
+
+	case HK_LOAD_LAST_STATE_1: return IDM_LOAD_LAST_1;
+	case HK_LOAD_LAST_STATE_2: return IDM_LOAD_LAST_2;
+	case HK_LOAD_LAST_STATE_3: return IDM_LOAD_LAST_3;
+	case HK_LOAD_LAST_STATE_4: return IDM_LOAD_LAST_4;
+	case HK_LOAD_LAST_STATE_5: return IDM_LOAD_LAST_5;
+	case HK_LOAD_LAST_STATE_6: return IDM_LOAD_LAST_6;
+	case HK_LOAD_LAST_STATE_7: return IDM_LOAD_LAST_7;
+	case HK_LOAD_LAST_STATE_8: return IDM_LOAD_LAST_8;
+
+	case HK_SAVE_FIRST_STATE: return IDM_SAVE_FIRST_STATE;
+	case HK_UNDO_LOAD_STATE: return IDM_UNDO_LOAD_STATE;
+	case HK_UNDO_SAVE_STATE: return IDM_UNDO_SAVE_STATE;
+	case HK_LOAD_STATE_FILE: return IDM_LOAD_STATE_FILE;
+	case HK_SAVE_STATE_FILE: return IDM_SAVE_STATE_FILE;
+
+	case HK_SELECT_STATE_SLOT_1: return IDM_SELECT_SLOT_1;
+	case HK_SELECT_STATE_SLOT_2: return IDM_SELECT_SLOT_2;
+	case HK_SELECT_STATE_SLOT_3: return IDM_SELECT_SLOT_3;
+	case HK_SELECT_STATE_SLOT_4: return IDM_SELECT_SLOT_4;
+	case HK_SELECT_STATE_SLOT_5: return IDM_SELECT_SLOT_5;
+	case HK_SELECT_STATE_SLOT_6: return IDM_SELECT_SLOT_6;
+	case HK_SELECT_STATE_SLOT_7: return IDM_SELECT_SLOT_7;
+	case HK_SELECT_STATE_SLOT_8: return IDM_SELECT_SLOT_8;
+	case HK_SELECT_STATE_SLOT_9: return IDM_SELECT_SLOT_9;
+	case HK_SELECT_STATE_SLOT_10: return IDM_SELECT_SLOT_10;
+	case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVE_SELECTED_SLOT;
+	case HK_LOAD_STATE_SLOT_SELECTED: return IDM_LOAD_SELECTED_SLOT;
+
+	case HK_FREELOOK_DECREASE_SPEED: return IDM_FREELOOK_DECREASE_SPEED;
+	case HK_FREELOOK_INCREASE_SPEED: return IDM_FREELOOK_INCREASE_SPEED;
+	case HK_FREELOOK_RESET_SPEED: return IDM_FREELOOK_RESET_SPEED;
+	case HK_FREELOOK_LEFT: return IDM_FREELOOK_LEFT;
+	case HK_FREELOOK_RIGHT: return IDM_FREELOOK_RIGHT;
+	case HK_FREELOOK_UP: return IDM_FREELOOK_UP;
+	case HK_FREELOOK_DOWN: return IDM_FREELOOK_DOWN;
+	case HK_FREELOOK_ZOOM_IN: return IDM_FREELOOK_ZOOM_IN;
+	case HK_FREELOOK_ZOOM_OUT: return IDM_FREELOOK_ZOOM_OUT;
+	case HK_FREELOOK_RESET: return IDM_FREELOOK_RESET;
+	}
+
+	return -1;
+}
+
+void OnAfterLoadCallback()
+{
+	// warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread
+	if (main_frame)
+	{
+		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_GUI);
+		main_frame->GetEventHandler()->AddPendingEvent(event);
+	}
+}
+
+void OnStoppedCallback()
+{
+	// warning: this gets called from the EmuThread, so we should only queue things to do on the proper thread
+	if (main_frame)
+	{
+		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_STOPPED);
+		main_frame->GetEventHandler()->AddPendingEvent(event);
+	}
+}
+
+void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID)
+{
+	if (main_frame)
+		main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus);
+}
+
+void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key)
+{
+	if (main_frame)
+	{
+		main_frame->g_TASInputDlg[controllerID + 4]->GetValues(data, rptf, ext, key);
+	}
+}
+
+bool TASInputHasFocus()
+{
+	for (int i = 0; i < 8; ++i)
+	{
+		if (main_frame->g_TASInputDlg[i]->TASHasFocus())
+			return true;
+	}
+	return false;
+}
+
+void CFrame::OnMouse(wxMouseEvent& event)
+{
+	// next handlers are all for FreeLook, so we don't need to check them if disabled
+	if (!g_Config.bFreeLook)
+	{
+		event.Skip();
+		return;
+	}
+
+	// Free look variables
+	static bool mouseLookEnabled = false;
+	static bool mouseMoveEnabled = false;
+	static float lastMouse[2];
+
+	if (event.MiddleDown())
+	{
+		lastMouse[0] = event.GetX();
+		lastMouse[1] = event.GetY();
+		mouseMoveEnabled = true;
+	}
+	else if (event.RightDown())
+	{
+		lastMouse[0] = event.GetX();
+		lastMouse[1] = event.GetY();
+		mouseLookEnabled = true;
+	}
+	else if (event.MiddleUp())
+	{
+		mouseMoveEnabled = false;
+	}
+	else if (event.RightUp())
+	{
+		mouseLookEnabled = false;
+	}
+	// no button, so it's a move event
+	else if (event.GetButton() == wxMOUSE_BTN_NONE)
+	{
+		if (mouseLookEnabled)
+		{
+			VertexShaderManager::RotateView((event.GetX() - lastMouse[0]) / 200.0f,
+					(event.GetY() - lastMouse[1]) / 200.0f);
+			lastMouse[0] = event.GetX();
+			lastMouse[1] = event.GetY();
+		}
+
+		if (mouseMoveEnabled)
+		{
+			VertexShaderManager::TranslateView((event.GetX() - lastMouse[0]) / 50.0f,
+					(event.GetY() - lastMouse[1]) / 50.0f);
+			lastMouse[0] = event.GetX();
+			lastMouse[1] = event.GetY();
+		}
+	}
+
+	event.Skip();
+}
+
+void CFrame::OnFocusChange(wxFocusEvent& event)
+{
+	if (SConfig::GetInstance().m_PauseOnFocusLost)
+	{
+		if (RendererHasFocus())
+		{
+			if (Core::GetState() == Core::CORE_PAUSE)
+			{
+				Core::SetState(Core::CORE_RUN);
+				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+					m_RenderParent->SetCursor(wxCURSOR_BLANK);
+			}
+		}
+		else
+		{
+			if (Core::GetState() == Core::CORE_RUN)
+			{
+				Core::SetState(Core::CORE_PAUSE);
+				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+					m_RenderParent->SetCursor(wxNullCursor);
+				Core::UpdateTitle();
+			}
+		}
+		UpdateGUI();
+	}
+
+	event.Skip();
+}
+
+void CFrame::DoFullscreen(bool enable_fullscreen)
+{
+	if (g_Config.bExclusiveMode && Core::GetState() == Core::CORE_PAUSE)
+	{
+		// A responsive renderer is required for exclusive fullscreen, but the
+		// renderer can only respond in the running state. Therefore we ignore
+		// fullscreen switches if we are in exclusive fullscreen, but the
+		// renderer is not running.
+		// TODO: Allow the renderer to switch fullscreen modes while paused.
+		return;
+	}
+
+	ToggleDisplayMode(enable_fullscreen);
+
+#if defined(__APPLE__)
+	NSView *view = (NSView *)m_RenderFrame->GetHandle();
+	NSWindow *window = [view window];
+
+	if (enable_fullscreen != RendererIsFullscreen())
+	{
+		[window toggleFullScreen : nil];
+	}
+#else
+	if (enable_fullscreen)
+	{
+		m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL);
+	}
+	else if (!g_Config.bExclusiveMode)
+	{
+		// Exiting exclusive fullscreen should be done from a Renderer callback.
+		// Therefore we don't exit fullscreen from here if we are in exclusive mode.
+		m_RenderFrame->ShowFullScreen(false, wxFULLSCREEN_ALL);
+	}
+#endif
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+	{
+		if (enable_fullscreen)
+		{
+			// Save the current mode before going to fullscreen
+			AuiCurrent = m_Mgr->SavePerspective();
+			m_Mgr->LoadPerspective(AuiFullscreen, true);
+
+			// Hide toolbar
+			DoToggleToolbar(false);
+
+			// Hide menubar (by having wxwidgets delete it)
+			SetMenuBar(nullptr);
+
+			// Hide the statusbar if enabled
+			if (GetStatusBar()->IsShown())
+			{
+				GetStatusBar()->Hide();
+				this->SendSizeEvent();
+			}
+		}
+		else
+		{
+			// Restore saved perspective
+			m_Mgr->LoadPerspective(AuiCurrent, true);
+
+			// Restore toolbar to the status it was at before going fullscreen.
+			DoToggleToolbar(SConfig::GetInstance().m_InterfaceToolbar);
+
+			// Recreate the menubar if needed.
+			if (wxFrame::GetMenuBar() == nullptr)
+			{
+				SetMenuBar(CreateMenu());
+			}
+
+			// Show statusbar if enabled
+			if (SConfig::GetInstance().m_InterfaceStatusbar)
+			{
+				GetStatusBar()->Show();
+				this->SendSizeEvent();
+			}
+		}
+	}
+	else
+	{
+		m_RenderFrame->Raise();
+	}
+
+	g_Config.bFullscreen = enable_fullscreen;
+}
+
+const CGameListCtrl *CFrame::GetGameListCtrl() const
+{
+	return m_GameListCtrl;
+}
+
+void CFrame::PollHotkeys(wxTimerEvent& event)
+{
+	if (!HotkeyManagerEmu::IsEnabled())
+		return;
+
+	if (Core::GetState() == Core::CORE_UNINITIALIZED || Core::GetState() == Core::CORE_PAUSE)
+		g_controller_interface.UpdateInput();
+
+	if (Core::GetState() != Core::CORE_STOPPING)
+	{
+		HotkeyManagerEmu::GetStatus();
+		ParseHotkeys();
+	}
+}
+
+void CFrame::ParseHotkeys()
+{
+	for (int i = 0; i < NUM_HOTKEYS; i++)
+	{
+		switch  (i)
+		{
+			case HK_OPEN:
+			case HK_CHANGE_DISC:
+			case HK_REFRESH_LIST:
+			case HK_RESET:
+			case HK_FRAME_ADVANCE:
+			case HK_START_RECORDING:
+			case HK_PLAY_RECORDING:
+			case HK_EXPORT_RECORDING:
+			case HK_READ_ONLY_MODE:
+
+			case HK_LOAD_STATE_FILE:
+			case HK_SAVE_STATE_FILE:
+			case HK_LOAD_STATE_SLOT_SELECTED:
+
+				if (IsHotkey(i))
+				{
+					int cmd = GetCmdForHotkey(i);
+					if (cmd >= 0)
+					{
+						wxCommandEvent evt(wxEVT_MENU, cmd);
+						wxMenuItem* item = GetMenuBar()->FindItem(cmd);
+						if (item && item->IsCheckable())
+						{
+							item->wxMenuItemBase::Toggle();
+							evt.SetInt(item->IsChecked());
+						}
+						GetEventHandler()->AddPendingEvent(evt);
+					}
+				}
+			default:
+				break;
+				// do nothing
+		}
+	}
+
+	if (!Core::IsRunningAndStarted())
+	{
+		return;
+	}
+
+	// Toggle fullscreen
+	if (IsHotkey(HK_FULLSCREEN))
+		DoFullscreen(!RendererIsFullscreen());
+	// Pause and Unpause
+	if (IsHotkey(HK_PLAY_PAUSE))
+		DoPause();
+	// Stop
+	if (IsHotkey(HK_STOP))
+		DoStop();
+	// Screenshot hotkey
+	if (IsHotkey(HK_SCREENSHOT))
+		Core::SaveScreenShot();
+	if (IsHotkey(HK_EXIT))
+		wxPostEvent(this, wxCommandEvent(wxID_EXIT));
+	if (IsHotkey(HK_VOLUME_DOWN))
+		AudioCommon::DecreaseVolume(3);
+	if (IsHotkey(HK_VOLUME_UP))
+		AudioCommon::IncreaseVolume(3);
+	if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
+		AudioCommon::ToggleMuteVolume();
+
+	// Wiimote connect and disconnect hotkeys
+	int WiimoteId = -1;
+	if (IsHotkey(HK_WIIMOTE1_CONNECT))
+		WiimoteId = 0;
+	if (IsHotkey(HK_WIIMOTE2_CONNECT))
+		WiimoteId = 1;
+	if (IsHotkey(HK_WIIMOTE3_CONNECT))
+		WiimoteId = 2;
+	if (IsHotkey(HK_WIIMOTE4_CONNECT))
+		WiimoteId = 3;
+	if (IsHotkey(HK_BALANCEBOARD_CONNECT))
+		WiimoteId = 4;
+
+	// Actually perform the Wiimote connection or disconnection
+	if (WiimoteId >= 0 && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		wxCommandEvent evt;
+		evt.SetId(IDM_CONNECT_WIIMOTE1 + WiimoteId);
+		OnConnectWiimote(evt);
+	}
+
+	if (IsHotkey(HK_TOGGLE_IR))
+	{
+		OSDChoice = 1;
+		// Toggle native resolution
+		if (++g_Config.iEFBScale > SCALE_4X)
+			g_Config.iEFBScale = SCALE_AUTO;
+	}
+	if (IsHotkey(HK_INCREASE_IR))
+	{
+		OSDChoice = 1;
+		++g_Config.iEFBScale;
+	}
+	if (IsHotkey(HK_DECREASE_IR))
+	{
+		OSDChoice = 1;
+		if (--g_Config.iEFBScale < SCALE_1X)
+			g_Config.iEFBScale = SCALE_1X;
+	}
+	if (IsHotkey(HK_TOGGLE_AR))
+	{
+		OSDChoice = 2;
+		// Toggle aspect ratio
+		g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
+	}
+	if (IsHotkey(HK_TOGGLE_EFBCOPIES))
+	{
+		OSDChoice = 3;
+		// Toggle EFB copies between EFB2RAM and EFB2Texture
+		g_Config.bSkipEFBCopyToRam = !g_Config.bSkipEFBCopyToRam;
+	}
+	if (IsHotkey(HK_TOGGLE_FOG))
+	{
+		OSDChoice = 4;
+		g_Config.bDisableFog = !g_Config.bDisableFog;
+	}
+	Core::SetIsFramelimiterTempDisabled(IsHotkey(HK_TOGGLE_THROTTLE, true));
+	if (IsHotkey(HK_DECREASE_FRAME_LIMIT))
+	{
+		if (--SConfig::GetInstance().m_Framelimit > 0x19)
+			SConfig::GetInstance().m_Framelimit = 0x19;
+	}
+	if (IsHotkey(HK_INCREASE_FRAME_LIMIT))
+	{
+		if (++SConfig::GetInstance().m_Framelimit > 0x19)
+			SConfig::GetInstance().m_Framelimit = 0;
+	}
+	if (IsHotkey(HK_SAVE_STATE_SLOT_SELECTED))
+	{
+		State::Save(g_saveSlot);
+	}
+	if (IsHotkey(HK_LOAD_STATE_SLOT_SELECTED))
+	{
+		State::Load(g_saveSlot);
+	}
+	if (IsHotkey(HK_DECREASE_DEPTH, true))
+	{
+		if (--g_Config.iStereoDepth < 0)
+			g_Config.iStereoDepth = 0;
+	}
+	if (IsHotkey(HK_INCREASE_DEPTH, true))
+	{
+		if (++g_Config.iStereoDepth > 100)
+			g_Config.iStereoDepth = 100;
+	}
+	if (IsHotkey(HK_DECREASE_CONVERGENCE, true))
+	{
+		g_Config.iStereoConvergence -= 5;
+		if (g_Config.iStereoConvergence < 0)
+			g_Config.iStereoConvergence = 0;
+	}
+	if (IsHotkey(HK_INCREASE_CONVERGENCE, true))
+	{
+		g_Config.iStereoConvergence += 5;
+		if (g_Config.iStereoConvergence > 500)
+			g_Config.iStereoConvergence = 500;
+	}
+
+	static float debugSpeed = 1.0f;
+	if (IsHotkey(HK_FREELOOK_DECREASE_SPEED, true))
+		debugSpeed /= 1.1f;
+	if (IsHotkey(HK_FREELOOK_INCREASE_SPEED, true))
+		debugSpeed *= 1.1f;
+	if (IsHotkey(HK_FREELOOK_RESET_SPEED, true))
+		debugSpeed = 1.0f;
+	if (IsHotkey(HK_FREELOOK_UP, true))
+		VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
+	if (IsHotkey(HK_FREELOOK_DOWN, true))
+		VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
+	if (IsHotkey(HK_FREELOOK_LEFT, true))
+		VertexShaderManager::TranslateView(debugSpeed, 0.0f);
+	if (IsHotkey(HK_FREELOOK_RIGHT, true))
+		VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
+	if (IsHotkey(HK_FREELOOK_ZOOM_IN, true))
+		VertexShaderManager::TranslateView(0.0f, debugSpeed);
+	if (IsHotkey(HK_FREELOOK_ZOOM_OUT, true))
+		VertexShaderManager::TranslateView(0.0f, -debugSpeed);
+	if (IsHotkey(HK_FREELOOK_RESET, true))
+		VertexShaderManager::ResetView();
+
+	// Savestates
+	for (int i = 0; i < 10; i++)
+	{
+		if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
+			State::Load(1 + i);
+
+		if (IsHotkey(HK_SAVE_STATE_SLOT_1 + i))
+			State::Save(1 + i);
+
+		if (IsHotkey(HK_LOAD_LAST_STATE_1 + i))
+			State::LoadLastSaved(1 + i);
+
+		if (IsHotkey(HK_SELECT_STATE_SLOT_1 + i))
+		{
+			wxCommandEvent slot_event;
+			slot_event.SetId(IDM_SELECT_SLOT_1 + i);
+			CFrame::OnSelectSlot(slot_event);
+		}
+	}
+	if (IsHotkey(HK_SAVE_FIRST_STATE))
+		State::SaveFirstSaved();
+	if (IsHotkey(HK_UNDO_LOAD_STATE))
+		State::UndoLoadState();
+	if (IsHotkey(HK_UNDO_SAVE_STATE))
+		State::UndoSaveState();
+}
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
new file mode 100644
index 0000000000..4460593497
--- /dev/null
+++ b/Source/Core/DolphinWX/Frame.h
@@ -0,0 +1,371 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <mutex>
+#include <string>
+#include <vector>
+#include <wx/bitmap.h>
+#include <wx/frame.h>
+#include <wx/image.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "DolphinWX/Globals.h"
+#include "InputCommon/GCPadStatus.h"
+
+#if defined(HAVE_X11) && HAVE_X11
+#include "DolphinWX/X11Utils.h"
+#endif
+
+// Class declarations
+class CGameListCtrl;
+class CCodeWindow;
+class CLogWindow;
+class FifoPlayerDlg;
+class LogConfigWindow;
+class NetPlaySetupFrame;
+class TASInputDlg;
+class wxCheatsWindow;
+
+class wxAuiManager;
+class wxAuiManagerEvent;
+class wxAuiNotebook;
+class wxAuiNotebookEvent;
+class wxListEvent;
+class wxMenuItem;
+
+class CRenderFrame : public wxFrame
+{
+	public:
+		CRenderFrame(wxFrame* parent,
+			wxWindowID id = wxID_ANY,
+			const wxString& title = "Dolphin",
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize,
+			long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
+
+		bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override;
+
+	private:
+		void OnDropFiles(wxDropFilesEvent& event);
+		static bool IsValidSavestateDropped(const std::string& filepath);
+		#ifdef _WIN32
+			// Receive WndProc messages
+			WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+		#endif
+
+};
+
+class CFrame : public CRenderFrame
+{
+public:
+	CFrame(wxFrame* parent,
+		wxWindowID id = wxID_ANY,
+		const wxString& title = "Dolphin",
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		bool _UseDebugger = false,
+		bool _BatchMode = false,
+		bool ShowLogWindow = false,
+		long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
+
+	virtual ~CFrame();
+
+	void* GetRenderHandle()
+	{
+		#if defined(HAVE_X11) && HAVE_X11
+			return reinterpret_cast<void*>(X11Utils::XWindowFromHandle(m_RenderParent->GetHandle()));
+		#else
+			return reinterpret_cast<void*>(m_RenderParent->GetHandle());
+		#endif
+	}
+
+	// These have to be public
+	CCodeWindow* g_pCodeWindow;
+	NetPlaySetupFrame* g_NetPlaySetupDiag;
+	wxCheatsWindow* g_CheatsWindow;
+	TASInputDlg* g_TASInputDlg[8];
+
+	void InitBitmaps();
+	void DoPause();
+	void DoStop();
+	void OnStopped();
+	void DoRecordingSave();
+	void UpdateGUI();
+	void UpdateGameList();
+	void ToggleLogWindow(bool bShow);
+	void ToggleLogConfigWindow(bool bShow);
+	void PostEvent(wxCommandEvent& event);
+	void StatusBarMessage(const char * Text, ...);
+	void ClearStatusBar();
+	void OnRenderWindowSizeRequest(int width, int height);
+	void BootGame(const std::string& filename);
+	void OnRenderParentClose(wxCloseEvent& event);
+	void OnRenderParentMove(wxMoveEvent& event);
+	bool RendererHasFocus();
+	bool UIHasFocus();
+	bool RendererIsFullscreen();
+	void DoFullscreen(bool bF);
+	void ToggleDisplayMode (bool bFullscreen);
+	void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=nullptr);
+	void PopulateSavedPerspectives();
+	static void ConnectWiimote(int wm_idx, bool connect);
+	void UpdateTitle(const std::string &str);
+
+	const CGameListCtrl *GetGameListCtrl() const;
+	virtual wxMenuBar* GetMenuBar() const override;
+
+#ifdef __WXGTK__
+	Common::Event panic_event;
+	bool bPanicResult;
+	std::recursive_mutex keystate_lock;
+#endif
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+	X11Utils::XRRConfiguration *m_XRRConfig;
+#endif
+
+	wxMenu* m_SavedPerspectives;
+
+	wxToolBar *m_ToolBar;
+	// AUI
+	wxAuiManager *m_Mgr;
+	bool bFloatWindow[IDM_CODE_WINDOW - IDM_LOG_WINDOW + 1];
+
+	// Perspectives (Should find a way to make all of this private)
+	void DoAddPage(wxWindow *Win, int i, bool Float);
+	void DoRemovePage(wxWindow *, bool bHide = true);
+	struct SPerspectives
+	{
+		std::string Name;
+		wxString Perspective;
+		std::vector<int> Width, Height;
+	};
+	std::vector<SPerspectives> Perspectives;
+	u32 ActivePerspective;
+
+private:
+	CGameListCtrl* m_GameListCtrl;
+	wxPanel* m_Panel;
+	CRenderFrame* m_RenderFrame;
+	wxWindow* m_RenderParent;
+	CLogWindow* m_LogWindow;
+	LogConfigWindow* m_LogConfigWindow;
+	FifoPlayerDlg* m_FifoPlayerDlg;
+	bool UseDebugger;
+	bool m_bBatchMode;
+	bool m_bEdit;
+	bool m_bTabSplit;
+	bool m_bNoDocking;
+	bool m_bGameLoading;
+	bool m_bClosing;
+	bool m_confirmStop;
+
+	std::vector<std::string> drives;
+
+	enum EToolbar
+	{
+		Toolbar_FileOpen,
+		Toolbar_Refresh,
+		Toolbar_Browse,
+		Toolbar_Play,
+		Toolbar_Stop,
+		Toolbar_Pause,
+		Toolbar_Screenshot,
+		Toolbar_FullScreen,
+		Toolbar_ConfigMain,
+		Toolbar_ConfigGFX,
+		Toolbar_ConfigAudio,
+		Toolbar_Controller,
+		EToolbar_Max
+	};
+
+	enum
+	{
+		Toolbar_Delete,
+		Toolbar_Add_BP,
+		Toolbar_Add_MC,
+		Num_Bitmaps
+	};
+
+	enum
+	{
+		ADD_PANE_TOP,
+		ADD_PANE_BOTTOM,
+		ADD_PANE_LEFT,
+		ADD_PANE_RIGHT,
+		ADD_PANE_CENTER
+	};
+
+	wxTimer m_poll_hotkey_timer;
+
+	wxBitmap m_Bitmaps[EToolbar_Max];
+	wxBitmap m_BitmapsMenu[EToolbar_Max];
+
+	wxMenuBar* m_menubar_shadow;
+
+	void PopulateToolbar(wxToolBar* toolBar);
+	void RecreateToolbar();
+	wxMenuBar* CreateMenu();
+
+	// Utility
+	wxString GetMenuLabel(int Id);
+	wxWindow * GetNotebookPageFromId(wxWindowID Id);
+	wxAuiNotebook * GetNotebookFromId(u32 NBId);
+	int GetNotebookCount();
+	wxAuiNotebook *CreateEmptyNotebook();
+
+	// Perspectives
+	void AddRemoveBlankPage();
+	void OnNotebookPageClose(wxAuiNotebookEvent& event);
+	void OnAllowNotebookDnD(wxAuiNotebookEvent& event);
+	void OnNotebookPageChanged(wxAuiNotebookEvent& event);
+	void OnFloatWindow(wxCommandEvent& event);
+	void ToggleFloatWindow(int Id);
+	void OnTab(wxAuiNotebookEvent& event);
+	int GetNotebookAffiliation(wxWindowID Id);
+	void ClosePages();
+	void CloseAllNotebooks();
+	void ShowResizePane();
+	void TogglePane();
+	void SetPaneSize();
+	void TogglePaneStyle(bool On, int EventId);
+	void ToggleNotebookStyle(bool On, long Style);
+	// Float window
+	void DoUnfloatPage(int Id);
+	void OnFloatingPageClosed(wxCloseEvent& event);
+	void OnFloatingPageSize(wxSizeEvent& event);
+	void DoFloatNotebookPage(wxWindowID Id);
+	wxFrame * CreateParentFrame(wxWindowID Id = wxID_ANY,
+			const wxString& title = "",
+			wxWindow * = nullptr);
+	wxString AuiFullscreen, AuiCurrent;
+	void AddPane(int dir);
+	void UpdateCurrentPerspective();
+	void SaveIniPerspectives();
+	void LoadIniPerspectives();
+	void OnPaneClose(wxAuiManagerEvent& evt);
+	void ReloadPanes();
+	void DoLoadPerspective();
+	void OnPerspectiveMenu(wxCommandEvent& event);
+	void OnSelectPerspective(wxCommandEvent& event);
+
+#ifdef _WIN32
+	// Override window proc for tricks like screensaver disabling
+	WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif
+	// Event functions
+	void OnQuit(wxCommandEvent& event);
+	void OnHelp(wxCommandEvent& event);
+
+	void OnOpen(wxCommandEvent& event); // File menu
+	void DoOpen(bool Boot);
+	void OnRefresh(wxCommandEvent& event);
+	void OnBrowse(wxCommandEvent& event);
+	void OnBootDrive(wxCommandEvent& event);
+
+	void OnPlay(wxCommandEvent& event); // Emulation
+	void OnStop(wxCommandEvent& event);
+	void OnReset(wxCommandEvent& event);
+	void OnRecord(wxCommandEvent& event);
+	void OnPlayRecording(wxCommandEvent& event);
+	void OnRecordExport(wxCommandEvent& event);
+	void OnRecordReadOnly(wxCommandEvent& event);
+	void OnTASInput(wxCommandEvent& event);
+	void OnTogglePauseMovie(wxCommandEvent& event);
+	void OnToggleDumpFrames(wxCommandEvent& event);
+	void OnToggleDumpAudio(wxCommandEvent& event);
+	void OnShowLag(wxCommandEvent& event);
+	void OnShowFrameCount(wxCommandEvent& event);
+	void OnShowInputDisplay(wxCommandEvent& event);
+	void OnChangeDisc(wxCommandEvent& event);
+	void OnScreenshot(wxCommandEvent& event);
+	void OnActive(wxActivateEvent& event);
+	void OnClose(wxCloseEvent &event);
+	void OnLoadState(wxCommandEvent& event);
+	void OnSaveState(wxCommandEvent& event);
+	void OnLoadStateFromFile(wxCommandEvent& event);
+	void OnSaveStateToFile(wxCommandEvent& event);
+	void OnLoadLastState(wxCommandEvent& event);
+	void OnSaveFirstState(wxCommandEvent& event);
+	void OnUndoLoadState(wxCommandEvent& event);
+	void OnUndoSaveState(wxCommandEvent& event);
+
+	void OnFrameSkip(wxCommandEvent& event);
+	void OnFrameStep(wxCommandEvent& event);
+
+	void OnConfigMain(wxCommandEvent& event); // Options
+	void OnConfigGFX(wxCommandEvent& event);
+	void OnConfigAudio(wxCommandEvent& event);
+	void OnConfigControllers(wxCommandEvent& event);
+	void OnConfigHotkey(wxCommandEvent& event);
+
+	void OnToggleFullscreen(wxCommandEvent& event);
+	void OnToggleDualCore(wxCommandEvent& event);
+	void OnToggleSkipIdle(wxCommandEvent& event);
+	void OnToggleThrottle(wxCommandEvent& event);
+	void OnManagerResize(wxAuiManagerEvent& event);
+	void OnMove(wxMoveEvent& event);
+	void OnResize(wxSizeEvent& event);
+	void OnToggleToolbar(wxCommandEvent& event);
+	void DoToggleToolbar(bool);
+	void OnToggleStatusbar(wxCommandEvent& event);
+	void OnToggleWindow(wxCommandEvent& event);
+
+	void OnKeyDown(wxKeyEvent& event); // Keyboard
+	void OnKeyUp(wxKeyEvent& event);
+
+	void OnMouse(wxMouseEvent& event); // Mouse
+
+	void OnFocusChange(wxFocusEvent& event);
+
+	void OnHostMessage(wxCommandEvent& event);
+
+	void OnMemcard(wxCommandEvent& event); // Misc
+	void OnImportSave(wxCommandEvent& event);
+	void OnExportAllSaves(wxCommandEvent& event);
+
+	void OnNetPlay(wxCommandEvent& event);
+
+	void OnShowCheatsWindow(wxCommandEvent& event);
+	void OnLoadWiiMenu(wxCommandEvent& event);
+	void OnInstallWAD(wxCommandEvent& event);
+	void OnFifoPlayer(wxCommandEvent& event);
+	void OnConnectWiimote(wxCommandEvent& event);
+	void GameListChanged(wxCommandEvent& event);
+
+	void OnGameListCtrlItemActivated(wxListEvent& event);
+	void OnRenderParentResize(wxSizeEvent& event);
+	void StartGame(const std::string& filename);
+	void OnChangeColumnsVisible(wxCommandEvent& event);
+
+	void OnSelectSlot(wxCommandEvent& event);
+	void OnSaveCurrentSlot(wxCommandEvent& event);
+	void OnLoadCurrentSlot(wxCommandEvent& event);
+
+	void PollHotkeys(wxTimerEvent&);
+	void ParseHotkeys();
+
+	bool InitControllers();
+
+	// Event table
+	DECLARE_EVENT_TABLE();
+};
+
+int GetCmdForHotkey(unsigned int key);
+
+void OnAfterLoadCallback();
+void OnStoppedCallback();
+
+// For TASInputDlg
+void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID);
+void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key);
+bool TASInputHasFocus();
+extern int g_saveSlot;
diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp
new file mode 100644
index 0000000000..346fb03d63
--- /dev/null
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@@ -0,0 +1,1037 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <wx/frame.h>
+#include <wx/list.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/rtti.h>
+#include <wx/sizer.h>
+#include <wx/statusbr.h>
+#include <wx/textdlg.h>
+#include <wx/toplevel.h>
+#include <wx/aui/auibar.h>
+#include <wx/aui/auibook.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/LogConfigWindow.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+
+// ------------
+// Aui events
+
+void CFrame::OnManagerResize(wxAuiManagerEvent& event)
+{
+	if (!g_pCodeWindow && m_LogWindow &&
+			m_Mgr->GetPane("Pane 1").IsShown() &&
+			!m_Mgr->GetPane("Pane 1").IsFloating())
+	{
+		m_LogWindow->x = m_Mgr->GetPane("Pane 1").rect.GetWidth();
+		m_LogWindow->y = m_Mgr->GetPane("Pane 1").rect.GetHeight();
+		m_LogWindow->winpos = m_Mgr->GetPane("Pane 1").dock_direction;
+	}
+	event.Skip();
+}
+
+void CFrame::OnPaneClose(wxAuiManagerEvent& event)
+{
+	event.Veto();
+
+	wxAuiNotebook * nb = (wxAuiNotebook*)event.pane->window;
+	if (!nb) return;
+
+	if (!g_pCodeWindow)
+	{
+		if (nb->GetPage(0)->GetId() == IDM_LOG_WINDOW ||
+		    nb->GetPage(0)->GetId() == IDM_LOG_CONFIG_WINDOW)
+		{
+
+			SConfig::GetInstance().m_InterfaceLogWindow = false;
+			SConfig::GetInstance().m_InterfaceLogConfigWindow = false;
+			ToggleLogWindow(false);
+			ToggleLogConfigWindow(false);
+		}
+	}
+	else
+	{
+		if (GetNotebookCount() == 1)
+		{
+			wxMessageBox(_("At least one pane must remain open."),
+					_("Notice"), wxOK, this);
+		}
+		else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs("<>"))
+		{
+			wxMessageBox(_("You can't close panes that have pages in them."),
+					_("Notice"), wxOK, this);
+		}
+		else
+		{
+			// Detach and delete the empty notebook
+			event.pane->DestroyOnClose(true);
+			m_Mgr->ClosePane(*event.pane);
+		}
+	}
+
+	m_Mgr->Update();
+}
+
+void CFrame::ToggleLogWindow(bool bShow)
+{
+	if (!m_LogWindow)
+		return;
+
+	GetMenuBar()->FindItem(IDM_LOG_WINDOW)->Check(bShow);
+
+	if (bShow)
+	{
+		// Create a new log window if it doesn't exist.
+		if (!m_LogWindow)
+		{
+			m_LogWindow = new CLogWindow(this, IDM_LOG_WINDOW);
+		}
+
+		m_LogWindow->Enable();
+
+		DoAddPage(m_LogWindow,
+				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[0] : 0,
+				g_pCodeWindow ? bFloatWindow[0] : false);
+	}
+	else
+	{
+		// Hiding the log window, so disable it and remove it.
+		m_LogWindow->Disable();
+		DoRemovePage(m_LogWindow, true);
+	}
+
+	// Hide or Show the pane
+	if (!g_pCodeWindow)
+		TogglePane();
+}
+
+void CFrame::ToggleLogConfigWindow(bool bShow)
+{
+	GetMenuBar()->FindItem(IDM_LOG_CONFIG_WINDOW)->Check(bShow);
+
+	if (bShow)
+	{
+		if (!m_LogConfigWindow)
+			m_LogConfigWindow = new LogConfigWindow(this, m_LogWindow, IDM_LOG_CONFIG_WINDOW);
+
+		const int nbIndex = IDM_LOG_CONFIG_WINDOW - IDM_LOG_WINDOW;
+		DoAddPage(m_LogConfigWindow,
+				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0,
+				g_pCodeWindow ? bFloatWindow[nbIndex] : false);
+	}
+	else
+	{
+		DoRemovePage(m_LogConfigWindow, false);
+		m_LogConfigWindow = nullptr;
+	}
+
+	// Hide or Show the pane
+	if (!g_pCodeWindow)
+		TogglePane();
+}
+
+void CFrame::OnToggleWindow(wxCommandEvent& event)
+{
+	bool bShow = GetMenuBar()->IsChecked(event.GetId());
+
+	switch (event.GetId())
+	{
+		case IDM_LOG_WINDOW:
+			if (!g_pCodeWindow)
+				SConfig::GetInstance().m_InterfaceLogWindow = bShow;
+			ToggleLogWindow(bShow);
+			break;
+		case IDM_LOG_CONFIG_WINDOW:
+			if (!g_pCodeWindow)
+				SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow;
+			ToggleLogConfigWindow(bShow);
+			break;
+		case IDM_REGISTER_WINDOW:
+			g_pCodeWindow->ToggleRegisterWindow(bShow);
+			break;
+		case IDM_WATCH_WINDOW:
+			g_pCodeWindow->ToggleWatchWindow(bShow);
+			break;
+		case IDM_BREAKPOINT_WINDOW:
+			g_pCodeWindow->ToggleBreakPointWindow(bShow);
+			break;
+		case IDM_MEMORY_WINDOW:
+			g_pCodeWindow->ToggleMemoryWindow(bShow);
+			break;
+		case IDM_JIT_WINDOW:
+			g_pCodeWindow->ToggleJitWindow(bShow);
+			break;
+		case IDM_SOUND_WINDOW:
+			g_pCodeWindow->ToggleSoundWindow(bShow);
+			break;
+		case IDM_VIDEO_WINDOW:
+			g_pCodeWindow->ToggleVideoWindow(bShow);
+			break;
+	}
+}
+
+// Notebooks
+// ---------------------
+void CFrame::ClosePages()
+{
+	ToggleLogWindow(false);
+	ToggleLogConfigWindow(false);
+
+	if (g_pCodeWindow)
+	{
+		g_pCodeWindow->ToggleCodeWindow(false);
+		g_pCodeWindow->ToggleRegisterWindow(false);
+		g_pCodeWindow->ToggleWatchWindow(false);
+		g_pCodeWindow->ToggleBreakPointWindow(false);
+		g_pCodeWindow->ToggleMemoryWindow(false);
+		g_pCodeWindow->ToggleJitWindow(false);
+		g_pCodeWindow->ToggleSoundWindow(false);
+		g_pCodeWindow->ToggleVideoWindow(false);
+	}
+}
+
+void CFrame::OnNotebookPageChanged(wxAuiNotebookEvent& event)
+{
+	event.Skip();
+
+	if (!g_pCodeWindow)
+		return;
+
+	// Remove the blank page if any
+	AddRemoveBlankPage();
+
+	// Update the notebook affiliation
+	for (int i = IDM_LOG_WINDOW; i <= IDM_CODE_WINDOW; i++)
+	{
+		if (GetNotebookAffiliation(i) >= 0)
+			g_pCodeWindow->iNbAffiliation[i - IDM_LOG_WINDOW] = GetNotebookAffiliation(i);
+	}
+}
+
+void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
+{
+	// Override event
+	event.Veto();
+
+	wxAuiNotebook* Ctrl = (wxAuiNotebook*)event.GetEventObject();
+
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOG_WINDOW)
+		ToggleLogWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOG_CONFIG_WINDOW)
+		ToggleLogConfigWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTER_WINDOW)
+		g_pCodeWindow->ToggleRegisterWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_WATCH_WINDOW)
+		g_pCodeWindow->ToggleWatchWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINT_WINDOW)
+		g_pCodeWindow->ToggleBreakPointWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_JIT_WINDOW)
+		g_pCodeWindow->ToggleJitWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_MEMORY_WINDOW)
+		g_pCodeWindow->ToggleMemoryWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_SOUND_WINDOW)
+		g_pCodeWindow->ToggleSoundWindow(false);
+	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_VIDEO_WINDOW)
+		g_pCodeWindow->ToggleVideoWindow(false);
+}
+
+void CFrame::OnFloatingPageClosed(wxCloseEvent& event)
+{
+	ToggleFloatWindow(event.GetId() - IDM_LOG_WINDOW_PARENT + IDM_FLOAT_LOG_WINDOW);
+}
+
+void CFrame::OnFloatingPageSize(wxSizeEvent& event)
+{
+	event.Skip();
+}
+
+void CFrame::OnFloatWindow(wxCommandEvent& event)
+{
+	ToggleFloatWindow(event.GetId());
+}
+
+void CFrame::ToggleFloatWindow(int Id)
+{
+	wxWindowID WinId = Id - IDM_FLOAT_LOG_WINDOW + IDM_LOG_WINDOW;
+	if (GetNotebookPageFromId(WinId))
+	{
+		DoFloatNotebookPage(WinId);
+		bFloatWindow[WinId - IDM_LOG_WINDOW] = true;
+	}
+	else
+	{
+		if (FindWindowById(WinId))
+			DoUnfloatPage(WinId - IDM_LOG_WINDOW + IDM_LOG_WINDOW_PARENT);
+		bFloatWindow[WinId - IDM_LOG_WINDOW] = false;
+	}
+}
+
+void CFrame::DoFloatNotebookPage(wxWindowID Id)
+{
+	wxPanel *Win = (wxPanel*)FindWindowById(Id);
+	if (!Win) return;
+
+	for (int i = 0; i < GetNotebookCount(); i++)
+	{
+		wxAuiNotebook *nb = GetNotebookFromId(i);
+		if (nb->GetPageIndex(Win) != wxNOT_FOUND)
+		{
+			nb->RemovePage(nb->GetPageIndex(Win));
+			// Create the parent frame and reparent the window
+			CreateParentFrame(Win->GetId() + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW,
+					Win->GetName(), Win);
+			if (nb->GetPageCount() == 0)
+				AddRemoveBlankPage();
+		}
+	}
+}
+
+void CFrame::DoUnfloatPage(int Id)
+{
+	wxFrame * Win = (wxFrame*)FindWindowById(Id);
+	if (!Win) return;
+
+	wxWindow * Child = Win->GetChildren().Item(0)->GetData();
+	Child->Reparent(this);
+	DoAddPage(Child, g_pCodeWindow->iNbAffiliation[Child->GetId() - IDM_LOG_WINDOW], false);
+	Win->Destroy();
+}
+
+void CFrame::OnTab(wxAuiNotebookEvent& event)
+{
+	event.Skip();
+	if (!g_pCodeWindow) return;
+
+	// Create the popup menu
+	wxMenu MenuPopup;
+
+	wxMenuItem* Item = new wxMenuItem(&MenuPopup, wxID_ANY, _("Select floating windows"));
+	MenuPopup.Append(Item);
+	Item->Enable(false);
+	MenuPopup.Append(new wxMenuItem(&MenuPopup));
+
+	for (int i = IDM_LOG_WINDOW; i <= IDM_CODE_WINDOW; i++)
+	{
+		wxWindow *Win = FindWindowById(i);
+		if (Win && Win->IsEnabled())
+		{
+			Item = new wxMenuItem(&MenuPopup, i + IDM_FLOAT_LOG_WINDOW - IDM_LOG_WINDOW,
+					Win->GetName(), "", wxITEM_CHECK);
+			MenuPopup.Append(Item);
+			Item->Check(!!FindWindowById(i + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW));
+		}
+	}
+
+	// Line up our menu with the cursor
+	wxPoint Pt = ::wxGetMousePosition();
+	Pt = ScreenToClient(Pt);
+
+	// Show
+	PopupMenu(&MenuPopup, Pt);
+}
+
+void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event)
+{
+	event.Skip();
+	event.Allow();
+}
+
+void CFrame::ShowResizePane()
+{
+	if (!m_LogWindow) return;
+
+	// Make sure the size is sane
+	if (m_LogWindow->x > GetClientRect().GetWidth())
+		m_LogWindow->x = GetClientRect().GetWidth() / 2;
+	if (m_LogWindow->y > GetClientRect().GetHeight())
+		m_LogWindow->y = GetClientRect().GetHeight() / 2;
+
+	wxAuiPaneInfo &pane = m_Mgr->GetPane("Pane 1");
+
+	// Hide first otherwise a resize doesn't work
+	pane.Hide();
+	m_Mgr->Update();
+
+	pane.BestSize(m_LogWindow->x, m_LogWindow->y)
+		.MinSize(m_LogWindow->x, m_LogWindow->y)
+		.Direction(m_LogWindow->winpos).Show();
+	m_Mgr->Update();
+
+	// Reset the minimum size of the pane
+	pane.MinSize(-1, -1);
+	m_Mgr->Update();
+}
+
+void CFrame::TogglePane()
+{
+	// Get the first notebook
+	wxAuiNotebook * NB = nullptr;
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
+	}
+
+	if (NB)
+	{
+		if (NB->GetPageCount() == 0)
+		{
+			m_Mgr->GetPane("Pane 1").Hide();
+			m_Mgr->Update();
+		}
+		else
+		{
+			ShowResizePane();
+		}
+	}
+}
+
+void CFrame::DoRemovePage(wxWindow *Win, bool bHide)
+{
+	if (!Win) return;
+
+	wxWindow *Parent = FindWindowById(Win->GetId() +
+			IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW);
+
+	if (Parent)
+	{
+		if (bHide)
+		{
+			Win->Hide();
+			Win->Reparent(this);
+		}
+		else
+		{
+			Win->Destroy();
+		}
+
+		Parent->Destroy();
+	}
+	else
+	{
+		for (int i = 0; i < GetNotebookCount(); i++)
+		{
+			int PageIndex = GetNotebookFromId(i)->GetPageIndex(Win);
+			if (PageIndex != wxNOT_FOUND)
+			{
+				GetNotebookFromId(i)->RemovePage(PageIndex);
+				if (bHide)
+				{
+					Win->Hide();
+					Win->Reparent(this);
+				}
+				else
+				{
+					Win->Destroy();
+				}
+			}
+		}
+	}
+
+	if (g_pCodeWindow)
+		AddRemoveBlankPage();
+}
+
+void CFrame::DoAddPage(wxWindow *Win, int i, bool Float)
+{
+	if (!Win) return;
+
+	// Ensure accessor remains within valid bounds.
+	if (i < 0 || i > GetNotebookCount() - 1)
+		i = 0;
+
+	// The page was already previously added, no need to add it again.
+	if (Win && GetNotebookFromId(i)->GetPageIndex(Win) != wxNOT_FOUND)
+		return;
+
+	if (!Float)
+		GetNotebookFromId(i)->AddPage(Win, Win->GetName(), true);
+	else
+		CreateParentFrame(Win->GetId() + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW,
+				Win->GetName(), Win);
+}
+
+void CFrame::PopulateSavedPerspectives()
+{
+	// If the perspective submenu hasn't been created yet, return
+	if (!m_SavedPerspectives) return;
+
+	// Delete all saved perspective menu items
+	while (m_SavedPerspectives->GetMenuItemCount() != 0)
+	{
+		// Delete the first menu item in the list (while there are menu items)
+		m_SavedPerspectives->Delete(m_SavedPerspectives->FindItemByPosition(0));
+	}
+
+	if (Perspectives.size() > 0)
+	{
+		for (u32 i = 0; i < Perspectives.size(); i++)
+		{
+			wxMenuItem* mItem = new wxMenuItem(m_SavedPerspectives, IDM_PERSPECTIVES_0 + i,
+					StrToWxStr(Perspectives[i].Name), "", wxITEM_CHECK);
+
+			m_SavedPerspectives->Append(mItem);
+
+			if (i == ActivePerspective)
+			{
+				mItem->Check(true);
+			}
+		}
+	}
+}
+
+void CFrame::OnPerspectiveMenu(wxCommandEvent& event)
+{
+	ClearStatusBar();
+
+	switch (event.GetId())
+	{
+		case IDM_SAVE_PERSPECTIVE:
+			if (Perspectives.size() == 0)
+			{
+				wxMessageBox(_("Please create a perspective before saving"),
+						_("Notice"), wxOK, this);
+				return;
+			}
+			SaveIniPerspectives();
+			GetStatusBar()->SetStatusText(StrToWxStr(std::string
+						("Saved " + Perspectives[ActivePerspective].Name)), 0);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE_TOP:
+			AddPane(ADD_PANE_TOP);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE_BOTTOM:
+			AddPane(ADD_PANE_BOTTOM);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE_LEFT:
+			AddPane(ADD_PANE_LEFT);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE_RIGHT:
+			AddPane(ADD_PANE_RIGHT);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE_CENTER:
+			AddPane(ADD_PANE_CENTER);
+			break;
+		case IDM_EDIT_PERSPECTIVES:
+			m_bEdit = event.IsChecked();
+			TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
+			break;
+		case IDM_ADD_PERSPECTIVE:
+			{
+				wxTextEntryDialog dlg(this,
+						_("Enter a name for the new perspective:"),
+						_("Create new perspective"));
+				wxString DefaultValue = wxString::Format(_("Perspective %d"), (int)(Perspectives.size() + 1));
+				dlg.SetValue(DefaultValue);
+
+				int Return = 0;
+				bool DlgOk = false;
+
+				while (!DlgOk)
+				{
+					Return = dlg.ShowModal();
+					if (Return == wxID_CANCEL)
+					{
+						return;
+					}
+					else if (dlg.GetValue().Find(",") != -1)
+					{
+						wxMessageBox(_("The name cannot contain the character ','"),
+								_("Notice"), wxOK, this);
+						wxString Str = dlg.GetValue();
+						Str.Replace(",", "", true);
+						dlg.SetValue(Str);
+					}
+					else if (dlg.GetValue().IsSameAs(""))
+					{
+						wxMessageBox(_("The name cannot be empty"),
+								_("Notice"), wxOK, this);
+						dlg.SetValue(DefaultValue);
+					}
+					else
+					{
+						DlgOk = true;
+					}
+				}
+
+				SPerspectives Tmp;
+				Tmp.Name = WxStrToStr(dlg.GetValue());
+				Tmp.Perspective = m_Mgr->SavePerspective();
+
+				ActivePerspective = (u32)Perspectives.size();
+				Perspectives.push_back(Tmp);
+
+				UpdateCurrentPerspective();
+				PopulateSavedPerspectives();
+			}
+			break;
+		case IDM_TAB_SPLIT:
+			m_bTabSplit = event.IsChecked();
+			ToggleNotebookStyle(m_bTabSplit, wxAUI_NB_TAB_SPLIT);
+			break;
+		case IDM_NO_DOCKING:
+			m_bNoDocking = event.IsChecked();
+			TogglePaneStyle(m_bNoDocking, IDM_NO_DOCKING);
+			break;
+	}
+}
+
+void CFrame::TogglePaneStyle(bool On, int EventId)
+{
+	wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
+	for (u32 i = 0; i < AllPanes.GetCount(); ++i)
+	{
+		wxAuiPaneInfo& Pane = AllPanes[i];
+		if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+		{
+			// Default
+			Pane.CloseButton(true);
+			Pane.MaximizeButton(true);
+			Pane.MinimizeButton(true);
+			Pane.PinButton(true);
+			Pane.Show();
+
+			switch (EventId)
+			{
+				case IDM_EDIT_PERSPECTIVES:
+					Pane.CaptionVisible(On);
+					Pane.Movable(On);
+					Pane.Floatable(On);
+					Pane.Dockable(On);
+					break;
+			}
+			Pane.Dockable(!m_bNoDocking);
+		}
+	}
+	m_Mgr->Update();
+}
+
+void CFrame::ToggleNotebookStyle(bool On, long Style)
+{
+	wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
+	for (int i = 0, Count = (int)AllPanes.GetCount(); i < Count; ++i)
+	{
+		wxAuiPaneInfo& Pane = AllPanes[i];
+		if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+		{
+			wxAuiNotebook* NB = (wxAuiNotebook*)Pane.window;
+
+			if (On)
+				NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() | Style);
+			else
+				NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() &~ Style);
+
+			NB->Refresh();
+		}
+	}
+}
+
+void CFrame::OnSelectPerspective(wxCommandEvent& event)
+{
+	u32 _Selection = event.GetId() - IDM_PERSPECTIVES_0;
+	if (Perspectives.size() <= _Selection) _Selection = 0;
+	ActivePerspective = _Selection;
+	DoLoadPerspective();
+}
+
+void CFrame::SetPaneSize()
+{
+	if (Perspectives.size() <= ActivePerspective)
+		return;
+
+	int iClientX = GetSize().GetX();
+	int iClientY = GetSize().GetY();
+
+	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiToolBar)))
+		{
+			if (!m_Mgr->GetAllPanes()[i].IsOk())
+				return;
+
+			if (Perspectives[ActivePerspective].Width.size() <= j ||
+					Perspectives[ActivePerspective].Height.size() <= j)
+				continue;
+
+			// Width and height of the active perspective
+			u32 W = Perspectives[ActivePerspective].Width[j],
+				H = Perspectives[ActivePerspective].Height[j];
+
+			// Check limits
+			MathUtil::Clamp<u32>(&W, 5, 95);
+			MathUtil::Clamp<u32>(&H, 5, 95);
+
+			// Convert percentages to pixel lengths
+			W = (W * iClientX) / 100;
+			H = (H * iClientY) / 100;
+			m_Mgr->GetAllPanes()[i].BestSize(W, H).MinSize(W, H);
+
+			j++;
+		}
+	}
+	m_Mgr->Update();
+
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiToolBar)))
+		{
+			m_Mgr->GetAllPanes()[i].MinSize(-1, -1);
+		}
+	}
+}
+
+void CFrame::ReloadPanes()
+{
+	// Close all pages
+	ClosePages();
+
+	CloseAllNotebooks();
+
+	// Create new panes with notebooks
+	for (u32 i = 0; i < Perspectives[ActivePerspective].Width.size() - 1; i++)
+	{
+		wxString PaneName = wxString::Format("Pane %i", i + 1);
+		m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo().Hide()
+				.CaptionVisible(m_bEdit).Dockable(!m_bNoDocking).Position(i)
+				.Name(PaneName).Caption(PaneName));
+	}
+
+	// Perspectives
+	m_Mgr->LoadPerspective(Perspectives[ActivePerspective].Perspective, false);
+	// Restore settings
+	TogglePaneStyle(m_bNoDocking, IDM_NO_DOCKING);
+	TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
+
+	// Load GUI settings
+	g_pCodeWindow->Load();
+	// Open notebook pages
+	AddRemoveBlankPage();
+	g_pCodeWindow->OpenPages();
+
+	// Repopulate perspectives
+	PopulateSavedPerspectives();
+}
+
+void CFrame::DoLoadPerspective()
+{
+	ReloadPanes();
+	// Restore the exact window sizes, which LoadPerspective doesn't always do
+	SetPaneSize();
+
+	m_Mgr->Update();
+}
+
+// Update the local perspectives array
+void CFrame::LoadIniPerspectives()
+{
+	Perspectives.clear();
+	std::vector<std::string> VPerspectives;
+	std::string _Perspectives;
+
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	IniFile::Section* perspectives = ini.GetOrCreateSection("Perspectives");
+	perspectives->Get("Perspectives", &_Perspectives, "Perspective 1");
+	perspectives->Get("Active", &ActivePerspective, 0);
+	SplitString(_Perspectives, ',', VPerspectives);
+
+	for (auto& VPerspective : VPerspectives)
+	{
+		SPerspectives Tmp;
+		std::string _Section, _Perspective, _Widths, _Heights;
+		std::vector<std::string> _SWidth, _SHeight;
+		Tmp.Name = VPerspective;
+
+		// Don't save a blank perspective
+		if (Tmp.Name.empty())
+		{
+			continue;
+		}
+
+		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
+
+		IniFile::Section* perspec_section = ini.GetOrCreateSection(_Section);
+		perspec_section->Get("Perspective", &_Perspective,
+		                     "layout2|"
+		                     "name=Pane 0;caption=Pane 0;state=768;dir=5;prop=100000;|"
+		                     "name=Pane 1;caption=Pane 1;state=31458108;dir=4;prop=100000;|"
+		                     "dock_size(5,0,0)=22|dock_size(4,0,0)=333|");
+		perspec_section->Get("Width", &_Widths, "70,25");
+		perspec_section->Get("Height", &_Heights, "80,80");
+
+		Tmp.Perspective = StrToWxStr(_Perspective);
+
+		SplitString(_Widths, ',', _SWidth);
+		SplitString(_Heights, ',', _SHeight);
+		for (auto& Width : _SWidth)
+		{
+			int _Tmp;
+			if (TryParse(Width, &_Tmp))
+				Tmp.Width.push_back(_Tmp);
+		}
+		for (auto& Height : _SHeight)
+		{
+			int _Tmp;
+			if (TryParse(Height, &_Tmp))
+				Tmp.Height.push_back(_Tmp);
+		}
+		Perspectives.push_back(Tmp);
+	}
+}
+
+void CFrame::UpdateCurrentPerspective()
+{
+	SPerspectives *current = &Perspectives[ActivePerspective];
+	current->Perspective = m_Mgr->SavePerspective();
+
+	// Get client size
+	int iClientX = GetSize().GetX(), iClientY = GetSize().GetY();
+	current->Width.clear();
+	current->Height.clear();
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->
+				IsKindOf(CLASSINFO(wxAuiToolBar)))
+		{
+			// Save width and height as a percentage of the client width and height
+			current->Width.push_back(
+					(m_Mgr->GetAllPanes()[i].window->GetClientSize().GetX() * 100) /
+					iClientX);
+			current->Height.push_back(
+					(m_Mgr->GetAllPanes()[i].window->GetClientSize().GetY() * 100) /
+					iClientY);
+		}
+	}
+}
+
+void CFrame::SaveIniPerspectives()
+{
+	if (Perspectives.size() == 0) return;
+	if (ActivePerspective >= Perspectives.size()) ActivePerspective = 0;
+
+	// Turn off edit before saving
+	TogglePaneStyle(false, IDM_EDIT_PERSPECTIVES);
+
+	UpdateCurrentPerspective();
+
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	// Save perspective names
+	std::string STmp = "";
+	for (auto& Perspective : Perspectives)
+	{
+		STmp += Perspective.Name + ",";
+	}
+	STmp = STmp.substr(0, STmp.length() - 1);
+
+	IniFile::Section* perspectives = ini.GetOrCreateSection("Perspectives");
+	perspectives->Set("Perspectives", STmp);
+	perspectives->Set("Active", ActivePerspective);
+
+	// Save the perspectives
+	for (auto& Perspective : Perspectives)
+	{
+		std::string _Section = "P - " + Perspective.Name;
+		IniFile::Section* perspec_section = ini.GetOrCreateSection(_Section);
+		perspec_section->Set("Perspective", WxStrToStr(Perspective.Perspective));
+
+		std::string SWidth = "", SHeight = "";
+		for (u32 j = 0; j < Perspective.Width.size(); j++)
+		{
+			SWidth += StringFromFormat("%i,", Perspective.Width[j]);
+			SHeight += StringFromFormat("%i,", Perspective.Height[j]);
+		}
+		// Remove the ending ","
+		SWidth = SWidth.substr(0, SWidth.length() - 1);
+		SHeight = SHeight.substr(0, SHeight.length() - 1);
+
+		perspec_section->Set("Width", SWidth);
+		perspec_section->Set("Height", SHeight);
+	}
+
+	ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	// Save notebook affiliations
+	g_pCodeWindow->Save();
+
+	TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
+}
+
+void CFrame::AddPane(int dir)
+{
+	int PaneNum = GetNotebookCount() + 1;
+	wxString PaneName = wxString::Format("Pane %i", PaneNum);
+	wxAuiPaneInfo PaneInfo = wxAuiPaneInfo()
+		.CaptionVisible(m_bEdit).Dockable(!m_bNoDocking)
+		.Name(PaneName).Caption(PaneName)
+		.Position(GetNotebookCount());
+
+	switch (dir)
+	{
+		case ADD_PANE_TOP:
+			PaneInfo = PaneInfo.Top();
+			break;
+		case ADD_PANE_BOTTOM:
+			PaneInfo = PaneInfo.Bottom();
+			break;
+		case ADD_PANE_LEFT:
+			PaneInfo = PaneInfo.Left();
+			break;
+		case ADD_PANE_RIGHT:
+			PaneInfo = PaneInfo.Right();
+			break;
+		case ADD_PANE_CENTER:
+			PaneInfo = PaneInfo.Center();
+			break;
+		default:
+			break;
+	}
+
+	m_Mgr->AddPane(CreateEmptyNotebook(), PaneInfo);
+
+	AddRemoveBlankPage();
+	m_Mgr->Update();
+}
+
+wxWindow * CFrame::GetNotebookPageFromId(wxWindowID Id)
+{
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			continue;
+
+		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
+		for (u32 j = 0; j < NB->GetPageCount(); j++)
+		{
+			if (NB->GetPage(j)->GetId() == Id)
+				return NB->GetPage(j);
+		}
+	}
+	return nullptr;
+}
+
+wxFrame* CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, wxWindow* Child)
+{
+	wxFrame* Frame = new wxFrame(this, Id, Title);
+
+	Child->Reparent(Frame);
+
+	wxBoxSizer* m_MainSizer = new wxBoxSizer(wxHORIZONTAL);
+
+	m_MainSizer->Add(Child, 1, wxEXPAND);
+
+	Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this);
+
+	// Main sizer
+	Frame->SetSizer(m_MainSizer);
+	// Minimum frame size
+	Frame->SetMinSize(wxSize(200, 200));
+	Frame->Show();
+	return Frame;
+}
+
+wxAuiNotebook* CFrame::CreateEmptyNotebook()
+{
+	const long NOTEBOOK_STYLE = wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT |
+		wxAUI_NB_TAB_MOVE |
+		wxAUI_NB_TAB_EXTERNAL_MOVE | wxAUI_NB_SCROLL_BUTTONS |
+		wxAUI_NB_WINDOWLIST_BUTTON | wxNO_BORDER;
+
+	return new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, NOTEBOOK_STYLE);
+}
+
+void CFrame::AddRemoveBlankPage()
+{
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			continue;
+
+		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
+		for (u32 j = 0; j < NB->GetPageCount(); j++)
+		{
+			if (NB->GetPageText(j).IsSameAs("<>") && NB->GetPageCount() > 1)
+				NB->DeletePage(j);
+		}
+
+		if (NB->GetPageCount() == 0)
+			NB->AddPage(new wxPanel(this, wxID_ANY), "<>", true);
+	}
+}
+
+int CFrame::GetNotebookAffiliation(wxWindowID Id)
+{
+	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			continue;
+
+		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
+		for (u32 k = 0; k < NB->GetPageCount(); k++)
+		{
+			if (NB->GetPage(k)->GetId() == Id)
+				return j;
+		}
+		j++;
+	}
+	return -1;
+}
+
+// Close all panes with notebooks
+void CFrame::CloseAllNotebooks()
+{
+	wxAuiPaneInfoArray AllPanes = m_Mgr->GetAllPanes();
+	for (u32 i = 0; i < AllPanes.GetCount(); i++)
+	{
+		if (AllPanes[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+		{
+			AllPanes[i].DestroyOnClose(true);
+			m_Mgr->ClosePane(AllPanes[i]);
+		}
+	}
+}
+
+int CFrame::GetNotebookCount()
+{
+	int Ret = 0;
+	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			Ret++;
+	}
+	return Ret;
+}
+
+wxAuiNotebook * CFrame::GetNotebookFromId(u32 NBId)
+{
+	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
+	{
+		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
+			continue;
+		if (j == NBId)
+			return (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
+		j++;
+	}
+	return nullptr;
+}
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
new file mode 100644
index 0000000000..d56a8486b2
--- /dev/null
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -0,0 +1,2007 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdarg>
+#include <cstdio>
+#include <mutex>
+#include <string>
+#include <vector>
+#include <wx/app.h>
+#include <wx/bitmap.h>
+#include <wx/filedlg.h>
+#include <wx/filefn.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/panel.h>
+#include <wx/progdlg.h>
+#include <wx/statusbr.h>
+#include <wx/thread.h>
+#include <wx/toolbar.h>
+#include <wx/toplevel.h>
+#include <wx/aui/framemanager.h>
+
+#ifdef __APPLE__
+#include <AppKit/AppKit.h>
+#endif
+
+#include "Common/CDUtils.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Host.h"
+#include "Core/HotkeyManager.h"
+#include "Core/Movie.h"
+#include "Core/State.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI_Device.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiiSaveCrypted.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+
+#include "DiscIO/NANDContentLoader.h"
+
+#include "DolphinWX/AboutDolphin.h"
+#include "DolphinWX/ControllerConfigDiag.h"
+#include "DolphinWX/FifoPlayerDlg.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/MemcardManager.h"
+#include "DolphinWX/TASInputDlg.h"
+#include "DolphinWX/WXInputBase.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/CheatsWindow.h"
+#include "DolphinWX/Config/ConfigMain.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
+#include "DolphinWX/NetPlay/NetPlaySetupFrame.h"
+#include "DolphinWX/NetPlay/NetWindow.h"
+
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+#include "VideoBackends/Software/SWVideoConfig.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+#ifdef _WIN32
+#ifndef SM_XVIRTUALSCREEN
+#define SM_XVIRTUALSCREEN 76
+#endif
+#ifndef SM_YVIRTUALSCREEN
+#define SM_YVIRTUALSCREEN 77
+#endif
+#ifndef SM_CXVIRTUALSCREEN
+#define SM_CXVIRTUALSCREEN 78
+#endif
+#ifndef SM_CYVIRTUALSCREEN
+#define SM_CYVIRTUALSCREEN 79
+#endif
+#endif
+
+// Resources
+extern "C" {
+#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon
+};
+
+class InputConfig;
+class wxFrame;
+
+// This override allows returning a fake menubar object while removing the real one from the screen
+wxMenuBar* CFrame::GetMenuBar() const
+{
+	if (m_frameMenuBar)
+	{
+		return m_frameMenuBar;
+	}
+	else
+	{
+		return m_menubar_shadow;
+	}
+}
+
+// Create menu items
+// ---------------------
+wxMenuBar* CFrame::CreateMenu()
+{
+	wxMenuBar* menubar = new wxMenuBar();
+
+	// file menu
+	wxMenu* fileMenu = new wxMenu;
+	fileMenu->Append(wxID_OPEN, GetMenuLabel(HK_OPEN));
+	fileMenu->Append(IDM_CHANGE_DISC, GetMenuLabel(HK_CHANGE_DISC));
+
+	wxMenu *externalDrive = new wxMenu;
+	fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Backup..."), externalDrive);
+
+	drives = cdio_get_devices();
+	// Windows Limitation of 24 character drives
+	for (unsigned int i = 0; i < drives.size() && i < 24; i++)
+	{
+		externalDrive->Append(IDM_DRIVE1 + i, StrToWxStr(drives[i]));
+	}
+
+	fileMenu->AppendSeparator();
+	fileMenu->Append(wxID_REFRESH, GetMenuLabel(HK_REFRESH_LIST));
+	fileMenu->AppendSeparator();
+	fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
+	fileMenu->AppendSeparator();
+	fileMenu->Append(wxID_EXIT, _("E&xit") + wxString("\tAlt+F4"));
+	menubar->Append(fileMenu, _("&File"));
+
+	// Emulation menu
+	wxMenu* emulationMenu = new wxMenu;
+	emulationMenu->Append(IDM_PLAY, GetMenuLabel(HK_PLAY_PAUSE));
+	emulationMenu->Append(IDM_STOP, GetMenuLabel(HK_STOP));
+	emulationMenu->Append(IDM_RESET, GetMenuLabel(HK_RESET));
+	emulationMenu->AppendSeparator();
+	emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN));
+	emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString);
+
+	wxMenu *skippingMenu = new wxMenu;
+	emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
+	for (int i = 0; i < 10; i++)
+		skippingMenu->AppendRadioItem(IDM_FRAME_SKIP_0 + i, wxString::Format("%i", i));
+	skippingMenu->Check(IDM_FRAME_SKIP_0 + SConfig::GetInstance().m_FrameSkip, true);
+	Movie::SetFrameSkipping(SConfig::GetInstance().m_FrameSkip);
+
+	emulationMenu->AppendSeparator();
+	emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
+
+	emulationMenu->AppendSeparator();
+	wxMenu *saveMenu = new wxMenu;
+	wxMenu *loadMenu = new wxMenu;
+	wxMenu *slotSelectMenu = new wxMenu;
+	emulationMenu->Append(IDM_LOAD_STATE, _("&Load State"), loadMenu);
+	emulationMenu->Append(IDM_SAVE_STATE, _("Sa&ve State"), saveMenu);
+	emulationMenu->Append(IDM_SELECT_SLOT, _("Select State slot"), slotSelectMenu);
+
+	saveMenu->Append(IDM_SAVE_STATE_FILE, GetMenuLabel(HK_SAVE_STATE_FILE));
+	saveMenu->Append(IDM_SAVE_SELECTED_SLOT, GetMenuLabel(HK_SAVE_STATE_SLOT_SELECTED));
+	saveMenu->Append(IDM_SAVE_FIRST_STATE, GetMenuLabel(HK_SAVE_FIRST_STATE));
+	saveMenu->Append(IDM_UNDO_SAVE_STATE, GetMenuLabel(HK_UNDO_SAVE_STATE));
+	saveMenu->AppendSeparator();
+
+	loadMenu->Append(IDM_LOAD_STATE_FILE, GetMenuLabel(HK_LOAD_STATE_FILE));
+	loadMenu->Append(IDM_LOAD_SELECTED_SLOT, GetMenuLabel(HK_LOAD_STATE_SLOT_SELECTED));
+	loadMenu->Append(IDM_UNDO_LOAD_STATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
+	loadMenu->AppendSeparator();
+
+	for (unsigned int i = 0; i < State::NUM_STATES; i++)
+	{
+		loadMenu->Append(IDM_LOAD_SLOT_1 + i, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i));
+		saveMenu->Append(IDM_SAVE_SLOT_1 + i, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i));
+		slotSelectMenu->Append(IDM_SELECT_SLOT_1 + i, GetMenuLabel(HK_SELECT_STATE_SLOT_1 + i));
+	}
+
+	loadMenu->AppendSeparator();
+	for (unsigned int i = 0; i < State::NUM_STATES; i++)
+		loadMenu->Append(IDM_LOAD_LAST_1 + i, GetMenuLabel(HK_LOAD_LAST_STATE_1 + i));
+
+	menubar->Append(emulationMenu, _("&Emulation"));
+
+	// Movie menu
+	wxMenu* movieMenu = new wxMenu;
+	movieMenu->Append(IDM_RECORD, GetMenuLabel(HK_START_RECORDING));
+	movieMenu->Append(IDM_PLAY_RECORD, GetMenuLabel(HK_PLAY_RECORDING));
+	movieMenu->Append(IDM_RECORD_EXPORT, GetMenuLabel(HK_EXPORT_RECORDING));
+	movieMenu->Append(IDM_RECORD_READ_ONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
+	movieMenu->Append(IDM_TAS_INPUT, _("TAS Input"));
+	movieMenu->AppendSeparator();
+	movieMenu->AppendCheckItem(IDM_TOGGLE_PAUSE_MOVIE, _("Pause at End of Movie"));
+	movieMenu->Check(IDM_TOGGLE_PAUSE_MOVIE, SConfig::GetInstance().m_PauseMovie);
+	movieMenu->AppendCheckItem(IDM_SHOW_LAG, _("Show Lag Counter"));
+	movieMenu->Check(IDM_SHOW_LAG, SConfig::GetInstance().m_ShowLag);
+	movieMenu->AppendCheckItem(IDM_SHOW_FRAME_COUNT, _("Show Frame Counter"));
+	movieMenu->Check(IDM_SHOW_FRAME_COUNT, SConfig::GetInstance().m_ShowFrameCount);
+	movieMenu->Check(IDM_RECORD_READ_ONLY, true);
+	movieMenu->AppendCheckItem(IDM_SHOW_INPUT_DISPLAY, _("Show Input Display"));
+	movieMenu->Check(IDM_SHOW_INPUT_DISPLAY, SConfig::GetInstance().m_ShowInputDisplay);
+	movieMenu->AppendSeparator();
+	movieMenu->AppendCheckItem(IDM_TOGGLE_DUMP_FRAMES, _("Dump Frames"));
+	movieMenu->Check(IDM_TOGGLE_DUMP_FRAMES, SConfig::GetInstance().m_DumpFrames);
+	movieMenu->AppendCheckItem(IDM_TOGGLE_DUMP_AUDIO, _("Dump Audio"));
+	movieMenu->Check(IDM_TOGGLE_DUMP_AUDIO, SConfig::GetInstance().m_DumpAudio);
+	menubar->Append(movieMenu, _("&Movie"));
+
+	// Options menu
+	wxMenu* pOptionsMenu = new wxMenu;
+	pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure..."));
+	pOptionsMenu->AppendSeparator();
+	pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_AUDIO, _("&Audio Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings"));
+	if (g_pCodeWindow)
+	{
+		pOptionsMenu->AppendSeparator();
+		g_pCodeWindow->CreateMenuOptions(pOptionsMenu);
+	}
+	menubar->Append(pOptionsMenu, _("&Options"));
+
+	// Tools menu
+	wxMenu* toolsMenu = new wxMenu;
+	toolsMenu->Append(IDM_MEMCARD, _("&Memcard Manager (GC)"));
+	toolsMenu->Append(IDM_IMPORT_SAVE, _("Import Wii Save"));
+	toolsMenu->Append(IDM_EXPORT_ALL_SAVE, _("Export All Wii Saves"));
+	toolsMenu->Append(IDM_CHEATS, _("&Cheat Manager"));
+
+	toolsMenu->Append(IDM_NETPLAY, _("Start &NetPlay"));
+
+	toolsMenu->Append(IDM_MENU_INSTALL_WAD, _("Install WAD"));
+	UpdateWiiMenuChoice(toolsMenu->Append(IDM_LOAD_WII_MENU, "Dummy string to keep wxw happy"));
+
+	toolsMenu->Append(IDM_FIFOPLAYER, _("Fifo Player"));
+
+	toolsMenu->AppendSeparator();
+	wxMenu* wiimoteMenu = new wxMenu;
+	toolsMenu->AppendSubMenu(wiimoteMenu, _("Connect Wiimotes"));
+	wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
+	wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE2, GetMenuLabel(HK_WIIMOTE2_CONNECT));
+	wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
+	wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
+	wiimoteMenu->AppendSeparator();
+	wiimoteMenu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, GetMenuLabel(HK_BALANCEBOARD_CONNECT));
+
+	menubar->Append(toolsMenu, _("&Tools"));
+
+	wxMenu* viewMenu = new wxMenu;
+	viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _("Show &Toolbar"));
+	viewMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
+	viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _("Show &Statusbar"));
+	viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
+	viewMenu->AppendSeparator();
+	viewMenu->AppendCheckItem(IDM_LOG_WINDOW, _("Show &Log"));
+	viewMenu->AppendCheckItem(IDM_LOG_CONFIG_WINDOW, _("Show Log &Configuration"));
+	viewMenu->AppendSeparator();
+
+	if (g_pCodeWindow)
+	{
+		viewMenu->Check(IDM_LOG_WINDOW, g_pCodeWindow->bShowOnStart[0]);
+
+		static const wxString menu_text[] = {
+			_("&Registers"),
+			_("&Watch"),
+			_("&Breakpoints"),
+			_("&Memory"),
+			_("&JIT"),
+			_("&Sound"),
+			_("&Video")
+		};
+
+		for (int i = IDM_REGISTER_WINDOW; i <= IDM_VIDEO_WINDOW; i++)
+		{
+			viewMenu->AppendCheckItem(i, menu_text[i - IDM_REGISTER_WINDOW]);
+			viewMenu->Check(i, g_pCodeWindow->bShowOnStart[i - IDM_LOG_WINDOW]);
+		}
+
+		viewMenu->AppendSeparator();
+	}
+	else
+	{
+		viewMenu->Check(IDM_LOG_WINDOW, SConfig::GetInstance().m_InterfaceLogWindow);
+		viewMenu->Check(IDM_LOG_CONFIG_WINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow);
+	}
+
+	wxMenu *platformMenu = new wxMenu;
+	viewMenu->AppendSubMenu(platformMenu, _("Show Platforms"));
+	platformMenu->AppendCheckItem(IDM_LIST_WII, _("Show Wii"));
+	platformMenu->Check(IDM_LIST_WII, SConfig::GetInstance().m_ListWii);
+	platformMenu->AppendCheckItem(IDM_LIST_GC, _("Show GameCube"));
+	platformMenu->Check(IDM_LIST_GC, SConfig::GetInstance().m_ListGC);
+	platformMenu->AppendCheckItem(IDM_LIST_WAD, _("Show Wad"));
+	platformMenu->Check(IDM_LIST_WAD, SConfig::GetInstance().m_ListWad);
+
+	wxMenu *regionMenu = new wxMenu;
+	viewMenu->AppendSubMenu(regionMenu, _("Show Regions"));
+	regionMenu->AppendCheckItem(IDM_LIST_JAP, _("Show JAP"));
+	regionMenu->Check(IDM_LIST_JAP, SConfig::GetInstance().m_ListJap);
+	regionMenu->AppendCheckItem(IDM_LIST_PAL, _("Show PAL"));
+	regionMenu->Check(IDM_LIST_PAL, SConfig::GetInstance().m_ListPal);
+	regionMenu->AppendCheckItem(IDM_LIST_USA, _("Show USA"));
+	regionMenu->Check(IDM_LIST_USA, SConfig::GetInstance().m_ListUsa);
+	regionMenu->AppendSeparator();
+	regionMenu->AppendCheckItem(IDM_LIST_AUSTRALIA, _("Show Australia"));
+	regionMenu->Check(IDM_LIST_AUSTRALIA, SConfig::GetInstance().m_ListAustralia);
+	regionMenu->AppendCheckItem(IDM_LIST_FRANCE, _("Show France"));
+	regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance);
+	regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany"));
+	regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany);
+	regionMenu->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy"));
+	regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly);
+	regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea"));
+	regionMenu->Check(IDM_LIST_KOREA, SConfig::GetInstance().m_ListKorea);
+	regionMenu->AppendCheckItem(IDM_LIST_NETHERLANDS, _("Show Netherlands"));
+	regionMenu->Check(IDM_LIST_NETHERLANDS, SConfig::GetInstance().m_ListNetherlands);
+	regionMenu->AppendCheckItem(IDM_LIST_RUSSIA, _("Show Russia"));
+	regionMenu->Check(IDM_LIST_RUSSIA, SConfig::GetInstance().m_ListRussia);
+	regionMenu->AppendCheckItem(IDM_LIST_SPAIN, _("Show Spain"));
+	regionMenu->Check(IDM_LIST_SPAIN, SConfig::GetInstance().m_ListSpain);
+	regionMenu->AppendCheckItem(IDM_LIST_TAIWAN, _("Show Taiwan"));
+	regionMenu->Check(IDM_LIST_TAIWAN, SConfig::GetInstance().m_ListTaiwan);
+	regionMenu->AppendCheckItem(IDM_LIST_WORLD, _("Show World"));
+	regionMenu->Check(IDM_LIST_WORLD, SConfig::GetInstance().m_ListWorld);
+	regionMenu->AppendCheckItem(IDM_LIST_UNKNOWN, _("Show Unknown"));
+	regionMenu->Check(IDM_LIST_UNKNOWN, SConfig::GetInstance().m_ListUnknown);
+
+	viewMenu->AppendCheckItem(IDM_LIST_DRIVES, _("Show Drives"));
+	viewMenu->Check(IDM_LIST_DRIVES, SConfig::GetInstance().m_ListDrives);
+	viewMenu->Append(IDM_PURGE_CACHE, _("Purge Cache"));
+
+	wxMenu *columnsMenu = new wxMenu;
+	viewMenu->AppendSubMenu(columnsMenu, _("Select Columns"));
+	columnsMenu->AppendCheckItem(IDM_SHOW_SYSTEM, _("Platform"));
+	columnsMenu->Check(IDM_SHOW_SYSTEM, SConfig::GetInstance().m_showSystemColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_BANNER, _("Banner"));
+	columnsMenu->Check(IDM_SHOW_BANNER, SConfig::GetInstance().m_showBannerColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_MAKER, _("Maker"));
+	columnsMenu->Check(IDM_SHOW_MAKER, SConfig::GetInstance().m_showMakerColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_ID, _("Game ID"));
+	columnsMenu->Check(IDM_SHOW_ID, SConfig::GetInstance().m_showIDColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_REGION, _("Region"));
+	columnsMenu->Check(IDM_SHOW_REGION, SConfig::GetInstance().m_showRegionColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_SIZE, _("File Size"));
+	columnsMenu->Check(IDM_SHOW_SIZE, SConfig::GetInstance().m_showSizeColumn);
+	columnsMenu->AppendCheckItem(IDM_SHOW_STATE, _("State"));
+	columnsMenu->Check(IDM_SHOW_STATE, SConfig::GetInstance().m_showStateColumn);
+
+
+
+	menubar->Append(viewMenu, _("&View"));
+
+	if (g_pCodeWindow)
+	{
+		g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, menubar);
+	}
+
+	// Help menu
+	wxMenu* helpMenu = new wxMenu;
+	// Re-enable when there's something useful to display */
+	// helpMenu->Append(wxID_HELP, _("&Help"));
+	helpMenu->Append(IDM_HELP_WEBSITE, _("&Website"));
+	helpMenu->Append(IDM_HELP_ONLINE_DOCS, _("Online &Documentation"));
+	helpMenu->Append(IDM_HELP_GITHUB, _("&GitHub Repository"));
+	helpMenu->AppendSeparator();
+	helpMenu->Append(wxID_ABOUT, _("&About..."));
+	menubar->Append(helpMenu, _("&Help"));
+
+	return menubar;
+}
+
+wxString CFrame::GetMenuLabel(int Id)
+{
+	wxString Label;
+
+	switch (Id)
+	{
+		case HK_OPEN:
+			Label = _("&Open...");
+			break;
+		case HK_CHANGE_DISC:
+			Label = _("Change &Disc...");
+			break;
+		case HK_REFRESH_LIST:
+			Label = _("&Refresh List");
+			break;
+
+		case HK_PLAY_PAUSE:
+			if (Core::GetState() == Core::CORE_RUN)
+				Label = _("&Pause");
+			else
+				Label = _("&Play");
+			break;
+		case HK_STOP:
+			Label = _("&Stop");
+			break;
+		case HK_RESET:
+			Label = _("&Reset");
+			break;
+		case HK_FRAME_ADVANCE:
+			Label = _("&Frame Advance");
+			break;
+
+		case HK_START_RECORDING:
+			Label = _("Start Re&cording Input");
+			break;
+		case HK_PLAY_RECORDING:
+			Label = _("P&lay Input Recording...");
+			break;
+		case HK_EXPORT_RECORDING:
+			Label = _("Export Recording...");
+			break;
+		case HK_READ_ONLY_MODE:
+			Label = _("&Read-Only Mode");
+			break;
+
+		case HK_FULLSCREEN:
+			Label = _("&Fullscreen");
+			break;
+		case HK_SCREENSHOT:
+			Label = _("Take Screenshot");
+			break;
+		case HK_EXIT:
+			Label = _("Exit");
+			break;
+
+		case HK_WIIMOTE1_CONNECT:
+		case HK_WIIMOTE2_CONNECT:
+		case HK_WIIMOTE3_CONNECT:
+		case HK_WIIMOTE4_CONNECT:
+			Label = wxString::Format(_("Connect Wiimote %i"),
+					Id - HK_WIIMOTE1_CONNECT + 1);
+			break;
+		case HK_BALANCEBOARD_CONNECT:
+			Label = _("Connect Balance Board");
+			break;
+		case HK_LOAD_STATE_SLOT_1:
+		case HK_LOAD_STATE_SLOT_2:
+		case HK_LOAD_STATE_SLOT_3:
+		case HK_LOAD_STATE_SLOT_4:
+		case HK_LOAD_STATE_SLOT_5:
+		case HK_LOAD_STATE_SLOT_6:
+		case HK_LOAD_STATE_SLOT_7:
+		case HK_LOAD_STATE_SLOT_8:
+		case HK_LOAD_STATE_SLOT_9:
+		case HK_LOAD_STATE_SLOT_10:
+			Label = wxString::Format(_("Slot %i"),
+					Id - HK_LOAD_STATE_SLOT_1 + 1);
+			break;
+
+		case HK_SAVE_STATE_SLOT_1:
+		case HK_SAVE_STATE_SLOT_2:
+		case HK_SAVE_STATE_SLOT_3:
+		case HK_SAVE_STATE_SLOT_4:
+		case HK_SAVE_STATE_SLOT_5:
+		case HK_SAVE_STATE_SLOT_6:
+		case HK_SAVE_STATE_SLOT_7:
+		case HK_SAVE_STATE_SLOT_8:
+		case HK_SAVE_STATE_SLOT_9:
+		case HK_SAVE_STATE_SLOT_10:
+			Label = wxString::Format(_("Slot %i"),
+					Id - HK_SAVE_STATE_SLOT_1 + 1);
+			break;
+		case HK_SAVE_STATE_FILE:
+			Label = _("Save State...");
+			break;
+
+		case HK_LOAD_LAST_STATE_1:
+		case HK_LOAD_LAST_STATE_2:
+		case HK_LOAD_LAST_STATE_3:
+		case HK_LOAD_LAST_STATE_4:
+		case HK_LOAD_LAST_STATE_5:
+		case HK_LOAD_LAST_STATE_6:
+		case HK_LOAD_LAST_STATE_7:
+		case HK_LOAD_LAST_STATE_8:
+			Label = wxString::Format(_("Last %i"),
+				Id - HK_LOAD_LAST_STATE_1 + 1);
+			break;
+		case HK_LOAD_STATE_FILE:
+			Label = _("Load State...");
+			break;
+
+		case HK_SAVE_FIRST_STATE: Label = _("Save Oldest State"); break;
+		case HK_UNDO_LOAD_STATE:  Label = _("Undo Load State");   break;
+		case HK_UNDO_SAVE_STATE:  Label = _("Undo Save State");   break;
+
+		case HK_SAVE_STATE_SLOT_SELECTED:
+			Label = _("Save state to selected slot");
+			break;
+
+		case HK_LOAD_STATE_SLOT_SELECTED:
+			Label = _("Load state from selected slot");
+			break;
+
+		case HK_SELECT_STATE_SLOT_1:
+		case HK_SELECT_STATE_SLOT_2:
+		case HK_SELECT_STATE_SLOT_3:
+		case HK_SELECT_STATE_SLOT_4:
+		case HK_SELECT_STATE_SLOT_5:
+		case HK_SELECT_STATE_SLOT_6:
+		case HK_SELECT_STATE_SLOT_7:
+		case HK_SELECT_STATE_SLOT_8:
+		case HK_SELECT_STATE_SLOT_9:
+		case HK_SELECT_STATE_SLOT_10:
+			Label = wxString::Format(_("Select Slot %i"), Id - HK_SELECT_STATE_SLOT_1 + 1);
+			break;
+
+
+		default:
+			Label = wxString::Format(_("Undefined %i"), Id);
+	}
+
+	return Label;
+}
+
+
+// Create toolbar items
+// ---------------------
+void CFrame::PopulateToolbar(wxToolBar* ToolBar)
+{
+	int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
+		h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
+	ToolBar->SetToolBitmapSize(wxSize(w, h));
+
+
+	WxUtils::AddToolbarButton(ToolBar, wxID_OPEN,               _("Open"),        m_Bitmaps[Toolbar_FileOpen],    _("Open file..."));
+	WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH,            _("Refresh"),     m_Bitmaps[Toolbar_Refresh],     _("Refresh game list"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE,              _("Browse"),      m_Bitmaps[Toolbar_Browse],      _("Browse for an ISO directory..."));
+	ToolBar->AddSeparator();
+	WxUtils::AddToolbarButton(ToolBar, IDM_PLAY,                _("Play"),        m_Bitmaps[Toolbar_Play],        _("Play"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_STOP,                _("Stop"),        m_Bitmaps[Toolbar_Stop],        _("Stop"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_TOGGLE_FULLSCREEN,   _("FullScr"),     m_Bitmaps[Toolbar_FullScreen],  _("Toggle Fullscreen"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_SCREENSHOT,          _("ScrShot"),     m_Bitmaps[Toolbar_Screenshot],  _("Take Screenshot"));
+	ToolBar->AddSeparator();
+	WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES,        _("Config"),      m_Bitmaps[Toolbar_ConfigMain],  _("Configure..."));
+	WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND,  _("Graphics"),    m_Bitmaps[Toolbar_ConfigGFX],   _("Graphics settings"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO,        _("Audio"),       m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings"));
+	WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS,  _("Controllers"), m_Bitmaps[Toolbar_Controller],  _("Controller settings"));
+}
+
+
+// Delete and recreate the toolbar
+void CFrame::RecreateToolbar()
+{
+	static const long TOOLBAR_STYLE = wxTB_DEFAULT_STYLE | wxTB_TEXT;
+
+	if (m_ToolBar != nullptr)
+	{
+		m_ToolBar->Destroy();
+		m_ToolBar = nullptr;
+	}
+
+	m_ToolBar = CreateToolBar(TOOLBAR_STYLE, wxID_ANY);
+
+	if (g_pCodeWindow)
+	{
+		g_pCodeWindow->PopulateToolbar(m_ToolBar);
+		m_ToolBar->AddSeparator();
+	}
+
+	PopulateToolbar(m_ToolBar);
+	// after adding the buttons to the toolbar, must call Realize() to reflect
+	// the changes
+	m_ToolBar->Realize();
+
+	UpdateGUI();
+}
+
+void CFrame::InitBitmaps()
+{
+	auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
+
+	m_Bitmaps[Toolbar_FileOpen   ].LoadFile(dir + "open.png",       wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Refresh    ].LoadFile(dir + "refresh.png",    wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Browse     ].LoadFile(dir + "browse.png",     wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Play       ].LoadFile(dir + "play.png",       wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Stop       ].LoadFile(dir + "stop.png",       wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Pause      ].LoadFile(dir + "pause.png",      wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png",     wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_ConfigGFX  ].LoadFile(dir + "graphics.png",   wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png",      wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png",    wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG);
+	m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG);
+
+	// Update in case the bitmap has been updated
+	if (m_ToolBar != nullptr)
+		RecreateToolbar();
+}
+
+// Menu items
+
+// Start the game or change the disc.
+// Boot priority:
+// 1. Show the game list and boot the selected game.
+// 2. Default ISO
+// 3. Boot last selected game
+void CFrame::BootGame(const std::string& filename)
+{
+	std::string bootfile = filename;
+	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+		return;
+
+	// Start filename if non empty.
+	// Start the selected ISO, or try one of the saved paths.
+	// If all that fails, ask to add a dir and don't boot
+	if (bootfile.empty())
+	{
+		if (m_GameListCtrl->GetSelectedISO() != nullptr)
+		{
+			if (m_GameListCtrl->GetSelectedISO()->IsValid())
+				bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName();
+		}
+		else if (!StartUp.m_strDefaultISO.empty() &&
+		         File::Exists(StartUp.m_strDefaultISO))
+		{
+			bootfile = StartUp.m_strDefaultISO;
+		}
+		else
+		{
+			if (!SConfig::GetInstance().m_LastFilename.empty() &&
+			    File::Exists(SConfig::GetInstance().m_LastFilename))
+			{
+				bootfile = SConfig::GetInstance().m_LastFilename;
+			}
+			else
+			{
+				m_GameListCtrl->BrowseForDirectory();
+				return;
+			}
+		}
+	}
+	if (!bootfile.empty())
+	{
+		StartGame(bootfile);
+		if (UseDebugger && g_pCodeWindow)
+		{
+			if (g_pCodeWindow->m_WatchWindow)
+				g_pCodeWindow->m_WatchWindow->LoadAll();
+			if (g_pCodeWindow->m_BreakpointWindow)
+				g_pCodeWindow->m_BreakpointWindow->LoadAll();
+		}
+	}
+}
+
+// Open file to boot
+void CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
+{
+	if (Core::GetState() == Core::CORE_UNINITIALIZED)
+		DoOpen(true);
+}
+
+void CFrame::DoOpen(bool Boot)
+{
+	std::string currentDir = File::GetCurrentDir();
+
+	wxString path = wxFileSelector(
+			_("Select the file to load"),
+			wxEmptyString, wxEmptyString, wxEmptyString,
+			_("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") +
+			wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad;*.dff;*.tmd|%s",
+				wxGetTranslation(wxALL_FILES)),
+			wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+			this);
+
+	if (path.IsEmpty())
+		return;
+
+	std::string currentDir2 = File::GetCurrentDir();
+
+	if (currentDir != currentDir2)
+	{
+		PanicAlertT("Current directory changed from %s to %s after wxFileSelector!",
+				currentDir.c_str(), currentDir2.c_str());
+		File::SetCurrentDir(currentDir);
+	}
+
+	// Should we boot a new game or just change the disc?
+	if (Boot && !path.IsEmpty())
+	{
+		BootGame(WxStrToStr(path));
+	}
+	else
+	{
+		DVDInterface::ChangeDisc(WxStrToStr(path));
+	}
+}
+
+void CFrame::OnRecordReadOnly(wxCommandEvent& event)
+{
+	Movie::SetReadOnly(event.IsChecked());
+}
+
+void CFrame::OnTASInput(wxCommandEvent& event)
+{
+	for (int i = 0; i < 4; ++i)
+	{
+		if (SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_NONE && SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_GC_GBA)
+		{
+			g_TASInputDlg[i]->CreateGCLayout();
+			g_TASInputDlg[i]->Show();
+			g_TASInputDlg[i]->SetTitle(wxString::Format(_("TAS Input - Controller %d"), i + 1));
+		}
+
+		if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU && !(Core::IsRunning() && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii))
+		{
+			g_TASInputDlg[i+4]->CreateWiiLayout(i);
+			g_TASInputDlg[i+4]->Show();
+			g_TASInputDlg[i+4]->SetTitle(wxString::Format(_("TAS Input - Wiimote %d"), i + 1));
+		}
+	}
+}
+
+void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
+{
+	SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnToggleDumpFrames(wxCommandEvent& WXUNUSED(event))
+{
+	SConfig::GetInstance().m_DumpFrames = !SConfig::GetInstance().m_DumpFrames;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event))
+{
+	SConfig::GetInstance().m_DumpAudio = !SConfig::GetInstance().m_DumpAudio;
+}
+
+void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event))
+{
+	SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnShowFrameCount(wxCommandEvent& WXUNUSED (event))
+{
+	SConfig::GetInstance().m_ShowFrameCount = !SConfig::GetInstance().m_ShowFrameCount;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnShowInputDisplay(wxCommandEvent& WXUNUSED(event))
+{
+	SConfig::GetInstance().m_ShowInputDisplay = !SConfig::GetInstance().m_ShowInputDisplay;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnFrameStep(wxCommandEvent& event)
+{
+	bool wasPaused = (Core::GetState() == Core::CORE_PAUSE);
+
+	Movie::DoFrameStep();
+
+	bool isPaused = (Core::GetState() == Core::CORE_PAUSE);
+	if (isPaused && !wasPaused) // don't update on unpause, otherwise the status would be wrong when pausing next frame
+		UpdateGUI();
+}
+
+void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
+{
+	DoOpen(false);
+}
+
+void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
+{
+	if ((!Core::IsRunningAndStarted() && Core::IsRunning()) || Movie::IsRecordingInput() || Movie::IsPlayingInput())
+		return;
+
+	int controllers = 0;
+
+	if (Movie::IsReadOnly())
+	{
+		// The user just chose to record a movie, so that should take precedence
+		Movie::SetReadOnly(false);
+		GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(false);
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
+			controllers |= (1 << i);
+
+		if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
+			controllers |= (1 << (i + 4));
+	}
+
+	if (Movie::BeginRecordingInput(controllers))
+		BootGame("");
+}
+
+void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event))
+{
+	wxString path = wxFileSelector(
+			_("Select The Recording File"),
+			wxEmptyString, wxEmptyString, wxEmptyString,
+			_("Dolphin TAS Movies (*.dtm)") +
+				wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)),
+			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
+			this);
+
+	if (path.IsEmpty())
+		return;
+
+	if (!Movie::IsReadOnly())
+	{
+		// let's make the read-only flag consistent at the start of a movie.
+		Movie::SetReadOnly(true);
+		GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check();
+	}
+
+	if (Movie::PlayInput(WxStrToStr(path)))
+		BootGame("");
+}
+
+void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED (event))
+{
+	DoRecordingSave();
+}
+
+void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
+{
+	if (Core::IsRunning())
+	{
+		// Core is initialized and emulator is running
+		if (UseDebugger)
+		{
+			if (CCPU::IsStepping())
+				CCPU::EnableStepping(false);
+			else
+				CCPU::EnableStepping(true);  // Break
+
+			wxThread::Sleep(20);
+			g_pCodeWindow->JumpToAddress(PC);
+			g_pCodeWindow->Update();
+			// Update toolbar with Play/Pause status
+			UpdateGUI();
+		}
+		else
+		{
+			DoPause();
+		}
+	}
+	else
+	{
+		// Core is uninitialized, start the game
+		BootGame("");
+	}
+}
+
+void CFrame::OnRenderParentClose(wxCloseEvent& event)
+{
+	// Before closing the window we need to shut down the emulation core.
+	// We'll try to close this window again once that is done.
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		DoStop();
+		if (event.CanVeto())
+		{
+			event.Veto();
+		}
+		return;
+	}
+
+	event.Skip();
+}
+
+void CFrame::OnRenderParentMove(wxMoveEvent& event)
+{
+	if (Core::GetState() != Core::CORE_UNINITIALIZED &&
+		!RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
+	{
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos = m_RenderFrame->GetPosition().x;
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos = m_RenderFrame->GetPosition().y;
+	}
+	event.Skip();
+}
+
+void CFrame::OnRenderParentResize(wxSizeEvent& event)
+{
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		int width, height;
+		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+			!RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
+		{
+			m_RenderFrame->GetClientSize(&width, &height);
+			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
+			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight = height;
+		}
+		m_LogWindow->Refresh();
+		m_LogWindow->Update();
+	}
+	event.Skip();
+}
+
+void CFrame::ToggleDisplayMode(bool bFullscreen)
+{
+#ifdef _WIN32
+	if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
+	{
+		DEVMODE dmScreenSettings;
+		memset(&dmScreenSettings, 0, sizeof(dmScreenSettings));
+		dmScreenSettings.dmSize = sizeof(dmScreenSettings);
+		sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
+				"%dx%d", &dmScreenSettings.dmPelsWidth, &dmScreenSettings.dmPelsHeight);
+		dmScreenSettings.dmBitsPerPel = 32;
+		dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
+
+		// Try To Set Selected Mode And Get Results.  NOTE: CDS_FULLSCREEN Gets Rid Of Start Bar.
+		ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN);
+	}
+	else
+	{
+		// Change to default resolution
+		ChangeDisplaySettings(nullptr, CDS_FULLSCREEN);
+	}
+#elif defined(HAVE_XRANDR) && HAVE_XRANDR
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
+		m_XRRConfig->ToggleDisplayMode(bFullscreen);
+#endif
+}
+
+// Prepare the GUI to start the game.
+void CFrame::StartGame(const std::string& filename)
+{
+	if (m_bGameLoading)
+		return;
+	m_bGameLoading = true;
+
+	if (m_ToolBar)
+		m_ToolBar->EnableTool(IDM_PLAY, false);
+	GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+	{
+		// Game has been started, hide the game list
+		m_GameListCtrl->Disable();
+		m_GameListCtrl->Hide();
+
+		m_RenderParent = m_Panel;
+		m_RenderFrame = this;
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)
+			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() | wxSTAY_ON_TOP);
+		else
+			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
+
+		// No, I really don't want TAB_TRAVERSAL being set behind my back,
+		// thanks.  (Note that calling DisableSelfFocus would prevent this flag
+		// from being set for new children, but wouldn't reset the existing
+		// flag.)
+		m_RenderParent->SetWindowStyle(m_RenderParent->GetWindowStyle() & ~wxTAB_TRAVERSAL);
+	}
+	else
+	{
+		wxPoint position(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos,
+				SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos);
+#ifdef __APPLE__
+		// On OS X, the render window's title bar is not visible,
+		// and the window therefore not easily moved, when the
+		// position is 0,0. Weed out the 0's from existing configs.
+		if (position == wxPoint(0, 0))
+			position = wxDefaultPosition;
+#endif
+
+		wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
+				SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
+#ifdef _WIN32
+		// Out of desktop check
+		int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
+		int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
+		int width =  GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+		if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y)
+			position.x = position.y = wxDefaultCoord;
+#endif
+		m_RenderFrame = new CRenderFrame((wxFrame*)this, wxID_ANY, _("Dolphin"), position);
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)
+			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() | wxSTAY_ON_TOP);
+		else
+			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
+
+		m_RenderFrame->SetBackgroundColour(*wxBLACK);
+		m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight());
+		m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this);
+		m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this);
+		m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this);
+#ifdef _WIN32
+		// The renderer should use a top-level window for exclusive fullscreen support.
+		m_RenderParent = m_RenderFrame;
+#else
+		// To capture key events on Linux and Mac OS X the frame needs at least one child.
+		m_RenderParent = new wxPanel(m_RenderFrame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
+#endif
+
+		m_RenderFrame->Show();
+	}
+
+#if defined(__APPLE__)
+	NSView *view = (NSView *) m_RenderFrame->GetHandle();
+	NSWindow *window = [view window];
+
+	[window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+#endif
+
+	wxBeginBusyCursor();
+
+	DoFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen);
+
+	if (!BootManager::BootCore(filename))
+	{
+		DoFullscreen(false);
+		// Destroy the renderer frame when not rendering to main
+		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+			m_RenderFrame->Destroy();
+		m_RenderParent = nullptr;
+		m_bGameLoading = false;
+		UpdateGUI();
+	}
+	else
+	{
+#if defined(HAVE_X11) && HAVE_X11
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
+		X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()),
+				X11Utils::XWindowFromHandle(GetHandle()), true);
+#endif
+
+		m_RenderParent->SetFocus();
+
+		wxTheApp->Bind(wxEVT_RIGHT_DOWN,   &CFrame::OnMouse,       this);
+		wxTheApp->Bind(wxEVT_RIGHT_UP,     &CFrame::OnMouse,       this);
+		wxTheApp->Bind(wxEVT_MIDDLE_DOWN,  &CFrame::OnMouse,       this);
+		wxTheApp->Bind(wxEVT_MIDDLE_UP,    &CFrame::OnMouse,       this);
+		wxTheApp->Bind(wxEVT_MOTION,       &CFrame::OnMouse,       this);
+		wxTheApp->Bind(wxEVT_SET_FOCUS,    &CFrame::OnFocusChange, this);
+		wxTheApp->Bind(wxEVT_KILL_FOCUS,   &CFrame::OnFocusChange, this);
+		m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
+	}
+
+	wxEndBusyCursor();
+}
+
+void CFrame::OnBootDrive(wxCommandEvent& event)
+{
+	BootGame(drives[event.GetId()-IDM_DRIVE1]);
+}
+
+// Refresh the file list and browse for a favorites directory
+void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event))
+{
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->Update();
+	}
+}
+
+
+void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event))
+{
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->BrowseForDirectory();
+	}
+}
+
+// Create screenshot
+void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event))
+{
+	Core::SaveScreenShot();
+}
+
+// Pause the emulation
+void CFrame::DoPause()
+{
+	if (Core::GetState() == Core::CORE_RUN)
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+			m_RenderParent->SetCursor(wxNullCursor);
+		Core::UpdateTitle();
+	}
+	else
+	{
+		Core::SetState(Core::CORE_RUN);
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
+				RendererHasFocus())
+			m_RenderParent->SetCursor(wxCURSOR_BLANK);
+	}
+	UpdateGUI();
+}
+
+// Stop the emulation
+void CFrame::DoStop()
+{
+	if (!Core::IsRunningAndStarted())
+		return;
+	if (m_confirmStop)
+		return;
+
+	// don't let this function run again until it finishes, or is aborted.
+	m_confirmStop = true;
+
+	m_bGameLoading = false;
+	if (Core::GetState() != Core::CORE_UNINITIALIZED ||
+			m_RenderParent != nullptr)
+	{
+#if defined __WXGTK__
+		wxMutexGuiLeave();
+		std::lock_guard<std::recursive_mutex> lk(keystate_lock);
+		wxMutexGuiEnter();
+#endif
+		// Ask for confirmation in case the user accidentally clicked Stop / Escape
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop)
+		{
+			// Exit fullscreen to ensure it does not cover the stop dialog.
+			DoFullscreen(false);
+
+			// Pause the state during confirmation and restore it afterwards
+			Core::EState state = Core::GetState();
+
+			// If exclusive fullscreen is not enabled then we can pause the emulation
+			// before we've exited fullscreen. If not then we need to exit fullscreen first.
+			if (!RendererIsFullscreen() || !g_Config.ExclusiveFullscreenEnabled() ||
+				SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+			{
+				Core::SetState(Core::CORE_PAUSE);
+			}
+
+			wxMessageDialog m_StopDlg(
+				this,
+				_("Do you want to stop the current emulation?"),
+				_("Please confirm..."),
+				wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
+				wxDefaultPosition);
+
+			int Ret = m_StopDlg.ShowModal();
+			if (Ret != wxID_YES)
+			{
+				Core::SetState(state);
+				m_confirmStop = false;
+				return;
+			}
+		}
+
+		if (UseDebugger && g_pCodeWindow)
+		{
+			if (g_pCodeWindow->m_WatchWindow)
+			{
+				g_pCodeWindow->m_WatchWindow->SaveAll();
+				PowerPC::watches.Clear();
+			}
+			if (g_pCodeWindow->m_BreakpointWindow)
+			{
+				g_pCodeWindow->m_BreakpointWindow->SaveAll();
+				PowerPC::breakpoints.Clear();
+				PowerPC::memchecks.Clear();
+				g_pCodeWindow->m_BreakpointWindow->NotifyUpdate();
+			}
+			g_symbolDB.Clear();
+			Host_NotifyMapLoaded();
+		}
+
+		// TODO: Show the author/description dialog here
+		if (Movie::IsRecordingInput())
+			DoRecordingSave();
+		if (Movie::IsMovieActive())
+			Movie::EndPlayInput(false);
+
+		if (NetPlayDialog::GetNetPlayClient())
+			NetPlayDialog::GetNetPlayClient()->Stop();
+
+		BootManager::Stop();
+		UpdateGUI();
+	}
+}
+
+void CFrame::OnStopped()
+{
+	m_confirmStop = false;
+
+#if defined(HAVE_X11) && HAVE_X11
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
+		X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()),
+				X11Utils::XWindowFromHandle(GetHandle()), false);
+#endif
+	m_RenderFrame->SetTitle(StrToWxStr(scm_rev_str));
+
+	// Destroy the renderer frame when not rendering to main
+	m_RenderParent->Unbind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
+
+	// Mouse
+	wxTheApp->Unbind(wxEVT_RIGHT_DOWN,  &CFrame::OnMouse, this);
+	wxTheApp->Unbind(wxEVT_RIGHT_UP,    &CFrame::OnMouse, this);
+	wxTheApp->Unbind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this);
+	wxTheApp->Unbind(wxEVT_MIDDLE_UP,   &CFrame::OnMouse, this);
+	wxTheApp->Unbind(wxEVT_MOTION,      &CFrame::OnMouse, this);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+		m_RenderParent->SetCursor(wxNullCursor);
+	DoFullscreen(false);
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+	{
+		m_RenderFrame->Destroy();
+	}
+	else
+	{
+#if defined(__APPLE__)
+		// Disable the full screen button when not in a game.
+		NSView *view = (NSView *)m_RenderFrame->GetHandle();
+		NSWindow *window = [view window];
+
+		[window setCollectionBehavior : NSWindowCollectionBehaviorDefault];
+#endif
+
+		// Make sure the window is not longer set to stay on top
+		m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
+	}
+	m_RenderParent = nullptr;
+
+	// Clean framerate indications from the status bar.
+	GetStatusBar()->SetStatusText(" ", 0);
+
+	// Clear wiimote connection status from the status bar.
+	GetStatusBar()->SetStatusText(" ", 1);
+
+	// If batch mode was specified on the command-line or we were already closing, exit now.
+	if (m_bBatchMode || m_bClosing)
+		Close(true);
+
+	// If using auto size with render to main, reset the application size.
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)
+		SetSize(SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth,
+		SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight);
+
+	m_GameListCtrl->Enable();
+	m_GameListCtrl->Show();
+	m_GameListCtrl->SetFocus();
+	UpdateGUI();
+}
+
+void CFrame::DoRecordingSave()
+{
+	bool paused = (Core::GetState() == Core::CORE_PAUSE);
+
+	if (!paused)
+		DoPause();
+
+	wxString path = wxFileSelector(
+			_("Select The Recording File"),
+			wxEmptyString, wxEmptyString, wxEmptyString,
+			_("Dolphin TAS Movies (*.dtm)") +
+				wxString::Format("|*.dtm|%s", wxGetTranslation(wxALL_FILES)),
+			wxFD_SAVE | wxFD_PREVIEW | wxFD_OVERWRITE_PROMPT,
+			this);
+
+	if (path.IsEmpty())
+		return;
+
+	Movie::SaveRecording(WxStrToStr(path));
+
+	if (!paused)
+		DoPause();
+}
+
+void CFrame::OnStop(wxCommandEvent& WXUNUSED (event))
+{
+	DoStop();
+}
+
+void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
+{
+	if (Movie::IsRecordingInput())
+		Movie::g_bReset = true;
+	ProcessorInterface::ResetButton_Tap();
+}
+
+void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
+{
+	CConfigMain ConfigMain(this);
+	if (ConfigMain.ShowModal() == wxID_OK)
+		m_GameListCtrl->Update();
+	UpdateGUI();
+}
+
+void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event))
+{
+	if (g_video_backend)
+		g_video_backend->ShowConfig(this);
+}
+
+void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event))
+{
+	CConfigMain ConfigMain(this);
+	ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE);
+	if (ConfigMain.ShowModal() == wxID_OK)
+		m_GameListCtrl->Update();
+}
+
+void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED (event))
+{
+	ControllerConfigDiag config_dlg(this);
+	config_dlg.ShowModal();
+}
+
+void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
+{
+	InputConfig* const hotkey_plugin = HotkeyManagerEmu::GetConfig();
+
+	// check if game is running
+	bool game_running = false;
+	if (Core::GetState() == Core::CORE_RUN)
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		game_running = true;
+	}
+
+	HotkeyManagerEmu::Enable(false);
+
+	InputConfigDialog m_ConfigFrame(this, *hotkey_plugin, _("Dolphin Hotkeys"));
+	m_ConfigFrame.ShowModal();
+
+	// Update references in case controllers were refreshed
+	Wiimote::LoadConfig();
+	Keyboard::LoadConfig();
+	Pad::LoadConfig();
+	HotkeyManagerEmu::LoadConfig();
+
+	HotkeyManagerEmu::Enable(true);
+
+	// if game isn't running
+	if (game_running)
+	{
+		Core::SetState(Core::CORE_RUN);
+	}
+
+	// Update the GUI in case menu accelerators were changed
+	UpdateGUI();
+}
+
+void CFrame::OnHelp(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case wxID_ABOUT:
+		{
+			AboutDolphin frame(this);
+			frame.ShowModal();
+		}
+		break;
+	case IDM_HELP_WEBSITE:
+		WxUtils::Launch("https://dolphin-emu.org/");
+		break;
+	case IDM_HELP_ONLINE_DOCS:
+		WxUtils::Launch("https://dolphin-emu.org/docs/guides/");
+		break;
+	case IDM_HELP_GITHUB:
+		WxUtils::Launch("https://github.com/dolphin-emu/dolphin");
+		break;
+	}
+}
+
+void CFrame::ClearStatusBar()
+{
+	if (this->GetStatusBar()->IsEnabled())
+	{
+		this->GetStatusBar()->SetStatusText("", 0);
+	}
+}
+
+void CFrame::StatusBarMessage(const char * Text, ...)
+{
+	const int MAX_BYTES = 1024 * 10;
+	char Str[MAX_BYTES];
+	va_list ArgPtr;
+	va_start(ArgPtr, Text);
+	vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
+	va_end(ArgPtr);
+
+	if (this->GetStatusBar()->IsEnabled())
+	{
+		this->GetStatusBar()->SetStatusText(StrToWxStr(Str), 0);
+	}
+}
+
+
+// Miscellaneous menus
+// ---------------------
+// NetPlay stuff
+void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
+{
+	if (!g_NetPlaySetupDiag)
+	{
+		if (NetPlayDialog::GetInstance() != nullptr)
+			NetPlayDialog::GetInstance()->Raise();
+		else
+			g_NetPlaySetupDiag = new NetPlaySetupFrame(this, m_GameListCtrl);
+	}
+	else
+	{
+		g_NetPlaySetupDiag->Raise();
+	}
+}
+
+void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
+{
+	CMemcardManager MemcardManager(this);
+	MemcardManager.ShowModal();
+}
+
+void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED (event))
+{
+	CWiiSaveCrypted::ExportAllSaves();
+}
+
+void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event))
+{
+	wxString path = wxFileSelector(_("Select the save file"),
+			wxEmptyString, wxEmptyString, wxEmptyString,
+			_("Wii save files (*.bin)|*.bin"),
+			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
+			this);
+
+	if (!path.IsEmpty())
+	{
+		CWiiSaveCrypted::ImportWiiSave(WxStrToStr(path));
+	}
+}
+
+void CFrame::OnShowCheatsWindow(wxCommandEvent& WXUNUSED (event))
+{
+	if (!g_CheatsWindow)
+		g_CheatsWindow = new wxCheatsWindow(this);
+	else
+		g_CheatsWindow->Raise();
+}
+
+void CFrame::OnLoadWiiMenu(wxCommandEvent& WXUNUSED(event))
+{
+	BootGame(Common::GetTitleContentPath(TITLEID_SYSMENU));
+}
+
+void CFrame::OnInstallWAD(wxCommandEvent& event)
+{
+	std::string fileName;
+
+	switch (event.GetId())
+	{
+	case IDM_LIST_INSTALL_WAD:
+	{
+		const GameListItem *iso = m_GameListCtrl->GetSelectedISO();
+		if (!iso)
+			return;
+		fileName = iso->GetFileName();
+		break;
+	}
+	case IDM_MENU_INSTALL_WAD:
+	{
+		wxString path = wxFileSelector(
+			_("Select a Wii WAD file to install"),
+			wxEmptyString, wxEmptyString, wxEmptyString,
+			"Wii WAD file (*.wad)|*.wad",
+			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
+			this);
+		fileName = WxStrToStr(path);
+		break;
+	}
+	default:
+		return;
+	}
+
+	wxProgressDialog dialog(_("Installing WAD..."),
+		_("Working..."),
+		1000,
+		this,
+		wxPD_APP_MODAL |
+		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+		wxPD_SMOOTH
+		);
+
+	u64 titleID = DiscIO::CNANDContentManager::Access().Install_WiiWAD(fileName);
+	if (titleID == TITLEID_SYSMENU)
+	{
+		UpdateWiiMenuChoice();
+	}
+}
+
+
+void CFrame::UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem)
+{
+	if (!WiiMenuItem)
+	{
+		WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
+	}
+
+	const DiscIO::INANDContentLoader & SysMenu_Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU, true);
+	if (SysMenu_Loader.IsValid())
+	{
+		int sysmenuVersion = SysMenu_Loader.GetTitleVersion();
+		char sysmenuRegion = SysMenu_Loader.GetCountryChar();
+		WiiMenuItem->Enable();
+		WiiMenuItem->SetItemLabel(wxString::Format(_("Load Wii System Menu %d%c"), sysmenuVersion, sysmenuRegion));
+	}
+	else
+	{
+		WiiMenuItem->Enable(false);
+		WiiMenuItem->SetItemLabel(_("Load Wii System Menu"));
+	}
+}
+
+void CFrame::OnFifoPlayer(wxCommandEvent& WXUNUSED (event))
+{
+	if (m_FifoPlayerDlg)
+	{
+		m_FifoPlayerDlg->Show();
+		m_FifoPlayerDlg->SetFocus();
+	}
+	else
+	{
+		m_FifoPlayerDlg = new FifoPlayerDlg(this);
+	}
+}
+
+void CFrame::ConnectWiimote(int wm_idx, bool connect)
+{
+	if (Core::IsRunning() && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		bool was_unpaused = Core::PauseAndLock(true);
+		GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
+		wxString msg(wxString::Format(_("Wiimote %i %s"), wm_idx + 1,
+					connect ? _("Connected") : _("Disconnected")));
+		Core::DisplayMessage(WxStrToStr(msg), 3000);
+		Host_UpdateMainFrame();
+		Core::PauseAndLock(false, was_unpaused);
+	}
+}
+
+void CFrame::OnConnectWiimote(wxCommandEvent& event)
+{
+	bool was_unpaused = Core::PauseAndLock(true);
+	ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, !GetUsbPointer()->AccessWiiMote((event.GetId() - IDM_CONNECT_WIIMOTE1) | 0x100)->IsConnected());
+	Core::PauseAndLock(false, was_unpaused);
+}
+
+// Toggle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover
+// the entire screen (when we render to the main window).
+void CFrame::OnToggleFullscreen(wxCommandEvent& WXUNUSED (event))
+{
+	DoFullscreen(!RendererIsFullscreen());
+}
+
+void CFrame::OnToggleDualCore(wxCommandEvent& WXUNUSED (event))
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED (event))
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle = !SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle;
+	SConfig::GetInstance().SaveSettings();
+}
+
+void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
+{
+	wxString path = wxFileSelector(
+		_("Select the state to load"),
+		wxEmptyString, wxEmptyString, wxEmptyString,
+		_("All Save States (sav, s##)") +
+			wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)),
+		wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
+		this);
+
+	if (!path.IsEmpty())
+		State::LoadAs(WxStrToStr(path));
+}
+
+void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event))
+{
+	wxString path = wxFileSelector(
+		_("Select the state to save"),
+		wxEmptyString, wxEmptyString, wxEmptyString,
+		_("All Save States (sav, s##)") +
+			wxString::Format("|*.sav;*.s??|%s", wxGetTranslation(wxALL_FILES)),
+		wxFD_SAVE,
+		this);
+
+	if (!path.IsEmpty())
+		State::SaveAs(WxStrToStr(path));
+}
+
+void CFrame::OnLoadLastState(wxCommandEvent& event)
+{
+	if (Core::IsRunningAndStarted())
+	{
+		int id = event.GetId();
+		int slot = id - IDM_LOAD_LAST_1 + 1;
+		State::LoadLastSaved(slot);
+	}
+}
+
+void CFrame::OnSaveFirstState(wxCommandEvent& WXUNUSED(event))
+{
+	if (Core::IsRunningAndStarted())
+		State::SaveFirstSaved();
+}
+
+void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED (event))
+{
+	if (Core::IsRunningAndStarted())
+		State::UndoLoadState();
+}
+
+void CFrame::OnUndoSaveState(wxCommandEvent& WXUNUSED (event))
+{
+	if (Core::IsRunningAndStarted())
+		State::UndoSaveState();
+}
+
+
+void CFrame::OnLoadState(wxCommandEvent& event)
+{
+	if (Core::IsRunningAndStarted())
+	{
+		int id = event.GetId();
+		int slot = id - IDM_LOAD_SLOT_1 + 1;
+		State::Load(slot);
+	}
+}
+
+void CFrame::OnSaveState(wxCommandEvent& event)
+{
+	if (Core::IsRunningAndStarted())
+	{
+		int id = event.GetId();
+		int slot = id - IDM_SAVE_SLOT_1 + 1;
+		State::Save(slot);
+	}
+}
+
+void CFrame::OnFrameSkip(wxCommandEvent& event)
+{
+	int amount = event.GetId() - IDM_FRAME_SKIP_0;
+
+	Movie::SetFrameSkipping((unsigned int)amount);
+	SConfig::GetInstance().m_FrameSkip = amount;
+}
+
+void CFrame::OnSelectSlot(wxCommandEvent& event)
+{
+	g_saveSlot = event.GetId() - IDM_SELECT_SLOT_1 + 1;
+	Core::DisplayMessage(StringFromFormat("Selected slot %d", g_saveSlot), 1000);
+}
+
+void CFrame::OnLoadCurrentSlot(wxCommandEvent& event)
+{
+	if (Core::IsRunningAndStarted())
+	{
+		State::Load(g_saveSlot);
+	}
+}
+
+void CFrame::OnSaveCurrentSlot(wxCommandEvent& event)
+{
+	if (Core::IsRunningAndStarted())
+	{
+		State::Save(g_saveSlot);
+	}
+}
+
+
+
+// GUI
+// ---------------------
+
+// Update the enabled/disabled status
+void CFrame::UpdateGUI()
+{
+	// Save status
+	bool Initialized     = Core::IsRunning();
+	bool Running         = Core::GetState() == Core::CORE_RUN;
+	bool Paused          = Core::GetState() == Core::CORE_PAUSE;
+	bool Stopping        = Core::GetState() == Core::CORE_STOPPING;
+	bool RunningWii      = Initialized && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
+
+	// Make sure that we have a toolbar
+	if (m_ToolBar)
+	{
+		// Enable/disable the Config and Stop buttons
+		m_ToolBar->EnableTool(wxID_OPEN, !Initialized);
+		// Don't allow refresh when we don't show the list
+		m_ToolBar->EnableTool(wxID_REFRESH, !Initialized);
+		m_ToolBar->EnableTool(IDM_STOP, Running || Paused);
+		m_ToolBar->EnableTool(IDM_TOGGLE_FULLSCREEN, Running || Paused);
+		m_ToolBar->EnableTool(IDM_SCREENSHOT, Running || Paused);
+	}
+
+	// File
+	GetMenuBar()->FindItem(wxID_OPEN)->Enable(!Initialized);
+	GetMenuBar()->FindItem(IDM_DRIVES)->Enable(!Initialized);
+	GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!Initialized);
+	GetMenuBar()->FindItem(IDM_BROWSE)->Enable(!Initialized);
+
+	// Emulation
+	GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused);
+	GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused);
+	GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput());
+	GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(!Initialized);
+	GetMenuBar()->FindItem(IDM_RECORD_EXPORT)->Enable(Movie::IsMovieActive());
+	GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused);
+	GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused);
+	GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused);
+
+	// Update Key Shortcuts
+	for (unsigned int i = 0; i < NUM_HOTKEYS; i++)
+	{
+		if (GetCmdForHotkey(i) == -1)
+			continue;
+		if (GetMenuBar()->FindItem(GetCmdForHotkey(i)))
+			GetMenuBar()->FindItem(GetCmdForHotkey(i))->SetItemLabel(GetMenuLabel(i));
+	}
+
+	GetMenuBar()->FindItem(IDM_LOAD_STATE)->Enable(Initialized);
+	GetMenuBar()->FindItem(IDM_SAVE_STATE)->Enable(Initialized);
+	// Misc
+	GetMenuBar()->FindItem(IDM_CHANGE_DISC)->Enable(Initialized);
+	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
+		GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable(!Initialized);
+
+	// Tools
+	GetMenuBar()->FindItem(IDM_CHEATS)->Enable(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
+
+	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(RunningWii);
+	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Enable(RunningWii);
+	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Enable(RunningWii);
+	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Enable(RunningWii);
+	GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Enable(RunningWii);
+	if (RunningWii)
+	{
+		bool was_unpaused = Core::PauseAndLock(true);
+		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0100)->IsConnected());
+		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0101)->IsConnected());
+		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0102)->IsConnected());
+		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0103)->IsConnected());
+		GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0104)->IsConnected());
+		Core::PauseAndLock(false, was_unpaused);
+	}
+
+	if (m_ToolBar)
+	{
+		// Get the tool that controls pausing/playing
+		wxToolBarToolBase * PlayTool = m_ToolBar->FindById(IDM_PLAY);
+
+		if (PlayTool)
+		{
+			if (Running)
+			{
+				PlayTool->SetLabel(_("Pause"));
+				PlayTool->SetShortHelp(_("Pause"));
+				m_ToolBar->SetToolNormalBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Pause]);
+			}
+			else
+			{
+				PlayTool->SetLabel(_("Play"));
+				PlayTool->SetShortHelp(_("Play"));
+				m_ToolBar->SetToolNormalBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Play]);
+			}
+		}
+	}
+
+	GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Enable(Running || Paused);
+
+	if (!Initialized && !m_bGameLoading)
+	{
+		if (m_GameListCtrl->IsEnabled())
+		{
+			// Prepare to load Default ISO, enable play button
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO.empty())
+			{
+				if (m_ToolBar)
+					m_ToolBar->EnableTool(IDM_PLAY, true);
+				GetMenuBar()->FindItem(IDM_PLAY)->Enable();
+				GetMenuBar()->FindItem(IDM_RECORD)->Enable();
+				GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
+			}
+			// Prepare to load last selected file, enable play button
+			else if (!SConfig::GetInstance().m_LastFilename.empty() &&
+			         File::Exists(SConfig::GetInstance().m_LastFilename))
+			{
+				if (m_ToolBar)
+					m_ToolBar->EnableTool(IDM_PLAY, true);
+				GetMenuBar()->FindItem(IDM_PLAY)->Enable();
+				GetMenuBar()->FindItem(IDM_RECORD)->Enable();
+				GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
+			}
+			else
+			{
+				// No game has been selected yet, disable play button
+				if (m_ToolBar)
+					m_ToolBar->EnableTool(IDM_PLAY, false);
+				GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
+				GetMenuBar()->FindItem(IDM_RECORD)->Enable(false);
+				GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(false);
+			}
+		}
+
+		// Game has not started, show game list
+		if (!m_GameListCtrl->IsShown())
+		{
+			m_GameListCtrl->Enable();
+			m_GameListCtrl->Show();
+		}
+		// Game has been selected but not started, enable play button
+		if (m_GameListCtrl->GetSelectedISO() != nullptr && m_GameListCtrl->IsEnabled())
+		{
+			if (m_ToolBar)
+				m_ToolBar->EnableTool(IDM_PLAY, true);
+			GetMenuBar()->FindItem(IDM_PLAY)->Enable();
+			GetMenuBar()->FindItem(IDM_RECORD)->Enable();
+			GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
+		}
+	}
+	else if (Initialized)
+	{
+		// Game has been loaded, enable the pause button
+		if (m_ToolBar)
+			m_ToolBar->EnableTool(IDM_PLAY, !Stopping);
+		GetMenuBar()->FindItem(IDM_PLAY)->Enable(!Stopping);
+
+		// Reset game loading flag
+		m_bGameLoading = false;
+	}
+
+	// Refresh toolbar
+	if (m_ToolBar)
+	{
+		m_ToolBar->Refresh();
+	}
+
+	// Commit changes to manager
+	m_Mgr->Update();
+
+	// Update non-modal windows
+	if (g_CheatsWindow)
+	{
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
+			g_CheatsWindow->UpdateGUI();
+		else
+			g_CheatsWindow->Close();
+	}
+}
+
+void CFrame::UpdateGameList()
+{
+	m_GameListCtrl->Update();
+}
+
+void CFrame::GameListChanged(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case IDM_LIST_WII:
+		SConfig::GetInstance().m_ListWii = event.IsChecked();
+		break;
+	case IDM_LIST_GC:
+		SConfig::GetInstance().m_ListGC = event.IsChecked();
+		break;
+	case IDM_LIST_WAD:
+		SConfig::GetInstance().m_ListWad = event.IsChecked();
+		break;
+	case IDM_LIST_JAP:
+		SConfig::GetInstance().m_ListJap = event.IsChecked();
+		break;
+	case IDM_LIST_PAL:
+		SConfig::GetInstance().m_ListPal = event.IsChecked();
+		break;
+	case IDM_LIST_USA:
+		SConfig::GetInstance().m_ListUsa = event.IsChecked();
+		break;
+	case IDM_LIST_AUSTRALIA:
+		SConfig::GetInstance().m_ListAustralia = event.IsChecked();
+		break;
+	case IDM_LIST_FRANCE:
+		SConfig::GetInstance().m_ListFrance = event.IsChecked();
+		break;
+	case IDM_LIST_GERMANY:
+		SConfig::GetInstance().m_ListGermany = event.IsChecked();
+		break;
+	case IDM_LIST_ITALY:
+		SConfig::GetInstance().m_ListItaly = event.IsChecked();
+		break;
+	case IDM_LIST_KOREA:
+		SConfig::GetInstance().m_ListKorea = event.IsChecked();
+		break;
+	case IDM_LIST_NETHERLANDS:
+		SConfig::GetInstance().m_ListNetherlands = event.IsChecked();
+		break;
+	case IDM_LIST_RUSSIA:
+		SConfig::GetInstance().m_ListRussia = event.IsChecked();
+		break;
+	case IDM_LIST_SPAIN:
+		SConfig::GetInstance().m_ListSpain = event.IsChecked();
+		break;
+	case IDM_LIST_TAIWAN:
+		SConfig::GetInstance().m_ListTaiwan = event.IsChecked();
+		break;
+	case IDM_LIST_WORLD:
+		SConfig::GetInstance().m_ListWorld = event.IsChecked();
+		break;
+	case IDM_LIST_UNKNOWN:
+		SConfig::GetInstance().m_ListUnknown = event.IsChecked();
+		break;
+	case IDM_LIST_DRIVES:
+		SConfig::GetInstance().m_ListDrives = event.IsChecked();
+		break;
+	case IDM_PURGE_CACHE:
+		std::vector<std::string> rFilenames = DoFileSearch({"*.cache"}, {File::GetUserPath(D_CACHE_IDX)});
+
+		for (const std::string& rFilename : rFilenames)
+		{
+			File::Delete(rFilename);
+		}
+		break;
+	}
+
+	// Update gamelist
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->Update();
+	}
+}
+
+// Enable and disable the toolbar
+void CFrame::OnToggleToolbar(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_InterfaceToolbar = event.IsChecked();
+	DoToggleToolbar(event.IsChecked());
+}
+void CFrame::DoToggleToolbar(bool _show)
+{
+	GetToolBar()->Show(_show);
+	m_Mgr->Update();
+}
+
+// Enable and disable the status bar
+void CFrame::OnToggleStatusbar(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked();
+
+	GetStatusBar()->Show(event.IsChecked());
+
+	SendSizeEvent();
+}
+
+void CFrame::OnChangeColumnsVisible(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case IDM_SHOW_SYSTEM:
+		SConfig::GetInstance().m_showSystemColumn = !SConfig::GetInstance().m_showSystemColumn;
+		break;
+	case IDM_SHOW_BANNER:
+		SConfig::GetInstance().m_showBannerColumn = !SConfig::GetInstance().m_showBannerColumn;
+		break;
+	case IDM_SHOW_MAKER:
+		SConfig::GetInstance().m_showMakerColumn = !SConfig::GetInstance().m_showMakerColumn;
+		break;
+	case IDM_SHOW_ID:
+		SConfig::GetInstance().m_showIDColumn = !SConfig::GetInstance().m_showIDColumn;
+		break;
+	case IDM_SHOW_REGION:
+		SConfig::GetInstance().m_showRegionColumn = !SConfig::GetInstance().m_showRegionColumn;
+		break;
+	case IDM_SHOW_SIZE:
+		SConfig::GetInstance().m_showSizeColumn = !SConfig::GetInstance().m_showSizeColumn;
+		break;
+	case IDM_SHOW_STATE:
+		SConfig::GetInstance().m_showStateColumn = !SConfig::GetInstance().m_showStateColumn;
+		break;
+	default: return;
+	}
+	m_GameListCtrl->Update();
+	SConfig::GetInstance().SaveSettings();
+}
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
new file mode 100644
index 0000000000..34f50ef4d5
--- /dev/null
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -0,0 +1,1297 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <vector>
+#include <wx/bitmap.h>
+#include <wx/buffer.h>
+#include <wx/colour.h>
+#include <wx/dirdlg.h>
+#include <wx/filedlg.h>
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/imaglist.h>
+#include <wx/listctrl.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/progdlg.h>
+#include <wx/settings.h>
+#include <wx/tipwin.h>
+
+#include "Common/CDUtils.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/StdMakeUnique.h"
+#include "Common/StringUtil.h"
+#include "Common/SysConf.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Movie.h"
+#include "Core/Boot/Boot.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/WiiSaveCrypted.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/resources/Flag_Australia.xpm"
+#include "DolphinWX/resources/Flag_Europe.xpm"
+#include "DolphinWX/resources/Flag_France.xpm"
+#include "DolphinWX/resources/Flag_Germany.xpm"
+#include "DolphinWX/resources/Flag_Italy.xpm"
+#include "DolphinWX/resources/Flag_Japan.xpm"
+#include "DolphinWX/resources/Flag_Korea.xpm"
+#include "DolphinWX/resources/Flag_Netherlands.xpm"
+#include "DolphinWX/resources/Flag_Russia.xpm"
+#include "DolphinWX/resources/Flag_Spain.xpm"
+#include "DolphinWX/resources/Flag_Taiwan.xpm"
+#include "DolphinWX/resources/Flag_Unknown.xpm"
+#include "DolphinWX/resources/Flag_USA.xpm"
+#include "DolphinWX/resources/Platform_Gamecube.xpm"
+#include "DolphinWX/resources/Platform_Wad.xpm"
+#include "DolphinWX/resources/Platform_Wii.xpm"
+#include "DolphinWX/resources/rating_gamelist.h"
+
+size_t CGameListCtrl::m_currentItem = 0;
+size_t CGameListCtrl::m_numberItem = 0;
+std::string CGameListCtrl::m_currentFilename;
+static bool sorted = false;
+
+static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2,
+                                long sortData = CGameListCtrl::COLUMN_TITLE)
+{
+	int t = 1;
+
+	if (sortData < 0)
+	{
+		t = -1;
+		sortData = -sortData;
+	}
+
+	DiscIO::IVolume::ELanguage languageOne = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso1->GetPlatform() != DiscIO::IVolume::GAMECUBE_DISC);
+	DiscIO::IVolume::ELanguage languageOther = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(iso2->GetPlatform() != DiscIO::IVolume::GAMECUBE_DISC);
+
+	switch (sortData)
+	{
+		case CGameListCtrl::COLUMN_TITLE:
+			if (!strcasecmp(iso1->GetName(languageOne).c_str(), iso2->GetName(languageOther).c_str()))
+			{
+				if (iso1->GetUniqueID() != iso2->GetUniqueID())
+					return t * (iso1->GetUniqueID() > iso2->GetUniqueID() ? 1 : -1);
+				if (iso1->GetRevision() != iso2->GetRevision())
+					return t * (iso1->GetRevision() > iso2->GetRevision() ? 1 : -1);
+				if (iso1->GetDiscNumber() != iso2->GetDiscNumber())
+					return t * (iso1->GetDiscNumber() > iso2->GetDiscNumber() ? 1 : -1);
+			}
+			return strcasecmp(iso1->GetName(languageOne).c_str(),
+			                  iso2->GetName(languageOther).c_str()) * t;
+		case CGameListCtrl::COLUMN_MAKER:
+			return strcasecmp(iso1->GetCompany().c_str(), iso2->GetCompany().c_str()) * t;
+		case CGameListCtrl::COLUMN_ID:
+			return strcasecmp(iso1->GetUniqueID().c_str(), iso2->GetUniqueID().c_str()) * t;
+		case CGameListCtrl::COLUMN_COUNTRY:
+			if (iso1->GetCountry() > iso2->GetCountry())
+				return  1 * t;
+			if (iso1->GetCountry() < iso2->GetCountry())
+				return -1 * t;
+			return 0;
+		case CGameListCtrl::COLUMN_SIZE:
+			if (iso1->GetFileSize() > iso2->GetFileSize())
+				return  1 * t;
+			if (iso1->GetFileSize() < iso2->GetFileSize())
+				return -1 * t;
+			return 0;
+		case CGameListCtrl::COLUMN_PLATFORM:
+			if (iso1->GetPlatform() > iso2->GetPlatform())
+				return  1 * t;
+			if (iso1->GetPlatform() < iso2->GetPlatform())
+				return -1 * t;
+			return 0;
+
+		case CGameListCtrl::COLUMN_EMULATION_STATE:
+		{
+			const int
+				nState1 = iso1->GetEmuState(),
+				nState2 = iso2->GetEmuState();
+
+			if (nState1 > nState2)
+				return  1 * t;
+			if (nState1 < nState2)
+				return -1 * t;
+			else
+				return 0;
+		}
+			break;
+	}
+
+	return 0;
+}
+
+CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const
+		wxPoint& pos, const wxSize& size, long style)
+	: wxListCtrl(parent, id, pos, size, style), toolTip(nullptr)
+{
+	Bind(wxEVT_SIZE, &CGameListCtrl::OnSize, this);
+	Bind(wxEVT_RIGHT_DOWN, &CGameListCtrl::OnRightClick, this);
+	Bind(wxEVT_LEFT_DOWN, &CGameListCtrl::OnLeftClick, this);
+	Bind(wxEVT_MOTION, &CGameListCtrl::OnMouseMotion, this);
+	Bind(wxEVT_LIST_KEY_DOWN, &CGameListCtrl::OnKeyPress, this);
+	Bind(wxEVT_LIST_COL_BEGIN_DRAG, &CGameListCtrl::OnColBeginDrag, this);
+	Bind(wxEVT_LIST_COL_CLICK, &CGameListCtrl::OnColumnClick, this);
+
+	Bind(wxEVT_MENU, &CGameListCtrl::OnProperties, this, IDM_PROPERTIES);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnWiki, this, IDM_GAME_WIKI);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnOpenContainingFolder, this, IDM_OPEN_CONTAINING_FOLDER);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnOpenSaveFolder, this, IDM_OPEN_SAVE_FOLDER);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnExportSave, this, IDM_EXPORT_SAVE);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnSetDefaultISO, this, IDM_SET_DEFAULT_ISO);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnCompressISO, this, IDM_COMPRESS_ISO);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnMultiCompressISO, this, IDM_MULTI_COMPRESS_ISO);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnMultiDecompressISO, this, IDM_MULTI_DECOMPRESS_ISO);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnDeleteISO, this, IDM_DELETE_ISO);
+	Bind(wxEVT_MENU, &CGameListCtrl::OnChangeDisc, this, IDM_LIST_CHANGE_DISC);
+}
+
+CGameListCtrl::~CGameListCtrl()
+{
+	if (m_imageListSmall)
+		delete m_imageListSmall;
+
+	ClearIsoFiles();
+}
+
+void CGameListCtrl::InitBitmaps()
+{
+	m_imageListSmall = new wxImageList(96, 32);
+	SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
+
+	m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN]         = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE]        = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA]           = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA]     = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE]        = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY]       = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY]         = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA]         = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS]   = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_RUSSIA]        = m_imageListSmall->Add(wxBitmap(Flag_Russia_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SPAIN]         = m_imageListSmall->Add(wxBitmap(Flag_Spain_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN]        = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm));
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_WORLD]         = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); // Uses European flag as a placeholder
+	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN]       = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
+
+	m_PlatformImageIndex.resize(3);
+	m_PlatformImageIndex[0] = m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm));
+	m_PlatformImageIndex[1] = m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm));
+	m_PlatformImageIndex[2] = m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm));
+
+	m_EmuStateImageIndex.resize(6);
+	m_EmuStateImageIndex[0] = m_imageListSmall->Add(wxBitmap(rating_0));
+	m_EmuStateImageIndex[1] = m_imageListSmall->Add(wxBitmap(rating_1));
+	m_EmuStateImageIndex[2] = m_imageListSmall->Add(wxBitmap(rating_2));
+	m_EmuStateImageIndex[3] = m_imageListSmall->Add(wxBitmap(rating_3));
+	m_EmuStateImageIndex[4] = m_imageListSmall->Add(wxBitmap(rating_4));
+	m_EmuStateImageIndex[5] = m_imageListSmall->Add(wxBitmap(rating_5));
+}
+
+void CGameListCtrl::BrowseForDirectory()
+{
+	wxString dirHome;
+	wxGetHomeDir(&dirHome);
+
+	// browse
+	wxDirDialog dialog(this, _("Browse for a directory to add"), dirHome,
+			wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
+
+	if (dialog.ShowModal() == wxID_OK)
+	{
+		std::string sPath(WxStrToStr(dialog.GetPath()));
+		std::vector<std::string>::iterator itResult = std::find(
+				SConfig::GetInstance().m_ISOFolder.begin(),
+				SConfig::GetInstance().m_ISOFolder.end(), sPath);
+
+		if (itResult == SConfig::GetInstance().m_ISOFolder.end())
+		{
+			SConfig::GetInstance().m_ISOFolder.push_back(sPath);
+			SConfig::GetInstance().SaveSettings();
+		}
+
+		Update();
+	}
+}
+
+void CGameListCtrl::Update()
+{
+	int scrollPos = wxWindow::GetScrollPos(wxVERTICAL);
+	// Don't let the user refresh it while a game is running
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+		return;
+
+	if (m_imageListSmall)
+	{
+		delete m_imageListSmall;
+		m_imageListSmall = nullptr;
+	}
+
+	Hide();
+
+	ScanForISOs();
+
+	ClearAll();
+
+	if (m_ISOFiles.size() != 0)
+	{
+		// Don't load bitmaps unless there are games to list
+		InitBitmaps();
+
+		// add columns
+		InsertColumn(COLUMN_DUMMY, "");
+		InsertColumn(COLUMN_PLATFORM, "");
+		InsertColumn(COLUMN_BANNER, _("Banner"));
+		InsertColumn(COLUMN_TITLE, _("Title"));
+
+		InsertColumn(COLUMN_MAKER, _("Maker"));
+		InsertColumn(COLUMN_ID, _("ID"));
+		InsertColumn(COLUMN_COUNTRY, "");
+		InsertColumn(COLUMN_SIZE, _("Size"));
+		InsertColumn(COLUMN_EMULATION_STATE, _("State"));
+
+#ifdef __WXMSW__
+		const int platform_padding = 0;
+#else
+		const int platform_padding = 8;
+#endif
+
+		// set initial sizes for columns
+		SetColumnWidth(COLUMN_DUMMY,0);
+		SetColumnWidth(COLUMN_PLATFORM, SConfig::GetInstance().m_showSystemColumn ? 35 + platform_padding : 0);
+		SetColumnWidth(COLUMN_BANNER, SConfig::GetInstance().m_showBannerColumn ? 96 + platform_padding : 0);
+		SetColumnWidth(COLUMN_TITLE, 175 + platform_padding);
+		SetColumnWidth(COLUMN_MAKER, SConfig::GetInstance().m_showMakerColumn ? 150 + platform_padding : 0);
+		SetColumnWidth(COLUMN_ID, SConfig::GetInstance().m_showIDColumn ? 75 + platform_padding : 0);
+		SetColumnWidth(COLUMN_COUNTRY, SConfig::GetInstance().m_showRegionColumn ? 32 + platform_padding : 0);
+		SetColumnWidth(COLUMN_EMULATION_STATE, SConfig::GetInstance().m_showStateColumn ? 50 + platform_padding : 0);
+
+		// add all items
+		for (int i = 0; i < (int)m_ISOFiles.size(); i++)
+		{
+			InsertItemInReportView(i);
+			if (SConfig::GetInstance().m_ColorCompressed && m_ISOFiles[i]->IsCompressed())
+				SetItemTextColour(i, wxColour(0xFF0000));
+		}
+
+		// Sort items by Title
+		if (!sorted)
+			last_column = 0;
+		sorted = false;
+		wxListEvent event;
+		event.m_col = SConfig::GetInstance().m_ListSort2;
+		OnColumnClick(event);
+
+		event.m_col = SConfig::GetInstance().m_ListSort;
+		OnColumnClick(event);
+		sorted = true;
+
+		SetColumnWidth(COLUMN_SIZE, SConfig::GetInstance().m_showSizeColumn ? wxLIST_AUTOSIZE : 0);
+	}
+	else
+	{
+		wxString errorString;
+		// We just check for one hide setting to be enabled, as we may only
+		// have GC games for example, and hide them, so we should show the
+		// second message instead
+		if ((SConfig::GetInstance().m_ListGC  &&
+			SConfig::GetInstance().m_ListWii  &&
+			SConfig::GetInstance().m_ListWad) &&
+			(SConfig::GetInstance().m_ListJap &&
+			SConfig::GetInstance().m_ListUsa  &&
+			SConfig::GetInstance().m_ListPal))
+		{
+			errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to browse for files...");
+		}
+		else
+		{
+			errorString = _("Dolphin is currently set to hide all games. Double-click here to show all games...");
+		}
+		InsertColumn(0, "");
+		long index = InsertItem(0, errorString);
+		SetItemFont(index, *wxITALIC_FONT);
+		SetColumnWidth(0, wxLIST_AUTOSIZE);
+	}
+	if (GetSelectedISO() == nullptr)
+		main_frame->UpdateGUI();
+	Show();
+
+	AutomaticColumnWidth();
+	ScrollLines(scrollPos);
+	SetFocus();
+}
+
+static wxString NiceSizeFormat(u64 _size)
+{
+	// Return a pretty filesize string from byte count.
+	// e.g. 1134278 -> "1.08 MiB"
+
+	const char* const unit_symbols[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"};
+
+	// Find largest power of 2 less than _size.
+	// div 10 to get largest named unit less than _size
+	// 10 == log2(1024) (number of B in a KiB, KiB in a MiB, etc)
+	const u64 unit = IntLog2(std::max<u64>(_size, 1)) / 10;
+	const u64 unit_size = (1ull << (unit * 10));
+
+	// mul 1000 for 3 decimal places, add 5 to round up, div 10 for 2 decimal places
+	std::string value = std::to_string((_size * 1000 / unit_size + 5) / 10);
+	// Insert decimal point.
+	value.insert(value.size() - 2, ".");
+	return StrToWxStr(StringFromFormat("%s %s", value.c_str(), unit_symbols[unit]));
+}
+
+void CGameListCtrl::InsertItemInReportView(long _Index)
+{
+	// When using wxListCtrl, there is no hope of per-column text colors.
+	// But for reference, here are the old colors that were used: (BGR)
+	// title: 0xFF0000
+	// company: 0x007030
+	int ImageIndex = -1;
+
+	GameListItem& rISOFile = *m_ISOFiles[_Index];
+
+	// Insert a first row with nothing in it, that will be used as the Index
+	long ItemIndex = InsertItem(_Index, wxEmptyString);
+
+	// Insert the platform's image in the first (visible) column
+	SetItemColumnImage(_Index, COLUMN_PLATFORM, m_PlatformImageIndex[rISOFile.GetPlatform()]);
+
+	if (rISOFile.GetBitmap().IsOk())
+		ImageIndex = m_imageListSmall->Add(rISOFile.GetBitmap());
+
+	// Set the game's banner in the second column
+	SetItemColumnImage(_Index, COLUMN_BANNER, ImageIndex);
+
+	wxString name = StrToWxStr(rISOFile.GetName());
+
+	std::ifstream titlestxt;
+	OpenFStream(titlestxt, File::GetUserPath(D_LOAD_IDX) + "titles.txt", std::ios::in);
+
+	if (titlestxt.is_open() && rISOFile.GetUniqueID().size() > 3)
+	{
+		while (!titlestxt.eof())
+		{
+			std::string line;
+
+			if (!std::getline(titlestxt, line) && titlestxt.eof())
+				break;
+
+			if (line.substr(0,rISOFile.GetUniqueID().size()) == rISOFile.GetUniqueID())
+			{
+				name = line.substr(rISOFile.GetUniqueID().size() + 3);
+				break;
+			}
+		}
+		titlestxt.close();
+	}
+
+	std::string title;
+	IniFile gameini = SCoreStartupParameter::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision());
+	if (gameini.GetIfExists("EmuState", "Title", &title))
+		name = title;
+
+	int disc_number = rISOFile.GetDiscNumber() + 1;
+	if (disc_number > 1 && name.Lower().find(wxString::Format("disc %i", disc_number)) == std::string::npos
+	                    && name.Lower().find(wxString::Format("disc%i", disc_number)) == std::string::npos)
+	{
+		name = wxString::Format(_("%s (Disc %i)"), name.c_str(), disc_number);
+	}
+
+	SetItem(_Index, COLUMN_TITLE, name, -1);
+	SetItem(_Index, COLUMN_MAKER, StrToWxStr(rISOFile.GetCompany()), -1);
+
+	// Emulation state
+	SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]);
+
+	// Country
+	SetItemColumnImage(_Index, COLUMN_COUNTRY, m_FlagImageIndex[rISOFile.GetCountry()]);
+
+	// File size
+	SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);
+
+	// Game ID
+	SetItem(_Index, COLUMN_ID, rISOFile.GetUniqueID(), -1);
+
+	// Background color
+	SetBackgroundColor();
+
+	// Item data
+	SetItemData(_Index, ItemIndex);
+}
+
+static wxColour blend50(const wxColour& c1, const wxColour& c2)
+{
+	unsigned char r,g,b,a;
+	r = c1.Red()/2   + c2.Red()/2;
+	g = c1.Green()/2 + c2.Green()/2;
+	b = c1.Blue()/2  + c2.Blue()/2;
+	a = c1.Alpha()/2 + c2.Alpha()/2;
+	return a << 24 | b << 16 | g << 8 | r;
+}
+
+void CGameListCtrl::SetBackgroundColor()
+{
+	for (long i = 0; i < GetItemCount(); i++)
+	{
+		wxColour color = (i & 1) ?
+			blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT),
+					wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) :
+			wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+		CGameListCtrl::SetItemBackgroundColour(i, color);
+	}
+}
+
+void CGameListCtrl::ScanForISOs()
+{
+	ClearIsoFiles();
+
+	std::vector<std::string> Extensions;
+
+	if (SConfig::GetInstance().m_ListGC)
+		Extensions.push_back("*.gcm");
+	if (SConfig::GetInstance().m_ListWii || SConfig::GetInstance().m_ListGC)
+	{
+		Extensions.push_back("*.iso");
+		Extensions.push_back("*.ciso");
+		Extensions.push_back("*.gcz");
+		Extensions.push_back("*.wbfs");
+	}
+	if (SConfig::GetInstance().m_ListWad)
+		Extensions.push_back("*.wad");
+
+	auto rFilenames = DoFileSearch(Extensions, SConfig::GetInstance().m_ISOFolder, SConfig::GetInstance().m_RecursiveISOFolder);
+
+	if (rFilenames.size() > 0)
+	{
+		wxProgressDialog dialog(
+			_("Scanning for ISOs"),
+			_("Scanning..."),
+			(int)rFilenames.size() - 1,
+			this,
+			wxPD_APP_MODAL |
+			wxPD_AUTO_HIDE |
+			wxPD_CAN_ABORT |
+			wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+			wxPD_SMOOTH // - makes updates as small as possible (down to 1px)
+			);
+
+		for (u32 i = 0; i < rFilenames.size(); i++)
+		{
+			std::string FileName;
+			SplitPath(rFilenames[i], nullptr, &FileName, nullptr);
+
+			// Update with the progress (i) and the message
+			dialog.Update(i, wxString::Format(_("Scanning %s"),
+				StrToWxStr(FileName)));
+			if (dialog.WasCancelled())
+				break;
+
+			auto iso_file = std::make_unique<GameListItem>(rFilenames[i]);
+
+			if (iso_file->IsValid())
+			{
+				bool list = true;
+
+				switch(iso_file->GetPlatform())
+				{
+					case DiscIO::IVolume::WII_DISC:
+						if (!SConfig::GetInstance().m_ListWii)
+							list = false;
+						break;
+					case DiscIO::IVolume::WII_WAD:
+						if (!SConfig::GetInstance().m_ListWad)
+							list = false;
+						break;
+					default:
+						if (!SConfig::GetInstance().m_ListGC)
+							list = false;
+						break;
+				}
+
+				switch(iso_file->GetCountry())
+				{
+					case DiscIO::IVolume::COUNTRY_AUSTRALIA:
+						if (!SConfig::GetInstance().m_ListAustralia)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_EUROPE:
+						if (!SConfig::GetInstance().m_ListPal)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_FRANCE:
+						if (!SConfig::GetInstance().m_ListFrance)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_GERMANY:
+						if (!SConfig::GetInstance().m_ListGermany)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_ITALY:
+						if (!SConfig::GetInstance().m_ListItaly)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_JAPAN:
+						if (!SConfig::GetInstance().m_ListJap)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_KOREA:
+						if (!SConfig::GetInstance().m_ListKorea)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+						if (!SConfig::GetInstance().m_ListNetherlands)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_RUSSIA:
+						if (!SConfig::GetInstance().m_ListRussia)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_SPAIN:
+						if (!SConfig::GetInstance().m_ListSpain)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_TAIWAN:
+						if (!SConfig::GetInstance().m_ListTaiwan)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_USA:
+						if (!SConfig::GetInstance().m_ListUsa)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_WORLD:
+						if (!SConfig::GetInstance().m_ListWorld)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_UNKNOWN:
+					default:
+						if (!SConfig::GetInstance().m_ListUnknown)
+							list = false;
+						break;
+				}
+
+				if (list)
+					m_ISOFiles.push_back(iso_file.release());
+			}
+		}
+	}
+
+	if (SConfig::GetInstance().m_ListDrives)
+	{
+		const std::vector<std::string> drives = cdio_get_devices();
+
+		for (const auto& drive : drives)
+		{
+			auto gli = std::make_unique<GameListItem>(drive);
+
+			if (gli->IsValid())
+				m_ISOFiles.push_back(gli.release());
+		}
+	}
+
+	std::sort(m_ISOFiles.begin(), m_ISOFiles.end());
+}
+
+void CGameListCtrl::OnColBeginDrag(wxListEvent& event)
+{
+	if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_MAKER)
+		event.Veto();
+}
+
+const GameListItem* CGameListCtrl::GetISO(size_t index) const
+{
+	if (index < m_ISOFiles.size())
+		return m_ISOFiles[index];
+	else
+		return nullptr;
+}
+
+static CGameListCtrl* caller;
+static int wxCALLBACK wxListCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
+{
+	// return 1 if item1 > item2
+	// return -1 if item1 < item2
+	// return 0 for identity
+	const GameListItem* iso1 = caller->GetISO(item1);
+	const GameListItem* iso2 = caller->GetISO(item2);
+
+	return CompareGameListItems(iso1, iso2, sortData);
+}
+
+void CGameListCtrl::OnColumnClick(wxListEvent& event)
+{
+	if (event.GetColumn() != COLUMN_BANNER)
+	{
+		int current_column = event.GetColumn();
+		if (sorted)
+		{
+			if (last_column == current_column)
+			{
+				last_sort = -last_sort;
+			}
+			else
+			{
+				SConfig::GetInstance().m_ListSort2 = last_sort;
+				last_column = current_column;
+				last_sort = current_column;
+			}
+			SConfig::GetInstance().m_ListSort = last_sort;
+		}
+		else
+		{
+			last_sort = current_column;
+			last_column = current_column;
+		}
+		caller = this;
+		SortItems(wxListCompare, last_sort);
+	}
+
+	SetBackgroundColor();
+
+	event.Skip();
+}
+
+// This is used by keyboard gamelist search
+void CGameListCtrl::OnKeyPress(wxListEvent& event)
+{
+	static int lastKey = 0, sLoop = 0;
+	int Loop = 0;
+
+	for (int i = 0; i < (int)m_ISOFiles.size(); i++)
+	{
+		// Easy way to get game string
+		wxListItem bleh;
+		bleh.SetId(i);
+		bleh.SetColumn(COLUMN_TITLE);
+		bleh.SetMask(wxLIST_MASK_TEXT);
+		GetItem(bleh);
+
+		wxString text = bleh.GetText();
+
+		if (text.MakeUpper()[0] == event.GetKeyCode())
+		{
+			if (lastKey == event.GetKeyCode() && Loop < sLoop)
+			{
+				Loop++;
+				if (i+1 == (int)m_ISOFiles.size())
+					i = -1;
+				continue;
+			}
+			else if (lastKey != event.GetKeyCode())
+			{
+				sLoop = 0;
+			}
+
+			lastKey = event.GetKeyCode();
+			sLoop++;
+
+			UnselectAll();
+			SetItemState(i, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED,
+					wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED);
+			EnsureVisible(i);
+			break;
+		}
+
+		// If we get past the last game in the list,
+		// we'll have to go back to the first one.
+		if (i+1 == (int)m_ISOFiles.size() && sLoop > 0 && Loop > 0)
+			i = -1;
+	}
+
+	event.Skip();
+}
+
+// This shows a little tooltip with the current Game's emulation state
+void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
+{
+	int flags;
+	long subitem = 0;
+	const long item = HitTest(event.GetPosition(), flags, &subitem);
+	static int lastItem = -1;
+
+	if (GetColumnCount() <= 1)
+		return;
+
+	if (item != wxNOT_FOUND)
+	{
+		wxRect Rect;
+#ifdef __WXMSW__
+		if (subitem == COLUMN_EMULATION_STATE)
+#else
+		// The subitem parameter of HitTest is only implemented for wxMSW.  On
+		// all other platforms it will always be -1.  Check the x position
+		// instead.
+		GetItemRect(item, Rect);
+		if (Rect.GetX() + Rect.GetWidth() - GetColumnWidth(COLUMN_EMULATION_STATE) < event.GetX())
+#endif
+		{
+			if (toolTip || lastItem == item || this != FindFocus())
+			{
+				if (lastItem != item) lastItem = -1;
+				event.Skip();
+				return;
+			}
+
+			// Emulation status
+			static const char* const emuState[] = { "Broken", "Intro", "In-Game", "Playable", "Perfect" };
+
+			const GameListItem& rISO = *m_ISOFiles[GetItemData(item)];
+
+			const int emu_state = rISO.GetEmuState();
+			const std::string& issues = rISO.GetIssues();
+
+			// Show a tooltip containing the EmuState and the state description
+			if (emu_state > 0 && emu_state < 6)
+			{
+				char temp[2048];
+				sprintf(temp, "^ %s%s%s", emuState[emu_state - 1],
+						issues.size() > 0 ? " :\n" : "", issues.c_str());
+				toolTip = new wxEmuStateTip(this, StrToWxStr(temp), &toolTip);
+			}
+			else
+			{
+				toolTip = new wxEmuStateTip(this, _("Not Set"), &toolTip);
+			}
+
+			// Get item Coords
+			GetItemRect(item, Rect);
+			int mx = Rect.GetWidth();
+			int my = Rect.GetY();
+#ifndef __WXMSW__
+			// For some reason the y position does not account for the header
+			// row, so subtract the y position of the first visible item.
+			GetItemRect(GetTopItem(), Rect);
+			my -= Rect.GetY();
+#endif
+			// Convert to screen coordinates
+			ClientToScreen(&mx, &my);
+			toolTip->SetBoundingRect(wxRect(mx - GetColumnWidth(COLUMN_EMULATION_STATE),
+						my, GetColumnWidth(COLUMN_EMULATION_STATE), Rect.GetHeight()));
+			toolTip->SetPosition(wxPoint(mx - GetColumnWidth(COLUMN_EMULATION_STATE),
+						my - 5 + Rect.GetHeight()));
+			lastItem = item;
+		}
+	}
+	if (!toolTip)
+		lastItem = -1;
+
+	event.Skip();
+}
+
+void CGameListCtrl::OnLeftClick(wxMouseEvent& event)
+{
+	// Focus the clicked item.
+	int flags;
+	long item = HitTest(event.GetPosition(), flags);
+	if ((item != wxNOT_FOUND) && (GetSelectedItemCount() == 0) &&
+			(!event.ControlDown()) && (!event.ShiftDown()))
+	{
+		SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+		wxGetApp().GetCFrame()->UpdateGUI();
+	}
+
+	event.Skip();
+}
+
+void CGameListCtrl::OnRightClick(wxMouseEvent& event)
+{
+	// Focus the clicked item.
+	int flags;
+	long item = HitTest(event.GetPosition(), flags);
+	if (item != wxNOT_FOUND)
+	{
+		if (GetItemState(item, wxLIST_STATE_SELECTED) != wxLIST_STATE_SELECTED)
+		{
+			UnselectAll();
+			SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+		}
+		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+	}
+	if (GetSelectedItemCount() == 1)
+	{
+		const GameListItem* selected_iso = GetSelectedISO();
+		if (selected_iso)
+		{
+			wxMenu popupMenu;
+			popupMenu.Append(IDM_PROPERTIES, _("&Properties"));
+			popupMenu.Append(IDM_GAME_WIKI, _("&Wiki"));
+			popupMenu.AppendSeparator();
+
+			if (selected_iso->GetPlatform() != DiscIO::IVolume::GAMECUBE_DISC)
+			{
+				popupMenu.Append(IDM_OPEN_SAVE_FOLDER, _("Open Wii &save folder"));
+				popupMenu.Append(IDM_EXPORT_SAVE, _("Export Wii save (Experimental)"));
+			}
+			popupMenu.Append(IDM_OPEN_CONTAINING_FOLDER, _("Open &containing folder"));
+			popupMenu.AppendCheckItem(IDM_SET_DEFAULT_ISO, _("Set as &default ISO"));
+
+			// First we have to decide a starting value when we append it
+			if (selected_iso->GetFileName() == SConfig::GetInstance().
+				m_LocalCoreStartupParameter.m_strDefaultISO)
+				popupMenu.FindItem(IDM_SET_DEFAULT_ISO)->Check();
+
+			popupMenu.AppendSeparator();
+			popupMenu.Append(IDM_DELETE_ISO, _("&Delete ISO..."));
+
+			if (selected_iso->GetPlatform() != DiscIO::IVolume::WII_WAD)
+			{
+				if (selected_iso->IsCompressed())
+					popupMenu.Append(IDM_COMPRESS_ISO, _("Decompress ISO..."));
+				else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" &&
+				         selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs")
+					popupMenu.Append(IDM_COMPRESS_ISO, _("Compress ISO..."));
+			}
+			else
+			{
+				popupMenu.Append(IDM_LIST_INSTALL_WAD, _("Install to Wii Menu"));
+			}
+			if (selected_iso->GetPlatform() == DiscIO::IVolume::GAMECUBE_DISC ||
+				selected_iso->GetPlatform() == DiscIO::IVolume::WII_DISC)
+			{
+				wxMenuItem* changeDiscItem = popupMenu.Append(IDM_LIST_CHANGE_DISC, _("Change &Disc"));
+				changeDiscItem->Enable(Core::IsRunning());
+			}
+
+			PopupMenu(&popupMenu);
+		}
+	}
+	else if (GetSelectedItemCount() > 1)
+	{
+		wxMenu popupMenu;
+		popupMenu.Append(IDM_DELETE_ISO, _("&Delete selected ISOs..."));
+		popupMenu.AppendSeparator();
+		popupMenu.Append(IDM_MULTI_COMPRESS_ISO, _("Compress selected ISOs..."));
+		popupMenu.Append(IDM_MULTI_DECOMPRESS_ISO, _("Decompress selected ISOs..."));
+		PopupMenu(&popupMenu);
+	}
+}
+
+const GameListItem * CGameListCtrl::GetSelectedISO()
+{
+	if (m_ISOFiles.size() == 0)
+	{
+		return nullptr;
+	}
+	else if (GetSelectedItemCount() == 0)
+	{
+		return nullptr;
+	}
+	else
+	{
+		long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (item == wxNOT_FOUND)
+		{
+			return nullptr;
+		}
+		else
+		{
+			// Here is a little workaround for multiselections:
+			// when > 1 item is selected, return info on the first one
+			// and deselect it so the next time GetSelectedISO() is called,
+			// the next item's info is returned
+			if (GetSelectedItemCount() > 1)
+				SetItemState(item, 0, wxLIST_STATE_SELECTED);
+
+			return m_ISOFiles[GetItemData(item)];
+		}
+	}
+}
+
+void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+
+	wxFileName path = wxFileName::FileName(StrToWxStr(iso->GetFileName()));
+	path.MakeAbsolute();
+	WxUtils::Explore(WxStrToStr(path.GetPath()));
+}
+
+void CGameListCtrl::OnOpenSaveFolder(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+	std::string path = iso->GetWiiFSPath();
+	if (!path.empty())
+		WxUtils::Explore(path);
+}
+
+void CGameListCtrl::OnExportSave(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+
+	u64 title;
+	std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(iso->GetFileName()));
+	if (volume && volume->GetTitleID((u8*)&title))
+	{
+		title = Common::swap64(title);
+		CWiiSaveCrypted::ExportWiiSave(title);
+	}
+}
+
+// Save this file as the default file
+void CGameListCtrl::OnSetDefaultISO(wxCommandEvent& event)
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso) return;
+
+	if (event.IsChecked())
+	{
+		// Write the new default value and save it the ini file
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO =
+			iso->GetFileName();
+		SConfig::GetInstance().SaveSettings();
+	}
+	else
+	{
+		// Otherwise blank the value and save it
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = "";
+		SConfig::GetInstance().SaveSettings();
+	}
+}
+
+void CGameListCtrl::OnDeleteISO(wxCommandEvent& WXUNUSED (event))
+{
+	if (GetSelectedItemCount() == 1)
+	{
+		const GameListItem* iso = GetSelectedISO();
+		if (!iso)
+			return;
+		if (wxMessageBox(_("Are you sure you want to delete this file?  It will be gone forever!"),
+					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
+		{
+			File::Delete(iso->GetFileName());
+			Update();
+		}
+	}
+	else
+	{
+		if (wxMessageBox(_("Are you sure you want to delete these files?\nThey will be gone forever!"),
+					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
+		{
+			int selected = GetSelectedItemCount();
+
+			for (int i = 0; i < selected; i++)
+			{
+				const GameListItem* iso = GetSelectedISO();
+				File::Delete(iso->GetFileName());
+			}
+			Update();
+		}
+	}
+}
+
+void CGameListCtrl::OnProperties(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+
+	CISOProperties* ISOProperties = new CISOProperties(iso->GetFileName(), this);
+	ISOProperties->Show();
+}
+
+void CGameListCtrl::OnWiki(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+
+	std::string wikiUrl = "https://wiki.dolphin-emu.org/dolphin-redirect.php?gameid=" + iso->GetUniqueID();
+	WxUtils::Launch(wikiUrl);
+}
+
+bool CGameListCtrl::MultiCompressCB(const std::string& text, float percent, void* arg)
+{
+	percent = (((float)m_currentItem) + percent) / (float)m_numberItem;
+	wxString textString(StrToWxStr(StringFromFormat("%s (%i/%i) - %s",
+				m_currentFilename.c_str(), (int)m_currentItem + 1,
+				(int)m_numberItem, text.c_str())));
+
+	return ((wxProgressDialog*)arg)->Update((int)(percent * 1000), textString);
+}
+
+void CGameListCtrl::OnMultiCompressISO(wxCommandEvent& /*event*/)
+{
+	CompressSelection(true);
+}
+
+void CGameListCtrl::OnMultiDecompressISO(wxCommandEvent& /*event*/)
+{
+	CompressSelection(false);
+}
+
+void CGameListCtrl::CompressSelection(bool _compress)
+{
+	wxString dirHome;
+	wxGetHomeDir(&dirHome);
+
+	wxDirDialog browseDialog(this, _("Browse for output directory"), dirHome,
+			wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
+	if (browseDialog.ShowModal() != wxID_OK)
+		return;
+
+	bool all_good = true;
+
+	{
+		wxProgressDialog progressDialog(
+			_compress ? _("Compressing ISO") : _("Decompressing ISO"),
+			_("Working..."),
+			1000,
+			this,
+			wxPD_APP_MODAL |
+			wxPD_CAN_ABORT |
+			wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+			wxPD_SMOOTH
+			);
+
+		m_currentItem = 0;
+		m_numberItem = GetSelectedItemCount();
+		for (u32 i = 0; i < m_numberItem; i++)
+		{
+			const GameListItem* iso = GetSelectedISO();
+			if (iso->GetPlatform() == DiscIO::IVolume::WII_WAD || iso->GetFileName().rfind(".wbfs") != std::string::npos)
+				continue;
+
+			if (!iso->IsCompressed() && _compress)
+			{
+				std::string FileName, FileExt;
+				SplitPath(iso->GetFileName(), nullptr, &FileName, &FileExt);
+				m_currentFilename = FileName;
+				FileName.append(".gcz");
+
+				std::string OutputFileName;
+				BuildCompleteFilename(OutputFileName,
+						WxStrToStr(browseDialog.GetPath()),
+						FileName);
+
+				if (File::Exists(OutputFileName) &&
+						wxMessageBox(
+							wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
+								StrToWxStr(OutputFileName)),
+							_("Confirm File Overwrite"),
+							wxYES_NO) == wxNO)
+					continue;
+
+				all_good &= DiscIO::CompressFileToBlob(iso->GetFileName(),
+						OutputFileName,
+						(iso->GetPlatform() == DiscIO::IVolume::WII_DISC) ? 1 : 0,
+						16384, &MultiCompressCB, &progressDialog);
+			}
+			else if (iso->IsCompressed() && !_compress)
+			{
+				std::string FileName, FileExt;
+				SplitPath(iso->GetFileName(), nullptr, &FileName, &FileExt);
+				m_currentFilename = FileName;
+				if (iso->GetPlatform() == DiscIO::IVolume::WII_DISC)
+					FileName.append(".iso");
+				else
+					FileName.append(".gcm");
+
+				std::string OutputFileName;
+				BuildCompleteFilename(OutputFileName,
+						WxStrToStr(browseDialog.GetPath()),
+						FileName);
+
+				if (File::Exists(OutputFileName) &&
+						wxMessageBox(
+							wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
+								StrToWxStr(OutputFileName)),
+							_("Confirm File Overwrite"),
+							wxYES_NO) == wxNO)
+					continue;
+
+				all_good &= DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(),
+						OutputFileName.c_str(), &MultiCompressCB, &progressDialog);
+			}
+			m_currentItem++;
+		}
+	}
+
+	if (!all_good)
+		WxUtils::ShowErrorDialog(_("Dolphin was unable to complete the requested action."));
+
+	Update();
+}
+
+bool CGameListCtrl::CompressCB(const std::string& text, float percent, void* arg)
+{
+	return ((wxProgressDialog*)arg)->
+		Update((int)(percent * 1000), StrToWxStr(text));
+}
+
+void CGameListCtrl::OnCompressISO(wxCommandEvent& WXUNUSED (event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso)
+		return;
+
+	wxString path;
+
+	std::string FileName, FilePath, FileExtension;
+	SplitPath(iso->GetFileName(), &FilePath, &FileName, &FileExtension);
+
+	do
+	{
+		if (iso->IsCompressed())
+		{
+			wxString FileType;
+			if (iso->GetPlatform() == DiscIO::IVolume::WII_DISC)
+				FileType = _("All Wii ISO files (iso)") + "|*.iso";
+			else
+				FileType = _("All GameCube GCM files (gcm)") + "|*.gcm";
+
+			path = wxFileSelector(
+					_("Save decompressed GCM/ISO"),
+					StrToWxStr(FilePath),
+					StrToWxStr(FileName) + FileType.After('*'),
+					wxEmptyString,
+					FileType + "|" + wxGetTranslation(wxALL_FILES),
+					wxFD_SAVE,
+					this);
+		}
+		else
+		{
+			path = wxFileSelector(
+					_("Save compressed GCM/ISO"),
+					StrToWxStr(FilePath),
+					StrToWxStr(FileName) + ".gcz",
+					wxEmptyString,
+					_("All compressed GC/Wii ISO files (gcz)") +
+						wxString::Format("|*.gcz|%s", wxGetTranslation(wxALL_FILES)),
+					wxFD_SAVE,
+					this);
+		}
+		if (!path)
+			return;
+	} while (wxFileExists(path) &&
+			wxMessageBox(
+				wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), path.c_str()),
+				_("Confirm File Overwrite"),
+				wxYES_NO) == wxNO);
+
+	bool all_good = false;
+
+	{
+	wxProgressDialog dialog(
+		iso->IsCompressed() ? _("Decompressing ISO") : _("Compressing ISO"),
+		_("Working..."),
+		1000,
+		this,
+		wxPD_APP_MODAL |
+		wxPD_CAN_ABORT |
+		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+		wxPD_SMOOTH
+		);
+
+
+	if (iso->IsCompressed())
+		all_good = DiscIO::DecompressBlobToFile(iso->GetFileName(),
+				WxStrToStr(path), &CompressCB, &dialog);
+	else
+		all_good = DiscIO::CompressFileToBlob(iso->GetFileName(),
+				WxStrToStr(path),
+				(iso->GetPlatform() == DiscIO::IVolume::WII_DISC) ? 1 : 0,
+				16384, &CompressCB, &dialog);
+	}
+
+	if (!all_good)
+		WxUtils::ShowErrorDialog(_("Dolphin was unable to complete the requested action."));
+
+	Update();
+}
+
+void CGameListCtrl::OnChangeDisc(wxCommandEvent& WXUNUSED(event))
+{
+	const GameListItem* iso = GetSelectedISO();
+	if (!iso || !Core::IsRunning())
+		return;
+	DVDInterface::ChangeDisc(WxStrToStr(iso->GetFileName()));
+}
+
+void CGameListCtrl::OnSize(wxSizeEvent& event)
+{
+	if (lastpos == event.GetSize())
+		return;
+
+	lastpos = event.GetSize();
+	AutomaticColumnWidth();
+
+	event.Skip();
+}
+
+void CGameListCtrl::AutomaticColumnWidth()
+{
+	wxRect rc(GetClientRect());
+
+	if (GetColumnCount() == 1)
+	{
+		SetColumnWidth(0, rc.GetWidth());
+	}
+	else if (GetColumnCount() > 0)
+	{
+		int resizable = rc.GetWidth() - (
+			GetColumnWidth(COLUMN_PLATFORM)
+			+ GetColumnWidth(COLUMN_BANNER)
+			+ GetColumnWidth(COLUMN_ID)
+			+ GetColumnWidth(COLUMN_COUNTRY)
+			+ GetColumnWidth(COLUMN_SIZE)
+			+ GetColumnWidth(COLUMN_EMULATION_STATE));
+
+		// We hide the Maker column if the window is too small
+		if (resizable > 400)
+		{
+			if (SConfig::GetInstance().m_showMakerColumn)
+			{
+				SetColumnWidth(COLUMN_TITLE, resizable / 2);
+				SetColumnWidth(COLUMN_MAKER, resizable / 2);
+			}
+			else
+			{
+				SetColumnWidth(COLUMN_TITLE, resizable);
+			}
+		}
+		else
+		{
+			SetColumnWidth(COLUMN_TITLE, resizable);
+			SetColumnWidth(COLUMN_MAKER, 0);
+		}
+	}
+}
+
+void CGameListCtrl::UnselectAll()
+{
+	for (int i = 0; i < GetItemCount(); i++)
+	{
+		SetItemState(i, 0, wxLIST_STATE_SELECTED);
+	}
+}
diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h
new file mode 100644
index 0000000000..5a0ec77cb2
--- /dev/null
+++ b/Source/Core/DolphinWX/GameListCtrl.h
@@ -0,0 +1,111 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+#include <wx/listctrl.h>
+#include <wx/tipwin.h>
+
+#include "DolphinWX/ISOFile.h"
+
+class wxEmuStateTip : public wxTipWindow
+{
+public:
+	wxEmuStateTip(wxWindow* parent, const wxString& text, wxEmuStateTip** windowPtr)
+	    : wxTipWindow(parent, text, 70, (wxTipWindow**)windowPtr)
+	{
+		Bind(wxEVT_KEY_DOWN, &wxEmuStateTip::OnKeyDown, this);
+	}
+
+	// wxTipWindow doesn't correctly handle KeyEvents and crashes... we must overload that.
+	void OnKeyDown(wxKeyEvent& event) { event.StopPropagation(); Close(); }
+};
+
+class CGameListCtrl : public wxListCtrl
+{
+public:
+
+	CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
+	~CGameListCtrl();
+
+	void Update() override;
+
+	void BrowseForDirectory();
+	const GameListItem *GetSelectedISO();
+	const GameListItem *GetISO(size_t index) const;
+
+	enum
+	{
+		COLUMN_DUMMY = 0,
+		COLUMN_PLATFORM,
+		COLUMN_BANNER,
+		COLUMN_TITLE,
+		COLUMN_MAKER,
+		COLUMN_ID,
+		COLUMN_COUNTRY,
+		COLUMN_SIZE,
+		COLUMN_EMULATION_STATE,
+		NUMBER_OF_COLUMN
+	};
+
+private:
+
+	std::vector<int> m_FlagImageIndex;
+	std::vector<int> m_PlatformImageIndex;
+	std::vector<int> m_EmuStateImageIndex;
+	std::vector<GameListItem*> m_ISOFiles;
+
+	void ClearIsoFiles()
+	{
+		while (!m_ISOFiles.empty()) // so lazy
+		{
+			delete m_ISOFiles.back();
+			m_ISOFiles.pop_back();
+		}
+	}
+
+	int last_column;
+	int last_sort;
+	wxSize lastpos;
+	wxEmuStateTip *toolTip;
+	void InitBitmaps();
+	void InsertItemInReportView(long _Index);
+	void SetBackgroundColor();
+	void ScanForISOs();
+
+	// events
+	void OnLeftClick(wxMouseEvent& event);
+	void OnRightClick(wxMouseEvent& event);
+	void OnMouseMotion(wxMouseEvent& event);
+	void OnColumnClick(wxListEvent& event);
+	void OnColBeginDrag(wxListEvent& event);
+	void OnKeyPress(wxListEvent& event);
+	void OnSize(wxSizeEvent& event);
+	void OnProperties(wxCommandEvent& event);
+	void OnWiki(wxCommandEvent& event);
+	void OnOpenContainingFolder(wxCommandEvent& event);
+	void OnOpenSaveFolder(wxCommandEvent& event);
+	void OnExportSave(wxCommandEvent& event);
+	void OnSetDefaultISO(wxCommandEvent& event);
+	void OnDeleteISO(wxCommandEvent& event);
+	void OnCompressISO(wxCommandEvent& event);
+	void OnMultiCompressISO(wxCommandEvent& event);
+	void OnMultiDecompressISO(wxCommandEvent& event);
+	void OnInstallWAD(wxCommandEvent& event);
+	void OnChangeDisc(wxCommandEvent& event);
+
+	void CompressSelection(bool _compress);
+	void AutomaticColumnWidth();
+	void UnselectAll();
+
+	static size_t m_currentItem;
+	static std::string m_currentFilename;
+	static size_t m_numberItem;
+	static bool CompressCB(const std::string& text, float percent, void* arg);
+	static bool MultiCompressCB(const std::string& text, float percent, void* arg);
+};
diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h
new file mode 100644
index 0000000000..2b327b0fad
--- /dev/null
+++ b/Source/Core/DolphinWX/Globals.h
@@ -0,0 +1,325 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// This file holds global data for DolphinWx and DebuggerWx
+
+#pragma once
+
+#include <cstddef>
+#include <wx/event.h>
+
+enum
+{
+	Toolbar_Step,
+	Toolbar_StepOver,
+	Toolbar_StepOut,
+	Toolbar_Skip,
+	Toolbar_GotoPC,
+	Toolbar_SetPC,
+	Toolbar_Debug_Bitmap_Max
+};
+
+enum
+{
+	// Emulation menu
+	IDM_LOAD_STATE = 200,
+	IDM_SAVE_STATE,
+	IDM_SELECT_SLOT,
+	IDM_SAVE_FIRST_STATE,
+	IDM_UNDO_LOAD_STATE,
+	IDM_UNDO_SAVE_STATE,
+	IDM_LOAD_STATE_FILE,
+	IDM_SAVE_STATE_FILE,
+	IDM_SAVE_SLOT_1,
+	IDM_SAVE_SLOT_2,
+	IDM_SAVE_SLOT_3,
+	IDM_SAVE_SLOT_4,
+	IDM_SAVE_SLOT_5,
+	IDM_SAVE_SLOT_6,
+	IDM_SAVE_SLOT_7,
+	IDM_SAVE_SLOT_8,
+	IDM_SAVE_SLOT_9,
+	IDM_SAVE_SLOT_10,
+	IDM_LOAD_SLOT_1,
+	IDM_LOAD_SLOT_2,
+	IDM_LOAD_SLOT_3,
+	IDM_LOAD_SLOT_4,
+	IDM_LOAD_SLOT_5,
+	IDM_LOAD_SLOT_6,
+	IDM_LOAD_SLOT_7,
+	IDM_LOAD_SLOT_8,
+	IDM_LOAD_SLOT_9,
+	IDM_LOAD_SLOT_10,
+	IDM_LOAD_LAST_1,
+	IDM_LOAD_LAST_2,
+	IDM_LOAD_LAST_3,
+	IDM_LOAD_LAST_4,
+	IDM_LOAD_LAST_5,
+	IDM_LOAD_LAST_6,
+	IDM_LOAD_LAST_7,
+	IDM_LOAD_LAST_8,
+	IDM_SELECT_SLOT_1,
+	IDM_SELECT_SLOT_2,
+	IDM_SELECT_SLOT_3,
+	IDM_SELECT_SLOT_4,
+	IDM_SELECT_SLOT_5,
+	IDM_SELECT_SLOT_6,
+	IDM_SELECT_SLOT_7,
+	IDM_SELECT_SLOT_8,
+	IDM_SELECT_SLOT_9,
+	IDM_SELECT_SLOT_10,
+	IDM_SAVE_SELECTED_SLOT,
+	IDM_LOAD_SELECTED_SLOT,
+	IDM_FRAME_SKIP_0,
+	IDM_FRAME_SKIP_1,
+	IDM_FRAME_SKIP_2,
+	IDM_FRAME_SKIP_3,
+	IDM_FRAME_SKIP_4,
+	IDM_FRAME_SKIP_5,
+	IDM_FRAME_SKIP_6,
+	IDM_FRAME_SKIP_7,
+	IDM_FRAME_SKIP_8,
+	IDM_FRAME_SKIP_9,
+	IDM_PLAY,
+	IDM_STOP,
+	IDM_RESET,
+	IDM_TOGGLE_FULLSCREEN,
+
+	// Movie menu
+	IDM_RECORD,
+	IDM_PLAY_RECORD,
+	IDM_RECORD_EXPORT,
+	IDM_RECORD_READ_ONLY,
+	IDM_TAS_INPUT,
+	IDM_TOGGLE_PAUSE_MOVIE,
+	IDM_SHOW_LAG,
+	IDM_SHOW_FRAME_COUNT,
+	IDM_SHOW_INPUT_DISPLAY,
+	IDM_FRAMESTEP,
+	IDM_SCREENSHOT,
+	IDM_TOGGLE_DUMP_FRAMES,
+	IDM_TOGGLE_DUMP_AUDIO,
+
+	// File menu
+	IDM_BROWSE,
+	IDM_DRIVES,
+	IDM_DRIVE1,
+	IDM_DRIVE24 = IDM_DRIVE1 + 23,//248,
+
+	// Tools menu
+	IDM_MEMCARD,
+	IDM_CHEATS,
+	IDM_NETPLAY,
+	IDM_RESTART,
+	IDM_CHANGE_DISC,
+	IDM_LIST_CHANGE_DISC,
+	IDM_PROPERTIES,
+	IDM_GAME_WIKI,
+	IDM_LOAD_WII_MENU,
+	IDM_MENU_INSTALL_WAD,
+	IDM_LIST_INSTALL_WAD,
+	IDM_FIFOPLAYER,
+	IDM_CONNECT_WIIMOTE1,
+	IDM_CONNECT_WIIMOTE2,
+	IDM_CONNECT_WIIMOTE3,
+	IDM_CONNECT_WIIMOTE4,
+	IDM_CONNECT_BALANCEBOARD,
+
+	// View menu
+	IDM_LIST_WAD,
+	IDM_LIST_WII,
+	IDM_LIST_GC,
+	IDM_LIST_JAP,
+	IDM_LIST_PAL,
+	IDM_LIST_USA,
+	IDM_LIST_AUSTRALIA,
+	IDM_LIST_FRANCE,
+	IDM_LIST_GERMANY,
+	IDM_LIST_ITALY,
+	IDM_LIST_KOREA,
+	IDM_LIST_NETHERLANDS,
+	IDM_LIST_RUSSIA,
+	IDM_LIST_SPAIN,
+	IDM_LIST_TAIWAN,
+	IDM_LIST_WORLD,
+	IDM_LIST_UNKNOWN,
+	IDM_LIST_DRIVES,
+	IDM_PURGE_CACHE,
+
+	// Help menu
+	IDM_HELP_WEBSITE,
+	IDM_HELP_ONLINE_DOCS,
+	IDM_HELP_GITHUB,
+
+	// Options menu
+	IDM_CONFIG_GFX_BACKEND,
+	IDM_CONFIG_AUDIO,
+	IDM_CONFIG_CONTROLLERS,
+	IDM_CONFIG_HOTKEYS,
+	IDM_CONFIG_LOGGER,
+
+	// Views
+	IDM_LOG_WINDOW,
+	IDM_LOG_CONFIG_WINDOW,
+	IDM_REGISTER_WINDOW,
+	IDM_WATCH_WINDOW,
+	IDM_BREAKPOINT_WINDOW,
+	IDM_MEMORY_WINDOW,
+	IDM_JIT_WINDOW,
+	IDM_SOUND_WINDOW,
+	IDM_VIDEO_WINDOW,
+	IDM_CODE_WINDOW,
+
+	// List Column Title Toggles
+	IDM_SHOW_SYSTEM,
+	IDM_SHOW_BANNER,
+	IDM_SHOW_MAKER,
+	IDM_SHOW_ID,
+	IDM_SHOW_REGION,
+	IDM_SHOW_SIZE,
+	IDM_SHOW_STATE,
+
+
+	// Float Window IDs
+	IDM_LOG_WINDOW_PARENT,
+	IDM_LOG_CONFIG_WINDOW_PARENT,
+	IDM_REGISTER_WINDOW_PARENT,
+	IDM_BREAKPOINT_WINDOW_PARENT,
+	IDM_MEMORY_WINDOW_PARENT,
+	IDM_JIT_WINDOW_PARENT,
+	IDM_SOUND_WINDOW_PARENT,
+	IDM_VIDEO_WINDOW_PARENT,
+	IDM_CODE_WINDOW_PARENT,
+
+	// Float popup menu IDs
+	IDM_FLOAT_LOG_WINDOW,
+	IDM_FLOAT_LOG_CONFIG_WINDOW,
+	IDM_FLOAT_REGISTER_WINDOW,
+	IDM_FLOAT_BREAKPOINT_WINDOW,
+	IDM_FLOAT_MEMORY_WINDOW,
+	IDM_FLOAT_JIT_WINDOW,
+	IDM_FLOAT_SOUND_WINDOW,
+	IDM_FLOAT_VIDEO_WINDOW,
+	IDM_FLOAT_CODE_WINDOW,
+
+	// --------------------------------------------------------------
+	// Debugger Menu Entries
+	// --------------------
+	// CPU Mode
+	IDM_INTERPRETER,
+	IDM_AUTOMATIC_START, IDM_BOOT_TO_PAUSE,
+	IDM_JIT_NO_BLOCK_CACHE, IDM_JIT_NO_BLOCK_LINKING,  // JIT
+	IDM_JIT_OFF,
+	IDM_JIT_LS_OFF, IDM_JIT_LSLXZ_OFF, IDM_JIT_LSLWZ_OFF, IDM_JIT_LSLBZX_OFF,
+	IDM_JIT_LSP_OFF, IDM_JIT_LSF_OFF,
+	IDM_JIT_I_OFF,
+	IDM_JIT_FP_OFF,
+	IDM_JIT_P_OFF,
+	IDM_JIT_SR_OFF,
+	IDM_FONT_PICKER,
+
+	// Symbols
+	IDM_CLEAR_SYMBOLS,
+	IDM_SCAN_FUNCTIONS,
+	IDM_LOAD_MAP_FILE, IDM_LOAD_MAP_FILE_AS, IDM_LOAD_BAD_MAP_FILE,
+	IDM_SAVEMAPFILE, IDM_SAVE_MAP_FILE_WITH_CODES, IDM_SAVE_MAP_FILE_AS,
+	IDM_CREATE_SIGNATURE_FILE,
+	IDM_APPEND_SIGNATURE_FILE,
+	IDM_COMBINE_SIGNATURE_FILES,
+	IDM_RENAME_SYMBOLS,
+	IDM_USE_SIGNATURE_FILE,
+	IDM_PATCH_HLE_FUNCTIONS,
+
+	// JIT
+	IDM_CLEAR_CODE_CACHE,
+	IDM_LOG_INSTRUCTIONS,
+	IDM_SEARCH_INSTRUCTION,
+
+	// Profiler
+	IDM_PROFILE_BLOCKS,
+	IDM_WRITE_PROFILE,
+	// --------------------------------------------------------------
+
+	// --------------------------------------------------------------
+	// Debugger Toolbar
+	// --------------------
+	ID_TOOLBAR_DEBUG,
+	IDM_STEP,
+	IDM_STEPOVER,
+	IDM_STEPOUT,
+	IDM_TOGGLE_BREAKPOINT,
+	IDM_SKIP,
+	IDM_SETPC,
+	IDM_GOTOPC,
+	IDM_ADDRBOX,
+
+	ID_TOOLBAR_AUI,
+	IDM_SAVE_PERSPECTIVE,
+	IDM_ADD_PERSPECTIVE,
+	IDM_PERSPECTIVES_ADD_PANE_TOP,
+	IDM_PERSPECTIVES_ADD_PANE_BOTTOM,
+	IDM_PERSPECTIVES_ADD_PANE_LEFT,
+	IDM_PERSPECTIVES_ADD_PANE_RIGHT,
+	IDM_PERSPECTIVES_ADD_PANE_CENTER,
+	IDM_EDIT_PERSPECTIVES,
+	IDM_TAB_SPLIT,
+	IDM_NO_DOCKING,
+	IDM_PERSPECTIVES_0,
+	IDM_PERSPECTIVES_100 = IDM_PERSPECTIVES_0 + 100,
+	// --------------------------------------------------------------
+
+	IDM_TOGGLE_DUAL_CORE, // Other
+	IDM_TOGGLE_SKIP_IDLE,
+	IDM_TOGGLE_TOOLBAR,
+	IDM_TOGGLE_STATUSBAR,
+	IDM_NOTIFY_MAP_LOADED,
+	IDM_OPEN_CONTAINING_FOLDER,
+	IDM_OPEN_SAVE_FOLDER,
+	IDM_EXPORT_SAVE,
+	IDM_IMPORT_SAVE,
+	IDM_EXPORT_ALL_SAVE,
+	IDM_SET_DEFAULT_ISO,
+	IDM_DELETE_ISO,
+	IDM_COMPRESS_ISO,
+	IDM_MULTI_COMPRESS_ISO,
+	IDM_MULTI_DECOMPRESS_ISO,
+	IDM_UPDATE_DISASM_DIALOG,
+	IDM_UPDATE_GUI,
+	IDM_UPDATE_STATUS_BAR,
+	IDM_UPDATE_TITLE,
+	IDM_UPDATE_BREAKPOINTS,
+	IDM_UPDATE_JIT_PANE,
+	IDM_PANIC,
+	IDM_KEYSTATE,
+	IDM_WINDOW_SIZE_REQUEST,
+	IDM_STOPPED,
+	IDM_HOST_MESSAGE,
+	IDM_FULLSCREEN_REQUEST,
+
+	IDM_MPANEL, ID_STATUSBAR,
+
+	IDM_FREELOOK_DECREASE_SPEED,
+	IDM_FREELOOK_INCREASE_SPEED,
+	IDM_FREELOOK_RESET_SPEED,
+	IDM_FREELOOK_UP,
+	IDM_FREELOOK_DOWN,
+	IDM_FREELOOK_LEFT,
+	IDM_FREELOOK_RIGHT,
+	IDM_FREELOOK_ZOOM_IN,
+	IDM_FREELOOK_ZOOM_OUT,
+	IDM_FREELOOK_RESET,
+
+	ID_TOOLBAR = 500,
+};
+
+// custom message macro
+#define EVT_HOST_COMMAND(id, fn) \
+	DECLARE_EVENT_TABLE_ENTRY(\
+			wxEVT_HOST_COMMAND, id, wxID_ANY, \
+			(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent(wxCommandEventFunction, &fn), \
+			(wxObject*) nullptr \
+			),
+
+wxDECLARE_EVENT(wxEVT_HOST_COMMAND, wxCommandEvent);
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
new file mode 100644
index 0000000000..d36ce1fde4
--- /dev/null
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -0,0 +1,276 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+#include <wx/app.h>
+#include <wx/bitmap.h>
+#include <wx/filefn.h>
+#include <wx/image.h>
+#include <wx/toplevel.h>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreParameter.h"
+#include "Core/Boot/Boot.h"
+
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/WxUtils.h"
+
+static const u32 CACHE_REVISION = 0x124;
+
+#define DVD_BANNER_WIDTH 96
+#define DVD_BANNER_HEIGHT 32
+
+static std::string GetLanguageString(DiscIO::IVolume::ELanguage language, std::map<DiscIO::IVolume::ELanguage, std::string> strings)
+{
+	auto end = strings.end();
+	auto it = strings.find(language);
+	if (it != end)
+		return it->second;
+
+	// English tends to be a good fallback when the requested language isn't available
+	if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH)
+	{
+		it = strings.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
+		if (it != end)
+			return it->second;
+	}
+
+	// If English isn't available either, just pick something
+	if (!strings.empty())
+		return strings.cbegin()->second;
+
+	return "";
+}
+
+GameListItem::GameListItem(const std::string& _rFileName)
+	: m_FileName(_rFileName)
+	, m_emu_state(0)
+	, m_FileSize(0)
+	, m_Revision(0)
+	, m_Valid(false)
+	, m_BlobCompressed(false)
+	, m_ImageWidth(0)
+	, m_ImageHeight(0)
+{
+	if (LoadFromCache())
+	{
+		m_Valid = true;
+	}
+	else
+	{
+		DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_rFileName);
+
+		if (pVolume != nullptr)
+		{
+			m_Platform = pVolume->GetVolumeType();
+
+			m_names = pVolume->GetNames(true);
+			m_descriptions = pVolume->GetDescriptions();
+			m_company = pVolume->GetCompany();
+
+			m_Country = pVolume->GetCountry();
+			m_FileSize = pVolume->GetRawSize();
+			m_VolumeSize = pVolume->GetSize();
+
+			m_UniqueID = pVolume->GetUniqueID();
+			m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName);
+			m_disc_number = pVolume->GetDiscNumber();
+			m_Revision = pVolume->GetRevision();
+
+			std::vector<u32> Buffer = pVolume->GetBanner(&m_ImageWidth, &m_ImageHeight);
+			u32* pData = Buffer.data();
+			m_pImage.resize(m_ImageWidth * m_ImageHeight * 3);
+
+			for (int i = 0; i < m_ImageWidth * m_ImageHeight; i++)
+			{
+				m_pImage[i * 3 + 0] = (pData[i] & 0xFF0000) >> 16;
+				m_pImage[i * 3 + 1] = (pData[i] & 0x00FF00) >> 8;
+				m_pImage[i * 3 + 2] = (pData[i] & 0x0000FF) >> 0;
+			}
+
+			delete pVolume;
+
+			m_Valid = true;
+
+			// Create a cache file only if we have an image.
+			// Wii ISOs create their images after you have generated the first savegame
+			if (!m_pImage.empty())
+				SaveToCache();
+		}
+	}
+
+	if (m_company.empty() && m_UniqueID.size() >= 6)
+		m_company = DiscIO::GetCompanyFromID(m_UniqueID.substr(4, 2));
+
+	if (IsValid())
+	{
+		IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision);
+		ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state);
+		ini.GetIfExists("EmuState", "EmulationIssues", &m_issues);
+	}
+
+	if (!m_pImage.empty())
+	{
+		wxImage Image(m_ImageWidth, m_ImageHeight, &m_pImage[0], true);
+		double Scale = wxTheApp->GetTopWindow()->GetContentScaleFactor();
+		// Note: This uses nearest neighbor, which subjectively looks a lot
+		// better for GC banners than smooth scaling.
+		Image.Rescale(DVD_BANNER_WIDTH * Scale, DVD_BANNER_HEIGHT * Scale);
+#ifdef __APPLE__
+		m_Bitmap = wxBitmap(Image, -1, Scale);
+#else
+		m_Bitmap = wxBitmap(Image, -1);
+#endif
+	}
+	else
+	{
+		// default banner
+		m_Bitmap.LoadFile(StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)) + "nobanner.png", wxBITMAP_TYPE_PNG);
+	}
+}
+
+GameListItem::~GameListItem()
+{
+}
+
+bool GameListItem::LoadFromCache()
+{
+	return CChunkFileReader::Load<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
+}
+
+void GameListItem::SaveToCache()
+{
+	if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
+		File::CreateDir(File::GetUserPath(D_CACHE_IDX));
+
+	CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
+}
+
+void GameListItem::DoState(PointerWrap &p)
+{
+	p.Do(m_names);
+	p.Do(m_descriptions);
+	p.Do(m_company);
+	p.Do(m_UniqueID);
+	p.Do(m_FileSize);
+	p.Do(m_VolumeSize);
+	p.Do(m_Country);
+	p.Do(m_BlobCompressed);
+	p.Do(m_pImage);
+	p.Do(m_ImageWidth);
+	p.Do(m_ImageHeight);
+	p.Do(m_Platform);
+	p.Do(m_disc_number);
+	p.Do(m_Revision);
+}
+
+std::string GameListItem::CreateCacheFilename()
+{
+	std::string Filename, LegalPathname, extension;
+	SplitPath(m_FileName, &LegalPathname, &Filename, &extension);
+
+	if (Filename.empty()) return Filename; // Disc Drive
+
+	// Filename.extension_HashOfFolderPath_Size.cache
+	// Append hash to prevent ISO name-clashing in different folders.
+	Filename.append(StringFromFormat("%s_%x_%" PRIx64 ".cache",
+		extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()),
+		File::GetSize(m_FileName)));
+
+	std::string fullname(File::GetUserPath(D_CACHE_IDX));
+	fullname += Filename;
+	return fullname;
+}
+
+std::string GameListItem::GetCompany() const
+{
+	return m_company;
+}
+
+std::string GameListItem::GetDescription(DiscIO::IVolume::ELanguage language) const
+{
+	return GetLanguageString(language, m_descriptions);
+}
+
+std::string GameListItem::GetDescription() const
+{
+	bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
+	return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
+}
+
+std::string GameListItem::GetName(DiscIO::IVolume::ELanguage language) const
+{
+	return GetLanguageString(language, m_names);
+}
+
+std::string GameListItem::GetName() const
+{
+	bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
+	std::string name = GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
+	if (name.empty())
+	{
+		// No usable name, return filename (better than nothing)
+		SplitPath(GetFileName(), nullptr, &name, nullptr);
+	}
+	return name;
+}
+
+std::vector<DiscIO::IVolume::ELanguage> GameListItem::GetLanguages() const
+{
+	std::vector<DiscIO::IVolume::ELanguage> languages;
+	for (std::pair<DiscIO::IVolume::ELanguage, std::string> name : m_names)
+		languages.push_back(name.first);
+	return languages;
+}
+
+const std::string GameListItem::GetWiiFSPath() const
+{
+	DiscIO::IVolume *iso = DiscIO::CreateVolumeFromFilename(m_FileName);
+	std::string ret;
+
+	if (iso == nullptr)
+		return ret;
+
+	if (iso->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC)
+	{
+		u64 title = 0;
+
+		iso->GetTitleID((u8*)&title);
+		title = Common::swap64(title);
+
+		const std::string path = StringFromFormat("%s/title/%08x/%08x/data/",
+				File::GetUserPath(D_WIIROOT_IDX).c_str(), (u32)(title>>32), (u32)title);
+
+		if (!File::Exists(path))
+			File::CreateFullPath(path);
+
+		if (path[0] == '.')
+			ret = WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR));
+		else
+			ret = path;
+	}
+	delete iso;
+
+	return ret;
+}
+
diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h
new file mode 100644
index 0000000000..1b7f5dd09e
--- /dev/null
+++ b/Source/Core/DolphinWX/ISOFile.h
@@ -0,0 +1,84 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Common/Common.h"
+#include "DiscIO/Volume.h"
+
+#if defined(HAVE_WX) && HAVE_WX
+#include <wx/image.h>
+#include <wx/bitmap.h>
+#endif
+
+class PointerWrap;
+class GameListItem : NonCopyable
+{
+public:
+	GameListItem(const std::string& _rFileName);
+	~GameListItem();
+
+	bool IsValid() const {return m_Valid;}
+	const std::string& GetFileName() const {return m_FileName;}
+	std::string GetName(DiscIO::IVolume::ELanguage language) const;
+	std::string GetName() const;
+	std::string GetDescription(DiscIO::IVolume::ELanguage language) const;
+	std::string GetDescription() const;
+	std::vector<DiscIO::IVolume::ELanguage> GetLanguages() const;
+	std::string GetCompany() const;
+	u16 GetRevision() const { return m_Revision; }
+	const std::string& GetUniqueID() const {return m_UniqueID;}
+	const std::string GetWiiFSPath() const;
+	DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
+	DiscIO::IVolume::EPlatform GetPlatform() const { return m_Platform; }
+	const std::string& GetIssues() const { return m_issues; }
+	int GetEmuState() const { return m_emu_state; }
+	bool IsCompressed() const {return m_BlobCompressed;}
+	u64 GetFileSize() const {return m_FileSize;}
+	u64 GetVolumeSize() const {return m_VolumeSize;}
+	// 0 is the first disc, 1 is the second disc
+	u8 GetDiscNumber() const {return m_disc_number;}
+#if defined(HAVE_WX) && HAVE_WX
+	const wxBitmap& GetBitmap() const {return m_Bitmap;}
+#endif
+
+	void DoState(PointerWrap &p);
+
+private:
+	std::string m_FileName;
+
+	std::map<DiscIO::IVolume::ELanguage, std::string> m_names;
+	std::map<DiscIO::IVolume::ELanguage, std::string> m_descriptions;
+	std::string m_company;
+
+	std::string m_UniqueID;
+
+	std::string m_issues;
+	int m_emu_state;
+
+	u64 m_FileSize;
+	u64 m_VolumeSize;
+
+	DiscIO::IVolume::ECountry m_Country;
+	DiscIO::IVolume::EPlatform m_Platform;
+	u16 m_Revision;
+
+#if defined(HAVE_WX) && HAVE_WX
+	wxBitmap m_Bitmap;
+#endif
+	bool m_Valid;
+	bool m_BlobCompressed;
+	std::vector<u8> m_pImage;
+	int m_ImageWidth, m_ImageHeight;
+	u8 m_disc_number;
+
+	bool LoadFromCache();
+	void SaveToCache();
+
+	std::string CreateCacheFilename();
+};
diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
new file mode 100644
index 0000000000..5ee8a4a52e
--- /dev/null
+++ b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -0,0 +1,1514 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef __APPLE__
+#import <Cocoa/Cocoa.h>
+#endif
+
+#include <cinttypes>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <vector>
+#include <polarssl/md5.h>
+#include <wx/bitmap.h>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/checklst.h>
+#include <wx/choice.h>
+#include <wx/dialog.h>
+#include <wx/dirdlg.h>
+#include <wx/filedlg.h>
+#include <wx/gbsizer.h>
+#include <wx/image.h>
+#include <wx/imaglist.h>
+#include <wx/itemid.h>
+#include <wx/menu.h>
+#include <wx/mimetype.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/progdlg.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/spinctrl.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/thread.h>
+#include <wx/treebase.h>
+#include <wx/treectrl.h>
+#include <wx/utils.h>
+#include <wx/validate.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/SysConf.h"
+#include "Core/ActionReplay.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreParameter.h"
+#include "Core/GeckoCodeConfig.h"
+#include "Core/PatchEngine.h"
+#include "Core/Boot/Boot.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DolphinWX/ARCodeAddEdit.h"
+#include "DolphinWX/GameListCtrl.h"
+//#include "DolphinWX/Frame.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/PatchAddEdit.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Cheats/GeckoCodeDiag.h"
+#include "DolphinWX/resources/isoprop_disc.xpm"
+#include "DolphinWX/resources/isoprop_file.xpm"
+#include "DolphinWX/resources/isoprop_folder.xpm"
+
+BEGIN_EVENT_TABLE(CISOProperties, wxDialog)
+	EVT_CLOSE(CISOProperties::OnClose)
+	EVT_BUTTON(wxID_OK, CISOProperties::OnCloseClick)
+	EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig)
+	EVT_BUTTON(ID_MD5SUMCOMPUTE, CISOProperties::OnComputeMD5Sum)
+	EVT_BUTTON(ID_SHOWDEFAULTCONFIG, CISOProperties::OnShowDefaultConfig)
+	EVT_CHOICE(ID_EMUSTATE, CISOProperties::SetRefresh)
+	EVT_CHOICE(ID_EMU_ISSUES, CISOProperties::SetRefresh)
+	EVT_LISTBOX(ID_PATCHES_LIST, CISOProperties::ListSelectionChanged)
+	EVT_BUTTON(ID_EDITPATCH, CISOProperties::PatchButtonClicked)
+	EVT_BUTTON(ID_ADDPATCH, CISOProperties::PatchButtonClicked)
+	EVT_BUTTON(ID_REMOVEPATCH, CISOProperties::PatchButtonClicked)
+	EVT_LISTBOX(ID_CHEATS_LIST, CISOProperties::ListSelectionChanged)
+	EVT_BUTTON(ID_EDITCHEAT, CISOProperties::ActionReplayButtonClicked)
+	EVT_BUTTON(ID_ADDCHEAT, CISOProperties::ActionReplayButtonClicked)
+	EVT_BUTTON(ID_REMOVECHEAT, CISOProperties::ActionReplayButtonClicked)
+	EVT_MENU(IDM_BNRSAVEAS, CISOProperties::OnBannerImageSave)
+	EVT_TREE_ITEM_RIGHT_CLICK(ID_TREECTRL, CISOProperties::OnRightClickOnTree)
+	EVT_MENU(IDM_EXTRACTFILE, CISOProperties::OnExtractFile)
+	EVT_MENU(IDM_EXTRACTDIR, CISOProperties::OnExtractDir)
+	EVT_MENU(IDM_EXTRACTALL, CISOProperties::OnExtractDir)
+	EVT_MENU(IDM_EXTRACTAPPLOADER, CISOProperties::OnExtractDataFromHeader)
+	EVT_MENU(IDM_EXTRACTDOL, CISOProperties::OnExtractDataFromHeader)
+	EVT_MENU(IDM_CHECKINTEGRITY, CISOProperties::CheckPartitionIntegrity)
+	EVT_CHOICE(ID_LANG, CISOProperties::OnChangeBannerLang)
+END_EVENT_TABLE()
+
+CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+{
+	// Load ISO data
+	OpenISO = DiscIO::CreateVolumeFromFilename(fileName);
+
+	// Is it really necessary to use GetTitleID if GetUniqueID fails?
+	game_id = OpenISO->GetUniqueID();
+	if (game_id.empty())
+	{
+		u8 game_id_bytes[8];
+		if (OpenISO->GetTitleID(game_id_bytes))
+		{
+			game_id = StringFromFormat("%016" PRIx64, Common::swap64(game_id_bytes));
+		}
+	}
+
+	// Load game INIs
+	GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + game_id + ".ini";
+	GameIniDefault = SCoreStartupParameter::LoadDefaultGameIni(game_id, OpenISO->GetRevision());
+	GameIniLocal = SCoreStartupParameter::LoadLocalGameIni(game_id, OpenISO->GetRevision());
+
+	// Setup GUI
+	OpenGameListItem = new GameListItem(fileName);
+
+	bRefreshList = false;
+
+	CreateGUIControls();
+
+	LoadGameConfig();
+
+	// Disk header and apploader
+
+	m_InternalName->SetValue(StrToWxStr(OpenISO->GetInternalName()));
+	m_GameID->SetValue(StrToWxStr(OpenISO->GetUniqueID()));
+	switch (OpenISO->GetCountry())
+	{
+	case DiscIO::IVolume::COUNTRY_AUSTRALIA:
+		m_Country->SetValue(_("Australia"));
+		break;
+	case DiscIO::IVolume::COUNTRY_EUROPE:
+		m_Country->SetValue(_("Europe"));
+		break;
+	case DiscIO::IVolume::COUNTRY_FRANCE:
+		m_Country->SetValue(_("France"));
+		break;
+	case DiscIO::IVolume::COUNTRY_ITALY:
+		m_Country->SetValue(_("Italy"));
+		break;
+	case DiscIO::IVolume::COUNTRY_GERMANY:
+		m_Country->SetValue(_("Germany"));
+		break;
+	case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+		m_Country->SetValue(_("Netherlands"));
+		break;
+	case DiscIO::IVolume::COUNTRY_RUSSIA:
+		m_Country->SetValue(_("Russia"));
+		break;
+	case DiscIO::IVolume::COUNTRY_SPAIN:
+		m_Country->SetValue(_("Spain"));
+		break;
+	case DiscIO::IVolume::COUNTRY_USA:
+		m_Country->SetValue(_("USA"));
+		break;
+	case DiscIO::IVolume::COUNTRY_JAPAN:
+		m_Country->SetValue(_("Japan"));
+		break;
+	case DiscIO::IVolume::COUNTRY_KOREA:
+		m_Country->SetValue(_("Korea"));
+		break;
+	case DiscIO::IVolume::COUNTRY_TAIWAN:
+		m_Country->SetValue(_("Taiwan"));
+		break;
+	case DiscIO::IVolume::COUNTRY_WORLD:
+		m_Country->SetValue(_("World"));
+		break;
+	case DiscIO::IVolume::COUNTRY_UNKNOWN:
+	default:
+		m_Country->SetValue(_("Unknown"));
+		break;
+	}
+
+	wxString temp = "0x" + StrToWxStr(OpenISO->GetMakerID());
+	m_MakerID->SetValue(temp);
+	m_Revision->SetValue(wxString::Format("%u", OpenISO->GetRevision()));
+	m_Date->SetValue(StrToWxStr(OpenISO->GetApploaderDate()));
+	m_FST->SetValue(wxString::Format("%u", OpenISO->GetFSTSize()));
+
+	// Here we set all the info to be shown + we set the window title
+	bool wii = OpenISO->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+	ChangeBannerDetails(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
+
+	m_Banner->SetBitmap(OpenGameListItem->GetBitmap());
+	m_Banner->Bind(wxEVT_RIGHT_DOWN, &CISOProperties::RightClickOnBanner, this);
+
+	// Filesystem browser/dumper
+	// TODO : Should we add a way to browse the wad file ?
+	if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_WAD)
+	{
+		if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+		{
+			int partition_count = 0;
+			for (int group = 0; group < 4; group++)
+			{
+				for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions...
+				{
+					WiiPartition partition;
+					if ((partition.Partition = DiscIO::CreateVolumeFromFilename(fileName, group, i)) != nullptr)
+					{
+						if ((partition.FileSystem = DiscIO::CreateFileSystem(partition.Partition)) != nullptr)
+						{
+							wxTreeItemId PartitionRoot =
+								m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), partition_count), 0, 0);
+							m_Treectrl->SetItemData(PartitionRoot, new WiiPartition(partition));
+							CreateDirectoryTree(PartitionRoot, partition.FileSystem->GetFileList());
+							if (partition_count == 1)
+								m_Treectrl->Expand(PartitionRoot);
+							partition_count++;
+						}
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+		}
+		else
+		{
+			pFileSystem = DiscIO::CreateFileSystem(OpenISO);
+			if (pFileSystem)
+				CreateDirectoryTree(RootId, pFileSystem->GetFileList());
+		}
+
+		m_Treectrl->Expand(RootId);
+	}
+}
+
+CISOProperties::~CISOProperties()
+{
+	if (OpenISO->GetVolumeType() == DiscIO::IVolume::GAMECUBE_DISC && pFileSystem)
+		delete pFileSystem;
+	delete OpenGameListItem;
+	delete OpenISO;
+}
+
+size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, const std::vector<DiscIO::SFileInfo>& fileInfos)
+{
+	if (fileInfos.empty())
+		return 0;
+	else
+		return CreateDirectoryTree(parent, fileInfos, 1, fileInfos.at(0).m_FileSize);
+}
+
+size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
+		const std::vector<DiscIO::SFileInfo>& fileInfos,
+		const size_t _FirstIndex,
+		const size_t _LastIndex)
+{
+	size_t CurrentIndex = _FirstIndex;
+
+	while (CurrentIndex < _LastIndex)
+	{
+		const DiscIO::SFileInfo rFileInfo = fileInfos[CurrentIndex];
+		std::string filePath = rFileInfo.m_FullPath;
+
+		// Trim the trailing '/' if it exists.
+		if (filePath[filePath.length() - 1] == DIR_SEP_CHR)
+		{
+			filePath.pop_back();
+		}
+
+		// Cut off the path up to the actual filename or folder.
+		// Say we have "/music/stream/stream1.strm", the result will be "stream1.strm".
+		size_t dirSepIndex = filePath.find_last_of(DIR_SEP_CHR);
+		if (dirSepIndex != std::string::npos)
+		{
+			filePath = filePath.substr(dirSepIndex + 1);
+		}
+
+		// check next index
+		if (rFileInfo.IsDirectory())
+		{
+			wxTreeItemId item = m_Treectrl->AppendItem(parent, StrToWxStr(filePath), 1, 1);
+			CurrentIndex = CreateDirectoryTree(item, fileInfos, CurrentIndex + 1, (size_t)rFileInfo.m_FileSize);
+		}
+		else
+		{
+			m_Treectrl->AppendItem(parent, StrToWxStr(filePath), 2, 2);
+			CurrentIndex++;
+		}
+	}
+
+	return CurrentIndex;
+}
+
+long CISOProperties::GetElementStyle(const char* section, const char* key)
+{
+	// Disable 3rd state if default gameini overrides the setting
+	if (GameIniDefault.Exists(section, key))
+		return 0;
+
+	return wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER;
+}
+
+void CISOProperties::CreateGUIControls()
+{
+	wxButton* const EditConfig = new wxButton(this, ID_EDITCONFIG, _("Edit Config"));
+	EditConfig->SetToolTip(_("This will let you manually edit the INI config file."));
+
+	wxButton* const EditConfigDefault = new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"));
+	EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor."));
+
+	// Notebook
+	wxNotebook* const m_Notebook = new wxNotebook(this, ID_NOTEBOOK);
+	wxPanel* const m_GameConfig = new wxPanel(m_Notebook, ID_GAMECONFIG);
+	m_Notebook->AddPage(m_GameConfig, _("GameConfig"));
+	wxPanel* const m_PatchPage = new wxPanel(m_Notebook, ID_PATCH_PAGE);
+	m_Notebook->AddPage(m_PatchPage, _("Patches"));
+	wxPanel* const m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE);
+	m_Notebook->AddPage(m_CheatPage, _("AR Codes"));
+	m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook);
+	m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes"));
+	wxPanel* const m_Information = new wxPanel(m_Notebook, ID_INFORMATION);
+	m_Notebook->AddPage(m_Information, _("Info"));
+
+	// GameConfig editing - Overrides and emulation state
+	wxStaticText* const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting."));
+
+	// Core
+	CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"));
+	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"));
+	MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"));
+	MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
+	DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"));
+	DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled."));
+	FPRF = new wxCheckBox(m_GameConfig, ID_FPRF, _("Enable FPRF"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FPRF"));
+	FPRF->SetToolTip(_("Enables Floating Point Result Flag calculation, needed for a few games. (ON = Compatible, OFF = Fast)"));
+	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"));
+	SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)"));
+	FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"));
+	FastDiscSpeed->SetToolTip(_("Enable fast disc access. This can cause crashes and other problems in some games. (ON = Fast, OFF = Compatible)"));
+	DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"));
+
+	wxBoxSizer* const sGPUDeterminism = new wxBoxSizer(wxHORIZONTAL);
+	wxStaticText* const GPUDeterminismText = new wxStaticText(m_GameConfig, wxID_ANY, _("Deterministic dual core: "));
+	arrayStringFor_GPUDeterminism.Add(_("Not Set"));
+	arrayStringFor_GPUDeterminism.Add(_("auto"));
+	arrayStringFor_GPUDeterminism.Add(_("none"));
+	arrayStringFor_GPUDeterminism.Add(_("fake-completion"));
+	GPUDeterminism = new wxChoice(m_GameConfig, ID_GPUDETERMINISM, wxDefaultPosition, wxDefaultSize, arrayStringFor_GPUDeterminism);
+	sGPUDeterminism->Add(GPUDeterminismText);
+	sGPUDeterminism->Add(GPUDeterminism);
+
+	// Wii Console
+	EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"));
+
+	// Stereoscopy
+	wxBoxSizer* const sDepthPercentage = new wxBoxSizer(wxHORIZONTAL);
+	wxStaticText* const DepthPercentageText = new wxStaticText(m_GameConfig, wxID_ANY, _("Depth Percentage: "));
+	DepthPercentage = new wxSlider(m_GameConfig, ID_DEPTHPERCENTAGE, 100, 0, 200);
+	DepthPercentage->SetToolTip(_("This value is multiplied with the depth set in the graphics configuration."));
+	sDepthPercentage->Add(DepthPercentageText);
+	sDepthPercentage->Add(DepthPercentage);
+
+	wxBoxSizer* const sConvergenceMinimum = new wxBoxSizer(wxHORIZONTAL);
+	wxStaticText* const ConvergenceMinimumText = new wxStaticText(m_GameConfig, wxID_ANY, _("Convergence Minimum: "));
+	ConvergenceMinimum = new wxSpinCtrl(m_GameConfig, ID_CONVERGENCEMINIMUM);
+	ConvergenceMinimum->SetRange(0, INT32_MAX);
+	ConvergenceMinimum->SetToolTip(_("This value is added to the convergence value set in the graphics configuration."));
+	sConvergenceMinimum->Add(ConvergenceMinimumText);
+	sConvergenceMinimum->Add(ConvergenceMinimum);
+
+	MonoDepth = new wxCheckBox(m_GameConfig, ID_MONODEPTH, _("Monoscopic Shadows"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video_Stereoscopy", "StereoEFBMonoDepth"));
+	MonoDepth->SetToolTip(_("Use a single depth buffer for both eyes. Needed for a few games."));
+
+	wxBoxSizer* const sEmuState = new wxBoxSizer(wxHORIZONTAL);
+	wxStaticText* const EmuStateText = new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
+	arrayStringFor_EmuState.Add(_("Not Set"));
+	arrayStringFor_EmuState.Add(_("Broken"));
+	arrayStringFor_EmuState.Add(_("Intro"));
+	arrayStringFor_EmuState.Add(_("In Game"));
+	arrayStringFor_EmuState.Add(_("Playable"));
+	arrayStringFor_EmuState.Add(_("Perfect"));
+	EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE, wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState);
+	EmuIssues = new wxTextCtrl(m_GameConfig, ID_EMU_ISSUES, wxEmptyString);
+
+	wxBoxSizer* const sConfigPage = new wxBoxSizer(wxVERTICAL);
+	wxStaticBoxSizer* const sbCoreOverrides =
+		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
+	sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(MMU, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(FPRF, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(SyncGPU, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(sGPUDeterminism, 0, wxEXPAND|wxALL, 5);
+
+	wxStaticBoxSizer * const sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
+	if (OpenISO->GetVolumeType() == DiscIO::IVolume::GAMECUBE_DISC)
+	{
+		sbWiiOverrides->ShowItems(false);
+		EnableWideScreen->Hide();
+	}
+	sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
+
+	wxStaticBoxSizer* const sbStereoOverrides =
+		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Stereoscopy"));
+	sbStereoOverrides->Add(sDepthPercentage);
+	sbStereoOverrides->Add(sConvergenceMinimum);
+	sbStereoOverrides->Add(MonoDepth);
+
+	wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
+	sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
+	sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
+	sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND);
+	sbGameConfig->Add(sbStereoOverrides, 0, wxEXPAND);
+	sConfigPage->Add(sbGameConfig, 0, wxEXPAND|wxALL, 5);
+	sEmuState->Add(EmuStateText, 0, wxALIGN_CENTER_VERTICAL);
+	sEmuState->Add(EmuState, 0, wxEXPAND);
+	sEmuState->Add(EmuIssues, 1, wxEXPAND);
+	sConfigPage->Add(sEmuState, 0, wxEXPAND|wxALL, 5);
+	m_GameConfig->SetSizer(sConfigPage);
+
+
+	// Patches
+	wxBoxSizer* const sPatches = new wxBoxSizer(wxVERTICAL);
+	Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_HSCROLL);
+	wxBoxSizer* const sPatchButtons = new wxBoxSizer(wxHORIZONTAL);
+	EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit..."));
+	wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add..."));
+	RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove"));
+	EditPatch->Disable();
+	RemovePatch->Disable();
+
+	wxBoxSizer* sPatchPage = new wxBoxSizer(wxVERTICAL);
+	sPatches->Add(Patches, 1, wxEXPAND|wxALL, 0);
+	sPatchButtons->Add(EditPatch,  0, wxEXPAND|wxALL, 0);
+	sPatchButtons->AddStretchSpacer();
+	sPatchButtons->Add(AddPatch,  0, wxEXPAND|wxALL, 0);
+	sPatchButtons->Add(RemovePatch,  0, wxEXPAND|wxALL, 0);
+	sPatches->Add(sPatchButtons, 0, wxEXPAND|wxALL, 0);
+	sPatchPage->Add(sPatches, 1, wxEXPAND|wxALL, 5);
+	m_PatchPage->SetSizer(sPatchPage);
+
+
+	// Action Replay Cheats
+	wxBoxSizer * const sCheats = new wxBoxSizer(wxVERTICAL);
+	Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_HSCROLL);
+	wxBoxSizer * const sCheatButtons = new wxBoxSizer(wxHORIZONTAL);
+	EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit..."));
+	wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add..."));
+	RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove"));
+	EditCheat->Disable();
+	RemoveCheat->Disable();
+
+	wxBoxSizer* sCheatPage = new wxBoxSizer(wxVERTICAL);
+	sCheats->Add(Cheats, 1, wxEXPAND|wxALL, 0);
+	sCheatButtons->Add(EditCheat,  0, wxEXPAND|wxALL, 0);
+	sCheatButtons->AddStretchSpacer();
+	sCheatButtons->Add(AddCheat,  0, wxEXPAND|wxALL, 0);
+	sCheatButtons->Add(RemoveCheat,  0, wxEXPAND|wxALL, 0);
+	sCheats->Add(sCheatButtons, 0, wxEXPAND|wxALL, 0);
+	sCheatPage->Add(sCheats, 1, wxEXPAND|wxALL, 5);
+	m_CheatPage->SetSizer(sCheatPage);
+
+
+	wxStaticText* const m_InternalNameText = new wxStaticText(m_Information, wxID_ANY, _("Internal Name:"));
+	m_InternalName = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_GameIDText = new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
+	m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_CountryText = new wxStaticText(m_Information, wxID_ANY, _("Country:"));
+	m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_MakerIDText = new wxStaticText(m_Information, wxID_ANY, _("Maker ID:"));
+	m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_RevisionText = new wxStaticText(m_Information, wxID_ANY, _("Revision:"));
+	m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_DateText = new wxStaticText(m_Information, wxID_ANY, _("Apploader Date:"));
+	m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_FSTText = new wxStaticText(m_Information, wxID_ANY, _("FST Size:"));
+	m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_MD5SumText = new wxStaticText(m_Information, wxID_ANY, _("MD5 Checksum:"));
+	m_MD5Sum = new wxTextCtrl(m_Information, ID_MD5SUM, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	m_MD5SumCompute = new wxButton(m_Information, ID_MD5SUMCOMPUTE, _("Compute"));
+
+	wxStaticText* const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:"));
+
+	bool wii = OpenISO->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+	DiscIO::IVolume::ELanguage preferred_language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii);
+
+	std::vector<DiscIO::IVolume::ELanguage> languages = OpenGameListItem->GetLanguages();
+	int preferred_language_index = 0;
+	for (size_t i = 0; i < languages.size(); ++i)
+	{
+		if (languages[i] == preferred_language)
+			preferred_language_index = i;
+
+		switch (languages[i])
+		{
+		case DiscIO::IVolume::LANGUAGE_JAPANESE:
+			arrayStringFor_Lang.Add(_("Japanese"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_ENGLISH:
+			arrayStringFor_Lang.Add(_("English"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_GERMAN:
+			arrayStringFor_Lang.Add(_("German"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_FRENCH:
+			arrayStringFor_Lang.Add(_("French"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_SPANISH:
+			arrayStringFor_Lang.Add(_("Spanish"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_ITALIAN:
+			arrayStringFor_Lang.Add(_("Italian"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_DUTCH:
+			arrayStringFor_Lang.Add(_("Dutch"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_SIMPLIFIED_CHINESE:
+			arrayStringFor_Lang.Add(_("Simplified Chinese"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_TRADITIONAL_CHINESE:
+			arrayStringFor_Lang.Add(_("Traditional Chinese"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_KOREAN:
+			arrayStringFor_Lang.Add(_("Korean"));
+			break;
+		case DiscIO::IVolume::LANGUAGE_UNKNOWN:
+		default:
+			arrayStringFor_Lang.Add(_("Unknown"));
+			break;
+		}
+	}
+	m_Lang = new wxChoice(m_Information, ID_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_Lang);
+	m_Lang->SetSelection(preferred_language_index);
+	if (arrayStringFor_Lang.size() <= 1)
+		m_Lang->Disable();
+
+	wxStaticText* const m_NameText = new wxStaticText(m_Information, wxID_ANY, _("Name:"));
+	m_Name = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
+	m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText* const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Description:"));
+	m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
+	wxStaticText* const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
+	m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32));
+
+	// ISO Details
+	wxGridBagSizer* const sISODetails = new wxGridBagSizer(0, 0);
+	sISODetails->Add(m_InternalNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_InternalName, wxGBPosition(0, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_GameID, wxGBPosition(1, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_Country, wxGBPosition(2, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_MakerIDText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_MakerID, wxGBPosition(3, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_RevisionText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_Revision, wxGBPosition(4, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_DateText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_Date, wxGBPosition(5, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_FSTText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_FST, wxGBPosition(6, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_MD5SumText, wxGBPosition(7, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_MD5Sum, wxGBPosition(7, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	wxSizer* sMD5SumButtonSizer = CreateButtonSizer(wxNO_DEFAULT);
+	sMD5SumButtonSizer->Add(m_MD5SumCompute);
+	sISODetails->Add(sMD5SumButtonSizer, wxGBPosition(7, 2), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+
+	sISODetails->AddGrowableCol(1);
+	wxStaticBoxSizer* const sbISODetails =
+		new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details"));
+	sbISODetails->Add(sISODetails, 0, wxEXPAND, 5);
+
+	// Banner Details
+	wxGridBagSizer* const sBannerDetails = new wxGridBagSizer(0, 0);
+	sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sBannerDetails->Add(m_NameText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sBannerDetails->Add(m_Name, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sBannerDetails->Add(m_MakerText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sBannerDetails->Add(m_Maker, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sBannerDetails->Add(m_CommentText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5);
+	sBannerDetails->Add(m_Comment, wxGBPosition(3, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sBannerDetails->Add(m_BannerText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
+	sBannerDetails->Add(m_Banner, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sBannerDetails->AddGrowableCol(1);
+	wxStaticBoxSizer* const sbBannerDetails =
+		new wxStaticBoxSizer(wxVERTICAL, m_Information, _("Banner Details"));
+	sbBannerDetails->Add(sBannerDetails, 0, wxEXPAND, 5);
+
+	wxBoxSizer* const sInfoPage = new wxBoxSizer(wxVERTICAL);
+	sInfoPage->Add(sbISODetails, 0, wxEXPAND|wxALL, 5);
+	sInfoPage->Add(sbBannerDetails, 0, wxEXPAND|wxALL, 5);
+	m_Information->SetSizer(sInfoPage);
+
+	if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_WAD)
+	{
+		wxPanel* const m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM);
+		m_Notebook->AddPage(m_Filesystem, _("Filesystem"));
+
+		// Filesystem icons
+		wxImageList* const m_iconList = new wxImageList(16, 16);
+		m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap);   // 0
+		m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap); // 1
+		m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap);   // 2
+
+		// Filesystem tree
+		m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL);
+		m_Treectrl->AssignImageList(m_iconList);
+		RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, nullptr);
+
+		wxBoxSizer* sTreePage = new wxBoxSizer(wxVERTICAL);
+		sTreePage->Add(m_Treectrl, 1, wxEXPAND|wxALL, 5);
+		m_Filesystem->SetSizer(sTreePage);
+	}
+
+	wxSizer* sButtons = CreateButtonSizer(wxNO_DEFAULT);
+	sButtons->Prepend(EditConfigDefault);
+	sButtons->Prepend(EditConfig);
+	sButtons->Add(new wxButton(this, wxID_OK, _("Close")));
+
+	// If there is no default gameini, disable the button.
+	bool game_ini_exists = false;
+	for (const std::string& ini_filename : SCoreStartupParameter::GetGameIniFilenames(game_id, OpenISO->GetRevision()))
+	{
+		if (File::Exists(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + ini_filename))
+		{
+			game_ini_exists = true;
+			break;
+		}
+	}
+	if (!game_ini_exists)
+		EditConfigDefault->Disable();
+
+	// Add notebook and buttons to the dialog
+	wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
+	sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5);
+	sMain->Add(sButtons, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+	sMain->SetMinSize(wxSize(500, -1));
+
+	SetSizerAndFit(sMain);
+	Center();
+	SetFocus();
+}
+
+void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))
+{
+	if (!SaveGameConfig())
+		WxUtils::ShowErrorDialog(wxString::Format(_("Could not save %s."), GameIniFileLocal.c_str()));
+	if (bRefreshList)
+		((CGameListCtrl*)GetParent())->Update();
+	Destroy();
+}
+
+void CISOProperties::OnCloseClick(wxCommandEvent& WXUNUSED (event))
+{
+	Close();
+}
+
+void CISOProperties::RightClickOnBanner(wxMouseEvent& event)
+{
+	wxMenu popupMenu;
+	popupMenu.Append(IDM_BNRSAVEAS, _("Save as..."));
+	PopupMenu(&popupMenu);
+
+	event.Skip();
+}
+
+void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event))
+{
+	wxString dirHome;
+
+	wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format("%s.png", m_GameID->GetValue().c_str()),
+		wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+	if (dialog.ShowModal() == wxID_OK)
+	{
+		m_Banner->GetBitmap().ConvertToImage().SaveFile(dialog.GetPath());
+	}
+	Raise();
+}
+
+void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
+{
+	m_Treectrl->SelectItem(event.GetItem());
+
+	wxMenu popupMenu;
+
+	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0 &&
+	    m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
+	{
+		popupMenu.Append(IDM_EXTRACTDIR, _("Extract Partition..."));
+	}
+	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1)
+	{
+		popupMenu.Append(IDM_EXTRACTDIR, _("Extract Directory..."));
+	}
+	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2)
+	{
+		popupMenu.Append(IDM_EXTRACTFILE, _("Extract File..."));
+	}
+
+	popupMenu.Append(IDM_EXTRACTALL, _("Extract All Files..."));
+
+	if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_DISC ||
+		(m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0 &&
+		m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection()))
+	{
+		popupMenu.AppendSeparator();
+		popupMenu.Append(IDM_EXTRACTAPPLOADER, _("Extract Apploader..."));
+		popupMenu.Append(IDM_EXTRACTDOL, _("Extract DOL..."));
+	}
+
+	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0 &&
+		m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
+	{
+		popupMenu.AppendSeparator();
+		popupMenu.Append(IDM_CHECKINTEGRITY, _("Check Partition Integrity"));
+	}
+
+	PopupMenu(&popupMenu);
+
+	event.Skip();
+}
+
+void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
+{
+	wxString File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
+
+	wxString Path = wxFileSelector(
+		_("Export File"),
+		wxEmptyString, File, wxEmptyString,
+		wxGetTranslation(wxALL_FILES),
+		wxFD_SAVE,
+		this);
+
+	if (!Path || !File)
+		return;
+
+	while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
+	{
+		wxString temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
+		File = temp + DIR_SEP_CHR + File;
+
+		m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
+	}
+
+	if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+	{
+		const wxTreeItemId tree_selection = m_Treectrl->GetSelection();
+		WiiPartition* partition = reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(tree_selection));
+		File.erase(0, m_Treectrl->GetItemText(tree_selection).length() + 1); // Remove "Partition x/"
+
+		partition->FileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
+	}
+	else
+	{
+		pFileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
+	}
+}
+
+void CISOProperties::ExportDir(const std::string& _rFullPath, const std::string& _rExportFolder, const WiiPartition* partition)
+{
+	DiscIO::IFileSystem* const fs = OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC ? partition->FileSystem : pFileSystem;
+
+	const std::vector<DiscIO::SFileInfo>& fst = fs->GetFileList();
+
+	u32 index = 0;
+	u32 size = 0;
+
+	// Extract all
+	if (_rFullPath.empty())
+	{
+		index = 0;
+		size = (u32)fst.size();
+
+		fs->ExportApploader(_rExportFolder);
+		if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_DISC)
+			fs->ExportDOL(_rExportFolder);
+	}
+	else
+	{
+		// Look for the dir we are going to extract
+		for (index = 0; index != fst.size(); ++index)
+		{
+			if (fst[index].m_FullPath == _rFullPath)
+			{
+				DEBUG_LOG(DISCIO, "Found the directory at %u", index);
+				size = (u32)fst[index].m_FileSize;
+				break;
+			}
+		}
+
+		DEBUG_LOG(DISCIO,"Directory found from %u to %u\nextracting to:\n%s", index , size, _rExportFolder.c_str());
+	}
+
+	wxString dialogTitle = (index != 0) ? _("Extracting Directory") : _("Extracting All Files");
+	wxProgressDialog dialog(
+		dialogTitle,
+		_("Extracting..."),
+		size - 1,
+		this,
+		wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT |
+		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+		wxPD_SMOOTH
+		);
+
+	// Extraction
+	for (u32 i = index; i < size; i++)
+	{
+		dialog.SetTitle(wxString::Format("%s : %d%%", dialogTitle.c_str(),
+			(u32)(((float)(i - index) / (float)(size - index)) * 100)));
+
+		dialog.Update(i, wxString::Format(_("Extracting %s"), StrToWxStr(fst[i].m_FullPath)));
+
+		if (dialog.WasCancelled())
+			break;
+
+		if (fst[i].IsDirectory())
+		{
+			const std::string exportName = StringFromFormat("%s/%s/", _rExportFolder.c_str(), fst[i].m_FullPath.c_str());
+			DEBUG_LOG(DISCIO, "%s", exportName.c_str());
+
+			if (!File::Exists(exportName) && !File::CreateFullPath(exportName))
+			{
+				ERROR_LOG(DISCIO, "Could not create the path %s", exportName.c_str());
+			}
+			else
+			{
+				if (!File::IsDirectory(exportName))
+					ERROR_LOG(DISCIO, "%s already exists and is not a directory", exportName.c_str());
+
+				DEBUG_LOG(DISCIO, "Folder %s already exists", exportName.c_str());
+			}
+		}
+		else
+		{
+			const std::string exportName = StringFromFormat("%s/%s", _rExportFolder.c_str(), fst[i].m_FullPath.c_str());
+			DEBUG_LOG(DISCIO, "%s", exportName.c_str());
+
+			if (!File::Exists(exportName) && !fs->ExportFile(fst[i].m_FullPath, exportName))
+			{
+				ERROR_LOG(DISCIO, "Could not export %s", exportName.c_str());
+			}
+			else
+			{
+				DEBUG_LOG(DISCIO, "%s already exists", exportName.c_str());
+			}
+		}
+	}
+}
+
+void CISOProperties::OnExtractDir(wxCommandEvent& event)
+{
+	wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
+	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
+
+	if (!Path || !Directory)
+		return;
+
+	if (event.GetId() == IDM_EXTRACTALL)
+	{
+		if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+		{
+			wxTreeItemIdValue cookie;
+			wxTreeItemId root = m_Treectrl->GetRootItem();
+			wxTreeItemId item = m_Treectrl->GetFirstChild(root, cookie);
+			while (item.IsOk())
+			{
+				ExportDir("", WxStrToStr(Path), reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(item)));
+				item = m_Treectrl->GetNextChild(root, cookie);
+			}
+		}
+		else
+		{
+			ExportDir("", WxStrToStr(Path));
+		}
+
+		return;
+	}
+
+	while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
+	{
+		wxString temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
+		Directory = temp + DIR_SEP_CHR + Directory;
+
+		m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
+	}
+
+	Directory += DIR_SEP_CHR;
+
+	if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+	{
+		const wxTreeItemId tree_selection = m_Treectrl->GetSelection();
+		WiiPartition* partition = reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(tree_selection));
+		Directory.erase(0, m_Treectrl->GetItemText(tree_selection).length() + 1); // Remove "Partition x/"
+
+		ExportDir(WxStrToStr(Directory), WxStrToStr(Path), partition);
+	}
+	else
+	{
+		ExportDir(WxStrToStr(Directory), WxStrToStr(Path));
+	}
+}
+
+void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
+{
+	DiscIO::IFileSystem *FS = nullptr;
+	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
+
+	if (Path.empty())
+		return;
+
+	if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
+	{
+		WiiPartition* partition = reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(m_Treectrl->GetSelection()));
+		FS = partition->FileSystem;
+	}
+	else
+	{
+		FS = pFileSystem;
+	}
+
+	bool ret = false;
+	if (event.GetId() == IDM_EXTRACTAPPLOADER)
+	{
+		ret = FS->ExportApploader(WxStrToStr(Path));
+	}
+	else if (event.GetId() == IDM_EXTRACTDOL)
+	{
+		ret = FS->ExportDOL(WxStrToStr(Path));
+	}
+
+	if (!ret)
+		WxUtils::ShowErrorDialog(wxString::Format(_("Failed to extract to %s!"), WxStrToStr(Path).c_str()));
+}
+
+class IntegrityCheckThread : public wxThread
+{
+public:
+	IntegrityCheckThread(const WiiPartition& Partition)
+		: wxThread(wxTHREAD_JOINABLE), m_Partition(Partition)
+	{
+		Create();
+	}
+
+	virtual ExitCode Entry() override
+	{
+		return (ExitCode)m_Partition.Partition->CheckIntegrity();
+	}
+
+private:
+	const WiiPartition& m_Partition;
+};
+
+void CISOProperties::CheckPartitionIntegrity(wxCommandEvent& event)
+{
+	// Normally we can't enter this function if we aren't analyzing a Wii disc
+	// anyway, but let's still check to be sure.
+	if (OpenISO->GetVolumeType() != DiscIO::IVolume::WII_DISC)
+		return;
+
+	wxProgressDialog dialog(_("Checking integrity..."), _("Working..."), 1000, this,
+		wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_SMOOTH
+	);
+
+	WiiPartition* partition = reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(m_Treectrl->GetSelection()));
+	IntegrityCheckThread thread(*partition);
+	thread.Run();
+
+	while (thread.IsAlive())
+	{
+		dialog.Pulse();
+		wxThread::Sleep(50);
+	}
+
+	dialog.Destroy();
+
+	if (!thread.Wait())
+	{
+		wxMessageBox(
+			wxString::Format(_("Integrity check for %s failed. The disc image is most "
+			                   "likely corrupted or has been patched incorrectly."),
+			                 m_Treectrl->GetItemText(m_Treectrl->GetSelection())),
+			_("Integrity Check Error"), wxOK | wxICON_ERROR, this
+		);
+	}
+	else
+	{
+		wxMessageBox(_("Integrity check completed. No errors have been found."),
+					 _("Integrity check completed"), wxOK | wxICON_INFORMATION, this);
+	}
+}
+
+void CISOProperties::SetRefresh(wxCommandEvent& event)
+{
+	bRefreshList = true;
+
+	if (event.GetId() == ID_EMUSTATE)
+		EmuIssues->Enable(event.GetSelection() != 0);
+}
+
+void CISOProperties::SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox)
+{
+	// Prefer local gameini value over default gameini value.
+	bool value;
+	if (GameIniLocal.GetOrCreateSection(section)->Get(key, &value))
+		checkbox->Set3StateValue((wxCheckBoxState)value);
+	else if (GameIniDefault.GetOrCreateSection(section)->Get(key, &value))
+		checkbox->Set3StateValue((wxCheckBoxState)value);
+	else
+		checkbox->Set3StateValue(wxCHK_UNDETERMINED);
+}
+
+void CISOProperties::LoadGameConfig()
+{
+	SetCheckboxValueFromGameini("Core", "CPUThread", CPUThread);
+	SetCheckboxValueFromGameini("Core", "SkipIdle", SkipIdle);
+	SetCheckboxValueFromGameini("Core", "MMU", MMU);
+	SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF);
+	SetCheckboxValueFromGameini("Core", "FPRF", FPRF);
+	SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU);
+	SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed);
+	SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE);
+	SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen);
+	SetCheckboxValueFromGameini("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth);
+
+	IniFile::Section* default_video = GameIniDefault.GetOrCreateSection("Video");
+
+	int iTemp;
+	default_video->Get("ProjectionHack", &iTemp);
+	default_video->Get("PH_SZNear", &m_PHack_Data.PHackSZNear);
+	if (GameIniLocal.GetIfExists("Video", "PH_SZNear", &iTemp))
+		m_PHack_Data.PHackSZNear = !!iTemp;
+	default_video->Get("PH_SZFar", &m_PHack_Data.PHackSZFar);
+	if (GameIniLocal.GetIfExists("Video", "PH_SZFar", &iTemp))
+		m_PHack_Data.PHackSZFar = !!iTemp;
+
+	std::string sTemp;
+	default_video->Get("PH_ZNear", &m_PHack_Data.PHZNear);
+	if (GameIniLocal.GetIfExists("Video", "PH_ZNear", &sTemp))
+		m_PHack_Data.PHZNear = sTemp;
+	default_video->Get("PH_ZFar", &m_PHack_Data.PHZFar);
+	if (GameIniLocal.GetIfExists("Video", "PH_ZFar", &sTemp))
+		m_PHack_Data.PHZFar = sTemp;
+
+	IniFile::Section* default_emustate = GameIniDefault.GetOrCreateSection("EmuState");
+	default_emustate->Get("EmulationStateId", &iTemp, 0/*Not Set*/);
+	EmuState->SetSelection(iTemp);
+	if (GameIniLocal.GetIfExists("EmuState", "EmulationStateId", &iTemp))
+		EmuState->SetSelection(iTemp);
+
+	default_emustate->Get("EmulationIssues", &sTemp);
+	if (!sTemp.empty())
+		EmuIssues->SetValue(StrToWxStr(sTemp));
+	if (GameIniLocal.GetIfExists("EmuState", "EmulationIssues", &sTemp))
+		EmuIssues->SetValue(StrToWxStr(sTemp));
+
+	EmuIssues->Enable(EmuState->GetSelection() != 0);
+
+	sTemp = "";
+	if (!GameIniLocal.GetIfExists("Core", "GPUDeterminismMode", &sTemp))
+		GameIniDefault.GetIfExists("Core", "GPUDeterminismMode", &sTemp);
+
+	if (sTemp == "")
+		GPUDeterminism->SetSelection(0);
+	else if (sTemp == "auto")
+		GPUDeterminism->SetSelection(1);
+	else if (sTemp == "none")
+		GPUDeterminism->SetSelection(2);
+	else if (sTemp == "fake-completion")
+		GPUDeterminism->SetSelection(3);
+
+	IniFile::Section* default_stereoscopy = GameIniDefault.GetOrCreateSection("Video_Stereoscopy");
+	default_stereoscopy->Get("StereoDepthPercentage", &iTemp, 100);
+	GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoDepthPercentage", &iTemp);
+	DepthPercentage->SetValue(iTemp);
+	default_stereoscopy->Get("StereoConvergenceMinimum", &iTemp, 0);
+	GameIniLocal.GetIfExists("Video_Stereoscopy", "StereoConvergenceMinimum", &iTemp);
+	ConvergenceMinimum->SetValue(iTemp);
+
+	PatchList_Load();
+	ActionReplayList_Load();
+	m_geckocode_panel->LoadCodes(GameIniDefault, GameIniLocal, OpenISO->GetUniqueID());
+}
+
+void CISOProperties::SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox)
+{
+	// Delete any existing entries from the local gameini if checkbox is undetermined.
+	// Otherwise, write the current value to the local gameini if the value differs from the default gameini values.
+	// Delete any existing entry from the local gameini if the value does not differ from the default gameini value.
+	bool checkbox_val = (checkbox->Get3StateValue() == wxCHK_CHECKED);
+
+	if (checkbox->Get3StateValue() == wxCHK_UNDETERMINED)
+		GameIniLocal.DeleteKey(section, key);
+	else if (!GameIniDefault.Exists(section, key))
+		GameIniLocal.GetOrCreateSection(section)->Set(key, checkbox_val);
+	else
+	{
+		bool default_value;
+		GameIniDefault.GetOrCreateSection(section)->Get(key, &default_value);
+		if (default_value != checkbox_val)
+			GameIniLocal.GetOrCreateSection(section)->Set(key, checkbox_val);
+		else
+			GameIniLocal.DeleteKey(section, key);
+	}
+}
+
+bool CISOProperties::SaveGameConfig()
+{
+	SaveGameIniValueFrom3StateCheckbox("Core", "CPUThread", CPUThread);
+	SaveGameIniValueFrom3StateCheckbox("Core", "SkipIdle", SkipIdle);
+	SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU);
+	SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF);
+	SaveGameIniValueFrom3StateCheckbox("Core", "FPRF", FPRF);
+	SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU);
+	SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed);
+	SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE);
+	SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen);
+	SaveGameIniValueFrom3StateCheckbox("Video_Stereoscopy", "StereoEFBMonoDepth", MonoDepth);
+
+	#define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \
+		if (GameIniDefault.Exists((section), (key))) { \
+			std::remove_reference<decltype((val))>::type tmp__; \
+			GameIniDefault.GetOrCreateSection((section))->Get((key), &tmp__); \
+			if ((val) != tmp__) \
+				GameIniLocal.GetOrCreateSection((section))->Set((key), (val)); \
+			else \
+				GameIniLocal.DeleteKey((section), (key)); \
+		} else if ((val) != (def)) \
+			GameIniLocal.GetOrCreateSection((section))->Set((key), (val)); \
+		else \
+			GameIniLocal.DeleteKey((section), (key)); \
+	} while (0)
+
+	SAVE_IF_NOT_DEFAULT("Video", "PH_SZNear", (m_PHack_Data.PHackSZNear ? 1 : 0), 0);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (m_PHack_Data.PHackSZFar ? 1 : 0), 0);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_ZNear", m_PHack_Data.PHZNear, "");
+	SAVE_IF_NOT_DEFAULT("Video", "PH_ZFar", m_PHack_Data.PHZFar, "");
+	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationStateId", EmuState->GetSelection(), 0);
+
+	std::string emu_issues = EmuIssues->GetValue().ToStdString();
+	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationIssues", emu_issues, "");
+
+	std::string tmp;
+	if (GPUDeterminism->GetSelection() == 0)
+		tmp = "Not Set";
+	else if (GPUDeterminism->GetSelection() == 1)
+		tmp = "auto";
+	else if (GPUDeterminism->GetSelection() == 2)
+		tmp = "none";
+	else if (GPUDeterminism->GetSelection() == 3)
+		tmp = "fake-completion";
+
+	SAVE_IF_NOT_DEFAULT("Core", "GPUDeterminismMode", tmp, "Not Set");
+
+	int depth = DepthPercentage->GetValue() > 0 ? DepthPercentage->GetValue() : 100;
+	SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoDepthPercentage", depth, 100);
+	SAVE_IF_NOT_DEFAULT("Video_Stereoscopy", "StereoConvergenceMinimum", ConvergenceMinimum->GetValue(), 0);
+
+	PatchList_Save();
+	ActionReplayList_Save();
+	Gecko::SaveCodes(GameIniLocal, m_geckocode_panel->GetCodes());
+
+	bool success = GameIniLocal.Save(GameIniFileLocal);
+
+	// If the resulting file is empty, delete it. Kind of a hack, but meh.
+	if (success && File::GetSize(GameIniFileLocal) == 0)
+		File::Delete(GameIniFileLocal);
+
+	return success;
+}
+
+void CISOProperties::LaunchExternalEditor(const std::string& filename, bool wait_until_closed)
+{
+#ifdef __APPLE__
+	// wxTheMimeTypesManager is not yet implemented for wxCocoa
+	[[NSWorkspace sharedWorkspace] openFile:
+		[NSString stringWithUTF8String: filename.c_str()]
+		withApplication: @"TextEdit"];
+#else
+	wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension("ini");
+	if (filetype == nullptr) // From extension failed, trying with MIME type now
+	{
+		filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType("text/plain");
+		if (filetype == nullptr) // MIME type failed, aborting mission
+		{
+			WxUtils::ShowErrorDialog(_("Filetype 'ini' is unknown! Will not open!"));
+			return;
+		}
+	}
+
+	wxString OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename));
+	if (OpenCommand.IsEmpty())
+	{
+		WxUtils::ShowErrorDialog(_("Couldn't find open command for extension 'ini'!"));
+		return;
+	}
+
+	long result;
+
+	if (wait_until_closed)
+		result = wxExecute(OpenCommand, wxEXEC_SYNC);
+	else
+		result = wxExecute(OpenCommand);
+
+	if (result == -1)
+	{
+		WxUtils::ShowErrorDialog(_("wxExecute returned -1 on application run!"));
+		return;
+	}
+
+	if (wait_until_closed)
+		bRefreshList = true; // Just in case
+#endif
+}
+
+void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event))
+{
+	SaveGameConfig();
+	// Create blank file to prevent editor from prompting to create it.
+	if (!File::Exists(GameIniFileLocal))
+	{
+		std::fstream blankFile(GameIniFileLocal, std::ios::out);
+		blankFile.close();
+	}
+	LaunchExternalEditor(GameIniFileLocal, true);
+	GameIniLocal.Load(GameIniFileLocal);
+	LoadGameConfig();
+}
+
+void CISOProperties::OnComputeMD5Sum(wxCommandEvent& WXUNUSED (event))
+{
+	u8 output[16];
+	std::string output_string;
+	std::vector<u8> data(8 * 1024 * 1024);
+	u64 read_offset = 0;
+	md5_context ctx;
+
+	File::IOFile file(OpenGameListItem->GetFileName(), "rb");
+	u64 game_size = file.GetSize();
+
+	wxProgressDialog progressDialog(
+		_("Computing MD5 checksum"),
+		_("Working..."),
+		1000,
+		this,
+		wxPD_APP_MODAL | wxPD_CAN_ABORT |
+		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
+		wxPD_SMOOTH
+		);
+
+	md5_starts(&ctx);
+
+	while(read_offset < game_size)
+	{
+		if (!progressDialog.Update((int)((double)read_offset / (double)game_size * 1000), _("Computing MD5 checksum")))
+			return;
+
+		size_t read_size;
+		file.ReadArray(&data[0], data.size(), &read_size);
+		md5_update(&ctx, &data[0], read_size);
+
+		read_offset += read_size;
+	}
+
+	md5_finish(&ctx, output);
+
+	// Convert to hex
+	for (int a = 0; a < 16; ++a)
+		output_string += StringFromFormat("%02x", output[a]);
+
+	m_MD5Sum->SetValue(output_string);
+}
+
+// Opens all pre-defined INIs for the game. If there are multiple ones,
+// they will all be opened, but there is usually only one
+void CISOProperties::OnShowDefaultConfig(wxCommandEvent& WXUNUSED (event))
+{
+	for (const std::string& filename : SCoreStartupParameter::GetGameIniFilenames(game_id, OpenISO->GetRevision()))
+	{
+		std::string path = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename;
+		if (File::Exists(path))
+			LaunchExternalEditor(path, false);
+	}
+}
+
+void CISOProperties::ListSelectionChanged(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case ID_PATCHES_LIST:
+		if (Patches->GetSelection() == wxNOT_FOUND ||
+		    DefaultPatches.find(Patches->GetString(Patches->GetSelection()).ToStdString()) != DefaultPatches.end())
+		{
+			EditPatch->Disable();
+			RemovePatch->Disable();
+		}
+		else
+		{
+			EditPatch->Enable();
+			RemovePatch->Enable();
+		}
+		break;
+	case ID_CHEATS_LIST:
+		if (Cheats->GetSelection() == wxNOT_FOUND ||
+		    DefaultCheats.find(Cheats->GetString(Cheats->GetSelection()).ToStdString()) != DefaultCheats.end())
+		{
+			EditCheat->Disable();
+			RemoveCheat->Disable();
+		}
+		else
+		{
+			EditCheat->Enable();
+			RemoveCheat->Enable();
+		}
+		break;
+	}
+}
+
+void CISOProperties::PatchList_Load()
+{
+	onFrame.clear();
+	Patches->Clear();
+
+	PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIniDefault, GameIniLocal);
+
+	u32 index = 0;
+	for (PatchEngine::Patch& p : onFrame)
+	{
+		Patches->Append(StrToWxStr(p.name));
+		Patches->Check(index, p.active);
+		if (!p.user_defined)
+			DefaultPatches.insert(p.name);
+		++index;
+	}
+}
+
+void CISOProperties::PatchList_Save()
+{
+	std::vector<std::string> lines;
+	std::vector<std::string> enabledLines;
+	u32 index = 0;
+	for (PatchEngine::Patch& p : onFrame)
+	{
+		if (Patches->IsChecked(index))
+			enabledLines.push_back("$" + p.name);
+
+		// Do not save default patches.
+		if (DefaultPatches.find(p.name) == DefaultPatches.end())
+		{
+			lines.push_back("$" + p.name);
+			for (const PatchEngine::PatchEntry& entry : p.entries)
+			{
+				std::string temp = StringFromFormat("0x%08X:%s:0x%08X", entry.address, PatchEngine::PatchTypeStrings[entry.type], entry.value);
+				lines.push_back(temp);
+			}
+		}
+		++index;
+	}
+	GameIniLocal.SetLines("OnFrame_Enabled", enabledLines);
+	GameIniLocal.SetLines("OnFrame", lines);
+}
+
+void CISOProperties::PatchButtonClicked(wxCommandEvent& event)
+{
+	int selection = Patches->GetSelection();
+
+	switch (event.GetId())
+	{
+	case ID_EDITPATCH:
+		{
+		CPatchAddEdit dlg(selection, &onFrame, this);
+		dlg.ShowModal();
+		Raise();
+		}
+		break;
+	case ID_ADDPATCH:
+		{
+		CPatchAddEdit dlg(-1, &onFrame, this, 1, _("Add Patch"));
+		int res = dlg.ShowModal();
+		Raise();
+		if (res == wxID_OK)
+		{
+			Patches->Append(StrToWxStr(onFrame.back().name));
+			Patches->Check((unsigned int)(onFrame.size() - 1), onFrame.back().active);
+		}
+		}
+		break;
+	case ID_REMOVEPATCH:
+		onFrame.erase(onFrame.begin() + Patches->GetSelection());
+		Patches->Delete(Patches->GetSelection());
+		break;
+	}
+
+	PatchList_Save();
+	Patches->Clear();
+	PatchList_Load();
+
+	EditPatch->Disable();
+	RemovePatch->Disable();
+}
+
+void CISOProperties::ActionReplayList_Load()
+{
+	arCodes.clear();
+	Cheats->Clear();
+	ActionReplay::LoadCodes(arCodes, GameIniDefault, GameIniLocal);
+
+	u32 index = 0;
+	for (const ActionReplay::ARCode& arCode : arCodes)
+	{
+		Cheats->Append(StrToWxStr(arCode.name));
+		Cheats->Check(index, arCode.active);
+		if (!arCode.user_defined)
+			DefaultCheats.insert(arCode.name);
+		++index;
+	}
+}
+
+void CISOProperties::ActionReplayList_Save()
+{
+	std::vector<std::string> lines;
+	std::vector<std::string> enabledLines;
+	u32 index = 0;
+	u32 cheats_chkbox_count = Cheats->GetCount();
+	for (const ActionReplay::ARCode& code : arCodes)
+	{
+		// Check the index against the count because of the hacky way codes are added from the "Cheat Search" dialog
+		if ((index < cheats_chkbox_count) && Cheats->IsChecked(index))
+			enabledLines.push_back("$" + code.name);
+
+		// Do not save default cheats.
+		if (DefaultCheats.find(code.name) == DefaultCheats.end())
+		{
+			lines.push_back("$" + code.name);
+			for (const ActionReplay::AREntry& op : code.ops)
+			{
+				lines.push_back(WxStrToStr(wxString::Format("%08X %08X", op.cmd_addr, op.value)));
+			}
+		}
+		++index;
+	}
+	GameIniLocal.SetLines("ActionReplay_Enabled", enabledLines);
+	GameIniLocal.SetLines("ActionReplay", lines);
+}
+
+void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
+{
+	int selection = Cheats->GetSelection();
+
+	switch (event.GetId())
+	{
+	case ID_EDITCHEAT:
+		{
+		CARCodeAddEdit dlg(selection, &arCodes, this);
+		dlg.ShowModal();
+		Raise();
+		}
+		break;
+	case ID_ADDCHEAT:
+		{
+			CARCodeAddEdit dlg(-1, &arCodes, this, 1, _("Add ActionReplay Code"));
+			int res = dlg.ShowModal();
+			Raise();
+			if (res == wxID_OK)
+			{
+				Cheats->Append(StrToWxStr(arCodes.back().name));
+				Cheats->Check((unsigned int)(arCodes.size() - 1), arCodes.back().active);
+			}
+		}
+		break;
+	case ID_REMOVECHEAT:
+		arCodes.erase(arCodes.begin() + Cheats->GetSelection());
+		Cheats->Delete(Cheats->GetSelection());
+		break;
+	}
+
+	ActionReplayList_Save();
+	Cheats->Clear();
+	ActionReplayList_Load();
+
+	EditCheat->Disable();
+	RemoveCheat->Disable();
+}
+
+void CISOProperties::OnChangeBannerLang(wxCommandEvent& event)
+{
+	ChangeBannerDetails(OpenGameListItem->GetLanguages()[event.GetSelection()]);
+}
+
+void CISOProperties::ChangeBannerDetails(DiscIO::IVolume::ELanguage language)
+{
+	wxString const name = StrToWxStr(OpenGameListItem->GetName(language));
+	wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(language));
+	wxString const maker = StrToWxStr(OpenGameListItem->GetCompany());
+
+	// Updates the information shown in the window
+	m_Name->SetValue(name);
+	m_Comment->SetValue(comment);
+	m_Maker->SetValue(maker);//dev too
+
+	std::string filename, extension;
+	SplitPath(OpenGameListItem->GetFileName(), nullptr, &filename, &extension);
+	// Also sets the window's title
+	SetTitle(StrToWxStr(StringFromFormat("%s%s: %s - ", filename.c_str(),
+		extension.c_str(), OpenGameListItem->GetUniqueID().c_str())) + name);
+}
diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h
new file mode 100644
index 0000000000..2f07ec8c10
--- /dev/null
+++ b/Source/Core/DolphinWX/ISOProperties.h
@@ -0,0 +1,241 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <set>
+#include <string>
+#include <vector>
+#include <wx/dialog.h>
+#include <wx/treebase.h>
+
+#include "Common/IniFile.h"
+#include "Core/ActionReplay.h"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DolphinWX/ARCodeAddEdit.h"
+#include "DolphinWX/PatchAddEdit.h"
+
+class GameListItem;
+class wxButton;
+class wxCheckBox;
+class wxCheckListBox;
+class wxChoice;
+class wxSlider;
+class wxSpinCtrl;
+class wxStaticBitmap;
+class wxTextCtrl;
+class wxTreeCtrl;
+
+namespace DiscIO { struct SFileInfo; }
+namespace Gecko { class CodeConfigPanel; }
+
+class WiiPartition final : public wxTreeItemData
+{
+public:
+	DiscIO::IVolume *Partition;
+	DiscIO::IFileSystem *FileSystem;
+};
+
+struct PHackData
+{
+	bool PHackSZNear;
+	bool PHackSZFar;
+	std::string PHZNear;
+	std::string PHZFar;
+};
+
+class CISOProperties : public wxDialog
+{
+public:
+	CISOProperties(const std::string fileName,
+			wxWindow* parent,
+			wxWindowID id = wxID_ANY,
+			const wxString& title = _("Properties"),
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize,
+			long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
+	virtual ~CISOProperties();
+
+	bool bRefreshList;
+
+	void ActionReplayList_Load();
+	bool SaveGameConfig();
+
+private:
+	DECLARE_EVENT_TABLE();
+
+	DiscIO::IVolume *OpenISO;
+	DiscIO::IFileSystem *pFileSystem;
+
+	std::vector<PatchEngine::Patch> onFrame;
+	std::vector<ActionReplay::ARCode> arCodes;
+	PHackData m_PHack_Data;
+
+	// Core
+	wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *FPRF;
+	wxCheckBox *SyncGPU, *FastDiscSpeed, *DSPHLE;
+
+	wxArrayString arrayStringFor_GPUDeterminism;
+	wxChoice* GPUDeterminism;
+	// Wii
+	wxCheckBox* EnableWideScreen;
+
+	// Stereoscopy
+	wxSlider* DepthPercentage;
+	wxSpinCtrl* ConvergenceMinimum;
+	wxCheckBox* MonoDepth;
+
+	wxArrayString arrayStringFor_EmuState;
+	wxChoice* EmuState;
+	wxTextCtrl* EmuIssues;
+
+	wxCheckListBox* Patches;
+	wxButton* EditPatch;
+	wxButton* RemovePatch;
+
+	wxCheckListBox* Cheats;
+	wxButton* EditCheat;
+	wxButton* RemoveCheat;
+
+	wxTextCtrl* m_InternalName;
+	wxTextCtrl* m_GameID;
+	wxTextCtrl* m_Country;
+	wxTextCtrl* m_MakerID;
+	wxTextCtrl* m_Revision;
+	wxTextCtrl* m_Date;
+	wxTextCtrl* m_FST;
+	wxTextCtrl* m_MD5Sum;
+	wxButton*   m_MD5SumCompute;
+	wxArrayString arrayStringFor_Lang;
+	wxChoice*   m_Lang;
+	wxTextCtrl* m_Name;
+	wxTextCtrl* m_Maker;
+	wxTextCtrl* m_Comment;
+	wxStaticBitmap* m_Banner;
+
+	wxTreeCtrl* m_Treectrl;
+	wxTreeItemId RootId;
+
+	Gecko::CodeConfigPanel* m_geckocode_panel;
+
+	enum
+	{
+		ID_TREECTRL = 1000,
+
+		ID_NOTEBOOK,
+		ID_GAMECONFIG,
+		ID_PATCH_PAGE,
+		ID_ARCODE_PAGE,
+		ID_SPEEDHACK_PAGE,
+		ID_INFORMATION,
+		ID_FILESYSTEM,
+
+		ID_USEDUALCORE,
+		ID_IDLESKIP,
+		ID_MMU,
+		ID_DCBZOFF,
+		ID_FPRF,
+		ID_SYNCGPU,
+		ID_DISCSPEED,
+		ID_AUDIO_DSP_HLE,
+		ID_USE_BBOX,
+		ID_ENABLEPROGRESSIVESCAN,
+		ID_ENABLEWIDESCREEN,
+		ID_EDITCONFIG,
+		ID_SHOWDEFAULTCONFIG,
+		ID_EMUSTATE,
+		ID_EMU_ISSUES,
+		ID_PATCHES_LIST,
+		ID_EDITPATCH,
+		ID_ADDPATCH,
+		ID_REMOVEPATCH,
+		ID_CHEATS_LIST,
+		ID_EDITCHEAT,
+		ID_ADDCHEAT,
+		ID_REMOVECHEAT,
+		ID_GPUDETERMINISM,
+		ID_DEPTHPERCENTAGE,
+		ID_CONVERGENCEMINIMUM,
+		ID_MONODEPTH,
+
+		ID_NAME,
+		ID_GAMEID,
+		ID_COUNTRY,
+		ID_MAKERID,
+		ID_REVISION,
+		ID_DATE,
+		ID_FST,
+		ID_MD5SUM,
+		ID_MD5SUMCOMPUTE,
+		ID_VERSION,
+		ID_LANG,
+		ID_SHORTNAME,
+		ID_LONGNAME,
+		ID_MAKER,
+		ID_COMMENT,
+		ID_BANNER,
+		IDM_EXTRACTDIR,
+		IDM_EXTRACTALL,
+		IDM_EXTRACTFILE,
+		IDM_EXTRACTAPPLOADER,
+		IDM_EXTRACTDOL,
+		IDM_CHECKINTEGRITY,
+		IDM_BNRSAVEAS
+	};
+
+	void LaunchExternalEditor(const std::string& filename, bool wait_until_closed);
+
+	void CreateGUIControls();
+	void OnClose(wxCloseEvent& event);
+	void OnCloseClick(wxCommandEvent& event);
+	void OnEditConfig(wxCommandEvent& event);
+	void OnComputeMD5Sum(wxCommandEvent& event);
+	void OnShowDefaultConfig(wxCommandEvent& event);
+	void ListSelectionChanged(wxCommandEvent& event);
+	void PatchButtonClicked(wxCommandEvent& event);
+	void ActionReplayButtonClicked(wxCommandEvent& event);
+	void RightClickOnBanner(wxMouseEvent& event);
+	void OnBannerImageSave(wxCommandEvent& event);
+	void OnRightClickOnTree(wxTreeEvent& event);
+	void OnExtractFile(wxCommandEvent& event);
+	void OnExtractDir(wxCommandEvent& event);
+	void OnExtractDataFromHeader(wxCommandEvent& event);
+	void CheckPartitionIntegrity(wxCommandEvent& event);
+	void SetRefresh(wxCommandEvent& event);
+	void OnChangeBannerLang(wxCommandEvent& event);
+
+	GameListItem* OpenGameListItem;
+
+	typedef std::vector<const DiscIO::SFileInfo*>::iterator fileIter;
+
+	size_t CreateDirectoryTree(wxTreeItemId& parent,
+			const std::vector<DiscIO::SFileInfo>& fileInfos);
+	size_t CreateDirectoryTree(wxTreeItemId& parent,
+			const std::vector<DiscIO::SFileInfo>& fileInfos,
+			const size_t _FirstIndex,
+			const size_t _LastIndex);
+	void ExportDir(const std::string& _rFullPath, const std::string& _rExportFilename,
+			const WiiPartition* partition = nullptr);
+
+	IniFile GameIniDefault;
+	IniFile GameIniLocal;
+	std::string GameIniFileLocal;
+	std::string game_id;
+
+	std::set<std::string> DefaultPatches;
+	std::set<std::string> DefaultCheats;
+
+	void LoadGameConfig();
+	void PatchList_Load();
+	void PatchList_Save();
+	void ActionReplayList_Save();
+	void ChangeBannerDetails(DiscIO::IVolume::ELanguage language);
+
+	long GetElementStyle(const char* section, const char* key);
+	void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox);
+	void SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox);
+};
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp
new file mode 100644
index 0000000000..4101dcdbf5
--- /dev/null
+++ b/Source/Core/DolphinWX/InputConfigDiag.cpp
@@ -0,0 +1,1074 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+#include <wx/app.h>
+#include <wx/bitmap.h>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/combobox.h>
+#include <wx/control.h>
+#include <wx/dcmemory.h>
+#include <wx/dialog.h>
+#include <wx/font.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/spinctrl.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
+
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/MsgHandler.h"
+#include "Core/Core.h"
+#include "Core/HotkeyManager.h"
+#include "Core/HW/GCKeyboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/Wiimote.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/InputConfig.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+
+using namespace ciface::ExpressionParser;
+
+void GamepadPage::ConfigExtension(wxCommandEvent& event)
+{
+	ControllerEmu::Extension* const ex = ((ExtensionButton*)event.GetEventObject())->extension;
+
+	// show config diag, if "none" isn't selected
+	if (ex->switch_extension)
+	{
+		wxDialog dlg(this, wxID_ANY,
+			wxGetTranslation(StrToWxStr(ex->attachments[ex->switch_extension]->GetName())));
+
+		wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
+		const std::size_t orig_size = control_groups.size();
+
+		ControlGroupsSizer* const szr = new ControlGroupsSizer(ex->attachments[ex->switch_extension].get(), &dlg, this, &control_groups);
+		main_szr->Add(szr, 0, wxLEFT, 5);
+		main_szr->Add(dlg.CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+		dlg.SetSizerAndFit(main_szr);
+		dlg.Center();
+
+		dlg.ShowModal();
+
+		// remove the new groups that were just added, now that the window closed
+		control_groups.resize(orig_size);
+	}
+}
+
+PadSettingExtension::PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext)
+	: PadSetting(new wxChoice(parent, wxID_ANY))
+	, extension(ext)
+{
+	for (auto& attachment : extension->attachments)
+	{
+		((wxChoice*)wxcontrol)->Append(wxGetTranslation(StrToWxStr(attachment->GetName())));
+	}
+
+	UpdateGUI();
+}
+
+void PadSettingExtension::UpdateGUI()
+{
+	((wxChoice*)wxcontrol)->Select(extension->switch_extension);
+}
+
+void PadSettingExtension::UpdateValue()
+{
+	extension->switch_extension = ((wxChoice*)wxcontrol)->GetSelection();
+}
+
+PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const _setting)
+	: PadSetting(new wxCheckBox(parent, wxID_ANY, wxGetTranslation(StrToWxStr(_setting->name))))
+	, setting(_setting)
+{
+	UpdateGUI();
+}
+
+void PadSettingCheckBox::UpdateGUI()
+{
+	((wxCheckBox*)wxcontrol)->SetValue(!!setting->GetValue());
+}
+
+void PadSettingCheckBox::UpdateValue()
+{
+	// 0.01 so its saved to the ini file as just 1. :(
+	setting->SetValue(0.01 * ((wxCheckBox*)wxcontrol)->GetValue());
+}
+
+void PadSettingSpin::UpdateGUI()
+{
+	((wxSpinCtrl*)wxcontrol)->SetValue((int)(setting->GetValue() * 100));
+}
+
+void PadSettingSpin::UpdateValue()
+{
+	setting->SetValue(ControlState(((wxSpinCtrl*)wxcontrol)->GetValue()) / 100);
+}
+
+ControlDialog::ControlDialog(GamepadPage* const parent, InputConfig& config, ControllerInterface::ControlReference* const ref)
+	: wxDialog(parent, wxID_ANY, _("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	, control_reference(ref)
+	, m_config(config)
+	, m_parent(parent)
+{
+	m_devq = m_parent->controller->default_device;
+
+	// GetStrings() sounds slow :/
+	//device_cbox = new wxComboBox(this, wxID_ANY, StrToWxStr(ref->device_qualifier.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER);
+	device_cbox = new wxComboBox(this, wxID_ANY, StrToWxStr(m_devq.ToString()), wxDefaultPosition, wxSize(256, -1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER);
+
+	device_cbox->Bind(wxEVT_COMBOBOX, &ControlDialog::SetDevice, this);
+	device_cbox->Bind(wxEVT_TEXT_ENTER, &ControlDialog::SetDevice, this);
+
+	wxStaticBoxSizer* const control_chooser = CreateControlChooser(parent);
+
+	wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer(wxVERTICAL, this, _("Device"));
+	d_szr->Add(device_cbox, 0, wxEXPAND|wxALL, 5);
+
+	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
+	szr->Add(d_szr, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5);
+	szr->Add(control_chooser, 1, wxEXPAND|wxALL, 5);
+
+	SetSizerAndFit(szr); // needed
+
+	UpdateGUI();
+	SetFocus();
+}
+
+ControlButton::ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const unsigned int width, const std::string& label)
+: wxButton(parent, wxID_ANY, "", wxDefaultPosition, wxSize(width,20))
+, control_reference(_ref)
+{
+	if (label.empty())
+		SetLabel(StrToWxStr(_ref->expression));
+	else
+		SetLabel(StrToWxStr(label));
+}
+
+void InputConfigDialog::UpdateProfileComboBox()
+{
+	std::string pname(File::GetUserPath(D_CONFIG_IDX));
+	pname += PROFILES_PATH;
+	pname += m_config.profile_name;
+
+	std::vector<std::string> sv = DoFileSearch({"*.ini"}, {pname});
+
+	wxArrayString strs;
+	for (const std::string& filename : sv)
+	{
+		std::string base;
+		SplitPath(filename, nullptr, &base, nullptr);
+		strs.push_back(StrToWxStr(base));
+	}
+
+	for (GamepadPage* page : m_padpages)
+	{
+		page->profile_cbox->Clear();
+		page->profile_cbox->Append(strs);
+	}
+}
+
+void InputConfigDialog::UpdateControlReferences()
+{
+	for (GamepadPage* page : m_padpages)
+	{
+		page->controller->UpdateReferences(g_controller_interface);
+	}
+}
+
+void InputConfigDialog::ClickSave(wxCommandEvent& event)
+{
+	m_config.SaveConfig();
+	event.Skip();
+}
+
+int ControlDialog::GetRangeSliderValue() const
+{
+	return range_slider->GetValue();
+}
+
+void ControlDialog::UpdateListContents()
+{
+	control_lbox->Clear();
+
+	ciface::Core::Device* const dev = g_controller_interface.FindDevice(m_devq);
+	if (dev)
+	{
+		if (control_reference->is_input)
+		{
+			for (ciface::Core::Device::Input* input : dev->Inputs())
+			{
+				control_lbox->Append(StrToWxStr(input->GetName()));
+			}
+		}
+		else // It's an output
+		{
+			for (ciface::Core::Device::Output* output : dev->Outputs())
+			{
+				control_lbox->Append(StrToWxStr(output->GetName()));
+			}
+		}
+	}
+}
+
+void ControlDialog::SelectControl(const std::string& name)
+{
+	//UpdateGUI();
+
+	const int f = control_lbox->FindString(StrToWxStr(name));
+	if (f >= 0)
+		control_lbox->Select(f);
+}
+
+void ControlDialog::UpdateGUI()
+{
+	// update textbox
+	textctrl->SetValue(StrToWxStr(control_reference->expression));
+
+	// updates the "bound controls:" label
+	m_bound_label->SetLabel(wxString::Format(_("Bound Controls: %lu"),
+		(unsigned long)control_reference->BoundCount()));
+
+	switch (control_reference->parse_error)
+	{
+	case EXPRESSION_PARSE_SYNTAX_ERROR:
+		m_error_label->SetLabel(_("Syntax error"));
+		break;
+	case EXPRESSION_PARSE_NO_DEVICE:
+		m_error_label->SetLabel(_("Device not found"));
+		break;
+	default:
+		m_error_label->SetLabel("");
+	}
+};
+
+void GamepadPage::UpdateGUI()
+{
+	device_cbox->SetValue(StrToWxStr(controller->default_device.ToString()));
+
+	for (ControlGroupBox* cgBox : control_groups)
+	{
+		for (ControlButton* button : cgBox->control_buttons)
+		{
+			wxString expr = StrToWxStr(button->control_reference->expression);
+			expr.Replace("&", "&&");
+			button->SetLabel(expr);
+		}
+
+		for (PadSetting* padSetting : cgBox->options)
+		{
+			padSetting->UpdateGUI();
+		}
+	}
+}
+
+void GamepadPage::ClearAll(wxCommandEvent&)
+{
+	// just load an empty ini section to clear everything :P
+	IniFile::Section section;
+	controller->LoadConfig(&section);
+
+	// no point in using the real ControllerInterface i guess
+	ControllerInterface face;
+
+	controller->UpdateReferences(face);
+
+	UpdateGUI();
+}
+
+void GamepadPage::LoadDefaults(wxCommandEvent&)
+{
+	controller->LoadDefaults(g_controller_interface);
+
+	controller->UpdateReferences(g_controller_interface);
+
+	UpdateGUI();
+}
+
+bool ControlDialog::Validate()
+{
+	control_reference->expression = WxStrToStr(textctrl->GetValue());
+
+	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
+
+	UpdateGUI();
+
+	return (control_reference->parse_error == EXPRESSION_PARSE_SUCCESS);
+}
+
+void GamepadPage::SetDevice(wxCommandEvent&)
+{
+	controller->default_device.FromString(WxStrToStr(device_cbox->GetValue()));
+
+	// show user what it was validated as
+	device_cbox->SetValue(StrToWxStr(controller->default_device.ToString()));
+
+	// this will set all the controls to this default device
+	controller->UpdateDefaultDevice();
+
+	// update references
+	controller->UpdateReferences(g_controller_interface);
+}
+
+void ControlDialog::SetDevice(wxCommandEvent&)
+{
+	m_devq.FromString(WxStrToStr(device_cbox->GetValue()));
+
+	// show user what it was validated as
+	device_cbox->SetValue(StrToWxStr(m_devq.ToString()));
+
+	// update gui
+	UpdateListContents();
+}
+
+void ControlDialog::ClearControl(wxCommandEvent&)
+{
+	control_reference->expression.clear();
+
+	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
+
+	UpdateGUI();
+}
+
+inline bool IsAlphabetic(wxString &str)
+{
+	for (wxUniChar c : str)
+		if (!isalpha(c))
+			return false;
+
+	return true;
+}
+
+inline void GetExpressionForControl(wxString &expr,
+				    wxString &control_name,
+				    ciface::Core::DeviceQualifier *control_device = nullptr,
+				    ciface::Core::DeviceQualifier *default_device = nullptr)
+{
+	expr = "";
+
+	// non-default device
+	if (control_device && default_device && !(*control_device == *default_device))
+	{
+		expr += control_device->ToString();
+		expr += ":";
+	}
+
+	// append the control name
+	expr += control_name;
+
+	if (!IsAlphabetic(expr))
+		expr = wxString::Format("`%s`", expr);
+}
+
+bool ControlDialog::GetExpressionForSelectedControl(wxString &expr)
+{
+	const int num = control_lbox->GetSelection();
+
+	if (num < 0)
+		return false;
+
+	wxString control_name = control_lbox->GetString(num);
+	GetExpressionForControl(expr,
+				control_name,
+				&m_devq,
+				&m_parent->controller->default_device);
+
+	return true;
+}
+
+void ControlDialog::SetSelectedControl(wxCommandEvent&)
+{
+	wxString expr;
+
+	if (!GetExpressionForSelectedControl(expr))
+		return;
+
+	textctrl->WriteText(expr);
+	control_reference->expression = textctrl->GetValue();
+
+	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
+
+	UpdateGUI();
+}
+
+void ControlDialog::AppendControl(wxCommandEvent& event)
+{
+	wxString device_expr, expr;
+
+	const wxString lbl = ((wxButton*)event.GetEventObject())->GetLabel();
+	char op = lbl[0];
+
+	if (!GetExpressionForSelectedControl(device_expr))
+		return;
+
+	// Unary ops (that is, '!') are a special case. When there's a selection,
+	// put parens around it and prepend it with a '!', but when there's nothing,
+	// just add a '!device'.
+	if (op == '!')
+	{
+		wxString selection = textctrl->GetStringSelection();
+		if (selection == "")
+			expr = wxString::Format("%c%s", op, device_expr);
+		else
+			expr = wxString::Format("%c(%s)", op, selection);
+	}
+	else
+	{
+		expr = wxString::Format(" %c %s", op, device_expr);
+	}
+
+	textctrl->WriteText(expr);
+	control_reference->expression = textctrl->GetValue();
+
+	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
+
+	UpdateGUI();
+}
+
+void GamepadPage::AdjustSetting(wxCommandEvent& event)
+{
+	((PadSetting*)((wxControl*)event.GetEventObject())->GetClientData())->UpdateValue();
+}
+
+void GamepadPage::AdjustSettingUI(wxCommandEvent& event)
+{
+	m_iterate = !m_iterate;
+	((PadSetting*)((wxControl*)event.GetEventObject())->GetClientData())->UpdateValue();
+}
+
+void GamepadPage::AdjustControlOption(wxCommandEvent&)
+{
+	m_control_dialog->control_reference->range = (ControlState)(m_control_dialog->GetRangeSliderValue()) / SLIDER_TICK_COUNT;
+}
+
+void GamepadPage::ConfigControl(wxEvent& event)
+{
+	m_control_dialog = new ControlDialog(this, m_config, ((ControlButton*)event.GetEventObject())->control_reference);
+	m_control_dialog->ShowModal();
+	m_control_dialog->Destroy();
+
+	// update changes that were made in the dialog
+	UpdateGUI();
+}
+
+void GamepadPage::ClearControl(wxEvent& event)
+{
+	ControlButton* const btn = (ControlButton*)event.GetEventObject();
+	btn->control_reference->expression.clear();
+	btn->control_reference->range = 1.0;
+
+	controller->UpdateReferences(g_controller_interface);
+
+	// update changes
+	UpdateGUI();
+}
+
+void ControlDialog::DetectControl(wxCommandEvent& event)
+{
+	wxButton* const btn = (wxButton*)event.GetEventObject();
+	const wxString lbl = btn->GetLabel();
+
+	ciface::Core::Device* const dev = g_controller_interface.FindDevice(m_devq);
+	if (dev)
+	{
+		btn->SetLabel(_("[ waiting ]"));
+
+		// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
+		wxTheApp->Yield(true);
+
+		ciface::Core::Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
+
+		// if we got input, select it in the list
+		if (ctrl)
+			SelectControl(ctrl->GetName());
+
+		btn->SetLabel(lbl);
+	}
+}
+
+void GamepadPage::DetectControl(wxCommandEvent& event)
+{
+	ControlButton* btn = (ControlButton*)event.GetEventObject();
+	if (DetectButton(btn) && m_iterate == true)
+	{
+		auto it = std::find(control_buttons.begin(), control_buttons.end(), btn);
+
+		// std find will never return end since btn will always be found in control_buttons
+		++it;
+		for (; it != control_buttons.end(); ++it)
+		{
+			if (!DetectButton(*it))
+				break;
+		}
+	}
+}
+
+bool GamepadPage::DetectButton(ControlButton* button)
+{
+	bool success = false;
+	// find device :/
+	ciface::Core::Device* const dev = g_controller_interface.FindDevice(controller->default_device);
+	if (dev)
+	{
+		button->SetLabel(_("[ waiting ]"));
+
+		// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
+		wxTheApp->Yield(true);
+
+		ciface::Core::Device::Control* const ctrl = button->control_reference->Detect(DETECT_WAIT_TIME, dev);
+
+		// if we got input, update expression and reference
+		if (ctrl)
+		{
+			wxString control_name = ctrl->GetName();
+			wxString expr;
+			GetExpressionForControl(expr, control_name);
+			button->control_reference->expression = expr;
+			g_controller_interface.UpdateReference(button->control_reference, controller->default_device);
+			success = true;
+		}
+	}
+
+	UpdateGUI();
+
+	return success;
+}
+
+wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
+{
+	wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output"));
+
+	textctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE | wxTE_RICH2);
+	wxFont font = textctrl->GetFont();
+	font.SetFamily(wxFONTFAMILY_MODERN);
+	textctrl->SetFont(font);
+
+	wxButton* const detect_button = new wxButton(this, wxID_ANY, control_reference->is_input ? _("Detect") : _("Test"));
+
+	wxButton* const clear_button = new  wxButton(this, wxID_ANY, _("Clear"));
+
+	wxButton* const select_button = new wxButton(this, wxID_ANY, _("Select"));
+	select_button->Bind(wxEVT_BUTTON, &ControlDialog::SetSelectedControl, this);
+
+	wxButton* const or_button = new  wxButton(this, wxID_ANY, _("| OR"));
+	or_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
+
+	control_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 64));
+
+	wxBoxSizer* const button_sizer = new wxBoxSizer(wxVERTICAL);
+	button_sizer->Add(detect_button, 1, 0, 5);
+	button_sizer->Add(select_button, 1, 0, 5);
+	button_sizer->Add(or_button, 1, 0, 5);
+
+	if (control_reference->is_input)
+	{
+		// TODO: check if && is good on other OS
+		wxButton* const and_button = new  wxButton(this, wxID_ANY, _("&& AND"));
+		wxButton* const not_button = new  wxButton(this, wxID_ANY, _("! NOT"));
+		wxButton* const add_button = new  wxButton(this, wxID_ANY, _("+ ADD"));
+
+		and_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
+		not_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
+		add_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
+
+		button_sizer->Add(and_button, 1, 0, 5);
+		button_sizer->Add(not_button, 1, 0, 5);
+		button_sizer->Add(add_button, 1, 0, 5);
+	}
+
+	range_slider = new wxSlider(this, wxID_ANY, SLIDER_TICK_COUNT, -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/);
+
+	range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT));
+
+	detect_button->Bind(wxEVT_BUTTON, &ControlDialog::DetectControl, this);
+	clear_button->Bind(wxEVT_BUTTON, &ControlDialog::ClearControl, this);
+
+	range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent);
+	wxStaticText* const range_label = new wxStaticText(this, wxID_ANY, _("Range"));
+
+	m_bound_label = new wxStaticText(this, wxID_ANY, "");
+	m_error_label = new wxStaticText(this, wxID_ANY, "");
+
+	wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL);
+	range_sizer->Add(range_label, 0, wxCENTER|wxLEFT, 5);
+	range_sizer->Add(range_slider, 1, wxEXPAND|wxLEFT, 5);
+
+	wxBoxSizer* const ctrls_sizer = new wxBoxSizer(wxHORIZONTAL);
+	ctrls_sizer->Add(control_lbox, 1, wxEXPAND, 0);
+	ctrls_sizer->Add(button_sizer, 0, wxEXPAND, 0);
+
+	wxSizer* const bottom_btns_sizer = CreateButtonSizer(wxOK|wxAPPLY);
+	bottom_btns_sizer->Prepend(clear_button, 0, wxLEFT, 5);
+
+	main_szr->Add(range_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 5);
+	main_szr->Add(ctrls_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+	main_szr->Add(textctrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+	main_szr->Add(bottom_btns_sizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5);
+	main_szr->Add(m_bound_label, 0, wxCENTER, 0);
+	main_szr->Add(m_error_label, 0, wxCENTER, 0);
+
+	UpdateListContents();
+
+	return main_szr;
+}
+
+void GamepadPage::GetProfilePath(std::string& path)
+{
+	const wxString& name = profile_cbox->GetValue();
+	if (!name.empty())
+	{
+		// TODO: check for dumb characters maybe
+
+		path = File::GetUserPath(D_CONFIG_IDX);
+		path += PROFILES_PATH;
+		path += m_config.profile_name;
+		path += '/';
+		path += WxStrToStr(profile_cbox->GetValue());
+		path += ".ini";
+	}
+}
+
+void GamepadPage::LoadProfile(wxCommandEvent&)
+{
+	std::string fname;
+	GamepadPage::GetProfilePath(fname);
+
+	if (!File::Exists(fname))
+		return;
+
+	IniFile inifile;
+	inifile.Load(fname);
+
+	controller->LoadConfig(inifile.GetOrCreateSection("Profile"));
+	controller->UpdateReferences(g_controller_interface);
+
+	UpdateGUI();
+}
+
+void GamepadPage::SaveProfile(wxCommandEvent&)
+{
+	std::string fname;
+	GamepadPage::GetProfilePath(fname);
+	File::CreateFullPath(fname);
+
+	if (!fname.empty())
+	{
+		IniFile inifile;
+		controller->SaveConfig(inifile.GetOrCreateSection("Profile"));
+		inifile.Save(fname);
+
+		m_config_dialog->UpdateProfileComboBox();
+	}
+	else
+	{
+		WxUtils::ShowErrorDialog(_("You must enter a valid profile name."));
+	}
+}
+
+void GamepadPage::DeleteProfile(wxCommandEvent&)
+{
+	std::string fname;
+	GamepadPage::GetProfilePath(fname);
+
+	const char* const fnamecstr = fname.c_str();
+
+	if (File::Exists(fnamecstr) &&
+			AskYesNoT("Are you sure you want to delete \"%s\"?",
+			WxStrToStr(profile_cbox->GetValue()).c_str()))
+	{
+		File::Delete(fnamecstr);
+
+		m_config_dialog->UpdateProfileComboBox();
+	}
+}
+
+void InputConfigDialog::UpdateDeviceComboBox()
+{
+	ciface::Core::DeviceQualifier dq;
+	for (GamepadPage* page : m_padpages)
+	{
+		page->device_cbox->Clear();
+
+		for (ciface::Core::Device* d : g_controller_interface.Devices())
+		{
+			dq.FromDevice(d);
+			page->device_cbox->Append(StrToWxStr(dq.ToString()));
+		}
+
+		page->device_cbox->SetValue(StrToWxStr(page->controller->default_device.ToString()));
+	}
+}
+
+void GamepadPage::RefreshDevices(wxCommandEvent&)
+{
+	bool was_unpaused = Core::PauseAndLock(true);
+
+	// refresh devices
+	g_controller_interface.Reinitialize();
+
+	// update all control references
+	m_config_dialog->UpdateControlReferences();
+
+	// update device cbox
+	m_config_dialog->UpdateDeviceComboBox();
+
+	Wiimote::LoadConfig();
+	Keyboard::LoadConfig();
+	Pad::LoadConfig();
+	HotkeyManagerEmu::LoadConfig();
+
+	Core::PauseAndLock(false, was_unpaused);
+}
+
+ControlGroupBox::~ControlGroupBox()
+{
+	for (PadSetting* padSetting : options)
+		delete padSetting;
+}
+
+ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink)
+	: wxBoxSizer(wxVERTICAL)
+	, control_group(group)
+{
+	static_bitmap = nullptr;
+	const std::vector<std::string> exclude_buttons = {"Mic", "Modifier"};
+	const std::vector<std::string> exclude_groups = {"IR", "Swing", "Tilt", "Shake", "UDP Wiimote", "Extension", "Rumble"};
+
+	wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+	for (auto& control : group->controls)
+	{
+		wxStaticText* const label = new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(control->name)));
+
+		ControlButton* const control_button = new ControlButton(parent, control->control_ref.get(), 80);
+		control_button->SetFont(m_SmallFont);
+
+		control_buttons.push_back(control_button);
+		if (std::find(exclude_groups.begin(), exclude_groups.end(), control_group->name) == exclude_groups.end() &&
+		    std::find(exclude_buttons.begin(), exclude_buttons.end(), control->name) == exclude_buttons.end())
+			eventsink->control_buttons.push_back(control_button);
+
+
+		if (control->control_ref->is_input)
+		{
+			control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
+			control_button->Bind(wxEVT_BUTTON, &GamepadPage::DetectControl, eventsink);
+		}
+		else
+		{
+			control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear."));
+			control_button->Bind(wxEVT_BUTTON, &GamepadPage::ConfigControl, eventsink);
+		}
+
+		control_button->Bind(wxEVT_MIDDLE_DOWN, &GamepadPage::ClearControl, eventsink);
+		control_button->Bind(wxEVT_RIGHT_UP, &GamepadPage::ConfigControl, eventsink);
+
+		wxBoxSizer* const control_sizer = new wxBoxSizer(wxHORIZONTAL);
+		control_sizer->AddStretchSpacer(1);
+		control_sizer->Add(label, 0, wxCENTER | wxRIGHT, 3);
+		control_sizer->Add(control_button, 0, 0, 0);
+
+		Add(control_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 3);
+
+	}
+
+	wxMemoryDC dc;
+
+	switch (group->type)
+	{
+	case GROUP_TYPE_STICK:
+	case GROUP_TYPE_TILT:
+	case GROUP_TYPE_CURSOR:
+	case GROUP_TYPE_FORCE:
+		{
+			wxBitmap bitmap(64, 64);
+			dc.SelectObject(bitmap);
+			dc.Clear();
+			static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
+
+			wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
+			for (auto& groupSetting : group->settings)
+			{
+				PadSettingSpin* setting = new PadSettingSpin(parent, groupSetting.get());
+				setting->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink);
+				options.push_back(setting);
+				szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))));
+				szr->Add(setting->wxcontrol, 0, wxLEFT, 0);
+			}
+
+			wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL);
+			h_szr->Add(szr, 1, 0, 5);
+			h_szr->Add(static_bitmap, 0, wxALL|wxCENTER, 3);
+
+			Add(h_szr, 0, wxEXPAND|wxLEFT|wxCENTER|wxTOP, 3);
+		}
+		break;
+	case GROUP_TYPE_BUTTONS:
+		{
+			// Draw buttons in rows of 8
+			unsigned int button_cols = group->controls.size() > 8 ? 8 : group->controls.size();
+			unsigned int button_rows = ceil((float)group->controls.size() / 8.0f);
+			wxBitmap bitmap(int(12 * button_cols + 1), (11 * button_rows) + 1);
+
+			dc.SelectObject(bitmap);
+			dc.Clear();
+			static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
+
+			PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0].get());
+			threshold_cbox->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink);
+
+			threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons."));
+
+			options.push_back(threshold_cbox);
+
+			wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
+			szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(group->settings[0]->name))),
+					0, wxCENTER|wxRIGHT, 3);
+			szr->Add(threshold_cbox->wxcontrol, 0, wxRIGHT, 3);
+
+			Add(szr, 0, wxALL|wxCENTER, 3);
+			Add(static_bitmap, 0, wxALL|wxCENTER, 3);
+		}
+		break;
+	case GROUP_TYPE_MIXED_TRIGGERS:
+	case GROUP_TYPE_TRIGGERS:
+	case GROUP_TYPE_SLIDER:
+		{
+			int height = (int)(12 * group->controls.size());
+			int width = 64;
+
+			if (GROUP_TYPE_MIXED_TRIGGERS == group->type)
+				width = 64+12+1;
+
+			if (GROUP_TYPE_TRIGGERS != group->type)
+				height /= 2;
+
+			wxBitmap bitmap(width, height+1);
+			dc.SelectObject(bitmap);
+			dc.Clear();
+			static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
+
+			for (auto& groupSetting : group->settings)
+			{
+				PadSettingSpin* setting = new PadSettingSpin(parent, groupSetting.get());
+				setting->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink);
+				options.push_back(setting);
+				wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
+				szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))), 0, wxCENTER | wxRIGHT, 3);
+				szr->Add(setting->wxcontrol, 0, wxRIGHT, 3);
+				Add(szr, 0, wxALL|wxCENTER, 3);
+			}
+
+			Add(static_bitmap, 0, wxALL|wxCENTER, 3);
+		}
+		break;
+	case GROUP_TYPE_EXTENSION:
+		{
+			PadSettingExtension* const attachments = new PadSettingExtension(parent, (ControllerEmu::Extension*)group);
+			wxButton* const configure_btn = new ExtensionButton(parent, (ControllerEmu::Extension*)group);
+
+			options.push_back(attachments);
+
+			attachments->wxcontrol->Bind(wxEVT_CHOICE, &GamepadPage::AdjustSetting, eventsink);
+			configure_btn->Bind(wxEVT_BUTTON, &GamepadPage::ConfigExtension, eventsink);
+
+			Add(attachments->wxcontrol, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 3);
+			Add(configure_btn, 0, wxALL|wxEXPAND, 3);
+		}
+		break;
+	default:
+		{
+			//options
+			for (auto& groupSetting : group->settings)
+			{
+				if (groupSetting->high == DEFAULT_HIGH_VALUE)
+				{
+					PadSettingCheckBox* setting_cbox = new PadSettingCheckBox(parent, groupSetting.get());
+					if (groupSetting->is_iterate == true)
+					{
+						setting_cbox->wxcontrol->Bind(wxEVT_CHECKBOX, &GamepadPage::AdjustSettingUI, eventsink);
+						groupSetting->value = 0;
+					}
+					else
+					{
+						setting_cbox->wxcontrol->Bind(wxEVT_CHECKBOX, &GamepadPage::AdjustSetting, eventsink);
+					}
+					options.push_back(setting_cbox);
+					Add(setting_cbox->wxcontrol, 0, wxALL | wxLEFT, 5);
+				}
+				else
+				{
+					PadSettingSpin* setting = new PadSettingSpin(parent, groupSetting.get());
+					setting->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink);
+					options.push_back(setting);
+					wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
+					szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))), 0, wxCENTER | wxRIGHT, 3);
+					szr->Add(setting->wxcontrol, 0, wxRIGHT, 3);
+					Add(szr, 0, wxALL | wxCENTER, 3);
+				}
+			}
+		}
+		break;
+	}
+
+	dc.SelectObject(wxNullBitmap);
+
+	//AddStretchSpacer(0);
+}
+
+ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* groups)
+	: wxBoxSizer(wxHORIZONTAL)
+{
+	size_t col_size = 0;
+
+	wxBoxSizer* stacked_groups = nullptr;
+	for (auto& group : controller->groups)
+	{
+		ControlGroupBox* control_group_box = new ControlGroupBox(group.get(), parent, eventsink);
+		wxStaticBoxSizer *control_group =
+			new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(group->name)));
+		control_group->Add(control_group_box);
+
+		const size_t grp_size = group->controls.size() + group->settings.size();
+		col_size += grp_size;
+		if (col_size > 8 || nullptr == stacked_groups)
+		{
+			if (stacked_groups)
+				Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5);
+
+			stacked_groups = new wxBoxSizer(wxVERTICAL);
+			stacked_groups->Add(control_group, 0, wxEXPAND);
+
+			col_size = grp_size;
+		}
+		else
+		{
+			stacked_groups->Add(control_group, 0, wxEXPAND);
+		}
+
+		if (groups)
+			groups->push_back(control_group_box);
+	}
+
+	if (stacked_groups)
+		Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5);
+}
+
+GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const unsigned int pad_num, InputConfigDialog* const config_dialog)
+	: wxPanel(parent, wxID_ANY)
+	,controller(config.controllers[pad_num])
+	, m_config_dialog(config_dialog)
+	, m_config(config)
+{
+
+	wxBoxSizer* control_group_sizer = new ControlGroupsSizer(m_config.controllers[pad_num], this, this, &control_groups);
+
+	wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Profile"));
+
+	// device chooser
+
+	wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Device"));
+
+	device_cbox = new wxComboBox(this, wxID_ANY, "", wxDefaultPosition, wxSize(64, -1));
+	device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER);
+
+	wxButton* refresh_button = new wxButton(this, wxID_ANY, _("Refresh"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+
+	device_cbox->Bind(wxEVT_COMBOBOX, &GamepadPage::SetDevice, this);
+	device_cbox->Bind(wxEVT_TEXT_ENTER, &GamepadPage::SetDevice, this);
+	refresh_button->Bind(wxEVT_BUTTON, &GamepadPage::RefreshDevices, this);
+
+	device_sbox->Add(device_cbox, 1, wxLEFT|wxRIGHT, 3);
+	device_sbox->Add(refresh_button, 0, wxRIGHT|wxBOTTOM, 3);
+
+	wxButton* const default_button = new wxButton(this, wxID_ANY, _("Default"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	wxButton* const clearall_button = new wxButton(this, wxID_ANY, _("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+
+	wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Reset"));
+	clear_sbox->Add(default_button, 1, wxLEFT, 3);
+	clear_sbox->Add(clearall_button, 1, wxRIGHT, 3);
+
+	clearall_button->Bind(wxEVT_BUTTON, &GamepadPage::ClearAll, this);
+	default_button->Bind(wxEVT_BUTTON, &GamepadPage::LoadDefaults, this);
+
+	profile_cbox = new wxComboBox(this, wxID_ANY, "", wxDefaultPosition, wxSize(64, -1));
+
+	wxButton* const pload_btn = new wxButton(this, wxID_ANY, _("Load"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	wxButton* const psave_btn = new wxButton(this, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	wxButton* const pdelete_btn = new wxButton(this, wxID_ANY, _("Delete"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+
+	pload_btn->Bind(wxEVT_BUTTON, &GamepadPage::LoadProfile, this);
+	psave_btn->Bind(wxEVT_BUTTON, &GamepadPage::SaveProfile, this);
+	pdelete_btn->Bind(wxEVT_BUTTON, &GamepadPage::DeleteProfile, this);
+
+	profile_sbox->Add(profile_cbox, 1, wxLEFT, 3);
+	profile_sbox->Add(pload_btn, 0, wxLEFT, 3);
+	profile_sbox->Add(psave_btn, 0, 0, 3);
+	profile_sbox->Add(pdelete_btn, 0, wxRIGHT|wxBOTTOM, 3);
+
+	wxBoxSizer* const dio = new wxBoxSizer(wxHORIZONTAL);
+	dio->Add(device_sbox, 1, wxEXPAND|wxRIGHT, 5);
+	dio->Add(clear_sbox, 0, wxEXPAND|wxRIGHT, 5);
+	dio->Add(profile_sbox, 1, wxEXPAND|wxRIGHT, 5);
+
+	wxBoxSizer* const mapping = new wxBoxSizer(wxVERTICAL);
+
+	mapping->Add(dio, 1, wxEXPAND|wxLEFT|wxTOP|wxBOTTOM, 5);
+	mapping->Add(control_group_sizer, 0, wxLEFT|wxEXPAND, 5);
+
+	UpdateGUI();
+
+	SetSizerAndFit(mapping); // needed
+	Layout();
+};
+
+
+InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num)
+	: wxDialog(parent, wxID_ANY, name, wxPoint(128,-1))
+	, m_config(config)
+{
+	m_pad_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
+	GamepadPage* gp = new GamepadPage(m_pad_notebook, m_config, tab_num, this);
+	m_padpages.push_back(gp);
+	m_pad_notebook->AddPage(gp, wxString::Format("%s [%u]", wxGetTranslation(StrToWxStr(m_config.gui_name)), 1 + tab_num));
+
+	m_pad_notebook->SetSelection(0);
+
+	UpdateDeviceComboBox();
+	UpdateProfileComboBox();
+
+	Bind(wxEVT_BUTTON, &InputConfigDialog::ClickSave, this, wxID_OK);
+
+	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
+	szr->Add(m_pad_notebook, 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, 5);
+	szr->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxEXPAND|wxALL, 5);
+
+	SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
+	SetSizerAndFit(szr);
+	Center();
+
+	// live preview update timer
+	m_update_timer.SetOwner(this);
+	Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this);
+	m_update_timer.Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS);
+}
diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h
new file mode 100644
index 0000000000..583bee11ef
--- /dev/null
+++ b/Source/Core/DolphinWX/InputConfigDiag.h
@@ -0,0 +1,236 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#define SLIDER_TICK_COUNT    100
+#define DETECT_WAIT_TIME     2500
+#define PREVIEW_UPDATE_TIME  25
+#define DEFAULT_HIGH_VALUE   100
+
+// might have to change this setup for Wiimote
+#define PROFILES_PATH       "Profiles/"
+
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/spinctrl.h>
+#include <wx/timer.h>
+
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+class InputConfig;
+class wxComboBox;
+class wxListBox;
+class wxNotebook;
+class wxSlider;
+class wxStaticBitmap;
+class wxStaticText;
+class wxTextCtrl;
+
+class PadSetting
+{
+protected:
+	PadSetting(wxControl* const _control) : wxcontrol(_control) { wxcontrol->SetClientData(this); }
+
+public:
+	virtual void UpdateGUI() = 0;
+	virtual void UpdateValue() = 0;
+
+	virtual ~PadSetting() {}
+
+	wxControl* const wxcontrol;
+};
+
+class PadSettingExtension : public PadSetting
+{
+public:
+	PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext);
+	void UpdateGUI() override;
+	void UpdateValue() override;
+
+	ControllerEmu::Extension* const extension;
+};
+
+class PadSettingSpin : public PadSetting
+{
+public:
+	PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const _setting)
+		: PadSetting(new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition,
+					    wxSize(54, -1), 0, _setting->low, _setting->high, (int)(_setting->value * 100)))
+		, setting(_setting) {}
+
+	void UpdateGUI() override;
+	void UpdateValue() override;
+
+	ControllerEmu::ControlGroup::Setting* const setting;
+};
+
+class PadSettingCheckBox : public PadSetting
+{
+public:
+	PadSettingCheckBox(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting);
+	void UpdateGUI() override;
+	void UpdateValue() override;
+
+	ControllerEmu::ControlGroup::Setting* const setting;
+};
+
+class GamepadPage;
+
+class ControlDialog : public wxDialog
+{
+public:
+	ControlDialog(GamepadPage* const parent, InputConfig& config, ControllerInterface::ControlReference* const ref);
+
+	bool Validate() override;
+
+	int GetRangeSliderValue() const;
+
+	ControllerInterface::ControlReference* const control_reference;
+	InputConfig& m_config;
+
+private:
+	wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent);
+
+	void UpdateGUI();
+	void UpdateListContents();
+	void SelectControl(const std::string& name);
+
+	void DetectControl(wxCommandEvent& event);
+	void ClearControl(wxCommandEvent& event);
+	void SetDevice(wxCommandEvent& event);
+
+	void SetSelectedControl(wxCommandEvent& event);
+	void AppendControl(wxCommandEvent& event);
+
+	bool GetExpressionForSelectedControl(wxString &expr);
+
+	GamepadPage* const m_parent;
+	wxComboBox*        device_cbox;
+	wxTextCtrl*        textctrl;
+	wxListBox*         control_lbox;
+	wxSlider*          range_slider;
+	wxStaticText*      m_bound_label;
+	wxStaticText*      m_error_label;
+	ciface::Core::DeviceQualifier m_devq;
+};
+
+class ExtensionButton : public wxButton
+{
+public:
+	ExtensionButton(wxWindow* const parent, ControllerEmu::Extension* const ext)
+		: wxButton(parent, wxID_ANY, _("Configure"), wxDefaultPosition)
+		, extension(ext) {}
+
+	ControllerEmu::Extension* const extension;
+};
+
+class ControlButton : public wxButton
+{
+public:
+	ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const unsigned int width, const std::string& label = "");
+
+	ControllerInterface::ControlReference* const control_reference;
+};
+
+class ControlGroupBox : public wxBoxSizer
+{
+public:
+	ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink);
+	~ControlGroupBox();
+
+	std::vector<PadSetting*> options;
+
+	ControllerEmu::ControlGroup* const control_group;
+	wxStaticBitmap*                    static_bitmap;
+	std::vector<ControlButton*>        control_buttons;
+};
+
+class ControlGroupsSizer : public wxBoxSizer
+{
+public:
+	ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* const groups = nullptr);
+};
+
+class InputConfigDialog;
+
+class GamepadPage : public wxPanel
+{
+	friend class InputConfigDialog;
+	friend class ControlDialog;
+
+public:
+	GamepadPage(wxWindow* parent, InputConfig& config, const unsigned int pad_num, InputConfigDialog* const config_dialog);
+
+	void UpdateGUI();
+
+	void RefreshDevices(wxCommandEvent& event);
+
+	void LoadProfile(wxCommandEvent& event);
+	void SaveProfile(wxCommandEvent& event);
+	void DeleteProfile(wxCommandEvent& event);
+
+	void ConfigControl(wxEvent& event);
+	void ClearControl(wxEvent& event);
+	void DetectControl(wxCommandEvent& event);
+
+	void ConfigExtension(wxCommandEvent& event);
+
+	void SetDevice(wxCommandEvent& event);
+
+	void ClearAll(wxCommandEvent& event);
+	void LoadDefaults(wxCommandEvent& event);
+
+	void AdjustControlOption(wxCommandEvent& event);
+	void AdjustSetting(wxCommandEvent& event);
+	void AdjustSettingUI(wxCommandEvent& event);
+
+	void GetProfilePath(std::string& path);
+
+	wxComboBox* profile_cbox;
+	wxComboBox* device_cbox;
+
+	std::vector<ControlGroupBox*> control_groups;
+	std::vector<ControlButton*>   control_buttons;
+
+protected:
+
+	ControllerEmu* const controller;
+
+private:
+
+	ControlDialog*           m_control_dialog;
+	InputConfigDialog* const m_config_dialog;
+	InputConfig& m_config;
+	bool DetectButton(ControlButton* button);
+	bool m_iterate = false;
+};
+
+class InputConfigDialog : public wxDialog
+{
+public:
+	InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num = 0);
+
+	void ClickSave(wxCommandEvent& event);
+
+	void UpdateDeviceComboBox();
+	void UpdateProfileComboBox();
+
+	void UpdateControlReferences();
+	void UpdateBitmaps(wxTimerEvent&);
+
+private:
+
+	wxNotebook*               m_pad_notebook;
+	std::vector<GamepadPage*> m_padpages;
+	InputConfig&              m_config;
+	wxTimer                   m_update_timer;
+};
diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
new file mode 100644
index 0000000000..8494663a7f
--- /dev/null
+++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
@@ -0,0 +1,483 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+#include <wx/bitmap.h>
+#include <wx/brush.h>
+#include <wx/colour.h>
+#include <wx/dcmemory.h>
+#include <wx/font.h>
+#include <wx/notebook.h>
+#include <wx/pen.h>
+#include <wx/statbmp.h>
+
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+struct ShapePosition
+{
+	double max;
+	double diag;
+	double box;
+	double scale;
+
+	double dz;
+	double range;
+
+	wxCoord offset;
+};
+
+// regular octagon
+static void DrawOctagon(wxDC* dc, ShapePosition p)
+{
+	const int vertices = 8;
+	double radius = p.max;
+
+	wxPoint point[vertices];
+
+	double angle = 2.0 * M_PI / vertices;
+
+	for (int i = 0; i < vertices; i++)
+	{
+		double a = (angle * i);
+		double x = radius * cos(a);
+		double y = radius * sin(a);
+		point[i].x = x;
+		point[i].y = y;
+	}
+
+	dc->DrawPolygon(vertices, point, p.offset, p.offset);
+}
+
+// irregular dodecagon
+static void DrawDodecagon(wxDC* dc, ShapePosition p)
+{
+	const int vertices = 12;
+
+	wxPoint point[vertices];
+	point[0].x = p.dz; point[0].y = p.max;
+	point[1].x = p.diag; point[1].y = p.diag;
+	point[2].x = p.max; point[2].y = p.dz;
+
+	point[3].x = p.max; point[3].y = -p.dz;
+	point[4].x = p.diag; point[4].y = -p.diag;
+	point[5].x = p.dz; point[5].y = -p.max;
+
+	point[6].x = -p.dz; point[6].y = -p.max;
+	point[7].x = -p.diag; point[7].y = -p.diag;
+	point[8].x = -p.max; point[8].y = -p.dz;
+
+	point[9].x = -p.max; point[9].y = p.dz;
+	point[10].x = -p.diag; point[10].y = p.diag;
+	point[11].x = -p.dz; point[11].y = p.max;
+
+	dc->DrawPolygon(vertices, point, p.offset, p.offset);
+}
+
+static void DrawCenteredRectangle(wxDC &dc, int x, int y, int w, int h)
+{
+	x -= w / 2;
+	y -= h / 2;
+	dc.DrawRectangle(x, y, w, h);
+}
+
+#define VIS_BITMAP_SIZE 64
+
+#define VIS_NORMALIZE(a) ((a / 2.0) + 0.5)
+#define VIS_COORD(a) ((VIS_NORMALIZE(a)) * VIS_BITMAP_SIZE)
+
+#define COORD_VIS_SIZE 4
+
+static void DrawCoordinate(wxDC &dc, ControlState x, ControlState y)
+{
+	int xc = VIS_COORD(x);
+	int yc = VIS_COORD(y);
+	DrawCenteredRectangle(dc, xc, yc, COORD_VIS_SIZE, COORD_VIS_SIZE);
+}
+
+static void DrawButton(unsigned int* const bitmasks, unsigned int buttons, unsigned int n, wxDC& dc, ControlGroupBox* g, unsigned int row)
+{
+	if (buttons & bitmasks[(row * 8) + n])
+	{
+		dc.SetBrush(*wxRED_BRUSH);
+	}
+	else
+	{
+		unsigned char amt = 255 - g->control_group->controls[(row * 8) + n]->control_ref->State() * 128;
+		dc.SetBrush(wxBrush(wxColour(amt, amt, amt)));
+	}
+	dc.DrawRectangle(n * 12, (row == 0) ? 0 : (row * 11), 14, 12);
+
+	// text
+	const std::string name = g->control_group->controls[(row * 8) + n]->name;
+	// bit of hax so ZL, ZR show up as L, R
+	dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n * 12 + 2, 1 + ((row == 0) ? 0 : (row * 11)));
+}
+
+static void DrawControlGroupBox(wxDC &dc, ControlGroupBox *g)
+{
+	switch (g->control_group->type)
+	{
+	case GROUP_TYPE_TILT :
+	case GROUP_TYPE_STICK :
+	case GROUP_TYPE_CURSOR :
+	{
+		// this is starting to be a mess combining all these in one case
+
+		ControlState x = 0, y = 0, z = 0;
+
+		switch (g->control_group->type)
+		{
+		case GROUP_TYPE_STICK :
+			((ControllerEmu::AnalogStick*)g->control_group)->GetState(&x, &y);
+			break;
+		case GROUP_TYPE_TILT :
+			((ControllerEmu::Tilt*)g->control_group)->GetState(&x, &y);
+			break;
+		case GROUP_TYPE_CURSOR :
+			((ControllerEmu::Cursor*)g->control_group)->GetState(&x, &y, &z);
+			break;
+		}
+
+		// ir cursor forward movement
+		if (GROUP_TYPE_CURSOR == g->control_group->type)
+		{
+			if (z)
+			{
+				dc.SetPen(*wxRED_PEN);
+				dc.SetBrush(*wxRED_BRUSH);
+			}
+			else
+			{
+				dc.SetPen(*wxGREY_PEN);
+				dc.SetBrush(*wxGREY_BRUSH);
+			}
+			dc.DrawRectangle(0, 31 - z*31, 64, 2);
+		}
+
+		// input zone
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		dc.SetBrush(*wxWHITE_BRUSH);
+		if (GROUP_TYPE_STICK == g->control_group->type)
+		{
+			// outline and fill colors
+			wxBrush LightGrayBrush("#dddddd");
+			wxPen LightGrayPen("#bfbfbf");
+			dc.SetBrush(LightGrayBrush);
+			dc.SetPen(LightGrayPen);
+
+			ShapePosition p;
+			p.box = 64;
+			p.offset = p.box / 2;
+			p.range = 256;
+			p.scale = p.box / p.range;
+			p.dz = 15 * p.scale;
+			bool octagon = false;
+
+			if (g->control_group->name == "Main Stick")
+			{
+				p.max = 87 * p.scale;
+				p.diag = 55 * p.scale;
+			}
+			else if (g->control_group->name == "C-Stick")
+			{
+				p.max = 74 * p.scale;
+				p.diag = 46 * p.scale;
+			}
+			else
+			{
+				p.scale = 1;
+				p.max = 32;
+				octagon = true;
+			}
+
+			if (octagon)
+				DrawOctagon(&dc, p);
+			else
+				DrawDodecagon(&dc, p);
+		}
+		else
+		{
+			dc.DrawRectangle(16, 16, 32, 32);
+		}
+
+		if (GROUP_TYPE_CURSOR != g->control_group->type)
+		{
+			// deadzone circle
+			dc.SetBrush(*wxLIGHT_GREY_BRUSH);
+			dc.DrawCircle(32, 32, g->control_group->settings[SETTING_DEADZONE]->value * 32);
+		}
+
+		// raw dot
+		{
+		ControlState xx, yy;
+		xx = g->control_group->controls[3]->control_ref->State();
+		xx -= g->control_group->controls[2]->control_ref->State();
+		yy = g->control_group->controls[1]->control_ref->State();
+		yy -= g->control_group->controls[0]->control_ref->State();
+
+		dc.SetPen(*wxGREY_PEN);
+		dc.SetBrush(*wxGREY_BRUSH);
+		DrawCoordinate(dc, xx, yy);
+		}
+
+		// adjusted dot
+		if (x != 0 || y != 0)
+		{
+			dc.SetPen(*wxRED_PEN);
+			dc.SetBrush(*wxRED_BRUSH);
+			// XXX: The adjusted values flip the Y axis to be in the format
+			// the Wii expects. Should this be in WiimoteEmu.cpp instead?
+			DrawCoordinate(dc, x, -y);
+		}
+	}
+	break;
+	case GROUP_TYPE_FORCE :
+	{
+		ControlState raw_dot[3];
+		ControlState adj_dot[3];
+		const ControlState deadzone = g->control_group->settings[0]->value;
+
+		// adjusted
+		((ControllerEmu::Force*)g->control_group)->GetState(adj_dot);
+
+		// raw
+		for (unsigned int i=0; i<3; ++i)
+		{
+			raw_dot[i] = (g->control_group->controls[i*2 + 1]->control_ref->State() -
+				      g->control_group->controls[i*2]->control_ref->State());
+		}
+
+		// deadzone rect for forward/backward visual
+		dc.SetBrush(*wxLIGHT_GREY_BRUSH);
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		int deadzone_height = deadzone * VIS_BITMAP_SIZE;
+		DrawCenteredRectangle(dc, 0, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE, deadzone_height);
+
+#define LINE_HEIGHT 2
+		int line_y;
+
+		// raw forward/background line
+		dc.SetPen(*wxGREY_PEN);
+		dc.SetBrush(*wxGREY_BRUSH);
+		line_y = VIS_COORD(raw_dot[2]);
+		DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT);
+
+		// adjusted forward/background line
+		if (adj_dot[2] != 0.0)
+		{
+			dc.SetPen(*wxRED_PEN);
+			dc.SetBrush(*wxRED_BRUSH);
+			line_y = VIS_COORD(adj_dot[2]);
+			DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT);
+		}
+
+#define DEADZONE_RECT_SIZE 32
+
+		// empty deadzone square
+		dc.SetBrush(*wxWHITE_BRUSH);
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, DEADZONE_RECT_SIZE, DEADZONE_RECT_SIZE);
+
+		// deadzone square
+		dc.SetBrush(*wxLIGHT_GREY_BRUSH);
+		int dz_size = (deadzone * DEADZONE_RECT_SIZE);
+		DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, dz_size, dz_size);
+
+		// raw dot
+		dc.SetPen(*wxGREY_PEN);
+		dc.SetBrush(*wxGREY_BRUSH);
+		DrawCoordinate(dc, raw_dot[1], raw_dot[0]);
+
+		// adjusted dot
+		if (adj_dot[1] != 0 && adj_dot[0] != 0)
+		{
+			dc.SetPen(*wxRED_PEN);
+			dc.SetBrush(*wxRED_BRUSH);
+			DrawCoordinate(dc, adj_dot[1], adj_dot[0]);
+		}
+
+	}
+	break;
+	case GROUP_TYPE_BUTTONS :
+	{
+		unsigned int button_count = ((unsigned int)g->control_group->controls.size());
+
+		// draw the shit
+		dc.SetPen(*wxGREY_PEN);
+
+		unsigned int* const bitmasks = new unsigned int[button_count];
+		for (unsigned int n = 0; n<button_count; ++n)
+			bitmasks[n] = (1 << n);
+
+		unsigned int buttons = 0;
+		((ControllerEmu::Buttons*)g->control_group)->GetState(&buttons, bitmasks);
+
+		// Draw buttons in rows of 8
+		for (unsigned int row = 0; row < ceil((float)button_count / 8.0f); row++)
+		{
+			unsigned int buttons_to_draw = 8;
+			if ((button_count - row * 8) <= 8)
+				buttons_to_draw = button_count - row * 8;
+
+			for (unsigned int n = 0; n < buttons_to_draw; ++n)
+			{
+				DrawButton(bitmasks, buttons, n, dc, g, row);
+			}
+		}
+
+		delete[] bitmasks;
+
+	}
+	break;
+	case GROUP_TYPE_TRIGGERS :
+	{
+		const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size()));
+
+		// draw the shit
+		dc.SetPen(*wxGREY_PEN);
+		ControlState deadzone =  g->control_group->settings[0]->value;
+
+		ControlState* const trigs = new ControlState[trigger_count];
+		((ControllerEmu::Triggers*)g->control_group)->GetState(trigs);
+
+		for (unsigned int n = 0; n < trigger_count; ++n)
+		{
+			ControlState trig_r = g->control_group->controls[n]->control_ref->State();
+
+			// outline
+			dc.SetPen(*wxGREY_PEN);
+			dc.SetBrush(*wxWHITE_BRUSH);
+			dc.DrawRectangle(0, n*12, 64, 14);
+
+			// raw
+			dc.SetBrush(*wxGREY_BRUSH);
+			dc.DrawRectangle(0, n*12, trig_r*64, 14);
+
+			// deadzone affected
+			dc.SetBrush(*wxRED_BRUSH);
+			dc.DrawRectangle(0, n*12, trigs[n]*64, 14);
+
+			// text
+			dc.DrawText(StrToWxStr(g->control_group->controls[n]->name), 3, n*12 + 1);
+		}
+
+		delete[] trigs;
+
+		// deadzone box
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		dc.SetBrush(*wxTRANSPARENT_BRUSH);
+		dc.DrawRectangle(0, 0, deadzone*64, trigger_count*14);
+
+	}
+	break;
+	case GROUP_TYPE_MIXED_TRIGGERS :
+	{
+		const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size() / 2));
+
+		// draw the shit
+		dc.SetPen(*wxGREY_PEN);
+		ControlState thresh = g->control_group->settings[0]->value;
+
+		for (unsigned int n = 0; n < trigger_count; ++n)
+		{
+			dc.SetBrush(*wxRED_BRUSH);
+			ControlState trig_d = g->control_group->controls[n]->control_ref->State();
+
+			ControlState trig_a = trig_d > thresh ? 1
+				: g->control_group->controls[n+trigger_count]->control_ref->State();
+
+			dc.DrawRectangle(0, n*12, 64+20, 14);
+			if (trig_d <= thresh)
+				dc.SetBrush(*wxWHITE_BRUSH);
+			dc.DrawRectangle(trig_a*64, n*12, 64+20, 14);
+			dc.DrawRectangle(64, n*12, 32, 14);
+
+			// text
+			dc.DrawText(StrToWxStr(g->control_group->controls[n+trigger_count]->name), 3, n*12 + 1);
+			dc.DrawText(StrToWxStr(std::string(1, g->control_group->controls[n]->name[0])), 64 + 3, n*12 + 1);
+		}
+
+		// threshold box
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		dc.SetBrush(*wxTRANSPARENT_BRUSH);
+		dc.DrawRectangle(thresh*64, 0, 128, trigger_count*14);
+
+	}
+	break;
+	case GROUP_TYPE_SLIDER:
+	{
+		const ControlState deadzone = g->control_group->settings[0]->value;
+
+		ControlState state = g->control_group->controls[1]->control_ref->State() - g->control_group->controls[0]->control_ref->State();
+		dc.SetPen(*wxGREY_PEN);
+		dc.SetBrush(*wxGREY_BRUSH);
+		dc.DrawRectangle(31 + state * 30, 0, 2, 14);
+
+		ControlState adj_state;
+		((ControllerEmu::Slider*)g->control_group)->GetState(&adj_state);
+		if (state)
+		{
+			dc.SetPen(*wxRED_PEN);
+			dc.SetBrush(*wxRED_BRUSH);
+			dc.DrawRectangle(31 + adj_state * 30, 0, 2, 14);
+		}
+
+		// deadzone box
+		dc.SetPen(*wxLIGHT_GREY_PEN);
+		dc.SetBrush(*wxTRANSPARENT_BRUSH);
+		dc.DrawRectangle(32 - deadzone * 32, 0, deadzone * 64, 14);
+	}
+	break;
+	default:
+	break;
+	}
+}
+
+void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
+{
+	wxFont small_font(6, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
+
+	g_controller_interface.UpdateInput();
+
+	GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection());
+
+	for (ControlGroupBox* g : current_page->control_groups)
+	{
+		// if this control group has a bitmap
+		if (g->static_bitmap)
+		{
+			wxMemoryDC dc;
+			wxBitmap bitmap(g->static_bitmap->GetBitmap());
+			dc.SelectObject(bitmap);
+			dc.Clear();
+
+			dc.SetFont(small_font);
+			dc.SetTextForeground(0xC0C0C0);
+
+			DrawControlGroupBox(dc, g);
+
+			// box outline
+			// Windows XP color
+			dc.SetPen(wxPen("#7f9db9"));
+			dc.SetBrush(*wxTRANSPARENT_BRUSH);
+			dc.DrawRectangle(0, 0, bitmap.GetWidth(), bitmap.GetHeight());
+
+			// label for sticks and stuff
+			if (64 == bitmap.GetHeight())
+				dc.DrawText(StrToWxStr(g->control_group->name).Upper(), 4, 2);
+
+			dc.SelectObject(wxNullBitmap);
+			g->static_bitmap->SetBitmap(bitmap);
+		}
+	}
+}
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp
new file mode 100644
index 0000000000..e4bd1b9e8b
--- /dev/null
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@@ -0,0 +1,248 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/checklst.h>
+#include <wx/panel.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/validate.h>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
+#include "Common/Logging/LogManager.h"
+#include "DolphinWX/LogConfigWindow.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
+
+LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id)
+	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration"))
+	, m_LogWindow(log_window), enableAll(true)
+{
+	SetMinSize(wxSize(100, 100));
+	m_LogManager = LogManager::GetInstance();
+	CreateGUIControls();
+	LoadSettings();
+}
+
+LogConfigWindow::~LogConfigWindow()
+{
+	SaveSettings();
+}
+
+void LogConfigWindow::CreateGUIControls()
+{
+	// Verbosity
+	wxArrayString wxLevels, wxLevelsUse;
+	wxLevels.Add(_("Notice"));
+	wxLevels.Add(_("Error"));
+	wxLevels.Add(_("Warning"));
+	wxLevels.Add(_("Info"));
+	wxLevels.Add(_("Debug"));
+	for (int i = 0; i < MAX_LOGLEVEL; ++i)
+		wxLevelsUse.Add(wxLevels[i]);
+	m_verbosity = new wxRadioBox(this, wxID_ANY, _("Verbosity"),
+			wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxRA_SPECIFY_ROWS);
+	m_verbosity->Bind(wxEVT_RADIOBOX, &LogConfigWindow::OnVerbosityChange, this);
+
+	// Options
+	m_writeFileCB = new wxCheckBox(this, wxID_ANY, _("Write to File"));
+	m_writeFileCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteFileChecked, this);
+	m_writeConsoleCB = new wxCheckBox(this, wxID_ANY, _("Write to Console"));
+	m_writeConsoleCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteConsoleChecked, this);
+	m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window"));
+	m_writeWindowCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteWindowChecked, this);
+
+	wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"),
+			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	btn_toggle_all->Bind(wxEVT_BUTTON, &LogConfigWindow::OnToggleAll, this);
+	m_checks = new wxCheckListBox(this, wxID_ANY);
+	m_checks->Bind(wxEVT_CHECKLISTBOX, &LogConfigWindow::OnLogCheck, this);
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
+		m_checks->Append(StrToWxStr(m_LogManager->GetFullName((LogTypes::LOG_TYPE)i)));
+
+	// Sizers
+	wxStaticBoxSizer* sbOutputs = new wxStaticBoxSizer(wxVERTICAL, this, _("Logger Outputs"));
+	sbOutputs->Add(m_writeFileCB, 0, wxDOWN, 1);
+	sbOutputs->Add(m_writeConsoleCB, 0, wxDOWN, 1);
+	sbOutputs->Add(m_writeWindowCB, 0);
+
+	wxStaticBoxSizer* sbLogTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Log Types"));
+	sbLogTypes->Add(m_checks, 1, wxEXPAND);
+
+	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
+	sMain->Add(m_verbosity, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
+	sMain->Add(sbOutputs, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
+	sMain->Add(btn_toggle_all, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
+	sMain->Add(sbLogTypes, 1, wxEXPAND | wxLEFT | wxRIGHT, 5);
+
+	SetSizer(sMain);
+	Layout();
+}
+
+void LogConfigWindow::LoadSettings()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+
+	IniFile::Section* options = ini.GetOrCreateSection("Options");
+
+	// Retrieve the verbosity value from the config ini file.
+	int verbosity;
+	options->Get("Verbosity", &verbosity, 0);
+
+	// Ensure the verbosity level is valid.
+	if (verbosity < 1)
+		verbosity = 1;
+	if (verbosity > MAX_LOGLEVEL)
+		verbosity = MAX_LOGLEVEL;
+
+	// Actually set the logging verbosity.
+	m_verbosity->SetSelection(verbosity - 1);
+
+	// Get the logger output settings from the config ini file.
+	options->Get("WriteToFile", &m_writeFile, false);
+	m_writeFileCB->SetValue(m_writeFile);
+	options->Get("WriteToConsole", &m_writeConsole, true);
+	m_writeConsoleCB->SetValue(m_writeConsole);
+	options->Get("WriteToWindow", &m_writeWindow, true);
+	m_writeWindowCB->SetValue(m_writeWindow);
+
+	// Run through all of the log types and check each checkbox for each logging type
+	// depending on its set value within the config ini.
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		bool log_enabled;
+		ini.GetOrCreateSection("Logs")->Get(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, false);
+
+		if (log_enabled)
+			enableAll = false;
+
+		m_checks->Check(i, log_enabled);
+	}
+}
+
+void LogConfigWindow::SaveSettings()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+
+	IniFile::Section* options = ini.GetOrCreateSection("Options");
+	options->Set("Verbosity", m_verbosity->GetSelection() + 1);
+	options->Set("WriteToFile", m_writeFile);
+	options->Set("WriteToConsole", m_writeConsole);
+	options->Set("WriteToWindow", m_writeWindow);
+
+	// Save all enabled/disabled states of the log types to the config ini.
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		ini.GetOrCreateSection("Logs")->Set(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i));
+	}
+
+	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
+}
+
+// If the verbosity changes while logging
+void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event)
+{
+	// Get the new verbosity
+	int v = m_verbosity->GetSelection() + 1;
+
+	// Set all log types to that verbosity level
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
+	{
+		m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v);
+	}
+
+	event.Skip();
+}
+
+void LogConfigWindow::OnWriteFileChecked(wxCommandEvent& event)
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		m_writeFile = event.IsChecked();
+		if (m_checks->IsChecked(i))
+		{
+			if (m_writeFile)
+				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
+			else
+				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
+		}
+	}
+}
+
+void LogConfigWindow::OnWriteConsoleChecked(wxCommandEvent& event)
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		m_writeConsole = event.IsChecked();
+		if (m_checks->IsChecked(i))
+		{
+			if (m_writeConsole)
+				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
+			else
+				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
+		}
+	}
+}
+
+void LogConfigWindow::OnWriteWindowChecked(wxCommandEvent& event)
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		m_writeWindow = event.IsChecked();
+		if (m_checks->IsChecked(i))
+		{
+			if (m_writeWindow)
+				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow);
+			else
+				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow);
+		}
+	}
+}
+
+void LogConfigWindow::OnToggleAll(wxCommandEvent& WXUNUSED(event))
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+		ToggleLog(i, enableAll);
+
+	enableAll = !enableAll;
+}
+
+void LogConfigWindow::ToggleLog(int _logType, bool enable)
+{
+	LogTypes::LOG_TYPE logType = (LogTypes::LOG_TYPE)_logType;
+
+	m_checks->Check(_logType, enable);
+
+	m_LogManager->SetEnable(logType, enable);
+
+	if (enable)
+	{
+		if (m_writeWindow)
+			m_LogManager->AddListener(logType, (LogListener *)m_LogWindow);
+		if (m_writeFile)
+			m_LogManager->AddListener(logType, m_LogManager->GetFileListener());
+		if (m_writeConsole)
+			m_LogManager->AddListener(logType, m_LogManager->GetConsoleListener());
+	}
+	else
+	{
+		m_LogManager->RemoveListener(logType, (LogListener *)m_LogWindow);
+		m_LogManager->RemoveListener(logType, m_LogManager->GetFileListener());
+		m_LogManager->RemoveListener(logType, m_LogManager->GetConsoleListener());
+	}
+}
+
+void LogConfigWindow::OnLogCheck(wxCommandEvent& event)
+{
+	int i = event.GetInt();
+	ToggleLog(i, m_checks->IsChecked(i));
+}
+
diff --git a/Source/Core/DolphinWX/LogConfigWindow.h b/Source/Core/DolphinWX/LogConfigWindow.h
new file mode 100644
index 0000000000..e54a7dd2f6
--- /dev/null
+++ b/Source/Core/DolphinWX/LogConfigWindow.h
@@ -0,0 +1,43 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/panel.h>
+
+class LogManager;
+class CLogWindow;
+class wxCheckBox;
+class wxCheckListBox;
+class wxRadioBox;
+
+class LogConfigWindow : public wxPanel
+{
+public:
+	LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id = wxID_ANY);
+	~LogConfigWindow();
+
+	void SaveSettings();
+	void LoadSettings();
+
+private:
+	LogManager *m_LogManager;
+	CLogWindow *m_LogWindow;
+	bool m_writeFile, m_writeConsole, m_writeWindow;
+	bool enableAll;
+
+	// Controls
+	wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB;
+	wxCheckListBox* m_checks;
+	wxRadioBox *m_verbosity;
+
+	void CreateGUIControls();
+	void OnVerbosityChange(wxCommandEvent& event);
+	void OnWriteFileChecked(wxCommandEvent& event);
+	void OnWriteConsoleChecked(wxCommandEvent& event);
+	void OnWriteWindowChecked(wxCommandEvent& event);
+	void OnToggleAll(wxCommandEvent& event);
+	void ToggleLog(int _logType, bool enable);
+	void OnLogCheck(wxCommandEvent& event);
+};
diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp
new file mode 100644
index 0000000000..e4e8af6407
--- /dev/null
+++ b/Source/Core/DolphinWX/LogWindow.cpp
@@ -0,0 +1,334 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <mutex>
+#include <queue>
+#include <utility>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/colour.h>
+#include <wx/font.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
+#include <wx/validate.h>
+#include <wx/aui/framemanager.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/LogManager.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
+// Milliseconds between msgQueue flushes to wxTextCtrl
+#define UPDATETIME 200
+
+CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos,
+		const wxSize& size, long style, const wxString& name)
+	: wxPanel(parent, id, pos, size, style, name)
+	, x(0), y(0), winpos(0)
+	, Parent(parent), m_LogAccess(true)
+	, m_Log(nullptr), m_cmdline(nullptr), m_FontChoice(nullptr)
+{
+	Bind(wxEVT_CLOSE_WINDOW, &CLogWindow::OnClose, this);
+	Bind(wxEVT_TIMER, &CLogWindow::OnLogTimer, this);
+
+	m_LogManager = LogManager::GetInstance();
+
+	CreateGUIControls();
+
+	m_LogTimer.SetOwner(this);
+	m_LogTimer.Start(UPDATETIME);
+}
+
+void CLogWindow::CreateGUIControls()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+
+	IniFile::Section* options    = ini.GetOrCreateSection("Options");
+	IniFile::Section* log_window = ini.GetOrCreateSection("LogWindow");
+	log_window->Get("x", &x, Parent->GetSize().GetX() / 2);
+	log_window->Get("y", &y, Parent->GetSize().GetY());
+	log_window->Get("pos", &winpos, wxAUI_DOCK_RIGHT);
+
+	// Set up log listeners
+	int verbosity;
+	options->Get("Verbosity", &verbosity, 0);
+
+	// Ensure the verbosity level is valid
+	if (verbosity < 1)
+		verbosity = 1;
+	if (verbosity > MAX_LOGLEVEL)
+		verbosity = MAX_LOGLEVEL;
+
+	// Get the logger output settings from the config ini file.
+	options->Get("WriteToFile", &m_writeFile, false);
+	options->Get("WriteToWindow", &m_writeWindow, true);
+
+	IniFile::Section* logs = ini.GetOrCreateSection("Logs");
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		bool enable;
+		logs->Get(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &enable, false);
+
+		if (m_writeWindow && enable)
+			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, this);
+		else
+			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, this);
+
+		if (m_writeFile && enable)
+			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
+		else
+			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
+
+		m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity));
+	}
+
+	// Font
+	m_FontChoice = new wxChoice(this, wxID_ANY);
+	m_FontChoice->Bind(wxEVT_CHOICE, &CLogWindow::OnFontChange, this);
+	m_FontChoice->Append(_("Default font"));
+	m_FontChoice->Append(_("Monospaced font"));
+	m_FontChoice->Append(_("Selected font"));
+
+	DefaultFont = GetFont();
+	MonoSpaceFont.SetNativeFontInfoUserDesc("lucida console windows-1252");
+	LogFont.push_back(DefaultFont);
+	LogFont.push_back(MonoSpaceFont);
+	LogFont.push_back(DebuggerFont);
+
+	int font;
+	options->Get("Font", &font, 0);
+	m_FontChoice->SetSelection(font);
+
+	// Word wrap
+	bool wrap_lines;
+	options->Get("WrapLines", &wrap_lines, false);
+	m_WrapLine = new wxCheckBox(this, wxID_ANY, _("Word Wrap"));
+	m_WrapLine->Bind(wxEVT_CHECKBOX, &CLogWindow::OnWrapLineCheck, this);
+	m_WrapLine->SetValue(wrap_lines);
+
+	// Log viewer
+	m_Log = CreateTextCtrl(this, wxID_ANY, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY |
+			(wrap_lines ? wxTE_WORDWRAP : wxTE_DONTWRAP));
+
+	// submit row
+	m_cmdline = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+			wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB);
+
+	// Clear log button
+	m_clear_log_btn = new wxButton(this, wxID_ANY, _("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
+	m_clear_log_btn->Bind(wxEVT_BUTTON, &CLogWindow::OnClear, this);
+
+	// Sizers
+	wxBoxSizer* sTop = new wxBoxSizer(wxHORIZONTAL);
+	sTop->Add(m_clear_log_btn);
+	sTop->Add(m_FontChoice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 3);
+	sTop->Add(m_WrapLine, 0, wxALIGN_CENTER_VERTICAL);
+
+	sBottom = new wxBoxSizer(wxVERTICAL);
+	PopulateBottom();
+
+	wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
+	sMain->Add(sTop, 0, wxEXPAND);
+	sMain->Add(sBottom, 1, wxEXPAND);
+	SetSizer(sMain);
+
+	m_cmdline->SetFocus();
+}
+
+CLogWindow::~CLogWindow()
+{
+	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
+		m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, this);
+	}
+}
+
+void CLogWindow::OnClose(wxCloseEvent& event)
+{
+	SaveSettings();
+	event.Skip();
+}
+
+void CLogWindow::SaveSettings()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+
+	if (!Parent->g_pCodeWindow)
+	{
+		IniFile::Section* log_window = ini.GetOrCreateSection("LogWindow");
+		log_window->Set("x", x);
+		log_window->Set("y", y);
+		log_window->Set("pos", winpos);
+	}
+
+	IniFile::Section* options = ini.GetOrCreateSection("Options");
+	options->Set("Font", m_FontChoice->GetSelection());
+	options->Set("WrapLines", m_WrapLine->IsChecked());
+
+	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
+}
+
+void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event))
+{
+	m_Log->Clear();
+
+	{
+	std::lock_guard<std::mutex> lk(m_LogSection);
+	while (!msgQueue.empty())
+		msgQueue.pop();
+	}
+}
+
+void CLogWindow::UnPopulateBottom()
+{
+	sBottom->Detach(m_Log);
+	sBottom->Detach(m_cmdline);
+}
+
+void CLogWindow::PopulateBottom()
+{
+	sBottom->Add(m_Log, 1, wxEXPAND | wxSHRINK);
+	sBottom->Add(m_cmdline, 0, wxEXPAND);
+	Layout();
+}
+
+wxTextCtrl* CLogWindow::CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style)
+{
+	wxTextCtrl* TC = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, Style);
+#ifdef __APPLE__
+	TC->SetBackgroundColour(*wxLIGHT_GREY);
+#else
+	TC->SetBackgroundColour(*wxBLACK);
+#endif
+	if (m_FontChoice && m_FontChoice->GetSelection() < (int)LogFont.size() && m_FontChoice->GetSelection() >= 0)
+		TC->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, LogFont[m_FontChoice->GetSelection()]));
+
+	return TC;
+}
+
+void CLogWindow::OnFontChange(wxCommandEvent& event)
+{
+	// Update selected font
+	LogFont[LogFont.size()-1] = DebuggerFont;
+	m_Log->SetStyle(0, m_Log->GetLastPosition(),
+			wxTextAttr(wxNullColour, wxNullColour, LogFont[event.GetSelection()]));
+	m_Log->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, LogFont[event.GetSelection()]));
+
+	SaveSettings();
+}
+
+void CLogWindow::OnWrapLineCheck(wxCommandEvent& event)
+{
+#ifdef __WXGTK__
+	// Clear the old word wrap state and set the new
+	m_Log->SetWindowStyleFlag(m_Log->GetWindowStyleFlag() ^ (wxTE_WORDWRAP | wxTE_DONTWRAP));
+#else
+	wxString Text;
+	// Unfortunately wrapping styles can only be changed dynamically with wxGTK
+	// Notice: To retain the colors when changing word wrapping we need to
+	//         loop through every letter with GetStyle and then reapply them letter by letter
+	// Prevent m_Log access while it's being destroyed
+	m_LogAccess = false;
+	UnPopulateBottom();
+	Text = m_Log->GetValue();
+	m_Log->Destroy();
+	if (event.IsChecked())
+		m_Log = CreateTextCtrl(this, wxID_ANY, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_WORDWRAP);
+	else
+		m_Log = CreateTextCtrl(this, wxID_ANY, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
+	m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
+	m_Log->AppendText(Text);
+	PopulateBottom();
+	m_LogAccess = true;
+#endif
+	SaveSettings();
+}
+
+void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event))
+{
+	if (!m_LogAccess)
+		return;
+
+	UpdateLog();
+
+	// Scroll to the last line
+	if (!msgQueue.empty())
+	{
+		m_Log->ScrollLines(1);
+		m_Log->ShowPosition( m_Log->GetLastPosition() );
+	}
+}
+
+void CLogWindow::UpdateLog()
+{
+	if (!m_LogAccess || !m_Log || msgQueue.empty())
+		return;
+
+	m_LogTimer.Stop();
+
+	std::lock_guard<std::mutex> lk(m_LogSection);
+	while (!msgQueue.empty())
+	{
+		switch (msgQueue.front().first)
+		{
+			case LogTypes::LOG_LEVELS::LERROR:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
+				break;
+
+			case LogTypes::LOG_LEVELS::LWARNING:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxYELLOW));
+				break;
+
+			case LogTypes::LOG_LEVELS::LNOTICE:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN));
+				break;
+
+			case LogTypes::LOG_LEVELS::LINFO:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN));
+				break;
+
+			case LogTypes::LOG_LEVELS::LDEBUG:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY));
+				break;
+
+			default:
+				m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
+				break;
+		}
+
+		if (msgQueue.front().second.size())
+		{
+			int i = m_Log->GetLastPosition();
+			m_Log->AppendText(msgQueue.front().second);
+			// White timestamp
+			m_Log->SetStyle(i, i + 9, wxTextAttr(*wxWHITE));
+		}
+
+		msgQueue.pop();
+	}
+
+	m_LogTimer.Start();
+}
+
+void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text)
+{
+	std::lock_guard<std::mutex> lk(m_LogSection);
+
+	if (msgQueue.size() >= 100)
+		msgQueue.pop();
+
+	msgQueue.push(std::make_pair(u8(level), StrToWxStr(text)));
+}
diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h
new file mode 100644
index 0000000000..cbd8f26cb2
--- /dev/null
+++ b/Source/Core/DolphinWX/LogWindow.h
@@ -0,0 +1,71 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <mutex>
+#include <queue>
+#include <utility>
+#include <vector>
+#include <wx/font.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/Logging/LogManager.h"
+
+class CFrame;
+class wxBoxSizer;
+class wxCheckBox;
+class wxChoice;
+class wxTextCtrl;
+
+// Uses multiple inheritance - only sane because LogListener is a pure virtual interface.
+class CLogWindow : public wxPanel, LogListener
+{
+public:
+	CLogWindow(CFrame* parent,
+		wxWindowID id = wxID_ANY,
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxTAB_TRAVERSAL,
+		const wxString& name = _("Log")
+		);
+	~CLogWindow();
+
+	void SaveSettings();
+	void Log(LogTypes::LOG_LEVELS, const char *text) override;
+
+	int x, y, winpos;
+
+private:
+	CFrame* Parent;
+	wxFont DefaultFont, MonoSpaceFont;
+	std::vector<wxFont> LogFont;
+	wxTimer m_LogTimer;
+	LogManager* m_LogManager;
+	std::queue<std::pair<u8, wxString> > msgQueue;
+	bool m_writeFile, m_writeWindow, m_LogAccess;
+
+	// Controls
+	wxBoxSizer* sBottom;
+	wxTextCtrl* m_Log;
+	wxTextCtrl* m_cmdline;
+	wxChoice* m_FontChoice;
+	wxCheckBox* m_WrapLine;
+	wxButton* m_clear_log_btn;
+
+	std::mutex m_LogSection;
+
+	wxTextCtrl* CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
+	void CreateGUIControls();
+	void PopulateBottom();
+	void UnPopulateBottom();
+	void OnClose(wxCloseEvent& event);
+	void OnFontChange(wxCommandEvent& event);
+	void OnWrapLineCheck(wxCommandEvent& event);
+	void OnClear(wxCommandEvent& event);
+	void OnLogTimer(wxTimerEvent& WXUNUSED(event));
+	void UpdateLog();
+};
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
new file mode 100644
index 0000000000..c89e0d8307
--- /dev/null
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -0,0 +1,553 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <utility>
+#include <wx/app.h>
+#include <wx/buffer.h>
+#include <wx/cmdline.h>
+#include <wx/image.h>
+#include <wx/imagpng.h>
+#include <wx/intl.h>
+#include <wx/language.h>
+#include <wx/msgdlg.h>
+#include <wx/thread.h>
+#include <wx/timer.h>
+#include <wx/utils.h>
+#include <wx/window.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/HW/Wiimote.h"
+
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/SoftwareVideoConfigDialog.h"
+#include "DolphinWX/VideoConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+
+#include "UICommon/UICommon.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+#if defined HAVE_X11 && HAVE_X11
+#include <X11/Xlib.h>
+#endif
+
+#ifdef _WIN32
+
+#ifndef SM_XVIRTUALSCREEN
+#define SM_XVIRTUALSCREEN 76
+#endif
+#ifndef SM_YVIRTUALSCREEN
+#define SM_YVIRTUALSCREEN 77
+#endif
+#ifndef SM_CXVIRTUALSCREEN
+#define SM_CXVIRTUALSCREEN 78
+#endif
+#ifndef SM_CYVIRTUALSCREEN
+#define SM_CYVIRTUALSCREEN 79
+#endif
+
+#endif
+
+#ifdef __APPLE__
+#import <AppKit/AppKit.h>
+#endif
+
+class wxFrame;
+
+// ------------
+//  Main window
+
+IMPLEMENT_APP(DolphinApp)
+
+bool wxMsgAlert(const char*, const char*, bool, int);
+std::string wxStringTranslator(const char *);
+
+CFrame* main_frame = nullptr;
+
+bool DolphinApp::Initialize(int& c, wxChar **v)
+{
+#if defined HAVE_X11 && HAVE_X11
+	XInitThreads();
+#endif
+	return wxApp::Initialize(c, v);
+}
+
+// The 'main program' equivalent that creates the main window and return the main frame
+
+bool DolphinApp::OnInit()
+{
+	Bind(wxEVT_QUERY_END_SESSION, &DolphinApp::OnEndSession, this);
+	Bind(wxEVT_END_SESSION, &DolphinApp::OnEndSession, this);
+
+	// Declarations and definitions
+	bool UseDebugger = false;
+	bool UseLogger = false;
+	bool selectVideoBackend = false;
+	bool selectAudioEmulation = false;
+	bool selectPerfDir = false;
+
+	wxString videoBackendName;
+	wxString audioEmulationName;
+	wxString userPath;
+	wxString perfDir;
+
+#if wxUSE_CMDLINE_PARSER // Parse command lines
+	wxCmdLineEntryDesc cmdLineDesc[] =
+	{
+		{
+			wxCMD_LINE_SWITCH, "h", "help",
+			"Show this help message",
+			wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
+		},
+		{
+			wxCMD_LINE_SWITCH, "d", "debugger",
+			"Opens the debugger",
+			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_SWITCH, "l", "logger",
+			"Opens the logger",
+			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "e", "exec",
+			"Loads the specified file (ELF, DOL, GCM, ISO, WBFS, CISO, GCZ, WAD)",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_SWITCH, "b", "batch",
+			"Exit Dolphin with emulator",
+			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "V", "video_backend",
+			"Specify a video backend",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "A", "audio_emulation",
+			"Low level (LLE) or high level (HLE) audio",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "m", "movie",
+			"Play a movie file",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "U", "user",
+			"User folder path",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_OPTION, "P", "perf_dir",
+			"Directory for Linux perf perf-$pid.map file",
+			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
+		},
+		{
+			wxCMD_LINE_NONE, nullptr, nullptr, nullptr, wxCMD_LINE_VAL_NONE, 0
+		}
+	};
+
+	// Gets the command line parameters
+	wxCmdLineParser parser(cmdLineDesc, argc, argv);
+	LoadFile = false;
+	if (argc == 2 && File::Exists(argv[1].ToUTF8().data()))
+	{
+		LoadFile = true;
+		FileToLoad = argv[1];
+	}
+	else if (parser.Parse() != 0)
+	{
+		return false;
+	}
+
+	UseDebugger = parser.Found("debugger");
+	UseLogger = parser.Found("logger");
+	if (!LoadFile)
+		LoadFile = parser.Found("exec", &FileToLoad);
+	BatchMode = parser.Found("batch");
+	selectVideoBackend = parser.Found("video_backend", &videoBackendName);
+	selectAudioEmulation = parser.Found("audio_emulation", &audioEmulationName);
+	selectPerfDir = parser.Found("perf_dir", &perfDir);
+	playMovie = parser.Found("movie", &movieFile);
+	parser.Found("user", &userPath);
+#endif // wxUSE_CMDLINE_PARSER
+
+	// Register message box and translation handlers
+	RegisterMsgAlertHandler(&wxMsgAlert);
+	RegisterStringTranslator(&wxStringTranslator);
+
+#if wxUSE_ON_FATAL_EXCEPTION
+	wxHandleFatalExceptions(true);
+#endif
+
+	UICommon::SetUserDirectory(userPath.ToStdString());
+	UICommon::CreateDirectories();
+	InitLanguageSupport();	// The language setting is loaded from the user directory
+	UICommon::Init();
+
+	if (selectPerfDir)
+	{
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_perfDir =
+			WxStrToStr(perfDir);
+	}
+
+	if (selectVideoBackend && videoBackendName != wxEmptyString)
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend =
+			WxStrToStr(videoBackendName);
+
+	if (selectAudioEmulation)
+	{
+		if (audioEmulationName == "HLE")
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true;
+		else if (audioEmulationName == "LLE")
+			SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false;
+	}
+
+	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
+
+	// Enable the PNG image handler for screenshots
+	wxImage::AddHandler(new wxPNGHandler);
+
+	int x = SConfig::GetInstance().m_LocalCoreStartupParameter.iPosX;
+	int y = SConfig::GetInstance().m_LocalCoreStartupParameter.iPosY;
+	int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth;
+	int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight;
+
+	if (File::Exists("www.dolphin-emulator.com.txt"))
+	{
+		File::Delete("www.dolphin-emulator.com.txt");
+		wxMessageDialog dlg(nullptr, _(
+		    "This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please "
+		    "download Dolphin from the official website instead: https://dolphin-emu.org/"),
+		    _("Unofficial version detected"), wxOK | wxICON_WARNING);
+		dlg.ShowModal();
+
+		wxLaunchDefaultBrowser("https://dolphin-emu.org/?ref=badver");
+
+		exit(0);
+	}
+
+	// The following is not needed with X11, where window managers
+	// do not allow windows to be created off the desktop.
+#ifdef _WIN32
+	// Out of desktop check
+	int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
+	int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
+	int width =  GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+	if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y)
+		x = y = wxDefaultCoord;
+#elif defined __APPLE__
+	if (y < 1)
+		y = wxDefaultCoord;
+#endif
+
+	main_frame = new CFrame(nullptr, wxID_ANY,
+				StrToWxStr(scm_rev_str),
+				wxPoint(x, y), wxSize(w, h),
+				UseDebugger, BatchMode, UseLogger);
+	SetTopWindow(main_frame);
+	main_frame->SetMinSize(wxSize(400, 300));
+
+	AfterInit();
+
+	return true;
+}
+
+void DolphinApp::MacOpenFile(const wxString &fileName)
+{
+	FileToLoad = fileName;
+	LoadFile = true;
+	main_frame->BootGame(WxStrToStr(FileToLoad));
+}
+
+void DolphinApp::AfterInit()
+{
+	if (!BatchMode)
+		main_frame->UpdateGameList();
+
+	if (playMovie && movieFile != wxEmptyString)
+	{
+		if (Movie::PlayInput(WxStrToStr(movieFile)))
+		{
+			if (LoadFile && FileToLoad != wxEmptyString)
+			{
+				main_frame->BootGame(WxStrToStr(FileToLoad));
+			}
+			else
+			{
+				main_frame->BootGame("");
+			}
+		}
+	}
+
+	// First check if we have an exec command line.
+	else if (LoadFile && FileToLoad != wxEmptyString)
+	{
+		main_frame->BootGame(WxStrToStr(FileToLoad));
+	}
+	// If we have selected Automatic Start, start the default ISO,
+	// or if no default ISO exists, start the last loaded ISO
+	else if (main_frame->g_pCodeWindow)
+	{
+		if (main_frame->g_pCodeWindow->AutomaticStart())
+		{
+			main_frame->BootGame("");
+		}
+	}
+}
+
+void DolphinApp::InitLanguageSupport()
+{
+	unsigned int language = 0;
+
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	ini.GetOrCreateSection("Interface")->Get("Language", &language, wxLANGUAGE_DEFAULT);
+
+	// Load language if possible, fall back to system default otherwise
+	if (wxLocale::IsAvailable(language))
+	{
+		m_locale = new wxLocale(language);
+
+#ifdef _WIN32
+		m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages"));
+#endif
+
+		m_locale->AddCatalog("dolphin-emu");
+
+		if (!m_locale->IsOk())
+		{
+			wxMessageBox(_("Error loading selected language. Falling back to system default."), _("Error"));
+			delete m_locale;
+			m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
+		}
+	}
+	else
+	{
+		wxMessageBox(_("The selected language is not supported by your system. Falling back to system default."), _("Error"));
+		m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
+	}
+}
+
+void DolphinApp::OnEndSession(wxCloseEvent& event)
+{
+	// Close if we've received wxEVT_END_SESSION (ignore wxEVT_QUERY_END_SESSION)
+	if (!event.CanVeto())
+	{
+		main_frame->Close(true);
+	}
+}
+
+int DolphinApp::OnExit()
+{
+	UICommon::Shutdown();
+
+	delete m_locale;
+
+	return wxApp::OnExit();
+}
+
+void DolphinApp::OnFatalException()
+{
+	WiimoteReal::Shutdown();
+}
+
+// ------------
+// Talk to GUI
+
+bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/)
+{
+#ifdef __WXGTK__
+	if (wxIsMainThread())
+#endif
+		return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption),
+				(yes_no) ? wxYES_NO : wxOK, wxWindow::FindFocus());
+#ifdef __WXGTK__
+	else
+	{
+		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_PANIC);
+		event.SetString(StrToWxStr(caption) + ":" + StrToWxStr(text));
+		event.SetInt(yes_no);
+		main_frame->GetEventHandler()->AddPendingEvent(event);
+		main_frame->panic_event.Wait();
+		return main_frame->bPanicResult;
+	}
+#endif
+}
+
+std::string wxStringTranslator(const char *text)
+{
+	return WxStrToStr(wxGetTranslation(wxString::FromUTF8(text)));
+}
+
+// Accessor for the main window class
+CFrame* DolphinApp::GetCFrame()
+{
+	return main_frame;
+}
+
+void Host_Message(int Id)
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, Id);
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+}
+
+void* Host_GetRenderHandle()
+{
+	return main_frame->GetRenderHandle();
+}
+
+// OK, this thread boundary is DANGEROUS on Linux
+// wxPostEvent / wxAddPendingEvent is the solution.
+void Host_NotifyMapLoaded()
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_NOTIFY_MAP_LOADED);
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+
+	if (main_frame->g_pCodeWindow)
+	{
+		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
+	}
+}
+
+void Host_UpdateDisasmDialog()
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_DISASM_DIALOG);
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+
+	if (main_frame->g_pCodeWindow)
+	{
+		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
+	}
+}
+
+void Host_UpdateMainFrame()
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_GUI);
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+
+	if (main_frame->g_pCodeWindow)
+	{
+		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
+	}
+}
+
+void Host_UpdateTitle(const std::string& title)
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_TITLE);
+	event.SetString(StrToWxStr(title));
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+}
+
+void Host_RequestRenderWindowSize(int width, int height)
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_WINDOW_SIZE_REQUEST);
+	event.SetClientData(new std::pair<int, int>(width, height));
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+}
+
+void Host_RequestFullscreen(bool enable_fullscreen)
+{
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_FULLSCREEN_REQUEST);
+	event.SetInt(enable_fullscreen ? 1 : 0);
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+}
+
+void Host_SetStartupDebuggingParameters()
+{
+	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	if (main_frame->g_pCodeWindow)
+	{
+		StartUp.bBootToPause = main_frame->g_pCodeWindow->BootToPause();
+		StartUp.bAutomaticStart = main_frame->g_pCodeWindow->AutomaticStart();
+		StartUp.bJITNoBlockCache = main_frame->g_pCodeWindow->JITNoBlockCache();
+		StartUp.bJITNoBlockLinking = main_frame->g_pCodeWindow->JITNoBlockLinking();
+	}
+	else
+	{
+		StartUp.bBootToPause = false;
+	}
+	StartUp.bEnableDebugging = main_frame->g_pCodeWindow ? true : false; // RUNNING_DEBUG
+}
+
+void Host_SetWiiMoteConnectionState(int _State)
+{
+	static int currentState = -1;
+	if (_State == currentState)
+		return;
+	currentState = _State;
+
+	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_STATUS_BAR);
+
+	switch (_State)
+	{
+	case 0: event.SetString(_("Not connected")); break;
+	case 1: event.SetString(_("Connecting...")); break;
+	case 2: event.SetString(_("Wiimote Connected")); break;
+	}
+	// Update field 1 or 2
+	event.SetInt(1);
+
+	NOTICE_LOG(WIIMOTE, "%s", static_cast<const char*>(event.GetString().c_str()));
+
+	main_frame->GetEventHandler()->AddPendingEvent(event);
+}
+
+bool Host_UIHasFocus()
+{
+	return main_frame->UIHasFocus();
+}
+
+bool Host_RendererHasFocus()
+{
+	return main_frame->RendererHasFocus();
+}
+
+bool Host_RendererIsFullscreen()
+{
+	return main_frame->RendererIsFullscreen();
+}
+
+void Host_ConnectWiimote(int wm_idx, bool connect)
+{
+	CFrame::ConnectWiimote(wm_idx, connect);
+}
+
+void Host_ShowVideoConfig(void* parent, const std::string& backend_name,
+                          const std::string& config_name)
+{
+	if (backend_name == "Direct3D" || backend_name == "OpenGL")
+	{
+		VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name);
+		diag.ShowModal();
+	}
+	else if (backend_name == "Software Renderer")
+	{
+		SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name);
+		diag.ShowModal();
+	}
+}
diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h
new file mode 100644
index 0000000000..ade8f81287
--- /dev/null
+++ b/Source/Core/DolphinWX/Main.h
@@ -0,0 +1,39 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/app.h>
+
+class CFrame;
+class wxLocale;
+
+extern CFrame* main_frame;
+
+// Define a new application
+class DolphinApp : public wxApp
+{
+public:
+	CFrame* GetCFrame();
+
+private:
+	bool OnInit() override;
+	int OnExit() override;
+	void OnFatalException() override;
+	bool Initialize(int& c, wxChar **v) override;
+	void InitLanguageSupport();
+	void MacOpenFile(const wxString &fileName);
+
+	bool BatchMode;
+	bool LoadFile;
+	bool playMovie;
+	wxString FileToLoad;
+	wxString movieFile;
+	wxLocale *m_locale;
+
+	void AfterInit();
+	void OnEndSession(wxCloseEvent& event);
+};
+
+DECLARE_APP(DolphinApp);
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
new file mode 100644
index 0000000000..1389abdcee
--- /dev/null
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -0,0 +1,632 @@
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstdio>
+#include <cstdlib>
+#include <jni.h>
+#include <android/log.h>
+#include <android/native_window_jni.h>
+#include <EGL/egl.h>
+#include "../DiscIO/Volume.h"
+#include "Android/ButtonManager.h"
+#include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Common/Event.h"
+#include "Common/FileUtil.h"
+#include "Common/Logging/LogManager.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/State.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/Profiler.h"
+
+#include "DiscIO/VolumeCreator.h"
+
+#include "UICommon/UICommon.h"
+
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+ANativeWindow* surf;
+std::string g_filename;
+std::string g_set_userpath = "";
+
+JavaVM* g_java_vm;
+jclass g_jni_class;
+jmethodID g_jni_method_alert;
+
+#define DOLPHIN_TAG "DolphinEmuNative"
+
+/*
+ * Cache the JavaVM so that we can call into it later.
+ */
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+	g_java_vm = vm;
+
+	return JNI_VERSION_1_6;
+}
+
+void Host_NotifyMapLoaded() {}
+void Host_RefreshDSPDebuggerWindow() {}
+
+Common::Event updateMainFrameEvent;
+void Host_Message(int Id)
+{
+}
+
+void* Host_GetRenderHandle()
+{
+	return surf;
+}
+
+void Host_UpdateTitle(const std::string& title)
+{
+	__android_log_write(ANDROID_LOG_INFO, DOLPHIN_TAG, title.c_str());
+}
+
+void Host_UpdateDisasmDialog(){}
+
+void Host_UpdateMainFrame()
+{
+}
+
+void Host_RequestRenderWindowSize(int width, int height) {}
+
+void Host_RequestFullscreen(bool enable_fullscreen) {}
+
+void Host_SetStartupDebuggingParameters()
+{
+}
+
+bool Host_UIHasFocus()
+{
+	return true;
+}
+
+bool Host_RendererHasFocus()
+{
+	return true;
+}
+
+bool Host_RendererIsFullscreen()
+{
+	return false;
+}
+
+void Host_ConnectWiimote(int wm_idx, bool connect) {}
+
+void Host_SetWiiMoteConnectionState(int _State) {}
+
+void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
+
+static bool MsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/)
+{
+	__android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "%s:%s", caption, text);
+
+	// Associate the current Thread with the Java VM.
+	JNIEnv* env;
+	g_java_vm->AttachCurrentThread(&env, NULL);
+
+	// Execute the Java method.
+	env->CallStaticVoidMethod(g_jni_class, g_jni_method_alert, env->NewStringUTF(text));
+
+	// Must be called before the current thread exits; might as well do it here.
+	g_java_vm->DetachCurrentThread();
+
+	return false;
+}
+
+#define DVD_BANNER_WIDTH 96
+#define DVD_BANNER_HEIGHT 32
+
+static inline u32 Average32(u32 a, u32 b) {
+	return ((a >> 1) & 0x7f7f7f7f) + ((b >> 1) & 0x7f7f7f7f);
+}
+
+static inline u32 GetPixel(u32 *buffer, unsigned int x, unsigned int y) {
+	// thanks to unsignedness, these also check for <0 automatically.
+	if (x > 191) return 0;
+	if (y > 63) return 0;
+	return buffer[y * 192 + x];
+}
+
+static bool LoadBanner(std::string filename, u32 *Banner)
+{
+	std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename));
+
+	if (pVolume != nullptr)
+	{
+		int Width, Height;
+		std::vector<u32> BannerVec = pVolume->GetBanner(&Width, &Height);
+		// This code (along with above inlines) is moved from
+		// elsewhere.  Someone who knows anything about Android
+		// please get rid of it and use proper high-resolution
+		// images.
+		if (Height == 64 && Width == 192)
+		{
+			u32* Buffer = &BannerVec[0];
+			for (int y = 0; y < 32; y++)
+			{
+				for (int x = 0; x < 96; x++)
+				{
+					// simplified plus-shaped "gaussian"
+					u32 surround = Average32(
+							Average32(GetPixel(Buffer, x*2 - 1, y*2), GetPixel(Buffer, x*2 + 1, y*2)),
+							Average32(GetPixel(Buffer, x*2, y*2 - 1), GetPixel(Buffer, x*2, y*2 + 1)));
+					Banner[y * 96 + x] = Average32(GetPixel(Buffer, x*2, y*2), surround);
+				}
+			}
+			return true;
+		}
+		else if (Height == 32 && Width == 96)
+		{
+			memcpy(Banner, &BannerVec[0], 96 * 32 * 4);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static int GetCountry(std::string filename)
+{
+	std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename));
+
+	if (pVolume != nullptr)
+	{
+		DiscIO::IVolume::ECountry country = pVolume->GetCountry();
+
+		__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Country Code: %i", country);
+
+		return country;
+	}
+
+	// Return UNKNOWN
+	return 13;
+}
+
+static int GetPlatform(std::string filename)
+{
+	std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename));
+
+	if (pVolume != nullptr)
+	{
+		switch (pVolume->GetVolumeType())
+		{
+			case DiscIO::IVolume::GAMECUBE_DISC:
+				__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a GameCube disc.");
+				return 0;
+			case DiscIO::IVolume::WII_DISC:
+				__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii disc.");
+				return 1;
+			case DiscIO::IVolume::WII_WAD:
+				__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii WAD.");
+				return 2;
+		}
+	}
+
+	return -1;
+}
+
+static std::string GetTitle(std::string filename)
+{
+	__android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Title for file: %s", filename.c_str());
+
+	std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename));
+
+	if (pVolume != nullptr) {
+		std::map <DiscIO::IVolume::ELanguage, std::string> titles = pVolume->GetNames(true);
+
+		/*
+		bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+		DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title);
+
+		auto it = titles.find(language);
+		if (it != end)
+			return it->second;*/
+
+		auto end = titles.end();
+
+		// English tends to be a good fallback when the requested language isn't available
+		//if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) {
+			auto it = titles.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
+			if (it != end)
+				return it->second;
+		//}
+
+
+		// If English isn't available either, just pick something
+		if (!titles.empty())
+			return titles.cbegin()->second;
+
+		// No usable name, return filename (better than nothing)
+		std::string name;
+		SplitPath(filename, nullptr, &name, nullptr);
+		return name;
+	}
+
+	return std::string ("");
+}
+
+static std::string GetDescription(std::string filename)
+{
+	__android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Description for file: %s", filename.c_str());
+
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+
+	if (pVolume != nullptr)
+	{
+		std::map <DiscIO::IVolume::ELanguage, std::string> descriptions = pVolume->GetDescriptions();
+
+		/*
+		bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+		DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title);
+
+		auto it = descriptions.find(language);
+		if (it != end)
+			return it->second;*/
+
+		auto end = descriptions.end();
+
+		// English tends to be a good fallback when the requested language isn't available
+		//if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) {
+			auto it = descriptions.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
+			if (it != end)
+				return it->second;
+		//}
+
+		// If English isn't available either, just pick something
+		if (!descriptions.empty())
+			return descriptions.cbegin()->second;
+	}
+
+	return std::string ("");
+}
+
+static std::string GetGameId(std::string filename)
+{
+	__android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting ID for file: %s", filename.c_str());
+
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+	if (pVolume != nullptr)
+	{
+		std::string id = pVolume->GetUniqueID();
+		__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Game ID: %s", id.c_str());
+
+		return id;
+	}
+	return std::string ("");
+}
+
+static std::string GetCompany(std::string filename)
+{
+	__android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Company for file: %s", filename.c_str());
+
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+	if (pVolume != nullptr)
+	{
+		std::string company = DiscIO::GetCompanyFromID(pVolume->GetMakerID());
+		__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Company: %s", company.c_str());
+		return company;
+	}
+	return std::string ("");
+}
+
+static u64 GetFileSize(std::string filename)
+{
+	__android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting size of file: %s", filename.c_str());
+
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+	if (pVolume != nullptr)
+	{
+		u64 size = pVolume->GetSize();
+		// Causes a warning because size is u64, not 'long unsigned'
+		//__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Size: %lu", size);
+
+		return  size;
+	}
+
+	return -1;
+}
+
+static std::string GetJString(JNIEnv *env, jstring jstr)
+{
+	std::string result = "";
+	if (!jstr)
+		return result;
+
+	const char *s = env->GetStringUTFChars(jstr, nullptr);
+	result = s;
+	env->ReleaseStringUTFChars(jstr, s);
+	return result;
+}
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj);
+JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value);
+JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile);JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDescription(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameId(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCountry(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCompany(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetFilesize(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetPlatform(JNIEnv *env, jobject obj, jstring jFilename);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj);
+JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv *env, jobject obj, jint api);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jDefault);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jValue);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv *env, jobject obj, jstring jFile);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv *env, jobject obj, jint slot);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(JNIEnv *env, jobject obj, jstring jDirectory);
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetProfiling(JNIEnv *env, jobject obj, jboolean enable);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteProfileResults(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CacheClassesAndMethods(JNIEnv *env, jobject obj);
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf);
+
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj)
+{
+	PowerPC::Start();
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj)
+{
+	PowerPC::Pause();
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj)
+{
+	Core::Stop();
+	updateMainFrameEvent.Set(); // Kick the waiting event
+}
+JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
+{
+	return ButtonManager::GamepadEvent(GetJString(env, jDevice), Button, Action);
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value)
+{
+	ButtonManager::GamepadAxisEvent(GetJString(env, jDevice), Axis, Value);
+}
+
+JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
+{
+	std::string file = GetJString(env, jFile);
+	u32 uBanner[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
+	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
+
+	if (LoadBanner(file, uBanner))
+	{
+		env->SetIntArrayRegion(Banner, 0, DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT, (jint*)uBanner);
+	}
+	return Banner;
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	std::string name = GetTitle(filename);
+	return env->NewStringUTF(name.c_str());
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDescription(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	std::string description = GetDescription(filename);
+	return env->NewStringUTF(description.c_str());
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameId(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	std::string id = GetGameId(filename);
+	return env->NewStringUTF(id.c_str());
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCompany(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	std::string company = GetCompany(filename);
+	return env->NewStringUTF(company.c_str());
+}
+
+JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCountry(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	int country = GetCountry(filename);
+	return country;
+}
+
+JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetFilesize(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	u64 size = GetFileSize(filename);
+	return size;
+}
+
+JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetPlatform(JNIEnv *env, jobject obj, jstring jFilename)
+{
+	std::string filename = GetJString(env, jFilename);
+	int platform = GetPlatform(filename);
+	return platform;
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj)
+{
+	return env->NewStringUTF(scm_rev_str);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv *env, jobject obj)
+{
+	return cpu_info.bNEON || cpu_info.bASIMD;
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv *env, jobject obj)
+{
+	Core::SaveScreenShot();
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv *env, jobject obj, jint api)
+{
+	eglBindAPI(api);
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jDefault)
+{
+	IniFile ini;
+	std::string file         = GetJString(env, jFile);
+	std::string section      = GetJString(env, jSection);
+	std::string key          = GetJString(env, jKey);
+	std::string defaultValue = GetJString(env, jDefault);
+
+	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(file));
+	std::string value;
+
+	ini.GetOrCreateSection(section)->Get(key, &value, defaultValue);
+
+	return env->NewStringUTF(value.c_str());
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jValue)
+{
+	IniFile ini;
+	std::string file         = GetJString(env, jFile);
+	std::string section      = GetJString(env, jSection);
+	std::string key          = GetJString(env, jKey);
+	std::string value        = GetJString(env, jValue);
+
+	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(file));
+
+	ini.GetOrCreateSection(section)->Set(key, value);
+	ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(file));
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv *env, jobject obj, jstring jFile)
+{
+	g_filename = GetJString(env, jFile);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot)
+{
+	State::Save(slot);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv *env, jobject obj, jint slot)
+{
+	State::Load(slot);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv *env, jobject obj)
+{
+	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
+	File::CreateFullPath(File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
+	File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
+	File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(JNIEnv *env, jobject obj, jstring jDirectory)
+{
+	std::string directory = GetJString(env, jDirectory);
+	g_set_userpath = directory;
+	UICommon::SetUserDirectory(directory);
+}
+
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv *env, jobject obj)
+{
+	return env->NewStringUTF(File::GetUserPath(D_USER_IDX).c_str());
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetProfiling(JNIEnv *env, jobject obj, jboolean enable)
+{
+	Core::SetState(Core::CORE_PAUSE);
+	JitInterface::ClearCache();
+	Profiler::g_ProfileBlocks = enable;
+	Core::SetState(Core::CORE_RUN);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteProfileResults(JNIEnv *env, jobject obj)
+{
+	std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt";
+	File::CreateFullPath(filename);
+	JitInterface::WriteProfileResults(filename);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CacheClassesAndMethods(JNIEnv *env, jobject obj)
+{
+	// This class reference is only valid for the lifetime of this method.
+	jclass localClass = env->FindClass("org/dolphinemu/dolphinemu/NativeLibrary");
+
+	// This reference, however, is valid until we delete it.
+	g_jni_class = reinterpret_cast<jclass>(env->NewGlobalRef(localClass));
+
+	// TODO Find a place for this.
+	// So we don't leak a reference to NativeLibrary.class.
+	// env->DeleteGlobalRef(g_jni_class);
+
+	// Method signature taken from javap -s Source/Android/app/build/intermediates/classes/arm/debug/org/dolphinemu/dolphinemu/NativeLibrary.class
+	g_jni_method_alert = env->GetStaticMethodID(g_jni_class, "displayAlertMsg", "(Ljava/lang/String;)V");
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf)
+{
+	__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", g_filename.c_str());
+
+	surf = ANativeWindow_fromSurface(env, _surf);
+
+	if (surf == nullptr)
+	{
+		__android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "Error: Surface is null.");
+		return;
+	}
+
+	// Install our callbacks
+	OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init);
+	OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown);
+
+	RegisterMsgAlertHandler(&MsgAlert);
+
+	UICommon::SetUserDirectory(g_set_userpath);
+	UICommon::Init();
+
+	// No use running the loop when booting fails
+	if ( BootManager::BootCore( g_filename.c_str() ) )
+	{
+		PowerPC::Start();
+		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+			updateMainFrameEvent.Wait();
+	}
+
+	UICommon::Shutdown();
+	ANativeWindow_release(surf);
+}
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
new file mode 100644
index 0000000000..9186742d46
--- /dev/null
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -0,0 +1,368 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <getopt.h>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/Event.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "Core/Host.h"
+#include "Core/State.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "UICommon/UICommon.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+static bool rendererHasFocus = true;
+static bool rendererIsFullscreen = false;
+static bool running = true;
+
+class Platform
+{
+public:
+	virtual void Init() = 0;
+	virtual void SetTitle(const std::string &title) = 0;
+	virtual void MainLoop() = 0;
+	virtual void Shutdown() = 0;
+	virtual ~Platform() {};
+};
+
+static Platform* platform;
+
+void Host_NotifyMapLoaded() {}
+void Host_RefreshDSPDebuggerWindow() {}
+
+static Common::Event updateMainFrameEvent;
+void Host_Message(int Id)
+{
+	if (Id == WM_USER_STOP)
+		running = false;
+}
+
+static void* s_window_handle;
+void* Host_GetRenderHandle()
+{
+	return s_window_handle;
+}
+
+void Host_UpdateTitle(const std::string& title)
+{
+	platform->SetTitle(title);
+}
+
+void Host_UpdateDisasmDialog(){}
+
+void Host_UpdateMainFrame()
+{
+	updateMainFrameEvent.Set();
+}
+
+void Host_RequestRenderWindowSize(int width, int height) {}
+
+void Host_RequestFullscreen(bool enable_fullscreen) {}
+
+void Host_SetStartupDebuggingParameters()
+{
+	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	StartUp.bEnableDebugging = false;
+	StartUp.bBootToPause = false;
+}
+
+bool Host_UIHasFocus()
+{
+	return false;
+}
+
+bool Host_RendererHasFocus()
+{
+	return rendererHasFocus;
+}
+
+bool Host_RendererIsFullscreen()
+{
+	return rendererIsFullscreen;
+}
+
+void Host_ConnectWiimote(int wm_idx, bool connect)
+{
+	if (Core::IsRunning() && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+	{
+		bool was_unpaused = Core::PauseAndLock(true);
+		GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
+		Host_UpdateMainFrame();
+		Core::PauseAndLock(false, was_unpaused);
+	}
+}
+
+void Host_SetWiiMoteConnectionState(int _State) {}
+
+void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
+
+#if HAVE_X11
+#include <X11/keysym.h>
+#include "DolphinWX/X11Utils.h"
+
+class PlatformX11 : public Platform
+{
+	Display *dpy;
+	Window win;
+	Cursor blankCursor = None;
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+	X11Utils::XRRConfiguration *XRRConfig;
+#endif
+
+	void Init() override
+	{
+		XInitThreads();
+		dpy = XOpenDisplay(nullptr);
+		if (!dpy)
+		{
+			PanicAlert("No X11 display found");
+			exit(1);
+		}
+
+		win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy),
+					  SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos,
+					  SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos,
+					  SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
+					  SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight,
+					  0, 0, BlackPixel(dpy, 0));
+		XSelectInput(dpy, win, KeyPressMask | FocusChangeMask);
+		Atom wmProtocols[1];
+		wmProtocols[0] = XInternAtom(dpy, "WM_DELETE_WINDOW", True);
+		XSetWMProtocols(dpy, win, wmProtocols, 1);
+		XMapRaised(dpy, win);
+		XFlush(dpy);
+		s_window_handle = (void*)win;
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
+			X11Utils::InhibitScreensaver(dpy, win, true);
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+		XRRConfig = new X11Utils::XRRConfiguration(dpy, win);
+#endif
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+		{
+			// make a blank cursor
+			Pixmap Blank;
+			XColor DummyColor;
+			char ZeroData[1] = { 0 };
+			Blank = XCreateBitmapFromData(dpy, win, ZeroData, 1, 1);
+			blankCursor = XCreatePixmapCursor(dpy, Blank, Blank, &DummyColor, &DummyColor, 0, 0);
+			XFreePixmap(dpy, Blank);
+			XDefineCursor(dpy, win, blankCursor);
+		}
+	}
+
+	void SetTitle(const std::string &string) override
+	{
+		XStoreName(dpy, win, string.c_str());
+	}
+
+	void MainLoop() override
+	{
+		bool fullscreen = SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen;
+
+		if (fullscreen)
+		{
+			rendererIsFullscreen = X11Utils::ToggleFullscreen(dpy, win);
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+			XRRConfig->ToggleDisplayMode(True);
+#endif
+		}
+
+		// The actual loop
+		while (running)
+		{
+			XEvent event;
+			KeySym key;
+			for (int num_events = XPending(dpy); num_events > 0; num_events--)
+			{
+				XNextEvent(dpy, &event);
+				switch (event.type)
+				{
+				case KeyPress:
+					key = XLookupKeysym((XKeyEvent*)&event, 0);
+					if (key == XK_Escape)
+					{
+						if (Core::GetState() == Core::CORE_RUN)
+						{
+							if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+								XUndefineCursor(dpy, win);
+							Core::SetState(Core::CORE_PAUSE);
+						}
+						else
+						{
+							if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+								XDefineCursor(dpy, win, blankCursor);
+							Core::SetState(Core::CORE_RUN);
+						}
+					}
+					else if ((key == XK_Return) && (event.xkey.state & Mod1Mask))
+					{
+						fullscreen = !fullscreen;
+						X11Utils::ToggleFullscreen(dpy, win);
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+						XRRConfig->ToggleDisplayMode(fullscreen);
+#endif
+					}
+					else if (key >= XK_F1 && key <= XK_F8)
+					{
+						int slot_number = key - XK_F1 + 1;
+						if (event.xkey.state & ShiftMask)
+							State::Save(slot_number);
+						else
+							State::Load(slot_number);
+					}
+					else if (key == XK_F9)
+						Core::SaveScreenShot();
+					else if (key == XK_F11)
+						State::LoadLastSaved();
+					else if (key == XK_F12)
+					{
+						if (event.xkey.state & ShiftMask)
+							State::UndoLoadState();
+						else
+							State::UndoSaveState();
+					}
+					break;
+				case FocusIn:
+					rendererHasFocus = true;
+					if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
+					    Core::GetState() != Core::CORE_PAUSE)
+						XDefineCursor(dpy, win, blankCursor);
+					break;
+				case FocusOut:
+					rendererHasFocus = false;
+					if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+						XUndefineCursor(dpy, win);
+					break;
+				case ClientMessage:
+					if ((unsigned long) event.xclient.data.l[0] == XInternAtom(dpy, "WM_DELETE_WINDOW", False))
+						running = false;
+					break;
+				}
+			}
+			if (!fullscreen)
+			{
+				Window winDummy;
+				unsigned int borderDummy, depthDummy;
+				XGetGeometry(dpy, win, &winDummy,
+					     &SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos,
+					     &SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos,
+					     (unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
+					     (unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight,
+					     &borderDummy, &depthDummy);
+				rendererIsFullscreen = false;
+			}
+			usleep(100000);
+		}
+	}
+
+	void Shutdown() override
+	{
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+		delete XRRConfig;
+#endif
+
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+			XFreeCursor(dpy, blankCursor);
+
+		XCloseDisplay(dpy);
+	}
+};
+#endif
+
+static Platform* GetPlatform()
+{
+#if HAVE_X11
+	return new PlatformX11();
+#endif
+	return nullptr;
+}
+
+int main(int argc, char* argv[])
+{
+	int ch, help = 0;
+	struct option longopts[] = {
+		{ "exec",    no_argument, nullptr, 'e' },
+		{ "help",    no_argument, nullptr, 'h' },
+		{ "version", no_argument, nullptr, 'v' },
+		{ nullptr,      0,           nullptr,  0  }
+	};
+
+	while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1)
+	{
+		switch (ch)
+		{
+		case 'e':
+			break;
+		case 'h':
+		case '?':
+			help = 1;
+			break;
+		case 'v':
+			fprintf(stderr, "%s\n", scm_rev_str);
+			return 1;
+		}
+	}
+
+	if (help == 1 || argc == optind)
+	{
+		fprintf(stderr, "%s\n\n", scm_rev_str);
+		fprintf(stderr, "A multi-platform GameCube/Wii emulator\n\n");
+		fprintf(stderr, "Usage: %s [-e <file>] [-h] [-v]\n", argv[0]);
+		fprintf(stderr, "  -e, --exec     Load the specified file\n");
+		fprintf(stderr, "  -h, --help     Show this help message\n");
+		fprintf(stderr, "  -v, --version  Print version and exit\n");
+		return 1;
+	}
+
+	platform = GetPlatform();
+	if (!platform)
+	{
+		fprintf(stderr, "No platform found\n");
+		return 1;
+	}
+
+	UICommon::SetUserDirectory(""); // Auto-detect user folder
+	UICommon::Init();
+
+	platform->Init();
+
+	if (!BootManager::BootCore(argv[optind]))
+	{
+		fprintf(stderr, "Could not boot %s\n", argv[optind]);
+		return 1;
+	}
+
+	while (!Core::IsRunning())
+		updateMainFrameEvent.Wait();
+
+	platform->MainLoop();
+	Core::Stop();
+	while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
+		updateMainFrameEvent.Wait();
+
+	platform->Shutdown();
+	UICommon::Shutdown();
+
+	delete platform;
+
+	return 0;
+}
diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp
new file mode 100644
index 0000000000..8d64a51cdb
--- /dev/null
+++ b/Source/Core/DolphinWX/MemcardManager.cpp
@@ -0,0 +1,848 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+#include <string>
+#include <wx/bitmap.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/filedlg.h>
+#include <wx/filepicker.h>
+#include <wx/image.h>
+#include <wx/imaglist.h>
+#include <wx/listbase.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/mstream.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Core/HW/GCMemcard.h"
+#include "DolphinWX/MemcardManager.h"
+#include "DolphinWX/WxUtils.h"
+
+#define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : ""
+
+const u8 hdr[] = {
+	0x42, 0x4D,
+	0x38, 0x30, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0x36, 0x00, 0x00, 0x00,
+	0x28, 0x00, 0x00, 0x00,
+	0x20, 0x00, 0x00, 0x00, //W
+	0x20, 0x00, 0x00, 0x00, //H
+	0x01, 0x00,
+	0x20, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0x02, 0x30, 0x00, 0x00, //data size
+	0x12, 0x0B, 0x00, 0x00,
+	0x12, 0x0B, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height)
+{
+	u32 stride = (4*width);
+
+	u32 bytes = (stride*height) + sizeof(hdr);
+
+	bytes = (bytes + 3)&(~3);
+
+	u8 *pdata = new u8[bytes];
+
+	memcpy(pdata, hdr, sizeof(hdr));
+	memset(pdata + sizeof(hdr), 0, bytes - sizeof(hdr));
+
+	u8 *pixelData = pdata + sizeof(hdr);
+
+	for (u32 y = 0; y < height; y++)
+	{
+		memcpy(pixelData + y*stride, data + (height - y - 1)*stride, stride);
+	}
+
+	*(u32*)(pdata + 18) = width;
+	*(u32*)(pdata + 22) = height;
+	*(u32*)(pdata + 34) = bytes - sizeof(hdr);
+
+	wxMemoryInputStream is(pdata, bytes);
+	wxBitmap map(wxImage(is, wxBITMAP_TYPE_BMP, -1), -1);
+
+	delete[] pdata;
+
+	return map;
+}
+
+BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
+	EVT_BUTTON(ID_COPYFROM_A,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_COPYFROM_B,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_DELETE_A,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_DELETE_B,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_SAVEIMPORT_B,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_SAVEEXPORT_B,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_SAVEIMPORT_A,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_SAVEEXPORT_A,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_CONVERTTOGCI,CMemcardManager::CopyDeleteClick)
+	EVT_BUTTON(ID_PREVPAGE_A, CMemcardManager::OnPageChange)
+	EVT_BUTTON(ID_NEXTPAGE_A, CMemcardManager::OnPageChange)
+	EVT_BUTTON(ID_PREVPAGE_B, CMemcardManager::OnPageChange)
+	EVT_BUTTON(ID_NEXTPAGE_B, CMemcardManager::OnPageChange)
+
+	EVT_FILEPICKER_CHANGED(ID_MEMCARDPATH_A,CMemcardManager::OnPathChange)
+	EVT_FILEPICKER_CHANGED(ID_MEMCARDPATH_B,CMemcardManager::OnPathChange)
+
+	EVT_MENU_RANGE(ID_MEMCARDPATH_A, ID_USEPAGES, CMemcardManager::OnMenuChange)
+	EVT_MENU_RANGE(ID_COPYFROM_A, ID_CONVERTTOGCI, CMemcardManager::CopyDeleteClick)
+	EVT_MENU_RANGE(ID_NEXTPAGE_A, ID_PREVPAGE_B, CMemcardManager::OnPageChange)
+	EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
+END_EVENT_TABLE()
+
+CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+{
+	memoryCard[SLOT_A] = nullptr;
+	memoryCard[SLOT_B] = nullptr;
+
+	mcmSettings.twoCardsLoaded = false;
+	if (!LoadSettings())
+	{
+		itemsPerPage = 16;
+		mcmSettings.usePages = true;
+		for (int i = COLUMN_BANNER; i < NUMBER_OF_COLUMN; i++)
+		{
+			mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK) ? true : false;
+		}
+	}
+	maxPages = (128 / itemsPerPage) - 1;
+	CreateGUIControls();
+}
+
+CMemcardManager::~CMemcardManager()
+{
+	if (memoryCard[SLOT_A])
+	{
+		delete memoryCard[SLOT_A];
+		memoryCard[SLOT_A] = nullptr;
+	}
+	if (memoryCard[SLOT_B])
+	{
+		delete memoryCard[SLOT_B];
+		memoryCard[SLOT_B] = nullptr;
+	}
+	SaveSettings();
+}
+
+bool CMemcardManager::LoadSettings()
+{
+	if (MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)))
+	{
+		iniMemcardSection = MemcardManagerIni.GetOrCreateSection("MemcardManager");
+		iniMemcardSection->Get("Items per page",  &itemsPerPage, 16);
+		iniMemcardSection->Get("DefaultMemcardA", &(DefaultMemcard[SLOT_A]), "");
+		iniMemcardSection->Get("DefaultMemcardB", &(DefaultMemcard[SLOT_B]), "");
+		iniMemcardSection->Get("DefaultIOFolder", &DefaultIOPath, "/Users/GC");
+
+		iniMemcardSection->Get("Use Pages", &mcmSettings.usePages, true);
+		iniMemcardSection->Get("cBanner", &mcmSettings.column[COLUMN_BANNER], true);
+		iniMemcardSection->Get("cTitle", &mcmSettings.column[COLUMN_TITLE], true);
+		iniMemcardSection->Get("cComment", &mcmSettings.column[COLUMN_COMMENT], true);
+		iniMemcardSection->Get("cIcon", &mcmSettings.column[COLUMN_ICON], true);
+		iniMemcardSection->Get("cBlocks", &mcmSettings.column[COLUMN_BLOCKS], true);
+		iniMemcardSection->Get("cFirst Block", &mcmSettings.column[COLUMN_FIRSTBLOCK], true);
+
+		mcmSettings.column[NUMBER_OF_COLUMN] = false;
+
+		for (int i = COLUMN_GAMECODE; i < NUMBER_OF_COLUMN; i++)
+		{
+			mcmSettings.column[i] = mcmSettings.column[NUMBER_OF_COLUMN];
+		}
+		return true;
+	}
+	return false;
+}
+
+bool CMemcardManager::SaveSettings()
+{
+	MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	iniMemcardSection = MemcardManagerIni.GetOrCreateSection("MemcardManager");
+	iniMemcardSection->Set("Items per page",  itemsPerPage, 16);
+	iniMemcardSection->Set("DefaultMemcardA", DefaultMemcard[SLOT_A], "");
+	iniMemcardSection->Set("DefaultMemcardB", DefaultMemcard[SLOT_B], "");
+
+	iniMemcardSection->Set("Use Pages", mcmSettings.usePages, true);
+	iniMemcardSection->Set("cBanner", mcmSettings.column[COLUMN_BANNER], true);
+	iniMemcardSection->Set("cTitle", mcmSettings.column[COLUMN_TITLE], true);
+	iniMemcardSection->Set("cComment", mcmSettings.column[COLUMN_COMMENT], true);
+	iniMemcardSection->Set("cIcon", mcmSettings.column[COLUMN_ICON], true);
+	iniMemcardSection->Set("cBlocks", mcmSettings.column[COLUMN_BLOCKS], true);
+	iniMemcardSection->Set("cFirst Block", mcmSettings.column[COLUMN_FIRSTBLOCK], true);
+
+	return MemcardManagerIni.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+}
+
+void CMemcardManager::CreateGUIControls()
+{
+	// Create the controls for both memcards
+
+	const char* ARROW[2] = { "<-", "->" };
+
+	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
+
+	wxStaticBoxSizer *sMemcard[2];
+
+	for (int slot = SLOT_A; slot <= SLOT_B; slot++)
+	{
+		m_CopyFrom[slot]    = new wxButton(this, ID_COPYFROM_A + slot,
+			wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1]));
+		m_SaveImport[slot]  = new wxButton(this, ID_SAVEIMPORT_A + slot,
+			wxString::Format(_("%sImport GCI%s"), ARROWS));
+		m_SaveExport[slot]  = new wxButton(this, ID_SAVEEXPORT_A + slot,
+			wxString::Format(_("%sExport GCI%s"), ARROWS));
+		m_Delete[slot]      = new wxButton(this, ID_DELETE_A + slot,
+			wxString::Format(_("%sDelete%s"), ARROWS));
+
+
+		m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, _("Prev Page"));
+		m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, _("Next Page"));
+
+		t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxEmptyString);
+
+		wxBoxSizer * const sPages = new wxBoxSizer(wxHORIZONTAL);
+		sPages->Add(m_PrevPage[slot], 0, wxEXPAND | wxALL, 1);
+		sPages->Add(t_Status[slot], 0, wxEXPAND | wxALL, 5);
+		sPages->Add(0, 0, 1, wxEXPAND|wxALL, 0);
+		sPages->Add(m_NextPage[slot], 0, wxEXPAND | wxALL, 1);
+
+		m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
+			 StrToWxStr(File::GetUserPath(D_GCUSER_IDX)), _("Choose a memory card:"),
+		_("GameCube Memory Cards (*.raw,*.gcp)") + wxString("|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN);
+
+		m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350, 400),
+		wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings);
+
+		m_MemcardList[slot]->AssignImageList(new wxImageList(96, 32), wxIMAGE_LIST_SMALL);
+
+		sMemcard[slot] = new wxStaticBoxSizer(wxVERTICAL, this, _("Memory Card") + wxString::Format(" %c", 'A' + slot));
+		sMemcard[slot]->Add(m_MemcardPath[slot], 0, wxEXPAND | wxALL, 5);
+		sMemcard[slot]->Add(m_MemcardList[slot], 1, wxEXPAND | wxALL, 5);
+		sMemcard[slot]->Add(sPages, 0, wxEXPAND | wxALL, 1);
+	}
+
+	wxBoxSizer * const sButtons = new wxBoxSizer(wxVERTICAL);
+	sButtons->AddStretchSpacer(2);
+	sButtons->Add(m_CopyFrom[SLOT_B],   0, wxEXPAND, 5);
+	sButtons->Add(m_CopyFrom[SLOT_A],   0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer(1);
+	sButtons->Add(m_SaveImport[SLOT_A], 0, wxEXPAND, 5);
+	sButtons->Add(m_SaveExport[SLOT_A], 0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer(1);
+	sButtons->Add(m_ConvertToGci,       0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer(1);
+	sButtons->Add(m_SaveImport[SLOT_B], 0, wxEXPAND, 5);
+	sButtons->Add(m_SaveExport[SLOT_B], 0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer(1);
+	sButtons->Add(m_Delete[SLOT_A],     0, wxEXPAND, 5);
+	sButtons->Add(m_Delete[SLOT_B],     0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer();
+	sButtons->Add(new wxButton(this, wxID_OK, _("Close")), 0, wxEXPAND, 5);
+	sButtons->AddStretchSpacer();
+
+	wxBoxSizer * const sMain = new wxBoxSizer(wxHORIZONTAL);
+	sMain->Add(sMemcard[SLOT_A], 1, wxEXPAND | wxALL, 5);
+	sMain->Add(sButtons, 0, wxEXPAND, 0);
+	sMain->Add(sMemcard[SLOT_B], 1, wxEXPAND | wxALL, 5);
+
+	SetSizerAndFit(sMain);
+	Center();
+
+	for (int i = SLOT_A; i <= SLOT_B; i++)
+	{
+		m_PrevPage[i]->Disable();
+		m_NextPage[i]->Disable();
+		m_CopyFrom[i]->Disable();
+		m_SaveImport[i]->Disable();
+		m_SaveExport[i]->Disable();
+		m_Delete[i]->Disable();
+		if (DefaultMemcard[i].length())
+		{
+			m_MemcardPath[i]->SetPath(StrToWxStr(DefaultMemcard[i]));
+			ChangePath(i);
+		}
+	}
+}
+
+void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
+{
+	ChangePath(event.GetId() - ID_MEMCARDPATH_A);
+}
+
+void CMemcardManager::ChangePath(int slot)
+{
+	int slot2 = (slot == SLOT_A) ? SLOT_B : SLOT_A;
+	page[slot] = FIRSTPAGE;
+	if (mcmSettings.usePages && m_PrevPage[slot]->IsEnabled())
+	{
+		m_PrevPage[slot]->Disable();
+		m_MemcardList[slot]->prevPage = false;
+	}
+	if (!m_MemcardPath[SLOT_A]->GetPath().CmpNoCase(m_MemcardPath[SLOT_B]->GetPath()))
+	{
+		if (m_MemcardPath[slot]->GetPath().length())
+			wxMessageBox(_("Memcard already opened"));
+	}
+	else
+	{
+		if (m_MemcardPath[slot]->GetPath().length() && ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()), slot))
+		{
+			if (memoryCard[slot2])
+			{
+				mcmSettings.twoCardsLoaded = true;
+			}
+			m_SaveImport[slot]->Enable();
+			m_SaveExport[slot]->Enable();
+			m_Delete[slot]->Enable();
+		}
+		else
+		{
+			if (memoryCard[slot])
+			{
+				delete memoryCard[slot];
+				memoryCard[slot] = nullptr;
+			}
+			mcmSettings.twoCardsLoaded = false;
+			m_MemcardPath[slot]->SetPath(wxEmptyString);
+			m_MemcardList[slot]->ClearAll();
+			t_Status[slot]->SetLabel(wxEmptyString);
+			m_SaveImport[slot]->Disable();
+			m_SaveExport[slot]->Disable();
+			m_Delete[slot]->Disable();
+			if (mcmSettings.usePages)
+			{
+				m_PrevPage[slot]->Disable();
+				m_NextPage[slot]->Disable();
+			}
+		}
+	}
+
+	m_CopyFrom[SLOT_A]->Enable(mcmSettings.twoCardsLoaded);
+	m_CopyFrom[SLOT_B]->Enable(mcmSettings.twoCardsLoaded);
+}
+
+void CMemcardManager::OnPageChange(wxCommandEvent& event)
+{
+	int slot = SLOT_B;
+	switch (event.GetId())
+	{
+	case ID_NEXTPAGE_A:
+		slot = SLOT_A;
+	case ID_NEXTPAGE_B:
+		if (!m_PrevPage[slot]->IsEnabled())
+		{
+			m_PrevPage[slot]->Enable();
+			m_MemcardList[slot]->prevPage = true;
+		}
+		page[slot]++;
+		if (page[slot] == maxPages)
+		{
+			m_NextPage[slot]->Disable();
+			m_MemcardList[slot]->nextPage = false;
+		}
+		ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()), slot);
+		break;
+	case ID_PREVPAGE_A:
+		slot = SLOT_A;
+	case ID_PREVPAGE_B:
+		if (!m_NextPage[slot]->IsEnabled())
+		{
+			m_NextPage[slot]->Enable();
+			m_MemcardList[slot]->nextPage = true;
+		}
+		page[slot]--;
+		if (!page[slot])
+		{
+			m_PrevPage[slot]->Disable();
+			m_MemcardList[slot]->prevPage = false;
+		}
+		ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()), slot);
+		break;
+	}
+}
+
+void CMemcardManager::OnMenuChange(wxCommandEvent& event)
+{
+	int _id = event.GetId();
+	switch (_id)
+	{
+	case ID_MEMCARDPATH_A:
+	case ID_MEMCARDPATH_B:
+		DefaultMemcard[_id - ID_MEMCARDPATH_A] = WxStrToStr(m_MemcardPath[_id - ID_MEMCARDPATH_A]->GetPath());
+		return;
+	case ID_USEPAGES:
+		mcmSettings.usePages = !mcmSettings.usePages;
+		if (!mcmSettings.usePages)
+		{
+			m_PrevPage[SLOT_A]->Disable();
+			m_PrevPage[SLOT_B]->Disable();
+			m_NextPage[SLOT_A]->Disable();
+			m_NextPage[SLOT_B]->Disable();
+			m_MemcardList[SLOT_A]->prevPage =
+			m_MemcardList[SLOT_B]->prevPage = false;
+			page[SLOT_A] =
+			page[SLOT_B] = FIRSTPAGE;
+		}
+		break;
+	case NUMBER_OF_COLUMN:
+		for (int i = COLUMN_GAMECODE; i <= NUMBER_OF_COLUMN; i++)
+		{
+			mcmSettings.column[i] = !mcmSettings.column[i];
+		}
+		break;
+	default:
+		mcmSettings.column[_id] = !mcmSettings.column[_id];
+		break;
+	}
+
+	if (memoryCard[SLOT_A]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_A]->GetPath()), SLOT_A);
+	if (memoryCard[SLOT_B]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_B]->GetPath()), SLOT_B);
+}
+bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot)
+{
+	switch (error)
+	{
+	case GCS:
+		wxMessageBox(_("File converted to .gci"));
+		break;
+	case SUCCESS:
+		if (slot != -1)
+		{
+			memoryCard[slot]->FixChecksums();
+			if (!memoryCard[slot]->Save()) PanicAlertT("File write failed");
+			page[slot] = FIRSTPAGE;
+			ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()), slot);
+		}
+		break;
+	case NOMEMCARD:
+		WxUtils::ShowErrorDialog(_("File is not recognized as a memcard"));
+		break;
+	case OPENFAIL:
+		WxUtils::ShowErrorDialog(_("File could not be opened\nor does not have a valid extension"));
+		break;
+	case OUTOFBLOCKS:
+		if (slot == -1)
+		{
+			WxUtils::ShowErrorDialog(_("Unknown memory card error"));
+			break;
+		}
+		wxMessageBox(wxString::Format(_("Only %d blocks available"), memoryCard[slot]->GetFreeBlocks()));
+		break;
+	case OUTOFDIRENTRIES:
+		WxUtils::ShowErrorDialog(_("No free directory index entries."));
+		break;
+	case LENGTHFAIL:
+		WxUtils::ShowErrorDialog(_("Imported file has invalid length."));
+		break;
+	case INVALIDFILESIZE:
+		WxUtils::ShowErrorDialog(_("The save you are trying to copy has an invalid file size."));
+		break;
+	case TITLEPRESENT:
+		WxUtils::ShowErrorDialog(_("Memcard already has a save for this title."));
+		break;
+	case SAVFAIL:
+		WxUtils::ShowErrorDialog(_("Imported file has sav extension\nbut does not have a correct header."));
+		break;
+	case GCSFAIL:
+		WxUtils::ShowErrorDialog(_("Imported file has gsc extension\nbut does not have a correct header."));
+		break;
+	case FAIL:
+		if (slot == -1)
+		{
+			WxUtils::ShowErrorDialog(_("Export failed"));
+			return false;
+		}
+		WxUtils::ShowErrorDialog(_("Invalid bat.map or dir entry."));
+		break;
+	case WRITEFAIL:
+		WxUtils::ShowErrorDialog(_("File write failed"));
+		break;
+	case DELETE_FAIL:
+		WxUtils::ShowErrorDialog(_("Order of files in the File Directory do not match the block order\n"
+		                           "Right click and export all of the saves,\nand import the saves to a new memcard\n"));
+		break;
+	default:
+		WxUtils::ShowErrorDialog(_("Unknown memory card error"));
+		break;
+	}
+	SetFocus();
+	return true;
+}
+
+void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
+{
+	int index_A = m_MemcardList[SLOT_A]->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	int index_B = m_MemcardList[SLOT_B]->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	int slot = SLOT_B;
+	int slot2 = SLOT_A;
+	std::string fileName2("");
+
+	if (index_A != wxNOT_FOUND && page[SLOT_A]) index_A += itemsPerPage * page[SLOT_A];
+	if (index_B != wxNOT_FOUND && page[SLOT_B]) index_B += itemsPerPage * page[SLOT_B];
+
+	int index = index_B;
+	switch (event.GetId())
+	{
+	case ID_COPYFROM_B:
+		slot = SLOT_A;
+		slot2 = SLOT_B;
+	case ID_COPYFROM_A:
+		index = slot2 ? index_B : index_A;
+		index = memoryCard[slot2]->GetFileIndex(index);
+		if ((index != wxNOT_FOUND))
+		{
+			CopyDeleteSwitch(memoryCard[slot]->CopyFrom(*memoryCard[slot2], index), slot);
+		}
+		break;
+	case ID_FIXCHECKSUM_A:
+		slot = SLOT_A;
+	case ID_FIXCHECKSUM_B:
+		if (memoryCard[slot]->FixChecksums() && memoryCard[slot]->Save())
+		{
+			wxMessageBox(_("The checksum was successfully fixed."));
+		}
+		else
+		{
+			WxUtils::ShowErrorDialog(_("File write failed"));
+		}
+		break;
+	case ID_CONVERTTOGCI:
+		fileName2 = "convert";
+	case ID_SAVEIMPORT_A:
+		slot = SLOT_A;
+	case ID_SAVEIMPORT_B:
+	{
+		wxString fileName = wxFileSelector(
+			_("Select a save file to import"),
+			(strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0)
+				? StrToWxStr("")
+				: StrToWxStr(DefaultIOPath),
+			wxEmptyString, wxEmptyString,
+			_("GameCube Savegame files(*.gci;*.gcs;*.sav)") + wxString("|*.gci;*.gcs;*.sav|") +
+			_("Native GCI files(*.gci)") + wxString("|*.gci|") +
+			_("MadCatz Gameshark files(*.gcs)") + wxString("|*.gcs|") +
+			_("Datel MaxDrive/Pro files(*.sav)") + wxString("|*.sav"),
+			wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
+		if (!fileName.empty() && !fileName2.empty())
+		{
+			wxString temp2 = wxFileSelector(_("Save GCI as..."),
+				wxEmptyString, wxEmptyString, ".gci",
+				_("GCI File(*.gci)") + wxString("|*.gci"),
+				wxFD_OVERWRITE_PROMPT | wxFD_SAVE, this);
+
+			if (temp2.empty())
+				break;
+
+			fileName2 = WxStrToStr(temp2);
+		}
+		if (fileName.length() > 0)
+		{
+			CopyDeleteSwitch(memoryCard[slot]->ImportGci(WxStrToStr(fileName), fileName2), slot);
+		}
+	}
+	break;
+	case ID_SAVEEXPORT_A:
+		slot = SLOT_A;
+		index = index_A;
+	case ID_SAVEEXPORT_B:
+		index = memoryCard[slot]->GetFileIndex(index);
+		if (index != wxNOT_FOUND)
+		{
+			std::string gciFilename;
+			if (!memoryCard[slot]->GCI_FileName(index, gciFilename))
+			{
+				wxMessageBox(_("Invalid index"), _("Error"));
+				return;
+			}
+			wxString fileName = wxFileSelector(
+				_("Export save as..."),
+				StrToWxStr(DefaultIOPath),
+				StrToWxStr(gciFilename), ".gci",
+				_("Native GCI files(*.gci)") + wxString("|*.gci|") +
+				_("MadCatz Gameshark files(*.gcs)") + wxString("|*.gcs|") +
+				_("Datel MaxDrive/Pro files(*.sav)") + wxString("|*.sav"),
+				wxFD_OVERWRITE_PROMPT | wxFD_SAVE, this);
+
+			if (fileName.length() > 0)
+			{
+				if (!CopyDeleteSwitch(memoryCard[slot]->ExportGci(index, WxStrToStr(fileName), ""), -1))
+				{
+					File::Delete(WxStrToStr(fileName));
+				}
+			}
+		}
+		break;
+	case ID_EXPORTALL_A:
+		slot = SLOT_A;
+	case ID_EXPORTALL_B:
+	{
+		std::string path1, path2, mpath;
+		mpath = WxStrToStr(m_MemcardPath[slot]->GetPath());
+		SplitPath(mpath, &path1, &path2, nullptr);
+		path1 += path2;
+		File::CreateDir(path1);
+
+		int answer = wxMessageBox(wxString::Format(_("Warning: This will overwrite any existing saves that are in the folder:\n"
+		                                             "%s\nand have the same name as a file on your memcard\nContinue?"), path1.c_str()), _("Warning"), wxYES_NO);
+		if (answer == wxYES)
+		{
+			for (int i = 0; i < DIRLEN; i++)
+			{
+				CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, "", path1), -1);
+			}
+		}
+
+		break;
+	}
+	case ID_DELETE_A:
+		slot = SLOT_A;
+		index = index_A;
+	case ID_DELETE_B:
+		index = memoryCard[slot]->GetFileIndex(index);
+		if (index != wxNOT_FOUND)
+		{
+			CopyDeleteSwitch(memoryCard[slot]->RemoveFile(index), slot);
+		}
+		break;
+	}
+}
+
+bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
+{
+	if (memoryCard[card]) delete memoryCard[card];
+
+	// TODO: add error checking and animate icons
+	memoryCard[card] = new GCMemcard(fileName);
+
+	if (!memoryCard[card]->IsValid())
+		return false;
+
+	int j;
+
+	wxString wxTitle,
+			 wxComment,
+			 wxBlock,
+			 wxFirstBlock,
+			 wxLabel;
+
+
+	m_MemcardList[card]->Hide();
+	m_MemcardList[card]->ClearAll();
+
+	m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _("Banner"));
+	m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _("Title"));
+	m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _("Comment"));
+	m_MemcardList[card]->InsertColumn(COLUMN_ICON, _("Icon"));
+	m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _("Blocks"));
+	m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _("First Block"));
+
+	wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL);
+	list->RemoveAll();
+
+	u8 nFiles = memoryCard[card]->GetNumFiles();
+	int *images = new int[nFiles * 2];
+
+	for (u8 i = 0; i < nFiles; i++)
+	{
+		static u32 pxdata[96*32];
+		static u8  animDelay[8];
+		static u32 animData[32*32*8];
+
+		u8 fileIndex = memoryCard[card]->GetFileIndex(i);
+		int numFrames = memoryCard[card]->ReadAnimRGBA8(fileIndex, animData, animDelay);
+
+		if (!memoryCard[card]->ReadBannerRGBA8(fileIndex, pxdata))
+		{
+			memset(pxdata, 0, 96*32*4);
+
+			if (numFrames > 0) // Just use the first one
+			{
+				u32 *icdata = animData;
+
+				for (int y = 0; y < 32; y++)
+				{
+					for (int x = 0; x < 32; x++)
+					{
+						pxdata[y*96 + x + 32] = icdata[y*32 + x];//  | 0xFF000000
+					}
+				}
+			}
+		}
+
+		wxBitmap map = wxBitmapFromMemoryRGBA((u8*)pxdata, 96, 32);
+		images[i*2] = list->Add(map);
+
+		if (numFrames > 0)
+		{
+			memset(pxdata, 0, 96*32*4);
+			int frames = 3;
+
+			if (numFrames < frames)
+				frames = numFrames;
+
+			for (int f = 0; f < frames; f++)
+			{
+				for (int y = 0; y < 32; y++)
+				{
+					for (int x = 0; x < 32; x++)
+					{
+						pxdata[y*96 + x + 32*f] = animData[f*32*32 + y*32 + x];
+					}
+				}
+			}
+			wxBitmap icon = wxBitmapFromMemoryRGBA((u8*)pxdata, 96, 32);
+			images[i*2 + 1] = list->Add(icon);
+		}
+	}
+
+	int pagesMax = (mcmSettings.usePages) ?
+					(page[card] + 1) * itemsPerPage : 128;
+
+	for (j = page[card] * itemsPerPage; (j < nFiles) && (j < pagesMax); j++)
+	{
+		u16 blocks;
+		u16 firstblock;
+		u8 fileIndex = memoryCard[card]->GetFileIndex(j);
+
+
+		int index = m_MemcardList[card]->InsertItem(j, wxEmptyString);
+
+		m_MemcardList[card]->SetItem(index, COLUMN_BANNER, wxEmptyString);
+
+		std::string title = memoryCard[card]->GetSaveComment1(fileIndex);
+		std::string comment = memoryCard[card]->GetSaveComment2(fileIndex);
+
+		auto const string_decoder = memoryCard[card]->IsAsciiEncoding() ?
+			CP1252ToUTF8 : SHIFTJISToUTF8;
+
+		wxTitle = StrToWxStr(string_decoder(title));
+		wxComment = StrToWxStr(string_decoder(comment));
+
+		m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxTitle);
+		m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxComment);
+
+		blocks = memoryCard[card]->DEntry_BlockCount(fileIndex);
+
+		if (blocks == 0xFFFF)
+			blocks = 0;
+
+		wxBlock.Printf("%10d", blocks);
+		m_MemcardList[card]->SetItem(index, COLUMN_BLOCKS, wxBlock);
+		firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex);
+		//if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1
+		wxFirstBlock.Printf("%15d", firstblock);
+		m_MemcardList[card]->SetItem(index, COLUMN_FIRSTBLOCK, wxFirstBlock);
+		m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString);
+
+		if (images[j] >= 0)
+		{
+			m_MemcardList[card]->SetItemImage(index, images[j*2]);
+			m_MemcardList[card]->SetItemColumnImage(index, COLUMN_ICON, images[j*2 + 1]);
+		}
+	}
+
+	if (mcmSettings.usePages)
+	{
+		if (nFiles <= itemsPerPage)
+		{
+			m_PrevPage[card]->Disable();
+			m_MemcardList[card]->prevPage = false;
+		}
+		if (j == nFiles)
+		{
+			m_NextPage[card]->Disable();
+			m_MemcardList[card]->nextPage = false;
+		}
+		else
+		{
+			m_NextPage[card]->Enable();
+			m_MemcardList[card]->nextPage = true;
+		}
+	}
+
+	delete[] images;
+	// Automatic column width and then show the list
+	for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
+	{
+		if (mcmSettings.column[i])
+			m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
+		else
+			m_MemcardList[card]->SetColumnWidth(i, 0);
+	}
+
+	m_MemcardList[card]->Show();
+	wxLabel.Printf(_("%u Free Blocks; %u Free Dir Entries"),
+		memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles);
+	t_Status[card]->SetLabel(wxLabel);
+
+	// Done so text doesn't overlap the UI.
+	this->Fit();
+
+	return true;
+}
+
+void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
+{
+	int flags;
+	long item = HitTest(event.GetPosition(), flags);
+	wxMenu popupMenu;
+
+	if (item != wxNOT_FOUND)
+	{
+		if (GetItemState(item, wxLIST_STATE_SELECTED) != wxLIST_STATE_SELECTED)
+		{
+			SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+		}
+		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+
+		int slot = GetId() - ID_MEMCARDLIST_A;
+		popupMenu.Append(ID_COPYFROM_A + slot, wxString::Format(_("Copy to Memcard %c"), 'B' - slot));
+		popupMenu.Append(ID_DELETE_A + slot, _("Delete Save"));
+		popupMenu.Append(ID_SAVEIMPORT_A + slot, _("Import Save"));
+		popupMenu.Append(ID_SAVEEXPORT_A + slot, _("Export Save"));
+		popupMenu.Append(ID_EXPORTALL_A + slot, _("Export all saves"));
+
+		popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded);
+
+		popupMenu.AppendSeparator();
+
+		popupMenu.Append(ID_FIXCHECKSUM_A + slot, _("Fix Checksums"));
+		popupMenu.Append(ID_PREVPAGE_A + slot, _("Previous Page"));
+		popupMenu.Append(ID_NEXTPAGE_A + slot, _("Next Page"));
+		popupMenu.Append(ID_MEMCARDPATH_A + slot, wxString::Format(_("Set as default Memcard %c"), 'A' + slot));
+		popupMenu.AppendCheckItem(ID_USEPAGES, _("Enable pages"));
+
+		popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
+		popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
+		popupMenu.FindItem(ID_USEPAGES)->Check(__mcmSettings.usePages);
+
+		popupMenu.AppendSeparator();
+
+		// popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
+		popupMenu.AppendCheckItem(COLUMN_TITLE, _("Show save title"));
+		popupMenu.AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
+		popupMenu.AppendCheckItem(COLUMN_ICON, _("Show save icon"));
+		popupMenu.AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
+		popupMenu.AppendCheckItem(COLUMN_FIRSTBLOCK, _("Show first block"));
+
+		// for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
+		for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++)
+		{
+			popupMenu.FindItem(i)->Check(__mcmSettings.column[i]);
+		}
+	}
+	PopupMenu(&popupMenu);
+}
+
diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h
new file mode 100644
index 0000000000..382f3efbdb
--- /dev/null
+++ b/Source/Core/DolphinWX/MemcardManager.h
@@ -0,0 +1,150 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <wx/dialog.h>
+#include <wx/listctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+
+class GCMemcard;
+class wxButton;
+class wxFileDirPickerEvent;
+class wxFilePickerCtrl;
+class wxStaticText;
+
+#undef MEMCARD_MANAGER_STYLE
+#define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX
+#define MEMCARDMAN_TITLE _trans("Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!")
+
+#define FIRSTPAGE 0
+
+class CMemcardManager : public wxDialog
+{
+	public:
+
+		CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxGetTranslation(MEMCARDMAN_TITLE),
+			const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE);
+		virtual ~CMemcardManager();
+
+	private:
+		DECLARE_EVENT_TABLE();
+
+		int page[2];
+		int itemsPerPage;
+		int maxPages;
+		std::string DefaultMemcard[2];
+		std::string DefaultIOPath;
+		IniFile MemcardManagerIni;
+		IniFile::Section* iniMemcardSection;
+
+		wxButton* m_CopyFrom[2];
+		wxButton* m_SaveImport[2];
+		wxButton* m_SaveExport[2];
+		wxButton* m_Delete[2];
+		wxButton* m_NextPage[2];
+		wxButton* m_PrevPage[2];
+		wxButton* m_ConvertToGci;
+		wxFilePickerCtrl *m_MemcardPath[2];
+		wxStaticText *t_Status[2];
+
+		enum
+		{
+			ID_COPYFROM_A = 1000, // Do not rearrange these items,
+			ID_COPYFROM_B,        // ID_..._B must be 1 more than ID_..._A
+			ID_FIXCHECKSUM_A,
+			ID_FIXCHECKSUM_B,
+			ID_DELETE_A,
+			ID_DELETE_B,
+			ID_SAVEEXPORT_A,
+			ID_SAVEEXPORT_B,
+			ID_SAVEIMPORT_A,
+			ID_SAVEIMPORT_B,
+			ID_EXPORTALL_A,
+			ID_EXPORTALL_B,
+			ID_CONVERTTOGCI,
+			ID_NEXTPAGE_A,
+			ID_NEXTPAGE_B,
+			ID_PREVPAGE_A,
+			ID_PREVPAGE_B,
+			ID_MEMCARDLIST_A,
+			ID_MEMCARDLIST_B,
+			ID_MEMCARDPATH_A,
+			ID_MEMCARDPATH_B,
+			ID_USEPAGES,
+			ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
+		};
+
+		enum
+		{
+			COLUMN_BANNER = 0,
+			COLUMN_TITLE,
+			COLUMN_COMMENT,
+			COLUMN_ICON,
+			COLUMN_BLOCKS,
+			COLUMN_FIRSTBLOCK,
+			COLUMN_GAMECODE,
+			COLUMN_MAKERCODE,
+			COLUMN_FILENAME,
+			COLUMN_BIFLAGS,
+			COLUMN_MODTIME,
+			COLUMN_IMAGEADD,
+			COLUMN_ICONFMT,
+			COLUMN_ANIMSPEED,
+			COLUMN_PERMISSIONS,
+			COLUMN_COPYCOUNTER,
+			COLUMN_COMMENTSADDRESS,
+			NUMBER_OF_COLUMN
+		};
+
+		GCMemcard *memoryCard[2];
+
+		void CreateGUIControls();
+		void CopyDeleteClick(wxCommandEvent& event);
+		bool ReloadMemcard(const std::string& fileName, int card);
+		void OnMenuChange(wxCommandEvent& event);
+		void OnPageChange(wxCommandEvent& event);
+		void OnPathChange(wxFileDirPickerEvent& event);
+		void ChangePath(int id);
+		bool CopyDeleteSwitch(u32 error, int slot);
+		bool LoadSettings();
+		bool SaveSettings();
+
+		struct _mcmSettings
+		{
+			bool twoCardsLoaded;
+			bool usePages;
+			bool column[NUMBER_OF_COLUMN + 1];
+		} mcmSettings;
+
+		class CMemcardListCtrl : public wxListCtrl
+		{
+//BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
+//      EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
+//END_EVENT_TABLE()
+		public:
+			CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
+				const wxPoint& pos, const wxSize& size,
+				long style, _mcmSettings& _mcmSetngs)
+				: wxListCtrl(parent, id, pos, size, style)
+				, __mcmSettings(_mcmSetngs)
+			{
+				Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
+			}
+			~CMemcardListCtrl()
+			{
+				Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
+			}
+			_mcmSettings & __mcmSettings;
+			bool prevPage;
+			bool nextPage;
+		private:
+			void OnRightClick(wxMouseEvent& event);
+		};
+
+		CMemcardListCtrl *m_MemcardList[2];
+};
diff --git a/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp b/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp
new file mode 100644
index 0000000000..57da50a65d
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.cpp
@@ -0,0 +1,37 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+
+#include "DolphinWX/NetPlay/ChangeGameDialog.h"
+#include "DolphinWX/NetPlay/NetWindow.h"
+
+ChangeGameDialog::ChangeGameDialog(wxWindow* parent, const CGameListCtrl* const game_list, wxString& game_name)
+	: wxDialog(parent, wxID_ANY, _("Change Game"))
+	, m_game_name(game_name)
+{
+	m_game_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
+	m_game_lbox->Bind(wxEVT_LISTBOX_DCLICK, &ChangeGameDialog::OnPick, this);
+
+	NetPlayDialog::FillWithGameNames(m_game_lbox, *game_list);
+
+	wxButton* const ok_btn = new wxButton(this, wxID_OK, _("Change"));
+	ok_btn->Bind(wxEVT_BUTTON, &ChangeGameDialog::OnPick, this);
+
+	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
+	szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 5);
+	szr->Add(ok_btn, 0, wxALL | wxALIGN_RIGHT, 5);
+
+	SetSizerAndFit(szr);
+	SetFocus();
+}
+
+void ChangeGameDialog::OnPick(wxCommandEvent& event)
+{
+	// return the selected game name
+	m_game_name = m_game_lbox->GetStringSelection();
+	EndModal(wxID_OK);
+}
diff --git a/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.h b/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.h
new file mode 100644
index 0000000000..6e4c24323c
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/ChangeGameDialog.h
@@ -0,0 +1,22 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/dialog.h>
+
+class CGameListCtrl;
+class wxListBox;
+
+class ChangeGameDialog final : public wxDialog
+{
+public:
+	ChangeGameDialog(wxWindow* parent, const CGameListCtrl* const game_list, wxString& game_name);
+
+private:
+	void OnPick(wxCommandEvent& event);
+
+	wxListBox* m_game_lbox;
+	wxString&  m_game_name;
+};
diff --git a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
new file mode 100644
index 0000000000..9d16c75c9b
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
@@ -0,0 +1,431 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/listbox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayServer.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/NetPlay/NetPlaySetupFrame.h"
+#include "DolphinWX/NetPlay/NetWindow.h"
+
+static void GetTraversalPort(IniFile::Section& section, std::string* port)
+{
+	section.Get("TraversalPort", port, "6262");
+	port->erase(std::remove(port->begin(), port->end(), ' '), port->end());
+	if (port->empty())
+		*port = "6262";
+}
+
+static void GetTraversalServer(IniFile::Section& section, std::string* server)
+{
+	section.Get("TraversalServer", server, "stun.dolphin-emu.org");
+	server->erase(std::remove(server->begin(), server->end(), ' '), server->end());
+	if (server->empty())
+		*server = "stun.dolphin-emu.org";
+}
+
+NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list)
+	: wxFrame(parent, wxID_ANY, _("Dolphin NetPlay Setup"))
+	, m_game_list(game_list)
+{
+	IniFile inifile;
+	inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini");
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+
+	wxPanel* const panel = new wxPanel(this);
+
+	// top row
+	wxBoxSizer* const trav_szr = new wxBoxSizer(wxHORIZONTAL);
+
+	m_direct_traversal = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxSize(75, -1));
+	m_direct_traversal->Bind(wxEVT_CHOICE, &NetPlaySetupFrame::OnChoice, this);
+	m_direct_traversal->Append(_("Direct"));
+	m_direct_traversal->Append(_("Traversal"));
+
+	std::string travChoice;
+	netplay_section.Get("TraversalChoice", &travChoice, "direct");
+
+	if (travChoice == "traversal")
+	{
+		m_direct_traversal->Select(1);
+	}
+	else
+	{
+		m_direct_traversal->Select(0);
+	}
+
+	trav_szr->Add(m_direct_traversal, 0, wxRIGHT);
+
+	m_trav_reset_btn = new wxButton(panel, wxID_ANY, _("Reset Traversal Settings"));
+	m_trav_reset_btn->Bind(wxEVT_BUTTON, &NetPlaySetupFrame::OnResetTraversal, this);
+	trav_szr->Add(m_trav_reset_btn, 0, wxCENTER | wxRIGHT);
+
+	wxBoxSizer* const nick_szr = new wxBoxSizer(wxHORIZONTAL);
+	wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"));
+	std::string nickname;
+	netplay_section.Get("Nickname", &nickname, "Player");
+	m_nickname_text = new wxTextCtrl(panel, wxID_ANY, StrToWxStr(nickname));
+	nick_szr->Add(nick_lbl, 0, wxCENTER);
+	nick_szr->Add(m_nickname_text, 0, wxALL, 5);
+
+	std::string centralPort;
+	GetTraversalPort(netplay_section, &centralPort);
+	std::string centralServer;
+	GetTraversalServer(netplay_section, &centralServer);
+
+	m_traversal_lbl = new wxStaticText(panel, wxID_ANY, _("Traversal: ") + centralServer + ":" + centralPort);
+
+	// tabs
+	wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY);
+	wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY);
+	notebook->AddPage(connect_tab, _("Connect"));
+	wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY);
+	notebook->AddPage(host_tab, _("Host"));
+
+	// connect tab
+	{
+		m_ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Host Code :"));
+
+		std::string address;
+		netplay_section.Get("HostCode", &address, "00000000");
+		m_connect_ip_text = new wxTextCtrl(connect_tab, wxID_ANY, StrToWxStr(address));
+
+		m_client_port_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Port :"));
+
+		// string? w/e
+		std::string port;
+		netplay_section.Get("ConnectPort", &port, "2626");
+		m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, StrToWxStr(port));
+
+		wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect"));
+		connect_btn->Bind(wxEVT_BUTTON, &NetPlaySetupFrame::OnJoin, this);
+
+		wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY,
+			_("ALERT:\n\n"
+			"Netplay will only work with the following settings:\n"
+			" - DSP Emulator Engine Must be the same on all computers!\n"
+			" - Manually set the extensions for each Wiimote\n"
+			"\n"
+			"All players should use the same Dolphin version and settings.\n"
+			"All memory cards must be identical between players or disabled.\n"
+			"Wiimote support is probably terrible. Don't use it.\n"
+			"\n"
+			"If connecting directly, the host must have the chosen UDP port open/forwarded!\n"));
+
+		wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
+
+		top_szr->Add(m_ip_lbl, 0, wxCENTER | wxRIGHT, 5);
+		top_szr->Add(m_connect_ip_text, 3);
+		top_szr->Add(m_client_port_lbl, 0, wxCENTER | wxRIGHT | wxLEFT, 5);
+		top_szr->Add(m_connect_port_text, 1);
+
+		wxBoxSizer* const con_szr = new wxBoxSizer(wxVERTICAL);
+		con_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
+		con_szr->AddStretchSpacer(1);
+		con_szr->Add(alert_lbl, 0, wxLEFT | wxRIGHT | wxEXPAND, 5);
+		con_szr->AddStretchSpacer(1);
+		con_szr->Add(connect_btn, 0, wxALL | wxALIGN_RIGHT, 5);
+
+		connect_tab->SetSizerAndFit(con_szr);
+	}
+
+	// host tab
+	{
+		m_host_port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port :"));
+
+		// string? w/e
+		std::string port;
+		netplay_section.Get("HostPort", &port, "2626");
+		m_host_port_text = new wxTextCtrl(host_tab, wxID_ANY, StrToWxStr(port));
+
+		wxButton* const host_btn = new wxButton(host_tab, wxID_ANY, _("Host"));
+		host_btn->Bind(wxEVT_BUTTON, &NetPlaySetupFrame::OnHost, this);
+
+		m_game_lbox = new wxListBox(host_tab, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
+		m_game_lbox->Bind(wxEVT_LISTBOX_DCLICK, &NetPlaySetupFrame::OnHost, this);
+
+		NetPlayDialog::FillWithGameNames(m_game_lbox, *game_list);
+
+		wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
+		top_szr->Add(m_host_port_lbl, 0, wxCENTER | wxRIGHT, 5);
+		top_szr->Add(m_host_port_text, 0);
+#ifdef USE_UPNP
+		m_upnp_chk = new wxCheckBox(host_tab, wxID_ANY, _("Forward port (UPnP)"));
+		top_szr->Add(m_upnp_chk, 0, wxALL | wxALIGN_RIGHT, 5);
+#endif
+
+		wxBoxSizer* const host_szr = new wxBoxSizer(wxVERTICAL);
+		host_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
+		host_szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxEXPAND, 5);
+		host_szr->Add(host_btn, 0, wxALL | wxALIGN_RIGHT, 5);
+
+		host_tab->SetSizerAndFit(host_szr);
+	}
+
+	// bottom row
+	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
+	quit_btn->Bind(wxEVT_BUTTON, &NetPlaySetupFrame::OnQuit, this);
+
+	// main sizer
+	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
+	main_szr->Add(trav_szr, 0, wxALL | wxALIGN_LEFT);
+	main_szr->Add(nick_szr, 0, wxALL | wxALIGN_LEFT, 5);
+	main_szr->Add(m_traversal_lbl, 0, wxALL | wxALIGN_LEFT, 5);
+	main_szr->Add(notebook, 1, wxLEFT | wxRIGHT | wxEXPAND, 5);
+	main_szr->Add(quit_btn, 0, wxALL | wxALIGN_RIGHT, 5);
+
+	panel->SetSizerAndFit(main_szr);
+
+	//wxBoxSizer* const diag_szr = new wxBoxSizer(wxVERTICAL);
+	//diag_szr->Add(panel, 1, wxEXPAND);
+	//SetSizerAndFit(diag_szr);
+
+	main_szr->SetSizeHints(this);
+
+	Center();
+	Show();
+
+	//  Needs to be done last or it set up the spacing on the page correctly
+	wxCommandEvent ev;
+	OnChoice(ev);
+}
+
+NetPlaySetupFrame::~NetPlaySetupFrame()
+{
+	IniFile inifile;
+	const std::string dolphin_ini = File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini";
+	inifile.Load(dolphin_ini);
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+
+	std::string travChoice = "traversal";
+	if (m_direct_traversal->GetSelection() == 1)
+	{
+		netplay_section.Set("TraversalChoice", travChoice);
+	}
+	else
+	{
+		travChoice = "direct";
+		netplay_section.Set("TraversalChoice", travChoice);
+	}
+
+	netplay_section.Set("Nickname", WxStrToStr(m_nickname_text->GetValue()));
+
+	if (m_direct_traversal->GetCurrentSelection() == 0)
+	{
+		netplay_section.Set("Address", WxStrToStr(m_connect_ip_text->GetValue()));
+	}
+	else
+	{
+		netplay_section.Set("HostCode", WxStrToStr(m_connect_ip_text->GetValue()));
+	}
+	netplay_section.Set("ConnectPort", WxStrToStr(m_connect_port_text->GetValue()));
+	netplay_section.Set("HostPort", WxStrToStr(m_host_port_text->GetValue()));
+
+	inifile.Save(dolphin_ini);
+	main_frame->g_NetPlaySetupDiag = nullptr;
+}
+
+void NetPlaySetupFrame::MakeNetPlayDiag(int port, const std::string &game, bool is_hosting)
+{
+	NetPlayDialog*& npd = NetPlayDialog::GetInstance();
+	NetPlayClient*& netplay_client = NetPlayDialog::GetNetPlayClient();
+
+	std::string ip;
+	npd = new NetPlayDialog(m_parent, m_game_list, game, is_hosting);
+	if (is_hosting)
+		ip = "127.0.0.1";
+	else
+		ip = WxStrToStr(m_connect_ip_text->GetValue());
+
+	bool trav;
+	if (!is_hosting && m_direct_traversal->GetCurrentSelection() == 1)
+		trav = true;
+	else
+		trav = false;
+
+	IniFile inifile;
+	inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini");
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+
+	std::string centralPortString;
+	GetTraversalPort(netplay_section, &centralPortString);
+	unsigned long int centralPort;
+	StrToWxStr(centralPortString).ToULong(&centralPort);
+
+	std::string centralServer;
+	GetTraversalServer(netplay_section, &centralServer);
+
+	netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()), trav, centralServer, (u16) centralPort);
+	if (netplay_client->is_connected)
+	{
+		npd->Show();
+		Destroy();
+	}
+	else
+	{
+		npd->Destroy();
+	}
+}
+
+void NetPlaySetupFrame::OnHost(wxCommandEvent&)
+{
+	NetPlayDialog*& npd = NetPlayDialog::GetInstance();
+	NetPlayServer*& netplay_server = NetPlayDialog::GetNetPlayServer();
+
+	if (npd)
+	{
+		WxUtils::ShowErrorDialog(_("A NetPlay window is already open!"));
+		return;
+	}
+
+	if (m_game_lbox->GetSelection() == wxNOT_FOUND)
+	{
+		WxUtils::ShowErrorDialog(_("You must choose a game!"));
+		return;
+	}
+
+	std::string game(WxStrToStr(m_game_lbox->GetStringSelection()));
+
+	bool trav;
+	if (m_direct_traversal->GetCurrentSelection() == 1)
+		trav = true;
+	else
+		trav = false;
+
+	unsigned long port = 0;
+	m_host_port_text->GetValue().ToULong(&port);
+
+	IniFile inifile;
+	inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini");
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+
+	std::string centralPortString;
+	GetTraversalPort(netplay_section, &centralPortString);
+	unsigned long int centralPort;
+	StrToWxStr(centralPortString).ToULong(&centralPort);
+
+	std::string centralServer;
+	GetTraversalServer(netplay_section, &centralServer);
+
+	netplay_server = new NetPlayServer((u16)port, trav, centralServer, (u16) centralPort);
+	if (netplay_server->is_connected)
+	{
+		netplay_server->ChangeGame(game);
+		netplay_server->AdjustPadBufferSize(INITIAL_PAD_BUFFER_SIZE);
+#ifdef USE_UPNP
+		if (m_upnp_chk->GetValue())
+			netplay_server->TryPortmapping(port);
+#endif
+		MakeNetPlayDiag(netplay_server->GetPort(), game, true);
+		netplay_server->SetNetPlayUI(NetPlayDialog::GetInstance());
+	}
+	else
+	{
+		WxUtils::ShowErrorDialog(_("Failed to listen. Is another instance of the NetPlay server running?"));
+	}
+}
+
+void NetPlaySetupFrame::OnJoin(wxCommandEvent&)
+{
+	NetPlayDialog*& npd = NetPlayDialog::GetInstance();
+	if (npd)
+	{
+		WxUtils::ShowErrorDialog(_("A NetPlay window is already open!"));
+		return;
+	}
+
+	unsigned long port = 0;
+	m_connect_port_text->GetValue().ToULong(&port);
+	MakeNetPlayDiag(port, "", false);
+}
+
+void NetPlaySetupFrame::OnResetTraversal(wxCommandEvent& event)
+{
+	IniFile inifile;
+	const std::string dolphin_ini = File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini";
+	inifile.Load(dolphin_ini);
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+	netplay_section.Set("TraversalServer", (std::string) "stun.dolphin-emu.org");
+	netplay_section.Set("TraversalPort", (std::string) "6262");
+	inifile.Save(dolphin_ini);
+
+	m_traversal_lbl->SetLabelText(_("Traversal: ") + "stun.dolphin-emu.org:6262");
+}
+
+void NetPlaySetupFrame::OnChoice(wxCommandEvent& event)
+{
+	int sel = m_direct_traversal->GetSelection();
+	IniFile inifile;
+	inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini");
+	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
+
+	if (sel == 1)
+	{
+		m_traversal_lbl->Show();
+		m_trav_reset_btn->Show();
+		//Traversal
+		//client tab
+		{
+			m_ip_lbl->SetLabelText("Host Code: ");
+
+			std::string address;
+			netplay_section.Get("HostCode", &address, "00000000");
+			m_connect_ip_text->SetLabelText(address);
+
+			m_client_port_lbl->Hide();
+			m_connect_port_text->Hide();
+		}
+
+		//server tab
+		{
+			m_host_port_lbl->Hide();
+			m_host_port_text->Hide();
+#ifdef USE_UPNP
+			m_upnp_chk->Hide();
+#endif
+		}
+	}
+	else
+	{
+		m_traversal_lbl->Hide();
+		m_trav_reset_btn->Hide();
+		// Direct
+		// Client tab
+		{
+			m_ip_lbl->SetLabelText("IP Address :");
+
+			std::string address;
+			netplay_section.Get("Address", &address, "127.0.0.1");
+			m_connect_ip_text->SetLabelText(address);
+
+			m_client_port_lbl->Show();
+			m_connect_port_text->Show();
+		}
+
+		// Server tab
+		m_host_port_lbl->Show();
+		m_host_port_text->Show();
+#ifdef USE_UPNP
+		m_upnp_chk->Show();
+#endif
+	}
+}
+
+void NetPlaySetupFrame::OnQuit(wxCommandEvent&)
+{
+	Destroy();
+}
diff --git a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h
new file mode 100644
index 0000000000..5dcb72d0b2
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h
@@ -0,0 +1,50 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <string>
+#include <wx/frame.h>
+
+class CGameListCtrl;
+class wxCheckBox;
+class wxChoice;
+class wxListBox;
+class wxStaticText;
+class wxTextCtrl;
+
+class NetPlaySetupFrame final : public wxFrame
+{
+public:
+	NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list);
+	~NetPlaySetupFrame();
+
+private:
+	void OnJoin(wxCommandEvent& event);
+	void OnHost(wxCommandEvent& event);
+	void OnQuit(wxCommandEvent& event);
+	void OnChoice(wxCommandEvent& event);
+	void OnResetTraversal(wxCommandEvent& event);
+
+	void MakeNetPlayDiag(int port, const std::string& game, bool is_hosting);
+
+	wxStaticText* m_ip_lbl;
+	wxStaticText* m_client_port_lbl;
+	wxTextCtrl*   m_nickname_text;
+	wxStaticText* m_host_port_lbl;
+	wxTextCtrl*   m_host_port_text;
+	wxTextCtrl*   m_connect_port_text;
+	wxTextCtrl*   m_connect_ip_text;
+	wxChoice*     m_direct_traversal;
+	wxStaticText* m_traversal_lbl;
+	wxButton* m_trav_reset_btn;
+
+	wxListBox*  m_game_lbox;
+#ifdef USE_UPNP
+	wxCheckBox* m_upnp_chk;
+#endif
+
+	const CGameListCtrl* const m_game_list;
+};
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
new file mode 100644
index 0000000000..2658aea656
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
@@ -0,0 +1,591 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/clipbrd.h>
+#include <wx/dialog.h>
+#include <wx/frame.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FifoQueue.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/CoreParameter.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayProto.h"
+#include "Core/NetPlayServer.h"
+#include "Core/HW/EXI_Device.h"
+
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/NetPlay/ChangeGameDialog.h"
+#include "DolphinWX/NetPlay/NetWindow.h"
+#include "DolphinWX/NetPlay/PadMapDialog.h"
+
+NetPlayServer* NetPlayDialog::netplay_server = nullptr;
+NetPlayClient* NetPlayDialog::netplay_client = nullptr;
+NetPlayDialog *NetPlayDialog::npd = nullptr;
+
+static wxString FailureReasonStringForHostLabel(int reason)
+{
+	switch (reason)
+	{
+	case TraversalClient::BadHost:
+		return _("(Error: Bad host)");
+	case TraversalClient::VersionTooOld:
+		return _("(Error: Dolphin too old)");
+	case TraversalClient::ServerForgotAboutUs:
+		return _("(Error: Disconnected)");
+	case TraversalClient::SocketSendError:
+		return _("(Error: Socket)");
+	case TraversalClient::ResendTimeout:
+		return _("(Error: Timeout)");
+	default:
+		return _("(Error: Unknown)");
+	}
+}
+
+static std::string BuildGameName(const GameListItem& game)
+{
+	// Lang needs to be consistent
+	DiscIO::IVolume::ELanguage const lang = DiscIO::IVolume::LANGUAGE_ENGLISH;
+
+	std::string name(game.GetName(lang));
+
+	if (game.GetRevision() != 0)
+		return name + " (" + game.GetUniqueID() + ", Revision " + std::to_string((long long)game.GetRevision()) + ")";
+	else
+		return name + " (" + game.GetUniqueID() + ")";
+}
+
+void NetPlayDialog::FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)
+{
+	for (u32 i = 0; auto game = game_list.GetISO(i); ++i)
+		game_lbox->Append(StrToWxStr(BuildGameName(*game)));
+}
+
+NetPlayDialog::NetPlayDialog(wxWindow* const parent, const CGameListCtrl* const game_list,
+	const std::string& game, const bool is_hosting)
+	: wxFrame(parent, wxID_ANY, _("Dolphin NetPlay"))
+	, m_selected_game(game)
+	, m_start_btn(nullptr)
+	, m_host_label(nullptr)
+	, m_host_type_choice(nullptr)
+	, m_host_copy_btn(nullptr)
+	, m_host_copy_btn_is_retry(false)
+	, m_is_hosting(is_hosting)
+	, m_game_list(game_list)
+{
+	Bind(wxEVT_THREAD, &NetPlayDialog::OnThread, this);
+
+	wxPanel* const panel = new wxPanel(this);
+
+	// top crap
+	m_game_btn = new wxButton(panel, wxID_ANY,
+		StrToWxStr(m_selected_game).Prepend(_(" Game : ")),
+		wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
+
+	if (m_is_hosting)
+		m_game_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnChangeGame, this);
+	else
+		m_game_btn->Disable();
+
+	// middle crap
+
+	// chat
+	m_chat_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString
+		, wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
+
+	m_chat_msg_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString
+		, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+	m_chat_msg_text->Bind(wxEVT_TEXT_ENTER, &NetPlayDialog::OnChat, this);
+	m_chat_msg_text->SetMaxLength(2000);
+
+	wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send"));
+	chat_msg_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnChat, this);
+
+	wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL);
+	chat_msg_szr->Add(m_chat_msg_text, 1);
+	chat_msg_szr->Add(chat_msg_btn, 0);
+
+	wxStaticBoxSizer* const chat_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Chat"));
+	chat_szr->Add(m_chat_text, 1, wxEXPAND);
+	chat_szr->Add(chat_msg_szr, 0, wxEXPAND | wxTOP, 5);
+
+	m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(256, -1));
+
+	wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Players"));
+
+	// player list
+	if (m_is_hosting && g_TraversalClient)
+	{
+		wxBoxSizer* const host_szr = new wxBoxSizer(wxHORIZONTAL);
+		m_host_type_choice = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxSize(60, -1));
+		m_host_type_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &NetPlayDialog::OnChoice, this);
+		m_host_type_choice->Append(_("ID:"));
+		host_szr->Add(m_host_type_choice);
+
+		m_host_label = new wxStaticText(panel, wxID_ANY, "555.555.555.555:55555", wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE | wxALIGN_LEFT);
+		// Update() should fix this immediately.
+		m_host_label->SetLabel(_(""));
+		host_szr->Add(m_host_label, 1, wxLEFT | wxCENTER, 5);
+
+		m_host_copy_btn = new wxButton(panel, wxID_ANY, _("Copy"));
+		m_host_copy_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDialog::OnCopyIP, this);
+		m_host_copy_btn->Disable();
+		host_szr->Add(m_host_copy_btn, 0, wxLEFT | wxCENTER, 5);
+		player_szr->Add(host_szr, 0, wxEXPAND | wxBOTTOM, 5);
+		m_host_type_choice->Select(0);
+
+		UpdateHostLabel();
+	}
+
+	player_szr->Add(m_player_lbox, 1, wxEXPAND);
+
+	if (m_is_hosting)
+	{
+		m_player_lbox->Bind(wxEVT_LISTBOX, &NetPlayDialog::OnPlayerSelect, this);
+		m_kick_btn = new wxButton(panel, wxID_ANY, _("Kick Player"));
+		m_kick_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnKick, this);
+		player_szr->Add(m_kick_btn, 0, wxEXPAND | wxTOP, 5);
+		m_kick_btn->Disable();
+
+		m_player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads"));
+		m_player_config_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnConfigPads, this);
+		player_szr->Add(m_player_config_btn, 0, wxEXPAND | wxTOP, 5);
+	}
+
+	wxBoxSizer* const mid_szr = new wxBoxSizer(wxHORIZONTAL);
+	mid_szr->Add(chat_szr, 1, wxEXPAND | wxRIGHT, 5);
+	mid_szr->Add(player_szr, 0, wxEXPAND);
+
+	// bottom crap
+	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
+	quit_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnQuit, this);
+
+	wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL);
+	if (is_hosting)
+	{
+		m_start_btn = new wxButton(panel, wxID_ANY, _("Start"));
+		m_start_btn->Bind(wxEVT_BUTTON, &NetPlayDialog::OnStart, this);
+		bottom_szr->Add(m_start_btn);
+
+		bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5);
+		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, std::to_string(INITIAL_PAD_BUFFER_SIZE)
+			, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, INITIAL_PAD_BUFFER_SIZE);
+		padbuf_spin->Bind(wxEVT_SPINCTRL, &NetPlayDialog::OnAdjustBuffer, this);
+		bottom_szr->Add(padbuf_spin, 0, wxCENTER);
+
+		m_memcard_write = new wxCheckBox(panel, wxID_ANY, _("Write memcards (GC)"));
+		bottom_szr->Add(m_memcard_write, 0, wxCENTER);
+	}
+
+	m_record_chkbox = new wxCheckBox(panel, wxID_ANY, _("Record input"));
+	bottom_szr->Add(m_record_chkbox, 0, wxCENTER);
+
+	bottom_szr->AddStretchSpacer(1);
+	bottom_szr->Add(quit_btn);
+
+	// main sizer
+	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
+	main_szr->Add(m_game_btn, 0, wxEXPAND | wxALL, 5);
+	main_szr->Add(mid_szr, 1, wxEXPAND | wxLEFT | wxRIGHT, 5);
+	main_szr->Add(bottom_szr, 0, wxEXPAND | wxALL, 5);
+
+	panel->SetSizerAndFit(main_szr);
+
+	main_szr->SetSizeHints(this);
+	SetSize(512, 512 - 128);
+
+	Center();
+}
+
+NetPlayDialog::~NetPlayDialog()
+{
+	if (netplay_client)
+	{
+		delete netplay_client;
+		netplay_client = nullptr;
+	}
+	if (netplay_server)
+	{
+		delete netplay_server;
+		netplay_server = nullptr;
+	}
+	npd = nullptr;
+}
+
+void NetPlayDialog::OnChat(wxCommandEvent&)
+{
+	wxString text = m_chat_msg_text->GetValue();
+
+	if (!text.empty())
+	{
+		netplay_client->SendChatMessage(WxStrToStr(text));
+		m_chat_text->AppendText(text.Prepend(" >> ").Append('\n'));
+		m_chat_msg_text->Clear();
+	}
+}
+
+void NetPlayDialog::GetNetSettings(NetSettings &settings)
+{
+	SConfig &instance = SConfig::GetInstance();
+	settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
+	settings.m_CPUcore = instance.m_LocalCoreStartupParameter.iCPUCore;
+	settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
+	settings.m_DSPEnableJIT = instance.m_DSPEnableJIT;
+	settings.m_WriteToMemcard = m_memcard_write->GetValue();
+	settings.m_OCEnable = instance.m_OCEnable;
+	settings.m_OCFactor = instance.m_OCFactor;
+	settings.m_EXIDevice[0] = instance.m_EXIDevice[0];
+	settings.m_EXIDevice[1] = instance.m_EXIDevice[1];
+}
+
+std::string NetPlayDialog::FindGame()
+{
+	// find path for selected game, sloppy..
+	for (u32 i = 0; auto game = m_game_list->GetISO(i); ++i)
+		if (m_selected_game == BuildGameName(*game))
+			return game->GetFileName();
+
+	WxUtils::ShowErrorDialog(_("Game not found!"));
+	return "";
+}
+
+void NetPlayDialog::OnStart(wxCommandEvent&)
+{
+	NetSettings settings;
+	GetNetSettings(settings);
+	netplay_server->SetNetSettings(settings);
+	netplay_server->StartGame();
+}
+
+void NetPlayDialog::BootGame(const std::string& filename)
+{
+	main_frame->BootGame(filename);
+}
+
+void NetPlayDialog::StopGame()
+{
+	main_frame->DoStop();
+}
+
+// NetPlayUI methods called from ---NETPLAY--- thread
+void NetPlayDialog::Update()
+{
+	wxThreadEvent evt(wxEVT_THREAD, 1);
+	GetEventHandler()->AddPendingEvent(evt);
+}
+
+void NetPlayDialog::AppendChat(const std::string& msg)
+{
+	chat_msgs.Push(msg);
+	// silly
+	Update();
+}
+
+void NetPlayDialog::OnMsgChangeGame(const std::string& filename)
+{
+	wxThreadEvent* evt = new wxThreadEvent(wxEVT_THREAD, NP_GUI_EVT_CHANGE_GAME);
+	evt->SetString(StrToWxStr(filename));
+	GetEventHandler()->QueueEvent(evt);
+}
+
+void NetPlayDialog::OnMsgStartGame()
+{
+	wxThreadEvent evt(wxEVT_THREAD, NP_GUI_EVT_START_GAME);
+	GetEventHandler()->AddPendingEvent(evt);
+	if (m_is_hosting)
+	{
+		m_start_btn->Disable();
+		m_memcard_write->Disable();
+		m_game_btn->Disable();
+		m_player_config_btn->Disable();
+	}
+
+	m_record_chkbox->Disable();
+}
+
+void NetPlayDialog::OnMsgStopGame()
+{
+	wxThreadEvent evt(wxEVT_THREAD, NP_GUI_EVT_STOP_GAME);
+	GetEventHandler()->AddPendingEvent(evt);
+	if (m_is_hosting)
+	{
+		m_start_btn->Enable();
+		m_memcard_write->Enable();
+		m_game_btn->Enable();
+		m_player_config_btn->Enable();
+	}
+	m_record_chkbox->Enable();
+}
+
+void NetPlayDialog::OnAdjustBuffer(wxCommandEvent& event)
+{
+	const int val = ((wxSpinCtrl*)event.GetEventObject())->GetValue();
+	netplay_server->AdjustPadBufferSize(val);
+
+	std::ostringstream ss;
+	ss << "< Pad Buffer: " << val << " >";
+	netplay_client->SendChatMessage(ss.str());
+	m_chat_text->AppendText(StrToWxStr(ss.str()).Append('\n'));
+}
+
+void NetPlayDialog::OnQuit(wxCommandEvent&)
+{
+	Destroy();
+}
+
+// update gui
+void NetPlayDialog::OnThread(wxThreadEvent& event)
+{
+	if (m_is_hosting && m_host_label && g_TraversalClient)
+	{
+		UpdateHostLabel();
+	}
+
+	// player list
+	m_playerids.clear();
+	std::string tmps;
+	netplay_client->GetPlayerList(tmps, m_playerids);
+
+	wxString selection;
+	if (m_player_lbox->GetSelection() != wxNOT_FOUND)
+		selection = m_player_lbox->GetString(m_player_lbox->GetSelection());
+
+	m_player_lbox->Clear();
+	std::istringstream ss(tmps);
+	while (std::getline(ss, tmps))
+		m_player_lbox->Append(StrToWxStr(tmps));
+
+	// remove ping from selection string, in case it has changed
+	selection.erase(selection.find_last_of("|") + 1);
+
+	if (!selection.empty())
+	{
+		for (unsigned int i = 0; i < m_player_lbox->GetCount(); ++i)
+		{
+			if (selection == m_player_lbox->GetString(i).Mid(0, selection.length()))
+			{
+				m_player_lbox->SetSelection(i);
+				break;
+			}
+		}
+	}
+
+	// flash window in taskbar when someone joins if window isn't active
+	static u8 numPlayers = 1;
+	bool focus = (wxWindow::FindFocus() == this || (wxWindow::FindFocus() != nullptr && wxWindow::FindFocus()->GetParent() == this) ||
+		(wxWindow::FindFocus() != nullptr && wxWindow::FindFocus()->GetParent() != nullptr
+		&& wxWindow::FindFocus()->GetParent()->GetParent() == this));
+	if (netplay_server != nullptr && numPlayers < m_playerids.size() && !focus)
+	{
+		RequestUserAttention();
+	}
+	numPlayers = m_playerids.size();
+
+	switch (event.GetId())
+	{
+	case NP_GUI_EVT_CHANGE_GAME:
+		// update selected game :/
+	{
+		m_selected_game.assign(WxStrToStr(event.GetString()));
+
+		wxString button_label = event.GetString();
+		m_game_btn->SetLabel(button_label.Prepend(_(" Game : ")));
+	}
+	break;
+	case NP_GUI_EVT_START_GAME:
+		// client start game :/
+	{
+		netplay_client->StartGame(FindGame());
+	}
+	break;
+	case NP_GUI_EVT_STOP_GAME:
+		// client stop game
+	{
+		netplay_client->StopGame();
+	}
+	break;
+	}
+
+	// chat messages
+	while (chat_msgs.Size())
+	{
+		std::string s;
+		chat_msgs.Pop(s);
+		//PanicAlert("message: %s", s.c_str());
+		m_chat_text->AppendText(StrToWxStr(s).Append('\n'));
+	}
+}
+
+void NetPlayDialog::OnChangeGame(wxCommandEvent&)
+{
+	wxString game_name;
+
+	ChangeGameDialog cgd(this, m_game_list, game_name);
+	cgd.ShowModal();
+
+	if (game_name.length())
+	{
+		m_selected_game = WxStrToStr(game_name);
+		netplay_server->ChangeGame(m_selected_game);
+		m_game_btn->SetLabel(game_name.Prepend(_(" Game : ")));
+	}
+}
+
+void NetPlayDialog::OnConfigPads(wxCommandEvent&)
+{
+	PadMapping mapping[4];
+	PadMapping wiimotemapping[4];
+	std::vector<const Player *> player_list;
+
+	netplay_server->GetPadMapping(mapping);
+	netplay_server->GetWiimoteMapping(wiimotemapping);
+	netplay_client->GetPlayers(player_list);
+
+	PadMapDialog pmd(this, mapping, wiimotemapping, player_list);
+	pmd.ShowModal();
+
+	netplay_server->SetPadMapping(mapping);
+	netplay_server->SetWiimoteMapping(wiimotemapping);
+}
+
+void NetPlayDialog::OnKick(wxCommandEvent&)
+{
+	wxString selection = m_player_lbox->GetStringSelection();
+	unsigned long player = 0;
+	selection.Mid(selection.find_last_of("[") + 1, selection.find_last_of("]")).ToULong(&player);
+
+	netplay_server->KickPlayer((u8)player);
+
+	m_player_lbox->SetSelection(wxNOT_FOUND);
+	wxCommandEvent event;
+	OnPlayerSelect(event);
+}
+
+void NetPlayDialog::OnPlayerSelect(wxCommandEvent&)
+{
+	if (m_player_lbox->GetSelection() > 0)
+		m_kick_btn->Enable();
+	else
+		m_kick_btn->Disable();
+}
+
+bool NetPlayDialog::IsRecording()
+{
+	return m_record_chkbox->GetValue();
+}
+
+
+void NetPlayDialog::OnCopyIP(wxCommandEvent&)
+{
+	if (m_host_copy_btn_is_retry)
+	{
+		g_TraversalClient->ReconnectToServer();
+		Update();
+	}
+	else
+	{
+		if (wxTheClipboard->Open())
+		{
+			wxTheClipboard->SetData(new wxTextDataObject(m_host_label->GetLabel()));
+			wxTheClipboard->Close();
+		}
+	}
+}
+
+void NetPlayDialog::OnChoice(wxCommandEvent& event)
+{
+	UpdateHostLabel();
+}
+
+
+void NetPlayDialog::UpdateHostLabel()
+{
+	wxString label = _(" (internal IP)");
+	auto DeLabel = [=](wxString str) {
+		if (str == _("Localhost"))
+			return std::string("!local!");
+		return WxStrToStr(str.Left(str.Len() - label.Len()));
+	};
+	auto EnLabel = [=](std::string str) -> wxString {
+		if (str == "!local!")
+			return _("Localhost");
+		return StrToWxStr(str) + label;
+	};
+	int sel = m_host_type_choice->GetSelection();
+	if (sel == 0)
+	{
+		// the traversal ID
+		switch (g_TraversalClient->m_State)
+		{
+		case TraversalClient::Connecting:
+			m_host_label->SetForegroundColour(*wxLIGHT_GREY);
+			m_host_label->SetLabel("...");
+			m_host_copy_btn->SetLabel(_("Copy"));
+			m_host_copy_btn->Disable();
+			break;
+		case TraversalClient::Connected:
+			m_host_label->SetForegroundColour(*wxBLACK);
+			m_host_label->SetLabel(wxString(g_TraversalClient->m_HostId.data(), g_TraversalClient->m_HostId.size()));
+			m_host_copy_btn->SetLabel(_("Copy"));
+			m_host_copy_btn->Enable();
+			m_host_copy_btn_is_retry = false;
+			break;
+		case TraversalClient::Failure:
+			m_host_label->SetForegroundColour(*wxBLACK);
+			m_host_label->SetLabel(FailureReasonStringForHostLabel(g_TraversalClient->m_FailureReason));
+			m_host_copy_btn->SetLabel(_("Retry"));
+			m_host_copy_btn->Enable();
+			m_host_copy_btn_is_retry = true;
+			break;
+		}
+	}
+	else if (sel != wxNOT_FOUND) // wxNOT_FOUND shouldn't generally happen
+	{
+		m_host_label->SetForegroundColour(*wxBLACK);
+		m_host_label->SetLabel(netplay_server->GetInterfaceHost(DeLabel(m_host_type_choice->GetString(sel))));
+		m_host_copy_btn->SetLabel(_("Copy"));
+		m_host_copy_btn->Enable();
+		m_host_copy_btn_is_retry = false;
+	}
+
+	auto set = netplay_server->GetInterfaceSet();
+	for (const std::string& iface : set)
+	{
+		wxString wxIface = EnLabel(iface);
+		if (m_host_type_choice->FindString(wxIface) == wxNOT_FOUND)
+			m_host_type_choice->Append(wxIface);
+	}
+	for (unsigned i = 1, count = m_host_type_choice->GetCount(); i != count; i++)
+	{
+		if (set.find(DeLabel(m_host_type_choice->GetString(i))) == set.end())
+		{
+			m_host_type_choice->Delete(i);
+			i--;
+			count--;
+		}
+	}
+}
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h
new file mode 100644
index 0000000000..0d1223225f
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h
@@ -0,0 +1,106 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <wx/frame.h>
+
+#include "Common/FifoQueue.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayProto.h"
+#include "Core/NetPlayServer.h"
+
+class CGameListCtrl;
+class wxButton;
+class wxCheckBox;
+class wxChoice;
+class wxListBox;
+class wxString;
+class wxStaticText;
+class wxTextCtrl;
+
+enum
+{
+	NP_GUI_EVT_CHANGE_GAME = 45,
+	NP_GUI_EVT_START_GAME,
+	NP_GUI_EVT_STOP_GAME,
+};
+
+enum
+{
+	INITIAL_PAD_BUFFER_SIZE = 5
+};
+
+class NetPlayDialog : public wxFrame, public NetPlayUI
+{
+public:
+	NetPlayDialog(wxWindow* parent, const CGameListCtrl* const game_list
+		, const std::string& game, const bool is_hosting = false);
+	~NetPlayDialog();
+
+	Common::FifoQueue<std::string> chat_msgs;
+
+	void OnStart(wxCommandEvent& event);
+
+	// implementation of NetPlayUI methods
+	void BootGame(const std::string& filename) override;
+	void StopGame() override;
+
+	void Update() override;
+	void AppendChat(const std::string& msg) override;
+
+	void OnMsgChangeGame(const std::string& filename) override;
+	void OnMsgStartGame() override;
+	void OnMsgStopGame() override;
+
+	static NetPlayDialog*& GetInstance() { return npd; }
+	static NetPlayClient*& GetNetPlayClient() { return netplay_client; }
+	static NetPlayServer*& GetNetPlayServer() { return netplay_server; }
+	static void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list);
+
+	bool IsRecording() override;
+
+private:
+	void OnChat(wxCommandEvent& event);
+	void OnQuit(wxCommandEvent& event);
+	void OnThread(wxThreadEvent& event);
+	void OnChangeGame(wxCommandEvent& event);
+	void OnAdjustBuffer(wxCommandEvent& event);
+	void OnConfigPads(wxCommandEvent& event);
+	void OnKick(wxCommandEvent& event);
+	void OnPlayerSelect(wxCommandEvent& event);
+	void GetNetSettings(NetSettings& settings);
+	std::string FindGame();
+
+	void OnCopyIP(wxCommandEvent&);
+	void OnChoice(wxCommandEvent& event);
+	void UpdateHostLabel();
+
+	wxListBox*    m_player_lbox;
+	wxTextCtrl*   m_chat_text;
+	wxTextCtrl*   m_chat_msg_text;
+	wxCheckBox*   m_memcard_write;
+	wxCheckBox*   m_record_chkbox;
+
+	std::string   m_selected_game;
+	wxButton*     m_player_config_btn;
+	wxButton*     m_game_btn;
+	wxButton*     m_start_btn;
+	wxButton*     m_kick_btn;
+	wxStaticText* m_host_label;
+	wxChoice*     m_host_type_choice;
+	wxButton*     m_host_copy_btn;
+	bool          m_host_copy_btn_is_retry;
+	bool          m_is_hosting;
+
+	std::vector<int> m_playerids;
+
+	const CGameListCtrl* const m_game_list;
+
+	static NetPlayDialog* npd;
+	static NetPlayServer* netplay_server;
+	static NetPlayClient* netplay_client;
+};
diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
new file mode 100644
index 0000000000..5e6d3798cb
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
@@ -0,0 +1,106 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/choice.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayProto.h"
+#include "DolphinWX/NetPlay/PadMapDialog.h"
+
+PadMapDialog::PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimotemap[], std::vector<const Player*>& player_list)
+	: wxDialog(parent, wxID_ANY, _("Configure Pads"))
+	, m_mapping(map)
+	, m_wiimapping(wiimotemap)
+	, m_player_list(player_list)
+{
+	wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL);
+	h_szr->AddSpacer(10);
+
+	wxArrayString player_names;
+	player_names.Add(_("None"));
+	for (auto& player : m_player_list)
+		player_names.Add(player->name);
+
+	for (unsigned int i = 0; i < 4; ++i)
+	{
+		wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL);
+		v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Pad ")) + (wxChar)('0' + i))),
+			1, wxALIGN_CENTER_HORIZONTAL);
+
+		m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names);
+		m_map_cbox[i]->Bind(wxEVT_CHOICE, &PadMapDialog::OnAdjust, this);
+		if (m_mapping[i] == -1)
+		{
+			m_map_cbox[i]->Select(0);
+		}
+		else
+		{
+			for (unsigned int j = 0; j < m_player_list.size(); j++)
+			{
+				if (m_mapping[i] == m_player_list[j]->pid)
+					m_map_cbox[i]->Select(j + 1);
+			}
+		}
+
+		v_szr->Add(m_map_cbox[i], 1);
+
+		h_szr->Add(v_szr, 1, wxTOP | wxEXPAND, 20);
+		h_szr->AddSpacer(10);
+	}
+
+	for (unsigned int i = 0; i < 4; ++i)
+	{
+		wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL);
+		v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Wiimote ")) + (wxChar)('0' + i))),
+			1, wxALIGN_CENTER_HORIZONTAL);
+
+		m_map_cbox[i + 4] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names);
+		m_map_cbox[i + 4]->Bind(wxEVT_CHOICE, &PadMapDialog::OnAdjust, this);
+		if (m_wiimapping[i] == -1)
+		{
+			m_map_cbox[i + 4]->Select(0);
+		}
+		else
+		{
+			for (unsigned int j = 0; j < m_player_list.size(); j++)
+			{
+				if (m_wiimapping[i] == m_player_list[j]->pid)
+					m_map_cbox[i + 4]->Select(j + 1);
+			}
+		}
+
+		v_szr->Add(m_map_cbox[i + 4], 1);
+
+		h_szr->Add(v_szr, 1, wxTOP | wxEXPAND, 20);
+		h_szr->AddSpacer(10);
+	}
+
+	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
+	main_szr->Add(h_szr);
+	main_szr->AddSpacer(5);
+	main_szr->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT, 20);
+	main_szr->AddSpacer(5);
+	SetSizerAndFit(main_szr);
+	SetFocus();
+}
+
+void PadMapDialog::OnAdjust(wxCommandEvent& WXUNUSED(event))
+{
+	for (unsigned int i = 0; i < 4; i++)
+	{
+		int player_idx = m_map_cbox[i]->GetSelection();
+		if (player_idx > 0)
+			m_mapping[i] = m_player_list[player_idx - 1]->pid;
+		else
+			m_mapping[i] = -1;
+
+		player_idx = m_map_cbox[i + 4]->GetSelection();
+		if (player_idx > 0)
+			m_wiimapping[i] = m_player_list[player_idx - 1]->pid;
+		else
+			m_wiimapping[i] = -1;
+	}
+}
diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.h b/Source/Core/DolphinWX/NetPlay/PadMapDialog.h
new file mode 100644
index 0000000000..b00cbd40c0
--- /dev/null
+++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.h
@@ -0,0 +1,27 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include <wx/dialog.h>
+
+#include "Core/NetPlayProto.h"
+
+class Player;
+class wxChoice;
+
+class PadMapDialog final : public wxDialog
+{
+public:
+	PadMapDialog(wxWindow* parent, PadMapping map[], PadMapping wiimotemap[], std::vector<const Player*>& player_list);
+
+private:
+	void OnAdjust(wxCommandEvent& event);
+
+	wxChoice* m_map_cbox[8];
+	PadMapping* const m_mapping;
+	PadMapping* const m_wiimapping;
+	std::vector<const Player*>& m_player_list;
+};
diff --git a/Source/Core/DolphinWX/PatchAddEdit.cpp b/Source/Core/DolphinWX/PatchAddEdit.cpp
new file mode 100644
index 0000000000..ef933b117c
--- /dev/null
+++ b/Source/Core/DolphinWX/PatchAddEdit.cpp
@@ -0,0 +1,233 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <vector>
+#include <wx/arrstr.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/gbsizer.h>
+#include <wx/msgdlg.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/spinbutt.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/PatchEngine.h"
+#include "DolphinWX/PatchAddEdit.h"
+#include "DolphinWX/WxUtils.h"
+
+CPatchAddEdit::CPatchAddEdit(int _selection, std::vector<PatchEngine::Patch>* _onFrame, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
+	: wxDialog(parent, id, title, position, size, style)
+	, onFrame(_onFrame)
+	, selection(_selection)
+{
+	CreateGUIControls(selection);
+
+	Bind(wxEVT_BUTTON, &CPatchAddEdit::SavePatchData, this, wxID_OK);
+}
+
+CPatchAddEdit::~CPatchAddEdit()
+{
+}
+
+void CPatchAddEdit::CreateGUIControls(int _selection)
+{
+	wxString currentName = _("<Insert name here>");
+
+	if (_selection == -1)
+	{
+		tempEntries.clear();
+		tempEntries.emplace_back(PatchEngine::PATCH_8BIT, 0x00000000, 0x00000000);
+	}
+	else
+	{
+		currentName = StrToWxStr(onFrame->at(_selection).name);
+		tempEntries = onFrame->at(_selection).entries;
+	}
+
+	itCurEntry = tempEntries.begin();
+
+	wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL);
+
+	wxStaticText* EditPatchNameText = new wxStaticText(this, wxID_ANY, _("Name:"));
+	EditPatchName = new wxTextCtrl(this, wxID_ANY);
+	EditPatchName->SetValue(currentName);
+
+	wxStaticText* EditPatchOffsetText = new wxStaticText(this, wxID_ANY, _("Offset:"));
+	EditPatchOffset = new wxTextCtrl(this, wxID_ANY);
+	EditPatchOffset->SetValue(wxString::Format("%08X", tempEntries.at(0).address));
+
+	EntrySelection = new wxSpinButton(this);
+	EntrySelection->Bind(wxEVT_SPIN, &CPatchAddEdit::ChangeEntry, this);
+	EntrySelection->SetRange(0, (int)tempEntries.size() - 1);
+	EntrySelection->SetValue((int)tempEntries.size() - 1);
+
+	wxArrayString wxArrayStringFor_EditPatchType;
+	for (int i = 0; i < 3; ++i)
+		wxArrayStringFor_EditPatchType.Add(StrToWxStr(PatchEngine::PatchTypeStrings[i]));
+	EditPatchType = new wxRadioBox(this, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, wxArrayStringFor_EditPatchType, 3, wxRA_SPECIFY_COLS);
+	EditPatchType->SetSelection((int)tempEntries.at(0).type);
+
+	wxStaticText* EditPatchValueText = new wxStaticText(this, wxID_ANY, _("Value:"));
+	EditPatchValue = new wxTextCtrl(this, wxID_ANY);
+	EditPatchValue->SetValue(wxString::Format("%0*X", PatchEngine::GetPatchTypeCharLength(tempEntries.at(0).type), tempEntries.at(0).value));
+
+	EntryAdd = new wxButton(this, wxID_ANY, _("Add"));
+	EntryAdd->Bind(wxEVT_BUTTON, &CPatchAddEdit::AddEntry, this);
+
+	EntryRemove = new wxButton(this, wxID_ANY, _("Remove"));
+	EntryRemove->Bind(wxEVT_BUTTON, &CPatchAddEdit::RemoveEntry, this);
+	if ((int)tempEntries.size() <= 1)
+		EntryRemove->Disable();
+
+	wxBoxSizer* sEditPatchName = new wxBoxSizer(wxHORIZONTAL);
+	sEditPatchName->Add(EditPatchNameText, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	sEditPatchName->Add(EditPatchName, 1, wxEXPAND | wxALL, 5);
+	sEditPatch->Add(sEditPatchName, 0, wxEXPAND);
+	sbEntry = new wxStaticBoxSizer(wxVERTICAL, this, wxString::Format(_("Entry 1/%d"), (int)tempEntries.size()));
+	currentItem = 1;
+
+	wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0);
+	sgEntry->Add(EditPatchType, wxGBPosition(0, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 5);
+	sgEntry->Add(EditPatchOffsetText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	sgEntry->Add(EditPatchOffset, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 5);
+	sgEntry->Add(EditPatchValueText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	sgEntry->Add(EditPatchValue, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 5);
+	sgEntry->Add(EntrySelection, wxGBPosition(0, 2), wxGBSpan(3, 1), wxEXPAND | wxALL, 5);
+	sgEntry->AddGrowableCol(1);
+
+	wxBoxSizer* sEntryAddRemove = new wxBoxSizer(wxHORIZONTAL);
+	sEntryAddRemove->Add(EntryAdd, 0, wxALL, 5);
+	sEntryAddRemove->Add(EntryRemove, 0, wxALL, 5);
+	sbEntry->Add(sgEntry, 0, wxEXPAND);
+	sbEntry->Add(sEntryAddRemove, 0, wxEXPAND);
+
+	sEditPatch->Add(sbEntry, 0, wxEXPAND | wxALL, 5);
+	sEditPatch->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	SetSizerAndFit(sEditPatch);
+	SetFocus();
+}
+
+void CPatchAddEdit::ChangeEntry(wxSpinEvent& event)
+{
+	if (!UpdateTempEntryData(itCurEntry))
+		return;
+
+	itCurEntry = tempEntries.end() - event.GetPosition() - 1;
+	currentItem = (int)tempEntries.size() - event.GetPosition();
+	UpdateEntryCtrls(*itCurEntry);
+}
+
+void CPatchAddEdit::SavePatchData(wxCommandEvent& event)
+{
+	if (!UpdateTempEntryData(itCurEntry))
+		return;
+
+	if (selection == -1)
+	{
+		PatchEngine::Patch newPatch;
+		newPatch.name = WxStrToStr(EditPatchName->GetValue());
+		newPatch.entries = tempEntries;
+		newPatch.active = true;
+
+		onFrame->push_back(newPatch);
+	}
+	else
+	{
+		onFrame->at(selection).name = WxStrToStr(EditPatchName->GetValue());
+		onFrame->at(selection).entries = tempEntries;
+	}
+
+	AcceptAndClose();
+	event.Skip();
+}
+
+void CPatchAddEdit::AddEntry(wxCommandEvent& event)
+{
+	if (!UpdateTempEntryData(itCurEntry))
+		return;
+
+	PatchEngine::PatchEntry peEmptyEntry(PatchEngine::PATCH_8BIT, 0x00000000, 0x00000000);
+	++itCurEntry;
+	currentItem++;
+	itCurEntry = tempEntries.insert(itCurEntry, peEmptyEntry);
+
+	EntrySelection->SetRange(EntrySelection->GetMin(), EntrySelection->GetMax() + 1);
+	UpdateEntryCtrls(*itCurEntry);
+
+	EntryRemove->Enable();
+	EntrySelection->Enable();
+}
+
+void CPatchAddEdit::RemoveEntry(wxCommandEvent& event)
+{
+	itCurEntry = tempEntries.erase(itCurEntry);
+
+	if (itCurEntry != tempEntries.begin())
+	{
+		--itCurEntry;
+		currentItem--;
+	}
+	else
+	{
+		EntrySelection->SetValue(EntrySelection->GetValue() - 1);
+	}
+
+	EntrySelection->SetRange(EntrySelection->GetMin(), EntrySelection->GetMax() - 1);
+	UpdateEntryCtrls(*itCurEntry);
+
+	if ((int)tempEntries.size() <= 1)
+	{
+		EntryRemove->Disable();
+		EntrySelection->Disable();
+	}
+}
+
+void CPatchAddEdit::UpdateEntryCtrls(PatchEngine::PatchEntry pE)
+{
+	sbEntry->GetStaticBox()->SetLabel(wxString::Format(_("Entry %d/%d"), currentItem,
+									  (int)tempEntries.size()));
+	EditPatchOffset->SetValue(wxString::Format("%08X", pE.address));
+	EditPatchType->SetSelection(pE.type);
+	EditPatchValue->SetValue(wxString::Format("%0*X",
+		PatchEngine::GetPatchTypeCharLength(pE.type), pE.value));
+}
+
+bool CPatchAddEdit::UpdateTempEntryData(std::vector<PatchEngine::PatchEntry>::iterator iterEntry)
+{
+	unsigned long value;
+	bool parsed_ok = true;
+
+	if (EditPatchOffset->GetValue().ToULong(&value, 16))
+		(*iterEntry).address = value;
+	else
+		parsed_ok = false;
+
+	PatchEngine::PatchType tempType =
+	(*iterEntry).type = (PatchEngine::PatchType)EditPatchType->GetSelection();
+
+	if (EditPatchValue->GetValue().ToULong(&value, 16))
+	{
+		(*iterEntry).value = value;
+		if (tempType == PatchEngine::PATCH_8BIT && value > 0xff)
+			parsed_ok = false;
+		else if (tempType == PatchEngine::PATCH_16BIT && value > 0xffff)
+			parsed_ok = false;
+	}
+	else
+	{
+		parsed_ok = false;
+	}
+
+	if (!parsed_ok)
+	{
+		wxMessageBox(_("Unable to create patch from given values.\nEntry not modified."), _("Error"));
+	}
+
+	return parsed_ok;
+}
diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h
new file mode 100644
index 0000000000..6d0ebc8db5
--- /dev/null
+++ b/Source/Core/DolphinWX/PatchAddEdit.h
@@ -0,0 +1,53 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include <wx/dialog.h>
+
+#include "Core/PatchEngine.h"
+
+class wxButton;
+class wxRadioBox;
+class wxSpinButton;
+class wxSpinEvent;
+class wxStaticBoxSizer;
+class wxTextCtrl;
+
+class CPatchAddEdit : public wxDialog
+{
+public:
+	CPatchAddEdit(int _selection, std::vector<PatchEngine::Patch>* _onFrame,
+		wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxString& title = _("Edit Patch"),
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxDEFAULT_DIALOG_STYLE);
+	virtual ~CPatchAddEdit();
+
+private:
+	wxTextCtrl* EditPatchName;
+	wxTextCtrl* EditPatchOffset;
+	wxRadioBox* EditPatchType;
+	wxTextCtrl* EditPatchValue;
+	wxSpinButton* EntrySelection;
+	wxButton* EntryAdd;
+	wxButton* EntryRemove;
+	wxStaticBoxSizer* sbEntry;
+	std::vector<PatchEngine::Patch>* onFrame;
+
+	void CreateGUIControls(int selection);
+	void ChangeEntry(wxSpinEvent& event);
+	void SavePatchData(wxCommandEvent& event);
+	void AddEntry(wxCommandEvent& event);
+	void RemoveEntry(wxCommandEvent& event);
+	void UpdateEntryCtrls(PatchEngine::PatchEntry pE);
+	bool UpdateTempEntryData(std::vector<PatchEngine::PatchEntry>::iterator iterEntry);
+
+	int selection, currentItem;
+	std::vector<PatchEngine::PatchEntry> tempEntries;
+	std::vector<PatchEngine::PatchEntry>::iterator itCurEntry;
+};
diff --git a/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp
new file mode 100644
index 0000000000..1954ee7a4f
--- /dev/null
+++ b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp
@@ -0,0 +1,316 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <math.h>
+#include <unordered_map>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/StringUtil.h"
+
+#include "DolphinWX/PostProcessingConfigDiag.h"
+
+#include "VideoCommon/RenderBase.h"
+
+PostProcessingConfigDiag::PostProcessingConfigDiag(wxWindow* parent, const std::string& shader)
+	: wxDialog(parent, wxID_ANY,
+		wxString::Format(_("Post Processing Shader Configuration"))),
+	  m_shader(shader)
+{
+	// Depending on if we are running already, either use the one from the videobackend
+	// or generate our own.
+	if (g_renderer && g_renderer->GetPostProcessor())
+	{
+		m_post_processor = g_renderer->GetPostProcessor()->GetConfig();
+	}
+	else
+	{
+		m_post_processor = new PostProcessingShaderConfiguration();
+		m_post_processor->LoadShader(m_shader);
+	}
+
+	// Create our UI classes
+	const PostProcessingShaderConfiguration::ConfigMap& config_map = m_post_processor->GetOptions();
+	for (const auto& it : config_map)
+	{
+		if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_BOOL)
+		{
+			ConfigGrouping* group = new ConfigGrouping(ConfigGrouping::WidgetType::TYPE_TOGGLE,
+				it.second.m_gui_name, it.first, it.second.m_dependent_option,
+				&it.second);
+			m_config_map[it.first] = group;
+		}
+		else
+		{
+			ConfigGrouping* group = new ConfigGrouping(ConfigGrouping::WidgetType::TYPE_SLIDER,
+				it.second.m_gui_name, it.first, it.second.m_dependent_option,
+				&it.second);
+			m_config_map[it.first] = group;
+		}
+	}
+
+	// Arrange our vectors based on dependency
+	for (const auto& it : m_config_map)
+	{
+		const std::string parent_name = it.second->GetParent();
+		if (parent_name.size())
+		{
+			// Since it depends on a different object, push it to a parent's object
+			m_config_map[parent_name]->AddChild(m_config_map[it.first]);
+		}
+		else
+		{
+			// It doesn't have a child, just push it to the vector
+			m_config_groups.push_back(m_config_map[it.first]);
+		}
+	}
+
+	// Generate our UI
+	wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
+	wxPanel* const page_general = new wxPanel(notebook);
+	wxFlexGridSizer* const szr_general = new wxFlexGridSizer(2, 5, 5);
+
+	// Now let's actually populate our window with our information
+	bool add_general_page = false;
+	for (const auto& it : m_config_groups)
+	{
+		if (it->HasChildren())
+		{
+			// Options with children get their own tab
+			wxPanel* const page_option = new wxPanel(notebook);
+			wxFlexGridSizer* const szr_option = new wxFlexGridSizer(2, 10, 5);
+			it->GenerateUI(this, page_option, szr_option);
+
+			// Add all the children
+			for (const auto& child : it->GetChildren())
+			{
+				child->GenerateUI(this, page_option, szr_option);
+			}
+			page_option->SetSizerAndFit(szr_option);
+			notebook->AddPage(page_option, _(it->GetGUIName()));
+		}
+		else
+		{
+			// Options with no children go in to the general tab
+			if (!add_general_page)
+			{
+				// Make it so it doesn't show up if there aren't any options without children.
+				add_general_page = true;
+			}
+			it->GenerateUI(this, page_general, szr_general);
+		}
+	}
+
+	if (add_general_page)
+	{
+		page_general->SetSizerAndFit(szr_general);
+		notebook->InsertPage(0, page_general, _("General"));
+	}
+
+	// Close Button
+	wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"));
+	btn_close->Bind(wxEVT_BUTTON, &PostProcessingConfigDiag::Event_ClickClose, this);
+
+	Bind(wxEVT_CLOSE_WINDOW, &PostProcessingConfigDiag::Event_Close, this);
+
+	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
+	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
+	szr_main->Add(btn_close, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
+
+	SetSizerAndFit(szr_main);
+	Center();
+	SetFocus();
+
+	UpdateWindowUI();
+}
+
+PostProcessingConfigDiag::~PostProcessingConfigDiag()
+{
+	m_post_processor->SaveOptionsConfiguration();
+	if (g_renderer && g_renderer->GetPostProcessor())
+		m_post_processor = nullptr;
+	else
+		delete m_post_processor;
+}
+
+void PostProcessingConfigDiag::ConfigGrouping::GenerateUI(PostProcessingConfigDiag* dialog, wxWindow* parent, wxFlexGridSizer* sizer)
+{
+	if (m_type == WidgetType::TYPE_TOGGLE)
+	{
+		m_option_checkbox = new wxCheckBox(parent, wxID_ANY, _(m_gui_name));
+		m_option_checkbox->SetValue(m_config_option->m_bool_value);
+		m_option_checkbox->Bind(wxEVT_CHECKBOX, &PostProcessingConfigDiag::Event_CheckBox,
+		                        dialog, wxID_ANY, wxID_ANY, new UserEventData(m_option));
+
+		sizer->Add(m_option_checkbox);
+		sizer->AddStretchSpacer();
+	}
+	else
+	{
+		size_t vector_size = 0;
+		if (m_config_option->m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER)
+			vector_size = m_config_option->m_integer_values.size();
+		else
+			vector_size = m_config_option->m_float_values.size();
+
+		wxFlexGridSizer* const szr_values = new wxFlexGridSizer(vector_size + 1, 0, 0);
+		wxStaticText* const option_static_text = new wxStaticText(parent, wxID_ANY, _(m_gui_name));
+		sizer->Add(option_static_text);
+
+		for (size_t i = 0; i < vector_size; ++i)
+		{
+			// wxSlider uses a signed integer for it's minimum and maximum values
+			// This won't work for floats.
+			// Let's determine how many steps we can take and use that instead.
+			int steps = 0;
+			int current_value = 0;
+			std::string string_value;
+			if (m_config_option->m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER)
+			{
+				// Find out our range by taking the max subtracting the minimum.
+				double range = m_config_option->m_integer_max_values[i] - m_config_option->m_integer_min_values[i];
+
+				// How many steps we have is the range divided by the step interval configured.
+				// This may not be 100% spot on accurate since developers can have odd stepping intervals set.
+				// Round up so if it is outside our range, then set it to the minimum or maximum
+				steps = ceil(range / (double)m_config_option->m_integer_step_values[i]);
+
+				// Default value is just the currently set value here
+				current_value = m_config_option->m_integer_values[i];
+				string_value = std::to_string(m_config_option->m_integer_values[i]);
+			}
+			else
+			{
+				// Same as above but with floats
+				float range = m_config_option->m_float_max_values[i] - m_config_option->m_float_min_values[i];
+				steps = ceil(range / m_config_option->m_float_step_values[i]);
+
+				// We need to convert our default float value from a float to the nearest step value range
+				current_value = (m_config_option->m_float_values[i] / m_config_option->m_float_step_values[i]);
+				string_value = std::to_string(m_config_option->m_float_values[i]);
+			}
+
+			wxSlider* slider = new wxSlider(parent, wxID_ANY, current_value, 0, steps,
+			                                wxDefaultPosition, wxSize(200, -1), wxSL_HORIZONTAL | wxSL_BOTTOM);
+			wxTextCtrl* text_ctrl = new wxTextCtrl(parent, wxID_ANY, string_value);
+
+			// Disable the textctrl, it's only there to show the absolute value from the slider
+			text_ctrl->Disable();
+
+			// wxWidget takes over the pointer provided to it in the event handler.
+			// This won't be a memory leak, it'll be destroyed on dialog close.
+			slider->Bind(wxEVT_SLIDER, &PostProcessingConfigDiag::Event_Slider,
+					 dialog, wxID_ANY, wxID_ANY, new UserEventData(m_option));
+
+			m_option_sliders.push_back(slider);
+			m_option_text_ctrls.push_back(text_ctrl);
+		}
+
+		if (vector_size == 1)
+		{
+			szr_values->Add(m_option_sliders[0], wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
+			szr_values->Add(m_option_text_ctrls[0]);
+
+			sizer->Add(szr_values);
+		}
+		else
+		{
+			wxFlexGridSizer* const szr_inside = new wxFlexGridSizer(2, 0, 0);
+			for (size_t i = 0; i < vector_size; ++i)
+			{
+				szr_inside->Add(m_option_sliders[i], wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
+				szr_inside->Add(m_option_text_ctrls[i]);
+			}
+
+			szr_values->Add(szr_inside);
+			sizer->Add(szr_values);
+		}
+	}
+}
+
+void PostProcessingConfigDiag::ConfigGrouping::EnableDependentChildren(bool enable)
+{
+	// Enable or disable all the children
+	for (auto& it : m_children)
+	{
+		if (it->m_type == ConfigGrouping::WidgetType::TYPE_TOGGLE)
+		{
+			it->m_option_checkbox->Enable(enable);
+		}
+		else
+		{
+			for (auto& slider : it->m_option_sliders)
+				slider->Enable(enable);
+		}
+		// Set this objects children as well
+		it->EnableDependentChildren(enable);
+	}
+}
+
+void PostProcessingConfigDiag::Event_CheckBox(wxCommandEvent &ev)
+{
+	UserEventData* config_option = (UserEventData*)ev.GetEventUserData();
+	ConfigGrouping* config = m_config_map[config_option->GetData()];
+
+	m_post_processor->SetOptionb(config->GetOption(), ev.IsChecked());
+
+	config->EnableDependentChildren(ev.IsChecked());
+
+	ev.Skip();
+}
+
+void PostProcessingConfigDiag::Event_Slider(wxCommandEvent &ev)
+{
+	UserEventData* config_option = (UserEventData*)ev.GetEventUserData();
+	ConfigGrouping* config = m_config_map[config_option->GetData()];
+
+	const auto& option_data = m_post_processor->GetOption(config->GetOption());
+
+	size_t vector_size = 0;
+	if (option_data.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER)
+		vector_size = option_data.m_integer_values.size();
+	else
+		vector_size = option_data.m_float_values.size();
+
+	for (size_t i = 0; i < vector_size; ++i)
+	{
+		// Got to do this garbage again.
+		// Convert current step in to the real range value
+		int current_step = config->GetSliderValue(i);
+		std::string string_value;
+		if (option_data.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER)
+		{
+			s32 value = option_data.m_integer_step_values[i] * current_step + option_data.m_integer_min_values[i];
+			m_post_processor->SetOptioni(config->GetOption(), i, value);
+			string_value = std::to_string(value);
+		}
+		else
+		{
+			float value = option_data.m_float_step_values[i] * current_step + option_data.m_float_min_values[i];
+			m_post_processor->SetOptionf(config->GetOption(), i, value);
+			string_value = std::to_string(value);
+		}
+		// Update the text box to include the new value
+		config->SetSliderText(i, string_value);
+	}
+	ev.Skip();
+}
+
+void PostProcessingConfigDiag::Event_ClickClose(wxCommandEvent&)
+{
+	Close();
+}
+
+void PostProcessingConfigDiag::Event_Close(wxCloseEvent& ev)
+{
+	EndModal(wxID_OK);
+}
+
diff --git a/Source/Core/DolphinWX/PostProcessingConfigDiag.h b/Source/Core/DolphinWX/PostProcessingConfigDiag.h
new file mode 100644
index 0000000000..7642fa1e17
--- /dev/null
+++ b/Source/Core/DolphinWX/PostProcessingConfigDiag.h
@@ -0,0 +1,106 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include <wx/dialog.h>
+#include <wx/slider.h>
+#include <wx/textctrl.h>
+
+#include "VideoCommon/PostProcessing.h"
+
+class wxButton;
+class wxCheckBox;
+class wxFlexGridSizer;
+
+class PostProcessingConfigDiag : public wxDialog
+{
+public:
+	PostProcessingConfigDiag(wxWindow* parent, const std::string& shader);
+	~PostProcessingConfigDiag();
+
+private:
+
+	// This is literally the stupidest thing ever
+	// wxWidgets takes ownership of any pointer given to a event handler
+	// Instead of passing them a pointer to a std::string, we wrap around it here.
+	class UserEventData : public wxObject
+	{
+	public:
+		UserEventData(const std::string& data) : m_data(data) {}
+		const std::string& GetData() { return m_data; }
+	private:
+		const std::string m_data;
+	};
+
+	class ConfigGrouping
+	{
+	public:
+		enum WidgetType
+		{
+			TYPE_TOGGLE,
+			TYPE_SLIDER,
+		};
+
+		ConfigGrouping(WidgetType type, const std::string& gui_name,
+		               const std::string& option_name, const std::string& parent,
+				   const PostProcessingShaderConfiguration::ConfigurationOption* config_option)
+			: m_type(type), m_gui_name(gui_name),
+			  m_option(option_name), m_parent(parent),
+			  m_config_option(config_option) {}
+
+		void AddChild(ConfigGrouping* child) { m_children.push_back(child); }
+		bool HasChildren() { return m_children.size() != 0; }
+		std::vector<ConfigGrouping*>& GetChildren() { return m_children; }
+
+		// Gets the string that is shown in the UI for the option
+		const std::string& GetGUIName() { return m_gui_name; }
+		// Gets the option name for use in the shader
+		// Also is a unique identifier for the option's configuration
+		const std::string& GetOption() { return m_option; }
+		// Gets the option name of the parent of this option
+		const std::string& GetParent() { return m_parent; }
+
+		void GenerateUI(PostProcessingConfigDiag* dialog, wxWindow* parent, wxFlexGridSizer* sizer);
+
+		void EnableDependentChildren(bool enable);
+
+		int GetSliderValue(const int index) { return m_option_sliders[index]->GetValue(); }
+		void SetSliderText(const int index, const std::string& text) { m_option_text_ctrls[index]->SetValue(text); }
+
+	private:
+		const WidgetType m_type;
+		const std::string m_gui_name;
+		const std::string m_option;
+		const std::string m_parent;
+		const PostProcessingShaderConfiguration::ConfigurationOption* m_config_option;
+
+		// For TYPE_TOGGLE
+		wxCheckBox* m_option_checkbox;
+
+		// For TYPE_SLIDER
+		// Can have up to 4
+		std::vector<wxSlider*> m_option_sliders;
+		std::vector<wxTextCtrl*> m_option_text_ctrls;
+
+		std::vector<ConfigGrouping*> m_children;
+	};
+
+	// WX UI things
+	void Event_Close(wxCloseEvent&);
+	void Event_ClickClose(wxCommandEvent&);
+	void Event_Slider(wxCommandEvent &ev);
+	void Event_CheckBox(wxCommandEvent &ev);
+
+	const std::string& m_shader;
+	PostProcessingShaderConfiguration* m_post_processor;
+
+	std::map<std::string, ConfigGrouping*> m_config_map;
+	std::vector<ConfigGrouping*> m_config_groups;
+};
+
diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
new file mode 100644
index 0000000000..dd747c4513
--- /dev/null
+++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
@@ -0,0 +1,143 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
+#include "Common/FileUtil.h"
+#include "Core/Core.h"
+#include "DolphinWX/SoftwareVideoConfigDialog.h"
+#include "DolphinWX/VideoConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+
+template <typename T>
+IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) :
+	wxSpinCtrl(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style),
+	m_setting(setting)
+{
+	SetRange(minVal, maxVal);
+	SetValue(m_setting);
+	Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
+}
+
+
+SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& _ininame) :
+	wxDialog(parent, wxID_ANY,
+	wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title))),
+	vconfig(g_SWVideoConfig),
+	ininame(_ininame)
+{
+	vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
+
+	wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
+
+	// -- GENERAL --
+	{
+	wxPanel* const page_general= new wxPanel(notebook);
+	notebook->AddPage(page_general, _("General"));
+	wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
+
+	// - rendering
+	{
+	wxStaticBoxSizer* const group_rendering = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Rendering"));
+	szr_general->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
+	wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
+	group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	// backend
+	wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
+	wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY);
+
+	for (const VideoBackend* backend : g_available_video_backends)
+	{
+		choice_backend->AppendString(StrToWxStr(backend->GetDisplayName()));
+	}
+
+	// TODO: How to get the translated plugin name?
+	choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
+	choice_backend->Bind(wxEVT_CHOICE, &SoftwareVideoConfigDialog::Event_Backend, this);
+
+	szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
+	szr_rendering->Add(choice_backend, 1, 0, 0);
+
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+	{
+		label_backend->Disable();
+		choice_backend->Disable();
+	}
+
+	// rasterizer
+	szr_rendering->Add(new SettingCheckBox(page_general, _("Hardware rasterization"), "", vconfig.bHwRasterizer));
+
+	// xfb
+	szr_rendering->Add(new SettingCheckBox(page_general, _("Bypass XFB"), "", vconfig.bBypassXFB));
+	}
+
+	// - info
+	{
+	wxStaticBoxSizer* const group_info = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Overlay Information"));
+	szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
+	group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	szr_info->Add(new SettingCheckBox(page_general, _("Various Statistics"), "", vconfig.bShowStats));
+	}
+
+	// - utility
+	{
+	wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Utility"));
+	szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
+	group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	szr_utility->Add(new SettingCheckBox(page_general, _("Dump Textures"), "", vconfig.bDumpTextures));
+	szr_utility->Add(new SettingCheckBox(page_general, _("Dump Objects"), "", vconfig.bDumpObjects));
+
+	// - debug only
+	wxStaticBoxSizer* const group_debug_only_utility = new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Debug Only"));
+	group_utility->Add(group_debug_only_utility, 0, wxEXPAND | wxBOTTOM, 5);
+	wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, 5, 5);
+	group_debug_only_utility->Add(szr_debug_only_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	szr_debug_only_utility->Add(new SettingCheckBox(page_general, _("Dump TEV Stages"), "", vconfig.bDumpTevStages));
+	szr_debug_only_utility->Add(new SettingCheckBox(page_general, _("Dump Texture Fetches"), "", vconfig.bDumpTevTextureFetches));
+	}
+
+	// - misc
+	{
+	wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Drawn Object Range"));
+	szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
+	group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	szr_misc->Add(new U32Setting(page_general, _("Start"), vconfig.drawStart, 0, 100000));
+	szr_misc->Add(new U32Setting(page_general, _("End"), vconfig.drawEnd, 0, 100000));
+	}
+
+	page_general->SetSizerAndFit(szr_general);
+	}
+
+	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
+	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
+	szr_main->Add(new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition),
+			0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
+
+	SetSizerAndFit(szr_main);
+	Center();
+	SetFocus();
+}
+
+SoftwareVideoConfigDialog::~SoftwareVideoConfigDialog()
+{
+	g_SWVideoConfig.Save((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
+}
diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h
new file mode 100644
index 0000000000..58461d2d82
--- /dev/null
+++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.h
@@ -0,0 +1,44 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// TODO: Merge this with the original VideoConfigDiag or something
+//       This is an awful way of managing a separate video backend.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <wx/dialog.h>
+
+#include "Core/ConfigManager.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+class SoftwareVideoConfigDialog : public wxDialog
+{
+public:
+	SoftwareVideoConfigDialog(wxWindow* parent, const std::string &title, const std::string& ininame);
+	~SoftwareVideoConfigDialog();
+
+	void Event_Backend(wxCommandEvent &ev)
+	{
+		VideoBackend* new_backend = g_available_video_backends[ev.GetInt()];
+
+		if (g_video_backend != new_backend)
+		{
+			Close();
+
+			g_video_backend = new_backend;
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = g_video_backend->GetName();
+
+			g_video_backend->ShowConfig(GetParent());
+		}
+		ev.Skip();
+	}
+
+protected:
+	SWVideoConfig& vconfig;
+	std::string ininame;
+};
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
deleted file mode 100644
index f0fd91abdb..0000000000
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "ARCodeAddEdit.h"
-#include "ARDecrypt.h"
-#include "WxUtils.h"
-
-extern std::vector<ActionReplay::ARCode> arCodes;
-
-BEGIN_EVENT_TABLE(CARCodeAddEdit, wxDialog)
-	EVT_BUTTON(wxID_OK, CARCodeAddEdit::SaveCheatData)
-	EVT_SPIN(ID_ENTRY_SELECT, CARCodeAddEdit::ChangeEntry)
-END_EVENT_TABLE()
-
-CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-	, selection(_selection)
-{
-	ActionReplay::ARCode tempEntries;
-	wxString currentName = _("Insert name here..");
-
-	if (selection == wxNOT_FOUND)
-	{
-		tempEntries.name = "";
-	}
-	else
-	{
-		currentName = StrToWxStr(arCodes.at(selection).name);
-		tempEntries = arCodes.at(selection);
-	}
-
-	wxBoxSizer* sEditCheat = new wxBoxSizer(wxVERTICAL);
-	wxStaticBoxSizer* sbEntry = new wxStaticBoxSizer(wxVERTICAL, this, _("Cheat Code"));
-	wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0);
-
-	wxStaticText* EditCheatNameText = new wxStaticText(this, ID_EDITCHEAT_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize);
-	EditCheatName = new wxTextCtrl(this, ID_EDITCHEAT_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	EditCheatName->SetValue(currentName);
-	EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL);
-	EntrySelection->SetRange(1, ((int)arCodes.size()) > 0 ? (int)arCodes.size() : 1); 
-	EntrySelection->SetValue((int)(arCodes.size() - selection));
-	EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE);
-	UpdateTextCtrl(tempEntries);
-
-	sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5);
-	sgEntry->Add(EditCheatName,		wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sgEntry->Add(EntrySelection,	wxGBPosition(0, 2), wxGBSpan(2, 1), wxEXPAND|wxALL, 5);
-	sgEntry->Add(EditCheatCode,		wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
-	sgEntry->AddGrowableCol(1);
-	sgEntry->AddGrowableRow(1);
-	sbEntry->Add(sgEntry, 1, wxEXPAND|wxALL);
-
-	sEditCheat->Add(sbEntry, 1, wxEXPAND|wxALL, 5);
-	sEditCheat->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxALL, 5);
-
-	SetSizerAndFit(sEditCheat);
-	SetFocus();
-}
-
-void CARCodeAddEdit::ChangeEntry(wxSpinEvent& event)
-{
-	ActionReplay::ARCode currentCode = arCodes.at((int)arCodes.size() - event.GetPosition());
-	EditCheatName->SetValue(StrToWxStr(currentCode.name));
-	UpdateTextCtrl(currentCode);
-}
-
-void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event))
-{
-	std::vector<ActionReplay::AREntry> decryptedLines;
-	std::vector<std::string> encryptedLines;
-
-	// Split the entered cheat into lines.
-	std::vector<std::string> userInputLines;
-	SplitString(WxStrToStr(EditCheatCode->GetValue()), '\n', userInputLines);
-
-	for (size_t i = 0;  i < userInputLines.size();  i++)
-	{
-		// Make sure to ignore unneeded whitespace characters.
-		std::string line_str = StripSpaces(userInputLines[i]);
-
-		if (line_str == "")
-			continue;
-
-		// Let's parse the current line.  Is it in encrypted or decrypted form?
-		std::vector<std::string> pieces;
-		SplitString(line_str, ' ', pieces);
-
-		if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
-		{
-			// Decrypted code line.
-			u32 addr = strtoul(pieces[0].c_str(), NULL, 16);
-			u32 value = strtoul(pieces[1].c_str(), NULL, 16);
-
-			decryptedLines.push_back(ActionReplay::AREntry(addr, value));
-			continue;
-		}
-		else if (pieces.size() == 1)
-		{
-			SplitString(line_str, '-', pieces);
-
-			if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5)
-			{
-				// Encrypted code line.  We'll have to decode it later.
-				encryptedLines.push_back(pieces[0] + pieces[1] + pieces[2]);
-				continue;
-			}
-		}
-
-		// If the above-mentioned conditions weren't met, then something went wrong.
-		if (!PanicYesNoT("Unable to parse line %lu of the entered AR code as a valid "
-						"encrypted or decrypted code.  Make sure you typed it correctly.\n"
-						"Would you like to ignore this line and continue parsing?",  i + 1))
-		{
-			return;
-		}
-	}
-
-	// If the entered code was in encrypted form, we decode it here.
-	if (encryptedLines.size())
-	{
-		// TODO: what if both decrypted AND encrypted lines are entered into a single AR code?
-		ActionReplay::DecryptARCode(encryptedLines, decryptedLines);
-	}
-
-	// Codes with no lines appear to be deleted/hidden from the list.  Let's prevent that.
-	if (!decryptedLines.size())
-	{
-		PanicAlertT("The resulting decrypted AR code doesn't contain any lines.");
-		return;
-	}
-
-
-	if (selection == wxNOT_FOUND)
-	{
-		// Add a new AR cheat code.
-		ActionReplay::ARCode newCheat;
-
-		newCheat.name = WxStrToStr(EditCheatName->GetValue());
-		newCheat.ops = decryptedLines;
-		newCheat.active = true;
-
-		arCodes.push_back(newCheat);
-	}
-	else
-	{
-		// Update the currently-selected AR cheat code.
-		arCodes.at(selection).name = WxStrToStr(EditCheatName->GetValue());
-		arCodes.at(selection).ops = decryptedLines;
-	}
-
-	AcceptAndClose();
-}
-
-void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode)
-{
-	EditCheatCode->Clear();
-
-	if (arCode.name != "")
-	{
-		for (u32 i = 0; i < arCode.ops.size(); i++)
-			EditCheatCode->AppendText(wxString::Format(wxT("%08X %08X\n"), arCode.ops.at(i).cmd_addr, arCode.ops.at(i).value));
-	}
-	else
-	{
-		EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here..."));
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h
deleted file mode 100644
index cdc9e95077..0000000000
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __ARCODE_ADDEDIT_h__
-#define __ARCODE_ADDEDIT_h__
-
-#include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include "ISOProperties.h"
-
-class CARCodeAddEdit : public wxDialog
-{
-	public:
-		CARCodeAddEdit(int _selection, wxWindow* parent,
-			wxWindowID id = 1,
-			const wxString& title = _("Edit ActionReplay Code"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_DIALOG_STYLE);
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		wxTextCtrl *EditCheatName;
-		wxSpinButton *EntrySelection;
-		wxTextCtrl *EditCheatCode;
-
-		enum {
-			ID_EDITCHEAT_NAME_TEXT = 4550,
-			ID_EDITCHEAT_NAME,
-			ID_ENTRY_SELECT,
-			ID_EDITCHEAT_CODE
-		};
-
-		void SaveCheatData(wxCommandEvent& event);
-		void ChangeEntry(wxSpinEvent& event);
-		void UpdateTextCtrl(ActionReplay::ARCode arCode);
-
-		int selection;
-
-};
-#endif // __PATCH_ADDEDIT_h__
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
deleted file mode 100644
index f1981efdd2..0000000000
--- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "AboutDolphin.h"
-#include "WxUtils.h"
-#include "../resources/dolphin_logo.cpp"
-#include "scmrev.h"
-
-AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
-		const wxString &title, const wxPoint &position,
-		const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png);
-	wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG);
-	wxStaticBitmap* const sbDolphinLogo = new wxStaticBitmap(this, wxID_ANY,
-			wxBitmap(iDolphinLogo));
-
-	const wxString Text = wxString::Format(_("Dolphin %s\n"
-				"Copyright (c) 2003-2013+ Dolphin Team\n"
-				"\n"
-				"Branch: %s\n"
-				"Revision: %s\n"
-				"Compiled: %s @ %s\n"
-				"\n"
-				"Dolphin is a Gamecube/Wii emulator, which was\n"
-				"originally written by F|RES and ector.\n"
-				"Today Dolphin is an open source project with many\n"
-				"contributors, too many to list.\n"
-				"If interested, just go check out the project page at\n"
-				"http://code.google.com/p/dolphin-emu/ .\n"
-				"\n"
-				"Special thanks to Bushing, Costis, CrowTRobo,\n"
-				"Marcan, Segher, Titanik, or9 and Hotquik for their\n"
-				"reverse engineering and docs/demos.\n"
-				"\n"
-				"Big thanks to Gilles Mouchard whose Microlib PPC\n"
-				"emulator gave our development a kickstart.\n"
-				"\n"
-				"Thanks to Frank Wille for his PowerPC disassembler,\n"
-				"which or9 and we modified to include Gekko specifics.\n"
-				"\n"
-				"Thanks to hcs/destop for their GC ADPCM decoder.\n"
-				"\n"
-				"We are not affiliated with Nintendo in any way.\n"
-				"Gamecube and Wii are trademarks of Nintendo.\n"
-				"The emulator is for educational purposes only\n"
-				"and should not be used to play games you do\n"
-				"not legally own."),
-		SCM_DESC_STR, SCM_BRANCH_STR, SCM_REV_STR, __DATE__, __TIME__);
-
-	wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
-	Message->Wrap(GetSize().GetWidth());
-
-	wxBoxSizer* const sInfo = new wxBoxSizer(wxVERTICAL);
-	sInfo->Add(Message, 1, wxEXPAND | wxALL, 5);
-
-	wxBoxSizer* const sMainHor = new wxBoxSizer(wxHORIZONTAL);
-	sMainHor->Add(sbDolphinLogo, 0, wxEXPAND | wxALL, 5);
-	sMainHor->Add(sInfo);
-
-	wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(sMainHor, 1, wxEXPAND);
-	sMain->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	SetSizerAndFit(sMain);
-	Center();
-	SetFocus();
-}
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.h b/Source/Core/DolphinWX/Src/AboutDolphin.h
deleted file mode 100644
index 4c31f6493a..0000000000
--- a/Source/Core/DolphinWX/Src/AboutDolphin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _ABOUTDOLPHIN_H_
-#define _ABOUTDOLPHIN_H_
-
-#include <wx/wx.h>
-#include <wx/dialog.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/statbox.h>
-#include <wx/mstream.h>
-#include <wx/statbmp.h>
-
-class AboutDolphin : public wxDialog
-{
-	public:
-		AboutDolphin(wxWindow *parent,
-			wxWindowID id = wxID_ANY,
-			const wxString &title = _("About Dolphin"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_DIALOG_STYLE);
-};
-
-#endif //_ABOUTDOLPHIN_H_
diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
deleted file mode 100644
index d3aa1c2a93..0000000000
--- a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <vector>
-#include "GLInterface.h"
-#include "Android/TextureLoader.h"
-#include "Android/ButtonManager.h"
-
-extern void DrawButton(GLuint tex, float *coords);
-
-namespace ButtonManager
-{
-	std::vector<Button*> m_buttons;
-	std::map<std::string, InputDevice*> m_controllers;
-	// XXX: This needs to not be here so we can load the locations from file
-	// This will allow customizable button locations in the future
-	// These are the OpenGL on screen coordinates
-	float m_coords[][8] =	{ // X, Y, X, EY, EX, EY, EX, Y
-				{0.75f, -1.0f, 0.75f, -0.75f, 1.0f, -0.75f, 1.0f, -1.0f}, // A
-				{0.50f, -1.0f, 0.50f, -0.75f, 0.75f, -0.75f, 0.75f, -1.0f}, // B
-				{-0.10f, -1.0f, -0.10f, -0.80f, 0.10f, -0.80f, 0.10f, -1.0f}, // Start
-				};
-	const char *configStrings[] = {	"InputA",
-					"InputB",
-					"InputStart",
-					"InputX",
-					"InputY",
-					"InputZ",
-					"DPadUp",
-					"DPadDown",
-					"DPadLeft",
-					"DPadRight",
-					"MainUp",
-					"MainDown",
-					"MainLeft",
-					"MainRight",
-					"CStickUp",
-					"CStickDown",
-					"CStickLeft",
-					"CStickRight",
-					"InputL",
-					"InputR" };
-	const int configStringNum = 20;
-	
-	void AddBind(std::string dev, sBind *bind)
-	{
-		auto it = m_controllers.find(dev);
-		if (it != m_controllers.end())
-		{
-			it->second->AddBind(bind);
-			return;
-		}
-		m_controllers[dev] = new InputDevice(dev);
-		m_controllers[dev]->AddBind(bind);
-	}
-
-	void Init()
-	{
-		// Initialize our touchscreen buttons
-		m_buttons.push_back(new Button("ButtonA.png", BUTTON_A, m_coords[0]));
-		m_buttons.push_back(new Button("ButtonB.png", BUTTON_B, m_coords[1]));
-		m_buttons.push_back(new Button("ButtonStart.png", BUTTON_START, m_coords[2]));
-
-		// Init our controller bindings
-		IniFile ini;
-		ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
-		for (int a = 0; a < configStringNum; ++a)
-		{
-			BindType type;
-			int bindnum;
-			char dev[128];
-			bool hasbind = false;
-			char modifier = 0;
-			std::string value;
-			ini.Get("Android", configStrings[a], &value, "None");
-			if (value == "None")
-				continue;
-			if (std::string::npos != value.find("Axis"))
-			{
-				hasbind = true;
-				type = BIND_AXIS;
-				sscanf(value.c_str(), "Device '%[^\']'-Axis %d%c", dev, &bindnum, &modifier);	
-			}
-			else if (std::string::npos != value.find("Button"))  
-			{
-				hasbind = true;
-				type = BIND_BUTTON;
-				sscanf(value.c_str(), "Device '%[^\']'-Button %d", dev, &bindnum);
-			}
-			if (hasbind)
-				AddBind(std::string(dev), new sBind((ButtonType)a, type, bindnum, modifier == '-' ? -1.0f : 1.0f));
-		}
-
-	}
-	bool GetButtonPressed(ButtonType button)
-	{
-		bool pressed = false;
-		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-			if ((*it)->GetButtonType() == button)
-				pressed = (*it)->Pressed();
-
-		for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
-			pressed |= it->second->ButtonValue(button);
-
-		return pressed;
-	}
-	float GetAxisValue(ButtonType axis)
-	{
-		auto it = m_controllers.begin();
-		if (it == m_controllers.end())
-			return 0.0f;
-		return it->second->AxisValue(axis); 
-	}
-	void TouchEvent(int action, float x, float y)
-	{
-		// Actions
-		// 0 is press
-		// 1 is let go
-		// 2 is move
-		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-		{
-			float *coords = (*it)->GetCoords();
-			if (	x >= coords[0] &&
-				x <= coords[4] &&
-				y >= coords[1] &&
-				y <= coords[3])
-			{
-				if (action == 0)
-					(*it)->SetState(BUTTON_PRESSED);
-				if (action == 1)
-					(*it)->SetState(BUTTON_RELEASED);
-				if (action == 2)
-					; // XXX: Be used later for analog stick
-			}
-		}
-	}
-
-	void GamepadEvent(std::string dev, int button, int action)
-	{
-		auto it = m_controllers.find(dev);
-		if (it != m_controllers.end())
-		{
-			it->second->PressEvent(button, action);
-			return;
-		}
-		m_controllers[dev] = new InputDevice(dev);
-		m_controllers[dev]->PressEvent(button, action);
-	}
-	void GamepadAxisEvent(std::string dev, int axis, float value)
-	{
-		auto it = m_controllers.find(dev);
-		if (it != m_controllers.end())
-		{
-			it->second->AxisEvent(axis, value);
-			return;
-		}
-		m_controllers[dev] = new InputDevice(dev);
-		m_controllers[dev]->AxisEvent(axis, value);
-	}
-	void Shutdown()
-	{
-		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-			delete *it;
-		for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
-			delete it->second;
-	}
-
-	void DrawButtons()
-	{
-		// XXX: Make platform specific drawing
-	}
-	
-	// InputDevice
-	void InputDevice::PressEvent(int button, int action)
-	{
-		m_buttons[button] = action == 0 ? true : false;
-	}
-	void InputDevice::AxisEvent(int axis, float value)
-	{
-		m_axises[axis] = value;
-	}
-	bool InputDevice::ButtonValue(ButtonType button)
-	{
-		auto it = m_binds.find(button);
-		if (it == m_binds.end())
-			return false;
-		if (it->second->m_bindtype == BIND_BUTTON)
-			return m_buttons[it->second->m_bind];
-		else
-			return AxisValue(button);
-	}
-	float InputDevice::AxisValue(ButtonType axis)
-	{
-		auto it = m_binds.find(axis);
-		if (it == m_binds.end())
-			return 0.0f;
-		if (it->second->m_bindtype == BIND_BUTTON)
-			return ButtonValue(axis);
-		else		
-			return m_axises[it->second->m_bind] * it->second->m_neg;
-	}
-	
-}
diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h
deleted file mode 100644
index bc5204d9bf..0000000000
--- a/Source/Core/DolphinWX/Src/Android/ButtonManager.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#pragma once
-
-#include <string>
-#include <map>
-#include "CommonPaths.h"
-#include "Android/TextureLoader.h"
-#include "VideoBackendBase.h"
-
-namespace ButtonManager
-{
-	enum ButtonType
-	{
-		BUTTON_A = 0,
-		BUTTON_B,
-		BUTTON_START,
-		BUTTON_X,
-		BUTTON_Y,
-		BUTTON_Z,
-		BUTTON_UP,
-		BUTTON_DOWN,
-		BUTTON_LEFT,
-		BUTTON_RIGHT,
-		STICK_MAIN_UP,
-		STICK_MAIN_DOWN,
-		STICK_MAIN_LEFT,
-		STICK_MAIN_RIGHT,
-		STICK_C_UP,
-		STICK_C_DOWN,
-		STICK_C_LEFT,
-		STICK_C_RIGHT,
-		TRIGGER_L,
-		TRIGGER_R
-	};
-	enum ButtonState
-	{
-		BUTTON_RELEASED = 0,
-		BUTTON_PRESSED = 1
-	};
-	enum BindType
-	{
-		BIND_BUTTON = 0,
-		BIND_AXIS
-	};
-	class Button
-	{
-	private:
-		int m_tex;
-		ButtonType m_button;
-		ButtonState m_state;
-		float m_coords[8];
-	public:
-		Button(std::string filename, ButtonType button, float *coords)
-		{
-			u32 width, height;
-			char *image;
-			// image = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str(), width, height);
-			// XXX: Make platform specific drawing
-			
-			m_button = button;
-			memcpy(m_coords, coords, sizeof(float) * 8);
-			m_state = BUTTON_RELEASED;
-		}
-		Button(ButtonType button)
-		{
-			m_button = button;
-			m_state = BUTTON_RELEASED;
-		}
-		void SetState(ButtonState state) { m_state = state; }
-		bool Pressed() { return m_state == BUTTON_PRESSED; }
-		ButtonType GetButtonType() { return m_button; }
-		GLuint GetTexture() { return m_tex; }
-		float *GetCoords() { return m_coords; }
-			
-		~Button() { }
-	};
-
-	struct sBind
-	{
-		const ButtonType m_buttontype;
-		const BindType m_bindtype;
-		const int m_bind;
-		const float m_neg;
-		sBind(ButtonType buttontype, BindType bindtype, int bind, float neg) 
-			: m_buttontype(buttontype), m_bindtype(bindtype), m_bind(bind), m_neg(neg) 
-		{}
-	};
-	
-
-	class InputDevice
-	{
-	private:
-		std::string m_dev;
-		std::map<int, bool> m_buttons;
-		std::map<int, float> m_axises;
-		std::map<ButtonType, sBind*> m_binds;
-	public:
-		InputDevice(std::string dev)
-		{
-			m_dev = dev;
-		}
-		~InputDevice()
-		{
-			for (auto it = m_binds.begin(); it != m_binds.end(); ++it)
-			delete it->second;
-		}
-		void AddBind(sBind *bind) { m_binds[bind->m_buttontype] = bind; } 
-		void PressEvent(int button, int action);
-		void AxisEvent(int axis, float value);
-		bool ButtonValue(ButtonType button);
-		float AxisValue(ButtonType axis);
-	};
-
-	void Init();
-	void DrawButtons();
-	bool GetButtonPressed(ButtonType button);
-	float GetAxisValue(ButtonType axis);
-	void TouchEvent(int action, float x, float y);
-	void GamepadEvent(std::string dev, int button, int action);
-	void GamepadAxisEvent(std::string dev, int axis, float value);
-	void Shutdown();
-}
diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
deleted file mode 100644
index 093370da78..0000000000
--- a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "GLInterface.h"
-#include <png.h>
-char* LoadPNG(const char *filename, u32 &width, u32 &height)
-{
-	FILE         *infile;         /* PNG file pointer */
-	png_structp   png_ptr;        /* internally used by libpng */
-	png_infop     info_ptr;       /* user requested transforms */
-
-	char         *image_data;      /* raw png image data */
-	char         sig[8];           /* PNG signature array */
-	/*char         **row_pointers;   */
-
-	int           bit_depth;
-	int           color_type;
-
-	png_uint_32 _width;
-	png_uint_32 _height;
-	unsigned int rowbytes;         /* raw bytes at row n in image */
-
-	image_data = NULL;
-	unsigned int i;
-	png_bytepp row_pointers = NULL;
-
-	/* Open the file. */
-	infile = fopen(filename, "rb");
-	if (!infile) 
-		return NULL;
-
-	/*
-	*              13.3 readpng_init()
-	*/
-
-	/* Check for the 8-byte signature */
-	fread(sig, 1, 8, infile);
-
-	if (!png_check_sig((unsigned char *) sig, 8)) {
-		fclose(infile);
-		return NULL;
-	}
-
-	/* 
-	* Set up the PNG structs 
-	*/
-	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (!png_ptr) {
-		fclose(infile);
-		return NULL;    /* out of memory */
-	}
-
-	info_ptr = png_create_info_struct(png_ptr);
-	if (!info_ptr) {
-		png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
-		fclose(infile);
-		return NULL;    /* out of memory */
-	}
-
-
-	/*
-	* block to handle libpng errors, 
-	* then check whether the PNG file had a bKGD chunk
-	*/
-	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-		fclose(infile);
-		return NULL;
-	}
-
-	/* 
-	* takes our file stream pointer (infile) and 
-	* stores it in the png_ptr struct for later use.
-	*/
-	/* png_ptr->io_ptr = (png_voidp)infile;*/
-	png_init_io(png_ptr, infile);
-
-	/*
-	* lets libpng know that we already checked the 8 
-	* signature bytes, so it should not expect to find 
-	* them at the current file pointer location
-	*/
-	png_set_sig_bytes(png_ptr, 8);
-
-	/* Read the image */
-
-	/*
-	* reads and processes not only the PNG file's IHDR chunk 
-	* but also any other chunks up to the first IDAT 
-	* (i.e., everything before the image data).
-	*/
-
-	/* read all the info up to the image data  */
-	png_read_info(png_ptr, info_ptr);
-
-	png_get_IHDR(png_ptr, info_ptr, &_width, &_height, &bit_depth, 
-	&color_type, NULL, NULL, NULL);
-
-	/* Set up some transforms. */
-	if (bit_depth > 8) 
-		png_set_strip_16(png_ptr);
-	
-	if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) 
-		png_set_gray_to_rgb(png_ptr);
-
-	if (color_type == PNG_COLOR_TYPE_PALETTE) 
-		png_set_palette_to_rgb(png_ptr);
-
-	/* Update the png info struct.*/
-	png_read_update_info(png_ptr, info_ptr);
-
-	/* Rowsize in bytes. */
-	rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-
-
-	/* Allocate the image_data buffer. */
-	if ((image_data = (char *) malloc(rowbytes * _height))==NULL) {
-		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-		return NULL;
-	}
-
-	if ((row_pointers = (png_bytepp)malloc(_height*sizeof(png_bytep))) == NULL) {
-		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-		free(image_data);
-		image_data = NULL;
-		return NULL;
-	}
-
-
-	/* set the individual row_pointers to point at the correct offsets */
-
-	for (i = 0;  i < _height;  ++i)
-		row_pointers[i] = (png_byte*)(image_data + i*rowbytes);
-
-
-	/* now we can go ahead and just read the whole image */
-	png_read_image(png_ptr, row_pointers);
-
-	/* and we're done!  (png_read_end() can be omitted if no processing of
-	* post-IDAT text/time/etc. is desired) */
-
-	/* Clean up. */
-	free(row_pointers);
-
-	/* Clean up. */
-	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-	fclose(infile);
-
-	width = (u32)_width;
-	height = (u32)_height;
-	return image_data;
-}
diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.h b/Source/Core/DolphinWX/Src/Android/TextureLoader.h
deleted file mode 100644
index db55078f1d..0000000000
--- a/Source/Core/DolphinWX/Src/Android/TextureLoader.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "GLInterface.h"
-
-char* LoadPNG(const char *filename, u32 &width, u32 &height);
-
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
deleted file mode 100644
index 1fe6f750ba..0000000000
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ /dev/null
@@ -1,660 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-#include "CheatsWindow.h"
-#include "ActionReplay.h"
-#include "CommonPaths.h"
-#include "Core.h"
-#include "ConfigManager.h"
-#include "VolumeHandler.h"
-#include "ISOProperties.h"
-#include "HW/Memmap.h"
-#include "Frame.h"
-#include "WxUtils.h"
-
-#define MAX_CHEAT_SEARCH_RESULTS_DISPLAY	256
-const wxString title = _("Cheats Manager");
-
-extern std::vector<ActionReplay::ARCode> arCodes;
-extern CFrame* main_frame;
-
-// meh
-static wxCheatsWindow *g_cheat_window;
-
-wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
-	: wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxDIALOG_NO_PARENT)
-{
-	::g_cheat_window = this;
-
-	// Create the GUI controls
-	Init_ChildControls();
-
-	// load codes
-	UpdateGUI();
-
-	SetSize(wxSize(-1, 600));
-	Center();
-	Show();
-}
-
-wxCheatsWindow::~wxCheatsWindow()
-{
-	main_frame->g_CheatsWindow = NULL;
-	::g_cheat_window = NULL;
-}
-
-void wxCheatsWindow::Init_ChildControls()
-{
-	wxPanel* const panel = new wxPanel(this);
-
-	// Main Notebook
-	m_Notebook_Main = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-
-	// --- Tabs ---
-	// $ Cheats List Tab
-	m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-
-	m_CheckListBox_CheatsList = new wxCheckListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_CheatStringList, wxLB_HSCROLL, wxDefaultValidator);
-	m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this);
-	m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this);
-
-	m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize);
-	m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize);
-
-	m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: "),  wxDefaultPosition, wxDefaultSize);
-	m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL);
-
-	wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL);
-	sGroupBoxInfo->Add(m_Label_Codename, 0, wxALL, 5);
-	sGroupBoxInfo->Add(m_Label_NumCodes, 0, wxALL, 5);
-	sGroupBoxInfo->Add(m_ListBox_CodesList, 1, wxALL, 5);
-
-	wxBoxSizer* sizer_tab_cheats = new wxBoxSizer(wxHORIZONTAL);
-	sizer_tab_cheats->Add(m_CheckListBox_CheatsList, 1, wxEXPAND | wxTOP | wxBOTTOM | wxLEFT, 10);
-	sizer_tab_cheats->Add(sGroupBoxInfo, 0, wxALIGN_LEFT | wxEXPAND | wxALL, 5);
-
-	m_Tab_Cheats->SetSizerAndFit(sizer_tab_cheats);	
-
-	// $ Cheat Search Tab
-	wxPanel* const tab_cheat_search = new CheatSearchTab(m_Notebook_Main);
-
-	// $ Log Tab
-	m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-
-	wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update"));
-	button_updatelog->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this);
-
-	m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging"));
-	m_CheckBox_LogAR->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this);
-
-	m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging());
-	m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
-
-	wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
-	HStrip1->Add(m_CheckBox_LogAR, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
-	HStrip1->Add(button_updatelog, 0, wxALL, 5);
-
-	wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL);
-	sTabLog->Add(HStrip1, 0, wxALL, 5);
-	sTabLog->Add(m_TextCtrl_Log, 1, wxALL|wxEXPAND, 5);
-
-	m_Tab_Log->SetSizerAndFit(sTabLog);
-
-	// Add Tabs to Notebook
-	m_Notebook_Main->AddPage(m_Tab_Cheats, _("AR Codes"));
-	m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook_Main);
-	m_Notebook_Main->AddPage(m_geckocode_panel, _("Gecko Codes"));
-	m_Notebook_Main->AddPage(tab_cheat_search, _("Cheat Search"));
-	m_Notebook_Main->AddPage(m_Tab_Log, _("Logging"));
-
-	// Button Strip
-	button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize);
-	button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
-	wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize);
-	button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
-
-	Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this);
-
-	wxStdDialogButtonSizer* const sButtons = new wxStdDialogButtonSizer();
-	sButtons->AddButton(button_apply);
-	sButtons->AddButton(button_cancel);
-	sButtons->Realize();
-
-	wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(m_Notebook_Main, 1, wxEXPAND|wxALL, 5);
-	sMain->Add(sButtons, 0, wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, 5);
-	panel->SetSizerAndFit(sMain);
-
-	wxBoxSizer* const frame_szr = new wxBoxSizer(wxVERTICAL);
-	frame_szr->Add(panel, 1, wxEXPAND);
-	SetSizerAndFit(frame_szr);
-}
-
-CheatSearchTab::CheatSearchTab(wxWindow* const parent)
-	: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
-{
-	// first scan button
-	btnInitScan = new wxButton(this, -1, _("New Scan"));
-	btnInitScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::StartNewSearch, this);
-
-	// next scan button
-	btnNextScan = new wxButton(this, -1, _("Next Scan"));
-	btnNextScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::FilterCheatSearchResults, this);
-	btnNextScan->Disable();
-
-	// data size radio buttons
-	size_radiobtn.rad_8 = new wxRadioButton(this, -1, _("8 bit"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-	size_radiobtn.rad_16 = new wxRadioButton(this, -1, _("16 bit"));
-	size_radiobtn.rad_32 = new wxRadioButton(this, -1, _("32 bit"));
-	size_radiobtn.rad_8->SetValue(true);
-
-	// data sizes groupbox
-	wxStaticBoxSizer* const sizer_cheat_new_search = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Data Size"));
-	sizer_cheat_new_search->Add(size_radiobtn.rad_8, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
-	sizer_cheat_new_search->Add(size_radiobtn.rad_16, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
-	sizer_cheat_new_search->Add(size_radiobtn.rad_32, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
-
-	// result controls
-	lbox_search_results = new wxListBox(this, -1, wxDefaultPosition, wxDefaultSize);
-	label_results_count = new wxStaticText(this, -1, _("Count:"));
-
-	// create AR code button
-	wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code"));
-	button_cheat_search_copy_address->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::CreateARCode, this);
-
-	// results groupbox
-	wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results"));
-	sizer_cheat_search_results->Add(label_results_count, 0, wxALIGN_LEFT | wxALL, 5);
-	sizer_cheat_search_results->Add(lbox_search_results, 1, wxEXPAND | wxALL, 5);
-	sizer_cheat_search_results->Add(button_cheat_search_copy_address, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
-
-	// Search value radio buttons
-	value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, _("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-	value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, wxT(""));
-	value_x_radiobtn.rad_oldvalue->SetValue(true);
-
-	// search value textbox
-	textctrl_value_x = new wxTextCtrl(this, -1, wxT("0x0"), wxDefaultPosition, wxSize(96,-1));
-	textctrl_value_x->Bind(wxEVT_SET_FOCUS, &CheatSearchTab::ApplyFocus, this);
-
-	wxBoxSizer* const sizer_cheat_filter_text = new wxBoxSizer(wxHORIZONTAL);
-	sizer_cheat_filter_text->Add(value_x_radiobtn.rad_uservalue, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5);
-	sizer_cheat_filter_text->Add(textctrl_value_x, 1, wxALIGN_CENTER_VERTICAL, 5);
-
-	// value groupbox
-	wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, _("Value"));
-	sizer_cheat_search_filter_x->Add(value_x_radiobtn.rad_oldvalue, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	sizer_cheat_search_filter_x->Add(sizer_cheat_filter_text, 0, wxALL | wxEXPAND, 5);
-
-	// filter types in the compare dropdown
-	static const wxString searches[] = {
-		_("Unknown"),
-		_("Not Equal"),
-		_("Equal"),
-		_("Greater Than"),
-		_("Less Than"),
-	// TODO: Implement between search.
-		//_("Between"),
-	};
-
-	search_type = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, sizeof(searches)/sizeof(*searches), searches);
-	search_type->Select(0);
-
-	wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, _("Search Filter"));
-	sizer_cheat_search_filter->Add(sizer_cheat_search_filter_x, 0, wxALL | wxEXPAND, 5);
-	sizer_cheat_search_filter->Add(search_type, 0, wxALL, 5);
-
-	// left sizer
-	wxBoxSizer* const sizer_left = new wxBoxSizer(wxVERTICAL);
-	sizer_left->Add(sizer_cheat_search_results, 1, wxEXPAND, 5);
-
-	// button sizer
-	wxBoxSizer* boxButtons = new wxBoxSizer(wxHORIZONTAL);
-	boxButtons->Add(btnInitScan, 1, wxRIGHT, 5);
-	boxButtons->Add(btnNextScan, 1);
-
-	// right sizer
-	wxBoxSizer* const sizer_right = new wxBoxSizer(wxVERTICAL);
-	sizer_right->Add(sizer_cheat_new_search, 0, wxBOTTOM, 5);
-	sizer_right->Add(sizer_cheat_search_filter, 0, wxEXPAND | wxBOTTOM, 5);
-	sizer_right->AddStretchSpacer(1);
-	sizer_right->Add(boxButtons, 0, wxTOP | wxEXPAND, 5);
-
-	// main sizer
-	wxBoxSizer* const sizer_main = new wxBoxSizer(wxHORIZONTAL);
-	sizer_main->Add(sizer_left, 1, wxEXPAND | wxALL, 5);
-	sizer_main->Add(sizer_right, 0, wxEXPAND | wxALL, 5);
-
-	SetSizerAndFit(sizer_main);
-}
-
-void wxCheatsWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED (event))
-{
-	Close();
-}
-
-void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev)
-{
-	Destroy();
-}
-
-// load codes for a new ISO ID
-void wxCheatsWindow::UpdateGUI()
-{
-	// load code
-	m_gameini_default_path = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
-	m_gameini_default.Load(m_gameini_default_path);
-	m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
-	m_gameini_local.Load(m_gameini_local_path, true);
-	Load_ARCodes();
-	Load_GeckoCodes();
-
-	// enable controls
-	button_apply->Enable(Core::IsRunning());
-
-	// write the ISO name in the title
-	if (Core::IsRunning())
-		SetTitle(title + ": " + Core::g_CoreStartupParameter.GetUniqueID() + " - " + Core::g_CoreStartupParameter.m_strName);
-	else
-		SetTitle(title);
-}
-
-void wxCheatsWindow::Load_ARCodes()
-{
-	using namespace ActionReplay;
-
-	m_CheckListBox_CheatsList->Clear();
-
-	if (!Core::IsRunning())
-		return;
-
-	indexList.clear();
-	size_t size = GetCodeListSize();
-	for (size_t i = 0; i < size; i++)
-	{
-		ARCode code = GetARCode(i);
-		ARCodeIndex ind;
-		u32 index = m_CheckListBox_CheatsList->Append(StrToWxStr(code.name));
-		m_CheckListBox_CheatsList->Check(index, code.active);
-		ind.index = i;
-		ind.uiIndex = index;
-		indexList.push_back(ind);
-	}
-}
-
-void wxCheatsWindow::Load_GeckoCodes()
-{
-	m_geckocode_panel->LoadCodes(m_gameini_local, Core::g_CoreStartupParameter.GetUniqueID(), true);
-}
-
-void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (event))
-{
-	using namespace ActionReplay;
-
-	int index = m_CheckListBox_CheatsList->GetSelection();
-	for (size_t i = 0; i < indexList.size(); i++)
-	{
-		if ((int)indexList[i].uiIndex == index)
-		{
-			ARCode code = GetARCode(i);
-			m_Label_Codename->SetLabel(_("Name: ") + StrToWxStr(code.name));
-			char text[CHAR_MAX];
-			char* numcodes = text;
-			sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size());
-			m_Label_NumCodes->SetLabel(StrToWxStr(numcodes));
-			m_ListBox_CodesList->Clear();
-
-			for (size_t j = 0; j < code.ops.size(); j++)
-			{
-				char text2[CHAR_MAX];
-				char* ops = text2;
-				sprintf(ops, "%08x %08x", code.ops[j].cmd_addr, code.ops[j].value);
-				m_ListBox_CodesList->Append(StrToWxStr(ops));
-			}
-		}
-	}
-}
-
-void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED (event))
-{
-	int index = m_CheckListBox_CheatsList->GetSelection();
-	for (size_t i = 0; i < indexList.size(); i++)
-	{
-		if ((int)indexList[i].uiIndex == index)
-		{
-			ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(index), indexList[i].index);
-		}
-	}
-}
-
-void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
-{
-	// Apply AR Code changes
-	for (size_t i = 0; i < indexList.size(); i++)
-	{
-		ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(indexList[i].uiIndex), indexList[i].index);
-	}
-
-	// Apply Gecko Code changes
-	Gecko::SetActiveCodes(m_geckocode_panel->GetCodes());
-
-	// Save gameini, with changed gecko codes
-	if (m_gameini_local_path.size())
-	{
-		Gecko::SaveCodes(m_gameini_local, m_geckocode_panel->GetCodes());
-		m_gameini_local.Save(m_gameini_local_path);
-	}
-
-	ev.Skip();
-}
-
-void wxCheatsWindow::OnEvent_ButtonUpdateLog_Press(wxCommandEvent& WXUNUSED (event))
-{
-	m_TextCtrl_Log->Clear();
-	const std::vector<std::string> &arLog = ActionReplay::GetSelfLog();
-	for (u32 i = 0; i < arLog.size(); i++)
-	{
-		m_TextCtrl_Log->AppendText(StrToWxStr(arLog[i]));
-	}
-}
-
-void wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& WXUNUSED (event))
-{
-	ActionReplay::EnableSelfLogging(m_CheckBox_LogAR->IsChecked());
-}
-
-void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED (event))
-{
-	const u8* const memptr = Memory::GetPointer(0);
-	if (NULL == memptr)
-	{
-		PanicAlertT("A game is not currently running.");
-		return;
-	}
-
-	// Determine the user-selected data size for this search.
-	search_type_size =
-		size_radiobtn.rad_8->GetValue() +
-		(size_radiobtn.rad_16->GetValue() << 1) +
-		(size_radiobtn.rad_32->GetValue() << 2);
-
-	// Set up the search results efficiently to prevent automatic re-allocations.
-	search_results.clear();
-	search_results.reserve(Memory::RAM_SIZE / search_type_size);
-
-	// Enable the "Next Scan" button.
-	btnNextScan->Enable();
-
-	CheatSearchResult r;
-	// can I assume cheatable values will be aligned like this?
-	for (u32 addr = 0; addr != Memory::RAM_SIZE; addr += search_type_size)
-	{
-		r.address = addr;
-		memcpy(&r.old_value, memptr + addr, search_type_size);
-		search_results.push_back(r);
-	}
-
-	UpdateCheatSearchResultsList();
-}
-
-void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
-{
-	const u8* const memptr = Memory::GetPointer(0);
-	if (NULL == memptr)
-	{
-		PanicAlertT("A game is not currently running.");
-		return;
-	}
-
-	std::vector<CheatSearchResult>::iterator
-		i = search_results.begin(),
-		e = search_results.end();
-
-	// Set up the sub-search results efficiently to prevent automatic re-allocations.
-	std::vector<CheatSearchResult> filtered_results;
-	filtered_results.reserve(search_results.size());
-
-
-	// Determine the selected filter
-	// 1 : equal
-	// 2 : greater-than
-	// 4 : less-than
-
-	const int filters[] = {7, 6, 1, 2, 4};
-	int filter_mask = filters[search_type->GetSelection()];
-
-	if (value_x_radiobtn.rad_oldvalue->GetValue())	// using old value comparison
-	{
-		for (; i!=e; ++i)
-		{
-			// with big endian, can just use memcmp for ><= comparison
-			int cmp_result = memcmp(memptr + i->address, &i->old_value, search_type_size);
-			if (cmp_result < 0)
-				cmp_result = 4;
-			else
-				cmp_result = cmp_result ? 2 : 1;
-
-			if (cmp_result & filter_mask)
-			{
-				memcpy(&i->old_value, memptr + i->address, search_type_size);
-				filtered_results.push_back(*i);
-			}
-		}
-	}
-	else	// using user entered x value comparison
-	{
-		u32 user_x_val;
-
-		// parse the user entered x value
-		if (filter_mask != 7) // don't need the value for the "None" filter
-		{
-			unsigned long parsed_x_val = 0;
-			wxString x_val = textctrl_value_x->GetValue();
-
-			if (!x_val.ToULong(&parsed_x_val, 0))
-			{
-				PanicAlertT("You must enter a valid decimal, hexadecimal or octal value.");
-				return;
-			}
-
-			user_x_val = (u32)parsed_x_val;
-
-			// #ifdef LIL_ENDIAN :p
-			switch (search_type_size)
-			{
-			case 1 :
-				break;
-			case 2 :
-				*(u16*)&user_x_val = Common::swap16((u8*)&user_x_val);
-				break;
-			case 4 :
-				user_x_val = Common::swap32(user_x_val);
-				break;
-			}
-			// #elseif BIG_ENDIAN
-			// would have to move <u32 vals (8/16bit) to start of the user_x_val for the comparisons i use below
-			// #endif
-		}
-
-		for (; i!=e; ++i)
-		{
-			// with big endian, can just use memcmp for ><= comparison
-			int cmp_result = memcmp(memptr + i->address, &user_x_val, search_type_size);
-			if (cmp_result < 0)
-				cmp_result = 4;
-			else if (cmp_result)
-				cmp_result = 2;
-			else
-				cmp_result = 1;
-
-			if (cmp_result & filter_mask)
-			{
-				memcpy(&i->old_value, memptr + i->address, search_type_size);
-				filtered_results.push_back(*i);
-			}
-		}
-	}
-
-	search_results.swap(filtered_results);
-
-	UpdateCheatSearchResultsList();
-}
-
-void CheatSearchTab::ApplyFocus(wxEvent& ev)
-{
-	ev.Skip(true);
-	value_x_radiobtn.rad_uservalue->SetValue(true);
-}
-
-void CheatSearchTab::UpdateCheatSearchResultsList()
-{
-	lbox_search_results->Clear();
-
-	wxString count_label = _("Count:") + wxString::Format(wxT(" %lu"),
-		(unsigned long)search_results.size());
-	if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
-	{
-		count_label += _(" (too many to display)");
-	}
-	else
-	{
-		std::vector<CheatSearchResult>::const_iterator
-			i = search_results.begin(),
-			e = search_results.end();
-		for (; i!=e; ++i)
-		{
-			u32 display_value = i->old_value;
-
-			// #ifdef LIL_ENDIAN :p
-			switch (search_type_size)
-			{
-			case 1 :
-				break;
-			case 2 :
-				*(u16*)&display_value = Common::swap16((u8*)&display_value);
-				break;
-			case 4 :
-				display_value = Common::swap32(display_value);
-				break;
-			}
-			// #elseif BIG_ENDIAN
-			// need to do some stuff in here (for 8 and 16bit) for bigendian
-			// #endif
-
-			static wxChar rowfmt[] = wxT("0x%08x    0x%0|x    %u/%i");
-			rowfmt[14] = (wxChar)(wxT('0') + search_type_size*2);
-
-			lbox_search_results->Append(
-				wxString::Format(rowfmt, i->address, display_value, display_value, display_value));
-		}
-	}
-
-	label_results_count->SetLabel(count_label);
-}
-
-void CheatSearchTab::CreateARCode(wxCommandEvent&)
-{
-	const int sel = lbox_search_results->GetSelection();
-	if (sel >= 0)
-	{
-		const u32 address = search_results[sel].address | ((search_type_size & ~1) << 24);
-
-		CreateCodeDialog arcode_dlg(this, address);
-		arcode_dlg.ShowModal();
-	}
-}
-
-CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
-	: wxDialog(parent, -1, _("Create AR Code"), wxDefaultPosition)
-	, code_address(address)
-{
-	wxStaticText* const label_name = new wxStaticText(this, -1, _("Name: "));
-	textctrl_name = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(256,-1));
-
-	wxStaticText* const label_code = new wxStaticText(this, -1, _("Code: "));
-	textctrl_code = new wxTextCtrl(this, -1, wxString::Format(wxT("0x%08x"), address));
-	textctrl_code->Disable();
-
-	wxStaticText* const label_value = new wxStaticText(this, -1, _("Value: "));
-	textctrl_value = new wxTextCtrl(this, -1, wxT("0"));
-
-	checkbox_use_hex = new wxCheckBox(this, -1, _("Use Hex"));
-	checkbox_use_hex->SetValue(true);
-
-	wxBoxSizer* const sizer_value_label = new wxBoxSizer(wxHORIZONTAL);
-	sizer_value_label->Add(label_value, 0, wxRIGHT, 5);
-	sizer_value_label->Add(checkbox_use_hex);
-
-	// main sizer
-	wxBoxSizer* const sizer_main = new wxBoxSizer(wxVERTICAL);
-	sizer_main->Add(label_name, 0, wxALL, 5);
-	sizer_main->Add(textctrl_name, 0, wxALL, 5);
-	sizer_main->Add(label_code, 0, wxALL, 5);
-	sizer_main->Add(textctrl_code, 0, wxALL, 5);
-	sizer_main->Add(sizer_value_label, 0, wxALL, 5);
-	sizer_main->Add(textctrl_value, 0, wxALL, 5);
-	sizer_main->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxALL, 5); 
-
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressOK, this, wxID_OK);
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressCancel, this, wxID_CANCEL);
-	Bind(wxEVT_CLOSE_WINDOW, &CreateCodeDialog::OnEvent_Close, this);
-
-	SetSizerAndFit(sizer_main);
-	SetFocus();
-}
-
-void CreateCodeDialog::PressOK(wxCommandEvent& ev)
-{
-	const wxString code_name = textctrl_name->GetValue();
-	if (code_name.empty())
-	{
-		PanicAlertT("You must enter a name!");
-		return;
-	}
-
-	long code_value;
-	if (!textctrl_value->GetValue().ToLong(&code_value, 10 + checkbox_use_hex->GetValue()*6))
-	{
-		PanicAlertT("Invalid Value!");
-		return;
-	}
-
-	//wxString full_code = textctrl_code->GetValue();
-	//full_code += wxT(' ');
-	//full_code += wxString::Format(wxT("0x%08x"), code_value);
-
-	// create the new code
-	ActionReplay::ARCode new_cheat;
-	new_cheat.active = false;
-	new_cheat.name = WxStrToStr(code_name);
-	const ActionReplay::AREntry new_entry(code_address, code_value);
-	new_cheat.ops.push_back(new_entry);
-
-	// pretty hacky - add the code to the gameini
-	{
-	CISOProperties isoprops(SConfig::GetInstance().m_LastFilename, this);
-	// add the code to the isoproperties arcode list
-	arCodes.push_back(new_cheat);
-	// save the gameini
-	isoprops.SaveGameConfig();
-	isoprops.ActionReplayList_Load();	// loads the new arcodes
-	//ActionReplay::UpdateActiveList();
-	}
-
-	// refresh arcode list in other tab
-	::g_cheat_window->Load_ARCodes();
-
-	Close();
-}
-
-void CreateCodeDialog::PressCancel(wxCommandEvent& ev)
-{
-	Close();
-}
-
-void CreateCodeDialog::OnEvent_Close(wxCloseEvent& ev)
-{
-	Destroy();
-}
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h
deleted file mode 100644
index ee2d0e1892..0000000000
--- a/Source/Core/DolphinWX/Src/CheatsWindow.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __CHEATSWINDOW_H__
-#define __CHEATSWINDOW_H__
-
-#include <wx/wx.h>
-#include <wx/sizer.h>
-#include <wx/filepicker.h>
-#include <wx/statbmp.h>
-#include <wx/imaglist.h>
-#include <wx/treectrl.h>
-#include <wx/gbsizer.h>
-#include <wx/textctrl.h>
-#include <wx/notebook.h>
-#include <wx/mimetype.h>
-#include <wx/colour.h>
-#include <wx/listbox.h>
-
-#include <string>
-#include <vector>
-
-#include "ActionReplay.h"
-
-#include "GeckoCodeDiag.h"
-
-#include "Filesystem.h"
-#include "IniFile.h"
-
-class CreateCodeDialog : public wxDialog
-{
-public:
-	CreateCodeDialog(wxWindow* const parent, const u32 address);
-
-protected:
-
-	const u32 code_address;
-
-	wxTextCtrl *textctrl_name, *textctrl_code, *textctrl_value;
-	wxCheckBox *checkbox_use_hex;
-
-	void PressOK(wxCommandEvent&);
-	void PressCancel(wxCommandEvent&);
-	void OnEvent_Close(wxCloseEvent& ev);
-};
-
-class CheatSearchTab : public wxPanel
-{
-public:
-	CheatSearchTab(wxWindow* const parent);
-
-protected:
-
-	class CheatSearchResult
-	{
-	public:
-		CheatSearchResult() : address(0), old_value(0) {}
-
-		u32 address;
-		u32 old_value;
-	};
-
-	std::vector<CheatSearchResult>	search_results;
-	unsigned int search_type_size;
-
-	wxChoice* search_type;
-	wxListBox*	lbox_search_results;
-	wxStaticText* label_results_count;
-	wxTextCtrl*	textctrl_value_x;
-	wxButton *btnInitScan, *btnNextScan;
-
-	struct
-	{
-		wxRadioButton *rad_8, *rad_16, *rad_32;
-
-	} size_radiobtn;
-
-	struct
-	{
-		wxRadioButton *rad_oldvalue, *rad_uservalue;
-
-	} value_x_radiobtn;
-
-	void UpdateCheatSearchResultsList();
-	void StartNewSearch(wxCommandEvent& event);
-	void FilterCheatSearchResults(wxCommandEvent& event);
-	void CreateARCode(wxCommandEvent&);
-	void ApplyFocus(wxEvent&);
-};
-
-class wxCheatsWindow : public wxDialog
-{
-	friend class CreateCodeDialog;
-
-	public:
-		wxCheatsWindow(wxWindow* const parent);
-		~wxCheatsWindow();
-		void UpdateGUI();
-
-	protected:
-
-		struct ARCodeIndex {
-			u32 uiIndex;
-			size_t index;
-		};
-
-		// --- GUI Controls ---
-		wxButton* button_apply;
-		wxNotebook *m_Notebook_Main;
-
-		wxPanel *m_Tab_Cheats;
-		wxPanel *m_Tab_Log;
-
-		wxCheckBox *m_CheckBox_LogAR;
-
-		wxStaticText *m_Label_Codename;
-		wxStaticText *m_Label_NumCodes;
-
-		wxCheckListBox *m_CheckListBox_CheatsList;
-
-		wxTextCtrl *m_TextCtrl_Log;
-
-		wxListBox *m_ListBox_CodesList;
-
-		wxStaticBox *m_GroupBox_Info;
-
-		wxArrayString m_CheatStringList;
-
-		std::vector<ARCodeIndex> indexList;
-
-		Gecko::CodeConfigPanel *m_geckocode_panel;
-		IniFile m_gameini_default;
-		IniFile m_gameini_local;
-		std::string m_gameini_default_path;
-		std::string m_gameini_local_path;
-
-		void Init_ChildControls();
-
-		void Load_ARCodes();
-		void Load_GeckoCodes();
-
-		// --- Wx Events Handlers ---
-
-		// $ Close Button
-		void OnEvent_ButtonClose_Press(wxCommandEvent& event);
-		void OnEvent_Close(wxCloseEvent& ev);
-
-		// $ Cheats List
-		void OnEvent_CheatsList_ItemSelected(wxCommandEvent& event);
-		void OnEvent_CheatsList_ItemToggled(wxCommandEvent& event);
-
-		// $ Apply Changes Button
-		void OnEvent_ApplyChanges_Press(wxCommandEvent& event);
-
-		// $ Update Log Button
-		void OnEvent_ButtonUpdateLog_Press(wxCommandEvent& event);
-
-		// $ Enable Logging Checkbox
-		void OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& event);
-};
-
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
deleted file mode 100644
index 7da1226d64..0000000000
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ /dev/null
@@ -1,1343 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string> // System
-#include <vector>
-#include <algorithm>
-#include <functional>
-#include <wx/spinbutt.h>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileSearch.h"
-
-#include "Core.h" // Core
-#include "HW/EXI.h"
-#include "HW/SI.h"
-#include "HW/DSPHLE/DSPHLE.h"
-#include "HW/DSPLLE/DSPLLE.h"
-#include "HW/GCMemcard.h"
-#include "IPC_HLE/WII_IPC_HLE.h"
-#include "NANDContentLoader.h"
-
-#include "WxUtils.h"
-#include "Globals.h" // Local
-#include "ConfigMain.h"
-#include "ConfigManager.h"
-#include "SysConf.h"
-#include "Frame.h"
-#include "HotkeyDlg.h"
-#include "Main.h"
-#include "VideoBackendBase.h"
-#include "NetPlayProto.h"
-
-#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
-
-struct CPUCore
-{
-	int CPUid;
-	const char *name;
-};
-const CPUCore CPUCores[] = {
-	{0, wxTRANSLATE("Interpreter (VERY slow)")},
-#ifdef _M_ARM
-	{3, wxTRANSLATE("Arm JIT (experimental)")},
-#else
-	{1, wxTRANSLATE("JIT Recompiler (recommended)")},
-	{2, wxTRANSLATE("JITIL experimental recompiler")},
-#endif
-};
-
-extern CFrame* main_frame;
-
-// keep these in sync with CConfigMain::InitializeGUILists
-static const wxLanguage langIds[] =
-{
-	wxLANGUAGE_DEFAULT,
-	wxLANGUAGE_ARABIC,
-	wxLANGUAGE_CATALAN,
-	wxLANGUAGE_CHINESE_SIMPLIFIED,
-	wxLANGUAGE_CHINESE_TRADITIONAL,
-	wxLANGUAGE_CZECH,
-	wxLANGUAGE_DUTCH,
-	wxLANGUAGE_ENGLISH,
-	wxLANGUAGE_FARSI,
-	wxLANGUAGE_FRENCH,
-	wxLANGUAGE_GERMAN,
-	wxLANGUAGE_GREEK,
-	wxLANGUAGE_HEBREW,
-	wxLANGUAGE_HUNGARIAN,
-	wxLANGUAGE_ITALIAN,
-	wxLANGUAGE_JAPANESE,
-	wxLANGUAGE_KOREAN,
-	wxLANGUAGE_NORWEGIAN_BOKMAL,
-	wxLANGUAGE_POLISH,
-	wxLANGUAGE_PORTUGUESE,
-	wxLANGUAGE_PORTUGUESE_BRAZILIAN,
-	wxLANGUAGE_RUSSIAN,
-	wxLANGUAGE_SERBIAN,
-	wxLANGUAGE_SPANISH,
-	wxLANGUAGE_SWEDISH,
-	wxLANGUAGE_TURKISH,
-};
-
-// Strings for Device Selections
-#define DEV_NONE_STR		_trans("<Nothing>")
-#define DEV_DUMMY_STR		_trans("Dummy")
-
-#define SIDEV_STDCONT_STR	_trans("Standard Controller")
-#define SIDEV_STEERING_STR	_trans("Steering Wheel")
-#define SIDEV_DANCEMAT_STR	_trans("Dance Mat")
-#define SIDEV_BONGO_STR		_trans("TaruKonga (Bongos)")
-#define SIDEV_GBA_STR		"GBA"
-#define SIDEV_AM_BB_STR		_trans("AM-Baseboard")
-
-#define EXIDEV_MEMCARD_STR	_trans("Memory Card")
-#define EXIDEV_MIC_STR		_trans("Mic")
-#define EXIDEV_BBA_STR		"BBA"
-#define EXIDEV_AM_BB_STR	_trans("AM-Baseboard")
-#define EXIDEV_GECKO_STR	"USBGecko"
-
-#define WXSTR_TRANS(a)		wxString(wxGetTranslation(wxT(a)))
-#ifdef WIN32
-//only used with xgettext to be picked up as translatable string.
-//win32 does not have wx on its path, the provided wxALL_FILES 
-//translation does not work there.
-#define unusedALL_FILES wxTRANSLATE("All files (*.*)|*.*");
-#endif
-
-BEGIN_EVENT_TABLE(CConfigMain, wxDialog)
-
-EVT_CLOSE(CConfigMain::OnClose)
-EVT_BUTTON(wxID_OK, CConfigMain::OnOk)
-
-
-EVT_CHECKBOX(ID_CPUTHREAD, CConfigMain::CoreSettingsChanged)
-EVT_CHECKBOX(ID_IDLESKIP, CConfigMain::CoreSettingsChanged)
-EVT_CHECKBOX(ID_ENABLECHEATS, CConfigMain::CoreSettingsChanged)
-EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged)
-EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged)
-
-EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged)
-EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged)
-
-
-EVT_RADIOBOX(ID_DSPENGINE, CConfigMain::AudioSettingsChanged)
-EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::AudioSettingsChanged)
-EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged)
-EVT_CHECKBOX(ID_DUMP_AUDIO, CConfigMain::AudioSettingsChanged)
-EVT_CHECKBOX(ID_DPL2DECODER, CConfigMain::AudioSettingsChanged)
-EVT_CHOICE(ID_BACKEND, CConfigMain::AudioSettingsChanged)
-EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged)
-
-EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged)
-EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged)
-EVT_CHECKBOX(ID_INTERFACE_ONSCREENDISPLAYMESSAGES, CConfigMain::DisplaySettingsChanged)
-EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::DisplaySettingsChanged)
-EVT_BUTTON(ID_HOTKEY_CONFIG, CConfigMain::DisplaySettingsChanged)
-
-
-EVT_CHOICE(ID_GC_SRAM_LNG, CConfigMain::GCSettingsChanged)
-EVT_CHECKBOX(ID_GC_ALWAYS_HLE_BS2, CConfigMain::GCSettingsChanged)
-
-EVT_CHOICE(ID_GC_EXIDEVICE_SLOTA, CConfigMain::GCSettingsChanged)
-EVT_BUTTON(ID_GC_EXIDEVICE_SLOTA_PATH, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_EXIDEVICE_SLOTB, CConfigMain::GCSettingsChanged)
-EVT_BUTTON(ID_GC_EXIDEVICE_SLOTB_PATH, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_EXIDEVICE_SP1, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_SIDEVICE0, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_SIDEVICE1, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_SIDEVICE2, CConfigMain::GCSettingsChanged)
-EVT_CHOICE(ID_GC_SIDEVICE3, CConfigMain::GCSettingsChanged)
-
-
-EVT_CHECKBOX(ID_WII_IPL_SSV, CConfigMain::WiiSettingsChanged)
-EVT_CHECKBOX(ID_WII_IPL_E60, CConfigMain::WiiSettingsChanged)
-EVT_CHOICE(ID_WII_IPL_AR, CConfigMain::WiiSettingsChanged)
-EVT_CHOICE(ID_WII_IPL_LNG, CConfigMain::WiiSettingsChanged)
-
-EVT_CHECKBOX(ID_WII_SD_CARD, CConfigMain::WiiSettingsChanged)
-EVT_CHECKBOX(ID_WII_KEYBOARD, CConfigMain::WiiSettingsChanged)
-
-
-EVT_LISTBOX(ID_ISOPATHS, CConfigMain::ISOPathsSelectionChanged)
-EVT_CHECKBOX(ID_RECURSIVEISOPATH, CConfigMain::RecursiveDirectoryChanged)
-EVT_BUTTON(ID_ADDISOPATH, CConfigMain::AddRemoveISOPaths)
-EVT_BUTTON(ID_REMOVEISOPATH, CConfigMain::AddRemoveISOPaths)
-
-EVT_FILEPICKER_CHANGED(ID_DEFAULTISO, CConfigMain::DefaultISOChanged)
-EVT_DIRPICKER_CHANGED(ID_DVDROOT, CConfigMain::DVDRootChanged)
-EVT_FILEPICKER_CHANGED(ID_APPLOADERPATH, CConfigMain::ApploaderPathChanged)
-EVT_DIRPICKER_CHANGED(ID_NANDROOT, CConfigMain::NANDRootChanged)
-
-
-END_EVENT_TABLE()
-
-CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
-		const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	// Control refreshing of the ISOs list
-	bRefreshList = false;
-
-	CreateGUIControls();
-
-	// Update selected ISO paths
-	for(u32 i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); i++)
-	{
-		ISOPaths->Append(StrToWxStr(SConfig::GetInstance().m_ISOFolder[i]));
-	}
-}
-
-CConfigMain::~CConfigMain()
-{
-}
-
-void CConfigMain::SetSelectedTab(int tab)
-{
-	// TODO : this is just a quick and dirty way to do it, possible cleanup
-
-	switch (tab)
-	{
-	case ID_AUDIOPAGE:
-		Notebook->SetSelection(2);
-		break;
-	}
-}
-
-// Used to restrict changing of some options while emulator is running
-void CConfigMain::UpdateGUI()
-{
-	if(Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		// Disable the Core stuff on GeneralPage
-		CPUThread->Disable();
-		SkipIdle->Disable();
-		EnableCheats->Disable();
-		
-		CPUEngine->Disable();
-		_NTSCJ->Disable();
-
-		// Disable stuff on AudioPage
-		DSPEngine->Disable();
-		DSPThread->Disable();
-		DPL2Decoder->Disable();
-		Latency->Disable();
-
-		// Disable stuff on GamecubePage
-		GCSystemLang->Disable();
-		GCAlwaysHLE_BS2->Disable();
-
-		// Disable stuff on WiiPage
-		WiiScreenSaver->Disable();
-		WiiEuRGB60->Disable();
-		WiiAspectRatio->Disable();
-		WiiSystemLang->Disable();
-
-		// Disable stuff on PathsPage
-		PathsPage->Disable();
-	}
-}
-void CConfigMain::InitializeGUILists()
-{
-	// General page
-	// Framelimit
-	arrayStringFor_Framelimit.Add(_("Off"));
-	arrayStringFor_Framelimit.Add(_("Auto"));
-	arrayStringFor_Framelimit.Add(_("Audio"));
-	for (int i = 10; i <= 120; i += 5)	// from 10 to 120
-		arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i));
-
-	// Emulator Engine
-	for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
-		arrayStringFor_CPUEngine.Add(wxGetTranslation(CPUCores[a].name));
-		
-	// DSP Engine 
-	arrayStringFor_DSPEngine.Add(_("DSP HLE emulation (fast)"));
-	arrayStringFor_DSPEngine.Add(_("DSP LLE recompiler"));
-	arrayStringFor_DSPEngine.Add(_("DSP LLE interpreter (slow)"));
-	
-	// Gamecube page
-	// GC Language arrayStrings
-	arrayStringFor_GCSystemLang.Add(_("English"));
-	arrayStringFor_GCSystemLang.Add(_("German"));
-	arrayStringFor_GCSystemLang.Add(_("French"));
-	arrayStringFor_GCSystemLang.Add(_("Spanish"));
-	arrayStringFor_GCSystemLang.Add(_("Italian"));
-	arrayStringFor_GCSystemLang.Add(_("Dutch"));
-
-	
-	// Wii page
-	// Sensorbar Position
-	arrayStringFor_WiiSensBarPos.Add(_("Bottom"));
-	arrayStringFor_WiiSensBarPos.Add(_("Top"));
-	
-	// Aspect ratio
-	arrayStringFor_WiiAspectRatio.Add(wxT("4:3"));
-	arrayStringFor_WiiAspectRatio.Add(wxT("16:9"));
-	
-	// Wii Language arrayStrings
-	arrayStringFor_WiiSystemLang = arrayStringFor_GCSystemLang;
-	arrayStringFor_WiiSystemLang.Insert(_("Japanese"), 0);
-	arrayStringFor_WiiSystemLang.Add(_("Simplified Chinese"));
-	arrayStringFor_WiiSystemLang.Add(_("Traditional Chinese"));
-	arrayStringFor_WiiSystemLang.Add(_("Korean"));
-
-	// GUI language arrayStrings
-	// keep these in sync with the langIds array at the beginning of this file
-	arrayStringFor_InterfaceLang.Add(_("<System>"));
-	arrayStringFor_InterfaceLang.Add(_("Arabic"));
-	arrayStringFor_InterfaceLang.Add(_("Catalan"));
-	arrayStringFor_InterfaceLang.Add(_("Chinese (Simplified)"));
-	arrayStringFor_InterfaceLang.Add(_("Chinese (Traditional)"));
-	arrayStringFor_InterfaceLang.Add(_("Czech"));
-	arrayStringFor_InterfaceLang.Add(_("Dutch"));
-	arrayStringFor_InterfaceLang.Add(_("English"));
-	arrayStringFor_InterfaceLang.Add(_("Farsi"));
-	arrayStringFor_InterfaceLang.Add(_("French"));
-	arrayStringFor_InterfaceLang.Add(_("German"));
-	arrayStringFor_InterfaceLang.Add(_("Greek"));
-	arrayStringFor_InterfaceLang.Add(_("Hebrew"));
-	arrayStringFor_InterfaceLang.Add(_("Hungarian"));
-	arrayStringFor_InterfaceLang.Add(_("Italian"));
-	arrayStringFor_InterfaceLang.Add(_("Japanese"));
-	arrayStringFor_InterfaceLang.Add(_("Korean"));
-	arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmaal"));
-	arrayStringFor_InterfaceLang.Add(_("Polish"));
-	arrayStringFor_InterfaceLang.Add(_("Portuguese"));
-	arrayStringFor_InterfaceLang.Add(_("Portuguese (Brazilian)"));
-	arrayStringFor_InterfaceLang.Add(_("Russian"));
-	arrayStringFor_InterfaceLang.Add(_("Serbian"));
-	arrayStringFor_InterfaceLang.Add(_("Spanish"));
-	arrayStringFor_InterfaceLang.Add(_("Swedish"));
-	arrayStringFor_InterfaceLang.Add(_("Turkish"));
-}
-
-void CConfigMain::InitializeGUIValues()
-{
-	const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
-	
-	// General - Basic
-	CPUThread->SetValue(startup_params.bCPUThread);
-	SkipIdle->SetValue(startup_params.bSkipIdle);
-	EnableCheats->SetValue(startup_params.bEnableCheats);
-	Framelimit->SetSelection(SConfig::GetInstance().m_Framelimit);
-	UseFPSForLimiting->SetValue(SConfig::GetInstance().b_UseFPS);
-
-	// General - Advanced
-	for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
-		if (CPUCores[a].CPUid == startup_params.iCPUCore)
-			CPUEngine->SetSelection(a);
-	_NTSCJ->SetValue(startup_params.bForceNTSCJ);
-
-
-	// Display - Interface
-	ConfirmStop->SetValue(startup_params.bConfirmStop);
-	UsePanicHandlers->SetValue(startup_params.bUsePanicHandlers);
-	OnScreenDisplayMessages->SetValue(startup_params.bOnScreenDisplayMessages);
-	// need redesign
-	for (unsigned int i = 0; i < sizeof(langIds) / sizeof(wxLanguage); i++)
-	{
-		if (langIds[i] == SConfig::GetInstance().m_InterfaceLanguage)
-		{
-			InterfaceLang->SetSelection(i);
-			break;
-		}
-	}
-
-	// Audio DSP Engine
-	if (startup_params.bDSPHLE)
-		DSPEngine->SetSelection(0);
-	else
-		DSPEngine->SetSelection(SConfig::GetInstance().m_EnableJIT ? 1 : 2);
-
-	// Audio
-	VolumeSlider->Enable(SupportsVolumeChanges(SConfig::GetInstance().sBackend));
-	VolumeSlider->SetValue(SConfig::GetInstance().m_Volume);
-	VolumeText->SetLabel(wxString::Format(wxT("%d %%"), SConfig::GetInstance().m_Volume));
-	DSPThread->SetValue(startup_params.bDSPThread);
-	DumpAudio->SetValue(SConfig::GetInstance().m_DumpAudio ? true : false);
-	DPL2Decoder->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL);
-	DPL2Decoder->SetValue(startup_params.bDPL2Decoder);
-	Latency->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL);
-	Latency->SetValue(startup_params.iLatency);
-	// add backends to the list
-	AddAudioBackends();
-
-
-	// Gamecube - IPL
-	GCSystemLang->SetSelection(startup_params.SelectedLanguage);
-	GCAlwaysHLE_BS2->SetValue(startup_params.bHLE_BS2);
-
-	// Gamecube - Devices
-	wxArrayString SlotDevices;
-		SlotDevices.Add(_(DEV_NONE_STR));
-		SlotDevices.Add(_(DEV_DUMMY_STR));
-		SlotDevices.Add(_(EXIDEV_MEMCARD_STR));
-		SlotDevices.Add(_(EXIDEV_GECKO_STR));
-#if HAVE_PORTAUDIO
-		SlotDevices.Add(_(EXIDEV_MIC_STR));
-#endif
-
-	wxArrayString SP1Devices;
-		SP1Devices.Add(_(DEV_NONE_STR));
-		SP1Devices.Add(_(DEV_DUMMY_STR));
-		SP1Devices.Add(_(EXIDEV_BBA_STR));
-		SP1Devices.Add(_(EXIDEV_AM_BB_STR));
-
-	wxArrayString SIDevices;
-		SIDevices.Add(_(DEV_NONE_STR));
-		SIDevices.Add(_(SIDEV_STDCONT_STR));
-		SIDevices.Add(_(SIDEV_STEERING_STR));
-		SIDevices.Add(_(SIDEV_DANCEMAT_STR));
-		SIDevices.Add(_(SIDEV_BONGO_STR));
-		SIDevices.Add(_(SIDEV_GBA_STR));
-		SIDevices.Add(_(SIDEV_AM_BB_STR));
-
-	for (int i = 0; i < 3; ++i)
-	{
-		bool isMemcard = false;
-
-		// Add strings to the wxChoice list, the third wxChoice is the SP1 slot
-		if (i == 2)
-			GCEXIDevice[i]->Append(SP1Devices);
-		else
-			GCEXIDevice[i]->Append(SlotDevices);
-
-		switch (SConfig::GetInstance().m_EXIDevice[i])
-		{
-		case EXIDEVICE_NONE:
-			GCEXIDevice[i]->SetStringSelection(SlotDevices[0]);
-			break;
-		case EXIDEVICE_MEMORYCARD:
-			isMemcard = GCEXIDevice[i]->SetStringSelection(SlotDevices[2]);
-			break;
-		case EXIDEVICE_MIC:
-			GCEXIDevice[i]->SetStringSelection(SlotDevices[4]);
-			break;
-		case EXIDEVICE_ETH:
-			GCEXIDevice[i]->SetStringSelection(SP1Devices[2]);
-			break;
-		case EXIDEVICE_AM_BASEBOARD:
-			GCEXIDevice[i]->SetStringSelection(SP1Devices[3]);
-			break;
-		case EXIDEVICE_GECKO:
-			GCEXIDevice[i]->SetStringSelection(SlotDevices[3]);
-			break;
-		case EXIDEVICE_DUMMY:
-		default:
-			GCEXIDevice[i]->SetStringSelection(SlotDevices[1]);
-			break;
-		}
-		if (!isMemcard && i < 2)
-			GCMemcardPath[i]->Disable();
-	}
-	for (int i = 0; i < 4; ++i)
-	{
-		// Add string to the wxChoice list
-		GCSIDevice[i]->Append(SIDevices);
-
-		switch (SConfig::GetInstance().m_SIDevice[i])
-		{
-		case SIDEVICE_GC_CONTROLLER:
-			GCSIDevice[i]->SetStringSelection(SIDevices[1]);
-			break;
-		case SIDEVICE_GC_STEERING:
-			GCSIDevice[i]->SetStringSelection(SIDevices[2]);
-			break;
-		case SIDEVICE_DANCEMAT:
-			GCSIDevice[i]->SetStringSelection(SIDevices[3]);
-			break;
-		case SIDEVICE_GC_TARUKONGA:
-			GCSIDevice[i]->SetStringSelection(SIDevices[4]);
-			break;
-		case SIDEVICE_GC_GBA:
-			GCSIDevice[i]->SetStringSelection(SIDevices[5]);
-			break;
-		case SIDEVICE_AM_BASEBOARD:
-			GCSIDevice[i]->SetStringSelection(SIDevices[6]);
-			break;
-		default:
-			GCSIDevice[i]->SetStringSelection(SIDevices[0]);
-			break;
-		}
-		// Remove the AM baseboard from the list, only the first list can select it
-		if (i == 0)
-			SIDevices.RemoveAt(SIDevices.GetCount() - 1);
-	}
-
-	// Wii - Misc
-	WiiScreenSaver->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.SSV"));
-	WiiEuRGB60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"));
-	WiiAspectRatio->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.AR"));
-	WiiSystemLang->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"));
-	
-	// Wii - Devices
-	WiiSDCard->SetValue(SConfig::GetInstance().m_WiiSDCard);
-	WiiKeyboard->SetValue(SConfig::GetInstance().m_WiiKeyboard);
-
-
-	// Paths
-	RecursiveISOPath->SetValue(SConfig::GetInstance().m_RecursiveISOFolder);
-	DefaultISO->SetPath(StrToWxStr(startup_params.m_strDefaultGCM));
-	DVDRoot->SetPath(StrToWxStr(startup_params.m_strDVDRoot));
-	ApploaderPath->SetPath(StrToWxStr(startup_params.m_strApploader));
-	NANDRoot->SetPath(StrToWxStr(SConfig::GetInstance().m_NANDPath));
-}
-
-void CConfigMain::InitializeGUITooltips()
-{
-	// General - Basic
-	CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches."));
-	Framelimit->SetToolTip(_("This limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)."));
-
-	// General - Advanced
-	_NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nLeft unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
-
-	// Display - Interface
-	ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game."));
-	UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occurred.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all."));
-	OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing."));
-
-	InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart."));
-
-	// Audio tooltips
-	DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended: might cause freezes)."));
-	BackendSelection->SetToolTip(_("Changing this will have no effect while the emulator is running!"));
-
-	// Gamecube - Devices
-	GCEXIDevice[2]->SetToolTip(_("Serial Port 1 - This is the port which devices such as the net adapter use"));
-
-	// Wii - Devices
-	WiiKeyboard->SetToolTip(_("This could cause slow down in Wii Menu and some games."));
-
-#if defined(__APPLE__)
-	DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX."));
-#else
-	DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."));
-#endif
-
-	Latency->SetToolTip(_("Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL backend only."));
-}
-
-void CConfigMain::CreateGUIControls()
-{
-	InitializeGUILists();
-	
-	// Create the notebook and pages
-	Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const DisplayPage = new wxPanel(Notebook, ID_DISPLAYPAGE, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const AudioPage = new wxPanel(Notebook, ID_AUDIOPAGE, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const GamecubePage = new wxPanel(Notebook, ID_GAMECUBEPAGE, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const WiiPage = new wxPanel(Notebook, ID_WIIPAGE, wxDefaultPosition, wxDefaultSize);
-	PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize);
-
-	Notebook->AddPage(GeneralPage, _("General"));
-	Notebook->AddPage(DisplayPage, _("Interface"));
-	Notebook->AddPage(AudioPage, _("Audio"));
-	Notebook->AddPage(GamecubePage, _("Gamecube"));
-	Notebook->AddPage(WiiPage, _("Wii"));
-	Notebook->AddPage(PathsPage, _("Paths"));
-
-	// General page
-	// Core Settings - Basic
-	CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, _("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, _("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	// Framelimit
-	Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator);
-	UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Limit by FPS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	// Core Settings - Advanced
-	CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
-	_NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-
-	// Populate the General settings
-	wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL);
-	sFramelimit->Add(TEXT_BOX(GeneralPage, _("Framelimit:")), 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	sFramelimit->Add(Framelimit, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
-	sFramelimit->Add(UseFPSForLimiting, 0, wxALL | wxEXPAND, 5);
-	wxStaticBoxSizer* const sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings"));
-	sbBasic->Add(CPUThread, 0, wxALL, 5);
-	sbBasic->Add(SkipIdle, 0, wxALL, 5);
-	sbBasic->Add(EnableCheats, 0, wxALL, 5);
-	sbBasic->Add(sFramelimit);
-
-	wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
-	sbAdvanced->Add(CPUEngine, 0, wxALL, 5);
-	sbAdvanced->Add(_NTSCJ, 0, wxALL, 5);
-
-	wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL);
-	sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5);
-	sGeneralPage->Add(sbAdvanced, 0, wxEXPAND | wxALL, 5);
-	GeneralPage->SetSizer(sGeneralPage);
-
-	// Interface Language
-	InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition,
-			wxDefaultSize, arrayStringFor_InterfaceLang, 0, wxDefaultValidator);
-	// Hotkey configuration
-	HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"),
-			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
-	// Interface settings
-	ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop"),
-			wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS,
-			_("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	OnScreenDisplayMessages = new wxCheckBox(DisplayPage, ID_INTERFACE_ONSCREENDISPLAYMESSAGES,
-			_("On-Screen Display Messages"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-
-	wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL);
-	sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-	sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-	sInterface->AddStretchSpacer();
-	sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5);
-
-	// theme selection
-	auto const theme_selection = new wxChoice(DisplayPage, wxID_ANY);
-
-	CFileSearch::XStringVector theme_dirs;
-	theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX));
-	theme_dirs.push_back(File::GetSysDirectory() + THEMES_DIR);
-
-	CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs);
-	auto const& sv = cfs.GetFileNames();
-	std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename)
-	{
-		std::string name, ext;
-		SplitPath(filename, NULL, &name, &ext);
-
-		name += ext;
-		auto const wxname = StrToWxStr(name);
-		if (-1 == theme_selection->FindString(wxname))
-			theme_selection->Append(wxname);
-	});
-	
-	theme_selection->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
-
-	// std::function = avoid error on msvc
-	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
-	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = WxStrToStr(theme_selection->GetStringSelection());
-		main_frame->InitBitmaps();
-		main_frame->UpdateGameList();
-	}));
-
-	auto const scInterface = new wxBoxSizer(wxHORIZONTAL);
-	scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-	scInterface->Add(theme_selection, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-	scInterface->AddStretchSpacer();
-
-	sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings"));
-	sbInterface->Add(ConfirmStop, 0, wxALL, 5);
-	sbInterface->Add(UsePanicHandlers, 0, wxALL, 5);
-	sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5);
-	sbInterface->Add(scInterface, 0, wxEXPAND | wxALL, 5);
-	sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5);
-	sDisplayPage = new wxBoxSizer(wxVERTICAL);
-	sDisplayPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5);
-	DisplayPage->SetSizer(sDisplayPage);
-
-	
-	// Audio page
-	DSPEngine = new wxRadioBox(AudioPage, ID_DSPENGINE, _("DSP Emulator Engine"),
-				wxDefaultPosition, wxDefaultSize, arrayStringFor_DSPEngine, 0, wxRA_SPECIFY_ROWS);
-	DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSPLLE on Separate Thread"));
-	DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"),
-				wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder"));
-	VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100,
-				wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE);
-	VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT(""),
-				wxDefaultPosition, wxDefaultSize, 0);
-	BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition,
-				wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString);
-	Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize,
-		wxSP_ARROW_KEYS, 0, 30);
-
-	Latency->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &CConfigMain::AudioSettingsChanged, this);
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		Latency->Disable();
-		BackendSelection->Disable();
-		DPL2Decoder->Disable();
-	}
-
-	// Create sizer and add items to dialog
-	wxStaticBoxSizer *sbAudioSettings = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Sound Settings"));
-	sbAudioSettings->Add(DSPEngine, 0, wxALL | wxEXPAND, 5);
-	sbAudioSettings->Add(DSPThread, 0, wxALL, 5);
-	sbAudioSettings->Add(DumpAudio, 0, wxALL, 5);
-	sbAudioSettings->Add(DPL2Decoder, 0, wxALL, 5);
-
-	wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume"));
-	sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13);
-	sbVolume->Add(VolumeText, 0, wxALIGN_CENTER|wxALL, 5);
-
-	wxGridBagSizer *sBackend = new wxGridBagSizer();
-	sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5);
-	sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBackend->Add(Latency, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5);
-	wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings"));
-	sbBackend->Add(sBackend, 0, wxEXPAND);
-
-	wxBoxSizer *sAudio = new wxBoxSizer(wxHORIZONTAL);
-	sAudio->Add(sbAudioSettings, 1, wxEXPAND|wxALL, 5);
-	sAudio->Add(sbVolume, 0, wxEXPAND|wxALL, 5);
-
-	sAudioPage = new wxBoxSizer(wxVERTICAL);
-	sAudioPage->Add(sAudio, 0, wxALL|wxEXPAND);
-	sAudioPage->Add(sbBackend, 0, wxALL|wxEXPAND, 5);
-	AudioPage->SetSizerAndFit(sAudioPage);
-
-
-	// Gamecube page
-	// IPL settings
-	GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition,
-			wxDefaultSize, arrayStringFor_GCSystemLang, 0, wxDefaultValidator);
-	GCAlwaysHLE_BS2 = new wxCheckBox(GamecubePage, ID_GC_ALWAYS_HLE_BS2, _("Skip BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	// Device settings
-	// EXI Devices
-	wxStaticText* GCEXIDeviceText[3];
-	GCEXIDeviceText[0] = TEXT_BOX(GamecubePage, _("Slot A"));
-	GCEXIDeviceText[1] = TEXT_BOX(GamecubePage, _("Slot B"));
-	GCEXIDeviceText[2] = TEXT_BOX(GamecubePage, wxT("SP1"));
-	GCEXIDevice[0] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTA);
-	GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB);
-	GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1);
-	GCMemcardPath[0] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTA_PATH, wxT("..."),
-			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
-	GCMemcardPath[1] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTB_PATH, wxT("..."),
-			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
-
-	//SI Devices
-	wxStaticText* GCSIDeviceText[4];
-	GCSIDeviceText[0] = TEXT_BOX(GamecubePage, _("Port 1"));
-	GCSIDeviceText[1] = TEXT_BOX(GamecubePage, _("Port 2"));
-	GCSIDeviceText[2] = TEXT_BOX(GamecubePage, _("Port 3"));
-	GCSIDeviceText[3] = TEXT_BOX(GamecubePage, _("Port 4"));
-	GCSIDevice[0] = new wxChoice(GamecubePage, ID_GC_SIDEVICE0);
-	GCSIDevice[1] = new wxChoice(GamecubePage, ID_GC_SIDEVICE1);
-	GCSIDevice[2] = new wxChoice(GamecubePage, ID_GC_SIDEVICE2);
-	GCSIDevice[3] = new wxChoice(GamecubePage, ID_GC_SIDEVICE3);
-
-	// Populate the Gamecube page
-	sGamecubeIPLSettings = new wxGridBagSizer();
-	sGamecubeIPLSettings->Add(GCAlwaysHLE_BS2, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
-	sGamecubeIPLSettings->Add(TEXT_BOX(GamecubePage, _("System Language:")),
-			wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	sGamecubeIPLSettings->Add(GCSystemLang, wxGBPosition(1, 1), wxDefaultSpan, wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-	sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("IPL Settings"));
-	sbGamecubeIPLSettings->Add(sGamecubeIPLSettings);
-	wxStaticBoxSizer *sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("Device Settings"));
-	wxGridBagSizer* sbGamecubeEXIDevSettings = new wxGridBagSizer(10, 10);
-	for (int i = 0; i < 3; ++i)
-	{
-		sbGamecubeEXIDevSettings->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-		sbGamecubeEXIDevSettings->Add(GCEXIDevice[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2)?1:2), wxALIGN_CENTER_VERTICAL);
-		if (i < 2) sbGamecubeEXIDevSettings->Add(GCMemcardPath[i], wxGBPosition(i, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-		if (NetPlay::IsNetPlayRunning())
-			GCEXIDevice[i]->Disable();
-	}
-	sbGamecubeDeviceSettings->Add(sbGamecubeEXIDevSettings, 0, wxALL, 5);
-
-	wxFlexGridSizer* sbGamecubeDevSettings = new wxFlexGridSizer(2, 10, 10);
-	for (int i = 0; i < 4; ++i)
-	{
-		sbGamecubeDevSettings->Add(GCSIDeviceText[i], 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0);
-		sbGamecubeDevSettings->Add(GCSIDevice[i], 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 0);
-		if (NetPlay::IsNetPlayRunning() || Movie::IsRecordingInput() || Movie::IsPlayingInput())
-		{
-			GCSIDevice[i]->Disable();
-		}
-	}
-	sbGamecubeDeviceSettings->Add(sbGamecubeDevSettings, 0, wxALL, 5);
-
-	sGamecubePage = new wxBoxSizer(wxVERTICAL);
-	sGamecubePage->Add(sbGamecubeIPLSettings, 0, wxEXPAND|wxALL, 5);
-	sGamecubePage->Add(sbGamecubeDeviceSettings, 0, wxEXPAND|wxALL, 5);
-	GamecubePage->SetSizer(sGamecubePage);
-
-
-	// Wii page
-	// Misc Settings
-	WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator);
-	WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator);
-
-	// Device Settings
-	WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, _("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, _("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-
-	// Populate the Wii Page
-	sWiiIPLSettings = new wxGridBagSizer();
-	sWiiIPLSettings->Add(WiiScreenSaver, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
-	sWiiIPLSettings->Add(WiiEuRGB60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
-	sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("Aspect Ratio:")),
-			wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5);
-	sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("System Language:")),
-			wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sWiiIPLSettings->Add(WiiSystemLang, wxGBPosition(3, 1), wxDefaultSpan, wxALL, 5);
-	sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Misc Settings"));
-	sbWiiIPLSettings->Add(sWiiIPLSettings);
-
-	sbWiiDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Device Settings"));
-	sbWiiDeviceSettings->Add(WiiSDCard, 0, wxALL, 5);
-	sbWiiDeviceSettings->Add(WiiKeyboard, 0, wxALL, 5);
-
-	sWiiPage = new wxBoxSizer(wxVERTICAL);
-	sWiiPage->Add(sbWiiIPLSettings, 0, wxEXPAND|wxALL, 5);
-	sWiiPage->Add(sbWiiDeviceSettings, 0, wxEXPAND|wxALL, 5);
-	WiiPage->SetSizer(sWiiPage);
-
-	
-	// Paths page
-	ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator);
-	RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add..."), wxDefaultPosition, wxDefaultSize, 0);
-	RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0);
-	RemoveISOPath->Enable(false);
-
-	DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"),
-		_("All GC/Wii images (gcm, iso, wbfs, ciso, gcz)") + wxString::Format(wxT("|*.gcm;*.iso;*.wbfs;*.ciso;*.gcz|%s"), wxGetTranslation(wxALL_FILES)),
-		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
-	DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
-	ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"),
-		_("apploader (.img)") + wxString::Format(wxT("|*.img|%s"), wxGetTranslation(wxALL_FILES)),
-		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
-	NANDRoot = new wxDirPickerCtrl(PathsPage, ID_NANDROOT, wxEmptyString, _("Choose a NAND root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
-
-	// Populate the settings
-	wxBoxSizer* sISOButtons = new wxBoxSizer(wxHORIZONTAL);
-	sISOButtons->Add(RecursiveISOPath, 0, wxALL|wxALIGN_CENTER, 0);
-	sISOButtons->AddStretchSpacer();
-	sISOButtons->Add(AddISOPath, 0, wxALL, 0);
-	sISOButtons->Add(RemoveISOPath, 0, wxALL, 0);
-	sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, _("ISO Directories"));
-	sbISOPaths->Add(ISOPaths, 1, wxEXPAND|wxALL, 0);
-	sbISOPaths->Add(sISOButtons, 0, wxEXPAND|wxALL, 5);
-
-	sOtherPaths = new wxGridBagSizer();
-	sOtherPaths->Add(TEXT_BOX(PathsPage, _("Default ISO:")),
-			wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sOtherPaths->Add(DefaultISO, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND|wxALL, 5);
-	sOtherPaths->Add(TEXT_BOX(PathsPage, _("DVD Root:")),
-			wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sOtherPaths->Add(DVDRoot, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND|wxALL, 5);
-	sOtherPaths->Add(TEXT_BOX(PathsPage, _("Apploader:")),
-			wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sOtherPaths->Add(ApploaderPath, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND|wxALL, 5);
-	sOtherPaths->Add(TEXT_BOX(PathsPage, _("Wii NAND Root:")),
-			wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sOtherPaths->Add(NANDRoot, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND|wxALL, 5);
-	sOtherPaths->AddGrowableCol(1);
-
-	// Populate the Paths page
-	sPathsPage = new wxBoxSizer(wxVERTICAL);
-	sPathsPage->Add(sbISOPaths, 1, wxEXPAND|wxALL, 5);
-	sPathsPage->Add(sOtherPaths, 0, wxEXPAND|wxALL, 5);
-	PathsPage->SetSizer(sPathsPage);
-
-	wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(Notebook, 1, wxEXPAND|wxALL, 5);
-	sMain->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	InitializeGUIValues();
-	InitializeGUITooltips();
-
-	UpdateGUI();
-
-	SetSizerAndFit(sMain);
-	Center();
-	SetFocus();
-}
-
-void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
-{
-	EndModal((bRefreshList) ? wxID_OK : wxID_CANCEL);
-}
-
-void CConfigMain::OnOk(wxCommandEvent& WXUNUSED (event))
-{
-	Close();
-
-	// Save the config. Dolphin crashes too often to only save the settings on closing
-	SConfig::GetInstance().SaveSettings();
-}
-
-// Core settings
-void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	// Core - Basic
-	case ID_CPUTHREAD:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked();
-		break;
-	case ID_IDLESKIP:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle = SkipIdle->IsChecked();
-		break;
-	case ID_ENABLECHEATS:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = EnableCheats->IsChecked();
-		break;
-	case ID_FRAMELIMIT:
-		SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection();
-		AudioCommon::UpdateSoundStream();
-		break;
-	case ID_FRAMELIMIT_USEFPSFORLIMITING:
-		SConfig::GetInstance().b_UseFPS = UseFPSForLimiting->IsChecked();
-		break;
-	// Core - Advanced
-	case ID_CPUENGINE:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUCores[CPUEngine->GetSelection()].CPUid;
-		if (main_frame->g_pCodeWindow)
-			main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER,
-				SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true);
-		break;
-	case ID_NTSCJ:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked();
-		break;
-	}
-}
-
-// Display and Interface settings
-void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	// Display - Interface
-	case ID_INTERFACE_CONFIRMSTOP:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop = ConfirmStop->IsChecked();
-		break;
-	case ID_INTERFACE_USEPANICHANDLERS:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers = UsePanicHandlers->IsChecked();
-		SetEnableAlert(UsePanicHandlers->IsChecked());
-		break;
-	case ID_INTERFACE_ONSCREENDISPLAYMESSAGES:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = OnScreenDisplayMessages->IsChecked();
-		SetEnableAlert(OnScreenDisplayMessages->IsChecked());
-		break;
-	case ID_INTERFACE_LANG:
-		if (SConfig::GetInstance().m_InterfaceLanguage != langIds[InterfaceLang->GetSelection()])
-			SuccessAlertT("You must restart Dolphin in order for the change to take effect.");
-		SConfig::GetInstance().m_InterfaceLanguage = langIds[InterfaceLang->GetSelection()];
-		break;
-	case ID_HOTKEY_CONFIG:
-		{
-			HotkeyConfigDialog m_HotkeyDialog(this);
-			m_HotkeyDialog.ShowModal();
-		}
-		// Update the GUI in case menu accelerators were changed
-		main_frame->UpdateGUI();
-		break;
-	}
-}
-
-void CConfigMain::AudioSettingsChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case ID_DSPENGINE:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = DSPEngine->GetSelection() == 0;
-		if (!DSPEngine->GetSelection() == 0)
-			SConfig::GetInstance().m_EnableJIT = DSPEngine->GetSelection() == 1;
-		AudioCommon::UpdateSoundStream();
-		break;
-
-	case ID_VOLUME:
-		SConfig::GetInstance().m_Volume = VolumeSlider->GetValue();
-		AudioCommon::UpdateSoundStream();
-		VolumeText->SetLabel(wxString::Format(wxT("%d %%"), VolumeSlider->GetValue()));
-		break;
-
-	case ID_DSPTHREAD:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = DSPThread->IsChecked();
-		break;
-
-	case ID_DPL2DECODER:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder = DPL2Decoder->IsChecked();
-		break;
-
-	case ID_BACKEND:
-		VolumeSlider->Enable(SupportsVolumeChanges(WxStrToStr(BackendSelection->GetStringSelection())));
-		Latency->Enable(WxStrToStr(BackendSelection->GetStringSelection()) == BACKEND_OPENAL);
-		DPL2Decoder->Enable(WxStrToStr(BackendSelection->GetStringSelection()) == BACKEND_OPENAL);
-		// Don't save the translated BACKEND_NULLSOUND string
-		SConfig::GetInstance().sBackend = BackendSelection->GetSelection() ?
-			WxStrToStr(BackendSelection->GetStringSelection()) : BACKEND_NULLSOUND;
-		AudioCommon::UpdateSoundStream();
-		break;
-
-	case ID_LATENCY:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = Latency->GetValue();
-		break;
-
-	default:
-		SConfig::GetInstance().m_DumpAudio = DumpAudio->GetValue();
-		break;
-	}
-}
-
-void CConfigMain::AddAudioBackends()
-{
-	std::vector<std::string> backends = AudioCommon::GetSoundBackends();
-	// I'm sure Billiard will change this into an auto sometimes soon :P
-	for (std::vector<std::string>::const_iterator iter = backends.begin(); 
-		 iter != backends.end(); ++iter)
-	{
-		BackendSelection->Append(wxGetTranslation(StrToWxStr(*iter)));
-		int num = BackendSelection->
-			FindString(StrToWxStr(SConfig::GetInstance().sBackend));
-		BackendSelection->SetSelection(num);
-	}
-}
-
-bool CConfigMain::SupportsVolumeChanges(std::string backend)
-{
-	//FIXME: this one should ask the backend whether it supports it.
-	//       but getting the backend from string etc. is probably
-	//       too much just to enable/disable a stupid slider...
-	return (backend == BACKEND_DIRECTSOUND ||
-			backend == BACKEND_COREAUDIO ||
-			backend == BACKEND_OPENAL ||
-			backend == BACKEND_XAUDIO2);
-}
-
-
-// GC settings
-// -----------------------
-void CConfigMain::GCSettingsChanged(wxCommandEvent& event)
-{
-	int sidevice = 0;
-	int exidevice = 0;
-	switch (event.GetId())
-	{
-	// Gamecube - IPL
-	case ID_GC_SRAM_LNG:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage = GCSystemLang->GetSelection();
-		bRefreshList = true;
-		break;
-	// Gamecube - IPL Settings
-	case ID_GC_ALWAYS_HLE_BS2:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2 = GCAlwaysHLE_BS2->IsChecked();
-		break;
-	// Gamecube - Devices
-	case ID_GC_EXIDEVICE_SP1:
-		exidevice++;
-	case ID_GC_EXIDEVICE_SLOTB:
-		exidevice++;
-	case ID_GC_EXIDEVICE_SLOTA:
-		ChooseEXIDevice(event.GetString(), exidevice);
-		break;
-	case ID_GC_EXIDEVICE_SLOTA_PATH:
-		ChooseMemcardPath(SConfig::GetInstance().m_strMemoryCardA, true);
-		break;
-	case ID_GC_EXIDEVICE_SLOTB_PATH:
-		ChooseMemcardPath(SConfig::GetInstance().m_strMemoryCardB, false);
-		break;
-	case ID_GC_SIDEVICE3:
-		sidevice++;
-	case ID_GC_SIDEVICE2:
-		sidevice++;
-	case ID_GC_SIDEVICE1:
-		sidevice++;
-	case ID_GC_SIDEVICE0:
-		ChooseSIDevice(event.GetString(), sidevice);
-		break;
-	}
-}
-
-void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
-{
-	std::string filename = WxStrToStr(wxFileSelector(
-		_("Choose a file to open"),
-		StrToWxStr(File::GetUserPath(D_GCUSER_IDX)),
-		isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB),
-		wxEmptyString,
-		_("Gamecube Memory Cards (*.raw,*.gcp)") + wxString(wxT("|*.raw;*.gcp"))));
-
-	if (!filename.empty())
-	{
-		if (File::Exists(filename))
-		{
-			GCMemcard memorycard(filename.c_str());
-			if (!memorycard.IsValid())
-			{
-				PanicAlertT("Cannot use that file as a memory card.\n%s\n" \
-							"is not a valid gamecube memory card file", filename.c_str());
-				return;
-			}
-		}
-		#ifdef _WIN32
-			if (!strncmp(File::GetExeDirectory().c_str(), filename.c_str(), File::GetExeDirectory().size()))
-			{
-				filename.erase(0, File::GetExeDirectory().size() +1);
-				filename = "./" + filename;
-			}
-		#endif
-
-		// also check that the path isn't used for the other memcard...
-		if (filename.compare(isSlotA ? SConfig::GetInstance().m_strMemoryCardB
-			: SConfig::GetInstance().m_strMemoryCardA) != 0)
-		{
-			strMemcard = filename;
-
-			if (Core::GetState() != Core::CORE_UNINITIALIZED)
-			{
-				// Change memcard to the new file
-				ExpansionInterface::ChangeDevice(
-					isSlotA ? 0 : 1, // SlotA: channel 0, SlotB channel 1
-					EXIDEVICE_MEMORYCARD,
-					0);	// SP1 is device 2, slots are device 0
-			}
-		}
-		else
-		{
-			PanicAlertT("Cannot use that file as a memory card.\n" \
-					"Are you trying to use the same file in both slots?");
-		}
-	}
-}
-
-void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum)
-{
-	SIDevices tempType;
-	if (!deviceName.compare(WXSTR_TRANS(SIDEV_STDCONT_STR)))
-		tempType = SIDEVICE_GC_CONTROLLER;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_STEERING_STR)))
-		tempType = SIDEVICE_GC_STEERING;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_DANCEMAT_STR)))
-		tempType = SIDEVICE_DANCEMAT;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_BONGO_STR)))
-		tempType = SIDEVICE_GC_TARUKONGA;
-	else if (!deviceName.compare(wxT(SIDEV_GBA_STR)))
-		tempType = SIDEVICE_GC_GBA;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_AM_BB_STR)))
-		tempType = SIDEVICE_AM_BASEBOARD;
-	else
-		tempType = SIDEVICE_NONE;
-
-	SConfig::GetInstance().m_SIDevice[deviceNum] = tempType;
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		// Change plugged device! :D
-		SerialInterface::ChangeDevice(tempType, deviceNum);
-	}
-}
-
-void CConfigMain::ChooseEXIDevice(wxString deviceName, int deviceNum)
-{
-	TEXIDevices tempType;
-
-	if (!deviceName.compare(WXSTR_TRANS(EXIDEV_MEMCARD_STR)))
-		tempType = EXIDEVICE_MEMORYCARD;
-	else if (!deviceName.compare(WXSTR_TRANS(EXIDEV_MIC_STR)))
-		tempType = EXIDEVICE_MIC;
-	else if (!deviceName.compare(wxT(EXIDEV_BBA_STR)))
-		tempType = EXIDEVICE_ETH;
-	else if (!deviceName.compare(WXSTR_TRANS(EXIDEV_AM_BB_STR)))
-		tempType = EXIDEVICE_AM_BASEBOARD;
-	else if (!deviceName.compare(wxT(EXIDEV_GECKO_STR)))
-		tempType = EXIDEVICE_GECKO;
-	else if (!deviceName.compare(WXSTR_TRANS(DEV_NONE_STR)))
-		tempType = EXIDEVICE_NONE;
-	else
-		tempType = EXIDEVICE_DUMMY;
-
-	// Gray out the memcard path button if we're not on a memcard
-	if (tempType == EXIDEVICE_MEMORYCARD)
-		GCMemcardPath[deviceNum]->Enable();
-	else if (deviceNum == 0 || deviceNum == 1)
-		GCMemcardPath[deviceNum]->Disable();
-
-	SConfig::GetInstance().m_EXIDevice[deviceNum] = tempType;
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		// Change plugged device! :D
-		ExpansionInterface::ChangeDevice(
-			(deviceNum == 1) ? 1 : 0,	// SlotB is on channel 1, slotA and SP1 are on 0
-			tempType,					// The device enum to change to
-			(deviceNum == 2) ? 2 : 0);	// SP1 is device 2, slots are device 0
-	}
-}
-
-
-
-
-// Wii settings
-// -------------------
-void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	// Wii - SYSCONF settings
-	case ID_WII_IPL_SSV:
-		SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", WiiScreenSaver->IsChecked());
-		break;
-	case ID_WII_IPL_E60:
-		SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiEuRGB60->IsChecked());
-		break;
-	case ID_WII_IPL_AR:
-		SConfig::GetInstance().m_SYSCONF->SetData("IPL.AR", WiiAspectRatio->GetSelection());
-		break;
-	case ID_WII_IPL_LNG:
-	{
-		int wii_system_lang = WiiSystemLang->GetSelection();
-		SConfig::GetInstance().m_SYSCONF->SetData("IPL.LNG", wii_system_lang);
-		u8 country_code = GetSADRCountryCode(wii_system_lang);
-		if(!SConfig::GetInstance().m_SYSCONF->SetArrayData("IPL.SADR", &country_code, 1))
-		{
-			PanicAlert("Failed to update country code in SYSCONF");
-		}
-		break;
-	}
-	// Wii - Devices
-	case ID_WII_SD_CARD:
-		SConfig::GetInstance().m_WiiSDCard = WiiSDCard->IsChecked();
-		WII_IPC_HLE_Interface::SDIO_EventNotify();
-		break;
-	case ID_WII_KEYBOARD:
-		SConfig::GetInstance().m_WiiKeyboard = WiiKeyboard->IsChecked();
-		break;
-	}
-}
-
-
-// Paths settings
-// -------------------
-void CConfigMain::ISOPathsSelectionChanged(wxCommandEvent& WXUNUSED (event))
-{
-	if (!ISOPaths->GetStringSelection().empty())
-	{
-		RemoveISOPath->Enable(true);
-	}
-	else
-	{
-		RemoveISOPath->Enable(false);
-	}
-}
-
-void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event)
-{
-	if (event.GetId() == ID_ADDISOPATH)
-	{
-		wxDirDialog dialog(this, _("Choose a directory to add"), wxGetHomeDir(),
-				wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
-
-		if (dialog.ShowModal() == wxID_OK)
-		{
-			if (ISOPaths->FindString(dialog.GetPath()) != -1)
-			{
-				wxMessageBox(_("The chosen directory is already in the list"), _("Error"), wxOK);
-			}
-			else
-			{
-				bRefreshList = true;
-				ISOPaths->Append(dialog.GetPath());
-			}
-		}
-	}
-	else
-	{
-		bRefreshList = true;
-		ISOPaths->Delete(ISOPaths->GetSelection());
-	}
-
-	// Save changes right away
-	SConfig::GetInstance().m_ISOFolder.clear();
-
-	for (unsigned int i = 0; i < ISOPaths->GetCount(); i++)
-		SConfig::GetInstance().m_ISOFolder.push_back(WxStrToStr(ISOPaths->GetStrings()[i]));
-}
-
-void CConfigMain::RecursiveDirectoryChanged(wxCommandEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_RecursiveISOFolder = RecursiveISOPath->IsChecked();
-	bRefreshList = true;
-}
-
-void CConfigMain::DefaultISOChanged(wxFileDirPickerEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = WxStrToStr(DefaultISO->GetPath());
-}
-
-void CConfigMain::DVDRootChanged(wxFileDirPickerEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDVDRoot = WxStrToStr(DVDRoot->GetPath());
-}
-
-void CConfigMain::ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strApploader = WxStrToStr(ApploaderPath->GetPath());
-}
-
-void CConfigMain::NANDRootChanged(wxFileDirPickerEvent& WXUNUSED (event))
-{
-	std::string NANDPath =
-		SConfig::GetInstance().m_NANDPath =
-			File::GetUserPath(D_WIIROOT_IDX, WxStrToStr(NANDRoot->GetPath()));
-	NANDRoot->SetPath(StrToWxStr(NANDPath));
-	SConfig::GetInstance().m_SYSCONF->UpdateLocation();
-	DiscIO::cUIDsys::AccessInstance().UpdateLocation();
-	DiscIO::CSharedContent::AccessInstance().UpdateLocation();
-	main_frame->UpdateWiiMenuChoice();
-}
-
-// GFX backend selection
-void CConfigMain::OnSelectionChanged(wxCommandEvent& ev)
-{
-	g_video_backend = g_available_video_backends[ev.GetInt()];
-	SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = g_video_backend->GetName();
-}
-
-void CConfigMain::OnConfig(wxCommandEvent&)
-{
-	if (g_video_backend)
-		g_video_backend->ShowConfig(this);
-}
-
-// Change from IPL.LNG value to IPL.SADR country code
-inline u8 CConfigMain::GetSADRCountryCode(int language)
-{
-	//http://wiibrew.org/wiki/Country_Codes
-	u8 countrycode = language;
-	switch (countrycode)
-	{
-	case 0: //Japanese
-		countrycode = 1; //Japan
-		break;
-	case 1: //English
-		countrycode = 49; // United States
-		break;
-	case 2:	//German
-		countrycode = 78; //Germany
-		break;
-	case 3: //French
-		countrycode = 77; //France
-		break;
-	case 4: //Spanish
-		countrycode = 105; //Spain
-		break;
-	case 5: //Italian
-		countrycode = 83; //Italy
-		break;
-	case 6:	//Dutch
-		countrycode = 94; //Netherlands
-		break;
-	case 7: //Simplified Chinese
-	case 8: //Traditional Chinese
-		countrycode = 157; //China
-		break;
-	case 9: //Korean
-		countrycode = 136; //Korea
-		break;
-	}
-	return countrycode;
-}
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h
deleted file mode 100644
index 094fb6df85..0000000000
--- a/Source/Core/DolphinWX/Src/ConfigMain.h
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __CONFIG_MAIN_h__
-#define __CONFIG_MAIN_h__
-
-#include <wx/wx.h>
-#include <wx/gbsizer.h>
-#include <wx/spinbutt.h>
-#include <wx/notebook.h>
-#include <wx/filepicker.h>
-#include "ConfigManager.h"
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "X11Utils.h"
-#endif
-
-class CConfigMain : public wxDialog
-{
-public:
-
-	CConfigMain(wxWindow* parent,
-		wxWindowID id = 1,
-		const wxString& title = _("Dolphin Configuration"),
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		long style = wxDEFAULT_DIALOG_STYLE);
-	virtual ~CConfigMain();
-
-	void OnOk(wxCommandEvent& event);
-	void CloseClick(wxCommandEvent& event);
-	void OnSelectionChanged(wxCommandEvent& event);
-	void OnConfig(wxCommandEvent& event);
-	void SetSelectedTab(int tab);
-
-	bool bRefreshList;
-
-	enum
-	{
-		ID_NOTEBOOK = 1000,
-		ID_GENERALPAGE,
-		ID_DISPLAYPAGE,
-		ID_AUDIOPAGE,
-		ID_GAMECUBEPAGE,
-		ID_WIIPAGE,
-		ID_PATHSPAGE,
-	};
-
-private:
-	enum
-	{
-		ID_CPUTHREAD = 1010,
-		ID_IDLESKIP,
-		ID_ENABLECHEATS,
-		ID_FRAMELIMIT,
-		ID_FRAMELIMIT_USEFPSFORLIMITING,
-
-		ID_CPUENGINE,
-		ID_DSPTHREAD,
-
-		ID_NTSCJ,
-
-		// Audio Settings
-		ID_DSPENGINE,
-		ID_ENABLE_HLE_AUDIO,
-		ID_ENABLE_THROTTLE,
-		ID_DUMP_AUDIO,
-		ID_DPL2DECODER,
-		ID_LATENCY,
-		ID_BACKEND,
-		ID_VOLUME,
-
-		// Interface settings
-		ID_INTERFACE_CONFIRMSTOP,
-		ID_INTERFACE_USEPANICHANDLERS,
-		ID_INTERFACE_ONSCREENDISPLAYMESSAGES,
-		ID_INTERFACE_LANG,
-		ID_HOTKEY_CONFIG,
-
-		ID_GC_SRAM_LNG,
-		ID_GC_ALWAYS_HLE_BS2,
-
-		ID_GC_EXIDEVICE_SLOTA,
-		ID_GC_EXIDEVICE_SLOTA_PATH,
-		ID_GC_EXIDEVICE_SLOTB,
-		ID_GC_EXIDEVICE_SLOTB_PATH,
-		ID_GC_EXIDEVICE_SP1,
-		ID_GC_SIDEVICE0,
-		ID_GC_SIDEVICE1,
-		ID_GC_SIDEVICE2,
-		ID_GC_SIDEVICE3,
-
-
-		ID_WII_IPL_SSV,
-		ID_WII_IPL_E60,
-		ID_WII_IPL_AR,
-		ID_WII_IPL_LNG,
-
-		ID_WII_SD_CARD,
-		ID_WII_KEYBOARD,
-
-
-		ID_ISOPATHS,
-		ID_RECURSIVEISOPATH,
-		ID_ADDISOPATH,
-		ID_REMOVEISOPATH,
-
-		ID_DEFAULTISO,
-		ID_DVDROOT,
-		ID_APPLOADERPATH,
-		ID_NANDROOT,
-
-		ID_DSP_CB,
-		ID_DSP_CONFIG,
-		ID_DSP_ABOUT,
-	};
-
-	wxNotebook* Notebook;
-	wxPanel* PathsPage;
-
-	// Basic
-	wxCheckBox* CPUThread;
-	wxCheckBox* SkipIdle;
-	wxCheckBox* EnableCheats;
-	wxChoice* Framelimit;
-	wxCheckBox* UseFPSForLimiting;
-	
-	// Advanced
-	wxCheckBox* EnableOpenCL;
-	wxRadioBox* CPUEngine;
-	wxCheckBox* DSPThread;
-	wxCheckBox* _NTSCJ;
-
-
-	wxBoxSizer* sDisplayPage; // Display settings
-	wxStaticBoxSizer* sbInterface; // Display and Interface sections
-
-
-	// Audio
-	wxBoxSizer* sAudioPage; // GC settings
-	wxRadioBox* DSPEngine;
-	wxSlider*	VolumeSlider;
-	wxStaticText* VolumeText;
-	wxCheckBox*	DumpAudio;
-	wxCheckBox*	DPL2Decoder;
-	wxArrayString wxArrayBackends;
-	wxChoice*	BackendSelection;
-	wxSpinCtrl*	Latency;
-
-	// Interface
-	wxCheckBox* ConfirmStop;
-	wxCheckBox* UsePanicHandlers;
-	wxCheckBox* OnScreenDisplayMessages;
-	wxChoice* InterfaceLang;
-	wxButton* HotkeyConfig;
-
-
-	wxBoxSizer* sGamecubePage; // GC settings
-	wxStaticBoxSizer* sbGamecubeIPLSettings;
-	wxGridBagSizer* sGamecubeIPLSettings;
-
-	// IPL
-	wxChoice* GCSystemLang;
-	wxCheckBox* GCAlwaysHLE_BS2;
-
-	// Device
-	wxChoice* GCEXIDevice[3];
-	wxButton* GCMemcardPath[2];
-	wxChoice* GCSIDevice[4];
-
-
-	wxBoxSizer* sWiiPage; // Wii settings
-	wxStaticBoxSizer* /*sbWiimoteSettings, **/sbWiiIPLSettings, *sbWiiDeviceSettings; // Wiimote, Misc and Device sections
-	wxGridBagSizer* /*sWiimoteSettings, **/sWiiIPLSettings;
-
-	// Misc
-	wxCheckBox* WiiScreenSaver;
-	wxCheckBox* WiiEuRGB60;
-	wxChoice* WiiAspectRatio;
-	wxChoice* WiiSystemLang;
-
-	// Device
-	wxCheckBox* WiiSDCard;
-	wxCheckBox* WiiKeyboard;
-
-
-	wxBoxSizer* sPathsPage; // Paths settings
-	wxStaticBoxSizer* sbISOPaths;
-	wxGridBagSizer* sOtherPaths;
-
-	// ISO Directories
-	wxListBox* ISOPaths;
-	wxCheckBox* RecursiveISOPath;
-	wxButton* AddISOPath;
-	wxButton* RemoveISOPath;
-
-	// DefaultISO, DVD Root, Apploader, NANDPath
-	wxFilePickerCtrl* DefaultISO;
-	wxDirPickerCtrl* DVDRoot;
-	wxFilePickerCtrl* ApploaderPath;
-	wxDirPickerCtrl* NANDRoot;
-
-	// Graphics
-	wxChoice* GraphicSelection;
-	wxButton* GraphicConfig;
-
-	wxButton* m_Ok;
-
-	FILE* pStream;
-
-	wxArrayString arrayStringFor_Framelimit;
-	wxArrayString arrayStringFor_CPUEngine;
-	wxArrayString arrayStringFor_DSPEngine;
-	wxArrayString arrayStringFor_FullscreenResolution;
-	wxArrayString arrayStringFor_InterfaceLang;
-	wxArrayString arrayStringFor_GCSystemLang;
-	wxArrayString arrayStringFor_WiiSensBarPos;
-	wxArrayString arrayStringFor_WiiAspectRatio;
-	wxArrayString arrayStringFor_WiiSystemLang;
-	wxArrayString arrayStringFor_ISOPaths;
-
-	void InitializeGUILists();
-	void InitializeGUIValues();
-	void InitializeGUITooltips();
-
-	void CreateGUIControls();
-	void UpdateGUI();
-	void OnClose(wxCloseEvent& event);
-
-	void CoreSettingsChanged(wxCommandEvent& event);
-
-	void DisplaySettingsChanged(wxCommandEvent& event);
-	void OnSpin(wxSpinEvent& event);
-
-	void AudioSettingsChanged(wxCommandEvent& event);
-	void AddAudioBackends();
-
-	void GCSettingsChanged(wxCommandEvent& event);
-	void ChooseMemcardPath(std::string& strMemcard, bool isSlotA);
-	void ChooseSIDevice(wxString deviceName, int deviceNum);
-	void ChooseEXIDevice(wxString deviceName, int deviceNum);
-
-	void WiiSettingsChanged(wxCommandEvent& event);
-	// Change from IPL.LNG value to country code
-	inline u8 GetSADRCountryCode(int language);
-
-	void ISOPathsSelectionChanged(wxCommandEvent& event);
-	void RecursiveDirectoryChanged(wxCommandEvent& event);
-	void AddRemoveISOPaths(wxCommandEvent& event);
-	void DefaultISOChanged(wxFileDirPickerEvent& event);
-	void DVDRootChanged(wxFileDirPickerEvent& event);
-	void ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED (event));
-	void NANDRootChanged(wxFileDirPickerEvent& event);
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	static bool SupportsVolumeChanges(std::string backend);
-};
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
deleted file mode 100644
index 64348e3cd4..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "BreakpointDlg.h"
-#include "StringUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "BreakpointWindow.h"
-#include "../WxUtils.h"
-
-BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog)
-	EVT_BUTTON(wxID_OK, BreakPointDlg::OnOK)
-END_EVENT_TABLE()
-
-BreakPointDlg::BreakPointDlg(CBreakPointWindow *_Parent)
-	: wxDialog(_Parent, wxID_ANY, wxT("BreakPoint"), wxDefaultPosition, wxDefaultSize)
-	, Parent(_Parent)
-{
-	m_pEditAddress = new wxTextCtrl(this, wxID_ANY, wxT("80000000"));
-
-	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
-	sMainSizer->Add(m_pEditAddress, 0, wxEXPAND | wxALL, 5);
-	sMainSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxALL, 5);
-
-	SetSizerAndFit(sMainSizer);
-	SetFocus();
-}
-
-void BreakPointDlg::OnOK(wxCommandEvent& event)
-{
-	wxString AddressString = m_pEditAddress->GetLineText(0);
-	u32 Address = 0;
-	if (AsciiToHex(WxStrToStr(AddressString).c_str(), Address))
-	{
-		PowerPC::breakpoints.Add(Address);
-		Parent->NotifyUpdate();
-		Close();
-	}
-	else
-	{
-		PanicAlert("The address %s is invalid.", WxStrToStr(AddressString).c_str());
-	}
-
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
deleted file mode 100644
index b5d6248e6f..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __BREAKPOINTDLG_h__
-#define __BREAKPOINTDLG_h__
-
-
-#include <wx/wx.h>
-
-class CBreakPointWindow;
-
-class BreakPointDlg : public wxDialog
-{
-public:
-	BreakPointDlg(CBreakPointWindow *_Parent);
-	
-private:
-	CBreakPointWindow *Parent;
-	wxTextCtrl *m_pEditAddress;
-
-	void OnOK(wxCommandEvent& event);
-
-	DECLARE_EVENT_TABLE();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
deleted file mode 100644
index c3d366c1dc..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/wx.h>
-
-#include "BreakpointView.h"
-#include "DebuggerUIUtil.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Memmap.h"
-#include "../WxUtils.h"
-
-CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id)
-	: wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize,
-			wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING)
-{
-	SetFont(DebuggerFont);
-	Refresh();
-}
-
-void CBreakPointView::Update()
-{
-	ClearAll();
-
-	InsertColumn(0, wxT("Active"));
-	InsertColumn(1, wxT("Type"));
-	InsertColumn(2, wxT("Function"));
-	InsertColumn(3, wxT("Address"));
-	InsertColumn(4, wxT("Flags"));
-
-	char szBuffer[64];
-	const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();
-	for (size_t i = 0; i < rBreakPoints.size(); i++)
-	{
-		const TBreakPoint& rBP = rBreakPoints[i];
-		if (!rBP.bTemporary)
-		{
-			wxString temp;
-			temp = StrToWxStr(rBP.bOn ? "on" : " ");
-			int Item = InsertItem(0, temp);
-			temp = StrToWxStr("BP");
-			SetItem(Item, 1, temp);
-			
-			Symbol *symbol = g_symbolDB.GetSymbolFromAddr(rBP.iAddress);
-			if (symbol)
-			{
-				temp = StrToWxStr(g_symbolDB.GetDescription(rBP.iAddress));
-				SetItem(Item, 2, temp);
-			}
-			
-			sprintf(szBuffer, "%08x", rBP.iAddress);
-			temp = StrToWxStr(szBuffer);
-			SetItem(Item, 3, temp);
-
-			SetItemData(Item, rBP.iAddress);
-		}
-	}
-
-	const MemChecks::TMemChecks& rMemChecks = PowerPC::memchecks.GetMemChecks();
-	for (size_t i = 0; i < rMemChecks.size(); i++)
-	{
-		const TMemCheck& rMemCheck = rMemChecks[i];
-
-		wxString temp;
-		temp = StrToWxStr((rMemCheck.Break || rMemCheck.Log) ? "on" : " ");
-		int Item = InsertItem(0, temp);
-		temp = StrToWxStr("MC");
-		SetItem(Item, 1, temp);
-
-		Symbol *symbol = g_symbolDB.GetSymbolFromAddr(rMemCheck.StartAddress);
-		if (symbol)
-		{
-			temp = StrToWxStr(g_symbolDB.GetDescription(rMemCheck.StartAddress));
-			SetItem(Item, 2, temp);
-		}
-
-		sprintf(szBuffer, "%08x to %08x", rMemCheck.StartAddress, rMemCheck.EndAddress);
-		temp = StrToWxStr(szBuffer);
-		SetItem(Item, 3, temp);
-
-		size_t c = 0;
-		if (rMemCheck.OnRead) szBuffer[c++] = 'r';
-		if (rMemCheck.OnWrite) szBuffer[c++] = 'w';
-		szBuffer[c] = 0x00;
-		temp = StrToWxStr(szBuffer);
-		SetItem(Item, 4, temp);
-
-		SetItemData(Item, rMemCheck.StartAddress);
-	}
-
-	Refresh();
-}
-
-void CBreakPointView::DeleteCurrentSelection()
-{
-	int Item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (Item >= 0)
-	{
-		u32 Address = (u32)GetItemData(Item);
-		PowerPC::breakpoints.Remove(Address);
-		PowerPC::memchecks.Remove(Address);
-		Update();
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
deleted file mode 100644
index 08c38de97e..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __BREAKPOINTVIEW_h__
-#define __BREAKPOINTVIEW_h__
-
-#include <wx/listctrl.h>
-#include "Common.h"
-
-class CBreakPointView : public wxListCtrl
-{
-public:
-	CBreakPointView(wxWindow* parent, const wxWindowID id);
-
-	void Update();
-	void DeleteCurrentSelection();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
deleted file mode 100644
index a39196697c..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "BreakpointWindow.h"
-#include "BreakpointView.h"
-#include "CodeWindow.h"
-#include "HW/Memmap.h"
-#include "BreakpointDlg.h"
-#include "MemoryCheckDlg.h"
-#include "Host.h"
-#include "PowerPC/PowerPC.h"
-#include "FileUtil.h"
-
-extern "C" {
-#include "../../resources/toolbar_add_breakpoint.c"
-#include "../../resources/toolbar_add_memorycheck.c"
-#include "../../resources/toolbar_debugger_delete.c"
-}
-
-class CBreakPointBar : public wxAuiToolBar
-{
-public:
-	CBreakPointBar(CBreakPointWindow* parent, const wxWindowID id)
-		: wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize,
-				wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT)
-	{
-		SetToolBitmapSize(wxSize(24, 24));
-
-		m_Bitmaps[Toolbar_Delete] =
-		   	wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(24, 24));
-		m_Bitmaps[Toolbar_Add_BP] =
-		   	wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(24, 24));
-		m_Bitmaps[Toolbar_Add_MC] =
-			wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24));
-
-		AddTool(ID_DELETE, wxT("Delete"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnDelete, parent, ID_DELETE);
-
-		AddTool(ID_CLEAR, wxT("Clear"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnClear, parent, ID_CLEAR);
-
-		AddTool(ID_ADDBP, wxT("+BP"), m_Bitmaps[Toolbar_Add_BP]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP);
-
-		// Add memory breakpoints if you can use them
-		if (Memory::AreMemoryBreakpointsActivated())
-		{
-			AddTool(ID_ADDMC, wxT("+MC"), m_Bitmaps[Toolbar_Add_MC]);
-			Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC);
-		}
-
-		AddTool(ID_LOAD, wxT("Load"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::LoadAll, parent, ID_LOAD);
-
-		AddTool(ID_SAVE, wxT("Save"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE);
-	}
-
-private:
-
-	enum
-	{
-		Toolbar_Delete,
-		Toolbar_Add_BP,
-		Toolbar_Add_MC,
-		Num_Bitmaps
-	};
-
-	enum
-	{
-		ID_DELETE = 2000,
-		ID_CLEAR,
-		ID_ADDBP,
-		ID_ADDMC,
-		ID_LOAD,
-		ID_SAVE
-	};
-
-	wxBitmap m_Bitmaps[Num_Bitmaps];
-};
-
-BEGIN_EVENT_TABLE(CBreakPointWindow, wxPanel)
-	EVT_CLOSE(CBreakPointWindow::OnClose)
-	EVT_LIST_ITEM_SELECTED(wxID_ANY, CBreakPointWindow::OnSelectBP)
-END_EVENT_TABLE()
-
-CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent,
-	   	wxWindowID id, const wxString& title, const wxPoint& position,
-	   	const wxSize& size, long style)
-	: wxPanel(parent, id, position, size, style, title)
-	, m_pCodeWindow(_pCodeWindow)
-{
-	m_mgr.SetManagedWindow(this);
-	m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
-
-	m_BreakPointListView = new CBreakPointView(this, wxID_ANY);
-
-	m_mgr.AddPane(new CBreakPointBar(this, wxID_ANY), wxAuiPaneInfo().ToolbarPane().Top().
-			LeftDockable(false).RightDockable(false).BottomDockable(false).Floatable(false));
-	m_mgr.AddPane(m_BreakPointListView, wxAuiPaneInfo().CenterPane());
-	m_mgr.Update();
-}
-
-CBreakPointWindow::~CBreakPointWindow()
-{
-	m_mgr.UnInit();
-}
-
-void CBreakPointWindow::OnClose(wxCloseEvent& event)
-{
-	SaveAll();
-	event.Skip();
-}
-
-void CBreakPointWindow::NotifyUpdate()
-{
-	m_BreakPointListView->Update();
-}
-
-void CBreakPointWindow::OnDelete(wxCommandEvent& WXUNUSED(event))
-{
-	m_BreakPointListView->DeleteCurrentSelection();
-}
-
-// jump to begin addr
-void CBreakPointWindow::OnSelectBP(wxListEvent& event)
-{
-	long Index = event.GetIndex();
-	if (Index >= 0)
-	{
-		u32 Address = (u32)m_BreakPointListView->GetItemData(Index);
-		if (m_pCodeWindow)
-			m_pCodeWindow->JumpToAddress(Address);
-	}
-}
-
-// Clear all breakpoints and memchecks
-void CBreakPointWindow::OnClear(wxCommandEvent& WXUNUSED(event))
-{
-	PowerPC::breakpoints.Clear();
-	PowerPC::memchecks.Clear();
-	NotifyUpdate();
-}
-
-void CBreakPointWindow::OnAddBreakPoint(wxCommandEvent& WXUNUSED(event))
-{
-	BreakPointDlg bpDlg(this);
-	bpDlg.ShowModal();
-}
-
-void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event))
-{
-	MemoryCheckDlg memDlg(this);
-	memDlg.ShowModal();
-}
-
-void CBreakPointWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
-{
-	SaveAll();
-}
-
-void CBreakPointWindow::SaveAll()
-{
-	// simply dump all to bp/mc files in a way we can read again
-	IniFile ini;
-	if (ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)))
-	{
-		ini.SetLines("BreakPoints", PowerPC::breakpoints.GetStrings());
-		ini.SetLines("MemoryChecks", PowerPC::memchecks.GetStrings());
-		ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-	}
-}
-
-void CBreakPointWindow::LoadAll(wxCommandEvent& WXUNUSED(event))
-{
-	IniFile ini;
-	BreakPoints::TBreakPointsStr newbps;
-	MemChecks::TMemChecksStr newmcs;
-	
-	if (!ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)))
-		return;
-	
-	if (ini.GetLines("BreakPoints", newbps, false))
-		PowerPC::breakpoints.AddFromStrings(newbps);
-	if (ini.GetLines("MemoryChecks", newmcs, false))
-		PowerPC::memchecks.AddFromStrings(newmcs);
-
-	NotifyUpdate();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
deleted file mode 100644
index 4f54e823aa..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __BREAKPOINTWINDOW_h__
-#define __BREAKPOINTWINDOW_h__
-
-#include <wx/wx.h>
-#include <wx/listctrl.h>
-#include <wx/aui/aui.h>
-
-class CBreakPointView;
-class CCodeWindow;
-
-class CBreakPointWindow : public wxPanel
-{
-public:
-
-	CBreakPointWindow(CCodeWindow* _pCodeWindow,
-		wxWindow* parent,
-		wxWindowID id = wxID_ANY,
-		const wxString& title = wxT("Breakpoints"),
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		long style = wxTAB_TRAVERSAL | wxBORDER_NONE);
-	~CBreakPointWindow();
-
-	void NotifyUpdate();
-
-	void OnDelete(wxCommandEvent& WXUNUSED(event));
-	void OnClear(wxCommandEvent& WXUNUSED(event));
-	void OnAddBreakPoint(wxCommandEvent& WXUNUSED(event));
-	void OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event));
-	void Event_SaveAll(wxCommandEvent& WXUNUSED(event));
-	void SaveAll();
-	void LoadAll(wxCommandEvent& WXUNUSED(event));
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	wxAuiManager m_mgr;
-	CBreakPointView* m_BreakPointListView;
-	CCodeWindow* m_pCodeWindow;
-
-	void OnClose(wxCloseEvent& event);
-	void OnSelectBP(wxListEvent& event);
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
deleted file mode 100644
index bcfb1ab586..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "StringUtil.h"
-#include "DebuggerUIUtil.h"
-#include "DebugInterface.h"
-
-#include "Host.h"
-#include "CodeView.h"
-#include "SymbolDB.h"
-#include "../WxUtils.h"
-
-#include <wx/event.h>
-#include <wx/clipbrd.h>
-#include <wx/textdlg.h>
-
-DEFINE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE);
-
-enum
-{
-	IDM_GOTOINMEMVIEW = 12000,
-	IDM_COPYADDRESS,
-	IDM_COPYHEX,
-	IDM_COPYCODE,
-	IDM_INSERTBLR, IDM_INSERTNOP,
-	IDM_RUNTOHERE,
-	IDM_JITRESULTS,
-	IDM_FOLLOWBRANCH,
-	IDM_RENAMESYMBOL,
-	IDM_PATCHALERT,
-	IDM_COPYFUNCTION,
-	IDM_ADDFUNCTION,
-};
-
-BEGIN_EVENT_TABLE(CCodeView, wxControl)
-	EVT_ERASE_BACKGROUND(CCodeView::OnErase)
-	EVT_PAINT(CCodeView::OnPaint)
-	EVT_LEFT_DOWN(CCodeView::OnMouseDown)
-	EVT_LEFT_UP(CCodeView::OnMouseUpL)
-	EVT_MOTION(CCodeView::OnMouseMove)
-	EVT_RIGHT_DOWN(CCodeView::OnMouseDown)
-	EVT_RIGHT_UP(CCodeView::OnMouseUpR)
-	EVT_MENU(-1, CCodeView::OnPopupMenu)
-	EVT_SIZE(CCodeView::OnResize)
-END_EVENT_TABLE()
-
-CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb,
-		wxWindow* parent, wxWindowID Id)
-	: wxControl(parent, Id),
-	  debugger(debuginterface),
-	  symbol_db(symboldb),
-	  plain(false),
-	  curAddress(debuginterface->getPC()),
-	  align(debuginterface->getInstructionSize(0)),
-	  rowHeight(13),
-	  selection(0),
-	  oldSelection(0),
-	  selecting(false),
-	  lx(-1),
-	  ly(-1)
-{
-}
-
-int CCodeView::YToAddress(int y)
-{
-	wxRect rc = GetClientRect();
-	int ydiff = y - rc.height / 2 - rowHeight / 2;
-	ydiff = (int)(floorf((float)ydiff / (float)rowHeight)) + 1;
-	return curAddress + ydiff * align;
-}
-
-void CCodeView::OnMouseDown(wxMouseEvent& event)
-{
-	int x = event.m_x;
-	int y = event.m_y;
-
-	if (x > 16)
-	{
-		oldSelection = selection;
-		selection = YToAddress(y);
-		// SetCapture(wnd);
-		bool oldselecting = selecting;
-		selecting = true;
-
-		if (!oldselecting || (selection != oldSelection))
-			Refresh();
-	}
-	else
-	{
-		ToggleBreakpoint(YToAddress(y));
-	}
-
-	event.Skip(true);
-}
-
-void CCodeView::ToggleBreakpoint(u32 address)
-{
-	debugger->toggleBreakpoint(address);
-	Refresh();
-	Host_UpdateBreakPointView();
-}
-
-void CCodeView::OnMouseMove(wxMouseEvent& event)
-{
-	wxRect rc = GetClientRect();
-
-	if (event.m_leftDown && event.m_x > 16)
-	{
-		if (event.m_y < 0)
-		{
-			curAddress -= align;
-			Refresh();
-		}
-		else if (event.m_y > rc.height)
-		{
-			curAddress += align;
-			Refresh();
-		}
-		else
-		{
-			OnMouseDown(event);
-		}
-	}
-
-	event.Skip(true);
-}
-
-void CCodeView::RaiseEvent()
-{
-	wxCommandEvent ev(wxEVT_CODEVIEW_CHANGE, GetId());
-	ev.SetEventObject(this);
-	ev.SetInt(selection);
-	GetEventHandler()->ProcessEvent(ev);
-}
-
-void CCodeView::OnMouseUpL(wxMouseEvent& event)
-{
-	if (event.m_x > 16)
-	{
-		curAddress = YToAddress(event.m_y);
-		selecting = false;
-		Refresh();
-	}
-	RaiseEvent();
-	event.Skip(true);
-}
-
-u32 CCodeView::AddrToBranch(u32 addr)
-{
-	char disasm[256];
-	debugger->disasm(addr, disasm, 256);
-	const char *mojs = strstr(disasm, "->0x");
-	if (mojs)
-	{
-		u32 dest;
-		sscanf(mojs+4,"%08x", &dest);
-		return dest;
-	}
-	return 0;
-}
-
-void CCodeView::InsertBlrNop(int Blr)
-{
-	// Check if this address has been modified
-	int find = -1;
-	for(u32 i = 0; i < BlrList.size(); i++)
-	{
-		if(BlrList.at(i).Address == selection)
-		{
-			find = i;
-			break;
-		}
-	}
-
-	// Save the old value
-	if (find >= 0)
-	{
-		debugger->writeExtraMemory(0, BlrList.at(find).OldValue, selection);
-		BlrList.erase(BlrList.begin() + find);
-	}
-	else
-	{
-		BlrStruct Temp;
-		Temp.Address = selection;
-		Temp.OldValue = debugger->readMemory(selection);
-		BlrList.push_back(Temp);
-		if (Blr == 0)
-			debugger->insertBLR(selection, 0x4e800020);
-		else
-			debugger->insertBLR(selection, 0x60000000);
-	}
-	Refresh();
-}
-
-void CCodeView::OnPopupMenu(wxCommandEvent& event)
-{
-#if wxUSE_CLIPBOARD
-	wxTheClipboard->Open();
-#endif
-
-	switch (event.GetId())
-	{
-		case IDM_GOTOINMEMVIEW:
-			// CMemoryDlg::Goto(selection);
-			break;
-
-#if wxUSE_CLIPBOARD
-		case IDM_COPYADDRESS:
-			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
-			break;
-
-		case IDM_COPYCODE:
-			{
-				char disasm[256];
-				debugger->disasm(selection, disasm, 256);
-				wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(disasm)));
-			}
-			break;
-
-		case IDM_COPYHEX:
-			{
-				char temp[24];
-				sprintf(temp, "%08x", debugger->readInstruction(selection));
-				wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
-			}
-			break;
-
-
-		case IDM_COPYFUNCTION:
-			{
-				Symbol *symbol = symbol_db->GetSymbolFromAddr(selection);
-				if (symbol)
-				{
-					std::string text;
-					text = text + symbol->name + "\r\n";
-					// we got a function
-					u32 start = symbol->address;
-					u32 end = start + symbol->size;
-					for (u32 addr = start; addr != end; addr += 4)
-					{
-						char disasm[256];
-						debugger->disasm(addr, disasm, 256);
-						text = text + StringFromFormat("%08x: ", addr) + disasm + "\r\n";
-					}
-					wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(text)));
-				}
-			}
-			break;
-#endif
-
-		case IDM_RUNTOHERE:
-			debugger->setBreakpoint(selection);
-			debugger->runToBreakpoint();
-			Refresh();
-			break;
-
-		// Insert blr or restore old value
-		case IDM_INSERTBLR:
-			InsertBlrNop(0);
-			Refresh();
-			break;
-		case IDM_INSERTNOP:
-			InsertBlrNop(1);
-			Refresh();
-			break;
-
-		case IDM_JITRESULTS:
-			debugger->showJitResults(selection);
-			break;
-			
-		case IDM_FOLLOWBRANCH:
-			{
-				u32 dest = AddrToBranch(selection);
-				if (dest)
-				{
-					Center(dest);
-					RaiseEvent();
-				}
-			}
-			break;
-	
-		case IDM_ADDFUNCTION:
-			symbol_db->AddFunction(selection);
-			Host_NotifyMapLoaded();
-			break;
-
-		case IDM_RENAMESYMBOL:
-			{
-				Symbol *symbol = symbol_db->GetSymbolFromAddr(selection);
-				if (symbol)
-				{
-					wxTextEntryDialog input_symbol(this, StrToWxStr("Rename symbol:"),
-							wxGetTextFromUserPromptStr,
-							StrToWxStr(symbol->name));
-					if (input_symbol.ShowModal() == wxID_OK)
-					{
-						symbol->name = WxStrToStr(input_symbol.GetValue());
-						Refresh(); // Redraw to show the renamed symbol
-					}
-					Host_NotifyMapLoaded();
-				}
-			}
-			break;
-
-		case IDM_PATCHALERT:
-			break;
-	}
-
-#if wxUSE_CLIPBOARD
-	wxTheClipboard->Close();
-#endif
-	event.Skip(true);
-}
-
-void CCodeView::OnMouseUpR(wxMouseEvent& event)
-{
-	bool isSymbol = symbol_db->GetSymbolFromAddr(selection) != 0;
-	// popup menu
-	wxMenu* menu = new wxMenu;
-	//menu->Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
-	menu->Append(IDM_FOLLOWBRANCH,
-			StrToWxStr("&Follow branch"))->Enable(AddrToBranch(selection) ? true : false);
-	menu->AppendSeparator();
-#if wxUSE_CLIPBOARD
-	menu->Append(IDM_COPYADDRESS, StrToWxStr("Copy &address"));
-	menu->Append(IDM_COPYFUNCTION, StrToWxStr("Copy &function"))->Enable(isSymbol);
-	menu->Append(IDM_COPYCODE, StrToWxStr("Copy &code line"));
-	menu->Append(IDM_COPYHEX, StrToWxStr("Copy &hex"));
-	menu->AppendSeparator();
-#endif
-	menu->Append(IDM_RENAMESYMBOL, StrToWxStr("Rename &symbol"))->Enable(isSymbol);
-	menu->AppendSeparator();
-	menu->Append(IDM_RUNTOHERE, _("&Run To Here"));
-	menu->Append(IDM_ADDFUNCTION, _("&Add function"));
-	menu->Append(IDM_JITRESULTS, StrToWxStr("PPC vs X86"));
-	menu->Append(IDM_INSERTBLR, StrToWxStr("Insert &blr"));
-	menu->Append(IDM_INSERTNOP, StrToWxStr("Insert &nop"));
-	menu->Append(IDM_PATCHALERT, StrToWxStr("Patch alert"));
-	PopupMenu(menu);
-	event.Skip(true);
-}
-
-void CCodeView::OnErase(wxEraseEvent& event)
-{}
-
-void CCodeView::OnPaint(wxPaintEvent& event)
-{
-	// --------------------------------------------------------------------
-	// General settings
-	// -------------------------
-	wxPaintDC dc(this);
-	wxRect rc = GetClientRect();
-
-	dc.SetFont(DebuggerFont);
-
-	wxCoord w,h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h);
-
-	if (h > rowHeight)
-		rowHeight = h;
-
-	dc.GetTextExtent(_T("W"),&w,&h);
-	int charWidth = w;
-
-	struct branch
-	{
-		int src, dst, srcAddr;
-	};
-
-	branch branches[256];
-	int numBranches = 0;
-	// TODO: Add any drawing code here...
-	int width   = rc.width;
-	int numRows = (rc.height / rowHeight) / 2 + 2;
-	// ------------
-
-	// --------------------------------------------------------------------
-	// Colors and brushes
-	// -------------------------	
-	dc.SetBackgroundMode(wxTRANSPARENT); // the text background
-	const wxChar* bgColor = _T("#ffffff");
-	wxPen nullPen(bgColor);
-	wxPen currentPen(_T("#000000"));
-	wxPen selPen(_T("#808080")); // gray
-	nullPen.SetStyle(wxTRANSPARENT);
-	currentPen.SetStyle(wxSOLID);
-	wxBrush currentBrush(_T("#FFEfE8")); // light gray
-	wxBrush pcBrush(_T("#70FF70")); // green	
-	wxBrush bpBrush(_T("#FF3311")); // red
-
-	wxBrush bgBrush(bgColor);
-	wxBrush nullBrush(bgColor);
-	nullBrush.SetStyle(wxTRANSPARENT);
-
-	dc.SetPen(nullPen);
-	dc.SetBrush(bgBrush);
-	dc.DrawRectangle(0, 0, 16, rc.height);
-	dc.DrawRectangle(0, 0, rc.width, 5);
-	// ------------
-
-	// --------------------------------------------------------------------
-	// Walk through all visible rows
-	// -------------------------
-	for (int i = -numRows; i <= numRows; i++)
-	{
-		unsigned int address = curAddress + i * align;
-
-		int rowY1 = rc.height / 2 + rowHeight * i - rowHeight / 2;
-		int rowY2 = rc.height / 2 + rowHeight * i + rowHeight / 2;
-
-		wxString temp = wxString::Format(_T("%08x"), address);
-		u32 col = debugger->getColor(address);
-		wxBrush rowBrush(wxColor(col >> 16, col >> 8, col));
-		dc.SetBrush(nullBrush);
-		dc.SetPen(nullPen);
-		dc.DrawRectangle(0, rowY1, 16, rowY2 - rowY1 + 2);
-
-		if (selecting && (address == selection))
-			dc.SetPen(selPen);
-		else
-			dc.SetPen(i == 0 ? currentPen : nullPen);
-
-		if (address == debugger->getPC())
-			dc.SetBrush(pcBrush);
-		else
-			dc.SetBrush(rowBrush);
-
-		dc.DrawRectangle(16, rowY1, width, rowY2 - rowY1 + 1);
-		dc.SetBrush(currentBrush);
-		if (!plain)
-		{
-			dc.SetTextForeground(_T("#600000")); // the address text is dark red
-			dc.DrawText(temp, 17, rowY1);
-			dc.SetTextForeground(_T("#000000"));
-		}
-
-		// If running
-		if (debugger->isAlive())
-		{
-			char dis[256];
-			debugger->disasm(address, dis, 256);
-			char* dis2 = strchr(dis, '\t');
-			char desc[256] = "";
-
-			// If we have a code
-			if (dis2)
-			{
-				*dis2 = 0;
-				dis2++;
-				// look for hex strings to decode branches
-				const char* mojs = strstr(dis2, "0x8");
-				if (mojs)
-				{
-					for (int k = 0; k < 8; k++)
-					{
-						bool found = false;
-						for (int j = 0; j < 22; j++)
-						{
-							if (mojs[k + 2] == "0123456789ABCDEFabcdef"[j])
-								found = true;
-						}
-						if (!found)
-						{
-							mojs = 0;
-							break;
-						}
-					}
-				}
-				if (mojs)
-				{
-					int offs;
-					sscanf(mojs + 2, "%08x", &offs);
-					branches[numBranches].src = rowY1 + rowHeight / 2;
-					branches[numBranches].srcAddr = address / align;
-					branches[numBranches++].dst = (int)(rowY1 + ((s64)(u32)offs - (s64)(u32)address) * rowHeight / align + rowHeight / 2);
-					sprintf(desc, "-->%s", debugger->getDescription(offs).c_str());
-					dc.SetTextForeground(_T("#600060")); // the -> arrow illustrations are purple
-				}
-				else
-				{
-					dc.SetTextForeground(_T("#000000"));
-				}
-
-				dc.DrawText(StrToWxStr(dis2), 17 + 17*charWidth, rowY1);
-				// ------------
-			}
-
-			// Show blr as its' own color
-			if (strcmp(dis, "blr"))
-				dc.SetTextForeground(_T("#007000")); // dark green
-			else
-				dc.SetTextForeground(_T("#8000FF")); // purple
-
-			dc.DrawText(StrToWxStr(dis), 17 + (plain ? 1*charWidth : 9*charWidth), rowY1);
-
-			if (desc[0] == 0)
-			{
-				strcpy(desc, debugger->getDescription(address).c_str());
-			}
-
-			if (!plain)
-			{
-				dc.SetTextForeground(_T("#0000FF")); // blue
-
-				//char temp[256];
-				//UnDecorateSymbolName(desc,temp,255,UNDNAME_COMPLETE);
-				if (strlen(desc))
-				{
-					dc.DrawText(StrToWxStr(desc), 17 + 35 * charWidth, rowY1);
-				}
-			}
-
-			// Show red breakpoint dot
-			if (debugger->isBreakpoint(address))
-			{
-				dc.SetBrush(bpBrush);
-				dc.DrawRectangle(2, rowY1 + 1, 11, 11);
-			}
-		}
-	} // end of for
-	// ------------
-
-	// --------------------------------------------------------------------
-	// Colors and brushes
-	// -------------------------
-	dc.SetPen(currentPen);
-	
-	for (int i = 0; i < numBranches; i++)
-	{
-		int x = 17 + 49 * charWidth + (branches[i].srcAddr % 9) * 8;
-		_MoveTo(x-2, branches[i].src);
-
-		if (branches[i].dst < rc.height + 400 && branches[i].dst > -400)
-		{
-			_LineTo(dc, x+2, branches[i].src);
-			_LineTo(dc, x+2, branches[i].dst);
-			_LineTo(dc, x-4, branches[i].dst);
-
-			_MoveTo(x, branches[i].dst - 4);
-			_LineTo(dc, x-4, branches[i].dst);
-			_LineTo(dc, x+1, branches[i].dst+5);
-		}
-		//else
-		//{
-			// This can be re-enabled when there is a scrollbar or
-			// something on the codeview (the lines are too long)
-
-			//_LineTo(dc, x+4, branches[i].src);
-			//_MoveTo(x+2, branches[i].dst-4);
-			//_LineTo(dc, x+6, branches[i].dst);
-			//_LineTo(dc, x+1, branches[i].dst+5);
-		//}
-
-		//_LineTo(dc, x, branches[i].dst+4);
-		//_LineTo(dc, x-2, branches[i].dst);
-	}
-	// ------------
-}
-
-void CCodeView::_LineTo(wxPaintDC &dc, int x, int y)
-{
-	dc.DrawLine(lx, ly, x, y);
-	lx = x;
-	ly = y;
-}
-
-void CCodeView::OnResize(wxSizeEvent& event)
-{
-	Refresh();
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.h b/Source/Core/DolphinWX/Src/Debugger/CodeView.h
deleted file mode 100644
index 5618abf4d7..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/CodeView.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef CODEVIEW_H_
-#define CODEVIEW_H_
-
-#define wxUSE_XPM_IN_MSW 1
-#define USE_XPM_BITMAPS 1
-
-#include <wx/wx.h>
-
-#include "Common.h"
-
-#include <vector>
-
-DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1);
-
-class DebugInterface;
-class SymbolDB;
-
-class CCodeView : public wxControl
-{
-public:
-	CCodeView(DebugInterface* debuginterface, SymbolDB *symbol_db,
-			wxWindow* parent, wxWindowID Id = wxID_ANY);
-	void OnPaint(wxPaintEvent& event);
-	void OnErase(wxEraseEvent& event);
-	void OnMouseDown(wxMouseEvent& event);
-	void OnMouseMove(wxMouseEvent& event);
-	void OnMouseUpL(wxMouseEvent& event);
-	void OnMouseUpR(wxMouseEvent& event);
-	void OnPopupMenu(wxCommandEvent& event);
-	void InsertBlrNop(int);
-
-	u32 GetSelection() {return(selection);}
-	void ToggleBreakpoint(u32 address);	
-
-	struct BlrStruct // for IDM_INSERTBLR
-	{
-		u32 Address;
-		u32 OldValue;
-	};
-	std::vector<BlrStruct> BlrList;
-
-	void Center(u32 addr)
-	{
-		curAddress = addr;
-		selection = addr;
-		Refresh();
-	}
-
-	void SetPlain()
-	{
-		plain = true;
-	}
-
-private:
-	void RaiseEvent();
-	int YToAddress(int y);
-
-	u32 AddrToBranch(u32 addr);
-	void OnResize(wxSizeEvent& event);
-
-	DebugInterface* debugger;
-	SymbolDB* symbol_db;
-
-	bool plain;
-
-	int curAddress;
-	int align;
-	int rowHeight;
-
-	u32 selection;
-	u32 oldSelection;
-	bool selecting;
-
-	int lx, ly;
-	void _MoveTo(int x, int y) {lx = x; ly = y;}
-	void _LineTo(wxPaintDC &dc, int x, int y);
-
-	DECLARE_EVENT_TABLE()
-};
-
-#endif /*CODEVIEW_H_*/
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
deleted file mode 100644
index 4853e0396b..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Include
-#include "Common.h"
-
-#include <wx/wx.h>
-
-#include "Host.h"
-
-#include "RegisterWindow.h"
-#include "BreakpointWindow.h"
-#include "MemoryWindow.h"
-#include "JitWindow.h"
-
-#include "CodeWindow.h"
-#include "CodeView.h"
-
-#include "../WxUtils.h"
-#include "FileUtil.h"
-#include "Core.h"
-#include "HW/Memmap.h"
-#include "HLE/HLE.h"
-#include "Boot/Boot.h"
-#include "LogManager.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitInterface.h"
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/Profiler.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCTables.h"
-
-#include "ConfigManager.h"
-
-extern "C"  // Bitmaps
-{
-	#include "../../resources/toolbar_add_memorycheck.c"
-	#include "../../resources/toolbar_add_breakpoint.c"
-}
-
-// -------
-// Main
-
-BEGIN_EVENT_TABLE(CCodeWindow, wxPanel)
-
-	// Menu bar
-	EVT_MENU_RANGE(IDM_INTERPRETER, IDM_JITSROFF, CCodeWindow::OnCPUMode)
-	EVT_MENU(IDM_FONTPICKER, CCodeWindow::OnChangeFont)
-	EVT_MENU_RANGE(IDM_CLEARCODECACHE, IDM_SEARCHINSTRUCTION, CCodeWindow::OnJitMenu)
-	EVT_MENU_RANGE(IDM_CLEARSYMBOLS, IDM_PATCHHLEFUNCTIONS, CCodeWindow::OnSymbolsMenu)
-	EVT_MENU_RANGE(IDM_PROFILEBLOCKS, IDM_WRITEPROFILE, CCodeWindow::OnProfilerMenu)
-
-	// Toolbar
-	EVT_MENU_RANGE(IDM_STEP, IDM_GOTOPC, CCodeWindow::OnCodeStep)
-	EVT_TEXT(IDM_ADDRBOX, CCodeWindow::OnAddrBoxChange)
-
-	// Other
-	EVT_LISTBOX(ID_SYMBOLLIST,			CCodeWindow::OnSymbolListChange)
-	EVT_LISTBOX(ID_CALLSTACKLIST,		CCodeWindow::OnCallstackListChange)
-	EVT_LISTBOX(ID_CALLERSLIST,			CCodeWindow::OnCallersListChange)
-	EVT_LISTBOX(ID_CALLSLIST,			CCodeWindow::OnCallsListChange)
-
-	EVT_HOST_COMMAND(wxID_ANY,			CCodeWindow::OnHostMessage)
-
-END_EVENT_TABLE()
-
-// Class
-CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, CFrame *parent,
-	wxWindowID id, const wxPoint& position, const wxSize& size, long style, const wxString& name)
-	: wxPanel((wxWindow*)parent, id, position, size, style, name)
-	, Parent(parent)
-	, m_RegisterWindow(NULL)
-	, m_BreakpointWindow(NULL)
-	, m_MemoryWindow(NULL)
-	, m_JitWindow(NULL)
-	, m_SoundWindow(NULL)
-	, m_VideoWindow(NULL)
-	, codeview(NULL)
-{
-	InitBitmaps();
-
-	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);
-
-	DebugInterface* di = &PowerPC::debug_interface;
-
-	codeview = new CCodeView(di, &g_symbolDB, this, ID_CODEVIEW);
-	sizerBig->Add(sizerLeft, 2, wxEXPAND);
-	sizerBig->Add(codeview, 5, wxEXPAND);
-
-	sizerLeft->Add(callstack = new wxListBox(this, ID_CALLSTACKLIST,
-				wxDefaultPosition, wxSize(90, 100)), 0, wxEXPAND);
-	sizerLeft->Add(symbols = new wxListBox(this, ID_SYMBOLLIST,
-				wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 1, wxEXPAND);
-	sizerLeft->Add(calls = new wxListBox(this, ID_CALLSLIST, wxDefaultPosition,
-				wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
-	sizerLeft->Add(callers = new wxListBox(this, ID_CALLERSLIST, wxDefaultPosition,
-				wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
-
-	SetSizer(sizerBig);
-
-	sizerLeft->Fit(this);
-	sizerBig->Fit(this);
-}
-
-wxMenuBar *CCodeWindow::GetMenuBar()
-{
-	return Parent->GetMenuBar();
-}
-
-wxAuiToolBar *CCodeWindow::GetToolBar()
-{
-	return Parent->m_ToolBarDebug;
-}
-
-// ----------
-// Events
-
-void CCodeWindow::OnHostMessage(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_NOTIFYMAPLOADED:
-			NotifyMapLoaded();
-			if (m_BreakpointWindow) m_BreakpointWindow->NotifyUpdate();
-			break;
-
-		case IDM_UPDATEDISASMDIALOG:
-			Update();
-			if (codeview) codeview->Center(PC);
-			if (m_RegisterWindow) m_RegisterWindow->NotifyUpdate();
-			break;
-
-		case IDM_UPDATEBREAKPOINTS:
-			Update();
-			if (m_BreakpointWindow) m_BreakpointWindow->NotifyUpdate();
-			break;
-	}
-}
-
-// The Play, Stop, Step, Skip, Go to PC and Show PC buttons go here
-void CCodeWindow::OnCodeStep(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_STEP:
-			SingleStep();
-			break;
-
-		case IDM_STEPOVER:
-			StepOver();
-			break;
-
-		case IDM_TOGGLE_BREAKPOINT:
-			ToggleBreakpoint();
-			break;
-
-		case IDM_SKIP:
-			PC += 4;
-			Update();
-			break;
-
-		case IDM_SETPC:
-			PC = codeview->GetSelection();
-			Update();
-			break;
-
-		case IDM_GOTOPC:
-			JumpToAddress(PC);
-			break;
-	}
-
-	UpdateButtonStates();
-	// Update all toolbars in the aui manager
-	Parent->UpdateGUI();
-}
-
-void CCodeWindow::JumpToAddress(u32 _Address)
-{
-	codeview->Center(_Address);
-	UpdateLists();
-}
-
-void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
-{
-	UpdateLists();
-}
-
-void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event)
-{
-	if (!GetToolBar()) return;
-
-	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)GetToolBar()->FindControl(IDM_ADDRBOX);
-	wxString txt = pAddrCtrl->GetValue();
-
-	std::string text(WxStrToStr(txt));
-	text = StripSpaces(text);
-	if (text.size() == 8)
-	{
-		u32 addr;
-		sscanf(text.c_str(), "%08x", &addr);
-		JumpToAddress(addr);
-	}
-
-	event.Skip(1);
-}
-
-void CCodeWindow::OnCallstackListChange(wxCommandEvent& event)
-{
-	int index   = callstack->GetSelection();
-	if (index >= 0)
-	{
-		u32 address = (u32)(u64)(callstack->GetClientData(index));
-		if (address)
-			JumpToAddress(address);
-	}
-}
-
-void CCodeWindow::OnCallersListChange(wxCommandEvent& event)
-{
-	int index = callers->GetSelection();
-	if (index >= 0)
-	{
-		u32 address = (u32)(u64)(callers->GetClientData(index));
-		if (address)
-			JumpToAddress(address);
-	}
-}
-
-void CCodeWindow::OnCallsListChange(wxCommandEvent& event)
-{
-	int index = calls->GetSelection();
-	if (index >= 0)
-	{
-		u32 address = (u32)(u64)(calls->GetClientData(index));
-		if (address)
-			JumpToAddress(address);
-	}
-}
-
-void CCodeWindow::SingleStep()
-{
-	if (CCPU::IsStepping())
-	{
-		JitInterface::InvalidateICache(PC, 4);
-		CCPU::StepOpcode(&sync_event);
-		wxThread::Sleep(20);
-		// need a short wait here
-		JumpToAddress(PC);
-		Update();
-		Host_UpdateLogDisplay();
-	}
-}
-
-void CCodeWindow::StepOver()
-{
-	if (CCPU::IsStepping())
-	{
-		UGeckoInstruction inst = Memory::Read_Instruction(PC);
-		if (inst.LK)
-		{
-			PowerPC::breakpoints.Add(PC + 4, true);
-			CCPU::EnableStepping(false);
-			JumpToAddress(PC);
-			Update();
-		}
-		else
-		{
-			SingleStep();
-		}
-
-		UpdateButtonStates();
-		// Update all toolbars in the aui manager
-		Parent->UpdateGUI();
-	}
-}
-
-void CCodeWindow::ToggleBreakpoint()
-{
-	if (CCPU::IsStepping())
-	{
-		if (codeview) codeview->ToggleBreakpoint(codeview->GetSelection());
-		Update();
-	}
-}
-
-void CCodeWindow::UpdateLists()
-{
-	callers->Clear();
-	u32 addr = codeview->GetSelection();
-	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
-	if (!symbol)
-		return;
-
-	for (int i = 0; i < (int)symbol->callers.size(); i++)
-	{
-		u32 caller_addr = symbol->callers[i].callAddress;
-		Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
-		if (caller_symbol)
-		{
-			int idx = callers->Append(StrToWxStr(StringFromFormat
-						("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str()));
-			callers->SetClientData(idx, (void*)(u64)caller_addr);
-		}
-	}
-
-	calls->Clear();
-	for (int i = 0; i < (int)symbol->calls.size(); i++)
-	{
-		u32 call_addr = symbol->calls[i].function;
-		Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
-		if (call_symbol)
-		{
-			int idx = calls->Append(StrToWxStr(StringFromFormat
-						("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str()));
-			calls->SetClientData(idx, (void*)(u64)call_addr);
-		}
-	}
-}
-
-void CCodeWindow::UpdateCallstack()
-{
-	if (Core::GetState() == Core::CORE_STOPPING) return;
-
-	callstack->Clear();
-
-	std::vector<Dolphin_Debugger::CallstackEntry> stack;
-
-	bool ret = Dolphin_Debugger::GetCallstack(stack);
-
-	for (size_t i = 0; i < stack.size(); i++)
-	{
-		int idx = callstack->Append(StrToWxStr(stack[i].Name));
-		callstack->SetClientData(idx, (void*)(u64)stack[i].vAddress);
-	}
-
-	if (!ret)
-		callstack->Append(StrToWxStr("invalid callstack"));
-}
-
-// Create CPU Mode menus
-void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar)
-{
-	// CPU Mode
-	wxMenu* pCoreMenu = new wxMenu;
-
-	wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _("&Interpreter core"), 
-		StrToWxStr("This is necessary to get break points"
-		" and stepping to work as explained in the Developer Documentation. But it can be very"
-		" slow, perhaps slower than 1 fps."), 
-		wxITEM_CHECK);
-	interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0);
-	pCoreMenu->AppendSeparator();
-
-	pCoreMenu->Append(IDM_JITBLOCKLINKING, _("&JIT Block Linking off"),
-		_("Provide safer execution by not linking the JIT blocks."), 
-		wxITEM_CHECK);
-
-	pCoreMenu->Append(IDM_JITNOBLOCKCACHE, _("&Disable JIT Cache"),
-		_("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.\n[This option must be selected before a game is started.]"), 
-		wxITEM_CHECK);
-	pCoreMenu->Append(IDM_CLEARCODECACHE, _("&Clear JIT cache"));
-
-	pCoreMenu->AppendSeparator();
-	pCoreMenu->Append(IDM_LOGINSTRUCTIONS, _("&Log JIT instruction coverage"));
-	pCoreMenu->Append(IDM_SEARCHINSTRUCTION, _("&Search for an op"));
-
-	pCoreMenu->AppendSeparator();
-	pCoreMenu->Append(IDM_JITOFF, _("&JIT off (JIT core)"),
-		_("Turn off all JIT functions, but still use the JIT core from Jit.cpp"),
-		wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSOFF, _("&JIT LoadStore off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSLBZXOFF, _("    &JIT LoadStore lbzx off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSLXZOFF, _("    &JIT LoadStore lXz off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSLWZOFF, _("&JIT LoadStore lwz off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSFOFF, _("&JIT LoadStore Floating off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITLSPOFF, _("&JIT LoadStore Paired off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITFPOFF, _("&JIT FloatingPoint off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITIOFF, _("&JIT Integer off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITPOFF, _("&JIT Paired off"),
-			wxEmptyString, wxITEM_CHECK);
-	pCoreMenu->Append(IDM_JITSROFF, _("&JIT SystemRegisters off"),
-			wxEmptyString, wxITEM_CHECK);
-
-	pMenuBar->Append(pCoreMenu, _("&JIT"));
-
-
-	// Debug Menu
-	wxMenu* pDebugMenu = new wxMenu;
-
-	pDebugMenu->Append(IDM_STEP, _("Step &Into\tF11"));
-	pDebugMenu->Append(IDM_STEPOVER, _("Step &Over\tF10"));
-	pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _("Toggle &Breakpoint\tF9"));
-
-	pMenuBar->Append(pDebugMenu, _("&Debug"));
-
-	CreateMenuSymbols(pMenuBar);
-}
-
-void CCodeWindow::CreateMenuOptions(wxMenu* pMenu)
-{
-	wxMenuItem* boottopause = pMenu->Append(IDM_BOOTTOPAUSE, _("Boot to pause"),
-		_("Start the game directly instead of booting to pause"), 
-		wxITEM_CHECK);
-	boottopause->Check(bBootToPause);
-
-	wxMenuItem* automaticstart = pMenu->Append(IDM_AUTOMATICSTART, _("&Automatic start"), 
-		StrToWxStr(
-		"Automatically load the Default ISO when Dolphin starts, or the last game you loaded,"
-		" if you have not given it an elf file with the --elf command line. [This can be"
-		" convenient if you are bug-testing with a certain game and want to rebuild"
-		" and retry it several times, either with changes to Dolphin or if you are"
-		" developing a homebrew game.]"), 
-		wxITEM_CHECK);
-	automaticstart->Check(bAutomaticStart);
-
-	pMenu->Append(IDM_FONTPICKER, _("&Font..."), wxEmptyString, wxITEM_NORMAL);
-}
-
-// CPU Mode and JIT Menu
-void CCodeWindow::OnCPUMode(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_INTERPRETER:
-			PowerPC::SetMode(UseInterpreter() ? PowerPC::MODE_INTERPRETER : PowerPC::MODE_JIT);
-			break;
-		case IDM_BOOTTOPAUSE:
-			bBootToPause = !bBootToPause;
-			return;
-		case IDM_AUTOMATICSTART:
-			bAutomaticStart = !bAutomaticStart;
-			return;
-		case IDM_JITOFF:
-			Core::g_CoreStartupParameter.bJITOff = event.IsChecked();
-			break;
-		case IDM_JITLSOFF:
-			Core::g_CoreStartupParameter.bJITLoadStoreOff = event.IsChecked();
-			break;
-		case IDM_JITLSLXZOFF:
-			Core::g_CoreStartupParameter.bJITLoadStorelXzOff = event.IsChecked();
-			break;
-		case IDM_JITLSLWZOFF:
-			Core::g_CoreStartupParameter.bJITLoadStorelwzOff = event.IsChecked();
-			break;
-		case IDM_JITLSLBZXOFF:
-			Core::g_CoreStartupParameter.bJITLoadStorelbzxOff = event.IsChecked();
-			break;
-		case IDM_JITLSFOFF:
-			Core::g_CoreStartupParameter.bJITLoadStoreFloatingOff = event.IsChecked();
-			break;
-		case IDM_JITLSPOFF:
-			Core::g_CoreStartupParameter.bJITLoadStorePairedOff = event.IsChecked();
-			break;
-		case IDM_JITFPOFF:
-			Core::g_CoreStartupParameter.bJITFloatingPointOff = event.IsChecked();
-			break;
-		case IDM_JITIOFF:
-			Core::g_CoreStartupParameter.bJITIntegerOff = event.IsChecked();
-			break;
-		case IDM_JITPOFF:
-			Core::g_CoreStartupParameter.bJITPairedOff = event.IsChecked();
-			break;
-		case IDM_JITSROFF:
-			Core::g_CoreStartupParameter.bJITSystemRegistersOff = event.IsChecked();
-			break;
-	}
-
-	// Clear the JIT cache to enable these changes
-	JitInterface::ClearCache();
-	
-	// Update
-	UpdateButtonStates();
-}
-
-void CCodeWindow::OnJitMenu(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_LOGINSTRUCTIONS:
-			PPCTables::LogCompiledInstructions();
-			break;
-
-		case IDM_CLEARCODECACHE:
-			JitInterface::ClearCache();
-			break;
-
-		case IDM_SEARCHINSTRUCTION:
-		{
-			wxString str;
-			str = wxGetTextFromUser(_T(""), wxT("Op?"), wxEmptyString, this);
-			for (u32 addr = 0x80000000; addr < 0x80100000; addr += 4)
-			{
-				const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr));
-				auto const wx_name = WxStrToStr(str);
-				if (name && (wx_name == name))
-				{
-					NOTICE_LOG(POWERPC, "Found %s at %08x", wx_name.c_str(), addr);
-				}
-			}
-			break;
-		}
-	}
-}
-
-// Shortcuts
-bool CCodeWindow::UseInterpreter()
-{
-	return GetMenuBar()->IsChecked(IDM_INTERPRETER);
-}
-
-bool CCodeWindow::BootToPause()
-{
-	return GetMenuBar()->IsChecked(IDM_BOOTTOPAUSE);
-}
-
-bool CCodeWindow::AutomaticStart()
-{
-	return GetMenuBar()->IsChecked(IDM_AUTOMATICSTART);
-}
-
-bool CCodeWindow::JITNoBlockCache()
-{
-	return GetMenuBar()->IsChecked(IDM_JITNOBLOCKCACHE);
-}
-
-bool CCodeWindow::JITBlockLinking()
-{
-	return GetMenuBar()->IsChecked(IDM_JITBLOCKLINKING);
-}
-
-// Toolbar
-void CCodeWindow::InitBitmaps()
-{
-	// load original size 48x48
-	m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png);
-	m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
-	m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
-	m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
-	m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
-
-	// scale to 24x24 for toolbar
-	for (size_t n = 0; n < ToolbarDebugBitmapMax; n++)
-		m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24));
-}
-
-void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar)
-{
-	int w = m_Bitmaps[0].GetWidth(),
-		h = m_Bitmaps[0].GetHeight();
-
-	toolBar->SetToolBitmapSize(wxSize(w, h));
-	toolBar->AddTool(IDM_STEP,		_("Step"),			m_Bitmaps[Toolbar_Step]);
-	toolBar->AddTool(IDM_STEPOVER,	_("Step Over"),		m_Bitmaps[Toolbar_StepOver]);
-	toolBar->AddTool(IDM_SKIP,		_("Skip"),			m_Bitmaps[Toolbar_Skip]);
-	toolBar->AddSeparator();
-	toolBar->AddTool(IDM_GOTOPC,		_("Show PC"),		m_Bitmaps[Toolbar_GotoPC]);
-	toolBar->AddTool(IDM_SETPC,		_("Set PC"),		m_Bitmaps[Toolbar_SetPC]);
-	toolBar->AddSeparator();
-	toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));
-
-	toolBar->Realize();
-}
-
-// Update GUI
-void CCodeWindow::Update()
-{
-	if (!codeview) return;
-
-	codeview->Refresh();
-	UpdateCallstack();
-	UpdateButtonStates();
-
-	// Do not automatically show the current PC position when a breakpoint is hit or
-	// when we pause since this can be called at other times too.
-	//codeview->Center(PC);
-}
-
-void CCodeWindow::UpdateButtonStates()
-{
-	bool Initialized = (Core::GetState() != Core::CORE_UNINITIALIZED);
-	bool Pause = (Core::GetState() == Core::CORE_PAUSE);
-	bool Stepping = CCPU::IsStepping();
-	wxAuiToolBar* ToolBar = GetToolBar();
-
-	// Toolbar
-	if (!ToolBar) return;
-
-	if (!Initialized)
-	{
-		ToolBar->EnableTool(IDM_STEPOVER, false);
-		ToolBar->EnableTool(IDM_SKIP, false);
-	}
-	else
-	{
-		if (!Stepping)
-		{
-			ToolBar->EnableTool(IDM_STEPOVER, false);
-			ToolBar->EnableTool(IDM_SKIP, false);
-		}
-		else
-		{
-			ToolBar->EnableTool(IDM_STEPOVER, true);
-			ToolBar->EnableTool(IDM_SKIP, true);
-		}
-	}
-
-	ToolBar->EnableTool(IDM_STEP, Initialized && Stepping);
-
-	if (ToolBar) ToolBar->Realize();
-
-	// Menu bar
-	// ------------------
-	GetMenuBar()->Enable(IDM_INTERPRETER, Pause); // CPU Mode
-
-	GetMenuBar()->Enable(IDM_JITNOBLOCKCACHE, !Initialized);
-
-	GetMenuBar()->Enable(IDM_JITOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSLXZOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSLWZOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSLBZXOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSFOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITLSPOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITFPOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITIOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITPOFF, Pause);
-	GetMenuBar()->Enable(IDM_JITSROFF, Pause);
-
-	GetMenuBar()->Enable(IDM_CLEARCODECACHE, Pause); // JIT Menu
-	GetMenuBar()->Enable(IDM_SEARCHINSTRUCTION, Initialized);
-
-	GetMenuBar()->Enable(IDM_CLEARSYMBOLS, Initialized); // Symbols menu
-	GetMenuBar()->Enable(IDM_SCANFUNCTIONS, Initialized);
-	GetMenuBar()->Enable(IDM_LOADMAPFILE, Initialized);
-	GetMenuBar()->Enable(IDM_SAVEMAPFILE, Initialized);
-	GetMenuBar()->Enable(IDM_SAVEMAPFILEWITHCODES, Initialized);
-	GetMenuBar()->Enable(IDM_CREATESIGNATUREFILE, Initialized);
-	GetMenuBar()->Enable(IDM_RENAME_SYMBOLS, Initialized);
-	GetMenuBar()->Enable(IDM_USESIGNATUREFILE, Initialized);
-	GetMenuBar()->Enable(IDM_PATCHHLEFUNCTIONS, Initialized);
-
-	// Update Fonts
-	callstack->SetFont(DebuggerFont);
-	symbols->SetFont(DebuggerFont);
-	callers->SetFont(DebuggerFont);
-	calls->SetFont(DebuggerFont);
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
deleted file mode 100644
index 2b5b24d6eb..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef CODEWINDOW_H_
-#define CODEWINDOW_H_
-
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <wx/listbox.h>
-#include <wx/artprov.h>
-
-#include "Thread.h"
-#include "CoreParameter.h"
-
-// GUI global
-#include "../Globals.h"
-#include "../Frame.h"
-
-class CFrame;
-class CRegisterWindow;
-class CBreakPointWindow;
-class CMemoryWindow;
-class CJitWindow;
-class CCodeView;
-class DSPDebuggerLLE;
-class GFXDebuggerPanel;
-
-class CCodeWindow
-	: public wxPanel
-{
-	public:
-
-		CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter,
-			CFrame * parent,
-			wxWindowID id = wxID_ANY,
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
-			const wxString& name = _("Code")
-			);
-
-		void Load();
-		void Save();
-
-		// Parent interaction
-		CFrame *Parent;
-		wxMenuBar * GetMenuBar();
-		wxAuiToolBar * GetToolBar();
-		wxBitmap m_Bitmaps[ToolbarDebugBitmapMax];
-
-		bool UseInterpreter();
-		bool BootToPause();
-		bool AutomaticStart();
-		bool JITNoBlockCache();
-		bool JITBlockLinking();
-		void JumpToAddress(u32 _Address);
-
-		void Update();
-		void NotifyMapLoaded();
-		void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter,
-			   	wxMenuBar *pMenuBar);
-		void CreateMenuOptions(wxMenu *pMenu);
-		void CreateMenuSymbols(wxMenuBar *pMenuBar);
-		void RecreateToolbar(wxAuiToolBar*);
-		void PopulateToolbar(wxAuiToolBar* toolBar);
-		void UpdateButtonStates();
-		void OpenPages();
-		void UpdateManager();
-
-		// Menu bar
-		// -------------------
-		void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
-		void OnJITOff(wxCommandEvent& event);
-
-		void ToggleCodeWindow(bool bShow);
-		void ToggleRegisterWindow(bool bShow);
-		void ToggleBreakPointWindow(bool bShow);
-		void ToggleMemoryWindow(bool bShow);
-		void ToggleJitWindow(bool bShow);
-		void ToggleSoundWindow(bool bShow);
-		void ToggleVideoWindow(bool bShow);
-
-		void OnChangeFont(wxCommandEvent& event);
-
-		void OnCodeStep(wxCommandEvent& event);
-		void OnAddrBoxChange(wxCommandEvent& event);
-		void OnSymbolsMenu(wxCommandEvent& event);
-		void OnJitMenu(wxCommandEvent& event);
-		void OnProfilerMenu(wxCommandEvent& event);
-
-		// Sub dialogs
-		CRegisterWindow* m_RegisterWindow;
-		CBreakPointWindow* m_BreakpointWindow;
-		CMemoryWindow* m_MemoryWindow;
-		CJitWindow* m_JitWindow;
-		DSPDebuggerLLE* m_SoundWindow;
-		GFXDebuggerPanel* m_VideoWindow;
-
-		// Settings
-		bool bAutomaticStart; bool bBootToPause;
-		bool bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW + 1];
-		int iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
-
-	private:
-
-		enum
-		{
-			// Debugger GUI Objects
-			ID_CODEVIEW,
-			ID_CALLSTACKLIST,
-			ID_CALLERSLIST,
-			ID_CALLSLIST,
-			ID_SYMBOLLIST
-		};
-
-		void OnSymbolListChange(wxCommandEvent& event);
-		void OnSymbolListContextMenu(wxContextMenuEvent& event);
-		void OnCallstackListChange(wxCommandEvent& event);
-		void OnCallersListChange(wxCommandEvent& event);
-		void OnCallsListChange(wxCommandEvent& event);
-		void OnCodeViewChange(wxCommandEvent &event);
-		void OnHostMessage(wxCommandEvent& event);
-
-		// Debugger functions
-		void SingleStep();
-		void StepOver();
-		void ToggleBreakpoint();
-
-		void UpdateLists();
-		void UpdateCallstack();
-
-		void InitBitmaps();
-
-		CCodeView* codeview;
-		wxListBox* callstack;
-		wxListBox* symbols;
-		wxListBox* callers;
-		wxListBox* calls;
-		Common::Event sync_event;
-
-		DECLARE_EVENT_TABLE()
-};
-
-#endif // CODEWINDOW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
deleted file mode 100644
index d9fe275abd..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
+++ /dev/null
@@ -1,544 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "CommonPaths.h"
-
-#include <wx/fontdlg.h>
-#include <wx/mimetype.h>
-
-#include "Host.h"
-
-#include "DebuggerUIUtil.h"
-
-#include "../WxUtils.h"
-#include "RegisterWindow.h"
-#include "BreakpointWindow.h"
-#include "MemoryWindow.h"
-#include "JitWindow.h"
-#include "DebuggerPanel.h"
-#include "DSPDebugWindow.h"
-#include "FileUtil.h"
-
-#include "CodeWindow.h"
-#include "CodeView.h"
-
-#include "Core.h"
-#include "HLE/HLE.h"
-#include "Boot/Boot.h"
-#include "LogManager.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/Profiler.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCTables.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/JitCommon/JitCache.h" // for ClearCache()
-
-#include "ConfigManager.h"
-
-// Save and load settings
-// -----------------------------
-void CCodeWindow::Load()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	// The font to override DebuggerFont with
-	std::string fontDesc;
-	ini.Get("General", "DebuggerFont", &fontDesc);
-	if (!fontDesc.empty())
-		DebuggerFont.SetNativeFontInfoUserDesc(StrToWxStr(fontDesc));
-
-	// Boot to pause or not
-	ini.Get("General", "AutomaticStart", &bAutomaticStart, false);
-	ini.Get("General", "BootToPause", &bBootToPause, true);
-
-	const char* SettingName[] = {
-		"Log",
-		"LogConfig",
-		"Console",
-		"Registers",
-		"Breakpoints",
-		"Memory",
-		"JIT",
-		"Sound",
-		"Video",
-		"Code"
-	};
-
-	// Decide what windows to show
-	for (int i = 0; i <= IDM_VIDEOWINDOW - IDM_LOGWINDOW; i++)
-		ini.Get("ShowOnStart", SettingName[i], &bShowOnStart[i], false);
-
-	// Get notebook affiliation
-	std::string _Section = "P - " +
-		((Parent->ActivePerspective < Parent->Perspectives.size())
-		? Parent->Perspectives[Parent->ActivePerspective].Name : "Perspective 1");
-
-	for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
-		ini.Get(_Section.c_str(), SettingName[i], &iNbAffiliation[i], 0);
-
-	// Get floating setting
-	for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
-		ini.Get("Float", SettingName[i], &Parent->bFloatWindow[i], false);
-}
-
-void CCodeWindow::Save()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	ini.Set("General", "DebuggerFont",
-		   	WxStrToStr(DebuggerFont.GetNativeFontInfoUserDesc()));
-
-	// Boot to pause or not
-	ini.Set("General", "AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATICSTART));
-	ini.Set("General", "BootToPause", GetMenuBar()->IsChecked(IDM_BOOTTOPAUSE));
-
-	const char* SettingName[] = {
-		"Log",
-		"LogConfig",
-		"Console",
-		"Registers",
-		"Breakpoints",
-		"Memory",
-		"JIT", 
-		"Sound",
-		"Video",
-		"Code"
-	};
-
-	// Save windows settings
-	for (int i = IDM_LOGWINDOW; i <= IDM_VIDEOWINDOW; i++)
-		ini.Set("ShowOnStart", SettingName[i - IDM_LOGWINDOW], GetMenuBar()->IsChecked(i));
-
-	// Save notebook affiliations
-	std::string _Section = "P - " + Parent->Perspectives[Parent->ActivePerspective].Name;
-	for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
-		ini.Set(_Section.c_str(), SettingName[i], iNbAffiliation[i]);
-
-	// Save floating setting
-	for (int i = IDM_LOGWINDOW_PARENT; i <= IDM_CODEWINDOW_PARENT; i++)
-		ini.Set("Float", SettingName[i - IDM_LOGWINDOW_PARENT], !!FindWindowById(i));
-
-	ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-}
-
-// Symbols, JIT, Profiler
-// ----------------
-void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar)
-{
-	wxMenu *pSymbolsMenu = new wxMenu;
-	pSymbolsMenu->Append(IDM_CLEARSYMBOLS, _("&Clear symbols"));
-	pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _("&Generate symbol map"));
-	pSymbolsMenu->AppendSeparator();
-	pSymbolsMenu->Append(IDM_LOADMAPFILE, _("&Load symbol map"));
-	pSymbolsMenu->Append(IDM_SAVEMAPFILE, _("&Save symbol map"));
-	pSymbolsMenu->AppendSeparator();
-	pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _("Save code"),
-		StrToWxStr("Save the entire disassembled code. This may take a several seconds"
-		" and may require between 50 and 100 MB of hard drive space. It will only save code"
-		" that are in the first 4 MB of memory, if you are debugging a game that load .rel"
-		" files with code to memory you may want to increase that to perhaps 8 MB, you can do"
-		" that from SymbolDB::SaveMap().")
-		);
-
-	pSymbolsMenu->AppendSeparator();
-	pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _("&Create signature file..."));
-	pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _("&Use signature file..."));
-	pSymbolsMenu->AppendSeparator();
-	pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _("&Patch HLE functions"));
-	pSymbolsMenu->Append(IDM_RENAME_SYMBOLS, _("&Rename symbols from file..."));
-	pMenuBar->Append(pSymbolsMenu, _("&Symbols"));
-
-	wxMenu *pProfilerMenu = new wxMenu;
-	pProfilerMenu->Append(IDM_PROFILEBLOCKS, _("&Profile blocks"), wxEmptyString, wxITEM_CHECK);
-	pProfilerMenu->AppendSeparator();
-	pProfilerMenu->Append(IDM_WRITEPROFILE, _("&Write to profile.txt, show"));
-	pMenuBar->Append(pProfilerMenu, _("&Profiler"));
-}
-
-void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case IDM_PROFILEBLOCKS:
-		Core::SetState(Core::CORE_PAUSE);
-		if (jit != NULL)
-			jit->ClearCache();
-		Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS);
-		Core::SetState(Core::CORE_RUN);
-		break;
-	case IDM_WRITEPROFILE:
-		if (Core::GetState() == Core::CORE_RUN)
-			Core::SetState(Core::CORE_PAUSE);
-
-		if (Core::GetState() == Core::CORE_PAUSE && PowerPC::GetMode() == PowerPC::MODE_JIT)
-		{
-			if (jit != NULL)
-			{
-				std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt";
-				File::CreateFullPath(filename);
-				Profiler::WriteProfileResults(filename.c_str());
-
-				wxFileType* filetype = NULL;
-				if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt"))))
-				{
-					// From extension failed, trying with MIME type now
-					if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"))))
-						// MIME type failed, aborting mission
-						break;
-				}
-				wxString OpenCommand;
-				OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename));
-				if(!OpenCommand.IsEmpty())
-					wxExecute(OpenCommand, wxEXEC_SYNC);
-			}
-		}
-		break;
-	}
-}
-
-void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
-{
-	Parent->ClearStatusBar();
-
-	if (Core::GetState() == Core::CORE_UNINITIALIZED) return;
-
-	std::string existing_map_file, writable_map_file;
-	bool map_exists = CBoot::FindMapFile(&existing_map_file,
-	                                     &writable_map_file);
-	switch (event.GetId())
-	{
-	case IDM_CLEARSYMBOLS:
-		if(!AskYesNo("Do you want to clear the list of symbol names?")) return;
-		g_symbolDB.Clear();
-		Host_NotifyMapLoaded();
-		break;
-	case IDM_SCANFUNCTIONS:
-		{
-		PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB);
-		SignatureDB db;
-		if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
-		{
-			db.Apply(&g_symbolDB);
-			Parent->StatusBarMessage("Generated symbol names from '%s'", TOTALDB);
-		}
-		else
-		{
-			Parent->StatusBarMessage("'%s' not found, no symbol names generated", TOTALDB);
-		}
-		// HLE::PatchFunctions();
-		// Update GUI
-		NotifyMapLoaded();
-		break;
-		}
-	case IDM_LOADMAPFILE:
-		if (!map_exists)
-		{
-			g_symbolDB.Clear();
-			PPCAnalyst::FindFunctions(0x81300000, 0x81800000, &g_symbolDB);
-			SignatureDB db;
-			if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
-				db.Apply(&g_symbolDB);
-			Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", writable_map_file.c_str());
-		}
-		else
-		{
-			g_symbolDB.LoadMap(existing_map_file.c_str());
-			Parent->StatusBarMessage("Loaded symbols from '%s'", existing_map_file.c_str());
-		}
-		HLE::PatchFunctions();
-		NotifyMapLoaded();
-		break;
-	case IDM_SAVEMAPFILE:
-		g_symbolDB.SaveMap(writable_map_file.c_str());
-		break;
-	case IDM_SAVEMAPFILEWITHCODES:
-		g_symbolDB.SaveMap(writable_map_file.c_str(), true);
-		break;
-
-	case IDM_RENAME_SYMBOLS:
-		{
-			const wxString path = wxFileSelector(
-				_("Apply signature file"), wxEmptyString,
-				wxEmptyString, wxEmptyString,
-				_T("Dolphin Symbol Rename File (*.sym)|*.sym"),
-				wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
-
-			if (!path.IsEmpty())
-			{
-				std::ifstream f;
-				OpenFStream(f, WxStrToStr(path), std::ios_base::in);
-
-				std::string line;
-				while (std::getline(f, line))
-				{
-					if (line.length() < 12)
-						continue;
-
-					u32 address, type;
-					std::string name;
-
-					std::istringstream ss(line);
-					ss >> std::hex >> address >> std::dec >> type >> name;
-
-					Symbol *symbol = g_symbolDB.GetSymbolFromAddr(address);
-					if (symbol)
-						symbol->name = line.substr(12);
-				}
-
-				Host_NotifyMapLoaded();
-			}
-		}
-		break;
-
-	case IDM_CREATESIGNATUREFILE:
-		{
-			wxTextEntryDialog input_prefix(
-				this,
-				StrToWxStr("Only export symbols with prefix:\n(Blank for all symbols)"),
-				wxGetTextFromUserPromptStr,
-				wxEmptyString);
-
-			if (input_prefix.ShowModal() == wxID_OK)
-			{
-				std::string prefix(WxStrToStr(input_prefix.GetValue()));
-
-				wxString path = wxFileSelector(
-					_T("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,
-					_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_SAVE,
-					this);
-				if (!path.IsEmpty())
-				{
-					SignatureDB db;
-					db.Initialize(&g_symbolDB, prefix.c_str());
-					db.Save(WxStrToStr(path).c_str());
-				}
-			}
-		}
-		break;
-	case IDM_USESIGNATUREFILE:
-		{
-			wxString path = wxFileSelector(
-				_T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,
-				_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST,
-				this);
-			if (!path.IsEmpty())
-			{
-				SignatureDB db;
-				db.Load(WxStrToStr(path).c_str());
-				db.Apply(&g_symbolDB);
-			}
-		}
-		NotifyMapLoaded();
-		break;
-	case IDM_PATCHHLEFUNCTIONS:
-		HLE::PatchFunctions();
-		Update();
-		break;
-	}
-}
-
-void CCodeWindow::NotifyMapLoaded()
-{
-	if (!codeview) return;
-
-	g_symbolDB.FillInCallers();
-	//symbols->Show(false); // hide it for faster filling
-	symbols->Freeze();	// HyperIris: wx style fast filling
-	symbols->Clear();
-	for (PPCSymbolDB::XFuncMap::iterator iter = g_symbolDB.GetIterator(); iter != g_symbolDB.End(); ++iter)
-	{
-		int idx = symbols->Append(StrToWxStr(iter->second.name));
-		symbols->SetClientData(idx, (void*)&iter->second);
-	}
-	symbols->Thaw();
-	//symbols->Show(true);
-	Update();
-}
-
-void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
-{
-	int index = symbols->GetSelection();
-	if (index >= 0) {
-		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
-		if (pSymbol != NULL)
-		{
-			if(pSymbol->type == Symbol::SYMBOL_DATA)
-			{
-				if(m_MemoryWindow)// && m_MemoryWindow->IsVisible())
-					m_MemoryWindow->JumpToAddress(pSymbol->address);
-			}
-			else
-			{
-				JumpToAddress(pSymbol->address);
-			}
-		}
-	}
-}
-
-void CCodeWindow::OnSymbolListContextMenu(wxContextMenuEvent& event)
-{
-}
-
-// Change the global DebuggerFont
-void CCodeWindow::OnChangeFont(wxCommandEvent& event)
-{
-	wxFontData data;
-	data.SetInitialFont(DebuggerFont);
-
-	wxFontDialog dialog(this, data);
-	if ( dialog.ShowModal() == wxID_OK )
-		DebuggerFont = dialog.GetFontData().GetChosenFont();
-}
-
-// Toggle windows
-
-void CCodeWindow::OpenPages()
-{
-	ToggleCodeWindow(true);
-	if (bShowOnStart[0])
-		Parent->ToggleLogWindow(true);
-	if (bShowOnStart[IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW])
-		Parent->ToggleLogConfigWindow(true);
-	if (bShowOnStart[IDM_CONSOLEWINDOW - IDM_LOGWINDOW])
-		Parent->ToggleConsole(true);
-	if (bShowOnStart[IDM_REGISTERWINDOW - IDM_LOGWINDOW])
-		ToggleRegisterWindow(true);
-	if (bShowOnStart[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW])
-		ToggleBreakPointWindow(true);
-	if (bShowOnStart[IDM_MEMORYWINDOW - IDM_LOGWINDOW])
-		ToggleMemoryWindow(true);
-	if (bShowOnStart[IDM_JITWINDOW - IDM_LOGWINDOW])
-		ToggleJitWindow(true);
-	if (bShowOnStart[IDM_SOUNDWINDOW - IDM_LOGWINDOW])
-		ToggleSoundWindow(true);
-	if (bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW])
-		ToggleVideoWindow(true);
-}
-
-void CCodeWindow::ToggleCodeWindow(bool bShow)
-{
-	if (bShow)
-		Parent->DoAddPage(this,
-			   	iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW]);
-	else // Hide
-		Parent->DoRemovePage(this);
-}
-
-void CCodeWindow::ToggleRegisterWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_REGISTERWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_RegisterWindow)
-		   	m_RegisterWindow = new CRegisterWindow(Parent, IDM_REGISTERWINDOW);
-		Parent->DoAddPage(m_RegisterWindow,
-			   	iNbAffiliation[IDM_REGISTERWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_REGISTERWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_RegisterWindow, false);
-		m_RegisterWindow = NULL;
-	}
-}
-
-void CCodeWindow::ToggleBreakPointWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_BREAKPOINTWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_BreakpointWindow)
-		   	m_BreakpointWindow = new CBreakPointWindow(this, Parent, IDM_BREAKPOINTWINDOW);
-		Parent->DoAddPage(m_BreakpointWindow,
-			   	iNbAffiliation[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_BreakpointWindow, false);
-		m_BreakpointWindow = NULL;
-	}
-}
-
-void CCodeWindow::ToggleMemoryWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_MEMORYWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_MemoryWindow)
-		   	m_MemoryWindow = new CMemoryWindow(Parent, IDM_MEMORYWINDOW);
-		Parent->DoAddPage(m_MemoryWindow,
-			   	iNbAffiliation[IDM_MEMORYWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_MEMORYWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_MemoryWindow, false);
-		m_MemoryWindow = NULL;
-	}
-}
-
-void CCodeWindow::ToggleJitWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_JITWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_JitWindow)
-		   	m_JitWindow = new CJitWindow(Parent, IDM_JITWINDOW);
-		Parent->DoAddPage(m_JitWindow,
-			   	iNbAffiliation[IDM_JITWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_JITWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_JitWindow, false);
-		m_JitWindow = NULL;
-	}
-}
-
-
-void CCodeWindow::ToggleSoundWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_SoundWindow)
-		   	m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUNDWINDOW);
-		Parent->DoAddPage(m_SoundWindow,
-			   	iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_SoundWindow, false);
-		m_SoundWindow = NULL;
-	}
-}
-
-void CCodeWindow::ToggleVideoWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_VIDEOWINDOW)->Check(bShow);
-	if (bShow)
-	{
-		if (!m_VideoWindow)
-		   	m_VideoWindow = new GFXDebuggerPanel(Parent, IDM_VIDEOWINDOW);
-		Parent->DoAddPage(m_VideoWindow,
-			   	iNbAffiliation[IDM_VIDEOWINDOW - IDM_LOGWINDOW],
-			   	Parent->bFloatWindow[IDM_VIDEOWINDOW - IDM_LOGWINDOW]);
-	}
-	else // Close
-	{
-		Parent->DoRemovePage(m_VideoWindow, false);
-		m_VideoWindow = NULL;
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
deleted file mode 100644
index d5e589c09b..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
-#include <wx/artprov.h>
-
-#include "../WxUtils.h"
-#include "StringUtil.h"
-#include "DSPDebugWindow.h"
-#include "DSPRegisterView.h"
-#include "CodeView.h"
-#include "MemoryView.h"
-#include "HW/DSPLLE/DSPSymbols.h"
-
-DSPDebuggerLLE* m_DebuggerFrame = NULL;
-
-BEGIN_EVENT_TABLE(DSPDebuggerLLE, wxPanel)	
-	EVT_CLOSE(DSPDebuggerLLE::OnClose)
-	EVT_MENU_RANGE(ID_RUNTOOL, ID_SHOWPCTOOL, DSPDebuggerLLE::OnChangeState)
-	EVT_TEXT_ENTER(ID_ADDRBOX, DSPDebuggerLLE::OnAddrBoxChange)
-	EVT_LISTBOX(ID_SYMBOLLIST, DSPDebuggerLLE::OnSymbolListChange)
-END_EVENT_TABLE()
-
-
-DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
-	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize,
-			wxTAB_TRAVERSAL, _("DSP LLE Debugger"))
-	, m_CachedStepCounter(-1)
-{
-	m_DebuggerFrame = this;
-
-	// notify wxAUI which frame to use
-	m_mgr.SetManagedWindow(this);
-	m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
-
-	m_Toolbar = new wxAuiToolBar(this, ID_TOOLBAR,
-		wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT);
-	m_Toolbar->AddTool(ID_RUNTOOL, wxT("Pause"),
-		wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
-	m_Toolbar->AddTool(ID_STEPTOOL, wxT("Step"),
-		wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(10,10)));
-	m_Toolbar->AddTool(ID_SHOWPCTOOL, wxT("Show PC"),
-		wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, wxSize(10,10)));
-	m_Toolbar->AddSeparator();
-	m_Toolbar->AddControl(new wxTextCtrl(m_Toolbar, ID_ADDRBOX, wxEmptyString,
-		wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER));
-	m_Toolbar->Realize();
-
-	m_SymbolList = new wxListBox(this, ID_SYMBOLLIST, wxDefaultPosition,
-		wxSize(140, 100), 0, NULL, wxLB_SORT);
-
-	m_MainNotebook = new wxAuiNotebook(this, wxID_ANY,
-		wxDefaultPosition, wxDefaultSize,
-		wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE);
-
-	wxPanel *code_panel = new wxPanel(m_MainNotebook, wxID_ANY);
-	wxBoxSizer *code_sizer = new wxBoxSizer(wxVERTICAL);
-	m_CodeView = new CCodeView(&debug_interface, &DSPSymbols::g_dsp_symbol_db, code_panel);
-	m_CodeView->SetPlain();
-	code_sizer->Add(m_CodeView, 1, wxALL | wxEXPAND);
-	code_panel->SetSizer(code_sizer);
-	m_MainNotebook->AddPage(code_panel, wxT("Disasm"), true);
-
-	wxPanel *mem_panel = new wxPanel(m_MainNotebook, wxID_ANY);
-	wxBoxSizer *mem_sizer = new wxBoxSizer(wxVERTICAL);
-	// TODO insert memViewer class
-	m_MemView = new CMemoryView(&debug_interface, mem_panel);
-	mem_sizer->Add(m_MemView, 1, wxALL | wxEXPAND);
-	mem_panel->SetSizer(mem_sizer);
-	m_MainNotebook->AddPage(mem_panel, wxT("Mem"));
-
-	m_Regs = new DSPRegisterView(this, ID_DSP_REGS);
-
-	// add the panes to the manager
-	m_mgr.AddPane(m_Toolbar, wxAuiPaneInfo().
-		ToolbarPane().Top().
-		LeftDockable(false).RightDockable(false));
-
-	m_mgr.AddPane(m_SymbolList, wxAuiPaneInfo().
-		Left().CloseButton(false).
-		Caption(wxT("Symbols")).Dockable(true));
-
-	m_mgr.AddPane(m_MainNotebook, wxAuiPaneInfo().
-		Name(wxT("m_MainNotebook")).Center().
-		CloseButton(false).MaximizeButton(true));
-
-	m_mgr.AddPane(m_Regs, wxAuiPaneInfo().Right().
-		CloseButton(false).Caption(wxT("Registers")).
-		Dockable(true));
-
-	UpdateState();
-
-	m_mgr.Update();
-}
-
-DSPDebuggerLLE::~DSPDebuggerLLE()
-{
-	m_mgr.UnInit();
-	m_DebuggerFrame = NULL;
-}
-
-void DSPDebuggerLLE::OnClose(wxCloseEvent& event)
-{
-	event.Skip();
-}
-
-void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event)
-{
-	if (DSPCore_GetState() == DSPCORE_STOP)
-		return;
-
-	switch (event.GetId())
-	{
-		case ID_RUNTOOL:
-			if (DSPCore_GetState() == DSPCORE_RUNNING)
-				DSPCore_SetState(DSPCORE_STEPPING);
-			else
-				DSPCore_SetState(DSPCORE_RUNNING);
-			break;
-
-		case ID_STEPTOOL:
-			if (DSPCore_GetState() == DSPCORE_STEPPING)
-			{
-				DSPCore_Step();
-				Update();
-			}
-			break;
-
-		case ID_SHOWPCTOOL:
-			FocusOnPC();
-			break;
-	}
-
-	UpdateState();
-	m_mgr.Update();
-}
-
-void Host_RefreshDSPDebuggerWindow()
-{
-	if (m_DebuggerFrame)
-		m_DebuggerFrame->Update();
-}
-
-void DSPDebuggerLLE::Update()
-{
-#if defined __WXGTK__
-	if (!wxIsMainThread())
-		wxMutexGuiEnter();
-#endif
-	UpdateSymbolMap();
-	UpdateDisAsmListView();
-	UpdateRegisterFlags();
-	UpdateState();
-	m_mgr.Update();
-#if defined __WXGTK__
-	if (!wxIsMainThread())
-		wxMutexGuiLeave();
-#endif
-}
-
-void DSPDebuggerLLE::FocusOnPC()
-{
-	JumpToAddress(g_dsp.pc);
-}
-
-void DSPDebuggerLLE::UpdateState()
-{
-	if (DSPCore_GetState() == DSPCORE_RUNNING)
-	{
-		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Pause"));
-		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
-			wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
-		m_Toolbar->EnableTool(ID_STEPTOOL, false);
-	}
-	else
-	{
-		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Run"));
-		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
-			wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_OTHER, wxSize(10,10)));
-		m_Toolbar->EnableTool(ID_STEPTOOL, true);
-	}
-	m_Toolbar->Realize();
-}
-
-void DSPDebuggerLLE::UpdateDisAsmListView()
-{
-	if (m_CachedStepCounter == g_dsp.step_counter)
-		return;
-
-	// show PC
-	FocusOnPC();
-	m_CachedStepCounter = g_dsp.step_counter;
-	m_Regs->Update();
-}
-
-void DSPDebuggerLLE::UpdateSymbolMap()
-{
-	if (g_dsp.dram == NULL)
-		return;
-
-	m_SymbolList->Freeze();	// HyperIris: wx style fast filling
-	m_SymbolList->Clear();
-	for (SymbolDB::XFuncMap::iterator iter = DSPSymbols::g_dsp_symbol_db.GetIterator();
-		 iter != DSPSymbols::g_dsp_symbol_db.End(); ++iter)
-	{
-		int idx = m_SymbolList->Append(StrToWxStr(iter->second.name));
-		m_SymbolList->SetClientData(idx, (void*)&iter->second);
-	}
-	m_SymbolList->Thaw();
-}
-
-void DSPDebuggerLLE::OnSymbolListChange(wxCommandEvent& event)
-{
-	int index = m_SymbolList->GetSelection();
-	if (index >= 0) {
-		Symbol* pSymbol = static_cast<Symbol *>(m_SymbolList->GetClientData(index));
-		if (pSymbol != NULL)
-		{
-			if (pSymbol->type == Symbol::SYMBOL_FUNCTION)
-			{
-				JumpToAddress(pSymbol->address);
-			}
-		}
-	}
-}
-
-void DSPDebuggerLLE::UpdateRegisterFlags()
-{
-}
-
-void DSPDebuggerLLE::OnAddrBoxChange(wxCommandEvent& event)
-{
-	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)m_Toolbar->FindControl(ID_ADDRBOX);
-	wxString txt = pAddrCtrl->GetValue();
-
-	auto text = StripSpaces(WxStrToStr(txt));
-	if (text.size())
-	{
-		u32 addr;
-		sscanf(text.c_str(), "%04x", &addr);
-		if (JumpToAddress(addr))
-			pAddrCtrl->SetBackgroundColour(*wxWHITE);
-		else
-			pAddrCtrl->SetBackgroundColour(*wxRED);
-	}
-	event.Skip();
-}
-
-bool DSPDebuggerLLE::JumpToAddress(u16 addr)
-{
-	int page = m_MainNotebook->GetSelection();
-	if (page == 0)
-	{
-		// Center on valid instruction in IRAM/IROM
-		int new_line = DSPSymbols::Addr2Line(addr);
-		if (new_line >= 0) {
-			m_CodeView->Center(new_line);
-			return true;
-		}
-	}
-	else if (page == 1)
-	{
-		// Center on any location in any valid ROM/RAM
-		int seg = addr >> 12;
-		if (seg == 0 || seg == 1 ||
-			seg == 8 || seg == 0xf)
-		{
-			m_MemView->Center(addr);
-			return true;
-		}
-	}
-
-	return false;
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
deleted file mode 100644
index 6f5f68a060..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DSP_DEBUGGER_LLE_H
-#define _DSP_DEBUGGER_LLE_H
-
-// general things
-#include <iostream>
-#include <vector>
-#include <list>
-#include <map>
-#include <algorithm>
-
-#include <wx/wx.h>
-#include <wx/frame.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/statbox.h>
-#include <wx/sizer.h>
-#include <wx/listctrl.h>
-#include <wx/statline.h>
-#include <wx/aui/aui.h>
-
-#include "DSP/disassemble.h"
-#include "DSP/DSPInterpreter.h"
-#include "DSP/DSPMemoryMap.h"
-#include "HW/DSPLLE/DSPDebugInterface.h"
-
-class DSPRegisterView;
-class CCodeView;
-class CMemoryView;
-
-class DSPDebuggerLLE : public wxPanel
-{
-public:
-	DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY);
-	virtual ~DSPDebuggerLLE();
-
-	void Update();
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	enum
-	{
-		ID_TOOLBAR = 1000,
-		ID_RUNTOOL,
-		ID_STEPTOOL,
-		ID_SHOWPCTOOL,
-		ID_ADDRBOX,
-		ID_SYMBOLLIST,
-		ID_DSP_REGS
-	};
-
-	DSPDebugInterface debug_interface;
-	u64 m_CachedStepCounter;
-
-	// GUI updaters
-	void UpdateDisAsmListView();
-	void UpdateRegisterFlags();
-	void UpdateSymbolMap();
-	void UpdateState();
-
-	// GUI items
-	wxAuiManager m_mgr;
-	wxAuiToolBar* m_Toolbar;
-	CCodeView* m_CodeView;
-	CMemoryView* m_MemView;
-	DSPRegisterView* m_Regs;
-	wxListBox* m_SymbolList;
-	wxAuiNotebook* m_MainNotebook;
-
-	void OnClose(wxCloseEvent& event);
-	void OnChangeState(wxCommandEvent& event);
-	//void OnRightClick(wxListEvent& event);
-	//void OnDoubleClick(wxListEvent& event);
-	void OnAddrBoxChange(wxCommandEvent& event);
-	void OnSymbolListChange(wxCommandEvent& event);
-
-	bool JumpToAddress(u16 addr);
-
-	void FocusOnPC();
-	//void UnselectAll();
-};
-
-extern DSPDebuggerLLE* m_DebuggerFrame;
-
-#endif //_DSP_DEBUGGER_LLE_H
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
deleted file mode 100644
index b3ad7dde8a..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DSPDebugWindow.h"
-#include "DSPRegisterView.h"
-#include "../WxUtils.h"
-
-wxString CDSPRegTable::GetValue(int row, int col)
-{
-	if (row < 32) // 32 "normal" regs
-	{
-		switch (col)
-		{
-		case 0: return StrToWxStr(pdregname(row));
-		case 1: return wxString::Format(wxT("0x%04x"), DSPCore_ReadRegister(row));
-		default: return wxEmptyString;
-		}
-	}
-	return wxEmptyString;
-}
-
-void CDSPRegTable::SetValue(int, int, const wxString &)
-{
-}
-
-void CDSPRegTable::UpdateCachedRegs()
-{
-	if (m_CachedCounter == g_dsp.step_counter)
-	{
-		return;
-	}
-
-	m_CachedCounter = g_dsp.step_counter;
-
-	for (int i = 0; i < 32; ++i)
-	{
-		m_CachedRegHasChanged[i] = (m_CachedRegs[i] != DSPCore_ReadRegister(i));
-		m_CachedRegs[i] = DSPCore_ReadRegister(i);
-	}
-}
-
-wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
-{
-	wxGridCellAttr *attr = new wxGridCellAttr();
-
-	attr->SetBackgroundColour(wxColour(wxT("#FFFFFF")));
-
-	switch (col)
-	{
-	case 1:
-		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
-		break;
-	default:
-		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
-		break;
-	}
-
-	if (col == 1)
-		attr->SetTextColour(m_CachedRegHasChanged[row] ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000")));
-
-	attr->IncRef();
-	return attr;
-}
-
-DSPRegisterView::DSPRegisterView(wxWindow *parent, wxWindowID id)
-	: wxGrid(parent, id, wxDefaultPosition, wxSize(130, 120))
-{
-	SetTable(new CDSPRegTable(), true);
-	SetRowLabelSize(0);
-	SetColLabelSize(0);
-	DisableDragRowSize();
-
-	AutoSizeColumns();
-}
-
-void DSPRegisterView::Update()
-{
-	((CDSPRegTable *)GetTable())->UpdateCachedRegs();
-	ForceRefresh();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
deleted file mode 100644
index fbafb08b03..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __DSPREGISTERVIEW_h__
-#define __DSPREGISTERVIEW_h__
-
-#include <wx/grid.h>
-
-
-class CDSPRegTable : public wxGridTableBase
-{
-private:
-	u64 m_CachedCounter;
-	u16 m_CachedRegs[32];
-	bool m_CachedRegHasChanged[32];
-
-	DECLARE_NO_COPY_CLASS(CDSPRegTable);
-
-public:
-	CDSPRegTable()
-	{
-		memset(m_CachedRegs, 0, sizeof(m_CachedRegs));
-		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
-	}
-
-	int GetNumberCols(void) {return 2;}
-	int GetNumberRows(void) {return 32;}
-	bool IsEmptyCell(int row, int col) {return false;}
-	wxString GetValue(int row, int col);
-	void SetValue(int row, int col, const wxString &);
-	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind);
-	void UpdateCachedRegs();
-};
-
-class DSPRegisterView : public wxGrid
-{
-public:
-	DSPRegisterView(wxWindow* parent, wxWindowID id);
-	void Update();
-};
-
-#endif //__DSPREGISTERVIEW_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
deleted file mode 100644
index 5a2e93166b..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "IniFile.h"
-#include "DebuggerPanel.h"
-#include "FileUtil.h"
-#include "../../Core/Src/ConfigManager.h"
-
-#include "VideoConfig.h"
-#include "TextureCacheBase.h"
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
-#include "NativeVertexFormat.h"
-
-BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel)
-	EVT_CLOSE(GFXDebuggerPanel::OnClose)
-	EVT_BUTTON(ID_PAUSE,GFXDebuggerPanel::OnPauseButton)
-	EVT_BUTTON(ID_PAUSE_AT_NEXT,GFXDebuggerPanel::OnPauseAtNextButton)
-	EVT_BUTTON(ID_PAUSE_AT_NEXT_FRAME,GFXDebuggerPanel::OnPauseAtNextFrameButton)
-	EVT_BUTTON(ID_CONT,GFXDebuggerPanel::OnContButton)
-	EVT_BUTTON(ID_DUMP,GFXDebuggerPanel::OnDumpButton)
-	EVT_BUTTON(ID_UPDATE_SCREEN,GFXDebuggerPanel::OnUpdateScreenButton)
-	EVT_BUTTON(ID_CLEAR_SCREEN,GFXDebuggerPanel::OnClearScreenButton)
-	EVT_BUTTON(ID_CLEAR_TEXTURE_CACHE,GFXDebuggerPanel::OnClearTextureCacheButton)
-	EVT_BUTTON(ID_CLEAR_VERTEX_SHADER_CACHE,GFXDebuggerPanel::OnClearVertexShaderCacheButton)
-	EVT_BUTTON(ID_CLEAR_PIXEL_SHADER_CACHE,GFXDebuggerPanel::OnClearPixelShaderCacheButton)
-END_EVENT_TABLE()
-
-// From VideoCommon
-extern GFXDebuggerBase *g_pdebugger;
-extern volatile bool GFXDebuggerPauseFlag;
-extern volatile PauseEvent GFXDebuggerToPauseAtNext;
-extern volatile int GFXDebuggerEventToPauseCount;
-
-GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position,
-									const wxSize& size, long style, const wxString &title)
-	: wxPanel(parent, id, position, size, style, title)
-{
-	g_pdebugger = this;
-
-	CreateGUIControls();
-
-	LoadSettings();
-}
-
-GFXDebuggerPanel::~GFXDebuggerPanel()
-{
-	g_pdebugger = NULL;
-	GFXDebuggerPauseFlag = false;
-}
-
-void GFXDebuggerPanel::OnClose(wxCloseEvent& event)
-{
-	// save the window position when we hide the window
-	SaveSettings();
-
-	event.Skip();
-}
-
-void GFXDebuggerPanel::SaveSettings() const
-{
-	IniFile file;
-	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	// TODO: make this work when we close the entire program too, currently on total close we get
-	// weird values, perhaps because of some conflict with the rendering window
-
-	// TODO: get the screen resolution and make limits from that
-	if (GetPosition().x < 1000 && GetPosition().y < 1000
-							   && GetSize().GetWidth() < 1000 
-							   && GetSize().GetHeight() < 1000)
-	{
-		file.Set("VideoWindow", "x", GetPosition().x);
-		file.Set("VideoWindow", "y", GetPosition().y);
-		file.Set("VideoWindow", "w", GetSize().GetWidth());
-		file.Set("VideoWindow", "h", GetSize().GetHeight());
-	}
-
-	file.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-}
-
-void GFXDebuggerPanel::LoadSettings()
-{
-	IniFile file;
-	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	int x = 100, y = 100, w = 100, h = 100;
-	file.Get("VideoWindow", "x", &x, GetPosition().x);
-	file.Get("VideoWindow", "y", &y, GetPosition().y);
-	file.Get("VideoWindow", "w", &w, GetSize().GetWidth());
-	file.Get("VideoWindow", "h", &h, GetSize().GetHeight());
-	SetSize(x, y, w, h);
-}
-
-struct PauseEventMap
-{
-	PauseEvent event;
-	const wxString ListStr;
-};
-
-static PauseEventMap pauseEventMap[] = {
-	{NEXT_FRAME,				_("Frame")},
-	{NEXT_FLUSH,				_("Flush")},
-
-	{NEXT_PIXEL_SHADER_CHANGE,	_("Pixel Shader")},
-	{NEXT_VERTEX_SHADER_CHANGE,	_("Vertex Shader")},
-	{NEXT_TEXTURE_CHANGE,		_("Texture")},
-	{NEXT_NEW_TEXTURE,			_("New Texture")},
-
-	{NEXT_XFB_CMD,				_("XFB Cmd")},
-	{NEXT_EFB_CMD,				_("EFB Cmd")},
-
-	{NEXT_MATRIX_CMD,			_("Matrix Cmd")},
-	{NEXT_VERTEX_CMD,			_("Vertex Cmd")},
-	{NEXT_TEXTURE_CMD,			_("Texture Cmd")},
-	{NEXT_LIGHT_CMD,			_("Light Cmd")},
-	{NEXT_FOG_CMD,				_("Fog Cmd")},
-
-	{NEXT_SET_TLUT,				_("TLUT Cmd")},
-
-	{NEXT_ERROR,				_("Error")}
-};
-static const int numPauseEventMap = sizeof(pauseEventMap)/sizeof(PauseEventMap);
-
-void GFXDebuggerPanel::CreateGUIControls()
-{
-	// Basic settings
-	CenterOnParent();
-
-	m_pButtonPause = new wxButton(this, ID_PAUSE, _("Pause"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause"));
-	m_pButtonPauseAtNext = new wxButton(this, ID_PAUSE_AT_NEXT, _("Pause After"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause At Next"));
-	m_pButtonPauseAtNextFrame = new wxButton(this, ID_PAUSE_AT_NEXT_FRAME, _("Go to Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Next Frame"));
-	m_pButtonCont = new wxButton(this, ID_CONT, _("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Continue"));
-
-	m_pCount = new wxTextCtrl(this, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), wxTE_RIGHT, wxDefaultValidator, _("Count"));
-
-	m_pPauseAtList = new wxChoice(this, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, NULL,0,wxDefaultValidator, _("PauseAtList"));
-	for (int i=0; i<numPauseEventMap; i++)
-	{
-		m_pPauseAtList->Append(pauseEventMap[i].ListStr);
-	}
-	m_pPauseAtList->SetSelection(0);
-
-	m_pButtonDump = new wxButton(this, ID_DUMP, _("Dump"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Dump"));
-	m_pButtonUpdateScreen = new wxButton(this, ID_UPDATE_SCREEN, _("Update Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Update Screen"));
-	m_pButtonClearScreen = new wxButton(this, ID_CLEAR_SCREEN, _("Clear Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Screen"));
-	m_pButtonClearTextureCache = new wxButton(this, ID_CLEAR_TEXTURE_CACHE, _("Clear Textures"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Textures"));
-	m_pButtonClearVertexShaderCache = new wxButton(this, ID_CLEAR_VERTEX_SHADER_CACHE, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear V Shaders"));
-	m_pButtonClearPixelShaderCache = new wxButton(this, ID_CLEAR_PIXEL_SHADER_CACHE, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear P Shaders"));
-
-	m_pDumpList = new wxChoice(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, NULL, 0 ,wxDefaultValidator, _("DumpList"));
-	m_pDumpList->Insert(_("Pixel Shader"),0);
-	m_pDumpList->Append(_("Vertex Shader"));
-	m_pDumpList->Append(_("Pixel Shader Constants"));
-	m_pDumpList->Append(_("Vertex Shader Constants"));
-	m_pDumpList->Append(_("Textures"));
-	m_pDumpList->Append(_("Frame Buffer"));
-	m_pDumpList->Append(_("Geometry data"));
-	m_pDumpList->Append(_("Vertex Description"));
-	m_pDumpList->Append(_("Vertex Matrices"));
-	m_pDumpList->Append(_("Statistics"));
-	m_pDumpList->SetSelection(0);
-
-	// Layout everything on m_MainPanel
-	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
-
-	wxStaticBoxSizer* const pFlowCtrlBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Flow Control"));
-	wxBoxSizer* const pPauseAtNextSzr = new wxBoxSizer(wxHORIZONTAL);
-	pFlowCtrlBox->Add(m_pButtonPause);
-	pPauseAtNextSzr->Add(m_pButtonPauseAtNext);
-	pPauseAtNextSzr->Add(m_pCount);
-	pPauseAtNextSzr->Add(m_pPauseAtList);
-	pFlowCtrlBox->Add(pPauseAtNextSzr);
-	pFlowCtrlBox->Add(m_pButtonPauseAtNextFrame);
-	pFlowCtrlBox->Add(m_pButtonCont);
-
-	wxStaticBoxSizer* const pDebugBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Debugging"));
-	wxBoxSizer* const pDumpSzr = new wxBoxSizer(wxHORIZONTAL);
-	pDumpSzr->Add(m_pButtonDump);
-	pDumpSzr->Add(m_pDumpList);
-	pDebugBox->Add(pDumpSzr);
-	wxGridSizer* const pDbgGrid = new wxGridSizer(2, 5, 5);
-	pDbgGrid->Add(m_pButtonUpdateScreen);
-	pDbgGrid->Add(m_pButtonClearScreen);
-	pDbgGrid->Add(m_pButtonClearTextureCache);
-	pDbgGrid->Add(m_pButtonClearVertexShaderCache);
-	pDbgGrid->Add(m_pButtonClearPixelShaderCache);
-	pDebugBox->Add(pDbgGrid);
-
-	sMain->Add(pFlowCtrlBox, 0, 0, 5);
-	sMain->Add(pDebugBox, 0, 0, 5);
-	SetSizerAndFit(sMain);
-
-	OnContinue();
-}
-
-void GFXDebuggerPanel::OnPause()
-{
-	m_pButtonDump->Enable(true);
-	m_pDumpList->Enable(true);
-	m_pButtonUpdateScreen->Enable(true);
-	m_pButtonClearScreen->Enable(true);
-	m_pButtonClearTextureCache->Enable(true);
-	m_pButtonClearVertexShaderCache->Enable(true);
-	m_pButtonClearPixelShaderCache->Enable(true);
-}
-
-void GFXDebuggerPanel::OnContinue()
-{
-	m_pButtonDump->Enable(false);
-	m_pDumpList->Enable(false);
-	m_pButtonUpdateScreen->Enable(false);
-	m_pButtonClearScreen->Enable(false);
-	m_pButtonClearTextureCache->Enable(false);
-	m_pButtonClearVertexShaderCache->Enable(false);
-	m_pButtonClearPixelShaderCache->Enable(false);
-}
-
-
-// General settings
-void GFXDebuggerPanel::GeneralSettings(wxCommandEvent& event)
-{
-	SaveSettings();
-}
-
-void GFXDebuggerPanel::OnPauseButton(wxCommandEvent& event)
-{
-	GFXDebuggerPauseFlag = true;
-}
-
-void GFXDebuggerPanel::OnPauseAtNextButton(wxCommandEvent& event)
-{
-	GFXDebuggerPauseFlag = false;
-	GFXDebuggerToPauseAtNext = pauseEventMap[m_pPauseAtList->GetSelection()].event;
-	wxString val = m_pCount->GetValue();
-	long value;
-	if (val.ToLong(&value))
-		GFXDebuggerEventToPauseCount = value;
-	else
-		GFXDebuggerEventToPauseCount = 1;
-}
-
-void GFXDebuggerPanel::OnPauseAtNextFrameButton(wxCommandEvent& event)
-{
-	GFXDebuggerPauseFlag = false;
-	GFXDebuggerToPauseAtNext = NEXT_FRAME;
-	GFXDebuggerEventToPauseCount = 1;
-}
-
-void GFXDebuggerPanel::OnDumpButton(wxCommandEvent& event)
-{
-	std::string dump_path = File::GetUserPath(D_DUMP_IDX) + "Debug/" +
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID + "/";
-	if (!File::CreateFullPath(dump_path))
-		return;
-
-	switch (m_pDumpList->GetSelection())
-	{
-		case 0: // Pixel Shader
-			DumpPixelShader(dump_path.c_str());
-			break;
-
-		case 1: // Vertex Shader
-			DumpVertexShader(dump_path.c_str());
-			break;
-
-		case 2: // Pixel Shader Constants
-			DumpPixelShaderConstants(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 3: // Vertex Shader Constants
-			DumpVertexShaderConstants(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 4: // Textures
-			DumpTextures(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 5: // Frame Buffer
-			DumpFrameBuffer(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 6: // Geometry
-			DumpGeometry(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 7: // Vertex Description
-			DumpVertexDecl(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 8: // Vertex Matrices
-			DumpMatrices(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-
-		case 9: // Statistics
-			DumpStats(dump_path.c_str());
-			wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-			break;
-	}
-}
-
-void GFXDebuggerPanel::OnContButton(wxCommandEvent& event)
-{
-	GFXDebuggerToPauseAtNext = NOT_PAUSE;
-	GFXDebuggerPauseFlag = false;
-}
-
-void GFXDebuggerPanel::OnClearScreenButton(wxCommandEvent& event)
-{
-	// TODO
-	wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-}
-
-void GFXDebuggerPanel::OnClearTextureCacheButton(wxCommandEvent& event)
-{
-	TextureCache::Invalidate();
-}
-
-void GFXDebuggerPanel::OnClearVertexShaderCacheButton(wxCommandEvent& event)
-{
-	// TODO
-	wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-}
-
-void GFXDebuggerPanel::OnClearPixelShaderCacheButton(wxCommandEvent& event)
-{
-	// TODO
-	wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-}
-
-void GFXDebuggerPanel::OnUpdateScreenButton(wxCommandEvent& event)
-{
-	wxMessageBox(_("Not implemented"), _("Error"), wxOK);
-	GFXDebuggerUpdateScreen();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
deleted file mode 100644
index eac6734bc9..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GFX_DEBUGGER_PANEL_H_
-#define _GFX_DEBUGGER_PANEL_H_
-
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include "Debugger.h"
-
-class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
-{
-public:
-	GFXDebuggerPanel(wxWindow *parent,
-		wxWindowID id = wxID_ANY,
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		long style = wxTAB_TRAVERSAL,
-		const wxString &title = _("GFX Debugger"));
-
-	virtual ~GFXDebuggerPanel();
-
-	void SaveSettings() const;
-	void LoadSettings();
-
-	bool bInfoLog;
-	bool bPrimLog;
-	bool bSaveTextures;
-	bool bSaveTargets;
-	bool bSaveShaders;
-
-	void OnPause();
-
-	// Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished
-	void OnContinue();
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	wxPanel *m_MainPanel;
-
-	wxButton	*m_pButtonPause;
-	wxButton	*m_pButtonPauseAtNext;
-	wxButton	*m_pButtonPauseAtNextFrame;
-	wxButton	*m_pButtonCont;
-	wxChoice	*m_pPauseAtList;
-	wxButton	*m_pButtonDump;
-	wxChoice	*m_pDumpList;
-	wxButton	*m_pButtonUpdateScreen;
-	wxButton	*m_pButtonClearScreen;
-	wxButton	*m_pButtonClearTextureCache;
-	wxButton	*m_pButtonClearVertexShaderCache;
-	wxButton	*m_pButtonClearPixelShaderCache;
-	wxTextCtrl	*m_pCount;
-
-
-	// TODO: Prefix with GFX_
-	enum
-	{
-		ID_MAINPANEL = 3900,
-		ID_CONT,
-		ID_PAUSE,
-		ID_PAUSE_AT_NEXT,
-		ID_PAUSE_AT_NEXT_FRAME,
-		ID_PAUSE_AT_LIST,
-		ID_DUMP,
-		ID_DUMP_LIST,
-		ID_UPDATE_SCREEN,
-		ID_CLEAR_SCREEN,
-		ID_CLEAR_TEXTURE_CACHE,
-		ID_CLEAR_VERTEX_SHADER_CACHE,
-		ID_CLEAR_PIXEL_SHADER_CACHE,
-		ID_COUNT
-	};
-
-	void OnClose(wxCloseEvent& event);		
-	void CreateGUIControls();
-
-	void GeneralSettings(wxCommandEvent& event);
-
-	// These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occurred)
-	void OnPauseButton(wxCommandEvent& event);
-	void OnPauseAtNextButton(wxCommandEvent& event);
-
-	void OnPauseAtNextFrameButton(wxCommandEvent& event);
-	void OnDumpButton(wxCommandEvent& event);
-
-	// sets GFXDebuggerPauseFlag to false
-	void OnContButton(wxCommandEvent& event);
-
-	void OnUpdateScreenButton(wxCommandEvent& event);
-	void OnClearScreenButton(wxCommandEvent& event);
-	void OnClearTextureCacheButton(wxCommandEvent& event);
-	void OnClearVertexShaderCacheButton(wxCommandEvent& event);
-	void OnClearPixelShaderCacheButton(wxCommandEvent& event);
-	void OnCountEnter(wxCommandEvent& event);
-};
-
-#endif // _GFX_DEBUGGER_PANEL_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
deleted file mode 100644
index db14859ff0..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "DebuggerUIUtil.h"
-
-// The default font
-wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace"));
-
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
deleted file mode 100644
index fb268fcd54..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DEBUGGER_UI_UTIL_H
-#define _DEBUGGER_UI_UTIL_H
-
-#include <wx/wx.h>
-
-extern wxFont DebuggerFont;
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
deleted file mode 100644
index a1df440b0f..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/button.h>
-#include <wx/textctrl.h>
-#include <wx/listctrl.h>
-#include <wx/thread.h>
-#include <wx/listctrl.h>
-
-#include "JitWindow.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/JitCommon/JitCache.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPCDisasm.h"
-#include "Host.h"
-#include "disasm.h"
-
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
-
-#include "Core.h"
-#include "StringUtil.h"
-#include "LogManager.h"
-#include "../WxUtils.h"
-
-#include "../Globals.h"
-
-enum
-{
-	IDM_REFRESH_LIST = 23350,
-	IDM_PPC_BOX,
-	IDM_X86_BOX,
-	IDM_NEXT,
-	IDM_PREV,
-	IDM_BLOCKLIST,
-};
-
-BEGIN_EVENT_TABLE(CJitWindow, wxPanel)
-	//EVT_TEXT(IDM_ADDRBOX, CJitWindow::OnAddrBoxChange)
-	//EVT_LISTBOX(IDM_SYMBOLLIST, CJitWindow::OnSymbolListChange)
-	//EVT_HOST_COMMAND(wxID_ANY, CJitWindow::OnHostMessage)
-	EVT_BUTTON(IDM_REFRESH_LIST, CJitWindow::OnRefresh)
-END_EVENT_TABLE()
-
-CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos,
-		const wxSize& size, long style, const wxString& name)
-: wxPanel(parent, id, pos, size, style, name)
-{
-	wxBoxSizer* sizerBig   = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer* sizerSplit = new wxBoxSizer(wxHORIZONTAL);
-	sizerSplit->Add(ppc_box = new wxTextCtrl(this, IDM_PPC_BOX, _T("(ppc)"),
-				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
-	sizerSplit->Add(x86_box = new wxTextCtrl(this, IDM_X86_BOX, _T("(x86)"),
-				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
-	sizerBig->Add(block_list = new JitBlockList(this, IDM_BLOCKLIST,
-				wxDefaultPosition, wxSize(100, 140),
-				wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING),
-				0, wxEXPAND);
-	sizerBig->Add(sizerSplit, 2, wxEXPAND);
-//	sizerBig->Add(memview, 5, wxEXPAND);
-//	sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
-	sizerBig->Add(button_refresh = new wxButton(this, IDM_REFRESH_LIST, _("&Refresh")));
-//	sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T("")));
-//	sizerRight->Add(new wxButton(this, IDM_SETPC, _("S&et PC")));
-
-	SetSizer(sizerBig);
-
-	sizerSplit->Fit(this);
-	sizerBig->Fit(this);
-}
-
-void CJitWindow::OnRefresh(wxCommandEvent& /*event*/) {
-	block_list->Update();
-}
-
-void CJitWindow::ViewAddr(u32 em_address)
-{
-	Show(true);
-	Compare(em_address);
-	SetFocus();
-}
-
-void CJitWindow::Compare(u32 em_address)
-{
-	u8 *xDis = new u8[1<<18];
-	memset(xDis, 0, 1<<18);
-
-	disassembler x64disasm;
-	x64disasm.set_syntax_intel();
-
-	int block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(em_address);
-	if (block_num < 0)
-	{
-		for (int i = 0; i < 500; i++)
-		{
-			block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(em_address - 4 * i);
-			if (block_num >= 0)
-				break;
-		}
-
-		if (block_num >= 0)
-		{
-			JitBlock *block = jit->GetBlockCache()->GetBlock(block_num);
-			if (!(block->originalAddress <= em_address &&
-						block->originalSize + block->originalAddress >= em_address))
-				block_num = -1;
-		}
-
-		// Do not merge this "if" with the above - block_num changes inside it.
-		if (block_num < 0)
-		{
-			ppc_box->SetValue(StrToWxStr(StringFromFormat("(non-code address: %08x)",
-							em_address)));
-			x86_box->SetValue(StrToWxStr(StringFromFormat("(no translation)")));
-			delete[] xDis;
-			return;
-		}
-	}
-	JitBlock *block = jit->GetBlockCache()->GetBlock(block_num);
-
-	// 800031f0
-	// == Fill in x86 box
-
-	const u8 *code = (const u8 *)jit->GetBlockCache()->GetCompiledCodeFromBlock(block_num);
-	u64 disasmPtr = (u64)code;
-	int size = block->codeSize;
-	const u8 *end = code + size;
-	char *sptr = (char*)xDis;
-
-	int num_x86_instructions = 0;
-	while ((u8*)disasmPtr < end)
-	{
-#ifdef _M_X64
-		disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
-#else
-		disasmPtr += x64disasm.disasm32(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
-#endif
-		sptr += strlen(sptr);
-		*sptr++ = 13;
-		*sptr++ = 10;
-		num_x86_instructions++;
-	}
-	x86_box->SetValue(StrToWxStr((char*)xDis));
-
-	// == Fill in ppc box
-	u32 ppc_addr = block->originalAddress;
-	PPCAnalyst::CodeBuffer code_buffer(32000);
-	PPCAnalyst::BlockStats st;
-	PPCAnalyst::BlockRegStats gpa;
-	PPCAnalyst::BlockRegStats fpa;
-	bool broken_block = false;
-	u32 merged_addresses[32];
-	const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]);
-	int size_of_merged_addresses;
-	if (PPCAnalyst::Flatten(ppc_addr, &size, &st, &gpa, &fpa, broken_block, &code_buffer, size, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses) != 0xffffffff)
-	{
-		sptr = (char*)xDis;
-		for (int i = 0; i < size; i++)
-		{
-			const PPCAnalyst::CodeOp &op = code_buffer.codebuffer[i];
-			char temp[256];
-			DisassembleGekko(op.inst.hex, op.address, temp, 256);
-			sptr += sprintf(sptr, "%08x %s\n", op.address, temp);
-		}
-
-		// Add stats to the end of the ppc box since it's generally the shortest.
-		sptr += sprintf(sptr, "\n");
-
-		// Add some generic analysis
-		if (st.isFirstBlockOfFunction)
-			sptr += sprintf(sptr, "(first block of function)\n");
-		if (st.isLastBlockOfFunction)
-			sptr += sprintf(sptr, "(first block of function)\n");
-
-		sptr += sprintf(sptr, "%i estimated cycles\n", st.numCycles);
-
-		sptr += sprintf(sptr, "Num instr: PPC: %i  x86: %i  (blowup: %i%%)\n",
-				size, num_x86_instructions, 100 * (num_x86_instructions / size - 1));
-		sptr += sprintf(sptr, "Num bytes: PPC: %i  x86: %i  (blowup: %i%%)\n",
-				size * 4, block->codeSize, 100 * (block->codeSize / (4 * size) - 1));
-
-		ppc_box->SetValue(StrToWxStr((char*)xDis));
-	}
-	else
-	{
-		ppc_box->SetValue(StrToWxStr(StringFromFormat(
-						"(non-code address: %08x)", em_address)));
-		x86_box->SetValue("---");
-	}
-
-	delete[] xDis;
-}
-
-void CJitWindow::Update()
-{
-
-}
-
-void CJitWindow::OnHostMessage(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_NOTIFYMAPLOADED:
-			//NotifyMapLoaded();
-			break;
-	}
-}
-
-// JitBlockList
-//================
-
-enum {
-	COLUMN_ADDRESS,
-	COLUMN_PPCSIZE,
-	COLUMN_X86SIZE,
-	COLUMN_NAME,
-	COLUMN_FLAGS,
-	COLUMN_NUMEXEC,
-	COLUMN_COST,  // (estimated as x86size * numexec)
-};
-
-JitBlockList::JitBlockList(wxWindow* parent, const wxWindowID id,
-		const wxPoint& pos, const wxSize& size, long style)
-	: wxListCtrl(parent, id, pos, size, style) // | wxLC_VIRTUAL)
-{
-	Init();
-}
-
-void JitBlockList::Init()
-{
-	InsertColumn(COLUMN_ADDRESS, _("Address"));
-	InsertColumn(COLUMN_PPCSIZE, _("PPC Size"));
-	InsertColumn(COLUMN_X86SIZE, _("x86 Size"));
-	InsertColumn(COLUMN_NAME, _("Symbol"));
-	InsertColumn(COLUMN_FLAGS, _("Flags"));
-	InsertColumn(COLUMN_NUMEXEC, _("NumExec"));
-	InsertColumn(COLUMN_COST, _("Cost"));
-}
-
-void JitBlockList::Update()
-{
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
deleted file mode 100644
index 821ca30af2..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../WxUtils.h"
-#include "MemoryCheckDlg.h"
-#include "Common.h"
-#include "StringUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "BreakpointWindow.h"
-
-#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text), wxDefaultPosition, wxDefaultSize)
-
-BEGIN_EVENT_TABLE(MemoryCheckDlg, wxDialog)
-	EVT_BUTTON(wxID_OK, MemoryCheckDlg::OnOK)
-END_EVENT_TABLE()
-
-MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow *parent)
-	: wxDialog(parent, wxID_ANY, _("Memory Check"), wxDefaultPosition, wxDefaultSize)
-	, m_parent(parent)
-{
-	m_pEditStartAddress = new wxTextCtrl(this, wxID_ANY, wxT(""));
-	m_pEditEndAddress = new wxTextCtrl(this, wxID_ANY, wxT(""));
-	m_pWriteFlag = new wxCheckBox(this, wxID_ANY, _("Write"));
-	m_pWriteFlag->SetValue(true);
-	m_pReadFlag = new wxCheckBox(this, wxID_ANY, _("Read"));
-
-	m_log_flag = new wxCheckBox(this, wxID_ANY, _("Log"));
-	m_log_flag->SetValue(true);
-	m_break_flag = new wxCheckBox(this, wxID_ANY, _("Break"));
-
-	wxStaticBoxSizer *sAddressRangeBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Address Range"));
-	sAddressRangeBox->Add(TEXT_BOX("Start"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
-	sAddressRangeBox->Add(m_pEditStartAddress, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10);
-	sAddressRangeBox->Add(TEXT_BOX("End"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
-	sAddressRangeBox->Add(m_pEditEndAddress, 1, wxALIGN_CENTER_VERTICAL);
-
-	wxStaticBoxSizer *sActionBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Action"));
-	sActionBox->Add(m_pWriteFlag);
-	sActionBox->Add(m_pReadFlag);
-
-	wxBoxSizer* sFlags = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Flags"));
-	sFlags->Add(m_log_flag);
-	sFlags->Add(m_break_flag);
-
-	wxBoxSizer *sControls = new wxBoxSizer(wxHORIZONTAL);
-	sControls->Add(sAddressRangeBox, 0, wxEXPAND);
-	sControls->Add(sActionBox, 0, wxEXPAND);
-	sControls->Add(sFlags, 0, wxEXPAND);
-
-	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
-	sMainSizer->Add(sControls, 0, wxEXPAND | wxALL, 5);
-	sMainSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	SetSizerAndFit(sMainSizer);
-	SetFocus();
-}
-
-void MemoryCheckDlg::OnOK(wxCommandEvent& event)
-{
-	wxString StartAddressString = m_pEditStartAddress->GetLineText(0);
-	wxString EndAddressString = m_pEditEndAddress->GetLineText(0);
-	bool OnRead = m_pReadFlag->GetValue();
-	bool OnWrite = m_pWriteFlag->GetValue();
-	bool Log = m_log_flag->GetValue();
-	bool Break = m_break_flag->GetValue();;
-
-	u32 StartAddress, EndAddress;
-	bool EndAddressOK = EndAddressString.Len() &&
-		AsciiToHex(WxStrToStr(EndAddressString).c_str(), EndAddress);
-
-	if (AsciiToHex(WxStrToStr(StartAddressString).c_str(), StartAddress) &&
-		(OnRead || OnWrite) && (Log || Break))
-	{
-		TMemCheck MemCheck;
-
-		if (!EndAddressOK)
-			EndAddress = StartAddress;
-
-		MemCheck.StartAddress = StartAddress;
-		MemCheck.EndAddress = EndAddress;
-		MemCheck.bRange = StartAddress != EndAddress;
-		MemCheck.OnRead = OnRead;
-		MemCheck.OnWrite = OnWrite;
-		MemCheck.Log = Log;
-		MemCheck.Break = Break;
-
-		PowerPC::memchecks.Add(MemCheck);
-		m_parent->NotifyUpdate();
-		Close();
-	}
-
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
deleted file mode 100644
index 9783869ffe..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __MEMORYCHECKDLG_h__
-#define __MEMORYCHECKDLG_h__
-
-#include <wx/wx.h>
-
-class CBreakPointWindow;
-
-class MemoryCheckDlg : public wxDialog
-{
-	public:
-		MemoryCheckDlg(CBreakPointWindow *parent);
-	
-	private:
-		CBreakPointWindow *m_parent;
-		wxCheckBox* m_pReadFlag;
-		wxCheckBox* m_pWriteFlag;
-		wxCheckBox* m_log_flag;
-		wxCheckBox* m_break_flag;
-		wxTextCtrl* m_pEditEndAddress;
-		wxTextCtrl* m_pEditStartAddress;
-
-		void OnOK(wxCommandEvent& event);
-
-		DECLARE_EVENT_TABLE();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
deleted file mode 100644
index 7c5225a05d..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DebuggerUIUtil.h"
-#include "Common.h"
-#include "Host.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Memmap.h"
-
-#include "MemoryView.h"
-#include "../WxUtils.h"
-
-#include <wx/event.h>
-#include <wx/clipbrd.h>
-
-enum
-{
-	IDM_GOTOINMEMVIEW = 12000,
-	IDM_COPYADDRESS,
-	IDM_COPYHEX,
-	IDM_COPYCODE,
-	IDM_RUNTOHERE,
-	IDM_DYNARECRESULTS,
-	IDM_TOGGLEMEMORY,
-	IDM_VIEWASFP,
-	IDM_VIEWASASCII,
-	IDM_VIEWASHEX,
-};
-
-BEGIN_EVENT_TABLE(CMemoryView, wxControl)
-	EVT_PAINT(CMemoryView::OnPaint)
-	EVT_LEFT_DOWN(CMemoryView::OnMouseDownL)
-	EVT_LEFT_UP(CMemoryView::OnMouseUpL)
-	EVT_MOTION(CMemoryView::OnMouseMove)
-	EVT_RIGHT_DOWN(CMemoryView::OnMouseDownR)
-	EVT_MENU(-1, CMemoryView::OnPopupMenu)
-	EVT_SIZE(CMemoryView::OnResize)
-END_EVENT_TABLE()
-
-CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent)
-	: wxControl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
-	, curAddress(debuginterface->getPC())
-	, debugger(debuginterface)
-	, align(debuginterface->getInstructionSize(0))
-	, rowHeight(13)
-	, selection(0)
-	, oldSelection(0)
-	, selecting(false)
-	, memory(0)
-	, viewAsType(VIEWAS_FP)
-{
-}
-
-int CMemoryView::YToAddress(int y)
-{
-	wxRect rc = GetClientRect();
-	int ydiff = y - rc.height / 2 - rowHeight / 2;
-	ydiff = (int)(floorf((float)ydiff / (float)rowHeight)) + 1;
-	return curAddress + ydiff * align;
-}
-
-void CMemoryView::OnMouseDownL(wxMouseEvent& event)
-{
-	int x = event.m_x;
-	int y = event.m_y;
-
-	if (x > 16)
-	{
-		oldSelection = selection;
-		selection = YToAddress(y);
-		bool oldselecting = selecting;
-		selecting = true;
-
-		if (!oldselecting || (selection != oldSelection))
-			Refresh();
-	}
-	else
-	{
-		debugger->toggleMemCheck(YToAddress(y));
-
-		Refresh();
-		Host_UpdateBreakPointView();
-	}
-
-	event.Skip(true);
-}
-
-void CMemoryView::OnMouseMove(wxMouseEvent& event)
-{
-	wxRect rc = GetClientRect();
-
-	if (event.m_leftDown && event.m_x > 16)
-	{
-		if (event.m_y < 0)
-		{
-			curAddress -= align;
-			Refresh();
-		}
-		else if (event.m_y > rc.height)
-		{
-			curAddress += align;
-			Refresh();
-		}
-		else
-			OnMouseDownL(event);
-	}
-
-	event.Skip(true);
-}
-
-void CMemoryView::OnMouseUpL(wxMouseEvent& event)
-{
-	if (event.m_x > 16)
-	{
-		curAddress = YToAddress(event.m_y);
-		selecting = false;
-		Refresh();
-	}
-
-	event.Skip(true);
-}
-
-void CMemoryView::OnPopupMenu(wxCommandEvent& event)
-{
-#if wxUSE_CLIPBOARD
-	wxTheClipboard->Open();
-#endif
-
-	switch (event.GetId())
-	{
-#if wxUSE_CLIPBOARD
-		case IDM_COPYADDRESS:
-			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
-			break;
-
-		case IDM_COPYHEX:
-			{
-			char temp[24];
-			sprintf(temp, "%08x", debugger->readExtraMemory(memory, selection));
-			wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
-			}
-			break;
-#endif
-
-		case IDM_TOGGLEMEMORY:
-			memory ^= 1;
-			Refresh();
-			break;
-
-		case IDM_VIEWASFP:
-			viewAsType = VIEWAS_FP;
-			Refresh();
-			break;
-
-		case IDM_VIEWASASCII:
-			viewAsType = VIEWAS_ASCII;
-			Refresh();
-			break;
-		case IDM_VIEWASHEX:
-			viewAsType = VIEWAS_HEX;
-			Refresh();
-			break;
-	}
-
-#if wxUSE_CLIPBOARD
-	wxTheClipboard->Close();
-#endif
-	event.Skip(true);
-}
-
-void CMemoryView::OnMouseDownR(wxMouseEvent& event)
-{
-	// popup menu
-	wxMenu* menu = new wxMenu;
-	//menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
-#if wxUSE_CLIPBOARD
-	menu->Append(IDM_COPYADDRESS, StrToWxStr("Copy &address"));
-	menu->Append(IDM_COPYHEX, StrToWxStr("Copy &hex"));
-#endif
-	menu->Append(IDM_TOGGLEMEMORY, StrToWxStr("Toggle &memory"));
-
-	wxMenu* viewAsSubMenu = new wxMenu;
-	viewAsSubMenu->Append(IDM_VIEWASFP, StrToWxStr("FP value"));
-	viewAsSubMenu->Append(IDM_VIEWASASCII, StrToWxStr("ASCII"));
-	viewAsSubMenu->Append(IDM_VIEWASHEX, StrToWxStr("Hex"));
-	menu->AppendSubMenu(viewAsSubMenu, StrToWxStr("View As:"));
-
-	PopupMenu(menu);
-}
-
-void CMemoryView::OnPaint(wxPaintEvent& event)
-{
-	wxPaintDC dc(this);
-	wxRect rc = GetClientRect();
-	wxFont hFont(_T("Courier"));
-	hFont.SetFamily(wxFONTFAMILY_TELETYPE);
-
-	wxCoord w,h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&hFont);
-	if (h > rowHeight)
-		rowHeight = h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&DebuggerFont);
-	if (h > rowHeight)
-		rowHeight = h;
-
-	if (viewAsType==VIEWAS_HEX)
-		dc.SetFont(hFont);
-	else
-		dc.SetFont(DebuggerFont);
-
-	dc.GetTextExtent(_T("W"),&w,&h);
-	int fontSize = w;
-	int textPlacement = 17 + 9 * fontSize;
-	struct branch
-	{
-		int src, dst, srcAddr;
-	};
-
-	// TODO: Add any drawing code here...
-	int width   = rc.width;
-	int numRows = (rc.height / rowHeight) / 2 + 2;
-	dc.SetBackgroundMode(wxTRANSPARENT);
-	const wxChar* bgColor = _T("#ffffff");
-	wxPen nullPen(bgColor);
-	wxPen currentPen(_T("#000000"));
-	wxPen selPen(_T("#808080")); // gray
-	nullPen.SetStyle(wxTRANSPARENT);
-
-	wxBrush currentBrush(_T("#FFEfE8")); // light gray
-	wxBrush pcBrush(_T("#70FF70")); // green
-	wxBrush mcBrush(_T("#1133FF")); // blue
-	wxBrush bgBrush(bgColor);
-	wxBrush nullBrush(bgColor);
-	nullBrush.SetStyle(wxTRANSPARENT);
-
-	dc.SetPen(nullPen);
-	dc.SetBrush(bgBrush);
-	dc.DrawRectangle(0, 0, 16, rc.height);
-	dc.DrawRectangle(0, 0, rc.width, 5+8);
-
-	// TODO - clean up this freaking mess!!!!!
-	for (int row = -numRows; row <= numRows; row++)
-	{
-		unsigned int address = curAddress + row * align;
-
-		int rowY1 = rc.height / 2 + rowHeight * row - rowHeight / 2;
-		int rowY2 = rc.height / 2 + rowHeight * row + rowHeight / 2;
-
-		wxString temp = wxString::Format(_T("%08x"), address);
-		u32 col = debugger->getColor(address);
-		wxBrush rowBrush(wxColor(col >> 16, col >> 8, col));
-		dc.SetBrush(nullBrush);
-		dc.SetPen(nullPen);
-		dc.DrawRectangle(0, rowY1, 16, rowY2);
-
-		if (selecting && (address == selection))
-			dc.SetPen(selPen);
-		else
-			dc.SetPen(row == 0 ? currentPen : nullPen);
-
-		if (address == debugger->getPC())
-			dc.SetBrush(pcBrush);
-		else
-			dc.SetBrush(rowBrush);
-
-		dc.DrawRectangle(16, rowY1, width, rowY2 - 1);
-		dc.SetBrush(currentBrush);
-		dc.SetTextForeground(_T("#600000"));
-		dc.DrawText(temp, 17, rowY1);
-
-		if (viewAsType != VIEWAS_HEX)
-		{
-			char mem[256];
-			debugger->getRawMemoryString(memory, address, mem, 256);
-			dc.SetTextForeground(_T("#000080"));
-			dc.DrawText(StrToWxStr(mem), 17+fontSize*(8), rowY1);
-			dc.SetTextForeground(_T("#000000"));
-		}
-
-		if (debugger->isAlive())
-		{
-			char dis[256] = {0};
-			u32 mem_data = debugger->readExtraMemory(memory, address);
-
-			if (viewAsType == VIEWAS_FP)
-			{
-				float flt = *(float *)(&mem_data);
-				sprintf(dis, "f: %f", flt);
-			}
-			else if (viewAsType == VIEWAS_ASCII)
-			{
-				u32 a[4] = {(mem_data&0xff000000)>>24,
-					(mem_data&0xff0000)>>16,
-					(mem_data&0xff00)>>8,
-					mem_data&0xff};
-				for (size_t i = 0; i < 4; i++)
-					if (a[i] == '\0')
-						a[i] = ' ';
-				sprintf(dis, "%c%c%c%c", a[0], a[1], a[2], a[3]);
-			}
-			else if (viewAsType == VIEWAS_HEX)
-			{
-				dis[0] = 0;
-				dis[1] = 0;
-				u32 mema[8] = {
-					debugger->readExtraMemory(memory, address),
-					debugger->readExtraMemory(memory, address+4),
-					debugger->readExtraMemory(memory, address+8),
-					debugger->readExtraMemory(memory, address+12),
-					debugger->readExtraMemory(memory, address+16),
-					debugger->readExtraMemory(memory, address+20),
-					debugger->readExtraMemory(memory, address+24),
-					debugger->readExtraMemory(memory, address+28)
-				};
-
-				for (int i = 0; i < 8; i++)
-				{
-					char buf[32] = "";
-					switch (dataType)
-					{
-					case 0:
-						sprintf(buf, " %02X %02X %02X %02X",
-							((mema[i]&0xff000000)>>24)&0xFF,
-							((mema[i]&0xff0000)>>16)&0xFF,
-							((mema[i]&0xff00)>>8)&0xFF,
-							mema[i]&0xff);
-						break;
-					case 1:
-						sprintf(buf, " %02X%02X %02X%02X",
-							((mema[i]&0xff000000)>>24)&0xFF,
-							((mema[i]&0xff0000)>>16)&0xFF,
-							((mema[i]&0xff00)>>8)&0xFF,
-							mema[i]&0xff);
-						break;
-					case 2:
-						sprintf(buf, " %02X%02X%02X%02X",
-							((mema[i]&0xff000000)>>24)&0xFF,
-							((mema[i]&0xff0000)>>16)&0xFF,
-							((mema[i]&0xff00)>>8)&0xFF,
-							mema[i]&0xff);
-						break;
-					}
-					strcat(dis, buf);
-				}
-				curAddress += 32;
-			}
-			else
-			{
-				sprintf(dis, "INVALID VIEWAS TYPE");
-			}
-
-			char desc[256] = "";
-			if (viewAsType != VIEWAS_HEX)
-				dc.DrawText(StrToWxStr(dis), textPlacement + fontSize*(8 + 8), rowY1);
-			else
-				dc.DrawText(StrToWxStr(dis), textPlacement, rowY1);
-
-			if (desc[0] == 0)
-				strcpy(desc, debugger->getDescription(address).c_str());
-
-			dc.SetTextForeground(_T("#0000FF"));
-
-			if (strlen(desc))
-				dc.DrawText(StrToWxStr(desc), 17+fontSize*((8+8+8+30)*2), rowY1);
-
-			// Show blue memory check dot
-			if (debugger->isMemCheck(address))
-			{
-				dc.SetBrush(mcBrush);
-				dc.DrawRectangle(8, rowY1 + 1, 11, 11);
-			}
-		}
-	}
-
-	dc.SetPen(currentPen);
-}
-
-void CMemoryView::OnResize(wxSizeEvent& event)
-{
-	Refresh();
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.h b/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
deleted file mode 100644
index 3bfdc03db5..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef MEMORYVIEW_H_
-#define MEMORYVIEW_H_
-
-#include "DebuggerUIUtil.h"
-#include "Common.h"
-#include "DebugInterface.h"
-
-class CMemoryView : public wxControl
-{
-public:
-	CMemoryView(DebugInterface* debuginterface, wxWindow* parent);
-	void OnPaint(wxPaintEvent& event);
-	void OnMouseDownL(wxMouseEvent& event);
-	void OnMouseMove(wxMouseEvent& event);
-	void OnMouseUpL(wxMouseEvent& event);
-	void OnMouseDownR(wxMouseEvent& event);
-	void OnPopupMenu(wxCommandEvent& event);
-
-	u32 GetSelection() { return selection ; }
-	int GetMemoryType() { return memory; }
-
-	void Center(u32 addr)
-	{
-		curAddress = addr;
-		Refresh();
-	}
-	int dataType;	// u8,u16,u32
-	int curAddress;	// Will be accessed by parent
-
-private:
-	int YToAddress(int y);
-	void OnResize(wxSizeEvent& event);
-
-	DebugInterface* debugger;
-
-	int align;
-	int rowHeight;
-
-	u32 selection;
-	u32 oldSelection;
-	bool selecting;
-
-	int memory;
-
-	enum EViewAsType
-	{
-		VIEWAS_ASCII = 0,
-		VIEWAS_FP,
-		VIEWAS_HEX,
-	};
-
-	EViewAsType viewAsType;
-
-	DECLARE_EVENT_TABLE()
-};
-
-#endif // MEMORYVIEW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
deleted file mode 100644
index fa85ce808e..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/button.h>
-#include <wx/textctrl.h>
-#include <wx/listctrl.h>
-#include <wx/thread.h>
-#include <wx/listctrl.h>
-
-#include "../WxUtils.h"
-#include "MemoryWindow.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "Host.h"
-#include "FileUtil.h"
-
-#include "Debugger/PPCDebugInterface.h"
-#include "PowerPC/PPCSymbolDB.h"
-
-#include "Core.h"
-#include "ConfigManager.h"
-#include "LogManager.h"
-
-#include "HW/Memmap.h"
-#include "HW/DSP.h"
-
-#include "../../DolphinWX/Src/Globals.h"
-
-enum
-{
-	IDM_MEM_ADDRBOX = 350,
-	IDM_SYMBOLLIST,
-	IDM_SETVALBUTTON,
-	IDM_DUMP_MEMORY,
-	IDM_DUMP_MEM2,
-	IDM_DUMP_FAKEVMEM,
-	IDM_VALBOX,
-	IDM_U8,
-	IDM_U16,
-	IDM_U32,
-	IDM_SEARCH,
-	IDM_ASCII,
-	IDM_HEX
-};
-
-BEGIN_EVENT_TABLE(CMemoryWindow, wxPanel)
-	EVT_TEXT(IDM_MEM_ADDRBOX,		CMemoryWindow::OnAddrBoxChange)
-	EVT_LISTBOX(IDM_SYMBOLLIST,		CMemoryWindow::OnSymbolListChange)
-	EVT_HOST_COMMAND(wxID_ANY,		CMemoryWindow::OnHostMessage)
-	EVT_BUTTON(IDM_SETVALBUTTON,	CMemoryWindow::SetMemoryValue)
-	EVT_BUTTON(IDM_DUMP_MEMORY,		CMemoryWindow::OnDumpMemory)
-	EVT_BUTTON(IDM_DUMP_MEM2,		CMemoryWindow::OnDumpMem2)
-	EVT_BUTTON(IDM_DUMP_FAKEVMEM,	CMemoryWindow::OnDumpFakeVMEM)
-	EVT_CHECKBOX(IDM_U8,			CMemoryWindow::U8)
-	EVT_CHECKBOX(IDM_U16,			CMemoryWindow::U16)
-	EVT_CHECKBOX(IDM_U32,			CMemoryWindow::U32)
-	EVT_BUTTON(IDM_SEARCH,			CMemoryWindow::onSearch)
-	EVT_CHECKBOX(IDM_ASCII,			CMemoryWindow::onAscii)
-	EVT_CHECKBOX(IDM_HEX,			CMemoryWindow::onHex)
-END_EVENT_TABLE()
-
-CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
-		const wxPoint& pos, const wxSize& size, long style, const wxString& name)
-	: wxPanel(parent, id, pos, size, style, name)
-{
-	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer* sizerRight = new wxBoxSizer(wxVERTICAL);
-	// Didn't see anything useful in the left part
-	//wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);
-
-	DebugInterface* di = &PowerPC::debug_interface;
-
-	//symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition,
-	//	   	wxSize(20, 100), 0, NULL, wxLB_SORT);
-	//sizerLeft->Add(symbols, 1, wxEXPAND);
-	memview = new CMemoryView(di, this);
-	memview->dataType = 0;
-	//sizerBig->Add(sizerLeft, 1, wxEXPAND);
-	sizerBig->Add(memview, 20, wxEXPAND);
-	sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
-	sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, _T("")));
-	sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, _T("")));
-	sizerRight->Add(new wxButton(this, IDM_SETVALBUTTON, _("Set &Value")));
-
-	sizerRight->AddSpacer(5);
-	sizerRight->Add(new wxButton(this, IDM_DUMP_MEMORY, _("&Dump MRAM")));
-	sizerRight->Add(new wxButton(this, IDM_DUMP_MEM2, _("&Dump EXRAM")));
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack == 1)
-		sizerRight->Add(new wxButton(this, IDM_DUMP_FAKEVMEM, _("&Dump FakeVMEM")));
-
-	wxStaticBoxSizer* sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search"));
-
-	sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _("Search")));
-	sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, _T("&Ascii ")));
-	sizerSearchType->Add(chkHex = new wxCheckBox(this, IDM_HEX, _("&Hex")));
-	sizerRight->Add(sizerSearchType);
-	wxStaticBoxSizer* sizerDataTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Data Type"));
-
-	sizerDataTypes->SetMinSize(74, 40);
-	sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, _T("&U8")));
-	sizerDataTypes->Add(chk16 = new wxCheckBox(this, IDM_U16, _T("&U16")));
-	sizerDataTypes->Add(chk32 = new wxCheckBox(this, IDM_U32, _T("&U32")));
-	sizerRight->Add(sizerDataTypes);
-	SetSizer(sizerBig);
-	chkHex->SetValue(1); //Set defaults
-	chk8->SetValue(1);
-
-	//sizerLeft->Fit(this);
-	sizerRight->Fit(this);
-	sizerBig->Fit(this);
-}
-
-void CMemoryWindow::Save(IniFile& _IniFile) const
-{
-	// Prevent these bad values that can happen after a crash or hanging
-	if(GetPosition().x != -32000 && GetPosition().y != -32000)
-	{
-		_IniFile.Set("MemoryWindow", "x", GetPosition().x);
-		_IniFile.Set("MemoryWindow", "y", GetPosition().y);
-		_IniFile.Set("MemoryWindow", "w", GetSize().GetWidth());
-		_IniFile.Set("MemoryWindow", "h", GetSize().GetHeight());
-	}
-}
-
-void CMemoryWindow::Load(IniFile& _IniFile)
-{
-	int x, y, w, h;
-	_IniFile.Get("MemoryWindow", "x", &x, GetPosition().x);
-	_IniFile.Get("MemoryWindow", "y", &y, GetPosition().y);
-	_IniFile.Get("MemoryWindow", "w", &w, GetSize().GetWidth());
-	_IniFile.Get("MemoryWindow", "h", &h, GetSize().GetHeight());
-	SetSize(x, y, w, h);
-}
-
-void CMemoryWindow::JumpToAddress(u32 _Address)
-{
-	memview->Center(_Address);
-}
-
-void CMemoryWindow::SetMemoryValue(wxCommandEvent& event)
-{
-	std::string str_addr = WxStrToStr(addrbox->GetValue());
-	std::string str_val = WxStrToStr(valbox->GetValue());
-	u32 addr;
-	u32 val;
-
-	if (!TryParse(std::string("0x") + str_addr, &addr))
-	{
-		PanicAlert("Invalid Address: %s", str_addr.c_str());
-		return;
-	}
-
-	if (!TryParse(std::string("0x") + str_val, &val))
-	{
-		PanicAlert("Invalid Value: %s", str_val.c_str());
-		return;
-	}
-
-	Memory::Write_U32(val, addr);
-	memview->Refresh();
-}
-
-void CMemoryWindow::OnAddrBoxChange(wxCommandEvent& event)
-{
-	wxString txt = addrbox->GetValue();
-	if (txt.size())
-	{
-		u32 addr;
-		sscanf(WxStrToStr(txt).c_str(), "%08x", &addr);
-		memview->Center(addr & ~3);
-	}
-
-	event.Skip(1);
-}
-
-void CMemoryWindow::Update()
-{
-	memview->Refresh();
-	memview->Center(PC);
-}
-
-void CMemoryWindow::NotifyMapLoaded()
-{
-	symbols->Show(false); // hide it for faster filling
-	symbols->Clear();
-#if 0
-	#ifdef _WIN32
-	const FunctionDB::XFuncMap &syms = g_symbolDB.Symbols();
-	for (FuntionDB::XFuncMap::iterator iter = syms.begin(); iter != syms.end(); ++iter)
-	{
-	int idx = symbols->Append(iter->second.name.c_str());
-	symbols->SetClientData(idx, (void*)&iter->second);
-	}
-	#endif
-#endif
-	symbols->Show(true);
-	Update();
-}
-
-void CMemoryWindow::OnSymbolListChange(wxCommandEvent& event)
-{
-	int index = symbols->GetSelection();
-	if (index >= 0)
-	{
-		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
-		if (pSymbol != NULL)
-		{
-			memview->Center(pSymbol->address);
-		}
-	}
-}
-
-void CMemoryWindow::OnHostMessage(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-		case IDM_NOTIFYMAPLOADED:
-			NotifyMapLoaded();
-			break;
-	}
-}
-
-void DumpArray(const std::string& filename, const u8* data, size_t length)
-{
-	if (data)
-	{
-		File::IOFile f(filename, "wb");
-		f.WriteBytes(data, length);
-	}
-}
-
-// Write mram to file
-void CMemoryWindow::OnDumpMemory( wxCommandEvent& event )
-{
-	DumpArray(File::GetUserPath(F_RAMDUMP_IDX), Memory::m_pRAM, Memory::REALRAM_SIZE);
-}
-
-// Write exram (aram or mem2) to file
-void CMemoryWindow::OnDumpMem2( wxCommandEvent& event )
-{	
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-	{
-		DumpArray(File::GetUserPath(F_ARAMDUMP_IDX), Memory::m_pEXRAM, Memory::EXRAM_SIZE);
-	}
-	else
-	{
-		DumpArray(File::GetUserPath(F_ARAMDUMP_IDX), DSP::GetARAMPtr(), DSP::ARAM_SIZE);
-	}
-}
-
-// Write fake vmem to file
-void CMemoryWindow::OnDumpFakeVMEM( wxCommandEvent& event )
-{
-	DumpArray(File::GetUserPath(F_FAKEVMEMDUMP_IDX), Memory::m_pVirtualFakeVMEM, Memory::FAKEVMEM_SIZE);
-}
-
-void CMemoryWindow::U8(wxCommandEvent& event)
-{
-	chk16->SetValue(0);
-	chk32->SetValue(0);
-	memview->dataType = 0;
-	memview->Refresh();
-}
-
-void CMemoryWindow::U16(wxCommandEvent& event)
-{
-	chk8->SetValue(0);
-	chk32->SetValue(0);
-	memview->dataType = 1;
-	memview->Refresh();
-}
-
-void CMemoryWindow::U32(wxCommandEvent& event)
-{
-	chk16->SetValue(0);
-	chk8->SetValue(0);
-	memview->dataType = 2;
-	memview->Refresh();
-}
-
-void CMemoryWindow::onSearch(wxCommandEvent& event)
-{
-	u8* TheRAM = 0;
-	u32 szRAM = 0;
-	switch (memview->GetMemoryType())
-	{
-	case 0:
-	default:
-		if (Memory::m_pRAM)
-		{
-			TheRAM = Memory::m_pRAM;
-			szRAM = Memory::REALRAM_SIZE;
-		}
-		break;
-	case 1:
-		{
-			u8* aram = DSP::GetARAMPtr();
-			if (aram)
-			{
-				TheRAM = aram;
-				szRAM = DSP::ARAM_SIZE;
-			}
-		}
-		break;
-	}
-	//Now we have memory to look in
-	//Are we looking for ASCII string, or hex?
-	//memview->cu
-	wxString rawData = valbox->GetValue();
-	std::vector<u8> Dest; //May need a better name
-	u32 size = 0;
-	int pad = rawData.size()%2; //If it's uneven
-	unsigned int i = 0;
-	long count = 0;
-	char copy[3] = {0};
-	long newsize = 0;
-	unsigned char *tmp2 = 0;
-	char* tmpstr = 0;
-
-	if (chkHex->GetValue())
-	{
-		//We are looking for hex
-		//If it's uneven
-		size = (rawData.size()/2) + pad;
-		Dest.resize(size+32);
-		newsize = rawData.size();
-
-		if (pad)
-		{
-			tmpstr = new char[newsize + 2];
-			memset(tmpstr, 0, newsize + 2);
-			tmpstr[0] = '0';
-		}
-		else
-		{
-			tmpstr = new char[newsize + 1];
-			memset(tmpstr, 0, newsize + 1);
-		}
-		sprintf(tmpstr, "%s%s", tmpstr, WxStrToStr(rawData).c_str());
-		tmp2 = &Dest.front();
-		count = 0;
-		for(i = 0; i < strlen(tmpstr); i++)
-		{
-			copy[0] = tmpstr[i];
-			copy[1] = tmpstr[i+1];
-			copy[2] = 0;
-			int tmpint;
-			sscanf(copy, "%02x", &tmpint);
-			tmp2[count++] = tmpint;
-			// Dest[count] should now be the hex of what the two chars were!
-			// Also should add a check to make sure it's A-F only
-			//sscanf(copy, "%02x", &tmp2[count++]);
-			i += 1;
-		}
-		delete[] tmpstr;
-	}
-	else
-	{
-		//Looking for an ascii string
-		size = rawData.size();
-		Dest.resize(size+1);
-		tmpstr = new char[size+1];
-
-		tmp2 = &Dest.front();
-		sprintf(tmpstr, "%s", WxStrToStr(rawData).c_str());
-
-		for(i = 0; i < size; i++)
-			tmp2[i] = tmpstr[i];
-
-		delete[] tmpstr;
-	}
-
-	if(size)
-	{
-		unsigned char* pnt = &Dest.front();
-		unsigned int k = 0;
-		//grab
-		wxString txt = addrbox->GetValue();
-		u32 addr = 0;
-		if (txt.size())
-		{
-			sscanf(WxStrToStr(txt).c_str(), "%08x", &addr);
-		}
-		i = addr+4;
-		for( ; i < szRAM; i++)
-		{
-			for(k = 0; k < size; k++)
-			{
-				if(i + k > szRAM) break;
-				if(k > size) break;
-				if(pnt[k] != TheRAM[i+k])
-				{
-					k = 0;
-					break;
-				}
-			}
-			if(k == size)
-			{
-				//Match was found
-				wxMessageBox(_("A match was found. Placing viewer at the offset."));
-				wxChar tmpwxstr[128] = {0};
-				wxSprintf(tmpwxstr, _T("%08x"), i);
-				wxString tmpwx(tmpwxstr);
-				addrbox->SetValue(tmpwx);
-				//memview->curAddress = i;
-				//memview->Refresh();
-				OnAddrBoxChange(event);
-				return;
-			}
-		}
-		wxMessageBox(_("No match was found."));
-	}
-}
-
-void CMemoryWindow::onAscii(wxCommandEvent& event)
-{
-	chkHex->SetValue(0);
-}
-
-void CMemoryWindow::onHex(wxCommandEvent& event)
-{
-	chkAscii->SetValue(0);
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
deleted file mode 100644
index b480934526..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef MEMORYWINDOW_H_
-#define MEMORYWINDOW_H_
-
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <wx/listbox.h>
-#include "MemoryView.h"
-#include "Thread.h"
-#include "StringUtil.h"
-
-#include "CoreParameter.h"
-
-class CRegisterWindow;
-class CBreakPointWindow;
-
-class CMemoryWindow
-	: public wxPanel
-{
-	public:
-
-		CMemoryWindow(wxWindow* parent,
-					  wxWindowID id = wxID_ANY,
-					  const wxPoint& pos = wxDefaultPosition,
-					  const wxSize& size = wxDefaultSize,
-					  long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
-					  const wxString& name = _("Memory"));
-
-		wxCheckBox* chk8;
-		wxCheckBox* chk16;
-		wxCheckBox* chk32;
-		wxButton*   btnSearch;
-		wxCheckBox* chkAscii;
-		wxCheckBox* chkHex;
-		void Save(IniFile& _IniFile) const;
-		void Load(IniFile& _IniFile);
-
-		void Update();
-		void NotifyMapLoaded();
-
-		void JumpToAddress(u32 _Address);
-
-	private:
-		DECLARE_EVENT_TABLE()
-
-		CMemoryView* memview;
-		wxListBox* symbols;
-
-		wxButton* buttonGo;
-		wxTextCtrl* addrbox;
-		wxTextCtrl* valbox;
-
-		void U8(wxCommandEvent& event);
-		void U16(wxCommandEvent& event);
-		void U32(wxCommandEvent& event);
-		void onSearch(wxCommandEvent& event);
-		void onAscii(wxCommandEvent& event);
-		void onHex(wxCommandEvent& event);
-		void OnSymbolListChange(wxCommandEvent& event);
-		void OnCallstackListChange(wxCommandEvent& event);
-		void OnAddrBoxChange(wxCommandEvent& event);
-		void OnHostMessage(wxCommandEvent& event);
-		void SetMemoryValue(wxCommandEvent& event);
-		void OnDumpMemory(wxCommandEvent& event);
-		void OnDumpMem2(wxCommandEvent& event);
-		void OnDumpFakeVMEM(wxCommandEvent& event);
-};
-
-#endif /*MEMORYWINDOW_*/
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
deleted file mode 100644
index ac56b8e4cc..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "DebuggerUIUtil.h"
-#include "RegisterView.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/ProcessorInterface.h"
-#include "IniFile.h"
-#include "../WxUtils.h"
-
-// F-zero 80005e60 wtf??
-
-extern const char* GetGPRName(unsigned int index);
-extern const char* GetFPRName(unsigned int index);
-
-static const char *special_reg_names[] = {
-	"PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause",
-};
-
-static u32 GetSpecialRegValue(int reg)
-{
-	switch (reg)
-	{
-	case 0: return PowerPC::ppcState.pc;
-	case 1: return PowerPC::ppcState.spr[SPR_LR];
-	case 2: return PowerPC::ppcState.spr[SPR_CTR];
-	case 3: return GetCR();
-	case 4: return PowerPC::ppcState.fpscr;
-	case 5: return PowerPC::ppcState.msr;
-	case 6: return PowerPC::ppcState.spr[SPR_SRR0];
-	case 7: return PowerPC::ppcState.spr[SPR_SRR1];
-	case 8: return PowerPC::ppcState.Exceptions;
-	case 9: return ProcessorInterface::GetMask();
-	case 10: return ProcessorInterface::GetCause();
-	default: return 0;	
-	}
-}
-
-wxString CRegTable::GetValue(int row, int col)
-{
-	if (row < 32)
-	{
-		switch (col)
-		{
-		case 0: return StrToWxStr(GetGPRName(row));
-		case 1: return wxString::Format(wxT("%08x"), GPR(row));
-		case 2: return StrToWxStr(GetFPRName(row));
-		case 3: return wxString::Format(wxT("%016llx"), riPS0(row));
-		case 4: return wxString::Format(wxT("%016llx"), riPS1(row));
-		default: return wxEmptyString;
-		}
-	}
-	else
-	{
-		if (row - 32 < NUM_SPECIALS)
-		{
-			switch (col)
-			{
-			case 0:	return StrToWxStr(special_reg_names[row - 32]);
-			case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32));
-			default: return wxEmptyString;
-			}
-		}
-	}
-	return wxEmptyString;
-}
-
-static void SetSpecialRegValue(int reg, u32 value)
-{
-	switch (reg)
-	{
-	case 0: PowerPC::ppcState.pc = value; break;
-	case 1: PowerPC::ppcState.spr[SPR_LR] = value; break;
-	case 2: PowerPC::ppcState.spr[SPR_CTR] = value; break;
-	case 3: SetCR(value); break;
-	case 4: PowerPC::ppcState.fpscr = value; break;
-	case 5: PowerPC::ppcState.msr = value; break;
-	case 6: PowerPC::ppcState.spr[SPR_SRR0] = value; break;
-	case 7: PowerPC::ppcState.spr[SPR_SRR1] = value; break;
-	case 8: PowerPC::ppcState.Exceptions = value; break;
-// Should we just change the value, or use ProcessorInterface::SetInterrupt() to make the system aware?
-// 	case 9: return ProcessorInterface::GetMask();
-// 	case 10: return ProcessorInterface::GetCause();
-	default: return;
-	}
-}
-
-void CRegTable::SetValue(int row, int col, const wxString& strNewVal)
-{
-	u32 newVal = 0;
-	if (TryParse(WxStrToStr(strNewVal), &newVal))
-	{
-		if (row < 32)
-		{
-			if (col == 1)
-				GPR(row) = newVal;
-			else if (col == 3)
-				riPS0(row) = newVal;
-			else if (col == 4)
-				riPS1(row) = newVal;
-		}
-		else
-		{
-			if ((row - 32 < NUM_SPECIALS) && (col == 1))
-			{
-				SetSpecialRegValue(row - 32, newVal);
-			}
-		}
-	}
-}
-
-void CRegTable::UpdateCachedRegs()
-{
-	for (int i = 0; i < 32; ++i)
-	{
-		m_CachedRegHasChanged[i] = (m_CachedRegs[i] != GPR(i));
-		m_CachedRegs[i] = GPR(i);
-
-		m_CachedFRegHasChanged[i][0] = (m_CachedFRegs[i][0] != riPS0(i));
-		m_CachedFRegs[i][0] = riPS0(i);
-		m_CachedFRegHasChanged[i][1] = (m_CachedFRegs[i][1] != riPS1(i));
-		m_CachedFRegs[i][1] = riPS1(i);
-	}
-	for (int i = 0; i < NUM_SPECIALS; ++i)
-	{
-		m_CachedSpecialRegHasChanged[i] = (m_CachedSpecialRegs[i] != GetSpecialRegValue(i));
-		m_CachedSpecialRegs[i] = GetSpecialRegValue(i);
-	}
-}
-
-wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
-{
-	wxGridCellAttr *attr = new wxGridCellAttr();
-
-	attr->SetBackgroundColour(wxColour(wxT("#FFFFFF")));  //wxWHITE
-	attr->SetFont(DebuggerFont);
-
-	switch (col)
-	{
-	case 1:
-		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
-		break;
-	case 3:
-	case 4:
-		attr->SetAlignment(wxALIGN_RIGHT, wxALIGN_CENTER);
-		break;
-	default:
-		attr->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTER);
-		break;
-	}
-
-	bool red = false;
-	switch (col)
-	{
-	case 1: red = row < 32 ? m_CachedRegHasChanged[row] : m_CachedSpecialRegHasChanged[row-32]; break;
-	case 3: 
-	case 4: red = row < 32 ? m_CachedFRegHasChanged[row][col-3] : false; break;
-	}
-
-	attr->SetTextColour(red ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000")));
-	attr->IncRef();
-	return attr;
-}
-
-CRegisterView::CRegisterView(wxWindow *parent, wxWindowID id)
-	: wxGrid(parent, id)
-{
-	SetTable(new CRegTable(), true);
-	SetRowLabelSize(0);
-	SetColLabelSize(0);
-	DisableDragRowSize();
-
-	AutoSizeColumns();
-}
-
-void CRegisterView::Update()
-{
-	ForceRefresh();
-	((CRegTable *)GetTable())->UpdateCachedRegs();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.h b/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
deleted file mode 100644
index 18b1d96bc3..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __REGISTERVIEW_h__
-#define __REGISTERVIEW_h__
-
-#include <wx/grid.h>
-
-#include "Common.h"
-
-// New register view:
-// R0  0x8000000    F0   0.0000       F0_PS1 0.0000
-// R1  0x8000000    F1   0.0000       F1_PS1 0.0000
-// R31  0x8000000   F31  0.0000      F31_PS1 0.0000
-// PC  (specials)
-// LR
-// CTR
-// CR0-7
-// FPSCR
-// MSR
-// SRR0
-// SRR1
-// Exceptions
-// Interrupt Mask (PI)
-// Interrupt Cause(PI)
-
-class CRegTable : public wxGridTableBase
-{
-	enum {
-		NUM_SPECIALS = 11,
-	};
-
-public:
-	CRegTable() {
-		memset(m_CachedRegs, 0, sizeof(m_CachedRegs));
-		memset(m_CachedSpecialRegs, 0, sizeof(m_CachedSpecialRegs));
-		memset(m_CachedFRegs, 0, sizeof(m_CachedFRegs));
-		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
-		memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged));
-		memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged));
-	}
-    int GetNumberCols(void) {return 5;}
-    int GetNumberRows(void) {return 32 + NUM_SPECIALS;}
-	bool IsEmptyCell(int row, int col) {return row > 31 && col > 2;}
-    wxString GetValue(int row, int col);
-    void SetValue(int row, int col, const wxString &);
-	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind);
-	void UpdateCachedRegs();
-
-private:
-	u32 m_CachedRegs[32];
-	u32 m_CachedSpecialRegs[NUM_SPECIALS];
-	u64 m_CachedFRegs[32][2];
-	bool m_CachedRegHasChanged[32];
-	bool m_CachedSpecialRegHasChanged[NUM_SPECIALS];
-	bool m_CachedFRegHasChanged[32][2];
-
-	DECLARE_NO_COPY_CLASS(CRegTable);
-};
-
-class CRegisterView : public wxGrid
-{
-public:
-	CRegisterView(wxWindow* parent, wxWindowID id);
-	void Update();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
deleted file mode 100644
index c8cb9d1433..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/wx.h>
-
-#include "RegisterWindow.h"
-#include "PowerPC/PowerPC.h"
-#include "RegisterView.h"
-
-extern const char* GetGRPName(unsigned int index);
-
-BEGIN_EVENT_TABLE(CRegisterWindow, wxPanel)
-END_EVENT_TABLE()
-
-
-CRegisterWindow::CRegisterWindow(wxWindow* parent, wxWindowID id,
-		const wxPoint& position, const wxSize& size,
-		long style, const wxString& name)
-	: wxPanel(parent, id, position, size, style, name)
-	, m_GPRGridView(NULL)
-{
-	CreateGUIControls();
-}
-
-void CRegisterWindow::CreateGUIControls()
-{
-	wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL);
-	m_GPRGridView = new CRegisterView(this, ID_GPR);
-	sGrid->Add(m_GPRGridView, 1, wxGROW);
-	SetSizer(sGrid);
-
-	NotifyUpdate();
-}
-
-void CRegisterWindow::NotifyUpdate()
-{
-	if (m_GPRGridView != NULL)
-		m_GPRGridView->Update();
-}
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
deleted file mode 100644
index dad48088ed..0000000000
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __REGISTERWINDOW_h__
-#define __REGISTERWINDOW_h__
-
-class CRegisterView;
-class IniFile;
-
-class CRegisterWindow
-	: public wxPanel
-{
-public:
-	CRegisterWindow(wxWindow* parent,
-			wxWindowID id = wxID_ANY,
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-			const wxString& name = _("Registers"));
-
-	void NotifyUpdate();
-
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	enum
-	{
-		ID_GPR = 1002
-	};
-
-	CRegisterView* m_GPRGridView;
-	void CreateGUIControls();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
deleted file mode 100644
index 63781008b3..0000000000
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ /dev/null
@@ -1,994 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FifoPlayerDlg.h"
-#include "FileUtil.h"
-#include "Thread.h"
-#include "FifoPlayer/FifoPlayer.h"
-#include "FifoPlayer/FifoRecorder.h"
-#include "OpcodeDecoding.h"
-#include "WxUtils.h"
-
-#include <wx/spinctrl.h>
-#include <wx/clipbrd.h>
-
-#include <algorithm>
-#include <vector>
-
-DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1)
-DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT)
-
-DECLARE_EVENT_TYPE(FRAME_WRITTEN_EVENT, -1)
-DEFINE_EVENT_TYPE(FRAME_WRITTEN_EVENT)
-
-using namespace std;
-
-std::recursive_mutex sMutex;
-wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = NULL;
-
-FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) :
-	wxDialog(parent, wxID_ANY, _("FIFO Player"), wxDefaultPosition, wxDefaultSize),
-	m_search_result_idx(0), m_FramesToRecord(1)
-{
-	CreateGUIControls();
-
-	sMutex.lock();
-	m_EvtHandler = GetEventHandler();
-	sMutex.unlock();
-
-	FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
-	FifoPlayer::GetInstance().SetFrameWrittenCallback(FrameWritten);
-}
-
-FifoPlayerDlg::~FifoPlayerDlg()
-{
-	Unbind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this);
-	Unbind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this);
-
-	// Disconnect Events
-	Unbind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this);
-	m_FrameFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this);
-	m_FrameToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this);
-	m_ObjectFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this);
-	m_ObjectToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this);
-	m_EarlyMemoryUpdates->Unbind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
-	m_RecordStop->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this);
-	m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);
-	m_FramesToRecordCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this);
-	m_Close->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this);
-
-	m_framesList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
-	m_objectsList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
-	m_objectCmdList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
-
-	FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL);
-
-	sMutex.lock();
-	m_EvtHandler = NULL;
-	sMutex.unlock();
-}
-
-void FifoPlayerDlg::CreateGUIControls()
-{
-	wxBoxSizer* sMain;
-	sMain = new wxBoxSizer(wxVERTICAL);
-	
-	m_Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);
-
-	{
-	m_PlayPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-	wxBoxSizer* sPlayPage;
-	sPlayPage = new wxBoxSizer(wxVERTICAL);
-	
-	wxStaticBoxSizer* sPlayInfo;
-	sPlayInfo = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("File Info")), wxVERTICAL);
-	
-	m_NumFramesLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_NumFramesLabel->Wrap(-1);
-	sPlayInfo->Add(m_NumFramesLabel, 0, wxALL, 5);
-	
-	m_CurrentFrameLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_CurrentFrameLabel->Wrap(-1);
-	sPlayInfo->Add(m_CurrentFrameLabel, 0, wxALL, 5);
-	
-	m_NumObjectsLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_NumObjectsLabel->Wrap(-1);
-	sPlayInfo->Add(m_NumObjectsLabel, 0, wxALL, 5);
-	
-	sPlayPage->Add(sPlayInfo, 1, wxEXPAND, 5);
-	
-	wxStaticBoxSizer* sFrameRange;
-	sFrameRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Frame Range")), wxHORIZONTAL);
-	
-	m_FrameFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"), wxDefaultPosition, wxDefaultSize, 0);
-	m_FrameFromLabel->Wrap(-1);
-	sFrameRange->Add(m_FrameFromLabel, 0, wxALL, 5);
-	
-	m_FrameFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10, 0);
-	sFrameRange->Add(m_FrameFromCtrl, 0, wxALL, 5);
-	
-	m_FrameToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"), wxDefaultPosition, wxDefaultSize, 0);
-	m_FrameToLabel->Wrap(-1);
-	sFrameRange->Add(m_FrameToLabel, 0, wxALL, 5);
-	
-	m_FrameToCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), wxSP_ARROW_KEYS, 0, 10, 0);
-	sFrameRange->Add(m_FrameToCtrl, 0, wxALL, 5);
-	
-	sPlayPage->Add(sFrameRange, 0, wxEXPAND, 5);
-	
-	wxStaticBoxSizer* sObjectRange;
-	sObjectRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Object Range")), wxHORIZONTAL);
-	
-	m_ObjectFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"), wxDefaultPosition, wxDefaultSize, 0);
-	m_ObjectFromLabel->Wrap(-1);
-	sObjectRange->Add(m_ObjectFromLabel, 0, wxALL, 5);
-	
-	m_ObjectFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
-	sObjectRange->Add(m_ObjectFromCtrl, 0, wxALL, 5);
-	
-	m_ObjectToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"), wxDefaultPosition, wxDefaultSize, 0);
-	m_ObjectToLabel->Wrap(-1);
-	sObjectRange->Add(m_ObjectToLabel, 0, wxALL, 5);
-	
-	m_ObjectToCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
-	sObjectRange->Add(m_ObjectToCtrl, 0, wxALL, 5);
-	
-	sPlayPage->Add(sObjectRange, 0, wxEXPAND, 5);
-	
-	wxStaticBoxSizer* sPlayOptions;
-	sPlayOptions = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Playback Options")), wxVERTICAL);
-	
-	m_EarlyMemoryUpdates = new wxCheckBox(m_PlayPage, wxID_ANY, _("Early Memory Updates"), wxDefaultPosition, wxDefaultSize, 0);
-	sPlayOptions->Add(m_EarlyMemoryUpdates, 0, wxALL, 5);
-	
-	sPlayPage->Add(sPlayOptions, 0, wxEXPAND, 5);
-	sPlayPage->AddStretchSpacer();
-
-	m_PlayPage->SetSizer(sPlayPage);
-	m_PlayPage->Layout();
-	sPlayPage->Fit(m_PlayPage);
-	m_Notebook->AddPage(m_PlayPage, _("Play"), true);
-	}
-
-	{
-	m_RecordPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-	wxBoxSizer* sRecordPage;
-	sRecordPage = new wxBoxSizer(wxVERTICAL);
-	
-	wxStaticBoxSizer* sRecordInfo;
-	sRecordInfo = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Info")), wxVERTICAL);
-	
-	m_RecordingFifoSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_RecordingFifoSizeLabel->Wrap(-1);
-	sRecordInfo->Add(m_RecordingFifoSizeLabel, 0, wxALL, 5);
-	
-	m_RecordingMemSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_RecordingMemSizeLabel->Wrap(-1);
-	sRecordInfo->Add(m_RecordingMemSizeLabel, 0, wxALL, 5);
-	
-	m_RecordingFramesLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
-	m_RecordingFramesLabel->Wrap(-1);
-	sRecordInfo->Add(m_RecordingFramesLabel, 0, wxALL, 5);
-	
-	sRecordPage->Add(sRecordInfo, 0, wxEXPAND, 5);
-	
-	wxBoxSizer* sRecordButtons;
-	sRecordButtons = new wxBoxSizer(wxHORIZONTAL);
-	
-	m_RecordStop = new wxButton(m_RecordPage, wxID_ANY, _("Record"), wxDefaultPosition, wxDefaultSize, 0);
-	sRecordButtons->Add(m_RecordStop, 0, wxALL, 5);
-	
-	m_Save = new wxButton(m_RecordPage, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0);
-	sRecordButtons->Add(m_Save, 0, wxALL, 5);
-	
-	sRecordPage->Add(sRecordButtons, 0, wxEXPAND, 5);
-	
-	wxStaticBoxSizer* sRecordingOptions;
-	sRecordingOptions = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Options")), wxHORIZONTAL);
-	
-	m_FramesToRecordLabel = new wxStaticText(m_RecordPage, wxID_ANY, _("Frames To Record"), wxDefaultPosition, wxDefaultSize, 0);
-	m_FramesToRecordLabel->Wrap(-1);
-	sRecordingOptions->Add(m_FramesToRecordLabel, 0, wxALL, 5);
-	
-	wxString initialNum = wxString::Format(_T("%d"), m_FramesToRecord);
-	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, initialNum, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 1);
-	sRecordingOptions->Add(m_FramesToRecordCtrl, 0, wxALL, 5);
-	
-	sRecordPage->Add(sRecordingOptions, 0, wxEXPAND, 5);
-	sRecordPage->AddStretchSpacer();
-
-	m_RecordPage->SetSizer(sRecordPage);
-	m_RecordPage->Layout();
-	sRecordPage->Fit(m_RecordPage);
-	m_Notebook->AddPage(m_RecordPage, _("Record"), false);
-	}
-
-	// Analyze page
-	{
-	m_AnalyzePage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-	wxBoxSizer* sAnalyzePage;
-	sAnalyzePage = new wxBoxSizer(wxVERTICAL);
-
-	wxStaticBoxSizer* sFrameInfoSizer;
-	sFrameInfoSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Frame Info")), wxVERTICAL);
-
-	wxBoxSizer* sListsSizer = new wxBoxSizer(wxHORIZONTAL);
-
-	m_framesList = new wxListBox(m_AnalyzePage, wxID_ANY);
-	m_framesList->SetMinSize(wxSize(100, 250));
-	sListsSizer->Add(m_framesList, 0, wxALL, 5);
-
-	m_objectsList = new wxListBox(m_AnalyzePage, wxID_ANY);
-	m_objectsList->SetMinSize(wxSize(110, 250));
-	sListsSizer->Add(m_objectsList, 0, wxALL, 5);
-
-	m_objectCmdList = new wxListBox(m_AnalyzePage, wxID_ANY);
-	m_objectCmdList->SetMinSize(wxSize(175, 250));
-	sListsSizer->Add(m_objectCmdList, 0, wxALL, 5);
-
-	sFrameInfoSizer->Add(sListsSizer, 0, wxALL, 5);
-
-	m_objectCmdInfo = new wxStaticText(m_AnalyzePage, wxID_ANY, wxString());
-	sFrameInfoSizer->Add(m_objectCmdInfo, 0, wxALL, 5);
-
-	sAnalyzePage->Add(sFrameInfoSizer, 0, wxEXPAND, 5);
-
-	wxStaticBoxSizer* sSearchSizer = new wxStaticBoxSizer(new wxStaticBox(m_AnalyzePage, wxID_ANY, _("Search current Object")), wxVERTICAL);
-
-	wxBoxSizer* sSearchField = new wxBoxSizer(wxHORIZONTAL);
-
-	sSearchField->Add(new wxStaticText(m_AnalyzePage, wxID_ANY, _("Search for hex Value:")), 0, wxALIGN_CENTER_VERTICAL, 5);
-	// TODO: ugh, wxValidator sucks - but we should use it anyway.
-	m_searchField = new wxTextCtrl(m_AnalyzePage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
-	m_numResultsText = new wxStaticText(m_AnalyzePage, wxID_ANY, wxEmptyString);
-
-	sSearchField->Add(m_searchField, 0, wxALL, 5);
-	sSearchField->Add(m_numResultsText, 0, wxALIGN_CENTER_VERTICAL, 5);
-
-	wxBoxSizer* sSearchButtons = new wxBoxSizer(wxHORIZONTAL);
-
-	m_beginSearch = new wxButton(m_AnalyzePage, wxID_ANY, _("Search"));
-	m_findNext = new wxButton(m_AnalyzePage, wxID_ANY, _("Find next"));
-	m_findPrevious = new wxButton(m_AnalyzePage, wxID_ANY, _("Find previous"));
-
-	ResetSearch();
-
-	sSearchButtons->Add(m_beginSearch, 0, wxALL, 5);
-	sSearchButtons->Add(m_findNext, 0, wxALL, 5);
-	sSearchButtons->Add(m_findPrevious, 0, wxALL, 5);
-
-	sSearchSizer->Add(sSearchField, 0, wxEXPAND, 5);
-	sSearchSizer->Add(sSearchButtons, 0, wxEXPAND, 5);
-
-	sAnalyzePage->Add(sSearchSizer, 0, wxEXPAND, 5);
-	sAnalyzePage->AddStretchSpacer();
-
-	m_AnalyzePage->SetSizer(sAnalyzePage);
-	m_AnalyzePage->Layout();
-	sAnalyzePage->Fit(m_AnalyzePage);
-	m_Notebook->AddPage(m_AnalyzePage, _("Analyze"), false);
-	}
-
-	sMain->Add(m_Notebook, 1, wxEXPAND | wxALL, 5);
-
-	wxBoxSizer* sButtons;
-	sButtons = new wxBoxSizer(wxHORIZONTAL);
-
-	wxBoxSizer* sCloseButtonExpander;
-	sCloseButtonExpander = new wxBoxSizer(wxHORIZONTAL);
-
-	sButtons->Add(sCloseButtonExpander, 1, wxEXPAND, 5);
-
-	m_Close = new wxButton(this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0);
-	sButtons->Add(m_Close, 0, wxALL, 5);
-
-	sMain->Add(sButtons, 0, wxEXPAND, 5);
-
-	SetSizer(sMain);
-	Layout();
-	sMain->Fit(this);
-
-	Center(wxBOTH);
-
-	// Connect Events
-	Bind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this);
-	m_FrameFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this);
-	m_FrameToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this);
-	m_ObjectFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this);
-	m_ObjectToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this);
-	m_EarlyMemoryUpdates->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
-	m_RecordStop->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this);
-	m_Save->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);
-	m_FramesToRecordCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this);
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this);
-
-	m_framesList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
-	m_objectsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
-	m_objectCmdList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
-
-	m_beginSearch->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnBeginSearch, this);
-	m_findNext->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindNextClick, this);
-	m_findPrevious->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindPreviousClick, this);
-
-	m_searchField->Bind(wxEVT_COMMAND_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this);
-	m_searchField->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FifoPlayerDlg::OnSearchFieldTextChanged, this);
-
-	// Setup command copying
-	wxAcceleratorEntry entry;
-	entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY);
-	wxAcceleratorTable accel(1, &entry);
-	m_objectCmdList->SetAcceleratorTable(accel);
-	m_objectCmdList->Bind(wxEVT_COMMAND_MENU_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY);
-
-	Bind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this);
-	Bind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this);
-
-	Show();
-}
-
-void FifoPlayerDlg::OnPaint(wxPaintEvent& event)
-{
-	UpdatePlayGui();
-	UpdateRecorderGui();
-	UpdateAnalyzerGui();
-
-	event.Skip();
-}
-
-void FifoPlayerDlg::OnFrameFrom(wxSpinEvent& event)
-{
-	FifoPlayer &player = FifoPlayer::GetInstance();
-
-	player.SetFrameRangeStart(event.GetPosition());
-
-	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
-	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());
-}
-
-void FifoPlayerDlg::OnFrameTo(wxSpinEvent& event)
-{
-	FifoPlayer &player = FifoPlayer::GetInstance();
-	player.SetFrameRangeEnd(event.GetPosition());
-
-	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
-	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());	
-}
-
-void FifoPlayerDlg::OnObjectFrom(wxSpinEvent& event)
-{
-	FifoPlayer::GetInstance().SetObjectRangeStart(event.GetPosition());
-}
-
-void FifoPlayerDlg::OnObjectTo(wxSpinEvent& event)
-{
-	FifoPlayer::GetInstance().SetObjectRangeEnd(event.GetPosition());
-}
-
-void FifoPlayerDlg::OnCheckEarlyMemoryUpdates(wxCommandEvent& event)
-{
-	FifoPlayer::GetInstance().SetEarlyMemoryUpdates(event.IsChecked());
-}
-
-void FifoPlayerDlg::OnSaveFile(wxCommandEvent& WXUNUSED(event))
-{
-	// Pointer to the file data that was created as a result of recording.
-	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
-
-	if (file)
-	{
-		// Bring up a save file dialog. The location the user chooses will be assigned to this variable.
-		wxString path = wxSaveFileSelector(_("Dolphin FIFO"), wxT("dff"), wxEmptyString, this);
-
-		// Has a valid file path
-		if (!path.empty())
-		{
-			// Attempt to save the file to the path the user chose
-			wxBeginBusyCursor();
-			bool result = file->Save(WxStrToStr(path).c_str());
-			wxEndBusyCursor();
-			
-			// Wasn't able to save the file, shit's whack, yo.
-			if (!result)
-				PanicAlert("Error saving file");
-		}
-	}
-}
-
-void FifoPlayerDlg::OnRecordStop(wxCommandEvent& WXUNUSED(event))
-{
-	FifoRecorder& recorder = FifoRecorder::GetInstance();
-
-	// Recorder is still recording
-	if (recorder.IsRecording())
-	{
-		// Then stop recording
-		recorder.StopRecording();
-
-		// and change the button label accordingly.
-		m_RecordStop->SetLabel(_("Record"));
-	}
-	else // Recorder is actually about to start recording
-	{
-		// So start recording
-		recorder.StartRecording(m_FramesToRecord, RecordingFinished);
-
-		// and change the button label accordingly.
-		m_RecordStop->SetLabel(_("Stop"));
-	}
-}
-
-void FifoPlayerDlg::OnNumFramesToRecord(wxSpinEvent& event)
-{
-	m_FramesToRecord = event.GetPosition();
-
-	// Entering 0 frames in the control indicates infinite frames to record
-	// The fifo recorder takes any value < 0 to be infinite frames
-	if (m_FramesToRecord < 1)
-		m_FramesToRecord = -1;
-}
-
-void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event)
-{
-	wxString str_search_val = m_searchField->GetValue();
-
-	if (m_framesList->GetSelection() == -1)
-		return;
-
-	// TODO: Limited to even str lengths...
-	if (str_search_val.Length() && str_search_val.Length() % 2)
-	{
-		m_numResultsText->SetLabel(_("Invalid search string (only even string lengths supported)"));
-		return;
-	}
-
-	unsigned int const val_length = str_search_val.Length() / 2;
-	std::vector<u8> search_val(val_length);
-	for (unsigned int i = 0; i < val_length; ++i)
-	{
-		wxString char_str = str_search_val.Mid(2*i, 2);
-		unsigned long val = 0;
-		if (!char_str.ToULong(&val, 16))
-		{
-			m_numResultsText->SetLabel(_("Invalid search string (couldn't convert to number)"));
-			return;
-		}
-		search_val[i] = (u8)val;
-	}
-	search_results.clear();
-
-	int const frame_idx = m_framesList->GetSelection();
-	FifoPlayer& player = FifoPlayer::GetInstance();
-	const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
-	const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
-
-	// TODO: Support searching through the last object... How do we know were the cmd data ends?
-	// TODO: Support searching for bit patterns
-	int obj_idx = m_objectsList->GetSelection();
-	if (obj_idx == -1)
-	{
-		m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)"));
-		return;
-	}
-
-	const u8* const start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]];
-	const u8* const end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]];
-
-	for (const u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr)
-	{
-		if (std::equal(search_val.begin(), search_val.end(), ptr))
-		{
-			SearchResult result;
-			result.frame_idx = frame_idx;
-
-			result.obj_idx = m_objectsList->GetSelection();
-			result.cmd_idx = 0;
-			for (unsigned int cmd_idx = 1; cmd_idx < m_objectCmdOffsets.size(); ++cmd_idx)
-			{
-				if (ptr < start_ptr + m_objectCmdOffsets[cmd_idx])
-				{
-					result.cmd_idx = cmd_idx-1;
-					break;
-				}
-			}
-			search_results.push_back(result);
-		}
-	}
-
-	ChangeSearchResult(0);
-	m_beginSearch->Disable();
-	m_numResultsText->SetLabel(wxString::Format(_("Found %d results for \'"), search_results.size()) + m_searchField->GetValue() + _("\'"));
-}
-
-void FifoPlayerDlg::OnSearchFieldTextChanged(wxCommandEvent& event)
-{
-	ResetSearch();
-}
-
-void FifoPlayerDlg::OnFindNextClick(wxCommandEvent& event)
-{
-	int cur_cmd_index = m_objectCmdList->GetSelection();
-	if (cur_cmd_index == -1)
-	{
-		ChangeSearchResult(0);
-		return;
-	}
-
-	for (std::vector<SearchResult>::iterator it = search_results.begin(); it != search_results.end(); ++it)
-	{
-		if (it->cmd_idx > cur_cmd_index)
-		{
-			ChangeSearchResult(it - search_results.begin());
-			return;
-		}
-	}
-}
-
-void FifoPlayerDlg::OnFindPreviousClick(wxCommandEvent& event)
-{
-	int cur_cmd_index = m_objectCmdList->GetSelection();
-	if (cur_cmd_index == -1)
-	{
-		ChangeSearchResult(search_results.size() - 1);
-		return;
-	}
-
-	for (std::vector<SearchResult>::reverse_iterator it = search_results.rbegin(); it != search_results.rend(); ++it)
-	{
-		if (it->cmd_idx < cur_cmd_index)
-		{
-			ChangeSearchResult(search_results.size()-1 - (it - search_results.rbegin()));
-			return;
-		}
-	}
-}
-
-void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
-{
-	if (result_idx < search_results.size()) // if index is valid
-	{
-		m_search_result_idx = result_idx;
-		int prev_frame = m_framesList->GetSelection();
-		int prev_obj = m_objectsList->GetSelection();
-		int prev_cmd = m_objectCmdList->GetSelection();
-		m_framesList->SetSelection(search_results[result_idx].frame_idx);
-		m_objectsList->SetSelection(search_results[result_idx].obj_idx);
-		m_objectCmdList->SetSelection(search_results[result_idx].cmd_idx);
-
-		wxCommandEvent ev(wxEVT_COMMAND_LISTBOX_SELECTED);
-		if (prev_frame != m_framesList->GetSelection())
-		{
-			ev.SetInt(m_framesList->GetSelection());
-			OnFrameListSelectionChanged(ev);
-		}
-		if (prev_obj != m_objectsList->GetSelection())
-		{
-			ev.SetInt(m_objectsList->GetSelection());
-			OnObjectListSelectionChanged(ev);
-		}
-		if (prev_cmd != m_objectCmdList->GetSelection())
-		{
-			ev.SetInt(m_objectCmdList->GetSelection());
-			OnObjectCmdListSelectionChanged(ev);
-		}
-
-		m_findNext->Enable(result_idx+1 < search_results.size());
-		m_findPrevious->Enable(result_idx != 0);
-	}
-	else if (search_results.size())
-	{
-		ChangeSearchResult(search_results.size() - 1);
-	}
-}
-
-void FifoPlayerDlg::ResetSearch()
-{
-	m_beginSearch->Enable(m_searchField->GetLineLength(0) > 0);
-	m_findNext->Disable();
-	m_findPrevious->Disable();
-
-	search_results.clear();
-}
-
-void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
-{
-	FifoPlayer& player = FifoPlayer::GetInstance();
-
-	m_objectsList->Clear();
-	if (event.GetInt() != -1)
-	{
-		int num_objects = player.GetAnalyzedFrameInfo(event.GetInt()).objectStarts.size();
-		for (int i = 0; i < num_objects; ++i)
-			m_objectsList->Append(wxString::Format(wxT("Object %i"), i));
-	}
-
-	// Update object list
-	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-	ev.SetInt(-1);
-	OnObjectListSelectionChanged(ev);
-
-	ResetSearch();
-}
-
-void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
-{
-	FifoPlayer& player = FifoPlayer::GetInstance();
-
-	int frame_idx = m_framesList->GetSelection();
-	int object_idx = event.GetInt();
-
-	m_objectCmdList->Clear();
-	m_objectCmdOffsets.clear();
-	if (frame_idx != -1 && object_idx != -1)
-	{
-		const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
-		const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
-		const u8* objectdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx]]; 
-		const u8* objectdata_end = &fifo_frame.fifoData[frame.objectEnds[object_idx]]; 
-		u8* objectdata = (u8*)objectdata_start;
-		const int obj_offset = objectdata_start - &fifo_frame.fifoData[frame.objectStarts[0]];
-
-		int cmd = *objectdata++;
-		int stream_size = Common::swap16(objectdata);
-		objectdata += 2;
-		wxString newLabel = wxString::Format(wxT("%08X:  %02X %04X  "), obj_offset, cmd, stream_size);
-		if (stream_size && ((objectdata_end - objectdata) % stream_size))
-			newLabel += _("NOTE: Stream size doesn't match actual data length\n");
-
-		while (objectdata < objectdata_end)
-		{
-			newLabel += wxString::Format(wxT("%02X"), *objectdata++);
-		}
-		m_objectCmdList->Append(newLabel);
-		m_objectCmdOffsets.push_back(0);
-
-
-		// Between objectdata_end and next_objdata_start, there are register setting commands
-		if (object_idx + 1 < (int)frame.objectStarts.size())
-		{
-			const u8* next_objdata_start = &fifo_frame.fifoData[frame.objectStarts[object_idx+1]]; 
-			while (objectdata < next_objdata_start)
-			{
-				m_objectCmdOffsets.push_back(objectdata - objectdata_start);
-				int new_offset = objectdata - &fifo_frame.fifoData[frame.objectStarts[0]];
-				int command = *objectdata++;
-				switch (command)
-				{
-				case GX_NOP:
-					newLabel = _("NOP");
-					break;
-
-				case 0x44:
-					newLabel = _("0x44");
-					break;
-
-				case GX_CMD_INVL_VC:
-					newLabel = _("GX_CMD_INVL_VC");
-					break;
-
-				case GX_LOAD_CP_REG:
-					{
-						u32 cmd2 = *objectdata++;
-						u32 value = Common::swap32(objectdata);
-						objectdata += 4;
-
-						newLabel = wxString::Format(wxT("CP  %02X  %08X"), cmd2, value);
-					}
-					break;
-
-				case GX_LOAD_XF_REG:
-					{
-						u32 cmd2 = Common::swap32(objectdata);
-						objectdata += 4;
-
-						u8 streamSize = ((cmd2 >> 16) & 15) + 1;
-
-						const u8* stream_start = objectdata;
-						const u8* stream_end = stream_start + streamSize * 4;
-
-						newLabel = wxString::Format(wxT("XF  %08X  "), cmd2);
-						while (objectdata < stream_end)
-						{
-							newLabel += wxString::Format(wxT("%02X"), *objectdata++);
-							if (((objectdata - stream_start) % 4) == 0) newLabel += wxT(" ");
-						}
-					}
-					break;
-
-				case GX_LOAD_INDX_A:
-				case GX_LOAD_INDX_B:
-				case GX_LOAD_INDX_C:
-				case GX_LOAD_INDX_D:
-					objectdata += 4;
-					newLabel = wxString::Format(wxT("LOAD INDX %s"), (command == GX_LOAD_INDX_A) ? _("A") :
-																	(command == GX_LOAD_INDX_B) ? _("B") :
-																	(command == GX_LOAD_INDX_C) ? _("C") : _("D"));
-					break;
-
-				case GX_CMD_CALL_DL:
-					// The recorder should have expanded display lists into the fifo stream and skipped the call to start them
-					// That is done to make it easier to track where memory is updated
-					_assert_(false);
-					objectdata += 8;
-					newLabel = wxString::Format(wxT("CALL DL"));
-					break;
-
-				case GX_LOAD_BP_REG:
-					{
-						u32 cmd2 = Common::swap32(objectdata);
-						objectdata += 4;
-						newLabel = wxString::Format(wxT("BP  %02X %06X"), cmd2 >> 24, cmd2 & 0xFFFFFF);
-					}
-					break;
-
-				default:
-					newLabel = _("Unexpected 0x80 call? Aborting...");
-					objectdata = (u8*)next_objdata_start;
-					break;
-				}
-				newLabel = wxString::Format(_("%08X:  "), new_offset) + newLabel;
-				m_objectCmdList->Append(newLabel);
-			}
-		}
-	}
-	// Update command list
-	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-	ev.SetInt(-1);
-	OnObjectCmdListSelectionChanged(ev);
-
-	ResetSearch();
-}
-
-void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event)
-{
-	const int frame_idx = m_framesList->GetSelection();
-	const int object_idx =  m_objectsList->GetSelection();
-
-	if (event.GetInt() == -1 || frame_idx == -1 || object_idx == -1)
-	{
-		m_objectCmdInfo->SetLabel(wxEmptyString);
-		return;
-	}
-
-	FifoPlayer& player = FifoPlayer::GetInstance();
-	const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx);
-	const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx);
-	const u8* cmddata = &fifo_frame.fifoData[frame.objectStarts[object_idx]] + m_objectCmdOffsets[event.GetInt()];
-
-	// TODO: Not sure whether we should bother translating the descriptions
-	wxString newLabel;
-	if (*cmddata == GX_LOAD_BP_REG)
-	{
-		char name[64]="\0", desc[512]="\0";
-		GetBPRegInfo(cmddata+1, name, sizeof(name), desc, sizeof(desc));
-		newLabel = _("BP register ");
-		newLabel += (name[0] != '\0') ? StrToWxStr(name) : wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1));
-		newLabel += wxT(":\n");
-		if (desc[0] != '\0')
-			newLabel += StrToWxStr(desc);
-		else
-			newLabel += _("No description available");
-	}
-	else if (*cmddata == GX_LOAD_CP_REG)
-		newLabel = _("CP reg");
-	else if (*cmddata == GX_LOAD_XF_REG)
-		newLabel = _("XF reg");
-	else
-		newLabel = _("No description available");
-
-	m_objectCmdInfo->SetLabel(newLabel);
-	Layout();
-	Fit();
-}
-
-void FifoPlayerDlg::OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event))
-{
-	if (wxTheClipboard->Open())
-	{
-		wxTheClipboard->SetData(new wxTextDataObject(m_objectCmdList->GetStringSelection()));
-		wxTheClipboard->Close();
-	}
-}
-
-void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event))
-{
-	Hide();
-}
-
-void FifoPlayerDlg::OnRecordingFinished(wxEvent&)
-{
-	m_RecordStop->SetLabel(_("Record"));
-	m_RecordStop->Enable();
-
-	UpdateRecorderGui();
-}
-
-void FifoPlayerDlg::OnFrameWritten(wxEvent&)
-{
-	m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel());
-	m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel());	
-}
-
-void FifoPlayerDlg::UpdatePlayGui()
-{
-	m_NumFramesLabel->SetLabel(CreateFileFrameCountLabel());
-	m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel());
-	m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel());
-
-	FifoPlayer &player = FifoPlayer::GetInstance();
-	FifoDataFile *file = player.GetFile();
-	u32 frameCount = 0;
-	if (file)
-		frameCount = file->GetFrameCount();
-
-	m_FrameFromCtrl->SetRange(0, frameCount);
-	m_FrameFromCtrl->SetValue(player.GetFrameRangeStart());
-
-	m_FrameToCtrl->SetRange(0, frameCount);
-	m_FrameToCtrl->SetValue(player.GetFrameRangeEnd());
-
-	m_ObjectFromCtrl->SetValue(player.GetObjectRangeStart());
-	m_ObjectToCtrl->SetValue(player.GetObjectRangeEnd());
-}
-
-void FifoPlayerDlg::UpdateRecorderGui()
-{
-	m_RecordingFifoSizeLabel->SetLabel(CreateRecordingFifoSizeLabel());
-	m_RecordingMemSizeLabel->SetLabel(CreateRecordingMemSizeLabel());
-	m_RecordingFramesLabel->SetLabel(CreateRecordingFrameCountLabel());	
-	m_Save->Enable(GetSaveButtonEnabled());
-}
-
-void FifoPlayerDlg::UpdateAnalyzerGui()
-{
-	FifoPlayer &player = FifoPlayer::GetInstance();
-	FifoDataFile* file = player.GetFile();
-
-	int num_frames = (file) ? player.GetFile()->GetFrameCount() : 0;
-	if ((int)m_framesList->GetCount() != num_frames)
-	{
-		m_framesList->Clear();
-
-		for (int i = 0; i < num_frames; ++i)
-		{
-			m_framesList->Append(wxString::Format(wxT("Frame %i"), i));
-		}
-
-		wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-		ev.SetInt(-1);
-		OnFrameListSelectionChanged(ev);
-	}
-}
-
-wxString FifoPlayerDlg::CreateFileFrameCountLabel() const
-{
-	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
-
-	if (file)
-		return CreateIntegerLabel(file->GetFrameCount(), _("Frame"));
-	
-	return _("No file loaded");
-}
-
-wxString FifoPlayerDlg::CreateCurrentFrameLabel() const
-{
-	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
-
-	if (file)
-		return _("Frame ") + wxString::Format(wxT("%i"), FifoPlayer::GetInstance().GetCurrentFrameNum());
-	
-	return wxEmptyString;
-}
-
-wxString FifoPlayerDlg::CreateFileObjectCountLabel() const
-{
-	FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
-
-	if (file)
-		return CreateIntegerLabel(FifoPlayer::GetInstance().GetFrameObjectCount(), _("Object"));
-	
-	return wxEmptyString;
-}
-
-wxString FifoPlayerDlg::CreateRecordingFifoSizeLabel() const
-{
-	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
-
-	if (file)
-	{
-		int fifoBytes = 0;
-		for (int i = 0; i < file->GetFrameCount(); ++i)
-			fifoBytes += file->GetFrame(i).fifoDataSize;
-
-		return CreateIntegerLabel(fifoBytes, _("FIFO Byte"));	
-	}
-	
-	return _("No recorded file");
-}
-
-wxString FifoPlayerDlg::CreateRecordingMemSizeLabel() const
-{
-	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
-
-	if (file)
-	{
-		int memBytes = 0;
-		for (int frameNum = 0; frameNum < file->GetFrameCount(); ++frameNum)
-		{
-			const vector<MemoryUpdate>& memUpdates = file->GetFrame(frameNum).memoryUpdates;
-			for (unsigned int i = 0; i < memUpdates.size(); ++i)
-				memBytes += memUpdates[i].size;
-		}
-
-		return CreateIntegerLabel(memBytes, _("Memory Byte"));	
-	}
-	
-	return wxEmptyString;
-}
-
-wxString FifoPlayerDlg::CreateRecordingFrameCountLabel() const
-{
-	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
-
-	if (file)
-	{
-		int numFrames = file->GetFrameCount();
-		return CreateIntegerLabel(numFrames, _("Frame"));
-	}
-	
-	return wxEmptyString;
-}
-
-wxString FifoPlayerDlg::CreateIntegerLabel(int size, const wxString& label) const
-{
-	wxString postfix;
-	if (size != 1)
-		postfix = _("s");
-
-	return wxString::Format(wxT("%i"), size) + wxT(" ") + label + postfix;
-}
-
-bool FifoPlayerDlg::GetSaveButtonEnabled() const
-{
-	return (FifoRecorder::GetInstance().GetRecordedFile() != NULL);
-}
-
-void FifoPlayerDlg::RecordingFinished()
-{
-	sMutex.lock();
-
-	if (m_EvtHandler)
-	{
-		wxCommandEvent event(RECORDING_FINISHED_EVENT);
-		m_EvtHandler->AddPendingEvent(event);
-	}
-
-	sMutex.unlock();
-}
-
-void FifoPlayerDlg::FileLoaded()
-{
-	sMutex.lock();
-
-	if (m_EvtHandler)
-	{
-		wxPaintEvent event;
-		m_EvtHandler->AddPendingEvent(event);
-	}
-
-	sMutex.unlock();
-}
-
-void FifoPlayerDlg::FrameWritten()
-{
-	sMutex.lock();
-
-	if (m_EvtHandler)
-	{
-		wxCommandEvent event(FRAME_WRITTEN_EVENT);
-		m_EvtHandler->AddPendingEvent(event);
-	}
-
-	sMutex.unlock();
-}
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
deleted file mode 100644
index 00976965a8..0000000000
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ /dev/null
@@ -1,1060 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// CFrame is the main parent window. Inside CFrame there is an m_Panel that is
-// the parent for the rendering window (when we render to the main window). In
-// Windows the rendering window is created by giving CreateWindow()
-// m_Panel->GetHandle() as parent window and creating a new child window to
-// m_Panel. The new child window handle that is returned by CreateWindow() can
-// be accessed from Core::GetWindowHandle().
-
-#include "Common.h" // Common
-#include "FileUtil.h"
-#include "Timer.h"
-
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "ConfigMain.h"
-#include "CheatsWindow.h"
-#include "GameListCtrl.h"
-#include "BootManager.h"
-#include "ConsoleListener.h"
-
-#include "ConfigManager.h" // Core
-#include "Core.h"
-#include "HW/DVDInterface.h"
-#include "HW/GCPad.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "State.h"
-#include "VolumeHandler.h"
-#include "Movie.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
-#include "VertexShaderManager.h"
-
-#include "VideoBackendBase.h"
-
-#include <wx/datetime.h> // wxWidgets
-
-// Resources
-
-extern "C" {
-#include "../resources/Dolphin.c" // Dolphin icon
-};
-
-
-#ifdef _WIN32
-// I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */
-HWND MSWGetParent_(HWND Parent)
-{
-	return GetParent(Parent);
-}
-#endif
-
-// ---------------
-// The CPanel class to receive MSWWindowProc messages from the video backend.
-
-extern CFrame* main_frame;
-
-
-BEGIN_EVENT_TABLE(CPanel, wxPanel)
-END_EVENT_TABLE()
-
-CPanel::CPanel(
-			wxWindow *parent,
-			wxWindowID id
-			)
-	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, 0) // disables wxTAB_TRAVERSAL because it was breaking hotkeys
-{
-}
-
-#ifdef _WIN32
-	WXLRESULT CPanel::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-	{
-		switch (nMsg)
-		{
-		case WM_USER:
-			switch(wParam)
-			{
-			case WM_USER_STOP:
-				main_frame->DoStop();
-				break;
-
-			case WM_USER_SETCURSOR:
-				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
-						main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN)
-					SetCursor(wxCURSOR_BLANK);
-				else
-					SetCursor(wxNullCursor);
-				break;
-			}
-			break;
-
-		default:
-			// By default let wxWidgets do what it normally does with this event
-			return wxPanel::MSWWindowProc(nMsg, wParam, lParam);
-		}
-		return 0;
-	}
-#endif
-
-CRenderFrame::CRenderFrame(wxFrame* parent, wxWindowID id, const wxString& title,
-		const wxPoint& pos, const wxSize& size,	long style)
-	: wxFrame(parent, id, title, pos, size, style)
-{
-	// Give it an icon
-	wxIcon IconTemp;
-	IconTemp.CopyFromBitmap(wxGetBitmapFromMemory(Dolphin_png));
-	SetIcon(IconTemp);
-}
-
-#ifdef _WIN32
-WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-	switch (nMsg)
-	{
-		case WM_SYSCOMMAND:
-			switch (wParam)
-			{
-				case SC_SCREENSAVE:
-				case SC_MONITORPOWER:
-					if (Core::GetState() == Core::CORE_RUN && SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-						break;
-				default:
-					return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
-			}
-			break;
-
-		case WM_CLOSE:
-			// Let Core finish initializing before accepting any WM_CLOSE messages
-			if (Core::GetState() == Core::CORE_UNINITIALIZED) break;
-			// Use default action otherwise
-
-		default:
-			// By default let wxWidgets do what it normally does with this event
-			return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
-	}
-	return 0;
-}
-#endif
-
-// event tables
-// Notice that wxID_HELP will be processed for the 'About' menu and the toolbar
-// help button.
-
-const wxEventType wxEVT_HOST_COMMAND = wxNewEventType();
-
-BEGIN_EVENT_TABLE(CFrame, CRenderFrame)
-
-// Menu bar
-EVT_MENU(wxID_OPEN, CFrame::OnOpen)
-EVT_MENU(wxID_EXIT, CFrame::OnQuit)
-EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
-EVT_MENU(IDM_HELPONLINEDOCS, CFrame::OnHelp)
-EVT_MENU(IDM_HELPGOOGLECODE, CFrame::OnHelp)
-EVT_MENU(wxID_ABOUT, CFrame::OnHelp)
-EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
-EVT_MENU(IDM_PLAY, CFrame::OnPlay)
-EVT_MENU(IDM_STOP, CFrame::OnStop)
-EVT_MENU(IDM_RESET, CFrame::OnReset)
-EVT_MENU(IDM_RECORD, CFrame::OnRecord)
-EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording)
-EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport)
-EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly)
-EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput)
-EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie)
-EVT_MENU(IDM_SHOWLAG, CFrame::OnShowLag)
-EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
-EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
-EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
-EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX)
-EVT_MENU(IDM_CONFIG_DSP_EMULATOR, CFrame::OnConfigDSP)
-EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnConfigPAD)
-EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnConfigWiimote)
-EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey)
-
-EVT_MENU(IDM_SAVE_PERSPECTIVE, CFrame::OnToolBar)
-EVT_AUITOOLBAR_TOOL_DROPDOWN(IDM_SAVE_PERSPECTIVE, CFrame::OnDropDownToolbarItem)
-EVT_MENU(IDM_EDIT_PERSPECTIVES, CFrame::OnToolBar)
-EVT_AUITOOLBAR_TOOL_DROPDOWN(IDM_EDIT_PERSPECTIVES, CFrame::OnDropDownSettingsToolbar)
-// Drop down
-EVT_MENU(IDM_PERSPECTIVES_ADD_PANE, CFrame::OnToolBar)
-EVT_MENU_RANGE(IDM_PERSPECTIVES_0, IDM_PERSPECTIVES_100, CFrame::OnSelectPerspective)
-EVT_MENU(IDM_ADD_PERSPECTIVE, CFrame::OnDropDownToolbarSelect)
-EVT_MENU(IDM_TAB_SPLIT, CFrame::OnDropDownToolbarSelect)
-EVT_MENU(IDM_NO_DOCKING, CFrame::OnDropDownToolbarSelect)
-// Drop down float
-EVT_MENU_RANGE(IDM_FLOAT_LOGWINDOW, IDM_FLOAT_CODEWINDOW, CFrame::OnFloatWindow)
-
-EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
-EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
-EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
-EVT_MENU(IDM_IMPORTSAVE, CFrame::OnImportSave)
-EVT_MENU(IDM_EXPORTALLSAVE, CFrame::OnExportAllSaves)
-EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow)
-EVT_MENU(IDM_CHANGEDISC, CFrame::OnChangeDisc)
-EVT_MENU(IDM_MENU_INSTALLWAD, CFrame::OnInstallWAD)
-EVT_MENU(IDM_LIST_INSTALLWAD, CFrame::OnInstallWAD)
-EVT_MENU(IDM_LOAD_WII_MENU, CFrame::OnLoadWiiMenu)
-EVT_MENU(IDM_FIFOPLAYER, CFrame::OnFifoPlayer)
-
-EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
-EVT_MENU(IDM_TOGGLE_DUALCORE, CFrame::OnToggleDualCore)
-EVT_MENU(IDM_TOGGLE_SKIPIDLE, CFrame::OnToggleSkipIdle)
-EVT_MENU(IDM_TOGGLE_TOOLBAR, CFrame::OnToggleToolbar)
-EVT_MENU(IDM_TOGGLE_STATUSBAR, CFrame::OnToggleStatusbar)
-EVT_MENU_RANGE(IDM_LOGWINDOW, IDM_VIDEOWINDOW, CFrame::OnToggleWindow)
-
-EVT_MENU(IDM_PURGECACHE, CFrame::GameListChanged)
-
-EVT_MENU(IDM_SAVEFIRSTSTATE, CFrame::OnSaveFirstState)
-EVT_MENU(IDM_UNDOLOADSTATE,     CFrame::OnUndoLoadState)
-EVT_MENU(IDM_UNDOSAVESTATE,     CFrame::OnUndoSaveState)
-EVT_MENU(IDM_LOADSTATEFILE, CFrame::OnLoadStateFromFile)
-EVT_MENU(IDM_SAVESTATEFILE, CFrame::OnSaveStateToFile)
-
-EVT_MENU_RANGE(IDM_LOADSLOT1, IDM_LOADSLOT10, CFrame::OnLoadState)
-EVT_MENU_RANGE(IDM_LOADLAST1, IDM_LOADLAST8, CFrame::OnLoadLastState)
-EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT10, CFrame::OnSaveState)
-EVT_MENU_RANGE(IDM_FRAMESKIP0, IDM_FRAMESKIP9, CFrame::OnFrameSkip)
-EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
-EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote)
-EVT_MENU_RANGE(IDM_LISTWAD, IDM_LISTDRIVES, CFrame::GameListChanged)
-
-// Other
-EVT_ACTIVATE(CFrame::OnActive)
-EVT_CLOSE(CFrame::OnClose)
-EVT_SIZE(CFrame::OnResize)
-EVT_MOVE(CFrame::OnMove)
-EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, CFrame::OnGameListCtrl_ItemActivated)
-EVT_HOST_COMMAND(wxID_ANY, CFrame::OnHostMessage)
-
-EVT_AUI_PANE_CLOSE(CFrame::OnPaneClose)
-EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, CFrame::OnNotebookPageClose)
-EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, CFrame::OnAllowNotebookDnD)
-EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, CFrame::OnNotebookPageChanged)
-EVT_AUINOTEBOOK_TAB_RIGHT_UP(wxID_ANY, CFrame::OnTab)
-
-// Post events to child panels
-EVT_MENU_RANGE(IDM_INTERPRETER, IDM_ADDRBOX, CFrame::PostEvent)
-EVT_TEXT(IDM_ADDRBOX, CFrame::PostEvent)
-
-END_EVENT_TABLE()
-
-// ---------------
-// Creation and close, quit functions
-
-CFrame::CFrame(wxFrame* parent,
-		wxWindowID id,
-		const wxString& title,
-		const wxPoint& pos,
-		const wxSize& size,
-		bool _UseDebugger,
-		bool _BatchMode,
-		bool ShowLogWindow,
-		long style)
-	: CRenderFrame(parent, id, title, pos, size, style)
-	, g_pCodeWindow(NULL), g_NetPlaySetupDiag(NULL), g_CheatsWindow(NULL)
-	, m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL)
-	, m_GameListCtrl(NULL), m_Panel(NULL)
-	, m_RenderFrame(NULL), m_RenderParent(NULL)
-	, m_LogWindow(NULL), m_LogConfigWindow(NULL)
-	, m_FifoPlayerDlg(NULL), UseDebugger(_UseDebugger)
-	, m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
-	, m_bGameLoading(false)
-{
-	for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
-		bFloatWindow[i] = false;
-
-	if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true;
-
-	// Give it a console early to show potential messages from this onward
-	ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener();
-	if (SConfig::GetInstance().m_InterfaceConsole) Console->Open();
-
-	// Start debugging maximized
-	if (UseDebugger) this->Maximize(true);
-	// Debugger class
-	if (UseDebugger)
-	{
-		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, this, IDM_CODEWINDOW);
-		LoadIniPerspectives();
-		g_pCodeWindow->Load();
-	}
-
-	// Create toolbar bitmaps
-	InitBitmaps();
-
-	// Give it a status bar
-	SetStatusBar(CreateStatusBar(2, wxST_SIZEGRIP, ID_STATUSBAR));
-	if (!SConfig::GetInstance().m_InterfaceStatusbar)
-		GetStatusBar()->Hide();
-
-	// Give it a menu bar
-	CreateMenu();
-
-	// ---------------
-	// Main panel
-	// This panel is the parent for rendering and it holds the gamelistctrl
-	m_Panel = new CPanel(this, IDM_MPANEL);
-
-	m_GameListCtrl = new CGameListCtrl(m_Panel, LIST_CTRL,
-			wxDefaultPosition, wxDefaultSize,
-			wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT);
-
-	wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL);
-	sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL);
-	m_Panel->SetSizer(sizerPanel);
-	// ---------------
-
-	// Manager
-	m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
-
-	m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
-			.Name(_T("Pane 0")).Caption(_T("Pane 0")).PaneBorder(false)
-			.CaptionVisible(false).Layer(0).Center().Show());
-	if (!g_pCodeWindow)
-		m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
-				.Name(_T("Pane 1")).Caption(_("Logging")).CaptionVisible(true)
-				.Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide());
-	AuiFullscreen = m_Mgr->SavePerspective();
-
-	// Create toolbar
-	RecreateToolbar();
-	if (!SConfig::GetInstance().m_InterfaceToolbar) DoToggleToolbar(false);
-
-	m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
-	m_LogWindow->Hide();
-	m_LogWindow->Disable();
-
-	g_TASInputDlg[0] = new TASInputDlg(this);
-	g_TASInputDlg[1] = new TASInputDlg(this);
-	g_TASInputDlg[2] = new TASInputDlg(this);
-	g_TASInputDlg[3] = new TASInputDlg(this);
-
-	Movie::SetInputManip(TASManipFunction);
-
-	State::SetOnAfterLoadCallback(OnAfterLoadCallback);
-
-	// Setup perspectives
-	if (g_pCodeWindow)
-	{
-		// Load perspective
-		DoLoadPerspective();
-	}
-	else
-	{
-		if (SConfig::GetInstance().m_InterfaceLogWindow)
-			ToggleLogWindow(true);
-		if (SConfig::GetInstance().m_InterfaceLogConfigWindow)
-			ToggleLogConfigWindow(true);
-		if (SConfig::GetInstance().m_InterfaceConsole)
-			ToggleConsole(true);
-	}
-
-	// Show window
-	Show();
-
-	// Commit
-	m_Mgr->Update();
-
-	#ifdef _WIN32
-		SetToolTip(wxT(""));
-		GetToolTip()->SetAutoPop(25000);
-	#endif
-
-	#if defined(HAVE_XRANDR) && HAVE_XRANDR
-		m_XRRConfig = new X11Utils::XRRConfiguration(X11Utils::XDisplayFromHandle(GetHandle()),
-				X11Utils::XWindowFromHandle(GetHandle()));
-	#endif
-
-	// -------------------------
-	// Connect event handlers
-
-	m_Mgr->Bind(wxEVT_AUI_RENDER, &CFrame::OnManagerResize, this);
-	// ----------
-
-	// Update controls
-	UpdateGUI();
-}
-// Destructor
-CFrame::~CFrame()
-{
-	drives.clear();
-
-	#if defined(HAVE_XRANDR) && HAVE_XRANDR
-		delete m_XRRConfig;
-	#endif
-
-	ClosePages();
-
-	delete m_Mgr;
-}
-
-bool CFrame::RendererIsFullscreen()
-{
-	bool fullscreen = false;
-
-	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
-	{
-		fullscreen = m_RenderFrame->IsFullScreen();
-	}
-
-#if defined(__APPLE__)
-	if (m_RenderFrame != NULL)
-	{
-		NSView *view = (NSView *) m_RenderFrame->GetHandle();
-		NSWindow *window = [view window];
-
-		fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask);
-	}
-#endif
-
-	return fullscreen;
-}
-
-void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
-{
-	Close(true);
-}
-
-// --------
-// Events
-void CFrame::OnActive(wxActivateEvent& event)
-{
-	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
-	{
-		if (event.GetActive() && event.GetEventObject() == m_RenderFrame)
-		{
-#ifdef __WXMSW__
-			::SetFocus((HWND)m_RenderParent->GetHandle());
-#else
-			m_RenderParent->SetFocus();
-#endif
-			
-			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
-					Core::GetState() == Core::CORE_RUN)
-				m_RenderParent->SetCursor(wxCURSOR_BLANK);
-		}
-		else
-		{
-			if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-				m_RenderParent->SetCursor(wxNullCursor);
-		}
-	}
-	event.Skip();
-}
-
-void CFrame::OnClose(wxCloseEvent& event)
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		DoStop();
-		if (Core::GetState() != Core::CORE_UNINITIALIZED)
-			return;
-		UpdateGUI();
-	}
-
-	//Stop Dolphin from saving the minimized Xpos and Ypos
-	if(main_frame->IsIconized())
-		main_frame->Iconize(false);
-
-	// Don't forget the skip or the window won't be destroyed
-	event.Skip();
-
-	// Save GUI settings
-	if (g_pCodeWindow)
-	{
-		SaveIniPerspectives();
-	}
-	else
-	{
-		// Close the log window now so that its settings are saved
-		m_LogWindow->Close();
-		m_LogWindow = NULL;
-	}
-
-
-	// Uninit
-	m_Mgr->UnInit();
-}
-
-// Post events
-
-// Warning: This may cause an endless loop if the event is propagated back to its parent
-void CFrame::PostEvent(wxCommandEvent& event)
-{
-	if (g_pCodeWindow &&
-		event.GetId() >= IDM_INTERPRETER &&
-		event.GetId() <= IDM_ADDRBOX)
-	{
-		event.StopPropagation();
-		g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-	else
-	{
-		event.Skip();
-	}
-}
-
-void CFrame::OnMove(wxMoveEvent& event)
-{
-	event.Skip();
-
-	if (!IsMaximized() &&
-		!(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()))
-	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iPosX = GetPosition().x;
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iPosY = GetPosition().y;
-	}
-}
-
-void CFrame::OnResize(wxSizeEvent& event)
-{
-	event.Skip();
-
-	if (!IsMaximized() &&
-		!(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && RendererIsFullscreen()) &&
-		!(Core::GetState() != Core::CORE_UNINITIALIZED &&
-			SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
-			SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize))
-	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth = GetSize().GetWidth();
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight = GetSize().GetHeight();
-	}
-
-	// Make sure the logger pane is a sane size
-	if (!g_pCodeWindow && m_LogWindow && m_Mgr->GetPane(_T("Pane 1")).IsShown() &&
-			!m_Mgr->GetPane(_T("Pane 1")).IsFloating() &&
-			(m_LogWindow->x > GetClientRect().GetWidth() ||
-			 m_LogWindow->y > GetClientRect().GetHeight()))
-		ShowResizePane();
-}
-
-// Host messages
-
-#ifdef _WIN32
-WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-	if (WM_SYSCOMMAND == nMsg && (SC_SCREENSAVE == wParam || SC_MONITORPOWER == wParam))
-	{
-		return 0;
-	}
-	else if (nMsg == WM_QUERYENDSESSION)
-	{
-		// Indicate that the application will be able to close
-		return 1;
-	}
-	else if (nMsg == WM_ENDSESSION)
-	{
-		// Actually trigger the close now
-		Close(true);
-		return 0;
-	}
-	else
-	{
-		return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
-	}
-}
-#endif
-
-void CFrame::OnHostMessage(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case IDM_UPDATEGUI:
-		UpdateGUI();
-		break;
-
-	case IDM_UPDATESTATUSBAR:
-		if (GetStatusBar() != NULL)
-			GetStatusBar()->SetStatusText(event.GetString(), event.GetInt());
-		break;
-
-	case IDM_UPDATETITLE:
-		if (m_RenderFrame != NULL)
-			m_RenderFrame->SetTitle(event.GetString());
-		break;
-
-	case IDM_WINDOWSIZEREQUEST:
-		{
-			std::pair<int, int> *win_size = (std::pair<int, int> *)(event.GetClientData());
-			OnRenderWindowSizeRequest(win_size->first, win_size->second);
-			delete win_size;
-		}
-		break;
-
-	case WM_USER_CREATE:
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-			m_RenderParent->SetCursor(wxCURSOR_BLANK);
-		break;
-
-#ifdef __WXGTK__
-	case IDM_PANIC:
-		{
-			wxString caption = event.GetString().BeforeFirst(':');
-			wxString text = event.GetString().AfterFirst(':');
-			bPanicResult = (wxYES == wxMessageBox(text, 
-						caption, event.GetInt() ? wxYES_NO : wxOK, wxGetActiveWindow()));
-			panic_event.Set();
-		}
-		break;
-#endif
-
-	case WM_USER_STOP:
-		DoStop();
-		break;
-	}
-}
-
-void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height)
-{
-#ifdef __WXGTK__
-	if (!wxIsMainThread())
-		wxMutexGuiEnter();
-#endif
-	wxRect client_rect = m_RenderParent->GetClientRect();
-	width = client_rect.width;
-	height = client_rect.height;
-	x = client_rect.x;
-	y = client_rect.y;
-#ifdef __WXGTK__
-	if (!wxIsMainThread())
-		wxMutexGuiLeave();
-#endif
-}
-
-void CFrame::OnRenderWindowSizeRequest(int width, int height)
-{
-	if (Core::GetState() == Core::CORE_UNINITIALIZED ||
-			!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize || 
-			RendererIsFullscreen() || m_RenderFrame->IsMaximized())
-		return;
-
-	int old_width, old_height, log_width = 0, log_height = 0;
-	m_RenderFrame->GetClientSize(&old_width, &old_height);
-
-	// Add space for the log/console/debugger window
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
-			(SConfig::GetInstance().m_InterfaceLogWindow ||
-			 SConfig::GetInstance().m_InterfaceConsole ||
-			 SConfig::GetInstance().m_InterfaceLogConfigWindow) &&
-			!m_Mgr->GetPane(wxT("Pane 1")).IsFloating())
-	{
-		switch (m_Mgr->GetPane(wxT("Pane 1")).dock_direction)
-		{
-			case wxAUI_DOCK_LEFT:
-			case wxAUI_DOCK_RIGHT:
-				log_width = m_Mgr->GetPane(wxT("Pane 1")).rect.GetWidth();
-				break;
-			case wxAUI_DOCK_TOP:
-			case wxAUI_DOCK_BOTTOM:
-				log_height = m_Mgr->GetPane(wxT("Pane 1")).rect.GetHeight();
-				break;
-		}
-	}
-
-	if (old_width != width + log_width || old_height != height + log_height)
-		m_RenderFrame->SetClientSize(width + log_width, height + log_height);
-}
-
-bool CFrame::RendererHasFocus()
-{
-	if (m_RenderParent == NULL)
-		return false;
-#ifdef _WIN32
-	if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
-		return true;
-#else
-	if (wxWindow::FindFocus() == NULL)
-		return false;
-	// Why these different cases?
-	if (m_RenderParent == wxWindow::FindFocus() ||
-			m_RenderParent == wxWindow::FindFocus()->GetParent() ||
-			m_RenderParent->GetParent() == wxWindow::FindFocus()->GetParent())
-		return true;
-#endif
-	return false;
-}
-
-void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
-{
-	// Show all platforms and regions if...
-	// 1. All platforms are set to hide
-	// 2. All Regions are set to hide
-	// Otherwise call BootGame to either...
-	// 1. Boot the selected iso
-	// 2. Boot the default or last loaded iso.
-	// 3. Call BrowseForDirectory if the gamelist is empty
-	if (!m_GameListCtrl->GetISO(0) &&
-		!((SConfig::GetInstance().m_ListGC &&
-		SConfig::GetInstance().m_ListWii &&
-		SConfig::GetInstance().m_ListWad) &&
-		(SConfig::GetInstance().m_ListJap &&
-		SConfig::GetInstance().m_ListUsa  &&
-		SConfig::GetInstance().m_ListPal  &&
-		SConfig::GetInstance().m_ListFrance &&
-		SConfig::GetInstance().m_ListItaly &&
-		SConfig::GetInstance().m_ListKorea &&
-		SConfig::GetInstance().m_ListTaiwan &&
-		SConfig::GetInstance().m_ListUnknown)))
-	{
-		SConfig::GetInstance().m_ListGC		= SConfig::GetInstance().m_ListWii =
-		SConfig::GetInstance().m_ListWad	= SConfig::GetInstance().m_ListJap =
-		SConfig::GetInstance().m_ListUsa	= SConfig::GetInstance().m_ListPal =
-		SConfig::GetInstance().m_ListFrance	= SConfig::GetInstance().m_ListItaly =
-		SConfig::GetInstance().m_ListKorea	= SConfig::GetInstance().m_ListTaiwan =
-		SConfig::GetInstance().m_ListUnknown= true;
-
-		GetMenuBar()->FindItem(IDM_LISTGC)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTWII)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTWAD)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTJAP)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTUSA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTPAL)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTFRANCE)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTITALY)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTKOREA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTTAIWAN)->Check(true);
-		GetMenuBar()->FindItem(IDM_LIST_UNK)->Check(true);
-
-		m_GameListCtrl->Update();
-	}
-	else if (!m_GameListCtrl->GetISO(0))
-	{
-		m_GameListCtrl->BrowseForDirectory();
-	}
-	else
-	{
-		// Game started by double click
-		BootGame(std::string(""));
-	}
-}
-
-bool IsHotkey(wxKeyEvent &event, int Id)
-{
-	return (event.GetKeyCode() != WXK_NONE &&
-			event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
-			event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
-}
-
-int GetCmdForHotkey(unsigned int key)
-{
-	switch (key)
-	{
-	case HK_OPEN: return wxID_OPEN;
-	case HK_CHANGE_DISC: return IDM_CHANGEDISC;
-	case HK_REFRESH_LIST: return wxID_REFRESH;
-	case HK_PLAY_PAUSE: return IDM_PLAY;
-	case HK_STOP: return IDM_STOP;
-	case HK_RESET: return IDM_RESET;
-	case HK_FRAME_ADVANCE: return IDM_FRAMESTEP;
-	case HK_START_RECORDING: return IDM_RECORD;
-	case HK_PLAY_RECORDING: return IDM_PLAYRECORD;
-	case HK_EXPORT_RECORDING: return IDM_RECORDEXPORT;
-	case HK_READ_ONLY_MODE: return IDM_RECORDREADONLY;
-	case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN;
-	case HK_SCREENSHOT: return IDM_SCREENSHOT;
-	case HK_EXIT: return wxID_EXIT;
-
-	case HK_WIIMOTE1_CONNECT: return IDM_CONNECT_WIIMOTE1;
-	case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2;
-	case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3;
-	case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4;
-	case HK_BALANCEBOARD_CONNECT: return IDM_CONNECT_BALANCEBOARD;
-
-	case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1;
-	case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2;
-	case HK_LOAD_STATE_SLOT_3: return IDM_LOADSLOT3;
-	case HK_LOAD_STATE_SLOT_4: return IDM_LOADSLOT4;
-	case HK_LOAD_STATE_SLOT_5: return IDM_LOADSLOT5;
-	case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6;
-	case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7;
-	case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8;
-	case HK_LOAD_STATE_SLOT_9: return IDM_LOADSLOT9;
-	case HK_LOAD_STATE_SLOT_10: return IDM_LOADSLOT10;
-
-	case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1;
-	case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2;
-	case HK_SAVE_STATE_SLOT_3: return IDM_SAVESLOT3;
-	case HK_SAVE_STATE_SLOT_4: return IDM_SAVESLOT4;
-	case HK_SAVE_STATE_SLOT_5: return IDM_SAVESLOT5;
-	case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6;
-	case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7;
-	case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8;
-	case HK_SAVE_STATE_SLOT_9: return IDM_SAVESLOT9;
-	case HK_SAVE_STATE_SLOT_10: return IDM_SAVESLOT10;
-
-	case HK_LOAD_LAST_STATE_1: return IDM_LOADLAST1;
-	case HK_LOAD_LAST_STATE_2: return IDM_LOADLAST2;
-	case HK_LOAD_LAST_STATE_3: return IDM_LOADLAST3;
-	case HK_LOAD_LAST_STATE_4: return IDM_LOADLAST4;
-	case HK_LOAD_LAST_STATE_5: return IDM_LOADLAST5;
-	case HK_LOAD_LAST_STATE_6: return IDM_LOADLAST6;
-	case HK_LOAD_LAST_STATE_7: return IDM_LOADLAST7;
-	case HK_LOAD_LAST_STATE_8: return IDM_LOADLAST8;
-
-	case HK_SAVE_FIRST_STATE: return IDM_SAVEFIRSTSTATE;
-	case HK_UNDO_LOAD_STATE: return IDM_UNDOLOADSTATE;
-	case HK_UNDO_SAVE_STATE: return IDM_UNDOSAVESTATE;
-	case HK_LOAD_STATE_FILE: return IDM_LOADSTATEFILE;
-	case HK_SAVE_STATE_FILE: return IDM_SAVESTATEFILE;
-	}
-
-	return -1;
-}
-
-void OnAfterLoadCallback()
-{
-	// warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread
-	if (main_frame)
-	{
-		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
-		main_frame->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-void TASManipFunction(SPADStatus *PadStatus, int controllerID)
-{
-	if (main_frame)
-		main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus, controllerID);
-}
-
-bool TASInputHasFocus()
-{
-	for (int i = 0; i < 4; i++)
-	{
-		if (main_frame->g_TASInputDlg[i]->TASHasFocus())
-			return true;
-	}
-	return false;
-}
-
-
-void CFrame::OnKeyDown(wxKeyEvent& event)
-{
-	if(Core::GetState() != Core::CORE_UNINITIALIZED &&
-			(RendererHasFocus() || TASInputHasFocus()))
-	{
-		int WiimoteId = -1;
-		// Toggle fullscreen
-		if (IsHotkey(event, HK_FULLSCREEN))
-			DoFullscreen(!RendererIsFullscreen());
-		// Send Debugger keys to CodeWindow
-		else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11))
-			event.Skip();
-		// Pause and Unpause
-		else if (IsHotkey(event, HK_PLAY_PAUSE))
-			DoPause();
-		// Stop
-		else if (IsHotkey(event, HK_STOP))
-			DoStop();
-		// Screenshot hotkey
-		else if (IsHotkey(event, HK_SCREENSHOT))
-			Core::SaveScreenShot();
-		else if (IsHotkey(event, HK_EXIT))
-			wxPostEvent(this, wxCommandEvent(wxID_EXIT));
-		// Wiimote connect and disconnect hotkeys
-		else if (IsHotkey(event, HK_WIIMOTE1_CONNECT))
-			WiimoteId = 0;
-		else if (IsHotkey(event, HK_WIIMOTE2_CONNECT))
-			WiimoteId = 1;
-		else if (IsHotkey(event, HK_WIIMOTE3_CONNECT))
-			WiimoteId = 2;
-		else if (IsHotkey(event, HK_WIIMOTE4_CONNECT))
-			WiimoteId = 3;
-		else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT))
-			WiimoteId = 4;
-		else if (IsHotkey(event, HK_TOGGLE_IR))
-		{
-			OSDChoice = 1;
-			// Toggle native resolution
-			if (++g_Config.iEFBScale > SCALE_4X)
-				g_Config.iEFBScale = SCALE_AUTO;
-		}
-		else if (IsHotkey(event, HK_TOGGLE_AR))
-		{
-			OSDChoice = 2;
-			// Toggle aspect ratio
-			g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
-		}
-		else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES))
-		{
-			OSDChoice = 3;
-			// Toggle EFB copy
-			if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
-			{
-				g_Config.bEFBCopyEnable ^= true;
-				g_Config.bCopyEFBToTexture = false;
-			}
-			else
-			{
-				g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
-			}
-		}
-		else if (IsHotkey(event, HK_TOGGLE_FOG))
-		{
-			OSDChoice = 4;
-			g_Config.bDisableFog = !g_Config.bDisableFog;
-		}
-		else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT))
-		{
-			if (++SConfig::GetInstance().m_Framelimit > 0x19)
-				SConfig::GetInstance().m_Framelimit = 0;
-		}
-		else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT))
-		{
-			if (--SConfig::GetInstance().m_Framelimit > 0x19)
-				SConfig::GetInstance().m_Framelimit = 0x19;
-		}
-		else
-		{
-			unsigned int i = NUM_HOTKEYS;
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus())
-			{
-				for (i = 0; i < NUM_HOTKEYS; i++)
-				{
-					if (IsHotkey(event, i))
-					{
-						int cmd = GetCmdForHotkey(i);
-						if (cmd >= 0)
-						{ 
-							wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, cmd);
-							wxMenuItem *item = GetMenuBar()->FindItem(cmd);
-							if (item && item->IsCheckable())
-							{
-								item->wxMenuItemBase::Toggle();
-								evt.SetInt(item->IsChecked());
-							}
-							GetEventHandler()->AddPendingEvent(evt);
-							break;
-						}
-					}
-				}
-			}
-			// On OS X, we claim all keyboard events while
-			// emulation is running to avoid wxWidgets sounding
-			// the system beep for unhandled key events when
-			// receiving pad/wiimote keypresses which take an
-			// entirely different path through the HID subsystem.
-#ifndef __APPLE__
-			// On other platforms, we leave the key event alone
-			// so it can be passed on to the windowing system.
-			if (i == NUM_HOTKEYS)
-				event.Skip();
-#endif
-		}
-
-		// Actually perform the wiimote connection or disconnection
-		if (WiimoteId >= 0)
-		{
-			bool connect = !GetMenuBar()->IsChecked(IDM_CONNECT_WIIMOTE1 + WiimoteId);
-			ConnectWiimote(WiimoteId, connect);
-		}
-
-		if (g_Config.bFreeLook && event.GetModifiers() == wxMOD_SHIFT)
-		{
-			static float debugSpeed = 1.0f;
-			switch (event.GetKeyCode())
-			{
-			case '9':
-				debugSpeed /= 2.0f;
-				break;
-			case '0':
-				debugSpeed *= 2.0f;
-				break;
-			case 'W':
-				VertexShaderManager::TranslateView(0.0f, debugSpeed);
-				break;
-			case 'S':
-				VertexShaderManager::TranslateView(0.0f, -debugSpeed);
-				break;
-			case 'A':
-				VertexShaderManager::TranslateView(debugSpeed, 0.0f);
-				break;
-			case 'D':
-				VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
-				break;
-			case 'Q':
-				VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
-				break;
-			case 'E':
-				VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
-				break;
-			case 'R':
-				VertexShaderManager::ResetView();
-				break;
-			default:
-				break;
-			}
-		}
-	}
-	else
-	{
-		event.Skip();
-	}
-}
-
-void CFrame::OnKeyUp(wxKeyEvent& event)
-{
-	event.Skip();
-}
-
-void CFrame::OnMouse(wxMouseEvent& event)
-{
-#if defined(HAVE_X11) && HAVE_X11
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		if(event.Dragging())
-			X11Utils::SendMotionEvent(X11Utils::XDisplayFromHandle(GetHandle()),
-					event.GetPosition().x, event.GetPosition().y);
-		else
-			X11Utils::SendButtonEvent(X11Utils::XDisplayFromHandle(GetHandle()), event.GetButton(),
-					event.GetPosition().x, event.GetPosition().y, event.ButtonDown());
-	}
-#endif
-	event.Skip();
-}
-
-void CFrame::DoFullscreen(bool bF)
-{
-	ToggleDisplayMode(bF);
-
-#if defined(__APPLE__)
-	NSView *view = (NSView *) m_RenderFrame->GetHandle();
-	NSWindow *window = [view window];
-
-	if (bF != RendererIsFullscreen())
-	{
-		[window toggleFullScreen:nil];
-	}
-#else
-	m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
-#endif
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
-	{
-		if (bF)
-		{
-			// Save the current mode before going to fullscreen
-			AuiCurrent = m_Mgr->SavePerspective();
-			m_Mgr->LoadPerspective(AuiFullscreen, true);
-		}
-		else
-		{
-			// Restore saved perspective
-			m_Mgr->LoadPerspective(AuiCurrent, true);
-		}
-	}
-	else
-	{
-		m_RenderFrame->Raise();
-	}
-}
-
-const CGameListCtrl *CFrame::GetGameListCtrl() const
-{
-	return m_GameListCtrl;
-}
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
deleted file mode 100644
index 4870eb8f72..0000000000
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __FRAME_H_
-#define __FRAME_H_
-
-#include <wx/wx.h> // wxWidgets
-#include <wx/busyinfo.h>
-#include <wx/mstream.h>
-#include <wx/listctrl.h>
-#include <wx/artprov.h>
-#include <wx/aui/aui.h>
-#include <wx/tooltip.h>
-#include <string>
-#include <vector>
-
-#ifdef __APPLE__
-#include <Cocoa/Cocoa.h>
-#endif
-
-#include "CDUtils.h"
-#include "Debugger/CodeWindow.h"
-#include "LogWindow.h"
-#include "LogConfigWindow.h"
-#include "TASInputDlg.h"
-#include "Movie.h"
-#if defined(HAVE_X11) && HAVE_X11
-#include "X11Utils.h"
-#endif
-
-// A shortcut to access the bitmaps
-#define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name))
-static inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
-{
-	wxMemoryInputStream is(data, length);
-	return(wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1));
-}
-
-// Class declarations
-class CGameListCtrl;
-class GameListItem;
-class CLogWindow;
-class FifoPlayerDlg;
-class NetPlaySetupDiag;
-class wxCheatsWindow;
-
-// The CPanel class to receive MSWWindowProc messages from the video backend.
-class CPanel : public wxPanel
-{
-	public:
-		CPanel(
-			wxWindow* parent,
-			wxWindowID id = wxID_ANY
-			);
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		#ifdef _WIN32
-			// Receive WndProc messages
-			WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-		#endif
-};
-
-class CRenderFrame : public wxFrame
-{
-	public:
-		CRenderFrame(wxFrame* parent,
-			wxWindowID id = wxID_ANY,
-			const wxString& title = wxT("Dolphin"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
-
-	private:
-		#ifdef _WIN32
-			// Receive WndProc messages
-			WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-		#endif
-};
-
-class CFrame : public CRenderFrame
-{
-public:
-	CFrame(wxFrame* parent,
-		wxWindowID id = wxID_ANY,
-		const wxString& title = wxT("Dolphin"),
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		bool _UseDebugger = false,
-		bool _BatchMode = false,
-		bool ShowLogWindow = false,
-		long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
-
-	virtual ~CFrame();
-
-	void* GetRenderHandle()
-	{
-		#ifdef _WIN32
-			return (void *)m_RenderParent->GetHandle();
-		#elif defined(HAVE_X11) && HAVE_X11
-			return (void *)X11Utils::XWindowFromHandle(m_RenderParent->GetHandle());
-		#else
-			return m_RenderParent;
-		#endif
-	}
-
-	// These have to be public
-	CCodeWindow* g_pCodeWindow;
-	NetPlaySetupDiag* g_NetPlaySetupDiag;
-	wxCheatsWindow* g_CheatsWindow;
-	TASInputDlg* g_TASInputDlg[4];
-
-	void InitBitmaps();
-	void DoPause();
-	void DoStop();
-	void DoRecordingSave();
-	void UpdateGUI();
-	void UpdateGameList();
-	void ToggleLogWindow(bool bShow);
-	void ToggleLogConfigWindow(bool bShow);
-	void ToggleConsole(bool bShow);
-	void PostEvent(wxCommandEvent& event);
-	void StatusBarMessage(const char * Text, ...);
-	void ClearStatusBar();
-	void GetRenderWindowSize(int& x, int& y, int& width, int& height);
-	void OnRenderWindowSizeRequest(int width, int height);
-	void BootGame(const std::string& filename);
-	void OnRenderParentClose(wxCloseEvent& event);
-	void OnRenderParentMove(wxMoveEvent& event);
-	bool RendererHasFocus();
-	void DoFullscreen(bool bF);
-	void ToggleDisplayMode (bool bFullscreen);
-	void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=NULL);
-	static void ConnectWiimote(int wm_idx, bool connect);
-
-	const CGameListCtrl *GetGameListCtrl() const;
-
-#ifdef __WXGTK__
-	Common::Event panic_event;
-	bool bPanicResult;
-	std::recursive_mutex keystate_lock;
-#endif
-
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-	X11Utils::XRRConfiguration *m_XRRConfig;
-#endif
-
-	// AUI
-	wxAuiManager *m_Mgr;
-	wxAuiToolBar *m_ToolBar, *m_ToolBarDebug, *m_ToolBarAui;
-	bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
-
-	// Perspectives (Should find a way to make all of this private)
-	void DoAddPage(wxWindow *Win, int i, bool Float);
-	void DoRemovePage(wxWindow *, bool bHide = true);
-	struct SPerspectives
-	{
-		std::string Name;
-		wxString Perspective;
-		std::vector<int> Width, Height;
-	};
-	std::vector<SPerspectives> Perspectives;
-	u32 ActivePerspective;	
-
-private:
-	CGameListCtrl* m_GameListCtrl;
-	wxPanel* m_Panel;
-	CRenderFrame* m_RenderFrame;
-	wxPanel* m_RenderParent;
-	CLogWindow* m_LogWindow;
-	LogConfigWindow* m_LogConfigWindow;
-	FifoPlayerDlg* m_FifoPlayerDlg;
-	bool UseDebugger;
-	bool m_bBatchMode;
-	bool m_bEdit;
-	bool m_bTabSplit;
-	bool m_bNoDocking;
-	bool m_bGameLoading;
-
-	std::vector<std::string> drives;
-
-	enum EToolbar
-	{
-		Toolbar_FileOpen,
-		Toolbar_Refresh,
-		Toolbar_Browse,
-		Toolbar_Play,
-		Toolbar_Stop,
-		Toolbar_Pause,
-		Toolbar_Screenshot,
-		Toolbar_FullScreen,
-		Toolbar_ConfigMain,
-		Toolbar_ConfigGFX,
-		Toolbar_ConfigDSP,
-		Toolbar_ConfigPAD,
-		Toolbar_Wiimote,
-		EToolbar_Max
-	};
-
-	wxBitmap m_Bitmaps[EToolbar_Max];
-	wxBitmap m_BitmapsMenu[EToolbar_Max];
-
-	void PopulateToolbar(wxAuiToolBar* toolBar);
-	void PopulateToolbarAui(wxAuiToolBar* toolBar);
-	void RecreateToolbar();
-	void CreateMenu();
-
-	// Utility
-	wxString GetMenuLabel(int Id);
-	wxWindow * GetNotebookPageFromId(wxWindowID Id);
-	wxAuiNotebook * GetNotebookFromId(u32 NBId);
-	int GetNotebookCount();
-	wxAuiNotebook *CreateEmptyNotebook();
-
-	// Perspectives
-	void AddRemoveBlankPage();
-	void OnNotebookPageClose(wxAuiNotebookEvent& event);
-	void OnAllowNotebookDnD(wxAuiNotebookEvent& event);
-	void OnNotebookPageChanged(wxAuiNotebookEvent& event);
-	void OnFloatWindow(wxCommandEvent& event);
-	void ToggleFloatWindow(int Id);
-	void OnTab(wxAuiNotebookEvent& event);
-	int GetNotebookAffiliation(wxWindowID Id);
-	void ClosePages();
-	void CloseAllNotebooks();
-	void ShowResizePane();
-	void TogglePane();
-	void SetPaneSize();
-	void ResetToolbarStyle();
-	void TogglePaneStyle(bool On, int EventId);
-	void ToggleNotebookStyle(bool On, long Style);
-	void ResizeConsole();
-	// Float window
-	void DoUnfloatPage(int Id);
-	void OnFloatingPageClosed(wxCloseEvent& event);
-	void OnFloatingPageSize(wxSizeEvent& event);
-	void DoFloatNotebookPage(wxWindowID Id);
-	wxFrame * CreateParentFrame(wxWindowID Id = wxID_ANY,
-			const wxString& title = wxT(""),
-			wxWindow * = NULL);
-	wxString AuiFullscreen, AuiCurrent;
-	void AddPane();
-	void UpdateCurrentPerspective();
-	void SaveIniPerspectives();
-	void LoadIniPerspectives();
-	void OnPaneClose(wxAuiManagerEvent& evt);
-	void ReloadPanes();
-	void DoLoadPerspective();
-	void OnDropDownToolbarSelect(wxCommandEvent& event);		
-	void OnDropDownSettingsToolbar(wxAuiToolBarEvent& event);
-	void OnDropDownToolbarItem(wxAuiToolBarEvent& event);
-	void OnSelectPerspective(wxCommandEvent& event);		
-
-#ifdef _WIN32
-	// Override window proc for tricks like screensaver disabling
-	WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-#endif
-	// Event functions
-	void OnQuit(wxCommandEvent& event);
-	void OnHelp(wxCommandEvent& event);
-	void OnToolBar(wxCommandEvent& event);
-	void OnAuiToolBar(wxAuiToolBarEvent& event);
-
-	void OnOpen(wxCommandEvent& event); // File menu
-	void DoOpen(bool Boot);
-	void OnRefresh(wxCommandEvent& event);
-	void OnBrowse(wxCommandEvent& event);
-	void OnBootDrive(wxCommandEvent& event);
-
-	void OnPlay(wxCommandEvent& event); // Emulation
-	void OnStop(wxCommandEvent& event);
-	void OnReset(wxCommandEvent& event);
-	void OnRecord(wxCommandEvent& event);
-	void OnPlayRecording(wxCommandEvent& event);
-	void OnRecordExport(wxCommandEvent& event);
-	void OnRecordReadOnly(wxCommandEvent& event);
-	void OnTASInput(wxCommandEvent& event);
-	void OnTogglePauseMovie(wxCommandEvent& event);
-	void OnShowLag(wxCommandEvent& event);
-	void OnChangeDisc(wxCommandEvent& event);
-	void OnScreenshot(wxCommandEvent& event);
-	void OnActive(wxActivateEvent& event);
-	void OnClose(wxCloseEvent &event);	
-	void OnLoadState(wxCommandEvent& event);
-	void OnSaveState(wxCommandEvent& event);
-	void OnLoadStateFromFile(wxCommandEvent& event);
-	void OnSaveStateToFile(wxCommandEvent& event);
-	void OnLoadLastState(wxCommandEvent& event);
-	void OnSaveFirstState(wxCommandEvent& event);
-	void OnUndoLoadState(wxCommandEvent& event);
-	void OnUndoSaveState(wxCommandEvent& event);
-
-	void OnFrameSkip(wxCommandEvent& event);
-	void OnFrameStep(wxCommandEvent& event);
-
-	void OnConfigMain(wxCommandEvent& event); // Options
-	void OnConfigGFX(wxCommandEvent& event);
-	void OnConfigDSP(wxCommandEvent& event);
-	void OnConfigPAD(wxCommandEvent& event);
-	void OnConfigWiimote(wxCommandEvent& event);
-	void OnConfigHotkey(wxCommandEvent& event);
-
-	void OnToggleFullscreen(wxCommandEvent& event);
-	void OnToggleDualCore(wxCommandEvent& event);
-	void OnToggleSkipIdle(wxCommandEvent& event);
-	void OnToggleThrottle(wxCommandEvent& event);
-	void OnManagerResize(wxAuiManagerEvent& event);
-	void OnMove(wxMoveEvent& event);
-	void OnResize(wxSizeEvent& event);
-	void OnToggleToolbar(wxCommandEvent& event);
-	void DoToggleToolbar(bool);
-	void OnToggleStatusbar(wxCommandEvent& event);
-	void OnToggleWindow(wxCommandEvent& event);
-
-	void OnKeyDown(wxKeyEvent& event); // Keyboard
-	void OnKeyUp(wxKeyEvent& event);
-
-	void OnMouse(wxMouseEvent& event); // Mouse
-
-	void OnHostMessage(wxCommandEvent& event);
-
-	void OnMemcard(wxCommandEvent& event); // Misc
-	void OnImportSave(wxCommandEvent& event);
-	void OnExportAllSaves(wxCommandEvent& event);
-
-	void OnNetPlay(wxCommandEvent& event);
-
-	void OnShow_CheatsWindow(wxCommandEvent& event);
-	void OnLoadWiiMenu(wxCommandEvent& event);
-	void OnInstallWAD(wxCommandEvent& event);
-	void OnFifoPlayer(wxCommandEvent& event);
-	void OnConnectWiimote(wxCommandEvent& event);
-	void GameListChanged(wxCommandEvent& event);
-
-	void OnGameListCtrl_ItemActivated(wxListEvent& event);
-	void OnRenderParentResize(wxSizeEvent& event);
-	bool RendererIsFullscreen();
-	void StartGame(const std::string& filename);
-
-	// Event table
-	DECLARE_EVENT_TABLE();
-};
-
-int GetCmdForHotkey(unsigned int key);
-
-void OnAfterLoadCallback();
-
-// For TASInputDlg
-void TASManipFunction(SPADStatus *PadStatus, int controllerID);
-bool TASInputHasFocus();
-
-#endif  // __FRAME_H_
-
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp
deleted file mode 100644
index 5ba5d54b43..0000000000
--- a/Source/Core/DolphinWX/Src/FrameAui.cpp
+++ /dev/null
@@ -1,1162 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h" // Common
-#include "ConsoleListener.h"
-
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "LogWindow.h"
-#include "WxUtils.h"
-
-#include "ConfigManager.h" // Core
-
-// ------------
-// Aui events
-
-void CFrame::OnManagerResize(wxAuiManagerEvent& event)
-{
-	if (!g_pCodeWindow && m_LogWindow &&
-			m_Mgr->GetPane(_T("Pane 1")).IsShown() &&
-			!m_Mgr->GetPane(_T("Pane 1")).IsFloating())
-	{
-		m_LogWindow->x = m_Mgr->GetPane(_T("Pane 1")).rect.GetWidth();
-		m_LogWindow->y = m_Mgr->GetPane(_T("Pane 1")).rect.GetHeight();
-		m_LogWindow->winpos = m_Mgr->GetPane(_T("Pane 1")).dock_direction;
-	}
-	event.Skip();
-	ResizeConsole();
-}
-
-void CFrame::OnPaneClose(wxAuiManagerEvent& event)
-{
-	event.Veto();
-
-	wxAuiNotebook * nb = (wxAuiNotebook*)event.pane->window;
-	if (!nb) return;
-
-	if (!g_pCodeWindow)
-	{
-		if (nb->GetPage(0)->GetId() == IDM_LOGWINDOW || 
-				nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW ||
-				nb->GetPage(0)->GetId() == IDM_CONSOLEWINDOW)
-		{
-			// Closing a pane containing the logwindow or a console closes both
-			SConfig::GetInstance().m_InterfaceConsole = false;
-			SConfig::GetInstance().m_InterfaceLogWindow = false;
-			SConfig::GetInstance().m_InterfaceLogConfigWindow = false;
-			ToggleConsole(false);
-			ToggleLogWindow(false);
-			ToggleLogConfigWindow(false);
-		}
-	}
-	else
-	{
-		if (GetNotebookCount() == 1)
-		{
-			wxMessageBox(_("At least one pane must remain open."),
-					_("Notice"), wxOK, this);
-		}
-		else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs(wxT("<>")))
-		{
-			wxMessageBox(_("You can't close panes that have pages in them."),
-					_("Notice"), wxOK, this);
-		}
-		else
-		{
-			// Detach and delete the empty notebook
-			event.pane->DestroyOnClose(true);
-			m_Mgr->ClosePane(*event.pane);
-		}
-	}
-
-	m_Mgr->Update();
-}
-
-void CFrame::ToggleLogWindow(bool bShow)
-{
-	if (!m_LogWindow)
-		return;
-
-	GetMenuBar()->FindItem(IDM_LOGWINDOW)->Check(bShow);
-
-	if (bShow)
-	{
-		// Create a new log window if it doesn't exist.
-		if (!m_LogWindow)
-		{
-			m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
-		}
-
-		m_LogWindow->Enable();
-
-		DoAddPage(m_LogWindow,
-				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[0] : 0,
-				g_pCodeWindow ? bFloatWindow[0] : false);
-	}
-	else
-	{
-		// Hiding the log window, so disable it and remove it.
-		m_LogWindow->Disable();
-		DoRemovePage(m_LogWindow, true);
-	}
-
-	// Hide or Show the pane
-	if (!g_pCodeWindow)
-		TogglePane();
-}
-
-void CFrame::ToggleLogConfigWindow(bool bShow)
-{
-	GetMenuBar()->FindItem(IDM_LOGCONFIGWINDOW)->Check(bShow);
-
-	if (bShow)
-	{
-		if (!m_LogConfigWindow)
-			m_LogConfigWindow = new LogConfigWindow(this, m_LogWindow, IDM_LOGCONFIGWINDOW);
-
-		const int nbIndex = IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW;
-		DoAddPage(m_LogConfigWindow,
-				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0,
-				g_pCodeWindow ? bFloatWindow[nbIndex] : false);
-	}
-	else
-	{
-		DoRemovePage(m_LogConfigWindow, false);
-		m_LogConfigWindow = NULL;
-	}
-
-	// Hide or Show the pane
-	if (!g_pCodeWindow)
-		TogglePane();
-}
-
-void CFrame::ToggleConsole(bool bShow)
-{
-#ifdef _WIN32
-	GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(bShow);
-
-	if (bShow)
-	{
-		// If the console doesn't exist, we create it
-		if (!GetConsoleWindow())
-		{
-			ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener();
-			Console->Open();
-		}
-		else
-		{
-			ShowWindow(GetConsoleWindow(), SW_SHOW);
-		}
-
-		// Create the parent window if it doesn't exist
-		wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW);
-		if (!ConsoleParent) ConsoleParent = new wxPanel(this, IDM_CONSOLEWINDOW,
-				wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Console"));
-
-		wxWindow *ConsoleWin = new wxWindow();
-		ConsoleWin->SetHWND((WXHWND)GetConsoleWindow());
-		ConsoleWin->AdoptAttributesFromHWND();
-		ConsoleWin->Reparent(ConsoleParent);
-
-		ConsoleParent->Enable();
-		const int nbIndex = IDM_CONSOLEWINDOW - IDM_LOGWINDOW;
-		DoAddPage(ConsoleParent,
-				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0,
-				g_pCodeWindow ? bFloatWindow[nbIndex] : false);
-	}
-	else // Hide
-	{
-		if(GetConsoleWindow())
-			ShowWindow(GetConsoleWindow(), SW_HIDE); // WIN32
-
-		wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW);
-		if (ConsoleParent)
-			ConsoleParent->Disable();
-
-		// Then close the page
-		DoRemovePage(ConsoleParent, true);
-	}
-
-	// Hide or Show the pane
-	if (!g_pCodeWindow)
-		TogglePane();
-#endif
-}
-
-void CFrame::OnToggleWindow(wxCommandEvent& event)
-{
-	bool bShow = GetMenuBar()->IsChecked(event.GetId());
-
-	switch(event.GetId())
-	{
-		case IDM_LOGWINDOW:
-			if (!g_pCodeWindow)
-				SConfig::GetInstance().m_InterfaceLogWindow = bShow;
-			ToggleLogWindow(bShow);
-			break;
-		case IDM_LOGCONFIGWINDOW:
-			if (!g_pCodeWindow)
-				SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow;
-			ToggleLogConfigWindow(bShow);
-			break;
-		case IDM_CONSOLEWINDOW:
-			if (!g_pCodeWindow)
-				SConfig::GetInstance().m_InterfaceConsole = bShow;
-			ToggleConsole(bShow);
-			break;
-		case IDM_REGISTERWINDOW:
-			g_pCodeWindow->ToggleRegisterWindow(bShow);
-			break;
-		case IDM_BREAKPOINTWINDOW:
-			g_pCodeWindow->ToggleBreakPointWindow(bShow);
-			break;
-		case IDM_MEMORYWINDOW:
-			g_pCodeWindow->ToggleMemoryWindow(bShow);
-			break;
-		case IDM_JITWINDOW:
-			g_pCodeWindow->ToggleJitWindow(bShow);
-			break;
-		case IDM_SOUNDWINDOW:
-			g_pCodeWindow->ToggleSoundWindow(bShow);
-			break;
-		case IDM_VIDEOWINDOW:
-			g_pCodeWindow->ToggleVideoWindow(bShow);
-			break;
-	}
-}
-
-// Notebooks
-// ---------------------
-void CFrame::ClosePages()
-{
-	ToggleLogWindow(false);
-	ToggleLogConfigWindow(false);
-	ToggleConsole(false);
-	if (g_pCodeWindow)
-	{
-		g_pCodeWindow->ToggleCodeWindow(false);
-		g_pCodeWindow->ToggleRegisterWindow(false);
-		g_pCodeWindow->ToggleBreakPointWindow(false);
-		g_pCodeWindow->ToggleMemoryWindow(false);
-		g_pCodeWindow->ToggleJitWindow(false);
-		g_pCodeWindow->ToggleSoundWindow(false);
-		g_pCodeWindow->ToggleVideoWindow(false);
-	}
-}
-
-void CFrame::OnNotebookPageChanged(wxAuiNotebookEvent& event)
-{
-	event.Skip();
-
-	if (!g_pCodeWindow)
-		return;
-
-	// Remove the blank page if any
-	AddRemoveBlankPage();
-
-	// Update the notebook affiliation
-	for (int i = IDM_LOGWINDOW; i <= IDM_CODEWINDOW; i++)
-	{
-		if(GetNotebookAffiliation(i) >= 0)
-			g_pCodeWindow->iNbAffiliation[i - IDM_LOGWINDOW] = GetNotebookAffiliation(i);
-	}
-}
-
-void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
-{
-	// Override event
-	event.Veto();
-
-	wxAuiNotebook* Ctrl = (wxAuiNotebook*)event.GetEventObject();
-
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGWINDOW)
-		ToggleLogWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGCONFIGWINDOW)
-		ToggleLogConfigWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_CONSOLEWINDOW)
-		ToggleConsole(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW)
-		g_pCodeWindow->ToggleRegisterWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW)
-		g_pCodeWindow->ToggleBreakPointWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_JITWINDOW)
-		g_pCodeWindow->ToggleJitWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_MEMORYWINDOW)
-		g_pCodeWindow->ToggleMemoryWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_SOUNDWINDOW)
-		g_pCodeWindow->ToggleSoundWindow(false);
-	if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_VIDEOWINDOW)
-		g_pCodeWindow->ToggleVideoWindow(false);
-}
-
-void CFrame::OnFloatingPageClosed(wxCloseEvent& event)
-{
-	ToggleFloatWindow(event.GetId() - IDM_LOGWINDOW_PARENT + IDM_FLOAT_LOGWINDOW);
-}
-
-void CFrame::OnFloatingPageSize(wxSizeEvent& event)
-{
-	event.Skip();
-	ResizeConsole();
-}
-
-void CFrame::OnFloatWindow(wxCommandEvent& event)
-{
-	ToggleFloatWindow(event.GetId());
-}
-
-void CFrame::ToggleFloatWindow(int Id)
-{
-	wxWindowID WinId = Id - IDM_FLOAT_LOGWINDOW + IDM_LOGWINDOW;
-	if (GetNotebookPageFromId(WinId))
-	{
-		DoFloatNotebookPage(WinId);
-		bFloatWindow[WinId - IDM_LOGWINDOW] = true;
-	}
-	else
-	{
-		if (FindWindowById(WinId))
-			DoUnfloatPage(WinId - IDM_LOGWINDOW + IDM_LOGWINDOW_PARENT);
-		bFloatWindow[WinId - IDM_LOGWINDOW] = false;
-	}
-}
-
-void CFrame::DoFloatNotebookPage(wxWindowID Id)
-{
-	wxPanel *Win = (wxPanel*)FindWindowById(Id);
-	if (!Win) return;
-
-	for (int i = 0; i < GetNotebookCount(); i++)
-	{
-		wxAuiNotebook *nb = GetNotebookFromId(i);
-		if (nb->GetPageIndex(Win) != wxNOT_FOUND)
-		{
-			nb->RemovePage(nb->GetPageIndex(Win));
-			// Create the parent frame and reparent the window
-			CreateParentFrame(Win->GetId() + IDM_LOGWINDOW_PARENT - IDM_LOGWINDOW,
-					Win->GetName(), Win);
-			if (nb->GetPageCount() == 0)
-				AddRemoveBlankPage();
-		}
-	}
-}
-
-void CFrame::DoUnfloatPage(int Id)
-{
-	wxFrame * Win = (wxFrame*)FindWindowById(Id);
-	if (!Win) return;
-
-	wxWindow * Child = Win->GetChildren().Item(0)->GetData();
-	Child->Reparent(this);
-	DoAddPage(Child, g_pCodeWindow->iNbAffiliation[Child->GetId() - IDM_LOGWINDOW], false);
-	Win->Destroy();
-}
-
-void CFrame::OnTab(wxAuiNotebookEvent& event)
-{
-	event.Skip();
-	if (!g_pCodeWindow) return;
-
-	// Create the popup menu
-	wxMenu* MenuPopup = new wxMenu;
-
-	wxMenuItem* Item =  new wxMenuItem(MenuPopup, wxID_ANY,
-			_("Select floating windows"));
-	MenuPopup->Append(Item);
-	Item->Enable(false);
-	MenuPopup->Append(new wxMenuItem(MenuPopup));
-
-	for (int i = IDM_LOGWINDOW; i <= IDM_CODEWINDOW; i++)
-	{
-		wxWindow *Win = FindWindowById(i);
-		if (Win && Win->IsEnabled())
-		{
-			Item = new wxMenuItem(MenuPopup, i + IDM_FLOAT_LOGWINDOW - IDM_LOGWINDOW,
-					Win->GetName(), wxT(""), wxITEM_CHECK);
-			MenuPopup->Append(Item);
-			Item->Check(!!FindWindowById(i + IDM_LOGWINDOW_PARENT - IDM_LOGWINDOW));
-		}
-	}
-
-	// Line up our menu with the cursor
-	wxPoint Pt = ::wxGetMousePosition();
-	Pt = ScreenToClient(Pt);
-
-	// Show
-	PopupMenu(MenuPopup, Pt);
-}
-
-void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event)
-{
-	event.Skip();
-	event.Allow();
-	ResizeConsole();
-}
-
-void CFrame::ShowResizePane()
-{
-	if (!m_LogWindow) return;
-
-	// Make sure the size is sane
-	if (m_LogWindow->x > GetClientRect().GetWidth())
-		m_LogWindow->x = GetClientRect().GetWidth() / 2;
-	if (m_LogWindow->y > GetClientRect().GetHeight())
-		m_LogWindow->y = GetClientRect().GetHeight() / 2;
-
-	wxAuiPaneInfo &pane = m_Mgr->GetPane(wxT("Pane 1"));
-
-	// Hide first otherwise a resize doesn't work
-	pane.Hide();
-	m_Mgr->Update();
-
-	pane.BestSize(m_LogWindow->x, m_LogWindow->y)
-		.MinSize(m_LogWindow->x, m_LogWindow->y)
-		.Direction(m_LogWindow->winpos).Show();
-	m_Mgr->Update();
-
-	// Reset the minimum size of the pane
-	pane.MinSize(-1, -1);
-	m_Mgr->Update();
-}
-
-void CFrame::TogglePane()
-{
-	// Get the first notebook
-	wxAuiNotebook * NB = NULL;
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
-	}
-
-	if (NB)
-	{
-		if (NB->GetPageCount() == 0)
-		{
-			m_Mgr->GetPane(_T("Pane 1")).Hide();
-			m_Mgr->Update();
-		}
-		else
-		{
-			ShowResizePane();
-		}
-	}
-}
-
-void CFrame::DoRemovePage(wxWindow *Win, bool bHide)
-{
-	if (!Win) return;
-
-	wxWindow *Parent = FindWindowById(Win->GetId() +
-			IDM_LOGWINDOW_PARENT - IDM_LOGWINDOW);
-
-	if (Parent)
-	{
-		if (bHide)
-		{
-			Win->Hide();
-			Win->Reparent(this);
-		}
-		else
-		{
-			Win->Destroy();
-		}
-
-		Parent->Destroy();
-	}
-	else
-	{
-		for (int i = 0; i < GetNotebookCount(); i++)
-		{
-			int PageIndex = GetNotebookFromId(i)->GetPageIndex(Win);
-			if (PageIndex != wxNOT_FOUND)
-			{
-				GetNotebookFromId(i)->RemovePage(PageIndex);
-				if (bHide)
-				{
-					Win->Hide();
-					Win->Reparent(this);
-				}
-				else
-				{
-					Win->Destroy();
-				}
-			}
-		}
-	}
-
-	if (g_pCodeWindow)
-		AddRemoveBlankPage();
-}
-
-void CFrame::DoAddPage(wxWindow *Win, int i, bool Float)
-{
-	if (!Win) return;
-	
-	// Ensure accessor remains within valid bounds.
-	if (i < 0 || i > GetNotebookCount()-1)
-		i = 0;
-
-	// The page was already previously added, no need to add it again.
-	if (Win && GetNotebookFromId(i)->GetPageIndex(Win) != wxNOT_FOUND)
-		return;
-
-	if (!Float)
-		GetNotebookFromId(i)->AddPage(Win, Win->GetName(), true);
-	else
-		CreateParentFrame(Win->GetId() + IDM_LOGWINDOW_PARENT - IDM_LOGWINDOW,
-				Win->GetName(), Win);
-}
-
-// Toolbar
-void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event)
-{
-	event.Skip();
-	ClearStatusBar();
-
-	if (event.IsDropDownClicked())
-	{
-		wxAuiToolBar* Tb = static_cast<wxAuiToolBar*>(event.GetEventObject());
-		Tb->SetToolSticky(event.GetId(), true);
-
-		// Create the popup menu
-		wxMenu* menuPopup = new wxMenu;
-
-		wxMenuItem* Item =  new wxMenuItem(menuPopup, IDM_PERSPECTIVES_ADD_PANE,
-				_("Add new pane"));
-		menuPopup->Append(Item);
-		menuPopup->Append(new wxMenuItem(menuPopup));
-		Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, _("Tab split"),
-				wxT(""), wxITEM_CHECK);
-		menuPopup->Append(Item);
-		Item->Check(m_bTabSplit);
-		Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, _("No docking"),
-				wxT(""), wxITEM_CHECK);
-		menuPopup->Append(Item);
-		Item->Check(m_bNoDocking);
-
-		// Line up our menu with the button
-		wxRect rect = Tb->GetToolRect(event.GetId());
-		wxPoint Pt = Tb->ClientToScreen(rect.GetBottomLeft());
-		Pt = ScreenToClient(Pt);
-
-		// Show
-		PopupMenu(menuPopup, Pt);
-
-		// Make the button un-stuck again
-		if (!m_bEdit)
-		{
-			Tb->SetToolSticky(event.GetId(), false);
-		}
-	}
-}
-
-void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
-{
-	event.Skip();
-	ClearStatusBar();
-
-	if (event.IsDropDownClicked())
-	{
-		wxAuiToolBar* tb = static_cast<wxAuiToolBar*>(event.GetEventObject());
-		tb->SetToolSticky(event.GetId(), true);
-
-		// create the popup menu
-		wxMenu* menuPopup = new wxMenu;
-		wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_ADD_PERSPECTIVE,
-				_("Create new perspective"));
-		menuPopup->Append(Item);
-
-		if (Perspectives.size() > 0)
-		{
-			menuPopup->Append(new wxMenuItem(menuPopup));
-			for (u32 i = 0; i < Perspectives.size(); i++)
-			{
-				wxMenuItem* mItem = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_0 + i,
-						StrToWxStr(Perspectives[i].Name),
-						wxT(""), wxITEM_CHECK);
-				
-				menuPopup->Append(mItem);
-
-				if (i == ActivePerspective)
-				{
-					mItem->Check(true);
-				}
-			}
-		}
-
-		// line up our menu with the button
-		wxRect rect = tb->GetToolRect(event.GetId());
-		wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft());
-		pt = ScreenToClient(pt);
-
-		// show
-		PopupMenu(menuPopup, pt);
-
-		// make sure the button is "un-stuck"
-		tb->SetToolSticky(event.GetId(), false);
-	}
-}
-
-void CFrame::OnToolBar(wxCommandEvent& event)
-{
-	ClearStatusBar();
-
-	switch (event.GetId())
-	{
-		case IDM_SAVE_PERSPECTIVE:
-			if (Perspectives.size() == 0)
-			{
-				wxMessageBox(_("Please create a perspective before saving"),
-						_("Notice"), wxOK, this);
-				return;
-			}
-			SaveIniPerspectives();
-			GetStatusBar()->SetStatusText(StrToWxStr(std::string
-						("Saved " + Perspectives[ActivePerspective].Name).c_str()), 0);
-			break;
-		case IDM_PERSPECTIVES_ADD_PANE:
-			AddPane();
-			break;
-		case IDM_EDIT_PERSPECTIVES:
-			m_bEdit = !m_bEdit;
-			m_ToolBarAui->SetToolSticky(IDM_EDIT_PERSPECTIVES, m_bEdit);
-			TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
-			break;
-	}
-}
-
-void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
-{
-	ClearStatusBar();
-
-	switch(event.GetId())
-	{
-		case IDM_ADD_PERSPECTIVE:
-			{
-				wxTextEntryDialog dlg(this,
-						_("Enter a name for the new perspective:"),
-						_("Create new perspective"));
-				wxString DefaultValue = wxString::Format(_("Perspective %d"),
-						Perspectives.size() + 1);
-				dlg.SetValue(DefaultValue);
-
-				int Return = 0;
-				bool DlgOk = false;
-
-				while (!DlgOk)
-				{
-					Return = dlg.ShowModal();
-					if (Return == wxID_CANCEL)
-					{
-						return;
-					}
-					else if (dlg.GetValue().Find(wxT(",")) != -1)
-					{
-						wxMessageBox(_("The name can not contain the character ','"),
-								_("Notice"), wxOK, this);
-						wxString Str = dlg.GetValue();
-						Str.Replace(wxT(","), wxT(""), true);
-						dlg.SetValue(Str);
-					}
-					else if (dlg.GetValue().IsSameAs(wxT("")))
-					{
-						wxMessageBox(_("The name can not be empty"),
-								_("Notice"), wxOK, this);
-						dlg.SetValue(DefaultValue);
-					}
-					else
-					{
-						DlgOk = true;
-					}
-				}
-
-				SPerspectives Tmp;
-				Tmp.Name = WxStrToStr(dlg.GetValue());
-				Tmp.Perspective = m_Mgr->SavePerspective();
-
-				ActivePerspective = (u32)Perspectives.size();
-				Perspectives.push_back(Tmp);
-
-				UpdateCurrentPerspective();
-			}
-			break;
-		case IDM_TAB_SPLIT:
-			m_bTabSplit = event.IsChecked();
-			ToggleNotebookStyle(m_bTabSplit, wxAUI_NB_TAB_SPLIT);
-			break;
-		case IDM_NO_DOCKING:
-			m_bNoDocking = event.IsChecked();
-			TogglePaneStyle(m_bNoDocking, IDM_NO_DOCKING);
-			break;
-	}
-}
-
-void CFrame::ResetToolbarStyle()
-{
-	wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
-	for (int i = 0, Count = (int)AllPanes.GetCount(); i < Count; ++i)
-	{
-		wxAuiPaneInfo& Pane = AllPanes[i];
-		if (Pane.window->IsKindOf(CLASSINFO(wxAuiToolBar)))
-		{
-			Pane.Show();
-
-			// Show all of it
-			if (Pane.rect.GetLeft() > GetClientSize().GetX() - 50)
-			{
-				Pane.Position(GetClientSize().GetX() - Pane.window->GetClientSize().GetX());
-			}
-		}
-	}
-	m_Mgr->Update();
-}
-
-void CFrame::TogglePaneStyle(bool On, int EventId)
-{
-	wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
-	for (u32 i = 0; i < AllPanes.GetCount(); ++i)
-	{
-		wxAuiPaneInfo& Pane = AllPanes[i];
-		if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-		{
-			// Default
-			Pane.CloseButton(true);
-			Pane.MaximizeButton(true);
-			Pane.MinimizeButton(true);
-			Pane.PinButton(true);
-			Pane.Show();
-
-			switch(EventId)
-			{
-				case IDM_EDIT_PERSPECTIVES:
-					Pane.CaptionVisible(On);
-					Pane.Movable(On);
-					Pane.Floatable(On);
-					Pane.Dockable(On);
-					break;
-			}
-			Pane.Dockable(!m_bNoDocking);
-		}
-	}
-	m_Mgr->Update();
-}
-
-void CFrame::ToggleNotebookStyle(bool On, long Style)
-{
-	wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
-	for (int i = 0, Count = (int)AllPanes.GetCount(); i < Count; ++i)
-	{
-		wxAuiPaneInfo& Pane = AllPanes[i];
-		if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-		{
-			wxAuiNotebook* NB = (wxAuiNotebook*)Pane.window;
-
-			if (On)
-				NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() | Style);
-			else
-				NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() &~ Style);
-
-			NB->Refresh();
-		}
-	}
-}
-
-void CFrame::OnSelectPerspective(wxCommandEvent& event)
-{
-	u32 _Selection = event.GetId() - IDM_PERSPECTIVES_0;
-	if (Perspectives.size() <= _Selection) _Selection = 0;
-	ActivePerspective = _Selection;
-	DoLoadPerspective();
-}
-
-void CFrame::ResizeConsole()
-{
-#ifdef _WIN32
-	// Get the console parent window
-	wxWindow * Win = FindWindowById(IDM_CONSOLEWINDOW);
-	if (!Win) return;
-
-	const int wxBorder = 2, Border = 4,
-		  MenuBar = 30, ScrollBar = 19;
-
-	// Get the client size
-	int X = Win->GetSize().GetX();
-	int Y = Win->GetSize().GetY();
-	int InternalWidth = X - wxBorder*2 - ScrollBar;
-	int InternalHeight = Y - wxBorder*2;
-	int WindowWidth = InternalWidth + Border*2 +
-		/*max out the width in the word wrap mode*/ 100;
-	int WindowHeight = InternalHeight + MenuBar;
-	// Resize buffer
-	ConsoleListener* Console = LogManager::GetInstance()->GetConsoleListener();
-	Console->PixelSpace(0,0, InternalWidth, InternalHeight, false);
-	// Move the window to hide the border
-	MoveWindow(GetConsoleWindow(), -Border-wxBorder, -MenuBar-wxBorder,
-			WindowWidth + 100, WindowHeight, true);
-#endif
-}
-
-static int Limit(int i, int Low, int High)
-{
-	if (i < Low) return Low;
-	if (i > High) return High;
-	return i;
-}
-
-void CFrame::SetPaneSize()
-{
-	if (Perspectives.size() <= ActivePerspective)
-		return;
-
-	int iClientX = GetSize().GetX();
-	int iClientY = GetSize().GetY();
-
-	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiToolBar)))
-		{
-			if (!m_Mgr->GetAllPanes()[i].IsOk())
-				return;
-
-			if (Perspectives[ActivePerspective].Width.size() <= j ||
-					Perspectives[ActivePerspective].Height.size() <= j)
-				continue;
-
-			// Width and height of the active perspective
-			u32 W = Perspectives[ActivePerspective].Width[j],
-				H = Perspectives[ActivePerspective].Height[j];
-
-			// Check limits
-			W = Limit(W, 5, 95);
-			H = Limit(H, 5, 95);
-
-			// Convert percentages to pixel lengths
-			W = (W * iClientX) / 100;
-			H = (H * iClientY) / 100;
-			m_Mgr->GetAllPanes()[i].BestSize(W,H).MinSize(W,H);
-
-			j++;
-		}
-	}
-	m_Mgr->Update();
-
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiToolBar)))
-		{
-			m_Mgr->GetAllPanes()[i].MinSize(-1,-1);
-		}
-	}
-}
-
-void CFrame::ReloadPanes()
-{
-	// Close all pages
-	ClosePages();
-
-	CloseAllNotebooks();
-
-	// Create new panes with notebooks
-	for (u32 i = 0; i < Perspectives[ActivePerspective].Width.size() - 1; i++)
-	{
-		wxString PaneName = wxString::Format(_T("Pane %i"), i + 1);
-		m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo().Hide()
-				.CaptionVisible(m_bEdit).Dockable(!m_bNoDocking).Position(i)
-				.Name(PaneName).Caption(PaneName));
-	}
-
-	// Perspectives
-	m_Mgr->LoadPerspective(Perspectives[ActivePerspective].Perspective, false);
-	// Reset toolbars
-	ResetToolbarStyle();
-	// Restore settings
-	TogglePaneStyle(m_bNoDocking, IDM_NO_DOCKING);
-	TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
-
-	// Load GUI settings
-	g_pCodeWindow->Load();
-	// Open notebook pages
-	AddRemoveBlankPage();
-	g_pCodeWindow->OpenPages();
-}
-
-void CFrame::DoLoadPerspective()
-{
-	ReloadPanes();
-	// Restore the exact window sizes, which LoadPerspective doesn't always do
-	SetPaneSize();
-
-	m_Mgr->Update();
-}
-
-// Update the local perspectives array
-void CFrame::LoadIniPerspectives()
-{
-	Perspectives.clear();
-	std::vector<std::string> VPerspectives;
-	std::string _Perspectives;
-
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-	ini.Get("Perspectives", "Perspectives", &_Perspectives, "Perspective 1");
-	ini.Get("Perspectives", "Active", &ActivePerspective, 0);
-	SplitString(_Perspectives, ',', VPerspectives);
-
-	for (u32 i = 0; i < VPerspectives.size(); i++)
-	{
-		SPerspectives Tmp;
-		std::string _Section, _Perspective, _Width, _Height;
-		std::vector<std::string> _SWidth, _SHeight;
-		Tmp.Name = VPerspectives[i];
-
-		// Don't save a blank perspective
-		if (Tmp.Name.empty())
-			continue;
-
-		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
-		ini.Get(_Section.c_str(), "Perspective", &_Perspective,
-				"layout2|"
-				"name=Pane 0;caption=Pane 0;state=768;dir=5;prop=100000;|"
-				"name=Pane 1;caption=Pane 1;state=31458108;dir=4;prop=100000;|"
-				"dock_size(5,0,0)=22|dock_size(4,0,0)=333|");
-		ini.Get(_Section.c_str(), "Width", &_Width, "70,25");
-		ini.Get(_Section.c_str(), "Height", &_Height, "80,80");
-
-		Tmp.Perspective = StrToWxStr(_Perspective);
-
-		SplitString(_Width, ',', _SWidth);
-		SplitString(_Height, ',', _SHeight);
-		for (u32 j = 0; j < _SWidth.size(); j++)
-		{
-			int _Tmp;
-			if (TryParse(_SWidth[j].c_str(), &_Tmp)) Tmp.Width.push_back(_Tmp);
-		}
-		for (u32 j = 0; j < _SHeight.size(); j++)
-		{
-			int _Tmp;
-			if (TryParse(_SHeight[j].c_str(), &_Tmp)) Tmp.Height.push_back(_Tmp);
-		}
-		Perspectives.push_back(Tmp);
-	}
-}
-
-void CFrame::UpdateCurrentPerspective()
-{
-	SPerspectives *current = &Perspectives[ActivePerspective];
-	current->Perspective = m_Mgr->SavePerspective();
-
-	// Get client size
-	int iClientX = GetSize().GetX(), iClientY = GetSize().GetY();
-	current->Width.clear();
-	current->Height.clear();
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->
-				IsKindOf(CLASSINFO(wxAuiToolBar)))
-		{
-			// Save width and height as a percentage of the client width and height
-			current->Width.push_back(
-					(m_Mgr->GetAllPanes()[i].window->GetClientSize().GetX() * 100) /
-					iClientX);
-			current->Height.push_back(
-					(m_Mgr->GetAllPanes()[i].window->GetClientSize().GetY() * 100) /
-					iClientY);
-		}
-	}
-}
-
-void CFrame::SaveIniPerspectives()
-{
-	if (Perspectives.size() == 0) return;
-	if (ActivePerspective >= Perspectives.size()) ActivePerspective = 0;
-
-	// Turn off edit before saving
-	TogglePaneStyle(false, IDM_EDIT_PERSPECTIVES);
-
-	UpdateCurrentPerspective();
-
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	// Save perspective names
-	std::string STmp = "";
-	for (u32 i = 0; i < Perspectives.size(); i++)
-	{
-		STmp += Perspectives[i].Name + ",";
-	}
-	STmp = STmp.substr(0, STmp.length()-1);
-	ini.Set("Perspectives", "Perspectives", STmp.c_str());
-	ini.Set("Perspectives", "Active", ActivePerspective);
-
-	// Save the perspectives
-	for (u32 i = 0; i < Perspectives.size(); i++)
-	{
-		std::string _Section = "P - " + Perspectives[i].Name;
-		ini.Set(_Section.c_str(), "Perspective", WxStrToStr(Perspectives[i].Perspective));
-
-		std::string SWidth = "", SHeight = "";
-		for (u32 j = 0; j < Perspectives[i].Width.size(); j++)
-		{
-			SWidth += StringFromFormat("%i,", Perspectives[i].Width[j]);
-			SHeight += StringFromFormat("%i,", Perspectives[i].Height[j]);
-		}
-		// Remove the ending ","
-		SWidth = SWidth.substr(0, SWidth.length()-1);
-		SHeight = SHeight.substr(0, SHeight.length()-1);
-
-		ini.Set(_Section.c_str(), "Width", SWidth.c_str());
-		ini.Set(_Section.c_str(), "Height", SHeight.c_str());
-	}
-
-	ini.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
-
-	// Save notebook affiliations
-	g_pCodeWindow->Save();
-
-	TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
-}
-
-void CFrame::AddPane()
-{
-	int PaneNum = GetNotebookCount() + 1;
-	wxString PaneName = wxString::Format(_T("Pane %i"), PaneNum);
-	m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
-		.CaptionVisible(m_bEdit).Dockable(!m_bNoDocking)
-		.Name(PaneName).Caption(PaneName)
-		.Position(GetNotebookCount()));
-
-	AddRemoveBlankPage();
-	m_Mgr->Update();
-}
-
-wxWindow * CFrame::GetNotebookPageFromId(wxWindowID Id)
-{
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			continue;
-
-		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
-		for(u32 j = 0; j < NB->GetPageCount(); j++)
-		{
-			if (NB->GetPage(j)->GetId() == Id)
-				return NB->GetPage(j);
-		}
-	}
-	return NULL;
-}
-
-wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title,
-		wxWindow * Child)
-{
-	wxFrame * Frame = new wxFrame(this, Id, Title,
-			wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
-
-	Child->Reparent(Frame);
-
-	wxBoxSizer * m_MainSizer = new wxBoxSizer(wxHORIZONTAL);
-
-	m_MainSizer->Add(Child, 1, wxEXPAND);
-
-	Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this);
-
-	if (Id == IDM_CONSOLEWINDOW_PARENT)
-	{
-		Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this);
-	}
-
-	// Main sizer
-	Frame->SetSizer(m_MainSizer);
-	// Minimum frame size
-	Frame->SetMinSize(wxSize(200, 200));
-	Frame->Show();
-	return Frame;
-}
-
-wxAuiNotebook* CFrame::CreateEmptyNotebook()
-{
-	const long NOTEBOOK_STYLE = wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT |
-		wxAUI_NB_TAB_EXTERNAL_MOVE | wxAUI_NB_SCROLL_BUTTONS |
-		wxAUI_NB_WINDOWLIST_BUTTON | wxNO_BORDER;
-	wxAuiNotebook* NB = new wxAuiNotebook(this, wxID_ANY,
-			wxDefaultPosition, wxDefaultSize, NOTEBOOK_STYLE);
-	return NB;
-}
-
-void CFrame::AddRemoveBlankPage()
-{
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			continue;
-
-		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
-		for(u32 j = 0; j < NB->GetPageCount(); j++)
-		{
-			if (NB->GetPageText(j).IsSameAs(wxT("<>")) && NB->GetPageCount() > 1)
-				NB->DeletePage(j);
-		}
-
-		if (NB->GetPageCount() == 0)
-			NB->AddPage(new wxPanel(this, wxID_ANY), wxT("<>"), true);
-	}
-}
-
-int CFrame::GetNotebookAffiliation(wxWindowID Id)
-{
-	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			continue;
-
-		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
-		for(u32 k = 0; k < NB->GetPageCount(); k++)
-		{
-			if (NB->GetPage(k)->GetId() == Id)
-				return j;
-		}
-		j++;
-	}
-	return -1;
-}
-
-// Close all panes with notebooks
-void CFrame::CloseAllNotebooks()
-{
-	wxAuiPaneInfoArray AllPanes = m_Mgr->GetAllPanes();
-	for (u32 i = 0; i < AllPanes.GetCount(); i++)
-	{
-		if (AllPanes[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-		{
-			AllPanes[i].DestroyOnClose(true);
-			m_Mgr->ClosePane(AllPanes[i]);
-		}
-	}
-}
-
-int CFrame::GetNotebookCount()
-{
-	int Ret = 0;
-	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			Ret++;
-	}
-	return Ret;
-}
-
-wxAuiNotebook * CFrame::GetNotebookFromId(u32 NBId)
-{
-	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
-	{
-		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
-			continue;
-		if (j == NBId)
-			return (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
-		j++;
-	}
-	return NULL;
-}
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
deleted file mode 100644
index c146facec6..0000000000
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ /dev/null
@@ -1,1846 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-/*
-1.1 Windows
-
-CFrame is the main parent window. Inside CFrame there is m_Panel which is the
-parent for the rendering window (when we render to the main window). In Windows
-the rendering window is created by giving CreateWindow() m_Panel->GetHandle()
-as parent window and creating a new child window to m_Panel. The new child
-window handle that is returned by CreateWindow() can be accessed from
-Core::GetWindowHandle().
-*/
-
-#include "NetWindow.h"
-#include "Common.h" // Common
-#include "FileUtil.h"
-#include "FileSearch.h"
-#include "Timer.h"
-#include "VideoBackendBase.h"
-
-#ifdef __APPLE__
-#include <AppKit/AppKit.h>
-#endif
-
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "ConfigMain.h"
-#include "MemcardManager.h"
-#include "CheatsWindow.h"
-#include "AboutDolphin.h"
-#include "GameListCtrl.h"
-#include "BootManager.h"
-#include "LogWindow.h"
-#include "LogConfigWindow.h"
-#include "FifoPlayerDlg.h"
-#include "WxUtils.h"
-#include "Host.h"
-
-#include "ConfigManager.h" // Core
-#include "Core.h"
-#include "Movie.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/DVDInterface.h"
-#include "HW/ProcessorInterface.h"
-#include "HW/GCPad.h"
-#include "HW/Wiimote.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-//#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-#include "State.h"
-#include "VolumeHandler.h"
-#include "NANDContentLoader.h"
-#include "WXInputBase.h"
-#include "WiimoteConfigDiag.h"
-#include "InputConfigDiag.h"
-#include "HotkeyDlg.h"
-#include "TASInputDlg.h"
-
-#include <wx/datetime.h> // wxWidgets
-
-#ifdef _WIN32
-#ifndef SM_XVIRTUALSCREEN
-#define SM_XVIRTUALSCREEN 76
-#endif
-#ifndef SM_YVIRTUALSCREEN
-#define SM_YVIRTUALSCREEN 77
-#endif
-#ifndef SM_CXVIRTUALSCREEN
-#define SM_CXVIRTUALSCREEN 78
-#endif
-#ifndef SM_CYVIRTUALSCREEN
-#define SM_CYVIRTUALSCREEN 79
-#endif
-#endif
-
-// Resources
-extern "C" {
-#include "../resources/Dolphin.c" // Dolphin icon
-};
-
-bool confirmStop = false;
-
-// Create menu items
-// ---------------------
-void CFrame::CreateMenu()
-{
-	if (GetMenuBar()) GetMenuBar()->Destroy();
-
-	wxMenuBar *m_MenuBar = new wxMenuBar();
-
-	// file menu
-	wxMenu* fileMenu = new wxMenu;
-	fileMenu->Append(wxID_OPEN, GetMenuLabel(HK_OPEN));
-	fileMenu->Append(IDM_CHANGEDISC, GetMenuLabel(HK_CHANGE_DISC));
-
-	wxMenu *externalDrive = new wxMenu;
-	fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Drive..."), externalDrive);
-	
-	drives = cdio_get_devices();
-	// Windows Limitation of 24 character drives
-	for (unsigned int i = 0; i < drives.size() && i < 24; i++) {
-		externalDrive->Append(IDM_DRIVE1 + i, StrToWxStr(drives[i]));
-	}
-
-	fileMenu->AppendSeparator();
-	fileMenu->Append(wxID_REFRESH, GetMenuLabel(HK_REFRESH_LIST));
-	fileMenu->AppendSeparator();
-	fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
-	fileMenu->AppendSeparator();
-	fileMenu->Append(wxID_EXIT, _("E&xit") + wxString(wxT("\tAlt+F4")));
-	m_MenuBar->Append(fileMenu, _("&File"));
-
-	// Emulation menu
-	wxMenu* emulationMenu = new wxMenu;
-	emulationMenu->Append(IDM_PLAY, GetMenuLabel(HK_PLAY_PAUSE));
-	emulationMenu->Append(IDM_STOP, GetMenuLabel(HK_STOP));
-	emulationMenu->Append(IDM_RESET, GetMenuLabel(HK_RESET));
-	emulationMenu->AppendSeparator();
-	emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN));
-	emulationMenu->AppendSeparator();
-	emulationMenu->Append(IDM_RECORD, GetMenuLabel(HK_START_RECORDING));
-	emulationMenu->Append(IDM_PLAYRECORD, GetMenuLabel(HK_PLAY_RECORDING));
-	emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING));
-	emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
-	emulationMenu->Append(IDM_TASINPUT, _("TAS Input"));
-	emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie"));
-	emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie);
-	emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter"));
-	emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag);
-	emulationMenu->Check(IDM_RECORDREADONLY, true);
-	emulationMenu->AppendSeparator();
-
-	emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString);
-
-	wxMenu *skippingMenu = new wxMenu;
-	emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
-	for(int i = 0; i < 10; i++)
-		skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(wxT("%i"), i), wxEmptyString, wxITEM_RADIO);
-
-	emulationMenu->AppendSeparator();
-	emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
-
-	emulationMenu->AppendSeparator();
-	wxMenu *saveMenu = new wxMenu;
-	wxMenu *loadMenu = new wxMenu;
-	emulationMenu->Append(IDM_LOADSTATE, _("&Load State"), loadMenu);
-	emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu);
-
-	saveMenu->Append(IDM_SAVESTATEFILE, GetMenuLabel(HK_SAVE_STATE_FILE));
-	saveMenu->Append(IDM_SAVEFIRSTSTATE, GetMenuLabel(HK_SAVE_FIRST_STATE));
-	loadMenu->Append(IDM_UNDOSAVESTATE, GetMenuLabel(HK_UNDO_SAVE_STATE));
-	saveMenu->AppendSeparator();
-
-	loadMenu->Append(IDM_LOADSTATEFILE,  GetMenuLabel(HK_LOAD_STATE_FILE));
-	
-	loadMenu->Append(IDM_UNDOLOADSTATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
-	loadMenu->AppendSeparator();
-
-	for (unsigned int i = 1; i <= State::NUM_STATES; i++)
-	{
-		loadMenu->Append(IDM_LOADSLOT1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1));
-		saveMenu->Append(IDM_SAVESLOT1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1));
-	}
-
-	loadMenu->AppendSeparator();
-	for (unsigned int i = 1; i <= State::NUM_STATES; i++)
-		loadMenu->Append(IDM_LOADLAST1 + i - 1, GetMenuLabel(HK_LOAD_LAST_STATE_1 + i - 1));
-
-	m_MenuBar->Append(emulationMenu, _("&Emulation"));
-
-	// Options menu
-	wxMenu* pOptionsMenu = new wxMenu;
-	pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure..."));
-	pOptionsMenu->AppendSeparator();
-	pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&DSP Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _("Gamecube &Pad Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _("&Wiimote Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings"));
-	if (g_pCodeWindow)
-	{
-		pOptionsMenu->AppendSeparator();
-		g_pCodeWindow->CreateMenuOptions(pOptionsMenu);
-	}
-	m_MenuBar->Append(pOptionsMenu, _("&Options"));
-
-	// Tools menu
-	wxMenu* toolsMenu = new wxMenu;
-	toolsMenu->Append(IDM_MEMCARD, _("&Memcard Manager (GC)"));
-	toolsMenu->Append(IDM_IMPORTSAVE, _("Import Wii Save"));
-	toolsMenu->Append(IDM_EXPORTALLSAVE, _("Export All Wii Saves"));
-	toolsMenu->Append(IDM_CHEATS, _("&Cheats Manager"));
-
-	toolsMenu->Append(IDM_NETPLAY, _("Start &NetPlay"));
-
-	toolsMenu->Append(IDM_MENU_INSTALLWAD, _("Install WAD"));
-	UpdateWiiMenuChoice(toolsMenu->Append(IDM_LOAD_WII_MENU, wxT("Dummy string to keep wxw happy")));
-
-	toolsMenu->Append(IDM_FIFOPLAYER, _("Fifo Player"));
-
-	toolsMenu->AppendSeparator();
-	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
-	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE2, GetMenuLabel(HK_WIIMOTE2_CONNECT));
-	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
-	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
-	toolsMenu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, GetMenuLabel(HK_BALANCEBOARD_CONNECT));
-
-	m_MenuBar->Append(toolsMenu, _("&Tools"));
-
-	wxMenu* viewMenu = new wxMenu;
-	viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _("Show &Toolbar"));
-	viewMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
-	viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _("Show &Statusbar"));
-	viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
-	viewMenu->AppendSeparator();
-	viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log"));
-	viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration"));
-	viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
-	viewMenu->AppendSeparator();
-
-#ifndef _WIN32
-	viewMenu->Enable(IDM_CONSOLEWINDOW, false);
-#endif
-
-	if (g_pCodeWindow)
-	{
-		viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]);
-		viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]);
-
-		const wxString MenuText[] = {
-			wxTRANSLATE("&Registers"),
-			wxTRANSLATE("&Breakpoints"),
-			wxTRANSLATE("&Memory"),
-			wxTRANSLATE("&JIT"),
-			wxTRANSLATE("&Sound"),
-			wxTRANSLATE("&Video")
-		};
-
-		for (int i = IDM_REGISTERWINDOW; i <= IDM_VIDEOWINDOW; i++)
-		{
-			viewMenu->AppendCheckItem(i, wxGetTranslation(MenuText[i - IDM_REGISTERWINDOW]));
-			viewMenu->Check(i, g_pCodeWindow->bShowOnStart[i - IDM_LOGWINDOW]);
-		}
-
-		viewMenu->AppendSeparator();
-	}
-	else
-	{
-		viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow);
-		viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow);
-		viewMenu->Check(IDM_CONSOLEWINDOW, SConfig::GetInstance().m_InterfaceConsole);
-	}
-
-	wxMenu *platformMenu = new wxMenu;
-	viewMenu->AppendSubMenu(platformMenu, _("Show Platforms"));
-	platformMenu->AppendCheckItem(IDM_LISTWII, _("Show Wii"));
-	platformMenu->Check(IDM_LISTWII, SConfig::GetInstance().m_ListWii);
-	platformMenu->AppendCheckItem(IDM_LISTGC, _("Show GameCube"));
-	platformMenu->Check(IDM_LISTGC, SConfig::GetInstance().m_ListGC);
-	platformMenu->AppendCheckItem(IDM_LISTWAD, _("Show Wad"));
-	platformMenu->Check(IDM_LISTWAD, SConfig::GetInstance().m_ListWad);
-
-	wxMenu *regionMenu = new wxMenu;
-	viewMenu->AppendSubMenu(regionMenu, _("Show Regions"));
-	regionMenu->AppendCheckItem(IDM_LISTJAP, _("Show JAP"));
-	regionMenu->Check(IDM_LISTJAP, SConfig::GetInstance().m_ListJap);
-	regionMenu->AppendCheckItem(IDM_LISTPAL, _("Show PAL"));
-	regionMenu->Check(IDM_LISTPAL, SConfig::GetInstance().m_ListPal);
-	regionMenu->AppendCheckItem(IDM_LISTUSA, _("Show USA"));
-	regionMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa);
-	regionMenu->AppendSeparator();
-	regionMenu->AppendCheckItem(IDM_LISTFRANCE, _("Show France"));
-	regionMenu->Check(IDM_LISTFRANCE, SConfig::GetInstance().m_ListFrance);
-	regionMenu->AppendCheckItem(IDM_LISTITALY, _("Show Italy"));
-	regionMenu->Check(IDM_LISTITALY, SConfig::GetInstance().m_ListItaly);
-	regionMenu->AppendCheckItem(IDM_LISTKOREA, _("Show Korea"));
-	regionMenu->Check(IDM_LISTKOREA, SConfig::GetInstance().m_ListKorea);
-	regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _("Show Taiwan"));
-	regionMenu->Check(IDM_LISTTAIWAN, SConfig::GetInstance().m_ListTaiwan);
-	regionMenu->AppendCheckItem(IDM_LIST_UNK, _("Show unknown"));
-	regionMenu->Check(IDM_LIST_UNK, SConfig::GetInstance().m_ListUnknown);
-	viewMenu->AppendCheckItem(IDM_LISTDRIVES, _("Show Drives"));
-	viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives);
-	viewMenu->Append(IDM_PURGECACHE, _("Purge Cache"));
-	m_MenuBar->Append(viewMenu, _("&View"));
-
-	if (g_pCodeWindow)
-	{
-		g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar);
-	}
-
-	// Help menu
-	wxMenu* helpMenu = new wxMenu;
-	// Re-enable when there's something useful to display */
-	// helpMenu->Append(wxID_HELP, _("&Help"));
-	helpMenu->Append(IDM_HELPWEBSITE, _("Dolphin &Web Site"));
-	helpMenu->Append(IDM_HELPONLINEDOCS, _("Online &Documentation"));
-	helpMenu->Append(IDM_HELPGOOGLECODE, _("Dolphin at &Google Code"));
-	helpMenu->AppendSeparator();
-	helpMenu->Append(wxID_ABOUT, _("&About..."));
-	m_MenuBar->Append(helpMenu, _("&Help"));
-
-	// Associate the menu bar with the frame
-	SetMenuBar(m_MenuBar);
-}
-
-wxString CFrame::GetMenuLabel(int Id)
-{
-	int hotkey = SConfig::GetInstance().\
-		m_LocalCoreStartupParameter.iHotkey[Id];
-	int hotkeymodifier = SConfig::GetInstance().\
-		m_LocalCoreStartupParameter.iHotkeyModifier[Id];
-	wxString Hotkey, Label, Modifier;
-
-	switch (Id)
-	{
-		case HK_OPEN:
-			Label = _("&Open...");
-			break;
-		case HK_CHANGE_DISC:
-			Label = _("Change &Disc...");
-			break;
-		case HK_REFRESH_LIST:
-			Label = _("&Refresh List");
-			break;
-
-		case HK_PLAY_PAUSE:
-			if (Core::GetState() == Core::CORE_RUN)
-				Label = _("&Pause");
-			else
-				Label = _("&Play");
-			break;
-		case HK_STOP:
-			Label = _("&Stop");
-			break;
-		case HK_RESET:
-			Label = _("&Reset");
-			break;
-		case HK_FRAME_ADVANCE:
-			Label = _("&Frame Advance");
-			break;
-
-		case HK_START_RECORDING:
-			Label = _("Start Re&cording");
-			break;
-		case HK_PLAY_RECORDING:
-			Label = _("P&lay Recording...");
-			break;
-		case HK_EXPORT_RECORDING:
-			Label = _("Export Recording...");
-			break;
-		case HK_READ_ONLY_MODE:
-			Label = _("&Read-only mode");
-			break;
-
-		case HK_FULLSCREEN:
-			Label = _("&Fullscreen");
-			break;
-		case HK_SCREENSHOT:
-			Label = _("Take Screenshot");
-			break;
-		case HK_EXIT:
-			Label = _("Exit");
-			break;
-
-		case HK_WIIMOTE1_CONNECT:
-		case HK_WIIMOTE2_CONNECT:
-		case HK_WIIMOTE3_CONNECT:
-		case HK_WIIMOTE4_CONNECT:
-			Label = wxString::Format(_("Connect Wiimote %i"),
-					Id - HK_WIIMOTE1_CONNECT + 1);
-			break;
-		case HK_BALANCEBOARD_CONNECT:
-			Label = _("Connect Balance Board");
-			break;
-		case HK_LOAD_STATE_SLOT_1:
-		case HK_LOAD_STATE_SLOT_2:
-		case HK_LOAD_STATE_SLOT_3:
-		case HK_LOAD_STATE_SLOT_4:
-		case HK_LOAD_STATE_SLOT_5:
-		case HK_LOAD_STATE_SLOT_6:
-		case HK_LOAD_STATE_SLOT_7:
-		case HK_LOAD_STATE_SLOT_8:
-		case HK_LOAD_STATE_SLOT_9:
-		case HK_LOAD_STATE_SLOT_10:
-			Label = wxString::Format(_("Slot %i"), 
-					Id - HK_LOAD_STATE_SLOT_1 + 1);
-			break;
-
-		case HK_SAVE_STATE_SLOT_1:
-		case HK_SAVE_STATE_SLOT_2:
-		case HK_SAVE_STATE_SLOT_3:
-		case HK_SAVE_STATE_SLOT_4:
-		case HK_SAVE_STATE_SLOT_5:
-		case HK_SAVE_STATE_SLOT_6:
-		case HK_SAVE_STATE_SLOT_7:
-		case HK_SAVE_STATE_SLOT_8:
-		case HK_SAVE_STATE_SLOT_9:
-		case HK_SAVE_STATE_SLOT_10:
-			Label = wxString::Format(_("Slot %i"), 
-					Id - HK_SAVE_STATE_SLOT_1 + 1);
-			break;
-		case HK_SAVE_STATE_FILE:
-			Label = _("Save State...");
-			break;
-
-		case HK_LOAD_LAST_STATE_1:
-		case HK_LOAD_LAST_STATE_2:
-		case HK_LOAD_LAST_STATE_3:
-		case HK_LOAD_LAST_STATE_4:
-		case HK_LOAD_LAST_STATE_5:
-		case HK_LOAD_LAST_STATE_6:
-		case HK_LOAD_LAST_STATE_7:
-		case HK_LOAD_LAST_STATE_8:
-			Label = wxString::Format(_("Last %i"),
-				Id - HK_LOAD_LAST_STATE_1 + 1);
-			break;
-		case HK_LOAD_STATE_FILE:
-			Label = _("Load State...");
-			break;
-
-		case HK_SAVE_FIRST_STATE: Label = wxString("Save Oldest State"); break;
-		case HK_UNDO_LOAD_STATE: Label = wxString("Undo Load State"); break;
-		case HK_UNDO_SAVE_STATE: Label = wxString("Undo Save State"); break;
-
-		default:
-			Label = wxString::Format(_("Undefined %i"), Id);
-	}
-
-	// wxWidgets only accepts Ctrl/Alt/Shift as menu accelerator
-	// modifiers. On OS X, "Ctrl+" is mapped to the Command key.
-#ifdef __APPLE__
-	if (hotkeymodifier & wxMOD_CMD)
-		hotkeymodifier |= wxMOD_CONTROL;
-#endif
-	hotkeymodifier &= wxMOD_CONTROL | wxMOD_ALT | wxMOD_SHIFT;
-	
-	Modifier = InputCommon::WXKeymodToString(hotkeymodifier);
-	Hotkey = InputCommon::WXKeyToString(hotkey);
-	if (Modifier.Len() + Hotkey.Len() > 0)
-		Label += '\t';
-
-	return Label + Modifier + Hotkey;
-}
-
-
-// Create toolbar items
-// ---------------------
-void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
-{
-	int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
-		h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
-	ToolBar->SetToolBitmapSize(wxSize(w, h));
-
-
-	ToolBar->AddTool(wxID_OPEN,    _("Open"),    m_Bitmaps[Toolbar_FileOpen], _("Open file..."));
-	ToolBar->AddTool(wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list"));
-	ToolBar->AddTool(IDM_BROWSE, _("Browse"),   m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory..."));
-	ToolBar->AddSeparator();
-	ToolBar->AddTool(IDM_PLAY, _("Play"),   m_Bitmaps[Toolbar_Play], _("Play"));
-	ToolBar->AddTool(IDM_STOP, _("Stop"),   m_Bitmaps[Toolbar_Stop], _("Stop"));
-	ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _("FullScr"),  m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen"));
-	ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"),   m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot"));
-	ToolBar->AddSeparator();
-	ToolBar->AddTool(wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure..."));
-	ToolBar->AddTool(IDM_CONFIG_GFX_BACKEND, _("Graphics"),  m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings"));
-	ToolBar->AddTool(IDM_CONFIG_DSP_EMULATOR, _("DSP"),  m_Bitmaps[Toolbar_ConfigDSP], _("DSP settings"));
-	ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _("GCPad"),  m_Bitmaps[Toolbar_ConfigPAD], _("Gamecube Pad settings"));
-	ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _("Wiimote"),  m_Bitmaps[Toolbar_Wiimote], _("Wiimote settings"));
-
-	// after adding the buttons to the toolbar, must call Realize() to reflect
-	// the changes
-	ToolBar->Realize();
-}
-
-void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar)
-{
-	int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
-		h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
-	ToolBar->SetToolBitmapSize(wxSize(w, h));
-
-	ToolBar->AddTool(IDM_SAVE_PERSPECTIVE,	_("Save"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Save current perspective"));
-	ToolBar->AddTool(IDM_EDIT_PERSPECTIVES,	_("Edit"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Edit current perspective"));
-
-	ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true);
-	ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true);
-
-	ToolBar->Realize();
-}
-
-
-// Delete and recreate the toolbar
-void CFrame::RecreateToolbar()
-{
-	if (m_ToolBar)
-	{
-		m_Mgr->DetachPane(m_ToolBar);
-		m_ToolBar->Destroy();
-	}
-
-	long TOOLBAR_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT  /*wxAUI_TB_OVERFLOW overflow visible*/;
-	m_ToolBar = new wxAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-
-	PopulateToolbar(m_ToolBar);
-	
-	m_Mgr->AddPane(m_ToolBar, wxAuiPaneInfo().
-				Name(wxT("TBMain")).Caption(wxT("TBMain")).
-				ToolbarPane().Top().
-				LeftDockable(false).RightDockable(false).Floatable(false));
-
-	if (g_pCodeWindow && !m_ToolBarDebug)
-	{
-		m_ToolBarDebug = new wxAuiToolBar(this, ID_TOOLBAR_DEBUG, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-		g_pCodeWindow->PopulateToolbar(m_ToolBarDebug);
-		
-		m_Mgr->AddPane(m_ToolBarDebug, wxAuiPaneInfo().
-				Name(wxT("TBDebug")).Caption(wxT("TBDebug")).
-				ToolbarPane().Top().
-				LeftDockable(false).RightDockable(false).Floatable(false));
-
-		m_ToolBarAui = new wxAuiToolBar(this, ID_TOOLBAR_AUI, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-		PopulateToolbarAui(m_ToolBarAui);
-		m_Mgr->AddPane(m_ToolBarAui, wxAuiPaneInfo().
-				Name(wxT("TBAui")).Caption(wxT("TBAui")).
-				ToolbarPane().Top().
-				LeftDockable(false).RightDockable(false).Floatable(false));
-	}
-
-	UpdateGUI();
-}
-
-void CFrame::InitBitmaps()
-{
-	auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
-
-	m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Browse].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Play].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Stop].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Pause].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_ConfigMain].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_ConfigGFX].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_ConfigDSP].LoadFile(dir + "dsp.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_ConfigPAD].LoadFile(dir + "gcpad.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Wiimote].LoadFile(dir + "wiimote.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG);
-
-	// Update in case the bitmap has been updated
-	if (m_ToolBar != NULL)
-		RecreateToolbar();
-}
-
-// Menu items
-
-// Start the game or change the disc.
-// Boot priority:
-// 1. Show the game list and boot the selected game.
-// 2. Default ISO
-// 3. Boot last selected game
-void CFrame::BootGame(const std::string& filename)
-{
-	std::string bootfile = filename;
-	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		return;
-
-	// Start filename if non empty.
-	// Start the selected ISO, or try one of the saved paths.
-	// If all that fails, ask to add a dir and don't boot
-	if (bootfile.empty())
-	{
-		if (m_GameListCtrl->GetSelectedISO() != NULL)
-		{
-			if (m_GameListCtrl->GetSelectedISO()->IsValid())
-				bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName();
-		}
-		else if (!StartUp.m_strDefaultGCM.empty()
-				&&	wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str())))
-		{
-			bootfile = StartUp.m_strDefaultGCM;
-		}
-		else
-		{
-			if (!SConfig::GetInstance().m_LastFilename.empty()
-					&& wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str())))
-			{
-				bootfile = SConfig::GetInstance().m_LastFilename;
-			}
-			else
-			{
-				m_GameListCtrl->BrowseForDirectory();
-				return;
-			}
-		}
-	}
-	if (!bootfile.empty())
-		StartGame(bootfile);
-}
-
-// Open file to boot
-void CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
-{
-	DoOpen(true);
-}
-
-void CFrame::DoOpen(bool Boot)
-{
-	std::string currentDir = File::GetCurrentDir();
-
-	wxString path = wxFileSelector(
-			_("Select the file to load"),
-			wxEmptyString, wxEmptyString, wxEmptyString,
-			_("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") +
-			wxString::Format(wxT("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad;*.dff;*.tmd|%s"),
-				wxGetTranslation(wxALL_FILES)),
-			wxFD_OPEN | wxFD_FILE_MUST_EXIST,
-			this);
-
-	if (path.IsEmpty())
-		return;
-
-	std::string currentDir2 = File::GetCurrentDir();
-
-	if (currentDir != currentDir2)
-	{
-		PanicAlertT("Current directory changed from %s to %s after wxFileSelector!",
-				currentDir.c_str(), currentDir2.c_str());
-		File::SetCurrentDir(currentDir);
-	}
-
-	// Should we boot a new game or just change the disc?
-	if (Boot && !path.IsEmpty())
-	{
-		BootGame(WxStrToStr(path));
-	}
-	else
-	{
-		DVDInterface::ChangeDisc(WxStrToStr(path).c_str());
-	}
-}
-
-void CFrame::OnRecordReadOnly(wxCommandEvent& event)
-{
-	Movie::SetReadOnly(event.IsChecked());
-}
-
-void CFrame::OnTASInput(wxCommandEvent& event)
-{
-	std::string number[4] = {"1","2","3","4"};
-
-	for (int i = 0; i < 4; ++i)
-	{
-		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
-		{
-			g_TASInputDlg[i]->Show(true);
-			g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
-		}
-	}
-}
-
-void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie;
-	SConfig::GetInstance().SaveSettings();
-}
-
-void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag;
-	SConfig::GetInstance().SaveSettings();
-}
-
-void CFrame::OnFrameStep(wxCommandEvent& event)
-{
-	bool wasPaused = (Core::GetState() == Core::CORE_PAUSE);
-
-	Movie::DoFrameStep();
-
-	bool isPaused = (Core::GetState() == Core::CORE_PAUSE);
-	if(isPaused && !wasPaused) // don't update on unpause, otherwise the status would be wrong when pausing next frame
-		UpdateGUI();
-}
-
-void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
-{
-	DoOpen(false);
-}
-
-void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
-{
-	int controllers = 0;
-	
-	if (Movie::IsReadOnly())
-	{
-		//PanicAlertT("Cannot record movies in read-only mode.");
-		//return;
-		// the user just chose to record a movie, so that should take precedence
-		Movie::SetReadOnly(false);
-		GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(false);
-	}
-
-	for (int i = 0; i < 4; i++)
-	{
-		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
-			controllers |= (1 << i);
-
-		if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
-			controllers |= (1 << (i + 4));
-	}
-
-	if(Movie::BeginRecordingInput(controllers))
-		BootGame(std::string(""));
-}
-
-void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event))
-{
-	wxString path = wxFileSelector(
-			_("Select The Recording File"),
-			wxEmptyString, wxEmptyString, wxEmptyString,
-			_("Dolphin TAS Movies (*.dtm)") + 
-				wxString::Format(wxT("|*.dtm|%s"), wxGetTranslation(wxALL_FILES)),
-			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
-			this);
-
-	if(path.IsEmpty())
-		return;
-
-	if (!Movie::IsReadOnly())
-	{
-		// let's make the read-only flag consistent at the start of a movie.
-		Movie::SetReadOnly(true);
-		GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(true);
-	}
-
-	if (Movie::PlayInput(WxStrToStr(path).c_str()))
-		BootGame(std::string(""));
-}
-
-void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED (event))
-{
-	DoRecordingSave();
-}
-
-void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		// Core is initialized and emulator is running
-		if (UseDebugger)
-		{
-			if (CCPU::IsStepping())
-				CCPU::EnableStepping(false);
-			else
-				CCPU::EnableStepping(true);  // Break
-
-			wxThread::Sleep(20);
-			g_pCodeWindow->JumpToAddress(PC);
-			g_pCodeWindow->Update();
-			// Update toolbar with Play/Pause status
-			UpdateGUI();
-		}
-		else
-		{
-			DoPause();
-		}
-	}
-	else
-	{
-		// Core is uninitialized, start the game
-		BootGame(std::string(""));
-	}
-}
-
-void CFrame::OnRenderParentClose(wxCloseEvent& event)
-{
-	DoStop();
-	if (Core::GetState() == Core::CORE_UNINITIALIZED)
-		event.Skip();
-}
-
-void CFrame::OnRenderParentMove(wxMoveEvent& event)
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED &&
-		!RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
-	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos = m_RenderFrame->GetPosition().x;
-		SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos = m_RenderFrame->GetPosition().y;
-	}
-	event.Skip();
-}
-
-void CFrame::OnRenderParentResize(wxSizeEvent& event)
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		int width, height;
-		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
-			!RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
-		{
-			m_RenderFrame->GetClientSize(&width, &height);
-			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
-			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight = height;
-		}
-#if defined(HAVE_X11) && HAVE_X11
-		wxRect client_rect = m_RenderParent->GetClientRect();
-		XMoveResizeWindow(X11Utils::XDisplayFromHandle(GetHandle()),
-				  (Window) Core::GetWindowHandle(),
-				  client_rect.x, client_rect.y,
-				  client_rect.width, client_rect.height);
-#endif
-		m_LogWindow->Refresh();
-		m_LogWindow->Update();
-	}
-	event.Skip();
-}
-
-void CFrame::ToggleDisplayMode(bool bFullscreen)
-{
-#ifdef _WIN32
-	if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
-	{
-		DEVMODE dmScreenSettings;
-		memset(&dmScreenSettings,0,sizeof(dmScreenSettings));
-		dmScreenSettings.dmSize = sizeof(dmScreenSettings);
-		sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
-				"%dx%d", &dmScreenSettings.dmPelsWidth, &dmScreenSettings.dmPelsHeight);
-		dmScreenSettings.dmBitsPerPel = 32;
-		dmScreenSettings.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
-
-		// Try To Set Selected Mode And Get Results.  NOTE: CDS_FULLSCREEN Gets Rid Of Start Bar.
-		ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN);
-	}
-	else
-	{
-		// Change to default resolution
-		ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
-	}
-#elif defined(HAVE_XRANDR) && HAVE_XRANDR
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
-		m_XRRConfig->ToggleDisplayMode(bFullscreen);
-#elif defined __APPLE__
-	if(bFullscreen)
-		CGDisplayHideCursor(CGMainDisplayID());
-	else
-		CGDisplayShowCursor(CGMainDisplayID());
-#endif
-}
-
-// Prepare the GUI to start the game.
-void CFrame::StartGame(const std::string& filename)
-{
-	m_bGameLoading = true;
-
-	if (m_ToolBar)
-		m_ToolBar->EnableTool(IDM_PLAY, false);
-	GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
-	{
-		// Game has been started, hide the game list
-		m_GameListCtrl->Disable();
-		m_GameListCtrl->Hide();
-
-		m_RenderParent = m_Panel;
-		m_RenderFrame = this;
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)
-			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() | wxSTAY_ON_TOP);
-		else
-			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
-	}
-	else
-	{
-		wxPoint position(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos,
-				SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos);
-#ifdef __APPLE__
-		// On OS X, the render window's title bar is not visible,
-		// and the window therefore not easily moved, when the
-		// position is 0,0. Weed out the 0's from existing configs.
-		if (position == wxPoint(0, 0))
-			position = wxDefaultPosition;
-#endif
-
-		wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
-				SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
-#ifdef _WIN32
-		// Out of desktop check
-		int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
-		int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
-		int width =  GetSystemMetrics(SM_CXVIRTUALSCREEN);
-		int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-		if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y)
-			position.x = position.y = wxDefaultCoord;
-#endif
-		m_RenderFrame = new CRenderFrame((wxFrame*)this, wxID_ANY, _("Dolphin"), position);
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)
-			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() | wxSTAY_ON_TOP);
-		else
-			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
-
-		m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight());
-		m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this);
-		m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this);
-		m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this);
-		m_RenderParent = new CPanel(m_RenderFrame, wxID_ANY);
-		m_RenderFrame->Show();
-	}
-
-#if defined(__APPLE__)
-	NSView *view = (NSView *) m_RenderFrame->GetHandle();
-	NSWindow *window = [view window];
-
-	[window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-#endif
-
-	wxBeginBusyCursor();
-
-	DoFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen);
-
-	if (!BootManager::BootCore(filename))
-	{
-		DoFullscreen(false);
-		// Destroy the renderer frame when not rendering to main
-		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
-			m_RenderFrame->Destroy();
-		m_RenderParent = NULL;
-		m_bGameLoading = false;
-		UpdateGUI();
-	}
-	else
-	{
-#if defined(HAVE_X11) && HAVE_X11
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-		X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()),
-				X11Utils::XWindowFromHandle(GetHandle()), true);
-#endif
-
-#ifdef _WIN32
-		::SetFocus((HWND)m_RenderParent->GetHandle());
-#else
-		m_RenderParent->SetFocus();
-#endif
-		
-		wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this);
-		wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this);
-		wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this);
-		wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this);
-		wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this);
-		wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this);
-		wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this);
-		m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
-	}
-
-	wxEndBusyCursor();
-}
-
-void CFrame::OnBootDrive(wxCommandEvent& event)
-{
-	BootGame(drives[event.GetId()-IDM_DRIVE1]);
-}
-
-// Refresh the file list and browse for a favorites directory
-void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event))
-{
-	if (m_GameListCtrl)
-	{
-		m_GameListCtrl->Update();
-	}
-}
-
-
-void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event))
-{
-	if (m_GameListCtrl)
-	{
-		m_GameListCtrl->BrowseForDirectory();
-	}
-}
-
-// Create screenshot
-void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event))
-{
-	Core::SaveScreenShot();
-}
-
-// Pause the emulation
-void CFrame::DoPause()
-{
-	if (Core::GetState() == Core::CORE_RUN)
-	{
-		Core::SetState(Core::CORE_PAUSE);
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-			m_RenderParent->SetCursor(wxNullCursor);
-		Core::UpdateTitle();
-	}
-	else
-	{
-		Core::SetState(Core::CORE_RUN);
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
-				RendererHasFocus())
-			m_RenderParent->SetCursor(wxCURSOR_BLANK);
-	}
-	UpdateGUI();
-}
-
-// Stop the emulation
-void CFrame::DoStop()
-{
-	if (!Core::IsRunningAndStarted())
-		return;
-	if (confirmStop)
-		return;
-
-	// don't let this function run again until it finishes, or is aborted.
-	confirmStop = true;
-
-	m_bGameLoading = false;
-	if (Core::GetState() != Core::CORE_UNINITIALIZED ||
-			m_RenderParent != NULL)
-	{
-#if defined __WXGTK__
-		wxMutexGuiLeave();
-		std::lock_guard<std::recursive_mutex> lk(keystate_lock);
-		wxMutexGuiEnter();
-#endif
-		// Ask for confirmation in case the user accidentally clicked Stop / Escape
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop)
-		{
-			Core::EState state = Core::GetState();
-			Core::SetState(Core::CORE_PAUSE);
-			wxMessageDialog m_StopDlg(
-				this,
-				_("Do you want to stop the current emulation?"),
-				_("Please confirm..."),
-				wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
-				wxDefaultPosition);
-
-			int Ret = m_StopDlg.ShowModal();
-			if (Ret != wxID_YES)
-			{
-				Core::SetState(state);
-				confirmStop = false;
-				return;
-			}
-		}
-
-		// TODO: Show the author/description dialog here
-		if(Movie::IsRecordingInput())
-			DoRecordingSave();
-		if(Movie::IsPlayingInput() || Movie::IsRecordingInput())
-			Movie::EndPlayInput(false);
-		NetPlay::StopGame();
-
-		wxBeginBusyCursor();
-		BootManager::Stop();
-		wxEndBusyCursor();
-		confirmStop = false;
-
-#if defined(HAVE_X11) && HAVE_X11
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-		X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()),
-				X11Utils::XWindowFromHandle(GetHandle()), false);
-#endif
-		m_RenderFrame->SetTitle(StrToWxStr(scm_rev_str));
-
-		// Destroy the renderer frame when not rendering to main
-		m_RenderParent->Unbind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this);
-
-		// Keyboard
-		wxTheApp->Unbind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this);
-		wxTheApp->Unbind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this);
-
-		// Mouse
-		wxTheApp->Unbind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this);
-		wxTheApp->Unbind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this);
-		wxTheApp->Unbind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this);
-		wxTheApp->Unbind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this);
-		wxTheApp->Unbind(wxEVT_MOTION, &CFrame::OnMouse, this);
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-			m_RenderParent->SetCursor(wxNullCursor);
-		DoFullscreen(false);
-		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
-		{
-			m_RenderFrame->Destroy();
-		}
-		else
-		{
-#if defined(__APPLE__)
-			// Disable the full screen button when not in a game.
-			NSView *view = (NSView *) m_RenderFrame->GetHandle();
-			NSWindow *window = [view window];
-
-			[window setCollectionBehavior:NSWindowCollectionBehaviorDefault];
-#endif
-
-			// Make sure the window is not longer set to stay on top
-			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
-		}
-		m_RenderParent = NULL;
-
-		// Clean framerate indications from the status bar.
-		GetStatusBar()->SetStatusText(wxT(" "), 0);
-
-		// Clear wiimote connection status from the status bar.
-		GetStatusBar()->SetStatusText(wxT(" "), 1);
-
-		// If batch mode was specified on the command-line, exit now.
-		if (m_bBatchMode)
-			Close(true);
-
-		// If using auto size with render to main, reset the application size.
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
-				SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)
-			SetSize(SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth,
-					SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight);
-
-		m_GameListCtrl->Enable();
-		m_GameListCtrl->Show();
-		m_GameListCtrl->SetFocus();
-		UpdateGUI();
-	}
-}
-
-void CFrame::DoRecordingSave()
-{
-	bool paused = (Core::GetState() == Core::CORE_PAUSE);
-	
-	if (!paused)
-		DoPause();
-	
-	wxString path = wxFileSelector(
-			_("Select The Recording File"),
-			wxEmptyString, wxEmptyString, wxEmptyString,
-			_("Dolphin TAS Movies (*.dtm)") + 
-				wxString::Format(wxT("|*.dtm|%s"), wxGetTranslation(wxALL_FILES)),
-			wxFD_SAVE | wxFD_PREVIEW | wxFD_OVERWRITE_PROMPT,
-			this);
-
-	if(path.IsEmpty())
-		return;
-	
-	Movie::SaveRecording(WxStrToStr(path).c_str());
-	
-	if (!paused)
-		DoPause();
-}
-
-void CFrame::OnStop(wxCommandEvent& WXUNUSED (event))
-{
-	DoStop();
-}
-
-void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
-{
-	ProcessorInterface::ResetButton_Tap();
-}
-
-void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
-{
-	CConfigMain ConfigMain(this);
-	if (ConfigMain.ShowModal() == wxID_OK)
-		m_GameListCtrl->Update();
-	UpdateGUI();
-}
-
-void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event))
-{
-	if (g_video_backend)
-		g_video_backend->ShowConfig(this);
-}
-
-void CFrame::OnConfigDSP(wxCommandEvent& WXUNUSED (event))
-{
-	CConfigMain ConfigMain(this);
-	ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE);
-	if (ConfigMain.ShowModal() == wxID_OK)
-		m_GameListCtrl->Update();
-}
-
-void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event))
-{
-	InputPlugin *const pad_plugin = Pad::GetPlugin();
-	bool was_init = false;
-	if (g_controller_interface.IsInit())	// check if game is running
-	{
-		was_init = true;
-	}
-	else
-	{
-#if defined(HAVE_X11) && HAVE_X11
-		Window win = X11Utils::XWindowFromHandle(GetHandle());
-		Pad::Initialize((void *)win);
-#elif defined(__APPLE__)
-		Pad::Initialize((void *)this);
-#else
-		Pad::Initialize(GetHandle());
-#endif
-	}
-	InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration"));
-	m_ConfigFrame.ShowModal();
-	m_ConfigFrame.Destroy();
-	if (!was_init)				// if game isn't running
-	{
-		Pad::Shutdown();
-	}
-}
-
-void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event))
-{
-	InputPlugin *const wiimote_plugin = Wiimote::GetPlugin();
-	bool was_init = false;
-	if (g_controller_interface.IsInit())	// check if game is running
-	{
-		was_init = true;
-	}
-	else
-	{
-#if defined(HAVE_X11) && HAVE_X11
-		Window win = X11Utils::XWindowFromHandle(GetHandle());
-		Wiimote::Initialize((void *)win);
-#elif defined(__APPLE__)
-		Wiimote::Initialize((void *)this);
-#else
-		Wiimote::Initialize(GetHandle());
-#endif
-	}
-	WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin);
-	m_ConfigFrame.ShowModal();
-	m_ConfigFrame.Destroy();
-	if (!was_init)				// if game isn't running
-	{
-		Wiimote::Shutdown();
-	}
-}
-
-void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
-{
-	HotkeyConfigDialog *m_HotkeyDialog = new HotkeyConfigDialog(this);
-	m_HotkeyDialog->ShowModal();
-	m_HotkeyDialog->Destroy();
-	// Update the GUI in case menu accelerators were changed
-	UpdateGUI();
-}
-
-void CFrame::OnHelp(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case wxID_ABOUT:
-		{
-			AboutDolphin frame(this);
-			frame.ShowModal();
-		}
-		break;
-	case IDM_HELPWEBSITE:
-		WxUtils::Launch("https://dolphin-emu.org/");
-		break;
-	case IDM_HELPONLINEDOCS:
-		WxUtils::Launch("https://dolphin-emu.org/docs/guides/");
-		break;
-	case IDM_HELPGOOGLECODE:
-		WxUtils::Launch("https://code.google.com/p/dolphin-emu/");
-		break;
-	}
-}
-
-void CFrame::ClearStatusBar()
-{
-	if (this->GetStatusBar()->IsEnabled())
-	{
-		this->GetStatusBar()->SetStatusText(wxT(""),0);
-	}
-}
-
-void CFrame::StatusBarMessage(const char * Text, ...)
-{
-	const int MAX_BYTES = 1024*10;
-	char Str[MAX_BYTES];
-	va_list ArgPtr;
-	va_start(ArgPtr, Text);
-	vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
-	va_end(ArgPtr);
-
-	if (this->GetStatusBar()->IsEnabled())
-	{
-		this->GetStatusBar()->SetStatusText(StrToWxStr(Str),0);
-	}
-}
-
-
-// Miscellaneous menus
-// ---------------------
-// NetPlay stuff
-void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
-{
-	if (!g_NetPlaySetupDiag)
-	{
-		if (NetPlayDiag::GetInstance() != NULL)
-			NetPlayDiag::GetInstance()->Raise();
-		else
-			g_NetPlaySetupDiag = new NetPlaySetupDiag(this, m_GameListCtrl);
-	}
-	else
-	{
-		g_NetPlaySetupDiag->Raise();
-	}
-}
-
-void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
-{
-	CMemcardManager MemcardManager(this);
-	MemcardManager.ShowModal();
-}
-
-void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED (event)) 
-{
-	CWiiSaveCrypted::ExportAllSaves();
-}
-
-void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event)) 
-{
-	wxString path = wxFileSelector(_("Select the save file"),
-			wxEmptyString, wxEmptyString, wxEmptyString,
-			_("Wii save files (*.bin)|*.bin"),
-			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
-			this);
-
-	if (!path.IsEmpty())
-	{
-		CWiiSaveCrypted::ImportWiiSave(WxStrToStr(path).c_str());
-	}
-}
-
-void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event))
-{
-	if (!g_CheatsWindow)
-		g_CheatsWindow = new wxCheatsWindow(this);
-	else
-		g_CheatsWindow->Raise();
-}
-
-void CFrame::OnLoadWiiMenu(wxCommandEvent& WXUNUSED(event))
-{
-	BootGame(Common::GetTitleContentPath(TITLEID_SYSMENU));
-}
-
-void CFrame::OnInstallWAD(wxCommandEvent& event)
-{
-	std::string fileName;
-
-	switch(event.GetId())
-	{
-	case IDM_LIST_INSTALLWAD:
-	{
-		const GameListItem *iso = m_GameListCtrl->GetSelectedISO();
-		if (!iso)
-			return;
-		fileName = iso->GetFileName();
-		break;
-	}
-	case IDM_MENU_INSTALLWAD:
-	{
-		wxString path = wxFileSelector(
-			_("Select a Wii WAD file to install"),
-			wxEmptyString, wxEmptyString, wxEmptyString,
-			_T("Wii WAD file (*.wad)|*.wad"),
-			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
-			this);
-		fileName = WxStrToStr(path);
-		break;
-	}
-	default:
-		return;
-	}
-
-	wxProgressDialog dialog(_("Installing WAD..."),
-		_("Working..."),
-		1000,
-		this,
-		wxPD_APP_MODAL |
-		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
-		wxPD_SMOOTH
-		);
-
-	u64 titleID = DiscIO::CNANDContentManager::Access().Install_WiiWAD(fileName);
-	if (titleID == TITLEID_SYSMENU)
-	{
-		UpdateWiiMenuChoice();
-	}
-}
-
-
-void CFrame::UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem)
-{
-	if (!WiiMenuItem)
-	{
-		WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
-	}
-
-	const DiscIO::INANDContentLoader & SysMenu_Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU, true);
-	if (SysMenu_Loader.IsValid())
-	{
-		int sysmenuVersion = SysMenu_Loader.GetTitleVersion();
-		char sysmenuRegion = SysMenu_Loader.GetCountryChar();
-		WiiMenuItem->Enable();
-		WiiMenuItem->SetItemLabel(wxString::Format(_("Load Wii System Menu %d%c"), sysmenuVersion, sysmenuRegion));
-	}
-	else
-	{
-		WiiMenuItem->Enable(false);
-		WiiMenuItem->SetItemLabel(_("Load Wii System Menu"));
-	}
-}
-
-void CFrame::OnFifoPlayer(wxCommandEvent& WXUNUSED (event))
-{
-	if (m_FifoPlayerDlg)
-	{
-		m_FifoPlayerDlg->Show();
-		m_FifoPlayerDlg->SetFocus();
-	}
-	else
-	{
-		m_FifoPlayerDlg = new FifoPlayerDlg(this);
-	}
-}
-
-void CFrame::ConnectWiimote(int wm_idx, bool connect)
-{
-	if (Core::IsRunning() && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
-	{
-		GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
-		wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1,
-					connect ? wxT("Connected") : wxT("Disconnected")));
-		Core::DisplayMessage(WxStrToStr(msg), 3000);
-		Host_UpdateMainFrame();
-	}
-}
-
-void CFrame::OnConnectWiimote(wxCommandEvent& event)
-{
-	ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, !GetUsbPointer()->AccessWiiMote((event.GetId() - IDM_CONNECT_WIIMOTE1) | 0x100)->IsConnected());
-}
-
-// Toogle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover
-// the entire screen (when we render to the main window).
-void CFrame::OnToggleFullscreen(wxCommandEvent& WXUNUSED (event))
-{
-	DoFullscreen(!RendererIsFullscreen());
-}
-
-void CFrame::OnToggleDualCore(wxCommandEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
-	SConfig::GetInstance().SaveSettings();
-}
-
-void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED (event))
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle = !SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle;
-	SConfig::GetInstance().SaveSettings();
-}
-
-void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
-{
-	wxString path = wxFileSelector(
-		_("Select the state to load"),
-		wxEmptyString, wxEmptyString, wxEmptyString,
-		_("All Save States (sav, s##)") + 
-			wxString::Format(wxT("|*.sav;*.s??|%s"), wxGetTranslation(wxALL_FILES)),
-		wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
-		this);
-
-	if (!path.IsEmpty())
-		State::LoadAs(WxStrToStr(path));
-}
-
-void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event))
-{
-	wxString path = wxFileSelector(
-		_("Select the state to save"),
-		wxEmptyString, wxEmptyString, wxEmptyString,
-		_("All Save States (sav, s##)") + 
-			wxString::Format(wxT("|*.sav;*.s??|%s"), wxGetTranslation(wxALL_FILES)),
-		wxFD_SAVE,
-		this);
-
-	if (!path.IsEmpty())
-		State::SaveAs(WxStrToStr(path));
-}
-
-void CFrame::OnLoadLastState(wxCommandEvent& event)
-{
-	if (Core::IsRunningAndStarted())
-	{
-		int id = event.GetId();
-		int slot = id - IDM_LOADLAST1 + 1;
-		State::LoadLastSaved(slot);
-	}
-}
-
-void CFrame::OnSaveFirstState(wxCommandEvent& WXUNUSED(event))
-{
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		State::SaveFirstSaved();
-}
-
-void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED (event))
-{
-	if (Core::IsRunningAndStarted())
-		State::UndoLoadState();
-}
-
-void CFrame::OnUndoSaveState(wxCommandEvent& WXUNUSED (event))
-{
-	if (Core::IsRunningAndStarted())
-		State::UndoSaveState();
-}
-
-
-void CFrame::OnLoadState(wxCommandEvent& event)
-{
-	if (Core::IsRunningAndStarted())
-	{
-		int id = event.GetId();
-		int slot = id - IDM_LOADSLOT1 + 1;
-		State::Load(slot);
-	}
-}
-
-void CFrame::OnSaveState(wxCommandEvent& event)
-{
-	if (Core::IsRunningAndStarted())
-	{
-		int id = event.GetId();
-		int slot = id - IDM_SAVESLOT1 + 1;
-		State::Save(slot);
-	}
-}
-
-void CFrame::OnFrameSkip(wxCommandEvent& event)
-{
-	int amount = event.GetId() - IDM_FRAMESKIP0;
-
-	Movie::SetFrameSkipping((unsigned int)amount);
-}
-
-
-
-
-// GUI
-// ---------------------
-
-// Update the enabled/disabled status
-void CFrame::UpdateGUI()
-{
-	// Save status
-	bool Initialized = Core::IsRunning();
-	bool Running = Core::GetState() == Core::CORE_RUN;
-	bool Paused = Core::GetState() == Core::CORE_PAUSE;
-	bool RunningWii = Initialized && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
-	bool RunningGamecube = Initialized && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
-
-	// Make sure that we have a toolbar
-	if (m_ToolBar)
-	{
-		// Enable/disable the Config and Stop buttons
-		m_ToolBar->EnableTool(wxID_OPEN, !Initialized);
-		// Don't allow refresh when we don't show the list
-		m_ToolBar->EnableTool(wxID_REFRESH, !Initialized);
-		m_ToolBar->EnableTool(IDM_STOP, Running || Paused);
-		m_ToolBar->EnableTool(IDM_TOGGLE_FULLSCREEN, Running || Paused);
-		m_ToolBar->EnableTool(IDM_SCREENSHOT, Running || Paused);
-		// Don't allow wiimote config while in Gamecube mode
-		m_ToolBar->EnableTool(IDM_CONFIG_WIIMOTE_PLUGIN, !RunningGamecube);
-	}
-
-	// File
-	GetMenuBar()->FindItem(wxID_OPEN)->Enable(!Initialized);
-	GetMenuBar()->FindItem(IDM_DRIVES)->Enable(!Initialized);
-	GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!Initialized);
-	GetMenuBar()->FindItem(IDM_BROWSE)->Enable(!Initialized);
-
-	// Emulation
-	GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused);
-	GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused);
-	GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput());
-	GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(!Initialized);
-	GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsPlayingInput() || Movie::IsRecordingInput());
-	GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused);
-	GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused);
-	GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused);
-
-	// Update Menu Accelerators
-	for (unsigned int i = 0; i < NUM_HOTKEYS; i++)
-	{
-		if (GetCmdForHotkey(i) == -1)
-			continue;
-		GetMenuBar()->FindItem(GetCmdForHotkey(i))->SetItemLabel(GetMenuLabel(i));
-	}
-
-	GetMenuBar()->FindItem(IDM_LOADSTATE)->Enable(Initialized);
-	GetMenuBar()->FindItem(IDM_SAVESTATE)->Enable(Initialized);
-	// Misc
-	GetMenuBar()->FindItem(IDM_CHANGEDISC)->Enable(Initialized);
-	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
-		GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable(!Initialized);
-
-	// Tools
-	GetMenuBar()->FindItem(IDM_CHEATS)->Enable(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
-
-	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(RunningWii);
-	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Enable(RunningWii);
-	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Enable(RunningWii);
-	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Enable(RunningWii);
-	GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Enable(RunningWii);
-	GetMenuBar()->FindItem(IDM_CONFIG_WIIMOTE_PLUGIN)->Enable(!RunningGamecube);
-	if (RunningWii)
-	{
-		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Check(GetUsbPointer()->
-				AccessWiiMote(0x0100)->IsConnected());
-		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Check(GetUsbPointer()->
-				AccessWiiMote(0x0101)->IsConnected());
-		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Check(GetUsbPointer()->
-				AccessWiiMote(0x0102)->IsConnected());
-		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Check(GetUsbPointer()->
-				AccessWiiMote(0x0103)->IsConnected());
-		GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Check(GetUsbPointer()->
-				AccessWiiMote(0x0104)->IsConnected());
-	}
-
-	if (Running)
-	{
-		if (m_ToolBar)
-		{
-			m_ToolBar->SetToolBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Pause]);
-			m_ToolBar->SetToolShortHelp(IDM_PLAY, _("Pause"));
-			m_ToolBar->SetToolLabel(IDM_PLAY, _("Pause"));
-		}
-	}
-	else
-	{
-		if (m_ToolBar)
-		{
-			m_ToolBar->SetToolBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Play]);
-			m_ToolBar->SetToolShortHelp(IDM_PLAY, _("Play"));
-			m_ToolBar->SetToolLabel(IDM_PLAY, _("Play"));
-		}
-	}
- 
-	GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Enable(Running || Paused);
-	
-	if (!Initialized && !m_bGameLoading)
-	{
-		if (m_GameListCtrl->IsEnabled())
-		{
-			// Prepare to load Default ISO, enable play button
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.empty())
-			{
-				if (m_ToolBar)
-					m_ToolBar->EnableTool(IDM_PLAY, true);
-				GetMenuBar()->FindItem(IDM_PLAY)->Enable(true);
-				GetMenuBar()->FindItem(IDM_RECORD)->Enable(true);
-				GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true);
-			}
-			// Prepare to load last selected file, enable play button
-			else if (!SConfig::GetInstance().m_LastFilename.empty()
-					&& wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str())))
-			{
-				if (m_ToolBar)
-					m_ToolBar->EnableTool(IDM_PLAY, true);
-				GetMenuBar()->FindItem(IDM_PLAY)->Enable(true);
-				GetMenuBar()->FindItem(IDM_RECORD)->Enable(true);
-				GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true);
-			}
-			else
-			{
-				// No game has been selected yet, disable play button
-				if (m_ToolBar)
-					m_ToolBar->EnableTool(IDM_PLAY, false);
-				GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
-				GetMenuBar()->FindItem(IDM_RECORD)->Enable(false);
-				GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(false);
-			}
-		}
-
-		// Game has not started, show game list
-		if (!m_GameListCtrl->IsShown())
-		{
-			m_GameListCtrl->Enable();
-			m_GameListCtrl->Show();
-		}
-		// Game has been selected but not started, enable play button
-		if (m_GameListCtrl->GetSelectedISO() != NULL && m_GameListCtrl->IsEnabled())
-		{
-			if (m_ToolBar)
-				m_ToolBar->EnableTool(IDM_PLAY, true);
-			GetMenuBar()->FindItem(IDM_PLAY)->Enable(true);
-			GetMenuBar()->FindItem(IDM_RECORD)->Enable(true);
-			GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true);
-		}
-	}
-	else if (Initialized)
-	{
-		// Game has been loaded, enable the pause button
-		if (m_ToolBar)
-			m_ToolBar->EnableTool(IDM_PLAY, true);
-		GetMenuBar()->FindItem(IDM_PLAY)->Enable(true);
-
-		// Reset game loading flag
-		m_bGameLoading = false;
-	}
-
-	// Refresh toolbar
-	if (m_ToolBar)
-	{
-		m_ToolBar->Refresh();
-	}
-
-	// Commit changes to manager
-	m_Mgr->Update();
-
-	// Update non-modal windows
-	if (g_CheatsWindow)
-	{
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
-			g_CheatsWindow->UpdateGUI();
-		else
-			g_CheatsWindow->Close();
-	}
-}
-
-void CFrame::UpdateGameList()
-{
-	m_GameListCtrl->Update();
-}
-
-void CFrame::GameListChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case IDM_LISTWII:
-		SConfig::GetInstance().m_ListWii = event.IsChecked();
-		break;
-	case IDM_LISTGC:
-		SConfig::GetInstance().m_ListGC = event.IsChecked();
-		break;
-	case IDM_LISTWAD:
-		SConfig::GetInstance().m_ListWad = event.IsChecked();
-		break;
-	case IDM_LISTJAP:
-		SConfig::GetInstance().m_ListJap = event.IsChecked();
-		break;
-	case IDM_LISTPAL:
-		SConfig::GetInstance().m_ListPal = event.IsChecked();
-		break;
-	case IDM_LISTUSA:
-		SConfig::GetInstance().m_ListUsa = event.IsChecked();
-		break;
-	case IDM_LISTFRANCE:
-		SConfig::GetInstance().m_ListFrance = event.IsChecked();
-		break;
-	case IDM_LISTITALY:
-		SConfig::GetInstance().m_ListItaly = event.IsChecked();
-		break;
-	case IDM_LISTKOREA:
-		SConfig::GetInstance().m_ListKorea = event.IsChecked();
-		break;
-	case IDM_LISTTAIWAN:
-		SConfig::GetInstance().m_ListTaiwan = event.IsChecked();
-		break;
-	case IDM_LIST_UNK:
-		SConfig::GetInstance().m_ListUnknown = event.IsChecked();
-		break;
-	case IDM_LISTDRIVES:
-		SConfig::GetInstance().m_ListDrives = event.IsChecked();
-		break;
-	case IDM_PURGECACHE:
-		CFileSearch::XStringVector Directories;
-		Directories.push_back(File::GetUserPath(D_CACHE_IDX).c_str());
-		CFileSearch::XStringVector Extensions;
-		Extensions.push_back("*.cache");
-		
-		CFileSearch FileSearch(Extensions, Directories);
-		const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();
-		
-		for (u32 i = 0; i < rFilenames.size(); i++)
-		{
-			File::Delete(rFilenames[i]);
-		}
-		break;
-	}
-	
-	// Update gamelist
-	if (m_GameListCtrl)
-	{
-		m_GameListCtrl->Update();
-	}
-}
-
-// Enable and disable the toolbar
-void CFrame::OnToggleToolbar(wxCommandEvent& event)
-{
-	SConfig::GetInstance().m_InterfaceToolbar = event.IsChecked();
-	DoToggleToolbar(event.IsChecked());
-}
-void CFrame::DoToggleToolbar(bool _show)
-{
-	if (_show)
-	{
-		m_Mgr->GetPane(wxT("TBMain")).Show();
-		if (g_pCodeWindow)
-		{
-			m_Mgr->GetPane(wxT("TBDebug")).Show();
-			m_Mgr->GetPane(wxT("TBAui")).Show();
-		}
-		m_Mgr->Update();
-	}
-	else
-	{
-		m_Mgr->GetPane(wxT("TBMain")).Hide();
-		if (g_pCodeWindow)
-		{
-			m_Mgr->GetPane(wxT("TBDebug")).Hide();
-			m_Mgr->GetPane(wxT("TBAui")).Hide();
-		}
-		m_Mgr->Update();
-	}
-}
-
-// Enable and disable the status bar
-void CFrame::OnToggleStatusbar(wxCommandEvent& event)
-{
-	SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked();
-	if (SConfig::GetInstance().m_InterfaceStatusbar == true)
-		GetStatusBar()->Show();
-	else
-		GetStatusBar()->Hide();
-
-	this->SendSizeEvent();
-}
diff --git a/Source/Core/DolphinWX/Src/GLInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h
deleted file mode 100644
index 9ef6c9f0e2..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLINTERFACE_H_
-#define _GLINTERFACE_H_
-
-#if USE_EGL
-#include "GLInterface/Platform.h"
-#else
-
-#include "Thread.h"
-#ifdef ANDROID
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
-#include "GLInterface/EGL.h"
-#elif defined(USE_EGL) && USE_EGL
-#include "GLInterface/EGL.h"
-#elif defined(__APPLE__)
-#include "GLInterface/AGL.h"
-#elif defined(_WIN32)
-#include "GLInterface/WGL.h"
-#elif defined(HAVE_X11) && HAVE_X11
-#include "GLInterface/GLX.h"
-#else
-#error Platform doesnt have a GLInterface
-#endif
-
-typedef struct {
-#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
-	int screen;
-	EGLSurface egl_surf;
-	EGLContext egl_ctx;
-	EGLDisplay egl_dpy;
-	int x, y;
-	unsigned int width, height;
-#elif defined(__APPLE__)
-	NSView *cocoaWin;
-	NSOpenGLContext *cocoaCtx;
-#elif defined(HAVE_X11) && HAVE_X11
-	int screen;
-	Window win;
-	Window parent;
-	// dpy used for glx stuff, evdpy for window events etc.
-	// evdpy is to be used by XEventThread only
-	Display *dpy, *evdpy;
-	XVisualInfo *vi;
-	GLXContext ctx;
-	XSetWindowAttributes attr;
-	std::thread xEventThread;
-	int x, y;
-	unsigned int width, height;
-#endif
-} GLWindow;
-
-extern cInterfaceBase *GLInterface;
-extern GLWindow GLWin;
-
-#endif
-#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
deleted file mode 100644
index 2062268e05..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
-#include "ConfigManager.h"
-
-#include <wx/panel.h>
-
-#include "VertexShaderManager.h"
-#include "../GLInterface.h"
-#include "AGL.h"
-
-void cInterfaceAGL::Swap()
-{
-	[GLWin.cocoaCtx flushBuffer];
-}
-
-// Create rendering window.
-//		Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceAGL::Create(void *&window_handle)
-{
-	int _tx, _ty, _twidth, _theight;
-	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
-
-	GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());
-
-	// Enable high-resolution display support.
-	[GLWin.cocoaWin setWantsBestResolutionOpenGLSurface:YES];
-
-	NSWindow *window = [GLWin.cocoaWin window];
-
-	float scale = [window backingScaleFactor];
-	_twidth *= scale;
-	_theight *= scale;
-
-	// Control window size and picture scaling
-	s_backbuffer_width = _twidth;
-	s_backbuffer_height = _theight;
-
-	NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFAAccelerated, 0 };
-	NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
-		initWithAttributes: attr];
-	if (fmt == nil) {
-		ERROR_LOG(VIDEO, "failed to create pixel format");
-		return false;
-	}
-
-	GLWin.cocoaCtx = [[NSOpenGLContext alloc]
-		initWithFormat: fmt shareContext: nil];
-	[fmt release];
-	if (GLWin.cocoaCtx == nil) {
-		ERROR_LOG(VIDEO, "failed to create context");
-		return false;
-	}
-
-	if (GLWin.cocoaWin == nil) {
-		ERROR_LOG(VIDEO, "failed to create window");
-		return false;
-	}
-
-	[window makeFirstResponder:GLWin.cocoaWin];
-	[GLWin.cocoaCtx setView: GLWin.cocoaWin];
-	[window makeKeyAndOrderFront: nil];
-
-	return true;
-}
-
-bool cInterfaceAGL::MakeCurrent()
-{
-	[GLWin.cocoaCtx makeCurrentContext];
-	return true;
-}
-
-bool cInterfaceAGL::ClearCurrent()
-{
-	// not tested at all
-	//clearCurrentContext();
-	return true;
-}
-
-// Close backend
-void cInterfaceAGL::Shutdown()
-{
-	[GLWin.cocoaCtx clearDrawable];
-	[GLWin.cocoaCtx release];
-	GLWin.cocoaCtx = nil;
-}
-
-void cInterfaceAGL::Update()
-{
-	NSWindow *window = [GLWin.cocoaWin window];
-	NSSize size = [GLWin.cocoaWin frame].size;
-
-	float scale = [window backingScaleFactor];
-	size.width *= scale;
-	size.height *= scale;
-
-	if( s_backbuffer_width == size.width
-	   && s_backbuffer_height == size.height)
-		return;
-	
-	s_backbuffer_width = size.width;
-	s_backbuffer_height = size.height;
-	
-	[GLWin.cocoaCtx update];
-}
-
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
deleted file mode 100644
index 565d593948..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _INTERFACEAGL_H_
-#define _INTERFACEAGL_H_
-
-#ifdef __APPLE__
-#include <GL/glew.h>
-#import <AppKit/AppKit.h>
-#endif
-
-#include "InterfaceBase.h"
-
-class cInterfaceAGL : public cInterfaceBase
-{
-public:
-	void Swap();
-	bool Create(void *&window_handle);
-	bool MakeCurrent();
-	bool ClearCurrent();
-	void Shutdown();
-	void Update();
-
-};
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
deleted file mode 100644
index b8276ae546..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "RenderBase.h"
-
-#include "../GLInterface.h"
-#include "EGL.h"
-
-// Show the current FPS
-void cInterfaceEGL::UpdateFPSDisplay(const char *text)
-{
-	Platform.UpdateFPSDisplay(text);
-}
-void cInterfaceEGL::Swap()
-{
-	eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
-}
-void cInterfaceEGL::SwapInterval(int Interval)
-{
-	eglSwapInterval(GLWin.egl_dpy, Interval);
-}
-
-// Create rendering window.
-//		Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceEGL::Create(void *&window_handle)
-{
-	const char *s;
-	EGLint egl_major, egl_minor;
-	EGLConfig config;
-	EGLint num_configs;
-
-	// attributes for a visual in RGBA format with at least
-	// 8 bits per color and a 24 bit depth buffer
-	int attribs[] = {
-		EGL_RED_SIZE, 8,
-		EGL_GREEN_SIZE, 8,
-		EGL_BLUE_SIZE, 8,
-		EGL_DEPTH_SIZE, 24,
-#ifdef USE_GLES
-#ifdef USE_GLES3
-		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-		
-		// OpenGL ES 3 bit is disabled for now, until we have a way to select it from runtime
-		// Qualcomm drivers don't even care if it is ES2 or ES3 bit set.
-		// Intel drivers /might/ not care, but that code path is untested
-		// EGL_RENDERABLE_TYPE, (1 << 6) /* EGL_OPENGL_ES3_BIT */,
-#else
-		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-#endif
-#else
-		EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
-#endif
-		EGL_NONE };
-
-	static const EGLint ctx_attribs[] = {
-#ifdef USE_GLES
-		EGL_CONTEXT_CLIENT_VERSION, 2,
-#endif
-		EGL_NONE
-	};
-
-	if(!Platform.SelectDisplay())
-		return false;
-
-	GLWin.egl_dpy = Platform.EGLGetDisplay();
-
-	if (!GLWin.egl_dpy) {
-		INFO_LOG(VIDEO, "Error: eglGetDisplay() failed\n");
-		return false;
-	}
-
-	GLWin.platform = Platform.platform;
-
-	if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) {
-		INFO_LOG(VIDEO, "Error: eglInitialize() failed\n");
-		return false;
-	}
-
-#ifdef USE_GLES
-	eglBindAPI(EGL_OPENGL_ES_API);
-#else
-	eglBindAPI(EGL_OPENGL_API);
-#endif
-
-	if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) {
-		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
-		exit(1);
-	}
-
-	if (!Platform.Init(config))
-		return false;
-
-	s = eglQueryString(GLWin.egl_dpy, EGL_VERSION);
-	INFO_LOG(VIDEO, "EGL_VERSION = %s\n", s);
-
-	s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR);
-	INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", s);
-
-	s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS);
-	INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", s);
-
-	s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS);
-	INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s);
-
-	GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs );
-	if (!GLWin.egl_ctx) {
-		INFO_LOG(VIDEO, "Error: eglCreateContext failed\n");
-		exit(1);
-	}
-
-	GLWin.native_window = Platform.CreateWindow();
-
-	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config,
-				GLWin.native_window, NULL);
-	if (!GLWin.egl_surf) {
-		INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
-		exit(1);
-	}
-
-	Platform.ToggleFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen);
-
-	window_handle = (void *)GLWin.native_window;
-	return true;
-}
-
-bool cInterfaceEGL::MakeCurrent()
-{
-	return eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx);
-}
-// Close backend
-void cInterfaceEGL::Shutdown()
-{
-	Platform.DestroyWindow();
-	if (GLWin.egl_ctx && !eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx))
-		NOTICE_LOG(VIDEO, "Could not release drawing context.");
-	if (GLWin.egl_ctx)
-	{
-		eglMakeCurrent(GLWin.egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-		if(!eglDestroyContext(GLWin.egl_dpy, GLWin.egl_ctx))
-			NOTICE_LOG(VIDEO, "Could not destroy drawing context.");
-		if(!eglDestroySurface(GLWin.egl_dpy, GLWin.egl_surf))
-			NOTICE_LOG(VIDEO, "Could not destroy window surface.");
-		if(!eglTerminate(GLWin.egl_dpy))
-			NOTICE_LOG(VIDEO, "Could not destroy display connection.");
-		GLWin.egl_ctx = NULL;
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
deleted file mode 100644
index cd0969c4b7..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _INTERFACEEGL_H_
-#define _INTERFACEEGL_H_
-
-#if USE_GLES
-#ifdef USE_GLES3
-#include <GLES3/gl3.h>
-#else
-#include <GLES2/gl2.h>
-#endif
-#else
-#include <GL/glxew.h>
-#include <GL/gl.h>
-#endif
-
-#include "InterfaceBase.h"
-
-class cPlatform;
-
-class cInterfaceEGL : public cInterfaceBase
-{
-private:
-	cPlatform Platform;
-public:
-	friend class cPlatform;
-	void SwapInterval(int Interval);
-	void Swap();
-	void UpdateFPSDisplay(const char *Text);
-	bool Create(void *&window_handle);
-	bool MakeCurrent();
-	void Shutdown(); 
-};
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
deleted file mode 100644
index 929d365081..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
-
-#include "../GLInterface.h"
-#include "GLX.h"
-
-// Show the current FPS
-void cInterfaceGLX::UpdateFPSDisplay(const char *text)
-{
-	XStoreName(GLWin.evdpy, GLWin.win, text);
-}
-
-void cInterfaceGLX::SwapInterval(int Interval)
-{
-	if (glXSwapIntervalSGI)
-		glXSwapIntervalSGI(Interval);
-	else
-		ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate).");
-}
-
-void cInterfaceGLX::Swap()
-{
-	glXSwapBuffers(GLWin.dpy, GLWin.win);
-}
-
-// Create rendering window.
-//		Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceGLX::Create(void *&window_handle)
-{
-	int _tx, _ty, _twidth, _theight;
-	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
-
-	// Control window size and picture scaling
-	s_backbuffer_width = _twidth;
-	s_backbuffer_height = _theight;
-
-	int glxMajorVersion, glxMinorVersion;
-
-	// attributes for a single buffered visual in RGBA format with at least
-	// 8 bits per color and a 24 bit depth buffer
-	int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8,
-		GLX_GREEN_SIZE, 8,
-		GLX_BLUE_SIZE, 8,
-		GLX_DEPTH_SIZE, 24,
-		None};
-
-	// attributes for a double buffered visual in RGBA format with at least
-	// 8 bits per color and a 24 bit depth buffer
-	int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
-		GLX_RED_SIZE, 8,
-		GLX_GREEN_SIZE, 8,
-		GLX_BLUE_SIZE, 8,
-		GLX_DEPTH_SIZE, 24,
-		None };
-
-	int attrListDefault[] = {
-		GLX_RGBA,
-		GLX_RED_SIZE, 1,
-		GLX_GREEN_SIZE, 1,
-		GLX_BLUE_SIZE, 1,
-		GLX_DOUBLEBUFFER,
-		GLX_DEPTH_SIZE, 1,
-		None };
-
-	GLWin.dpy = XOpenDisplay(0);
-	GLWin.evdpy = XOpenDisplay(0);
-	GLWin.parent = (Window)window_handle;
-	GLWin.screen = DefaultScreen(GLWin.dpy);
-	if (GLWin.parent == 0)
-		GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
-
-	glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion);
-	NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion);
-
-	// Get an appropriate visual
-	GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl);
-	if (GLWin.vi == NULL)
-	{
-		GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl);
-		if (GLWin.vi != NULL)
-		{
-			ERROR_LOG(VIDEO, "Only single buffered visual!");
-		}
-		else
-		{
-			GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault);
-			if (GLWin.vi == NULL)
-			{
-				ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)");
-				return false;
-			}
-		}
-	}
-	else
-		NOTICE_LOG(VIDEO, "Got double buffered visual!");
-
-	// Create a GLX context.
-	GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE);
-	if (!GLWin.ctx)
-	{
-		PanicAlert("Unable to create GLX context.");
-		return false;
-	}
-
-	GLWin.x = _tx;
-	GLWin.y = _ty;
-	GLWin.width = _twidth;
-	GLWin.height = _theight;
-
-	XWindow.CreateXWindow();
-	window_handle = (void *)GLWin.win;
-	return true;
-}
-
-bool cInterfaceGLX::MakeCurrent()
-{
-	// connect the glx-context to the window
-	#if defined(HAVE_WX) && (HAVE_WX)
-	Host_GetRenderWindowSize(GLWin.x, GLWin.y,
-			(int&)GLWin.width, (int&)GLWin.height);
-	XMoveResizeWindow(GLWin.evdpy, GLWin.win, GLWin.x, GLWin.y,
-			GLWin.width, GLWin.height);
-	#endif
-	return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
-}
-
-bool cInterfaceGLX::ClearCurrent()
-{
-	return glXMakeCurrent(GLWin.dpy, None, NULL);
-}
-
-
-// Close backend
-void cInterfaceGLX::Shutdown()
-{
-	XWindow.DestroyXWindow();
-	if (GLWin.ctx)
-	{
-		glXDestroyContext(GLWin.dpy, GLWin.ctx);
-		XCloseDisplay(GLWin.dpy);
-		XCloseDisplay(GLWin.evdpy);
-		GLWin.ctx = NULL;
-	}
-}
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
deleted file mode 100644
index ba8e6a9b82..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _INTERFACEGLX_H_
-#define _INTERFACEGLX_H_
-
-#include <GL/glxew.h>
-#include <GL/gl.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-
-#include "X11_Util.h"
-#include "InterfaceBase.h"
-
-class cInterfaceGLX : public cInterfaceBase
-{
-private:
-	cX11Window XWindow;
-public:
-	friend class cX11Window;
-	void SwapInterval(int Interval);
-	void Swap();
-	void UpdateFPSDisplay(const char *Text);
-	bool Create(void *&window_handle);
-	bool MakeCurrent();
-	bool ClearCurrent();
-	void Shutdown(); 
-};
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
deleted file mode 100644
index 506adcbb6e..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLINTERFACEBASE_H_
-#define _GLINTERFACEBASE_H_
-class cInterfaceBase
-{
-protected:
-	// Window dimensions.
-	u32 s_backbuffer_width;
-	u32 s_backbuffer_height;
-public:
-	virtual void Swap() {}
-	virtual void UpdateFPSDisplay(const char *Text) {}
-	virtual bool Create(void *&window_handle) { return true; }
-	virtual bool MakeCurrent() { return true; }
-	virtual bool ClearCurrent() { return true; }
-	virtual void Shutdown() {} 
-
-	virtual void SwapInterval(int Interval) { }
-	virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }
-	virtual u32 GetBackBufferHeight() { return s_backbuffer_height; }
-	virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; }
-	virtual void Update() { } 
-	virtual bool PeekMessages() { return false; }
-};
-#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp b/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
deleted file mode 100644
index 64e32591d8..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "Platform.h"
-
-bool cPlatform::SelectDisplay(void)
-{
-	enum egl_platform selected_platform = EGL_PLATFORM_NONE;
-	enum egl_platform desired_platform = EGL_PLATFORM_NONE;
-	char *platform_env = getenv("DOLPHIN_EGL_PLATFORM");
-
-	if (platform_env)
-		platform_env = strdup(platform_env);
-
-	if (!platform_env)
-		printf("Running automatic platform detection\n");
-
-	// Try to select the platform set in the environment variable first
-#if HAVE_WAYLAND
-	bool wayland_possible = WaylandInterface.ServerConnect();
-
-	if (platform_env && !strcmp(platform_env, "wayland"))
-	{
-		desired_platform = EGL_PLATFORM_WAYLAND;
-		if (wayland_possible)
-			selected_platform = EGL_PLATFORM_WAYLAND;
-		else
-			printf("Wayland display server connection failed\n");
-	}
-#endif
-
-#if HAVE_X11
-	bool x11_possible = XInterface.ServerConnect();
-
-	if (platform_env && !strcmp(platform_env, "x11"))
-	{
-		desired_platform = EGL_PLATFORM_X11;
-		if ((selected_platform != EGL_PLATFORM_WAYLAND) && x11_possible)
-			selected_platform = EGL_PLATFORM_X11;
-		else
-			printf("X11 display server connection failed\n");
-	}
-#endif
-	// Fall back to automatic detection
-	if (selected_platform == EGL_PLATFORM_NONE)
-	{
-		if (platform_env && (desired_platform == EGL_PLATFORM_NONE)) {
-			printf("DOLPHIN_EGL_PLATFORM set to unrecognized platform \"%s\".\n"
-#if HAVE_WAYLAND && !HAVE_X11
-				"Note: Valid value is \"wayland\" (built without x11 support)\n",
-#endif
-#if HAVE_X11 && !HAVE_WAYLAND
-				"Note: Valid values is \"x11\" (built without wayland support)\n",
-#endif
-#if HAVE_WAYLAND && HAVE_X11
-				"Note: Valid values are \"wayland\" and \"x11\"\n",
-#endif
-#if !HAVE_WAYLAND && !HAVE_X11
-				"Note: No Valid platform. Must be Android\n",
-#endif
-			platform_env);
-			free(platform_env);
-			platform_env = NULL;
-		}
-#if HAVE_WAYLAND
-		if (wayland_possible)
-		{
-			selected_platform = EGL_PLATFORM_WAYLAND;
-			platform_env = strdup("wayland");
-		}
-#endif
-#if HAVE_X11
-		if ((selected_platform != EGL_PLATFORM_WAYLAND) && x11_possible)
-		{
-			selected_platform = EGL_PLATFORM_X11;
-			platform_env = strdup("x11");
-		}
-#endif
-#ifdef ANDROID
-		selected_platform = EGL_PLATFORM_ANDROID;
-#endif
-		if (selected_platform == EGL_PLATFORM_NONE)
-		{
-			printf("FATAL: Failed to find suitable platform for display connection\n");
-			goto out;
-		}
-	}
-
-	printf("Using EGL Native Display Platform: %s\n", platform_env);
-out:
-	cPlatform::platform = selected_platform;
-	free(platform_env);
-#if HAVE_WAYLAND
-	if (selected_platform != EGL_PLATFORM_WAYLAND) {
-		if (GLWin.wl_display)
-			wl_display_disconnect(GLWin.wl_display);
-	}
-		
-#endif
-#if HAVE_X11
-	if (selected_platform != EGL_PLATFORM_X11) {
-		if (GLWin.dpy)
-		{
-			XCloseDisplay(GLWin.dpy);
-			XCloseDisplay(GLWin.evdpy);
-		}
-	}
-#endif
-	if (selected_platform == EGL_PLATFORM_NONE)
-		return false;
-
-	return true;
-}
-
-bool cPlatform::Init(EGLConfig config)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		if (!WaylandInterface.Initialize(config))
-			return false;
-#endif
-#if HAVE_X11
-	if (cPlatform::platform == EGL_PLATFORM_X11)
-		if (!XInterface.Initialize(config))
-			return false;
-#endif
-#ifdef ANDROID
-	EGLint format;
-	eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format);
-	ANativeWindow_setBuffersGeometry((EGLNativeWindowType)Host_GetRenderHandle(), 0, 0, format);
-	int none, width, height;
-	Host_GetRenderWindowSize(none, none, width, height);
-	GLWin.width = width;
-	GLWin.height = height;
-	GLInterface->SetBackBufferDimensions(width, height);
-#endif
-	return true;
-}
-
-EGLDisplay cPlatform::EGLGetDisplay(void)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		return (EGLDisplay) WaylandInterface.EGLGetDisplay();
-#endif
-#if HAVE_X11
-	if (cPlatform::platform == EGL_PLATFORM_X11)
-		return (EGLDisplay) XInterface.EGLGetDisplay();
-#endif
-#ifdef ANDROID
-	return eglGetDisplay(EGL_DEFAULT_DISPLAY);
-#endif
-	return NULL;
-}
-
-EGLNativeWindowType cPlatform::CreateWindow(void)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		return (EGLNativeWindowType) WaylandInterface.CreateWindow();
-#endif
-#if HAVE_X11
-	if (cPlatform::platform == EGL_PLATFORM_X11)
-		return (EGLNativeWindowType) XInterface.CreateWindow();
-#endif
-#ifdef ANDROID
-	return (EGLNativeWindowType)Host_GetRenderHandle(); 
-#endif
-	return 0;
-}
-
-void cPlatform::DestroyWindow(void)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		WaylandInterface.DestroyWindow();
-#endif
-#if HAVE_X11
-	if (cPlatform::platform == EGL_PLATFORM_X11)
-		XInterface.DestroyWindow();
-#endif
-}
-
-void cPlatform::UpdateFPSDisplay(const char *text)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		WaylandInterface.UpdateFPSDisplay(text);
-#endif
-#if HAVE_X11
-	if (cPlatform::platform == EGL_PLATFORM_X11)
-		XInterface.UpdateFPSDisplay(text);
-#endif
-}
-
-void
-cPlatform::ToggleFullscreen(bool fullscreen)
-{
-#if HAVE_WAYLAND
-	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
-		WaylandInterface.ToggleFullscreen(fullscreen);
-#endif
-#if HAVE_X11
-	// Only wayland uses this function
-#endif
-}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Platform.h b/Source/Core/DolphinWX/Src/GLInterface/Platform.h
deleted file mode 100644
index a6b9d59cff..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/Platform.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _EGLPLATFORM_H_
-#define _EGLPLATFORM_H_
-
-#include "Thread.h"
-#include "ConfigManager.h"
-
-#if USE_EGL
-// We must include wayland-egl.h before egl.h so our
-// native types are defined as wayland native types
-#if HAVE_WAYLAND && !HAVE_X11
-#include <wayland-egl.h>
-#endif
-#include <EGL/egl.h>
-#endif
-
-#if HAVE_X11
-#include "X11_Util.h"
-#endif
-#if HAVE_WAYLAND
-#include "Wayland_Util.h"
-#endif
-
-#if USE_EGL
-// There may be multiple EGL platforms
-enum egl_platform {
-	EGL_PLATFORM_NONE,
-	EGL_PLATFORM_WAYLAND,
-	EGL_PLATFORM_X11,
-	EGL_PLATFORM_ANDROID
-};
-
-class cPlatform
-{
-private:
-#if HAVE_X11
-	cXInterface XInterface;
-#endif
-#if HAVE_WAYLAND
-	cWaylandInterface WaylandInterface;
-#endif
-public:
-	enum egl_platform platform;
-	bool SelectDisplay(void);
-	bool Init(EGLConfig config);
-	EGLDisplay EGLGetDisplay(void);
-	EGLNativeWindowType CreateWindow(void);
-	void DestroyWindow(void);
-	void UpdateFPSDisplay(const char *text);
-	void ToggleFullscreen(bool fullscreen);
-};
-
-#include "GLInterface/EGL.h"
-
-#if HAVE_WAYLAND
-#include <wayland-egl.h>
-#endif
-#elif defined(__APPLE__)
-#include "GLInterface/AGL.h"
-#elif defined(_WIN32)
-#include "GLInterface/WGL.h"
-#elif HAVE_X11
-#include "GLInterface/GLX.h"
-#endif
-
-#if HAVE_WAYLAND
-struct geometry {
-	int width;
-	int height;
-};
-
-struct xkb {
-	struct xkb_context *context;
-	struct xkb_keymap *keymap;
-	struct xkb_state *state;
-	xkb_mod_mask_t control_mask;
-	xkb_mod_mask_t alt_mask;
-	xkb_mod_mask_t shift_mask;
-};
-#endif
-
-typedef struct {
-// Currently Wayland/EGL and X11/EGL platforms are supported.
-// The platform may be spelected at run time by setting the
-// environment variable DOLPHIN_EGL_PLATFORM to "wayland" or "x11".
-#if USE_EGL
-	EGLSurface egl_surf;
-	EGLContext egl_ctx;
-	EGLDisplay egl_dpy;
-	enum egl_platform platform;
-#endif
-	EGLNativeWindowType native_window;
-#if HAVE_WAYLAND
-	struct wl_display *wl_display;
-	struct wl_registry *wl_registry;
-	struct wl_compositor *wl_compositor;
-	struct wl_shell *wl_shell;
-	struct wl_seat *wl_seat;
-	struct {
-		struct wl_pointer *wl_pointer;
-		uint32_t serial;
-	} pointer;
-	struct {
-		struct wl_keyboard *wl_keyboard;
-		struct xkb xkb;
-		uint32_t modifiers;
-	} keyboard;
-	struct wl_shm *wl_shm;
-	struct wl_cursor_theme *wl_cursor_theme;
-	struct wl_cursor *wl_cursor;
-	struct wl_surface *wl_cursor_surface;
-	struct geometry geometry, window_size;
-	struct wl_egl_window *wl_egl_native;
-	struct wl_surface *wl_surface;
-	struct wl_shell_surface *wl_shell_surface;
-	struct wl_callback *wl_callback;
-	bool fullscreen, configured, frame_drawn, swap_complete, running;
-#endif
-#if HAVE_X11
-	int screen;
-	// dpy used for egl/glx stuff, evdpy for window events etc.
-	// evdpy is to be used by XEventThread only
-	Display *dpy;
-	Display *evdpy;
-#if !USE_EGL
-	GLXContext ctx;
-#endif
-	Window win;
-	Window parent;
-	XVisualInfo *vi;
-	XSetWindowAttributes attr;
-	std::thread xEventThread;
-	int x, y;
-	unsigned int width, height;
-#elif defined(ANDROID)
-	unsigned int width, height;
-#elif defined(__APPLE__)
-	NSWindow *cocoaWin;
-	NSOpenGLContext *cocoaCtx;
-#endif
-} GLWindow;
-
-extern cInterfaceBase *GLInterface;
-extern GLWindow GLWin;
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
deleted file mode 100644
index 7ba315a5b4..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
-
-#include "VertexShaderManager.h"
-#include "../GLInterface.h"
-#include "WGL.h"
-
-#include "EmuWindow.h"
-static HDC hDC = NULL;       // Private GDI Device Context
-static HGLRC hRC = NULL;     // Permanent Rendering Context
-
-void cInterfaceWGL::SwapInterval(int Interval)
-{
-	if (WGLEW_EXT_swap_control)
-		wglSwapIntervalEXT(Interval);
-	else
-		ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate).");
-}
-void cInterfaceWGL::Swap()
-{
-	SwapBuffers(hDC);
-}
-
-// Draw messages on top of the screen
-bool cInterfaceWGL::PeekMessages()
-{
-	// TODO: peekmessage
-	MSG msg;
-	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-	{
-		if (msg.message == WM_QUIT)
-			return FALSE;
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-	return TRUE;
-}
-
-// Show the current FPS
-void cInterfaceWGL::UpdateFPSDisplay(const char *text)
-{
-	TCHAR temp[512];
-	swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text);
-	EmuWindow::SetWindowText(temp);
-}
-
-// Create rendering window.
-//		Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceWGL::Create(void *&window_handle)
-{
-	int _tx, _ty, _twidth, _theight;
-	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
-
-	// Control window size and picture scaling
-	s_backbuffer_width = _twidth;
-	s_backbuffer_height = _theight;
-
-	window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait..."));
-	if (window_handle == NULL)
-	{
-		Host_SysMessage("failed to create window");
-		return false;
-	}
-
-	// Show the window
-	EmuWindow::Show();
-
-	PIXELFORMATDESCRIPTOR pfd =         // pfd Tells Windows How We Want Things To Be
-	{
-		sizeof(PIXELFORMATDESCRIPTOR),  // Size Of This Pixel Format Descriptor
-		1,                              // Version Number
-		PFD_DRAW_TO_WINDOW |            // Format Must Support Window
-			PFD_SUPPORT_OPENGL |        // Format Must Support OpenGL
-			PFD_DOUBLEBUFFER,           // Must Support Double Buffering
-		PFD_TYPE_RGBA,                  // Request An RGBA Format
-		32,                             // Select Our Color Depth
-		0, 0, 0, 0, 0, 0,               // Color Bits Ignored
-		0,                              // 8bit Alpha Buffer
-		0,                              // Shift Bit Ignored
-		0,                              // No Accumulation Buffer
-		0, 0, 0, 0,                     // Accumulation Bits Ignored
-		24,                             // 24Bit Z-Buffer (Depth Buffer)  
-		8,                              // 8bit Stencil Buffer
-		0,                              // No Auxiliary Buffer
-		PFD_MAIN_PLANE,                 // Main Drawing Layer
-		0,                              // Reserved
-		0, 0, 0                         // Layer Masks Ignored
-	};
-
-	GLuint      PixelFormat;            // Holds The Results After Searching For A Match
-
-	if (!(hDC=GetDC(EmuWindow::GetWnd()))) {
-		PanicAlert("(1) Can't create an OpenGL Device context. Fail.");
-		return false;
-	}
-	if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) {
-		PanicAlert("(2) Can't find a suitable PixelFormat.");
-		return false;
-	}
-	if (!SetPixelFormat(hDC, PixelFormat, &pfd)) {
-		PanicAlert("(3) Can't set the PixelFormat.");
-		return false;
-	}
-	if (!(hRC = wglCreateContext(hDC))) {
-		PanicAlert("(4) Can't create an OpenGL rendering context.");
-		return false;
-	}
-	return true;
-}
-
-bool cInterfaceWGL::MakeCurrent()
-{
-	return wglMakeCurrent(hDC, hRC) ? true : false;
-}
-
-bool cInterfaceWGL::ClearCurrent()
-{
-	return wglMakeCurrent(hDC, NULL) ? true : false;
-}
-
-// Update window width, size and etc. Called from Render.cpp
-void cInterfaceWGL::Update()
-{
-	RECT rcWindow;
-	if (!EmuWindow::GetParentWnd())
-	{
-		// We are not rendering to a child window - use client size.
-		GetClientRect(EmuWindow::GetWnd(), &rcWindow);
-	}
-	else
-	{
-		// We are rendering to a child window - use parent size.
-		GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow);
-	}
-
-	// Get the new window width and height
-	// See below for documentation
-	int width = rcWindow.right - rcWindow.left;
-	int height = rcWindow.bottom - rcWindow.top;
-
-	// If we are rendering to a child window
-	if (EmuWindow::GetParentWnd() != 0 &&
-			(s_backbuffer_width != width || s_backbuffer_height != height) &&
-			width >= 4 && height >= 4)
-	{
-		::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
-		s_backbuffer_width = width;
-		s_backbuffer_height = height;
-	}
-}
-
-// Close backend
-void cInterfaceWGL::Shutdown()
-{
-	if (hRC)
-	{
-		if (!wglMakeCurrent(NULL, NULL))
-			NOTICE_LOG(VIDEO, "Could not release drawing context.");
-
-		if (!wglDeleteContext(hRC))
-			ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");
-
-		hRC = NULL;
-	}
-
-	if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
-	{
-		ERROR_LOG(VIDEO, "Attempt to release device context failed.");
-		hDC = NULL;
-	}
-}
-
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
deleted file mode 100644
index 5c968d963e..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _INTERFACEWGL_H_
-#define _INTERFACEWGL_H_
-
-#ifdef _WIN32
-#define GLEW_STATIC
-#include <GL/glew.h>
-#include <GL/wglew.h>
-#endif
-
-#include "InterfaceBase.h"
-
-class cInterfaceWGL : public cInterfaceBase
-{
-public:
-	void SwapInterval(int Interval);
-	void Swap();
-	void UpdateFPSDisplay(const char *Text);
-	bool Create(void *&window_handle);
-	bool MakeCurrent();
-	bool ClearCurrent();
-	void Shutdown(); 
-
-	void Update();
-	bool PeekMessages();
-};
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp
deleted file mode 100644
index aa15917344..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Core.h"
-#include "State.h"
-#include "../GLInterface.h"
-#include <linux/input.h>
-#include <sys/mman.h>
-
-
-static void
-redraw(void *data, struct wl_callback *callback, uint32_t time);
-
-static const struct wl_callback_listener frame_listener = {
-	redraw
-};
-
-static void
-redraw(void *data, struct wl_callback *callback, uint32_t time)
-{
-	if (GLWin.wl_callback != callback) {
-		printf("Got wrong callback from wayland server\n");
-		exit(-1);
-	}
-
-	GLWin.wl_callback = NULL;
-
-	if (callback)
-		wl_callback_destroy(callback);
-
-	if (!GLWin.configured)
-		return;
-
-	// Reset the frame callback
-	GLWin.wl_callback = wl_surface_frame(GLWin.wl_surface);
-	wl_callback_add_listener(GLWin.wl_callback, &frame_listener, 0);
-
-	// Present rendered buffer on screen
-	//eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
-}
-
-static void
-hide_cursor(void)
-{
-	if (!GLWin.pointer.wl_pointer)
-		return;
-
-	wl_pointer_set_cursor(GLWin.pointer.wl_pointer,
-			      GLWin.pointer.serial, NULL, 0, 0);
-}
-
-static void
-configure_callback(void *data, struct wl_callback *callback, uint32_t  time)
-{
-	wl_callback_destroy(callback);
-
-	GLWin.configured = true;
-
-	if (GLWin.wl_callback == NULL)
-		redraw(data, NULL, time);
-}
-
-static struct wl_callback_listener configure_callback_listener = {
-	configure_callback,
-};
-
-static void
-handle_ping(void *data, struct wl_shell_surface *wl_shell_surface,
-	    uint32_t serial)
-{
-	wl_shell_surface_pong(wl_shell_surface, serial);
-}
-
-static void
-handle_configure(void *data, struct wl_shell_surface *wl_shell_surface,
-		 uint32_t edges, int32_t width, int32_t height)
-{
-
-	if (GLWin.wl_egl_native)
-		wl_egl_window_resize(GLWin.wl_egl_native, width, height, 0, 0);
-
-	GLWin.geometry.width = width;
-	GLWin.geometry.height = height;
-
-	GLInterface->SetBackBufferDimensions(width, height);
-
-	if (!GLWin.fullscreen)
-		GLWin.window_size = GLWin.geometry;
-}
-
-static void
-handle_popup_done(void *data, struct wl_shell_surface *wl_shell_surface)
-{
-}
-
-static const struct wl_shell_surface_listener shell_surface_listener = {
-	handle_ping,
-	handle_configure,
-	handle_popup_done
-};
-
-static void
-pointer_handle_enter(void *data, struct wl_pointer *pointer,
-		     uint32_t serial, struct wl_surface *surface,
-		     wl_fixed_t sx, wl_fixed_t sy)
-{
-	GLWin.pointer.serial = serial;
-
-	if (GLWin.fullscreen)
-		hide_cursor();
-}
-
-static void
-pointer_handle_leave(void *data, struct wl_pointer *pointer,
-		     uint32_t serial, struct wl_surface *surface)
-{
-}
-
-static void
-pointer_handle_motion(void *data, struct wl_pointer *pointer,
-		      uint32_t time, wl_fixed_t sx, wl_fixed_t sy)
-{
-}
-
-static void
-pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
-		      uint32_t serial, uint32_t time, uint32_t button,
-		      uint32_t state)
-{
-}
-
-static void
-pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
-		    uint32_t time, uint32_t axis, wl_fixed_t value)
-{
-}
-
-static const struct wl_pointer_listener pointer_listener = {
-	pointer_handle_enter,
-	pointer_handle_leave,
-	pointer_handle_motion,
-	pointer_handle_button,
-	pointer_handle_axis,
-};
-
-void setup_callback_listener()
-{
-	struct wl_callback *callback;
-
-	callback = wl_display_sync(GLWin.wl_display);
-	wl_callback_add_listener(callback, &configure_callback_listener, 0);
-}
-
-static void
-toggle_fullscreen(bool fullscreen)
-{
-	GLWin.fullscreen = fullscreen;
-	GLWin.configured = false;
-
-	if (fullscreen) {
-		wl_shell_surface_set_fullscreen(GLWin.wl_shell_surface,
-						WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
-						0, NULL);
-	} else {
-		wl_shell_surface_set_toplevel(GLWin.wl_shell_surface);
-		handle_configure(NULL, GLWin.wl_shell_surface, 0,
-				 GLWin.window_size.width,
-				 GLWin.window_size.height);
-	}
-
-	setup_callback_listener();
-}
-
-static void
-keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
-		       uint32_t format, int fd, uint32_t size)
-{
-	char *map_str;
-
-	if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
-		close(fd);
-		return;
-	}
-
-	map_str = (char *) mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-	if (map_str == MAP_FAILED) {
-		close(fd);
-		return;
-	}
-
-	GLWin.keyboard.xkb.keymap = xkb_map_new_from_string(GLWin.keyboard.xkb.context,
-						    map_str,
-						    XKB_KEYMAP_FORMAT_TEXT_V1,
-						    (xkb_keymap_compile_flags) 0);
-	munmap(map_str, size);
-	close(fd);
-
-	if (!GLWin.keyboard.xkb.keymap) {
-		fprintf(stderr, "failed to compile keymap\n");
-		return;
-	}
-
-	GLWin.keyboard.xkb.state = xkb_state_new(GLWin.keyboard.xkb.keymap);
-	if (!GLWin.keyboard.xkb.state) {
-		fprintf(stderr, "failed to create XKB state\n");
-		xkb_map_unref(GLWin.keyboard.xkb.keymap);
-		GLWin.keyboard.xkb.keymap = NULL;
-		return;
-	}
-
-	GLWin.keyboard.xkb.control_mask =
-		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Control");
-	GLWin.keyboard.xkb.alt_mask =
-		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Mod1");
-	GLWin.keyboard.xkb.shift_mask =
-		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Shift");
-}
-
-static void
-keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
-		      uint32_t serial, struct wl_surface *surface,
-		      struct wl_array *keys)
-{
-}
-
-static void
-keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
-		      uint32_t serial, struct wl_surface *surface)
-{
-}
-
-static void
-keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
-		    uint32_t serial, uint32_t time, uint32_t key,
-		    uint32_t state)
-{
-	if (state == WL_KEYBOARD_KEY_STATE_RELEASED)
-		return;
-
-	if (key == KEY_ESC)
-		GLWin.running = false;
-	else if ((key == KEY_P) ||
-		((key == KEY_ENTER) && (GLWin.keyboard.modifiers == 0)))
-		Core::SetState((Core::GetState() == Core::CORE_RUN) ?
-				Core::CORE_PAUSE : Core::CORE_RUN);
-	else if (key == KEY_F)
-		toggle_fullscreen(!GLWin.fullscreen);
-	else if ((key == KEY_ENTER) && (GLWin.keyboard.modifiers == MOD_ALT_MASK))
-		toggle_fullscreen(!GLWin.fullscreen);
-	else if (key >= KEY_F1 && key <= KEY_F8) {
-		int slot_number = key - KEY_F1 + 1;
-		if (GLWin.keyboard.modifiers == MOD_SHIFT_MASK)
-			State::Save(slot_number);
-		else
-			State::Load(slot_number);
-	}
-	else if (key == KEY_F9)
-		Core::SaveScreenShot();
-	else if (key == KEY_F11)
-		State::LoadLastSaved();
-	else if (key == KEY_F12) {
-		if (GLWin.keyboard.modifiers == MOD_SHIFT_MASK)
-			State::UndoLoadState();
-		else
-			State::UndoSaveState();
-	}
-}
-
-static void
-keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
-			  uint32_t serial, uint32_t mods_depressed,
-			  uint32_t mods_latched, uint32_t mods_locked,
-			  uint32_t group)
-{
-	xkb_mod_mask_t mask;
-
-	xkb_state_update_mask(GLWin.keyboard.xkb.state, mods_depressed, mods_latched,
-			      mods_locked, 0, 0, group);
-	mask = xkb_state_serialize_mods(GLWin.keyboard.xkb.state,
-					(xkb_state_component)
-					(XKB_STATE_DEPRESSED |
-					 XKB_STATE_LATCHED));
-	GLWin.keyboard.modifiers = 0;
-	if (mask & GLWin.keyboard.xkb.control_mask)
-		GLWin.keyboard.modifiers |= MOD_CONTROL_MASK;
-	if (mask & GLWin.keyboard.xkb.alt_mask)
-		GLWin.keyboard.modifiers |= MOD_ALT_MASK;
-	if (mask & GLWin.keyboard.xkb.shift_mask)
-		GLWin.keyboard.modifiers |= MOD_SHIFT_MASK;
-}
-
-static const struct wl_keyboard_listener keyboard_listener = {
-	keyboard_handle_keymap,
-	keyboard_handle_enter,
-	keyboard_handle_leave,
-	keyboard_handle_key,
-	keyboard_handle_modifiers,
-};
-
-static void
-seat_handle_capabilities(void *data, struct wl_seat *seat,
-			 uint32_t caps)
-{
-	struct wl_pointer *wl_pointer = NULL;
-	struct wl_keyboard *wl_keyboard = NULL;
-
-	if ((caps & WL_SEAT_CAPABILITY_POINTER) && !wl_pointer) {
-		wl_pointer = wl_seat_get_pointer(seat);
-		wl_pointer_add_listener(wl_pointer, &pointer_listener, 0);
-	} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && wl_pointer) {
-		wl_pointer_destroy(wl_pointer);
-		wl_pointer = NULL;
-	}
-
-	GLWin.pointer.wl_pointer = wl_pointer;
-
-	if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !wl_keyboard) {
-		wl_keyboard = wl_seat_get_keyboard(seat);
-		wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, 0);
-	} else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && wl_keyboard) {
-		wl_keyboard_destroy(wl_keyboard);
-		wl_keyboard = NULL;
-	}
-
-	GLWin.keyboard.wl_keyboard = wl_keyboard;
-}
-
-static const struct wl_seat_listener seat_listener = {
-	seat_handle_capabilities,
-};
-
-static void
-registry_handle_global(void *data, struct wl_registry *registry,
-		       uint32_t name, const char *interface, uint32_t version)
-{
-	if (strcmp(interface, "wl_compositor") == 0) {
-		GLWin.wl_compositor = (wl_compositor *)
-			wl_registry_bind(registry, name,
-					 &wl_compositor_interface, 1);
-	} else if (strcmp(interface, "wl_shell") == 0) {
-		GLWin.wl_shell = (wl_shell *) wl_registry_bind(registry, name,
-					    &wl_shell_interface, 1);
-	} else if (strcmp(interface, "wl_seat") == 0) {
-		GLWin.wl_seat = (wl_seat *) wl_registry_bind(registry, name,
-					   &wl_seat_interface, 1);
-		wl_seat_add_listener(GLWin.wl_seat, &seat_listener, 0);
-	} else if (strcmp(interface, "wl_shm") == 0) {
-		GLWin.wl_shm = (wl_shm *) wl_registry_bind(registry, name,
-					  &wl_shm_interface, 1);
-		GLWin.wl_cursor_theme = (wl_cursor_theme *) wl_cursor_theme_load(NULL, 32, GLWin.wl_shm);
-		GLWin.wl_cursor = (wl_cursor *)
-			wl_cursor_theme_get_cursor(GLWin.wl_cursor_theme, "left_ptr");
-	}
-}
-
-static void
-registry_handle_global_remove(void *data, struct wl_registry *registry,
-			      uint32_t name)
-{
-}
-
-static const struct wl_registry_listener registry_listener = {
-	registry_handle_global,
-	registry_handle_global_remove
-};
-
-bool cWaylandInterface::ServerConnect(void)
-{
-	GLWin.wl_display = wl_display_connect(NULL);
-
-	if (!GLWin.wl_display)
-		return false;
-
-	return true;
-}
-
-bool cWaylandInterface::Initialize(void *config)
-{
-	if (!GLWin.wl_display) {
-		printf("Error: couldn't open wayland display\n");
-		return false;
-	}
-
-	GLWin.pointer.wl_pointer = NULL;
-	GLWin.keyboard.wl_keyboard = NULL;
-
-	GLWin.keyboard.xkb.context = xkb_context_new((xkb_context_flags) 0);
-	if (GLWin.keyboard.xkb.context == NULL) {
-		fprintf(stderr, "Failed to create XKB context\n");
-		return NULL;
-	}
-
-	GLWin.wl_registry = wl_display_get_registry(GLWin.wl_display);
-	wl_registry_add_listener(GLWin.wl_registry,
-				 &registry_listener, NULL);
-
-	wl_display_dispatch(GLWin.wl_display);
-
-	GLWin.wl_cursor_surface =
-		wl_compositor_create_surface(GLWin.wl_compositor);
-
-	return true;
-}
-
-void *cWaylandInterface::EGLGetDisplay(void)
-{
-#if HAVE_X11
-	return eglGetDisplay((_XDisplay *) GLWin.wl_display);
-#else
-	return eglGetDisplay(GLWin.wl_display);
-#endif
-}
-
-void *cWaylandInterface::CreateWindow(void)
-{
-	GLWin.window_size.width = 640;
-	GLWin.window_size.height = 480;
-	GLWin.fullscreen = true;
-	GLWin.frame_drawn = false;
-	GLWin.swap_complete = false;
-
-	GLWin.wl_surface = wl_compositor_create_surface(GLWin.wl_compositor);
-	GLWin.wl_shell_surface = wl_shell_get_shell_surface(GLWin.wl_shell,
-							   GLWin.wl_surface);
-
-	wl_shell_surface_add_listener(GLWin.wl_shell_surface,
-				      &shell_surface_listener, 0);
-
-	GLWin.wl_egl_native = wl_egl_window_create(GLWin.wl_surface,
-						   GLWin.window_size.width,
-						   GLWin.window_size.height);
-#if HAVE_X11
-	return GLWin.wl_egl_native;
-#else
-	return GLWin.wl_egl_native;
-#endif
-}
-
-void cWaylandInterface::DestroyWindow(void)
-{
-	wl_egl_window_destroy(GLWin.wl_egl_native);
-
-	wl_shell_surface_destroy(GLWin.wl_shell_surface);
-	wl_surface_destroy(GLWin.wl_surface);
-
-	if (GLWin.wl_callback)
-		wl_callback_destroy(GLWin.wl_callback);
-}
-
-void cWaylandInterface::UpdateFPSDisplay(const char *text)
-{
-	wl_shell_surface_set_title(GLWin.wl_shell_surface, text);
-}
-
-void cWaylandInterface::ToggleFullscreen(bool fullscreen)
-{
-	toggle_fullscreen(GLWin.fullscreen);
-}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h
deleted file mode 100644
index db5504878a..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _WAYLAND_UTIL_H_
-#define _WAYLAND_UTIL_H_
-
-#include <wayland-client.h>
-#include <wayland-egl.h>
-#include <wayland-cursor.h>
-#include <xkbcommon/xkbcommon.h>
-
-#define MOD_SHIFT_MASK		0x01
-#define MOD_ALT_MASK		0x02
-#define MOD_CONTROL_MASK	0x04
-
-
-class cWaylandInterface
-{
-public:
-	bool ServerConnect(void);
-	bool Initialize(void *config);
-	void *EGLGetDisplay(void);
-	void *CreateWindow(void);
-	void DestroyWindow(void);
-	void UpdateFPSDisplay(const char *text);
-	void ToggleFullscreen(bool fullscreen);
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
deleted file mode 100644
index e57c095d86..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Host.h"
-#include "VideoConfig.h"
-#include "../GLInterface.h"
-#include "VertexShaderManager.h"
-
-#if USE_EGL
-bool cXInterface::ServerConnect(void)
-{
-	GLWin.dpy = XOpenDisplay(NULL);
-
-	if (!GLWin.dpy)
-		return false;
-
-	return true;
-}
-
-bool cXInterface::Initialize(void *config)
-{
-	int _tx, _ty, _twidth, _theight;
-	XVisualInfo  visTemplate;
-	int num_visuals;
-	EGLint vid;
-
-	if (!GLWin.dpy) {
-		printf("Error: couldn't open X display\n");
-		return false;
-	}
-
-	if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) {
-		printf("Error: eglGetConfigAttrib() failed\n");
-		exit(1);
-	}
-
-	/* The X window visual must match the EGL config */
-	visTemplate.visualid = vid;
-	GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals);
-	if (!GLWin.vi) {
-		printf("Error: couldn't get X visual\n");
-		exit(1);
-	}
-
-	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
-
-	GLWin.x = _tx;
-	GLWin.y = _ty;
-	GLWin.width = _twidth;
-	GLWin.height = _theight;
-
-	GLWin.evdpy = XOpenDisplay(NULL);
-	GLWin.parent = GLWin.win;
-	GLWin.screen = DefaultScreen(GLWin.dpy);
-
-	if (GLWin.parent == 0)
-		GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
-
-	/* Set initial projection/viewing transformation.
-	 * We can't be sure we'll get a ConfigureNotify event when the window
-	 * first appears.
-	 */
-	glViewport(0, 0, (GLint) GLWin.width, (GLint) GLWin.height);
-
-	return true;
-}
-
-void *cXInterface::EGLGetDisplay(void)
-{
-	return eglGetDisplay(GLWin.dpy);
-}
-
-void *cXInterface::CreateWindow(void)
-{
-	Atom wmProtocols[1];
-
-	// Setup window attributes
-	GLWin.attr.colormap = XCreateColormap(GLWin.evdpy,
-			GLWin.parent, GLWin.vi->visual, AllocNone);
-	GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
-	GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen);
-	GLWin.attr.border_pixel = 0;
-
-	// Create the window
-	GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent,
-			GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0,
-			GLWin.vi->depth, InputOutput, GLWin.vi->visual,
-			CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
-	wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
-	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
-	XMapRaised(GLWin.evdpy, GLWin.win);
-	XSync(GLWin.evdpy, True);
-
-	GLWin.xEventThread = std::thread(&cXInterface::XEventThread, this);
-	// Control window size and picture scaling
-	GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height);
-
-	return (void *) GLWin.win;
-}
-
-void cXInterface::DestroyWindow(void)
-{
-	XDestroyWindow(GLWin.evdpy, GLWin.win);
-	GLWin.win = 0;
-	if (GLWin.xEventThread.joinable())
-		GLWin.xEventThread.join();
-	XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
-}
-
-void cXInterface::UpdateFPSDisplay(const char *text)
-{
-	XStoreName(GLWin.evdpy, GLWin.win, text);
-}
-
-void cXInterface::XEventThread()
-#else
-void cX11Window::CreateXWindow(void)
-{
-	Atom wmProtocols[1];
-
-	// Setup window attributes
-	GLWin.attr.colormap = XCreateColormap(GLWin.evdpy,
-			GLWin.parent, GLWin.vi->visual, AllocNone);
-	GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
-	GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen);
-	GLWin.attr.border_pixel = 0;
-
-	// Create the window
-	GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent,
-			GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0,
-			GLWin.vi->depth, InputOutput, GLWin.vi->visual,
-			CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
-	wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
-	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
-	XMapRaised(GLWin.evdpy, GLWin.win);
-	XSync(GLWin.evdpy, True);
-
-	GLWin.xEventThread = std::thread(&cX11Window::XEventThread, this);
-}
-
-void cX11Window::DestroyXWindow(void)
-{
-	XUnmapWindow(GLWin.evdpy, GLWin.win);
-	GLWin.win = 0;
-	if (GLWin.xEventThread.joinable())
-		GLWin.xEventThread.join();
-	XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
-}
-
-void cX11Window::XEventThread()
-#endif
-{
-	// Free look variables
-	static bool mouseLookEnabled = false;
-	static bool mouseMoveEnabled = false;
-	static float lastMouse[2];
-	while (GLWin.win)
-	{
-		XEvent event;
-		for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
-		{
-			XNextEvent(GLWin.evdpy, &event);
-			switch(event.type) {
-				case ButtonPress:
-					if (g_Config.bFreeLook)
-					{
-						switch (event.xbutton.button)
-						{
-							case 2: // Middle button
-								lastMouse[0] = event.xbutton.x;
-								lastMouse[1] = event.xbutton.y;
-								mouseMoveEnabled = true;
-								break;
-							case 3: // Right button
-								lastMouse[0] = event.xbutton.x;
-								lastMouse[1] = event.xbutton.y;
-								mouseLookEnabled = true;
-								break;
-						}
-					}
-					break;
-				case ButtonRelease:
-					if (g_Config.bFreeLook)
-					{
-						switch (event.xbutton.button)
-						{
-							case 2: // Middle button
-								mouseMoveEnabled = false;
-								break;
-							case 3: // Right button
-								mouseLookEnabled = false;
-								break;
-						}
-					}
-					break;
-				case MotionNotify:
-					if (g_Config.bFreeLook)
-					{
-						if (mouseLookEnabled)
-						{
-							VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f,
-									(event.xmotion.y - lastMouse[1]) / 200.0f);
-							lastMouse[0] = event.xmotion.x;
-							lastMouse[1] = event.xmotion.y;
-						}
-
-						if (mouseMoveEnabled)
-						{
-							VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f,
-									(event.xmotion.y - lastMouse[1]) / 50.0f);
-							lastMouse[0] = event.xmotion.x;
-							lastMouse[1] = event.xmotion.y;
-						}
-					}
-					break;
-				case ConfigureNotify:
-					GLInterface->SetBackBufferDimensions(event.xconfigure.width, event.xconfigure.height);
-					break;
-				case ClientMessage:
-					if ((unsigned long) event.xclient.data.l[0] ==
-							XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
-						Host_Message(WM_USER_STOP);
-					break;
-				default:
-					break;
-			}
-		}
-		Common::SleepCurrentThread(20);
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
deleted file mode 100644
index 321aa2a9b3..0000000000
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _X11_UTIL_H_
-#define _X11_UTIL_H_
-
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-
-#if USE_EGL
-class cXInterface
-{
-private:
-	void XEventThread();
-public:
-	bool ServerConnect(void);
-	bool Initialize(void *config);
-	void *EGLGetDisplay(void);
-	void *CreateWindow(void);
-	void DestroyWindow(void);
-	void UpdateFPSDisplay(const char *text);
-};
-#else
-class cX11Window
-{
-private:
-	void XEventThread();
-public:
-	void CreateXWindow(void);
-	void DestroyXWindow(void);
-};
-#endif
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
deleted file mode 100644
index 49a38b6ea8..0000000000
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ /dev/null
@@ -1,1326 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-
-#include <wx/imaglist.h>
-#include <wx/fontmap.h>
-#include <wx/filename.h>
-
-#include <algorithm>
-#include <memory>
-
-#include "FileSearch.h"
-#include "StringUtil.h"
-#include "ConfigManager.h"
-#include "GameListCtrl.h"
-#include "Blob.h"
-#include "Core.h"
-#include "ISOProperties.h"
-#include "FileUtil.h"
-#include "CDUtils.h"
-#include "WxUtils.h"
-#include "Main.h"
-#include "MathUtil.h"
-#include "HW/DVDInterface.h"
-
-#include "../resources/Flag_Europe.xpm"
-#include "../resources/Flag_Germany.xpm"
-#include "../resources/Flag_France.xpm"
-#include "../resources/Flag_Italy.xpm"
-#include "../resources/Flag_Japan.xpm"
-#include "../resources/Flag_USA.xpm"
-#include "../resources/Flag_Taiwan.xpm"
-#include "../resources/Flag_Korea.xpm"
-#include "../resources/Flag_Unknown.xpm"
-#include "../resources/Flag_SDK.xpm"
-
-#include "../resources/Platform_Wad.xpm"
-#include "../resources/Platform_Wii.xpm"
-#include "../resources/Platform_Gamecube.xpm"
-#include "../resources/rating_gamelist.h"
-
-size_t CGameListCtrl::m_currentItem = 0;
-size_t CGameListCtrl::m_numberItem = 0;
-std::string CGameListCtrl::m_currentFilename;
-bool sorted = false;
-
-extern CFrame* main_frame;
-
-static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2,
-								long sortData = CGameListCtrl::COLUMN_TITLE)
-{
-	int t = 1;
-
-	if (sortData < 0)
-	{
-		t = -1;
-		sortData = -sortData;
-	}
-
-	int indexOne = 0;
-	int indexOther = 0;
-
-	
-	// index only matters for WADS and PAL GC games, but invalid indicies for the others
-	// will return the (only) language in the list
-	if (iso1->GetPlatform() == GameListItem::WII_WAD)
-	{
-		indexOne = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
-	}
-	else
-	{	// GC
-		indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
-	}
-
-	if (iso2->GetPlatform() == GameListItem::WII_WAD)
-	{
-		indexOther = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
-	}
-	else
-	{	// GC
-		indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
-	}
-
-	switch(sortData)
-	{
-		case CGameListCtrl::COLUMN_TITLE:
-			if (!strcasecmp(iso1->GetName(indexOne).c_str(),iso2->GetName(indexOther).c_str()))
-			{
-				if (iso1->IsDiscTwo())
-					return 1 * t;
-				else if (iso2->IsDiscTwo())
-					return -1 * t;
-			}
-			return strcasecmp(iso1->GetName(indexOne).c_str(),
-					iso2->GetName(indexOther).c_str()) * t;
-		case CGameListCtrl::COLUMN_NOTES:
-			{
-				std::string cmp1 =
-					(iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ?
-					iso1->GetCompany() : iso1->GetDescription(indexOne);
-				std::string cmp2 =
-					(iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ?
-					iso2->GetCompany() : iso2->GetDescription(indexOther);
-				return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t;
-			}
-		case CGameListCtrl::COLUMN_COUNTRY:
-			if(iso1->GetCountry() > iso2->GetCountry())
-				return  1 * t;
-			if(iso1->GetCountry() < iso2->GetCountry())
-				return -1 * t;
-			return 0;
-		case CGameListCtrl::COLUMN_SIZE:
-			if (iso1->GetFileSize() > iso2->GetFileSize())
-				return  1 * t;
-			if (iso1->GetFileSize() < iso2->GetFileSize())
-				return -1 * t;
-			return 0;
-		case CGameListCtrl::COLUMN_PLATFORM:
-			if(iso1->GetPlatform() > iso2->GetPlatform())
-				return  1 * t;
-			if(iso1->GetPlatform() < iso2->GetPlatform())
-				return -1 * t;
-			return 0;
-
-		case CGameListCtrl::COLUMN_EMULATION_STATE:
-		{
-			const int
-				nState1 = iso1->GetEmuState(),
-				nState2 = iso2->GetEmuState();
-
-			if (nState1 > nState2)
-				return  1 * t;
-			if (nState1 < nState2)
-				return -1 * t;
-			else
-				return 0;
-		}
-			break;
-	}
-
-	return 0;
-}
-
-bool operator < (const GameListItem &one, const GameListItem &other)
-{
-	return CompareGameListItems(&one, &other) < 0;
-}
-
-BEGIN_EVENT_TABLE(wxEmuStateTip, wxTipWindow)
-	EVT_KEY_DOWN(wxEmuStateTip::OnKeyDown)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(CGameListCtrl, wxListCtrl)
-	EVT_SIZE(CGameListCtrl::OnSize)
-	EVT_RIGHT_DOWN(CGameListCtrl::OnRightClick)
-	EVT_LEFT_DOWN(CGameListCtrl::OnLeftClick)
-	EVT_LIST_KEY_DOWN(LIST_CTRL, CGameListCtrl::OnKeyPress)
-	EVT_MOTION(CGameListCtrl::OnMouseMotion)
-	EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, CGameListCtrl::OnColBeginDrag)
-	EVT_LIST_COL_CLICK(LIST_CTRL, CGameListCtrl::OnColumnClick)
-	EVT_MENU(IDM_PROPERTIES, CGameListCtrl::OnProperties)
-	EVT_MENU(IDM_GAMEWIKI, CGameListCtrl::OnWiki)
-	EVT_MENU(IDM_OPENCONTAININGFOLDER, CGameListCtrl::OnOpenContainingFolder)
-	EVT_MENU(IDM_OPENSAVEFOLDER, CGameListCtrl::OnOpenSaveFolder)
-	EVT_MENU(IDM_EXPORTSAVE, CGameListCtrl::OnExportSave)
-	EVT_MENU(IDM_SETDEFAULTGCM, CGameListCtrl::OnSetDefaultGCM)
-	EVT_MENU(IDM_COMPRESSGCM, CGameListCtrl::OnCompressGCM)
-	EVT_MENU(IDM_MULTICOMPRESSGCM, CGameListCtrl::OnMultiCompressGCM)
-	EVT_MENU(IDM_MULTIDECOMPRESSGCM, CGameListCtrl::OnMultiDecompressGCM)
-	EVT_MENU(IDM_DELETEGCM, CGameListCtrl::OnDeleteGCM)
-END_EVENT_TABLE()
-
-CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const
-		wxPoint& pos, const wxSize& size, long style)
-	: wxListCtrl(parent, id, pos, size, style), toolTip(0)
-{
-	DragAcceptFiles(true);
-	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CGameListCtrl::OnDropFiles), NULL, this);
-}
-
-CGameListCtrl::~CGameListCtrl()
-{
-	if (m_imageListSmall)
-		delete m_imageListSmall;
-
-	ClearIsoFiles();
-}
-
-void CGameListCtrl::InitBitmaps()
-{
-	m_imageListSmall = new wxImageList(96, 32);
-	SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
-
-	m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] =
-		m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] =
-		m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] =
-		m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] =
-		m_imageListSmall->Add(wxBitmap(Flag_USA_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] =
-		m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] =
-		m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] =
-		m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] =
-		m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] =
-		m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap);
-	m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] =
-		m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap);
-
-	m_PlatformImageIndex.resize(3);
-	m_PlatformImageIndex[0] =
-		m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm), wxNullBitmap);
-	m_PlatformImageIndex[1] =
-		m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm), wxNullBitmap);
-	m_PlatformImageIndex[2] =
-		m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm), wxNullBitmap);
-
-	m_EmuStateImageIndex.resize(6);
-	m_EmuStateImageIndex[0] =
-		m_imageListSmall->Add(wxBitmap(rating_0), wxNullBitmap);
-	m_EmuStateImageIndex[1] =
-		m_imageListSmall->Add(wxBitmap(rating_1), wxNullBitmap);
-	m_EmuStateImageIndex[2] =
-		m_imageListSmall->Add(wxBitmap(rating_2), wxNullBitmap);
-	m_EmuStateImageIndex[3] =
-		m_imageListSmall->Add(wxBitmap(rating_3), wxNullBitmap);
-	m_EmuStateImageIndex[4] =
-		m_imageListSmall->Add(wxBitmap(rating_4), wxNullBitmap);
-	m_EmuStateImageIndex[5] =
-		m_imageListSmall->Add(wxBitmap(rating_5), wxNullBitmap);
-}
-
-void CGameListCtrl::BrowseForDirectory()
-{
-	wxString dirHome;
-	wxGetHomeDir(&dirHome);
-
-	// browse
-	wxDirDialog dialog(this, _("Browse for a directory to add"), dirHome,
-			wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
-
-	if (dialog.ShowModal() == wxID_OK)
-	{
-		std::string sPath(WxStrToStr(dialog.GetPath()));
-		std::vector<std::string>::iterator itResult = std::find(
-				SConfig::GetInstance().m_ISOFolder.begin(),
-				SConfig::GetInstance().m_ISOFolder.end(), sPath);
-
-		if (itResult == SConfig::GetInstance().m_ISOFolder.end())
-		{
-			SConfig::GetInstance().m_ISOFolder.push_back(sPath);
-			SConfig::GetInstance().SaveSettings();
-		}
-
-		Update();
-	}
-}
-
-void CGameListCtrl::Update()
-{
-	int scrollPos = wxWindow::GetScrollPos(wxVERTICAL);
-	// Don't let the user refresh it while a game is running
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		return;
-
-	if (m_imageListSmall)
-	{
-		delete m_imageListSmall;
-		m_imageListSmall = NULL;
-	}
-
-	Hide();
-
-	ScanForISOs();
-
-	ClearAll();
-
-	if (m_ISOFiles.size() != 0)
-	{
-		// Don't load bitmaps unless there are games to list
-		InitBitmaps();
-
-		// add columns
-		InsertColumn(COLUMN_DUMMY,_T(""));
-		InsertColumn(COLUMN_PLATFORM, _T(""));
-		InsertColumn(COLUMN_BANNER, _("Banner"));
-		InsertColumn(COLUMN_TITLE, _("Title"));
-
-		// Instead of showing the notes + the company, which is unknown with
-		// wii titles We show in the same column : company for GC games and
-		// description for wii/wad games
-		InsertColumn(COLUMN_NOTES, _("Notes"));
-		InsertColumn(COLUMN_COUNTRY, _T(""));
-		InsertColumn(COLUMN_SIZE, _("Size"));
-		InsertColumn(COLUMN_EMULATION_STATE, _("State"));
-
-#ifdef __WXMSW__
-		const int platform_padding = 0;
-#else
-		const int platform_padding = 8;
-#endif
-		
-		// set initial sizes for columns
-		SetColumnWidth(COLUMN_DUMMY,0);
-		SetColumnWidth(COLUMN_PLATFORM, 35 + platform_padding);
-		SetColumnWidth(COLUMN_BANNER, 96 + platform_padding);
-		SetColumnWidth(COLUMN_TITLE, 200 + platform_padding);
-		SetColumnWidth(COLUMN_NOTES, 200 + platform_padding);
-		SetColumnWidth(COLUMN_COUNTRY, 32 + platform_padding);
-		SetColumnWidth(COLUMN_EMULATION_STATE, 50 + platform_padding);
-
-		// add all items
-		for (int i = 0; i < (int)m_ISOFiles.size(); i++)
-		{
-			InsertItemInReportView(i);
-			if (m_ISOFiles[i]->IsCompressed())
-				SetItemTextColour(i, wxColour(0xFF0000));
-		}
-
-		// Sort items by Title
-		if (!sorted)
-			last_column = 0;
-		sorted = false;
-		wxListEvent event;
-		event.m_col = SConfig::GetInstance().m_ListSort2;
-		OnColumnClick(event);
-
-		event.m_col = SConfig::GetInstance().m_ListSort;
-		OnColumnClick(event);
-		sorted = true;
-
-		SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE);
-	}
-	else
-	{
-		wxString errorString;
-		// We just check for one hide setting to be enabled, as we may only
-		// have GC games for example, and hide them, so we should show the
-		// second message instead
-		if ((SConfig::GetInstance().m_ListGC  &&
-			SConfig::GetInstance().m_ListWii  &&
-			SConfig::GetInstance().m_ListWad) &&
-			(SConfig::GetInstance().m_ListJap &&
-			SConfig::GetInstance().m_ListUsa  &&
-			SConfig::GetInstance().m_ListPal))
-		{
-			errorString = _("Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for files...");
-		}
-		else
-		{
-			errorString = _("Dolphin is currently set to hide all games.  Doubleclick here to show all games...");
-		}
-		InsertColumn(0, _("No ISOs or WADS found"));
-		long index = InsertItem(0, errorString);
-		SetItemFont(index, *wxITALIC_FONT);
-		SetColumnWidth(0, wxLIST_AUTOSIZE);
-	}
-	if (GetSelectedISO() == NULL)
-		main_frame->UpdateGUI();
-	Show();
-
-	AutomaticColumnWidth();
-	ScrollLines(scrollPos);
-	SetFocus();
-}
-
-wxString NiceSizeFormat(u64 _size)
-{
-	const char* const unit_symbols[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"};
-	
-	auto const unit = Log2(std::max<u64>(_size, 1)) / 10;
-	auto const unit_size = (1 << (unit * 10));
-	
-	// ugly rounding integer math
-	auto const value = (_size + unit_size / 2) / unit_size;
-	auto const frac = (_size % unit_size * 10 + unit_size / 2) / unit_size % 10;
-
-	return StrToWxStr(StringFromFormat("%llu.%llu %s", value, frac, unit_symbols[unit]));
-}
-
-void CGameListCtrl::InsertItemInReportView(long _Index)
-{
-	// When using wxListCtrl, there is no hope of per-column text colors.
-	// But for reference, here are the old colors that were used: (BGR)
-	// title: 0xFF0000
-	// company: 0x007030
-	int ImageIndex = -1;
-
-	GameListItem& rISOFile = *m_ISOFiles[_Index];
-
-	// Insert a first row with nothing in it, that will be used as the Index
-	long ItemIndex = InsertItem(_Index, wxEmptyString);
-
-	// Insert the platform's image in the first (visible) column
-	SetItemColumnImage(_Index, COLUMN_PLATFORM, m_PlatformImageIndex[rISOFile.GetPlatform()]);
-
-	if (rISOFile.GetImage().IsOk())
-		ImageIndex = m_imageListSmall->Add(rISOFile.GetImage());
-
-	// Set the game's banner in the second column
-	SetItemColumnImage(_Index, COLUMN_BANNER, ImageIndex);
-
-	int SelectedLanguage = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
-	
-	// Is this sane?
-	if  (rISOFile.GetPlatform() == GameListItem::WII_WAD)
-	{
-		SelectedLanguage = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
-	}
-	
-	std::string const name = rISOFile.GetName(SelectedLanguage);
-	SetItem(_Index, COLUMN_TITLE, StrToWxStr(name), -1);
-
-	// We show the company string on Gamecube only
-	// On Wii we show the description instead as the company string is empty
-	std::string const notes = (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) ?
-		rISOFile.GetCompany() : rISOFile.GetDescription(SelectedLanguage);
-	SetItem(_Index, COLUMN_NOTES, StrToWxStr(notes), -1);
-
-	// Emulation state
-	SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]);
-
-	// Country
-	SetItemColumnImage(_Index, COLUMN_COUNTRY, m_FlagImageIndex[rISOFile.GetCountry()]);
-
-	// File size
-	SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);
-
-	// Background color
-	SetBackgroundColor();
-
-	// Item data
-	SetItemData(_Index, ItemIndex);
-}
-
-wxColour blend50(const wxColour& c1, const wxColour& c2)
-{
-	unsigned char r,g,b,a;
-	r = c1.Red()/2   + c2.Red()/2;
-	g = c1.Green()/2 + c2.Green()/2;
-	b = c1.Blue()/2  + c2.Blue()/2;
-	a = c1.Alpha()/2 + c2.Alpha()/2;
-	return a << 24 | b << 16 | g << 8 | r;
-}
-
-void CGameListCtrl::SetBackgroundColor()
-{
-	for(long i = 0; i < GetItemCount(); i++)
-	{
-		wxColour color = (i & 1) ?
-			blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT),
-					wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) :
-			wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-		CGameListCtrl::SetItemBackgroundColour(i, color);
-	}
-}
-
-void CGameListCtrl::ScanForISOs()
-{
-	ClearIsoFiles();
-
-	CFileSearch::XStringVector Directories(SConfig::GetInstance().m_ISOFolder);
-
-	if (SConfig::GetInstance().m_RecursiveISOFolder)
-	{
-		for (u32 i = 0; i < Directories.size(); i++)
-		{
-			File::FSTEntry FST_Temp;
-			File::ScanDirectoryTree(Directories[i], FST_Temp);
-			for (u32 j = 0; j < FST_Temp.children.size(); j++)
-			{
-				if (FST_Temp.children[j].isDirectory)
-				{
-					bool duplicate = false;
-					for (u32 k = 0; k < Directories.size(); k++)
-					{
-						if (strcmp(Directories[k].c_str(),
-									FST_Temp.children[j].physicalName.c_str()) == 0)
-						{
-							duplicate = true;
-							break;
-						}
-					}
-					if (!duplicate)
-						Directories.push_back(
-								FST_Temp.children[j].physicalName.c_str());
-				}
-			}
-		}
-	}
-
-	CFileSearch::XStringVector Extensions;
-
-	if (SConfig::GetInstance().m_ListGC)
-		Extensions.push_back("*.gcm");
-	if (SConfig::GetInstance().m_ListWii || SConfig::GetInstance().m_ListGC)
-	{
-		Extensions.push_back("*.iso");
-		Extensions.push_back("*.ciso");
-		Extensions.push_back("*.gcz");
-		Extensions.push_back("*.wbfs");
-	}
-	if (SConfig::GetInstance().m_ListWad)
-		Extensions.push_back("*.wad");
-
-	CFileSearch FileSearch(Extensions, Directories);
-	const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();
-
-	if (rFilenames.size() > 0)
-	{
-		wxProgressDialog dialog(
-			_("Scanning for ISOs"),
-			_("Scanning..."),
-			(int)rFilenames.size() - 1,
-			this,
-			wxPD_APP_MODAL |
-			wxPD_AUTO_HIDE |
-			wxPD_CAN_ABORT |
-			wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
-			wxPD_SMOOTH // - makes updates as small as possible (down to 1px)
-			);
-
-		for (u32 i = 0; i < rFilenames.size(); i++)
-		{
-			std::string FileName;
-			SplitPath(rFilenames[i], NULL, &FileName, NULL);
-
-			// Update with the progress (i) and the message
-			dialog.Update(i, wxString::Format(_("Scanning %s"),
-				StrToWxStr(FileName)));
-			if (dialog.WasCancelled())
-				break;
-
-			std::auto_ptr<GameListItem> iso_file(new GameListItem(rFilenames[i]));
-			const GameListItem& ISOFile = *iso_file;
-
-			if (ISOFile.IsValid())
-			{
-				bool list = true;
-
-				switch(ISOFile.GetPlatform())
-				{
-					case GameListItem::WII_DISC:
-						if (!SConfig::GetInstance().m_ListWii)
-							list = false;
-						break;
-					case GameListItem::WII_WAD:
-						if (!SConfig::GetInstance().m_ListWad)
-							list = false;
-						break;
-					default:
-						if (!SConfig::GetInstance().m_ListGC)
-							list = false;
-						break;
-				}
-
-				switch(ISOFile.GetCountry())
-				{
-					case DiscIO::IVolume::COUNTRY_TAIWAN:
-						if (!SConfig::GetInstance().m_ListTaiwan)
-							list = false;
-					case DiscIO::IVolume::COUNTRY_KOREA:
-						if (!SConfig::GetInstance().m_ListKorea)
-							list = false;
-						break;
-					case DiscIO::IVolume::COUNTRY_JAPAN:
-						if (!SConfig::GetInstance().m_ListJap)
-							list = false;
-						break;
-					case DiscIO::IVolume::COUNTRY_USA:
-						if (!SConfig::GetInstance().m_ListUsa)
-							list = false;
-						break;
-					case DiscIO::IVolume::COUNTRY_FRANCE:
-						if (!SConfig::GetInstance().m_ListFrance)
-							list = false;
-						break;
-					case DiscIO::IVolume::COUNTRY_ITALY:
-						if (!SConfig::GetInstance().m_ListItaly)
-							list = false;
-						break;
-					default:
-						if (!SConfig::GetInstance().m_ListPal)
-							list = false;
-						break;
-				}
-
-				if (list)
-					m_ISOFiles.push_back(iso_file.release());
-			}
-		}
-	}
-
-	if (SConfig::GetInstance().m_ListDrives)
-	{
-		const std::vector<std::string> drives = cdio_get_devices();
-
-		for (std::vector<std::string>::const_iterator iter = drives.begin(); iter != drives.end(); ++iter)
-		{
-			#ifdef __APPLE__
-			std::auto_ptr<GameListItem> gli(new GameListItem(*iter));
-			#else
-			std::unique_ptr<GameListItem> gli(new GameListItem(*iter));
-			#endif
-
-			if (gli->IsValid())
-				m_ISOFiles.push_back(gli.release());
-		}
-	}
-
-	std::sort(m_ISOFiles.begin(), m_ISOFiles.end());
-}
-
-void CGameListCtrl::OnColBeginDrag(wxListEvent& event)
-{
-	if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES)
-		event.Veto();
-}
-
-const GameListItem *CGameListCtrl::GetISO(size_t index) const
-{
-	if (index < m_ISOFiles.size())
-		return m_ISOFiles[index];
-	else
-		return NULL;
-}
-
-CGameListCtrl *caller;
-#if wxCHECK_VERSION(2, 9, 0)
-int wxCALLBACK wxListCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
-#else // 2.8.x
-int wxCALLBACK wxListCompare(long item1, long item2, long sortData)
-#endif
-{
-	// return 1 if item1 > item2
-	// return -1 if item1 < item2
-	// return 0 for identity
-	const GameListItem *iso1 = caller->GetISO(item1);
-	const GameListItem *iso2 = caller->GetISO(item2);
-
-	return CompareGameListItems(iso1, iso2, sortData);
-}
-
-void CGameListCtrl::OnColumnClick(wxListEvent& event)
-{
-	if(event.GetColumn() != COLUMN_BANNER)
-	{
-		int current_column = event.GetColumn();
-		if (sorted)
-		{
-			if (last_column == current_column)
-			{
-				last_sort = -last_sort;
-			}
-			else
-			{
-				SConfig::GetInstance().m_ListSort2 = last_sort;
-				last_column = current_column;
-				last_sort = current_column;
-			}
-			SConfig::GetInstance().m_ListSort = last_sort;
-		}
-		else
-		{
-			last_sort = current_column;
-			last_column = current_column;
-		}
-		caller = this;
-		SortItems(wxListCompare, last_sort);
-	}
-
-	SetBackgroundColor();
-
-	event.Skip();
-}
-
-// This is used by keyboard gamelist search
-void CGameListCtrl::OnKeyPress(wxListEvent& event)
-{
-	static int lastKey = 0, sLoop = 0;
-	int Loop = 0;
-
-	for (int i = 0; i < (int)m_ISOFiles.size(); i++)
-	{
-		// Easy way to get game string
-		wxListItem bleh;
-		bleh.SetId(i);
-		bleh.SetColumn(COLUMN_TITLE);
-		bleh.SetMask(wxLIST_MASK_TEXT);
-		GetItem(bleh);
-
-		wxString text = bleh.GetText();
-
-#ifdef __WXGTK__
-		if (text.MakeLower()[0] == event.GetKeyCode())
-#else
-		if (text.MakeUpper()[0] == event.GetKeyCode())
-#endif
-		{
-			if (lastKey == event.GetKeyCode() && Loop < sLoop)
-			{
-				Loop++;
-				if (i+1 == (int)m_ISOFiles.size())
-					i = -1;
-				continue;
-			}
-			else if (lastKey != event.GetKeyCode())
-			{
-				sLoop = 0;
-			}
-
-			lastKey = event.GetKeyCode();
-			sLoop++;
-
-			UnselectAll();
-			SetItemState(i, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED,
-					wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED);
-			EnsureVisible(i);
-			break;
-		}
-
-		// If we get past the last game in the list,
-		// we'll have to go back to the first one.
-		if (i+1 == (int)m_ISOFiles.size() && sLoop > 0 && Loop > 0)
-			i = -1;
-	}
-
-	event.Skip();
-}
-
-// This shows a little tooltip with the current Game's emulation state
-void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
-{
-	int flags;
-	long subitem = 0;
-	const long item = HitTest(event.GetPosition(), flags, &subitem);
-	static int lastItem = -1;
-
-	if (GetColumnCount() <= 1)
-		return;
-
-	if (item != wxNOT_FOUND)
-	{
-		wxRect Rect;
-#ifdef __WXMSW__
-		if (subitem == COLUMN_EMULATION_STATE)
-#else
-		// The subitem parameter of HitTest is only implemented for wxMSW.  On
-		// all other platforms it will always be -1.  Check the x position
-		// instead.
-		GetItemRect(item, Rect);
-		if (Rect.GetX() + Rect.GetWidth() - GetColumnWidth(COLUMN_EMULATION_STATE) < event.GetX())
-#endif
-		{
-			if (toolTip || lastItem == item || this != FindFocus())
-			{
-				if (lastItem != item) lastItem = -1;
-				event.Skip();
-				return;
-			}
-
-			// Emulation status
-			static const char* const emuState[] = { "Broken", "Intro", "In-Game", "Playable", "Perfect" };
-
-			const GameListItem& rISO = *m_ISOFiles[GetItemData(item)];
-
-			const int emu_state = rISO.GetEmuState();
-			const std::string& issues = rISO.GetIssues();
-
-			// Show a tooltip containing the EmuState and the state description
-			if (emu_state > 0 && emu_state < 6)
-			{
-				char temp[2048];
-				sprintf(temp, "^ %s%s%s", emuState[emu_state - 1],
-						issues.size() > 0 ? " :\n" : "", issues.c_str());
-				toolTip = new wxEmuStateTip(this, StrToWxStr(temp), &toolTip);
-			}
-			else
-			{
-				toolTip = new wxEmuStateTip(this, _("Not Set"), &toolTip);
-			}
-
-			// Get item Coords
-			GetItemRect(item, Rect);
-			int mx = Rect.GetWidth();
-			int my = Rect.GetY();
-#ifndef __WXMSW__
-			// For some reason the y position does not account for the header
-			// row, so subtract the y position of the first visible item.
-			GetItemRect(GetTopItem(), Rect);
-			my -= Rect.GetY();
-#endif
-			// Convert to screen coordinates
-			ClientToScreen(&mx, &my);
-			toolTip->SetBoundingRect(wxRect(mx - GetColumnWidth(COLUMN_EMULATION_STATE),
-						my, GetColumnWidth(COLUMN_EMULATION_STATE), Rect.GetHeight()));
-			toolTip->SetPosition(wxPoint(mx - GetColumnWidth(COLUMN_EMULATION_STATE),
-						my - 5 + Rect.GetHeight()));
-			lastItem = item;
-		}
-	}
-	if (!toolTip)
-		lastItem = -1;
-
-	event.Skip();
-}
-
-void CGameListCtrl::OnLeftClick(wxMouseEvent& event)
-{
-	// Focus the clicked item.
-	int flags;
-	long item = HitTest(event.GetPosition(), flags);
-	if ((item != wxNOT_FOUND) && (GetSelectedItemCount() == 0) &&
-			(!event.ControlDown()) && (!event.ShiftDown()))
-	{
-		SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
-		wxGetApp().GetCFrame()->UpdateGUI();
-	}
-
-	event.Skip();
-}
-
-void CGameListCtrl::OnRightClick(wxMouseEvent& event)
-{	
-	// Focus the clicked item.
-	int flags;
-	long item = HitTest(event.GetPosition(), flags);
-	if (item != wxNOT_FOUND)
-	{
-		if (GetItemState(item, wxLIST_STATE_SELECTED) != wxLIST_STATE_SELECTED)
-		{
-			UnselectAll();
-			SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-		}
-		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
-	}
-	if (GetSelectedItemCount() == 1)
-	{
-		const GameListItem *selected_iso = GetSelectedISO();
-		if (selected_iso)
-		{
-			wxMenu* popupMenu = new wxMenu;
-			popupMenu->Append(IDM_PROPERTIES, _("&Properties"));
-			popupMenu->Append(IDM_GAMEWIKI, _("&Wiki"));
-			popupMenu->AppendSeparator();
-
-			if (selected_iso->GetPlatform() != GameListItem::GAMECUBE_DISC)
-			{
-				popupMenu->Append(IDM_OPENSAVEFOLDER, _("Open Wii &save folder"));
-				popupMenu->Append(IDM_EXPORTSAVE, _("Export Wii save (Experimental)"));
-			}
-			popupMenu->Append(IDM_OPENCONTAININGFOLDER, _("Open &containing folder"));
-			popupMenu->AppendCheckItem(IDM_SETDEFAULTGCM, _("Set as &default ISO"));
-
-			// First we have to decide a starting value when we append it
-			if(selected_iso->GetFileName() == SConfig::GetInstance().
-				m_LocalCoreStartupParameter.m_strDefaultGCM)
-				popupMenu->FindItem(IDM_SETDEFAULTGCM)->Check();
-
-			popupMenu->AppendSeparator();
-			popupMenu->Append(IDM_DELETEGCM, _("&Delete ISO..."));
-
-			if (selected_iso->GetPlatform() != GameListItem::WII_WAD)
-			{
-				if (selected_iso->IsCompressed())
-					popupMenu->Append(IDM_COMPRESSGCM, _("Decompress ISO..."));
-				else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" 
-						 && selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs")
-					popupMenu->Append(IDM_COMPRESSGCM, _("Compress ISO..."));
-			}
-			else
-			{
-				popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu"));
-			}
-
-			PopupMenu(popupMenu);
-		}
-	}
-	else if (GetSelectedItemCount() > 1)
-	{
-		wxMenu* popupMenu = new wxMenu;
-		popupMenu->Append(IDM_DELETEGCM, _("&Delete selected ISOs..."));
-		popupMenu->AppendSeparator();
-		popupMenu->Append(IDM_MULTICOMPRESSGCM, _("Compress selected ISOs..."));
-		popupMenu->Append(IDM_MULTIDECOMPRESSGCM, _("Decompress selected ISOs..."));
-		PopupMenu(popupMenu);
-	}
-}
-
-const GameListItem * CGameListCtrl::GetSelectedISO()
-{
-	if (m_ISOFiles.size() == 0)
-	{
-		return NULL;
-	}
-	else if (GetSelectedItemCount() == 0)
-	{
-		return NULL;
-	}
-	else
-	{
-		long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == wxNOT_FOUND)
-		{
-			return NULL;
-		}
-		else
-		{
-			// Here is a little workaround for multiselections:
-			// when > 1 item is selected, return info on the first one
-			// and deselect it so the next time GetSelectedISO() is called,
-			// the next item's info is returned
-			if (GetSelectedItemCount() > 1)
-				SetItemState(item, 0, wxLIST_STATE_SELECTED);
-
-			return m_ISOFiles[GetItemData(item)];
-		}
-	}
-}
-
-void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso)
-		return;
-
-	wxFileName path = wxFileName::FileName(StrToWxStr(iso->GetFileName()));
-	path.MakeAbsolute();
-	WxUtils::Explore(path.GetPath().char_str());
-}
-
-void CGameListCtrl::OnOpenSaveFolder(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso)
-		return;
-	std::string path = iso->GetWiiFSPath();
-	if (!path.empty())
-		WxUtils::Explore(path.c_str());
-}
-
-void CGameListCtrl::OnExportSave(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso =  GetSelectedISO();
-	if (!iso)
-		return;
-	u64 title;
-	DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(iso->GetFileName());
-	if (Iso)
-	{
-		if (Iso->GetTitleID((u8*)&title))
-		{
-			title = Common::swap64(title);
-			CWiiSaveCrypted::ExportWiiSave(title);
-		}
-		delete Iso;
-	}
-}
-
-// Save this file as the default file
-void CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& event)
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso) return;
-
-	if (event.IsChecked())
-	{
-		// Write the new default value and save it the ini file
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM =
-			iso->GetFileName();
-		SConfig::GetInstance().SaveSettings();
-	}
-	else
-	{
-		// Otherwise blank the value and save it
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = "";
-		SConfig::GetInstance().SaveSettings();
-	}
-}
-
-void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event))
-{
-	if (GetSelectedItemCount() == 1)
-	{
-		const GameListItem *iso = GetSelectedISO();
-		if (!iso)
-			return;
-		if (wxMessageBox(_("Are you sure you want to delete this file?  It will be gone forever!"),
-					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
-		{
-			File::Delete(iso->GetFileName());
-			Update();
-		}
-	}
-	else
-	{
-		if (wxMessageBox(_("Are you sure you want to delete these files?\nThey will be gone forever!"),
-					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
-		{
-			int selected = GetSelectedItemCount();
-
-			for (int i = 0; i < selected; i++)
-			{
-				const GameListItem *iso = GetSelectedISO();
-				File::Delete(iso->GetFileName());
-			}
-			Update();
-		}
-	}
-}
-
-void CGameListCtrl::OnProperties(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso)
-		return;
-
-	CISOProperties ISOProperties(iso->GetFileName(), this);
-	if(ISOProperties.ShowModal() == wxID_OK)
-		Update();
-}
-
-void CGameListCtrl::OnWiki(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso)
-		return;
-
-	std::string wikiUrl = "http://wiki.dolphin-emu.org/dolphin-redirect.php?gameid=[GAME_ID]";
-	wikiUrl = ReplaceAll(wikiUrl, "[GAME_ID]", UriEncode(iso->GetUniqueID()));
-	if (UriEncode(iso->GetName(0)).length() < 100)
-		wikiUrl = ReplaceAll(wikiUrl, "[GAME_NAME]", UriEncode(iso->GetName(0)));
-	else
-		wikiUrl = ReplaceAll(wikiUrl, "[GAME_NAME]", "");
-
-	WxUtils::Launch(wikiUrl.c_str());
-}
-
-void CGameListCtrl::MultiCompressCB(const char* text, float percent, void* arg)
-{
-	percent = (((float)m_currentItem) + percent) / (float)m_numberItem;
-	wxString textString(StrToWxStr(StringFromFormat("%s (%i/%i) - %s",
-				m_currentFilename.c_str(), (int)m_currentItem+1,
-				(int)m_numberItem, text)));
-
-	((wxProgressDialog*)arg)->Update((int)(percent*1000), textString);
-}
-
-void CGameListCtrl::OnMultiCompressGCM(wxCommandEvent& /*event*/)
-{
-	CompressSelection(true);
-}
-
-void CGameListCtrl::OnMultiDecompressGCM(wxCommandEvent& /*event*/)
-{
-	CompressSelection(false);
-}
-
-void CGameListCtrl::CompressSelection(bool _compress)
-{
-	wxString dirHome;
-	wxGetHomeDir(&dirHome);
-
-	wxDirDialog browseDialog(this, _("Browse for output directory"), dirHome,
-			wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
-	if (browseDialog.ShowModal() != wxID_OK)
-		return;
-
-	bool all_good = true;
-
-	{
-	wxProgressDialog progressDialog(
-		_compress ? _("Compressing ISO") : _("Decompressing ISO"),
-		_("Working..."),
-		1000,
-		this,
-		wxPD_APP_MODAL |
-		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
-		wxPD_SMOOTH
-		);
-
-	m_currentItem = 0;
-	m_numberItem = GetSelectedItemCount();
-	for (u32 i=0; i < m_numberItem; i++)
-	{
-		const GameListItem *iso = GetSelectedISO();
-
-			if (!iso->IsCompressed() && _compress)
-			{
-				std::string FileName, FileExt;
-				SplitPath(iso->GetFileName(), NULL, &FileName, &FileExt);
-				m_currentFilename = FileName;
-				FileName.append(".gcz");
-
-				std::string OutputFileName;
-				BuildCompleteFilename(OutputFileName,
-						WxStrToStr(browseDialog.GetPath()),
-						FileName);
-
-				if (wxFileExists(StrToWxStr(OutputFileName)) &&
-						wxMessageBox(
-							wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
-								StrToWxStr(OutputFileName)), 
-							_("Confirm File Overwrite"),
-							wxYES_NO) == wxNO)
-					continue;
-
-				all_good &= DiscIO::CompressFileToBlob(iso->GetFileName().c_str(),
-						OutputFileName.c_str(),
-						(iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0,
-						16384, &MultiCompressCB, &progressDialog);
-			}
-			else if (iso->IsCompressed() && !_compress)
-			{
-				std::string FileName, FileExt;
-				SplitPath(iso->GetFileName(), NULL, &FileName, &FileExt);
-				m_currentFilename = FileName;
-				if (iso->GetPlatform() == GameListItem::WII_DISC)
-					FileName.append(".iso");
-				else
-					FileName.append(".gcm");
-
-				std::string OutputFileName;
-				BuildCompleteFilename(OutputFileName,
-						WxStrToStr(browseDialog.GetPath()),
-						FileName);
-
-				if (wxFileExists(StrToWxStr(OutputFileName)) &&
-						wxMessageBox(
-							wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"),
-								StrToWxStr(OutputFileName)), 
-							_("Confirm File Overwrite"),
-							wxYES_NO) == wxNO)
-					continue;
-
-				all_good &= DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(),
-						OutputFileName.c_str(), &MultiCompressCB, &progressDialog);
-			}
-			m_currentItem++;
-	}
-	}
-
-	if (!all_good)
-		wxMessageBox(_("Dolphin was unable to complete the requested action."));
-
-	Update();
-}
-
-void CGameListCtrl::CompressCB(const char* text, float percent, void* arg)
-{
-	((wxProgressDialog*)arg)->
-		Update((int)(percent*1000), StrToWxStr(text));
-}
-
-void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
-{
-	const GameListItem *iso = GetSelectedISO();
-	if (!iso)
-		return;
-
-	wxString path;
-
-	std::string FileName, FilePath, FileExtension;
-	SplitPath(iso->GetFileName(), &FilePath, &FileName, &FileExtension);
-
-	do
-	{
-		if (iso->IsCompressed())
-		{
-			wxString FileType;
-			if (iso->GetPlatform() == GameListItem::WII_DISC)
-				FileType = _("All Wii ISO files (iso)") + wxString(wxT("|*.iso"));
-			else
-				FileType = _("All Gamecube GCM files (gcm)") + wxString(wxT("|*.gcm"));
-
-			path = wxFileSelector(
-					_("Save decompressed GCM/ISO"),
-					StrToWxStr(FilePath),
-					StrToWxStr(FileName) + FileType.After('*'),
-					wxEmptyString,
-					FileType + wxT("|") + wxGetTranslation(wxALL_FILES),
-					wxFD_SAVE,
-					this);
-		}
-		else
-		{
-			path = wxFileSelector(
-					_("Save compressed GCM/ISO"),
-					StrToWxStr(FilePath),
-					StrToWxStr(FileName) + _T(".gcz"),
-					wxEmptyString,
-					_("All compressed GC/Wii ISO files (gcz)") + 
-						wxString::Format(wxT("|*.gcz|%s"), wxGetTranslation(wxALL_FILES)),
-					wxFD_SAVE,
-					this);
-		}
-		if (!path)
-			return;
-	} while (wxFileExists(path) &&
-			wxMessageBox(
-				wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), path.c_str()), 
-				_("Confirm File Overwrite"),
-				wxYES_NO) == wxNO);
-
-	bool all_good = false;
-
-	{
-	wxProgressDialog dialog(
-		iso->IsCompressed() ? _("Decompressing ISO") : _("Compressing ISO"),
-		_("Working..."),
-		1000,
-		this,
-		wxPD_APP_MODAL |
-		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
-		wxPD_SMOOTH
-		);
-
-
-	if (iso->IsCompressed())
-		all_good = DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(),
-				path.char_str(), &CompressCB, &dialog);
-	else
-		all_good = DiscIO::CompressFileToBlob(iso->GetFileName().c_str(),
-				path.char_str(),
-				(iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0,
-				16384, &CompressCB, &dialog);
-	}
-
-	if (!all_good)
-		wxMessageBox(_("Dolphin was unable to complete the requested action."));
-
-	Update();
-}
-
-void CGameListCtrl::OnSize(wxSizeEvent& event)
-{
-	if (lastpos == event.GetSize())
-		return;
-
-	lastpos = event.GetSize();
-	AutomaticColumnWidth();
-
-	event.Skip();
-}
-
-void CGameListCtrl::AutomaticColumnWidth()
-{
-	wxRect rc(GetClientRect());
-
-	if (GetColumnCount() == 1)
-	{
-		SetColumnWidth(0, rc.GetWidth());
-	}
-	else if (GetColumnCount() > 4)
-	{
-		int resizable = rc.GetWidth() - (
-			GetColumnWidth(COLUMN_BANNER)
-			+ GetColumnWidth(COLUMN_COUNTRY)
-			+ GetColumnWidth(COLUMN_SIZE)
-			+ GetColumnWidth(COLUMN_EMULATION_STATE)
-			+ GetColumnWidth(COLUMN_PLATFORM));
-
-		// We hide the Notes column if the window is too small
-		if (resizable > 400)
-		{
-			SetColumnWidth(COLUMN_TITLE, resizable / 2);
-			SetColumnWidth(COLUMN_NOTES, resizable / 2);
-		}
-		else
-		{
-			SetColumnWidth(COLUMN_TITLE, resizable);
-			SetColumnWidth(COLUMN_NOTES, 0);
-		}
-	}
-}
-
-void CGameListCtrl::UnselectAll()
-{
-	for (int i=0; i<GetItemCount(); i++)
-	{
-		SetItemState(i, 0, wxLIST_STATE_SELECTED);
-	}
-}
-
-void CGameListCtrl::OnDropFiles(wxDropFilesEvent& event)
-{
-	if (event.GetNumberOfFiles() != 1)
-		return;
-	if (File::IsDirectory(WxStrToStr(event.GetFiles()[0])))
-		return;
-
-	wxFileName file = event.GetFiles()[0];
-
-	if (file.GetExt() == "dtm")
-	{
-		if (Core::IsRunning())
-			return;
-
-		if (!Movie::IsReadOnly())
-		{
-			// let's make the read-only flag consistent at the start of a movie.
-			Movie::SetReadOnly(true);
-			main_frame->GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(true);
-		}
-
-		if (Movie::PlayInput(file.GetFullPath().c_str()))
-			main_frame->BootGame(std::string(""));
-	}
-	else if (!Core::IsRunning())
-	{
-		main_frame->BootGame(WxStrToStr(file.GetFullPath()));
-	}
-	else
-	{
-		DVDInterface::ChangeDisc(WxStrToStr(file.GetFullPath()).c_str());
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h
deleted file mode 100644
index ad46ec6d67..0000000000
--- a/Source/Core/DolphinWX/Src/GameListCtrl.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __GAMELIST_CTRL_H_
-#define __GAMELIST_CTRL_H_
-
-#include <memory>
-#include <vector>
-
-#include <wx/listctrl.h>
-#include <wx/tipwin.h>
-
-#include "ISOFile.h"
-#include "MemoryCards/WiiSaveCrypted.h"
-
-class wxEmuStateTip : public wxTipWindow
-{
-public:
-	wxEmuStateTip(wxWindow* parent, const wxString& text, wxEmuStateTip** windowPtr)
-		: wxTipWindow(parent, text, 70, (wxTipWindow**)windowPtr) {}
-	// wxTipWindow doesn't correctly handle KeyEvents and crashes... we must overload that.
-	void OnKeyDown(wxKeyEvent& event) { event.StopPropagation(); Close(); }
-private:
-	DECLARE_EVENT_TABLE()
-};
-
-class CGameListCtrl : public wxListCtrl
-{
-public:
-
-	CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
-	~CGameListCtrl();
-
-	void Update();
-
-	void BrowseForDirectory();
-	const GameListItem *GetSelectedISO();
-	const GameListItem *GetISO(size_t index) const;
-
-	enum
-	{
-		COLUMN_DUMMY = 0,
-		COLUMN_PLATFORM,
-		COLUMN_BANNER,
-		COLUMN_TITLE,
-		COLUMN_NOTES,
-		COLUMN_COUNTRY,
-		COLUMN_SIZE,
-		COLUMN_EMULATION_STATE,
-		NUMBER_OF_COLUMN
-	};
-
-private:
-
-	std::vector<int> m_FlagImageIndex;
-	std::vector<int> m_PlatformImageIndex;
-	std::vector<int> m_EmuStateImageIndex;
-	std::vector<GameListItem*> m_ISOFiles;
-
-	void ClearIsoFiles()
-	{
-		while (!m_ISOFiles.empty())	// so lazy
-		{
-			delete m_ISOFiles.back();
-			m_ISOFiles.pop_back();
-		}
-	}
-
-	int last_column;
-	int last_sort;
-	wxSize lastpos;
-	wxEmuStateTip *toolTip;
-	void InitBitmaps();
-	void InsertItemInReportView(long _Index);
-	void SetBackgroundColor();
-	void ScanForISOs();
-	
-	DECLARE_EVENT_TABLE()
-
-	// events
-	void OnLeftClick(wxMouseEvent& event);
-	void OnRightClick(wxMouseEvent& event);
-	void OnMouseMotion(wxMouseEvent& event);
-	void OnColumnClick(wxListEvent& event);
-	void OnColBeginDrag(wxListEvent& event);
-	void OnKeyPress(wxListEvent& event);
-	void OnSize(wxSizeEvent& event);
-	void OnProperties(wxCommandEvent& event);
-	void OnWiki(wxCommandEvent& event);
-	void OnOpenContainingFolder(wxCommandEvent& event);
-	void OnOpenSaveFolder(wxCommandEvent& event);
-	void OnExportSave(wxCommandEvent& event);
-	void OnSetDefaultGCM(wxCommandEvent& event);
-	void OnDeleteGCM(wxCommandEvent& event);
-	void OnCompressGCM(wxCommandEvent& event);
-	void OnMultiCompressGCM(wxCommandEvent& event);
-	void OnMultiDecompressGCM(wxCommandEvent& event);
-	void OnInstallWAD(wxCommandEvent& event);
-	void OnDropFiles(wxDropFilesEvent& event);
-
-	void CompressSelection(bool _compress);
-	void AutomaticColumnWidth();
-	void UnselectAll();
-
-	static size_t m_currentItem;
-	static std::string m_currentFilename;
-	static size_t m_numberItem;
-	static void CompressCB(const char* text, float percent, void* arg);
-	static void MultiCompressCB(const char* text, float percent, void* arg);
-};
-
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
deleted file mode 100644
index 39130bcf8e..0000000000
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GeckoCodeDiag.h"
-#include "Core.h"
-#include "WxUtils.h"
-
-#include <SFML/Network/Http.hpp>
-
-#include <sstream>
-
-namespace Gecko
-{
-
-static const wxString wxstr_name(wxTRANSLATE("Name: ")),
-	wxstr_notes(wxTRANSLATE("Notes: ")),
-	wxstr_creator(wxTRANSLATE("Creator: "));
-
-CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
-	: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
-{
-	m_listbox_gcodes = new wxCheckListBox(this, -1, wxDefaultPosition, wxDefaultSize);
-	m_listbox_gcodes->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &CodeConfigPanel::UpdateInfoBox, this);
-	m_listbox_gcodes->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &CodeConfigPanel::ToggleCode, this);
-
-	m_infobox.label_name = new wxStaticText(this, -1, wxGetTranslation(wxstr_name));
-	m_infobox.label_creator = new wxStaticText(this, -1, wxGetTranslation(wxstr_creator));
-	m_infobox.label_notes = new wxStaticText(this, -1, wxGetTranslation(wxstr_notes));
-	m_infobox.textctrl_notes = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(64, -1), wxTE_MULTILINE | wxTE_READONLY);
-	m_infobox.listbox_codes = new wxListBox(this, -1, wxDefaultPosition, wxSize(-1, 64));
-
-	// TODO: buttons to add/edit codes
-
-	// sizers
-	wxBoxSizer* const sizer_infobox = new wxBoxSizer(wxVERTICAL);
-	sizer_infobox->Add(m_infobox.label_name, 0, wxBOTTOM, 5);
-	sizer_infobox->Add(m_infobox.label_creator, 0,  wxBOTTOM, 5);
-	sizer_infobox->Add(m_infobox.label_notes, 0, wxBOTTOM, 5);
-	sizer_infobox->Add(m_infobox.textctrl_notes, 0, wxBOTTOM | wxEXPAND, 5);
-	sizer_infobox->Add(m_infobox.listbox_codes, 1, wxEXPAND, 5);
-
-	// button sizer
-	wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL);
-	btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
-	btn_download->Enable(false);
-	btn_download->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CodeConfigPanel::DownloadCodes, this);
-	sizer_buttons->AddStretchSpacer(1);
-	sizer_buttons->Add(btn_download, 1, wxEXPAND);
-
-	// horizontal sizer
-	wxBoxSizer* const sizer_vert = new wxBoxSizer(wxVERTICAL);
-	sizer_vert->Add(sizer_infobox, 1, wxEXPAND);
-	sizer_vert->Add(sizer_buttons, 0, wxEXPAND | wxTOP, 5);
-	
-	wxBoxSizer* const sizer_main = new wxBoxSizer(wxVERTICAL);
-	sizer_main->Add(m_listbox_gcodes, 1, wxALL | wxEXPAND, 5);
-	sizer_main->Add(sizer_vert, 0, wxALL | wxEXPAND, 5);
-
-	SetSizerAndFit(sizer_main);
-}
-
-void CodeConfigPanel::UpdateCodeList(bool checkRunning)
-{
-	// disable the button if it doesn't have an effect
-	btn_download->Enable((!checkRunning || Core::IsRunning()) && !m_gameid.empty());
-
-	m_listbox_gcodes->Clear();
-	// add the codes to the listbox
-	std::vector<GeckoCode>::const_iterator
-		gcodes_iter = m_gcodes.begin(),
-		gcodes_end = m_gcodes.end();
-	for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
-	{
-		m_listbox_gcodes->Append(StrToWxStr(gcodes_iter->name));
-		if (gcodes_iter->enabled)
-			m_listbox_gcodes->Check(m_listbox_gcodes->GetCount()-1, true);
-	}
-	
-	wxCommandEvent evt;
-	UpdateInfoBox(evt);
-}
-
-void CodeConfigPanel::LoadCodes(const IniFile& inifile, const std::string& gameid, bool checkRunning)
-{
-	m_gameid = gameid;
-
-	m_gcodes.clear();
-	if (!checkRunning || Core::IsRunning())
-		Gecko::LoadCodes(inifile, m_gcodes);
-
-	UpdateCodeList(checkRunning);
-}
-
-void CodeConfigPanel::ToggleCode(wxCommandEvent& evt)
-{
-	const int sel = evt.GetInt();	// this right?
-	if (sel > -1)
-		m_gcodes[sel].enabled = m_listbox_gcodes->IsChecked(sel);
-}
-
-void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&)
-{
-	m_infobox.listbox_codes->Clear();
-	const int sel = m_listbox_gcodes->GetSelection();
-
-	if (sel > -1)
-	{
-		m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name) + StrToWxStr(m_gcodes[sel].name));
-
-		// notes textctrl
-		m_infobox.textctrl_notes->Clear();
-		std::vector<std::string>::const_iterator
-			notes_iter = m_gcodes[sel].notes.begin(),
-			notes_end = m_gcodes[sel].notes.end();
-		for (; notes_iter!=notes_end; ++notes_iter)
-			m_infobox.textctrl_notes->AppendText(StrToWxStr(*notes_iter));
-		m_infobox.textctrl_notes->ScrollLines(-99);	// silly
-
-		m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + StrToWxStr(m_gcodes[sel].creator));
-
-		// add codes to info listbox
-		std::vector<GeckoCode::Code>::const_iterator
-		codes_iter = m_gcodes[sel].codes.begin(),
-		codes_end = m_gcodes[sel].codes.end();
-		for (; codes_iter!=codes_end; ++codes_iter)
-			m_infobox.listbox_codes->Append(wxString::Format(wxT("%08X %08X"), codes_iter->address, codes_iter->data));
-	}
-	else
-	{
-		m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name));
-		m_infobox.textctrl_notes->Clear();
-		m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator));
-	}
-}
-
-//void CodeConfigPanel::ApplyChanges(wxCommandEvent&)
-//{
-//	Gecko::SetActiveCodes(m_gcodes);
-//}
-
-void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
-{
-	if (m_gameid.empty())
-		return;
-
-	std::string gameid = m_gameid;
-
-	
-	switch (m_gameid[0])
-	{
-	case 'R':
-	case 'S':
-	case 'G':
-		break;
-	default:
-	// All channels (WiiWare, VirtualConsole, etc) are identified by their first four characters
-		gameid = m_gameid.substr(0, 4);
-		break;
-	}
-
-	sf::Http::Request req;
-	req.SetURI("/txt.php?txt=" + gameid);
-
-	sf::Http http;
-	http.SetHost("geckocodes.org");
-
-	const sf::Http::Response resp = http.SendRequest(req, 5.0f);
-
-	if (sf::Http::Response::Ok == resp.GetStatus())
-	{
-		// temp vector containing parsed codes
-		std::vector<GeckoCode>	gcodes;
-
-		// parse the codes
-		std::istringstream ss(resp.GetBody());
-
-		// debug
-		//PanicAlert("File size is %i bytes.", ss.str().size());
-
-		std::string line;
-
-		// make sure the txt file is for this game
-		// eh w/e
-		//std::getline(ss, line);
-		//if (line != m_gameid)
-		//	PanicAlert("Bad code file.");
-
-		// seek past the header, get to the first code
-		std::getline(ss, line);
-		std::getline(ss, line);
-		std::getline(ss, line);
-
-		int read_state = 0;
-		GeckoCode gcode;
-
-		while ((std::getline(ss, line).good()))
-		{
-			// empty line
-			if (0 == line.size() || line == "\r" || line == "\n")	// \r\n checks might not be needed
-			{
-				// add the code
-				if (gcode.codes.size())
-					gcodes.push_back(gcode);
-				gcode = GeckoCode();
-				read_state = 0;
-				continue;
-			}
-
-			switch (read_state)
-			{
-				// read new code
-			case 0 :
-			{
-				std::istringstream ssline(line);
-				// stop at [ character (beginning of contributor name)
-				std::getline(ssline, gcode.name, '[');
-				gcode.name = StripSpaces(gcode.name);
-				// read the code creator name
-				std::getline(ssline, gcode.creator, ']');
-				read_state = 1;
-			}
-				break;
-
-				// read code lines
-			case 1 :
-			{
-				std::istringstream ssline(line);	
-				std::string addr, data;
-				ssline >> addr >> data;
-				ssline.seekg(0);
-
-				// check if this line a code, silly, but the dumb txt file comment lines can start with valid hex chars :/
-				if (8 == addr.length() && 8 == data.length())
-				{
-					GeckoCode::Code new_code;
-					new_code.original_line = line;
-					ssline >> std::hex >> new_code.address >> new_code.data;
-					gcode.codes.push_back(new_code);
-				}
-				else
-				{
-					gcode.notes.push_back(line);
-					read_state = 2;	// start reading comments
-				}
-
-			}
-				break;
-
-				// read comment lines
-			case 2 :
-				// append comment line
-				gcode.notes.push_back(line);
-				break;
-
-			}
-		}
-
-		// add the last code
-		if (gcode.codes.size())
-			gcodes.push_back(gcode);
-
-		if (gcodes.size())
-		{
-			unsigned long added_count = 0;
-
-			// append the codes to the code list
-			std::vector<GeckoCode>::const_iterator
-				gcodes_iter = gcodes.begin(),
-				gcodes_end = gcodes.end();
-			for (; gcodes_iter!= gcodes_end; ++gcodes_iter)
-			{
-				// only add codes which do not already exist
-				std::vector<GeckoCode>::const_iterator
-					existing_gcodes_iter = m_gcodes.begin(),
-					existing_gcodes_end = m_gcodes.end();
-				for (;; ++existing_gcodes_iter)
-				{
-					if (existing_gcodes_end == existing_gcodes_iter)
-					{
-						m_gcodes.push_back(*gcodes_iter);
-						++added_count;
-						break;
-					}
-
-					// code exists
-					if (existing_gcodes_iter->Compare(*gcodes_iter))
-						break;
-				}
-			}
-
-			PanicAlertT("Downloaded %lu codes. (added %lu)",
-				(unsigned long)gcodes.size(), added_count);
-
-			// refresh the list
-			UpdateCodeList();
-		}
-		else
-		{
-			PanicAlertT("File contained no codes.");
-		}
-	}
-	else
-	{
-		PanicAlertT("Failed to download codes.");
-	}
-}
-
-}
-
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
deleted file mode 100644
index 0140966c5e..0000000000
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __GECKOCODEDIAG_h__
-#define __GECKOCODEDIAG_h__
-
-#include "GeckoCode.h"
-#include "GeckoCodeConfig.h"
-
-#include "wx/wx.h"
-
-namespace Gecko
-{
-
-
-class CodeConfigPanel : public wxPanel
-{
-public:
-	CodeConfigPanel(wxWindow* const parent);
-
-
-	void LoadCodes(const IniFile& inifile, const std::string& gameid = "", bool checkRunning = false);
-	const std::vector<GeckoCode>& GetCodes() const { return m_gcodes; }
-
-protected:
-	void UpdateInfoBox(wxCommandEvent&);
-	void ToggleCode(wxCommandEvent& evt);
-	void DownloadCodes(wxCommandEvent&);
-	//void ApplyChanges(wxCommandEvent&);
-
-	void UpdateCodeList(bool checkRunning = false);
-
-private:
-	std::vector<GeckoCode> m_gcodes;
-
-	std::string m_gameid;
-
-	// wxwidgets stuff
-	wxCheckListBox	*m_listbox_gcodes;
-	struct
-	{
-		wxStaticText	*label_name, *label_notes, *label_creator;
-		wxTextCtrl		*textctrl_notes;
-		wxListBox	*listbox_codes;
-	} m_infobox;
-	wxButton* btn_download;
-};
-
-
-
-}
-
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
deleted file mode 100644
index 42c0154405..0000000000
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ /dev/null
@@ -1,285 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// This file holds global data for DolphinWx and DebuggerWx
-
-
-#ifndef _WX_GLOBALS_H
-#define _WX_GLOBALS_H
-
-#include "Common.h"
-
-enum
-{
-	Toolbar_Step,
-	Toolbar_StepOver,
-	Toolbar_Skip,
-	Toolbar_GotoPC,
-	Toolbar_SetPC,
-	ToolbarDebugBitmapMax
-};
-
-enum
-{
-	IDM_LOADSTATE = 200, // File menu
-	IDM_SAVESTATE,
-	IDM_SAVEFIRSTSTATE,
-	IDM_UNDOLOADSTATE,
-	IDM_UNDOSAVESTATE,
-	IDM_LOADSTATEFILE,
-	IDM_SAVESTATEFILE,
-	IDM_SAVESLOT1,
-	IDM_SAVESLOT2,
-	IDM_SAVESLOT3,
-	IDM_SAVESLOT4,
-	IDM_SAVESLOT5,
-	IDM_SAVESLOT6,
-	IDM_SAVESLOT7,
-	IDM_SAVESLOT8,
-	IDM_SAVESLOT9,
-	IDM_SAVESLOT10,
-	IDM_LOADSLOT1,
-	IDM_LOADSLOT2,
-	IDM_LOADSLOT3,
-	IDM_LOADSLOT4,
-	IDM_LOADSLOT5,
-	IDM_LOADSLOT6,
-	IDM_LOADSLOT7,
-	IDM_LOADSLOT8,
-	IDM_LOADSLOT9,
-	IDM_LOADSLOT10,
-	IDM_LOADLAST1,
-	IDM_LOADLAST2,
-	IDM_LOADLAST3,
-	IDM_LOADLAST4,
-	IDM_LOADLAST5,
-	IDM_LOADLAST6,
-	IDM_LOADLAST7,
-	IDM_LOADLAST8,
-	IDM_FRAMESKIP0,
-	IDM_FRAMESKIP1,
-	IDM_FRAMESKIP2,
-	IDM_FRAMESKIP3,
-	IDM_FRAMESKIP4,
-	IDM_FRAMESKIP5,
-	IDM_FRAMESKIP6,
-	IDM_FRAMESKIP7,
-	IDM_FRAMESKIP8,
-	IDM_FRAMESKIP9,
-	IDM_PLAY,
-	IDM_STOP,
-	IDM_RESET,
-	IDM_TOGGLE_FULLSCREEN,
-	IDM_RECORD,
-	IDM_PLAYRECORD,
-	IDM_RECORDEXPORT,
-	IDM_RECORDREADONLY,
-	IDM_TASINPUT,
-	IDM_TOGGLE_PAUSEMOVIE,
-	IDM_SHOWLAG,
-	IDM_FRAMESTEP,
-	IDM_SCREENSHOT,
-	IDM_BROWSE,
-	IDM_DRIVES,
-	IDM_DRIVE1,
-	IDM_DRIVE24 = IDM_DRIVE1 + 23,//248,
-
-	IDM_MEMCARD, // Tools menu
-	IDM_CHEATS,
-	IDM_NETPLAY,
-	IDM_RESTART,
-	IDM_CHANGEDISC,
-	IDM_PROPERTIES,
-	IDM_GAMEWIKI,
-	IDM_LOAD_WII_MENU,
-	IDM_MENU_INSTALLWAD,
-	IDM_LIST_INSTALLWAD,
-	IDM_FIFOPLAYER,
-	IDM_CONNECT_WIIMOTE1,
-	IDM_CONNECT_WIIMOTE2,
-	IDM_CONNECT_WIIMOTE3,
-	IDM_CONNECT_WIIMOTE4,
-	IDM_CONNECT_BALANCEBOARD,
-
-	IDM_LISTWAD,
-	IDM_LISTWII,
-	IDM_LISTGC,
-	IDM_LISTJAP,
-	IDM_LISTPAL,
-	IDM_LISTUSA,
-	IDM_LISTFRANCE,
-	IDM_LISTITALY,
-	IDM_LISTKOREA,
-	IDM_LISTTAIWAN,
-	IDM_LIST_UNK,
-	IDM_LISTDRIVES,
-	IDM_PURGECACHE,
-
-	IDM_HELPWEBSITE, // Help menu
-	IDM_HELPONLINEDOCS,
-	IDM_HELPGOOGLECODE,
-
-	IDM_CONFIG_GFX_BACKEND,
-	IDM_CONFIG_DSP_EMULATOR,
-	IDM_CONFIG_PAD_PLUGIN,
-	IDM_CONFIG_WIIMOTE_PLUGIN,
-	IDM_CONFIG_HOTKEYS,
-	IDM_CONFIG_LOGGER,
-
-	// Views	
-	IDM_LOGWINDOW,
-	IDM_LOGCONFIGWINDOW,
-	IDM_CONSOLEWINDOW,
-	IDM_REGISTERWINDOW,
-	IDM_BREAKPOINTWINDOW,
-	IDM_MEMORYWINDOW,
-	IDM_JITWINDOW,
-	IDM_SOUNDWINDOW,
-	IDM_VIDEOWINDOW,
-	IDM_CODEWINDOW,
-
-	// Float Window IDs
-	IDM_LOGWINDOW_PARENT,
-	IDM_LOGCONFIGWINDOW_PARENT,
-	IDM_CONSOLEWINDOW_PARENT,
-	IDM_REGISTERWINDOW_PARENT,
-	IDM_BREAKPOINTWINDOW_PARENT,
-	IDM_MEMORYWINDOW_PARENT,
-	IDM_JITWINDOW_PARENT,
-	IDM_SOUNDWINDOW_PARENT,
-	IDM_VIDEOWINDOW_PARENT,
-	IDM_CODEWINDOW_PARENT,
-
-	// Float popup menu IDs
-	IDM_FLOAT_LOGWINDOW,
-	IDM_FLOAT_LOGCONFIGWINDOW,
-	IDM_FLOAT_CONSOLEWINDOW,
-	IDM_FLOAT_REGISTERWINDOW,
-	IDM_FLOAT_BREAKPOINTWINDOW,
-	IDM_FLOAT_MEMORYWINDOW,
-	IDM_FLOAT_JITWINDOW,
-	IDM_FLOAT_SOUNDWINDOW,
-	IDM_FLOAT_VIDEOWINDOW,
-	IDM_FLOAT_CODEWINDOW,
-
-	// --------------------------------------------------------------
-	// Debugger Menu Entries
-	// --------------------
-	// CPU Mode
-	IDM_INTERPRETER,
-	IDM_AUTOMATICSTART, IDM_BOOTTOPAUSE,
-	IDM_JITNOBLOCKCACHE, IDM_JITBLOCKLINKING,  // JIT
-	IDM_JITOFF,
-	IDM_JITLSOFF, IDM_JITLSLXZOFF, IDM_JITLSLWZOFF, IDM_JITLSLBZXOFF,
-	IDM_JITLSPOFF, IDM_JITLSFOFF,
-	IDM_JITIOFF,
-	IDM_JITFPOFF,
-	IDM_JITPOFF,
-	IDM_JITSROFF,
-	IDM_FONTPICKER,
-
-	// Symbols
-	IDM_CLEARSYMBOLS,
-	IDM_SCANFUNCTIONS,
-	IDM_LOADMAPFILE,
-	IDM_SAVEMAPFILE, IDM_SAVEMAPFILEWITHCODES,
-	IDM_CREATESIGNATUREFILE,
-	IDM_RENAME_SYMBOLS,
-	IDM_USESIGNATUREFILE,
-	IDM_PATCHHLEFUNCTIONS,
-
-	// JIT
-	IDM_CLEARCODECACHE,
-	IDM_LOGINSTRUCTIONS,
-	IDM_SEARCHINSTRUCTION,
-
-	// Profiler
-	IDM_PROFILEBLOCKS,
-	IDM_WRITEPROFILE,
-	// --------------------------------------------------------------
-
-	// --------------------------------------------------------------
-	// Debugger Toolbar
-	// --------------------
-	ID_TOOLBAR_DEBUG,
-	IDM_STEP,
-	IDM_STEPOVER,
-	IDM_TOGGLE_BREAKPOINT,
-	IDM_SKIP,
-	IDM_SETPC,
-	IDM_GOTOPC,
-	IDM_ADDRBOX,
-
-	ID_TOOLBAR_AUI,
-	IDM_SAVE_PERSPECTIVE,
-	IDM_ADD_PERSPECTIVE,
-	IDM_PERSPECTIVES_ADD_PANE,
-	IDM_EDIT_PERSPECTIVES,
-	IDM_TAB_SPLIT,
-	IDM_NO_DOCKING,
-	IDM_PERSPECTIVES_0,
-	IDM_PERSPECTIVES_100 = IDM_PERSPECTIVES_0 + 100,
-	// --------------------------------------------------------------
-
-	IDM_TOGGLE_DUALCORE, // Other
-	IDM_TOGGLE_SKIPIDLE,
-	IDM_TOGGLE_TOOLBAR,
-	IDM_TOGGLE_STATUSBAR,
-	IDM_NOTIFYMAPLOADED,
-	IDM_OPENCONTAININGFOLDER,
-	IDM_OPENSAVEFOLDER,
-	IDM_EXPORTSAVE,
-	IDM_IMPORTSAVE,
-	IDM_EXPORTALLSAVE,
-	IDM_SETDEFAULTGCM,
-	IDM_DELETEGCM,
-	IDM_COMPRESSGCM,
-	IDM_MULTICOMPRESSGCM,
-	IDM_MULTIDECOMPRESSGCM,
-	IDM_UPDATELOGDISPLAY,
-	IDM_UPDATEDISASMDIALOG,
-	IDM_UPDATEGUI,
-	IDM_UPDATESTATUSBAR,
-	IDM_UPDATETITLE,
-	IDM_UPDATEBREAKPOINTS,
-	IDM_PANIC,
-	IDM_KEYSTATE,
-	IDM_WINDOWSIZEREQUEST,
-	IDM_HOST_MESSAGE,
-
-	IDM_MPANEL, ID_STATUSBAR,
-
-	ID_TOOLBAR = 500,
-	LIST_CTRL = 1000
-};
-
-#include <wx/wx.h>
-#include <wx/toolbar.h>
-#include <wx/log.h>
-#include <wx/image.h>
-#include <wx/aboutdlg.h>
-#include <wx/filedlg.h>
-#include <wx/spinctrl.h>
-#include <wx/srchctrl.h>
-#include <wx/listctrl.h>
-#include <wx/progdlg.h>
-#include <wx/imagpng.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/choice.h>
-#include <wx/cmdline.h>
-#include <wx/busyinfo.h>
-
-// custom message macro
-#define EVT_HOST_COMMAND(id, fn) \
-	DECLARE_EVENT_TABLE_ENTRY(\
-			wxEVT_HOST_COMMAND, id, wxID_ANY, \
-			(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent(wxCommandEventFunction, &fn), \
-			(wxObject*) NULL \
-			),
-
-extern const wxEventType wxEVT_HOST_COMMAND;
-
-#endif // _WX_GLOBALS_H
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
deleted file mode 100644
index 67d540b16e..0000000000
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/notebook.h>
-
-#include "HotkeyDlg.h"
-#include "ConfigManager.h"
-
-BEGIN_EVENT_TABLE(HotkeyConfigDialog,wxDialog)
-	EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1,
-			wxEVT_COMMAND_BUTTON_CLICKED, HotkeyConfigDialog::OnButtonClick)
-	EVT_TIMER(wxID_ANY, HotkeyConfigDialog::OnButtonTimer)
-END_EVENT_TABLE()
-
-HotkeyConfigDialog::HotkeyConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title,
-		const wxPoint &position, const wxSize& size, long style)
-: wxDialog(parent, id, title, position, size, style)
-{
-	CreateHotkeyGUIControls();
-
-#if wxUSE_TIMER
-	m_ButtonMappingTimer = new wxTimer(this, wxID_ANY);
-	g_Pressed = 0;
-	g_Modkey = 0;
-	ClickedButton = NULL;
-	GetButtonWaitingID = 0;
-	GetButtonWaitingTimer = 0;
-#endif
-}
-
-HotkeyConfigDialog::~HotkeyConfigDialog()
-{
-	delete m_ButtonMappingTimer;
-}
-
-// Save keyboard key mapping
-void HotkeyConfigDialog::SaveButtonMapping(int Id, int Key, int Modkey)
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] = Key;
-	SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id] = Modkey;
-}
-
-void HotkeyConfigDialog::EndGetButtons(void)
-{
-	wxTheApp->Unbind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this);
-	m_ButtonMappingTimer->Stop();
-	GetButtonWaitingTimer = 0;
-	GetButtonWaitingID = 0;
-	ClickedButton = NULL;
-	SetEscapeId(wxID_ANY);
-}
-
-void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event)
-{
-	if(ClickedButton != NULL)
-	{
-		// Save the key
-		g_Pressed = event.GetKeyCode();
-		g_Modkey = event.GetModifiers();
-
-		// Don't allow modifier keys
-		if (g_Pressed == WXK_CONTROL || g_Pressed == WXK_ALT ||
-			g_Pressed == WXK_SHIFT || g_Pressed == WXK_COMMAND)
-			return;
-
-		// Use the space key to set a blank key
-		if (g_Pressed == WXK_SPACE)
-		{
-			SaveButtonMapping(ClickedButton->GetId(), -1, 0);
-			SetButtonText(ClickedButton->GetId(), wxString());
-		}
-		else
-		{
-			SetButtonText(ClickedButton->GetId(),
-					InputCommon::WXKeyToString(g_Pressed),
-					InputCommon::WXKeymodToString(g_Modkey));
-			SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey);
-		}
-		EndGetButtons();
-	}
-}
-
-// Update the textbox for the buttons
-void HotkeyConfigDialog::SetButtonText(int id, const wxString &keystr, const wxString &modkeystr)
-{
-	m_Button_Hotkeys[id]->SetLabel(modkeystr + keystr);
-}
-
-void HotkeyConfigDialog::DoGetButtons(int _GetId)
-{
-	// Values used in this function
-	const int Seconds = 4; // Seconds to wait for
-	const int TimesPerSecond = 40; // How often to run the check
-
-	// If the Id has changed or the timer is not running we should start one
-	if( GetButtonWaitingID != _GetId || !m_ButtonMappingTimer->IsRunning() )
-	{
-		if(m_ButtonMappingTimer->IsRunning())
-			m_ButtonMappingTimer->Stop();
-
-		// Save the button Id
-		GetButtonWaitingID = _GetId;
-		GetButtonWaitingTimer = 0;
-
-		// Start the timer
-		#if wxUSE_TIMER
-		m_ButtonMappingTimer->Start(1000 / TimesPerSecond);
-		#endif
-	}
-
-	// Process results
-	// Count each time
-	GetButtonWaitingTimer++;
-
-	// This is run every second
-	if (GetButtonWaitingTimer % TimesPerSecond == 0)
-	{
-		// Current time
-		int TmpTime = Seconds - (GetButtonWaitingTimer / TimesPerSecond);
-		// Update text
-		SetButtonText(_GetId, wxString::Format(wxT("[ %d ]"), TmpTime));
-	}
-
-	// Time's up
-	if (GetButtonWaitingTimer / TimesPerSecond >= Seconds)
-	{
-		// Revert back to old label
-		SetButtonText(_GetId, OldLabel);
-		EndGetButtons();
-	}
-}
-
-// Input button clicked
-void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event)
-{
-	event.Skip();
-
-	if (m_ButtonMappingTimer->IsRunning())
-		return;
-
-	wxTheApp->Bind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this);
-
-	// Get the button
-	ClickedButton = (wxButton *)event.GetEventObject();
-	SetEscapeId(wxID_CANCEL);
-	// Save old label so we can revert back
-	OldLabel = ClickedButton->GetLabel();
-	ClickedButton->SetWindowStyle(wxWANTS_CHARS);
-	ClickedButton->SetLabel(_("<Press Key>"));
-	DoGetButtons(ClickedButton->GetId());
-}
-
-#define HOTKEY_NUM_COLUMNS 2
-
-void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
-{
-	const wxString pageNames[] =
-	{
-		_("General"),
-		_("State Saves")
-	};
-
-	const wxString hkText[] =
-	{
-		_("Open"),
-		_("Change Disc"),
-		_("Refresh List"),
-
-		_("Play/Pause"),
-		_("Stop"),
-		_("Reset"),
-		_("Frame Advance"),
-
-		_("Start Recording"),
-		_("Play Recording"),
-		_("Export Recording"),
-		_("Read-only mode"),
-
-		_("Toggle Fullscreen"),
-		_("Take Screenshot"),
-		_("Exit"),
-
-		_("Connect Wiimote 1"),
-		_("Connect Wiimote 2"),
-		_("Connect Wiimote 3"),
-		_("Connect Wiimote 4"),
-		_("Connect Balance Board"),
-
-		_("Toggle IR"),
-		_("Toggle Aspect Ratio"),
-		_("Toggle EFB Copies"),
-		_("Toggle Fog"),
-		_("Increase Frame limit"),
-		_("Decrease Frame limit"),
-
-		_("Load State Slot 1"),
-		_("Load State Slot 2"),
-		_("Load State Slot 3"),
-		_("Load State Slot 4"),
-		_("Load State Slot 5"),
-		_("Load State Slot 6"),
-		_("Load State Slot 7"),
-		_("Load State Slot 8"),
-		_("Load State Slot 9"),
-		_("Load State Slot 10"),
-
-		_("Save State Slot 1"),
-		_("Save State Slot 2"),
-		_("Save State Slot 3"),
-		_("Save State Slot 4"),
-		_("Save State Slot 5"),
-		_("Save State Slot 6"),
-		_("Save State Slot 7"),
-		_("Save State Slot 8"),
-		_("Save State Slot 9"),
-		_("Save State Slot 10"),
-
-		_("Load State Last 1"),
-		_("Load State Last 2"),
-		_("Load State Last 3"),
-		_("Load State Last 4"),
-		_("Load State Last 5"),
-		_("Load State Last 6"),
-		_("Load State Last 7"),
-		_("Load State Last 8"),
-
-		_("Save Oldest State"),
-		_("Undo Load State"),
-		_("Undo Save State"),
-		_("Save State"),
-		_("Load State"),
-	};
-
-	const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS};
-
-	// Configuration controls sizes
-	wxSize size(100,20);
-	// A small type font
-	wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
-
-	wxNotebook *Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-
-	for (int j = 0; j < 2; j++)
-	{
-		wxPanel *Page = new wxPanel(Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-		Notebook->AddPage(Page, pageNames[j]);
-
-		wxGridBagSizer *sHotkeys = new wxGridBagSizer();
-
-		// Header line
-		for (int i = 0; i < HOTKEY_NUM_COLUMNS; i++)
-		{
-			wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL);
-			wxStaticText *StaticTextHeader = new wxStaticText(Page, wxID_ANY, _("Action"));
-			HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2);
-			StaticTextHeader = new wxStaticText(Page, wxID_ANY, _("Key"), wxDefaultPosition, size);
-			HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2);	
-			sHotkeys->Add(HeaderSizer, wxGBPosition(0, i), wxDefaultSpan, wxEXPAND | wxLEFT, (i > 0) ? 30 : 1);
-		}
-
-		int column_break = (page_breaks[j+1] + page_breaks[j] + 1) / 2;
-		
-		for (int i = page_breaks[j]; i < page_breaks[j+1]; i++)
-		{
-			// Text for the action
-			wxStaticText *stHotkeys = new wxStaticText(Page, wxID_ANY, hkText[i]);
-
-			// Key selection button
-			m_Button_Hotkeys[i] = new wxButton(Page, i, wxEmptyString,
-					wxDefaultPosition, size);
-			m_Button_Hotkeys[i]->SetFont(m_SmallFont);
-			m_Button_Hotkeys[i]->SetToolTip(_("Left click to detect hotkeys.\nEnter space to clear."));
-			SetButtonText(i,
-					InputCommon::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]),
-					InputCommon::WXKeymodToString(
-						SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[i]));
-
-			wxBoxSizer *sHotkey = new wxBoxSizer(wxHORIZONTAL);
-			sHotkey->Add(stHotkeys, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 2);
-			sHotkey->Add(m_Button_Hotkeys[i], 0, wxALL, 2);
-			sHotkeys->Add(sHotkey,
-					wxGBPosition((i < column_break) ? i - page_breaks[j] + 1 : i - column_break + 1,
-						(i < column_break) ? 0 : 1),
-					wxDefaultSpan, wxEXPAND | wxLEFT, (i < column_break) ? 1 : 30);
-		}
-
-		wxStaticBoxSizer *sHotkeyBox = new wxStaticBoxSizer(wxVERTICAL, Page, _("Hotkeys"));
-		sHotkeyBox->Add(sHotkeys);
-
-		wxBoxSizer* const sPage = new wxBoxSizer(wxVERTICAL);
-		sPage->Add(sHotkeyBox, 0, wxEXPAND | wxALL, 5);
-		Page->SetSizer(sPage);
-	}
-
-	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
-	sMainSizer->Add(Notebook, 0, wxEXPAND | wxALL, 5);
-	sMainSizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxDOWN, 5);
-	SetSizerAndFit(sMainSizer);
-	SetFocus();
-}
-
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.h b/Source/Core/DolphinWX/Src/HotkeyDlg.h
deleted file mode 100644
index 0bf31d4739..0000000000
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __HOTKEYDIALOG_h__
-#define __HOTKEYDIALOG_h__
-
-#include <wx/wx.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/gbsizer.h>
-
-#include "Common.h"
-#include "CoreParameter.h"
-#include "WXInputBase.h"
-
-#if defined(HAVE_X11) && HAVE_X11
-#include "X11InputBase.h"
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#endif
-
-class HotkeyConfigDialog : public wxDialog
-{
-	public:
-		HotkeyConfigDialog(wxWindow *parent,
-				wxWindowID id = 1,
-				const wxString &title = _("Hotkey Configuration"),
-				const wxPoint& pos = wxDefaultPosition,
-				const wxSize& size = wxDefaultSize,
-				long style = wxDEFAULT_DIALOG_STYLE);
-		virtual ~HotkeyConfigDialog();
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		wxString OldLabel;
-
-		wxButton *ClickedButton,
-				 *m_Button_Hotkeys[NUM_HOTKEYS];
-
-		wxTimer *m_ButtonMappingTimer;
-
-		void OnButtonTimer(wxTimerEvent& WXUNUSED(event)) { DoGetButtons(GetButtonWaitingID); }
-		void OnButtonClick(wxCommandEvent& event);
-		void OnKeyDown(wxKeyEvent& event);
-		void SaveButtonMapping(int Id, int Key, int Modkey);
-		void CreateHotkeyGUIControls(void);
-
-		void SetButtonText(int id, const wxString &keystr, const wxString &modkeystr = wxString());
-
-		void DoGetButtons(int id);
-		void EndGetButtons(void);
-
-		int GetButtonWaitingID, GetButtonWaitingTimer, g_Pressed, g_Modkey;
-};
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
deleted file mode 100644
index c38f6f5110..0000000000
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-#include <vector>
-#include <wx/mstream.h>
-
-#include "Common.h"
-#include "CommonPaths.h"
-
-#include "Globals.h"
-#include "FileUtil.h"
-#include "ISOFile.h"
-#include "StringUtil.h"
-#include "Hash.h"
-#include "IniFile.h"
-#include "WxUtils.h"
-
-#include "Filesystem.h"
-#include "BannerLoader.h"
-#include "FileSearch.h"
-#include "CompressedBlob.h"
-#include "ChunkFile.h"
-#include "ConfigManager.h"
-
-static const u32 CACHE_REVISION = 0x114;
-
-#define DVD_BANNER_WIDTH 96
-#define DVD_BANNER_HEIGHT 32
-
-static u32 g_ImageTemp[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
-
-GameListItem::GameListItem(const std::string& _rFileName)
-	: m_FileName(_rFileName)
-	, m_emu_state(0)
-	, m_FileSize(0)
-	, m_Revision(0)
-	, m_Valid(false)
-	, m_BlobCompressed(false)
-{
-	if (LoadFromCache())
-	{
-		m_Valid = true;
-	}
-	else
-	{
-		DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_rFileName);
-
-		if (pVolume != NULL)
-		{
-			if (!DiscIO::IsVolumeWadFile(pVolume))
-				m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC;
-			else
-			{
-				m_Platform = WII_WAD;
-			}
-
-			m_volume_names = pVolume->GetNames();
-
-			m_Country  = pVolume->GetCountry();
-			m_FileSize = pVolume->GetRawSize();
-			m_VolumeSize = pVolume->GetSize();
-
-			m_UniqueID = pVolume->GetUniqueID();
-			m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName.c_str());
-			m_IsDiscTwo = pVolume->IsDiscTwo();
-			m_Revision = pVolume->GetRevision();
-
-			// check if we can get some info from the banner file too
-			DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-
-			if (pFileSystem != NULL || m_Platform == WII_WAD)
-			{
-				DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
-
-				if (pBannerLoader != NULL)
-				{
-					if (pBannerLoader->IsValid())
-					{
-						if (m_Platform != WII_WAD)
-							m_names = pBannerLoader->GetNames();
-						m_company = pBannerLoader->GetCompany();
-						m_descriptions = pBannerLoader->GetDescriptions();
-						
-						if (pBannerLoader->GetBanner(g_ImageTemp))
-						{
-							// resize vector to image size
-							m_pImage.resize(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT * 3);
-
-							for (size_t i = 0; i < DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT; i++)
-							{
-								m_pImage[i * 3 + 0] = (g_ImageTemp[i] & 0xFF0000) >> 16;
-								m_pImage[i * 3 + 1] = (g_ImageTemp[i] & 0x00FF00) >>  8;
-								m_pImage[i * 3 + 2] = (g_ImageTemp[i] & 0x0000FF) >>  0;
-							}
-						}
-					}
-					delete pBannerLoader;
-				}
-
-				delete pFileSystem;
-			}
-
-			delete pVolume;
-
-			m_Valid = true;
-
-			// Create a cache file only if we have an image.
-			// Wii isos create their images after you have generated the first savegame
-			if (!m_pImage.empty())
-				SaveToCache();
-		}
-	}
-
-	if (IsValid())
-	{
-		IniFile ini;
-		ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini");
-		ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true);
-		ini.Get("EmuState", "EmulationStateId", &m_emu_state);
-		ini.Get("EmuState", "EmulationIssues", &m_issues);
-	}
-
-	if (!m_pImage.empty())
-	{
-		m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, &m_pImage[0], true);
-	}
-	else
-	{
-		// default banner
-		m_Image = wxImage(StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)) + "nobanner.png", wxBITMAP_TYPE_PNG);
-	}
-}
-
-GameListItem::~GameListItem()
-{
-}
-
-bool GameListItem::LoadFromCache()
-{
-	return CChunkFileReader::Load<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
-}
-
-void GameListItem::SaveToCache()
-{
-	if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
-	{
-		File::CreateDir(File::GetUserPath(D_CACHE_IDX));
-	}
-
-	CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
-}
-
-void GameListItem::DoState(PointerWrap &p)
-{
-	p.Do(m_volume_names);
-	p.Do(m_company);
-	p.Do(m_names);
-	p.Do(m_descriptions);
-	p.Do(m_UniqueID);
-	p.Do(m_FileSize);
-	p.Do(m_VolumeSize);
-	p.Do(m_Country);
-	p.Do(m_BlobCompressed);
-	p.Do(m_pImage);
-	p.Do(m_Platform);
-	p.Do(m_IsDiscTwo);
-	p.Do(m_Revision);
-}
-
-std::string GameListItem::CreateCacheFilename()
-{
-	std::string Filename, LegalPathname, extension;
-	SplitPath(m_FileName, &LegalPathname, &Filename, &extension);
-
-	if (Filename.empty()) return Filename; // Disc Drive
-
-	// Filename.extension_HashOfFolderPath_Size.cache
-	// Append hash to prevent ISO name-clashing in different folders.
-	Filename.append(StringFromFormat("%s_%x_%llx.cache",
-		extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()),
-		File::GetSize(m_FileName)));
-
-	std::string fullname(File::GetUserPath(D_CACHE_IDX));
-	fullname += Filename;
-	return fullname;
-}
-
-std::string GameListItem::GetCompany() const
-{
-	if (m_company.empty())
-		return "N/A";
-	else
-		return m_company;
-}
-
-// (-1 = Japanese, 0 = English, etc)?
-std::string GameListItem::GetDescription(int _index) const
-{
-	const u32 index = _index;
-
-	if (index < m_descriptions.size())
-		return m_descriptions[index];
-	
-	if (!m_descriptions.empty())
-		return m_descriptions[0];
-
-	return "";
-}
-
-// (-1 = Japanese, 0 = English, etc)?
-std::string GameListItem::GetVolumeName(int _index) const
-{
-	u32 const index = _index;
-
-	if (index < m_volume_names.size() && !m_volume_names[index].empty())
-		return m_volume_names[index];
-
-	if (!m_volume_names.empty())
-		return m_volume_names[0];
-	
-	return "";
-}
-
-// (-1 = Japanese, 0 = English, etc)?
-std::string GameListItem::GetBannerName(int _index) const
-{
-	u32 const index = _index;
-
-	if (index < m_names.size() && !m_names[index].empty())
-		return m_names[index];
-	
-	if (!m_names.empty())
-		return m_names[0];
-
-	return "";
-}
-
-// (-1 = Japanese, 0 = English, etc)?
-std::string GameListItem::GetName(int _index) const
-{
-	// Prefer name from banner, fallback to name from volume, fallback to filename
-	
-	std::string name = GetBannerName(_index);
-	
-	if (name.empty())
-		name = GetVolumeName(_index);
-
-	if (name.empty())
-	{
-		// No usable name, return filename (better than nothing)
-		SplitPath(GetFileName(), NULL, &name, NULL);
-	}
-
-	return name;
-}
-
-const std::string GameListItem::GetWiiFSPath() const
-{
-	DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(m_FileName);
-	std::string ret;
-
-	if (Iso == NULL)
-		return ret;
-
-	if (DiscIO::IsVolumeWiiDisc(Iso) || DiscIO::IsVolumeWadFile(Iso))
-	{
-		char Path[250];
-		u64 Title;
-
-		Iso->GetTitleID((u8*)&Title);
-		Title = Common::swap64(Title);
-
-		sprintf(Path, "%stitle/%08x/%08x/data/",
-				File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(Title>>32), (u32)Title);
-
-		if (!File::Exists(Path))
-			File::CreateFullPath(Path);
-
-		if (Path[0] == '.')
-			ret = WxStrToStr(wxGetCwd()) + std::string(Path).substr(strlen(ROOT_DIR));
-		else
-			ret = std::string(Path);
-	}
-	delete Iso;
-
-	return ret;
-}
-
diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h
deleted file mode 100644
index 080f45fd32..0000000000
--- a/Source/Core/DolphinWX/Src/ISOFile.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __ISOFILE_H_
-#define __ISOFILE_H_
-
-#include <vector>
-#include <string>
-
-#include "Volume.h"
-#include "VolumeCreator.h"
-
-#if defined(HAVE_WX) && HAVE_WX
-#include <wx/image.h>
-#endif
-
-class PointerWrap;
-class GameListItem : NonCopyable
-{
-public:
-	GameListItem(const std::string& _rFileName);
-	~GameListItem();
-
-	bool IsValid() const {return m_Valid;}
-	const std::string& GetFileName() const {return m_FileName;}
-	std::string GetBannerName(int index) const;
-	std::string GetVolumeName(int index) const;
-	std::string GetName(int index) const;
-	std::string GetCompany() const;
-	std::string GetDescription(int index = 0) const;
-	int GetRevision() const { return m_Revision; }
-	const std::string& GetUniqueID() const {return m_UniqueID;}
-	const std::string GetWiiFSPath() const;
-	DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
-	int GetPlatform() const {return m_Platform;}
-	const std::string& GetIssues() const { return m_issues; }
-	int GetEmuState() const { return m_emu_state; }
-	bool IsCompressed() const {return m_BlobCompressed;}
-	u64 GetFileSize() const {return m_FileSize;}
-	u64 GetVolumeSize() const {return m_VolumeSize;}
-	bool IsDiscTwo() const {return m_IsDiscTwo;}
-#if defined(HAVE_WX) && HAVE_WX
-	const wxImage& GetImage() const {return m_Image;}
-#endif
-
-	void DoState(PointerWrap &p);
-
-	enum
-	{
-		GAMECUBE_DISC = 0,
-		WII_DISC,
-		WII_WAD,
-		NUMBER_OF_PLATFORMS
-	};
-
-private:
-	std::string m_FileName;
-
-	// TODO: eliminate this and overwrite with names from banner when available?
-	std::vector<std::string> m_volume_names;
-
-	// Stuff from banner
-	std::string m_company;
-	std::vector<std::string> m_names;
-	std::vector<std::string> m_descriptions;
-
-	std::string m_UniqueID;
-
-	std::string m_issues;
-	int m_emu_state;
-
-	u64 m_FileSize;
-	u64 m_VolumeSize;
-
-	DiscIO::IVolume::ECountry m_Country;
-	int m_Platform;
-	int m_Revision;
-
-#if defined(HAVE_WX) && HAVE_WX
-	wxImage m_Image;
-#endif
-	bool m_Valid;
-	bool m_BlobCompressed;
-	std::vector<u8> m_pImage;
-	bool m_IsDiscTwo;
-
-	bool LoadFromCache();
-	void SaveToCache();
-
-	std::string CreateCacheFilename();
-};
-
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
deleted file mode 100644
index 500a3014fc..0000000000
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ /dev/null
@@ -1,1408 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifdef __APPLE__
-#import <Cocoa/Cocoa.h>
-#endif
-
-#include <type_traits>
-
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Globals.h"
-
-#include "WxUtils.h"
-#include "VolumeCreator.h"
-#include "Filesystem.h"
-#include "ISOProperties.h"
-#include "PHackSettings.h"
-#include "PatchAddEdit.h"
-#include "ARCodeAddEdit.h"
-#include "GeckoCodeDiag.h"
-#include "ConfigManager.h"
-#include "StringUtil.h"
-
-#include "../resources/isoprop_file.xpm"
-#include "../resources/isoprop_folder.xpm"
-#include "../resources/isoprop_disc.xpm"
-
-struct WiiPartition
-{
-	DiscIO::IVolume *Partition;
-	DiscIO::IFileSystem *FileSystem;
-	std::vector<const DiscIO::SFileInfo *> Files;
-};
-std::vector<WiiPartition> WiiDisc;
-
-DiscIO::IVolume *OpenISO = NULL;
-DiscIO::IFileSystem *pFileSystem = NULL;
-
-std::vector<PatchEngine::Patch> onFrame;
-std::vector<ActionReplay::ARCode> arCodes;
-PHackData PHack_Data;
-
-
-BEGIN_EVENT_TABLE(CISOProperties, wxDialog)
-	EVT_CLOSE(CISOProperties::OnClose)
-	EVT_BUTTON(wxID_OK, CISOProperties::OnCloseClick)
-	EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig)
-	EVT_BUTTON(ID_SHOWDEFAULTCONFIG, CISOProperties::OnShowDefaultConfig)
-	EVT_CHOICE(ID_EMUSTATE, CISOProperties::SetRefresh)
-	EVT_CHOICE(ID_EMU_ISSUES, CISOProperties::SetRefresh)
-	EVT_BUTTON(ID_PHSETTINGS, CISOProperties::PHackButtonClicked)
-	EVT_LISTBOX(ID_PATCHES_LIST, CISOProperties::ListSelectionChanged)
-	EVT_BUTTON(ID_EDITPATCH, CISOProperties::PatchButtonClicked)
-	EVT_BUTTON(ID_ADDPATCH, CISOProperties::PatchButtonClicked)
-	EVT_BUTTON(ID_REMOVEPATCH, CISOProperties::PatchButtonClicked)
-	EVT_LISTBOX(ID_CHEATS_LIST, CISOProperties::ListSelectionChanged)
-	EVT_BUTTON(ID_EDITCHEAT, CISOProperties::ActionReplayButtonClicked)
-	EVT_BUTTON(ID_ADDCHEAT, CISOProperties::ActionReplayButtonClicked)
-	EVT_BUTTON(ID_REMOVECHEAT, CISOProperties::ActionReplayButtonClicked)
-	EVT_MENU(IDM_BNRSAVEAS, CISOProperties::OnBannerImageSave)
-	EVT_TREE_ITEM_RIGHT_CLICK(ID_TREECTRL, CISOProperties::OnRightClickOnTree)
-	EVT_MENU(IDM_EXTRACTFILE, CISOProperties::OnExtractFile)
-	EVT_MENU(IDM_EXTRACTDIR, CISOProperties::OnExtractDir)
-	EVT_MENU(IDM_EXTRACTALL, CISOProperties::OnExtractDir)
-	EVT_MENU(IDM_EXTRACTAPPLOADER, CISOProperties::OnExtractDataFromHeader)
-	EVT_MENU(IDM_EXTRACTDOL, CISOProperties::OnExtractDataFromHeader)
-	EVT_MENU(IDM_CHECKINTEGRITY, CISOProperties::CheckPartitionIntegrity)
-	EVT_CHOICE(ID_LANG, CISOProperties::OnChangeBannerLang)
-END_EVENT_TABLE()
-
-CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	// Load ISO data
-	OpenISO = DiscIO::CreateVolumeFromFilename(fileName);
-	bool IsWad = DiscIO::IsVolumeWadFile(OpenISO);
-	bool IsWiiDisc = DiscIO::IsVolumeWiiDisc(OpenISO);
-	if (IsWiiDisc)
-	{
-		for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions...
-		{
-			WiiPartition temp;
-			if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, 0, i)) != NULL)
-			{
-				if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != NULL)
-				{
-					temp.FileSystem->GetFileList(temp.Files);
-					WiiDisc.push_back(temp);
-				}
-			}
-			else
-			{
-				break;
-			}
-		}
-	}
-	else
-	{
-		// TODO : Should we add a way to browse the wad file ?
-		if (!IsWad)
-		{
-			GCFiles.clear();
-			pFileSystem = DiscIO::CreateFileSystem(OpenISO);
-			if (pFileSystem)
-				pFileSystem->GetFileList(GCFiles);
-		}
-	}
-
-	// Load game ini
-	std::string _iniFilename = OpenISO->GetUniqueID();
-
-	if (!_iniFilename.length())
-	{
-		char tmp[17];
-		u8 _tTitleID[8];
-		if(OpenISO->GetTitleID(_tTitleID))
-		{
-			snprintf(tmp, 17, "%016llx", Common::swap64(_tTitleID));
-			_iniFilename = tmp;
-		}
-	}
-
-	GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini";
-	GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
-
-	GameIniDefault.Load(GameIniFileDefault);
-	GameIniLocal.Load(GameIniFileLocal);
-
-	// Setup GUI
-	OpenGameListItem = new GameListItem(fileName);
-
-	bRefreshList = false;
-
-	CreateGUIControls(IsWad);
-
-	LoadGameConfig();
-
-	// Disk header and apploader
-
-	m_Name->SetValue(StrToWxStr(OpenISO->GetName()));
-	m_GameID->SetValue(StrToWxStr(OpenISO->GetUniqueID()));
-	switch (OpenISO->GetCountry())
-	{
-	case DiscIO::IVolume::COUNTRY_EUROPE:
-		m_Country->SetValue(_("EUROPE"));
-		break;
-	case DiscIO::IVolume::COUNTRY_FRANCE:
-		m_Country->SetValue(_("FRANCE"));
-		break;
-	case DiscIO::IVolume::COUNTRY_ITALY:
-		m_Country->SetValue(_("ITALY"));
-		break;
-	case DiscIO::IVolume::COUNTRY_RUSSIA:
-		m_Country->SetValue(_("RUSSIA"));
-		break;
-	case DiscIO::IVolume::COUNTRY_USA:
-		m_Country->SetValue(_("USA"));
-		if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
-		{
-			m_Lang->SetSelection(0);
-			m_Lang->Disable();
-		}
-
-		break;
-	case DiscIO::IVolume::COUNTRY_JAPAN:
-		m_Country->SetValue(_("JAPAN"));
-		if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
-		{
-			m_Lang->Insert(_("Japanese"), 0);
-			m_Lang->SetSelection(0);
-			m_Lang->Disable();
-		}
-		break;
-	case DiscIO::IVolume::COUNTRY_KOREA:
-		m_Country->SetValue(_("KOREA"));
-		break;
-	case DiscIO::IVolume::COUNTRY_TAIWAN:
-		m_Country->SetValue(_("TAIWAN"));
-		if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
-		{
-			m_Lang->Insert(_("TAIWAN"), 0);
-			m_Lang->SetSelection(0);
-			m_Lang->Disable();
-		}
-		break;
-	case DiscIO::IVolume::COUNTRY_SDK:
-		m_Country->SetValue(_("No Country (SDK)"));
-		break;
-	default:
-		m_Country->SetValue(_("UNKNOWN"));
-		break;
-	}
-	
-	if (IsWiiDisc) // Only one language with wii banners
-	{
-		m_Lang->SetSelection(0);
-		m_Lang->Disable();
-	}
-
-	wxString temp = _T("0x") + StrToWxStr(OpenISO->GetMakerID());
-	m_MakerID->SetValue(temp);
-	m_Revision->SetValue(wxString::Format(wxT("%u"), OpenISO->GetRevision()));
-	m_Date->SetValue(StrToWxStr(OpenISO->GetApploaderDate()));
-	m_FST->SetValue(wxString::Format(wxT("%u"), OpenISO->GetFSTSize()));
-
-	// Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title
-	if (!IsWad)
-	{
-		ChangeBannerDetails((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage);
-	}
-	else
-	{
-		ChangeBannerDetails(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"));
-	}
-	
-	m_Banner->SetBitmap(OpenGameListItem->GetImage());
-	m_Banner->Bind(wxEVT_RIGHT_DOWN, &CISOProperties::RightClickOnBanner, this);
-
-	// Filesystem browser/dumper
-	// TODO : Should we add a way to browse the wad file ?
-	if (!DiscIO::IsVolumeWadFile(OpenISO))
-	{
-		if (DiscIO::IsVolumeWiiDisc(OpenISO))
-		{
-			for (u32 i = 0; i < WiiDisc.size(); i++)
-			{
-				WiiPartition partition = WiiDisc.at(i);
-				wxTreeItemId PartitionRoot =
-					m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), i), 0, 0);
-				CreateDirectoryTree(PartitionRoot, partition.Files, 1, partition.Files.at(0)->m_FileSize);	
-				if (i == 1)
-					m_Treectrl->Expand(PartitionRoot);
-			}
-		}
-		else if (!GCFiles.empty())
-		{
-			CreateDirectoryTree(RootId, GCFiles, 1, GCFiles.at(0)->m_FileSize);
-		}
-
-		m_Treectrl->Expand(RootId);
-	}
-}
-
-CISOProperties::~CISOProperties()
-{
-	if (!IsVolumeWiiDisc(OpenISO) && !IsVolumeWadFile(OpenISO) && pFileSystem)
-		delete pFileSystem;
-	// two vector's items are no longer valid after deleting filesystem
-	WiiDisc.clear();
-	GCFiles.clear();
-	delete OpenGameListItem;
-	delete OpenISO;
-}
-
-size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
-		std::vector<const DiscIO::SFileInfo*> fileInfos,
-		const size_t _FirstIndex, 
-		const size_t _LastIndex)
-{
-	size_t CurrentIndex = _FirstIndex;
-
-	while (CurrentIndex < _LastIndex)
-	{
-		const DiscIO::SFileInfo *rFileInfo = fileInfos[CurrentIndex];
-		char *name = (char*)rFileInfo->m_FullPath;
-
-		if (rFileInfo->IsDirectory())
-		{
-			name[strlen(name) - 1] = '\0';
-		}
-
-		char *itemName = strrchr(name, DIR_SEP_CHR);
-
-		if(!itemName)
-			itemName = name;
-		else
-			itemName++;
-
-		// check next index
-		if (rFileInfo->IsDirectory())
-		{
-			wxTreeItemId item = m_Treectrl->AppendItem(parent, StrToWxStr(itemName), 1, 1);
-			CurrentIndex = CreateDirectoryTree(item, fileInfos, CurrentIndex + 1, (size_t)rFileInfo->m_FileSize);
-		}
-		else
-		{
-			m_Treectrl->AppendItem(parent, StrToWxStr(itemName), 2, 2);
-			CurrentIndex++;
-		}
-	}
-
-	return CurrentIndex;
-}
-
-long CISOProperties::GetElementStyle(const char* section, const char* key)
-{
-	// Disable 3rd state if default gameini overrides the setting
-	if (GameIniDefault.Exists(section, key))
-		return 0;
-
-	return wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER;
-}
-
-void CISOProperties::CreateGUIControls(bool IsWad)
-{
-	wxButton * const EditConfig =
-		new wxButton(this, ID_EDITCONFIG, _("Edit Config"), wxDefaultPosition, wxDefaultSize);
-	EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file"));
-
-	wxButton * const EditConfigDefault =
-		new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize);
-	EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor."));
-
-	// Notebook
-	wxNotebook * const m_Notebook =
-		new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
-	wxPanel * const m_GameConfig =
-		new wxPanel(m_Notebook, ID_GAMECONFIG, wxDefaultPosition, wxDefaultSize);
-	m_Notebook->AddPage(m_GameConfig, _("GameConfig"));
-	wxPanel * const m_PatchPage =
-		new wxPanel(m_Notebook, ID_PATCH_PAGE, wxDefaultPosition, wxDefaultSize);
-	m_Notebook->AddPage(m_PatchPage, _("Patches"));
-	wxPanel * const m_CheatPage =
-		new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize);
-	m_Notebook->AddPage(m_CheatPage, _("AR Codes"));
-	m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook);
-	m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes"));
-	wxPanel * const m_Information =
-		new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize);
-	m_Notebook->AddPage(m_Information, _("Info"));
-
-	// GameConfig editing - Overrides and emulation state
-	wxStaticText * const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting."));
-
-	// Core
-	CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"), wxDefaultValidator);
-	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"), wxDefaultValidator);
-	MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"), wxDefaultValidator);
-	MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
-	TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"), wxDefaultValidator);
-	TLBHack->SetToolTip(_("Fast version of the MMU.  Does not work for every game."));
-	DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"), wxDefaultValidator);
-	DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled."));
-	VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"), wxDefaultValidator);
-	VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)"));
-	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"), wxDefaultValidator);
-	SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)"));
-	FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"), wxDefaultValidator);
-	FastDiscSpeed->SetToolTip(_("Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = Compatible)"));
-	BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"), wxDefaultValidator);
-	DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"), wxDefaultValidator);
-
-	// Wii Console
-	EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"), wxDefaultValidator);
-
-	// Video
-	UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox"));
-	UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games."));
-
-	UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "ZTPSpeedupHack"));
-	UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game."));
-	
-	// Hack
-	wxFlexGridSizer * const szrPHackSettings = new wxFlexGridSizer(0);
-	PHackEnable = new wxCheckBox(m_GameConfig, ID_PHACKENABLE, _("Custom Projection Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
-	PHackEnable->SetToolTip(_("Enables Custom Projection Hack"));
-	PHSettings = new wxButton(m_GameConfig, ID_PHSETTINGS, _("Settings..."));
-	PHSettings->SetToolTip(_("Customize some Orthographic Projection parameters."));
-
-	wxBoxSizer * const sEmuState = new wxBoxSizer(wxHORIZONTAL);
-	wxStaticText * const EmuStateText =
-		new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
-	arrayStringFor_EmuState.Add(_("Not Set"));
-	arrayStringFor_EmuState.Add(_("Broken"));
-	arrayStringFor_EmuState.Add(_("Intro"));
-	arrayStringFor_EmuState.Add(_("In Game"));
-	arrayStringFor_EmuState.Add(_("Playable"));
-	arrayStringFor_EmuState.Add(_("Perfect"));
-	EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE,
-			wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState);
-	EmuIssues = new wxTextCtrl(m_GameConfig, ID_EMU_ISSUES, wxEmptyString);
-
-	wxBoxSizer * const sConfigPage = new wxBoxSizer(wxVERTICAL);
-	wxStaticBoxSizer * const sbCoreOverrides =
-		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
-	sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(MMU, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(TLBHack, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(SyncGPU, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5);	
-	sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5);
-	sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5);
-
-	wxStaticBoxSizer * const sbWiiOverrides =
-		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
-	if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
-	{
-		sbWiiOverrides->ShowItems(false);
-		EnableWideScreen->Hide();
-	}
-	sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
-
-	wxStaticBoxSizer * const sbVideoOverrides =
-		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
-	sbVideoOverrides->Add(UseBBox, 0, wxLEFT, 5);
-	sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxLEFT, 5);
-	szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
-	szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5);
-
-	sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
-	wxStaticBoxSizer * const sbGameConfig =
-		new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
-	sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
-	sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
-	sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND);
-	sbGameConfig->Add(sbVideoOverrides, 0, wxEXPAND);
-	sConfigPage->Add(sbGameConfig, 0, wxEXPAND|wxALL, 5);
-	sEmuState->Add(EmuStateText, 0, wxALIGN_CENTER_VERTICAL);
-	sEmuState->Add(EmuState, 0, wxEXPAND);
-	sEmuState->Add(EmuIssues, 1, wxEXPAND);
-	sConfigPage->Add(sEmuState, 0, wxEXPAND|wxALL, 5);
-	m_GameConfig->SetSizer(sConfigPage);
-
-	
-	// Patches
-	wxBoxSizer * const sPatches = new wxBoxSizer(wxVERTICAL);
-	Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition,
-			wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL);
-	wxBoxSizer * const sPatchButtons = new wxBoxSizer(wxHORIZONTAL);
-	EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit..."));
-	wxButton * const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add..."));
-	RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove"));
-	EditPatch->Enable(false);
-	RemovePatch->Enable(false);
-
-	wxBoxSizer* sPatchPage = new wxBoxSizer(wxVERTICAL);
-	sPatches->Add(Patches, 1, wxEXPAND|wxALL, 0);
-	sPatchButtons->Add(EditPatch,  0, wxEXPAND|wxALL, 0);
-	sPatchButtons->AddStretchSpacer();
-	sPatchButtons->Add(AddPatch,  0, wxEXPAND|wxALL, 0);
-	sPatchButtons->Add(RemovePatch,  0, wxEXPAND|wxALL, 0);
-	sPatches->Add(sPatchButtons, 0, wxEXPAND|wxALL, 0);
-	sPatchPage->Add(sPatches, 1, wxEXPAND|wxALL, 5);
-	m_PatchPage->SetSizer(sPatchPage);
-
-	
-	// Action Replay Cheats
-	wxBoxSizer * const sCheats = new wxBoxSizer(wxVERTICAL);
-	Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition,
-			wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL);
-	wxBoxSizer * const sCheatButtons = new wxBoxSizer(wxHORIZONTAL);
-	EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit..."));
-	wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add..."));
-	RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove"),
-			wxDefaultPosition, wxDefaultSize, 0);
-	EditCheat->Enable(false);
-	RemoveCheat->Enable(false);
-
-	wxBoxSizer* sCheatPage = new wxBoxSizer(wxVERTICAL);
-	sCheats->Add(Cheats, 1, wxEXPAND|wxALL, 0);
-	sCheatButtons->Add(EditCheat,  0, wxEXPAND|wxALL, 0);
-	sCheatButtons->AddStretchSpacer();
-	sCheatButtons->Add(AddCheat,  0, wxEXPAND|wxALL, 0);
-	sCheatButtons->Add(RemoveCheat,  0, wxEXPAND|wxALL, 0);
-	sCheats->Add(sCheatButtons, 0, wxEXPAND|wxALL, 0);
-	sCheatPage->Add(sCheats, 1, wxEXPAND|wxALL, 5);
-	m_CheatPage->SetSizer(sCheatPage);
-
-	
-	wxStaticText * const m_NameText =
-		new wxStaticText(m_Information, wxID_ANY, _("Name:"));
-	m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_GameIDText =
-		new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
-	m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_CountryText =
-		new wxStaticText(m_Information, wxID_ANY, _("Country:"));
-	m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_MakerIDText =
-		new wxStaticText(m_Information, wxID_ANY, _("Maker ID:"));
-	m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_RevisionText =
-		new wxStaticText(m_Information, wxID_ANY, _("Revision:"));
-	m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString,
-			 wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_DateText =
-		new wxStaticText(m_Information, wxID_ANY, _("Date:"));
-	m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_FSTText =
-		new wxStaticText(m_Information, wxID_ANY, _("FST Size:"));	
-	m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString,
-			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-
-	wxStaticText * const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:"));
-	arrayStringFor_Lang.Add(_("English"));
-	arrayStringFor_Lang.Add(_("German"));
-	arrayStringFor_Lang.Add(_("French"));
-	arrayStringFor_Lang.Add(_("Spanish"));
-	arrayStringFor_Lang.Add(_("Italian"));
-	arrayStringFor_Lang.Add(_("Dutch"));
-	int language = (int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
-	if (IsWad)
-	{
-		arrayStringFor_Lang.Insert(_("Japanese"), 0);
-		arrayStringFor_Lang.Add(_("Simplified Chinese"));
-		arrayStringFor_Lang.Add(_("Traditional Chinese"));
-		arrayStringFor_Lang.Add(_("Korean"));
-		
-		language = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
-	}
-	m_Lang = new wxChoice(m_Information, ID_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_Lang);
-	m_Lang->SetSelection(language);
-	
-	wxStaticText * const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:"));
-	m_ShortName = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
-	m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
-	wxStaticText * const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:"));
-	m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
-	wxStaticText * const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
-	m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32), 0);
-
-	// ISO Details
-	wxGridBagSizer * const sISODetails = new wxGridBagSizer(0, 0);
-	sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_GameID, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_Country, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_MakerIDText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_MakerID, wxGBPosition(3, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_RevisionText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_Revision, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_DateText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_Date, wxGBPosition(5, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_FSTText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_FST, wxGBPosition(6, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->AddGrowableCol(1);
-	wxStaticBoxSizer * const sbISODetails =
-		new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details"));
-	sbISODetails->Add(sISODetails, 0, wxEXPAND, 5);
-
-	// Banner Details
-	wxGridBagSizer * const sBannerDetails = new wxGridBagSizer(0, 0);
-	sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sBannerDetails->Add(m_ShortText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBannerDetails->Add(m_ShortName, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sBannerDetails->Add(m_MakerText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBannerDetails->Add(m_Maker, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sBannerDetails->Add(m_CommentText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5);
-	sBannerDetails->Add(m_Comment, wxGBPosition(3, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sBannerDetails->Add(m_BannerText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
-	sBannerDetails->Add(m_Banner, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sBannerDetails->AddGrowableCol(1);
-	wxStaticBoxSizer * const sbBannerDetails =
-		new wxStaticBoxSizer(wxVERTICAL, m_Information, _("Banner Details"));
-	sbBannerDetails->Add(sBannerDetails, 0, wxEXPAND, 5);
-
-	wxBoxSizer * const sInfoPage = new wxBoxSizer(wxVERTICAL);
-	sInfoPage->Add(sbISODetails, 0, wxEXPAND|wxALL, 5);
-	sInfoPage->Add(sbBannerDetails, 0, wxEXPAND|wxALL, 5);
-	m_Information->SetSizer(sInfoPage);
-
-	if (!IsWad)
-	{
-		wxPanel * const m_Filesystem =
-			new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize);
-		m_Notebook->AddPage(m_Filesystem, _("Filesystem"));
-
-		// Filesystem icons
-		wxImageList * const m_iconList = new wxImageList(16, 16);
-		m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap);	// 0
-		m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap);	// 1
-		m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap);	// 2
-
-		// Filesystem tree
-		m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL,
-				wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE);
-		m_Treectrl->AssignImageList(m_iconList);
-		RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0);
-
-		wxBoxSizer* sTreePage = new wxBoxSizer(wxVERTICAL);
-		sTreePage->Add(m_Treectrl, 1, wxEXPAND|wxALL, 5);
-		m_Filesystem->SetSizer(sTreePage);
-	}
-
-	wxSizer* sButtons = CreateButtonSizer(wxNO_DEFAULT);
-	sButtons->Prepend(EditConfigDefault);
-	sButtons->Prepend(EditConfig);
-	sButtons->Add(new wxButton(this, wxID_OK, _("Close")));
-
-	// If there is no default gameini, disable the button.
-	if (!File::Exists(GameIniFileDefault))
-		EditConfigDefault->Disable();
-
-	// Add notebook and buttons to the dialog
-	wxBoxSizer* sMain;
-	sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5);
-	sMain->Add(sButtons, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	sMain->SetMinSize(wxSize(500, -1));
-
-	SetSizerAndFit(sMain);
-	Center();
-	SetFocus();
-}
-
-void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))
-{
-	if (!SaveGameConfig())
-		PanicAlertT("Could not save %s", GameIniFileLocal.c_str());
-
-	EndModal(bRefreshList ? wxID_OK : wxID_CANCEL);
-}
-
-void CISOProperties::OnCloseClick(wxCommandEvent& WXUNUSED (event))
-{
-	Close();
-}
-
-void CISOProperties::RightClickOnBanner(wxMouseEvent& event)
-{
-	wxMenu* popupMenu = new wxMenu;
-	popupMenu->Append(IDM_BNRSAVEAS, _("Save as..."));
-	PopupMenu(popupMenu);
-
-	event.Skip();
-}
-
-void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event))
-{
-	wxString dirHome;
-
-	wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(wxT("%s.png"), m_GameID->GetLabel().c_str()),
-		wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize);
-	if (dialog.ShowModal() == wxID_OK)
-	{
-		m_Banner->GetBitmap().ConvertToImage().SaveFile(dialog.GetPath());
-	}
-}
-
-void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
-{
-	m_Treectrl->SelectItem(event.GetItem());
-
-	wxMenu* popupMenu = new wxMenu;
-
-	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0
-		&& m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
-	{
-		popupMenu->Append(IDM_EXTRACTDIR, _("Extract Partition..."));
-	}
-	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1)
-		popupMenu->Append(IDM_EXTRACTDIR, _("Extract Directory..."));
-	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2)
-		popupMenu->Append(IDM_EXTRACTFILE, _("Extract File..."));
-	
-	popupMenu->Append(IDM_EXTRACTALL, _("Extract All Files..."));
-	
-	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0
-		&& m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
-	{
-		popupMenu->AppendSeparator();
-		popupMenu->Append(IDM_EXTRACTAPPLOADER, _("Extract Apploader..."));
-		popupMenu->Append(IDM_EXTRACTDOL, _("Extract DOL..."));
-		popupMenu->AppendSeparator();
-		popupMenu->Append(IDM_CHECKINTEGRITY, _("Check Partition Integrity"));
-	}
-	
-	PopupMenu(popupMenu);
-
-	event.Skip();
-}
-
-void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
-{
-	wxString Path;
-	wxString File;
-
-	File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
-	
-	Path = wxFileSelector(
-		_("Export File"),
-		wxEmptyString, File, wxEmptyString,
-		wxGetTranslation(wxALL_FILES),
-		wxFD_SAVE,
-		this);
-
-	if (!Path || !File)
-		return;
-
-	while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
-	{
-		wxString temp;
-		temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
-		File = temp + wxT(DIR_SEP_CHR) + File;
-
-		m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
-	}
-
-	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-	{
-		int partitionNum = wxAtoi(File.Mid(File.find_first_of("/"), 1));
-		File.Remove(0, File.find_first_of("/") +1); // Remove "Partition x/"
-		WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
-	}
-	else
-	{
-		pFileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
-	}
-}
-
-void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolder, const int partitionNum)
-{
-	char exportName[512];
-	u32 index[2] = {0, 0};
-	std::vector<const DiscIO::SFileInfo *> fst;
-	DiscIO::IFileSystem *FS = 0;
-
-	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-	{
-		FS = WiiDisc.at(partitionNum).FileSystem;
-	}
-	else
-	{
-		FS = pFileSystem;
-	}
-
-	FS->GetFileList(fst);
-
-	if (!_rFullPath) // Extract all
-	{
-		index[0] = 0;
-		index[1] = (u32)fst.size();
-
-		FS->ExportApploader(_rExportFolder);
-		if (!DiscIO::IsVolumeWiiDisc(OpenISO))
-			FS->ExportDOL(_rExportFolder);
-	}
-	else // Look for the dir we are going to extract
-	{
-		for(index[0] = 0; index[0] < fst.size(); index[0]++)
-		{
-			if (!strcmp(fst.at(index[0])->m_FullPath, _rFullPath))
-			{
-				DEBUG_LOG(DISCIO, "Found the directory at %u", index[0]);
-				index[1] = (u32)fst.at(index[0])->m_FileSize;
-				break;
-			}
-		}
-
-		DEBUG_LOG(DISCIO,"Directory found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
-	}
-
-	wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files");
-	wxProgressDialog dialog(
-		dialogTitle,
-		_("Extracting..."),
-		index[1] - 1,
-		this,
-		wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT |
-		wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME |
-		wxPD_SMOOTH
-		);
-
-	// Extraction
-	for (u32 i = index[0]; i < index[1]; i++)
-	{
-		dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
-			(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
-		
-		dialog.Update(i, wxString::Format(_("Extracting %s"),
-			StrToWxStr(fst[i]->m_FullPath)));
-
-		if (dialog.WasCancelled())
-			break;
-
-		if (fst[i]->IsDirectory())
-		{
-			snprintf(exportName, sizeof(exportName), "%s/%s/", _rExportFolder, fst[i]->m_FullPath);
-			DEBUG_LOG(DISCIO, "%s", exportName);		
-
-			if (!File::Exists(exportName) && !File::CreateFullPath(exportName))
-			{
-				ERROR_LOG(DISCIO, "Could not create the path %s", exportName);
-			}
-			else
-			{
-				if (!File::IsDirectory(exportName))
-					ERROR_LOG(DISCIO, "%s already exists and is not a directory", exportName);
-
-				DEBUG_LOG(DISCIO, "Folder %s already exists", exportName);
-			}
-		}
-		else
-		{
-			snprintf(exportName, sizeof(exportName), "%s/%s", _rExportFolder, fst[i]->m_FullPath);
-			DEBUG_LOG(DISCIO, "%s", exportName);
-
-			if (!File::Exists(exportName) && !FS->ExportFile(fst[i]->m_FullPath, exportName))
-			{
-				ERROR_LOG(DISCIO, "Could not export %s", exportName);
-			}
-			else
-			{
-				DEBUG_LOG(DISCIO, "%s already exists", exportName);
-			}
-		}
-	}
-}
-
-void CISOProperties::OnExtractDir(wxCommandEvent& event)
-{
-	wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
-	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
-
-	if (!Path || !Directory)
-		return;
-
-	if (event.GetId() == IDM_EXTRACTALL)
-	{
-		if (DiscIO::IsVolumeWiiDisc(OpenISO))
-			for (u32 i = 0; i < WiiDisc.size(); i++)
-				ExportDir(NULL, WxStrToStr(Path).c_str(), i);
-		else
-			ExportDir(NULL, WxStrToStr(Path).c_str());
-
-		return;
-	}
-
-	while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
-	{
-		wxString temp;
-		temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
-		Directory = temp + wxT(DIR_SEP_CHR) + Directory;
-
-		m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
-	}
-
-	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-	{
-		int partitionNum = wxAtoi(Directory.Mid(Directory.find_first_of("/"), 1));
-		Directory.Remove(0, Directory.find_first_of("/") +1); // Remove "Partition x/"
-		ExportDir(WxStrToStr(Directory).c_str(), WxStrToStr(Path).c_str(), partitionNum);
-	}
-	else
-	{
-		ExportDir(WxStrToStr(Directory).c_str(), WxStrToStr(Path).c_str());
-	}
-}
-
-void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
-{
-	std::vector<const DiscIO::SFileInfo *> fst;
-	DiscIO::IFileSystem *FS = NULL;
-	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
-
-	if (Path.empty())
-		return;
-
-	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-	{
-		wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
-		std::size_t partitionNum = (std::size_t)wxAtoi(Directory.Mid(Directory.find_first_of("/"), 1));
-		Directory.Remove(0, Directory.find_first_of("/") +1); // Remove "Partition x/"
-		
-		if(WiiDisc.size() > partitionNum)
-		{
-			// Get the filesystem of the LAST partition
-			FS = WiiDisc.at(partitionNum).FileSystem;
-		}
-		else
-		{
-			PanicAlertT("Partition doesn't exist: %lu", partitionNum);
-			return;
-		}
-	}
-	else
-	{
-		FS = pFileSystem;
-	}
-	
-	bool ret = false;
-	if (event.GetId() == IDM_EXTRACTAPPLOADER)
-	{
-		ret = FS->ExportApploader(WxStrToStr(Path).c_str());
-	}
-	else if (event.GetId() == IDM_EXTRACTDOL)
-	{
-		ret = FS->ExportDOL(WxStrToStr(Path).c_str());
-	}
-
-	if (!ret)
-		PanicAlertT("Failed to extract to %s!", WxStrToStr(Path).c_str());
-}
-
-class IntegrityCheckThread : public wxThread
-{
-public:
-	IntegrityCheckThread(const WiiPartition& Partition)
-		: wxThread(wxTHREAD_JOINABLE), m_Partition(Partition)
-	{
-		Create();
-	}
-
-	virtual ExitCode Entry()
-	{
-		return (ExitCode)m_Partition.Partition->CheckIntegrity();
-	}
-
-private:
-	const WiiPartition& m_Partition;
-};
-
-void CISOProperties::CheckPartitionIntegrity(wxCommandEvent& event)
-{
-	// Normally we can't enter this function if we aren't analyzing a Wii disc
-	// anyway, but let's still check to be sure.
-	if (!DiscIO::IsVolumeWiiDisc(OpenISO))
-		return;
-
-	wxString PartitionName = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
-	if (!PartitionName)
-		return;
-
-	// Get the partition number from the item text ("Partition N")
-	int PartitionNum = wxAtoi(PartitionName.Mid(PartitionName.find_first_of("0123456789"), 1));
-	const WiiPartition& Partition = WiiDisc[PartitionNum];
-
-	wxProgressDialog* dialog = new wxProgressDialog(
-		_("Checking integrity..."), _("Working..."), 1000, this,
-		wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_SMOOTH
-	);
-
-	IntegrityCheckThread thread(Partition);
-	thread.Run();
-
-	while (thread.IsAlive())
-	{
-		dialog->Pulse();
-		wxThread::Sleep(50);
-	}
-
-	delete dialog;
-
-	if (!thread.Wait())
-	{
-		wxMessageBox(
-			wxString::Format(_("Integrity check for partition %d failed. "
-							   "Your dump is most likely corrupted or has been "
-							   "patched incorrectly."), PartitionNum),
-			_("Integrity Check Error"), wxOK | wxICON_ERROR, this
-		);
-	}
-	else
-	{
-		wxMessageBox(_("Integrity check completed. No errors have been found."),
-					 _("Integrity check completed"), wxOK | wxICON_INFORMATION, this);
-	}
-}
-
-void CISOProperties::SetRefresh(wxCommandEvent& event)
-{
-	bRefreshList = true;
-
-	if (event.GetId() == ID_EMUSTATE)
-		EmuIssues->Enable(event.GetSelection() != 0);
-}
-
-void CISOProperties::SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox)
-{
-	// Prefer local gameini value over default gameini value.
-	bool value;
-	if (GameIniLocal.Get(section, key, &value))
-		checkbox->Set3StateValue((wxCheckBoxState)value);
-	else if (GameIniDefault.Get(section, key, &value))
-		checkbox->Set3StateValue((wxCheckBoxState)value);
-	else
-		checkbox->Set3StateValue(wxCHK_UNDETERMINED);
-}
-
-void CISOProperties::LoadGameConfig()
-{
-	SetCheckboxValueFromGameini("Core", "CPUThread", CPUThread);
-	SetCheckboxValueFromGameini("Core", "SkipIdle", SkipIdle);
-	SetCheckboxValueFromGameini("Core", "MMU", MMU);
-	SetCheckboxValueFromGameini("Core", "TLBHack", TLBHack);
-	SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF);
-	SetCheckboxValueFromGameini("Core", "VBeam", VBeam);
-	SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU);
-	SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed);
-	SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging);
-	SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE);
-	SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen);
-	SetCheckboxValueFromGameini("Video", "UseBBox", UseBBox);
-	SetCheckboxValueFromGameini("Video", "ZTPSpeedupHack", UseZTPSpeedupHack);
-
-	// First set values from default gameini, then apply values from local gameini
-	int iTemp;
-	GameIniDefault.Get("Video", "ProjectionHack", &iTemp);
-	PHackEnable->SetValue(iTemp);
-	if (GameIniLocal.Get("Video", "ProjectionHack", &iTemp))
-		PHackEnable->SetValue(iTemp);
-
-	GameIniDefault.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear);
-	if (GameIniLocal.GetIfExists("Video", "PH_SZNear", &iTemp))
-		PHack_Data.PHackSZNear = iTemp;
-	GameIniDefault.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar);
-	if (GameIniLocal.GetIfExists("Video", "PH_SZFar", &iTemp))
-		PHack_Data.PHackSZFar = iTemp;
-	GameIniDefault.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP);
-	if (GameIniLocal.GetIfExists("Video", "PH_ExtraParam", &iTemp))
-		PHack_Data.PHackExP = iTemp;
-
-	std::string sTemp;
-	GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear);
-	if (GameIniLocal.GetIfExists("Video", "PH_ZNear", &sTemp))
-		PHack_Data.PHZNear = sTemp;
-	GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar);
-	if (GameIniLocal.GetIfExists("Video", "PH_ZFar", &sTemp))
-		PHack_Data.PHZFar = sTemp;
-
-	GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/);
-	EmuState->SetSelection(iTemp);
-	if (GameIniLocal.GetIfExists("EmuState", "EmulationStateId", &iTemp))
-		EmuState->SetSelection(iTemp);
-
-	GameIniDefault.Get("EmuState", "EmulationIssues", &sTemp);
-	if (!sTemp.empty())
-		EmuIssues->SetValue(StrToWxStr(sTemp));
-	if (GameIniLocal.GetIfExists("EmuState", "EmulationIssues", &sTemp))
-		EmuIssues->SetValue(StrToWxStr(sTemp));
-
-	EmuIssues->Enable(EmuState->GetSelection() != 0);
-
-	PatchList_Load();
-	ActionReplayList_Load();
-	m_geckocode_panel->LoadCodes(GameIniLocal, OpenISO->GetUniqueID());
-}
-
-void CISOProperties::SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox)
-{
-	// Delete any existing entries from the local gameini if checkbox is undetermined.
-	// Otherwise, write the current value to the local gameini if the value differs from the default gameini values.
-	// Delete any existing entry from the local gameini if the value does not differ from the default gameini value.
-	bool checkbox_val = (checkbox->Get3StateValue() == wxCHK_CHECKED);
-
-	if (checkbox->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIniLocal.DeleteKey(section, key);
-	else if (!GameIniDefault.Exists(section, key))
-		GameIniLocal.Set(section, key, checkbox_val);
-	else
-	{
-		bool default_value;
-		GameIniDefault.Get(section, key, &default_value);
-		if (default_value != checkbox_val)
-			GameIniLocal.Set(section, key, checkbox_val);
-		else
-			GameIniLocal.DeleteKey(section, key);
-	}
-}
-
-bool CISOProperties::SaveGameConfig()
-{
-	SaveGameIniValueFrom3StateCheckbox("Core", "CPUThread", CPUThread);
-	SaveGameIniValueFrom3StateCheckbox("Core", "SkipIdle", SkipIdle);
-	SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU);
-	SaveGameIniValueFrom3StateCheckbox("Core", "TLBHack", TLBHack);
-	SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF);
-	SaveGameIniValueFrom3StateCheckbox("Core", "VBeam", VBeam);
-	SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU);
-	SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed);
-	SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging);
-	SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE);
-	SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen);
-	SaveGameIniValueFrom3StateCheckbox("Video", "UseBBox", UseBBox);
-	SaveGameIniValueFrom3StateCheckbox("Video", "ZTPSpeedupHack", UseZTPSpeedupHack);
-
-	#define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \
-		if (GameIniDefault.Exists((section), (key))) { \
-			std::remove_reference<decltype((val))>::type tmp__; \
-			GameIniDefault.Get((section), (key), &tmp__); \
-			if ((val) != tmp__) \
-				GameIniLocal.Set((section), (key), (val)); \
-			else \
-				GameIniLocal.DeleteKey((section), (key)); \
-		} else if ((val) != (def)) \
-			GameIniLocal.Set((section), (key), (val)); \
-		else \
-			GameIniLocal.DeleteKey((section), (key)); \
-	} while (0)
-
-	SAVE_IF_NOT_DEFAULT("Video", "ProjectionHack", (int)PHackEnable->GetValue(), 0);
-	SAVE_IF_NOT_DEFAULT("Video", "PH_SZNear", (PHack_Data.PHackSZNear ? 1 : 0), 0);
-	SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (PHack_Data.PHackSZFar ? 1 : 0), 0);
-	SAVE_IF_NOT_DEFAULT("Video", "PH_ExtraParam", (PHack_Data.PHackExP ? 1 : 0), 0);
-	SAVE_IF_NOT_DEFAULT("Video", "PH_ZNear", PHack_Data.PHZNear, "");
-	SAVE_IF_NOT_DEFAULT("Video", "PH_ZFar", PHack_Data.PHZFar, "");
-	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationStateId", EmuState->GetSelection(), 0);
-
-	std::string emu_issues = EmuIssues->GetValue().ToStdString();
-	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationIssues", emu_issues, "");
-
-	PatchList_Save();
-	ActionReplayList_Save();
-	Gecko::SaveCodes(GameIniLocal, m_geckocode_panel->GetCodes());
-
-	bool success = GameIniLocal.Save(GameIniFileLocal.c_str());
-
-	// If the resulting file is empty, delete it. Kind of a hack, but meh.
-	if (success && File::GetSize(GameIniFileLocal) == 0)
-		File::Delete(GameIniFileLocal);
-
-	return success;
-}
-
-void CISOProperties::LaunchExternalEditor(const std::string& filename)
-{
-#ifdef __APPLE__
-	// wxTheMimeTypesManager is not yet implemented for wxCocoa
-	[[NSWorkspace sharedWorkspace] openFile:
-		[NSString stringWithUTF8String: filename.c_str()]
-		withApplication: @"TextEdit"];
-#else
-	wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini"));
-	if(filetype == NULL) // From extension failed, trying with MIME type now
-	{
-		filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"));
-		if(filetype == NULL) // MIME type failed, aborting mission
-		{
-			PanicAlertT("Filetype 'ini' is unknown! Will not open!");
-			return;
-		}
-	}
-	wxString OpenCommand;
-	OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename));
-	if(OpenCommand.IsEmpty())
-		PanicAlertT("Couldn't find open command for extension 'ini'!");
-	else
-		if(wxExecute(OpenCommand, wxEXEC_SYNC) == -1)
-			PanicAlertT("wxExecute returned -1 on application run!");
-#endif
-
-	bRefreshList = true; // Just in case
-
-	// Once we're done with the ini edit, give the focus back to Dolphin 
-	SetFocus();
-}
-
-void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event))
-{
-	SaveGameConfig();
-	// Create blank file to prevent editor from prompting to create it.
-	if (!File::Exists(GameIniFileLocal))
-	{
-		std::fstream blankFile(GameIniFileLocal, std::ios::out);
-		blankFile.close();
-	}
-	LaunchExternalEditor(GameIniFileLocal);
-	GameIniLocal.Load(GameIniFileLocal);
-	LoadGameConfig();
-}
-
-void CISOProperties::OnShowDefaultConfig(wxCommandEvent& WXUNUSED (event))
-{
-	LaunchExternalEditor(GameIniFileDefault);
-}
-
-void CISOProperties::ListSelectionChanged(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case ID_PATCHES_LIST:
-		if (Patches->GetSelection() == wxNOT_FOUND
-		        || DefaultPatches.find(Patches->GetString(Patches->GetSelection()).ToStdString()) != DefaultPatches.end())
-		{
-			EditPatch->Disable();
-			RemovePatch->Disable();
-		}
-		else
-		{
-			EditPatch->Enable();
-			RemovePatch->Enable();
-		}
-		break;
-	case ID_CHEATS_LIST:
-		if (Cheats->GetSelection() == wxNOT_FOUND
-		        || DefaultCheats.find(Cheats->GetString(Cheats->GetSelection()).ToStdString()) != DefaultCheats.end())
-		{
-			EditCheat->Disable();
-			RemoveCheat->Disable();
-		}
-		else
-		{
-			EditCheat->Enable();
-			RemoveCheat->Enable();
-		}
-		break;
-	}
-}
-
-void CISOProperties::PatchList_Load()
-{
-	onFrame.clear();
-	Patches->Clear();
-
-	PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIniDefault, GameIniLocal);
-
-	u32 index = 0;
-	for (auto it = onFrame.begin(); it != onFrame.end(); ++it)
-	{
-		PatchEngine::Patch p = *it;
-		Patches->Append(StrToWxStr(p.name));
-		Patches->Check(index, p.active);
-		if (!p.user_defined)
-			DefaultPatches.insert(p.name);
-		++index;
-	}
-}
-
-void CISOProperties::PatchList_Save()
-{
-	std::vector<std::string> lines;
-	std::vector<std::string> enabledLines;
-	u32 index = 0;
-	for (auto onFrame_it = onFrame.begin(); onFrame_it != onFrame.end(); ++onFrame_it)
-	{
-		if (Patches->IsChecked(index))
-			enabledLines.push_back("$" + onFrame_it->name);
-
-		// Do not save default patches.
-		if (DefaultPatches.find(onFrame_it->name) == DefaultPatches.end())
-		{
-			lines.push_back("$" + onFrame_it->name);
-			for (auto iter2 = onFrame_it->entries.begin(); iter2 != onFrame_it->entries.end(); ++iter2)
-			{
-				std::string temp = StringFromFormat("0x%08X:%s:0x%08X", iter2->address, PatchEngine::PatchTypeStrings[iter2->type], iter2->value);
-				lines.push_back(temp);
-			}
-		}
-		++index;
-	}
-	GameIniLocal.SetLines("OnFrame_Enabled", enabledLines);
-	GameIniLocal.SetLines("OnFrame", lines);
-}
-
-void CISOProperties::PHackButtonClicked(wxCommandEvent& event)
-{
-	if (event.GetId() == ID_PHSETTINGS)
-	{
-		::PHack_Data = PHack_Data;
-		CPHackSettings dlg(this, 1);
-		if (dlg.ShowModal() == wxID_OK)
-			PHack_Data = ::PHack_Data;
-	}
-}
-
-void CISOProperties::PatchButtonClicked(wxCommandEvent& event)
-{
-	int selection = Patches->GetSelection();
-	
-	switch (event.GetId())
-	{
-	case ID_EDITPATCH:
-		{
-		CPatchAddEdit dlg(selection, this);
-		dlg.ShowModal();
-		}
-		break;
-	case ID_ADDPATCH:
-		{
-		CPatchAddEdit dlg(-1, this, 1, _("Add Patch"));
-		if (dlg.ShowModal() == wxID_OK)
-		{
-			Patches->Append(StrToWxStr(onFrame.back().name));
-			Patches->Check((unsigned int)(onFrame.size() - 1), onFrame.back().active);
-		}
-		}
-		break;
-	case ID_REMOVEPATCH:
-		onFrame.erase(onFrame.begin() + Patches->GetSelection());
-		Patches->Delete(Cheats->GetSelection());
-		break;
-	}
-
-	PatchList_Save();
-	Patches->Clear();
-	PatchList_Load();
-
-	EditPatch->Enable(false);
-	RemovePatch->Enable(false);
-}
-
-void CISOProperties::ActionReplayList_Load()
-{
-	arCodes.clear();
-	Cheats->Clear();
-	ActionReplay::LoadCodes(arCodes, GameIniDefault, GameIniLocal);
-
-	u32 index = 0;
-	for (std::vector<ActionReplay::ARCode>::const_iterator it = arCodes.begin(); it != arCodes.end(); ++it)
-	{
-		ActionReplay::ARCode arCode = *it;
-		Cheats->Append(StrToWxStr(arCode.name));
-		Cheats->Check(index, arCode.active);
-		if (!arCode.user_defined)
-			DefaultCheats.insert(arCode.name);
-		++index;
-	}
-}
-
-void CISOProperties::ActionReplayList_Save()
-{
-	std::vector<std::string> lines;
-	std::vector<std::string> enabledLines;
-	u32 index = 0;
-	for (auto iter = arCodes.begin(); iter != arCodes.end(); ++iter)
-	{
-		ActionReplay::ARCode code = *iter;
-
-		if (Cheats->IsChecked(index))
-			enabledLines.push_back("$" + code.name);
-
-		// Do not save default cheats.
-		if (DefaultCheats.find(code.name) == DefaultCheats.end())
-		{
-			lines.push_back("$" + code.name);
-			for (auto iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2)
-			{
-				lines.push_back(WxStrToStr(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value)));
-			}
-		}
-		++index;
-	}
-	GameIniLocal.SetLines("ActionReplay_Enabled", enabledLines);
-	GameIniLocal.SetLines("ActionReplay", lines);
-}
-
-void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
-{
-	int selection = Cheats->GetSelection();
-	
-	switch (event.GetId())
-	{
-	case ID_EDITCHEAT:
-		{
-		CARCodeAddEdit dlg(selection, this);
-		dlg.ShowModal();
-		}
-		break;
-	case ID_ADDCHEAT:
-		{
-			CARCodeAddEdit dlg(-1, this, 1, _("Add ActionReplay Code"));
-			if (dlg.ShowModal() == wxID_OK)
-			{
-				Cheats->Append(StrToWxStr(arCodes.back().name));
-				Cheats->Check((unsigned int)(arCodes.size() - 1), arCodes.back().active);
-			}
-		}
-		break;
-	case ID_REMOVECHEAT:
-		arCodes.erase(arCodes.begin() + Cheats->GetSelection());
-		Cheats->Delete(Cheats->GetSelection());
-		break;
-	}
-
-	ActionReplayList_Save();
-	Cheats->Clear();
-	ActionReplayList_Load();
-
-	EditCheat->Enable(false);
-	RemoveCheat->Enable(false);
-}
-
-void CISOProperties::OnChangeBannerLang(wxCommandEvent& event)
-{
-	ChangeBannerDetails(event.GetSelection());
-}
-
-void CISOProperties::ChangeBannerDetails(int lang)
-{
-	wxString const shortName = StrToWxStr(OpenGameListItem->GetName(lang));
-	wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(lang));
-	wxString const maker = StrToWxStr(OpenGameListItem->GetCompany());
-
-	// Updates the information shown in the window
-	m_ShortName->SetValue(shortName);
-	m_Comment->SetValue(comment);
-	m_Maker->SetValue(maker);//dev too
-
-	std::string filename, extension;
-	SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension);
-	// Also sets the window's title
-	SetTitle(StrToWxStr(StringFromFormat("%s%s: %s - ", filename.c_str(),
-		extension.c_str(), OpenGameListItem->GetUniqueID().c_str())) + shortName);
-}
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h
deleted file mode 100644
index f58c51dbee..0000000000
--- a/Source/Core/DolphinWX/Src/ISOProperties.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __ISOPROPERTIES_h__
-#define __ISOPROPERTIES_h__
-
-#include <wx/wx.h>
-#include <wx/sizer.h>
-#include <wx/filepicker.h>
-#include <wx/statbmp.h>
-#include <wx/imaglist.h>
-#include <wx/fontmap.h>
-#include <wx/treectrl.h>
-#include <wx/gbsizer.h>
-#include <wx/notebook.h>
-#include <wx/mimetype.h>
-#include <string>
-
-#include "ISOFile.h"
-#include "Filesystem.h"
-#include "IniFile.h"
-#include "PatchEngine.h"
-#include "ActionReplay.h"
-#include "GeckoCodeDiag.h"
-
-struct PHackData
-{
-	bool PHackSZNear;
-	bool PHackSZFar;
-	bool PHackExP;
-	std::string PHZNear;
-	std::string PHZFar;
-};
-
-class CISOProperties : public wxDialog
-{
-public:
-	CISOProperties(const std::string fileName,
-			wxWindow* parent,
-			wxWindowID id = 1,
-			const wxString& title = _("Properties"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
-	virtual ~CISOProperties();
-
-	bool bRefreshList;
-
-	void ActionReplayList_Load();
-	bool SaveGameConfig();
-
-	PHackData PHack_Data;
-
-private:
-	DECLARE_EVENT_TABLE();
-
-	// Core
-	wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *TLBHack;
-	wxCheckBox *VBeam, *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE;
-	// Wii
-	wxCheckBox *EnableWideScreen;
-	// Video
-	wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox;
-	wxButton *PHSettings;
-
-	wxArrayString arrayStringFor_EmuState;
-	wxChoice *EmuState;
-	wxTextCtrl *EmuIssues;
-	wxArrayString arrayStringFor_Patches;
-	wxCheckListBox *Patches;
-	wxButton *EditPatch;
-	wxButton *RemovePatch;
-	wxArrayString arrayStringFor_Cheats;
-	wxCheckListBox *Cheats;
-	wxButton *EditCheat;
-	wxButton *RemoveCheat;
-	wxArrayString arrayStringFor_Speedhacks;
-	wxCheckListBox *Speedhacks;
-	wxButton *EditSpeedhack;
-	wxButton *AddSpeedhack;
-	wxButton *RemoveSpeedhack;
-
-	wxTextCtrl *m_Name;
-	wxTextCtrl *m_GameID;
-	wxTextCtrl *m_Country;
-	wxTextCtrl *m_MakerID;
-	wxTextCtrl *m_Revision;
-	wxTextCtrl *m_Date;
-	wxTextCtrl *m_FST;
-	wxArrayString arrayStringFor_Lang;
-	wxChoice *m_Lang;
-	wxTextCtrl *m_ShortName;
-	wxTextCtrl *m_Maker;
-	wxTextCtrl *m_Comment;
-	wxStaticBitmap *m_Banner;
-
-	wxTreeCtrl *m_Treectrl;
-	wxTreeItemId RootId;
-
-	Gecko::CodeConfigPanel *m_geckocode_panel;
-
-	enum
-	{
-		ID_TREECTRL = 1000,
-
-		ID_NOTEBOOK,
-		ID_GAMECONFIG,
-		ID_PATCH_PAGE,
-		ID_ARCODE_PAGE,
-		ID_SPEEDHACK_PAGE,
-		ID_INFORMATION,
-		ID_FILESYSTEM,
-
-		ID_USEDUALCORE,
-		ID_IDLESKIP,
-		ID_MMU,
-		ID_DCBZOFF,
-		ID_TLBHACK,
-		ID_VBEAM,
-		ID_SYNCGPU,
-		ID_DISCSPEED,
-		ID_MERGEBLOCKS,
-		ID_AUDIO_DSP_HLE,
-		ID_USE_BBOX,
-		ID_ZTP_SPEEDUP,
-		ID_PHACKENABLE,
-		ID_PHSETTINGS,
-		ID_ENABLEPROGRESSIVESCAN,
-		ID_ENABLEWIDESCREEN,
-		ID_EDITCONFIG,
-		ID_SHOWDEFAULTCONFIG,
-		ID_EMUSTATE,
-		ID_EMU_ISSUES,
-		ID_PATCHES_LIST,
-		ID_EDITPATCH,
-		ID_ADDPATCH,
-		ID_REMOVEPATCH,
-		ID_CHEATS_LIST,
-		ID_EDITCHEAT,
-		ID_ADDCHEAT,
-		ID_REMOVECHEAT,
-
-		ID_NAME,
-		ID_GAMEID,
-		ID_COUNTRY,
-		ID_MAKERID,
-		ID_REVISION,
-		ID_DATE,
-		ID_FST,
-		ID_VERSION,
-		ID_LANG,
-		ID_SHORTNAME,
-		ID_LONGNAME,
-		ID_MAKER,
-		ID_COMMENT,
-		ID_BANNER,
-		IDM_EXTRACTDIR,
-		IDM_EXTRACTALL,
-		IDM_EXTRACTFILE,
-		IDM_EXTRACTAPPLOADER,
-		IDM_EXTRACTDOL,
-		IDM_CHECKINTEGRITY,
-		IDM_BNRSAVEAS
-	};
-
-	void LaunchExternalEditor(const std::string& filename);
-
-	void CreateGUIControls(bool);
-	void OnClose(wxCloseEvent& event);
-	void OnCloseClick(wxCommandEvent& event);
-	void OnEditConfig(wxCommandEvent& event);
-	void OnShowDefaultConfig(wxCommandEvent& event);
-	void ListSelectionChanged(wxCommandEvent& event);
-	void PatchButtonClicked(wxCommandEvent& event);
-	void ActionReplayButtonClicked(wxCommandEvent& event);
-	void RightClickOnBanner(wxMouseEvent& event);
-	void OnBannerImageSave(wxCommandEvent& event);
-	void OnRightClickOnTree(wxTreeEvent& event);
-	void OnExtractFile(wxCommandEvent& event);
-	void OnExtractDir(wxCommandEvent& event);
-	void OnExtractDataFromHeader(wxCommandEvent& event);
-	void CheckPartitionIntegrity(wxCommandEvent& event);
-	void SetRefresh(wxCommandEvent& event);
-	void OnChangeBannerLang(wxCommandEvent& event);
-	void PHackButtonClicked(wxCommandEvent& event);
-
-	GameListItem *OpenGameListItem;
-
-	std::vector<const DiscIO::SFileInfo *> GCFiles;
-	typedef std::vector<const DiscIO::SFileInfo *>::iterator fileIter;
-
-	size_t CreateDirectoryTree(wxTreeItemId& parent,
-			std::vector<const DiscIO::SFileInfo*> fileInfos,
-			const size_t _FirstIndex, 
-			const size_t _LastIndex);
-	void ExportDir(const char* _rFullPath, const char* _rExportFilename,
-			const int partitionNum = 0);
-
-	IniFile GameIniDefault;
-	IniFile GameIniLocal;
-	std::string GameIniFileDefault;
-	std::string GameIniFileLocal;
-
-	std::set<std::string> DefaultPatches;
-	std::set<std::string> DefaultCheats;
-
-	void LoadGameConfig();
-	void PatchList_Load();
-	void PatchList_Save();
-	void ActionReplayList_Save();
-	void ChangeBannerDetails(int lang);
-
-	long GetElementStyle(const char* section, const char* key);
-	void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox);
-	void SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox);
-};
-#endif
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
deleted file mode 100644
index 574834f940..0000000000
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ /dev/null
@@ -1,1045 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "InputConfigDiag.h"
-#include "UDPConfigDiag.h"
-#include "WxUtils.h"
-#include "HW/Wiimote.h"
-#include "ControllerInterface/ExpressionParser.h"
-
-using namespace ciface::ExpressionParser;
-
-void GamepadPage::ConfigUDPWii(wxCommandEvent &event)
-{
-	UDPWrapper* const wrp = ((UDPConfigButton*)event.GetEventObject())->wrapper;
-	UDPConfigDiag diag(this, wrp);
-	diag.ShowModal();
-}
-
-void GamepadPage::ConfigExtension(wxCommandEvent& event)
-{
-	ControllerEmu::Extension* const ex = ((ExtensionButton*)event.GetEventObject())->extension;
-
-	// show config diag, if "none" isn't selected
-	if (ex->switch_extension)
-	{
-		wxDialog dlg(this, -1,
-			wxGetTranslation(StrToWxStr(ex->attachments[ex->switch_extension]->GetName())),
-			wxDefaultPosition, wxDefaultSize);
-
-		wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
-		const std::size_t orig_size = control_groups.size();
-
-		ControlGroupsSizer* const szr =
-			new ControlGroupsSizer(ex->attachments[ex->switch_extension], &dlg, this, &control_groups);
-		main_szr->Add(szr, 0, wxLEFT, 5);
-		main_szr->Add(dlg.CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-		dlg.SetSizerAndFit(main_szr);
-		dlg.Center();
-
-		dlg.ShowModal();
-
-		// remove the new groups that were just added, now that the window closed
-		control_groups.resize(orig_size);
-	}
-}
-
-PadSettingExtension::PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext)
-	: PadSetting(new wxChoice(parent, -1))
-	, extension(ext)
-{
-
-	std::vector<ControllerEmu*>::const_iterator
-		i = extension->attachments.begin(),
-		e = extension->attachments.end();
-
-	for (; i!=e; ++i)
-		((wxChoice*)wxcontrol)->Append(wxGetTranslation(StrToWxStr((*i)->GetName())));
-
-	UpdateGUI();
-}
-
-void PadSettingExtension::UpdateGUI()
-{
-	((wxChoice*)wxcontrol)->Select(extension->switch_extension);
-}
-
-void PadSettingExtension::UpdateValue()
-{
-	extension->switch_extension = ((wxChoice*)wxcontrol)->GetSelection();
-}
-
-PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label)
-	: PadSetting(new wxCheckBox(parent, -1, wxGetTranslation(StrToWxStr(label)), wxDefaultPosition))
-	, value(_value)
-{
-	UpdateGUI();
-}
-
-void PadSettingCheckBox::UpdateGUI()
-{
-	((wxCheckBox*)wxcontrol)->SetValue(value > 0);
-}
-
-void PadSettingCheckBox::UpdateValue()
-{
-	// 0.01 so its saved to the ini file as just 1. :(
-	value = 0.01 * ((wxCheckBox*)wxcontrol)->GetValue();
-}
-
-void PadSettingSpin::UpdateGUI()
-{
-	((wxSpinCtrl*)wxcontrol)->SetValue((int)(value * 100));
-}
-
-void PadSettingSpin::UpdateValue()
-{
-	value = float(((wxSpinCtrl*)wxcontrol)->GetValue()) / 100;
-}
-
-ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref)
-	: wxDialog(parent, -1, _("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
-	, control_reference(ref)
-	, m_plugin(plugin)
-	, m_parent(parent)
-{
-	m_devq = m_parent->controller->default_device;
-
-	// GetStrings() sounds slow :/
-	//device_cbox = new wxComboBox(this, -1, StrToWxStr(ref->device_qualifier.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER);
-	device_cbox = new wxComboBox(this, -1, StrToWxStr(m_devq.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER);
-
-	device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &ControlDialog::SetDevice, this);
-	device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &ControlDialog::SetDevice, this);
-
-	wxStaticBoxSizer* const control_chooser = CreateControlChooser(parent);
-
-	wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer(wxVERTICAL, this, _("Device"));
-	d_szr->Add(device_cbox, 0, wxEXPAND|wxALL, 5);
-
-	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
-	szr->Add(d_szr, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5);
-	szr->Add(control_chooser, 1, wxEXPAND|wxALL, 5);
-
-	SetSizerAndFit(szr);	// needed
-
-	UpdateGUI();
-	SetFocus();
-}
-
-ControlButton::ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const unsigned int width, const std::string& label)
-: wxButton(parent, -1, wxT(""), wxDefaultPosition, wxSize(width,20))
-, control_reference(_ref)
-{
-	if (label.empty())
-		SetLabel(StrToWxStr(_ref->expression));
-	else
-		SetLabel(StrToWxStr(label));
-}
-
-void InputConfigDialog::UpdateProfileComboBox()
-{
-	std::string pname(File::GetUserPath(D_CONFIG_IDX));
-	pname += PROFILES_PATH;
-	pname += m_plugin.profile_name;
-
-	CFileSearch::XStringVector exts;
-	exts.push_back("*.ini");
-	CFileSearch::XStringVector dirs;
-	dirs.push_back(pname);
-	CFileSearch cfs(exts, dirs);
-	const CFileSearch::XStringVector& sv = cfs.GetFileNames();
-
-	wxArrayString strs;
-	CFileSearch::XStringVector::const_iterator si = sv.begin(),
-		se = sv.end();
-	for (; si!=se; ++si)
-	{
-		std::string str(si->begin() + si->find_last_of('/') + 1 , si->end() - 4) ;
-		strs.push_back(StrToWxStr(str));
-	}
-
-	std::vector< GamepadPage* >::iterator i = m_padpages.begin(),
-		e = m_padpages.end();
-	for (; i != e; ++i)
-	{
-		(*i)->profile_cbox->Clear();
-		(*i)->profile_cbox->Append(strs);
-	}
-}
-
-void InputConfigDialog::UpdateControlReferences()
-{
-	std::vector< GamepadPage* >::iterator i = m_padpages.begin(),
-		e = m_padpages.end();
-	for (; i != e; ++i)
-		(*i)->controller->UpdateReferences(g_controller_interface);
-}
-
-void InputConfigDialog::ClickSave(wxCommandEvent& event)
-{
-	m_plugin.SaveConfig();
-	event.Skip();
-}
-
-void ControlDialog::UpdateListContents()
-{
-	control_lbox->Clear();
-
-	Device* const dev = g_controller_interface.FindDevice(m_devq);
-	if (dev)
-	{
-		if (control_reference->is_input)
-		{
-			// for inputs
-			std::vector<Device::Input*>::const_iterator
-				i = dev->Inputs().begin(),
-				e = dev->Inputs().end();
-			for (; i!=e; ++i)
-				control_lbox->Append(StrToWxStr((*i)->GetName()));
-		}
-		else
-		{
-			// for outputs
-			std::vector<Device::Output*>::const_iterator
-				i = dev->Outputs().begin(),
-				e = dev->Outputs().end();
-			for (; i!=e; ++i)
-				control_lbox->Append(StrToWxStr((*i)->GetName()));
-		}
-	}
-}
-
-void ControlDialog::SelectControl(const std::string& name)
-{
-	//UpdateGUI();
-
-	const int f = control_lbox->FindString(StrToWxStr(name));
-	if (f >= 0)
-		control_lbox->Select(f);
-}
-
-void ControlDialog::UpdateGUI()
-{
-	// update textbox
-	textctrl->SetValue(StrToWxStr(control_reference->expression));
-
-	// updates the "bound controls:" label
-	m_bound_label->SetLabel(wxString::Format(_("Bound Controls: %lu"),
-		(unsigned long)control_reference->BoundCount()));
-
-	switch (control_reference->parse_error)
-	{
-	case EXPRESSION_PARSE_SYNTAX_ERROR:
-		m_error_label->SetLabel("Syntax error");
-		break;
-	case EXPRESSION_PARSE_NO_DEVICE:
-		m_error_label->SetLabel("Device not found");
-		break;
-	default:
-		m_error_label->SetLabel("");
-	}
-};
-
-void GamepadPage::UpdateGUI()
-{
-	device_cbox->SetValue(StrToWxStr(controller->default_device.ToString()));
-
-	std::vector< ControlGroupBox* >::const_iterator g = control_groups.begin(),
-		ge = control_groups.end();
-	for (; g!=ge; ++g)
-	{
-		// buttons
-		std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin()
-			, e = (*g)->control_buttons.end();
-		for (; i!=e; ++i) {
-			wxString expr = StrToWxStr((*i)->control_reference->expression);
-			expr.Replace("&", "&&");
-			(*i)->SetLabel(expr);
-		}
-
-		// cboxes
-		std::vector<PadSetting*>::const_iterator si = (*g)->options.begin()
-			, se = (*g)->options.end();
-		for (; si!=se; ++si)
-			(*si)->UpdateGUI();
-	}
-}
-
-void GamepadPage::ClearAll(wxCommandEvent&)
-{
-	// just load an empty ini section to clear everything :P
-	IniFile::Section section;
-	controller->LoadConfig(&section);
-
-	// no point in using the real ControllerInterface i guess
-	ControllerInterface face;
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	controller->UpdateReferences(face);
-
-	UpdateGUI();
-}
-
-void GamepadPage::LoadDefaults(wxCommandEvent&)
-{
-	controller->LoadDefaults(g_controller_interface);
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	controller->UpdateReferences(g_controller_interface);
-
-	UpdateGUI();
-}
-
-bool ControlDialog::Validate()
-{
-	control_reference->expression = WxStrToStr(textctrl->GetValue());
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
-
-	UpdateGUI();
-
-	return (control_reference->parse_error == EXPRESSION_PARSE_SUCCESS);
-}
-
-void GamepadPage::SetDevice(wxCommandEvent&)
-{
-	controller->default_device.FromString(WxStrToStr(device_cbox->GetValue()));
-	
-	// show user what it was validated as
-	device_cbox->SetValue(StrToWxStr(controller->default_device.ToString()));
-
-	// this will set all the controls to this default device
-	controller->UpdateDefaultDevice();
-
-	// update references
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	controller->UpdateReferences(g_controller_interface);
-}
-
-void ControlDialog::SetDevice(wxCommandEvent&)
-{
-	m_devq.FromString(WxStrToStr(device_cbox->GetValue()));
-	
-	// show user what it was validated as
-	device_cbox->SetValue(StrToWxStr(m_devq.ToString()));
-
-	// update gui
-	UpdateListContents();
-}
-
-void ControlDialog::ClearControl(wxCommandEvent&)
-{
-	control_reference->expression.clear();
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
-
-	UpdateGUI();
-}
-
-inline bool IsAlphabetic(wxString &str)
-{
-	for (wxString::const_iterator it = str.begin(); it != str.end(); ++it)
-		if (!isalpha(*it))
-			return false;
-	return true;
-}
-
-inline void GetExpressionForControl(wxString &expr,
-				    wxString &control_name,
-				    DeviceQualifier *control_device = NULL,
-				    DeviceQualifier *default_device = NULL)
-{
-	expr = "";
-
-	// non-default device
-	if (control_device && default_device && !(*control_device == *default_device))
-	{
-		expr += control_device->ToString();
-		expr += ":";
-	}
-
-	// append the control name
-	expr += control_name;
-
-	if (!IsAlphabetic(expr))
-		expr = wxString::Format("`%s`", expr);
-}
-
-bool ControlDialog::GetExpressionForSelectedControl(wxString &expr)
-{
-	const int num = control_lbox->GetSelection();
-
-	if (num < 0)
-		return false;
-
-	wxString control_name = control_lbox->GetString(num);
-	GetExpressionForControl(expr,
-				control_name,
-				&m_devq,
-				&m_parent->controller->default_device);
-
-	return true;
-}
-
-void ControlDialog::SetSelectedControl(wxCommandEvent&)
-{
-	wxString expr;
-
-	if (!GetExpressionForSelectedControl(expr))
-		return;
-
-	textctrl->WriteText(expr);
-	control_reference->expression = textctrl->GetValue();
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
-
-	UpdateGUI();
-}
-
-void ControlDialog::AppendControl(wxCommandEvent& event)
-{
-	wxString device_expr, expr;
-
-	const wxString lbl = ((wxButton*)event.GetEventObject())->GetLabel();
-	char op = lbl[0];
-
-	if (!GetExpressionForSelectedControl(device_expr))
-		return;
-
-	// Unary ops (that is, '!') are a special case. When there's a selection,
-	// put parens around it and prepend it with a '!', but when there's nothing,
-	// just add a '!device'.
-	if (op == '!')
-	{
-		wxString selection = textctrl->GetStringSelection();
-		if (selection == "")
-			expr = wxString::Format("%c%s", op, device_expr);
-		else
-			expr = wxString::Format("%c(%s)", op, selection);
-	}
-	else
-		expr = wxString::Format(" %c %s", op, device_expr);
-
-	textctrl->WriteText(expr);
-	control_reference->expression = textctrl->GetValue();
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
-
-	UpdateGUI();
-}
-
-void GamepadPage::AdjustSetting(wxCommandEvent& event)
-{
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	((PadSetting*)((wxControl*)event.GetEventObject())->GetClientData())->UpdateValue();
-}
-
-void GamepadPage::AdjustControlOption(wxCommandEvent&)
-{
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	m_control_dialog->control_reference->range = (ControlState)(m_control_dialog->range_slider->GetValue()) / SLIDER_TICK_COUNT;
-}
-
-void GamepadPage::ConfigControl(wxEvent& event)
-{
-	m_control_dialog = new ControlDialog(this, m_plugin, ((ControlButton*)event.GetEventObject())->control_reference);
-	m_control_dialog->ShowModal();
-	m_control_dialog->Destroy();
-
-	// update changes that were made in the dialog
-	UpdateGUI();
-}
-
-void GamepadPage::ClearControl(wxEvent& event)
-{
-	ControlButton* const btn = (ControlButton*)event.GetEventObject();
-	btn->control_reference->expression.clear();
-	btn->control_reference->range = 1.0f;
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	controller->UpdateReferences(g_controller_interface);
-
-	// update changes
-	UpdateGUI();
-}
-
-void ControlDialog::DetectControl(wxCommandEvent& event)
-{
-	wxButton* const btn = (wxButton*)event.GetEventObject();
-	const wxString lbl = btn->GetLabel();
-
-	Device* const dev = g_controller_interface.FindDevice(m_devq);
-	if (dev)
-	{
-		btn->SetLabel(_("[ waiting ]"));
-
-		// apparently, this makes the "waiting" text work on Linux
-		wxTheApp->Yield();
-
-		std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-		Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
-
-		// if we got input, select it in the list
-		if (ctrl)
-			SelectControl(ctrl->GetName());
-
-		btn->SetLabel(lbl);
-	}
-}
-
-void GamepadPage::DetectControl(wxCommandEvent& event)
-{
-	ControlButton* btn = (ControlButton*)event.GetEventObject();
-
-	// find device :/
-	Device* const dev = g_controller_interface.FindDevice(controller->default_device);
-	if (dev)
-	{
-		btn->SetLabel(_("[ waiting ]"));
-
-		// apparently, this makes the "waiting" text work on Linux
-		wxTheApp->Yield();
-
-		std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-		Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);
-
-		// if we got input, update expression and reference
-		if (ctrl)
-		{
-			wxString control_name = ctrl->GetName();
-			wxString expr;
-			GetExpressionForControl(expr, control_name);
-			btn->control_reference->expression = expr;
-			g_controller_interface.UpdateReference(btn->control_reference, controller->default_device);
-		}
-	}
-
-	UpdateGUI();
-}
-
-wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
-{
-	wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output"));
-
-	textctrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE | wxTE_RICH2);
-	wxFont font = textctrl->GetFont();
-	font.SetFamily(wxFONTFAMILY_MODERN);
-	textctrl->SetFont(font);
-
-	wxButton* const detect_button = new wxButton(this, -1, control_reference->is_input ? _("Detect") : _("Test"));
-
-	wxButton* const clear_button = new  wxButton(this, -1, _("Clear"));
-
-	wxButton* const select_button = new wxButton(this, -1, _("Select"));
-	select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this);
-
-	wxButton* const not_button = new  wxButton(this, -1, _("! NOT"), wxDefaultPosition);
-	not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
-
-	wxButton* const or_button = new  wxButton(this, -1, _("| OR"), wxDefaultPosition);
-	or_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
-
-	control_lbox = new wxListBox(this, -1, wxDefaultPosition, wxSize(-1, 64));
-
-	wxBoxSizer* const button_sizer = new wxBoxSizer(wxVERTICAL);
-	button_sizer->Add(detect_button, 1, 0, 5);
-	button_sizer->Add(select_button, 1, 0, 5);
-	button_sizer->Add(or_button, 1, 0, 5);
-
-	if (control_reference->is_input)
-	{
-		// TODO: check if && is good on other OS
-		wxButton* const and_button = new  wxButton(this, -1, _("&& AND"), wxDefaultPosition);
-		wxButton* const add_button = new  wxButton(this, -1, _("+ ADD"), wxDefaultPosition);
-
-		and_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
-		add_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
-
-		button_sizer->Add(and_button, 1, 0, 5);
-		button_sizer->Add(not_button, 1, 0, 5);
-		button_sizer->Add(add_button, 1, 0, 5);
-	}
-
-	range_slider = new wxSlider(this, -1, SLIDER_TICK_COUNT, -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/);
-
-	range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT));
-
-	detect_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::DetectControl, this);
-	clear_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::ClearControl, this);
-
-	range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent);
-	wxStaticText* const range_label = new wxStaticText(this, -1, _("Range"));
-
-	m_bound_label = new wxStaticText(this, -1, wxT(""));
-	m_error_label = new wxStaticText(this, -1, wxT(""));
-
-	wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL);
-	range_sizer->Add(range_label, 0, wxCENTER|wxLEFT, 5);
-	range_sizer->Add(range_slider, 1, wxEXPAND|wxLEFT, 5);
-
-	wxBoxSizer* const ctrls_sizer = new wxBoxSizer(wxHORIZONTAL);
-	ctrls_sizer->Add(control_lbox, 1, wxEXPAND, 0);
-	ctrls_sizer->Add(button_sizer, 0, wxEXPAND, 0);
-
-	wxSizer* const bottom_btns_sizer = CreateButtonSizer(wxOK|wxAPPLY);
-	bottom_btns_sizer->Prepend(clear_button, 0, wxLEFT, 5);
-
-	main_szr->Add(range_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 5);
-	main_szr->Add(ctrls_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	main_szr->Add(textctrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	main_szr->Add(bottom_btns_sizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5);
-	main_szr->Add(m_bound_label, 0, wxCENTER, 0);
-	main_szr->Add(m_error_label, 0, wxCENTER, 0);
-
-	UpdateListContents();
-
-	return main_szr;
-}
-
-void GamepadPage::GetProfilePath(std::string& path)
-{
-	const wxString& name = profile_cbox->GetValue();
-	if (false == name.empty())
-	{
-		// TODO: check for dumb characters maybe
-
-		path = File::GetUserPath(D_CONFIG_IDX);
-		path += PROFILES_PATH;
-		path += m_plugin.profile_name;
-		path += '/';
-		path += WxStrToStr(profile_cbox->GetValue());
-		path += ".ini";
-	}
-}
-
-void GamepadPage::LoadProfile(wxCommandEvent&)
-{
-	std::string fname;
-	GamepadPage::GetProfilePath(fname);
-
-	if (false == File::Exists(fname))
-		return;
-
-	IniFile inifile;
-	inifile.Load(fname);
-
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-	controller->LoadConfig(inifile.GetOrCreateSection("Profile"));
-	controller->UpdateReferences(g_controller_interface);
-
-	UpdateGUI();
-}
-
-void GamepadPage::SaveProfile(wxCommandEvent&)
-{
-	std::string fname;
-	GamepadPage::GetProfilePath(fname);
-	File::CreateFullPath(fname);
-
-	if (false == fname.empty())
-	{
-		IniFile inifile;
-		controller->SaveConfig(inifile.GetOrCreateSection("Profile"));
-		inifile.Save(fname);
-		
-		m_config_dialog->UpdateProfileComboBox();
-	}
-	else
-	{
-		PanicAlertT("You must enter a valid profile name.");
-	}
-}
-
-void GamepadPage::DeleteProfile(wxCommandEvent&)
-{
-	std::string fname;
-	GamepadPage::GetProfilePath(fname);
-
-	const char* const fnamecstr = fname.c_str();
-
-	if (File::Exists(fnamecstr) &&
-			AskYesNoT("Are you sure you want to delete \"%s\"?",
-			WxStrToStr(profile_cbox->GetValue()).c_str()))
-	{
-		File::Delete(fnamecstr);
-
-		m_config_dialog->UpdateProfileComboBox();
-	}
-}
-
-void InputConfigDialog::UpdateDeviceComboBox()
-{
-	std::vector< GamepadPage* >::iterator i = m_padpages.begin(),
-		e = m_padpages.end();
-	DeviceQualifier dq;
-	for (; i != e; ++i)
-	{
-		(*i)->device_cbox->Clear();
-		std::vector<Device*>::const_iterator
-			di = g_controller_interface.Devices().begin(),
-			de = g_controller_interface.Devices().end();
-		for (; di!=de; ++di)
-		{
-			dq.FromDevice(*di);
-			(*i)->device_cbox->Append(StrToWxStr(dq.ToString()));
-		}
-		(*i)->device_cbox->SetValue(StrToWxStr((*i)->controller->default_device.ToString()));
-	}
-}
-
-void GamepadPage::RefreshDevices(wxCommandEvent&)
-{
-	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-
-	// refresh devices
-	g_controller_interface.Shutdown();
-	g_controller_interface.Initialize();
-
-	// update all control references
-	m_config_dialog->UpdateControlReferences();
-
-	// update device cbox
-	m_config_dialog->UpdateDeviceComboBox();
-}
-
-ControlGroupBox::~ControlGroupBox()
-{
-	std::vector<PadSetting*>::const_iterator
-		i = options.begin(),
-		e = options.end();
-	for (; i!=e; ++i)
-		delete *i;
-}
-
-ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink)
-	: wxBoxSizer(wxVERTICAL)
-	, control_group(group)
-{
-	static_bitmap = NULL;
-
-	wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
-	std::vector<ControllerEmu::ControlGroup::Control*>::iterator
-		ci = group->controls.begin(),
-		ce = group->controls.end();
-	for (; ci != ce; ++ci)
-	{
-
-		wxStaticText* const label = new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*ci)->name)));
-		
-		ControlButton* const control_button = new ControlButton(parent, (*ci)->control_ref, 80);
-		control_button->SetFont(m_SmallFont);
-
-		control_buttons.push_back(control_button);
-
-		if ((*ci)->control_ref->is_input)
-		{
-			control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
-			control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DetectControl, eventsink);
-		}
-		else
-		{
-			control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear."));
-			control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigControl, eventsink);
-		}
-
-		control_button->Bind(wxEVT_MIDDLE_DOWN, &GamepadPage::ClearControl, eventsink);
-		control_button->Bind(wxEVT_RIGHT_UP, &GamepadPage::ConfigControl, eventsink);
-
-		wxBoxSizer* const control_sizer = new wxBoxSizer(wxHORIZONTAL);
-		control_sizer->AddStretchSpacer(1);
-		control_sizer->Add(label, 0, wxCENTER | wxRIGHT, 3);
-		control_sizer->Add(control_button, 0, 0, 0);
-
-		Add(control_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 3);
-
-	}
-
-	wxMemoryDC dc;
-
-	switch (group->type)
-	{
-	case GROUP_TYPE_STICK:
-	case GROUP_TYPE_TILT:
-	case GROUP_TYPE_CURSOR:
-	case GROUP_TYPE_FORCE:
-		{
-			wxBitmap bitmap(64, 64);
-			dc.SelectObject(bitmap);
-			dc.Clear();
-			static_bitmap = new wxStaticBitmap(parent, -1, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
-
-			std::vector< ControllerEmu::ControlGroup::Setting* >::const_iterator
-				i = group->settings.begin(),
-				e = group->settings.end();
-
-			wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
-			for (; i!=e; ++i)
-			{
-				PadSettingSpin* setting = new PadSettingSpin(parent, *i);
-				setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink);
-				options.push_back(setting);
-				szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*i)->name))));
-				szr->Add(setting->wxcontrol, 0, wxLEFT, 0);
-			}
-
-			wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL);
-			h_szr->Add(szr, 1, 0, 5);
-			h_szr->Add(static_bitmap, 0, wxALL|wxCENTER, 3);
-
-			Add(h_szr, 0, wxEXPAND|wxLEFT|wxCENTER|wxTOP, 3);
-		}
-		break;
-	case GROUP_TYPE_BUTTONS:
-		{
-			wxBitmap bitmap(int(12*group->controls.size()+1), 12);
-			dc.SelectObject(bitmap);
-			dc.Clear();
-			static_bitmap = new wxStaticBitmap(parent, -1, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
-
-			PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]);
-			threshold_cbox->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink);
-
-			threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons."));
-
-			options.push_back(threshold_cbox);
-
-			wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
-			szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr(group->settings[0]->name))),
-					0, wxCENTER|wxRIGHT, 3);
-			szr->Add(threshold_cbox->wxcontrol, 0, wxRIGHT, 3);
-
-			Add(szr, 0, wxALL|wxCENTER, 3);
-			Add(static_bitmap, 0, wxALL|wxCENTER, 3);
-		}
-		break;
-	case GROUP_TYPE_MIXED_TRIGGERS:
-	case GROUP_TYPE_TRIGGERS:
-	case GROUP_TYPE_SLIDER:
-		{
-			int height = (int)(12 * group->controls.size());
-			int width = 64;
-
-			if (GROUP_TYPE_MIXED_TRIGGERS == group->type)
-				width = 64+12+1;
-			
-			if (GROUP_TYPE_TRIGGERS != group->type)
-				height /= 2;
-
-			wxBitmap bitmap(width, height+1);
-			dc.SelectObject(bitmap);
-			dc.Clear();
-			static_bitmap = new wxStaticBitmap(parent, -1, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP);
-
-			std::vector<ControllerEmu::ControlGroup::Setting*>::const_iterator
-				i = group->settings.begin(),
-				e = group->settings.end();
-			for (; i!=e; ++i)
-			{
-				PadSettingSpin* setting = new PadSettingSpin(parent, *i);
-				setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink);
-				options.push_back(setting);
-				wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
-				szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*i)->name))), 0, wxCENTER|wxRIGHT, 3);
-				szr->Add(setting->wxcontrol, 0, wxRIGHT, 3);
-				Add(szr, 0, wxALL|wxCENTER, 3);
-			}
-
-			Add(static_bitmap, 0, wxALL|wxCENTER, 3);
-		}
-		break;
-	case GROUP_TYPE_EXTENSION:
-		{
-			PadSettingExtension* const attachments = new PadSettingExtension(parent, (ControllerEmu::Extension*)group);
-			wxButton* const configure_btn = new ExtensionButton(parent, (ControllerEmu::Extension*)group);
-
-			options.push_back(attachments);
-
-			attachments->wxcontrol->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &GamepadPage::AdjustSetting, eventsink);
-			configure_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigExtension, eventsink);
-
-			Add(attachments->wxcontrol, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 3);
-			Add(configure_btn, 0, wxALL|wxEXPAND, 3);
-		}
-		break;
-	case GROUP_TYPE_UDPWII:
-		{
-			wxButton* const btn = new UDPConfigButton(parent, (UDPWrapper*)group);
-			btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigUDPWii, eventsink);
-			Add(btn, 0, wxALL|wxEXPAND, 3);
-		}
-		break;
-	default:
-		{
-			//options
-
-			std::vector<ControllerEmu::ControlGroup::Setting*>::const_iterator
-				i = group->settings.begin(),
-				e = group->settings.end();
-			for (; i!=e; ++i)
-			{
-				PadSettingCheckBox* setting_cbox = new PadSettingCheckBox(parent, (*i)->value, (*i)->name);
-				setting_cbox->wxcontrol->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &GamepadPage::AdjustSetting, eventsink);
-				options.push_back(setting_cbox);
-
-				Add(setting_cbox->wxcontrol, 0, wxALL|wxLEFT, 5);
-
-			}
-		}
-		break;
-	}
-
-	dc.SelectObject(wxNullBitmap);
-
-	//AddStretchSpacer(0);
-}
-
-ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* groups)
-	: wxBoxSizer(wxHORIZONTAL)
-{
-	size_t col_size = 0;
-
-	wxBoxSizer* stacked_groups = NULL;
-	for (unsigned int i = 0; i < controller->groups.size(); ++i)
-	{
-		ControlGroupBox* control_group_box = new ControlGroupBox(controller->groups[i], parent, eventsink);
-		wxStaticBoxSizer *control_group =
-			new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(controller->groups[i]->name)));
-		control_group->Add(control_group_box);
-
-		const size_t grp_size = controller->groups[i]->controls.size() + controller->groups[i]->settings.size();
-		col_size += grp_size;
-		if (col_size > 8 || NULL == stacked_groups)
-		{
-			if (stacked_groups)
-				Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5);
-
-			stacked_groups = new wxBoxSizer(wxVERTICAL);
-			stacked_groups->Add(control_group, 0, wxEXPAND);
-
-			col_size = grp_size;
-		}
-		else
-		{
-			stacked_groups->Add(control_group, 0, wxEXPAND);
-		}
-
-		if (groups)
-			groups->push_back(control_group_box);
-	}
-
-	if (stacked_groups)
-		Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5);
-}
-
-GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog)
-	: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
-	,controller(plugin.controllers[pad_num])
-	, m_config_dialog(config_dialog)
-	, m_plugin(plugin)
-{
-
-	wxBoxSizer* control_group_sizer = new ControlGroupsSizer(m_plugin.controllers[pad_num], this, this, &control_groups);
-
-	wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Profile"));
-
-	// device chooser
-
-	wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Device"));
-
-	device_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1));
-	device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER);
-
-	wxButton* refresh_button = new wxButton(this, -1, _("Refresh"), wxDefaultPosition, wxSize(60,-1));
-
-	device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &GamepadPage::SetDevice, this);
-	device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &GamepadPage::SetDevice, this);
-	refresh_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::RefreshDevices, this);
-
-	device_sbox->Add(device_cbox, 1, wxLEFT|wxRIGHT, 3);
-	device_sbox->Add(refresh_button, 0, wxRIGHT|wxBOTTOM, 3);
-
-	wxButton* const default_button = new wxButton(this, -1, _("Default"), wxDefaultPosition, wxSize(48,-1));
-	wxButton* const clearall_button = new wxButton(this, -1, _("Clear"), wxDefaultPosition, wxSize(58,-1));
-
-	wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Reset"));
-	clear_sbox->Add(default_button, 1, wxLEFT, 3);
-	clear_sbox->Add(clearall_button, 1, wxRIGHT, 3);
-
-	clearall_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ClearAll, this);
-	default_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadDefaults, this);
-
-	profile_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1));
-
-	wxButton* const pload_btn = new wxButton(this, -1, _("Load"), wxDefaultPosition, wxSize(48,-1));
-	wxButton* const psave_btn = new wxButton(this, -1, _("Save"), wxDefaultPosition, wxSize(48,-1));
-	wxButton* const pdelete_btn = new wxButton(this, -1, _("Delete"), wxDefaultPosition, wxSize(60,-1));
-
-	pload_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadProfile, this);
-	psave_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::SaveProfile, this);
-	pdelete_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DeleteProfile, this);
-
-	profile_sbox->Add(profile_cbox, 1, wxLEFT, 3);
-	profile_sbox->Add(pload_btn, 0, wxLEFT, 3);
-	profile_sbox->Add(psave_btn, 0, 0, 3);
-	profile_sbox->Add(pdelete_btn, 0, wxRIGHT|wxBOTTOM, 3);
-
-	wxBoxSizer* const dio = new wxBoxSizer(wxHORIZONTAL);
-	dio->Add(device_sbox, 1, wxEXPAND|wxRIGHT, 5);
-	dio->Add(clear_sbox, 0, wxEXPAND|wxRIGHT, 5);
-	dio->Add(profile_sbox, 1, wxEXPAND|wxRIGHT, 5);
-
-	wxBoxSizer* const mapping = new wxBoxSizer(wxVERTICAL);
-
-	mapping->Add(dio, 1, wxEXPAND|wxLEFT|wxTOP|wxBOTTOM, 5);
-	mapping->Add(control_group_sizer, 0, wxLEFT|wxEXPAND, 5);
-
-	UpdateGUI();
-
-	SetSizerAndFit(mapping);	// needed
-	Layout();
-};
-
-
-InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num)
-	: wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1), wxDefaultSize)
-	, m_plugin(plugin)
-{
-	m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
-	for (unsigned int i = 0; i < std::min(plugin.controllers.size(), (size_t)MAX_WIIMOTES); ++i)
-	{
-		GamepadPage* gp = new GamepadPage(m_pad_notebook, m_plugin, i, this);
-		m_padpages.push_back(gp);
-		m_pad_notebook->AddPage(gp, wxString::Format(wxT("%s %u"), wxGetTranslation(StrToWxStr(m_plugin.gui_name)), 1+i));
-	}
-
-	m_pad_notebook->SetSelection(tab_num);
-
-	UpdateDeviceComboBox();
-	UpdateProfileComboBox();
-
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputConfigDialog::ClickSave, this, wxID_OK);
-
-	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
-	szr->Add(m_pad_notebook, 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, 5);
-	szr->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxEXPAND|wxALL, 5);
-
-	SetSizerAndFit(szr);
-	Center();
-
-	// live preview update timer
-	m_update_timer = new wxTimer(this, -1);
-	Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this);
-	m_update_timer->Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS);
-}
-
-bool InputConfigDialog::Destroy()
-{
-	m_update_timer->Stop();
-	return true;
-}
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
deleted file mode 100644
index 7d337ed0de..0000000000
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONFIGBOX_H_
-#define _CONFIGBOX_H_
-
-#define SLIDER_TICK_COUNT			100
-#define DETECT_WAIT_TIME			1500
-#define PREVIEW_UPDATE_TIME			25
-
-// might have to change this setup for wiimote
-#define PROFILES_PATH				"Profiles/"
-
-#include <wx/wx.h>
-#include <wx/listbox.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
-#include <sstream>
-#include <vector>
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "ControllerEmu.h"
-#include "InputConfig.h"
-#include "FileSearch.h"
-#include "UDPWrapper.h"
-
-class PadSetting
-{
-protected:
-	PadSetting(wxControl* const _control) : wxcontrol(_control) { wxcontrol->SetClientData(this); }
-
-public:
-	virtual void UpdateGUI() = 0;
-	virtual void UpdateValue() = 0;
-
-	virtual ~PadSetting() {}
-
-	wxControl* const	wxcontrol;
-};
-
-class PadSettingExtension : public PadSetting
-{
-public:
-	PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext);
-	void UpdateGUI();
-	void UpdateValue();
-
-	ControllerEmu::Extension* const	extension;
-};
-
-class PadSettingSpin : public PadSetting
-{
-public:
-	PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting)
-		: PadSetting(new wxSpinCtrl(parent, -1, wxEmptyString, wxDefaultPosition
-			, wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100)))
-		, value(setting->value) {}
-
-	void UpdateGUI();
-	void UpdateValue();
-
-	ControlState& value;
-};
-
-class PadSettingCheckBox : public PadSetting
-{
-public:
-	PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label);
-	void UpdateGUI();
-	void UpdateValue();
-
-	ControlState&		value;
-};
-
-class GamepadPage;
-
-class ControlDialog : public wxDialog
-{
-public:
-	ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref);
-	
-	wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent);
-
-	virtual bool Validate();
-
-	void DetectControl(wxCommandEvent& event);
-	void ClearControl(wxCommandEvent& event);
-	void SetDevice(wxCommandEvent& event);
-
-	void UpdateGUI();
-	void UpdateListContents();
-	void SelectControl(const std::string& name);
-
-	void SetSelectedControl(wxCommandEvent& event);
-	void AppendControl(wxCommandEvent& event);
-
-	ControllerInterface::ControlReference* const		control_reference;
-	InputPlugin&				m_plugin;
-	wxComboBox*				device_cbox;
-
-	wxTextCtrl*		textctrl;
-	wxListBox*		control_lbox;
-	wxSlider*		range_slider;
-
-private:
-	GamepadPage* const		m_parent;
-	wxStaticText*		m_bound_label;
-	wxStaticText*		m_error_label;
-	DeviceQualifier	m_devq;
-	bool GetExpressionForSelectedControl(wxString &expr);
-};
-
-class ExtensionButton : public wxButton
-{
-public:
-	ExtensionButton(wxWindow* const parent, ControllerEmu::Extension* const ext)
-		: wxButton(parent, -1, _("Configure"), wxDefaultPosition)
-		, extension(ext) {}
-
-	ControllerEmu::Extension* const	extension;
-};
-
-class ControlButton : public wxButton
-{
-public:
-	ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const unsigned int width, const std::string& label = "");
-
-	ControllerInterface::ControlReference* const		control_reference;
-};
-
-class UDPConfigButton : public wxButton
-{
-public:
-	UDPWrapper* const wrapper;
-	UDPConfigButton(wxWindow* const parent, UDPWrapper * udp)
-		: wxButton(parent, -1, _("Configure"), wxDefaultPosition)
-		, wrapper(udp)
-	{}
-};
-
-class ControlGroupBox : public wxBoxSizer
-{
-public:
-	ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink);
-	~ControlGroupBox();
-
-	std::vector<PadSetting*>		options;
-
-	ControllerEmu::ControlGroup* const	control_group;
-	wxStaticBitmap*					static_bitmap;
-	std::vector<ControlButton*>		control_buttons;
-};
-
-class ControlGroupsSizer : public wxBoxSizer
-{
-public:
-	ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* const groups = NULL);
-};
-
-class InputConfigDialog;
-
-class GamepadPage : public wxPanel
-{
-	friend class InputConfigDialog;
-	friend class ControlDialog;
-
-public:
-	GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog);
-
-	void UpdateGUI();
-
-	void RefreshDevices(wxCommandEvent& event);
-
-	void LoadProfile(wxCommandEvent& event);
-	void SaveProfile(wxCommandEvent& event);
-	void DeleteProfile(wxCommandEvent& event);
-
-	void ConfigControl(wxEvent& event);
-	void ClearControl(wxEvent& event);
-	void DetectControl(wxCommandEvent& event);
-
-	void ConfigExtension(wxCommandEvent& event);
-
-	void ConfigUDPWii(wxCommandEvent& event);
-
-	void SetDevice(wxCommandEvent& event);
-
-	void ClearAll(wxCommandEvent& event);
-	void LoadDefaults(wxCommandEvent& event);
-
-	void AdjustControlOption(wxCommandEvent& event);
-	void AdjustSetting(wxCommandEvent& event);
-
-	void GetProfilePath(std::string& path);
-
-	wxComboBox*					profile_cbox;
-	wxComboBox*					device_cbox;
-
-	std::vector<ControlGroupBox*>		control_groups;
-
-protected:
-	
-	ControllerEmu* const				controller;
-
-private:
-
-	ControlDialog*				m_control_dialog;
-	InputConfigDialog* const	m_config_dialog;
-	InputPlugin &m_plugin;
-};
-
-class InputConfigDialog : public wxDialog
-{
-public:
-	InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num = 0);
-	//~InputConfigDialog();
-
-	bool Destroy();
-
-	void ClickSave(wxCommandEvent& event);
-
-	void UpdateDeviceComboBox();
-	void UpdateProfileComboBox();
-
-	void UpdateControlReferences();
-	void UpdateBitmaps(wxTimerEvent&);
-
-private:
-
-	wxNotebook*					m_pad_notebook;
-	std::vector<GamepadPage*>	m_padpages;
-	InputPlugin&				m_plugin;
-	wxTimer*					m_update_timer;
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
deleted file mode 100644
index 6aa37d78e9..0000000000
--- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "InputConfigDiag.h"
-#include "WxUtils.h"
-
-void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
-{
-	wxFont small_font(6, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
-
-	g_controller_interface.UpdateInput();
-
-	// don't want game thread updating input when we are using it here
-	std::unique_lock<std::recursive_mutex> lk(g_controller_interface.update_lock, std::try_to_lock);
-	if (!lk.owns_lock())
-		return;
-
-	GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection());
-
-	std::vector< ControlGroupBox* >::iterator
-		g = current_page->control_groups.begin(),
-		ge = current_page->control_groups.end();
-	for ( ; g != ge; ++g  )
-	{
-		// if this control group has a bitmap
-		if ( (*g)->static_bitmap )
-		{
-			wxMemoryDC dc;
-			wxBitmap bitmap((*g)->static_bitmap->GetBitmap());
-			dc.SelectObject(bitmap);
-			dc.Clear();
-
-			dc.SetFont(small_font);
-			dc.SetTextForeground(0xC0C0C0);
-
-			// label for sticks and stuff
-			if (64 == bitmap.GetHeight())
-				dc.DrawText(StrToWxStr((*g)->control_group->name).Upper(), 4, 2);
-
-			switch ( (*g)->control_group->type )
-			{
-			case GROUP_TYPE_TILT :
-			case GROUP_TYPE_STICK :
-			case GROUP_TYPE_CURSOR :
-				{
-					// this is starting to be a mess combining all these in one case
-
-					float x = 0, y = 0, z = 0;
-					float xx, yy;
-
-					switch ((*g)->control_group->type)
-					{
-					case GROUP_TYPE_STICK :
-						((ControllerEmu::AnalogStick*)(*g)->control_group)->GetState( &x, &y, 32.0, 32-1.5 );
-						break;
-					case GROUP_TYPE_TILT :
-						((ControllerEmu::Tilt*)(*g)->control_group)->GetState( &x, &y, 32.0, 32-1.5 );
-						break;
-					case GROUP_TYPE_CURSOR :
-						((ControllerEmu::Cursor*)(*g)->control_group)->GetState( &x, &y, &z );
-						x *= (32-1.5); x+= 32;
-						y *= (32-1.5); y+= 32;
-						break;
-					}
-
-					xx = (*g)->control_group->controls[3]->control_ref->State();
-					xx -= (*g)->control_group->controls[2]->control_ref->State();
-					yy = (*g)->control_group->controls[1]->control_ref->State();
-					yy -= (*g)->control_group->controls[0]->control_ref->State();
-					xx *= 32 - 1; xx += 32;
-					yy *= 32 - 1; yy += 32;
-
-					// draw the shit
-
-					// ir cursor forward movement
-					if (GROUP_TYPE_CURSOR == (*g)->control_group->type)
-					{
-						if (z)
-						{
-							dc.SetPen(*wxRED_PEN);
-							dc.SetBrush(*wxRED_BRUSH);
-						}
-						else
-						{
-							dc.SetPen(*wxGREY_PEN);
-							dc.SetBrush(*wxGREY_BRUSH);
-						}
-						dc.DrawRectangle( 0, 31 - z*31, 64, 2);
-					}
-
-					// octagon for visual aid for diagonal adjustment
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.SetBrush(*wxWHITE_BRUSH);
-					if ( GROUP_TYPE_STICK == (*g)->control_group->type )
-					{
-						// outline and fill colors
-						wxBrush LightGrayBrush(_T("#dddddd"));
-						wxPen LightGrayPen(_T("#bfbfbf"));
-						dc.SetBrush(LightGrayBrush);
-						dc.SetPen(LightGrayPen);
-
-						// polygon offset
-						float max
-							, diagonal
-							, box = 64
-							, d_of = box / 256.0
-							, x_of = box / 2.0;
-
-						if (strcmp((*g)->control_group->name, "Main Stick") == 0)
-						{
-							max = (87.0f / 127.0f) * 100;
-							diagonal = (55.0f / 127.0f) * 100.0;
-						}
-						else if (strcmp((*g)->control_group->name,"C-Stick") == 0)
-						{
-							max = (74.0f / 127.0f) * 100;
-							diagonal = (46.0f / 127.0f) * 100;
-						}
-						else
-						{
-							max = (82.0f / 127.0f) * 100;
-							diagonal = (58.0f / 127.0f) * 100;
-						}
-
-						// polygon corners
-						wxPoint Points[8];
-						Points[0].x = (int)(0.0 * d_of + x_of); Points[0].y = (int)(max * d_of + x_of);
-						Points[1].x = (int)(diagonal * d_of + x_of); Points[1].y = (int)(diagonal * d_of + x_of);
-						Points[2].x = (int)(max * d_of + x_of); Points[2].y = (int)(0.0 * d_of + x_of);
-						Points[3].x = (int)(diagonal * d_of + x_of); Points[3].y = (int)(-diagonal * d_of + x_of);
-						Points[4].x = (int)(0.0 * d_of + x_of); Points[4].y = (int)(-max * d_of + x_of);
-						Points[5].x = (int)(-diagonal * d_of + x_of); Points[5].y = (int)(-diagonal * d_of + x_of);
-						Points[6].x = (int)(-max * d_of + x_of); Points[6].y = (int)(0.0 * d_of + x_of);
-						Points[7].x = (int)(-diagonal * d_of + x_of); Points[7].y = (int)(diagonal * d_of + x_of);
-
-						// draw polygon
-						dc.DrawPolygon(8, Points);
-					}
-					else
-					{
-						dc.DrawRectangle( 16, 16, 32, 32 );
-					}
-
-					if ( GROUP_TYPE_CURSOR != (*g)->control_group->type )
-					{
-						// deadzone circle
-						dc.SetBrush(*wxLIGHT_GREY_BRUSH);
-						dc.DrawCircle( 32, 32, ((*g)->control_group)->settings[SETTING_DEADZONE]->value * 32 );
-					}
-
-					// raw dot
-					dc.SetPen(*wxGREY_PEN);
-					dc.SetBrush(*wxGREY_BRUSH);
-					// i like the dot better than the cross i think
-					dc.DrawRectangle( xx - 2, yy - 2, 4, 4 );
-					//dc.DrawRectangle( xx-1, 64-yy-4, 2, 8 );
-					//dc.DrawRectangle( xx-4, 64-yy-1, 8, 2 );
-
-					// adjusted dot
-					if (x!=32 || y!=32)
-					{
-						dc.SetPen(*wxRED_PEN);
-						dc.SetBrush(*wxRED_BRUSH);
-						dc.DrawRectangle( x-2, 64-y-2, 4, 4 );
-						// i like the dot better than the cross i think
-						//dc.DrawRectangle( x-1, 64-y-4, 2, 8 );
-						//dc.DrawRectangle( x-4, 64-y-1, 8, 2 );
-					}
-
-				}
-				break;
-			case GROUP_TYPE_FORCE :
-				{
-					float raw_dot[3];
-					float adj_dot[3];
-					const float deadzone = 32 * ((*g)->control_group)->settings[0]->value;
-
-					// adjusted
-					((ControllerEmu::Force*)(*g)->control_group)->GetState( adj_dot, 32.0, 32-1.5 );
-
-					// raw
-					for ( unsigned int i=0; i<3; ++i )
-					{
-						raw_dot[i] = (*g)->control_group->controls[i*2 + 1]->control_ref->State()
-							- (*g)->control_group->controls[i*2]->control_ref->State();
-						raw_dot[i] *= 32 - 1; raw_dot[i] += 32;
-					}
-
-					// deadzone rect for forward/backward visual
-					dc.SetBrush(*wxLIGHT_GREY_BRUSH);
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.DrawRectangle( 0, 32 - deadzone, 64, deadzone * 2 );
-
-					// raw forward/background line
-					dc.SetPen(*wxGREY_PEN);
-					dc.SetBrush(*wxGREY_BRUSH);
-					dc.DrawRectangle( 0, raw_dot[2] - 1, 64, 2 );
-
-					// adjusted forward/background line
-					if ( adj_dot[2]!=32 )
-					{
-						dc.SetPen(*wxRED_PEN);
-						dc.SetBrush(*wxRED_BRUSH);
-						dc.DrawRectangle( 0, adj_dot[2] - 1, 64, 2 );
-					}
-
-					// a rectangle, for looks i guess
-					dc.SetBrush(*wxWHITE_BRUSH);
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.DrawRectangle( 16, 16, 32, 32 );
-
-					// deadzone square
-					dc.SetBrush(*wxLIGHT_GREY_BRUSH);
-					dc.DrawRectangle( 32 - deadzone, 32 - deadzone, deadzone * 2, deadzone * 2 );
-
-					// raw dot
-					dc.SetPen(*wxGREY_PEN);
-					dc.SetBrush(*wxGREY_BRUSH);
-					dc.DrawRectangle( raw_dot[1] - 2, raw_dot[0] - 2, 4, 4 );
-
-					// adjusted dot
-					if ( adj_dot[1]!=32 || adj_dot[0]!=32 )
-					{
-						dc.SetPen(*wxRED_PEN);
-						dc.SetBrush(*wxRED_BRUSH);
-						dc.DrawRectangle( adj_dot[1]-2, adj_dot[0]-2, 4, 4 );
-					}
-
-				}
-				break;
-			case GROUP_TYPE_BUTTONS :
-				{
-					const unsigned int button_count = ((unsigned int)(*g)->control_group->controls.size());
-
-					// draw the shit
-					dc.SetPen(*wxGREY_PEN);
-
-					unsigned int * const bitmasks = new unsigned int[ button_count ];
-					for (unsigned int n = 0; n<button_count; ++n)
-						bitmasks[n] = (1 << n);
-
-					unsigned int buttons = 0;
-					((ControllerEmu::Buttons*)(*g)->control_group)->GetState( &buttons, bitmasks );
-
-					for (unsigned int n = 0; n<button_count; ++n)
-					{
-						if ( buttons & bitmasks[n] )
-						{
-							dc.SetBrush( *wxRED_BRUSH );
-						}
-						else
-						{
-							unsigned char amt = 255 - (*g)->control_group->controls[n]->control_ref->State() * 128;
-							dc.SetBrush(wxBrush(wxColor(amt, amt, amt)));
-						}
-						dc.DrawRectangle(n * 12, 0, 14, 12);
-
-						// text
-						const char* const name = (*g)->control_group->controls[n]->name;
-						// bit of hax so ZL, ZR show up as L, R
-						dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n*12 + 2, 1);
-					}
-
-					delete[] bitmasks;
-					
-				}
-				break;
-			case GROUP_TYPE_TRIGGERS :
-				{
-					const unsigned int trigger_count = ((unsigned int)((*g)->control_group->controls.size()));
-
-					// draw the shit
-					dc.SetPen(*wxGREY_PEN);
-					ControlState deadzone =  (*g)->control_group->settings[0]->value;
-
-					unsigned int* const trigs = new unsigned int[trigger_count];
-					((ControllerEmu::Triggers*)(*g)->control_group)->GetState( trigs, 64 );
-
-					for ( unsigned int n = 0; n < trigger_count; ++n )
-					{
-						ControlState trig_r = (*g)->control_group->controls[n]->control_ref->State();
-
-						// outline
-						dc.SetPen(*wxGREY_PEN);
-						dc.SetBrush(*wxWHITE_BRUSH);
-						dc.DrawRectangle(0, n*12, 64, 14);
-
-						// raw
-						dc.SetBrush(*wxGREY_BRUSH);
-						dc.DrawRectangle(0, n*12, trig_r*64, 14);
-
-						// deadzone affected
-						dc.SetBrush(*wxRED_BRUSH);
-						dc.DrawRectangle(0, n*12, trigs[n], 14);
-
-						// text
-						dc.DrawText(StrToWxStr((*g)->control_group->controls[n]->name), 3, n*12 + 1);
-					}
-
-					delete[] trigs;
-
-					// deadzone box
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.SetBrush(*wxTRANSPARENT_BRUSH);
-					dc.DrawRectangle(0, 0, deadzone*64, trigger_count*14);
-
-				}
-				break;
-			case GROUP_TYPE_MIXED_TRIGGERS :
-				{
-					const unsigned int trigger_count = ((unsigned int)((*g)->control_group->controls.size() / 2));
-
-					// draw the shit
-					dc.SetPen(*wxGREY_PEN);
-					ControlState thresh =  (*g)->control_group->settings[0]->value;
-
-					for ( unsigned int n = 0; n < trigger_count; ++n )
-					{
-						dc.SetBrush(*wxRED_BRUSH);
-						ControlState trig_d = (*g)->control_group->controls[n]->control_ref->State();
-
-						ControlState trig_a = trig_d > thresh ? 1
-							: (*g)->control_group->controls[n+trigger_count]->control_ref->State();
-
-						dc.DrawRectangle(0, n*12, 64+20, 14);
-						if ( trig_d <= thresh )
-							dc.SetBrush(*wxWHITE_BRUSH);
-						dc.DrawRectangle(trig_a*64, n*12, 64+20, 14);
-						dc.DrawRectangle(64, n*12, 32, 14);
-
-						// text
-						dc.DrawText(StrToWxStr((*g)->control_group->controls[n+trigger_count]->name), 3, n*12 + 1);
-						dc.DrawText(StrToWxStr(std::string(1, (*g)->control_group->controls[n]->name[0])), 64 + 3, n*12 + 1);
-					}
-
-					// threshold box
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.SetBrush(*wxTRANSPARENT_BRUSH);
-					dc.DrawRectangle(thresh*64, 0, 128, trigger_count*14);
-
-				}
-				break;
-			case GROUP_TYPE_SLIDER:
-				{
-					const ControlState deadzone =  (*g)->control_group->settings[0]->value;
-
-					ControlState state = (*g)->control_group->controls[1]->control_ref->State() - (*g)->control_group->controls[0]->control_ref->State();
-					dc.SetPen(*wxGREY_PEN);
-					dc.SetBrush(*wxGREY_BRUSH);
-					dc.DrawRectangle(31 + state * 30, 0, 2, 14);
-
-					((ControllerEmu::Slider*)(*g)->control_group)->GetState(&state, 1);
-					if (state)
-					{
-						dc.SetPen(*wxRED_PEN);
-						dc.SetBrush(*wxRED_BRUSH);
-						dc.DrawRectangle(31 + state * 30, 0, 2, 14);
-					}
-
-					// deadzone box
-					dc.SetPen(*wxLIGHT_GREY_PEN);
-					dc.SetBrush(*wxTRANSPARENT_BRUSH);
-					dc.DrawRectangle(32 - deadzone * 32, 0, deadzone * 64, 14);
-				}
-				break;
-			default :
-				break;
-			}
-
-			// box outline
-			// Windows XP color
-			dc.SetPen(wxPen(_T("#7f9db9")));
-			dc.SetBrush(*wxTRANSPARENT_BRUSH);
-			dc.DrawRectangle(0, 0, bitmap.GetWidth(), bitmap.GetHeight());
-
-			dc.SelectObject(wxNullBitmap);
-			(*g)->static_bitmap->SetBitmap(bitmap);
-		}
-	}
-}
diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp
deleted file mode 100644
index 1518acdf24..0000000000
--- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "LogConfigWindow.h"
-#include "LogManager.h"
-#include "ConsoleListener.h"
-#include "LogWindow.h"
-#include "FileUtil.h"
-#include "WxUtils.h"
-
-LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id)
-	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration"))
-	, m_LogWindow(log_window), enableAll(true)
-{
-	SetMinSize(wxSize(100, 100));
-	m_LogManager = LogManager::GetInstance();
-	CreateGUIControls();
-	LoadSettings();
-}
-
-LogConfigWindow::~LogConfigWindow()
-{
-	SaveSettings();
-}
-
-void LogConfigWindow::CreateGUIControls()
-{
-	// Verbosity
-	wxArrayString wxLevels, wxLevelsUse;
-	wxLevels.Add(_("Notice"));
-	wxLevels.Add(_("Error"));
-	wxLevels.Add(_("Warning"));
-	wxLevels.Add(_("Info"));
-	wxLevels.Add(_("Debug"));
-	for (int i = 0; i < MAX_LOGLEVEL; ++i)
-		wxLevelsUse.Add(wxLevels[i]);
-	m_verbosity = new wxRadioBox(this, wxID_ANY, _("Verbosity"),
-			wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0,
-			wxRA_SPECIFY_ROWS, wxDefaultValidator);
-	m_verbosity->Bind(wxEVT_COMMAND_RADIOBOX_SELECTED, &LogConfigWindow::OnVerbosityChange, this);
-
-	// Options
-	m_writeFileCB = new wxCheckBox(this, wxID_ANY, _("Write to File"));
-	m_writeFileCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteFileChecked, this);
-	m_writeConsoleCB = new wxCheckBox(this, wxID_ANY, _("Write to Console"));
-	m_writeConsoleCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteConsoleChecked, this);
-	m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window"));
-	m_writeWindowCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteWindowChecked, this);
-	m_writeDebuggerCB = NULL;
-#ifdef _MSC_VER
-	if (IsDebuggerPresent())
-	{
-		m_writeDebuggerCB = new wxCheckBox(this, wxID_ANY, _("Write to Debugger"));
-		m_writeDebuggerCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteDebuggerChecked, this);
-	}
-#endif
-
-	wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"),
-			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
-	btn_toggle_all->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &LogConfigWindow::OnToggleAll, this);
-	m_checks = new wxCheckListBox(this, wxID_ANY);
-	m_checks->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &LogConfigWindow::OnLogCheck, this);
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
-		m_checks->Append(StrToWxStr(m_LogManager->GetFullName((LogTypes::LOG_TYPE)i)));
-
-	// Sizers
-	wxStaticBoxSizer* sbOutputs = new wxStaticBoxSizer(wxVERTICAL, this, _("Logger Outputs"));
-	sbOutputs->Add(m_writeFileCB, 0, wxDOWN, 1);
-	sbOutputs->Add(m_writeConsoleCB, 0, wxDOWN, 1);
-#ifdef _MSC_VER
-	if (m_writeDebuggerCB)
-	{
-		sbOutputs->Add(m_writeWindowCB, 0, wxDOWN, 1);
-		sbOutputs->Add(m_writeDebuggerCB, 0);
-	}
-	else
-#endif
-	{
-		sbOutputs->Add(m_writeWindowCB, 0);
-	}
-
-	wxStaticBoxSizer* sbLogTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Log Types"));
-	sbLogTypes->Add(m_checks, 1, wxEXPAND);
-
-	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(m_verbosity, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
-	sMain->Add(sbOutputs, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
-	sMain->Add(btn_toggle_all, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
-	sMain->Add(sbLogTypes, 1, wxEXPAND | wxLEFT | wxRIGHT, 5);
-
-	SetSizer(sMain);
-	Layout();
-}
-
-void LogConfigWindow::LoadSettings()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
-
-	// Retrieve the verbosity value from the config ini file.
-	int verbosity;
-	ini.Get("Options", "Verbosity", &verbosity, 0);
-	
-	// Ensure the verbosity level is valid.
-	if (verbosity < 1)
-		verbosity = 1;
-	if (verbosity > MAX_LOGLEVEL)
-		verbosity = MAX_LOGLEVEL;
-	
-	// Actually set the logging verbosity.
-	m_verbosity->SetSelection(verbosity - 1);
-
-	// Get the logger output settings from the config ini file.
-	ini.Get("Options", "WriteToFile", &m_writeFile, false);
-	m_writeFileCB->SetValue(m_writeFile);
-	ini.Get("Options", "WriteToConsole", &m_writeConsole, true);
-	m_writeConsoleCB->SetValue(m_writeConsole);
-	ini.Get("Options", "WriteToWindow", &m_writeWindow, true);
-	m_writeWindowCB->SetValue(m_writeWindow);
-#ifdef _MSC_VER
-	if (IsDebuggerPresent())
-	{
-		ini.Get("Options", "WriteToDebugger", &m_writeDebugger, true);
-		m_writeDebuggerCB->SetValue(m_writeDebugger);
-	}
-	else
-#endif
-	{
-		m_writeDebugger = false;
-	}
-
-	// Run through all of the log types and check each checkbox for each logging type
-	// depending on its set value within the config ini.
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		bool log_enabled;
-		ini.Get("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, true);
-		
-		if (log_enabled)
-			enableAll = false;
-		
-		m_checks->Check(i, log_enabled);
-	}
-}
-
-void LogConfigWindow::SaveSettings()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
-
-	// Save the verbosity level.
-	ini.Set("Options", "Verbosity", m_verbosity->GetSelection() + 1);
-
-	// Save the enabled/disabled states of the logger outputs to the config ini.
-	ini.Set("Options", "WriteToFile", m_writeFile);
-	ini.Set("Options", "WriteToConsole", m_writeConsole);
-	ini.Set("Options", "WriteToWindow", m_writeWindow);
-#ifdef _MSC_VER
-	if (IsDebuggerPresent())
-		ini.Set("Options", "WriteToDebugger", m_writeDebugger);
-#endif
-
-	// Save all enabled/disabled states of the log types to the config ini.
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		ini.Set("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i));
-	}
-
-	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
-}
-
-// If the verbosity changes while logging
-void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event)
-{
-	// Get the new verbosity
-	int v = m_verbosity->GetSelection() + 1;
-	
-	// Set all log types to that verbosity level
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
-	{
-		m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v);
-	}
-
-	event.Skip();
-}
-
-void LogConfigWindow::OnWriteFileChecked(wxCommandEvent& event)
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_writeFile = event.IsChecked();
-		if (m_checks->IsChecked(i))
-		{
-			if (m_writeFile)
-				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
-			else
-				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
-		}
-	}
-}
-
-void LogConfigWindow::OnWriteConsoleChecked(wxCommandEvent& event)
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_writeConsole = event.IsChecked();
-		if (m_checks->IsChecked(i))
-		{
-			if (m_writeConsole)
-				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
-			else
-				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
-		}
-	}
-}
-
-void LogConfigWindow::OnWriteWindowChecked(wxCommandEvent& event)
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_writeWindow = event.IsChecked();
-		if (m_checks->IsChecked(i))
-		{
-			if (m_writeWindow)
-				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow);
-			else
-				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogWindow);
-		}
-	}
-}
-
-void LogConfigWindow::OnWriteDebuggerChecked(wxCommandEvent& event)
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_writeDebugger = event.IsChecked();
-		if (m_checks->IsChecked(i))
-		{
-			if (m_writeDebugger)
-				m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener());
-			else
-				m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener());
-		}
-	}
-}
-
-void LogConfigWindow::OnToggleAll(wxCommandEvent& WXUNUSED(event))
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-		ToggleLog(i, enableAll);
-
-	enableAll = !enableAll;
-}
-
-void LogConfigWindow::ToggleLog(int _logType, bool enable)
-{
-	LogTypes::LOG_TYPE logType = (LogTypes::LOG_TYPE)_logType;
-
-	m_checks->Check(_logType, enable);
-
-	m_LogManager->SetEnable(logType, enable);
-
-	if (enable)
-	{
-		if (m_writeWindow)
-			m_LogManager->AddListener(logType, (LogListener *)m_LogWindow);
-		if (m_writeFile)
-			m_LogManager->AddListener(logType, m_LogManager->GetFileListener());
-		if (m_writeConsole)
-			m_LogManager->AddListener(logType, m_LogManager->GetConsoleListener());
-		if (m_writeDebugger)
-			m_LogManager->AddListener(logType, m_LogManager->GetDebuggerListener());
-	}
-	else
-	{
-		m_LogManager->RemoveListener(logType, (LogListener *)m_LogWindow);
-		m_LogManager->RemoveListener(logType, m_LogManager->GetFileListener());
-		m_LogManager->RemoveListener(logType, m_LogManager->GetConsoleListener());
-		m_LogManager->RemoveListener(logType, m_LogManager->GetDebuggerListener());
-	}
-}
-
-void LogConfigWindow::OnLogCheck(wxCommandEvent& event)
-{
-	int i = event.GetInt();
-	ToggleLog(i, m_checks->IsChecked(i));
-}
diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.h b/Source/Core/DolphinWX/Src/LogConfigWindow.h
deleted file mode 100644
index c246bb169c..0000000000
--- a/Source/Core/DolphinWX/Src/LogConfigWindow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LOG_CONFIG_DIAG_H_
-#define _LOG_CONFIG_DIAG_H_
-
-#include <vector>
-#include <wx/wx.h>
-
-class CFrame;
-class LogManager;
-class CLogWindow;
-
-class LogConfigWindow : public wxPanel
-{
-public:
-	LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id = wxID_ANY);
-	~LogConfigWindow();
-
-	void SaveSettings();
-	void LoadSettings();
-
-private:
-	LogManager *m_LogManager;
-	CLogWindow *m_LogWindow;
-	bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger;
-	bool enableAll;
-
-	// Controls
-	wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB, *m_writeDebuggerCB;
-	wxCheckListBox* m_checks;
-	wxRadioBox *m_verbosity;
-
-	void CreateGUIControls();
-	void OnVerbosityChange(wxCommandEvent& event);
-	void OnWriteFileChecked(wxCommandEvent& event);
-	void OnWriteConsoleChecked(wxCommandEvent& event);
-	void OnWriteWindowChecked(wxCommandEvent& event);
-	void OnWriteDebuggerChecked(wxCommandEvent& event);
-	void OnToggleAll(wxCommandEvent& event);
-	void ToggleLog(int _logType, bool enable);
-	void OnLogCheck(wxCommandEvent& event);
-};
-
-#endif // _LOG_CONFIG_DIAG_H_
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp
deleted file mode 100644
index 421ca9ae6b..0000000000
--- a/Source/Core/DolphinWX/Src/LogWindow.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "LogWindow.h"
-#include "ConsoleListener.h"
-#include "Console.h"
-#include "IniFile.h"
-#include "FileUtil.h"
-#include "Debugger/DebuggerUIUtil.h"
-#include "WxUtils.h"
-
-#include <wx/fontmap.h>
-
-// Milliseconds between msgQueue flushes to wxTextCtrl
-#define UPDATETIME 200
-
-BEGIN_EVENT_TABLE(CLogWindow, wxPanel)
-	EVT_CLOSE(CLogWindow::OnClose)
-	EVT_TEXT_ENTER(IDM_SUBMITCMD, CLogWindow::OnSubmit)
-	EVT_BUTTON(IDM_CLEARLOG, CLogWindow::OnClear)
-	EVT_CHOICE(IDM_FONT, CLogWindow::OnFontChange)
-	EVT_CHECKBOX(IDM_WRAPLINE, CLogWindow::OnWrapLineCheck)
-	EVT_TIMER(IDTM_UPDATELOG, CLogWindow::OnLogTimer)
-END_EVENT_TABLE()
-
-CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos,
-		const wxSize& size, long style, const wxString& name)
-	: wxPanel(parent, id, pos, size, style, name)
-	, x(0), y(0), winpos(0)
-	, Parent(parent), m_ignoreLogTimer(false), m_LogAccess(true)
-	, m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL)
-{
-	m_LogManager = LogManager::GetInstance();
-
-	CreateGUIControls();
-
-	m_LogTimer = new wxTimer(this, IDTM_UPDATELOG);
-	m_LogTimer->Start(UPDATETIME);
-}
-
-void CLogWindow::CreateGUIControls()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
-
-	ini.Get("LogWindow", "x", &x, Parent->GetSize().GetX() / 2);
-	ini.Get("LogWindow", "y", &y, Parent->GetSize().GetY());
-	ini.Get("LogWindow", "pos", &winpos, wxAUI_DOCK_RIGHT);
-
-	// Set up log listeners
-	int verbosity;
-	ini.Get("Options", "Verbosity", &verbosity, 0);
-	
-	// Ensure the verbosity level is valid
-	if (verbosity < 1)
-		verbosity = 1;
-	if (verbosity > MAX_LOGLEVEL)
-		verbosity = MAX_LOGLEVEL;
-
-	// Get the logger output settings from the config ini file.
-	ini.Get("Options", "WriteToFile", &m_writeFile, false);
-	ini.Get("Options", "WriteToConsole", &m_writeConsole, true);
-	ini.Get("Options", "WriteToWindow", &m_writeWindow, true);
-#ifdef _MSC_VER
-	if (IsDebuggerPresent())
-	{
-		ini.Get("Options", "WriteToDebugger", &m_writeDebugger, true);
-	}
-	else
-#endif
-	{
-		m_writeDebugger = false;
-	}
-
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		bool enable;
-		ini.Get("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &enable, true);
-
-		if (m_writeWindow && enable)
-			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, this);
-		else
-			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, this);
-
-		if (m_writeFile && enable)
-			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
-		else
-			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener());
-
-		if (m_writeConsole && enable)
-			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
-		else
-			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener());
-
-		if (m_writeDebugger && enable)
-			m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener());
-		else
-			m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener());
-
-		m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity));
-	}
-
-	// Font
-	m_FontChoice = new wxChoice(this, IDM_FONT,
-			wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
-	m_FontChoice->Append(_("Default font"));
-	m_FontChoice->Append(_("Monospaced font"));
-	m_FontChoice->Append(_("Selected font"));
-
-	DefaultFont = GetFont();
-	MonoSpaceFont.SetNativeFontInfoUserDesc(_T("lucida console windows-1252"));
-	LogFont.push_back(DefaultFont);
-	LogFont.push_back(MonoSpaceFont);
-	LogFont.push_back(DebuggerFont);
-
-	int font;
-	ini.Get("Options", "Font", &font, 0);
-	m_FontChoice->SetSelection(font);
-
-	// Word wrap
-	bool wrap_lines;
-	ini.Get("Options", "WrapLines", &wrap_lines, false);
-	m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, _("Word Wrap"));
-	m_WrapLine->SetValue(wrap_lines);
-
-	// Log viewer
-	m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY |
-			(wrap_lines ? wxTE_WORDWRAP : wxTE_DONTWRAP));
-
-	// submit row
-	m_cmdline = new wxTextCtrl(this, IDM_SUBMITCMD, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-			wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB);
-
-	// Sizers
-	wxBoxSizer *sTop = new wxBoxSizer(wxHORIZONTAL);
-	sTop->Add(new wxButton(this, IDM_CLEARLOG, _("Clear"),
-				wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT));
-	sTop->Add(m_FontChoice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 3);
-	sTop->Add(m_WrapLine, 0, wxALIGN_CENTER_VERTICAL);
-
-	sBottom = new wxBoxSizer(wxVERTICAL);
-	PopulateBottom();
-
-	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
-	sMain->Add(sTop, 0, wxEXPAND);
-	sMain->Add(sBottom, 1, wxEXPAND);
-	SetSizer(sMain);
-
-	m_cmdline->SetFocus();
-}
-
-CLogWindow::~CLogWindow()
-{
-	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-	{
-		m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, this);
-	}
-	m_LogTimer->Stop();
-	delete m_LogTimer;
-}
-
-void CLogWindow::OnClose(wxCloseEvent& event)
-{
-	SaveSettings();
-	event.Skip();
-}
-
-void CLogWindow::SaveSettings()
-{
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
-
-	if (!Parent->g_pCodeWindow)
-	{
-		ini.Set("LogWindow", "x", x);
-		ini.Set("LogWindow", "y", y);
-		ini.Set("LogWindow", "pos", winpos);
-	}
-	ini.Set("Options", "Font", m_FontChoice->GetSelection());
-	ini.Set("Options", "WrapLines", m_WrapLine->IsChecked());
-	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
-}
-
-void CLogWindow::OnSubmit(wxCommandEvent& WXUNUSED (event))
-{
-	if (!m_cmdline) return;
-	Console_Submit(WxStrToStr(m_cmdline->GetValue()).c_str());
-	m_cmdline->SetValue(wxEmptyString);
-}
-
-void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event))
-{
-	m_Log->Clear();
-
-	{
-	std::lock_guard<std::mutex> lk(m_LogSection);
-	int msgQueueSize = (int)msgQueue.size();
-	for (int i = 0; i < msgQueueSize; i++)
-		msgQueue.pop();
-	}
-
-	m_LogManager->GetConsoleListener()->ClearScreen();
-}
-
-void CLogWindow::UnPopulateBottom()
-{
-	sBottom->Detach(m_Log);
-	sBottom->Detach(m_cmdline);
-}
-
-void CLogWindow::PopulateBottom()
-{
-	sBottom->Add(m_Log, 1, wxEXPAND | wxSHRINK);
-	sBottom->Add(m_cmdline, 0, wxEXPAND);
-	Layout();
-}
-
-wxTextCtrl* CLogWindow::CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style)
-{
-	wxTextCtrl* TC = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, Style);
-#ifdef __APPLE__
-	TC->SetBackgroundColour(*wxLIGHT_GREY);
-#else
-	TC->SetBackgroundColour(*wxBLACK);
-#endif
-	if (m_FontChoice && m_FontChoice->GetSelection() < (int)LogFont.size() && m_FontChoice->GetSelection() >= 0)
-		TC->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, LogFont[m_FontChoice->GetSelection()]));
-
-	return TC;
-}
-
-void CLogWindow::OnFontChange(wxCommandEvent& event)
-{
-	// Update selected font
-	LogFont[LogFont.size()-1] = DebuggerFont;
-	m_Log->SetStyle(0, m_Log->GetLastPosition(),
-			wxTextAttr(wxNullColour, wxNullColour, LogFont[event.GetSelection()]));
-	m_Log->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, LogFont[event.GetSelection()]));
-
-	SaveSettings();
-}
-
-void CLogWindow::OnWrapLineCheck(wxCommandEvent& event)
-{
-#ifdef __WXGTK__
-	// Clear the old word wrap state and set the new
-	m_Log->SetWindowStyleFlag(m_Log->GetWindowStyleFlag() ^ (wxTE_WORDWRAP | wxTE_DONTWRAP));
-#else
-	wxString Text;
-	// Unfortunately wrapping styles can only be changed dynamically with wxGTK
-	// Notice:	To retain the colors when changing word wrapping we need to
-	//			loop through every letter with GetStyle and then reapply them letter by letter
-	// Prevent m_Log access while it's being destroyed
-	m_LogAccess = false;
-	UnPopulateBottom();
-	Text = m_Log->GetValue();
-	m_Log->Destroy();
-	if (event.IsChecked())
-		m_Log = CreateTextCtrl(this, IDM_LOG,
-				wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_WORDWRAP);
-	else
-		m_Log = CreateTextCtrl(this, IDM_LOG,
-				wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
-	m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
-	m_Log->AppendText(Text);
-	PopulateBottom();
-	m_LogAccess = true;
-#endif
-	SaveSettings();
-}
-
-void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event))
-{
-	if (!m_LogAccess) return;
-	if (m_ignoreLogTimer) return;
-
-	UpdateLog();
-	// Scroll to the last line
-	if (msgQueue.size() > 0)
-	{
-		m_Log->ScrollLines(1);
-		m_Log->ShowPosition( m_Log->GetLastPosition() );
-	}
-}
-
-void CLogWindow::UpdateLog()
-{
-	if (!m_LogAccess) return;
-	if (!m_Log) return;
-
-	// m_LogTimer->Stop();
-	// instead of stopping the timer, let's simply ignore its calls during UpdateLog,
-	// because repeatedly stopping and starting a timer churns memory (and potentially leaks it).
-	m_ignoreLogTimer = true;
-
-	if (!msgQueue.empty())
-	{
-		std::lock_guard<std::mutex> lk(m_LogSection);
-		int msgQueueSize = (int)msgQueue.size();
-		for (int i = 0; i < msgQueueSize; i++)
-		{
-			switch (msgQueue.front().first)
-			{
-				case ERROR_LEVEL:
-					m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
-					break;
-				
-				case WARNING_LEVEL:
-					m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); // YELLOW
-					break;
-				
-				case NOTICE_LEVEL:
-					m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN));
-					break;
-				
-				case INFO_LEVEL:
-					m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN));
-					break;
-				
-				case DEBUG_LEVEL:
-					m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY));
-					break;
-				
-				default:
-					m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
-					break;
-			}
-			if (msgQueue.front().second.size())
-			{
-				int j = m_Log->GetLastPosition();
-				m_Log->AppendText(msgQueue.front().second);
-				// White timestamp
-				m_Log->SetStyle(j, j + 9, wxTextAttr(*wxWHITE));
-			}
-			msgQueue.pop();
-		}
-	}	// unlock log
-
-	// m_LogTimer->Start(UPDATETIME);
-	m_ignoreLogTimer = false;
-}
-
-void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text)
-{
-	std::lock_guard<std::mutex> lk(m_LogSection);
-
-	if (msgQueue.size() >= 100)
-		msgQueue.pop();
-
-	msgQueue.push(std::make_pair(u8(level), StrToWxStr(text)));
-}
diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h
deleted file mode 100644
index 451c90cba8..0000000000
--- a/Source/Core/DolphinWX/Src/LogWindow.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef LOGWINDOW_H_
-#define LOGWINDOW_H_
-
-#include "LogManager.h"
-#include "Frame.h"
-#include "Thread.h"
-#include <queue>
-
-enum
-{
-	IDM_LOG,
-	IDM_CLEARLOG,
-	IDM_TOGGLEALL,
-	IDM_WRAPLINE,
-	IDTM_UPDATELOG,
-	IDM_FONT,
-	IDM_SUBMITCMD
-};
-
-class wxTextCtrl;
-class wxCheckListBox;
-class wxString;
-class CFrame;
-
-// Uses multiple inheritance - only sane because LogListener is a pure virtual interface.
-class CLogWindow : public wxPanel, LogListener
-{
-public:
-	CLogWindow(CFrame *parent,
-		wxWindowID id = wxID_ANY,
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		long style = wxTAB_TRAVERSAL,
-		const wxString& name = _("Log")
-		);
-	~CLogWindow();
-
-	void SaveSettings();
-	void Log(LogTypes::LOG_LEVELS, const char *text);
-
-	int x, y, winpos;
-
-private:
-	CFrame *Parent;
-	wxFont DefaultFont, MonoSpaceFont;
-	std::vector<wxFont> LogFont;
-	wxTimer *m_LogTimer;
-	bool m_ignoreLogTimer;
-	LogManager *m_LogManager;
-	std::queue<std::pair<u8, wxString> > msgQueue;
-	bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger, m_LogAccess;
-
-	// Controls
-	wxBoxSizer *sBottom;
-	wxTextCtrl *m_Log, *m_cmdline;
-	wxChoice *m_FontChoice;
-	wxCheckBox *m_WrapLine;
-
-	std::mutex m_LogSection;
-
-	DECLARE_EVENT_TABLE()
-
-	wxTextCtrl * CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
-	void CreateGUIControls();
-	void PopulateBottom();
-	void UnPopulateBottom();
-	void OnClose(wxCloseEvent& event);
-	void OnSubmit(wxCommandEvent& event);
-	void OnFontChange(wxCommandEvent& event);
-	void OnWrapLineCheck(wxCommandEvent& event);
-	void OnClear(wxCommandEvent& event);
-	void OnLogTimer(wxTimerEvent& WXUNUSED(event));
-	void UpdateLog();
-
-	// LogListener
-	const char *getName() const { return "LogWindow"; }
-};
-
-#endif /*LOGWINDOW_H_*/
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
deleted file mode 100644
index 285fc2729e..0000000000
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ /dev/null
@@ -1,691 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <vector>
-#include <string>
-
-#include "Common.h"
-#include "CommonPaths.h"
-
-#if defined HAVE_X11 && HAVE_X11
-#include <X11/Xlib.h>
-#endif
-
-#include "CPUDetect.h"
-#include "IniFile.h"
-#include "FileUtil.h"
-
-#include "Host.h" // Core
-#include "HW/Wiimote.h"
-
-#include "WxUtils.h"
-#include "Globals.h" // Local
-#include "Main.h"
-#include "ConfigManager.h"
-#include "Debugger/CodeWindow.h"
-#include "Debugger/JitWindow.h"
-#include "ExtendedTrace.h"
-#include "BootManager.h"
-#include "Frame.h"
-
-#include "VideoBackendBase.h"
-
-#include <wx/intl.h>
-
-#ifdef _WIN32
-#include <shellapi.h>
-
-#ifndef SM_XVIRTUALSCREEN
-#define SM_XVIRTUALSCREEN 76
-#endif
-#ifndef SM_YVIRTUALSCREEN
-#define SM_YVIRTUALSCREEN 77
-#endif
-#ifndef SM_CXVIRTUALSCREEN
-#define SM_CXVIRTUALSCREEN 78
-#endif
-#ifndef SM_CYVIRTUALSCREEN
-#define SM_CYVIRTUALSCREEN 79
-#endif
-
-#endif
-
-#ifdef __APPLE__
-#import <AppKit/AppKit.h>
-#endif
-
-// Nvidia drivers >= v302 will check if the application exports a global
-// variable named NvOptimusEnablement to know if it should run the app in high
-// performance graphics mode or using the IGP.
-#ifdef WIN32
-extern "C" {
-	__declspec(dllexport) DWORD NvOptimusEnablement = 1;
-}
-#endif
-
-// ------------
-//  Main window
-
-IMPLEMENT_APP(DolphinApp)
-
-BEGIN_EVENT_TABLE(DolphinApp, wxApp)
-	EVT_TIMER(wxID_ANY, DolphinApp::AfterInit)
-	EVT_QUERY_END_SESSION(DolphinApp::OnEndSession)
-	EVT_END_SESSION(DolphinApp::OnEndSession)
-END_EVENT_TABLE()
-
-#include <wx/stdpaths.h>
-bool wxMsgAlert(const char*, const char*, bool, int);
-std::string wxStringTranslator(const char *);
-
-CFrame* main_frame = NULL;
-
-#ifdef WIN32
-//Has no error handling.
-//I think that if an error occurs here there's no way to handle it anyway.
-LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) {
-	//EnterCriticalSection(&g_uefcs);
-
-	File::IOFile file("exceptioninfo.txt", "a");
-	file.Seek(0, SEEK_END);
-	etfprint(file.GetHandle(), "\n");
-	//etfprint(file, g_buildtime);
-	//etfprint(file, "\n");
-	//dumpCurrentDate(file);
-	etfprintf(file.GetHandle(), "Unhandled Exception\n  Code: 0x%08X\n",
-		e->ExceptionRecord->ExceptionCode);
-#ifndef _M_X64
-	STACKTRACE2(file.GetHandle(), e->ContextRecord->Eip, e->ContextRecord->Esp, e->ContextRecord->Ebp);
-#else
-	STACKTRACE2(file.GetHandle(), e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp);
-#endif
-	file.Close();
-	_flushall();
-
-	//LeaveCriticalSection(&g_uefcs);
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-#endif
-
-bool DolphinApp::Initialize(int& c, wxChar **v)
-{
-#if defined HAVE_X11 && HAVE_X11
-	XInitThreads();
-#endif 
-	return wxApp::Initialize(c, v);
-}
-
-// The `main program' equivalent that creates the main window and return the main frame 
-
-bool DolphinApp::OnInit()
-{
-	InitLanguageSupport();
-
-	// Declarations and definitions
-	bool UseDebugger = false;
-	bool UseLogger = false;
-	bool selectVideoBackend = false;
-	bool selectAudioEmulation = false;
-
-	wxString videoBackendName;
-	wxString audioEmulationName;
-	wxString userPath;
-
-#if wxUSE_CMDLINE_PARSER // Parse command lines
-	wxCmdLineEntryDesc cmdLineDesc[] =
-	{
-		{
-			wxCMD_LINE_SWITCH, "h", "help",
-			"Show this help message",
-			wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
-		},
-		{
-			wxCMD_LINE_SWITCH, "d", "debugger",
-			"Opens the debugger",
-			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_SWITCH, "l", "logger",
-			"Opens the logger",
-			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_OPTION, "e", "exec",
-			"Loads the specified file (DOL,ELF,GCM,ISO,WAD)",
-			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_SWITCH, "b", "batch",
-			"Exit Dolphin with emulator",
-			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_OPTION, "V", "video_backend",
-			"Specify a video backend",
-			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_OPTION, "A", "audio_emulation",
-			"Low level (LLE) or high level (HLE) audio",
-			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_OPTION, "m", "movie",
-			"Play a movie file",
-			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_OPTION, "U", "user",
-			"User folder path",
-			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
-		},
-		{
-			wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0
-		}
-	};
-
-	// Gets the command line parameters
-	wxCmdLineParser parser(cmdLineDesc, argc, argv);
-	if (parser.Parse() != 0)
-	{
-		return false;
-	} 
-
-	UseDebugger = parser.Found(wxT("debugger"));
-	UseLogger = parser.Found(wxT("logger"));
-	LoadFile = parser.Found(wxT("exec"), &FileToLoad);
-	BatchMode = parser.Found(wxT("batch"));
-	selectVideoBackend = parser.Found(wxT("video_backend"),
-		&videoBackendName);
-	selectAudioEmulation = parser.Found(wxT("audio_emulation"),
-		&audioEmulationName);
-	playMovie = parser.Found(wxT("movie"), &movieFile);
-
-	if (parser.Found(wxT("user"), &userPath))
-	{
-		File::CreateFullPath(WxStrToStr(userPath) + DIR_SEP);
-		File::GetUserPath(D_USER_IDX, userPath.ToStdString() + DIR_SEP);
-	}
-#endif // wxUSE_CMDLINE_PARSER
-
-#if defined _DEBUG && defined _WIN32
-	int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-	tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF;
-	_CrtSetDbgFlag(tmpflag);
-#endif
-
-	// Register message box and translation handlers
-	RegisterMsgAlertHandler(&wxMsgAlert);
-	RegisterStringTranslator(&wxStringTranslator);
-
-	// "ExtendedTrace" looks freakin' dangerous!!!
-#ifdef _WIN32
-	EXTENDEDTRACEINITIALIZE(".");
-	SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
-#elif wxUSE_ON_FATAL_EXCEPTION
-	wxHandleFatalExceptions(true);
-#endif
-
-#ifndef _M_ARM
-	// TODO: if First Boot
-	if (!cpu_info.bSSE2) 
-	{
-		PanicAlertT("Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
-				"Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
-				"Sayonara!\n");
-		return false;
-	}
-#endif
-#ifdef __APPLE__
-	if (floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_7)
-	{
-		PanicAlertT("Hi,\n\nDolphin requires Mac OS X 10.7 or greater.\n"
-				"Unfortunately you're running an old version of OS X.\n"
-				"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
-				"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n\n"
-				"Sayonara!\n");
-		return false;
-	}
-#endif
-
-	// Copy initial Wii NAND data from Sys to User.
-	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR DIR_SEP,
-	              File::GetUserPath(D_WIIUSER_IDX));
-
-	File::CreateFullPath(File::GetUserPath(D_USER_IDX));
-	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
-	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
-	File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
-	File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GAMESETTINGS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
-	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_MAPS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_OPENCL_IDX));
-	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_THEMES_IDX));
-
-	LogManager::Init();
-	SConfig::Init();
-	VideoBackend::PopulateList();
-	WiimoteReal::LoadSettings();
-
-	if (selectVideoBackend && videoBackendName != wxEmptyString)
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend =
-			WxStrToStr(videoBackendName);
-
-	if (selectAudioEmulation)
-	{
-		if (audioEmulationName == "HLE")
-			SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true;
-		else if (audioEmulationName == "LLE")
-			SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false;
-	}
-
-	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
-
-	// Enable the PNG image handler for screenshots
-	wxImage::AddHandler(new wxPNGHandler);
-
-	SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers);
-
-	int x = SConfig::GetInstance().m_LocalCoreStartupParameter.iPosX;
-	int y = SConfig::GetInstance().m_LocalCoreStartupParameter.iPosY;
-	int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth;
-	int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight;
-
-#ifdef _WIN32
-	if (File::Exists("www.dolphin-emulator.com.txt"))
-	{
-		File::Delete("www.dolphin-emulator.com.txt");
-		MessageBox(NULL,
-				   L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please "
-				   L"download Dolphin from the official website instead: http://dolphin-emu.org/",
-				   L"Unofficial version detected", MB_OK | MB_ICONWARNING);
-		ShellExecute(NULL, L"open", L"http://dolphin-emu.org/?ref=badver", NULL, NULL, SW_SHOWDEFAULT);
-		exit(0);
-	}
-#endif
-
-	// The following is not needed with X11, where window managers
-	// do not allow windows to be created off the desktop.
-#ifdef _WIN32
-	// Out of desktop check
-	int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
-	int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
-	int width =  GetSystemMetrics(SM_CXVIRTUALSCREEN);
-	int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);	
-	if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y)
-		x = y = wxDefaultCoord;
-#elif defined __APPLE__
-	if (y < 1)
-		y = wxDefaultCoord;
-#endif
-
-	main_frame = new CFrame((wxFrame*)NULL, wxID_ANY,
-				StrToWxStr(scm_rev_str),
-				wxPoint(x, y), wxSize(w, h),
-				UseDebugger, BatchMode, UseLogger);
-	SetTopWindow(main_frame);
-	main_frame->SetMinSize(wxSize(400, 300));
-
-	// Postpone final actions until event handler is running.
-	// Updating the game list makes use of wxProgressDialog which may
-	// only be run after OnInit() when the event handler is running.
-	m_afterinit = new wxTimer(this, wxID_ANY);
-	m_afterinit->Start(1, wxTIMER_ONE_SHOT);
-
-	return true;
-}
-
-void DolphinApp::MacOpenFile(const wxString &fileName)
-{
-	FileToLoad = fileName;
-	LoadFile = true;
-
-	if (m_afterinit == NULL)
-		main_frame->BootGame(WxStrToStr(FileToLoad));
-}
-
-void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
-{
-	delete m_afterinit;
-	m_afterinit = NULL;
-
-	if (!BatchMode)
-		main_frame->UpdateGameList();
-
-	if (playMovie && movieFile != wxEmptyString)
-	{
-		if (Movie::PlayInput(movieFile.char_str()))
-		{
-			if (LoadFile && FileToLoad != wxEmptyString)
-			{
-				main_frame->BootGame(WxStrToStr(FileToLoad));
-			}
-			else
-			{
-				main_frame->BootGame(std::string(""));
-			}
-		}
-	}
-
-	// First check if we have an exec command line.
-	else if (LoadFile && FileToLoad != wxEmptyString)
-	{
-		main_frame->BootGame(WxStrToStr(FileToLoad));
-	}
-	// If we have selected Automatic Start, start the default ISO,
-	// or if no default ISO exists, start the last loaded ISO
-	else if (main_frame->g_pCodeWindow)
-	{
-		if (main_frame->g_pCodeWindow->AutomaticStart())
-		{
-			main_frame->BootGame("");
-		}
-	}
-}
-
-void DolphinApp::InitLanguageSupport()
-{
-	unsigned int language = 0;
-
-	IniFile ini;
-	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-	ini.Get("Interface", "Language", &language, wxLANGUAGE_DEFAULT);
-
-	// Load language if possible, fall back to system default otherwise
-	if(wxLocale::IsAvailable(language))
-	{
-		m_locale = new wxLocale(language);
-
-#ifdef _WIN32
-		m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages"));
-#endif
-
-		m_locale->AddCatalog(wxT("dolphin-emu"));
-
-		if(!m_locale->IsOk())
-		{
-			PanicAlertT("Error loading selected language. Falling back to system default.");
-			delete m_locale;
-			m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
-		}
-	}
-	else
-	{
-		PanicAlertT("The selected language is not supported by your system. Falling back to system default.");
-		m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
-	}
-}
-
-void DolphinApp::OnEndSession(wxCloseEvent& event)
-{
-	// Close if we've recieved wxEVT_END_SESSION (ignore wxEVT_QUERY_END_SESSION)
-	if (!event.CanVeto())
-	{
-		main_frame->Close(true);
-	}
-}
-
-int DolphinApp::OnExit()
-{
-	WiimoteReal::Shutdown();
-	VideoBackend::ClearList();
-	SConfig::Shutdown();
-	LogManager::Shutdown();
-
-	delete m_locale;
-
-	return wxApp::OnExit();
-}
-
-void DolphinApp::OnFatalException()
-{
-	WiimoteReal::Shutdown();
-}
-
-
-// ------------
-// Talk to GUI
-
-void Host_SysMessage(const char *fmt, ...) 
-{
-	va_list list;
-	char msg[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = 0;
-	//wxMessageBox(StrToWxStr(msg));
-	PanicAlert("%s", msg);
-}
-
-bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/)
-{
-#ifdef __WXGTK__
-	if (wxIsMainThread())
-#endif
-		return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption),
-				(yes_no) ? wxYES_NO : wxOK, wxGetActiveWindow());
-#ifdef __WXGTK__
-	else
-	{
-		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_PANIC);
-		event.SetString(StrToWxStr(caption) + wxT(":") + StrToWxStr(text));
-		event.SetInt(yes_no);
-		main_frame->GetEventHandler()->AddPendingEvent(event);
-		main_frame->panic_event.Wait();
-		return main_frame->bPanicResult;
-	}
-#endif
-}
-
-std::string wxStringTranslator(const char *text)
-{
-	return WxStrToStr(wxGetTranslation(wxString::FromUTF8(text)));
-}
-
-// Accessor for the main window class
-CFrame* DolphinApp::GetCFrame()
-{
-	return main_frame;
-}
-
-void Host_Message(int Id)
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, Id);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-}
-
-#ifdef _WIN32
-extern "C" HINSTANCE wxGetInstance();
-void* Host_GetInstance()
-{
-	return (void*)wxGetInstance();
-}
-#else
-void* Host_GetInstance()
-{
-	return NULL;
-}
-#endif
-
-void* Host_GetRenderHandle()
-{
-	return main_frame->GetRenderHandle();
-}
-
-// OK, this thread boundary is DANGEROUS on linux
-// wxPostEvent / wxAddPendingEvent is the solution.
-void Host_NotifyMapLoaded()
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_NOTIFYMAPLOADED);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-
-	if (main_frame->g_pCodeWindow)
-	{
-		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-
-void Host_UpdateLogDisplay()
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATELOGDISPLAY);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-
-	if (main_frame->g_pCodeWindow)
-	{
-		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-
-void Host_UpdateDisasmDialog()
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEDISASMDIALOG);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-
-	if (main_frame->g_pCodeWindow)
-	{
-		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-
-void Host_ShowJitResults(unsigned int address)
-{
-	if (main_frame->g_pCodeWindow && main_frame->g_pCodeWindow->m_JitWindow)
-		main_frame->g_pCodeWindow->m_JitWindow->ViewAddr(address);
-}
-
-void Host_UpdateMainFrame()
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-
-	if (main_frame->g_pCodeWindow)
-	{
-		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-void Host_UpdateTitle(const char* title)
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATETITLE);
-	event.SetString(StrToWxStr(title));
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-}
-
-void Host_UpdateBreakPointView()
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEBREAKPOINTS);
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-
-	if (main_frame->g_pCodeWindow)
-	{
-		main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
-	}
-}
-
-bool Host_GetKeyState(int keycode)
-{
-#ifdef _WIN32
-	return (0 != GetAsyncKeyState(keycode));
-#elif defined __WXGTK__
-	std::unique_lock<std::recursive_mutex> lk(main_frame->keystate_lock, std::try_to_lock);
-	if (!lk.owns_lock())
-		return false;
-
-	bool key_pressed;
-	if (!wxIsMainThread()) wxMutexGuiEnter();
-	key_pressed = wxGetKeyState(wxKeyCode(keycode));
-	if (!wxIsMainThread()) wxMutexGuiLeave();
-	return key_pressed;
-#else
-	return wxGetKeyState(wxKeyCode(keycode));
-#endif
-}
-
-void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
-{
-	main_frame->GetRenderWindowSize(x, y, width, height);
-}
-
-void Host_RequestRenderWindowSize(int width, int height)
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_WINDOWSIZEREQUEST);
-	event.SetClientData(new std::pair<int, int>(width, height));
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-}
-
-void Host_SetStartupDebuggingParameters()
-{
-	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-	if (main_frame->g_pCodeWindow)
-	{
-		StartUp.bBootToPause = main_frame->g_pCodeWindow->BootToPause();
-		StartUp.bAutomaticStart = main_frame->g_pCodeWindow->AutomaticStart();
-		StartUp.bJITNoBlockCache = main_frame->g_pCodeWindow->JITNoBlockCache();
-		StartUp.bJITBlockLinking = main_frame->g_pCodeWindow->JITBlockLinking();
-	}
-	else
-	{
-		StartUp.bBootToPause = false;
-	}
-	StartUp.bEnableDebugging = main_frame->g_pCodeWindow ? true : false; // RUNNING_DEBUG
-}
-
-void Host_UpdateStatusBar(const char* _pText, int Field)
-{
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATESTATUSBAR);
-	// Set the event string
-	event.SetString(StrToWxStr(_pText));
-	// Update statusbar field
-	event.SetInt(Field);
-	// Post message
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-}
-
-void Host_SetWiiMoteConnectionState(int _State)
-{
-	static int currentState = -1;
-	if (_State == currentState)
-		return;
-	currentState = _State;
-
-	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATESTATUSBAR);
-
-	switch(_State)
-	{
-	case 0: event.SetString(_("Not connected")); break;
-	case 1: event.SetString(_("Connecting...")); break;
-	case 2: event.SetString(_("Wiimote Connected")); break;
-	}
-	// Update field 1 or 2
-	event.SetInt(1);
-
-	NOTICE_LOG(WIIMOTE, "%s", static_cast<const char*>(event.GetString().c_str()));
-
-	main_frame->GetEventHandler()->AddPendingEvent(event);
-}
-
-bool Host_RendererHasFocus()
-{
-	return main_frame->RendererHasFocus();
-}
-
-void Host_ConnectWiimote(int wm_idx, bool connect)
-{
-	CFrame::ConnectWiimote(wm_idx, connect);
-}
diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h
deleted file mode 100644
index 08d67e4dda..0000000000
--- a/Source/Core/DolphinWX/Src/Main.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __MAIN_H_
-#define __MAIN_H_
-
-#include "Frame.h"
-
-// Define a new application
-class CFrame;
-class DolphinApp : public wxApp
-{
-public:
-	CFrame* GetCFrame();
-
-private:
-	bool OnInit();
-	int OnExit();
-	void OnFatalException();
-	bool Initialize(int& c, wxChar **v);
-	void InitLanguageSupport();
-	void MacOpenFile(const wxString &fileName);
-
-	DECLARE_EVENT_TABLE()
-
-	wxTimer *m_afterinit;
-	bool BatchMode;
-	bool LoadFile;
-	bool playMovie;
-	wxString FileToLoad;
-	wxString movieFile;
-	wxLocale *m_locale;
-
-	void AfterInit(wxTimerEvent& WXUNUSED(event));
-	void OnEndSession(wxCloseEvent& event);
-};
-
-DECLARE_APP(DolphinApp);
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
deleted file mode 100644
index 8fcab598cc..0000000000
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#include "Core.h"
-#include "Host.h"
-#include "CPUDetect.h"
-#include "Thread.h"
-
-#include "State.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Wiimote.h"
-
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-#include "LogManager.h"
-#include "BootManager.h"
-#include "OnScreenDisplay.h"
-
-// Banner loading
-#include "Filesystem.h"
-#include "BannerLoader.h"
-#include "VolumeCreator.h"
-
-#include "Android/ButtonManager.h"
-
-#include <jni.h>
-#include <android/log.h>
-#include <android/native_window_jni.h>
-ANativeWindow* surf;
-int g_width, g_height;
-std::string g_filename;
-static std::thread g_run_thread;
-
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "Dolphinemu", __VA_ARGS__))
-
-void Host_NotifyMapLoaded() {}
-void Host_RefreshDSPDebuggerWindow() {}
-
-void Host_ShowJitResults(unsigned int address){}
-
-Common::Event updateMainFrameEvent;
-void Host_Message(int Id)
-{
-}
-
-void* Host_GetRenderHandle()
-{
-	return surf;
-}
-
-void* Host_GetInstance() { return NULL; }
-
-void Host_UpdateTitle(const char* title)
-{
-	LOGI(title);
-};
-
-void Host_UpdateLogDisplay(){}
-
-void Host_UpdateDisasmDialog(){}
-
-void Host_UpdateMainFrame()
-{
-}
-
-void Host_UpdateBreakPointView(){}
-
-bool Host_GetKeyState(int keycode)
-{
-	return false;
-}
-
-void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
-{
-	x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;
-	y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos;
-	width = g_width; 	
-	height = g_height; 
-}
-
-void Host_RequestRenderWindowSize(int width, int height) {}
-void Host_SetStartupDebuggingParameters()
-{
-}
-
-bool Host_RendererHasFocus()
-{
-	return true;
-}
-
-void Host_ConnectWiimote(int wm_idx, bool connect) {}
-
-void Host_SetWaitCursor(bool enable){}
-
-void Host_UpdateStatusBar(const char* _pText, int Filed){}
-
-void Host_SysMessage(const char *fmt, ...)
-{
-	va_list list;
-	char msg[512];
-
-	va_start(list, fmt);
-	vsnprintf(msg, 512, fmt, list);
-	va_end(list);
-
-	size_t len = strlen(msg);
-	if (msg[len - 1] != '\n') {
-		msg[len - 1] = '\n';
-		msg[len] = '\0';
-	}
-	LOGI(msg);
-}
-
-void Host_SetWiiMoteConnectionState(int _State) {}
-
-#define DVD_BANNER_WIDTH 96
-#define DVD_BANNER_HEIGHT 32
-std::vector<std::string> m_volume_names;
-std::vector<std::string> m_names;
-
-bool LoadBanner(std::string filename, u32 *Banner)
-{
-	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
-
-	if (pVolume != NULL)
-	{
-		bool bIsWad = false;
-		if (DiscIO::IsVolumeWadFile(pVolume))
-			bIsWad = true;
-
-		m_volume_names = pVolume->GetNames();
-
-		// check if we can get some info from the banner file too
-		DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
-
-		if (pFileSystem != NULL || bIsWad)
-		{
-			DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
-
-			if (pBannerLoader != NULL)
-				if (pBannerLoader->IsValid())
-				{
-					m_names = pBannerLoader->GetNames();
-					if (pBannerLoader->GetBanner(Banner))
-						return true;
-				}
-		}
-	}
-
-	return false;
-}
-std::string GetName(std::string filename)
-{
-	if (!m_names.empty())
-		return m_names[0];
-
-	if (!m_volume_names.empty())
-		return m_volume_names[0];
-	// No usable name, return filename (better than nothing)
-	std::string name;
-	SplitPath(filename, NULL, &name, NULL);
-
-	return name;
-}
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj)
-{
-	PowerPC::Start();
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj) 
-{
-	PowerPC::Pause();
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj) 
-{
-	PowerPC::Stop();
-	updateMainFrameEvent.Set(); // Kick the waiting event
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchEvent(JNIEnv *env, jobject obj, jint Action, jfloat X, jfloat Y)
-{
-	ButtonManager::TouchEvent(Action, X, Y);
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
-{
-	const char *Device = env->GetStringUTFChars(jDevice, NULL);
-	std::string strDevice = std::string(Device);
-	ButtonManager::GamepadEvent(strDevice, Button, Action);
-	env->ReleaseStringUTFChars(jDevice, Device);
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value)
-{
-	const char *Device = env->GetStringUTFChars(jDevice, NULL);
-	std::string strDevice = std::string(Device);
-	ButtonManager::GamepadAxisEvent(strDevice, Axis, Value);
-	env->ReleaseStringUTFChars(jDevice, Device);
-}
-
-JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
-{
-	const char *File = env->GetStringUTFChars(jFile, NULL);
-	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
-	u32 uBanner[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
-	if (LoadBanner(File, uBanner))
-	{
-		env->SetIntArrayRegion(Banner, 0, DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT, (jint*)uBanner);
-	}
-	env->ReleaseStringUTFChars(jFile, File);
-	return Banner;
-}
-JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
-{
-	const char *File = env->GetStringUTFChars(jFile, NULL);
-	std::string Name = GetName(File);
-	m_names.clear();
-	m_volume_names.clear();
-
-	env->ReleaseStringUTFChars(jFile, File);
-	return env->NewStringUTF(Name.c_str());
-}
-JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj)
-{
-	return env->NewStringUTF(scm_rev_str);
-}
-JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
-{
-	IniFile ini;
-	const char *File = env->GetStringUTFChars(jFile, NULL);
-	const char *Key = env->GetStringUTFChars(jKey, NULL);
-	const char *Value = env->GetStringUTFChars(jValue, NULL);
-	const char *Default = env->GetStringUTFChars(jDefault, NULL);
-	
-	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
-	std::string value;
-	
-	ini.Get(Key, Value, &value, Default);
-	
-	env->ReleaseStringUTFChars(jFile, File);
-	env->ReleaseStringUTFChars(jKey, Key);
-	env->ReleaseStringUTFChars(jValue, Value);
-	env->ReleaseStringUTFChars(jDefault, Default);
-
-	return env->NewStringUTF(value.c_str());
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
-{
-	IniFile ini;
-	const char *File = env->GetStringUTFChars(jFile, NULL);
-	const char *Key = env->GetStringUTFChars(jKey, NULL);
-	const char *Value = env->GetStringUTFChars(jValue, NULL);
-	const char *Default = env->GetStringUTFChars(jDefault, NULL);
-	
-	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
-
-	ini.Set(Key, Value, Default);
-	ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
-
-	env->ReleaseStringUTFChars(jFile, File);
-	env->ReleaseStringUTFChars(jKey, Key);
-	env->ReleaseStringUTFChars(jValue, Value);
-	env->ReleaseStringUTFChars(jDefault, Default);
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv *env, jobject obj, jstring jFile)
-{
-	const char *File = env->GetStringUTFChars(jFile, NULL);
-
-	g_filename = std::string(File);
-
-	env->ReleaseStringUTFChars(jFile, File);
-}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetDimensions(JNIEnv *env, jobject obj, jint _width, jint _height)
-{
-	g_width = (int)_width;
-	g_height = (int)_height;
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot)
-{
-	State::Save(slot);
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv *env, jobject obj, jint slot)
-{
-	State::Load(slot);
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv *env, jobject obj)
-{
-	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
-	File::CreateFullPath(File::GetUserPath(D_WIIUSER_IDX));
-	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
-	File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
-	File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
-}
-
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf)
-{
-	surf = ANativeWindow_fromSurface(env, _surf);
-	// Install our callbacks
-	OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init);
-	OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown);
-
-	LogManager::Init();
-	SConfig::Init();
-	VideoBackend::PopulateList();
-	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
-	WiimoteReal::LoadSettings();
-
-	// Load our Android specific settings
-	IniFile ini;
-	bool onscreencontrols = true;
-	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
-	ini.Get("Android", "ScreenControls", &onscreencontrols, true);
-
-	if (onscreencontrols)
-		OSD::AddCallback(OSD::OSD_ONFRAME, ButtonManager::DrawButtons);
-
-	// No use running the loop when booting fails
-	if ( BootManager::BootCore( g_filename.c_str() ) )
-		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
-			updateMainFrameEvent.Wait();
-
-	WiimoteReal::Shutdown();
-	VideoBackend::ClearList();
-	SConfig::Shutdown();
-	LogManager::Shutdown();
-}
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
deleted file mode 100644
index ad1ac8120d..0000000000
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <getopt.h>
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#if defined HAVE_X11 && HAVE_X11
-#include <X11/keysym.h>
-#include "State.h"
-#include "X11Utils.h"
-#endif
-
-#ifdef __APPLE__
-#import <Cocoa/Cocoa.h>
-#endif
-
-#include "Core.h"
-#include "Host.h"
-#include "CPUDetect.h"
-#include "Thread.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Wiimote.h"
-
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-#include "LogManager.h"
-#include "BootManager.h"
-
-bool rendererHasFocus = true;
-bool running = true;
-
-void Host_NotifyMapLoaded() {}
-void Host_RefreshDSPDebuggerWindow() {}
-
-void Host_ShowJitResults(unsigned int address){}
-
-Common::Event updateMainFrameEvent;
-void Host_Message(int Id)
-{
-	switch (Id)
-	{
-		case WM_USER_STOP:
-			running = false;
-			break;
-	}
-}
-
-void* Host_GetRenderHandle()
-{
-	return NULL;
-}
-
-void* Host_GetInstance() { return NULL; }
-
-void Host_UpdateTitle(const char* title){};
-
-void Host_UpdateLogDisplay(){}
-
-void Host_UpdateDisasmDialog(){}
-
-void Host_UpdateMainFrame()
-{
-	updateMainFrameEvent.Set();
-}
-
-void Host_UpdateBreakPointView(){}
-
-bool Host_GetKeyState(int keycode)
-{
-	return false;
-}
-
-void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
-{
-	x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;
-	y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos;
-	width = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth;
-	height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight;
-}
-
-void Host_RequestRenderWindowSize(int width, int height) {}
-void Host_SetStartupDebuggingParameters()
-{
-    SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
-	StartUp.bEnableDebugging = false;
-	StartUp.bBootToPause = false;
-}
-
-bool Host_RendererHasFocus()
-{
-	return rendererHasFocus;
-}
-
-void Host_ConnectWiimote(int wm_idx, bool connect) {}
-
-void Host_SetWaitCursor(bool enable){}
-
-void Host_UpdateStatusBar(const char* _pText, int Filed){}
-
-void Host_SysMessage(const char *fmt, ...)
-{
-	va_list list;
-	char msg[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	size_t len = strlen(msg);
-	if (msg[len - 1] != '\n') {
-		msg[len - 1] = '\n';
-		msg[len] = '\0';
-	}
-	fprintf(stderr, "%s", msg);
-}
-
-void Host_SetWiiMoteConnectionState(int _State) {}
-
-#if defined(HAVE_X11) && HAVE_X11
-void X11_MainLoop()
-{
-	bool fullscreen = SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen;
-	while (Core::GetState() == Core::CORE_UNINITIALIZED)
-		updateMainFrameEvent.Wait();
-
-	Display *dpy = XOpenDisplay(0);
-	Window win = (Window)Core::GetWindowHandle();
-	XSelectInput(dpy, win, KeyPressMask | FocusChangeMask);
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-		X11Utils::InhibitScreensaver(dpy, win, true);
-
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-	X11Utils::XRRConfiguration *XRRConfig = new X11Utils::XRRConfiguration(dpy, win);
-#endif
-
-	Cursor blankCursor = None;
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-	{
-		// make a blank cursor
-		Pixmap Blank;
-		XColor DummyColor;
-		char ZeroData[1] = {0};
-		Blank = XCreateBitmapFromData (dpy, win, ZeroData, 1, 1);
-		blankCursor = XCreatePixmapCursor(dpy, Blank, Blank, &DummyColor, &DummyColor, 0, 0);
-		XFreePixmap (dpy, Blank);
-		XDefineCursor(dpy, win, blankCursor);
-	}
-
-	if (fullscreen)
-	{
-		X11Utils::EWMH_Fullscreen(dpy, _NET_WM_STATE_TOGGLE);
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-		XRRConfig->ToggleDisplayMode(True);
-#endif
-	}
-
-	// The actual loop
-	while (running)
-	{
-		XEvent event;
-		KeySym key;
-		for (int num_events = XPending(dpy); num_events > 0; num_events--)
-		{
-			XNextEvent(dpy, &event);
-			switch(event.type)
-			{
-				case KeyPress:
-					key = XLookupKeysym((XKeyEvent*)&event, 0);
-					if (key == XK_Escape)
-					{
-						if (Core::GetState() == Core::CORE_RUN)
-						{
-							if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-								XUndefineCursor(dpy, win);
-							Core::SetState(Core::CORE_PAUSE);
-						}
-						else
-						{
-							if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-								XDefineCursor(dpy, win, blankCursor);
-							Core::SetState(Core::CORE_RUN);
-						}
-					}
-					else if ((key == XK_Return) && (event.xkey.state & Mod1Mask))
-					{
-						fullscreen = !fullscreen;
-						X11Utils::EWMH_Fullscreen(dpy, _NET_WM_STATE_TOGGLE);
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-						XRRConfig->ToggleDisplayMode(fullscreen);
-#endif
-					}
-					else if (key >= XK_F1 && key <= XK_F8)
-					{
-						int slot_number = key - XK_F1 + 1;
-						if (event.xkey.state & ShiftMask)
-							State::Save(slot_number);
-						else
-							State::Load(slot_number);
-					}
-					else if (key == XK_F9)
-						Core::SaveScreenShot();
-					else if (key == XK_F11)
-						State::LoadLastSaved();
-					else if (key == XK_F12)
-					{
-						if (event.xkey.state & ShiftMask)
-							State::UndoLoadState();
-						else
-							State::UndoSaveState();
-					}
-					break;
-				case FocusIn:
-					rendererHasFocus = true;
-					if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
-							Core::GetState() != Core::CORE_PAUSE)
-						XDefineCursor(dpy, win, blankCursor);
-					break;
-				case FocusOut:
-					rendererHasFocus = false;
-					if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-						XUndefineCursor(dpy, win);
-					break;
-			}
-		}
-		if (!fullscreen)
-		{
-			Window winDummy;
-			unsigned int borderDummy, depthDummy;
-			XGetGeometry(dpy, win, &winDummy,
-					&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos,
-					&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos,
-					(unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
-					(unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight,
-					&borderDummy, &depthDummy);
-		}
-		usleep(100000);
-	}
-
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-	delete XRRConfig;
-#endif
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-		X11Utils::InhibitScreensaver(dpy, win, false);
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
-		XFreeCursor(dpy, blankCursor);
-	XCloseDisplay(dpy);
-	Core::Stop();
-}
-#endif
-
-int main(int argc, char* argv[])
-{
-#ifdef __APPLE__
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSEvent *event = [[NSEvent alloc] init];	
-	[NSApplication sharedApplication];
-	[NSApp activateIgnoringOtherApps: YES];
-	[NSApp finishLaunching];
-#endif
-	int ch, help = 0;
-	struct option longopts[] = {
-		{ "exec",	no_argument,	NULL,	'e' },
-		{ "help",	no_argument,	NULL,	'h' },
-		{ "version",	no_argument,	NULL,	'v' },
-		{ NULL,		0,		NULL,	0 }
-	};
-
-	while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1) {
-		switch (ch) {
-		case 'e':
-			break;
-		case 'h':
-		case '?':
-			help = 1;
-			break;
-		case 'v':
-			fprintf(stderr, "%s\n", scm_rev_str);
-			return 1;
-		}
-	}
-
-	if (help == 1 || argc == optind) {
-		fprintf(stderr, "%s\n\n", scm_rev_str);
-		fprintf(stderr, "A multi-platform Gamecube/Wii emulator\n\n");
-		fprintf(stderr, "Usage: %s [-e <file>] [-h] [-v]\n", argv[0]);
-		fprintf(stderr, "  -e, --exec	Load the specified file\n");
-		fprintf(stderr, "  -h, --help	Show this help message\n");
-		fprintf(stderr, "  -v, --help	Print version and exit\n");
-		return 1;
-	}
-
-	LogManager::Init();
-	SConfig::Init();
-	VideoBackend::PopulateList();
-	VideoBackend::ActivateBackend(SConfig::GetInstance().
-		m_LocalCoreStartupParameter.m_strVideoBackend);
-	WiimoteReal::LoadSettings();
-
-	// No use running the loop when booting fails
-	if (BootManager::BootCore(argv[optind]))
-	{
-#ifdef __APPLE__
-		while (running)
-		{
-			event = [NSApp nextEventMatchingMask: NSAnyEventMask
-				untilDate: [NSDate distantFuture]
-				inMode: NSDefaultRunLoopMode dequeue: YES];
-	
-			if ([event type] == NSKeyDown &&
-				[event modifierFlags] & NSCommandKeyMask &&
-				[[event characters] UTF8String][0] == 'q')
-			{
-				Core::Stop();
-				break;
-			}
-	
-			if ([event type] != NSKeyDown)
-				[NSApp sendEvent: event];
-		}	
-
-		[event release];
-		[pool release];
-#elif defined HAVE_X11 && HAVE_X11
-		XInitThreads();
-		X11_MainLoop();
-#else
-		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
-			updateMainFrameEvent.Wait();
-#endif
-	}
-
-	WiimoteReal::Shutdown();
-	VideoBackend::ClearList();
-	SConfig::Shutdown();
-	LogManager::Shutdown();
-
-	return 0;
-}
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
deleted file mode 100644
index 68f56c014c..0000000000
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ /dev/null
@@ -1,826 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "MemcardManager.h"
-#include "Common.h"
-
-#include "WxUtils.h"
-#include "wx/mstream.h"
-
-#define ARROWS slot ? _T("") : ARROW[slot], slot ? ARROW[slot] : _T("")
-
-const u8 hdr[] = {
-0x42,0x4D,
-0x38,0x30,0x00,0x00,
-0x00,0x00,0x00,0x00,
-0x36,0x00,0x00,0x00,
-0x28,0x00,0x00,0x00,
-0x20,0x00,0x00,0x00, //W
-0x20,0x00,0x00,0x00, //H
-0x01,0x00,
-0x20,0x00,
-0x00,0x00,0x00,0x00,
-0x02,0x30,0x00,0x00, //data size
-0x12,0x0B,0x00,0x00,
-0x12,0x0B,0x00,0x00,
-0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00
-};
-
-wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height)
-{
-	u32 stride = (4*width);
-
-	u32 bytes = (stride*height) + sizeof(hdr);
-
-	bytes = (bytes+3)&(~3);
-
-	u8 *pdata = new u8[bytes];
-
-	memset(pdata,0,bytes);
-	memcpy(pdata,hdr,sizeof(hdr));
-
-	u8 *pixelData = pdata + sizeof(hdr);
-
-	for (u32 y=0;y<height;y++)
-	{
-		memcpy(pixelData+y*stride,data+(height-y-1)*stride,stride);
-	}
-
-	*(u32*)(pdata+18) = width;
-	*(u32*)(pdata+22) = height;
-	*(u32*)(pdata+34) = bytes-sizeof(hdr);
-
-	wxMemoryInputStream is(pdata, bytes);
-	wxBitmap map(wxImage(is, wxBITMAP_TYPE_BMP, -1), -1);
-
-	delete [] pdata;
-
-	return map;
-}
-
-BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
-	EVT_BUTTON(ID_COPYFROM_A,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_COPYFROM_B,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_DELETE_A,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_DELETE_B,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_SAVEIMPORT_B,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_SAVEEXPORT_B,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_SAVEIMPORT_A,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_SAVEEXPORT_A,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_CONVERTTOGCI,CMemcardManager::CopyDeleteClick)
-	EVT_BUTTON(ID_PREVPAGE_A, CMemcardManager::OnPageChange)
-	EVT_BUTTON(ID_NEXTPAGE_A, CMemcardManager::OnPageChange)
-	EVT_BUTTON(ID_PREVPAGE_B, CMemcardManager::OnPageChange)
-	EVT_BUTTON(ID_NEXTPAGE_B, CMemcardManager::OnPageChange)
-
-	EVT_FILEPICKER_CHANGED(ID_MEMCARDPATH_A,CMemcardManager::OnPathChange)
-	EVT_FILEPICKER_CHANGED(ID_MEMCARDPATH_B,CMemcardManager::OnPathChange)
-
-	EVT_MENU_RANGE(ID_MEMCARDPATH_A, ID_USEPAGES, CMemcardManager::OnMenuChange)
-	EVT_MENU_RANGE(ID_COPYFROM_A, ID_CONVERTTOGCI, CMemcardManager::CopyDeleteClick)
-	EVT_MENU_RANGE(ID_NEXTPAGE_A, ID_PREVPAGE_B, CMemcardManager::OnPageChange)
-	EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
-END_EVENT_TABLE()
-
-CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	memoryCard[SLOT_A]=NULL;
-	memoryCard[SLOT_B]=NULL;
-
-	mcmSettings.twoCardsLoaded = false;
-	if (!LoadSettings())
-	{
-		itemsPerPage = 16;
-		mcmSettings.usePages = true;
-		for (int i = COLUMN_BANNER; i < NUMBER_OF_COLUMN; i++)
-		{
-			mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK)? true:false;
-		}
-	}
-	maxPages = (128 / itemsPerPage) - 1;
-	CreateGUIControls();
-}
-
-CMemcardManager::~CMemcardManager()
-{
-	if (memoryCard[SLOT_A])
-	{
-		delete memoryCard[SLOT_A];
-		memoryCard[SLOT_A] = NULL;
-	}
-	if (memoryCard[SLOT_B])
-	{
-		delete memoryCard[SLOT_B];
-		memoryCard[SLOT_B] = NULL;
-	}
-	SaveSettings();
-}
-
-bool CMemcardManager::LoadSettings()
-{
-	if (MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)))
-	{
-		iniMemcardSection = MemcardManagerIni.GetOrCreateSection("MemcardManager");
-		iniMemcardSection->Get("Items per page",  &itemsPerPage, 16);
-		iniMemcardSection->Get("DefaultMemcardA", &(DefaultMemcard[SLOT_A]), "");
-		iniMemcardSection->Get("DefaultMemcardB", &(DefaultMemcard[SLOT_B]), "");
-		iniMemcardSection->Get("DefaultIOFolder", &DefaultIOPath, "/Users/GC");
-
-		iniMemcardSection->Get("Use Pages", &mcmSettings.usePages, true);
-		iniMemcardSection->Get("cBanner", &mcmSettings.column[COLUMN_BANNER], true);
-		iniMemcardSection->Get("cTitle", &mcmSettings.column[COLUMN_TITLE], true);
-		iniMemcardSection->Get("cComment", &mcmSettings.column[COLUMN_COMMENT], true);
-		iniMemcardSection->Get("cIcon", &mcmSettings.column[COLUMN_ICON], true);
-		iniMemcardSection->Get("cBlocks", &mcmSettings.column[COLUMN_BLOCKS], true);
-		iniMemcardSection->Get("cFirst Block", &mcmSettings.column[COLUMN_FIRSTBLOCK], true);
-
-		mcmSettings.column[NUMBER_OF_COLUMN] = false;
-
-		for(int i = COLUMN_GAMECODE; i < NUMBER_OF_COLUMN; i++)
-		{
-			mcmSettings.column[i] = mcmSettings.column[NUMBER_OF_COLUMN];
-		}
-		return true;
-	}
-	return false;
-}
-
-bool CMemcardManager::SaveSettings()
-{
-	MemcardManagerIni.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-	iniMemcardSection = MemcardManagerIni.GetOrCreateSection("MemcardManager");
-	iniMemcardSection->Set("Items per page",  itemsPerPage, 16);
-	iniMemcardSection->Set("DefaultMemcardA", DefaultMemcard[SLOT_A], "");
-	iniMemcardSection->Set("DefaultMemcardB", DefaultMemcard[SLOT_B], "");
-
-	iniMemcardSection->Set("Use Pages", mcmSettings.usePages, true);
-	iniMemcardSection->Set("cBanner", mcmSettings.column[COLUMN_BANNER], true);
-	iniMemcardSection->Set("cTitle", mcmSettings.column[COLUMN_TITLE], true);
-	iniMemcardSection->Set("cComment", mcmSettings.column[COLUMN_COMMENT], true);
-	iniMemcardSection->Set("cIcon",	mcmSettings.column[COLUMN_ICON], true);
-	iniMemcardSection->Set("cBlocks", mcmSettings.column[COLUMN_BLOCKS], true);
-	iniMemcardSection->Set("cFirst Block", mcmSettings.column[COLUMN_FIRSTBLOCK], true);
-
-	return MemcardManagerIni.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-}
-
-void CMemcardManager::CreateGUIControls()
-{
-	// Create the controls for both memcards
-
-	const wxChar* ARROW[2] = {_T("<-"), _T("->")};
-
-	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
-
-	wxStaticBoxSizer *sMemcard[2];
-	
-	for (int slot = SLOT_A; slot <= SLOT_B; slot++)
-	{
-		m_CopyFrom[slot]	= new wxButton(this, ID_COPYFROM_A + slot,
-			wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1]));
-		m_SaveImport[slot]	= new wxButton(this, ID_SAVEIMPORT_A + slot,
-			wxString::Format(_("%sImport GCI%s"), ARROWS));
-		m_SaveExport[slot]	= new wxButton(this, ID_SAVEEXPORT_A + slot,
-			wxString::Format(_("%sExport GCI%s"), ARROWS));
-		m_Delete[slot]		= new wxButton(this, ID_DELETE_A + slot,
-			wxString::Format(_("%sDelete%s"), ARROWS));
-
-
-		m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, _("Prev Page"));
-		m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, _("Next Page"));
-
-		t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition,wxDefaultSize, 0, wxEmptyString);
-
-		wxBoxSizer * const sPages = new wxBoxSizer(wxHORIZONTAL);
-		sPages->Add(m_PrevPage[slot], 0, wxEXPAND|wxALL, 1);
-		sPages->Add(t_Status[slot],0, wxEXPAND|wxALL, 5);
-		sPages->Add(0, 0, 1, wxEXPAND|wxALL, 0);
-		sPages->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1);
-
-		m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
-			 StrToWxStr(File::GetUserPath(D_GCUSER_IDX)), _("Choose a memory card:"),
-		_("Gamecube Memory Cards (*.raw,*.gcp)") + wxString(wxT("|*.raw;*.gcp")), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
-	
-		m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400),
-		wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings);
-	
-		m_MemcardList[slot]->AssignImageList(new wxImageList(96,32),wxIMAGE_LIST_SMALL);
-
-		sMemcard[slot] = new wxStaticBoxSizer(wxVERTICAL, this, _("Memory Card") + wxString::Format(wxT(" %c"), 'A' + slot));
-		sMemcard[slot]->Add(m_MemcardPath[slot], 0, wxEXPAND|wxALL, 5);
-		sMemcard[slot]->Add(m_MemcardList[slot], 1, wxEXPAND|wxALL, 5);
-		sMemcard[slot]->Add(sPages, 0, wxEXPAND|wxALL, 1);
-	}
-
-	wxBoxSizer * const sButtons = new wxBoxSizer(wxVERTICAL);
-	sButtons->AddStretchSpacer(2);
-	sButtons->Add(m_CopyFrom[SLOT_B], 0, wxEXPAND, 5);
-	sButtons->Add(m_CopyFrom[SLOT_A], 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer(1);
-	sButtons->Add(m_SaveImport[SLOT_A], 0, wxEXPAND, 5);
-	sButtons->Add(m_SaveExport[SLOT_A], 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer(1);
-	sButtons->Add(m_ConvertToGci, 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer(1);
-	sButtons->Add(m_SaveImport[SLOT_B], 0, wxEXPAND, 5);
-	sButtons->Add(m_SaveExport[SLOT_B], 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer(1);
-	sButtons->Add(m_Delete[SLOT_A], 0, wxEXPAND, 5);
-	sButtons->Add(m_Delete[SLOT_B], 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer();
-	sButtons->Add(new wxButton(this, wxID_OK, _("Close")), 0, wxEXPAND, 5);
-	sButtons->AddStretchSpacer();
-
-	wxBoxSizer * const sMain = new wxBoxSizer(wxHORIZONTAL);
-	sMain->Add(sMemcard[SLOT_A], 1, wxEXPAND|wxALL, 5);
-	sMain->Add(sButtons, 0, wxEXPAND, 0);
-	sMain->Add(sMemcard[SLOT_B], 1, wxEXPAND|wxALL, 5);
-
-	SetSizerAndFit(sMain);
-	Center();
-
-	for (int i = SLOT_A; i <= SLOT_B; i++)
-	{
-		m_PrevPage[i]->Disable();
-		m_NextPage[i]->Disable();
-		m_CopyFrom[i]->Disable();
-		m_SaveImport[i]->Disable();
-		m_SaveExport[i]->Disable();
-		m_Delete[i]->Disable();
-		if (DefaultMemcard[i].length())
-		{
-			m_MemcardPath[i]->SetPath(StrToWxStr(DefaultMemcard[i]));
-			ChangePath(i);
-		}
-	}
-}
-
-void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
-{
-	ChangePath(event.GetId() - ID_MEMCARDPATH_A);
-}
-
-void CMemcardManager::ChangePath(int slot)
-{
-	int slot2 = (slot == SLOT_A) ? SLOT_B : SLOT_A;
-	page[slot] = FIRSTPAGE;
-	if (mcmSettings.usePages && m_PrevPage[slot]->IsEnabled())
-	{
-		m_PrevPage[slot]->Disable();
-		m_MemcardList[slot]->prevPage = false;
-	}
-	if (!m_MemcardPath[SLOT_A]->GetPath().CmpNoCase(m_MemcardPath[SLOT_B]->GetPath()))
-	{
-		if(m_MemcardPath[slot]->GetPath().length())
-			PanicAlertT("Memcard already opened");
-	}
-	else
-	{
-		if (m_MemcardPath[slot]->GetPath().length() && ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()).c_str(), slot))
-		{
-			if (memoryCard[slot2])
-			{
-				mcmSettings.twoCardsLoaded = true;
-			}
-			m_SaveImport[slot]->Enable();
-			m_SaveExport[slot]->Enable();
-			m_Delete[slot]->Enable();
-		}
-		else
-		{
-			if (memoryCard[slot])
-			{
-				delete memoryCard[slot];
-				memoryCard[slot] = NULL;
-			}
-			mcmSettings.twoCardsLoaded = false;
-			m_MemcardPath[slot]->SetPath(wxEmptyString);
-			m_MemcardList[slot]->ClearAll();
-			t_Status[slot]->SetLabel(wxEmptyString);
-			m_SaveImport[slot]->Disable();
-			m_SaveExport[slot]->Disable();
-			m_Delete[slot]->Disable();
-			if (mcmSettings.usePages)
-			{
-				m_PrevPage[slot]->Disable();
-				m_NextPage[slot]->Disable();
-			}
-		}
-	}
-
-	m_CopyFrom[SLOT_A]->Enable(mcmSettings.twoCardsLoaded);
-	m_CopyFrom[SLOT_B]->Enable(mcmSettings.twoCardsLoaded);
-}
-
-void CMemcardManager::OnPageChange(wxCommandEvent& event)
-{
-	int slot = SLOT_B;
-	switch (event.GetId())
-	{
-	case ID_NEXTPAGE_A:
-		slot = SLOT_A;
-	case ID_NEXTPAGE_B:
-		if (!m_PrevPage[slot]->IsEnabled())
-		{
-			m_PrevPage[slot]->Enable();
-			m_MemcardList[slot]->prevPage = true;
-		}
-		page[slot]++;
-		if (page[slot] == maxPages)
-		{
-			m_NextPage[slot]->Disable();
-			m_MemcardList[slot]->nextPage = false;
-		}
-		ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()).c_str(), slot);
-		break;
-	case ID_PREVPAGE_A:
-		slot = SLOT_A;
-	case ID_PREVPAGE_B:
-		if (!m_NextPage[slot]->IsEnabled())
-		{
-			m_NextPage[slot]->Enable();
-			m_MemcardList[slot]->nextPage = true;
-		}
-		page[slot]--;
-		if (!page[slot])
-		{
-			m_PrevPage[slot]->Disable();
-			m_MemcardList[slot]->prevPage = false;
-		}
-		ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()).c_str(), slot);
-		break;
-	}
-}
-
-void CMemcardManager::OnMenuChange(wxCommandEvent& event)
-{
-	int _id = event.GetId();
-	switch(_id)
-	{
-	case ID_MEMCARDPATH_A:
-	case ID_MEMCARDPATH_B:
-		DefaultMemcard[_id - ID_MEMCARDPATH_A] = WxStrToStr(m_MemcardPath[_id - ID_MEMCARDPATH_A]->GetPath());
-		return;
-	case ID_USEPAGES:
-		mcmSettings.usePages = !mcmSettings.usePages;
-		if (!mcmSettings.usePages)
-		{
-			m_PrevPage[SLOT_A]->Disable();
-			m_PrevPage[SLOT_B]->Disable();
-			m_NextPage[SLOT_A]->Disable();
-			m_NextPage[SLOT_B]->Disable();
-			m_MemcardList[SLOT_A]->prevPage =
-			m_MemcardList[SLOT_B]->prevPage = false;
-			page[SLOT_A] =
-			page[SLOT_B] = FIRSTPAGE;
-		}
-		break;
-	case NUMBER_OF_COLUMN:
-		for (int i = COLUMN_GAMECODE; i <= NUMBER_OF_COLUMN; i++)
-		{
-			mcmSettings.column[i] = !mcmSettings.column[i];
-		}
-		break;
-	default:
-		mcmSettings.column[_id] = !mcmSettings.column[_id];
-		break;
-	}
-
-	if (memoryCard[SLOT_A])	ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_A]->GetPath()).c_str(), SLOT_A);
-	if (memoryCard[SLOT_B])	ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_B]->GetPath()).c_str(), SLOT_B);
-}
-bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot)
-{
-	switch (error)
-	{
-	case GCS:
-		SuccessAlertT("File converted to .gci");
-		break;
-	case SUCCESS:
-		if (slot != -1)
-		{
-			memoryCard[slot]->FixChecksums();
-			if (!memoryCard[slot]->Save()) PanicAlert(E_SAVEFAILED);
-			page[slot] = FIRSTPAGE;
-			ReloadMemcard(WxStrToStr(m_MemcardPath[slot]->GetPath()).c_str(), slot);
-		}
-		break;
-	case NOMEMCARD:
-		PanicAlertT("File is not recognized as a memcard");
-		break;
-	case OPENFAIL:
-		PanicAlertT("File could not be opened\nor does not have a valid extension");
-		break;
-	case OUTOFBLOCKS:
-		if (slot == -1)
-		{
-			PanicAlert(E_UNK);
-			break;
-		}
-		PanicAlertT("Only %d blocks available", memoryCard[slot]->GetFreeBlocks());
-		break;
-	case OUTOFDIRENTRIES:
-		PanicAlertT("No free dir index entries");
-		break;
-	case LENGTHFAIL:
-		PanicAlertT("Imported file has invalid length");
-		break;
-	case INVALIDFILESIZE:
-		PanicAlertT("The save you are trying to copy has an invalid file size");
-		break;
-	case TITLEPRESENT:
-		PanicAlertT("Memcard already has a save for this title");
-		break;
-	case SAVFAIL:
-		PanicAlertT("Imported file has sav extension\nbut does not have a correct header");
-		break;
-	case GCSFAIL:
-		PanicAlertT("Imported file has gsc extension\nbut does not have a correct header");
-		break;
-	case FAIL:
-		if (slot == -1)
-		{
-			PanicAlertT("Export Failed");
-			return false;
-		}
-		PanicAlertT("Invalid bat.map or dir entry");
-		break;
-	case WRITEFAIL:
-		PanicAlert(E_SAVEFAILED);
-		break;
-	case DELETE_FAIL:
-		PanicAlertT("Order of files in the File Directory do not match the block order\n"
-				"Right click and export all of the saves,\nand import the saves to a new memcard\n");
-		break;
-	default:
-		PanicAlert(E_UNK);
-		break;
-	}
-	SetFocus();
-	return true;
-}
-
-void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
-{
-	int index_A = m_MemcardList[SLOT_A]->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	int index_B = m_MemcardList[SLOT_B]->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	int slot = SLOT_B;
-	int slot2 = SLOT_A;
-	std::string fileName2("");
-
-	if (index_A != wxNOT_FOUND && page[SLOT_A]) index_A += itemsPerPage * page[SLOT_A];
-	if (index_B != wxNOT_FOUND && page[SLOT_B]) index_B += itemsPerPage * page[SLOT_B];
-
-	int index = index_B;
-	switch (event.GetId())
-	{
-	case ID_COPYFROM_B:
-		slot = SLOT_A;
-		slot2 = SLOT_B;
-	case ID_COPYFROM_A:
-		index = slot2 ? index_B : index_A;
-		index = memoryCard[slot2]->GetFileIndex(index);
-		if ((index != wxNOT_FOUND))
-		{
-			CopyDeleteSwitch(memoryCard[slot]->CopyFrom(*memoryCard[slot2], index), slot);
-		}
-		break;
-	case ID_FIXCHECKSUM_A:
-		slot = SLOT_A;
-	case ID_FIXCHECKSUM_B:
-		if (memoryCard[slot]->FixChecksums() && memoryCard[slot]->Save())
-		{
-			SuccessAlertT("The checksum was successfully fixed");
-		}
-		else
-		{
-			PanicAlert(E_SAVEFAILED);
-		}
-		break; 
-	case ID_CONVERTTOGCI:
-		fileName2 = "convert";
-	case ID_SAVEIMPORT_A:
-		slot = SLOT_A;
-	case ID_SAVEIMPORT_B:
-	{
-		wxString fileName = wxFileSelector(
-			_("Select a save file to import"),
-			(strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0)
-				? StrToWxStr("")
-				: StrToWxStr(DefaultIOPath),
-			wxEmptyString, wxEmptyString,
-			_("GameCube Savegame files(*.gci;*.gcs;*.sav)") + wxString(wxT("|*.gci;*.gcs;*.sav|")) +
-			_("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) +
-			_("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) +
-			_("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")),
-			wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
-		if (!fileName.empty() && !fileName2.empty())
-		{
-			wxString temp2 = wxFileSelector(_("Save GCI as..."),
-				wxEmptyString, wxEmptyString, wxT(".gci"),
-				_("GCI File(*.gci)") + wxString(_T("|*.gci")),
-				wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this);
-
-			if (temp2.empty())
-				break;
-
-			fileName2 = WxStrToStr(temp2);
-		}
-		if (fileName.length() > 0)
-		{
-			CopyDeleteSwitch(memoryCard[slot]->ImportGci(WxStrToStr(fileName).c_str(), fileName2), slot);
-		}
-	}
-	break;
-	case ID_SAVEEXPORT_A:
-		slot=SLOT_A;
-		index = index_A;
-	case ID_SAVEEXPORT_B:
-		index = memoryCard[slot]->GetFileIndex(index);
-		if (index != wxNOT_FOUND)
-		{
-			std::string gciFilename;
-			if (!memoryCard[slot]->GCI_FileName(index, gciFilename))
-			{
-				PanicAlert("Invalid index");
-				return;
-			}
-			wxString fileName = wxFileSelector(
-				_("Export save as..."),
-				StrToWxStr(DefaultIOPath),
-				StrToWxStr(gciFilename), wxT(".gci"),
-				_("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) +
-				_("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) +
-				_("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")),
-				wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this);
-
-			if (fileName.length() > 0)
-			{
-				if (!CopyDeleteSwitch(memoryCard[slot]->ExportGci(index, WxStrToStr(fileName).c_str(), ""), -1))
-				{
-					File::Delete(WxStrToStr(fileName));
-				}
-			}
-		}
-		break;
-	case ID_EXPORTALL_A:
-		slot=SLOT_A;
-	case ID_EXPORTALL_B:
-	{
-		std::string path1, path2, mpath;
-		mpath = WxStrToStr(m_MemcardPath[slot]->GetPath());
-		SplitPath(mpath, &path1, &path2, NULL);
-		path1 += path2;
-		File::CreateDir(path1);
-		if(PanicYesNoT("Warning: This will overwrite any existing saves that are in the folder:\n"
-					"%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str()))
-		for (int i = 0; i < DIRLEN; i++)
-		{
-			CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, NULL, path1), -1);
-		}
-		break;
-	}
-	case ID_DELETE_A:
-		slot = SLOT_A;
-		index = index_A;
-	case ID_DELETE_B:
-		index = memoryCard[slot]->GetFileIndex(index);
-		if (index != wxNOT_FOUND)
-		{
-			CopyDeleteSwitch(memoryCard[slot]->RemoveFile(index), slot);
-		}
-		break;
-	}
-}
-
-bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
-{
-	if (memoryCard[card]) delete memoryCard[card];
-
-	// TODO: add error checking and animate icons
-	memoryCard[card] = new GCMemcard(fileName);
-
-	if (!memoryCard[card]->IsValid())
-		return false;
-
-	int j;
-
-	wxString wxTitle,
-			 wxComment,
-			 wxBlock,
-			 wxFirstBlock,
-			 wxLabel;
-
-
-	m_MemcardList[card]->Hide();
-	m_MemcardList[card]->ClearAll();
-
-	m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _("Banner"));
-	m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _("Title"));
-	m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _("Comment"));
-	m_MemcardList[card]->InsertColumn(COLUMN_ICON, _("Icon"));
-	m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _("Blocks"));
-	m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _("First Block"));
-
-	wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL);
-	list->RemoveAll();
-
-	u8 nFiles = memoryCard[card]->GetNumFiles();
-	int *images = new int[nFiles*2];
-
-	for (u8 i = 0;i < nFiles;i++)
-	{
-		static u32 pxdata[96*32];
-		static u8  animDelay[8];
-		static u32 animData[32*32*8];
-
-		u8 fileIndex = memoryCard[card]->GetFileIndex(i);
-		int numFrames = memoryCard[card]->ReadAnimRGBA8(fileIndex, animData, animDelay);
-
-		if (!memoryCard[card]->ReadBannerRGBA8(fileIndex, pxdata))
-		{
-			memset(pxdata,0,96*32*4);
-
-			if (numFrames>0) // Just use the first one
-			{
-				u32 *icdata = animData;
-
-				for (int y=0;y<32;y++)
-				{
-					for (int x=0;x<32;x++)
-					{
-						pxdata[y*96+x+32] = icdata[y*32+x];//  | 0xFF000000
-					}
-				}
-			}
-		}
-
-		wxBitmap map = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
-		images[i*2] = list->Add(map);
-
-		if (numFrames>0)
-		{
-			memset(pxdata,0,96*32*4);
-			int frames=3;
-
-			if (numFrames<frames)
-				frames=numFrames;
-
-			for (int f=0;f<frames;f++)
-			{
-				for (int y=0;y<32;y++)
-				{
-					for (int x=0;x<32;x++)
-					{
-						pxdata[y*96 + x + 32*f] = animData[f*32*32 + y*32 + x];
-					}
-				}
-			}
-			wxBitmap icon = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
-			images[i*2+1] = list->Add(icon);
-		}
-	}
-
-	int	pagesMax = (mcmSettings.usePages) ?
-					(page[card] + 1) * itemsPerPage : 128;
-
-	for (j = page[card] * itemsPerPage; (j < nFiles) && (j < pagesMax); j++)
-	{
-		u16 blocks;
-		u16 firstblock;
-		u8 fileIndex = memoryCard[card]->GetFileIndex(j);
-
-
-		int index = m_MemcardList[card]->InsertItem(j, wxEmptyString);
-
-		m_MemcardList[card]->SetItem(index, COLUMN_BANNER, wxEmptyString);
-
-		std::string title = memoryCard[card]->GetSaveComment1(fileIndex);
-		std::string comment = memoryCard[card]->GetSaveComment2(fileIndex);
-
-		auto const string_decoder = memoryCard[card]->IsAsciiEncoding() ?
-			CP1252ToUTF8 : SHIFTJISToUTF8;
-			
-		wxTitle = StrToWxStr(string_decoder(title));
-		wxComment = StrToWxStr(string_decoder(comment));
-
-		m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxTitle);
-		m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxComment);
-
-		blocks = memoryCard[card]->DEntry_BlockCount(fileIndex);
-		
-		if (blocks == 0xFFFF)
-			blocks = 0;
-		
-		wxBlock.Printf(wxT("%10d"), blocks);
-		m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock);
-		firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex);
-		//if (firstblock == 0xFFFF) firstblock = 3;	// to make firstblock -1
-		wxFirstBlock.Printf(wxT("%15d"), firstblock);
-		m_MemcardList[card]->SetItem(index, COLUMN_FIRSTBLOCK, wxFirstBlock);
-		m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString);
-
-		if (images[j] >= 0)
-		{
-			m_MemcardList[card]->SetItemImage(index, images[j*2]);
-			m_MemcardList[card]->SetItemColumnImage(index, COLUMN_ICON, images[j*2+1]);
-		}
-	}
-
-	if (mcmSettings.usePages)
-	{
-		if (nFiles <= itemsPerPage)
-		{
-			m_PrevPage[card]->Disable();
-			m_MemcardList[card]->prevPage = false;
-		}
-		if (j == nFiles)
-		{
-			m_NextPage[card]->Disable();
-			m_MemcardList[card]->nextPage = false;
-		}
-		else
-		{
-			m_NextPage[card]->Enable();
-			m_MemcardList[card]->nextPage = true;
-		}
-	}
-
-	delete[] images;
-	// Automatic column width and then show the list
-	for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
-	{
-		if (mcmSettings.column[i])
-			m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
-		else
-			m_MemcardList[card]->SetColumnWidth(i, 0);
-	}
-
-	m_MemcardList[card]->Show();
-	wxLabel.Printf(_("%u Free Blocks; %u Free Dir Entries"),
-		memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles);
-	t_Status[card]->SetLabel(wxLabel);
-
-	// Done so text doesn't overlap the UI.
-	this->Fit();
-
-	return true;
-}
-
-void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
-{
-
-	int flags;
-	long item = HitTest(event.GetPosition(), flags);
-	wxMenu* popupMenu = new wxMenu;
-
-	if (item != wxNOT_FOUND) 
-	{
-		if (GetItemState(item, wxLIST_STATE_SELECTED) != wxLIST_STATE_SELECTED)
-		{
-			SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-		}
-		SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
-
-		int slot = GetId() - ID_MEMCARDLIST_A;
-		popupMenu->Append(ID_COPYFROM_A + slot, wxString::Format(_("Copy to Memcard %c"), 'B' - slot));
-		popupMenu->Append(ID_DELETE_A + slot, _("Delete Save"));
-		popupMenu->Append(ID_SAVEIMPORT_A + slot, _("Import Save"));
-		popupMenu->Append(ID_SAVEEXPORT_A + slot, _("Export Save"));
-		popupMenu->Append(ID_EXPORTALL_A + slot, _("Export all saves"));
-				
-		popupMenu->FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded);
-
-		popupMenu->AppendSeparator();
-
-		popupMenu->Append(ID_FIXCHECKSUM_A + slot, _("Fix Checksums"));
-		popupMenu->Append(ID_PREVPAGE_A + slot, _("Previous Page"));
-		popupMenu->Append(ID_NEXTPAGE_A + slot, _("Next Page"));
-		popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(_("Set as default Memcard %c"), 'A' + slot));
-		popupMenu->AppendCheckItem(ID_USEPAGES, _("Enable pages"));
-
-		popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
-		popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
-		popupMenu->FindItem(ID_USEPAGES)->Check(__mcmSettings.usePages);
-		
-		popupMenu->AppendSeparator();
-
-//		popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
-		popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title"));
-		popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
-		popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon"));
-		popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
-		popupMenu->AppendCheckItem(COLUMN_FIRSTBLOCK, _("Show first block"));
-
-//		for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
-		for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++)
-		{
-			popupMenu->FindItem(i)->Check(__mcmSettings.column[i]);
-		}
-	}
-	PopupMenu(popupMenu);
-}
-
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h
deleted file mode 100644
index 9f2f8f0d9b..0000000000
--- a/Source/Core/DolphinWX/Src/MemcardManager.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __MEMCARD_MANAGER_h__
-#define __MEMCARD_MANAGER_h__
-
-#include <wx/wx.h>
-#include <wx/sizer.h>
-#include <wx/filepicker.h>
-#include <wx/statbmp.h>
-#include <wx/stattext.h>
-#include <wx/listctrl.h>
-#include <wx/imaglist.h>
-#include <wx/fontmap.h>
-
-#include "IniFile.h"
-#include "FileUtil.h"
-#include "HW/GCMemcard.h"
-
-#undef MEMCARD_MANAGER_STYLE
-#define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX
-#define MEMCARDMAN_TITLE _trans("Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!")
-
-#define E_SAVEFAILED "File write failed"
-#define E_UNK "Unknown error"
-#define FIRSTPAGE 0
-
-class CMemcardManager : public wxDialog
-{
-	public:
-
-		CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxGetTranslation(wxT(MEMCARDMAN_TITLE)),
-			const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE);
-		virtual ~CMemcardManager();
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		int page[2],
-			itemsPerPage,
-			maxPages;
-		std::string DefaultMemcard[2],
-					DefaultIOPath;
-		IniFile MemcardManagerIni;
-		IniFile::Section* iniMemcardSection;
-
-		wxButton *m_CopyFrom[2],
-				 *m_SaveImport[2],
-				 *m_SaveExport[2],
-				 *m_Delete[2],
-				 *m_NextPage[2],
-				 *m_PrevPage[2],
-				 *m_ConvertToGci;
-		wxFilePickerCtrl *m_MemcardPath[2];
-		wxStaticText *t_Status[2];
-
-		enum
-		{
-			ID_COPYFROM_A = 1000,	// Do not rearrange these items,
-			ID_COPYFROM_B,			// ID_..._B must be 1 more than ID_..._A
-			ID_FIXCHECKSUM_A,
-			ID_FIXCHECKSUM_B,
-			ID_DELETE_A,
-			ID_DELETE_B,
-			ID_SAVEEXPORT_A,
-			ID_SAVEEXPORT_B,
-			ID_SAVEIMPORT_A,
-			ID_SAVEIMPORT_B,
-			ID_EXPORTALL_A,
-			ID_EXPORTALL_B,
-			ID_CONVERTTOGCI,
-			ID_NEXTPAGE_A,
-			ID_NEXTPAGE_B,
-			ID_PREVPAGE_A,
-			ID_PREVPAGE_B,
-			ID_MEMCARDLIST_A,
-			ID_MEMCARDLIST_B,
-			ID_MEMCARDPATH_A,
-			ID_MEMCARDPATH_B,
-			ID_USEPAGES,
-			ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
-		};
-
-		enum
-		{
-			COLUMN_BANNER = 0,
-			COLUMN_TITLE,
-			COLUMN_COMMENT,
-			COLUMN_ICON,
-			COLUMN_BLOCKS,
-			COLUMN_FIRSTBLOCK,
-			COLUMN_GAMECODE,
-			COLUMN_MAKERCODE,
-			COLUMN_FILENAME,
-			COLUMN_BIFLAGS,
-			COLUMN_MODTIME,
-			COLUMN_IMAGEADD,
-			COLUMN_ICONFMT,
-			COLUMN_ANIMSPEED,
-			COLUMN_PERMISSIONS,
-			COLUMN_COPYCOUNTER,
-			COLUMN_COMMENTSADDRESS,
-			NUMBER_OF_COLUMN
-		};
-		
-		GCMemcard *memoryCard[2];
-
-		void CreateGUIControls();
-		void CopyDeleteClick(wxCommandEvent& event);
-		bool ReloadMemcard(const char *fileName, int card);
-		void OnMenuChange(wxCommandEvent& event);
-		void OnPageChange(wxCommandEvent& event);
-		void OnPathChange(wxFileDirPickerEvent& event);
-		void ChangePath(int id);
-		bool CopyDeleteSwitch(u32 error, int slot);
-		bool LoadSettings();
-		bool SaveSettings();
-
-		struct _mcmSettings
-		{
-			bool twoCardsLoaded;
-			bool usePages;
-			bool column[NUMBER_OF_COLUMN + 1];
-		} mcmSettings;
-
-		class CMemcardListCtrl : public wxListCtrl
-		{
-//BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
-//      EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
-//END_EVENT_TABLE()
-		public:
-			CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
-				const wxPoint& pos, const wxSize& size,
-				long style, _mcmSettings& _mcmSetngs)
-				: wxListCtrl(parent, id, pos, size, style)
-				, __mcmSettings(_mcmSetngs)
-			{
-				Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
-			}
-			~CMemcardListCtrl()
-			{
-				Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
-			}
-			_mcmSettings & __mcmSettings;
-			bool prevPage,
-				 nextPage;
-		private:
-			void OnRightClick(wxMouseEvent& event);	
-		};
-		
-		CMemcardListCtrl *m_MemcardList[2];
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
deleted file mode 100644
index 091804e786..0000000000
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Based off of tachtig/twintig http://git.infradead.org/?p=users/segher/wii.git
-// Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
-// Licensed under the terms of the GNU GPL, version 2
-// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
-#include "WiiSaveCrypted.h"
-#include "FileUtil.h"
-#include "MathUtil.h"
-#include "NandPaths.h"
-#include "FileUtil.h"
-#include <algorithm>
-
-static Common::replace_v replacements;
-
-const u8 SDKey[16] =	{0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08,
-						 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D};
-const u8 MD5_BLANKER[0x10] = {0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17,
-						0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93};
-const u32 NG_id = 0x0403AC68;
-
-bool CWiiSaveCrypted::ImportWiiSave(const char* FileName)
-{
-	CWiiSaveCrypted	saveFile(FileName);
-	return saveFile.b_valid;
-}
-
-bool CWiiSaveCrypted::ExportWiiSave(u64 TitleID)
-{
-	CWiiSaveCrypted exportSave("", TitleID);
-	return exportSave.b_valid;
-}
-
-void CWiiSaveCrypted::ExportAllSaves()
-{
-	std::string titleFolder = File::GetUserPath(D_WIIUSER_IDX) + "title";
-	std::vector<u64> titles;
-	u32 pathMask = 0x00010000;
-	for (int i = 0; i < 8; ++i)
-	{		
-		File::FSTEntry FST_Temp;
-		std::string folder = StringFromFormat("%s/%08x/", titleFolder.c_str(), pathMask | i);
-		File::ScanDirectoryTree(folder, FST_Temp);
-		
-		for (u32 j = 0; j < FST_Temp.children.size(); j++)
-		{
-			if (FST_Temp.children[j].isDirectory)
-			{
-				u32 gameid;
-				if (AsciiToHex(FST_Temp.children[j].virtualName.c_str(), gameid))
-				{
-					std::string bannerPath = StringFromFormat("%s%08x/data/banner.bin", folder.c_str(), gameid);
-					if (File::Exists(bannerPath))
-					{
-						u64 titleID = (((u64)pathMask | i) << 32) | gameid;
-						titles.push_back(titleID);
-					}
-				}
-			}
-		}
-	}	
-	SuccessAlertT("Found %x save files", (unsigned int) titles.size());
-	for (u32 i = 0; i < titles.size(); ++i)
-	{
-		CWiiSaveCrypted* exportSave = new CWiiSaveCrypted("", titles[i]);
-		delete exportSave;
-	}
-}
-CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
- : m_TitleID(TitleID)
-{
-	Common::ReadReplacements(replacements);
-	encryptedSavePath = std::string(FileName);
-	memcpy(SD_IV, "\x21\x67\x12\xE6\xAA\x1F\x68\x9F\x95\xC5\xA2\x23\x24\xDC\x6A\x98", 0x10);
-
-	if (!TitleID) // Import
-	{
-		AES_set_decrypt_key(SDKey, 128, &m_AES_KEY);
-			b_valid = true;
-			ReadHDR();
-			ReadBKHDR();
-			ImportWiiSaveFiles();
-			// TODO: check_sig()
-			if (b_valid)
-			{
-				SuccessAlertT("Successfully imported save files");
-			}
-			else
-			{
-				PanicAlertT("Import failed");
-			}
-	}
-	else
-	{
-		AES_set_encrypt_key(SDKey, 128, &m_AES_KEY);
-		
-		if (getPaths(true))
-		{
-			b_valid = true;
-			WriteHDR();
-			WriteBKHDR();
-			ExportWiiSaveFiles();
-			do_sig();
-			if (b_valid)
-			{
-				SuccessAlertT("Successfully exported file to %s", encryptedSavePath.c_str());
-			}
-			else
-			{
-				 PanicAlertT("Export failed");
-			}
-		}
-	}
-}
-
-void CWiiSaveCrypted::ReadHDR()
-{
-	File::IOFile fpData_bin(encryptedSavePath, "rb");
-	if (!fpData_bin)
-	{
-		PanicAlertT("Cannot open %s", encryptedSavePath.c_str());
-		b_valid = false;
-		return;
-	}
-	if (!fpData_bin.ReadBytes(&_encryptedHeader, HEADER_SZ))
-	{
-		PanicAlertT("Failed to read header");
-		b_valid = false;
-		return;
-	}
-	fpData_bin.Close();
-
-	AES_cbc_encrypt((const u8*)&_encryptedHeader, (u8*)&_header, HEADER_SZ, &m_AES_KEY, SD_IV, AES_DECRYPT);
-	u32 bannerSize = Common::swap32(_header.hdr.BannerSize);
-	if ((bannerSize < FULL_BNR_MIN) || (bannerSize > FULL_BNR_MAX) ||
-		(((bannerSize - BNR_SZ) % ICON_SZ) != 0))
-	{
-		PanicAlertT("Not a Wii save or read failure for file header size %x", bannerSize);
-		b_valid = false;
-		return;
-	}
-	m_TitleID = Common::swap64(_header.hdr.SaveGameTitle);
-
-	
-	u8	md5_file[16],
-		md5_calc[16];
-	memcpy(md5_file, _header.hdr.Md5, 0x10);
-	memcpy(_header.hdr.Md5, MD5_BLANKER, 0x10);
-	md5((u8*)&_header, HEADER_SZ, md5_calc);
-	if (memcmp(md5_file, md5_calc, 0x10))
-	{
-		PanicAlertT("MD5 mismatch\n %016llx%016llx != %016llx%016llx", Common::swap64(md5_file),Common::swap64(md5_file+8), Common::swap64(md5_calc), Common::swap64(md5_calc+8));
-		b_valid= false;
-	}
-	
-	if (!getPaths())
-	{
-		b_valid = false;
-		return;	
-	}
-	std::string BannerFilePath = WiiTitlePath + "banner.bin";
-	if (!File::Exists(BannerFilePath) || AskYesNoT("%s already exists, overwrite?", BannerFilePath.c_str()))
-	{
-		INFO_LOG(CONSOLE, "Creating file %s", BannerFilePath.c_str());
-		File::IOFile fpBanner_bin(BannerFilePath, "wb");
-		fpBanner_bin.WriteBytes(_header.BNR, bannerSize);
-	}
-}
-
-void CWiiSaveCrypted::WriteHDR()
-{
-	if (!b_valid) return;
-	memset(&_header, 0, HEADER_SZ);
-
-	std::string BannerFilePath = WiiTitlePath + "banner.bin";
-	u32 bannerSize = File::GetSize(BannerFilePath);
-	_header.hdr.BannerSize =  Common::swap32(bannerSize);
-
-	_header.hdr.SaveGameTitle = Common::swap64(m_TitleID);
-	memcpy(_header.hdr.Md5, MD5_BLANKER, 0x10);
-	_header.hdr.Permissions = 0x3C;
-
-	File::IOFile fpBanner_bin(BannerFilePath, "rb");
-	if (!fpBanner_bin.ReadBytes(_header.BNR, bannerSize))
-	{
-		PanicAlertT("Failed to read banner.bin");
-		b_valid = false;
-		return;
-	}
-	// remove nocopy flag
-	_header.BNR[7] &= ~1;
-
-	u8	md5_calc[16];
-	md5((u8*)&_header, HEADER_SZ, md5_calc);
-	memcpy(_header.hdr.Md5, md5_calc, 0x10);
-
-	AES_cbc_encrypt((const unsigned char *)&_header, (u8*)&_encryptedHeader, HEADER_SZ, &m_AES_KEY, SD_IV, AES_ENCRYPT);
-	
-	File::IOFile fpData_bin(encryptedSavePath, "wb");
-	if (!fpData_bin.WriteBytes(&_encryptedHeader, HEADER_SZ))
-	{
-		PanicAlertT("Failed to write header for %s", encryptedSavePath.c_str());
-		b_valid = false;
-	}
-}
-
-
-
-void CWiiSaveCrypted::ReadBKHDR()
-{
-	if (!b_valid) return;
-	
-	File::IOFile fpData_bin(encryptedSavePath, "rb");
-	if (!fpData_bin)
-	{
-		PanicAlertT("Cannot open %s", encryptedSavePath.c_str());
-		b_valid = false;
-		return;
-	}
-	fpData_bin.Seek(HEADER_SZ, SEEK_SET);
-	if (!fpData_bin.ReadBytes(&bkhdr, BK_SZ))
-	{
-		PanicAlertT("Failed to read bk header");
-		b_valid = false;
-		return;
-	}
-	fpData_bin.Close();
-	
-	if (bkhdr.size  != Common::swap32(BK_LISTED_SZ) ||
-		bkhdr.magic != Common::swap32(BK_HDR_MAGIC))
-	{
-		PanicAlertT("Invalid Size(%x) or Magic word (%x)", bkhdr.size, bkhdr.magic);
-		b_valid = false;
-		return;
-	}
-	
-	_numberOfFiles = Common::swap32(bkhdr.numberOfFiles);
-	_sizeOfFiles = Common::swap32(bkhdr.sizeOfFiles);
-	_totalSize = Common::swap32(bkhdr.totalSize);
-	
-	if (_sizeOfFiles + FULL_CERT_SZ != _totalSize)
-		WARN_LOG(CONSOLE, "Size(%x) + cert(%x) does not equal totalsize(%x)", _sizeOfFiles, FULL_CERT_SZ, _totalSize);
-	if (m_TitleID != Common::swap64(bkhdr.SaveGameTitle))
-		WARN_LOG(CONSOLE, "Encrypted title (%llx) does not match unencrypted title (%llx)", m_TitleID,  Common::swap64(bkhdr.SaveGameTitle));
-}
-
-void CWiiSaveCrypted::WriteBKHDR()
-{
-	if (!b_valid) return;
-	_numberOfFiles = 0;
-	_sizeOfFiles = 0;
-	
-	ScanForFiles(WiiTitlePath, FilesList, &_numberOfFiles, &_sizeOfFiles);
-	memset(&bkhdr, 0, BK_SZ);
-	bkhdr.size = Common::swap32(BK_LISTED_SZ);
-	bkhdr.magic = Common::swap32(BK_HDR_MAGIC);
-	bkhdr.NGid = NG_id;
-	bkhdr.numberOfFiles = Common::swap32(_numberOfFiles);
-	bkhdr.sizeOfFiles = Common::swap32(_sizeOfFiles);
-	bkhdr.totalSize = Common::swap32(_sizeOfFiles + FULL_CERT_SZ);
-	bkhdr.SaveGameTitle = Common::swap64(m_TitleID);
-
-	File::IOFile fpData_bin(encryptedSavePath, "ab");
-	if (!fpData_bin.WriteBytes(&bkhdr, BK_SZ))
-	{
-		PanicAlertT("Failed to write bkhdr");
-		b_valid = false;
-	}
-}
-
-void CWiiSaveCrypted::ImportWiiSaveFiles()
-{
-	if (!b_valid) return;
-
-	File::IOFile fpData_bin(encryptedSavePath, "rb");
-	if (!fpData_bin)
-	{
-		PanicAlertT("Cannot open %s", encryptedSavePath.c_str());
-		b_valid = false;
-		return;
-	}
-
-	fpData_bin.Seek(HEADER_SZ + BK_SZ, SEEK_SET);
-
-
-	FileHDR _tmpFileHDR;
-
-	for(u32 i = 0; i < _numberOfFiles; i++)
-	{
-		memset(&_tmpFileHDR, 0, FILE_HDR_SZ);
-		memset(IV, 0, 0x10);
-		u32 _fileSize = 0;
-		
-		if (!fpData_bin.ReadBytes(&_tmpFileHDR, FILE_HDR_SZ))
-		{
-			PanicAlertT("Failed to read header for file %d", i);
-			b_valid = false;
-		}
-		
-		if (Common::swap32(_tmpFileHDR.magic) != FILE_HDR_MAGIC)
-		{
-			PanicAlertT("Bad File Header");
-			break;
-		}
-		else
-		{
-			std::string fileName ((char*)_tmpFileHDR.name);
-			for (Common::replace_v::const_iterator iter = replacements.begin(); iter != replacements.end(); ++iter)
-			{
-				for (size_t j = 0; (j = fileName.find(iter->first, j)) != fileName.npos; ++j)
-					fileName.replace(j, 1, iter->second);
-			}
-
-			std::string fullFilePath = WiiTitlePath + fileName;
-			File::CreateFullPath(fullFilePath);			
-			if (_tmpFileHDR.type == 1)
-			{
-				_fileSize = Common::swap32(_tmpFileHDR.size);
-				u32 RoundedFileSize = ROUND_UP(_fileSize, BLOCK_SZ);
-				std::vector<u8> _data,_encryptedData;
-				_data.reserve(RoundedFileSize);
-				_encryptedData.reserve(RoundedFileSize);
-				if (!fpData_bin.ReadBytes(&_encryptedData[0], RoundedFileSize))
-				{
-					PanicAlertT("Failed to read data from file %d", i);
-					b_valid = false;
-					break;
-				}
-				
-				
-				memcpy(IV, _tmpFileHDR.IV, 0x10);
-				AES_cbc_encrypt((const unsigned char *)&_encryptedData[0], &_data[0], RoundedFileSize, &m_AES_KEY, IV, AES_DECRYPT);
-	
-				if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str()))
-				{
-					INFO_LOG(CONSOLE, "Creating file %s", fullFilePath.c_str());
-	
-					File::IOFile fpRawSaveFile(fullFilePath, "wb");
-					fpRawSaveFile.WriteBytes(&_data[0], _fileSize);
-				}
-			}
-		}	
-	}
-}
-
-void CWiiSaveCrypted::ExportWiiSaveFiles()
-{
-	if (!b_valid) return;
-
-	for(u32 i = 0; i < _numberOfFiles; i++)
-	{
-		FileHDR tmpFileHDR;
-		std::string __name, __ext;
-		memset(&tmpFileHDR, 0, FILE_HDR_SZ);
-		
-		u32 _fileSize =  0;
-		if (File::IsDirectory(FilesList[i]))
-		{
-			tmpFileHDR.type = 2;	
-		}
-		else
-		{
-			_fileSize = File::GetSize(FilesList[i]);
-			tmpFileHDR.type = 1;
-		}
-		
-		u32 _roundedfileSize = ROUND_UP(_fileSize, BLOCK_SZ);
-		tmpFileHDR.magic = Common::swap32(FILE_HDR_MAGIC);
-		tmpFileHDR.size = Common::swap32(_fileSize);
-		tmpFileHDR.Permissions = 0x3c;
-
-		__name = FilesList[i].substr(WiiTitlePath.length()+1);
-
-		
-		for (Common::replace_v::const_iterator iter = replacements.begin(); iter != replacements.end(); ++iter)
-		{
-			for (size_t j = 0; (j = __name.find(iter->second, j)) != __name.npos; ++j)
-			{
-				__name.replace(j, iter->second.length(), 1, iter->first);
-			}
-		}
-		
-		if (__name.length() > 0x44)
-		{
-			PanicAlertT("%s is too long for the filename, max chars is 45", __name.c_str());
-			b_valid = false;
-			return;
-		}
-		strncpy((char *)tmpFileHDR.name, __name.c_str(), __name.length());
-		
-		{
-		File::IOFile fpData_bin(encryptedSavePath, "ab");
-		fpData_bin.WriteBytes(&tmpFileHDR, FILE_HDR_SZ);
-		}
-
-		if (tmpFileHDR.type == 1)
-		{
-			if (_fileSize == 0)
-			{
-				PanicAlertT("%s is a 0 byte file", FilesList[i].c_str());
-				b_valid = false;
-				return;
-			}
-			File::IOFile fpRawSaveFile(FilesList[i], "rb");
-			if (!fpRawSaveFile)
-			{
-				PanicAlertT("%s failed to open", FilesList[i].c_str());
-				b_valid = false;
-			}
-			
-				std::vector<u8> _data,_encryptedData;
-				_data.reserve(_roundedfileSize);
-				_encryptedData.reserve(_roundedfileSize);
-				memset(&_data[0], 0, _roundedfileSize);
-			if (!fpRawSaveFile.ReadBytes(&_data[0], _fileSize))
-			{
-				PanicAlertT("Failed to read data from file: %s", FilesList[i].c_str());
-				b_valid = false;
-			}
-
-			AES_cbc_encrypt((const u8*)&_data[0], &_encryptedData[0], _roundedfileSize, &m_AES_KEY, tmpFileHDR.IV, AES_ENCRYPT);
-			
-			File::IOFile fpData_bin(encryptedSavePath, "ab");
-			if (!fpData_bin.WriteBytes(&_encryptedData[0], _roundedfileSize))
-				PanicAlertT("Failed to write data to file: %s", encryptedSavePath.c_str());
-
-
-		}
-	}
-}
-
-void CWiiSaveCrypted::do_sig()
-{
-	if (!b_valid) return;
-	u8 sig[0x40];
-	u8 ng_cert[0x180];
-	u8 ap_cert[0x180];
-	u8 hash[0x14];
-	u8 ap_priv[30];
-	u8 ap_sig[60];
-	char signer[64];
-	char name[64];
-	u8 *data;
-	u32 data_size;
-	
-	u32 NG_key_id = 0x6AAB8C59;
-
-	u8 NG_priv[30] = { 0, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70,
-					0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2};
-
-	u8 NG_sig[0x3C] = {0, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00,
-					0x71, 0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37,
-					0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC,
-					0x05, 0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8};
-
-	sprintf(signer, "Root-CA00000001-MS00000002");
-	sprintf(name, "NG%08x", NG_id);
-	make_ec_cert(ng_cert, NG_sig, signer, name, NG_priv, NG_key_id);
-
-
-	memset(ap_priv, 0, sizeof ap_priv);
-	ap_priv[10] = 1;
-
-	memset(ap_sig, 81, sizeof ap_sig);	// temp
-
-	sprintf(signer, "Root-CA00000001-MS00000002-NG%08x", NG_id);
-	sprintf(name, "AP%08x%08x", 1, 2);
-	make_ec_cert(ap_cert, ap_sig, signer, name, ap_priv, 0);
-
-	sha1(ap_cert + 0x80, 0x100, hash);
-	generate_ecdsa(ap_sig, ap_sig + 30, NG_priv, hash);
-	make_ec_cert(ap_cert, ap_sig, signer, name, ap_priv, 0);
-
-	data_size = Common::swap32(bkhdr.sizeOfFiles)  + 0x80;
-
-	File::IOFile fpData_bin(encryptedSavePath, "rb");
-	if (!fpData_bin)
-	{
-		b_valid = false;
-		return;
-	}
-	data = new u8[data_size];
-
-	fpData_bin.Seek(0xf0c0, SEEK_SET);
-	if (!fpData_bin.ReadBytes(data, data_size))
-	{
-		b_valid = false;
-		return;
-	}
-
-	sha1(data, data_size, hash);
-	sha1(hash, 20, hash);
-	delete []data;
-
-	fpData_bin.Open(encryptedSavePath, "ab");
-	if (!fpData_bin)
-	{
-		b_valid = false;
-		return;
-	}
-	generate_ecdsa(sig, sig + 30, ap_priv, hash);
-	*(u32*)(sig + 60) = Common::swap32(0x2f536969);
-	
-	fpData_bin.WriteArray(sig, sizeof(sig));
-	fpData_bin.WriteArray(ng_cert, sizeof(ng_cert));
-	fpData_bin.WriteArray(ap_cert, sizeof(ap_cert));
-
-	b_valid = fpData_bin.IsGood();
-}
-
-
-void CWiiSaveCrypted::make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name, u8 *priv, u32 key_id)
-{
-	memset(cert, 0, 0x180);
-	*(u32*)cert = Common::swap32(0x10002);
-
-	memcpy(cert + 4, sig, 60);
-	strcpy((char*)cert + 0x80, signer);
-	*(u32*)(cert + 0xc0) = Common::swap32(2);
-	strcpy((char*)cert + 0xc4, name);
-	*(u32*)(cert + 0x104) = Common::swap32(key_id);
-	ec_priv_to_pub(priv, cert + 0x108);
-}
-
-bool CWiiSaveCrypted::getPaths(bool forExport)
-{
-	if (m_TitleID)
-	{
-		WiiTitlePath = Common::GetTitleDataPath(m_TitleID);
-	}
-
-	if (forExport)
-	{
-		char GameID[5];
-		sprintf(GameID, "%c%c%c%c",
-			(u8)(m_TitleID >> 24) & 0xFF, (u8)(m_TitleID >> 16) & 0xFF,
-			(u8)(m_TitleID >>  8) & 0xFF, (u8)m_TitleID & 0xFF);
-
-		if(!File::IsDirectory(WiiTitlePath))
-		{
-			b_valid = false;
-			PanicAlertT("No save folder found for title %s", GameID);
-			return false;
-		}
-		
-		if(!File::Exists(WiiTitlePath + "banner.bin"))
-		{
-			b_valid = false;
-			PanicAlertT("No banner file found for title  %s", GameID);
-			return false;
-		}
-		if (encryptedSavePath.length() == 0) 
-			encryptedSavePath = "."; // If no path was passed, use current dir
-		encryptedSavePath += StringFromFormat("/private/wii/title/%s/data.bin", GameID);
-		File::CreateFullPath(encryptedSavePath);
-	}
-	else
-	{
-		File::CreateFullPath(WiiTitlePath);	
-		if (!AskYesNoT("Warning! it is advised to backup all files in the folder:\n%s\nDo you wish to continue?", WiiTitlePath.c_str()))
-			return false;
-	}
-	return true;
-}
-
-void CWiiSaveCrypted::ScanForFiles(std::string savDir, std::vector<std::string>& FileList, u32 *_numFiles, u32 *_sizeFiles)
-{
-	std::vector<std::string> Directories;
-	*_numFiles = *_sizeFiles = 0;
-
-	Directories.push_back(savDir);
-	for (u32 i = 0; i < Directories.size(); i++)
-	{
-		if (i != 0)
-		{
-			FileList.push_back(Directories[i]);//add dir to fst
-		}
-
-		File::FSTEntry FST_Temp;
-		File::ScanDirectoryTree(Directories[i], FST_Temp);
-		for (u32 j = 0; j < FST_Temp.children.size(); j++)
-		{
-			if (strncmp(FST_Temp.children.at(j).virtualName.c_str(), "banner.bin", 10) != 0)
-			{
-				(*_numFiles)++;
-				*_sizeFiles += FILE_HDR_SZ;
-				if (FST_Temp.children.at(j).isDirectory)
-				{
-					if ((FST_Temp.children.at(j).virtualName == "nocopy") || FST_Temp.children.at(j).virtualName == "nomove")
-					{
-						PanicAlert("This save will likely require homebrew tools to copy to a real wii");
-					}
-
-					Directories.push_back(FST_Temp.children.at(j).physicalName);
-				}
-				else
-				{
-					FileList.push_back(FST_Temp.children.at(j).physicalName);
-					*_sizeFiles += ROUND_UP(FST_Temp.children.at(j).size, BLOCK_SZ);
-				}
-			}
-		}
-	}
-}
-
-CWiiSaveCrypted::~CWiiSaveCrypted()
-{
-}
-
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
deleted file mode 100644
index 29a3e1f530..0000000000
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _WII_SAVE_CRYPTED
-#define _WII_SAVE_CRYPTED
-
-#include "StringUtil.h"
-#include "Crypto/aes.h"
-#include "Crypto/tools.h"
-#include "polarssl/md5.h"
-
-// --- this is used for encrypted Wii save files
-
-
-class CWiiSaveCrypted
-{
-public:
-	bool static ImportWiiSave(const char* FileName);
-	bool static ExportWiiSave(u64 TitleID);
-	void static ExportAllSaves();
-
-private:
-	CWiiSaveCrypted(const char* FileName, u64 TitleID = 0);
-	~CWiiSaveCrypted();
-	void ReadHDR();
-	void ReadBKHDR();
-	void WriteHDR();
-	void WriteBKHDR();
-	void Extract(){;}
-	void ImportWiiSaveFiles();
-	void ExportWiiSaveFiles(); // To data.bin
-	void do_sig();
-	void make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name, u8 *priv, u32 key_id);
-	bool getPaths(bool forExport = false);
-	void ScanForFiles(std::string savDir, std::vector<std::string>&FilesList, u32 *_numFiles, u32 *_sizeFiles);
-
-
-	AES_KEY m_AES_KEY;
-	u8 SD_IV[0x10];
-	std::vector<std::string> FilesList;
-
-	std::string encryptedSavePath;
-
-	std::string WiiTitlePath;
-
-	u8  IV[0x10];
-	
-	u32 //_bannerSize,
-		_numberOfFiles,
-		_sizeOfFiles,
-		_totalSize;
-
-	u64 m_TitleID;
-
-	bool b_valid;
-
-	enum
-	{
-		BLOCK_SZ = 0x40,
-		HDR_SZ = 0x20,
-		ICON_SZ = 0x1200,
-		BNR_SZ = 0x60a0,
-		FULL_BNR_MIN = 0x72a0,	// BNR_SZ + 1*ICON_SZ
-		FULL_BNR_MAX = 0xF0A0,	// BNR_SZ + 8*ICON_SZ
-		HEADER_SZ = 0xF0C0,		// HDR_SZ + FULL_BNR_MAX
-		BK_LISTED_SZ = 0x70,	// Size before rounding to nearest block
-		BK_SZ  = 0x80,
-		FILE_HDR_SZ = 0x80,
-
-		SIG_SZ = 0x40,
-		NG_CERT_SZ = 0x180,
-		AP_CERT_SZ = 0x180,
-		FULL_CERT_SZ =  0x3C0,	// SIG_SZ +	NG_CERT_SZ + AP_CERT_SZ + 0x80?
-
-		BK_HDR_MAGIC   = 0x426B0001,
-		FILE_HDR_MAGIC = 0x03adf17e
-	};
-
-#pragma pack(push,1)
-
-	struct Data_Bin_HDR // encrypted
-	{
-		u64 SaveGameTitle;
-		u32 BannerSize; // (0x72A0 or 0xF0A0, also seen 0xBAA0)
-		u8 Permissions;
-		u8 unk1; // maybe permissions is a be16
-		u8 Md5[0x10]; // md5 of plaintext header with md5 blanker applied
-		u16 unk2;
-	};
-
-	struct HEADER
-	{
-		Data_Bin_HDR hdr;
-		u8 BNR[FULL_BNR_MAX];
-	}_header, _encryptedHeader;
-
-	struct BK_Header // Not encrypted
-	{
-		u32 size;   // 0x00000070
-//		u16 magic;  // 'Bk'
-//		u16 magic2; // or version (0x0001)
-		u32 magic;  // 0x426B0001
-		u32 NGid;
-		u32 numberOfFiles;
-		u32 sizeOfFiles;
-		u32 unk1;
-		u32 unk2;
-		u32 totalSize;
-		u8 unk3[64];
-		u64 SaveGameTitle;
-		u8 MACaddress[6];
-		u8 padding[0x12];
-	}bkhdr;
-
-	struct FileHDR // encrypted
-	{
-		u32 magic; //0x03adf17e
-		u32 size;
-		u8 Permissions;
-		u8 attrib;
-		u8 type; // (1=file, 2=directory)
-		u8 name[0x45];
-		u8 IV[0x10];
-		u8 unk[0x20];
-	};
-#pragma pack(pop)
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
deleted file mode 100644
index c7ef839198..0000000000
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <FileUtil.h>
-#include <IniFile.h>
-
-#include "WxUtils.h"
-#include "NetPlayClient.h"
-#include "NetPlayServer.h"
-#include "NetWindow.h"
-#include "Frame.h"
-#include "Core.h"
-#include "ConfigManager.h"
-
-#include <sstream>
-#include <string>
-
-#define NETPLAY_TITLEBAR	"Dolphin NetPlay"
-#define INITIAL_PAD_BUFFER_SIZE 20
-
-BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
-	EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
-END_EVENT_TABLE()
-
-static NetPlayServer* netplay_server = NULL;
-static NetPlayClient* netplay_client = NULL;
-extern CFrame* main_frame;
-NetPlayDiag *NetPlayDiag::npd = NULL;
-
-std::string BuildGameName(const GameListItem& game)
-{
-	// Lang needs to be consistent
-	auto const lang = 0;
-	
-	std::string name(game.GetBannerName(lang));
-	if (name.empty())
-		name = game.GetVolumeName(lang);
-
-	if (game.GetRevision() != 0)
-		return name + " (" + game.GetUniqueID() + ", Revision " + std::to_string((long long)game.GetRevision()) + ")";
-	else
-		return name + " (" + game.GetUniqueID() + ")";
-}
-
-void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)
-{
-	for (u32 i = 0 ; auto game = game_list.GetISO(i); ++i)
-		game_lbox->Append(StrToWxStr(BuildGameName(*game)));
-}
-
-NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* const game_list)
-	: wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize)
-	, m_game_list(game_list)
-{
-	IniFile inifile;
-	inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini");
-	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
-
-	wxPanel* const panel = new wxPanel(this);
-
-	// top row
-	wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"),
-			wxDefaultPosition, wxDefaultSize);
-	
-	std::string nickname;
-	netplay_section.Get("Nickname", &nickname, "Player");
-	m_nickname_text = new wxTextCtrl(panel, wxID_ANY, StrToWxStr(nickname));
-
-	wxBoxSizer* const nick_szr = new wxBoxSizer(wxHORIZONTAL);
-	nick_szr->Add(nick_lbl, 0, wxCENTER);
-	nick_szr->Add(m_nickname_text, 0, wxALL, 5);
-
-
-	// tabs
-	wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-	wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-	notebook->AddPage(connect_tab, _("Connect"));
-	wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-	notebook->AddPage(host_tab, _("Host"));
-
-
-	// connect tab
-	{
-	wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Address :"),
-			wxDefaultPosition, wxDefaultSize);
-	
-	std::string address;
-	netplay_section.Get("Address", &address, "localhost");
-	m_connect_ip_text = new wxTextCtrl(connect_tab, wxID_ANY, StrToWxStr(address));
-
-	wxStaticText* const port_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Port :"),
-			wxDefaultPosition, wxDefaultSize);
-	
-	// string? w/e
-	std::string port;
-	netplay_section.Get("ConnectPort", &port, "2626");	
-	m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, StrToWxStr(port));
-
-	wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect"));
-	connect_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnJoin, this);
-
-	wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY,
-		_("ALERT:\n\n"
-		"Netplay will only work with the following settings:\n"
-		" - Enable Dual Core [OFF]\n"
-		" - DSP Emulator Engine Must be the same on all computers!\n"
-		" - DSP on Dedicated Thread [OFF]\n"
-		" - Framelimit NOT set to [Audio]\n"
-		"\n"
-		"All players should use the same Dolphin version and settings.\n"
-		"All memory cards must be identical between players or disabled.\n"
-		"Wiimote support has not been implemented!\n"
-		"\n"
-		"The host must have the chosen TCP port open/forwarded!\n"),
-		wxDefaultPosition, wxDefaultSize);
-
-	wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
-	top_szr->Add(ip_lbl, 0, wxCENTER | wxRIGHT, 5);
-	top_szr->Add(m_connect_ip_text, 3);
-	top_szr->Add(port_lbl, 0, wxCENTER | wxRIGHT | wxLEFT, 5);
-	top_szr->Add(m_connect_port_text, 1);
-
-	wxBoxSizer* const con_szr = new wxBoxSizer(wxVERTICAL);
-	con_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
-	con_szr->AddStretchSpacer(1);
-	con_szr->Add(alert_lbl, 0, wxLEFT | wxRIGHT | wxEXPAND, 5);
-	con_szr->AddStretchSpacer(1);
-	con_szr->Add(connect_btn, 0, wxALL | wxALIGN_RIGHT, 5);
-
-	connect_tab->SetSizerAndFit(con_szr);
-	}
-
-	// host tab
-	{
-	wxStaticText* const port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port :"),
-			wxDefaultPosition, wxDefaultSize);
-	
-	// string? w/e
-	std::string port;
-	netplay_section.Get("HostPort", &port, "2626");	
-	m_host_port_text = new wxTextCtrl(host_tab, wxID_ANY, StrToWxStr(port));
-
-	wxButton* const host_btn = new wxButton(host_tab, wxID_ANY, _("Host"));
-	host_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnHost, this);
-
-	m_game_lbox = new wxListBox(host_tab, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
-	m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &NetPlaySetupDiag::OnHost, this);
-	
-	FillWithGameNames(m_game_lbox, *game_list);
-
-	wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
-	top_szr->Add(port_lbl, 0, wxCENTER | wxRIGHT, 5);
-	top_szr->Add(m_host_port_text, 0);
-#ifdef USE_UPNP
-	m_upnp_chk = new wxCheckBox(host_tab, wxID_ANY, _("Forward port (UPnP)"));
-	top_szr->Add(m_upnp_chk, 0, wxALL | wxALIGN_RIGHT, 5);
-#endif
-
-	wxBoxSizer* const host_szr = new wxBoxSizer(wxVERTICAL);
-	host_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
-	host_szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxEXPAND, 5);
-	host_szr->Add(host_btn, 0, wxALL | wxALIGN_RIGHT, 5);
-
-	host_tab->SetSizerAndFit(host_szr);
-	}
-
-	// bottom row
-	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
-	quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnQuit, this);
-
-	// main sizer
-	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
-	main_szr->Add(nick_szr, 0, wxALL | wxALIGN_RIGHT, 5);
-	main_szr->Add(notebook, 1, wxLEFT | wxRIGHT | wxEXPAND, 5);
-	main_szr->Add(quit_btn, 0, wxALL | wxALIGN_RIGHT, 5);
-
-	panel->SetSizerAndFit(main_szr);
-
-	//wxBoxSizer* const diag_szr = new wxBoxSizer(wxVERTICAL);
-	//diag_szr->Add(panel, 1, wxEXPAND);
-	//SetSizerAndFit(diag_szr);
-
-	main_szr->SetSizeHints(this);
-
-	Center();
-	Show();
-}
-
-NetPlaySetupDiag::~NetPlaySetupDiag()
-{
-	IniFile inifile;
-	const std::string dolphin_ini = File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini";
-	inifile.Load(dolphin_ini);
-	IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
-
-	netplay_section.Set("Nickname", WxStrToStr(m_nickname_text->GetValue()));
-	netplay_section.Set("Address", WxStrToStr(m_connect_ip_text->GetValue()));
-	netplay_section.Set("ConnectPort", WxStrToStr(m_connect_port_text->GetValue()));
-	netplay_section.Set("HostPort", WxStrToStr(m_host_port_text->GetValue()));
-
-	inifile.Save(dolphin_ini);
-	main_frame->g_NetPlaySetupDiag = NULL;
-}
-
-void NetPlaySetupDiag::MakeNetPlayDiag(int port, const std::string &game, bool is_hosting)
-{
-	NetPlayDiag *&npd = NetPlayDiag::GetInstance();
-	std::string ip;
-	npd = new NetPlayDiag(m_parent, m_game_list, game, is_hosting);
-	if (is_hosting)
-		ip = "127.0.0.1";
-	else
-		ip = WxStrToStr(m_connect_ip_text->GetValue());
-
-	netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()));
-	if (netplay_client->is_connected)
-	{
-		npd->Show();
-		Destroy();
-	}
-	else
-	{
-		npd->Destroy();
-	}
-}
-
-void NetPlaySetupDiag::OnHost(wxCommandEvent&)
-{
-	NetPlayDiag *&npd = NetPlayDiag::GetInstance();
-	if (npd)
-	{
-		PanicAlertT("A NetPlay window is already open!!");
-		return;
-	}
-
-	if (-1 == m_game_lbox->GetSelection())
-	{
-		PanicAlertT("You must choose a game!!");
-		return;
-	}
-
-	std::string game(WxStrToStr(m_game_lbox->GetStringSelection()));
-
-	unsigned long port = 0;
-	m_host_port_text->GetValue().ToULong(&port);
-	netplay_server = new NetPlayServer(u16(port));
-	netplay_server->ChangeGame(game);
-	netplay_server->AdjustPadBufferSize(INITIAL_PAD_BUFFER_SIZE);
-	if (netplay_server->is_connected)
-	{
-#ifdef USE_UPNP
-		if(m_upnp_chk->GetValue())
-			netplay_server->TryPortmapping(port);
-#endif
-	}
-
-	MakeNetPlayDiag(port, game, true);
-}
-
-void NetPlaySetupDiag::OnJoin(wxCommandEvent&)
-{
-	NetPlayDiag *&npd = NetPlayDiag::GetInstance();
-	if (npd)
-	{
-		PanicAlertT("A NetPlay window is already open!!");
-		return;
-	}
-
-	unsigned long port = 0;
-	m_connect_port_text->GetValue().ToULong(&port);
-	MakeNetPlayDiag(port, "", false);
-}
-
-void NetPlaySetupDiag::OnQuit(wxCommandEvent&)
-{
-	Destroy();
-}
-
-NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game_list,
-		const std::string& game, const bool is_hosting)
-	: wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize)
-	, m_selected_game(game)
-	, m_start_btn(NULL)
-	, m_game_list(game_list)
-{
-	wxPanel* const panel = new wxPanel(this);
-
-	// top crap
-	m_game_btn = new wxButton(panel, wxID_ANY,
-			StrToWxStr(m_selected_game).Prepend(_(" Game : ")),
-			wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
-	
-	if (is_hosting)
-		m_game_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChangeGame, this);
-	else
-		m_game_btn->Disable();
-
-	// middle crap
-
-	// chat
-	m_chat_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString
-		, wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
-
-	m_chat_msg_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString
-		, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
-	m_chat_msg_text->Bind(wxEVT_COMMAND_TEXT_ENTER, &NetPlayDiag::OnChat, this);
-
-	wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send"));
-	chat_msg_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChat, this);
-
-	wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL);
-	chat_msg_szr->Add(m_chat_msg_text, 1);
-	chat_msg_szr->Add(chat_msg_btn, 0);
-
-	wxStaticBoxSizer* const chat_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Chat"));
-	chat_szr->Add(m_chat_text, 1, wxEXPAND);
-	chat_szr->Add(chat_msg_szr, 0, wxEXPAND | wxTOP, 5);
-
-	m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(256, -1));
-
-	wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Players"));
-	player_szr->Add(m_player_lbox, 1, wxEXPAND);
-	// player list
-	if (is_hosting)
-	{
-		wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads"));
-		player_config_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnConfigPads, this);
-		player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5);
-	}
-
-	wxBoxSizer* const mid_szr = new wxBoxSizer(wxHORIZONTAL);
-	mid_szr->Add(chat_szr, 1, wxEXPAND | wxRIGHT, 5);
-	mid_szr->Add(player_szr, 0, wxEXPAND);
-
-	// bottom crap
-	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
-	quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnQuit, this);
-
-	wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL);
-	if (is_hosting)
-	{
-		m_start_btn = new wxButton(panel, wxID_ANY, _("Start"));
-		m_start_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnStart, this);
-		bottom_szr->Add(m_start_btn);
-
-		bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 );
-		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20")
-			, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, INITIAL_PAD_BUFFER_SIZE);
-		padbuf_spin->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &NetPlayDiag::OnAdjustBuffer, this);
-		bottom_szr->Add(padbuf_spin, 0, wxCENTER);
-
-		m_memcard_write = new wxCheckBox(panel, wxID_ANY, _("Write memcards (GC)"));
-		bottom_szr->Add(m_memcard_write, 0, wxCENTER);
-	}
-
-	m_record_chkbox = new wxCheckBox(panel, wxID_ANY, _("Record input"));
-	bottom_szr->Add(m_record_chkbox, 0, wxCENTER);
-
-	bottom_szr->AddStretchSpacer(1);
-	bottom_szr->Add(quit_btn);
-
-	// main sizer
-	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
-	main_szr->Add(m_game_btn, 0, wxEXPAND | wxALL, 5);
-	main_szr->Add(mid_szr, 1, wxEXPAND | wxLEFT | wxRIGHT, 5);
-	main_szr->Add(bottom_szr, 0, wxEXPAND | wxALL, 5);
-
-	panel->SetSizerAndFit(main_szr);
-
-	main_szr->SetSizeHints(this);
-	SetSize(512, 512-128);
-
-	Center();
-}
-
-NetPlayDiag::~NetPlayDiag()
-{
-	if (netplay_client)
-	{
-		delete netplay_client;
-		netplay_client = NULL;
-	}
-	if (netplay_server)
-	{
-		delete netplay_server;
-		netplay_server = NULL;
-	}
-	npd = NULL;
-}
-
-void NetPlayDiag::OnChat(wxCommandEvent&)
-{
-	wxString s = m_chat_msg_text->GetValue();
-
-	if (s.Length())
-	{
-		netplay_client->SendChatMessage(WxStrToStr(s));
-		m_chat_text->AppendText(s.Prepend(wxT(" >> ")).Append(wxT('\n')));
-		m_chat_msg_text->Clear();
-	}
-}
-
-void NetPlayDiag::GetNetSettings(NetSettings &settings)
-{
-	SConfig &instance = SConfig::GetInstance();
-	settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
-	settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
-	settings.m_DSPEnableJIT = instance.m_EnableJIT;
-	settings.m_WriteToMemcard = m_memcard_write->GetValue();
-	settings.m_EXIDevice[0] = instance.m_EXIDevice[0];
-	settings.m_EXIDevice[1] = instance.m_EXIDevice[1];
-}
-
-std::string NetPlayDiag::FindGame()
-{
-	// find path for selected game, sloppy..
-	for (u32 i = 0 ; auto game = m_game_list->GetISO(i); ++i)
-		if (m_selected_game == BuildGameName(*game))
-			return game->GetFileName();
-	
-	PanicAlertT("Game not found!");
-	return "";
-}
-
-void NetPlayDiag::OnStart(wxCommandEvent&)
-{
-	NetSettings settings;
-	GetNetSettings(settings);
-	netplay_server->SetNetSettings(settings);
-	netplay_server->StartGame(FindGame());
-}
-
-void NetPlayDiag::BootGame(const std::string& filename)
-{
-	main_frame->BootGame(filename);
-}
-
-void NetPlayDiag::StopGame()
-{
-	main_frame->DoStop();
-}
-
-// NetPlayUI methods called from ---NETPLAY--- thread
-void NetPlayDiag::Update()
-{
-	wxCommandEvent evt(wxEVT_THREAD, 1);
-	GetEventHandler()->AddPendingEvent(evt);
-}
-
-void NetPlayDiag::AppendChat(const std::string& msg)
-{
-	chat_msgs.Push(msg);
-	// silly
-	Update();
-}
-
-void NetPlayDiag::OnMsgChangeGame(const std::string& filename)
-{
-	wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_CHANGE_GAME);
-	// TODO: using a wxString in AddPendingEvent from another thread is unsafe i guess?
-	evt.SetString(StrToWxStr(filename));
-	GetEventHandler()->AddPendingEvent(evt);
-}
-
-void NetPlayDiag::OnMsgStartGame()
-{
-	wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_START_GAME);
-	GetEventHandler()->AddPendingEvent(evt);
-	if (m_start_btn)
-		m_start_btn->Disable();
-}
-
-void NetPlayDiag::OnMsgStopGame()
-{
-	wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_STOP_GAME);
-	GetEventHandler()->AddPendingEvent(evt);
-	if (m_start_btn)
-		m_start_btn->Enable();
-}
-
-void NetPlayDiag::OnAdjustBuffer(wxCommandEvent& event)
-{
-	const int val = ((wxSpinCtrl*)event.GetEventObject())->GetValue();
-	netplay_server->AdjustPadBufferSize(val);
-
-	std::ostringstream ss;
-	ss << "< Pad Buffer: " << val << " >";
-	netplay_client->SendChatMessage(ss.str());
-	m_chat_text->AppendText(StrToWxStr(ss.str()).Append(wxT('\n')));
-}
-
-void NetPlayDiag::OnQuit(wxCommandEvent&)
-{
-	Destroy();
-}
-
-// update gui
-void NetPlayDiag::OnThread(wxCommandEvent& event)
-{
-	// player list
-	m_playerids.clear();
-	std::string tmps;
-	netplay_client->GetPlayerList(tmps, m_playerids);
-
-	const int selection = m_player_lbox->GetSelection();
-
-	m_player_lbox->Clear();
-	std::istringstream ss(tmps);
-	while (std::getline(ss, tmps))
-		m_player_lbox->Append(StrToWxStr(tmps));
-
-	m_player_lbox->SetSelection(selection);
-
-	switch (event.GetId())
-	{
-	case NP_GUI_EVT_CHANGE_GAME :
-		// update selected game :/
-		{
-		m_selected_game.assign(WxStrToStr(event.GetString()));
-		m_game_btn->SetLabel(event.GetString().Prepend(_(" Game : ")));
-		}
-		break;
-	case NP_GUI_EVT_START_GAME :
-		// client start game :/
-		{
-		netplay_client->StartGame(FindGame());
-		}
-		break;
-	case NP_GUI_EVT_STOP_GAME :
-		// client stop game
-		{
-		netplay_client->StopGame();
-		}
-		break;
-	}
-
-	// chat messages
-	while (chat_msgs.Size())
-	{
-		std::string s;
-		chat_msgs.Pop(s);
-		//PanicAlert("message: %s", s.c_str());
-		m_chat_text->AppendText(StrToWxStr(s).Append(wxT('\n')));
-	}
-}
-
-void NetPlayDiag::OnChangeGame(wxCommandEvent&)
-{
-	wxString game_name;
-	ChangeGameDiag* const cgd = new ChangeGameDiag(this, m_game_list, game_name);
-	cgd->ShowModal();
-
-	if (game_name.length())
-	{
-		m_selected_game = WxStrToStr(game_name);
-		netplay_server->ChangeGame(m_selected_game);
-		m_game_btn->SetLabel(game_name.Prepend(_(" Game : ")));
-	}
-}
-
-void NetPlayDiag::OnConfigPads(wxCommandEvent&)
-{
-	PadMapping mapping[4];
-	std::vector<const Player *> player_list;
-	netplay_server->GetPadMapping(mapping);
-	netplay_client->GetPlayers(player_list);
-	PadMapDiag pmd(this, mapping, player_list);
-	pmd.ShowModal();
-	netplay_server->SetPadMapping(mapping);
-}
-
-bool NetPlayDiag::IsRecording()
-{
-	return m_record_chkbox->GetValue();
-}
-
-ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name)
-	: wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize)
-	, m_game_name(game_name)
-{
-	m_game_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
-	m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &ChangeGameDiag::OnPick, this);
-
-	FillWithGameNames(m_game_lbox, *game_list);
-
-	wxButton* const ok_btn = new wxButton(this, wxID_OK, _("Change"));
-	ok_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ChangeGameDiag::OnPick, this);
-
-	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
-	szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 5);
-	szr->Add(ok_btn, 0, wxALL | wxALIGN_RIGHT, 5);
-
-	SetSizerAndFit(szr);
-	SetFocus();
-}
-
-void ChangeGameDiag::OnPick(wxCommandEvent& event)
-{
-	// return the selected game name
-	m_game_name = m_game_lbox->GetStringSelection();
-	EndModal(wxID_OK);
-}
-
-PadMapDiag::PadMapDiag(wxWindow* const parent, PadMapping map[], std::vector<const Player *>& player_list)
-	: wxDialog(parent, wxID_ANY, _("Configure Pads"), wxDefaultPosition, wxDefaultSize)
-	, m_mapping(map)
-	, m_player_list(player_list)
-{
-	wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL);
-	h_szr->AddSpacer(10);
-
-	wxArrayString player_names;
-	player_names.Add(_("None"));
-	for (unsigned int i = 0; i < m_player_list.size(); i++)
-		player_names.Add(m_player_list[i]->name);
-
-	for (unsigned int i=0; i<4; ++i)
-	{
-		wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL);
-		v_szr->Add(new wxStaticText(this, wxID_ANY, (wxString(_("Pad ")) + (wxChar)(wxT('0')+i))),
-					    1, wxALIGN_CENTER_HORIZONTAL);
-
-		m_map_cbox[i] = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, player_names);
-		m_map_cbox[i]->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &PadMapDiag::OnAdjust, this);
-		if (m_mapping[i] == -1)
-			m_map_cbox[i]->Select(0);
-		else
-			for (unsigned int j = 0; j < m_player_list.size(); j++)
-				if (m_mapping[i] == m_player_list[j]->pid)
-					m_map_cbox[i]->Select(j + 1);
-
-		v_szr->Add(m_map_cbox[i], 1);
-
-		h_szr->Add(v_szr, 1, wxTOP | wxEXPAND, 20);
-		h_szr->AddSpacer(10);
-	}
-
-	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
-	main_szr->Add(h_szr);
-	main_szr->AddSpacer(5);
-	main_szr->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT, 20);
-	main_szr->AddSpacer(5);
-	SetSizerAndFit(main_szr);
-	SetFocus();
-}
-
-void PadMapDiag::OnAdjust(wxCommandEvent& event)
-{
-	(void)event;
-	for (unsigned int i = 0; i < 4; i++)
-	{
-		int player_idx = m_map_cbox[i]->GetSelection();
-		if (player_idx > 0)
-			m_mapping[i] = m_player_list[player_idx - 1]->pid;
-		else
-			m_mapping[i] = -1;
-	}
-}
-
-void NetPlay::StopGame()
-{
-	if (netplay_client != NULL)
-		netplay_client->Stop();
-}
diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h
deleted file mode 100644
index f271f12afe..0000000000
--- a/Source/Core/DolphinWX/Src/NetWindow.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NETWINDOW_H_
-#define _NETWINDOW_H_
-
-#include "CommonTypes.h"
-
-#include <queue>
-#include <string>
-
-#include <wx/wx.h>
-#include <wx/event.h>
-#include <wx/sizer.h>
-#include <wx/dialog.h>
-#include <wx/notebook.h>
-#include <wx/gbsizer.h>
-#include <wx/listbox.h>
-#include <wx/spinctrl.h>
-
-#include "GameListCtrl.h"
-
-#include "FifoQueue.h"
-
-#include "NetPlayClient.h"
-
-enum
-{
-	NP_GUI_EVT_CHANGE_GAME = 45,
-	NP_GUI_EVT_START_GAME,
-	NP_GUI_EVT_STOP_GAME,
-};
-
-class NetPlaySetupDiag : public wxFrame
-{
-public:
-	NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* const game_list);
-	~NetPlaySetupDiag();
-private:
-	void OnJoin(wxCommandEvent& event);
-	void OnHost(wxCommandEvent& event);
-	void OnQuit(wxCommandEvent& event);
-
-	void MakeNetPlayDiag(int port, const std::string &game, bool is_hosting);
-
-	wxTextCtrl		*m_nickname_text,
-		*m_host_port_text,
-		*m_connect_port_text,
-		*m_connect_ip_text;
-
-	wxListBox*		m_game_lbox;
-#ifdef USE_UPNP
-	wxCheckBox*		m_upnp_chk;
-#endif
-
-	const CGameListCtrl* const m_game_list;
-};
-
-class NetPlayDiag : public wxFrame, public NetPlayUI
-{
-public:
-	NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game_list
-		, const std::string& game, const bool is_hosting = false);
-	~NetPlayDiag();
-
-	Common::FifoQueue<std::string>	chat_msgs;
-
-	void OnStart(wxCommandEvent& event);
-
-	// implementation of NetPlayUI methods
-	void BootGame(const std::string& filename);
-	void StopGame();
-
-	void Update();
-	void AppendChat(const std::string& msg);
-
-	void OnMsgChangeGame(const std::string& filename);
-	void OnMsgStartGame();
-	void OnMsgStopGame();
-
-	static NetPlayDiag *&GetInstance() { return npd; };
-
-	bool IsRecording();
-
-private:
-    DECLARE_EVENT_TABLE()
-
-	void OnChat(wxCommandEvent& event);
-	void OnQuit(wxCommandEvent& event);
-	void OnThread(wxCommandEvent& event);
-	void OnChangeGame(wxCommandEvent& event);
-	void OnAdjustBuffer(wxCommandEvent& event);
-	void OnConfigPads(wxCommandEvent& event);
-	void GetNetSettings(NetSettings &settings);
-	std::string FindGame();
-
-	wxListBox*		m_player_lbox;
-	wxTextCtrl*		m_chat_text;
-	wxTextCtrl*		m_chat_msg_text;
-	wxCheckBox*		m_memcard_write;
-	wxCheckBox*		m_record_chkbox;
-
-	std::string		m_selected_game;
-	wxButton*		m_game_btn;
-	wxButton*		m_start_btn;
-
-	std::vector<int>	m_playerids;
-
-	const CGameListCtrl* const m_game_list;
-
-	static NetPlayDiag* npd;
-};
-
-class ChangeGameDiag : public wxDialog
-{
-public:
-	ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name);
-
-private:
-	void OnPick(wxCommandEvent& event);
-
-	wxListBox*		m_game_lbox;
-	wxString&		m_game_name;
-};
-
-class PadMapDiag : public wxDialog
-{
-public:
-	PadMapDiag(wxWindow* const parent, PadMapping map[], std::vector<const Player *>& player_list);
-
-private:
-	void OnAdjust(wxCommandEvent& event);
-
-	wxChoice*	m_map_cbox[4];
-	PadMapping* const m_mapping;
-	std::vector<const Player *>& m_player_list;
-};
-
-namespace NetPlay
-{
-	void StopGame();
-}
-
-#endif // _NETWINDOW_H_
-
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.cpp b/Source/Core/DolphinWX/Src/PHackSettings.cpp
deleted file mode 100644
index 3db44891e6..0000000000
--- a/Source/Core/DolphinWX/Src/PHackSettings.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "CommonPaths.h"
-#include "PHackSettings.h"
-#include "ConfigManager.h"
-#include "WxUtils.h"
-
-extern PHackData PHack_Data;
-
-BEGIN_EVENT_TABLE(CPHackSettings, wxDialog)
-	EVT_CHOICE(ID_PHACK_CHOICE, CPHackSettings::SetRefresh)
-	EVT_BUTTON(wxID_OK, CPHackSettings::SavePHackData)
-END_EVENT_TABLE()
-
-CPHackSettings::CPHackSettings(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	CreateGUIControls();
-	std::string _iniFilename;
-	_iniFilename = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP "PH_PRESETS.ini";
-	PHPresetsIni.Load(_iniFilename.c_str());
-	PHPresetsIni.SortSections();
-
-	LoadPHackData();
-}
-
-CPHackSettings::~CPHackSettings()
-{
-}
-
-void CPHackSettings::CreateGUIControls()
-{
-	wxStaticText *PHackChoiceText = new wxStaticText(this, wxID_ANY, _("Presets: "));
-	PHackChoice = new wxChoice(this, ID_PHACK_CHOICE);
-	PHackChoice->SetToolTip(_("Load preset values from hack patterns available."));
-	wxStaticText *PHackZNearText = new wxStaticText(this, wxID_ANY, _("zNear Correction: "));
-	PHackZNear = new wxTextCtrl(this, ID_PHACK_ZNEAR);
-	PHackZNear->SetToolTip(_("Adds the specified value to zNear Parameter.\nTwo ways to express the floating point values.\nExample: entering '\'200'\' or '\'0.0002'\' directly, it produces equal effects, the acquired value will be '\'0.0002'\'.\nValues: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n\nNOTE: Check LogWindow/Console for the acquired values."));
-	PHackSZNear = new wxCheckBox(this, ID_PHACK_SZNEAR, _("(-)+zNear"));
-	PHackSZNear->SetToolTip(_("Changes sign to zNear Parameter (after correction)"));
-	wxStaticText *PHackZFarText = new wxStaticText(this, wxID_ANY, _("zFar Correction: "));
-	PHackZFar = new wxTextCtrl(this, ID_PHACK_ZFAR);
-	PHackZFar->SetToolTip(_("Adds the specified value to zFar Parameter.\nTwo ways to express the floating point values.\nExample: entering '\'200'\' or '\'0.0002'\' directly, it produces equal effects, the acquired value will be '\'0.0002'\'.\nValues: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n\nNOTE: Check LogWindow/Console for the acquired values."));
-	PHackSZFar = new wxCheckBox(this, ID_PHACK_SZFAR, _("(-)+zFar"));
-	PHackSZFar->SetToolTip(_("Changes sign to zFar Parameter (after correction)"));
-	PHackExP = new wxCheckBox(this, ID_PHACK_EXP, _("Extra Parameter"));
-	PHackExP->SetToolTip(_("Extra Parameter useful in '\'Metroid: Other M'\' only."));
-
-	wxStaticBoxSizer *sbPHackSettings = new wxStaticBoxSizer(wxVERTICAL, this, _("Parameters"));
-	wxFlexGridSizer *szrPHackSettings = new wxFlexGridSizer(3, 5, 5);
-	sbPHackSettings->Add(szrPHackSettings, 0, wxEXPAND|wxLEFT|wxTOP, 5);
-	szrPHackSettings->Add(PHackZNearText, 0, wxALIGN_CENTER_VERTICAL);
-	szrPHackSettings->Add(PHackZNear, 1, wxEXPAND);
-	szrPHackSettings->Add(PHackSZNear, 0, wxEXPAND|wxLEFT, 5);
-	szrPHackSettings->Add(PHackZFarText, 0, wxALIGN_CENTER_VERTICAL);
-	szrPHackSettings->Add(PHackZFar, 1, wxEXPAND);
-	szrPHackSettings->Add(PHackSZFar, 0, wxEXPAND|wxLEFT, 5);
-	szrPHackSettings->Add(PHackExP, 0, wxEXPAND|wxTOP|wxBOTTOM, 5);
-
-	wxBoxSizer* sPHack = new wxBoxSizer(wxVERTICAL);
-	sPHack->Add(PHackChoiceText, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5);
-	sPHack->Add(PHackChoice, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	sPHack->Add(sbPHackSettings, 0, wxEXPAND|wxALL, 5);
-	sPHack->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-	SetSizerAndFit(sPHack);
-	SetFocus();
-}
-
-void CPHackSettings::LoadPHackData()
-{
-	std::string sTemp;
-	char sIndex[15];
-
-	PHackChoice->Clear();
-	PHackChoice->Append(_("[Custom]"));
-	for (int i=0 ;  ; i++)
-	{
-		sprintf(sIndex,"%d",i);
-		if (!PHPresetsIni.Exists(sIndex, "Title"))
-			break;
-		PHPresetsIni.Get(sIndex, "Title", &sTemp);
-		if (sTemp.empty())
-			sTemp = wxString(_("(UNKNOWN)")).char_str();
-		if (i == 0)
-			PHackChoice->Append(StrToWxStr("-------------"));
-		PHackChoice->Append(StrToWxStr(sTemp));
-	}
-	PHackChoice->Select(0);
-
-	PHackSZNear->Set3StateValue((wxCheckBoxState)PHack_Data.PHackSZNear);
-	PHackSZFar->Set3StateValue((wxCheckBoxState)PHack_Data.PHackSZFar);
-	PHackExP->Set3StateValue((wxCheckBoxState)PHack_Data.PHackExP);
-
-	PHackZNear->SetValue(StrToWxStr(PHack_Data.PHZNear));
-	PHackZFar->SetValue(StrToWxStr(PHack_Data.PHZFar));
-}
-
-void CPHackSettings::SetRefresh(wxCommandEvent& event)
-{
-	bool bTemp;
-	std::string sTemp;
-	char sIndex[15];
-	int index = event.GetSelection();
-	if (index > 1)
-	{
-		index -= 2;
-		sprintf(sIndex,"%d", index);
-
-		PHPresetsIni.Get(sIndex, "PH_SZNear", &bTemp);
-		PHackSZNear->Set3StateValue((wxCheckBoxState)bTemp);
-		PHPresetsIni.Get(sIndex, "PH_SZFar", &bTemp);
-		PHackSZFar->Set3StateValue((wxCheckBoxState)bTemp);
-		PHPresetsIni.Get(sIndex, "PH_ExtraParam", &bTemp);
-		PHackExP->Set3StateValue((wxCheckBoxState)bTemp);
-		PHPresetsIni.Get(sIndex, "PH_ZNear", &sTemp);
-		PHackZNear->SetValue(StrToWxStr(sTemp));
-		PHPresetsIni.Get(sIndex, "PH_ZFar", &sTemp);
-		PHackZFar->SetValue(StrToWxStr(sTemp));
-	}
-}
-
-void CPHackSettings::SavePHackData(wxCommandEvent& event)
-{
-	PHack_Data.PHackSZNear = PHackSZNear->GetValue();
-	PHack_Data.PHackSZFar = PHackSZFar->GetValue();
-	PHack_Data.PHackExP = PHackExP->GetValue();
-
-	PHack_Data.PHZNear = PHackZNear->GetValue().char_str();
-	PHack_Data.PHZFar = PHackZFar->GetValue().char_str();
-
-	AcceptAndClose();
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.h b/Source/Core/DolphinWX/Src/PHackSettings.h
deleted file mode 100644
index 336f26886d..0000000000
--- a/Source/Core/DolphinWX/Src/PHackSettings.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __PHACK_SETTINGS_h__
-#define __PHACK_SETTINGS_h__
-
-#include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include "ISOProperties.h"
-
-class CPHackSettings : public wxDialog
-{
-	public:
-		CPHackSettings(wxWindow* parent,
-			wxWindowID id = 1,
-			const wxString& title = _("Custom Projection Hack Settings"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_DIALOG_STYLE);
-		virtual ~CPHackSettings();
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		wxChoice *PHackChoice;
-		wxCheckBox *PHackSZNear;
-		wxCheckBox *PHackSZFar;
-		wxCheckBox *PHackExP;
-		wxTextCtrl *PHackZNear;
-		wxTextCtrl *PHackZFar;
-
-		enum {
-			ID_PHACK_CHOICE = 1000,
-			ID_PHACK_SZNEAR,
-			ID_PHACK_SZFAR,
-			ID_PHACK_ZNEAR,
-			ID_PHACK_ZFAR,
-			ID_PHACK_EXP
-		};
-
-		IniFile PHPresetsIni;
-
-		void SetRefresh(wxCommandEvent& event);
-		void CreateGUIControls();
-
-		void SavePHackData(wxCommandEvent& event);
-		void LoadPHackData();
-};
-
-#endif // __PHACK_SETTINGS_h__
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
deleted file mode 100644
index e730b21afe..0000000000
--- a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "PatchAddEdit.h"
-#include "WxUtils.h"
-
-extern std::vector<PatchEngine::Patch> onFrame;
-
-BEGIN_EVENT_TABLE(CPatchAddEdit, wxDialog)
-	EVT_BUTTON(wxID_OK, CPatchAddEdit::SavePatchData)
-	EVT_BUTTON(ID_ENTRY_ADD, CPatchAddEdit::AddRemoveEntry)
-	EVT_BUTTON(ID_ENTRY_REMOVE, CPatchAddEdit::AddRemoveEntry)
-	EVT_SPIN(ID_ENTRY_SELECT, CPatchAddEdit::ChangeEntry)
-END_EVENT_TABLE()
-
-CPatchAddEdit::CPatchAddEdit(int _selection, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
-{
-	selection = _selection;
-	CreateGUIControls(selection);
-}
-
-CPatchAddEdit::~CPatchAddEdit()
-{
-}
-
-void CPatchAddEdit::CreateGUIControls(int _selection)
-{
-	wxString currentName = _("<Insert name here>");
-
-	if (_selection == -1)
-	{
-		tempEntries.clear();
-		tempEntries.push_back(PatchEngine::PatchEntry(PatchEngine::PATCH_8BIT, 0x00000000, 0x00000000));
-	}
-	else
-	{
-		currentName = StrToWxStr(onFrame.at(_selection).name);
-		tempEntries = onFrame.at(_selection).entries;
-	}
-
-	itCurEntry = tempEntries.begin();
-
-	wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL);
-	wxStaticText* EditPatchNameText = new wxStaticText(this, ID_EDITPATCH_NAME_TEXT, _("Name:"));
-	EditPatchName = new wxTextCtrl(this, ID_EDITPATCH_NAME);
-	EditPatchName->SetValue(currentName);
-	wxStaticText* EditPatchOffsetText = new wxStaticText(this, ID_EDITPATCH_OFFSET_TEXT, _("Offset:"));
-	EditPatchOffset = new wxTextCtrl(this, ID_EDITPATCH_OFFSET);
-	EditPatchOffset->SetValue(wxString::Format(wxT("%08X"), tempEntries.at(0).address));
-	EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL);
-	EntrySelection->SetRange(0, (int)tempEntries.size()-1);
-	EntrySelection->SetValue((int)tempEntries.size()-1);
-	wxArrayString wxArrayStringFor_EditPatchType;
-	for (int i = 0; i < 3; ++i)
-		wxArrayStringFor_EditPatchType.Add(StrToWxStr(PatchEngine::PatchTypeStrings[i]));
-	EditPatchType = new wxRadioBox(this, ID_EDITPATCH_TYPE, _("Type"), wxDefaultPosition, wxDefaultSize, wxArrayStringFor_EditPatchType, 3, wxRA_SPECIFY_COLS);
-	EditPatchType->SetSelection((int)tempEntries.at(0).type);
-	wxStaticText* EditPatchValueText = new wxStaticText(this, ID_EDITPATCH_VALUE_TEXT, _("Value:"));
-	EditPatchValue = new wxTextCtrl(this, ID_EDITPATCH_VALUE);
-	EditPatchValue->SetValue(wxString::Format(wxT("%0*X"), PatchEngine::GetPatchTypeCharLength(tempEntries.at(0).type), tempEntries.at(0).value));
-	wxButton *EntryAdd = new wxButton(this, ID_ENTRY_ADD, _("Add"));
-	EntryRemove = new wxButton(this, ID_ENTRY_REMOVE, _("Remove"));
-	if ((int)tempEntries.size() <= 1)
-		EntryRemove->Disable();
-
-	wxBoxSizer* sEditPatchName = new wxBoxSizer(wxHORIZONTAL);
-	sEditPatchName->Add(EditPatchNameText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sEditPatchName->Add(EditPatchName, 1, wxEXPAND|wxALL, 5);
-	sEditPatch->Add(sEditPatchName, 0, wxEXPAND);
-	sbEntry = new wxStaticBoxSizer(wxVERTICAL, this, wxString::Format(_("Entry 1/%d"), (int)tempEntries.size()));
-	currentItem = 1;
-	wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0);
-	sgEntry->Add(EditPatchType, wxGBPosition(0, 0), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
-	sgEntry->Add(EditPatchOffsetText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sgEntry->Add(EditPatchOffset, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);	
-	sgEntry->Add(EditPatchValueText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sgEntry->Add(EditPatchValue, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sgEntry->Add(EntrySelection, wxGBPosition(0, 2), wxGBSpan(3, 1), wxEXPAND|wxALL, 5);
-	sgEntry->AddGrowableCol(1);
-	wxBoxSizer* sEntryAddRemove = new wxBoxSizer(wxHORIZONTAL);
-	sEntryAddRemove->Add(EntryAdd, 0, wxALL, 5);
-	sEntryAddRemove->Add(EntryRemove, 0, wxALL, 5);
-	sbEntry->Add(sgEntry, 0, wxEXPAND);
-	sbEntry->Add(sEntryAddRemove, 0, wxEXPAND);
-
-	sEditPatch->Add(sbEntry, 0, wxEXPAND|wxALL, 5);
-	sEditPatch->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-	SetSizerAndFit(sEditPatch);
-	SetFocus();
-}
-
-void CPatchAddEdit::ChangeEntry(wxSpinEvent& event)
-{
-	if (!UpdateTempEntryData(itCurEntry))
-		return;
-	
-	itCurEntry = tempEntries.end() - event.GetPosition() - 1;
-	currentItem = (int)tempEntries.size() - event.GetPosition();
-	UpdateEntryCtrls(*itCurEntry);
-}
-
-void CPatchAddEdit::SavePatchData(wxCommandEvent& event)
-{
-	if (!UpdateTempEntryData(itCurEntry))
-		return;
-
-	if (selection == -1)
-	{
-		PatchEngine::Patch newPatch;
-		newPatch.name = WxStrToStr(EditPatchName->GetValue());
-		newPatch.entries = tempEntries;
-		newPatch.active = true;
-
-		onFrame.push_back(newPatch);
-	}
-	else
-	{
-		onFrame.at(selection).name = WxStrToStr(EditPatchName->GetValue());
-		onFrame.at(selection).entries = tempEntries;
-	}
-
-	AcceptAndClose();
-	event.Skip();
-}
-
-void CPatchAddEdit::AddRemoveEntry(wxCommandEvent& event)
-{
-	switch (event.GetId())
-	{
-	case ID_ENTRY_ADD:
-		{
-			if (!UpdateTempEntryData(itCurEntry))
-				break;
-
-			PatchEngine::PatchEntry peEmptyEntry(PatchEngine::PATCH_8BIT, 0x00000000, 0x00000000);
-			++itCurEntry;
-			currentItem++;
-			itCurEntry = tempEntries.insert(itCurEntry, peEmptyEntry);
-
-			EntrySelection->SetRange(EntrySelection->GetMin(), EntrySelection->GetMax() + 1);
-			UpdateEntryCtrls(*itCurEntry);
-
-			EntryRemove->Enable();
-			EntrySelection->Enable();
-		}
-		break;
-	case ID_ENTRY_REMOVE:
-		{		
-			itCurEntry = tempEntries.erase(itCurEntry);
-			
-			if (itCurEntry != tempEntries.begin())
-			{
-				--itCurEntry;
-				currentItem--;
-			}
-			else
-			{
-				EntrySelection->SetValue(EntrySelection->GetValue() - 1);
-			}
-			
-			EntrySelection->SetRange(EntrySelection->GetMin(), EntrySelection->GetMax() - 1);			
-			UpdateEntryCtrls(*itCurEntry);
-
-			if ((int)tempEntries.size() <= 1)
-			{
-				EntryRemove->Disable();
-				EntrySelection->Disable();
-			}
-		}
-		break;
-	}
-}
-
-void CPatchAddEdit::UpdateEntryCtrls(PatchEngine::PatchEntry pE)
-{
-	sbEntry->GetStaticBox()->SetLabel(wxString::Format(_("Entry %d/%d"), currentItem,
-									  (int)tempEntries.size()));
-	EditPatchOffset->SetValue(wxString::Format(wxT("%08X"), pE.address));
-	EditPatchType->SetSelection(pE.type);
-	EditPatchValue->SetValue(wxString::Format(wxT("%0*X"),
-		PatchEngine::GetPatchTypeCharLength(pE.type), pE.value));
-}
-
-bool CPatchAddEdit::UpdateTempEntryData(std::vector<PatchEngine::PatchEntry>::iterator iterEntry)
-{
-	unsigned long value;
-	bool parsed_ok = true;
-
-	if (EditPatchOffset->GetValue().ToULong(&value, 16))
-		(*iterEntry).address = value;
-	else
-		parsed_ok = false;
-
-	PatchEngine::PatchType tempType = 
-	(*iterEntry).type = (PatchEngine::PatchType)EditPatchType->GetSelection();
-
-	if (EditPatchValue->GetValue().ToULong(&value, 16))
-	{
-		(*iterEntry).value = value;
-		if (tempType == PatchEngine::PATCH_8BIT && value > 0xff)
-			parsed_ok = false;
-		else if (tempType == PatchEngine::PATCH_16BIT && value > 0xffff)
-			parsed_ok = false;
-	}
-	else
-	{
-		parsed_ok = false;
-	}
-
-	if (!parsed_ok)
-	{
-		PanicAlertT("Unable to create patch from given values.\nEntry not modified.");
-	}
-
-	return parsed_ok;
-}
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.h b/Source/Core/DolphinWX/Src/PatchAddEdit.h
deleted file mode 100644
index cb64c40c67..0000000000
--- a/Source/Core/DolphinWX/Src/PatchAddEdit.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __PATCH_ADDEDIT_h__
-#define __PATCH_ADDEDIT_h__
-
-#include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include "ISOProperties.h"
-
-class CPatchAddEdit : public wxDialog
-{
-	public:
-		CPatchAddEdit(int _selection, wxWindow* parent,
-			wxWindowID id = 1,
-			const wxString& title = _("Edit Patch"),
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			long style = wxDEFAULT_DIALOG_STYLE);
-		virtual ~CPatchAddEdit();
-
-	private:
-		DECLARE_EVENT_TABLE();
-
-		wxTextCtrl *EditPatchName;
-		wxTextCtrl *EditPatchOffset;
-		wxRadioBox *EditPatchType;
-		wxTextCtrl *EditPatchValue;
-		wxSpinButton *EntrySelection;
-		wxButton *EntryRemove;
-		wxStaticBoxSizer* sbEntry;
-
-		enum {
-			ID_EDITPATCH_NAME_TEXT = 4500,
-			ID_EDITPATCH_NAME,
-			ID_EDITPATCH_OFFSET_TEXT,
-			ID_EDITPATCH_OFFSET,
-			ID_ENTRY_SELECT,
-			ID_EDITPATCH_TYPE,
-			ID_EDITPATCH_VALUE_TEXT,
-			ID_EDITPATCH_VALUE,
-			ID_ENTRY_ADD,
-			ID_ENTRY_REMOVE
-		};
-
-		void CreateGUIControls(int selection);
-		void ChangeEntry(wxSpinEvent& event);
-		void SavePatchData(wxCommandEvent& event);
-		void AddRemoveEntry(wxCommandEvent& event);
-		void UpdateEntryCtrls(PatchEngine::PatchEntry pE);
-		bool UpdateTempEntryData(std::vector<PatchEngine::PatchEntry>::iterator iterEntry);
-
-		int selection, currentItem;
-		std::vector<PatchEngine::PatchEntry> tempEntries;
-		std::vector<PatchEngine::PatchEntry>::iterator itCurEntry;
-
-};
-#endif // __PATCH_ADDEDIT_h__
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
deleted file mode 100644
index 2bae92287b..0000000000
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ /dev/null
@@ -1,1141 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "TASInputDlg.h"
-#include "Movie.h"
-
-BEGIN_EVENT_TABLE(TASInputDlg, wxDialog)
-
-EVT_SLIDER(ID_MAIN_X_SLIDER, TASInputDlg::UpdateFromSliders)
-EVT_SLIDER(ID_MAIN_Y_SLIDER, TASInputDlg::UpdateFromSliders)
-EVT_SLIDER(ID_C_X_SLIDER, TASInputDlg::UpdateFromSliders)
-EVT_SLIDER(ID_C_Y_SLIDER, TASInputDlg::UpdateFromSliders)
-EVT_SLIDER(ID_L_SLIDER, TASInputDlg::UpdateFromSliders)
-EVT_SLIDER(ID_R_SLIDER, TASInputDlg::UpdateFromSliders)
-
-EVT_TEXT(ID_MAIN_X_TEXT, TASInputDlg::UpdateFromText)
-EVT_TEXT(ID_MAIN_Y_TEXT, TASInputDlg::UpdateFromText)
-EVT_TEXT(ID_C_X_TEXT, TASInputDlg::UpdateFromText)
-EVT_TEXT(ID_C_Y_TEXT, TASInputDlg::UpdateFromText)
-EVT_TEXT(ID_L_TEXT, TASInputDlg::UpdateFromText)
-EVT_TEXT(ID_R_TEXT, TASInputDlg::UpdateFromText)
-
-EVT_CLOSE(TASInputDlg::OnCloseWindow)
-
-END_EVENT_TABLE()
-
-TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
-		const wxPoint &position, const wxSize& size, long style)
-: wxDialog(parent, id, title, position, size, style)
-{
-	A_turbo = B_turbo = X_turbo = Y_turbo = Z_turbo = L_turbo = R_turbo = START_turbo = DL_turbo = DR_turbo = DD_turbo = DU_turbo = false;
-	xaxis = yaxis = c_xaxis = c_yaxis = 128;
-	A_cont = B_cont = X_cont = Y_cont = Z_cont = L_cont = L_button_cont = R_cont = R_button_cont = START_cont = DL_cont = DR_cont = DD_cont = DU_cont = mstickx = msticky = cstickx = csticky = false;
-	
-	wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
-	wxStaticBoxSizer* const main_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Main Stick"));
-	wxBoxSizer* const main_xslider_box = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer* const main_yslider_box = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer* const main_stick_box = new wxBoxSizer(wxVERTICAL);
-
-	static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
-	static_bitmap_main->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this);
-	static_bitmap_main->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this);
-	static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
-	wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
-	wx_mainX_s->SetMinSize(wxSize(120,-1));
-	wx_mainX_t = new wxTextCtrl(this, ID_MAIN_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20));
-	wx_mainX_t->SetMaxLength(3);
-	wx_mainY_s = new wxSlider(this, ID_MAIN_Y_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE);
-	wx_mainY_s->SetMinSize(wxSize(-1,120));
-	wx_mainY_t = new wxTextCtrl(this, ID_MAIN_Y_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20));
-	wx_mainY_t->SetMaxLength(3);
-
-	main_xslider_box->Add(wx_mainX_s, 0, wxALIGN_TOP);
-	main_xslider_box->Add(wx_mainX_t, 0, wxALIGN_TOP);
-	main_stick_box->Add(main_xslider_box);
-	main_stick_box->Add(static_bitmap_main, 0, wxALL|wxCENTER, 3);
-	main_box->Add(main_stick_box);
-	main_yslider_box->Add(wx_mainY_s, 0, wxALIGN_CENTER_VERTICAL);
-	main_yslider_box->Add(wx_mainY_t, 0, wxALIGN_CENTER_VERTICAL);
-	main_box->Add(main_yslider_box);
-
-	wxStaticBoxSizer* const c_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("C Stick"));
-	wxBoxSizer* const c_xslider_box = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer* const c_yslider_box = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer* const c_stick_box = new wxBoxSizer(wxVERTICAL);
-	
-	static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
-	static_bitmap_c->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this);
-	static_bitmap_c->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this);
-	static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
-	wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
-	wx_cX_s->SetMinSize(wxSize(120,-1));
-	wx_cX_t = new wxTextCtrl(this, ID_C_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20));
-	wx_cX_t->SetMaxLength(3);
-	wx_cY_s = new wxSlider(this, ID_C_Y_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE);
-	wx_cY_s->SetMinSize(wxSize(-1,120));
-	wx_cY_t = new wxTextCtrl(this, ID_C_Y_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20));
-	wx_cY_t->SetMaxLength(3);
-
-	c_xslider_box->Add(wx_cX_s, 0, wxALIGN_TOP);
-	c_xslider_box->Add(wx_cX_t, 0, wxALIGN_TOP);
-	c_stick_box->Add(c_xslider_box);
-	c_stick_box->Add(static_bitmap_c,0, wxALL|wxCenter,3);
-	c_box->Add(c_stick_box);
-	c_yslider_box->Add(wx_cY_s, 0, wxALIGN_CENTER_VERTICAL);
-	c_yslider_box->Add(wx_cY_t, 0, wxALIGN_CENTER_VERTICAL);
-	c_box->Add(c_yslider_box);
-
-	wxStaticBoxSizer* const shoulder_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons"));
-	
-	wx_l_s = new wxSlider(this, ID_L_SLIDER, 0, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE);
-	wx_l_s->SetMinSize(wxSize(-1,100));
-	wx_l_t = new wxTextCtrl(this, ID_L_TEXT, wxT("0"), wxDefaultPosition, wxSize(40, 20));
-	wx_l_t->SetMaxLength(3);
-	wx_r_s = new wxSlider(this, ID_R_SLIDER, 0, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL | wxSL_INVERSE);
-	wx_r_s->SetMinSize(wxSize(-1,100));
-	wx_r_t = new wxTextCtrl(this, ID_R_TEXT, wxT("0"), wxDefaultPosition, wxSize(40, 20));
-	wx_r_t->SetMaxLength(3);
-	
-	shoulder_box->Add(wx_l_s, 0, wxALIGN_CENTER_VERTICAL);
-	shoulder_box->Add(wx_l_t, 0, wxALIGN_CENTER_VERTICAL);
-	shoulder_box->Add(wx_r_s, 0, wxALIGN_CENTER_VERTICAL);
-	shoulder_box->Add(wx_r_t, 0, wxALIGN_CENTER_VERTICAL);
-
-	wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
-	wxGridSizer* const buttons_grid = new wxGridSizer(4);
-	
-	wx_a_button = new wxCheckBox(this,ID_A,_T("A"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_a_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_a_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_b_button = new wxCheckBox(this,ID_B,_T("B"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_b_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_b_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_x_button = new wxCheckBox(this,ID_X,_T("X"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_x_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_x_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_y_button = new wxCheckBox(this,ID_Y,_T("Y"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_y_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_y_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_l_button = new wxCheckBox(this,ID_L,_T("L"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_l_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_l_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_r_button = new wxCheckBox(this,ID_R,_T("R"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_r_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_r_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_z_button = new wxCheckBox(this,ID_Z,_T("Z"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_z_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_z_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_start_button = new wxCheckBox(this,ID_START,_T("Start"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_start_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_start_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	
-	buttons_grid->Add(wx_a_button,false);
-	buttons_grid->Add(wx_b_button,false);
-	buttons_grid->Add(wx_x_button,false);
-	buttons_grid->Add(wx_y_button,false);
-	buttons_grid->Add(wx_l_button,false);
-	buttons_grid->Add(wx_r_button,false);
-	buttons_grid->Add(wx_z_button,false);
-	buttons_grid->Add(wx_start_button,false);
-	buttons_grid->AddSpacer(5);
-
-	wxGridSizer* const buttons_dpad = new wxGridSizer(3);
-	
-	wx_up_button = new wxCheckBox(this,ID_UP,_T("Up"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_up_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_up_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_right_button = new wxCheckBox(this,ID_RIGHT,_T("Right"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_right_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_right_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_down_button = new wxCheckBox(this,ID_DOWN,_T("Down"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_down_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_down_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	wx_left_button = new wxCheckBox(this,ID_LEFT,_T("Left"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr);
-	wx_left_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
-	wx_left_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this);
-	
-	buttons_dpad->AddSpacer(20);
-	buttons_dpad->Add(wx_up_button,false);
-	buttons_dpad->AddSpacer(20);
-	buttons_dpad->Add(wx_left_button,false);
-	buttons_dpad->AddSpacer(20);
-	buttons_dpad->Add(wx_right_button,false);
-	buttons_dpad->AddSpacer(20);
-	buttons_dpad->Add(wx_down_button,false);
-	buttons_dpad->AddSpacer(20);
-	buttons_box->Add(buttons_grid);
-	buttons_box->Add(buttons_dpad);
-
-	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
-
-	top_box->AddSpacer(5);
-	top_box->Add(main_box);
-	top_box->AddSpacer(5);
-	top_box->Add(c_box);
-	top_box->AddSpacer(5);
-	bottom_box->AddSpacer(5);
-	bottom_box->Add(shoulder_box);
-	bottom_box->AddSpacer(5);
-	bottom_box->Add(buttons_box);
-	bottom_box->AddSpacer(5);
-	main_szr->Add(top_box);
-	main_szr->Add(bottom_box);
-	SetSizerAndFit(main_szr);
-	ResetValues();
-}
-
-void TASInputDlg::ResetValues()
-{
-	mainX = mainY = cX = cY = 128;
-	lTrig = rTrig = 0;
-	
-	wx_mainX_s->SetValue(128);
-	wx_mainY_s->SetValue(128);
-	wx_cX_s->SetValue(128);
-	wx_cY_s->SetValue(128);
-	wx_l_s->SetValue(0);
-	wx_r_s->SetValue(0);
-	
-	wx_mainX_t->SetValue(wxT("128"));
-	wx_mainY_t->SetValue(wxT("128"));
-	wx_cX_t->SetValue(wxT("128"));
-	wx_cY_t->SetValue(wxT("128"));
-	wx_l_t->SetValue(wxT("0"));
-	wx_r_t->SetValue(wxT("0"));
-	
-	wx_up_button->SetValue(false);
-	wx_down_button->SetValue(false);
-	wx_left_button->SetValue(false);
-	wx_right_button->SetValue(false);
-	wx_a_button->SetValue(false);
-	wx_b_button->SetValue(false);
-	wx_x_button->SetValue(false);
-	wx_y_button->SetValue(false);
-	wx_l_button->SetValue(false);
-	wx_r_button->SetValue(false);
-	wx_z_button->SetValue(false);
-	wx_start_button->SetValue(false);
-}
-
-void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
-{
-	if(PadStatus->stickX != 128)
-	{
-		mainX = PadStatus->stickX;
-		mstickx = true;
-		wx_mainX_t->SetValue(wxString::Format(wxT("%i"), mainX));
-	}
-	
-	else if(mstickx)
-	{
-		mstickx = false;
-		mainX = 128;
-		wx_mainX_t->SetValue(wxString::Format(wxT("%i"), mainX));
-	}
-
-	if(PadStatus->stickY != 128)
-	{
-		mainY = PadStatus->stickY;
-		msticky = true;
-		wx_mainY_t->SetValue(wxString::Format(wxT("%i"),mainY));
-	}
-	else if(msticky)
-	{
-		msticky = false;
-		mainY = 128;
-		wx_mainY_t->SetValue(wxString::Format(wxT("%i"), mainY));
-	}
-
-	if(PadStatus->substickX != 128)
-	{
-		cX = PadStatus->substickX;
-		cstickx = true;
-		wx_cX_t->SetValue(wxString::Format(wxT("%i"), cX));
-	}
-	else if(cstickx)
-	{
-		cstickx = false;
-		cX = 128;
-		wx_cX_t->SetValue(wxString::Format(wxT("%i"), cX));
-	}
-
-	if(PadStatus->substickY != 128)
-	{
-		cY = PadStatus->substickY;
-		csticky = true;
-		wx_cY_t->SetValue(wxString::Format(wxT("%i"), cY));
-	}
-	else if(csticky)
-	{
-		csticky = false;
-		cY = 128;
-		wx_cY_t->SetValue(wxString::Format(wxT("%i"), cY));
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_UP) != 0))
-	{
-		wx_up_button->SetValue(true);
-		DU_cont = true;
-	}
-	else if(DU_cont)
-	{
-		wx_up_button->SetValue(false);
-		DU_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_DOWN) != 0))
-	{
-		wx_down_button->SetValue(true);
-		DD_cont = true;
-	}
-	else if(DD_cont)
-	{
-		wx_down_button->SetValue(false);
-		DD_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_LEFT) != 0))
-	{
-		wx_left_button->SetValue(true);
-		DL_cont = true;
-	}
-	else if(DL_cont)
-	{
-		wx_left_button->SetValue(false);
-		DL_cont = false;
-	}
-	
-	if(((PadStatus->button & PAD_BUTTON_RIGHT) != 0))
-	{
-		wx_right_button->SetValue(true);
-		DR_cont = true;
-	}
-	else if(DR_cont)
-	{
-		wx_right_button->SetValue(false);
-		DR_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_A) != 0))
-	{
-		wx_a_button->SetValue(true);
-		A_cont = true;
-	}
-	else if(A_cont)
-	{
-		wx_a_button->SetValue(false);
-		A_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_B) != 0))
-	{
-		wx_b_button->SetValue(true);
-		B_cont = true;
-	}
-	else if(B_cont)
-	{
-		wx_b_button->SetValue(false);
-		B_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_X) != 0))
-	{
-		wx_x_button->SetValue(true);
-		X_cont = true;
-	}
-	else if(X_cont)
-	{
-		wx_x_button->SetValue(false);
-		X_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_BUTTON_Y) != 0))
-	{
-		wx_y_button->SetValue(true);
-		Y_cont = true;
-	}
-	else if(Y_cont)
-	{
-		wx_y_button->SetValue(false);
-		Y_cont = false;
-	}
-
-	if(((PadStatus->triggerLeft) != 0))
-	{
-		if (PadStatus->triggerLeft == 255)
-		{
-			wx_l_button->SetValue(true);
-			L_button_cont = true;
-		}
-		else if (L_button_cont)
-		{
-			wx_l_button->SetValue(false);
-			L_button_cont = false;
-		}
-
-		wx_l_s->SetValue(PadStatus->triggerLeft);
-		wx_l_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerLeft));
-		L_cont = true;
-	}
-	else if(L_cont)
-	{
-		wx_l_button->SetValue(false);
-		wx_l_s->SetValue(0);
-		wx_l_t->SetValue(wxT("0"));
-		L_cont = false;
-	}
-	
-	if(((PadStatus->triggerRight) != 0))
-	{
-		if (PadStatus->triggerRight == 255)
-		{
-			wx_r_button->SetValue(true);
-			R_button_cont = true;
-		}
-		else if (R_button_cont)
-		{
-			wx_r_button->SetValue(false);
-			R_button_cont = false;
-		}
-
-		wx_r_s->SetValue(PadStatus->triggerRight);
-		wx_r_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerRight));
-		R_cont = true;
-	}
-	else if(R_cont)
-	{
-		wx_r_button->SetValue(false);
-		wx_r_s->SetValue(0);
-		wx_r_t->SetValue(wxT("0"));
-		R_cont = false;
-	}
-
-	if(((PadStatus->button & PAD_TRIGGER_Z) != 0))
-	{
-		wx_z_button->SetValue(true);
-		Z_cont = true;
-	}
-	else if(Z_cont)
-	{
-		wx_z_button->SetValue(false);
-		Z_cont = false;
-	}
-	
-	if(((PadStatus->button & PAD_BUTTON_START) != 0))
-	{
-		wx_start_button->SetValue(true);
-		START_cont = true;
-	}
-	else if(START_cont)
-	{
-		wx_start_button->SetValue(false);
-		START_cont = false;
-	}
-}
-
-void TASInputDlg::SetLandRTriggers()
-{
-	if (wx_l_button->GetValue())
-		lTrig = 255;
-	else
-		lTrig = wx_l_s->GetValue();
-
-	if (wx_r_button->GetValue())
-		rTrig = 255;
-	else
-		rTrig = wx_r_s->GetValue();
-}
-
-void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
-{
-	if (!IsShown())
-		return;
-	
-	//TODO:: Make this instant not when polled.
-	GetKeyBoardInput(PadStatus);
-	SetLandRTriggers();
-
-	PadStatus->stickX = mainX;
-	PadStatus->stickY = mainY;
-	PadStatus->substickX = cX;
-	PadStatus->substickY = cY;
-	PadStatus->triggerLeft = lTrig;
-	PadStatus->triggerRight = rTrig;
-
-	if(wx_up_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_UP;
-	else
-		PadStatus->button &= ~PAD_BUTTON_UP;
-
-	if(wx_down_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_DOWN;
-	else
-		PadStatus->button &= ~PAD_BUTTON_DOWN;
-
-	if(wx_left_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_LEFT;
-	else
-		PadStatus->button &= ~PAD_BUTTON_LEFT;
-
-	if(wx_right_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_RIGHT;
-	else
-		PadStatus->button &= ~PAD_BUTTON_RIGHT;
-	
-	if(wx_a_button->IsChecked())
-	{
-		PadStatus->button |= PAD_BUTTON_A;
-		PadStatus->analogA = 0xFF;
-	}
-	else
-	{
-		PadStatus->button &= ~PAD_BUTTON_A;
-		PadStatus->analogA = 0x00;
-	}
-
-	if(wx_b_button->IsChecked())
-	{
-		PadStatus->button |= PAD_BUTTON_B;
-		PadStatus->analogB = 0xFF;
-	}
-	else
-	{
-		PadStatus->button &= ~PAD_BUTTON_B;
-		PadStatus->analogB = 0x00;
-	}
-
-	if(wx_x_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_X;
-	else
-		PadStatus->button &= ~PAD_BUTTON_X;
-
-	if(wx_y_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_Y;
-	else
-		PadStatus->button &= ~PAD_BUTTON_Y;
-
-	if(wx_z_button->IsChecked())
-		PadStatus->button |= PAD_TRIGGER_Z;
-	else
-		PadStatus->button &= ~PAD_TRIGGER_Z;
-
-	if(wx_start_button->IsChecked())
-		PadStatus->button |= PAD_BUTTON_START;
-	else
-		PadStatus->button &= ~PAD_BUTTON_START;
-
-	if(wx_r_button->IsChecked() || rTrig >= 255)
-		PadStatus->button |= PAD_TRIGGER_R;
-	else
-		PadStatus->button &= ~PAD_TRIGGER_R;
-
-	if(wx_l_button->IsChecked() || lTrig >= 255)
-		PadStatus->button |= PAD_TRIGGER_L;
-	else
-		PadStatus->button &= ~PAD_TRIGGER_L;
-	
-	ButtonTurbo();
-}
-
-void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
-{
-	wxTextCtrl *text;
-	u8 *v;
-	update = 0;
-
-	switch(event.GetId())
-	{
-		case ID_MAIN_X_SLIDER:
-			text = wx_mainX_t;
-			v = &mainX;
-			xaxis =((wxSlider *) event.GetEventObject())->GetValue();
-			update = 1;
-			break;
-
-		case ID_MAIN_Y_SLIDER:
-			text = wx_mainY_t;
-			v = &mainY;
-			yaxis = 256 - ((wxSlider *) event.GetEventObject())->GetValue();
-			update = 1;
-			break;
-
-		case ID_C_X_SLIDER:
-			text = wx_cX_t;
-			v = &cX;
-			c_xaxis = ((wxSlider *) event.GetEventObject())->GetValue();
-			update = 2;
-			break;
-
-		case ID_C_Y_SLIDER:
-			text = wx_cY_t;
-			v = &cY;
-			c_yaxis = 256 -((wxSlider *) event.GetEventObject())->GetValue();
-			update = 2;
-			break;
-
-		case ID_L_SLIDER:
-			text = wx_l_t;
-			v = &lTrig;
-			break;
-
-		case ID_R_SLIDER:
-			text = wx_r_t;
-			v = &rTrig;
-			break;
-
-		default:
-			return;
-	}
-
-	int value = ((wxSlider *) event.GetEventObject())->GetValue();
-	*v = (u8) value;
-	text->SetValue(wxString::Format(wxT("%i"), value));
-	
-	if(update == 1)
-	{
-		static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis, yaxis));
-	}
-	
-	if(update == 2)
-	{
-		static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis, c_yaxis));
-	}
-}
-
-void TASInputDlg::UpdateFromText(wxCommandEvent& event)
-{
-	wxSlider *slider;
-	u8 *v;
-	update = 0;
-	update_axis = 0;
-	
-	switch(event.GetId())
-	{
-		case ID_MAIN_X_TEXT:
-			slider = wx_mainX_s;
-			v = &mainX;
-			update = 1;
-			update_axis = 1;
-			break;
-
-		case ID_MAIN_Y_TEXT:
-			slider = wx_mainY_s;
-			v = &mainY;
-			update = 1;
-			update_axis = 2;
-			break;
-
-		case ID_C_X_TEXT:
-			slider = wx_cX_s;
-			v = &cX;
-			update = 2;
-			update_axis = 1;
-			break;
-
-		case ID_C_Y_TEXT:
-			slider = wx_cY_s;
-			v = &cY;
-			update = 2; 
-			update_axis = 2;
-			break;
-
-		case ID_L_TEXT:
-			slider = wx_l_s;
-			v = &lTrig;
-			break;
-
-		case ID_R_TEXT:
-			slider = wx_r_s;
-			v = &rTrig;
-			break;
-
-		default:
-			return;
-	}
-	unsigned long value;
-
-	if (((wxTextCtrl *) event.GetEventObject())->GetValue().ToULong(&value))
-	{
-		*v = (u8) (value > 255 ? 255 : value);
-		slider->SetValue(*v);
-	
-		if(update == 1)
-			{
-				if(update_axis == 1)
-				{
-					xaxis = *v;
-					static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
-				}
-			
-				if(update_axis == 2)
-				{
-					yaxis =256 - *v;
-					static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
-				}
-			
-			}
-
-		if(update == 2)
-		{
-			if(update_axis == 1)
-			{
-				c_xaxis = *v;
-				static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis,c_yaxis));
-			}
-			
-			if(update_axis == 2)
-			{
-				c_yaxis =256- *v;
-				static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis,c_yaxis));
-			}
-	
-		}
-	}
-}
-
-void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
-{
-	if (event.CanVeto())
-	{
-		event.Skip(false);
-		this->Show(false);
-		ResetValues();
-	}
-}
-
-bool TASInputDlg::TASHasFocus()
-{	
-	//allows numbers to be used as hotkeys
-	if(TextBoxHasFocus())
-		return false;
-
-	if (wxWindow::FindFocus() == this)
-		return true;
-	else if (wxWindow::FindFocus() != NULL &&
-				wxWindow::FindFocus()->GetParent() == this)
-		return true;
-	else
-		return false;
-}
-
-bool TASInputDlg::TextBoxHasFocus()
-{
-	if(wxWindow::FindFocus() == wx_mainX_t)
-		return true;
-
-	if(wxWindow::FindFocus() == wx_mainY_t)
-		return true;
-
-	if(wxWindow::FindFocus() == wx_cX_t)
-		return true;
-
-	if(wxWindow::FindFocus() == wx_cY_t)
-		return true;
-
-	if(wxWindow::FindFocus() == wx_l_t)
-		return true;
-
-	if(wxWindow::FindFocus() == wx_r_t)
-		return true;
-
-	return false;
-}
-
-void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
-{
-	wxSlider *sliderX,*sliderY;
-	wxStaticBitmap *sbitmap;
-	wxTextCtrl *textX, *textY;
-	int *x,*y;
-
-	switch(event.GetId())
-	{
-		case ID_MAIN_STICK:
-			sliderX = wx_mainX_s;
-			sliderY = wx_mainY_s;
-			textX = wx_mainX_t;
-			textY = wx_mainY_t;
-			sbitmap = static_bitmap_main;
-			x = &xaxis;
-			y = &yaxis;
-			break;
-
-		case ID_C_STICK:
-			sliderX = wx_cX_s;
-			sliderY = wx_cY_s;
-			textX = wx_cX_t;
-			textY = wx_cY_t;
-			sbitmap = static_bitmap_c;
-			x = &c_xaxis;
-			y = &c_yaxis;
-			break;
-
-		default:
-			return;
-	}
-
-	*x = 128;
-	*y = 128;
-
-	sbitmap->SetBitmap(TASInputDlg::CreateStickBitmap(*x,*y));
-	
-	textX->SetValue(wxString::Format(wxT("%i"), *x));
-	textY->SetValue(wxString::Format(wxT("%i"), 256 - *y));
-	
-	sliderX->SetValue(*x);
-	sliderY->SetValue(256 - *y);
-	event.Skip(true);
-
-}
-
-void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
-{
-	if (event.GetEventType() == wxEVT_MOTION && !event.LeftIsDown())
-		return;
-
-	wxSlider *sliderX,*sliderY;
-	wxStaticBitmap *sbitmap;
-	wxTextCtrl *textX, *textY;
-	int *x,*y;
-
-	switch(event.GetId())
-	{
-		case ID_MAIN_STICK:
-			sliderX = wx_mainX_s;
-			sliderY = wx_mainY_s;
-			textX = wx_mainX_t;
-			textY = wx_mainY_t;
-			sbitmap = static_bitmap_main;
-			x = &xaxis;
-			y = &yaxis;
-			break;
-
-		case ID_C_STICK:
-			sliderX = wx_cX_s;
-			sliderY = wx_cY_s;
-			textX = wx_cX_t;
-			textY = wx_cY_t;
-			sbitmap = static_bitmap_c;
-			x = &c_xaxis;
-			y = &c_yaxis;
-			break;
-
-		default:
-			return;
-	}
-
-	wxPoint ptM(event.GetPosition()); 
-	*x = ptM.x *2;
-	*y = ptM.y * 2;
-
-	if(*x > 255)
-		*x = 255;
-	
-	if(*y > 255)
-		*y = 255;
-
-	sbitmap->SetBitmap(TASInputDlg::CreateStickBitmap(*x,*y));
-	
-	textX->SetValue(wxString::Format(wxT("%i"), *x));
-	textY->SetValue(wxString::Format(wxT("%i"), 256 - *y));
-	
-	sliderX->SetValue(*x);
-	sliderY->SetValue(256 - *y);
-	event.Skip(true);
-}
-
-void TASInputDlg::SetTurboFalse(wxMouseEvent& event)
-{
-	switch(event.GetId())
-	{
-		case ID_A:
-				A_turbo = false;
-			break;
-
-		case ID_B:
-				B_turbo = false;
-			break;
-
-		case ID_X:
-				X_turbo = false;
-			break;
-
-		case ID_Y:
-				Y_turbo = false;
-			break;
-
-		case ID_Z:
-				Z_turbo = false;
-			break;
-
-		case ID_L:
-				L_turbo = false;
-			break;
-
-		case ID_R:
-				R_turbo = false;
-			break;
-
-		case ID_START:
-				START_turbo = false;
-			break;
-
-		case ID_UP:
-				DU_turbo = false;
-			break;
-
-		case ID_DOWN:
-				DD_turbo = false;
-			break;
-
-		case ID_LEFT:
-				DL_turbo = false;
-			break;
-
-		case ID_RIGHT:
-				DR_turbo = false;
-			break;
-
-		default:
-			return;
-	}
-
-	event.Skip(true);
-}
-
-void TASInputDlg::SetTurbo(wxMouseEvent& event)
-{
-	wxCheckBox* placeholder;
-
-	switch(event.GetId())
-	{
-		case ID_A:
-			placeholder = wx_a_button;
-			
-			if(A_turbo)
-				A_turbo = false;
-			else
-				A_turbo = true;
-			break;
-
-		case ID_B:
-			placeholder = wx_b_button;
-			if(B_turbo)
-				B_turbo = false;
-			else
-				B_turbo = true;
-			break;
-
-		case ID_X:
-			placeholder = wx_x_button;
-			if(X_turbo)
-				X_turbo = false;
-			else
-				X_turbo = true;
-			break;
-
-		case ID_Y:
-			placeholder = wx_y_button;
-			if(Y_turbo)
-				Y_turbo = false;
-			else
-				Y_turbo = true;
-			break;
-
-		case ID_Z:
-			placeholder = wx_z_button;
-			if(Z_turbo)
-				Z_turbo = false;
-			else
-				Z_turbo = true;
-			break;
-
-		case ID_L:
-			placeholder = wx_l_button;
-			if(L_turbo)
-				L_turbo = false;
-			else
-				L_turbo = true;
-			break;
-
-		case ID_R:
-			placeholder = wx_r_button;
-			if(R_turbo)
-				R_turbo = false;
-			else
-				R_turbo = true;
-			break;
-
-		case ID_START:
-			placeholder = wx_start_button;
-			if(START_turbo)
-				START_turbo = false;
-			else
-				START_turbo = true;
-			break;
-
-		case ID_UP:
-			placeholder = wx_start_button;
-			if(DU_turbo)
-				DU_turbo = false;
-			else
-				DU_turbo = true;
-			break;
-
-		case ID_DOWN:
-			placeholder = wx_start_button;
-			if(DD_turbo)
-				DD_turbo = false;
-			else
-				DD_turbo = true;
-			break;
-
-		case ID_LEFT:
-			placeholder = wx_left_button;
-			if(DL_turbo)
-				DL_turbo = false;
-			else
-				DL_turbo = true;
-			break;
-
-		case ID_RIGHT:
-			placeholder = wx_right_button;
-			if(DR_turbo)
-				DR_turbo = false;
-			else
-				DR_turbo = true;
-			break;
-		default:
-			return;
-	}
-	placeholder->SetValue(true);
-}
-
-void TASInputDlg::ButtonTurbo()
-{
-	if(A_turbo)
-	{
-		if(wx_a_button->GetValue())
-			wx_a_button->SetValue(false);
-		else
-			wx_a_button->SetValue(true);
-	}
-
-	if(B_turbo)
-	{
-		if(wx_b_button->GetValue())
-			wx_b_button->SetValue(false);
-		else
-			wx_b_button->SetValue(true);
-	}
-
-	if(X_turbo)
-	{
-		if(wx_x_button->GetValue())
-			wx_x_button->SetValue(false);
-		else
-			wx_x_button->SetValue(true);
-	}
-
-	if(Y_turbo)
-	{
-		if(wx_y_button->GetValue())
-			wx_y_button->SetValue(false);
-		else
-			wx_y_button->SetValue(true);
-	}
-
-	if(Z_turbo)
-	{
-		if(wx_z_button->GetValue())
-			wx_z_button->SetValue(false);
-		else
-			wx_z_button->SetValue(true);
-	}
-
-	if(L_turbo)
-	{
-		if(wx_l_button->GetValue())
-			wx_l_button->SetValue(false);
-		else
-			wx_l_button->SetValue(true);
-	}
-
-	if(R_turbo)
-	{
-		if(wx_r_button->GetValue())
-			wx_r_button->SetValue(false);
-		else
-			wx_r_button->SetValue(true);
-	}
-
-	if(START_turbo)
-	{
-		if(wx_start_button->GetValue())
-			wx_start_button->SetValue(false);
-		else
-			wx_start_button->SetValue(true);
-		}
-
-	if(DU_turbo)
-	{
-		if(wx_up_button->GetValue())
-			wx_up_button->SetValue(false);
-		else
-			wx_up_button->SetValue(true);
-	}
-
-	if(DD_turbo)
-	{
-		if(wx_down_button->GetValue())
-			wx_down_button->SetValue(false);
-		else
-			wx_down_button->SetValue(true);
-	}
-
-	if(DL_turbo)
-	{
-		if(wx_left_button->GetValue())
-			wx_left_button->SetValue(false);
-		else
-			wx_left_button->SetValue(true);
-	}
-
-	if(DR_turbo)
-	{
-		if(wx_right_button->GetValue())
-			wx_right_button->SetValue(false);
-		else
-			wx_right_button->SetValue(true);
-	}
-}
-
-wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
-{
-	x = x/2;
-	y = y/2;
-
-	wxMemoryDC memDC;
-	wxBitmap stick_bitmap(127, 127);
-	memDC.SelectObject(stick_bitmap);
-	memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
-	memDC.Clear();
-	memDC.SetBrush(*wxWHITE_BRUSH);
-	memDC.DrawCircle(65,65,64);
-	memDC.SetBrush(*wxRED_BRUSH);
-	memDC.DrawLine(64,64,x,y);
-	memDC.DrawLine(63,64,x-1,y);
-	memDC.DrawLine(65,64,x+1,y);
-	memDC.DrawLine(64,63,x,y-1);
-	memDC.DrawLine(64,65,x,y+1);
-	memDC.SetPen(*wxBLACK_PEN);
-	memDC.CrossHair(64,64);
-	memDC.SetBrush(*wxBLUE_BRUSH);
-	memDC.DrawCircle(x,y,5);
-	memDC.SelectObject(wxNullBitmap);
-	return stick_bitmap;
-}
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
deleted file mode 100644
index 70f2db92a1..0000000000
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __TASINPUT_H__
-#define __TASINPUT_H__
-
-#include <wx/wx.h>
-
-#include "Common.h"
-#include "CoreParameter.h"
-#include "../../InputCommon/Src/GCPadStatus.h"
-
-class TASInputDlg : public wxDialog
-{
-	public:
-		TASInputDlg(wxWindow *parent,
-				wxWindowID id = 1,
-				const wxString &title = _("TAS Input"),
-				const wxPoint& pos = wxDefaultPosition,
-				const wxSize& size = wxDefaultSize,
-				long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
-
-		void OnCloseWindow(wxCloseEvent& event);
-		void UpdateFromSliders(wxCommandEvent& event);
-		void UpdateFromText(wxCommandEvent& event);
-		void OnMouseDownL(wxMouseEvent& event);
-		void OnMouseUpR(wxMouseEvent& event);
-		void ResetValues();
-		void GetValues(SPADStatus *PadStatus, int controllerID);
-		void SetTurbo(wxMouseEvent& event);
-		void SetTurboFalse(wxMouseEvent& event);
-		void ButtonTurbo();
-		void GetKeyBoardInput(SPADStatus *PadStatus);
-		bool TextBoxHasFocus();
-		void SetLandRTriggers();
-		bool TASHasFocus();
-
-		wxBitmap CreateStickBitmap(int x, int y);
-
-	private:
-		u8 mainX, mainY, cX, cY, lTrig, rTrig;
-
-		enum
-		{
-			ID_MAIN_X_SLIDER = 1000,
-			ID_MAIN_X_TEXT,
-			ID_MAIN_Y_SLIDER,
-			ID_MAIN_Y_TEXT,
-			ID_C_X_SLIDER,
-			ID_C_X_TEXT,
-			ID_C_Y_SLIDER,
-			ID_C_Y_TEXT,
-			ID_L_SLIDER,
-			ID_L_TEXT,
-			ID_R_SLIDER,
-			ID_R_TEXT,
-			ID_CLOSE,
-			ID_UP,
-			ID_DOWN,
-			ID_LEFT,
-			ID_RIGHT,
-			ID_A,
-			ID_B,
-			ID_X,
-			ID_Y,
-			ID_Z,
-			ID_L,
-			ID_R,
-			ID_START,
-			ID_MAIN_STICK,
-			ID_C_STICK,
-		};
-
-		wxSlider *wx_mainX_s, *wx_mainY_s, *wx_cX_s, *wx_cY_s, *wx_l_s, *wx_r_s;
-		wxCheckBox *wx_up_button, *wx_down_button, *wx_left_button, *wx_right_button, *wx_a_button, *wx_b_button, *wx_x_button, *wx_y_button, *wx_l_button, *wx_r_button, *wx_z_button, *wx_start_button;
-		wxTextCtrl *wx_mainX_t, *wx_mainY_t, *wx_cX_t, *wx_cY_t, *wx_l_t, *wx_r_t;
-		wxMemoryDC dc_main,  dc_c;
-		wxStaticBitmap*	static_bitmap_main, *static_bitmap_c;
-		wxBitmap bitmap;
-		bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo;
-		bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, L_button_cont, R_cont, R_button_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky;
-		int xaxis,yaxis,c_xaxis,c_yaxis,update,update_axis;
-
-		DECLARE_EVENT_TABLE();
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp b/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp
deleted file mode 100644
index 9619f38dee..0000000000
--- a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "UDPConfigDiag.h"
-#include "UDPWrapper.h"
-
-#include "Common.h"
-#include "ControllerEmu.h"
-#include "IniFile.h"
-#include "WxUtils.h"
-
-#include <string>
-
-UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) :
-	wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
-	wrp(_wrp)
-{
-	wxBoxSizer *const outer_sizer = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer *const sizer1 = new wxBoxSizer(wxVERTICAL);
-	wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, _("Update"));
-
-	outer_sizer->Add(sizer1, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 5);
-	outer_sizer->Add(sizer2, 1, wxLEFT | wxRIGHT | wxEXPAND, 10);
-
-	enable = new wxCheckBox(this, wxID_ANY, _("Enable"));
-	butt = new wxCheckBox(this, wxID_ANY, _("Buttons"));
-	accel = new wxCheckBox(this, wxID_ANY, _("Acceleration"));
-	point = new wxCheckBox(this, wxID_ANY, _("IR Pointer"));
-	nun = new wxCheckBox(this, wxID_ANY, _("Nunchuk"));
-	nunaccel = new wxCheckBox(this, wxID_ANY, _("Nunchuk Acceleration"));
-
-	wxBoxSizer *const port_sizer = new wxBoxSizer(wxHORIZONTAL);
-	port_sizer->Add(new wxStaticText(this, wxID_ANY, _("UDP Port:")), 0, wxALIGN_CENTER);
-	port_tbox = new wxTextCtrl(this, wxID_ANY, StrToWxStr(wrp->port));
-	port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND, 5);
-
-	enable->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeState, this);
-	butt->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this);
-	accel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this);
-	point->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this);
-	nun->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this);
-	nunaccel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this);
-	port_tbox->Bind(wxEVT_COMMAND_TEXT_UPDATED, &UDPConfigDiag::ChangeState, this);
-
-	enable->SetValue(wrp->udpEn);
-	butt->SetValue(wrp->updButt);
-	accel->SetValue(wrp->updAccel);
-	point->SetValue(wrp->updIR);
-	nun->SetValue(wrp->updNun);
-	nunaccel->SetValue(wrp->updNunAccel);
-	
-	sizer1->Add(enable, 1, wxALL | wxEXPAND, 5);
-	sizer1->Add(port_sizer, 1, wxBOTTOM | wxLEFT| wxRIGHT | wxEXPAND, 5);
-
-	sizer2->Add(butt, 1, wxALL | wxEXPAND, 5);
-	sizer2->Add(accel, 1, wxALL | wxEXPAND, 5);
-	sizer2->Add(point, 1, wxALL | wxEXPAND, 5);
-	sizer2->Add(nun, 1, wxALL | wxEXPAND, 5);
-	sizer2->Add(nunaccel, 1, wxALL | wxEXPAND, 5);
-
-	outer_sizer->Add(CreateButtonSizer(wxOK), 0, wxALL | wxALIGN_RIGHT, 5);
-
-	SetSizerAndFit(outer_sizer);
-	Center();
-	SetFocus();
-}
-
-void UDPConfigDiag::ChangeUpdateFlags(wxCommandEvent & WXUNUSED(event))
-{
-	wrp->updAccel=accel->GetValue();
-	wrp->updButt=butt->GetValue();
-	wrp->updIR=point->GetValue();
-	wrp->updNun=nun->GetValue();
-	wrp->updNunAccel=nunaccel->GetValue();
-}
-
-void UDPConfigDiag::ChangeState(wxCommandEvent & WXUNUSED(event))
-{
-	wrp->udpEn = enable->GetValue();
-	wrp->port = WxStrToStr(port_tbox->GetValue());
-	wrp->Refresh();
-}
diff --git a/Source/Core/DolphinWX/Src/UDPConfigDiag.h b/Source/Core/DolphinWX/Src/UDPConfigDiag.h
deleted file mode 100644
index 8071e36978..0000000000
--- a/Source/Core/DolphinWX/Src/UDPConfigDiag.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef UDPCONFIGDIAG_H
-#define UDPCONFIGDIAG_H
-
-#include "UDPWrapper.h"
-
-#include <wx/wx.h>
-#include <wx/listbox.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
-class UDPConfigDiag : public wxDialog
-{
-public:
-	UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp);
-private:
-	UDPWrapper * wrp;
-	void ChangeUpdateFlags(wxCommandEvent & event);
-	void ChangeState(wxCommandEvent & event);
-	void OKPressed(wxCommandEvent & event);
-	wxCheckBox * enable;
-	wxCheckBox * butt;
-	wxCheckBox * accel;
-	wxCheckBox * point;
-	wxCheckBox * nun;
-	wxCheckBox * nunaccel;
-	wxTextCtrl * port_tbox;
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
deleted file mode 100644
index 409f94cd0b..0000000000
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ /dev/null
@@ -1,693 +0,0 @@
-#include "VideoConfigDiag.h"
-
-#include "FileUtil.h"
-#include "TextureCacheBase.h"
-#include "Core.h"
-#include "Frame.h"
-
-#include <wx/intl.h>
-
-#ifdef __APPLE__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-extern CFrame* main_frame;
-
-// template instantiation
-template class BoolSetting<wxCheckBox>;
-template class BoolSetting<wxRadioButton>;
-
-template <>
-SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse, long style)
-	: wxCheckBox(parent, -1, label, wxDefaultPosition, wxDefaultSize, style)
-	, m_setting(setting)
-	, m_reverse(reverse)
-{
-	SetToolTip(tooltip);
-	SetValue(m_setting ^ m_reverse);
-	Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &SettingCheckBox::UpdateValue, this);
-}
-
-template <>
-SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse, long style)
-	: wxRadioButton(parent, -1, label, wxDefaultPosition, wxDefaultSize, style)
-	, m_setting(setting)
-	, m_reverse(reverse)
-{
-	SetToolTip(tooltip);
-	SetValue(m_setting ^ m_reverse);
-	Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &SettingRadioButton::UpdateValue, this);
-}
-
-SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num, const wxString choices[], long style)
-	: wxChoice(parent, -1, wxDefaultPosition, wxDefaultSize, num, choices)
-	, m_setting(setting)
-{
-	SetToolTip(tooltip);
-	Select(m_setting);
-	Bind(wxEVT_COMMAND_CHOICE_SELECTED, &SettingChoice::UpdateValue, this);
-}
-
-void SettingChoice::UpdateValue(wxCommandEvent& ev)
-{
-	m_setting = ev.GetInt();
-	ev.Skip();
-}
-
-void VideoConfigDiag::Event_ClickClose(wxCommandEvent&)
-{
-	Close();
-}
-
-void VideoConfigDiag::Event_Close(wxCloseEvent& ev)
-{
-	g_Config.Save((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
-
-	EndModal(wxID_OK);
-}
-
-#if defined(_WIN32)
-wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nDirect3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\nNote that the Direct3D backends are only available on Windows.\n\nIf unsure, use Direct3D 11.");
-#else
-wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nDirect3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\nNote that the Direct3D backends are only available on Windows.\n\nIf unsure, use OpenGL.");
-#endif
-wxString adapter_desc = wxTRANSLATE("Select a hardware adapter to use.\n\nIf unsure, use the first one.");
-wxString display_res_desc = wxTRANSLATE("Selects the display resolution used in fullscreen mode.\nThis should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n\nIf unsure, use your desktop resolution.\nIf still unsure, use the highest resolution which works for you.");
-wxString use_fullscreen_desc = wxTRANSLATE("Enable this if you want the whole screen to be used for rendering.\nIf this is disabled, a render window will be created instead.\n\nIf unsure, leave this unchecked.");
-wxString auto_window_size_desc = wxTRANSLATE("Automatically adjusts the window size to your internal resolution.\n\nIf unsure, leave this unchecked.");
-wxString keep_window_on_top_desc = wxTRANSLATE("Keep the game window on top of all other windows.\n\nIf unsure, leave this unchecked.");
-wxString hide_mouse_cursor_desc = wxTRANSLATE("Hides the mouse cursor if it's on top of the emulation window.\n\nIf unsure, leave this checked.");
-wxString render_to_main_win_desc = wxTRANSLATE("Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n\nIf unsure, leave this unchecked.");
-wxString prog_scan_desc = wxTRANSLATE("Enables progressive scan if supported by the emulated software.\nMost games don't care about this.\n\nIf unsure, leave this unchecked.");
-wxString ar_desc = wxTRANSLATE("Select what aspect ratio to use when rendering:\nAuto: Use the native aspect ratio\nForce 16:9: Stretch the picture to an aspect ratio of 16:9.\nForce 4:3: Stretch the picture to an aspect ratio of 4:3.\nStretch to Window: Stretch the picture to the window size.\n\nIf unsure, select Auto.");
-wxString ws_hack_desc = wxTRANSLATE("Force the game to output graphics for widescreen resolutions.\nCauses graphical glitches is some games.\n\nIf unsure, leave this unchecked.");
-wxString vsync_desc = wxTRANSLATE("Wait for vertical blanks in order to reduce tearing.\nDecreases performance if emulation speed is below 100%.\n\nIf unsure, leave this unchecked.");
-wxString af_desc = wxTRANSLATE("Enable anisotropic filtering.\nEnhances visual quality of textures that are at oblique viewing angles.\nMight cause issues in a small number of games.\n\nIf unsure, select 1x.");
-wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky.\nHeavily decreases emulation speed and sometimes causes issues.\n\nIf unsure, select None.");
-wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked.");
-wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked.");
-wxString hacked_buffer_upload_desc = wxTRANSLATE("Uses unsafe operations to speed up vertex streaming in OpenGL. There are no known problems on supported GPUs, but it will cause severe stability and graphical issues otherwise.\n\nIf unsure, leave this unchecked.");
-wxString fast_depth_calc_desc = wxTRANSLATE("Use a less accurate algorithm to calculate depth values.\nCauses issues in a few games but might give a decent speedup.\n\nIf unsure, leave this checked.");
-wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked.");
-wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked.");
-wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528.");
-wxString efb_access_desc = wxTRANSLATE("Ignore any requests of the CPU to read from or write to the EFB.\nImproves performance in some games, but might disable some gameplay-related features or graphical effects.\n\nIf unsure, leave this unchecked.");
-wxString efb_emulate_format_changes_desc = wxTRANSLATE("Ignore any changes to the EFB format.\nImproves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n\nIf unsure, leave this checked.");
-wxString efb_copy_desc = wxTRANSLATE("Disable emulation of EFB copies.\nThese are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n\nIf unsure, leave this unchecked.");
-wxString efb_copy_texture_desc = wxTRANSLATE("Store EFB copies in GPU texture objects.\nThis is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n\nIf unsure, leave this checked.");
-wxString efb_copy_ram_desc = wxTRANSLATE("Accurately emulate EFB copies.\nSome games depend on this for certain graphical effects or gameplay functionality.\n\nIf unsure, check EFB to Texture instead.");
-wxString stc_desc = wxTRANSLATE("The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n\nIf unsure, use the rightmost value.");
-wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf unsure, leave this unchecked.");
-wxString disable_fog_desc = wxTRANSLATE("Makes distant objects more visible by removing fog, thus increasing the overall detail.\nDisabling fog will break some games which rely on proper fog emulation.\n\nIf unsure, leave this unchecked.");
-wxString disable_dstalpha_desc = wxTRANSLATE("Disables emulation of a hardware feature called destination alpha, which is used in many games for various graphical effects.\n\nIf unsure, leave this unchecked.");
-wxString show_fps_desc = wxTRANSLATE("Show the number of frames rendered per second as a measure of emulation speed.\n\nIf unsure, leave this unchecked.");
-wxString log_fps_to_file_desc = wxTRANSLATE("Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n\nIf unsure, leave this unchecked."); 
-wxString show_input_display_desc = wxTRANSLATE("Display the inputs read by the emulator.\n\nIf unsure, leave this unchecked.");
-wxString show_stats_desc = wxTRANSLATE("Show various statistics.\n\nIf unsure, leave this unchecked.");
-wxString texfmt_desc = wxTRANSLATE("Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n\nIf unsure, leave this unchecked.");
-wxString efb_copy_regions_desc = wxTRANSLATE("[BROKEN]\nHighlight regions the EFB was copied from.\n\nIf unsure, leave this unchecked.");
-wxString xfb_desc = wxTRANSLATE("Disable any XFB emulation.\nSpeeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n\nIf unsure, leave this checked.");
-wxString xfb_virtual_desc = wxTRANSLATE("Emulate XFBs using GPU texture objects.\nFixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n\nIf unsure, leave this checked.");
-wxString xfb_real_desc = wxTRANSLATE("Emulate XFBs accurately.\nSlows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n\nIf unsure, check virtual XFB emulation instead.");
-wxString dump_textures_desc = wxTRANSLATE("Dump decoded game textures to User/Dump/Textures/<game_id>/\n\nIf unsure, leave this unchecked.");
-wxString load_hires_textures_desc = wxTRANSLATE("Load custom textures from User/Load/Textures/<game_id>/\n\nIf unsure, leave this unchecked.");
-wxString dump_efb_desc = wxTRANSLATE("Dump the contents of EFB copies to User/Dump/Textures/\n\nIf unsure, leave this unchecked.");
-wxString dump_frames_desc = wxTRANSLATE("Dump all rendered frames to an AVI file in User/Dump/Frames/\n\nIf unsure, leave this unchecked.");
-#if !defined WIN32 && defined HAVE_LIBAV
-wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked.");
-#endif
-wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked.");
-wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked.");
-wxString opencl_desc = wxTRANSLATE("[EXPERIMENTAL]\nAims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\nHowever, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n\nIf unsure, leave this unchecked.");
-wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked.");
-wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked.");
-wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off).");
-wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked.");
-wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, an error message is displayed.\nHowever, one may skip the popups to allow interruption free gameplay by checking this option.\n\nIf unsure, leave this unchecked.");
-
-
-// Search for available resolutions - TODO: Move to Common?
-wxArrayString GetListOfResolutions()
-{
-	wxArrayString retlist;
-	retlist.Add("Auto");
-#ifdef _WIN32
-	DWORD iModeNum = 0;
-	DEVMODE dmi;
-	ZeroMemory(&dmi, sizeof(dmi));
-	dmi.dmSize = sizeof(dmi);
-	std::vector<std::string> resos;
-
-	while (EnumDisplaySettings(NULL, iModeNum++, &dmi) != 0)
-	{
-		char res[100];
-		sprintf(res, "%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
-		std::string strRes(res);
-		// Only add unique resolutions
-		if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
-		{
-			resos.push_back(strRes);
-			retlist.Add(StrToWxStr(res));
-		}
-		ZeroMemory(&dmi, sizeof(dmi));
-	}
-#elif defined(HAVE_XRANDR) && HAVE_XRANDR
-	main_frame->m_XRRConfig->AddResolutions(retlist);
-#elif defined(__APPLE__)
-	CFArrayRef modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL);
-	for (CFIndex i = 0; i < CFArrayGetCount(modes); i++)
-	{
-		std::stringstream res;
-		CGDisplayModeRef mode;
-		CFStringRef encoding;
-		size_t w, h;
-		bool is32;
-
-		mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i);
-		w = CGDisplayModeGetWidth(mode);
-		h = CGDisplayModeGetHeight(mode);
-		encoding = CGDisplayModeCopyPixelEncoding(mode);
-		is32 = CFEqual(encoding, CFSTR(IO32BitDirectPixels));
-		CFRelease(encoding);
-
-		if (!is32)
-			continue;
-		if (CGDisplayModeGetIOFlags(mode) & kDisplayModeStretchedFlag)
-			continue;
-
-		res << w << "x" << h;
-
-		retlist.Add(res.str());
-	}
-	CFRelease(modes);
-#endif
-	return retlist;
-}
-
-VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame)
-	: wxDialog(parent, -1,
-		wxString::Format(_("Dolphin %s Graphics Configuration"), wxGetTranslation(StrToWxStr(title))),
-		wxDefaultPosition, wxDefaultSize)
-	, vconfig(g_Config)
-	, ininame(_ininame)
-{
-	vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
-
-	Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this);
-
-	wxNotebook* const notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize);
-
-	// -- GENERAL --
-	{
-	wxPanel* const page_general = new wxPanel(notebook, -1, wxDefaultPosition);
-	notebook->AddPage(page_general, _("General"));
-	wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
-
-	// - basic
-	{
-	wxFlexGridSizer* const szr_basic = new wxFlexGridSizer(2, 5, 5);
-
-	// backend
-	{
-	wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
-	choice_backend = new wxChoice(page_general, wxID_ANY, wxDefaultPosition);
-	RegisterControl(choice_backend, wxGetTranslation(backend_desc));
-
-	std::vector<VideoBackend*>::const_iterator
-			it = g_available_video_backends.begin(),
-			itend = g_available_video_backends.end();
-	for (; it != itend; ++it)
-		choice_backend->AppendString(wxGetTranslation(StrToWxStr((*it)->GetDisplayName())));
-
-	choice_backend->SetStringSelection(wxGetTranslation(StrToWxStr(g_video_backend->GetDisplayName())));
-	choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this);
-
-	szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
-	szr_basic->Add(choice_backend, 1, 0, 0);
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		label_backend->Disable();
-		choice_backend->Disable();
-	}
-	}
-
-	// adapter (D3D only)
-	if (vconfig.backend_info.Adapters.size())
-	{
-		wxChoice* const choice_adapter = CreateChoice(page_general, vconfig.iAdapter, wxGetTranslation(adapter_desc));
-
-		std::vector<std::string>::const_iterator
-			it = vconfig.backend_info.Adapters.begin(),
-			itend = vconfig.backend_info.Adapters.end();
-		for (; it != itend; ++it)
-			choice_adapter->AppendString(StrToWxStr(*it));
-
-		choice_adapter->Select(vconfig.iAdapter);
-
-		szr_basic->Add(new wxStaticText(page_general, -1, _("Adapter:")), 1, wxALIGN_CENTER_VERTICAL, 5);
-		szr_basic->Add(choice_adapter, 1, 0, 0);
-	}
-
-
-	// - display
-	wxFlexGridSizer* const szr_display = new wxFlexGridSizer(2, 5, 5);
-
-	{
-
-#if !defined(__APPLE__)
-	// display resolution
-	{
-		wxArrayString res_list = GetListOfResolutions();
-		if (res_list.empty())
-			res_list.Add(_("<No resolutions found>"));
-		wxStaticText* const label_display_resolution = new wxStaticText(page_general, wxID_ANY, _("Fullscreen resolution:"));
-		choice_display_resolution = new wxChoice(page_general, wxID_ANY, wxDefaultPosition, wxDefaultSize, res_list);
-		RegisterControl(choice_display_resolution, wxGetTranslation(display_res_desc));
-		choice_display_resolution->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_DisplayResolution, this);
-
-		choice_display_resolution->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution));
-
-		szr_display->Add(label_display_resolution, 1, wxALIGN_CENTER_VERTICAL, 0);
-		szr_display->Add(choice_display_resolution);
-
-		if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		{
-			label_display_resolution->Disable();
-			choice_display_resolution->Disable();
-		}
-	}
-#endif
-
-	// aspect-ratio
-	{
-	const wxString ar_choices[] = { _("Auto"), _("Force 16:9"), _("Force 4:3"), _("Stretch to Window") };
-
-	szr_display->Add(new wxStaticText(page_general, -1, _("Aspect Ratio:")), 1, wxALIGN_CENTER_VERTICAL, 0);
-	wxChoice* const choice_aspect = CreateChoice(page_general, vconfig.iAspectRatio, wxGetTranslation(ar_desc),
-														sizeof(ar_choices)/sizeof(*ar_choices), ar_choices);
-	szr_display->Add(choice_aspect, 1, 0, 0);
-	}
-
-	// various other display options
-	{
-	szr_display->Add(CreateCheckBox(page_general, _("V-Sync"), wxGetTranslation(vsync_desc), vconfig.bVSync));
-	szr_display->Add(CreateCheckBox(page_general, _("Use Fullscreen"), wxGetTranslation(use_fullscreen_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen));
-	}
-	}
-
-	// - other
-	wxFlexGridSizer* const szr_other = new wxFlexGridSizer(2, 5, 5);
-
-	{
-	SettingCheckBox* render_to_main_cb;
-	szr_other->Add(CreateCheckBox(page_general, _("Show FPS"), wxGetTranslation(show_fps_desc), vconfig.bShowFPS));
-	szr_other->Add(CreateCheckBox(page_general, _("Log FPS to file"), wxGetTranslation(log_fps_to_file_desc), vconfig.bLogFPSToFile));
-	szr_other->Add(CreateCheckBox(page_general, _("Auto adjust Window Size"), wxGetTranslation(auto_window_size_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize));
-	szr_other->Add(CreateCheckBox(page_general, _("Keep window on top"), wxGetTranslation(keep_window_on_top_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop));
-	szr_other->Add(CreateCheckBox(page_general, _("Hide Mouse Cursor"), wxGetTranslation(hide_mouse_cursor_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor));
-	szr_other->Add(render_to_main_cb = CreateCheckBox(page_general, _("Render to Main Window"), wxGetTranslation(render_to_main_win_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain));
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		render_to_main_cb->Disable();
-
-	}
-
-
-	wxStaticBoxSizer* const group_basic = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Basic"));
-	group_basic->Add(szr_basic, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	szr_general->Add(group_basic, 0, wxEXPAND | wxALL, 5);
-
-	wxStaticBoxSizer* const group_display = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Display"));
-	group_display->Add(szr_display, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	szr_general->Add(group_display, 0, wxEXPAND | wxALL, 5);
-
-	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Other"));
-	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	szr_general->Add(group_other, 0, wxEXPAND | wxALL, 5);
-	}
-
-	szr_general->AddStretchSpacer();
-	CreateDescriptionArea(page_general, szr_general);
-	page_general->SetSizerAndFit(szr_general);
-	}
-
-	// -- ENHANCEMENTS --
-	{
-	wxPanel* const page_enh = new wxPanel(notebook, -1, wxDefaultPosition);
-	notebook->AddPage(page_enh, _("Enhancements"));
-	wxBoxSizer* const szr_enh_main = new wxBoxSizer(wxVERTICAL);
-
-	// - enhancements
-	wxFlexGridSizer* const szr_enh = new wxFlexGridSizer(2, 5, 5);
-
-	// Internal resolution
-	{
-	const wxString efbscale_choices[] = { _("Auto (Window Size)"), _("Auto (Multiple of 640x528)"),
-		_("1x Native (640x528)"), _("1.5x Native (960x792)"), _("2x Native (1280x1056)"), 
-		_("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)") };
-
-	wxChoice *const choice_efbscale = CreateChoice(page_enh,
-		vconfig.iEFBScale, wxGetTranslation(internal_res_desc), sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices);
-
-	szr_enh->Add(new wxStaticText(page_enh, wxID_ANY, _("Internal Resolution:")), 1, wxALIGN_CENTER_VERTICAL, 0);
-	szr_enh->Add(choice_efbscale);
-	}
-
-	// AA
-	{
-	text_aamode = new wxStaticText(page_enh, -1, _("Anti-Aliasing:"));
-	choice_aamode = CreateChoice(page_enh, vconfig.iMultisampleMode, wxGetTranslation(aa_desc));
-
-	std::vector<std::string>::const_iterator
-		it = vconfig.backend_info.AAModes.begin(),
-		itend = vconfig.backend_info.AAModes.end();
-	for (; it != itend; ++it)
-		choice_aamode->AppendString(wxGetTranslation(StrToWxStr(*it)));
-
-	choice_aamode->Select(vconfig.iMultisampleMode);
-	szr_enh->Add(text_aamode, 1, wxALIGN_CENTER_VERTICAL, 0);
-	szr_enh->Add(choice_aamode);
-	}
-
-	// AF
-	{
-	const wxString af_choices[] = {wxT("1x"), wxT("2x"), wxT("4x"), wxT("8x"), wxT("16x")};
-	szr_enh->Add(new wxStaticText(page_enh, -1, _("Anisotropic Filtering:")), 1, wxALIGN_CENTER_VERTICAL, 0);
-	szr_enh->Add(CreateChoice(page_enh, vconfig.iMaxAnisotropy, wxGetTranslation(af_desc), 5, af_choices));
-	}
-
-	// postproc shader
-	if (vconfig.backend_info.PPShaders.size())
-	{
-		wxChoice *const choice_ppshader = new wxChoice(page_enh, -1, wxDefaultPosition);
-		RegisterControl(choice_ppshader, wxGetTranslation(ppshader_desc));
-		choice_ppshader->AppendString(_("(off)"));
-
-		std::vector<std::string>::const_iterator
-			it = vconfig.backend_info.PPShaders.begin(),
-			itend = vconfig.backend_info.PPShaders.end();
-		for (; it != itend; ++it)
-			choice_ppshader->AppendString(StrToWxStr(*it));
-
-		if (vconfig.sPostProcessingShader.empty())
-			choice_ppshader->Select(0);
-		else
-			choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader));
-
-		choice_ppshader->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_PPShader, this);
-
-		szr_enh->Add(new wxStaticText(page_enh, -1, _("Post-Processing Effect:")), 1, wxALIGN_CENTER_VERTICAL, 0);
-		szr_enh->Add(choice_ppshader);
-	}
-
-	// Scaled copy, PL, Bilinear filter, 3D Vision
-	szr_enh->Add(CreateCheckBox(page_enh, _("Scaled EFB Copy"), wxGetTranslation(scaled_efb_copy_desc), vconfig.bCopyEFBScaled));
-	szr_enh->Add(pixel_lighting = CreateCheckBox(page_enh, _("Per-Pixel Lighting"), wxGetTranslation(pixel_lighting_desc), vconfig.bEnablePixelLighting));
-	szr_enh->Add(CreateCheckBox(page_enh, _("Force Texture Filtering"), wxGetTranslation(force_filtering_desc), vconfig.bForceFiltering));
-
-	szr_enh->Add(CreateCheckBox(page_enh, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack));
-	szr_enh->Add(CreateCheckBox(page_enh, _("Disable Fog"), wxGetTranslation(disable_fog_desc), vconfig.bDisableFog));
-
-	// 3D Vision
-	_3d_vision = CreateCheckBox(page_enh, _("3D Vision"), wxGetTranslation(_3d_vision_desc), vconfig.b3DVision);
-	_3d_vision->Show(vconfig.backend_info.bSupports3DVision);
-	szr_enh->Add(_3d_vision);
-	// TODO: Add anaglyph 3d here
-
-	wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_enh, _("Enhancements"));
-	group_enh->Add(szr_enh, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	szr_enh_main->Add(group_enh, 0, wxEXPAND | wxALL, 5);
-
-
-	szr_enh_main->AddStretchSpacer();
-	CreateDescriptionArea(page_enh, szr_enh_main);
-	page_enh->SetSizerAndFit(szr_enh_main);
-	}
-
-
-	// -- SPEED HACKS --
-	{
-	wxPanel* const page_hacks = new wxPanel(notebook, -1, wxDefaultPosition);
-	notebook->AddPage(page_hacks, _("Hacks"));
-	wxBoxSizer* const szr_hacks = new wxBoxSizer(wxVERTICAL);
-
-	// - EFB hacks
-	wxStaticBoxSizer* const szr_efb = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Embedded Frame Buffer"));
-
-	// format change emulation
-	emulate_efb_format_changes = CreateCheckBox(page_hacks, _("Ignore Format Changes"), wxGetTranslation(efb_emulate_format_changes_desc), vconfig.bEFBEmulateFormatChanges, true);
-
-	// EFB copies
-	wxStaticBoxSizer* const group_efbcopy = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("EFB Copies"));
-
-	SettingCheckBox* efbcopy_disable = CreateCheckBox(page_hacks, _("Disable"), wxGetTranslation(efb_copy_desc), vconfig.bEFBCopyEnable, true);
-	efbcopy_texture = CreateRadioButton(page_hacks, _("Texture"), wxGetTranslation(efb_copy_texture_desc), vconfig.bCopyEFBToTexture, false, wxRB_GROUP);
-	efbcopy_ram = CreateRadioButton(page_hacks, _("RAM"), wxGetTranslation(efb_copy_ram_desc), vconfig.bCopyEFBToTexture, true);
-	cache_efb_copies = CreateCheckBox(page_hacks, _("Enable Cache"), wxGetTranslation(cache_efb_copies_desc), vconfig.bEFBCopyCacheEnable);
-
-	group_efbcopy->Add(efbcopy_disable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	group_efbcopy->AddStretchSpacer(1);
-	group_efbcopy->Add(efbcopy_texture, 0, wxRIGHT, 5);
-	group_efbcopy->Add(efbcopy_ram, 0, wxRIGHT, 5);
-	group_efbcopy->Add(cache_efb_copies, 0, wxRIGHT, 5);
-
-	szr_efb->Add(CreateCheckBox(page_hacks, _("Skip EFB Access from CPU"), wxGetTranslation(efb_access_desc), vconfig.bEFBAccessEnable, true), 0, wxBOTTOM | wxLEFT, 5);
-	szr_efb->Add(emulate_efb_format_changes, 0, wxBOTTOM | wxLEFT, 5);
-	szr_efb->Add(group_efbcopy, 0, wxEXPAND | wxALL, 5);
-	szr_hacks->Add(szr_efb, 0, wxEXPAND | wxALL, 5);
-
-	// Texture cache
-	{
-	wxStaticBoxSizer* const szr_safetex = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("Texture Cache"));
-
-	// TODO: Use wxSL_MIN_MAX_LABELS or wxSL_VALUE_LABEL with wx 2.9.1
-	wxSlider* const stc_slider = new wxSlider(page_hacks, wxID_ANY, 0, 0, 2, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_BOTTOM);
-	stc_slider->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &VideoConfigDiag::Event_Stc, this);
-	RegisterControl(stc_slider, wxGetTranslation(stc_desc));
-
-	if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0);
-	else if (vconfig.iSafeTextureCache_ColorSamples == 512) stc_slider->SetValue(1);
-	else if (vconfig.iSafeTextureCache_ColorSamples == 128) stc_slider->SetValue(2);
-	else stc_slider->Disable(); // Using custom number of samples; TODO: Inform the user why this is disabled..
-
-	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Accuracy:")), 0, wxALL, 5);
-	szr_safetex->AddStretchSpacer(1);
-	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Safe")), 0, wxLEFT|wxTOP|wxBOTTOM, 5);
-	szr_safetex->Add(stc_slider, 2, wxRIGHT, 0);
-	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Fast")), 0, wxRIGHT|wxTOP|wxBOTTOM, 5);
-	szr_hacks->Add(szr_safetex, 0, wxEXPAND | wxALL, 5);
-	}
-
-	// - XFB
-	{
-	wxStaticBoxSizer* const group_xfb = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("External Frame Buffer"));
-
-	SettingCheckBox* disable_xfb = CreateCheckBox(page_hacks, _("Disable"), wxGetTranslation(xfb_desc), vconfig.bUseXFB, true);
-	virtual_xfb = CreateRadioButton(page_hacks, _("Virtual"), wxGetTranslation(xfb_virtual_desc), vconfig.bUseRealXFB, true, wxRB_GROUP);
-	real_xfb = CreateRadioButton(page_hacks, _("Real"), wxGetTranslation(xfb_real_desc), vconfig.bUseRealXFB);
-
-	group_xfb->Add(disable_xfb, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	group_xfb->AddStretchSpacer(1);
-	group_xfb->Add(virtual_xfb, 0, wxRIGHT, 5);
-	group_xfb->Add(real_xfb, 0, wxRIGHT, 5);
-	szr_hacks->Add(group_xfb, 0, wxEXPAND | wxALL, 5);
-	}	// xfb
-
-	// - other hacks
-	{
-	wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5);
-	szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable));
-	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass));
-	szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL));
-	szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
-	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
-	szr_other->Add(hacked_buffer_upload = CreateCheckBox(page_hacks, _("Vertex Streaming Hack"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
-	
-	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Other"));
-	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	szr_hacks->Add(group_other, 0, wxEXPAND | wxALL, 5);
-	}
-
-	szr_hacks->AddStretchSpacer();
-	CreateDescriptionArea(page_hacks, szr_hacks);
-	page_hacks->SetSizerAndFit(szr_hacks);
-	}
-
-	// -- ADVANCED --
-	{
-	wxPanel* const page_advanced = new wxPanel(notebook, -1, wxDefaultPosition);
-	notebook->AddPage(page_advanced, _("Advanced"));
-	wxBoxSizer* const szr_advanced = new wxBoxSizer(wxVERTICAL);
-
-	// - debug
-	{
-	wxGridSizer* const szr_debug = new wxGridSizer(2, 5, 5);
-
-	szr_debug->Add(CreateCheckBox(page_advanced, _("Enable Wireframe"), wxGetTranslation(wireframe_desc), vconfig.bWireFrame));
-	szr_debug->Add(CreateCheckBox(page_advanced, _("Show EFB Copy Regions"), wxGetTranslation(efb_copy_regions_desc), vconfig.bShowEFBCopyRegions));
-	szr_debug->Add(CreateCheckBox(page_advanced, _("Show Statistics"), wxGetTranslation(show_stats_desc), vconfig.bOverlayStats));
-	szr_debug->Add(CreateCheckBox(page_advanced, _("Texture Format Overlay"), wxGetTranslation(texfmt_desc), vconfig.bTexFmtOverlayEnable));
-
-	wxStaticBoxSizer* const group_debug = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Debugging"));
-	szr_advanced->Add(group_debug, 0, wxEXPAND | wxALL, 5);
-	group_debug->Add(szr_debug, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	}
-
-	// - utility
-	{
-	wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
-
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Dump Textures"), wxGetTranslation(dump_textures_desc), vconfig.bDumpTextures));
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Load Custom Textures"), wxGetTranslation(load_hires_textures_desc), vconfig.bHiresTextures));
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Dump EFB Target"), wxGetTranslation(dump_efb_desc), vconfig.bDumpEFBTarget));
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Dump Frames"), wxGetTranslation(dump_frames_desc), vconfig.bDumpFrames));
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Free Look"), wxGetTranslation(free_look_desc), vconfig.bFreeLook));
-#if !defined WIN32 && defined HAVE_LIBAV
-	szr_utility->Add(CreateCheckBox(page_advanced, _("Frame Dumps use FFV1"), wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1));
-#endif
-
-	wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Utility"));
-	szr_advanced->Add(group_utility, 0, wxEXPAND | wxALL, 5);
-	group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	}
-
-	// - misc
-	{
-	wxGridSizer* const szr_misc = new wxGridSizer(2, 5, 5);
-
-	szr_misc->Add(CreateCheckBox(page_advanced, _("Show Input Display"), wxGetTranslation(show_input_display_desc), vconfig.bShowInputDisplay));
-	szr_misc->Add(CreateCheckBox(page_advanced, _("Crop"), wxGetTranslation(crop_desc), vconfig.bCrop));
-
-	// Progressive Scan
-	{
-	wxCheckBox* const cb_prog_scan = new wxCheckBox(page_advanced, wxID_ANY, _("Enable Progressive Scan"));
-	RegisterControl(cb_prog_scan, wxGetTranslation(prog_scan_desc));
-	cb_prog_scan->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &VideoConfigDiag::Event_ProgressiveScan, this);
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		cb_prog_scan->Disable();
-
-	cb_prog_scan->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive);
-	// A bit strange behavior, but this needs to stay in sync with the main progressive boolean; TODO: Is this still necessary?
-	SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive);
-
-	szr_misc->Add(cb_prog_scan);
-	}
-
-	wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Misc"));
-	szr_advanced->Add(group_misc, 0, wxEXPAND | wxALL, 5);
-	group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	}
-
-	szr_advanced->AddStretchSpacer();
-	CreateDescriptionArea(page_advanced, szr_advanced);
-	page_advanced->SetSizerAndFit(szr_advanced);
-	}
-
-	wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition);
-	btn_close->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &VideoConfigDiag::Event_ClickClose, this);
-
-	Bind(wxEVT_CLOSE_WINDOW, &VideoConfigDiag::Event_Close, this);
-
-	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
-	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
-	szr_main->Add(btn_close, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
-
-	SetSizerAndFit(szr_main);
-	Center();
-	SetFocus();
-
-	UpdateWindowUI();
-}
-
-void VideoConfigDiag::Event_DisplayResolution(wxCommandEvent &ev)
-{
-	SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
-		WxStrToStr(choice_display_resolution->GetStringSelection());
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-	main_frame->m_XRRConfig->Update();
-#endif
-	ev.Skip();
-}
-
-SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
-{
-	SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style);
-	RegisterControl(cb, description);
-	return cb;
-}
-
-SettingChoice* VideoConfigDiag::CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num, const wxString choices[], long style)
-{
-	SettingChoice* const ch = new SettingChoice(parent, setting, wxString(), num, choices, style);
-	RegisterControl(ch, description);
-	return ch;
-}
-
-SettingRadioButton* VideoConfigDiag::CreateRadioButton(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
-{
-	SettingRadioButton* const rb = new SettingRadioButton(parent, label, wxString(), setting, reverse, style);
-	RegisterControl(rb, description);
-	return rb;
-}
-
-/* Use this to register descriptions for controls which have NOT been created using the Create* functions from above */
-wxControl* VideoConfigDiag::RegisterControl(wxControl* const control, const wxString& description)
-{
-	ctrl_descs.insert(std::pair<wxWindow*,wxString>(control, description));
-	control->Bind(wxEVT_ENTER_WINDOW, &VideoConfigDiag::Evt_EnterControl, this);
-	control->Bind(wxEVT_LEAVE_WINDOW, &VideoConfigDiag::Evt_LeaveControl, this);
-	return control;
-}
-
-void VideoConfigDiag::Evt_EnterControl(wxMouseEvent& ev)
-{
-	// TODO: Re-Fit the sizer if necessary!
-
-	// Get settings control object from event
-	wxWindow* ctrl = (wxWindow*)ev.GetEventObject();
-	if (!ctrl) return;
-
-	// look up description text object from the control's parent (which is the wxPanel of the current tab)
-	wxStaticText* descr_text = desc_texts[ctrl->GetParent()];
-	if (!descr_text) return;
-
-	// look up the description of the selected control and assign it to the current description text object's label
-	descr_text->SetLabel(ctrl_descs[ctrl]);
-	descr_text->Wrap(descr_text->GetContainingSizer()->GetSize().x - 20);
-
-	ev.Skip();
-}
-
-// TODO: Don't hardcode the size of the description area via line breaks
-#define DEFAULT_DESC_TEXT _("Move the mouse pointer over an option to display a detailed description.\n\n\n\n\n\n\n")
-void VideoConfigDiag::Evt_LeaveControl(wxMouseEvent& ev)
-{
-	// look up description text control and reset its label
-	wxWindow* ctrl = (wxWindow*)ev.GetEventObject();
-	if (!ctrl) return;
-	wxStaticText* descr_text = desc_texts[ctrl->GetParent()];
-	if (!descr_text) return;
-
-	descr_text->SetLabel(DEFAULT_DESC_TEXT);
-	descr_text->Wrap(descr_text->GetContainingSizer()->GetSize().x - 20);
-	ev.Skip();
-}
-
-void VideoConfigDiag::CreateDescriptionArea(wxPanel* const page, wxBoxSizer* const sizer)
-{
-	// Create description frame
-	wxStaticBoxSizer* const desc_sizer = new wxStaticBoxSizer(wxVERTICAL, page, _("Description"));
-	sizer->Add(desc_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	// Need to call SetSizerAndFit here, since we don't want the description texts to change the dialog width
-	page->SetSizerAndFit(sizer);
-
-	// Create description text
-	wxStaticText* const desc_text = new wxStaticText(page, wxID_ANY, DEFAULT_DESC_TEXT);
-	desc_text->Wrap(desc_sizer->GetSize().x - 20);
-	desc_sizer->Add(desc_text, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	// Store description text object for later lookup
-	desc_texts.insert(std::pair<wxWindow*,wxStaticText*>(page, desc_text));
-}
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
deleted file mode 100644
index 563f5076d6..0000000000
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#ifndef _CONFIG_DIAG_H_
-#define _CONFIG_DIAG_H_
-
-#include <vector>
-#include <string>
-#include <map>
-
-#include "ConfigManager.h"
-#include "VideoConfig.h"
-#include "Core.h"
-
-#include <wx/wx.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
-#include "MsgHandler.h"
-#include "WxUtils.h"
-
-template <typename W>
-class BoolSetting : public W
-{
-public:
-	BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse = false, long style = 0);
-
-	void UpdateValue(wxCommandEvent& ev)
-	{
-		m_setting = (ev.GetInt() != 0) ^ m_reverse;
-		ev.Skip();
-	}
-private:
-	bool &m_setting;
-	const bool m_reverse;
-};
-
-typedef BoolSetting<wxCheckBox> SettingCheckBox;
-typedef BoolSetting<wxRadioButton> SettingRadioButton;
-
-template <typename T>
-class IntegerSetting : public wxSpinCtrl
-{
-public:
-	IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style = 0);
-
-	void UpdateValue(wxCommandEvent& ev)
-	{
-		m_setting = ev.GetInt();
-		ev.Skip();
-	}
-private:
-	T& m_setting;
-};
-
-typedef IntegerSetting<u32> U32Setting;
-
-class SettingChoice : public wxChoice
-{
-public:
-	SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num = 0, const wxString choices[] = NULL, long style = 0);
-	void UpdateValue(wxCommandEvent& ev);
-private:
-	int &m_setting;
-};
-
-class VideoConfigDiag : public wxDialog
-{
-public:
-	VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& ininame);
-
-protected:
-	void Event_Backend(wxCommandEvent &ev)
-	{
-		VideoBackend* new_backend = g_available_video_backends[ev.GetInt()];
-		if (g_video_backend != new_backend)
-		{
-			bool do_switch = true;
-			if (new_backend->GetName() == "Software Renderer")
-			{
-				do_switch = (wxYES == wxMessageBox(_("Software rendering is an order of magnitude slower than using the other backends.\nIt's only useful for debugging purposes.\nDo you really want to enable software rendering? If unsure, select 'No'."),
-							_("Warning"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION, wxGetActiveWindow()));
-			}
-
-			if (do_switch)
-			{
-				// TODO: Only reopen the dialog if the software backend is
-				// selected (make sure to reinitialize backend info)
-				// reopen the dialog
-				Close();
-
-				g_video_backend = new_backend;
-				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = g_video_backend->GetName();
-
-				g_video_backend->ShowConfig(GetParent());
-			}
-			else
-			{
-				// Select current backend again
-				choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
-			}
-		}
-
-		ev.Skip();
-	}
-	void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO
-
-	void Event_DisplayResolution(wxCommandEvent &ev);
-
-	void Event_ProgressiveScan(wxCommandEvent &ev)
-	{
-		SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", ev.GetInt());
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.IsChecked();
-
-		ev.Skip();
-	}
-
-	void Event_Stc(wxCommandEvent &ev)
-	{
-		int samples[] = { 0, 512, 128 };
-		vconfig.iSafeTextureCache_ColorSamples = samples[ev.GetInt()];
-
-		ev.Skip();
-	}
-
-	void Event_PPShader(wxCommandEvent &ev)
-	{
-		const int sel = ev.GetInt();
-		if (sel)
-			vconfig.sPostProcessingShader = WxStrToStr(ev.GetString());
-		else
-			vconfig.sPostProcessingShader.clear();
-
-		ev.Skip();
-	}
-
-	void Event_ClickClose(wxCommandEvent&);
-	void Event_Close(wxCloseEvent&);
-
-	// Enables/disables UI elements depending on current config
-	void OnUpdateUI(wxUpdateUIEvent& ev)
-	{
-		// Anti-aliasing
-		choice_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
-		text_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
-
-		// pixel lighting
-		pixel_lighting->Enable(vconfig.backend_info.bSupportsPixelLighting);
-
-		// 3D vision
-		_3d_vision->Enable(vconfig.backend_info.bSupports3DVision);
-		_3d_vision->Show(vconfig.backend_info.bSupports3DVision);
-
-		// EFB copy
-		efbcopy_texture->Enable(vconfig.bEFBCopyEnable);
-		efbcopy_ram->Enable(vconfig.bEFBCopyEnable);
-		cache_efb_copies->Enable(vconfig.bEFBCopyEnable && !vconfig.bCopyEFBToTexture);
-
-		// EFB format change emulation
-		emulate_efb_format_changes->Enable(vconfig.backend_info.bSupportsFormatReinterpretation);
-
-		// XFB
-		virtual_xfb->Enable(vconfig.bUseXFB);
-		real_xfb->Enable(vconfig.bUseXFB);
-		
-		// OGL Hacked buffer
-		hacked_buffer_upload->Enable(Core::GetState() == Core::CORE_UNINITIALIZED && vconfig.backend_info.APIType == API_OPENGL);
-		hacked_buffer_upload->Show(vconfig.backend_info.APIType == API_OPENGL);
-
-		ev.Skip();
-	}
-
-	// Creates controls and connects their enter/leave window events to Evt_Enter/LeaveControl
-	SettingCheckBox* CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
-	SettingChoice* CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num = 0, const wxString choices[] = NULL, long style = 0);
-	SettingRadioButton* CreateRadioButton(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
-
-	// Same as above but only connects enter/leave window events
-	wxControl* RegisterControl(wxControl* const control, const wxString& description);
-
-	void Evt_EnterControl(wxMouseEvent& ev);
-	void Evt_LeaveControl(wxMouseEvent& ev);
-	void CreateDescriptionArea(wxPanel* const page, wxBoxSizer* const sizer);
-
-	wxChoice* choice_backend;
-	wxChoice* choice_display_resolution;
-	wxStaticText* text_aamode;
-	SettingChoice* choice_aamode;
-
-	SettingCheckBox* pixel_lighting;
-
-	SettingCheckBox* _3d_vision;
-
-	SettingRadioButton* efbcopy_texture;
-	SettingRadioButton* efbcopy_ram;
-	SettingCheckBox* cache_efb_copies;
-	SettingCheckBox* emulate_efb_format_changes;
-	SettingCheckBox* hacked_buffer_upload;
-
-	SettingRadioButton* virtual_xfb;
-	SettingRadioButton* real_xfb;
-
-	std::map<wxWindow*, wxString> ctrl_descs; // maps setting controls to their descriptions
-	std::map<wxWindow*, wxStaticText*> desc_texts; // maps dialog tabs (which are the parents of the setting controls) to their description text objects
-
-	VideoConfig &vconfig;
-	std::string ininame;
-};
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp
deleted file mode 100644
index fc05479752..0000000000
--- a/Source/Core/DolphinWX/Src/WXInputBase.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "WXInputBase.h"
-
-namespace InputCommon
-{
-
-const wxString WXKeyToString(int keycode)
-{
-	switch (keycode)
-	{
-		case WXK_BACK:				return _("Back");
-		case WXK_TAB:				return _("Tab");
-		case WXK_RETURN:			return _("Return");
-		case WXK_ESCAPE:			return _("Escape");
-		case WXK_SPACE:				return _("Space");
-		case WXK_DELETE:			return _("Delete");
-
-		// Undocumented wx keycodes
-		case 167:				return _("Paragraph");
-		case 177:				return _("Plus-Minus");
-
-		case WXK_START:				return _("Start");
-		case WXK_LBUTTON:			return _("L Button");
-		case WXK_RBUTTON:			return _("R Button");
-		case WXK_CANCEL:			return _("Cancel");
-		case WXK_MBUTTON:			return _("M Button");
-		case WXK_CLEAR:				return _("Clear");
-		case WXK_SHIFT:				return wxT("Shift");
-		case WXK_ALT:				return wxT("Alt");
-		case WXK_RAW_CONTROL:		return _("Control");
-#ifdef __WXOSX__
-		case WXK_COMMAND:			return _("Command");
-#endif
-		case WXK_MENU:				return _("Menu");
-		case WXK_PAUSE:				return _("Pause");
-		case WXK_CAPITAL:			return _("Caps Lock");
-		case WXK_END:				return _("End");
-		case WXK_HOME:				return _("Home");
-		case WXK_LEFT:				return _("Left");
-		case WXK_UP:				return _("Up");
-		case WXK_RIGHT:				return _("Right");
-		case WXK_DOWN:				return _("Down");
-		case WXK_SELECT:			return _("Select");
-		case WXK_PRINT:				return _("Print");
-		case WXK_EXECUTE:			return _("Execute");
-		case WXK_SNAPSHOT:			return _("Snapshot");
-		case WXK_INSERT:			return _("Insert");
-		case WXK_HELP:				return _("Help");
-		case WXK_NUMPAD0:			return wxT("NP 0");
-		case WXK_NUMPAD1:			return wxT("NP 1");
-		case WXK_NUMPAD2:			return wxT("NP 2");
-		case WXK_NUMPAD3:			return wxT("NP 3");
-		case WXK_NUMPAD4:			return wxT("NP 4");
-		case WXK_NUMPAD5:			return wxT("NP 5");
-		case WXK_NUMPAD6:			return wxT("NP 6");
-		case WXK_NUMPAD7:			return wxT("NP 7");
-		case WXK_NUMPAD8:			return wxT("NP 8");
-		case WXK_NUMPAD9:			return wxT("NP 9");
-		case WXK_MULTIPLY:			return _("Multiply");
-		case WXK_ADD:				return _("Add");
-		case WXK_SEPARATOR:			return _("Separator");
-		case WXK_SUBTRACT:			return _("Subtract");
-		case WXK_DECIMAL:			return _("Decimal");
-		case WXK_DIVIDE:			return _("Divide");
-		case WXK_F1:				return wxT("F1");
-		case WXK_F2:				return wxT("F2");
-		case WXK_F3:				return wxT("F3");
-		case WXK_F4:				return wxT("F4");
-		case WXK_F5:				return wxT("F5");
-		case WXK_F6:				return wxT("F6");
-		case WXK_F7:				return wxT("F7");
-		case WXK_F8:				return wxT("F8");
-		case WXK_F9:				return wxT("F9");
-		case WXK_F10:				return wxT("F10");
-		case WXK_F11:				return wxT("F11");
-		case WXK_F12:				return wxT("F12");
-		case WXK_F13:				return wxT("F13");
-		case WXK_F14:				return wxT("F14");
-		case WXK_F15:				return wxT("F15");
-		case WXK_F16:				return wxT("F16");
-		case WXK_F17:				return wxT("F17");
-		case WXK_F18:				return wxT("F19");
-		case WXK_F19:				return wxT("F20");
-		case WXK_F20:				return wxT("F21");
-		case WXK_F21:				return wxT("F22");
-		case WXK_F22:				return wxT("F23");
-		case WXK_F23:				return wxT("F24");
-		case WXK_F24:				return wxT("F25");
-		case WXK_NUMLOCK:			return _("Num Lock");
-		case WXK_SCROLL:			return _("Scroll Lock");
-		case WXK_PAGEUP:			return _("Page Up");
-		case WXK_PAGEDOWN:			return _("Page Down");
-		case WXK_NUMPAD_SPACE:			return _("NP Space");
-		case WXK_NUMPAD_TAB:			return _("NP Tab");
-		case WXK_NUMPAD_ENTER:			return _("NP Enter");
-		case WXK_NUMPAD_F1:			return wxT("NP F1");
-		case WXK_NUMPAD_F2:			return wxT("NP F2");
-		case WXK_NUMPAD_F3:			return wxT("NP F3");
-		case WXK_NUMPAD_F4:			return wxT("NP F4");
-		case WXK_NUMPAD_HOME:			return _("NP Home");
-		case WXK_NUMPAD_LEFT:			return _("NP Left");
-		case WXK_NUMPAD_UP:			return _("NP Up");
-		case WXK_NUMPAD_RIGHT:			return _("NP Right");
-		case WXK_NUMPAD_DOWN:			return _("NP Down");
-		case WXK_NUMPAD_PAGEUP:			return _("NP Page Up");
-		case WXK_NUMPAD_PAGEDOWN:		return _("NP Page Down");
-		case WXK_NUMPAD_END:			return _("NP End");
-		case WXK_NUMPAD_BEGIN:			return _("NP Begin");
-		case WXK_NUMPAD_INSERT:			return _("NP Insert");
-		case WXK_NUMPAD_DELETE:			return _("NP Delete");
-		case WXK_NUMPAD_EQUAL:			return _("NP Equal");
-		case WXK_NUMPAD_MULTIPLY:		return _("NP Multiply");
-		case WXK_NUMPAD_ADD:			return _("NP Add");
-		case WXK_NUMPAD_SEPARATOR:		return _("NP Separator");
-		case WXK_NUMPAD_SUBTRACT:		return _("NP Subtract");
-		case WXK_NUMPAD_DECIMAL:		return _("NP Decimal");
-		case WXK_NUMPAD_DIVIDE:			return _("NP Divide");
-		case WXK_WINDOWS_LEFT:			return _("Windows Left");
-		case WXK_WINDOWS_RIGHT:			return _("Windows Right");
-		case WXK_WINDOWS_MENU:			return _("Windows Menu");
-	}
-
-	if (keycode > WXK_SPACE && keycode < WXK_DELETE) {
-		return wxString((wxChar)keycode, 1);
-	}
-
-	return wxT("");
-}
-
-const wxString WXKeymodToString(int modifier)
-{
-	wxString mods;
-
-	if (modifier & wxMOD_META)
-#ifdef __APPLE__
-		mods += wxT("Cmd+");
-#elif defined _WIN32
-		mods += wxT("Win+");
-#else
-		mods += wxT("Meta+");
-#endif
-	if (modifier & wxMOD_CONTROL)
-		mods += wxT("Ctrl+");
-	if (modifier & wxMOD_ALT)
-		mods += wxT("Alt+");
-	if (modifier & wxMOD_SHIFT)
-		mods += wxT("Shift+");
-
-	return mods;
-}
-
-}
diff --git a/Source/Core/DolphinWX/Src/WXInputBase.h b/Source/Core/DolphinWX/Src/WXInputBase.h
deleted file mode 100644
index 4d6f57911d..0000000000
--- a/Source/Core/DolphinWX/Src/WXInputBase.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef WXINPUTBASE_H
-#define WXINPUTBASE_H
-
-#include "Common.h"
-#if defined(HAVE_WX) && HAVE_WX
-#include <wx/wx.h>
-#endif
-
-namespace InputCommon
-{
-#if defined(HAVE_WX) && HAVE_WX
-const wxString WXKeyToString(int keycode);
-const wxString WXKeymodToString(int modifier);
-#endif
-}
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
deleted file mode 100644
index 06b839b960..0000000000
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-
-#include "WiimoteConfigDiag.h"
-#include "HW/Wiimote.h"
-#include "HW/WiimoteReal/WiimoteReal.h"
-#include "Frame.h"
-
-WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin)
-	: wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)
-	, m_plugin(plugin)
-{
-	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
-
-
-	// "Wiimotes" controls
-	wxStaticText* wiimote_label[4];
-	wxChoice* wiimote_source_ch[4];
-
-	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
-	{
-		wxString str;
-		str.Printf(_("Wiimote %i"), i + 1);
-
-		const wxString src_choices[] = { _("None"),
-		_("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") };
-
-		// reserve four ids, so that we can calculate the index from the ids later on
-		// Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated..
-		int source_ctrl_id =  wxWindow::NewControlId();
-		m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, i));
-
-		int config_bt_id = wxWindow::NewControlId();
-		m_wiimote_index_from_conf_bt_id.insert(std::pair<wxWindowID, unsigned int>(config_bt_id, i));
-
-		wiimote_label[i] = new wxStaticText(this, wxID_ANY, str);
-		wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices);
-		wiimote_source_ch[i]->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::SelectSource, this);
-		wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure"));
-		wiimote_configure_bt[i]->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::ConfigEmulatedWiimote, this);
-
-		m_orig_wiimote_sources[i] = g_wiimote_sources[i];
-		wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]);
-		if (m_orig_wiimote_sources[i] != WIIMOTE_SRC_EMU && m_orig_wiimote_sources[i] != WIIMOTE_SRC_HYBRID)
-			wiimote_configure_bt[i]->Disable();
-	}
-
-
-	// "Wiimotes" layout
-	wxStaticBoxSizer* const wiimote_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Wiimotes"));
-	wxFlexGridSizer* const wiimote_sizer = new wxFlexGridSizer(3, 5, 5);
-	for (unsigned int i = 0; i < 4; ++i)
-	{
-		wiimote_sizer->Add(wiimote_label[i], 0, wxALIGN_CENTER_VERTICAL);
-		wiimote_sizer->Add(wiimote_source_ch[i], 0, wxALIGN_CENTER_VERTICAL);
-		wiimote_sizer->Add(wiimote_configure_bt[i]);
-	}
-	wiimote_group->Add(wiimote_sizer, 1, wxEXPAND, 5 );
-	
-	
-	// "BalanceBoard" layout
-	wxStaticBoxSizer* const bb_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Balance Board"));
-	wxFlexGridSizer* const bb_sizer = new wxFlexGridSizer(1, 5, 5);
-	int source_ctrl_id =  wxWindow::NewControlId();
-	m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
-	const wxString src_choices[] = { _("None"), _("Real Balance Board") };
-	wxChoice* bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices);
-	bb_source->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::SelectSource, this);
-	
-	m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] = g_wiimote_sources[WIIMOTE_BALANCE_BOARD];
-	bb_source->Select(m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] ? 1 : 0);
-	
-	bb_sizer->Add(bb_source, 0, wxALIGN_CENTER_VERTICAL);
-	
-	bb_group->Add(bb_sizer, 1, wxEXPAND, 5 );
-
-	
-	// "Real wiimotes" controls
-	wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition);
-	refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this);
-
-	wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes"));
-	
-	wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL);
-	
-	if (!WiimoteReal::g_wiimote_scanner.IsReady())
-		real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n"
-			"You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
-		
-	wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning"));
-	continuous_scanning->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnContinuousScanning, this);
-	continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning);
-
-	auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data"));
-	wiimote_speaker->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnEnableSpeaker, this);
-	wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker);
-	
-	real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL);
-	real_wiimotes_sizer->AddStretchSpacer(1);
-	real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5);
-
-	real_wiimotes_group->Add(wiimote_speaker, 0);
-	real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND);
-
-	// "General Settings" controls
-	const wxString str[] = { _("Bottom"), _("Top") };
-	wxChoice* const WiiSensBarPos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, str);
-	wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
-	wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127);
-	wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
-
-	wxStaticText* const WiiSensBarPosText = new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:"));
-	wxStaticText* const WiiSensBarSensText = new wxStaticText(this, wxID_ANY, _("IR Sensitivity:"));
-	wxStaticText* const WiiSensBarSensMinText = new wxStaticText(this, wxID_ANY, _("Min"));
-	wxStaticText* const WiiSensBarSensMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
-	wxStaticText* const WiimoteSpkVolumeText = new wxStaticText(this, wxID_ANY, _("Speaker Volume:"));
-	wxStaticText* const WiimoteSpkVolumeMinText = new wxStaticText(this, wxID_ANY, _("Min"));
-	wxStaticText* const WiimoteSpkVolumeMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
-
-	// With some GTK themes, no minimum size will be applied - so do this manually here
-	WiiSensBarSens->SetMinSize(wxSize(100,-1));
-	WiimoteSpkVolume->SetMinSize(wxSize(100,-1));
-
-
-	// Disable some controls when emulation is running
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		WiiSensBarPos->Disable();
-		WiiSensBarSens->Disable();
-		WiimoteSpkVolume->Disable();
-		WiimoteMotor->Disable();
-		WiiSensBarPosText->Disable();
-		WiiSensBarSensText->Disable();
-		WiiSensBarSensMinText->Disable();
-		WiiSensBarSensMaxText->Disable();
-		WiimoteSpkVolumeText->Disable();
-		WiimoteSpkVolumeMinText->Disable();
-		WiimoteSpkVolumeMaxText->Disable();
-	}
-
-
-	// "General Settings" initialization
-	WiiSensBarPos->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR"));
-	WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u32>("BT.SENS"));
-	WiimoteSpkVolume->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.SPKV"));
-	WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<bool>("BT.MOT"));
-
-	WiiSensBarPos->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::OnSensorBarPos, this);
-	WiiSensBarSens->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSensorBarSensitivity, this);
-	WiimoteSpkVolume->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSpeakerVolume, this);
-	WiimoteMotor->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnMotor, this);
-
-
-	// "General Settings" layout
-	wxStaticBoxSizer* const general_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("General Settings"));
-	wxFlexGridSizer* const choice_sizer = new wxFlexGridSizer(2, 5, 5);
-
-	wxBoxSizer* const sensbarsens_sizer = new wxBoxSizer(wxHORIZONTAL);
-	sensbarsens_sizer->Add(WiiSensBarSensMinText, 0, wxALIGN_CENTER_VERTICAL);
-	sensbarsens_sizer->Add(WiiSensBarSens);
-	sensbarsens_sizer->Add(WiiSensBarSensMaxText, 0, wxALIGN_CENTER_VERTICAL);
-
-	wxBoxSizer* const spkvol_sizer = new wxBoxSizer(wxHORIZONTAL);
-	spkvol_sizer->Add(WiimoteSpkVolumeMinText, 0, wxALIGN_CENTER_VERTICAL);
-	spkvol_sizer->Add(WiimoteSpkVolume);
-	spkvol_sizer->Add(WiimoteSpkVolumeMaxText, 0, wxALIGN_CENTER_VERTICAL);
-
-	choice_sizer->Add(WiiSensBarPosText, 0, wxALIGN_CENTER_VERTICAL);
-	choice_sizer->Add(WiiSensBarPos);
-	choice_sizer->Add(WiiSensBarSensText, 0, wxALIGN_CENTER_VERTICAL);
-	choice_sizer->Add(sensbarsens_sizer);
-	choice_sizer->Add(WiimoteSpkVolumeText, 0, wxALIGN_CENTER_VERTICAL);
-	choice_sizer->Add(spkvol_sizer);
-
-	wxGridSizer* const general_wiimote_sizer = new wxGridSizer(1, 5, 5);
-	general_wiimote_sizer->Add(WiimoteMotor);
-
-	general_sizer->Add(choice_sizer);
-	general_sizer->Add(general_wiimote_sizer);
-
-
-	// Dialog layout
-	main_sizer->Add(wiimote_group, 0, wxEXPAND | wxALL, 5);
-	main_sizer->Add(bb_group, 0, wxEXPAND | wxALL, 5);
-	main_sizer->Add(real_wiimotes_group, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	main_sizer->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Save, this, wxID_OK);
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Cancel, this, wxID_CANCEL);
-
-	SetSizerAndFit(main_sizer);
-	Center();
-}
-
-
-void WiimoteConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
-{
-	InputConfigDialog* const m_emu_config_diag = new InputConfigDialog(this, m_plugin, _trans("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
-	m_emu_config_diag->ShowModal();
-	m_emu_config_diag->Destroy();
-}
-
-void WiimoteConfigDiag::RefreshRealWiimotes(wxCommandEvent&)
-{
-	WiimoteReal::Refresh();
-}
-
-void WiimoteConfigDiag::SelectSource(wxCommandEvent& event)
-{
-	// This needs to be changed now in order for refresh to work right.
-	// Revert if the dialog is canceled.
-	int index = m_wiimote_index_from_ctrl_id[event.GetId()];
-	
-	if(index != WIIMOTE_BALANCE_BOARD)
-	{
-		WiimoteReal::ChangeWiimoteSource(index, event.GetInt());
-		if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID)
-			wiimote_configure_bt[index]->Disable();
-		else
-			wiimote_configure_bt[index]->Enable();
-	}
-	else
-	{
-		WiimoteReal::ChangeWiimoteSource(index, event.GetInt() ? WIIMOTE_SRC_REAL : WIIMOTE_SRC_NONE);	
-	}
-}
-
-void WiimoteConfigDiag::RevertSource()
-{
-	for (int i = 0; i < MAX_BBMOTES; ++i)
-		g_wiimote_sources[i] = m_orig_wiimote_sources[i];
-}
-
-void WiimoteConfigDiag::Save(wxCommandEvent& event)
-{
-	std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + WIIMOTE_INI_NAME ".ini";
-
-	IniFile inifile;
-	inifile.Load(ini_filename);
-
-	for (unsigned int i=0; i<MAX_WIIMOTES; ++i)
-	{
-		std::string secname("Wiimote");
-		secname += (char)('1' + i);
-		IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
-
-		sec.Set("Source", (int)g_wiimote_sources[i]);
-	}
-	
-	std::string secname("BalanceBoard");
-	IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
-	sec.Set("Source", (int)g_wiimote_sources[WIIMOTE_BALANCE_BOARD]);
-
-	inifile.Save(ini_filename);
-
-	event.Skip();
-}
-
-void WiimoteConfigDiag::Cancel(wxCommandEvent& event)
-{
-	RevertSource();
-	event.Skip();
-}
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
deleted file mode 100644
index 977760f579..0000000000
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-#ifndef WIIMOTE_CONFIG_DIAG_H
-#define WIIMOTE_CONFIG_DIAG_H
-
-#include <wx/wx.h>
-#include <wx/listbox.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
-#include "InputConfigDiag.h"
-#include "ConfigManager.h"
-#include <HW/Wiimote.h>
-
-#include <map>
-
-class WiimoteConfigDiag : public wxDialog
-{
-public:
-	WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin);
-
-	void RefreshRealWiimotes(wxCommandEvent& event);
-
-	void SelectSource(wxCommandEvent& event);
-	void RevertSource();
-
-	void ConfigEmulatedWiimote(wxCommandEvent& event);
-	void Save(wxCommandEvent& event);
-
-	void OnSensorBarPos(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_SYSCONF->SetData("BT.BAR", event.GetInt());
-		event.Skip();
-	}
-	void OnSensorBarSensitivity(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_SYSCONF->SetData("BT.SENS", event.GetInt());
-		event.Skip();
-	}
-	void OnSpeakerVolume(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_SYSCONF->SetData("BT.SPKV", event.GetInt());
-		event.Skip();
-	}
-	void OnMotor(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_SYSCONF->SetData("BT.MOT", event.GetInt());
-		event.Skip();
-	}
-	void OnContinuousScanning(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked();
-		WiimoteReal::Initialize();
-		event.Skip();
-	}
-	void OnEnableSpeaker(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_WiimoteEnableSpeaker = event.IsChecked();
-		event.Skip();
-	}
-
-private:
-	void Cancel(wxCommandEvent& event);
-
-	InputPlugin&	m_plugin;
-
-	std::map<wxWindowID, unsigned int> m_wiimote_index_from_ctrl_id;
-	unsigned int m_orig_wiimote_sources[MAX_BBMOTES];
-
-	wxButton* wiimote_configure_bt[MAX_WIIMOTES];
-	std::map<wxWindowID, unsigned int> m_wiimote_index_from_conf_bt_id;
-};
-
-
-#endif
diff --git a/Source/Core/DolphinWX/Src/WxUtils.cpp b/Source/Core/DolphinWX/Src/WxUtils.cpp
deleted file mode 100644
index 173c07fbcc..0000000000
--- a/Source/Core/DolphinWX/Src/WxUtils.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include <wx/wx.h>
-#include <wx/string.h>
-
-#include "WxUtils.h"
-
-namespace WxUtils {
-
-// Launch a file according to its mime type
-void Launch(const char *filename)
-{
-	if (! ::wxLaunchDefaultBrowser(StrToWxStr(filename)))
-	{
-		// WARN_LOG
-	}
-}
-
-// Launch an file explorer window on a certain path
-void Explore(const char *path)
-{
-	wxString wxPath = StrToWxStr(path);
-	// Default to file
-	if (! wxPath.Contains(wxT("://")))
-	{
-		wxPath = wxT("file://") + wxPath;
-	}
-
-#ifdef __WXGTK__
-	wxPath.Replace(wxT(" "), wxT("\\ "));
-#endif
-
-	if (! ::wxLaunchDefaultBrowser(wxPath))
-	{
-		// WARN_LOG
-	}
-}
-
-}  // namespace
-
-std::string WxStrToStr(const wxString& str)
-{
-	return str.ToUTF8().data();
-}
-
-wxString StrToWxStr(const std::string& str)
-{
-	//return wxString::FromUTF8Unchecked(str.c_str());
-	return wxString::FromUTF8(str.c_str());
-}
diff --git a/Source/Core/DolphinWX/Src/WxUtils.h b/Source/Core/DolphinWX/Src/WxUtils.h
deleted file mode 100644
index 9dee725da3..0000000000
--- a/Source/Core/DolphinWX/Src/WxUtils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef WXUTILS_H
-#define WXUTILS_H
-
-#include <string>
-#include <wx/string.h>
-
-namespace WxUtils
-{
-
-// Launch a file according to its mime type
-void Launch(const char *filename);
-
-// Launch an file explorer window on a certain path
-void Explore(const char *path);
-
-}  // namespace
-
-std::string WxStrToStr(const wxString& str);
-wxString StrToWxStr(const std::string& str);
-
-#endif // WXUTILS
diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
deleted file mode 100644
index 9c509add91..0000000000
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "X11Utils.h"
-
-#include <unistd.h>
-#include <spawn.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#if defined(HAVE_WX) && HAVE_WX
-#include <string>
-#include <algorithm>
-#include "WxUtils.h"
-#endif
-
-namespace X11Utils
-{
-
-void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed)
-{
-	XEvent event;
-	Window win = (Window)Core::GetWindowHandle();
-
-	// Init X event structure for mouse button press event
-	event.xbutton.type = pressed ? ButtonPress : ButtonRelease;
-	event.xbutton.x = x;
-	event.xbutton.y = y;
-	event.xbutton.button = button;
-
-	// Send the event
-	if (!XSendEvent(dpy, win, False, False, &event))
-		ERROR_LOG(VIDEO, "Failed to send mouse button event to the emulator window.");
-}
-
-void SendMotionEvent(Display *dpy, int x, int y)
-{
-	XEvent event;
-	Window win = (Window)Core::GetWindowHandle();
-
-	// Init X event structure for mouse motion
-	event.xmotion.type = MotionNotify;
-	event.xmotion.x = x;
-	event.xmotion.y = y;
-
-	// Send the event
-	if (!XSendEvent(dpy, win, False, False, &event))
-		ERROR_LOG(VIDEO, "Failed to send mouse button event to the emulator window.");
-}
-
-void EWMH_Fullscreen(Display *dpy, int action)
-{
-	_assert_(action == _NET_WM_STATE_REMOVE || action == _NET_WM_STATE_ADD
-			|| action == _NET_WM_STATE_TOGGLE);
-
-	Window win = (Window)Core::GetWindowHandle();
-
-	// Init X event structure for _NET_WM_STATE_FULLSCREEN client message
-	XEvent event;
-	event.xclient.type = ClientMessage;
-	event.xclient.message_type = XInternAtom(dpy, "_NET_WM_STATE", False);
-	event.xclient.window = win;
-	event.xclient.format = 32;
-	event.xclient.data.l[0] = action;
-	event.xclient.data.l[1] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-
-	// Send the event
-	if (!XSendEvent(dpy, DefaultRootWindow(dpy), False,
-				SubstructureRedirectMask | SubstructureNotifyMask, &event))
-		ERROR_LOG(VIDEO, "Failed to switch fullscreen/windowed mode.");
-}
-
-
-#if defined(HAVE_WX) && HAVE_WX
-Window XWindowFromHandle(void *Handle)
-{
-	return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle)));
-}
-
-Display *XDisplayFromHandle(void *Handle)
-{
-	return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle)));
-}
-#endif
-
-void InhibitScreensaver(Display *dpy, Window win, bool suspend)
-{
-	char id[11];
-	snprintf(id, sizeof(id), "0x%lx", win);
-
-	// Call xdg-screensaver
-	char *argv[4] = {
-		(char *)"xdg-screensaver",
-		(char *)(suspend ? "suspend" : "resume"),
-		id,
-		NULL};
-	pid_t pid;
-	if (!posix_spawnp(&pid, "xdg-screensaver", NULL, NULL, argv, environ))
-	{
-		int status;
-		while (waitpid (pid, &status, 0) == -1);
-
-		DEBUG_LOG(VIDEO, "Started xdg-screensaver (PID = %d)", (int)pid);
-	}
-}
-
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-XRRConfiguration::XRRConfiguration(Display *_dpy, Window _win)
-	: dpy(_dpy)
-	, win(_win)
-	, screenResources(NULL), outputInfo(NULL), crtcInfo(NULL)
-	, fullMode(0)
-	, fs_fb_width(0), fs_fb_height(0), fs_fb_width_mm(0), fs_fb_height_mm(0)
-	, bValid(true), bIsFullscreen(false)
-{
-	int XRRMajorVersion, XRRMinorVersion;
-
-	if (!XRRQueryVersion(dpy, &XRRMajorVersion, &XRRMinorVersion) ||
-			(XRRMajorVersion < 1 || (XRRMajorVersion == 1 && XRRMinorVersion < 3)))
-	{
-		WARN_LOG(VIDEO, "XRRExtension not supported.");
-		bValid = false;
-		return;
-	}
-
-	screenResources = XRRGetScreenResourcesCurrent(dpy, win);
-
-	screen = DefaultScreen(dpy);
-	fb_width = DisplayWidth(dpy, screen);
-	fb_height = DisplayHeight(dpy, screen);
-	fb_width_mm = DisplayWidthMM(dpy, screen);
-	fb_height_mm = DisplayHeightMM(dpy, screen);
-
-	INFO_LOG(VIDEO, "XRRExtension-Version %d.%d", XRRMajorVersion, XRRMinorVersion);
-	Update();
-}
-
-XRRConfiguration::~XRRConfiguration()
-{
-	if (bValid && bIsFullscreen)
-		ToggleDisplayMode(False);
-	if (screenResources)
-		XRRFreeScreenResources(screenResources);
-	if (outputInfo)
-		XRRFreeOutputInfo(outputInfo);
-	if (crtcInfo)
-		XRRFreeCrtcInfo(crtcInfo);
-}
-
-void XRRConfiguration::Update()
-{
-	if(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution == "Auto")
-		return;
-	
-	if (!bValid)
-		return;
-
-	if (outputInfo)
-	{
-		XRRFreeOutputInfo(outputInfo);
-		outputInfo = NULL;
-	}
-	if (crtcInfo)
-	{
-		XRRFreeCrtcInfo(crtcInfo);
-		crtcInfo = NULL;
-	}
-	fullMode = 0;
-
-	// Get the resolution setings for fullscreen mode
-	unsigned int fullWidth, fullHeight;
-	char *output_name = NULL;
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.find(':') ==
-			std::string::npos)
-	{
-		fullWidth = fb_width;
-		fullHeight = fb_height;
-	}
-	else
-		sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
-				"%m[^:]: %ux%u", &output_name, &fullWidth, &fullHeight);
-
-	for (int i = 0; i < screenResources->noutput; i++)
-	{
-		XRROutputInfo *output_info = XRRGetOutputInfo(dpy, screenResources, screenResources->outputs[i]);
-		if (output_info && output_info->crtc && output_info->connection == RR_Connected)
-		{
-			XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(dpy, screenResources, output_info->crtc);
-			if (crtc_info)
-			{
-				if (!output_name || !strcmp(output_name, output_info->name))
-				{
-					// Use the first output for the default setting.
-					if (!output_name)
-					{
-						output_name = strdup(output_info->name);
-						SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
-							StringFromFormat("%s: %ux%u", output_info->name, fullWidth, fullHeight);
-					}
-					outputInfo = output_info;
-					crtcInfo = crtc_info;
-					for (int j = 0; j < output_info->nmode && fullMode == 0; j++)
-					{
-						for (int k = 0; k < screenResources->nmode && fullMode == 0; k++)
-						{
-							if (output_info->modes[j] == screenResources->modes[k].id)
-							{
-								if (fullWidth == screenResources->modes[k].width &&
-										fullHeight == screenResources->modes[k].height)
-								{
-									fullMode = screenResources->modes[k].id;
-									if (crtcInfo->x + (int)screenResources->modes[k].width > fs_fb_width)
-										fs_fb_width = crtcInfo->x + screenResources->modes[k].width;
-									if (crtcInfo->y + (int)screenResources->modes[k].height > fs_fb_height)
-										fs_fb_height = crtcInfo->y + screenResources->modes[k].height;
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					if (crtc_info->x + (int)crtc_info->width > fs_fb_width)
-						fs_fb_width = crtc_info->x + crtc_info->width;
-					if (crtc_info->y + (int)crtc_info->height > fs_fb_height)
-						fs_fb_height = crtc_info->y + crtc_info->height;
-				}
-			}
-			if (crtc_info && crtcInfo != crtc_info)
-				XRRFreeCrtcInfo(crtc_info);
-		}
-		if (output_info && outputInfo != output_info)
-			XRRFreeOutputInfo(output_info);
-	}
-	fs_fb_width_mm = fs_fb_width * DisplayHeightMM(dpy, screen) / DisplayHeight(dpy, screen);
-	fs_fb_height_mm = fs_fb_height * DisplayHeightMM(dpy, screen) / DisplayHeight(dpy, screen);
-
-	if (output_name)
-		free(output_name);
-
-	if (outputInfo && crtcInfo && fullMode)
-	{
-		INFO_LOG(VIDEO, "Fullscreen Resolution %dx%d", fullWidth, fullHeight);
-	}
-	else
-	{
-		ERROR_LOG(VIDEO, "Failed to obtain fullscreen size.\n"
-				"Using current desktop resolution for fullscreen.");
-	}
-}
-
-void XRRConfiguration::ToggleDisplayMode(bool bFullscreen)
-{
-	if (!bValid || !screenResources || !outputInfo || !crtcInfo || !fullMode)
-		return;
-	if (bFullscreen == bIsFullscreen)
-		return;
-
-	XGrabServer(dpy);
-	if (bFullscreen)
-	{
-		XRRSetCrtcConfig(dpy, screenResources, outputInfo->crtc, CurrentTime,
-				crtcInfo->x, crtcInfo->y, fullMode, crtcInfo->rotation,
-				crtcInfo->outputs, crtcInfo->noutput);
-		XRRSetScreenSize(dpy, win, fs_fb_width, fs_fb_height, fs_fb_width_mm, fs_fb_height_mm);
-		bIsFullscreen = true;
-	}
-	else
-	{
-		XRRSetCrtcConfig(dpy, screenResources, outputInfo->crtc, CurrentTime,
-				crtcInfo->x, crtcInfo->y, crtcInfo->mode, crtcInfo->rotation,
-				crtcInfo->outputs, crtcInfo->noutput);
-		XRRSetScreenSize(dpy, win, fb_width, fb_height, fb_width_mm, fb_height_mm);
-		bIsFullscreen = false;
-	}
-	XUngrabServer(dpy);
-	XSync(dpy, false);
-}
-
-#if defined(HAVE_WX) && HAVE_WX
-void XRRConfiguration::AddResolutions(wxArrayString& arrayStringFor_FullscreenResolution)
-{
-	if (!bValid || !screenResources)
-		return;
-
-	//Get all full screen resolutions for the config dialog
-	for (int i = 0; i < screenResources->noutput; i++)
-	{
-		XRROutputInfo *output_info =
-			XRRGetOutputInfo(dpy, screenResources, screenResources->outputs[i]);
-
-		if (output_info && output_info->crtc && output_info->connection == RR_Connected)
-		{
-			std::vector<std::string> resos;
-			for (int j = 0; j < output_info->nmode; j++)
-				for (int k = 0; k < screenResources->nmode; k++)
-					if (output_info->modes[j] == screenResources->modes[k].id)
-					{
-						const std::string strRes =
-							std::string(output_info->name) + ": " +
-							std::string(screenResources->modes[k].name);
-						// Only add unique resolutions
-						if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
-						{
-							resos.push_back(strRes);
-							arrayStringFor_FullscreenResolution.Add(StrToWxStr(strRes));
-						}
-					}
-		}
-		if (output_info)
-			XRRFreeOutputInfo(output_info);
-	}
-}
-#endif
-
-#endif
-
-}
diff --git a/Source/Core/DolphinWX/Src/X11Utils.h b/Source/Core/DolphinWX/Src/X11Utils.h
deleted file mode 100644
index 1525e8ec09..0000000000
--- a/Source/Core/DolphinWX/Src/X11Utils.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef __X11UTILS_H_
-#define __X11UTILS_H_
-
-#include "Common.h"
-
-#if defined(HAVE_WX) && HAVE_WX
-#include <wx/wx.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#endif
-
-#include <X11/Xlib.h>
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include <X11/extensions/Xrandr.h>
-#endif
-
-#include "Core.h"
-#include "ConfigManager.h"
-
-// EWMH state actions, see
-// http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec
-#define _NET_WM_STATE_REMOVE        0    // remove/unset property
-#define _NET_WM_STATE_ADD           1    // add/set property
-#define _NET_WM_STATE_TOGGLE        2    // toggle property
-
-namespace X11Utils
-{
-
-void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed);
-void SendMotionEvent(Display *dpy, int x, int y);
-void EWMH_Fullscreen(Display *dpy, int action);
-#if defined(HAVE_WX) && HAVE_WX
-Window XWindowFromHandle(void *Handle);
-Display *XDisplayFromHandle(void *Handle);
-#endif
-
-void InhibitScreensaver(Display *dpy, Window win, bool suspend);
-
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
-class XRRConfiguration
-{
-	public:
-		XRRConfiguration(Display *_dpy, Window _win);
-		~XRRConfiguration();
-
-		void Update();
-		void ToggleDisplayMode(bool bFullscreen);
-#if defined(HAVE_WX) && HAVE_WX
-		void AddResolutions(wxArrayString& arrayStringFor_FullscreenResolution);
-#endif
-
-	private:
-		Display *dpy;
-		Window win;
-		int screen;
-		XRRScreenResources *screenResources;
-		XRROutputInfo *outputInfo;
-		XRRCrtcInfo *crtcInfo;
-		RRMode fullMode;
-		int fb_width, fb_height, fb_width_mm, fb_height_mm;
-		int fs_fb_width, fs_fb_height, fs_fb_width_mm, fs_fb_height_mm;
-		bool bValid;
-		bool bIsFullscreen;
-};
-#endif
-
-}
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/stdafx.cpp b/Source/Core/DolphinWX/Src/stdafx.cpp
deleted file mode 100644
index b602b39925..0000000000
--- a/Source/Core/DolphinWX/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
diff --git a/Source/Core/DolphinWX/Src/stdafx.h b/Source/Core/DolphinWX/Src/stdafx.h
deleted file mode 100644
index 63a82873e1..0000000000
--- a/Source/Core/DolphinWX/Src/stdafx.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __STDAFX_H_
-#define __STDAFX_H_
-
-#ifdef _WIN32
-
-// Change these values to use different versions
-#define WINVER          0x0400
-#define _WIN32_WINNT    0x0501
-#define _WIN32_IE       0x0500
-#define _RICHEDIT_VER   0x0100
-
-#define WIN32_LEAN_AND_MEAN
-#include <wx/wx.h> // wxWidgets
-
-#if defined _M_IX86
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
-#elif defined _M_IA64
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
-#elif defined _M_X64
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
-#else
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
-#endif
-
-#endif
-
-#endif
diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp
new file mode 100644
index 0000000000..40ced03275
--- /dev/null
+++ b/Source/Core/DolphinWX/TASInputDlg.cpp
@@ -0,0 +1,1073 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <wx/bitmap.h>
+#include <wx/checkbox.h>
+#include <wx/dcmemory.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/statbmp.h>
+#include <wx/textctrl.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/Movie.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
+#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "DolphinWX/TASInputDlg.h"
+#include "InputCommon/GCPadStatus.h"
+#include "InputCommon/InputConfig.h"
+
+
+TASInputDlg::TASInputDlg(wxWindow* parent, wxWindowID id, const wxString& title,
+                         const wxPoint& position, const wxSize& size, long style)
+: wxDialog(parent, id, title, position, size, style)
+{
+}
+
+void TASInputDlg::CreateBaseLayout()
+{
+	for (unsigned int i = 0; i < ArraySize(m_controls); ++i)
+		m_controls[i] = nullptr;
+	for (unsigned int i = 0; i <  ArraySize(m_buttons); ++i)
+		m_buttons[i] = nullptr;
+	for (unsigned int i = 0; i <  ArraySize(m_cc_controls); ++i)
+		m_cc_controls[i] = nullptr;
+
+	m_buttons[0] = &m_dpad_down;
+	m_buttons[1] = &m_dpad_up;
+	m_buttons[2] = &m_dpad_left;
+	m_buttons[3] = &m_dpad_right;
+	m_buttons[4] = &m_a;
+	m_buttons[5] = &m_b;
+	m_controls[0] = &m_main_stick.x_cont;
+	m_controls[1] = &m_main_stick.y_cont;
+
+	m_a = CreateButton("A");
+	m_b = CreateButton("B");
+	m_dpad_up = CreateButton("Up");
+	m_dpad_right = CreateButton("Right");
+	m_dpad_down = CreateButton("Down");
+	m_dpad_left = CreateButton("Left");
+
+	m_buttons_dpad = new wxGridSizer(3);
+	m_buttons_dpad->AddSpacer(20);
+	m_buttons_dpad->Add(m_dpad_up.checkbox);
+	m_buttons_dpad->AddSpacer(20);
+	m_buttons_dpad->Add(m_dpad_left.checkbox);
+	m_buttons_dpad->AddSpacer(20);
+	m_buttons_dpad->Add(m_dpad_right.checkbox);
+	m_buttons_dpad->AddSpacer(20);
+	m_buttons_dpad->Add(m_dpad_down.checkbox);
+	m_buttons_dpad->AddSpacer(20);
+
+	Bind(wxEVT_CLOSE_WINDOW, &TASInputDlg::OnCloseWindow, this);
+	Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this);
+}
+
+const int TASInputDlg::m_gc_pad_buttons_bitmask[12] = {
+	PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT, PAD_BUTTON_A, PAD_BUTTON_B,
+	PAD_BUTTON_X, PAD_BUTTON_Y, PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START
+};
+
+const int TASInputDlg::m_wii_buttons_bitmask[11] = {
+	WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP, WiimoteEmu::Wiimote::PAD_LEFT,
+	WiimoteEmu::Wiimote::PAD_RIGHT, WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B,
+	WiimoteEmu::Wiimote::BUTTON_ONE, WiimoteEmu::Wiimote::BUTTON_TWO, WiimoteEmu::Wiimote::BUTTON_PLUS,
+	WiimoteEmu::Wiimote::BUTTON_MINUS, WiimoteEmu::Wiimote::BUTTON_HOME,
+};
+
+const int TASInputDlg::m_cc_buttons_bitmask[15] = {
+	WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP, WiimoteEmu::Classic::PAD_LEFT,
+	WiimoteEmu::Classic::PAD_RIGHT, WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B,
+	WiimoteEmu::Classic::BUTTON_X, WiimoteEmu::Classic::BUTTON_Y, WiimoteEmu::Classic::BUTTON_PLUS,
+	WiimoteEmu::Classic::BUTTON_MINUS, WiimoteEmu::Classic::TRIGGER_L, WiimoteEmu::Classic::TRIGGER_R,
+	WiimoteEmu::Classic::BUTTON_ZR, WiimoteEmu::Classic::BUTTON_ZL, WiimoteEmu::Classic::BUTTON_HOME,
+};
+
+const std::string TASInputDlg::m_cc_button_names[] = {
+	"Down", "Up", "Left", "Right", "A", "B", "X", "Y", "+", "-", "L", "R", "ZR", "ZL", "Home"
+};
+
+void TASInputDlg::CreateWiiLayout(int num)
+{
+	if (m_has_layout)
+		return;
+
+	CreateBaseLayout();
+
+	m_buttons[6] = &m_one;
+	m_buttons[7] = &m_two;
+	m_buttons[8] = &m_plus;
+	m_buttons[9] = &m_minus;
+	m_buttons[10] = &m_home;
+
+	m_controls[4] = &m_x_cont;
+	m_controls[5] = &m_y_cont;
+	m_controls[6] = &m_z_cont;
+
+	m_main_stick = CreateStick(ID_MAIN_STICK, 1024, 768, 512, 384, true, false);
+	m_main_stick_szr = CreateStickLayout(&m_main_stick, _("IR"));
+
+	m_x_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 512);
+	m_y_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 512);
+	m_z_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 616);
+	wxStaticBoxSizer* const axisBox = CreateAccelLayout(&m_x_cont, &m_y_cont, &m_z_cont, _("Orientation"));
+
+	wxStaticBoxSizer* const m_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
+	wxGridSizer* const m_buttons_grid = new wxGridSizer(4);
+
+	m_plus = CreateButton("+");
+	m_minus = CreateButton("-");
+	m_one = CreateButton("1");
+	m_two = CreateButton("2");
+	m_home = CreateButton("Home");
+
+	m_main_szr = new wxBoxSizer(wxVERTICAL);
+	m_wiimote_szr = new wxBoxSizer(wxHORIZONTAL);
+	m_ext_szr = new wxBoxSizer(wxHORIZONTAL);
+	m_cc_szr = CreateCCLayout();
+
+	if (Core::IsRunning())
+	{
+		m_ext = ((WiimoteEmu::Wiimote*)Wiimote::GetConfig()->controllers[num])->CurrentExtension();
+	}
+	else
+	{
+		IniFile ini;
+		ini.Load(File::GetUserPath(D_CONFIG_IDX) + "WiimoteNew.ini");
+		std::string extension;
+		ini.GetIfExists("Wiimote" + std::to_string(num + 1), "Extension", &extension);
+
+		if (extension == "Nunchuk")
+			m_ext = 1;
+		if (extension == "Classic")
+			m_ext = 2;
+	}
+
+	m_buttons[11] = &m_c;
+	m_buttons[12] = &m_z;
+	m_controls[2] = &m_c_stick.x_cont;
+	m_controls[3] = &m_c_stick.y_cont;
+	m_controls[7] = &m_nx_cont;
+	m_controls[8] = &m_ny_cont;
+	m_controls[9] = &m_nz_cont;
+
+	m_c_stick = CreateStick(ID_C_STICK, 255, 255, 128, 128, false, true);
+	m_c_stick_szr = CreateStickLayout(&m_c_stick, _("Nunchuk stick"));
+
+	m_nx_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 512);
+	m_ny_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 512);
+	m_nz_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 1023, 512);
+	wxStaticBoxSizer* const nunchukaxisBox = CreateAccelLayout(&m_nx_cont, &m_ny_cont, &m_nz_cont, _("Nunchuk orientation"));
+
+	m_c = CreateButton("C");
+	m_z = CreateButton("Z");
+	m_ext_szr->Add(m_c_stick_szr, 0, wxLEFT | wxBOTTOM | wxRIGHT, 5);
+	m_ext_szr->Add(nunchukaxisBox);
+
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr)
+			control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this);
+	}
+
+	for (unsigned int i = 4; i < ArraySize(m_buttons); ++i)
+		if (m_buttons[i] != nullptr)
+			m_buttons_grid->Add(m_buttons[i]->checkbox);
+	m_buttons_grid->AddSpacer(5);
+
+	m_buttons_box->Add(m_buttons_grid);
+	m_buttons_box->Add(m_buttons_dpad);
+
+	m_wiimote_szr->Add(m_main_stick_szr, 0, wxALL, 5);
+	m_wiimote_szr->Add(axisBox, 0, wxTOP | wxRIGHT, 5);
+	m_wiimote_szr->Add(m_buttons_box, 0, wxTOP | wxRIGHT, 5);
+	m_main_szr->Add(m_wiimote_szr);
+	m_main_szr->Add(m_ext_szr);
+	m_main_szr->Add(m_cc_szr);
+
+	HandleExtensionChange();
+	m_has_layout = true;
+}
+
+wxBoxSizer* TASInputDlg::CreateCCLayout()
+{
+	wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
+
+	for (size_t i = 0; i < ArraySize(m_cc_buttons); ++i)
+		m_cc_buttons[i] = CreateButton(m_cc_button_names[i]);
+
+	m_cc_l_stick = CreateStick(ID_CC_L_STICK, 63, 63, WiimoteEmu::Classic::LEFT_STICK_CENTER_X, WiimoteEmu::Classic::LEFT_STICK_CENTER_Y, false, true);
+	m_cc_r_stick = CreateStick(ID_CC_R_STICK, 31, 31, WiimoteEmu::Classic::RIGHT_STICK_CENTER_X, WiimoteEmu::Classic::RIGHT_STICK_CENTER_Y, false, true);
+
+	m_cc_controls[CC_L_STICK_X] = &m_cc_l_stick.x_cont;
+	m_cc_controls[CC_L_STICK_Y] = &m_cc_l_stick.y_cont;
+	m_cc_controls[CC_R_STICK_X] = &m_cc_r_stick.x_cont;
+	m_cc_controls[CC_R_STICK_Y] = &m_cc_r_stick.y_cont;
+	m_cc_controls[CC_L_TRIGGER] = &m_cc_l;
+	m_cc_controls[CC_R_TRIGGER] = &m_cc_r;
+
+	m_cc_l_stick_szr = CreateStickLayout(&m_cc_l_stick, _("Left stick"));
+	m_cc_r_stick_szr = CreateStickLayout(&m_cc_r_stick, _("Right stick"));
+
+	m_cc_l = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0);;
+	m_cc_r = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0);;
+
+	wxStaticBoxSizer* const shoulder_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons"));
+	shoulder_box->Add(m_cc_l.slider, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_cc_l.text, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_cc_r.slider, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_cc_r.text, 0, wxALIGN_CENTER_VERTICAL);
+
+	wxStaticBoxSizer* const cc_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
+	wxGridSizer* const cc_buttons_grid = new wxGridSizer(4);
+	wxGridSizer* const cc_buttons_dpad = new wxGridSizer(3);
+
+	cc_buttons_dpad->AddSpacer(20);
+	cc_buttons_dpad->Add(m_cc_buttons[1].checkbox);
+	cc_buttons_dpad->AddSpacer(20);
+	cc_buttons_dpad->Add(m_cc_buttons[2].checkbox);
+	cc_buttons_dpad->AddSpacer(20);
+	cc_buttons_dpad->Add(m_cc_buttons[3].checkbox);
+	cc_buttons_dpad->AddSpacer(20);
+	cc_buttons_dpad->Add(m_cc_buttons[0].checkbox);
+	cc_buttons_dpad->AddSpacer(20);
+
+
+	for (auto button : m_cc_buttons)
+		cc_buttons_grid->Add(button.checkbox);
+	cc_buttons_grid->AddSpacer(5);
+
+	cc_buttons_box->Add(cc_buttons_grid);
+	cc_buttons_box->Add(cc_buttons_dpad);
+
+	szr->Add(m_cc_l_stick_szr, 0, wxALL, 5);
+	szr->Add(m_cc_r_stick_szr, 0, wxALL, 5);
+	szr->Add(shoulder_box, 0, wxLEFT | wxRIGHT, 5);
+	szr->Add(cc_buttons_box, 0, wxTOP | wxRIGHT, 5);
+
+	for (Control* const control : m_cc_controls)
+	{
+		if (control != nullptr)
+			control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this);
+	}
+	return szr;
+}
+
+void TASInputDlg::HandleExtensionChange()
+{
+	if (m_ext == 1)
+	{
+		m_main_szr->Hide(m_cc_szr);
+		m_main_szr->Show(m_wiimote_szr);
+		m_main_szr->Show(m_ext_szr);
+	}
+	else if (m_ext == 2)
+	{
+		m_main_szr->Hide(m_ext_szr);
+		m_main_szr->Hide(m_wiimote_szr);
+		m_main_szr->Show(m_cc_szr);
+	}
+	else
+	{
+		m_main_szr->Hide(m_ext_szr);
+		m_main_szr->Hide(m_cc_szr);
+		m_main_szr->Show(m_wiimote_szr);
+	}
+	SetSizerAndFit(m_main_szr, true);
+	ResetValues();
+}
+
+void TASInputDlg::CreateGCLayout()
+{
+	if (m_has_layout)
+		return;
+
+	CreateBaseLayout();
+
+	m_buttons[6] = &m_x;
+	m_buttons[7] = &m_y;
+	m_buttons[8] = &m_z;
+	m_buttons[9] = &m_l;
+	m_buttons[10] = &m_r;
+	m_buttons[11] = &m_start;
+
+	m_controls[2] = &m_c_stick.x_cont;
+	m_controls[3] = &m_c_stick.y_cont;
+	m_controls[4] = &m_l_cont;
+	m_controls[5] = &m_r_cont;
+
+	wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
+	m_main_stick = CreateStick(ID_MAIN_STICK, 255, 255, 128, 128, false, true);
+	wxStaticBoxSizer* const main_box = CreateStickLayout(&m_main_stick, _("Main Stick"));
+
+	m_c_stick = CreateStick(ID_C_STICK, 255, 255, 128, 128, false, true);
+	wxStaticBoxSizer* const c_box = CreateStickLayout(&m_c_stick, _("C Stick"));
+
+	wxStaticBoxSizer* const shoulder_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons"));
+	m_l_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 255, 0);
+	m_r_cont = CreateControl(wxSL_VERTICAL, -1, 100, false, 255, 0);
+	shoulder_box->Add(m_l_cont.slider, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_l_cont.text, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_r_cont.slider, 0, wxALIGN_CENTER_VERTICAL);
+	shoulder_box->Add(m_r_cont.text, 0, wxALIGN_CENTER_VERTICAL);
+
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr)
+			control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this);
+	}
+
+	wxStaticBoxSizer* const m_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
+	wxGridSizer* const m_buttons_grid = new wxGridSizer(4);
+
+	m_x = CreateButton("X");
+	m_y = CreateButton("Y");
+	m_l = CreateButton("L");
+	m_r = CreateButton("R");
+	m_z = CreateButton("Z");
+	m_start = CreateButton("Start");
+
+	for (unsigned int i = 4; i < ArraySize(m_buttons); ++i)
+		if (m_buttons[i] != nullptr)
+			m_buttons_grid->Add(m_buttons[i]->checkbox, false);
+	m_buttons_grid->AddSpacer(5);
+
+	m_buttons_box->Add(m_buttons_grid);
+	m_buttons_box->Add(m_buttons_dpad);
+
+	wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
+
+	top_box->Add(main_box, 0, wxALL, 5);
+	top_box->Add(c_box, 0, wxTOP | wxRIGHT, 5);
+	bottom_box->Add(shoulder_box, 0, wxLEFT | wxRIGHT, 5);
+	bottom_box->Add(m_buttons_box, 0, wxBOTTOM, 5);
+	main_szr->Add(top_box);
+	main_szr->Add(bottom_box);
+	SetSizerAndFit(main_szr);
+
+	ResetValues();
+	m_has_layout = true;
+}
+
+
+TASInputDlg::Control TASInputDlg::CreateControl(long style, int width, int height, bool reverse, u32 range, u32 default_value)
+{
+	Control tempCont;
+	tempCont.range = range;
+	tempCont.default_value = default_value;
+	tempCont.slider = new wxSlider(this, m_eleID++, default_value, 0, range, wxDefaultPosition, wxDefaultSize, style);
+	tempCont.slider->SetMinSize(wxSize(width, height));
+	tempCont.slider->Bind(wxEVT_SLIDER, &TASInputDlg::UpdateFromSliders, this);
+	tempCont.text = new wxTextCtrl(this, m_eleID++, std::to_string(default_value), wxDefaultPosition, wxSize(40, 20));
+	tempCont.text->SetMaxLength(range > 999 ? 4 : 3);
+	tempCont.text_id = m_eleID - 1;
+	tempCont.text->Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this);
+	tempCont.slider_id = m_eleID - 2;
+	tempCont.reverse = reverse;
+	return tempCont;
+}
+
+TASInputDlg::Stick TASInputDlg::CreateStick(int id_stick, int xRange, int yRange, u32 defaultX, u32 defaultY, bool reverseX, bool reverseY)
+{
+	Stick tempStick;
+	tempStick.bitmap = new wxStaticBitmap(this, id_stick, CreateStickBitmap(128, 128));
+	tempStick.bitmap->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this);
+	tempStick.bitmap->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this);
+	tempStick.bitmap->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
+	tempStick.x_cont = CreateControl(wxSL_HORIZONTAL | (reverseX ? wxSL_INVERSE : 0), 120, -1, reverseX, xRange, defaultX);
+	tempStick.y_cont = CreateControl(wxSL_VERTICAL | (reverseY ? wxSL_INVERSE : 0), -1, 120, reverseY, yRange, defaultY);
+	return tempStick;
+}
+
+wxStaticBoxSizer* TASInputDlg::CreateStickLayout(Stick* tempStick, const wxString& title)
+{
+	wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxHORIZONTAL, this, title);
+	wxBoxSizer* const temp_xslider_box = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer* const temp_yslider_box = new wxBoxSizer(wxVERTICAL);
+	wxBoxSizer* const temp_stick_box = new wxBoxSizer(wxVERTICAL);
+
+	temp_xslider_box->Add(tempStick->x_cont.slider, 0, wxALIGN_TOP);
+	temp_xslider_box->Add(tempStick->x_cont.text, 0, wxALIGN_TOP);
+	temp_stick_box->Add(temp_xslider_box);
+	temp_stick_box->Add(tempStick->bitmap, 0, wxALL | wxALIGN_CENTER, 3);
+	temp_box->Add(temp_stick_box);
+	temp_yslider_box->Add(tempStick->y_cont.slider, 0, wxALIGN_CENTER_VERTICAL);
+	temp_yslider_box->Add(tempStick->y_cont.text, 0, wxALIGN_CENTER_VERTICAL);
+	temp_box->Add(temp_yslider_box);
+	return temp_box;
+}
+
+wxStaticBoxSizer* TASInputDlg::CreateAccelLayout(Control* x, Control* y, Control* z, const wxString& title)
+{
+	wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxHORIZONTAL, this, title);
+	wxStaticBoxSizer* const xBox = new wxStaticBoxSizer(wxVERTICAL, this, _("X"));
+	wxStaticBoxSizer* const yBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Y"));
+	wxStaticBoxSizer* const zBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Z"));
+
+	xBox->Add(x->slider, 0, wxALIGN_CENTER_VERTICAL);
+	xBox->Add(x->text, 0, wxALIGN_CENTER_VERTICAL);
+	yBox->Add(y->slider, 0, wxALIGN_CENTER_VERTICAL);
+	yBox->Add(y->text, 0, wxALIGN_CENTER_VERTICAL);
+	zBox->Add(z->slider, 0, wxALIGN_CENTER_VERTICAL);
+	zBox->Add(z->text, 0, wxALIGN_CENTER_VERTICAL);
+	temp_box->Add(xBox, 0, wxLEFT | wxBOTTOM | wxRIGHT, 5);
+	temp_box->Add(yBox, 0, wxRIGHT, 5);
+	temp_box->Add(zBox, 0, wxRIGHT, 5);
+	return temp_box;
+}
+
+TASInputDlg::Button TASInputDlg::CreateButton(const std::string& name)
+{
+	Button temp;
+	wxCheckBox* checkbox = new wxCheckBox(this, m_eleID++, name);
+	checkbox->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
+	checkbox->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurbo, this);
+	temp.checkbox = checkbox;
+	temp.id = m_eleID - 1;
+	return temp;
+}
+
+void TASInputDlg::ResetValues()
+{
+	for (Button* const button : m_buttons)
+	{
+		if (button != nullptr)
+			button->checkbox->SetValue(false);
+	}
+
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr)
+		{
+			control->value = control->default_value;
+			control->slider->SetValue(control->default_value);
+			control->text->SetValue(std::to_string(control->default_value));
+		}
+	}
+	if (m_ext == 2)
+	{
+		for (Button const button : m_cc_buttons)
+			button.checkbox->SetValue(false);
+
+		for (Control* const control : m_cc_controls)
+		{
+			control->value = control->default_value;
+			control->slider->SetValue(control->default_value);
+			control->text->SetValue(std::to_string(control->default_value));
+		}
+	}
+}
+
+void TASInputDlg::SetStickValue(bool* ActivatedByKeyboard, int* AmountPressed, wxTextCtrl* Textbox, int CurrentValue, int center)
+{
+	if (CurrentValue != center)
+	{
+		*AmountPressed = CurrentValue;
+		*ActivatedByKeyboard = true;
+	}
+	else if (*ActivatedByKeyboard)
+	{
+		*AmountPressed = center;
+		*ActivatedByKeyboard = false;
+	}
+	else
+	{
+		return;
+	}
+
+	Textbox->ChangeValue(std::to_string(*AmountPressed));
+	wxCommandEvent* evt = new wxCommandEvent(wxEVT_TEXT, Textbox->GetId());
+	evt->SetEventObject(Textbox);
+	wxQueueEvent(this, evt);
+}
+
+void TASInputDlg::SetSliderValue(Control* control, int CurrentValue)
+{
+	if (CurrentValue != (int)control->default_value)
+	{
+		control->value = CurrentValue;
+		control->set_by_keyboard = true;
+		control->text->ChangeValue(std::to_string(CurrentValue));
+	}
+	else if (control->set_by_keyboard)
+	{
+		control->value = control->default_value;
+		control->set_by_keyboard = false;
+		control->text->ChangeValue(std::to_string(control->default_value));
+	}
+	else
+	{
+		return;
+	}
+
+	wxCommandEvent* evt = new wxCommandEvent(wxEVT_TEXT, control->text_id);
+	evt->SetEventObject(control->text);
+	wxQueueEvent(this, evt);
+}
+
+void TASInputDlg::SetButtonValue(Button* button, bool CurrentState)
+{
+	if (CurrentState)
+	{
+		button->set_by_keyboard = true;
+		button->checkbox->SetValue(CurrentState);
+	}
+	else if (button->set_by_keyboard)
+	{
+		button->set_by_keyboard = false;
+		button->checkbox->SetValue(CurrentState);
+	}
+}
+
+void TASInputDlg::SetWiiButtons(u16* butt)
+{
+	for (unsigned int i = 0; i < 11; ++i)
+	{
+		if (m_buttons[i] != nullptr)
+			*butt |= (m_buttons[i]->checkbox->IsChecked()) ? m_wii_buttons_bitmask[i] : 0;
+	}
+	ButtonTurbo();
+}
+
+void TASInputDlg::GetKeyBoardInput(GCPadStatus* PadStatus)
+{
+	SetStickValue(&m_main_stick.x_cont.set_by_keyboard, &m_main_stick.x_cont.value, m_main_stick.x_cont.text, PadStatus->stickX);
+	SetStickValue(&m_main_stick.y_cont.set_by_keyboard, &m_main_stick.y_cont.value, m_main_stick.y_cont.text, PadStatus->stickY);
+
+	SetStickValue(&m_c_stick.x_cont.set_by_keyboard, &m_c_stick.x_cont.value, m_c_stick.x_cont.text, PadStatus->substickX);
+	SetStickValue(&m_c_stick.y_cont.set_by_keyboard, &m_c_stick.y_cont.value, m_c_stick.y_cont.text, PadStatus->substickY);
+	SetSliderValue(&m_l_cont, PadStatus->triggerLeft);
+	SetSliderValue(&m_r_cont, PadStatus->triggerRight);
+
+	for (unsigned int i = 0; i < ArraySize(m_buttons); ++i)
+	{
+		if (m_buttons[i] != nullptr)
+			SetButtonValue(m_buttons[i], ((PadStatus->button & m_gc_pad_buttons_bitmask[i]) != 0));
+	}
+	SetButtonValue(&m_l, ((PadStatus->triggerLeft) == 255) || ((PadStatus->button & PAD_TRIGGER_L) != 0));
+	SetButtonValue(&m_r, ((PadStatus->triggerRight) == 255) || ((PadStatus->button & PAD_TRIGGER_R) != 0));
+}
+
+void TASInputDlg::GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key)
+{
+	u8* const coreData = rptf.core ? (data + rptf.core) : nullptr;
+	u8* const accelData = rptf.accel ? (data + rptf.accel) : nullptr;
+	//u8* const irData = rptf.ir ? (data + rptf.ir) : nullptr;
+	u8* const extData = rptf.ext ? (data + rptf.ext) : nullptr;
+
+	if (coreData)
+	{
+		for (unsigned int i = 0; i < 11; ++i)
+		{
+			if (m_buttons[i] != nullptr)
+				SetButtonValue(m_buttons[i], (((wm_buttons*)coreData)->hex & m_wii_buttons_bitmask[i]) != 0);
+		}
+	}
+	if (accelData)
+	{
+		wm_accel* dt = (wm_accel*)accelData;
+
+		SetSliderValue(&m_x_cont, dt->x << 2 | ((wm_buttons*)coreData)->acc_x_lsb);
+		SetSliderValue(&m_y_cont, dt->y << 2 | ((wm_buttons*)coreData)->acc_y_lsb << 1);
+		SetSliderValue(&m_z_cont, dt->z << 2 | ((wm_buttons*)coreData)->acc_z_lsb << 1);
+	}
+
+	// I don't think this can be made to work in a sane manner.
+	//if (irData)
+	//{
+	//	u16 x = 1023 - (irData[0] | ((irData[2] >> 4 & 0x3) << 8));
+	//	u16 y = irData[1] | ((irData[2] >> 6 & 0x3) << 8);
+
+	//	SetStickValue(&m_main_stick.x_cont.set_by_keyboard, &m_main_stick.x_cont.value, m_main_stick.x_cont.text, x, 561);
+	//	SetStickValue(&m_main_stick.y_cont.set_by_keyboard, &m_main_stick.y_cont.value, m_main_stick.y_cont.text, y, 486);
+	//}
+
+	if (extData && ext == 1)
+	{
+		wm_nc& nunchuk = *(wm_nc*)extData;
+		WiimoteDecrypt(&key, (u8*)&nunchuk, 0, sizeof(wm_nc));
+		nunchuk.bt.hex = nunchuk.bt.hex ^ 0x3;
+		SetButtonValue(m_buttons[11], nunchuk.bt.c != 0);
+		SetButtonValue(m_buttons[12], nunchuk.bt.z != 0);
+	}
+
+	if (extData && ext == 2)
+	{
+		wm_classic_extension& cc = *(wm_classic_extension*)extData;
+		WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
+		cc.bt.hex = cc.bt.hex ^ 0xFFFF;
+		for (unsigned int i = 0; i < 15; ++i)
+		{
+			SetButtonValue(&m_cc_buttons[i], ((cc.bt.hex & m_cc_buttons_bitmask[i]) != 0));
+		}
+
+		if (m_cc_l.value == 31)
+			m_cc_buttons[10].checkbox->SetValue(true);
+		if (m_cc_r.value == 31)
+			m_cc_buttons[11].checkbox->SetValue(true);
+
+		SetSliderValue(&m_cc_l_stick.x_cont, cc.regular_data.lx);
+		SetSliderValue(&m_cc_l_stick.y_cont, cc.regular_data.ly);
+
+		SetSliderValue(&m_cc_r_stick.x_cont, cc.rx1 | (cc.rx2 << 1) | (cc.rx3 << 3));
+		SetSliderValue(&m_cc_r_stick.y_cont, cc.ry);
+	}
+}
+
+void TASInputDlg::GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key)
+{
+	if (!IsShown() || !m_has_layout)
+		return;
+
+	GetKeyBoardInput(data, rptf, ext, key);
+
+	u8* const coreData = rptf.core ? (data + rptf.core) : nullptr;
+	u8* const accelData = rptf.accel ? (data + rptf.accel) : nullptr;
+	u8* const irData = rptf.ir ? (data + rptf.ir) : nullptr;
+	u8* const extData = rptf.ext ? (data + rptf.ext) : nullptr;
+	if (ext != 2)
+	{
+	if (coreData)
+		SetWiiButtons(&((wm_buttons*)coreData)->hex);
+
+	if (accelData)
+	{
+		wm_accel& dt = *(wm_accel*)accelData;
+		wm_buttons& but = *(wm_buttons*)coreData;
+		dt.x = m_x_cont.value >> 2;
+		dt.y = m_y_cont.value >> 2;
+		dt.z = m_z_cont.value >> 2;
+		but.acc_x_lsb = m_x_cont.value & 0x3;
+		but.acc_y_lsb = m_y_cont.value >> 1 & 0x1;
+		but.acc_z_lsb = m_z_cont.value >> 1 & 0x1;
+	}
+	if (irData)
+	{
+		u16 x[4];
+		u16 y;
+
+		x[0] = m_main_stick.x_cont.value;
+		y = m_main_stick.y_cont.value;
+		x[1] = x[0] + 100;
+		x[2] = x[0] - 10;
+		x[3] = x[1] + 10;
+
+		u8 mode;
+		// Mode 5 not supported in core anyway.
+		if (rptf.ext)
+			mode = (rptf.ext - rptf.ir) == 10 ? 1 : 3;
+		else
+			mode = (rptf.size - rptf.ir) == 10 ? 1 : 3;
+
+		if (mode == 1)
+		{
+			memset(irData, 0xFF, sizeof(wm_ir_basic) * 2);
+			wm_ir_basic* ir_data = (wm_ir_basic*)irData;
+			for (unsigned int i = 0; i < 2; ++i)
+			{
+				if (x[i * 2] < 1024 && y < 768)
+				{
+					ir_data[i].x1 = static_cast<u8>(x[i*2]);
+					ir_data[i].x1hi = x[i*2] >> 8;
+
+					ir_data[i].y1 = static_cast<u8>(y);
+					ir_data[i].y1hi = y >> 8;
+				}
+				if (x[i*2 + 1] < 1024 && y < 768)
+				{
+					ir_data[i].x2 = static_cast<u8>(x[i*2 + 1]);
+					ir_data[i].x2hi = x[i*2 + 1] >> 8;
+
+					ir_data[i].y2 = static_cast<u8>(y);
+					ir_data[i].y2hi = y >> 8;
+				}
+			}
+		}
+		else
+		{
+			memset(data, 0xFF, sizeof(wm_ir_extended) * 4);
+			wm_ir_extended* const ir_data = (wm_ir_extended*)irData;
+			for (unsigned int i = 0; i < 4; ++i)
+			{
+				if (x[i] < 1024 && y < 768)
+				{
+					ir_data[i].x = static_cast<u8>(x[i]);
+					ir_data[i].xhi = x[i] >> 8;
+
+					ir_data[i].y = static_cast<u8>(y);
+					ir_data[i].yhi = y >> 8;
+
+					ir_data[i].size = 10;
+				}
+			}
+		}
+	}
+	}
+	if (ext != m_ext)
+	{
+		m_ext = ext;
+		HandleExtensionChange();
+	}
+	else if (extData && ext == 1)
+	{
+		wm_nc& nunchuk = *(wm_nc*)extData;
+
+		nunchuk.jx = m_c_stick.x_cont.value;
+		nunchuk.jy = m_c_stick.y_cont.value;
+
+		nunchuk.ax    = m_nx_cont.value >> 2;
+		nunchuk.bt.acc_x_lsb = m_nx_cont.value & 0x3;
+		nunchuk.ay    = m_ny_cont.value >> 2;
+		nunchuk.bt.acc_y_lsb = m_ny_cont.value & 0x3;
+		nunchuk.az    = m_nz_cont.value >> 2;
+		nunchuk.bt.acc_z_lsb = m_nz_cont.value & 0x3;
+
+		nunchuk.bt.hex |= (m_buttons[11]->checkbox->IsChecked()) ? WiimoteEmu::Nunchuk::BUTTON_C : 0;
+		nunchuk.bt.hex |= (m_buttons[12]->checkbox->IsChecked()) ? WiimoteEmu::Nunchuk::BUTTON_Z : 0;
+		nunchuk.bt.hex = nunchuk.bt.hex ^ 0x3;
+		WiimoteEncrypt(&key, (u8*)&nunchuk, 0, sizeof(wm_nc));
+	}
+	else if (extData && ext == 2)
+	{
+		wm_classic_extension& cc = *(wm_classic_extension*)extData;
+		WiimoteDecrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
+		cc.bt.hex = 0;
+
+		for (unsigned int i = 0; i < ArraySize(m_cc_buttons); ++i)
+		{
+			cc.bt.hex |= (m_cc_buttons[i].checkbox->IsChecked()) ? m_cc_buttons_bitmask[i] : 0;
+		}
+		cc.bt.hex ^= 0xFFFF;
+
+		u16 rx = m_cc_r_stick.x_cont.value;
+		cc.rx1 = rx & 0x1;
+		cc.rx2 = (rx >> 1) & 0x3;
+		cc.rx3 = (rx >> 3) & 0x3;
+		cc.ry = m_cc_r_stick.y_cont.value;
+
+		cc.regular_data.lx = m_cc_l_stick.x_cont.value;
+		cc.regular_data.ly = m_cc_l_stick.y_cont.value;
+
+		cc.rt = m_cc_r.value;
+		cc.lt1 = m_cc_l.value & 0x7;
+		cc.lt2 = (m_cc_l.value >> 3) & 0x3;
+
+		WiimoteEncrypt(&key, (u8*)&cc, 0, sizeof(wm_classic_extension));
+	}
+}
+
+void TASInputDlg::GetValues(GCPadStatus* PadStatus)
+{
+	if (!IsShown())
+		return;
+
+	//TODO:: Make this instant not when polled.
+	GetKeyBoardInput(PadStatus);
+
+	PadStatus->stickX = m_main_stick.x_cont.value;
+	PadStatus->stickY = m_main_stick.y_cont.value;
+	PadStatus->substickX = m_c_stick.x_cont.value;
+	PadStatus->substickY = m_c_stick.y_cont.value;
+	PadStatus->triggerLeft = m_l.checkbox->GetValue() ? 255 : m_l_cont.slider->GetValue();
+	PadStatus->triggerRight = m_r.checkbox->GetValue() ? 255 : m_r_cont.slider->GetValue();
+
+	for (unsigned int i = 0; i < ArraySize(m_buttons); ++i)
+	{
+		if (m_buttons[i] != nullptr)
+		{
+			if (m_buttons[i]->checkbox->IsChecked())
+				PadStatus->button |= m_gc_pad_buttons_bitmask[i];
+			else
+				PadStatus->button &= ~m_gc_pad_buttons_bitmask[i];
+		}
+	}
+
+	if (m_a.checkbox->IsChecked())
+		PadStatus->analogA = 0xFF;
+	else
+		PadStatus->analogA = 0x00;
+
+	if (m_b.checkbox->IsChecked())
+		PadStatus->analogB = 0xFF;
+	else
+		PadStatus->analogB = 0x00;
+
+	ButtonTurbo();
+}
+
+void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
+{
+	wxTextCtrl* text = nullptr;
+
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr && event.GetId() == control->slider_id)
+			text = control->text;
+	}
+
+	for (Control* const control : m_cc_controls)
+	{
+		if (control != nullptr && event.GetId() == control->slider_id)
+			text = control->text;
+	}
+	int value = ((wxSlider*)event.GetEventObject())->GetValue();
+	if (text)
+		text->SetValue(std::to_string(value));
+}
+
+void TASInputDlg::UpdateFromText(wxCommandEvent& event)
+{
+	unsigned long value;
+
+	if (!((wxTextCtrl*)event.GetEventObject())->GetValue().ToULong(&value))
+		return;
+
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr && event.GetId() == control->text_id)
+		{
+			int v = (value > control->range) ? control->range : value;
+			control->slider->SetValue(v);
+			control->value = v;
+		}
+	}
+
+	for (Control* const control : m_cc_controls)
+	{
+		if (control != nullptr && event.GetId() == control->text_id)
+		{
+			int v = (value > control->range) ? control->range : value;
+			control->slider->SetValue(v);
+			control->value = v;
+		}
+	}
+
+	if (m_controls[0] != nullptr)
+		UpdateStickBitmap(m_main_stick);
+	if (m_controls[2] != nullptr)
+		UpdateStickBitmap(m_c_stick);
+	if (m_cc_controls[CC_L_STICK_X] != nullptr)
+		UpdateStickBitmap(m_cc_l_stick);
+	if (m_cc_controls[CC_R_STICK_X] != nullptr)
+		UpdateStickBitmap(m_cc_r_stick);
+}
+
+void TASInputDlg::UpdateStickBitmap(Stick stick)
+{
+	int x = (u8)(std::floor(((double)stick.x_cont.value / (double)(stick.x_cont.range + 1) * 255.0) + .5));
+	int y = (u8)(std::floor(((double)stick.y_cont.value / (double)(stick.y_cont.range + 1) * 255.0) + .5));
+	if (stick.x_cont.reverse)
+		x = 256 - (u8)x;
+	if (stick.y_cont.reverse)
+		y = 256 - (u8)y;
+	stick.bitmap->SetBitmap(CreateStickBitmap(x, y));
+}
+
+void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
+{
+	if (event.CanVeto())
+	{
+		event.Skip(false);
+		Show(false);
+		ResetValues();
+	}
+}
+
+bool TASInputDlg::TASHasFocus()
+{
+	if (!m_has_layout)
+		return false;
+	//allows numbers to be used as hotkeys
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr && wxWindow::FindFocus() == control->text)
+			return false;
+	}
+
+	if (wxWindow::FindFocus() == this)
+		return true;
+	else if (wxWindow::FindFocus() != nullptr && wxWindow::FindFocus()->GetParent() == this)
+		return true;
+	else
+		return false;
+}
+
+TASInputDlg::Stick* TASInputDlg::FindStickByID(int id)
+{
+	if (id == ID_MAIN_STICK)
+		return &m_main_stick;
+	else if (id == ID_C_STICK)
+		return &m_c_stick;
+	else if (id == ID_CC_L_STICK)
+		return &m_cc_l_stick;
+	else if (id == ID_CC_R_STICK)
+		return &m_cc_r_stick;
+	else
+		return nullptr;
+}
+void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
+{
+	Stick* stick = FindStickByID(event.GetId());
+	if (stick == nullptr)
+		return;
+
+	stick->x_cont.value = stick->x_cont.default_value;
+	stick->y_cont.value = stick->y_cont.default_value;
+	stick->bitmap->SetBitmap(CreateStickBitmap(128, 128));
+	stick->x_cont.text->SetValue(std::to_string(stick->x_cont.default_value));
+	stick->y_cont.text->SetValue(std::to_string(stick->y_cont.default_value));
+	stick->x_cont.slider->SetValue(stick->x_cont.default_value);
+	stick->y_cont.slider->SetValue(stick->y_cont.default_value);
+
+	event.Skip();
+}
+
+void TASInputDlg::OnRightClickSlider(wxMouseEvent& event)
+{
+	for (Control* const control : m_controls)
+	{
+		if (control != nullptr && event.GetId() == control->slider_id)
+		{
+			control->value = control->default_value;
+			control->slider->SetValue(control->default_value);
+			control->text->SetValue(std::to_string(control->default_value));
+			return;
+		}
+	}
+	for (Control* const control : m_cc_controls)
+	{
+		if (control != nullptr && event.GetId() == control->slider_id)
+		{
+			control->value = control->default_value;
+			control->slider->SetValue(control->default_value);
+			control->text->SetValue(std::to_string(control->default_value));
+			return;
+		}
+	}
+}
+
+void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
+{
+	if (!event.LeftIsDown())
+		return;
+
+	Stick* stick = FindStickByID(event.GetId());
+	if (stick == nullptr)
+		return;
+
+	wxPoint ptM(event.GetPosition());
+	stick->x_cont.value = ptM.x * stick->x_cont.range / 127;
+	stick->y_cont.value = ptM.y * stick->y_cont.range / 127;
+
+	if ((unsigned)stick->y_cont.value > stick->y_cont.range)
+		stick->y_cont.value = stick->y_cont.range;
+	if ((unsigned)stick->x_cont.value > stick->x_cont.range)
+		stick->x_cont.value = stick->x_cont.range;
+
+	if (stick->y_cont.reverse)
+		stick->y_cont.value = stick->y_cont.range - (u16)stick->y_cont.value;
+	if (stick->x_cont.reverse)
+		stick->x_cont.value = stick->x_cont.range - (u16)stick->x_cont.value;
+
+	stick->x_cont.value = (unsigned int)stick->x_cont.value > stick->x_cont.range ? stick->x_cont.range : stick->x_cont.value;
+	stick->y_cont.value = (unsigned int)stick->y_cont.value > stick->y_cont.range ? stick->y_cont.range : stick->y_cont.value;
+
+	// This updates sliders and the bitmap too.
+	stick->x_cont.text->SetValue(std::to_string(stick->x_cont.value));
+	stick->y_cont.text->SetValue(std::to_string(stick->y_cont.value));
+
+	event.Skip();
+}
+
+void TASInputDlg::SetTurbo(wxMouseEvent& event)
+{
+	Button* button = nullptr;
+
+	for (Button* const btn : m_buttons)
+	{
+		if (btn != nullptr && event.GetId() == btn->id)
+			button = btn;
+	}
+	if (m_ext == 2)
+	{
+		for (size_t i = 0; i < ArraySize(m_cc_buttons); ++i)
+		{
+			if (event.GetId() == m_cc_buttons[i].id)
+				button = &m_cc_buttons[i];
+		}
+	}
+
+	if (event.LeftDown())
+	{
+		if (button)
+			button->turbo_on = false;
+
+		event.Skip();
+		return;
+	}
+
+	if (button)
+	{
+		button->checkbox->SetValue(true);
+		button->turbo_on = !button->turbo_on;
+	}
+
+	event.Skip();
+}
+
+void TASInputDlg::ButtonTurbo()
+{
+	static u64 frame = Movie::g_currentFrame;
+
+	if (frame != Movie::g_currentFrame)
+	{
+		frame = Movie::g_currentFrame;
+		for (Button* const button : m_buttons)
+		{
+			if (button != nullptr && button->turbo_on)
+				button->checkbox->SetValue(!button->checkbox->GetValue());
+		}
+		if (m_ext == 2)
+		{
+			for (Button const button : m_cc_buttons)
+			{
+				if (button.turbo_on)
+					button.checkbox->SetValue(!button.checkbox->GetValue());
+			}
+		}
+	}
+}
+
+wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
+{
+	x = x / 2;
+	y = y / 2;
+
+	wxMemoryDC memDC;
+	wxBitmap bitmap(129, 129);
+	memDC.SelectObject(bitmap);
+	memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
+	memDC.Clear();
+	memDC.SetBrush(*wxWHITE_BRUSH);
+	memDC.DrawCircle(65, 65, 64);
+	memDC.SetBrush(*wxRED_BRUSH);
+	memDC.DrawLine(64, 64, x, y);
+	memDC.DrawLine(63, 64, x - 1, y);
+	memDC.DrawLine(65, 64, x + 1, y);
+	memDC.DrawLine(64, 63, x, y - 1);
+	memDC.DrawLine(64, 65, x, y + 1);
+	memDC.SetPen(*wxBLACK_PEN);
+	memDC.CrossHair(64, 64);
+	memDC.SetBrush(*wxBLUE_BRUSH);
+	memDC.DrawCircle(x, y, 5);
+	memDC.SelectObject(wxNullBitmap);
+	return bitmap;
+}
diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h
new file mode 100644
index 0000000000..1a6cc60a22
--- /dev/null
+++ b/Source/Core/DolphinWX/TASInputDlg.h
@@ -0,0 +1,143 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/bitmap.h>
+#include <wx/dcmemory.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "InputCommon/GCPadStatus.h"
+
+class wxCheckBox;
+class wxSlider;
+class wxStaticBitmap;
+class wxTextCtrl;
+
+class TASInputDlg : public wxDialog
+{
+	public:
+		TASInputDlg(wxWindow* parent,
+		            wxWindowID id = wxID_ANY,
+		            const wxString& title = _("TAS Input"),
+		            const wxPoint& pos = wxDefaultPosition,
+		            const wxSize& size = wxDefaultSize,
+		            long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
+
+		void OnCloseWindow(wxCloseEvent& event);
+		void UpdateFromSliders(wxCommandEvent& event);
+		void UpdateFromText(wxCommandEvent& event);
+		void OnMouseDownL(wxMouseEvent& event);
+		void OnMouseUpR(wxMouseEvent& event);
+		void OnRightClickSlider(wxMouseEvent& event);
+		void ResetValues();
+		void GetValues(GCPadStatus* PadStatus);
+		void GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key);
+		void SetTurbo(wxMouseEvent& event);
+		void SetTurboFalse(wxMouseEvent& event);
+		void SetTurboState(wxCheckBox* CheckBox, bool* turbo_on);
+		void ButtonTurbo();
+		void GetKeyBoardInput(GCPadStatus* PadStatus);
+		void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key);
+		bool TextBoxHasFocus();
+		void SetLandRTriggers();
+		bool TASHasFocus();
+		void CreateGCLayout();
+		void CreateWiiLayout(int num);
+		wxBitmap CreateStickBitmap(int x, int y);
+		void SetWiiButtons(u16* butt);
+		void GetIRData(u8* const data, u8 mode, bool use_accel);
+		void HandleExtensionChange();
+
+	private:
+		const int ID_C_STICK = 1001;
+		const int ID_MAIN_STICK = 1002;
+		const int ID_CC_L_STICK = 1003;
+		const int ID_CC_R_STICK = 1004;
+		int m_eleID = 1005;
+
+		struct Control
+		{
+			wxTextCtrl* text;
+			wxSlider* slider;
+			int value = -1;
+			int text_id;
+			int slider_id;
+			u32 range;
+			u32 default_value = 128;
+			bool set_by_keyboard = false;
+			bool reverse = false;
+		};
+
+		struct Button
+		{
+			wxCheckBox* checkbox;
+			bool set_by_keyboard = false;
+			bool turbo_on = false;
+			int id;
+		};
+
+		struct Stick
+		{
+			wxStaticBitmap* bitmap;
+			Control x_cont;
+			Control y_cont;
+		};
+
+		wxBoxSizer* CreateCCLayout();
+		void SetStickValue(bool* ActivatedByKeyboard, int* AmountPressed, wxTextCtrl* Textbox, int CurrentValue, int center = 128);
+		void SetButtonValue(Button* button, bool CurrentState);
+		void SetSliderValue(Control* control, int CurrentValue);
+		void CreateBaseLayout();
+		void UpdateStickBitmap(Stick stick);
+		Stick* FindStickByID(int id);
+		Stick CreateStick(int id_stick, int xRange, int yRange, u32 defaultX, u32 defaultY, bool reverseX, bool reverseY);
+		wxStaticBoxSizer* CreateStickLayout(Stick* tempStick, const wxString& title);
+		wxStaticBoxSizer* CreateAccelLayout(Control* x, Control* y, Control* z, const wxString& title);
+		Button CreateButton(const std::string& name);
+		Control CreateControl(long style, int width, int height, bool reverse = false, u32 range = 255, u32 default_value = 128);
+
+		enum
+		{
+			CC_L_STICK_X,
+			CC_L_STICK_Y,
+			CC_R_STICK_X,
+			CC_R_STICK_Y,
+			CC_L_TRIGGER,
+			CC_R_TRIGGER,
+		};
+
+		Control m_l_cont, m_r_cont, m_x_cont, m_y_cont, m_z_cont, m_nx_cont, m_ny_cont, m_nz_cont, m_cc_l, m_cc_r;
+		Button m_a, m_b, m_x, m_y, m_z, m_l, m_r, m_c;
+		Button m_start, m_plus, m_minus, m_one, m_two, m_home;
+		Button m_dpad_up, m_dpad_down, m_dpad_left, m_dpad_right;
+		Stick m_main_stick, m_c_stick;
+
+		Stick m_cc_l_stick, m_cc_r_stick;
+
+		Button* m_buttons[13];
+		Button m_cc_buttons[15];
+		Control* m_controls[10];
+		Control* m_cc_controls[6];
+		static const int m_gc_pad_buttons_bitmask[12];
+		static const int m_wii_buttons_bitmask[11];
+		static const int m_cc_buttons_bitmask[15];
+		static const std::string m_cc_button_names[15];
+		u8 m_ext = 0;
+		wxBoxSizer* m_main_szr;
+		wxBoxSizer* m_wiimote_szr;
+		wxBoxSizer* m_ext_szr;
+		wxBoxSizer* m_cc_szr;
+		wxStaticBoxSizer* m_main_stick_szr;
+		wxStaticBoxSizer* m_c_stick_szr;
+		wxStaticBoxSizer* m_cc_l_stick_szr;
+		wxStaticBoxSizer* m_cc_r_stick_szr;
+
+		bool m_has_layout = false;
+
+		wxGridSizer* m_buttons_dpad;
+};
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
new file mode 100644
index 0000000000..2e132576b3
--- /dev/null
+++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
@@ -0,0 +1,749 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/control.h>
+#include <wx/dialog.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/stattext.h>
+
+#include "Common/FileUtil.h"
+#include "Common/SysConf.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/VideoConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "VideoBackends/OGL/main.h"
+#include "VideoCommon/PostProcessing.h"
+#include "VideoCommon/VideoBackendBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+#ifdef __APPLE__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+// template instantiation
+template class BoolSetting<wxCheckBox>;
+template class BoolSetting<wxRadioButton>;
+
+template <>
+SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse, long style)
+	: wxCheckBox(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style)
+	, m_setting(setting)
+	, m_reverse(reverse)
+{
+	SetToolTip(tooltip);
+	SetValue(m_setting ^ m_reverse);
+	Bind(wxEVT_CHECKBOX, &SettingCheckBox::UpdateValue, this);
+}
+
+template <>
+SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse, long style)
+	: wxRadioButton(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style)
+	, m_setting(setting)
+	, m_reverse(reverse)
+{
+	SetToolTip(tooltip);
+	SetValue(m_setting ^ m_reverse);
+	Bind(wxEVT_RADIOBUTTON, &SettingRadioButton::UpdateValue, this);
+}
+
+SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num, const wxString choices[], long style)
+	: wxChoice(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, num, choices)
+	, m_setting(setting)
+{
+	SetToolTip(tooltip);
+	Select(m_setting);
+	Bind(wxEVT_CHOICE, &SettingChoice::UpdateValue, this);
+}
+
+void SettingChoice::UpdateValue(wxCommandEvent& ev)
+{
+	m_setting = ev.GetInt();
+	ev.Skip();
+}
+
+void VideoConfigDiag::Event_ClickClose(wxCommandEvent&)
+{
+	Close();
+}
+
+void VideoConfigDiag::Event_Close(wxCloseEvent& ev)
+{
+	g_Config.Save(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
+
+	EndModal(wxID_OK);
+}
+
+#if defined(_WIN32)
+static wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nThe software renderer is extremely slow and only useful for debugging, so you'll want to use either Direct3D or OpenGL. Different games and different GPUs will behave differently on each backend, so for the best emulation experience it's recommended to try both and choose the one that's less problematic.\n\nIf unsure, select OpenGL.");
+#else
+static wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nThe software renderer is extremely slow and only useful for debugging, so unless you have a reason to use it you'll want to select OpenGL here.\n\nIf unsure, select OpenGL.");
+#endif
+static wxString adapter_desc = wxTRANSLATE("Selects a hardware adapter to use.\n\nIf unsure, use the first one.");
+static wxString display_res_desc = wxTRANSLATE("Selects the display resolution used in fullscreen mode.\nThis should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n\nIf unsure, select auto.");
+static wxString use_fullscreen_desc = wxTRANSLATE("Enable this if you want the whole screen to be used for rendering.\nIf this is disabled, a render window will be created instead.\n\nIf unsure, leave this unchecked.");
+static wxString auto_window_size_desc = wxTRANSLATE("Automatically adjusts the window size to your internal resolution.\n\nIf unsure, leave this unchecked.");
+static wxString keep_window_on_top_desc = wxTRANSLATE("Keep the game window on top of all other windows.\n\nIf unsure, leave this unchecked.");
+static wxString hide_mouse_cursor_desc = wxTRANSLATE("Hides the mouse cursor if it's on top of the emulation window.\n\nIf unsure, leave this unchecked.");
+static wxString render_to_main_win_desc = wxTRANSLATE("Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n\nIf unsure, leave this unchecked.");
+static wxString prog_scan_desc = wxTRANSLATE("Enables progressive scan if supported by the emulated software.\nMost games don't care about this.\n\nIf unsure, leave this unchecked.");
+static wxString ar_desc = wxTRANSLATE("Select what aspect ratio to use when rendering:\nAuto: Use the native aspect ratio\nForce 16:9: Stretch the picture to an aspect ratio of 16:9.\nForce 4:3: Stretch the picture to an aspect ratio of 4:3.\nStretch to Window: Stretch the picture to the window size.\n\nIf unsure, select Auto.");
+static wxString ws_hack_desc = wxTRANSLATE("Forces the game to output graphics for any aspect ratio.\nUse with \"Aspect Ratio\" set to \"Force 16:9\" to force 4:3-only games to run at 16:9.\nRarely produces good results and often partially breaks graphics and game UIs.\nUnnecessary (and detrimental) if using any AR/Gecko-code widescreen patches.\n\nIf unsure, leave this unchecked.");
+static wxString vsync_desc = wxTRANSLATE("Wait for vertical blanks in order to reduce tearing.\nDecreases performance if emulation speed is below 100%.\n\nIf unsure, leave this unchecked.");
+static wxString af_desc = wxTRANSLATE("Enable anisotropic filtering.\nEnhances visual quality of textures that are at oblique viewing angles.\nMight cause issues in a small number of games.\nOn Direct3D, setting this above 1x will also have the same effect as enabling \"Force Texture Filtering\".\n\nIf unsure, select 1x.");
+static wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis smooths out jagged edges on objects.\nHeavily increases GPU load and sometimes causes graphical issues.\n\nIf unsure, select None.");
+static wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render-to-texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly increases GPU load and causes relatively few graphical issues.\n\nIf unsure, leave this checked.");
+static wxString pixel_lighting_desc = wxTRANSLATE("Calculates lighting of 3D objects per-pixel rather than per-vertex, smoothing out the appearance of lit polygons and making individual triangles less noticeable.\nRarely causes slowdowns or graphical issues.\n\nIf unsure, leave this unchecked.");
+static wxString fast_depth_calc_desc = wxTRANSLATE("Use a less accurate algorithm to calculate depth values.\nCauses issues in a few games, but can give a decent speedup depending on the game and/or your GPU.\n\nIf unsure, leave this checked.");
+static wxString disable_bbox_desc = wxTRANSLATE("Disable the bounding box emulation.\nThis may improve the GPU performance a lot, but some games will break.\n\nIf unsure, leave this checked.");
+static wxString force_filtering_desc = wxTRANSLATE("Filter all textures, including any that the game explicitly set as unfiltered.\nMay improve quality of certain textures in some games, but will cause issues in others.\nOn Direct3D, setting Anisotropic Filtering above 1x will also have the same effect as enabling this option.\n\nIf unsure, leave this unchecked.");
+static wxString borderless_fullscreen_desc = wxTRANSLATE("Implement fullscreen mode with a borderless window spanning the whole screen instead of using exclusive mode.\nAllows for faster transitions between fullscreen and windowed mode, but slightly increases input latency, makes movement less smooth and slightly decreases performance.\nExclusive mode is required for Nvidia 3D Vision to work in the Direct3D backend.\n\nIf unsure, leave this unchecked.");
+static wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution greatly improves visual quality, but also greatly increases GPU load and can cause issues in certain games.\n\"Multiple of 640x528\" will result in a size slightly larger than \"Window Size\" but yield fewer issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528.");
+static wxString efb_access_desc = wxTRANSLATE("Ignore any requests from the CPU to read from or write to the EFB.\nImproves performance in some games, but might disable some gameplay-related features or graphical effects.\n\nIf unsure, leave this unchecked.");
+static wxString efb_emulate_format_changes_desc = wxTRANSLATE("Ignore any changes to the EFB format.\nImproves performance in many games without any negative effect. Causes graphical defects in a small number of other games.\n\nIf unsure, leave this checked.");
+static wxString skip_efb_copy_to_ram_desc = wxTRANSLATE("Skip GPU synchronizing on EFB copies. Causes graphical defects in a small number of games.\n\nIf unsure, leave this checked.");
+static wxString stc_desc = wxTRANSLATE("The \"Safe\" setting eliminates the likelihood of the GPU missing texture updates from RAM.\nLower accuracies cause in-game text to appear garbled in certain games.\n\nIf unsure, use the rightmost value.");
+static wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf unsure, leave this unchecked.");
+static wxString disable_fog_desc = wxTRANSLATE("Makes distant objects more visible by removing fog, thus increasing the overall detail.\nDisabling fog will break some games which rely on proper fog emulation.\n\nIf unsure, leave this unchecked.");
+static wxString disable_dstalpha_desc = wxTRANSLATE("Disables emulation of a hardware feature called destination alpha, which is used in many games for various graphical effects.\nThis has no performance impact on D3D and desktop OpenGL, but on OpenGL ES this is rendered in two passes, which has a minor but noticeable performance impact.\n\nIf unsure, leave this unchecked.");
+static wxString show_fps_desc = wxTRANSLATE("Show the number of frames rendered per second as a measure of emulation speed.\n\nIf unsure, leave this unchecked.");
+static wxString log_render_time_to_file_desc = wxTRANSLATE("Log the render time of every frame to User/Logs/render_time.txt. Use this feature when you want to measure the performance of Dolphin.\n\nIf unsure, leave this unchecked.");
+static wxString show_stats_desc = wxTRANSLATE("Show various rendering statistics.\n\nIf unsure, leave this unchecked.");
+static wxString texfmt_desc = wxTRANSLATE("Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n\nIf unsure, leave this unchecked.");
+static wxString efb_copy_regions_desc = wxTRANSLATE("[BROKEN]\nHighlight regions the EFB was copied from.\n\nIf unsure, leave this unchecked.");
+static wxString xfb_desc = wxTRANSLATE("Disable any XFB emulation.\nSpeeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n\nIf unsure, leave this checked.");
+static wxString xfb_virtual_desc = wxTRANSLATE("Emulate XFBs using GPU texture objects.\nFixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n\nIf unsure, leave this checked.");
+static wxString xfb_real_desc = wxTRANSLATE("Emulate XFBs accurately.\nSlows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n\nIf unsure, check virtual XFB emulation instead.");
+static wxString dump_textures_desc = wxTRANSLATE("Dump decoded game textures to User/Dump/Textures/<game_id>/.\n\nIf unsure, leave this unchecked.");
+static wxString load_hires_textures_desc = wxTRANSLATE("Load custom textures from User/Load/Textures/<game_id>/.\n\nIf unsure, leave this unchecked.");
+static wxString cache_hires_textures_desc = wxTRANSLATE("Cache custom textures to system RAM on startup.\nThis can require exponentially more RAM but fixes possible stuttering.\n\nIf unsure, leave this unchecked.");
+static wxString dump_efb_desc = wxTRANSLATE("Dump the contents of EFB copies to User/Dump/Textures/.\n\nIf unsure, leave this unchecked.");
+#if !defined WIN32 && defined HAVE_LIBAV
+static wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked.");
+#endif
+static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n\nIf unsure, leave this unchecked.");
+static wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked.");
+static wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off).");
+static wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked.");
+static wxString stereo_3d_desc = wxTRANSLATE("Selects the stereoscopic 3D mode. Stereoscopy allows you to get a better feeling of depth if you have the necessary hardware.\nSide-by-Side and Top-and-Bottom are used by most 3D TVs.\nAnaglyph is used for Red-Cyan colored glasses.\nHeavily decreases emulation speed and sometimes causes issues.\n\nIf unsure, select Off.");
+static wxString stereo_depth_desc = wxTRANSLATE("Controls the separation distance between the virtual cameras.\nA higher value creates a stronger feeling of depth while a lower value is more comfortable.");
+static wxString stereo_convergence_desc = wxTRANSLATE("Controls the distance of the convergence plane. This is the distance at which virtual objects will appear to be in front of the screen.\nA higher value creates stronger out-of-screen effects while a lower value is more comfortable.");
+static wxString stereo_swap_desc = wxTRANSLATE("Swaps the left and right eye. Mostly useful if you want to view side-by-side cross-eyed.\n\nIf unsure, leave this unchecked.");
+
+#if !defined(__APPLE__)
+// Search for available resolutions - TODO: Move to Common?
+static wxArrayString GetListOfResolutions()
+{
+	wxArrayString retlist;
+	retlist.Add(_("Auto"));
+#ifdef _WIN32
+	DWORD iModeNum = 0;
+	DEVMODE dmi;
+	ZeroMemory(&dmi, sizeof(dmi));
+	dmi.dmSize = sizeof(dmi);
+	std::vector<std::string> resos;
+
+	while (EnumDisplaySettings(nullptr, iModeNum++, &dmi) != 0)
+	{
+		char res[100];
+		sprintf(res, "%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
+		std::string strRes(res);
+		// Only add unique resolutions
+		if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
+		{
+			resos.push_back(strRes);
+			retlist.Add(StrToWxStr(res));
+		}
+		ZeroMemory(&dmi, sizeof(dmi));
+	}
+#elif defined(HAVE_XRANDR) && HAVE_XRANDR
+	std::vector<std::string> resos;
+	main_frame->m_XRRConfig->AddResolutions(resos);
+	for (auto res : resos)
+		retlist.Add(StrToWxStr(res));
+#elif defined(__APPLE__)
+	CFArrayRef modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), nullptr);
+	for (CFIndex i = 0; i < CFArrayGetCount(modes); i++)
+	{
+		std::stringstream res;
+		CGDisplayModeRef mode;
+		CFStringRef encoding;
+		size_t w, h;
+		bool is32;
+
+		mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i);
+		w = CGDisplayModeGetWidth(mode);
+		h = CGDisplayModeGetHeight(mode);
+		encoding = CGDisplayModeCopyPixelEncoding(mode);
+		is32 = CFEqual(encoding, CFSTR(IO32BitDirectPixels));
+		CFRelease(encoding);
+
+		if (!is32)
+			continue;
+		if (CGDisplayModeGetIOFlags(mode) & kDisplayModeStretchedFlag)
+			continue;
+
+		res << w << "x" << h;
+
+		retlist.Add(res.str());
+	}
+	CFRelease(modes);
+#endif
+	return retlist;
+}
+#endif
+
+VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame)
+	: wxDialog(parent, wxID_ANY,
+		wxString::Format(_("Dolphin %s Graphics Configuration"), wxGetTranslation(StrToWxStr(title))))
+	, vconfig(g_Config)
+	, ininame(_ininame)
+{
+	vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
+
+	Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this);
+
+	wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
+
+	// -- GENERAL --
+	{
+	wxPanel* const page_general = new wxPanel(notebook);
+	notebook->AddPage(page_general, _("General"));
+	wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
+
+	// - basic
+	{
+	wxFlexGridSizer* const szr_basic = new wxFlexGridSizer(2, 5, 5);
+
+	// backend
+	{
+	label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
+	choice_backend = new wxChoice(page_general, wxID_ANY);
+	RegisterControl(choice_backend, wxGetTranslation(backend_desc));
+
+	for (const VideoBackend* backend : g_available_video_backends)
+	{
+		choice_backend->AppendString(wxGetTranslation(StrToWxStr(backend->GetDisplayName())));
+	}
+
+	choice_backend->SetStringSelection(wxGetTranslation(StrToWxStr(g_video_backend->GetDisplayName())));
+	choice_backend->Bind(wxEVT_CHOICE, &VideoConfigDiag::Event_Backend, this);
+
+	szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
+	szr_basic->Add(choice_backend, 1, 0, 0);
+	}
+
+	// adapter (D3D only)
+	if (vconfig.backend_info.Adapters.size())
+	{
+		choice_adapter = CreateChoice(page_general, vconfig.iAdapter, wxGetTranslation(adapter_desc));
+
+		for (const std::string& adapter : vconfig.backend_info.Adapters)
+		{
+			choice_adapter->AppendString(StrToWxStr(adapter));
+		}
+
+		choice_adapter->Select(vconfig.iAdapter);
+
+		label_adapter = new wxStaticText(page_general, wxID_ANY, _("Adapter:"));
+		szr_basic->Add(label_adapter, 1, wxALIGN_CENTER_VERTICAL, 5);
+		szr_basic->Add(choice_adapter, 1, 0, 0);
+	}
+
+
+	// - display
+	wxFlexGridSizer* const szr_display = new wxFlexGridSizer(2, 5, 5);
+
+	{
+
+#if !defined(__APPLE__)
+	// display resolution
+	{
+		wxArrayString res_list = GetListOfResolutions();
+		if (res_list.empty())
+			res_list.Add(_("<No resolutions found>"));
+		label_display_resolution = new wxStaticText(page_general, wxID_ANY, _("Fullscreen Resolution:"));
+		choice_display_resolution = new wxChoice(page_general, wxID_ANY, wxDefaultPosition, wxDefaultSize, res_list);
+		RegisterControl(choice_display_resolution, wxGetTranslation(display_res_desc));
+		choice_display_resolution->Bind(wxEVT_CHOICE, &VideoConfigDiag::Event_DisplayResolution, this);
+
+		choice_display_resolution->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution));
+
+		szr_display->Add(label_display_resolution, 1, wxALIGN_CENTER_VERTICAL, 0);
+		szr_display->Add(choice_display_resolution);
+	}
+#endif
+
+	// aspect-ratio
+	{
+	const wxString ar_choices[] = { _("Auto"), _("Force 16:9"), _("Force 4:3"), _("Stretch to Window") };
+
+	szr_display->Add(new wxStaticText(page_general, wxID_ANY, _("Aspect Ratio:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+	wxChoice* const choice_aspect = CreateChoice(page_general, vconfig.iAspectRatio, wxGetTranslation(ar_desc),
+	                                             sizeof(ar_choices)/sizeof(*ar_choices), ar_choices);
+	szr_display->Add(choice_aspect, 1, 0, 0);
+	}
+
+	// various other display options
+	{
+	szr_display->Add(CreateCheckBox(page_general, _("V-Sync"), wxGetTranslation(vsync_desc), vconfig.bVSync));
+	szr_display->Add(CreateCheckBox(page_general, _("Use Fullscreen"), wxGetTranslation(use_fullscreen_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen));
+	}
+	}
+
+	// - other
+	wxFlexGridSizer* const szr_other = new wxFlexGridSizer(2, 5, 5);
+
+	{
+	szr_other->Add(CreateCheckBox(page_general, _("Show FPS"), wxGetTranslation(show_fps_desc), vconfig.bShowFPS));
+	szr_other->Add(CreateCheckBox(page_general, _("Log Render Time to File"), wxGetTranslation(log_render_time_to_file_desc), vconfig.bLogRenderTimeToFile));
+	szr_other->Add(CreateCheckBox(page_general, _("Auto adjust Window Size"), wxGetTranslation(auto_window_size_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize));
+	szr_other->Add(CreateCheckBox(page_general, _("Keep Window on Top"), wxGetTranslation(keep_window_on_top_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop));
+	szr_other->Add(CreateCheckBox(page_general, _("Hide Mouse Cursor"), wxGetTranslation(hide_mouse_cursor_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor));
+	szr_other->Add(render_to_main_checkbox = CreateCheckBox(page_general, _("Render to Main Window"), wxGetTranslation(render_to_main_win_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain));
+	}
+
+
+	wxStaticBoxSizer* const group_basic = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Basic"));
+	group_basic->Add(szr_basic, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	szr_general->Add(group_basic, 0, wxEXPAND | wxALL, 5);
+
+	wxStaticBoxSizer* const group_display = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Display"));
+	group_display->Add(szr_display, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	szr_general->Add(group_display, 0, wxEXPAND | wxALL, 5);
+
+	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Other"));
+	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	szr_general->Add(group_other, 0, wxEXPAND | wxALL, 5);
+	}
+
+	szr_general->AddStretchSpacer();
+	CreateDescriptionArea(page_general, szr_general);
+	page_general->SetSizerAndFit(szr_general);
+	}
+
+	// -- ENHANCEMENTS --
+	{
+	wxPanel* const page_enh = new wxPanel(notebook);
+	notebook->AddPage(page_enh, _("Enhancements"));
+	wxBoxSizer* const szr_enh_main = new wxBoxSizer(wxVERTICAL);
+
+	// - enhancements
+	wxFlexGridSizer* const szr_enh = new wxFlexGridSizer(2, 5, 5);
+
+	// Internal resolution
+	{
+	const wxString efbscale_choices[] = { _("Auto (Window Size)"), _("Auto (Multiple of 640x528)"),
+		_("1x Native (640x528)"), _("1.5x Native (960x792)"), _("2x Native (1280x1056)"),
+		_("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)"), _("Custom") };
+
+	wxChoice *const choice_efbscale = CreateChoice(page_enh,
+		vconfig.iEFBScale, wxGetTranslation(internal_res_desc), (vconfig.iEFBScale > 7) ?
+		ArraySize(efbscale_choices) : ArraySize(efbscale_choices) - 1, efbscale_choices);
+
+
+	if (vconfig.iEFBScale > 7)
+		choice_efbscale->SetSelection(8);
+
+	szr_enh->Add(new wxStaticText(page_enh, wxID_ANY, _("Internal Resolution:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+	szr_enh->Add(choice_efbscale);
+	}
+
+	// AA
+	{
+	text_aamode = new wxStaticText(page_enh, wxID_ANY, _("Anti-Aliasing:"));
+	choice_aamode = CreateChoice(page_enh, vconfig.iMultisampleMode, wxGetTranslation(aa_desc));
+
+	for (const std::string& mode : vconfig.backend_info.AAModes)
+	{
+		choice_aamode->AppendString(wxGetTranslation(StrToWxStr(mode)));
+	}
+
+	choice_aamode->Select(vconfig.iMultisampleMode);
+	szr_enh->Add(text_aamode, 1, wxALIGN_CENTER_VERTICAL, 0);
+	szr_enh->Add(choice_aamode);
+	}
+
+	// AF
+	{
+	const wxString af_choices[] = {"1x", "2x", "4x", "8x", "16x"};
+	szr_enh->Add(new wxStaticText(page_enh, wxID_ANY, _("Anisotropic Filtering:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+	szr_enh->Add(CreateChoice(page_enh, vconfig.iMaxAnisotropy, wxGetTranslation(af_desc), 5, af_choices));
+	}
+
+	// postproc shader
+	if (vconfig.backend_info.bSupportsPostProcessing)
+	{
+		wxFlexGridSizer* const szr_pp = new wxFlexGridSizer(3, 5, 5);
+		choice_ppshader = new wxChoice(page_enh, wxID_ANY);
+		RegisterControl(choice_ppshader, wxGetTranslation(ppshader_desc));
+		button_config_pp = new wxButton(page_enh, wxID_ANY, _("Config"));
+
+		PopulatePostProcessingShaders();
+
+		choice_ppshader->Bind(wxEVT_CHOICE, &VideoConfigDiag::Event_PPShader, this);
+		button_config_pp->Bind(wxEVT_BUTTON, &VideoConfigDiag::Event_ConfigurePPShader, this);
+
+		szr_enh->Add(new wxStaticText(page_enh, wxID_ANY, _("Post-Processing Effect:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+		szr_pp->Add(choice_ppshader);
+		szr_pp->Add(button_config_pp);
+		szr_enh->Add(szr_pp);
+	}
+	else
+	{
+		choice_ppshader = nullptr;
+		button_config_pp = nullptr;
+	}
+
+	// Scaled copy, PL, Bilinear filter
+	szr_enh->Add(CreateCheckBox(page_enh, _("Scaled EFB Copy"), wxGetTranslation(scaled_efb_copy_desc), vconfig.bCopyEFBScaled));
+	szr_enh->Add(CreateCheckBox(page_enh, _("Per-Pixel Lighting"), wxGetTranslation(pixel_lighting_desc), vconfig.bEnablePixelLighting));
+	szr_enh->Add(CreateCheckBox(page_enh, _("Force Texture Filtering"), wxGetTranslation(force_filtering_desc), vconfig.bForceFiltering));
+
+	szr_enh->Add(CreateCheckBox(page_enh, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack));
+	szr_enh->Add(CreateCheckBox(page_enh, _("Disable Fog"), wxGetTranslation(disable_fog_desc), vconfig.bDisableFog));
+
+	wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_enh, _("Enhancements"));
+	group_enh->Add(szr_enh, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	szr_enh_main->Add(group_enh, 0, wxEXPAND | wxALL, 5);
+
+	// - stereoscopy
+
+	if (vconfig.backend_info.bSupportsGeometryShaders)
+	{
+		wxFlexGridSizer* const szr_stereo = new wxFlexGridSizer(2, 5, 5);
+
+		szr_stereo->Add(new wxStaticText(page_enh, wxID_ANY, _("Stereoscopic 3D Mode:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+
+		const wxString stereo_choices[] = { _("Off"), _("Side-by-Side"), _("Top-and-Bottom"), _("Anaglyph"), _("Nvidia 3D Vision") };
+		wxChoice* stereo_choice = CreateChoice(page_enh, vconfig.iStereoMode, wxGetTranslation(stereo_3d_desc), vconfig.backend_info.bSupports3DVision ? ArraySize(stereo_choices) : ArraySize(stereo_choices) - 1, stereo_choices);
+		stereo_choice->Bind(wxEVT_CHOICE, &VideoConfigDiag::Event_StereoMode, this);
+		szr_stereo->Add(stereo_choice);
+
+		wxSlider* const sep_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoDepth, 0, 100, wxDefaultPosition, wxDefaultSize);
+		sep_slider->Bind(wxEVT_SLIDER, &VideoConfigDiag::Event_StereoDepth, this);
+		RegisterControl(sep_slider, wxGetTranslation(stereo_depth_desc));
+
+		szr_stereo->Add(new wxStaticText(page_enh, wxID_ANY, _("Depth:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+		szr_stereo->Add(sep_slider, 0, wxEXPAND | wxRIGHT);
+
+		wxSlider* const conv_slider = new wxSlider(page_enh, wxID_ANY, vconfig.iStereoConvergence, 0, 500, wxDefaultPosition, wxDefaultSize);
+		conv_slider->Bind(wxEVT_SLIDER, &VideoConfigDiag::Event_StereoConvergence, this);
+		RegisterControl(conv_slider, wxGetTranslation(stereo_convergence_desc));
+
+		szr_stereo->Add(new wxStaticText(page_enh, wxID_ANY, _("Convergence:")), 1, wxALIGN_CENTER_VERTICAL, 0);
+		szr_stereo->Add(conv_slider, 0, wxEXPAND | wxRIGHT);
+
+		szr_stereo->Add(CreateCheckBox(page_enh, _("Swap Eyes"), wxGetTranslation(stereo_swap_desc), vconfig.bStereoSwapEyes));
+
+		wxStaticBoxSizer* const group_stereo = new wxStaticBoxSizer(wxVERTICAL, page_enh, _("Stereoscopy"));
+		group_stereo->Add(szr_stereo, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+		szr_enh_main->Add(group_stereo, 0, wxEXPAND | wxALL, 5);
+	}
+
+	szr_enh_main->AddStretchSpacer();
+	CreateDescriptionArea(page_enh, szr_enh_main);
+	page_enh->SetSizerAndFit(szr_enh_main);
+	}
+
+
+	// -- SPEED HACKS --
+	{
+	wxPanel* const page_hacks = new wxPanel(notebook);
+	notebook->AddPage(page_hacks, _("Hacks"));
+	wxBoxSizer* const szr_hacks = new wxBoxSizer(wxVERTICAL);
+
+	// - EFB hacks
+	wxStaticBoxSizer* const szr_efb = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Embedded Frame Buffer (EFB)"));
+
+	szr_efb->Add(CreateCheckBox(page_hacks, _("Skip EFB Access from CPU"), wxGetTranslation(efb_access_desc), vconfig.bEFBAccessEnable, true), 0, wxBOTTOM | wxLEFT, 5);
+	szr_efb->Add(CreateCheckBox(page_hacks, _("Ignore Format Changes"), wxGetTranslation(efb_emulate_format_changes_desc), vconfig.bEFBEmulateFormatChanges, true), 0, wxBOTTOM | wxLEFT, 5);
+	szr_efb->Add(CreateCheckBox(page_hacks, _("Store EFB Copies to Texture Only"), wxGetTranslation(skip_efb_copy_to_ram_desc), vconfig.bSkipEFBCopyToRam), 0, wxBOTTOM | wxLEFT, 5);
+
+	szr_hacks->Add(szr_efb, 0, wxEXPAND | wxALL, 5);
+
+	// Texture cache
+	{
+	wxStaticBoxSizer* const szr_safetex = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("Texture Cache"));
+
+	// TODO: Use wxSL_MIN_MAX_LABELS or wxSL_VALUE_LABEL with wx 2.9.1
+	wxSlider* const stc_slider = new wxSlider(page_hacks, wxID_ANY, 0, 0, 2, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_BOTTOM);
+	stc_slider->Bind(wxEVT_SLIDER, &VideoConfigDiag::Event_Stc, this);
+	RegisterControl(stc_slider, wxGetTranslation(stc_desc));
+
+	if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0);
+	else if (vconfig.iSafeTextureCache_ColorSamples == 512) stc_slider->SetValue(1);
+	else if (vconfig.iSafeTextureCache_ColorSamples == 128) stc_slider->SetValue(2);
+	else stc_slider->Disable(); // Using custom number of samples; TODO: Inform the user why this is disabled..
+
+	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Accuracy:")), 0, wxALL, 5);
+	szr_safetex->AddStretchSpacer(1);
+	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Safe")), 0, wxLEFT|wxTOP|wxBOTTOM, 5);
+	szr_safetex->Add(stc_slider, 2, wxRIGHT, 0);
+	szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Fast")), 0, wxRIGHT|wxTOP|wxBOTTOM, 5);
+	szr_hacks->Add(szr_safetex, 0, wxEXPAND | wxALL, 5);
+	}
+
+	// - XFB
+	{
+	wxStaticBoxSizer* const group_xfb = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("External Frame Buffer (XFB)"));
+
+	SettingCheckBox* disable_xfb = CreateCheckBox(page_hacks, _("Disable"), wxGetTranslation(xfb_desc), vconfig.bUseXFB, true);
+	virtual_xfb = CreateRadioButton(page_hacks, _("Virtual"), wxGetTranslation(xfb_virtual_desc), vconfig.bUseRealXFB, true, wxRB_GROUP);
+	real_xfb = CreateRadioButton(page_hacks, _("Real"), wxGetTranslation(xfb_real_desc), vconfig.bUseRealXFB);
+
+	group_xfb->Add(disable_xfb, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	group_xfb->AddStretchSpacer(1);
+	group_xfb->Add(virtual_xfb, 0, wxRIGHT, 5);
+	group_xfb->Add(real_xfb, 0, wxRIGHT, 5);
+	szr_hacks->Add(group_xfb, 0, wxEXPAND | wxALL, 5);
+	} // xfb
+
+	// - other hacks
+	{
+	wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5);
+	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass));
+	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
+	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Bounding Box"), wxGetTranslation(disable_bbox_desc), vconfig.bBBoxEnable, true));
+
+	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Other"));
+	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	szr_hacks->Add(group_other, 0, wxEXPAND | wxALL, 5);
+	}
+
+	szr_hacks->AddStretchSpacer();
+	CreateDescriptionArea(page_hacks, szr_hacks);
+	page_hacks->SetSizerAndFit(szr_hacks);
+	}
+
+	// -- ADVANCED --
+	{
+	wxPanel* const page_advanced = new wxPanel(notebook);
+	notebook->AddPage(page_advanced, _("Advanced"));
+	wxBoxSizer* const szr_advanced = new wxBoxSizer(wxVERTICAL);
+
+	// - debug
+	{
+	wxGridSizer* const szr_debug = new wxGridSizer(2, 5, 5);
+
+	szr_debug->Add(CreateCheckBox(page_advanced, _("Enable Wireframe"), wxGetTranslation(wireframe_desc), vconfig.bWireFrame));
+	szr_debug->Add(CreateCheckBox(page_advanced, _("Show EFB Copy Regions"), wxGetTranslation(efb_copy_regions_desc), vconfig.bShowEFBCopyRegions));
+	szr_debug->Add(CreateCheckBox(page_advanced, _("Show Statistics"), wxGetTranslation(show_stats_desc), vconfig.bOverlayStats));
+	szr_debug->Add(CreateCheckBox(page_advanced, _("Texture Format Overlay"), wxGetTranslation(texfmt_desc), vconfig.bTexFmtOverlayEnable));
+
+	wxStaticBoxSizer* const group_debug = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Debugging"));
+	szr_advanced->Add(group_debug, 0, wxEXPAND | wxALL, 5);
+	group_debug->Add(szr_debug, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	}
+
+	// - utility
+	{
+	wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
+
+	szr_utility->Add(CreateCheckBox(page_advanced, _("Dump Textures"), wxGetTranslation(dump_textures_desc), vconfig.bDumpTextures));
+	szr_utility->Add(CreateCheckBox(page_advanced, _("Load Custom Textures"), wxGetTranslation(load_hires_textures_desc), vconfig.bHiresTextures));
+	cache_hires_textures = CreateCheckBox(page_advanced, _("Prefetch Custom Textures"), wxGetTranslation(cache_hires_textures_desc), vconfig.bCacheHiresTextures);
+	szr_utility->Add(cache_hires_textures);
+	szr_utility->Add(CreateCheckBox(page_advanced, _("Dump EFB Target"), wxGetTranslation(dump_efb_desc), vconfig.bDumpEFBTarget));
+	szr_utility->Add(CreateCheckBox(page_advanced, _("Free Look"), wxGetTranslation(free_look_desc), vconfig.bFreeLook));
+#if !defined WIN32 && defined HAVE_LIBAV
+	szr_utility->Add(CreateCheckBox(page_advanced, _("Frame Dumps use FFV1"), wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1));
+#endif
+
+	wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Utility"));
+	szr_advanced->Add(group_utility, 0, wxEXPAND | wxALL, 5);
+	group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	}
+
+	// - misc
+	{
+	wxGridSizer* const szr_misc = new wxGridSizer(2, 5, 5);
+
+	szr_misc->Add(CreateCheckBox(page_advanced, _("Crop"), wxGetTranslation(crop_desc), vconfig.bCrop));
+
+	// Progressive Scan
+	{
+	progressive_scan_checkbox = new wxCheckBox(page_advanced, wxID_ANY, _("Enable Progressive Scan"));
+	RegisterControl(progressive_scan_checkbox, wxGetTranslation(prog_scan_desc));
+	progressive_scan_checkbox->Bind(wxEVT_CHECKBOX, &VideoConfigDiag::Event_ProgressiveScan, this);
+
+	progressive_scan_checkbox->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive);
+	// A bit strange behavior, but this needs to stay in sync with the main progressive boolean; TODO: Is this still necessary?
+	SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive);
+
+	szr_misc->Add(progressive_scan_checkbox);
+	}
+
+#if defined WIN32
+	// Borderless Fullscreen
+	borderless_fullscreen = CreateCheckBox(page_advanced, _("Borderless Fullscreen"), wxGetTranslation(borderless_fullscreen_desc), vconfig.bBorderlessFullscreen);
+	szr_misc->Add(borderless_fullscreen);
+#endif
+
+	wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Misc"));
+	szr_advanced->Add(group_misc, 0, wxEXPAND | wxALL, 5);
+	group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+	}
+
+	szr_advanced->AddStretchSpacer();
+	CreateDescriptionArea(page_advanced, szr_advanced);
+	page_advanced->SetSizerAndFit(szr_advanced);
+	}
+
+	wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"));
+	btn_close->Bind(wxEVT_BUTTON, &VideoConfigDiag::Event_ClickClose, this);
+
+	Bind(wxEVT_CLOSE_WINDOW, &VideoConfigDiag::Event_Close, this);
+
+	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
+	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
+	szr_main->Add(btn_close, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
+
+	SetSizerAndFit(szr_main);
+	Center();
+	SetFocus();
+
+	UpdateWindowUI();
+}
+
+void VideoConfigDiag::Event_DisplayResolution(wxCommandEvent &ev)
+{
+	SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
+		WxStrToStr(choice_display_resolution->GetStringSelection());
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+	main_frame->m_XRRConfig->Update();
+#endif
+	ev.Skip();
+}
+
+SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
+{
+	SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style);
+	RegisterControl(cb, description);
+	return cb;
+}
+
+SettingChoice* VideoConfigDiag::CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num, const wxString choices[], long style)
+{
+	SettingChoice* const ch = new SettingChoice(parent, setting, wxString(), num, choices, style);
+	RegisterControl(ch, description);
+	return ch;
+}
+
+SettingRadioButton* VideoConfigDiag::CreateRadioButton(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
+{
+	SettingRadioButton* const rb = new SettingRadioButton(parent, label, wxString(), setting, reverse, style);
+	RegisterControl(rb, description);
+	return rb;
+}
+
+/* Use this to register descriptions for controls which have NOT been created using the Create* functions from above */
+wxControl* VideoConfigDiag::RegisterControl(wxControl* const control, const wxString& description)
+{
+	ctrl_descs.insert(std::pair<wxWindow*, wxString>(control, description));
+	control->Bind(wxEVT_ENTER_WINDOW, &VideoConfigDiag::Evt_EnterControl, this);
+	control->Bind(wxEVT_LEAVE_WINDOW, &VideoConfigDiag::Evt_LeaveControl, this);
+	return control;
+}
+
+void VideoConfigDiag::Evt_EnterControl(wxMouseEvent& ev)
+{
+	// TODO: Re-Fit the sizer if necessary!
+
+	// Get settings control object from event
+	wxWindow* ctrl = (wxWindow*)ev.GetEventObject();
+	if (!ctrl) return;
+
+	// look up description text object from the control's parent (which is the wxPanel of the current tab)
+	wxStaticText* descr_text = desc_texts[ctrl->GetParent()];
+	if (!descr_text) return;
+
+	// look up the description of the selected control and assign it to the current description text object's label
+	descr_text->SetLabel(ctrl_descs[ctrl]);
+	descr_text->Wrap(descr_text->GetContainingSizer()->GetSize().x - 20);
+
+	ev.Skip();
+}
+
+// TODO: Don't hardcode the size of the description area via line breaks
+#define DEFAULT_DESC_TEXT _("Move the mouse pointer over an option to display a detailed description.\n\n\n\n\n\n\n")
+void VideoConfigDiag::Evt_LeaveControl(wxMouseEvent& ev)
+{
+	// look up description text control and reset its label
+	wxWindow* ctrl = (wxWindow*)ev.GetEventObject();
+	if (!ctrl) return;
+	wxStaticText* descr_text = desc_texts[ctrl->GetParent()];
+	if (!descr_text) return;
+
+	descr_text->SetLabel(DEFAULT_DESC_TEXT);
+	descr_text->Wrap(descr_text->GetContainingSizer()->GetSize().x - 20);
+	ev.Skip();
+}
+
+void VideoConfigDiag::CreateDescriptionArea(wxPanel* const page, wxBoxSizer* const sizer)
+{
+	// Create description frame
+	wxStaticBoxSizer* const desc_sizer = new wxStaticBoxSizer(wxVERTICAL, page, _("Description"));
+	sizer->Add(desc_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	// Need to call SetSizerAndFit here, since we don't want the description texts to change the dialog width
+	page->SetSizerAndFit(sizer);
+
+	// Create description text
+	wxStaticText* const desc_text = new wxStaticText(page, wxID_ANY, DEFAULT_DESC_TEXT);
+	desc_text->Wrap(desc_sizer->GetSize().x - 20);
+	desc_sizer->Add(desc_text, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+	// Store description text object for later lookup
+	desc_texts.insert(std::pair<wxWindow*, wxStaticText*>(page, desc_text));
+}
+
+void VideoConfigDiag::PopulatePostProcessingShaders()
+{
+	std::vector<std::string> &shaders = (vconfig.iStereoMode == STEREO_ANAGLYPH) ?
+			vconfig.backend_info.AnaglyphShaders : vconfig.backend_info.PPShaders;
+
+	if (shaders.empty())
+		return;
+
+	choice_ppshader->AppendString(_("(off)"));
+
+	for (const std::string& shader : shaders)
+	{
+		choice_ppshader->AppendString(StrToWxStr(shader));
+	}
+
+	if (!choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader)))
+	{
+		// Invalid shader, reset it to default
+		choice_ppshader->Select(0);
+
+		if (vconfig.iStereoMode == STEREO_ANAGLYPH)
+		{
+			vconfig.sPostProcessingShader = "dubois";
+			choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader));
+		}
+		else
+			vconfig.sPostProcessingShader.clear();
+	}
+
+	// Should the configuration button be loaded by default?
+	PostProcessingShaderConfiguration postprocessing_shader;
+	postprocessing_shader.LoadShader(vconfig.sPostProcessingShader);
+	button_config_pp->Enable(postprocessing_shader.HasOptions());
+}
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h
new file mode 100644
index 0000000000..e7939216b7
--- /dev/null
+++ b/Source/Core/DolphinWX/VideoConfigDiag.h
@@ -0,0 +1,279 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <map>
+#include <string>
+#include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/dialog.h>
+#include <wx/msgdlg.h>
+#include <wx/radiobut.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/SysConf.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/PostProcessingConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "VideoCommon/PostProcessing.h"
+#include "VideoCommon/VideoBackendBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+class wxBoxSizer;
+class wxControl;
+class wxPanel;
+
+template <typename W>
+class BoolSetting : public W
+{
+public:
+	BoolSetting(wxWindow* parent, const wxString& label, const wxString& tooltip, bool &setting, bool reverse = false, long style = 0);
+
+	void UpdateValue(wxCommandEvent& ev)
+	{
+		m_setting = (ev.GetInt() != 0) ^ m_reverse;
+		ev.Skip();
+	}
+private:
+	bool &m_setting;
+	const bool m_reverse;
+};
+
+typedef BoolSetting<wxCheckBox> SettingCheckBox;
+typedef BoolSetting<wxRadioButton> SettingRadioButton;
+
+template <typename T>
+class IntegerSetting : public wxSpinCtrl
+{
+public:
+	IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style = 0);
+
+	void UpdateValue(wxCommandEvent& ev)
+	{
+		m_setting = ev.GetInt();
+		ev.Skip();
+	}
+private:
+	T& m_setting;
+};
+
+typedef IntegerSetting<u32> U32Setting;
+
+class SettingChoice : public wxChoice
+{
+public:
+	SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num = 0, const wxString choices[] = nullptr, long style = 0);
+	void UpdateValue(wxCommandEvent& ev);
+private:
+	int &m_setting;
+};
+
+class VideoConfigDiag : public wxDialog
+{
+public:
+	VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& ininame);
+
+protected:
+	void Event_Backend(wxCommandEvent &ev)
+	{
+		VideoBackend* new_backend = g_available_video_backends[ev.GetInt()];
+		if (g_video_backend != new_backend)
+		{
+			bool do_switch = !Core::IsRunning();
+			if (new_backend->GetName() == "Software Renderer")
+			{
+				do_switch = (wxYES == wxMessageBox(_("Software rendering is an order of magnitude slower than using the other backends.\nIt's only useful for debugging purposes.\nDo you really want to enable software rendering? If unsure, select 'No'."),
+							_("Warning"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION, wxWindow::FindFocus()));
+			}
+
+			if (do_switch)
+			{
+				// TODO: Only reopen the dialog if the software backend is
+				// selected (make sure to reinitialize backend info)
+				// reopen the dialog
+				Close();
+
+				g_video_backend = new_backend;
+				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = g_video_backend->GetName();
+
+				g_video_backend->ShowConfig(GetParent());
+			}
+			else
+			{
+				// Select current backend again
+				choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
+			}
+		}
+
+		ev.Skip();
+	}
+	void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO
+
+	void Event_DisplayResolution(wxCommandEvent &ev);
+
+	void Event_ProgressiveScan(wxCommandEvent &ev)
+	{
+		SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", ev.GetInt());
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.IsChecked();
+
+		ev.Skip();
+	}
+
+	void Event_Stc(wxCommandEvent &ev)
+	{
+		int samples[] = { 0, 512, 128 };
+		vconfig.iSafeTextureCache_ColorSamples = samples[ev.GetInt()];
+
+		ev.Skip();
+	}
+
+	void Event_PPShader(wxCommandEvent &ev)
+	{
+		const int sel = ev.GetInt();
+		if (sel)
+			vconfig.sPostProcessingShader = WxStrToStr(ev.GetString());
+		else
+			vconfig.sPostProcessingShader.clear();
+
+		// Should we enable the configuration button?
+		PostProcessingShaderConfiguration postprocessing_shader;
+		postprocessing_shader.LoadShader(vconfig.sPostProcessingShader);
+		button_config_pp->Enable(postprocessing_shader.HasOptions());
+
+		ev.Skip();
+	}
+
+	void Event_ConfigurePPShader(wxCommandEvent &ev)
+	{
+		PostProcessingConfigDiag dialog(this, vconfig.sPostProcessingShader);
+		dialog.ShowModal();
+
+		ev.Skip();
+	}
+
+	void Event_StereoDepth(wxCommandEvent &ev)
+	{
+		vconfig.iStereoDepth = ev.GetInt();
+
+		ev.Skip();
+	}
+
+	void Event_StereoConvergence(wxCommandEvent &ev)
+	{
+		vconfig.iStereoConvergence = ev.GetInt();
+
+		ev.Skip();
+	}
+
+	void Event_StereoMode(wxCommandEvent &ev)
+	{
+		if (vconfig.backend_info.bSupportsPostProcessing)
+		{
+			// Anaglyph overrides post-processing shaders
+			choice_ppshader->Clear();
+		}
+
+		ev.Skip();
+	}
+
+	void Event_ClickClose(wxCommandEvent&);
+	void Event_Close(wxCloseEvent&);
+
+	// Enables/disables UI elements depending on current config
+	void OnUpdateUI(wxUpdateUIEvent& ev)
+	{
+		// Anti-aliasing
+		choice_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
+		text_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
+
+		// XFB
+		virtual_xfb->Enable(vconfig.bUseXFB);
+		real_xfb->Enable(vconfig.bUseXFB);
+
+		// custom textures
+		cache_hires_textures->Enable(vconfig.bHiresTextures);
+
+		// Repopulating the post-processing shaders can't be done from an event
+		if (choice_ppshader && choice_ppshader->IsEmpty())
+			PopulatePostProcessingShaders();
+
+		// Things which shouldn't be changed during emulation
+		if (Core::IsRunning())
+		{
+			choice_backend->Disable();
+			label_backend->Disable();
+
+			// D3D only
+			if (vconfig.backend_info.Adapters.size())
+			{
+				choice_adapter->Disable();
+				label_adapter->Disable();
+			}
+
+#ifndef __APPLE__
+			// This isn't supported on OS X.
+
+			choice_display_resolution->Disable();
+			label_display_resolution->Disable();
+#endif
+
+			progressive_scan_checkbox->Disable();
+			render_to_main_checkbox->Disable();
+		}
+		ev.Skip();
+	}
+
+	// Creates controls and connects their enter/leave window events to Evt_Enter/LeaveControl
+	SettingCheckBox* CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
+	SettingChoice* CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num = 0, const wxString choices[] = nullptr, long style = 0);
+	SettingRadioButton* CreateRadioButton(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
+
+	// Same as above but only connects enter/leave window events
+	wxControl* RegisterControl(wxControl* const control, const wxString& description);
+
+	void Evt_EnterControl(wxMouseEvent& ev);
+	void Evt_LeaveControl(wxMouseEvent& ev);
+	void CreateDescriptionArea(wxPanel* const page, wxBoxSizer* const sizer);
+	void PopulatePostProcessingShaders();
+
+	wxChoice* choice_backend;
+	wxChoice* choice_adapter;
+	wxChoice* choice_display_resolution;
+
+	wxStaticText* label_backend;
+	wxStaticText* label_adapter;
+
+	wxStaticText* text_aamode;
+	SettingChoice* choice_aamode;
+
+	wxStaticText* label_display_resolution;
+
+	wxButton* button_config_pp;
+
+	SettingCheckBox* borderless_fullscreen;
+	SettingCheckBox* render_to_main_checkbox;
+
+	SettingRadioButton* virtual_xfb;
+	SettingRadioButton* real_xfb;
+
+	SettingCheckBox* cache_hires_textures;
+
+	wxCheckBox* progressive_scan_checkbox;
+
+	wxChoice* choice_ppshader;
+
+	std::map<wxWindow*, wxString> ctrl_descs; // maps setting controls to their descriptions
+	std::map<wxWindow*, wxStaticText*> desc_texts; // maps dialog tabs (which are the parents of the setting controls) to their description text objects
+
+	VideoConfig &vconfig;
+	std::string ininame;
+};
diff --git a/Source/Core/DolphinWX/WXInputBase.cpp b/Source/Core/DolphinWX/WXInputBase.cpp
new file mode 100644
index 0000000000..eb87a7169b
--- /dev/null
+++ b/Source/Core/DolphinWX/WXInputBase.cpp
@@ -0,0 +1,161 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/chartype.h>
+#include <wx/defs.h>
+#include <wx/string.h>
+#include <wx/translation.h>
+
+#include "DolphinWX/WXInputBase.h"
+
+namespace WxUtils
+{
+
+const wxString WXKeyToString(int keycode)
+{
+	switch (keycode)
+	{
+		case WXK_BACK:              return _("Back");
+		case WXK_TAB:               return _("Tab");
+		case WXK_RETURN:            return _("Return");
+		case WXK_ESCAPE:            return _("Escape");
+		case WXK_SPACE:             return _("Space");
+		case WXK_DELETE:            return _("Delete");
+
+		// Undocumented wx keycodes
+		case 167:                   return _("Paragraph");
+		case 177:                   return _("Plus-Minus");
+
+		case WXK_START:             return _("Start");
+		case WXK_LBUTTON:           return _("L Button");
+		case WXK_RBUTTON:           return _("R Button");
+		case WXK_CANCEL:            return _("Cancel");
+		case WXK_MBUTTON:           return _("M Button");
+		case WXK_CLEAR:             return _("Clear");
+		case WXK_SHIFT:             return "Shift";
+		case WXK_ALT:               return "Alt";
+		case WXK_RAW_CONTROL:       return _("Control");
+#ifdef __WXOSX__
+		case WXK_COMMAND:           return _("Command");
+#endif
+		case WXK_MENU:              return _("Menu");
+		case WXK_PAUSE:             return _("Pause");
+		case WXK_CAPITAL:           return _("Caps Lock");
+		case WXK_END:               return _("End");
+		case WXK_HOME:              return _("Home");
+		case WXK_LEFT:              return _("Left");
+		case WXK_UP:                return _("Up");
+		case WXK_RIGHT:             return _("Right");
+		case WXK_DOWN:              return _("Down");
+		case WXK_SELECT:            return _("Select");
+		case WXK_PRINT:             return _("Print");
+		case WXK_EXECUTE:           return _("Execute");
+		case WXK_SNAPSHOT:          return _("Snapshot");
+		case WXK_INSERT:            return _("Insert");
+		case WXK_HELP:              return _("Help");
+		case WXK_NUMPAD0:           return "NP 0";
+		case WXK_NUMPAD1:           return "NP 1";
+		case WXK_NUMPAD2:           return "NP 2";
+		case WXK_NUMPAD3:           return "NP 3";
+		case WXK_NUMPAD4:           return "NP 4";
+		case WXK_NUMPAD5:           return "NP 5";
+		case WXK_NUMPAD6:           return "NP 6";
+		case WXK_NUMPAD7:           return "NP 7";
+		case WXK_NUMPAD8:           return "NP 8";
+		case WXK_NUMPAD9:           return "NP 9";
+		case WXK_MULTIPLY:          return _("Multiply");
+		case WXK_ADD:               return _("Add");
+		case WXK_SEPARATOR:         return _("Separator");
+		case WXK_SUBTRACT:          return _("Subtract");
+		case WXK_DECIMAL:           return _("Decimal");
+		case WXK_DIVIDE:            return _("Divide");
+		case WXK_F1:                return "F1";
+		case WXK_F2:                return "F2";
+		case WXK_F3:                return "F3";
+		case WXK_F4:                return "F4";
+		case WXK_F5:                return "F5";
+		case WXK_F6:                return "F6";
+		case WXK_F7:                return "F7";
+		case WXK_F8:                return "F8";
+		case WXK_F9:                return "F9";
+		case WXK_F10:               return "F10";
+		case WXK_F11:               return "F11";
+		case WXK_F12:               return "F12";
+		case WXK_F13:               return "F13";
+		case WXK_F14:               return "F14";
+		case WXK_F15:               return "F15";
+		case WXK_F16:               return "F16";
+		case WXK_F17:               return "F17";
+		case WXK_F18:               return "F19";
+		case WXK_F19:               return "F20";
+		case WXK_F20:               return "F21";
+		case WXK_F21:               return "F22";
+		case WXK_F22:               return "F23";
+		case WXK_F23:               return "F24";
+		case WXK_F24:               return "F25";
+		case WXK_NUMLOCK:           return _("Num Lock");
+		case WXK_SCROLL:            return _("Scroll Lock");
+		case WXK_PAGEUP:            return _("Page Up");
+		case WXK_PAGEDOWN:          return _("Page Down");
+		case WXK_NUMPAD_SPACE:      return _("NP Space");
+		case WXK_NUMPAD_TAB:        return _("NP Tab");
+		case WXK_NUMPAD_ENTER:      return _("NP Enter");
+		case WXK_NUMPAD_F1:         return "NP F1";
+		case WXK_NUMPAD_F2:         return "NP F2";
+		case WXK_NUMPAD_F3:         return "NP F3";
+		case WXK_NUMPAD_F4:         return "NP F4";
+		case WXK_NUMPAD_HOME:       return _("NP Home");
+		case WXK_NUMPAD_LEFT:       return _("NP Left");
+		case WXK_NUMPAD_UP:         return _("NP Up");
+		case WXK_NUMPAD_RIGHT:      return _("NP Right");
+		case WXK_NUMPAD_DOWN:       return _("NP Down");
+		case WXK_NUMPAD_PAGEUP:     return _("NP Page Up");
+		case WXK_NUMPAD_PAGEDOWN:   return _("NP Page Down");
+		case WXK_NUMPAD_END:        return _("NP End");
+		case WXK_NUMPAD_BEGIN:      return _("NP Begin");
+		case WXK_NUMPAD_INSERT:     return _("NP Insert");
+		case WXK_NUMPAD_DELETE:     return _("NP Delete");
+		case WXK_NUMPAD_EQUAL:      return _("NP Equal");
+		case WXK_NUMPAD_MULTIPLY:   return _("NP Multiply");
+		case WXK_NUMPAD_ADD:        return _("NP Add");
+		case WXK_NUMPAD_SEPARATOR:  return _("NP Separator");
+		case WXK_NUMPAD_SUBTRACT:   return _("NP Subtract");
+		case WXK_NUMPAD_DECIMAL:    return _("NP Decimal");
+		case WXK_NUMPAD_DIVIDE:     return _("NP Divide");
+		case WXK_WINDOWS_LEFT:      return _("Windows Left");
+		case WXK_WINDOWS_RIGHT:     return _("Windows Right");
+		case WXK_WINDOWS_MENU:      return _("Windows Menu");
+	}
+
+	if (keycode > WXK_SPACE && keycode < WXK_DELETE)
+	{
+		return wxString((wxChar)keycode, 1);
+	}
+
+	return "";
+}
+
+const wxString WXKeymodToString(int modifier)
+{
+	wxString mods;
+
+	if (modifier & wxMOD_META)
+#ifdef __APPLE__
+		mods += "Cmd+";
+#elif defined _WIN32
+		mods += "Win+";
+#else
+		mods += "Meta+";
+#endif
+	if (modifier & wxMOD_CONTROL)
+		mods += "Ctrl+";
+	if (modifier & wxMOD_ALT)
+		mods += "Alt+";
+	if (modifier & wxMOD_SHIFT)
+		mods += "Shift+";
+
+	return mods;
+}
+
+}
diff --git a/Source/Core/DolphinWX/WXInputBase.h b/Source/Core/DolphinWX/WXInputBase.h
new file mode 100644
index 0000000000..9aa64c72e4
--- /dev/null
+++ b/Source/Core/DolphinWX/WXInputBase.h
@@ -0,0 +1,13 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <wx/string.h>
+
+namespace WxUtils
+{
+const wxString WXKeyToString(int keycode);
+const wxString WXKeymodToString(int modifier);
+}
diff --git a/Source/Core/DolphinWX/WxUtils.cpp b/Source/Core/DolphinWX/WxUtils.cpp
new file mode 100644
index 0000000000..1b5c7b5f42
--- /dev/null
+++ b/Source/Core/DolphinWX/WxUtils.cpp
@@ -0,0 +1,88 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/msgdlg.h>
+#include <wx/mstream.h>
+#include <wx/toolbar.h>
+#include <wx/utils.h>
+
+#include "DolphinWX/WxUtils.h"
+
+#ifdef __APPLE__
+#import <AppKit/AppKit.h>
+#endif
+
+namespace WxUtils
+{
+
+// Launch a file according to its mime type
+void Launch(const std::string& filename)
+{
+	if (! ::wxLaunchDefaultBrowser(StrToWxStr(filename)))
+	{
+		// WARN_LOG
+	}
+}
+
+// Launch an file explorer window on a certain path
+void Explore(const std::string& path)
+{
+	wxString wxPath = StrToWxStr(path);
+#ifndef _WIN32
+	// Default to file
+	if (! wxPath.Contains("://"))
+	{
+		wxPath = "file://" + wxPath;
+	}
+#endif
+
+#ifdef __WXGTK__
+	wxPath.Replace(" ", "\\ ");
+#endif
+
+	if (! ::wxLaunchDefaultBrowser(wxPath))
+	{
+		// WARN_LOG
+	}
+}
+
+void ShowErrorDialog(const wxString& error_msg)
+{
+	wxMessageBox(error_msg, _("Error"), wxOK | wxICON_ERROR);
+}
+
+wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
+{
+	wxMemoryInputStream is(data, length);
+	return(wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1));
+}
+
+wxBitmap CreateDisabledButtonBitmap(const wxBitmap& original)
+{
+	wxImage image = original.ConvertToImage();
+	return wxBitmap(image.ConvertToDisabled(240));
+}
+
+void AddToolbarButton(wxToolBar* toolbar, int toolID, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp)
+{
+	// Must explicitly set the disabled button bitmap because wxWidgets
+	// incorrectly desaturates it instead of lightening it.
+	toolbar->AddTool(toolID, label, bitmap, WxUtils::CreateDisabledButtonBitmap(bitmap), wxITEM_NORMAL, shortHelp);
+}
+
+}  // namespace
+
+std::string WxStrToStr(const wxString& str)
+{
+	return str.ToUTF8().data();
+}
+
+wxString StrToWxStr(const std::string& str)
+{
+	//return wxString::FromUTF8Unchecked(str.c_str());
+	return wxString::FromUTF8(str.c_str());
+}
diff --git a/Source/Core/DolphinWX/WxUtils.h b/Source/Core/DolphinWX/WxUtils.h
new file mode 100644
index 0000000000..3faad4593c
--- /dev/null
+++ b/Source/Core/DolphinWX/WxUtils.h
@@ -0,0 +1,39 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <wx/string.h>
+
+class wxBitmap;
+class wxToolBar;
+
+// A shortcut to access the bitmaps
+#define wxGetBitmapFromMemory(name) WxUtils::_wxGetBitmapFromMemory(name, sizeof(name))
+
+namespace WxUtils
+{
+
+// Launch a file according to its mime type
+void Launch(const std::string& filename);
+
+// Launch an file explorer window on a certain path
+void Explore(const std::string& path);
+
+// Displays a wxMessageBox geared for errors
+void ShowErrorDialog(const wxString& error_msg);
+
+wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length);
+
+// From a wxBitmap, creates the corresponding disabled version for toolbar buttons
+wxBitmap CreateDisabledButtonBitmap(const wxBitmap& original);
+
+// Helper function to add a button to a toolbar
+void AddToolbarButton(wxToolBar* toolbar, int toolID, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp);
+
+}  // namespace
+
+std::string WxStrToStr(const wxString& str);
+wxString StrToWxStr(const std::string& str);
diff --git a/Source/Core/DolphinWX/X11Utils.cpp b/Source/Core/DolphinWX/X11Utils.cpp
new file mode 100644
index 0000000000..5622d37d0d
--- /dev/null
+++ b/Source/Core/DolphinWX/X11Utils.cpp
@@ -0,0 +1,287 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <spawn.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "Common/Logging/Log.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/X11Utils.h"
+
+extern char **environ;
+
+#if defined(HAVE_WX) && HAVE_WX
+#include <algorithm>
+#include <string>
+
+#include "DolphinWX/WxUtils.h"
+#endif
+
+namespace X11Utils
+{
+
+bool ToggleFullscreen(Display *dpy, Window win)
+{
+	// Init X event structure for _NET_WM_STATE_FULLSCREEN client message
+	XEvent event;
+	event.xclient.type = ClientMessage;
+	event.xclient.message_type = XInternAtom(dpy, "_NET_WM_STATE", False);
+	event.xclient.window = win;
+	event.xclient.format = 32;
+	event.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
+	event.xclient.data.l[1] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
+
+	// Send the event
+	if (!XSendEvent(dpy, DefaultRootWindow(dpy), False,
+	                SubstructureRedirectMask | SubstructureNotifyMask, &event))
+	{
+		ERROR_LOG(VIDEO, "Failed to switch fullscreen/windowed mode.");
+		return false;
+	}
+
+	return true;
+}
+
+void InhibitScreensaver(Display *dpy, Window win, bool suspend)
+{
+	char id[11];
+	snprintf(id, sizeof(id), "0x%lx", win);
+
+	// Call xdg-screensaver
+	char *argv[4] = {
+		(char *)"xdg-screensaver",
+		(char *)(suspend ? "suspend" : "resume"),
+		id,
+		nullptr};
+	pid_t pid;
+	if (!posix_spawnp(&pid, "xdg-screensaver", nullptr, nullptr, argv, environ))
+	{
+		int status;
+		while (waitpid (pid, &status, 0) == -1);
+
+		DEBUG_LOG(VIDEO, "Started xdg-screensaver (PID = %d)", (int)pid);
+	}
+}
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+XRRConfiguration::XRRConfiguration(Display *_dpy, Window _win)
+	: dpy(_dpy)
+	, win(_win)
+	, screenResources(nullptr), outputInfo(nullptr), crtcInfo(nullptr)
+	, fullMode(0)
+	, fs_fb_width(0), fs_fb_height(0), fs_fb_width_mm(0), fs_fb_height_mm(0)
+	, bValid(true), bIsFullscreen(false)
+{
+	int XRRMajorVersion, XRRMinorVersion;
+
+	if (!XRRQueryVersion(dpy, &XRRMajorVersion, &XRRMinorVersion) ||
+	    (XRRMajorVersion < 1 || (XRRMajorVersion == 1 && XRRMinorVersion < 3)))
+	{
+		WARN_LOG(VIDEO, "XRRExtension not supported.");
+		bValid = false;
+		return;
+	}
+
+	screenResources = XRRGetScreenResourcesCurrent(dpy, win);
+
+	screen = DefaultScreen(dpy);
+	fb_width = DisplayWidth(dpy, screen);
+	fb_height = DisplayHeight(dpy, screen);
+	fb_width_mm = DisplayWidthMM(dpy, screen);
+	fb_height_mm = DisplayHeightMM(dpy, screen);
+
+	INFO_LOG(VIDEO, "XRRExtension-Version %d.%d", XRRMajorVersion, XRRMinorVersion);
+	Update();
+}
+
+XRRConfiguration::~XRRConfiguration()
+{
+	if (bValid && bIsFullscreen)
+		ToggleDisplayMode(False);
+	if (screenResources)
+		XRRFreeScreenResources(screenResources);
+	if (outputInfo)
+		XRRFreeOutputInfo(outputInfo);
+	if (crtcInfo)
+		XRRFreeCrtcInfo(crtcInfo);
+}
+
+void XRRConfiguration::Update()
+{
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution == "Auto")
+		return;
+
+	if (!bValid)
+		return;
+
+	if (outputInfo)
+	{
+		XRRFreeOutputInfo(outputInfo);
+		outputInfo = nullptr;
+	}
+	if (crtcInfo)
+	{
+		XRRFreeCrtcInfo(crtcInfo);
+		crtcInfo = nullptr;
+	}
+	fullMode = 0;
+
+	// Get the resolution setings for fullscreen mode
+	unsigned int fullWidth, fullHeight;
+	char *output_name = nullptr;
+	char auxFlag = '\0';
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.find(':') ==
+			std::string::npos)
+	{
+		fullWidth = fb_width;
+		fullHeight = fb_height;
+	}
+	else
+	{
+		sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
+				"%m[^:]: %ux%u%c", &output_name, &fullWidth, &fullHeight, &auxFlag);
+	}
+	bool want_interlaced = ('i' == auxFlag);
+
+	for (int i = 0; i < screenResources->noutput; i++)
+	{
+		XRROutputInfo *output_info = XRRGetOutputInfo(dpy, screenResources, screenResources->outputs[i]);
+		if (output_info && output_info->crtc && output_info->connection == RR_Connected)
+		{
+			XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(dpy, screenResources, output_info->crtc);
+			if (crtc_info)
+			{
+				if (!output_name || !strcmp(output_name, output_info->name))
+				{
+					// Use the first output for the default setting.
+					if (!output_name)
+					{
+						output_name = strdup(output_info->name);
+						SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
+							StringFromFormat("%s: %ux%u", output_info->name, fullWidth, fullHeight);
+					}
+					outputInfo = output_info;
+					crtcInfo = crtc_info;
+					for (int j = 0; j < output_info->nmode && fullMode == 0; j++)
+					{
+						for (int k = 0; k < screenResources->nmode && fullMode == 0; k++)
+						{
+							if (output_info->modes[j] == screenResources->modes[k].id)
+							{
+								if (fullWidth == screenResources->modes[k].width &&
+										fullHeight == screenResources->modes[k].height &&
+										want_interlaced == !!(screenResources->modes[k].modeFlags & RR_Interlace))
+								{
+									fullMode = screenResources->modes[k].id;
+									if (crtcInfo->x + (int)screenResources->modes[k].width > fs_fb_width)
+										fs_fb_width = crtcInfo->x + screenResources->modes[k].width;
+									if (crtcInfo->y + (int)screenResources->modes[k].height > fs_fb_height)
+										fs_fb_height = crtcInfo->y + screenResources->modes[k].height;
+								}
+							}
+						}
+					}
+				}
+				else
+				{
+					if (crtc_info->x + (int)crtc_info->width > fs_fb_width)
+						fs_fb_width = crtc_info->x + crtc_info->width;
+					if (crtc_info->y + (int)crtc_info->height > fs_fb_height)
+						fs_fb_height = crtc_info->y + crtc_info->height;
+				}
+			}
+			if (crtc_info && crtcInfo != crtc_info)
+				XRRFreeCrtcInfo(crtc_info);
+		}
+		if (output_info && outputInfo != output_info)
+			XRRFreeOutputInfo(output_info);
+	}
+	fs_fb_width_mm = fs_fb_width * DisplayHeightMM(dpy, screen) / DisplayHeight(dpy, screen);
+	fs_fb_height_mm = fs_fb_height * DisplayHeightMM(dpy, screen) / DisplayHeight(dpy, screen);
+
+	if (output_name)
+		free(output_name);
+
+	if (outputInfo && crtcInfo && fullMode)
+	{
+		INFO_LOG(VIDEO, "Fullscreen Resolution %dx%d", fullWidth, fullHeight);
+	}
+	else
+	{
+		ERROR_LOG(VIDEO, "Failed to obtain fullscreen size.\n"
+				"Using current desktop resolution for fullscreen.");
+	}
+}
+
+void XRRConfiguration::ToggleDisplayMode(bool bFullscreen)
+{
+	if (!bValid || !screenResources || !outputInfo || !crtcInfo || !fullMode)
+		return;
+	if (bFullscreen == bIsFullscreen)
+		return;
+
+	XGrabServer(dpy);
+	if (bFullscreen)
+	{
+		XRRSetCrtcConfig(dpy, screenResources, outputInfo->crtc, CurrentTime,
+				crtcInfo->x, crtcInfo->y, fullMode, crtcInfo->rotation,
+				crtcInfo->outputs, crtcInfo->noutput);
+		XRRSetScreenSize(dpy, win, fs_fb_width, fs_fb_height, fs_fb_width_mm, fs_fb_height_mm);
+		bIsFullscreen = true;
+	}
+	else
+	{
+		XRRSetCrtcConfig(dpy, screenResources, outputInfo->crtc, CurrentTime,
+				crtcInfo->x, crtcInfo->y, crtcInfo->mode, crtcInfo->rotation,
+				crtcInfo->outputs, crtcInfo->noutput);
+		XRRSetScreenSize(dpy, win, fb_width, fb_height, fb_width_mm, fb_height_mm);
+		bIsFullscreen = false;
+	}
+	XUngrabServer(dpy);
+	XSync(dpy, false);
+}
+
+void XRRConfiguration::AddResolutions(std::vector<std::string>& resos)
+{
+	if (!bValid || !screenResources)
+		return;
+
+	//Get all full screen resolutions for the config dialog
+	for (int i = 0; i < screenResources->noutput; i++)
+	{
+		XRROutputInfo *output_info =
+			XRRGetOutputInfo(dpy, screenResources, screenResources->outputs[i]);
+
+		if (output_info && output_info->crtc && output_info->connection == RR_Connected)
+		{
+			for (int j = 0; j < output_info->nmode; j++)
+			{
+				for (int k = 0; k < screenResources->nmode; k++)
+				{
+					if (output_info->modes[j] == screenResources->modes[k].id)
+					{
+						bool interlaced = !!(screenResources->modes[k].modeFlags & RR_Interlace);
+						const std::string strRes =
+							std::string(output_info->name) + ": " +
+							std::string(screenResources->modes[k].name) + (interlaced? "i" : "");
+						// Only add unique resolutions
+						if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
+						{
+							resos.push_back(strRes);
+						}
+					}
+				}
+			}
+		}
+		if (output_info)
+			XRRFreeOutputInfo(output_info);
+	}
+}
+
+#endif
+
+}
diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h
new file mode 100644
index 0000000000..bab37feaf8
--- /dev/null
+++ b/Source/Core/DolphinWX/X11Utils.h
@@ -0,0 +1,71 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on
+// common names such as "Status", "BadRequest" or "Response", causing SFML
+// headers to be completely broken.
+//
+// We work around that issue by including SFML first before X11 headers. This
+// is terrible, but such is the life with Xlib.
+#include <SFML/Network.hpp> // NOLINT
+
+#if defined(HAVE_WX) && HAVE_WX
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <wx/arrstr.h>
+#endif
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xlib.h>
+
+
+// EWMH state actions, see
+// http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec
+#define _NET_WM_STATE_REMOVE        0    // remove/unset property
+#define _NET_WM_STATE_ADD           1    // add/set property
+#define _NET_WM_STATE_TOGGLE        2    // toggle property
+
+namespace X11Utils
+{
+
+bool ToggleFullscreen(Display *dpy, Window win);
+#if defined(HAVE_WX) && HAVE_WX
+Window XWindowFromHandle(void *Handle);
+Display *XDisplayFromHandle(void *Handle);
+#endif
+
+void InhibitScreensaver(Display *dpy, Window win, bool suspend);
+
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+class XRRConfiguration
+{
+	public:
+		XRRConfiguration(Display *_dpy, Window _win);
+		~XRRConfiguration();
+
+		void Update();
+		void ToggleDisplayMode(bool bFullscreen);
+		void AddResolutions(std::vector<std::string>& resos);
+
+	private:
+		Display *dpy;
+		Window win;
+		int screen;
+		XRRScreenResources *screenResources;
+		XRROutputInfo *outputInfo;
+		XRRCrtcInfo *crtcInfo;
+		RRMode fullMode;
+		int fb_width, fb_height, fb_width_mm, fb_height_mm;
+		int fs_fb_width, fs_fb_height, fs_fb_width_mm, fs_fb_height_mm;
+		bool bValid;
+		bool bIsFullscreen;
+};
+#endif
+
+}
diff --git a/Source/Core/DolphinWX/resource.h b/Source/Core/DolphinWX/resource.h
index 2032a4efd9..b95c701893 100644
--- a/Source/Core/DolphinWX/resource.h
+++ b/Source/Core/DolphinWX/resource.h
@@ -1,3 +1,7 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by DolphinWX.rc
@@ -5,7 +9,7 @@
 #define IDI_ICON1                       101
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        102
diff --git a/Source/Core/DolphinWX/resources/Flag_Australia.xpm b/Source/Core/DolphinWX/resources/Flag_Australia.xpm
new file mode 100644
index 0000000000..ebc4f57613
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Australia.xpm
@@ -0,0 +1,141 @@
+/* XPM */
+static const char * Flag_Australia_xpm[] = {
+"96 32 106 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #ED6786",
+"@ 	c #F6ECF1",
+"# 	c #7489B4",
+"$ 	c #032A78",
+"% 	c #002776",
+"& 	c #C797B3",
+"* 	c #E00034",
+"= 	c #817BA7",
+"- 	c #E75377",
+"; 	c #F4A8BA",
+"> 	c #7E7EA9",
+", 	c #E95E7F",
+"' 	c #F5ADBE",
+") 	c #C6CFE0",
+"! 	c #28498B",
+"~ 	c #2A488A",
+"{ 	c #D36F90",
+"] 	c #EB5C7D",
+"^ 	c #F5EAF0",
+"/ 	c #012877",
+"( 	c #204287",
+"_ 	c #C985A4",
+": 	c #EC6282",
+"< 	c #F8EBEF",
+"[ 	c #889ABF",
+"} 	c #C997B3",
+"| 	c #9584AB",
+"1 	c #E84A6F",
+"2 	c #F6B1C1",
+"3 	c #BDC7DC",
+"4 	c #143881",
+"5 	c #758AB5",
+"6 	c #BBC5DA",
+"7 	c #BCC6DB",
+"8 	c #DDDDE8",
+"9 	c #F9D4DD",
+"0 	c #FCE9EE",
+"a 	c #F4BDCB",
+"b 	c #F5B8C7",
+"c 	c #FAD4DC",
+"d 	c #FCF9FB",
+"e 	c #DAE0EB",
+"f 	c #244589",
+"g 	c #EAEDF4",
+"h 	c #234589",
+"i 	c #3D5B97",
+"j 	c #AAB7D1",
+"k 	c #ABB8D2",
+"l 	c #D1D8E6",
+"m 	c #FCF7F9",
+"n 	c #F9CBD5",
+"o 	c #F4B8C7",
+"p 	c #F3BCCB",
+"q 	c #FCE5EA",
+"r 	c #F7C3CF",
+"s 	c #D6D1E0",
+"t 	c #647CAC",
+"u 	c #294A8C",
+"v 	c #325191",
+"w 	c #D2D9E7",
+"x 	c #E75D7F",
+"y 	c #7072A2",
+"z 	c #667DAD",
+"A 	c #F2E8EE",
+"B 	c #D87393",
+"C 	c #345090",
+"D 	c #214388",
+"E 	c #052B79",
+"F 	c #072D7A",
+"G 	c #C3CCDF",
+"H 	c #F6E8EE",
+"I 	c #CF8AA6",
+"J 	c #C7D0E1",
+"K 	c #E74A70",
+"L 	c #8475A2",
+"M 	c #D8DEEA",
+"N 	c #627AAB",
+"O 	c #2C4C8E",
+"P 	c #1E4086",
+"Q 	c #F5AFBF",
+"R 	c #E85679",
+"S 	c #807AA6",
+"T 	c #F5E9EF",
+"U 	c #EC6080",
+"V 	c #335291",
+"W 	c #1C3F85",
+"X 	c #3C5A96",
+"Y 	c #0D327D",
+"Z 	c #7B8FB8",
+"` 	c #C1CADE",
+" .	c #7C90B9",
+"..	c #A6B4CF",
+"+.	c #FFFFFF",
+"@.	c #A5B3CF",
+"#.	c #395795",
+"$.	c #385694",
+"%.	c #092F7B",
+"&.	c #25468A",
+"*.	c #5A73A6",
+"=.	c #A8B5D0",
+"-.	c #5972A6",
+";.	c #2F4F8F",
+">.	c #F9FAFC",
+",.	c #7E92BA",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                                                                                                 ",
+". + @ # $ % % & * & % % $ = - ; % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". > , ' ) ! % & * & % ~ { ] ^ # % % % % % % % / % % % % % % % .                                                                                                                                 ",
+". % ( _ : < [ } * } | 1 2 3 ( % % % % % % % 4 5 4 % % % % % % .                                                                                                                                 ",
+". 6 6 7 8 9 0 a * b c d e 7 6 6 % % % % % % f g h % % % % % % .                                                                                                                                 ",
+". * * * * * * * * * * * * * * * % % % % % % % i % % % % % % % .                                                                                                                                 ",
+". * * * * * * * * * * * * * * * % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". j j k l m n o * p q r s k j j % % % % % % % % % % t u % % % .                                                                                                                                 ",
+". % v w ' x y & * & z A ] B C % % % / D E % % % % F G # % % % .                                                                                                                                 ",
+". 5 H : I ! % & * & % ! J 2 K L % % E M N % % % % % O P % % % .                                                                                                                                 ",
+". Q R S $ % % & * & % % $ 5 T U % % E # V % % % % % % % % % % .                                                                                                                                 ",
+". % % % % % % % % % % % % % % % % % % % % % % % i i % % % % % .                                                                                                                                 ",
+". % % % % % % % % % % % % % % % % % % % % % % % W W % % % % % .                                                                                                                                 ",
+". % % % % % % % X % % % % % % % % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". % % % % % Y Z `  .Y % % % % % % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". % % % % % % ..+.@.% % % % % % % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". % % % % % #.M +.M $.% % % % % % % % % % % %.&.%.% % % % % % .                                                                                                                                 ",
+". % % % % % % *.=.-.% % % % % % % % % % % % ;.>.;.% % % % % % .                                                                                                                                 ",
+". % % % % % % &.% &.% % % % % % % % % % % % % ,.% % % % % % % .                                                                                                                                 ",
+". % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % .                                                                                                                                 ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .                                                                                                                                 ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                ",
+"                                                                                                                                                                                                "};
diff --git a/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm b/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm
new file mode 100644
index 0000000000..c02e098412
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static const char * Flag_Netherlands_xpm[] = {
+"96 32 8 1",
+" 	c None",
+".	c #000000",
+"+	c #AE1C28",
+"@	c #C3565F",
+"#	c #FFFFFF",
+"$	c #526EA5",
+"%	c #1F448A",
+"&	c #21468B",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"................................                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.                                                                ",
+".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.                                                                ",
+".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.                                                                ",
+".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.                                                                ",
+".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&.                                                                ",
+"................................                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff --git a/Source/Core/DolphinWX/resources/Flag_Russia.xpm b/Source/Core/DolphinWX/resources/Flag_Russia.xpm
new file mode 100644
index 0000000000..cf6b646d62
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Russia.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static const char * Flag_Russia_xpm[] = {
+"96 32 7 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #AABDE1",
+"#	c #0039A6",
+"$	c #8E304B",
+"%	c #D52B1E",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"................................                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".##############################.                                                                ",
+".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.                                                                ",
+"................................                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff --git a/Source/Core/DolphinWX/resources/Flag_SDK.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm
deleted file mode 100644
index 169caacdcc..0000000000
--- a/Source/Core/DolphinWX/resources/Flag_SDK.xpm
+++ /dev/null
@@ -1,114 +0,0 @@
-/* XPM */
-static const char * Flag_SDK_xpm[] = {
-"96 32 79 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #E9E9FE",
-"#	c #5959FE",
-"$	c #1515FE",
-"%	c #0505FE",
-"&	c #1313FE",
-"*	c #3232FE",
-"=	c #0000FF",
-"-	c #0202FE",
-";	c #0C0CFE",
-">	c #2B2BFE",
-",	c #7676FE",
-"'	c #EEEEFE",
-")	c #D4D4FE",
-"!	c #1C1CFE",
-"~	c #0303FE",
-"{	c #9292FE",
-"]	c #5151FE",
-"^	c #B1B1FE",
-"/	c #F8F8FE",
-"(	c #CCCCFE",
-"_	c #E5E5FE",
-":	c #9393FE",
-"<	c #0A0AFE",
-"[	c #2424FE",
-"}	c #EAEAFE",
-"|	c #C2C2FE",
-"1	c #1010FE",
-"2	c #0D0DFE",
-"3	c #B6B6FE",
-"4	c #0F0FFE",
-"5	c #8989FE",
-"6	c #6767FE",
-"7	c #ACACFE",
-"8	c #0808FE",
-"9	c #1E1EFE",
-"0	c #D2D2FE",
-"a	c #5F5FFE",
-"b	c #9C9CFE",
-"c	c #E8E8FE",
-"d	c #DDDDFE",
-"e	c #1A1AFE",
-"f	c #9494FE",
-"g	c #3636FE",
-"h	c #E7E7FE",
-"i	c #B7B7FE",
-"j	c #0707FE",
-"k	c #A4A4FE",
-"l	c #F7F7FE",
-"m	c #B0B0FE",
-"n	c #FCFCFE",
-"o	c #C4C4FE",
-"p	c #8181FE",
-"q	c #2020FE",
-"r	c #1B1BFE",
-"s	c #0101FE",
-"t	c #0606FE",
-"u	c #AEAEFE",
-"v	c #E2E2FE",
-"w	c #8787FE",
-"x	c #0404FE",
-"y	c #A2A2FE",
-"z	c #3E3EFE",
-"A	c #A8A8FE",
-"B	c #F9F9FE",
-"C	c #5656FE",
-"D	c #E6E6FE",
-"E	c #B4B4FE",
-"F	c #0909FE",
-"G	c #9696FE",
-"H	c #4D4DFE",
-"I	c #2222FE",
-"J	c #1D1DFE",
-"K	c #6969FE",
-"L	c #0E0EFE",
-"M	c #2D2DFE",
-"N	c #7575FE",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"................................                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".+@#$%&*+++==-;>,'+++==+++)!~{+.                                                                ",
-".+]=^/(]+++==+_:<[}++==++|123++.                                                                ",
-".+4=_++++++==+++5=6++==+7890+++.                                                                ",
-".+9=&abc+++==+++d=e++==f-gh++++.                                                                ",
-".+ie===jk++==+++l=%++====m+++++.                                                                ",
-".++nopq=!++==+++d=r++==:stu++++.                                                                ",
-".+++++v=1++==+++w=6++==+kx~y+++.                                                                ",
-".+zAcB7=C++==+D:<[}++==++EFsG++.                                                                ",
-".+HI;%JK'++==~LMN'+++==+++|4=w+.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-".++++++++++++++++++++++++++++++.                                                                ",
-"................................                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};
diff --git a/Source/Core/DolphinWX/resources/Flag_Spain.xpm b/Source/Core/DolphinWX/resources/Flag_Spain.xpm
new file mode 100644
index 0000000000..09d1cffb4b
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Spain.xpm
@@ -0,0 +1,94 @@
+/* XPM */
+static const char * Flag_Spain_xpm[] = {
+"96 32 59 1",
+" 	c None",
+".	c #000000",
+"+	c #C60B1E",
+"@	c #FFC400",
+"#	c #E8B707",
+"$	c #E6B709",
+"%	c #FAC006",
+"&	c #C08113",
+"*	c #B9720D",
+"=	c #B9720E",
+"-	c #BF8113",
+";	c #FAC005",
+">	c #D99F03",
+",	c #D69A03",
+"'	c #C47F08",
+")	c #A37D0A",
+"!	c #AB7D0A",
+"~	c #C58109",
+"{	c #DDA102",
+"]	c #E3B91B",
+"^	c #DCB41F",
+"/	c #A73C12",
+"(	c #A83D11",
+"_	c #B59BA2",
+":	c #C5A6A9",
+"<	c #DDB420",
+"[	c #DFB61E",
+"}	c #CE872D",
+"|	c #C67C30",
+"1	c #925318",
+"2	c #854523",
+"3	c #A17C89",
+"4	c #C6A0B1",
+"5	c #C77F2F",
+"6	c #C8822E",
+"7	c #D59433",
+"8	c #CD8D39",
+"9	c #A64D1B",
+"0	c #7C423D",
+"a	c #7D4443",
+"b	c #B9572A",
+"c	c #CC8C39",
+"d	c #D08E35",
+"e	c #E3B72C",
+"f	c #DDB632",
+"g	c #A7560E",
+"h	c #AB580D",
+"i	c #B44C15",
+"j	c #B34C13",
+"k	c #DDB52E",
+"l	c #DEB32E",
+"m	c #C7AA2D",
+"n	c #C6AD31",
+"o	c #C4872C",
+"p	c #B58955",
+"q	c #B9885E",
+"r	c #CF8932",
+"s	c #C6AC2F",
+"t	c #C4AA2E",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"................................                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@@@@#$@@@@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@@%&*=-;@@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@>,')!~{{@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@]^/(_:<[@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@}|123456@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@7890abcd@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@efghijkl@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@mnopqrst@@@@@@@@@@@@@@@@.                                                                ",
+".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+".++++++++++++++++++++++++++++++.                                                                ",
+"................................                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop
deleted file mode 100644
index f201f07f22..0000000000
--- a/Source/Core/DolphinWX/resources/dolphin-emu.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Dolphin Emulator
-Comment=A Wii/GameCube Emulator
-Icon=dolphin-emu
-Exec=dolphin-emu
-Categories=Game;
-
diff --git a/Source/Core/DolphinWX/resources/dolphin_logo.cpp b/Source/Core/DolphinWX/resources/dolphin_logo.cpp
index a78ca0fb95..5eaf079561 100644
--- a/Source/Core/DolphinWX/resources/dolphin_logo.cpp
+++ b/Source/Core/DolphinWX/resources/dolphin_logo.cpp
@@ -1,2868 +1,946 @@
-static const unsigned char dolphin_logo_png[] = {
-0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x01, 0x07, 0x00, 0x00, 0x01, 0x76, 
-0x08, 0x02, 0x00, 0x00, 0x00, 0xec, 0xb7, 0xca, 0x94, 0x00, 0x00, 0x00, 
-0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, 
-0x00, 0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 
-0x61, 0x05, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 
-0x7a, 0x26, 0x00, 0x00, 0x80, 0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 
-0x80, 0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea, 0x60, 0x00, 0x00, 
-0x3a, 0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 
-0x85, 0xcd, 0x49, 0x44, 0x41, 0x54, 0x78, 0x5e, 0xed, 0x9d, 0x07, 0x98, 
-0x14, 0x55, 0xb6, 0xc7, 0x7b, 0x62, 0x4f, 0x1e, 0x18, 0x26, 0x90, 0xd3, 
-0x30, 0xe4, 0xcc, 0x90, 0xe3, 0x90, 0x73, 0x8e, 0x22, 0x41, 0x92, 0x82, 
-0x48, 0x14, 0x15, 0x45, 0x24, 0x89, 0xc0, 0xc0, 0x90, 0x83, 0x04, 0x45, 
-0x50, 0x11, 0x31, 0x60, 0xc0, 0xac, 0x6b, 0x5c, 0x73, 0x5a, 0xd3, 0xa6, 
-0xf7, 0x36, 0xb9, 0xcf, 0x4d, 0xba, 0xee, 0xae, 0xae, 0xab, 0xee, 0x2e, 
-0xef, 0xd7, 0x1c, 0xbc, 0x73, 0xa7, 0xaa, 0xba, 0xbb, 0x3a, 0x4c, 0xe8, 
-0x50, 0xdf, 0xc0, 0xd7, 0xd3, 0x53, 0x75, 0xeb, 0xd6, 0xad, 0xf3, 0xbf, 
-0x27, 0x9f, 0x13, 0x13, 0x17, 0x17, 0x97, 0x9e, 0x9e, 0xfe, 0xed, 0xb7, 
-0xdf, 0xc6, 0xc4, 0xc4, 0x38, 0xac, 0x8e, 0xf3, 0xe7, 0xcf, 0x5b, 0x7e, 
-0x1f, 0xfd, 0x32, 0xba, 0x02, 0xa1, 0xbb, 0x02, 0x96, 0xd4, 0x0e, 0xa9, 
-0x3b, 0x9d, 0xce, 0x7f, 0xfc, 0xe3, 0x1f, 0x8e, 0xcc, 0xcc, 0xcc, 0x7d, 
-0xfb, 0xf6, 0xdd, 0x7b, 0xef, 0xbd, 0xa7, 0x4c, 0xc7, 0xdd, 0x17, 0x8e, 
-0xbb, 0x2e, 0x1c, 0x77, 0xde, 0x79, 0xe7, 0xc9, 0x0b, 0xc7, 0x89, 0x0b, 
-0xc7, 0x1d, 0x6e, 0x8e, 0xe3, 0xc7, 0x8f, 0xab, 0xbf, 0xf0, 0xd9, 0xeb, 
-0x71, 0x7b, 0x39, 0x1f, 0xb7, 0xd9, 0x3e, 0x8e, 0x95, 0xc3, 0x71, 0xf4, 
-0xe8, 0x51, 0x46, 0xe5, 0x7f, 0x9f, 0x8e, 0x23, 0x47, 0x8e, 0xf8, 0x74, 
-0xbe, 0xdc, 0x25, 0xe8, 0x87, 0xed, 0x95, 0xbb, 0x8d, 0x77, 0xc8, 0xc9, 
-0xe5, 0xf1, 0x26, 0xa1, 0x1f, 0x86, 0xf5, 0x4a, 0x45, 0x3a, 0xd5, 0x99, 
-0x09, 0x53, 0x28, 0x56, 0xa8, 0x17, 0x32, 0x16, 0x7a, 0x16, 0xda, 0x36, 
-0x90, 0x3c, 0x28, 0x00, 0x0b, 0x20, 0xc2, 0x91, 0x92, 0x92, 0xc2, 0x9f, 
-0x41, 0x89, 0x7e, 0xfc, 0xf7, 0xc2, 0xf1, 0x9f, 0x0b, 0xc7, 0xbf, 0xff, 
-0xfd, 0xef, 0xef, 0xbf, 0xff, 0x1e, 0x66, 0xf2, 0xcd, 0x37, 0xdf, 0xfc, 
-0xf3, 0x9f, 0xff, 0xfc, 0xfa, 0xeb, 0xaf, 0xbf, 0xfa, 0xea, 0x2b, 0xf0, 
-0xc4, 0xf1, 0x77, 0xd3, 0xf1, 0xb7, 0xbf, 0xfd, 0x4d, 0x7d, 0xc7, 0x67, 
-0xcb, 0xe3, 0x4b, 0x1b, 0xc7, 0x5f, 0x6d, 0x1c, 0x5f, 0xd8, 0x38, 0x3e, 
-0xb7, 0x71, 0xfc, 0xc5, 0x74, 0xfc, 0xf9, 0xcf, 0x7f, 0xd6, 0xbf, 0xe3, 
-0x57, 0x3b, 0xc7, 0x9f, 0x4c, 0xc7, 0x1f, 0xff, 0xf8, 0x47, 0xf5, 0x1d, 
-0x9f, 0x2d, 0x8f, 0x3f, 0xfc, 0xe1, 0x0f, 0x86, 0xef, 0xcd, 0xdf, 0x58, 
-0x5e, 0x68, 0xbe, 0x9d, 0xf9, 0x1b, 0x3b, 0xd3, 0x36, 0x3f, 0xbe, 0x7c, 
-0xa3, 0x56, 0x4e, 0xff, 0xac, 0x2f, 0xa7, 0xbe, 0xfc, 0x7c, 0xef, 0xee, 
-0x6d, 0xa8, 0x37, 0xc9, 0x09, 0xee, 0xde, 0xaa, 0xa2, 0x08, 0x4e, 0xb0, 
-0xa4, 0x0e, 0x77, 0xb4, 0xa4, 0xbe, 0x37, 0x93, 0x22, 0xdf, 0x40, 0xa2, 
-0xd0, 0x2a, 0x07, 0x44, 0x0b, 0xe9, 0xfe, 0xeb, 0x5f, 0xff, 0x82, 0x8c, 
-0xbf, 0xfb, 0xee, 0x3b, 0xe8, 0x19, 0xaa, 0x86, 0xb6, 0x85, 0xce, 0x75, 
-0xca, 0x07, 0x0b, 0x20, 0xc2, 0x02, 0x15, 0x82, 0x07, 0x01, 0x03, 0x43, 
-0x08, 0x1e, 0x18, 0x97, 0x7b, 0x30, 0x09, 0x79, 0x30, 0x59, 0x1d, 0x77, 
-0xf4, 0xe4, 0xee, 0x65, 0x78, 0x78, 0x91, 0xee, 0x88, 0x86, 0xef, 0x85, 
-0x4a, 0xf8, 0xdf, 0xf2, 0xf8, 0xcc, 0xdb, 0xf1, 0x7f, 0xee, 0x8f, 0xdf, 
-0xff, 0xfe, 0xf7, 0xfc, 0x91, 0xff, 0x0d, 0xc7, 0xa7, 0x9f, 0x7e, 0xca, 
-0x37, 0xfc, 0xef, 0xe1, 0xf8, 0x9d, 0xc7, 0xe3, 0xb7, 0xa6, 0xe3, 0x37, 
-0xbf, 0xf9, 0x0d, 0xdf, 0xf1, 0x7f, 0xe0, 0x87, 0x79, 0x70, 0xf9, 0xc6, 
-0xf3, 0x94, 0x3c, 0x3f, 0x8e, 0xfc, 0xd5, 0xbc, 0x14, 0xb2, 0x3e, 0x96, 
-0x4b, 0xe8, 0x6d, 0xe1, 0x3f, 0xe3, 0x7d, 0x71, 0x8e, 0xbb, 0x17, 0xa7, 
-0xde, 0xac, 0x4f, 0x98, 0x77, 0x47, 0x5a, 0x90, 0xa2, 0xfa, 0x93, 0x22, 
-0x4b, 0xc1, 0xaa, 0x20, 0x4d, 0x40, 0x02, 0x19, 0x43, 0xcc, 0xc0, 0xc3, 
-0x80, 0x0d, 0x05, 0x0c, 0x6b, 0x54, 0xe8, 0x90, 0x30, 0xe3, 0x81, 0xfb, 
-0x41, 0xd9, 0x3c, 0x86, 0xac, 0x88, 0x2c, 0x96, 0x79, 0x29, 0xe5, 0x1b, 
-0xb5, 0xca, 0xe6, 0xf7, 0x61, 0xf9, 0xfe, 0xdc, 0xbd, 0x6c, 0xa1, 0x27, 
-0x77, 0x24, 0xf5, 0x6b, 0x37, 0xc7, 0xaf, 0x7e, 0xf5, 0x2b, 0xf9, 0x0b, 
-0x1f, 0xcc, 0xc7, 0xff, 0x9a, 0x8e, 0xff, 0x71, 0x73, 0xfc, 0xf2, 0x97, 
-0xbf, 0x94, 0xbf, 0xf0, 0xc1, 0x7c, 0xfc, 0xc2, 0xcd, 0xf1, 0x73, 0xd3, 
-0xf1, 0xb3, 0x9f, 0xfd, 0x4c, 0xbe, 0xe3, 0x83, 0xf9, 0xf8, 0xe9, 0x0f, 
-0x87, 0xe5, 0x5f, 0x0d, 0x5f, 0x9a, 0x07, 0xb7, 0x9c, 0x85, 0xcc, 0x96, 
-0x3f, 0x59, 0xce, 0x5c, 0x3d, 0x97, 0xe1, 0xb9, 0x65, 0x61, 0xf8, 0xd2, 
-0xbc, 0x44, 0x96, 0x2b, 0xa9, 0xd6, 0xd9, 0xf0, 0x1e, 0x04, 0xfc, 0x7c, 
-0xe9, 0x6e, 0x17, 0xb0, 0x7c, 0xdd, 0x42, 0x18, 0x3a, 0xc2, 0x85, 0x78, 
-0xf8, 0xd2, 0x1d, 0xaa, 0x2d, 0xc9, 0x4f, 0xc1, 0x58, 0xb6, 0x54, 0x00, 
-0x03, 0x42, 0x04, 0x1e, 0x0a, 0x1b, 0xc2, 0x37, 0x14, 0xd3, 0x10, 0x60, 
-0x58, 0xa0, 0x42, 0x41, 0x82, 0xb3, 0x85, 0x3f, 0x80, 0x30, 0xc6, 0x02, 
-0x0c, 0xcf, 0x3c, 0xf3, 0xcc, 0x8a, 0x15, 0x2b, 0x7a, 0xf4, 0xe8, 0x91, 
-0x9b, 0x9b, 0x1b, 0x1b, 0x1b, 0x1b, 0xba, 0x6a, 0x56, 0x74, 0xe6, 0x91, 
-0xb3, 0x02, 0x10, 0x6a, 0x76, 0x76, 0x36, 0x44, 0xbb, 0x7c, 0xf9, 0xf2, 
-0xc7, 0x1f, 0x7f, 0x1c, 0xa8, 0x80, 0x10, 0x88, 0x19, 0x06, 0x82, 0xd4, 
-0x83, 0x64, 0x05, 0x91, 0x0b, 0xd3, 0x10, 0x69, 0xca, 0x02, 0x15, 0x06, 
-0x48, 0x00, 0x29, 0x80, 0xc5, 0x10, 0xf7, 0xdd, 0x77, 0x5f, 0x9f, 0x3e, 
-0x7d, 0x22, 0x67, 0x29, 0xa3, 0x4f, 0x1a, 0xae, 0x2b, 0xd0, 0xbb, 0x77, 
-0x6f, 0xd4, 0x6b, 0x78, 0x0e, 0x62, 0x0e, 0x84, 0x0d, 0x79, 0x2b, 0x60, 
-0x28, 0x8e, 0x51, 0x86, 0x57, 0x18, 0x20, 0x01, 0x8b, 0x80, 0xe3, 0xc0, 
-0x7d, 0xe6, 0xce, 0x9d, 0xcb, 0x1a, 0x0d, 0x1c, 0x38, 0x30, 0x5c, 0x57, 
-0x2a, 0xfa, 0x5c, 0x91, 0xb6, 0x02, 0xb3, 0x67, 0xcf, 0x46, 0x3e, 0x44, 
-0x24, 0x83, 0x6f, 0xc0, 0x34, 0xd8, 0xfd, 0x85, 0x63, 0x08, 0x30, 0x30, 
-0x4f, 0x95, 0x6a, 0xdb, 0xa0, 0x42, 0xd4, 0x6b, 0xce, 0xe0, 0x3c, 0x20, 
-0x81, 0xbc, 0xd8, 0xaf, 0x5f, 0xbf, 0xac, 0xac, 0xac, 0x48, 0x5b, 0xb5, 
-0xe8, 0xf3, 0x86, 0xfd, 0x0a, 0xc0, 0x34, 0x3e, 0xf8, 0xe0, 0x03, 0x14, 
-0x1e, 0xf6, 0x7d, 0x14, 0x04, 0x38, 0x86, 0xe8, 0xdf, 0x40, 0x00, 0xd3, 
-0x6d, 0x72, 0x72, 0xb2, 0xcb, 0x06, 0x05, 0x3e, 0x40, 0x89, 0x98, 0x5f, 
-0xd1, 0x25, 0xe0, 0x2c, 0x9c, 0x5d, 0x54, 0x54, 0x34, 0x69, 0xd2, 0xa4, 
-0x32, 0x0b, 0x54, 0x30, 0xc8, 0x31, 0xe1, 0x88, 0x63, 0xe5, 0x27, 0x8e, 
-0x4d, 0xdf, 0x38, 0x36, 0xff, 0xdb, 0xb1, 0xe5, 0xbf, 0xe5, 0xf9, 0xf3, 
-0x1f, 0xc7, 0x16, 0x6e, 0x21, 0x3f, 0x7c, 0xe6, 0xc7, 0xb7, 0xdb, 0xc5, 
-0x6c, 0xf9, 0x6f, 0xcc, 0x96, 0xff, 0xc4, 0x6e, 0xf9, 0x0f, 0xff, 0xcb, 
-0x4f, 0xec, 0x56, 0x7e, 0xfe, 0x1d, 0x1b, 0xc0, 0x98, 0xbe, 0xce, 0xc1, 
-0xe3, 0xf9, 0xf2, 0x50, 0xea, 0xd1, 0x64, 0x92, 0x17, 0x9f, 0x51, 0x26, 
-0x1f, 0xd4, 0xdb, 0xf9, 0xb6, 0x7a, 0x61, 0x72, 0x6b, 0x08, 0x15, 0x72, 
-0x85, 0x68, 0x21, 0xdd, 0xb2, 0x47, 0xcf, 0x9e, 0x3d, 0x31, 0x5a, 0xa0, 
-0xd6, 0xa3, 0x88, 0x43, 0xf0, 0xd8, 0x6d, 0x21, 0x7e, 0x20, 0x60, 0x44, 
-0x85, 0x68, 0xd8, 0xc8, 0x4e, 0x88, 0x5c, 0xf3, 0xe6, 0xcd, 0x73, 0xf9, 
-0x32, 0x7e, 0x38, 0x12, 0x72, 0xf2, 0x1d, 0xb3, 0x1f, 0xad, 0xd8, 0x95, 
-0x12, 0x72, 0x09, 0x04, 0x15, 0x2e, 0x3a, 0x2b, 0x3b, 0x67, 0x9d, 0x0a, 
-0xab, 0x02, 0x95, 0x18, 0xd0, 0x5e, 0x8a, 0x0a, 0xa6, 0xad, 0x10, 0x52, 
-0xb1, 0xcb, 0x5e, 0x15, 0x96, 0xa5, 0x7c, 0xe6, 0x30, 0xfb, 0xd1, 0x78, 
-0xc8, 0x58, 0x3b, 0x2e, 0xbd, 0xf4, 0x52, 0x0c, 0x71, 0xa8, 0xe0, 0x10, 
-0xbc, 0x92, 0xa3, 0x2e, 0xa2, 0x02, 0x7e, 0xc1, 0x27, 0x78, 0x87, 0x30, 
-0x0a, 0x18, 0x0a, 0xea, 0xb5, 0x7e, 0x71, 0x52, 0x93, 0x5e, 0x8e, 0x9b, 
-0xbe, 0xa8, 0x8c, 0x77, 0x63, 0xd8, 0x4d, 0xcb, 0x67, 0xb1, 0x7c, 0x64, 
-0x41, 0xc1, 0x5e, 0x87, 0x32, 0xb8, 0x8d, 0x22, 0x21, 0xd8, 0xcb, 0x5b, 
-0x96, 0x66, 0x6e, 0xfa, 0xc2, 0x99, 0xdf, 0x4b, 0xa7, 0x6d, 0x9c, 0xe2, 
-0xb0, 0x0b, 0x14, 0x0c, 0xd8, 0x05, 0xc4, 0x0f, 0x04, 0xf0, 0x7f, 0xbb, 
-0x24, 0x28, 0x41, 0x85, 0xd2, 0x28, 0xc0, 0x4d, 0xdf, 0xbe, 0x7d, 0x1b, 
-0x34, 0x68, 0x20, 0x17, 0xbb, 0xb8, 0x44, 0xe5, 0x40, 0x82, 0xe7, 0x11, 
-0x8a, 0xf1, 0x47, 0x7c, 0x2a, 0xdf, 0xc5, 0xad, 0x64, 0x20, 0x85, 0xe5, 
-0xee, 0x50, 0x51, 0x0f, 0x75, 0xd3, 0x17, 0x3a, 0xc7, 0xe8, 0xde, 0xbd, 
-0x3b, 0x6e, 0x19, 0xd8, 0x85, 0x52, 0xbb, 0x89, 0x0d, 0xb9, 0x88, 0x0a, 
-0xf0, 0x21, 0x8c, 0x02, 0x23, 0xee, 0xd3, 0x4f, 0x3f, 0x5d, 0x46, 0x00, 
-0xab, 0x68, 0xc1, 0xc9, 0x72, 0x75, 0xa2, 0x12, 0x76, 0x45, 0x11, 0x4d, 
-0x24, 0x00, 0x1e, 0x92, 0xd6, 0x8e, 0xb3, 0x67, 0xcf, 0x62, 0x8f, 0x42, 
-0xbb, 0x80, 0xf8, 0x81, 0x00, 0x61, 0x54, 0x17, 0x51, 0x01, 0x3e, 0xc4, 
-0xf4, 0x84, 0xf8, 0xb4, 0x72, 0xe5, 0xca, 0xd2, 0x4b, 0xd0, 0x51, 0x42, 
-0x69, 0x99, 0xa2, 0xe0, 0x89, 0x82, 0xc7, 0xde, 0x0a, 0x68, 0xca, 0xf7, 
-0xa2, 0x45, 0x8b, 0x70, 0xc0, 0x2b, 0x2b, 0x2d, 0x32, 0x55, 0x29, 0x2a, 
-0xd0, 0xc1, 0xc1, 0x0a, 0xe2, 0x13, 0xba, 0x79, 0x29, 0x2a, 0x50, 0xde, 
-0x43, 0x09, 0x15, 0xf6, 0x56, 0x24, 0xfa, 0x44, 0xd1, 0x15, 0x80, 0xb0, 
-0x7f, 0x38, 0x3a, 0x77, 0xee, 0x8c, 0xfb, 0x42, 0x74, 0x6e, 0x4c, 0x4d, 
-0xa5, 0xa8, 0x80, 0x6b, 0x88, 0x9e, 0x4d, 0x8c, 0x53, 0x4e, 0x4e, 0x4e, 
-0x29, 0x2a, 0xb0, 0x6a, 0x45, 0x57, 0x30, 0xba, 0x02, 0xe1, 0xb7, 0x02, 
-0x10, 0xf6, 0x0f, 0x07, 0x21, 0x21, 0x98, 0x68, 0x11, 0xa2, 0x20, 0x7e, 
-0x74, 0x6e, 0x42, 0xe2, 0x2f, 0xf2, 0x0a, 0xf0, 0x81, 0x23, 0x03, 0x85, 
-0x03, 0x3e, 0x52, 0x26, 0xc6, 0x09, 0x73, 0x6f, 0xf8, 0xad, 0x48, 0xf4, 
-0x89, 0xa2, 0x2b, 0x00, 0x61, 0xff, 0x70, 0x40, 0xf0, 0x44, 0x66, 0x8a, 
-0x25, 0x0a, 0xc6, 0x50, 0x06, 0x15, 0xe2, 0xcf, 0x26, 0x3e, 0xa4, 0x8c, 
-0xaa, 0x1d, 0x5d, 0xbe, 0xe8, 0x0a, 0x84, 0xe5, 0x0a, 0xe0, 0x83, 0xd6, 
-0x8e, 0x4f, 0x3e, 0xf9, 0x04, 0xd5, 0x02, 0xe2, 0x87, 0x31, 0x44, 0x51, 
-0x11, 0xd5, 0x43, 0x22, 0x78, 0x05, 0x34, 0x54, 0x7c, 0xfc, 0xf1, 0xc7, 
-0xd6, 0xa8, 0x10, 0x97, 0x36, 0x3a, 0x47, 0x94, 0x57, 0x44, 0x85, 0xc6, 
-0x88, 0x58, 0x01, 0x8d, 0xd0, 0x3f, 0xfa, 0xe8, 0x23, 0xa2, 0xfe, 0x20, 
-0x7e, 0xc4, 0x25, 0x12, 0x7d, 0x4b, 0xf5, 0x8a, 0x28, 0x2a, 0x22, 0x82, 
-0x14, 0xc2, 0x52, 0x1c, 0xf2, 0xef, 0xa1, 0xec, 0xa3, 0x82, 0xb4, 0xa6, 
-0x28, 0xaf, 0x88, 0xc2, 0x23, 0x22, 0x56, 0x20, 0x8a, 0x8a, 0x88, 0x78, 
-0xcd, 0xfe, 0x6d, 0x99, 0x11, 0x7b, 0x55, 0x14, 0x15, 0x21, 0x87, 0x8a, 
-0xa4, 0x6d, 0xdf, 0xe5, 0xed, 0xf8, 0x47, 0xfe, 0xce, 0xcf, 0x5b, 0xee, 
-0xfc, 0xac, 0x5d, 0xc9, 0x6f, 0x46, 0x6e, 0x3c, 0x5d, 0x74, 0xed, 0xb1, 
-0x76, 0x57, 0xec, 0x6e, 0x3c, 0x73, 0x6b, 0xdb, 0xcb, 0x77, 0xf7, 0xbf, 
-0xe6, 0xe8, 0x98, 0xe2, 0x73, 0xfc, 0x35, 0xe4, 0x9e, 0xab, 0x0a, 0x4d, 
-0x58, 0x43, 0xc5, 0x87, 0x1f, 0x7e, 0x28, 0xd1, 0x50, 0xd6, 0x7a, 0x45, 
-0x54, 0x82, 0xaa, 0x94, 0xd7, 0x96, 0xbd, 0xfd, 0xeb, 0x56, 0x25, 0x9f, 
-0x8e, 0xdc, 0x74, 0xa6, 0xdf, 0xc2, 0xcd, 0x1d, 0x47, 0xce, 0x6a, 0xd4, 
-0xa6, 0x73, 0x66, 0xcd, 0xc6, 0xce, 0xcc, 0x3c, 0x67, 0x7a, 0x96, 0x33, 
-0xbd, 0x86, 0x33, 0xad, 0x46, 0x62, 0x52, 0x7a, 0x62, 0x52, 0x9a, 0xfe, 
-0xe3, 0x4c, 0xad, 0x96, 0xde, 0xb0, 0x43, 0xcf, 0x79, 0x1b, 0xda, 0xee, 
-0xfe, 0x2c, 0x67, 0xc7, 0x3f, 0x2b, 0x65, 0xda, 0xa1, 0x7d, 0x53, 0xaf, 
-0xbc, 0x82, 0x42, 0x54, 0x84, 0x7b, 0x10, 0x20, 0x15, 0x45, 0x45, 0x05, 
-0xbf, 0x69, 0xf6, 0xfb, 0xa1, 0xab, 0x8f, 0xd6, 0xef, 0x50, 0xe4, 0x88, 
-0x4b, 0x8a, 0x8b, 0x89, 0x4b, 0x75, 0x26, 0x55, 0x4f, 0x4d, 0xcd, 0xcd, 
-0xcc, 0xa8, 0x59, 0x3d, 0xb3, 0x65, 0x7e, 0xe3, 0x3e, 0xdd, 0xba, 0xf6, 
-0xec, 0x5c, 0xd8, 0xbf, 0x57, 0xcf, 0x99, 0xd3, 0xa6, 0x5e, 0x36, 0xe3, 
-0xd2, 0x39, 0xda, 0xcf, 0x88, 0x41, 0x83, 0xb2, 0x33, 0xd2, 0x12, 0x1c, 
-0x8e, 0xd8, 0xe4, 0x8c, 0x66, 0x43, 0x66, 0x8d, 0xdd, 0xf9, 0x74, 0x93, 
-0xdd, 0x5f, 0x56, 0xf0, 0xe4, 0x43, 0xfb, 0x76, 0x5e, 0x51, 0x81, 0x6f, 
-0x1b, 0x1b, 0x54, 0x14, 0x15, 0x15, 0xf6, 0x9a, 0xb3, 0x77, 0x7c, 0xdd, 
-0x66, 0xd7, 0xff, 0xf5, 0x59, 0xbc, 0x23, 0x31, 0xaf, 0x80, 0xb7, 0x93, 
-0x93, 0x99, 0xd1, 0xbd, 0xb0, 0x70, 0xce, 0xcc, 0x99, 0xc5, 0x5b, 0xb6, 
-0x3c, 0xfa, 0xc8, 0x23, 0xd4, 0xaa, 0x81, 0xa1, 0x4b, 0x45, 0x19, 0x55, 
-0xf5, 0x47, 0x2f, 0xfd, 0x22, 0xb5, 0x61, 0x5e, 0x7d, 0xf5, 0xd5, 0xe5, 
-0x4b, 0x97, 0xb6, 0x6d, 0xde, 0x3c, 0x35, 0x01, 0x74, 0xc4, 0xa5, 0x34, 
-0xea, 0x58, 0xb4, 0x62, 0x5f, 0xc1, 0x9e, 0xbf, 0x55, 0xd8, 0x53, 0x84, 
-0xf6, 0x8d, 0xa2, 0xa8, 0xa8, 0x3a, 0xef, 0xaf, 0xf1, 0xce, 0xcf, 0x47, 
-0x6f, 0x7f, 0xa2, 0xdd, 0xa5, 0x37, 0x26, 0x64, 0xd6, 0xe2, 0xbd, 0x34, 
-0xa8, 0x95, 0x37, 0x7d, 0xca, 0x94, 0xfb, 0xcf, 0x9c, 0x81, 0xd0, 0xa5, 
-0x18, 0x99, 0xd4, 0x2f, 0x92, 0x72, 0x72, 0x52, 0xf6, 0xcb, 0xb2, 0x74, 
-0x9f, 0x14, 0x05, 0xe3, 0x1c, 0xb2, 0xc9, 0x6e, 0x3d, 0x78, 0x70, 0xcc, 
-0x88, 0x61, 0xb5, 0xb3, 0x5c, 0xb9, 0x93, 0x69, 0xf9, 0x9d, 0x07, 0xaf, 
-0x39, 0xd9, 0x34, 0x8a, 0x0d, 0xaf, 0x56, 0x04, 0x9b, 0x7a, 0x45, 0x94, 
-0x57, 0x94, 0x37, 0x78, 0x90, 0x97, 0x7a, 0x2f, 0xda, 0xe6, 0xac, 0x56, 
-0x93, 0x37, 0xd2, 0xb8, 0x4e, 0xad, 0x15, 0x4b, 0x97, 0x3c, 0xf9, 0xc4, 
-0x13, 0x52, 0xa4, 0x48, 0xca, 0x78, 0xa9, 0x42, 0x77, 0x52, 0x28, 0x52, 
-0xaa, 0x44, 0x4a, 0xf1, 0x52, 0xf3, 0xc1, 0x9f, 0xa4, 0x94, 0x23, 0x57, 
-0x71, 0xf9, 0x13, 0x8f, 0x3f, 0x3e, 0x77, 0xd6, 0xac, 0xcc, 0x24, 0x17, 
-0xdf, 0xc8, 0xe9, 0x36, 0x7e, 0xc8, 0xe6, 0x87, 0x0a, 0xf6, 0x44, 0x65, 
-0x2a, 0xf7, 0xce, 0x7b, 0xaf, 0xa8, 0x50, 0x7a, 0x05, 0xa5, 0x72, 0xa2, 
-0xfe, 0x8a, 0xf2, 0xc0, 0x46, 0xe3, 0x92, 0xbf, 0x0c, 0xb8, 0xf1, 0xee, 
-0x8c, 0x26, 0x1d, 0x59, 0xde, 0x3a, 0x35, 0xaa, 0x6d, 0xde, 0xb8, 0x01, 
-0xf9, 0x07, 0x3c, 0x40, 0xcd, 0x90, 0x35, 0xc4, 0x2d, 0x05, 0xed, 0x88, 
-0xe7, 0x97, 0x7a, 0x8f, 0xfa, 0x41, 0x42, 0x98, 0xe5, 0xc1, 0x39, 0xaa, 
-0xf2, 0xaf, 0x14, 0x3b, 0x65, 0xb4, 0x87, 0x1f, 0x7e, 0x78, 0x58, 0xff, 
-0x7e, 0xdc, 0x25, 0x21, 0x35, 0xab, 0xd7, 0xac, 0xd5, 0x51, 0x81, 0xca, 
-0xed, 0xdb, 0xb4, 0x8f, 0x8a, 0xa8, 0xb6, 0x5d, 0x1e, 0x90, 0x80, 0x45, 
-0xf4, 0xba, 0x62, 0xb3, 0x33, 0x3d, 0x9b, 0x17, 0x31, 0x79, 0xdc, 0xd8, 
-0x97, 0x5e, 0x7a, 0x89, 0x75, 0x86, 0x3f, 0xc0, 0x1c, 0x04, 0x0f, 0x02, 
-0x06, 0x21, 0x7d, 0x29, 0x65, 0x67, 0x38, 0xc8, 0xaa, 0x37, 0x1c, 0x72, 
-0x02, 0x27, 0xeb, 0x85, 0x80, 0xe1, 0x1e, 0x52, 0x9f, 0xe5, 0x8e, 0xdb, 
-0x6e, 0x6b, 0xde, 0xb0, 0x3e, 0x8d, 0x17, 0x9c, 0x19, 0xb9, 0x7d, 0xae, 
-0xd8, 0x5c, 0x10, 0x55, 0xc4, 0xcd, 0x02, 0x55, 0x14, 0x15, 0xe5, 0x41, 
-0xeb, 0x76, 0xc6, 0x84, 0x45, 0x0c, 0xda, 0xf4, 0x40, 0x6a, 0xc3, 0xb6, 
-0xbc, 0x82, 0x7a, 0x79, 0x39, 0xbb, 0x76, 0xee, 0x44, 0x8d, 0x56, 0x85, 
-0xeb, 0x04, 0x0f, 0x86, 0x4a, 0xc0, 0x52, 0x07, 0x5e, 0x6a, 0x65, 0x7b, 
-0x3d, 0xcc, 0x45, 0xe3, 0x55, 0x11, 0x54, 0x6e, 0xb4, 0xee, 0xc6, 0x35, 
-0x75, 0xb3, 0x6b, 0x50, 0xfc, 0xb4, 0x70, 0xc4, 0xcc, 0xa8, 0xa6, 0x61, 
-0x7c, 0x5f, 0x26, 0x54, 0xb0, 0x55, 0xa1, 0xad, 0x95, 0xc6, 0x41, 0x45, 
-0x25, 0x28, 0x3b, 0x24, 0xee, 0xeb, 0x39, 0x28, 0xd6, 0xfd, 0x96, 0xee, 
-0x89, 0x4b, 0xcb, 0x8e, 0x77, 0x38, 0xc6, 0x8e, 0x18, 0xf1, 0xc6, 0xeb, 
-0xaf, 0x23, 0xa0, 0x4a, 0x26, 0x24, 0x9b, 0xba, 0xd4, 0x72, 0x34, 0x14, 
-0x00, 0x56, 0x30, 0x30, 0x34, 0x4e, 0x70, 0xf7, 0xab, 0x3a, 0x5f, 0x6a, 
-0xc8, 0xc3, 0x37, 0xc0, 0x18, 0x48, 0x63, 0x70, 0xa9, 0x86, 0xfa, 0xfe, 
-0xfb, 0xef, 0x8f, 0x1b, 0x35, 0x0a, 0x55, 0x23, 0x21, 0x3d, 0x7b, 0xd0, 
-0x9a, 0x3b, 0xa2, 0x02, 0x55, 0xe9, 0x4b, 0xb4, 0x42, 0x45, 0x19, 0x2f, 
-0x5e, 0x14, 0x15, 0xbe, 0x52, 0xbc, 0xd7, 0xf3, 0x91, 0x9a, 0xba, 0xcf, 
-0xb8, 0x96, 0x95, 0xaf, 0x9d, 0x5d, 0x63, 0xc7, 0xf6, 0xed, 0x58, 0x52, 
-0x95, 0xc8, 0xe4, 0x0e, 0x0f, 0x36, 0x91, 0x60, 0x79, 0x9a, 0xea, 0x37, 
-0x22, 0x62, 0x95, 0x60, 0x43, 0x12, 0xf1, 0x29, 0xe7, 0xbd, 0x71, 0xdd, 
-0xba, 0x2c, 0x57, 0x75, 0xaf, 0x84, 0x3e, 0x0b, 0x36, 0x35, 0xdd, 0xfb, 
-0x77, 0xaf, 0x93, 0x8f, 0x88, 0x13, 0xa2, 0xa8, 0xa8, 0xe0, 0xd7, 0x9c, 
-0xbf, 0xeb, 0x8b, 0x4e, 0xc3, 0x2e, 0x61, 0xd9, 0xbb, 0x15, 0x76, 0x7a, 
-0xe8, 0xc1, 0x07, 0x61, 0xcd, 0x98, 0x50, 0x21, 0x50, 0x58, 0x84, 0x59, 
-0x64, 0x32, 0x74, 0x15, 0xf1, 0x1b, 0x1b, 0x0a, 0x18, 0x7a, 0x17, 0x1e, 
-0x10, 0x88, 0xea, 0xc2, 0x16, 0x78, 0xee, 0xd1, 0x47, 0xdb, 0xb7, 0x68, 
-0xce, 0x94, 0xaa, 0xb5, 0xe8, 0x35, 0xd4, 0x65, 0x9e, 0x8a, 0x78, 0xb7, 
-0x86, 0x4d, 0x54, 0xf0, 0xe6, 0xa2, 0x36, 0xa8, 0x00, 0xf1, 0xe3, 0xb2, 
-0x35, 0xad, 0xbb, 0x27, 0xbd, 0x8e, 0x8b, 0xfe, 0xa6, 0x4e, 0x9a, 0xf8, 
-0xfa, 0x6b, 0xaf, 0x49, 0x9a, 0xbc, 0x54, 0x55, 0x51, 0x75, 0xe1, 0xdd, 
-0x35, 0xda, 0xf1, 0x1b, 0x12, 0xea, 0x42, 0x77, 0xd8, 0x40, 0xa0, 0xfa, 
-0xc9, 0xfb, 0xef, 0xe3, 0x20, 0x67, 0x62, 0xc9, 0xd5, 0xeb, 0x0c, 0xba, 
-0x21, 0xe2, 0xa5, 0xa9, 0x28, 0x2a, 0x02, 0xa4, 0x75, 0x9b, 0x97, 0xa3, 
-0x48, 0xf4, 0x5d, 0xb6, 0x37, 0x21, 0xb5, 0x3a, 0x8a, 0xc4, 0xaa, 0x15, 
-0xcb, 0x55, 0xb5, 0x46, 0x81, 0x84, 0xaa, 0xef, 0x6b, 0xd9, 0x78, 0x2a, 
-0x70, 0x3c, 0x18, 0x1a, 0xb8, 0xe9, 0xdd, 0xaa, 0xa4, 0x15, 0x09, 0xd3, 
-0x80, 0x6b, 0xed, 0x2a, 0x29, 0xa9, 0x9e, 0xec, 0x8c, 0x8d, 0x4d, 0xe8, 
-0x35, 0xe3, 0xda, 0x88, 0x56, 0xc1, 0xed, 0xa0, 0x82, 0xbd, 0x24, 0xca, 
-0x2b, 0x6c, 0x52, 0xbf, 0xe5, 0x69, 0x28, 0x12, 0x5d, 0xa7, 0x5f, 0xcd, 
-0x52, 0xe7, 0x56, 0xcf, 0xdc, 0xb3, 0x67, 0x37, 0x11, 0x19, 0xd8, 0x9a, 
-0x10, 0x5d, 0x44, 0x6a, 0x92, 0xca, 0xbe, 0x86, 0xb6, 0x3a, 0xc1, 0x45, 
-0x82, 0xbb, 0xce, 0x86, 0x4a, 0xa0, 0x12, 0xf3, 0x14, 0xba, 0xfe, 0xb3, 
-0xcf, 0x3c, 0xdd, 0xb1, 0x55, 0x4b, 0xa6, 0xda, 0xa1, 0xff, 0xe8, 0xc8, 
-0x55, 0x33, 0x6c, 0xda, 0xa0, 0xa2, 0xa8, 0xf0, 0x1b, 0x15, 0xf9, 0x3b, 
-0xbf, 0xe8, 0x38, 0xdc, 0xa5, 0x48, 0xb4, 0x6b, 0xd5, 0xea, 0xec, 0x83, 
-0x0f, 0x4a, 0x6f, 0x04, 0x03, 0x24, 0x2a, 0x80, 0x45, 0x98, 0x61, 0x26, 
-0x02, 0x95, 0x00, 0x43, 0x57, 0xc1, 0xa9, 0xf5, 0x82, 0x34, 0x15, 0x17, 
-0xe3, 0x48, 0xa8, 0x5e, 0x7b, 0xf0, 0xda, 0x53, 0x91, 0xe8, 0x05, 0xb7, 
-0x8f, 0x0a, 0x5e, 0x67, 0xd4, 0xb7, 0xed, 0x2b, 0x36, 0xd0, 0xad, 0xdb, 
-0xf5, 0x1d, 0xc1, 0xba, 0x8d, 0x1d, 0x39, 0x52, 0x14, 0x09, 0x29, 0xfe, 
-0x2e, 0x65, 0xae, 0xe1, 0x12, 0x15, 0xc9, 0x22, 0xdc, 0x59, 0xa8, 0xa4, 
-0x13, 0x83, 0x94, 0x9d, 0x57, 0x2a, 0x78, 0xc9, 0x8e, 0x1d, 0x19, 0x49, 
-0xce, 0xf8, 0x94, 0xea, 0x83, 0xd7, 0xdd, 0x13, 0x71, 0xd2, 0x94, 0x1b, 
-0x54, 0xd0, 0xa6, 0xf9, 0x62, 0xde, 0xb6, 0x58, 0x66, 0xe1, 0x15, 0x51, 
-0x54, 0xf8, 0x04, 0x89, 0x0b, 0x4e, 0xba, 0x07, 0x93, 0x73, 0x1b, 0xe3, 
-0x29, 0x5b, 0xbc, 0x70, 0xa1, 0x2a, 0x41, 0xa7, 0xb7, 0x96, 0x52, 0x3d, 
-0xd7, 0x82, 0x65, 0x6b, 0xf2, 0x4f, 0xee, 0xd2, 0x7b, 0x59, 0xc1, 0x34, 
-0x94, 0x34, 0x75, 0xf4, 0xf0, 0xe1, 0xcc, 0xc4, 0x78, 0xc2, 0x43, 0x06, 
-0xaf, 0x3b, 0xdd, 0x74, 0x6f, 0x24, 0x19, 0xa6, 0xbc, 0xa2, 0x82, 0x1a, 
-0x38, 0xa2, 0x57, 0x44, 0x51, 0x61, 0x1f, 0x15, 0x2e, 0x48, 0x6c, 0x78, 
-0x20, 0x25, 0x2f, 0x1f, 0x48, 0xac, 0x5e, 0xb5, 0x8a, 0xb0, 0x6f, 0x42, 
-0x2d, 0x44, 0x6a, 0x32, 0xeb, 0xd6, 0xfe, 0x91, 0x72, 0x70, 0xaf, 0x32, 
-0x77, 0xc7, 0x95, 0xd6, 0x87, 0xb7, 0x1f, 0x3d, 0x9a, 0x99, 0x10, 0x9b, 
-0x98, 0x9e, 0x3d, 0x64, 0xdd, 0xe9, 0x08, 0xb2, 0xd8, 0x6a, 0xa8, 0xa0, 
-0xef, 0x11, 0x3b, 0x9a, 0xf8, 0xb6, 0x4b, 0x79, 0x45, 0x14, 0x15, 0xf6, 
-0xc1, 0x20, 0x67, 0x36, 0x72, 0x41, 0xe2, 0xbe, 0xe4, 0xbc, 0x7c, 0xcc, 
-0x4d, 0xab, 0xaf, 0xb9, 0x86, 0x2c, 0x08, 0xd1, 0xad, 0x61, 0xb9, 0xe2, 
-0x91, 0xa8, 0x60, 0xdd, 0xda, 0x26, 0x7e, 0x0c, 0xc0, 0x50, 0x9e, 0xbe, 
-0x13, 0xb7, 0xdf, 0x9e, 0x91, 0x18, 0x87, 0xff, 0x7b, 0xc8, 0x4d, 0xf7, 
-0x44, 0x0a, 0x30, 0xa2, 0xbc, 0xc2, 0x57, 0xa2, 0xf7, 0x7c, 0x3e, 0x90, 
-0x18, 0xb8, 0xfe, 0x8c, 0x33, 0xa7, 0x51, 0x62, 0x6c, 0xcc, 0xea, 0x6b, 
-0xaf, 0xc5, 0xdc, 0xa4, 0xb8, 0x84, 0x32, 0x37, 0x55, 0x8a, 0x6e, 0x6d, 
-0x07, 0x1b, 0xba, 0x43, 0x43, 0xfa, 0xa9, 0x4b, 0x78, 0xc8, 0x89, 0xe3, 
-0xb7, 0x57, 0x4b, 0x4e, 0x8a, 0x4b, 0xcd, 0xba, 0xc0, 0x31, 0x22, 0x20, 
-0x04, 0x3d, 0x8a, 0x8a, 0x20, 0xa2, 0x02, 0xc1, 0x49, 0x20, 0xe1, 0x04, 
-0x12, 0xd7, 0x5c, 0x23, 0x90, 0x90, 0xd0, 0x26, 0x03, 0x24, 0xec, 0xd0, 
-0x68, 0x65, 0x9d, 0x23, 0x4c, 0x43, 0x3a, 0x21, 0x0a, 0x30, 0x70, 0xbd, 
-0xdf, 0x7e, 0xec, 0x58, 0x46, 0x6a, 0x4a, 0x42, 0xf5, 0xba, 0xc3, 0xb6, 
-0x3d, 0x1e, 0xc4, 0x15, 0xab, 0xa2, 0x43, 0xd9, 0x44, 0x05, 0xc6, 0x44, 
-0xde, 0x71, 0xd4, 0x06, 0xe5, 0xf9, 0x2d, 0x0e, 0x5a, 0x7f, 0x26, 0x39, 
-0xa7, 0x21, 0xf1, 0x76, 0xc2, 0x25, 0x54, 0xdf, 0x83, 0x10, 0x82, 0x84, 
-0x40, 0xd1, 0xd0, 0x4b, 0x5a, 0x38, 0xc6, 0xce, 0xed, 0xdb, 0x9d, 0x09, 
-0xf1, 0x29, 0xb5, 0x9a, 0x35, 0xdb, 0x17, 0xee, 0xe1, 0x52, 0x36, 0xf5, 
-0x8a, 0x28, 0x2a, 0xbc, 0xee, 0x6a, 0xf8, 0x25, 0x92, 0x72, 0x1a, 0xa2, 
-0x4b, 0x5c, 0x7f, 0xed, 0xb5, 0xd2, 0x97, 0x36, 0xe4, 0xb8, 0x84, 0xd9, 
-0x05, 0x2e, 0x1c, 0x43, 0x74, 0x0c, 0x1e, 0xe7, 0xc6, 0xd5, 0xab, 0x49, 
-0xcc, 0x28, 0xec, 0x3f, 0x36, 0xcc, 0x1d, 0x7c, 0x51, 0x54, 0x78, 0x25, 
-0x77, 0x3b, 0x27, 0x10, 0xd0, 0xd1, 0xbe, 0xff, 0x58, 0x2c, 0x4e, 0x37, 
-0xac, 0xbe, 0x8e, 0x4a, 0x03, 0x66, 0xd7, 0xb5, 0xe8, 0x12, 0x95, 0x25, 
-0x14, 0xf9, 0x77, 0x5f, 0x5d, 0x94, 0x02, 0x18, 0xc8, 0x81, 0xd8, 0x0c, 
-0x16, 0x2e, 0x58, 0xe0, 0x0a, 0x6d, 0x1c, 0x3d, 0x2b, 0x9c, 0x81, 0x11, 
-0x45, 0x85, 0x1d, 0xa2, 0xf7, 0x7c, 0x0e, 0xea, 0x44, 0x97, 0x49, 0x57, 
-0xb1, 0x92, 0xf3, 0x67, 0xcf, 0x96, 0x8a, 0x5a, 0x12, 0xf3, 0xa7, 0x2c, 
-0x4e, 0xa1, 0x08, 0x09, 0x5d, 0x94, 0x52, 0xdd, 0xd6, 0x79, 0xa8, 0xdf, 
-0xfc, 0xfa, 0xd7, 0x93, 0xc6, 0x8f, 0xe7, 0x61, 0x7b, 0xcd, 0x58, 0x15, 
-0xb6, 0x26, 0x29, 0x3b, 0xa8, 0x40, 0xd9, 0x0a, 0x03, 0x09, 0xaa, 0xc6, 
-0xf6, 0xaf, 0x5a, 0x95, 0xfc, 0x8e, 0x0a, 0x4b, 0x9d, 0xa7, 0x2e, 0xaf, 
-0x53, 0x38, 0xb8, 0x76, 0xe1, 0x90, 0x4e, 0x13, 0xae, 0x1c, 0x7a, 0xc3, 
-0xed, 0xd0, 0x74, 0x80, 0xc0, 0xe8, 0xb3, 0x64, 0x8f, 0x8b, 0x4a, 0xba, 
-0x75, 0x7d, 0xf7, 0x9d, 0x77, 0xc5, 0x7b, 0x2d, 0x31, 0x7f, 0x12, 0xe0, 
-0x54, 0x65, 0x2d, 0x4e, 0x76, 0x18, 0x88, 0x21, 0x2a, 0x44, 0x14, 0x0c, 
-0x8a, 0xd7, 0xf7, 0xbb, 0xd0, 0x0b, 0xae, 0xef, 0x15, 0xb7, 0x84, 0x67, 
-0xa5, 0xa9, 0x48, 0x40, 0x85, 0xcb, 0x81, 0xb0, 0x72, 0x6f, 0x9d, 0xd6, 
-0xbc, 0xc8, 0xb8, 0xf8, 0x18, 0x47, 0xb5, 0x94, 0xe4, 0x5a, 0xd9, 0x35, 
-0xf8, 0xa9, 0x9e, 0x96, 0x8a, 0xcc, 0x13, 0x9f, 0x5a, 0xbd, 0xcf, 0xb2, 
-0x3d, 0x7e, 0x63, 0x03, 0xd9, 0x29, 0x3e, 0x23, 0xb7, 0x56, 0x4e, 0xce, 
-0x7d, 0x67, 0xce, 0x10, 0x6c, 0x2f, 0x01, 0x1d, 0xe2, 0xaa, 0x13, 0xbf, 
-0x84, 0x10, 0x96, 0x1d, 0x12, 0xac, 0x9a, 0xe7, 0x18, 0x34, 0x6f, 0x49, 
-0x57, 0x7a, 0xed, 0xd5, 0x57, 0xdb, 0x36, 0x6f, 0x06, 0xf1, 0x0c, 0x5c, 
-0x73, 0x47, 0x80, 0x7b, 0x4a, 0x55, 0xbc, 0x3c, 0xec, 0x51, 0x01, 0xb9, 
-0x77, 0x9f, 0x75, 0x43, 0x8c, 0x23, 0xa6, 0x6e, 0x4e, 0xd6, 0xb0, 0x41, 
-0x83, 0xae, 0x5d, 0xb5, 0xea, 0xf0, 0xa1, 0x43, 0x8f, 0x3f, 0xf6, 0xd8, 
-0x63, 0xe7, 0xce, 0x9d, 0x38, 0x7e, 0x9c, 0x58, 0x8c, 0x3a, 0x79, 0x79, 
-0x14, 0xe7, 0x2b, 0xba, 0xfa, 0x90, 0x1f, 0xaf, 0x87, 0xc1, 0xdb, 0xf5, 
-0x1b, 0x95, 0x10, 0x1f, 0xbf, 0x71, 0xfd, 0x7a, 0xd5, 0x3d, 0x8d, 0x0d, 
-0x55, 0x20, 0x11, 0xd2, 0x5c, 0xc2, 0xa0, 0x79, 0x4b, 0x1c, 0xa1, 0xc4, 
-0x4a, 0x49, 0xef, 0xab, 0x47, 0x1e, 0x7e, 0x38, 0x2f, 0x3b, 0xdb, 0x99, 
-0xd7, 0x24, 0x0c, 0x3d, 0x18, 0x26, 0x54, 0xb0, 0xdf, 0x19, 0x7d, 0xdb, 
-0xa1, 0x2c, 0x41, 0x9d, 0xef, 0xb3, 0xb8, 0xc4, 0x11, 0x97, 0xd0, 0xb1, 
-0x6d, 0x9b, 0x87, 0xce, 0x9e, 0xc5, 0x75, 0x8f, 0xc1, 0x94, 0x27, 0x44, 
-0xce, 0xe1, 0xc0, 0x8d, 0x8f, 0xb1, 0xe8, 0xae, 0x93, 0x27, 0x6b, 0x54, 
-0xaf, 0x16, 0xeb, 0x4c, 0x27, 0x92, 0xcf, 0x27, 0x60, 0xc0, 0x82, 0xba, 
-0x4d, 0x5d, 0xce, 0x02, 0x4e, 0x99, 0x38, 0x11, 0x75, 0x42, 0x8c, 0x4e, 
-0x92, 0x62, 0x0a, 0xf5, 0x84, 0x01, 0x97, 0xb0, 0xcc, 0xca, 0x10, 0x93, 
-0x94, 0x94, 0xd2, 0xb9, 0x74, 0xea, 0x54, 0x1e, 0x7f, 0xcc, 0x2d, 0x0f, 
-0xf8, 0xb4, 0x6e, 0x21, 0x70, 0xb2, 0x4d, 0x54, 0xf0, 0xca, 0x21, 0xa0, 
-0x90, 0xf3, 0x57, 0x60, 0x2d, 0x4d, 0xc9, 0x69, 0x50, 0xb3, 0x5a, 0x3a, 
-0x65, 0xc2, 0x28, 0x41, 0x29, 0xe9, 0xa0, 0xec, 0x73, 0xe0, 0x5c, 0x2a, 
-0x88, 0xa1, 0x2f, 0xf1, 0x25, 0x1e, 0x37, 0x2c, 0xaa, 0x5d, 0xa7, 0x2e, 
-0x41, 0x1c, 0xb2, 0xff, 0xce, 0xa8, 0x04, 0x1e, 0x9f, 0x9c, 0xd1, 0x3c, 
-0xbf, 0xd1, 0x9b, 0x6f, 0xbe, 0x29, 0x7b, 0x09, 0x56, 0x1a, 0x05, 0x89, 
-0xd0, 0xd5, 0xb0, 0x3d, 0x94, 0x47, 0x10, 0xef, 0x1e, 0x9c, 0x50, 0x5c, 
-0x7b, 0x6c, 0x28, 0xd5, 0xd3, 0xd3, 0x0a, 0x8a, 0xa6, 0xe4, 0xee, 0x0c, 
-0xaf, 0xd6, 0xa1, 0xf6, 0x51, 0x11, 0x82, 0x5e, 0xbc, 0xf3, 0xc3, 0xae, 
-0xde, 0xcb, 0x03, 0xae, 0xb9, 0xee, 0x3a, 0xf6, 0x72, 0x3d, 0x43, 0x9a, 
-0x97, 0x8a, 0x18, 0x20, 0x79, 0x36, 0xe0, 0xe4, 0x17, 0xbf, 0xfc, 0x65, 
-0xbb, 0x16, 0x2d, 0x62, 0xe3, 0x93, 0x46, 0x17, 0x3f, 0x6a, 0x13, 0x15, 
-0xe0, 0x27, 0xbd, 0x5e, 0x6b, 0xb0, 0x44, 0x1d, 0x5e, 0xf6, 0x0b, 0xd0, 
-0x25, 0xea, 0x84, 0xae, 0x61, 0x57, 0x4d, 0x3d, 0x21, 0x90, 0x59, 0x29, 
-0x39, 0x4a, 0x0c, 0xb5, 0xb0, 0x8b, 0xae, 0x1d, 0xda, 0xc7, 0x26, 0xa6, 
-0x76, 0xd8, 0x1f, 0xa8, 0xc5, 0xc2, 0xe6, 0xb2, 0x57, 0xd0, 0x69, 0x61, 
-0x8d, 0x8a, 0xff, 0xf6, 0x9a, 0x7c, 0x45, 0x7a, 0x8c, 0xe3, 0x47, 0xcf, 
-0x3d, 0xa7, 0x9a, 0xc3, 0x82, 0x07, 0x31, 0x98, 0x4a, 0x69, 0x3d, 0xd1, 
-0x1d, 0x71, 0x2f, 0x6c, 0xda, 0xb0, 0x3e, 0x29, 0xd1, 0xd9, 0xeb, 0xf2, 
-0x4d, 0x76, 0xd6, 0xdd, 0xa5, 0xab, 0xcc, 0x5c, 0xcd, 0xd2, 0x5d, 0x31, 
-0x7f, 0x3e, 0xb9, 0xa6, 0xe2, 0x9d, 0x30, 0xa8, 0x13, 0x81, 0x10, 0x5f, 
-0x95, 0xbd, 0x56, 0x69, 0xde, 0x12, 0x70, 0xce, 0x9e, 0xb2, 0x7e, 0xed, 
-0x8d, 0x49, 0xce, 0xa4, 0x81, 0xab, 0x0e, 0xdb, 0x59, 0xb7, 0x90, 0x39, 
-0xc7, 0x0a, 0x15, 0x6c, 0x01, 0x65, 0x62, 0x66, 0xa1, 0x9b, 0x10, 0x95, 
-0xa0, 0x5a, 0xf7, 0x18, 0xdc, 0xa5, 0x6d, 0xab, 0x77, 0xdf, 0x79, 0xc7, 
-0xe0, 0x43, 0x50, 0x75, 0xf5, 0x24, 0x97, 0x00, 0x76, 0xf1, 0xf4, 0x53, 
-0x4f, 0xa5, 0x27, 0x27, 0x35, 0xec, 0x39, 0x36, 0xa3, 0xf8, 0x5f, 0x5e, 
-0x5f, 0x5e, 0xd1, 0x35, 0xc7, 0x28, 0x15, 0xd3, 0xae, 0x75, 0x4b, 0x4c, 
-0x31, 0x12, 0x63, 0x8c, 0x9c, 0xad, 0xab, 0x13, 0x55, 0x96, 0xac, 0x03, 
-0x9f, 0x98, 0x00, 0x43, 0xd4, 0x6e, 0x96, 0x6e, 0xdf, 0xee, 0xdd, 0x89, 
-0x09, 0x89, 0x79, 0x7d, 0xa6, 0x37, 0xdb, 0xf7, 0x0f, 0xaf, 0xeb, 0x16, 
-0x32, 0x27, 0xd8, 0xe7, 0x15, 0x95, 0xa8, 0x57, 0xb0, 0x37, 0x0f, 0xbf, 
-0xe1, 0xb6, 0x3e, 0xf3, 0xd7, 0xb7, 0x1c, 0x38, 0x35, 0xaf, 0xe3, 0x90, 
-0xf4, 0x96, 0xfd, 0x72, 0xdb, 0x0f, 0x6c, 0x33, 0x62, 0xee, 0x80, 0x15, 
-0x7b, 0x47, 0x6f, 0x39, 0xeb, 0xc1, 0xa8, 0xda, 0xa0, 0x75, 0xd7, 0xbe, 
-0x5d, 0x3a, 0x11, 0x22, 0x2f, 0x5d, 0xc4, 0xe1, 0x0c, 0xaa, 0x6e, 0x80, 
-0xca, 0xcc, 0x64, 0x8f, 0x67, 0xa7, 0x87, 0x99, 0xe4, 0x66, 0xa6, 0xa7, 
-0xd6, 0x6c, 0xe2, 0x55, 0xe7, 0xe6, 0x76, 0x49, 0x75, 0x9a, 0x3b, 0x63, 
-0x1d, 0xb7, 0x1d, 0x3b, 0x26, 0xa6, 0x58, 0xb3, 0x77, 0x22, 0x70, 0xe2, 
-0xab, 0xb2, 0x23, 0xe8, 0x0e, 0x6f, 0xf6, 0x94, 0xdb, 0x6f, 0xbb, 0xad, 
-0xa0, 0x41, 0x03, 0x97, 0xef, 0x62, 0xfe, 0x3a, 0xc7, 0x96, 0xf3, 0x21, 
-0x43, 0xf7, 0x9e, 0xcb, 0x92, 0x57, 0x71, 0x54, 0x34, 0xdc, 0xfe, 0xa7, 
-0xa2, 0x1b, 0x4e, 0x12, 0x91, 0xc6, 0x3c, 0xe3, 0x1c, 0x8e, 0xba, 0x59, 
-0x19, 0x0d, 0x72, 0xaa, 0xd7, 0xcf, 0xae, 0xde, 0x28, 0xb7, 0x46, 0xb5, 
-0x24, 0xe7, 0x85, 0xc9, 0x27, 0x64, 0x36, 0xed, 0xda, 0x7f, 0xed, 0xa9, 
-0xc6, 0x25, 0x16, 0x8a, 0x72, 0x56, 0x41, 0x97, 0xb6, 0x4d, 0x1a, 0x52, 
-0x24, 0x4f, 0xdc, 0x08, 0x22, 0xe4, 0x88, 0x81, 0x48, 0x0e, 0xb1, 0xa8, 
-0x20, 0x09, 0x20, 0x05, 0x15, 0xf5, 0xec, 0xee, 0xcc, 0xc8, 0x69, 0xb7, 
-0xeb, 0x53, 0xcf, 0xaf, 0xb6, 0xfb, 0xec, 0x35, 0xdc, 0x75, 0xee, 0x65, 
-0x97, 0xa1, 0xbe, 0x0b, 0xd8, 0x0c, 0xde, 0x89, 0x2a, 0x4b, 0xd0, 0xc1, 
-0x9a, 0x98, 0xc1, 0x4a, 0x4b, 0xed, 0xf4, 0xcc, 0x78, 0x47, 0x66, 0xb3, 
-0x1e, 0xe1, 0xc3, 0x2e, 0xaa, 0x38, 0x2a, 0xfa, 0x5c, 0x7d, 0x30, 0x3e, 
-0x2d, 0x2b, 0x39, 0x3e, 0x6e, 0xc1, 0x9c, 0xcb, 0xee, 0xb8, 0xe3, 0x8e, 
-0x47, 0x1f, 0x7d, 0x14, 0x57, 0x03, 0xaf, 0x81, 0x9f, 0xfb, 0xef, 0xbf, 
-0x7f, 0xdb, 0x2d, 0xb7, 0x4c, 0x1c, 0x3d, 0x92, 0x78, 0xb5, 0xe4, 0xea, 
-0xb5, 0x8b, 0xae, 0x3b, 0x66, 0x6e, 0x06, 0x97, 0xd7, 0x69, 0x48, 0xad, 
-0x8c, 0xe4, 0xb7, 0xde, 0x7a, 0x4b, 0x95, 0x5d, 0x52, 0xda, 0xb0, 0x94, 
-0x61, 0x15, 0x49, 0x00, 0xc0, 0x40, 0xdf, 0x37, 0x5c, 0x77, 0x6d, 0x7c, 
-0x6c, 0xfc, 0x10, 0x14, 0x74, 0xf7, 0x1b, 0x49, 0xa3, 0x1d, 0x7f, 0x8e, 
-0xab, 0x56, 0xa7, 0x49, 0xa3, 0x86, 0x2f, 0x3c, 0xff, 0x3c, 0x8c, 0x02, 
-0x26, 0xa3, 0xf3, 0x9f, 0xf0, 0xb3, 0x3b, 0x79, 0x4e, 0xf5, 0x16, 0xed, 
-0x02, 0xe9, 0x7a, 0x68, 0xbf, 0xde, 0xce, 0xac, 0x7a, 0x93, 0x0f, 0xbc, 
-0x1c, 0x7e, 0xbc, 0xe2, 0x27, 0x3f, 0xf9, 0x09, 0xaa, 0xa3, 0xb5, 0xbf, 
-0xa2, 0x52, 0xf4, 0x0a, 0x48, 0x30, 0xb9, 0x5e, 0x2b, 0x6c, 0x7f, 0xc5, 
-0x5b, 0xb7, 0xfe, 0xec, 0x67, 0x3f, 0xc3, 0x8e, 0x24, 0x4d, 0x7d, 0xc4, 
-0xd5, 0xc0, 0x67, 0x76, 0x6b, 0xa2, 0x0f, 0x6e, 0xb9, 0x79, 0x53, 0x7a, 
-0x7c, 0x4c, 0xbc, 0x33, 0xad, 0xef, 0xd2, 0xbd, 0x65, 0x2b, 0x6c, 0x9f, 
-0x6f, 0x3f, 0x6e, 0x21, 0xb0, 0x7f, 0xe5, 0xe5, 0x97, 0xcd, 0xe1, 0xab, 
-0x82, 0x0a, 0xb1, 0x33, 0x8a, 0xf5, 0xfd, 0xa9, 0x27, 0x9f, 0xe4, 0xe4, 
-0xa6, 0xfd, 0x26, 0x64, 0xbb, 0xef, 0x25, 0x37, 0x62, 0xf3, 0x59, 0xce, 
-0x19, 0x3d, 0x62, 0x84, 0x54, 0x4a, 0x8e, 0x04, 0xbb, 0x93, 0x3b, 0x60, 
-0x28, 0xa7, 0x1e, 0xda, 0xc5, 0xfa, 0x35, 0xd7, 0xb3, 0x2c, 0x83, 0xaf, 
-0x3f, 0x5e, 0x6d, 0xc7, 0xb7, 0xe1, 0x00, 0x0c, 0x3b, 0xbc, 0x02, 0x92, 
-0xaa, 0x14, 0x54, 0x8c, 0x58, 0x7f, 0x8f, 0x90, 0x20, 0xa4, 0x4f, 0xcf, 
-0x2b, 0x31, 0xad, 0x4a, 0x83, 0x1f, 0x69, 0xe7, 0xc3, 0xac, 0x00, 0x09, 
-0x7f, 0x22, 0x8b, 0xb2, 0x76, 0x76, 0x96, 0x23, 0x3e, 0x79, 0xc0, 0xb5, 
-0xc7, 0xb4, 0x58, 0xce, 0xf3, 0xfd, 0xaf, 0x2a, 0x66, 0x84, 0x53, 0x77, 
-0xdd, 0x29, 0x4a, 0x05, 0xc2, 0x92, 0x88, 0x4f, 0x02, 0x09, 0x95, 0x5b, 
-0xc3, 0x9f, 0x18, 0xf0, 0xe3, 0x8f, 0x3e, 0x6a, 0x54, 0x33, 0x27, 0xb5, 
-0x6e, 0x2b, 0x1a, 0x70, 0x59, 0xbe, 0xda, 0xf4, 0x6d, 0xdf, 0x74, 0x9d, 
-0xb1, 0x3a, 0x39, 0x21, 0x61, 0xc3, 0x4d, 0x37, 0xa1, 0x87, 0x30, 0x19, 
-0x29, 0xd5, 0xa1, 0x7c, 0x76, 0xc1, 0x12, 0x51, 0xaa, 0xfe, 0x38, 0xba, 
-0x76, 0x81, 0x5c, 0xfa, 0xe4, 0xe3, 0x8f, 0xb3, 0xce, 0x2d, 0xc6, 0x2e, 
-0x69, 0xba, 0x37, 0x2c, 0x74, 0x6e, 0x3b, 0x36, 0xa8, 0xca, 0x42, 0x45, 
-0xcf, 0x59, 0xd7, 0xa7, 0x27, 0x25, 0x6d, 0xdf, 0xb6, 0x8d, 0x0a, 0x45, 
-0x52, 0x46, 0x89, 0x99, 0xb0, 0x3d, 0x4b, 0x23, 0x1f, 0x3e, 0x48, 0x23, 
-0x1f, 0xf6, 0x6c, 0xfe, 0x7a, 0xfa, 0xd4, 0xa9, 0x9c, 0x6a, 0x99, 0x8e, 
-0xc4, 0xf4, 0xa1, 0x1b, 0xce, 0x34, 0x3f, 0xf0, 0xb5, 0x90, 0xf5, 0xd8, 
-0x0d, 0xa7, 0x78, 0xc0, 0x4d, 0x37, 0xad, 0xd5, 0x2b, 0x6b, 0x28, 0xaf, 
-0xb3, 0xc8, 0xc7, 0xc8, 0x54, 0xbc, 0x57, 0x86, 0x02, 0x5d, 0xd3, 0x27, 
-0x8e, 0xc7, 0xc9, 0x3d, 0x7a, 0xf3, 0x7d, 0x96, 0xa8, 0x80, 0x77, 0xd5, 
-0x6c, 0xd5, 0xa3, 0x66, 0x76, 0x8d, 0x67, 0x9e, 0x7e, 0x5a, 0x58, 0xaa, 
-0x28, 0x2a, 0x02, 0xb3, 0xaa, 0x4f, 0xca, 0xc1, 0x9d, 0xa1, 0xee, 0xbb, 
-0xa0, 0x20, 0x67, 0xdd, 0xcc, 0x94, 0xcc, 0x96, 0x45, 0x1d, 0xf7, 0xff, 
-0x29, 0x5c, 0x79, 0x85, 0xd1, 0x32, 0x2b, 0xca, 0x28, 0xe2, 0x4a, 0x05, 
-0xfb, 0xb6, 0x5b, 0x14, 0x8d, 0xcf, 0xad, 0x56, 0x8d, 0x12, 0xc5, 0x22, 
-0xae, 0xa8, 0x1a, 0x19, 0xe2, 0x6a, 0x90, 0xa2, 0xf3, 0x20, 0x04, 0x3e, 
-0x20, 0x7c, 0xe3, 0xe4, 0x1d, 0x77, 0x54, 0xcb, 0x48, 0x8f, 0x4b, 0xcb, 
-0x19, 0xb5, 0xfd, 0xa9, 0x96, 0x87, 0x5c, 0xde, 0xd6, 0x19, 0xb7, 0xbf, 
-0x93, 0x54, 0xa3, 0x7e, 0xbf, 0x6e, 0x5d, 0xd8, 0xd7, 0xcd, 0xb1, 0x18, 
-0x3a, 0x2a, 0x18, 0x04, 0xc1, 0xac, 0xa4, 0x78, 0x1b, 0xcf, 0x38, 0x60, 
-0x69, 0x89, 0xa5, 0x39, 0xa5, 0xf5, 0xf6, 0x5f, 0xc5, 0x25, 0xa6, 0x76, 
-0x6e, 0xdf, 0x0e, 0x94, 0x72, 0x32, 0xcb, 0x22, 0x6e, 0xbb, 0x08, 0x51, 
-0x27, 0xcc, 0xa0, 0x92, 0xca, 0x9c, 0xbc, 0x0e, 0x56, 0x63, 0xf4, 0xe0, 
-0x01, 0x31, 0xe9, 0x35, 0x27, 0xed, 0x7f, 0x31, 0xcc, 0x50, 0xa1, 0xf4, 
-0x8a, 0xaa, 0x82, 0x8a, 0xec, 0x26, 0x9d, 0x6a, 0xe7, 0x64, 0xd3, 0xfe, 
-0x47, 0x59, 0x7b, 0x54, 0x21, 0x7b, 0xe9, 0xfd, 0xa3, 0x3c, 0x71, 0xb0, 
-0x0e, 0x68, 0x94, 0xcd, 0x9b, 0xc8, 0xbf, 0x14, 0xbc, 0x4a, 0xd9, 0x0d, 
-0xc6, 0xec, 0x7b, 0x09, 0xca, 0x6e, 0x75, 0xeb, 0xb7, 0xd9, 0xed, 0x07, 
-0xa7, 0xc6, 0x38, 0x7e, 0xf9, 0x8b, 0x5f, 0x18, 0xb2, 0x1d, 0x54, 0x8c, 
-0x34, 0xf2, 0x0f, 0xc4, 0x2d, 0x7d, 0x80, 0x88, 0x7b, 0x05, 0x15, 0x9d, 
-0xa7, 0x5f, 0x63, 0x89, 0x8a, 0x61, 0xd7, 0xdf, 0x96, 0x98, 0x98, 0x74, 
-0xf9, 0xbc, 0xb9, 0x34, 0x32, 0x05, 0xa5, 0x00, 0x49, 0x44, 0xb2, 0x88, 
-0x45, 0x85, 0x6c, 0x2b, 0x12, 0x00, 0xb2, 0xe1, 0xa6, 0xb5, 0x2c, 0xdd, 
-0xf0, 0x75, 0xa7, 0xa2, 0xa8, 0x70, 0xdf, 0x6f, 0xcf, 0x6b, 0x9b, 0x4a, 
-0x1b, 0x27, 0x64, 0x17, 0x14, 0xd6, 0xce, 0xce, 0x7e, 0xf9, 0xa5, 0x97, 
-0x70, 0x95, 0x88, 0x5b, 0x40, 0x12, 0xa0, 0x95, 0x5d, 0x55, 0xb2, 0x61, 
-0x54, 0xb3, 0x12, 0x91, 0xac, 0xf0, 0x2b, 0x61, 0xc3, 0x4d, 0xaf, 0x55, 
-0x30, 0xee, 0xd0, 0x6b, 0x10, 0x77, 0xc3, 0x49, 0xab, 0xe3, 0x1c, 0x31, 
-0xc7, 0x8f, 0x1d, 0x95, 0x5a, 0x7d, 0x7a, 0x28, 0xab, 0x2e, 0x03, 0x70, 
-0x21, 0x12, 0x1a, 0xa2, 0x11, 0x41, 0x1c, 0xf5, 0xfb, 0x4d, 0x4d, 0x2d, 
-0xfe, 0xce, 0xfc, 0x76, 0x7b, 0x5d, 0x76, 0x43, 0x72, 0x42, 0xe2, 0xf6, 
-0xe2, 0x62, 0xa2, 0x0c, 0x81, 0x10, 0xa8, 0x10, 0xa5, 0x22, 0x92, 0x51, 
-0xc1, 0xb3, 0xb3, 0xaa, 0x2e, 0xc7, 0xc5, 0x31, 0x3c, 0x9b, 0x8e, 0x5e, 
-0x4b, 0xf7, 0xa6, 0x16, 0x7f, 0x1f, 0xf2, 0xc0, 0xd0, 0x84, 0xa2, 0x2a, 
-0xc7, 0x2b, 0x5a, 0x0d, 0x9c, 0x96, 0x9d, 0x99, 0x79, 0xe6, 0xde, 0x7b, 
-0x15, 0x2a, 0xf4, 0xd8, 0x3b, 0x61, 0xdf, 0x52, 0x0a, 0x52, 0xf1, 0x0d, 
-0x5e, 0x0f, 0x1a, 0xf0, 0xb6, 0x2d, 0x5b, 0x78, 0xae, 0xb4, 0x3a, 0xcd, 
-0x78, 0x3d, 0x6d, 0x6f, 0x7e, 0xc1, 0x99, 0x52, 0x7d, 0xcc, 0xb0, 0x21, 
-0xe6, 0xba, 0xdf, 0x4a, 0x65, 0x14, 0x37, 0x2d, 0xc0, 0xc3, 0x57, 0x5d, 
-0x37, 0x2b, 0x3d, 0xa3, 0x79, 0x9f, 0xfa, 0xbb, 0xbf, 0x32, 0xbf, 0xda, 
-0xd6, 0x03, 0xa7, 0xa4, 0x26, 0xc4, 0x3d, 0xfc, 0xd0, 0x43, 0x48, 0x74, 
-0x12, 0xf8, 0xa4, 0x47, 0x8c, 0x07, 0x57, 0x6a, 0x0f, 0x89, 0xd1, 0x64, 
-0x01, 0xc5, 0xe7, 0x43, 0xdd, 0x30, 0xd6, 0xbc, 0xe5, 0x9c, 0xad, 0xf5, 
-0x77, 0x5d, 0x54, 0xea, 0x42, 0x18, 0x1b, 0x55, 0x19, 0x15, 0xbd, 0x66, 
-0x5d, 0x9f, 0x91, 0x9c, 0xbc, 0x7b, 0x67, 0x89, 0xa0, 0x02, 0xc2, 0x35, 
-0x53, 0xb6, 0x01, 0x1b, 0x12, 0xe0, 0x04, 0x36, 0x36, 0xaf, 0x5f, 0xc7, 
-0xa3, 0x25, 0xd7, 0x2a, 0xe8, 0xb0, 0xed, 0xf5, 0x6a, 0x2d, 0xfb, 0xd4, 
-0xce, 0xaa, 0xfe, 0xa7, 0x3f, 0xfe, 0xd1, 0xc0, 0x28, 0x14, 0x2a, 0x44, 
-0x06, 0x40, 0x6f, 0xf9, 0xe0, 0x27, 0x3f, 0xe9, 0xd4, 0xa2, 0x69, 0x52, 
-0x9d, 0xd6, 0xad, 0xf7, 0xff, 0xd5, 0xf4, 0x52, 0xcf, 0xe7, 0x36, 0xef, 
-0x9c, 0x16, 0x1f, 0xfb, 0xd6, 0x9b, 0x6f, 0x22, 0xd1, 0xa1, 0xa8, 0xc0, 
-0x5e, 0xa2, 0xa8, 0x10, 0x9f, 0x0f, 0xa8, 0x38, 0x7d, 0x8f, 0xcb, 0x60, 
-0x98, 0xd7, 0xe7, 0xd2, 0x56, 0x7b, 0x7d, 0x88, 0x3b, 0xae, 0xa2, 0xc8, 
-0xa9, 0xca, 0xa8, 0x18, 0xb9, 0xc1, 0xb5, 0xd0, 0x93, 0x2f, 0x64, 0x2f, 
-0xc8, 0xde, 0xac, 0x24, 0x28, 0x95, 0xd0, 0x23, 0x94, 0xad, 0xb0, 0xa1, 
-0x58, 0x07, 0x1b, 0x58, 0xc9, 0xb6, 0x6d, 0x88, 0x52, 0x49, 0xb5, 0x5b, 
-0xe4, 0x76, 0x9b, 0x90, 0x91, 0x96, 0x7e, 0xcf, 0xdd, 0x77, 0xab, 0xab, 
-0xd4, 0x4e, 0x2c, 0x17, 0x8a, 0x0c, 0x80, 0x44, 0x84, 0x57, 0xa4, 0x5f, 
-0xd7, 0xc2, 0x84, 0x9c, 0xfc, 0xc2, 0x03, 0x7f, 0x36, 0xa3, 0xa2, 0x56, 
-0xa7, 0xc1, 0x69, 0x09, 0xf1, 0x4f, 0x3f, 0xf9, 0xa4, 0x8e, 0x52, 0xee, 
-0x18, 0xd2, 0xa9, 0x76, 0x81, 0x30, 0x25, 0x15, 0x13, 0xc5, 0x7b, 0xf9, 
-0xf9, 0xcf, 0x7e, 0xd6, 0xbb, 0x4b, 0xa1, 0xc3, 0x99, 0xd9, 0x61, 0x8f, 
-0xb5, 0x5d, 0xbb, 0x8a, 0x02, 0xc0, 0x52, 0x92, 0xaf, 0xca, 0xa8, 0x20, 
-0xe2, 0x28, 0xbe, 0x46, 0xfd, 0x82, 0xc6, 0x8d, 0x70, 0xc3, 0xa1, 0xdd, 
-0x4a, 0x4e, 0x8f, 0xb2, 0x84, 0x8a, 0xba, 0xac, 0x1f, 0x0a, 0x1e, 0x22, 
-0x59, 0x71, 0x1c, 0xdc, 0xb7, 0x2f, 0x39, 0x31, 0x21, 0x21, 0xa7, 0x31, 
-0xf0, 0x58, 0x30, 0x67, 0x8e, 0x39, 0x59, 0x54, 0x99, 0xa1, 0x24, 0x93, 
-0x06, 0xe3, 0xec, 0xc8, 0x41, 0xfd, 0x1d, 0x58, 0xb1, 0x76, 0xff, 0xc8, 
-0xfc, 0x16, 0x3b, 0x8c, 0x5f, 0x94, 0x92, 0x90, 0x70, 0xc7, 0xed, 0xb7, 
-0xe3, 0xac, 0x90, 0x6c, 0x0a, 0xe1, 0x15, 0x11, 0x8e, 0x0a, 0xd9, 0x53, 
-0xe0, 0xb4, 0x57, 0xcc, 0x9d, 0x03, 0x39, 0x4d, 0xd8, 0xfd, 0x4c, 0x28, 
-0x01, 0x20, 0xe4, 0x50, 0xc1, 0xe2, 0x76, 0x9b, 0xe9, 0x72, 0x9a, 0x2e, 
-0xba, 0xe2, 0x0a, 0xc9, 0xff, 0x14, 0x85, 0x5b, 0x79, 0xe2, 0x74, 0x2a, 
-0x57, 0xf0, 0x50, 0x1e, 0x3a, 0xe1, 0x03, 0xc7, 0x8f, 0x1d, 0x4b, 0x49, 
-0x4e, 0x66, 0x90, 0xee, 0xdd, 0xba, 0x99, 0xc9, 0x57, 0xed, 0x76, 0xd0, 
-0x37, 0x0a, 0x09, 0x72, 0xda, 0xbc, 0x79, 0x73, 0x39, 0x39, 0xa7, 0xeb, 
-0xb8, 0x2e, 0x07, 0x8c, 0xa6, 0xf7, 0x01, 0x8b, 0x8b, 0x93, 0x13, 0x9c, 
-0x84, 0x99, 0xe0, 0x4f, 0x14, 0x88, 0x8a, 0xea, 0x1f, 0xc9, 0xa8, 0x50, 
-0x0e, 0x9f, 0x4f, 0x3e, 0xfe, 0xb8, 0x67, 0xa7, 0x8e, 0xb1, 0xd5, 0xea, 
-0xb5, 0xdb, 0xf3, 0xc7, 0x08, 0x42, 0x05, 0xfb, 0x68, 0x05, 0xfb, 0x2b, 
-0x58, 0x5c, 0x42, 0x9b, 0x92, 0x6a, 0x35, 0x75, 0xc6, 0x39, 0x76, 0xef, 
-0xdc, 0x29, 0x2e, 0x02, 0xdd, 0x9d, 0x6c, 0x69, 0xfc, 0x31, 0xf3, 0x90, 
-0x07, 0xce, 0x9c, 0x69, 0xdb, 0xa2, 0xc5, 0x94, 0x09, 0x13, 0xcc, 0xd2, 
-0x82, 0x21, 0x02, 0x94, 0xed, 0xff, 0x9d, 0x77, 0xde, 0x19, 0x3b, 0x7c, 
-0x18, 0x4f, 0xda, 0x60, 0xda, 0x86, 0x91, 0x25, 0xcf, 0xea, 0x11, 0x6f, 
-0x63, 0x36, 0x9e, 0x72, 0x26, 0x26, 0xaf, 0x58, 0xba, 0x44, 0xcc, 0xb2, 
-0x6c, 0x90, 0x11, 0xe8, 0xd5, 0xd6, 0xd7, 0x50, 0xf6, 0x1d, 0xd9, 0x50, 
-0x8e, 0x1e, 0x39, 0xe2, 0x72, 0x6f, 0x8f, 0x59, 0x98, 0x53, 0x12, 0xfa, 
-0x79, 0x79, 0x55, 0x59, 0x82, 0x92, 0x2d, 0x67, 0xc0, 0xf5, 0x27, 0x62, 
-0x93, 0x32, 0x32, 0x52, 0x92, 0xb0, 0xfd, 0x89, 0x7b, 0x5b, 0xbc, 0x16, 
-0xaa, 0x82, 0x86, 0x1d, 0xc9, 0x98, 0xee, 0xbd, 0xc4, 0x4e, 0x79, 0x0d, 
-0xe9, 0x91, 0x9e, 0x26, 0x08, 0x6c, 0x05, 0x8d, 0x1a, 0x39, 0x62, 0x9c, 
-0x54, 0xa8, 0x4f, 0xab, 0xd3, 0xbc, 0xf7, 0x9c, 0x35, 0x82, 0x8d, 0xe6, 
-0xfb, 0xbf, 0x8a, 0x4f, 0x4c, 0xeb, 0xd7, 0xb3, 0x87, 0xa8, 0xfe, 0x32, 
-0x87, 0x08, 0x37, 0xcb, 0xb2, 0x02, 0xac, 0xc3, 0x2f, 0x7f, 0xfe, 0xf3, 
-0xb6, 0x2d, 0x9a, 0x51, 0x14, 0x62, 0x5c, 0xf1, 0x23, 0x21, 0xcf, 0x28, 
-0xa0, 0x3a, 0xaf, 0xa8, 0xa0, 0x1f, 0x3d, 0x22, 0x63, 0xa5, 0xf8, 0xb6, 
-0x65, 0x7d, 0xc9, 0x05, 0xed, 0x7f, 0xcd, 0x61, 0x80, 0x91, 0x95, 0x96, 
-0x72, 0xef, 0xe9, 0xd3, 0xc8, 0x51, 0x12, 0xbe, 0x11, 0xac, 0x5c, 0x50, 
-0x61, 0x17, 0x22, 0x09, 0xa8, 0x66, 0x3f, 0x84, 0x99, 0x14, 0xf5, 0xea, 
-0x31, 0x6e, 0xd8, 0x90, 0x7a, 0xd9, 0x59, 0x78, 0x30, 0x52, 0x72, 0x1b, 
-0x4d, 0x3b, 0x84, 0x5b, 0xf0, 0xbf, 0x19, 0x4d, 0xbb, 0xd7, 0xcd, 0xcd, 
-0x79, 0xe7, 0xad, 0xb7, 0x0c, 0x1a, 0x8e, 0x1d, 0x64, 0x86, 0xd3, 0x39, 
-0x06, 0x1f, 0xe8, 0xfa, 0x1b, 0x5d, 0xd1, 0xf5, 0x03, 0x96, 0xec, 0x08, 
-0x93, 0x60, 0x72, 0xfb, 0xa8, 0xa8, 0x14, 0x09, 0x4a, 0x80, 0x41, 0x26, 
-0x50, 0xff, 0xab, 0x0f, 0xc7, 0x3b, 0x53, 0xa9, 0x4b, 0xf0, 0xe8, 0xc3, 
-0x0f, 0xab, 0xca, 0x7c, 0xc1, 0x12, 0x60, 0x74, 0x39, 0x4a, 0x0c, 0xbb, 
-0x12, 0x48, 0xc2, 0x8d, 0xd0, 0x67, 0x56, 0x2e, 0x5d, 0xca, 0x2a, 0x55, 
-0x6b, 0xd5, 0x8f, 0x99, 0xd4, 0x9f, 0xb6, 0x3e, 0x29, 0x36, 0x76, 0xdb, 
-0xe6, 0xcd, 0x51, 0xff, 0x1d, 0x8b, 0x26, 0x5e, 0xd4, 0x47, 0x1e, 0x7e, 
-0x28, 0x3d, 0xd6, 0x91, 0x56, 0xb7, 0x45, 0x8b, 0x83, 0xff, 0x0c, 0x07, 
-0x46, 0x61, 0x9f, 0x57, 0x20, 0xd3, 0x57, 0x22, 0x2a, 0x58, 0xeb, 0x26, 
-0xbb, 0xfe, 0xda, 0x7f, 0xc5, 0x81, 0xf8, 0x78, 0x67, 0xc3, 0x5a, 0x79, 
-0x78, 0xa0, 0x95, 0x3d, 0x4a, 0x64, 0x98, 0x00, 0xb7, 0x61, 0xd9, 0xf9, 
-0x24, 0x84, 0x16, 0xa4, 0xe9, 0xce, 0xf2, 0x0b, 0x41, 0x56, 0x7f, 0x99, 
-0x77, 0xd9, 0x6c, 0x80, 0xd1, 0x74, 0xe1, 0xa1, 0xf6, 0xc5, 0xaf, 0xf1, 
-0x61, 0x70, 0xff, 0xa2, 0xaf, 0xbf, 0xfa, 0x2a, 0x2a, 0x3e, 0xb1, 0x02, 
-0xef, 0xbc, 0xfd, 0x76, 0xa3, 0x5a, 0x79, 0x89, 0xc9, 0x19, 0xae, 0x18, 
-0x7b, 0x1b, 0xf1, 0x0a, 0xa1, 0x71, 0x8e, 0x89, 0x57, 0xb0, 0x39, 0x96, 
-0x89, 0x83, 0x12, 0x09, 0xaa, 0xd2, 0x51, 0xe1, 0x02, 0xc6, 0xee, 0x2f, 
-0x8b, 0x96, 0xee, 0x66, 0xc2, 0xcd, 0x1a, 0x36, 0x78, 0xf1, 0x85, 0x17, 
-0xa4, 0x29, 0x44, 0xb0, 0x02, 0x2e, 0x14, 0x30, 0x54, 0xb3, 0x5d, 0x09, 
-0xb2, 0x92, 0x6a, 0x20, 0xcf, 0xff, 0xe8, 0x47, 0x8d, 0x6a, 0xe6, 0xa6, 
-0xb7, 0x19, 0xd8, 0xf9, 0xf0, 0xff, 0xd4, 0xec, 0x7f, 0x99, 0xab, 0xaf, 
-0xd7, 0x35, 0xd7, 0x70, 0x42, 0x24, 0x5b, 0x9f, 0xd8, 0x44, 0xb0, 0xc5, 
-0xf5, 0xea, 0xda, 0xc5, 0xe1, 0x88, 0x29, 0x58, 0x78, 0xb0, 0xe5, 0xa1, 
-0xb0, 0xc8, 0xac, 0x10, 0x60, 0x87, 0x10, 0x2a, 0x98, 0x2e, 0x65, 0xea, 
-0xfa, 0x2d, 0xde, 0xce, 0x9c, 0xdb, 0xb7, 0x6c, 0xf1, 0xce, 0xdb, 0xef, 
-0x04, 0xdd, 0x36, 0xaa, 0x63, 0x43, 0x02, 0x49, 0xc4, 0x59, 0x4e, 0xdc, 
-0x78, 0xcf, 0xce, 0x85, 0xb1, 0xb9, 0x4d, 0x3a, 0x1f, 0xfe, 0x75, 0xe1, 
-0xde, 0x8f, 0xe3, 0x6b, 0x36, 0x6f, 0x96, 0xdf, 0xf0, 0xa3, 0x0f, 0x3f, 
-0x8c, 0x70, 0x54, 0x48, 0x95, 0xb4, 0x9a, 0xfd, 0x66, 0xb5, 0xdb, 0xf2, 
-0x72, 0x93, 0xf9, 0x7b, 0x87, 0xdd, 0x74, 0x4f, 0xb3, 0xfd, 0x16, 0x91, 
-0x32, 0xa1, 0xc1, 0x1f, 0x74, 0x46, 0xa7, 0xa1, 0x82, 0xf4, 0x66, 0x82, 
-0x41, 0xab, 0x2e, 0xaf, 0x90, 0xc5, 0x25, 0xa9, 0xa8, 0xdf, 0xc2, 0xcd, 
-0x4c, 0xbb, 0x47, 0x61, 0x21, 0x11, 0xdd, 0x2a, 0xe6, 0x22, 0x40, 0x21, 
-0xca, 0xb2, 0x4e, 0x9e, 0x08, 0x54, 0x02, 0x8f, 0x59, 0xd3, 0xa7, 0x73, 
-0xd3, 0xdc, 0x6e, 0xe3, 0x5b, 0x5d, 0xff, 0x50, 0x4a, 0xe3, 0xce, 0xb9, 
-0x19, 0xa9, 0xaf, 0xbc, 0xf4, 0x52, 0x10, 0x6f, 0x1a, 0x5a, 0x43, 0xc9, 
-0xf6, 0x41, 0xa7, 0x0e, 0xd6, 0xc4, 0x59, 0xbd, 0x4e, 0x52, 0x56, 0x9d, 
-0xb8, 0x38, 0x67, 0x7c, 0x42, 0x4a, 0x52, 0xf5, 0x5a, 0x5d, 0xc7, 0xce, 
-0x29, 0x9b, 0x11, 0x59, 0xbe, 0x21, 0xa4, 0xe5, 0x02, 0xb9, 0xd0, 0xe2, 
-0x15, 0xb2, 0x04, 0x18, 0x3a, 0xfa, 0x2e, 0xd8, 0xc0, 0xcc, 0x47, 0x0c, 
-0x1a, 0x88, 0x49, 0x2a, 0x58, 0x42, 0x94, 0x01, 0x18, 0xca, 0x36, 0x25, 
-0x32, 0x15, 0x62, 0xe4, 0xcc, 0x69, 0x53, 0x29, 0xa0, 0x90, 0x10, 0x9f, 
-0x84, 0x55, 0xea, 0xea, 0x65, 0xcb, 0x22, 0x96, 0x51, 0xb0, 0x50, 0x82, 
-0x0a, 0x38, 0xe9, 0xe3, 0xe7, 0xce, 0x0d, 0xee, 0xd7, 0x67, 0xdc, 0xb0, 
-0x61, 0x1b, 0xd6, 0xae, 0x59, 0xb5, 0x6c, 0x69, 0x9f, 0x2e, 0x85, 0x29, 
-0xf1, 0x71, 0xce, 0xcc, 0xdc, 0xf1, 0x7b, 0x9f, 0x2d, 0x17, 0x7a, 0xad, 
-0x18, 0xd5, 0xc5, 0x0a, 0x15, 0x50, 0x5a, 0x69, 0x3d, 0xa8, 0xaa, 0xa3, 
-0x57, 0xe8, 0xab, 0xdc, 0xf5, 0xd0, 0xe7, 0xd5, 0x5a, 0xf6, 0x4d, 0x74, 
-0x38, 0x08, 0xbf, 0x29, 0x0f, 0x54, 0xa8, 0x17, 0x2f, 0xd8, 0x50, 0x07, 
-0x89, 0x4d, 0x57, 0x2e, 0x58, 0xf0, 0xf8, 0xa3, 0x8f, 0x02, 0x95, 0xd0, 
-0xda, 0xdd, 0x83, 0x3e, 0x5b, 0xdd, 0xa2, 0xad, 0xea, 0xcd, 0x11, 0x60, 
-0x7f, 0xf3, 0x86, 0x0d, 0xa9, 0x71, 0x8e, 0xd4, 0x5a, 0x05, 0x4d, 0x76, 
-0x9b, 0x23, 0x2c, 0x43, 0x84, 0x6f, 0xd8, 0xe7, 0x15, 0x84, 0xe8, 0x55, 
-0xbc, 0x6f, 0xdb, 0x72, 0xbf, 0x41, 0x88, 0xea, 0x7f, 0x55, 0x89, 0x2b, 
-0x88, 0xa3, 0x73, 0x21, 0xbe, 0xb9, 0x0a, 0x08, 0xbb, 0x50, 0xfe, 0xf2, 
-0xa0, 0xd3, 0x56, 0x48, 0x0f, 0xa8, 0x5b, 0xb4, 0x05, 0x18, 0xe2, 0xda, 
-0x5a, 0xb5, 0x72, 0xa5, 0xeb, 0xed, 0x4c, 0xb9, 0x2a, 0x54, 0x81, 0x61, 
-0x5f, 0xaf, 0xa8, 0x3a, 0xa8, 0xe8, 0xbf, 0xf2, 0x80, 0x2b, 0xb8, 0xa0, 
-0xa0, 0xc9, 0x1b, 0xaf, 0xbd, 0xa6, 0xa2, 0x68, 0x23, 0x59, 0x9e, 0xa9, 
-0x44, 0x68, 0x19, 0x80, 0x41, 0x64, 0x00, 0x4e, 0x1e, 0xb2, 0xb2, 0x7a, 
-0x74, 0xee, 0xe4, 0x48, 0x48, 0x19, 0xb5, 0xe9, 0x74, 0x48, 0x96, 0x4e, 
-0x0b, 0x39, 0x54, 0xe0, 0xd1, 0x73, 0xd6, 0x6c, 0x9a, 0x57, 0xbd, 0xda, 
-0xc3, 0x67, 0xcf, 0xaa, 0xcc, 0xe9, 0x48, 0x0e, 0xd1, 0xab, 0x44, 0x48, 
-0xc8, 0xad, 0x0d, 0xb1, 0x64, 0x02, 0x8c, 0x47, 0x1f, 0x7a, 0x08, 0xfb, 
-0x75, 0xcb, 0x51, 0x0b, 0x42, 0x32, 0x2c, 0x2a, 0xe4, 0x50, 0xd1, 0x73, 
-0xc1, 0xcd, 0xcc, 0x79, 0xe1, 0xe5, 0x97, 0xab, 0xcc, 0xe9, 0x48, 0xae, 
-0x27, 0x50, 0xe9, 0x90, 0x50, 0x0a, 0x98, 0x5e, 0xa1, 0x54, 0xba, 0x84, 
-0x51, 0xe1, 0x97, 0x18, 0xfe, 0xf6, 0xfb, 0xcc, 0x99, 0x2a, 0x55, 0x5e, 
-0xbb, 0xb0, 0x83, 0x0a, 0xa0, 0x8f, 0xbf, 0xa6, 0x2a, 0x48, 0x50, 0x34, 
-0x52, 0xa1, 0xb9, 0x4e, 0x83, 0xda, 0xb5, 0xe8, 0x47, 0x81, 0x62, 0xc7, 
-0xea, 0x47, 0x78, 0xe4, 0x45, 0x55, 0x40, 0x85, 0x62, 0x17, 0x7a, 0x33, 
-0x24, 0x62, 0x02, 0xae, 0x5e, 0xe6, 0x8a, 0x94, 0x19, 0xb7, 0x25, 0x04, 
-0x7b, 0xbe, 0x58, 0xa1, 0xc2, 0x68, 0x83, 0xaa, 0x3a, 0xa8, 0x18, 0xbd, 
-0xc3, 0x55, 0x8d, 0x6b, 0xec, 0xc8, 0x91, 0x84, 0x9f, 0x48, 0xba, 0x85, 
-0x42, 0x45, 0x15, 0xa1, 0x8f, 0x88, 0x9d, 0x86, 0x41, 0xc1, 0x20, 0xf2, 
-0x40, 0x72, 0x56, 0xfb, 0x5c, 0x7e, 0x73, 0xe8, 0x99, 0x68, 0xbd, 0xa2, 
-0x02, 0x1b, 0x6d, 0xd5, 0x41, 0xc5, 0xc0, 0xa5, 0x25, 0x94, 0xee, 0xbb, 
-0x71, 0xcd, 0x1a, 0x32, 0xa7, 0xa5, 0xea, 0x47, 0x84, 0x67, 0xc3, 0x55, 
-0x29, 0x10, 0x2a, 0x60, 0x48, 0x1e, 0x3c, 0x61, 0x32, 0x35, 0xd3, 0x93, 
-0x1b, 0xf4, 0x9b, 0x16, 0x7a, 0x65, 0x36, 0x43, 0x0b, 0x15, 0xdd, 0x26, 
-0xcc, 0xaf, 0x91, 0x91, 0x41, 0xd5, 0x8f, 0x68, 0x8e, 0x68, 0x95, 0xc2, 
-0x83, 0x9a, 0x0c, 0xc0, 0x50, 0x95, 0xde, 0xdf, 0x7b, 0xf7, 0x5d, 0x0a, 
-0xc2, 0x27, 0x37, 0xee, 0xd2, 0x6c, 0xdf, 0xdf, 0x43, 0x8c, 0x5d, 0xd8, 
-0x47, 0x05, 0xe6, 0xb6, 0x4a, 0xf7, 0x57, 0xb4, 0xee, 0x3e, 0xb0, 0x76, 
-0x4e, 0x0e, 0xe9, 0x72, 0xc4, 0xa5, 0x48, 0x3d, 0xf0, 0x0a, 0x70, 0x56, 
-0x54, 0x4d, 0xfa, 0xab, 0x9a, 0xb3, 0x12, 0x76, 0x21, 0x95, 0xde, 0xe1, 
-0xe7, 0x83, 0xfa, 0xf4, 0x74, 0x64, 0xd4, 0xe9, 0x74, 0x20, 0xd4, 0xfa, 
-0x83, 0x85, 0x16, 0x2a, 0x1a, 0x36, 0x6d, 0xdd, 0xb8, 0x6e, 0x6d, 0xc2, 
-0x9f, 0x08, 0xd7, 0x8b, 0x66, 0x4e, 0x57, 0x59, 0x60, 0xa8, 0x4a, 0xef, 
-0x33, 0xa6, 0x4c, 0x82, 0xc0, 0x26, 0xec, 0x7d, 0x2e, 0xa4, 0x78, 0xc5, 
-0x7f, 0xf4, 0xdd, 0x5f, 0x45, 0x07, 0x96, 0xd1, 0xb6, 0x95, 0x5e, 0x51, 
-0x15, 0x78, 0x45, 0x5e, 0xdd, 0x46, 0xed, 0x5a, 0x36, 0x27, 0x86, 0x11, 
-0x9b, 0x18, 0x56, 0x0e, 0x84, 0xd7, 0x60, 0x25, 0x1e, 0x55, 0x4d, 0x0a, 
-0x0b, 0xc5, 0x59, 0xa9, 0x6c, 0x24, 0x38, 0xf9, 0xbc, 0xd9, 0x33, 0xa1, 
-0xb0, 0x9e, 0x37, 0x3d, 0x18, 0x52, 0xa8, 0x28, 0x13, 0x49, 0x2e, 0xa8, 
-0x90, 0x12, 0xf4, 0xa5, 0x71, 0x50, 0x55, 0x0a, 0x15, 0xa9, 0x19, 0xd9, 
-0xfd, 0x7b, 0xf7, 0xa2, 0xcb, 0x06, 0xf9, 0x1e, 0x51, 0x54, 0x54, 0x4d, 
-0xcc, 0xe8, 0xa8, 0x98, 0x3b, 0xcb, 0x85, 0x8a, 0xe6, 0x57, 0x87, 0x5a, 
-0xf1, 0x59, 0x93, 0x04, 0x65, 0x8d, 0x0a, 0x24, 0x96, 0xaa, 0xc0, 0x2b, 
-0x12, 0x93, 0x32, 0x06, 0xf5, 0xeb, 0xcb, 0x4c, 0x14, 0x2a, 0xa2, 0x7a, 
-0x45, 0x55, 0xc3, 0x86, 0xa0, 0x02, 0x33, 0x14, 0xc6, 0xd9, 0x79, 0xb3, 
-0x67, 0xb9, 0x78, 0xc5, 0xba, 0x10, 0xe6, 0x15, 0xef, 0xbd, 0xf7, 0x1e, 
-0x12, 0x7b, 0x95, 0x46, 0x45, 0x4a, 0x66, 0x76, 0x87, 0x56, 0x2d, 0xa3, 
-0xa8, 0xa8, 0x6a, 0x48, 0x30, 0x04, 0xe1, 0x2b, 0x54, 0xcc, 0x99, 0xe1, 
-0x4a, 0x4a, 0x99, 0xb8, 0x3b, 0x84, 0xa2, 0xca, 0xff, 0x63, 0xc8, 0xc5, 
-0xf3, 0x82, 0x0a, 0xe4, 0x96, 0x4a, 0xb7, 0x41, 0xe5, 0xd5, 0x6b, 0xd2, 
-0xb8, 0x6e, 0x1d, 0x5d, 0x82, 0x8a, 0xf2, 0x8a, 0x2a, 0x85, 0x10, 0xdd, 
-0x65, 0x41, 0xdd, 0xd1, 0x41, 0xbd, 0x7b, 0x38, 0xaa, 0xd5, 0x2b, 0x3c, 
-0x18, 0x42, 0x36, 0x28, 0x4f, 0xa8, 0x38, 0x72, 0xe4, 0x48, 0x32, 0x15, 
-0xf7, 0xf8, 0x87, 0x5e, 0x81, 0xbf, 0xac, 0x8a, 0x48, 0x50, 0xf9, 0x1d, 
-0x7a, 0xd7, 0xc9, 0xcd, 0xa1, 0x46, 0xb2, 0xd2, 0xb6, 0xa3, 0xa8, 0xa8, 
-0x82, 0xa8, 0x10, 0xcb, 0xec, 0x4b, 0x2f, 0xbe, 0x58, 0x3b, 0x23, 0xa5, 
-0x41, 0xd1, 0x25, 0xcd, 0x43, 0xae, 0x15, 0xb7, 0xb6, 0xfd, 0xeb, 0xbc, 
-0xa2, 0x8a, 0xa2, 0xa2, 0x5d, 0xff, 0x71, 0x35, 0xb3, 0xaa, 0xbf, 0xf8, 
-0xe2, 0x8b, 0xd1, 0x9a, 0x96, 0x55, 0x0a, 0x0c, 0x6a, 0x32, 0x7a, 0x35, 
-0xeb, 0x53, 0x77, 0xdd, 0x05, 0x75, 0x15, 0x2d, 0xdb, 0x55, 0x6d, 0x87, 
-0x45, 0x33, 0x90, 0x2a, 0x6c, 0x95, 0x2a, 0x63, 0x99, 0x55, 0xa8, 0xa0, 
-0x42, 0x9f, 0x05, 0x2a, 0xaa, 0x82, 0x04, 0xd5, 0x6d, 0xdc, 0xfc, 0xec, 
-0x8c, 0x8c, 0xfb, 0xef, 0xbb, 0x4f, 0x79, 0xf1, 0xa2, 0x11, 0x1f, 0x55, 
-0x07, 0x1e, 0xe2, 0xd8, 0x16, 0x46, 0x81, 0xaa, 0xbd, 0x7c, 0xf1, 0x22, 
-0x50, 0x31, 0xbe, 0xf8, 0xe1, 0x2a, 0x0c, 0x00, 0x73, 0xf4, 0xae, 0x8f, 
-0x12, 0x54, 0x55, 0x40, 0x45, 0xbf, 0xf9, 0x6b, 0xe9, 0x68, 0xb1, 0x77, 
-0xd7, 0x2e, 0x6c, 0x02, 0x12, 0x07, 0x15, 0x8d, 0x99, 0xad, 0x0a, 0xa8, 
-0x50, 0xb5, 0x51, 0xa4, 0x6e, 0x1a, 0x7e, 0xa4, 0x0f, 0x3f, 0xf8, 0xa0, 
-0x61, 0x6e, 0x8d, 0xe4, 0xba, 0xad, 0x3b, 0x1c, 0xf8, 0x22, 0xd4, 0x50, 
-0x61, 0xcd, 0x2b, 0xf0, 0x57, 0x54, 0x51, 0x5e, 0x31, 0x72, 0xe3, 0xbd, 
-0xd4, 0xdc, 0x9f, 0x33, 0x7b, 0x36, 0x31, 0xb3, 0x86, 0x8e, 0x16, 0xd1, 
-0x5c, 0xbc, 0xca, 0x82, 0x87, 0x0e, 0x09, 0x29, 0x30, 0xc7, 0x6e, 0x75, 
-0xeb, 0xc1, 0x83, 0x30, 0x8a, 0x76, 0xd3, 0xae, 0xc9, 0xdd, 0xf9, 0xaf, 
-0x28, 0x2a, 0xca, 0x37, 0xa1, 0xa4, 0x55, 0xc9, 0xa7, 0xf4, 0x0e, 0xee, 
-0xda, 0xa9, 0x23, 0xc6, 0x59, 0xbd, 0xa3, 0x45, 0x24, 0x97, 0xf1, 0xab, 
-0x2c, 0x30, 0xe8, 0x11, 0x81, 0x52, 0x76, 0x51, 0x5a, 0x81, 0x21, 0x3b, 
-0x7d, 0xfa, 0xbb, 0xdf, 0x75, 0x6d, 0xdf, 0x26, 0x21, 0x23, 0x6f, 0xc2, 
-0xae, 0xa7, 0x43, 0x0d, 0x12, 0xc6, 0x2a, 0x69, 0x5e, 0xb4, 0xed, 0xaa, 
-0x20, 0x41, 0xd5, 0xd8, 0xfe, 0x55, 0xa3, 0x5e, 0x63, 0xd2, 0x9c, 0x09, 
-0x08, 0x51, 0xaa, 0xa3, 0x85, 0xb4, 0xf7, 0xd5, 0xbb, 0x7b, 0x55, 0x3a, 
-0xa1, 0x44, 0xc8, 0x04, 0x84, 0x4b, 0xa8, 0x6a, 0x8b, 0xc2, 0x25, 0x88, 
-0xda, 0x2c, 0xde, 0xb6, 0x15, 0x96, 0xde, 0x73, 0xda, 0x52, 0xea, 0x4e, 
-0x84, 0x14, 0x2a, 0x7e, 0xd8, 0xd3, 0x6d, 0xda, 0xa0, 0x20, 0xc1, 0xaa, 
-0x80, 0x0a, 0x96, 0x78, 0xc4, 0x2d, 0x67, 0x1d, 0xb1, 0xce, 0xfc, 0x7a, 
-0xf5, 0x48, 0xc7, 0x13, 0x76, 0x21, 0xa5, 0x35, 0x05, 0x18, 0xd2, 0x10, 
-0x5e, 0x95, 0xe4, 0xb0, 0xfc, 0x10, 0x21, 0x24, 0x5b, 0xae, 0x8f, 0xa9, 
-0xa4, 0x26, 0x1d, 0x12, 0x52, 0xe3, 0x03, 0x5b, 0x48, 0x8d, 0xd4, 0x24, 
-0x67, 0x46, 0x4e, 0x08, 0x42, 0xe2, 0x82, 0xaa, 0x5d, 0xb6, 0xa2, 0xa6, 
-0x27, 0x1b, 0x54, 0xd5, 0x41, 0x05, 0x6d, 0xc1, 0x7a, 0x5f, 0x59, 0x0c, 
-0x98, 0x5b, 0x36, 0x6d, 0x4a, 0x19, 0x66, 0xe9, 0x68, 0x01, 0x30, 0xe0, 
-0x18, 0x08, 0xb5, 0x60, 0x03, 0x1b, 0x88, 0xc0, 0xc3, 0x7c, 0xe8, 0x95, 
-0x9d, 0xe4, 0xbd, 0x96, 0x2b, 0xe9, 0x84, 0xdf, 0xe0, 0x0a, 0x0c, 0x7a, 
-0x93, 0x4e, 0xa9, 0xe2, 0x2e, 0x5c, 0xe2, 0xd5, 0x57, 0x5e, 0x69, 0x52, 
-0xbf, 0x1e, 0x95, 0x67, 0x07, 0x5e, 0x77, 0x2c, 0x04, 0xb9, 0x04, 0xa8, 
-0x70, 0x6b, 0x83, 0xb2, 0xb0, 0xcc, 0x82, 0x0a, 0x22, 0x07, 0x2b, 0xdd, 
-0xb7, 0x2d, 0x0b, 0x4d, 0x03, 0xa4, 0x3e, 0x57, 0xb8, 0x7a, 0x07, 0xb7, 
-0x69, 0xd9, 0xe2, 0x85, 0xe7, 0x9f, 0x17, 0x60, 0xf0, 0x56, 0x30, 0x7d, 
-0xf0, 0x7a, 0x78, 0x49, 0x02, 0x0f, 0x39, 0xa4, 0x24, 0xa6, 0x1c, 0xd2, 
-0x2c, 0x4f, 0x61, 0xc6, 0xdc, 0x3c, 0x32, 0xfc, 0xe8, 0x38, 0x58, 0x4f, 
-0xa4, 0xb8, 0xae, 0x8e, 0x07, 0x29, 0xc2, 0x2b, 0xad, 0x70, 0x48, 0xd8, 
-0x7c, 0xe0, 0x81, 0x07, 0x9a, 0x36, 0x68, 0xe0, 0xca, 0x4a, 0x5d, 0xb0, 
-0x91, 0x52, 0xd9, 0x21, 0x8b, 0x0a, 0xdb, 0xfe, 0x8a, 0x2a, 0x85, 0x0a, 
-0x17, 0x30, 0x76, 0x7d, 0xe1, 0x4a, 0x08, 0x76, 0xc4, 0x14, 0xb6, 0x6f, 
-0x47, 0x26, 0x24, 0xc1, 0x82, 0x18, 0xce, 0xd8, 0xab, 0x08, 0xa4, 0xe5, 
-0x0d, 0xc1, 0x3a, 0xe0, 0xe6, 0xbc, 0x2d, 0xc1, 0x89, 0x1c, 0x48, 0x59, 
-0x1c, 0xbc, 0x45, 0x05, 0x1b, 0x83, 0xc4, 0x15, 0x2c, 0x02, 0x0a, 0xbf, 
-0x71, 0x74, 0x79, 0x49, 0xef, 0x6e, 0xce, 0x22, 0x0b, 0x8b, 0xc0, 0xa9, 
-0xba, 0x79, 0xe3, 0xc6, 0xac, 0x8c, 0x74, 0x6a, 0x40, 0xf5, 0x9e, 0xbf, 
-0x31, 0xc4, 0xeb, 0xcc, 0x86, 0x2c, 0x2a, 0x5c, 0x85, 0xfb, 0x77, 0xfd, 
-0xb5, 0xd7, 0xfc, 0xf5, 0x8e, 0x98, 0xd8, 0x4e, 0x6d, 0xdb, 0x3c, 0xf9, 
-0xe4, 0x93, 0x78, 0x30, 0xc0, 0x06, 0x85, 0x3f, 0x80, 0x07, 0xfb, 0x16, 
-0xaf, 0x0a, 0x06, 0x02, 0x48, 0xe4, 0xa0, 0x1a, 0x88, 0xa0, 0x45, 0x01, 
-0x06, 0x84, 0x98, 0xbb, 0x77, 0x87, 0x1f, 0x41, 0x07, 0xfe, 0x44, 0xba, 
-0xe1, 0x55, 0x9a, 0x7b, 0xb0, 0xc5, 0x08, 0x1e, 0x58, 0x61, 0xbc, 0x46, 
-0x3f, 0x7e, 0xe5, 0x95, 0xc9, 0xe3, 0xc7, 0xc5, 0x50, 0x86, 0x39, 0xa7, 
-0xfe, 0xc0, 0xd5, 0xb7, 0x85, 0x26, 0x97, 0x40, 0x06, 0xf9, 0x41, 0xa9, 
-0x28, 0xab, 0x57, 0xbc, 0xfb, 0xee, 0xbb, 0xf4, 0x9b, 0x26, 0xa6, 0xab, 
-0xaa, 0x4b, 0x50, 0x8a, 0x35, 0xc3, 0x31, 0x7a, 0xcd, 0x5b, 0x07, 0xcb, 
-0xae, 0x5f, 0x33, 0x6f, 0xf2, 0x84, 0x09, 0xeb, 0xd6, 0xae, 0xdd, 0xb4, 
-0x7e, 0xfd, 0xf1, 0xdb, 0x6e, 0xc3, 0x6e, 0x0b, 0x73, 0x63, 0x03, 0x03, 
-0x27, 0x1c, 0x28, 0xe5, 0xa0, 0x45, 0x00, 0xc3, 0x5b, 0x04, 0x33, 0x4a, 
-0xe2, 0x32, 0xab, 0xe9, 0x81, 0x93, 0x51, 0x98, 0x8d, 0x60, 0x2e, 0x9b, 
-0xc9, 0x16, 0xc3, 0xa6, 0xc3, 0x62, 0xb2, 0xb6, 0x74, 0x94, 0x2d, 0xb8, 
-0x20, 0x35, 0x15, 0x8e, 0x98, 0x51, 0xb0, 0xe7, 0x6f, 0x21, 0x28, 0x35, 
-0x19, 0x7c, 0x09, 0x17, 0x54, 0x0b, 0x93, 0x0d, 0xca, 0x02, 0x15, 0x3c, 
-0x7f, 0x55, 0x93, 0xa0, 0xd4, 0xea, 0xd3, 0x35, 0xaf, 0xd7, 0xc2, 0x2d, 
-0x09, 0x35, 0xea, 0xb2, 0x57, 0x25, 0xc5, 0xc7, 0x53, 0x01, 0x04, 0xe7, 
-0x77, 0xbb, 0x16, 0x2d, 0xb0, 0x84, 0x10, 0x16, 0x0f, 0xca, 0xf9, 0x1f, 
-0x8d, 0x08, 0x03, 0x1a, 0x50, 0xa1, 0xa4, 0x15, 0xee, 0x3f, 0x0e, 0x18, 
-0x0b, 0x98, 0x01, 0xfd, 0xb0, 0x11, 0x61, 0x1a, 0x51, 0x69, 0xca, 0x12, 
-0xcc, 0xe6, 0x7a, 0x36, 0x82, 0x87, 0x0f, 0x3e, 0xf8, 0x60, 0xe3, 0xba, 
-0x9b, 0x0a, 0xdb, 0xb4, 0xa6, 0x48, 0x7b, 0x8c, 0x33, 0xb3, 0xf7, 0x15, 
-0xb7, 0x84, 0x6a, 0x49, 0xd9, 0xd2, 0x22, 0xe7, 0x8a, 0x57, 0x84, 0x3e, 
-0x2a, 0x04, 0x1e, 0x60, 0x63, 0xd4, 0xd6, 0x87, 0x7a, 0x2d, 0x2a, 0x6e, 
-0x31, 0xed, 0x86, 0x1a, 0x9d, 0x46, 0xc6, 0xc5, 0x25, 0x24, 0x38, 0x1c, 
-0x79, 0x19, 0xe9, 0xed, 0x9b, 0x17, 0xb4, 0x29, 0x68, 0x7c, 0xe1, 0x27, 
-0xbf, 0x6d, 0x41, 0x7e, 0x87, 0xe6, 0x4d, 0xf3, 0x6b, 0xe7, 0xa5, 0xc5, 
-0xc6, 0xd0, 0x7f, 0x9b, 0x9f, 0x94, 0x18, 0x47, 0x97, 0x4e, 0x9d, 0x30, 
-0x64, 0x49, 0x53, 0x56, 0xb3, 0x6d, 0x37, 0xcc, 0x76, 0x7d, 0x5f, 0x1f, 
-0x47, 0x20, 0x21, 0x35, 0x3b, 0xe8, 0x2b, 0x7b, 0xd3, 0x8d, 0x37, 0xae, 
-0x5c, 0xb2, 0x78, 0xea, 0xb8, 0xb1, 0x9d, 0xdb, 0xb4, 0xac, 0x91, 0xe2, 
-0x4c, 0x88, 0x89, 0x8d, 0x4f, 0x48, 0x2e, 0x1c, 0x31, 0x33, 0x64, 0x45, 
-0x26, 0xcb, 0x20, 0xa8, 0xb0, 0xe0, 0x15, 0x3a, 0xcb, 0xce, 0x28, 0xfe, 
-0x06, 0x78, 0xb4, 0x2d, 0xf9, 0xed, 0x88, 0xeb, 0x8f, 0xf5, 0x9d, 0xb6, 
-0xa4, 0x73, 0xd1, 0x88, 0xd6, 0x5d, 0xfb, 0x16, 0xb4, 0xef, 0x5e, 0xb7, 
-0x69, 0x87, 0xcc, 0xba, 0x4d, 0x53, 0x72, 0x1b, 0xa6, 0xe4, 0x34, 0x4c, 
-0xad, 0x5d, 0x90, 0xd1, 0xb0, 0x7d, 0x66, 0xa3, 0x0e, 0xd5, 0x9a, 0x14, 
-0xd2, 0x35, 0x18, 0x56, 0xb9, 0x61, 0xdd, 0x3a, 0x69, 0xca, 0x2a, 0xd2, 
-0x94, 0x32, 0xec, 0x46, 0xb8, 0x85, 0x4a, 0x79, 0xe8, 0x24, 0xda, 0xef, 
-0xc8, 0xad, 0xb7, 0xc6, 0xc7, 0xc6, 0x3a, 0x62, 0x12, 0x9d, 0xe9, 0x39, 
-0xc9, 0xd9, 0x0d, 0x9a, 0x74, 0x1d, 0x3a, 0x64, 0xc9, 0x56, 0x5a, 0x4f, 
-0x85, 0xbe, 0xc8, 0xe4, 0x45, 0x82, 0x72, 0xab, 0x57, 0x54, 0x65, 0x09, 
-0xca, 0xfd, 0x5b, 0x39, 0xaf, 0xff, 0xc9, 0xb9, 0xed, 0xfb, 0xac, 0x1d, 
-0xdf, 0xd4, 0xdd, 0xf9, 0x0f, 0x36, 0xb6, 0x56, 0x7b, 0x3f, 0xa7, 0xf8, 
-0x69, 0xe1, 0xfe, 0x3f, 0xb5, 0xbc, 0xee, 0x3e, 0x50, 0x41, 0x59, 0x79, 
-0x1e, 0x50, 0xd7, 0x34, 0x44, 0x0b, 0x8f, 0x64, 0x99, 0xca, 0x10, 0xda, 
-0xc4, 0x96, 0x71, 0xd3, 0x1a, 0x57, 0xef, 0xe0, 0x86, 0x53, 0xd7, 0x8e, 
-0xd8, 0xf1, 0x54, 0x87, 0x03, 0x9f, 0xe7, 0xee, 0x0c, 0xfd, 0x56, 0xf3, 
-0xc6, 0x06, 0x31, 0xe2, 0xac, 0x30, 0xfa, 0x2b, 0x3c, 0xa1, 0x02, 0x41, 
-0x1c, 0x01, 0xbd, 0x8a, 0xf8, 0x2b, 0x82, 0xb5, 0x3f, 0x0d, 0xdd, 0xf2, 
-0x28, 0x4f, 0x34, 0x79, 0xec, 0x58, 0x9e, 0x0e, 0x8d, 0x1c, 0x45, 0x1c, 
-0x35, 0x43, 0x1c, 0x82, 0x22, 0x50, 0x49, 0x01, 0x91, 0x48, 0x63, 0x1a, 
-0x86, 0x00, 0x58, 0x58, 0x28, 0x4d, 0x42, 0x86, 0x0c, 0xec, 0xcf, 0x5a, 
-0x75, 0x3d, 0x44, 0x56, 0x5d, 0x99, 0xed, 0x26, 0x58, 0xef, 0xa2, 0x52, 
-0xc7, 0xd1, 0x34, 0x0a, 0x93, 0x6f, 0xdb, 0x0b, 0x2a, 0xaa, 0x8e, 0x17, 
-0x2f, 0x58, 0x2b, 0x88, 0x82, 0x98, 0xde, 0xbc, 0x27, 0xda, 0x45, 0x49, 
-0x71, 0x31, 0x8a, 0x38, 0x16, 0x05, 0x4b, 0x6c, 0x44, 0x5a, 0xe8, 0xa1, 
-0x52, 0x27, 0x44, 0x76, 0xc2, 0x08, 0xbb, 0x71, 0x9d, 0xcb, 0xd0, 0xd7, 
-0x6b, 0xfa, 0x8a, 0x60, 0xad, 0x7c, 0x15, 0x1b, 0x47, 0xe3, 0x12, 0x51, 
-0x54, 0xf0, 0x6e, 0x8a, 0xae, 0x3d, 0x16, 0xe7, 0x4c, 0x4d, 0x8e, 0x73, 
-0x4c, 0x9d, 0x30, 0xe1, 0xb1, 0x73, 0xe7, 0x04, 0x1b, 0xd8, 0xa6, 0xb0, 
-0xb4, 0x88, 0xb3, 0x5c, 0x69, 0xe1, 0xc2, 0x31, 0x7c, 0x55, 0x58, 0x43, 
-0xee, 0x7c, 0xc5, 0x28, 0xc4, 0x35, 0x01, 0xf3, 0xdc, 0xb4, 0x6e, 0x1d, 
-0x96, 0x89, 0xa4, 0xda, 0xcd, 0x9a, 0x87, 0x47, 0x7f, 0x54, 0xeb, 0xce, 
-0x7a, 0x3f, 0xc8, 0x4e, 0xbe, 0xa2, 0x22, 0xfc, 0x24, 0x28, 0x50, 0x41, 
-0xe9, 0xff, 0xa2, 0xeb, 0x8f, 0x27, 0xd7, 0x6c, 0x42, 0x8c, 0x67, 0x4a, 
-0x5c, 0x4c, 0xf3, 0x86, 0xf5, 0xa7, 0x8e, 0x1f, 0xb7, 0x7b, 0xe7, 0x4e, 
-0xcc, 0xb8, 0x22, 0x50, 0xb1, 0x53, 0x2a, 0x9f, 0x46, 0x24, 0x00, 0x43, 
-0xb7, 0x3b, 0xe1, 0x8e, 0x28, 0xea, 0xd5, 0x8b, 0x95, 0x49, 0xce, 0xaa, 
-0x33, 0x75, 0xf7, 0x53, 0x55, 0x6c, 0x83, 0x0f, 0x7a, 0xce, 0x82, 0x2f, 
-0x5e, 0x3c, 0xf2, 0x8f, 0x50, 0x46, 0xc3, 0x52, 0xaf, 0x28, 0x75, 0x7a, 
-0x94, 0xfc, 0x65, 0xd0, 0xf2, 0x9d, 0x4d, 0xfb, 0x4e, 0xc0, 0x4e, 0xe5, 
-0xc0, 0xe7, 0x11, 0xe3, 0x58, 0xb7, 0x66, 0x0d, 0x0e, 0x0d, 0x1e, 0x5c, 
-0x80, 0x21, 0x1c, 0x43, 0xe9, 0x18, 0x21, 0xc7, 0x01, 0xec, 0x4f, 0x58, 
-0x2f, 0xd2, 0x31, 0x77, 0x16, 0xd5, 0x9c, 0x62, 0xfa, 0xce, 0xbc, 0xba, 
-0xe5, 0xa1, 0xf0, 0xd3, 0xad, 0x75, 0x50, 0x95, 0x65, 0x14, 0x76, 0x7c, 
-0xdb, 0x91, 0x80, 0x0a, 0x81, 0x47, 0xf6, 0x8e, 0x7f, 0xb6, 0xd9, 0xf5, 
-0xd9, 0x80, 0xd5, 0xb7, 0x27, 0xd7, 0x6a, 0x82, 0x18, 0x7d, 0xed, 0xca, 
-0x95, 0x52, 0x1b, 0x4b, 0x01, 0x43, 0x57, 0xbe, 0xed, 0xd3, 0x59, 0x68, 
-0x9d, 0xa9, 0x50, 0x71, 0xf2, 0xf8, 0xf1, 0x94, 0xa4, 0xa4, 0xea, 0x1d, 
-0x86, 0xf5, 0xb8, 0x2d, 0x2c, 0x1a, 0xcb, 0xfb, 0xd4, 0x92, 0x58, 0x33, 
-0x2b, 0x59, 0x6b, 0xdb, 0x91, 0x83, 0x8a, 0x1f, 0x58, 0xc7, 0x79, 0x82, 
-0xdb, 0xda, 0xf5, 0x1a, 0x42, 0x5b, 0xb7, 0x55, 0x2b, 0x56, 0x50, 0xf2, 
-0x07, 0x60, 0x88, 0x43, 0x43, 0x72, 0xc4, 0xc3, 0x9b, 0x63, 0x28, 0x54, 
-0x0c, 0x1d, 0x3c, 0x18, 0xda, 0xa8, 0xde, 0x76, 0xe0, 0xc8, 0x2d, 0x0f, 
-0x5f, 0xe0, 0x15, 0xe1, 0x67, 0x7a, 0x12, 0x76, 0x61, 0x62, 0x14, 0x51, 
-0x5e, 0xe1, 0x4e, 0x56, 0xc6, 0x3c, 0xd5, 0xb6, 0xe7, 0x10, 0x57, 0xb7, 
-0xf9, 0xe5, 0xcb, 0x25, 0xe9, 0x4f, 0xca, 0xda, 0x86, 0x3d, 0x30, 0x94, 
-0x5e, 0x71, 0xfb, 0xb1, 0x63, 0x5d, 0x3b, 0x76, 0x44, 0xcf, 0x8e, 0x4b, 
-0x48, 0x49, 0xab, 0xdf, 0xba, 0xcf, 0xf4, 0x15, 0x61, 0xaa, 0x6d, 0xfb, 
-0x8b, 0x0a, 0x6c, 0x32, 0xe1, 0xad, 0x57, 0x58, 0x62, 0x83, 0xd0, 0xc3, 
-0x36, 0x3d, 0x06, 0xa3, 0x63, 0xac, 0x5a, 0xbe, 0x1c, 0x1d, 0x03, 0xe5, 
-0x3b, 0x12, 0x38, 0x86, 0x6e, 0x83, 0xc2, 0x16, 0xbf, 0x73, 0xc7, 0x8e, 
-0xb1, 0xc3, 0x86, 0xe4, 0xd7, 0xcc, 0x73, 0x85, 0xc4, 0x56, 0xaf, 0xdd, 
-0x7b, 0xfe, 0x86, 0xb0, 0x08, 0x01, 0xf4, 0xa8, 0x54, 0xb8, 0xe1, 0x15, 
-0x44, 0x97, 0x96, 0xd6, 0xf8, 0xe0, 0x53, 0x64, 0xa2, 0x42, 0xb2, 0x38, 
-0x92, 0x6b, 0x35, 0x85, 0x63, 0xac, 0x5e, 0xb5, 0x0a, 0x51, 0x4a, 0xac, 
-0x52, 0x66, 0x8e, 0x11, 0x66, 0x16, 0x5b, 0x83, 0xbf, 0x02, 0xb7, 0x26, 
-0xc6, 0xa8, 0x92, 0xed, 0xdb, 0x1b, 0xd4, 0xac, 0x89, 0x4c, 0x95, 0xda, 
-0xa8, 0xc3, 0x80, 0xd5, 0xc7, 0x09, 0xe3, 0x0f, 0x17, 0x93, 0x94, 0x66, 
-0x7a, 0x52, 0xba, 0x87, 0x1d, 0xbd, 0x02, 0x54, 0x10, 0x49, 0x4b, 0xfc, 
-0x69, 0x98, 0xf9, 0xb6, 0xed, 0xbc, 0xd7, 0x81, 0x1b, 0xee, 0x4f, 0xae, 
-0x59, 0x80, 0x75, 0x72, 0xed, 0x0d, 0xd7, 0xeb, 0x1c, 0x23, 0x8c, 0x73, 
-0x33, 0xf4, 0x1c, 0x23, 0x2c, 0x6f, 0xe2, 0xc8, 0x83, 0x4f, 0xd2, 0xc9, 
-0x61, 0xd6, 0xf4, 0xe9, 0x59, 0x69, 0xa9, 0xb1, 0x09, 0xc9, 0x7d, 0x08, 
-0x92, 0x0d, 0x1f, 0x60, 0x98, 0x8c, 0xbc, 0x51, 0x54, 0x78, 0xc6, 0x06, 
-0x69, 0xe2, 0x83, 0x37, 0x3d, 0x98, 0x94, 0x97, 0x0f, 0x30, 0x08, 0x1a, 
-0xfd, 0xf4, 0xd3, 0x32, 0xa2, 0x54, 0xb8, 0xd6, 0x16, 0x31, 0x07, 0x7d, 
-0x00, 0x0c, 0xf8, 0x24, 0xfb, 0xe3, 0x89, 0x13, 0x27, 0x9a, 0x35, 0xc9, 
-0x87, 0x6c, 0x7a, 0x5c, 0xb2, 0x22, 0x5c, 0x80, 0x61, 0x62, 0x17, 0x51, 
-0x54, 0x78, 0xe5, 0x18, 0xc4, 0xe1, 0xba, 0x80, 0x91, 0xd3, 0x00, 0x51, 
-0x8a, 0x20, 0x39, 0x83, 0x8e, 0x11, 0xae, 0xc0, 0xc0, 0xa0, 0xac, 0x7b, 
-0xf4, 0x84, 0x63, 0x00, 0x0c, 0x0c, 0x0f, 0x2f, 0xbf, 0xf8, 0x62, 0x8f, 
-0x6e, 0xdd, 0x5c, 0x99, 0x46, 0xc3, 0x2f, 0x6d, 0xb2, 0x2b, 0xb4, 0x4a, 
-0x03, 0x5a, 0xfa, 0xfe, 0x3c, 0xa1, 0x82, 0x26, 0x8c, 0x3f, 0xfd, 0xe9, 
-0x4f, 0x8d, 0x59, 0x47, 0xa2, 0x57, 0x44, 0xac, 0x04, 0xa5, 0xf2, 0x37, 
-0x06, 0x6d, 0x7c, 0x20, 0x29, 0xbb, 0x41, 0x92, 0xc3, 0xb1, 0xce, 0xc5, 
-0x31, 0x5c, 0xe6, 0xda, 0x48, 0xf0, 0x7c, 0x9b, 0x13, 0xf1, 0x04, 0x18, 
-0x1f, 0x7f, 0xf2, 0xc9, 0xb4, 0x89, 0x13, 0x5d, 0x05, 0x25, 0xba, 0xf5, 
-0x0f, 0x17, 0x8e, 0xa1, 0x01, 0xc6, 0x0e, 0xaf, 0x40, 0xfb, 0x8e, 0x70, 
-0x54, 0xb8, 0x12, 0x9b, 0xf0, 0x7f, 0xaf, 0x3f, 0x93, 0x58, 0xad, 0x4e, 
-0x72, 0x7c, 0xdc, 0x05, 0x51, 0xca, 0x08, 0x8c, 0x70, 0xf5, 0x63, 0xe8, 
-0x1c, 0x83, 0xe0, 0x17, 0xd1, 0x31, 0x00, 0xc6, 0x6f, 0x7e, 0xfb, 0x5b, 
-0x8c, 0x10, 0x49, 0x09, 0x09, 0xad, 0x3b, 0xf7, 0x09, 0x37, 0x60, 0x58, 
-0xa1, 0x02, 0x14, 0x1c, 0x3e, 0x7c, 0xf8, 0x62, 0xff, 0x8a, 0x28, 0xaf, 
-0xd0, 0x03, 0x43, 0x06, 0xae, 0x3b, 0xe3, 0xcc, 0xaa, 0x9b, 0x18, 0xe3, 
-0xb8, 0xf6, 0x82, 0x55, 0xca, 0xec, 0xf9, 0x0e, 0x33, 0x7b, 0x94, 0x38, 
-0xe6, 0x75, 0x8e, 0x21, 0xa5, 0x6e, 0xe0, 0x18, 0xd2, 0xd5, 0x64, 0xcd, 
-0xf5, 0xd7, 0x27, 0x3a, 0x1c, 0xed, 0xfb, 0x8e, 0x0c, 0xa3, 0x0c, 0xd5, 
-0x32, 0xdd, 0x22, 0xdd, 0xfa, 0xb6, 0x45, 0x82, 0x42, 0xba, 0x8a, 0x40, 
-0x1b, 0x94, 0x41, 0xeb, 0x70, 0x29, 0xdf, 0x1b, 0xee, 0x4b, 0xa9, 0xd5, 
-0x94, 0xa5, 0x58, 0xba, 0xf8, 0xca, 0xdf, 0xfc, 0xc6, 0x55, 0x1a, 0x9d, 
-0xbd, 0xd3, 0x50, 0xd5, 0x33, 0xb4, 0xa2, 0x3c, 0xbc, 0xce, 0xd6, 0x50, 
-0xf9, 0x46, 0xd5, 0x80, 0xe2, 0xd9, 0x31, 0xda, 0x2e, 0x5c, 0x30, 0xdf, 
-0xa5, 0x63, 0x8c, 0x9c, 0x11, 0x9a, 0xc0, 0x70, 0x79, 0xf1, 0x62, 0x2e, 
-0xfc, 0x94, 0x96, 0xf9, 0xd0, 0x08, 0xdd, 0x8b, 0x5e, 0x11, 0x45, 0x85, 
-0x42, 0x08, 0xaf, 0xbf, 0x7d, 0xbf, 0x51, 0x2c, 0xdd, 0x92, 0x45, 0x0b, 
-0xa5, 0x93, 0x06, 0x46, 0xfd, 0xf0, 0xee, 0x19, 0x60, 0x09, 0x0c, 0xb6, 
-0x03, 0x80, 0xf1, 0xeb, 0x5f, 0xfd, 0x6a, 0xca, 0xc4, 0x09, 0xac, 0x46, 
-0xb7, 0x49, 0x57, 0x86, 0x94, 0x28, 0x25, 0x4a, 0xb6, 0xeb, 0xff, 0x98, 
-0x0b, 0x3f, 0xa5, 0x3b, 0x60, 0x14, 0x15, 0x5e, 0x6d, 0x50, 0x96, 0x27, 
-0x10, 0x2b, 0xd5, 0xa1, 0xff, 0x58, 0x56, 0x6f, 0xe3, 0xfa, 0x75, 0x52, 
-0x2b, 0x44, 0x4a, 0x7a, 0x8a, 0x76, 0xe1, 0x75, 0xf7, 0x0d, 0xd1, 0x13, 
-0x74, 0x07, 0x1f, 0x0f, 0x2b, 0x55, 0x03, 0x01, 0xc6, 0x4f, 0x3f, 0xf9, 
-0x64, 0xc8, 0xc0, 0x01, 0x2e, 0x73, 0xed, 0xa5, 0x2b, 0x71, 0x7d, 0xfa, 
-0xb7, 0xa4, 0x95, 0x7a, 0x55, 0x59, 0x33, 0x94, 0x09, 0x15, 0xbf, 0xfe, 
-0xf5, 0xaf, 0xa3, 0x7a, 0x85, 0xad, 0xd8, 0x7d, 0x72, 0xf9, 0x93, 0xb2, 
-0xea, 0x66, 0x24, 0x26, 0xdc, 0x71, 0xfc, 0x38, 0x94, 0x21, 0x01, 0xe7, 
-0x92, 0xb8, 0x17, 0xa2, 0x44, 0x6f, 0x67, 0xda, 0x06, 0xcf, 0x37, 0xc0, 
-0x10, 0x8e, 0xf1, 0xee, 0xdb, 0x6f, 0x77, 0x29, 0x2c, 0x74, 0x01, 0x63, 
-0xc6, 0xb5, 0x94, 0x3c, 0xad, 0x54, 0x12, 0xb7, 0xf5, 0xfa, 0xf4, 0x19, 
-0x96, 0x61, 0x14, 0xee, 0x23, 0x3e, 0x4a, 0xb5, 0x6d, 0x3e, 0x45, 0x6d, 
-0x50, 0xee, 0xde, 0xf1, 0xc0, 0xb5, 0x77, 0x39, 0xe2, 0x93, 0xf2, 0xeb, 
-0xd7, 0x47, 0xfa, 0x14, 0xed, 0x42, 0x82, 0x6a, 0xc3, 0x52, 0xe7, 0x56, 
-0x98, 0xb1, 0x04, 0x06, 0x86, 0x87, 0x17, 0x5f, 0x78, 0xa1, 0x79, 0xbe, 
-0xcb, 0xc1, 0xd7, 0x77, 0xf9, 0x1e, 0x9c, 0x3c, 0xa1, 0x02, 0x8c, 0x0b, 
-0xe2, 0x93, 0x5b, 0x5e, 0xa1, 0xb4, 0xed, 0x28, 0xaf, 0xb0, 0xbb, 0xd9, 
-0xb4, 0xdb, 0xfd, 0x7f, 0x35, 0x07, 0xce, 0x75, 0x26, 0x26, 0x50, 0x42, 
-0x8f, 0x2a, 0x21, 0x6c, 0x9c, 0x11, 0xd2, 0xd3, 0xd5, 0x9c, 0xdb, 0xcd, 
-0xe3, 0x23, 0x49, 0x3e, 0xf8, 0xc0, 0x03, 0xb5, 0x73, 0xb2, 0x63, 0x62, 
-0x13, 0x07, 0xde, 0x74, 0x2a, 0x74, 0x50, 0xa1, 0xb4, 0x6d, 0x8b, 0xfe, 
-0x15, 0x51, 0x54, 0xd8, 0x05, 0x43, 0xa9, 0xda, 0xbd, 0xeb, 0xf3, 0x46, 
-0xb3, 0x8a, 0x13, 0x1c, 0x31, 0x4b, 0x17, 0x2f, 0xa6, 0x50, 0x27, 0x3a, 
-0x77, 0xe4, 0x74, 0xaf, 0x34, 0x78, 0xbe, 0x79, 0x76, 0x80, 0x81, 0x49, 
-0x6a, 0xdf, 0x9e, 0x3d, 0xa9, 0xf1, 0x71, 0x69, 0x75, 0x5b, 0x84, 0x94, 
-0xe6, 0x5d, 0xf6, 0xd5, 0x47, 0xf5, 0x8a, 0x40, 0xb6, 0xb4, 0xcc, 0xe2, 
-0x6f, 0x1a, 0x4c, 0x5d, 0x97, 0x18, 0x1b, 0x77, 0xcd, 0xca, 0x95, 0xd2, 
-0xbd, 0x32, 0x72, 0x50, 0x61, 0xf0, 0x63, 0x48, 0x0b, 0x0b, 0x71, 0x62, 
-0x2c, 0x5b, 0xbc, 0x18, 0xba, 0xea, 0x32, 0x66, 0x4e, 0xa8, 0x02, 0xc3, 
-0xbe, 0x0d, 0x2a, 0x32, 0x63, 0x66, 0xbd, 0x62, 0xa6, 0xee, 0xd8, 0xab, 
-0x93, 0xe3, 0xe3, 0x29, 0xfc, 0x2c, 0xdd, 0x2b, 0x45, 0xe1, 0x0e, 0x6f, 
-0xbd, 0x42, 0x57, 0xca, 0x79, 0x52, 0x69, 0x77, 0x24, 0x26, 0x29, 0x89, 
-0x07, 0xa1, 0x16, 0xc4, 0xc8, 0x61, 0xc3, 0x5c, 0x9a, 0xf7, 0xcc, 0xeb, 
-0x42, 0xd2, 0x24, 0x15, 0x45, 0x85, 0x57, 0xba, 0xf7, 0x70, 0x42, 0x7a, 
-0xf1, 0xbf, 0x6a, 0x8f, 0x5c, 0x96, 0x92, 0x90, 0xb0, 0x69, 0xc3, 0x06, 
-0x41, 0x45, 0x44, 0xf1, 0x0a, 0x3d, 0x82, 0x50, 0x15, 0x8f, 0x42, 0x8e, 
-0x42, 0x31, 0x7d, 0xe3, 0xf5, 0xd7, 0x5b, 0x37, 0x6f, 0x46, 0x26, 0xdf, 
-0x80, 0x6b, 0x8e, 0x04, 0xb2, 0xc2, 0x95, 0x73, 0xad, 0x9d, 0x38, 0xa8, 
-0x68, 0x74, 0xa0, 0xbb, 0x77, 0xd3, 0x68, 0xc7, 0x9f, 0x6b, 0x0d, 0xbe, 
-0x3c, 0xd5, 0xe9, 0xdc, 0xbe, 0x6d, 0x9b, 0x8e, 0x8a, 0x48, 0xa8, 0x91, 
-0x63, 0x69, 0x92, 0x92, 0x1e, 0xaa, 0xb8, 0x35, 0x01, 0xc6, 0x99, 0xd3, 
-0xa7, 0xab, 0xa7, 0x26, 0x27, 0x52, 0x94, 0x76, 0x77, 0xa8, 0xa5, 0x28, 
-0x45, 0xe3, 0xa0, 0x02, 0xd9, 0x8d, 0x5a, 0x6f, 0xff, 0x55, 0x62, 0x7a, 
-0x4e, 0x4e, 0x66, 0xc6, 0xe9, 0x7b, 0xee, 0x89, 0x4c, 0x5e, 0x61, 0x0e, 
-0x94, 0x52, 0x9d, 0x54, 0xd1, 0xbc, 0x37, 0xdc, 0x74, 0x13, 0x04, 0xd6, 
-0xf5, 0x92, 0x50, 0x2b, 0x3a, 0x18, 0xe5, 0x15, 0x81, 0xa0, 0xa2, 0x68, 
-0xc1, 0xfa, 0xc4, 0xb8, 0xb8, 0x15, 0x4b, 0x96, 0x20, 0x49, 0x47, 0xa6, 
-0x5e, 0x61, 0xe0, 0x18, 0xd2, 0x75, 0x1b, 0xcd, 0x1b, 0x8e, 0x81, 0x51, 
-0xee, 0xa3, 0x0f, 0x3f, 0x2c, 0x6c, 0xdf, 0xd6, 0xe1, 0xcc, 0x0c, 0xb1, 
-0xea, 0xe5, 0x51, 0xbd, 0x22, 0x00, 0x54, 0x9c, 0xef, 0x30, 0x68, 0x52, 
-0x72, 0x5c, 0xcc, 0x53, 0x4f, 0x3e, 0x49, 0x29, 0x4e, 0x50, 0x11, 0x69, 
-0x36, 0x28, 0x83, 0x2f, 0x5c, 0xd7, 0xbc, 0x01, 0x86, 0x68, 0xde, 0x04, 
-0xd5, 0x92, 0xc6, 0x38, 0xe0, 0xf2, 0x75, 0x01, 0xac, 0xb3, 0xcf, 0x16, 
-0xf3, 0x40, 0xef, 0x15, 0xe5, 0x15, 0x7e, 0xaf, 0x60, 0xfa, 0xb6, 0x6f, 
-0x6a, 0x36, 0xed, 0x98, 0x1e, 0x1f, 0x8b, 0xa3, 0x07, 0x54, 0x40, 0x01, 
-0x11, 0x8e, 0x0a, 0xa5, 0x7c, 0x4b, 0x8d, 0x5a, 0x42, 0x60, 0xd0, 0xbc, 
-0x09, 0x2a, 0x6d, 0xd1, 0xa4, 0x49, 0xad, 0x06, 0x4d, 0x73, 0x4b, 0x42, 
-0xa7, 0x00, 0xa1, 0x4d, 0x54, 0x44, 0x60, 0xe5, 0x1b, 0xaf, 0x68, 0x69, 
-0xb4, 0xe3, 0x4f, 0x29, 0xb9, 0x8d, 0xea, 0xe7, 0x66, 0x93, 0xe6, 0x4f, 
-0xf4, 0x18, 0xa6, 0xfa, 0x88, 0xf2, 0xe2, 0x79, 0xe8, 0x18, 0x86, 0xad, 
-0x16, 0x60, 0x88, 0x07, 0x83, 0xcd, 0x62, 0xcc, 0xf0, 0xe1, 0x31, 0x8e, 
-0xb8, 0xf6, 0xfb, 0xa8, 0xf2, 0x5f, 0xe1, 0xbb, 0xbe, 0x7f, 0x77, 0x8c, 
-0xa2, 0xc2, 0xef, 0x57, 0xd5, 0xaa, 0xf8, 0x7f, 0x93, 0xaa, 0xd7, 0xee, 
-0xd8, 0xba, 0xe5, 0x87, 0x1f, 0x7e, 0x48, 0xfe, 0x89, 0xf8, 0xb6, 0x25, 
-0x8d, 0x3b, 0x72, 0xfc, 0x15, 0x66, 0x6c, 0xe8, 0x95, 0x6a, 0xf1, 0x60, 
-0x60, 0x8f, 0xa2, 0x36, 0xa9, 0x33, 0x21, 0x71, 0xec, 0xa6, 0x7b, 0xfc, 
-0x5e, 0xea, 0x8a, 0xbe, 0xd0, 0x8d, 0x0d, 0xaa, 0x4c, 0x3d, 0xa8, 0xb0, 
-0xaf, 0xbe, 0xec, 0xdf, 0xa2, 0x8f, 0xbc, 0xe5, 0xc1, 0xc4, 0xb4, 0xec, 
-0xc1, 0x45, 0x7d, 0x3f, 0xf9, 0xe4, 0x13, 0x78, 0x29, 0xaf, 0x1f, 0x99, 
-0x21, 0x42, 0xe2, 0xa0, 0x3c, 0x44, 0xd7, 0xea, 0x91, 0x20, 0xa2, 0x5d, 
-0x1c, 0x3b, 0x72, 0x24, 0x3d, 0x29, 0x79, 0xe0, 0xa2, 0xcd, 0xfe, 0xad, 
-0x73, 0x25, 0x5c, 0x65, 0x87, 0x57, 0x44, 0x51, 0x61, 0x7e, 0x31, 0x28, 
-0x15, 0x7d, 0x57, 0x1d, 0x8e, 0x4f, 0x4a, 0xbf, 0x64, 0xd2, 0x04, 0x7a, 
-0x18, 0x10, 0xe6, 0x10, 0x45, 0x85, 0x6e, 0x8f, 0x92, 0x1e, 0x93, 0x62, 
-0xa5, 0xfd, 0xf1, 0xcb, 0x2f, 0xd7, 0x48, 0x4f, 0xef, 0x30, 0x7c, 0x66, 
-0x25, 0xd0, 0x77, 0xf9, 0x49, 0x50, 0x51, 0x54, 0x98, 0x5f, 0x27, 0xfe, 
-0xbb, 0x16, 0x97, 0xac, 0x75, 0xc4, 0xc4, 0x2d, 0x5b, 0xbc, 0x88, 0xb6, 
-0xc5, 0x94, 0xc3, 0x89, 0xa8, 0x98, 0x59, 0xcf, 0x99, 0x18, 0xc2, 0x2e, 
-0xc4, 0xdb, 0x8d, 0x54, 0x89, 0x75, 0xae, 0x56, 0xf5, 0x6a, 0x79, 0x05, 
-0x1d, 0xa2, 0xa8, 0x08, 0x11, 0xbd, 0xca, 0xbf, 0xbd, 0x64, 0xcb, 0x7f, 
-0x51, 0x2a, 0x6a, 0xb4, 0x1b, 0x84, 0xcd, 0x91, 0x8a, 0xf6, 0x38, 0x2b, 
-0xf0, 0x58, 0x49, 0x3a, 0x5e, 0x24, 0xe4, 0x57, 0x78, 0x4d, 0x4e, 0x52, 
-0xa8, 0x10, 0x4b, 0xd4, 0x67, 0xff, 0xf7, 0x7f, 0x35, 0xab, 0x67, 0xa6, 
-0xd5, 0x69, 0x11, 0x3e, 0xa8, 0x38, 0x7a, 0xf4, 0x68, 0x94, 0x57, 0x98, 
-0x5f, 0xe7, 0xa8, 0x2d, 0x0f, 0xc5, 0xa5, 0x65, 0xf7, 0xe9, 0xda, 0xf9, 
-0x8d, 0x37, 0xde, 0xa0, 0xad, 0x3d, 0x01, 0x0e, 0x04, 0x41, 0x21, 0x30, 
-0x80, 0x8a, 0x88, 0x0a, 0xf7, 0xf0, 0x60, 0x89, 0x12, 0xfb, 0x2c, 0xbc, 
-0xe2, 0xbd, 0x77, 0xdf, 0xcd, 0xc9, 0x48, 0xaf, 0x5d, 0x38, 0x34, 0x0c, 
-0x51, 0x11, 0x7e, 0xdd, 0x22, 0x03, 0x79, 0x49, 0x43, 0xd7, 0xdc, 0x8e, 
-0x4a, 0xb6, 0x68, 0xfe, 0xdc, 0x8f, 0x3f, 0xfe, 0x18, 0xb3, 0xac, 0xb8, 
-0xf0, 0x40, 0x45, 0xa4, 0xb5, 0x96, 0x74, 0x67, 0x83, 0x12, 0xe3, 0xac, 
-0x48, 0x50, 0xcf, 0x3d, 0xfb, 0x4c, 0x56, 0x5a, 0x5a, 0x87, 0x31, 0x0b, 
-0x02, 0x59, 0xf0, 0x0a, 0xbd, 0xd6, 0xab, 0xb6, 0xad, 0x78, 0x45, 0x14, 
-0x15, 0xfa, 0x8b, 0x19, 0xb4, 0xea, 0x00, 0x4b, 0x77, 0xcd, 0x8a, 0xe5, 
-0x04, 0xd8, 0x4b, 0x4b, 0x24, 0x29, 0xf3, 0x11, 0x45, 0x85, 0x6e, 0x99, 
-0x65, 0x9b, 0x80, 0x85, 0xde, 0x79, 0xf2, 0x64, 0x46, 0x72, 0xf2, 0x80, 
-0xf9, 0x37, 0x55, 0x28, 0x65, 0xfb, 0x2b, 0x1b, 0xbb, 0x26, 0x69, 0x1f, 
-0x15, 0x61, 0xd9, 0x2d, 0xd2, 0xdf, 0xf7, 0x74, 0xbe, 0xff, 0xf2, 0x3d, 
-0x2c, 0xdd, 0xf5, 0xd7, 0x5e, 0xc3, 0xb2, 0x50, 0xfc, 0x46, 0x5c, 0x78, 
-0x51, 0x54, 0x98, 0x53, 0xba, 0x59, 0x99, 0xc1, 0x45, 0x45, 0xb1, 0x8e, 
-0xb8, 0x09, 0xc5, 0x0f, 0xf9, 0xbb, 0xda, 0x15, 0xae, 0xa3, 0xda, 0x44, 
-0x05, 0x2f, 0x3e, 0xca, 0x2b, 0xb4, 0x97, 0x7a, 0xbe, 0xef, 0xe2, 0xed, 
-0x2c, 0xdd, 0x86, 0x9b, 0xd6, 0xb2, 0x2c, 0x98, 0x65, 0x71, 0xe1, 0x45, 
-0x48, 0x8d, 0x0f, 0x3b, 0x9e, 0x0a, 0xd1, 0x28, 0xa4, 0xfc, 0x07, 0x71, 
-0x50, 0xf4, 0x52, 0xeb, 0x71, 0xc9, 0xf2, 0x66, 0xfb, 0xfe, 0x11, 0x45, 
-0x45, 0x85, 0xe3, 0x3b, 0x10, 0x8e, 0xe9, 0xf3, 0xb5, 0xe7, 0x7b, 0x5c, 
-0xbe, 0x19, 0x54, 0xdc, 0xb2, 0x69, 0xa3, 0x98, 0x65, 0xa3, 0xa8, 0x30, 
-0x94, 0x8a, 0x92, 0x70, 0x8f, 0xfd, 0x7b, 0xf6, 0x64, 0xa6, 0xa5, 0x24, 
-0x66, 0xd5, 0x0b, 0xb1, 0xee, 0x61, 0x51, 0x5e, 0xe1, 0xd7, 0x06, 0x76, 
-0xbe, 0x70, 0xf6, 0x3a, 0x96, 0xae, 0xa4, 0x78, 0x9b, 0x98, 0x65, 0x71, 
-0xe1, 0xb1, 0x35, 0x86, 0x7d, 0x95, 0x34, 0x77, 0x8c, 0xc2, 0x2c, 0x38, 
-0xb1, 0x20, 0x1b, 0xd6, 0xae, 0x4d, 0x4e, 0x8c, 0x8f, 0x4b, 0xca, 0x18, 
-0xba, 0xe1, 0x3e, 0xbf, 0x16, 0xb9, 0xf2, 0x36, 0x56, 0x0d, 0x15, 0xef, 
-0xbd, 0xf7, 0x1e, 0x42, 0xb2, 0xb1, 0x52, 0xbf, 0x68, 0xdb, 0x51, 0x09, 
-0xaa, 0xec, 0x7b, 0x3d, 0xdf, 0xf6, 0x92, 0xd5, 0x2c, 0xdd, 0xde, 0xdd, 
-0xbb, 0x88, 0x96, 0x35, 0xa3, 0x22, 0xa2, 0xe2, 0xa0, 0xcc, 0x90, 0x80, 
-0x73, 0x5e, 0xb5, 0x70, 0x61, 0x02, 0xed, 0xeb, 0xeb, 0x34, 0x1f, 0x7e, 
-0xcb, 0xc3, 0x4d, 0xf7, 0xfe, 0x3d, 0x0c, 0x51, 0x81, 0xc2, 0x14, 0x45, 
-0x85, 0x01, 0x15, 0x4d, 0xc7, 0x2f, 0x07, 0x15, 0xb7, 0x1e, 0x3c, 0x08, 
-0x2a, 0x3e, 0xfb, 0xec, 0x33, 0x71, 0x6c, 0x47, 0x20, 0xaf, 0x30, 0x43, 
-0x02, 0xef, 0xcd, 0xd4, 0x09, 0xe3, 0xd1, 0x25, 0x0a, 0x07, 0x8c, 0x09, 
-0x31, 0xc1, 0xc9, 0xaa, 0x2f, 0x9e, 0x5b, 0x5e, 0x11, 0x45, 0x85, 0x69, 
-0xab, 0x3b, 0x5f, 0x7f, 0xd8, 0x15, 0xa0, 0xe2, 0xb6, 0xa3, 0x47, 0x21, 
-0x02, 0x1d, 0x15, 0x61, 0x5f, 0x51, 0x53, 0x0f, 0x76, 0x32, 0x40, 0x82, 
-0xad, 0xe1, 0xc4, 0xf1, 0xe3, 0x8d, 0x6b, 0xe5, 0xb9, 0xaa, 0x7b, 0x8c, 
-0x5f, 0x10, 0xaa, 0x90, 0xb0, 0x69, 0x99, 0x8d, 0xa2, 0xc2, 0x8c, 0x8a, 
-0x5a, 0x03, 0xe7, 0xf0, 0xee, 0x4f, 0x9e, 0x38, 0x11, 0x99, 0xa8, 0x30, 
-0x37, 0xce, 0x7b, 0xed, 0xc7, 0xaf, 0x4e, 0x1e, 0x3b, 0x86, 0x06, 0xc4, 
-0x24, 0xb2, 0xf7, 0xbf, 0x72, 0x6b, 0xb3, 0xfd, 0x5f, 0x85, 0x98, 0xd4, 
-0xe4, 0xa6, 0x26, 0xb9, 0xf0, 0x0a, 0x71, 0x49, 0x95, 0x46, 0x92, 0xa3, 
-0x57, 0x44, 0x51, 0x61, 0xc1, 0x2b, 0x46, 0x2c, 0x12, 0x09, 0x2a, 0x02, 
-0x51, 0x61, 0x80, 0xc4, 0x87, 0x1f, 0x7c, 0xb0, 0xfe, 0xc6, 0x1b, 0xeb, 
-0xe5, 0xe5, 0xb2, 0x20, 0x39, 0x5d, 0xc7, 0x8d, 0x2c, 0x7e, 0x22, 0x94, 
-0x8c, 0xb0, 0x96, 0xe6, 0x47, 0x93, 0xb6, 0x6d, 0x8d, 0x0a, 0x4c, 0xf2, 
-0x98, 0x20, 0x75, 0x9f, 0x5f, 0x08, 0xef, 0x04, 0x3e, 0xdb, 0x61, 0xcd, 
-0xc6, 0x90, 0xf3, 0xcd, 0xa7, 0x5e, 0xcf, 0x6a, 0x6c, 0xdd, 0x7c, 0xb3, 
-0x01, 0x15, 0xe1, 0x5d, 0xa9, 0xdf, 0x5c, 0xd1, 0xe3, 0xb6, 0x63, 0xc7, 
-0x2e, 0xd4, 0x7d, 0x72, 0x38, 0x73, 0xf2, 0x87, 0x5c, 0x77, 0xb4, 0xf9, 
-0x81, 0xaf, 0xc3, 0x81, 0x30, 0xa2, 0xa8, 0xf0, 0xeb, 0x2d, 0x9e, 0x6f, 
-0x3f, 0x77, 0x0b, 0x4b, 0xb7, 0xfa, 0x9a, 0x55, 0x96, 0xa8, 0x08, 0x63, 
-0x1b, 0x94, 0x30, 0x0a, 0x09, 0x73, 0x22, 0xa0, 0xa3, 0xb0, 0x6d, 0x5b, 
-0xd6, 0x61, 0xe0, 0xb2, 0x3d, 0x2d, 0x0f, 0x86, 0x4e, 0x5a, 0xb6, 0xd7, 
-0x6d, 0xd1, 0x0a, 0x15, 0x84, 0xba, 0x19, 0x25, 0xa8, 0x28, 0xaf, 0x30, 
-0x80, 0xa7, 0xc3, 0x94, 0x15, 0x2c, 0x1d, 0x45, 0x97, 0x61, 0xa1, 0x11, 
-0x65, 0x83, 0x32, 0x24, 0xa0, 0xb6, 0x6a, 0xde, 0x2c, 0x2e, 0x35, 0xa7, 
-0xdb, 0xe1, 0xbf, 0xf9, 0xb5, 0xb9, 0x54, 0x9e, 0x47, 0xc2, 0x33, 0x30, 
-0xa2, 0xbc, 0xc2, 0xbf, 0xd7, 0xd9, 0xb2, 0x68, 0x7c, 0xa3, 0xbc, 0x1a, 
-0xb7, 0x1e, 0x3a, 0x64, 0xf0, 0xe2, 0x85, 0xbd, 0x0d, 0x4a, 0x18, 0x85, 
-0xe4, 0xd9, 0xa1, 0x70, 0xb6, 0x68, 0x92, 0x9f, 0x98, 0xd5, 0xb0, 0xf0, 
-0xd6, 0x28, 0x2a, 0x04, 0x49, 0x5e, 0xd9, 0x50, 0x58, 0x9f, 0xd0, 0x69, 
-0xf4, 0x9c, 0x6a, 0x09, 0x8e, 0x87, 0xce, 0x9e, 0x8d, 0x58, 0x54, 0x10, 
-0xd3, 0x41, 0x08, 0x7d, 0xd3, 0x86, 0x0d, 0x92, 0x6a, 0x35, 0x6f, 0x73, 
-0x30, 0xd4, 0xfc, 0x74, 0x51, 0x5e, 0x51, 0x1e, 0x00, 0xee, 0x31, 0x6d, 
-0x19, 0x89, 0x78, 0xf7, 0x9e, 0x3e, 0x1d, 0x69, 0x71, 0x50, 0xe4, 0x54, 
-0xa9, 0x0a, 0xe4, 0x94, 0x71, 0xc8, 0xaf, 0x57, 0x37, 0xa5, 0x7e, 0xbb, 
-0xfc, 0xbd, 0x61, 0xa1, 0x64, 0xbb, 0xf7, 0xe2, 0xb9, 0xb5, 0x41, 0xb1, 
-0x29, 0x46, 0x6d, 0x50, 0x3f, 0x00, 0xec, 0x7c, 0xd1, 0xbc, 0xb5, 0xe2, 
-0xaf, 0x88, 0xb4, 0x98, 0x59, 0x41, 0x05, 0x31, 0xf3, 0xc4, 0x08, 0xbf, 
-0xfd, 0xd6, 0x5b, 0x0d, 0x6b, 0xd5, 0xaa, 0xd1, 0xba, 0x4f, 0xde, 0xce, 
-0x7f, 0x95, 0xc7, 0xd6, 0x53, 0x69, 0x63, 0x6a, 0x84, 0x4e, 0xb1, 0x2f, 
-0x5e, 0xb1, 0xa0, 0x02, 0x2f, 0xc5, 0xc5, 0x2e, 0xf4, 0xe2, 0xaf, 0x40, 
-0xdb, 0x8e, 0xa2, 0x42, 0x8f, 0x24, 0x1f, 0x78, 0xe5, 0x56, 0xf1, 0x57, 
-0xa8, 0xfc, 0x0a, 0x3d, 0x92, 0x3c, 0x5c, 0x6d, 0x50, 0x4a, 0xd5, 0x96, 
-0xda, 0xe3, 0xaf, 0xbc, 0xfc, 0x72, 0xbd, 0xbc, 0xbc, 0xfc, 0x5e, 0x63, 
-0x93, 0xb6, 0x7d, 0x5f, 0x69, 0x14, 0x5c, 0x1e, 0x82, 0xba, 0x1d, 0x54, 
-0x10, 0xec, 0x15, 0x45, 0x85, 0xe1, 0xad, 0x0f, 0xbf, 0x90, 0xa1, 0x3a, 
-0xff, 0xb2, 0xd9, 0x9f, 0x7c, 0xfc, 0x71, 0xe4, 0xe4, 0xe2, 0xa9, 0x32, 
-0x05, 0x52, 0xd2, 0xe6, 0xb9, 0x67, 0x9f, 0xad, 0x93, 0x93, 0xdd, 0x3e, 
-0x84, 0x4a, 0xda, 0xd8, 0x84, 0x50, 0x14, 0x15, 0xfe, 0x6d, 0x72, 0x8d, 
-0x4b, 0xfe, 0x92, 0x5e, 0xaf, 0x25, 0x61, 0xa1, 0xfb, 0x76, 0xef, 0x96, 
-0x30, 0x63, 0xc9, 0xdb, 0x0e, 0xef, 0x1a, 0x1f, 0xca, 0x53, 0x81, 0xaa, 
-0x4d, 0x46, 0xd1, 0xfd, 0xf7, 0xdd, 0x47, 0x97, 0x82, 0x9e, 0xd3, 0x43, 
-0xad, 0x10, 0xbf, 0x57, 0x6c, 0xb8, 0xb1, 0xcc, 0x96, 0x91, 0xa0, 0xa2, 
-0xbc, 0xc2, 0x12, 0x39, 0xfd, 0x6f, 0x38, 0x91, 0x98, 0x5a, 0xad, 0x41, 
-0xcd, 0xdc, 0x5f, 0xfe, 0xe2, 0x17, 0x52, 0xe3, 0x23, 0xec, 0x2b, 0xdf, 
-0x28, 0x54, 0x48, 0xb3, 0xaf, 0x5d, 0x3b, 0x77, 0xa6, 0x25, 0x26, 0x0c, 
-0x59, 0xb1, 0xcb, 0xbf, 0x9d, 0xa5, 0xea, 0x5e, 0x65, 0xe2, 0x15, 0xc4, 
-0x8c, 0x1b, 0xf5, 0x8a, 0x28, 0x2a, 0x2c, 0xdf, 0x5f, 0xdb, 0x92, 0xdf, 
-0x65, 0x34, 0xee, 0x98, 0x1c, 0xe3, 0xf8, 0xe0, 0x83, 0x0f, 0x22, 0xa4, 
-0x1e, 0x94, 0x72, 0x56, 0x80, 0x0a, 0x22, 0x64, 0x97, 0x5e, 0x79, 0x25, 
-0xf4, 0x33, 0x6e, 0x6b, 0xe8, 0x24, 0x64, 0x7b, 0xe5, 0x12, 0x72, 0x82, 
-0x4d, 0x54, 0x90, 0x84, 0x69, 0xd2, 0xb6, 0xcb, 0x36, 0xee, 0xb6, 0x79, 
-0xbf, 0x30, 0x3a, 0x2d, 0x7f, 0xe7, 0xe7, 0xd5, 0xdb, 0xf4, 0x4f, 0x72, 
-0xf5, 0xaf, 0x78, 0x42, 0xd5, 0x0e, 0x8c, 0x04, 0x09, 0x0a, 0x17, 0x9e, 
-0xa0, 0x62, 0xec, 0xc8, 0x91, 0xd0, 0x4f, 0xc7, 0xbd, 0x7f, 0xa8, 0xba, 
-0xbb, 0xbe, 0x7f, 0xf4, 0x66, 0x1f, 0x15, 0xa4, 0xd7, 0x94, 0xb5, 0xcc, 
-0x46, 0x3a, 0x2a, 0x32, 0x8a, 0xbf, 0x69, 0x3c, 0x70, 0x46, 0x52, 0x7c, 
-0xfc, 0xf1, 0xdb, 0x6f, 0x83, 0xc3, 0x46, 0x42, 0x9d, 0x59, 0xc5, 0x2b, 
-0x5c, 0x15, 0x01, 0x3f, 0xfb, 0xac, 0x47, 0xd7, 0x2e, 0x8e, 0xe4, 0xac, 
-0xd6, 0xfb, 0xbe, 0x88, 0xa2, 0xe2, 0x07, 0x68, 0x6c, 0x89, 0x74, 0x54, 
-0x40, 0x0a, 0x3d, 0x17, 0x6c, 0x74, 0x26, 0x38, 0x89, 0xa3, 0xc6, 0x0c, 
-0x15, 0x09, 0x95, 0xfa, 0x41, 0x85, 0xf4, 0xf8, 0xc2, 0x2c, 0x4b, 0x97, 
-0xd4, 0xe6, 0x8d, 0x1a, 0x64, 0xb7, 0xec, 0xdb, 0x60, 0x77, 0x28, 0xa7, 
-0x52, 0x78, 0x8b, 0x24, 0x17, 0x7f, 0x85, 0xb5, 0x5e, 0x61, 0x25, 0x41, 
-0x55, 0xd5, 0xd0, 0x2e, 0xff, 0x98, 0xa6, 0x5f, 0x57, 0x51, 0x57, 0x33, 
-0xde, 0x99, 0x3a, 0x74, 0xe0, 0x00, 0xe9, 0xea, 0x12, 0xf6, 0xbd, 0x8e, 
-0x04, 0x15, 0x24, 0xe2, 0xf2, 0xa4, 0x0f, 0xdc, 0x7f, 0x7f, 0x4e, 0x5a, 
-0x72, 0xfb, 0x89, 0x4b, 0x53, 0x8b, 0xbf, 0x8b, 0xf2, 0x0a, 0xc5, 0x2b, 
-0xa2, 0xa8, 0xf8, 0x6f, 0xab, 0x92, 0x4f, 0x13, 0x33, 0x6a, 0x36, 0xaa, 
-0x53, 0x9b, 0x78, 0xf2, 0x48, 0xe8, 0x00, 0xa6, 0xa3, 0x02, 0x03, 0x14, 
-0xa4, 0x30, 0x68, 0xd5, 0xc1, 0x70, 0x83, 0x84, 0x4f, 0xda, 0xb6, 0x49, 
-0xaf, 0x88, 0xa2, 0xe2, 0xbf, 0xd9, 0xdb, 0xbf, 0xaa, 0xd6, 0xba, 0x28, 
-0xa7, 0x5a, 0xe6, 0xb9, 0x47, 0x1f, 0x8d, 0x84, 0x1e, 0xaa, 0x82, 0x0a, 
-0xc2, 0x3d, 0x30, 0x43, 0xaf, 0x5c, 0xba, 0x14, 0x54, 0x4c, 0xd8, 0xf1, 
-0x78, 0x24, 0xa2, 0xe2, 0xd8, 0xb1, 0x63, 0x48, 0xcc, 0x48, 0x50, 0x7e, 
-0xa1, 0xe2, 0x3f, 0x31, 0x5b, 0x5c, 0x3f, 0x8e, 0x8b, 0x3f, 0x61, 0x08, 
-0xa4, 0x1a, 0x5d, 0xc6, 0x66, 0xa5, 0xa7, 0x51, 0x4a, 0x35, 0x12, 0x7a, 
-0xa8, 0xaa, 0xae, 0x14, 0xff, 0xfb, 0x3f, 0xff, 0x53, 0xd4, 0xb3, 0xbb, 
-0x23, 0x25, 0xbb, 0xfd, 0xbe, 0x3f, 0x47, 0x51, 0xa1, 0x59, 0xa1, 0xbc, 
-0x0b, 0xe2, 0x80, 0xe1, 0xdf, 0xb1, 0x17, 0x7e, 0xf8, 0x70, 0x01, 0x18, 
-0xe1, 0x86, 0x8a, 0x1a, 0xdb, 0xbf, 0x4e, 0xae, 0xd3, 0xb2, 0x56, 0x4e, 
-0xf6, 0x5b, 0x6f, 0xbe, 0xa9, 0xa3, 0x22, 0x2c, 0x8b, 0xf5, 0xeb, 0xe1, 
-0x1e, 0x84, 0xd0, 0x27, 0x3b, 0x1c, 0xcd, 0x87, 0xce, 0xce, 0xdd, 0x19, 
-0x46, 0x29, 0x78, 0x56, 0x31, 0xb3, 0xd6, 0xda, 0x36, 0xbc, 0x02, 0x9b, 
-0x23, 0x5e, 0x2a, 0xdf, 0x79, 0xc5, 0x7f, 0xe2, 0xb6, 0x7c, 0x9f, 0xb8, 
-0xf5, 0xfb, 0xf8, 0xad, 0x02, 0x89, 0x30, 0x44, 0x45, 0xab, 0x1d, 0xbf, 
-0x4d, 0x70, 0xa6, 0xf5, 0xe9, 0xd6, 0x45, 0xba, 0xd0, 0x87, 0xb7, 0xb6, 
-0xad, 0xcc, 0xb2, 0xb8, 0xf0, 0x6f, 0xbc, 0xee, 0x5a, 0x36, 0xc8, 0xb1, 
-0x9b, 0x43, 0xad, 0x28, 0xa0, 0xcd, 0x7d, 0xd9, 0xca, 0x5f, 0x81, 0x35, 
-0xa5, 0x34, 0xe2, 0xc3, 0x2f, 0x54, 0xb8, 0xb8, 0x04, 0x90, 0x70, 0x6e, 
-0xfb, 0x2e, 0x69, 0xdb, 0x77, 0xf1, 0x5b, 0x09, 0xa8, 0x0c, 0x43, 0x48, 
-0xc0, 0xfa, 0x06, 0x2d, 0xdf, 0x9d, 0x98, 0xe0, 0x5c, 0xb5, 0x7c, 0xb9, 
-0xa0, 0x02, 0x69, 0x5b, 0xca, 0x92, 0x87, 0x5f, 0xcc, 0xac, 0x2a, 0xfd, 
-0x84, 0x01, 0x8a, 0x87, 0xed, 0xd6, 0xae, 0x4d, 0x7c, 0xf5, 0x7a, 0x1d, 
-0x0e, 0x7c, 0x1e, 0x7e, 0xfc, 0xdf, 0x9d, 0x6f, 0x3b, 0x40, 0x54, 0xb8, 
-0x20, 0x01, 0x7f, 0x00, 0x12, 0x29, 0xdb, 0xbf, 0x4d, 0x2e, 0xfe, 0x36, 
-0x7e, 0x2b, 0x96, 0xbb, 0x30, 0x44, 0x05, 0x0d, 0x23, 0x0b, 0xc7, 0x2d, 
-0x48, 0x8a, 0x8b, 0xa3, 0x09, 0x58, 0xd8, 0x77, 0xa1, 0xd7, 0x2b, 0x18, 
-0x3c, 0xfb, 0xec, 0x33, 0x6c, 0xa6, 0xad, 0xc7, 0x2c, 0xcc, 0x0d, 0xb3, 
-0xb4, 0x0a, 0x8f, 0x12, 0x54, 0x20, 0xa8, 0x70, 0x49, 0x4a, 0x17, 0xb8, 
-0xc4, 0xb7, 0x69, 0xdb, 0xbf, 0x4d, 0xdf, 0xf1, 0xaf, 0xe4, 0xed, 0xdf, 
-0xc6, 0x6e, 0x11, 0x5e, 0x11, 0x6e, 0xc0, 0xa0, 0x61, 0x64, 0xbd, 0x8e, 
-0xfd, 0x93, 0x62, 0x1d, 0xcf, 0x3f, 0xff, 0x7c, 0x78, 0x5b, 0x66, 0x55, 
-0x5a, 0x05, 0xfe, 0x3b, 0xbc, 0xda, 0xd7, 0xad, 0x5a, 0xe9, 0x12, 0x9f, 
-0x6e, 0xbe, 0xd7, 0xb1, 0xe5, 0x7c, 0xa4, 0xf3, 0x0a, 0x5e, 0xbc, 0x8d, 
-0x5c, 0xbc, 0x0b, 0x8c, 0x62, 0xcb, 0x77, 0xa9, 0xc5, 0xdf, 0x66, 0x94, 
-0xfc, 0x8b, 0xff, 0x13, 0xb7, 0x7e, 0x17, 0x13, 0xa6, 0xaa, 0x76, 0xeb, 
-0xe2, 0xff, 0x4d, 0xc9, 0xa9, 0x9f, 0x1a, 0xe7, 0xf8, 0xc9, 0x4f, 0x7e, 
-0x12, 0xc6, 0x5d, 0xe8, 0x95, 0xec, 0x24, 0x15, 0x0c, 0x7e, 0xfb, 0x9b, 
-0xdf, 0x34, 0xaf, 0x5f, 0x27, 0xa5, 0x56, 0xd3, 0x8e, 0x07, 0xff, 0x1a, 
-0x9e, 0x90, 0x28, 0xeb, 0xaf, 0xe0, 0xe5, 0x92, 0x84, 0x2c, 0x8d, 0x7b, 
-0x2c, 0xf4, 0x0a, 0x3b, 0xa8, 0xc0, 0x08, 0x0b, 0x67, 0x40, 0x70, 0xca, 
-0xd8, 0xe1, 0xfa, 0x49, 0xdd, 0xfe, 0x5d, 0x7c, 0x98, 0x32, 0x8a, 0x86, 
-0xdb, 0xff, 0xd8, 0x65, 0xca, 0x32, 0xb6, 0x89, 0x99, 0xd3, 0x2f, 0xa1, 
-0x09, 0x58, 0x18, 0xc7, 0x41, 0x89, 0xec, 0x24, 0x6e, 0x0a, 0x82, 0x02, 
-0xef, 0xbd, 0xe7, 0x1e, 0x9e, 0xba, 0xed, 0xa4, 0x65, 0x79, 0xbb, 0xc2, 
-0x2b, 0x2b, 0xd5, 0x4d, 0x45, 0x4d, 0x85, 0x8a, 0x32, 0x91, 0xe4, 0x4a, 
-0xdb, 0xb6, 0x81, 0x0a, 0x20, 0xf1, 0x6f, 0x98, 0x43, 0xaa, 0x0b, 0x15, 
-0x2e, 0x46, 0x91, 0xb0, 0xf5, 0xfb, 0x70, 0x65, 0x14, 0x23, 0x6e, 0x7e, 
-0x20, 0x21, 0x3d, 0xa7, 0x45, 0xe3, 0x86, 0x3f, 0x7a, 0xee, 0x39, 0x29, 
-0x68, 0x40, 0xbe, 0x01, 0x44, 0x13, 0x66, 0x31, 0xb3, 0xba, 0xec, 0x84, 
-0xe9, 0x89, 0x67, 0xec, 0xde, 0xa9, 0x43, 0x62, 0x72, 0xb5, 0xf1, 0xdb, 
-0x1f, 0x09, 0x5b, 0x46, 0x11, 0x54, 0x5e, 0x01, 0x24, 0x5c, 0x1a, 0x45, 
-0x4a, 0xf1, 0xbf, 0x50, 0x27, 0x10, 0x9f, 0xd0, 0xb6, 0xe3, 0x2e, 0xca, 
-0x4e, 0xe1, 0xa6, 0x51, 0x20, 0x4f, 0x0f, 0x58, 0xe6, 0x8a, 0x77, 0xa0, 
-0x76, 0xe0, 0x87, 0x1f, 0x7e, 0x28, 0xc5, 0xfa, 0x2b, 0x3e, 0xeb, 0x88, 
-0xfd, 0xfb, 0xcb, 0xbf, 0xfe, 0xf5, 0x8b, 0xcf, 0x3f, 0xe7, 0xe7, 0xaf, 
-0x5f, 0x7c, 0x81, 0x84, 0x23, 0x85, 0xfd, 0x82, 0x68, 0x01, 0x53, 0x3e, 
-0x0a, 0xe9, 0x9c, 0x7d, 0xf2, 0x8e, 0xe3, 0xc9, 0xf1, 0xf1, 0x79, 0xbd, 
-0xa6, 0x84, 0x7c, 0x25, 0x59, 0xdb, 0x95, 0x6f, 0x94, 0xbf, 0xc2, 0x3f, 
-0x09, 0x0a, 0x1f, 0x36, 0x76, 0x27, 0x94, 0xec, 0x7f, 0xa5, 0x63, 0x7a, 
-0x42, 0x76, 0x72, 0x31, 0x8a, 0x30, 0x54, 0xb2, 0x2f, 0xec, 0x91, 0xe7, 
-0x7b, 0xcf, 0x5f, 0x0f, 0x2a, 0x76, 0xed, 0xd8, 0x6e, 0xe8, 0x2c, 0x5c, 
-0x91, 0xfd, 0xb6, 0xef, 0xb9, 0xfb, 0xee, 0x41, 0x7d, 0xfa, 0x14, 0x75, 
-0x2d, 0xec, 0xd7, 0xb5, 0x70, 0xd4, 0xb0, 0x61, 0xcf, 0x3d, 0xf3, 0x8c, 
-0x54, 0xb9, 0x15, 0x1f, 0x62, 0x50, 0xb0, 0xa1, 0x7c, 0x14, 0x92, 0xa8, 
-0xdd, 0xa3, 0x4b, 0xe7, 0xf8, 0xa4, 0xf4, 0xe1, 0x37, 0x87, 0x5d, 0x9a, 
-0x91, 0x01, 0x24, 0x9a, 0x02, 0x1d, 0xa0, 0x5e, 0x01, 0xa3, 0xf8, 0x37, 
-0x76, 0xd8, 0xf4, 0xed, 0xff, 0x42, 0x82, 0x4a, 0xdc, 0xf6, 0xfd, 0x05, 
-0x97, 0x76, 0xf8, 0x71, 0x09, 0x71, 0xcf, 0x9f, 0xef, 0x7c, 0xa9, 0xcb, 
-0x8d, 0x45, 0x8d, 0x0f, 0xbd, 0xb3, 0x70, 0x45, 0xf6, 0xdb, 0x86, 0x5e, 
-0xa7, 0x4c, 0x98, 0xc0, 0x1c, 0x9c, 0xb5, 0x5a, 0xc4, 0xe5, 0xe4, 0xf3, 
-0xe1, 0xd0, 0x81, 0x03, 0x60, 0x12, 0x06, 0x22, 0xd8, 0x08, 0x0a, 0x30, 
-0xf4, 0xea, 0x4f, 0x87, 0x0f, 0x1e, 0x4c, 0x49, 0x72, 0x66, 0x77, 0x9d, 
-0x10, 0xe6, 0x8c, 0xc2, 0xbe, 0x04, 0x85, 0x84, 0xe0, 0x59, 0xaf, 0x40, 
-0x7c, 0x4a, 0xd8, 0xf2, 0x5d, 0x4a, 0xf1, 0xb7, 0xa8, 0xda, 0xc8, 0x4e, 
-0xfc, 0x1a, 0xbe, 0x90, 0x70, 0xa1, 0xa2, 0xd5, 0xf8, 0x25, 0x10, 0xe2, 
-0x1d, 0xc7, 0x8f, 0x5b, 0xd6, 0x83, 0x0a, 0xca, 0x3e, 0xed, 0xb9, 0x5b, 
-0x29, 0x55, 0x14, 0x92, 0x63, 0x1d, 0x99, 0x6d, 0x06, 0xb0, 0xce, 0x4d, 
-0xae, 0x38, 0xc4, 0x64, 0x76, 0x97, 0x94, 0x20, 0xe7, 0x20, 0x47, 0x89, 
-0x6e, 0x13, 0x94, 0xa8, 0x13, 0x55, 0xfd, 0x09, 0x8d, 0xa2, 0xa8, 0x67, 
-0x4f, 0x47, 0x5c, 0xf2, 0xf0, 0xe2, 0x27, 0xc3, 0x59, 0xa3, 0x30, 0x65, 
-0xa8, 0x0a, 0xaf, 0xa0, 0xc6, 0x8d, 0x85, 0x04, 0x05, 0x2a, 0x48, 0x21, 
-0x70, 0x6f, 0x99, 0x75, 0x31, 0x8a, 0x44, 0x50, 0xb1, 0xfd, 0x5b, 0x97, 
-0x33, 0x7b, 0xcb, 0xbf, 0x2f, 0xc8, 0x4e, 0xe1, 0x16, 0xf5, 0xa4, 0x9e, 
-0xc8, 0xb9, 0xf5, 0xfb, 0x06, 0x43, 0xe7, 0xb3, 0x1a, 0x27, 0x4e, 0x9c, 
-0xc0, 0xd1, 0x8b, 0xaa, 0xad, 0xba, 0x45, 0x96, 0x77, 0x17, 0x7a, 0xe1, 
-0x00, 0xef, 0xbf, 0xf7, 0x5e, 0xfd, 0x9a, 0xb9, 0xf1, 0x79, 0xcd, 0x26, 
-0x1c, 0x7e, 0x93, 0x59, 0x15, 0x5c, 0x75, 0x9c, 0xc9, 0x94, 0x14, 0x17, 
-0xa3, 0x10, 0x63, 0x29, 0x02, 0x1b, 0x41, 0x01, 0x86, 0xf2, 0xdc, 0x31, 
-0x2c, 0x8c, 0x82, 0x82, 0x26, 0x35, 0xba, 0x8e, 0x0f, 0x7f, 0x46, 0x61, 
-0xc5, 0x2b, 0x8c, 0xa8, 0xb8, 0xed, 0xb6, 0xdb, 0xc8, 0xd0, 0xf5, 0x88, 
-0x8a, 0x8b, 0x3e, 0x8a, 0xe4, 0x6d, 0x78, 0xb2, 0xbf, 0x0b, 0x77, 0xd9, 
-0xc9, 0x05, 0xf5, 0x1a, 0xdb, 0xff, 0x29, 0xbd, 0x8e, 0x08, 0x95, 0x55, 
-0x95, 0xfa, 0x21, 0x9d, 0xf2, 0xee, 0x8b, 0x27, 0x90, 0x60, 0xff, 0x3e, 
-0x73, 0xef, 0xbd, 0xdc, 0x3d, 0x7f, 0xd6, 0xb6, 0x1e, 0x77, 0xb8, 0xca, 
-0x93, 0x35, 0xba, 0x6c, 0x57, 0x3c, 0x35, 0x78, 0xf6, 0xec, 0x41, 0x21, 
-0x16, 0x60, 0xc0, 0x31, 0x02, 0xc7, 0xa7, 0x52, 0x2a, 0x7e, 0xfd, 0xab, 
-0x5f, 0xf5, 0xe9, 0xde, 0xcd, 0x11, 0x97, 0x32, 0xa2, 0xe4, 0xd9, 0x30, 
-0xde, 0xec, 0x4a, 0x1f, 0xcd, 0xa4, 0x57, 0xb8, 0x45, 0x85, 0x7b, 0x09, 
-0xca, 0x85, 0x0a, 0xc4, 0x27, 0xf0, 0x90, 0xb8, 0x8d, 0xf0, 0xa7, 0x70, 
-0x8e, 0x1b, 0x97, 0x85, 0xab, 0xb7, 0xe3, 0xcb, 0xda, 0x83, 0xe6, 0xb1, 
-0x74, 0x77, 0xdf, 0x75, 0x97, 0x14, 0x83, 0x42, 0xc0, 0x80, 0x1c, 0xa1, 
-0xc5, 0xf2, 0xeb, 0xea, 0xa2, 0x20, 0xc1, 0x2d, 0x76, 0x6d, 0x2f, 0xe6, 
-0xee, 0xbd, 0x6f, 0xbc, 0xaf, 0xf6, 0x5e, 0x17, 0x4f, 0x6e, 0x38, 0xfd, 
-0x16, 0xe7, 0x05, 0xbd, 0x02, 0x3b, 0x98, 0x02, 0x46, 0xe0, 0xec, 0x82, 
-0x3b, 0x4a, 0xe6, 0xdd, 0x81, 0x7d, 0xfb, 0xb8, 0x5d, 0x5e, 0xd1, 0xec, 
-0xd0, 0xee, 0xeb, 0x65, 0x5f, 0x78, 0xb1, 0x8f, 0x0a, 0xf7, 0x12, 0x94, 
-0xcb, 0x20, 0x8b, 0xb7, 0x0e, 0xa3, 0xd3, 0x05, 0x48, 0x84, 0xad, 0xe0, 
-0xa4, 0x1e, 0xad, 0x69, 0xc9, 0x9f, 0x84, 0x57, 0x9c, 0x3e, 0x75, 0x4a, 
-0x32, 0x7a, 0x21, 0x47, 0x54, 0x6d, 0x41, 0x45, 0x79, 0x28, 0x15, 0x0a, 
-0x12, 0x90, 0xe9, 0xd7, 0x5f, 0x7d, 0xb5, 0x68, 0xee, 0x6c, 0x47, 0x4c, 
-0xf2, 0xf4, 0xc3, 0x3f, 0xbe, 0x88, 0xd2, 0xa9, 0xeb, 0x53, 0x1c, 0x8e, 
-0x23, 0x87, 0x0f, 0x03, 0x4e, 0x32, 0xaa, 0x71, 0x9b, 0xc0, 0x2e, 0x02, 
-0x47, 0x85, 0x28, 0x15, 0xbf, 0xf8, 0xf9, 0xcf, 0xdb, 0x36, 0x6d, 0x12, 
-0x9b, 0x91, 0x37, 0x7a, 0xcf, 0x0b, 0x91, 0xf0, 0x72, 0x0d, 0xd1, 0x81, 
-0xd6, 0x7a, 0x85, 0x37, 0x09, 0xea, 0x62, 0x78, 0x2c, 0xa8, 0x40, 0xb5, 
-0x08, 0x6f, 0x75, 0x42, 0xd1, 0x44, 0xab, 0x92, 0xdf, 0xe7, 0xf4, 0x98, 
-0x9c, 0xe8, 0x70, 0x3c, 0xf2, 0xf0, 0xc3, 0xf0, 0x56, 0xb2, 0xb2, 0xb0, 
-0x5a, 0x2a, 0x42, 0x0c, 0x3a, 0x2a, 0x74, 0x48, 0x00, 0x3c, 0x8a, 0xb2, 
-0x35, 0xaf, 0x5f, 0x3b, 0x25, 0xbf, 0x4b, 0xeb, 0xc3, 0x17, 0x13, 0xa6, 
-0x73, 0xfb, 0xcf, 0xcb, 0x4a, 0x4d, 0xc2, 0xeb, 0x8c, 0x7a, 0x23, 0xec, 
-0x42, 0x20, 0x1a, 0x88, 0x10, 0xa5, 0x3c, 0x15, 0xbb, 0x2f, 0x64, 0xa2, 
-0x0e, 0x58, 0xb4, 0x25, 0x4c, 0xba, 0x7b, 0xd9, 0xd9, 0xb5, 0x03, 0xe3, 
-0x15, 0x2e, 0x48, 0xc4, 0xb8, 0x18, 0x05, 0x82, 0x93, 0x64, 0x17, 0x45, 
-0x04, 0xaf, 0x68, 0xb7, 0xe3, 0x57, 0xce, 0xbc, 0xfc, 0x5a, 0xd5, 0x32, 
-0x70, 0x11, 0x48, 0xa3, 0x23, 0x08, 0x11, 0x49, 0x23, 0x10, 0x2a, 0xf4, 
-0x6c, 0x71, 0x62, 0xdb, 0x96, 0x5e, 0x2a, 0xbf, 0xff, 0xf4, 0xd3, 0x4b, 
-0x26, 0x4f, 0xe6, 0xad, 0x0d, 0x5a, 0xb2, 0x5d, 0x50, 0x7a, 0xc9, 0x91, 
-0xd7, 0x1d, 0x09, 0xe9, 0x6d, 0xdb, 0xb6, 0xf9, 0xf9, 0xcf, 0x7e, 0x16, 
-0x5c, 0x54, 0x70, 0x47, 0x06, 0x1c, 0xd0, 0xa3, 0x6b, 0x42, 0x56, 0xfd, 
-0x96, 0x87, 0xc2, 0x31, 0xbb, 0xc8, 0x1d, 0x42, 0x02, 0x47, 0x05, 0x81, 
-0x4f, 0x3f, 0xe0, 0x21, 0x22, 0x20, 0x41, 0xa8, 0x6c, 0xc7, 0xe1, 0x97, 
-0xb2, 0x6e, 0xf3, 0xe7, 0xcc, 0xc1, 0xab, 0x2d, 0x4a, 0x05, 0x42, 0x4b, 
-0x80, 0x7b, 0xb3, 0x67, 0x54, 0x48, 0x1f, 0x3a, 0xd8, 0xd1, 0x92, 0xc5, 
-0xae, 0x72, 0x7d, 0x7d, 0xa6, 0x2d, 0x6d, 0x75, 0xeb, 0xb7, 0x40, 0xa2, 
-0xd6, 0x9e, 0xef, 0x5b, 0x8d, 0x98, 0x93, 0x92, 0x10, 0xbf, 0x7d, 0xeb, 
-0x56, 0x4c, 0x87, 0x41, 0x44, 0x85, 0xe0, 0x90, 0x4a, 0xa1, 0xad, 0x1b, 
-0xd7, 0x4f, 0xcb, 0x2f, 0x8c, 0xa2, 0xa2, 0x8c, 0x65, 0xd6, 0xa3, 0x04, 
-0x25, 0xbc, 0x22, 0xbc, 0x5d, 0x13, 0x46, 0x35, 0xa9, 0xef, 0x65, 0x37, 
-0x40, 0x97, 0xa3, 0x86, 0x0e, 0x25, 0xd6, 0x43, 0x4c, 0x13, 0xe5, 0x5a, 
-0x77, 0x59, 0x24, 0x19, 0xa9, 0xc2, 0x84, 0x42, 0xdf, 0x20, 0x2f, 0x27, 
-0x29, 0xbb, 0x7e, 0xf7, 0x63, 0x17, 0xbb, 0xa8, 0x74, 0x39, 0xfa, 0x55, 
-0x7c, 0x72, 0x46, 0xc7, 0x36, 0xad, 0x01, 0x27, 0x82, 0x1c, 0x5c, 0x8b, 
-0xc9, 0xe8, 0x7a, 0x85, 0xdf, 0xe2, 0x9c, 0xa0, 0x82, 0x58, 0x92, 0x11, 
-0x03, 0x8a, 0xe2, 0xb3, 0xea, 0x8d, 0xd9, 0xff, 0x4a, 0xb8, 0x2b, 0x15, 
-0xda, 0x9e, 0x1e, 0x00, 0xaf, 0x70, 0x41, 0x22, 0x2c, 0x13, 0x27, 0x3c, 
-0xbc, 0xfe, 0xac, 0xe2, 0x7f, 0xe4, 0x15, 0x74, 0x28, 0x68, 0xd4, 0xf0, 
-0xd9, 0x67, 0x9f, 0xc5, 0x53, 0x81, 0xf8, 0x24, 0x25, 0x03, 0xcb, 0x55, 
-0xa9, 0x50, 0x8c, 0x82, 0x1b, 0xe5, 0x64, 0xa4, 0xa6, 0xd6, 0x6a, 0xda, 
-0xea, 0xd0, 0xc5, 0x78, 0xd5, 0xa9, 0x87, 0x5e, 0x4e, 0x74, 0xa6, 0x4c, 
-0x9b, 0x38, 0x41, 0xa1, 0x02, 0x6d, 0x5b, 0x6c, 0xc4, 0x81, 0xc4, 0x29, 
-0x2a, 0x28, 0xf2, 0x5c, 0x5b, 0x6f, 0xde, 0x04, 0x91, 0xd4, 0x1e, 0x72, 
-0x45, 0xb8, 0x7b, 0x2a, 0x82, 0x83, 0x0a, 0x55, 0xa3, 0x20, 0x22, 0x04, 
-0x27, 0x81, 0x4a, 0x8b, 0x62, 0x57, 0x92, 0x49, 0xbf, 0x5e, 0xbd, 0x68, 
-0x7e, 0x85, 0x51, 0x4e, 0xd9, 0x64, 0xcb, 0x55, 0xa9, 0x50, 0xdd, 0x19, 
-0xe1, 0x03, 0xb9, 0xe9, 0xa9, 0x75, 0x9a, 0x75, 0xaa, 0xbe, 0x93, 0xc5, 
-0xff, 0x6f, 0xf5, 0x92, 0xef, 0x47, 0x6c, 0x7f, 0xd2, 0xe9, 0x4c, 0x9d, 
-0x33, 0x73, 0x06, 0x33, 0x09, 0xa2, 0xf8, 0xa4, 0x50, 0xc1, 0x73, 0x51, 
-0xce, 0xa3, 0x27, 0x95, 0x33, 0x79, 0xea, 0x85, 0xb7, 0x14, 0xec, 0x09, 
-0xaf, 0xae, 0x90, 0x65, 0xf4, 0x8a, 0x28, 0x2a, 0xec, 0x18, 0x22, 0xac, 
-0xce, 0xe9, 0xb1, 0xa8, 0x38, 0xd6, 0xe1, 0xb8, 0x6c, 0xe6, 0x4c, 0x69, 
-0x71, 0x24, 0xd6, 0x27, 0x65, 0x93, 0x0d, 0x4a, 0x90, 0x85, 0x41, 0xc1, 
-0xd0, 0x23, 0x91, 0x1e, 0x3f, 0x77, 0x2e, 0xc3, 0x99, 0xd0, 0x75, 0xe4, 
-0x8c, 0x8b, 0x10, 0x3d, 0xf0, 0x75, 0xe7, 0xd5, 0xa7, 0xe3, 0xe3, 0x9d, 
-0x23, 0x87, 0x0e, 0xc1, 0x3a, 0x0c, 0x2a, 0x94, 0xf8, 0x14, 0xa0, 0x92, 
-0xa3, 0xa3, 0x02, 0x79, 0xec, 0x8d, 0x37, 0xde, 0x68, 0xdd, 0xcc, 0xd5, 
-0x6a, 0xbe, 0xf7, 0xfc, 0x0d, 0xed, 0x76, 0x7d, 0xda, 0xb8, 0xe4, 0xcf, 
-0x64, 0xe7, 0x86, 0x97, 0x40, 0x55, 0x56, 0x0b, 0xb0, 0x29, 0x41, 0xa1, 
-0x75, 0xe1, 0xae, 0x2a, 0x1b, 0xf1, 0x11, 0x59, 0xea, 0x04, 0x44, 0xd0, 
-0xa0, 0xf8, 0x8f, 0x29, 0xf5, 0x5a, 0x65, 0xa4, 0xa7, 0xdd, 0x7e, 0xdb, 
-0x6d, 0x12, 0x3d, 0x8e, 0x9e, 0x2d, 0xd6, 0xa7, 0xf2, 0x0b, 0x95, 0x55, 
-0x91, 0x48, 0x7f, 0xfb, 0xf2, 0x4b, 0xf6, 0xec, 0x98, 0xd8, 0xc4, 0x49, 
-0x25, 0x8f, 0x09, 0x45, 0x76, 0x3e, 0xf4, 0x45, 0x76, 0x87, 0x21, 0x34, 
-0xad, 0xdc, 0xbe, 0x6d, 0x1b, 0xea, 0x8d, 0x4c, 0x26, 0x70, 0xf1, 0x49, 
-0x60, 0xa9, 0xac, 0x5e, 0x60, 0x1e, 0x6b, 0xef, 0x8f, 0x5f, 0xf9, 0x71, 
-0xeb, 0xa6, 0x05, 0x10, 0x40, 0xcd, 0xfe, 0x97, 0xb5, 0x99, 0xb7, 0xbd, 
-0xff, 0x0d, 0x27, 0x87, 0x6f, 0x3e, 0xdb, 0x62, 0xeb, 0x2f, 0x1a, 0x6c, 
-0xfb, 0x43, 0xda, 0xd6, 0x7f, 0x86, 0x38, 0x42, 0x4c, 0x7e, 0x67, 0x8d, 
-0xd0, 0x69, 0xc3, 0x80, 0xa8, 0x6c, 0xed, 0xdb, 0x76, 0x83, 0x8a, 0xf0, 
-0x77, 0xd8, 0xa9, 0xf7, 0xdd, 0xa0, 0xf8, 0x0f, 0x85, 0x53, 0x5c, 0xd5, 
-0xf2, 0x86, 0x0c, 0x18, 0x40, 0xf4, 0xb8, 0x74, 0xfd, 0x62, 0x6f, 0x16, 
-0x97, 0x76, 0xb9, 0xda, 0x64, 0x25, 0x0f, 0x8e, 0xf8, 0xdc, 0xe4, 0xc4, 
-0xc4, 0xac, 0xc2, 0xd1, 0x2d, 0x0e, 0x5e, 0xa4, 0xc2, 0xd1, 0xeb, 0xee, 
-0x8c, 0x4b, 0x48, 0xea, 0xdf, 0xab, 0x27, 0x59, 0xa3, 0xa0, 0x02, 0xda, 
-0x15, 0x3d, 0x3b, 0x28, 0xf3, 0x51, 0x41, 0x50, 0x60, 0x1e, 0x5d, 0x05, 
-0x46, 0xf4, 0xe2, 0x8b, 0x2f, 0x0a, 0x30, 0x62, 0xe3, 0x53, 0x12, 0xd3, 
-0x6a, 0x24, 0x66, 0xe4, 0xa6, 0xd4, 0x6c, 0x52, 0xaf, 0xd3, 0x60, 0x96, 
-0x65, 0xf0, 0x0d, 0x77, 0xd4, 0xdf, 0x26, 0xf5, 0xfa, 0x43, 0x51, 0x9c, 
-0x36, 0xed, 0xef, 0x76, 0x50, 0xc1, 0x26, 0x14, 0xe1, 0xa8, 0xe0, 0x95, 
-0x77, 0x9f, 0xb3, 0x3e, 0x26, 0x36, 0x01, 0xb2, 0x78, 0xee, 0xb9, 0xe7, 
-0x88, 0x93, 0xa5, 0x40, 0x96, 0x44, 0x04, 0x4a, 0xa9, 0x9b, 0xf2, 0x90, 
-0x9d, 0xd8, 0xb0, 0x95, 0x2b, 0x8d, 0x0d, 0x7b, 0xd2, 0xf8, 0xf1, 0xbc, 
-0xac, 0xd1, 0x7b, 0x5f, 0x12, 0xa0, 0xe6, 0xed, 0xfa, 0xae, 0x59, 0xff, 
-0x49, 0x44, 0xec, 0x3d, 0xf5, 0xc4, 0x13, 0x4c, 0x46, 0xc9, 0x72, 0xa2, 
-0xe1, 0x04, 0xee, 0x62, 0x37, 0xd8, 0xbe, 0xc0, 0x3f, 0xbb, 0x00, 0xc0, 
-0xb8, 0x6e, 0xd5, 0xd5, 0xf3, 0x67, 0xcf, 0x1e, 0x39, 0x68, 0x60, 0xff, 
-0x9e, 0xdd, 0x6b, 0x67, 0x65, 0xe2, 0xca, 0x4c, 0x88, 0x89, 0x8d, 0x77, 
-0xa6, 0x55, 0x6b, 0xd5, 0xaf, 0xcf, 0x35, 0xc7, 0xea, 0x6f, 0xfb, 0x2c, 
-0x04, 0x81, 0x61, 0x42, 0xb2, 0x15, 0x2a, 0x58, 0xe1, 0xd2, 0xbc, 0x6d, 
-0x2c, 0xb3, 0x11, 0x8e, 0x0a, 0xde, 0x74, 0xf7, 0xcb, 0x6f, 0x89, 0x49, 
-0x48, 0xae, 0x59, 0x23, 0x8b, 0xb0, 0x3c, 0x49, 0x33, 0xaa, 0x80, 0x28, 
-0x0f, 0x41, 0x85, 0x18, 0xa0, 0x30, 0xb9, 0xf6, 0xed, 0x41, 0x05, 0xcb, 
-0x9c, 0xae, 0x87, 0xbf, 0x14, 0x54, 0x74, 0x38, 0xf0, 0x45, 0x4a, 0xed, 
-0xe6, 0xed, 0x9a, 0xe6, 0x13, 0x92, 0x20, 0x10, 0x65, 0x47, 0x17, 0x46, 
-0x11, 0xac, 0x30, 0x72, 0xb9, 0xbb, 0x84, 0x42, 0x49, 0x23, 0x3c, 0x9e, 
-0x5a, 0x6a, 0xab, 0x62, 0x6c, 0x20, 0x49, 0xed, 0xcd, 0x37, 0xdf, 0x7c, 
-0xf8, 0xec, 0xd9, 0x4d, 0x1b, 0x36, 0x14, 0xb6, 0x6d, 0x9b, 0x18, 0xe3, 
-0x88, 0x75, 0xa6, 0x76, 0x99, 0xb5, 0x06, 0x99, 0x2a, 0xa4, 0x04, 0x2a, 
-0x2b, 0xe6, 0x66, 0xa5, 0x57, 0xd8, 0x44, 0x45, 0x44, 0x88, 0x4f, 0xf5, 
-0xb7, 0x7e, 0xd6, 0xfd, 0x8a, 0x2d, 0x8e, 0x84, 0xe4, 0x8c, 0xe4, 0xa4, 
-0x03, 0xfb, 0xf7, 0x4b, 0xbe, 0x22, 0x52, 0xa6, 0x50, 0x61, 0xf9, 0x99, 
-0x9e, 0x44, 0xb8, 0x57, 0xa8, 0xb8, 0x98, 0xde, 0x90, 0x9c, 0xd5, 0xf1, 
-0xf0, 0x3f, 0x84, 0xe6, 0x26, 0x1f, 0x78, 0x21, 0x3e, 0xa3, 0xe6, 0xb0, 
-0xfe, 0xfd, 0x40, 0xa9, 0x84, 0xb2, 0x0b, 0x2a, 0x82, 0xa8, 0xe1, 0x08, 
-0xbb, 0x50, 0x76, 0x61, 0x18, 0x23, 0xc0, 0x40, 0x54, 0x03, 0x84, 0x08, 
-0x90, 0x60, 0x03, 0x93, 0xc3, 0x47, 0x1f, 0x7d, 0xf4, 0xde, 0x7b, 0xef, 
-0xbd, 0xfa, 0xea, 0xab, 0x37, 0xde, 0xb0, 0x86, 0x2e, 0xc3, 0x90, 0x53, 
-0xd7, 0xd9, 0x6b, 0x90, 0x36, 0x2b, 0x04, 0x18, 0x81, 0x4b, 0x6b, 0x32, 
-0x42, 0x30, 0x79, 0x45, 0xf8, 0xa3, 0xa2, 0xde, 0xd6, 0xcf, 0xba, 0xcd, 
-0xdf, 0xe4, 0x88, 0x77, 0x56, 0xcf, 0x48, 0xdf, 0xb6, 0x65, 0xcb, 0x3b, 
-0xef, 0xbc, 0xf3, 0xd3, 0x9f, 0xfe, 0x54, 0x82, 0x64, 0x25, 0x4b, 0xbb, 
-0xfc, 0xc2, 0x01, 0x75, 0x54, 0x48, 0xc7, 0xad, 0xc1, 0x45, 0x45, 0x24, 
-0xde, 0xb5, 0x3c, 0x78, 0xd1, 0x7f, 0xd7, 0x74, 0xef, 0xdf, 0x53, 0x1b, 
-0xb4, 0x6f, 0x98, 0x97, 0xfd, 0xee, 0x3b, 0xef, 0x28, 0x54, 0x04, 0x1d, 
-0xa5, 0x06, 0x60, 0xf0, 0xc8, 0x88, 0x52, 0x30, 0x2e, 0x98, 0x06, 0xc6, 
-0x06, 0xac, 0x70, 0x44, 0x52, 0x83, 0x0d, 0x1c, 0x9a, 0x2c, 0xce, 0xa9, 
-0x53, 0xa7, 0x1a, 0xd6, 0xab, 0x8b, 0xde, 0xd1, 0xf3, 0xca, 0x92, 0x0a, 
-0x01, 0x46, 0xb0, 0x50, 0x61, 0xa2, 0x64, 0xfb, 0x12, 0x14, 0xdb, 0x43, 
-0x59, 0x1b, 0x54, 0x98, 0xa3, 0xc2, 0x05, 0x89, 0x79, 0x1b, 0x11, 0x0b, 
-0xaa, 0x57, 0xcb, 0xdc, 0xb9, 0x63, 0x07, 0x6f, 0x9d, 0x5d, 0x19, 0x22, 
-0x10, 0x71, 0xa5, 0x62, 0x7a, 0xce, 0xab, 0x0c, 0x07, 0x6e, 0x87, 0x37, 
-0x3d, 0x39, 0x39, 0xb9, 0xde, 0x1e, 0x55, 0x6f, 0xe6, 0x7c, 0x8f, 0x4b, 
-0x96, 0xc7, 0x38, 0x1c, 0x2b, 0x97, 0x2d, 0x15, 0xde, 0x55, 0x4e, 0xb1, 
-0x58, 0x3a, 0x30, 0x44, 0x94, 0x82, 0x29, 0xb1, 0x29, 0x70, 0x47, 0x76, 
-0x07, 0x56, 0x83, 0x6d, 0x02, 0x2b, 0x0d, 0x32, 0x15, 0xb2, 0xdc, 0xad, 
-0x87, 0x0e, 0x55, 0xcb, 0xcc, 0x8c, 0x4b, 0xca, 0xe8, 0xbd, 0x6c, 0x5f, 
-0x85, 0xb0, 0x8b, 0xf2, 0x21, 0xc2, 0x28, 0x2a, 0x2c, 0x5f, 0x1e, 0x82, 
-0x53, 0xd7, 0xd9, 0x6b, 0x63, 0xe3, 0x9c, 0xd5, 0xd3, 0xd2, 0xf6, 0xec, 
-0xde, 0xfd, 0xee, 0xbb, 0xef, 0xf2, 0xd6, 0x91, 0x19, 0xd8, 0x95, 0x0d, 
-0x3e, 0x0a, 0xbf, 0x43, 0x2a, 0x3c, 0x04, 0x3e, 0xa9, 0x3f, 0x49, 0x86, 
-0x83, 0x54, 0xec, 0x1b, 0x37, 0x6a, 0x54, 0xdd, 0xba, 0x75, 0x53, 0x8a, 
-0x5d, 0xfe, 0x3b, 0xf9, 0xc1, 0xa7, 0x96, 0x5c, 0xa3, 0x5e, 0x56, 0x4a, 
-0x12, 0xbb, 0x35, 0xb3, 0xe2, 0x9c, 0xa0, 0x58, 0x9f, 0xcc, 0x13, 0xd3, 
-0x81, 0xc1, 0x2d, 0x90, 0xd3, 0xc0, 0x06, 0xb7, 0x03, 0x1b, 0xdc, 0x17, 
-0x6c, 0xb0, 0x2c, 0xe8, 0x5a, 0xc8, 0x96, 0xd8, 0x31, 0x37, 0x6f, 0xda, 
-0xe4, 0x8c, 0x8d, 0x49, 0xc9, 0x6d, 0x44, 0xc0, 0x98, 0xbf, 0xc0, 0x08, 
-0x9c, 0x09, 0x04, 0x86, 0x16, 0x9b, 0x36, 0x28, 0x9e, 0x3c, 0x72, 0x78, 
-0x05, 0x90, 0xe8, 0x34, 0x65, 0x59, 0x6c, 0x6c, 0x5c, 0x5e, 0xf5, 0xcc, 
-0xfd, 0xfb, 0xf7, 0x03, 0x09, 0x04, 0x27, 0xe1, 0x12, 0x12, 0xf5, 0x54, 
-0xae, 0xd6, 0x58, 0x9d, 0x28, 0x15, 0x2a, 0xfe, 0xfc, 0x97, 0xbf, 0xf4, 
-0xe9, 0xd1, 0xbd, 0x45, 0x87, 0x1e, 0x3a, 0x9d, 0x15, 0xec, 0xf9, 0x32, 
-0x25, 0xa7, 0x41, 0x5e, 0x66, 0x1a, 0x15, 0x15, 0xca, 0xbb, 0x2b, 0x9f, 
-0x02, 0x86, 0xa0, 0x14, 0xa6, 0x21, 0x45, 0xd3, 0xe0, 0x1b, 0xe8, 0x3c, 
-0xdc, 0x5d, 0x04, 0x2a, 0x52, 0x9c, 0xd1, 0x34, 0x26, 0x8e, 0x1d, 0x13, 
-0x1b, 0x1b, 0x3f, 0x70, 0xe9, 0x0e, 0x7f, 0x51, 0x11, 0x18, 0x4d, 0xfb, 
-0xeb, 0xa2, 0x2d, 0x9d, 0xad, 0x4d, 0x5e, 0x11, 0x39, 0xa8, 0x00, 0x12, 
-0x6d, 0x87, 0x4c, 0x67, 0x59, 0x9a, 0x35, 0x6a, 0x74, 0xd7, 0xc9, 0x93, 
-0x02, 0x09, 0x36, 0x42, 0x09, 0x79, 0x52, 0x9e, 0xec, 0xf2, 0xb3, 0xc6, 
-0x9a, 0x51, 0x01, 0x09, 0x3e, 0xf7, 0xec, 0xb3, 0xf5, 0x72, 0x6b, 0xf4, 
-0xb9, 0xe4, 0x2a, 0x9d, 0xce, 0x7a, 0xcf, 0x5b, 0xc7, 0x3c, 0x17, 0xcc, 
-0x9d, 0x83, 0x0c, 0x03, 0x5c, 0x95, 0xf6, 0x5f, 0x4e, 0xec, 0x4b, 0x4f, 
-0x06, 0xe4, 0xf1, 0x51, 0xeb, 0x15, 0xdf, 0xe0, 0xd6, 0xa2, 0x6c, 0x20, 
-0xcb, 0xc1, 0x51, 0xcf, 0x9d, 0x3b, 0x97, 0xe4, 0x70, 0x34, 0xea, 0xd4, 
-0x3f, 0x7b, 0xc7, 0x45, 0x2d, 0xc8, 0x17, 0x78, 0x28, 0x9f, 0x5a, 0xe5, 
-0x25, 0x75, 0xda, 0x41, 0x05, 0x8c, 0x32, 0x12, 0x50, 0x51, 0xf7, 0x96, 
-0xdf, 0x77, 0x5f, 0xbc, 0xd3, 0x99, 0xdb, 0x90, 0x35, 0xe9, 0xde, 0xa5, 
-0xf3, 0x23, 0x8f, 0x3c, 0x82, 0x2e, 0x81, 0xe0, 0x24, 0x99, 0xd9, 0x22, 
-0x38, 0x19, 0xb8, 0x44, 0x39, 0xd1, 0x9f, 0x41, 0x82, 0x02, 0x15, 0x4b, 
-0x17, 0x2f, 0x66, 0x56, 0xe3, 0x37, 0xde, 0xad, 0x89, 0x4f, 0x5f, 0x26, 
-0xe7, 0x36, 0xac, 0x99, 0x99, 0xfe, 0xc2, 0x0b, 0x2f, 0xc0, 0xc6, 0x2b, 
-0x00, 0x15, 0x62, 0x13, 0x13, 0xa6, 0x21, 0xb6, 0x29, 0xc1, 0x06, 0xd3, 
-0xc3, 0x9d, 0x82, 0x40, 0x05, 0xd3, 0x10, 0x60, 0xa0, 0x80, 0x15, 0xf5, 
-0xe8, 0xea, 0xac, 0x5e, 0xb7, 0xcd, 0x2e, 0xdc, 0x17, 0x3e, 0x6d, 0xfc, 
-0x06, 0x48, 0xf8, 0x74, 0x6d, 0xf0, 0x4e, 0x8e, 0xa2, 0x42, 0xbd, 0xb6, 
-0x2e, 0x73, 0x37, 0xc6, 0x39, 0xd3, 0xf0, 0x1f, 0x4f, 0x9f, 0x3a, 0xf5, 
-0xf1, 0xc7, 0x1f, 0x7f, 0xfb, 0xed, 0xb7, 0x79, 0xbb, 0xec, 0x7c, 0xa2, 
-0x5e, 0x9b, 0xb9, 0x44, 0x79, 0x43, 0x42, 0xa8, 0x10, 0xca, 0xfb, 0xf0, 
-0x83, 0x0f, 0x5a, 0xe6, 0x37, 0x4c, 0xac, 0xd3, 0x5a, 0x39, 0x2b, 0x28, 
-0xbd, 0xd3, 0x67, 0xe1, 0x56, 0xde, 0xdd, 0x35, 0xab, 0xae, 0x86, 0x95, 
-0x55, 0x18, 0x2a, 0x94, 0x65, 0xcc, 0xc0, 0x37, 0x84, 0x69, 0x20, 0x50, 
-0x09, 0x30, 0x58, 0xb4, 0x49, 0xa3, 0x47, 0xc6, 0xa7, 0xd6, 0x18, 0xbd, 
-0xf5, 0x61, 0x5f, 0x50, 0x21, 0x90, 0xa8, 0x02, 0x81, 0xd8, 0x51, 0x54, 
-0xc8, 0x6b, 0xab, 0xbb, 0xe5, 0xf7, 0x09, 0xe9, 0xd9, 0x19, 0x69, 0xa9, 
-0x9b, 0x36, 0x6e, 0x7c, 0xf9, 0xe5, 0x97, 0x81, 0x04, 0xf2, 0xb1, 0x54, 
-0xb5, 0xa9, 0x60, 0x5d, 0xc2, 0x20, 0x41, 0xb1, 0x25, 0xff, 0xe8, 0xd9, 
-0x67, 0xd3, 0x09, 0x40, 0x1a, 0xb2, 0xb0, 0xcb, 0x91, 0xbf, 0x2b, 0x3d, 
-0x3b, 0xb5, 0x7e, 0x1b, 0xde, 0xdd, 0x99, 0xd3, 0xa7, 0x55, 0x9c, 0xa2, 
-0x68, 0xdb, 0x81, 0x7b, 0xb5, 0xed, 0x98, 0x01, 0x14, 0x3c, 0x14, 0xd3, 
-0x90, 0x8a, 0xe5, 0x12, 0x1b, 0x82, 0x82, 0x31, 0x63, 0xca, 0xe4, 0xb8, 
-0xa4, 0x6a, 0x5d, 0xaf, 0xbe, 0xdd, 0x77, 0x54, 0x54, 0x9e, 0xe0, 0xa4, 
-0xd8, 0x9a, 0x09, 0x15, 0x62, 0x65, 0x31, 0xfa, 0xb6, 0x91, 0xa0, 0x78, 
-0xd4, 0x30, 0xb6, 0xcc, 0xf6, 0x5b, 0xb6, 0x3b, 0x2e, 0x36, 0x7e, 0xd8, 
-0xe0, 0x41, 0x08, 0x24, 0x6f, 0xbd, 0xf5, 0x96, 0x40, 0x42, 0x62, 0xc2, 
-0x54, 0xa5, 0x82, 0x8a, 0xd1, 0x25, 0xcc, 0xa8, 0x80, 0xf4, 0x59, 0xf9, 
-0xc6, 0x33, 0xb6, 0x14, 0x1e, 0xb9, 0xd8, 0xef, 0xbd, 0xe7, 0x05, 0x8d, 
-0xe2, 0x8a, 0x05, 0x0b, 0xb0, 0xf9, 0x48, 0xed, 0x67, 0xb1, 0xcc, 0x56, 
-0x30, 0x2a, 0x74, 0x99, 0x4a, 0xe5, 0x45, 0x89, 0xbc, 0xbd, 0xf8, 0xf2, 
-0xf9, 0x8e, 0xf8, 0xe4, 0x2e, 0x2b, 0x0e, 0xfb, 0x82, 0x8a, 0xe0, 0x89, 
-0x40, 0xbe, 0x89, 0x6d, 0xde, 0xfd, 0x15, 0x16, 0xa8, 0x90, 0xe7, 0x0c, 
-0x6f, 0x54, 0xb4, 0x1b, 0x3e, 0x33, 0x35, 0x31, 0x71, 0x7b, 0x71, 0xf1, 
-0x6b, 0xaf, 0xbd, 0x26, 0xa4, 0x06, 0x24, 0x24, 0xac, 0xa3, 0x5c, 0xb3, 
-0x4f, 0x3d, 0x6f, 0xcc, 0xe2, 0xaf, 0x38, 0x7a, 0xf8, 0x30, 0x18, 0x68, 
-0x7a, 0xc5, 0xa1, 0xb6, 0xb7, 0xba, 0xe2, 0xb7, 0x29, 0x3f, 0x13, 0x9f, 
-0xd5, 0xb0, 0x59, 0xa3, 0xfa, 0x0f, 0x3f, 0xf4, 0x90, 0xd8, 0x8b, 0x91, 
-0xf1, 0x50, 0x76, 0x65, 0x9e, 0x15, 0xc9, 0x2b, 0x0c, 0x1c, 0x03, 0x1d, 
-0x43, 0xd8, 0x05, 0xd4, 0x32, 0x63, 0xca, 0xc4, 0xb8, 0x94, 0xac, 0x71, 
-0x3b, 0xce, 0x85, 0x39, 0x2a, 0xc2, 0xdb, 0x32, 0x5b, 0xab, 0x5d, 0xbf, 
-0xf4, 0x24, 0xe7, 0x3d, 0xa7, 0x4e, 0x61, 0x74, 0x12, 0x99, 0x44, 0xb8, 
-0x84, 0x04, 0x66, 0x57, 0x3c, 0x97, 0xd0, 0x7d, 0xdb, 0x3b, 0xb6, 0x6e, 
-0x01, 0x15, 0xcd, 0x97, 0x1c, 0x6f, 0x7e, 0xd0, 0xe5, 0xc2, 0x1b, 0xb6, 
-0xf9, 0x2c, 0xbf, 0xce, 0x9e, 0x31, 0x03, 0xf4, 0x62, 0x93, 0x15, 0x63, 
-0x80, 0xca, 0x1d, 0xaf, 0x78, 0x54, 0xa8, 0xc8, 0x14, 0x89, 0x98, 0x02, 
-0x9c, 0x90, 0x4a, 0x41, 0x9d, 0x9a, 0x69, 0xf5, 0xdb, 0x10, 0xac, 0x15, 
-0xce, 0xa8, 0x60, 0xd7, 0x0c, 0x6f, 0x5e, 0x51, 0xbb, 0x6d, 0xdf, 0xf4, 
-0xa4, 0xa4, 0x07, 0xee, 0xbf, 0x1f, 0x52, 0x53, 0xb9, 0x13, 0xbc, 0x60, 
-0x3d, 0x77, 0xa2, 0x02, 0xd4, 0x6b, 0x03, 0xeb, 0x10, 0x5e, 0xb1, 0x7e, 
-0xcd, 0x1a, 0x60, 0xd0, 0x62, 0xe5, 0xdd, 0x0d, 0xf6, 0xb9, 0x4a, 0xdd, 
-0x14, 0x2c, 0xba, 0x95, 0x5f, 0x97, 0x2f, 0x5d, 0x4a, 0x9c, 0x05, 0x00, 
-0xc6, 0x6a, 0x4c, 0x44, 0xb3, 0x94, 0x69, 0x0b, 0x24, 0x2b, 0xd5, 0xbe, 
-0x3a, 0x61, 0xe9, 0xe6, 0xd3, 0x3b, 0xbf, 0xbc, 0xf6, 0xea, 0xab, 0x38, 
-0xdd, 0x5b, 0x0e, 0xbc, 0x24, 0x6f, 0xa7, 0xab, 0xe4, 0x42, 0xe8, 0xfd, 
-0xd8, 0xd1, 0x2b, 0x24, 0x58, 0x32, 0xbc, 0x51, 0xd1, 0x69, 0xc2, 0x95, 
-0xc9, 0x09, 0x09, 0xf8, 0x65, 0x55, 0xee, 0x84, 0x04, 0xdb, 0xa9, 0xa8, 
-0xec, 0x8a, 0x87, 0x84, 0xda, 0x83, 0x57, 0xaf, 0x5c, 0xce, 0x6b, 0x6a, 
-0x73, 0xdd, 0x7d, 0xd9, 0xbb, 0x5c, 0xf5, 0x33, 0x47, 0x94, 0xb8, 0x9a, 
-0x35, 0x4e, 0x9f, 0x32, 0x19, 0xe5, 0x07, 0x77, 0x32, 0xce, 0x0a, 0x50, 
-0x51, 0xf1, 0xdd, 0x33, 0x74, 0xf3, 0xb1, 0x1e, 0x44, 0x88, 0x7a, 0xb3, 
-0x66, 0xf5, 0x75, 0xf1, 0xb1, 0x09, 0xa3, 0xae, 0x3f, 0x1a, 0x7a, 0x78, 
-0x30, 0x55, 0x5f, 0x96, 0xac, 0x23, 0x6b, 0xbd, 0x22, 0xec, 0x51, 0x31, 
-0x74, 0xdd, 0x3d, 0xa4, 0x09, 0x90, 0x90, 0x8d, 0xa1, 0x53, 0x0a, 0x9f, 
-0x09, 0xa3, 0x28, 0xbf, 0x0a, 0x99, 0x5e, 0xf7, 0x66, 0xf1, 0x0c, 0xa0, 
-0x2a, 0xac, 0x58, 0xbc, 0xc8, 0xe5, 0x42, 0x59, 0xff, 0x68, 0xe2, 0x36, 
-0x57, 0x28, 0x44, 0x73, 0x97, 0x5e, 0x51, 0x9f, 0x36, 0x4b, 0x8f, 0x9d, 
-0x3b, 0x57, 0x15, 0x78, 0x85, 0x21, 0x13, 0x03, 0x25, 0xa7, 0x69, 0x83, 
-0xfa, 0x29, 0x79, 0x8d, 0x99, 0x67, 0x18, 0xa0, 0x42, 0xba, 0xf6, 0xf8, 
-0x8d, 0x0a, 0x77, 0xfe, 0x97, 0xca, 0x8e, 0x69, 0xb1, 0xc7, 0xc1, 0x1b, 
-0x6e, 0xff, 0x53, 0x52, 0xcd, 0x26, 0x79, 0xd9, 0x35, 0xce, 0x3d, 0xf2, 
-0x88, 0x28, 0xaf, 0xe5, 0x5a, 0x21, 0xd3, 0x2b, 0x24, 0x14, 0xa3, 0x80, 
-0x5f, 0x2d, 0x5d, 0x74, 0x05, 0xa8, 0x18, 0x70, 0xcb, 0xe3, 0x8a, 0xc8, 
-0xfa, 0x2d, 0x76, 0xd5, 0x99, 0x25, 0x5d, 0x1b, 0x0b, 0xb2, 0xae, 0x57, 
-0x54, 0xbc, 0x04, 0x65, 0x08, 0xaa, 0x85, 0xc1, 0xee, 0xd8, 0xb6, 0x2d, 
-0x21, 0x3e, 0xbe, 0xf7, 0xec, 0xd5, 0xa1, 0x0a, 0x89, 0xb2, 0x35, 0xc9, 
-0xad, 0x51, 0x71, 0xfb, 0xed, 0xb7, 0xdb, 0x90, 0xa0, 0xcc, 0x36, 0x66, 
-0x95, 0xf5, 0xa7, 0x42, 0xd8, 0xab, 0x7a, 0x9e, 0x77, 0xaf, 0xcb, 0x5d, 
-0x4a, 0xed, 0x84, 0x31, 0x63, 0xd8, 0x18, 0x14, 0x2a, 0xca, 0x29, 0xc9, 
-0xce, 0x12, 0x15, 0xe2, 0x1a, 0x53, 0x87, 0x64, 0x6c, 0xa3, 0x2d, 0x5c, 
-0x39, 0x8f, 0x9a, 0xb6, 0xf1, 0x23, 0x76, 0x3c, 0xa3, 0xe8, 0x8c, 0x30, 
-0xf2, 0xac, 0xf6, 0x83, 0x99, 0x2d, 0x46, 0x33, 0xd5, 0x2a, 0xa0, 0xfc, 
-0xa2, 0x03, 0x3d, 0x60, 0x58, 0x31, 0x0a, 0x09, 0xa7, 0x65, 0xe9, 0x3a, 
-0xb4, 0x6c, 0xc9, 0x6c, 0x43, 0x98, 0x51, 0x94, 0x03, 0x2a, 0x74, 0xce, 
-0x50, 0x05, 0x02, 0x5a, 0xec, 0x31, 0x0a, 0xa1, 0xb6, 0xb6, 0x3b, 0x7e, 
-0x9d, 0x90, 0xdb, 0xb4, 0x55, 0xd3, 0x82, 0x77, 0xde, 0x7e, 0x1b, 0xf3, 
-0xbf, 0x04, 0x77, 0x94, 0x37, 0x2a, 0x0c, 0x48, 0x30, 0xc7, 0x53, 0xc0, 
-0x2b, 0xae, 0x5d, 0xbe, 0x0c, 0x00, 0x8c, 0xdd, 0x51, 0xca, 0x2b, 0x98, 
-0xed, 0xc0, 0x1b, 0xef, 0x74, 0xc4, 0x25, 0xcd, 0x98, 0x36, 0x15, 0xe3, 
-0xac, 0x54, 0x1b, 0xf1, 0x90, 0x75, 0x64, 0xbe, 0x8b, 0xfa, 0xc6, 0x0e, 
-0xd7, 0x72, 0x77, 0x8e, 0xce, 0x28, 0xc4, 0x26, 0xbb, 0xe8, 0x0a, 0x17, 
-0x5b, 0xeb, 0x79, 0xe9, 0xd5, 0x21, 0xcc, 0x28, 0xca, 0xa2, 0xc2, 0x5a, 
-0xaf, 0x80, 0x57, 0x48, 0xce, 0xae, 0x95, 0xb6, 0xed, 0x35, 0x6a, 0x45, 
-0x3f, 0xa1, 0xaa, 0xdb, 0x22, 0x9a, 0xef, 0xfc, 0x43, 0x5c, 0x46, 0xed, 
-0xc2, 0xb6, 0x6d, 0xa0, 0x33, 0x88, 0xac, 0xfc, 0x50, 0x61, 0x60, 0x08, 
-0x2a, 0xac, 0x08, 0x1d, 0x46, 0x2c, 0x39, 0x7a, 0xec, 0x1d, 0xea, 0x8d, 
-0x14, 0xca, 0x1f, 0xbb, 0xe9, 0xb4, 0x4e, 0x6a, 0xed, 0xf6, 0xfc, 0x31, 
-0xb9, 0x56, 0xd3, 0x36, 0x4d, 0x1a, 0x62, 0xf0, 0xd1, 0x2b, 0x53, 0xe9, 
-0x19, 0xaa, 0x3a, 0xdb, 0x91, 0xbb, 0x88, 0x5a, 0xac, 0x3e, 0xfb, 0x87, 
-0x0d, 0x7d, 0x58, 0xc9, 0xd4, 0x93, 0x5e, 0x92, 0xc7, 0x8e, 0x1c, 0x49, 
-0x8e, 0x8f, 0x4d, 0x2f, 0xe8, 0x1e, 0xf2, 0x05, 0xfd, 0x35, 0x1b, 0x94, 
-0x5b, 0x09, 0xca, 0x36, 0x2a, 0x68, 0x18, 0x69, 0x26, 0xfd, 0xd0, 0xd0, 
-0x2b, 0x5c, 0x41, 0x1f, 0x25, 0x5f, 0xa6, 0x64, 0xe4, 0xf4, 0xea, 0xda, 
-0x45, 0x9c, 0x15, 0x4a, 0xdb, 0x0e, 0xa2, 0xf5, 0xc9, 0x40, 0xa6, 0x02, 
-0x03, 0x1d, 0x09, 0x12, 0x88, 0x2a, 0x71, 0xda, 0xec, 0xbe, 0x92, 0x14, 
-0xba, 0x63, 0xab, 0x2b, 0xe4, 0x69, 0xc2, 0x2d, 0xf7, 0xeb, 0xa8, 0xc8, 
-0x29, 0xf9, 0x67, 0xe3, 0xee, 0xc3, 0x53, 0x1d, 0x8e, 0xc7, 0x1f, 0x7b, 
-0x0c, 0x21, 0x4a, 0xcf, 0x85, 0x52, 0x35, 0xfa, 0x15, 0xf5, 0x03, 0x33, 
-0xec, 0x54, 0xa0, 0x1d, 0x5b, 0x82, 0x2a, 0x77, 0x60, 0x86, 0x87, 0x1d, 
-0xbe, 0x61, 0x80, 0x84, 0xca, 0xea, 0x06, 0x9c, 0x8d, 0x48, 0xc4, 0x8b, 
-0x4b, 0x1a, 0xb1, 0xed, 0x62, 0x61, 0x9e, 0x10, 0x66, 0x17, 0xf6, 0x51, 
-0x81, 0x65, 0xc6, 0x14, 0xf1, 0x61, 0x96, 0x91, 0xaa, 0xba, 0xf2, 0xe0, 
-0xe1, 0x55, 0xa5, 0x6c, 0xfb, 0xb6, 0x61, 0xdb, 0xee, 0xed, 0x5a, 0xb6, 
-0x20, 0x11, 0x19, 0xde, 0xa8, 0x2c, 0xb3, 0x01, 0x0a, 0x51, 0xe6, 0x0d, 
-0x5b, 0x45, 0x9b, 0x0a, 0x06, 0x74, 0x18, 0x80, 0x04, 0x78, 0x14, 0x60, 
-0x60, 0xeb, 0x55, 0xb9, 0xa0, 0x57, 0x11, 0x3d, 0xe1, 0x88, 0x99, 0xb2, 
-0xe7, 0xe9, 0xb2, 0x93, 0x3f, 0xdf, 0x77, 0xd6, 0x2a, 0xde, 0xc8, 0xcc, 
-0xe9, 0xd3, 0x25, 0x40, 0x50, 0x0a, 0x19, 0x4a, 0x92, 0xa0, 0xa4, 0x1f, 
-0x29, 0xb6, 0x73, 0xf3, 0x86, 0x0d, 0xfd, 0x7b, 0xf7, 0x6e, 0x5f, 0xd0, 
-0xb8, 0x55, 0x7e, 0xc3, 0xc5, 0x0b, 0x17, 0x52, 0x29, 0x87, 0x13, 0xb8, 
-0xbb, 0x74, 0x97, 0x14, 0xeb, 0xb3, 0x0e, 0x12, 0x33, 0x33, 0x51, 0xdf, 
-0x08, 0xb7, 0x91, 0x47, 0x50, 0x91, 0xe4, 0x3f, 0xfd, 0xe4, 0x13, 0xda, 
-0xab, 0x32, 0x99, 0x81, 0x57, 0xef, 0x0f, 0x87, 0xc2, 0x9b, 0x6e, 0x50, 
-0x41, 0xef, 0x79, 0xd2, 0x21, 0x1d, 0xfc, 0x53, 0xda, 0xb6, 0x37, 0x54, 
-0x08, 0x97, 0x08, 0x61, 0x54, 0x30, 0xff, 0x6e, 0x53, 0x96, 0x54, 0x4f, 
-0x76, 0xd2, 0x03, 0x92, 0x9d, 0xd5, 0x32, 0x6e, 0x5c, 0x48, 0xdc, 0xec, 
-0x6b, 0xd3, 0x8d, 0xf7, 0x66, 0xa5, 0x59, 0xa7, 0x24, 0x88, 0x09, 0x1a, 
-0x42, 0xd8, 0xd8, 0xbf, 0x77, 0xef, 0x53, 0x4f, 0x3e, 0x09, 0x0c, 0x14, 
-0x12, 0x60, 0x0b, 0xb4, 0x50, 0xe1, 0xe7, 0x67, 0x90, 0xf9, 0x27, 0x9f, 
-0x7c, 0xfc, 0xd1, 0x47, 0xaf, 0xbf, 0xf6, 0xda, 0xd2, 0xab, 0x16, 0xe7, 
-0xa4, 0x3a, 0x53, 0xeb, 0xb5, 0x32, 0x53, 0x5b, 0xe3, 0x92, 0xbf, 0x74, 
-0x18, 0x30, 0x9e, 0x5a, 0x86, 0x03, 0x8b, 0x8a, 0xf6, 0xef, 0xdb, 0xc7, 
-0x85, 0xaa, 0x56, 0x1a, 0x63, 0x4a, 0xe7, 0x48, 0x81, 0x5c, 0xcf, 0x2e, 
-0x94, 0xc4, 0x8c, 0x49, 0x69, 0xde, 0x2f, 0xa9, 0x7e, 0x07, 0xde, 0xf8, 
-0xdd, 0x27, 0x4f, 0xaa, 0x0e, 0x7a, 0x72, 0x8e, 0x19, 0x21, 0x8a, 0x8f, 
-0x19, 0x18, 0x9a, 0x92, 0xee, 0x24, 0x80, 0x1c, 0x00, 0x7f, 0xf2, 0xf1, 
-0xc7, 0x3d, 0x0a, 0x0b, 0x19, 0xb6, 0xdf, 0xe5, 0x1b, 0x43, 0x5e, 0x76, 
-0x32, 0xf9, 0x2b, 0x74, 0x09, 0xaa, 0x0c, 0x2a, 0x44, 0x82, 0x32, 0xa1, 
-0x42, 0x0f, 0xfa, 0xd5, 0xc1, 0x10, 0xc2, 0xc0, 0x18, 0xbe, 0xf6, 0x24, 
-0x6f, 0xf7, 0xca, 0x85, 0x0b, 0x55, 0x15, 0x0f, 0xd5, 0x1e, 0x45, 0x36, 
-0x54, 0x7d, 0xcb, 0xb4, 0xfc, 0x6c, 0x20, 0x26, 0x5d, 0x49, 0x60, 0x28, 
-0x0a, 0xe7, 0xd0, 0x21, 0xbb, 0x6e, 0x6e, 0x4e, 0x86, 0xd3, 0x99, 0x96, 
-0x90, 0x90, 0x5b, 0x2d, 0xb3, 0x55, 0x93, 0xfc, 0xd6, 0x05, 0x4d, 0xf8, 
-0x69, 0x55, 0xd0, 0xa4, 0x79, 0xe3, 0x46, 0x8d, 0x6a, 0xd7, 0xe2, 0xa7, 
-0xa1, 0xfc, 0xd4, 0xaa, 0xc5, 0x99, 0x34, 0xbc, 0x73, 0xe6, 0x36, 0x9a, 
-0xb4, 0xd3, 0x5a, 0x2c, 0x01, 0x18, 0xed, 0x07, 0x4d, 0x62, 0xce, 0x69, 
-0x89, 0x09, 0x2d, 0x0b, 0x9a, 0xcc, 0xba, 0x64, 0xda, 0xfe, 0x3d, 0xbb, 
-0xdf, 0x78, 0xfd, 0x35, 0x5e, 0x19, 0x4c, 0x43, 0x0e, 0x2c, 0x07, 0x9d, 
-0xdb, 0xb6, 0x71, 0x66, 0xe4, 0xd0, 0x05, 0x66, 0xcc, 0x8e, 0x27, 0x63, 
-0x53, 0xaa, 0xb7, 0x2e, 0x68, 0x0c, 0xea, 0x38, 0x87, 0x03, 0x96, 0x28, 
-0x15, 0x07, 0x31, 0x1f, 0xbd, 0xfd, 0xd6, 0x5b, 0x6f, 0xbf, 0xf9, 0xe6, 
-0x3b, 0x6f, 0xbd, 0x25, 0x3f, 0xef, 0xbe, 0xfd, 0xb6, 0xfa, 0x71, 0xfd, 
-0xfa, 0xce, 0x3b, 0xd4, 0x9e, 0xba, 0xf3, 0xe4, 0x89, 0x3b, 0x4f, 0xdc, 
-0x41, 0x3b, 0xfa, 0x13, 0x77, 0x1c, 0xbf, 0x83, 0x22, 0x8a, 0x47, 0x0e, 
-0x77, 0x6e, 0xd7, 0xce, 0x05, 0x89, 0x79, 0xeb, 0x42, 0xdb, 0xee, 0xa4, 
-0x0b, 0xff, 0x56, 0xbc, 0x82, 0x65, 0xf4, 0x15, 0x15, 0x06, 0x75, 0x22, 
-0x64, 0x74, 0x09, 0x83, 0x40, 0xd5, 0x78, 0xe7, 0xe7, 0x38, 0xc8, 0xea, 
-0xe5, 0x64, 0x53, 0xd1, 0x15, 0x81, 0x44, 0xda, 0xb5, 0xa8, 0x7d, 0x57, 
-0xc9, 0x1b, 0x4a, 0x38, 0x31, 0x7f, 0x90, 0x4d, 0x57, 0x0e, 0xd9, 0xa7, 
-0x45, 0x49, 0x60, 0xcb, 0x99, 0x34, 0x66, 0x14, 0x24, 0x1e, 0xeb, 0x88, 
-0x49, 0x6b, 0xd4, 0xb1, 0xde, 0xa4, 0x1b, 0x1b, 0x4c, 0x5b, 0x5f, 0xbd, 
-0xcd, 0xc0, 0xf8, 0xd4, 0x9c, 0xd8, 0xc4, 0xd4, 0x58, 0x67, 0xba, 0x33, 
-0x35, 0x2b, 0xa7, 0x6e, 0x93, 0x82, 0x6e, 0xc3, 0x5a, 0xf7, 0x19, 0xdd, 
-0x71, 0xe0, 0x84, 0x6e, 0xc3, 0xa6, 0xf4, 0x1c, 0x79, 0x49, 0x9f, 0x09, 
-0x73, 0x46, 0x5e, 0xb3, 0x17, 0x3b, 0xac, 0x07, 0xc1, 0x8f, 0x39, 0x8f, 
-0xdc, 0xfc, 0x40, 0xb3, 0xa1, 0xb3, 0x9d, 0x35, 0xea, 0x27, 0xc4, 0x27, 
-0x26, 0x3b, 0x93, 0xd2, 0x12, 0xe3, 0x6b, 0xa4, 0x24, 0xb6, 0x6e, 0xd2, 
-0xa8, 0x7f, 0x8f, 0x6e, 0x97, 0x4e, 0x9a, 0xd8, 0xac, 0x7e, 0x5d, 0xee, 
-0xdb, 0x6f, 0xf6, 0xf5, 0x0c, 0xd2, 0xf2, 0xd0, 0xb7, 0x83, 0x56, 0xee, 
-0x8d, 0x8b, 0x89, 0x4d, 0x8f, 0x73, 0x54, 0x73, 0xc6, 0x95, 0xfd, 0x89, 
-0xcf, 0x70, 0x26, 0x7a, 0xfe, 0x49, 0xa3, 0xd4, 0xb3, 0x33, 0x49, 0xff, 
-0x49, 0x49, 0x74, 0xc6, 0xc7, 0x39, 0xc3, 0x0a, 0x12, 0x6e, 0x2c, 0xb3, 
-0x16, 0xa8, 0x80, 0x35, 0x9b, 0x78, 0x85, 0xca, 0x0e, 0x09, 0x61, 0xe6, 
-0x60, 0xa6, 0xb6, 0x5e, 0x57, 0xdc, 0xc2, 0x4e, 0x31, 0x67, 0xd6, 0x2c, 
-0x89, 0xa4, 0x00, 0x18, 0xd2, 0x53, 0x0b, 0x51, 0x81, 0x0d, 0x15, 0x84, 
-0x40, 0xe2, 0xee, 0x0e, 0x11, 0x87, 0x44, 0x22, 0x92, 0x7c, 0x7f, 0x76, 
-0x62, 0x0c, 0x44, 0xbb, 0x76, 0xec, 0xc8, 0x49, 0x4f, 0x21, 0x34, 0xa8, 
-0x7a, 0x8b, 0x9e, 0x63, 0x76, 0x3d, 0xdb, 0xfd, 0xe8, 0xdf, 0xbb, 0x1e, 
-0xfd, 0x07, 0x61, 0xe1, 0xed, 0x6f, 0xfd, 0xba, 0xe5, 0xc1, 0x7f, 0xe6, 
-0xef, 0xff, 0xa6, 0xce, 0x9e, 0x6f, 0xb3, 0x4a, 0x5c, 0xbd, 0x36, 0xfd, 
-0xd6, 0x50, 0x51, 0xbe, 0xdb, 0xef, 0xfb, 0xf3, 0x84, 0x9d, 0x4f, 0x0c, 
-0x59, 0xb6, 0xb3, 0xe3, 0xe8, 0x39, 0x35, 0x9b, 0x75, 0x4e, 0xad, 0x99, 
-0x9f, 0x9c, 0x55, 0xd7, 0x99, 0x9e, 0x4d, 0xc5, 0x83, 0xbe, 0x73, 0x6e, 
-0x50, 0x75, 0x38, 0x5b, 0x1c, 0xf8, 0x7a, 0xcc, 0x75, 0xfb, 0xfb, 0x8f, 
-0x9d, 0xd1, 0x77, 0xd4, 0xd4, 0x3e, 0x23, 0xa7, 0xf4, 0x1e, 0x3e, 0xb9, 
-0xfb, 0xd0, 0x09, 0x9d, 0x07, 0x8c, 0x29, 0x1c, 0x32, 0xa5, 0xd3, 0xd8, 
-0x05, 0x6d, 0x46, 0xcc, 0x69, 0x36, 0x78, 0x66, 0xc3, 0x7e, 0xd3, 0x6a, 
-0xf6, 0x98, 0x98, 0xd3, 0x75, 0x5c, 0xcd, 0x1e, 0x13, 0x1a, 0xf4, 0x9d, 
-0xc6, 0x37, 0x6d, 0x46, 0xcc, 0xed, 0x38, 0x66, 0x41, 0xcf, 0x99, 0xd7, 
-0xf5, 0x5f, 0x5c, 0x3c, 0x68, 0xe9, 0x8e, 0x61, 0xcb, 0x4b, 0x86, 0xaf, 
-0xd8, 0x35, 0x72, 0xe5, 0xee, 0x51, 0xab, 0xf6, 0xc0, 0xc7, 0xc2, 0x41, 
-0x97, 0xf0, 0x83, 0x57, 0x58, 0xa1, 0xc2, 0xe0, 0xb9, 0x0b, 0x55, 0xfe, 
-0x60, 0x20, 0xc4, 0xfc, 0x9d, 0x5f, 0x64, 0x36, 0xe9, 0x42, 0xa1, 0xc8, 
-0x0d, 0xeb, 0xd7, 0x11, 0x3f, 0x8b, 0xb9, 0x1a, 0xd3, 0x8d, 0x04, 0xa5, 
-0x02, 0x0f, 0x91, 0x37, 0x2c, 0x0f, 0xfe, 0xc4, 0x21, 0x62, 0x09, 0x48, 
-0x40, 0x35, 0xf8, 0xd1, 0x73, 0xcf, 0xed, 0xdf, 0xb7, 0xb7, 0x3f, 0x35, 
-0xff, 0x1c, 0x54, 0xfd, 0x6b, 0x34, 0xf4, 0x86, 0xdb, 0xc1, 0x80, 0xdf, 
-0x74, 0x6f, 0xff, 0xc2, 0xb4, 0xed, 0xdf, 0x37, 0xdc, 0xfb, 0xcf, 0xb6, 
-0x07, 0xff, 0xde, 0xf9, 0xe0, 0xe7, 0x53, 0xf6, 0x3f, 0xef, 0x46, 0xb0, 
-0x39, 0x4f, 0x42, 0x9f, 0xe9, 0xa7, 0xaa, 0x5b, 0xcf, 0xed, 0x2f, 0x42, 
-0x40, 0x67, 0xda, 0x94, 0xa0, 0x3c, 0xa2, 0x22, 0x4c, 0xf0, 0xa0, 0xd6, 
-0x71, 0xc2, 0x9e, 0x67, 0x9d, 0x35, 0x5c, 0x52, 0x47, 0xc7, 0x56, 0xcd, 
-0xbb, 0xb6, 0x6f, 0xdb, 0xb3, 0x53, 0x87, 0x51, 0x83, 0x07, 0x4d, 0x1e, 
-0x37, 0x66, 0xe2, 0x98, 0x51, 0xf3, 0x2e, 0x9b, 0xbd, 0x7c, 0xc9, 0x92, 
-0xa5, 0x57, 0x5d, 0x75, 0xc3, 0x75, 0xd7, 0x6d, 0xb9, 0xf9, 0xe6, 0x6b, 
-0xae, 0xbe, 0x7a, 0xd9, 0x92, 0x25, 0x2b, 0x96, 0x2e, 0x5d, 0x72, 0xe5, 
-0x95, 0xd3, 0x27, 0x4f, 0x9c, 0x34, 0x66, 0xf4, 0xa4, 0xb1, 0xa3, 0x39, 
-0xad, 0xa8, 0x7b, 0xb7, 0x6e, 0xed, 0x5a, 0xe7, 0x56, 0xcb, 0x60, 0x79, 
-0x63, 0x12, 0x52, 0x6a, 0xf6, 0xbd, 0x74, 0x64, 0xc9, 0x33, 0xcd, 0xf7, 
-0xfb, 0x91, 0xda, 0x1f, 0x25, 0xd3, 0xca, 0x58, 0x01, 0xfb, 0xa8, 0x40, 
-0x1b, 0x2b, 0x6b, 0x99, 0x0d, 0x2b, 0xc1, 0xc9, 0xb0, 0xb5, 0x34, 0xd9, 
-0xf5, 0xc5, 0x80, 0x79, 0x37, 0xb6, 0xef, 0x3d, 0x3c, 0xbf, 0x63, 0xdf, 
-0xf4, 0x7a, 0xad, 0x1c, 0x09, 0x69, 0x90, 0xb7, 0xc3, 0x41, 0x55, 0x7c, 
-0x0f, 0x87, 0x9c, 0xc0, 0x4f, 0x7c, 0x4a, 0xcd, 0xfc, 0x86, 0xed, 0xfb, 
-0x76, 0x19, 0x7f, 0xf9, 0x88, 0x35, 0xb7, 0x4d, 0xde, 0xfb, 0x5c, 0xb3, 
-0x7d, 0x9e, 0x14, 0x83, 0x80, 0x76, 0x35, 0x5f, 0x9c, 0xf7, 0xd1, 0x1b, 
-0xd9, 0x5d, 0x01, 0x3b, 0x96, 0x59, 0x44, 0x02, 0x78, 0x85, 0x1b, 0x54, 
-0x84, 0x1b, 0xa3, 0x30, 0x2f, 0x5c, 0x5a, 0xf1, 0x77, 0x0d, 0xf6, 0x7c, 
-0xdd, 0x66, 0xff, 0x97, 0x85, 0x07, 0xff, 0x32, 0xe5, 0xc0, 0x4b, 0x63, 
-0x77, 0x3e, 0x3d, 0x68, 0xeb, 0xe3, 0xed, 0x57, 0x9e, 0x68, 0x74, 0x59, 
-0x49, 0x87, 0xeb, 0x4e, 0x0f, 0xda, 0xf2, 0xd8, 0xb8, 0x5d, 0xcf, 0x4c, 
-0x39, 0xf0, 0x22, 0xe2, 0x4a, 0x87, 0x83, 0x5f, 0x22, 0xae, 0xd4, 0xdd, 
-0xfd, 0x4d, 0x4a, 0xb1, 0x2b, 0xe4, 0x3b, 0xfa, 0x13, 0xaa, 0x2b, 0x60, 
-0x42, 0x85, 0x38, 0x49, 0x8d, 0x36, 0x28, 0xf7, 0x12, 0x54, 0xf4, 0xdd, 
-0x47, 0x57, 0x20, 0xec, 0x56, 0xc0, 0x2b, 0x2a, 0x8e, 0x1f, 0x3f, 0x8e, 
-0x12, 0x69, 0xc5, 0x2b, 0xc2, 0x6e, 0x2d, 0xa2, 0xbb, 0x7b, 0x74, 0x05, 
-0xdc, 0x78, 0xf1, 0x8c, 0xbc, 0x22, 0x8a, 0x8a, 0x50, 0x15, 0x03, 0xa2, 
-0x24, 0xee, 0xf7, 0x0a, 0xd8, 0xe4, 0x15, 0xc4, 0x90, 0x9a, 0xf4, 0x8a, 
-0x28, 0xaf, 0x88, 0xae, 0x40, 0x98, 0xae, 0x80, 0x86, 0x0a, 0xd2, 0x80, 
-0x55, 0x21, 0x7a, 0xa3, 0x5e, 0x01, 0x2a, 0x60, 0x22, 0x65, 0xec, 0x2f, 
-0x9b, 0xfd, 0x77, 0x39, 0x45, 0x77, 0xdf, 0xe8, 0x0a, 0x54, 0xe9, 0x15, 
-0xf0, 0x8a, 0x0a, 0x91, 0xa0, 0x04, 0x15, 0xb1, 0xb1, 0x84, 0xa2, 0xfd, 
-0x70, 0x6c, 0x0a, 0xb3, 0xde, 0xb2, 0x61, 0xba, 0xed, 0xf9, 0x2d, 0x45, 
-0x44, 0xec, 0x85, 0x10, 0xf6, 0x0f, 0x07, 0x04, 0x6f, 0xcd, 0x2b, 0x74, 
-0x54, 0xe4, 0xe4, 0xe4, 0x94, 0xa2, 0x62, 0xe5, 0x27, 0x55, 0x1a, 0xee, 
-0x11, 0xfb, 0x52, 0xa3, 0x0f, 0x1e, 0xe0, 0x0a, 0x40, 0xd8, 0x3f, 0x1c, 
-0x35, 0x6a, 0xd4, 0x70, 0x8b, 0x0a, 0x89, 0xbb, 0x84, 0x57, 0x74, 0xeb, 
-0xd6, 0xad, 0x14, 0x15, 0x13, 0x8e, 0x44, 0x51, 0x11, 0x5d, 0x81, 0x30, 
-0x5c, 0x01, 0x08, 0xfb, 0x87, 0xa3, 0x73, 0xe7, 0xce, 0x82, 0x0a, 0x42, 
-0x7e, 0x88, 0x88, 0xa3, 0x73, 0xea, 0xc5, 0xfc, 0x0a, 0x78, 0x85, 0xa0, 
-0x82, 0x3f, 0x2c, 0x59, 0xb2, 0xa4, 0x14, 0x15, 0x05, 0x83, 0xc2, 0x70, 
-0x45, 0x02, 0xdc, 0x66, 0xa2, 0x97, 0x87, 0xc1, 0x0a, 0x14, 0x0c, 0x4a, 
-0x4b, 0x23, 0x94, 0xc1, 0x75, 0x2c, 0x58, 0xb0, 0x40, 0x5a, 0xe6, 0x5a, 
-0xa0, 0x82, 0x70, 0x51, 0x80, 0x42, 0x00, 0x29, 0x2d, 0x1d, 0xca, 0x28, 
-0xdc, 0xb3, 0x1f, 0x8d, 0x02, 0x23, 0xba, 0x02, 0x61, 0xb5, 0x02, 0x90, 
-0xb4, 0x76, 0xdc, 0x79, 0xe7, 0x9d, 0xc4, 0x86, 0x4a, 0xf4, 0x34, 0xe1, 
-0xa1, 0xa5, 0xbc, 0xe2, 0x8e, 0x3b, 0xee, 0x90, 0xbe, 0x04, 0xe4, 0x1b, 
-0x00, 0x9a, 0x1e, 0x3d, 0x7a, 0x94, 0x5e, 0x95, 0xdd, 0xd4, 0x71, 0x53, 
-0x68, 0x16, 0x12, 0x0d, 0x83, 0x2d, 0x2d, 0xfa, 0x08, 0x41, 0x5f, 0x01, 
-0x88, 0x39, 0xbb, 0xe9, 0x94, 0x29, 0x53, 0x84, 0xc2, 0x11, 0x9f, 0xa4, 
-0x6b, 0xae, 0xca, 0xfe, 0x2d, 0x45, 0xc5, 0x89, 0x13, 0x27, 0xa4, 0x03, 
-0x39, 0xee, 0x6d, 0x40, 0x83, 0x40, 0x55, 0x86, 0x5d, 0xe4, 0x17, 0x45, 
-0x81, 0x11, 0x56, 0x9b, 0x65, 0xd0, 0x49, 0x2d, 0x54, 0x06, 0x04, 0x12, 
-0xf9, 0x45, 0x57, 0x5e, 0x79, 0xa5, 0x22, 0xef, 0xdd, 0xbb, 0x77, 0x93, 
-0xc1, 0x4f, 0x75, 0x46, 0x55, 0x9d, 0x9e, 0x6c, 0xed, 0x8b, 0x7a, 0x05, 
-0xa8, 0x20, 0x8d, 0x86, 0x00, 0x41, 0x8c, 0xb3, 0x14, 0xbf, 0xe0, 0xa4, 
-0x69, 0xd3, 0xa6, 0x95, 0x01, 0x06, 0x1c, 0x23, 0x2a, 0x4a, 0x85, 0xca, 
-0xbb, 0x8f, 0xce, 0xd3, 0x72, 0x05, 0x20, 0xe0, 0xec, 0xa6, 0x3a, 0x24, 
-0xc6, 0x8d, 0x1b, 0xf7, 0xca, 0x2b, 0xaf, 0xd0, 0x2b, 0x59, 0xda, 0x83, 
-0x48, 0x67, 0x9f, 0x32, 0xa8, 0x20, 0xf5, 0x0c, 0x85, 0x1b, 0xd5, 0x82, 
-0x3f, 0x53, 0x64, 0x05, 0x00, 0x75, 0xed, 0xda, 0xb5, 0x0c, 0x30, 0xf8, 
-0x05, 0xe5, 0x1b, 0xe5, 0x1d, 0xab, 0x56, 0xd4, 0x8f, 0x11, 0xa5, 0xbc, 
-0xaa, 0xbf, 0x02, 0xf8, 0xa0, 0x21, 0x54, 0xc8, 0x15, 0xa2, 0x85, 0x74, 
-0x1d, 0x0e, 0x25, 0x38, 0xf1, 0xb9, 0x53, 0xa7, 0x4e, 0xcf, 0x3c, 0xf3, 
-0xcc, 0xeb, 0xaf, 0xbf, 0x2e, 0x1d, 0xd6, 0xa5, 0x51, 0x28, 0x10, 0x40, 
-0x50, 0xba, 0xc8, 0x2b, 0x4e, 0x9e, 0x3c, 0x29, 0x4d, 0x09, 0x10, 0xa2, 
-0xd0, 0x39, 0x50, 0x2d, 0x48, 0x41, 0xa6, 0x21, 0x50, 0x17, 0x57, 0xd9, 
-0x08, 0x37, 0x47, 0x8c, 0xe6, 0xec, 0x73, 0x7b, 0x52, 0xf4, 0x0f, 0xd1, 
-0x15, 0xa8, 0x12, 0x2b, 0xa0, 0x2c, 0x4e, 0x32, 0x9b, 0xf6, 0xed, 0xdb, 
-0x9f, 0x3d, 0x7b, 0x16, 0x0a, 0xa7, 0x86, 0x2f, 0xed, 0x41, 0xd0, 0x1a, 
-0xa4, 0xa4, 0x10, 0x10, 0x28, 0x45, 0x05, 0x6a, 0xb8, 0xea, 0x61, 0x23, 
-0xf1, 0xe4, 0x9c, 0x4a, 0xea, 0x26, 0xcd, 0xe3, 0xe0, 0x32, 0x55, 0xe2, 
-0xb1, 0xa2, 0x93, 0x88, 0xae, 0x40, 0x90, 0x56, 0x60, 0xc4, 0x88, 0x11, 
-0x18, 0x5a, 0x9f, 0x7d, 0xf6, 0x59, 0x69, 0x79, 0xa5, 0x7a, 0x85, 0x12, 
-0xde, 0x81, 0x1e, 0x81, 0x36, 0x71, 0x91, 0x57, 0x80, 0x0a, 0x55, 0x1f, 
-0x0e, 0xc4, 0xc0, 0x2e, 0xe0, 0x29, 0xb8, 0x36, 0x68, 0x1e, 0xf7, 0xe2, 
-0x8b, 0x2f, 0x6e, 0xdb, 0xb6, 0xad, 0x79, 0x7b, 0x57, 0x79, 0xac, 0xe8, 
-0x11, 0x5d, 0x81, 0x90, 0x5e, 0x81, 0xc6, 0xad, 0x3a, 0xae, 0x5b, 0xb7, 
-0xee, 0xd1, 0x47, 0x1f, 0x7d, 0xfa, 0xe9, 0xa7, 0xd1, 0x28, 0xd8, 0xf7, 
-0xd9, 0xfd, 0x51, 0xa4, 0x55, 0x17, 0x38, 0x24, 0xa6, 0x32, 0xa8, 0x90, 
-0x5a, 0xa2, 0x68, 0x17, 0xd2, 0x21, 0x53, 0xb4, 0x0b, 0xe4, 0xa8, 0x37, 
-0xdf, 0x7c, 0x93, 0xeb, 0x9f, 0x7e, 0xe6, 0xb9, 0x8d, 0xdb, 0xf7, 0xf6, 
-0x9f, 0x38, 0x3b, 0x35, 0xbf, 0x5b, 0x5c, 0x5a, 0x0d, 0x47, 0x54, 0x7c, 
-0x0a, 0x69, 0xea, 0x88, 0x9c, 0xc9, 0xd3, 0xaf, 0x24, 0x2d, 0x3b, 0xa5, 
-0x51, 0xe7, 0x6e, 0xa3, 0x2e, 0x5d, 0xbb, 0xb9, 0xf8, 0xfe, 0x87, 0x1e, 
-0x79, 0xe2, 0x89, 0x27, 0x9e, 0x7b, 0xee, 0x39, 0x48, 0x1a, 0x83, 0xac, 
-0x68, 0x14, 0x52, 0xe4, 0x45, 0xca, 0x31, 0x02, 0x01, 0x38, 0x84, 0x8b, 
-0x57, 0xa4, 0xa4, 0xa4, 0xdc, 0x75, 0xd7, 0x5d, 0x52, 0x32, 0x9e, 0xea, 
-0x46, 0x98, 0x68, 0x55, 0xc5, 0x34, 0x74, 0x73, 0x38, 0x06, 0x90, 0x42, 
-0x29, 0x79, 0xe9, 0xa5, 0x97, 0x9e, 0x7c, 0xfa, 0xb9, 0xfb, 0x1e, 0x7d, 
-0xf2, 0xde, 0x87, 0xce, 0xdd, 0xf3, 0xe0, 0x23, 0x77, 0xdd, 0x77, 0xf6, 
-0xce, 0x33, 0x0f, 0xde, 0x79, 0xef, 0x03, 0xfc, 0x9c, 0x3c, 0x7d, 0xbf, 
-0x4f, 0x3f, 0x27, 0xee, 0xb9, 0xcf, 0x8f, 0x9f, 0x3b, 0x4e, 0x9d, 0xf1, 
-0xfa, 0x73, 0xfc, 0xee, 0x7b, 0x0d, 0xe7, 0xf0, 0x8d, 0xd7, 0x9f, 0xdb, 
-0xef, 0x3a, 0xed, 0xf5, 0xe7, 0xb6, 0x3b, 0xef, 0x31, 0x9c, 0xc3, 0x37, 
-0x5e, 0x7f, 0x8e, 0x9d, 0x3c, 0x65, 0x38, 0x87, 0x6f, 0x82, 0xf5, 0xe3, 
-0xf5, 0xee, 0x96, 0x73, 0xf6, 0xfa, 0xa4, 0x9c, 0x60, 0x58, 0x31, 0xf3, 
-0x37, 0x96, 0x4b, 0x6a, 0x5e, 0x79, 0xaf, 0xef, 0x8b, 0x13, 0xec, 0x53, 
-0x82, 0x7d, 0x1a, 0x13, 0xb2, 0x74, 0xd1, 0xe7, 0x99, 0x07, 0xef, 0xbe, 
-0xff, 0xa1, 0x53, 0xf7, 0x3f, 0x7c, 0xf6, 0x91, 0x73, 0x4f, 0x3e, 0xf9, 
-0x24, 0x78, 0x40, 0xf6, 0x41, 0x70, 0x12, 0x48, 0x48, 0x27, 0x17, 0x78, 
-0x80, 0xc8, 0x4e, 0x52, 0xa1, 0xb4, 0x14, 0x15, 0x77, 0xdf, 0x7d, 0xb7, 
-0x74, 0x67, 0x13, 0x76, 0xa1, 0x3c, 0x7a, 0x30, 0x17, 0x38, 0x06, 0x9e, 
-0x3f, 0xac, 0x57, 0xe8, 0x25, 0x0c, 0x87, 0xa6, 0xf1, 0xfc, 0xf3, 0xcf, 
-0x33, 0x3a, 0x3c, 0xe8, 0xa9, 0xa7, 0xa8, 0x16, 0xe9, 0x3a, 0xc0, 0x9f, 
-0x4f, 0x07, 0xed, 0xdf, 0xfd, 0x38, 0x1e, 0xf3, 0xeb, 0x38, 0x67, 0xfb, 
-0x80, 0xb1, 0xfa, 0x74, 0x20, 0x9b, 0xfa, 0x71, 0x3c, 0x1c, 0x8c, 0xc3, 
-0xfe, 0x7d, 0x7d, 0x7a, 0x22, 0x75, 0xb2, 0xed, 0x35, 0x2b, 0x73, 0xa2, 
-0x5f, 0xef, 0xe7, 0x31, 0x3b, 0x94, 0xe0, 0x13, 0x75, 0x71, 0xb2, 0x90, 
-0x25, 0xf4, 0xc9, 0x81, 0xa1, 0x09, 0x72, 0x45, 0xb1, 0x66, 0x5b, 0x87, 
-0x80, 0x51, 0x0a, 0xde, 0x7f, 0xff, 0x7d, 0x20, 0x21, 0x4d, 0xa5, 0x45, 
-0x76, 0xd2, 0xdb, 0x85, 0xc2, 0x21, 0x2e, 0xf2, 0x0a, 0x41, 0x85, 0x54, 
-0x4a, 0x95, 0x6a, 0xbb, 0x62, 0xa5, 0x45, 0x31, 0xe7, 0x4a, 0x4c, 0x52, 
-0xb4, 0x66, 0x63, 0x20, 0x86, 0x03, 0x64, 0x6f, 0xbc, 0xf1, 0x06, 0xa3, 
-0xc3, 0x83, 0x40, 0x08, 0x77, 0xe2, 0x00, 0x7f, 0x3e, 0x1d, 0x4c, 0xd1, 
-0x8f, 0x03, 0x34, 0xfa, 0x71, 0xfc, 0xc8, 0xf6, 0xc1, 0xda, 0xf9, 0x74, 
-0xa0, 0xae, 0xf9, 0x71, 0xf0, 0x92, 0x02, 0x3f, 0xec, 0xdf, 0xd7, 0xa7, 
-0x27, 0x52, 0x27, 0xdb, 0x5e, 0xb3, 0x32, 0x27, 0xfa, 0xf1, 0x76, 0xb8, 
-0xc4, 0x0e, 0x25, 0xf8, 0x44, 0x5d, 0x9c, 0x2c, 0x64, 0x09, 0x7d, 0x72, 
-0xfc, 0xf8, 0xc7, 0x3f, 0x86, 0x5c, 0x51, 0x04, 0xd8, 0xd6, 0x21, 0x60, 
-0x64, 0x1f, 0xdc, 0x71, 0x70, 0x09, 0x81, 0x84, 0xd8, 0x9d, 0x44, 0x76, 
-0x82, 0xf8, 0x41, 0x01, 0xa8, 0x40, 0x7a, 0x72, 0x49, 0x50, 0xa0, 0x42, 
-0xba, 0x51, 0x29, 0x39, 0x4a, 0xfa, 0x77, 0x00, 0x0c, 0xae, 0xc4, 0x94, 
-0x8b, 0x3f, 0x1c, 0x09, 0x0c, 0x6c, 0xe0, 0x1b, 0x47, 0xd9, 0x80, 0x75, 
-0xe0, 0xd0, 0x40, 0xb2, 0x02, 0x24, 0x1e, 0x0e, 0xe6, 0xe1, 0xf7, 0x01, 
-0xa6, 0x83, 0x72, 0xb0, 0x1c, 0x36, 0x0f, 0xd0, 0xee, 0xd3, 0x81, 0x54, 
-0x19, 0x94, 0x83, 0x77, 0x66, 0xe7, 0xf0, 0xef, 0x5e, 0x3e, 0x3d, 0x91, 
-0x3a, 0xd9, 0xe6, 0x8a, 0x19, 0x4e, 0x0b, 0xca, 0xfb, 0x62, 0x10, 0xfb, 
-0x34, 0xe3, 0x99, 0xfc, 0xa0, 0x4f, 0x0e, 0x90, 0x00, 0xb9, 0x02, 0x06, 
-0x44, 0x1e, 0xf0, 0x00, 0x8b, 0xc0, 0x0e, 0x8b, 0xe0, 0x04, 0x61, 0x2b, 
-0x75, 0x42, 0xef, 0x07, 0x02, 0x16, 0x8c, 0xa8, 0x30, 0x00, 0x03, 0x8e, 
-0x01, 0x7f, 0x41, 0xf0, 0x12, 0x6c, 0x00, 0x2f, 0x46, 0x04, 0x67, 0x0c, 
-0x0d, 0x42, 0xb8, 0x07, 0x2a, 0xbc, 0xd7, 0x03, 0x20, 0xa9, 0x73, 0xf8, 
-0x1c, 0xc4, 0x83, 0xe7, 0x0c, 0xca, 0x01, 0x1b, 0xf4, 0xe3, 0x60, 0xa1, 
-0x83, 0x72, 0xb0, 0xcb, 0xd8, 0x39, 0xfc, 0xbb, 0x97, 0x1f, 0xcf, 0x65, 
-0x79, 0x49, 0x50, 0xd6, 0x59, 0x7a, 0x6b, 0xf8, 0x7d, 0xe8, 0x54, 0xe4, 
-0x95, 0xea, 0x38, 0x01, 0xfa, 0xe4, 0x40, 0x37, 0x86, 0x5c, 0xd9, 0xd3, 
-0x21, 0x5d, 0x34, 0x02, 0x72, 0x25, 0x90, 0x80, 0x88, 0xe1, 0x90, 0x86, 
-0x07, 0x4a, 0x9d, 0x50, 0xad, 0x1a, 0x8c, 0xa8, 0x10, 0x76, 0xa1, 0x03, 
-0x43, 0x74, 0x0c, 0x98, 0x06, 0xd8, 0x00, 0x58, 0xb8, 0x32, 0x18, 0x11, 
-0x78, 0x30, 0x34, 0x08, 0x91, 0x83, 0x3b, 0x05, 0x7e, 0xc0, 0x8b, 0x18, 
-0x84, 0xff, 0xe5, 0xd0, 0x3f, 0xab, 0x2f, 0x03, 0xf9, 0xc0, 0x8a, 0xc8, 
-0xa1, 0x06, 0x51, 0xdf, 0x04, 0xf8, 0x01, 0xf1, 0xb2, 0x6a, 0x1e, 0x01, 
-0x3e, 0x97, 0xe1, 0x72, 0xd6, 0xcd, 0xc3, 0x1a, 0x06, 0xf2, 0x6a, 0xcc, 
-0xd7, 0xca, 0xdb, 0x0f, 0x9c, 0xa8, 0x84, 0x3e, 0x61, 0x0b, 0x90, 0x2b, 
-0x86, 0x26, 0x48, 0x17, 0x02, 0x66, 0x8b, 0x07, 0x0f, 0xd8, 0x93, 0x20, 
-0x6c, 0x33, 0x24, 0x80, 0x80, 0x05, 0x2a, 0x0c, 0xc0, 0x90, 0xbe, 0x4f, 
-0xaa, 0x25, 0x8f, 0x74, 0x21, 0x01, 0x21, 0x8c, 0x0b, 0x48, 0xe4, 0xe0, 
-0x36, 0xc1, 0x3a, 0x40, 0xb0, 0x1c, 0x6a, 0x40, 0x9f, 0xbe, 0x51, 0x27, 
-0x07, 0xf2, 0x81, 0x85, 0x53, 0x97, 0xf3, 0x59, 0x0e, 0x3b, 0xdf, 0xa8, 
-0x93, 0xab, 0xc8, 0x07, 0x3b, 0x73, 0xf6, 0x70, 0x4e, 0x20, 0x6b, 0x68, 
-0x79, 0xad, 0xaf, 0xef, 0x34, 0x70, 0xa2, 0x52, 0x24, 0x2a, 0xe5, 0x83, 
-0xa5, 0xb1, 0x81, 0x2a, 0xb0, 0x0d, 0x61, 0x4b, 0xfd, 0x79, 0xe1, 0x12, 
-0xaa, 0x63, 0x89, 0x35, 0x2a, 0x74, 0x60, 0xa8, 0x86, 0x3d, 0x7a, 0xab, 
-0x1e, 0xe9, 0xd3, 0xa3, 0x0e, 0x77, 0x85, 0x8a, 0xcb, 0xe9, 0x7b, 0xa9, 
-0x7f, 0xac, 0x17, 0x48, 0x0e, 0xf0, 0x1b, 0x75, 0x79, 0xe0, 0x1f, 0xa4, 
-0x2a, 0x33, 0x2f, 0x40, 0x0e, 0x69, 0x1c, 0xa1, 0x0e, 0xfd, 0x57, 0x39, 
-0x33, 0xf0, 0x6f, 0x0c, 0x73, 0x66, 0x40, 0x28, 0xc0, 0xce, 0xe1, 0x6e, 
-0x86, 0x32, 0x82, 0xfa, 0xab, 0xde, 0x22, 0xc3, 0xe6, 0x3a, 0xab, 0x47, 
-0x93, 0x41, 0xd4, 0x64, 0x0c, 0xab, 0xe1, 0xa1, 0xc4, 0x75, 0xb0, 0x28, 
-0x47, 0xa7, 0x52, 0x29, 0x20, 0x2f, 0xc5, 0xe4, 0xd9, 0xe5, 0x05, 0x12, 
-0xd2, 0xab, 0xc4, 0xd0, 0xc4, 0xc7, 0x2d, 0x2a, 0xa4, 0xa9, 0x8f, 0x92, 
-0xa6, 0xdc, 0x75, 0x76, 0x93, 0x0e, 0x3a, 0x15, 0x7c, 0x48, 0xb3, 0x08, 
-0xd5, 0xe3, 0x47, 0xb5, 0x8f, 0xa8, 0xdc, 0x6f, 0x78, 0xf7, 0xe8, 0x06, 
-0x58, 0x03, 0x89, 0xa2, 0xd9, 0xb4, 0x69, 0xd3, 0x9a, 0x35, 0x6b, 0x1e, 
-0x78, 0xe0, 0x01, 0xd5, 0x13, 0x43, 0xcd, 0x59, 0x26, 0xa9, 0xff, 0xea, 
-0xf7, 0x67, 0xd5, 0xe2, 0x48, 0xad, 0x06, 0xc1, 0x6c, 0xab, 0x57, 0xaf, 
-0xbe, 0xee, 0xba, 0xeb, 0xae, 0xbf, 0xfe, 0xfa, 0x1b, 0x6e, 0xb8, 0x81, 
-0x39, 0xac, 0x5d, 0xbb, 0x16, 0x57, 0xee, 0x86, 0x0d, 0x1b, 0x6e, 0xbe, 
-0xf9, 0xe6, 0xcd, 0x9b, 0x37, 0x6f, 0xd9, 0xb2, 0x65, 0xeb, 0xd6, 0xad, 
-0xdb, 0xb7, 0x6f, 0xdf, 0xb1, 0x63, 0xc7, 0xce, 0x9d, 0x3b, 0xd1, 0x41, 
-0x65, 0x86, 0x22, 0x0e, 0x60, 0x57, 0xe5, 0xfc, 0xf5, 0xeb, 0xd7, 0x1f, 
-0x3a, 0x74, 0xe8, 0xbe, 0xfb, 0xee, 0xc3, 0xba, 0xc4, 0x09, 0x88, 0x31, 
-0x90, 0xaf, 0xf9, 0x5e, 0xe6, 0x6f, 0x20, 0x7a, 0x14, 0x4e, 0xcc, 0x06, 
-0xf7, 0xdf, 0x7f, 0xff, 0xae, 0x5d, 0xbb, 0x96, 0x2f, 0x5f, 0xbe, 0x7f, 
-0xff, 0x7e, 0xa6, 0xc1, 0x04, 0xf8, 0x95, 0x04, 0x1e, 0x2c, 0xd2, 0xd8, 
-0x85, 0x58, 0x25, 0xe4, 0x19, 0xa1, 0xcb, 0x0a, 0xa3, 0x1c, 0x44, 0x5c, 
-0x0c, 0x53, 0x38, 0xad, 0x59, 0x0a, 0xe6, 0xc3, 0x6b, 0x92, 0xbe, 0x81, 
-0x96, 0x7d, 0x34, 0xbd, 0xa0, 0xc2, 0x80, 0x0d, 0xbd, 0x3f, 0xa7, 0xb9, 
-0x73, 0x94, 0xbb, 0x6f, 0xf4, 0x3e, 0x40, 0x3a, 0x41, 0x48, 0xc8, 0x3a, 
-0x3a, 0x10, 0x12, 0x24, 0x9f, 0xcd, 0xb4, 0x2e, 0xdc, 0xcd, 0xb2, 0xab, 
-0x90, 0x87, 0x7e, 0x2b, 0x41, 0xfc, 0x93, 0x34, 0x6d, 0x51, 0x44, 0xc3, 
-0x8b, 0x64, 0x71, 0x31, 0xf3, 0x41, 0x31, 0x7b, 0xf6, 0xec, 0x81, 0xfe, 
-0x66, 0xce, 0x9c, 0x39, 0x60, 0xc0, 0x80, 0x96, 0x2d, 0x5b, 0x56, 0xab, 
-0x56, 0xcd, 0xd2, 0x59, 0x3c, 0x64, 0xc8, 0x10, 0xd5, 0xd2, 0xdb, 0xb2, 
-0x59, 0x8c, 0xde, 0x1a, 0xc6, 0x40, 0x67, 0xfa, 0x7d, 0xb9, 0x35, 0xd6, 
-0x0e, 0xee, 0x0e, 0xd9, 0xf1, 0x41, 0x35, 0xd6, 0x50, 0x18, 0xc3, 0x1e, 
-0xd8, 0xa6, 0x4d, 0x1b, 0x3f, 0x1c, 0xd6, 0x57, 0x5f, 0x7d, 0xb5, 0x6c, 
-0xcc, 0x13, 0x27, 0x4e, 0xf4, 0x70, 0x79, 0x7c, 0x7c, 0x7c, 0x66, 0x66, 
-0x66, 0x5e, 0x5e, 0x5e, 0xfd, 0xfa, 0xf5, 0x1b, 0x37, 0x6e, 0x9c, 0x9f, 
-0x9f, 0xdf, 0xa4, 0x49, 0x13, 0xfe, 0x6f, 0x44, 0xdb, 0xa6, 0xda, 0xb5, 
-0xab, 0x57, 0xaf, 0x9e, 0x98, 0x48, 0xd7, 0x03, 0xdf, 0x0e, 0x06, 0x6c, 
-0xd0, 0xa0, 0x01, 0x51, 0x7a, 0x45, 0x45, 0x45, 0xe3, 0xc7, 0x8f, 0xbf, 
-0xec, 0xb2, 0xcb, 0xc8, 0x75, 0x23, 0x1a, 0x75, 0xf8, 0xf0, 0xe1, 0x33, 
-0x66, 0xcc, 0x58, 0xb1, 0x62, 0x05, 0x30, 0x3e, 0x7c, 0xf8, 0x30, 0x18, 
-0x03, 0x4b, 0xa8, 0xe9, 0xc8, 0xa5, 0x86, 0xcd, 0x45, 0x7a, 0x9a, 0xa9, 
-0x96, 0x7f, 0xe2, 0x83, 0xc6, 0xd4, 0x0b, 0x02, 0xa1, 0xfe, 0xb9, 0x73, 
-0xe7, 0x0e, 0x1a, 0x34, 0xa8, 0x69, 0xd3, 0xa6, 0x96, 0x73, 0x23, 0x51, 
-0x02, 0xd6, 0xc1, 0xe5, 0xe6, 0x7e, 0x88, 0xb6, 0x50, 0xa1, 0xb7, 0x87, 
-0x33, 0x34, 0x83, 0xf3, 0xfa, 0xab, 0xd8, 0x79, 0xb1, 0x56, 0x9d, 0x3e, 
-0x7d, 0x9a, 0xad, 0x6b, 0xd2, 0xa4, 0x49, 0x85, 0x85, 0x85, 0xb5, 0x6a, 
-0xd5, 0x8a, 0x8b, 0x33, 0xd6, 0xfd, 0x66, 0xdd, 0x1b, 0x36, 0x6c, 0x38, 
-0x70, 0xe0, 0xc0, 0x95, 0x2b, 0x57, 0xb2, 0x10, 0x32, 0x63, 0x5d, 0xe6, 
-0xf3, 0x7a, 0xaf, 0xa0, 0x9f, 0x80, 0x51, 0x81, 0x7d, 0x85, 0x17, 0x46, 
-0x79, 0x87, 0x7a, 0xf5, 0xea, 0x99, 0xe7, 0x6c, 0x87, 0x0a, 0xa6, 0x4f, 
-0x9f, 0x0e, 0xcd, 0x89, 0xe1, 0x4f, 0x9f, 0xa1, 0x6c, 0x31, 0x6a, 0xcb, 
-0x40, 0x11, 0xc4, 0x80, 0x88, 0x63, 0x14, 0x63, 0x79, 0x49, 0x49, 0xc9, 
-0xb5, 0xd7, 0x5e, 0x0b, 0x95, 0x10, 0xc4, 0x46, 0xa6, 0x18, 0x84, 0x98, 
-0x94, 0x94, 0xa4, 0xdf, 0x2b, 0x23, 0x23, 0x83, 0x20, 0x7f, 0x08, 0x1a, 
-0x63, 0xbc, 0x6c, 0x34, 0x16, 0x31, 0xff, 0x76, 0x26, 0x77, 0xe1, 0x1c, 
-0xf8, 0xc6, 0xe2, 0xc5, 0x8b, 0x6d, 0x9f, 0x5e, 0x99, 0x27, 0xb2, 0x0e, 
-0x75, 0xeb, 0xd6, 0x05, 0x48, 0xd0, 0x09, 0x64, 0x4d, 0xd2, 0x9c, 0x02, 
-0x06, 0x8b, 0x89, 0x4f, 0xba, 0x4e, 0x9d, 0x3a, 0xf6, 0xe7, 0xb7, 0x6a, 
-0xd5, 0x2a, 0x71, 0x53, 0x18, 0x80, 0xe1, 0x33, 0x2a, 0xec, 0x34, 0xa5, 
-0x15, 0xd1, 0x0b, 0x3e, 0x00, 0xd0, 0x99, 0x3a, 0xf4, 0x64, 0x7f, 0xa2, 
-0xea, 0x4c, 0x9c, 0x8b, 0xec, 0xc4, 0x70, 0x5b, 0xc5, 0xe9, 0x6c, 0xde, 
-0x3a, 0x28, 0xa7, 0x31, 0x7f, 0xe4, 0x87, 0xec, 0xec, 0x6c, 0x3f, 0x66, 
-0x6e, 0xbe, 0x84, 0xa8, 0x4c, 0x38, 0x06, 0x2f, 0x40, 0xcd, 0x0d, 0x1b, 
-0x2b, 0x7b, 0xe1, 0xd0, 0xa1, 0x43, 0x3b, 0x74, 0xe8, 0xc0, 0x8b, 0x4c, 
-0x48, 0x48, 0xf0, 0xfb, 0x46, 0x7d, 0xfb, 0xf6, 0x45, 0x54, 0xf3, 0xfb, 
-0x72, 0x2e, 0x64, 0x37, 0x75, 0xb9, 0x72, 0x43, 0xf3, 0x18, 0x39, 0x72, 
-0xa4, 0xf8, 0x1c, 0xf0, 0x67, 0xfb, 0xfa, 0x04, 0xbc, 0x5f, 0xa8, 0x14, 
-0x9d, 0x9e, 0x57, 0xc3, 0xf6, 0xa4, 0xde, 0x4e, 0xf0, 0x51, 0xc1, 0x14, 
-0xf7, 0xee, 0xdd, 0xcb, 0xab, 0xf2, 0x75, 0x8a, 0xee, 0xce, 0x07, 0x57, 
-0x18, 0x9e, 0x03, 0x6c, 0xfb, 0xab, 0x1e, 0x58, 0xa4, 0x7f, 0x44, 0x4c, 
-0xa2, 0x0c, 0x88, 0x55, 0x60, 0x51, 0x2c, 0x7b, 0xa5, 0xc2, 0xdc, 0x10, 
-0x0c, 0x7c, 0x7a, 0x04, 0x67, 0x42, 0x6c, 0x7e, 0x9d, 0xf4, 0xde, 0x6d, 
-0x73, 0x27, 0x17, 0x35, 0x58, 0x3e, 0xb9, 0x45, 0xb5, 0xb4, 0x52, 0x89, 
-0x82, 0x55, 0x46, 0x4a, 0x44, 0xef, 0x14, 0x5e, 0x01, 0x11, 0xc7, 0xc4, 
-0xd0, 0x04, 0xa3, 0x5c, 0x8e, 0x76, 0x4d, 0xaa, 0xdf, 0x30, 0xa3, 0x8d, 
-0xe5, 0xcf, 0xd5, 0x53, 0x5b, 0x5e, 0x39, 0xae, 0x99, 0xfc, 0xcc, 0x1e, 
-0x96, 0xaf, 0x6e, 0xaf, 0xf3, 0x40, 0xa6, 0xcd, 0x69, 0xb3, 0x86, 0xe6, 
-0x0f, 0xed, 0x5a, 0xbb, 0x4b, 0x8b, 0x1a, 0x05, 0x75, 0xd3, 0xf3, 0xaa, 
-0x27, 0xa5, 0x24, 0x79, 0x6e, 0xe8, 0x71, 0x71, 0xa4, 0xd4, 0xa4, 0xf8, 
-0x3a, 0xd9, 0xc9, 0x1d, 0x0a, 0xb2, 0x06, 0x77, 0xae, 0x3d, 0x67, 0x44, 
-0x13, 0x2e, 0xe7, 0x0f, 0x19, 0xa9, 0x09, 0xd7, 0x5e, 0xd2, 0x6a, 0xc1, 
-0xe8, 0x02, 0x96, 0x65, 0x50, 0xe7, 0x5a, 0x9d, 0x9b, 0xd7, 0x68, 0x52, 
-0x37, 0xbd, 0x46, 0x86, 0x33, 0x36, 0x36, 0x68, 0x2b, 0x40, 0x49, 0x1a, 
-0x38, 0x2d, 0xdc, 0xc3, 0xc3, 0x82, 0xe6, 0x54, 0x73, 0x76, 0x6a, 0x96, 
-0x35, 0xbe, 0x4f, 0xfd, 0x25, 0x13, 0x9b, 0xeb, 0xa7, 0x11, 0x9f, 0x81, 
-0x0c, 0xcf, 0xab, 0xd1, 0xf7, 0xac, 0xe0, 0xa0, 0x42, 0x02, 0xa8, 0xe0, 
-0xe6, 0xb3, 0x66, 0xcd, 0xb2, 0xff, 0xbe, 0x59, 0xaf, 0x7a, 0xb9, 0x29, 
-0xf5, 0x73, 0x53, 0xf9, 0x3f, 0x3d, 0x85, 0x96, 0x43, 0x6e, 0x0f, 0xc4, 
-0x56, 0x64, 0x2a, 0xec, 0x09, 0xca, 0x27, 0x6f, 0x87, 0x21, 0xc8, 0xac, 
-0xb8, 0x8a, 0xe4, 0x12, 0x78, 0x25, 0xc2, 0x6b, 0x6e, 0x6e, 0xae, 0xf9, 
-0x1e, 0x6c, 0xd8, 0x67, 0xce, 0x9c, 0x41, 0x60, 0x13, 0x21, 0x47, 0x64, 
-0xd3, 0x32, 0xc5, 0x1c, 0xb4, 0x6b, 0x58, 0xdc, 0xf6, 0x4d, 0xaa, 0x0f, 
-0xeb, 0x56, 0x67, 0xee, 0x88, 0x26, 0x6b, 0x67, 0xb7, 0x3d, 0xb4, 0xb2, 
-0xdb, 0x43, 0x9b, 0x8b, 0xde, 0x3e, 0x3a, 0xe2, 0xff, 0x1e, 0x9c, 0xf8, 
-0xcd, 0x33, 0xd3, 0xf5, 0x9f, 0xec, 0x4c, 0xa7, 0xba, 0x0e, 0x25, 0x18, 
-0x5f, 0x12, 0xfa, 0x00, 0x83, 0xa3, 0x92, 0x22, 0x9d, 0xfb, 0x01, 0x88, 
-0xb4, 0xe4, 0x78, 0x59, 0xab, 0x64, 0xa7, 0x27, 0x1a, 0x5d, 0x3f, 0xa7, 
-0x9d, 0x61, 0x26, 0x96, 0xbf, 0x1e, 0xbf, 0xbe, 0xa7, 0x9a, 0x43, 0x56, 
-0x56, 0x96, 0xfa, 0x3c, 0xaa, 0x47, 0x5d, 0x77, 0x97, 0xff, 0xe9, 0xe1, 
-0xc9, 0x9f, 0x9d, 0x9d, 0xf4, 0x3f, 0xf7, 0x8c, 0xfb, 0xe9, 0x9d, 0x63, 
-0xf4, 0x9f, 0x4f, 0xef, 0x9f, 0xc8, 0xf7, 0xe6, 0xab, 0xd8, 0x20, 0x18, 
-0x16, 0x44, 0x79, 0x18, 0xf0, 0x67, 0x77, 0x8d, 0x7d, 0xfd, 0xd6, 0xe1, 
-0x4f, 0x6e, 0x1f, 0x78, 0xea, 0xa6, 0xde, 0x07, 0x57, 0x76, 0xbd, 0xe9, 
-0xb2, 0x76, 0xcf, 0xef, 0x19, 0xf2, 0xe0, 0xcd, 0xfd, 0x0e, 0xaf, 0xea, 
-0xbe, 0x69, 0x7e, 0xfb, 0x15, 0x93, 0x5b, 0xce, 0x1c, 0xda, 0x18, 0x7c, 
-0x82, 0xa5, 0x46, 0xb5, 0xd2, 0x40, 0x9d, 0xbb, 0x75, 0x83, 0x8e, 0x0d, 
-0x4f, 0xc1, 0xb5, 0xbb, 0x97, 0x74, 0x3e, 0xbb, 0xb9, 0xdf, 0xbb, 0xc7, 
-0x46, 0x7e, 0x71, 0x6e, 0x8a, 0x9a, 0x03, 0xb7, 0x53, 0x83, 0xa4, 0xa7, 
-0xa7, 0xa3, 0x84, 0xc0, 0xb7, 0xd1, 0x58, 0x20, 0x80, 0x20, 0xf3, 0x0a, 
-0xf8, 0xd7, 0xe8, 0xd1, 0xa3, 0x3d, 0xbc, 0x69, 0x9e, 0xa7, 0x6f, 0xfb, 
-0xbc, 0x65, 0x93, 0x5a, 0xf0, 0xb4, 0xcf, 0xed, 0x1e, 0xfc, 0xbf, 0xa7, 
-0xc7, 0x7f, 0xf5, 0xe4, 0x34, 0xc3, 0x62, 0x7d, 0xf9, 0xd8, 0xd4, 0x9f, 
-0xdc, 0x3e, 0xea, 0xae, 0xb5, 0xbd, 0x17, 0x8d, 0x6b, 0x56, 0x37, 0x27, 
-0xc5, 0x30, 0x1a, 0x0a, 0x13, 0x2c, 0x12, 0x12, 0x87, 0x64, 0xed, 0xf0, 
-0x0d, 0x20, 0x01, 0x2d, 0x8e, 0x1d, 0x3b, 0xd6, 0xa6, 0x32, 0x80, 0xae, 
-0x89, 0x16, 0x81, 0xb4, 0x86, 0x4d, 0x66, 0xe1, 0xc2, 0x85, 0xfa, 0xdd, 
-0x2f, 0x1f, 0xdd, 0xf4, 0x47, 0xbb, 0x07, 0xf3, 0xfe, 0xfe, 0xf6, 0xf8, 
-0x54, 0x3b, 0x04, 0xc7, 0x39, 0x9f, 0x3f, 0x7a, 0xb1, 0x7e, 0x84, 0x8c, 
-0x73, 0xea, 0xd4, 0x29, 0x74, 0x06, 0xdc, 0x49, 0x6c, 0x48, 0x47, 0x8f, 
-0x1e, 0xb5, 0x5c, 0x28, 0xb6, 0xcf, 0xa6, 0xf5, 0x32, 0xfa, 0xb4, 0xcb, 
-0x9b, 0xd8, 0xaf, 0x01, 0x2b, 0xb0, 0x6e, 0x4e, 0xbb, 0x03, 0x2b, 0xba, 
-0x3e, 0xb0, 0xa9, 0xdf, 0x8b, 0xfb, 0x86, 0x70, 0xeb, 0xbf, 0x3e, 0x56, 
-0xe6, 0xd6, 0xbf, 0xba, 0x77, 0xfc, 0x89, 0x1b, 0x7a, 0x0e, 0xe8, 0x54, 
-0xd3, 0x3c, 0xd4, 0xfd, 0x1b, 0xfb, 0xda, 0x99, 0xe4, 0x88, 0xee, 0xa5, 
-0xf2, 0x37, 0xd6, 0x02, 0x35, 0xce, 0x96, 0xcb, 0x3b, 0xda, 0xb9, 0xdc, 
-0xeb, 0x39, 0xac, 0x40, 0x42, 0xbc, 0x2b, 0x55, 0x93, 0xfd, 0xce, 0xeb, 
-0xc9, 0xea, 0x84, 0x37, 0x0e, 0x0f, 0xf7, 0x7c, 0x32, 0x44, 0xf2, 0xcb, 
-0x7b, 0xc6, 0xbd, 0x7a, 0x70, 0xd8, 0xc3, 0xb7, 0x14, 0xd5, 0xaa, 0x51, 
-0x2a, 0xf5, 0xb5, 0x6a, 0xd5, 0x4a, 0x3d, 0x02, 0xc4, 0xf6, 0xf5, 0x53, 
-0x97, 0xb8, 0x1b, 0x67, 0xcf, 0xd2, 0xd2, 0x34, 0x21, 0xec, 0x13, 0x0f, 
-0x3d, 0xf4, 0x10, 0x41, 0x2b, 0xb8, 0xf9, 0xb0, 0xb3, 0x05, 0x0d, 0x15, 
-0xe2, 0x05, 0x47, 0x29, 0xb4, 0x7c, 0xd3, 0x5d, 0x5b, 0x66, 0xf3, 0x76, 
-0x5f, 0xde, 0x3f, 0xd4, 0x8c, 0x01, 0xcf, 0x0f, 0xcf, 0xf9, 0xa7, 0xd7, 
-0xf7, 0x69, 0xdd, 0xa8, 0x9a, 0x3e, 0x2c, 0x4f, 0x0e, 0xe1, 0xc2, 0xec, 
-0x64, 0x53, 0x37, 0xb3, 0x0b, 0x99, 0x0c, 0xbb, 0x32, 0xfa, 0xba, 0xbe, 
-0x73, 0xd8, 0xdc, 0x98, 0x5b, 0xb4, 0x68, 0x41, 0xcc, 0x0c, 0xba, 0x90, 
-0x7e, 0xfe, 0xe8, 0x9e, 0x75, 0x3d, 0x2c, 0xb1, 0xbb, 0xa7, 0xe0, 0x91, 
-0xd5, 0x20, 0x98, 0xa7, 0x50, 0xa0, 0x09, 0xec, 0x81, 0x53, 0xc3, 0x28, 
-0xf4, 0xb5, 0xba, 0x74, 0x70, 0xe3, 0x1f, 0x1f, 0x1c, 0xc6, 0xee, 0xfb, 
-0xf7, 0x27, 0x8c, 0x7b, 0x84, 0x4d, 0x4a, 0x3a, 0xb3, 0xa1, 0xaf, 0x81, 
-0xcd, 0xfe, 0xf4, 0xae, 0x31, 0x5e, 0xaf, 0x85, 0xb3, 0xc5, 0xc7, 0x95, 
-0x0a, 0x30, 0xa9, 0xa9, 0xa9, 0x6a, 0xb6, 0xcc, 0xdc, 0xeb, 0xe5, 0x76, 
-0x4e, 0x80, 0x6a, 0x65, 0x4c, 0xa0, 0x6e, 0xe7, 0x7c, 0x39, 0x07, 0x8e, 
-0x61, 0xff, 0x64, 0xb6, 0x0c, 0xcb, 0x37, 0xdb, 0xab, 0x4d, 0xae, 0x87, 
-0x41, 0xa6, 0x0f, 0x6a, 0xa4, 0xae, 0x42, 0x27, 0x41, 0x4c, 0xc0, 0x94, 
-0x8c, 0x20, 0xcd, 0xab, 0x09, 0x1a, 0x2a, 0xa0, 0x42, 0xc2, 0x3f, 0x0d, 
-0x93, 0x43, 0xbc, 0x86, 0xfd, 0xfd, 0xe2, 0xd4, 0x38, 0xfb, 0x4f, 0x68, 
-0x79, 0x26, 0xe4, 0xb8, 0xfa, 0xd2, 0xd6, 0xfa, 0xe0, 0x37, 0xde, 0x78, 
-0x23, 0xc0, 0x80, 0xd9, 0xe9, 0xba, 0x91, 0x32, 0x1f, 0x63, 0xbc, 0x9b, 
-0x37, 0x6f, 0x9e, 0x67, 0x0c, 0x20, 0x7e, 0xf0, 0x9e, 0x58, 0xb8, 0x91, 
-0x3d, 0xea, 0x76, 0x6c, 0x5a, 0x2a, 0x39, 0xc8, 0x55, 0xed, 0xda, 0xb5, 
-0xd3, 0xa5, 0x2c, 0x1e, 0xe4, 0x8f, 0x0f, 0x4d, 0xf6, 0xe3, 0x29, 0x76, 
-0x5d, 0x55, 0xba, 0x21, 0x61, 0xc1, 0xa4, 0x66, 0x04, 0x81, 0x7d, 0x12, 
-0xa7, 0xa9, 0x4f, 0x0f, 0x48, 0xf8, 0x31, 0xb8, 0xe1, 0x12, 0x78, 0x6f, 
-0xdc, 0x0f, 0x32, 0x3a, 0x08, 0xf9, 0xe7, 0xd3, 0x6e, 0xb7, 0x49, 0x75, 
-0x21, 0x82, 0x9f, 0x0e, 0x5a, 0xf5, 0x19, 0x99, 0xd6, 0xd7, 0xfd, 0xcb, 
-0xdd, 0xfc, 0xd1, 0xac, 0x64, 0x58, 0x98, 0x92, 0xcd, 0x67, 0x84, 0x01, 
-0xde, 0x76, 0x5d, 0x0f, 0x9b, 0x27, 0xcb, 0x69, 0x97, 0x0c, 0x2c, 0x25, 
-0x71, 0xf5, 0x14, 0x68, 0x0e, 0x1e, 0x06, 0xe1, 0x9d, 0xaa, 0x33, 0x11, 
-0x0a, 0x10, 0xbd, 0x30, 0xfb, 0x62, 0xf2, 0x46, 0xe1, 0x0c, 0x0e, 0x2a, 
-0xd8, 0x9b, 0xd9, 0xb6, 0xaf, 0xb8, 0xe2, 0x0a, 0x75, 0x9b, 0x96, 0x0d, 
-0x33, 0x91, 0xe4, 0xfc, 0xd8, 0x5c, 0x3d, 0x3c, 0xc6, 0xb4, 0x01, 0x0d, 
-0xd5, 0xf8, 0x98, 0xb7, 0x09, 0x5c, 0x33, 0x48, 0x81, 0x4c, 0x03, 0x06, 
-0xb2, 0x74, 0xe9, 0x52, 0x77, 0x78, 0x68, 0x5c, 0x3b, 0x6d, 0xe1, 0xd8, 
-0xa6, 0x77, 0xde, 0xd8, 0x0b, 0x69, 0xd8, 0x40, 0x34, 0x2f, 0xed, 0x1b, 
-0x6a, 0xc6, 0x86, 0x8c, 0x03, 0xa9, 0xf9, 0x4d, 0xb5, 0xe3, 0x7a, 0x97, 
-0x9a, 0xdd, 0x30, 0x3c, 0xe0, 0x3c, 0x82, 0x4d, 0x13, 0x12, 0x87, 0xc9, 
-0x55, 0x4d, 0x92, 0xd7, 0x63, 0x87, 0x82, 0xed, 0x50, 0xc9, 0xe2, 0xf1, 
-0xcd, 0x64, 0xd8, 0x6e, 0x2d, 0xb3, 0xed, 0x9c, 0xdf, 0xbf, 0x63, 0xa9, 
-0xe8, 0xd5, 0xb1, 0x63, 0xc7, 0xd2, 0xbd, 0xd3, 0xbd, 0x52, 0x61, 0x67, 
-0x58, 0xfd, 0x1c, 0x94, 0x7e, 0x19, 0x96, 0x7d, 0xcd, 0xe6, 0xb5, 0x3b, 
-0xae, 0x2c, 0xfc, 0xe8, 0xc4, 0x68, 0x9b, 0x27, 0xcb, 0x69, 0xbf, 0x7f, 
-0x60, 0x22, 0xc6, 0x00, 0xc3, 0x7b, 0x47, 0x65, 0x72, 0x37, 0xc8, 0xef, 
-0xee, 0x9f, 0xa0, 0x9f, 0x8c, 0x49, 0x1a, 0xd7, 0x13, 0xbc, 0x02, 0xe1, 
-0x36, 0x38, 0xbc, 0x42, 0xe9, 0xb2, 0x35, 0x6b, 0x96, 0x2e, 0xf1, 0xbd, 
-0xeb, 0xfb, 0xf8, 0xf4, 0x54, 0x76, 0x4e, 0x46, 0x09, 0x11, 0x09, 0x55, 
-0x0e, 0xdc, 0xa5, 0xc4, 0xa8, 0x81, 0x6c, 0x65, 0xfb, 0xa7, 0x07, 0x87, 
-0xa5, 0xfe, 0x8a, 0xbe, 0xcb, 0x8e, 0xf5, 0xa6, 0x0d, 0x51, 0x15, 0xbe, 
-0x61, 0x46, 0xd4, 0x8d, 0xb3, 0xda, 0xda, 0x99, 0x9e, 0xf9, 0x1c, 0xd4, 
-0x0f, 0x5d, 0xaa, 0xc1, 0xbe, 0x8c, 0x1d, 0x1d, 0x09, 0x0a, 0x3c, 0xf7, 
-0xef, 0xdf, 0x5f, 0xdd, 0xc8, 0x3e, 0xb9, 0x78, 0x9d, 0xc6, 0x6b, 0x87, 
-0x86, 0xc9, 0xb0, 0xd8, 0x00, 0xbc, 0x9e, 0xfc, 0x9b, 0x33, 0x13, 0x74, 
-0x03, 0x98, 0x6e, 0x6a, 0x43, 0x3d, 0xf5, 0x7a, 0xb9, 0x9d, 0x13, 0x74, 
-0xe2, 0xb3, 0xa9, 0xe7, 0x30, 0xec, 0x84, 0xbe, 0xf5, 0xfd, 0xd8, 0x26, 
-0x90, 0xb4, 0x0d, 0xef, 0x0e, 0xed, 0xd4, 0xdd, 0x24, 0x99, 0x8c, 0x3a, 
-0x19, 0xba, 0xc5, 0x85, 0x4f, 0xf2, 0x16, 0xaf, 0x06, 0x01, 0x04, 0xdd, 
-0x38, 0x08, 0xbc, 0x42, 0x92, 0x93, 0x10, 0xcb, 0xd4, 0x6d, 0xe0, 0xbf, 
-0x28, 0x43, 0x76, 0x56, 0xcd, 0xd7, 0x73, 0x30, 0xa8, 0xa9, 0xbb, 0x4c, 
-0x9d, 0x3a, 0x95, 0x4d, 0x97, 0xf8, 0x47, 0x34, 0x63, 0x18, 0x1f, 0x2e, 
-0x36, 0x33, 0x41, 0x37, 0xab, 0x9f, 0x81, 0x5a, 0x6f, 0x7f, 0x32, 0x7f, 
-0x79, 0x64, 0x4a, 0xfd, 0xbc, 0x52, 0xd9, 0x9a, 0x01, 0x5b, 0x34, 0xc8, 
-0xb4, 0xaf, 0x5b, 0x1b, 0x1e, 0x47, 0x97, 0x77, 0x09, 0xd3, 0xdf, 0xb8, 
-0x71, 0x23, 0x1e, 0x4c, 0xa9, 0x96, 0xa2, 0x4f, 0x15, 0xcb, 0x95, 0xaf, 
-0xeb, 0xe0, 0xee, 0x7c, 0xd4, 0x12, 0x19, 0x79, 0xe7, 0x55, 0x85, 0x5e, 
-0xc7, 0xe4, 0x1c, 0x35, 0x0d, 0x2a, 0xd4, 0xeb, 0x53, 0x42, 0xad, 0xf7, 
-0x7a, 0xb9, 0x9d, 0x13, 0x4e, 0xae, 0xe9, 0xa5, 0x86, 0x65, 0x3b, 0xb7, 
-0x73, 0x09, 0xea, 0x10, 0xe2, 0x90, 0x9d, 0x33, 0xcd, 0xe7, 0x4c, 0xea, 
-0xd7, 0x40, 0xdd, 0x8e, 0xfd, 0xc8, 0x83, 0xa8, 0x82, 0x8d, 0x58, 0x9d, 
-0x89, 0x37, 0x19, 0x27, 0x20, 0x6e, 0x53, 0xbc, 0x49, 0x98, 0x07, 0x83, 
-0x63, 0x83, 0x42, 0xb2, 0xc7, 0x5c, 0x83, 0xe3, 0x56, 0xdd, 0x66, 0xc6, 
-0x90, 0xc6, 0xfe, 0x3d, 0x95, 0xd7, 0xab, 0x8e, 0x5e, 0xdb, 0x5d, 0xdd, 
-0x05, 0x9d, 0x9b, 0x44, 0x13, 0xf0, 0x00, 0xa9, 0xe9, 0x6c, 0x4a, 0x4e, 
-0x68, 0x58, 0x2b, 0x0d, 0x06, 0xea, 0x87, 0x08, 0x07, 0x8a, 0x74, 0xfa, 
-0x78, 0xaa, 0x64, 0xa0, 0xd7, 0x59, 0xb9, 0x3b, 0x81, 0x3d, 0x4f, 0x0d, 
-0x85, 0x17, 0x96, 0xf2, 0x28, 0x38, 0x28, 0x08, 0x28, 0x42, 0x29, 0x52, 
-0xdf, 0x23, 0x6a, 0x9a, 0x2f, 0x87, 0xd3, 0xee, 0x5d, 0xd6, 0xe5, 0xad, 
-0x23, 0x3e, 0xa3, 0x05, 0x65, 0x40, 0x46, 0x7e, 0x72, 0x87, 0xf7, 0x69, 
-0xf7, 0x68, 0x5d, 0xda, 0x9c, 0x04, 0xca, 0x28, 0x9d, 0x6a, 0x93, 0xea, 
-0x7e, 0x3f, 0xb2, 0xe1, 0x42, 0xdc, 0x1d, 0x32, 0x2c, 0xf6, 0x12, 0x9b, 
-0x63, 0xa2, 0x88, 0xf2, 0x0a, 0x6c, 0x9e, 0x6c, 0x38, 0x0d, 0xd6, 0xa4, 
-0xec, 0xe0, 0x18, 0xf1, 0x3c, 0x0c, 0x82, 0x21, 0x54, 0x3d, 0x2f, 0xfb, 
-0x29, 0x3c, 0x9c, 0xad, 0x0a, 0x6f, 0x98, 0x44, 0xe5, 0x04, 0x81, 0x57, 
-0x60, 0x64, 0x44, 0x9a, 0x27, 0xf4, 0x40, 0xdd, 0xe6, 0x91, 0x2d, 0xfd, 
-0xfd, 0x7b, 0x2a, 0xaf, 0x57, 0x7d, 0x70, 0x7c, 0x94, 0xba, 0x0b, 0x77, 
-0xc4, 0x07, 0x47, 0xe4, 0x99, 0x4e, 0xc4, 0x7c, 0x4e, 0x4a, 0x8c, 0xc3, 
-0x54, 0x6f, 0x9f, 0x3f, 0x18, 0x6e, 0x8a, 0xe9, 0x53, 0x99, 0xc3, 0xd1, 
-0x0a, 0xbc, 0x4e, 0xc9, 0xdd, 0x09, 0xbf, 0xbd, 0x6f, 0x82, 0x2e, 0xef, 
-0xe1, 0xc0, 0x41, 0xe4, 0x23, 0x19, 0x9a, 0x0d, 0x49, 0xef, 0x0a, 0x82, 
-0x61, 0xde, 0x30, 0x02, 0xc2, 0x43, 0xed, 0x1f, 0x4c, 0x8d, 0x37, 0xcf, 
-0xef, 0xe0, 0xd3, 0x04, 0xd0, 0x97, 0x64, 0x35, 0xb8, 0xbb, 0xe7, 0x0b, 
-0x7f, 0x7e, 0xf7, 0x58, 0x7d, 0xdd, 0xf4, 0xf6, 0x3d, 0xbe, 0xde, 0xd4, 
-0xdd, 0x8d, 0x78, 0x10, 0x65, 0x58, 0xbf, 0x6a, 0x82, 0x27, 0xc5, 0x57, 
-0x1f, 0x01, 0x2f, 0x10, 0xa2, 0xb2, 0x4f, 0x4f, 0xad, 0x9f, 0x8c, 0xd2, 
-0x28, 0xcf, 0x85, 0xf5, 0xdf, 0xdd, 0x20, 0xec, 0x1d, 0xba, 0xc7, 0x83, 
-0xd8, 0x02, 0x24, 0x1d, 0xc4, 0x27, 0x76, 0x58, 0x94, 0x0a, 0x04, 0x9f, 
-0x20, 0xa0, 0x02, 0xd7, 0x01, 0x31, 0x58, 0x6a, 0x89, 0x01, 0xeb, 0x3f, 
-0x4c, 0x2e, 0x08, 0xbf, 0x1f, 0xd2, 0x70, 0x21, 0x23, 0xeb, 0xa2, 0xb0, 
-0xd9, 0x10, 0x8c, 0x4d, 0xc9, 0x57, 0x45, 0xcd, 0x3c, 0xb7, 0x21, 0x5d, 
-0x5c, 0xce, 0x6c, 0x7c, 0xae, 0x80, 0xd0, 0xef, 0x99, 0x6f, 0x98, 0xdb, 
-0x5e, 0xad, 0x09, 0xce, 0x47, 0x18, 0x05, 0x06, 0x28, 0x49, 0xa8, 0xd7, 
-0xc9, 0xf1, 0xc3, 0x3b, 0x8c, 0x6a, 0x25, 0x36, 0x78, 0x75, 0x42, 0x9b, 
-0xc6, 0x76, 0xb7, 0x58, 0x99, 0xe7, 0xed, 0xab, 0x5d, 0x05, 0xe4, 0x79, 
-0x05, 0x5e, 0xa7, 0xbd, 0x79, 0x41, 0x07, 0x75, 0x17, 0xdd, 0xda, 0xc6, 
-0xf2, 0x62, 0x20, 0xf6, 0x7a, 0xb9, 0x9d, 0x13, 0xde, 0x39, 0x36, 0x52, 
-0xdd, 0x02, 0x17, 0xa7, 0x9d, 0x4b, 0xde, 0xbf, 0x7d, 0x14, 0xda, 0xb9, 
-0x9d, 0x33, 0x3d, 0x9c, 0x33, 0xf6, 0x82, 0x85, 0x03, 0x37, 0x8e, 0xbb, 
-0x73, 0x74, 0xff, 0x1d, 0x11, 0x2e, 0xa8, 0xda, 0xc4, 0xf0, 0x62, 0xb7, 
-0x24, 0x80, 0xd7, 0x60, 0xd5, 0xf4, 0xdf, 0xb7, 0x0d, 0xbc, 0x74, 0x99, 
-0x1e, 0x97, 0x7e, 0x80, 0x4f, 0xe5, 0xf9, 0x72, 0x9c, 0x5c, 0x06, 0xe6, 
-0x20, 0xbf, 0xf2, 0x3a, 0xd9, 0x77, 0x83, 0x62, 0x4f, 0xc4, 0x1b, 0xca, 
-0x80, 0x38, 0x53, 0xfd, 0x7e, 0x10, 0xe4, 0x7b, 0x42, 0x1e, 0xd4, 0x3c, 
-0xfb, 0xf5, 0xeb, 0xb7, 0x6f, 0xdf, 0x3e, 0x09, 0xc9, 0xbe, 0xe6, 0x9a, 
-0x6b, 0xd4, 0xf7, 0xc4, 0x44, 0x98, 0x6f, 0x81, 0xa7, 0x5c, 0x9d, 0x80, 
-0xa0, 0xec, 0xd3, 0x1c, 0xc4, 0xe4, 0xe5, 0x59, 0x78, 0x90, 0x01, 0xb9, 
-0xb5, 0xba, 0x8b, 0x1e, 0x71, 0xe8, 0xc1, 0xa5, 0xed, 0xd3, 0x4c, 0x38, 
-0xf9, 0x96, 0xcb, 0x2f, 0x02, 0x0f, 0xee, 0xad, 0x3b, 0x95, 0x3d, 0x8c, 
-0x73, 0xc3, 0xcc, 0x36, 0xd7, 0xdb, 0x36, 0x55, 0xb9, 0x1b, 0xe7, 0xd7, 
-0x67, 0xc6, 0x57, 0x4f, 0x4f, 0xf4, 0xb0, 0x39, 0xea, 0xfe, 0x3b, 0xcc, 
-0xe5, 0x94, 0x22, 0xc7, 0x2f, 0x8c, 0x13, 0x89, 0x78, 0x6d, 0x83, 0x07, 
-0xcc, 0x4f, 0x54, 0x60, 0xff, 0x21, 0xf2, 0xc4, 0xe9, 0x2c, 0xa5, 0xd4, 
-0xa7, 0x77, 0x0e, 0xf2, 0x75, 0xf9, 0x7c, 0x3a, 0xdf, 0xec, 0xed, 0xe6, 
-0xed, 0xb2, 0x0a, 0x8f, 0x6d, 0x1b, 0xe0, 0xd3, 0x38, 0x1e, 0x4e, 0x46, 
-0x84, 0x00, 0x63, 0x81, 0xf0, 0x1c, 0xd9, 0xb3, 0xd5, 0x41, 0xdc, 0x2b, 
-0xfa, 0x1c, 0xa1, 0xfc, 0x58, 0xc4, 0x89, 0x02, 0x54, 0xdf, 0xb3, 0x61, 
-0x9b, 0xa7, 0x21, 0x51, 0x43, 0x1c, 0x44, 0x76, 0x78, 0xb0, 0xa2, 0x98, 
-0x2f, 0x64, 0x8f, 0x17, 0x97, 0x1c, 0x1e, 0x71, 0xcf, 0x4b, 0xa1, 0x0b, 
-0xa2, 0x86, 0x2d, 0xc6, 0x8e, 0x42, 0x62, 0x73, 0x9d, 0xfb, 0x75, 0xb8, 
-0x28, 0xbb, 0x13, 0x17, 0x63, 0xf3, 0x12, 0x3c, 0x48, 0x7e, 0x1b, 0xc1, 
-0xf5, 0x5b, 0x60, 0xe7, 0xf0, 0x60, 0xc5, 0xd2, 0xfd, 0x77, 0x84, 0xff, 
-0x20, 0xd9, 0x52, 0xd0, 0x04, 0xeb, 0x13, 0xfb, 0xbb, 0x84, 0x33, 0x07, 
-0x24, 0x41, 0x89, 0x4d, 0xf6, 0xd6, 0x5b, 0x6f, 0x55, 0x2b, 0xcb, 0x06, 
-0xe9, 0x87, 0x82, 0x6b, 0x73, 0xc9, 0xe4, 0xb4, 0x9a, 0x59, 0x46, 0xb3, 
-0x34, 0x81, 0x31, 0x3e, 0x89, 0x3a, 0x68, 0x0e, 0x18, 0x5b, 0xf1, 0x4e, 
-0x10, 0x49, 0x61, 0x79, 0x6b, 0x14, 0x3e, 0xa2, 0x2d, 0x7c, 0x9a, 0x95, 
-0x7e, 0x32, 0xef, 0x03, 0xc9, 0x47, 0xad, 0x09, 0x7a, 0x36, 0xf9, 0x3d, 
-0xc4, 0x7a, 0x10, 0x7f, 0xa6, 0x5b, 0xea, 0x38, 0xc1, 0x6c, 0xea, 0x41, 
-0x1f, 0x90, 0x0b, 0x89, 0x1a, 0x7a, 0x62, 0xbb, 0x6f, 0x38, 0xbf, 0x62, 
-0x4c, 0x53, 0xb9, 0x96, 0x38, 0x22, 0xcf, 0x93, 0xe7, 0xf1, 0x0d, 0x60, 
-0x90, 0x5f, 0x6d, 0x7a, 0x39, 0xec, 0xac, 0x0c, 0x4e, 0x4f, 0xe5, 0x35, 
-0xdf, 0xb7, 0xac, 0x8b, 0x9d, 0x4b, 0x30, 0x2b, 0x63, 0x00, 0xf4, 0xc3, 
-0x26, 0x6b, 0x67, 0x70, 0xfd, 0x1c, 0xa2, 0x12, 0xd5, 0xe3, 0xcf, 0x9e, 
-0x3d, 0xfb, 0xc8, 0x91, 0x23, 0xec, 0x56, 0x30, 0x0a, 0x74, 0x01, 0x43, 
-0x84, 0xa8, 0x3f, 0xbc, 0x42, 0x2a, 0xa9, 0xe9, 0xc2, 0xfd, 0xd2, 0x89, 
-0x6e, 0x55, 0x1c, 0x5f, 0xa7, 0xee, 0xee, 0x7c, 0x43, 0xd8, 0x26, 0xc6, 
-0x0d, 0x38, 0xa6, 0xfd, 0xc1, 0x89, 0x6c, 0xe3, 0xdd, 0xcb, 0xa2, 0xf0, 
-0x0e, 0x2c, 0x2f, 0x44, 0x82, 0x22, 0xe8, 0xc8, 0xfe, 0x98, 0x86, 0x33, 
-0x71, 0x5f, 0xea, 0x34, 0x37, 0x7f, 0xfe, 0x7c, 0x78, 0x34, 0x81, 0x89, 
-0xe4, 0x03, 0xe9, 0xd9, 0x0b, 0xdd, 0x5b, 0xe5, 0x98, 0x6f, 0x71, 0xe4, 
-0x1a, 0x97, 0x05, 0x0c, 0x6f, 0x23, 0xb2, 0xaf, 0x4f, 0x13, 0xe0, 0x7c, 
-0x15, 0x7c, 0xea, 0x35, 0x58, 0xa3, 0x79, 0xfd, 0x52, 0xd3, 0x88, 0x3e, 
-0xd5, 0x20, 0x32, 0x8a, 0xbb, 0xd7, 0xf6, 0x56, 0x23, 0xdb, 0xd4, 0x9e, 
-0x57, 0x4e, 0x69, 0x89, 0x5b, 0xc9, 0xa7, 0xa7, 0xf6, 0xe3, 0x64, 0x42, 
-0x18, 0xf5, 0x47, 0x26, 0xdf, 0x10, 0xad, 0x18, 0xff, 0x9d, 0x21, 0x5a, 
-0x56, 0xd8, 0x85, 0xcf, 0xa8, 0x00, 0x55, 0x40, 0x02, 0x77, 0x81, 0x7e, 
-0x8f, 0x57, 0x0e, 0xd8, 0x0d, 0x9e, 0x61, 0x9b, 0x24, 0x74, 0x07, 0x19, 
-0x1a, 0x51, 0x18, 0xbe, 0x09, 0x7c, 0x09, 0x69, 0xf6, 0x1a, 0x55, 0x81, 
-0x3f, 0x41, 0xbf, 0x1d, 0x90, 0xe0, 0x21, 0xed, 0x2f, 0x0d, 0x7c, 0x0c, 
-0x6e, 0xae, 0x46, 0x70, 0xa7, 0xd8, 0x05, 0x68, 0x84, 0xd1, 0x2d, 0x9e, 
-0x88, 0xad, 0x64, 0x84, 0xb2, 0x1b, 0xa1, 0x67, 0x63, 0xf8, 0xd3, 0x63, 
-0xd7, 0xf0, 0xe0, 0x9a, 0x67, 0x4e, 0x94, 0x35, 0xc6, 0x13, 0x1e, 0xd3, 
-0xfe, 0x43, 0x71, 0x26, 0xdc, 0x4f, 0x71, 0x27, 0x3c, 0xf1, 0x86, 0x08, 
-0x42, 0xc3, 0x50, 0x2c, 0x02, 0x0e, 0x4d, 0x89, 0x75, 0x25, 0x18, 0x87, 
-0x28, 0x57, 0x7e, 0x7c, 0xbd, 0xa3, 0xd7, 0xe9, 0x11, 0xd9, 0x25, 0xeb, 
-0x8c, 0x40, 0xe8, 0xf5, 0x64, 0x4e, 0x80, 0x45, 0x10, 0x08, 0x6c, 0x9f, 
-0x7e, 0xec, 0x8c, 0x69, 0x79, 0x8e, 0xee, 0x44, 0xc2, 0xcc, 0x40, 0xc6, 
-0x2c, 0x96, 0x7d, 0x0c, 0x50, 0x92, 0x7c, 0x6b, 0x88, 0xa9, 0xf3, 0x07, 
-0x15, 0xd8, 0x64, 0x51, 0x22, 0x15, 0x91, 0xb1, 0xc3, 0xd9, 0x64, 0x7f, 
-0x98, 0x4d, 0xd1, 0xc0, 0xcc, 0x4c, 0x9c, 0xdd, 0xc2, 0xf3, 0xd3, 0xea, 
-0x66, 0x0d, 0x02, 0x25, 0xf0, 0xce, 0xfa, 0xb4, 0x3a, 0xba, 0x9a, 0xc5, 
-0xdd, 0xc9, 0x1f, 0xb0, 0xbc, 0x3c, 0x90, 0x2d, 0x93, 0x6b, 0xf5, 0xe7, 
-0xc2, 0xd5, 0x48, 0x70, 0x07, 0x8b, 0x8b, 0x39, 0x9c, 0x22, 0x7f, 0xea, 
-0x4f, 0xe8, 0x2d, 0x44, 0xfb, 0x98, 0xef, 0xfe, 0xb1, 0x8f, 0x91, 0x0e, 
-0x32, 0xc2, 0x65, 0xc3, 0x9b, 0xa8, 0x91, 0xdb, 0xe6, 0x07, 0x6a, 0xc3, 
-0xf1, 0x69, 0x49, 0x2d, 0x4f, 0xc6, 0xe6, 0xa1, 0xfc, 0x06, 0x88, 0xa3, 
-0x76, 0x06, 0x24, 0x18, 0x99, 0x9d, 0xd1, 0x26, 0xfd, 0xd8, 0x19, 0xd0, 
-0xdd, 0x39, 0xba, 0xff, 0x8e, 0x66, 0x2e, 0x07, 0x0f, 0x1e, 0x84, 0x8d, 
-0xe3, 0x44, 0x92, 0x34, 0xc9, 0x80, 0x50, 0x21, 0x1a, 0x05, 0xda, 0x09, 
-0xc9, 0xca, 0xea, 0x7d, 0x5c, 0x37, 0xdd, 0x6e, 0xa0, 0x8b, 0x81, 0x74, 
-0xd4, 0x08, 0xf3, 0x46, 0x7a, 0xb1, 0x5f, 0xdd, 0xb3, 0xee, 0xa2, 0x57, 
-0x9f, 0x45, 0xf7, 0x95, 0x80, 0xd8, 0x41, 0x73, 0xab, 0x95, 0xea, 0x24, 
-0xd0, 0xa5, 0xd9, 0x2a, 0xca, 0x52, 0x12, 0x46, 0x1a, 0xc8, 0xc6, 0xa9, 
-0xbb, 0x87, 0x48, 0x65, 0xa6, 0x9a, 0x01, 0x11, 0xe3, 0xb8, 0x29, 0x08, 
-0x7f, 0x22, 0x8f, 0x54, 0x3d, 0x29, 0xa7, 0x05, 0xf2, 0x6a, 0xf5, 0x6b, 
-0xb7, 0x5e, 0x51, 0x1a, 0xbf, 0xc4, 0xf8, 0x76, 0x62, 0x3d, 0x82, 0x75, 
-0x6b, 0x77, 0xe3, 0x3c, 0xbb, 0xcb, 0xd5, 0x4c, 0x48, 0x0e, 0x9b, 0x46, 
-0x0b, 0x2c, 0x04, 0x08, 0x0e, 0xe5, 0x3d, 0x31, 0xc6, 0xd7, 0x5f, 0xd0, 
-0x84, 0x09, 0x13, 0x30, 0x97, 0x63, 0x80, 0xc2, 0x2c, 0x6b, 0x19, 0x69, 
-0xea, 0x1b, 0xaf, 0x90, 0x3c, 0x63, 0xb2, 0x34, 0xf4, 0x7d, 0x91, 0x8d, 
-0xdc, 0xe6, 0x53, 0x19, 0x02, 0x60, 0xd5, 0x20, 0x24, 0x9d, 0x78, 0x1e, 
-0x01, 0xb3, 0x1d, 0x27, 0xa3, 0xc6, 0x3d, 0xe3, 0xbb, 0xa5, 0x4b, 0x4f, 
-0xaf, 0x61, 0x10, 0x77, 0x0e, 0x78, 0xcf, 0xe2, 0x87, 0xe7, 0xe9, 0x31, 
-0x2b, 0x7d, 0x41, 0xf0, 0xf7, 0x53, 0xeb, 0xe0, 0xde, 0x7b, 0xef, 0xa5, 
-0x7c, 0x2a, 0xbb, 0x91, 0x9e, 0xbd, 0xb0, 0x7f, 0xb9, 0x2d, 0x05, 0xd4, 
-0xeb, 0x7a, 0x1e, 0x5e, 0x55, 0x1a, 0xf4, 0x2a, 0xb7, 0xf6, 0xdb, 0x31, 
-0xec, 0xf5, 0x5e, 0xf6, 0x4f, 0x40, 0x08, 0x94, 0xc9, 0xe0, 0x92, 0xb3, 
-0x73, 0x15, 0xbc, 0x85, 0x1c, 0x09, 0x24, 0x3a, 0x3b, 0x27, 0x07, 0x72, 
-0x8e, 0xc1, 0x7f, 0x87, 0x95, 0x1c, 0x2b, 0x08, 0xf9, 0x46, 0x64, 0x5c, 
-0xe2, 0xd2, 0x36, 0xc7, 0x5f, 0xfb, 0x86, 0x0a, 0x89, 0x7d, 0xa2, 0xf2, 
-0x82, 0x22, 0x82, 0x56, 0xb6, 0x5d, 0xfa, 0x3c, 0x95, 0xd2, 0x77, 0x75, 
-0x1a, 0xb2, 0xe3, 0xe8, 0x18, 0x58, 0x58, 0x8b, 0x4b, 0x2c, 0x25, 0x72, 
-0xaf, 0x8b, 0xa5, 0xc7, 0x5f, 0x10, 0x5f, 0xe9, 0xce, 0xfb, 0xeb, 0x77, 
-0x86, 0x03, 0x13, 0x28, 0xd2, 0x42, 0x50, 0x49, 0x52, 0xa7, 0xba, 0x0c, 
-0x9a, 0x1c, 0x19, 0xb0, 0xd4, 0x4b, 0xc5, 0x59, 0xa1, 0x1e, 0x16, 0xd1, 
-0xdf, 0x27, 0x75, 0xc8, 0xdd, 0xa3, 0x61, 0xdb, 0xd1, 0x17, 0x50, 0x3e, 
-0x5b, 0x32, 0x40, 0xaf, 0x8b, 0x13, 0xc4, 0x13, 0x90, 0x82, 0xb0, 0x0a, 
-0xca, 0x64, 0x36, 0xce, 0xb3, 0x25, 0x3e, 0x3d, 0x5e, 0x3c, 0xc0, 0x8e, 
-0x8f, 0x25, 0xf0, 0x49, 0x92, 0xcc, 0xa4, 0x56, 0x8c, 0xc8, 0x34, 0x6c, 
-0xb2, 0xc4, 0xe0, 0xbc, 0xfa, 0xea, 0xab, 0x38, 0x2b, 0x50, 0x07, 0xcc, 
-0xb9, 0x3a, 0xbe, 0xa1, 0x42, 0x62, 0x9f, 0xf4, 0xec, 0x4d, 0x9b, 0xf9, 
-0x90, 0x3c, 0x18, 0x56, 0x20, 0x95, 0x06, 0xa0, 0xa6, 0x48, 0x76, 0xaf, 
-0x57, 0x07, 0x1c, 0x51, 0x7a, 0x18, 0xa0, 0xc8, 0xfe, 0xf1, 0x4f, 0xfa, 
-0x54, 0xf6, 0x38, 0xbc, 0xfd, 0x2f, 0xec, 0xb5, 0x36, 0x31, 0x21, 0x3e, 
-0xf9, 0x6d, 0x59, 0x46, 0x32, 0xd6, 0x69, 0x94, 0x6e, 0x69, 0x62, 0x7a, 
-0x92, 0x62, 0x2d, 0x7a, 0x98, 0x3d, 0xd9, 0xcc, 0x01, 0xbe, 0x60, 0xd6, 
-0x0a, 0x1d, 0xcc, 0x0c, 0x09, 0x76, 0x5c, 0xff, 0x16, 0x27, 0xc0, 0xf9, 
-0xe8, 0x97, 0xeb, 0x94, 0xf7, 0xc9, 0x49, 0x5b, 0xdb, 0x3f, 0x7a, 0x11, 
-0xc6, 0xb7, 0x20, 0xce, 0xc1, 0xdd, 0x50, 0x44, 0x97, 0xa9, 0x45, 0x6b, 
-0xd6, 0xac, 0x19, 0xc2, 0x2d, 0x29, 0xfb, 0x44, 0xd3, 0x11, 0x40, 0xae, 
-0xfb, 0xef, 0xbc, 0xd7, 0x0e, 0xb4, 0x4c, 0x8c, 0xc6, 0xfa, 0x44, 0x38, 
-0xb4, 0xfe, 0x56, 0xec, 0x4b, 0xf9, 0x86, 0xcc, 0x29, 0x5c, 0x1c, 0x1e, 
-0x9c, 0xf3, 0xfa, 0xe3, 0xb1, 0xa3, 0xa0, 0x18, 0x10, 0x01, 0xe6, 0xdf, 
-0xf2, 0x61, 0x09, 0x65, 0xc2, 0xd8, 0x6a, 0x3c, 0x44, 0xdd, 0xf9, 0x6a, 
-0x0f, 0xd5, 0x67, 0x22, 0x71, 0x22, 0x72, 0xc0, 0x28, 0x28, 0x0a, 0xc6, 
-0xa2, 0xe3, 0x1e, 0xc2, 0xbe, 0x41, 0xc5, 0x5f, 0x4a, 0x27, 0xa9, 0xbf, 
-0x06, 0x48, 0x01, 0xa8, 0xe9, 0x3a, 0x53, 0xd2, 0xdf, 0xc2, 0xd4, 0x01, 
-0x0d, 0xfd, 0x5b, 0x9c, 0x20, 0x5e, 0x25, 0x52, 0x2e, 0x87, 0x4d, 0xeb, 
-0x13, 0x9b, 0x1d, 0x26, 0x72, 0x4b, 0x5d, 0xee, 0xcf, 0x8f, 0x4c, 0x0e, 
-0xae, 0x58, 0x75, 0xe9, 0xe0, 0xd2, 0xe4, 0x24, 0x2a, 0x44, 0x11, 0x14, 
-0x88, 0x09, 0x04, 0x4a, 0xc6, 0x94, 0x2a, 0x65, 0x6f, 0x54, 0xe2, 0x9a, 
-0x3f, 0x96, 0x59, 0x82, 0xb7, 0x31, 0x38, 0xaa, 0xf7, 0x51, 0xd8, 0xcc, 
-0x96, 0xf5, 0x4d, 0x96, 0x9e, 0x0c, 0x29, 0x5c, 0xd1, 0x64, 0x66, 0xa1, 
-0x5d, 0xa1, 0x3d, 0xdb, 0x0f, 0xe3, 0xc3, 0x4b, 0x45, 0x32, 0xb7, 0xdf, 
-0xef, 0x0f, 0x3f, 0x31, 0x01, 0xb0, 0x1e, 0x58, 0x01, 0x66, 0x4a, 0xbf, 
-0xad, 0x4f, 0x7a, 0x68, 0x0d, 0xcb, 0x42, 0x08, 0x0c, 0x71, 0xe3, 0xc8, 
-0xac, 0x28, 0xd9, 0x30, 0x0a, 0x72, 0x82, 0xd5, 0x5a, 0x25, 0x26, 0xc4, 
-0xfe, 0xc1, 0x2a, 0xe5, 0xdf, 0xe6, 0x73, 0xa1, 0x1d, 0x65, 0x65, 0xb8, 
-0x2d, 0x43, 0x86, 0x9a, 0x61, 0x73, 0x9c, 0xf2, 0x3b, 0x8d, 0xe8, 0x7d, 
-0x79, 0x58, 0x9b, 0x82, 0x2e, 0xbb, 0x24, 0xbc, 0xc2, 0x72, 0x3e, 0x64, 
-0x41, 0x6c, 0x5b, 0xd8, 0x29, 0x88, 0x53, 0xd5, 0xfd, 0x77, 0x0b, 0x16, 
-0x2c, 0xc0, 0xa9, 0x8a, 0x6b, 0x95, 0xbc, 0x48, 0x5c, 0x78, 0x52, 0x70, 
-0xcc, 0x4f, 0x54, 0x48, 0x4a, 0x34, 0x5e, 0x40, 0x3d, 0xf6, 0xd8, 0xa7, 
-0xa9, 0xe3, 0xd3, 0xf1, 0x43, 0x4a, 0x41, 0xdc, 0xf7, 0x3b, 0xec, 0xde, 
-0xe6, 0xb2, 0x92, 0xc8, 0x66, 0x1f, 0xa2, 0x86, 0x31, 0xf1, 0x33, 0x28, 
-0xba, 0xa7, 0xac, 0x13, 0x90, 0x38, 0x70, 0xe0, 0x00, 0x75, 0x29, 0x31, 
-0x48, 0xa0, 0xc9, 0x5d, 0x7e, 0xf9, 0xe5, 0xea, 0xaf, 0x7e, 0x07, 0x1a, 
-0x51, 0xa2, 0xc2, 0x5c, 0xb5, 0x40, 0x8f, 0xb5, 0xe1, 0x16, 0x36, 0xfd, 
-0x65, 0x36, 0x17, 0xc4, 0x8f, 0xd3, 0xf0, 0x84, 0xc8, 0x93, 0xe2, 0x52, 
-0xb4, 0x69, 0x37, 0x27, 0xc5, 0xd2, 0x9d, 0x40, 0xcb, 0x3e, 0xe8, 0x39, 
-0xf7, 0xda, 0xa7, 0x19, 0x1a, 0xfc, 0x77, 0x04, 0x1c, 0x48, 0xa6, 0x11, 
-0x15, 0x0c, 0xcc, 0xb1, 0x1e, 0xbe, 0xf1, 0x0a, 0xb1, 0x3e, 0xd1, 0xf2, 
-0x43, 0x67, 0xdc, 0xc1, 0x8a, 0xb2, 0xf4, 0xf0, 0x90, 0x64, 0x5a, 0x79, 
-0x4d, 0xa6, 0xf3, 0x69, 0x8d, 0x0c, 0x27, 0xe3, 0x0f, 0x1e, 0xd3, 0xcb, 
-0xcf, 0xb8, 0x71, 0x12, 0x65, 0xf4, 0xa2, 0x46, 0x63, 0xc6, 0x8c, 0x41, 
-0xa3, 0xb8, 0xe7, 0x9e, 0x7b, 0xf0, 0x51, 0xa0, 0xc6, 0xb1, 0x15, 0x51, 
-0xf3, 0x4f, 0x2d, 0x97, 0x4d, 0x71, 0x51, 0x9f, 0x1e, 0x51, 0xdf, 0xec, 
-0xa6, 0xe6, 0xba, 0x49, 0x54, 0x5e, 0xec, 0xd9, 0xb3, 0xb4, 0x6e, 0x8d, 
-0x65, 0xac, 0x61, 0x20, 0x6b, 0xe2, 0xc7, 0xb5, 0xab, 0xa6, 0x5d, 0xcc, 
-0xe6, 0xb1, 0xa9, 0x3b, 0x11, 0x35, 0x88, 0xa0, 0xe5, 0x4e, 0x17, 0x92, 
-0xad, 0xdd, 0xd2, 0xb1, 0xe3, 0xc7, 0xdc, 0x74, 0xd1, 0x9d, 0xc8, 0x79, 
-0x54, 0x6d, 0x32, 0x8d, 0xa8, 0x09, 0x46, 0x71, 0x34, 0xcc, 0xb2, 0x96, 
-0xf5, 0x62, 0xec, 0x6a, 0xdb, 0x40, 0x02, 0x6d, 0x9d, 0xb2, 0xbe, 0xea, 
-0x35, 0x53, 0xed, 0xc7, 0x8f, 0x29, 0xfa, 0x7a, 0x49, 0xb0, 0x72, 0x26, 
-0x2d, 0xef, 0x0b, 0x23, 0xc2, 0xcf, 0x4d, 0xe5, 0x01, 0x5f, 0x67, 0xa5, 
-0x64, 0x42, 0xb5, 0x1a, 0x54, 0xa1, 0x23, 0x88, 0x80, 0x5c, 0x59, 0x62, 
-0x01, 0x49, 0xbb, 0x63, 0x1f, 0x02, 0x1e, 0xea, 0xaf, 0x94, 0x50, 0xf0, 
-0xc9, 0x19, 0xc2, 0x46, 0x40, 0xe8, 0xae, 0x5e, 0x86, 0xa3, 0x54, 0x6a, 
-0x2d, 0x2c, 0x24, 0x7e, 0x84, 0xfc, 0x75, 0xf5, 0x4d, 0xc5, 0xd8, 0xfb, 
-0x3d, 0x2c, 0x11, 0x22, 0x00, 0xfe, 0x69, 0x99, 0x0f, 0xf1, 0x91, 0x76, 
-0x16, 0x13, 0x91, 0x18, 0x7f, 0x8b, 0xe5, 0x99, 0x2a, 0x57, 0xc4, 0xa6, 
-0x24, 0xe6, 0xf5, 0x76, 0xba, 0xff, 0xae, 0x6d, 0xdb, 0xb6, 0xd4, 0x70, 
-0xc1, 0x62, 0x4e, 0x65, 0x09, 0xbc, 0xda, 0x68, 0x04, 0xe6, 0x1a, 0x79, 
-0x3e, 0x44, 0x7c, 0xa0, 0xaa, 0x33, 0x8a, 0x1e, 0xb9, 0x80, 0x5e, 0xef, 
-0x75, 0x42, 0x01, 0x9e, 0x40, 0xc1, 0xac, 0x40, 0x02, 0x93, 0xbc, 0xde, 
-0x5d, 0x14, 0xc4, 0xf7, 0x6e, 0xb3, 0xeb, 0x6f, 0xd1, 0x07, 0x84, 0xca, 
-0xc9, 0xc8, 0x55, 0xa4, 0x49, 0x95, 0x65, 0x58, 0x33, 0x41, 0x04, 0xb0, 
-0x53, 0x56, 0x9c, 0x7a, 0x0b, 0xc4, 0x9f, 0xa9, 0xbf, 0xda, 0x8c, 0x0c, 
-0xc7, 0x14, 0x86, 0x43, 0x43, 0xcc, 0x03, 0xe6, 0x83, 0x04, 0x6b, 0xaa, 
-0xf4, 0x52, 0xd4, 0x47, 0xb7, 0x6b, 0xf9, 0x3d, 0x7f, 0xaf, 0x8b, 0x63, 
-0xff, 0x04, 0xe5, 0x9c, 0x25, 0xda, 0x97, 0x32, 0x50, 0x76, 0x2e, 0x9c, 
-0xd2, 0xbf, 0xa1, 0x3b, 0xf3, 0x89, 0xb2, 0x17, 0x51, 0x19, 0xcd, 0xce, 
-0x50, 0x5e, 0xcf, 0x51, 0x31, 0xbc, 0xac, 0xd5, 0xb0, 0x61, 0xc3, 0xf0, 
-0xdf, 0x11, 0xfe, 0x44, 0xa6, 0x91, 0xa1, 0x8a, 0xa6, 0x6e, 0x5e, 0xb2, 
-0xcb, 0x2b, 0x30, 0xc8, 0x92, 0x24, 0xa0, 0x5e, 0x15, 0x36, 0x56, 0xbf, 
-0x8d, 0x42, 0x5e, 0x1f, 0x43, 0x9d, 0x50, 0xae, 0x41, 0x63, 0xbc, 0x4b, 
-0xfc, 0xdc, 0xd4, 0x02, 0xf4, 0xcf, 0xa6, 0x09, 0xf9, 0xaa, 0xd5, 0x20, 
-0x51, 0x81, 0x02, 0xf7, 0x88, 0x4f, 0x08, 0xac, 0xb0, 0x66, 0x34, 0x39, 
-0x8a, 0x7a, 0xe8, 0x05, 0x16, 0x90, 0x03, 0xdd, 0x3d, 0x35, 0xc6, 0x56, 
-0x82, 0x46, 0xa9, 0x4d, 0xc6, 0xcb, 0x33, 0x5b, 0xae, 0xe5, 0x16, 0xa4, 
-0x1f, 0x52, 0x06, 0x81, 0x22, 0x26, 0x18, 0xb8, 0x70, 0x16, 0xf1, 0x6a, 
-0xd5, 0xad, 0x3d, 0x07, 0x7a, 0x10, 0x66, 0x0f, 0x4b, 0xef, 0xd9, 0x3a, 
-0x07, 0x13, 0x1c, 0xc1, 0x63, 0x52, 0x7a, 0x10, 0x30, 0x23, 0xb8, 0xdb, 
-0x7f, 0x0b, 0x5e, 0xcf, 0xc4, 0x31, 0x2a, 0xf3, 0xb1, 0x99, 0x9a, 0x42, 
-0xd8, 0x1b, 0x46, 0x21, 0x77, 0xc3, 0x22, 0xd0, 0xaa, 0xa7, 0xf3, 0x29, 
-0x26, 0xda, 0x72, 0x40, 0x83, 0xff, 0x8e, 0x0d, 0x05, 0x8a, 0x47, 0xa9, 
-0xc0, 0x26, 0xab, 0xeb, 0xd9, 0x7e, 0x46, 0x7c, 0xc0, 0x28, 0xf4, 0xd2, 
-0x32, 0x36, 0xc5, 0x47, 0xaf, 0x0b, 0xea, 0xe1, 0x84, 0x47, 0xb7, 0xf6, 
-0xa7, 0xc2, 0x5a, 0x20, 0x23, 0x78, 0xb8, 0x16, 0x95, 0x00, 0x3c, 0xb0, 
-0xfa, 0x7e, 0x2b, 0x15, 0xd8, 0xdf, 0xd4, 0xcb, 0x23, 0xae, 0x86, 0x20, 
-0x02, 0x4c, 0x7e, 0x54, 0x91, 0x31, 0x57, 0x67, 0x23, 0xbf, 0xde, 0xec, 
-0x38, 0x47, 0x05, 0xa4, 0xd8, 0x2b, 0x3e, 0x2c, 0xf6, 0x57, 0x4b, 0xce, 
-0x20, 0x5f, 0x52, 0xf2, 0x11, 0x15, 0x02, 0x91, 0x89, 0x74, 0x4a, 0xc4, 
-0x57, 0xfc, 0x83, 0x94, 0xa5, 0xd0, 0xcb, 0x6e, 0xbb, 0x93, 0x43, 0xe4, 
-0xd9, 0xf5, 0x2a, 0x10, 0xfa, 0x5d, 0x82, 0xc8, 0xe7, 0xb1, 0xa2, 0xaa, 
-0x70, 0x66, 0x9b, 0xc9, 0xee, 0x64, 0xe1, 0xf3, 0x72, 0x2d, 0xdf, 0x0e, 
-0x49, 0x97, 0x3a, 0x07, 0x5e, 0xe3, 0x6f, 0x99, 0x15, 0x35, 0xb8, 0xee, 
-0x45, 0x21, 0xff, 0x8e, 0x48, 0x1c, 0x0c, 0x50, 0x04, 0x1c, 0x90, 0x56, 
-0xe1, 0xa1, 0x02, 0xa5, 0x2d, 0x5e, 0x81, 0xec, 0x45, 0xa5, 0x19, 0xe2, 
-0x40, 0xd5, 0xca, 0x06, 0x68, 0x7a, 0xf7, 0x4a, 0xeb, 0x18, 0xb3, 0xb1, 
-0xf4, 0x05, 0x25, 0x13, 0xc5, 0x7c, 0x2f, 0xaa, 0x4e, 0xa8, 0x98, 0x6a, 
-0xff, 0xe2, 0x64, 0xb1, 0xf6, 0x7a, 0x20, 0x65, 0xc3, 0x9f, 0x2c, 0xf7, 
-0x45, 0xf4, 0x25, 0xcf, 0x23, 0x50, 0xa8, 0x41, 0x9a, 0x16, 0xc0, 0x1f, 
-0x78, 0x97, 0x74, 0x60, 0x21, 0xa1, 0x05, 0x43, 0x3b, 0xbf, 0xaa, 0x0b, 
-0x51, 0x3c, 0x3c, 0x24, 0x6a, 0xe3, 0x36, 0xa5, 0x20, 0xb4, 0xe5, 0x5d, 
-0xfc, 0x28, 0x98, 0xe0, 0xee, 0x95, 0xa9, 0x82, 0x6b, 0x38, 0xb6, 0x6d, 
-0x72, 0x5d, 0xa2, 0x19, 0xdc, 0x59, 0x23, 0xf5, 0x48, 0x2a, 0x66, 0xee, 
-0x53, 0xe4, 0x84, 0xe5, 0x0c, 0x75, 0xff, 0x1d, 0x04, 0x2c, 0x59, 0xa9, 
-0x78, 0x2a, 0x28, 0xea, 0x61, 0xa9, 0x51, 0xf8, 0x60, 0x83, 0xe2, 0x7a, 
-0xbd, 0x0c, 0x3a, 0xa6, 0x77, 0xaf, 0xb1, 0xdf, 0x5e, 0xe9, 0xde, 0xf3, 
-0x09, 0x94, 0xd4, 0xe6, 0x8d, 0x96, 0x47, 0x22, 0x38, 0x90, 0xd0, 0xb3, 
-0x34, 0xfd, 0xf3, 0x54, 0x90, 0x13, 0x6b, 0x1f, 0x15, 0x96, 0xb9, 0xcb, 
-0x48, 0x35, 0x96, 0x23, 0x20, 0x2c, 0xa1, 0x11, 0xc2, 0x79, 0x16, 0x2d, 
-0x5a, 0x44, 0xc5, 0x68, 0xba, 0x67, 0x10, 0x7b, 0x8b, 0x5b, 0x90, 0x1d, 
-0x8e, 0xa0, 0x74, 0x9c, 0x83, 0x7a, 0x60, 0x01, 0xd2, 0xb9, 0x87, 0x65, 
-0xa4, 0x0e, 0x9f, 0xe5, 0x2d, 0x88, 0xb0, 0xf4, 0xc3, 0x44, 0xee, 0xee, 
-0x46, 0x2a, 0x8a, 0xc7, 0x5c, 0x9f, 0xc1, 0xf2, 0x12, 0x98, 0xa4, 0x87, 
-0x78, 0x08, 0xe5, 0x0a, 0x54, 0x33, 0xb7, 0x53, 0x20, 0xd4, 0xc3, 0x22, 
-0xe8, 0xfe, 0x3b, 0xa4, 0x50, 0xec, 0xe6, 0x50, 0x32, 0x8a, 0x1f, 0x9e, 
-0x8a, 0x80, 0x50, 0x21, 0x36, 0x59, 0x5d, 0xc3, 0xf3, 0x5b, 0xea, 0xb0, 
-0x09, 0x15, 0x62, 0x28, 0x30, 0x47, 0xc2, 0x2b, 0x6c, 0x9e, 0x6f, 0xff, 
-0x34, 0x1c, 0x76, 0x94, 0x9c, 0xd1, 0x69, 0xc5, 0x3f, 0x78, 0xeb, 0xe2, 
-0x93, 0x99, 0xf2, 0x32, 0x53, 0x13, 0x7a, 0xb7, 0xcb, 0xc5, 0x0d, 0x42, 
-0x04, 0x3b, 0x5e, 0x79, 0x73, 0x84, 0x15, 0xd3, 0xd0, 0xaf, 0xa2, 0x9d, 
-0x0d, 0x4e, 0x71, 0xc8, 0xfd, 0x92, 0x4b, 0x2e, 0x81, 0x39, 0x10, 0xbb, 
-0x46, 0xfb, 0x1b, 0x2c, 0x5a, 0x6c, 0x6c, 0xc8, 0x4b, 0x70, 0x73, 0x62, 
-0x6f, 0x29, 0x6b, 0x42, 0xf6, 0x12, 0x36, 0x2e, 0xfd, 0x42, 0xcf, 0xa6, 
-0x08, 0x4a, 0x79, 0xab, 0x93, 0xf5, 0x36, 0x48, 0x9e, 0xb1, 0x64, 0x7f, 
-0x31, 0x39, 0x13, 0x5f, 0x8a, 0xdc, 0x02, 0x0d, 0xcd, 0x66, 0x01, 0x55, 
-0x12, 0x21, 0x3d, 0x54, 0x9d, 0x42, 0xc3, 0x36, 0xac, 0xa7, 0xcd, 0x84, 
-0x3e, 0x77, 0xd3, 0xd6, 0xfd, 0x77, 0x54, 0x5b, 0x45, 0xd5, 0x66, 0x67, 
-0xc1, 0x68, 0x4e, 0xa9, 0x9b, 0x80, 0x50, 0x21, 0x36, 0x59, 0x1a, 0xcc, 
-0xa8, 0xe9, 0x52, 0x65, 0xc4, 0xa7, 0xb5, 0xf3, 0xe9, 0x64, 0x32, 0xec, 
-0xa4, 0x00, 0x4c, 0xb0, 0x4c, 0x10, 0xea, 0xee, 0x80, 0xcd, 0x90, 0xe6, 
-0x4a, 0xf1, 0x28, 0x9f, 0xe6, 0x26, 0x27, 0x93, 0xac, 0x63, 0x78, 0x73, 
-0x0d, 0x6a, 0xa6, 0xe2, 0xa4, 0x23, 0x25, 0x9f, 0x82, 0x4e, 0xfa, 0xde, 
-0x46, 0x62, 0x1a, 0x81, 0x5e, 0xe6, 0x5b, 0xa0, 0x5b, 0xab, 0x11, 0xb0, 
-0xa0, 0xa3, 0x36, 0x50, 0xc8, 0x87, 0x24, 0x6f, 0x0a, 0x46, 0xd1, 0xb7, 
-0x0a, 0xe5, 0x81, 0x9c, 0x18, 0x12, 0x00, 0x90, 0x97, 0x88, 0xa7, 0x92, 
-0xe0, 0x11, 0x52, 0x97, 0xb0, 0xf6, 0x62, 0xe9, 0x52, 0x17, 0x7a, 0xf6, 
-0x73, 0xc1, 0x12, 0x75, 0xc3, 0x2e, 0xd5, 0x46, 0xd4, 0x85, 0x36, 0x8d, 
-0xa7, 0x76, 0x56, 0x46, 0xf5, 0x82, 0x20, 0xec, 0xc5, 0xce, 0xf9, 0x9c, 
-0x43, 0x0d, 0x14, 0x77, 0x67, 0x32, 0x67, 0x73, 0x57, 0x0f, 0x9b, 0xe6, 
-0x3b, 0x77, 0x7c, 0x49, 0x7f, 0x53, 0x2c, 0xac, 0x24, 0x0c, 0xab, 0x5e, 
-0x22, 0xee, 0xfa, 0x3d, 0x78, 0xef, 0x16, 0x09, 0x24, 0x30, 0xad, 0xa8, 
-0xd1, 0x89, 0xb1, 0xb3, 0x69, 0x7d, 0xb3, 0xb9, 0x4c, 0xfa, 0x69, 0x8c, 
-0xac, 0x76, 0x8b, 0x20, 0xf2, 0x0a, 0x0c, 0x11, 0x44, 0x71, 0x9a, 0x2d, 
-0x3c, 0xf6, 0x0b, 0x03, 0xeb, 0x93, 0x44, 0xa7, 0xc4, 0xcb, 0x81, 0xe1, 
-0x65, 0xfb, 0xa2, 0x4e, 0x7c, 0xf6, 0x10, 0xc7, 0x41, 0xbe, 0xa1, 0x65, 
-0x12, 0xb6, 0x5e, 0xd9, 0x16, 0x16, 0x81, 0x1a, 0x0d, 0x18, 0xe0, 0x0c, 
-0x20, 0x81, 0x60, 0x5b, 0x42, 0xd0, 0x61, 0x0e, 0x80, 0x81, 0xa0, 0x4e, 
-0xf8, 0x03, 0x78, 0xe0, 0x2d, 0x52, 0x9d, 0x85, 0x0e, 0x1e, 0xfa, 0x3b, 
-0xf6, 0x5c, 0x7d, 0x8b, 0x2d, 0x59, 0x9d, 0xac, 0xf7, 0xec, 0x03, 0x2a, 
-0x96, 0xbd, 0x26, 0xfc, 0x78, 0x59, 0x04, 0x04, 0xa8, 0x20, 0x14, 0x0f, 
-0x46, 0x36, 0x7d, 0x64, 0xdc, 0xbe, 0x1e, 0xbc, 0x99, 0xaa, 0xa6, 0x93, 
-0xfe, 0x98, 0xc4, 0xcb, 0xf9, 0x31, 0x37, 0xb9, 0x84, 0x3e, 0x18, 0x6a, 
-0x28, 0x4c, 0x82, 0x2c, 0xaf, 0x65, 0x5d, 0x7e, 0x33, 0x36, 0x3c, 0xa1, 
-0x42, 0x72, 0x8c, 0x48, 0x56, 0xa2, 0x41, 0x9b, 0x1a, 0xbd, 0xfc, 0x02, 
-0xd1, 0x30, 0xd4, 0x48, 0xc4, 0xb8, 0x1c, 0x10, 0x31, 0xfa, 0xa2, 0xdf, 
-0x2b, 0xa2, 0x2e, 0x24, 0x54, 0xc9, 0xcc, 0x97, 0xe5, 0x16, 0x5e, 0x73, 
-0x00, 0x03, 0xb9, 0x3b, 0x93, 0x87, 0x17, 0x99, 0x23, 0x82, 0x09, 0xf9, 
-0xd6, 0xdf, 0x3a, 0x1d, 0x0d, 0x89, 0x13, 0x21, 0xb7, 0x11, 0x63, 0x2e, 
-0xef, 0x0c, 0x30, 0x48, 0x9d, 0x66, 0x4c, 0x87, 0x68, 0x84, 0xd2, 0x29, 
-0x9d, 0x8d, 0x09, 0x1b, 0x60, 0xaf, 0x5e, 0xa5, 0x65, 0x2a, 0xf1, 0x69, 
-0x78, 0x56, 0x6d, 0xf5, 0x24, 0x1b, 0x14, 0x15, 0x75, 0x47, 0xfb, 0x75, 
-0x37, 0xbc, 0x3e, 0xbb, 0x2a, 0x68, 0x02, 0x07, 0xb6, 0x19, 0x87, 0x4f, 
-0xbc, 0x96, 0x87, 0x5a, 0x38, 0xaa, 0xe2, 0xe0, 0x05, 0x91, 0xac, 0xb4, 
-0x91, 0x80, 0xdf, 0x21, 0x14, 0xe4, 0xc3, 0xa9, 0x07, 0xc7, 0x4e, 0x28, 
-0xf5, 0x33, 0x31, 0x40, 0x51, 0x9e, 0x86, 0x55, 0xf5, 0xd0, 0x18, 0xc8, 
-0x0b, 0x2a, 0x10, 0x9f, 0x70, 0x8c, 0xeb, 0xed, 0xe1, 0xec, 0x17, 0xd3, 
-0xf5, 0xba, 0xac, 0xfa, 0x09, 0xc8, 0xf7, 0xfa, 0x8b, 0x94, 0x87, 0x09, 
-0x50, 0xa6, 0x44, 0xd2, 0x25, 0x62, 0xc2, 0x43, 0xab, 0x2d, 0xec, 0x27, 
-0x3e, 0x4d, 0xd2, 0xa7, 0x93, 0x8f, 0x5d, 0xd7, 0x83, 0x42, 0xe8, 0xe6, 
-0x4b, 0x74, 0x4d, 0x1d, 0xb9, 0xf4, 0xa6, 0x9b, 0x6e, 0x92, 0x6c, 0x49, 
-0xa2, 0x38, 0xc1, 0x03, 0x01, 0x54, 0x48, 0xbd, 0xd8, 0x0d, 0x31, 0xfa, 
-0x09, 0x1e, 0xe4, 0x40, 0xa6, 0xd2, 0xb1, 0x84, 0xad, 0xc6, 0xc3, 0x64, 
-0x88, 0x95, 0xd0, 0x9f, 0x5a, 0xef, 0x79, 0xe7, 0x47, 0xe0, 0x89, 0xbb, 
-0x1b, 0x29, 0x6f, 0xa3, 0xfd, 0x64, 0xcc, 0x5b, 0xaf, 0x76, 0xbb, 0xe0, 
-0x7a, 0xc5, 0x41, 0x9e, 0x54, 0x2f, 0x6a, 0x78, 0x9f, 0xbd, 0x3e, 0x35, 
-0xe6, 0x79, 0xea, 0xfe, 0x3b, 0xa9, 0x9f, 0x89, 0xf8, 0x24, 0xf5, 0x33, 
-0xf5, 0x7e, 0x5f, 0xbe, 0xf1, 0x0a, 0xc9, 0x31, 0x62, 0xac, 0x52, 0x5e, 
-0x9c, 0x96, 0xe8, 0x77, 0x4d, 0x62, 0x0f, 0x6f, 0x91, 0xed, 0x93, 0x6a, 
-0xc7, 0xfa, 0x5b, 0x97, 0xcf, 0xb8, 0x14, 0xfc, 0x8b, 0x7b, 0xc3, 0x2f, 
-0x46, 0x91, 0x04, 0xbd, 0xb2, 0xe5, 0x45, 0xfe, 0x13, 0x17, 0xa7, 0x2f, 
-0xb7, 0xd7, 0x1c, 0x40, 0x9f, 0x60, 0x60, 0x38, 0x19, 0x65, 0x97, 0xce, 
-0x12, 0xe6, 0x11, 0xf4, 0x27, 0xc5, 0xf6, 0x4a, 0x71, 0x41, 0xec, 0x4b, 
-0x12, 0x63, 0xab, 0xf8, 0x83, 0x24, 0x88, 0x49, 0x91, 0x22, 0x3e, 0x20, 
-0x41, 0xe9, 0x6e, 0x10, 0xaf, 0x05, 0x3f, 0x89, 0x95, 0x50, 0x8b, 0xa9, 
-0xd7, 0x57, 0xc6, 0x0c, 0x10, 0x48, 0xca, 0xa1, 0xfe, 0x2c, 0xaa, 0xd2, 
-0x21, 0xf0, 0xb3, 0x59, 0xb3, 0x99, 0xa4, 0x0b, 0x0f, 0x60, 0x56, 0x8a, 
-0xbb, 0x30, 0x8a, 0xe6, 0xcd, 0x4b, 0xbb, 0xd7, 0xf9, 0x57, 0x1c, 0x1e, 
-0x2e, 0xad, 0xfb, 0x82, 0xa4, 0x7e, 0xa6, 0x54, 0x28, 0xb6, 0xac, 0x60, 
-0x60, 0xd7, 0xb7, 0xcd, 0x5b, 0x01, 0x52, 0x93, 0x27, 0x4f, 0x56, 0x4b, 
-0x0c, 0xa9, 0x05, 0x42, 0x28, 0x96, 0xd7, 0xb2, 0x7b, 0x79, 0x68, 0x8a, 
-0x47, 0x1d, 0x10, 0x9b, 0x0e, 0x4e, 0xb8, 0x0d, 0x42, 0x3c, 0x49, 0xb0, 
-0x06, 0x2b, 0x93, 0x9a, 0x3c, 0x6d, 0x8b, 0xc9, 0x1d, 0x25, 0x15, 0x4b, 
-0x7d, 0x63, 0x33, 0x39, 0xc6, 0x8f, 0x47, 0x46, 0x71, 0xb4, 0x2c, 0xf2, 
-0x80, 0xa3, 0x40, 0x07, 0x3f, 0xaf, 0x8a, 0x60, 0x35, 0x6c, 0x85, 0x04, 
-0xd8, 0xa2, 0x4c, 0x53, 0x85, 0x05, 0xfe, 0x20, 0x3d, 0x63, 0xc5, 0xc7, 
-0xc4, 0xc1, 0x2b, 0xa0, 0x36, 0x82, 0xba, 0x8a, 0x90, 0x2a, 0xaf, 0xc6, 
-0x4a, 0x5a, 0x4c, 0xa9, 0xf3, 0xf5, 0x42, 0xfc, 0x5e, 0xcb, 0xa8, 0xd9, 
-0x7f, 0x52, 0x65, 0xf1, 0x1c, 0x6e, 0xbb, 0x14, 0x1a, 0x2f, 0xda, 0x83, 
-0xd4, 0x57, 0xbc, 0xa8, 0x93, 0x9a, 0x33, 0x6e, 0x4a, 0x5d, 0x5c, 0x24, 
-0x9b, 0xd2, 0xfe, 0xc4, 0xd4, 0x99, 0x06, 0xff, 0x1d, 0x6a, 0x1b, 0x02, 
-0x2a, 0x9e, 0x0a, 0x34, 0x34, 0x73, 0x56, 0xaa, 0x21, 0x1d, 0xcf, 0x93, 
-0x04, 0x25, 0x99, 0x77, 0x69, 0x69, 0x17, 0xd3, 0x0e, 0x99, 0x74, 0x10, 
-0x0b, 0xf5, 0x31, 0x7b, 0x1a, 0x9c, 0xe9, 0xdd, 0x4f, 0x64, 0x51, 0xa8, 
-0x4a, 0x42, 0xc3, 0x21, 0x9d, 0x74, 0x70, 0x8f, 0xcc, 0x1f, 0x55, 0x80, 
-0x63, 0xc1, 0x10, 0x60, 0x87, 0x37, 0x83, 0x48, 0x32, 0x24, 0xba, 0x6b, 
-0xa6, 0xb5, 0x72, 0xd7, 0x99, 0x45, 0xc6, 0xc1, 0x09, 0xc0, 0xae, 0x8c, 
-0x9d, 0xc7, 0x50, 0xb3, 0xd9, 0xef, 0x00, 0x72, 0xaf, 0x2f, 0x89, 0x78, 
-0x10, 0xcb, 0x70, 0x15, 0xa6, 0xaa, 0x1e, 0x8d, 0x08, 0x3f, 0xac, 0x22, 
-0xc7, 0x8f, 0x1f, 0xa7, 0xad, 0x3d, 0x71, 0x53, 0xe0, 0xc1, 0x50, 0xc1, 
-0x8e, 0xdd, 0x0b, 0x54, 0xd0, 0xac, 0x43, 0x5f, 0x0d, 0xcb, 0xba, 0x83, 
-0xfa, 0x7c, 0xc0, 0x8c, 0x99, 0xeb, 0xca, 0x37, 0xec, 0xc7, 0x5e, 0x67, 
-0x6e, 0xe7, 0x04, 0x55, 0xad, 0x90, 0x31, 0xe9, 0xf4, 0x65, 0xe7, 0x12, 
-0xce, 0xf1, 0x6c, 0xba, 0x24, 0x5a, 0x42, 0x4d, 0x9b, 0x32, 0xd5, 0x04, 
-0x20, 0xab, 0x5f, 0xed, 0x17, 0x36, 0xd7, 0x67, 0xa2, 0xe7, 0xf1, 0xaa, 
-0xfa, 0x99, 0x92, 0x53, 0x61, 0xee, 0x20, 0x67, 0x50, 0x33, 0x3c, 0xa1, 
-0x82, 0x8b, 0x69, 0xb8, 0xa8, 0x26, 0x47, 0xd2, 0xb3, 0xd7, 0x6c, 0x52, 
-0x9b, 0x0b, 0x84, 0xe0, 0x4b, 0x49, 0x32, 0x73, 0x15, 0x1c, 0x66, 0x8f, 
-0xf7, 0xea, 0xaa, 0xab, 0xae, 0x62, 0x5f, 0xb7, 0x7c, 0xb5, 0x78, 0xa0, 
-0x08, 0xe6, 0xe1, 0x87, 0xb2, 0xb3, 0x76, 0x7a, 0xf3, 0x02, 0x69, 0x22, 
-0x26, 0xe8, 0x3c, 0x8b, 0x9d, 0x07, 0xa5, 0x16, 0xbf, 0x98, 0x1a, 0x96, 
-0x14, 0x28, 0x9b, 0xb3, 0xf5, 0xe3, 0x34, 0x74, 0x24, 0xca, 0x10, 0x1a, 
-0x72, 0xa9, 0xd9, 0x29, 0xd1, 0xbf, 0xd5, 0x04, 0x86, 0x0f, 0x1f, 0x4e, 
-0x0b, 0x66, 0x61, 0xeb, 0x68, 0x11, 0xf0, 0x04, 0xb3, 0x05, 0x9d, 0x6f, 
-0x08, 0xf0, 0x54, 0x97, 0x20, 0x13, 0x12, 0x6d, 0x4a, 0x90, 0x85, 0x87, 
-0x29, 0x61, 0x6d, 0x53, 0xe7, 0xeb, 0xf5, 0x95, 0xc9, 0xe3, 0xf3, 0xe3, 
-0x41, 0x2c, 0x2f, 0x51, 0xdd, 0xbd, 0xe0, 0x87, 0x36, 0x1d, 0x82, 0x94, 
-0xbc, 0xc0, 0xe6, 0xc1, 0x66, 0x61, 0x6e, 0x36, 0xcb, 0x2d, 0x0c, 0x25, 
-0x91, 0xe0, 0x8d, 0xe4, 0x06, 0xa9, 0xa7, 0x80, 0x4e, 0x6c, 0x7a, 0xcd, 
-0xf5, 0xd9, 0xaa, 0xca, 0x54, 0x8c, 0x43, 0xc1, 0x5f, 0xfc, 0x77, 0x58, 
-0x32, 0xdc, 0xe5, 0x54, 0xe8, 0x65, 0xfa, 0xbd, 0xc4, 0xcc, 0xf2, 0x9e, 
-0xae, 0xbc, 0xf2, 0x4a, 0x35, 0x39, 0xaf, 0xf5, 0x69, 0xbc, 0x2e, 0x3a, 
-0x66, 0x19, 0xda, 0x01, 0x12, 0x9c, 0x63, 0x19, 0x23, 0xdd, 0xa5, 0x4b, 
-0x17, 0xc8, 0x17, 0x37, 0x16, 0xa5, 0x62, 0x20, 0x5f, 0x5a, 0xa3, 0xbb, 
-0xdb, 0xf3, 0xec, 0x7c, 0x8f, 0xe4, 0x40, 0x2d, 0x51, 0xe6, 0x0f, 0x7f, 
-0xc0, 0x2f, 0x46, 0x0a, 0x21, 0x76, 0x9e, 0xd5, 0xab, 0x57, 0xab, 0x6b, 
-0xf1, 0xef, 0x78, 0x9d, 0xb0, 0x7f, 0x27, 0xa0, 0x0b, 0x29, 0xc4, 0x62, 
-0xf3, 0x81, 0xc1, 0xca, 0x4b, 0xa5, 0xdb, 0x98, 0x3e, 0x73, 0x62, 0x37, 
-0xb0, 0x8a, 0x48, 0x8a, 0x92, 0x34, 0x4d, 0x36, 0xa8, 0x7d, 0x92, 0xe9, 
-0x65, 0x48, 0x09, 0x66, 0x04, 0xb0, 0x81, 0xb1, 0xae, 0x64, 0x71, 0xa1, 
-0xa5, 0x28, 0x45, 0xbc, 0xa0, 0xe5, 0xfa, 0x90, 0x66, 0xe0, 0xdf, 0xe3, 
-0x18, 0xae, 0x82, 0xac, 0x55, 0xbd, 0x7b, 0xfb, 0x69, 0x67, 0xaa, 0xbc, 
-0x0b, 0xaf, 0x1e, 0xa1, 0x8b, 0xd4, 0x42, 0x9d, 0xf3, 0xb3, 0x44, 0x6a, 
-0xce, 0x6c, 0x64, 0xd0, 0x00, 0xbb, 0x98, 0x9e, 0x59, 0xe5, 0x87, 0x7a, 
-0x49, 0xa7, 0x70, 0x35, 0x26, 0xfd, 0x12, 0xa8, 0x58, 0x47, 0xde, 0x0b, 
-0x8c, 0x02, 0x00, 0x98, 0x77, 0x1f, 0x5b, 0xa8, 0x50, 0x99, 0x77, 0x7a, 
-0x29, 0x48, 0xee, 0xc1, 0x9d, 0x28, 0x61, 0x8b, 0x08, 0x48, 0x2e, 0x35, 
-0x39, 0x31, 0x5e, 0xf7, 0x09, 0x56, 0x90, 0xb4, 0x1e, 0x8a, 0xb2, 0x10, 
-0x09, 0xc7, 0x56, 0xe1, 0x2e, 0x26, 0x14, 0x0d, 0x98, 0xc6, 0xbe, 0xd0, 
-0x2e, 0x01, 0x3f, 0xd4, 0x8c, 0x81, 0x7c, 0x91, 0xb6, 0x8b, 0x8b, 0x8b, 
-0xe9, 0x84, 0xad, 0xd7, 0xcd, 0xf6, 0x0a, 0x06, 0x62, 0xe9, 0xf2, 0xf3, 
-0xf3, 0xe9, 0x43, 0x37, 0x67, 0xce, 0x1c, 0x46, 0x23, 0x8e, 0x15, 0x30, 
-0x48, 0x04, 0x11, 0x3c, 0x91, 0x00, 0x18, 0xdc, 0x02, 0x6a, 0x90, 0xa0, 
-0x7b, 0x09, 0xa1, 0x1e, 0x4c, 0x11, 0x78, 0x03, 0xf4, 0x6a, 0xf8, 0x72, 
-0x3b, 0x34, 0x6c, 0xb6, 0x49, 0xe4, 0x40, 0x75, 0x77, 0x72, 0xea, 0x89, 
-0xb1, 0xc5, 0x35, 0x41, 0xd1, 0x03, 0xd2, 0xbb, 0x2d, 0xeb, 0xaf, 0x88, 
-0x65, 0x1c, 0x7b, 0x94, 0xbb, 0x16, 0xb5, 0x8c, 0x46, 0xa4, 0x10, 0x19, 
-0x3f, 0xa8, 0xf5, 0xc2, 0xc6, 0x89, 0x8a, 0xb7, 0x5c, 0x25, 0xd4, 0x33, 
-0xaf, 0x2f, 0xcb, 0x26, 0x66, 0x70, 0x56, 0xca, 0x2d, 0x08, 0x0a, 0xb4, 
-0xe9, 0xfa, 0x60, 0x53, 0xd0, 0x7b, 0x34, 0xca, 0xe5, 0x28, 0x48, 0x78, 
-0xe8, 0xb0, 0x2f, 0xb1, 0x68, 0x8a, 0xf9, 0xf0, 0x7d, 0xeb, 0xd6, 0xad, 
-0xb1, 0xcb, 0xc1, 0xd8, 0xf5, 0x96, 0x3d, 0xee, 0xb2, 0xf6, 0x98, 0x33, 
-0x73, 0x30, 0x3f, 0x1a, 0x7a, 0x9d, 0xbe, 0x0e, 0x04, 0x0a, 0x60, 0xf8, 
-0xa6, 0x61, 0xa7, 0xf0, 0x64, 0xb3, 0xd1, 0xc9, 0x16, 0x2a, 0x24, 0xca, 
-0x83, 0x21, 0x74, 0x03, 0x94, 0x79, 0xb9, 0xa1, 0x72, 0x9c, 0x2c, 0x14, 
-0xff, 0x21, 0x5c, 0x99, 0x0d, 0x80, 0xee, 0x72, 0xfc, 0xf0, 0x99, 0x80, 
-0x08, 0x78, 0xab, 0xa1, 0x32, 0xac, 0xe5, 0xdb, 0xa2, 0x8b, 0x76, 0xf7, 
-0xee, 0xdd, 0x11, 0x99, 0xd8, 0xc5, 0xa1, 0x60, 0x32, 0x42, 0xb0, 0x51, 
-0xe2, 0x34, 0x64, 0x07, 0x85, 0x8e, 0xc1, 0x06, 0xab, 0x03, 0x36, 0xa0, 
-0x75, 0x5d, 0x4b, 0x56, 0x43, 0x25, 0x24, 0x24, 0x60, 0x63, 0x29, 0x28, 
-0x28, 0x40, 0x39, 0x9b, 0x32, 0x65, 0x0a, 0x61, 0x29, 0x0c, 0x85, 0x0a, 
-0x4b, 0xc4, 0x04, 0x11, 0xd7, 0x00, 0x8c, 0xcd, 0x18, 0xe7, 0x17, 0x56, 
-0x6a, 0x64, 0x77, 0x3c, 0x62, 0x18, 0x7c, 0x4a, 0xe9, 0xd2, 0xd5, 0x25, 
-0xac, 0x1b, 0x3f, 0x6c, 0xba, 0xec, 0x79, 0x90, 0x32, 0xc1, 0x57, 0xfc, 
-0x50, 0xd4, 0x08, 0x0c, 0x63, 0x54, 0x45, 0xa1, 0xe4, 0x07, 0xce, 0xc6, 
-0x43, 0xe1, 0xef, 0xe3, 0xb9, 0xf8, 0x01, 0x4b, 0x44, 0x65, 0xf3, 0x23, 
-0x82, 0x1c, 0x52, 0x25, 0x31, 0x9e, 0x7a, 0x98, 0xa7, 0x57, 0xe8, 0xca, 
-0x09, 0xec, 0x02, 0x44, 0x37, 0xf1, 0x98, 0xa4, 0x28, 0x61, 0x7a, 0x42, 
-0xc3, 0x36, 0xd7, 0x5f, 0x91, 0xb7, 0xc0, 0x5f, 0xd9, 0xe4, 0xf4, 0x90, 
-0x0d, 0xcb, 0x5b, 0x20, 0x52, 0xb2, 0x61, 0xe9, 0x41, 0xb2, 0xba, 0x9e, 
-0x4d, 0xe8, 0x9e, 0xbc, 0x1d, 0x7e, 0x70, 0xc3, 0xcb, 0xa3, 0xe9, 0x3f, 
-0x3c, 0x2f, 0x4f, 0xad, 0xff, 0xa0, 0x02, 0xc9, 0x82, 0xa8, 0x1f, 0xdc, 
-0xd2, 0x2c, 0x54, 0xb5, 0xb4, 0x8b, 0xe9, 0xe3, 0xdc, 0x51, 0x8d, 0x89, 
-0xc4, 0x28, 0xeb, 0x63, 0xfe, 0xc1, 0x80, 0xeb, 0xce, 0xfe, 0x21, 0x0f, 
-0x82, 0x65, 0x0c, 0x69, 0x56, 0x3d, 0x14, 0x2d, 0xd2, 0x79, 0x4d, 0x28, 
-0xc7, 0x7a, 0x1d, 0x2d, 0xd2, 0x59, 0xa9, 0x65, 0x4c, 0xae, 0x32, 0xea, 
-0x07, 0xaf, 0x00, 0x8c, 0x71, 0x77, 0x83, 0xc4, 0x81, 0xa0, 0xc5, 0x97, 
-0x3c, 0x69, 0xa7, 0x66, 0x59, 0x7a, 0x48, 0x8e, 0xd7, 0xfa, 0x99, 0x80, 
-0xc4, 0x37, 0x54, 0xf0, 0x4a, 0xf4, 0x68, 0x7e, 0x9b, 0xaf, 0xdc, 0xce, 
-0x69, 0x68, 0xc0, 0xe0, 0x01, 0x5e, 0x04, 0x1e, 0x80, 0x32, 0x3b, 0x3a, 
-0x41, 0x3e, 0xe0, 0x01, 0x87, 0x2e, 0x89, 0x3b, 0xc4, 0x38, 0x20, 0x05, 
-0x52, 0xb4, 0x87, 0x2f, 0xb7, 0x6f, 0xdf, 0x0e, 0x36, 0xae, 0xbf, 0xfe, 
-0x7a, 0x64, 0x21, 0x42, 0x59, 0xe0, 0x86, 0x1c, 0x7c, 0xe0, 0x5a, 0x04, 
-0x2d, 0x0e, 0x62, 0x25, 0x60, 0xb8, 0x20, 0x81, 0x3d, 0x06, 0x68, 0x71, 
-0x3e, 0x70, 0x22, 0xe2, 0x05, 0x91, 0x9d, 0xa2, 0x4c, 0x98, 0xa8, 0x71, 
-0xdc, 0xe0, 0x17, 0x63, 0x4b, 0xd6, 0xdb, 0xd0, 0xd8, 0x99, 0x64, 0x39, 
-0x9d, 0x13, 0x1b, 0x1b, 0x0b, 0x68, 0x89, 0x3e, 0x40, 0x67, 0xc0, 0x7c, 
-0x8e, 0xb7, 0x4e, 0xaf, 0x34, 0x21, 0x4a, 0x36, 0x90, 0x40, 0xaf, 0x43, 
-0xd5, 0x86, 0xa5, 0x8c, 0x1a, 0x35, 0xca, 0x8f, 0xf6, 0xe1, 0xe5, 0x34, 
-0xf9, 0xf2, 0x1e, 0x16, 0x7a, 0xc0, 0x81, 0x03, 0x7b, 0xd7, 0x3b, 0x6b, 
-0x06, 0x72, 0x53, 0xc2, 0xfb, 0x55, 0xfd, 0x4c, 0x4b, 0x49, 0xd5, 0x07, 
-0x54, 0xf0, 0x9e, 0xe0, 0x15, 0x74, 0xe7, 0x86, 0x3a, 0xd9, 0xd8, 0x2c, 
-0x9b, 0x94, 0xfa, 0x31, 0x57, 0xa4, 0x46, 0x4c, 0xd1, 0x74, 0xff, 0x5e, 
-0xb6, 0x6c, 0x19, 0xa4, 0x0c, 0x1d, 0xb3, 0x31, 0x20, 0x32, 0xd1, 0xa7, 
-0x9d, 0x12, 0x3d, 0xe0, 0x81, 0x8c, 0x67, 0xcc, 0xf3, 0x68, 0x45, 0xc8, 
-0xd3, 0x6c, 0xf0, 0xc4, 0x3e, 0xc0, 0xfb, 0x58, 0x23, 0x42, 0x47, 0x39, 
-0x13, 0x62, 0x82, 0xee, 0x01, 0x89, 0x1c, 0x7c, 0xbe, 0xe5, 0x96, 0x5b, 
-0x64, 0x6b, 0x81, 0x7a, 0x00, 0x03, 0x28, 0x82, 0xbf, 0x01, 0x27, 0xcc, 
-0x9d, 0x08, 0x27, 0xec, 0xc4, 0xef, 0xbf, 0xff, 0x3e, 0xbf, 0x72, 0xf2, 
-0xb4, 0x69, 0xd3, 0xf0, 0xf2, 0xea, 0x1d, 0xd7, 0xfd, 0x98, 0xbf, 0x4f, 
-0x97, 0x50, 0xac, 0x5f, 0x4f, 0x25, 0x55, 0xd7, 0xa2, 0xfc, 0x61, 0x7d, 
-0x62, 0x0b, 0xc0, 0x4d, 0xc1, 0xbe, 0x83, 0x41, 0x56, 0xb7, 0x3e, 0x01, 
-0x09, 0x62, 0x01, 0x89, 0x89, 0xd2, 0x3b, 0x86, 0x99, 0xef, 0xab, 0x3b, 
-0x5e, 0x7c, 0x9a, 0x55, 0xe5, 0x9e, 0x8c, 0x34, 0x48, 0x46, 0xa7, 0xee, 
-0x58, 0xd4, 0xe7, 0x43, 0x97, 0x0f, 0x5e, 0x34, 0x6f, 0x1c, 0x33, 0x0f, 
-0x02, 0x70, 0x50, 0xa6, 0x8a, 0xf8, 0xe0, 0xb9, 0x7e, 0xa6, 0x5d, 0x54, 
-0xa8, 0x58, 0x0f, 0x7c, 0xe3, 0xa4, 0xf3, 0x21, 0xcc, 0xe0, 0x5b, 0x25, 
-0xeb, 0x88, 0x12, 0x60, 0xe8, 0xc4, 0xc8, 0x33, 0x6c, 0x5d, 0x44, 0x7a, 
-0xda, 0x99, 0x34, 0x30, 0xc0, 0x83, 0x0b, 0x39, 0x52, 0x9a, 0x16, 0x77, 
-0x01, 0xfa, 0x34, 0x12, 0x0e, 0x1b, 0x3f, 0x22, 0x3e, 0xfc, 0x01, 0x91, 
-0x89, 0xfc, 0x66, 0xf0, 0x80, 0x90, 0x40, 0xe7, 0x38, 0x3c, 0x2c, 0xb8, 
-0xd2, 0x41, 0x23, 0x91, 0x0e, 0xc8, 0xd3, 0xd8, 0xd1, 0xd8, 0xe6, 0xd9, 
-0xec, 0xf1, 0xfb, 0x42, 0x43, 0xc8, 0x42, 0xec, 0xaf, 0xe0, 0x47, 0x56, 
-0x8d, 0x83, 0x89, 0x91, 0x14, 0x0a, 0xd1, 0xf3, 0x57, 0x60, 0x40, 0x97, 
-0x2d, 0x76, 0x5f, 0xb0, 0x84, 0x65, 0x1a, 0x15, 0x05, 0x4f, 0x0b, 0xe2, 
-0xbb, 0x9d, 0x49, 0x56, 0xca, 0x39, 0xa3, 0x47, 0x8f, 0x06, 0xb1, 0xac, 
-0x30, 0x4e, 0x25, 0x50, 0x21, 0x0e, 0x0a, 0xac, 0x52, 0x86, 0xbe, 0xa6, 
-0x1e, 0xe6, 0x86, 0xad, 0xa6, 0x4f, 0x9f, 0x3e, 0x94, 0xb5, 0x8d, 0x8b, 
-0xb3, 0xa8, 0x69, 0x5d, 0x29, 0x0f, 0xe5, 0xe1, 0xa6, 0x50, 0x02, 0xd1, 
-0x8d, 0x50, 0x11, 0x1b, 0x22, 0xff, 0xf3, 0xf8, 0x2d, 0x5a, 0xb4, 0x40, 
-0x06, 0x56, 0x97, 0x20, 0x25, 0xb2, 0x79, 0x41, 0x12, 0xbc, 0x3e, 0x0e, 
-0x64, 0x69, 0x82, 0x88, 0x03, 0x79, 0x0a, 0x76, 0x40, 0xe4, 0x6a, 0xb6, 
-0x4b, 0x88, 0x04, 0xc2, 0xf8, 0xe5, 0x2f, 0x7f, 0xe9, 0x2e, 0x2b, 0xd5, 
-0x96, 0x04, 0x25, 0x4c, 0x9c, 0x21, 0x20, 0x50, 0xde, 0x1c, 0x34, 0xc7, 
-0x1e, 0xcc, 0xae, 0xcc, 0x06, 0x86, 0x7d, 0x00, 0x49, 0x06, 0xe2, 0xe6, 
-0x40, 0x8c, 0x61, 0xde, 0x40, 0x85, 0x0d, 0x80, 0x07, 0x1e, 0x3c, 0x78, 
-0x30, 0xff, 0x63, 0x70, 0xc4, 0xd8, 0x0c, 0x45, 0x22, 0xe7, 0x20, 0xe4, 
-0x80, 0x54, 0x39, 0x99, 0xb5, 0x00, 0x0f, 0x12, 0x19, 0xca, 0x4e, 0x09, 
-0x7f, 0x80, 0xa6, 0x11, 0xac, 0x21, 0x62, 0x8c, 0x30, 0x30, 0x25, 0x90, 
-0xa0, 0x7c, 0xba, 0xe2, 0x56, 0xe7, 0x57, 0x26, 0x40, 0x29, 0x2b, 0xd0, 
-0x82, 0x08, 0x84, 0x62, 0x80, 0x7c, 0x05, 0x48, 0x78, 0x42, 0x76, 0x53, 
-0x58, 0x01, 0xd7, 0xc2, 0x5e, 0x94, 0x80, 0xc4, 0x38, 0x14, 0x9b, 0xd1, 
-0x0b, 0x93, 0x05, 0xb2, 0xa6, 0xf6, 0xaf, 0x85, 0xf5, 0xe9, 0x41, 0x31, 
-0xf6, 0x2f, 0x24, 0x0f, 0x9b, 0xe8, 0x03, 0x2a, 0x4d, 0xf0, 0xbc, 0x1c, 
-0xbc, 0x3f, 0x0f, 0xd7, 0xa2, 0xbd, 0x10, 0xc3, 0xaf, 0xea, 0x06, 0x70, 
-0x26, 0x92, 0x15, 0x46, 0x36, 0x56, 0x98, 0x75, 0x36, 0x68, 0xe4, 0xd8, 
-0x85, 0x2d, 0xcb, 0xbf, 0x5b, 0x8e, 0x8f, 0x06, 0xa8, 0x57, 0x12, 0x21, 
-0x64, 0x08, 0xa9, 0x83, 0x6d, 0x1b, 0x5e, 0x87, 0xef, 0x88, 0x1d, 0x0d, 
-0x7a, 0x45, 0x4b, 0x31, 0x5b, 0x3e, 0x50, 0x0b, 0xd9, 0xec, 0x48, 0x42, 
-0xe4, 0xbd, 0xa3, 0xfe, 0xf1, 0xea, 0x99, 0x06, 0xab, 0xc1, 0xc1, 0xdc, 
-0xa0, 0x7b, 0x0e, 0x88, 0x01, 0x55, 0x01, 0xea, 0x84, 0x00, 0x10, 0x77, 
-0x11, 0x10, 0x90, 0x91, 0x38, 0xa0, 0x04, 0x7e, 0x85, 0x24, 0x38, 0x01, 
-0x29, 0x7d, 0xc6, 0x8c, 0x19, 0x10, 0x06, 0xd2, 0x2f, 0x54, 0x41, 0x2e, 
-0x34, 0x12, 0x0a, 0x7b, 0x1c, 0xf5, 0x48, 0x91, 0xae, 0xf1, 0x35, 0x31, 
-0x0d, 0xb6, 0xe3, 0xde, 0xbd, 0x7b, 0x43, 0x63, 0x8c, 0x09, 0x75, 0x71, 
-0x3e, 0xe4, 0xb7, 0x70, 0xe1, 0x42, 0x79, 0x7c, 0x54, 0x4a, 0x7e, 0xa5, 
-0xb5, 0x39, 0x37, 0xe2, 0x76, 0xcc, 0x87, 0xff, 0xa1, 0x55, 0x28, 0x4d, 
-0x95, 0xc1, 0x46, 0x06, 0xb1, 0xd4, 0xdf, 0xec, 0xf2, 0x0a, 0x51, 0xd2, 
-0x11, 0xa2, 0x78, 0x61, 0x50, 0x24, 0x8c, 0x5e, 0xa6, 0x88, 0x70, 0x02, 
-0x94, 0x31, 0xfd, 0xa2, 0xc8, 0xb2, 0xd3, 0xf3, 0x0c, 0x48, 0x2f, 0xdc, 
-0x18, 0xc0, 0x20, 0xcc, 0xe8, 0x07, 0xdf, 0xf0, 0x3d, 0x7f, 0xe5, 0x1c, 
-0xce, 0x14, 0xf1, 0x06, 0x41, 0x08, 0x5e, 0x26, 0x12, 0x0e, 0x78, 0x10, 
-0x09, 0x87, 0x14, 0x10, 0xe4, 0x25, 0x09, 0x4d, 0x41, 0xb9, 0x14, 0x87, 
-0xae, 0x30, 0x2b, 0x71, 0x23, 0xb2, 0x95, 0xc2, 0x40, 0x60, 0x1d, 0x08, 
-0xd9, 0xf8, 0x80, 0x11, 0xc4, 0x09, 0x8e, 0x00, 0x24, 0x1c, 0xfc, 0x8a, 
-0xb6, 0xc0, 0xd3, 0xf2, 0x57, 0xbe, 0xd4, 0xc3, 0x04, 0x3c, 0x90, 0x17, 
-0xfa, 0x22, 0x5e, 0x3f, 0x14, 0x53, 0x02, 0xa1, 0xc9, 0xc5, 0x23, 0x61, 
-0x12, 0x57, 0x20, 0xd1, 0x1f, 0x44, 0x31, 0x10, 0x2a, 0x22, 0x3f, 0xa4, 
-0x2e, 0x60, 0x67, 0x23, 0x14, 0x9c, 0x64, 0x2e, 0xac, 0x2e, 0x04, 0xae, 
-0xa1, 0x50, 0x92, 0xf4, 0x6c, 0x39, 0xac, 0x9e, 0xa5, 0x68, 0x1f, 0x12, 
-0x72, 0x26, 0xb9, 0x44, 0xc0, 0x9e, 0x67, 0xc7, 0x91, 0xa7, 0xbb, 0x17, 
-0xd4, 0x38, 0x4c, 0x95, 0x40, 0x23, 0x0a, 0x3c, 0x4b, 0x0e, 0x96, 0xde, 
-0x5b, 0x1a, 0x42, 0x44, 0xcc, 0x90, 0xc5, 0x87, 0x22, 0xf5, 0x4b, 0x38, 
-0x13, 0x3b, 0x38, 0xee, 0x64, 0x66, 0x8e, 0x17, 0x0c, 0x83, 0x8f, 0xfa, 
-0x2b, 0x91, 0x04, 0xc4, 0x23, 0x63, 0x32, 0x46, 0x7f, 0x25, 0xa7, 0x12, 
-0x77, 0xbb, 0xa1, 0xd6, 0x1b, 0x34, 0xc7, 0x2e, 0x8e, 0x84, 0xa6, 0x87, 
-0xe8, 0xb9, 0x7b, 0x2e, 0xf6, 0x63, 0x11, 0x86, 0x99, 0x09, 0x3b, 0x3d, 
-0x2c, 0x5a, 0x91, 0x01, 0xe2, 0xae, 0x1c, 0x22, 0xe5, 0x22, 0x1a, 0x41, 
-0x03, 0xd0, 0x28, 0x26, 0x10, 0x14, 0x3c, 0xfe, 0x87, 0x96, 0xd8, 0x1c, 
-0xf9, 0x1e, 0x01, 0x18, 0x3a, 0x11, 0x53, 0x21, 0x72, 0x01, 0xdb, 0x1c, 
-0x07, 0x9b, 0x20, 0x7b, 0x1f, 0x3b, 0x32, 0x34, 0xc3, 0xe5, 0x0c, 0x22, 
-0x62, 0x33, 0xb7, 0x90, 0x31, 0x21, 0x30, 0x2a, 0x48, 0xf0, 0x27, 0x75, 
-0xf0, 0x2b, 0x5f, 0x0a, 0x41, 0x62, 0xc3, 0x14, 0x61, 0x0c, 0x49, 0x04, 
-0x79, 0x07, 0x52, 0x61, 0x85, 0xdd, 0xe5, 0x6a, 0xdb, 0xe5, 0x15, 0xa0, 
-0x42, 0x59, 0xa2, 0x90, 0x7d, 0x19, 0x14, 0xa6, 0xc1, 0xc6, 0xcc, 0x3e, 
-0x8d, 0x49, 0x87, 0x3b, 0xc1, 0xe3, 0xc0, 0x09, 0xf2, 0x0f, 0x54, 0xce, 
-0xbd, 0xf1, 0xd1, 0x32, 0x7b, 0x1e, 0x95, 0xff, 0x39, 0xf8, 0x86, 0xef, 
-0x11, 0x78, 0x30, 0x3e, 0x3e, 0xf8, 0xe0, 0x83, 0x3c, 0x1b, 0xaf, 0x9f, 
-0x2a, 0xd0, 0xec, 0xee, 0xd4, 0x24, 0x96, 0xdd, 0x1d, 0xbc, 0x41, 0x10, 
-0xe0, 0x01, 0x1d, 0x08, 0xce, 0x60, 0x99, 0x05, 0x22, 0xf0, 0x10, 0xbe, 
-0x01, 0x3c, 0x60, 0x1d, 0x9c, 0x8f, 0xd5, 0x19, 0x9c, 0x88, 0xac, 0x85, 
-0x50, 0xce, 0xf7, 0x8c, 0xa0, 0xfb, 0x7d, 0xf4, 0x57, 0x88, 0xeb, 0x00, 
-0xb2, 0x20, 0xd1, 0x9e, 0xe8, 0x20, 0x48, 0x3f, 0xc0, 0x22, 0x0c, 0x58, 
-0xd9, 0x01, 0x0c, 0x50, 0xd1, 0x93, 0xee, 0x75, 0x55, 0x18, 0xeb, 0x87, 
-0x6e, 0xc2, 0xc2, 0xce, 0x43, 0x96, 0x8f, 0xb2, 0xd5, 0xe0, 0x67, 0xc0, 
-0x4a, 0xa3, 0x77, 0xbe, 0x64, 0x2f, 0x64, 0x6d, 0xe1, 0x93, 0xd0, 0x96, 
-0x9a, 0x36, 0x79, 0x88, 0x18, 0x94, 0x08, 0x4a, 0x35, 0xcf, 0x56, 0x5a, 
-0x5a, 0xca, 0x81, 0x7e, 0xc2, 0x76, 0x03, 0x85, 0xb1, 0xe0, 0x3a, 0x32, 
-0xc9, 0xdf, 0x30, 0x9b, 0x59, 0x99, 0x39, 0x46, 0x4c, 0xcb, 0xf4, 0x46, 
-0x3d, 0x61, 0xcd, 0xdc, 0xc2, 0xdc, 0x2b, 0xce, 0xc9, 0x1c, 0x84, 0x1c, 
-0xd9, 0x28, 0xf1, 0x09, 0x20, 0x53, 0x08, 0x01, 0x70, 0x40, 0x12, 0x1c, 
-0x4c, 0x8f, 0x03, 0x4a, 0x80, 0x5a, 0xd8, 0x0a, 0xe1, 0x03, 0xec, 0x86, 
-0x90, 0x29, 0x32, 0x33, 0xf4, 0x80, 0x39, 0x84, 0x2d, 0x92, 0x3f, 0x41, 
-0x27, 0x10, 0x15, 0xdf, 0x20, 0x48, 0xb3, 0x4b, 0x72, 0x40, 0x75, 0xec, 
-0x74, 0x90, 0x1c, 0x57, 0x41, 0x4e, 0x0c, 0xc8, 0xf8, 0x02, 0x2a, 0x86, 
-0x15, 0x02, 0x03, 0x45, 0x8c, 0x0c, 0x11, 0xf2, 0x3f, 0x07, 0xbf, 0xf2, 
-0x25, 0x87, 0x92, 0xae, 0xd9, 0xcd, 0x71, 0x92, 0x22, 0x3b, 0x61, 0xd2, 
-0xb0, 0x8c, 0x1e, 0x10, 0x06, 0xe0, 0x03, 0x2a, 0xc4, 0x12, 0xc2, 0x36, 
-0xc6, 0x3b, 0x83, 0x10, 0x09, 0x20, 0x81, 0x8e, 0xd9, 0xda, 0x11, 0x54, 
-0xd8, 0xe3, 0x99, 0xae, 0x08, 0x33, 0x80, 0x1b, 0x9c, 0x50, 0x07, 0x09, 
-0xc9, 0x5e, 0x0e, 0x3e, 0xf3, 0x0d, 0xdf, 0xf3, 0x90, 0xb2, 0x04, 0xd8, 
-0x94, 0x78, 0x5a, 0xb6, 0x79, 0x54, 0x05, 0x84, 0x25, 0xb6, 0x76, 0x80, 
-0xab, 0xc2, 0x42, 0x61, 0x4a, 0x66, 0xbb, 0xa4, 0x32, 0x2a, 0x2b, 0xbe, 
-0x01, 0x36, 0x98, 0x0c, 0x0f, 0xa0, 0x0e, 0x89, 0x27, 0xe5, 0x57, 0x1e, 
-0x98, 0x74, 0x36, 0xf5, 0xfe, 0x10, 0x1e, 0x70, 0xe5, 0x52, 0x28, 0x09, 
-0x18, 0xf8, 0x54, 0x88, 0xc9, 0xa6, 0xcd, 0x9e, 0xd3, 0xcc, 0xb9, 0x94, 
-0x72, 0x77, 0x3b, 0x7d, 0x0b, 0xb0, 0x8d, 0xaa, 0xa9, 0xb2, 0xcb, 0xf2, 
-0xda, 0xe0, 0xc6, 0x3a, 0xf1, 0x79, 0xc8, 0xe2, 0xd7, 0x23, 0xff, 0x3a, 
-0x77, 0xee, 0x0c, 0xa1, 0xb0, 0x3d, 0xb1, 0x07, 0xeb, 0x97, 0xdb, 0x4c, 
-0x8b, 0x93, 0x87, 0x25, 0xee, 0x46, 0x37, 0x71, 0x5a, 0x5a, 0xc0, 0xd5, 
-0xe0, 0x48, 0x71, 0x64, 0x3b, 0x11, 0x4f, 0xc5, 0x46, 0xa3, 0xbe, 0x84, 
-0x4d, 0x31, 0x01, 0x68, 0x91, 0xbd, 0x0f, 0xca, 0x16, 0x02, 0x50, 0x07, 
-0xbb, 0xa1, 0x6c, 0x88, 0x50, 0x0b, 0x4f, 0x0a, 0xa1, 0xb3, 0x0b, 0x60, 
-0x53, 0x81, 0x52, 0x75, 0xa9, 0x18, 0x3a, 0x61, 0x11, 0x20, 0x12, 0x38, 
-0x3f, 0xf4, 0xc6, 0x66, 0x07, 0x79, 0x80, 0x0d, 0xe8, 0x0d, 0x4a, 0x63, 
-0x04, 0xf0, 0x83, 0xe9, 0x85, 0xf1, 0x01, 0x89, 0x10, 0x18, 0x52, 0x16, 
-0xc3, 0x72, 0x40, 0x84, 0x1c, 0x7c, 0x00, 0x72, 0x50, 0x1d, 0x07, 0x60, 
-0xe0, 0x33, 0x5f, 0xc2, 0x70, 0xb8, 0x97, 0x84, 0x8e, 0xbb, 0xdb, 0x79, 
-0x7d, 0x43, 0x85, 0x99, 0x2e, 0x21, 0x41, 0xd2, 0x2d, 0xd8, 0xad, 0x21, 
-0x6b, 0x66, 0x8f, 0xf4, 0xc2, 0xa4, 0x31, 0x16, 0x51, 0xee, 0x85, 0xed, 
-0x1f, 0x66, 0xc2, 0x24, 0xf8, 0x9f, 0xcf, 0x3c, 0x1e, 0xe0, 0x01, 0x06, 
-0x3c, 0x3c, 0x92, 0x0f, 0x8f, 0x07, 0xae, 0x44, 0x73, 0x90, 0x28, 0x14, 
-0x11, 0x93, 0x3c, 0xc4, 0xb8, 0xdb, 0xf9, 0x93, 0x0c, 0xc2, 0x80, 0x7a, 
-0x4b, 0x0d, 0x36, 0xda, 0xf2, 0xcb, 0x8b, 0x12, 0x4a, 0x22, 0x9d, 0xc0, 
-0xdc, 0xbd, 0x12, 0x2a, 0xb1, 0x99, 0xbb, 0x8b, 0x6f, 0x47, 0x91, 0x14, 
-0x7a, 0x27, 0x2f, 0x0f, 0x05, 0x43, 0x7d, 0x43, 0x81, 0x71, 0x0f, 0x48, 
-0xd6, 0x1b, 0xcf, 0x61, 0xd1, 0x67, 0x77, 0xe4, 0x72, 0x44, 0x6a, 0x75, 
-0x39, 0x19, 0xe1, 0xf6, 0xb1, 0xcd, 0x99, 0x3a, 0xf3, 0xc9, 0xcc, 0x34, 
-0x46, 0x2e, 0x13, 0xa2, 0x42, 0x35, 0x78, 0x50, 0xea, 0x4a, 0x33, 0xfc, 
-0xa1, 0xd1, 0x04, 0x81, 0xb7, 0xba, 0x8b, 0x06, 0x05, 0x92, 0xcd, 0x5b, 
-0x4c, 0x88, 0x6c, 0x7f, 0x42, 0x00, 0xea, 0x80, 0x12, 0x38, 0xc4, 0x32, 
-0x2e, 0xa2, 0x32, 0xbc, 0x5d, 0x36, 0x32, 0xe8, 0x01, 0x7a, 0x65, 0xab, 
-0x65, 0xaf, 0x14, 0x3a, 0x91, 0x8e, 0xa6, 0xc8, 0x39, 0x72, 0x40, 0x6c, 
-0xec, 0x9e, 0x90, 0x35, 0xa3, 0xb1, 0x11, 0x33, 0x38, 0xb8, 0xe2, 0x03, 
-0xbf, 0xf2, 0xc6, 0x45, 0x90, 0x86, 0xc6, 0x20, 0x42, 0x39, 0xf8, 0x15, 
-0x6a, 0xe4, 0x4f, 0xf2, 0x57, 0xfe, 0x04, 0xc3, 0x01, 0x5d, 0xdc, 0xce, 
-0x1c, 0x63, 0xa6, 0x13, 0x98, 0x0f, 0xbc, 0x42, 0xbf, 0x4c, 0xf8, 0x06, 
-0x13, 0xd5, 0x85, 0x19, 0x08, 0x1d, 0xc6, 0x84, 0x14, 0xc4, 0xc3, 0x08, 
-0xd7, 0x53, 0x07, 0xdf, 0x70, 0xf0, 0x57, 0xce, 0x61, 0x21, 0x54, 0xf6, 
-0x8c, 0x0a, 0x90, 0xb6, 0x43, 0xf4, 0x5e, 0xcf, 0x11, 0x36, 0xc2, 0xfa, 
-0x62, 0x90, 0xf6, 0x9b, 0x2c, 0x7c, 0xa2, 0x21, 0x39, 0x59, 0x27, 0x4d, 
-0x7d, 0x93, 0xb6, 0x59, 0x94, 0x44, 0x2f, 0x63, 0x4e, 0xdc, 0x17, 0x52, 
-0xb5, 0x3e, 0x88, 0x87, 0x24, 0x04, 0x6e, 0x4d, 0x07, 0x67, 0x75, 0x32, 
-0xec, 0x91, 0x1d, 0x9a, 0x5d, 0x56, 0x8f, 0x8e, 0xf1, 0xa9, 0xda, 0x22, 
-0xba, 0x87, 0x4e, 0xdf, 0x28, 0xd9, 0x6a, 0x70, 0x04, 0x3f, 0x77, 0x49, 
-0xed, 0x27, 0xd7, 0x94, 0xe6, 0x3f, 0x61, 0x63, 0x45, 0x76, 0x12, 0xdf, 
-0x0b, 0x94, 0x0d, 0x89, 0x2b, 0x1a, 0x40, 0xb8, 0xe0, 0x33, 0xff, 0x73, 
-0x40, 0xfd, 0xfa, 0xb6, 0x28, 0x84, 0x24, 0xd9, 0x54, 0x90, 0x07, 0xc2, 
-0xb0, 0xc8, 0x0e, 0xaa, 0x9e, 0x9f, 0xf2, 0xd8, 0xf0, 0x72, 0xf9, 0xab, 
-0x08, 0x54, 0x6c, 0xc4, 0xfc, 0xcf, 0xc1, 0x80, 0x50, 0x17, 0x63, 0x72, 
-0x40, 0x63, 0xea, 0xe0, 0x57, 0xa8, 0x51, 0x08, 0x52, 0xfe, 0x04, 0xcf, 
-0x81, 0xe2, 0x11, 0x46, 0x3c, 0x6f, 0xc1, 0x7e, 0xa2, 0x42, 0xe7, 0x1b, 
-0x42, 0x8b, 0xa2, 0x0d, 0x73, 0x3f, 0x1e, 0xcf, 0xdd, 0xc1, 0x5f, 0x05, 
-0xf4, 0xca, 0xf2, 0xe8, 0x95, 0xd0, 0x7d, 0x3a, 0x81, 0x99, 0x30, 0x38, 
-0xcb, 0x7a, 0xe9, 0xa5, 0x97, 0xaa, 0xd7, 0x89, 0x53, 0xd6, 0x0f, 0x42, 
-0xf7, 0xe9, 0x12, 0xcb, 0x8a, 0xf9, 0xf6, 0x73, 0x97, 0xf5, 0x94, 0x43, 
-0xb6, 0x79, 0x4c, 0x3d, 0x6a, 0xf2, 0x48, 0x26, 0x9e, 0x43, 0x30, 0xf5, 
-0x3c, 0x04, 0xf4, 0x19, 0x04, 0x68, 0xf6, 0x69, 0x75, 0x39, 0xa6, 0x24, 
-0x0f, 0xb5, 0x70, 0xcc, 0xcf, 0xa8, 0x67, 0x90, 0x13, 0x77, 0xa4, 0xbb, 
-0xc3, 0x31, 0x42, 0xb8, 0x5b, 0x13, 0x1d, 0xd5, 0x48, 0x71, 0x88, 0x4f, 
-0x18, 0xcd, 0xd9, 0xc8, 0x21, 0x5f, 0x69, 0x33, 0x67, 0x3e, 0x84, 0x12, 
-0x74, 0x19, 0x41, 0xb7, 0xa9, 0x28, 0x22, 0x31, 0xec, 0xe8, 0xba, 0xf0, 
-0xcc, 0x98, 0x58, 0x90, 0xf4, 0x91, 0x19, 0x53, 0x11, 0x98, 0x90, 0xa2, 
-0x3a, 0x38, 0x4d, 0x3e, 0xdb, 0x24, 0xbc, 0x40, 0x51, 0x21, 0x54, 0x2b, 
-0x8f, 0x04, 0xf7, 0xe0, 0x10, 0x84, 0x58, 0x1e, 0x72, 0x82, 0x32, 0x2b, 
-0xf9, 0x44, 0xf1, 0x76, 0x4e, 0x66, 0x70, 0x9e, 0x9c, 0x5d, 0x41, 0xdf, 
-0x2c, 0x2d, 0x2b, 0xcd, 0xf8, 0x44, 0xf4, 0x9e, 0x4f, 0x76, 0xd7, 0xcb, 
-0xdd, 0x32, 0xc7, 0xc8, 0x72, 0x28, 0x3d, 0x47, 0x0c, 0xdf, 0xa2, 0xce, 
-0x28, 0xdc, 0x95, 0x0f, 0x53, 0xe3, 0x50, 0xed, 0x41, 0x9d, 0x8f, 0x0e, 
-0x80, 0xf6, 0x89, 0x17, 0x48, 0x7d, 0x03, 0xde, 0xec, 0x3f, 0x29, 0x72, 
-0x60, 0xdd, 0x9c, 0x52, 0xab, 0x1a, 0x06, 0x59, 0xdd, 0xe8, 0xe4, 0xae, 
-0x83, 0x04, 0xf1, 0xce, 0xba, 0x19, 0x17, 0x23, 0x87, 0xc4, 0x38, 0x22, 
-0x45, 0xb3, 0xd3, 0x4b, 0xeb, 0x20, 0xf3, 0xa1, 0x28, 0xc1, 0xf0, 0x5a, 
-0x15, 0x6d, 0x28, 0x3a, 0x31, 0x9f, 0xe0, 0x8e, 0xc6, 0x64, 0x4c, 0xcb, 
-0x43, 0xc0, 0xe0, 0x6e, 0x4c, 0x33, 0x69, 0x05, 0x07, 0x15, 0x76, 0x48, 
-0xb6, 0x02, 0xce, 0x11, 0xf3, 0x14, 0xbb, 0x94, 0xbe, 0x59, 0x06, 0x25, 
-0xdb, 0xdb, 0x03, 0x6d, 0x61, 0xd0, 0x34, 0x9b, 0x65, 0x7c, 0xea, 0x64, 
-0x45, 0x5d, 0x1c, 0x35, 0x82, 0x1e, 0x34, 0x30, 0xa8, 0xb3, 0x77, 0x9a, 
-0x26, 0xef, 0x59, 0x5d, 0x8b, 0xf3, 0x0e, 0xcb, 0xa6, 0x6e, 0x66, 0xf0, 
-0xa9, 0x91, 0x85, 0xa1, 0x60, 0x14, 0x1e, 0x06, 0x35, 0x32, 0x55, 0x4b, 
-0xdc, 0xad, 0x80, 0xce, 0x5e, 0x30, 0x25, 0x23, 0xfe, 0x89, 0x87, 0xc1, 
-0x5d, 0x8f, 0xb9, 0x0a, 0x20, 0x83, 0xc0, 0x6f, 0x11, 0x6e, 0xa8, 0x60, 
-0x73, 0xd2, 0x9d, 0x5f, 0x3e, 0x35, 0x9a, 0xb1, 0xbf, 0xad, 0xaa, 0x33, 
-0x51, 0x34, 0xf5, 0x50, 0x36, 0x45, 0x46, 0x38, 0x37, 0xec, 0x8f, 0x66, 
-0x59, 0x22, 0x0d, 0x0b, 0xb2, 0x9d, 0x92, 0x7e, 0xc4, 0x9f, 0xea, 0x98, 
-0xc4, 0x3d, 0xaa, 0x7e, 0x25, 0xc2, 0xdc, 0x7e, 0xe3, 0x18, 0xc6, 0xd1, 
-0x63, 0xce, 0x89, 0xc2, 0xd0, 0x05, 0x39, 0x0f, 0x59, 0x03, 0xaa, 0xc3, 
-0x37, 0xf7, 0xc5, 0x85, 0x27, 0x85, 0x33, 0xd0, 0xb3, 0xd1, 0x95, 0xdd, 
-0xf9, 0xc8, 0x02, 0xa7, 0xda, 0xf2, 0x1e, 0x21, 0xac, 0x50, 0x21, 0x6e, 
-0x3e, 0xdc, 0x99, 0x8a, 0x32, 0xdc, 0xf5, 0xd2, 0xb6, 0x4f, 0xb2, 0x9e, 
-0xcf, 0xc4, 0xed, 0x65, 0x66, 0x14, 0x64, 0x84, 0xfa, 0x34, 0xbe, 0x9e, 
-0x41, 0xaa, 0x46, 0x73, 0xd7, 0xf8, 0xc7, 0x3c, 0x32, 0xc9, 0x89, 0xea, 
-0x2a, 0x3d, 0x93, 0xd3, 0xa7, 0xc6, 0x31, 0xe7, 0xb6, 0xf6, 0xd7, 0x1f, 
-0x04, 0x41, 0x4e, 0x4f, 0xba, 0xa4, 0x66, 0x8c, 0xe5, 0x13, 0x19, 0xfc, 
-0x7d, 0x84, 0xeb, 0xe3, 0x37, 0xc0, 0x48, 0x8a, 0x95, 0x09, 0x05, 0xd7, 
-0x9c, 0xe3, 0x56, 0xde, 0xd4, 0x1c, 0xac, 0xf1, 0xc3, 0x0d, 0x15, 0xd8, 
-0x28, 0xf4, 0xe6, 0x29, 0xbc, 0x6c, 0x9f, 0x08, 0xd4, 0xd7, 0x93, 0x2d, 
-0x09, 0xda, 0xd7, 0x84, 0x1e, 0x73, 0xe9, 0x41, 0x62, 0x2e, 0xec, 0x37, 
-0x31, 0xd1, 0x43, 0xf4, 0xf5, 0x5a, 0x4f, 0x3e, 0xd5, 0xef, 0xd0, 0x35, 
-0x7e, 0x22, 0xa9, 0x08, 0xa3, 0x50, 0x20, 0xc1, 0xf9, 0xed, 0x2e, 0x77, 
-0xf7, 0xaa, 0x09, 0xa5, 0x45, 0x06, 0x08, 0x7c, 0x24, 0x6a, 0x41, 0x35, 
-0x23, 0xc5, 0xe6, 0x21, 0xa1, 0x09, 0xc1, 0xa2, 0xd4, 0x8a, 0x1c, 0x27, 
-0xac, 0x50, 0xc1, 0xe6, 0x84, 0xa7, 0x5c, 0xbd, 0x4e, 0x36, 0x51, 0x0f, 
-0xe5, 0x86, 0x7c, 0x05, 0x80, 0xf9, 0x7c, 0xc3, 0x4e, 0x29, 0xf7, 0xa5, 
-0x62, 0x9a, 0xaf, 0xf9, 0x93, 0x7a, 0xa1, 0x5b, 0x19, 0xc4, 0xa7, 0xe2, 
-0xdb, 0x96, 0x65, 0xcc, 0x81, 0x8a, 0x7d, 0x7f, 0xa5, 0x9e, 0xe9, 0xcf, 
-0xdd, 0xd1, 0x28, 0xc8, 0x51, 0x51, 0xcb, 0x48, 0x90, 0x88, 0xe5, 0x5a, 
-0xe1, 0x17, 0xa7, 0x40, 0xa8, 0x3a, 0x8d, 0x78, 0x13, 0x62, 0x7f, 0xf0, 
-0xaf, 0xc1, 0x28, 0x24, 0xef, 0x5c, 0xb4, 0xdb, 0x8a, 0xa4, 0xe6, 0x60, 
-0xdd, 0x2b, 0xac, 0x50, 0x81, 0x52, 0x41, 0xac, 0x81, 0x7a, 0x4f, 0xf6, 
-0x53, 0x93, 0x31, 0xbf, 0xb0, 0x59, 0x92, 0x4b, 0x44, 0xd1, 0x37, 0xf6, 
-0x3f, 0xa2, 0xa1, 0x08, 0xaf, 0xa0, 0x44, 0x08, 0xb9, 0x6c, 0x1e, 0x94, 
-0x75, 0xa4, 0x6d, 0xb3, 0xf8, 0x84, 0xef, 0xc2, 0x57, 0xbc, 0x19, 0x92, 
-0x48, 0x3d, 0xbb, 0xed, 0xcc, 0x83, 0xab, 0x04, 0x51, 0x7d, 0x32, 0x74, 
-0xe8, 0xb3, 0x3f, 0x0d, 0xc2, 0x49, 0xd4, 0xb5, 0xf4, 0x13, 0xd3, 0xad, 
-0x58, 0x7c, 0x4f, 0xe9, 0x51, 0xcb, 0xa1, 0xf4, 0x56, 0x5a, 0x44, 0x4c, 
-0xe3, 0x95, 0xc7, 0x28, 0x4c, 0xe0, 0x06, 0x7a, 0xb6, 0x87, 0xbe, 0x41, 
-0xc1, 0x22, 0xdc, 0x72, 0x1d, 0x27, 0x7c, 0x50, 0xc1, 0xb6, 0xc4, 0xfe, 
-0x44, 0x10, 0xa5, 0x7a, 0xc1, 0xb7, 0x5c, 0xde, 0xc1, 0x26, 0x65, 0x60, 
-0xbd, 0x35, 0xd3, 0xb7, 0xfa, 0x86, 0x80, 0x11, 0x72, 0x09, 0x49, 0x22, 
-0x23, 0x82, 0x70, 0xee, 0x88, 0x26, 0xc0, 0x46, 0xf2, 0xd1, 0xcc, 0xe4, 
-0x48, 0x98, 0x9d, 0x1f, 0x99, 0x9f, 0x86, 0xdc, 0x34, 0xcf, 0x6e, 0x3b, 
-0xf3, 0x13, 0x59, 0x06, 0xc3, 0x9e, 0xd9, 0xd0, 0xd7, 0xe6, 0xb3, 0x13, 
-0x0f, 0xa2, 0xa7, 0x0a, 0x13, 0xaf, 0xa1, 0x47, 0x55, 0x12, 0x8c, 0xe8, 
-0x6e, 0x1c, 0x3d, 0xd1, 0x8f, 0x40, 0x5a, 0xa2, 0xf4, 0x88, 0xd0, 0xc6, 
-0xd9, 0x4c, 0x08, 0x4f, 0xe8, 0xea, 0xd9, 0x02, 0xb6, 0x30, 0x41, 0x85, 
-0xf8, 0xef, 0x60, 0xdc, 0x7a, 0x80, 0xfe, 0xdb, 0x47, 0x47, 0xd8, 0xa4, 
-0x0c, 0x38, 0x03, 0x8d, 0x49, 0xc9, 0x66, 0xd6, 0x83, 0x49, 0x3d, 0xe0, 
-0xc4, 0xdd, 0x9f, 0x28, 0x10, 0x68, 0xf3, 0x8e, 0xfa, 0x69, 0xaa, 0x09, 
-0x2f, 0xc3, 0x7a, 0x75, 0xdb, 0x99, 0xc7, 0x37, 0xa7, 0xbf, 0x93, 0xe4, 
-0x69, 0xbf, 0x8a, 0x8f, 0x9e, 0x24, 0x4d, 0x55, 0x66, 0x22, 0xae, 0xf5, 
-0xa7, 0x73, 0x87, 0x2e, 0x52, 0xf0, 0x75, 0x2d, 0x9f, 0x40, 0x6e, 0x52, 
-0x6e, 0x08, 0x7c, 0x22, 0xb6, 0x02, 0x7f, 0x51, 0xe8, 0x6a, 0x14, 0x61, 
-0x85, 0x0a, 0x3c, 0x15, 0xec, 0x4f, 0x7a, 0x61, 0x1e, 0x12, 0x0f, 0x7c, 
-0x95, 0xef, 0x85, 0xe0, 0xc8, 0x7c, 0x27, 0x74, 0x9c, 0xb4, 0xfa, 0x9d, 
-0x57, 0x15, 0x12, 0x14, 0x44, 0xa8, 0x36, 0x3d, 0x19, 0x70, 0x6f, 0x79, 
-0xad, 0xac, 0x43, 0x8a, 0xb0, 0x87, 0x0e, 0x1b, 0x1e, 0x26, 0xa3, 0x97, 
-0x8f, 0xf7, 0xea, 0xb6, 0x33, 0xa0, 0x02, 0xd6, 0x64, 0x86, 0xa8, 0xcd, 
-0xd6, 0x5b, 0x0c, 0x45, 0x10, 0x87, 0x5e, 0x93, 0x8e, 0xca, 0x0f, 0x7a, 
-0x66, 0x48, 0x8f, 0xd6, 0x6e, 0xcb, 0xd7, 0xea, 0xed, 0x51, 0x50, 0xf1, 
-0x25, 0x6f, 0x81, 0x38, 0x3c, 0xa2, 0x9b, 0x3c, 0x57, 0xbd, 0x2f, 0x57, 
-0xc9, 0x27, 0x58, 0x83, 0x87, 0x09, 0xaf, 0x40, 0xcf, 0x26, 0xb8, 0x40, 
-0x0f, 0xf4, 0xa0, 0x83, 0x8e, 0x1f, 0xdb, 0xb6, 0x87, 0x4b, 0xa0, 0x78, 
-0x6a, 0x45, 0xb2, 0x77, 0xba, 0x63, 0x14, 0xd4, 0xfd, 0xf6, 0x70, 0x39, 
-0xfd, 0x90, 0xdc, 0xfd, 0x55, 0x55, 0x85, 0xf2, 0xdc, 0x48, 0x8d, 0x06, 
-0x28, 0xe6, 0x11, 0x08, 0x7c, 0x34, 0xcf, 0xc7, 0x3e, 0xb4, 0x10, 0x32, 
-0xd5, 0xe5, 0x84, 0x78, 0xe8, 0xdd, 0xd3, 0xd9, 0x05, 0xc8, 0x30, 0x71, 
-0x37, 0x67, 0xdd, 0xf8, 0x46, 0x89, 0x2d, 0x72, 0x06, 0x09, 0xff, 0x26, 
-0x1a, 0x9a, 0xa8, 0x24, 0x82, 0xdc, 0x42, 0x54, 0xc9, 0x56, 0xa0, 0x0a, 
-0x13, 0x54, 0xa0, 0x67, 0xb3, 0x45, 0xe9, 0xc9, 0x00, 0xf6, 0x8b, 0xd8, 
-0xf9, 0x04, 0x1e, 0xbd, 0x86, 0x8a, 0x9e, 0x94, 0x4b, 0x71, 0x13, 0xcf, 
-0x25, 0x77, 0x0f, 0xae, 0x74, 0x8b, 0x19, 0xc9, 0xa7, 0xf3, 0xea, 0xb6, 
-0xb3, 0x6c, 0x19, 0x4c, 0x98, 0x93, 0x01, 0x15, 0x54, 0xe3, 0xb5, 0xd9, 
-0x14, 0x0a, 0x1b, 0x03, 0xd3, 0x56, 0x97, 0x13, 0xe2, 0xa1, 0x0f, 0x45, 
-0x1b, 0x1a, 0x77, 0x2b, 0x63, 0x08, 0x72, 0x21, 0xf7, 0x4d, 0xea, 0x7b, 
-0x63, 0x7d, 0x92, 0xbc, 0x85, 0x60, 0xed, 0xd9, 0x95, 0x35, 0x4e, 0x98, 
-0xa0, 0x82, 0x37, 0xa1, 0x77, 0xd5, 0xc0, 0x58, 0x69, 0x5f, 0xb0, 0xf6, 
-0x09, 0x15, 0x1f, 0x9f, 0x28, 0x35, 0xe4, 0xeb, 0xe9, 0xd1, 0x9e, 0xbb, 
-0x41, 0x53, 0x35, 0xd0, 0x83, 0xb1, 0x55, 0x48, 0xd3, 0xb3, 0xdb, 0x0e, 
-0xa1, 0x8e, 0x3e, 0xed, 0xe6, 0xa9, 0x52, 0x1b, 0xd7, 0x80, 0x8a, 0xcb, 
-0x47, 0xdb, 0x6d, 0x88, 0x8a, 0x16, 0xa4, 0x5f, 0xab, 0xab, 0x64, 0x00, 
-0xd5, 0x43, 0x49, 0x42, 0xbd, 0xe4, 0x3d, 0x01, 0x26, 0x88, 0x4f, 0xd2, 
-0x43, 0x19, 0xf1, 0x89, 0xa0, 0x54, 0x44, 0xd9, 0xca, 0xa2, 0xe6, 0x60, 
-0xdd, 0x37, 0x1c, 0x50, 0x01, 0xbf, 0x86, 0x6b, 0xeb, 0x4d, 0xc9, 0x48, 
-0x53, 0xf6, 0x89, 0xd6, 0xed, 0x9f, 0x4c, 0xbf, 0x12, 0xb3, 0xc4, 0x82, 
-0xd9, 0xde, 0xb3, 0x63, 0x84, 0x6d, 0xde, 0x83, 0x7c, 0x45, 0x15, 0x29, 
-0xaf, 0x6e, 0x3b, 0x22, 0x08, 0x2d, 0x43, 0xfd, 0xcc, 0x3e, 0x13, 0x92, 
-0x57, 0x6d, 0x3e, 0x0e, 0x95, 0xbb, 0xd4, 0xb3, 0xe8, 0x7c, 0x0f, 0xae, 
-0xe5, 0xa1, 0x3f, 0xa0, 0xde, 0x64, 0x9e, 0xcb, 0x71, 0x53, 0xe0, 0xbc, 
-0x23, 0x01, 0x88, 0xec, 0x05, 0x62, 0xb6, 0x25, 0xd5, 0x3e, 0x58, 0xd4, 
-0x59, 0x59, 0xe3, 0x84, 0x09, 0x2a, 0x10, 0x9f, 0xf4, 0x5a, 0xb4, 0xe5, 
-0xd7, 0x94, 0x4c, 0xcf, 0xde, 0x54, 0x24, 0xe5, 0xb5, 0xf3, 0x2a, 0x3d, 
-0x5a, 0xcf, 0x6e, 0x76, 0x5b, 0xc1, 0x92, 0x6a, 0xb9, 0x9e, 0xab, 0xcf, 
-0x93, 0x47, 0xce, 0xbd, 0xc6, 0xf6, 0xae, 0x67, 0x26, 0x77, 0xba, 0x2b, 
-0xe9, 0x28, 0xc5, 0x2a, 0x60, 0xd3, 0x34, 0x8c, 0x8f, 0xcf, 0x9d, 0x82, 
-0xe4, 0xb9, 0x30, 0x26, 0xf9, 0x8c, 0xfa, 0x85, 0x52, 0xaf, 0x09, 0x3d, 
-0x9b, 0x6c, 0x07, 0xde, 0x82, 0xa1, 0x92, 0x55, 0x65, 0x91, 0x75, 0x80, 
-0xf7, 0x0d, 0x79, 0x54, 0x48, 0x04, 0x3b, 0x7b, 0x95, 0xee, 0x5e, 0xb0, 
-0xef, 0xd6, 0xb5, 0xb9, 0xad, 0xca, 0x69, 0x84, 0x6d, 0x9b, 0x9b, 0xf3, 
-0x12, 0x1d, 0xe8, 0x39, 0x2c, 0xf7, 0xcd, 0xc3, 0xae, 0xc2, 0x02, 0xf8, 
-0x8f, 0xdd, 0xdd, 0x8b, 0x32, 0x98, 0x1e, 0x26, 0x8c, 0xf4, 0x8f, 0xc9, 
-0x98, 0x11, 0x2c, 0xdb, 0x4a, 0x91, 0x13, 0xa7, 0xd3, 0x28, 0x95, 0x0e, 
-0x6d, 0x3e, 0x11, 0x66, 0x6b, 0x4b, 0x54, 0x50, 0x01, 0xd6, 0xf3, 0x08, 
-0x7a, 0x19, 0x63, 0x22, 0xf6, 0x0d, 0x75, 0xd4, 0x43, 0xd7, 0x9f, 0xad, 
-0x03, 0x29, 0xe4, 0x51, 0x21, 0x29, 0x81, 0xf3, 0xe7, 0xcf, 0x57, 0xef, 
-0x18, 0xef, 0x92, 0x4d, 0xca, 0xf0, 0xf5, 0x34, 0x44, 0x76, 0x33, 0x25, 
-0x79, 0x6d, 0x32, 0x22, 0xe5, 0xf8, 0x3d, 0x94, 0x4d, 0xb8, 0x67, 0x5d, 
-0x1f, 0x0f, 0x33, 0xd9, 0x75, 0xd5, 0xc5, 0x56, 0xdc, 0x96, 0xf6, 0x56, 
-0x5c, 0x7e, 0xfa, 0x94, 0x50, 0x3f, 0x6c, 0x3e, 0x94, 0xea, 0xc3, 0xa2, 
-0x2e, 0x47, 0x70, 0xa2, 0xb5, 0x9f, 0xe7, 0xcb, 0x41, 0xaf, 0xee, 0xbb, 
-0x24, 0x93, 0x96, 0xd8, 0x75, 0xac, 0x4f, 0x1e, 0xea, 0xa8, 0x07, 0xb8, 
-0x6d, 0x57, 0xca, 0xe5, 0x21, 0x8f, 0x0a, 0xc9, 0xa9, 0xd0, 0xad, 0x4f, 
-0xd4, 0x39, 0xb7, 0x49, 0x19, 0x3e, 0x9d, 0x06, 0x19, 0xe9, 0xe9, 0x35, 
-0x42, 0x4c, 0xa8, 0xf5, 0x96, 0xb5, 0xe6, 0xd5, 0xc8, 0x52, 0x8e, 0x9f, 
-0xa0, 0x6e, 0x0f, 0xfe, 0x0a, 0x0f, 0x7f, 0x22, 0x14, 0x5c, 0x55, 0x00, 
-0xb1, 0x6c, 0x20, 0x86, 0xf0, 0xa6, 0xc8, 0xda, 0xa7, 0x02, 0xd2, 0x8c, 
-0xac, 0x37, 0x7f, 0x42, 0xbd, 0xb6, 0xd3, 0xea, 0x49, 0x77, 0xf9, 0x11, 
-0x54, 0x4b, 0xc9, 0x19, 0xa9, 0xc3, 0x47, 0x7a, 0xb4, 0xbb, 0xea, 0x94, 
-0x95, 0x42, 0xd6, 0x01, 0xde, 0x34, 0xb4, 0x51, 0x81, 0xf8, 0x84, 0x4d, 
-0x96, 0x2a, 0x29, 0x8a, 0x32, 0xf0, 0x49, 0x05, 0xab, 0xab, 0x95, 0x8e, 
-0x19, 0x2c, 0x5a, 0x7a, 0x19, 0x0b, 0x75, 0x3b, 0x0a, 0x80, 0x7b, 0x86, 
-0x16, 0x75, 0x71, 0x38, 0xb9, 0x7e, 0x9e, 0xdb, 0xac, 0x1d, 0xcf, 0x97, 
-0xeb, 0xb5, 0x05, 0x2c, 0x65, 0x1b, 0x44, 0x26, 0x35, 0x19, 0xcb, 0x0a, 
-0x37, 0x1e, 0xc6, 0xc7, 0x13, 0x07, 0x62, 0xf1, 0x51, 0xc2, 0x22, 0xec, 
-0x14, 0x7c, 0xc0, 0x0d, 0xa2, 0xf3, 0x25, 0x92, 0x51, 0xc5, 0x4d, 0x41, 
-0xb5, 0x0e, 0xea, 0x0f, 0x84, 0x87, 0x9e, 0x1d, 0xf2, 0xbe, 0x6d, 0xc9, 
-0xe2, 0x25, 0x10, 0x8d, 0xba, 0xb7, 0xea, 0x6d, 0xb9, 0x0b, 0xf0, 0x34, 
-0x13, 0x07, 0x89, 0x41, 0x52, 0x48, 0xdc, 0xce, 0x8f, 0x1e, 0x1c, 0xaa, 
-0x2b, 0x30, 0x5e, 0xb3, 0xa2, 0xb1, 0xfa, 0x73, 0x3e, 0x31, 0x54, 0x3e, 
-0xf1, 0x25, 0x39, 0x99, 0xa4, 0x50, 0x3d, 0xaa, 0xc2, 0xd2, 0xf8, 0x4b, 
-0x5d, 0x6e, 0x35, 0x1f, 0x0f, 0xaa, 0x8b, 0x1f, 0x77, 0x37, 0x5c, 0x42, 
-0x82, 0x38, 0x81, 0x24, 0xea, 0x5e, 0x54, 0x43, 0xa3, 0xb6, 0x1f, 0x8c, 
-0x82, 0xaa, 0x33, 0x94, 0xd8, 0xa0, 0xbc, 0x40, 0xe8, 0x66, 0x53, 0x98, 
-0x19, 0x4b, 0x08, 0xf3, 0x0a, 0x89, 0x7d, 0x62, 0x97, 0xa2, 0xa6, 0xb7, 
-0x7a, 0x5b, 0xd8, 0x64, 0x6c, 0x52, 0x80, 0x1e, 0x28, 0xea, 0xce, 0x1a, 
-0xe3, 0xf9, 0x7b, 0xc2, 0x04, 0x3d, 0xdf, 0x0b, 0x73, 0x10, 0x01, 0xb0, 
-0x0c, 0xe2, 0x9f, 0xaa, 0xa3, 0xd7, 0x05, 0x64, 0x10, 0xcb, 0x68, 0x5c, 
-0x55, 0x48, 0x81, 0x22, 0x4e, 0x36, 0x9d, 0x77, 0x36, 0xd7, 0x47, 0x3f, 
-0x0d, 0xb7, 0x9d, 0x3c, 0x88, 0x3a, 0x28, 0x92, 0x49, 0xe0, 0x13, 0x55, 
-0x0b, 0x60, 0x14, 0xb8, 0x29, 0x28, 0xd8, 0x11, 0xea, 0xb1, 0x4f, 0x61, 
-0xa2, 0x6d, 0x8b, 0x46, 0x41, 0xc1, 0x46, 0xf5, 0xaa, 0x90, 0x07, 0x6c, 
-0xc6, 0x3e, 0x19, 0xb4, 0x46, 0x35, 0x02, 0x91, 0x76, 0x84, 0x33, 0x51, 
-0xcf, 0x8f, 0x0e, 0x7d, 0xaa, 0x9f, 0x03, 0xa5, 0xfe, 0x48, 0x81, 0x30, 
-0xf4, 0xdf, 0x40, 0x28, 0xf7, 0xda, 0xf8, 0x19, 0xab, 0xbf, 0x8c, 0xec, 
-0xc1, 0x4f, 0xec, 0x8e, 0x46, 0x69, 0x5c, 0x62, 0xc0, 0xe4, 0x2b, 0x07, 
-0x86, 0x9a, 0x4f, 0x56, 0x91, 0x85, 0xd8, 0x64, 0xfd, 0x20, 0x77, 0x3b, 
-0x97, 0xd0, 0x88, 0x07, 0x7f, 0xb9, 0x3e, 0x99, 0xae, 0x5d, 0xbb, 0x62, 
-0x90, 0xa5, 0x00, 0x26, 0xd9, 0x14, 0x94, 0x7b, 0xc2, 0x4d, 0x21, 0x15, 
-0xa3, 0x43, 0x3d, 0xd0, 0x23, 0x1c, 0x22, 0x3e, 0x24, 0x1f, 0x55, 0x4f, 
-0x2f, 0xf6, 0x6a, 0x0e, 0x52, 0x44, 0xa0, 0x5a, 0xa6, 0xf3, 0xb2, 0x71, 
-0x66, 0x51, 0xfd, 0x8e, 0x6f, 0xa8, 0xf3, 0xe7, 0xa1, 0x7d, 0x3a, 0x1b, 
-0x3f, 0xd6, 0x4c, 0x1a, 0x3b, 0x49, 0x30, 0x9f, 0x9d, 0x06, 0x68, 0x84, 
-0x9d, 0x0b, 0x31, 0x79, 0xed, 0xe9, 0x68, 0xa0, 0x4e, 0xb0, 0x8d, 0xb8, 
-0x6f, 0x40, 0x85, 0x39, 0x09, 0x9b, 0xd3, 0x94, 0x45, 0x88, 0xa2, 0xb7, 
-0x76, 0x48, 0xdc, 0xd7, 0x73, 0xf0, 0x7f, 0x1b, 0x22, 0xd5, 0x49, 0xe9, 
-0xa6, 0x59, 0x99, 0xf8, 0xb3, 0x69, 0x17, 0x04, 0xa3, 0xc0, 0x85, 0x8a, 
-0x3f, 0x3b, 0x6c, 0x20, 0x11, 0xda, 0x91, 0xe4, 0x38, 0x8c, 0xa8, 0x94, 
-0xa8, 0x48, 0x07, 0xc3, 0xa2, 0xfd, 0xd2, 0x91, 0xd8, 0xfe, 0x91, 0xa0, 
-0x28, 0xef, 0x45, 0x5c, 0x93, 0x4f, 0x84, 0x82, 0xda, 0x4d, 0xc1, 0x0b, 
-0x8c, 0x51, 0xee, 0x2a, 0xc1, 0xa8, 0xd1, 0x00, 0x58, 0x56, 0xc6, 0xc5, 
-0x9e, 0x3d, 0x40, 0xce, 0xa7, 0xbb, 0xe0, 0x85, 0x34, 0x40, 0x02, 0x01, 
-0xc6, 0x3c, 0x42, 0x99, 0xa0, 0xac, 0xb8, 0x98, 0xe0, 0xf6, 0x3e, 0xa7, 
-0x0a, 0xad, 0x59, 0xc8, 0xa4, 0x0c, 0x33, 0x6d, 0x0a, 0x31, 0x3d, 0xe1, 
-0xb9, 0xc3, 0xf4, 0x44, 0x41, 0x3e, 0x89, 0x1b, 0xc7, 0x3e, 0x1e, 0xa0, 
-0xd9, 0xa7, 0x4a, 0x5d, 0x1e, 0xaa, 0x7a, 0x85, 0x58, 0x9f, 0x28, 0xc5, 
-0xae, 0xa8, 0x87, 0xaa, 0xda, 0xf6, 0x29, 0xcf, 0xa6, 0x03, 0xd8, 0x3c, 
-0x20, 0x7e, 0x5f, 0xee, 0x88, 0x27, 0xcb, 0xeb, 0xbd, 0xf4, 0x4c, 0x26, 
-0x0f, 0x01, 0x14, 0xe6, 0x71, 0x00, 0x9e, 0xde, 0x5b, 0x55, 0x1e, 0xd0, 
-0x32, 0x9c, 0x96, 0xda, 0x84, 0x3a, 0x78, 0x1e, 0xd9, 0x12, 0x9c, 0x24, 
-0x75, 0x58, 0x10, 0xfb, 0x85, 0x41, 0x91, 0xe0, 0x46, 0xd4, 0xc7, 0x97, 
-0xce, 0x6c, 0x04, 0x8d, 0xab, 0x1e, 0x34, 0x30, 0x8a, 0xf0, 0xf0, 0xdc, 
-0x85, 0xbc, 0x5e, 0x21, 0xd6, 0x27, 0x42, 0x0c, 0x74, 0x3d, 0xdb, 0xd7, 
-0x1a, 0x02, 0x5e, 0xc9, 0xda, 0x7c, 0x02, 0xdb, 0xa7, 0xd4, 0xb9, 0x79, 
-0xdf, 0x7d, 0x58, 0xb8, 0xba, 0x4a, 0xdf, 0x68, 0xd1, 0x56, 0xed, 0xdf, 
-0x4e, 0x8f, 0xee, 0x56, 0x44, 0x4f, 0x40, 0x9e, 0x79, 0x04, 0x43, 0x25, 
-0x4f, 0x62, 0xa5, 0x6c, 0xaa, 0x55, 0x1e, 0x26, 0xf3, 0xec, 0xae, 0x41, 
-0x96, 0x95, 0x78, 0xa8, 0x1e, 0x42, 0xff, 0x07, 0x20, 0x41, 0x72, 0x36, 
-0x8d, 0x36, 0x29, 0xba, 0x45, 0xbd, 0x57, 0x91, 0x9d, 0xaa, 0xd4, 0x36, 
-0x1f, 0x94, 0xc9, 0x84, 0x24, 0xaf, 0x10, 0x3d, 0x9b, 0x76, 0x61, 0x8a, 
-0x68, 0x70, 0x08, 0x04, 0xab, 0xf9, 0xb7, 0x07, 0x8a, 0x59, 0x39, 0xc5, 
-0x55, 0x16, 0xdf, 0x4e, 0xe8, 0x21, 0x3e, 0x13, 0xbd, 0xc8, 0x80, 0x1d, 
-0x6f, 0x80, 0xdc, 0x97, 0x24, 0x0a, 0xcb, 0x66, 0x93, 0x84, 0x42, 0x99, 
-0x27, 0xb6, 0x69, 0x7e, 0x7b, 0x83, 0xa0, 0x65, 0x3f, 0x29, 0xd7, 0x30, 
-0x1a, 0xab, 0x47, 0xa2, 0x95, 0x5e, 0xaf, 0x4d, 0x8d, 0x4c, 0xa1, 0x4e, 
-0x8a, 0xef, 0xa3, 0x4b, 0x20, 0x38, 0xd1, 0x53, 0x02, 0x07, 0x05, 0xfd, 
-0x15, 0x80, 0x04, 0x99, 0x8f, 0xee, 0x7a, 0x05, 0x05, 0x85, 0x34, 0x2b, 
-0x71, 0x90, 0x90, 0x44, 0x05, 0x1a, 0x05, 0x9e, 0x54, 0x3d, 0x1c, 0x10, 
-0xfa, 0xb0, 0xbf, 0x19, 0xfb, 0x77, 0x26, 0xad, 0x93, 0x25, 0x08, 0x8a, 
-0xb8, 0x26, 0xaf, 0x23, 0xe0, 0x5f, 0x57, 0x54, 0x05, 0x95, 0x7b, 0x3d, 
-0x5f, 0x9d, 0x80, 0x03, 0xdb, 0x40, 0xe8, 0xf2, 0xab, 0x65, 0xca, 0xd1, 
-0x9c, 0x1f, 0xb4, 0x79, 0xfd, 0x12, 0x6a, 0x19, 0xda, 0x07, 0x21, 0xf7, 
-0xc5, 0xcb, 0x41, 0x4c, 0x8a, 0x5e, 0x4b, 0x53, 0x1f, 0x8d, 0x84, 0x6c, 
-0x7a, 0x59, 0x21, 0x38, 0x51, 0x26, 0x02, 0x48, 0x50, 0xd8, 0x86, 0xd6, 
-0x2a, 0x84, 0xc7, 0x12, 0x31, 0x0e, 0x24, 0xc2, 0x4f, 0x76, 0x0a, 0x61, 
-0x2f, 0x1e, 0x50, 0xa6, 0x51, 0x83, 0x7a, 0x79, 0x18, 0x49, 0x7c, 0x55, 
-0x9a, 0xed, 0x93, 0xa9, 0x3a, 0x53, 0xa2, 0x65, 0xb1, 0xd2, 0xda, 0xb9, 
-0x56, 0xcf, 0xf4, 0x27, 0x60, 0xd6, 0xce, 0x25, 0x9c, 0x43, 0xbe, 0x9e, 
-0x65, 0x0f, 0x72, 0xca, 0x1d, 0x58, 0x8e, 0x40, 0xdd, 0x4e, 0x4b, 0x08, 
-0x11, 0x9a, 0x4e, 0xb1, 0x05, 0xc8, 0xdd, 0x52, 0x7d, 0x82, 0x2d, 0x20, 
-0x01, 0x52, 0x3f, 0x13, 0x50, 0xc1, 0x63, 0x2d, 0x47, 0xe0, 0x4b, 0x12, 
-0x27, 0x08, 0x73, 0x42, 0xb7, 0x96, 0x96, 0x85, 0x94, 0x3f, 0xa3, 0x65, 
-0x04, 0xd9, 0x76, 0x54, 0xc0, 0x47, 0xc3, 0x56, 0x9d, 0xa8, 0x2a, 0x71, 
-0x47, 0x2f, 0xbf, 0x5b, 0x87, 0x1e, 0xaf, 0x40, 0xa9, 0xc0, 0x3a, 0x8e, 
-0xc9, 0x5c, 0xbd, 0x4e, 0x0c, 0xa0, 0x36, 0xc9, 0xce, 0xef, 0xd3, 0x54, 
-0x1a, 0xc3, 0x4b, 0xfb, 0x2c, 0x9c, 0x06, 0x86, 0x61, 0x09, 0xa1, 0xd5, 
-0xad, 0x99, 0xf6, 0x0b, 0xf0, 0x00, 0x39, 0xf5, 0x50, 0xe9, 0xe9, 0x2e, 
-0xfb, 0xaf, 0x1c, 0x96, 0x11, 0x50, 0xdc, 0xb4, 0x76, 0x59, 0xcf, 0x9a, 
-0x99, 0xbe, 0x91, 0xe2, 0xf0, 0xb4, 0xa0, 0xa9, 0xab, 0xde, 0xe7, 0x05, 
-0x75, 0xd3, 0xf5, 0xf0, 0x27, 0x4b, 0x48, 0x50, 0xfc, 0x86, 0xac, 0x09, 
-0x32, 0xec, 0xa8, 0x05, 0x88, 0x98, 0x4a, 0xe5, 0x7d, 0x1a, 0x00, 0x60, 
-0xee, 0xa3, 0xa0, 0x32, 0xf5, 0x3b, 0xa4, 0xa6, 0x72, 0xb8, 0x72, 0x89, 
-0x90, 0xe4, 0x15, 0x12, 0x37, 0x0e, 0x1f, 0xd7, 0x5f, 0x27, 0x55, 0x9b, 
-0xfc, 0x26, 0x77, 0x9b, 0x17, 0x4a, 0x69, 0x3d, 0xea, 0x80, 0xd8, 0x39, 
-0xdf, 0x50, 0xc6, 0x18, 0x26, 0x63, 0xe7, 0x2a, 0x43, 0xde, 0x82, 0x5e, 
-0x05, 0x10, 0x89, 0xdf, 0x3c, 0x02, 0xb9, 0x72, 0xfa, 0x22, 0x50, 0xf2, 
-0xc7, 0xdc, 0xbe, 0xd1, 0x1d, 0x1f, 0x70, 0xf7, 0x3d, 0x7d, 0xc3, 0x68, 
-0xf6, 0x09, 0x7f, 0x90, 0xfe, 0x7a, 0xc4, 0xc3, 0x52, 0xe2, 0x89, 0xba, 
-0xb1, 0x34, 0xa3, 0x20, 0xac, 0x83, 0x9c, 0x6c, 0x32, 0x28, 0x50, 0xaf, 
-0xc3, 0xc9, 0x8d, 0x6d, 0xc9, 0x70, 0x42, 0x8c, 0x57, 0x48, 0x94, 0x07, 
-0x3b, 0x99, 0x7a, 0xaf, 0x34, 0x0a, 0xb2, 0x43, 0x73, 0x81, 0x9c, 0xa3, 
-0x6a, 0xb0, 0xd2, 0x42, 0xc5, 0xce, 0x38, 0xd8, 0x88, 0x75, 0xb2, 0xb3, 
-0xd3, 0x40, 0x03, 0x51, 0x47, 0xcf, 0x8c, 0xd3, 0x2b, 0x93, 0x13, 0xca, 
-0x61, 0x99, 0x2c, 0xaa, 0x9b, 0x65, 0x33, 0x32, 0x32, 0x48, 0x45, 0x9c, 
-0x3b, 0x77, 0x6e, 0xeb, 0xd6, 0xad, 0x7d, 0x45, 0x02, 0xe7, 0xd7, 0xa9, 
-0x53, 0xa7, 0x47, 0x8f, 0x1e, 0xb3, 0x67, 0xcf, 0xa6, 0x01, 0x29, 0xc5, 
-0xce, 0x10, 0x99, 0xe0, 0x0f, 0x88, 0x4c, 0xe0, 0x81, 0x3e, 0x5a, 0x34, 
-0x13, 0xc2, 0x55, 0xe7, 0xb5, 0x6b, 0x56, 0xf9, 0xc9, 0x33, 0x15, 0x3f, 
-0x72, 0x28, 0xa1, 0x02, 0x48, 0xa0, 0x67, 0xf3, 0x9e, 0xf4, 0x17, 0x8f, 
-0x25, 0xd1, 0x0e, 0xa5, 0xfa, 0x7d, 0x0e, 0xf4, 0x4a, 0x91, 0x4c, 0xee, 
-0x48, 0x03, 0x38, 0x3b, 0x83, 0xa0, 0xe1, 0xe8, 0x7d, 0xe5, 0xb8, 0x90, 
-0x9e, 0xab, 0xf0, 0x01, 0x9c, 0xc4, 0xf8, 0x3a, 0x08, 0x6b, 0xe5, 0x7f, 
-0x3a, 0xa4, 0x3c, 0xb6, 0x6d, 0x00, 0x29, 0xe0, 0x2a, 0x72, 0xc9, 0x50, 
-0xc5, 0x59, 0x6f, 0x38, 0xef, 0x4e, 0x00, 0xd3, 0xdd, 0xf3, 0xd4, 0x78, 
-0x65, 0x83, 0xc7, 0x4c, 0x44, 0xe7, 0x72, 0x28, 0xbb, 0xa8, 0xa8, 0x88, 
-0x62, 0xbb, 0x1e, 0xba, 0x6e, 0x93, 0xa2, 0x8d, 0x98, 0x44, 0x58, 0x00, 
-0x9d, 0x7f, 0x69, 0x46, 0x4c, 0x4b, 0x5f, 0x1a, 0xfb, 0xc2, 0x1f, 0xa8, 
-0x74, 0x26, 0x5d, 0xcf, 0xcf, 0x9c, 0x39, 0x43, 0x75, 0x02, 0x5c, 0xd7, 
-0x84, 0x88, 0x63, 0x01, 0x97, 0xfe, 0x2c, 0x9e, 0xfb, 0x15, 0x56, 0x3c, 
-0xed, 0x96, 0xdf, 0x1d, 0x43, 0x06, 0x15, 0x22, 0x3b, 0x31, 0x5d, 0xac, 
-0x84, 0x0a, 0x15, 0x14, 0x2c, 0xb2, 0xa4, 0x54, 0xb2, 0xa8, 0x51, 0x28, 
-0xd9, 0xda, 0x71, 0x12, 0xef, 0x59, 0xda, 0x79, 0xdd, 0x9c, 0x76, 0x84, 
-0x64, 0x23, 0x9d, 0xab, 0xd0, 0xa6, 0xf9, 0xa3, 0x0a, 0xe8, 0x23, 0x7c, 
-0xd3, 0x65, 0xed, 0x88, 0xa6, 0xc6, 0xe8, 0x89, 0x59, 0xc9, 0x5d, 0xe2, 
-0xb5, 0x4a, 0xf9, 0xd7, 0x7d, 0x64, 0x94, 0x51, 0x22, 0x0c, 0x91, 0x6b, 
-0x19, 0x76, 0xda, 0x80, 0xd2, 0x9e, 0xa8, 0xf8, 0x28, 0x28, 0xcb, 0x69, 
-0x7f, 0xb7, 0x06, 0x3f, 0x24, 0xe2, 0x51, 0xfd, 0x52, 0x6f, 0xab, 0x97, 
-0x9f, 0x9f, 0xaf, 0xf7, 0x08, 0x27, 0xa5, 0x81, 0x48, 0x24, 0x22, 0x7c, 
-0x49, 0x19, 0x3f, 0xbc, 0xaa, 0x3b, 0x91, 0xb3, 0x4c, 0x1b, 0x1b, 0x31, 
-0x71, 0xb8, 0xea, 0x46, 0xb4, 0xea, 0x42, 0x01, 0x50, 0x9d, 0x9d, 0x21, 
-0x6e, 0x7e, 0x05, 0x21, 0x70, 0x0f, 0x02, 0x8a, 0x29, 0x07, 0x28, 0xbd, 
-0xcf, 0x09, 0xe9, 0xa3, 0x4d, 0x30, 0x19, 0x5a, 0x78, 0x1e, 0xa4, 0xd7, 
-0xf5, 0x9a, 0x35, 0x6b, 0xd6, 0xad, 0x5b, 0x87, 0x17, 0x82, 0x6e, 0xbc, 
-0xf0, 0x07, 0xf0, 0x40, 0xf3, 0x2e, 0x3c, 0x74, 0xb4, 0x11, 0xa3, 0x60, 
-0x07, 0xfd, 0xbb, 0x08, 0xfb, 0xf3, 0xd0, 0x6b, 0xb4, 0xfc, 0xe8, 0xb2, 
-0x72, 0x47, 0x0e, 0x25, 0x54, 0x20, 0x3b, 0xd1, 0x01, 0x4d, 0xa7, 0x39, 
-0xfc, 0xc7, 0x58, 0x54, 0x3e, 0x3a, 0x31, 0x9a, 0x44, 0xcd, 0x0d, 0x73, 
-0xdb, 0x43, 0xf4, 0x14, 0xc2, 0xd0, 0x1b, 0xf5, 0xda, 0x27, 0x50, 0xce, 
-0x24, 0x2e, 0x90, 0xa0, 0x40, 0x62, 0x96, 0x48, 0x8a, 0x90, 0x5d, 0x1c, 
-0xb7, 0x83, 0x94, 0xa5, 0xe9, 0xd4, 0x2c, 0x8b, 0x30, 0x24, 0xec, 0xad, 
-0xc0, 0x09, 0x9b, 0x92, 0x4f, 0xc3, 0xfa, 0x7a, 0x32, 0x65, 0x5e, 0x6d, 
-0x76, 0x0a, 0x57, 0x23, 0xb3, 0xe5, 0x93, 0xea, 0x40, 0x60, 0x92, 0x1c, 
-0x08, 0x3f, 0xb8, 0x9f, 0xd1, 0x0a, 0x68, 0x32, 0x8d, 0x7a, 0x80, 0x44, 
-0x04, 0xe9, 0x83, 0x13, 0xfe, 0xe7, 0xa0, 0x47, 0xb5, 0xf4, 0x9f, 0x86, 
-0x2d, 0x10, 0xb8, 0x41, 0xd1, 0x1a, 0xfa, 0xb0, 0xd0, 0xee, 0x99, 0x08, 
-0x0e, 0xf8, 0x30, 0xa5, 0x3a, 0xc0, 0x03, 0x22, 0x13, 0xa5, 0xf6, 0x3d, 
-0x77, 0x79, 0xae, 0x5c, 0xc2, 0x2d, 0xd7, 0xbb, 0x87, 0x0c, 0x2a, 0xcc, 
-0x7d, 0x8c, 0x08, 0x7c, 0x42, 0xb6, 0x31, 0x27, 0x52, 0xfb, 0x4a, 0x85, 
-0x96, 0xe7, 0x93, 0x4b, 0x40, 0x20, 0xf7, 0x8c, 0x21, 0x8d, 0xe5, 0xaf, 
-0xec, 0xe5, 0x96, 0x36, 0xd3, 0xa0, 0xdc, 0x4b, 0x1f, 0x04, 0xa9, 0x86, 
-0x5d, 0x5c, 0xef, 0x33, 0xe4, 0xf5, 0x16, 0x28, 0x15, 0x6c, 0xf6, 0xec, 
-0xf1, 0x04, 0x75, 0xe3, 0x5f, 0xc3, 0x78, 0x0a, 0x71, 0x43, 0xe2, 0xb8, 
-0xdb, 0xe8, 0x6c, 0x2d, 0xad, 0xdd, 0xe1, 0x03, 0x60, 0x80, 0x7e, 0x37, 
-0x1c, 0x38, 0xa7, 0xf9, 0x52, 0x9a, 0x5e, 0xa3, 0x39, 0x10, 0xf7, 0xca, 
-0x55, 0x20, 0x81, 0xe6, 0x8e, 0xd2, 0xdb, 0x56, 0x9a, 0x9a, 0xe2, 0x27, 
-0x95, 0x00, 0xa7, 0x70, 0x0a, 0xfb, 0xb3, 0x89, 0xa5, 0x50, 0x42, 0x05, 
-0xd6, 0x0f, 0x64, 0x5c, 0xdd, 0x38, 0xe3, 0x95, 0x62, 0x2a, 0xeb, 0x04, 
-0x64, 0xfa, 0xfe, 0xfd, 0xfb, 0x53, 0x77, 0x0c, 0x92, 0x65, 0x0e, 0xd4, 
-0x6f, 0xc5, 0xe7, 0x48, 0x68, 0x5d, 0x9b, 0x36, 0x6d, 0xe8, 0xff, 0x4b, 
-0x83, 0x08, 0x0a, 0x57, 0x26, 0x26, 0x5e, 0x8c, 0x1d, 0x54, 0x93, 0xa4, 
-0x3e, 0x3e, 0x52, 0x0d, 0xf2, 0x0f, 0xb4, 0x4b, 0x68, 0xaa, 0x9d, 0xc9, 
-0x33, 0x3e, 0x5a, 0x32, 0xe7, 0x23, 0xf6, 0x40, 0xd9, 0xd2, 0xbe, 0x1a, 
-0x65, 0x80, 0x9e, 0xce, 0x02, 0x0f, 0xd4, 0x03, 0xfc, 0x0c, 0x34, 0xaa, 
-0xa3, 0xe0, 0x83, 0x1c, 0x00, 0x86, 0x2f, 0xa5, 0xe3, 0x35, 0x3d, 0xad, 
-0x31, 0x2e, 0x71, 0x09, 0xf6, 0x25, 0x0a, 0x9c, 0x11, 0xc1, 0xf1, 0xf5, 
-0xd7, 0x5f, 0x0b, 0x1e, 0x82, 0xd5, 0xee, 0xd9, 0x26, 0x21, 0x56, 0xa9, 
-0xd3, 0x42, 0x06, 0x15, 0xbc, 0x27, 0xcc, 0xe4, 0x70, 0x76, 0xbd, 0x99, 
-0xb4, 0x07, 0xba, 0xc1, 0x4c, 0x59, 0xa3, 0x46, 0x0d, 0xac, 0x2b, 0x88, 
-0xe9, 0x50, 0x58, 0x87, 0x0e, 0x1d, 0xba, 0x74, 0xe9, 0xd2, 0xbd, 0x7b, 
-0x77, 0x8c, 0x2d, 0x1c, 0xb8, 0x3b, 0x90, 0xc5, 0xf9, 0x1e, 0x09, 0x1e, 
-0x83, 0x8f, 0xe7, 0x5e, 0xeb, 0x96, 0x77, 0x81, 0x1c, 0xd1, 0x71, 0x09, 
-0x98, 0x63, 0x34, 0xb4, 0x5b, 0x9a, 0x5f, 0xf5, 0xeb, 0xd7, 0x8f, 0xcf, 
-0x0c, 0x4b, 0xc8, 0x10, 0x61, 0x8b, 0x0b, 0x17, 0x2e, 0x44, 0xf1, 0xc5, 
-0x31, 0x4c, 0x0b, 0x6d, 0x3e, 0xc8, 0xc1, 0x67, 0xf5, 0x0d, 0x6a, 0x2e, 
-0x45, 0x8b, 0x11, 0xfa, 0x99, 0x0c, 0xd9, 0x9e, 0xf0, 0x07, 0xb8, 0x04, 
-0xd2, 0x0e, 0x5b, 0xfb, 0x5d, 0x77, 0xdd, 0xc5, 0xff, 0x83, 0x06, 0x0d, 
-0xa2, 0xd3, 0x1c, 0x59, 0x6f, 0x6c, 0x04, 0x39, 0x39, 0x39, 0x3c, 0x0b, 
-0xd0, 0xa2, 0xac, 0x86, 0xb4, 0xe7, 0xe2, 0x71, 0xd0, 0x16, 0x68, 0xf9, 
-0x05, 0x8a, 0xd8, 0xfb, 0xe9, 0xc1, 0x2e, 0x0d, 0xaa, 0x11, 0x7b, 0x88, 
-0xc5, 0xc0, 0x64, 0x04, 0xa1, 0x4b, 0x77, 0x77, 0xfc, 0x6e, 0x78, 0xa3, 
-0x69, 0x3e, 0x2d, 0x07, 0xbf, 0xf2, 0x25, 0x7f, 0x62, 0x8b, 0x81, 0x39, 
-0x70, 0x26, 0x3d, 0x7c, 0x51, 0x1e, 0xc4, 0x31, 0x17, 0x66, 0xd1, 0xaf, 
-0xfe, 0x81, 0xcd, 0xc0, 0x1e, 0x91, 0x30, 0x5d, 0x14, 0xc2, 0x3f, 0x3e, 
-0xf9, 0x37, 0x62, 0x39, 0x5d, 0xc5, 0xd6, 0xc5, 0x6b, 0xe3, 0x5d, 0xb2, 
-0xc3, 0x19, 0xea, 0x66, 0x63, 0x51, 0x81, 0xb2, 0xd9, 0x89, 0x29, 0x78, 
-0x4a, 0x93, 0x1e, 0xf6, 0x4e, 0x88, 0x0f, 0x9b, 0x0c, 0x44, 0x86, 0x1f, 
-0x8a, 0x83, 0x0d, 0x98, 0x83, 0xb0, 0x05, 0x0e, 0x74, 0x50, 0x39, 0xe4, 
-0x57, 0xbe, 0xc7, 0xfc, 0xc2, 0x39, 0x38, 0xad, 0xd0, 0x44, 0x7b, 0xf7, 
-0xee, 0x0d, 0x4e, 0xf4, 0x2a, 0x7a, 0x3a, 0x24, 0x40, 0x02, 0x9b, 0x3d, 
-0x74, 0x4c, 0xa7, 0x50, 0x51, 0x58, 0xb9, 0x56, 0x46, 0x56, 0xc3, 0x62, 
-0x08, 0xe2, 0xc0, 0x9e, 0xb3, 0x7e, 0xfd, 0x7a, 0xd1, 0x62, 0x49, 0x45, 
-0x20, 0x82, 0x48, 0x0e, 0x3e, 0xcb, 0x37, 0x48, 0xf6, 0x50, 0x33, 0xe7, 
-0x20, 0xee, 0x93, 0xea, 0xc9, 0xf9, 0xa2, 0x2e, 0x1f, 0x3a, 0x74, 0x08, 
-0xc5, 0x80, 0xbd, 0x9c, 0xff, 0x11, 0xfa, 0x39, 0x19, 0x85, 0x98, 0xc1, 
-0xb9, 0x91, 0x1c, 0xea, 0x59, 0xf8, 0x52, 0x14, 0x65, 0x89, 0x4d, 0x62, 
-0xd7, 0x57, 0xfd, 0xa4, 0xd9, 0xef, 0xa5, 0xa9, 0x3b, 0xe4, 0x0e, 0x48, 
-0x10, 0x8a, 0x38, 0x80, 0x8a, 0x1c, 0xd2, 0xf2, 0x9c, 0x3f, 0x11, 0xb5, 
-0x81, 0xb0, 0x24, 0x78, 0x10, 0xfb, 0x92, 0xb4, 0x30, 0x2d, 0xa7, 0x37, 
-0x18, 0xba, 0xc3, 0x56, 0x75, 0x54, 0x60, 0x15, 0x41, 0x30, 0x40, 0x1a, 
-0x86, 0xb0, 0xa8, 0xb5, 0x3c, 0x7e, 0xfc, 0x78, 0x9d, 0x40, 0x21, 0x14, 
-0x28, 0x0c, 0xf2, 0x62, 0xc7, 0x85, 0xe6, 0x14, 0x15, 0xa2, 0x59, 0x42, 
-0x70, 0xb4, 0xf7, 0x2c, 0x29, 0x29, 0x41, 0xbc, 0x96, 0x83, 0xcf, 0x7c, 
-0xa3, 0xec, 0x36, 0x9c, 0x8c, 0x1a, 0x0a, 0x9d, 0x41, 0x85, 0x50, 0x1e, 
-0xc1, 0x0e, 0x84, 0x00, 0x21, 0xea, 0xb0, 0x2b, 0x03, 0x42, 0x3c, 0x24, 
-0xb4, 0x8a, 0x03, 0x09, 0xe0, 0x07, 0xa2, 0xe7, 0x16, 0xa2, 0xb3, 0x42, 
-0xb5, 0x32, 0x32, 0x03, 0x92, 0xb1, 0x29, 0x82, 0x3b, 0x07, 0x3d, 0xa7, 
-0xa1, 0x6f, 0x14, 0x59, 0x14, 0x5f, 0x24, 0x78, 0xf2, 0x9b, 0xe5, 0xe0, 
-0x33, 0x85, 0xd3, 0xe5, 0x1b, 0x14, 0x62, 0x08, 0x1a, 0xd2, 0x87, 0x2d, 
-0x70, 0x3e, 0x07, 0x27, 0xe3, 0xa0, 0xa4, 0x01, 0x29, 0xf2, 0x0f, 0x7b, 
-0x3f, 0xb4, 0xce, 0x08, 0x8c, 0xc6, 0xf8, 0xdc, 0x48, 0x0e, 0xf5, 0x2c, 
-0xdc, 0x91, 0x4b, 0x18, 0x84, 0x34, 0x51, 0x4e, 0x86, 0x09, 0xe8, 0x3d, 
-0xdb, 0x85, 0x04, 0x55, 0xa3, 0x5e, 0x77, 0x1f, 0x42, 0x97, 0x52, 0x2b, 
-0x72, 0xe6, 0x55, 0x17, 0x15, 0xaa, 0x97, 0x36, 0xa2, 0x33, 0x01, 0x6a, 
-0x50, 0x0f, 0xa1, 0x50, 0x60, 0x43, 0xf6, 0x5d, 0x68, 0x05, 0x2a, 0xc7, 
-0x0e, 0x03, 0x91, 0x41, 0x28, 0x90, 0x1d, 0x41, 0x0a, 0x68, 0x93, 0xd8, 
-0xdd, 0x39, 0xf3, 0xec, 0xd9, 0xb3, 0x04, 0x3f, 0x23, 0x52, 0x9f, 0x3b, 
-0x77, 0x0e, 0x09, 0x5b, 0x0e, 0x3e, 0xf3, 0x0d, 0xdf, 0x63, 0x7e, 0x81, 
-0xfe, 0x38, 0x19, 0xa2, 0x3c, 0x76, 0xec, 0x18, 0x23, 0x40, 0xdf, 0x04, 
-0xc3, 0x41, 0xf7, 0x20, 0x44, 0x9c, 0x00, 0x80, 0x8d, 0x7d, 0x9d, 0x7b, 
-0x41, 0xa0, 0x10, 0x31, 0x12, 0x0b, 0x27, 0xb3, 0x9d, 0x33, 0xb8, 0x8c, 
-0x8c, 0xec, 0x8e, 0xbc, 0x4e, 0x6a, 0x3f, 0x07, 0xfa, 0x2b, 0xb5, 0xf4, 
-0x44, 0x70, 0xc7, 0xa4, 0x83, 0xd5, 0x1f, 0x24, 0xcb, 0xc1, 0xaf, 0x72, 
-0xf0, 0x19, 0x1d, 0x17, 0x03, 0x28, 0xa7, 0x71, 0x32, 0x64, 0xcd, 0xc1, 
-0x37, 0x14, 0x56, 0x82, 0xbe, 0x09, 0xac, 0xe0, 0x31, 0x39, 0x8d, 0xbf, 
-0x32, 0x4f, 0x76, 0x01, 0x66, 0x08, 0xf5, 0xcb, 0xb3, 0xf0, 0x2b, 0x5a, 
-0x04, 0x8f, 0x40, 0x14, 0x06, 0x5e, 0x67, 0x82, 0xba, 0x11, 0x90, 0x10, 
-0x84, 0x42, 0xbd, 0x97, 0x4a, 0x45, 0x12, 0xba, 0x4f, 0xf7, 0xaa, 0xba, 
-0xa8, 0x90, 0x9c, 0x0a, 0xa4, 0x02, 0x44, 0x61, 0xd4, 0x4a, 0xa8, 0x01, 
-0x12, 0x81, 0x3a, 0xe5, 0x20, 0x30, 0x01, 0x59, 0x1c, 0xd2, 0x81, 0x46, 
-0xa1, 0x4b, 0xb6, 0x5b, 0x5a, 0x51, 0x41, 0x8e, 0x50, 0x0c, 0x89, 0xc5, 
-0xb4, 0x1a, 0x51, 0xf2, 0x34, 0x9a, 0x89, 0x1c, 0x22, 0x70, 0x43, 0x7c, 
-0x8c, 0x86, 0xfb, 0x16, 0x32, 0x65, 0x4c, 0xae, 0x85, 0xe6, 0x40, 0x08, 
-0x9b, 0x34, 0x3b, 0xb1, 0xe2, 0x24, 0x80, 0x01, 0x33, 0x0e, 0x78, 0x03, 
-0x6c, 0xdc, 0x17, 0x8a, 0x14, 0x23, 0x26, 0x83, 0x33, 0xb2, 0x88, 0xe9, 
-0xf0, 0x31, 0x0e, 0x84, 0x75, 0x91, 0xd7, 0xc9, 0x66, 0x46, 0x56, 0x41, 
-0x4a, 0x61, 0xce, 0x96, 0x07, 0x32, 0x0c, 0xde, 0x31, 0xa8, 0x99, 0x93, 
-0xb1, 0x38, 0x73, 0x20, 0x02, 0x21, 0xdb, 0x88, 0x09, 0x88, 0xbf, 0x32, 
-0x02, 0x03, 0x42, 0xf1, 0x04, 0x20, 0x31, 0x43, 0x18, 0x08, 0x9a, 0x31, 
-0x9f, 0x51, 0xa6, 0xf9, 0x92, 0x9b, 0x72, 0x23, 0x51, 0x24, 0x70, 0xb1, 
-0xa1, 0x22, 0x47, 0x85, 0x1f, 0x9f, 0x68, 0xdd, 0xfe, 0xc9, 0x55, 0x1a, 
-0x15, 0xe2, 0xc5, 0x83, 0x08, 0xa0, 0x06, 0xa8, 0x19, 0xa2, 0x47, 0xfe, 
-0x96, 0x03, 0x1a, 0x65, 0xdf, 0x85, 0xb2, 0xe9, 0x16, 0x29, 0x30, 0x10, 
-0xba, 0x51, 0x3a, 0x25, 0xd4, 0x03, 0xfd, 0x41, 0x76, 0x1c, 0xc8, 0xd6, 
-0xf2, 0x81, 0x6f, 0xf8, 0x1e, 0xad, 0x14, 0xe2, 0xe3, 0x64, 0xc6, 0x84, 
-0xec, 0x18, 0x81, 0x3d, 0x9e, 0x9d, 0x9b, 0xbd, 0x1f, 0x84, 0xb0, 0x37, 
-0x0b, 0x43, 0x00, 0x09, 0x6c, 0xea, 0xdc, 0x85, 0xfb, 0x42, 0xa3, 0x9c, 
-0x0c, 0xb4, 0x84, 0x2e, 0x19, 0x0a, 0x00, 0x40, 0xe2, 0x1c, 0x4c, 0x8f, 
-0x03, 0x18, 0x40, 0xdc, 0xc8, 0xf7, 0xec, 0xdf, 0x1c, 0x90, 0xac, 0xf9, 
-0x40, 0x9a, 0xe7, 0x71, 0x20, 0x68, 0x85, 0x19, 0x3e, 0xf3, 0x8d, 0x04, 
-0x1a, 0xf1, 0x81, 0xef, 0x19, 0x10, 0x6c, 0xc8, 0x0c, 0x05, 0x6f, 0x7c, 
-0x16, 0xc8, 0xe9, 0x10, 0x0a, 0xa7, 0xaa, 0x33, 0xf6, 0x89, 0xb5, 0xc2, 
-0xce, 0xac, 0xba, 0xa8, 0x10, 0x29, 0x59, 0x2c, 0x51, 0x90, 0x0b, 0x94, 
-0x0d, 0x7d, 0x40, 0xca, 0x72, 0xc8, 0x56, 0xcd, 0x37, 0xec, 0xb8, 0xd0, 
-0xba, 0x52, 0x28, 0x39, 0x13, 0x52, 0x43, 0xa1, 0x84, 0xc8, 0xb8, 0x90, 
-0x43, 0xc8, 0x94, 0x43, 0x7e, 0xe5, 0x7b, 0xfe, 0x0a, 0x05, 0xb3, 0x37, 
-0x73, 0x15, 0xd7, 0x32, 0x02, 0xc4, 0x07, 0xc5, 0xc3, 0x49, 0xd8, 0x95, 
-0x01, 0x18, 0x07, 0x18, 0x80, 0x27, 0xf0, 0xa5, 0xdc, 0x45, 0xf1, 0x01, 
-0xa1, 0x63, 0xc6, 0x51, 0x44, 0x8f, 0xda, 0xca, 0xa1, 0x2c, 0x9b, 0x9e, 
-0xdf, 0x9c, 0x38, 0xec, 0xe1, 0x81, 0xea, 0x50, 0xfe, 0x01, 0xa9, 0x14, 
-0xca, 0xb0, 0x6a, 0x86, 0x4c, 0x52, 0x9e, 0x05, 0xb0, 0xc9, 0x4d, 0x45, 
-0x45, 0x8e, 0x4c, 0x97, 0x42, 0x85, 0x41, 0x82, 0x1b, 0x55, 0x69, 0x54, 
-0x08, 0x30, 0xc4, 0x9d, 0x07, 0x65, 0xc8, 0x56, 0x2a, 0x7b, 0x33, 0x34, 
-0xcd, 0x21, 0x3b, 0xb4, 0x60, 0x40, 0x27, 0x56, 0x21, 0x53, 0xa1, 0x54, 
-0xfd, 0x90, 0x2f, 0xf9, 0x2b, 0x03, 0xea, 0x08, 0x61, 0x1c, 0x31, 0xdd, 
-0x28, 0x96, 0x22, 0xdc, 0x40, 0x6e, 0xa4, 0x6e, 0x21, 0x60, 0x30, 0x0c, 
-0x0b, 0x8d, 0x0a, 0x99, 0xda, 0x94, 0x67, 0xcc, 0x7a, 0xb0, 0x52, 0x94, 
-0x05, 0x30, 0x6a, 0x86, 0x02, 0x3c, 0xfd, 0x59, 0x7c, 0xba, 0x51, 0x45, 
-0x92, 0x51, 0x98, 0xdd, 0xab, 0xaa, 0xa3, 0xc2, 0xb0, 0xdc, 0x06, 0x92, 
-0x0a, 0xe2, 0xcb, 0xf0, 0x60, 0xbd, 0x09, 0xe2, 0x5d, 0xa2, 0x43, 0x85, 
-0xc4, 0x0a, 0x84, 0x18, 0x2a, 0x42, 0x62, 0x4d, 0xa3, 0x93, 0x0c, 0xf5, 
-0x15, 0x88, 0xa2, 0x22, 0xd4, 0xdf, 0x60, 0x74, 0xfe, 0xc1, 0x5f, 0x81, 
-0x28, 0x2a, 0x82, 0xbf, 0xa6, 0xd1, 0x11, 0x43, 0x7d, 0x05, 0xa2, 0xa8, 
-0x08, 0xf5, 0x37, 0x18, 0x9d, 0x7f, 0xf0, 0x57, 0x20, 0x8a, 0x8a, 0xe0, 
-0xaf, 0x69, 0x74, 0xc4, 0x50, 0x5f, 0x81, 0x8b, 0xa8, 0xc8, 0xcc, 0xcc, 
-0x24, 0xae, 0x81, 0x6e, 0x29, 0x78, 0x79, 0xa3, 0x47, 0x74, 0x05, 0x22, 
-0x79, 0x05, 0x40, 0x01, 0x58, 0x00, 0x11, 0x0e, 0xd2, 0x03, 0x88, 0x5e, 
-0x4e, 0x4e, 0x4e, 0x26, 0x78, 0x36, 0x7a, 0x44, 0x57, 0x20, 0x92, 0x57, 
-0x00, 0x14, 0x80, 0x05, 0x10, 0xf1, 0xff, 0x0a, 0xfb, 0x09, 0x6c, 0x5e, 
-0xaf, 0x2e, 0x17, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
-0x42, 0x60, 0x82, 
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+const unsigned char dolphin_logo_png[] = {
+0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x6e, 0x08, 0x06, 0x00, 0x00, 0x00, 0x62, 0x1d, 0x5c,
+0x6d, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
+0x65, 0x00, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x61,
+0x64, 0x79, 0x71, 0xc9, 0x65, 0x3c, 0x00, 0x00, 0x12, 0xff, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda,
+0xec, 0x9d, 0xfd, 0x57, 0x14, 0x57, 0x9a, 0xc7, 0x9f, 0x8a, 0xa0, 0x28, 0xa2, 0xed, 0x0b, 0x6b,
+0xc4, 0x28, 0xad, 0x11, 0x93, 0x30, 0x2a, 0x4d, 0x82, 0x99, 0xc4, 0xc4, 0x00, 0xd9, 0xec, 0x99,
+0x33, 0xe6, 0x45, 0x9c, 0x68, 0x72, 0x66, 0x66, 0x27, 0xc2, 0xce, 0xd9, 0xec, 0xcb, 0xfc, 0x10,
+0xf9, 0x0b, 0x94, 0x9f, 0xe6, 0xc7, 0x98, 0x3f, 0x60, 0x4e, 0xf0, 0xec, 0xd9, 0xdd, 0x61, 0xcc,
+0x8c, 0x6d, 0x62, 0x4c, 0x5c, 0x31, 0x74, 0x6b, 0xc4, 0x64, 0x21, 0xb1, 0xdb, 0x68, 0xfb, 0xd2,
+0x1a, 0xaa, 0x51, 0x40, 0x45, 0xa5, 0x11, 0xc1, 0x17, 0x92, 0xd4, 0xdc, 0xe7, 0xf6, 0xad, 0xa6,
+0xba, 0xe9, 0x6e, 0xaa, 0xe8, 0x7a, 0xed, 0xbe, 0xdf, 0x73, 0xca, 0x7e, 0x81, 0x23, 0xf7, 0xd6,
+0xbd, 0x9f, 0x7a, 0x5e, 0xee, 0x9b, 0x00, 0x5c, 0x5c, 0xa8, 0xb7, 0xf7, 0xb9, 0xc8, 0xbf, 0x1e,
+0x72, 0xd5, 0x91, 0xab, 0x9c, 0x5c, 0x6e, 0xc5, 0xa5, 0x56, 0x51, 0x72, 0x05, 0xd8, 0x7b, 0xbf,
+0xe2, 0x73, 0x00, 0xda, 0xb6, 0x47, 0x9d, 0x78, 0x5b, 0x04, 0xde, 0x33, 0xf2, 0x1a, 0x0a, 0x84,
+0x61, 0x0b, 0x83, 0xc2, 0x63, 0xf0, 0x5f, 0x43, 0x50, 0x7c, 0xe4, 0xfa, 0x80, 0xc0, 0x22, 0x3a,
+0xe5, 0x16, 0x15, 0xe4, 0x69, 0xc7, 0xc0, 0xce, 0xe0, 0x62, 0x97, 0xb2, 0x63, 0x54, 0xb1, 0xef,
+0xd4, 0x08, 0x1b, 0x39, 0x92, 0xd4, 0x01, 0xa2, 0xf4, 0x6a, 0xdb, 0x1e, 0xb0, 0x39, 0x14, 0x3b,
+0xc8, 0xd5, 0xa0, 0xa1, 0xae, 0x7a, 0xc8, 0xc3, 0xae, 0x03, 0xec, 0xde, 0x71, 0x40, 0x2c, 0xee,
+0x08, 0xb2, 0x7b, 0xa0, 0x74, 0x19, 0x3c, 0xa6, 0x74, 0x8a, 0xb7, 0xf7, 0x29, 0xdd, 0x0d, 0x19,
+0xa4, 0xd8, 0x7b, 0x2b, 0xe0, 0x89, 0xb9, 0x4f, 0x8d, 0xe4, 0x7a, 0x4f, 0xa3, 0xcb, 0x94, 0xf7,
+0x2a, 0xc8, 0x11, 0x18, 0x5c, 0x0a, 0x37, 0xa1, 0xd6, 0x34, 0x10, 0x32, 0x4b, 0x2e, 0x53, 0x2a,
+0x78, 0x02, 0xec, 0x0a, 0x1a, 0xea, 0xa3, 0xc7, 0x1e, 0x12, 0xbb, 0x18, 0x1c, 0xaa, 0x35, 0xdb,
+0x55, 0x0c, 0xb3, 0xe7, 0xcf, 0x81, 0x92, 0x47, 0x5d, 0x50, 0x50, 0x54, 0x98, 0xf0, 0xb3, 0x92,
+0x25, 0x2e, 0x28, 0x64, 0xdf, 0xdd, 0x8e, 0x0c, 0x26, 0xfc, 0xec, 0x87, 0xfb, 0xe3, 0x30, 0x72,
+0x2d, 0x9a, 0xf2, 0x67, 0x4e, 0x95, 0xe0, 0x70, 0x20, 0x6a, 0x4d, 0xf2, 0x9f, 0xcd, 0x90, 0xa8,
+0x80, 0xc6, 0x47, 0x80, 0xf1, 0x99, 0x01, 0x06, 0x02, 0xb0, 0xb0, 0xbc, 0x14, 0x16, 0x90, 0x0b,
+0x3b, 0x3f, 0xbe, 0xd7, 0x4b, 0xe3, 0x08, 0xcc, 0xf5, 0x28, 0xbb, 0x86, 0x61, 0x88, 0x40, 0x73,
+0x2f, 0x3a, 0x5a, 0x9f, 0x55, 0xdd, 0x38, 0x20, 0x19, 0x1b, 0xbd, 0x41, 0x11, 0x54, 0xea, 0xae,
+0x05, 0x1a, 0x3a, 0xc7, 0x0f, 0xac, 0xf1, 0x4d, 0x0a, 0x6c, 0xfd, 0xcc, 0xca, 0x88, 0x7a, 0x80,
+0x81, 0x16, 0xa2, 0x74, 0x4d, 0x19, 0x94, 0x55, 0x95, 0x53, 0x28, 0x4c, 0x52, 0x3c, 0x48, 0x3f,
+0xb2, 0x4e, 0x10, 0x39, 0x20, 0xfa, 0x42, 0xb1, 0x23, 0x1b, 0x2b, 0x81, 0x9d, 0x40, 0x7e, 0x52,
+0xa2, 0xe6, 0xa2, 0x9b, 0x30, 0xab, 0x10, 0x8a, 0x98, 0x2b, 0xa1, 0x87, 0x10, 0x16, 0x84, 0x66,
+0xfc, 0xc1, 0x38, 0xdc, 0xbd, 0x3e, 0xe1, 0x66, 0xe8, 0x0c, 0x92, 0xa8, 0x00, 0xc6, 0x1b, 0x77,
+0xcb, 0x62, 0x16, 0x75, 0x27, 0x83, 0x23, 0xad, 0xa5, 0xf8, 0x87, 0x35, 0xcb, 0xa0, 0x6c, 0x7d,
+0xb9, 0xa6, 0x07, 0x41, 0x96, 0xf2, 0xb2, 0xa0, 0xdc, 0x77, 0x64, 0xbd, 0x73, 0xa0, 0xb0, 0x3f,
+0x20, 0x6f, 0xef, 0x6b, 0x64, 0x96, 0xa2, 0x41, 0x53, 0x40, 0x45, 0x3a, 0x01, 0xc2, 0xb0, 0x60,
+0x45, 0x29, 0xe9, 0xf8, 0xc5, 0x04, 0x84, 0xf9, 0xd4, 0x8f, 0xb6, 0x83, 0xd0, 0x37, 0xbf, 0x3f,
+0x3c, 0x16, 0x77, 0x39, 0xee, 0x12, 0x97, 0xe3, 0xde, 0xf0, 0xa8, 0x1e, 0x4f, 0xe5, 0x00, 0x64,
+0xc8, 0x48, 0xe1, 0x7d, 0x58, 0xfe, 0xec, 0x6a, 0x02, 0x86, 0x7b, 0x52, 0x3c, 0x61, 0x94, 0xab,
+0x28, 0x60, 0x2a, 0x17, 0xa0, 0x95, 0x40, 0xe1, 0xc8, 0xb1, 0x0f, 0x7b, 0x02, 0x32, 0xf1, 0x14,
+0xdc, 0xa1, 0x36, 0xd3, 0x82, 0x8d, 0x8f, 0x4f, 0x43, 0x04, 0x82, 0xc2, 0xb0, 0xc4, 0xe5, 0xb8,
+0x06, 0x18, 0xea, 0x1d, 0x8c, 0x03, 0x23, 0xc3, 0xa3, 0x87, 0xf0, 0xde, 0xac, 0xda, 0x54, 0x09,
+0x4b, 0xd7, 0x97, 0x9b, 0x55, 0x15, 0xb4, 0x6c, 0x2d, 0xed, 0x55, 0x82, 0x0f, 0x72, 0x48, 0x82,
+0x0d, 0xc0, 0xd0, 0x94, 0x69, 0x41, 0x18, 0xd0, 0x7f, 0x8e, 0x41, 0xe1, 0x82, 0x5c, 0x14, 0x42,
+0x13, 0x65, 0xe0, 0xe0, 0x7b, 0x74, 0xd3, 0xd4, 0xaa, 0x48, 0x06, 0x63, 0x9d, 0x69, 0x60, 0x04,
+0x04, 0x01, 0x9a, 0x73, 0x0d, 0x0c, 0xeb, 0x01, 0xd1, 0x00, 0x06, 0x02, 0x51, 0x5a, 0xb1, 0x8c,
+0xbe, 0x9a, 0xe4, 0x26, 0xd8, 0x4a, 0xe8, 0x9a, 0x61, 0x06, 0x08, 0x61, 0xc1, 0xeb, 0x7e, 0x0a,
+0xd7, 0x8c, 0x82, 0xf1, 0xa2, 0xa9, 0x16, 0x03, 0x4d, 0x5d, 0xcb, 0x51, 0x8f, 0xb0, 0x27, 0x97,
+0xef, 0xbd, 0x60, 0x01, 0x18, 0x2e, 0x06, 0xc6, 0xce, 0x4c, 0xbf, 0x86, 0xd6, 0x61, 0x79, 0x4d,
+0x45, 0x0c, 0x8a, 0x59, 0xf9, 0x07, 0xc5, 0x94, 0xc0, 0x10, 0x50, 0x6e, 0x86, 0xfb, 0x68, 0xfa,
+0x14, 0xad, 0xc5, 0xf2, 0x0d, 0x15, 0x66, 0xde, 0xa7, 0x28, 0xe9, 0x38, 0xf5, 0x47, 0xab, 0x85,
+0x40, 0xae, 0xdf, 0x6b, 0xc1, 0x64, 0x38, 0xe4, 0x4c, 0x4b, 0x4a, 0xdf, 0x08, 0x1b, 0x78, 0xe9,
+0x3a, 0x37, 0x6d, 0xec, 0x22, 0x9d, 0xb2, 0x4b, 0x5c, 0x86, 0x58, 0x8e, 0x95, 0x5f, 0x54, 0x3b,
+0x3f, 0x00, 0x57, 0xa3, 0x02, 0x93, 0xc0, 0xc0, 0x14, 0xed, 0xfb, 0x90, 0x66, 0xfc, 0x02, 0xdd,
+0x83, 0x95, 0x2f, 0x54, 0x26, 0x5a, 0x0b, 0x89, 0xf7, 0x44, 0x9b, 0xaa, 0xfe, 0x8b, 0xa7, 0xf3,
+0x03, 0x0e, 0x73, 0x00, 0x89, 0x59, 0x8d, 0xf7, 0x33, 0x81, 0xf1, 0xe8, 0xda, 0x09, 0xbf, 0x59,
+0xe2, 0x60, 0xd8, 0x59, 0x7b, 0x3a, 0x9e, 0xc9, 0x7d, 0xb7, 0xca, 0x1c, 0x40, 0x62, 0xb1, 0xc6,
+0xfe, 0x54, 0x56, 0x03, 0xc1, 0x70, 0x6f, 0x34, 0x35, 0xd3, 0xc2, 0xa5, 0x83, 0xc4, 0x13, 0xa1,
+0x03, 0xf9, 0x56, 0xe7, 0x02, 0x83, 0xe0, 0xf0, 0x30, 0x38, 0xdc, 0xc9, 0x31, 0xc6, 0x63, 0x24,
+0xf0, 0x46, 0x38, 0xb8, 0xb5, 0x70, 0x96, 0x7e, 0x78, 0x30, 0x0e, 0x3d, 0x27, 0x42, 0x38, 0x78,
+0xeb, 0xcb, 0xa7, 0x7a, 0x0b, 0x06, 0xc0, 0xd1, 0xc8, 0x5c, 0xaa, 0x84, 0x40, 0x7c, 0xf1, 0xea,
+0x32, 0x58, 0xfd, 0xb2, 0x07, 0x8a, 0xe6, 0xf1, 0xe0, 0xdb, 0x91, 0x91, 0xf9, 0x95, 0x41, 0x08,
+0xb4, 0xf9, 0x69, 0x80, 0xee, 0xd4, 0xd5, 0x81, 0xd6, 0x5b, 0x90, 0x18, 0x1c, 0x1f, 0x26, 0x5b,
+0x8d, 0x27, 0x7e, 0xb9, 0x81, 0x02, 0xc2, 0x63, 0x6f, 0xe7, 0x6a, 0x46, 0x2c, 0x79, 0xe2, 0x62,
+0xed, 0xbb, 0x35, 0x6f, 0xea, 0xad, 0x23, 0x1c, 0x78, 0xe3, 0x76, 0x2b, 0xbf, 0x72, 0x2d, 0x2f,
+0x85, 0x75, 0x6f, 0x6e, 0x82, 0x79, 0x4b, 0x17, 0xf2, 0x1e, 0xe6, 0x70, 0xcd, 0x2c, 0x2e, 0x82,
+0xbe, 0x6f, 0xc3, 0xf0, 0xd3, 0x8f, 0x3f, 0x3d, 0x09, 0x6b, 0xdf, 0x8a, 0xc0, 0xd9, 0x7d, 0x79,
+0x11, 0xac, 0x0b, 0x3a, 0xc2, 0xd1, 0xa8, 0xfc, 0xaa, 0xfc, 0xf9, 0xca, 0x78, 0xac, 0x91, 0x4b,
+0x71, 0x2a, 0x24, 0x2e, 0x17, 0x75, 0x43, 0x1e, 0xad, 0xd0, 0x3b, 0xff, 0x79, 0x37, 0x5c, 0x3f,
+0x4b, 0xab, 0x8f, 0x2e, 0x56, 0xbd, 0xad, 0x97, 0x16, 0xdb, 0x06, 0x90, 0xa4, 0x34, 0x2e, 0x75,
+0xa9, 0x7e, 0xb1, 0x01, 0x16, 0x31, 0x97, 0xca, 0x01, 0xf2, 0xb1, 0x06, 0x0f, 0x42, 0xe2, 0xae,
+0x1c, 0x81, 0x63, 0x3f, 0xd7, 0x9e, 0xef, 0x7f, 0xe9, 0x6b, 0x49, 0xb9, 0xce, 0x5d, 0xf9, 0xbe,
+0x4a, 0xf1, 0xd9, 0x91, 0x93, 0xc8, 0x86, 0xaf, 0x0e, 0x42, 0xf0, 0x2f, 0xfe, 0x78, 0x58, 0x92,
+0x0f, 0x90, 0x08, 0x59, 0xc2, 0x91, 0x10, 0x73, 0x20, 0x1c, 0xeb, 0xb7, 0xd7, 0xc2, 0xdc, 0x52,
+0x97, 0x9d, 0x61, 0xf0, 0x33, 0x08, 0x02, 0xc7, 0x9e, 0xb3, 0x6e, 0x8d, 0xc2, 0x4b, 0x5f, 0x49,
+0x75, 0x0a, 0x60, 0xaa, 0xd8, 0xab, 0xed, 0xad, 0xd1, 0xd9, 0x8f, 0x3b, 0xe1, 0xd6, 0xe5, 0x7e,
+0x25, 0x24, 0x5b, 0x9d, 0xb4, 0x42, 0xd0, 0x3c, 0x40, 0x62, 0xa9, 0xdc, 0x53, 0xf2, 0xc7, 0x62,
+0x02, 0x45, 0xe5, 0x1b, 0x1b, 0xed, 0x96, 0xa5, 0x42, 0x10, 0xe8, 0x82, 0x9d, 0xe3, 0xcf, 0x39,
+0x63, 0xb6, 0xe9, 0xa6, 0x18, 0x38, 0x32, 0x34, 0x75, 0x76, 0x83, 0x06, 0xd3, 0xbd, 0x5d, 0x7f,
+0x3a, 0x44, 0x5f, 0x15, 0x6a, 0x26, 0x90, 0xec, 0xe1, 0x80, 0x4c, 0xc0, 0xe1, 0x62, 0x70, 0xb8,
+0x65, 0x38, 0xd6, 0x6f, 0xab, 0xb5, 0xcb, 0xa4, 0x42, 0x84, 0x62, 0x2f, 0xb9, 0xbc, 0xc7, 0x9f,
+0x77, 0xe6, 0x2a, 0xb6, 0x04, 0x60, 0x4e, 0x4a, 0xb6, 0x5b, 0x7f, 0x8f, 0xae, 0xd6, 0xe9, 0x8f,
+0xfc, 0xc9, 0x5f, 0xe3, 0xea, 0xc1, 0xa6, 0x5c, 0x4b, 0x01, 0x4f, 0x17, 0x10, 0x8c, 0x39, 0x76,
+0xca, 0x70, 0xac, 0x7b, 0xd3, 0x16, 0x70, 0xb4, 0x92, 0xda, 0x7c, 0xf0, 0xe5, 0xf3, 0xb9, 0x3d,
+0x15, 0xe2, 0x45, 0x19, 0x18, 0xc9, 0x5a, 0x60, 0x6e, 0x84, 0x22, 0x70, 0xf1, 0x48, 0x57, 0xaa,
+0x87, 0x53, 0x53, 0x2e, 0xc5, 0x25, 0xc2, 0x34, 0xe0, 0xc0, 0x46, 0xe9, 0x90, 0x63, 0x0e, 0x84,
+0xa3, 0xd8, 0xba, 0x98, 0x03, 0x9f, 0x56, 0xb8, 0xbc, 0x73, 0xcf, 0x97, 0x1b, 0xf3, 0x67, 0x02,
+0x5d, 0x02, 0x30, 0x9d, 0x92, 0x9b, 0x81, 0xa2, 0x79, 0x89, 0xb2, 0x41, 0x90, 0x44, 0x19, 0x24,
+0xde, 0x7c, 0x05, 0xa4, 0x47, 0x76, 0xad, 0x3c, 0xbf, 0x7e, 0xc5, 0x4a, 0x38, 0x5a, 0x10, 0x8c,
+0x13, 0x2f, 0xe4, 0x27, 0x18, 0xe9, 0xf4, 0xc2, 0x09, 0xa9, 0x41, 0x01, 0x8b, 0xe1, 0x8d, 0x33,
+0xdc, 0x37, 0x08, 0xe7, 0x0f, 0x76, 0x26, 0xc7, 0x24, 0xc0, 0x20, 0x69, 0xcd, 0x2f, 0x40, 0x14,
+0x59, 0xab, 0x95, 0x9b, 0xaa, 0xa0, 0xcc, 0x53, 0x61, 0x45, 0x99, 0xbd, 0xa4, 0xd4, 0xcd, 0x04,
+0x0c, 0x91, 0xe3, 0xa0, 0x02, 0x16, 0xc9, 0x78, 0x58, 0x10, 0x8e, 0x33, 0x7f, 0xf3, 0xc3, 0xe8,
+0xcd, 0xe8, 0x64, 0xb7, 0xb7, 0x6d, 0x7b, 0x53, 0x3e, 0x01, 0x42, 0xad, 0xc7, 0xc2, 0x55, 0x65,
+0xf0, 0xd4, 0xab, 0x1b, 0xad, 0x70, 0xa7, 0x9a, 0x4e, 0xbc, 0x28, 0x78, 0x79, 0xd7, 0xd7, 0x08,
+0xca, 0x97, 0x34, 0x6e, 0x91, 0xb7, 0x4f, 0xaa, 0x33, 0xea, 0xef, 0x84, 0xdb, 0xbb, 0xe1, 0xc6,
+0x39, 0x31, 0xa7, 0x82, 0x77, 0x41, 0x03, 0x1c, 0x78, 0x83, 0xf7, 0x63, 0xdc, 0xf1, 0xf4, 0x3b,
+0x9b, 0xcd, 0x0e, 0xca, 0xe9, 0x4d, 0xee, 0xdc, 0xc4, 0xdd, 0xa9, 0x6c, 0xb5, 0xf1, 0x38, 0x8d,
+0x59, 0xd0, 0x13, 0x78, 0xcf, 0x08, 0xab, 0x72, 0xe3, 0x7c, 0x04, 0x2e, 0xb5, 0xa7, 0x0c, 0xde,
+0xeb, 0x9d, 0x08, 0x89, 0x16, 0x40, 0x70, 0xfa, 0x7a, 0x83, 0xfb, 0x45, 0xd3, 0x5d, 0xab, 0x16,
+0x02, 0xc6, 0x6e, 0xde, 0xb5, 0x0d, 0x81, 0xa5, 0xd1, 0x08, 0xab, 0x32, 0x3a, 0x18, 0x85, 0xb3,
+0x5e, 0x7f, 0x72, 0x5c, 0x82, 0x90, 0x6c, 0x75, 0xd2, 0xd1, 0x07, 0xea, 0x01, 0x89, 0x8d, 0x7b,
+0x0c, 0xcd, 0x2a, 0x29, 0x26, 0xd6, 0xe3, 0x97, 0x66, 0x96, 0xaf, 0xe9, 0xe4, 0x4b, 0x42, 0x2b,
+0xef, 0xca, 0xc6, 0xea, 0xf9, 0x63, 0x74, 0x70, 0xf2, 0x3d, 0xd0, 0x31, 0x0b, 0x86, 0xf1, 0xc8,
+0xe5, 0xa3, 0xdd, 0xc9, 0x71, 0x89, 0xe3, 0xa6, 0xa7, 0x3c, 0xa2, 0xf2, 0xf7, 0xe8, 0x8d, 0x5b,
+0xbe, 0xa1, 0x32, 0x36, 0x5f, 0xdd, 0x8c, 0x8b, 0xc3, 0x61, 0x9a, 0xc8, 0x7d, 0xf6, 0x91, 0x0b,
+0xa7, 0xb0, 0xaf, 0x24, 0xf7, 0xbe, 0x55, 0x8f, 0xf6, 0x2b, 0x5e, 0xe4, 0x82, 0xca, 0x86, 0x5a,
+0x28, 0x5e, 0x9c, 0xe0, 0xc5, 0xe1, 0x87, 0x0e, 0x36, 0x0b, 0x23, 0xa7, 0x00, 0xa9, 0x45, 0xeb,
+0xb1, 0xf8, 0xc9, 0x72, 0xb3, 0xf8, 0xe0, 0x70, 0x58, 0x03, 0x8a, 0x78, 0xb2, 0x56, 0x68, 0x22,
+0xf7, 0x7f, 0x25, 0xb9, 0x5a, 0xb3, 0x6d, 0xc7, 0x19, 0x33, 0x0b, 0x61, 0xdd, 0x5b, 0xaf, 0x40,
+0xe9, 0x93, 0x6e, 0xc7, 0x42, 0xa2, 0x16, 0x90, 0xba, 0x52, 0x02, 0x87, 0x49, 0x74, 0x34, 0x7f,
+0x55, 0xcb, 0xe1, 0xb0, 0x52, 0xe4, 0xfe, 0x8b, 0xe4, 0x6a, 0x22, 0x6d, 0x51, 0x4d, 0x2e, 0x5f,
+0xb6, 0x6d, 0xfa, 0x78, 0x7d, 0x0d, 0x94, 0x3e, 0x31, 0x09, 0x92, 0x53, 0x6c, 0xd8, 0xc0, 0xe1,
+0x31, 0x08, 0x8b, 0x3f, 0x3c, 0xbf, 0xdd, 0x0c, 0xb3, 0x8c, 0x9f, 0x88, 0xe8, 0xfd, 0xba, 0x4e,
+0xd8, 0x9a, 0xa1, 0x1c, 0xca, 0xa7, 0x4e, 0xf2, 0xb4, 0xf1, 0xf9, 0xa0, 0xcf, 0xb4, 0x0b, 0xf4,
+0x8f, 0x87, 0x93, 0xfc, 0xe6, 0x40, 0xfc, 0x7d, 0x1e, 0xac, 0x81, 0x48, 0xd6, 0xcf, 0x7d, 0x34,
+0x46, 0xc1, 0xf1, 0x2f, 0x77, 0x36, 0xff, 0xcf, 0xb5, 0xd3, 0x61, 0x88, 0x9c, 0x08, 0x4e, 0x8a,
+0x33, 0xed, 0x3c, 0xa0, 0xa8, 0x06, 0x90, 0xba, 0x39, 0x8b, 0x5d, 0x1d, 0xeb, 0xb6, 0xbd, 0x62,
+0x68, 0x41, 0x7e, 0x7c, 0x38, 0x0e, 0x67, 0xf7, 0x77, 0x34, 0xdd, 0x1b, 0xba, 0xe3, 0x4e, 0xea,
+0xec, 0x76, 0x5d, 0x3f, 0xe1, 0x63, 0xaf, 0x7e, 0xc5, 0x67, 0xd1, 0x69, 0x59, 0x1a, 0x4d, 0xa0,
+0x74, 0x48, 0xbb, 0x21, 0xcb, 0xf4, 0xf0, 0xe0, 0x85, 0x08, 0x7c, 0xdf, 0xd1, 0xe5, 0x18, 0x48,
+0xd4, 0x00, 0xb2, 0x7b, 0x59, 0x4d, 0xe5, 0xae, 0xc7, 0x9e, 0x31, 0x76, 0x75, 0xe0, 0xd5, 0x6f,
+0x42, 0xd0, 0xd7, 0x1d, 0xca, 0x95, 0xbe, 0xe4, 0x63, 0x56, 0x27, 0x02, 0xb1, 0xd3, 0xa2, 0x02,
+0x39, 0x04, 0x89, 0x9b, 0xb8, 0x4d, 0xef, 0x67, 0x93, 0xf1, 0xa2, 0x90, 0xf8, 0x9c, 0x01, 0x89,
+0x1a, 0x40, 0xf6, 0x3f, 0xf5, 0x7a, 0x6d, 0x43, 0x49, 0x99, 0x71, 0x87, 0xae, 0xfc, 0xf8, 0x60,
+0x1c, 0x02, 0xff, 0x73, 0x88, 0x5a, 0x91, 0x1c, 0x96, 0x8f, 0x59, 0x1b, 0x5f, 0x2e, 0x2c, 0x30,
+0x7a, 0xf6, 0x0b, 0x3a, 0xe7, 0xeb, 0xc3, 0xe9, 0x5a, 0x93, 0x91, 0xfe, 0x41, 0xb8, 0x78, 0xb8,
+0x33, 0xb9, 0xcd, 0x6d, 0x77, 0x3c, 0x9b, 0x1a, 0x40, 0x7a, 0x9e, 0x7d, 0x77, 0x9b, 0xdb, 0xc8,
+0x42, 0x5c, 0xfb, 0x2e, 0x0c, 0xbd, 0x27, 0x83, 0x59, 0xfd, 0x1f, 0x98, 0x65, 0x9b, 0x59, 0x92,
+0x7d, 0x8c, 0xf4, 0x70, 0x64, 0x0c, 0x1e, 0x8c, 0x8c, 0x9a, 0x05, 0xcc, 0x01, 0x27, 0x5b, 0x98,
+0x67, 0x8f, 0x4a, 0xf2, 0x2e, 0x27, 0xd3, 0xb2, 0x26, 0x63, 0xb7, 0xa2, 0x70, 0xee, 0x13, 0xbf,
+0x12, 0x12, 0xdb, 0x8d, 0x93, 0x08, 0x53, 0xc0, 0xe1, 0x9e, 0xb3, 0xc8, 0xd5, 0xf3, 0xb3, 0x5f,
+0x19, 0x1b, 0x7f, 0x9c, 0x3f, 0xe8, 0x87, 0x91, 0x81, 0x89, 0x53, 0x51, 0x31, 0x3d, 0x48, 0xfe,
+0x2e, 0x7d, 0x3f, 0x8f, 0x59, 0x2e, 0xe5, 0x77, 0xa8, 0x92, 0xa5, 0xe6, 0x1c, 0x23, 0x86, 0x8d,
+0x87, 0x0d, 0x89, 0xc2, 0x91, 0xe1, 0x7b, 0xb7, 0xa3, 0xf1, 0xc6, 0xc5, 0xcf, 0xf8, 0xaa, 0x83,
+0xe5, 0xc3, 0xb8, 0xc5, 0x4b, 0x2d, 0x8c, 0x03, 0xa7, 0x89, 0x6f, 0x68, 0x97, 0x32, 0x6e, 0x4a,
+0x3e, 0x15, 0x24, 0xd8, 0xfe, 0x76, 0x85, 0x64, 0x2a, 0x40, 0xf6, 0x2f, 0x5e, 0xe3, 0x6e, 0x58,
+0x59, 0x5b, 0x63, 0x68, 0x21, 0xfa, 0x48, 0xfc, 0x81, 0x20, 0x24, 0x43, 0xe0, 0x24, 0x21, 0xe0,
+0x0f, 0x98, 0xf5, 0xc1, 0xf7, 0x0f, 0xef, 0x4e, 0xdb, 0x12, 0x61, 0x07, 0x41, 0x5f, 0x7c, 0xaf,
+0x93, 0x2c, 0x0b, 0x81, 0xc4, 0xc3, 0xac, 0x89, 0x47, 0x27, 0x48, 0xaa, 0xed, 0x90, 0xf0, 0x10,
+0x32, 0xc0, 0x41, 0x27, 0x27, 0x2e, 0x7f, 0xae, 0x0a, 0x96, 0xac, 0xad, 0x00, 0xae, 0xe9, 0x5b,
+0x1f, 0x04, 0x46, 0xbe, 0xa6, 0x61, 0x59, 0xf6, 0x42, 0x6c, 0xda, 0xb8, 0x68, 0xf7, 0xfa, 0xd6,
+0x1c, 0xa1, 0x2e, 0x17, 0x06, 0xf0, 0x8d, 0xd3, 0x81, 0xe4, 0xc2, 0xa7, 0x09, 0x90, 0xd8, 0x62,
+0x82, 0xa3, 0x90, 0xce, 0xb5, 0x82, 0xd8, 0x9a, 0x73, 0xd7, 0x13, 0xaf, 0xd6, 0x9a, 0xe6, 0xce,
+0xe4, 0x83, 0x64, 0x60, 0xa2, 0x91, 0x7e, 0xad, 0xc0, 0x78, 0x99, 0x55, 0xf1, 0x3a, 0x00, 0x94,
+0xb4, 0x3b, 0xfa, 0x67, 0x34, 0x9d, 0x62, 0x3f, 0x5c, 0x6a, 0xef, 0x4c, 0x8c, 0xd3, 0xda, 0xb6,
+0xd7, 0xdb, 0x0b, 0x90, 0xd8, 0x80, 0x5c, 0x87, 0x6c, 0x2a, 0x9f, 0xf9, 0xfd, 0x36, 0xde, 0xab,
+0x0d, 0x14, 0x82, 0x22, 0xc3, 0xf2, 0xf0, 0xae, 0x2a, 0x97, 0x4c, 0xb6, 0x2a, 0x7b, 0xec, 0x3c,
+0x7d, 0xbc, 0xe6, 0xff, 0xa4, 0x3a, 0x29, 0xb6, 0x81, 0xb9, 0x26, 0x9f, 0xf9, 0x56, 0x38, 0x02,
+0xe2, 0xb1, 0x84, 0x14, 0xb0, 0xa5, 0x8b, 0xae, 0x52, 0x01, 0x12, 0xdf, 0x25, 0x71, 0x51, 0x85,
+0x1b, 0xdc, 0x9b, 0x6a, 0x78, 0x2f, 0x36, 0xcb, 0xba, 0xdc, 0x8e, 0xd2, 0x0e, 0x82, 0xc0, 0xa8,
+0x84, 0x05, 0x63, 0x95, 0x16, 0xbb, 0xba, 0x5f, 0xcf, 0x1c, 0x96, 0x52, 0xee, 0xf2, 0xaf, 0x0a,
+0x92, 0xe3, 0x09, 0x90, 0x58, 0x36, 0x46, 0x22, 0x24, 0xc1, 0x11, 0x37, 0x8d, 0x18, 0x30, 0xaf,
+0x7d, 0x6b, 0x33, 0x7d, 0xe5, 0xb2, 0xc6, 0xb2, 0x0c, 0xf7, 0xa2, 0x75, 0xe9, 0x53, 0x93, 0x25,
+0xf3, 0x31, 0x50, 0x7c, 0x36, 0x84, 0xc4, 0x25, 0x29, 0x3c, 0x12, 0xb5, 0xba, 0xfa, 0x75, 0x10,
+0x6e, 0x9c, 0x0d, 0x2b, 0xbf, 0xb2, 0x64, 0x8c, 0x44, 0x50, 0xc0, 0x51, 0xc7, 0x5c, 0x2b, 0xaa,
+0x55, 0xff, 0xb8, 0x11, 0x5c, 0x2b, 0xca, 0x78, 0x4f, 0xb5, 0x41, 0xa0, 0x1f, 0x25, 0xa0, 0xdc,
+0x0e, 0x8b, 0x30, 0x72, 0x6d, 0x50, 0x0d, 0x28, 0x7b, 0xed, 0x36, 0x22, 0xfd, 0xf4, 0xe7, 0x52,
+0xda, 0xc3, 0x94, 0x32, 0x29, 0x72, 0xbc, 0x1b, 0x6e, 0x5d, 0x8a, 0x1b, 0x47, 0x4b, 0x32, 0x5b,
+0x82, 0x22, 0xee, 0xe8, 0x91, 0xfd, 0xc5, 0xa5, 0x9e, 0x4a, 0x7a, 0x71, 0xd9, 0x4b, 0x98, 0x3a,
+0x1e, 0x08, 0x84, 0x08, 0x30, 0x53, 0x5a, 0x15, 0x91, 0x59, 0x14, 0x7b, 0x81, 0xf2, 0x99, 0x34,
+0x69, 0x93, 0xf3, 0xa9, 0x74, 0xee, 0xe3, 0xf6, 0xf8, 0xd8, 0x13, 0x60, 0x66, 0xab, 0x6d, 0x7b,
+0xb5, 0x15, 0x80, 0xc4, 0x0b, 0x3e, 0x9f, 0x58, 0x8d, 0x55, 0x2f, 0x6f, 0xb4, 0x7b, 0x5f, 0x09,
+0xb0, 0x27, 0x8a, 0xfc, 0x64, 0x09, 0x4e, 0xf1, 0x3b, 0xa8, 0xac, 0x67, 0xa3, 0xda, 0xc9, 0xaa,
+0xa0, 0xfb, 0x85, 0xb0, 0x4c, 0x11, 0xab, 0xd8, 0x0e, 0x94, 0x6a, 0x8d, 0x90, 0x60, 0x5d, 0xcf,
+0x13, 0x48, 0x14, 0xf5, 0xc4, 0xe4, 0x44, 0xb3, 0x79, 0x80, 0x28, 0x5c, 0xab, 0xd9, 0x0b, 0x5d,
+0x50, 0xf1, 0x8b, 0x5a, 0xab, 0xe3, 0x0e, 0x79, 0x7a, 0x39, 0x36, 0x6e, 0x44, 0xd1, 0xd1, 0xc5,
+0x53, 0x9b, 0xa7, 0xbf, 0xd5, 0x4f, 0xf5, 0x21, 0xba, 0xfe, 0xfa, 0xc3, 0x9c, 0x8b, 0x55, 0x08,
+0x28, 0x83, 0xe7, 0xc2, 0x70, 0x37, 0xb3, 0xfb, 0x65, 0xab, 0x18, 0x85, 0xb4, 0x85, 0x26, 0x48,
+0xd0, 0x82, 0x84, 0x0f, 0x27, 0x8c, 0x91, 0x6c, 0x35, 0x2b, 0xdd, 0x2d, 0xc8, 0xd6, 0x03, 0xa1,
+0x58, 0x4d, 0xe0, 0x98, 0xbd, 0xc0, 0x65, 0x2e, 0x08, 0x02, 0x9d, 0xc0, 0x87, 0x1d, 0x5f, 0x0c,
+0x6c, 0x36, 0x76, 0x83, 0x69, 0xcf, 0xa7, 0x52, 0x8f, 0xd1, 0x56, 0x44, 0x6e, 0x44, 0xb3, 0x1f,
+0x32, 0x77, 0xaf, 0x0f, 0xc2, 0x60, 0x28, 0x0c, 0xc3, 0x57, 0xfa, 0x33, 0xfd, 0x1a, 0x76, 0xaa,
+0x66, 0x3b, 0x64, 0xbd, 0x48, 0x5b, 0x68, 0x82, 0xe4, 0xf6, 0xe5, 0x08, 0xf4, 0x9e, 0xe8, 0x52,
+0xf6, 0x1d, 0x53, 0x8e, 0x82, 0x43, 0x40, 0x86, 0x30, 0xf6, 0x58, 0xf1, 0xc2, 0x06, 0x58, 0xf8,
+0xb8, 0xa1, 0xa7, 0xce, 0x62, 0xe7, 0xf7, 0xb3, 0xd7, 0x40, 0xe0, 0x55, 0xf3, 0xb7, 0xf0, 0x21,
+0x8d, 0xd2, 0xc0, 0x82, 0x45, 0x43, 0x3b, 0xea, 0xa5, 0xc3, 0xfe, 0x56, 0xcf, 0x3b, 0xdb, 0x9a,
+0x59, 0xe6, 0x06, 0x2d, 0xb4, 0x69, 0xc7, 0x1b, 0x60, 0x9c, 0x72, 0x2d, 0x18, 0x22, 0x1d, 0x2a,
+0x23, 0x03, 0x2d, 0x60, 0x83, 0x71, 0x14, 0xad, 0x90, 0xf4, 0x75, 0x05, 0xa9, 0xb5, 0x8c, 0xf7,
+0x27, 0x13, 0x06, 0x11, 0x11, 0x10, 0x69, 0xfe, 0xf2, 0x32, 0x70, 0xd7, 0xe9, 0x1e, 0x77, 0xa0,
+0x6b, 0xe4, 0x23, 0x41, 0xce, 0x81, 0xc0, 0x6b, 0xf6, 0x39, 0x7a, 0xa0, 0xea, 0xa0, 0xd4, 0x01,
+0x06, 0x6e, 0x9e, 0x86, 0x0a, 0xfe, 0xd7, 0x47, 0xb8, 0x70, 0x6a, 0xe5, 0xa4, 0x0e, 0x71, 0x30,
+0x7e, 0xb8, 0x0e, 0x0e, 0xa2, 0xc9, 0xc7, 0x1b, 0xb8, 0x8c, 0x02, 0xe5, 0xfa, 0xe9, 0x8c, 0xa0,
+0xe0, 0x0f, 0x9a, 0xac, 0x76, 0xbb, 0x48, 0x7b, 0x68, 0x82, 0xe4, 0xe2, 0x41, 0x12, 0xb4, 0x0f,
+0xc5, 0xb9, 0x36, 0xfc, 0xd8, 0x05, 0x61, 0xc6, 0xef, 0xbc, 0xd2, 0x9a, 0x57, 0xff, 0x09, 0x66,
+0xce, 0xd5, 0x65, 0x39, 0x6d, 0x7c, 0xa2, 0x5d, 0xf0, 0x35, 0x7b, 0xee, 0xb2, 0x4e, 0x1a, 0x24,
+0xe1, 0x5c, 0x13, 0x23, 0x74, 0xa6, 0xed, 0x00, 0xba, 0x5a, 0xaa, 0xf2, 0xf6, 0xac, 0x3c, 0x08,
+0x4a, 0xad, 0x11, 0xc0, 0x20, 0x28, 0x57, 0x3a, 0xbb, 0xa8, 0x65, 0xcb, 0xe0, 0x76, 0x59, 0xba,
+0xf3, 0xa1, 0x16, 0x48, 0xb0, 0x3e, 0x17, 0x3f, 0x3d, 0xa2, 0x8c, 0x47, 0xaa, 0x8d, 0x9c, 0xd4,
+0x29, 0x2c, 0xde, 0x15, 0x90, 0x96, 0xd5, 0x54, 0x65, 0xfb, 0xff, 0xe0, 0xd3, 0x08, 0x77, 0x59,
+0x6f, 0x0d, 0xbe, 0x6e, 0xff, 0xdd, 0x0f, 0xab, 0x3e, 0xa1, 0x4b, 0x47, 0x77, 0x19, 0xf5, 0xff,
+0x5f, 0x3e, 0xe2, 0xc7, 0x0e, 0x39, 0xad, 0x29, 0x12, 0xa4, 0x6c, 0x32, 0x30, 0x5b, 0xf4, 0xb4,
+0x74, 0x08, 0x08, 0x5a, 0x94, 0x34, 0xa0, 0x58, 0xbe, 0x23, 0x3b, 0xa9, 0xb7, 0x6a, 0x48, 0x30,
+0xce, 0x12, 0xfd, 0x9d, 0x13, 0x9e, 0x8a, 0x81, 0xa9, 0x5f, 0xa1, 0x62, 0xef, 0x90, 0x94, 0x45,
+0x60, 0xee, 0x23, 0x4e, 0xda, 0xde, 0xd3, 0xaf, 0x3b, 0x6f, 0x17, 0x92, 0xf5, 0x1f, 0x4b, 0xa7,
+0xc0, 0xa0, 0xb3, 0x35, 0xae, 0x7f, 0x17, 0xa2, 0x9d, 0x91, 0x05, 0x92, 0xd3, 0x0e, 0x88, 0xd7,
+0x7f, 0x12, 0x3f, 0x0b, 0x44, 0xb7, 0x0d, 0xa8, 0x87, 0xbe, 0x8f, 0x40, 0xff, 0x37, 0x81, 0x74,
+0xe3, 0x28, 0xad, 0xcc, 0x6d, 0x89, 0x5a, 0xd4, 0x26, 0xaa, 0x21, 0xe9, 0xff, 0x26, 0x08, 0x37,
+0xcf, 0x87, 0x27, 0x62, 0xaa, 0xb6, 0xed, 0xbb, 0x0d, 0x01, 0x84, 0x14, 0x4a, 0xeb, 0xd1, 0xe5,
+0x51, 0x66, 0x96, 0x5b, 0x4e, 0xbf, 0xe1, 0xdc, 0x1d, 0xd6, 0x49, 0xbd, 0x11, 0x8e, 0x0e, 0x23,
+0x62, 0x00, 0x7c, 0x4a, 0x7f, 0xdf, 0xee, 0x8f, 0xb9, 0x2f, 0x6d, 0xdb, 0xb7, 0xea, 0x58, 0xe6,
+0x06, 0xe6, 0x8a, 0x35, 0x64, 0x13, 0xf0, 0x23, 0x1c, 0x08, 0xb1, 0xa2, 0x83, 0x25, 0x7b, 0x03,
+0x5b, 0xad, 0x5a, 0x8b, 0xa2, 0x16, 0x12, 0xac, 0x43, 0xf8, 0x50, 0x3b, 0x3c, 0x1c, 0x1d, 0x35,
+0xd4, 0xd5, 0x12, 0xd6, 0x1d, 0x50, 0x0d, 0x48, 0xdc, 0x8d, 0xfa, 0x6e, 0x4b, 0x6e, 0x6c, 0x22,
+0x4d, 0xea, 0x8e, 0x0d, 0x61, 0xc8, 0xd8, 0x48, 0xe8, 0xa3, 0x03, 0xf2, 0x53, 0xda, 0x90, 0x9c,
+0x3d, 0x29, 0x3b, 0x02, 0xfe, 0x5e, 0x36, 0x96, 0xe5, 0x3e, 0x09, 0x76, 0xaf, 0x7c, 0xd5, 0x4d,
+0x5f, 0x53, 0xc8, 0xb2, 0x73, 0x07, 0x49, 0xdd, 0x54, 0x59, 0x77, 0x2c, 0x77, 0xf8, 0xb3, 0xf6,
+0x09, 0x6f, 0xc6, 0x80, 0xac, 0x16, 0x02, 0x92, 0x89, 0x58, 0xd9, 0x5a, 0xec, 0x25, 0x50, 0xf8,
+0x20, 0x07, 0x45, 0xea, 0x1f, 0x3f, 0x4e, 0x4e, 0x4f, 0x0d, 0xa0, 0x0b, 0x70, 0x21, 0x2c, 0xdf,
+0x43, 0x43, 0x97, 0x90, 0x92, 0x3a, 0x64, 0x75, 0x68, 0xce, 0x0d, 0x74, 0x09, 0xbf, 0x0b, 0xd9,
+0x26, 0x80, 0x27, 0xf5, 0x49, 0x58, 0x72, 0xa1, 0xa1, 0xec, 0xba, 0x43, 0x2d, 0xac, 0xf5, 0xc6,
+0x57, 0x81, 0xc9, 0x79, 0xfa, 0x00, 0xbb, 0xfc, 0x67, 0x1a, 0xf2, 0xe3, 0x2c, 0x0e, 0x72, 0x0f,
+0x34, 0xcf, 0x11, 0x9a, 0x4a, 0xe3, 0xa3, 0x63, 0x70, 0xe1, 0xe3, 0x43, 0xca, 0x07, 0x8d, 0x29,
+0xeb, 0xac, 0x49, 0x5d, 0x1a, 0x61, 0x1a, 0xc7, 0xb1, 0xe1, 0xd3, 0xf8, 0xea, 0xd7, 0x29, 0xad,
+0x89, 0x25, 0x2e, 0x17, 0xeb, 0x97, 0xaa, 0x20, 0xb9, 0xf4, 0x79, 0xbb, 0x5c, 0x6e, 0xdd, 0x07,
+0x10, 0x05, 0xe0, 0x8a, 0x35, 0xc8, 0x7e, 0xfd, 0x83, 0xf6, 0x3e, 0xd2, 0xe1, 0x86, 0x7a, 0x44,
+0xd3, 0x21, 0x61, 0x1d, 0xcc, 0x4d, 0x21, 0x91, 0xa8, 0x1b, 0xa6, 0x3a, 0x5e, 0x19, 0x38, 0x15,
+0x84, 0x5b, 0x17, 0xc2, 0xa9, 0x3c, 0x89, 0x66, 0xb3, 0xe7, 0x74, 0x51, 0x48, 0xa4, 0xa9, 0x21,
+0xb9, 0x1f, 0x8d, 0x52, 0x48, 0xe2, 0x56, 0x4f, 0xc7, 0xb8, 0x8f, 0x03, 0xc2, 0xf4, 0xb3, 0xfd,
+0xea, 0x9f, 0x58, 0x5a, 0x82, 0xe1, 0xf0, 0x27, 0x87, 0xe0, 0xc7, 0xf1, 0x84, 0x8c, 0x91, 0xe9,
+0x8b, 0x7f, 0x48, 0xdd, 0x34, 0xc5, 0x2b, 0x23, 0x57, 0xfb, 0x09, 0xdc, 0x5d, 0xc9, 0xe5, 0x36,
+0x34, 0x5b, 0x34, 0x45, 0xbb, 0x9c, 0x9a, 0x0a, 0xf2, 0xc1, 0x33, 0x21, 0xb8, 0x71, 0x26, 0xee,
+0x6a, 0xe9, 0xb6, 0x76, 0x84, 0x03, 0x92, 0xdc, 0x20, 0x7f, 0xd3, 0xd7, 0xdd, 0x1a, 0xbd, 0x31,
+0x08, 0x62, 0xc7, 0xa4, 0x33, 0xc5, 0x5b, 0xc1, 0x82, 0x74, 0x2a, 0xa9, 0x9b, 0x7c, 0x14, 0xdb,
+0xae, 0xa9, 0x3a, 0x1c, 0xc2, 0x21, 0x7e, 0xe1, 0xa7, 0x4f, 0xe7, 0x49, 0x65, 0x37, 0x79, 0x09,
+0x2c, 0x29, 0xf7, 0x94, 0x19, 0x47, 0x2c, 0xef, 0xe5, 0xc3, 0xed, 0xc4, 0xb5, 0x1d, 0x8d, 0xb9,
+0x85, 0x29, 0x66, 0x32, 0x70, 0x40, 0xf4, 0x6a, 0x90, 0xbf, 0xea, 0x1b, 0xb8, 0x0f, 0x89, 0x11,
+0xe8, 0xff, 0xff, 0xae, 0x54, 0xbe, 0xbd, 0x65, 0x53, 0x3d, 0x48, 0x1d, 0xeb, 0x18, 0x28, 0x75,
+0x19, 0x5d, 0xae, 0x40, 0x10, 0x6e, 0x5f, 0x9c, 0xe4, 0x72, 0xf9, 0x58, 0x5c, 0x12, 0x35, 0xb1,
+0xbc, 0x53, 0x42, 0x32, 0x3a, 0x98, 0xf0, 0x30, 0xd2, 0xc5, 0xda, 0x71, 0x40, 0xd2, 0xa8, 0xf2,
+0xaf, 0xd9, 0x6d, 0xad, 0x39, 0xc9, 0x89, 0x4f, 0x0d, 0x09, 0x6a, 0x0f, 0x6b, 0xcc, 0xa8, 0x45,
+0xf5, 0x74, 0x33, 0x50, 0x1a, 0x33, 0x95, 0xfd, 0xfa, 0xa9, 0x40, 0xb2, 0xcb, 0x65, 0xfa, 0xb6,
+0x3c, 0x95, 0x2a, 0x20, 0xb9, 0x72, 0xa2, 0x13, 0x46, 0xfa, 0xfa, 0x75, 0x0b, 0xd8, 0x1f, 0xe1,
+0x28, 0xa4, 0x56, 0xe8, 0x4d, 0xc1, 0xab, 0xd7, 0xf9, 0x18, 0x78, 0xb9, 0xca, 0xcb, 0xa1, 0xbc,
+0xae, 0x16, 0x66, 0x14, 0x4e, 0x9a, 0x06, 0x8f, 0x96, 0xaa, 0xc7, 0xaa, 0xb3, 0x32, 0x48, 0x3d,
+0x45, 0x72, 0xe1, 0x59, 0x20, 0x69, 0x4f, 0x97, 0x4a, 0x53, 0xf6, 0x58, 0x67, 0x8d, 0xad, 0x46,
+0x35, 0xab, 0xac, 0x01, 0x52, 0x9e, 0xa6, 0x4c, 0xf7, 0xb9, 0x6c, 0xc3, 0x06, 0xb9, 0x9c, 0x72,
+0x76, 0x96, 0x5b, 0x10, 0xa3, 0xf5, 0xd4, 0x47, 0xd4, 0x9a, 0xbc, 0x0f, 0x3a, 0x4c, 0x57, 0x47,
+0x9f, 0x7e, 0xa0, 0xab, 0x3b, 0x95, 0x6f, 0x6f, 0xb9, 0xdb, 0xc5, 0xea, 0x9a, 0xd6, 0xa2, 0x60,
+0xd2, 0xa1, 0xd7, 0x3f, 0x29, 0x2e, 0x31, 0x7d, 0xab, 0x50, 0x52, 0xc6, 0x46, 0xc8, 0x30, 0xc0,
+0x8b, 0x2e, 0xe1, 0xf5, 0x60, 0x50, 0x97, 0x80, 0x9d, 0x03, 0xa2, 0xa5, 0x61, 0xf6, 0xd1, 0x86,
+0xd9, 0xa5, 0x07, 0x28, 0xd8, 0x80, 0xb7, 0xc3, 0xe1, 0x74, 0x3f, 0xf6, 0x81, 0xc5, 0x2b, 0x00,
+0x49, 0x5d, 0xdd, 0xec, 0xa1, 0xd0, 0x90, 0x1c, 0x0c, 0x0f, 0x74, 0x75, 0xc1, 0x48, 0x7f, 0xbf,
+0xb5, 0x90, 0xec, 0xcb, 0x1c, 0x27, 0xf6, 0xb4, 0xb7, 0xcb, 0x20, 0x67, 0x35, 0xc2, 0xce, 0x01,
+0x99, 0x86, 0x9e, 0xfc, 0x8b, 0x3e, 0xa7, 0xc2, 0x8e, 0x91, 0xa0, 0x72, 0xa0, 0xbb, 0x1b, 0xc6,
+0xc7, 0xd2, 0xae, 0x2b, 0x0f, 0x30, 0x50, 0xbc, 0x16, 0xd7, 0x75, 0x52, 0x30, 0x8f, 0xe5, 0x1e,
+0x8e, 0x88, 0x96, 0x42, 0x42, 0xca, 0xb6, 0x3f, 0x5d, 0x1b, 0xe0, 0xbd, 0xed, 0x3d, 0x16, 0x0f,
+0xd8, 0xa7, 0x3d, 0xdd, 0x87, 0x03, 0x92, 0x5d, 0x03, 0xb9, 0x59, 0x03, 0xed, 0x80, 0x2c, 0xc6,
+0x4f, 0x6e, 0x86, 0x42, 0x30, 0x74, 0x29, 0x9c, 0x6a, 0xdc, 0x21, 0xeb, 0x27, 0xa0, 0x8e, 0x75,
+0x9d, 0x64, 0x3d, 0x53, 0x40, 0x82, 0x1f, 0xaa, 0xcd, 0x0a, 0xdc, 0x49, 0x99, 0x32, 0x8e, 0x5d,
+0xf5, 0x9d, 0xec, 0x94, 0x2d, 0xdd, 0xb4, 0xd3, 0xbe, 0x1c, 0x10, 0x9d, 0xf4, 0x44, 0x1b, 0x85,
+0x05, 0x9f, 0xb2, 0xf2, 0x3a, 0x0e, 0x4d, 0xc1, 0xeb, 0xf8, 0xd8, 0x18, 0xdc, 0x3a, 0x17, 0x4a,
+0xee, 0x70, 0xb6, 0x01, 0x84, 0xd5, 0xd1, 0xc5, 0xdc, 0x9a, 0xf8, 0x5a, 0x1a, 0x04, 0xfb, 0xc6,
+0xe9, 0x60, 0xb2, 0xd5, 0x33, 0x2d, 0xbb, 0x45, 0xca, 0x94, 0x36, 0xb3, 0x85, 0xf7, 0x54, 0x3c,
+0x7a, 0x04, 0x7e, 0x8a, 0x3d, 0x78, 0xa6, 0x95, 0xf6, 0xe5, 0x80, 0x18, 0xdb, 0x70, 0xb8, 0x96,
+0xa3, 0x16, 0x34, 0xac, 0x47, 0x1f, 0xbb, 0x39, 0x48, 0x41, 0xc1, 0x57, 0xbb, 0x01, 0x92, 0x50,
+0xb7, 0xd8, 0x31, 0x6c, 0xd4, 0xed, 0x1a, 0xee, 0x8d, 0xc0, 0xb5, 0x6f, 0xba, 0xac, 0x84, 0xa4,
+0x91, 0x94, 0x27, 0x65, 0xd0, 0x7e, 0xeb, 0x7c, 0x08, 0x6e, 0x9e, 0x0b, 0xc9, 0x2e, 0xa0, 0xe6,
+0xb4, 0x2f, 0x07, 0xc4, 0xac, 0x4e, 0xf5, 0xe7, 0xf8, 0x7a, 0x74, 0x8f, 0x04, 0x50, 0xae, 0x80,
+0x26, 0x25, 0x38, 0xf7, 0x88, 0x0f, 0x3d, 0x74, 0x39, 0x0c, 0x77, 0x07, 0xfa, 0x6d, 0x07, 0x88,
+0xa2, 0x4e, 0x3b, 0x25, 0x76, 0x70, 0xce, 0x9d, 0x08, 0x81, 0xe4, 0xdb, 0x04, 0x48, 0x4c, 0xdd,
+0xbf, 0x6a, 0xcd, 0x9f, 0x53, 0x07, 0xed, 0x3f, 0x3d, 0x1c, 0x87, 0x48, 0x47, 0xbb, 0x1c, 0xe7,
+0x69, 0xb6, 0x22, 0x1c, 0x10, 0x1b, 0x68, 0xcd, 0xff, 0x4a, 0xca, 0x23, 0xae, 0x13, 0x8e, 0xbb,
+0x7e, 0x38, 0x72, 0x47, 0x14, 0xdf, 0x9d, 0xdf, 0x6a, 0xe3, 0xb2, 0x23, 0xe0, 0xf8, 0xf4, 0xae,
+0xbb, 0xd3, 0x9b, 0x00, 0x89, 0xe9, 0x60, 0x93, 0xb2, 0xa4, 0x9c, 0x70, 0x9a, 0x54, 0x2e, 0x4d,
+0xab, 0x3c, 0x0b, 0x78, 0xf7, 0xb4, 0x5e, 0x17, 0x7f, 0x4d, 0x17, 0xa0, 0xf9, 0x14, 0x5f, 0x79,
+0x1d, 0x54, 0x76, 0xec, 0x6c, 0xf5, 0xa4, 0x73, 0xee, 0x9c, 0xb7, 0xbc, 0x7c, 0x17, 0x71, 0x0d,
+0x5d, 0x77, 0x7a, 0x45, 0xab, 0x8a, 0xb3, 0x95, 0xb8, 0x5a, 0xa7, 0x92, 0xe3, 0x11, 0x52, 0x2e,
+0x6a, 0x8d, 0x1f, 0x0c, 0x53, 0xef, 0x0a, 0x2d, 0x9e, 0xea, 0xb9, 0x64, 0x7c, 0x24, 0x9d, 0x4b,
+0x2f, 0x50, 0xf6, 0x10, 0x77, 0xab, 0x7e, 0x49, 0x75, 0x4d, 0x60, 0xde, 0x0a, 0xb7, 0x65, 0xb0,
+0x92, 0x32, 0x34, 0xa5, 0x1a, 0x64, 0x2f, 0x5d, 0x1b, 0xdf, 0x98, 0xa4, 0x91, 0x1d, 0x10, 0xc5,
+0x01, 0xe1, 0x32, 0x57, 0xe1, 0xdf, 0x08, 0x01, 0x72, 0x55, 0x2f, 0xf1, 0xd4, 0xec, 0x99, 0x5b,
+0xf6, 0x98, 0x55, 0x65, 0xf0, 0xa6, 0x9a, 0x32, 0x33, 0x7b, 0x51, 0x29, 0xcc, 0x5e, 0x1c, 0x3f,
+0x29, 0x4d, 0xf5, 0x8e, 0x36, 0x3c, 0x06, 0xe1, 0x32, 0x44, 0xab, 0xff, 0x5b, 0xf2, 0x5c, 0xfa,
+0xad, 0x35, 0x7b, 0xa3, 0x91, 0xbf, 0x9d, 0x72, 0x0d, 0x09, 0xba, 0x58, 0x57, 0xfc, 0xed, 0x9a,
+0x62, 0x11, 0x6e, 0x41, 0xb8, 0x0c, 0x91, 0x55, 0x70, 0xb0, 0xbf, 0x1d, 0x4d, 0x35, 0xa9, 0x71,
+0xd6, 0x3c, 0x17, 0x89, 0x47, 0xdc, 0x9a, 0xac, 0x08, 0x07, 0x84, 0x2b, 0x37, 0x01, 0xfd, 0x67,
+0xc1, 0x27, 0x49, 0xd0, 0x82, 0x7b, 0xf6, 0x28, 0xaf, 0x05, 0x6b, 0x2a, 0x35, 0xc5, 0x22, 0x1c,
+0x10, 0xae, 0x9c, 0xd5, 0xe5, 0xdf, 0x09, 0xbb, 0x21, 0x36, 0x68, 0x19, 0x57, 0xc1, 0xec, 0x39,
+0x50, 0xa2, 0xc1, 0x8a, 0x70, 0x40, 0xb8, 0x72, 0x5b, 0xc4, 0xd5, 0x9a, 0x64, 0x45, 0x2a, 0xd4,
+0x5b, 0x11, 0x0e, 0x08, 0x57, 0x6e, 0x5b, 0x91, 0x77, 0x84, 0xd8, 0x8c, 0xe8, 0x64, 0x2b, 0xf2,
+0x98, 0x7b, 0x02, 0x92, 0x0c, 0xe2, 0x59, 0x2c, 0xae, 0xbc, 0xd0, 0xaa, 0xbd, 0x89, 0xa3, 0xec,
+0x3f, 0xdc, 0x1b, 0x83, 0xde, 0x0e, 0xba, 0x6f, 0x59, 0xc6, 0x39, 0x5a, 0xdc, 0x82, 0x70, 0xe5,
+0x87, 0xa7, 0x25, 0x41, 0xb3, 0xd2, 0xcd, 0x9a, 0x51, 0x34, 0x07, 0xe6, 0x2e, 0xa3, 0x56, 0x44,
+0xde, 0xe9, 0x85, 0xbb, 0x58, 0x5c, 0xf9, 0xab, 0x9e, 0x46, 0xba, 0x75, 0x6e, 0xc2, 0xb6, 0xa4,
+0x0b, 0x56, 0x57, 0x4e, 0x19, 0xac, 0x73, 0x40, 0xb8, 0xf2, 0xc9, 0x8a, 0x60, 0xda, 0x57, 0x8c,
+0x5b, 0x11, 0x12, 0x8b, 0xcc, 0x59, 0x52, 0x86, 0x3f, 0x72, 0xb3, 0xc3, 0x6c, 0x39, 0x20, 0x5c,
+0xf9, 0x2b, 0xb1, 0x89, 0x0e, 0x20, 0x36, 0x2b, 0x07, 0x0f, 0xe7, 0xad, 0xa8, 0x90, 0x7f, 0xbc,
+0x83, 0x03, 0xc2, 0xc5, 0x21, 0xf9, 0x17, 0xc1, 0x4b, 0xb8, 0xf0, 0xc9, 0x8c, 0xcc, 0x5a, 0x58,
+0x0a, 0x33, 0x4b, 0xe8, 0xe4, 0xdf, 0x94, 0x29, 0x5f, 0x0e, 0x08, 0x57, 0x1e, 0xfa, 0x5a, 0x74,
+0x1a, 0x4a, 0x54, 0xb6, 0x22, 0x25, 0xe5, 0x71, 0x2b, 0xd2, 0xc8, 0x01, 0xe1, 0xca, 0x7b, 0x45,
+0x7e, 0x4f, 0xd7, 0xb0, 0x7c, 0x20, 0x7f, 0x9e, 0x5b, 0x56, 0x0e, 0x8f, 0x14, 0x14, 0xa6, 0x74,
+0xb3, 0x38, 0x20, 0x5c, 0xf9, 0x0a, 0xc9, 0x6e, 0x65, 0xc0, 0xce, 0xac, 0xc8, 0xa4, 0x60, 0x9d,
+0x03, 0xc2, 0x95, 0xef, 0xae, 0x16, 0x75, 0xb3, 0x8a, 0x97, 0xba, 0x53, 0x06, 0xeb, 0x1c, 0x10,
+0xae, 0xbc, 0x55, 0xef, 0xbf, 0x0a, 0x3e, 0x39, 0x60, 0xc7, 0x81, 0xc3, 0xd9, 0xa5, 0x34, 0xe5,
+0xdb, 0xa0, 0xdc, 0x6f, 0x98, 0x03, 0xc2, 0xc5, 0xad, 0x48, 0xa2, 0x15, 0x49, 0x18, 0x59, 0xe7,
+0x80, 0x70, 0xe5, 0xb5, 0xae, 0xbc, 0x2b, 0x88, 0xf2, 0xba, 0x91, 0xa2, 0xc5, 0x65, 0x72, 0xb0,
+0xbe, 0x85, 0x03, 0xc2, 0xc5, 0x35, 0x21, 0x9c, 0x82, 0x42, 0x27, 0x2b, 0xce, 0x89, 0x59, 0x91,
+0xb8, 0x9b, 0xc5, 0x01, 0xe1, 0xca, 0x7b, 0x5d, 0xfd, 0x37, 0x21, 0x2a, 0x4f, 0x66, 0x9c, 0xf3,
+0x68, 0xb9, 0xfc, 0x75, 0x23, 0x07, 0x84, 0x8b, 0x8b, 0xa9, 0xef, 0xdf, 0x05, 0xdc, 0x09, 0x45,
+0x2c, 0x2c, 0x76, 0x41, 0xe1, 0x5c, 0x6a, 0x3c, 0x76, 0x70, 0x40, 0xb8, 0xb8, 0x12, 0x45, 0x37,
+0x94, 0x63, 0x56, 0xc4, 0x83, 0x53, 0x4f, 0x38, 0x20, 0x5c, 0x5c, 0xb2, 0x15, 0xf9, 0x0f, 0xba,
+0xd1, 0x83, 0xaf, 0x68, 0xd1, 0x32, 0xf9, 0xab, 0x3a, 0x0e, 0x08, 0x17, 0x57, 0xa2, 0x5a, 0x70,
+0x4c, 0x04, 0x33, 0x5a, 0x44, 0x5b, 0x38, 0x20, 0x5c, 0x5c, 0x0a, 0xf5, 0xff, 0x27, 0xb5, 0x22,
+0xad, 0xcc, 0x8a, 0x34, 0x70, 0x40, 0xb8, 0xb8, 0x52, 0x58, 0x91, 0x59, 0x0b, 0xa9, 0x05, 0xe1,
+0x41, 0x3a, 0x17, 0x57, 0xb2, 0x06, 0xfe, 0x20, 0x88, 0x42, 0x41, 0x21, 0xb1, 0x22, 0x65, 0x1c,
+0x10, 0x2e, 0xae, 0x94, 0x92, 0xa0, 0x65, 0xe6, 0xfc, 0x52, 0x7e, 0x1f, 0xb8, 0xb8, 0xd2, 0x69,
+0xd1, 0x1f, 0x6f, 0x7f, 0xf8, 0x77, 0x01, 0x06, 0x00, 0x5b, 0x55, 0x45, 0x4c, 0xe2, 0xcc, 0x33,
+0x89, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+const unsigned char dolphin_logo_2x_png[] = {
+0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x00, 0xdc, 0x08, 0x06, 0x00, 0x00, 0x00, 0x5e, 0x52, 0xf7,
+0x6f, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
+0x65, 0x00, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x61,
+0x64, 0x79, 0x71, 0xc9, 0x65, 0x3c, 0x00, 0x00, 0x26, 0xd6, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda,
+0xec, 0x9d, 0x7b, 0x74, 0x14, 0x55, 0x9e, 0xc7, 0x6f, 0x03, 0x11, 0x48, 0x82, 0x69, 0x1e, 0x41,
+0x0c, 0xc4, 0x34, 0x9a, 0x88, 0x46, 0x21, 0x41, 0x65, 0x66, 0xc4, 0xd1, 0x74, 0x66, 0x9c, 0x99,
+0x9d, 0x97, 0x89, 0xbb, 0x8b, 0xec, 0xce, 0xec, 0x0e, 0xc9, 0x3e, 0x66, 0xdf, 0x47, 0x73, 0xce,
+0xfe, 0xbd, 0x92, 0xbf, 0xf7, 0x0f, 0xc2, 0xdf, 0xbb, 0xe7, 0x18, 0xf6, 0xcc, 0xd9, 0x19, 0x06,
+0x67, 0x08, 0x3a, 0x83, 0xa3, 0x80, 0x74, 0x14, 0xa3, 0x0e, 0x71, 0xe8, 0xf8, 0x88, 0x62, 0x78,
+0x54, 0x50, 0xc2, 0x23, 0x02, 0x1d, 0xde, 0x8a, 0xb3, 0xbd, 0xf7, 0x77, 0xfb, 0x56, 0xa8, 0x74,
+0x57, 0x75, 0x57, 0x77, 0x57, 0x75, 0xd7, 0xad, 0xfa, 0x7e, 0xce, 0x29, 0x92, 0x74, 0x1a, 0x48,
+0x6e, 0xd5, 0xad, 0xcf, 0xfd, 0xfd, 0x7e, 0xf7, 0xde, 0x0a, 0x31, 0x00, 0x00, 0xb0, 0xc3, 0xc6,
+0x1d, 0x51, 0xfe, 0x67, 0x98, 0x1f, 0xad, 0xf2, 0x95, 0x36, 0xc3, 0x77, 0x23, 0xf2, 0x28, 0x86,
+0x04, 0x3f, 0xe2, 0x86, 0xaf, 0xe9, 0xf3, 0xa9, 0x19, 0xaf, 0x6f, 0xdf, 0x10, 0xc3, 0x89, 0xf0,
+0x0e, 0x21, 0x34, 0x01, 0x00, 0x20, 0x4d, 0x14, 0xba, 0x24, 0x48, 0x18, 0x2d, 0xf2, 0xf3, 0x88,
+0x87, 0x7e, 0x42, 0x5d, 0x28, 0x74, 0x8c, 0x4f, 0x7f, 0xbe, 0x7d, 0x43, 0x02, 0x27, 0x0f, 0x02,
+0x01, 0x00, 0x94, 0x5e, 0x18, 0x51, 0x19, 0x51, 0x44, 0x0d, 0x11, 0x86, 0x6a, 0x68, 0xfc, 0xa0,
+0x08, 0x65, 0x44, 0x7c, 0xdc, 0xbe, 0x21, 0x8e, 0x93, 0x0b, 0x81, 0x00, 0x00, 0x9c, 0x97, 0x06,
+0x49, 0xa2, 0x93, 0x1f, 0x1d, 0x0a, 0x0b, 0xc3, 0x8e, 0x50, 0x7a, 0xb8, 0x48, 0x06, 0x70, 0xc2,
+0xdd, 0x61, 0x0e, 0x9a, 0x00, 0x64, 0x19, 0x95, 0x5a, 0xdd, 0x58, 0xc2, 0x36, 0x6e, 0x3a, 0x31,
+0xcb, 0xef, 0x20, 0x8f, 0x5d, 0x4e, 0x69, 0x6c, 0x92, 0xe2, 0x88, 0x04, 0xe0, 0x37, 0x8e, 0xc8,
+0xeb, 0x14, 0x02, 0x81, 0x40, 0x40, 0x91, 0x37, 0x8f, 0x88, 0xe1, 0xa6, 0x11, 0x95, 0x1f, 0x1b,
+0x0c, 0xaf, 0xd9, 0x91, 0x42, 0x3e, 0x3c, 0x9b, 0xe5, 0x67, 0xc9, 0x26, 0x1b, 0xbd, 0x70, 0x6a,
+0x7c, 0x1d, 0xf9, 0xed, 0xe2, 0xce, 0x7b, 0x97, 0x14, 0x47, 0x04, 0x0d, 0x02, 0x9c, 0x04, 0x29,
+0x2c, 0x7f, 0xdd, 0x2c, 0xa2, 0x06, 0x11, 0xe8, 0x72, 0x88, 0xf8, 0xe8, 0xc6, 0xa1, 0x19, 0x0e,
+0xbd, 0x78, 0x9a, 0x40, 0x44, 0x63, 0x7a, 0x2d, 0xe8, 0xd2, 0x88, 0x06, 0xbc, 0x25, 0x7a, 0xf9,
+0xf5, 0xb1, 0x19, 0x17, 0x04, 0x22, 0x10, 0x30, 0x53, 0x14, 0xba, 0x18, 0xda, 0x7c, 0x26, 0x89,
+0x6c, 0x98, 0xff, 0x9e, 0xa9, 0x88, 0x06, 0x33, 0x73, 0x52, 0xd1, 0xc6, 0xd3, 0x32, 0xe2, 0x08,
+0xa3, 0xa3, 0x00, 0x08, 0x04, 0xb2, 0x88, 0xca, 0x88, 0x42, 0x9f, 0x4e, 0xd9, 0x8a, 0x46, 0x31,
+0x45, 0x9f, 0x49, 0x14, 0x4d, 0x6b, 0x3f, 0xa3, 0x58, 0x46, 0x44, 0xf4, 0xe2, 0xb7, 0x88, 0x25,
+0x75, 0x8d, 0x90, 0x38, 0x3a, 0xbd, 0xf6, 0xa3, 0xcd, 0x0f, 0x57, 0xb1, 0xf9, 0x35, 0x95, 0x19,
+0xaf, 0x9f, 0x1f, 0x9f, 0xc4, 0x15, 0x0b, 0x81, 0x00, 0x17, 0x46, 0x90, 0x51, 0x29, 0x8b, 0x28,
+0x64, 0xe1, 0x92, 0x58, 0x52, 0x11, 0x8b, 0x31, 0x5a, 0x89, 0x29, 0x19, 0xad, 0x94, 0x38, 0x4d,
+0xb5, 0xa8, 0xa1, 0x96, 0xcd, 0x99, 0x57, 0xc1, 0x16, 0x2c, 0x0b, 0xb3, 0x39, 0x73, 0x2b, 0xd8,
+0xad, 0xcb, 0x6e, 0x06, 0x39, 0x0b, 0xf9, 0xf7, 0x9c, 0xe0, 0xd2, 0x99, 0x04, 0xfb, 0xf2, 0xfa,
+0x0d, 0xf1, 0xf9, 0xb5, 0xc4, 0x55, 0x76, 0x6d, 0xea, 0x8a, 0xf8, 0xfc, 0x82, 0x36, 0x09, 0xf1,
+0x78, 0x10, 0xd4, 0x40, 0xbc, 0x21, 0x0c, 0x7d, 0xfe, 0x7d, 0x04, 0x8d, 0x52, 0x56, 0x34, 0x43,
+0xa4, 0xe2, 0x5d, 0xa9, 0xa4, 0xc4, 0xf1, 0xac, 0x5b, 0xd7, 0x0b, 0x49, 0x82, 0x64, 0xb1, 0xe0,
+0xb6, 0xb0, 0xf8, 0x38, 0xcf, 0x22, 0x8a, 0x28, 0x27, 0x17, 0xb8, 0x48, 0xae, 0x4d, 0x71, 0xc1,
+0x24, 0xae, 0x88, 0xcf, 0x2f, 0x1a, 0xc4, 0x93, 0x06, 0x6a, 0x20, 0x10, 0x88, 0x6f, 0x84, 0x11,
+0x96, 0x69, 0x06, 0x08, 0x43, 0x3d, 0xa9, 0x0c, 0x4a, 0xa1, 0xc4, 0xfc, 0x26, 0x0e, 0x12, 0xc6,
+0xd2, 0x55, 0xcb, 0x45, 0x14, 0x21, 0x84, 0xe1, 0x31, 0x59, 0xd8, 0xe5, 0x3a, 0x17, 0xca, 0xc5,
+0xd3, 0x09, 0x21, 0x14, 0x3a, 0x28, 0x9a, 0x81, 0x40, 0x20, 0x10, 0xd5, 0xa5, 0xa1, 0x6f, 0x09,
+0x41, 0xa9, 0x06, 0xa4, 0xa4, 0xfc, 0x41, 0x2c, 0x4d, 0x2a, 0x9a, 0x6a, 0xe2, 0xa0, 0xe8, 0xa2,
+0xae, 0xa5, 0x41, 0x48, 0x83, 0x3e, 0xf7, 0x23, 0x57, 0xcf, 0x5f, 0xd6, 0xb8, 0x44, 0x7a, 0xdf,
+0x7d, 0xaa, 0xbe, 0x1f, 0x97, 0x2c, 0x04, 0xa2, 0x92, 0x34, 0x48, 0x18, 0x1d, 0x4c, 0xe1, 0x05,
+0x5b, 0x74, 0x53, 0xa1, 0x91, 0x69, 0x3a, 0x15, 0x94, 0x03, 0xb7, 0x79, 0xc3, 0xb1, 0xca, 0x57,
+0x5f, 0x37, 0xe4, 0xb6, 0x7d, 0x14, 0xa5, 0x90, 0x54, 0x9c, 0xdd, 0x42, 0x23, 0x75, 0x1d, 0x6d,
+0x71, 0x6a, 0xe0, 0xa1, 0x4b, 0xa3, 0xf6, 0xee, 0xe5, 0x6c, 0x7e, 0xb8, 0xd2, 0x8f, 0x3d, 0x8f,
+0x42, 0x8e, 0x01, 0x29, 0xf6, 0xd8, 0x9e, 0xd5, 0x21, 0x8d, 0x01, 0x08, 0x44, 0x21, 0x69, 0xe8,
+0xab, 0x7c, 0x3d, 0x37, 0xa4, 0x9b, 0x5f, 0x53, 0xc5, 0xe6, 0xf1, 0x9b, 0x46, 0xc5, 0xdc, 0x54,
+0x11, 0x94, 0xa8, 0xe6, 0x37, 0x14, 0xfa, 0x9a, 0x28, 0x67, 0x9e, 0x9b, 0x72, 0xd9, 0xd7, 0x13,
+0x57, 0x6e, 0x7e, 0x2e, 0xe5, 0x72, 0xe9, 0x74, 0x82, 0xdd, 0xf8, 0xfc, 0x86, 0x8a, 0xc2, 0x49,
+0x48, 0xa1, 0x0c, 0x16, 0x24, 0x94, 0x54, 0xd4, 0xba, 0x85, 0x39, 0x50, 0x1c, 0xa7, 0xf3, 0x7e,
+0xc7, 0x57, 0x1a, 0x59, 0xed, 0xaa, 0xe5, 0x9e, 0xab, 0x63, 0x38, 0x04, 0xb5, 0xed, 0x2e, 0x12,
+0xc7, 0x9e, 0x35, 0x21, 0xec, 0x7d, 0x05, 0x81, 0x28, 0x25, 0x0d, 0xcf, 0x6c, 0x0d, 0x31, 0x47,
+0x46, 0x06, 0x74, 0xc3, 0xa0, 0xd1, 0xa5, 0x2e, 0x07, 0xab, 0x48, 0x42, 0x45, 0xa8, 0x48, 0x4a,
+0x79, 0x6d, 0x92, 0xca, 0x65, 0xfe, 0x51, 0x9f, 0xa5, 0x73, 0xc9, 0xba, 0x80, 0xea, 0x35, 0xa1,
+0xec, 0x92, 0x42, 0xd1, 0x2c, 0xae, 0xa7, 0xb0, 0x14, 0x47, 0x57, 0xb1, 0xd7, 0xc2, 0x52, 0x1e,
+0x65, 0x90, 0x38, 0x7c, 0x9a, 0x9e, 0x22, 0x51, 0x6c, 0x93, 0xd2, 0x40, 0x94, 0x01, 0x81, 0x28,
+0x25, 0x8d, 0x30, 0xbb, 0xb9, 0x35, 0x44, 0x59, 0x6a, 0x1a, 0x7a, 0xde, 0x9a, 0x8a, 0x9d, 0xf4,
+0xd1, 0x4f, 0x92, 0x28, 0x06, 0x2a, 0x9c, 0x52, 0x21, 0x95, 0xa4, 0x22, 0x3e, 0xf7, 0x6e, 0xe4,
+0xa2, 0xcd, 0x10, 0x4a, 0x8a, 0x67, 0x58, 0x6a, 0x2d, 0x47, 0xc1, 0x77, 0x7c, 0x1a, 0x3c, 0xd4,
+0x73, 0x69, 0xd4, 0xad, 0x89, 0xf8, 0xf1, 0x7a, 0xa0, 0x36, 0x1b, 0xe0, 0x37, 0xac, 0xad, 0x90,
+0x06, 0x04, 0xa2, 0xa2, 0x38, 0x3a, 0x0d, 0xd1, 0x46, 0x49, 0xa3, 0x8a, 0x85, 0x77, 0xd4, 0x4e,
+0x8b, 0x62, 0x9e, 0x3f, 0xd3, 0x10, 0xee, 0x46, 0x2d, 0x67, 0x13, 0x22, 0x4a, 0x21, 0xa1, 0xd0,
+0xe7, 0x17, 0xbc, 0xb7, 0x96, 0x20, 0x51, 0x8c, 0x38, 0x68, 0x40, 0x71, 0xc7, 0xba, 0x26, 0x56,
+0x7b, 0x77, 0x9d, 0x1f, 0x4f, 0x21, 0xd5, 0x34, 0xb6, 0xed, 0x6d, 0x09, 0x61, 0x43, 0x44, 0x08,
+0x44, 0xd9, 0x68, 0x83, 0x46, 0x86, 0x11, 0xb7, 0xff, 0x3b, 0x5d, 0x12, 0x24, 0x8c, 0xea, 0xdb,
+0x6a, 0x7c, 0x3b, 0x3b, 0xc6, 0x0b, 0x50, 0xa4, 0x42, 0x52, 0xa1, 0xe3, 0xc2, 0x89, 0x49, 0x15,
+0xd2, 0x60, 0x19, 0x50, 0xa4, 0x51, 0xbf, 0xce, 0x97, 0x69, 0x2a, 0xbd, 0x18, 0xde, 0xcb, 0xc5,
+0x81, 0x68, 0x03, 0x02, 0x51, 0x4e, 0x1c, 0x24, 0x8b, 0x67, 0x59, 0x91, 0xb9, 0x68, 0x3b, 0xc2,
+0x20, 0x59, 0xd0, 0x08, 0x92, 0x3e, 0x22, 0x0d, 0xe5, 0x8d, 0x68, 0x45, 0x5f, 0x43, 0x40, 0x62,
+0xf1, 0xa2, 0x54, 0x48, 0x1c, 0x77, 0x3e, 0xda, 0xec, 0xc7, 0x68, 0x94, 0xc4, 0xb1, 0x95, 0x1f,
+0x7d, 0x5c, 0x1c, 0xd8, 0x7d, 0x19, 0x02, 0x51, 0x4e, 0x1c, 0x51, 0x29, 0x8e, 0xa8, 0x1b, 0xff,
+0x3c, 0x09, 0xa2, 0xb6, 0x69, 0xf9, 0xb4, 0x30, 0x90, 0x8e, 0x52, 0x27, 0x52, 0xb9, 0x2c, 0xc5,
+0x42, 0x52, 0x29, 0x17, 0xb7, 0xaf, 0xf6, 0xad, 0x38, 0x88, 0xbe, 0x50, 0x48, 0x44, 0x1c, 0x10,
+0x07, 0x04, 0xa2, 0x9c, 0x38, 0x28, 0xd2, 0x70, 0x65, 0x4f, 0x21, 0x8a, 0x32, 0x28, 0x37, 0xbd,
+0xa4, 0xa9, 0x0e, 0x29, 0x29, 0x9f, 0x40, 0x42, 0x49, 0x88, 0xb4, 0xd7, 0x94, 0x10, 0xca, 0x75,
+0x97, 0x0b, 0xf5, 0x3e, 0x17, 0x47, 0x8c, 0x1f, 0xdd, 0xfb, 0x5a, 0x91, 0xaa, 0x82, 0x40, 0xd4,
+0x14, 0x87, 0xe3, 0x5b, 0x43, 0x90, 0x30, 0x68, 0xb1, 0x16, 0xa2, 0x8c, 0x60, 0x40, 0x69, 0x2e,
+0x12, 0x09, 0x1d, 0x89, 0x13, 0xd3, 0x5b, 0x68, 0x14, 0x0d, 0x5d, 0x3f, 0xcd, 0x3f, 0x58, 0xe7,
+0xd7, 0x6b, 0x28, 0x21, 0xc5, 0x81, 0xe2, 0x38, 0x04, 0xa2, 0x9c, 0x38, 0x28, 0xd2, 0x78, 0xce,
+0x49, 0x71, 0x08, 0x69, 0x34, 0x2d, 0x17, 0x1f, 0x51, 0xcb, 0x80, 0x50, 0x8a, 0x11, 0x0a, 0x89,
+0x63, 0xe5, 0xd7, 0x9b, 0x1d, 0xdb, 0xe1, 0xd6, 0x83, 0x0c, 0x48, 0x79, 0x20, 0x5d, 0x05, 0x81,
+0x28, 0x27, 0x0e, 0xc7, 0x6a, 0x1c, 0xb4, 0x58, 0xef, 0xf6, 0xd5, 0x0d, 0x22, 0xc5, 0xa0, 0xaf,
+0xe8, 0x06, 0x20, 0x1d, 0x5a, 0xf8, 0x98, 0x90, 0x42, 0xa1, 0xe3, 0xb2, 0x85, 0x50, 0xe6, 0xd5,
+0x54, 0x09, 0x71, 0xd4, 0xad, 0x6e, 0xf0, 0x73, 0x73, 0xf4, 0xec, 0x5b, 0x1b, 0xea, 0xc3, 0x55,
+0x01, 0x81, 0xa8, 0x24, 0x0e, 0x8a, 0x34, 0x68, 0x85, 0x6f, 0xd1, 0x6b, 0x38, 0xa8, 0x93, 0x53,
+0x94, 0x51, 0xff, 0x50, 0x13, 0xd2, 0x53, 0xa0, 0x20, 0xa8, 0x30, 0xaf, 0x47, 0x27, 0x93, 0x63,
+0x27, 0xc5, 0x6b, 0x74, 0x3d, 0xd5, 0xaf, 0x6b, 0x12, 0xcf, 0xd9, 0xf0, 0x29, 0x64, 0xcd, 0x9e,
+0x57, 0xd7, 0x86, 0xfa, 0x71, 0x05, 0x40, 0x20, 0xaa, 0x88, 0x83, 0xaa, 0xd6, 0xcf, 0xc8, 0xa8,
+0xa3, 0x28, 0x48, 0x1a, 0xcb, 0x78, 0xa4, 0x51, 0xdb, 0x54, 0x87, 0xab, 0x06, 0x80, 0xfc, 0xe5,
+0xd1, 0xce, 0xe5, 0x81, 0xbd, 0xaa, 0x7c, 0x86, 0x7f, 0x9f, 0x48, 0x98, 0x5a, 0x39, 0x4e, 0x51,
+0x47, 0xa4, 0xe0, 0xc6, 0xe1, 0xa3, 0x41, 0x1a, 0x15, 0xde, 0x7e, 0x7f, 0xe4, 0x66, 0xb4, 0x91,
+0xc4, 0x45, 0x03, 0x40, 0x9e, 0xf4, 0xbc, 0xfa, 0x00, 0xe4, 0x01, 0x81, 0xa8, 0x21, 0x8e, 0x08,
+0x2b, 0x32, 0x5d, 0x55, 0xbd, 0x34, 0x2c, 0x52, 0x0a, 0xb7, 0xfb, 0x3b, 0x17, 0x0d, 0x40, 0x29,
+0xe8, 0xe5, 0xf2, 0xe8, 0x47, 0x33, 0xf8, 0x13, 0x7f, 0xa5, 0xb0, 0x36, 0xee, 0xd0, 0xd3, 0x55,
+0x05, 0x2d, 0xb8, 0x08, 0xd3, 0xec, 0x97, 0x47, 0x9a, 0xc5, 0x2c, 0x18, 0x00, 0x40, 0xd1, 0xc4,
+0xb8, 0x3c, 0xda, 0xd1, 0x0c, 0x88, 0x40, 0xbc, 0x2e, 0x0e, 0x12, 0xc6, 0x4e, 0x56, 0xe0, 0xec,
+0xaa, 0x65, 0xf7, 0x47, 0x84, 0x38, 0xf4, 0x34, 0x55, 0x12, 0x69, 0x2a, 0x00, 0x9c, 0x18, 0x9e,
+0xf6, 0xa0, 0x11, 0x20, 0x10, 0xaf, 0xcb, 0x83, 0x52, 0x55, 0xcf, 0x15, 0x12, 0x75, 0xa4, 0x8b,
+0x03, 0x00, 0xe0, 0x18, 0x03, 0xfb, 0x51, 0xf7, 0x80, 0x40, 0x3c, 0x1e, 0x75, 0x50, 0xba, 0xea,
+0x19, 0x88, 0x03, 0x00, 0xcf, 0xb1, 0x0d, 0x4d, 0x00, 0x81, 0x78, 0x55, 0x1e, 0xad, 0x32, 0xea,
+0xc8, 0xeb, 0x81, 0x4e, 0xe1, 0xfa, 0x5a, 0x16, 0xa1, 0x1a, 0x47, 0xbd, 0xac, 0x71, 0x20, 0x55,
+0x05, 0x80, 0x2b, 0xec, 0xff, 0xcf, 0xe7, 0xb1, 0xf1, 0x1b, 0x04, 0xe2, 0x49, 0x79, 0xe4, 0x9d,
+0xb2, 0xa2, 0xc5, 0x7f, 0xf7, 0x7c, 0xf7, 0x21, 0x21, 0x10, 0x78, 0x03, 0x00, 0x77, 0x49, 0x7c,
+0x22, 0x76, 0x2c, 0xee, 0xe0, 0x47, 0x3f, 0x5a, 0xc3, 0xdf, 0xcc, 0x52, 0x4c, 0x1e, 0x9b, 0x59,
+0xaa, 0x58, 0x6e, 0x4b, 0x1e, 0xb4, 0x8e, 0xa3, 0xf1, 0x1b, 0x2d, 0xec, 0x6b, 0x3f, 0xfd, 0xee,
+0xb4, 0x3c, 0x00, 0x00, 0xee, 0x42, 0x5b, 0xdf, 0x33, 0x9a, 0x46, 0x9f, 0x9a, 0x52, 0x0f, 0x10,
+0x81, 0x94, 0x5d, 0x1c, 0x61, 0x19, 0x75, 0xd8, 0x5e, 0xdb, 0xb1, 0xa4, 0xb1, 0x8e, 0x47, 0x1d,
+0xeb, 0x52, 0x5b, 0x43, 0x20, 0xe4, 0x00, 0xa0, 0x64, 0x18, 0x1e, 0xc2, 0x45, 0x35, 0xca, 0x6e,
+0xb4, 0x08, 0x22, 0x90, 0x72, 0xca, 0x83, 0x46, 0x31, 0xfb, 0xed, 0xca, 0x83, 0xd2, 0x55, 0xad,
+0x1b, 0xdb, 0xd8, 0xfd, 0x9d, 0xeb, 0xfd, 0xbc, 0xaf, 0x10, 0x00, 0x2a, 0xd0, 0x85, 0x28, 0x04,
+0x11, 0x48, 0x39, 0xe5, 0xd1, 0x2a, 0xe5, 0x61, 0x2b, 0x65, 0xb5, 0xe2, 0xc1, 0x26, 0x16, 0x59,
+0xdf, 0x0c, 0x71, 0x00, 0xe0, 0x1d, 0x28, 0x73, 0x80, 0xc5, 0x84, 0x3e, 0x65, 0xb6, 0x1f, 0xe4,
+0x31, 0xef, 0xd6, 0x2a, 0x76, 0x5f, 0xc7, 0x7a, 0x56, 0xd7, 0x72, 0x27, 0x9b, 0x35, 0x7b, 0x36,
+0xce, 0x2a, 0x00, 0x65, 0xe4, 0xfa, 0xc5, 0xab, 0xec, 0xdc, 0x91, 0x09, 0xfd, 0xcb, 0x08, 0xbb,
+0xff, 0xa9, 0x29, 0xf6, 0xc1, 0x8e, 0xb7, 0xd0, 0x32, 0xfe, 0xc3, 0x9b, 0x29, 0xac, 0xd4, 0x93,
+0x02, 0x0f, 0xd9, 0x91, 0x07, 0xd5, 0x3a, 0x1e, 0xfc, 0xc9, 0xe3, 0x28, 0x92, 0x03, 0xe0, 0x11,
+0xaa, 0x6b, 0x6b, 0xd2, 0x5f, 0x7a, 0x56, 0x0e, 0x08, 0x01, 0x04, 0x52, 0x12, 0x79, 0x3c, 0x97,
+0xeb, 0x6d, 0x94, 0xa6, 0x5a, 0xf5, 0x27, 0xeb, 0x44, 0xe4, 0x81, 0x94, 0x15, 0x00, 0x1e, 0x12,
+0xc8, 0xd2, 0x70, 0x7a, 0x9f, 0x4c, 0x4d, 0x82, 0x49, 0x4d, 0x86, 0x01, 0x10, 0x48, 0x79, 0xe5,
+0x51, 0x5d, 0x1b, 0x66, 0x2d, 0x4f, 0xb5, 0xb1, 0x65, 0xf7, 0x61, 0xb7, 0x5c, 0x00, 0xbc, 0xc8,
+0x92, 0xc6, 0xe5, 0xe9, 0x2f, 0xb5, 0xda, 0xe9, 0xdb, 0x40, 0x2d, 0xbc, 0xb3, 0x1b, 0xaf, 0x4d,
+0x79, 0xdc, 0x76, 0x5f, 0x84, 0xdd, 0x15, 0x6d, 0x41, 0xd4, 0xe1, 0x1d, 0x68, 0xbf, 0x23, 0xb3,
+0x67, 0xb4, 0xd2, 0x6b, 0x23, 0x39, 0xfe, 0x6e, 0x9b, 0xc5, 0xeb, 0x61, 0x96, 0xe7, 0x2e, 0x03,
+0xc0, 0x5b, 0x4c, 0x7d, 0x3a, 0xc9, 0x46, 0x7e, 0x39, 0x68, 0xf6, 0xad, 0x7e, 0xb6, 0x7d, 0x03,
+0xa6, 0xf6, 0x42, 0x20, 0x8e, 0xca, 0x83, 0xa6, 0xe8, 0xee, 0xcc, 0xf5, 0x36, 0x12, 0xc7, 0xf2,
+0x07, 0x9a, 0x70, 0xd6, 0xdc, 0x27, 0x66, 0x90, 0xc3, 0x94, 0x94, 0x81, 0xbe, 0x31, 0x9e, 0xf6,
+0xda, 0x57, 0x43, 0x5a, 0x29, 0x7f, 0x98, 0xc7, 0xde, 0x4e, 0xa6, 0x0b, 0x25, 0x2a, 0x3f, 0xd6,
+0x18, 0x5e, 0x6f, 0x65, 0x05, 0x6e, 0xe3, 0x0f, 0xdc, 0xe1, 0xf7, 0xff, 0xfd, 0x12, 0xbb, 0x7e,
+0xf1, 0x0a, 0x24, 0x02, 0x81, 0xb8, 0x2a, 0x8f, 0x9c, 0xb3, 0xad, 0x28, 0xda, 0xa0, 0x5a, 0x47,
+0xcd, 0x0a, 0x14, 0xca, 0x1d, 0x8e, 0x1c, 0x34, 0x19, 0x25, 0x68, 0xf2, 0x88, 0x73, 0x39, 0x24,
+0x54, 0xfe, 0xa5, 0xb8, 0x6c, 0x22, 0x2c, 0xf5, 0x14, 0x4a, 0xfd, 0x68, 0x48, 0xfb, 0x1a, 0x94,
+0x88, 0x33, 0x1f, 0x8c, 0xb3, 0xc3, 0x2f, 0x1f, 0xb4, 0xfa, 0x36, 0x24, 0x02, 0x81, 0xb8, 0x2f,
+0x0f, 0x9a, 0xa2, 0xdb, 0xfc, 0xc4, 0xc3, 0xa2, 0xee, 0x01, 0x8a, 0x8a, 0x28, 0xe2, 0x52, 0x16,
+0xf1, 0xd7, 0xbe, 0x16, 0xdc, 0x6d, 0xb6, 0x1f, 0x7b, 0x2b, 0xd9, 0x2a, 0x45, 0xd2, 0x6a, 0x90,
+0x4b, 0x14, 0x97, 0x88, 0x3b, 0xfc, 0xe1, 0x67, 0x7b, 0xd9, 0xe5, 0xc9, 0x04, 0x24, 0x02, 0x81,
+0x38, 0x2e, 0x8f, 0xb0, 0x94, 0x87, 0x65, 0xae, 0xbb, 0x8a, 0x8a, 0xe5, 0x1b, 0xda, 0x50, 0xef,
+0xc8, 0x8f, 0x84, 0x14, 0x06, 0x25, 0xa0, 0x63, 0x41, 0x96, 0x45, 0x9e, 0x62, 0x89, 0x18, 0x64,
+0xd2, 0x62, 0x90, 0x0c, 0x28, 0xe6, 0x62, 0xfc, 0x74, 0x92, 0xbd, 0xbb, 0x63, 0x30, 0xdb, 0x5b,
+0x06, 0x18, 0x6d, 0x77, 0xb2, 0x7d, 0x43, 0x02, 0xad, 0x05, 0x81, 0xe4, 0x23, 0x90, 0xfd, 0xd9,
+0x46, 0x7e, 0x94, 0xae, 0x6a, 0x7e, 0x02, 0x53, 0x74, 0x6d, 0x32, 0xa0, 0x0b, 0xe3, 0x75, 0x08,
+0xc3, 0x51, 0x1e, 0x7d, 0x2b, 0x19, 0x95, 0x22, 0x69, 0x91, 0x1f, 0x21, 0x95, 0x3c, 0x39, 0x16,
+0x1b, 0x61, 0x27, 0x0f, 0x8d, 0x65, 0x7b, 0x4b, 0x5c, 0x4a, 0x04, 0xd7, 0x2e, 0x04, 0x62, 0x4b,
+0x1e, 0x9b, 0x59, 0x6a, 0xa3, 0x35, 0x53, 0x6e, 0x6b, 0x8e, 0xb0, 0xbb, 0xbf, 0xfd, 0x10, 0xce,
+0x8e, 0x35, 0x9a, 0x88, 0x32, 0x42, 0x6c, 0x17, 0x17, 0xc6, 0x00, 0x9a, 0xa3, 0x2c, 0x52, 0x89,
+0xb2, 0xe4, 0xb4, 0x54, 0x22, 0x68, 0x15, 0x6b, 0xbe, 0xfc, 0xfc, 0x06, 0x7b, 0xf7, 0xf9, 0x41,
+0x76, 0x65, 0x32, 0x91, 0x2b, 0x72, 0x26, 0x89, 0xe0, 0x7a, 0x86, 0x40, 0xb2, 0xca, 0x83, 0x3a,
+0xdf, 0x7e, 0xc8, 0xa3, 0x20, 0x69, 0x50, 0xe7, 0xda, 0xf6, 0xfa, 0xc3, 0x88, 0x32, 0x3c, 0x25,
+0x94, 0x37, 0x45, 0xfa, 0x2b, 0x2a, 0xa3, 0x94, 0x28, 0xa2, 0x94, 0x4c, 0x48, 0x1e, 0x24, 0x11,
+0x92, 0x49, 0x0e, 0xfa, 0xb8, 0x44, 0xf0, 0x2c, 0x75, 0x08, 0xc4, 0x54, 0x1e, 0x54, 0xf7, 0x38,
+0xce, 0x2c, 0x8a, 0xe6, 0x90, 0x87, 0x29, 0xfd, 0xfc, 0xd8, 0xc5, 0xa5, 0x81, 0x91, 0x99, 0x3a,
+0x42, 0x09, 0x4b, 0x91, 0xb4, 0x41, 0x28, 0x37, 0x39, 0x77, 0x74, 0x82, 0x8d, 0xbe, 0x38, 0x64,
+0xe7, 0xad, 0x31, 0x7e, 0x3c, 0x89, 0xba, 0x08, 0x04, 0x92, 0x2e, 0x10, 0x5a, 0xeb, 0xd1, 0x69,
+0x25, 0x8f, 0x26, 0xc8, 0xc3, 0x18, 0x6d, 0xf4, 0x52, 0xc4, 0x71, 0xe0, 0xe1, 0x10, 0x3a, 0x91,
+0xe2, 0x7c, 0x1d, 0x42, 0x99, 0xe6, 0xec, 0xe8, 0x38, 0xfb, 0xf8, 0x95, 0x83, 0x76, 0xde, 0x4a,
+0xd7, 0x7d, 0x3b, 0xea, 0x22, 0x10, 0x88, 0x2e, 0x8f, 0x2e, 0x66, 0xb1, 0xd2, 0x5c, 0xc8, 0xe3,
+0x5b, 0x90, 0x07, 0x4b, 0xa5, 0xa8, 0xb6, 0x1e, 0x58, 0x1f, 0x8a, 0xa1, 0x29, 0x7c, 0x2c, 0x94,
+0xa1, 0xe9, 0x94, 0x57, 0x9b, 0x1c, 0x50, 0x05, 0x6a, 0x8e, 0xba, 0x90, 0xc8, 0x9e, 0x83, 0x76,
+0xdf, 0x4e, 0x75, 0x91, 0x7e, 0x5c, 0x35, 0x41, 0x16, 0x48, 0x96, 0xd4, 0x15, 0x4d, 0xd5, 0x5d,
+0xfd, 0x67, 0x81, 0x9f, 0xaa, 0x4b, 0x1d, 0xa4, 0x97, 0x8b, 0x43, 0xc3, 0x25, 0x19, 0x48, 0xa1,
+0xb4, 0x4a, 0x91, 0x74, 0x04, 0x25, 0x3a, 0xc9, 0x53, 0x22, 0xa8, 0x8b, 0x04, 0x5c, 0x20, 0x14,
+0x79, 0x74, 0x41, 0x1e, 0x10, 0x07, 0xb0, 0x1d, 0x9d, 0x74, 0xb0, 0x3c, 0x1e, 0xe1, 0x1c, 0x00,
+0x89, 0x50, 0x54, 0x8e, 0xba, 0x48, 0xe0, 0x04, 0x62, 0x31, 0xeb, 0x8a, 0xa4, 0x71, 0xff, 0x9f,
+0xb6, 0x09, 0x89, 0x04, 0x55, 0x1c, 0x6f, 0x3c, 0x02, 0x71, 0x80, 0xec, 0x3c, 0xf2, 0x46, 0xb2,
+0xd3, 0x20, 0x13, 0xdf, 0x75, 0x96, 0xf3, 0xc7, 0x26, 0xd8, 0x18, 0x97, 0x88, 0x8d, 0xd9, 0x59,
+0x44, 0x5c, 0x4a, 0x04, 0xfd, 0x26, 0x40, 0x02, 0x31, 0x5d, 0x30, 0x78, 0x3f, 0x8f, 0x3c, 0x6a,
+0x96, 0x07, 0x6e, 0x6f, 0x2b, 0x1a, 0x45, 0xf5, 0x70, 0x71, 0xa0, 0x30, 0x08, 0x20, 0x13, 0x09,
+0x4d, 0xf1, 0x1d, 0xdb, 0x3b, 0x9c, 0x6b, 0x9d, 0x88, 0x0e, 0x8a, 0xeb, 0x81, 0x11, 0x88, 0x45,
+0xe1, 0x7c, 0xe5, 0xa3, 0x2d, 0xac, 0xae, 0x35, 0x50, 0xbb, 0xea, 0x6a, 0xbc, 0xa5, 0xbb, 0xb9,
+0x38, 0x62, 0xb8, 0xe4, 0x80, 0x63, 0x32, 0x49, 0xfa, 0x47, 0x26, 0x14, 0x81, 0x1c, 0x7f, 0x7d,
+0x84, 0x9d, 0xfd, 0xd0, 0x76, 0x70, 0x81, 0xe2, 0x7a, 0x00, 0x04, 0x42, 0x85, 0xf3, 0x88, 0xf1,
+0xa5, 0x45, 0x77, 0xd6, 0xb1, 0x7b, 0xbf, 0xbf, 0x3e, 0x48, 0x6d, 0xdc, 0xfb, 0xc6, 0xd7, 0x43,
+0x9b, 0x71, 0xa9, 0x01, 0xd7, 0x64, 0x72, 0xc0, 0x3f, 0x91, 0xc9, 0x44, 0x7c, 0x4c, 0x88, 0xc4,
+0x6e, 0xdf, 0xe2, 0x12, 0x41, 0xdf, 0xf2, 0xa5, 0x40, 0x4c, 0xa2, 0x0f, 0xaa, 0x7b, 0x3c, 0xb8,
+0xe9, 0x7b, 0x41, 0x29, 0x9a, 0x53, 0xb4, 0xd1, 0xcd, 0xe5, 0xa1, 0xe1, 0x32, 0x03, 0x25, 0x12,
+0x49, 0x58, 0x4a, 0x64, 0x13, 0x53, 0x78, 0x87, 0xe1, 0x2b, 0x9f, 0x25, 0xd8, 0xfb, 0xbf, 0x1e,
+0xb4, 0x5b, 0x17, 0xc1, 0x8e, 0xbe, 0x3e, 0x15, 0x48, 0x46, 0xed, 0x83, 0x8a, 0xe6, 0xb7, 0xfa,
+0xbf, 0xee, 0x41, 0x39, 0xda, 0xde, 0xa1, 0xaf, 0x87, 0xfa, 0x70, 0x79, 0x81, 0x72, 0xb1, 0xfe,
+0x80, 0x98, 0xcd, 0xd5, 0x25, 0x65, 0x12, 0x51, 0xed, 0xe7, 0x27, 0x79, 0x7c, 0xc0, 0x25, 0x42,
+0x32, 0xb1, 0x39, 0x58, 0xc3, 0x0c, 0x2d, 0xdf, 0x08, 0xc4, 0x64, 0xe6, 0xd5, 0xed, 0x2d, 0x4d,
+0xa2, 0xf6, 0xe1, 0x73, 0xc4, 0xae, 0xa2, 0x43, 0x8f, 0xa2, 0x48, 0x0e, 0x3c, 0x24, 0x93, 0xd7,
+0xa7, 0x53, 0x5c, 0x5d, 0xaa, 0xfd, 0xec, 0x47, 0xf6, 0x0d, 0xdb, 0xad, 0x8b, 0x50, 0x9f, 0x6b,
+0x87, 0x44, 0xfc, 0x21, 0x90, 0x19, 0xeb, 0x3e, 0x28, 0x65, 0xf5, 0xc0, 0x4f, 0x7c, 0x9f, 0xba,
+0xea, 0xe7, 0xe2, 0x40, 0x28, 0x0d, 0xbc, 0x2c, 0x12, 0x4a, 0x71, 0x3d, 0xa3, 0x5a, 0x54, 0x72,
+0xf6, 0xa3, 0x71, 0x76, 0x64, 0xaf, 0xad, 0xf5, 0x22, 0x9a, 0x8c, 0x44, 0x30, 0x80, 0x53, 0x56,
+0x20, 0xa9, 0x55, 0xe7, 0x17, 0x8c, 0x2f, 0x35, 0x3e, 0xbe, 0x8e, 0x2d, 0xbd, 0xa7, 0xc1, 0xaf,
+0x6d, 0x48, 0x23, 0x9e, 0x1e, 0x2e, 0x8f, 0x7e, 0x5c, 0x4e, 0x40, 0xb1, 0xa8, 0xe4, 0x69, 0xa6,
+0x48, 0xad, 0xe4, 0xe2, 0xc9, 0x49, 0xf6, 0xd1, 0xee, 0x21, 0x3b, 0x75, 0x11, 0x4c, 0xf3, 0x55,
+0x5c, 0x20, 0x14, 0x79, 0x4c, 0x17, 0xcf, 0xa9, 0xe6, 0x71, 0x5f, 0x67, 0x9b, 0x9f, 0xe5, 0xd1,
+0xfe, 0xe6, 0x63, 0x48, 0x59, 0x01, 0x35, 0x79, 0xf8, 0x35, 0x51, 0x2b, 0x79, 0x96, 0x29, 0x90,
+0xde, 0xa2, 0x7a, 0xc8, 0xd1, 0x7d, 0xc3, 0x76, 0xea, 0x22, 0x09, 0x19, 0x89, 0xc4, 0x70, 0x86,
+0xdd, 0x65, 0x96, 0x0b, 0xff, 0xe6, 0xd3, 0xc6, 0x2f, 0xea, 0xd7, 0x35, 0xfb, 0xb5, 0xed, 0x48,
+0x1a, 0x2b, 0x21, 0x0f, 0xa0, 0x32, 0xfc, 0xfa, 0xd5, 0xf8, 0x41, 0xa9, 0xd7, 0x85, 0x2c, 0xb5,
+0x03, 0xb4, 0x67, 0x6b, 0x08, 0x55, 0x4b, 0xc2, 0xac, 0xb9, 0xd3, 0xd6, 0x44, 0x9c, 0xd4, 0xe3,
+0xb2, 0x53, 0x83, 0x59, 0xa0, 0x4c, 0x04, 0xb2, 0x71, 0x07, 0x8d, 0x66, 0x8e, 0xeb, 0x5f, 0xd6,
+0xde, 0x13, 0x61, 0x8d, 0xdf, 0xf4, 0xe5, 0x2e, 0xbb, 0x71, 0x19, 0x79, 0xa0, 0x60, 0x07, 0xfc,
+0x16, 0x91, 0xe8, 0x53, 0x81, 0x29, 0x2a, 0x89, 0x78, 0xf5, 0xe7, 0xa4, 0xe2, 0xfa, 0xe4, 0x47,
+0x9a, 0x9d, 0xb7, 0x62, 0xc1, 0xa1, 0x42, 0x11, 0x48, 0x34, 0x23, 0xfa, 0x48, 0x32, 0xbf, 0x1d,
+0x90, 0x07, 0xf0, 0x73, 0x44, 0x92, 0xe0, 0x47, 0x3f, 0x3f, 0x56, 0x8a, 0x9b, 0x6f, 0x92, 0x69,
+0x5e, 0xec, 0x87, 0x8d, 0xdf, 0x78, 0xc8, 0x6e, 0x76, 0xe3, 0x39, 0xf9, 0x08, 0x6d, 0xa0, 0x80,
+0x40, 0x3a, 0x8c, 0xd1, 0xc7, 0xdc, 0x05, 0x95, 0x88, 0x3c, 0x00, 0x50, 0x57, 0x26, 0xfd, 0x6f,
+0xb6, 0x49, 0x91, 0xa4, 0x66, 0x38, 0x79, 0x8a, 0x15, 0x5c, 0x20, 0x8d, 0xdf, 0x58, 0x67, 0xe7,
+0xad, 0xcf, 0xca, 0x99, 0xa1, 0xc0, 0x61, 0x9c, 0x4e, 0x61, 0x25, 0xf5, 0x4f, 0xd7, 0x3c, 0xf5,
+0x38, 0xab, 0x5c, 0xe2, 0xab, 0xcd, 0x43, 0x85, 0x3c, 0xde, 0x6a, 0x83, 0x3c, 0x40, 0x30, 0xf9,
+0xda, 0x60, 0xb2, 0x8b, 0x79, 0x30, 0xb5, 0x75, 0x71, 0x62, 0x92, 0x7d, 0xfc, 0x92, 0xad, 0x19,
+0x5a, 0x58, 0xb5, 0xee, 0xd9, 0x08, 0x24, 0xb5, 0x78, 0x50, 0x70, 0x6b, 0x5d, 0x2d, 0xe4, 0x01,
+0x80, 0xcf, 0xe0, 0xd7, 0x7f, 0xff, 0x5b, 0x1e, 0x8c, 0x48, 0xe8, 0x7e, 0xd3, 0xdc, 0x61, 0xeb,
+0xb9, 0x42, 0x5d, 0x88, 0x44, 0xbc, 0x2a, 0x10, 0x43, 0xfd, 0x83, 0xd2, 0x57, 0x3e, 0xaa, 0x79,
+0x24, 0xf8, 0xd1, 0x0d, 0x79, 0x00, 0x90, 0x26, 0x92, 0x24, 0xeb, 0x91, 0xfd, 0xa3, 0xec, 0xfd,
+0xb4, 0x72, 0x71, 0x98, 0xad, 0xde, 0xf0, 0x2d, 0x31, 0x53, 0xcb, 0x86, 0x44, 0xf6, 0xcb, 0xf5,
+0x6a, 0xc0, 0x43, 0x02, 0x11, 0x8b, 0x3d, 0x68, 0x14, 0x50, 0xbb, 0xca, 0x57, 0x8b, 0x06, 0xbb,
+0xdf, 0x8a, 0x62, 0xaa, 0x2e, 0x00, 0x19, 0x22, 0x89, 0x8a, 0xfd, 0xde, 0x28, 0x22, 0xf1, 0xc4,
+0xf4, 0x5f, 0xaa, 0xb9, 0x36, 0x3f, 0xd1, 0x66, 0x47, 0x22, 0x34, 0xd8, 0x85, 0x44, 0x1c, 0xc0,
+0xb9, 0x1a, 0xc8, 0xc6, 0x1d, 0xb4, 0xfa, 0x3c, 0x5c, 0xbb, 0x2a, 0xc2, 0xee, 0xfc, 0x86, 0x6f,
+0xa6, 0xee, 0xf6, 0xbd, 0x1d, 0x0d, 0x95, 0xfe, 0x59, 0xcc, 0xa9, 0xe9, 0xd0, 0x11, 0x8b, 0xef,
+0x66, 0xfb, 0x5e, 0xa1, 0x68, 0x59, 0x52, 0x12, 0x1a, 0x9e, 0x00, 0x07, 0x72, 0xf1, 0xd5, 0x98,
+0x77, 0x16, 0x24, 0xfe, 0xf1, 0xf3, 0x1b, 0xec, 0xe8, 0xfe, 0x83, 0xec, 0xc2, 0xf1, 0x89, 0x5c,
+0x6f, 0xc5, 0xfe, 0x59, 0x9e, 0x10, 0x88, 0x61, 0xfd, 0xc7, 0xea, 0x0d, 0x8f, 0x8b, 0x70, 0xd2,
+0x07, 0xc4, 0xdf, 0x6e, 0x0f, 0xad, 0x2d, 0xb0, 0x3d, 0xa8, 0x01, 0x5a, 0xd3, 0x46, 0x3c, 0x3a,
+0xb4, 0xa3, 0x64, 0xd8, 0x65, 0x21, 0xb8, 0xde, 0x36, 0x69, 0x23, 0x4e, 0xfa, 0x7a, 0xca, 0xe4,
+0x7b, 0x71, 0x74, 0xce, 0x80, 0x89, 0x64, 0x7f, 0x92, 0xae, 0xf5, 0x2d, 0x69, 0xd7, 0x7f, 0x59,
+0x38, 0xb6, 0x7f, 0x98, 0x4d, 0x1e, 0xd6, 0xec, 0x5c, 0xcb, 0x90, 0x48, 0x99, 0x05, 0x42, 0x0b,
+0x8f, 0x76, 0xce, 0x5d, 0x50, 0xc5, 0x5a, 0x7f, 0xfc, 0x5d, 0xbf, 0xb4, 0xcd, 0x5a, 0x2e, 0x90,
+0x78, 0x16, 0x31, 0xe8, 0x52, 0x68, 0x30, 0x08, 0x20, 0x8a, 0x4b, 0xca, 0x94, 0x84, 0xec, 0xa8,
+0xc4, 0xa0, 0xfc, 0x18, 0x13, 0x7f, 0x62, 0xbb, 0x09, 0xbf, 0x8a, 0xe4, 0x19, 0x19, 0x91, 0x94,
+0x75, 0x34, 0x09, 0x89, 0xa8, 0x21, 0x90, 0xcd, 0x74, 0xb1, 0x2c, 0x5b, 0xd3, 0xc4, 0x1a, 0xd6,
+0xab, 0xbf, 0x65, 0xfb, 0x05, 0x6d, 0x22, 0xfe, 0xf1, 0xef, 0x86, 0x76, 0xf1, 0x4f, 0x6b, 0xa4,
+0x30, 0xc2, 0x5e, 0x18, 0x51, 0xf9, 0x9c, 0x98, 0x14, 0xcd, 0xc8, 0x74, 0x14, 0x03, 0xb9, 0xa8,
+0x2e, 0x91, 0xb0, 0x8c, 0x46, 0xba, 0xca, 0xf9, 0x73, 0x9c, 0x7e, 0x6f, 0x8c, 0x8d, 0xbf, 0x91,
+0xf3, 0x29, 0x87, 0x90, 0x48, 0x19, 0x05, 0x22, 0x1e, 0x1e, 0x75, 0xf7, 0x77, 0xd6, 0xb3, 0x85,
+0x91, 0x3a, 0xa5, 0x1b, 0xe4, 0x8f, 0x5f, 0xdc, 0x60, 0x87, 0xfe, 0x77, 0xb7, 0xc8, 0xa3, 0x02,
+0x4f, 0xa0, 0xc9, 0xce, 0xad, 0x8b, 0x25, 0x8e, 0x9a, 0x8c, 0x72, 0x22, 0x89, 0xb2, 0xa4, 0xd8,
+0x60, 0x35, 0x52, 0xae, 0x9f, 0x61, 0xf2, 0xf0, 0x38, 0x3b, 0x16, 0xcb, 0xb9, 0x25, 0x3c, 0x24,
+0x52, 0x26, 0x81, 0x88, 0x67, 0x9f, 0x7f, 0xe5, 0x1f, 0xfe, 0x5c, 0xf9, 0x06, 0x39, 0xf9, 0xce,
+0x28, 0x3b, 0x39, 0x3c, 0x8a, 0x2b, 0x43, 0x8d, 0x88, 0x45, 0x17, 0x4b, 0x0c, 0x52, 0xf1, 0x3e,
+0x5f, 0x79, 0x35, 0x29, 0x32, 0x15, 0xe5, 0xfa, 0xff, 0x3f, 0x83, 0x44, 0x3c, 0x28, 0x10, 0xf9,
+0xfc, 0x0f, 0x5a, 0xcc, 0x73, 0xcf, 0x0f, 0xd5, 0xde, 0xb6, 0x9d, 0xa2, 0x8e, 0x38, 0x45, 0x1f,
+0x5f, 0x20, 0xfa, 0x50, 0x90, 0x84, 0x94, 0x8a, 0x2e, 0x94, 0x18, 0x9a, 0xc4, 0x93, 0x12, 0xa1,
+0x54, 0x30, 0x45, 0x23, 0x65, 0x49, 0x09, 0x93, 0x44, 0xc6, 0x87, 0xe2, 0xb9, 0xfa, 0x38, 0x24,
+0x52, 0x42, 0x81, 0x44, 0xf9, 0x9f, 0xfb, 0x97, 0x3f, 0xd8, 0xcc, 0xe8, 0x50, 0x19, 0xca, 0x95,
+0x9e, 0x78, 0x73, 0x04, 0x57, 0x85, 0xbf, 0xa2, 0x94, 0x41, 0x08, 0xc5, 0x83, 0x22, 0xd9, 0x57,
+0xbe, 0x68, 0xe4, 0xea, 0xb9, 0x04, 0xfb, 0xf0, 0xc5, 0xc1, 0x5c, 0x12, 0x19, 0xe0, 0xd7, 0xcc,
+0x93, 0x38, 0x53, 0xee, 0x0b, 0x44, 0x5c, 0x08, 0xf7, 0xf2, 0xe8, 0x63, 0xc1, 0xed, 0xb5, 0x4a,
+0x37, 0xc6, 0xc8, 0xcf, 0x5f, 0x62, 0x9f, 0x5f, 0xba, 0x82, 0xab, 0xc2, 0xff, 0x42, 0x19, 0xc0,
+0x13, 0xeb, 0x3c, 0x21, 0x91, 0xb2, 0x45, 0x23, 0x36, 0x25, 0x82, 0xbd, 0xb3, 0x4a, 0x20, 0x90,
+0x9d, 0xfc, 0xcf, 0xce, 0x07, 0xba, 0x3a, 0xd8, 0xec, 0x5b, 0xd4, 0x7d, 0xe6, 0x39, 0x5d, 0x50,
+0x1f, 0xfc, 0x6a, 0xaf, 0x27, 0x7e, 0x96, 0x05, 0x75, 0xe6, 0x22, 0x9e, 0xc3, 0xdb, 0xd7, 0xad,
+0x35, 0x36, 0xf4, 0xfb, 0x7f, 0x69, 0xd1, 0x99, 0x2e, 0x4d, 0x4c, 0xfa, 0xf1, 0xda, 0x4f, 0x08,
+0x91, 0xdc, 0x14, 0x0a, 0xd2, 0x15, 0x65, 0x8c, 0x46, 0x92, 0x65, 0x88, 0x46, 0xe8, 0x9a, 0xff,
+0x08, 0x12, 0x29, 0xbb, 0x40, 0x2e, 0xcc, 0x5d, 0x50, 0x15, 0x5e, 0xf3, 0x17, 0x6a, 0xaf, 0xff,
+0x98, 0xf8, 0xc3, 0xa8, 0x28, 0xa0, 0x3b, 0x01, 0xad, 0x87, 0xb9, 0xa5, 0xba, 0x72, 0xfa, 0x73,
+0xe3, 0xb6, 0xf6, 0xe9, 0x51, 0x9a, 0x8a, 0x51, 0x1b, 0x75, 0x38, 0xea, 0x7c, 0x3a, 0x9f, 0x5f,
+0xba, 0xca, 0xbe, 0xb8, 0x7c, 0x65, 0xfa, 0x73, 0x3d, 0x8a, 0xfb, 0xe2, 0xf2, 0x55, 0x95, 0x22,
+0x3a, 0x8a, 0x4e, 0x76, 0x49, 0x99, 0x68, 0xb8, 0x35, 0x94, 0x96, 0x75, 0x7b, 0xc5, 0x02, 0xc4,
+0x92, 0xcf, 0xd4, 0x12, 0x12, 0xf9, 0x0d, 0x24, 0x52, 0x1e, 0x81, 0xc8, 0xe7, 0x9f, 0xd3, 0xd4,
+0xdd, 0xc6, 0x6f, 0xad, 0x57, 0xba, 0x21, 0xe8, 0x22, 0xba, 0x74, 0x6a, 0xd2, 0x96, 0x18, 0x68,
+0xbf, 0x2f, 0x3d, 0x12, 0x98, 0xbf, 0x28, 0x2c, 0xbe, 0x9e, 0xed, 0x62, 0x74, 0xa0, 0x3a, 0x46,
+0xe1, 0xd0, 0x47, 0xfd, 0x6b, 0xda, 0x7e, 0x5b, 0xff, 0xda, 0x63, 0xc4, 0xa5, 0x50, 0xb6, 0x21,
+0xd5, 0x55, 0x52, 0x89, 0x84, 0xa5, 0x44, 0x3a, 0x3d, 0x28, 0x11, 0x3c, 0xd9, 0xd0, 0x05, 0x81,
+0x88, 0xe9, 0xbb, 0x54, 0x3c, 0xaf, 0x7b, 0x40, 0xed, 0x02, 0xfa, 0xc1, 0xff, 0x7a, 0x7e, 0x3a,
+0x22, 0xd0, 0x05, 0x71, 0x4b, 0x75, 0x2a, 0x7a, 0xd0, 0x3f, 0x02, 0xf7, 0x20, 0x79, 0x93, 0x50,
+0xae, 0x9d, 0x4f, 0x4c, 0x47, 0x31, 0xb9, 0x84, 0x5e, 0x22, 0x34, 0x96, 0x4a, 0x75, 0x41, 0x26,
+0xa5, 0x13, 0x09, 0xad, 0x62, 0xdf, 0x02, 0x89, 0xf8, 0x59, 0x20, 0x1b, 0x77, 0x4c, 0x9f, 0xe4,
+0x55, 0xdf, 0x57, 0xbf, 0x80, 0x4e, 0x17, 0x8e, 0xca, 0x35, 0x1c, 0xbf, 0xa2, 0xa7, 0xc1, 0x48,
+0x26, 0xf4, 0x39, 0x75, 0x74, 0x63, 0xfa, 0xac, 0x0c, 0x91, 0xc9, 0x36, 0x86, 0x34, 0x57, 0x29,
+0x24, 0xd2, 0x9a, 0x4c, 0x32, 0xaa, 0xaf, 0x46, 0x4a, 0x29, 0x91, 0xc3, 0xbf, 0xcd, 0x29, 0x91,
+0x76, 0xcc, 0xe8, 0x2b, 0x56, 0x20, 0xa9, 0xcd, 0x13, 0x0f, 0x31, 0xb9, 0xcf, 0xcd, 0x9a, 0xbf,
+0xf8, 0xde, 0x74, 0xce, 0x1f, 0x80, 0x52, 0x45, 0x2c, 0xd4, 0xe1, 0xaf, 0x9d, 0x9f, 0x2a, 0x97,
+0x54, 0x62, 0x06, 0x99, 0xa0, 0x00, 0xef, 0x02, 0x0f, 0xed, 0x29, 0x7d, 0x4a, 0xcb, 0x86, 0x44,
+0x12, 0x52, 0x22, 0x88, 0x46, 0x8b, 0x10, 0x08, 0xc9, 0x43, 0x4c, 0xbd, 0xa3, 0x51, 0xfb, 0xda,
+0x9f, 0x74, 0xa0, 0x25, 0x41, 0xd9, 0x23, 0x48, 0xea, 0xfc, 0x24, 0x16, 0xfd, 0x28, 0x11, 0xfa,
+0x6c, 0xae, 0x6d, 0x18, 0x99, 0xba, 0x26, 0x92, 0xcd, 0xac, 0x84, 0xb3, 0xb4, 0x6c, 0x4a, 0x64,
+0x25, 0x06, 0x0e, 0x85, 0x08, 0x64, 0xe3, 0x0e, 0x4a, 0x5b, 0x3d, 0xa3, 0x7f, 0x49, 0xa9, 0x2b,
+0x4a, 0x61, 0x01, 0xe0, 0x35, 0xd2, 0x85, 0x52, 0x82, 0x62, 0xbd, 0xc6, 0x8f, 0xad, 0x2c, 0x35,
+0x6b, 0x07, 0x51, 0x89, 0xb3, 0x12, 0xe9, 0x94, 0xd1, 0x48, 0xb8, 0x54, 0xd7, 0xce, 0xe8, 0xce,
+0xac, 0xd3, 0xfa, 0xb1, 0x5a, 0x3d, 0x6f, 0x81, 0xc8, 0x6d, 0xdb, 0x8d, 0x2f, 0x51, 0xf1, 0xbc,
+0x6e, 0x6d, 0x33, 0xae, 0x70, 0xe0, 0x79, 0x84, 0x48, 0x4e, 0x97, 0x2c, 0x42, 0xe9, 0x47, 0x54,
+0xe2, 0xb0, 0x44, 0x5e, 0x29, 0xed, 0xc2, 0xc3, 0x73, 0x63, 0xe3, 0xec, 0xf8, 0x6b, 0x59, 0xf7,
+0xce, 0x0a, 0xfc, 0x6a, 0x75, 0xfb, 0x02, 0xd9, 0xb8, 0x83, 0x4e, 0xda, 0xfe, 0xf4, 0x11, 0xc0,
+0x5d, 0x8f, 0xaf, 0x67, 0xe1, 0x86, 0x3a, 0x5c, 0xdd, 0x40, 0x29, 0x28, 0x1a, 0x21, 0x89, 0x24,
+0xc6, 0x27, 0xf8, 0x71, 0xd2, 0xcd, 0xe8, 0x04, 0x51, 0x89, 0xb3, 0x12, 0x09, 0x27, 0x4b, 0x58,
+0x17, 0x21, 0x89, 0x68, 0xd9, 0x25, 0x12, 0xe8, 0x35, 0x22, 0xf6, 0x04, 0x92, 0xda, 0x30, 0x71,
+0xbf, 0x99, 0xf9, 0x5b, 0xff, 0xba, 0x03, 0xb3, 0x97, 0x80, 0xf2, 0x50, 0xca, 0x82, 0x6e, 0x16,
+0x97, 0x4f, 0x4f, 0xba, 0x55, 0x90, 0xd7, 0x6b, 0x25, 0xbd, 0x98, 0xc1, 0x55, 0x3c, 0x0f, 0xbe,
+0x92, 0x9c, 0x91, 0x4a, 0x2f, 0xb3, 0x44, 0x02, 0x3b, 0xbd, 0xd7, 0xae, 0x40, 0x76, 0x9a, 0x19,
+0x7f, 0x71, 0x53, 0x84, 0x45, 0x1e, 0x7d, 0x08, 0x57, 0x33, 0xf0, 0x15, 0x34, 0x5d, 0x98, 0xa2,
+0x12, 0xba, 0x71, 0x5c, 0x3d, 0xef, 0x8a, 0x4c, 0x62, 0x52, 0x24, 0x31, 0xb4, 0x76, 0x11, 0x12,
+0x79, 0x39, 0xd9, 0xc5, 0x52, 0xd1, 0x88, 0xeb, 0x7c, 0xf2, 0xf6, 0x08, 0x3b, 0xfb, 0xc1, 0x58,
+0xb6, 0xb7, 0xac, 0x0d, 0xe2, 0xcc, 0xac, 0xdc, 0x02, 0x91, 0x9b, 0x25, 0x9a, 0x7d, 0x6b, 0xf5,
+0x53, 0x98, 0xbe, 0x0b, 0x20, 0x93, 0x22, 0xd0, 0xa4, 0x48, 0xfa, 0xd1, 0xd2, 0x05, 0x4b, 0x24,
+0xca, 0x52, 0x75, 0x59, 0xd7, 0x8b, 0xeb, 0xda, 0xeb, 0xc3, 0xfc, 0x3a, 0xd0, 0xb2, 0x45, 0x98,
+0x6b, 0x83, 0x16, 0x5d, 0x86, 0x72, 0xc8, 0x23, 0xa3, 0x68, 0xae, 0xb3, 0xf4, 0xbe, 0x26, 0x56,
+0xff, 0xd5, 0x16, 0x5c, 0xc1, 0x20, 0x30, 0x7c, 0xce, 0x65, 0x42, 0xa3, 0x50, 0xaa, 0x9b, 0xe8,
+0x7b, 0x7f, 0x39, 0x04, 0xdd, 0x7c, 0xa8, 0x4e, 0xd2, 0x87, 0x3a, 0x49, 0x41, 0x12, 0x31, 0xad,
+0xcf, 0xba, 0xc1, 0xd1, 0x7d, 0x43, 0xe2, 0xfc, 0x5b, 0x10, 0xb8, 0x99, 0x59, 0xa1, 0x2c, 0xf2,
+0xb0, 0x3c, 0x29, 0xb4, 0xb5, 0xc7, 0xbd, 0x1d, 0x8f, 0xa3, 0xf6, 0x01, 0x02, 0x0b, 0x6d, 0xb9,
+0x72, 0xf6, 0x83, 0x23, 0x2c, 0x71, 0xc2, 0xd1, 0x02, 0x3c, 0xea, 0x24, 0x05, 0xf2, 0xc0, 0xcb,
+0xc9, 0x30, 0x4b, 0x9a, 0xd7, 0x69, 0x9d, 0x84, 0xce, 0xf5, 0xc7, 0x2f, 0x0d, 0x8a, 0xf3, 0x6f,
+0x41, 0xa0, 0x8a, 0xea, 0x21, 0x0b, 0x79, 0x58, 0x16, 0xcd, 0x09, 0x92, 0x07, 0x6d, 0x22, 0x08,
+0x00, 0x60, 0xec, 0xdc, 0x91, 0x71, 0x76, 0x7e, 0x4c, 0x13, 0x53, 0x84, 0x1d, 0xa4, 0x1f, 0x22,
+0xc9, 0x53, 0x22, 0xbf, 0x4b, 0x66, 0xbd, 0x6f, 0x39, 0x29, 0x91, 0x0f, 0x77, 0xed, 0xcd, 0x16,
+0x85, 0xf6, 0xf0, 0xf3, 0xd6, 0x17, 0x64, 0x81, 0x50, 0x61, 0xaa, 0xcb, 0xec, 0x5b, 0x2b, 0xbe,
+0xda, 0xc2, 0x96, 0x36, 0x37, 0xe1, 0x6a, 0x05, 0x20, 0x0d, 0xaa, 0x97, 0x9c, 0x3b, 0xa2, 0x89,
+0x7a, 0x89, 0x83, 0x29, 0x2e, 0x8a, 0x48, 0xb6, 0xa2, 0xe0, 0x9e, 0x97, 0x44, 0xb6, 0x58, 0xdd,
+0xbf, 0x9c, 0x8c, 0x40, 0x29, 0x12, 0xc9, 0x12, 0x7d, 0x06, 0x62, 0xcf, 0xac, 0x90, 0x89, 0x3c,
+0xa8, 0xe1, 0x4d, 0x67, 0x36, 0x2c, 0x6e, 0x8c, 0xb0, 0x06, 0xcc, 0xba, 0x02, 0x20, 0x27, 0x94,
+0x27, 0x3f, 0xcf, 0x65, 0x92, 0x38, 0x31, 0xe1, 0xd4, 0x3f, 0x19, 0x63, 0x98, 0xb9, 0x95, 0x8f,
+0x48, 0x9e, 0x73, 0x5b, 0x22, 0x97, 0x4f, 0x4d, 0xb2, 0x8f, 0x7f, 0x37, 0x68, 0x79, 0x09, 0xb0,
+0x00, 0x6c, 0x77, 0x12, 0x4a, 0x93, 0x47, 0x84, 0x19, 0x36, 0x49, 0x34, 0x42, 0x29, 0xab, 0xa6,
+0x3f, 0x69, 0x13, 0x4f, 0xc5, 0x03, 0x00, 0xd8, 0x43, 0x14, 0xde, 0x47, 0xc7, 0x84, 0x4c, 0x1c,
+0xaa, 0x95, 0x40, 0x24, 0x76, 0x25, 0xf2, 0x92, 0xfb, 0x12, 0xa1, 0xf4, 0xe5, 0xf8, 0x81, 0x83,
+0xd6, 0xe7, 0x6a, 0xfb, 0x86, 0xf6, 0x20, 0x09, 0x84, 0xf2, 0x87, 0xd1, 0xf4, 0x37, 0x51, 0xb1,
+0x9c, 0xe4, 0x81, 0xba, 0x47, 0xe9, 0x06, 0xb0, 0x2c, 0x35, 0xa3, 0xc3, 0x0c, 0x7a, 0x7d, 0x2a,
+0xcb, 0xdf, 0xdd, 0xc4, 0x4a, 0xfc, 0x54, 0x37, 0x60, 0x8f, 0xf3, 0xfc, 0x66, 0x43, 0x32, 0xb9,
+0xe6, 0xcc, 0x74, 0x60, 0x88, 0xc4, 0x06, 0x6b, 0x5f, 0x72, 0x7f, 0xc1, 0xe1, 0xf8, 0x81, 0x61,
+0x31, 0x40, 0xb0, 0x80, 0xce, 0xd1, 0x66, 0xff, 0x0b, 0x24, 0x4b, 0xea, 0xaa, 0xe9, 0x3b, 0x6d,
+0xac, 0x7a, 0x59, 0x2d, 0xae, 0xc6, 0xfc, 0xd1, 0xe4, 0x91, 0x7e, 0xe3, 0x37, 0xbe, 0x2e, 0xbe,
+0x77, 0xe8, 0x7b, 0x21, 0x47, 0xee, 0x2a, 0x6b, 0x77, 0x97, 0x6e, 0x71, 0x15, 0x28, 0x0c, 0x5a,
+0xed, 0x7e, 0xf6, 0xc3, 0x31, 0x36, 0xe5, 0x4c, 0x7a, 0x0b, 0x22, 0xf1, 0x40, 0x9f, 0x18, 0x7b,
+0x79, 0x50, 0x9c, 0x57, 0x0b, 0x7c, 0x5b, 0x0f, 0x09, 0x49, 0x79, 0x50, 0x68, 0x41, 0x4f, 0x17,
+0xcc, 0x08, 0x31, 0x56, 0xac, 0x6b, 0x61, 0xb5, 0x28, 0x9a, 0x67, 0x93, 0x03, 0x1d, 0xe3, 0x46,
+0x29, 0x70, 0x19, 0xc4, 0xca, 0xdc, 0x61, 0x8e, 0x23, 0x0a, 0xf1, 0x3e, 0x54, 0x74, 0x3f, 0x35,
+0x32, 0xca, 0x45, 0xe2, 0xc8, 0x54, 0xe0, 0x7e, 0x86, 0x59, 0x5b, 0x65, 0x93, 0x08, 0x9d, 0xbf,
+0x8f, 0x5e, 0xb4, 0x9c, 0x99, 0xe5, 0xdb, 0x7a, 0x88, 0x2e, 0x10, 0x0a, 0xb1, 0x32, 0x56, 0x9b,
+0x2f, 0xa2, 0xa2, 0xf9, 0x23, 0x81, 0x2e, 0x9a, 0xeb, 0xa9, 0x24, 0x3d, 0x7a, 0x20, 0x31, 0x24,
+0xb8, 0x20, 0xe2, 0x41, 0xee, 0x2c, 0xc0, 0x59, 0xbe, 0xe4, 0x37, 0x9f, 0x49, 0x1e, 0x91, 0x4c,
+0x8e, 0x8e, 0x39, 0x21, 0x92, 0x3e, 0x29, 0x12, 0x2c, 0x48, 0x2c, 0x71, 0xbf, 0xa0, 0x9d, 0x0a,
+0x8e, 0xbc, 0x6c, 0x39, 0x33, 0xcb, 0x97, 0xf5, 0x10, 0x5d, 0x20, 0x19, 0x23, 0x56, 0xaa, 0x77,
+0x34, 0x7e, 0xa7, 0x2d, 0x28, 0x8b, 0x05, 0xf5, 0xe8, 0x61, 0x50, 0xff, 0x3c, 0x5e, 0xe6, 0x28,
+0xa2, 0x58, 0x5a, 0x11, 0x85, 0x28, 0x09, 0xd5, 0x49, 0x4e, 0xf3, 0xa8, 0xa4, 0xc8, 0x69, 0xc0,
+0xa9, 0x95, 0xed, 0x3e, 0xce, 0xbd, 0x17, 0xd1, 0x2f, 0x5c, 0x95, 0x08, 0x9d, 0xbf, 0x13, 0x6f,
+0x58, 0x16, 0xd5, 0x7d, 0x57, 0x0f, 0x09, 0x99, 0x6d, 0x57, 0x42, 0xd2, 0x68, 0xfc, 0xb6, 0x2f,
+0x8b, 0xe6, 0xc6, 0x88, 0x62, 0x44, 0x88, 0xe2, 0xfb, 0x6a, 0x8b, 0xc2, 0xb2, 0xa3, 0xfc, 0x36,
+0x69, 0xb9, 0x0d, 0x8d, 0x6a, 0x4c, 0x7d, 0x32, 0xc1, 0xbe, 0xbc, 0x76, 0x3d, 0xb1, 0xf8, 0xee,
+0x3b, 0xe9, 0xbc, 0xd1, 0x22, 0x31, 0xdf, 0xcf, 0xe6, 0x38, 0x7f, 0x74, 0x5c, 0x44, 0x25, 0x45,
+0x16, 0xdc, 0x69, 0x30, 0x44, 0x8b, 0xda, 0x06, 0xa0, 0x8e, 0x19, 0x7d, 0xc3, 0x55, 0x89, 0x9c,
+0x3c, 0x38, 0x22, 0xce, 0x9d, 0x55, 0x20, 0xe4, 0xa7, 0x4d, 0x17, 0x43, 0x66, 0x8b, 0x06, 0x57,
+0xb6, 0xaf, 0x67, 0x35, 0xf5, 0xbe, 0x78, 0xc6, 0x47, 0x4c, 0x46, 0x15, 0x42, 0x1a, 0x5c, 0x16,
+0x5a, 0xc0, 0x3a, 0x8a, 0xe9, 0xac, 0x3a, 0xd5, 0xa0, 0x11, 0x39, 0x3f, 0x12, 0xbc, 0xe3, 0x2d,
+0x94, 0xbf, 0x57, 0x44, 0x8a, 0x84, 0x8e, 0x36, 0x19, 0x69, 0xf9, 0x32, 0xda, 0xba, 0x7c, 0x66,
+0x52, 0xfc, 0xfe, 0x97, 0x8b, 0x5b, 0xe5, 0x4e, 0xfd, 0xa0, 0x1b, 0xf5, 0x91, 0xd2, 0x49, 0xe4,
+0xc8, 0x2b, 0x96, 0x45, 0x75, 0x4d, 0x4a, 0xc4, 0x17, 0x29, 0xc6, 0x90, 0xf1, 0xf9, 0xe6, 0xc4,
+0xa2, 0xbb, 0x22, 0xec, 0x0e, 0x35, 0xeb, 0x1e, 0x9a, 0x14, 0x05, 0x09, 0x23, 0xc6, 0x65, 0x11,
+0x47, 0x27, 0x11, 0x9b, 0xcc, 0x1d, 0xf2, 0x89, 0x40, 0xb2, 0x8e, 0xde, 0xf8, 0xef, 0x1a, 0x96,
+0xd7, 0x31, 0x09, 0xb3, 0x45, 0x7e, 0xee, 0x1b, 0xa9, 0xd0, 0xcd, 0x48, 0x88, 0xe4, 0x4c, 0x51,
+0x22, 0xe9, 0x65, 0xd8, 0xb0, 0xb1, 0x24, 0x12, 0xa1, 0x3a, 0xc8, 0xe8, 0xaf, 0x77, 0x5b, 0xd5,
+0x43, 0x7c, 0xb3, 0x5f, 0x16, 0x09, 0x24, 0xa9, 0x7f, 0x41, 0x9b, 0x24, 0xae, 0xfa, 0xbe, 0x52,
+0x9b, 0x24, 0x0e, 0x4c, 0x0b, 0xe3, 0x07, 0x10, 0x86, 0x69, 0x27, 0xf9, 0x8d, 0xfb, 0x8b, 0xa9,
+0xdc, 0x86, 0x52, 0x58, 0xc7, 0x63, 0x43, 0xf4, 0x69, 0x5e, 0x7b, 0x0c, 0xf1, 0xdf, 0xdd, 0x28,
+0x95, 0x36, 0xe6, 0x83, 0xf4, 0xd7, 0x74, 0x44, 0x52, 0xb8, 0x48, 0x34, 0x86, 0xb4, 0x96, 0xf1,
+0x1a, 0x71, 0x4d, 0x22, 0xd7, 0x2e, 0x24, 0xd8, 0xe1, 0xdf, 0x58, 0x3e, 0x57, 0xfd, 0x49, 0x3f,
+0x9c, 0x83, 0x19, 0x02, 0xb9, 0xeb, 0xdb, 0x6d, 0xac, 0xfa, 0x36, 0x4f, 0xaf, 0xf7, 0xd0, 0x77,
+0x2b, 0xdd, 0x45, 0xd2, 0x18, 0xf9, 0x41, 0x08, 0x23, 0xa9, 0x1c, 0xb4, 0xa4, 0x6e, 0xa2, 0xc7,
+0x55, 0xbe, 0x71, 0xd2, 0xcd, 0xf2, 0xe8, 0x2b, 0x62, 0xcb, 0x88, 0x38, 0xef, 0x74, 0x6b, 0x8b,
+0x6c, 0x8f, 0x88, 0x21, 0x4a, 0x89, 0xb2, 0x12, 0x3d, 0x5f, 0xdb, 0x8d, 0x36, 0x39, 0x53, 0x9c,
+0x48, 0x06, 0xa4, 0x48, 0x34, 0xf4, 0x11, 0xf7, 0x24, 0x42, 0xb5, 0x90, 0x89, 0xe1, 0x11, 0xab,
+0x7b, 0x99, 0xf2, 0x53, 0x7b, 0xa7, 0x05, 0x42, 0xa9, 0xab, 0xfa, 0xf5, 0x9e, 0x4d, 0x5d, 0xc5,
+0xf8, 0xb1, 0x8d, 0x2e, 0x7a, 0x48, 0xa3, 0xa0, 0x0e, 0x42, 0x2b, 0x71, 0xb7, 0xa8, 0xfa, 0xf3,
+0x53, 0x1a, 0xe0, 0xfd, 0xed, 0xbb, 0xf4, 0x2f, 0x57, 0x3a, 0x79, 0xd3, 0x93, 0x82, 0xd5, 0x23,
+0x14, 0xe5, 0x84, 0x52, 0xa4, 0x48, 0xa8, 0x2f, 0xf5, 0x06, 0x65, 0xe7, 0xd8, 0x72, 0x49, 0x44,
+0xe3, 0xd1, 0x33, 0x45, 0xd1, 0xa6, 0xf7, 0x35, 0xc5, 0xa7, 0xf6, 0x0a, 0x81, 0x50, 0xca, 0xea,
+0xde, 0xce, 0xef, 0x79, 0x2d, 0x75, 0x35, 0xfd, 0x6c, 0x84, 0x91, 0x1f, 0x06, 0xab, 0xf8, 0xed,
+0x4a, 0x07, 0x79, 0x51, 0xed, 0x82, 0xfa, 0xfb, 0xbf, 0xdc, 0xa5, 0xe7, 0x93, 0x5d, 0x9d, 0x0a,
+0xc9, 0xdb, 0x49, 0x49, 0xa1, 0xd0, 0x0d, 0x6a, 0xe2, 0x9d, 0x91, 0x42, 0xa7, 0xff, 0xd2, 0x00,
+0x2d, 0xf0, 0x45, 0x76, 0x7e, 0xee, 0x5d, 0x91, 0x88, 0x78, 0x86, 0xc8, 0x6e, 0xcb, 0x45, 0x86,
+0x4a, 0x6f, 0xfd, 0x2e, 0x04, 0x72, 0xdb, 0x9a, 0x66, 0xb6, 0x8c, 0x1f, 0x1e, 0x41, 0x93, 0xd1,
+0x46, 0x1f, 0x17, 0x07, 0xa2, 0x0d, 0xe7, 0x3a, 0x47, 0x84, 0x59, 0x6c, 0x94, 0xa9, 0x02, 0x47,
+0xf7, 0x0c, 0xea, 0xa3, 0x6c, 0x8d, 0x77, 0xb8, 0x95, 0x25, 0x6c, 0x37, 0x6a, 0xaf, 0x4e, 0x83,
+0x50, 0x22, 0x5e, 0x6e, 0xa7, 0xf3, 0xc7, 0xc6, 0xd9, 0xc4, 0x70, 0xbc, 0x90, 0x05, 0x89, 0x88,
+0x46, 0x5c, 0x94, 0x88, 0x48, 0xc3, 0xee, 0x19, 0xb4, 0x6a, 0x77, 0x65, 0x1f, 0x85, 0x2b, 0x04,
+0x72, 0xdf, 0x53, 0x1d, 0x5e, 0x88, 0x3e, 0xa8, 0x08, 0xbe, 0xf5, 0xdd, 0x1f, 0x86, 0xfa, 0x71,
+0xbb, 0x77, 0x87, 0x35, 0x2f, 0xaa, 0x9b, 0xca, 0x3a, 0xf3, 0xee, 0xa8, 0x38, 0x24, 0xdd, 0xe5,
+0x7a, 0x8e, 0x38, 0x6f, 0x43, 0xbd, 0x28, 0xdf, 0xe1, 0xd5, 0x88, 0x8e, 0xe4, 0xf1, 0xd9, 0x47,
+0x63, 0xe2, 0x28, 0x40, 0x24, 0x81, 0x8f, 0x46, 0xf8, 0x39, 0x76, 0x65, 0xe2, 0x49, 0xda, 0x35,
+0x3c, 0xb3, 0xcd, 0x15, 0x4d, 0x65, 0x85, 0x6e, 0xfd, 0xf7, 0x37, 0x92, 0x91, 0xc7, 0xd6, 0x97,
+0xf3, 0x67, 0x18, 0xe0, 0x1a, 0x23, 0x71, 0xc4, 0x70, 0x8b, 0x2f, 0x41, 0xe7, 0x78, 0x41, 0xcd,
+0x54, 0xd6, 0xc5, 0x4f, 0x27, 0x98, 0x36, 0x38, 0xe4, 0xa9, 0x0e, 0xb7, 0x46, 0x8f, 0x4e, 0x92,
+0x22, 0x3a, 0xe9, 0xf4, 0x5a, 0x74, 0xf7, 0xc5, 0x95, 0xab, 0x22, 0x1a, 0xa1, 0xb6, 0x43, 0x34,
+0x92, 0x77, 0x3f, 0x71, 0x45, 0x22, 0xc7, 0xf6, 0x0e, 0x5a, 0xd5, 0xab, 0x94, 0x4c, 0x65, 0x85,
+0xea, 0xfb, 0xb4, 0xe4, 0xc2, 0x3b, 0x1b, 0x4a, 0xfd, 0xff, 0xd2, 0x05, 0xda, 0x2f, 0x22, 0x8e,
+0x27, 0x50, 0xdf, 0x28, 0x71, 0xc7, 0x88, 0x30, 0x05, 0x53, 0x59, 0x34, 0x92, 0xfe, 0x60, 0xc7,
+0x2e, 0xe3, 0x4b, 0x9e, 0x9b, 0x06, 0xc9, 0xdb, 0x56, 0x8f, 0x4c, 0x48, 0x26, 0x11, 0xaf, 0xfc,
+0x5c, 0x57, 0xf8, 0x0d, 0x8b, 0xea, 0x23, 0x34, 0xad, 0x34, 0xef, 0xc1, 0x5d, 0x2a, 0x1a, 0x49,
+0x04, 0xb4, 0xaf, 0x38, 0x2e, 0x11, 0x92, 0xfa, 0xd8, 0xee, 0x3d, 0x66, 0x91, 0xa1, 0x92, 0xa9,
+0xac, 0x50, 0xd3, 0xb6, 0x0b, 0xc9, 0xf9, 0x0b, 0x4b, 0x76, 0x2f, 0x89, 0x4b, 0x69, 0xf4, 0x33,
+0x50, 0xce, 0x8e, 0x41, 0x9d, 0x42, 0xb9, 0xcd, 0x16, 0xc7, 0x76, 0xef, 0x35, 0xde, 0x04, 0x4b,
+0x5a, 0x0b, 0x29, 0xa0, 0x8d, 0x29, 0xd5, 0xb5, 0xc9, 0x4b, 0x32, 0xa1, 0x94, 0xd6, 0x99, 0xf7,
+0x46, 0xf3, 0x4d, 0x6b, 0x25, 0xa4, 0xac, 0x63, 0x01, 0xed, 0x2b, 0x8e, 0x4b, 0x64, 0x8a, 0x47,
+0x84, 0xe3, 0x37, 0xa3, 0x69, 0x23, 0xca, 0xa5, 0xb2, 0x42, 0xab, 0x5f, 0x48, 0x26, 0x4b, 0xf0,
+0xff, 0x90, 0x30, 0xb6, 0xbd, 0xf7, 0x04, 0xd2, 0x54, 0x5e, 0x61, 0xf5, 0x0b, 0xea, 0x2d, 0x30,
+0x3c, 0xc5, 0x47, 0xd1, 0x74, 0x13, 0x34, 0xa0, 0xc4, 0xe6, 0x74, 0xab, 0x5f, 0x98, 0xae, 0x9b,
+0x90, 0x50, 0xca, 0x3a, 0xab, 0x4b, 0x6c, 0x21, 0xff, 0x4e, 0x41, 0x69, 0x2d, 0x5a, 0xc1, 0xde,
+0x83, 0xbe, 0xe2, 0x0c, 0x24, 0x10, 0x8b, 0x73, 0xa0, 0x54, 0x2a, 0x2b, 0xb4, 0x7a, 0x57, 0xf2,
+0x82, 0x4b, 0xe9, 0x0c, 0x0a, 0xc5, 0x68, 0x36, 0x55, 0xff, 0x7b, 0x1d, 0x48, 0x53, 0x79, 0xae,
+0x53, 0xec, 0x12, 0xf9, 0xfb, 0xfd, 0x4c, 0xa1, 0x75, 0x0f, 0xd7, 0x79, 0xf4, 0x31, 0xf6, 0xd2,
+0xde, 0xf4, 0xd1, 0x71, 0xbb, 0x4a, 0x9b, 0xd3, 0xf1, 0x76, 0x8f, 0xc8, 0xa8, 0xe4, 0xe9, 0x72,
+0x46, 0x26, 0x57, 0xce, 0x4e, 0xb2, 0x4f, 0xdf, 0x1c, 0x66, 0x5f, 0x5c, 0xc9, 0x6b, 0xda, 0x6f,
+0x5c, 0x46, 0x23, 0x5a, 0x00, 0xfb, 0xcb, 0x21, 0x27, 0xfb, 0x0a, 0x45, 0x81, 0x47, 0xf8, 0xb5,
+0x6c, 0xd2, 0xfe, 0x4a, 0x2d, 0x30, 0x9c, 0xc5, 0xac, 0x1f, 0x9d, 0x5a, 0x28, 0x14, 0x65, 0x74,
+0x73, 0x69, 0xac, 0xe4, 0xc7, 0x66, 0xc8, 0xc3, 0x9b, 0xf0, 0xf3, 0x92, 0x4a, 0x4d, 0xa4, 0x2e,
+0x58, 0x25, 0x98, 0xb7, 0x30, 0xcc, 0x6e, 0xa9, 0xaa, 0x32, 0xbe, 0x44, 0x12, 0x7c, 0x4e, 0xb1,
+0x76, 0xd7, 0xf8, 0xd1, 0x47, 0xfd, 0x83, 0x51, 0xce, 0x3b, 0xf5, 0xfc, 0x8e, 0x92, 0xf7, 0x91,
+0xaa, 0xa5, 0xb5, 0xac, 0xf1, 0xbb, 0x8f, 0xb3, 0x25, 0xab, 0xf2, 0x7a, 0x58, 0x5c, 0x6a, 0x6f,
+0xb5, 0xd4, 0x0e, 0xde, 0x41, 0xa3, 0xdd, 0xc9, 0x7b, 0x25, 0xcd, 0x7a, 0x5d, 0xf1, 0xb0, 0xe9,
+0xc2, 0x6d, 0xa5, 0xae, 0x69, 0x8a, 0x40, 0xba, 0x1c, 0xf8, 0x81, 0xa9, 0x03, 0x50, 0xc1, 0x6d,
+0x2b, 0x84, 0xa1, 0xdc, 0xc8, 0x2a, 0x2a, 0x23, 0x11, 0x25, 0x38, 0xfb, 0xde, 0xa8, 0xc8, 0xe3,
+0xa7, 0xa1, 0xfc, 0xe6, 0x74, 0xfc, 0x3c, 0x94, 0xad, 0x66, 0x42, 0xd1, 0x08, 0x15, 0xd9, 0xaf,
+0xe7, 0x57, 0x64, 0x0f, 0x5c, 0x4a, 0xcb, 0x8d, 0xa8, 0x5d, 0xa4, 0x65, 0x0f, 0x9b, 0x6e, 0xfd,
+0xae, 0xc4, 0x5e, 0x59, 0xe2, 0x81, 0x52, 0xab, 0x07, 0x0a, 0x0a, 0xcf, 0xa6, 0xf7, 0xa5, 0x7a,
+0xaf, 0x33, 0x84, 0x8d, 0xd9, 0x54, 0xee, 0x18, 0x03, 0xea, 0x14, 0xd5, 0x69, 0x16, 0xcb, 0xe1,
+0x17, 0x76, 0x9b, 0x7d, 0xab, 0xc7, 0x2f, 0xd3, 0x4e, 0xf9, 0xf9, 0x20, 0x89, 0xe8, 0xb3, 0xb9,
+0x4a, 0x36, 0xc3, 0xe5, 0xcc, 0xfb, 0xa3, 0x42, 0xd0, 0x79, 0x10, 0xb8, 0x94, 0x16, 0x3f, 0x37,
+0x8e, 0x4a, 0x44, 0xa4, 0xb2, 0x7e, 0x67, 0x9a, 0xca, 0xd2, 0x98, 0x02, 0xdb, 0xbe, 0x0b, 0x81,
+0xdc, 0x6f, 0xbf, 0x51, 0xe8, 0x97, 0x8a, 0x91, 0x34, 0xde, 0x87, 0x34, 0x7c, 0x05, 0xbf, 0x06,
+0x94, 0x29, 0xaa, 0x9f, 0x7c, 0x6b, 0x98, 0x5d, 0x38, 0x6e, 0x7a, 0xcf, 0x2a, 0xdb, 0x02, 0x43,
+0x17, 0xcf, 0x4b, 0x97, 0x41, 0x26, 0xae, 0x43, 0x51, 0xc8, 0x89, 0xd7, 0xdf, 0xcc, 0xa7, 0x36,
+0x12, 0xb8, 0x59, 0x5a, 0xf2, 0x7e, 0x79, 0xc8, 0xa9, 0x48, 0x91, 0x22, 0xc0, 0xe3, 0xfb, 0x06,
+0x95, 0x8c, 0xf2, 0x42, 0x69, 0x0d, 0xd3, 0x29, 0x25, 0xd2, 0x22, 0x47, 0x3e, 0xfa, 0xb3, 0xc0,
+0xc5, 0x03, 0x99, 0xb8, 0x34, 0x02, 0x33, 0xd2, 0x80, 0x44, 0xbc, 0xcb, 0x0d, 0xeb, 0x28, 0xc4,
+0x97, 0x12, 0x91, 0xe7, 0x26, 0x22, 0x25, 0xe2, 0xfa, 0x4c, 0x2e, 0x1a, 0x15, 0x9f, 0xe5, 0xd1,
+0xc8, 0xb9, 0xc3, 0x63, 0xf9, 0xfc, 0xb5, 0x9e, 0x20, 0x2d, 0x3c, 0xe4, 0xe7, 0xa3, 0x55, 0x0e,
+0xba, 0x1d, 0x89, 0x10, 0x4f, 0xfd, 0x61, 0xc4, 0xaa, 0xbd, 0x3d, 0xfd, 0x04, 0xc3, 0x10, 0x6e,
+0x9b, 0x60, 0x46, 0xc7, 0xd8, 0xa9, 0xc6, 0x4a, 0xf5, 0x93, 0x6f, 0x5b, 0x46, 0x21, 0x4a, 0x8c,
+0xdc, 0x8a, 0xbe, 0x79, 0x25, 0x85, 0x48, 0xba, 0x98, 0x8b, 0x29, 0x2e, 0x1a, 0x19, 0x9f, 0x38,
+0x30, 0x94, 0xcf, 0xba, 0x91, 0x7e, 0x29, 0x92, 0x40, 0x2c, 0x3c, 0x94, 0xe7, 0xc1, 0x11, 0x89,
+0xfc, 0xf1, 0xc6, 0x0d, 0x76, 0xd4, 0x3c, 0x95, 0x55, 0xf4, 0x23, 0x0c, 0x20, 0x10, 0x50, 0x4a,
+0x81, 0x28, 0x31, 0xbd, 0x57, 0x44, 0x21, 0x2f, 0xee, 0xce, 0x7e, 0x33, 0xf3, 0xc9, 0x53, 0xdf,
+0x72, 0x9c, 0x2f, 0x3d, 0x2a, 0x71, 0x25, 0xc5, 0x45, 0x37, 0xb6, 0x93, 0x6f, 0x1f, 0xcc, 0x67,
+0xdd, 0x08, 0x8d, 0x96, 0xdb, 0x03, 0x23, 0x91, 0x9d, 0xce, 0x45, 0x22, 0x22, 0x95, 0xf5, 0xea,
+0xa0, 0x52, 0xd1, 0x1d, 0x04, 0x02, 0x32, 0xb8, 0x4f, 0x11, 0x89, 0x4c, 0x52, 0xd1, 0xf7, 0xfd,
+0x51, 0xdc, 0xcc, 0x6e, 0x9e, 0x33, 0x8a, 0x48, 0x5c, 0x59, 0x5f, 0x42, 0xe9, 0x95, 0xd3, 0x87,
+0x46, 0xec, 0xbe, 0x5d, 0xb9, 0xf5, 0x39, 0x45, 0xb6, 0xbd, 0x63, 0x12, 0x39, 0x4d, 0xa9, 0xac,
+0x8f, 0xc7, 0xcc, 0xda, 0xd3, 0x93, 0x6b, 0x43, 0x20, 0x10, 0x60, 0xde, 0x29, 0x7e, 0xad, 0x86,
+0x44, 0x8e, 0xbe, 0xbc, 0x97, 0x5d, 0x4f, 0x24, 0x70, 0x33, 0x9b, 0x79, 0xee, 0xa2, 0x32, 0x2a,
+0xe9, 0x72, 0xf2, 0xdf, 0xa5, 0x76, 0xa6, 0xd4, 0x61, 0x8e, 0xf6, 0x36, 0xb6, 0x7b, 0x8f, 0x1f,
+0xeb, 0x51, 0x59, 0xda, 0xbc, 0xe8, 0xe9, 0xf0, 0x22, 0x95, 0xc5, 0xaf, 0xe9, 0x1b, 0x99, 0xa9,
+0x2c, 0x4f, 0x46, 0xd4, 0x10, 0x08, 0xc8, 0xd5, 0x31, 0x3c, 0x5d, 0x58, 0xa7, 0x9b, 0x99, 0xc6,
+0xc3, 0x7e, 0xea, 0x78, 0x39, 0xe8, 0x09, 0xda, 0xee, 0xb2, 0x72, 0x10, 0xe0, 0x68, 0x54, 0x42,
+0xed, 0x4c, 0x91, 0x48, 0xc2, 0xba, 0xfe, 0x14, 0xd8, 0x76, 0xe7, 0xed, 0x4d, 0x6d, 0x5d, 0xf4,
+0x74, 0xf8, 0x4b, 0x27, 0x27, 0x44, 0xed, 0xc9, 0x84, 0x76, 0xaf, 0xcd, 0x76, 0x83, 0x40, 0x80,
+0xf2, 0x12, 0x49, 0x1c, 0x1f, 0x67, 0x27, 0x7f, 0x7f, 0xd0, 0xce, 0x5b, 0x03, 0xbb, 0xbb, 0xac,
+0x1c, 0x21, 0x93, 0x48, 0x3a, 0x4b, 0xdc, 0xe6, 0x9e, 0x1d, 0x3d, 0x7b, 0x59, 0x22, 0x24, 0x10,
+0x12, 0x49, 0x1a, 0x9e, 0x2b, 0xa8, 0x43, 0x20, 0xc0, 0x5e, 0xc7, 0xf8, 0x95, 0xb7, 0x17, 0x1b,
+0x9e, 0x8e, 0x9b, 0xe6, 0x8e, 0x4d, 0xef, 0x7d, 0x2c, 0xc0, 0xbb, 0xcb, 0xf2, 0xf3, 0x48, 0x91,
+0xc8, 0xb3, 0xcc, 0x81, 0x45, 0x8a, 0x14, 0xfd, 0x9d, 0x78, 0xe3, 0x4d, 0xb3, 0x74, 0x4b, 0xa0,
+0xe5, 0xed, 0x44, 0x5f, 0xa1, 0x05, 0xb3, 0xc7, 0x5e, 0xd9, 0x63, 0x16, 0x59, 0x7b, 0x2a, 0xa2,
+0x83, 0x40, 0x80, 0x6d, 0x9a, 0x7f, 0x25, 0x46, 0xb1, 0x3b, 0x99, 0x47, 0x9f, 0x25, 0x32, 0xf1,
+0xfb, 0x61, 0x96, 0xd0, 0x34, 0xbb, 0x6f, 0xa7, 0x4e, 0xd8, 0x1b, 0xd4, 0x67, 0x5d, 0xf0, 0x73,
+0x49, 0xe7, 0x90, 0x9e, 0x50, 0x49, 0xb5, 0x92, 0x48, 0xa1, 0xff, 0x0e, 0xdd, 0xe0, 0x3e, 0x7d,
+0x63, 0x48, 0xcc, 0x20, 0xb2, 0x41, 0x60, 0x26, 0x35, 0x34, 0x3b, 0x20, 0x91, 0xf3, 0x7c, 0x40,
+0x44, 0x03, 0x23, 0x93, 0x01, 0x90, 0x67, 0x0a, 0xea, 0x10, 0x08, 0xc8, 0xb7, 0x63, 0x44, 0xa4,
+0x44, 0x3c, 0x59, 0x5c, 0xcf, 0x53, 0x22, 0x9a, 0x1c, 0xd1, 0x0d, 0x04, 0xfc, 0x9c, 0x76, 0xc9,
+0xa8, 0xa4, 0x60, 0x91, 0xd0, 0x8d, 0xee, 0xbc, 0xbd, 0x08, 0x30, 0x2e, 0x23, 0x91, 0x78, 0x00,
+0xda, 0xb5, 0xe8, 0xd4, 0xef, 0xb1, 0x57, 0x4c, 0x27, 0x89, 0x78, 0x26, 0x25, 0x08, 0x81, 0x80,
+0xc2, 0x3a, 0xc7, 0xf3, 0xc9, 0x2d, 0x72, 0x04, 0xeb, 0x39, 0x12, 0xda, 0x38, 0x9b, 0x38, 0x78,
+0x30, 0x9f, 0xbf, 0x32, 0x20, 0x45, 0xa2, 0x05, 0xfa, 0x9c, 0xfe, 0x2a, 0x49, 0x8f, 0xe7, 0xa5,
+0x3a, 0x49, 0xb4, 0xd0, 0x76, 0x3f, 0x13, 0x8f, 0xdb, 0x99, 0xd0, 0x10, 0x98, 0x99, 0x71, 0xbc,
+0x9f, 0x14, 0x25, 0x11, 0x92, 0xc7, 0xb1, 0x3d, 0x7b, 0xcd, 0xbe, 0xe5, 0x89, 0x15, 0xea, 0xb3,
+0x70, 0x2b, 0x04, 0x85, 0x30, 0xfa, 0xe7, 0xa1, 0x1e, 0x96, 0xda, 0xe2, 0xda, 0x73, 0x37, 0xdd,
+0x70, 0xa4, 0x81, 0xd5, 0xad, 0x5b, 0xc7, 0x66, 0x57, 0x54, 0xd8, 0xfd, 0x2b, 0x54, 0x0f, 0xa0,
+0x6d, 0xca, 0x37, 0x07, 0xfa, 0x9c, 0xfe, 0x59, 0x68, 0x80, 0x9f, 0xd7, 0x76, 0x79, 0x5e, 0x63,
+0x85, 0xb4, 0x7b, 0x43, 0xb4, 0x8d, 0x55, 0xcc, 0xdc, 0x72, 0xdf, 0xf4, 0xad, 0x8c, 0xa6, 0xbc,
+0x6e, 0xdc, 0xd1, 0x1a, 0x80, 0x7e, 0xd2, 0x5d, 0x48, 0x5b, 0xea, 0xcc, 0x0b, 0x87, 0xd9, 0xa2,
+0x26, 0xd3, 0x2d, 0xf7, 0xb7, 0x20, 0x02, 0x01, 0xca, 0x73, 0xef, 0xf3, 0xd3, 0xb9, 0xf4, 0x67,
+0xbd, 0xf6, 0xb3, 0x89, 0x22, 0x6f, 0xcc, 0xd6, 0x14, 0x5f, 0x23, 0x1a, 0x43, 0x5a, 0x4b, 0x3f,
+0xb7, 0x51, 0x79, 0x5e, 0xf3, 0x8a, 0x48, 0xa8, 0xbd, 0xa9, 0xdd, 0x6d, 0xac, 0x17, 0x09, 0x44,
+0x24, 0x22, 0xfb, 0x48, 0xc1, 0x6b, 0xaa, 0xc4, 0xda, 0x90, 0xdf, 0xee, 0x36, 0xbb, 0x8e, 0xcb,
+0xbe, 0xe5, 0x3b, 0x04, 0x02, 0x9c, 0xea, 0x24, 0xad, 0x72, 0x54, 0x14, 0xf5, 0xd2, 0xcf, 0x45,
+0xfb, 0x38, 0x9d, 0x18, 0x1c, 0xb4, 0xbb, 0xf8, 0xcd, 0x08, 0x8d, 0x1a, 0x7b, 0x83, 0x3a, 0x5b,
+0xcb, 0x09, 0x91, 0x4c, 0x1c, 0x1c, 0x66, 0x53, 0xf6, 0xea, 0x51, 0xdd, 0x7e, 0x5f, 0x70, 0x28,
+0x25, 0x72, 0x9c, 0x15, 0x38, 0x01, 0x65, 0xca, 0x3c, 0x2d, 0x4b, 0x8d, 0x5b, 0xd6, 0x2d, 0xdf,
+0x21, 0x10, 0xe0, 0x6c, 0x47, 0xd9, 0x21, 0x6e, 0x36, 0x94, 0xf7, 0x8d, 0x78, 0xe9, 0xe7, 0x3a,
+0x33, 0x32, 0xc2, 0xce, 0x8f, 0x8d, 0x15, 0xf2, 0x57, 0xfb, 0xa5, 0x48, 0x34, 0x9c, 0x5b, 0x71,
+0x6e, 0xb7, 0xe4, 0x33, 0x92, 0xfe, 0x6c, 0x74, 0x94, 0x4d, 0x8e, 0xda, 0x7a, 0xc6, 0x88, 0xff,
+0x25, 0xb2, 0xa3, 0xb8, 0x2d, 0x4f, 0xc6, 0xf9, 0x40, 0xe8, 0xea, 0x64, 0xc6, 0x6c, 0x37, 0xba,
+0x36, 0x37, 0x43, 0x20, 0xc0, 0x6f, 0x9d, 0xa5, 0x8b, 0x15, 0x39, 0xb3, 0xc7, 0x69, 0xa8, 0xf3,
+0x7d, 0x3a, 0x34, 0x94, 0x6f, 0x4a, 0x0b, 0x22, 0x29, 0xf2, 0xdc, 0x4e, 0x8d, 0xdb, 0x9e, 0xd4,
+0x10, 0x04, 0x89, 0x50, 0xbd, 0x6d, 0x67, 0x21, 0x7f, 0x97, 0xa2, 0xe8, 0xe3, 0x7b, 0x33, 0x0a,
+0xea, 0x65, 0x9d, 0xd6, 0x0b, 0x81, 0x80, 0x52, 0x8c, 0x5a, 0xf3, 0x4e, 0x7f, 0xb8, 0x05, 0xc9,
+0xe3, 0x14, 0xbf, 0x99, 0x5d, 0x9a, 0x98, 0x28, 0xf4, 0x9f, 0x80, 0x48, 0x6e, 0x9e, 0x5b, 0xbd,
+0xf6, 0x95, 0x73, 0x44, 0x9d, 0x87, 0xbc, 0x83, 0x20, 0x91, 0x67, 0x58, 0x81, 0x45, 0x70, 0x8b,
+0x48, 0xba, 0x6c, 0xd3, 0x7a, 0x21, 0x10, 0x50, 0x12, 0xee, 0xf9, 0xa5, 0x08, 0xdf, 0xf5, 0xad,
+0x34, 0xca, 0xbe, 0x10, 0xf1, 0x32, 0x17, 0xc8, 0xa9, 0xe1, 0x83, 0x85, 0x46, 0x23, 0xba, 0x48,
+0xb6, 0x06, 0x69, 0x93, 0x46, 0x8b, 0xf3, 0x6a, 0x7b, 0x12, 0xc5, 0xe7, 0x34, 0xa9, 0xe1, 0xb5,
+0x41, 0x48, 0x24, 0xd5, 0x6e, 0x05, 0x4d, 0xef, 0xfd, 0x3f, 0x2a, 0xa8, 0xbf, 0x64, 0x5a, 0x50,
+0x2f, 0xcb, 0xb4, 0x5e, 0x08, 0x04, 0x94, 0xe3, 0x86, 0xd3, 0x29, 0x65, 0x52, 0xd6, 0x69, 0x9c,
+0xd4, 0x19, 0x49, 0x22, 0x45, 0x44, 0x23, 0x44, 0x8c, 0xa5, 0x66, 0x6d, 0x05, 0x5d, 0x24, 0x11,
+0x29, 0x91, 0xac, 0x37, 0xc5, 0x1b, 0x57, 0xaf, 0xb2, 0x93, 0x6f, 0x0e, 0xd9, 0x99, 0xd4, 0x10,
+0x04, 0x89, 0x1c, 0x2a, 0xa4, 0x0f, 0x50, 0x4a, 0x90, 0xae, 0xdb, 0x8c, 0xeb, 0x70, 0xfb, 0x86,
+0x76, 0x08, 0x04, 0x04, 0x2d, 0x2a, 0xd1, 0x1f, 0x86, 0x14, 0x29, 0xd7, 0xcf, 0x41, 0xe9, 0x95,
+0x53, 0xc3, 0xc3, 0xfc, 0xe6, 0x76, 0xa5, 0xd0, 0x7f, 0xa2, 0xac, 0x85, 0x4c, 0x8f, 0x9d, 0xd3,
+0x28, 0xcb, 0x51, 0x68, 0x27, 0x71, 0x53, 0x24, 0x62, 0x43, 0x22, 0x4f, 0xfa, 0x79, 0x3a, 0xb5,
+0x1c, 0x4c, 0x15, 0x34, 0x33, 0x4b, 0xdb, 0x67, 0xba, 0x42, 0xbd, 0xe4, 0xed, 0x05, 0x81, 0x00,
+0xef, 0xc8, 0x24, 0x59, 0x3e, 0x99, 0xd0, 0x4d, 0xed, 0xfc, 0x91, 0x31, 0x76, 0x81, 0x1f, 0x05,
+0xa4, 0xb5, 0x20, 0x90, 0xcc, 0xf3, 0xd9, 0xc5, 0xcf, 0xe7, 0x16, 0xab, 0x9b, 0xe3, 0xb4, 0x44,
+0xa6, 0x82, 0xfd, 0x2c, 0x17, 0x79, 0xdd, 0x1f, 0xca, 0x7b, 0xd0, 0xf3, 0xd9, 0xa4, 0x68, 0xbf,
+0x74, 0xaf, 0xf0, 0xb6, 0x5a, 0x59, 0xca, 0x9f, 0x1f, 0x2b, 0xd1, 0x81, 0x27, 0xf8, 0xe8, 0xa9,
+0x50, 0xfc, 0xa3, 0x8d, 0xa1, 0x1e, 0x7e, 0xac, 0x4c, 0x32, 0xb6, 0x96, 0x1f, 0xbd, 0xfc, 0x88,
+0xf3, 0x83, 0x95, 0xe2, 0x08, 0x55, 0x54, 0xb0, 0xc5, 0xf7, 0x36, 0xb3, 0x86, 0x6f, 0x7e, 0x8b,
+0x55, 0xd7, 0xd5, 0xe1, 0x84, 0x14, 0x7f, 0x3e, 0xfb, 0x79, 0xbb, 0xd2, 0xb9, 0xec, 0xb3, 0x6a,
+0xef, 0xfa, 0xc7, 0xda, 0x72, 0xb5, 0xb5, 0xef, 0x57, 0xac, 0xd3, 0x75, 0xcf, 0xdb, 0xa3, 0x3b,
+0xdf, 0xeb, 0x75, 0xfe, 0x92, 0x5a, 0x56, 0xd3, 0x90, 0x31, 0xce, 0x8a, 0xf0, 0xb6, 0x2a, 0xe9,
+0xf6, 0x42, 0x88, 0x40, 0x80, 0xa7, 0x59, 0xb5, 0x7d, 0xba, 0x66, 0xd2, 0xc6, 0x52, 0x33, 0xb9,
+0x4a, 0x12, 0x9d, 0xd0, 0x08, 0xef, 0xdc, 0x87, 0xa3, 0x66, 0xf3, 0xee, 0x11, 0x81, 0xe4, 0x7f,
+0x0e, 0xb3, 0x2e, 0x32, 0x3d, 0xfd, 0xce, 0x30, 0x9b, 0x1a, 0xd7, 0x02, 0x1d, 0x89, 0xf0, 0x36,
+0xca, 0xbb, 0xa8, 0x4e, 0xf5, 0x24, 0x6d, 0xdf, 0x1e, 0x11, 0xcd, 0xa5, 0xb5, 0x55, 0xc9, 0xa6,
+0xf5, 0x22, 0x02, 0x01, 0x9e, 0xe6, 0xf0, 0xc6, 0x50, 0x82, 0x1f, 0xfd, 0xfc, 0xe8, 0xe6, 0xc7,
+0x4a, 0xd1, 0x39, 0xa8, 0xc0, 0x9a, 0x9a, 0x05, 0xa5, 0xb9, 0xf5, 0xff, 0x56, 0xf2, 0x11, 0x5e,
+0xfd, 0xa3, 0x6d, 0x6c, 0xf9, 0xd7, 0xd6, 0xb3, 0x8a, 0xca, 0x2a, 0x9c, 0x88, 0xe2, 0xce, 0x61,
+0x9c, 0x1f, 0x54, 0xe0, 0xed, 0x91, 0x37, 0xb8, 0x19, 0x2c, 0x7b, 0xf0, 0x21, 0x56, 0x73, 0x47,
+0x24, 0x57, 0x24, 0xf2, 0x1c, 0x1f, 0x5d, 0x87, 0x7d, 0xdc, 0x4c, 0xd4, 0x36, 0x79, 0x09, 0xb2,
+0xa2, 0xb2, 0x92, 0x2d, 0x6a, 0x6c, 0x32, 0x6b, 0xab, 0x92, 0x45, 0x21, 0x88, 0x40, 0x80, 0xda,
+0x23, 0xb7, 0x5f, 0x88, 0x08, 0x85, 0x46, 0xb6, 0xad, 0x32, 0x4a, 0x69, 0x65, 0x2e, 0x4c, 0x13,
+0x9e, 0x3a, 0x31, 0x2e, 0x22, 0x12, 0x8b, 0x42, 0x3b, 0x22, 0x90, 0xfc, 0xce, 0xd7, 0x73, 0xcc,
+0xe4, 0xc9, 0x88, 0x22, 0x12, 0x39, 0x91, 0x75, 0x4c, 0xe0, 0xeb, 0xe7, 0x89, 0xf0, 0xb6, 0x21,
+0x8b, 0x1e, 0xca, 0xe7, 0xfa, 0xa5, 0xe8, 0x43, 0x7b, 0x75, 0x6f, 0xfa, 0x75, 0x49, 0xed, 0xb3,
+0xb6, 0x14, 0x6b, 0x95, 0x20, 0x10, 0xe0, 0xd7, 0x9b, 0x14, 0x89, 0x24, 0x9a, 0x64, 0xac, 0x81,
+0xa5, 0xd2, 0x5e, 0x51, 0x27, 0xfe, 0xed, 0x8b, 0xe6, 0x22, 0x81, 0x40, 0xf2, 0x3f, 0x47, 0x9d,
+0xc9, 0x54, 0x5a, 0x2b, 0x92, 0x2e, 0x91, 0x8b, 0xd9, 0x25, 0x32, 0xc0, 0xdb, 0xfa, 0x49, 0xbf,
+0xb6, 0xcb, 0xdd, 0xbf, 0xc8, 0x7f, 0xa5, 0x3a, 0x5d, 0x93, 0xa7, 0xdf, 0xc9, 0x98, 0xd6, 0x5b,
+0x92, 0xc5, 0x85, 0x10, 0x08, 0x08, 0x0c, 0x77, 0xff, 0x7c, 0x5a, 0x2c, 0x11, 0x79, 0xb4, 0xc8,
+0xd1, 0x5e, 0x84, 0xe5, 0x59, 0x5b, 0xa1, 0x4e, 0x4b, 0x37, 0x3a, 0xaa, 0x95, 0x40, 0x20, 0x45,
+0x9d, 0x0f, 0x5a, 0x3b, 0x32, 0x23, 0xe5, 0x72, 0xfa, 0x0f, 0x39, 0x25, 0xe2, 0xa9, 0xc7, 0xba,
+0xba, 0xd0, 0x2e, 0x79, 0x3f, 0x6b, 0xe7, 0xd3, 0x03, 0x83, 0xfa, 0xb5, 0x68, 0x64, 0xa5, 0xdb,
+0x51, 0xc8, 0x1c, 0x5c, 0xc6, 0x20, 0x28, 0x7c, 0xfc, 0x97, 0x21, 0x0a, 0xed, 0x63, 0x36, 0x04,
+0xc3, 0xd2, 0xa4, 0x52, 0xc3, 0xd2, 0xd6, 0x35, 0xdc, 0x7a, 0x47, 0x03, 0x1d, 0xd1, 0x6b, 0xbc,
+0xd3, 0x8a, 0x82, 0x3b, 0x9a, 0xb7, 0xd0, 0xf3, 0xd1, 0xc3, 0xdb, 0x7d, 0x17, 0x33, 0x6c, 0xc0,
+0xb9, 0xec, 0x81, 0x87, 0xa4, 0xa4, 0x2d, 0xef, 0x7d, 0x61, 0x9f, 0xb7, 0x0b, 0xb5, 0x49, 0x94,
+0xe5, 0xb1, 0xc8, 0x70, 0xf1, 0x3d, 0xcd, 0xec, 0xea, 0x81, 0x8c, 0x69, 0xbd, 0xd4, 0xa6, 0xae,
+0x2e, 0x2e, 0x44, 0x04, 0x02, 0x00, 0xf0, 0x64, 0x34, 0x92, 0x25, 0x12, 0xf1, 0x7d, 0xc4, 0xc7,
+0xdb, 0x83, 0x64, 0x9a, 0x57, 0x3d, 0x64, 0xe2, 0xed, 0x21, 0x76, 0xf9, 0x54, 0xc6, 0xae, 0x0a,
+0xed, 0x6e, 0x3e, 0x92, 0x00, 0xb3, 0xb0, 0x00, 0x00, 0x9e, 0x88, 0x46, 0x68, 0xe4, 0x2d, 0x47,
+0xcc, 0x09, 0x3d, 0x12, 0x99, 0x5b, 0x13, 0x0e, 0x6a, 0x7b, 0x90, 0x39, 0xf3, 0xaa, 0x61, 0xd4,
+0xae, 0x36, 0x0d, 0x58, 0x5c, 0x7d, 0xd0, 0x1b, 0x04, 0x02, 0x00, 0xf0, 0xd2, 0x8d, 0x33, 0xc6,
+0x92, 0x6c, 0x65, 0x32, 0xc9, 0x06, 0xf8, 0xc1, 0x56, 0x3c, 0xd2, 0x16, 0x64, 0x89, 0x50, 0x1b,
+0xf4, 0x51, 0x3b, 0xd8, 0x39, 0xe6, 0xcc, 0xaf, 0x64, 0xe1, 0xbb, 0x32, 0xa6, 0xf5, 0x46, 0xd9,
+0xc6, 0x1d, 0x9d, 0x10, 0x08, 0x00, 0x20, 0x18, 0x37, 0xce, 0x1f, 0x85, 0x12, 0x63, 0x3f, 0x0a,
+0xd1, 0x4c, 0xab, 0xee, 0x59, 0x15, 0x15, 0x89, 0x20, 0x4b, 0x84, 0xb7, 0x43, 0x5e, 0xeb, 0x43,
+0x16, 0xaf, 0x6a, 0x66, 0xbc, 0xcd, 0xd2, 0x5f, 0x76, 0xed, 0xf9, 0xe9, 0x10, 0x08, 0x00, 0xc0,
+0xab, 0x37, 0xcf, 0x7e, 0xfe, 0xa1, 0x9d, 0xdf, 0x10, 0xe3, 0xb7, 0x7f, 0x65, 0xbd, 0xd9, 0x8d,
+0x31, 0x28, 0x50, 0x2a, 0xcb, 0xd6, 0xda, 0x17, 0x6a, 0xa3, 0x85, 0x77, 0x66, 0x44, 0x21, 0xb4,
+0xc5, 0x49, 0x17, 0x04, 0x02, 0x00, 0x08, 0x9a, 0x44, 0xe2, 0xfc, 0x58, 0x5b, 0x31, 0xbf, 0xb2,
+0x6f, 0xc5, 0xfa, 0xb6, 0x40, 0x4a, 0x84, 0xda, 0x80, 0x25, 0x59, 0xaf, 0xdd, 0x8d, 0xb2, 0x16,
+0xf1, 0x28, 0xc4, 0x64, 0xf7, 0x04, 0x57, 0x6a, 0x21, 0x10, 0x08, 0x00, 0xc0, 0xfb, 0x37, 0xd1,
+0x1f, 0x87, 0x7a, 0xe6, 0xd6, 0x84, 0x9f, 0x5c, 0xda, 0xf2, 0x60, 0x22, 0xa0, 0xbf, 0x3f, 0x6d,
+0x4a, 0x39, 0x60, 0x77, 0xb3, 0x45, 0x92, 0x48, 0x29, 0xa2, 0x10, 0x08, 0x04, 0x00, 0xa0, 0xca,
+0x4d, 0x74, 0xa0, 0xba, 0x6e, 0x45, 0x7b, 0xfd, 0x63, 0xdf, 0x0c, 0xea, 0xc3, 0xbb, 0x6c, 0xa7,
+0xb2, 0x16, 0xd4, 0x37, 0x98, 0xd5, 0x8d, 0x1c, 0x8f, 0x42, 0xb0, 0x0e, 0x04, 0x00, 0x00, 0x14,
+0xa1, 0xf1, 0x67, 0x62, 0x81, 0xe1, 0x7e, 0x3b, 0xef, 0xbd, 0x76, 0x6e, 0x92, 0x9d, 0x1c, 0x1a,
+0xcc, 0x94, 0x90, 0x83, 0x4f, 0x7a, 0x44, 0x04, 0x02, 0x00, 0x00, 0x8a, 0x70, 0xe4, 0xaf, 0x42,
+0x31, 0xfe, 0xc1, 0xd6, 0x36, 0x2e, 0xf3, 0x17, 0xd7, 0x8a, 0xc3, 0xcd, 0x28, 0x04, 0x02, 0x01,
+0x00, 0x00, 0xb5, 0xe8, 0x65, 0x36, 0x1f, 0x65, 0xe0, 0x76, 0x2d, 0x04, 0x02, 0x01, 0x00, 0x00,
+0xb5, 0xa2, 0x10, 0xaa, 0x83, 0x3c, 0x69, 0x67, 0x71, 0xe1, 0xbc, 0x45, 0xb5, 0x6c, 0x41, 0x7d,
+0xc4, 0xb5, 0x28, 0x04, 0x02, 0x01, 0x00, 0x00, 0xf5, 0x24, 0x12, 0x97, 0x91, 0x48, 0xee, 0x28,
+0xe4, 0x6e, 0xf7, 0xa2, 0x10, 0x08, 0x04, 0x00, 0x00, 0x14, 0xe4, 0xe8, 0x5f, 0x87, 0x36, 0x33,
+0x1b, 0xab, 0xd4, 0x69, 0x8b, 0x13, 0x93, 0x28, 0x64, 0x13, 0x04, 0x02, 0x00, 0x00, 0xc1, 0xc6,
+0xd6, 0x86, 0x8b, 0x8b, 0x9a, 0x32, 0xa2, 0x10, 0xda, 0x23, 0x2b, 0x0a, 0x81, 0x00, 0x00, 0x40,
+0x70, 0xa3, 0x10, 0x5b, 0xab, 0xd4, 0x45, 0x14, 0xb2, 0x22, 0x23, 0x0a, 0x29, 0xba, 0x16, 0x82,
+0x75, 0x20, 0x00, 0x00, 0xa0, 0x38, 0x77, 0xfe, 0x4f, 0x92, 0x9e, 0x1d, 0x92, 0xf5, 0x01, 0x54,
+0x5f, 0x5e, 0xbb, 0xca, 0x4e, 0xbc, 0xba, 0x3b, 0xfd, 0x65, 0x7a, 0x76, 0x7a, 0xc1, 0x0b, 0x33,
+0x11, 0x81, 0x00, 0x00, 0x80, 0xfa, 0xe4, 0x4c, 0x65, 0x59, 0x44, 0x21, 0x4f, 0x17, 0xf3, 0x9f,
+0x42, 0x20, 0x00, 0x00, 0xa0, 0x38, 0xc7, 0x7e, 0x62, 0x2f, 0x95, 0xb5, 0x30, 0xb3, 0x16, 0xd2,
+0xc5, 0x36, 0xee, 0x88, 0x40, 0x20, 0x00, 0x00, 0x10, 0x64, 0x89, 0x6c, 0xca, 0x3d, 0x2b, 0xcb,
+0x22, 0x0a, 0xe9, 0x82, 0x40, 0x00, 0x00, 0x00, 0xe4, 0x4c, 0x65, 0x85, 0x1b, 0x33, 0xa2, 0x90,
+0xa7, 0x79, 0x14, 0x52, 0xd0, 0x13, 0xbb, 0x20, 0x10, 0x00, 0x00, 0xf0, 0x4f, 0x14, 0x12, 0xcf,
+0xf5, 0x18, 0x5c, 0x8a, 0x42, 0xaa, 0x97, 0xcf, 0x88, 0x42, 0x48, 0x1e, 0x05, 0x3d, 0xf6, 0x16,
+0x02, 0x01, 0x00, 0x00, 0x7f, 0x91, 0x73, 0xaf, 0xac, 0x9a, 0x48, 0x63, 0xfa, 0x4b, 0x05, 0x4d,
+0xe9, 0x85, 0x40, 0x00, 0x00, 0xc0, 0x47, 0x1c, 0xef, 0x12, 0x7b, 0x65, 0x65, 0x4d, 0x65, 0xdd,
+0x72, 0x6b, 0x58, 0xec, 0x93, 0x65, 0x20, 0x52, 0xc8, 0xc2, 0x42, 0x08, 0x04, 0x00, 0x00, 0xfc,
+0x27, 0x91, 0x18, 0x4b, 0xb2, 0x81, 0x6c, 0x33, 0xb2, 0x4c, 0x6b, 0x21, 0x10, 0x08, 0x00, 0x00,
+0x00, 0xee, 0x88, 0x6e, 0x7e, 0x24, 0xac, 0x1c, 0x42, 0x11, 0x08, 0x45, 0x22, 0x06, 0x3a, 0xf3,
+0x9d, 0xd2, 0x0b, 0x81, 0x00, 0x00, 0x80, 0x0f, 0xd1, 0xba, 0x45, 0x2a, 0xab, 0x27, 0xdb, 0x7b,
+0x6e, 0x6d, 0x68, 0x2a, 0x2a, 0x0a, 0x81, 0x40, 0x00, 0x00, 0xc0, 0xbf, 0x12, 0xe9, 0xe7, 0xe1,
+0x46, 0xcc, 0x2a, 0x8d, 0x55, 0x5d, 0xd7, 0xc0, 0xe6, 0xcc, 0xaf, 0x32, 0xfe, 0x95, 0x2e, 0x08,
+0x04, 0x00, 0x00, 0x80, 0x4e, 0x77, 0xf6, 0x28, 0x64, 0xc6, 0x8c, 0xac, 0x70, 0x3e, 0xcf, 0x0a,
+0x81, 0x40, 0x00, 0x00, 0xc0, 0xcf, 0x51, 0xc8, 0xdf, 0x84, 0x34, 0x1e, 0x6c, 0xf4, 0x5a, 0xd5,
+0x42, 0xaa, 0x96, 0x47, 0xd8, 0xac, 0x39, 0x15, 0xc6, 0xbf, 0x62, 0x3b, 0x8d, 0x05, 0x81, 0x00,
+0x00, 0x80, 0xff, 0xe9, 0x63, 0x16, 0x6b, 0x43, 0x48, 0x1e, 0x69, 0x0b, 0x0b, 0x5b, 0x79, 0x14,
+0xd2, 0x0a, 0x81, 0x00, 0x00, 0x00, 0x60, 0xe3, 0x7f, 0x13, 0x4a, 0xf0, 0x70, 0xa3, 0xdb, 0xaa,
+0x16, 0xb2, 0xe0, 0x8e, 0xc2, 0x8a, 0xe9, 0x10, 0x08, 0x00, 0x00, 0x04, 0x41, 0x22, 0x7f, 0x1b,
+0x8a, 0xf1, 0x0f, 0x03, 0x66, 0xdf, 0xa3, 0xed, 0x4d, 0x2a, 0x97, 0xd6, 0x19, 0x5f, 0xea, 0xb4,
+0xb3, 0x3f, 0x16, 0x04, 0x02, 0x00, 0x00, 0xc1, 0x81, 0xa6, 0xf5, 0x26, 0xcc, 0xbe, 0x91, 0x16,
+0x85, 0xd8, 0xda, 0x1f, 0x0b, 0x02, 0x01, 0x00, 0x80, 0xe0, 0x44, 0x21, 0x5a, 0x32, 0xc9, 0xb6,
+0x9a, 0x6d, 0xb2, 0x38, 0x77, 0x61, 0x6d, 0xfa, 0x94, 0xde, 0x4d, 0xb9, 0xfe, 0x3d, 0x3c, 0xd2,
+0x16, 0x00, 0x00, 0x02, 0xc6, 0x1d, 0xff, 0x9d, 0x3c, 0xce, 0x68, 0xff, 0xab, 0x34, 0x2e, 0x9d,
+0x18, 0x63, 0x17, 0x0e, 0x8f, 0x18, 0x5f, 0x5a, 0xc9, 0xb6, 0x6f, 0xd0, 0x10, 0x81, 0x00, 0x00,
+0x00, 0xd0, 0x31, 0x5d, 0x1b, 0x52, 0x55, 0x97, 0xdf, 0x94, 0x5e, 0x08, 0x04, 0x00, 0x00, 0x02,
+0xc6, 0x89, 0xbf, 0x33, 0xdf, 0x6c, 0x71, 0xd6, 0xec, 0x0a, 0x36, 0x7f, 0xe9, 0x72, 0xe3, 0x5b,
+0x3b, 0x21, 0x10, 0x00, 0x00, 0x00, 0x33, 0xe0, 0xbe, 0xe8, 0x31, 0xdb, 0x6c, 0x71, 0x41, 0xfd,
+0x8c, 0x95, 0xe9, 0xb4, 0xcd, 0x7b, 0x27, 0x04, 0x02, 0x00, 0x00, 0x60, 0x9a, 0x4f, 0xfe, 0x3e,
+0xa4, 0xf1, 0x0f, 0x5b, 0xd3, 0x5f, 0xaf, 0x58, 0x10, 0x16, 0x87, 0x81, 0x0e, 0x08, 0x04, 0x00,
+0x00, 0x40, 0x3a, 0x7d, 0x3c, 0xec, 0xd0, 0x32, 0x16, 0x16, 0xd6, 0xcf, 0x98, 0xd2, 0xdb, 0x65,
+0xb5, 0x26, 0x04, 0x02, 0x01, 0x00, 0x80, 0xe0, 0x46, 0x21, 0xa6, 0x5b, 0xbe, 0xcf, 0xaf, 0xad,
+0x4b, 0x2f, 0xa6, 0x77, 0x42, 0x20, 0x00, 0x00, 0x00, 0x66, 0x4a, 0xe4, 0xa7, 0x21, 0x5a, 0x9d,
+0x1e, 0x9b, 0x21, 0x06, 0x2e, 0x8f, 0xf9, 0xb5, 0x33, 0x8a, 0xe9, 0x9b, 0x20, 0x10, 0x00, 0x00,
+0x00, 0x19, 0xc8, 0x82, 0xfa, 0x8c, 0x4c, 0x56, 0xf5, 0xcc, 0x62, 0x7a, 0xd4, 0xec, 0x69, 0x85,
+0x10, 0x08, 0x00, 0x00, 0x04, 0x9c, 0x4f, 0x7f, 0x1a, 0x8a, 0x73, 0x6b, 0xf4, 0x1b, 0x0d, 0x52,
+0x51, 0x1d, 0x66, 0x73, 0xe6, 0xcd, 0x58, 0x99, 0xde, 0x09, 0x81, 0x00, 0x00, 0x00, 0x30, 0x23,
+0x63, 0x9f, 0xac, 0xb4, 0x28, 0x64, 0x13, 0x04, 0x02, 0x00, 0x00, 0x20, 0x33, 0x0a, 0xf9, 0x07,
+0xb1, 0xe5, 0xfb, 0x56, 0x63, 0x14, 0x32, 0x7f, 0xc9, 0x8c, 0x3a, 0x48, 0x6b, 0x7a, 0x1a, 0x0b,
+0x02, 0x01, 0x00, 0x00, 0x90, 0x92, 0xc8, 0x3f, 0x86, 0x36, 0x73, 0x6f, 0x68, 0xba, 0x43, 0x66,
+0xcd, 0xab, 0x64, 0xf3, 0x96, 0xcc, 0xd8, 0xe6, 0xfd, 0x69, 0x08, 0x04, 0x00, 0x00, 0x80, 0x15,
+0xbd, 0xc6, 0x2f, 0xd2, 0x66, 0x63, 0x75, 0x42, 0x20, 0x00, 0x00, 0x00, 0x4c, 0x39, 0xf9, 0x8f,
+0xa1, 0x7e, 0x66, 0x98, 0xd6, 0x5b, 0xb9, 0xac, 0xc1, 0xb8, 0x26, 0x24, 0x62, 0x7c, 0xdc, 0x2d,
+0x04, 0x02, 0x00, 0x00, 0x60, 0x26, 0x49, 0x1e, 0x85, 0x18, 0x6a, 0x21, 0xf3, 0x96, 0x98, 0xaf,
+0x09, 0x81, 0x40, 0x00, 0x00, 0x00, 0xcc, 0x8c, 0x42, 0xfe, 0x69, 0xe6, 0xe3, 0x6f, 0xab, 0x57,
+0xcc, 0x98, 0x8d, 0xd5, 0x09, 0x81, 0x00, 0x00, 0x00, 0xc8, 0x12, 0x84, 0xdc, 0x5c, 0x5c, 0x38,
+0xa7, 0x3a, 0xcc, 0x66, 0xdf, 0x5c, 0x13, 0x32, 0x9d, 0xc6, 0x82, 0x40, 0x00, 0x00, 0x00, 0x64,
+0x30, 0xf1, 0x4f, 0x21, 0xda, 0x64, 0xb1, 0xef, 0x66, 0x1a, 0xab, 0x2e, 0x23, 0x0a, 0x81, 0x40,
+0x00, 0x00, 0x00, 0x58, 0x41, 0x33, 0xb2, 0xc4, 0xe2, 0xc2, 0xca, 0xdb, 0x1a, 0x8c, 0xaf, 0x77,
+0x40, 0x20, 0x00, 0x00, 0x00, 0xac, 0xa3, 0x90, 0x7f, 0x16, 0xbb, 0xf5, 0x8a, 0x67, 0x86, 0xd0,
+0xd6, 0x26, 0x74, 0x48, 0xc4, 0xa2, 0x42, 0x08, 0x04, 0x00, 0x00, 0x80, 0x25, 0xc9, 0x24, 0xeb,
+0xe3, 0x47, 0x22, 0x49, 0x2b, 0xd3, 0x67, 0x46, 0x21, 0x9d, 0x10, 0x08, 0x00, 0x00, 0x00, 0x4b,
+0x4e, 0xfd, 0xcb, 0xcd, 0x67, 0x86, 0xcc, 0x5b, 0x3c, 0x73, 0x3a, 0x2f, 0x04, 0x02, 0x00, 0x00,
+0x20, 0x97, 0x44, 0xfa, 0xf9, 0x07, 0x6d, 0xf6, 0xbc, 0xca, 0x19, 0x69, 0x2c, 0x08, 0x04, 0x00,
+0x00, 0x40, 0x6e, 0xe4, 0xe2, 0xc2, 0xf9, 0x4b, 0x6f, 0xa6, 0xb1, 0x20, 0x10, 0x00, 0x00, 0x00,
+0xb9, 0xa3, 0x90, 0x7f, 0x0d, 0xf5, 0x73, 0x7f, 0xc4, 0xe7, 0x1a, 0xd2, 0x58, 0x10, 0x08, 0x00,
+0x00, 0x00, 0xbb, 0xf4, 0x88, 0x34, 0x56, 0x55, 0x18, 0x02, 0x01, 0x00, 0x00, 0x60, 0x9f, 0xd3,
+0xff, 0x2a, 0xb6, 0x38, 0x89, 0xe9, 0xb3, 0xb1, 0x20, 0x10, 0x00, 0x00, 0x00, 0xf6, 0x49, 0xb2,
+0xde, 0x5b, 0x6a, 0x6a, 0x21, 0x10, 0x00, 0x00, 0x00, 0x79, 0x46, 0x21, 0xff, 0x16, 0x8a, 0xcd,
+0xa9, 0x0a, 0xc7, 0x68, 0x6f, 0x2c, 0x08, 0x04, 0x00, 0x00, 0x40, 0xbe, 0xf4, 0xce, 0x5d, 0x54,
+0x87, 0x56, 0x00, 0x00, 0x00, 0x90, 0x3f, 0x35, 0xff, 0xf1, 0xc9, 0xfe, 0xff, 0x17, 0x60, 0x00,
+0xb5, 0x4d, 0xe6, 0xa8, 0xa5, 0xe0, 0x35, 0x86, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+0xae, 0x42, 0x60, 0x82
 };
diff --git a/Source/Core/DolphinWX/resources/dolphin_logo.png b/Source/Core/DolphinWX/resources/dolphin_logo.png
deleted file mode 100644
index 73da44dfb0..0000000000
Binary files a/Source/Core/DolphinWX/resources/dolphin_logo.png and /dev/null differ
diff --git a/Source/Core/DolphinWX/resources/rating_gamelist.h b/Source/Core/DolphinWX/resources/rating_gamelist.h
index de90bc79eb..8e5516add2 100644
--- a/Source/Core/DolphinWX/resources/rating_gamelist.h
+++ b/Source/Core/DolphinWX/resources/rating_gamelist.h
@@ -1,3 +1,7 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 static const char *rating_5[] = {
 "96 32 33 1",
 "7 c #EBB027",
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 76871e5b3b..75679b6a9f 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -1,35 +1,49 @@
-set(SRCS	Src/ControllerEmu.cpp
-			Src/InputConfig.cpp
-			Src/UDPWiimote.cpp
-			Src/UDPWrapper.cpp
-			Src/ControllerInterface/ControllerInterface.cpp
-			Src/ControllerInterface/Device.cpp
-			Src/ControllerInterface/ExpressionParser.cpp)
+set(SRCS	ControllerEmu.cpp
+			InputConfig.cpp
+			ControllerInterface/ControllerInterface.cpp
+			ControllerInterface/Device.cpp
+			ControllerInterface/ExpressionParser.cpp)
+
+
+set(LIBS	common)
 
 if(WIN32)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/DInput/DInput.cpp
-				Src/ControllerInterface/DInput/DInputJoystick.cpp
-				Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
-				Src/ControllerInterface/SDL/SDL.cpp
-				Src/ControllerInterface/XInput/XInput.cpp)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+				ControllerInterface/DInput/DInput.cpp
+				ControllerInterface/DInput/DInputJoystick.cpp
+				ControllerInterface/DInput/DInputKeyboardMouse.cpp
+				ControllerInterface/XInput/XInput.cpp
+				ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
+elseif(APPLE)
+	find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+	find_library(CARBON_LIBRARY Carbon)
+	find_library(COCOA_LIBRARY Cocoa)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/OSX/OSX.mm
-				Src/ControllerInterface/OSX/OSXKeyboard.mm
-				Src/ControllerInterface/OSX/OSXJoystick.mm
-				Src/ControllerInterface/SDL/SDL.cpp)
+				ControllerInterface/OSX/OSX.mm
+				ControllerInterface/OSX/OSXKeyboard.mm
+				ControllerInterface/OSX/OSXJoystick.mm
+				ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
+	set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
 elseif(X11_FOUND)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/SDL/SDL.cpp
-				Src/ControllerInterface/Xlib/Xlib.cpp)
+				ControllerInterface/Xlib/Xlib.cpp)
 	if(XINPUT2_FOUND)
 		set(SRCS	${SRCS}
-					Src/ControllerInterface/Xlib/XInput2.cpp)
+					ControllerInterface/Xlib/XInput2.cpp)
 	endif()
+	set(LIBS ${LIBS} ${X11_LIBRARIES} ${XINPUT2_LIBRARIES})
 elseif(ANDROID)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/Android/Android.cpp)
+				ControllerInterface/Android/Android.cpp)
 endif()
 
-add_library(inputcommon ${SRCS})
+if(SDL_FOUND OR SDL2_FOUND)
+	set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
+	if (SDL2_FOUND)
+		set(LIBS ${LIBS} ${SDL2_LIBRARY})
+	elseif(SDL_FOUND)
+		set(LIBS ${LIBS} ${SDL_LIBRARY})
+	endif()
+endif()
+
+add_dolphin_library(inputcommon "${SRCS}" "${LIBS}")
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
new file mode 100644
index 0000000000..f1d33c65c3
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -0,0 +1,235 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "InputCommon/ControllerEmu.h"
+
+void ControllerEmu::UpdateReferences(ControllerInterface& devi)
+{
+	for (auto& ctrlGroup : groups)
+	{
+		for (auto& control : ctrlGroup->controls)
+			devi.UpdateReference(control->control_ref.get(), default_device);
+
+		// extension
+		if (ctrlGroup->type == GROUP_TYPE_EXTENSION)
+		{
+			for (auto& attachment : ((Extension*)ctrlGroup.get())->attachments)
+				attachment->UpdateReferences(devi);
+		}
+	}
+}
+
+void ControllerEmu::UpdateDefaultDevice()
+{
+	for (auto& ctrlGroup : groups)
+	{
+		// extension
+		if (ctrlGroup->type == GROUP_TYPE_EXTENSION)
+		{
+			for (auto& ai : ((Extension*)ctrlGroup.get())->attachments)
+			{
+				ai->default_device = default_device;
+				ai->UpdateDefaultDevice();
+			}
+		}
+	}
+}
+
+void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
+{
+	std::string group(base + name + "/");
+
+	// settings
+	for (auto& s : settings)
+	{
+		if (s->is_virtual)
+			continue;
+		if (s->is_iterate)
+			continue;
+		sec->Get(group + s->name, &s->value, s->default_value * 100);
+		s->value /= 100;
+	}
+
+	for (auto& c : controls)
+	{
+		// control expression
+		sec->Get(group + c->name, &c->control_ref->expression, "");
+
+		// range
+		sec->Get(group + c->name + "/Range", &c->control_ref->range, 100.0);
+		c->control_ref->range /= 100;
+
+	}
+
+	// extensions
+	if (type == GROUP_TYPE_EXTENSION)
+	{
+		Extension* const ext = (Extension*)this;
+
+		ext->switch_extension = 0;
+		unsigned int n = 0;
+		std::string extname;
+		sec->Get(base + name, &extname, "");
+
+		for (auto& ai : ext->attachments)
+		{
+			ai->default_device.FromString(defdev);
+			ai->LoadConfig(sec, base + ai->GetName() + "/");
+
+			if (ai->GetName() == extname)
+				ext->switch_extension = n;
+
+			n++;
+		}
+	}
+}
+
+void ControllerEmu::LoadConfig(IniFile::Section *sec, const std::string& base)
+{
+	std::string defdev = default_device.ToString();
+	if (base.empty())
+	{
+		sec->Get(base + "Device", &defdev, "");
+		default_device.FromString(defdev);
+	}
+
+	for (auto& cg : groups)
+		cg->LoadConfig(sec, defdev, base);
+}
+
+void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
+{
+	std::string group(base + name + "/");
+
+	for (auto& s : settings)
+	{
+		if (s->is_virtual)
+			continue;
+		if (s->is_iterate)
+			continue;
+
+		sec->Set(group + s->name, s->value * 100.0, s->default_value * 100.0);
+	}
+
+	for (auto& c : controls)
+	{
+		// control expression
+		sec->Set(group + c->name, c->control_ref->expression, "");
+
+		// range
+		sec->Set(group + c->name + "/Range", c->control_ref->range*100.0, 100.0);
+	}
+
+	// extensions
+	if (type == GROUP_TYPE_EXTENSION)
+	{
+		Extension* const ext = (Extension*)this;
+		sec->Set(base + name, ext->attachments[ext->switch_extension]->GetName(), "None");
+
+		for (auto& ai : ext->attachments)
+			ai->SaveConfig(sec, base + ai->GetName() + "/");
+	}
+}
+
+void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
+{
+	const std::string defdev = default_device.ToString();
+	if (base.empty())
+		sec->Set(/*std::string(" ") +*/ base + "Device", defdev, "");
+
+	for (auto& ctrlGroup : groups)
+		ctrlGroup->SaveConfig(sec, defdev, base);
+}
+
+ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
+	: ControlGroup(_name, GROUP_TYPE_STICK)
+{
+	for (auto& named_direction : named_directions)
+		controls.emplace_back(new Input(named_direction));
+
+	controls.emplace_back(new Input(_trans("Modifier")));
+	settings.emplace_back(new Setting(_trans("Radius"), default_radius, 0, 100));
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Buttons::Buttons(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS)
+{
+	settings.emplace_back(new Setting(_trans("Threshold"), 0.5));
+}
+
+ControllerEmu::MixedTriggers::MixedTriggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_MIXED_TRIGGERS)
+{
+	settings.emplace_back(new Setting(_trans("Threshold"), 0.9));
+}
+
+ControllerEmu::Triggers::Triggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_TRIGGERS)
+{
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Slider::Slider(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_SLIDER)
+{
+	controls.emplace_back(new Input("Left"));
+	controls.emplace_back(new Input("Right"));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Force::Force(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_FORCE)
+{
+	memset(m_swing, 0, sizeof(m_swing));
+
+	controls.emplace_back(new Input(_trans("Up")));
+	controls.emplace_back(new Input(_trans("Down")));
+	controls.emplace_back(new Input(_trans("Left")));
+	controls.emplace_back(new Input(_trans("Right")));
+	controls.emplace_back(new Input(_trans("Forward")));
+	controls.emplace_back(new Input(_trans("Backward")));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Tilt::Tilt(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_TILT)
+{
+	memset(m_tilt, 0, sizeof(m_tilt));
+
+	controls.emplace_back(new Input("Forward"));
+	controls.emplace_back(new Input("Backward"));
+	controls.emplace_back(new Input("Left"));
+	controls.emplace_back(new Input("Right"));
+
+	controls.emplace_back(new Input(_trans("Modifier")));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+	settings.emplace_back(new Setting(_trans("Circle Stick"), 0));
+	settings.emplace_back(new Setting(_trans("Angle"), 0.9, 0, 180));
+}
+
+ControllerEmu::Cursor::Cursor(const std::string& _name)
+	: ControlGroup(_name, GROUP_TYPE_CURSOR)
+	, m_z(0)
+{
+	for (auto& named_direction : named_directions)
+		controls.emplace_back(new Input(named_direction));
+	controls.emplace_back(new Input("Forward"));
+	controls.emplace_back(new Input("Backward"));
+	controls.emplace_back(new Input(_trans("Hide")));
+
+	settings.emplace_back(new Setting(_trans("Center"), 0.5));
+	settings.emplace_back(new Setting(_trans("Width"), 0.5));
+	settings.emplace_back(new Setting(_trans("Height"), 0.5));
+}
+
+void ControllerEmu::LoadDefaults(const ControllerInterface &ciface)
+{
+	// load an empty inifile section, clears everything
+	IniFile::Section sec;
+	LoadConfig(&sec);
+
+	if (ciface.Devices().size())
+	{
+		default_device.FromDevice(ciface.Devices()[0]);
+		UpdateDefaultDevice();
+	}
+}
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h
new file mode 100644
index 0000000000..0737556c69
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerEmu.h
@@ -0,0 +1,449 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "InputCommon/GCPadStatus.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+#define sign(x) ((x)?(x)<0?-1:1:0)
+
+enum
+{
+	GROUP_TYPE_OTHER,
+	GROUP_TYPE_STICK,
+	GROUP_TYPE_MIXED_TRIGGERS,
+	GROUP_TYPE_BUTTONS,
+	GROUP_TYPE_FORCE,
+	GROUP_TYPE_EXTENSION,
+	GROUP_TYPE_TILT,
+	GROUP_TYPE_CURSOR,
+	GROUP_TYPE_TRIGGERS,
+	GROUP_TYPE_SLIDER
+};
+
+enum
+{
+	SETTING_RADIUS,
+	SETTING_DEADZONE,
+};
+
+const char* const named_directions[] =
+{
+	"Up",
+	"Down",
+	"Left",
+	"Right"
+};
+
+class ControllerEmu
+{
+public:
+
+	class ControlGroup
+	{
+	public:
+
+		class Control
+		{
+		protected:
+			Control(ControllerInterface::ControlReference* const _ref, const std::string& _name)
+				: control_ref(_ref), name(_name) {}
+
+		public:
+			virtual ~Control() {}
+			std::unique_ptr<ControllerInterface::ControlReference> const control_ref;
+			const std::string name;
+
+		};
+
+		class Input : public Control
+		{
+		public:
+
+			Input(const std::string& _name)
+				: Control(new ControllerInterface::InputReference, _name) {}
+		};
+
+		class Output : public Control
+		{
+		public:
+
+			Output(const std::string& _name)
+				: Control(new ControllerInterface::OutputReference, _name) {}
+		};
+
+		class Setting
+		{
+		public:
+			Setting(const std::string& _name, const ControlState def_value
+				, const unsigned int _low = 0, const unsigned int _high = 100)
+				: name(_name)
+				, value(def_value)
+				, default_value(def_value)
+				, low(_low)
+				, high(_high)
+				, is_virtual(false)
+				, is_iterate(false) {}
+
+			virtual ~Setting()
+			{
+			}
+
+			const std::string   name;
+			ControlState        value;
+			const ControlState  default_value;
+			const unsigned int  low, high;
+			bool                is_virtual;
+			bool                is_iterate;
+
+			virtual void SetValue(ControlState new_value)
+			{
+				value = new_value;
+			}
+
+			virtual ControlState GetValue()
+			{
+				return value;
+			}
+		};
+
+		class BackgroundInputSetting : public Setting
+		{
+		public:
+			BackgroundInputSetting(const std::string &_name) : Setting(_name, false)
+			{
+				is_virtual = true;
+			}
+
+			void SetValue(ControlState new_value) override
+			{
+				SConfig::GetInstance().m_BackgroundInput = !!new_value;
+			}
+
+			ControlState GetValue() override
+			{
+				return SConfig::GetInstance().m_BackgroundInput;
+			}
+		};
+
+		class IterateUI : public Setting
+		{
+		public:
+			IterateUI(const std::string &_name) : Setting(_name, false)
+			{
+				is_iterate = true;
+			}
+		};
+
+		ControlGroup(const std::string& _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {}
+		virtual ~ControlGroup() {}
+
+		virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
+		virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
+
+		const std::string     name;
+		const unsigned int    type;
+
+		std::vector<std::unique_ptr<Control>> controls;
+		std::vector<std::unique_ptr<Setting>> settings;
+
+	};
+
+	class AnalogStick : public ControlGroup
+	{
+	public:
+		// The GameCube controller and Wiimote attachments have a different default radius
+		AnalogStick(const char* const _name, ControlState default_radius);
+
+		void GetState(ControlState* const x, ControlState* const y)
+		{
+			ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
+			ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
+
+			ControlState radius = settings[SETTING_RADIUS]->value;
+			ControlState deadzone = settings[SETTING_DEADZONE]->value;
+			ControlState m = controls[4]->control_ref->State();
+
+			ControlState ang = atan2(yy, xx);
+			ControlState ang_sin = sin(ang);
+			ControlState ang_cos = cos(ang);
+
+			ControlState dist = sqrt(xx*xx + yy*yy);
+
+			// dead zone code
+			dist = std::max(0.0, dist - deadzone);
+			dist /= (1 - deadzone);
+
+			// radius
+			dist *= radius;
+
+			// The modifier halves the distance by 50%, which is useful
+			// for keyboard controls.
+			if (m)
+				dist *= 0.5;
+
+			yy = std::max(-1.0, std::min(1.0, ang_sin * dist));
+			xx = std::max(-1.0, std::min(1.0, ang_cos * dist));
+
+			*y = yy;
+			*x = xx;
+		}
+	};
+
+	class Buttons : public ControlGroup
+	{
+	public:
+		Buttons(const std::string& _name);
+
+		template <typename C>
+		void GetState(C* const buttons, const C* bitmasks)
+		{
+			for (auto& control : controls)
+			{
+				if (control->control_ref->State() > settings[0]->value) // threshold
+					*buttons |= *bitmasks;
+
+				bitmasks++;
+			}
+		}
+
+	};
+
+	class MixedTriggers : public ControlGroup
+	{
+	public:
+		MixedTriggers(const std::string& _name);
+
+		void GetState(u16 *const digital, const u16* bitmasks, ControlState* analog)
+		{
+			const unsigned int trig_count = ((unsigned int) (controls.size() / 2));
+			for (unsigned int i=0; i<trig_count; ++i,++bitmasks,++analog)
+			{
+				if (controls[i]->control_ref->State() > settings[0]->value) //threshold
+				{
+					*analog = 1.0;
+					*digital |= *bitmasks;
+				}
+				else
+				{
+					*analog = controls[i+trig_count]->control_ref->State();
+				}
+			}
+		}
+	};
+
+	class Triggers : public ControlGroup
+	{
+	public:
+		Triggers(const std::string& _name);
+
+		void GetState(ControlState* analog)
+		{
+			const unsigned int trig_count = ((unsigned int) (controls.size()));
+			const ControlState deadzone = settings[0]->value;
+			for (unsigned int i=0; i<trig_count; ++i,++analog)
+				*analog = std::max(controls[i]->control_ref->State() - deadzone, 0.0) / (1 - deadzone);
+		}
+	};
+
+	class Slider : public ControlGroup
+	{
+	public:
+		Slider(const std::string& _name);
+
+		void GetState(ControlState* const slider)
+		{
+			const ControlState deadzone = settings[0]->value;
+			const ControlState state = controls[1]->control_ref->State() - controls[0]->control_ref->State();
+
+			if (fabs(state) > deadzone)
+				*slider = (state - (deadzone * sign(state))) / (1 - deadzone);
+			else
+				*slider = 0;
+		}
+	};
+
+	class Force : public ControlGroup
+	{
+	public:
+		Force(const std::string& _name);
+
+		void GetState(ControlState* axis)
+		{
+			const ControlState deadzone = settings[0]->value;
+			for (unsigned int i = 0; i < 6; i += 2)
+			{
+				ControlState tmpf = 0;
+				const ControlState state = controls[i+1]->control_ref->State() - controls[i]->control_ref->State();
+				if (fabs(state) > deadzone)
+					tmpf = ((state - (deadzone * sign(state))) / (1 - deadzone));
+
+				ControlState &ax = m_swing[i >> 1];
+				*axis++ = (tmpf - ax);
+				ax = tmpf;
+			}
+		}
+
+	private:
+		ControlState m_swing[3];
+	};
+
+	class Tilt : public ControlGroup
+	{
+	public:
+		Tilt(const std::string& _name);
+
+		void GetState(ControlState* const x, ControlState* const y, const bool step = true)
+		{
+			// this is all a mess
+
+			ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
+			ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
+
+			ControlState deadzone = settings[0]->value;
+			ControlState circle = settings[1]->value;
+			auto const angle = settings[2]->value / 1.8;
+			ControlState m = controls[4]->control_ref->State();
+
+			// deadzone / circle stick code
+			// this section might be all wrong, but its working good enough, I think
+
+			ControlState ang = atan2(yy, xx);
+			ControlState ang_sin = sin(ang);
+			ControlState ang_cos = cos(ang);
+
+			// the amt a full square stick would have at current angle
+			ControlState square_full = std::min(ang_sin ? 1/fabs(ang_sin) : 2, ang_cos ? 1/fabs(ang_cos) : 2);
+
+			// the amt a full stick would have that was (user setting circular) at current angle
+			// I think this is more like a pointed circle rather than a rounded square like it should be
+			ControlState stick_full = (square_full * (1 - circle)) + (circle);
+
+			ControlState dist = sqrt(xx*xx + yy*yy);
+
+			// dead zone code
+			dist = std::max(0.0, dist - deadzone * stick_full);
+			dist /= (1 - deadzone);
+
+			// circle stick code
+			ControlState amt = dist / stick_full;
+			dist += (square_full - 1) * amt * circle;
+
+			if (m)
+				dist *= 0.5;
+
+			yy = std::max(-1.0, std::min(1.0, ang_sin * dist));
+			xx = std::max(-1.0, std::min(1.0, ang_cos * dist));
+
+			// this is kinda silly here
+			// gui being open will make this happen 2x as fast, o well
+
+			// silly
+			if (step)
+			{
+				if (xx > m_tilt[0])
+					m_tilt[0] = std::min(m_tilt[0] + 0.1, xx);
+				else if (xx < m_tilt[0])
+					m_tilt[0] = std::max(m_tilt[0] - 0.1, xx);
+
+				if (yy > m_tilt[1])
+					m_tilt[1] = std::min(m_tilt[1] + 0.1, yy);
+				else if (yy < m_tilt[1])
+					m_tilt[1] = std::max(m_tilt[1] - 0.1, yy);
+			}
+
+			*y = m_tilt[1] * angle;
+			*x = m_tilt[0] * angle;
+		}
+
+	private:
+		ControlState m_tilt[2];
+	};
+
+	class Cursor : public ControlGroup
+	{
+	public:
+		Cursor(const std::string& _name);
+
+		void GetState(ControlState* const x, ControlState* const y, ControlState* const z, const bool adjusted = false)
+		{
+			const ControlState zz = controls[4]->control_ref->State() - controls[5]->control_ref->State();
+
+			// silly being here
+			if (zz > m_z)
+				m_z = std::min(m_z + 0.1, zz);
+			else if (zz < m_z)
+				m_z = std::max(m_z - 0.1, zz);
+
+			*z = m_z;
+
+			// hide
+			if (controls[6]->control_ref->State() > 0.5)
+			{
+				*x = 10000; *y = 0;
+			}
+			else
+			{
+				ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
+				ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
+
+				// adjust cursor according to settings
+				if (adjusted)
+				{
+					xx *= (settings[1]->value * 2);
+					yy *= (settings[2]->value * 2);
+					yy += (settings[0]->value - 0.5);
+				}
+
+				*x = xx;
+				*y = yy;
+			}
+		}
+
+		ControlState m_z;
+	};
+
+	class Extension : public ControlGroup
+	{
+	public:
+		Extension(const std::string& _name)
+			: ControlGroup(_name, GROUP_TYPE_EXTENSION)
+			, switch_extension(0)
+			, active_extension(0) {}
+
+		~Extension() {}
+
+		void GetState(u8* const data);
+
+		std::vector<std::unique_ptr<ControllerEmu>> attachments;
+
+		int switch_extension;
+		int active_extension;
+	};
+
+	virtual ~ControllerEmu() {}
+
+	virtual std::string GetName() const = 0;
+
+	virtual void LoadDefaults(const ControllerInterface& ciface);
+
+	virtual void LoadConfig(IniFile::Section *sec, const std::string& base = "");
+	virtual void SaveConfig(IniFile::Section *sec, const std::string& base = "");
+	void UpdateDefaultDevice();
+
+	void UpdateReferences(ControllerInterface& devi);
+
+	std::vector<std::unique_ptr<ControlGroup>> groups;
+
+	ciface::Core::DeviceQualifier default_device;
+};
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
new file mode 100644
index 0000000000..b0539b520f
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -0,0 +1,83 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include "InputCommon/ControllerInterface/Android/Android.h"
+
+namespace ciface
+{
+
+namespace Android
+{
+
+void Init( std::vector<Core::Device*>& devices )
+{
+	devices.push_back(new Touchscreen(0));
+	devices.push_back(new Touchscreen(1));
+	devices.push_back(new Touchscreen(2));
+	devices.push_back(new Touchscreen(3));
+}
+
+// Touchscreens and stuff
+std::string Touchscreen::GetName() const
+{
+	return "Touchscreen";
+}
+
+std::string Touchscreen::GetSource() const
+{
+	return "Android";
+}
+
+int Touchscreen::GetId() const
+{
+	return 0;
+}
+Touchscreen::Touchscreen(int padID)
+	: _padID(padID)
+{
+	AddInput(new Button(_padID, ButtonManager::BUTTON_A));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_B));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_START));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_X));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_Y));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_Z));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_UP));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_DOWN));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_LEFT));
+	AddInput(new Button(_padID, ButtonManager::BUTTON_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_LEFT), new Axis(_padID, ButtonManager::STICK_MAIN_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_MAIN_UP), new Axis(_padID, ButtonManager::STICK_MAIN_DOWN));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_LEFT), new Axis(_padID, ButtonManager::STICK_C_RIGHT));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::STICK_C_UP), new Axis(_padID, ButtonManager::STICK_C_DOWN));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_L), new Axis(_padID, ButtonManager::TRIGGER_L));
+	AddAnalogInputs(new Axis(_padID, ButtonManager::TRIGGER_R), new Axis(_padID, ButtonManager::TRIGGER_R));
+}
+// Buttons and stuff
+
+std::string Touchscreen::Button::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Button " << (int)_index;
+	return ss.str();
+}
+
+ControlState Touchscreen::Button::GetState() const
+{
+	return ButtonManager::GetButtonPressed(_padID, _index);
+}
+std::string Touchscreen::Axis::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Axis " << (int)_index;
+	return ss.str();
+}
+
+ControlState Touchscreen::Axis::GetState() const
+{
+	return ButtonManager::GetAxisValue(_padID, _index) * _neg;
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
new file mode 100644
index 0000000000..35b68cdd71
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -0,0 +1,53 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "DolphinWX/Android/ButtonManager.h"
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace Android
+{
+
+void Init( std::vector<Core::Device*>& devices );
+class Touchscreen : public Core::Device
+{
+private:
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(int padID, ButtonManager::ButtonType index) :  _padID(padID), _index(index) {}
+		ControlState GetState() const;
+	private:
+		const int _padID;
+		const ButtonManager::ButtonType _index;
+	};
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const;
+		Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f) : _padID(padID), _index(index), _neg(neg) {}
+		ControlState GetState() const;
+	private:
+		const int _padID;
+		const ButtonManager::ButtonType _index;
+		const float _neg;
+	};
+
+public:
+	Touchscreen(int padID);
+	~Touchscreen() {}
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+private:
+	const int _padID;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
new file mode 100644
index 0000000000..6b8b11fd3a
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -0,0 +1,262 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Thread.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+#ifdef CIFACE_USE_XINPUT
+	#include "InputCommon/ControllerInterface/XInput/XInput.h"
+#endif
+#ifdef CIFACE_USE_DINPUT
+	#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#endif
+#ifdef CIFACE_USE_XLIB
+	#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
+	#ifdef CIFACE_USE_X11_XINPUT2
+		#include "InputCommon/ControllerInterface/Xlib/XInput2.h"
+	#endif
+#endif
+#ifdef CIFACE_USE_OSX
+	#include "InputCommon/ControllerInterface/OSX/OSX.h"
+#endif
+#ifdef CIFACE_USE_SDL
+	#include "InputCommon/ControllerInterface/SDL/SDL.h"
+#endif
+#ifdef CIFACE_USE_ANDROID
+	#include "InputCommon/ControllerInterface/Android/Android.h"
+#endif
+
+using namespace ciface::ExpressionParser;
+
+namespace
+{
+const ControlState INPUT_DETECT_THRESHOLD = 0.55;
+}
+
+ControllerInterface g_controller_interface;
+
+//
+// Init
+//
+// Detect devices and inputs outputs / will make refresh function later
+//
+void ControllerInterface::Initialize(void* const hwnd)
+{
+	if (m_is_init)
+		return;
+
+	m_hwnd = hwnd;
+
+#ifdef CIFACE_USE_DINPUT
+	ciface::DInput::Init(m_devices, (HWND)hwnd);
+#endif
+#ifdef CIFACE_USE_XINPUT
+	ciface::XInput::Init(m_devices);
+#endif
+#ifdef CIFACE_USE_XLIB
+	ciface::Xlib::Init(m_devices, hwnd);
+	#ifdef CIFACE_USE_X11_XINPUT2
+	ciface::XInput2::Init(m_devices, hwnd);
+	#endif
+#endif
+#ifdef CIFACE_USE_OSX
+	ciface::OSX::Init(m_devices, hwnd);
+#endif
+#ifdef CIFACE_USE_SDL
+	ciface::SDL::Init(m_devices);
+#endif
+#ifdef CIFACE_USE_ANDROID
+	ciface::Android::Init(m_devices);
+#endif
+
+	m_is_init = true;
+}
+
+void ControllerInterface::Reinitialize()
+{
+	if (!m_is_init)
+		return;
+
+	Shutdown();
+	Initialize(m_hwnd);
+}
+
+//
+// DeInit
+//
+// Remove all devices/ call library cleanup functions
+//
+void ControllerInterface::Shutdown()
+{
+	if (!m_is_init)
+		return;
+
+	for (ciface::Core::Device* d : m_devices)
+	{
+		// Set outputs to ZERO before destroying device
+		for (ciface::Core::Device::Output* o : d->Outputs())
+			o->SetState(0);
+
+		// Delete device
+		delete d;
+	}
+
+	m_devices.clear();
+
+#ifdef CIFACE_USE_XINPUT
+	ciface::XInput::DeInit();
+#endif
+#ifdef CIFACE_USE_DINPUT
+	// nothing needed
+#endif
+#ifdef CIFACE_USE_XLIB
+	// nothing needed
+#endif
+#ifdef CIFACE_USE_OSX
+	ciface::OSX::DeInit();
+#endif
+#ifdef CIFACE_USE_SDL
+	// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
+	SDL_Quit();
+#endif
+#ifdef CIFACE_USE_ANDROID
+	// nothing needed
+#endif
+
+	m_is_init = false;
+}
+
+//
+// UpdateInput
+//
+// Update input for all devices, return true if all devices returned successful
+//
+void ControllerInterface::UpdateInput()
+{
+	for (ciface::Core::Device* d : m_devices)
+		d->UpdateInput();
+}
+
+//
+// InputReference :: State
+//
+// Gets the state of an input reference
+// override function for ControlReference::State ...
+//
+ControlState ControllerInterface::InputReference::State( const ControlState ignore )
+{
+	if (parsed_expression)
+		return parsed_expression->GetValue() * range;
+	else
+		return 0.0;
+}
+
+//
+// OutputReference :: State
+//
+// Set the state of all binded outputs
+// overrides ControlReference::State .. combined them so I could make the GUI simple / inputs == same as outputs one list
+// I was lazy and it works so watever
+//
+ControlState ControllerInterface::OutputReference::State(const ControlState state)
+{
+	if (parsed_expression)
+		parsed_expression->SetValue(state);
+	return 0.0;
+}
+
+//
+// UpdateReference
+//
+// Updates a controlreference's binded devices/controls
+// need to call this to re-parse a control reference's expression after changing it
+//
+void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
+	, const ciface::Core::DeviceQualifier& default_device) const
+{
+	delete ref->parsed_expression;
+	ref->parsed_expression = nullptr;
+
+	ControlFinder finder(*this, default_device, ref->is_input);
+	ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression);
+}
+
+//
+// InputReference :: Detect
+//
+// Wait for input on all binded devices
+// supports not detecting inputs that were held down at the time of Detect start,
+// which is useful for those crazy flightsticks that have certain buttons that are always held down
+// or some crazy axes or something
+// upon input, return pointer to detected Control
+// else return nullptr
+//
+ciface::Core::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, ciface::Core::Device* const device)
+{
+	unsigned int time = 0;
+	std::vector<bool> states(device->Inputs().size());
+
+	if (device->Inputs().size() == 0)
+		return nullptr;
+
+	// get starting state of all inputs,
+	// so we can ignore those that were activated at time of Detect start
+	std::vector<ciface::Core::Device::Input*>::const_iterator
+		i = device->Inputs().begin(),
+		e = device->Inputs().end();
+	for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
+		*state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD));
+
+	while (time < ms)
+	{
+		device->UpdateInput();
+		i = device->Inputs().begin();
+		for (std::vector<bool>::iterator state = states.begin(); i != e; ++i,++state)
+		{
+			// detected an input
+			if ((*i)->IsDetectable() && (*i)->GetState() > INPUT_DETECT_THRESHOLD)
+			{
+				// input was released at some point during Detect call
+				// return the detected input
+				if (false == *state)
+					return *i;
+			}
+			else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
+			{
+				*state = false;
+			}
+		}
+		Common::SleepCurrentThread(10); time += 10;
+	}
+
+	// no input was detected
+	return nullptr;
+}
+
+//
+// OutputReference :: Detect
+//
+// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI.
+// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy
+//
+// set all binded outputs to <range> power for x milliseconds return false
+//
+ciface::Core::Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, ciface::Core::Device* const device)
+{
+	// ignore device
+
+	// don't hang if we don't even have any controls mapped
+	if (BoundCount() > 0)
+	{
+		State(1);
+		unsigned int slept = 0;
+
+		// this loop is to make stuff like flashing keyboard LEDs work
+		while (ms > (slept += 10))
+			Common::SleepCurrentThread(10);
+
+		State(0);
+	}
+	return nullptr;
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
new file mode 100644
index 0000000000..408a36fefa
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -0,0 +1,130 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+
+// enable disable sources
+#ifdef _WIN32
+	#define CIFACE_USE_XINPUT
+	#define CIFACE_USE_DINPUT
+#endif
+#if defined(HAVE_X11) && HAVE_X11
+	#define CIFACE_USE_XLIB
+	#if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2
+		#define CIFACE_USE_X11_XINPUT2
+	#endif
+#endif
+#if defined(__APPLE__)
+	#define CIFACE_USE_OSX
+#endif
+#ifdef ANDROID
+	#define CIFACE_USE_ANDROID
+#endif
+#if defined(HAVE_SDL) && HAVE_SDL
+	#define CIFACE_USE_SDL
+#endif
+
+//
+// ControllerInterface
+//
+// Some crazy shit I made to control different device inputs and outputs
+// from lots of different sources, hopefully more easily.
+//
+class ControllerInterface : public ciface::Core::DeviceContainer
+{
+public:
+
+	//
+	// ControlReference
+	//
+	// These are what you create to actually use the inputs, InputReference or OutputReference.
+	//
+	// After being bound to devices and controls with ControllerInterface::UpdateReference,
+	// each one can link to multiple devices and controls
+	// when you change a ControlReference's expression,
+	// you must use ControllerInterface::UpdateReference on it to rebind controls
+	//
+	class ControlReference
+	{
+		friend class ControllerInterface;
+	public:
+		virtual ControlState State(const ControlState state = 0) = 0;
+		virtual ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) = 0;
+
+		ControlState range;
+		std::string  expression;
+		const bool   is_input;
+		ciface::ExpressionParser::ExpressionParseStatus parse_error;
+
+		virtual ~ControlReference()
+		{
+			delete parsed_expression;
+		}
+
+		int BoundCount()
+		{
+			if (parsed_expression)
+				return parsed_expression->num_controls;
+			else
+				return 0;
+		}
+
+	protected:
+		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(nullptr) {}
+		ciface::ExpressionParser::Expression *parsed_expression;
+	};
+
+	//
+	// InputReference
+	//
+	// Control reference for inputs
+	//
+	class InputReference : public ControlReference
+	{
+	public:
+		InputReference() : ControlReference(true) {}
+		ControlState State(const ControlState state) override;
+		ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) override;
+	};
+
+	//
+	// OutputReference
+	//
+	// Control reference for outputs
+	//
+	class OutputReference : public ControlReference
+	{
+	public:
+		OutputReference() : ControlReference(false) {}
+		ControlState State(const ControlState state) override;
+		ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) override;
+	};
+
+	ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {}
+
+	void Initialize(void* const hwnd);
+	void Reinitialize();
+	void Shutdown();
+	bool IsInit() const { return m_is_init; }
+
+	void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
+	void UpdateInput();
+
+private:
+	bool   m_is_init;
+	void*  m_hwnd;
+};
+
+extern ControllerInterface g_controller_interface;
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
new file mode 100644
index 0000000000..4a68474618
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
@@ -0,0 +1,65 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/StringUtil.h"
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"
+
+#pragma comment(lib, "Dinput8.lib")
+#pragma comment(lib, "dxguid.lib")
+
+namespace ciface
+{
+namespace DInput
+{
+
+BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef)
+{
+	((std::list<DIDEVICEOBJECTINSTANCE>*)pvRef)->push_back(*lpddoi);
+	return DIENUM_CONTINUE;
+}
+
+BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+{
+	((std::list<DIDEVICEINSTANCE>*)pvRef)->push_back(*lpddi);
+	return DIENUM_CONTINUE;
+}
+
+std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device)
+{
+	DIPROPSTRING str = {};
+	str.diph.dwSize = sizeof(str);
+	str.diph.dwHeaderSize = sizeof(str.diph);
+	str.diph.dwHow = DIPH_DEVICE;
+
+	std::string result;
+	if (SUCCEEDED(device->GetProperty(DIPROP_PRODUCTNAME, &str.diph)))
+	{
+		result = StripSpaces(UTF16ToUTF8(str.wsz));
+	}
+
+	return result;
+}
+
+void Init(std::vector<Core::Device*>& devices, HWND hwnd)
+{
+	IDirectInput8* idi8;
+	if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION,
+		IID_IDirectInput8, (LPVOID*)&idi8, nullptr)))
+	{
+		return;
+	}
+
+	InitKeyboardMouse(idi8, devices, hwnd);
+	InitJoystick(idi8, devices, hwnd);
+
+	idi8->Release();
+
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
new file mode 100644
index 0000000000..1823499e98
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@@ -0,0 +1,28 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#define DINPUT_SOURCE_NAME "DInput"
+
+#include <list>
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/DInput/DInput8.h"
+
+namespace ciface
+{
+namespace DInput
+{
+
+//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef);
+BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef);
+BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
+std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
+
+void Init(std::vector<Core::Device*>& devices, HWND hwnd);
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h
new file mode 100644
index 0000000000..4a32edb632
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput8.h
@@ -0,0 +1,8 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
new file mode 100644
index 0000000000..aa1e972126
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -0,0 +1,281 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <map>
+#include <sstream>
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
+#include "InputCommon/ControllerInterface/DInput/XInputFilter.h"
+
+namespace ciface
+{
+namespace DInput
+{
+
+#define DATA_BUFFER_SIZE 32
+
+void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd)
+{
+	std::list<DIDEVICEINSTANCE> joysticks;
+	idi8->EnumDevices(DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_ATTACHEDONLY);
+
+	// this is used to number the joysticks
+	// multiple joysticks with the same name shall get unique ids starting at 0
+	std::map< std::basic_string<TCHAR>, int> name_counts;
+
+	std::vector<DWORD> xinput_guids;
+	GetXInputGUIDS(&xinput_guids);
+
+	for (DIDEVICEINSTANCE& joystick : joysticks)
+	{
+		// skip XInput Devices
+		if (std::find(xinput_guids.begin(), xinput_guids.end(), joystick.guidProduct.Data1) != xinput_guids.end())
+		{
+			continue;
+		}
+
+		LPDIRECTINPUTDEVICE8 js_device;
+		if (SUCCEEDED(idi8->CreateDevice(joystick.guidInstance, &js_device, nullptr)))
+		{
+			if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick)))
+			{
+				if (FAILED(js_device->SetCooperativeLevel(GetAncestor(hwnd, GA_ROOT), DISCL_BACKGROUND | DISCL_EXCLUSIVE)))
+				{
+					//PanicAlert("SetCooperativeLevel(DISCL_EXCLUSIVE) failed!");
+					// fall back to non-exclusive mode, with no rumble
+					if (FAILED(js_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+					{
+						//PanicAlert("SetCooperativeLevel failed!");
+						js_device->Release();
+						continue;
+					}
+				}
+
+				Joystick* js = new Joystick(/*&*i, */js_device, name_counts[joystick.tszInstanceName]++);
+				// only add if it has some inputs/outputs
+				if (js->Inputs().size() || js->Outputs().size())
+					devices.push_back(js);
+				else
+					delete js;
+			}
+			else
+			{
+				//PanicAlert("SetDataFormat failed!");
+				js_device->Release();
+			}
+		}
+	}
+}
+
+Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVICE8 device, const unsigned int index )
+	: m_device(device)
+	, m_index(index)
+	//, m_name(TStringToString(lpddi->tszInstanceName))
+{
+	// seems this needs to be done before GetCapabilities
+	// polled or buffered data
+	DIPROPDWORD dipdw;
+	dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+	dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+	dipdw.diph.dwObj = 0;
+	dipdw.diph.dwHow = DIPH_DEVICE;
+	dipdw.dwData = DATA_BUFFER_SIZE;
+	// set the buffer size,
+	// if we can't set the property, we can't use buffered data
+	m_buffered = SUCCEEDED(m_device->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph));
+
+	// seems this needs to be done after SetProperty of buffer size
+	m_device->Acquire();
+
+	// get joystick caps
+	DIDEVCAPS js_caps;
+	js_caps.dwSize = sizeof(js_caps);
+	if (FAILED(m_device->GetCapabilities(&js_caps)))
+		return;
+
+	// max of 32 buttons and 4 hats / the limit of the data format I am using
+	js_caps.dwButtons = std::min((DWORD)32, js_caps.dwButtons);
+	js_caps.dwPOVs = std::min((DWORD)4, js_caps.dwPOVs);
+
+	//m_must_poll = (js_caps.dwFlags & DIDC_POLLEDDATAFORMAT) != 0;
+
+	// buttons
+	for (u8 i = 0; i != js_caps.dwButtons; ++i)
+		AddInput(new Button(i, m_state_in.rgbButtons[i]));
+
+	// hats
+	for (u8 i = 0; i != js_caps.dwPOVs; ++i)
+	{
+		// each hat gets 4 input instances associated with it, (up down left right)
+		for (u8 d = 0; d != 4; ++d)
+			AddInput(new Hat(i, m_state_in.rgdwPOV[i], d));
+	}
+
+	// get up to 6 axes and 2 sliders
+	DIPROPRANGE range;
+	range.diph.dwSize = sizeof(range);
+	range.diph.dwHeaderSize = sizeof(range.diph);
+	range.diph.dwHow = DIPH_BYOFFSET;
+	// screw EnumObjects, just go through all the axis offsets and try to GetProperty
+	// this should be more foolproof, less code, and probably faster
+	for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset)
+	{
+		range.diph.dwObj = offset * sizeof(LONG);
+		// try to set some nice power of 2 values (128) to match the GameCube controls
+		range.lMin = -(1 << 7);
+		range.lMax = (1 << 7);
+		m_device->SetProperty(DIPROP_RANGE, &range.diph);
+		// but I guess not all devices support setting range
+		// so I getproperty right afterward incase it didn't set.
+		// This also checks that the axis is present
+		if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph)))
+		{
+			const LONG base = (range.lMin + range.lMax) / 2;
+			const LONG& ax = (&m_state_in.lX)[offset];
+
+			// each axis gets a negative and a positive input instance associated with it
+			AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base),
+				new Axis(offset, ax, base, range.lMax-base));
+		}
+	}
+
+	// force feedback
+	std::list<DIDEVICEOBJECTINSTANCE> objects;
+	if (SUCCEEDED(m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS)))
+	{
+		InitForceFeedback(m_device, (int)objects.size());
+	}
+
+	ZeroMemory(&m_state_in, sizeof(m_state_in));
+	// set hats to center
+	memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV));
+}
+
+Joystick::~Joystick()
+{
+	m_device->Unacquire();
+	m_device->Release();
+}
+
+std::string Joystick::GetName() const
+{
+	return GetDeviceName(m_device);
+}
+
+int Joystick::GetId() const
+{
+	return m_index;
+}
+
+std::string Joystick::GetSource() const
+{
+	return DINPUT_SOURCE_NAME;
+}
+
+// update IO
+
+void Joystick::UpdateInput()
+{
+	HRESULT hr = 0;
+
+	// just always poll,
+	// MSDN says if this isn't needed it doesn't do anything
+	m_device->Poll();
+
+	if (m_buffered)
+	{
+		DIDEVICEOBJECTDATA evtbuf[DATA_BUFFER_SIZE];
+		DWORD numevents = DATA_BUFFER_SIZE;
+		hr = m_device->GetDeviceData(sizeof(*evtbuf), evtbuf, &numevents, 0);
+
+		if (SUCCEEDED(hr))
+		{
+			for (LPDIDEVICEOBJECTDATA evt = evtbuf; evt != (evtbuf + numevents); ++evt)
+			{
+				// all the buttons are at the end of the data format
+				// they are bytes rather than longs
+				if (evt->dwOfs < DIJOFS_BUTTON(0))
+					*(DWORD*)(((BYTE*)&m_state_in) + evt->dwOfs) = evt->dwData;
+				else
+					((BYTE*)&m_state_in)[evt->dwOfs] = (BYTE)evt->dwData;
+			}
+
+			// seems like this needs to be done maybe...
+			if (DI_BUFFEROVERFLOW == hr)
+				hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
+		}
+	}
+	else
+	{
+		hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
+	}
+
+	// try reacquire if input lost
+	if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
+		m_device->Acquire();
+}
+
+// get name
+
+std::string Joystick::Button::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Button " << (int)m_index;
+	return ss.str();
+}
+
+std::string Joystick::Axis::GetName() const
+{
+	std::ostringstream ss;
+	// axis
+	if (m_index < 6)
+	{
+		ss << "Axis " << (char)('X' + (m_index % 3));
+		if (m_index > 2)
+			ss << 'r';
+	}
+	// slider
+	else
+	{
+		ss << "Slider " << (int)(m_index - 6);
+	}
+
+	ss << (m_range < 0 ? '-' : '+');
+	return ss.str();
+}
+
+std::string Joystick::Hat::GetName() const
+{
+	static char tmpstr[] = "Hat . .";
+	tmpstr[4] = (char)('0' + m_index);
+	tmpstr[6] = "NESW"[m_direction];
+	return tmpstr;
+}
+
+// get / set state
+
+ControlState Joystick::Axis::GetState() const
+{
+	return std::max(0.0, ControlState(m_axis - m_base) / m_range);
+}
+
+ControlState Joystick::Button::GetState() const
+{
+	return ControlState(m_button > 0);
+}
+
+ControlState Joystick::Hat::GetState() const
+{
+	// can this func be simplified ?
+	// hat centered code from MSDN
+	if (0xFFFF == LOWORD(m_hat))
+		return 0;
+
+	return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
new file mode 100644
index 0000000000..c89ba509d3
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@@ -0,0 +1,74 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
+
+namespace ciface
+{
+namespace DInput
+{
+
+void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd);
+
+class Joystick : public ForceFeedback::ForceFeedbackDevice
+{
+private:
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(u8 index, const BYTE& button) : m_index(index), m_button(button) {}
+		ControlState GetState() const;
+	private:
+		const BYTE& m_button;
+		const u8 m_index;
+	};
+
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const;
+		Axis(u8 index, const LONG& axis, LONG base, LONG range) : m_index(index), m_axis(axis), m_base(base), m_range(range) {}
+		ControlState GetState() const;
+	private:
+		const LONG& m_axis;
+		const LONG m_base, m_range;
+		const u8 m_index;
+	};
+
+	class Hat : public Input
+	{
+	public:
+		std::string GetName() const;
+		Hat(u8 index, const DWORD& hat, u8 direction) : m_index(index), m_hat(hat), m_direction(direction) {}
+		ControlState GetState() const;
+	private:
+		const DWORD& m_hat;
+		const u8 m_index, m_direction;
+	};
+
+public:
+	void UpdateInput() override;
+
+	Joystick(const LPDIRECTINPUTDEVICE8 device, const unsigned int index);
+	~Joystick();
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+
+private:
+	const LPDIRECTINPUTDEVICE8 m_device;
+	const unsigned int         m_index;
+
+	DIJOYSTATE                 m_state_in;
+
+	bool                       m_buffered;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
new file mode 100644
index 0000000000..6db8a86a3a
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -0,0 +1,247 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"
+
+	// (lower would be more sensitive) user can lower sensitivity by setting range
+	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
+	// and user can lower it much farther than they would want to with the range
+#define MOUSE_AXIS_SENSITIVITY   8
+
+	// if input hasn't been received for this many ms, mouse input will be skipped
+	// otherwise it is just some crazy value
+#define DROP_INPUT_TIME          250
+
+namespace ciface
+{
+namespace DInput
+{
+
+static const struct
+{
+	const BYTE        code;
+	const char* const name;
+} named_keys[] =
+{
+#include "InputCommon/ControllerInterface/DInput/NamedKeys.h" // NOLINT
+};
+
+// lil silly
+static HWND m_hwnd;
+
+void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd)
+{
+	m_hwnd = _hwnd;
+
+	// mouse and keyboard are a combined device, to allow shift+click and stuff
+	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
+	// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
+
+	LPDIRECTINPUTDEVICE8 kb_device = nullptr;
+	LPDIRECTINPUTDEVICE8 mo_device = nullptr;
+
+	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, nullptr)))
+	{
+		if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
+		{
+			if (SUCCEEDED(kb_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+			{
+				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, nullptr )))
+				{
+					if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
+					{
+						if (SUCCEEDED(mo_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+						{
+							devices.push_back(new KeyboardMouse(kb_device, mo_device));
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (kb_device)
+		kb_device->Release();
+	if (mo_device)
+		mo_device->Release();
+}
+
+KeyboardMouse::~KeyboardMouse()
+{
+	// kb
+	m_kb_device->Unacquire();
+	m_kb_device->Release();
+	// mouse
+	m_mo_device->Unacquire();
+	m_mo_device->Release();
+}
+
+KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device)
+	: m_kb_device(kb_device)
+	, m_mo_device(mo_device)
+{
+	m_kb_device->Acquire();
+	m_mo_device->Acquire();
+
+	m_last_update = GetTickCount();
+
+	ZeroMemory(&m_state_in, sizeof(m_state_in));
+
+	// KEYBOARD
+	// add keys
+	for (u8 i = 0; i < sizeof(named_keys)/sizeof(*named_keys); ++i)
+		AddInput(new Key(i, m_state_in.keyboard[named_keys[i].code]));
+
+	// MOUSE
+	// get caps
+	DIDEVCAPS mouse_caps;
+	ZeroMemory( &mouse_caps, sizeof(mouse_caps) );
+	mouse_caps.dwSize = sizeof(mouse_caps);
+	m_mo_device->GetCapabilities(&mouse_caps);
+	// mouse buttons
+	for (u8 i = 0; i < mouse_caps.dwButtons; ++i)
+		AddInput(new Button(i, m_state_in.mouse.rgbButtons[i]));
+	// mouse axes
+	for (unsigned int i = 0; i < mouse_caps.dwAxes; ++i)
+	{
+		const LONG& ax = (&m_state_in.mouse.lX)[i];
+
+		// each axis gets a negative and a positive input instance associated with it
+		AddInput(new Axis(i, ax, (2==i) ? -1 : -MOUSE_AXIS_SENSITIVITY));
+		AddInput(new Axis(i, ax, -(2==i) ? 1 : MOUSE_AXIS_SENSITIVITY));
+	}
+	// cursor, with a hax for-loop
+	for (unsigned int i=0; i<4; ++i)
+		AddInput(new Cursor(!!(i&2), (&m_state_in.cursor.x)[i/2], !!(i&1)));
+}
+
+void GetMousePos(ControlState* const x, ControlState* const y)
+{
+	POINT point = { 1, 1 };
+	GetCursorPos(&point);
+	// Get the cursor position relative to the upper left corner of the current window (separate or render to main)
+	HWND hwnd = WindowFromPoint(point);
+	ScreenToClient(hwnd, &point);
+
+	// Get the size of the current window. (In my case Rect.top and Rect.left was zero.)
+	RECT rect;
+	GetClientRect(hwnd, &rect);
+	// Width and height is the size of the rendering window
+	unsigned int win_width = rect.right - rect.left;
+	unsigned int win_height = rect.bottom - rect.top;
+
+	// Return the mouse position as a range from -1 to 1
+	*x = (ControlState)point.x / (ControlState)win_width * 2 - 1;
+	*y = (ControlState)point.y / (ControlState)win_height * 2 - 1;
+}
+
+void KeyboardMouse::UpdateInput()
+{
+	DIMOUSESTATE2 tmp_mouse;
+
+	// if mouse position hasn't been updated in a short while, skip a dev state
+	DWORD cur_time = GetTickCount();
+	if (cur_time - m_last_update > DROP_INPUT_TIME)
+	{
+		// set axes to zero
+		ZeroMemory(&m_state_in.mouse, sizeof(m_state_in.mouse));
+		// skip this input state
+		m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
+	}
+
+	m_last_update = cur_time;
+
+	HRESULT kb_hr = m_kb_device->GetDeviceState(sizeof(m_state_in.keyboard), &m_state_in.keyboard);
+	HRESULT mo_hr = m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
+
+	if (DIERR_INPUTLOST == kb_hr || DIERR_NOTACQUIRED == kb_hr)
+		m_kb_device->Acquire();
+
+	if (DIERR_INPUTLOST == mo_hr || DIERR_NOTACQUIRED == mo_hr)
+		m_mo_device->Acquire();
+
+	if (SUCCEEDED(kb_hr) && SUCCEEDED(mo_hr))
+	{
+		// need to smooth out the axes, otherwise it doesn't work for shit
+		for (unsigned int i = 0; i < 3; ++i)
+			((&m_state_in.mouse.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
+
+		// copy over the buttons
+		memcpy(m_state_in.mouse.rgbButtons, tmp_mouse.rgbButtons, sizeof(m_state_in.mouse.rgbButtons));
+
+		// update mouse cursor
+		GetMousePos(&m_state_in.cursor.x, &m_state_in.cursor.y);
+	}
+}
+
+std::string KeyboardMouse::GetName() const
+{
+	return "Keyboard Mouse";
+}
+
+int KeyboardMouse::GetId() const
+{
+	// should this be -1, idk
+	return 0;
+}
+
+std::string KeyboardMouse::GetSource() const
+{
+	return DINPUT_SOURCE_NAME;
+}
+
+// names
+std::string KeyboardMouse::Key::GetName() const
+{
+	return named_keys[m_index].name;
+}
+
+std::string KeyboardMouse::Button::GetName() const
+{
+	return std::string("Click ") + char('0' + m_index);
+}
+
+std::string KeyboardMouse::Axis::GetName() const
+{
+	static char tmpstr[] = "Axis ..";
+	tmpstr[5] = (char)('X' + m_index);
+	tmpstr[6] = (m_range<0 ? '-' : '+');
+	return tmpstr;
+}
+
+std::string KeyboardMouse::Cursor::GetName() const
+{
+	static char tmpstr[] = "Cursor ..";
+	tmpstr[7] = (char)('X' + m_index);
+	tmpstr[8] = (m_positive ? '+' : '-');
+	return tmpstr;
+}
+
+// get/set state
+ControlState KeyboardMouse::Key::GetState() const
+{
+	return (m_key != 0);
+}
+
+ControlState KeyboardMouse::Button::GetState() const
+{
+	return (m_button != 0);
+}
+
+ControlState KeyboardMouse::Axis::GetState() const
+{
+	return std::max(0.0, ControlState(m_axis) / m_range);
+}
+
+ControlState KeyboardMouse::Cursor::GetState() const
+{
+	return std::max(0.0, ControlState(m_axis) / (m_positive ? 1.0 : -1.0));
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
new file mode 100644
index 0000000000..db4d363df0
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -0,0 +1,98 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/DInput/DInput8.h"
+
+namespace ciface
+{
+namespace DInput
+{
+
+void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd);
+
+class KeyboardMouse : public Core::Device
+{
+private:
+	struct State
+	{
+		BYTE          keyboard[256];
+		DIMOUSESTATE2 mouse;
+		struct
+		{
+			ControlState x, y;
+		} cursor;
+	};
+
+	class Key : public Input
+	{
+	public:
+		std::string GetName() const;
+		Key(u8 index, const BYTE& key) : m_index(index), m_key(key) {}
+		ControlState GetState() const;
+	private:
+		const BYTE& m_key;
+		const u8 m_index;
+	};
+
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(u8 index, const BYTE& button) : m_index(index), m_button(button) {}
+		ControlState GetState() const;
+	private:
+		const BYTE& m_button;
+		const u8 m_index;
+	};
+
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const;
+		Axis(u8 index, const LONG& axis, LONG range) : m_index(index), m_axis(axis), m_range(range) {}
+		ControlState GetState() const;
+	private:
+		const LONG& m_axis;
+		const LONG m_range;
+		const u8 m_index;
+	};
+
+	class Cursor : public Input
+	{
+	public:
+		std::string GetName() const;
+		bool IsDetectable() { return false; }
+		Cursor(u8 index, const ControlState& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {}
+		ControlState GetState() const;
+	private:
+		const ControlState& m_axis;
+		const u8 m_index;
+		const bool m_positive;
+	};
+
+public:
+	void UpdateInput() override;
+
+	KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
+	~KeyboardMouse();
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+
+private:
+	const LPDIRECTINPUTDEVICE8 m_kb_device;
+	const LPDIRECTINPUTDEVICE8 m_mo_device;
+
+	DWORD         m_last_update;
+	State         m_state_in;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/NamedKeys.h b/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h
similarity index 96%
rename from Source/Core/InputCommon/Src/ControllerInterface/DInput/NamedKeys.h
rename to Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h
index 43e090dbeb..6802fd7888 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/NamedKeys.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/NamedKeys.h
@@ -1,3 +1,7 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 { DIK_A, "A" },
 { DIK_B, "B" },
 { DIK_C, "C" },
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
new file mode 100644
index 0000000000..aedfc5dc44
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
@@ -0,0 +1,123 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This function is contained in a separate file because WbemIdl.h pulls in files which break on
+// /Zc:strictStrings, so this compilation unit is compiled without /Zc:strictStrings.
+
+#include <vector>
+#include <WbemIdl.h>
+#include <Windows.h>
+
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p)=nullptr; } }
+
+namespace ciface
+{
+namespace DInput
+{
+
+//-----------------------------------------------------------------------------
+// Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector,
+// faster than checking all the devices for each DirectInput device, like MSDN says to do
+//-----------------------------------------------------------------------------
+void GetXInputGUIDS(std::vector<DWORD>* guids)
+{
+	IWbemLocator*           pIWbemLocator  = nullptr;
+	IEnumWbemClassObject*   pEnumDevices   = nullptr;
+	IWbemClassObject*       pDevices[20]   = {0};
+	IWbemServices*          pIWbemServices = nullptr;
+	BSTR                    bstrNamespace  = nullptr;
+	BSTR                    bstrDeviceID   = nullptr;
+	BSTR                    bstrClassName  = nullptr;
+	DWORD                   uReturned      = 0;
+	VARIANT                 var;
+	HRESULT                 hr;
+
+	// CoInit if needed
+	hr = CoInitialize(nullptr);
+	bool bCleanupCOM = SUCCEEDED(hr);
+
+	// Create WMI
+	hr = CoCreateInstance(__uuidof(WbemLocator),
+	                      nullptr,
+	                      CLSCTX_INPROC_SERVER,
+	                      __uuidof(IWbemLocator),
+	                      (LPVOID*) &pIWbemLocator);
+	if (FAILED(hr) || pIWbemLocator == nullptr)
+		goto LCleanup;
+
+	bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2"); if (bstrNamespace == nullptr) goto LCleanup;
+	bstrClassName = SysAllocString(L"Win32_PNPEntity");    if (bstrClassName == nullptr) goto LCleanup;
+	bstrDeviceID  = SysAllocString(L"DeviceID");           if (bstrDeviceID == nullptr)  goto LCleanup;
+
+	// Connect to WMI
+	hr = pIWbemLocator->ConnectServer(bstrNamespace, nullptr, nullptr, 0L, 0L, nullptr, nullptr, &pIWbemServices);
+	if (FAILED(hr) || pIWbemServices == nullptr)
+		goto LCleanup;
+
+	// Switch security level to IMPERSONATE.
+	CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
+	                  RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_NONE);
+
+	hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, nullptr, &pEnumDevices);
+	if (FAILED(hr) || pEnumDevices == nullptr)
+		goto LCleanup;
+
+	// Loop over all devices
+	while (true)
+	{
+		// Get 20 at a time
+		hr = pEnumDevices->Next(10000, 20, pDevices, &uReturned);
+		if (FAILED(hr) || uReturned == 0)
+			break;
+
+		for (UINT iDevice = 0; iDevice < uReturned; ++iDevice)
+		{
+			// For each device, get its device ID
+			hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, nullptr, nullptr);
+			if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != nullptr)
+			{
+				// Check if the device ID contains "IG_".  If it does, then it's an XInput device
+				// This information can not be found from DirectInput
+				if (wcsstr(var.bstrVal, L"IG_"))
+				{
+					// If it does, then get the VID/PID from var.bstrVal
+					DWORD dwPid = 0, dwVid = 0;
+					WCHAR* strVid = wcsstr(var.bstrVal, L"VID_");
+					if (strVid && swscanf(strVid, L"VID_%4X", &dwVid) != 1)
+						dwVid = 0;
+					WCHAR* strPid = wcsstr(var.bstrVal, L"PID_");
+					if (strPid && swscanf(strPid, L"PID_%4X", &dwPid) != 1)
+						dwPid = 0;
+
+					// Compare the VID/PID to the DInput device
+					DWORD dwVidPid = MAKELONG(dwVid, dwPid);
+					guids->push_back(dwVidPid);
+					//bIsXinputDevice = true;
+				}
+			}
+			SAFE_RELEASE(pDevices[iDevice]);
+		}
+	}
+
+LCleanup:
+	if (bstrNamespace)
+		SysFreeString(bstrNamespace);
+	if (bstrDeviceID)
+		SysFreeString(bstrDeviceID);
+	if (bstrClassName)
+		SysFreeString(bstrClassName);
+	for (UINT iDevice = 0; iDevice < 20; iDevice++)
+		SAFE_RELEASE(pDevices[iDevice]);
+	SAFE_RELEASE(pEnumDevices);
+	SAFE_RELEASE(pIWbemLocator);
+	SAFE_RELEASE(pIWbemServices);
+
+	if (bCleanupCOM)
+		CoUninitialize();
+}
+
+}
+}
+
+#undef SAFE_RELEASE
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
new file mode 100644
index 0000000000..6506dd156e
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
@@ -0,0 +1,18 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include <Windows.h>
+
+namespace ciface
+{
+namespace DInput
+{
+
+void GetXInputGUIDS(std::vector<DWORD>* guids);
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp
new file mode 100644
index 0000000000..fae7e98e2f
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@@ -0,0 +1,185 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <string>
+
+// For InputGateOn()
+// This is a really bad layering violation, but it's the cleanest
+// place I could find to put it.
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace Core
+{
+
+//
+// Device :: ~Device
+//
+// Destructor, delete all inputs/outputs on device destruction
+//
+Device::~Device()
+{
+	// delete inputs
+	for (Device::Input* input : m_inputs)
+		delete input;
+
+	// delete outputs
+	for (Device::Output* output: m_outputs)
+		delete output;
+}
+
+void Device::AddInput(Device::Input* const i)
+{
+	m_inputs.push_back(i);
+}
+
+void Device::AddOutput(Device::Output* const o)
+{
+	m_outputs.push_back(o);
+}
+
+Device::Input* Device::FindInput(const std::string &name) const
+{
+	for (Input* input : m_inputs)
+	{
+		if (input->GetName() == name)
+			return input;
+	}
+
+	return nullptr;
+}
+
+Device::Output* Device::FindOutput(const std::string &name) const
+{
+	for (Output* output : m_outputs)
+	{
+		if (output->GetName() == name)
+			return output;
+	}
+
+	return nullptr;
+}
+
+bool Device::Control::InputGateOn()
+{
+	if (SConfig::GetInstance().m_BackgroundInput)
+		return true;
+	else if (Host_RendererHasFocus() || Host_UIHasFocus())
+		return true;
+	else
+		return false;
+}
+
+//
+// DeviceQualifier :: ToString
+//
+// Get string from a device qualifier / serialize
+//
+std::string DeviceQualifier::ToString() const
+{
+	if (source.empty() && (cid < 0) && name.empty())
+		return "";
+
+	std::ostringstream ss;
+	ss << source << '/';
+	if (cid > -1)
+		ss << cid;
+	ss << '/' << name;
+
+	return ss.str();
+}
+
+//
+// DeviceQualifier :: FromString
+//
+// Set a device qualifier from a string / unserialize
+//
+void DeviceQualifier::FromString(const std::string& str)
+{
+	std::istringstream ss(str);
+
+	std::getline(ss, source = "", '/');
+
+	// silly
+	std::getline(ss, name, '/');
+	std::istringstream(name) >> (cid = -1);
+
+	std::getline(ss, name = "");
+}
+
+//
+// DeviceQualifier :: FromDevice
+//
+// Set a device qualifier from a device
+//
+void DeviceQualifier::FromDevice(const Device* const dev)
+{
+	name = dev->GetName();
+	cid = dev->GetId();
+	source= dev->GetSource();
+}
+
+bool DeviceQualifier::operator==(const Device* const dev) const
+{
+	if (dev->GetId() == cid)
+		if (dev->GetName() == name)
+			if (dev->GetSource() == source)
+				return true;
+
+	return false;
+}
+
+bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
+{
+	if (cid == devq.cid)
+		if (name == devq.name)
+			if (source == devq.source)
+				return true;
+
+	return false;
+}
+
+Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
+{
+	for (Device* d : m_devices)
+	{
+		if (devq == d)
+			return d;
+	}
+
+	return nullptr;
+}
+
+Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const
+{
+	if (def_dev)
+	{
+		Device::Input* const inp = def_dev->FindInput(name);
+		if (inp)
+			return inp;
+	}
+
+	for (Device* d : m_devices)
+	{
+		Device::Input* const i = d->FindInput(name);
+
+		if (i)
+			return i;
+	}
+
+	return nullptr;
+}
+
+Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const
+{
+	return def_dev->FindOutput(name);
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
new file mode 100644
index 0000000000..c27910af5d
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -0,0 +1,186 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
+// idk in case I wanted to change it to double or something, idk what's best
+typedef double ControlState;
+
+namespace ciface
+{
+namespace Core
+{
+
+// Forward declarations
+class DeviceQualifier;
+
+//
+// Device
+//
+// A device class
+//
+class Device
+{
+public:
+	class Input;
+	class Output;
+
+	//
+	// Control
+	//
+	// Control includes inputs and outputs
+	//
+	class Control // input or output
+	{
+	public:
+		virtual std::string GetName() const = 0;
+		virtual ~Control() {}
+
+		bool InputGateOn();
+
+		virtual Input* ToInput() { return nullptr; }
+		virtual Output* ToOutput() { return nullptr; }
+	};
+
+	//
+	// Input
+	//
+	// An input on a device
+	//
+	class Input : public Control
+	{
+	public:
+		// things like absolute axes/ absolute mouse position will override this
+		virtual bool IsDetectable() { return true; }
+
+		virtual ControlState GetState() const = 0;
+
+		bool ShouldHaveInput();
+
+		ControlState GetGatedState()
+		{
+			if (InputGateOn())
+				return GetState();
+			else
+				return 0.0;
+		}
+
+		Input* ToInput() override { return this; }
+	};
+
+	//
+	// Output
+	//
+	// An output on a device
+	//
+	class Output : public Control
+	{
+	public:
+		virtual ~Output() {}
+
+		virtual void SetState(ControlState state) = 0;
+
+		void SetGatedState(ControlState state)
+		{
+			if (InputGateOn())
+				SetState(state);
+		}
+
+		Output* ToOutput() override { return this; }
+	};
+
+	virtual ~Device();
+
+	virtual std::string GetName() const = 0;
+	virtual int GetId() const = 0;
+	virtual std::string GetSource() const = 0;
+	virtual void UpdateInput() {}
+
+	const std::vector<Input*>& Inputs() const { return m_inputs; }
+	const std::vector<Output*>& Outputs() const { return m_outputs; }
+
+	Input* FindInput(const std::string& name) const;
+	Output* FindOutput(const std::string& name) const;
+
+protected:
+	void AddInput(Input* const i);
+	void AddOutput(Output* const o);
+
+	class FullAnalogSurface : public Input
+	{
+	public:
+		FullAnalogSurface(Input* low, Input* high)
+			: m_low(*low), m_high(*high)
+		{}
+
+		ControlState GetState() const override
+		{
+			return (1 + m_high.GetState() - m_low.GetState()) / 2;
+		}
+
+		std::string GetName() const override
+		{
+			return m_low.GetName() + *m_high.GetName().rbegin();
+		}
+
+	private:
+		Input& m_low;
+		Input& m_high;
+	};
+
+	void AddAnalogInputs(Input* low, Input* high)
+	{
+		AddInput(low);
+		AddInput(high);
+		AddInput(new FullAnalogSurface(low, high));
+		AddInput(new FullAnalogSurface(high, low));
+	}
+
+private:
+	std::vector<Input*>  m_inputs;
+	std::vector<Output*> m_outputs;
+};
+
+//
+// DeviceQualifier
+//
+// Device qualifier used to match devices.
+// Currently has ( source, id, name ) properties which match a device
+//
+class DeviceQualifier
+{
+public:
+	DeviceQualifier() : cid(-1) {}
+	DeviceQualifier(const std::string& _source, const int _id, const std::string& _name)
+		: source(_source), cid(_id), name(_name) {}
+	void FromDevice(const Device* const dev);
+	void FromString(const std::string& str);
+	std::string ToString() const;
+	bool operator==(const DeviceQualifier& devq) const;
+	bool operator==(const Device* const dev) const;
+
+	std::string  source;
+	int          cid;
+	std::string  name;
+};
+
+class DeviceContainer
+{
+public:
+	Device::Input* FindInput(const std::string& name, const Device* def_dev) const;
+	Device::Output* FindOutput(const std::string& name, const Device* def_dev) const;
+
+	const std::vector<Device*>& Devices() const { return m_devices; }
+	Device* FindDevice(const DeviceQualifier& devq) const;
+protected:
+	std::vector<Device*> m_devices;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
similarity index 83%
rename from Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
rename to Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
index d91fbc587c..9837ea74cb 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
@@ -1,12 +1,16 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-#include "ExpressionParser.h"
-
+#include <algorithm>
 #include <cassert>
 #include <iostream>
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+
 using namespace ciface::Core;
 
 namespace ciface
@@ -88,7 +92,7 @@ public:
 	std::string expr;
 	std::string::iterator it;
 
-	Lexer(std::string expr_) : expr(expr_)
+	Lexer(const std::string& expr_) : expr(expr_)
 	{
 		it = expr.begin();
 	}
@@ -99,7 +103,7 @@ public:
 		while (it != expr.end())
 		{
 			char c = *it;
-			it++;
+			++it;
 			if (c == '`')
 				return false;
 			if (c > 0 && c == otherDelim)
@@ -132,12 +136,13 @@ public:
 		std::string name;
 		name += c;
 
-		while (it != expr.end()) {
+		while (it != expr.end())
+		{
 			c = *it;
 			if (!isalpha(c))
 				break;
 			name += c;
-			it++;
+			++it;
 		}
 
 		ControlQualifier qualifier;
@@ -214,6 +219,33 @@ public:
 	virtual operator std::string() { return ""; }
 };
 
+class DummyExpression : public ExpressionNode
+{
+public:
+	std::string name;
+
+	DummyExpression(const std::string& name_) : name(name_) {}
+
+	ControlState GetValue() override
+	{
+		return 0.0;
+	}
+
+	void SetValue(ControlState value) override
+	{
+	}
+
+	int CountNumControls() override
+	{
+		return 0;
+	}
+
+	operator std::string() override
+	{
+		return "`" + name + "`";
+	}
+};
+
 class ControlExpression : public ExpressionNode
 {
 public:
@@ -222,22 +254,22 @@ public:
 
 	ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
-		return control->ToInput()->GetState();
+		return control->ToInput()->GetGatedState();
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
-		control->ToOutput()->SetState(value);
+		control->ToOutput()->SetGatedState(value);
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return 1;
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return "`" + (std::string)qualifier + "`";
 	}
@@ -257,7 +289,7 @@ public:
 		delete rhs;
 	}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
 		ControlState lhsValue = lhs->GetValue();
 		ControlState rhsValue = rhs->GetValue();
@@ -268,14 +300,14 @@ public:
 		case TOK_OR:
 			return std::max(lhsValue, rhsValue);
 		case TOK_ADD:
-			return std::min(lhsValue + rhsValue, 1.0f);
+			return std::min(lhsValue + rhsValue, 1.0);
 		default:
 			assert(false);
 			return 0;
 		}
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
 		// Don't do anything special with the op we have.
 		// Treat "A & B" the same as "A | B".
@@ -283,12 +315,12 @@ public:
 		rhs->SetValue(value);
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return lhs->CountNumControls() + rhs->CountNumControls();
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
 	}
@@ -306,36 +338,38 @@ public:
 		delete inner;
 	}
 
-	virtual ControlState GetValue()
+	virtual ControlState GetValue() override
 	{
 		ControlState value = inner->GetValue();
 		switch (op)
 		{
 		case TOK_NOT:
-			return 1.0f - value;
+			return 1.0 - value;
 		default:
 			assert(false);
 			return 0;
 		}
 	}
 
-	virtual void SetValue(ControlState value)
+	virtual void SetValue(ControlState value) override
 	{
 		switch (op)
 		{
 		case TOK_NOT:
-			inner->SetValue(1.0f - value);
+			inner->SetValue(1.0 - value);
+			break;
+
 		default:
 			assert(false);
 		}
 	}
 
-	virtual int CountNumControls()
+	virtual int CountNumControls() override
 	{
 		return inner->CountNumControls();
 	}
 
-	virtual operator std::string()
+	virtual operator std::string() override
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
 	}
@@ -353,7 +387,7 @@ Device::Control *ControlFinder::FindControl(ControlQualifier qualifier)
 {
 	Device *device = FindDevice(qualifier);
 	if (!device)
-		return NULL;
+		return nullptr;
 
 	if (is_input)
 		return device->FindInput(qualifier.control_name);
@@ -410,8 +444,11 @@ private:
 		case TOK_CONTROL:
 			{
 				Device::Control *control = finder.FindControl(tok.qualifier);
-				if (control == NULL)
-					return EXPRESSION_PARSE_NO_DEVICE;
+				if (control == nullptr)
+				{
+					*expr_out = new DummyExpression(tok.qualifier);
+					return EXPRESSION_PARSE_SUCCESS;
+				}
 
 				*expr_out = new ControlExpression(tok.qualifier, control);
 				return EXPRESSION_PARSE_SUCCESS;
@@ -531,11 +568,11 @@ Expression::~Expression()
 	delete node;
 }
 
-ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finder, Expression **expr_out)
+static ExpressionParseStatus ParseExpressionInner(const std::string& str, ControlFinder &finder, Expression **expr_out)
 {
 	ExpressionParseStatus status;
 	Expression *expr;
-	*expr_out = NULL;
+	*expr_out = nullptr;
 
 	if (str == "")
 		return EXPRESSION_PARSE_SUCCESS;
@@ -555,7 +592,7 @@ ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finde
 	return EXPRESSION_PARSE_SUCCESS;
 }
 
-ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Expression **expr_out)
+ExpressionParseStatus ParseExpression(const std::string& str, ControlFinder &finder, Expression **expr_out)
 {
 	// Add compatibility with old simple expressions, which are simple
 	// barewords control names.
@@ -565,7 +602,8 @@ ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Ex
 	qualifier.has_device = false;
 
 	Device::Control *control = finder.FindControl(qualifier);
-	if (control) {
+	if (control)
+	{
 		*expr_out = new Expression(new ControlExpression(qualifier, control));
 		return EXPRESSION_PARSE_SUCCESS;
 	}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
similarity index 78%
rename from Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
rename to Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
index 70cc51373b..9575ff619d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
@@ -1,9 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-#ifndef _EXPRESSIONPARSER_H_
-#define _EXPRESSIONPARSER_H_
+#pragma once
 
 #include <string>
-#include "Device.h"
+#include "InputCommon/ControllerInterface/Device.h"
 
 namespace ciface
 {
@@ -45,7 +47,7 @@ class ExpressionNode;
 class Expression
 {
 public:
-	Expression() : node(NULL) {}
+	Expression() : node(nullptr) {}
 	Expression(ExpressionNode *node);
 	~Expression();
 	ControlState GetValue();
@@ -61,9 +63,7 @@ enum ExpressionParseStatus
 	EXPRESSION_PARSE_NO_DEVICE,
 };
 
-ExpressionParseStatus ParseExpression(std::string expr, ControlFinder &finder, Expression **expr_out);
+ExpressionParseStatus ParseExpression(const std::string& expr, ControlFinder &finder, Expression **expr_out);
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
new file mode 100644
index 0000000000..f67f63fc8b
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@@ -0,0 +1,210 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <string>
+#include "Common/Thread.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
+
+namespace ciface
+{
+namespace ForceFeedback
+{
+
+// template instantiation
+template class ForceFeedbackDevice::Force<DICONSTANTFORCE>;
+template class ForceFeedbackDevice::Force<DIRAMPFORCE>;
+template class ForceFeedbackDevice::Force<DIPERIODIC>;
+
+struct ForceType
+{
+	GUID guid;
+	const std::string name;
+};
+
+static const ForceType force_type_names[] =
+{
+	{GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE
+	{GUID_RampForce, "Ramp"},         // DIRAMPFORCE
+	{GUID_Square, "Square"},          // DIPERIODIC ...
+	{GUID_Sine, "Sine"},
+	{GUID_Triangle, "Triangle"},
+	{GUID_SawtoothUp, "Sawtooth Up"},
+	{GUID_SawtoothDown, "Sawtooth Down"},
+	//{GUID_Spring, "Spring"},          // DICUSTOMFORCE ... < I think
+	//{GUID_Damper, "Damper"},
+	//{GUID_Inertia, "Inertia"},
+	//{GUID_Friction, "Friction"},
+};
+
+bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, int cAxes)
+{
+	if (cAxes == 0)
+		return false;
+
+	// TODO: check for DIDC_FORCEFEEDBACK in devcaps?
+
+	// temporary
+	DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y};
+	LONG rglDirection[2] = {-200, 0};
+
+	DIEFFECT eff;
+	memset(&eff, 0, sizeof(eff));
+	eff.dwSize = sizeof(DIEFFECT);
+	eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+	eff.dwDuration = INFINITE; // (4 * DI_SECONDS)
+	eff.dwSamplePeriod = 0;
+	eff.dwGain = DI_FFNOMINALMAX;
+	eff.dwTriggerButton = DIEB_NOTRIGGER;
+	eff.dwTriggerRepeatInterval = 0;
+	eff.cAxes = std::min<DWORD>(1, cAxes);
+	eff.rgdwAxes = rgdwAxes;
+	eff.rglDirection = rglDirection;
+
+	// initialize parameters
+	DICONSTANTFORCE diCF = { -10000 };
+	diCF.lMagnitude = DI_FFNOMINALMAX;
+	DIRAMPFORCE diRF = { 0 };
+	DIPERIODIC diPE = { 0 };
+
+	// doesn't seem needed
+	//DIENVELOPE env;
+	//eff.lpEnvelope = &env;
+	//ZeroMemory(&env, sizeof(env));
+	//env.dwSize = sizeof(env);
+
+	for (const ForceType& f : force_type_names)
+	{
+		if (f.guid == GUID_ConstantForce)
+		{
+			eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE);
+			eff.lpvTypeSpecificParams = &diCF;
+		}
+		else if (f.guid == GUID_RampForce)
+		{
+			eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE);
+			eff.lpvTypeSpecificParams = &diRF;
+		}
+		else
+		{
+			// all other forces need periodic parameters
+			eff.cbTypeSpecificParams = sizeof(DIPERIODIC);
+			eff.lpvTypeSpecificParams = &diPE;
+		}
+
+		LPDIRECTINPUTEFFECT pEffect;
+		if (SUCCEEDED(device->CreateEffect(f.guid, &eff, &pEffect, nullptr)))
+		{
+			if (f.guid == GUID_ConstantForce)
+				AddOutput(new ForceConstant(f.name, pEffect));
+			else if (f.guid == GUID_RampForce)
+				AddOutput(new ForceRamp(f.name, pEffect));
+			else
+				AddOutput(new ForcePeriodic(f.name, pEffect));
+		}
+	}
+
+	// disable autocentering
+	if (Outputs().size())
+	{
+		DIPROPDWORD dipdw;
+		dipdw.diph.dwSize = sizeof( DIPROPDWORD );
+		dipdw.diph.dwHeaderSize = sizeof( DIPROPHEADER );
+		dipdw.diph.dwObj = 0;
+		dipdw.diph.dwHow = DIPH_DEVICE;
+		dipdw.dwData = DIPROPAUTOCENTER_OFF;
+		device->SetProperty( DIPROP_AUTOCENTER, &dipdw.diph );
+	}
+
+	return true;
+}
+
+template<typename P>
+ForceFeedbackDevice::Force<P>::~Force()
+{
+	m_iface->Stop();
+	m_iface->Unload();
+	m_iface->Release();
+}
+
+template<typename P>
+void ForceFeedbackDevice::Force<P>::Update()
+{
+	DIEFFECT eff = {};
+	eff.dwSize = sizeof(DIEFFECT);
+	eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+
+	eff.cbTypeSpecificParams = sizeof(P);
+	eff.lpvTypeSpecificParams = &params;
+
+	// set params and start effect
+	m_iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START);
+}
+
+template<typename P>
+void ForceFeedbackDevice::Force<P>::Stop()
+{
+	m_iface->Stop();
+}
+
+template<>
+void ForceFeedbackDevice::ForceConstant::SetState(const ControlState state)
+{
+	const LONG new_val = LONG(10000 * state);
+
+	if (params.lMagnitude == new_val)
+		return;
+
+	params.lMagnitude = new_val;
+	if (new_val)
+		Update();
+	else
+		Stop();
+}
+
+template<>
+void ForceFeedbackDevice::ForceRamp::SetState(const ControlState state)
+{
+	const LONG new_val = LONG(10000 * state);
+
+	if (params.lStart == new_val)
+		return;
+
+	params.lStart = params.lEnd = new_val;
+	if (new_val)
+		Update();
+	else
+		Stop();
+}
+
+template<>
+void ForceFeedbackDevice::ForcePeriodic::SetState(const ControlState state)
+{
+	const DWORD new_val = DWORD(10000 * state);
+
+	if (params.dwMagnitude == new_val)
+		return;
+
+	params.dwMagnitude = new_val;
+	if (new_val)
+		Update();
+	else
+		Stop();
+}
+
+template <typename P>
+ForceFeedbackDevice::Force<P>::Force(const std::string& name, LPDIRECTINPUTEFFECT iface)
+: m_name(name), m_iface(iface)
+{
+	memset(&params, 0, sizeof(params));
+}
+
+template <typename P>
+std::string ForceFeedbackDevice::Force<P>::GetName() const
+{
+	return m_name;
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
new file mode 100644
index 0000000000..a528c00602
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@@ -0,0 +1,53 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <list>
+#include <string>
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+#ifdef _WIN32
+#include <Windows.h>
+#include "InputCommon/ControllerInterface/DInput/DInput8.h"
+#elif __APPLE__
+#include "InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h"
+#endif
+
+namespace ciface
+{
+namespace ForceFeedback
+{
+
+
+class ForceFeedbackDevice : public Core::Device
+{
+private:
+	template <typename P>
+	class Force : public Output
+	{
+	public:
+		std::string GetName() const;
+		Force(const std::string& name, LPDIRECTINPUTEFFECT iface);
+		~Force();
+		void SetState(ControlState state);
+		void Update();
+		void Stop();
+	private:
+		const std::string m_name;
+		LPDIRECTINPUTEFFECT m_iface;
+		P params;
+	};
+	typedef Force<DICONSTANTFORCE>  ForceConstant;
+	typedef Force<DIRAMPFORCE>      ForceRamp;
+	typedef Force<DIPERIODIC>       ForcePeriodic;
+
+public:
+	bool InitForceFeedback(const LPDIRECTINPUTDEVICE8, int cAxes);
+};
+
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
new file mode 100644
index 0000000000..133a4e2d09
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -0,0 +1,223 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+/*
+ * The OS X Force Feedback API is very similar to the DirectInput API,
+ * but it is no longer object-oriented and all prefixes have been changed.
+ *
+ * Our implementation uses the Windows API names so we need to adapt
+ * for these differences on OS X.
+ */
+
+#pragma once
+
+#include <atomic>
+
+typedef LONG* LPLONG; // Missing type for ForceFeedback.h
+#include <CoreFoundation/CoreFoundation.h>
+#include <ForceFeedback/ForceFeedback.h>
+#include "DirectInputConstants.h" // Not stricty necessary
+#include "Common/CommonTypes.h" // for LONG
+
+namespace ciface
+{
+namespace ForceFeedback
+{
+
+
+// Prototypes
+class IUnknownImpl;
+class FFEffectAdapter;
+class FFDeviceAdapter;
+
+// Structs
+typedef FFCAPABILITIES              DICAPABILITIES;
+typedef FFCONDITION                 DICONDITION;
+typedef FFCONSTANTFORCE             DICONSTANTFORCE;
+typedef FFCUSTOMFORCE               DICUSTOMFORCE;
+typedef FFEFFECT                    DIEFFECT;
+typedef FFEFFESCAPE                 DIEFFESCAPE;
+typedef FFENVELOPE                  DIENVELOPE;
+typedef FFPERIODIC                  DIPERIODIC;
+typedef FFRAMPFORCE                 DIRAMPFORCE;
+
+// Other types
+typedef CFUUIDRef                   GUID;
+typedef FFDeviceAdapter*            FFDeviceAdapterReference;
+typedef FFEffectAdapter*            FFEffectAdapterReference;
+typedef FFDeviceAdapterReference    LPDIRECTINPUTDEVICE8;
+typedef FFEffectAdapterReference    LPDIRECTINPUTEFFECT;
+
+// Property structures
+#define DIPH_DEVICE 0
+
+typedef struct DIPROPHEADER {
+	DWORD dwSize;
+	DWORD dwHeaderSize;
+	DWORD dwObj;
+	DWORD dwHow;
+} DIPROPHEADER, *LPDIPROPHEADER;
+
+typedef struct DIPROPDWORD {
+	DIPROPHEADER diph;
+	DWORD dwData;
+} DIPROPDWORD, *LPDIPROPDWORD;
+
+class IUnknownImpl : public IUnknown
+{
+private:
+	std::atomic<ULONG> m_cRef;
+
+public:
+	IUnknownImpl() : m_cRef(1) {}
+	virtual ~IUnknownImpl() {}
+
+	HRESULT QueryInterface(REFIID iid, LPVOID *ppv)
+	{
+		*ppv = nullptr;
+
+		if (CFEqual(&iid, IUnknownUUID))
+			*ppv = this;
+		if (nullptr == *ppv)
+			return E_NOINTERFACE;
+
+		((IUnknown*)*ppv)->AddRef();
+
+		return S_OK;
+	}
+
+	ULONG AddRef()
+	{
+		return ++m_cRef;
+	}
+
+	ULONG Release()
+	{
+		if (--m_cRef == 0)
+			delete this;
+
+		return m_cRef;
+	}
+};
+
+class FFEffectAdapter : public IUnknownImpl
+{
+private:
+	// Only used for destruction
+	FFDeviceObjectReference m_device;
+
+public:
+	FFEffectObjectReference m_effect;
+
+	FFEffectAdapter(FFDeviceObjectReference device, FFEffectObjectReference effect) : m_device(device), m_effect(effect) {}
+	~FFEffectAdapter() { FFDeviceReleaseEffect(m_device, m_effect); }
+
+	HRESULT Download()
+	{
+		return FFEffectDownload(m_effect);
+	}
+
+	HRESULT Escape(FFEFFESCAPE *pFFEffectEscape)
+	{
+		return FFEffectEscape(m_effect, pFFEffectEscape);
+	}
+
+	HRESULT GetEffectStatus(FFEffectStatusFlag *pFlags)
+	{
+		return FFEffectGetEffectStatus(m_effect, pFlags);
+	}
+
+	HRESULT GetParameters(FFEFFECT *pFFEffect, FFEffectParameterFlag flags)
+	{
+		return FFEffectGetParameters(m_effect, pFFEffect, flags);
+	}
+
+	HRESULT SetParameters(FFEFFECT *pFFEffect, FFEffectParameterFlag flags)
+	{
+		return FFEffectSetParameters(m_effect, pFFEffect, flags);
+	}
+
+	HRESULT Start(UInt32 iterations, FFEffectStartFlag flags)
+	{
+		return FFEffectStart(m_effect, iterations, flags);
+	}
+
+	HRESULT Stop()
+	{
+		return FFEffectStop(m_effect);
+	}
+
+	HRESULT Unload()
+	{
+		return FFEffectUnload(m_effect);
+	}
+};
+
+class FFDeviceAdapter : public IUnknownImpl
+{
+public:
+	FFDeviceObjectReference m_device;
+
+	FFDeviceAdapter(FFDeviceObjectReference device) : m_device(device) {}
+	~FFDeviceAdapter() { FFReleaseDevice(m_device); }
+
+	static HRESULT Create(io_service_t hidDevice, FFDeviceAdapterReference *pDeviceReference)
+	{
+		FFDeviceObjectReference ref;
+
+		HRESULT hr = FFCreateDevice(hidDevice, &ref);
+		if (SUCCEEDED(hr))
+			*pDeviceReference = new FFDeviceAdapter(ref);
+
+		return hr;
+	}
+
+	HRESULT CreateEffect(CFUUIDRef uuidRef, FFEFFECT *pEffectDefinition, FFEffectAdapterReference *pEffectReference, IUnknown *punkOuter)
+	{
+		FFEffectObjectReference ref;
+
+		HRESULT hr = FFDeviceCreateEffect(m_device, uuidRef, pEffectDefinition, &ref);
+		if (SUCCEEDED(hr))
+			*pEffectReference = new FFEffectAdapter(m_device, ref);
+
+		return hr;
+	}
+
+	HRESULT Escape(FFEFFESCAPE *pFFEffectEscape)
+	{
+		return FFDeviceEscape(m_device, pFFEffectEscape);
+	}
+
+	HRESULT GetForceFeedbackState(FFState *pFFState)
+	{
+		return FFDeviceGetForceFeedbackState(m_device, pFFState);
+	}
+
+	HRESULT SendForceFeedbackCommand(FFCommandFlag flags)
+	{
+		return FFDeviceSendForceFeedbackCommand(m_device, flags);
+	}
+
+	HRESULT SetCooperativeLevel(void *taskIdentifier, FFCooperativeLevelFlag flags)
+	{
+		return FFDeviceSetCooperativeLevel(m_device, taskIdentifier, flags);
+	}
+
+	HRESULT SetProperty(FFProperty property, const LPDIPROPHEADER pdiph)
+	{
+		// There are only two properties supported
+		if (property != DIPROP_FFGAIN && property != DIPROP_AUTOCENTER)
+			return DIERR_UNSUPPORTED;
+
+		// And they are both device properties
+		if (pdiph->dwHow != DIPH_DEVICE)
+			return DIERR_INVALIDPARAM;
+
+		UInt32 value = ((const LPDIPROPDWORD)pdiph)->dwData;
+		return FFDeviceSetForceFeedbackProperty(m_device, property, &value);
+	}
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h
new file mode 100644
index 0000000000..ceac035b6c
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h
@@ -0,0 +1,147 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+/*
+ * Define all constants from ForceFeedbackConstants.h with DirectInput prefixes.
+ *
+ * No effort was made to confirm if all definitions are actually supported by
+ * DirectInput, so some of these definitions may actually only exist on Mac OS X.
+ */
+
+// UUIDs
+#define GUID_ConstantForce              kFFEffectType_ConstantForce_ID
+#define GUID_CustomForce                kFFEffectType_CustomForce_ID
+#define GUID_Damper                     kFFEffectType_Damper_ID
+#define GUID_Friction                   kFFEffectType_Friction_ID
+#define GUID_Inertia                    kFFEffectType_Inertia_ID
+#define GUID_RampForce                  kFFEffectType_RampForce_ID
+#define GUID_SawtoothDown               kFFEffectType_SawtoothDown_ID
+#define GUID_SawtoothUp                 kFFEffectType_SawtoothUp_ID
+#define GUID_Sine                       kFFEffectType_Sine_ID
+#define GUID_Spring                     kFFEffectType_Spring_ID
+#define GUID_Square                     kFFEffectType_Square_ID
+#define GUID_Triangle                   kFFEffectType_Triangle_ID
+
+// Miscellaneous
+#define DI_DEGREES                      FF_DEGREES
+#define DI_DOWNLOADSKIPPED              FF_DOWNLOADSKIPPED
+#define DI_EFFECTRESTARTED              FF_EFFECTRESTARTED
+#define DI_FALSE                        FF_FALSE
+#define DI_FFNOMINALMAX                 FF_FFNOMINALMAX
+#define DI_INFINITE                     FF_INFINITE
+#define DI_OK                           FF_OK
+#define DI_SECONDS                      FF_SECONDS
+#define DI_TRUNCATED                    FF_TRUNCATED
+#define DI_TRUNCATEDANDRESTARTED        FF_TRUNCATEDANDRESTARTED
+#define DIEFF_OBJECTOFFSETS             FFEFF_OBJECTOFFSETS
+#define DIERR_DEVICEFULL                FFERR_DEVICEFULL
+#define DIERR_DEVICENOTREG              FFERR_DEVICENOTREG
+#define DIERR_DEVICEPAUSED              FFERR_DEVICEPAUSED
+#define DIERR_DEVICERELEASED            FFERR_DEVICERELEASED
+#define DIERR_EFFECTPLAYING             FFERR_EFFECTPLAYING
+#define DIERR_EFFECTTYPEMISMATCH        FFERR_EFFECTTYPEMISMATCH
+#define DIERR_EFFECTTYPENOTSUPPORTED    FFERR_EFFECTTYPENOTSUPPORTED
+#define DIERR_GENERIC                   FFERR_GENERIC
+#define DIERR_HASEFFECTS                FFERR_HASEFFECTS
+#define DIERR_INCOMPLETEEFFECT          FFERR_INCOMPLETEEFFECT
+#define DIERR_INTERNAL                  FFERR_INTERNAL
+#define DIERR_INVALIDDOWNLOADID         FFERR_INVALIDDOWNLOADID
+#define DIERR_INVALIDPARAM              FFERR_INVALIDPARAM
+#define DIERR_MOREDATA                  FFERR_MOREDATA
+#define DIERR_NOINTERFACE               FFERR_NOINTERFACE
+#define DIERR_NOTDOWNLOADED             FFERR_NOTDOWNLOADED
+#define DIERR_NOTINITIALIZED            FFERR_NOTINITIALIZED
+#define DIERR_OUTOFMEMORY               FFERR_OUTOFMEMORY
+#define DIERR_UNPLUGGED                 FFERR_UNPLUGGED
+#define DIERR_UNSUPPORTED               FFERR_UNSUPPORTED
+#define DIERR_UNSUPPORTEDAXIS           FFERR_UNSUPPORTEDAXIS
+#define DIJOFS_X                        FFJOFS_X
+#define DIJOFS_Y                        FFJOFS_Y
+#define DIJOFS_Z                        FFJOFS_Z
+
+// FFCapabilitiesEffectSubType
+#define DICAP_ST_KINESTHETIC            FFCAP_ST_KINESTHETIC
+#define DICAP_ST_VIBRATION              FFCAP_ST_VIBRATION
+
+// FFCapabilitiesEffectType
+#define DICAP_ET_CONSTANTFORCE          FFCAP_ET_CONSTANTFORCE
+#define DICAP_ET_RAMPFORCE              FFCAP_ET_RAMPFORCE
+#define DICAP_ET_SQUARE                 FFCAP_ET_SQUARE
+#define DICAP_ET_SINE                   FFCAP_ET_SINE
+#define DICAP_ET_TRIANGLE               FFCAP_ET_TRIANGLE
+#define DICAP_ET_SAWTOOTHUP             FFCAP_ET_SAWTOOTHUP
+#define DICAP_ET_SAWTOOTHDOWN           FFCAP_ET_SAWTOOTHDOWN
+#define DICAP_ET_SPRING                 FFCAP_ET_SPRING
+#define DICAP_ET_DAMPER                 FFCAP_ET_DAMPER
+#define DICAP_ET_INERTIA                FFCAP_ET_INERTIA
+#define DICAP_ET_FRICTION               FFCAP_ET_FRICTION
+#define DICAP_ET_CUSTOMFORCE            FFCAP_ET_CUSTOMFORCE
+
+// FFCommandFlag
+#define DISFFC_RESET                    FFSFFC_RESET
+#define DISFFC_STOPALL                  FFSFFC_STOPALL
+#define DISFFC_PAUSE                    FFSFFC_PAUSE
+#define DISFFC_CONTINUE                 FFSFFC_CONTINUE
+#define DISFFC_SETACTUATORSON           FFSFFC_SETACTUATORSON
+#define DISFFC_SETACTUATORSOFF          FFSFFC_SETACTUATORSOFF
+
+// FFCooperativeLevelFlag
+#define DISCL_EXCLUSIVE                 FFSCL_EXCLUSIVE
+#define DISCL_NONEXCLUSIVE              FFSCL_NONEXCLUSIVE
+#define DISCL_FOREGROUND                FFSCL_FOREGROUND
+#define DISCL_BACKGROUND                FFSCL_BACKGROUND
+
+// FFCoordinateSystemFlag
+#define DIEFF_CARTESIAN                 FFEFF_CARTESIAN
+#define DIEFF_POLAR                     FFEFF_POLAR
+#define DIEFF_SPHERICAL                 FFEFF_SPHERICAL
+
+// FFEffectParameterFlag
+#define DIEP_DURATION                   FFEP_DURATION
+#define DIEP_SAMPLEPERIOD               FFEP_SAMPLEPERIOD
+#define DIEP_GAIN                       FFEP_GAIN
+#define DIEP_TRIGGERBUTTON              FFEP_TRIGGERBUTTON
+#define DIEP_TRIGGERREPEATINTERVAL      FFEP_TRIGGERREPEATINTERVAL
+#define DIEP_AXES                       FFEP_AXES
+#define DIEP_DIRECTION                  FFEP_DIRECTION
+#define DIEP_ENVELOPE                   FFEP_ENVELOPE
+#define DIEP_TYPESPECIFICPARAMS         FFEP_TYPESPECIFICPARAMS
+#define DIEP_STARTDELAY                 FFEP_STARTDELAY
+#define DIEP_ALLPARAMS                  FFEP_ALLPARAMS
+#define DIEP_START                      FFEP_START
+#define DIEP_NORESTART                  FFEP_NORESTART
+#define DIEP_NODOWNLOAD                 FFEP_NODOWNLOAD
+#define DIEB_NOTRIGGER                  FFEB_NOTRIGGER
+
+// FFEffectStartFlag
+#define DIES_SOLO                       FFES_SOLO
+#define DIES_NODOWNLOAD                 FFES_NODOWNLOAD
+
+// FFEffectStatusFlag
+#define DIEGES_NOTPLAYING               FFEGES_NOTPLAYING
+#define DIEGES_PLAYING                  FFEGES_PLAYING
+#define DIEGES_EMULATED                 FFEGES_EMULATED
+
+// FFProperty
+#define DIPROP_FFGAIN                   FFPROP_FFGAIN
+#define DIPROP_AUTOCENTER               FFPROP_AUTOCENTER
+// not defined in ForceFeedbackConstants.h
+#define DIPROPAUTOCENTER_OFF            0
+#define DIPROPAUTOCENTER_ON             1
+
+// FFState
+#define DIGFFS_EMPTY                    FFGFFS_EMPTY
+#define DIGFFS_STOPPED                  FFGFFS_STOPPED
+#define DIGFFS_PAUSED                   FFGFFS_PAUSED
+#define DIGFFS_ACTUATORSON              FFGFFS_ACTUATORSON
+#define DIGFFS_ACTUATORSOFF             FFGFFS_ACTUATORSOFF
+#define DIGFFS_POWERON                  FFGFFS_POWERON
+#define DIGFFS_POWEROFF                 FFGFFS_POWEROFF
+#define DIGFFS_SAFETYSWITCHON           FFGFFS_SAFETYSWITCHON
+#define DIGFFS_SAFETYSWITCHOFF          FFGFFS_SAFETYSWITCHOFF
+#define DIGFFS_USERFFSWITCHON           FFGFFS_USERFFSWITCHON
+#define DIGFFS_USERFFSWITCHOFF          FFGFFS_USERFFSWITCHOFF
+#define DIGFFS_DEVICELOST               FFGFFS_DEVICELOST
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
new file mode 100644
index 0000000000..5cb4a87fd8
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
@@ -0,0 +1,20 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace OSX
+{
+
+void Init(std::vector<Core::Device*>& devices, void *window);
+void DeInit();
+
+void DeviceElementDebugPrint(const void *, void *);
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
similarity index 87%
rename from Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm
rename to Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
index 8a859f46c8..18542b6c50 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
@@ -1,10 +1,14 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <Cocoa/Cocoa.h>
 
-#include "OSX.h"
-#include "OSXKeyboard.h"
-#include "OSXJoystick.h"
+#include "InputCommon/ControllerInterface/OSX/OSX.h"
+#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h"
+#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
 
 #include <map>
 
@@ -14,7 +18,7 @@ namespace OSX
 {
 
 
-static IOHIDManagerRef HIDManager = NULL;
+static IOHIDManagerRef HIDManager = nullptr;
 static CFStringRef OurRunLoop = CFSTR("DolphinOSXInput");
 static std::map<std::string, int> kbd_name_counts, joy_name_counts;
 
@@ -26,7 +30,8 @@ void DeviceElementDebugPrint(const void *value, void *context)
 		recurse = *(bool*)context;
 
 	std::string type = "";
-	switch (IOHIDElementGetType(e)) {
+	switch (IOHIDElementGetType(e))
+	{
 	case kIOHIDElementTypeInput_Axis:
 		type = "axis";
 		break;
@@ -53,7 +58,8 @@ void DeviceElementDebugPrint(const void *value, void *context)
 	std::string c_type = "";
 	if (type == "collection")
 	{
-		switch (IOHIDElementGetCollectionType(e)) {
+		switch (IOHIDElementGetCollectionType(e))
+		{
 		case kIOHIDElementCollectionTypePhysical:
 			c_type = "physical";
 			break;
@@ -86,7 +92,7 @@ void DeviceElementDebugPrint(const void *value, void *context)
 		  type == "collection" ? c_type.c_str() : " ",
 		  IOHIDElementGetUsagePage(e),
 		  IOHIDElementGetUsage(e),
-		  IOHIDElementGetName(e),		// usually just NULL
+		  IOHIDElementGetName(e),		// usually just nullptr
 		  IOHIDElementGetLogicalMin(e),
 		  IOHIDElementGetLogicalMax(e),
 		  IOHIDElementGetPhysicalMin(e),
@@ -98,11 +104,11 @@ void DeviceElementDebugPrint(const void *value, void *context)
 		CFRange range = {0, CFArrayGetCount(elements)};
 		// this leaks...but it's just debug code, right? :D
 		CFArrayApplyFunction(elements, range,
-			DeviceElementDebugPrint, NULL);
+			DeviceElementDebugPrint, nullptr);
 	}
 }
 
-void DeviceDebugPrint(IOHIDDeviceRef device)
+static void DeviceDebugPrint(IOHIDDeviceRef device)
 {
 #if 0
 #define shortlog(x) NSLog(@"%s: %@", \
@@ -142,7 +148,7 @@ static void DeviceMatching_callback(void* inContext,
 {
 	NSString *pName = (NSString *)
 		IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey));
-	std::string name = (pName != NULL) ? [pName UTF8String] : "Unknown device";
+	std::string name = (pName != nullptr) ? [pName UTF8String] : "Unknown device";
 
 	DeviceDebugPrint(inIOHIDDeviceRef);
 
@@ -174,7 +180,7 @@ void Init(std::vector<Core::Device*>& devices, void *window)
 
 	g_window = window;
 
-	IOHIDManagerSetDeviceMatching(HIDManager, NULL);
+	IOHIDManagerSetDeviceMatching(HIDManager, nullptr);
 
 	// Callbacks for acquisition or loss of a matching device
 	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager,
@@ -196,7 +202,7 @@ void Init(std::vector<Core::Device*>& devices, void *window)
 
 	// Things should be configured now
 	// Disable hotplugging and other scheduling
-	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager, NULL, NULL);
+	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager, nullptr, nullptr);
 	IOHIDManagerUnscheduleFromRunLoop(HIDManager,
 		CFRunLoopGetCurrent(), OurRunLoop);
 }
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
new file mode 100644
index 0000000000..c0fdec5537
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -0,0 +1,91 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <IOKit/hid/IOHIDLib.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
+
+namespace ciface
+{
+namespace OSX
+{
+
+class Joystick : public ForceFeedback::ForceFeedbackDevice
+{
+private:
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(IOHIDElementRef element, IOHIDDeviceRef device)
+			: m_element(element), m_device(device) {}
+		ControlState GetState() const;
+	private:
+		const IOHIDElementRef m_element;
+		const IOHIDDeviceRef  m_device;
+	};
+
+	class Axis : public Input
+	{
+	public:
+		enum direction
+		{
+			positive = 0,
+			negative
+		};
+		std::string GetName() const;
+		Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir);
+		ControlState GetState() const;
+
+	private:
+		const IOHIDElementRef m_element;
+		const IOHIDDeviceRef  m_device;
+		std::string           m_name;
+		const direction       m_direction;
+		float                 m_neutral;
+		float                 m_scale;
+	};
+
+	class Hat : public Input
+	{
+	public:
+		enum direction
+		{
+			up = 0,
+			right,
+			down,
+			left
+		};
+		std::string GetName() const;
+		Hat(IOHIDElementRef element, IOHIDDeviceRef device, direction dir);
+		ControlState GetState() const;
+
+	private:
+		const IOHIDElementRef m_element;
+		const IOHIDDeviceRef  m_device;
+		const char*           m_name;
+		const direction       m_direction;
+	};
+
+public:
+	Joystick(IOHIDDeviceRef device, std::string name, int index);
+	~Joystick();
+
+	std::string GetName() const;
+	std::string GetSource() const;
+	int GetId() const;
+
+private:
+	const IOHIDDeviceRef m_device;
+	const std::string    m_device_name;
+	const int            m_index;
+
+	ForceFeedback::FFDeviceAdapterReference m_ff_device;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
similarity index 81%
rename from Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
rename to Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index ebd713d142..234625a40f 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -1,9 +1,13 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 
-#include "OSXJoystick.h"
-
-#include <sstream>
+#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
 
 namespace ciface
 {
@@ -15,15 +19,13 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 	: m_device(device)
 	, m_device_name(name)
 	, m_index(index)
+	, m_ff_device(nullptr)
 {
 	// Buttons
-	NSDictionary *buttonDict =
-	 [NSDictionary dictionaryWithObjectsAndKeys:
-	  [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementTypeKey,
-	  [NSNumber numberWithInteger: kHIDPage_Button],
-		@kIOHIDElementUsagePageKey,
-	  nil];
+	NSDictionary *buttonDict = @{
+		@kIOHIDElementTypeKey      : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
+		@kIOHIDElementUsagePageKey : [NSNumber numberWithInteger: kHIDPage_Button]
+	};
 
 	CFArrayRef buttons = IOHIDDeviceCopyMatchingElements(m_device,
 		(CFDictionaryRef)buttonDict, kIOHIDOptionsTypeNone);
@@ -34,7 +36,7 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 		{
 			IOHIDElementRef e =
 			(IOHIDElementRef)CFArrayGetValueAtIndex(buttons, i);
-			//DeviceElementDebugPrint(e, NULL);
+			//DeviceElementDebugPrint(e, nullptr);
 
 			AddInput(new Button(e, m_device));
 		}
@@ -42,11 +44,9 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 	}
 
 	// Axes
-	NSDictionary *axisDict =
-	[NSDictionary dictionaryWithObjectsAndKeys:
-	 [NSNumber numberWithInteger: kIOHIDElementTypeInput_Misc],
-		@kIOHIDElementTypeKey,
-	 nil];
+	NSDictionary *axisDict = @{
+		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Misc]
+	};
 
 	CFArrayRef axes = IOHIDDeviceCopyMatchingElements(m_device,
 		(CFDictionaryRef)axisDict, kIOHIDOptionsTypeNone);
@@ -57,30 +57,37 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 		{
 			IOHIDElementRef e =
 			(IOHIDElementRef)CFArrayGetValueAtIndex(axes, i);
-			//DeviceElementDebugPrint(e, NULL);
+			//DeviceElementDebugPrint(e, nullptr);
 
-			if (IOHIDElementGetUsage(e) == kHIDUsage_GD_Hatswitch) {
+			if (IOHIDElementGetUsage(e) == kHIDUsage_GD_Hatswitch)
+			{
 				AddInput(new Hat(e, m_device, Hat::up));
 				AddInput(new Hat(e, m_device, Hat::right));
 				AddInput(new Hat(e, m_device, Hat::down));
 				AddInput(new Hat(e, m_device, Hat::left));
-			} else {
+			}
+			else
+			{
 				AddAnalogInputs(new Axis(e, m_device, Axis::negative),
 					new Axis(e, m_device, Axis::positive));
 			}
 		}
 		CFRelease(axes);
 	}
+
+	// Force Feedback
+	FFCAPABILITIES ff_caps;
+	if (SUCCEEDED(ForceFeedback::FFDeviceAdapter::Create(IOHIDDeviceGetService(m_device), &m_ff_device)) &&
+		SUCCEEDED(FFDeviceGetForceFeedbackCapabilities(m_ff_device->m_device, &ff_caps)))
+	{
+		InitForceFeedback(m_ff_device, ff_caps.numFfAxes);
+	}
 }
 
-bool Joystick::UpdateInput()
+Joystick::~Joystick()
 {
-	return true;
-}
-
-bool Joystick::UpdateOutput()
-{
-	return true;
+	if (m_ff_device)
+		m_ff_device->Release();
 }
 
 std::string Joystick::GetName() const
@@ -198,7 +205,8 @@ Joystick::Hat::Hat(IOHIDElementRef element, IOHIDDeviceRef device, direction dir
 	, m_device(device)
 	, m_direction(dir)
 {
-	switch (dir) {
+	switch (dir)
+	{
 	case up:
 		m_name = "Up";
 		break;
@@ -225,7 +233,8 @@ ControlState Joystick::Hat::GetState() const
 	{
 		position = IOHIDValueGetIntegerValue(value);
 
-		switch (position) {
+		switch (position)
+		{
 		case 0:
 			if (m_direction == up)
 				return 1;
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
new file mode 100644
index 0000000000..973bd1fefd
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -0,0 +1,78 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <IOKit/hid/IOHIDLib.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace OSX
+{
+
+class Keyboard : public Core::Device
+{
+private:
+	class Key : public Input
+	{
+	public:
+		std::string GetName() const;
+		Key(IOHIDElementRef element, IOHIDDeviceRef device);
+		ControlState GetState() const;
+	private:
+		const IOHIDElementRef m_element;
+		const IOHIDDeviceRef  m_device;
+		std::string           m_name;
+	};
+
+	class Cursor : public Input
+	{
+	public:
+		std::string GetName() const;
+		bool IsDetectable() { return false; }
+		Cursor(u8 index, const float& axis, const bool positive) : m_axis(axis), m_index(index), m_positive(positive) {}
+		ControlState GetState() const;
+	private:
+		const float& m_axis;
+		const u8     m_index;
+		const bool   m_positive;
+	};
+
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(u8 index, const unsigned char& button) : m_button(button), m_index(index) {}
+		ControlState GetState() const;
+	private:
+		const unsigned char& m_button;
+		const u8 m_index;
+	};
+
+public:
+	void UpdateInput() override;
+
+	Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
+
+	std::string GetName() const;
+	std::string GetSource() const;
+	int GetId() const;
+
+private:
+	struct
+	{
+		float x, y;
+	} m_cursor;
+
+	const IOHIDDeviceRef m_device;
+	const std::string    m_device_name;
+	int                  m_index;
+	uint32_t             m_windowid;
+	unsigned char        m_mousebuttons[3];
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
similarity index 88%
rename from Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
rename to Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
index 6473f00e77..9c5707bc5d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@@ -1,11 +1,14 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <Cocoa/Cocoa.h>
-#include <wx/wx.h> // wxWidgets
 
-#include "OSXKeyboard.h"
-
-#include <sstream>
+#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h"
 
 namespace ciface
 {
@@ -19,13 +22,11 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win
 {
 	// This class should only recieve Keyboard or Keypad devices
 	// Now, filter on just the buttons we can handle sanely
-	NSDictionary *matchingElements =
-	 [NSDictionary dictionaryWithObjectsAndKeys:
-	  [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
-		@kIOHIDElementTypeKey,
-	  [NSNumber numberWithInteger: 0], @kIOHIDElementMinKey,
-	  [NSNumber numberWithInteger: 1], @kIOHIDElementMaxKey,
-	  nil];
+	NSDictionary *matchingElements = @{
+		@kIOHIDElementTypeKey : [NSNumber numberWithInteger: kIOHIDElementTypeInput_Button],
+		@kIOHIDElementMinKey  : [NSNumber numberWithInteger: 0],
+		@kIOHIDElementMaxKey  : [NSNumber numberWithInteger: 1]
+	};
 
 	CFArrayRef elements = IOHIDDeviceCopyMatchingElements(m_device,
 		(CFDictionaryRef)matchingElements, kIOHIDOptionsTypeNone);
@@ -36,14 +37,14 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win
 		{
 			IOHIDElementRef e =
 			(IOHIDElementRef)CFArrayGetValueAtIndex(elements, i);
-			//DeviceElementDebugPrint(e, NULL);
+			//DeviceElementDebugPrint(e, nullptr);
 
 			AddInput(new Key(e, m_device));
 		}
 		CFRelease(elements);
 	}
 
-	m_windowid = [[(NSView *)(((wxWindow *)window)->GetHandle()) window] windowNumber];
+	m_windowid = [[reinterpret_cast<NSView*>(window) window] windowNumber];
 
 	// cursor, with a hax for-loop
 	for (unsigned int i=0; i<4; ++i)
@@ -53,11 +54,11 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win
 		AddInput(new Button(i, m_mousebuttons[i]));
 }
 
-bool Keyboard::UpdateInput()
+void Keyboard::UpdateInput()
 {
 	CGRect bounds = CGRectZero;
 	uint32_t windowid[1] = { m_windowid };
-	CFArrayRef windowArray = CFArrayCreate(NULL, (const void **) windowid, 1, NULL);
+	CFArrayRef windowArray = CFArrayCreate(nullptr, (const void **) windowid, 1, nullptr);
 	CFArrayRef windowDescriptions = CGWindowListCreateDescriptionFromArray(windowArray);
 	CFDictionaryRef windowDescription = (CFDictionaryRef) CFArrayGetValueAtIndex((CFArrayRef) windowDescriptions, 0);
 
@@ -65,7 +66,7 @@ bool Keyboard::UpdateInput()
 	{
 		CFDictionaryRef boundsDictionary = (CFDictionaryRef) CFDictionaryGetValue(windowDescription, kCGWindowBounds);
 
-		if (boundsDictionary != NULL)
+		if (boundsDictionary != nullptr)
 			CGRectMakeWithDictionaryRepresentation(boundsDictionary, &bounds);
 	}
 
@@ -84,13 +85,6 @@ bool Keyboard::UpdateInput()
 	m_mousebuttons[0] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonLeft);
 	m_mousebuttons[1] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonRight);
 	m_mousebuttons[2] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonCenter);
-
-	return true;
-}
-
-bool Keyboard::UpdateOutput()
-{
-	return true;
 }
 
 std::string Keyboard::GetName() const
@@ -112,9 +106,10 @@ Keyboard::Key::Key(IOHIDElementRef element, IOHIDDeviceRef device)
 	: m_element(element)
 	, m_device(device)
 {
-	static const struct PrettyKeys {
-		const uint32_t		code;
-		const char *const	name;
+	static const struct PrettyKeys
+	{
+		const uint32_t    code;
+		const char *const name;
 	} named_keys[] = {
 		{ kHIDUsage_KeyboardA, "A" },
 		{ kHIDUsage_KeyboardB, "B" },
@@ -220,14 +215,17 @@ Keyboard::Key::Key(IOHIDElementRef element, IOHIDDeviceRef device)
 		{ kHIDUsage_KeyboardRightGUI, "Right Command" },
 		{ 184, "Eject" },
 	};
-	
+
 	const uint32_t keycode = IOHIDElementGetUsage(m_element);
-	for (uint32_t i = 0; i < sizeof named_keys / sizeof *named_keys; i++)
-		if (named_keys[i].code == keycode) {
-			m_name = named_keys[i].name;
+	for (auto & named_key : named_keys)
+	{
+		if (named_key.code == keycode)
+		{
+			m_name = named_key.name;
 			return;
 		}
-	
+	}
+
 	std::stringstream ss;
 	ss << "Key " << keycode;
 	m_name = ss.str();
@@ -245,7 +243,7 @@ ControlState Keyboard::Key::GetState() const
 
 ControlState Keyboard::Cursor::GetState() const
 {
-	return std::max(0.0f, ControlState(m_axis) / (m_positive ? 1.0f : -1.0f));
+	return std::max(0.0, ControlState(m_axis) / (m_positive ? 1.0 : -1.0));
 }
 
 ControlState Keyboard::Button::GetState() const
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
new file mode 100644
index 0000000000..6cdfa470cd
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
@@ -0,0 +1,346 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <map>
+#include <sstream>
+
+#include "Common/StringUtil.h"
+#include "InputCommon/ControllerInterface/SDL/SDL.h"
+
+#ifdef _WIN32
+#pragma comment(lib, "SDL2.lib")
+#endif
+
+namespace ciface
+{
+namespace SDL
+{
+
+// 10ms = 100Hz which homebrew docs very roughly imply is within WiiMote normal
+// range, used for periodic haptic effects though often ignored by devices
+static const u16 RUMBLE_PERIOD = 10;
+static const u16 RUMBLE_LENGTH_MAX = 500; // ms: enough to span multiple frames at low FPS, but still finite
+
+static std::string GetJoystickName(int index)
+{
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	return SDL_JoystickNameForIndex(index);
+#else
+	return SDL_JoystickName(index);
+#endif
+}
+
+void Init( std::vector<Core::Device*>& devices )
+{
+	// this is used to number the joysticks
+	// multiple joysticks with the same name shall get unique ids starting at 0
+	std::map<std::string, int> name_counts;
+
+#ifdef USE_SDL_HAPTIC
+	if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC) >= 0)
+	{
+		// Correctly initialized
+	}
+	else
+#endif
+	if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+	{
+		// Failed to initialize
+		return;
+	}
+
+	// joysticks
+	for (int i = 0; i < SDL_NumJoysticks(); ++i)
+	{
+		SDL_Joystick* dev = SDL_JoystickOpen(i);
+		if (dev)
+		{
+			Joystick* js = new Joystick(dev, i, name_counts[GetJoystickName(i)]++);
+			// only add if it has some inputs/outputs
+			if (js->Inputs().size() || js->Outputs().size())
+				devices.push_back( js );
+			else
+				delete js;
+		}
+	}
+}
+
+Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
+	: m_joystick(joystick)
+	, m_sdl_index(sdl_index)
+	, m_index(index)
+{
+	// really bad HACKS:
+	// to not use SDL for an XInput device
+	// too many people on the forums pick the SDL device and ask:
+	// "why don't my 360 gamepad triggers/rumble work correctly"
+#ifdef _WIN32
+	// checking the name is probably good (and hacky) enough
+	// but I'll double check with the num of buttons/axes
+	std::string lcasename = GetName();
+	std::transform(lcasename.begin(), lcasename.end(), lcasename.begin(), tolower);
+
+	if ((std::string::npos != lcasename.find("xbox 360")) &&
+	    (10 == SDL_JoystickNumButtons(joystick)) &&
+	    (5 == SDL_JoystickNumAxes(joystick)) &&
+	    (1 == SDL_JoystickNumHats(joystick)) &&
+	    (0 == SDL_JoystickNumBalls(joystick)))
+	{
+		// this device won't be used
+		return;
+	}
+#endif
+
+	if (SDL_JoystickNumButtons(joystick) > 255 ||
+	    SDL_JoystickNumAxes(joystick) > 255 ||
+	    SDL_JoystickNumHats(joystick) > 255 ||
+	    SDL_JoystickNumBalls(joystick) > 255)
+	{
+		// This device is invalid, don't use it
+		// Some crazy devices(HP webcam 2100) end up as HID devices
+		// SDL tries parsing these as joysticks
+		return;
+	}
+
+	// get buttons
+	for (u8 i = 0; i != SDL_JoystickNumButtons(m_joystick); ++i)
+		AddInput(new Button(i, m_joystick));
+
+	// get hats
+	for (u8 i = 0; i != SDL_JoystickNumHats(m_joystick); ++i)
+	{
+		// each hat gets 4 input instances associated with it, (up down left right)
+		for (u8 d = 0; d != 4; ++d)
+			AddInput(new Hat(i, m_joystick, d));
+	}
+
+	// get axes
+	for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i)
+	{
+		// each axis gets a negative and a positive input instance associated with it
+		AddAnalogInputs(new Axis(i, m_joystick, -32768),
+			new Axis(i, m_joystick, 32767));
+	}
+
+#ifdef USE_SDL_HAPTIC
+	// try to get supported ff effects
+	m_haptic = SDL_HapticOpenFromJoystick( m_joystick );
+	if (m_haptic)
+	{
+		//SDL_HapticSetGain( m_haptic, 1000 );
+		//SDL_HapticSetAutocenter( m_haptic, 0 );
+
+		const unsigned int supported_effects = SDL_HapticQuery( m_haptic );
+
+		// constant effect
+		if (supported_effects & SDL_HAPTIC_CONSTANT)
+			AddOutput(new ConstantEffect(m_haptic));
+
+		// ramp effect
+		if (supported_effects & SDL_HAPTIC_RAMP)
+			AddOutput(new RampEffect(m_haptic));
+
+		// sine effect
+		if (supported_effects & SDL_HAPTIC_SINE)
+			AddOutput(new SineEffect(m_haptic));
+
+		// triangle effect
+		if (supported_effects & SDL_HAPTIC_TRIANGLE)
+			AddOutput(new TriangleEffect(m_haptic));
+
+		// left-right effect
+		if (supported_effects & SDL_HAPTIC_LEFTRIGHT)
+			AddOutput(new LeftRightEffect(m_haptic));
+	}
+#endif
+
+}
+
+Joystick::~Joystick()
+{
+#ifdef USE_SDL_HAPTIC
+	if (m_haptic)
+	{
+		// stop/destroy all effects
+		SDL_HapticStopAll(m_haptic);
+		// close haptic first
+		SDL_HapticClose(m_haptic);
+	}
+#endif
+
+	// close joystick
+	SDL_JoystickClose(m_joystick);
+}
+
+#ifdef USE_SDL_HAPTIC
+void Joystick::HapticEffect::Update()
+{
+	if (m_id == -1 && m_effect.type > 0)
+	{
+		m_id = SDL_HapticNewEffect(m_haptic, &m_effect);
+		if (m_id > -1)
+			SDL_HapticRunEffect(m_haptic, m_id, 1);
+	}
+	else if (m_id > -1 && m_effect.type == 0)
+	{
+		SDL_HapticStopEffect(m_haptic, m_id);
+		SDL_HapticDestroyEffect(m_haptic, m_id);
+		m_id = -1;
+	}
+	else if (m_id > -1)
+	{
+		SDL_HapticUpdateEffect(m_haptic, m_id, &m_effect);
+	}
+}
+
+std::string Joystick::ConstantEffect::GetName() const
+{
+	return "Constant";
+}
+
+std::string Joystick::RampEffect::GetName() const
+{
+	return "Ramp";
+}
+
+std::string Joystick::SineEffect::GetName() const
+{
+	return "Sine";
+}
+
+std::string Joystick::TriangleEffect::GetName() const
+{
+	return "Triangle";
+}
+
+std::string Joystick::LeftRightEffect::GetName() const
+{
+	return "LeftRight";
+}
+
+void Joystick::HapticEffect::SetState(ControlState state)
+{
+	memset(&m_effect, 0, sizeof(m_effect));
+	if (state)
+	{
+		SetSDLHapticEffect(state);
+	}
+	else
+	{
+		// this module uses type==0 to indicate 'off'
+		m_effect.type = 0;
+	}
+	Update();
+}
+
+void Joystick::ConstantEffect::SetSDLHapticEffect(ControlState state)
+{
+	m_effect.type = SDL_HAPTIC_CONSTANT;
+	m_effect.constant.length = RUMBLE_LENGTH_MAX;
+	m_effect.constant.level = (Sint16)(state * 0x7FFF);
+}
+
+void Joystick::RampEffect::SetSDLHapticEffect(ControlState state)
+{
+	m_effect.type = SDL_HAPTIC_RAMP;
+	m_effect.ramp.length = RUMBLE_LENGTH_MAX;
+	m_effect.ramp.start = (Sint16)(state * 0x7FFF);
+}
+
+void Joystick::SineEffect::SetSDLHapticEffect(ControlState state)
+{
+	m_effect.type = SDL_HAPTIC_SINE;
+	m_effect.periodic.period = RUMBLE_PERIOD;
+	m_effect.periodic.magnitude = (Sint16)(state * 0x7FFF);
+	m_effect.periodic.offset = 0;
+	m_effect.periodic.phase = 18000;
+	m_effect.periodic.length = RUMBLE_LENGTH_MAX;
+	m_effect.periodic.delay = 0;
+	m_effect.periodic.attack_length = 0;
+}
+
+void Joystick::TriangleEffect::SetSDLHapticEffect(ControlState state)
+{
+	m_effect.type = SDL_HAPTIC_TRIANGLE;
+	m_effect.periodic.period = RUMBLE_PERIOD;
+	m_effect.periodic.magnitude = (Sint16)(state * 0x7FFF);
+	m_effect.periodic.offset = 0;
+	m_effect.periodic.phase = 18000;
+	m_effect.periodic.length = RUMBLE_LENGTH_MAX;
+	m_effect.periodic.delay = 0;
+	m_effect.periodic.attack_length = 0;
+}
+
+void Joystick::LeftRightEffect::SetSDLHapticEffect(ControlState state)
+{
+	m_effect.type = SDL_HAPTIC_LEFTRIGHT;
+	m_effect.leftright.length = RUMBLE_LENGTH_MAX;
+	// max ranges tuned to 'feel' similar in magnitude to triangle/sine on xbox360 controller
+	m_effect.leftright.large_magnitude = (Uint16)(state * 0x4000);
+	m_effect.leftright.small_magnitude = (Uint16)(state * 0xFFFF);
+}
+#endif
+
+void Joystick::UpdateInput()
+{
+	// each joystick is doin this, o well
+	SDL_JoystickUpdate();
+}
+
+std::string Joystick::GetName() const
+{
+	return StripSpaces(GetJoystickName(m_sdl_index));
+}
+
+std::string Joystick::GetSource() const
+{
+	return "SDL";
+}
+
+int Joystick::GetId() const
+{
+	return m_index;
+}
+
+std::string Joystick::Button::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Button " << (int)m_index;
+	return ss.str();
+}
+
+std::string Joystick::Axis::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Axis " << (int)m_index << (m_range<0 ? '-' : '+');
+	return ss.str();
+}
+
+std::string Joystick::Hat::GetName() const
+{
+	static char tmpstr[] = "Hat . .";
+	// I don't think more than 10 hats are supported
+	tmpstr[4] = (char)('0' + m_index);
+	tmpstr[6] = "NESW"[m_direction];
+	return tmpstr;
+}
+
+ControlState Joystick::Button::GetState() const
+{
+	return SDL_JoystickGetButton(m_js, m_index);
+}
+
+ControlState Joystick::Axis::GetState() const
+{
+	return std::max(0.0, ControlState(SDL_JoystickGetAxis(m_js, m_index)) / m_range);
+}
+
+ControlState Joystick::Hat::GetState() const
+{
+	return (SDL_JoystickGetHat(m_js, m_index) & (1 << m_direction)) > 0;
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
new file mode 100644
index 0000000000..751f40e9f4
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
@@ -0,0 +1,153 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <list>
+
+#include <SDL.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+
+#if SDL_VERSION_ATLEAST(1, 3, 0)
+	#define USE_SDL_HAPTIC
+#endif
+
+#ifdef USE_SDL_HAPTIC
+	#include <SDL_haptic.h>
+#endif
+
+namespace ciface
+{
+namespace SDL
+{
+
+void Init( std::vector<Core::Device*>& devices );
+
+class Joystick : public Core::Device
+{
+private:
+
+	class Button : public Core::Device::Input
+	{
+	public:
+		std::string GetName() const override;
+		Button(u8 index, SDL_Joystick* js) : m_js(js), m_index(index) {}
+		ControlState GetState() const override;
+	private:
+		 SDL_Joystick* const m_js;
+		 const u8 m_index;
+	};
+
+	class Axis : public Core::Device::Input
+	{
+	public:
+		std::string GetName() const override;
+		Axis(u8 index, SDL_Joystick* js, Sint16 range) : m_js(js), m_range(range), m_index(index) {}
+		ControlState GetState() const override;
+	private:
+		SDL_Joystick* const m_js;
+		const Sint16 m_range;
+		const u8 m_index;
+	};
+
+	class Hat : public Input
+	{
+	public:
+		std::string GetName() const override;
+		Hat(u8 index, SDL_Joystick* js, u8 direction) : m_js(js), m_direction(direction), m_index(index) {}
+		ControlState GetState() const override;
+	private:
+		SDL_Joystick* const m_js;
+		const u8 m_direction;
+		const u8 m_index;
+	};
+
+#ifdef USE_SDL_HAPTIC
+	class HapticEffect : public Output
+	{
+	public:
+		HapticEffect(SDL_Haptic* haptic) : m_haptic(haptic), m_id(-1) {}
+		~HapticEffect() { m_effect.type = 0; Update(); }
+
+	protected:
+		void Update();
+		virtual void SetSDLHapticEffect(ControlState state) = 0;
+
+		SDL_HapticEffect m_effect;
+		SDL_Haptic* m_haptic;
+		int m_id;
+	private:
+		virtual void SetState(ControlState state) override final;
+	};
+
+	class ConstantEffect : public HapticEffect
+	{
+	public:
+		ConstantEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
+		std::string GetName() const override;
+	private:
+		void SetSDLHapticEffect(ControlState state) override;
+	};
+
+	class RampEffect : public HapticEffect
+	{
+	public:
+		RampEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
+		std::string GetName() const override;
+	private:
+		void SetSDLHapticEffect(ControlState state) override;
+	};
+
+	class SineEffect : public HapticEffect
+	{
+	public:
+		SineEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
+		std::string GetName() const override;
+	private:
+		void SetSDLHapticEffect(ControlState state) override;
+	};
+
+	class TriangleEffect : public HapticEffect
+	{
+	public:
+		TriangleEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
+		std::string GetName() const override;
+	private:
+		void SetSDLHapticEffect(ControlState state) override;
+	};
+
+	class LeftRightEffect : public HapticEffect
+	{
+	public:
+		LeftRightEffect(SDL_Haptic* haptic) : HapticEffect(haptic) {}
+		std::string GetName() const override;
+	private:
+		void SetSDLHapticEffect(ControlState state) override;
+	};
+#endif
+
+public:
+	void UpdateInput() override;
+
+	Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
+	~Joystick();
+
+	std::string GetName() const override;
+	int GetId() const override;
+	std::string GetSource() const override;
+
+private:
+	SDL_Joystick* const      m_joystick;
+	const int                m_sdl_index;
+	const unsigned int       m_index;
+
+#ifdef USE_SDL_HAPTIC
+	SDL_Haptic*              m_haptic;
+#endif
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
new file mode 100644
index 0000000000..0e2c0bcad3
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
@@ -0,0 +1,265 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#include "InputCommon/ControllerInterface/XInput/XInput.h"
+
+#ifndef XINPUT_GAMEPAD_GUIDE
+#define XINPUT_GAMEPAD_GUIDE 0x0400
+#endif
+
+namespace ciface
+{
+namespace XInput
+{
+
+static const struct
+{
+	const char* const name;
+	const WORD bitmask;
+} named_buttons[] =
+{
+	{ "Button A", XINPUT_GAMEPAD_A },
+	{ "Button B", XINPUT_GAMEPAD_B },
+	{ "Button X", XINPUT_GAMEPAD_X },
+	{ "Button Y", XINPUT_GAMEPAD_Y },
+	{ "Pad N", XINPUT_GAMEPAD_DPAD_UP },
+	{ "Pad S", XINPUT_GAMEPAD_DPAD_DOWN },
+	{ "Pad W", XINPUT_GAMEPAD_DPAD_LEFT },
+	{ "Pad E", XINPUT_GAMEPAD_DPAD_RIGHT },
+	{ "Start", XINPUT_GAMEPAD_START },
+	{ "Back", XINPUT_GAMEPAD_BACK },
+	{ "Shoulder L", XINPUT_GAMEPAD_LEFT_SHOULDER },
+	{ "Shoulder R", XINPUT_GAMEPAD_RIGHT_SHOULDER },
+	{ "Guide", XINPUT_GAMEPAD_GUIDE },
+	{ "Thumb L", XINPUT_GAMEPAD_LEFT_THUMB },
+	{ "Thumb R", XINPUT_GAMEPAD_RIGHT_THUMB }
+};
+
+static const char* const named_triggers[] =
+{
+	"Trigger L",
+	"Trigger R"
+};
+
+static const char* const named_axes[] =
+{
+	"Left X",
+	"Left Y",
+	"Right X",
+	"Right Y"
+};
+
+static const char* const named_motors[] =
+{
+	"Motor L",
+	"Motor R"
+};
+
+static HMODULE hXInput = nullptr;
+
+typedef decltype(&XInputGetCapabilities) XInputGetCapabilities_t;
+typedef decltype(&XInputSetState) XInputSetState_t;
+typedef decltype(&XInputGetState) XInputGetState_t;
+
+static XInputGetCapabilities_t PXInputGetCapabilities = nullptr;
+static XInputSetState_t PXInputSetState = nullptr;
+static XInputGetState_t PXInputGetState = nullptr;
+
+static bool haveGuideButton = false;
+
+void Init(std::vector<Core::Device*>& devices)
+{
+	if (!hXInput)
+	{
+		// Try for the most recent version we were compiled against (will only work if running on Win8+)
+		hXInput = ::LoadLibrary(XINPUT_DLL);
+		if (!hXInput)
+		{
+			// Drop back to DXSDK June 2010 version. Requires DX June 2010 redist.
+			hXInput = ::LoadLibrary(TEXT("xinput1_3.dll"));
+			if (!hXInput)
+			{
+				return;
+			}
+		}
+
+		PXInputGetCapabilities = (XInputGetCapabilities_t)::GetProcAddress(hXInput, "XInputGetCapabilities");
+		PXInputSetState = (XInputSetState_t)::GetProcAddress(hXInput, "XInputSetState");
+
+		// Ordinal 100 is the same as XInputGetState, except it doesn't dummy out the guide
+		// button info. Try loading it and fall back if needed.
+		PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, (LPCSTR)100);
+		if (PXInputGetState)
+			haveGuideButton = true;
+		else
+			PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, "XInputGetState");
+
+		if (!PXInputGetCapabilities ||
+			!PXInputSetState ||
+			!PXInputGetState)
+		{
+			::FreeLibrary(hXInput);
+			hXInput = nullptr;
+			return;
+		}
+	}
+
+	XINPUT_CAPABILITIES caps;
+	for (int i = 0; i != 4; ++i)
+		if (ERROR_SUCCESS == PXInputGetCapabilities(i, 0, &caps))
+			devices.push_back(new Device(caps, i));
+}
+
+void DeInit()
+{
+	if (hXInput)
+	{
+		::FreeLibrary(hXInput);
+		hXInput = nullptr;
+	}
+}
+
+Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
+	: m_index(index), m_subtype(caps.SubType)
+{
+	ZeroMemory(&m_state_out, sizeof(m_state_out));
+
+	// XInputGetCaps seems to always claim all capabilities are supported
+	// but I will leave all this stuff in, incase m$ fixes xinput up a bit
+
+	// get supported buttons
+	for (int i = 0; i != sizeof(named_buttons)/sizeof(*named_buttons); ++i)
+	{
+		// Guide button is never reported in caps
+		if ((named_buttons[i].bitmask & caps.Gamepad.wButtons) ||
+			((named_buttons[i].bitmask & XINPUT_GAMEPAD_GUIDE) && haveGuideButton))
+			AddInput(new Button(i, m_state_in.Gamepad.wButtons));
+	}
+
+	// get supported triggers
+	for (int i = 0; i != sizeof(named_triggers)/sizeof(*named_triggers); ++i)
+	{
+		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];  // should be max value / MSDN lies
+		if ((&caps.Gamepad.bLeftTrigger)[i])
+			AddInput(new Trigger(i, (&m_state_in.Gamepad.bLeftTrigger)[i], 255 ));
+	}
+
+	// get supported axes
+	for (int i = 0; i != sizeof(named_axes)/sizeof(*named_axes); ++i)
+	{
+		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesn't give the range / MSDN is a liar
+		if ((&caps.Gamepad.sThumbLX)[i])
+		{
+			const SHORT& ax = (&m_state_in.Gamepad.sThumbLX)[i];
+
+			// each axis gets a negative and a positive input instance associated with it
+			AddInput(new Axis(i, ax, -32768));
+			AddInput(new Axis(i, ax, 32767));
+		}
+	}
+
+	// get supported motors
+	for (int i = 0; i != sizeof(named_motors)/sizeof(*named_motors); ++i)
+	{
+		//WORD val = (&caps.Vibration.wLeftMotorSpeed)[i]; // should be max value / nope, more lies
+		if ((&caps.Vibration.wLeftMotorSpeed)[i])
+			AddOutput(new Motor(i, this, (&m_state_out.wLeftMotorSpeed)[i], 65535));
+	}
+
+	ZeroMemory(&m_state_in, sizeof(m_state_in));
+}
+
+std::string Device::GetName() const
+{
+	switch (m_subtype)
+	{
+	case XINPUT_DEVSUBTYPE_GAMEPAD:
+		return "Gamepad";
+	case XINPUT_DEVSUBTYPE_WHEEL:
+		return "Wheel";
+	case XINPUT_DEVSUBTYPE_ARCADE_STICK:
+		return "Arcade Stick";
+	case XINPUT_DEVSUBTYPE_FLIGHT_STICK:
+		return "Flight Stick";
+	case XINPUT_DEVSUBTYPE_DANCE_PAD:
+		return "Dance Pad";
+	case XINPUT_DEVSUBTYPE_GUITAR:
+		return "Guitar";
+	case XINPUT_DEVSUBTYPE_DRUM_KIT:
+		return "Drum Kit";
+	default:
+		return "Device";
+	}
+}
+
+int Device::GetId() const
+{
+	return m_index;
+}
+
+std::string Device::GetSource() const
+{
+	return "XInput";
+}
+
+// Update I/O
+
+void Device::UpdateInput()
+{
+	PXInputGetState(m_index, &m_state_in);
+}
+
+void Device::UpdateMotors()
+{
+	PXInputSetState(m_index, &m_state_out);
+}
+
+// GET name/source/id
+
+std::string Device::Button::GetName() const
+{
+	return named_buttons[m_index].name;
+}
+
+std::string Device::Axis::GetName() const
+{
+	return std::string(named_axes[m_index]) + (m_range<0 ? '-' : '+');
+}
+
+std::string Device::Trigger::GetName() const
+{
+	return named_triggers[m_index];
+}
+
+std::string Device::Motor::GetName() const
+{
+	return named_motors[m_index];
+}
+
+// GET / SET STATES
+
+ControlState Device::Button::GetState() const
+{
+	return (m_buttons & named_buttons[m_index].bitmask) > 0;
+}
+
+ControlState Device::Trigger::GetState() const
+{
+	return ControlState(m_trigger) / m_range;
+}
+
+ControlState Device::Axis::GetState() const
+{
+	return std::max( 0.0, ControlState(m_axis) / m_range );
+}
+
+void Device::Motor::SetState(ControlState state)
+{
+	m_motor = (WORD)(state * m_range);
+	m_parent->UpdateMotors();
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
new file mode 100644
index 0000000000..5dcfb0cee5
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@@ -0,0 +1,100 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// XInput suffers a similar issue as XAudio2. Since Win8, it is part of the OS.
+// However, unlike XAudio2 they have not made the API incompatible - so we just
+// compile against the latest version and fall back to dynamically loading the
+// old DLL.
+
+#pragma once
+
+#include <windows.h>
+#include <XInput.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+#ifndef XINPUT_DEVSUBTYPE_FLIGHT_STICK
+#error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong.
+#endif
+
+namespace ciface
+{
+namespace XInput
+{
+
+void Init(std::vector<Core::Device*>& devices);
+void DeInit();
+
+class Device : public Core::Device
+{
+private:
+	class Button : public Core::Device::Input
+	{
+	public:
+		std::string GetName() const;
+		Button(u8 index, const WORD& buttons) : m_index(index), m_buttons(buttons) {}
+		ControlState GetState() const;
+	private:
+		const WORD& m_buttons;
+		u8 m_index;
+	};
+
+	class Axis : public Core::Device::Input
+	{
+	public:
+		std::string GetName() const;
+		Axis(u8 index, const SHORT& axis, SHORT range) : m_index(index), m_axis(axis), m_range(range) {}
+		ControlState GetState() const;
+	private:
+		const SHORT& m_axis;
+		const SHORT m_range;
+		const u8 m_index;
+	};
+
+	class Trigger : public Core::Device::Input
+	{
+	public:
+		std::string GetName() const;
+		Trigger(u8 index, const BYTE& trigger, BYTE range) : m_index(index), m_trigger(trigger), m_range(range) {}
+		ControlState GetState() const;
+	private:
+		const BYTE& m_trigger;
+		const BYTE m_range;
+		const u8 m_index;
+	};
+
+	class Motor : public Core::Device::Output
+	{
+	public:
+		std::string GetName() const;
+		Motor(u8 index, Device* parent, WORD &motor, WORD range) : m_index(index), m_parent(parent), m_motor(motor), m_range(range) {}
+		void SetState(ControlState state);
+	private:
+		WORD& m_motor;
+		const WORD m_range;
+		const u8 m_index;
+		Device* m_parent;
+	};
+
+public:
+	void UpdateInput() override;
+
+	Device(const XINPUT_CAPABILITIES& capabilities, u8 index);
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+
+	void UpdateMotors();
+
+private:
+	XINPUT_STATE m_state_in;
+	XINPUT_VIBRATION m_state_out;
+	const BYTE m_subtype;
+	const u8 m_index;
+};
+
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
similarity index 87%
rename from Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
rename to Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index b42eda1f21..e4983e80bb 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -1,15 +1,16 @@
 // Copyright 2013 Max Eliaser
-// Licensed under the GNU General Public License, version 2 or higher.
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-
-#include "XInput2.h"
-#include <X11/XKBlib.h>
 #include <cmath>
+#include <cstring>
+#include <X11/XKBlib.h>
+
+#include "InputCommon/ControllerInterface/Xlib/XInput2.h"
 
 // This is an input plugin using the XInput 2.0 extension to the X11 protocol,
-// loosely based on the old XLib plugin. (Has nothing to do with the XInput 
-// API on Windows.) 
+// loosely based on the old XLib plugin. (Has nothing to do with the XInput
+// API on Windows.)
 
 // This plugin creates one KeyboardMouse object for each master pointer/
 // keyboard pair. Each KeyboardMouse object exports four types of controls:
@@ -20,25 +21,25 @@
 //      center of the emulator window.
 // *    Mouse axis controls: one for each cardinal direction. Calculated using
 //      a running average of relative mouse motion on each axis.
-// *    Key controls: these correspond to a limited subset of the keyboard 
+// *    Key controls: these correspond to a limited subset of the keyboard
 //      keys.
 
 
 // Mouse axis control tuning. Unlike absolute mouse position, relative mouse
 // motion data needs to be tweaked and smoothed out a bit to be usable.
 
-// Mouse axis control output is simply divided by this number. In practice, 
+// Mouse axis control output is simply divided by this number. In practice,
 // that just means you can use a smaller "dead zone" if you bind axis controls
 // to a joystick. No real need to make this customizable.
-#define MOUSE_AXIS_SENSITIVITY		8.0f
+#define MOUSE_AXIS_SENSITIVITY 8.0f
 
 // The mouse axis controls use a weighted running average. Each frame, the new
-// value is the average of the old value and the amount of relative mouse 
+// value is the average of the old value and the amount of relative mouse
 // motion during that frame. The old value is weighted by a ratio of
 // MOUSE_AXIS_SMOOTHING:1 compared to the new value. Increasing
 // MOUSE_AXIS_SMOOTHING makes the controls smoother, decreasing it makes them
 // more responsive. This might be useful as a user-customizable option.
-#define MOUSE_AXIS_SMOOTHING		1.5f
+#define MOUSE_AXIS_SMOOTHING 1.5f
 
 namespace ciface
 {
@@ -48,32 +49,30 @@ namespace XInput2
 // This function will add zero or more KeyboardMouse objects to devices.
 void Init(std::vector<Core::Device*>& devices, void* const hwnd)
 {
-	Display* dpy;
-	
-	dpy = XOpenDisplay(NULL);
-	
-	// xi_opcode is important; it will be used to identify XInput events by 
+	Display* dpy = XOpenDisplay(nullptr);
+
+	// xi_opcode is important; it will be used to identify XInput events by
 	// the polling loop in UpdateInput.
 	int xi_opcode, event, error;
-	
+
 	// verify that the XInput extension is available
 	if (!XQueryExtension(dpy, "XInputExtension", &xi_opcode, &event, &error))
 		return;
-	
+
 	// verify that the XInput extension is at at least version 2.0
 	int major = 2, minor = 0;
-	
+
 	if (XIQueryVersion(dpy, &major, &minor) != Success)
 		return;
-	
+
 	// register all master devices with Dolphin
-	
-	XIDeviceInfo*	all_masters;
-	XIDeviceInfo*	current_master;
-	int				num_masters;
-	
+
+	XIDeviceInfo* all_masters;
+	XIDeviceInfo* current_master;
+	int           num_masters;
+
 	all_masters = XIQueryDevice(dpy, XIAllMasterDevices, &num_masters);
-	
+
 	for (int i = 0; i < num_masters; i++)
 	{
 		current_master = &all_masters[i];
@@ -82,34 +81,33 @@ void Init(std::vector<Core::Device*>& devices, void* const hwnd)
 			// be a master keyboard.
 			devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment));
 	}
-	
+
 	XCloseDisplay(dpy);
-	
+
 	XIFreeDeviceInfo(all_masters);
 }
 
-// Apply the event mask to the device and all its slaves. Only used in the 
+// Apply the event mask to the device and all its slaves. Only used in the
 // constructor. Remember, each KeyboardMouse has its own copy of the event
 // stream, which is how multiple event masks can "coexist."
 void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid)
 {
 	// Set the event mask for the master device.
-	
 	mask->deviceid = deviceid;
 	XISelectEvents(m_display, window, mask, 1);
-	
+
 	// Query all the master device's slaves and set the same event mask for
 	// those too. There are two reasons we want to do this. For mouse devices,
 	// we want the raw motion events, and only slaves (i.e. physical hardware
 	// devices) emit those. For keyboard devices, selecting slaves avoids
 	// dealing with key focus.
-	
-	XIDeviceInfo*	all_slaves;
-	XIDeviceInfo*	current_slave;
-	int				num_slaves;
-	
+
+	XIDeviceInfo* all_slaves;
+	XIDeviceInfo* current_slave;
+	int           num_slaves;
+
 	all_slaves = XIQueryDevice(m_display, XIAllDevices, &num_slaves);
-	
+
 	for (int i = 0; i < num_slaves; i++)
 	{
 		current_slave = &all_slaves[i];
@@ -118,33 +116,33 @@ void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int
 		mask->deviceid = current_slave->deviceid;
 		XISelectEvents(m_display, window, mask, 1);
 	}
-	
+
 	XIFreeDeviceInfo(all_slaves);
 }
 
-KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard) 
+KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard)
 	: m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(keyboard)
 {
 	memset(&m_state, 0, sizeof(m_state));
-	
+
 	// The cool thing about each KeyboardMouse object having its own Display
 	// is that each one gets its own separate copy of the X11 event stream,
 	// which it can individually filter to get just the events it's interested
 	// in. So be aware that each KeyboardMouse object actually has its own X11
 	// "context."
-	m_display = XOpenDisplay(NULL);
-	
+	m_display = XOpenDisplay(nullptr);
+
 	int min_keycode, max_keycode;
 	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
-	
+
 	int unused; // should always be 1
 	XIDeviceInfo* pointer_device = XIQueryDevice(m_display, pointer_deviceid, &unused);
 	name = std::string(pointer_device->name);
 	XIFreeDeviceInfo(pointer_device);
-	
-	XIEventMask		mask;
-	unsigned char	mask_buf[(XI_LASTEVENT + 7)/8];
-	
+
+	XIEventMask   mask;
+	unsigned char mask_buf[(XI_LASTEVENT + 7)/8];
+
 	mask.mask_len = sizeof(mask_buf);
 	mask.mask = mask_buf;
 	memset(mask_buf, 0, sizeof(mask_buf));
@@ -155,9 +153,9 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
 	XISetMask(mask_buf, XI_KeyPress);
 	XISetMask(mask_buf, XI_KeyRelease);
 
-	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, pointer_deviceid);	
+	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, pointer_deviceid);
 	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, keyboard_deviceid);
-	
+
 	// Keyboard Keys
 	for (int i = min_keycode; i <= max_keycode; ++i)
 	{
@@ -170,15 +168,15 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
 
 	// Mouse Buttons
 	for (int i = 0; i < 5; i++)
-		AddInput(new Button(i, m_state.buttons));
+		AddInput(new Button(i, &m_state.buttons));
 
 	// Mouse Cursor, X-/+ and Y-/+
 	for (int i = 0; i != 4; ++i)
-		AddInput(new Cursor(!!(i & 2), !!(i & 1), (&m_state.cursor.x)[!!(i & 2)]));
-	
+		AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x));
+
 	// Mouse Axis, X-/+ and Y-/+
 	for (int i = 0; i != 4; ++i)
-		AddInput(new Axis(!!(i & 2), !!(i & 1), (&m_state.axis.x)[!!(i & 2)]));
+		AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x));
 }
 
 KeyboardMouse::~KeyboardMouse()
@@ -191,15 +189,15 @@ void KeyboardMouse::UpdateCursor()
 {
 	double root_x, root_y, win_x, win_y;
 	Window root, child;
-	
-	// unused-- we're not interested in button presses here, as those are 
+
+	// unused-- we're not interested in button presses here, as those are
 	// updated using events
 	XIButtonState button_state;
 	XIModifierState mods;
 	XIGroupState group;
-	
+
 	XIQueryPointer(m_display, pointer_deviceid, m_window, &root, &child, &root_x, &root_y, &win_x, &win_y, &button_state, &mods, &group);
-	
+
 	free (button_state.mask);
 
 	XWindowAttributes win_attribs;
@@ -210,35 +208,35 @@ void KeyboardMouse::UpdateCursor()
 	m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1;
 }
 
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
 {
 	XFlush(m_display);
-	
+
 	// Get the absolute position of the mouse pointer
 	UpdateCursor();
-	
+
 	// for the axis controls
 	float delta_x = 0.0f, delta_y = 0.0f;
 	double delta_delta;
-	
+
 	// Iterate through the event queue - update the axis controls, mouse
 	// button controls, and keyboard controls.
 	XEvent event;
-	while (XPending(m_display)) 
+	while (XPending(m_display))
 	{
 		XNextEvent(m_display, &event);
-		
+
 		if (event.xcookie.type != GenericEvent)
 			continue;
 		if (event.xcookie.extension != xi_opcode)
 			continue;
 		if (!XGetEventData(m_display, &event.xcookie))
 			continue;
-		
+
 		// only one of these will get used
 		XIDeviceEvent* dev_event = (XIDeviceEvent*)event.xcookie.data;
 		XIRawEvent* raw_event = (XIRawEvent*)event.xcookie.data;
-		
+
 		switch (event.xcookie.evtype)
 		{
 		case XI_ButtonPress:
@@ -254,7 +252,7 @@ bool KeyboardMouse::UpdateInput()
 			m_state.keyboard[dev_event->detail / 8] &= ~(1<<(dev_event->detail % 8));
 			break;
 		case XI_RawMotion:
-			// always safe because there is always at least one byte in 
+			// always safe because there is always at least one byte in
 			// raw_event->valuators.mask, and if a bit is set in the mask,
 			// then the value in raw_values is also available.
 			if (XIMaskIsSet(raw_event->valuators.mask, 0))
@@ -273,10 +271,10 @@ bool KeyboardMouse::UpdateInput()
 			}
 			break;
 		}
-		
+
 		XFreeEventData(m_display, &event.xcookie);
 	}
-	
+
 	// apply axis smoothing
 	m_state.axis.x *= MOUSE_AXIS_SMOOTHING;
 	m_state.axis.x += delta_x;
@@ -284,13 +282,6 @@ bool KeyboardMouse::UpdateInput()
 	m_state.axis.y *= MOUSE_AXIS_SMOOTHING;
 	m_state.axis.y += delta_y;
 	m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f;
-	
-	return true;
-}
-
-bool KeyboardMouse::UpdateOutput()
-{
-	return true;
 }
 
 std::string KeyboardMouse::GetName() const
@@ -322,14 +313,14 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key
 	}
 	while (keysym == NoSymbol && i < 8);
 
-	// Convert to upper case for the keyname	
+	// Convert to upper case for the keyname
 	if (keysym >= 97 && keysym <= 122)
 		keysym -= 32;
-	
+
 	// 0x0110ffff is the top of the unicode character range according
 	// to keysymdef.h although it is probably more than we need.
 	if (keysym == NoSymbol || keysym > 0x0110ffff ||
-		XKeysymToString(keysym) == NULL)
+		XKeysymToString(keysym) == nullptr)
 		m_keyname = std::string();
 	else
 		m_keyname = std::string(XKeysymToString(keysym));
@@ -340,7 +331,7 @@ ControlState KeyboardMouse::Key::GetState() const
 	return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0;
 }
 
-KeyboardMouse::Button::Button(unsigned int index, unsigned int& buttons)
+KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons)
 	: m_buttons(buttons), m_index(index)
 {
 	// this will be a problem if we remove the hardcoded five-button limit
@@ -349,10 +340,10 @@ KeyboardMouse::Button::Button(unsigned int index, unsigned int& buttons)
 
 ControlState KeyboardMouse::Button::GetState() const
 {
-	return ((m_buttons & (1 << m_index)) != 0);
+	return ((*m_buttons & (1 << m_index)) != 0);
 }
 
-KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float& cursor)
+KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float* cursor)
 	: m_cursor(cursor), m_index(index), m_positive(positive)
 {
 	name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
@@ -360,10 +351,10 @@ KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float& cursor)
 
 ControlState KeyboardMouse::Cursor::GetState() const
 {
-	return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f));
+	return std::max(0.0f, *m_cursor / (m_positive ? 1.0f : -1.0f));
 }
 
-KeyboardMouse::Axis::Axis(u8 index, bool positive, const float& axis)
+KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis)
 	: m_axis(axis), m_index(index), m_positive(positive)
 {
 	name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
@@ -371,7 +362,7 @@ KeyboardMouse::Axis::Axis(u8 index, bool positive, const float& axis)
 
 ControlState KeyboardMouse::Axis::GetState() const
 {
-	return std::max(0.0f, m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
+	return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
 }
 
 }
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
new file mode 100644
index 0000000000..09a59706e3
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -0,0 +1,120 @@
+// Copyright 2013 Max Eliaser
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// See XInput2.cpp for extensive documentation.
+
+#pragma once
+
+extern "C" {
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
+}
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace XInput2
+{
+
+void Init(std::vector<Core::Device*>& devices, void* const hwnd);
+
+class KeyboardMouse : public Core::Device
+{
+
+private:
+	struct State
+	{
+		char keyboard[32];
+		unsigned int buttons;
+		struct
+		{
+			float x, y;
+		} cursor, axis;
+	};
+
+	class Key : public Input
+	{
+		friend class KeyboardMouse;
+	public:
+		std::string GetName() const override { return m_keyname; }
+		Key(Display* display, KeyCode keycode, const char* keyboard);
+		ControlState GetState() const override;
+
+	private:
+		std::string       m_keyname;
+		Display* const    m_display;
+		const char* const m_keyboard;
+		const KeyCode     m_keycode;
+	};
+
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const override { return name; }
+		Button(unsigned int index, unsigned int* buttons);
+		ControlState GetState() const override;
+
+	private:
+		const unsigned int* m_buttons;
+		const unsigned int m_index;
+		std::string name;
+	};
+
+	class Cursor : public Input
+	{
+	public:
+		std::string GetName() const override { return name; }
+		bool IsDetectable() override { return false; }
+		Cursor(u8 index, bool positive, const float* cursor);
+		ControlState GetState() const override;
+
+	private:
+		const float* m_cursor;
+		const u8     m_index;
+		const bool   m_positive;
+		std::string  name;
+	};
+
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const override { return name; }
+		bool IsDetectable() override { return false; }
+		Axis(u8 index, bool positive, const float* axis);
+		ControlState GetState() const override;
+
+	private:
+		const float* m_axis;
+		const u8     m_index;
+		const bool   m_positive;
+		std::string  name;
+	};
+
+private:
+	void SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid);
+	void UpdateCursor();
+
+public:
+	void UpdateInput() override;
+
+	KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
+	~KeyboardMouse();
+
+	std::string GetName() const override;
+	std::string GetSource() const override;
+	int GetId() const override;
+
+private:
+	Window      m_window;
+	Display*    m_display;
+	State       m_state;
+	int         xi_opcode;
+	const int   pointer_deviceid, keyboard_deviceid;
+	std::string name;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
similarity index 92%
rename from Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
rename to Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
index 7016c4908b..e198f1112d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -1,7 +1,12 @@
-#include "Xlib.h"
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
+#include <cstring>
 #include <X11/XKBlib.h>
 
+#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
+
 namespace ciface
 {
 namespace Xlib
@@ -16,11 +21,11 @@ KeyboardMouse::KeyboardMouse(Window window) : m_window(window)
 {
 	memset(&m_state, 0, sizeof(m_state));
 
-	m_display = XOpenDisplay(NULL);
+	m_display = XOpenDisplay(nullptr);
 
 	int min_keycode, max_keycode;
 	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
-	
+
 	// Keyboard Keys
 	for (int i = min_keycode; i <= max_keycode; ++i)
 	{
@@ -48,7 +53,7 @@ KeyboardMouse::~KeyboardMouse()
 	XCloseDisplay(m_display);
 }
 
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
 {
 	XQueryKeymap(m_display, m_state.keyboard);
 
@@ -63,16 +68,8 @@ bool KeyboardMouse::UpdateInput()
 	// the mouse position as a range from -1 to 1
 	m_state.cursor.x = (float)win_x / (float)win_attribs.width * 2 - 1;
 	m_state.cursor.y = (float)win_y / (float)win_attribs.height * 2 - 1;
-
-	return true;
 }
 
-bool KeyboardMouse::UpdateOutput()
-{
-	return true;
-}
-
-
 std::string KeyboardMouse::GetName() const
 {
 	return "Keyboard Mouse";
@@ -99,7 +96,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key
 		i++;
 	}
 	while (keysym == NoSymbol && i < 8);
-	
+
 	// Convert to upper case for the keyname
 	if (keysym >= 97 && keysym <= 122)
 		keysym -= 32;
@@ -107,7 +104,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key
 	// 0x0110ffff is the top of the unicode character range according
 	// to keysymdef.h although it is probably more than we need.
 	if (keysym == NoSymbol || keysym > 0x0110ffff ||
-		XKeysymToString(keysym) == NULL)
+		XKeysymToString(keysym) == nullptr)
 		m_keyname = std::string();
 	else
 		m_keyname = std::string(XKeysymToString(keysym));
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
new file mode 100644
index 0000000000..6fe72e4da7
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
@@ -0,0 +1,93 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
+
+namespace ciface
+{
+namespace Xlib
+{
+
+void Init(std::vector<Core::Device*>& devices, void* const hwnd);
+
+class KeyboardMouse : public Core::Device
+{
+
+private:
+	struct State
+	{
+		char keyboard[32];
+		unsigned int buttons;
+		struct
+		{
+			float x, y;
+		} cursor;
+	};
+
+	class Key : public Input
+	{
+		friend class KeyboardMouse;
+	public:
+		std::string GetName() const override;
+		Key(Display* display, KeyCode keycode, const char* keyboard);
+		ControlState GetState() const override;
+
+	private:
+		std::string       m_keyname;
+		Display* const    m_display;
+		const char* const m_keyboard;
+		const KeyCode     m_keycode;
+	};
+
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const override;
+		Button(unsigned int index, unsigned int& buttons)
+			: m_buttons(buttons), m_index(index) {}
+		ControlState GetState() const override;
+
+	private:
+		const unsigned int& m_buttons;
+		const unsigned int m_index;
+	};
+
+	class Cursor : public Input
+	{
+	public:
+		std::string GetName() const override;
+		bool IsDetectable() override { return false; }
+		Cursor(u8 index, bool positive, const float& cursor)
+			: m_cursor(cursor), m_index(index), m_positive(positive) {}
+		ControlState GetState() const override;
+
+	private:
+		const float& m_cursor;
+		const u8     m_index;
+		const bool   m_positive;
+	};
+
+public:
+	void UpdateInput() override;
+
+	KeyboardMouse(Window window);
+	~KeyboardMouse();
+
+	std::string GetName() const override;
+	std::string GetSource() const override;
+	int GetId() const override;
+
+private:
+	Window   m_window;
+	Display* m_display;
+	State    m_state;
+};
+
+}
+}
diff --git a/Source/Core/InputCommon/GCPadStatus.h b/Source/Core/InputCommon/GCPadStatus.h
new file mode 100644
index 0000000000..d6bb972de1
--- /dev/null
+++ b/Source/Core/InputCommon/GCPadStatus.h
@@ -0,0 +1,57 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+enum PadError
+{
+	PAD_ERR_NONE          = 0,
+	PAD_ERR_NO_CONTROLLER = -1,
+	PAD_ERR_NOT_READY     = -2,
+	PAD_ERR_TRANSFER      = -3,
+};
+
+enum
+{
+	PAD_USE_ORIGIN = 0x0080,
+};
+
+enum PadButton
+{
+	PAD_BUTTON_LEFT  = 0x0001,
+	PAD_BUTTON_RIGHT = 0x0002,
+	PAD_BUTTON_DOWN  = 0x0004,
+	PAD_BUTTON_UP    = 0x0008,
+	PAD_TRIGGER_Z    = 0x0010,
+	PAD_TRIGGER_R    = 0x0020,
+	PAD_TRIGGER_L    = 0x0040,
+	PAD_BUTTON_A     = 0x0100,
+	PAD_BUTTON_B     = 0x0200,
+	PAD_BUTTON_X     = 0x0400,
+	PAD_BUTTON_Y     = 0x0800,
+	PAD_BUTTON_START = 0x1000,
+};
+
+struct GCPadStatus
+{
+	u16 button;                 // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
+	u8  stickX;                 // 0 <= stickX       <= 255
+	u8  stickY;                 // 0 <= stickY       <= 255
+	u8  substickX;              // 0 <= substickX    <= 255
+	u8  substickY;              // 0 <= substickY    <= 255
+	u8  triggerLeft;            // 0 <= triggerLeft  <= 255
+	u8  triggerRight;           // 0 <= triggerRight <= 255
+	u8  analogA;                // 0 <= analogA      <= 255
+	u8  analogB;                // 0 <= analogB      <= 255
+	s8  err;                    // one of PAD_ERR_* number
+
+	static const u8 MAIN_STICK_CENTER_X = 0x80;
+	static const u8 MAIN_STICK_CENTER_Y = 0x80;
+	static const u8 MAIN_STICK_RADIUS   = 0x7f;
+	static const u8 C_STICK_CENTER_X    = 0x80;
+	static const u8 C_STICK_CENTER_Y    = 0x80;
+	static const u8 C_STICK_RADIUS      = 0x7f;
+};
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 03aaf1b3ea..1ef940178e 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -1,202 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}</ProjectGuid>
-    <RootNamespace>InputCommon</RootNamespace>
+    <ProjectGuid>{6BBD47CF-91FD-4077-B676-8B76980178A9}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup 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\CodeGen_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\CodeGen_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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\ControllerEmu.cpp" />
-    <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp" />
-    <ClCompile Include="Src\ControllerInterface\Device.cpp" />
-    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp" />
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
-    <ClCompile Include="Src\ControllerInterface\SDL\SDL.cpp" />
-    <ClCompile Include="Src\ControllerInterface\XInput\XInput.cpp" />
-    <ClCompile Include="Src\InputConfig.cpp" />
-    <ClCompile Include="Src\UDPWiimote.cpp" />
-    <ClCompile Include="Src\UDPWrapper.cpp" />
+    <ClCompile Include="ControllerEmu.cpp" />
+    <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
+    <ClCompile Include="ControllerInterface\Device.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\XInputFilter.cpp">
+      <!--Disable /Zc:strictStrings so that wbem headers may compile-->
+      <!--
+        This is somewhat gross as it doesn't dynamically remove the option,
+        I really hope the issue is fixed in next VS release :(
+        -->
+      <AdditionalOptions>/Zo /Zc:inline /Zc:rvalueCast /volatile:iso</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\ExpressionParser.cpp" />
+    <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
+    <ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
+    <ClCompile Include="InputConfig.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\ControllerEmu.h" />
-    <ClInclude Include="Src\ControllerInterface\ControllerInterface.h" />
-    <ClInclude Include="Src\ControllerInterface\Device.h" />
-    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInput.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h" />
-    <ClInclude Include="Src\ControllerInterface\DInput\NamedKeys.h" />
-    <ClInclude Include="Src\ControllerInterface\SDL\SDL.h" />
-    <ClInclude Include="Src\ControllerInterface\XInput\XInput.h" />
-    <ClInclude Include="Src\GCPadStatus.h" />
-    <ClInclude Include="Src\InputConfig.h" />
-    <ClInclude Include="Src\UDPWiimote.h" />
-    <ClInclude Include="Src\UDPWrapper.h" />
+    <ClInclude Include="ControllerEmu.h" />
+    <ClInclude Include="ControllerInterface\ControllerInterface.h" />
+    <ClInclude Include="ControllerInterface\Device.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInput.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInput8.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h" />
+    <ClInclude Include="ControllerInterface\DInput\XInputFilter.h" />
+    <ClInclude Include="ControllerInterface\ExpressionParser.h" />
+    <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
+    <ClInclude Include="ControllerInterface\XInput\XInput.h" />
+    <ClInclude Include="GCPadStatus.h" />
+    <ClInclude Include="InputConfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index c93a9289f4..3c16ad5f26 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -1,84 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\ControllerEmu.cpp" />
-    <ClCompile Include="Src\InputConfig.cpp" />
-    <ClCompile Include="Src\UDPWiimote.cpp" />
-    <ClCompile Include="Src\UDPWrapper.cpp" />
-    <ClCompile Include="Src\ControllerInterface\SDL\SDL.cpp">
-      <Filter>ControllerInterface\SDL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\XInput\XInput.cpp">
-      <Filter>ControllerInterface\XInput</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp">
-      <Filter>ControllerInterface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp">
-      <Filter>ControllerInterface</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ControllerInterface\Device.cpp">
-      <Filter>ControllerInterface</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\ControllerEmu.h" />
-    <ClInclude Include="Src\GCPadStatus.h" />
-    <ClInclude Include="Src\InputConfig.h" />
-    <ClInclude Include="Src\UDPWiimote.h" />
-    <ClInclude Include="Src\UDPWrapper.h" />
-    <ClInclude Include="Src\ControllerInterface\SDL\SDL.h">
-      <Filter>ControllerInterface\SDL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\XInput\XInput.h">
-      <Filter>ControllerInterface\XInput</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\ControllerInterface.h">
-      <Filter>ControllerInterface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\Device.h">
-      <Filter>ControllerInterface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h">
-      <Filter>ControllerInterface</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\NamedKeys.h">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ControllerInterface\DInput\DInput.h">
-      <Filter>ControllerInterface\DInput</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="ControllerInterface">
-      <UniqueIdentifier>{63655b75-3fd6-4cd0-814a-eb9f3505f91d}</UniqueIdentifier>
+      <UniqueIdentifier>{3a755a86-0efa-4396-bf79-bb3a1910764d}</UniqueIdentifier>
     </Filter>
     <Filter Include="ControllerInterface\DInput">
-      <UniqueIdentifier>{64f2ab35-5cce-40a5-a4d3-232710267e05}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ControllerInterface\SDL">
-      <UniqueIdentifier>{08565cb5-f959-45dc-90b1-93a9c0135478}</UniqueIdentifier>
+      <UniqueIdentifier>{0289ef91-50f5-4c16-9fa4-ff4c4d8208e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="ControllerInterface\XInput">
-      <UniqueIdentifier>{5a9c1b94-2eab-4357-b44f-87d5db50da3d}</UniqueIdentifier>
+      <UniqueIdentifier>{07bad1aa-7e03-4f5c-ade2-a44857c5cbc3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ControllerInterface\ForceFeedback">
+      <UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ClCompile Include="ControllerEmu.cpp" />
+    <ClCompile Include="InputConfig.cpp" />
+    <ClCompile Include="ControllerInterface\DInput\DInput.cpp">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\XInput\XInput.cpp">
+      <Filter>ControllerInterface\XInput</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\Device.cpp">
+      <Filter>ControllerInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\ControllerInterface.cpp">
+      <Filter>ControllerInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\ExpressionParser.cpp">
+      <Filter>ControllerInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp">
+      <Filter>ControllerInterface\ForceFeedback</Filter>
+    </ClCompile>
+    <ClCompile Include="ControllerInterface\DInput\XInputFilter.cpp">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ControllerEmu.h" />
+    <ClInclude Include="GCPadStatus.h" />
+    <ClInclude Include="InputConfig.h" />
+    <ClInclude Include="ControllerInterface\DInput\DInput.h">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\XInput\XInput.h">
+      <Filter>ControllerInterface\XInput</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\ControllerInterface.h">
+      <Filter>ControllerInterface</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\Device.h">
+      <Filter>ControllerInterface</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\ExpressionParser.h">
+      <Filter>ControllerInterface</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h">
+      <Filter>ControllerInterface\ForceFeedback</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\DInput\DInput8.h">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerInterface\DInput\XInputFilter.h">
+      <Filter>ControllerInterface\DInput</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
new file mode 100644
index 0000000000..d17d02d085
--- /dev/null
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -0,0 +1,99 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonPaths.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/Wiimote.h"
+#include "InputCommon/InputConfig.h"
+
+bool InputConfig::LoadConfig(bool isGC)
+{
+	IniFile inifile;
+	bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
+	std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
+	std::string profile[MAX_BBMOTES];
+	std::string path;
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000")
+	{
+		std::string type;
+		if (isGC)
+		{
+			type = "Pad";
+			path = "Profiles/GCPad/";
+		}
+		else
+		{
+			type = "Wiimote";
+			path = "Profiles/Wiimote/";
+		}
+
+		IniFile game_ini = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
+		IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls");
+
+		for (int i = 0; i < 4; i++)
+		{
+			if (control_section->Exists(type + "Profile" + num[i]))
+			{
+				if (control_section->Get(type + "Profile" + num[i], &profile[i]))
+				{
+					if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
+					{
+						useProfile[i] = true;
+					}
+					else
+					{
+						// TODO: PanicAlert shouldn't be used for this.
+						PanicAlertT("Selected controller profile does not exist");
+					}
+				}
+			}
+		}
+	}
+
+	if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"))
+	{
+		int n = 0;
+		for (ControllerEmu* pad : controllers)
+		{
+			// Load settings from ini
+			if (useProfile[n])
+			{
+				IniFile profile_ini;
+				profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
+				pad->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
+			}
+			else
+			{
+				pad->LoadConfig(inifile.GetOrCreateSection(pad->GetName()));
+			}
+
+			// Update refs
+			pad->UpdateReferences(g_controller_interface);
+
+			// Next profile
+			n++;
+		}
+		return true;
+	}
+	else
+	{
+		controllers[0]->LoadDefaults(g_controller_interface);
+		controllers[0]->UpdateReferences(g_controller_interface);
+		return false;
+	}
+}
+
+void InputConfig::SaveConfig()
+{
+	std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini";
+
+	IniFile inifile;
+	inifile.Load(ini_filename);
+
+	for (ControllerEmu* pad : controllers)
+		pad->SaveConfig(inifile.GetOrCreateSection(pad->GetName()));
+
+	inifile.Save(ini_filename);
+}
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
new file mode 100644
index 0000000000..d827e25927
--- /dev/null
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -0,0 +1,32 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <vector>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
+
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+class InputConfig
+{
+public:
+	InputConfig(const char* const _ini_name, const char* const _gui_name,
+		const char* const _profile_name)
+		: ini_name(_ini_name), gui_name(_gui_name), profile_name(_profile_name) {}
+
+	bool LoadConfig(bool isGC);
+	void SaveConfig();
+
+	std::vector<ControllerEmu*>  controllers;
+
+	const char* const ini_name;
+	const char* const gui_name;
+	const char* const profile_name;
+};
diff --git a/Source/Core/InputCommon/KeyboardStatus.h b/Source/Core/InputCommon/KeyboardStatus.h
new file mode 100644
index 0000000000..0ed4e255f9
--- /dev/null
+++ b/Source/Core/InputCommon/KeyboardStatus.h
@@ -0,0 +1,198 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+enum KeyMasks
+{
+	KEYMASK_HOME = (1 << 0),
+	KEYMASK_END = (1 << 1),
+	KEYMASK_PGUP = (1 << 2),
+	KEYMASK_PGDN = (1 << 3),
+	KEYMASK_SCROLLLOCK = (1 << 4),
+	KEYMASK_A = (1 << 5),
+	KEYMASK_B = (1 << 6),
+	KEYMASK_C = (1 << 7),
+	KEYMASK_D = (1 << 8),
+	KEYMASK_E = (1 << 9),
+	KEYMASK_F = (1 << 10),
+	KEYMASK_G = (1 << 11),
+	KEYMASK_H = (1 << 12),
+	KEYMASK_I = (1 << 13),
+	KEYMASK_J = (1 << 14),
+	KEYMASK_K = (1 << 15),
+	KEYMASK_L = (1 << 0),
+	KEYMASK_M = (1 << 1),
+	KEYMASK_N = (1 << 2),
+	KEYMASK_O = (1 << 3),
+	KEYMASK_P = (1 << 4),
+	KEYMASK_Q = (1 << 5),
+	KEYMASK_R = (1 << 6),
+	KEYMASK_S = (1 << 7),
+	KEYMASK_T = (1 << 8),
+	KEYMASK_U = (1 << 9),
+	KEYMASK_V = (1 << 10),
+	KEYMASK_W = (1 << 11),
+	KEYMASK_X = (1 << 12),
+	KEYMASK_Y = (1 << 13),
+	KEYMASK_Z = (1 << 14),
+	KEYMASK_1 = (1 << 15),
+	KEYMASK_2 = (1 << 0),
+	KEYMASK_3 = (1 << 1),
+	KEYMASK_4 = (1 << 2),
+	KEYMASK_5 = (1 << 3),
+	KEYMASK_6 = (1 << 4),
+	KEYMASK_7 = (1 << 5),
+	KEYMASK_8 = (1 << 6),
+	KEYMASK_9 = (1 << 7),
+	KEYMASK_0 = (1 << 8),
+	KEYMASK_MINUS = (1 << 9),
+	KEYMASK_PLUS = (1 << 10),
+	KEYMASK_PRINTSCR = (1 << 11),
+	KEYMASK_BRACE_OPEN = (1 << 12),
+	KEYMASK_BRACE_CLOSE = (1 << 13),
+	KEYMASK_COLON = (1 << 14),
+	KEYMASK_QUOTE = (1 << 15),
+	KEYMASK_HASH = (1 << 0),
+	KEYMASK_COMMA = (1 << 1),
+	KEYMASK_PERIOD = (1 << 2),
+	KEYMASK_QUESTIONMARK = (1 << 3),
+	KEYMASK_INTERNATIONAL1 = (1 << 4),
+	KEYMASK_F1 = (1 << 5),
+	KEYMASK_F2 = (1 << 6),
+	KEYMASK_F3 = (1 << 7),
+	KEYMASK_F4 = (1 << 8),
+	KEYMASK_F5 = (1 << 9),
+	KEYMASK_F6 = (1 << 10),
+	KEYMASK_F7 = (1 << 11),
+	KEYMASK_F8 = (1 << 12),
+	KEYMASK_F9 = (1 << 13),
+	KEYMASK_F10 = (1 << 14),
+	KEYMASK_F11 = (1 << 15),
+	KEYMASK_F12 = (1 << 0),
+	KEYMASK_ESC = (1 << 1),
+	KEYMASK_INSERT = (1 << 2),
+	KEYMASK_DELETE = (1 << 3),
+	KEYMASK_TILDE = (1 << 4),
+	KEYMASK_BACKSPACE = (1 << 5),
+	KEYMASK_TAB = (1 << 6),
+	KEYMASK_CAPSLOCK = (1 << 7),
+	KEYMASK_LEFTSHIFT = (1 << 8),
+	KEYMASK_RIGHTSHIFT = (1 << 9),
+	KEYMASK_LEFTCONTROL = (1 << 10),
+	KEYMASK_RIGHTALT = (1 << 11),
+	KEYMASK_LEFTWINDOWS = (1 << 12),
+	KEYMASK_SPACE = (1 << 13),
+	KEYMASK_RIGHTWINDOWS = (1 << 14),
+	KEYMASK_MENU = (1 << 15),
+	KEYMASK_LEFTARROW = (1 << 0),
+	KEYMASK_DOWNARROW = (1 << 1),
+	KEYMASK_UPARROW = (1 << 2),
+	KEYMASK_RIGHTARROW = (1 << 3),
+	KEYMASK_ENTER = (1 << 4),
+};
+
+enum KeyScanCode
+{
+	KEY_HOME = 0x06,
+	KEY_END = 0x07,
+	KEY_PGUP = 0x08,
+	KEY_PGDN = 0x09,
+	KEY_SCROLLLOCK = 0x0A,
+	KEY_A = 0x10,
+	KEY_B = 0x11,
+	KEY_C = 0x12,
+	KEY_D = 0x13,
+	KEY_E = 0x14,
+	KEY_F = 0x15,
+	KEY_G = 0x16,
+	KEY_H = 0x17,
+	KEY_I = 0x18,
+	KEY_J = 0x19,
+	KEY_K = 0x1A,
+	KEY_L = 0x1B,
+	KEY_M = 0x1C,
+	KEY_N = 0x1D,
+	KEY_O = 0x1E,
+	KEY_P = 0x1F,
+	KEY_Q = 0x20,
+	KEY_R = 0x21,
+	KEY_S = 0x22,
+	KEY_T = 0x23,
+	KEY_U = 0x24,
+	KEY_V = 0x25,
+	KEY_W = 0x26,
+	KEY_X = 0x27,
+	KEY_Y = 0x28,
+	KEY_Z = 0x29,
+	KEY_1 = 0x2A,
+	KEY_2 = 0x2B,
+	KEY_3 = 0x2C,
+	KEY_4 = 0x2D,
+	KEY_5 = 0x2E,
+	KEY_6 = 0x2F,
+	KEY_7 = 0x30,
+	KEY_8 = 0x31,
+	KEY_9 = 0x32,
+	KEY_0 = 0x33,
+	KEY_MINUS = 0x34,
+	KEY_PLUS = 0x35,
+	KEY_PRINTSCR = 0x36,
+	KEY_BRACE_OPEN = 0x37,
+	KEY_BRACE_CLOSE = 0x38,
+	KEY_COLON = 0x39,
+	KEY_QUOTE = 0x3A,
+	KEY_HASH = 0x3B,
+	KEY_COMMA = 0x3C,
+	KEY_PERIOD = 0x3D,
+	KEY_QUESTIONMARK = 0x3E,
+	KEY_INTERNATIONAL1 = 0x3F,
+	KEY_F1 = 0x40,
+	KEY_F2 = 0x41,
+	KEY_F3 = 0x42,
+	KEY_F4 = 0x43,
+	KEY_F5 = 0x44,
+	KEY_F6 = 0x45,
+	KEY_F7 = 0x46,
+	KEY_F8 = 0x47,
+	KEY_F9 = 0x48,
+	KEY_F10 = 0x49,
+	KEY_F11 = 0x4A,
+	KEY_F12 = 0x4B,
+	KEY_ESC = 0x4C,
+	KEY_INSERT = 0x4D,
+	KEY_DELETE = 0x4E,
+	KEY_TILDE = 0x4F,
+	KEY_BACKSPACE = 0x50,
+	KEY_TAB = 0x51,
+	KEY_CAPSLOCK = 0x53,
+	KEY_LEFTSHIFT = 0x54,
+	KEY_RIGHTSHIFT = 0x55,
+	KEY_LEFTCONTROL = 0x56,
+	KEY_RIGHTALT = 0x57,
+	KEY_LEFTWINDOWS = 0x58,
+	KEY_SPACE = 0x59,
+	KEY_RIGHTWINDOWS = 0x5A,
+	KEY_MENU = 0x5B,
+	KEY_LEFTARROW = 0x5C,
+	KEY_DOWNARROW = 0x5D,
+	KEY_UPARROW = 0x5E,
+	KEY_RIGHTARROW = 0x5F,
+	KEY_ENTER = 0x61
+
+};
+
+struct KeyboardStatus
+{
+	u16 key0x;
+	u16 key1x;
+	u16 key2x;
+	u16 key3x;
+	u16 key4x;
+	u16 key5x;
+	u16 key6x;
+	s8  err;
+};
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp
deleted file mode 100644
index 328fcb8c2f..0000000000
--- a/Source/Core/InputCommon/Src/ControllerEmu.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "ControllerEmu.h"
-
-#if defined(HAVE_X11) && HAVE_X11
-#include <X11/Xlib.h>
-#endif
-
-ControllerEmu::~ControllerEmu()
-{
-	// control groups
-	std::vector<ControlGroup*>::const_iterator
-		i = groups.begin(),
-		e = groups.end();
-	for (; i!=e; ++i)
-		delete *i;
-}
-
-ControllerEmu::ControlGroup::~ControlGroup()
-{
-	// controls
-	std::vector<Control*>::const_iterator
-		ci = controls.begin(),
-		ce = controls.end();
-	for (; ci!=ce; ++ci)
-		delete *ci;
-
-	// settings
-	std::vector<Setting*>::const_iterator
-		si = settings.begin(),
-		se = settings.end();
-	for (; si!=se; ++si)
-		delete *si;
-}
-
-ControllerEmu::Extension::~Extension()
-{
-	// attachments
-	std::vector<ControllerEmu*>::const_iterator
-		ai = attachments.begin(),
-		ae = attachments.end();
-	for (; ai!=ae; ++ai)
-		delete *ai;
-}
-ControllerEmu::ControlGroup::Control::~Control()
-{
-	delete control_ref;
-}
-
-void ControllerEmu::UpdateReferences(ControllerInterface& devi)
-{
-	std::vector<ControlGroup*>::const_iterator
-		i = groups.begin(),
-		e = groups.end();
-	for (; i!=e; ++i)
-	{
-		std::vector<ControlGroup::Control*>::const_iterator
-			ci = (*i)->controls.begin(),
-			ce = (*i)->controls.end();
-		for (; ci!=ce; ++ci)
-			devi.UpdateReference((*ci)->control_ref, default_device);
-
-		// extension
-		if (GROUP_TYPE_EXTENSION == (*i)->type)
-		{
-			std::vector<ControllerEmu*>::const_iterator
-				ai = ((Extension*)*i)->attachments.begin(),
-				ae = ((Extension*)*i)->attachments.end();
-			for (; ai!=ae; ++ai)
-				(*ai)->UpdateReferences(devi);
-		}
-	}
-}
-
-void ControllerEmu::UpdateDefaultDevice()
-{
-	std::vector<ControlGroup*>::const_iterator
-		i = groups.begin(),
-		e = groups.end();
-	for (; i!=e; ++i)
-	{
-		//std::vector<ControlGroup::Control*>::const_iterator
-			//ci = (*i)->controls.begin(),
-			//ce = (*i)->controls.end();
-		//for (; ci!=ce; ++ci)
-			//(*ci)->control_ref->device_qualifier = default_device;
-
-		// extension
-		if (GROUP_TYPE_EXTENSION == (*i)->type)
-		{
-			std::vector<ControllerEmu*>::const_iterator
-				ai = ((Extension*)*i)->attachments.begin(),
-				ae = ((Extension*)*i)->attachments.end();
-			for (; ai!=ae; ++ai)
-			{
-				(*ai)->default_device = default_device;
-				(*ai)->UpdateDefaultDevice();
-			}
-		}
-	}
-}
-
-void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
-{
-	std::string group(base + name); group += "/";
-
-	// settings
-	std::vector<ControlGroup::Setting*>::const_iterator
-		si = settings.begin(),
-		se = settings.end();
-	for (; si!=se; ++si)
-	{
-		sec->Get((group+(*si)->name).c_str(), &(*si)->value, (*si)->default_value*100);
-		(*si)->value /= 100;
-	}
-
-	// controls
-	std::vector<ControlGroup::Control*>::const_iterator
-		ci = controls.begin(),
-		ce = controls.end();
-	for (; ci!=ce; ++ci)
-	{
-		// control expression
-		sec->Get((group + (*ci)->name).c_str(), &(*ci)->control_ref->expression, "");
-
-		// range
-		sec->Get((group+(*ci)->name+"/Range").c_str(), &(*ci)->control_ref->range, 100.0f);
-		(*ci)->control_ref->range /= 100;
-
-	}
-
-	// extensions
-	if (GROUP_TYPE_EXTENSION == type)
-	{
-		Extension* const ex = ((Extension*)this);
-
-		ex->switch_extension = 0;
-		unsigned int n = 0;
-		std::string extname;
-		sec->Get((base + name).c_str(), &extname, "");
-
-		std::vector<ControllerEmu*>::const_iterator
-			ai = ((Extension*)this)->attachments.begin(),
-			ae = ((Extension*)this)->attachments.end();
-		for (; ai!=ae; ++ai,++n)
-		{
-			(*ai)->default_device.FromString(defdev);
-			(*ai)->LoadConfig(sec, base + (*ai)->GetName() + "/");
-
-			if ((*ai)->GetName() == extname)
-				ex->switch_extension = n;
-		}
-	}
-}
-
-void ControllerEmu::LoadConfig(IniFile::Section *sec, const std::string& base)
-{
-	std::string defdev = default_device.ToString();
-	if (base.empty())
-	{
-		sec->Get((base + "Device").c_str(), &defdev, "");
-		default_device.FromString(defdev);
-	}
-	std::vector<ControlGroup*>::const_iterator i = groups.begin(),
-		e = groups.end();
-	for (; i!=e; ++i)
-		(*i)->LoadConfig(sec, defdev, base);
-}
-
-void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
-{
-	std::string group(base + name); group += "/";
-
-	// settings
-	std::vector<ControlGroup::Setting*>::const_iterator
-		si = settings.begin(),
-		se = settings.end();
-	for (; si!=se; ++si)
-		sec->Set((group+(*si)->name).c_str(), (*si)->value*100.0f, (*si)->default_value*100.0f);
-
-	// controls
-	std::vector<ControlGroup::Control*>::const_iterator
-		ci = controls.begin(),
-		ce = controls.end();
-	for (; ci!=ce; ++ci)
-	{
-		// control expression
-		sec->Set((group+(*ci)->name).c_str(), (*ci)->control_ref->expression, "");
-
-		// range
-		sec->Set((group+(*ci)->name+"/Range").c_str(), (*ci)->control_ref->range*100.0f, 100.0f);
-	}
-
-	// extensions
-	if (GROUP_TYPE_EXTENSION == type)
-	{
-		Extension* const ext = ((Extension*)this);
-		sec->Set((base + name).c_str(), ext->attachments[ext->switch_extension]->GetName(), "None");
-
-		std::vector<ControllerEmu*>::const_iterator
-			ai = ((Extension*)this)->attachments.begin(),
-			ae = ((Extension*)this)->attachments.end();
-		for (; ai!=ae; ++ai)
-			(*ai)->SaveConfig(sec, base + (*ai)->GetName() + "/");
-	}
-}
-
-void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
-{
-	const std::string defdev = default_device.ToString();
-	if (base.empty())
-		sec->Set((/*std::string(" ") +*/ base + "Device").c_str(), defdev, "");
-
-	std::vector<ControlGroup*>::const_iterator i = groups.begin(),
-		e = groups.end();
-	for (; i!=e; ++i)
-		(*i)->SaveConfig(sec, defdev, base);
-}
-
-ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK)
-{
-	for (unsigned int i = 0; i < 4; ++i)
-		controls.push_back(new Input(named_directions[i]));
-
-	controls.push_back(new Input(_trans("Modifier")));
-
-	settings.push_back(new Setting(_trans("Radius"), 0.7f, 0, 100));
-	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
-	settings.push_back(new Setting(_trans("Square Stick"), 0));
-
-}
-
-ControllerEmu::Buttons::Buttons(const char* const _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS)
-{
-	settings.push_back(new Setting(_trans("Threshold"), 0.5f));
-}
-
-ControllerEmu::MixedTriggers::MixedTriggers(const char* const _name) : ControlGroup(_name, GROUP_TYPE_MIXED_TRIGGERS)
-{
-	settings.push_back(new Setting(_trans("Threshold"), 0.9f));
-}
-
-ControllerEmu::Triggers::Triggers(const char* const _name) : ControlGroup(_name, GROUP_TYPE_TRIGGERS)
-{
-	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
-}
-
-ControllerEmu::Slider::Slider(const char* const _name) : ControlGroup(_name, GROUP_TYPE_SLIDER)
-{
-	controls.push_back(new Input("Left"));
-	controls.push_back(new Input("Right"));
-
-	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
-}
-
-ControllerEmu::Force::Force(const char* const _name) : ControlGroup(_name, GROUP_TYPE_FORCE)
-{
-	memset(m_swing, 0, sizeof(m_swing));
-
-	controls.push_back(new Input(_trans("Up")));
-	controls.push_back(new Input(_trans("Down")));
-	controls.push_back(new Input(_trans("Left")));
-	controls.push_back(new Input(_trans("Right")));
-	controls.push_back(new Input(_trans("Forward")));
-	controls.push_back(new Input(_trans("Backward")));
-
-	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
-}
-
-ControllerEmu::Tilt::Tilt(const char* const _name)
-	: ControlGroup(_name, GROUP_TYPE_TILT)
-{
-	memset(m_tilt, 0, sizeof(m_tilt));
-
-	controls.push_back(new Input("Forward"));
-	controls.push_back(new Input("Backward"));
-	controls.push_back(new Input("Left"));
-	controls.push_back(new Input("Right"));
-
-	controls.push_back(new Input(_trans("Modifier")));
-
-	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
-	settings.push_back(new Setting(_trans("Circle Stick"), 0));
-	settings.push_back(new Setting(_trans("Angle"), 0.9f, 0, 180));
-}
-
-ControllerEmu::Cursor::Cursor(const char* const _name)
-	: ControlGroup(_name, GROUP_TYPE_CURSOR)
-	, m_z(0)
-{
-	for (unsigned int i = 0; i < 4; ++i)
-		controls.push_back(new Input(named_directions[i]));
-	controls.push_back(new Input("Forward"));
-	controls.push_back(new Input("Backward"));
-	controls.push_back(new Input(_trans("Hide")));
-
-	settings.push_back(new Setting(_trans("Center"), 0.5f));
-	settings.push_back(new Setting(_trans("Width"), 0.5f));
-	settings.push_back(new Setting(_trans("Height"), 0.5f));
-
-}
-
-void ControllerEmu::LoadDefaults(const ControllerInterface &ciface)
-{
-	// load an empty inifile section, clears everything
-	IniFile::Section sec;
-	LoadConfig(&sec);
-
-	if (ciface.Devices().size())
-	{
-		default_device.FromDevice(ciface.Devices()[0]);
-		UpdateDefaultDevice();
-	}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h
deleted file mode 100644
index 5dc54b463f..0000000000
--- a/Source/Core/InputCommon/Src/ControllerEmu.h
+++ /dev/null
@@ -1,456 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONTROLLEREMU_H_
-#define _CONTROLLEREMU_H_
-
-// windows crap
-#define NOMINMAX
-
-#include <cmath>
-#include <vector>
-#include <string>
-#include <algorithm>
-
-#include "GCPadStatus.h"
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "IniFile.h"
-
-#define sign(x) ((x)?(x)<0?-1:1:0)
-
-enum
-{
-	GROUP_TYPE_OTHER,
-	GROUP_TYPE_STICK,
-	GROUP_TYPE_MIXED_TRIGGERS,
-	GROUP_TYPE_BUTTONS,
-	GROUP_TYPE_FORCE,
-	GROUP_TYPE_EXTENSION,
-	GROUP_TYPE_TILT,
-	GROUP_TYPE_CURSOR,
-	GROUP_TYPE_TRIGGERS,
-	GROUP_TYPE_UDPWII,
-	GROUP_TYPE_SLIDER,
-};
-
-enum
-{
-	SETTING_RADIUS,
-	SETTING_DEADZONE,
-	SETTING_SQUARE,
-};
-
-const char * const named_directions[] = 
-{
-	"Up",
-	"Down",
-	"Left",
-	"Right"
-};
-
-class ControllerEmu
-{
-public:
-
-	class ControlGroup
-	{
-	public:
-
-		class Control
-		{
-		protected:
-			Control(ControllerInterface::ControlReference* const _ref, const char * const _name)
-				: control_ref(_ref), name(_name){}
-		public:
-
-			virtual ~Control();
-			ControllerInterface::ControlReference*		const control_ref;
-			const char * const		name;
-
-		};
-
-		class Input : public Control
-		{
-		public:
-
-			Input(const char * const _name)
-				: Control(new ControllerInterface::InputReference, _name) {}
-
-		};
-
-		class Output : public Control
-		{
-		public:
-
-			Output(const char * const _name)
-				: Control(new ControllerInterface::OutputReference, _name) {}
-
-		};
-
-		class Setting
-		{
-		public:
-
-			Setting(const char* const _name, const ControlState def_value
-				, const unsigned int _low = 0, const unsigned int _high = 100 )
-				: name(_name)
-				, value(def_value)
-				, default_value(def_value)
-				, low(_low)
-				, high(_high){}
-
-			const char* const	name;
-			ControlState		value;
-			const ControlState	default_value;
-			const unsigned int	low, high;
-		};
-
-		ControlGroup(const char* const _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {}
-		virtual ~ControlGroup();
-	
-		virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
-		virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
-
-		const char* const			name;
-		const unsigned int			type;
-
-		std::vector< Control* >		controls;
-		std::vector< Setting* >		settings;
-
-	};
-
-	class AnalogStick : public ControlGroup
-	{
-	public:
-
-		template <typename C>
-		void GetState(C* const x, C* const y, const unsigned int base, const unsigned int range)
-		{
-			// this is all a mess
-
-			ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
-			ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
-
-			ControlState radius = settings[SETTING_RADIUS]->value;
-			ControlState deadzone = settings[SETTING_DEADZONE]->value;
-			ControlState square = settings[SETTING_SQUARE]->value;
-			ControlState m = controls[4]->control_ref->State();
-
-			// modifier code
-			if (m)
-			{
-				yy = (fabsf(yy)>deadzone) * sign(yy) * (m + deadzone/2);
-				xx = (fabsf(xx)>deadzone) * sign(xx) * (m + deadzone/2);
-			}
-
-			// deadzone / square stick code
-			if (radius != 1 || deadzone || square)
-			{
-				// this section might be all wrong, but its working good enough, I think
-
-				ControlState ang = atan2(yy, xx);
-				ControlState ang_sin = sin(ang);
-				ControlState ang_cos = cos(ang);
-
-				// the amt a full square stick would have at current angle
-				ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2);
-
-				// the amt a full stick would have that was ( user setting squareness) at current angle
-				// I think this is more like a pointed circle rather than a rounded square like it should be
-				ControlState stick_full = (1 + (square_full - 1) * square);
-
-				ControlState dist = sqrt(xx*xx + yy*yy);
-
-				// dead zone code
-				dist = std::max(0.0f, dist - deadzone * stick_full);
-				dist /= (1 - deadzone);
-
-				// square stick code
-				ControlState amt = dist / stick_full;
-				dist -= ((square_full - 1) * amt * square);
-
-				// radius
-				dist *= radius;
-
-				yy = std::max(-1.0f, std::min(1.0f, ang_sin * dist));
-				xx = std::max(-1.0f, std::min(1.0f, ang_cos * dist));
-			}
-
-			*y = C(yy * range + base);
-			*x = C(xx * range + base);
-		}
-
-		AnalogStick(const char* const _name);
-
-	};
-
-	class Buttons : public ControlGroup
-	{
-	public:
-		Buttons(const char* const _name);
-
-		template <typename C>
-		void GetState(C* const buttons, const C* bitmasks)
-		{
-			std::vector<Control*>::iterator
-				i = controls.begin(),
-				e = controls.end();
-
-			for (; i!=e; ++i, ++bitmasks)
-			{
-				if ((*i)->control_ref->State() > settings[0]->value) // threshold
-					*buttons |= *bitmasks;
-			}
-		}
-
-	};
-
-	class MixedTriggers : public ControlGroup
-	{
-	public:
-
-		template <typename C, typename S>
-		void GetState(C* const digital, const C* bitmasks, S* analog, const unsigned int range)
-		{
-			const unsigned int trig_count = ((unsigned int) (controls.size() / 2));
-			for (unsigned int i=0; i<trig_count; ++i,++bitmasks,++analog)
-			{
-				if (controls[i]->control_ref->State() > settings[0]->value) //threshold
-				{
-					*analog = range;
-					*digital |= *bitmasks;
-				}
-				else
-				{
-					*analog = S(controls[i+trig_count]->control_ref->State() * range);
-				}
-			}
-		}
-
-		MixedTriggers(const char* const _name);
-
-	};
-
-	class Triggers : public ControlGroup
-	{
-	public:
-
-		template <typename S>
-		void GetState(S* analog, const unsigned int range)
-		{
-			const unsigned int trig_count = ((unsigned int) (controls.size()));
-			const ControlState deadzone = settings[0]->value;
-			for (unsigned int i=0; i<trig_count; ++i,++analog)
-				*analog = S(std::max(controls[i]->control_ref->State() - deadzone, 0.0f) / (1 - deadzone) * range);
-		}
-
-		Triggers(const char* const _name);
-
-	};
-
-	class Slider : public ControlGroup
-	{
-	public:
-
-		template <typename S>
-		void GetState(S* const slider, const unsigned int range, const unsigned int base = 0)
-		{
-			const float deadzone = settings[0]->value;
-			const float state = controls[1]->control_ref->State() - controls[0]->control_ref->State();
-
-			if (fabsf(state) > deadzone)
-				*slider = (S)((state - (deadzone * sign(state))) / (1 - deadzone) * range + base);
-			else
-				*slider = 0;
-		}
-
-		Slider(const char* const _name);
-
-	};
-
-	class Force : public ControlGroup
-	{
-	public:
-		Force(const char* const _name);
-
-		template <typename C, typename R>
-		void GetState(C* axis, const u8 base, const R range)
-		{
-			const float deadzone = settings[0]->value;
-			for (unsigned int i=0; i<6; i+=2)
-			{
-				float tmpf = 0;
-				const float state = controls[i+1]->control_ref->State() - controls[i]->control_ref->State();
-				if (fabsf(state) > deadzone)
-					tmpf = ((state - (deadzone * sign(state))) / (1 - deadzone));
-
-				float &ax = m_swing[i >> 1];
-				*axis++	= (C)((tmpf - ax) * range + base);
-				ax = tmpf;
-			}
-		}
-	private:
-		float	m_swing[3];
-	};
-
-	class Tilt : public ControlGroup
-	{
-	public:
-		Tilt(const char* const _name);
-
-		template <typename C, typename R>
-		void GetState(C* const x, C* const y, const unsigned int base, const R range, const bool step = true)
-		{
-			// this is all a mess
-
-			ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
-			ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
-
-			ControlState deadzone = settings[0]->value;
-			ControlState circle = settings[1]->value;
-			auto const angle = settings[2]->value / 1.8f;
-			ControlState m = controls[4]->control_ref->State();
-
-			// modifier code
-			if (m)
-			{
-				yy = (fabsf(yy)>deadzone) * sign(yy) * (m + deadzone/2);
-				xx = (fabsf(xx)>deadzone) * sign(xx) * (m + deadzone/2);
-			}
-
-			// deadzone / circle stick code
-			if (deadzone || circle)
-			{
-				// this section might be all wrong, but its working good enough, I think
-
-				ControlState ang = atan2(yy, xx); 
-				ControlState ang_sin = sin(ang);
-				ControlState ang_cos = cos(ang);
-
-				// the amt a full square stick would have at current angle
-				ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2);
-
-				// the amt a full stick would have that was (user setting circular) at current angle
-				// I think this is more like a pointed circle rather than a rounded square like it should be
-				ControlState stick_full = (square_full * (1 - circle)) + (circle);
-
-				ControlState dist = sqrt(xx*xx + yy*yy);
-
-				// dead zone code
-				dist = std::max(0.0f, dist - deadzone * stick_full);
-				dist /= (1 - deadzone);
-
-				// circle stick code
-				ControlState amt = dist / stick_full;
-				dist += (square_full - 1) * amt * circle;
-
-				yy = std::max(-1.0f, std::min(1.0f, ang_sin * dist));
-				xx = std::max(-1.0f, std::min(1.0f, ang_cos * dist));
-			}
-
-			// this is kinda silly here
-			// gui being open will make this happen 2x as fast, o well
-			
-			// silly
-			if (step)
-			{
-				if (xx > m_tilt[0])
-					m_tilt[0] = std::min(m_tilt[0] + 0.1f, xx);
-				else if (xx < m_tilt[0])
-					m_tilt[0] = std::max(m_tilt[0] - 0.1f, xx);
-
-				if (yy > m_tilt[1])
-					m_tilt[1] = std::min(m_tilt[1] + 0.1f, yy);
-				else if (yy < m_tilt[1])
-					m_tilt[1] = std::max(m_tilt[1] - 0.1f, yy);
-			}
-
-			*y = C(m_tilt[1] * angle * range + base);
-			*x = C(m_tilt[0] * angle * range + base);
-		}
-	private:
-		float	m_tilt[2];
-	};
-
-	class Cursor : public ControlGroup
-	{
-	public:
-		Cursor(const char* const _name);
-
-		template <typename C>
-		void GetState(C* const x, C* const y, C* const z, const bool adjusted = false)
-		{
-			const float zz = controls[4]->control_ref->State() - controls[5]->control_ref->State();
-
-			// silly being here
-			if (zz > m_z)
-				m_z = std::min(m_z + 0.1f, zz);
-			else if (zz < m_z)
-				m_z = std::max(m_z - 0.1f, zz);
-
-			*z = m_z;
-			
-			// hide
-			if (controls[6]->control_ref->State() > 0.5f)
-			{
-				*x = 10000; *y = 0;
-			}
-			else
-			{
-				float yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
-				float xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
-
-				// adjust cursor according to settings
-				if (adjusted)
-				{
-					xx *= (settings[1]->value * 2);
-					yy *= (settings[2]->value * 2);
-					yy += (settings[0]->value - 0.5f);
-				}
-
-				*x = xx;
-				*y = yy;
-			}
-		}
-
-		float	m_z;
-	};
-
-	class Extension : public ControlGroup
-	{
-	public:
-		Extension(const char* const _name)
-			: ControlGroup(_name, GROUP_TYPE_EXTENSION)
-			, switch_extension(0)
-			, active_extension(0) {}
-		~Extension();
-
-		void GetState(u8* const data, const bool focus = true);
-
-		std::vector<ControllerEmu*>		attachments;
-
-		int	switch_extension;
-		int	active_extension;
-	};
-
-	virtual ~ControllerEmu();
-
-	virtual std::string GetName() const = 0;
-
-	virtual void LoadDefaults(const ControllerInterface& ciface);
-
-	virtual void LoadConfig(IniFile::Section *sec, const std::string& base = "");
-	virtual void SaveConfig(IniFile::Section *sec, const std::string& base = "");
-	void UpdateDefaultDevice();
-
-	void UpdateReferences(ControllerInterface& devi);
-
-	std::vector< ControlGroup* >		groups;
-
-	DeviceQualifier	default_device;
-};
-
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
deleted file mode 100644
index ef95f9b363..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Android.h"
-
-namespace ciface
-{
-
-namespace Android
-{
-
-void Init( std::vector<Core::Device*>& devices )
-{
-	devices.push_back(new Touchscreen());
-}
-
-// Touchscreens and stuff
-std::string Touchscreen::GetName() const
-{
-	return "Touchscreen";
-}
-
-std::string Touchscreen::GetSource() const
-{
-	return "Android";
-}
-
-int Touchscreen::GetId() const
-{
-	return 0;
-}
-Touchscreen::Touchscreen()
-{
-	AddInput(new Button(ButtonManager::BUTTON_A));
-	AddInput(new Button(ButtonManager::BUTTON_B));
-	AddInput(new Button(ButtonManager::BUTTON_START));
-	AddInput(new Button(ButtonManager::BUTTON_X));
-	AddInput(new Button(ButtonManager::BUTTON_Y));
-	AddInput(new Button(ButtonManager::BUTTON_Z));
-	AddInput(new Button(ButtonManager::BUTTON_UP));
-	AddInput(new Button(ButtonManager::BUTTON_DOWN));
-	AddInput(new Button(ButtonManager::BUTTON_LEFT));
-	AddInput(new Button(ButtonManager::BUTTON_RIGHT));
-	AddAnalogInputs(new Axis(ButtonManager::STICK_MAIN_LEFT), new Axis(ButtonManager::STICK_MAIN_RIGHT));
-	AddAnalogInputs(new Axis(ButtonManager::STICK_MAIN_UP), new Axis(ButtonManager::STICK_MAIN_DOWN));
-	AddAnalogInputs(new Axis(ButtonManager::STICK_C_UP), new Axis(ButtonManager::STICK_C_DOWN));
-	AddAnalogInputs(new Axis(ButtonManager::STICK_C_LEFT), new Axis(ButtonManager::STICK_C_RIGHT));
-	AddAnalogInputs(new Axis(ButtonManager::TRIGGER_L), new Axis(ButtonManager::TRIGGER_L));
-	AddAnalogInputs(new Axis(ButtonManager::TRIGGER_R), new Axis(ButtonManager::TRIGGER_R));
-
-}
-// Buttons and stuff
-
-std::string Touchscreen::Button::GetName() const
-{
-	std::ostringstream ss;
-	ss << "Button " << (int)m_index;
-	return ss.str();
-}
-
-ControlState Touchscreen::Button::GetState() const
-{
-	return ButtonManager::GetButtonPressed(m_index);
-}
-std::string Touchscreen::Axis::GetName() const
-{
-	std::ostringstream ss;
-	ss << "Axis " << (int)m_index;
-	return ss.str();
-}
-
-ControlState Touchscreen::Axis::GetState() const
-{
-	return ButtonManager::GetAxisValue(m_index);
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
deleted file mode 100644
index e38c6a221a..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-#ifndef _CIFACE_ANDROID_H_
-#define _CIFACE_ANDROID_H_
-
-#include "../Device.h"
-#include "Android/ButtonManager.h"
-
-namespace ciface
-{
-namespace Android
-{
-
-void Init( std::vector<Core::Device*>& devices );
-class Touchscreen : public Core::Device
-{
-private:
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(ButtonManager::ButtonType index) : m_index(index) {}
-		ControlState GetState() const;
-	private:
-		const ButtonManager::ButtonType m_index;
-	};
-	class Axis : public Input
-	{
-	public:
-		std::string GetName() const;
-		Axis(ButtonManager::ButtonType index) : m_index(index) {}
-		ControlState GetState() const;
-	private:
-		const ButtonManager::ButtonType m_index;
-	};
-
-public:
-	bool UpdateInput() { return true; }
-	bool UpdateOutput() { return true; }
-
-	Touchscreen();
-	~Touchscreen() {}
-
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
deleted file mode 100644
index bc1e115c17..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-#include "ControllerInterface.h"
-
-#ifdef CIFACE_USE_XINPUT
-	#include "XInput/XInput.h"
-#endif
-#ifdef CIFACE_USE_DINPUT
-	#include "DInput/DInput.h"
-#endif
-#ifdef CIFACE_USE_XLIB
-	#include "Xlib/Xlib.h"
-	#ifdef CIFACE_USE_X11_XINPUT2
-		#include "Xlib/XInput2.h"
-	#endif
-#endif
-#ifdef CIFACE_USE_OSX
-	#include "OSX/OSX.h"
-#endif
-#ifdef CIFACE_USE_SDL
-	#include "SDL/SDL.h"
-#endif
-#ifdef CIFACE_USE_ANDROID
-	#include "Android/Android.h"
-#endif
-
-#include "Thread.h"
-
-using namespace ciface::ExpressionParser;
-
-namespace
-{
-const float INPUT_DETECT_THRESHOLD = 0.55f;
-}
-
-ControllerInterface g_controller_interface;
-
-//
-//		Init
-//
-// detect devices and inputs outputs / will make refresh function later
-//
-void ControllerInterface::Initialize()
-{
-	if (m_is_init)
-		return;
-
-#ifdef CIFACE_USE_DINPUT
-	ciface::DInput::Init(m_devices, (HWND)m_hwnd);
-#endif
-#ifdef CIFACE_USE_XINPUT
-	ciface::XInput::Init(m_devices);
-#endif
-#ifdef CIFACE_USE_XLIB
-	ciface::Xlib::Init(m_devices, m_hwnd);
-	#ifdef CIFACE_USE_X11_XINPUT2
-		ciface::XInput2::Init(m_devices, m_hwnd);
-	#endif
-#endif
-#ifdef CIFACE_USE_OSX
-	ciface::OSX::Init(m_devices, m_hwnd);
-#endif
-#ifdef CIFACE_USE_SDL
-	ciface::SDL::Init(m_devices);
-#endif
-#ifdef CIFACE_USE_ANDROID
-	ciface::Android::Init(m_devices);
-#endif
-
-	m_is_init = true;
-}
-
-//
-//		DeInit
-//
-// remove all devices/ call library cleanup functions
-//
-void ControllerInterface::Shutdown()
-{
-	if (false == m_is_init)
-		return;
-
-	std::vector<Device*>::const_iterator
-		d = m_devices.begin(),
-		de = m_devices.end();
-	for ( ;d != de; ++d )
-	{
-		std::vector<Device::Output*>::const_iterator
-			o = (*d)->Outputs().begin(),
-			oe = (*d)->Outputs().end();
-		// set outputs to ZERO before destroying device
-		for ( ;o!=oe; ++o)
-			(*o)->SetState(0);
-		// update output
-		(*d)->UpdateOutput();
-
-		//delete device
-		delete *d;
-	}
-
-	m_devices.clear();
-
-#ifdef CIFACE_USE_XINPUT
-	// nothing needed
-#endif
-#ifdef CIFACE_USE_DINPUT
-	// nothing needed
-#endif
-#ifdef CIFACE_USE_XLIB
-	// nothing needed
-#endif
-#ifdef CIFACE_USE_OSX
-	ciface::OSX::DeInit();
-#endif
-#ifdef CIFACE_USE_SDL
-	// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
-	SDL_Quit();
-#endif
-#ifdef CIFACE_USE_ANDROID
-	// nothing needed
-#endif
-
-	m_is_init = false;
-}
-
-//
-//		SetHwnd
-//
-// sets the hwnd used for some crap when initializing, use before calling Init
-//
-void ControllerInterface::SetHwnd( void* const hwnd )
-{
-	m_hwnd = hwnd;
-}
-
-//
-//		UpdateInput
-//
-// update input for all devices, return true if all devices returned successful
-//
-bool ControllerInterface::UpdateInput(const bool force)
-{
-	std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
-
-	if (force)
-		lk.lock();
-	else if (!lk.try_lock())
-			return false;
-
-	size_t ok_count = 0;
-
-	std::vector<Device*>::const_iterator
-		d = m_devices.begin(),
-		e = m_devices.end();
-	for ( ;d != e; ++d )
-	{
-		if ((*d)->UpdateInput())
-			++ok_count;
-		//else
-		// disabled. it might be causing problems
-			//(*d)->ClearInputState();
-	}
-
-	return (m_devices.size() == ok_count);
-}
-
-//
-//		UpdateOutput
-//
-// update output for all devices, return true if all devices returned successful
-//
-bool ControllerInterface::UpdateOutput(const bool force)
-{
-	std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
-
-	if (force)
-		lk.lock();
-	else if (!lk.try_lock())
-		return false;
-
-	size_t ok_count = 0;
-
-	for (auto d = m_devices.cbegin(); d != m_devices.cend(); ++d)
-	{
-		if ((*d)->UpdateOutput())
-			++ok_count;
-	}
-
-	return (m_devices.size() == ok_count);
-}
-
-//
-//		InputReference :: State
-//
-// get the state of an input reference
-// override function for ControlReference::State ...
-//
-ControlState ControllerInterface::InputReference::State( const ControlState ignore )
-{
-	if (parsed_expression)
-		return parsed_expression->GetValue() * range;
-	else
-		return 0.0f;
-}
-
-//
-//		OutputReference :: State
-//
-// set the state of all binded outputs
-// overrides ControlReference::State .. combined them so i could make the gui simple / inputs == same as outputs one list
-// i was lazy and it works so watever
-//
-ControlState ControllerInterface::OutputReference::State(const ControlState state)
-{
-	if (parsed_expression)
-		parsed_expression->SetValue(state);
-	return 0.0f;
-}
-
-//
-//		UpdateReference
-//
-// updates a controlreference's binded devices/controls
-// need to call this to re-parse a control reference's expression after changing it
-//
-void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
-	, const DeviceQualifier& default_device) const
-{
-	delete ref->parsed_expression;
-	ref->parsed_expression = NULL;
-
-	ControlFinder finder(*this, default_device, ref->is_input);
-	ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression);
-}
-
-//
-//		InputReference :: Detect
-//
-// wait for input on all binded devices
-// supports not detecting inputs that were held down at the time of Detect start,
-// which is useful for those crazy flightsticks that have certain buttons that are always held down
-// or some crazy axes or something
-// upon input, return pointer to detected Control
-// else return NULL
-//
-Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
-{
-	unsigned int time = 0;
-	std::vector<bool> states(device->Inputs().size());
-
-	if (device->Inputs().size() == 0)
-		return NULL;
-
-	// get starting state of all inputs, 
-	// so we can ignore those that were activated at time of Detect start
-	std::vector<Device::Input*>::const_iterator
-		i = device->Inputs().begin(),
-		e = device->Inputs().end();
-	for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
-		*state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD));
-
-	while (time < ms)
-	{
-		device->UpdateInput();
-		i = device->Inputs().begin();
-		for (std::vector<bool>::iterator state = states.begin(); i != e; ++i,++state)
-		{
-			// detected an input
-			if ((*i)->IsDetectable() && (*i)->GetState() > INPUT_DETECT_THRESHOLD)
-			{
-				// input was released at some point during Detect call
-				// return the detected input
-				if (false == *state)
-					return *i;
-			}
-			else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
-			{
-				*state = false;
-			}
-		}
-		Common::SleepCurrentThread(10); time += 10;
-	}
-
-	// no input was detected
-	return NULL;
-}
-
-//
-//		OutputReference :: Detect
-//
-// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI.
-// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy
-//
-// set all binded outputs to <range> power for x milliseconds return false
-//
-Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, Device* const device)
-{
-	// ignore device
-
-	// don't hang if we don't even have any controls mapped
-	if (BoundCount() > 0)
-	{
-		State(1);
-		unsigned int slept = 0;
-
-		// this loop is to make stuff like flashing keyboard LEDs work
-		while (ms > (slept += 10))
-		{
-			// TODO: improve this to update more than just the default device's output
-			device->UpdateOutput();
-			Common::SleepCurrentThread(10);
-		}
-		
-		State(0);
-		device->UpdateOutput();
-	}
-	return NULL;
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
deleted file mode 100644
index 00b4b2c07d..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef _DEVICEINTERFACE_H_
-#define _DEVICEINTERFACE_H_
-
-#include <vector>
-#include <string>
-#include <sstream>
-#include <map>
-#include <algorithm>
-
-#include "Common.h"
-#include "Thread.h"
-#include "ExpressionParser.h"
-#include "Device.h"
-
-// enable disable sources
-#ifdef _WIN32
-	#define CIFACE_USE_XINPUT
-	#define CIFACE_USE_DINPUT
-	#define CIFACE_USE_SDL
-#endif
-#if defined(HAVE_X11) && HAVE_X11
-	#define CIFACE_USE_XLIB
-	#define CIFACE_USE_SDL
-	#if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2
-		#define CIFACE_USE_X11_XINPUT2
-	#endif
-#endif
-#if defined(__APPLE__)
-	#define CIFACE_USE_OSX
-#endif
-#ifdef ANDROID
-	#define CIFACE_USE_ANDROID
-#endif
-
-using namespace ciface::Core;
-
-//
-//		ControllerInterface
-//
-// some crazy shit I made to control different device inputs and outputs
-// from lots of different sources, hopefully more easily
-//
-class ControllerInterface : public DeviceContainer
-{
-public:
-
-	//
-	//		ControlReference
-	//
-	// these are what you create to actually use the inputs, InputReference or OutputReference
-	//
-	// after being bound to devices and controls with ControllerInterface::UpdateReference,
-	//		each one can link to multiple devices and controls
-	//		when you change a ControlReference's expression,
-	//		you must use ControllerInterface::UpdateReference on it to rebind controls
-	//
-	class ControlReference
-	{
-		friend class ControllerInterface;
-	public:
-		virtual ControlState State(const ControlState state = 0) = 0;
-		virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0;
-
-		ControlState range;
-		std::string			expression;
-		const bool			is_input;
-		ciface::ExpressionParser::ExpressionParseStatus parse_error;
-
-		virtual ~ControlReference() {
-			delete parsed_expression;
-		}
-
-		int BoundCount() {
-			if (parsed_expression)
-				return parsed_expression->num_controls;
-			else
-				return 0;
-		}
-
-	protected:
-		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {}
-		ciface::ExpressionParser::Expression *parsed_expression;
-	};
-
-	//
-	//		InputReference
-	//
-	// control reference for inputs
-	//
-	class InputReference : public ControlReference
-	{
-	public:
-		InputReference() : ControlReference(true) {}
-		ControlState State(const ControlState state);
-		Device::Control* Detect(const unsigned int ms, Device* const device);
-	};
-
-	//
-	//		OutputReference
-	//
-	// control reference for outputs
-	//
-	class OutputReference : public ControlReference
-	{
-	public:
-		OutputReference() : ControlReference(false) {}
-		ControlState State(const ControlState state);
-		Device::Control* Detect(const unsigned int ms, Device* const device);
-	};
-
-	ControllerInterface() : m_is_init(false), m_hwnd(NULL) {}
-	
-	void SetHwnd(void* const hwnd);
-	void Initialize();
-	void Shutdown();
-	bool IsInit() const { return m_is_init; }
-
-	void UpdateReference(ControlReference* control, const DeviceQualifier& default_device) const;
-	bool UpdateInput(const bool force = false);
-	bool UpdateOutput(const bool force = false);
-
-	std::recursive_mutex update_lock;
-
-private:
-	bool					m_is_init;
-	void*					m_hwnd;
-};
-
-extern ControllerInterface g_controller_interface;
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp
deleted file mode 100644
index 6b7b492ea9..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#include "DInput.h"
-
-#include "StringUtil.h"
-
-#include "DInputJoystick.h"
-#include "DInputKeyboardMouse.h"
-
-#pragma comment(lib, "Dinput8.lib")
-#pragma comment(lib, "dxguid.lib")
-
-namespace ciface
-{
-namespace DInput
-{
-
-//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef)
-//{
-//	((std::list<DIEFFECTINFO>*)pvRef)->push_back(*pdei);
-//	return DIENUM_CONTINUE;
-//}
-
-BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef)
-{
-	((std::list<DIDEVICEOBJECTINSTANCE>*)pvRef)->push_back(*lpddoi);
-	return DIENUM_CONTINUE;
-}
-
-BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
-{
-	((std::list<DIDEVICEINSTANCE>*)pvRef)->push_back(*lpddi);
-	return DIENUM_CONTINUE;
-}
-
-std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device)
-{
-	DIPROPSTRING str = {};
-	str.diph.dwSize = sizeof(str);
-	str.diph.dwHeaderSize = sizeof(str.diph);
-	str.diph.dwHow = DIPH_DEVICE;
-
-	std::string result;
-	if (SUCCEEDED(device->GetProperty(DIPROP_PRODUCTNAME, &str.diph)))
-	{
-		result = StripSpaces(UTF16ToUTF8(str.wsz));
-	}
-
-	return result;
-}
-
-void Init(std::vector<Core::Device*>& devices, HWND hwnd)
-{
-	IDirectInput8* idi8;
-	if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL)))
-		return;
-
-	InitKeyboardMouse(idi8, devices, hwnd);
-	InitJoystick(idi8, devices, hwnd);
-
-	idi8->Release();
-
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h
deleted file mode 100644
index 86452c23ab..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _CIFACE_DINPUT_H_
-#define _CIFACE_DINPUT_H_
-
-#include "../Device.h"
-
-#define DINPUT_SOURCE_NAME "DInput"
-
-#define DIRECTINPUT_VERSION 0x0800
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#include <dinput.h>
-
-#include <list>
-
-namespace ciface
-{
-namespace DInput
-{
-
-//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef);
-BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef);
-BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
-std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
-
-void Init(std::vector<Core::Device*>& devices, HWND hwnd);
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
deleted file mode 100644
index fa33595ee8..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ /dev/null
@@ -1,600 +0,0 @@
-
-#include "DInputJoystick.h"
-#include "DInput.h"
-
-#include <map>
-#include <sstream>
-#include <algorithm>
-
-#include <wbemidl.h>
-#include <oleauto.h>
-
-namespace ciface
-{
-namespace DInput
-{
-
-// template instantiation
-template class Joystick::Force<DICONSTANTFORCE>;
-template class Joystick::Force<DIRAMPFORCE>;
-template class Joystick::Force<DIPERIODIC>;
-
-static const struct
-{
-	GUID guid;
-	const char* name;
-} force_type_names[] =
-{
-	{GUID_ConstantForce, "Constant"},	// DICONSTANTFORCE
-	{GUID_RampForce, "Ramp"},			// DIRAMPFORCE
-	{GUID_Square, "Square"},			// DIPERIODIC ...
-	{GUID_Sine, "Sine"},
-	{GUID_Triangle, "Triangle"},
-	{GUID_SawtoothUp, "Sawtooth Up"},
-	{GUID_SawtoothDown, "Sawtooth Down"},
-	//{GUID_Spring, "Spring"},			// DICUSTOMFORCE ... < I think
-	//{GUID_Damper, "Damper"},
-	//{GUID_Inertia, "Inertia"},
-	//{GUID_Friction, "Friction"},
-};
-
-#define DATA_BUFFER_SIZE	32
-
-//-----------------------------------------------------------------------------
-// Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector,
-// faster than checking all the devices for each DirectInput device, like MSDN says to do
-//-----------------------------------------------------------------------------
-void GetXInputGUIDS( std::vector<DWORD>& guids )
-{
-
-#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
-
-	IWbemLocator*			pIWbemLocator  = NULL;
-	IEnumWbemClassObject*   pEnumDevices   = NULL;
-	IWbemClassObject*		pDevices[20]   = {0};
-	IWbemServices*			pIWbemServices = NULL;
-	BSTR					bstrNamespace  = NULL;
-	BSTR					bstrDeviceID   = NULL;
-	BSTR					bstrClassName  = NULL;
-	DWORD					uReturned	   = 0;
-	VARIANT					var;
-	HRESULT					hr;
-
-	// CoInit if needed
-	hr = CoInitialize(NULL);
-	bool bCleanupCOM = SUCCEEDED(hr);
-
-	// Create WMI
-	hr = CoCreateInstance( __uuidof(WbemLocator),
-						   NULL,
-						   CLSCTX_INPROC_SERVER,
-						   __uuidof(IWbemLocator),
-						   (LPVOID*) &pIWbemLocator);
-	if( FAILED(hr) || pIWbemLocator == NULL )
-		goto LCleanup;
-
-	bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;
-	bstrClassName = SysAllocString( L"Win32_PNPEntity" );   if( bstrClassName == NULL ) goto LCleanup;
-	bstrDeviceID  = SysAllocString( L"DeviceID" );			if( bstrDeviceID == NULL )  goto LCleanup;
-	
-	// Connect to WMI 
-	hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices );
-	if( FAILED(hr) || pIWbemServices == NULL )
-		goto LCleanup;
-
-	// Switch security level to IMPERSONATE. 
-	CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, 
-					   RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );
-
-	hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); 
-	if( FAILED(hr) || pEnumDevices == NULL )
-		goto LCleanup;
-
-	// Loop over all devices
-	while( true )
-	{
-		// Get 20 at a time
-		hr = pEnumDevices->Next( 10000, 20, pDevices, &uReturned );
-		if( FAILED(hr) || uReturned == 0 )
-			break;
-
-		for( UINT iDevice=0; iDevice<uReturned; ++iDevice )
-		{
-			// For each device, get its device ID
-			hr = pDevices[iDevice]->Get( bstrDeviceID, 0L, &var, NULL, NULL );
-			if( SUCCEEDED( hr ) && var.vt == VT_BSTR && var.bstrVal != NULL )
-			{
-				// Check if the device ID contains "IG_".  If it does, then it's an XInput device
-					// This information can not be found from DirectInput 
-				if( wcsstr( var.bstrVal, L"IG_" ) )
-				{
-					// If it does, then get the VID/PID from var.bstrVal
-					DWORD dwPid = 0, dwVid = 0;
-					WCHAR* strVid = wcsstr( var.bstrVal, L"VID_" );
-					if( strVid && swscanf( strVid, L"VID_%4X", &dwVid ) != 1 )
-						dwVid = 0;
-					WCHAR* strPid = wcsstr( var.bstrVal, L"PID_" );
-					if( strPid && swscanf( strPid, L"PID_%4X", &dwPid ) != 1 )
-						dwPid = 0;
-
-					// Compare the VID/PID to the DInput device
-					DWORD dwVidPid = MAKELONG( dwVid, dwPid );
-					guids.push_back( dwVidPid );
-					//bIsXinputDevice = true;
-				}
-			} 
-			SAFE_RELEASE( pDevices[iDevice] );
-		}
-	}
-
-LCleanup:
-	if(bstrNamespace)
-		SysFreeString(bstrNamespace);
-	if(bstrDeviceID)
-		SysFreeString(bstrDeviceID);
-	if(bstrClassName)
-		SysFreeString(bstrClassName);
-	for( UINT iDevice=0; iDevice<20; iDevice++ )
-		SAFE_RELEASE( pDevices[iDevice] );
-	SAFE_RELEASE( pEnumDevices );
-	SAFE_RELEASE( pIWbemLocator );
-	SAFE_RELEASE( pIWbemServices );
-
-	if( bCleanupCOM )
-		CoUninitialize();
-}
-
-void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd)
-{
-	std::list<DIDEVICEINSTANCE> joysticks;
-	idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_ATTACHEDONLY );
-
-	// this is used to number the joysticks
-	// multiple joysticks with the same name shall get unique ids starting at 0
-	std::map< std::basic_string<TCHAR>, int>	name_counts;
-
-	std::vector<DWORD> xinput_guids;
-	GetXInputGUIDS( xinput_guids );
-
-	std::list<DIDEVICEINSTANCE>::iterator
-		i = joysticks.begin(),
-		e = joysticks.end();
-	for ( ; i!=e; ++i )
-	{
-		// skip XInput Devices
-		if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() )
-			continue;
-
-		LPDIRECTINPUTDEVICE8 js_device;
-		if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL)))
-		{
-			if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick)))
-			{
-				if (FAILED(js_device->SetCooperativeLevel(GetAncestor(hwnd, GA_ROOT), DISCL_BACKGROUND | DISCL_EXCLUSIVE)))
-				{
-					//PanicAlert("SetCooperativeLevel(DISCL_EXCLUSIVE) failed!");
-					// fall back to non-exclusive mode, with no rumble
-					if (FAILED(js_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
-					{
-						//PanicAlert("SetCooperativeLevel failed!");
-						js_device->Release();
-						continue;
-					}
-				}
-
-				Joystick* js = new Joystick(/*&*i, */js_device, name_counts[i->tszInstanceName]++);
-				// only add if it has some inputs/outputs
-				if (js->Inputs().size() || js->Outputs().size())
-					devices.push_back(js);
-				else
-					delete js;
-			}
-			else
-			{
-				//PanicAlert("SetDataFormat failed!");
-				js_device->Release();
-			}
-		}
-	}
-}
-
-Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVICE8 device, const unsigned int index )
-	: m_device(device)
-	, m_index(index)
-	//, m_name(TStringToString(lpddi->tszInstanceName))
-{
-	// seems this needs to be done before GetCapabilities
-	// polled or buffered data
-	DIPROPDWORD dipdw;
-	dipdw.diph.dwSize = sizeof(DIPROPDWORD);
-	dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-	dipdw.diph.dwObj = 0;
-	dipdw.diph.dwHow = DIPH_DEVICE;
-	dipdw.dwData = DATA_BUFFER_SIZE;
-	// set the buffer size,
-	// if we can't set the property, we can't use buffered data
-	m_buffered = SUCCEEDED(m_device->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph));
-
-	// seems this needs to be done after SetProperty of buffer size
-	m_device->Acquire();
-
-	// get joystick caps
-	DIDEVCAPS js_caps;
-	js_caps.dwSize = sizeof(js_caps);
-	if (FAILED(m_device->GetCapabilities(&js_caps)))
-		return;
-
-	// max of 32 buttons and 4 hats / the limit of the data format I am using
-	js_caps.dwButtons = std::min((DWORD)32, js_caps.dwButtons);
-	js_caps.dwPOVs = std::min((DWORD)4, js_caps.dwPOVs);
-
-	//m_must_poll = (js_caps.dwFlags & DIDC_POLLEDDATAFORMAT) != 0;
-
-	// buttons
-	for (u8 i = 0; i != js_caps.dwButtons; ++i)
-		AddInput(new Button(i, m_state_in.rgbButtons[i]));
-
-	// hats
-	for (u8 i = 0; i != js_caps.dwPOVs; ++i)
-	{
-		// each hat gets 4 input instances associated with it, (up down left right)
-		for (u8 d = 0; d != 4; ++d)
-			AddInput(new Hat(i, m_state_in.rgdwPOV[i], d));
-	}
-
-	// get up to 6 axes and 2 sliders
-	DIPROPRANGE range;
-	range.diph.dwSize = sizeof(range);
-	range.diph.dwHeaderSize = sizeof(range.diph);
-	range.diph.dwHow = DIPH_BYOFFSET;
-	// screw EnumObjects, just go through all the axis offsets and try to GetProperty
-	// this should be more foolproof, less code, and probably faster
-	for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset)
-	{
-		range.diph.dwObj = offset * sizeof(LONG);
-		// try to set some nice power of 2 values (128) to match the GameCube controls
-		range.lMin = -(1 << 7);
-		range.lMax = (1 << 7);
-		m_device->SetProperty(DIPROP_RANGE, &range.diph);
-		// but I guess not all devices support setting range
-		// so I getproperty right afterward incase it didn't set.
-		// This also checks that the axis is present
-		if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph)))
-		{
-			const LONG base = (range.lMin + range.lMax) / 2;
-			const LONG& ax = (&m_state_in.lX)[offset];
-
-			// each axis gets a negative and a positive input instance associated with it
-			AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base),
-				new Axis(offset, ax, base, range.lMax-base));
-		}
-	}
-
-	// TODO: check for DIDC_FORCEFEEDBACK in devcaps?
-
-	// get supported ff effects
-	std::list<DIDEVICEOBJECTINSTANCE> objects;
-	m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS);
-	// got some ff axes or something
-	if ( objects.size() )
-	{
-		// temporary
-		DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y};
-		LONG rglDirection[2] = {-200, 0};
-
-		DIEFFECT eff;
-		ZeroMemory(&eff, sizeof(eff));
-		eff.dwSize = sizeof(DIEFFECT);
-		eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
-		eff.dwDuration = INFINITE;	// (4 * DI_SECONDS)
-		eff.dwSamplePeriod = 0;
-		eff.dwGain = DI_FFNOMINALMAX;
-		eff.dwTriggerButton = DIEB_NOTRIGGER;
-		eff.dwTriggerRepeatInterval = 0;
-		eff.cAxes = std::min((DWORD)1, (DWORD)objects.size());
-		eff.rgdwAxes = rgdwAxes;
-		eff.rglDirection = rglDirection;
-
-		// DIPERIODIC is the largest, so we'll use that
-		DIPERIODIC f;
-		eff.lpvTypeSpecificParams = &f;
-		ZeroMemory(&f, sizeof(f));
-
-		// doesn't seem needed
-		//DIENVELOPE env;
-		//eff.lpEnvelope = &env;
-		//ZeroMemory(&env, sizeof(env));
-		//env.dwSize = sizeof(env);
-
-		for (unsigned int f = 0; f < sizeof(force_type_names)/sizeof(*force_type_names); ++f)
-		{
-			// ugly if ladder
-			if (0 == f)
-			{
-				DICONSTANTFORCE  diCF = {-10000};
-				diCF.lMagnitude = DI_FFNOMINALMAX;
-				eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE);
-				eff.lpvTypeSpecificParams = &diCF;
-			}
-			else if (1 == f)
-			{
-				eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE);
-			}
-			else
-			{
-				eff.cbTypeSpecificParams = sizeof(DIPERIODIC);
-			}
-			
-			LPDIRECTINPUTEFFECT pEffect;
-			if (SUCCEEDED(m_device->CreateEffect(force_type_names[f].guid, &eff, &pEffect, NULL)))
-			{
-				m_state_out.push_back(EffectState(pEffect));
-
-				// ugly if ladder again :/
-				if (0 == f)
-					AddOutput(new ForceConstant(f, m_state_out.back()));
-				else if (1 == f)
-					AddOutput(new ForceRamp(f, m_state_out.back()));
-				else
-					AddOutput(new ForcePeriodic(f, m_state_out.back()));
-			}
-		}
-	}
-
-	// disable autocentering
-	if (Outputs().size())
-	{
-		DIPROPDWORD dipdw;
-		dipdw.diph.dwSize = sizeof( DIPROPDWORD );
-		dipdw.diph.dwHeaderSize = sizeof( DIPROPHEADER );
-		dipdw.diph.dwObj = 0;
-		dipdw.diph.dwHow = DIPH_DEVICE;
-		dipdw.dwData = DIPROPAUTOCENTER_OFF;
-		m_device->SetProperty( DIPROP_AUTOCENTER, &dipdw.diph );
-	}
-
-	ClearInputState();
-}
-
-Joystick::~Joystick()
-{
-	// release the ff effect iface's
-	std::list<EffectState>::iterator
-		i = m_state_out.begin(),
-		e = m_state_out.end();
-	for (; i!=e; ++i)
-	{
-		i->iface->Stop();
-		i->iface->Unload();
-		i->iface->Release();
-	}
-
-	m_device->Unacquire();
-	m_device->Release();
-}
-
-void Joystick::ClearInputState()
-{
-	ZeroMemory(&m_state_in, sizeof(m_state_in));
-	// set hats to center
-	memset( m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV) );
-}
-
-std::string Joystick::GetName() const
-{
-	return GetDeviceName(m_device);
-}
-
-int Joystick::GetId() const
-{
-	return m_index;
-}
-
-std::string Joystick::GetSource() const
-{
-	return DINPUT_SOURCE_NAME;
-}
-
-// update IO
-
-bool Joystick::UpdateInput()
-{
-	HRESULT hr = 0;
-
-	// just always poll,
-	// MSDN says if this isn't needed it doesn't do anything
-	m_device->Poll();
-
-	if (m_buffered)
-	{
-		DIDEVICEOBJECTDATA evtbuf[DATA_BUFFER_SIZE];
-		DWORD numevents = DATA_BUFFER_SIZE;
-		hr = m_device->GetDeviceData(sizeof(*evtbuf), evtbuf, &numevents, 0);
-
-		if (SUCCEEDED(hr))
-		{
-			for (LPDIDEVICEOBJECTDATA evt = evtbuf; evt != (evtbuf + numevents); ++evt)
-			{
-				// all the buttons are at the end of the data format
-				// they are bytes rather than longs
-				if (evt->dwOfs < DIJOFS_BUTTON(0))
-					*(DWORD*)(((BYTE*)&m_state_in) + evt->dwOfs) = evt->dwData;
-				else
-					((BYTE*)&m_state_in)[evt->dwOfs] = (BYTE)evt->dwData;
-			}
-
-			// seems like this needs to be done maybe...
-			if (DI_BUFFEROVERFLOW == hr)
-				hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
-		}
-	}
-	else
-	{
-		hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
-	}
-
-	// try reacquire if input lost
-	if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
-		hr = m_device->Acquire();
-
-	return SUCCEEDED(hr);
-}
-
-bool Joystick::UpdateOutput()
-{
-	size_t ok_count = 0;
-
-	DIEFFECT eff;
-	ZeroMemory(&eff, sizeof(eff));
-	eff.dwSize = sizeof(DIEFFECT);
-	eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
-
-	std::list<EffectState>::iterator
-		i = m_state_out.begin(),
-		e = m_state_out.end();
-	for (; i!=e; ++i)
-	{
-		if (i->params)
-		{
-			if (i->size)
-			{
-				eff.cbTypeSpecificParams = i->size;
-				eff.lpvTypeSpecificParams = i->params;
-				// set params and start effect
-				ok_count += SUCCEEDED(i->iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START));
-			}
-			else
-			{
-				ok_count += SUCCEEDED(i->iface->Stop());
-			}
-
-			i->params = NULL;
-		}
-		else
-		{
-			++ok_count;
-		}
-	}
-
-	return (m_state_out.size() == ok_count);
-}
-
-// get name
-
-std::string Joystick::Button::GetName() const
-{
-	std::ostringstream ss;
-	ss << "Button " << (int)m_index;
-	return ss.str();
-}
-
-std::string Joystick::Axis::GetName() const
-{
-	std::ostringstream ss;
-	// axis
-	if (m_index < 6)
-	{
-		ss << "Axis " << (char)('X' + (m_index % 3));
-		if (m_index > 2)
-			ss << 'r';
-	}
-	// slider
-	else
-	{
-		ss << "Slider " << (int)(m_index - 6);
-	}
-
-	ss << (m_range < 0 ? '-' : '+');
-	return ss.str();
-}
-
-std::string Joystick::Hat::GetName() const
-{
-	static char tmpstr[] = "Hat . .";
-	tmpstr[4] = (char)('0' + m_index);
-	tmpstr[6] = "NESW"[m_direction];
-	return tmpstr;
-}
-
-template <typename P>
-std::string Joystick::Force<P>::GetName() const
-{
-	return force_type_names[m_index].name;
-}
-
-// get / set state
-
-ControlState Joystick::Axis::GetState() const
-{
-	return std::max(0.0f, ControlState(m_axis - m_base) / m_range);
-}
-
-ControlState Joystick::Button::GetState() const
-{
-	return ControlState(m_button > 0);
-}
-
-ControlState Joystick::Hat::GetState() const
-{
-	// can this func be simplified ?
-	// hat centered code from MSDN
-	if (0xFFFF == LOWORD(m_hat))
-		return 0;
-	return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
-}
-
-void Joystick::ForceConstant::SetState(const ControlState state)
-{
-	const LONG new_val = LONG(10000 * state);
-
-	LONG &val = params.lMagnitude;
-	if (val != new_val)
-	{
-		val = new_val;
-		m_state.params = &params;	// tells UpdateOutput the state has changed
-
-		 // tells UpdateOutput to either start or stop the force
-		m_state.size = new_val ? sizeof(params) : 0;
-	}
-}
-
-void Joystick::ForceRamp::SetState(const ControlState state)
-{
-	const LONG new_val = LONG(10000 * state);
-
-	if (params.lStart != new_val)
-	{
-		params.lStart = params.lEnd = new_val;
-		m_state.params = &params;	// tells UpdateOutput the state has changed
-
-		 // tells UpdateOutput to either start or stop the force
-		m_state.size = new_val ? sizeof(params) : 0;
-	}
-}
-
-void Joystick::ForcePeriodic::SetState(const ControlState state)
-{
-	const LONG new_val = LONG(10000 * state);
-
-	DWORD &val = params.dwMagnitude;
-	if (val != new_val)
-	{
-		val = new_val;
-		//params.dwPeriod = 0;//DWORD(0.05 * DI_SECONDS);	// zero is working fine for me
-
-		m_state.params = &params;	// tells UpdateOutput the state has changed
-
-		 // tells UpdateOutput to either start or stop the force
-		m_state.size = new_val ? sizeof(params) : 0;
-	}
-}
-
-template <typename P>
-Joystick::Force<P>::Force(u8 index, EffectState& state)
-	: m_index(index), m_state(state)
-{
-	ZeroMemory(&params, sizeof(params));
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h
deleted file mode 100644
index ad383bd764..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef _CIFACE_DINPUT_JOYSTICK_H_
-#define _CIFACE_DINPUT_JOYSTICK_H_
-
-#include "../Device.h"
-
-#define DIRECTINPUT_VERSION 0x0800
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#include <dinput.h>
-
-#include <list>
-
-namespace ciface
-{
-namespace DInput
-{
-
-void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd);
-
-class Joystick : public Core::Device
-{
-private:
-	struct EffectState
-	{
-		EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {}
-
-		LPDIRECTINPUTEFFECT		iface;
-		void*	params;	// null when force hasn't changed
-		u8		size;	// zero when force should stop
-	};
-
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(u8 index, const BYTE& button) : m_index(index), m_button(button) {}
-		ControlState GetState() const;
-	private:
-		const BYTE& m_button;
-		const u8 m_index;
-	};
-
-	class Axis : public Input
-	{
-	public:
-		std::string GetName() const;
-		Axis(u8 index, const LONG& axis, LONG base, LONG range) : m_index(index), m_axis(axis), m_base(base), m_range(range) {}
-		ControlState GetState() const;
-	private:
-		const LONG& m_axis;
-		const LONG m_base, m_range;
-		const u8 m_index;
-	};
-
-	class Hat : public Input
-	{
-	public:
-		std::string GetName() const;
-		Hat(u8 index, const DWORD& hat, u8 direction) : m_index(index), m_hat(hat), m_direction(direction) {}
-		ControlState GetState() const;
-	private:
-		const DWORD& m_hat;
-		const u8 m_index, m_direction;
-	};
-
-	template <typename P>
-	class Force : public Output
-	{
-	public:
-		std::string GetName() const;
-		Force(u8 index, EffectState& state);
-		void SetState(ControlState state);
-	private:
-		EffectState& m_state;
-		P params;
-		const u8 m_index;
-	};
-	typedef Force<DICONSTANTFORCE>	ForceConstant;
-	typedef Force<DIRAMPFORCE>		ForceRamp;
-	typedef Force<DIPERIODIC>		ForcePeriodic;
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	void ClearInputState();
-
-	Joystick(const LPDIRECTINPUTDEVICE8 device, const unsigned int index);
-	~Joystick();
-	
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
-
-private:
-	const LPDIRECTINPUTDEVICE8		m_device;
-	const unsigned int				m_index;
-
-	DIJOYSTATE					m_state_in;
-	std::list<EffectState>		m_state_out;
-
-	bool						m_buffered;
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
deleted file mode 100644
index 850ff27281..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-
-#include "DInputKeyboardMouse.h"
-#include "DInput.h"
-
-	// (lower would be more sensitive) user can lower sensitivity by setting range
-	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
-	// and user can lower it much farther than they would want to with the range
-#define MOUSE_AXIS_SENSITIVITY		8
-
-	// if input hasn't been received for this many ms, mouse input will be skipped
-	// otherwise it is just some crazy value
-#define DROP_INPUT_TIME				250
-
-namespace ciface
-{
-namespace DInput
-{
-
-static const struct
-{
-	const BYTE			code;
-	const char* const	name;
-} named_keys[] =
-{
-#include "NamedKeys.h"
-};
-
-static const struct
-{
-	const BYTE			code;
-	const char* const	name;
-} named_lights[] =
-{
-	{ VK_NUMLOCK, "NUM LOCK" },
-	{ VK_CAPITAL, "CAPS LOCK" },
-	{ VK_SCROLL, "SCROLL LOCK" }
-};
-
-// lil silly
-static HWND hwnd;
-
-void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd)
-{
-	hwnd = _hwnd;
-
-	// mouse and keyboard are a combined device, to allow shift+click and stuff
-	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
-	// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
-
-	LPDIRECTINPUTDEVICE8 kb_device = NULL;
-	LPDIRECTINPUTDEVICE8 mo_device = NULL;
-
-	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL)))
-	{
-		if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
-		{
-			if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
-			{
-				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
-				{
-					if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
-					{
-						if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
-						{
-							devices.push_back(new KeyboardMouse(kb_device, mo_device));
-							return;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if (kb_device)
-		kb_device->Release();
-	if (mo_device)
-		mo_device->Release();
-}
-
-KeyboardMouse::~KeyboardMouse()
-{
-	// kb
-	m_kb_device->Unacquire();
-	m_kb_device->Release();
-	// mouse
-	m_mo_device->Unacquire();
-	m_mo_device->Release();
-}
-
-KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device)
-	: m_kb_device(kb_device)
-	, m_mo_device(mo_device)
-{
-	m_kb_device->Acquire();
-	m_mo_device->Acquire();
-
-	m_last_update = GetTickCount();
-
-	ZeroMemory(&m_state_in, sizeof(m_state_in));
-	ZeroMemory(m_state_out, sizeof(m_state_out));
-	ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
-
-	// KEYBOARD
-	// add keys
-	for (u8 i = 0; i < sizeof(named_keys)/sizeof(*named_keys); ++i)
-		AddInput(new Key(i, m_state_in.keyboard[named_keys[i].code]));
-	// add lights
-	for (u8 i = 0; i < sizeof(named_lights)/sizeof(*named_lights); ++i)
-		AddOutput(new Light(i));
-
-	// MOUSE
-	// get caps
-	DIDEVCAPS mouse_caps;
-	ZeroMemory( &mouse_caps, sizeof(mouse_caps) );
-	mouse_caps.dwSize = sizeof(mouse_caps);
-	m_mo_device->GetCapabilities(&mouse_caps);
-	// mouse buttons
-	for (u8 i = 0; i < mouse_caps.dwButtons; ++i)
-		AddInput(new Button(i, m_state_in.mouse.rgbButtons[i]));
-	// mouse axes
-	for (unsigned int i = 0; i < mouse_caps.dwAxes; ++i)
-	{
-		const LONG& ax = (&m_state_in.mouse.lX)[i];
-
-		// each axis gets a negative and a positive input instance associated with it
-		AddInput(new Axis(i, ax, (2==i) ? -1 : -MOUSE_AXIS_SENSITIVITY));
-		AddInput(new Axis(i, ax, -(2==i) ? 1 : MOUSE_AXIS_SENSITIVITY));
-	}
-	// cursor, with a hax for-loop
-	for (unsigned int i=0; i<4; ++i)
-		AddInput(new Cursor(!!(i&2), (&m_state_in.cursor.x)[i/2], !!(i&1)));
-}
-
-void GetMousePos(float* const x, float* const y)
-{
-	unsigned int win_width = 2, win_height = 2;
-	POINT point = { 1, 1 };
-	GetCursorPos(&point);
-	// Get the cursor position relative to the upper left corner of the rendering window
-	ScreenToClient(hwnd, &point);
-
-	// Get the size of the rendering window. (In my case Rect.top and Rect.left was zero.)
-	RECT rect;
-	GetClientRect(hwnd, &rect);
-	// Width and height is the size of the rendering window
-	win_width = rect.right - rect.left;
-	win_height = rect.bottom - rect.top;
-
-	// Return the mouse position as a range from -1 to 1
-	*x = (float)point.x / (float)win_width * 2 - 1;
-	*y = (float)point.y / (float)win_height * 2 - 1;
-}
-
-bool KeyboardMouse::UpdateInput()
-{
-	DIMOUSESTATE2 tmp_mouse;
-
-	// if mouse position hasn't been updated in a short while, skip a dev state
-	DWORD cur_time = GetTickCount();
-	if (cur_time - m_last_update > DROP_INPUT_TIME)
-	{
-		// set axes to zero
-		ZeroMemory(&m_state_in.mouse, sizeof(m_state_in.mouse));
-		// skip this input state
-		m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
-	}
-
-	m_last_update = cur_time;
-
-	HRESULT kb_hr = m_kb_device->GetDeviceState(sizeof(m_state_in.keyboard), &m_state_in.keyboard);
-	HRESULT mo_hr = m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
-
-	if (DIERR_INPUTLOST == kb_hr || DIERR_NOTACQUIRED == kb_hr)
-		m_kb_device->Acquire();
-
-	if (DIERR_INPUTLOST == mo_hr || DIERR_NOTACQUIRED == mo_hr)
-		m_mo_device->Acquire();
-
-	if (SUCCEEDED(kb_hr) && SUCCEEDED(mo_hr))
-	{
-		// need to smooth out the axes, otherwise it doesn't work for shit
-		for (unsigned int i = 0; i < 3; ++i)
-			((&m_state_in.mouse.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
-
-		// copy over the buttons
-		memcpy(m_state_in.mouse.rgbButtons, tmp_mouse.rgbButtons, sizeof(m_state_in.mouse.rgbButtons));
-
-		// update mouse cursor
-		GetMousePos(&m_state_in.cursor.x, &m_state_in.cursor.y);
-
-		return true;
-	}
-
-	return false;
-}
-
-bool KeyboardMouse::UpdateOutput()
-{
-	class KInput : public INPUT
-	{
-	public:
-		KInput( const unsigned char key, const bool up = false )
-		{
-			memset( this, 0, sizeof(*this) );
-			type = INPUT_KEYBOARD;
-			ki.wVk = key;
-
-			if (up)
-				ki.dwFlags = KEYEVENTF_KEYUP;
-		}
-	};
-
-	std::vector< KInput > kbinputs;
-	for (unsigned int i = 0; i < sizeof(m_state_out)/sizeof(*m_state_out); ++i)
-	{
-		bool want_on = false;
-		if (m_state_out[i])
-			want_on = m_state_out[i] > GetTickCount() % 255 ;	// light should flash when output is 0.5
-
-		// lights are set to their original state when output is zero
-		if (want_on ^ m_current_state_out[i])
-		{
-			kbinputs.push_back(KInput(named_lights[i].code));		// press
-			kbinputs.push_back(KInput(named_lights[i].code, true)); // release
-
-			m_current_state_out[i] ^= 1;
-		}
-	}
-
-	if (kbinputs.size())
-		return ( kbinputs.size() == SendInput( (UINT)kbinputs.size(), &kbinputs[0], sizeof( kbinputs[0] ) ) );
-	else
-		return true;
-}
-
-std::string KeyboardMouse::GetName() const
-{
-	return "Keyboard Mouse";
-}
-
-int KeyboardMouse::GetId() const
-{
-	// should this be -1, idk
-	return 0;
-}
-
-std::string KeyboardMouse::GetSource() const
-{
-	return DINPUT_SOURCE_NAME;
-}
-
-// names
-std::string KeyboardMouse::Key::GetName() const
-{
-	return named_keys[m_index].name;
-}
-
-std::string KeyboardMouse::Button::GetName() const
-{
-	return std::string("Click ") + char('0' + m_index);
-}
-
-std::string KeyboardMouse::Axis::GetName() const
-{
-	static char tmpstr[] = "Axis ..";
-	tmpstr[5] = (char)('X' + m_index);
-	tmpstr[6] = (m_range<0 ? '-' : '+');
-	return tmpstr;
-}
-
-std::string KeyboardMouse::Cursor::GetName() const
-{
-	static char tmpstr[] = "Cursor ..";
-	tmpstr[7] = (char)('X' + m_index);
-	tmpstr[8] = (m_positive ? '+' : '-');
-	return tmpstr;
-}
-
-std::string KeyboardMouse::Light::GetName() const
-{
-	return named_lights[m_index].name;
-}
-
-// get/set state
-ControlState KeyboardMouse::Key::GetState() const
-{
-	return (m_key != 0);
-}
-
-ControlState KeyboardMouse::Button::GetState() const
-{
-	return (m_button != 0);
-}
-
-ControlState KeyboardMouse::Axis::GetState() const
-{
-	return std::max(0.0f, ControlState(m_axis) / m_range);
-}
-
-ControlState KeyboardMouse::Cursor::GetState() const
-{
-	return std::max(0.0f, ControlState(m_axis) / (m_positive ? 1.0f : -1.0f));
-}
-
-void KeyboardMouse::Light::SetState(const ControlState state)
-{
-	//state_out[m_index] = (unsigned char)(state * 255);
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h
deleted file mode 100644
index 73398ca1b1..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _CIFACE_DINPUT_KBM_H_
-#define _CIFACE_DINPUT_KBM_H_
-
-#include "../Device.h"
-
-#define DIRECTINPUT_VERSION 0x0800
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
-#include <Windows.h>
-#include <dinput.h>
-
-namespace ciface
-{
-namespace DInput
-{
-
-void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd);
-
-class KeyboardMouse : public Core::Device
-{
-private:
-	struct State
-	{
-		BYTE			keyboard[256];
-		DIMOUSESTATE2	mouse;
-		struct
-		{
-			float x, y;
-		} cursor;
-	};
-
-	class Key : public Input
-	{
-	public:
-		std::string GetName() const;
-		Key(u8 index, const BYTE& key) : m_index(index), m_key(key) {}
-		ControlState GetState() const;
-	private:
-		const BYTE& m_key;
-		const u8 m_index;
-	};
-
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(u8 index, const BYTE& button) : m_index(index), m_button(button) {}
-		ControlState GetState() const;
-	private:
-		const BYTE& m_button;
-		const u8 m_index;
-	};
-
-	class Axis : public Input
-	{
-	public:
-		std::string GetName() const;
-		Axis(u8 index, const LONG& axis, LONG range) : m_index(index), m_axis(axis), m_range(range) {}
-		ControlState GetState() const;
-	private:
-		const LONG& m_axis;
-		const LONG m_range;
-		const u8 m_index;
-	};
-
-	class Cursor : public Input
-	{
-	public:
-		std::string GetName() const;
-		bool IsDetectable() { return false; }
-		Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {}
-		ControlState GetState() const;
-	private:
-		const float& m_axis;
-		const u8 m_index;
-		const bool m_positive;
-	};
-
-	class Light : public Output
-	{
-	public:
-		std::string GetName() const;
-		Light(u8 index) : m_index(index) {}
-		void SetState(ControlState state);
-	private:
-		const u8 m_index;
-	};
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
-	~KeyboardMouse();
-
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
-
-private:
-	const LPDIRECTINPUTDEVICE8	m_kb_device;
-	const LPDIRECTINPUTDEVICE8	m_mo_device;
-
-	DWORD				m_last_update;
-	State				m_state_in;
-	unsigned char		m_state_out[3];	// NUM CAPS SCROLL
-	bool				m_current_state_out[3];	// NUM CAPS SCROLL
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp
deleted file mode 100644
index 965ecfc817..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-
-#include "Device.h"
-
-#include <string>
-#include <sstream>
-
-namespace ciface
-{
-namespace Core
-{
-
-//
-//		Device :: ~Device
-//
-// Destructor, delete all inputs/outputs on device destruction
-//
-Device::~Device()
-{
-	{
-	// delete inputs
-	std::vector<Device::Input*>::iterator
-		i = m_inputs.begin(),
-		e = m_inputs.end();
-	for ( ;i!=e; ++i)
-		delete *i;
-	}
-
-	{
-	// delete outputs
-	std::vector<Device::Output*>::iterator
-		o = m_outputs.begin(),
-		e = m_outputs.end();
-	for ( ;o!=e; ++o)
-		delete *o;
-	}
-}
-
-void Device::AddInput(Device::Input* const i)
-{
-	m_inputs.push_back(i);
-}
-
-void Device::AddOutput(Device::Output* const o)
-{
-	m_outputs.push_back(o);
-}
-
-Device::Input* Device::FindInput(const std::string &name) const
-{
-	std::vector<Input*>::const_iterator
-		it = m_inputs.begin(),
-		itend = m_inputs.end();
-	for (; it != itend; ++it)
-		if ((*it)->GetName() == name)
-			return *it;
-
-	return NULL;
-}
-
-Device::Output* Device::FindOutput(const std::string &name) const
-{
-	std::vector<Output*>::const_iterator
-		it = m_outputs.begin(),
-		itend = m_outputs.end();
-	for (; it != itend; ++it)
-		if ((*it)->GetName() == name)
-			return *it;
-
-	return NULL;
-}
-
-//
-//		Device :: ClearInputState
-//
-// Device classes should override this function
-// ControllerInterface will call this when the device returns failure during UpdateInput
-// used to try to set all buttons and axes to their default state when user unplugs a gamepad during play
-// buttons/axes that were held down at the time of unplugging should be seen as not pressed after unplugging
-//
-void Device::ClearInputState()
-{
-	// this is going to be called for every UpdateInput call that fails
-	// kinda slow but, w/e, should only happen when user unplugs a device while playing
-}
-
-//
-//		DeviceQualifier :: ToString
-//
-// get string from a device qualifier / serialize
-//
-std::string DeviceQualifier::ToString() const
-{
-	if (source.empty() && (cid < 0) && name.empty())
-		return "";
-	std::ostringstream ss;
-	ss << source << '/';
-	if ( cid > -1 )
-		ss << cid;
-	ss << '/' << name;
-	return ss.str();
-}
-
-//
-//		DeviceQualifier	::	FromString
-//
-// set a device qualifier from a string / unserialize
-//
-void DeviceQualifier::FromString(const std::string& str)
-{
-	std::istringstream ss(str);
-
-	std::getline(ss, source = "", '/');
-
-	// silly
-	std::getline(ss, name, '/');
-	std::istringstream(name) >> (cid = -1);
-
-	std::getline(ss, name = "");
-}
-
-//
-//		DeviceQualifier :: FromDevice
-//
-// set a device qualifier from a device
-//
-void DeviceQualifier::FromDevice(const Device* const dev)
-{
-	name = dev->GetName();
-	cid = dev->GetId();
-	source= dev->GetSource();
-}
-
-bool DeviceQualifier::operator==(const Device* const dev) const
-{
-	if (dev->GetId() == cid)
-		if (dev->GetName() == name)
-			if (dev->GetSource() == source)
-				return true;
-	return false;
-}
-
-bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
-{
-	if (cid == devq.cid)
-		if (name == devq.name)
-			if (source == devq.source)
-				return true;
-
-	return false;
-}
-
-Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
-{
-	std::vector<Device*>::const_iterator
-		di = m_devices.begin(),
-		de = m_devices.end();
-	for (; di!=de; ++di)
-		if (devq == *di)
-			return *di;
-
-	return NULL;
-}
-
-Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const
-{
-	if (def_dev)
-	{
-		Device::Input* const inp = def_dev->FindInput(name);
-		if (inp)
-			return inp;
-	}
-
-	std::vector<Device*>::const_iterator
-		di = m_devices.begin(),
-		de = m_devices.end();
-	for (; di != de; ++di)
-	{
-		Device::Input* const i = (*di)->FindInput(name);
-
-		if (i)
-			return i;
-	}
-
-	return NULL;
-}
-
-Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const
-{
-	return def_dev->FindOutput(name);
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Device.h b/Source/Core/InputCommon/Src/ControllerInterface/Device.h
deleted file mode 100644
index a7c26b867d..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Device.h
+++ /dev/null
@@ -1,171 +0,0 @@
-
-#ifndef _DEVICE_H_
-#define _DEVICE_H_
-
-#include <string>
-#include <vector>
-
-#include "Common.h"
-
-// idk in case I wanted to change it to double or something, idk what's best
-typedef float ControlState;
-
-namespace ciface
-{
-namespace Core
-{
-
-// Forward declarations
-class DeviceQualifier;
-
-//
-//		Device
-//
-// a device class
-//
-class Device
-{
-public:
-	class Input;
-	class Output;
-
-	//
-	//		Control
-	//
-	//  control includes inputs and outputs
-	//
-	class Control		// input or output
-	{
-	public:
-		virtual std::string GetName() const = 0;
-		virtual ~Control() {}
-
-		virtual Input* ToInput() { return NULL; }
-		virtual Output* ToOutput() { return NULL; }
-	};
-
-	//
-	//		Input
-	//
-	// an input on a device
-	//
-	class Input : public Control
-	{
-	public:
-		// things like absolute axes/ absolute mouse position will override this
-		virtual bool IsDetectable() { return true; }
-
-		virtual ControlState GetState() const = 0;
-
-		Input* ToInput() { return this; }
-	};
-
-	//
-	//		Output
-	//
-	// an output on a device
-	//
-	class Output : public Control
-	{
-	public:
-		virtual ~Output() {}
-
-		virtual void SetState(ControlState state) = 0;
-
-		Output* ToOutput() { return this; }
-	};
-
-	virtual ~Device();
-
-	virtual std::string GetName() const = 0;
-	virtual int GetId() const = 0;
-	virtual std::string GetSource() const = 0;
-	virtual bool UpdateInput() = 0;
-	virtual bool UpdateOutput() = 0;
-
-	virtual void ClearInputState();
-
-	const std::vector<Input*>& Inputs() const { return m_inputs; }
-	const std::vector<Output*>& Outputs() const { return m_outputs; }
-
-	Input* FindInput(const std::string& name) const;
-	Output* FindOutput(const std::string& name) const;
-
-protected:
-	void AddInput(Input* const i);
-	void AddOutput(Output* const o);
-
-	class FullAnalogSurface : public Input
-	{
-	public:
-		FullAnalogSurface(Input* low, Input* high)
-			: m_low(*low), m_high(*high)
-		{}
-
-		ControlState GetState() const
-		{
-			return (1 + m_high.GetState() - m_low.GetState()) / 2;
-		}
-
-		std::string GetName() const
-		{
-			return m_low.GetName() + *m_high.GetName().rbegin();
-		}
-
-	private:
-		Input& m_low;
-		Input& m_high;
-	};
-
-	void AddAnalogInputs(Input* low, Input* high)
-	{
-		AddInput(low);
-		AddInput(high);
-		AddInput(new FullAnalogSurface(low, high));
-		AddInput(new FullAnalogSurface(high, low));
-	}
-
-private:
-	std::vector<Input*>		m_inputs;
-	std::vector<Output*>	m_outputs;
-};
-
-//
-//		DeviceQualifier
-//
-// device qualifier used to match devices
-// currently has ( source, id, name ) properties which match a device
-//
-class DeviceQualifier
-{
-public:
-	DeviceQualifier() : cid(-1) {}
-	DeviceQualifier(const std::string& _source, const int _id, const std::string& _name)
-		: source(_source), cid(_id), name(_name) {}
-	void FromDevice(const Device* const dev);
-	void FromString(const std::string& str);
-	std::string ToString() const;
-	bool operator==(const DeviceQualifier& devq) const;
-	bool operator==(const Device* const dev) const;
-
-	std::string		source;
-	int				cid;
-	std::string		name;
-};
-
-class DeviceContainer
-{
-public:
-	Device::Input* FindInput(const std::string& name, const Device* def_dev) const;
-	Device::Output* FindOutput(const std::string& name, const Device* def_dev) const;
-
-	const std::vector<Device*>& Devices() const { return m_devices; }
-	Device* FindDevice(const DeviceQualifier& devq) const;
-protected:
-	std::vector<Device*> m_devices;
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h
deleted file mode 100644
index a922e3f2dd..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "../Device.h"
-
-namespace ciface
-{
-namespace OSX
-{
-
-void Init(std::vector<Core::Device*>& devices, void *window);
-void DeInit();
-
-void DeviceElementDebugPrint(const void *, void *);
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h
deleted file mode 100644
index ebe908522b..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <IOKit/hid/IOHIDLib.h>
-
-#include "../Device.h"
-
-namespace ciface
-{
-namespace OSX
-{
-
-class Joystick : public Core::Device
-{
-private:
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(IOHIDElementRef element, IOHIDDeviceRef device)
-			: m_element(element), m_device(device) {}
-		ControlState GetState() const;
-	private:
-		const IOHIDElementRef	m_element;
-		const IOHIDDeviceRef m_device;
-	};
-
-	class Axis : public Input
-	{
-	public:
-		enum direction {
-			positive = 0,
-			negative
-		};
-		std::string GetName() const;
-		Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir);
-		ControlState GetState() const;
-	private:
-		const IOHIDElementRef	m_element;
-		const IOHIDDeviceRef m_device;
-		std::string		m_name;
-		const direction		m_direction;
-		float			m_neutral;
-		float			m_scale;
-	};
-
-	class Hat : public Input
-	{
-	public:
-		enum direction {
-			up = 0,
-			right,
-			down,
-			left
-		};
-		std::string GetName() const;
-		Hat(IOHIDElementRef element, IOHIDDeviceRef device, direction dir);
-		ControlState GetState() const;
-	private:
-		const IOHIDElementRef	m_element;
-		const IOHIDDeviceRef m_device;
-		const char*		m_name;
-		const direction		m_direction;
-	};
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	Joystick(IOHIDDeviceRef device, std::string name, int index);
-
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
-
-private:
-	const IOHIDDeviceRef	m_device;
-	const std::string	m_device_name;
-	const int	m_index;
-};
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h
deleted file mode 100644
index e5c2c1b3d4..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <IOKit/hid/IOHIDLib.h>
-
-#include "../Device.h"
-
-namespace ciface
-{
-namespace OSX
-{
-
-class Keyboard : public Core::Device
-{
-private:
-	class Key : public Input
-	{
-	public:
-		std::string GetName() const;
-		Key(IOHIDElementRef element, IOHIDDeviceRef device);
-		ControlState GetState() const;
-	private:
-		const IOHIDElementRef	m_element;
-		const IOHIDDeviceRef	m_device;
-		std::string		m_name;
-	};
-	class Cursor : public Input
-	{
-	public:
-		std::string GetName() const;
-		bool IsDetectable() { return false; }
-		Cursor(u8 index, const float& axis, const bool positive) : m_axis(axis), m_index(index), m_positive(positive) {}
-		ControlState GetState() const;
-	private:
-		const float& m_axis;
-		const u8 m_index;
-		const bool m_positive;
-	};
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(u8 index, const unsigned char& button) : m_button(button), m_index(index) {}
-		ControlState GetState() const;
-	private:
-		const unsigned char& m_button;
-		const u8 m_index;
-	};
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
-
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
-
-private:
-	struct
-	{
-		float x, y;
-	} m_cursor;
-
-	const IOHIDDeviceRef	m_device;
-	const std::string	m_device_name;
-	int		m_index;
-	uint32_t m_windowid;
-	unsigned char m_mousebuttons[3];
-};
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
deleted file mode 100644
index 40c822c577..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-
-#include "SDL.h"
-#include <StringUtil.h>
-
-#include <map>
-#include <sstream>
-#include <algorithm>
-
-#ifdef _WIN32
-	#if SDL_VERSION_ATLEAST(1, 3, 0)
-		#pragma comment(lib, "SDL.1.3.lib")
-	#else
-		#pragma comment(lib, "SDL.lib")
-	#endif
-#endif
-
-namespace ciface
-{
-namespace SDL
-{
-	
-std::string GetJoystickName(int index)
-{
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	return SDL_JoystickNameForIndex(index);
-#else
-	return SDL_JoystickName(index);
-#endif
-}
-
-void Init( std::vector<Core::Device*>& devices )
-{	
-	// this is used to number the joysticks
-	// multiple joysticks with the same name shall get unique ids starting at 0
-	std::map<std::string, int>	name_counts;
-
-	if (SDL_Init( SDL_INIT_FLAGS ) >= 0)
-	{
-		// joysticks
-		for(int i = 0; i < SDL_NumJoysticks(); ++i)
-		{
-			SDL_Joystick* dev = SDL_JoystickOpen(i);
-			if (dev)
-			{
-				Joystick* js = new Joystick(dev, i, name_counts[GetJoystickName(i)]++);
-				// only add if it has some inputs/outputs
-				if (js->Inputs().size() || js->Outputs().size())
-					devices.push_back( js );
-				else
-					delete js;
-			}
-		}
-	}
-}
-
-Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
-	: m_joystick(joystick)
-	, m_sdl_index(sdl_index)
-	, m_index(index)
-{
-	// really bad HACKS:
-	// to not use SDL for an XInput device
-	// too many people on the forums pick the SDL device and ask:
-	// "why don't my 360 gamepad triggers/rumble work correctly"
-#ifdef _WIN32
-	// checking the name is probably good (and hacky) enough
-	// but I'll double check with the num of buttons/axes
-	std::string lcasename = GetName();
-	std::transform(lcasename.begin(), lcasename.end(), lcasename.begin(), tolower);
-
-	if ((std::string::npos != lcasename.find("xbox 360"))
-		&& (10 == SDL_JoystickNumButtons(joystick))
-		&& (5 == SDL_JoystickNumAxes(joystick))
-		&& (1 == SDL_JoystickNumHats(joystick))
-		&& (0 == SDL_JoystickNumBalls(joystick))
-		)
-	{
-		// this device won't be used
-		return;
-	}
-#endif
-
-	// get buttons
-	for (u8 i = 0; i != SDL_JoystickNumButtons(m_joystick); ++i)
-		AddInput(new Button(i, m_joystick));
-	
-	// get hats
-	for (u8 i = 0; i != SDL_JoystickNumHats(m_joystick); ++i)
-	{
-		// each hat gets 4 input instances associated with it, (up down left right)
-		for (u8 d = 0; d != 4; ++d)
-			AddInput(new Hat(i, m_joystick, d));
-	}
-
-	// get axes
-	for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i)
-	{
-		// each axis gets a negative and a positive input instance associated with it
-		AddAnalogInputs(new Axis(i, m_joystick, -32768),
-			new Axis(i, m_joystick, 32767));
-	}
-
-#ifdef USE_SDL_HAPTIC
-	// try to get supported ff effects
-	m_haptic = SDL_HapticOpenFromJoystick( m_joystick );
-	if (m_haptic)
-	{
-		//SDL_HapticSetGain( m_haptic, 1000 );
-		//SDL_HapticSetAutocenter( m_haptic, 0 );
-
-		const unsigned int supported_effects = SDL_HapticQuery( m_haptic );
-
-		// constant effect
-		if (supported_effects & SDL_HAPTIC_CONSTANT)
-		{
-			m_state_out.push_back(EffectIDState());
-			AddOutput(new ConstantEffect(m_state_out.back()));
-		}
-
-		// ramp effect
-		if (supported_effects & SDL_HAPTIC_RAMP)
-		{
-			m_state_out.push_back(EffectIDState());
-			AddOutput(new RampEffect(m_state_out.back()));
-		}
-
-		// sine effect
-		if (supported_effects & SDL_HAPTIC_SINE)
-		{
-			m_state_out.push_back(EffectIDState());
-			AddOutput(new SineEffect(m_state_out.back()));
-		}
-
-#ifdef SDL_HAPTIC_SQUARE
-		// square effect
-		if (supported_effects & SDL_HAPTIC_SQUARE)
-		{
-			m_state_out.push_back(EffectIDState());
-			AddOutput(new SquareEffect(m_state_out.back()));
-		}
-#endif // defined(SDL_HAPTIC_SQUARE)
-
-		// triangle effect
-		if (supported_effects & SDL_HAPTIC_TRIANGLE)
-		{
-			m_state_out.push_back(EffectIDState());
-			AddOutput(new TriangleEffect(m_state_out.back()));
-		}
-	}
-#endif
-
-}
-
-Joystick::~Joystick()
-{
-#ifdef USE_SDL_HAPTIC
-	if (m_haptic)
-	{	
-		// stop/destroy all effects
-		SDL_HapticStopAll(m_haptic);
-		std::list<EffectIDState>::iterator
-			i = m_state_out.begin(),
-			e = m_state_out.end();
-		for ( ; i != e; ++i)
-			if (i->id != -1)
-				SDL_HapticDestroyEffect(m_haptic, i->id);
-		// close haptic first
-		SDL_HapticClose(m_haptic);
-	}
-#endif
-
-	// close joystick
-	SDL_JoystickClose(m_joystick);
-}
-
-#ifdef USE_SDL_HAPTIC
-std::string Joystick::ConstantEffect::GetName() const
-{
-	return "Constant";
-}
-
-std::string Joystick::RampEffect::GetName() const
-{
-	return "Ramp";
-}
-
-std::string Joystick::SineEffect::GetName() const
-{
-	return "Sine";
-}
-
-#ifdef SDL_HAPTIC_SQUARE
-std::string Joystick::SquareEffect::GetName() const
-{
-	return "Square";
-}
-#endif // defined(SDL_HAPTIC_SQUARE)
-
-std::string Joystick::TriangleEffect::GetName() const
-{
-	return "Triangle";
-}
-
-void Joystick::ConstantEffect::SetState(const ControlState state)
-{
-	if (state)
-	{
-		m_effect.effect.type = SDL_HAPTIC_CONSTANT;
-		m_effect.effect.constant.length = SDL_HAPTIC_INFINITY;
-	}
-	else
-	{
-		m_effect.effect.type = 0;
-	}
-
-	const Sint16 old = m_effect.effect.constant.level;
-	m_effect.effect.constant.level = state * 0x7FFF;
-	if (old != m_effect.effect.constant.level)
-		m_effect.changed = true;
-}
-
-void Joystick::RampEffect::SetState(const ControlState state)
-{
-	if (state)
-	{
-		m_effect.effect.type = SDL_HAPTIC_RAMP;
-		m_effect.effect.ramp.length = SDL_HAPTIC_INFINITY;
-	}
-	else
-	{
-		m_effect.effect.type = 0;
-	}
-
-	const Sint16 old = m_effect.effect.ramp.start;
-	m_effect.effect.ramp.start = state * 0x7FFF;
-	if (old != m_effect.effect.ramp.start)
-		m_effect.changed = true;
-}
-
-void Joystick::SineEffect::SetState(const ControlState state)
-{
-	if (state)
-	{
-		m_effect.effect.type = SDL_HAPTIC_SINE;
-		m_effect.effect.periodic.length = 250;
-	}
-	else
-	{
-		m_effect.effect.type = 0;
-	}
-
-	const Sint16 old = m_effect.effect.periodic.magnitude;
-	m_effect.effect.periodic.period = 5;
-	m_effect.effect.periodic.magnitude = state * 0x5000;
-	m_effect.effect.periodic.attack_length = 0;
-	m_effect.effect.periodic.fade_length = 500;
-
-	if (old != m_effect.effect.periodic.magnitude)
-		m_effect.changed = true;
-}
-
-#ifdef SDL_HAPTIC_SQUARE
-void Joystick::SquareEffect::SetState(const ControlState state)
-{
-	if (state)
-	{
-		m_effect.effect.type = SDL_HAPTIC_SQUARE;
-		m_effect.effect.periodic.length = 250;
-	}
-	else
-	{
-		m_effect.effect.type = 0;
-	}
-
-	const Sint16 old = m_effect.effect.periodic.magnitude;
-	m_effect.effect.periodic.period = 5;
-	m_effect.effect.periodic.magnitude = state * 0x5000;
-	m_effect.effect.periodic.attack_length = 0;
-	m_effect.effect.periodic.fade_length = 100;
-
-	if (old != m_effect.effect.periodic.magnitude)
-		m_effect.changed = true;
-}
-#endif // defined(SDL_HAPTIC_SQUARE)
-
-void Joystick::TriangleEffect::SetState(const ControlState state)
-{
-	if (state)
-	{
-		m_effect.effect.type = SDL_HAPTIC_TRIANGLE;
-		m_effect.effect.periodic.length = 250;
-	}
-	else
-	{
-		m_effect.effect.type = 0;
-	}
-
-	const Sint16 old = m_effect.effect.periodic.magnitude;
-	m_effect.effect.periodic.period = 5;
-	m_effect.effect.periodic.magnitude = state * 0x5000;
-	m_effect.effect.periodic.attack_length = 0;
-	m_effect.effect.periodic.fade_length = 100;
-
-	if (old != m_effect.effect.periodic.magnitude)
-		m_effect.changed = true;
-}
-#endif
-
-bool Joystick::UpdateInput()
-{
-	// each joystick is doin this, o well
-	SDL_JoystickUpdate();
-	
-	return true;
-}
-
-bool Joystick::UpdateOutput()
-{
-#ifdef USE_SDL_HAPTIC
-	std::list<EffectIDState>::iterator
-		i = m_state_out.begin(),
-		e = m_state_out.end();
-	for ( ; i != e; ++i)
-	{
-		if (i->changed)	// if SetState was called on this output
-		{
-			if (-1 == i->id)	// effect isn't currently uploaded
-			{
-				if (i->effect.type)		// if outputstate is >0  this would be true
-					if ((i->id = SDL_HapticNewEffect( m_haptic, &i->effect )) > -1)	// upload the effect
-						SDL_HapticRunEffect(m_haptic, i->id, 1);	// run the effect
-			}
-			else	// effect is already uploaded
-			{
-				if (i->effect.type)	// if ouputstate >0
-				{
-					SDL_HapticUpdateEffect(m_haptic, i->id, &i->effect);	// update the effect
-				}
-				else
-				{
-					SDL_HapticStopEffect(m_haptic, i->id);	// else, stop and remove the effect
-					SDL_HapticDestroyEffect(m_haptic, i->id);
-					i->id = -1;	// mark it as not uploaded
-				}
-			}
-
-			i->changed = false;
-		}
-	}
-#endif
-	return true;
-}
-
-std::string Joystick::GetName() const
-{
-	return StripSpaces(GetJoystickName(m_sdl_index));
-}
-
-std::string Joystick::GetSource() const
-{
-	return "SDL";
-}
-
-int Joystick::GetId() const
-{
-	return m_index;
-}
-
-std::string Joystick::Button::GetName() const
-{
-	std::ostringstream ss;
-	ss << "Button " << (int)m_index;
-	return ss.str();
-}
-
-std::string Joystick::Axis::GetName() const
-{
-	std::ostringstream ss;
-	ss << "Axis " << (int)m_index << (m_range<0 ? '-' : '+');
-	return ss.str();
-}
-
-std::string Joystick::Hat::GetName() const
-{
-	static char tmpstr[] = "Hat . .";
-	// I don't think more than 10 hats are supported
-	tmpstr[4] = (char)('0' + m_index);
-	tmpstr[6] = "NESW"[m_direction];
-	return tmpstr;
-}
-
-ControlState Joystick::Button::GetState() const
-{
-	return SDL_JoystickGetButton(m_js, m_index);
-}
-
-ControlState Joystick::Axis::GetState() const
-{
-	return std::max(0.0f, ControlState(SDL_JoystickGetAxis(m_js, m_index)) / m_range);
-}
-
-ControlState Joystick::Hat::GetState() const
-{
-	return (SDL_JoystickGetHat(m_js, m_index) & (1 << m_direction)) > 0;
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
deleted file mode 100644
index 9b9794c481..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef _CIFACE_SDL_H_
-#define _CIFACE_SDL_H_
-
-#include "../Device.h"
-
-#include <list>
-
-#include <SDL.h>
-
-#if SDL_VERSION_ATLEAST(1, 3, 0)
-	#define USE_SDL_HAPTIC
-#endif
-
-#ifdef USE_SDL_HAPTIC
-	#include <SDL_haptic.h>
-	#define SDL_INIT_FLAGS	SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC
-#else
-	#define SDL_INIT_FLAGS	SDL_INIT_JOYSTICK
-#endif
-
-namespace ciface
-{
-namespace SDL
-{
-
-void Init( std::vector<Core::Device*>& devices );
-
-class Joystick : public Core::Device
-{
-private:
-
-#ifdef USE_SDL_HAPTIC
-	struct EffectIDState
-	{
-		EffectIDState() : effect(SDL_HapticEffect()), id(-1), changed(false) {}
-
-		SDL_HapticEffect	effect;
-		int					id;
-		bool				changed;
-	};
-#endif
-
-	class Button : public Core::Device::Input
-	{
-	public:
-		std::string GetName() const;
-		Button(u8 index, SDL_Joystick* js) : m_js(js), m_index(index) {}
-		ControlState GetState() const;
-	private:
-		 SDL_Joystick* const m_js;
-		 const u8 m_index;
-	};
-
-	class Axis : public Core::Device::Input
-	{
-	public:
-		std::string GetName() const;
-		Axis(u8 index, SDL_Joystick* js, Sint16 range) : m_js(js), m_range(range), m_index(index) {}
-		ControlState GetState() const;
-	private:
-		SDL_Joystick* const m_js;
-		const Sint16 m_range;
-		const u8 m_index;
-	};
-
-	class Hat : public Input
-	{
-	public:
-		std::string GetName() const;
-		Hat(u8 index, SDL_Joystick* js, u8 direction) : m_js(js), m_direction(direction), m_index(index) {}
-		ControlState GetState() const;
-	private:
-		SDL_Joystick* const m_js;
-		const u8 m_direction;
-		const u8 m_index;
-	};
-
-#ifdef USE_SDL_HAPTIC
-	class ConstantEffect : public Output
-	{
-	public:
-		std::string GetName() const;
-		ConstantEffect(EffectIDState& effect) : m_effect(effect) {}
-		void SetState(const ControlState state);
-	private:
-		EffectIDState& m_effect;
-	};
-
-	class RampEffect : public Output
-	{
-	public:
-		std::string GetName() const;
-		RampEffect(EffectIDState& effect) : m_effect(effect) {}
-		void SetState(const ControlState state);
-	private:
-		EffectIDState& m_effect;
-	};
-
-	class SineEffect : public Output
-	{
-	public:
-		std::string GetName() const;
-		SineEffect(EffectIDState& effect) : m_effect(effect) {}
-		void SetState(const ControlState state);
-	private:
-		EffectIDState& m_effect;
-	};
-
-#ifdef SDL_HAPTIC_SQUARE
-	class SquareEffect : public Output
-	{
-	public:
-		std::string GetName() const;
-		SquareEffect(EffectIDState& effect) : m_effect(effect) {}
-		void SetState(const ControlState state);
-	private:
-		EffectIDState& m_effect;
-	};
-#endif // defined(SDL_HAPTIC_SQUARE)
-
-	class TriangleEffect : public Output
-	{
-	public:
-		std::string GetName() const;
-		TriangleEffect(EffectIDState& effect) : m_effect(effect) {}
-		void SetState(const ControlState state);
-	private:
-		EffectIDState& m_effect;
-	};
-#endif
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
-	~Joystick();
-
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
-
-private:
-	SDL_Joystick* const			m_joystick;
-	const int					m_sdl_index;
-	const unsigned int			m_index;
-
-#ifdef USE_SDL_HAPTIC
-	std::list<EffectIDState>	m_state_out;
-	SDL_Haptic*					m_haptic;
-#endif
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
deleted file mode 100644
index c687bef856..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-
-#include "XInput.h"
-
-namespace ciface
-{
-namespace XInput
-{
-
-static const struct
-{
-	const char* const name;
-	const WORD bitmask;
-} named_buttons[] = 
-{
-	{ "Button A", XINPUT_GAMEPAD_A },
-	{ "Button B", XINPUT_GAMEPAD_B },
-	{ "Button X", XINPUT_GAMEPAD_X },
-	{ "Button Y", XINPUT_GAMEPAD_Y },
-	{ "Pad N", XINPUT_GAMEPAD_DPAD_UP },
-	{ "Pad S", XINPUT_GAMEPAD_DPAD_DOWN },
-	{ "Pad W", XINPUT_GAMEPAD_DPAD_LEFT },
-	{ "Pad E", XINPUT_GAMEPAD_DPAD_RIGHT },
-	{ "Start", XINPUT_GAMEPAD_START },
-	{ "Back", XINPUT_GAMEPAD_BACK },
-	{ "Shoulder L", XINPUT_GAMEPAD_LEFT_SHOULDER },
-	{ "Shoulder R", XINPUT_GAMEPAD_RIGHT_SHOULDER },
-	{ "Thumb L", XINPUT_GAMEPAD_LEFT_THUMB },
-	{ "Thumb R", XINPUT_GAMEPAD_RIGHT_THUMB }
-};
-
-static const char* const named_triggers[] =
-{
-	"Trigger L",
-	"Trigger R"
-};
-
-static const char* const named_axes[] =
-{
-	"Left X",
-	"Left Y",
-	"Right X",
-	"Right Y"
-};
-
-static const char* const named_motors[] =
-{
-	"Motor L",
-	"Motor R"
-};
-
-void Init(std::vector<Core::Device*>& devices)
-{
-	XINPUT_CAPABILITIES caps;
-	for (int i = 0; i != 4; ++i)
-		if (ERROR_SUCCESS == XInputGetCapabilities(i, 0, &caps))
-			devices.push_back(new Device(caps, i));
-}
-
-Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
-	: m_index(index), m_subtype(caps.SubType)
-{
-	ZeroMemory(&m_state_out, sizeof(m_state_out));
-	ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
-
-	// XInputGetCaps seems to always claim all capabilities are supported
-	// but I will leave all this stuff in, incase m$ fixes xinput up a bit
-
-	// get supported buttons
-	for (int i = 0; i != sizeof(named_buttons)/sizeof(*named_buttons); ++i)
-	{
-		if (named_buttons[i].bitmask & caps.Gamepad.wButtons)
-			AddInput(new Button(i, m_state_in.Gamepad.wButtons));
-	}
-
-	// get supported triggers
-	for (int i = 0; i != sizeof(named_triggers)/sizeof(*named_triggers); ++i)
-	{
-		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];	// should be max value / MSDN lies
-		if ((&caps.Gamepad.bLeftTrigger)[i])
-			AddInput(new Trigger(i, (&m_state_in.Gamepad.bLeftTrigger)[i], 255 ));
-	}
-
-	// get supported axes
-	for (int i = 0; i != sizeof(named_axes)/sizeof(*named_axes); ++i)
-	{
-		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesn't give the range / MSDN is a liar
-		if ((&caps.Gamepad.sThumbLX)[i])
-		{
-			const SHORT& ax = (&m_state_in.Gamepad.sThumbLX)[i];
-
-			// each axis gets a negative and a positive input instance associated with it
-			AddInput(new Axis(i, ax, -32768));
-			AddInput(new Axis(i, ax, 32767));
-		}
-	}
-
-	// get supported motors
-	for (int i = 0; i != sizeof(named_motors)/sizeof(*named_motors); ++i)
-	{
-		//WORD val = (&caps.Vibration.wLeftMotorSpeed)[i];	// should be max value / nope, more lies
-		if ((&caps.Vibration.wLeftMotorSpeed)[i])
-			AddOutput(new Motor(i, (&m_state_out.wLeftMotorSpeed)[i], 65535));
-	}
-
-	ClearInputState();
-}
-
-void Device::ClearInputState()
-{
-	ZeroMemory(&m_state_in, sizeof(m_state_in));	
-}
-
-std::string Device::GetName() const
-{
-	// why aren't these defined
-	// subtype doesn't seem to work, I tested with 2 different arcade sticks, both were shown as gamepad
-	// I'll leave it in anyway, maybe m$ will fix it
-
-	switch (m_subtype)
-	{
-	case XINPUT_DEVSUBTYPE_GAMEPAD : return "Gamepad"; break;
-	case 0x02 /*XINPUT_DEVSUBTYPE_WHEEL*/ :	return "Wheel"; break;
-	case 0x03 /*XINPUT_DEVSUBTYPE_ARCADE_STICK*/ : return "Arcade Stick"; break;
-	case 0x04 /*XINPUT_DEVSUBTYPE_FLIGHT_STICK*/ : return "Flight Stick"; break;
-	case 0x05 /*XINPUT_DEVSUBTYPE_DANCE_PAD*/ : return "Dance Pad"; break;
-	case 0x06 /*XINPUT_DEVSUBTYPE_GUITAR*/ :	return "Guitar"; break;
-	case 0x08 /*XINPUT_DEVSUBTYPE_DRUM_KIT*/ : return "Drum Kit"; break;
-	default : return "Device"; break;
-	}
-}
-
-int Device::GetId() const
-{
-	return m_index;
-}
-
-std::string Device::GetSource() const
-{
-	return "XInput";
-}
-
-// Update I/O
-
-bool Device::UpdateInput()
-{
-	return (ERROR_SUCCESS == XInputGetState(m_index, &m_state_in));
-}
-
-bool Device::UpdateOutput()
-{
-	// this if statement is to make rumble work better when multiple ControllerInterfaces are using the device
-	// only calls XInputSetState if the state changed
-	if (memcmp(&m_state_out, &m_current_state_out, sizeof(m_state_out)))
-	{
-		m_current_state_out = m_state_out;
-		return (ERROR_SUCCESS == XInputSetState(m_index, &m_state_out));
-	}
-	else
-	{
-		return true;
-	}
-}
-
-// GET name/source/id
-
-std::string Device::Button::GetName() const
-{
-	return named_buttons[m_index].name;
-}
-
-std::string Device::Axis::GetName() const
-{
-	return std::string(named_axes[m_index]) + (m_range<0 ? '-' : '+');
-}
-
-std::string Device::Trigger::GetName() const
-{
-	return named_triggers[m_index];
-}
-
-std::string Device::Motor::GetName() const
-{
-	return named_motors[m_index];
-}
-
-// GET / SET STATES
-
-ControlState Device::Button::GetState() const
-{
-	return (m_buttons & named_buttons[m_index].bitmask) > 0;
-}
-
-ControlState Device::Trigger::GetState() const
-{
-	return ControlState(m_trigger) / m_range;
-}
-
-ControlState Device::Axis::GetState() const
-{
-	return std::max( 0.0f, ControlState(m_axis) / m_range );
-}
-
-void Device::Motor::SetState(ControlState state)
-{
-	m_motor = (WORD)(state * m_range);
-}
-
-}
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
deleted file mode 100644
index 8fe6dd1dee..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _CIFACE_XINPUT_H_
-#define _CIFACE_XINPUT_H_
-
-#include "../Device.h"
-
-#define NOMINMAX
-#include <Windows.h>
-#include <XInput.h>
-
-namespace ciface
-{
-namespace XInput
-{
-
-void Init(std::vector<Core::Device*>& devices);
-
-class Device : public Core::Device
-{
-private:
-	class Button : public Core::Device::Input
-	{
-	public:
-		std::string GetName() const;
-		Button(u8 index, const WORD& buttons) : m_index(index), m_buttons(buttons) {}
-		ControlState GetState() const;
-	private:
-		const WORD& m_buttons;
-		u8 m_index;
-	};
-
-	class Axis : public Core::Device::Input
-	{
-	public:
-		std::string GetName() const;
-		Axis(u8 index, const SHORT& axis, SHORT range) : m_index(index), m_axis(axis), m_range(range) {}
-		ControlState GetState() const;
-	private:
-		const SHORT& m_axis;
-		const SHORT m_range;
-		const u8 m_index;
-	};
-
-	class Trigger : public Core::Device::Input
-	{
-	public:
-		std::string GetName() const;
-		Trigger(u8 index, const BYTE& trigger, BYTE range) : m_index(index), m_trigger(trigger), m_range(range) {}
-		ControlState GetState() const;
-	private:
-		const BYTE& m_trigger;
-		const BYTE m_range;
-		const u8 m_index;
-	};
-
-	class Motor : public Core::Device::Output
-	{
-	public:
-		std::string GetName() const;
-		Motor(u8 index, WORD& motor, WORD range) : m_index(index), m_motor(motor), m_range(range) {}
-		void SetState(ControlState state);
-	private:
-		WORD& m_motor;
-		const WORD m_range;
-		const u8 m_index;
-	};
-
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-
-	void ClearInputState();
-
-	Device(const XINPUT_CAPABILITIES& capabilities, u8 index);
-
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
-
-private:
-	XINPUT_STATE m_state_in;
-	XINPUT_VIBRATION m_state_out, m_current_state_out;
-	const BYTE m_subtype;
-	const u8 m_index;
-};
-
-
-}
-}
-
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
deleted file mode 100644
index 58a1a38c8c..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 Max Eliaser
-// Licensed under the GNU General Public License, version 2 or higher.
-// Refer to the license.txt file included.
-
-// See XInput2.cpp for extensive documentation.
-
-#ifndef _CIFACE_X11_XINPUT2_H_
-#define _CIFACE_X11_XINPUT2_H_
-
-#include "../Device.h"
-
-extern "C" {
-#include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/keysym.h>
-}
-
-namespace ciface
-{
-namespace XInput2
-{
-
-void Init(std::vector<Core::Device*>& devices, void* const hwnd);
-
-class KeyboardMouse : public Core::Device
-{
-
-private:
-	struct State
-	{
-		char keyboard[32];
-		unsigned int buttons;
-		struct
-		{
-			float x, y;
-		} cursor, axis;
-	};
-	
-	class Key : public Input
-	{
-		friend class KeyboardMouse;
-	public:
-		std::string GetName() const { return m_keyname; }
-		Key(Display* display, KeyCode keycode, const char* keyboard);
-		ControlState GetState() const;
-		
-	private:
-		std::string	m_keyname;
-		Display* const	m_display;
-		const char* const m_keyboard;
-		const KeyCode	m_keycode;
-	};
-	
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const { return name; }
-		Button(unsigned int index, unsigned int& buttons);
-		ControlState GetState() const;
-		
-	private:
-		const unsigned int& m_buttons;
-		const unsigned int m_index;
-		std::string name;
-	};
-
-	class Cursor : public Input
-	{
-	public:
-		std::string GetName() const { return name; }
-		bool IsDetectable() { return false; }
-		Cursor(u8 index, bool positive, const float& cursor);
-		ControlState GetState() const;
-	
-	private:
-		const float& m_cursor;
-		const u8 m_index;
-		const bool m_positive;
-		std::string name;
-	};
-	
-	class Axis : public Input
-	{
-	public:
-		std::string GetName() const { return name; }
-		bool IsDetectable() { return false; }
-		Axis(u8 index, bool positive, const float& axis);
-		ControlState GetState() const;
-
-	private:
-		const float& m_axis;
-		const u8 m_index;
-		const bool m_positive;
-		std::string name;
-	};
-	
-private:
-	void SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid);
-	void UpdateCursor();
-	
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-	
-	KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
-	~KeyboardMouse();
-	
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
-	
-private:
-	Window m_window;
-	Display* m_display;
-	State m_state;
-	int				xi_opcode;
-	const int		pointer_deviceid, keyboard_deviceid;
-	std::string		name;
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
deleted file mode 100644
index c178f1e9b4..0000000000
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef _CIFACE_XLIB_H_
-#define _CIFACE_XLIB_H_
-
-#include "../Device.h"
-
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-
-namespace ciface
-{
-namespace Xlib
-{
-
-void Init(std::vector<Core::Device*>& devices, void* const hwnd);
-
-class KeyboardMouse : public Core::Device
-{
-
-private:
-	struct State
-	{
-		char keyboard[32];
-		unsigned int buttons;
-		struct
-		{
-			float x, y;
-		} cursor;
-	};
-	
-	class Key : public Input
-	{
-		friend class KeyboardMouse;
-	public:
-		std::string GetName() const;
-		Key(Display* display, KeyCode keycode, const char* keyboard);
-		ControlState GetState() const;
-		
-	private:
-		std::string	m_keyname;
-		Display* const	m_display;
-		const char* const m_keyboard;
-		const KeyCode	m_keycode;
-	};
-	
-	class Button : public Input
-	{
-	public:
-		std::string GetName() const;
-		Button(unsigned int index, unsigned int& buttons)
-			: m_buttons(buttons), m_index(index) {}
-		ControlState GetState() const;
-		
-	private:
-		const unsigned int& m_buttons;
-		const unsigned int m_index;
-	};
-
-	class Cursor : public Input
-	{
-	public:
-		std::string GetName() const;
-		bool IsDetectable() { return false; }
-		Cursor(u8 index, bool positive, const float& cursor)
-			: m_cursor(cursor), m_index(index), m_positive(positive) {}
-		ControlState GetState() const;
-
-	private:
-		const float& m_cursor;
-		const u8 m_index;
-		const bool m_positive;
-	};
-	
-public:
-	bool UpdateInput();
-	bool UpdateOutput();
-	
-	KeyboardMouse(Window window);
-	~KeyboardMouse();
-	
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
-	
-private:
-	Window m_window;
-	Display* m_display;
-	State m_state;
-};
-
-}
-}
-
-#endif
diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h
deleted file mode 100644
index c94f0b7fe8..0000000000
--- a/Source/Core/InputCommon/Src/GCPadStatus.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GCPAD_H_INCLUDED__
-#define _GCPAD_H_INCLUDED__
-
-#include "CommonTypes.h"
-
-#define PAD_ERR_NONE            0
-#define PAD_ERR_NO_CONTROLLER   -1
-#define PAD_ERR_NOT_READY       -2
-#define PAD_ERR_TRANSFER        -3
-
-#define PAD_USE_ORIGIN          0x0080
-
-#define PAD_BUTTON_LEFT         0x0001
-#define PAD_BUTTON_RIGHT        0x0002
-#define PAD_BUTTON_DOWN         0x0004
-#define PAD_BUTTON_UP           0x0008
-#define PAD_TRIGGER_Z           0x0010
-#define PAD_TRIGGER_R           0x0020
-#define PAD_TRIGGER_L           0x0040
-#define PAD_BUTTON_A            0x0100
-#define PAD_BUTTON_B            0x0200
-#define PAD_BUTTON_X            0x0400
-#define PAD_BUTTON_Y            0x0800
-#define PAD_BUTTON_START        0x1000
-
-typedef struct
-{
-	unsigned short	button;                 // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
-	unsigned char	stickX;                 // 0 <= stickX       <= 255
-	unsigned char	stickY;                 // 0 <= stickY       <= 255
-	unsigned char	substickX;              // 0 <= substickX    <= 255
-	unsigned char	substickY;              // 0 <= substickY    <= 255
-	unsigned char	triggerLeft;            // 0 <= triggerLeft  <= 255
-	unsigned char	triggerRight;           // 0 <= triggerRight <= 255
-	unsigned char	analogA;                // 0 <= analogA      <= 255
-	unsigned char	analogB;                // 0 <= analogB      <= 255
-	signed char		err;                    // one of PAD_ERR_* number
-} SPADStatus;
-
-#endif
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
deleted file mode 100644
index 9382138c43..0000000000
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "InputConfig.h"
-#include "CommonPaths.h"
-#include "../../Core/Src/ConfigManager.h"
-#include "../../Core/Src/HW/Wiimote.h"
-
-InputPlugin::~InputPlugin()
-{
-	// delete pads
-	std::vector<ControllerEmu*>::const_iterator i = controllers.begin(),
-		e = controllers.end();
-	for ( ; i != e; ++i )
-		delete *i;
-}
-
-bool InputPlugin::LoadConfig(bool isGC)
-{
-	IniFile inifile;
-	IniFile game_ini;
-	bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
-	std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
-	std::string profile[MAX_BBMOTES];
-	std::string path;
-
-	if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000")
-	{
-		std::string type;
-		if (isGC)
-		{
-			type = "Pad";
-			path = "Profiles/GCPad/";
-		}
-		else
-		{
-			type = "Wiimote";
-			path = "Profiles/Wiimote/";
-		}
-		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
-		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true);
-		for (int i = 0; i < 4; i++)
-		{
-			if (game_ini.Exists("Controls", (type + "Profile" + num[i]).c_str()))
-			{
-				game_ini.Get("Controls", (type + "Profile" + num[i]).c_str(), &profile[i]);
-				if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
-					useProfile[i] = true;
-				else
-				{
-					// TODO: Having a PanicAlert for this is dumb.
-					PanicAlertT("Selected controller profile does not exist");
-				}
-			}
-		}
-	}
-
-	if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"))
-	{
-		std::vector< ControllerEmu* >::const_iterator
-			i = controllers.begin(),
-			e = controllers.end();
-		for (int n = 0; i!=e; ++i, ++n)
-		{
-			// load settings from ini
-			if (useProfile[n])
-			{
-				IniFile profile_ini;
-				profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
-				(*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
-			}
-			else
-			{
-				(*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
-			}
-
-			// update refs
-			(*i)->UpdateReferences(g_controller_interface);
-		}
-		return true;
-	}
-	else
-	{
-		controllers[0]->LoadDefaults(g_controller_interface);
-		controllers[0]->UpdateReferences(g_controller_interface);
-		return false;
-	}
-}
-
-void InputPlugin::SaveConfig()
-{
-	std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini";
-
-	IniFile inifile;
-	inifile.Load(ini_filename);
-
-	std::vector< ControllerEmu* >::const_iterator i = controllers.begin(),
-		e = controllers.end();
-	for ( ; i!=e; ++i )
-		(*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
-
-	inifile.Save(ini_filename);
-}
diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h
deleted file mode 100644
index 0d14f325d1..0000000000
--- a/Source/Core/InputCommon/Src/InputConfig.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-#include "Thread.h"
-#include "FileUtil.h"
-#include "IniFile.h"
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "ControllerEmu.h"
-
-#include <string>
-#include <vector>
-#include <map>
-#include <sstream>
-
-// InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote
-// which are not even plugins anymore.
-class InputPlugin
-{
-public:
-
-	InputPlugin(const char* const _ini_name, const char* const _gui_name,
-		const char* const _profile_name)
-		: ini_name(_ini_name), gui_name(_gui_name), profile_name(_profile_name) {}
-
-	~InputPlugin();
-
-	bool LoadConfig(bool isGC);
-	void SaveConfig();
-
-	std::vector< ControllerEmu* >	controllers;
-
-	std::recursive_mutex controls_lock;		// for changing any control references
-
-	const char * const		ini_name;
-	const char * const		gui_name;
-	const char * const		profile_name;
-};
-
-#endif
diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp
deleted file mode 100644
index e0cf787e0f..0000000000
--- a/Source/Core/InputCommon/Src/UDPWiimote.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-
-#include "UDPWiimote.h"
-
-#ifdef _WIN32
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#define sock_t SOCKET
-#define ERRNO WSAGetLastError()
-#undef EWOULDBLOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define BAD_SOCK INVALID_SOCKET
-#define close(x) closesocket(x)
-#define cleanup do {noinst--; if (noinst==0) WSACleanup();} while (0)
-#define blockingoff(sock) ioctlsocket(sock, FIONBIO, &iMode)
-#define dataz char*
-#ifdef _MSC_VER
-#pragma comment (lib, "Ws2_32.lib")
-#endif
-
-#else
-
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <fcntl.h>
-#define BAD_SOCK -1
-#define ERRNO errno
-#define cleanup noinst--
-#define blockingoff(sock) fcntl(sock, F_SETFL, O_NONBLOCK)
-#define dataz void*
-#define sock_t int
-
-#endif
-
-#include "Thread.h"
-#include "Timer.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <list>
-#include <functional>
-
-struct UDPWiimote::_d
-{
-	std::thread thread;
-	std::list<sock_t> sockfds;
-	std::mutex termLock, mutex, nameMutex;
-	volatile bool exit;
-	sock_t bipv4_fd, bipv6_fd;
-};
-
-int UDPWiimote::noinst = 0;
-
-UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) : 
-	port(_port), displayName(name),
-	d(new _d) ,x(0),y(0),z(1.0f),naX(0),naY(0),naZ(-1.0f),nunX(0),nunY(0),
-	pointerX(1001.0f/2),pointerY(0),nunMask(0),mask(0),index(_index), int_port(atoi(_port))
-{
-		
-	static bool sranded=false;
-	if (!sranded)
-	{
-		srand((unsigned int)time(0));
-		sranded=true;
-	}
-	bcastMagic=rand() & 0xFFFF;
-	
-	#ifdef _WIN32
-	u_long iMode = 1;
-	#endif
-	struct addrinfo hints, *servinfo, *p;
-	int rv;
-
-	#ifdef _WIN32
-	if (noinst==0)
-	{
-		WORD sockVersion;
-		WSADATA wsaData;
-		sockVersion = MAKEWORD(2, 2);
-		WSAStartup(sockVersion, &wsaData);
-	}
-	#endif
-	
-	noinst++;
-
-	memset(&hints, 0, sizeof hints);
-	hints.ai_family = AF_INET;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_flags = AI_PASSIVE; // use my IP
-	
-	if (!int_port)
-	{
-		cleanup;
-		err=-1;
-		return;
-	}
-	
-	if ((rv = getaddrinfo(NULL, _port, &hints, &servinfo)) != 0)
-	{
-		cleanup;
-		err=-1;
-		return;
-	}
-
-	// loop through all the results and bind to everything we can
-	for(p = servinfo; p != NULL; p = p->ai_next)
-	{
-		sock_t sock;
-		if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == BAD_SOCK)
-		{
-			continue;
-		}
-
-		if (bind(sock, p->ai_addr, (int)p->ai_addrlen) == -1)
-		{
-			close(sock);
-			continue;
-		}
-		d->sockfds.push_back(sock);
-	}
-	
-	if (d->sockfds.empty())
-	{
-		cleanup;
-		err=-2;
-		return;
-	}
-	
-	freeaddrinfo(servinfo);
-	err=0;
-	d->exit=false;
-	initBroadcastIPv4();
-	initBroadcastIPv6();
-
-	std::lock_guard<std::mutex> lk(d->termLock);
-	d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this);
-
-	return;
-}
-
-void UDPWiimote::mainThread()
-{
-	std::unique_lock<std::mutex> lk(d->termLock);
-
-	Common::Timer time;
-	fd_set fds;
-	struct timeval timeout;
-	timeout.tv_sec=0;
-	timeout.tv_usec=0;
-	time.Update();
-	do
-	{
-		int maxfd=0;
-		FD_ZERO(&fds);
-		for (std::list<sock_t>::iterator i=d->sockfds.begin(); i!=d->sockfds.end(); i++)
-		{
-			FD_SET(*i,&fds);
-#ifndef _WIN32
-			if (*i>=maxfd)
-				maxfd=(*i)+1;
-#endif
-		}
-		
-		u64 tleft=timeout.tv_sec*1000+timeout.tv_usec/1000;
-		u64 telapsed=time.GetTimeDifference();
-		time.Update();
-		if (tleft<=telapsed)
-		{
-			timeout.tv_sec=1;
-			timeout.tv_usec=500000;
-			broadcastPresence();
-		}
-		else
-		{
-			tleft-=telapsed;
-			timeout.tv_sec=(long)(tleft/1000);
-			timeout.tv_usec=(tleft%1000)*1000;
-		}
-		
-		lk.unlock(); //VERY hacky. don't like it
-		if (d->exit) return; 
-		int rt=select(maxfd,&fds,NULL,NULL,&timeout);
-		if (d->exit) return;
-		lk.lock();
-		if (d->exit) return;
-		
-		if (rt)
-		{
-			for (std::list<sock_t>::iterator i=d->sockfds.begin(); i!=d->sockfds.end(); i++)
-			{
-				if (FD_ISSET(*i,&fds))
-				{
-					sock_t fd=*i;
-					u8 bf[64];
-					int size=60;
-					size_t addr_len;
-					struct sockaddr_storage their_addr;
-					addr_len = sizeof their_addr;
-					if ((size = recvfrom(fd, 
-										 (dataz)bf, 
-										 size , 0,(struct sockaddr *)&their_addr, (socklen_t*)&addr_len)) == -1) 
-					{
-						ERROR_LOG(WIIMOTE,"UDPWii Packet error");
-					}
-					else
-					{
-						std::lock_guard<std::mutex> lkm(d->mutex);
-						if (pharsePacket(bf,size)==0)
-						{
-							//NOTICE_LOG(WIIMOTE,"UDPWII New pack");
-						}
-						else
-						{
-							//NOTICE_LOG(WIIMOTE,"UDPWII Wrong pack format... ignoring");
-						}
-					}
-				}
-			}
-		}
-	} while (!(d->exit));
-}
-
-UDPWiimote::~UDPWiimote()
-{
-	d->exit = true;
-	{
-	std::lock_guard<std::mutex> lk(d->termLock);
-	d->thread.join();
-	}
-	for (std::list<sock_t>::iterator i=d->sockfds.begin(); i!=d->sockfds.end(); i++)
-		close(*i);
-	close(d->bipv4_fd);
-	close(d->bipv6_fd);
-	cleanup;
-	delete d;
-}
-
-#define ACCEL_FLAG    (1 << 0)
-#define BUTT_FLAG     (1 << 1)
-#define IR_FLAG       (1 << 2)
-#define NUN_FLAG      (1 << 3)
-#define NUNACCEL_FLAG (1 << 4)
-
-int UDPWiimote::pharsePacket(u8 * bf, size_t size)
-{
-	if (size < 3)
-		return -1;
-
-	if (bf[0] != 0xde)
-		return -1;
-	//if (bf[1]==0)
-	//	time=0;
-	//if (bf[1]<time) //NOT LONGER NEEDED TO ALLOW MULTIPLE IPHONES ON A SINGLE PORT
-	//	return -1;
-	//time=bf[1];
-	u32 *p=(u32*)(&bf[3]);
-	if (bf[2] & ACCEL_FLAG)
-	{
-		if ((size-(((u8*)p)-bf)) < 12)
-			return -1;
-
-		double ux,uy,uz;
-		ux=(double)((s32)ntohl(*p)); p++;
-		uy=(double)((s32)ntohl(*p)); p++;
-		uz=(double)((s32)ntohl(*p)); p++;
-		x=ux/1048576; //packet accel data
-		y=uy/1048576;
-		z=uz/1048576;
-	}
-
-	if (bf[2] & BUTT_FLAG)
-	{
-		if ((size-(((u8*)p)-bf)) < 4)
-			return -1;
-
-		mask=ntohl(*p); p++;
-	}
-
-	if (bf[2] & IR_FLAG)
-	{
-		if ((size-(((u8*)p)-bf)) < 8)
-			return -1;
-
-		pointerX=((double)((s32)ntohl(*p)))/1048576; p++;
-		pointerY=((double)((s32)ntohl(*p)))/1048576; p++;
-	}
-
-	if (bf[2] & NUN_FLAG)
-	{
-		if ((size-(((u8*)p)-bf)) < 9)
-			return -1;
-
-		nunMask=*((u8*)p); p=(u32*)(((u8*)p)+1);
-		nunX=((double)((s32)ntohl(*p)))/1048576; p++;
-		nunY=((double)((s32)ntohl(*p)))/1048576; p++;
-	}
-
-	if (bf[2] & NUNACCEL_FLAG)
-	{
-		if ((size-(((u8*)p)-bf)) < 12)
-			return -1;
-
-		double ux,uy,uz;
-		ux=(double)((s32)ntohl(*p)); p++;
-		uy=(double)((s32)ntohl(*p)); p++;
-		uz=(double)((s32)ntohl(*p)); p++;
-		naX=ux/1048576; //packet accel data
-		naY=uy/1048576;
-		naZ=uz/1048576;
-	}
-
-	return 0;
-}
-
-void UDPWiimote::initBroadcastIPv4()
-{
-	d->bipv4_fd=socket(AF_INET, SOCK_DGRAM, 0);
-	if (d->bipv4_fd == BAD_SOCK)
-	{
-		WARN_LOG(WIIMOTE,"socket() failed");
-		return;
-	}
-	
-	int broad=1;
-	if (setsockopt(d->bipv4_fd,SOL_SOCKET,SO_BROADCAST, (const dataz)(&broad), sizeof broad) == -1)
-	{
-		WARN_LOG(WIIMOTE,"setsockopt(SO_BROADCAST) failed");
-		return;
-	}
-}
-
-void UDPWiimote::broadcastIPv4(const void * data, size_t size)
-{
-
-	struct sockaddr_in their_addr;
-	their_addr.sin_family = AF_INET;
-	their_addr.sin_port = htons(4431);
-	their_addr.sin_addr.s_addr = INADDR_BROADCAST;
-	memset(their_addr.sin_zero, '\0', sizeof their_addr.sin_zero);
-	
-	int num;
-	if ((num=sendto(d->bipv4_fd,(const dataz)data,(int)size,0,(struct sockaddr *) &their_addr, sizeof their_addr)) == -1)
-	{
-		WARN_LOG(WIIMOTE,"sendto() failed");
-		return;
-	}
-}
-
-void UDPWiimote::initBroadcastIPv6()
-{
-	//TODO: IPv6 support
-}
-
-void UDPWiimote::broadcastIPv6(const void * data, size_t size)
-{
-	//TODO: IPv6 support
-}
-
-void UDPWiimote::broadcastPresence()
-{
-	size_t slen;
-	u8 bf[512];
-	bf[0]=0xdf; //magic number
-	*((u16*)(&(bf[1])))=htons(bcastMagic); //unique per-wiimote 16-bit ID
-	bf[3]=(u8)index; //wiimote index
-	*((u16*)(&(bf[4])))=htons(int_port); //port
-	{
-	std::lock_guard<std::mutex> lk(d->nameMutex);
-	slen=displayName.size();
-	if (slen>=256)
-		slen=255;
-	bf[6]=(u8)slen; //display name size (max 255)
-	memcpy(&(bf[7]),displayName.c_str(),slen); //display name
-	}
-	broadcastIPv4(bf,7+slen);
-	broadcastIPv6(bf,7+slen);
-}
-
-void UDPWiimote::getAccel(float &_x, float &_y, float &_z)
-{
-	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)x;
-	_y=(float)y;
-	_z=(float)z;
-}
-
-u32 UDPWiimote::getButtons()
-{
-	u32 msk;
-	std::lock_guard<std::mutex> lk(d->mutex);
-	msk=mask;
-	return msk;
-}
-
-void UDPWiimote::getIR(float &_x, float &_y)
-{
-	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)pointerX;
-	_y=(float)pointerY;
-}
-
-void UDPWiimote::getNunchuck(float &_x, float &_y, u8 &_mask)
-{
-	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)nunX;
-	_y=(float)nunY;
-	_mask=nunMask;
-}
-
-void UDPWiimote::getNunchuckAccel(float &_x, float &_y, float &_z)
-{
-	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)naX;
-	_y=(float)naY;
-	_z=(float)naZ;
-}
-
-const char * UDPWiimote::getPort()
-{
-	return port.c_str();
-}
-
-void UDPWiimote::changeName(const char * name)
-{
-	std::lock_guard<std::mutex> lk(d->nameMutex);
-	displayName=name;
-}
diff --git a/Source/Core/InputCommon/Src/UDPWiimote.h b/Source/Core/InputCommon/Src/UDPWiimote.h
deleted file mode 100644
index 01b9b11969..0000000000
--- a/Source/Core/InputCommon/Src/UDPWiimote.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef UDPWIIMOTE_H
-#define UDPWIIMOTE_H
-
-#include "Common.h"
-#include <string>
-
-#define UDPWM_B1 (1<<0)
-#define UDPWM_B2 (1<<1)
-#define UDPWM_BA (1<<2)
-#define UDPWM_BB (1<<3)
-#define UDPWM_BP (1<<4)
-#define UDPWM_BM (1<<5)
-#define UDPWM_BH (1<<6)
-#define UDPWM_BU (1<<7)
-#define UDPWM_BD (1<<8)
-#define UDPWM_BL (1<<9)
-#define UDPWM_BR (1<<10)
-#define UDPWM_SK (1<<11)
-#define UDPWM_NC (1<<0)
-#define UDPWM_NZ (1<<1)
-
-class UDPWiimote
-{
-public:
-	UDPWiimote(const char * port, const char * name, int index);
-	virtual ~UDPWiimote();
-	void getAccel(float &x, float &y, float &z);
-	u32 getButtons();
-	void getNunchuck(float &x, float &y, u8 &mask);
-	void getIR(float &x, float &y);
-	void getNunchuckAccel(float &x, float &y, float &z);
-	int getErrNo() {return err;};
-	const char * getPort();
-	void changeName(const char * name);
-
-	void mainThread();
-private:
-	std::string port,displayName;
-	int pharsePacket(u8 * data, size_t size);
-	struct _d; //using pimpl because Winsock2.h doesn't have include guards -_-
-	_d *d; 
-	double x,y,z;
-	double naX,naY,naZ;
-	double nunX,nunY;
-	double pointerX,pointerY;
-	u8 nunMask;
-	u32 mask;
-	u16 bcastMagic;
-	int err;
-	int index;
-	int int_port;
-	static int noinst;
-	void broadcastPresence();
-	void broadcastIPv4(const void * data, size_t size);
-	void broadcastIPv6(const void * data, size_t size);
-	void initBroadcastIPv4();
-	void initBroadcastIPv6();
-};
-#endif
diff --git a/Source/Core/InputCommon/Src/UDPWrapper.cpp b/Source/Core/InputCommon/Src/UDPWrapper.cpp
deleted file mode 100644
index e176a2164d..0000000000
--- a/Source/Core/InputCommon/Src/UDPWrapper.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "UDPWrapper.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-const char* DefaultPort(const int index)
-{
-	static std::string s;
-	s = "443";
-	s += (char)('2' + index);
-	return s.c_str();
-}
-
-UDPWrapper::UDPWrapper(int indx, const char* const _name) : 
-	ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII),
-	inst(NULL), index(indx),
-	updIR(false),updAccel(false),
-	updButt(false),udpEn(false)
-	, port(DefaultPort(indx))
-{
-	//PanicAlert("UDPWrapper #%d ctor",index);
-}
-
-void UDPWrapper::LoadConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base )
-{
-	ControlGroup::LoadConfig(sec,defdev,base);
-
-	std::string group( base + name ); group += "/";
-
-	int _updAccel,_updIR,_updButt,_udpEn,_updNun,_updNunAccel;
-	sec->Get((group + "Enable").c_str(),&_udpEn, 0);
-	sec->Get((group + "Port").c_str(), &port, DefaultPort(index));
-	sec->Get((group + "Update_Accel").c_str(), &_updAccel, 1);
-	sec->Get((group + "Update_IR").c_str(), &_updIR, 1);
-	sec->Get((group + "Update_Butt").c_str(), &_updButt, 1);
-	sec->Get((group + "Update_Nunchuk").c_str(), &_updNun, 1);
-	sec->Get((group + "Update_NunchukAccel").c_str(), &_updNunAccel, 0);
-
-	udpEn=(_udpEn>0);
-	updAccel=(_updAccel>0);
-	updIR=(_updIR>0);
-	updButt=(_updButt>0);
-	updNun=(_updNun>0);
-	updNunAccel=(_updNunAccel>0);
-
-	Refresh();
-}
-
-
-void UDPWrapper::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base )
-{
-	ControlGroup::SaveConfig(sec,defdev,base);
-	std::string group( base + name ); group += "/";
-	sec->Set((group + "Enable").c_str(), (int)udpEn, 0);
-	sec->Set((group + "Port").c_str(), port, DefaultPort(index));
-	sec->Set((group + "Update_Accel").c_str(), (int)updAccel, 1);
-	sec->Set((group + "Update_IR").c_str(), (int)updIR, 1);
-	sec->Set((group + "Update_Butt").c_str(), (int)updButt, 1);
-	sec->Set((group + "Update_Nunchuk").c_str(), (int)updNun, 1);
-	sec->Set((group + "Update_NunchukAccel").c_str(), (int)updNunAccel, 0);
-}
-
-
-void UDPWrapper::Refresh()
-{
-	bool udpAEn=(inst!=NULL);
-	if (udpEn&&udpAEn)
-	{
-		if (strcmp(inst->getPort(),port.c_str()))
-		{
-			delete inst;
-			inst= new UDPWiimote(port.c_str(),"Dolphin-Emu",index); //TODO: Changeable display name
-		}
-		return;
-	}
-	if (!udpEn)
-	{
-		if (inst)
-			delete inst;
-		inst=NULL;
-		return;
-	}
-	//else
-	inst= new UDPWiimote(port.c_str(),"Dolphin-Emu",index);
-}
-
-UDPWrapper::~UDPWrapper()
-{
-	if (inst)
-		delete inst;
-}
diff --git a/Source/Core/InputCommon/Src/UDPWrapper.h b/Source/Core/InputCommon/Src/UDPWrapper.h
deleted file mode 100644
index 420e425e25..0000000000
--- a/Source/Core/InputCommon/Src/UDPWrapper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef UDPWRAPPER_H
-#define UDPWRAPPER_H
-
-#include "UDPWiimote.h"
-
-#include "Common.h"
-#include "ControllerEmu.h"
-#include "IniFile.h"
-#include <string>
-
-class UDPWrapper : public ControllerEmu::ControlGroup
-{
-public:
-	UDPWiimote * inst;
-	int index;
-	bool updIR, updAccel, updButt, updNun, updNunAccel, udpEn; //upd from update and udp from... well... UDP
-	std::string port;
-
-	UDPWrapper(int index, const char* const _name);
-	virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "");
-	virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "");
-	void Refresh();
-	virtual ~UDPWrapper();
-};
-
-#endif
diff --git a/Source/Core/InputCommon/Src/X11InputBase.cpp b/Source/Core/InputCommon/Src/X11InputBase.cpp
deleted file mode 100644
index d23d2d77c5..0000000000
--- a/Source/Core/InputCommon/Src/X11InputBase.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "X11InputBase.h"
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-namespace InputCommon
-{
-#if defined(HAVE_WX) && HAVE_WX
-// Taken from wxw source code
-KeySym wxCharCodeWXToX(int id)
-{
-	KeySym keySym;
-
-	switch (id)
-	{
-		case WXK_CANCEL:        keySym = XK_Cancel; break;
-		case WXK_BACK:          keySym = XK_BackSpace; break;
-		case WXK_TAB:           keySym = XK_Tab; break;
-		case WXK_CLEAR:         keySym = XK_Clear; break;
-		case WXK_RETURN:        keySym = XK_Return; break;
-		case WXK_SHIFT:         keySym = XK_Shift_L; break;
-		case WXK_CONTROL:       keySym = XK_Control_L; break;
-		case WXK_ALT:           keySym = XK_Meta_L; break;
-		case WXK_CAPITAL:       keySym = XK_Caps_Lock; break;
-		case WXK_MENU :         keySym = XK_Menu; break;
-		case WXK_PAUSE:         keySym = XK_Pause; break;
-		case WXK_ESCAPE:        keySym = XK_Escape; break;
-		case WXK_SPACE:         keySym = ' '; break;
-		case WXK_PAGEUP:        keySym = XK_Prior; break;
-		case WXK_PAGEDOWN:      keySym = XK_Next; break;
-		case WXK_END:           keySym = XK_End; break;
-		case WXK_HOME :         keySym = XK_Home; break;
-		case WXK_LEFT :         keySym = XK_Left; break;
-		case WXK_UP:            keySym = XK_Up; break;
-		case WXK_RIGHT:         keySym = XK_Right; break;
-		case WXK_DOWN :         keySym = XK_Down; break;
-		case WXK_SELECT:        keySym = XK_Select; break;
-		case WXK_PRINT:         keySym = XK_Print; break;
-		case WXK_EXECUTE:       keySym = XK_Execute; break;
-		case WXK_INSERT:        keySym = XK_Insert; break;
-		case WXK_DELETE:        keySym = XK_Delete; break;
-		case WXK_HELP :         keySym = XK_Help; break;
-		case WXK_NUMPAD0:       keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT:     keySym = XK_KP_Insert; break;
-		case WXK_NUMPAD1:       keySym = XK_KP_1; break; case WXK_NUMPAD_END:        keySym = XK_KP_End; break;
-		case WXK_NUMPAD2:       keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN:       keySym = XK_KP_Down; break;
-		case WXK_NUMPAD3:       keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN:   keySym = XK_KP_Page_Down; break;
-		case WXK_NUMPAD4:       keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT:       keySym = XK_KP_Left; break;
-		case WXK_NUMPAD5:       keySym = XK_KP_5; break;
-		case WXK_NUMPAD6:       keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT:      keySym = XK_KP_Right; break;
-		case WXK_NUMPAD7:       keySym = XK_KP_7; break; case WXK_NUMPAD_HOME:       keySym = XK_KP_Home; break;
-		case WXK_NUMPAD8:       keySym = XK_KP_8; break; case WXK_NUMPAD_UP:         keySym = XK_KP_Up; break;
-		case WXK_NUMPAD9:       keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP:     keySym = XK_KP_Page_Up; break;
-		case WXK_NUMPAD_DECIMAL:    keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE:   keySym = XK_KP_Delete; break;
-		case WXK_NUMPAD_MULTIPLY:   keySym = XK_KP_Multiply; break;
-		case WXK_NUMPAD_ADD:        keySym = XK_KP_Add; break;
-		case WXK_NUMPAD_SUBTRACT:   keySym = XK_KP_Subtract; break;
-		case WXK_NUMPAD_DIVIDE:     keySym = XK_KP_Divide; break;
-		case WXK_NUMPAD_ENTER:      keySym = XK_KP_Enter; break;
-		case WXK_NUMPAD_SEPARATOR:  keySym = XK_KP_Separator; break;
-		case WXK_F1:            keySym = XK_F1; break;
-		case WXK_F2:            keySym = XK_F2; break;
-		case WXK_F3:            keySym = XK_F3; break;
-		case WXK_F4:            keySym = XK_F4; break;
-		case WXK_F5:            keySym = XK_F5; break;
-		case WXK_F6:            keySym = XK_F6; break;
-		case WXK_F7:            keySym = XK_F7; break;
-		case WXK_F8:            keySym = XK_F8; break;
-		case WXK_F9:            keySym = XK_F9; break;
-		case WXK_F10:           keySym = XK_F10; break;
-		case WXK_F11:           keySym = XK_F11; break;
-		case WXK_F12:           keySym = XK_F12; break;
-		case WXK_F13:           keySym = XK_F13; break;
-		case WXK_F14:           keySym = XK_F14; break;
-		case WXK_F15:           keySym = XK_F15; break;
-		case WXK_F16:           keySym = XK_F16; break;
-		case WXK_F17:           keySym = XK_F17; break;
-		case WXK_F18:           keySym = XK_F18; break;
-		case WXK_F19:           keySym = XK_F19; break;
-		case WXK_F20:           keySym = XK_F20; break;
-		case WXK_F21:           keySym = XK_F21; break;
-		case WXK_F22:           keySym = XK_F22; break;
-		case WXK_F23:           keySym = XK_F23; break;
-		case WXK_F24:           keySym = XK_F24; break;
-		case WXK_NUMLOCK:       keySym = XK_Num_Lock; break;
-		case WXK_SCROLL:        keySym = XK_Scroll_Lock; break;
-				// Input fix: Config dialogs read all alphabetic characters as UPPERCASE and
-				// saves the UPPERCASE keycodes. X11 reads these as lowercase by default.
-				default:
-						if (id >= 65 && id <= 90)
-							// Standard uppercase letter: return lowercase keycode
-							keySym = (KeySym)id + 32;
-						else 
-							// All other keyboard characters
-							keySym = id <= 255 ? (KeySym)id : 0;
-	}
-
-	return keySym;
-}
-int wxKeyModWXToX(int modstate)
-{
-	int xstate = 0;
-	if (modstate & wxMOD_ALT)
-		xstate |= 8;
-	if (modstate & wxMOD_SHIFT)
-		xstate |= 1;
-	if (modstate & wxMOD_CONTROL)
-		xstate |= 4;
-	return xstate;
-}
-#endif
-void XKeyToString(unsigned int keycode, char *keyStr) {
-	switch (keycode)
-	{  
-	case XK_Insert:
-		sprintf(keyStr, "INSERT");
-		break;
-	case XK_Delete:
-		sprintf(keyStr, "DELETE");
-		break;
-	case XK_Home:
-		sprintf(keyStr, "HOME");
-		break;
-	case XK_End:
-		sprintf(keyStr, "END");
-		break;
-	case XK_Prior:
-		sprintf(keyStr, "PAGEUP");
-		break;
-	case XK_Next:
-		sprintf(keyStr, "PAGEDOWN");
-		break;
-	case XK_Left:
-		sprintf(keyStr, "LEFT");
-		break;
-	case XK_Up: 
-		sprintf(keyStr, "UP");
-		break;
-	case XK_Right: 
-		sprintf(keyStr, "RIGHT");
-		break;
-	case XK_Down:
-		sprintf(keyStr, "DOWN");
-		break;
-	case XK_Return:
-		sprintf(keyStr, "RETURN");
-		break;
-	case XK_Escape:
-		sprintf(keyStr, "ESCAPE");
-		break;
-	case XK_Caps_Lock:
-		sprintf(keyStr, "CAPSLOCK");
-		break;
-	case XK_BackSpace:
-		sprintf(keyStr, "BACKSPACE");
-		break;
-	case XK_Tab:
-		sprintf(keyStr, "TAB");
-		break;
-	case XK_KP_Enter:
-		sprintf(keyStr, "KP ENTER");
-		break;
-	case XK_KP_Left:
-		sprintf(keyStr, "KP LEFT");
-		break;
-	case XK_KP_Up: 
-		sprintf(keyStr, "KP UP");
-		break;
-	case XK_KP_Right: 
-		sprintf(keyStr, "KP RIGHT");
-		break;
-	case XK_KP_Down:
-		sprintf(keyStr, "KP DOWN");
-		break;
-	case XK_KP_Insert:
-		sprintf(keyStr, "KP Insert");
-		break;
-	case XK_KP_Delete:
-		sprintf(keyStr, "KP Delete");
-		break;
-	case XK_KP_Page_Down:
-		sprintf(keyStr, "KP Page Down");
-		break;
-	case XK_KP_Page_Up:
-		sprintf(keyStr, "KP Page Up");
-		break;
-	case XK_KP_Separator:
-		sprintf(keyStr, "KP Separator");
-		break;
-	case XK_KP_Home:
-		sprintf(keyStr, "KP Home");
-		break;
-	case XK_KP_End:
-		sprintf(keyStr, "KP End");
-		break;
-	case XK_KP_Subtract:
-		sprintf(keyStr, "KP -");
-		break;
-	case XK_KP_Add:
-		sprintf(keyStr, "KP +");
-		break;
-	case XK_KP_Multiply:
-		sprintf(keyStr, "KP *");
-		break;
-	case XK_KP_Divide:
-		sprintf(keyStr, "KP /");
-		break;
-	case XK_KP_Decimal:
-		sprintf(keyStr, "KP .");
-		break;
-	case XK_KP_0:
-		sprintf(keyStr, "KP 0");
-		break;
-	case XK_KP_1:
-		sprintf(keyStr, "KP 1");
-		break;
-	case XK_KP_2:
-		sprintf(keyStr, "KP 2");
-		break;
-	case XK_KP_3:
-		sprintf(keyStr, "KP 3");
-		break;
-	case XK_KP_4:
-		sprintf(keyStr, "KP 4");
-		break;
-	case XK_KP_5:
-		sprintf(keyStr, "KP 5");
-		break;
-	case XK_KP_6:
-		sprintf(keyStr, "KP 6");
-		break;
-	case XK_KP_7:
-		sprintf(keyStr, "KP 7");
-		break;
-	case XK_KP_8:
-		sprintf(keyStr, "KP 8");
-		break;
-	case XK_KP_9:
-		sprintf(keyStr, "KP 9");
-		break;
-	case XK_Shift_L:
-		sprintf(keyStr, "LShift");
-		break;
-	case XK_Control_L:
-		sprintf(keyStr, "LControl");
-		break;
-	case XK_F1:
-		sprintf(keyStr, "F1");
-		break;
-	case XK_F2:
-		sprintf(keyStr, "F2");
-		break;
-	case XK_F3:
-		sprintf(keyStr, "F3");
-		break;
-	case XK_F4:
-		sprintf(keyStr, "F4");
-		break;
-	case XK_F5:
-		sprintf(keyStr, "F5");
-		break;
-	case XK_F6:
-		sprintf(keyStr, "F6");
-		break;
-	case XK_F7:
-		sprintf(keyStr, "F7");
-		break;
-	case XK_F8:
-		sprintf(keyStr, "F8");
-		break;
-	case XK_F9:
-		sprintf(keyStr, "F9");
-		break;
-	case XK_F10:
-		sprintf(keyStr, "F10");
-		break;
-	case XK_F11:
-		sprintf(keyStr, "F11");
-		break;
-	case XK_F12:
-		sprintf(keyStr, "F12");
-		break;
-	default:
-		sprintf(keyStr, "%c", toupper(keycode));
-	}
-}
-}
diff --git a/Source/Core/InputCommon/Src/X11InputBase.h b/Source/Core/InputCommon/Src/X11InputBase.h
deleted file mode 100644
index 7d0339d046..0000000000
--- a/Source/Core/InputCommon/Src/X11InputBase.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef XINPUTBASE_H
-#define XINPUTBASE_H
-
-#include "Common.h"
-
-#include <X11/X.h>
-#include <X11/keysym.h>
-#if defined(HAVE_WX) && HAVE_WX
-#include <wx/wx.h>
-#endif
-
-namespace InputCommon
-{
-#if defined(HAVE_WX) && HAVE_WX
-	KeySym wxCharCodeWXToX(int id);
-	int wxKeyModWXToX(int modstate);
-#endif
-	void XKeyToString(unsigned int keycode, char *keyStr);
-}
-#endif
diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
new file mode 100644
index 0000000000..65630b6b8e
--- /dev/null
+++ b/Source/Core/UICommon/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(SRCS Disassembler.cpp
+         UICommon.cpp)
+
+set(LIBS common)
+
+add_dolphin_library(uicommon "${SRCS}" "${LIBS}")
diff --git a/Source/Core/UICommon/Disassembler.cpp b/Source/Core/UICommon/Disassembler.cpp
new file mode 100644
index 0000000000..795ff57307
--- /dev/null
+++ b/Source/Core/UICommon/Disassembler.cpp
@@ -0,0 +1,176 @@
+#include <disasm.h>        // Bochs
+
+#if defined(HAS_LLVM)
+// PowerPC.h defines PC.
+// This conflicts with a function that has an argument named PC
+#undef PC
+#include <llvm-c/Disassembler.h>
+#include <llvm-c/Target.h>
+#endif
+
+#include "Common/StringUtil.h"
+
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+#include "UICommon/Disassembler.h"
+
+class HostDisassemblerX86 : public HostDisassembler
+{
+public:
+	HostDisassemblerX86();
+
+private:
+	disassembler m_disasm;
+
+	std::string DisassembleHostBlock(const u8* code_start, const u32 code_size, u32* host_instructions_count) override;
+};
+
+#if defined(HAS_LLVM)
+class HostDisassemblerLLVM : public HostDisassembler
+{
+public:
+	HostDisassemblerLLVM(const std::string host_disasm, int inst_size = -1, const std::string cpu = "");
+	~HostDisassemblerLLVM()
+	{
+		if (m_can_disasm)
+			LLVMDisasmDispose(m_llvm_context);
+	}
+
+private:
+	bool m_can_disasm;
+	LLVMDisasmContextRef m_llvm_context;
+	int m_instruction_size;
+
+	std::string DisassembleHostBlock(const u8* code_start, const u32 code_size, u32* host_instructions_count) override;
+};
+
+HostDisassemblerLLVM::HostDisassemblerLLVM(const std::string host_disasm, int inst_size, const std::string cpu)
+	: m_can_disasm(false), m_instruction_size(inst_size)
+{
+	LLVMInitializeAllTargetInfos();
+	LLVMInitializeAllTargetMCs();
+	LLVMInitializeAllDisassemblers();
+
+	m_llvm_context = LLVMCreateDisasmCPU(host_disasm.c_str(), cpu.c_str(), nullptr, 0, 0, nullptr);
+
+	// Couldn't create llvm context
+	if (!m_llvm_context)
+		return;
+
+	LLVMSetDisasmOptions(m_llvm_context,
+		LLVMDisassembler_Option_AsmPrinterVariant |
+		LLVMDisassembler_Option_PrintLatency);
+
+	m_can_disasm = true;
+}
+
+std::string HostDisassemblerLLVM::DisassembleHostBlock(const u8* code_start, const u32 code_size, u32 *host_instructions_count)
+{
+	if (!m_can_disasm)
+		return "(No LLVM context)";
+
+	u8* disasmPtr = (u8*)code_start;
+	const u8 *end = code_start + code_size;
+
+	std::ostringstream x86_disasm;
+	while ((u8*)disasmPtr < end)
+	{
+		char inst_disasm[256];
+		size_t inst_size = LLVMDisasmInstruction(m_llvm_context, disasmPtr, (u64)(end - disasmPtr), (u64)disasmPtr, inst_disasm, 256);
+		if (!inst_size)
+		{
+			x86_disasm << "Invalid inst:";
+
+			if (m_instruction_size != -1)
+			{
+				// If we are on an architecture that has a fixed instruction size
+				// We can continue onward past this bad instruction.
+				std::string inst_str = "";
+				for (int i = 0; i < m_instruction_size; ++i)
+					inst_str += StringFromFormat("%02x", disasmPtr[i]);
+
+				x86_disasm << inst_str << std::endl;
+				disasmPtr += m_instruction_size;
+			}
+			else
+			{
+				// We can't continue if we are on an architecture that has flexible instruction sizes
+				// Dump the rest of the block instead
+				std::string code_block = "";
+				for (int i = 0; (disasmPtr + i) < end; ++i)
+					code_block += StringFromFormat("%02x", disasmPtr[i]);
+
+				x86_disasm << code_block << std::endl;
+				break;
+			}
+		}
+		else
+		{
+			x86_disasm << inst_disasm << std::endl;
+			disasmPtr += inst_size;
+		}
+
+		(*host_instructions_count)++;
+	}
+
+	return x86_disasm.str();
+}
+#endif
+
+HostDisassemblerX86::HostDisassemblerX86()
+{
+	m_disasm.set_syntax_intel();
+}
+
+std::string HostDisassemblerX86::DisassembleHostBlock(const u8* code_start, const u32 code_size, u32* host_instructions_count)
+{
+	u64 disasmPtr = (u64)code_start;
+	const u8* end = code_start + code_size;
+
+	std::ostringstream x86_disasm;
+	while ((u8*)disasmPtr < end)
+	{
+		char inst_disasm[256];
+		disasmPtr += m_disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, inst_disasm);
+		x86_disasm << inst_disasm << std::endl;
+		(*host_instructions_count)++;
+	}
+
+	return x86_disasm.str();
+}
+
+HostDisassembler* GetNewDisassembler(const std::string& arch)
+{
+#if defined(HAS_LLVM)
+	if (arch == "x86")
+		return new HostDisassemblerLLVM("x86_64-none-unknown");
+	else if (arch == "aarch64")
+		return new HostDisassemblerLLVM("aarch64-none-unknown", 4, "cortex-a57");
+	else if (arch == "armv7")
+		return new HostDisassemblerLLVM("armv7-none-unknown", 4, "cortex-a15");
+#elif defined(_M_X86)
+	if (arch == "x86")
+		new HostDisassemblerX86();
+#endif
+	return new HostDisassembler();
+}
+
+std::string DisassembleBlock(HostDisassembler* disasm, u32* address, u32* host_instructions_count, u32* code_size)
+{
+	const u8* code;
+	int res = JitInterface::GetHostCode(address, &code, code_size);
+
+	if (res == 1)
+	{
+		*host_instructions_count = 0;
+		return "(No JIT active)";
+	}
+	else if (res == 2)
+	{
+		host_instructions_count = 0;
+		return "(No translation)";
+	}
+	return disasm->DisassembleHostBlock(code, *code_size, host_instructions_count);
+}
diff --git a/Source/Core/UICommon/Disassembler.h b/Source/Core/UICommon/Disassembler.h
new file mode 100644
index 0000000000..af3cf6f388
--- /dev/null
+++ b/Source/Core/UICommon/Disassembler.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class HostDisassembler
+{
+public:
+	virtual ~HostDisassembler() {}
+	virtual std::string DisassembleHostBlock(const u8* code_start, const u32 code_size, u32* host_instructions_count) { return "(No disassembler)"; }
+};
+
+HostDisassembler* GetNewDisassembler(const std::string& arch);
+std::string DisassembleBlock(HostDisassembler* disasm, u32* address, u32* host_instructions_count, u32* code_size);
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
new file mode 100644
index 0000000000..a8394d9ea4
--- /dev/null
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -0,0 +1,149 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#ifdef _WIN32
+#include <shlobj.h>    // for SHGetFolderPath
+#endif
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#if defined(__LIBUSB__) || defined (_WIN32)
+#include "Core/HW/SI_GCAdapter.h"
+#endif
+#include "Core/HW/Wiimote.h"
+
+#include "UICommon/UICommon.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace UICommon
+{
+
+void Init()
+{
+	LogManager::Init();
+	SConfig::Init();
+	VideoBackend::PopulateList();
+	WiimoteReal::LoadSettings();
+#if defined(__LIBUSB__) || defined (_WIN32)
+	SI_GCAdapter::Init();
+#endif
+	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
+
+	SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers);
+}
+
+void Shutdown()
+{
+#if defined(__LIBUSB__) || defined (_WIN32)
+	SI_GCAdapter::Shutdown();
+#endif
+	WiimoteReal::Shutdown();
+	VideoBackend::ClearList();
+	SConfig::Shutdown();
+	LogManager::Shutdown();
+}
+
+void CreateDirectories()
+{
+	// Copy initial Wii NAND data from Sys to User.
+	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR,
+				  File::GetUserPath(D_WIIROOT_IDX));
+
+	File::CreateFullPath(File::GetUserPath(D_USER_IDX));
+	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
+	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
+	File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
+	File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GAMESETTINGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_MAPS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX) + ANAGLYPH_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_THEMES_IDX));
+}
+
+void SetUserDirectory(const std::string& custom_path)
+{
+	if (!custom_path.empty())
+	{
+		File::CreateFullPath(custom_path + DIR_SEP);
+		File::SetUserPath(D_USER_IDX, custom_path + DIR_SEP);
+		return;
+	}
+
+	std::string user_path = "";
+#ifdef _WIN32
+	// Detect where the User directory is. There are five different cases (on top of the
+	// command line flag, which overrides all this):
+	// 1. GetExeDirectory()\portable.txt exists
+	//    -> Use GetExeDirectory()\User
+	// 2. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true
+	//    -> Use GetExeDirectory()\User
+	// 3. HKCU\Software\Dolphin Emulator\UserConfigPath exists
+	//    -> Use this as the user directory path
+	// 4. My Documents exists
+	//    -> Use My Documents\Dolphin Emulator as the User directory path
+	// 5. Default
+	//    -> Use GetExeDirectory()\User
+
+	// Check our registry keys
+	HKEY hkey;
+	DWORD local = 0;
+	TCHAR configPath[MAX_PATH] = {0};
+	if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
+	{
+		DWORD size = 4;
+		if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), nullptr, nullptr, reinterpret_cast<LPBYTE>(&local), &size) != ERROR_SUCCESS)
+			local = 0;
+
+		size = MAX_PATH;
+		if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), nullptr, nullptr, (LPBYTE)configPath, &size) != ERROR_SUCCESS)
+			configPath[0] = 0;
+		RegCloseKey(hkey);
+	}
+
+	local = local || File::Exists(File::GetExeDirectory() + DIR_SEP "portable.txt");
+
+	// Get Program Files path in case we need it.
+	TCHAR my_documents[MAX_PATH];
+	bool my_documents_found = SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, my_documents));
+
+	if (local) // Case 1-2
+		user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+	else if (configPath[0]) // Case 3
+		user_path = TStrToUTF8(configPath);
+	else if (my_documents_found) // Case 4
+		user_path = TStrToUTF8(my_documents) + DIR_SEP "Dolphin Emulator" DIR_SEP;
+	else // Case 5
+		user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+
+	// Prettify the path: it will be displayed in some places, we don't want a mix of \ and /.
+	user_path = ReplaceAll(user_path, "\\", DIR_SEP);
+
+	// Make sure it ends in DIR_SEP.
+	if (*user_path.rbegin() != DIR_SEP_CHR)
+		user_path += DIR_SEP;
+#else
+	if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
+		user_path = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
+	else
+		user_path = std::string(getenv("HOME") ?
+			getenv("HOME") : getenv("PWD") ?
+			getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP;
+#endif
+	File::SetUserPath(D_USER_IDX, user_path);
+}
+
+} // namespace UICommon
diff --git a/Source/Core/UICommon/UICommon.h b/Source/Core/UICommon/UICommon.h
new file mode 100644
index 0000000000..136d955eda
--- /dev/null
+++ b/Source/Core/UICommon/UICommon.h
@@ -0,0 +1,16 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace UICommon
+{
+
+void Init();
+void Shutdown();
+
+void CreateDirectories();
+void SetUserDirectory(const std::string& custom_path);
+
+} // namespace UICommon
diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
new file mode 100644
index 0000000000..cd542b24c1
--- /dev/null
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -0,0 +1,56 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{604C8368-F34A-4D55-82C8-CC92A0C13254}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{E54CF649-140E-4255-81A5-30A673C1FB36}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="UICommon.cpp" />
+    <ClCompile Include="Disassembler.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="UICommon.h" />
+    <ClInclude Include="Disassembler.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Source/Core/VideoBackends/CMakeLists.txt b/Source/Core/VideoBackends/CMakeLists.txt
new file mode 100644
index 0000000000..1f5772306f
--- /dev/null
+++ b/Source/Core/VideoBackends/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(OGL)
+add_subdirectory(Software)
+# TODO: Add other backends here!
diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.cpp b/Source/Core/VideoBackends/D3D/BoundingBox.cpp
new file mode 100644
index 0000000000..564a84a276
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/BoundingBox.cpp
@@ -0,0 +1,86 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/D3D/BoundingBox.h"
+
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+static ID3D11Buffer* s_bbox_buffer;
+static ID3D11Buffer* s_bbox_staging_buffer;
+static ID3D11UnorderedAccessView*  s_bbox_uav;
+
+ID3D11UnorderedAccessView* &BBox::GetUAV()
+{
+	return s_bbox_uav;
+}
+
+void BBox::Init()
+{
+	if (g_ActiveConfig.backend_info.bSupportsBBox)
+	{
+		// Create 2 buffers here.
+		// First for unordered access on default pool.
+		auto desc = CD3D11_BUFFER_DESC(4 * sizeof(s32), D3D11_BIND_UNORDERED_ACCESS, D3D11_USAGE_DEFAULT, 0, 0, 4);
+		int initial_values[4] = { 0, 0, 0, 0 };
+		D3D11_SUBRESOURCE_DATA data;
+		data.pSysMem = initial_values;
+		data.SysMemPitch = 4 * sizeof(s32);
+		data.SysMemSlicePitch = 0;
+		HRESULT hr;
+		hr = D3D::device->CreateBuffer(&desc, &data, &s_bbox_buffer);
+		CHECK(SUCCEEDED(hr), "Create BoundingBox Buffer.");
+		D3D::SetDebugObjectName(s_bbox_buffer, "BoundingBox Buffer");
+
+		// Second to use as a staging buffer.
+		desc.Usage = D3D11_USAGE_STAGING;
+		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+		desc.BindFlags = 0;
+		hr = D3D::device->CreateBuffer(&desc, nullptr, &s_bbox_staging_buffer);
+		CHECK(SUCCEEDED(hr), "Create BoundingBox Staging Buffer.");
+		D3D::SetDebugObjectName(s_bbox_staging_buffer, "BoundingBox Staging Buffer");
+
+		// UAV is required to allow concurrent access.
+		D3D11_UNORDERED_ACCESS_VIEW_DESC UAVdesc = {};
+		UAVdesc.Format = DXGI_FORMAT_R32_SINT;
+		UAVdesc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
+		UAVdesc.Buffer.FirstElement = 0;
+		UAVdesc.Buffer.Flags = 0;
+		UAVdesc.Buffer.NumElements = 4;
+		hr = D3D::device->CreateUnorderedAccessView(s_bbox_buffer, &UAVdesc, &s_bbox_uav);
+		CHECK(SUCCEEDED(hr), "Create BoundingBox UAV.");
+		D3D::SetDebugObjectName(s_bbox_uav, "BoundingBox UAV");
+	}
+}
+
+void BBox::Shutdown()
+{
+	SAFE_RELEASE(s_bbox_buffer);
+	SAFE_RELEASE(s_bbox_staging_buffer);
+	SAFE_RELEASE(s_bbox_uav);
+}
+
+void BBox::Set(int index, int value)
+{
+	D3D11_BOX box{ index * sizeof(s32), 0, 0, (index + 1) * sizeof(s32), 1, 1 };
+	D3D::context->UpdateSubresource(s_bbox_buffer, 0, &box, &value, 0, 0);
+}
+
+int BBox::Get(int index)
+{
+	int data = 0;
+	D3D::context->CopyResource(s_bbox_staging_buffer, s_bbox_buffer);
+	D3D11_MAPPED_SUBRESOURCE map;
+	HRESULT hr = D3D::context->Map(s_bbox_staging_buffer, 0, D3D11_MAP_READ, 0, &map);
+	if (SUCCEEDED(hr))
+	{
+		data = ((s32*)map.pData)[index];
+	}
+	D3D::context->Unmap(s_bbox_staging_buffer, 0);
+	return data;
+}
+
+};
diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.h b/Source/Core/VideoBackends/D3D/BoundingBox.h
new file mode 100644
index 0000000000..8fd359a356
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/BoundingBox.h
@@ -0,0 +1,22 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+#include "VideoBackends/D3D/D3DBase.h"
+
+namespace DX11
+{
+
+class BBox
+{
+public:
+	static ID3D11UnorderedAccessView* &GetUAV();
+	static void Init();
+	static void Shutdown();
+
+	static void Set(int index, int value);
+	static int Get(int index);
+};
+
+};
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
new file mode 100644
index 0000000000..37299fdfa4
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -0,0 +1,91 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClCompile Include="BoundingBox.cpp" />
+    <ClCompile Include="D3DBase.cpp" />
+    <ClCompile Include="D3DBlob.cpp" />
+    <ClCompile Include="D3DShader.cpp" />
+    <ClCompile Include="D3DState.cpp" />
+    <ClCompile Include="D3DTexture.cpp" />
+    <ClCompile Include="D3DUtil.cpp" />
+    <ClCompile Include="FramebufferManager.cpp" />
+    <ClCompile Include="GeometryShaderCache.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="NativeVertexFormat.cpp" />
+    <ClCompile Include="PerfQuery.cpp" />
+    <ClCompile Include="PixelShaderCache.cpp" />
+    <ClCompile Include="PSTextureEncoder.cpp" />
+    <ClCompile Include="Render.cpp" />
+    <ClCompile Include="Television.cpp" />
+    <ClCompile Include="TextureCache.cpp" />
+    <ClCompile Include="VertexManager.cpp" />
+    <ClCompile Include="VertexShaderCache.cpp" />
+    <ClCompile Include="XFBEncoder.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BoundingBox.h" />
+    <ClInclude Include="D3DBase.h" />
+    <ClInclude Include="D3DBlob.h" />
+    <ClInclude Include="D3DShader.h" />
+    <ClInclude Include="D3DState.h" />
+    <ClInclude Include="D3DTexture.h" />
+    <ClInclude Include="D3DUtil.h" />
+    <ClInclude Include="FramebufferManager.h" />
+    <ClInclude Include="GeometryShaderCache.h" />
+    <ClInclude Include="Globals.h" />
+    <ClInclude Include="main.h" />
+    <ClInclude Include="PerfQuery.h" />
+    <ClInclude Include="PixelShaderCache.h" />
+    <ClInclude Include="PSTextureEncoder.h" />
+    <ClInclude Include="Render.h" />
+    <ClInclude Include="Television.h" />
+    <ClInclude Include="TextureCache.h" />
+    <ClInclude Include="TextureEncoder.h" />
+    <ClInclude Include="VertexManager.h" />
+    <ClInclude Include="VertexShaderCache.h" />
+    <ClInclude Include="VideoBackend.h" />
+    <ClInclude Include="XFBEncoder.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
new file mode 100644
index 0000000000..e5f5baf882
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="D3D">
+      <UniqueIdentifier>{ae700f7e-33c8-45b5-b7ee-a0ded3630549}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Render">
+      <UniqueIdentifier>{3683d29b-19f6-4e7a-803f-4ac70b1d49fd}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="D3DBase.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="D3DBlob.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="D3DShader.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="D3DTexture.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="D3DUtil.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="D3DState.cpp">
+      <Filter>D3D</Filter>
+    </ClCompile>
+    <ClCompile Include="FramebufferManager.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="GeometryShaderCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="NativeVertexFormat.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="PerfQuery.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="PixelShaderCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="PSTextureEncoder.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="Render.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="Television.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexManager.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexShaderCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="XFBEncoder.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="BoundingBox.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="D3DBase.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="D3DBlob.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="D3DShader.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="D3DTexture.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="D3DUtil.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="D3DState.h">
+      <Filter>D3D</Filter>
+    </ClInclude>
+    <ClInclude Include="FramebufferManager.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="GeometryShaderCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="PerfQuery.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="PixelShaderCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="PSTextureEncoder.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="Render.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="Television.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureEncoder.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexManager.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexShaderCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="XFBEncoder.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="Globals.h" />
+    <ClInclude Include="main.h" />
+    <ClInclude Include="VideoBackend.h" />
+    <ClInclude Include="BoundingBox.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
new file mode 100644
index 0000000000..8439f95ef6
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -0,0 +1,555 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/StringUtil.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DTexture.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+HINSTANCE hD3DCompilerDll = nullptr;
+D3DREFLECT PD3DReflect = nullptr;
+pD3DCompile PD3DCompile = nullptr;
+int d3dcompiler_dll_ref = 0;
+
+CREATEDXGIFACTORY PCreateDXGIFactory = nullptr;
+HINSTANCE hDXGIDll = nullptr;
+int dxgi_dll_ref = 0;
+
+typedef HRESULT (WINAPI* D3D11CREATEDEVICEANDSWAPCHAIN)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, CONST DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
+static D3D11CREATEDEVICE PD3D11CreateDevice = nullptr;
+D3D11CREATEDEVICEANDSWAPCHAIN PD3D11CreateDeviceAndSwapChain = nullptr;
+HINSTANCE hD3DDll = nullptr;
+int d3d_dll_ref = 0;
+
+namespace D3D
+{
+
+ID3D11Device* device = nullptr;
+ID3D11DeviceContext* context = nullptr;
+static IDXGISwapChain* swapchain = nullptr;
+static ID3D11Debug* debug = nullptr;
+D3D_FEATURE_LEVEL featlevel;
+D3DTexture2D* backbuf = nullptr;
+HWND hWnd;
+
+std::vector<DXGI_SAMPLE_DESC> aa_modes; // supported AA modes of the current adapter
+
+bool bgra_textures_supported;
+
+#define NUM_SUPPORTED_FEATURE_LEVELS 3
+const D3D_FEATURE_LEVEL supported_feature_levels[NUM_SUPPORTED_FEATURE_LEVELS] = {
+	D3D_FEATURE_LEVEL_11_0,
+	D3D_FEATURE_LEVEL_10_1,
+	D3D_FEATURE_LEVEL_10_0
+};
+
+unsigned int xres, yres;
+
+bool bFrameInProgress = false;
+
+HRESULT LoadDXGI()
+{
+	if (dxgi_dll_ref++ > 0) return S_OK;
+
+	if (hDXGIDll) return S_OK;
+	hDXGIDll = LoadLibraryA("dxgi.dll");
+	if (!hDXGIDll)
+	{
+		MessageBoxA(nullptr, "Failed to load dxgi.dll", "Critical error", MB_OK | MB_ICONERROR);
+		--dxgi_dll_ref;
+		return E_FAIL;
+	}
+	PCreateDXGIFactory = (CREATEDXGIFACTORY)GetProcAddress(hDXGIDll, "CreateDXGIFactory");
+	if (PCreateDXGIFactory == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for CreateDXGIFactory!", "Critical error", MB_OK | MB_ICONERROR);
+
+	return S_OK;
+}
+
+HRESULT LoadD3D()
+{
+	if (d3d_dll_ref++ > 0) return S_OK;
+
+	if (hD3DDll) return S_OK;
+	hD3DDll = LoadLibraryA("d3d11.dll");
+	if (!hD3DDll)
+	{
+		MessageBoxA(nullptr, "Failed to load d3d11.dll", "Critical error", MB_OK | MB_ICONERROR);
+		--d3d_dll_ref;
+		return E_FAIL;
+	}
+	PD3D11CreateDevice = (D3D11CREATEDEVICE)GetProcAddress(hD3DDll, "D3D11CreateDevice");
+	if (PD3D11CreateDevice == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3D11CreateDevice!", "Critical error", MB_OK | MB_ICONERROR);
+
+	PD3D11CreateDeviceAndSwapChain = (D3D11CREATEDEVICEANDSWAPCHAIN)GetProcAddress(hD3DDll, "D3D11CreateDeviceAndSwapChain");
+	if (PD3D11CreateDeviceAndSwapChain == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3D11CreateDeviceAndSwapChain!", "Critical error", MB_OK | MB_ICONERROR);
+
+	return S_OK;
+}
+
+HRESULT LoadD3DCompiler()
+{
+	if (d3dcompiler_dll_ref++ > 0) return S_OK;
+	if (hD3DCompilerDll) return S_OK;
+
+	// try to load D3DCompiler first to check whether we have proper runtime support
+	// try to use the dll the backend was compiled against first - don't bother about debug runtimes
+	hD3DCompilerDll = LoadLibraryA(D3DCOMPILER_DLL_A);
+	if (!hD3DCompilerDll)
+	{
+		// if that fails, use the dll which should be available in every SDK which officially supports DX11.
+		hD3DCompilerDll = LoadLibraryA("D3DCompiler_42.dll");
+		if (!hD3DCompilerDll)
+		{
+			MessageBoxA(nullptr, "Failed to load D3DCompiler_42.dll, update your DX11 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
+			return E_FAIL;
+		}
+		else
+		{
+			NOTICE_LOG(VIDEO, "Successfully loaded D3DCompiler_42.dll. If you're having trouble, try updating your DX runtime first.");
+		}
+	}
+
+	PD3DReflect = (D3DREFLECT)GetProcAddress(hD3DCompilerDll, "D3DReflect");
+	if (PD3DReflect == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3DReflect!", "Critical error", MB_OK | MB_ICONERROR);
+	PD3DCompile = (pD3DCompile)GetProcAddress(hD3DCompilerDll, "D3DCompile");
+	if (PD3DCompile == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3DCompile!", "Critical error", MB_OK | MB_ICONERROR);
+
+	return S_OK;
+}
+
+void UnloadDXGI()
+{
+	if (!dxgi_dll_ref) return;
+	if (--dxgi_dll_ref != 0) return;
+
+	if (hDXGIDll) FreeLibrary(hDXGIDll);
+	hDXGIDll = nullptr;
+	PCreateDXGIFactory = nullptr;
+}
+
+void UnloadD3D()
+{
+	if (!d3d_dll_ref) return;
+	if (--d3d_dll_ref != 0) return;
+
+	if (hD3DDll) FreeLibrary(hD3DDll);
+	hD3DDll = nullptr;
+	PD3D11CreateDevice = nullptr;
+	PD3D11CreateDeviceAndSwapChain = nullptr;
+}
+
+void UnloadD3DCompiler()
+{
+	if (!d3dcompiler_dll_ref) return;
+	if (--d3dcompiler_dll_ref != 0) return;
+
+	if (hD3DCompilerDll) FreeLibrary(hD3DCompilerDll);
+	hD3DCompilerDll = nullptr;
+	PD3DReflect = nullptr;
+}
+
+std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter)
+{
+	std::vector<DXGI_SAMPLE_DESC> _aa_modes;
+
+	// NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND shader resources.
+	// Thus, we can't have MSAA with 10.0 level hardware.
+	ID3D11Device* _device;
+	ID3D11DeviceContext* _context;
+	D3D_FEATURE_LEVEL feat_level;
+	HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &_device, &feat_level, &_context);
+	if (FAILED(hr) || feat_level == D3D_FEATURE_LEVEL_10_0)
+	{
+		DXGI_SAMPLE_DESC desc;
+		desc.Count = 1;
+		desc.Quality = 0;
+		_aa_modes.push_back(desc);
+		SAFE_RELEASE(_context);
+		SAFE_RELEASE(_device);
+	}
+	else
+	{
+		for (int samples = 0; samples < D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples)
+		{
+			UINT quality_levels = 0;
+			_device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, &quality_levels);
+			if (quality_levels > 0)
+			{
+				DXGI_SAMPLE_DESC desc;
+				desc.Count = samples;
+				for (desc.Quality = 0; desc.Quality < quality_levels; ++desc.Quality)
+					_aa_modes.push_back(desc);
+			}
+		}
+		_context->Release();
+		_device->Release();
+	}
+	return _aa_modes;
+}
+
+D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter)
+{
+	D3D_FEATURE_LEVEL feat_level = D3D_FEATURE_LEVEL_9_1;
+	PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, nullptr, &feat_level, nullptr);
+	return feat_level;
+}
+
+DXGI_SAMPLE_DESC GetAAMode(int index)
+{
+	return aa_modes[index];
+}
+
+HRESULT Create(HWND wnd)
+{
+	hWnd = wnd;
+	HRESULT hr;
+
+	RECT client;
+	GetClientRect(hWnd, &client);
+	xres = client.right - client.left;
+	yres = client.bottom - client.top;
+
+	hr = LoadDXGI();
+	if (SUCCEEDED(hr)) hr = LoadD3D();
+	if (SUCCEEDED(hr)) hr = LoadD3DCompiler();
+	if (FAILED(hr))
+	{
+		UnloadDXGI();
+		UnloadD3D();
+		UnloadD3DCompiler();
+		return hr;
+	}
+
+	IDXGIFactory* factory;
+	IDXGIAdapter* adapter;
+	IDXGIOutput* output;
+	hr = PCreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&factory);
+	if (FAILED(hr)) MessageBox(wnd, _T("Failed to create IDXGIFactory object"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+
+	hr = factory->EnumAdapters(g_ActiveConfig.iAdapter, &adapter);
+	if (FAILED(hr))
+	{
+		// try using the first one
+		hr = factory->EnumAdapters(0, &adapter);
+		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate adapters"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+	}
+
+	// TODO: Make this configurable
+	hr = adapter->EnumOutputs(0, &output);
+	if (FAILED(hr))
+	{
+		// try using the first one
+		IDXGIAdapter* firstadapter;
+		hr = factory->EnumAdapters(0, &firstadapter);
+		if (!FAILED(hr))
+			hr = firstadapter->EnumOutputs(0, &output);
+		if (FAILED(hr)) MessageBox(wnd,
+			_T("Failed to enumerate outputs!\n")
+			_T("This usually happens when you've set your video adapter to the Nvidia GPU in an Optimus-equipped system.\n")
+			_T("Set Dolphin to use the high-performance graphics in Nvidia's drivers instead and leave Dolphin's video adapter set to the Intel GPU."),
+			_T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+		SAFE_RELEASE(firstadapter);
+	}
+
+	// get supported AA modes
+	aa_modes = EnumAAModes(adapter);
+	if (g_Config.iMultisampleMode >= (int)aa_modes.size())
+	{
+		g_Config.iMultisampleMode = 0;
+		UpdateActiveConfig();
+	}
+
+	DXGI_SWAP_CHAIN_DESC swap_chain_desc = {};
+	swap_chain_desc.BufferCount = 1;
+	swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+	swap_chain_desc.OutputWindow = wnd;
+	swap_chain_desc.SampleDesc.Count = 1;
+	swap_chain_desc.SampleDesc.Quality = 0;
+	swap_chain_desc.Windowed = !g_Config.bFullscreen;
+
+	DXGI_OUTPUT_DESC out_desc = {};
+	output->GetDesc(&out_desc);
+
+	DXGI_MODE_DESC mode_desc = {};
+	mode_desc.Width = out_desc.DesktopCoordinates.right - out_desc.DesktopCoordinates.left;
+	mode_desc.Height = out_desc.DesktopCoordinates.bottom - out_desc.DesktopCoordinates.top;
+	mode_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+	mode_desc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
+	hr = output->FindClosestMatchingMode(&mode_desc, &swap_chain_desc.BufferDesc, nullptr);
+	if (FAILED(hr)) MessageBox(wnd, _T("Failed to find a supported video mode"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+
+	if (swap_chain_desc.Windowed)
+	{
+		// forcing buffer resolution to xres and yres..
+		// this is not a problem as long as we're in windowed mode
+		swap_chain_desc.BufferDesc.Width = xres;
+		swap_chain_desc.BufferDesc.Height = yres;
+	}
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	// Creating debug devices can sometimes fail if the user doesn't have the correct
+	// version of the DirectX SDK. If it does, simply fallback to a non-debug device.
+	{
+		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+											D3D11_CREATE_DEVICE_SINGLETHREADED | D3D11_CREATE_DEVICE_DEBUG,
+											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
+											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
+											&featlevel, &context);
+		// Debugbreak on D3D error
+		if (SUCCEEDED(hr) && SUCCEEDED(device->QueryInterface(__uuidof(ID3D11Debug), (void**)&debug)))
+		{
+			ID3D11InfoQueue* infoQueue = nullptr;
+			if (SUCCEEDED(debug->QueryInterface(__uuidof(ID3D11InfoQueue), (void**)&infoQueue)))
+			{
+				infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, true);
+				infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, true);
+
+				D3D11_MESSAGE_ID hide[] =
+				{
+					D3D11_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS
+				};
+
+				D3D11_INFO_QUEUE_FILTER filter = {};
+				filter.DenyList.NumIDs = sizeof(hide) / sizeof(D3D11_MESSAGE_ID);
+				filter.DenyList.pIDList = hide;
+				infoQueue->AddStorageFilterEntries(&filter);
+				infoQueue->Release();
+			}
+		}
+	}
+
+	if (FAILED(hr))
+#endif
+	{
+		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+											D3D11_CREATE_DEVICE_SINGLETHREADED,
+											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
+											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
+											&featlevel, &context);
+	}
+
+	if (FAILED(hr))
+	{
+		MessageBox(wnd, _T("Failed to initialize Direct3D.\nMake sure your video card supports at least D3D 10.0"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+		SAFE_RELEASE(device);
+		SAFE_RELEASE(context);
+		SAFE_RELEASE(swapchain);
+		return E_FAIL;
+	}
+
+	// prevent DXGI from responding to Alt+Enter, unfortunately DXGI_MWA_NO_ALT_ENTER
+	// does not work so we disable all monitoring of window messages. However this
+	// may make it more difficult for DXGI to handle display mode changes.
+	hr = factory->MakeWindowAssociation(wnd, DXGI_MWA_NO_WINDOW_CHANGES);
+	if (FAILED(hr)) MessageBox(wnd, _T("Failed to associate the window"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+
+	SetDebugObjectName((ID3D11DeviceChild*)context, "device context");
+	SAFE_RELEASE(factory);
+	SAFE_RELEASE(output);
+	SAFE_RELEASE(adapter);
+
+	ID3D11Texture2D* buf;
+	hr = swapchain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&buf);
+	if (FAILED(hr))
+	{
+		MessageBox(wnd, _T("Failed to get swapchain buffer"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+		SAFE_RELEASE(device);
+		SAFE_RELEASE(context);
+		SAFE_RELEASE(swapchain);
+		return E_FAIL;
+	}
+	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
+	SAFE_RELEASE(buf);
+	CHECK(backbuf!=nullptr, "Create back buffer texture");
+	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
+	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
+
+	context->OMSetRenderTargets(1, &backbuf->GetRTV(), nullptr);
+
+	// BGRA textures are easier to deal with in TextureCache, but might not be supported by the hardware
+	UINT format_support;
+	device->CheckFormatSupport(DXGI_FORMAT_B8G8R8A8_UNORM, &format_support);
+	bgra_textures_supported = (format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
+
+	stateman = new StateManager;
+	return S_OK;
+}
+
+void Close()
+{
+	// we can't release the swapchain while in fullscreen.
+	swapchain->SetFullscreenState(false, nullptr);
+
+	// release all bound resources
+	context->ClearState();
+	SAFE_RELEASE(backbuf);
+	SAFE_RELEASE(swapchain);
+	SAFE_DELETE(stateman);
+	context->Flush();  // immediately destroy device objects
+
+	SAFE_RELEASE(context);
+	ULONG references = device->Release();
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (debug)
+	{
+		--references; // the debug interface increases the refcount of the device, subtract that.
+		if (references)
+		{
+			// print out alive objects, but only if we actually have pending references
+			// note this will also print out internal live objects to the debug console
+			debug->ReportLiveDeviceObjects(D3D11_RLDO_SUMMARY | D3D11_RLDO_DETAIL);
+		}
+		SAFE_RELEASE(debug)
+	}
+#endif
+
+	if (references)
+	{
+		ERROR_LOG(VIDEO, "Unreleased references: %i.", references);
+	}
+	else
+	{
+		NOTICE_LOG(VIDEO, "Successfully released all device references!");
+	}
+	device = nullptr;
+
+	// unload DLLs
+	UnloadD3D();
+	UnloadDXGI();
+}
+
+const char* VertexShaderVersionString()
+{
+	if (featlevel == D3D_FEATURE_LEVEL_11_0) return "vs_5_0";
+	else if (featlevel == D3D_FEATURE_LEVEL_10_1) return "vs_4_1";
+	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "vs_4_0";
+}
+
+const char* GeometryShaderVersionString()
+{
+	if (featlevel == D3D_FEATURE_LEVEL_11_0) return "gs_5_0";
+	else if (featlevel == D3D_FEATURE_LEVEL_10_1) return "gs_4_1";
+	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "gs_4_0";
+}
+
+const char* PixelShaderVersionString()
+{
+	if (featlevel == D3D_FEATURE_LEVEL_11_0) return "ps_5_0";
+	else if (featlevel == D3D_FEATURE_LEVEL_10_1) return "ps_4_1";
+	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "ps_4_0";
+}
+
+D3DTexture2D* &GetBackBuffer() { return backbuf; }
+unsigned int GetBackBufferWidth() { return xres; }
+unsigned int GetBackBufferHeight() { return yres; }
+
+bool BGRATexturesSupported() { return bgra_textures_supported; }
+
+// Returns the maximum width/height of a texture. This value only depends upon the feature level in DX11
+unsigned int GetMaxTextureSize()
+{
+	switch (featlevel)
+	{
+		case D3D_FEATURE_LEVEL_11_0:
+			return D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+
+		case D3D_FEATURE_LEVEL_10_1:
+		case D3D_FEATURE_LEVEL_10_0:
+			return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+
+		case D3D_FEATURE_LEVEL_9_3:
+			return 4096;
+
+		case D3D_FEATURE_LEVEL_9_2:
+		case D3D_FEATURE_LEVEL_9_1:
+			return 2048;
+
+		default:
+			return 0;
+	}
+}
+
+void Reset()
+{
+	// release all back buffer references
+	SAFE_RELEASE(backbuf);
+
+	// resize swapchain buffers
+	RECT client;
+	GetClientRect(hWnd, &client);
+	xres = client.right - client.left;
+	yres = client.bottom - client.top;
+	D3D::swapchain->ResizeBuffers(1, xres, yres, DXGI_FORMAT_R8G8B8A8_UNORM, 0);
+
+	// recreate back buffer texture
+	ID3D11Texture2D* buf;
+	HRESULT hr = swapchain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&buf);
+	if (FAILED(hr))
+	{
+		MessageBox(hWnd, _T("Failed to get swapchain buffer"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
+		SAFE_RELEASE(device);
+		SAFE_RELEASE(context);
+		SAFE_RELEASE(swapchain);
+		return;
+	}
+	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
+	SAFE_RELEASE(buf);
+	CHECK(backbuf!=nullptr, "Create back buffer texture");
+	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
+	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
+}
+
+bool BeginFrame()
+{
+	if (bFrameInProgress)
+	{
+		PanicAlert("BeginFrame called although a frame is already in progress");
+		return false;
+	}
+	bFrameInProgress = true;
+	return (device != nullptr);
+}
+
+void EndFrame()
+{
+	if (!bFrameInProgress)
+	{
+		PanicAlert("EndFrame called although no frame is in progress");
+		return;
+	}
+	bFrameInProgress = false;
+}
+
+void Present()
+{
+	// TODO: Is 1 the correct value for vsyncing?
+	swapchain->Present((UINT)g_ActiveConfig.IsVSync(), 0);
+}
+
+HRESULT SetFullscreenState(bool enable_fullscreen)
+{
+	return swapchain->SetFullscreenState(enable_fullscreen, nullptr);
+}
+
+HRESULT GetFullscreenState(bool* fullscreen_state)
+{
+	if (fullscreen_state == nullptr)
+	{
+		return E_POINTER;
+	}
+
+	BOOL state;
+	HRESULT hr = swapchain->GetFullscreenState(&state, nullptr);
+	*fullscreen_state = !!state;
+	return hr;
+}
+
+}  // namespace D3D
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h
new file mode 100644
index 0000000000..51e4a8bf0a
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@@ -0,0 +1,106 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <dxgi.h>
+#include <vector>
+
+#include "Common/Common.h"
+
+namespace DX11
+{
+
+#define SAFE_RELEASE(x) { if (x) (x)->Release(); (x) = nullptr; }
+#define SAFE_DELETE(x) { delete (x); (x) = nullptr; }
+#define SAFE_DELETE_ARRAY(x) { delete[] (x); (x) = nullptr; }
+#define CHECK(cond, Message, ...) if (!(cond)) { PanicAlert(__FUNCTION__ " failed in %s at line %d: " Message, __FILE__, __LINE__, __VA_ARGS__); }
+
+class D3DTexture2D;
+
+namespace D3D
+{
+
+HRESULT LoadDXGI();
+HRESULT LoadD3D();
+HRESULT LoadD3DCompiler();
+void UnloadDXGI();
+void UnloadD3D();
+void UnloadD3DCompiler();
+
+D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter);
+std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter);
+DXGI_SAMPLE_DESC GetAAMode(int index);
+
+HRESULT Create(HWND wnd);
+void Close();
+
+extern ID3D11Device* device;
+extern ID3D11DeviceContext* context;
+extern HWND hWnd;
+extern bool bFrameInProgress;
+
+void Reset();
+bool BeginFrame();
+void EndFrame();
+void Present();
+
+unsigned int GetBackBufferWidth();
+unsigned int GetBackBufferHeight();
+D3DTexture2D* &GetBackBuffer();
+const char* PixelShaderVersionString();
+const char* GeometryShaderVersionString();
+const char* VertexShaderVersionString();
+bool BGRATexturesSupported();
+
+unsigned int GetMaxTextureSize();
+
+HRESULT SetFullscreenState(bool enable_fullscreen);
+HRESULT GetFullscreenState(bool* fullscreen_state);
+
+// This function will assign a name to the given resource.
+// The DirectX debug layer will make it easier to identify resources that way,
+// e.g. when listing up all resources who have unreleased references.
+template <typename T>
+void SetDebugObjectName(T resource, const char* name)
+{
+	static_assert(std::is_convertible<T, ID3D11DeviceChild*>::value,
+		"resource must be convertible to ID3D11DeviceChild*");
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (resource)
+		resource->SetPrivateData(WKPDID_D3DDebugObjectName, (UINT)(name ? strlen(name) : 0), name);
+#endif
+}
+
+template <typename T>
+std::string GetDebugObjectName(T resource)
+{
+	static_assert(std::is_convertible<T, ID3D11DeviceChild*>::value,
+		"resource must be convertible to ID3D11DeviceChild*");
+	std::string name;
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (resource)
+	{
+		UINT size = 0;
+		resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, nullptr); //get required size
+		name.resize(size);
+		resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, const_cast<char*>(name.data()));
+	}
+#endif
+	return name;
+}
+
+}  // namespace D3D
+
+typedef HRESULT (WINAPI* CREATEDXGIFACTORY)(REFIID, void**);
+extern CREATEDXGIFACTORY PCreateDXGIFactory;
+typedef HRESULT (WINAPI* D3D11CREATEDEVICE)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
+
+typedef HRESULT (WINAPI* D3DREFLECT)(LPCVOID, SIZE_T, REFIID, void**);
+extern D3DREFLECT PD3DReflect;
+extern pD3DCompile PD3DCompile;
+
+}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp b/Source/Core/VideoBackends/D3D/D3DBlob.cpp
similarity index 76%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
rename to Source/Core/VideoBackends/D3D/D3DBlob.cpp
index 26c8c8ba85..db5210e539 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBlob.cpp
@@ -1,14 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #include <d3d11.h>
-#include "D3DBlob.h"
+
+#include "VideoBackends/D3D/D3DBlob.h"
 
 namespace DX11
 {
 
-D3DBlob::D3DBlob(unsigned int blob_size, const u8* init_data) : ref(1), size(blob_size), blob(NULL)
+D3DBlob::D3DBlob(unsigned int blob_size, const u8* init_data) : ref(1), size(blob_size), blob(nullptr)
 {
 	data = new u8[blob_size];
 	if (init_data) memcpy(data, init_data, size);
@@ -43,7 +44,7 @@ unsigned int D3DBlob::Release()
 	return ref;
 }
 
-unsigned int D3DBlob::Size()
+unsigned int D3DBlob::Size() const
 {
 	return size;
 }
@@ -53,4 +54,4 @@ u8* D3DBlob::Data()
 	return data;
 }
 
-}  // namespace DX11
\ No newline at end of file
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.h b/Source/Core/VideoBackends/D3D/D3DBlob.h
new file mode 100644
index 0000000000..cbdc7f5792
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DBlob.h
@@ -0,0 +1,40 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+struct ID3D10Blob;
+
+namespace DX11
+{
+
+// use this class instead ID3D10Blob or ID3D11Blob whenever possible
+class D3DBlob
+{
+public:
+	// memory will be copied into an own buffer
+	D3DBlob(unsigned int blob_size, const u8* init_data = nullptr);
+
+	// d3dblob will be AddRef'd
+	D3DBlob(ID3D10Blob* d3dblob);
+
+	void AddRef();
+	unsigned int Release();
+
+	unsigned int Size() const;
+	u8* Data();
+
+private:
+	~D3DBlob();
+
+	unsigned int ref;
+	unsigned int size;
+
+	u8* data;
+	ID3D10Blob* blob;
+};
+
+}  // namespace
diff --git a/Source/Core/VideoBackends/D3D/D3DShader.cpp b/Source/Core/VideoBackends/D3D/D3DShader.cpp
new file mode 100644
index 0000000000..665c0cf644
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DShader.cpp
@@ -0,0 +1,221 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/StringUtil.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+namespace D3D
+{
+
+// bytecode->shader
+ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigned int len)
+{
+	ID3D11VertexShader* v_shader;
+	HRESULT hr = D3D::device->CreateVertexShader(bytecode, len, nullptr, &v_shader);
+	if (FAILED(hr))
+		return nullptr;
+
+	return v_shader;
+}
+
+// code->bytecode
+bool CompileVertexShader(const std::string& code, D3DBlob** blob)
+{
+	ID3D10Blob* shaderBuffer = nullptr;
+	ID3D10Blob* errorBuffer = nullptr;
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG;
+#else
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
+#endif
+	HRESULT hr = PD3DCompile(code.c_str(), code.length(), nullptr, nullptr, nullptr, "main", D3D::VertexShaderVersionString(),
+							flags, 0, &shaderBuffer, &errorBuffer);
+	if (errorBuffer)
+	{
+		INFO_LOG(VIDEO, "Vertex shader compiler messages:\n%s\n",
+			(const char*)errorBuffer->GetBufferPointer());
+	}
+
+	if (FAILED(hr))
+	{
+		static int num_failures = 0;
+		std::string filename = StringFromFormat("%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+		std::ofstream file;
+		OpenFStream(file, filename, std::ios_base::out);
+		file << code;
+		file.close();
+
+		PanicAlert("Failed to compile vertex shader: %s\nDebug info (%s):\n%s",
+		           filename.c_str(), D3D::VertexShaderVersionString(), (const char*)errorBuffer->GetBufferPointer());
+
+		*blob = nullptr;
+		errorBuffer->Release();
+	}
+	else
+	{
+		*blob = new D3DBlob(shaderBuffer);
+		shaderBuffer->Release();
+	}
+	return SUCCEEDED(hr);
+}
+
+// bytecode->shader
+ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, unsigned int len)
+{
+	ID3D11GeometryShader* g_shader;
+	HRESULT hr = D3D::device->CreateGeometryShader(bytecode, len, nullptr, &g_shader);
+	if (FAILED(hr))
+		return nullptr;
+
+	return g_shader;
+}
+
+// code->bytecode
+bool CompileGeometryShader(const std::string& code, D3DBlob** blob, const D3D_SHADER_MACRO* pDefines)
+{
+	ID3D10Blob* shaderBuffer = nullptr;
+	ID3D10Blob* errorBuffer = nullptr;
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG;
+#else
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
+#endif
+	HRESULT hr = PD3DCompile(code.c_str(), code.length(), nullptr, pDefines, nullptr, "main", D3D::GeometryShaderVersionString(),
+							flags, 0, &shaderBuffer, &errorBuffer);
+
+	if (errorBuffer)
+	{
+		INFO_LOG(VIDEO, "Geometry shader compiler messages:\n%s\n",
+			(const char*)errorBuffer->GetBufferPointer());
+	}
+
+	if (FAILED(hr))
+	{
+		static int num_failures = 0;
+		std::string filename = StringFromFormat("%sbad_gs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+		std::ofstream file;
+		OpenFStream(file, filename, std::ios_base::out);
+		file << code;
+		file.close();
+
+		PanicAlert("Failed to compile geometry shader: %s\nDebug info (%s):\n%s",
+		           filename.c_str(), D3D::GeometryShaderVersionString(), (const char*)errorBuffer->GetBufferPointer());
+
+		*blob = nullptr;
+		errorBuffer->Release();
+	}
+	else
+	{
+		*blob = new D3DBlob(shaderBuffer);
+		shaderBuffer->Release();
+	}
+	return SUCCEEDED(hr);
+}
+
+// bytecode->shader
+ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned int len)
+{
+	ID3D11PixelShader* p_shader;
+	HRESULT hr = D3D::device->CreatePixelShader(bytecode, len, nullptr, &p_shader);
+	if (FAILED(hr))
+	{
+		PanicAlert("CreatePixelShaderFromByteCode failed at %s %d\n", __FILE__, __LINE__);
+		p_shader = nullptr;
+	}
+	return p_shader;
+}
+
+// code->bytecode
+bool CompilePixelShader(const std::string& code, D3DBlob** blob, const D3D_SHADER_MACRO* pDefines)
+{
+	ID3D10Blob* shaderBuffer = nullptr;
+	ID3D10Blob* errorBuffer = nullptr;
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	UINT flags = D3D10_SHADER_DEBUG;
+#else
+	UINT flags = D3D10_SHADER_OPTIMIZATION_LEVEL3;
+#endif
+	HRESULT hr = PD3DCompile(code.c_str(), code.length(), nullptr, pDefines, nullptr, "main", D3D::PixelShaderVersionString(),
+							flags, 0, &shaderBuffer, &errorBuffer);
+
+	if (errorBuffer)
+	{
+		INFO_LOG(VIDEO, "Pixel shader compiler messages:\n%s",
+			(const char*)errorBuffer->GetBufferPointer());
+	}
+
+	if (FAILED(hr))
+	{
+		static int num_failures = 0;
+		std::string filename = StringFromFormat("%sbad_ps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+		std::ofstream file;
+		OpenFStream(file, filename, std::ios_base::out);
+		file << code;
+		file.close();
+
+		PanicAlert("Failed to compile pixel shader: %s\nDebug info (%s):\n%s",
+		           filename.c_str(), D3D::PixelShaderVersionString(), (const char*)errorBuffer->GetBufferPointer());
+
+		*blob = nullptr;
+		errorBuffer->Release();
+	}
+	else
+	{
+		*blob = new D3DBlob(shaderBuffer);
+		shaderBuffer->Release();
+	}
+
+	return SUCCEEDED(hr);
+}
+
+ID3D11VertexShader* CompileAndCreateVertexShader(const std::string& code)
+{
+	D3DBlob* blob = nullptr;
+	if (CompileVertexShader(code, &blob))
+	{
+		ID3D11VertexShader* v_shader = CreateVertexShaderFromByteCode(blob);
+		blob->Release();
+		return v_shader;
+	}
+	return nullptr;
+}
+
+ID3D11GeometryShader* CompileAndCreateGeometryShader(const std::string& code, const D3D_SHADER_MACRO* pDefines)
+{
+	D3DBlob* blob = nullptr;
+	if (CompileGeometryShader(code, &blob, pDefines))
+	{
+		ID3D11GeometryShader* g_shader = CreateGeometryShaderFromByteCode(blob);
+		blob->Release();
+		return g_shader;
+	}
+	return nullptr;
+}
+
+ID3D11PixelShader* CompileAndCreatePixelShader(const std::string& code)
+{
+	D3DBlob* blob = nullptr;
+	CompilePixelShader(code, &blob);
+	if (blob)
+	{
+		ID3D11PixelShader* p_shader = CreatePixelShaderFromByteCode(blob);
+		blob->Release();
+		return p_shader;
+	}
+	return nullptr;
+}
+
+}  // namespace
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DShader.h b/Source/Core/VideoBackends/D3D/D3DShader.h
new file mode 100644
index 0000000000..033987e9aa
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DShader.h
@@ -0,0 +1,57 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBlob.h"
+
+struct ID3D11PixelShader;
+struct ID3D11VertexShader;
+
+namespace DX11
+{
+
+namespace D3D
+{
+	ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigned int len);
+	ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, unsigned int len);
+	ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned int len);
+
+	// The returned bytecode buffers should be Release()d.
+	bool CompileVertexShader(const std::string& code, D3DBlob** blob);
+	bool CompileGeometryShader(const std::string& code, D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = nullptr);
+	bool CompilePixelShader(const std::string& code, D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = nullptr);
+
+	// Utility functions
+	ID3D11VertexShader* CompileAndCreateVertexShader(const std::string& code);
+	ID3D11GeometryShader* CompileAndCreateGeometryShader(const std::string& code, const D3D_SHADER_MACRO* pDefines = nullptr);
+	ID3D11PixelShader* CompileAndCreatePixelShader(const std::string& code);
+
+	inline ID3D11VertexShader* CreateVertexShaderFromByteCode(D3DBlob* bytecode)
+	{ return CreateVertexShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
+	inline ID3D11GeometryShader* CreateGeometryShaderFromByteCode(D3DBlob* bytecode)
+	{ return CreateGeometryShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
+	inline ID3D11PixelShader* CreatePixelShaderFromByteCode(D3DBlob* bytecode)
+	{ return CreatePixelShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
+
+	inline ID3D11VertexShader* CompileAndCreateVertexShader(D3DBlob* code)
+	{
+		return CompileAndCreateVertexShader((const char*)code->Data());
+	}
+
+	inline ID3D11GeometryShader* CompileAndCreateGeometryShader(D3DBlob* code, const D3D_SHADER_MACRO* pDefines = nullptr)
+	{
+		return CompileAndCreateGeometryShader((const char*)code->Data(), pDefines);
+	}
+
+	inline ID3D11PixelShader* CompileAndCreatePixelShader(D3DBlob* code)
+	{
+		return CompileAndCreatePixelShader((const char*)code->Data());
+	}
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp
new file mode 100644
index 0000000000..bd0a80b355
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DState.cpp
@@ -0,0 +1,504 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/BitSet.h"
+#include "Common/Logging/Log.h"
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DState.h"
+
+namespace DX11
+{
+
+namespace D3D
+{
+
+StateManager* stateman;
+
+
+template<typename T> AutoState<T>::AutoState(const T* object) : state(object)
+{
+	((IUnknown*)state)->AddRef();
+}
+
+template<typename T> AutoState<T>::AutoState(const AutoState<T> &source)
+{
+	state = source.GetPtr();
+	((T*)state)->AddRef();
+}
+
+template<typename T> AutoState<T>::~AutoState()
+{
+	if (state) ((T*)state)->Release();
+	state = nullptr;
+}
+
+StateManager::StateManager()
+	: m_currentBlendState(nullptr)
+	, m_currentDepthState(nullptr)
+	, m_currentRasterizerState(nullptr)
+	, m_dirtyFlags(~0u)
+	, m_pending()
+	, m_current()
+{
+}
+
+void StateManager::PushBlendState(const ID3D11BlendState* state) { m_blendStates.push(AutoBlendState(state)); }
+void StateManager::PushDepthState(const ID3D11DepthStencilState* state) { m_depthStates.push(AutoDepthStencilState(state)); }
+void StateManager::PushRasterizerState(const ID3D11RasterizerState* state) { m_rasterizerStates.push(AutoRasterizerState(state)); }
+void StateManager::PopBlendState() { m_blendStates.pop(); }
+void StateManager::PopDepthState() { m_depthStates.pop(); }
+void StateManager::PopRasterizerState() { m_rasterizerStates.pop(); }
+
+void StateManager::Apply()
+{
+	if (!m_blendStates.empty())
+	{
+		if (m_currentBlendState != m_blendStates.top().GetPtr())
+		{
+			m_currentBlendState = (ID3D11BlendState*)m_blendStates.top().GetPtr();
+			D3D::context->OMSetBlendState(m_currentBlendState, nullptr, 0xFFFFFFFF);
+		}
+	}
+	else ERROR_LOG(VIDEO, "Tried to apply without blend state!");
+
+	if (!m_depthStates.empty())
+	{
+		if (m_currentDepthState != m_depthStates.top().GetPtr())
+		{
+			m_currentDepthState = (ID3D11DepthStencilState*)m_depthStates.top().GetPtr();
+			D3D::context->OMSetDepthStencilState(m_currentDepthState, 0);
+		}
+	}
+	else ERROR_LOG(VIDEO, "Tried to apply without depth state!");
+
+	if (!m_rasterizerStates.empty())
+	{
+		if (m_currentRasterizerState != m_rasterizerStates.top().GetPtr())
+		{
+			m_currentRasterizerState = (ID3D11RasterizerState*)m_rasterizerStates.top().GetPtr();
+			D3D::context->RSSetState(m_currentRasterizerState);
+		}
+	}
+	else ERROR_LOG(VIDEO, "Tried to apply without rasterizer state!");
+
+	if (!m_dirtyFlags)
+	{
+		return;
+	}
+
+	int textureMaskShift = LeastSignificantSetBit((u32)DirtyFlag_Texture0);
+	int samplerMaskShift = LeastSignificantSetBit((u32)DirtyFlag_Sampler0);
+
+	u32 dirtyTextures = (m_dirtyFlags & (DirtyFlag_Texture0 | DirtyFlag_Texture1 | DirtyFlag_Texture2 | DirtyFlag_Texture3
+		| DirtyFlag_Texture4 | DirtyFlag_Texture5 | DirtyFlag_Texture6 | DirtyFlag_Texture7)) >> textureMaskShift;
+	u32 dirtySamplers = (m_dirtyFlags & (DirtyFlag_Sampler0 | DirtyFlag_Sampler1 | DirtyFlag_Sampler2 | DirtyFlag_Sampler3
+		| DirtyFlag_Sampler4 | DirtyFlag_Sampler5 | DirtyFlag_Sampler6 | DirtyFlag_Sampler7)) >> samplerMaskShift;
+	u32 dirtyConstants = m_dirtyFlags & (DirtyFlag_PixelConstants | DirtyFlag_VertexConstants | DirtyFlag_GeometryConstants);
+	u32 dirtyShaders = m_dirtyFlags & (DirtyFlag_PixelShader | DirtyFlag_VertexShader | DirtyFlag_GeometryShader);
+	u32 dirtyBuffers = m_dirtyFlags & (DirtyFlag_VertexBuffer | DirtyFlag_IndexBuffer);
+
+	if (dirtyConstants)
+	{
+		if (m_current.pixelConstants[0] != m_pending.pixelConstants[0] ||
+			m_current.pixelConstants[1] != m_pending.pixelConstants[1])
+		{
+			D3D::context->PSSetConstantBuffers(0, m_pending.pixelConstants[1] ? 2 : 1, m_pending.pixelConstants);
+			m_current.pixelConstants[0] = m_pending.pixelConstants[0];
+			m_current.pixelConstants[1] = m_pending.pixelConstants[1];
+		}
+
+		if (m_current.vertexConstants != m_pending.vertexConstants)
+		{
+			D3D::context->VSSetConstantBuffers(0, 1, &m_pending.vertexConstants);
+			m_current.vertexConstants = m_pending.vertexConstants;
+		}
+
+		if (m_current.geometryConstants != m_pending.geometryConstants)
+		{
+			D3D::context->GSSetConstantBuffers(0, 1, &m_pending.geometryConstants);
+			m_current.geometryConstants = m_pending.geometryConstants;
+		}
+	}
+
+	if (dirtyBuffers || (m_dirtyFlags & DirtyFlag_InputAssembler))
+	{
+		if (m_current.vertexBuffer != m_pending.vertexBuffer ||
+			m_current.vertexBufferStride != m_pending.vertexBufferStride ||
+			m_current.vertexBufferOffset != m_pending.vertexBufferOffset)
+		{
+			D3D::context->IASetVertexBuffers(0, 1, &m_pending.vertexBuffer, &m_pending.vertexBufferStride, &m_pending.vertexBufferOffset);
+			m_current.vertexBuffer = m_pending.vertexBuffer;
+			m_current.vertexBufferStride = m_pending.vertexBufferStride;
+			m_current.vertexBufferOffset = m_pending.vertexBufferOffset;
+		}
+
+		if (m_current.indexBuffer != m_pending.indexBuffer)
+		{
+			D3D::context->IASetIndexBuffer(m_pending.indexBuffer, DXGI_FORMAT_R16_UINT, 0);
+			m_current.indexBuffer = m_pending.indexBuffer;
+		}
+
+		if (m_current.topology != m_pending.topology)
+		{
+			D3D::context->IASetPrimitiveTopology(m_pending.topology);
+			m_current.topology = m_pending.topology;
+		}
+
+		if (m_current.inputLayout != m_pending.inputLayout)
+		{
+			D3D::context->IASetInputLayout(m_pending.inputLayout);
+			m_current.inputLayout = m_pending.inputLayout;
+		}
+	}
+
+	while (dirtyTextures)
+	{
+		int index = LeastSignificantSetBit(dirtyTextures);
+		if (m_current.textures[index] != m_pending.textures[index])
+		{
+			D3D::context->PSSetShaderResources(index, 1, &m_pending.textures[index]);
+			m_current.textures[index] = m_pending.textures[index];
+		}
+
+		dirtyTextures &= ~(1 << index);
+	}
+
+	while (dirtySamplers)
+	{
+		int index = LeastSignificantSetBit(dirtySamplers);
+		if (m_current.samplers[index] != m_pending.samplers[index])
+		{
+			D3D::context->PSSetSamplers(index, 1, &m_pending.samplers[index]);
+			m_current.samplers[index] = m_pending.samplers[index];
+		}
+
+		dirtySamplers &= ~(1 << index);
+	}
+
+	if (dirtyShaders)
+	{
+		if (m_current.pixelShader != m_pending.pixelShader)
+		{
+			D3D::context->PSSetShader(m_pending.pixelShader, nullptr, 0);
+			m_current.pixelShader = m_pending.pixelShader;
+		}
+
+		if (m_current.vertexShader != m_pending.vertexShader)
+		{
+			D3D::context->VSSetShader(m_pending.vertexShader, nullptr, 0);
+			m_current.vertexShader = m_pending.vertexShader;
+		}
+
+		if (m_current.geometryShader != m_pending.geometryShader)
+		{
+			D3D::context->GSSetShader(m_pending.geometryShader, nullptr, 0);
+			m_current.geometryShader = m_pending.geometryShader;
+		}
+	}
+
+	m_dirtyFlags = 0;
+}
+
+u32 StateManager::UnsetTexture(ID3D11ShaderResourceView* srv)
+{
+	u32 mask = 0;
+
+	for (u32 index = 0; index < 8; ++index)
+	{
+		if (m_current.textures[index] == srv)
+		{
+			SetTexture(index, nullptr);
+			mask |= 1 << index;
+		}
+	}
+
+	return mask;
+}
+
+void StateManager::SetTextureByMask(u32 textureSlotMask, ID3D11ShaderResourceView* srv)
+{
+	while (textureSlotMask)
+	{
+		int index = LeastSignificantSetBit(textureSlotMask);
+		SetTexture(index, srv);
+		textureSlotMask &= ~(1 << index);
+	}
+}
+
+}  // namespace D3D
+
+ID3D11SamplerState* StateCache::Get(SamplerState state)
+{
+	auto it = m_sampler.find(state.packed);
+
+	if (it != m_sampler.end())
+	{
+		return it->second;
+	}
+
+	const unsigned int d3dMipFilters[4] =
+	{
+		TexMode0::TEXF_NONE,
+		TexMode0::TEXF_POINT,
+		TexMode0::TEXF_LINEAR,
+		TexMode0::TEXF_NONE, //reserved
+	};
+	const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] =
+	{
+		D3D11_TEXTURE_ADDRESS_CLAMP,
+		D3D11_TEXTURE_ADDRESS_WRAP,
+		D3D11_TEXTURE_ADDRESS_MIRROR,
+		D3D11_TEXTURE_ADDRESS_WRAP //reserved
+	};
+
+	D3D11_SAMPLER_DESC sampdc = CD3D11_SAMPLER_DESC(CD3D11_DEFAULT());
+
+	unsigned int mip = d3dMipFilters[state.min_filter & 3];
+
+	if (state.max_anisotropy)
+	{
+		sampdc.Filter = D3D11_FILTER_ANISOTROPIC;
+		sampdc.MaxAnisotropy = (u32)state.max_anisotropy;
+	}
+	else if (state.min_filter & 4) // linear min filter
+	{
+		if (state.mag_filter) // linear mag filter
+		{
+			if (mip == TexMode0::TEXF_NONE)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+			else if (mip == TexMode0::TEXF_POINT)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+			else if (mip == TexMode0::TEXF_LINEAR)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+		}
+		else // point mag filter
+		{
+			if (mip == TexMode0::TEXF_NONE)
+				sampdc.Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT;
+			else if (mip == TexMode0::TEXF_POINT)
+				sampdc.Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT;
+			else if (mip == TexMode0::TEXF_LINEAR)
+				sampdc.Filter = D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR;
+		}
+	}
+	else // point min filter
+	{
+		if (state.mag_filter) // linear mag filter
+		{
+			if (mip == TexMode0::TEXF_NONE)
+				sampdc.Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
+			else if (mip == TexMode0::TEXF_POINT)
+				sampdc.Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
+			else if (mip == TexMode0::TEXF_LINEAR)
+				sampdc.Filter = D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR;
+		}
+		else // point mag filter
+		{
+			if (mip == TexMode0::TEXF_NONE)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+			else if (mip == TexMode0::TEXF_POINT)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+			else if (mip == TexMode0::TEXF_LINEAR)
+				sampdc.Filter = D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR;
+		}
+	}
+
+	sampdc.AddressU = d3dClamps[state.wrap_s];
+	sampdc.AddressV = d3dClamps[state.wrap_t];
+
+	sampdc.MaxLOD = (mip == TexMode0::TEXF_NONE) ? 0.0f : (float)state.max_lod / 16.f;
+	sampdc.MinLOD = (float)state.min_lod / 16.f;
+	sampdc.MipLODBias = (s32)state.lod_bias / 32.0f;
+
+	ID3D11SamplerState* res = nullptr;
+
+	HRESULT hr = D3D::device->CreateSamplerState(&sampdc, &res);
+	if (FAILED(hr)) PanicAlert("Fail %s %d\n", __FILE__, __LINE__);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)res, "sampler state used to emulate the GX pipeline");
+	m_sampler.insert(std::make_pair(state.packed, res));
+
+	return res;
+}
+
+ID3D11BlendState* StateCache::Get(BlendState state)
+{
+	if (!state.blend_enable)
+	{
+		state.src_blend = D3D11_BLEND_ONE;
+		state.dst_blend = D3D11_BLEND_ZERO;
+		state.blend_op = D3D11_BLEND_OP_ADD;
+		state.use_dst_alpha = false;
+	}
+
+	auto it = m_blend.find(state.packed);
+
+	if (it != m_blend.end())
+		return it->second;
+
+	D3D11_BLEND_DESC blenddc = CD3D11_BLEND_DESC(CD3D11_DEFAULT());
+
+	blenddc.AlphaToCoverageEnable = FALSE;
+	blenddc.IndependentBlendEnable = FALSE;
+	blenddc.RenderTarget[0].BlendEnable = state.blend_enable;
+	blenddc.RenderTarget[0].RenderTargetWriteMask = (u32)state.write_mask;
+	blenddc.RenderTarget[0].SrcBlend = state.src_blend;
+	blenddc.RenderTarget[0].DestBlend = state.dst_blend;
+	blenddc.RenderTarget[0].BlendOp = state.blend_op;
+	blenddc.RenderTarget[0].SrcBlendAlpha = state.src_blend;
+	blenddc.RenderTarget[0].DestBlendAlpha = state.dst_blend;
+	blenddc.RenderTarget[0].BlendOpAlpha = state.blend_op;
+
+	if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_SRC_COLOR)
+		blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
+	else if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_INV_SRC_COLOR)
+		blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
+	else if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_DEST_COLOR)
+		blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA;
+	else if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_INV_DEST_COLOR)
+		blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
+	else
+		blenddc.RenderTarget[0].SrcBlendAlpha = blenddc.RenderTarget[0].SrcBlend;
+
+	if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_SRC_COLOR)
+		blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_SRC_ALPHA;
+	else if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_INV_SRC_COLOR)
+		blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
+	else if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_DEST_COLOR)
+		blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA;
+	else if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_INV_DEST_COLOR)
+		blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
+	else
+		blenddc.RenderTarget[0].DestBlendAlpha = blenddc.RenderTarget[0].DestBlend;
+
+	if (state.use_dst_alpha)
+	{
+		// Colors should blend against SRC1_ALPHA
+		if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_SRC_ALPHA)
+			blenddc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC1_ALPHA;
+		else if (blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_INV_SRC_ALPHA)
+			blenddc.RenderTarget[0].SrcBlend = D3D11_BLEND_INV_SRC1_ALPHA;
+
+		// Colors should blend against SRC1_ALPHA
+		if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_SRC_ALPHA)
+			blenddc.RenderTarget[0].DestBlend = D3D11_BLEND_SRC1_ALPHA;
+		else if (blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_INV_SRC_ALPHA)
+			blenddc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC1_ALPHA;
+
+		blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
+		blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
+		blenddc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+	}
+
+	ID3D11BlendState* res = nullptr;
+
+	HRESULT hr = D3D::device->CreateBlendState(&blenddc, &res);
+	if (FAILED(hr)) PanicAlert("Failed to create blend state at %s %d\n", __FILE__, __LINE__);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)res, "blend state used to emulate the GX pipeline");
+	m_blend.insert(std::make_pair(state.packed, res));
+
+	return res;
+}
+
+ID3D11RasterizerState* StateCache::Get(RasterizerState state)
+{
+	auto it = m_raster.find(state.packed);
+
+	if (it != m_raster.end())
+		return it->second;
+
+	D3D11_RASTERIZER_DESC rastdc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID,
+		state.cull_mode,
+		false, 0, 0.f, 0, true, true, false, false);
+
+	ID3D11RasterizerState* res = nullptr;
+
+	HRESULT hr = D3D::device->CreateRasterizerState(&rastdc, &res);
+	if (FAILED(hr)) PanicAlert("Failed to create rasterizer state at %s %d\n", __FILE__, __LINE__);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)res, "rasterizer state used to emulate the GX pipeline");
+	m_raster.insert(std::make_pair(state.packed, res));
+
+	return res;
+}
+
+ID3D11DepthStencilState* StateCache::Get(ZMode state)
+{
+	auto it = m_depth.find(state.hex);
+
+	if (it != m_depth.end())
+		return it->second;
+
+	D3D11_DEPTH_STENCIL_DESC depthdc = CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT());
+
+	depthdc.DepthEnable = TRUE;
+	depthdc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
+	depthdc.DepthFunc = D3D11_COMPARISON_GREATER;
+	depthdc.StencilEnable = FALSE;
+	depthdc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;
+	depthdc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
+
+	const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] =
+	{
+		D3D11_COMPARISON_NEVER,
+		D3D11_COMPARISON_GREATER,
+		D3D11_COMPARISON_EQUAL,
+		D3D11_COMPARISON_GREATER_EQUAL,
+		D3D11_COMPARISON_LESS,
+		D3D11_COMPARISON_NOT_EQUAL,
+		D3D11_COMPARISON_LESS_EQUAL,
+		D3D11_COMPARISON_ALWAYS
+	};
+
+	if (state.testenable)
+	{
+		depthdc.DepthEnable = TRUE;
+		depthdc.DepthWriteMask = state.updateenable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO;
+		depthdc.DepthFunc = d3dCmpFuncs[state.func];
+	}
+	else
+	{
+		// if the test is disabled write is disabled too
+		depthdc.DepthEnable = FALSE;
+		depthdc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
+	}
+
+	ID3D11DepthStencilState* res = nullptr;
+
+	HRESULT hr = D3D::device->CreateDepthStencilState(&depthdc, &res);
+	if (SUCCEEDED(hr)) D3D::SetDebugObjectName((ID3D11DeviceChild*)res, "depth-stencil state used to emulate the GX pipeline");
+	else PanicAlert("Failed to create depth state at %s %d\n", __FILE__, __LINE__);
+
+	m_depth.insert(std::make_pair(state.hex, res));
+
+	return res;
+}
+
+void StateCache::Clear()
+{
+	for (auto it : m_depth)
+	{
+		SAFE_RELEASE(it.second);
+	}
+	m_depth.clear();
+
+	for (auto it : m_raster)
+	{
+		SAFE_RELEASE(it.second);
+	}
+	m_raster.clear();
+
+	for (auto it : m_blend)
+	{
+		SAFE_RELEASE(it.second);
+	}
+	m_blend.clear();
+
+	for (auto it : m_sampler)
+	{
+		SAFE_RELEASE(it.second);
+	}
+	m_sampler.clear();
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DState.h b/Source/Core/VideoBackends/D3D/D3DState.h
new file mode 100644
index 0000000000..9ddc60d8ed
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DState.h
@@ -0,0 +1,299 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <stack>
+#include <unordered_map>
+
+#include "Common/BitField.h"
+#include "Common/CommonTypes.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoCommon/BPMemory.h"
+
+struct ID3D11BlendState;
+struct ID3D11DepthStencilState;
+struct ID3D11RasterizerState;
+
+namespace DX11
+{
+
+union RasterizerState
+{
+	BitField<0, 2, D3D11_CULL_MODE> cull_mode;
+
+	u32 packed;
+};
+
+union BlendState
+{
+	BitField<0, 1, u32> blend_enable;
+	BitField<1, 3, D3D11_BLEND_OP> blend_op;
+	BitField<4, 4, u32> write_mask;
+	BitField<8, 5, D3D11_BLEND> src_blend;
+	BitField<13, 5, D3D11_BLEND> dst_blend;
+	BitField<18, 1, u32> use_dst_alpha;
+
+	u32 packed;
+};
+
+union SamplerState
+{
+	BitField<0, 3, u64> min_filter;
+	BitField<3, 1, u64> mag_filter;
+	BitField<4, 8, u64> min_lod;
+	BitField<12, 8, u64> max_lod;
+	BitField<20, 8, s64> lod_bias;
+	BitField<28, 2, u64> wrap_s;
+	BitField<30, 2, u64> wrap_t;
+	BitField<32, 5, u64> max_anisotropy;
+
+	u64 packed;
+};
+
+class StateCache
+{
+public:
+
+	// Get existing or create new render state.
+	// Returned objects is owned by the cache and does not need to be released.
+	ID3D11SamplerState* Get(SamplerState state);
+	ID3D11BlendState* Get(BlendState state);
+	ID3D11RasterizerState* Get(RasterizerState state);
+	ID3D11DepthStencilState* Get(ZMode state);
+
+	// Release all cached states and clear hash tables.
+	void Clear();
+
+private:
+
+	std::unordered_map<u32, ID3D11DepthStencilState*> m_depth;
+	std::unordered_map<u32, ID3D11RasterizerState*> m_raster;
+	std::unordered_map<u32, ID3D11BlendState*> m_blend;
+	std::unordered_map<u64, ID3D11SamplerState*> m_sampler;
+};
+
+namespace D3D
+{
+
+template<typename T> class AutoState
+{
+public:
+	AutoState(const T* object);
+	AutoState(const AutoState<T> &source);
+	~AutoState();
+
+	const inline T* GetPtr() const { return state; }
+
+private:
+	const T* state;
+};
+
+typedef AutoState<ID3D11BlendState> AutoBlendState;
+typedef AutoState<ID3D11DepthStencilState> AutoDepthStencilState;
+typedef AutoState<ID3D11RasterizerState> AutoRasterizerState;
+
+class StateManager
+{
+public:
+	StateManager();
+
+	// call any of these to change the affected states
+	void PushBlendState(const ID3D11BlendState* state);
+	void PushDepthState(const ID3D11DepthStencilState* state);
+	void PushRasterizerState(const ID3D11RasterizerState* state);
+
+	// call these after drawing
+	void PopBlendState();
+	void PopDepthState();
+	void PopRasterizerState();
+
+	void SetTexture(u32 index, ID3D11ShaderResourceView* texture)
+	{
+		if (m_current.textures[index] != texture)
+			m_dirtyFlags |= DirtyFlag_Texture0 << index;
+
+		m_pending.textures[index] = texture;
+	}
+
+	void SetSampler(u32 index, ID3D11SamplerState* sampler)
+	{
+		if (m_current.samplers[index] != sampler)
+			m_dirtyFlags |= DirtyFlag_Sampler0 << index;
+
+		m_pending.samplers[index] = sampler;
+	}
+
+	void SetPixelConstants(ID3D11Buffer* buffer0, ID3D11Buffer* buffer1 = nullptr)
+	{
+		if (m_current.pixelConstants[0] != buffer0 || m_current.pixelConstants[1] != buffer1)
+			m_dirtyFlags |= DirtyFlag_PixelConstants;
+
+		m_pending.pixelConstants[0] = buffer0;
+		m_pending.pixelConstants[1] = buffer1;
+	}
+
+	void SetVertexConstants(ID3D11Buffer* buffer)
+	{
+		if (m_current.vertexConstants != buffer)
+			m_dirtyFlags |= DirtyFlag_VertexConstants;
+
+		m_pending.vertexConstants = buffer;
+	}
+
+	void SetGeometryConstants(ID3D11Buffer* buffer)
+	{
+		if (m_current.geometryConstants != buffer)
+			m_dirtyFlags |= DirtyFlag_GeometryConstants;
+
+		m_pending.geometryConstants = buffer;
+	}
+
+	void SetVertexBuffer(ID3D11Buffer* buffer, u32 stride, u32 offset)
+	{
+		if (m_current.vertexBuffer != buffer ||
+			m_current.vertexBufferStride != stride ||
+			m_current.vertexBufferOffset != offset)
+			m_dirtyFlags |= DirtyFlag_VertexBuffer;
+
+		m_pending.vertexBuffer = buffer;
+		m_pending.vertexBufferStride = stride;
+		m_pending.vertexBufferOffset = offset;
+	}
+
+	void SetIndexBuffer(ID3D11Buffer* buffer)
+	{
+		if (m_current.indexBuffer != buffer)
+			m_dirtyFlags |= DirtyFlag_IndexBuffer;
+
+		m_pending.indexBuffer = buffer;
+	}
+
+	void SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY topology)
+	{
+		if (m_current.topology != topology)
+			m_dirtyFlags |= DirtyFlag_InputAssembler;
+
+		m_pending.topology = topology;
+	}
+
+	void SetInputLayout(ID3D11InputLayout* layout)
+	{
+		if (m_current.inputLayout != layout)
+			m_dirtyFlags |= DirtyFlag_InputAssembler;
+
+		m_pending.inputLayout = layout;
+	}
+
+	void SetPixelShader(ID3D11PixelShader* shader)
+	{
+		if (m_current.pixelShader != shader)
+			m_dirtyFlags |= DirtyFlag_PixelShader;
+
+		m_pending.pixelShader = shader;
+	}
+
+	void SetPixelShaderDynamic(ID3D11PixelShader* shader, ID3D11ClassInstance * const * classInstances, u32 classInstancesCount)
+	{
+		D3D::context->PSSetShader(shader, classInstances, classInstancesCount);
+		m_current.pixelShader = shader;
+		m_pending.pixelShader = shader;
+	}
+
+	void SetVertexShader(ID3D11VertexShader* shader)
+	{
+		if (m_current.vertexShader != shader)
+			m_dirtyFlags |= DirtyFlag_VertexShader;
+
+		m_pending.vertexShader = shader;
+	}
+
+	void SetGeometryShader(ID3D11GeometryShader* shader)
+	{
+		if (m_current.geometryShader != shader)
+			m_dirtyFlags |= DirtyFlag_GeometryShader;
+
+		m_pending.geometryShader = shader;
+	}
+
+	// removes currently set texture from all slots, returns mask of previously bound slots
+	u32 UnsetTexture(ID3D11ShaderResourceView* srv);
+	void SetTextureByMask(u32 textureSlotMask, ID3D11ShaderResourceView* srv);
+
+	// call this immediately before any drawing operation or to explicitly apply pending resource state changes
+	void Apply();
+
+private:
+
+	std::stack<AutoBlendState> m_blendStates;
+	std::stack<AutoDepthStencilState> m_depthStates;
+	std::stack<AutoRasterizerState> m_rasterizerStates;
+
+	ID3D11BlendState* m_currentBlendState;
+	ID3D11DepthStencilState* m_currentDepthState;
+	ID3D11RasterizerState* m_currentRasterizerState;
+
+	enum DirtyFlags
+	{
+		DirtyFlag_Texture0 = 1 << 0,
+		DirtyFlag_Texture1 = 1 << 1,
+		DirtyFlag_Texture2 = 1 << 2,
+		DirtyFlag_Texture3 = 1 << 3,
+		DirtyFlag_Texture4 = 1 << 4,
+		DirtyFlag_Texture5 = 1 << 5,
+		DirtyFlag_Texture6 = 1 << 6,
+		DirtyFlag_Texture7 = 1 << 7,
+
+		DirtyFlag_Sampler0 = 1 << 8,
+		DirtyFlag_Sampler1 = 1 << 9,
+		DirtyFlag_Sampler2 = 1 << 10,
+		DirtyFlag_Sampler3 = 1 << 11,
+		DirtyFlag_Sampler4 = 1 << 12,
+		DirtyFlag_Sampler5 = 1 << 13,
+		DirtyFlag_Sampler6 = 1 << 14,
+		DirtyFlag_Sampler7 = 1 << 15,
+
+		DirtyFlag_PixelConstants = 1 << 16,
+		DirtyFlag_VertexConstants = 1 << 17,
+		DirtyFlag_GeometryConstants = 1 << 18,
+
+		DirtyFlag_VertexBuffer = 1 << 19,
+		DirtyFlag_IndexBuffer = 1 << 20,
+
+		DirtyFlag_PixelShader = 1 << 21,
+		DirtyFlag_VertexShader = 1 << 22,
+		DirtyFlag_GeometryShader = 1 << 23,
+
+		DirtyFlag_InputAssembler = 1 << 24,
+	};
+
+	u32 m_dirtyFlags;
+
+	struct Resources
+	{
+		ID3D11ShaderResourceView* textures[8];
+		ID3D11SamplerState* samplers[8];
+		ID3D11Buffer* pixelConstants[2];
+		ID3D11Buffer* vertexConstants;
+		ID3D11Buffer* geometryConstants;
+		ID3D11Buffer* vertexBuffer;
+		ID3D11Buffer* indexBuffer;
+		u32 vertexBufferStride;
+		u32 vertexBufferOffset;
+		D3D11_PRIMITIVE_TOPOLOGY topology;
+		ID3D11InputLayout* inputLayout;
+		ID3D11PixelShader* pixelShader;
+		ID3D11VertexShader* vertexShader;
+		ID3D11GeometryShader* geometryShader;
+	};
+
+	Resources m_pending;
+	Resources m_current;
+};
+
+extern StateManager* stateman;
+
+}  // namespace
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp
new file mode 100644
index 0000000000..49c0d0916d
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DTexture.cpp
@@ -0,0 +1,113 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DTexture.h"
+
+namespace DX11
+{
+
+namespace D3D
+{
+
+void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage)
+{
+	if (usage == D3D11_USAGE_DYNAMIC || usage == D3D11_USAGE_STAGING)
+	{
+		D3D11_MAPPED_SUBRESOURCE map;
+		D3D::context->Map(pTexture, level, D3D11_MAP_WRITE_DISCARD, 0, &map);
+		if (4 * pitch == map.RowPitch)
+		{
+			memcpy(map.pData, buffer, map.RowPitch * height);
+		}
+		else
+		{
+			for (unsigned int y = 0; y < height; ++y)
+				memcpy((u8*)map.pData + y * map.RowPitch, (u32*)buffer + y * pitch, 4 * pitch);
+		}
+		D3D::context->Unmap(pTexture, level);
+	}
+	else
+	{
+		D3D11_BOX dest_region = CD3D11_BOX(0, 0, 0, width, height, 1);
+		D3D::context->UpdateSubresource(pTexture, level, &dest_region, buffer, 4*pitch, 4*pitch*height);
+	}
+}
+
+}  // namespace
+
+D3DTexture2D* D3DTexture2D::Create(unsigned int width, unsigned int height, D3D11_BIND_FLAG bind, D3D11_USAGE usage, DXGI_FORMAT fmt, unsigned int levels, unsigned int slices, D3D11_SUBRESOURCE_DATA* data)
+{
+	ID3D11Texture2D* pTexture = nullptr;
+	HRESULT hr;
+
+	D3D11_CPU_ACCESS_FLAG cpuflags;
+	if (usage == D3D11_USAGE_STAGING)
+		cpuflags = (D3D11_CPU_ACCESS_FLAG)((int)D3D11_CPU_ACCESS_WRITE|(int)D3D11_CPU_ACCESS_READ);
+	else if (usage == D3D11_USAGE_DYNAMIC)
+		cpuflags = D3D11_CPU_ACCESS_WRITE;
+	else
+		cpuflags = (D3D11_CPU_ACCESS_FLAG)0;
+	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(fmt, width, height, slices, levels, bind, usage, cpuflags);
+	hr = D3D::device->CreateTexture2D(&texdesc, data, &pTexture);
+	if (FAILED(hr))
+	{
+		PanicAlert("Failed to create texture at %s, line %d: hr=%#x\n", __FILE__, __LINE__, hr);
+		return nullptr;
+	}
+
+	D3DTexture2D* ret = new D3DTexture2D(pTexture, bind);
+	SAFE_RELEASE(pTexture);
+	return ret;
+}
+
+void D3DTexture2D::AddRef()
+{
+	++ref;
+}
+
+UINT D3DTexture2D::Release()
+{
+	--ref;
+	if (ref == 0)
+	{
+		delete this;
+		return 0;
+	}
+	return ref;
+}
+
+ID3D11Texture2D* &D3DTexture2D::GetTex() { return tex; }
+ID3D11ShaderResourceView* &D3DTexture2D::GetSRV() { return srv; }
+ID3D11RenderTargetView* &D3DTexture2D::GetRTV() { return rtv; }
+ID3D11DepthStencilView* &D3DTexture2D::GetDSV() { return dsv; }
+
+D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind,
+							DXGI_FORMAT srv_format, DXGI_FORMAT dsv_format, DXGI_FORMAT rtv_format, bool multisampled)
+							: ref(1), tex(texptr), srv(nullptr), rtv(nullptr), dsv(nullptr)
+{
+	D3D11_SRV_DIMENSION srv_dim = multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY : D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
+	D3D11_DSV_DIMENSION dsv_dim = multisampled ? D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY : D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
+	D3D11_RTV_DIMENSION rtv_dim = multisampled ? D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY : D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
+	D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = CD3D11_SHADER_RESOURCE_VIEW_DESC(srv_dim, srv_format);
+	D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc = CD3D11_DEPTH_STENCIL_VIEW_DESC(dsv_dim, dsv_format);
+	D3D11_RENDER_TARGET_VIEW_DESC rtv_desc = CD3D11_RENDER_TARGET_VIEW_DESC(rtv_dim, rtv_format);
+	if (bind & D3D11_BIND_SHADER_RESOURCE)
+		D3D::device->CreateShaderResourceView(tex, &srv_desc, &srv);
+	if (bind & D3D11_BIND_RENDER_TARGET)
+		D3D::device->CreateRenderTargetView(tex, &rtv_desc, &rtv);
+	if (bind & D3D11_BIND_DEPTH_STENCIL)
+		D3D::device->CreateDepthStencilView(tex, &dsv_desc, &dsv);
+	tex->AddRef();
+}
+
+D3DTexture2D::~D3DTexture2D()
+{
+	SAFE_RELEASE(srv);
+	SAFE_RELEASE(rtv);
+	SAFE_RELEASE(dsv);
+	SAFE_RELEASE(tex);
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.h b/Source/Core/VideoBackends/D3D/D3DTexture.h
new file mode 100644
index 0000000000..9fb8ea3404
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DTexture.h
@@ -0,0 +1,47 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <d3d11.h>
+
+namespace DX11
+{
+
+namespace D3D
+{
+	void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage);
+}
+
+class D3DTexture2D
+{
+public:
+	// there are two ways to create a D3DTexture2D object:
+	//     either create an ID3D11Texture2D object, pass it to the constructor and specify what views to create
+	//     or let the texture automatically be created by D3DTexture2D::Create
+
+	D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind, DXGI_FORMAT srv_format = DXGI_FORMAT_UNKNOWN, DXGI_FORMAT dsv_format = DXGI_FORMAT_UNKNOWN, DXGI_FORMAT rtv_format = DXGI_FORMAT_UNKNOWN, bool multisampled = false);
+	static D3DTexture2D* Create(unsigned int width, unsigned int height, D3D11_BIND_FLAG bind, D3D11_USAGE usage, DXGI_FORMAT, unsigned int levels = 1, unsigned int slices = 1, D3D11_SUBRESOURCE_DATA* data = nullptr);
+
+	// reference counting, use AddRef() when creating a new reference and Release() it when you don't need it anymore
+	void AddRef();
+	UINT Release();
+
+	ID3D11Texture2D* &GetTex();
+	ID3D11ShaderResourceView* &GetSRV();
+	ID3D11RenderTargetView* &GetRTV();
+	ID3D11DepthStencilView* &GetDSV();
+
+private:
+	~D3DTexture2D();
+
+	ID3D11Texture2D* tex;
+	ID3D11ShaderResourceView* srv;
+	ID3D11RenderTargetView* rtv;
+	ID3D11DepthStencilView* dsv;
+	D3D11_BIND_FLAG bindflags;
+	UINT ref;
+};
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/D3DUtil.cpp
new file mode 100644
index 0000000000..e26f960fa3
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DUtil.cpp
@@ -0,0 +1,652 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cctype>
+#include <list>
+#include <string>
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+
+namespace DX11
+{
+
+namespace D3D
+{
+
+// Ring buffer class, shared between the draw* functions
+class UtilVertexBuffer
+{
+public:
+	UtilVertexBuffer(int size) : buf(nullptr), offset(0), max_size(size)
+	{
+		D3D11_BUFFER_DESC desc = CD3D11_BUFFER_DESC(max_size, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+		device->CreateBuffer(&desc, nullptr, &buf);
+	}
+	~UtilVertexBuffer()
+	{
+		buf->Release();
+	}
+
+	// returns vertex offset to the new data
+	int AppendData(void* data, int size, int vertex_size)
+	{
+		D3D11_MAPPED_SUBRESOURCE map;
+		if (offset + size >= max_size)
+		{
+			// wrap buffer around and notify observers
+			offset = 0;
+			context->Map(buf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+
+			for (bool* observer : observers)
+				*observer = true;
+		}
+		else
+		{
+			context->Map(buf, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map);
+		}
+		offset = ((offset+vertex_size-1)/vertex_size)*vertex_size; // align offset to vertex_size bytes
+		memcpy((u8*)map.pData + offset, data, size);
+		context->Unmap(buf, 0);
+
+		offset += size;
+		return (offset - size) / vertex_size;
+	}
+
+	void AddWrapObserver(bool* observer)
+	{
+		observers.push_back(observer);
+	}
+
+	inline ID3D11Buffer* &GetBuffer() { return buf; }
+
+private:
+	ID3D11Buffer* buf;
+	int offset;
+	int max_size;
+
+	std::list<bool*> observers;
+};
+
+CD3DFont font;
+UtilVertexBuffer* util_vbuf = nullptr;
+
+#define MAX_NUM_VERTICES 50*6
+struct FONT2DVERTEX {
+	float x,y,z;
+	float col[4];
+	float tu, tv;
+};
+
+inline FONT2DVERTEX InitFont2DVertex(float x, float y, u32 color, float tu, float tv)
+{
+	FONT2DVERTEX v;   v.x=x; v.y=y; v.z=0;  v.tu = tu; v.tv = tv;
+	v.col[0] = ((float)((color >> 16) & 0xFF)) / 255.f;
+	v.col[1] = ((float)((color >>  8) & 0xFF)) / 255.f;
+	v.col[2] = ((float)((color >>  0) & 0xFF)) / 255.f;
+	v.col[3] = ((float)((color >> 24) & 0xFF)) / 255.f;
+	return v;
+}
+
+CD3DFont::CD3DFont() : m_dwTexWidth(512), m_dwTexHeight(512)
+{
+	m_pTexture    = nullptr;
+	m_pVB         = nullptr;
+	m_InputLayout = nullptr;
+	m_pshader     = nullptr;
+	m_vshader     = nullptr;
+}
+
+const char fontpixshader[] = {
+	"Texture2D tex2D;\n"
+	"SamplerState linearSampler\n"
+	"{\n"
+	"	Filter = MIN_MAG_MIP_LINEAR;\n"
+	"	AddressU = D3D11_TEXTURE_ADDRESS_BORDER;\n"
+	"	AddressV = D3D11_TEXTURE_ADDRESS_BORDER;\n"
+	"	BorderColor = float4(0.f, 0.f, 0.f, 0.f);\n"
+	"};\n"
+	"struct PS_INPUT\n"
+	"{\n"
+	"	float4 pos : SV_POSITION;\n"
+	"	float4 col : COLOR;\n"
+	"	float2 tex : TEXCOORD;\n"
+	"};\n"
+	"float4 main( PS_INPUT input ) : SV_Target\n"
+	"{\n"
+	"	return tex2D.Sample( linearSampler, input.tex ) * input.col;\n"
+	"};\n"
+};
+
+const char fontvertshader[] = {
+	"struct VS_INPUT\n"
+	"{\n"
+	"	float4 pos : POSITION;\n"
+	"	float4 col : COLOR;\n"
+	"	float2 tex : TEXCOORD;\n"
+	"};\n"
+	"struct PS_INPUT\n"
+	"{\n"
+	"	float4 pos : SV_POSITION;\n"
+	"	float4 col : COLOR;\n"
+	"	float2 tex : TEXCOORD;\n"
+	"};\n"
+	"PS_INPUT main( VS_INPUT input )\n"
+	"{\n"
+	"	PS_INPUT output;\n"
+	"	output.pos = input.pos;\n"
+	"	output.col = input.col;\n"
+	"	output.tex = input.tex;\n"
+	"	return output;\n"
+	"};\n"
+};
+
+int CD3DFont::Init()
+{
+	// Create vertex buffer for the letters
+	HRESULT hr;
+
+	// Prepare to create a bitmap
+	unsigned int* pBitmapBits;
+	BITMAPINFO bmi;
+	ZeroMemory(&bmi.bmiHeader, sizeof(BITMAPINFOHEADER));
+	bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
+	bmi.bmiHeader.biWidth       =  (int)m_dwTexWidth;
+	bmi.bmiHeader.biHeight      = -(int)m_dwTexHeight;
+	bmi.bmiHeader.biPlanes      = 1;
+	bmi.bmiHeader.biCompression = BI_RGB;
+	bmi.bmiHeader.biBitCount    = 32;
+
+	// Create a DC and a bitmap for the font
+	HDC hDC = CreateCompatibleDC(nullptr);
+	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, nullptr, 0);
+	SetMapMode(hDC, MM_TEXT);
+
+	// create a GDI font
+	HFONT hFont = CreateFont(24, 0, 0, 0, FW_NORMAL, FALSE,
+							FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
+							CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
+							VARIABLE_PITCH, _T("Tahoma"));
+	if (nullptr == hFont) return E_FAIL;
+
+	HGDIOBJ hOldbmBitmap = SelectObject(hDC, hbmBitmap);
+	HGDIOBJ hOldFont = SelectObject(hDC, hFont);
+
+	// Set text properties
+	SetTextColor(hDC, 0xFFFFFF);
+	SetBkColor  (hDC, 0);
+	SetTextAlign(hDC, TA_TOP);
+
+	TEXTMETRICW tm;
+	GetTextMetricsW(hDC, &tm);
+	m_LineHeight = tm.tmHeight;
+
+	// Loop through all printable characters and output them to the bitmap
+	// Meanwhile, keep track of the corresponding tex coords for each character.
+	int x = 0, y = 0;
+	char str[2] = "\0";
+	for (int c = 0; c < 127 - 32; c++)
+	{
+		str[0] = c + 32;
+		SIZE size;
+		GetTextExtentPoint32A(hDC, str, 1, &size);
+		if ((int)(x+size.cx+1) > m_dwTexWidth)
+		{
+			x  = 0;
+			y += m_LineHeight;
+		}
+
+		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, nullptr, str, 1, nullptr);
+		m_fTexCoords[c][0] = ((float)(x+0))/m_dwTexWidth;
+		m_fTexCoords[c][1] = ((float)(y+0))/m_dwTexHeight;
+		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
+		m_fTexCoords[c][3] = ((float)(y+0+size.cy))/m_dwTexHeight;
+
+		x += size.cx + 3;  // 3 to work around annoying ij conflict (part of the j ends up with the i)
+	}
+
+	// Create a new texture for the font
+	// possible optimization: store the converted data in a buffer and fill the texture on creation.
+	// That way, we can use a static texture
+	ID3D11Texture2D* buftex;
+	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_dwTexWidth, m_dwTexHeight,
+										1, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DYNAMIC,
+										D3D11_CPU_ACCESS_WRITE);
+	hr = device->CreateTexture2D(&texdesc, nullptr, &buftex);
+	if (FAILED(hr))
+	{
+		PanicAlert("Failed to create font texture");
+		return hr;
+	}
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)buftex, "texture of a CD3DFont object");
+
+	// Lock the surface and write the alpha values for the set pixels
+	D3D11_MAPPED_SUBRESOURCE texmap;
+	hr = context->Map(buftex, 0, D3D11_MAP_WRITE_DISCARD, 0, &texmap);
+	if (FAILED(hr)) PanicAlert("Failed to map a texture at %s %d\n", __FILE__, __LINE__);
+
+	for (y = 0; y < m_dwTexHeight; y++)
+	{
+		u32* pDst32 = (u32*)((u8*)texmap.pData + y * texmap.RowPitch);
+		for (x = 0; x < m_dwTexWidth; x++)
+		{
+			const u8 bAlpha = (pBitmapBits[m_dwTexWidth * y + x] & 0xff);
+			*pDst32++ = (((bAlpha << 4) | bAlpha) << 24) | 0xFFFFFF;
+		}
+	}
+
+	// Done updating texture, so clean up used objects
+	context->Unmap(buftex, 0);
+	hr = D3D::device->CreateShaderResourceView(buftex, nullptr, &m_pTexture);
+	if (FAILED(hr)) PanicAlert("Failed to create shader resource view at %s %d\n", __FILE__, __LINE__);
+	SAFE_RELEASE(buftex);
+
+	SelectObject(hDC, hOldbmBitmap);
+	DeleteObject(hbmBitmap);
+
+	SelectObject(hDC, hOldFont);
+	DeleteObject(hFont);
+
+	// setup device objects for drawing
+	m_pshader = D3D::CompileAndCreatePixelShader(fontpixshader);
+	if (m_pshader == nullptr) PanicAlert("Failed to create pixel shader, %s %d\n", __FILE__, __LINE__);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_pshader, "pixel shader of a CD3DFont object");
+
+	D3DBlob* vsbytecode;
+	D3D::CompileVertexShader(fontvertshader, &vsbytecode);
+	if (vsbytecode == nullptr) PanicAlert("Failed to compile vertex shader, %s %d\n", __FILE__, __LINE__);
+	m_vshader = D3D::CreateVertexShaderFromByteCode(vsbytecode);
+	if (m_vshader == nullptr) PanicAlert("Failed to create vertex shader, %s %d\n", __FILE__, __LINE__);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vshader, "vertex shader of a CD3DFont object");
+
+	const D3D11_INPUT_ELEMENT_DESC desc[] =
+	{
+		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+		{ "COLOR",    0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+	};
+	hr = D3D::device->CreateInputLayout(desc, 3, vsbytecode->Data(), vsbytecode->Size(), &m_InputLayout);
+	if (FAILED(hr)) PanicAlert("Failed to create input layout, %s %d\n", __FILE__, __LINE__);
+	SAFE_RELEASE(vsbytecode);
+
+	D3D11_BLEND_DESC blenddesc;
+	blenddesc.AlphaToCoverageEnable = FALSE;
+	blenddesc.IndependentBlendEnable = FALSE;
+	blenddesc.RenderTarget[0].BlendEnable = TRUE;
+	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+	blenddesc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
+	blenddesc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
+	blenddesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
+	blenddesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
+	blenddesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
+	blenddesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+	hr = D3D::device->CreateBlendState(&blenddesc, &m_blendstate);
+	CHECK(hr==S_OK, "Create font blend state");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_blendstate, "blend state of a CD3DFont object");
+
+	D3D11_RASTERIZER_DESC rastdesc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, D3D11_CULL_NONE, false, 0, 0.f, 0.f, false, false, false, false);
+	hr = D3D::device->CreateRasterizerState(&rastdesc, &m_raststate);
+	CHECK(hr==S_OK, "Create font rasterizer state");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_raststate, "rasterizer state of a CD3DFont object");
+
+	D3D11_BUFFER_DESC vbdesc = CD3D11_BUFFER_DESC(MAX_NUM_VERTICES*sizeof(FONT2DVERTEX), D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+	if (FAILED(hr = device->CreateBuffer(&vbdesc, nullptr, &m_pVB)))
+	{
+		PanicAlert("Failed to create font vertex buffer at %s, line %d\n", __FILE__, __LINE__);
+		return hr;
+	}
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_pVB, "vertex buffer of a CD3DFont object");
+	return S_OK;
+}
+
+int CD3DFont::Shutdown()
+{
+	SAFE_RELEASE(m_pVB);
+	SAFE_RELEASE(m_pTexture);
+	SAFE_RELEASE(m_InputLayout);
+	SAFE_RELEASE(m_pshader);
+	SAFE_RELEASE(m_vshader);
+
+	SAFE_RELEASE(m_blendstate);
+	SAFE_RELEASE(m_raststate);
+
+	return S_OK;
+}
+
+int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dwColor, const std::string& text)
+{
+	if (!m_pVB)
+		return 0;
+
+	UINT stride = sizeof(FONT2DVERTEX);
+	UINT bufoffset = 0;
+
+	float scalex = 1 / (float)D3D::GetBackBufferWidth() * 2.f;
+	float scaley = 1 / (float)D3D::GetBackBufferHeight() * 2.f;
+	float sizeratio = size / (float)m_LineHeight;
+
+	// translate starting positions
+	float sx = x * scalex - 1.f;
+	float sy = 1.f - y * scaley;
+
+	// Fill vertex buffer
+	FONT2DVERTEX* pVertices;
+	int dwNumTriangles = 0L;
+
+	D3D11_MAPPED_SUBRESOURCE vbmap;
+	HRESULT hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vbmap);
+	if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__);
+	pVertices = (D3D::FONT2DVERTEX*)vbmap.pData;
+
+	// set general pipeline state
+	D3D::stateman->PushBlendState(m_blendstate);
+	D3D::stateman->PushRasterizerState(m_raststate);
+
+	D3D::stateman->SetPixelShader(m_pshader);
+	D3D::stateman->SetVertexShader(m_vshader);
+	D3D::stateman->SetGeometryShader(nullptr);
+
+	D3D::stateman->SetInputLayout(m_InputLayout);
+	D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+	D3D::stateman->SetTexture(0, m_pTexture);
+
+	float fStartX = sx;
+	for (char c : text)
+	{
+		if (c == '\n')
+		{
+			sx  = fStartX;
+			sy -= scaley * size;
+		}
+		if (!std::isprint(c))
+			continue;
+
+		c -= 32;
+		float tx1 = m_fTexCoords[c][0];
+		float ty1 = m_fTexCoords[c][1];
+		float tx2 = m_fTexCoords[c][2];
+		float ty2 = m_fTexCoords[c][3];
+
+		float w = (float)(tx2-tx1) * m_dwTexWidth * scalex * sizeratio;
+		float h = (float)(ty1-ty2) * m_dwTexHeight * scaley * sizeratio;
+
+		FONT2DVERTEX v[6];
+		v[0] = InitFont2DVertex(sx,   sy+h, dwColor, tx1, ty2);
+		v[1] = InitFont2DVertex(sx,   sy,   dwColor, tx1, ty1);
+		v[2] = InitFont2DVertex(sx+w, sy+h, dwColor, tx2, ty2);
+		v[3] = InitFont2DVertex(sx+w, sy,   dwColor, tx2, ty1);
+		v[4] = v[2];
+		v[5] = v[1];
+
+		memcpy(pVertices, v, 6*sizeof(FONT2DVERTEX));
+
+		pVertices+=6;
+		dwNumTriangles += 2;
+
+		if (dwNumTriangles * 3 > (MAX_NUM_VERTICES - 6))
+		{
+			context->Unmap(m_pVB, 0);
+
+			D3D::stateman->SetVertexBuffer(m_pVB, stride, bufoffset);
+
+			D3D::stateman->Apply();
+			D3D::context->Draw(3 * dwNumTriangles, 0);
+
+			dwNumTriangles = 0;
+			D3D11_MAPPED_SUBRESOURCE _vbmap;
+			hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &_vbmap);
+			if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__);
+			pVertices = (D3D::FONT2DVERTEX*)_vbmap.pData;
+		}
+		sx += w + spacing * scalex * size;
+	}
+
+	// Unlock and render the vertex buffer
+	context->Unmap(m_pVB, 0);
+	if (dwNumTriangles > 0)
+	{
+		D3D::stateman->SetVertexBuffer(m_pVB, stride, bufoffset);
+
+		D3D::stateman->Apply();
+		D3D::context->Draw(3 * dwNumTriangles, 0);
+	}
+	D3D::stateman->PopBlendState();
+	D3D::stateman->PopRasterizerState();
+	return S_OK;
+}
+
+ID3D11SamplerState* linear_copy_sampler = nullptr;
+ID3D11SamplerState* point_copy_sampler = nullptr;
+
+struct STQVertex   { float x, y, z, u, v, w, g; };
+struct STSQVertex  { float x, y, z, u, v, w, g; };
+struct ClearVertex { float x, y, z; u32 col; };
+struct ColVertex   { float x, y, z; u32 col; };
+
+struct
+{
+	float u1, v1, u2, v2, S, G;
+} tex_quad_data;
+
+struct
+{
+	MathUtil::Rectangle<float> rdest;
+	float u1, v1, u2, v2, S, G;
+} tex_sub_quad_data;
+
+struct
+{
+	float x1, y1, x2, y2, z;
+	u32 col;
+} draw_quad_data;
+
+struct
+{
+	u32 col;
+	float z;
+} clear_quad_data;
+
+// ring buffer offsets
+int stq_offset, stsq_offset, cq_offset, clearq_offset;
+
+// observer variables for ring buffer wraps
+bool stq_observer, stsq_observer, cq_observer, clearq_observer;
+
+void InitUtils()
+{
+	util_vbuf = new UtilVertexBuffer(0x4000);
+
+	float border[4] = { 0.f, 0.f, 0.f, 0.f };
+	D3D11_SAMPLER_DESC samDesc = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_POINT, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, 0.f, 1, D3D11_COMPARISON_ALWAYS, border, 0.f, 0.f);
+	HRESULT hr = D3D::device->CreateSamplerState(&samDesc, &point_copy_sampler);
+	if (FAILED(hr)) PanicAlert("Failed to create sampler state at %s %d\n", __FILE__, __LINE__);
+	else SetDebugObjectName((ID3D11DeviceChild*)point_copy_sampler, "point copy sampler state");
+
+	samDesc = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_LINEAR, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, 0.f, 1, D3D11_COMPARISON_ALWAYS, border, 0.f, 0.f);
+	hr = D3D::device->CreateSamplerState(&samDesc, &linear_copy_sampler);
+	if (FAILED(hr)) PanicAlert("Failed to create sampler state at %s %d\n", __FILE__, __LINE__);
+	else SetDebugObjectName((ID3D11DeviceChild*)linear_copy_sampler, "linear copy sampler state");
+
+	// cached data used to avoid unnecessarily reloading the vertex buffers
+	memset(&tex_quad_data, 0, sizeof(tex_quad_data));
+	memset(&tex_sub_quad_data, 0, sizeof(tex_sub_quad_data));
+	memset(&draw_quad_data, 0, sizeof(draw_quad_data));
+	memset(&clear_quad_data, 0, sizeof(clear_quad_data));
+
+	// make sure to properly load the vertex data whenever the corresponding functions get called the first time
+	stq_observer = stsq_observer = cq_observer = clearq_observer = true;
+	util_vbuf->AddWrapObserver(&stq_observer);
+	util_vbuf->AddWrapObserver(&stsq_observer);
+	util_vbuf->AddWrapObserver(&cq_observer);
+	util_vbuf->AddWrapObserver(&clearq_observer);
+
+	font.Init();
+}
+
+void ShutdownUtils()
+{
+	font.Shutdown();
+	SAFE_RELEASE(point_copy_sampler);
+	SAFE_RELEASE(linear_copy_sampler);
+	SAFE_DELETE(util_vbuf);
+}
+
+void SetPointCopySampler()
+{
+	D3D::stateman->SetSampler(0, point_copy_sampler);
+}
+
+void SetLinearCopySampler()
+{
+	D3D::stateman->SetSampler(0, linear_copy_sampler);
+}
+
+void drawShadedTexQuad(ID3D11ShaderResourceView* texture,
+						const D3D11_RECT* rSource,
+						int SourceWidth,
+						int SourceHeight,
+						ID3D11PixelShader* PShader,
+						ID3D11VertexShader* VShader,
+						ID3D11InputLayout* layout,
+						ID3D11GeometryShader* GShader,
+						float Gamma,
+						u32 slice)
+{
+	float sw = 1.0f /(float) SourceWidth;
+	float sh = 1.0f /(float) SourceHeight;
+	float u1 = ((float)rSource->left) * sw;
+	float u2 = ((float)rSource->right) * sw;
+	float v1 = ((float)rSource->top) * sh;
+	float v2 = ((float)rSource->bottom) * sh;
+	float S = (float)slice;
+	float G = 1.0f / Gamma;
+
+	STQVertex coords[4] = {
+		{-1.0f, 1.0f, 0.0f,  u1, v1, S, G},
+		{ 1.0f, 1.0f, 0.0f,  u2, v1, S, G},
+		{-1.0f,-1.0f, 0.0f,  u1, v2, S, G},
+		{ 1.0f,-1.0f, 0.0f,  u2, v2, S, G},
+	};
+
+	// only upload the data to VRAM if it changed
+	if (stq_observer ||
+		tex_quad_data.u1 != u1 || tex_quad_data.v1 != v1 ||
+		tex_quad_data.u2 != u2 || tex_quad_data.v2 != v2 ||
+		tex_quad_data.S  != S  || tex_quad_data.G  != G)
+	{
+		stq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(STQVertex));
+		stq_observer = false;
+
+		tex_quad_data.u1 = u1;
+		tex_quad_data.v1 = v1;
+		tex_quad_data.u2 = u2;
+		tex_quad_data.v2 = v2;
+		tex_quad_data.S  = S;
+		tex_quad_data.G  = G;
+	}
+	UINT stride = sizeof(STQVertex);
+	UINT offset = 0;
+
+	D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+	D3D::stateman->SetInputLayout(layout);
+	D3D::stateman->SetVertexBuffer(util_vbuf->GetBuffer(), stride, offset);
+	D3D::stateman->SetPixelShader(PShader);
+	D3D::stateman->SetTexture(0, texture);
+	D3D::stateman->SetVertexShader(VShader);
+	D3D::stateman->SetGeometryShader(GShader);
+
+	D3D::stateman->Apply();
+	D3D::context->Draw(4, stq_offset);
+
+	D3D::stateman->SetTexture(0, nullptr); // immediately unbind the texture
+	D3D::stateman->Apply();
+
+	D3D::stateman->SetGeometryShader(nullptr);
+}
+
+// Fills a certain area of the current render target with the specified color
+// destination coordinates normalized to (-1;1)
+void drawColorQuad(u32 Color, float z, float x1, float y1, float x2, float y2)
+{
+	ColVertex coords[4] = {
+		{ x1, y1, z, Color },
+		{ x2, y1, z, Color },
+		{ x1, y2, z, Color },
+		{ x2, y2, z, Color },
+	};
+
+	if (cq_observer ||
+	    draw_quad_data.x1 != x1 || draw_quad_data.y1 != y1 ||
+	    draw_quad_data.x2 != x2 || draw_quad_data.y2 != y2 ||
+	    draw_quad_data.col != Color || draw_quad_data.z != z)
+	{
+		cq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(ColVertex));
+		cq_observer = false;
+
+		draw_quad_data.x1 = x1;
+		draw_quad_data.y1 = y1;
+		draw_quad_data.x2 = x2;
+		draw_quad_data.y2 = y2;
+		draw_quad_data.col = Color;
+		draw_quad_data.z = z;
+	}
+
+	stateman->SetVertexShader(VertexShaderCache::GetClearVertexShader());
+	stateman->SetGeometryShader(GeometryShaderCache::GetClearGeometryShader());
+	stateman->SetPixelShader(PixelShaderCache::GetClearProgram());
+	stateman->SetInputLayout(VertexShaderCache::GetClearInputLayout());
+
+	UINT stride = sizeof(ColVertex);
+	UINT offset = 0;
+	stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+	stateman->SetVertexBuffer(util_vbuf->GetBuffer(), stride, offset);
+
+	stateman->Apply();
+	context->Draw(4, cq_offset);
+
+	stateman->SetGeometryShader(nullptr);
+}
+
+void drawClearQuad(u32 Color, float z)
+{
+	ClearVertex coords[4] = {
+		{-1.0f,  1.0f, z, Color},
+		{ 1.0f,  1.0f, z, Color},
+		{-1.0f, -1.0f, z, Color},
+		{ 1.0f, -1.0f, z, Color},
+	};
+
+	if (clearq_observer || clear_quad_data.col != Color || clear_quad_data.z != z)
+	{
+		clearq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(ClearVertex));
+		clearq_observer = false;
+
+		clear_quad_data.col = Color;
+		clear_quad_data.z = z;
+	}
+
+	stateman->SetVertexShader(VertexShaderCache::GetClearVertexShader());
+	stateman->SetGeometryShader(GeometryShaderCache::GetClearGeometryShader());
+	stateman->SetPixelShader(PixelShaderCache::GetClearProgram());
+	stateman->SetInputLayout(VertexShaderCache::GetClearInputLayout());
+
+	UINT stride = sizeof(ClearVertex);
+	UINT offset = 0;
+	stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+	stateman->SetVertexBuffer(util_vbuf->GetBuffer(), stride, offset);
+
+	stateman->Apply();
+	context->Draw(4, clearq_offset);
+
+	stateman->SetGeometryShader(nullptr);
+}
+
+}  // namespace D3D
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.h b/Source/Core/VideoBackends/D3D/D3DUtil.h
new file mode 100644
index 0000000000..2f2000f004
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/D3DUtil.h
@@ -0,0 +1,72 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <d3d11.h>
+#include <string>
+
+#include "Common/MathUtil.h"
+
+namespace DX11
+{
+
+namespace D3D
+{
+	// Font creation flags
+	#define D3DFONT_BOLD        0x0001
+	#define D3DFONT_ITALIC      0x0002
+
+	// Font rendering flags
+	#define D3DFONT_CENTERED    0x0001
+
+	class CD3DFont
+	{
+		ID3D11ShaderResourceView* m_pTexture;
+		ID3D11Buffer* m_pVB;
+		ID3D11InputLayout* m_InputLayout;
+		ID3D11PixelShader* m_pshader;
+		ID3D11VertexShader* m_vshader;
+		ID3D11BlendState* m_blendstate;
+		ID3D11RasterizerState* m_raststate;
+		const int m_dwTexWidth;
+		const int m_dwTexHeight;
+		unsigned int m_LineHeight;
+		float m_fTexCoords[128-32][4];
+
+	public:
+		CD3DFont();
+		// 2D text drawing function
+		// Initializing and destroying device-dependent objects
+		int Init();
+		int Shutdown();
+		int DrawTextScaled(float x, float y,
+		                   float size,
+		                   float spacing, u32 dwColor,
+		                   const std::string& text);
+	};
+
+	extern CD3DFont font;
+
+	void InitUtils();
+	void ShutdownUtils();
+
+	void SetPointCopySampler();
+	void SetLinearCopySampler();
+
+	void drawShadedTexQuad(ID3D11ShaderResourceView* texture,
+						const D3D11_RECT* rSource,
+						int SourceWidth,
+						int SourceHeight,
+						ID3D11PixelShader* PShader,
+						ID3D11VertexShader* VShader,
+						ID3D11InputLayout* layout,
+						ID3D11GeometryShader* GShader = nullptr,
+						float Gamma = 1.0f,
+						u32 slice = 0);
+	void drawClearQuad(u32 Color, float z);
+	void drawColorQuad(u32 Color, float z, float x1, float y1, float x2, float y2);
+}
+
+}
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
new file mode 100644
index 0000000000..03cea928f0
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
@@ -0,0 +1,209 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+#include "VideoBackends/D3D/XFBEncoder.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11 {
+
+static XFBEncoder s_xfbEncoder;
+
+FramebufferManager::Efb FramebufferManager::m_efb;
+unsigned int FramebufferManager::m_target_width;
+unsigned int FramebufferManager::m_target_height;
+
+D3DTexture2D* &FramebufferManager::GetEFBColorTexture() { return m_efb.color_tex; }
+ID3D11Texture2D* &FramebufferManager::GetEFBColorStagingBuffer() { return m_efb.color_staging_buf; }
+
+D3DTexture2D* &FramebufferManager::GetEFBDepthTexture() { return m_efb.depth_tex; }
+D3DTexture2D* &FramebufferManager::GetEFBDepthReadTexture() { return m_efb.depth_read_texture; }
+ID3D11Texture2D* &FramebufferManager::GetEFBDepthStagingBuffer() { return m_efb.depth_staging_buf; }
+
+D3DTexture2D* &FramebufferManager::GetResolvedEFBColorTexture()
+{
+	if (g_ActiveConfig.iMultisampleMode)
+	{
+		for (int i = 0; i < m_efb.slices; i++)
+			D3D::context->ResolveSubresource(m_efb.resolved_color_tex->GetTex(), D3D11CalcSubresource(0, i, 1), m_efb.color_tex->GetTex(), D3D11CalcSubresource(0, i, 1), DXGI_FORMAT_R8G8B8A8_UNORM);
+		return m_efb.resolved_color_tex;
+	}
+	else
+		return m_efb.color_tex;
+}
+
+D3DTexture2D* &FramebufferManager::GetResolvedEFBDepthTexture()
+{
+	if (g_ActiveConfig.iMultisampleMode)
+	{
+		for (int i = 0; i < m_efb.slices; i++)
+			D3D::context->ResolveSubresource(m_efb.resolved_depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), m_efb.depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), DXGI_FORMAT_R24_UNORM_X8_TYPELESS);
+		return m_efb.resolved_depth_tex;
+	}
+	else
+		return m_efb.depth_tex;
+}
+
+FramebufferManager::FramebufferManager()
+{
+	m_target_width = Renderer::GetTargetWidth();
+	m_target_height = Renderer::GetTargetHeight();
+	DXGI_SAMPLE_DESC sample_desc = D3D::GetAAMode(g_ActiveConfig.iMultisampleMode);
+
+	ID3D11Texture2D* buf;
+	D3D11_TEXTURE2D_DESC texdesc;
+	HRESULT hr;
+
+	m_EFBLayers = m_efb.slices = (g_ActiveConfig.iStereoMode > 0) ? 2 : 1;
+
+	// EFB color texture - primary render target
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_target_width, m_target_height, m_efb.slices, 1, D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+	CHECK(hr==S_OK, "create EFB color texture (size: %dx%d; hr=%#x)", m_target_width, m_target_height, hr);
+	m_efb.color_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
+	CHECK(m_efb.color_tex!=nullptr, "create EFB color texture (size: %dx%d)", m_target_width, m_target_height);
+	SAFE_RELEASE(buf);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetTex(), "EFB color texture");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetSRV(), "EFB color texture shader resource view");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetRTV(), "EFB color texture render target view");
+
+	// Temporary EFB color texture - used in ReinterpretPixelData
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_target_width, m_target_height, m_efb.slices, 1, D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+	CHECK(hr==S_OK, "create EFB color temp texture (size: %dx%d; hr=%#x)", m_target_width, m_target_height, hr);
+	m_efb.color_temp_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
+	CHECK(m_efb.color_temp_tex!=nullptr, "create EFB color temp texture (size: %dx%d)", m_target_width, m_target_height);
+	SAFE_RELEASE(buf);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetTex(), "EFB color temp texture");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetSRV(), "EFB color temp texture shader resource view");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetRTV(), "EFB color temp texture render target view");
+
+	// AccessEFB - Sysmem buffer used to retrieve the pixel data from color_tex
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, m_efb.slices, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &m_efb.color_staging_buf);
+	CHECK(hr==S_OK, "create EFB color staging buffer (hr=%#x)", hr);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_staging_buf, "EFB color staging texture (used for Renderer::AccessEFB)");
+
+	// EFB depth buffer - primary depth buffer
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, m_target_width, m_target_height, m_efb.slices, 1, D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+	CHECK(hr==S_OK, "create EFB depth texture (size: %dx%d; hr=%#x)", m_target_width, m_target_height, hr);
+	m_efb.depth_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_SHADER_RESOURCE), DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_UNKNOWN, (sample_desc.Count > 1));
+	SAFE_RELEASE(buf);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetTex(), "EFB depth texture");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetDSV(), "EFB depth texture depth stencil view");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetSRV(), "EFB depth texture shader resource view");
+
+	// Render buffer for AccessEFB (depth data)
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, m_efb.slices, 1, D3D11_BIND_RENDER_TARGET);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+	CHECK(hr==S_OK, "create EFB depth read texture (hr=%#x)", hr);
+	m_efb.depth_read_texture = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
+	SAFE_RELEASE(buf);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_read_texture->GetTex(), "EFB depth read texture (used in Renderer::AccessEFB)");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_read_texture->GetRTV(), "EFB depth read texture render target view (used in Renderer::AccessEFB)");
+
+	// AccessEFB - Sysmem buffer used to retrieve the pixel data from depth_read_texture
+	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, m_efb.slices, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
+	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &m_efb.depth_staging_buf);
+	CHECK(hr==S_OK, "create EFB depth staging buffer (hr=%#x)", hr);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_staging_buf, "EFB depth staging texture (used for Renderer::AccessEFB)");
+
+	if (g_ActiveConfig.iMultisampleMode)
+	{
+		// Framebuffer resolve textures (color+depth)
+		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_target_width, m_target_height, m_efb.slices, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, 1);
+		hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+		m_efb.resolved_color_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R8G8B8A8_UNORM);
+		CHECK(m_efb.resolved_color_tex!=nullptr, "create EFB color resolve texture (size: %dx%d)", m_target_width, m_target_height);
+		SAFE_RELEASE(buf);
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetTex(), "EFB color resolve texture");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetSRV(), "EFB color resolve texture shader resource view");
+
+		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, m_target_width, m_target_height, m_efb.slices, 1, D3D11_BIND_SHADER_RESOURCE);
+		hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
+		CHECK(hr==S_OK, "create EFB depth resolve texture (size: %dx%d; hr=%#x)", m_target_width, m_target_height, hr);
+		m_efb.resolved_depth_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R24_UNORM_X8_TYPELESS);
+		SAFE_RELEASE(buf);
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_depth_tex->GetTex(), "EFB depth resolve texture");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_depth_tex->GetSRV(), "EFB depth resolve texture shader resource view");
+	}
+	else
+	{
+		m_efb.resolved_color_tex = nullptr;
+		m_efb.resolved_depth_tex = nullptr;
+	}
+
+	s_xfbEncoder.Init();
+}
+
+FramebufferManager::~FramebufferManager()
+{
+	s_xfbEncoder.Shutdown();
+
+	SAFE_RELEASE(m_efb.color_tex);
+	SAFE_RELEASE(m_efb.color_temp_tex);
+	SAFE_RELEASE(m_efb.color_staging_buf);
+	SAFE_RELEASE(m_efb.resolved_color_tex);
+	SAFE_RELEASE(m_efb.depth_tex);
+	SAFE_RELEASE(m_efb.depth_staging_buf);
+	SAFE_RELEASE(m_efb.depth_read_texture);
+	SAFE_RELEASE(m_efb.resolved_depth_tex);
+}
+
+void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma)
+{
+	u8* dst = Memory::GetPointer(xfbAddr);
+	s_xfbEncoder.Encode(dst, fbWidth, fbHeight, sourceRc, Gamma);
+}
+
+XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers)
+{
+	return new XFBSource(D3DTexture2D::Create(target_width, target_height,
+		(D3D11_BIND_FLAG)(D3D11_BIND_RENDER_TARGET|D3D11_BIND_SHADER_RESOURCE),
+		D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM, 1, layers), layers);
+}
+
+void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height)
+{
+	*width = m_target_width;
+	*height = m_target_height;
+}
+
+void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
+{
+	// DX11's XFB decoder does not use this function.
+	// YUYV data is decoded in Render::Swap.
+}
+
+void XFBSource::CopyEFB(float Gamma)
+{
+	g_renderer->ResetAPIState(); // reset any game specific settings
+
+	// Copy EFB data to XFB and restore render target again
+	const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)texWidth, (float)texHeight);
+
+	D3D::context->RSSetViewports(1, &vp);
+	D3D::context->OMSetRenderTargets(1, &tex->GetRTV(), nullptr);
+	D3D::SetLinearCopySampler();
+
+	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), sourceRc.AsRECT(),
+		Renderer::GetTargetWidth(), Renderer::GetTargetHeight(), PixelShaderCache::GetColorCopyProgram(true),
+		VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(),
+		GeometryShaderCache::GetCopyGeometryShader(), Gamma);
+
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(),
+		FramebufferManager::GetEFBDepthTexture()->GetDSV());
+
+	g_renderer->RestoreAPIState();
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.h b/Source/Core/VideoBackends/D3D/FramebufferManager.h
new file mode 100644
index 0000000000..11ee646b4c
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/FramebufferManager.h
@@ -0,0 +1,109 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "d3d11.h"
+
+#include "VideoBackends/D3D/D3DTexture.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+
+namespace DX11 {
+
+// On the GameCube, the game sends a request for the graphics processor to
+// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
+// called the XFB (External Framebuffer). The size and location of the XFB is
+// decided at the time of the copy, and the format is always YUYV. The video
+// interface is given a pointer to the XFB, which will be decoded and
+// displayed on the TV.
+//
+// There are two ways for Dolphin to emulate this:
+//
+// Real XFB mode:
+//
+// Dolphin will behave like the GameCube and encode the EFB to
+// a portion of GameCube RAM. The emulated video interface will decode the data
+// for output to the screen.
+//
+// Advantages: Behaves exactly like the GameCube.
+// Disadvantages: Resolution will be limited.
+//
+// Virtual XFB mode:
+//
+// When a request is made to copy the EFB to an XFB, Dolphin
+// will remember the RAM location and size of the XFB in a Virtual XFB list.
+// The video interface will look up the XFB in the list and use the enhanced
+// data stored there, if available.
+//
+// Advantages: Enables high resolution graphics, better than real hardware.
+// Disadvantages: If the GameCube CPU writes directly to the XFB (which is
+// possible but uncommon), the Virtual XFB will not capture this information.
+
+// There may be multiple XFBs in GameCube RAM. This is the maximum number to
+// virtualize.
+
+struct XFBSource : public XFBSourceBase
+{
+	XFBSource(D3DTexture2D *_tex, int slices) : tex(_tex), m_slices(slices) {}
+	~XFBSource() { tex->Release(); }
+
+	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
+	void CopyEFB(float Gamma) override;
+
+	D3DTexture2D* const tex;
+	const int m_slices;
+};
+
+class FramebufferManager : public FramebufferManagerBase
+{
+public:
+	FramebufferManager();
+	~FramebufferManager();
+
+	static D3DTexture2D* &GetEFBColorTexture();
+	static ID3D11Texture2D* &GetEFBColorStagingBuffer();
+
+	static D3DTexture2D* &GetEFBDepthTexture();
+	static D3DTexture2D* &GetEFBDepthReadTexture();
+	static ID3D11Texture2D* &GetEFBDepthStagingBuffer();
+
+	static D3DTexture2D* &GetResolvedEFBColorTexture();
+	static D3DTexture2D* &GetResolvedEFBDepthTexture();
+
+	static D3DTexture2D* &GetEFBColorTempTexture() { return m_efb.color_temp_tex; }
+	static void SwapReinterpretTexture()
+	{
+		D3DTexture2D* swaptex = GetEFBColorTempTexture();
+		m_efb.color_temp_tex = GetEFBColorTexture();
+		m_efb.color_tex = swaptex;
+	}
+
+private:
+	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) override;
+	void GetTargetSize(unsigned int *width, unsigned int *height) override;
+
+	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;
+
+	static struct Efb
+	{
+		D3DTexture2D* color_tex;
+		ID3D11Texture2D* color_staging_buf;
+
+		D3DTexture2D* depth_tex;
+		ID3D11Texture2D* depth_staging_buf;
+		D3DTexture2D* depth_read_texture;
+
+		D3DTexture2D* color_temp_tex;
+
+		D3DTexture2D* resolved_color_tex;
+		D3DTexture2D* resolved_depth_tex;
+
+		int slices;
+	} m_efb;
+
+	static unsigned int m_target_width;
+	static unsigned int m_target_height;
+};
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp b/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp
new file mode 100644
index 0000000000..6e2ab7462b
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp
@@ -0,0 +1,279 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/LinearDiskCache.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/Globals.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+GeometryShaderCache::GSCache GeometryShaderCache::GeometryShaders;
+const GeometryShaderCache::GSCacheEntry* GeometryShaderCache::last_entry;
+GeometryShaderUid GeometryShaderCache::last_uid;
+UidChecker<GeometryShaderUid,ShaderCode> GeometryShaderCache::geometry_uid_checker;
+const GeometryShaderCache::GSCacheEntry GeometryShaderCache::pass_entry;
+
+ID3D11GeometryShader* ClearGeometryShader = nullptr;
+ID3D11GeometryShader* CopyGeometryShader = nullptr;
+
+LinearDiskCache<GeometryShaderUid, u8> g_gs_disk_cache;
+
+ID3D11GeometryShader* GeometryShaderCache::GetClearGeometryShader() { return (g_ActiveConfig.iStereoMode > 0) ? ClearGeometryShader: nullptr; }
+ID3D11GeometryShader* GeometryShaderCache::GetCopyGeometryShader() { return (g_ActiveConfig.iStereoMode > 0) ? CopyGeometryShader : nullptr; }
+
+ID3D11Buffer* gscbuf = nullptr;
+
+ID3D11Buffer* &GeometryShaderCache::GetConstantBuffer()
+{
+	// TODO: divide the global variables of the generated shaders into about 5 constant buffers to speed this up
+	if (GeometryShaderManager::dirty)
+	{
+		D3D11_MAPPED_SUBRESOURCE map;
+		D3D::context->Map(gscbuf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+		memcpy(map.pData, &GeometryShaderManager::constants, sizeof(GeometryShaderConstants));
+		D3D::context->Unmap(gscbuf, 0);
+		GeometryShaderManager::dirty = false;
+
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(GeometryShaderConstants));
+	}
+	return gscbuf;
+}
+
+// this class will load the precompiled shaders into our cache
+class GeometryShaderCacheInserter : public LinearDiskCacheReader<GeometryShaderUid, u8>
+{
+public:
+	void Read(const GeometryShaderUid &key, const u8* value, u32 value_size)
+	{
+		GeometryShaderCache::InsertByteCode(key, value, value_size);
+	}
+};
+
+const char clear_shader_code[] = {
+	"struct VSOUTPUT\n"
+	"{\n"
+	"	float4 vPosition   : POSITION;\n"
+	"	float4 vColor0   : COLOR0;\n"
+	"};\n"
+	"struct GSOUTPUT\n"
+	"{\n"
+	"	float4 vPosition   : POSITION;\n"
+	"	float4 vColor0   : COLOR0;\n"
+	"	uint slice    : SV_RenderTargetArrayIndex;\n"
+	"};\n"
+	"[maxvertexcount(6)]\n"
+	"void main(triangle VSOUTPUT o[3], inout TriangleStream<GSOUTPUT> Output)\n"
+	"{\n"
+	"for(int slice = 0; slice < 2; slice++)\n"
+	"{\n"
+	"	for(int i = 0; i < 3; i++)\n"
+	"	{\n"
+	"		GSOUTPUT OUT;\n"
+	"		OUT.vPosition = o[i].vPosition;\n"
+	"		OUT.vColor0 = o[i].vColor0;\n"
+	"		OUT.slice = slice;\n"
+	"		Output.Append(OUT);\n"
+	"	}\n"
+	"	Output.RestartStrip();\n"
+	"}\n"
+	"}\n"
+};
+
+const char copy_shader_code[] = {
+	"struct VSOUTPUT\n"
+	"{\n"
+	"	float4 vPosition : POSITION;\n"
+	"	float3 vTexCoord : TEXCOORD0;\n"
+	"	float  vTexCoord1 : TEXCOORD1;\n"
+	"};\n"
+	"struct GSOUTPUT\n"
+	"{\n"
+	"	float4 vPosition : POSITION;\n"
+	"	float3 vTexCoord : TEXCOORD0;\n"
+	"	float  vTexCoord1 : TEXCOORD1;\n"
+	"	uint slice    : SV_RenderTargetArrayIndex;\n"
+	"};\n"
+	"[maxvertexcount(6)]\n"
+	"void main(triangle VSOUTPUT o[3], inout TriangleStream<GSOUTPUT> Output)\n"
+	"{\n"
+	"for(int slice = 0; slice < 2; slice++)\n"
+	"{\n"
+	"	for(int i = 0; i < 3; i++)\n"
+	"	{\n"
+	"		GSOUTPUT OUT;\n"
+	"		OUT.vPosition = o[i].vPosition;\n"
+	"		OUT.vTexCoord = o[i].vTexCoord;\n"
+	"		OUT.vTexCoord.z = slice;\n"
+	"		OUT.vTexCoord1 = o[i].vTexCoord1;\n"
+	"		OUT.slice = slice;\n"
+	"		Output.Append(OUT);\n"
+	"	}\n"
+	"	Output.RestartStrip();\n"
+	"}\n"
+	"}\n"
+};
+
+void GeometryShaderCache::Init()
+{
+	unsigned int gbsize = ROUND_UP(sizeof(GeometryShaderConstants), 16); // must be a multiple of 16
+	D3D11_BUFFER_DESC gbdesc = CD3D11_BUFFER_DESC(gbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+	HRESULT hr = D3D::device->CreateBuffer(&gbdesc, nullptr, &gscbuf);
+	CHECK(hr == S_OK, "Create geometry shader constant buffer (size=%u)", gbsize);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)gscbuf, "geometry shader constant buffer used to emulate the GX pipeline");
+
+	// used when drawing clear quads
+	ClearGeometryShader = D3D::CompileAndCreateGeometryShader(clear_shader_code);
+	CHECK(ClearGeometryShader != nullptr, "Create clear geometry shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearGeometryShader, "clear geometry shader");
+
+	// used for buffer copy
+	CopyGeometryShader = D3D::CompileAndCreateGeometryShader(copy_shader_code);
+	CHECK(CopyGeometryShader != nullptr, "Create copy geometry shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)CopyGeometryShader, "copy geometry shader");
+
+	Clear();
+
+	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
+		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
+
+	std::string cache_filename = StringFromFormat("%sdx11-%s-gs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
+	GeometryShaderCacheInserter inserter;
+	g_gs_disk_cache.OpenAndRead(cache_filename, inserter);
+
+	if (g_Config.bEnableShaderDebugging)
+		Clear();
+
+	last_entry = nullptr;
+}
+
+// ONLY to be used during shutdown.
+void GeometryShaderCache::Clear()
+{
+	for (auto& iter : GeometryShaders)
+		iter.second.Destroy();
+	GeometryShaders.clear();
+	geometry_uid_checker.Invalidate();
+
+	last_entry = nullptr;
+}
+
+void GeometryShaderCache::Shutdown()
+{
+	SAFE_RELEASE(gscbuf);
+
+	SAFE_RELEASE(ClearGeometryShader);
+	SAFE_RELEASE(CopyGeometryShader);
+
+	Clear();
+	g_gs_disk_cache.Sync();
+	g_gs_disk_cache.Close();
+}
+
+bool GeometryShaderCache::SetShader(u32 primitive_type)
+{
+	GeometryShaderUid uid;
+	GetGeometryShaderUid(uid, primitive_type, API_D3D);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		ShaderCode code;
+		GenerateGeometryShaderCode(code, primitive_type, API_D3D);
+		geometry_uid_checker.AddToIndexAndCheck(code, uid, "Geometry", "g");
+	}
+
+	// Check if the shader is already set
+	if (last_entry)
+	{
+		if (uid == last_uid)
+		{
+			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
+			return true;
+		}
+	}
+
+	last_uid = uid;
+
+	// Check if the shader is a pass-through shader
+	if (uid.GetUidData()->IsPassthrough())
+	{
+		// Return the default pass-through shader
+		last_entry = &pass_entry;
+		return true;
+	}
+
+	// Check if the shader is already in the cache
+	GSCache::iterator iter;
+	iter = GeometryShaders.find(uid);
+	if (iter != GeometryShaders.end())
+	{
+		const GSCacheEntry &entry = iter->second;
+		last_entry = &entry;
+
+		return (entry.shader != nullptr);
+	}
+
+	// Need to compile a new shader
+	ShaderCode code;
+	GenerateGeometryShaderCode(code, primitive_type, API_D3D);
+
+	D3DBlob* pbytecode;
+	if (!D3D::CompileGeometryShader(code.GetBuffer(), &pbytecode))
+	{
+		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
+		return false;
+	}
+
+	// Insert the bytecode into the caches
+	g_gs_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size());
+
+	bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size());
+	pbytecode->Release();
+
+	if (g_ActiveConfig.bEnableShaderDebugging && success)
+	{
+		GeometryShaders[uid].code = code.GetBuffer();
+	}
+
+	return success;
+}
+
+bool GeometryShaderCache::InsertByteCode(const GeometryShaderUid &uid, const void* bytecode, unsigned int bytecodelen)
+{
+	ID3D11GeometryShader* shader = D3D::CreateGeometryShaderFromByteCode(bytecode, bytecodelen);
+	if (shader == nullptr)
+		return false;
+
+	// TODO: Somehow make the debug name a bit more specific
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of GeometryShaderCache");
+
+	// Make an entry in the table
+	GSCacheEntry newentry;
+	newentry.shader = shader;
+	GeometryShaders[uid] = newentry;
+	last_entry = &GeometryShaders[uid];
+
+	if (!shader)
+		return false;
+
+	return true;
+}
+
+}  // DX11
diff --git a/Source/Core/VideoBackends/D3D/GeometryShaderCache.h b/Source/Core/VideoBackends/D3D/GeometryShaderCache.h
new file mode 100644
index 0000000000..93e5dfa8b1
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/GeometryShaderCache.h
@@ -0,0 +1,51 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <d3d11.h>
+#include <map>
+
+#include "VideoCommon/GeometryShaderGen.h"
+
+namespace DX11
+{
+
+class GeometryShaderCache
+{
+public:
+	static void Init();
+	static void Clear();
+	static void Shutdown();
+	static bool SetShader(u32 primitive_type); // TODO: Should be renamed to LoadShader
+	static bool InsertByteCode(const GeometryShaderUid &uid, const void* bytecode, unsigned int bytecodelen);
+
+	static ID3D11GeometryShader* GeometryShaderCache::GetClearGeometryShader();
+	static ID3D11GeometryShader* GeometryShaderCache::GetCopyGeometryShader();
+
+	static ID3D11GeometryShader* GetActiveShader() { return last_entry->shader; }
+	static ID3D11Buffer* &GetConstantBuffer();
+
+private:
+	struct GSCacheEntry
+	{
+		ID3D11GeometryShader* shader;
+
+		std::string code;
+
+		GSCacheEntry() : shader(nullptr) {}
+		void Destroy() { SAFE_RELEASE(shader); }
+	};
+
+	typedef std::map<GeometryShaderUid, GSCacheEntry> GSCache;
+
+	static GSCache GeometryShaders;
+	static const GSCacheEntry* last_entry;
+	static GeometryShaderUid last_uid;
+	static const GSCacheEntry pass_entry;
+
+	static UidChecker<GeometryShaderUid, ShaderCode> geometry_uid_checker;
+};
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/Globals.h b/Source/Core/VideoBackends/D3D/Globals.h
new file mode 100644
index 0000000000..6d7665c66c
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/Globals.h
@@ -0,0 +1,12 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+
+#include "VideoBackends/D3D/main.h"
+
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
new file mode 100644
index 0000000000..4b2951a689
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
@@ -0,0 +1,144 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBlob.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+#include "VideoCommon/NativeVertexFormat.h"
+
+namespace DX11
+{
+
+class D3DVertexFormat : public NativeVertexFormat
+{
+	D3D11_INPUT_ELEMENT_DESC m_elems[32];
+	UINT m_num_elems;
+
+	ID3D11InputLayout* m_layout;
+
+public:
+	D3DVertexFormat() : m_num_elems(0), m_layout(nullptr) {}
+	~D3DVertexFormat() { SAFE_RELEASE(m_layout); }
+
+	void Initialize(const PortableVertexDeclaration &_vtx_decl);
+	void SetupVertexPointers();
+};
+
+NativeVertexFormat* VertexManager::CreateNativeVertexFormat()
+{
+	return new D3DVertexFormat();
+}
+
+static const DXGI_FORMAT d3d_format_lookup[5*4*2] =
+{
+	// float formats
+	DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R32_FLOAT,
+	DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R32G32_FLOAT,
+	DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R32G32B32_FLOAT,
+	DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R16G16B16A16_SNORM, DXGI_FORMAT_R32G32B32A32_FLOAT,
+
+	// integer formats
+	DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_UNKNOWN,
+	DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_UNKNOWN,
+	DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
+	DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_UNKNOWN,
+};
+
+DXGI_FORMAT VarToD3D(VarType t, int size, bool integer)
+{
+	DXGI_FORMAT retval = d3d_format_lookup[(int)t + 5*(size-1) + 5*4*(int)integer];
+	if (retval == DXGI_FORMAT_UNKNOWN)
+	{
+		PanicAlert("VarToD3D: Invalid type/size combo %i , %i, %i", (int)t, size, (int)integer);
+	}
+	return retval;
+}
+
+void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
+{
+	vtx_decl = _vtx_decl;
+	memset(m_elems, 0, sizeof(m_elems));
+	const AttributeFormat* format = &_vtx_decl.position;
+
+	if (format->enable)
+	{
+		m_elems[m_num_elems].SemanticName = "POSITION";
+		m_elems[m_num_elems].AlignedByteOffset = format->offset;
+		m_elems[m_num_elems].Format = VarToD3D(format->type, format->components, format->integer);
+		m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+		++m_num_elems;
+	}
+
+	for (int i = 0; i < 3; i++)
+	{
+		format = &_vtx_decl.normals[i];
+		if (format->enable)
+		{
+			m_elems[m_num_elems].SemanticName = "NORMAL";
+			m_elems[m_num_elems].SemanticIndex = i;
+			m_elems[m_num_elems].AlignedByteOffset = format->offset;
+			m_elems[m_num_elems].Format = VarToD3D(format->type, format->components, format->integer);
+			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+			++m_num_elems;
+		}
+	}
+
+	for (int i = 0; i < 2; i++)
+	{
+		format = &_vtx_decl.colors[i];
+		if (format->enable)
+		{
+			m_elems[m_num_elems].SemanticName = "COLOR";
+			m_elems[m_num_elems].SemanticIndex = i;
+			m_elems[m_num_elems].AlignedByteOffset = format->offset;
+			m_elems[m_num_elems].Format = VarToD3D(format->type, format->components, format->integer);
+			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+			++m_num_elems;
+		}
+	}
+
+	for (int i = 0; i < 8; i++)
+	{
+		format = &_vtx_decl.texcoords[i];
+		if (format->enable)
+		{
+			m_elems[m_num_elems].SemanticName = "TEXCOORD";
+			m_elems[m_num_elems].SemanticIndex = i;
+			m_elems[m_num_elems].AlignedByteOffset = format->offset;
+			m_elems[m_num_elems].Format = VarToD3D(format->type, format->components, format->integer);
+			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+			++m_num_elems;
+		}
+	}
+
+	format = &_vtx_decl.posmtx;
+	if (format->enable)
+	{
+		m_elems[m_num_elems].SemanticName = "BLENDINDICES";
+		m_elems[m_num_elems].AlignedByteOffset = format->offset;
+		m_elems[m_num_elems].Format = VarToD3D(format->type, format->components, format->integer);
+		m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+		++m_num_elems;
+	}
+}
+
+void D3DVertexFormat::SetupVertexPointers()
+{
+	if (!m_layout)
+	{
+		// CreateInputLayout requires a shader input, but it only looks at the
+		// signature of the shader, so we don't need to recompute it if the shader
+		// changes.
+		D3DBlob* vs_bytecode = DX11::VertexShaderCache::GetActiveShaderBytecode();
+
+		HRESULT hr = DX11::D3D::device->CreateInputLayout(m_elems, m_num_elems, vs_bytecode->Data(), vs_bytecode->Size(), &m_layout);
+		if (FAILED(hr)) PanicAlert("Failed to create input layout, %s %d\n", __FILE__, __LINE__);
+		DX11::D3D::SetDebugObjectName((ID3D11DeviceChild*)m_layout, "input layout used to emulate the GX pipeline");
+	}
+	DX11::D3D::stateman->SetInputLayout(m_layout);
+}
+
+} // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
new file mode 100644
index 0000000000..485cf54ee3
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
@@ -0,0 +1,268 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/PSTextureEncoder.h"
+#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/TextureCache.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+
+#include "VideoCommon/TextureConversionShader.h"
+
+namespace DX11
+{
+
+struct EFBEncodeParams
+{
+	DWORD SrcLeft;
+	DWORD SrcTop;
+	DWORD DestWidth;
+	DWORD ScaleFactor;
+};
+
+PSTextureEncoder::PSTextureEncoder()
+	: m_ready(false), m_out(nullptr), m_outRTV(nullptr), m_outStage(nullptr),
+	m_encodeParams(nullptr)
+{
+}
+
+void PSTextureEncoder::Init()
+{
+	m_ready = false;
+
+	HRESULT hr;
+
+	// Create output texture RGBA format
+	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
+		DXGI_FORMAT_B8G8R8A8_UNORM,
+		EFB_WIDTH * 4, EFB_HEIGHT / 4, 1, 1, D3D11_BIND_RENDER_TARGET);
+	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_out);
+	CHECK(SUCCEEDED(hr), "create efb encode output texture");
+	D3D::SetDebugObjectName(m_out, "efb encoder output texture");
+
+	// Create output render target view
+	D3D11_RENDER_TARGET_VIEW_DESC rtvd = CD3D11_RENDER_TARGET_VIEW_DESC(m_out,
+		D3D11_RTV_DIMENSION_TEXTURE2D, DXGI_FORMAT_B8G8R8A8_UNORM);
+	hr = D3D::device->CreateRenderTargetView(m_out, &rtvd, &m_outRTV);
+	CHECK(SUCCEEDED(hr), "create efb encode output render target view");
+	D3D::SetDebugObjectName(m_outRTV, "efb encoder output rtv");
+
+	// Create output staging buffer
+	t2dd.Usage = D3D11_USAGE_STAGING;
+	t2dd.BindFlags = 0;
+	t2dd.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_outStage);
+	CHECK(SUCCEEDED(hr), "create efb encode output staging buffer");
+	D3D::SetDebugObjectName(m_outStage, "efb encoder output staging buffer");
+
+	// Create constant buffer for uploading data to shaders
+	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(EFBEncodeParams),
+		D3D11_BIND_CONSTANT_BUFFER);
+	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_encodeParams);
+	CHECK(SUCCEEDED(hr), "create efb encode params buffer");
+	D3D::SetDebugObjectName(m_encodeParams, "efb encoder params buffer");
+
+	m_ready = true;
+}
+
+void PSTextureEncoder::Shutdown()
+{
+	m_ready = false;
+
+	for (auto& it : m_staticShaders)
+	{
+		SAFE_RELEASE(it.second);
+	}
+	m_staticShaders.clear();
+
+	SAFE_RELEASE(m_encodeParams);
+	SAFE_RELEASE(m_outStage);
+	SAFE_RELEASE(m_outRTV);
+	SAFE_RELEASE(m_out);
+}
+
+size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
+	PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+	bool isIntensity, bool scaleByHalf)
+{
+	if (!m_ready) // Make sure we initialized OK
+		return 0;
+
+	// Clamp srcRect to 640x528. BPS: The Strike tries to encode an 800x600
+	// texture, which is invalid.
+	EFBRectangle correctSrc = srcRect;
+	correctSrc.ClampUL(0, 0, EFB_WIDTH, EFB_HEIGHT);
+
+	// Validate source rect size
+	if (correctSrc.GetWidth() <= 0 || correctSrc.GetHeight() <= 0)
+		return 0;
+
+	HRESULT hr;
+
+	unsigned int blockW = BLOCK_WIDTHS[dstFormat];
+	unsigned int blockH = BLOCK_HEIGHTS[dstFormat];
+
+	// Round up source dims to multiple of block size
+	unsigned int actualWidth = correctSrc.GetWidth() / (scaleByHalf ? 2 : 1);
+	actualWidth = (actualWidth + blockW-1) & ~(blockW-1);
+	unsigned int actualHeight = correctSrc.GetHeight() / (scaleByHalf ? 2 : 1);
+	actualHeight = (actualHeight + blockH-1) & ~(blockH-1);
+
+	unsigned int numBlocksX = actualWidth/blockW;
+	unsigned int numBlocksY = actualHeight/blockH;
+
+	unsigned int cacheLinesPerRow;
+	if (dstFormat == 0x6) // RGBA takes two cache lines per block; all others take one
+		cacheLinesPerRow = numBlocksX*2;
+	else
+		cacheLinesPerRow = numBlocksX;
+	_assert_msg_(VIDEO, cacheLinesPerRow*32 <= MAX_BYTES_PER_BLOCK_ROW, "cache lines per row sanity check");
+
+	unsigned int totalCacheLines = cacheLinesPerRow * numBlocksY;
+	_assert_msg_(VIDEO, totalCacheLines*32 <= MAX_BYTES_PER_ENCODE, "total encode size sanity check");
+
+	size_t encodeSize = 0;
+
+	// Reset API
+	g_renderer->ResetAPIState();
+
+	// Set up all the state for EFB encoding
+
+	{
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, FLOAT(cacheLinesPerRow * 8), FLOAT(numBlocksY));
+		D3D::context->RSSetViewports(1, &vp);
+
+		EFBRectangle fullSrcRect;
+		fullSrcRect.left = 0;
+		fullSrcRect.top = 0;
+		fullSrcRect.right = EFB_WIDTH;
+		fullSrcRect.bottom = EFB_HEIGHT;
+		TargetRectangle targetRect = g_renderer->ConvertEFBRectangle(fullSrcRect);
+
+		D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr);
+
+		ID3D11ShaderResourceView* pEFB = (srcFormat == PEControl::Z24) ?
+			FramebufferManager::GetResolvedEFBDepthTexture()->GetSRV() :
+			// FIXME: Instead of resolving EFB, it would be better to pick out a
+			// single sample from each pixel. The game may break if it isn't
+			// expecting the blurred edges around multisampled shapes.
+			FramebufferManager::GetResolvedEFBColorTexture()->GetSRV();
+
+		EFBEncodeParams params;
+		params.SrcLeft = correctSrc.left;
+		params.SrcTop = correctSrc.top;
+		params.DestWidth = actualWidth;
+		params.ScaleFactor = scaleByHalf ? 2 : 1;
+		D3D::context->UpdateSubresource(m_encodeParams, 0, nullptr, &params, 0, 0);
+		D3D::stateman->SetPixelConstants(m_encodeParams);
+
+		// Use linear filtering if (bScaleByHalf), use point filtering otherwise
+		if (scaleByHalf)
+			D3D::SetLinearCopySampler();
+		else
+			D3D::SetPointCopySampler();
+
+		D3D::drawShadedTexQuad(pEFB,
+			targetRect.AsRECT(),
+			Renderer::GetTargetWidth(),
+			Renderer::GetTargetHeight(),
+			SetStaticShader(dstFormat, srcFormat, isIntensity, scaleByHalf),
+			VertexShaderCache::GetSimpleVertexShader(),
+			VertexShaderCache::GetSimpleInputLayout());
+
+		// Copy to staging buffer
+		D3D11_BOX srcBox = CD3D11_BOX(0, 0, 0, cacheLinesPerRow * 8, numBlocksY, 1);
+		D3D::context->CopySubresourceRegion(m_outStage, 0, 0, 0, 0, m_out, 0, &srcBox);
+
+		// Transfer staging buffer to GameCube/Wii RAM
+		D3D11_MAPPED_SUBRESOURCE map = { 0 };
+		hr = D3D::context->Map(m_outStage, 0, D3D11_MAP_READ, 0, &map);
+		CHECK(SUCCEEDED(hr), "map staging buffer (0x%x)", hr);
+
+		u8* src = (u8*)map.pData;
+		for (unsigned int y = 0; y < numBlocksY; ++y)
+		{
+			memcpy(dst, src, cacheLinesPerRow*32);
+			dst += bpmem.copyMipMapStrideChannels*32;
+			src += map.RowPitch;
+		}
+
+		D3D::context->Unmap(m_outStage, 0);
+
+		encodeSize = bpmem.copyMipMapStrideChannels*32 * numBlocksY;
+	}
+
+	// Restore API
+	g_renderer->RestoreAPIState();
+	D3D::context->OMSetRenderTargets(1,
+		&FramebufferManager::GetEFBColorTexture()->GetRTV(),
+		FramebufferManager::GetEFBDepthTexture()->GetDSV());
+
+	return encodeSize;
+}
+
+ID3D11PixelShader* PSTextureEncoder::SetStaticShader(unsigned int dstFormat, PEControl::PixelFormat srcFormat,
+	bool isIntensity, bool scaleByHalf)
+{
+	size_t fetchNum = static_cast<size_t>(srcFormat);
+	size_t scaledFetchNum = scaleByHalf ? 1 : 0;
+	size_t intensityNum = isIntensity ? 1 : 0;
+	size_t generatorNum = dstFormat;
+
+	ComboKey key = MakeComboKey(dstFormat, srcFormat, isIntensity, scaleByHalf);
+
+	ComboMap::iterator it = m_staticShaders.find(key);
+	if (it == m_staticShaders.end())
+	{
+		INFO_LOG(VIDEO, "Compiling efb encoding shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d",
+			dstFormat, static_cast<int>(srcFormat), isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
+
+		u32 format = dstFormat;
+
+		if (srcFormat == PEControl::Z24)
+		{
+			format |= _GX_TF_ZTF;
+			if (dstFormat == 11)
+				format = GX_TF_Z16;
+			else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
+				format |= _GX_TF_CTF;
+		}
+		else
+		{
+			if (dstFormat > GX_TF_RGBA8 || (dstFormat < GX_TF_RGB565 && !isIntensity))
+				format |= _GX_TF_CTF;
+		}
+
+		D3DBlob* bytecode = nullptr;
+		const char* shader = TextureConversionShader::GenerateEncodingShader(format, API_D3D);
+		if (!D3D::CompilePixelShader(shader, &bytecode))
+		{
+			WARN_LOG(VIDEO, "EFB encoder shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d failed to compile",
+				dstFormat, static_cast<int>(srcFormat), isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
+			m_staticShaders[key] = nullptr;
+			return nullptr;
+		}
+
+		ID3D11PixelShader* newShader;
+		HRESULT hr = D3D::device->CreatePixelShader(bytecode->Data(), bytecode->Size(), nullptr, &newShader);
+		CHECK(SUCCEEDED(hr), "create efb encoder pixel shader");
+
+		char debugName[255] = {};
+		sprintf_s(debugName, "efb encoder pixel shader (dst:%d, src:%d, intensity:%d, scale:%d)",
+			dstFormat, srcFormat, isIntensity, scaleByHalf);
+		D3D::SetDebugObjectName(newShader, debugName);
+
+		it = m_staticShaders.insert(std::make_pair(key, newShader)).first;
+		bytecode->Release();
+	}
+
+	return it->second;
+}
+
+}
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
new file mode 100644
index 0000000000..03a501d61a
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
@@ -0,0 +1,61 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/D3D/TextureEncoder.h"
+
+struct ID3D11Texture2D;
+struct ID3D11RenderTargetView;
+struct ID3D11Buffer;
+struct ID3D11InputLayout;
+struct ID3D11VertexShader;
+struct ID3D11PixelShader;
+struct ID3D11ClassLinkage;
+struct ID3D11ClassInstance;
+struct ID3D11BlendState;
+struct ID3D11DepthStencilState;
+struct ID3D11RasterizerState;
+struct ID3D11SamplerState;
+
+namespace DX11
+{
+
+class PSTextureEncoder : public TextureEncoder
+{
+public:
+	PSTextureEncoder();
+
+	void Init();
+	void Shutdown();
+	size_t Encode(u8* dst, unsigned int dstFormat,
+	              PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+	              bool isIntensity, bool scaleByHalf);
+
+private:
+	bool m_ready;
+
+	ID3D11Texture2D* m_out;
+	ID3D11RenderTargetView* m_outRTV;
+	ID3D11Texture2D* m_outStage;
+	ID3D11Buffer* m_encodeParams;
+
+	ID3D11PixelShader* SetStaticShader(unsigned int dstFormat,
+		PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf);
+
+	typedef unsigned int ComboKey; // Key for a shader combination
+
+	ComboKey MakeComboKey(unsigned int dstFormat,
+		PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf)
+	{
+		return (dstFormat << 4) | (static_cast<int>(srcFormat) << 2) | (isIntensity ? (1<<1) : 0)
+			| (scaleByHalf ? (1<<0) : 0);
+	}
+
+	typedef std::map<ComboKey, ID3D11PixelShader*> ComboMap;
+
+	ComboMap m_staticShaders;
+};
+
+}
diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/PerfQuery.cpp
new file mode 100644
index 0000000000..62bc197be7
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PerfQuery.cpp
@@ -0,0 +1,145 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/PerfQuery.h"
+#include "VideoCommon/RenderBase.h"
+
+namespace DX11 {
+
+PerfQuery::PerfQuery()
+	: m_query_read_pos()
+{
+	for (ActiveQuery& entry : m_query_buffer)
+	{
+		D3D11_QUERY_DESC qdesc = CD3D11_QUERY_DESC(D3D11_QUERY_OCCLUSION, 0);
+		D3D::device->CreateQuery(&qdesc, &entry.query);
+	}
+
+	ResetQuery();
+}
+
+PerfQuery::~PerfQuery()
+{
+	for (ActiveQuery& entry : m_query_buffer)
+	{
+		// TODO: EndQuery?
+		entry.query->Release();
+	}
+}
+
+void PerfQuery::EnableQuery(PerfQueryGroup type)
+{
+	// Is this sane?
+	if (m_query_count > m_query_buffer.size() / 2)
+		WeakFlush();
+
+	if (m_query_buffer.size() == m_query_count)
+	{
+		// TODO
+		FlushOne();
+		ERROR_LOG(VIDEO, "Flushed query buffer early!");
+	}
+
+	// start query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % m_query_buffer.size()];
+
+		D3D::context->Begin(entry.query);
+		entry.query_type = type;
+
+		++m_query_count;
+	}
+}
+
+void PerfQuery::DisableQuery(PerfQueryGroup type)
+{
+	// stop query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + m_query_buffer.size()-1) % m_query_buffer.size()];
+		D3D::context->End(entry.query);
+	}
+}
+
+void PerfQuery::ResetQuery()
+{
+	m_query_count = 0;
+	std::fill_n(m_results, ArraySize(m_results), 0);
+}
+
+u32 PerfQuery::GetQueryResult(PerfQueryType type)
+{
+	u32 result = 0;
+
+	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
+		result = m_results[PQG_ZCOMP_ZCOMPLOC];
+	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
+		result = m_results[PQG_ZCOMP];
+	else if (type == PQ_BLEND_INPUT)
+		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
+	else if (type == PQ_EFB_COPY_CLOCKS)
+		result = m_results[PQG_EFB_COPY_CLOCKS];
+
+	return result / 4;
+}
+
+void PerfQuery::FlushOne()
+{
+	auto& entry = m_query_buffer[m_query_read_pos];
+
+	UINT64 result = 0;
+	HRESULT hr = S_FALSE;
+	while (hr != S_OK)
+	{
+		// TODO: Might cause us to be stuck in an infinite loop!
+		hr = D3D::context->GetData(entry.query, &result, sizeof(result), 0);
+	}
+
+	// NOTE: Reported pixel metrics should be referenced to native resolution
+	m_results[entry.query_type] += (u32)(result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
+
+	m_query_read_pos = (m_query_read_pos + 1) % m_query_buffer.size();
+	--m_query_count;
+}
+
+// TODO: could selectively flush things, but I don't think that will do much
+void PerfQuery::FlushResults()
+{
+	while (!IsFlushed())
+		FlushOne();
+}
+
+void PerfQuery::WeakFlush()
+{
+	while (!IsFlushed())
+	{
+		auto& entry = m_query_buffer[m_query_read_pos];
+
+		UINT64 result = 0;
+		HRESULT hr = D3D::context->GetData(entry.query, &result, sizeof(result), D3D11_ASYNC_GETDATA_DONOTFLUSH);
+
+		if (hr == S_OK)
+		{
+			// NOTE: Reported pixel metrics should be referenced to native resolution
+			m_results[entry.query_type] += (u32)(result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
+
+			m_query_read_pos = (m_query_read_pos + 1) % m_query_buffer.size();
+			--m_query_count;
+		}
+		else
+		{
+			break;
+		}
+	}
+}
+
+bool PerfQuery::IsFlushed() const
+{
+	return 0 == m_query_count;
+}
+
+
+} // namespace
diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/PerfQuery.h
new file mode 100644
index 0000000000..e133e13d01
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PerfQuery.h
@@ -0,0 +1,45 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+
+#include "VideoCommon/PerfQueryBase.h"
+
+namespace DX11 {
+
+class PerfQuery : public PerfQueryBase
+{
+public:
+	PerfQuery();
+	~PerfQuery();
+
+	void EnableQuery(PerfQueryGroup type) override;
+	void DisableQuery(PerfQueryGroup type) override;
+	void ResetQuery() override;
+	u32 GetQueryResult(PerfQueryType type) override;
+	void FlushResults() override;
+	bool IsFlushed() const override;
+
+private:
+	struct ActiveQuery
+	{
+		ID3D11Query* query;
+		PerfQueryGroup query_type;
+	};
+
+	void WeakFlush();
+
+	// Only use when non-empty
+	void FlushOne();
+
+	// when testing in SMS: 64 was too small, 128 was ok
+	static const int PERF_QUERY_BUFFER_SIZE = 512;
+
+	std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer;
+	int m_query_read_pos;
+};
+
+} // namespace
diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
new file mode 100644
index 0000000000..918432bb77
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
@@ -0,0 +1,615 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/LinearDiskCache.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/Globals.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
+const PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry;
+PixelShaderUid PixelShaderCache::last_uid;
+UidChecker<PixelShaderUid,PixelShaderCode> PixelShaderCache::pixel_uid_checker;
+
+LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
+
+ID3D11PixelShader* s_ColorMatrixProgram[2] = {nullptr};
+ID3D11PixelShader* s_ColorCopyProgram[2] = {nullptr};
+ID3D11PixelShader* s_DepthMatrixProgram[2] = {nullptr};
+ID3D11PixelShader* s_ClearProgram = nullptr;
+ID3D11PixelShader* s_AnaglyphProgram = nullptr;
+ID3D11PixelShader* s_rgba6_to_rgb8[2] = {nullptr};
+ID3D11PixelShader* s_rgb8_to_rgba6[2] = {nullptr};
+ID3D11Buffer* pscbuf = nullptr;
+
+const char clear_program_code[] = {
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float4 incol0 : COLOR0){\n"
+	"ocol0 = incol0;\n"
+	"}\n"
+};
+
+// TODO: Find some way to avoid having separate shaders for non-MSAA and MSAA...
+const char color_copy_program_code[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float3 uv0 : TEXCOORD0){\n"
+	"ocol0 = Tex0.Sample(samp0,uv0);\n"
+	"}\n"
+};
+
+// Anaglyph Red-Cyan shader based on Dubois algorithm
+// Constants taken from the paper:
+// "Conversion of a Stereo Pair to Anaglyph with
+// the Least-Squares Projection Method"
+// Eric Dubois, March 2009
+const char anaglyph_program_code[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float3 uv0 : TEXCOORD0){\n"
+	"float4 c0 = Tex0.Sample(samp0, float3(uv0.xy, 0.0));\n"
+	"float4 c1 = Tex0.Sample(samp0, float3(uv0.xy, 1.0));\n"
+	"float3x3 l = float3x3( 0.437, 0.449, 0.164,\n"
+	"                      -0.062,-0.062,-0.024,\n"
+	"                      -0.048,-0.050,-0.017);\n"
+	"float3x3 r = float3x3(-0.011,-0.032,-0.007,\n"
+	"                       0.377, 0.761, 0.009,\n"
+	"                      -0.026,-0.093, 1.234);\n"
+	"ocol0 = float4(mul(l, c0.rgb) + mul(r, c1.rgb), c0.a);\n"
+	"}\n"
+};
+
+// TODO: Improve sampling algorithm!
+const char color_copy_program_code_msaa[] = {
+	"#define SAMPLES %d\n"
+	"sampler samp0 : register(s0);\n"
+	"Texture2DMSArray<float4, SAMPLES> Tex0 : register(t0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float3 uv0 : TEXCOORD0){\n"
+	"int width, height, slices, samples;\n"
+	"Tex0.GetDimensions(width, height, slices, samples);\n"
+	"ocol0 = 0;\n"
+	"for(int i = 0; i < SAMPLES; ++i)\n"
+	"	ocol0 += Tex0.Load(int3(uv0.x*(width), uv0.y*(height), uv0.z), i);\n"
+	"ocol0 /= SAMPLES;\n"
+	"}\n"
+};
+
+const char color_matrix_program_code[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"uniform float4 cColMatrix[7] : register(c0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float3 uv0 : TEXCOORD0){\n"
+	"float4 texcol = Tex0.Sample(samp0,uv0);\n"
+	"texcol = round(texcol * cColMatrix[5])*cColMatrix[6];\n"
+	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
+	"}\n"
+};
+
+const char color_matrix_program_code_msaa[] = {
+	"#define SAMPLES %d\n"
+	"sampler samp0 : register(s0);\n"
+	"Texture2DMSArray<float4, SAMPLES> Tex0 : register(t0);\n"
+	"uniform float4 cColMatrix[7] : register(c0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	"in float4 pos : SV_Position,\n"
+	"in float3 uv0 : TEXCOORD0){\n"
+	"int width, height, slices, samples;\n"
+	"Tex0.GetDimensions(width, height, slices, samples);\n"
+	"float4 texcol = 0;\n"
+	"for(int i = 0; i < SAMPLES; ++i)\n"
+	"	texcol += Tex0.Load(int3(uv0.x*(width), uv0.y*(height), uv0.z), i);\n"
+	"texcol /= SAMPLES;\n"
+	"texcol = round(texcol * cColMatrix[5])*cColMatrix[6];\n"
+	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
+	"}\n"
+};
+
+const char depth_matrix_program[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"uniform float4 cColMatrix[7] : register(c0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	" in float4 pos : SV_Position,\n"
+	" in float3 uv0 : TEXCOORD0){\n"
+	"	float4 texcol = Tex0.Sample(samp0,uv0);\n"
+	"	int depth = clamp(int((1.0 - texcol.x) * 16777216.0), 0, 0xFFFFFF);\n"
+
+	// Convert to Z24 format
+	"	int4 workspace;\n"
+	"	workspace.r = (depth >> 16) & 255;\n"
+	"	workspace.g = (depth >> 8) & 255;\n"
+	"	workspace.b = depth & 255;\n"
+
+	// Convert to Z4 format
+	"	workspace.a = (depth >> 16) & 0xF0;\n"
+
+	// Normalize components to [0.0..1.0]
+	"	texcol = float4(workspace) / 255.0;\n"
+
+	// Apply color matrix
+	"	ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
+	"}\n"
+};
+
+const char depth_matrix_program_msaa[] = {
+	"#define SAMPLES %d\n"
+	"sampler samp0 : register(s0);\n"
+	"Texture2DMSArray<float4, SAMPLES> Tex0 : register(t0);\n"
+	"uniform float4 cColMatrix[7] : register(c0);\n"
+	"void main(\n"
+	"out float4 ocol0 : SV_Target,\n"
+	" in float4 pos : SV_Position,\n"
+	" in float3 uv0 : TEXCOORD0){\n"
+	"	int width, height, slices, samples;\n"
+	"	Tex0.GetDimensions(width, height, slices, samples);\n"
+	"	float4 texcol = 0;\n"
+	"	for(int i = 0; i < SAMPLES; ++i)\n"
+	"		texcol += Tex0.Load(int3(uv0.x*(width), uv0.y*(height), uv0.z), i);\n"
+	"	texcol /= SAMPLES;\n"
+	"	int depth = clamp(int((1.0 - texcol.x) * 16777216.0), 0, 0xFFFFFF);\n"
+
+	// Convert to Z24 format
+	"	int4 workspace;\n"
+	"	workspace.r = (depth >> 16) & 255;\n"
+	"	workspace.g = (depth >> 8) & 255;\n"
+	"	workspace.b = depth & 255;\n"
+
+	// Convert to Z4 format
+	"	workspace.a = (depth >> 16) & 0xF0;\n"
+
+	// Normalize components to [0.0..1.0]
+	"	texcol = float4(workspace) / 255.0;\n"
+
+	// Apply color matrix
+	"	ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
+	"}\n"
+};
+
+const char reint_rgba6_to_rgb8[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"void main(\n"
+	"	out float4 ocol0 : SV_Target,\n"
+	"	in float4 pos : SV_Position,\n"
+	"	in float3 uv0 : TEXCOORD0)\n"
+	"{\n"
+	"	int4 src6 = round(Tex0.Sample(samp0,uv0) * 63.f);\n"
+	"	int4 dst8;\n"
+	"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
+	"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
+	"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
+	"	dst8.a = 255;\n"
+	"	ocol0 = (float4)dst8 / 255.f;\n"
+	"}"
+};
+
+const char reint_rgba6_to_rgb8_msaa[] = {
+	"#define SAMPLES %d\n"
+	"sampler samp0 : register(s0);\n"
+	"Texture2DMSArray<float4, SAMPLES> Tex0 : register(t0);\n"
+	"void main(\n"
+	"	out float4 ocol0 : SV_Target,\n"
+	"	in float4 pos : SV_Position,\n"
+	"	in float3 uv0 : TEXCOORD0)\n"
+	"{\n"
+	"	int width, height, slices, samples;\n"
+	"	Tex0.GetDimensions(width, height, slices, samples);\n"
+	"	float4 texcol = 0;\n"
+	"	for (int i = 0; i < SAMPLES; ++i)\n"
+	"		texcol += Tex0.Load(int3(uv0.x*(width), uv0.y*(height), uv0.z), i);\n"
+	"	texcol /= SAMPLES;\n"
+	"	int4 src6 = round(texcol * 63.f);\n"
+	"	int4 dst8;\n"
+	"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
+	"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
+	"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
+	"	dst8.a = 255;\n"
+	"	ocol0 = (float4)dst8 / 255.f;\n"
+	"}"
+};
+
+const char reint_rgb8_to_rgba6[] = {
+	"sampler samp0 : register(s0);\n"
+	"Texture2DArray Tex0 : register(t0);\n"
+	"void main(\n"
+	"	out float4 ocol0 : SV_Target,\n"
+	"	in float4 pos : SV_Position,\n"
+	"	in float3 uv0 : TEXCOORD0)\n"
+	"{\n"
+	"	int4 src8 = round(Tex0.Sample(samp0,uv0) * 255.f);\n"
+	"	int4 dst6;\n"
+	"	dst6.r = src8.r >> 2;\n"
+	"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
+	"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
+	"	dst6.a = src8.b & 0x3F;\n"
+	"	ocol0 = (float4)dst6 / 63.f;\n"
+	"}\n"
+};
+
+const char reint_rgb8_to_rgba6_msaa[] = {
+	"#define SAMPLES %d\n"
+	"sampler samp0 : register(s0);\n"
+	"Texture2DMSArray<float4, SAMPLES> Tex0 : register(t0);\n"
+	"void main(\n"
+	"	out float4 ocol0 : SV_Target,\n"
+	"	in float4 pos : SV_Position,\n"
+	"	in float3 uv0 : TEXCOORD0)\n"
+	"{\n"
+	"	int width, height, slices, samples;\n"
+	"	Tex0.GetDimensions(width, height, slices, samples);\n"
+	"	float4 texcol = 0;\n"
+	"	for (int i = 0; i < SAMPLES; ++i)\n"
+	"		texcol += Tex0.Load(int3(uv0.x*(width), uv0.y*(height), uv0.z), i);\n"
+	"	texcol /= SAMPLES;\n"
+	"	int4 src8 = round(texcol * 255.f);\n"
+	"	int4 dst6;\n"
+	"	dst6.r = src8.r >> 2;\n"
+	"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
+	"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
+	"	dst6.a = src8.b & 0x3F;\n"
+	"	ocol0 = (float4)dst6 / 63.f;\n"
+	"}\n"
+};
+
+ID3D11PixelShader* PixelShaderCache::ReinterpRGBA6ToRGB8(bool multisampled)
+{
+	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
+	{
+		if (!s_rgba6_to_rgb8[0])
+		{
+			s_rgba6_to_rgb8[0] = D3D::CompileAndCreatePixelShader(reint_rgba6_to_rgb8);
+			CHECK(s_rgba6_to_rgb8[0], "Create RGBA6 to RGB8 pixel shader");
+			D3D::SetDebugObjectName(s_rgba6_to_rgb8[0], "RGBA6 to RGB8 pixel shader");
+		}
+		return s_rgba6_to_rgb8[0];
+	}
+	else if (!s_rgba6_to_rgb8[1])
+	{
+		// create MSAA shader for current AA mode
+		std::string buf = StringFromFormat(reint_rgba6_to_rgb8_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
+		s_rgba6_to_rgb8[1] = D3D::CompileAndCreatePixelShader(buf);
+
+		CHECK(s_rgba6_to_rgb8[1], "Create RGBA6 to RGB8 MSAA pixel shader");
+		D3D::SetDebugObjectName(s_rgba6_to_rgb8[1], "RGBA6 to RGB8 MSAA pixel shader");
+	}
+	return s_rgba6_to_rgb8[1];
+}
+
+ID3D11PixelShader* PixelShaderCache::ReinterpRGB8ToRGBA6(bool multisampled)
+{
+	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
+	{
+		if (!s_rgb8_to_rgba6[0])
+		{
+			s_rgb8_to_rgba6[0] = D3D::CompileAndCreatePixelShader(reint_rgb8_to_rgba6);
+			CHECK(s_rgb8_to_rgba6[0], "Create RGB8 to RGBA6 pixel shader");
+			D3D::SetDebugObjectName(s_rgb8_to_rgba6[0], "RGB8 to RGBA6 pixel shader");
+		}
+		return s_rgb8_to_rgba6[0];
+	}
+	else if (!s_rgb8_to_rgba6[1])
+	{
+		// create MSAA shader for current AA mode
+		std::string buf = StringFromFormat(reint_rgb8_to_rgba6_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
+		s_rgb8_to_rgba6[1] = D3D::CompileAndCreatePixelShader(buf);
+
+		CHECK(s_rgb8_to_rgba6[1], "Create RGB8 to RGBA6 MSAA pixel shader");
+		D3D::SetDebugObjectName(s_rgb8_to_rgba6[1], "RGB8 to RGBA6 MSAA pixel shader");
+	}
+	return s_rgb8_to_rgba6[1];
+}
+
+ID3D11PixelShader* PixelShaderCache::GetColorCopyProgram(bool multisampled)
+{
+	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
+	{
+		return s_ColorCopyProgram[0];
+	}
+	else if (s_ColorCopyProgram[1])
+	{
+		return s_ColorCopyProgram[1];
+	}
+	else
+	{
+		// create MSAA shader for current AA mode
+		std::string buf = StringFromFormat(color_copy_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
+		s_ColorCopyProgram[1] = D3D::CompileAndCreatePixelShader(buf);
+		CHECK(s_ColorCopyProgram[1]!=nullptr, "Create color copy MSAA pixel shader");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[1], "color copy MSAA pixel shader");
+		return s_ColorCopyProgram[1];
+	}
+}
+
+ID3D11PixelShader* PixelShaderCache::GetColorMatrixProgram(bool multisampled)
+{
+	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
+	{
+		return s_ColorMatrixProgram[0];
+	}
+	else if (s_ColorMatrixProgram[1])
+	{
+		return s_ColorMatrixProgram[1];
+	}
+	else
+	{
+		// create MSAA shader for current AA mode
+		std::string buf = StringFromFormat(color_matrix_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
+		s_ColorMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf);
+		CHECK(s_ColorMatrixProgram[1]!=nullptr, "Create color matrix MSAA pixel shader");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[1], "color matrix MSAA pixel shader");
+		return s_ColorMatrixProgram[1];
+	}
+}
+
+ID3D11PixelShader* PixelShaderCache::GetDepthMatrixProgram(bool multisampled)
+{
+	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
+	{
+		return s_DepthMatrixProgram[0];
+	}
+	else if (s_DepthMatrixProgram[1])
+	{
+		return s_DepthMatrixProgram[1];
+	}
+	else
+	{
+		// create MSAA shader for current AA mode
+		std::string buf = StringFromFormat(depth_matrix_program_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
+		s_DepthMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf);
+		CHECK(s_DepthMatrixProgram[1]!=nullptr, "Create depth matrix MSAA pixel shader");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[1], "depth matrix MSAA pixel shader");
+		return s_DepthMatrixProgram[1];
+	}
+}
+
+ID3D11PixelShader* PixelShaderCache::GetClearProgram()
+{
+	return s_ClearProgram;
+}
+
+ID3D11PixelShader* PixelShaderCache::GetAnaglyphProgram()
+{
+	return s_AnaglyphProgram;
+}
+
+ID3D11Buffer* &PixelShaderCache::GetConstantBuffer()
+{
+	// TODO: divide the global variables of the generated shaders into about 5 constant buffers to speed this up
+	if (PixelShaderManager::dirty)
+	{
+		D3D11_MAPPED_SUBRESOURCE map;
+		D3D::context->Map(pscbuf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+		memcpy(map.pData, &PixelShaderManager::constants, sizeof(PixelShaderConstants));
+		D3D::context->Unmap(pscbuf, 0);
+		PixelShaderManager::dirty = false;
+
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(PixelShaderConstants));
+	}
+	return pscbuf;
+}
+
+// this class will load the precompiled shaders into our cache
+class PixelShaderCacheInserter : public LinearDiskCacheReader<PixelShaderUid, u8>
+{
+public:
+	void Read(const PixelShaderUid &key, const u8* value, u32 value_size)
+	{
+		PixelShaderCache::InsertByteCode(key, value, value_size);
+	}
+};
+
+void PixelShaderCache::Init()
+{
+	unsigned int cbsize = ROUND_UP(sizeof(PixelShaderConstants), 16); // must be a multiple of 16
+	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+	D3D::device->CreateBuffer(&cbdesc, nullptr, &pscbuf);
+	CHECK(pscbuf!=nullptr, "Create pixel shader constant buffer");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)pscbuf, "pixel shader constant buffer used to emulate the GX pipeline");
+
+	// used when drawing clear quads
+	s_ClearProgram = D3D::CompileAndCreatePixelShader(clear_program_code);
+	CHECK(s_ClearProgram!=nullptr, "Create clear pixel shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ClearProgram, "clear pixel shader");
+
+	// used for anaglyph stereoscopy
+	s_AnaglyphProgram = D3D::CompileAndCreatePixelShader(anaglyph_program_code);
+	CHECK(s_AnaglyphProgram != nullptr, "Create anaglyph pixel shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_AnaglyphProgram, "anaglyph pixel shader");
+
+	// used when copying/resolving the color buffer
+	s_ColorCopyProgram[0] = D3D::CompileAndCreatePixelShader(color_copy_program_code);
+	CHECK(s_ColorCopyProgram[0]!=nullptr, "Create color copy pixel shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[0], "color copy pixel shader");
+
+	// used for color conversion
+	s_ColorMatrixProgram[0] = D3D::CompileAndCreatePixelShader(color_matrix_program_code);
+	CHECK(s_ColorMatrixProgram[0]!=nullptr, "Create color matrix pixel shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[0], "color matrix pixel shader");
+
+	// used for depth copy
+	s_DepthMatrixProgram[0] = D3D::CompileAndCreatePixelShader(depth_matrix_program);
+	CHECK(s_DepthMatrixProgram[0]!=nullptr, "Create depth matrix pixel shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[0], "depth matrix pixel shader");
+
+	Clear();
+
+	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
+		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
+
+	SETSTAT(stats.numPixelShadersCreated, 0);
+	SETSTAT(stats.numPixelShadersAlive, 0);
+
+	std::string cache_filename = StringFromFormat("%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
+	PixelShaderCacheInserter inserter;
+	g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
+
+	if (g_Config.bEnableShaderDebugging)
+		Clear();
+
+	last_entry = nullptr;
+}
+
+// ONLY to be used during shutdown.
+void PixelShaderCache::Clear()
+{
+	for (auto& iter : PixelShaders)
+		iter.second.Destroy();
+	PixelShaders.clear();
+	pixel_uid_checker.Invalidate();
+
+	last_entry = nullptr;
+}
+
+// Used in Swap() when AA mode has changed
+void PixelShaderCache::InvalidateMSAAShaders()
+{
+	SAFE_RELEASE(s_ColorCopyProgram[1]);
+	SAFE_RELEASE(s_ColorMatrixProgram[1]);
+	SAFE_RELEASE(s_DepthMatrixProgram[1]);
+	SAFE_RELEASE(s_rgb8_to_rgba6[1]);
+	SAFE_RELEASE(s_rgba6_to_rgb8[1]);
+}
+
+void PixelShaderCache::Shutdown()
+{
+	SAFE_RELEASE(pscbuf);
+
+	SAFE_RELEASE(s_ClearProgram);
+	SAFE_RELEASE(s_AnaglyphProgram);
+	for (int i = 0; i < 2; ++i)
+	{
+		SAFE_RELEASE(s_ColorCopyProgram[i]);
+		SAFE_RELEASE(s_ColorMatrixProgram[i]);
+		SAFE_RELEASE(s_DepthMatrixProgram[i]);
+		SAFE_RELEASE(s_rgba6_to_rgb8[i]);
+		SAFE_RELEASE(s_rgb8_to_rgba6[i]);
+	}
+
+	Clear();
+	g_ps_disk_cache.Sync();
+	g_ps_disk_cache.Close();
+}
+
+bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
+{
+	PixelShaderUid uid;
+	GetPixelShaderUid(uid, dstAlphaMode, API_D3D, components);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode code;
+		GeneratePixelShaderCode(code, dstAlphaMode, API_D3D, components);
+		pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
+	}
+
+	// Check if the shader is already set
+	if (last_entry)
+	{
+		if (uid == last_uid)
+		{
+			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
+			return (last_entry->shader != nullptr);
+		}
+	}
+
+	last_uid = uid;
+
+	// Check if the shader is already in the cache
+	PSCache::iterator iter;
+	iter = PixelShaders.find(uid);
+	if (iter != PixelShaders.end())
+	{
+		const PSCacheEntry &entry = iter->second;
+		last_entry = &entry;
+
+		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
+		return (entry.shader != nullptr);
+	}
+
+	// Need to compile a new shader
+	PixelShaderCode code;
+	GeneratePixelShaderCode(code, dstAlphaMode, API_D3D, components);
+
+	D3DBlob* pbytecode;
+	if (!D3D::CompilePixelShader(code.GetBuffer(), &pbytecode))
+	{
+		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
+		return false;
+	}
+
+	// Insert the bytecode into the caches
+	g_ps_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size());
+
+	bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size());
+	pbytecode->Release();
+
+	if (g_ActiveConfig.bEnableShaderDebugging && success)
+	{
+		PixelShaders[uid].code = code.GetBuffer();
+	}
+
+	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
+	return success;
+}
+
+bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen)
+{
+	ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
+	if (shader == nullptr)
+		return false;
+
+	// TODO: Somehow make the debug name a bit more specific
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of PixelShaderCache");
+
+	// Make an entry in the table
+	PSCacheEntry newentry;
+	newentry.shader = shader;
+	PixelShaders[uid] = newentry;
+	last_entry = &PixelShaders[uid];
+
+	if (!shader)
+	{
+		// INCSTAT(stats.numPixelShadersFailed);
+		return false;
+	}
+
+	INCSTAT(stats.numPixelShadersCreated);
+	SETSTAT(stats.numPixelShadersAlive, PixelShaders.size());
+	return true;
+}
+
+}  // DX11
diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.h b/Source/Core/VideoBackends/D3D/PixelShaderCache.h
new file mode 100644
index 0000000000..d24ea03fcd
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h
@@ -0,0 +1,59 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <d3d11.h>
+#include <map>
+
+#include "VideoCommon/PixelShaderGen.h"
+
+enum DSTALPHA_MODE;
+
+namespace DX11
+{
+
+class PixelShaderCache
+{
+public:
+	static void Init();
+	static void Clear();
+	static void Shutdown();
+	static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 components); // TODO: Should be renamed to LoadShader
+	static bool InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen);
+
+	static ID3D11PixelShader* GetActiveShader() { return last_entry->shader; }
+	static ID3D11Buffer* &GetConstantBuffer();
+
+	static ID3D11PixelShader* GetColorMatrixProgram(bool multisampled);
+	static ID3D11PixelShader* GetColorCopyProgram(bool multisampled);
+	static ID3D11PixelShader* GetDepthMatrixProgram(bool multisampled);
+	static ID3D11PixelShader* GetClearProgram();
+	static ID3D11PixelShader* GetAnaglyphProgram();
+	static ID3D11PixelShader* ReinterpRGBA6ToRGB8(bool multisampled);
+	static ID3D11PixelShader* ReinterpRGB8ToRGBA6(bool multisampled);
+
+	static void InvalidateMSAAShaders();
+
+private:
+	struct PSCacheEntry
+	{
+		ID3D11PixelShader* shader;
+
+		std::string code;
+
+		PSCacheEntry() : shader(nullptr) {}
+		void Destroy() { SAFE_RELEASE(shader); }
+	};
+
+	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
+
+	static PSCache PixelShaders;
+	static const PSCacheEntry* last_entry;
+	static PixelShaderUid last_uid;
+
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
+};
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
new file mode 100644
index 0000000000..b41d750eab
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -0,0 +1,1311 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <cmath>
+#include <string>
+#include <strsafe.h>
+#include <unordered_map>
+
+#include "Common/MathUtil.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+
+#include "VideoBackends/D3D/BoundingBox.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/Television.h"
+#include "VideoBackends/D3D/TextureCache.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+
+#include "VideoCommon/AVIDump.h"
+#include "VideoCommon/BPFunctions.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/FPSCounter.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+static u32 s_last_multisample_mode = 0;
+static bool s_last_stereo_mode = false;
+static bool s_last_xfb_mode = false;
+
+static Television s_television;
+
+ID3D11Buffer* access_efb_cbuf = nullptr;
+ID3D11BlendState* clearblendstates[4] = {nullptr};
+ID3D11DepthStencilState* cleardepthstates[3] = {nullptr};
+ID3D11BlendState* resetblendstate = nullptr;
+ID3D11DepthStencilState* resetdepthstate = nullptr;
+ID3D11RasterizerState* resetraststate = nullptr;
+
+static ID3D11Texture2D* s_screenshot_texture = nullptr;
+static D3DTexture2D* s_3d_vision_texture = nullptr;
+
+// Nvidia stereo blitting struct defined in "nvstereo.h" from the Nvidia SDK
+typedef struct _Nv_Stereo_Image_Header
+{
+	unsigned int    dwSignature;
+	unsigned int    dwWidth;
+	unsigned int    dwHeight;
+	unsigned int    dwBPP;
+	unsigned int    dwFlags;
+} NVSTEREOIMAGEHEADER, *LPNVSTEREOIMAGEHEADER;
+
+#define NVSTEREO_IMAGE_SIGNATURE 0x4433564e
+
+// GX pipeline state
+struct
+{
+	SamplerState sampler[8];
+	BlendState blend;
+	ZMode zmode;
+	RasterizerState raster;
+
+} gx_state;
+
+StateCache gx_state_cache;
+
+void SetupDeviceObjects()
+{
+	s_television.Init();
+
+	g_framebuffer_manager = new FramebufferManager;
+
+	HRESULT hr;
+	float colmat[20]= {0.0f};
+	colmat[0] = colmat[5] = colmat[10] = 1.0f;
+	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(20*sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
+	D3D11_SUBRESOURCE_DATA data;
+	data.pSysMem = colmat;
+	hr = D3D::device->CreateBuffer(&cbdesc, &data, &access_efb_cbuf);
+	CHECK(hr==S_OK, "Create constant buffer for Renderer::AccessEFB");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)access_efb_cbuf, "constant buffer for Renderer::AccessEFB");
+
+	D3D11_DEPTH_STENCIL_DESC ddesc;
+	ddesc.DepthEnable      = FALSE;
+	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ZERO;
+	ddesc.DepthFunc        = D3D11_COMPARISON_ALWAYS;
+	ddesc.StencilEnable    = FALSE;
+	ddesc.StencilReadMask  = D3D11_DEFAULT_STENCIL_READ_MASK;
+	ddesc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
+	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[0]);
+	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
+	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ALL;
+	ddesc.DepthEnable      = TRUE;
+	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[1]);
+	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
+	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ZERO;
+	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[2]);
+	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[0], "depth state for Renderer::ClearScreen (depth buffer disabled)");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[1], "depth state for Renderer::ClearScreen (depth buffer enabled, writing enabled)");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[2], "depth state for Renderer::ClearScreen (depth buffer enabled, writing disabled)");
+
+	D3D11_BLEND_DESC blenddesc;
+	blenddesc.AlphaToCoverageEnable = FALSE;
+	blenddesc.IndependentBlendEnable = FALSE;
+	blenddesc.RenderTarget[0].BlendEnable = FALSE;
+	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+	blenddesc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE;
+	blenddesc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO;
+	blenddesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
+	blenddesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
+	blenddesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
+	blenddesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+	hr = D3D::device->CreateBlendState(&blenddesc, &resetblendstate);
+	CHECK(hr==S_OK, "Create blend state for Renderer::ResetAPIState");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetblendstate, "blend state for Renderer::ResetAPIState");
+
+	clearblendstates[0] = resetblendstate;
+	resetblendstate->AddRef();
+
+	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_RED|D3D11_COLOR_WRITE_ENABLE_GREEN|D3D11_COLOR_WRITE_ENABLE_BLUE;
+	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[1]);
+	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
+
+	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALPHA;
+	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[2]);
+	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
+
+	blenddesc.RenderTarget[0].RenderTargetWriteMask = 0;
+	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[3]);
+	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
+
+	ddesc.DepthEnable      = FALSE;
+	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ZERO;
+	ddesc.DepthFunc        = D3D11_COMPARISON_LESS;
+	ddesc.StencilEnable    = FALSE;
+	ddesc.StencilReadMask  = D3D11_DEFAULT_STENCIL_READ_MASK;
+	ddesc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
+	hr = D3D::device->CreateDepthStencilState(&ddesc, &resetdepthstate);
+	CHECK(hr==S_OK, "Create depth state for Renderer::ResetAPIState");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetdepthstate, "depth stencil state for Renderer::ResetAPIState");
+
+	D3D11_RASTERIZER_DESC rastdesc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, D3D11_CULL_NONE, false, 0, 0.f, 0.f, false, false, false, false);
+	hr = D3D::device->CreateRasterizerState(&rastdesc, &resetraststate);
+	CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState");
+
+	s_screenshot_texture = nullptr;
+}
+
+// Kill off all device objects
+void TeardownDeviceObjects()
+{
+	delete g_framebuffer_manager;
+
+	SAFE_RELEASE(access_efb_cbuf);
+	SAFE_RELEASE(clearblendstates[0]);
+	SAFE_RELEASE(clearblendstates[1]);
+	SAFE_RELEASE(clearblendstates[2]);
+	SAFE_RELEASE(clearblendstates[3]);
+	SAFE_RELEASE(cleardepthstates[0]);
+	SAFE_RELEASE(cleardepthstates[1]);
+	SAFE_RELEASE(cleardepthstates[2]);
+	SAFE_RELEASE(resetblendstate);
+	SAFE_RELEASE(resetdepthstate);
+	SAFE_RELEASE(resetraststate);
+	SAFE_RELEASE(s_screenshot_texture);
+	SAFE_RELEASE(s_3d_vision_texture);
+
+	s_television.Shutdown();
+
+	gx_state_cache.Clear();
+}
+
+void CreateScreenshotTexture(const TargetRectangle& rc)
+{
+	D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, rc.GetWidth(), rc.GetHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE);
+	HRESULT hr = D3D::device->CreateTexture2D(&scrtex_desc, nullptr, &s_screenshot_texture);
+	CHECK(hr==S_OK, "Create screenshot staging texture");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture");
+}
+
+void Create3DVisionTexture(int width, int height)
+{
+	// Create a staging texture for 3D vision with signature information in the last row.
+	// Nvidia 3D Vision supports full SBS, so there is no loss in resolution during this process.
+	D3D11_SUBRESOURCE_DATA sysData;
+	sysData.SysMemPitch = 4 * width * 2;
+	sysData.pSysMem = new u8[(height + 1) * sysData.SysMemPitch];
+	LPNVSTEREOIMAGEHEADER header = (LPNVSTEREOIMAGEHEADER)((u8*)sysData.pSysMem + height * sysData.SysMemPitch);
+	header->dwSignature = NVSTEREO_IMAGE_SIGNATURE;
+	header->dwWidth = width * 2;
+	header->dwHeight = height + 1;
+	header->dwBPP = 32;
+	header->dwFlags = 0;
+
+	s_3d_vision_texture = D3DTexture2D::Create(width * 2, height + 1, D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, &sysData);
+	delete[] sysData.pSysMem;
+}
+
+Renderer::Renderer(void *&window_handle)
+{
+	D3D::Create((HWND)window_handle);
+
+	s_backbuffer_width = D3D::GetBackBufferWidth();
+	s_backbuffer_height = D3D::GetBackBufferHeight();
+
+	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
+	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
+
+	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+
+	s_last_multisample_mode = g_ActiveConfig.iMultisampleMode;
+	s_last_efb_scale = g_ActiveConfig.iEFBScale;
+	s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0;
+	s_last_xfb_mode = g_ActiveConfig.bUseRealXFB;
+	CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
+	PixelShaderManager::SetEfbScaleChanged();
+
+	SetupDeviceObjects();
+
+	// Setup GX pipeline state
+	gx_state.blend.blend_enable = false;
+	gx_state.blend.write_mask = D3D11_COLOR_WRITE_ENABLE_ALL;
+	gx_state.blend.src_blend = D3D11_BLEND_ONE;
+	gx_state.blend.dst_blend = D3D11_BLEND_ZERO;
+	gx_state.blend.blend_op = D3D11_BLEND_OP_ADD;
+	gx_state.blend.use_dst_alpha = false;
+
+	for (unsigned int k = 0;k < 8;k++)
+	{
+		gx_state.sampler[k].packed = 0;
+	}
+
+	gx_state.zmode.testenable = false;
+	gx_state.zmode.updateenable = false;
+	gx_state.zmode.func = ZMode::NEVER;
+
+	gx_state.raster.cull_mode = D3D11_CULL_NONE;
+
+	// Clear EFB textures
+	float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };
+	D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(), ClearColor);
+	D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(), D3D11_CLEAR_DEPTH, 0.f, 0);
+
+	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)s_target_width, (float)s_target_height);
+	D3D::context->RSSetViewports(1, &vp);
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+	D3D::BeginFrame();
+}
+
+Renderer::~Renderer()
+{
+	TeardownDeviceObjects();
+	D3D::EndFrame();
+	D3D::Present();
+	D3D::Close();
+}
+
+void Renderer::RenderText(const std::string& text, int left, int top, u32 color)
+{
+	D3D::font.DrawTextScaled((float)(left+1), (float)(top+1), 20.f, 0.0f, color & 0xFF000000, text);
+	D3D::font.DrawTextScaled((float)left, (float)top, 20.f, 0.0f, color, text);
+}
+
+TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
+{
+	TargetRectangle result;
+	result.left   = EFBToScaledX(rc.left);
+	result.top    = EFBToScaledY(rc.top);
+	result.right  = EFBToScaledX(rc.right);
+	result.bottom = EFBToScaledY(rc.bottom);
+	return result;
+}
+
+// With D3D, we have to resize the backbuffer if the window changed
+// size.
+bool Renderer::CheckForResize()
+{
+	RECT rcWindow;
+	GetClientRect(D3D::hWnd, &rcWindow);
+	int client_width = rcWindow.right - rcWindow.left;
+	int client_height = rcWindow.bottom - rcWindow.top;
+
+	// Sanity check
+	if ((client_width != Renderer::GetBackbufferWidth() ||
+		client_height != Renderer::GetBackbufferHeight()) &&
+		client_width >= 4 && client_height >= 4)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void Renderer::SetScissorRect(const EFBRectangle& rc)
+{
+	TargetRectangle trc = ConvertEFBRectangle(rc);
+	D3D::context->RSSetScissorRects(1, trc.AsRECT());
+}
+
+void Renderer::SetColorMask()
+{
+	// Only enable alpha channel if it's supported by the current EFB format
+	UINT8 color_mask = 0;
+	if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
+	{
+		if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24))
+			color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA;
+		if (bpmem.blendmode.colorupdate)
+			color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE;
+	}
+	gx_state.blend.write_mask = color_mask;
+}
+
+// This function allows the CPU to directly access the EFB.
+// There are EFB peeks (which will read the color or depth of a pixel)
+// and EFB pokes (which will change the color or depth of a pixel).
+//
+// The behavior of EFB peeks can only be modified by:
+//  - GX_PokeAlphaRead
+// The behavior of EFB pokes can be modified by:
+//  - GX_PokeAlphaMode (TODO)
+//  - GX_PokeAlphaUpdate (TODO)
+//  - GX_PokeBlendMode (TODO)
+//  - GX_PokeColorUpdate (TODO)
+//  - GX_PokeDither (TODO)
+//  - GX_PokeDstAlpha (TODO)
+//  - GX_PokeZMode (TODO)
+u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
+{
+	// TODO: This function currently is broken if anti-aliasing is enabled
+	D3D11_MAPPED_SUBRESOURCE map;
+	ID3D11Texture2D* read_tex;
+
+	// Convert EFB dimensions to the ones of our render target
+	EFBRectangle efbPixelRc;
+	efbPixelRc.left = x;
+	efbPixelRc.top = y;
+	efbPixelRc.right = x + 1;
+	efbPixelRc.bottom = y + 1;
+	TargetRectangle targetPixelRc = Renderer::ConvertEFBRectangle(efbPixelRc);
+
+	// Take the mean of the resulting dimensions; TODO: Don't use the center pixel, compute the average color instead
+	D3D11_RECT RectToLock;
+	if (type == PEEK_COLOR || type == PEEK_Z)
+	{
+		RectToLock.left = (targetPixelRc.left + targetPixelRc.right) / 2;
+		RectToLock.top = (targetPixelRc.top + targetPixelRc.bottom) / 2;
+		RectToLock.right = RectToLock.left + 1;
+		RectToLock.bottom = RectToLock.top + 1;
+	}
+	else
+	{
+		RectToLock.left = targetPixelRc.left;
+		RectToLock.right = targetPixelRc.right;
+		RectToLock.top = targetPixelRc.top;
+		RectToLock.bottom = targetPixelRc.bottom;
+	}
+
+	if (type == PEEK_Z)
+	{
+		ResetAPIState(); // Reset any game specific settings
+
+		// depth buffers can only be completely CopySubresourceRegion'ed, so we're using drawShadedTexQuad instead
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, 1.f, 1.f);
+		D3D::context->RSSetViewports(1, &vp);
+		D3D::stateman->SetPixelConstants(0, access_efb_cbuf);
+		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBDepthReadTexture()->GetRTV(), nullptr);
+		D3D::SetPointCopySampler();
+		D3D::drawShadedTexQuad(FramebufferManager::GetEFBDepthTexture()->GetSRV(),
+								&RectToLock,
+								Renderer::GetTargetWidth(),
+								Renderer::GetTargetHeight(),
+								PixelShaderCache::GetColorCopyProgram(true),
+								VertexShaderCache::GetSimpleVertexShader(),
+								VertexShaderCache::GetSimpleInputLayout());
+
+		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+
+		// copy to system memory
+		D3D11_BOX box = CD3D11_BOX(0, 0, 0, 1, 1, 1);
+		read_tex = FramebufferManager::GetEFBDepthStagingBuffer();
+		D3D::context->CopySubresourceRegion(read_tex, 0, 0, 0, 0, FramebufferManager::GetEFBDepthReadTexture()->GetTex(), 0, &box);
+
+		RestoreAPIState(); // restore game state
+
+		// read the data from system memory
+		D3D::context->Map(read_tex, 0, D3D11_MAP_READ, 0, &map);
+
+		// depth buffer is inverted in the d3d backend
+		float val = 1.0f - *(float*)map.pData;
+		u32 ret = 0;
+		if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
+		{
+			// if Z is in 16 bit format you must return a 16 bit integer
+			ret = MathUtil::Clamp<u32>((u32)(val * 65536.0f), 0, 0xFFFF);
+		}
+		else
+		{
+			ret = MathUtil::Clamp<u32>((u32)(val * 16777216.0f), 0, 0xFFFFFF);
+		}
+		D3D::context->Unmap(read_tex, 0);
+
+		return ret;
+	}
+	else if (type == PEEK_COLOR)
+	{
+		// we can directly copy to system memory here
+		read_tex = FramebufferManager::GetEFBColorStagingBuffer();
+		D3D11_BOX box = CD3D11_BOX(RectToLock.left, RectToLock.top, 0, RectToLock.right, RectToLock.bottom, 1);
+		D3D::context->CopySubresourceRegion(read_tex, 0, 0, 0, 0, FramebufferManager::GetEFBColorTexture()->GetTex(), 0, &box);
+
+		// read the data from system memory
+		D3D::context->Map(read_tex, 0, D3D11_MAP_READ, 0, &map);
+		u32 ret = 0;
+		if (map.pData)
+			ret = *(u32*)map.pData;
+		D3D::context->Unmap(read_tex, 0);
+
+		// check what to do with the alpha channel (GX_PokeAlphaRead)
+		PixelEngine::UPEAlphaReadReg alpha_read_mode = PixelEngine::GetAlphaReadMode();
+
+		if (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24)
+		{
+			ret = RGBA8ToRGBA6ToRGBA8(ret);
+		}
+		else if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
+		{
+			ret = RGBA8ToRGB565ToRGBA8(ret);
+		}
+		if (bpmem.zcontrol.pixel_format != PEControl::RGBA6_Z24)
+		{
+			ret |= 0xFF000000;
+		}
+
+		if (alpha_read_mode.ReadMode == 2) return ret; // GX_READ_NONE
+		else if (alpha_read_mode.ReadMode == 1) return (ret | 0xFF000000); // GX_READ_FF
+		else /*if(alpha_read_mode.ReadMode == 0)*/ return (ret & 0x00FFFFFF); // GX_READ_00
+	}
+	else if (type == POKE_COLOR)
+	{
+		u32 rgbaColor = (poke_data & 0xFF00FF00) | ((poke_data >> 16) & 0xFF) | ((poke_data << 16) & 0xFF0000);
+
+		// TODO: The first five PE registers may change behavior of EFB pokes, this isn't implemented, yet.
+		ResetAPIState();
+
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.0f, 0.0f, (float)GetTargetWidth(), (float)GetTargetHeight());
+		D3D::context->RSSetViewports(1, &vp);
+
+		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), nullptr);
+		D3D::drawColorQuad(rgbaColor, 0.f,
+		                  (float)RectToLock.left   * 2.f / GetTargetWidth()  - 1.f,
+		                - (float)RectToLock.top    * 2.f / GetTargetHeight() + 1.f,
+		                  (float)RectToLock.right  * 2.f / GetTargetWidth()  - 1.f,
+		                - (float)RectToLock.bottom * 2.f / GetTargetHeight() + 1.f);
+
+		RestoreAPIState();
+	}
+	else // if (type == POKE_Z)
+	{
+		// TODO: The first five PE registers may change behavior of EFB pokes, this isn't implemented, yet.
+		ResetAPIState();
+
+		D3D::stateman->PushBlendState(clearblendstates[3]);
+		D3D::stateman->PushDepthState(cleardepthstates[1]);
+
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.0f, 0.0f, (float)GetTargetWidth(), (float)GetTargetHeight(),
+			1.0f - MathUtil::Clamp<float>(xfmem.viewport.farZ, 0.0f, 16777215.0f) / 16777216.0f,
+			1.0f - MathUtil::Clamp<float>((xfmem.viewport.farZ - MathUtil::Clamp<float>(xfmem.viewport.zRange, 0.0f, 16777215.0f)), 0.0f, 16777215.0f) / 16777216.0f);
+		D3D::context->RSSetViewports(1, &vp);
+
+		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(),
+			FramebufferManager::GetEFBDepthTexture()->GetDSV());
+		D3D::drawColorQuad(0, 1.0f - float(poke_data & 0xFFFFFF) / 16777216.0f,
+		                  (float)RectToLock.left   * 2.f / GetTargetWidth()  - 1.f,
+		                - (float)RectToLock.top    * 2.f / GetTargetHeight() + 1.f,
+		                  (float)RectToLock.right  * 2.f / GetTargetWidth()  - 1.f,
+		                - (float)RectToLock.bottom * 2.f / GetTargetHeight() + 1.f);
+
+		D3D::stateman->PopDepthState();
+		D3D::stateman->PopBlendState();
+
+		RestoreAPIState();
+	}
+
+	return 0;
+}
+
+
+void Renderer::SetViewport()
+{
+	// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
+	// [0] = width/2
+	// [1] = height/2
+	// [2] = 16777215 * (farz - nearz)
+	// [3] = xorig + width/2 + 342
+	// [4] = yorig + height/2 + 342
+	// [5] = 16777215 * farz
+
+	// D3D crashes for zero viewports
+	if (xfmem.viewport.wd == 0 || xfmem.viewport.ht == 0)
+		return;
+
+	int scissorXOff = bpmem.scissorOffset.x * 2;
+	int scissorYOff = bpmem.scissorOffset.y * 2;
+
+	float X = Renderer::EFBToScaledXf(xfmem.viewport.xOrig - xfmem.viewport.wd - scissorXOff);
+	float Y = Renderer::EFBToScaledYf(xfmem.viewport.yOrig + xfmem.viewport.ht - scissorYOff);
+	float Wd = Renderer::EFBToScaledXf(2.0f * xfmem.viewport.wd);
+	float Ht = Renderer::EFBToScaledYf(-2.0f * xfmem.viewport.ht);
+	if (Wd < 0.0f)
+	{
+		X += Wd;
+		Wd = -Wd;
+	}
+	if (Ht < 0.0f)
+	{
+		Y += Ht;
+		Ht = -Ht;
+	}
+
+	// In D3D, the viewport rectangle must fit within the render target.
+	X = (X >= 0.f) ? X : 0.f;
+	Y = (Y >= 0.f) ? Y : 0.f;
+	Wd = (X + Wd <= GetTargetWidth()) ? Wd : (GetTargetWidth() - X);
+	Ht = (Y + Ht <= GetTargetHeight()) ? Ht : (GetTargetHeight() - Y);
+
+	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(X, Y, Wd, Ht,
+		1.0f - MathUtil::Clamp<float>(xfmem.viewport.farZ, 0.0f, 16777215.0f) / 16777216.0f,
+		1.0f - MathUtil::Clamp<float>((xfmem.viewport.farZ - MathUtil::Clamp<float>(xfmem.viewport.zRange, 0.0f, 16777215.0f)), 0.0f, 16777215.0f) / 16777216.0f);
+	D3D::context->RSSetViewports(1, &vp);
+}
+
+void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
+{
+	ResetAPIState();
+
+	if (colorEnable && alphaEnable) D3D::stateman->PushBlendState(clearblendstates[0]);
+	else if (colorEnable) D3D::stateman->PushBlendState(clearblendstates[1]);
+	else if (alphaEnable) D3D::stateman->PushBlendState(clearblendstates[2]);
+	else D3D::stateman->PushBlendState(clearblendstates[3]);
+
+	// TODO: Should we enable Z testing here?
+	/*if (!bpmem.zmode.testenable) D3D::stateman->PushDepthState(cleardepthstates[0]);
+	else */if (zEnable) D3D::stateman->PushDepthState(cleardepthstates[1]);
+	else /*if (!zEnable)*/ D3D::stateman->PushDepthState(cleardepthstates[2]);
+
+	// Update the view port for clearing the picture
+	TargetRectangle targetRc = Renderer::ConvertEFBRectangle(rc);
+	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)targetRc.left, (float)targetRc.top, (float)targetRc.GetWidth(), (float)targetRc.GetHeight(), 0.f, 1.f);
+	D3D::context->RSSetViewports(1, &vp);
+
+	// Color is passed in bgra mode so we need to convert it to rgba
+	u32 rgbaColor = (color & 0xFF00FF00) | ((color >> 16) & 0xFF) | ((color << 16) & 0xFF0000);
+	D3D::drawClearQuad(rgbaColor, 1.0f - (z & 0xFFFFFF) / 16777216.0f);
+
+	D3D::stateman->PopDepthState();
+	D3D::stateman->PopBlendState();
+
+	RestoreAPIState();
+}
+
+void Renderer::ReinterpretPixelData(unsigned int convtype)
+{
+	// TODO: MSAA support..
+	D3D11_RECT source = CD3D11_RECT(0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight());
+
+	ID3D11PixelShader* pixel_shader;
+	if (convtype == 0) pixel_shader = PixelShaderCache::ReinterpRGB8ToRGBA6(true);
+	else if (convtype == 2) pixel_shader = PixelShaderCache::ReinterpRGBA6ToRGB8(true);
+	else
+	{
+		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
+		return;
+	}
+
+	// convert data and set the target texture as our new EFB
+	g_renderer->ResetAPIState();
+
+	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)g_renderer->GetTargetWidth(), (float)g_renderer->GetTargetHeight());
+	D3D::context->RSSetViewports(1, &vp);
+
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTempTexture()->GetRTV(), nullptr);
+	D3D::SetPointCopySampler();
+	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), &source, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight(),
+		pixel_shader, VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), GeometryShaderCache::GetCopyGeometryShader());
+
+	g_renderer->RestoreAPIState();
+
+	FramebufferManager::SwapReinterpretTexture();
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+}
+
+void Renderer::SetBlendMode(bool forceUpdate)
+{
+	// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
+	// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
+	bool target_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
+	const D3D11_BLEND d3dSrcFactors[8] =
+	{
+		D3D11_BLEND_ZERO,
+		D3D11_BLEND_ONE,
+		D3D11_BLEND_DEST_COLOR,
+		D3D11_BLEND_INV_DEST_COLOR,
+		D3D11_BLEND_SRC_ALPHA,
+		D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled!
+		(target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE,
+		(target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO
+	};
+	const D3D11_BLEND d3dDestFactors[8] =
+	{
+		D3D11_BLEND_ZERO,
+		D3D11_BLEND_ONE,
+		D3D11_BLEND_SRC_COLOR,
+		D3D11_BLEND_INV_SRC_COLOR,
+		D3D11_BLEND_SRC_ALPHA,
+		D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled!
+		(target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE,
+		(target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO
+	};
+
+	if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable && !forceUpdate)
+		return;
+
+	if (bpmem.blendmode.subtract)
+	{
+		gx_state.blend.blend_enable = true;
+		gx_state.blend.blend_op = D3D11_BLEND_OP_REV_SUBTRACT;
+		gx_state.blend.src_blend = D3D11_BLEND_ONE;
+		gx_state.blend.dst_blend = D3D11_BLEND_ONE;
+	}
+	else
+	{
+		gx_state.blend.blend_enable = (u32)bpmem.blendmode.blendenable;
+		if (bpmem.blendmode.blendenable)
+		{
+			gx_state.blend.blend_op = D3D11_BLEND_OP_ADD;
+			gx_state.blend.src_blend = d3dSrcFactors[bpmem.blendmode.srcfactor];
+			gx_state.blend.dst_blend = d3dDestFactors[bpmem.blendmode.dstfactor];
+		}
+	}
+}
+
+bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle& rc)
+{
+	if (!s_screenshot_texture)
+		CreateScreenshotTexture(rc);
+
+	// copy back buffer to system memory
+	D3D11_BOX box = CD3D11_BOX(rc.left, rc.top, 0, rc.right, rc.bottom, 1);
+	D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box);
+
+	D3D11_MAPPED_SUBRESOURCE map;
+	D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map);
+
+	bool saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, rc.GetWidth(), rc.GetHeight(), false);
+
+	D3D::context->Unmap(s_screenshot_texture, 0);
+
+
+	if (saved_png)
+	{
+		OSD::AddMessage(StringFromFormat("Saved %i x %i %s", rc.GetWidth(),
+		                                 rc.GetHeight(), filename.c_str()));
+	}
+	else
+	{
+		OSD::AddMessage(StringFromFormat("Error saving %s", filename.c_str()));
+	}
+
+	return saved_png;
+}
+
+void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
+{
+	for (int y = 0; y < h; ++y)
+	{
+		auto line = (in + (h - y - 1) * p);
+		for (int x = 0; x < w; ++x)
+		{
+			out[0] = line[2];
+			out[1] = line[1];
+			out[2] = line[0];
+			out += 3;
+			line += 4;
+		}
+	}
+}
+
+// This function has the final picture. We adjust the aspect ratio here.
+void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma)
+{
+	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
+	{
+		if (SConfig::GetInstance().m_DumpFrames && !frame_data.empty())
+			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
+
+		Core::Callback_VideoCopiedToXFB(false);
+		return;
+	}
+
+	u32 xfbCount = 0;
+	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbStride, fbHeight, &xfbCount);
+	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
+	{
+		if (SConfig::GetInstance().m_DumpFrames && !frame_data.empty())
+			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
+
+		Core::Callback_VideoCopiedToXFB(false);
+		return;
+	}
+
+	ResetAPIState();
+
+	// Prepare to copy the XFBs to our backbuffer
+	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+	TargetRectangle targetRc = GetTargetRectangle();
+
+	D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
+
+	float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };
+	D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor);
+
+	// activate linear filtering for the buffer copies
+	D3D::SetLinearCopySampler();
+
+	if (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB)
+	{
+		// TODO: Television should be used to render Virtual XFB mode as well.
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)targetRc.left, (float)targetRc.top, (float)targetRc.GetWidth(), (float)targetRc.GetHeight());
+		D3D::context->RSSetViewports(1, &vp);
+
+		s_television.Submit(xfbAddr, fbStride, fbWidth, fbHeight);
+		s_television.Render();
+	}
+	else if (g_ActiveConfig.bUseXFB)
+	{
+		const XFBSource* xfbSource;
+
+		// draw each xfb source
+		for (u32 i = 0; i < xfbCount; ++i)
+		{
+			xfbSource = (const XFBSource*)xfbSourceList[i];
+
+			TargetRectangle drawRc;
+
+			// use virtual xfb with offset
+			int xfbHeight = xfbSource->srcHeight;
+			int xfbWidth = xfbSource->srcWidth;
+			int hOffset = ((s32)xfbSource->srcAddr - (s32)xfbAddr) / ((s32)fbStride * 2);
+
+			drawRc.top = targetRc.top + hOffset * targetRc.GetHeight() / (s32)fbHeight;
+			drawRc.bottom = targetRc.top + (hOffset + xfbHeight) * targetRc.GetHeight() / (s32)fbHeight;
+			drawRc.left = targetRc.left + (targetRc.GetWidth() - xfbWidth * targetRc.GetWidth() / (s32)fbStride) / 2;
+			drawRc.right = targetRc.left + (targetRc.GetWidth() + xfbWidth * targetRc.GetWidth() / (s32)fbStride) / 2;
+
+			// The following code disables auto stretch.  Kept for reference.
+			// scale draw area for a 1 to 1 pixel mapping with the draw target
+			//float vScale = (float)fbHeight / (float)s_backbuffer_height;
+			//float hScale = (float)fbWidth / (float)s_backbuffer_width;
+			//drawRc.top *= vScale;
+			//drawRc.bottom *= vScale;
+			//drawRc.left *= hScale;
+			//drawRc.right *= hScale;
+
+			TargetRectangle sourceRc;
+			sourceRc.left = 0;
+			sourceRc.top = 0;
+			sourceRc.right = (int)xfbSource->texWidth;
+			sourceRc.bottom = (int)xfbSource->texHeight;
+
+			sourceRc.right -= Renderer::EFBToScaledX(fbStride - fbWidth);
+
+			BlitScreen(sourceRc, drawRc, xfbSource->tex, xfbSource->texWidth, xfbSource->texHeight, Gamma);
+		}
+	}
+	else
+	{
+		TargetRectangle sourceRc = Renderer::ConvertEFBRectangle(rc);
+
+		// TODO: Improve sampling algorithm for the pixel shader so that we can use the multisampled EFB texture as source
+		D3DTexture2D* read_texture = FramebufferManager::GetResolvedEFBColorTexture();
+		BlitScreen(sourceRc, targetRc, read_texture, GetTargetWidth(), GetTargetHeight(), Gamma);
+	}
+
+	// done with drawing the game stuff, good moment to save a screenshot
+	if (s_bScreenshot)
+	{
+		SaveScreenshot(s_sScreenshotName, GetTargetRectangle());
+		s_bScreenshot = false;
+	}
+
+	// Dump frames
+	static int w = 0, h = 0;
+	if (SConfig::GetInstance().m_DumpFrames)
+	{
+		static int s_recordWidth;
+		static int s_recordHeight;
+
+		if (!s_screenshot_texture)
+			CreateScreenshotTexture(GetTargetRectangle());
+
+		D3D11_BOX box = CD3D11_BOX(GetTargetRectangle().left, GetTargetRectangle().top, 0, GetTargetRectangle().right, GetTargetRectangle().bottom, 1);
+		D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box);
+		if (!bLastFrameDumped)
+		{
+			s_recordWidth = GetTargetRectangle().GetWidth();
+			s_recordHeight = GetTargetRectangle().GetHeight();
+			bAVIDumping = AVIDump::Start(D3D::hWnd, s_recordWidth, s_recordHeight);
+			if (!bAVIDumping)
+			{
+				PanicAlert("Error dumping frames to AVI.");
+			}
+			else
+			{
+				std::string msg = StringFromFormat("Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
+					File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight);
+
+				OSD::AddMessage(msg, 2000);
+			}
+		}
+		if (bAVIDumping)
+		{
+			D3D11_MAPPED_SUBRESOURCE map;
+			D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map);
+
+			if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight)
+			{
+				frame_data.resize(3 * s_recordWidth * s_recordHeight);
+				w = s_recordWidth;
+				h = s_recordHeight;
+			}
+			formatBufferDump((u8*)map.pData, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch);
+			AVIDump::AddFrame(&frame_data[0], GetTargetRectangle().GetWidth(), GetTargetRectangle().GetHeight());
+			D3D::context->Unmap(s_screenshot_texture, 0);
+		}
+		bLastFrameDumped = true;
+	}
+	else
+	{
+		if (bLastFrameDumped && bAVIDumping)
+		{
+			std::vector<u8>().swap(frame_data);
+			w = h = 0;
+
+			AVIDump::Stop();
+			bAVIDumping = false;
+			OSD::AddMessage("Stop dumping frames to AVI", 2000);
+		}
+		bLastFrameDumped = false;
+	}
+
+	// Reset viewport for drawing text
+	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.0f, 0.0f, (float)GetBackbufferWidth(), (float)GetBackbufferHeight());
+	D3D::context->RSSetViewports(1, &vp);
+
+	Renderer::DrawDebugText();
+
+	OSD::DrawMessages();
+	D3D::EndFrame();
+
+	TextureCache::Cleanup(frameCount);
+
+	// Enable configuration changes
+	UpdateActiveConfig();
+	TextureCache::OnConfigChanged(g_ActiveConfig);
+
+	SetWindowSize(fbStride, fbHeight);
+
+	const bool windowResized = CheckForResize();
+	const bool fullscreen = g_ActiveConfig.bFullscreen && !g_ActiveConfig.bBorderlessFullscreen &&
+		!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain;
+
+	bool xfbchanged = s_last_xfb_mode != g_ActiveConfig.bUseRealXFB;
+
+	if (FramebufferManagerBase::LastXfbWidth() != fbStride || FramebufferManagerBase::LastXfbHeight() != fbHeight)
+	{
+		xfbchanged = true;
+		unsigned int xfb_w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride;
+		unsigned int xfb_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
+		FramebufferManagerBase::SetLastXfbWidth(xfb_w);
+		FramebufferManagerBase::SetLastXfbHeight(xfb_h);
+	}
+
+	// Flip/present backbuffer to frontbuffer here
+	D3D::Present();
+
+	// Check exclusive fullscreen state
+	bool exclusive_mode, fullscreen_changed = false;
+	if (SUCCEEDED(D3D::GetFullscreenState(&exclusive_mode)))
+	{
+		if (fullscreen && !exclusive_mode)
+		{
+			if (g_Config.bExclusiveMode)
+				OSD::AddMessage("Lost exclusive fullscreen.");
+
+			// Exclusive fullscreen is enabled in the configuration, but we're
+			// not in exclusive mode. Either exclusive fullscreen was turned on
+			// or the render frame lost focus. When the render frame is in focus
+			// we can apply exclusive mode.
+			fullscreen_changed = Host_RendererHasFocus();
+
+			g_Config.bExclusiveMode = false;
+		}
+		else if (!fullscreen && exclusive_mode)
+		{
+			// Exclusive fullscreen is disabled, but we're still in exclusive mode.
+			fullscreen_changed = true;
+		}
+	}
+
+	// Resize the back buffers NOW to avoid flickering
+	if (xfbchanged ||
+		windowResized ||
+		fullscreen_changed ||
+		s_last_efb_scale != g_ActiveConfig.iEFBScale ||
+		s_last_multisample_mode != g_ActiveConfig.iMultisampleMode ||
+		s_last_stereo_mode != (g_ActiveConfig.iStereoMode > 0))
+	{
+		s_last_xfb_mode = g_ActiveConfig.bUseRealXFB;
+		s_last_multisample_mode = g_ActiveConfig.iMultisampleMode;
+		PixelShaderCache::InvalidateMSAAShaders();
+
+		if (windowResized || fullscreen_changed)
+		{
+			// Apply fullscreen state
+			if (fullscreen_changed)
+			{
+				g_Config.bExclusiveMode = fullscreen;
+
+				if (fullscreen)
+					OSD::AddMessage("Entered exclusive fullscreen.");
+
+				D3D::SetFullscreenState(fullscreen);
+
+				// If fullscreen is disabled we can safely notify the UI to exit fullscreen.
+				if (!g_ActiveConfig.bFullscreen)
+					Host_RequestFullscreen(false);
+			}
+
+			// TODO: Aren't we still holding a reference to the back buffer right now?
+			D3D::Reset();
+			SAFE_RELEASE(s_screenshot_texture);
+			SAFE_RELEASE(s_3d_vision_texture);
+			s_backbuffer_width = D3D::GetBackBufferWidth();
+			s_backbuffer_height = D3D::GetBackBufferHeight();
+		}
+
+		UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+
+		s_last_efb_scale = g_ActiveConfig.iEFBScale;
+		s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0;
+		CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
+
+		PixelShaderManager::SetEfbScaleChanged();
+
+		D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
+
+		delete g_framebuffer_manager;
+		g_framebuffer_manager = new FramebufferManager;
+		float clear_col[4] = { 0.f, 0.f, 0.f, 1.f };
+		D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(), clear_col);
+		D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(), D3D11_CLEAR_DEPTH, 0.f, 0);
+	}
+
+	// begin next frame
+	RestoreAPIState();
+	D3D::BeginFrame();
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+	SetViewport();
+}
+
+// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
+void Renderer::ResetAPIState()
+{
+	D3D::stateman->PushBlendState(resetblendstate);
+	D3D::stateman->PushDepthState(resetdepthstate);
+	D3D::stateman->PushRasterizerState(resetraststate);
+}
+
+void Renderer::RestoreAPIState()
+{
+	// Gets us back into a more game-like state.
+	D3D::stateman->PopBlendState();
+	D3D::stateman->PopDepthState();
+	D3D::stateman->PopRasterizerState();
+	SetViewport();
+	BPFunctions::SetScissor();
+}
+
+void Renderer::ApplyState(bool bUseDstAlpha)
+{
+	gx_state.blend.use_dst_alpha = bUseDstAlpha;
+	D3D::stateman->PushBlendState(gx_state_cache.Get(gx_state.blend));
+	D3D::stateman->PushDepthState(gx_state_cache.Get(gx_state.zmode));
+	D3D::stateman->PushRasterizerState(gx_state_cache.Get(gx_state.raster));
+
+	for (unsigned int stage = 0; stage < 8; stage++)
+	{
+		// TODO: cache SamplerState directly, not d3d object
+		gx_state.sampler[stage].max_anisotropy = g_ActiveConfig.iMaxAnisotropy;
+		D3D::stateman->SetSampler(stage, gx_state_cache.Get(gx_state.sampler[stage]));
+	}
+
+	if (bUseDstAlpha)
+	{
+		// restore actual state
+		SetBlendMode(false);
+		SetLogicOpMode();
+	}
+
+	ID3D11Buffer* vertexConstants = VertexShaderCache::GetConstantBuffer();
+
+	D3D::stateman->SetPixelConstants(PixelShaderCache::GetConstantBuffer(), g_ActiveConfig.bEnablePixelLighting ? vertexConstants : nullptr);
+	D3D::stateman->SetVertexConstants(vertexConstants);
+	D3D::stateman->SetGeometryConstants(GeometryShaderCache::GetConstantBuffer());
+
+	D3D::stateman->SetPixelShader(PixelShaderCache::GetActiveShader());
+	D3D::stateman->SetVertexShader(VertexShaderCache::GetActiveShader());
+	D3D::stateman->SetGeometryShader(GeometryShaderCache::GetActiveShader());
+}
+
+void Renderer::RestoreState()
+{
+	D3D::stateman->PopBlendState();
+	D3D::stateman->PopDepthState();
+	D3D::stateman->PopRasterizerState();
+}
+
+void Renderer::ApplyCullDisable()
+{
+	RasterizerState rast = gx_state.raster;
+	rast.cull_mode = D3D11_CULL_NONE;
+
+	ID3D11RasterizerState* raststate = gx_state_cache.Get(rast);
+	D3D::stateman->PushRasterizerState(raststate);
+}
+
+void Renderer::RestoreCull()
+{
+	D3D::stateman->PopRasterizerState();
+}
+
+void Renderer::SetGenerationMode()
+{
+	const D3D11_CULL_MODE d3dCullModes[4] =
+	{
+		D3D11_CULL_NONE,
+		D3D11_CULL_BACK,
+		D3D11_CULL_FRONT,
+		D3D11_CULL_BACK
+	};
+
+	// rastdc.FrontCounterClockwise must be false for this to work
+	// TODO: GX_CULL_ALL not supported, yet!
+	gx_state.raster.cull_mode = d3dCullModes[bpmem.genMode.cullmode];
+}
+
+void Renderer::SetDepthMode()
+{
+	gx_state.zmode = bpmem.zmode;
+}
+
+void Renderer::SetLogicOpMode()
+{
+	// D3D11 doesn't support logic blending, so this is a huge hack
+	// TODO: Make use of D3D11.1's logic blending support
+
+	// 0   0x00
+	// 1   Source & destination
+	// 2   Source & ~destination
+	// 3   Source
+	// 4   ~Source & destination
+	// 5   Destination
+	// 6   Source ^ destination =  Source & ~destination | ~Source & destination
+	// 7   Source | destination
+	// 8   ~(Source | destination)
+	// 9   ~(Source ^ destination) = ~Source & ~destination | Source & destination
+	// 10  ~Destination
+	// 11  Source | ~destination
+	// 12  ~Source
+	// 13  ~Source | destination
+	// 14  ~(Source & destination)
+	// 15  0xff
+	const D3D11_BLEND_OP d3dLogicOps[16] =
+	{
+		D3D11_BLEND_OP_ADD,//0
+		D3D11_BLEND_OP_ADD,//1
+		D3D11_BLEND_OP_SUBTRACT,//2
+		D3D11_BLEND_OP_ADD,//3
+		D3D11_BLEND_OP_REV_SUBTRACT,//4
+		D3D11_BLEND_OP_ADD,//5
+		D3D11_BLEND_OP_MAX,//6
+		D3D11_BLEND_OP_ADD,//7
+		D3D11_BLEND_OP_MAX,//8
+		D3D11_BLEND_OP_MAX,//9
+		D3D11_BLEND_OP_ADD,//10
+		D3D11_BLEND_OP_ADD,//11
+		D3D11_BLEND_OP_ADD,//12
+		D3D11_BLEND_OP_ADD,//13
+		D3D11_BLEND_OP_ADD,//14
+		D3D11_BLEND_OP_ADD//15
+	};
+	const D3D11_BLEND d3dLogicOpSrcFactors[16] =
+	{
+		D3D11_BLEND_ZERO,//0
+		D3D11_BLEND_DEST_COLOR,//1
+		D3D11_BLEND_ONE,//2
+		D3D11_BLEND_ONE,//3
+		D3D11_BLEND_DEST_COLOR,//4
+		D3D11_BLEND_ZERO,//5
+		D3D11_BLEND_INV_DEST_COLOR,//6
+		D3D11_BLEND_INV_DEST_COLOR,//7
+		D3D11_BLEND_INV_SRC_COLOR,//8
+		D3D11_BLEND_INV_SRC_COLOR,//9
+		D3D11_BLEND_INV_DEST_COLOR,//10
+		D3D11_BLEND_ONE,//11
+		D3D11_BLEND_INV_SRC_COLOR,//12
+		D3D11_BLEND_INV_SRC_COLOR,//13
+		D3D11_BLEND_INV_DEST_COLOR,//14
+		D3D11_BLEND_ONE//15
+	};
+	const D3D11_BLEND d3dLogicOpDestFactors[16] =
+	{
+		D3D11_BLEND_ZERO,//0
+		D3D11_BLEND_ZERO,//1
+		D3D11_BLEND_INV_SRC_COLOR,//2
+		D3D11_BLEND_ZERO,//3
+		D3D11_BLEND_ONE,//4
+		D3D11_BLEND_ONE,//5
+		D3D11_BLEND_INV_SRC_COLOR,//6
+		D3D11_BLEND_ONE,//7
+		D3D11_BLEND_INV_DEST_COLOR,//8
+		D3D11_BLEND_SRC_COLOR,//9
+		D3D11_BLEND_INV_DEST_COLOR,//10
+		D3D11_BLEND_INV_DEST_COLOR,//11
+		D3D11_BLEND_INV_SRC_COLOR,//12
+		D3D11_BLEND_ONE,//13
+		D3D11_BLEND_INV_SRC_COLOR,//14
+		D3D11_BLEND_ONE//15
+	};
+
+	if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable)
+	{
+		gx_state.blend.blend_enable = true;
+		gx_state.blend.blend_op = d3dLogicOps[bpmem.blendmode.logicmode];
+		gx_state.blend.src_blend = d3dLogicOpSrcFactors[bpmem.blendmode.logicmode];
+		gx_state.blend.dst_blend = d3dLogicOpDestFactors[bpmem.blendmode.logicmode];
+	}
+	else
+	{
+		SetBlendMode(true);
+	}
+}
+
+void Renderer::SetDitherMode()
+{
+	// TODO: Set dither mode to bpmem.blendmode.dither
+}
+
+void Renderer::SetSamplerState(int stage, int texindex, bool custom_tex)
+{
+	const FourTexUnits &tex = bpmem.tex[texindex];
+	const TexMode0 &tm0 = tex.texMode0[stage];
+	const TexMode1 &tm1 = tex.texMode1[stage];
+
+	if (texindex)
+		stage += 4;
+
+	if (g_ActiveConfig.bForceFiltering)
+	{
+		gx_state.sampler[stage].min_filter = 6; // 4 (linear mip) | 2 (linear min)
+		gx_state.sampler[stage].mag_filter = 1; // linear mag
+	}
+	else
+	{
+		gx_state.sampler[stage].min_filter = (u32)tm0.min_filter;
+		gx_state.sampler[stage].mag_filter = (u32)tm0.mag_filter;
+	}
+
+	gx_state.sampler[stage].wrap_s = (u32)tm0.wrap_s;
+	gx_state.sampler[stage].wrap_t = (u32)tm0.wrap_t;
+	gx_state.sampler[stage].max_lod = (u32)tm1.max_lod;
+	gx_state.sampler[stage].min_lod = (u32)tm1.min_lod;
+	gx_state.sampler[stage].lod_bias = (s32)tm0.lod_bias;
+
+	// custom textures may have higher resolution, so disable the max_lod
+	if (custom_tex)
+	{
+		gx_state.sampler[stage].max_lod = 255;
+	}
+}
+
+void Renderer::SetInterlacingMode()
+{
+	// TODO
+}
+
+int Renderer::GetMaxTextureSize()
+{
+	return DX11::D3D::GetMaxTextureSize();
+}
+
+u16 Renderer::BBoxRead(int index)
+{
+	// Here we get the min/max value of the truncated position of the upscaled framebuffer.
+	// So we have to correct them to the unscaled EFB sizes.
+	int value = BBox::Get(index);
+
+	if (index < 2)
+	{
+		// left/right
+		value = value * EFB_WIDTH / s_target_width;
+	}
+	else
+	{
+		// up/down
+		value = value * EFB_HEIGHT / s_target_height;
+	}
+	if (index & 1)
+		value++; // fix max values to describe the outer border
+
+	return value;
+}
+
+void Renderer::BBoxWrite(int index, u16 _value)
+{
+	int value = _value; // u16 isn't enough to multiply by the efb width
+	if (index & 1)
+		value--;
+	if (index < 2)
+	{
+		value = value * s_target_width / EFB_WIDTH;
+	}
+	else
+	{
+		value = value * s_target_height / EFB_HEIGHT;
+	}
+
+	BBox::Set(index, value);
+}
+
+void Renderer::BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D* src_texture, u32 src_width, u32 src_height, float Gamma)
+{
+	if (g_ActiveConfig.iStereoMode == STEREO_SBS || g_ActiveConfig.iStereoMode == STEREO_TAB)
+	{
+		TargetRectangle leftRc, rightRc;
+		ConvertStereoRectangle(dst, leftRc, rightRc);
+
+		D3D11_VIEWPORT leftVp = CD3D11_VIEWPORT((float)leftRc.left, (float)leftRc.top, (float)leftRc.GetWidth(), (float)leftRc.GetHeight());
+		D3D11_VIEWPORT rightVp = CD3D11_VIEWPORT((float)rightRc.left, (float)rightRc.top, (float)rightRc.GetWidth(), (float)rightRc.GetHeight());
+
+		D3D::context->RSSetViewports(1, &leftVp);
+		D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), nullptr, Gamma, 0);
+
+		D3D::context->RSSetViewports(1, &rightVp);
+		D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), nullptr, Gamma, 1);
+	}
+	else if (g_ActiveConfig.iStereoMode == STEREO_3DVISION)
+	{
+		if (!s_3d_vision_texture)
+			Create3DVisionTexture(s_backbuffer_width, s_backbuffer_height);
+
+		D3D11_VIEWPORT leftVp = CD3D11_VIEWPORT((float)dst.left, (float)dst.top, (float)dst.GetWidth(), (float)dst.GetHeight());
+		D3D11_VIEWPORT rightVp = CD3D11_VIEWPORT((float)(dst.left + s_backbuffer_width), (float)dst.top, (float)dst.GetWidth(), (float)dst.GetHeight());
+
+		// Render to staging texture which is double the width of the backbuffer
+		D3D::context->OMSetRenderTargets(1, &s_3d_vision_texture->GetRTV(), nullptr);
+
+		D3D::context->RSSetViewports(1, &leftVp);
+		D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), nullptr, Gamma, 0);
+
+		D3D::context->RSSetViewports(1, &rightVp);
+		D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), nullptr, Gamma, 1);
+
+		// Copy the left eye to the backbuffer, if Nvidia 3D Vision is enabled it should
+		// recognize the signature and automatically include the right eye frame.
+		D3D11_BOX box = CD3D11_BOX(0, 0, 0, s_backbuffer_width, s_backbuffer_height, 1);
+		D3D::context->CopySubresourceRegion(D3D::GetBackBuffer()->GetTex(), 0, 0, 0, 0, s_3d_vision_texture->GetTex(), 0, &box);
+
+		// Restore render target to backbuffer
+		D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
+	}
+	else
+	{
+		D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)dst.left, (float)dst.top, (float)dst.GetWidth(), (float)dst.GetHeight());
+		D3D::context->RSSetViewports(1, &vp);
+		D3D::drawShadedTexQuad(src_texture->GetSRV(), src.AsRECT(), src_width, src_height, (g_Config.iStereoMode == STEREO_ANAGLYPH) ? PixelShaderCache::GetAnaglyphProgram() : PixelShaderCache::GetColorCopyProgram(false), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), nullptr, Gamma);
+	}
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/Render.h
new file mode 100644
index 0000000000..ab1ef5f265
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/Render.h
@@ -0,0 +1,64 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoCommon/RenderBase.h"
+
+namespace DX11
+{
+
+class Renderer : public ::Renderer
+{
+public:
+	Renderer(void *&window_handle);
+	~Renderer();
+
+	void SetColorMask() override;
+	void SetBlendMode(bool forceUpdate) override;
+	void SetScissorRect(const EFBRectangle& rc) override;
+	void SetGenerationMode() override;
+	void SetDepthMode() override;
+	void SetLogicOpMode() override;
+	void SetDitherMode() override;
+	void SetSamplerState(int stage, int texindex, bool custom_tex) override;
+	void SetInterlacingMode() override;
+	void SetViewport() override;
+
+	// TODO: Fix confusing names (see ResetAPIState and RestoreAPIState)
+	void ApplyState(bool bUseDstAlpha) override;
+	void RestoreState() override;
+
+	void ApplyCullDisable();
+	void RestoreCull();
+
+	void RenderText(const std::string& text, int left, int top, u32 color) override;
+
+	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override;
+	u16 BBoxRead(int index) override;
+	void BBoxWrite(int index, u16 value) override;
+
+	void ResetAPIState() override;
+	void RestoreAPIState() override;
+
+	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) override;
+
+	void SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma) override;
+
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) override;
+
+	void ReinterpretPixelData(unsigned int convtype) override;
+
+	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override;
+
+	static bool CheckForResize();
+
+	int GetMaxTextureSize() override;
+
+private:
+	void BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D* src_texture, u32 src_width, u32 src_height, float Gamma);
+};
+
+}
diff --git a/Source/Core/VideoBackends/D3D/Television.cpp b/Source/Core/VideoBackends/D3D/Television.cpp
new file mode 100644
index 0000000000..334d1b7420
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/Television.cpp
@@ -0,0 +1,171 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <vector>
+
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/Television.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+static const char YUYV_DECODER_PS[] =
+"// dolphin-emu YUYV decoder pixel shader\n"
+
+"Texture2D Tex0 : register(t0);\n"
+"sampler Samp0 : register(s0);\n"
+
+"static const float3x3 YCBCR_TO_RGB = float3x3(\n"
+	"1.164, 0.000, 1.596,\n"
+	"1.164, -0.392, -0.813,\n"
+	"1.164, 2.017, 0.000\n"
+	");\n"
+
+"void main(out float4 ocol0 : SV_Target, in float4 pos : SV_Position, in float2 uv0 : TEXCOORD0)\n"
+"{\n"
+	"float3 sample = Tex0.Sample(Samp0, uv0).rgb;\n"
+
+	// GameCube/Wii XFB data is in YUYV format with ITU-R Rec. BT.601 color
+	// primaries, compressed to the range Y in 16..235, U and V in 16..240.
+	// We want to convert it to RGB format with sRGB color primaries, with
+	// range 0..255.
+
+	// Recover RGB components
+	"float3 yuv_601_sub = sample.grb - float3(16.0/255.0, 128.0/255.0, 128.0/255.0);\n"
+	"float3 rgb_601 = mul(YCBCR_TO_RGB, yuv_601_sub);\n"
+
+	// If we were really obsessed with accuracy, we would correct for the
+	// differing color primaries between BT.601 and sRGB. However, this may not
+	// be worth the trouble because:
+	// - BT.601 defines two sets of primaries: one for NTSC and one for PAL.
+	// - sRGB's color primaries are actually an intermediate between BT.601's
+	//   NTSC and PAL primaries.
+	// - If users even noticed any difference at all, they would be confused by
+	//   the slightly-different colors in the NTSC and PAL versions of the same
+	//   game.
+	// - Even the game designers probably don't pay close attention to this
+	//   stuff.
+	// Still, instructions on how to do it can be found at
+	// <http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC20>
+
+	"ocol0 = float4(rgb_601, 1);\n"
+"}\n"
+;
+
+Television::Television()
+	: m_yuyvTexture(nullptr), m_yuyvTextureSRV(nullptr), m_pShader(nullptr)
+{ }
+
+void Television::Init()
+{
+	HRESULT hr;
+
+	// Create YUYV texture for real XFB mode
+
+
+	// Initialize the texture with YCbCr black
+	//
+	// Some games use narrower XFB widths (Nintendo titles are fond of 608),
+	// so the sampler's BorderColor won't cover the right side
+	// (see sampler state below)
+	const unsigned int MAX_XFB_SIZE = 2*(MAX_XFB_WIDTH) * MAX_XFB_HEIGHT;
+	std::vector<u8> fill(MAX_XFB_SIZE);
+	for (size_t i = 0; i < MAX_XFB_SIZE / sizeof(u32); ++i)
+		reinterpret_cast<u32*>(fill.data())[i] = 0x80108010;
+	D3D11_SUBRESOURCE_DATA srd = { fill.data(), 2*(MAX_XFB_WIDTH), 0 };
+
+	// This texture format is designed for YUYV data.
+	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
+		DXGI_FORMAT_G8R8_G8B8_UNORM, MAX_XFB_WIDTH, MAX_XFB_HEIGHT, 1, 1);
+	hr = D3D::device->CreateTexture2D(&t2dd, &srd, &m_yuyvTexture);
+	CHECK(SUCCEEDED(hr), "create tv yuyv texture");
+	D3D::SetDebugObjectName(m_yuyvTexture, "tv yuyv texture");
+
+	// Create shader resource view for YUYV texture
+
+	D3D11_SHADER_RESOURCE_VIEW_DESC srvd = CD3D11_SHADER_RESOURCE_VIEW_DESC(
+		m_yuyvTexture, D3D11_SRV_DIMENSION_TEXTURE2D,
+		DXGI_FORMAT_G8R8_G8B8_UNORM);
+	hr = D3D::device->CreateShaderResourceView(m_yuyvTexture, &srvd, &m_yuyvTextureSRV);
+	CHECK(SUCCEEDED(hr), "create tv yuyv texture srv");
+	D3D::SetDebugObjectName(m_yuyvTextureSRV, "tv yuyv texture srv");
+
+	// Create YUYV-decoding pixel shader
+
+	m_pShader = D3D::CompileAndCreatePixelShader(YUYV_DECODER_PS);
+	CHECK(m_pShader != nullptr, "compile and create yuyv decoder pixel shader");
+	D3D::SetDebugObjectName(m_pShader, "yuyv decoder pixel shader");
+
+	// Create sampler state and set border color
+	//
+	// The default sampler border color of { 0.f, 0.f, 0.f, 0.f }
+	// creates a green border around the image - see issue 6483
+	// (remember, the XFB is being interpreted as YUYV, and 0,0,0,0
+	// is actually two green pixels in YUYV - black should be 16,128,16,128,
+	// but we reverse the order to match DXGI_FORMAT_G8R8_G8B8_UNORM's ordering)
+	float border[4] = { 128.0f/255.0f, 16.0f/255.0f, 128.0f/255.0f, 16.0f/255.0f };
+	D3D11_SAMPLER_DESC samDesc = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_LINEAR,
+		D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER,
+		0.f, 1, D3D11_COMPARISON_ALWAYS, border, 0.f, 0.f);
+	hr = D3D::device->CreateSamplerState(&samDesc, &m_samplerState);
+	CHECK(SUCCEEDED(hr), "create yuyv decoder sampler state");
+	D3D::SetDebugObjectName(m_samplerState, "yuyv decoder sampler state");
+}
+
+void Television::Shutdown()
+{
+	SAFE_RELEASE(m_pShader);
+	SAFE_RELEASE(m_yuyvTextureSRV);
+	SAFE_RELEASE(m_yuyvTexture);
+	SAFE_RELEASE(m_samplerState);
+}
+
+void Television::Submit(u32 xfbAddr, u32 stride, u32 width, u32 height)
+{
+	m_curAddr = xfbAddr;
+	m_curWidth = width;
+	m_curHeight = height;
+
+	// Load data from GameCube RAM to YUYV texture
+	u8* yuyvSrc = Memory::GetPointer(xfbAddr);
+	D3D11_BOX box = CD3D11_BOX(0, 0, 0, stride, height, 1);
+	D3D::context->UpdateSubresource(m_yuyvTexture, 0, &box, yuyvSrc, 2 * stride, 2 * stride * height);
+}
+
+void Television::Render()
+{
+	if (g_ActiveConfig.bUseRealXFB && g_ActiveConfig.bUseXFB)
+	{
+		// Use real XFB mode
+		// TODO: If this is the lower field, render at a vertical offset of 1
+		// line down. We could even consider implementing a deinterlacing
+		// algorithm.
+
+		D3D11_RECT sourceRc = CD3D11_RECT(0, 0, int(m_curWidth), int(m_curHeight));
+
+		D3D::stateman->SetSampler(0, m_samplerState);
+
+		D3D::drawShadedTexQuad(
+			m_yuyvTextureSRV, &sourceRc,
+			MAX_XFB_WIDTH, MAX_XFB_HEIGHT,
+			m_pShader,
+			VertexShaderCache::GetSimpleVertexShader(),
+			VertexShaderCache::GetSimpleInputLayout());
+	}
+	else if (g_ActiveConfig.bUseXFB)
+	{
+		// Use virtual XFB mode
+
+		// TODO: Eventually, Television should render the Virtual XFB mode
+		// display as well.
+	}
+}
+
+}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.h b/Source/Core/VideoBackends/D3D/Television.h
similarity index 75%
rename from Source/Plugins/Plugin_VideoDX11/Src/Television.h
rename to Source/Core/VideoBackends/D3D/Television.h
index 163d9131a6..688fbbeab0 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Television.h
+++ b/Source/Core/VideoBackends/D3D/Television.h
@@ -1,15 +1,15 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _TELEVISION_H
-#define _TELEVISION_H
+#pragma once
 
-#include "VideoCommon.h"
+#include "VideoCommon/VideoCommon.h"
 
 struct ID3D11Texture2D;
 struct ID3D11ShaderResourceView;
 struct ID3D11PixelShader;
+struct ID3D11SamplerState;
 
 namespace DX11
 {
@@ -27,7 +27,7 @@ public:
 	// Submit video data to be drawn. This will change the current state of the
 	// TV. xfbAddr points to YUYV data stored in GameCube/Wii RAM, but the XFB
 	// may be virtualized when rendering so the RAM may not actually be read.
-	void Submit(u32 xfbAddr, u32 width, u32 height);
+	void Submit(u32 xfbAddr, u32 stride, u32 width, u32 height);
 
 	// Render the current state of the TV.
 	void Render();
@@ -44,9 +44,8 @@ private:
 	ID3D11Texture2D* m_yuyvTexture;
 	ID3D11ShaderResourceView* m_yuyvTextureSRV;
 	ID3D11PixelShader* m_pShader;
+	ID3D11SamplerState* m_samplerState;
 
 };
 
 }
-
-#endif
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp
new file mode 100644
index 0000000000..bbc23c6e59
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp
@@ -0,0 +1,361 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/PSTextureEncoder.h"
+#include "VideoBackends/D3D/TextureCache.h"
+#include "VideoBackends/D3D/TextureEncoder.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+static TextureEncoder* g_encoder = nullptr;
+const size_t MAX_COPY_BUFFERS = 32;
+ID3D11Buffer* efbcopycbuf[MAX_COPY_BUFFERS] = { 0 };
+
+TextureCache::TCacheEntry::~TCacheEntry()
+{
+	texture->Release();
+}
+
+void TextureCache::TCacheEntry::Bind(unsigned int stage)
+{
+	D3D::stateman->SetTexture(stage, texture->GetSRV());
+}
+
+bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int level)
+{
+	// TODO: Somehow implement this (D3DX11 doesn't support dumping individual LODs)
+	static bool warn_once = true;
+	if (level && warn_once)
+	{
+		WARN_LOG(VIDEO, "Dumping individual LOD not supported by D3D11 backend!");
+		warn_once = false;
+		return false;
+	}
+
+	ID3D11Texture2D* pNewTexture = nullptr;
+	ID3D11Texture2D* pSurface = texture->GetTex();
+	D3D11_TEXTURE2D_DESC desc;
+	pSurface->GetDesc(&desc);
+
+	desc.BindFlags = 0;
+	desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+	desc.Usage = D3D11_USAGE_STAGING;
+
+	HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, &pNewTexture);
+
+	bool saved_png = false;
+
+	if (SUCCEEDED(hr) && pNewTexture)
+	{
+		D3D::context->CopyResource(pNewTexture, pSurface);
+
+		D3D11_MAPPED_SUBRESOURCE map;
+		hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map);
+		if (SUCCEEDED(hr))
+		{
+			saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, desc.Width, desc.Height);
+			D3D::context->Unmap(pNewTexture, 0);
+		}
+		SAFE_RELEASE(pNewTexture);
+	}
+
+	return saved_png;
+}
+
+void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
+	unsigned int expanded_width, unsigned int level)
+{
+	D3D::ReplaceRGBATexture2D(texture->GetTex(), TextureCache::temp, width, height, expanded_width, level, usage);
+}
+
+TextureCache::TCacheEntryBase* TextureCache::CreateTexture(const TCacheEntryConfig& config)
+{
+	if (config.rendertarget)
+	{
+		return new TCacheEntry(config, D3DTexture2D::Create(config.width, config.height,
+			(D3D11_BIND_FLAG)((int)D3D11_BIND_RENDER_TARGET | (int)D3D11_BIND_SHADER_RESOURCE),
+			D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM, 1, config.layers));
+	}
+	else
+	{
+		D3D11_USAGE usage = D3D11_USAGE_DEFAULT;
+		D3D11_CPU_ACCESS_FLAG cpu_access = (D3D11_CPU_ACCESS_FLAG)0;
+
+		if (config.levels == 1)
+		{
+			usage = D3D11_USAGE_DYNAMIC;
+			cpu_access = D3D11_CPU_ACCESS_WRITE;
+		}
+
+		const D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM,
+			config.width, config.height, 1, config.levels, D3D11_BIND_SHADER_RESOURCE, usage, cpu_access);
+
+		ID3D11Texture2D *pTexture;
+		const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &pTexture);
+		CHECK(SUCCEEDED(hr), "Create texture of the TextureCache");
+
+		TCacheEntry* const entry = new TCacheEntry(config, new D3DTexture2D(pTexture, D3D11_BIND_SHADER_RESOURCE));
+		entry->usage = usage;
+
+		// TODO: better debug names
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetTex(), "a texture of the TextureCache");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetSRV(), "shader resource view of a texture of the TextureCache");
+
+		SAFE_RELEASE(pTexture);
+
+		return entry;
+	}
+}
+
+void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
+	PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+	bool isIntensity, bool scaleByHalf, unsigned int cbufid,
+	const float *colmat)
+{
+	g_renderer->ResetAPIState();
+
+	// stretch picture with increased internal resolution
+	const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)config.width, (float)config.height);
+	D3D::context->RSSetViewports(1, &vp);
+
+	// set transformation
+	if (nullptr == efbcopycbuf[cbufid])
+	{
+		const D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(28 * sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
+		D3D11_SUBRESOURCE_DATA data;
+		data.pSysMem = colmat;
+		HRESULT hr = D3D::device->CreateBuffer(&cbdesc, &data, &efbcopycbuf[cbufid]);
+		CHECK(SUCCEEDED(hr), "Create efb copy constant buffer %d", cbufid);
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)efbcopycbuf[cbufid], "a constant buffer used in TextureCache::CopyRenderTargetToTexture");
+	}
+	D3D::stateman->SetPixelConstants(efbcopycbuf[cbufid]);
+
+	const TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
+	// TODO: try targetSource.asRECT();
+	const D3D11_RECT sourcerect = CD3D11_RECT(targetSource.left, targetSource.top, targetSource.right, targetSource.bottom);
+
+	// Use linear filtering if (bScaleByHalf), use point filtering otherwise
+	if (scaleByHalf)
+		D3D::SetLinearCopySampler();
+	else
+		D3D::SetPointCopySampler();
+
+	// Make sure we don't draw with the texture set as both a source and target.
+	// (This can happen because we don't unbind textures when we free them.)
+	D3D::stateman->UnsetTexture(texture->GetSRV());
+
+	D3D::context->OMSetRenderTargets(1, &texture->GetRTV(), nullptr);
+
+	// Create texture copy
+	D3D::drawShadedTexQuad(
+		(srcFormat == PEControl::Z24) ? FramebufferManager::GetEFBDepthTexture()->GetSRV() : FramebufferManager::GetEFBColorTexture()->GetSRV(),
+		&sourcerect, Renderer::GetTargetWidth(), Renderer::GetTargetHeight(),
+		(srcFormat == PEControl::Z24) ? PixelShaderCache::GetDepthMatrixProgram(true) : PixelShaderCache::GetColorMatrixProgram(true),
+		VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), GeometryShaderCache::GetCopyGeometryShader());
+
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+
+	g_renderer->RestoreAPIState();
+
+	if (!g_ActiveConfig.bSkipEFBCopyToRam)
+	{
+		u8* dst = Memory::GetPointer(dstAddr);
+		size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf);
+
+		size_in_bytes = (u32)encoded_size;
+
+		TextureCache::MakeRangeDynamic(dstAddr, (u32)encoded_size);
+
+		this->hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
+	}
+}
+
+const char palette_shader[] =
+R"HLSL(
+sampler samp0 : register(s0);
+Texture2DArray Tex0 : register(t0);
+Buffer<uint> Tex1 : register(t1);
+uniform float Multiply;
+
+uint Convert3To8(uint v)
+{
+	// Swizzle bits: 00000123 -> 12312312
+	return (v << 5) | (v << 2) | (v >> 1);
+}
+
+uint Convert4To8(uint v)
+{
+	// Swizzle bits: 00001234 -> 12341234
+	return (v << 4) | v;
+}
+
+uint Convert5To8(uint v)
+{
+	// Swizzle bits: 00012345 -> 12345123
+	return (v << 3) | (v >> 2);
+}
+
+uint Convert6To8(uint v)
+{
+	// Swizzle bits: 00123456 -> 12345612
+	return (v << 2) | (v >> 4);
+}
+
+float4 DecodePixel_RGB5A3(uint val)
+{
+	int r,g,b,a;
+	if ((val&0x8000))
+	{
+		r=Convert5To8((val>>10) & 0x1f);
+		g=Convert5To8((val>>5 ) & 0x1f);
+		b=Convert5To8((val    ) & 0x1f);
+		a=0xFF;
+	}
+	else
+	{
+		a=Convert3To8((val>>12) & 0x7);
+		r=Convert4To8((val>>8 ) & 0xf);
+		g=Convert4To8((val>>4 ) & 0xf);
+		b=Convert4To8((val    ) & 0xf);
+	}
+	return float4(r, g, b, a) / 255;
+}
+
+float4 DecodePixel_RGB565(uint val)
+{
+	int r, g, b, a;
+	r = Convert5To8((val >> 11) & 0x1f);
+	g = Convert6To8((val >> 5) & 0x3f);
+	b = Convert5To8((val) & 0x1f);
+	a = 0xFF;
+	return float4(r, g, b, a) / 255;
+}
+
+float4 DecodePixel_IA8(uint val)
+{
+	int i = val & 0xFF;
+	int a = val >> 8;
+	return float4(i, i, i, a) / 255;
+}
+
+void main(
+	out float4 ocol0 : SV_Target,
+	in float4 pos : SV_Position,
+	in float3 uv0 : TEXCOORD0)
+{
+	uint src = round(Tex0.Sample(samp0,uv0) * Multiply).r;
+	src = Tex1.Load(src);
+	src = ((src << 8) & 0xFF00) | (src >> 8);
+	ocol0 = DECODE(src);
+}
+)HLSL";
+
+void TextureCache::ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format)
+{
+	g_renderer->ResetAPIState();
+
+	// stretch picture with increased internal resolution
+	const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)unconverted->config.width, (float)unconverted->config.height);
+	D3D::context->RSSetViewports(1, &vp);
+
+	D3D11_BOX box{ 0, 0, 0, 512, 1, 1 };
+	D3D::context->UpdateSubresource(palette_buf, 0, &box, palette, 0, 0);
+
+	D3D::stateman->SetTexture(1, palette_buf_srv);
+
+	// TODO: Add support for C14X2 format.  (Different multiplier, more palette entries.)
+	float params[4] = { unconverted->format == 0 ? 15.f : 255.f };
+	D3D::context->UpdateSubresource(palette_uniform, 0, nullptr, &params, 0, 0);
+	D3D::stateman->SetPixelConstants(palette_uniform);
+
+	const D3D11_RECT sourcerect = CD3D11_RECT(0, 0, unconverted->config.width, unconverted->config.height);
+
+	D3D::SetPointCopySampler();
+
+	// Make sure we don't draw with the texture set as both a source and target.
+	// (This can happen because we don't unbind textures when we free them.)
+	D3D::stateman->UnsetTexture(static_cast<TCacheEntry*>(entry)->texture->GetSRV());
+
+	D3D::context->OMSetRenderTargets(1, &static_cast<TCacheEntry*>(entry)->texture->GetRTV(), nullptr);
+
+	// Create texture copy
+	D3D::drawShadedTexQuad(
+		static_cast<TCacheEntry*>(unconverted)->texture->GetSRV(),
+		&sourcerect, unconverted->config.width, unconverted->config.height,
+		palette_pixel_shader[format],
+		VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(),
+		GeometryShaderCache::GetCopyGeometryShader());
+
+	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
+
+	g_renderer->RestoreAPIState();
+}
+
+ID3D11PixelShader *GetConvertShader(const char* Type)
+{
+	std::string shader = "#define DECODE DecodePixel_";
+	shader.append(Type);
+	shader.append("\n");
+	shader.append(palette_shader);
+	return D3D::CompileAndCreatePixelShader(shader);
+}
+
+TextureCache::TextureCache()
+{
+	// FIXME: Is it safe here?
+	g_encoder = new PSTextureEncoder;
+	g_encoder->Init();
+
+	palette_buf = nullptr;
+	palette_buf_srv = nullptr;
+	palette_uniform = nullptr;
+	palette_pixel_shader[GX_TL_IA8] = GetConvertShader("IA8");
+	palette_pixel_shader[GX_TL_RGB565] = GetConvertShader("RGB565");
+	palette_pixel_shader[GX_TL_RGB5A3] = GetConvertShader("RGB5A3");
+	auto lutBd = CD3D11_BUFFER_DESC(sizeof(u16) * 256, D3D11_BIND_SHADER_RESOURCE);
+	HRESULT hr = D3D::device->CreateBuffer(&lutBd, nullptr, &palette_buf);
+	CHECK(SUCCEEDED(hr), "create palette decoder lut buffer");
+	D3D::SetDebugObjectName(palette_buf, "texture decoder lut buffer");
+	// TODO: C14X2 format.
+	auto outlutUavDesc = CD3D11_SHADER_RESOURCE_VIEW_DESC(palette_buf, DXGI_FORMAT_R16_UINT, 0, 256, 0);
+	hr = D3D::device->CreateShaderResourceView(palette_buf, &outlutUavDesc, &palette_buf_srv);
+	CHECK(SUCCEEDED(hr), "create palette decoder lut srv");
+	D3D::SetDebugObjectName(palette_buf_srv, "texture decoder lut srv");
+	const D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(16, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
+	hr = D3D::device->CreateBuffer(&cbdesc, nullptr, &palette_uniform);
+	CHECK(SUCCEEDED(hr), "Create palette decoder constant buffer");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)palette_uniform, "a constant buffer used in TextureCache::CopyRenderTargetToTexture");
+}
+
+TextureCache::~TextureCache()
+{
+	for (unsigned int k = 0; k < MAX_COPY_BUFFERS; ++k)
+		SAFE_RELEASE(efbcopycbuf[k]);
+
+	g_encoder->Shutdown();
+	delete g_encoder;
+	g_encoder = nullptr;
+
+	SAFE_RELEASE(palette_buf);
+	SAFE_RELEASE(palette_buf_srv);
+	SAFE_RELEASE(palette_uniform);
+	for (ID3D11PixelShader*& shader : palette_pixel_shader)
+		SAFE_RELEASE(shader);
+}
+
+}
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.h b/Source/Core/VideoBackends/D3D/TextureCache.h
new file mode 100644
index 0000000000..7621e86fa3
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/TextureCache.h
@@ -0,0 +1,56 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/D3D/D3DTexture.h"
+#include "VideoCommon/TextureCacheBase.h"
+
+namespace DX11
+{
+
+class TextureCache : public ::TextureCache
+{
+public:
+	TextureCache();
+	~TextureCache();
+
+private:
+	struct TCacheEntry : TCacheEntryBase
+	{
+		D3DTexture2D *const texture;
+
+		D3D11_USAGE usage;
+
+		TCacheEntry(const TCacheEntryConfig& config, D3DTexture2D *_tex) : TCacheEntryBase(config), texture(_tex) {}
+		~TCacheEntry();
+
+		void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int levels) override;
+
+		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
+			PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
+			const float *colmat) override;
+
+		void Bind(unsigned int stage) override;
+		bool Save(const std::string& filename, unsigned int level) override;
+	};
+
+	TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) override;
+
+	u64 EncodeToRamFromTexture(u32 address, void* source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) {return 0;};
+
+	void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) override;
+
+	void CompileShaders() override { }
+	void DeleteShaders() override { }
+
+	ID3D11Buffer* palette_buf;
+	ID3D11ShaderResourceView* palette_buf_srv;
+	ID3D11Buffer* palette_uniform;
+	ID3D11PixelShader* palette_pixel_shader[3];
+};
+
+}
diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h
new file mode 100644
index 0000000000..7c298f3f81
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h
@@ -0,0 +1,120 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace DX11
+{
+
+// 4-bit format: 8x8 texels / cache line
+// 8-bit format: 8x4 texels / cache line
+// 16-bit format: 4x4 texels / cache line
+// 32-bit format: 4x4 texels / 2 cache lines
+// Compressed format: 8x8 texels / cache line
+
+// Document EFB encoding formats here with examples of where they are used.
+
+// Format: 0 - R4
+// Used in The Legend of Zelda: The Wind Waker for character shadows (srcFormat 1,
+// isIntensity 1, scaleByHalf 1).
+
+// Format: 1 - R8
+// FIXME: Unseen. May or may not be a duplicate of format 8.
+
+// Format: 2 - A4 R4
+// FIXME: Unseen.
+
+// Format: 3 - A8 R8
+// FIXME: Unseen.
+
+// Format: 4 - R5 G6 B5
+// Used in Wind Waker for most render-to-texture effects like heat shimmer and
+// depth-of-field.
+
+// Format: 5 - 1 R5 G5 B5 or 0 A3 R4 G4 B4
+// Used in Twilight Princess for character shadows.
+
+// Format: 6 - A8 R8 A8 R8 | G8 B8 G8 B8
+// Used in Twilight Princess for bloom effect.
+
+// Format: 7 - A8
+// Used in Metroid Prime 2 for the scan visor.
+
+// Format: 8 - R8
+// Used in Twilight Princess for the map.
+
+// Format: 9 - G8
+// FIXME: Unseen.
+
+// Format: A - B8
+// Used in Metroid Prime 2 for the scan visor.
+
+// Format: B - G8 R8
+// Used in Wind Waker for depth-of-field. Usually used with srcFormat 3 to
+// render depth textures. The bytes are swapped, so games have to correct it
+// in RAM before using it as a texture.
+
+// Format: C - B8 G8
+// FIXME: Unseen.
+
+const unsigned int BLOCK_WIDTHS[16] = {
+	8, // R4
+	8, // R8 (FIXME: duplicate of R8 below?)
+	8, // A4 R4
+	4, // A8 R8
+	4, // R5 G6 B5
+	4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4
+	4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines)
+	8, // A8
+	8, // R8 (FIXME: duplicate of R8 above?)
+	8, // G8
+	8, // B8
+	4, // G8 R8
+	4, // B8 G8
+	0, 0, 0 // Unknown formats
+};
+
+const unsigned int BLOCK_HEIGHTS[16] = {
+	8, // R4
+	4, // R8 (FIXME: duplicate of R8 below?)
+	4, // A4 R4
+	4, // A8 R8
+	4, // R5 G6 B5
+	4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4
+	4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines)
+	4, // A8
+	4, // R8 (FIXME: duplicate of R8 above?)
+	4, // G8
+	4, // B8
+	4, // G8 R8
+	4, // B8 G8
+	0, 0, 0 // Unknown formats
+};
+
+// Maximum number of bytes that can occur in a texture block-row generated by
+// the encoder
+static const UINT MAX_BYTES_PER_BLOCK_ROW = (EFB_WIDTH/4)*64;
+// The maximum amount of data that the texture encoder can generate in one call
+static const UINT MAX_BYTES_PER_ENCODE = MAX_BYTES_PER_BLOCK_ROW*(EFB_HEIGHT/4);
+
+class TextureEncoder
+{
+
+public:
+
+	virtual ~TextureEncoder() { }
+
+	virtual void Init() = 0;
+	virtual void Shutdown() = 0;
+	// Returns size in bytes of encoded block of memory
+	virtual size_t Encode(u8* dst, unsigned int dstFormat,
+		PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+		bool isIntensity, bool scaleByHalf) = 0;
+
+};
+
+}
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp
new file mode 100644
index 0000000000..1c1d81f157
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp
@@ -0,0 +1,198 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/D3D/BoundingBox.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/MainBase.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+// TODO: Find sensible values for these two
+const u32 MAX_IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * sizeof(u16) * 8;
+const u32 MAX_VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE;
+const u32 MAX_BUFFER_SIZE = MAX_IBUFFER_SIZE + MAX_VBUFFER_SIZE;
+
+void VertexManager::CreateDeviceObjects()
+{
+	D3D11_BUFFER_DESC bufdesc = CD3D11_BUFFER_DESC(MAX_BUFFER_SIZE,
+		D3D11_BIND_INDEX_BUFFER | D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+
+	m_vertexDrawOffset = 0;
+	m_indexDrawOffset = 0;
+
+	for (int i = 0; i < MAX_BUFFER_COUNT; i++)
+	{
+		m_buffers[i] = nullptr;
+		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, nullptr, &m_buffers[i])), "Failed to create buffer.");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_buffers[i], "Buffer of VertexManager");
+	}
+
+	m_currentBuffer = 0;
+	m_bufferCursor = MAX_BUFFER_SIZE;
+}
+
+void VertexManager::DestroyDeviceObjects()
+{
+	for (int i = 0; i < MAX_BUFFER_COUNT; i++)
+	{
+		SAFE_RELEASE(m_buffers[i]);
+	}
+
+}
+
+VertexManager::VertexManager()
+{
+	LocalVBuffer.resize(MAXVBUFFERSIZE);
+
+	s_pCurBufferPointer = s_pBaseBufferPointer = &LocalVBuffer[0];
+	s_pEndBufferPointer = s_pBaseBufferPointer + LocalVBuffer.size();
+
+	LocalIBuffer.resize(MAXIBUFFERSIZE);
+
+	CreateDeviceObjects();
+}
+
+VertexManager::~VertexManager()
+{
+	DestroyDeviceObjects();
+}
+
+void VertexManager::PrepareDrawBuffers(u32 stride)
+{
+	D3D11_MAPPED_SUBRESOURCE map;
+
+	u32 vertexBufferSize = u32(s_pCurBufferPointer - s_pBaseBufferPointer);
+	u32 indexBufferSize = IndexGenerator::GetIndexLen() * sizeof(u16);
+	u32 totalBufferSize = vertexBufferSize + indexBufferSize;
+
+	u32 cursor = m_bufferCursor;
+	u32 padding = m_bufferCursor % stride;
+	if (padding)
+	{
+		cursor += stride - padding;
+	}
+
+	D3D11_MAP MapType = D3D11_MAP_WRITE_NO_OVERWRITE;
+	if (cursor + totalBufferSize >= MAX_BUFFER_SIZE)
+	{
+		// Wrap around
+		m_currentBuffer = (m_currentBuffer + 1) % MAX_BUFFER_COUNT;
+		cursor = 0;
+		MapType = D3D11_MAP_WRITE_DISCARD;
+	}
+
+	m_vertexDrawOffset = cursor;
+	m_indexDrawOffset = cursor + vertexBufferSize;
+
+	D3D::context->Map(m_buffers[m_currentBuffer], 0, MapType, 0, &map);
+	u8* mappedData = reinterpret_cast<u8*>(map.pData);
+	memcpy(mappedData + m_vertexDrawOffset, s_pBaseBufferPointer, vertexBufferSize);
+	memcpy(mappedData + m_indexDrawOffset, GetIndexBuffer(), indexBufferSize);
+	D3D::context->Unmap(m_buffers[m_currentBuffer], 0);
+
+	m_bufferCursor = cursor + totalBufferSize;
+
+	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vertexBufferSize);
+	ADDSTAT(stats.thisFrame.bytesIndexStreamed, indexBufferSize);
+}
+
+void VertexManager::Draw(u32 stride)
+{
+	u32 indices = IndexGenerator::GetIndexLen();
+
+	D3D::stateman->SetVertexBuffer(m_buffers[m_currentBuffer], stride, 0);
+	D3D::stateman->SetIndexBuffer(m_buffers[m_currentBuffer]);
+
+	u32 baseVertex = m_vertexDrawOffset / stride;
+	u32 startIndex = m_indexDrawOffset / sizeof(u16);
+
+	switch (current_primitive_type)
+	{
+		case PRIMITIVE_POINTS:
+			D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
+			((DX11::Renderer*)g_renderer)->ApplyCullDisable();
+			break;
+		case PRIMITIVE_LINES:
+			D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
+			((DX11::Renderer*)g_renderer)->ApplyCullDisable();
+			break;
+		case PRIMITIVE_TRIANGLES:
+			D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+			break;
+	}
+
+	D3D::stateman->Apply();
+	D3D::context->DrawIndexed(indices, startIndex, baseVertex);
+
+	INCSTAT(stats.thisFrame.numDrawCalls);
+
+	if (current_primitive_type != PRIMITIVE_TRIANGLES)
+		((DX11::Renderer*)g_renderer)->RestoreCull();
+}
+
+void VertexManager::vFlush(bool useDstAlpha)
+{
+	u32 components = VertexLoaderManager::GetCurrentVertexFormat()->m_components;
+
+	if (!PixelShaderCache::SetShader(
+		useDstAlpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, components))
+	{
+		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
+		return;
+	}
+
+	if (!VertexShaderCache::SetShader(components))
+	{
+		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
+		return;
+	}
+
+	if (!GeometryShaderCache::SetShader(current_primitive_type))
+	{
+		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); });
+		return;
+	}
+
+	if (g_ActiveConfig.backend_info.bSupportsBBox && BoundingBox::active)
+	{
+		D3D::context->OMSetRenderTargetsAndUnorderedAccessViews(D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, nullptr, nullptr, 2, 1, &BBox::GetUAV(), nullptr);
+	}
+
+	u32 stride = VertexLoaderManager::GetCurrentVertexFormat()->GetVertexStride();
+
+	PrepareDrawBuffers(stride);
+
+	VertexLoaderManager::GetCurrentVertexFormat()->SetupVertexPointers();
+	g_renderer->ApplyState(useDstAlpha);
+
+	Draw(stride);
+
+	g_renderer->RestoreState();
+}
+
+void VertexManager::ResetBuffer(u32 stride)
+{
+	s_pCurBufferPointer = s_pBaseBufferPointer;
+	IndexGenerator::Start(GetIndexBuffer());
+}
+
+}  // namespace
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h
new file mode 100644
index 0000000000..03a1385ab7
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/VertexManager.h
@@ -0,0 +1,45 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/VertexManagerBase.h"
+
+namespace DX11
+{
+
+class VertexManager : public ::VertexManager
+{
+public:
+	VertexManager();
+	~VertexManager();
+
+	NativeVertexFormat* CreateNativeVertexFormat() override;
+	void CreateDeviceObjects() override;
+	void DestroyDeviceObjects() override;
+
+protected:
+	virtual void ResetBuffer(u32 stride) override;
+	u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
+
+private:
+
+	void PrepareDrawBuffers(u32 stride);
+	void Draw(u32 stride);
+	// temp
+	void vFlush(bool useDstAlpha) override;
+
+	u32 m_vertexDrawOffset;
+	u32 m_indexDrawOffset;
+	u32 m_currentBuffer;
+	u32 m_bufferCursor;
+
+	enum { MAX_BUFFER_COUNT = 2 };
+	ID3D11Buffer* m_buffers[MAX_BUFFER_COUNT];
+
+	std::vector<u8> LocalVBuffer;
+	std::vector<u16> LocalIBuffer;
+};
+
+}  // namespace
diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
new file mode 100644
index 0000000000..d7c998c138
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
@@ -0,0 +1,267 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/LinearDiskCache.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/Globals.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VertexShaderManager.h"
+
+namespace DX11 {
+
+VertexShaderCache::VSCache VertexShaderCache::vshaders;
+const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
+VertexShaderUid VertexShaderCache::last_uid;
+UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
+
+static ID3D11VertexShader* SimpleVertexShader = nullptr;
+static ID3D11VertexShader* ClearVertexShader = nullptr;
+static ID3D11InputLayout* SimpleLayout = nullptr;
+static ID3D11InputLayout* ClearLayout = nullptr;
+
+LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
+
+ID3D11VertexShader* VertexShaderCache::GetSimpleVertexShader() { return SimpleVertexShader; }
+ID3D11VertexShader* VertexShaderCache::GetClearVertexShader() { return ClearVertexShader; }
+ID3D11InputLayout* VertexShaderCache::GetSimpleInputLayout() { return SimpleLayout; }
+ID3D11InputLayout* VertexShaderCache::GetClearInputLayout() { return ClearLayout; }
+
+ID3D11Buffer* vscbuf = nullptr;
+
+ID3D11Buffer* &VertexShaderCache::GetConstantBuffer()
+{
+	// TODO: divide the global variables of the generated shaders into about 5 constant buffers to speed this up
+	if (VertexShaderManager::dirty)
+	{
+		D3D11_MAPPED_SUBRESOURCE map;
+		D3D::context->Map(vscbuf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+		memcpy(map.pData, &VertexShaderManager::constants, sizeof(VertexShaderConstants));
+		D3D::context->Unmap(vscbuf, 0);
+		VertexShaderManager::dirty = false;
+
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(VertexShaderConstants));
+	}
+	return vscbuf;
+}
+
+// this class will load the precompiled shaders into our cache
+class VertexShaderCacheInserter : public LinearDiskCacheReader<VertexShaderUid, u8>
+{
+public:
+	void Read(const VertexShaderUid &key, const u8* value, u32 value_size)
+	{
+		D3DBlob* blob = new D3DBlob(value_size, value);
+		VertexShaderCache::InsertByteCode(key, blob);
+		blob->Release();
+
+	}
+};
+
+const char simple_shader_code[] = {
+	"struct VSOUTPUT\n"
+	"{\n"
+	"float4 vPosition : POSITION;\n"
+	"float3 vTexCoord : TEXCOORD0;\n"
+	"float  vTexCoord1 : TEXCOORD1;\n"
+	"};\n"
+	"VSOUTPUT main(float4 inPosition : POSITION,float4 inTEX0 : TEXCOORD0)\n"
+	"{\n"
+	"VSOUTPUT OUT;\n"
+	"OUT.vPosition = inPosition;\n"
+	"OUT.vTexCoord = inTEX0.xyz;\n"
+	"OUT.vTexCoord1 = inTEX0.w;\n"
+	"return OUT;\n"
+	"}\n"
+};
+
+const char clear_shader_code[] = {
+	"struct VSOUTPUT\n"
+	"{\n"
+	"float4 vPosition   : POSITION;\n"
+	"float4 vColor0   : COLOR0;\n"
+	"};\n"
+	"VSOUTPUT main(float4 inPosition : POSITION,float4 inColor0: COLOR0)\n"
+	"{\n"
+	"VSOUTPUT OUT;\n"
+	"OUT.vPosition = inPosition;\n"
+	"OUT.vColor0 = inColor0;\n"
+	"return OUT;\n"
+	"}\n"
+};
+
+void VertexShaderCache::Init()
+{
+	const D3D11_INPUT_ELEMENT_DESC simpleelems[2] =
+	{
+		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+
+	};
+	const D3D11_INPUT_ELEMENT_DESC clearelems[2] =
+	{
+		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+		{ "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+	};
+
+	unsigned int cbsize = ROUND_UP(sizeof(VertexShaderConstants), 16); // must be a multiple of 16
+	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+	HRESULT hr = D3D::device->CreateBuffer(&cbdesc, nullptr, &vscbuf);
+	CHECK(hr==S_OK, "Create vertex shader constant buffer (size=%u)", cbsize);
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)vscbuf, "vertex shader constant buffer used to emulate the GX pipeline");
+
+	D3DBlob* blob;
+	D3D::CompileVertexShader(simple_shader_code, &blob);
+	D3D::device->CreateInputLayout(simpleelems, 2, blob->Data(), blob->Size(), &SimpleLayout);
+	SimpleVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
+	if (SimpleLayout == nullptr || SimpleVertexShader == nullptr)
+		PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
+	blob->Release();
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleVertexShader, "simple vertex shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleLayout, "simple input layout");
+
+	D3D::CompileVertexShader(clear_shader_code, &blob);
+	D3D::device->CreateInputLayout(clearelems, 2, blob->Data(), blob->Size(), &ClearLayout);
+	ClearVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
+	if (ClearLayout == nullptr || ClearVertexShader == nullptr)
+		PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
+	blob->Release();
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearVertexShader, "clear vertex shader");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearLayout, "clear input layout");
+
+	Clear();
+
+	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
+		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
+
+	SETSTAT(stats.numVertexShadersCreated, 0);
+	SETSTAT(stats.numVertexShadersAlive, 0);
+
+	std::string cache_filename = StringFromFormat("%sdx11-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
+	VertexShaderCacheInserter inserter;
+	g_vs_disk_cache.OpenAndRead(cache_filename, inserter);
+
+	if (g_Config.bEnableShaderDebugging)
+		Clear();
+
+	last_entry = nullptr;
+}
+
+void VertexShaderCache::Clear()
+{
+	for (auto& iter : vshaders)
+		iter.second.Destroy();
+	vshaders.clear();
+	vertex_uid_checker.Invalidate();
+
+	last_entry = nullptr;
+}
+
+void VertexShaderCache::Shutdown()
+{
+	SAFE_RELEASE(vscbuf);
+
+	SAFE_RELEASE(SimpleVertexShader);
+	SAFE_RELEASE(ClearVertexShader);
+
+	SAFE_RELEASE(SimpleLayout);
+	SAFE_RELEASE(ClearLayout);
+
+	Clear();
+	g_vs_disk_cache.Sync();
+	g_vs_disk_cache.Close();
+}
+
+bool VertexShaderCache::SetShader(u32 components)
+{
+	VertexShaderUid uid;
+	GetVertexShaderUid(uid, components, API_D3D);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		VertexShaderCode code;
+		GenerateVertexShaderCode(code, components, API_D3D);
+		vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
+	}
+
+	if (last_entry)
+	{
+		if (uid == last_uid)
+		{
+			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+			return (last_entry->shader != nullptr);
+		}
+	}
+
+	last_uid = uid;
+
+	VSCache::iterator iter = vshaders.find(uid);
+	if (iter != vshaders.end())
+	{
+		const VSCacheEntry &entry = iter->second;
+		last_entry = &entry;
+
+		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+		return (entry.shader != nullptr);
+	}
+
+	VertexShaderCode code;
+	GenerateVertexShaderCode(code, components, API_D3D);
+
+	D3DBlob* pbytecode = nullptr;
+	D3D::CompileVertexShader(code.GetBuffer(), &pbytecode);
+
+	if (pbytecode == nullptr)
+	{
+		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
+		return false;
+	}
+	g_vs_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size());
+
+	bool success = InsertByteCode(uid, pbytecode);
+	pbytecode->Release();
+
+	if (g_ActiveConfig.bEnableShaderDebugging && success)
+	{
+		vshaders[uid].code = code.GetBuffer();
+	}
+
+	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+	return success;
+}
+
+bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob)
+{
+	ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob);
+	if (shader == nullptr)
+		return false;
+
+	// TODO: Somehow make the debug name a bit more specific
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a vertex shader of VertexShaderCache");
+
+	// Make an entry in the table
+	VSCacheEntry entry;
+	entry.shader = shader;
+	entry.SetByteCode(bcodeblob);
+
+	vshaders[uid] = entry;
+	last_entry = &vshaders[uid];
+
+	INCSTAT(stats.numVertexShadersCreated);
+	SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
+
+	return true;
+}
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.h b/Source/Core/VideoBackends/D3D/VertexShaderCache.h
new file mode 100644
index 0000000000..126eb16ae1
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.h
@@ -0,0 +1,65 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBlob.h"
+
+#include "VideoCommon/VertexShaderGen.h"
+
+namespace DX11 {
+
+class VertexShaderCache
+{
+public:
+	static void Init();
+	static void Clear();
+	static void Shutdown();
+	static bool SetShader(u32 components); // TODO: Should be renamed to LoadShader
+
+	static ID3D11VertexShader* GetActiveShader() { return last_entry->shader; }
+	static D3DBlob* GetActiveShaderBytecode() { return last_entry->bytecode; }
+	static ID3D11Buffer* &GetConstantBuffer();
+
+	static ID3D11VertexShader* GetSimpleVertexShader();
+	static ID3D11VertexShader* GetClearVertexShader();
+	static ID3D11InputLayout* GetSimpleInputLayout();
+	static ID3D11InputLayout* GetClearInputLayout();
+
+	static bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob);
+
+private:
+	struct VSCacheEntry
+	{
+		ID3D11VertexShader* shader;
+		D3DBlob* bytecode; // needed to initialize the input layout
+
+		std::string code;
+
+		VSCacheEntry() : shader(nullptr), bytecode(nullptr) {}
+		void SetByteCode(D3DBlob* blob)
+		{
+			SAFE_RELEASE(bytecode);
+			bytecode = blob;
+			blob->AddRef();
+		}
+		void Destroy()
+		{
+			SAFE_RELEASE(shader);
+			SAFE_RELEASE(bytecode);
+		}
+	};
+	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
+
+	static VSCache vshaders;
+	static const VSCacheEntry* last_entry;
+	static VertexShaderUid last_uid;
+
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
+};
+
+}  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
new file mode 100644
index 0000000000..7ab12f7d9d
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -0,0 +1,32 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace DX11
+{
+
+class VideoBackend : public VideoBackendHardware
+{
+	bool Initialize(void*) override;
+	void Shutdown() override;
+
+	std::string GetName() const override;
+	std::string GetDisplayName() const override;
+
+	void Video_Prepare() override;
+	void Video_Cleanup() override;
+
+	void ShowConfig(void* parent) override;
+
+	unsigned int PeekMessages() override;
+
+	void* m_window_handle;
+};
+
+}
+
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp
similarity index 80%
rename from Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
rename to Source/Core/VideoBackends/D3D/XFBEncoder.cpp
index bc6c66d29b..560b13fa7a 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
+++ b/Source/Core/VideoBackends/D3D/XFBEncoder.cpp
@@ -1,15 +1,14 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "XFBEncoder.h"
-
-#include "D3DBase.h"
-#include "D3DBlob.h"
-#include "D3DShader.h"
-#include "Render.h"
-#include "GfxState.h"
-#include "FramebufferManager.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBlob.h"
+#include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/XFBEncoder.h"
 
 namespace DX11
 {
@@ -79,7 +78,7 @@ static const char XFB_ENCODE_PS[] =
 	"} Params;\n"
 "}\n"
 
-"Texture2D EFBTexture : register(t0);\n"
+"Texture2DArray EFBTexture : register(t0);\n"
 "sampler EFBSampler : register(s0);\n"
 
 // GameCube/Wii uses the BT.601 standard algorithm for converting to YCbCr; see
@@ -93,12 +92,13 @@ static const char XFB_ENCODE_PS[] =
 "float3 SampleEFB(float2 coord)\n"
 "{\n"
 	"float2 texCoord = lerp(float2(Params.TexLeft,Params.TexTop), float2(Params.TexRight,Params.TexBottom), coord / float2(Params.Width,Params.Height));\n"
-	"return EFBTexture.Sample(EFBSampler, texCoord).rgb;\n"
+	"return EFBTexture.Sample(EFBSampler, float3(texCoord, 0.0)).rgb;\n"
 "}\n"
 
 "void main(out float4 ocol0 : SV_Target, in float4 Pos : SV_Position, in float2 Coord : ENCODECOORD)\n"
 "{\n"
-	"float2 baseCoord = Coord * float2(2,1);\n"
+	// Multiplying X by 2, moves pixel centers from (x+0.5) to (2x+1) instead of (2x+0.5), so subtract 0.5 to compensate
+	"float2 baseCoord = Coord * float2(2,1) - float2(0.5,0);\n"
 	// FIXME: Shall we apply gamma here, or apply it below to the Y components?
 	// Be careful if you apply it to Y! The Y components are in the range (16..235) / 255.
 	"float3 sampleL = pow(abs(SampleEFB(baseCoord+float2(-1,0))), Params.Gamma);\n" // Left
@@ -131,10 +131,10 @@ static const struct QuadVertex
 } QUAD_VERTS[4] = { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } };
 
 XFBEncoder::XFBEncoder()
-	: m_out(NULL), m_outRTV(NULL), m_outStage(NULL), m_encodeParams(NULL),
-	m_quad(NULL), m_vShader(NULL), m_quadLayout(NULL), m_pShader(NULL),
-	m_xfbEncodeBlendState(NULL), m_xfbEncodeDepthState(NULL),
-	m_xfbEncodeRastState(NULL), m_efbSampler(NULL)
+	: m_out(nullptr), m_outRTV(nullptr), m_outStage(nullptr), m_encodeParams(nullptr),
+	m_quad(nullptr), m_vShader(nullptr), m_quadLayout(nullptr), m_pShader(nullptr),
+	m_xfbEncodeBlendState(nullptr), m_xfbEncodeDepthState(nullptr),
+	m_xfbEncodeRastState(nullptr), m_efbSampler(nullptr)
 { }
 
 void XFBEncoder::Init()
@@ -148,7 +148,7 @@ void XFBEncoder::Init()
 	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
 		DXGI_FORMAT_R8G8B8A8_UNORM, MAX_XFB_WIDTH/2, MAX_XFB_HEIGHT, 1, 1,
 		D3D11_BIND_RENDER_TARGET);
-	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_out);
+	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_out);
 	CHECK(SUCCEEDED(hr), "create xfb encoder output texture");
 	D3D::SetDebugObjectName(m_out, "xfb encoder output texture");
 
@@ -165,7 +165,7 @@ void XFBEncoder::Init()
 	t2dd.Usage = D3D11_USAGE_STAGING;
 	t2dd.BindFlags = 0;
 	t2dd.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_outStage);
+	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_outStage);
 	CHECK(SUCCEEDED(hr), "create xfb encoder output staging buffer");
 	D3D::SetDebugObjectName(m_outStage, "xfb encoder output staging buffer");
 
@@ -173,7 +173,7 @@ void XFBEncoder::Init()
 
 	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(XFBEncodeParams),
 		D3D11_BIND_CONSTANT_BUFFER);
-	hr = D3D::device->CreateBuffer(&bd, NULL, &m_encodeParams);
+	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_encodeParams);
 	CHECK(SUCCEEDED(hr), "create xfb encode params buffer");
 	D3D::SetDebugObjectName(m_encodeParams, "xfb encoder params buffer");
 
@@ -189,14 +189,14 @@ void XFBEncoder::Init()
 
 	// Create vertex shader
 
-	D3DBlob* bytecode = NULL;
-	if (!D3D::CompileVertexShader(XFB_ENCODE_VS, sizeof(XFB_ENCODE_VS), &bytecode))
+	D3DBlob* bytecode = nullptr;
+	if (!D3D::CompileVertexShader(XFB_ENCODE_VS, &bytecode))
 	{
 		ERROR_LOG(VIDEO, "XFB encode vertex shader failed to compile");
 		return;
 	}
 
-	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), NULL, &m_vShader);
+	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), nullptr, &m_vShader);
 	CHECK(SUCCEEDED(hr), "create xfb encode vertex shader");
 	D3D::SetDebugObjectName(m_vShader, "xfb encoder vertex shader");
 
@@ -212,7 +212,7 @@ void XFBEncoder::Init()
 
 	// Create pixel shader
 
-	m_pShader = D3D::CompileAndCreatePixelShader(XFB_ENCODE_PS, sizeof(XFB_ENCODE_PS));
+	m_pShader = D3D::CompileAndCreatePixelShader(XFB_ENCODE_PS);
 	if (!m_pShader)
 	{
 		ERROR_LOG(VIDEO, "XFB encode pixel shader failed to compile");
@@ -280,22 +280,22 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
 
 	// Set up all the state for XFB encoding
 
-	D3D::context->PSSetShader(m_pShader, NULL, 0);
-	D3D::context->VSSetShader(m_vShader, NULL, 0);
+	D3D::stateman->SetPixelShader(m_pShader);
+	D3D::stateman->SetVertexShader(m_vShader);
+	D3D::stateman->SetGeometryShader(nullptr);
 
 	D3D::stateman->PushBlendState(m_xfbEncodeBlendState);
 	D3D::stateman->PushDepthState(m_xfbEncodeDepthState);
 	D3D::stateman->PushRasterizerState(m_xfbEncodeRastState);
-	D3D::stateman->Apply();
 
 	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, FLOAT(width/2), FLOAT(height));
 	D3D::context->RSSetViewports(1, &vp);
 
-	D3D::context->IASetInputLayout(m_quadLayout);
-	D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+	D3D::stateman->SetInputLayout(m_quadLayout);
+	D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 	UINT stride = sizeof(QuadVertex);
 	UINT offset = 0;
-	D3D::context->IASetVertexBuffers(0, 1, &m_quad, &stride, &offset);
+	D3D::stateman->SetVertexBuffer(m_quad, stride, offset);
 
 	TargetRectangle targetRect = g_renderer->ConvertEFBRectangle(srcRect);
 
@@ -307,20 +307,20 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
 	params.TexRight = FLOAT(targetRect.right) / g_renderer->GetTargetWidth();
 	params.TexBottom = FLOAT(targetRect.bottom) / g_renderer->GetTargetHeight();
 	params.Gamma = gamma;
-	D3D::context->UpdateSubresource(m_encodeParams, 0, NULL, &params, 0, 0);
+	D3D::context->UpdateSubresource(m_encodeParams, 0, nullptr, &params, 0, 0);
 
-	D3D::context->VSSetConstantBuffers(0, 1, &m_encodeParams);
+	D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr);
 
-	D3D::context->OMSetRenderTargets(1, &m_outRTV, NULL);
+	ID3D11ShaderResourceView* pEFB = FramebufferManager::GetResolvedEFBColorTexture()->GetSRV();
 
-	ID3D11ShaderResourceView* pEFB = FramebufferManager::GetEFBColorTexture()->GetSRV();
-
-	D3D::context->PSSetConstantBuffers(0, 1, &m_encodeParams);
-	D3D::context->PSSetShaderResources(0, 1, &pEFB);
-	D3D::context->PSSetSamplers(0, 1, &m_efbSampler);
+	D3D::stateman->SetVertexConstants(m_encodeParams);
+	D3D::stateman->SetPixelConstants(m_encodeParams);
+	D3D::stateman->SetTexture(0, pEFB);
+	D3D::stateman->SetSampler(0, m_efbSampler);
 
 	// Encode!
 
+	D3D::stateman->Apply();
 	D3D::context->Draw(4, 0);
 
 	// Copy to staging buffer
@@ -330,23 +330,20 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
 
 	// Clean up state
 
-	IUnknown* nullDummy = NULL;
+	D3D::context->OMSetRenderTargets(0, nullptr, nullptr);
 
-	D3D::context->PSSetSamplers(0, 1, (ID3D11SamplerState**)&nullDummy);
-	D3D::context->PSSetShaderResources(0, 1, (ID3D11ShaderResourceView**)&nullDummy);
-	D3D::context->PSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
+	D3D::stateman->SetSampler(0, nullptr);
+	D3D::stateman->SetTexture(0, nullptr);
+	D3D::stateman->SetPixelConstants(nullptr);
+	D3D::stateman->SetVertexConstants(nullptr);
 
-	D3D::context->OMSetRenderTargets(0, NULL, NULL);
-
-	D3D::context->VSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
+	D3D::stateman->SetPixelShader(nullptr);
+	D3D::stateman->SetVertexShader(nullptr);
 
 	D3D::stateman->PopRasterizerState();
 	D3D::stateman->PopDepthState();
 	D3D::stateman->PopBlendState();
 
-	D3D::context->PSSetShader(NULL, NULL, 0);
-	D3D::context->VSSetShader(NULL, NULL, 0);
-
 	// Transfer staging buffer to GameCube/Wii RAM
 
 	D3D11_MAPPED_SUBRESOURCE map = { 0 };
@@ -364,8 +361,8 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
 	D3D::context->Unmap(m_outStage, 0);
 
 	// Restore API
-
 	g_renderer->RestoreAPIState();
+	D3D::stateman->Apply(); // force unbind efb texture as shader resource
 	D3D::context->OMSetRenderTargets(1,
 		&FramebufferManager::GetEFBColorTexture()->GetRTV(),
 		FramebufferManager::GetEFBDepthTexture()->GetDSV());
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h b/Source/Core/VideoBackends/D3D/XFBEncoder.h
similarity index 86%
rename from Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
rename to Source/Core/VideoBackends/D3D/XFBEncoder.h
index c96e683ceb..b1ab0969b8 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
+++ b/Source/Core/VideoBackends/D3D/XFBEncoder.h
@@ -1,11 +1,10 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _XFBENCODER_H
-#define _XFBENCODER_H
+#pragma once
 
-#include "VideoCommon.h"
+#include "VideoCommon/VideoCommon.h"
 
 struct ID3D11Texture2D;
 struct ID3D11RenderTargetView;
@@ -51,5 +50,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
new file mode 100644
index 0000000000..e6f0074f1b
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -0,0 +1,239 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+
+#include "VideoBackends/D3D/BoundingBox.h"
+#include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DUtil.h"
+#include "VideoBackends/D3D/GeometryShaderCache.h"
+#include "VideoBackends/D3D/Globals.h"
+#include "VideoBackends/D3D/PerfQuery.h"
+#include "VideoBackends/D3D/PixelShaderCache.h"
+#include "VideoBackends/D3D/TextureCache.h"
+#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
+#include "VideoBackends/D3D/VideoBackend.h"
+
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace DX11
+{
+
+unsigned int VideoBackend::PeekMessages()
+{
+	MSG msg;
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+	{
+		if (msg.message == WM_QUIT)
+			return FALSE;
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+	return TRUE;
+}
+
+std::string VideoBackend::GetName() const
+{
+	return "D3D";
+}
+
+std::string VideoBackend::GetDisplayName() const
+{
+	return "Direct3D";
+}
+
+void InitBackendInfo()
+{
+	HRESULT hr = DX11::D3D::LoadDXGI();
+	if (SUCCEEDED(hr)) hr = DX11::D3D::LoadD3D();
+	if (FAILED(hr))
+	{
+		DX11::D3D::UnloadDXGI();
+		return;
+	}
+
+	g_Config.backend_info.APIType = API_D3D;
+	g_Config.backend_info.bSupportsExclusiveFullscreen = true;
+	g_Config.backend_info.bSupportsDualSourceBlend = true;
+	g_Config.backend_info.bSupportsPrimitiveRestart = true;
+	g_Config.backend_info.bSupportsOversizedViewports = false;
+	g_Config.backend_info.bSupportsGeometryShaders = true;
+	g_Config.backend_info.bSupports3DVision = true;
+	g_Config.backend_info.bSupportsPostProcessing = false;
+	g_Config.backend_info.bSupportsPaletteConversion = true;
+	g_Config.backend_info.bSupportsClipControl = false;
+
+	IDXGIFactory* factory;
+	IDXGIAdapter* ad;
+	hr = DX11::PCreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&factory);
+	if (FAILED(hr))
+		PanicAlert("Failed to create IDXGIFactory object");
+
+	// adapters
+	g_Config.backend_info.Adapters.clear();
+	g_Config.backend_info.AAModes.clear();
+	while (factory->EnumAdapters((UINT)g_Config.backend_info.Adapters.size(), &ad) != DXGI_ERROR_NOT_FOUND)
+	{
+		const size_t adapter_index = g_Config.backend_info.Adapters.size();
+
+		DXGI_ADAPTER_DESC desc;
+		ad->GetDesc(&desc);
+
+		// TODO: These don't get updated on adapter change, yet
+		if (adapter_index == g_Config.iAdapter)
+		{
+			std::string samples;
+			std::vector<DXGI_SAMPLE_DESC> modes = DX11::D3D::EnumAAModes(ad);
+			for (unsigned int i = 0; i < modes.size(); ++i)
+			{
+				if (i == 0)
+					samples = _trans("None");
+				else if (modes[i].Quality)
+					samples = StringFromFormat(_trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality);
+				else
+					samples = StringFromFormat(_trans("%d samples"), modes[i].Count);
+
+				g_Config.backend_info.AAModes.push_back(samples);
+			}
+
+			bool shader_model_5_supported = (DX11::D3D::GetFeatureLevel(ad) >= D3D_FEATURE_LEVEL_11_0);
+
+			// Requires the earlydepthstencil attribute (only available in shader model 5)
+			g_Config.backend_info.bSupportsEarlyZ = shader_model_5_supported;
+
+			// Requires full UAV functionality (only available in shader model 5)
+			g_Config.backend_info.bSupportsBBox = shader_model_5_supported;
+
+			// Requires the instance attribute (only available in shader model 5)
+			g_Config.backend_info.bSupportsGSInstancing = shader_model_5_supported;
+		}
+		g_Config.backend_info.Adapters.push_back(UTF16ToUTF8(desc.Description));
+		ad->Release();
+	}
+	factory->Release();
+
+	// Clear ppshaders string vector
+	g_Config.backend_info.PPShaders.clear();
+	g_Config.backend_info.AnaglyphShaders.clear();
+
+	DX11::D3D::UnloadDXGI();
+	DX11::D3D::UnloadD3D();
+}
+
+void VideoBackend::ShowConfig(void *hParent)
+{
+	InitBackendInfo();
+	Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11");
+}
+
+bool VideoBackend::Initialize(void *window_handle)
+{
+	if (window_handle == nullptr)
+		return false;
+
+	InitializeShared();
+	InitBackendInfo();
+
+	frameCount = 0;
+
+	g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini");
+	g_Config.GameIniLoad();
+	g_Config.UpdateProjectionHack();
+	g_Config.VerifyValidity();
+	UpdateActiveConfig();
+
+	m_window_handle = window_handle;
+
+	s_BackendInitialized = true;
+
+	return true;
+}
+
+void VideoBackend::Video_Prepare()
+{
+	// internal interfaces
+	g_renderer = new Renderer(m_window_handle);
+	g_texture_cache = new TextureCache;
+	g_vertex_manager = new VertexManager;
+	g_perf_query = new PerfQuery;
+	VertexShaderCache::Init();
+	PixelShaderCache::Init();
+	GeometryShaderCache::Init();
+	D3D::InitUtils();
+
+	// VideoCommon
+	BPInit();
+	Fifo_Init();
+	IndexGenerator::Init();
+	VertexLoaderManager::Init();
+	OpcodeDecoder_Init();
+	VertexShaderManager::Init();
+	PixelShaderManager::Init();
+	GeometryShaderManager::Init();
+	CommandProcessor::Init();
+	PixelEngine::Init();
+	BBox::Init();
+
+	// Tell the host that the window is ready
+	Host_Message(WM_USER_CREATE);
+}
+
+void VideoBackend::Shutdown()
+{
+	s_BackendInitialized = false;
+
+	// TODO: should be in Video_Cleanup
+	if (g_renderer)
+	{
+		// VideoCommon
+		Fifo_Shutdown();
+		CommandProcessor::Shutdown();
+		GeometryShaderManager::Shutdown();
+		PixelShaderManager::Shutdown();
+		VertexShaderManager::Shutdown();
+		OpcodeDecoder_Shutdown();
+		VertexLoaderManager::Shutdown();
+
+		// internal interfaces
+		D3D::ShutdownUtils();
+		PixelShaderCache::Shutdown();
+		VertexShaderCache::Shutdown();
+		GeometryShaderCache::Shutdown();
+		BBox::Shutdown();
+
+		delete g_perf_query;
+		delete g_vertex_manager;
+		delete g_texture_cache;
+		delete g_renderer;
+		g_renderer = nullptr;
+		g_texture_cache = nullptr;
+	}
+}
+
+void VideoBackend::Video_Cleanup()
+{
+}
+
+}
diff --git a/Source/Core/VideoBackends/D3D/main.h b/Source/Core/VideoBackends/D3D/main.h
new file mode 100644
index 0000000000..9943835ce2
--- /dev/null
+++ b/Source/Core/VideoBackends/D3D/main.h
@@ -0,0 +1,8 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/D3D/Render.h"
+#include "VideoCommon/MainBase.h"
diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.cpp b/Source/Core/VideoBackends/OGL/BoundingBox.cpp
new file mode 100644
index 0000000000..91fedb2a2d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/BoundingBox.cpp
@@ -0,0 +1,54 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/BoundingBox.h"
+#include "VideoBackends/OGL/GLUtil.h"
+
+#include "VideoCommon/VideoConfig.h"
+
+static GLuint s_bbox_buffer_id;
+
+namespace OGL
+{
+
+void BoundingBox::Init()
+{
+	if (g_ActiveConfig.backend_info.bSupportsBBox)
+	{
+		int initial_values[4] = {0,0,0,0};
+		glGenBuffers(1, &s_bbox_buffer_id);
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, s_bbox_buffer_id);
+		glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * sizeof(s32), initial_values, GL_DYNAMIC_DRAW);
+		glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, s_bbox_buffer_id);
+	}
+}
+
+void BoundingBox::Shutdown()
+{
+	if (g_ActiveConfig.backend_info.bSupportsBBox)
+		glDeleteBuffers(1, &s_bbox_buffer_id);
+}
+
+void BoundingBox::Set(int index, int value)
+{
+	glBindBuffer(GL_SHADER_STORAGE_BUFFER, s_bbox_buffer_id);
+	glBufferSubData(GL_SHADER_STORAGE_BUFFER, index * sizeof(int), sizeof(int), &value);
+	glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+}
+
+int BoundingBox::Get(int index)
+{
+	int data = 0;
+	glBindBuffer(GL_SHADER_STORAGE_BUFFER, s_bbox_buffer_id);
+	void* ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, index * sizeof(int), sizeof(int), GL_MAP_READ_BIT);
+	if (ptr)
+	{
+		data = *(int*)ptr;
+		glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
+	}
+	glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+	return data;
+}
+
+};
diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.h b/Source/Core/VideoBackends/OGL/BoundingBox.h
new file mode 100644
index 0000000000..76b86d0c4c
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/BoundingBox.h
@@ -0,0 +1,20 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace OGL
+{
+
+class BoundingBox
+{
+public:
+	static void Init();
+	static void Shutdown();
+
+	static void Set(int index, int value);
+	static int Get(int index);
+};
+
+};
diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
new file mode 100644
index 0000000000..85964a3185
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -0,0 +1,58 @@
+set(SRCS GLExtensions/GLExtensions.cpp
+	   BoundingBox.cpp
+	   FramebufferManager.cpp
+	   GLUtil.cpp
+	   main.cpp
+	   NativeVertexFormat.cpp
+	   PerfQuery.cpp
+	   PostProcessing.cpp
+	   ProgramShaderCache.cpp
+	   RasterFont.cpp
+	   Render.cpp
+	   SamplerCache.cpp
+	   StreamBuffer.cpp
+	   TextureCache.cpp
+	   TextureConverter.cpp
+	   VertexManager.cpp)
+
+if(USE_EGL)
+    set(SRCS ${SRCS} GLInterface/EGL.cpp)
+    if(ANDROID)
+        set(SRCS ${SRCS} GLInterface/EGLAndroid.cpp)
+    elseif(USE_X11)
+        set(SRCS ${SRCS} GLInterface/EGLX11.cpp)
+    endif()
+endif()
+
+if(WIN32)
+    set(SRCS ${SRCS} GLInterface/WGL.cpp)
+elseif(APPLE)
+    set(SRCS ${SRCS} GLInterface/AGL.cpp)
+elseif(USE_X11)
+    if (NOT USE_EGL)
+        set(SRCS ${SRCS} GLInterface/GLX.cpp)
+        # GLX has a hard dependency on libGL.
+        # Make sure to link to it if using GLX.
+        set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
+    endif()
+    set(SRCS ${SRCS} GLInterface/X11_Util.cpp)
+    set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
+endif()
+
+set(SRCS ${SRCS} GLInterface/GLInterface.cpp)
+
+set(LIBS	${LIBS}
+			videocommon
+			SOIL
+			common
+			dl
+			${X11_LIBRARIES})
+if(USE_EGL)
+	set(LIBS ${LIBS} EGL)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
+	set(LIBS	${LIBS} usbhid)
+endif()
+
+add_dolphin_library(videoogl "${SRCS}" "${LIBS}")
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
new file mode 100644
index 0000000000..3fee033c57
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
@@ -0,0 +1,639 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonFuncs.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoBackends/OGL/TextureConverter.h"
+
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VertexShaderGen.h"
+
+namespace OGL
+{
+
+int FramebufferManager::m_targetWidth;
+int FramebufferManager::m_targetHeight;
+int FramebufferManager::m_msaaSamples;
+
+GLenum FramebufferManager::m_textureType;
+GLuint* FramebufferManager::m_efbFramebuffer;
+GLuint FramebufferManager::m_xfbFramebuffer;
+GLuint FramebufferManager::m_efbColor;
+GLuint FramebufferManager::m_efbDepth;
+GLuint FramebufferManager::m_efbColorSwap; // for hot swap when reinterpreting EFB pixel formats
+
+// Only used in MSAA mode.
+GLuint* FramebufferManager::m_resolvedFramebuffer;
+GLuint FramebufferManager::m_resolvedColorTexture;
+GLuint FramebufferManager::m_resolvedDepthTexture;
+
+// reinterpret pixel format
+SHADER FramebufferManager::m_pixel_format_shaders[2];
+
+// EFB pokes
+GLuint FramebufferManager::m_EfbPokes_VBO;
+GLuint FramebufferManager::m_EfbPokes_VAO;
+SHADER FramebufferManager::m_EfbPokes;
+
+FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int msaaSamples)
+{
+	m_xfbFramebuffer = 0;
+	m_efbColor = 0;
+	m_efbDepth = 0;
+	m_efbColorSwap = 0;
+	m_resolvedColorTexture = 0;
+	m_resolvedDepthTexture = 0;
+
+	m_targetWidth = targetWidth;
+	m_targetHeight = targetHeight;
+
+	m_msaaSamples = msaaSamples;
+
+	// The EFB can be set to different pixel formats by the game through the
+	// BPMEM_ZCOMPARE register (which should probably have a different name).
+	// They are:
+	// - 24-bit RGB (8-bit components) with 24-bit Z
+	// - 24-bit RGBA (6-bit components) with 24-bit Z
+	// - Multisampled 16-bit RGB (5-6-5 format) with 16-bit Z
+	// We only use one EFB format here: 32-bit ARGB with 24-bit Z.
+	// Multisampling depends on user settings.
+	// The distinction becomes important for certain operations, i.e. the
+	// alpha channel should be ignored if the EFB does not have one.
+
+	glActiveTexture(GL_TEXTURE9);
+
+	GLuint glObj[3];
+	glGenTextures(3, glObj);
+	m_efbColor = glObj[0];
+	m_efbDepth = glObj[1];
+	m_efbColorSwap = glObj[2];
+
+	m_EFBLayers = (g_ActiveConfig.iStereoMode > 0) ? 2 : 1;
+	m_efbFramebuffer = new GLuint[m_EFBLayers]();
+	m_resolvedFramebuffer = new GLuint[m_EFBLayers]();
+
+	// OpenGL MSAA textures are a different kind of texture type and must be allocated
+	// with a different function, so we create them separately.
+	if (m_msaaSamples <= 1)
+	{
+		m_textureType = GL_TEXTURE_2D_ARRAY;
+
+		glBindTexture(m_textureType, m_efbColor);
+		glTexParameteri(m_textureType, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage3D(m_textureType, 0, GL_RGBA, m_targetWidth, m_targetHeight, m_EFBLayers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+		glBindTexture(m_textureType, m_efbDepth);
+		glTexParameteri(m_textureType, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage3D(m_textureType, 0, GL_DEPTH_COMPONENT32F, m_targetWidth, m_targetHeight, m_EFBLayers, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
+
+		glBindTexture(m_textureType, m_efbColorSwap);
+		glTexParameteri(m_textureType, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage3D(m_textureType, 0, GL_RGBA, m_targetWidth, m_targetHeight, m_EFBLayers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+	}
+	else
+	{
+		GLenum resolvedType = GL_TEXTURE_2D_ARRAY;
+
+		// Only use a layered multisample texture if needed. Some drivers
+		// slow down significantly with single-layered multisample textures.
+		if (m_EFBLayers > 1)
+		{
+			m_textureType = GL_TEXTURE_2D_MULTISAMPLE_ARRAY;
+
+			glBindTexture(m_textureType, m_efbColor);
+			glTexImage3DMultisample(m_textureType, m_msaaSamples, GL_RGBA, m_targetWidth, m_targetHeight, m_EFBLayers, false);
+
+			glBindTexture(m_textureType, m_efbDepth);
+			glTexImage3DMultisample(m_textureType, m_msaaSamples, GL_DEPTH_COMPONENT32F, m_targetWidth, m_targetHeight, m_EFBLayers, false);
+
+			glBindTexture(m_textureType, m_efbColorSwap);
+			glTexImage3DMultisample(m_textureType, m_msaaSamples, GL_RGBA, m_targetWidth, m_targetHeight, m_EFBLayers, false);
+			glBindTexture(m_textureType, 0);
+		}
+		else
+		{
+			m_textureType = GL_TEXTURE_2D_MULTISAMPLE;
+
+			glBindTexture(m_textureType, m_efbColor);
+			glTexImage2DMultisample(m_textureType, m_msaaSamples, GL_RGBA, m_targetWidth, m_targetHeight, false);
+
+			glBindTexture(m_textureType, m_efbDepth);
+			glTexImage2DMultisample(m_textureType, m_msaaSamples, GL_DEPTH_COMPONENT32F, m_targetWidth, m_targetHeight, false);
+
+			glBindTexture(m_textureType, m_efbColorSwap);
+			glTexImage2DMultisample(m_textureType, m_msaaSamples, GL_RGBA, m_targetWidth, m_targetHeight, false);
+			glBindTexture(m_textureType, 0);
+		}
+
+		// Although we are able to access the multisampled texture directly, we don't do it everywhere.
+		// The old way is to "resolve" this multisampled texture by copying it into a non-sampled texture.
+		// This would lead to an unneeded copy of the EFB, so we are going to avoid it.
+		// But as this job isn't done right now, we do need that texture for resolving:
+		glGenTextures(2, glObj);
+		m_resolvedColorTexture = glObj[0];
+		m_resolvedDepthTexture = glObj[1];
+
+		glBindTexture(resolvedType, m_resolvedColorTexture);
+		glTexParameteri(resolvedType, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage3D(resolvedType, 0, GL_RGBA, m_targetWidth, m_targetHeight, m_EFBLayers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+		glBindTexture(resolvedType, m_resolvedDepthTexture);
+		glTexParameteri(resolvedType, GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage3D(resolvedType, 0, GL_DEPTH_COMPONENT32F, m_targetWidth, m_targetHeight, m_EFBLayers, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
+
+		// Bind resolved textures to resolved framebuffer.
+		glGenFramebuffers(m_EFBLayers, m_resolvedFramebuffer);
+		glBindFramebuffer(GL_FRAMEBUFFER, m_resolvedFramebuffer[0]);
+		FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, resolvedType, m_resolvedColorTexture, 0);
+		FramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, resolvedType, m_resolvedDepthTexture, 0);
+
+		// Bind all the other layers as separate FBOs for blitting.
+		for (unsigned int i = 1; i < m_EFBLayers; i++)
+		{
+			glBindFramebuffer(GL_FRAMEBUFFER, m_resolvedFramebuffer[i]);
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_resolvedColorTexture, 0, i);
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_resolvedDepthTexture, 0, i);
+		}
+	}
+
+	// Create XFB framebuffer; targets will be created elsewhere.
+	glGenFramebuffers(1, &m_xfbFramebuffer);
+
+	// Bind target textures to EFB framebuffer.
+	glGenFramebuffers(m_EFBLayers, m_efbFramebuffer);
+	glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer[0]);
+	FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_textureType, m_efbColor, 0);
+	FramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_textureType, m_efbDepth, 0);
+
+	// Bind all the other layers as separate FBOs for blitting.
+	for (unsigned int i = 1; i < m_EFBLayers; i++)
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer[i]);
+		glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_efbColor, 0, i);
+		glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_efbDepth, 0, i);
+	}
+
+	// EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f
+	glViewport(0, 0, m_targetWidth, m_targetHeight);
+	glScissor(0, 0, m_targetWidth, m_targetHeight);
+	glClearColor(0.f, 0.f, 0.f, 1.f);
+	glClearDepthf(1.0f);
+	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+
+	// reinterpret pixel format
+	const char* vs = m_EFBLayers > 1 ?
+		"void main(void) {\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+		"}\n" :
+		"flat out int layer;\n"
+		"void main(void) {\n"
+		"	layer = 0;\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+		"}\n";
+
+	// The way to sample the EFB is based on the on the current configuration.
+	// As we use the same sampling way for both interpreting shaders, the sampling
+	// shader are generated first:
+	std::string sampler;
+	if (m_msaaSamples <= 1)
+	{
+		// non-msaa, so just fetch the pixel
+		sampler =
+			"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+			"vec4 sampleEFB(ivec3 pos) {\n"
+			"	return texelFetch(samp9, pos, 0);\n"
+			"}\n";
+	}
+	else if (g_ogl_config.bSupportSampleShading)
+	{
+		// msaa + sample shading available, so just fetch the sample
+		// This will lead to sample shading, but it's the only way to not loose
+		// the values of each sample.
+		if (m_EFBLayers > 1)
+		{
+			sampler =
+				"SAMPLER_BINDING(9) uniform sampler2DMSArray samp9;\n"
+				"vec4 sampleEFB(ivec3 pos) {\n"
+				"	return texelFetch(samp9, pos, gl_SampleID);\n"
+				"}\n";
+		}
+		else
+		{
+			sampler =
+				"SAMPLER_BINDING(9) uniform sampler2DMS samp9;\n"
+				"vec4 sampleEFB(ivec3 pos) {\n"
+				"	return texelFetch(samp9, pos.xy, gl_SampleID);\n"
+				"}\n";
+		}
+	}
+	else
+	{
+		// msaa without sample shading: calculate the mean value of the pixel
+		std::stringstream samples;
+		samples << m_msaaSamples;
+		if (m_EFBLayers > 1)
+		{
+			sampler =
+				"SAMPLER_BINDING(9) uniform sampler2DMSArray samp9;\n"
+				"vec4 sampleEFB(ivec3 pos) {\n"
+				"	vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n"
+				"	for(int i=0; i<" + samples.str() + "; i++)\n"
+				"		color += texelFetch(samp9, pos, 0), i);\n"
+				"	return color / " + samples.str() + ";\n"
+				"}\n";
+		}
+		else
+		{
+			sampler =
+				"SAMPLER_BINDING(9) uniform sampler2DMS samp9;\n"
+				"vec4 sampleEFB(ivec3 pos) {\n"
+				"	vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n"
+				"	for(int i=0; i<" + samples.str() + "; i++)\n"
+				"		color += texelFetch(samp9, pos.xy, i);\n"
+				"	return color / " + samples.str() + ";\n"
+				"}\n";
+		}
+	}
+
+	std::string ps_rgba6_to_rgb8 = sampler +
+		"flat in int layer;\n"
+		"out vec4 ocol0;\n"
+		"void main()\n"
+		"{\n"
+		"	ivec4 src6 = ivec4(round(sampleEFB(ivec3(gl_FragCoord.xy, layer)) * 63.f));\n"
+		"	ivec4 dst8;\n"
+		"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
+		"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
+		"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
+		"	dst8.a = 255;\n"
+		"	ocol0 = float4(dst8) / 255.f;\n"
+		"}";
+
+	std::string ps_rgb8_to_rgba6 = sampler +
+		"flat in int layer;\n"
+		"out vec4 ocol0;\n"
+		"void main()\n"
+		"{\n"
+		"	ivec4 src8 = ivec4(round(sampleEFB(ivec3(gl_FragCoord.xy, layer)) * 255.f));\n"
+		"	ivec4 dst6;\n"
+		"	dst6.r = src8.r >> 2;\n"
+		"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
+		"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
+		"	dst6.a = src8.b & 0x3F;\n"
+		"	ocol0 = float4(dst6) / 63.f;\n"
+		"}";
+
+	std::stringstream vertices, layers;
+	vertices << m_EFBLayers * 3;
+	layers << m_EFBLayers;
+	std::string gs =
+		"layout(triangles) in;\n"
+		"layout(triangle_strip, max_vertices = " + vertices.str() + ") out;\n"
+		"flat out int layer;\n"
+		"void main()\n"
+		"{\n"
+		"	for (int j = 0; j < " + layers.str() + "; ++j) {\n"
+		"		for (int i = 0; i < 3; ++i) {\n"
+		"			layer = j;\n"
+		"			gl_Layer = j;\n"
+		"			gl_Position = gl_in[i].gl_Position;\n"
+		"			EmitVertex();\n"
+		"		}\n"
+		"		EndPrimitive();\n"
+		"	}\n"
+		"}\n";
+
+	ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6.c_str(), (m_EFBLayers > 1) ? gs.c_str() : nullptr);
+	ProgramShaderCache::CompileShader(m_pixel_format_shaders[1], vs, ps_rgba6_to_rgb8.c_str(), (m_EFBLayers > 1) ? gs.c_str() : nullptr);
+
+	ProgramShaderCache::CompileShader(m_EfbPokes,
+		StringFromFormat(
+		"in vec2 rawpos;\n"
+		"in vec4 color0;\n" // color
+		"in int color1;\n" // depth
+		"out vec4 v_c;\n"
+		"out float v_z;\n"
+		"void main(void) {\n"
+		"	gl_Position = vec4(((rawpos + 0.5) / vec2(640.0, 528.0) * 2.0 - 1.0) * vec2(1.0, -1.0), 0.0, 1.0);\n"
+		"	gl_PointSize = %d.0 / 640.0;\n"
+		"	v_c = color0.bgra;\n"
+		"	v_z = float(color1 & 0xFFFFFF) / 16777216.0;\n"
+		"}\n", m_targetWidth).c_str(),
+
+		StringFromFormat(
+		"in vec4 %s_c;\n"
+		"in float %s_z;\n"
+		"out vec4 ocol0;\n"
+		"void main(void) {\n"
+		"	ocol0 = %s_c;\n"
+		"	gl_FragDepth = %s_z;\n"
+		"}\n", m_EFBLayers > 1 ? "g" : "v", m_EFBLayers > 1 ? "g" : "v", m_EFBLayers > 1 ? "g" : "v", m_EFBLayers > 1 ? "g" : "v").c_str(),
+
+		m_EFBLayers > 1 ? StringFromFormat(
+		"layout(points) in;\n"
+		"layout(points, max_vertices = %d) out;\n"
+		"in vec4 v_c[1];\n"
+		"in float v_z[1];\n"
+		"out vec4 g_c;\n"
+		"out float g_z;\n"
+		"void main()\n"
+		"{\n"
+		"	for (int j = 0; j < %d; ++j) {\n"
+		"		gl_Layer = j;\n"
+		"		gl_Position = gl_in[0].gl_Position;\n"
+		"		gl_PointSize = %d.0 / 640.0;\n"
+		"		g_c = v_c[0];\n"
+		"		g_z = v_z[0];\n"
+		"		EmitVertex();\n"
+		"		EndPrimitive();\n"
+		"	}\n"
+		"}\n", m_EFBLayers, m_EFBLayers, m_targetWidth).c_str() : nullptr);
+	glGenBuffers(1, &m_EfbPokes_VBO);
+	glGenVertexArrays(1, &m_EfbPokes_VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, m_EfbPokes_VBO);
+	glBindVertexArray(m_EfbPokes_VAO );
+	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
+	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_UNSIGNED_SHORT, 0, sizeof(EfbPokeData), (void*)offsetof(EfbPokeData, x));
+	glEnableVertexAttribArray(SHADER_COLOR0_ATTRIB);
+	glVertexAttribPointer(SHADER_COLOR0_ATTRIB, 4, GL_UNSIGNED_BYTE, 1, sizeof(EfbPokeData), (void*)offsetof(EfbPokeData, data));
+	glEnableVertexAttribArray(SHADER_COLOR1_ATTRIB);
+	glVertexAttribIPointer(SHADER_COLOR1_ATTRIB, 1, GL_INT, sizeof(EfbPokeData), (void*)offsetof(EfbPokeData, data));
+
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+		glEnable(GL_PROGRAM_POINT_SIZE);
+}
+
+FramebufferManager::~FramebufferManager()
+{
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+	GLuint glObj[3];
+
+	// Note: OpenGL deletion functions silently ignore parameters of "0".
+
+	glDeleteFramebuffers(m_EFBLayers, m_efbFramebuffer);
+	glDeleteFramebuffers(m_EFBLayers, m_resolvedFramebuffer);
+	delete [] m_efbFramebuffer;
+	delete [] m_resolvedFramebuffer;
+	m_efbFramebuffer = nullptr;
+	m_resolvedFramebuffer = nullptr;
+
+	glDeleteFramebuffers(1, &m_xfbFramebuffer);
+	m_xfbFramebuffer = 0;
+
+	glObj[0] = m_resolvedColorTexture;
+	glObj[1] = m_resolvedDepthTexture;
+	glDeleteTextures(2, glObj);
+	m_resolvedColorTexture = 0;
+	m_resolvedDepthTexture = 0;
+
+	glObj[0] = m_efbColor;
+	glObj[1] = m_efbDepth;
+	glObj[2] = m_efbColorSwap;
+	glDeleteTextures(3, glObj);
+	m_efbColor = 0;
+	m_efbDepth = 0;
+	m_efbColorSwap = 0;
+
+	// reinterpret pixel format
+	m_pixel_format_shaders[0].Destroy();
+	m_pixel_format_shaders[1].Destroy();
+
+	// EFB pokes
+	glDeleteBuffers(1, &m_EfbPokes_VBO);
+	glDeleteVertexArrays(1, &m_EfbPokes_VAO);
+	m_EfbPokes_VBO = 0;
+	m_EfbPokes_VAO = 0;
+	m_EfbPokes.Destroy();
+}
+
+GLuint FramebufferManager::GetEFBColorTexture(const EFBRectangle& sourceRc)
+{
+	if (m_msaaSamples <= 1)
+	{
+		return m_efbColor;
+	}
+	else
+	{
+		// Transfer the EFB to a resolved texture. EXT_framebuffer_blit is
+		// required.
+
+		TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
+		targetRc.ClampUL(0, 0, m_targetWidth, m_targetHeight);
+
+		// Resolve.
+		for (unsigned int i = 0; i < m_EFBLayers; i++)
+		{
+			glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer[i]);
+			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer[i]);
+			glBlitFramebuffer(
+				targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
+				targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST
+				);
+		}
+
+		// Return to EFB.
+		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer[0]);
+
+		return m_resolvedColorTexture;
+	}
+}
+
+GLuint FramebufferManager::GetEFBDepthTexture(const EFBRectangle& sourceRc)
+{
+	if (m_msaaSamples <= 1)
+	{
+		return m_efbDepth;
+	}
+	else
+	{
+		// Transfer the EFB to a resolved texture.
+
+		TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
+		targetRc.ClampUL(0, 0, m_targetWidth, m_targetHeight);
+
+		// Resolve.
+		for (unsigned int i = 0; i < m_EFBLayers; i++)
+		{
+			glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer[i]);
+			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer[i]);
+			glBlitFramebuffer(
+				targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
+				targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
+				GL_DEPTH_BUFFER_BIT, GL_NEAREST
+				);
+		}
+
+		// Return to EFB.
+		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer[0]);
+
+		return m_resolvedDepthTexture;
+	}
+}
+
+void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma)
+{
+	u8* xfb_in_ram = Memory::GetPointer(xfbAddr);
+	if (!xfb_in_ram)
+	{
+		WARN_LOG(VIDEO, "Tried to copy to invalid XFB address");
+		return;
+	}
+
+	TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
+	TextureConverter::EncodeToRamYUYV(ResolveAndGetRenderTarget(sourceRc), targetRc, xfb_in_ram, fbWidth, fbHeight);
+}
+
+void FramebufferManager::SetFramebuffer(GLuint fb)
+{
+	glBindFramebuffer(GL_FRAMEBUFFER, fb != 0 ? fb : GetEFBFramebuffer());
+}
+
+void FramebufferManager::FramebufferTexture(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+{
+	if (textarget == GL_TEXTURE_2D_ARRAY || textarget == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
+	{
+		if (m_EFBLayers > 1)
+			glFramebufferTexture(target, attachment, texture, level);
+		else
+			glFramebufferTextureLayer(target, attachment, texture, level, 0);
+	}
+	else
+	{
+		glFramebufferTexture2D(target, attachment, textarget, texture, level);
+	}
+}
+
+// Apply AA if enabled
+GLuint FramebufferManager::ResolveAndGetRenderTarget(const EFBRectangle &source_rect)
+{
+	return GetEFBColorTexture(source_rect);
+}
+
+GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_rect)
+{
+	return GetEFBDepthTexture(source_rect);
+}
+
+void FramebufferManager::ReinterpretPixelData(unsigned int convtype)
+{
+	g_renderer->ResetAPIState();
+
+	OpenGL_BindAttributelessVAO();
+
+	GLuint src_texture = 0;
+
+	// We aren't allowed to render and sample the same texture in one draw call,
+	// so we have to create a new texture and overwrite it completely.
+	// To not allocate one big texture every time, we've allocated two on
+	// initialization and just swap them here:
+	src_texture = m_efbColor;
+	m_efbColor = m_efbColorSwap;
+	m_efbColorSwap = src_texture;
+	FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, m_textureType, m_efbColor, 0);
+
+	glViewport(0,0, m_targetWidth, m_targetHeight);
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(m_textureType, src_texture);
+	g_sampler_cache->BindNearestSampler(9);
+
+	m_pixel_format_shaders[convtype ? 1 : 0].Bind();
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glBindTexture(m_textureType, 0);
+
+	g_renderer->RestoreAPIState();
+}
+
+XFBSource::~XFBSource()
+{
+	glDeleteTextures(1, &texture);
+}
+
+void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
+{
+	TextureConverter::DecodeToTexture(xfbAddr, fbWidth, fbHeight, texture);
+}
+
+void XFBSource::CopyEFB(float Gamma)
+{
+	g_renderer->ResetAPIState();
+
+	// Copy EFB data to XFB and restore render target again
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, FramebufferManager::GetXFBFramebuffer());
+
+	for (int i = 0; i < m_layers; i++)
+	{
+		// Bind EFB and texture layer
+		glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetEFBFramebuffer(i));
+		glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, 0, i);
+
+		glBlitFramebuffer(
+			0, 0, texWidth, texHeight,
+			0, 0, texWidth, texHeight,
+			GL_COLOR_BUFFER_BIT, GL_NEAREST
+		);
+	}
+
+	// Return to EFB.
+	FramebufferManager::SetFramebuffer(0);
+
+	g_renderer->RestoreAPIState();
+
+}
+
+XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers)
+{
+	GLuint texture;
+
+	glGenTextures(1, &texture);
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, texture);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
+	glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, target_width, target_height, layers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+	return new XFBSource(texture, layers);
+}
+
+void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height)
+{
+	*width = m_targetWidth;
+	*height = m_targetHeight;
+}
+
+void FramebufferManager::PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data)
+{
+	g_renderer->ResetAPIState();
+
+	if (type == POKE_Z)
+	{
+		glDepthMask(GL_TRUE);
+		glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+		glEnable(GL_DEPTH_TEST);
+		glDepthFunc(GL_ALWAYS);
+	}
+
+	glBindVertexArray(m_EfbPokes_VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, m_EfbPokes_VBO);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(EfbPokeData) * data.size(), data.data(), GL_STREAM_DRAW);
+	m_EfbPokes.Bind();
+	glViewport(0, 0, m_targetWidth, m_targetHeight);
+	glDrawArrays(GL_POINTS, 0, (GLsizei)data.size());
+
+	g_renderer->RestoreAPIState();
+
+	// TODO: Could just update the EFB cache with the new value
+	ClearEFBCache();
+}
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h
new file mode 100644
index 0000000000..bf04b41536
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h
@@ -0,0 +1,127 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+
+#include "VideoCommon/FramebufferManagerBase.h"
+
+// On the GameCube, the game sends a request for the graphics processor to
+// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
+// called the XFB (External Framebuffer). The size and location of the XFB is
+// decided at the time of the copy, and the format is always YUYV. The video
+// interface is given a pointer to the XFB, which will be decoded and
+// displayed on the TV.
+//
+// There are two ways for Dolphin to emulate this:
+//
+// Real XFB mode:
+//
+// Dolphin will behave like the GameCube and encode the EFB to
+// a portion of GameCube RAM. The emulated video interface will decode the data
+// for output to the screen.
+//
+// Advantages: Behaves exactly like the GameCube.
+// Disadvantages: Resolution will be limited.
+//
+// Virtual XFB mode:
+//
+// When a request is made to copy the EFB to an XFB, Dolphin
+// will remember the RAM location and size of the XFB in a Virtual XFB list.
+// The video interface will look up the XFB in the list and use the enhanced
+// data stored there, if available.
+//
+// Advantages: Enables high resolution graphics, better than real hardware.
+// Disadvantages: If the GameCube CPU writes directly to the XFB (which is
+// possible but uncommon), the Virtual XFB will not capture this information.
+
+// There may be multiple XFBs in GameCube RAM. This is the maximum number to
+// virtualize.
+
+namespace OGL
+{
+
+struct XFBSource : public XFBSourceBase
+{
+	XFBSource(GLuint tex, int layers) : texture(tex), m_layers(layers) {}
+	~XFBSource();
+
+	void CopyEFB(float Gamma) override;
+	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
+
+	const GLuint texture;
+	const int m_layers;
+};
+
+class FramebufferManager : public FramebufferManagerBase
+{
+public:
+	FramebufferManager(int targetWidth, int targetHeight, int msaaSamples);
+	~FramebufferManager();
+
+	// To get the EFB in texture form, these functions may have to transfer
+	// the EFB to a resolved texture first.
+	static GLuint GetEFBColorTexture(const EFBRectangle& sourceRc);
+	static GLuint GetEFBDepthTexture(const EFBRectangle& sourceRc);
+
+	static GLuint GetEFBFramebuffer(unsigned int layer = 0) { return (layer < m_EFBLayers) ? m_efbFramebuffer[layer] : m_efbFramebuffer[m_EFBLayers - 1]; }
+	static GLuint GetXFBFramebuffer() { return m_xfbFramebuffer; }
+
+	// Resolved framebuffer is only used in MSAA mode.
+	static GLuint GetResolvedFramebuffer() { return m_resolvedFramebuffer[0]; }
+
+	static void SetFramebuffer(GLuint fb);
+	static void FramebufferTexture(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+
+	// If in MSAA mode, this will perform a resolve of the specified rectangle, and return the resolve target as a texture ID.
+	// Thus, this call may be expensive. Don't repeat it unnecessarily.
+	// If not in MSAA mode, will just return the render target texture ID.
+	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
+	static GLuint ResolveAndGetRenderTarget(const EFBRectangle &rect);
+
+	// Same as above but for the depth Target.
+	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
+	static GLuint ResolveAndGetDepthTarget(const EFBRectangle &rect);
+
+	// Convert EFB content on pixel format change.
+	// convtype=0 -> rgb8->rgba6, convtype=2 -> rgba6->rgb8
+	static void ReinterpretPixelData(unsigned int convtype);
+
+	static void PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data);
+
+private:
+	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) override;
+	void GetTargetSize(unsigned int *width, unsigned int *height) override;
+
+	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;
+
+	static int m_targetWidth;
+	static int m_targetHeight;
+	static int m_msaaSamples;
+
+	static GLenum m_textureType;
+	static GLuint* m_efbFramebuffer;
+	static GLuint m_xfbFramebuffer;
+	static GLuint m_efbColor;
+	static GLuint m_efbDepth;
+	static GLuint m_efbColorSwap;// will be hot swapped with m_efbColor when reinterpreting EFB pixel formats
+
+	// Only used in MSAA mode, TODO: try to avoid them
+	static GLuint* m_resolvedFramebuffer;
+	static GLuint m_resolvedColorTexture;
+	static GLuint m_resolvedDepthTexture;
+
+	// For pixel format draw
+	static SHADER m_pixel_format_shaders[2];
+
+	// For EFB pokes
+	static GLuint m_EfbPokes_VBO;
+	static GLuint m_EfbPokes_VAO;
+	static SHADER m_EfbPokes;
+};
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h
new file mode 100644
index 0000000000..bdd8e6ad1f
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h
@@ -0,0 +1,12 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLCLEARDEPTHFPROC glClearDepthf;
+extern PFNGLDEPTHRANGEFPROC glDepthRangef;
+extern PFNGLGETSHADERPRECISIONFORMATPROC glGetShaderPrecisionFormat;
+extern PFNGLRELEASESHADERCOMPILERPROC glReleaseShaderCompiler;
+extern PFNGLSHADERBINARYPROC glShaderBinary;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h
new file mode 100644
index 0000000000..5cd5636488
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h
@@ -0,0 +1,9 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed;
+extern PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h
new file mode 100644
index 0000000000..c1330ab26d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h
@@ -0,0 +1,9 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
+extern PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_clip_control.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_clip_control.h
new file mode 100644
index 0000000000..c2b8c940be
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_clip_control.h
@@ -0,0 +1,8 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLCLIPCONTROLPROC glClipControl;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h
new file mode 100644
index 0000000000..a4451a0a83
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h
@@ -0,0 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
+extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;
+extern PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB;
+extern PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h
new file mode 100644
index 0000000000..063fb9f0f2
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h
@@ -0,0 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
+extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+extern PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex;
+extern PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h
new file mode 100644
index 0000000000..70b5476f5d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h
@@ -0,0 +1,27 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
+extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;
+extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
+extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
+extern PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers;
+extern PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
+extern PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D;
+extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
+extern PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D;
+extern PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer;
+extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
+extern PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers;
+extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
+extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv;
+extern PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv;
+extern PFNGLISFRAMEBUFFERPROC glIsFramebuffer;
+extern PFNGLISRENDERBUFFERPROC glIsRenderbuffer;
+extern PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;
+extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h
new file mode 100644
index 0000000000..57745ed728
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h
@@ -0,0 +1,10 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
+extern PFNGLPROGRAMBINARYPROC glProgramBinary;
+extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h
new file mode 100644
index 0000000000..2a9cde1d4b
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h
@@ -0,0 +1,9 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h
new file mode 100644
index 0000000000..9572ecc0c8
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h
@@ -0,0 +1,8 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h
new file mode 100644
index 0000000000..b4d0f19f7e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h
@@ -0,0 +1,21 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBINDSAMPLERPROC glBindSampler;
+extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
+extern PFNGLGENSAMPLERSPROC glGenSamplers;
+extern PFNGLGETSAMPLERPARAMETERIIVPROC glGetSamplerParameterIiv;
+extern PFNGLGETSAMPLERPARAMETERIUIVPROC glGetSamplerParameterIuiv;
+extern PFNGLGETSAMPLERPARAMETERFVPROC glGetSamplerParameterfv;
+extern PFNGLGETSAMPLERPARAMETERIVPROC glGetSamplerParameteriv;
+extern PFNGLISSAMPLERPROC glIsSampler;
+extern PFNGLSAMPLERPARAMETERIIVPROC glSamplerParameterIiv;
+extern PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv;
+extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+extern PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
+extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+extern PFNGLSAMPLERPARAMETERIVPROC glSamplerParameteriv;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h
new file mode 100644
index 0000000000..6496db3594
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h
@@ -0,0 +1,14 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+extern PFNGLDELETESYNCPROC glDeleteSync;
+extern PFNGLFENCESYNCPROC glFenceSync;
+extern PFNGLGETINTEGER64VPROC glGetInteger64v;
+extern PFNGLGETSYNCIVPROC glGetSynciv;
+extern PFNGLISSYNCPROC glIsSync;
+extern PFNGLWAITSYNCPROC glWaitSync;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h
new file mode 100644
index 0000000000..2001fc2423
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h
@@ -0,0 +1,10 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
+extern PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample;
+extern PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
+extern PFNGLSAMPLEMASKIPROC glSampleMaski;
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h
new file mode 100644
index 0000000000..69d6796957
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h
@@ -0,0 +1,17 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
+extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
+extern PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glGetActiveUniformBlockName;
+extern PFNGLGETACTIVEUNIFORMBLOCKIVPROC glGetActiveUniformBlockiv;
+extern PFNGLGETACTIVEUNIFORMNAMEPROC glGetActiveUniformName;
+extern PFNGLGETACTIVEUNIFORMSIVPROC glGetActiveUniformsiv;
+extern PFNGLGETINTEGERI_VPROC glGetIntegeri_v;
+extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+extern PFNGLGETUNIFORMINDICESPROC glGetUniformIndices;
+extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h
new file mode 100644
index 0000000000..0d71a6923c
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h
@@ -0,0 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+extern PFNGLISVERTEXARRAYPROC glIsVertexArray;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h
new file mode 100644
index 0000000000..73268b180e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h
@@ -0,0 +1,17 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLDEPTHRANGEARRAYVPROC glDepthRangeArrayv;
+extern PFNGLDEPTHRANGEINDEXEDPROC glDepthRangeIndexed;
+extern PFNGLGETDOUBLEI_VPROC glGetDoublei_v;
+extern PFNGLGETFLOATI_VPROC glGetFloati_v;
+extern PFNGLSCISSORARRAYVPROC glScissorArrayv;
+extern PFNGLSCISSORINDEXEDPROC glScissorIndexed;
+extern PFNGLSCISSORINDEXEDVPROC glScissorIndexedv;
+extern PFNGLVIEWPORTARRAYVPROC glViewportArrayv;
+extern PFNGLVIEWPORTINDEXEDFPROC glViewportIndexedf;
+extern PFNGLVIEWPORTINDEXEDFVPROC glViewportIndexedfv;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
new file mode 100644
index 0000000000..6777bec627
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
@@ -0,0 +1,1987 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <sstream>
+#include <unordered_map>
+
+#include "Common/Logging/Log.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+
+#if defined(__linux__) || defined(__APPLE__)
+#include <dlfcn.h>
+#endif
+
+// gl_1_1
+PFNGLCLEARINDEXPROC glClearIndex;
+PFNGLCLEARCOLORPROC glClearColor;
+PFNGLCLEARPROC glClear;
+PFNGLINDEXMASKPROC glIndexMask;
+PFNGLCOLORMASKPROC glColorMask;
+PFNGLALPHAFUNCPROC glAlphaFunc;
+PFNGLBLENDFUNCPROC glBlendFunc;
+PFNGLLOGICOPPROC glLogicOp;
+PFNGLCULLFACEPROC glCullFace;
+PFNGLFRONTFACEPROC glFrontFace;
+PFNGLPOINTSIZEPROC glPointSize;
+PFNGLLINEWIDTHPROC glLineWidth;
+PFNGLLINESTIPPLEPROC glLineStipple;
+PFNGLPOLYGONMODEPROC glPolygonMode;
+PFNGLPOLYGONOFFSETPROC glPolygonOffset;
+PFNGLPOLYGONSTIPPLEPROC glPolygonStipple;
+PFNGLGETPOLYGONSTIPPLEPROC glGetPolygonStipple;
+PFNGLEDGEFLAGPROC glEdgeFlag;
+PFNGLEDGEFLAGVPROC glEdgeFlagv;
+PFNGLSCISSORPROC glScissor;
+PFNGLCLIPPLANEPROC glClipPlane;
+PFNGLGETCLIPPLANEPROC glGetClipPlane;
+PFNGLDRAWBUFFERPROC glDrawBuffer;
+PFNGLREADBUFFERPROC glReadBuffer;
+PFNGLENABLEPROC glEnable;
+PFNGLDISABLEPROC glDisable;
+PFNGLISENABLEDPROC glIsEnabled;
+PFNGLENABLECLIENTSTATEPROC glEnableClientState;
+PFNGLDISABLECLIENTSTATEPROC glDisableClientState;
+PFNGLGETBOOLEANVPROC glGetBooleanv;
+PFNGLGETDOUBLEVPROC glGetDoublev;
+PFNGLGETFLOATVPROC glGetFloatv;
+PFNGLGETINTEGERVPROC glGetIntegerv;
+PFNGLPUSHATTRIBPROC glPushAttrib;
+PFNGLPOPATTRIBPROC glPopAttrib;
+PFNGLPUSHCLIENTATTRIBPROC glPushClientAttrib;
+PFNGLPOPCLIENTATTRIBPROC glPopClientAttrib;
+PFNGLRENDERMODEPROC glRenderMode;
+PFNGLGETERRORPROC glGetError;
+PFNGLGETSTRINGPROC glGetString;
+PFNGLFINISHPROC glFinish;
+PFNGLFLUSHPROC glFlush;
+PFNGLHINTPROC glHint;
+PFNGLCLEARDEPTHPROC glClearDepth;
+PFNGLDEPTHFUNCPROC glDepthFunc;
+PFNGLDEPTHMASKPROC glDepthMask;
+PFNGLDEPTHRANGEPROC glDepthRange;
+PFNGLCLEARACCUMPROC glClearAccum;
+PFNGLACCUMPROC glAccum;
+PFNGLMATRIXMODEPROC glMatrixMode;
+PFNGLORTHOPROC glOrtho;
+PFNGLFRUSTUMPROC glFrustum;
+PFNGLVIEWPORTPROC glViewport;
+PFNGLPUSHMATRIXPROC glPushMatrix;
+PFNGLPOPMATRIXPROC glPopMatrix;
+PFNGLLOADIDENTITYPROC glLoadIdentity;
+PFNGLLOADMATRIXDPROC glLoadMatrixd;
+PFNGLLOADMATRIXFPROC glLoadMatrixf;
+PFNGLMULTMATRIXDPROC glMultMatrixd;
+PFNGLMULTMATRIXFPROC glMultMatrixf;
+PFNGLROTATEDPROC glRotated;
+PFNGLROTATEFPROC glRotatef;
+PFNGLSCALEDPROC glScaled;
+PFNGLSCALEFPROC glScalef;
+PFNGLTRANSLATEDPROC glTranslated;
+PFNGLTRANSLATEFPROC glTranslatef;
+PFNGLISLISTPROC glIsList;
+PFNGLDELETELISTSPROC glDeleteLists;
+PFNGLGENLISTSPROC glGenLists;
+PFNGLNEWLISTPROC glNewList;
+PFNGLENDLISTPROC glEndList;
+PFNGLCALLLISTPROC glCallList;
+PFNGLCALLLISTSPROC glCallLists;
+PFNGLLISTBASEPROC glListBase;
+PFNGLBEGINPROC glBegin;
+PFNGLENDPROC glEnd;
+PFNGLVERTEX2DPROC glVertex2d;
+PFNGLVERTEX2FPROC glVertex2f;
+PFNGLVERTEX2IPROC glVertex2i;
+PFNGLVERTEX2SPROC glVertex2s;
+PFNGLVERTEX3DPROC glVertex3d;
+PFNGLVERTEX3FPROC glVertex3f;
+PFNGLVERTEX3IPROC glVertex3i;
+PFNGLVERTEX3SPROC glVertex3s;
+PFNGLVERTEX4DPROC glVertex4d;
+PFNGLVERTEX4FPROC glVertex4f;
+PFNGLVERTEX4IPROC glVertex4i;
+PFNGLVERTEX4SPROC glVertex4s;
+PFNGLVERTEX2DVPROC glVertex2dv;
+PFNGLVERTEX2FVPROC glVertex2fv;
+PFNGLVERTEX2IVPROC glVertex2iv;
+PFNGLVERTEX2SVPROC glVertex2sv;
+PFNGLVERTEX3DVPROC glVertex3dv;
+PFNGLVERTEX3FVPROC glVertex3fv;
+PFNGLVERTEX3IVPROC glVertex3iv;
+PFNGLVERTEX3SVPROC glVertex3sv;
+PFNGLVERTEX4DVPROC glVertex4dv;
+PFNGLVERTEX4FVPROC glVertex4fv;
+PFNGLVERTEX4IVPROC glVertex4iv;
+PFNGLVERTEX4SVPROC glVertex4sv;
+PFNGLNORMAL3BPROC glNormal3b;
+PFNGLNORMAL3DPROC glNormal3d;
+PFNGLNORMAL3FPROC glNormal3f;
+PFNGLNORMAL3IPROC glNormal3i;
+PFNGLNORMAL3SPROC glNormal3s;
+PFNGLNORMAL3BVPROC glNormal3bv;
+PFNGLNORMAL3DVPROC glNormal3dv;
+PFNGLNORMAL3FVPROC glNormal3fv;
+PFNGLNORMAL3IVPROC glNormal3iv;
+PFNGLNORMAL3SVPROC glNormal3sv;
+PFNGLINDEXDPROC glIndexd;
+PFNGLINDEXFPROC glIndexf;
+PFNGLINDEXIPROC glIndexi;
+PFNGLINDEXSPROC glIndexs;
+PFNGLINDEXUBPROC glIndexub;
+PFNGLINDEXDVPROC glIndexdv;
+PFNGLINDEXFVPROC glIndexfv;
+PFNGLINDEXIVPROC glIndexiv;
+PFNGLINDEXSVPROC glIndexsv;
+PFNGLINDEXUBVPROC glIndexubv;
+PFNGLCOLOR3BPROC glColor3b;
+PFNGLCOLOR3DPROC glColor3d;
+PFNGLCOLOR3FPROC glColor3f;
+PFNGLCOLOR3IPROC glColor3i;
+PFNGLCOLOR3SPROC glColor3s;
+PFNGLCOLOR3UBPROC glColor3ub;
+PFNGLCOLOR3UIPROC glColor3ui;
+PFNGLCOLOR3USPROC glColor3us;
+PFNGLCOLOR4BPROC glColor4b;
+PFNGLCOLOR4DPROC glColor4d;
+PFNGLCOLOR4FPROC glColor4f;
+PFNGLCOLOR4IPROC glColor4i;
+PFNGLCOLOR4SPROC glColor4s;
+PFNGLCOLOR4UBPROC glColor4ub;
+PFNGLCOLOR4UIPROC glColor4ui;
+PFNGLCOLOR4USPROC glColor4us;
+PFNGLCOLOR3BVPROC glColor3bv;
+PFNGLCOLOR3DVPROC glColor3dv;
+PFNGLCOLOR3FVPROC glColor3fv;
+PFNGLCOLOR3IVPROC glColor3iv;
+PFNGLCOLOR3SVPROC glColor3sv;
+PFNGLCOLOR3UBVPROC glColor3ubv;
+PFNGLCOLOR3UIVPROC glColor3uiv;
+PFNGLCOLOR3USVPROC glColor3usv;
+PFNGLCOLOR4BVPROC glColor4bv;
+PFNGLCOLOR4DVPROC glColor4dv;
+PFNGLCOLOR4FVPROC glColor4fv;
+PFNGLCOLOR4IVPROC glColor4iv;
+PFNGLCOLOR4SVPROC glColor4sv;
+PFNGLCOLOR4UBVPROC glColor4ubv;
+PFNGLCOLOR4UIVPROC glColor4uiv;
+PFNGLCOLOR4USVPROC glColor4usv;
+PFNGLTEXCOORD1DPROC glTexCoord1d;
+PFNGLTEXCOORD1FPROC glTexCoord1f;
+PFNGLTEXCOORD1IPROC glTexCoord1i;
+PFNGLTEXCOORD1SPROC glTexCoord1s;
+PFNGLTEXCOORD2DPROC glTexCoord2d;
+PFNGLTEXCOORD2FPROC glTexCoord2f;
+PFNGLTEXCOORD2IPROC glTexCoord2i;
+PFNGLTEXCOORD2SPROC glTexCoord2s;
+PFNGLTEXCOORD3DPROC glTexCoord3d;
+PFNGLTEXCOORD3FPROC glTexCoord3f;
+PFNGLTEXCOORD3IPROC glTexCoord3i;
+PFNGLTEXCOORD3SPROC glTexCoord3s;
+PFNGLTEXCOORD4DPROC glTexCoord4d;
+PFNGLTEXCOORD4FPROC glTexCoord4f;
+PFNGLTEXCOORD4IPROC glTexCoord4i;
+PFNGLTEXCOORD4SPROC glTexCoord4s;
+PFNGLTEXCOORD1DVPROC glTexCoord1dv;
+PFNGLTEXCOORD1FVPROC glTexCoord1fv;
+PFNGLTEXCOORD1IVPROC glTexCoord1iv;
+PFNGLTEXCOORD1SVPROC glTexCoord1sv;
+PFNGLTEXCOORD2DVPROC glTexCoord2dv;
+PFNGLTEXCOORD2FVPROC glTexCoord2fv;
+PFNGLTEXCOORD2IVPROC glTexCoord2iv;
+PFNGLTEXCOORD2SVPROC glTexCoord2sv;
+PFNGLTEXCOORD3DVPROC glTexCoord3dv;
+PFNGLTEXCOORD3FVPROC glTexCoord3fv;
+PFNGLTEXCOORD3IVPROC glTexCoord3iv;
+PFNGLTEXCOORD3SVPROC glTexCoord3sv;
+PFNGLTEXCOORD4DVPROC glTexCoord4dv;
+PFNGLTEXCOORD4FVPROC glTexCoord4fv;
+PFNGLTEXCOORD4IVPROC glTexCoord4iv;
+PFNGLTEXCOORD4SVPROC glTexCoord4sv;
+PFNGLRASTERPOS2DPROC glRasterPos2d;
+PFNGLRASTERPOS2FPROC glRasterPos2f;
+PFNGLRASTERPOS2IPROC glRasterPos2i;
+PFNGLRASTERPOS2SPROC glRasterPos2s;
+PFNGLRASTERPOS3DPROC glRasterPos3d;
+PFNGLRASTERPOS3FPROC glRasterPos3f;
+PFNGLRASTERPOS3IPROC glRasterPos3i;
+PFNGLRASTERPOS3SPROC glRasterPos3s;
+PFNGLRASTERPOS4DPROC glRasterPos4d;
+PFNGLRASTERPOS4FPROC glRasterPos4f;
+PFNGLRASTERPOS4IPROC glRasterPos4i;
+PFNGLRASTERPOS4SPROC glRasterPos4s;
+PFNGLRASTERPOS2DVPROC glRasterPos2dv;
+PFNGLRASTERPOS2FVPROC glRasterPos2fv;
+PFNGLRASTERPOS2IVPROC glRasterPos2iv;
+PFNGLRASTERPOS2SVPROC glRasterPos2sv;
+PFNGLRASTERPOS3DVPROC glRasterPos3dv;
+PFNGLRASTERPOS3FVPROC glRasterPos3fv;
+PFNGLRASTERPOS3IVPROC glRasterPos3iv;
+PFNGLRASTERPOS3SVPROC glRasterPos3sv;
+PFNGLRASTERPOS4DVPROC glRasterPos4dv;
+PFNGLRASTERPOS4FVPROC glRasterPos4fv;
+PFNGLRASTERPOS4IVPROC glRasterPos4iv;
+PFNGLRASTERPOS4SVPROC glRasterPos4sv;
+PFNGLRECTDPROC glRectd;
+PFNGLRECTFPROC glRectf;
+PFNGLRECTIPROC glRecti;
+PFNGLRECTSPROC glRects;
+PFNGLRECTDVPROC glRectdv;
+PFNGLRECTFVPROC glRectfv;
+PFNGLRECTIVPROC glRectiv;
+PFNGLRECTSVPROC glRectsv;
+PFNGLVERTEXPOINTERPROC glVertexPointer;
+PFNGLNORMALPOINTERPROC glNormalPointer;
+PFNGLCOLORPOINTERPROC glColorPointer;
+PFNGLINDEXPOINTERPROC glIndexPointer;
+PFNGLTEXCOORDPOINTERPROC glTexCoordPointer;
+PFNGLEDGEFLAGPOINTERPROC glEdgeFlagPointer;
+PFNGLGETPOINTERVPROC glGetPointerv;
+PFNGLARRAYELEMENTPROC glArrayElement;
+PFNGLDRAWARRAYSPROC glDrawArrays;
+PFNGLDRAWELEMENTSPROC glDrawElements;
+PFNGLINTERLEAVEDARRAYSPROC glInterleavedArrays;
+PFNGLSHADEMODELPROC glShadeModel;
+PFNGLLIGHTFPROC glLightf;
+PFNGLLIGHTIPROC glLighti;
+PFNGLLIGHTFVPROC glLightfv;
+PFNGLLIGHTIVPROC glLightiv;
+PFNGLGETLIGHTFVPROC glGetLightfv;
+PFNGLGETLIGHTIVPROC glGetLightiv;
+PFNGLLIGHTMODELFPROC glLightModelf;
+PFNGLLIGHTMODELIPROC glLightModeli;
+PFNGLLIGHTMODELFVPROC glLightModelfv;
+PFNGLLIGHTMODELIVPROC glLightModeliv;
+PFNGLMATERIALFPROC glMaterialf;
+PFNGLMATERIALIPROC glMateriali;
+PFNGLMATERIALFVPROC glMaterialfv;
+PFNGLMATERIALIVPROC glMaterialiv;
+PFNGLGETMATERIALFVPROC glGetMaterialfv;
+PFNGLGETMATERIALIVPROC glGetMaterialiv;
+PFNGLCOLORMATERIALPROC glColorMaterial;
+PFNGLPIXELZOOMPROC glPixelZoom;
+PFNGLPIXELSTOREFPROC glPixelStoref;
+PFNGLPIXELSTOREIPROC glPixelStorei;
+PFNGLPIXELTRANSFERFPROC glPixelTransferf;
+PFNGLPIXELTRANSFERIPROC glPixelTransferi;
+PFNGLPIXELMAPFVPROC glPixelMapfv;
+PFNGLPIXELMAPUIVPROC glPixelMapuiv;
+PFNGLPIXELMAPUSVPROC glPixelMapusv;
+PFNGLGETPIXELMAPFVPROC glGetPixelMapfv;
+PFNGLGETPIXELMAPUIVPROC glGetPixelMapuiv;
+PFNGLGETPIXELMAPUSVPROC glGetPixelMapusv;
+PFNGLBITMAPPROC glBitmap;
+PFNGLREADPIXELSPROC glReadPixels;
+PFNGLDRAWPIXELSPROC glDrawPixels;
+PFNGLCOPYPIXELSPROC glCopyPixels;
+PFNGLSTENCILFUNCPROC glStencilFunc;
+PFNGLSTENCILMASKPROC glStencilMask;
+PFNGLSTENCILOPPROC glStencilOp;
+PFNGLCLEARSTENCILPROC glClearStencil;
+PFNGLTEXGENDPROC glTexGend;
+PFNGLTEXGENFPROC glTexGenf;
+PFNGLTEXGENIPROC glTexGeni;
+PFNGLTEXGENDVPROC glTexGendv;
+PFNGLTEXGENFVPROC glTexGenfv;
+PFNGLTEXGENIVPROC glTexGeniv;
+PFNGLGETTEXGENDVPROC glGetTexGendv;
+PFNGLGETTEXGENFVPROC glGetTexGenfv;
+PFNGLGETTEXGENIVPROC glGetTexGeniv;
+PFNGLTEXENVFPROC glTexEnvf;
+PFNGLTEXENVIPROC glTexEnvi;
+PFNGLTEXENVFVPROC glTexEnvfv;
+PFNGLTEXENVIVPROC glTexEnviv;
+PFNGLGETTEXENVFVPROC glGetTexEnvfv;
+PFNGLGETTEXENVIVPROC glGetTexEnviv;
+PFNGLTEXPARAMETERFPROC glTexParameterf;
+PFNGLTEXPARAMETERIPROC glTexParameteri;
+PFNGLTEXPARAMETERFVPROC glTexParameterfv;
+PFNGLTEXPARAMETERIVPROC glTexParameteriv;
+PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv;
+PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv;
+PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv;
+PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv;
+PFNGLTEXIMAGE1DPROC glTexImage1D;
+PFNGLTEXIMAGE2DPROC glTexImage2D;
+PFNGLGETTEXIMAGEPROC glGetTexImage;
+PFNGLGENTEXTURESPROC glGenTextures;
+PFNGLDELETETEXTURESPROC glDeleteTextures;
+PFNGLBINDTEXTUREPROC glBindTexture;
+PFNGLPRIORITIZETEXTURESPROC glPrioritizeTextures;
+PFNGLARETEXTURESRESIDENTPROC glAreTexturesResident;
+PFNGLISTEXTUREPROC glIsTexture;
+PFNGLTEXSUBIMAGE1DPROC glTexSubImage1D;
+PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D;
+PFNGLCOPYTEXIMAGE1DPROC glCopyTexImage1D;
+PFNGLCOPYTEXIMAGE2DPROC glCopyTexImage2D;
+PFNGLCOPYTEXSUBIMAGE1DPROC glCopyTexSubImage1D;
+PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D;
+PFNGLMAP1DPROC glMap1d;
+PFNGLMAP1FPROC glMap1f;
+PFNGLMAP2DPROC glMap2d;
+PFNGLMAP2FPROC glMap2f;
+PFNGLGETMAPDVPROC glGetMapdv;
+PFNGLGETMAPFVPROC glGetMapfv;
+PFNGLGETMAPIVPROC glGetMapiv;
+PFNGLEVALCOORD1DPROC glEvalCoord1d;
+PFNGLEVALCOORD1FPROC glEvalCoord1f;
+PFNGLEVALCOORD1DVPROC glEvalCoord1dv;
+PFNGLEVALCOORD1FVPROC glEvalCoord1fv;
+PFNGLEVALCOORD2DPROC glEvalCoord2d;
+PFNGLEVALCOORD2FPROC glEvalCoord2f;
+PFNGLEVALCOORD2DVPROC glEvalCoord2dv;
+PFNGLEVALCOORD2FVPROC glEvalCoord2fv;
+PFNGLMAPGRID1DPROC glMapGrid1d;
+PFNGLMAPGRID1FPROC glMapGrid1f;
+PFNGLMAPGRID2DPROC glMapGrid2d;
+PFNGLMAPGRID2FPROC glMapGrid2f;
+PFNGLEVALPOINT1PROC glEvalPoint1;
+PFNGLEVALPOINT2PROC glEvalPoint2;
+PFNGLEVALMESH1PROC glEvalMesh1;
+PFNGLEVALMESH2PROC glEvalMesh2;
+PFNGLFOGFPROC glFogf;
+PFNGLFOGIPROC glFogi;
+PFNGLFOGFVPROC glFogfv;
+PFNGLFOGIVPROC glFogiv;
+PFNGLFEEDBACKBUFFERPROC glFeedbackBuffer;
+PFNGLPASSTHROUGHPROC glPassThrough;
+PFNGLSELECTBUFFERPROC glSelectBuffer;
+PFNGLINITNAMESPROC glInitNames;
+PFNGLLOADNAMEPROC glLoadName;
+PFNGLPUSHNAMEPROC glPushName;
+PFNGLPOPNAMEPROC glPopName;
+
+// gl_1_2
+PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
+PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
+PFNGLTEXIMAGE3DPROC glTexImage3D;
+PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D;
+
+// gl_1_3
+PFNGLACTIVETEXTUREARBPROC glActiveTexture;
+PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTexture;
+PFNGLCOMPRESSEDTEXIMAGE1DPROC glCompressedTexImage1D;
+PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
+PFNGLCOMPRESSEDTEXIMAGE3DPROC glCompressedTexImage3D;
+PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glCompressedTexSubImage1D;
+PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glCompressedTexSubImage2D;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glCompressedTexSubImage3D;
+PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
+PFNGLLOADTRANSPOSEMATRIXDARBPROC glLoadTransposeMatrixd;
+PFNGLLOADTRANSPOSEMATRIXFARBPROC glLoadTransposeMatrixf;
+PFNGLMULTTRANSPOSEMATRIXDARBPROC glMultTransposeMatrixd;
+PFNGLMULTTRANSPOSEMATRIXFARBPROC glMultTransposeMatrixf;
+PFNGLMULTITEXCOORD1DARBPROC glMultiTexCoord1d;
+PFNGLMULTITEXCOORD1DVARBPROC glMultiTexCoord1dv;
+PFNGLMULTITEXCOORD1FARBPROC glMultiTexCoord1f;
+PFNGLMULTITEXCOORD1FVARBPROC glMultiTexCoord1fv;
+PFNGLMULTITEXCOORD1IARBPROC glMultiTexCoord1i;
+PFNGLMULTITEXCOORD1IVARBPROC glMultiTexCoord1iv;
+PFNGLMULTITEXCOORD1SARBPROC glMultiTexCoord1s;
+PFNGLMULTITEXCOORD1SVARBPROC glMultiTexCoord1sv;
+PFNGLMULTITEXCOORD2DARBPROC glMultiTexCoord2d;
+PFNGLMULTITEXCOORD2DVARBPROC glMultiTexCoord2dv;
+PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2f;
+PFNGLMULTITEXCOORD2FVARBPROC glMultiTexCoord2fv;
+PFNGLMULTITEXCOORD2IARBPROC glMultiTexCoord2i;
+PFNGLMULTITEXCOORD2IVARBPROC glMultiTexCoord2iv;
+PFNGLMULTITEXCOORD2SARBPROC glMultiTexCoord2s;
+PFNGLMULTITEXCOORD2SVARBPROC glMultiTexCoord2sv;
+PFNGLMULTITEXCOORD3DARBPROC glMultiTexCoord3d;
+PFNGLMULTITEXCOORD3DVARBPROC glMultiTexCoord3dv;
+PFNGLMULTITEXCOORD3FARBPROC glMultiTexCoord3f;
+PFNGLMULTITEXCOORD3FVARBPROC glMultiTexCoord3fv;
+PFNGLMULTITEXCOORD3IARBPROC glMultiTexCoord3i;
+PFNGLMULTITEXCOORD3IVARBPROC glMultiTexCoord3iv;
+PFNGLMULTITEXCOORD3SARBPROC glMultiTexCoord3s;
+PFNGLMULTITEXCOORD3SVARBPROC glMultiTexCoord3sv;
+PFNGLMULTITEXCOORD4DARBPROC glMultiTexCoord4d;
+PFNGLMULTITEXCOORD4DVARBPROC glMultiTexCoord4dv;
+PFNGLMULTITEXCOORD4FARBPROC glMultiTexCoord4f;
+PFNGLMULTITEXCOORD4FVARBPROC glMultiTexCoord4fv;
+PFNGLMULTITEXCOORD4IARBPROC glMultiTexCoord4i;
+PFNGLMULTITEXCOORD4IVARBPROC glMultiTexCoord4iv;
+PFNGLMULTITEXCOORD4SARBPROC glMultiTexCoord4s;
+PFNGLMULTITEXCOORD4SVARBPROC glMultiTexCoord4sv;
+PFNGLSAMPLECOVERAGEARBPROC glSampleCoverage;
+
+// gl_1_4
+PFNGLBLENDCOLORPROC glBlendColor;
+PFNGLBLENDEQUATIONPROC glBlendEquation;
+PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate;
+PFNGLFOGCOORDPOINTERPROC glFogCoordPointer;
+PFNGLFOGCOORDDPROC glFogCoordd;
+PFNGLFOGCOORDDVPROC glFogCoorddv;
+PFNGLFOGCOORDFPROC glFogCoordf;
+PFNGLFOGCOORDFVPROC glFogCoordfv;
+PFNGLMULTIDRAWARRAYSPROC glMultiDrawArrays;
+PFNGLMULTIDRAWELEMENTSPROC glMultiDrawElements;
+PFNGLPOINTPARAMETERFPROC glPointParameterf;
+PFNGLPOINTPARAMETERFVPROC glPointParameterfv;
+PFNGLPOINTPARAMETERIPROC glPointParameteri;
+PFNGLPOINTPARAMETERIVPROC glPointParameteriv;
+PFNGLSECONDARYCOLOR3BPROC glSecondaryColor3b;
+PFNGLSECONDARYCOLOR3BVPROC glSecondaryColor3bv;
+PFNGLSECONDARYCOLOR3DPROC glSecondaryColor3d;
+PFNGLSECONDARYCOLOR3DVPROC glSecondaryColor3dv;
+PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
+PFNGLSECONDARYCOLOR3FVPROC glSecondaryColor3fv;
+PFNGLSECONDARYCOLOR3IPROC glSecondaryColor3i;
+PFNGLSECONDARYCOLOR3IVPROC glSecondaryColor3iv;
+PFNGLSECONDARYCOLOR3SPROC glSecondaryColor3s;
+PFNGLSECONDARYCOLOR3SVPROC glSecondaryColor3sv;
+PFNGLSECONDARYCOLOR3UBPROC glSecondaryColor3ub;
+PFNGLSECONDARYCOLOR3UBVPROC glSecondaryColor3ubv;
+PFNGLSECONDARYCOLOR3UIPROC glSecondaryColor3ui;
+PFNGLSECONDARYCOLOR3UIVPROC glSecondaryColor3uiv;
+PFNGLSECONDARYCOLOR3USPROC glSecondaryColor3us;
+PFNGLSECONDARYCOLOR3USVPROC glSecondaryColor3usv;
+PFNGLSECONDARYCOLORPOINTERPROC glSecondaryColorPointer;
+PFNGLWINDOWPOS2DPROC glWindowPos2d;
+PFNGLWINDOWPOS2DVPROC glWindowPos2dv;
+PFNGLWINDOWPOS2FPROC glWindowPos2f;
+PFNGLWINDOWPOS2FVPROC glWindowPos2fv;
+PFNGLWINDOWPOS2IPROC glWindowPos2i;
+PFNGLWINDOWPOS2IVPROC glWindowPos2iv;
+PFNGLWINDOWPOS2SPROC glWindowPos2s;
+PFNGLWINDOWPOS2SVPROC glWindowPos2sv;
+PFNGLWINDOWPOS3DPROC glWindowPos3d;
+PFNGLWINDOWPOS3DVPROC glWindowPos3dv;
+PFNGLWINDOWPOS3FPROC glWindowPos3f;
+PFNGLWINDOWPOS3FVPROC glWindowPos3fv;
+PFNGLWINDOWPOS3IPROC glWindowPos3i;
+PFNGLWINDOWPOS3IVPROC glWindowPos3iv;
+PFNGLWINDOWPOS3SPROC glWindowPos3s;
+PFNGLWINDOWPOS3SVPROC glWindowPos3sv;
+
+// gl_1_5
+PFNGLBEGINQUERYPROC glBeginQuery;
+PFNGLBINDBUFFERPROC glBindBuffer;
+PFNGLBUFFERDATAPROC glBufferData;
+PFNGLBUFFERSUBDATAPROC glBufferSubData;
+PFNGLDELETEBUFFERSPROC glDeleteBuffers;
+PFNGLDELETEQUERIESPROC glDeleteQueries;
+PFNGLENDQUERYPROC glEndQuery;
+PFNGLGENBUFFERSPROC glGenBuffers;
+PFNGLGENQUERIESPROC glGenQueries;
+PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv;
+PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv;
+PFNGLGETBUFFERSUBDATAPROC glGetBufferSubData;
+PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv;
+PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
+PFNGLGETQUERYIVPROC glGetQueryiv;
+PFNGLISBUFFERPROC glIsBuffer;
+PFNGLISQUERYPROC glIsQuery;
+PFNGLMAPBUFFERPROC glMapBuffer;
+PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+
+// gl_2_0
+PFNGLATTACHSHADERPROC glAttachShader;
+PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
+PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate;
+PFNGLCOMPILESHADERPROC glCompileShader;
+PFNGLCREATEPROGRAMPROC glCreateProgram;
+PFNGLCREATESHADERPROC glCreateShader;
+PFNGLDELETEPROGRAMPROC glDeleteProgram;
+PFNGLDELETESHADERPROC glDeleteShader;
+PFNGLDETACHSHADERPROC glDetachShader;
+PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
+PFNGLDRAWBUFFERSPROC glDrawBuffers;
+PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
+PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib;
+PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
+PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders;
+PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
+PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
+PFNGLGETPROGRAMIVPROC glGetProgramiv;
+PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
+PFNGLGETSHADERSOURCEPROC glGetShaderSource;
+PFNGLGETSHADERIVPROC glGetShaderiv;
+PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
+PFNGLGETUNIFORMFVPROC glGetUniformfv;
+PFNGLGETUNIFORMIVPROC glGetUniformiv;
+PFNGLGETVERTEXATTRIBPOINTERVPROC glGetVertexAttribPointerv;
+PFNGLGETVERTEXATTRIBDVPROC glGetVertexAttribdv;
+PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv;
+PFNGLGETVERTEXATTRIBIVPROC glGetVertexAttribiv;
+PFNGLISPROGRAMPROC glIsProgram;
+PFNGLISSHADERPROC glIsShader;
+PFNGLLINKPROGRAMPROC glLinkProgram;
+PFNGLSHADERSOURCEPROC glShaderSource;
+PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate;
+PFNGLSTENCILMASKSEPARATEPROC glStencilMaskSeparate;
+PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate;
+PFNGLUNIFORM1FPROC glUniform1f;
+PFNGLUNIFORM1FVPROC glUniform1fv;
+PFNGLUNIFORM1IPROC glUniform1i;
+PFNGLUNIFORM1IVPROC glUniform1iv;
+PFNGLUNIFORM2FPROC glUniform2f;
+PFNGLUNIFORM2FVPROC glUniform2fv;
+PFNGLUNIFORM2IPROC glUniform2i;
+PFNGLUNIFORM2IVPROC glUniform2iv;
+PFNGLUNIFORM3FPROC glUniform3f;
+PFNGLUNIFORM3FVPROC glUniform3fv;
+PFNGLUNIFORM3IPROC glUniform3i;
+PFNGLUNIFORM3IVPROC glUniform3iv;
+PFNGLUNIFORM4FPROC glUniform4f;
+PFNGLUNIFORM4FVPROC glUniform4fv;
+PFNGLUNIFORM4IPROC glUniform4i;
+PFNGLUNIFORM4IVPROC glUniform4iv;
+PFNGLUNIFORMMATRIX2FVPROC glUniformMatrix2fv;
+PFNGLUNIFORMMATRIX3FVPROC glUniformMatrix3fv;
+PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
+PFNGLUSEPROGRAMPROC glUseProgram;
+PFNGLVALIDATEPROGRAMPROC glValidateProgram;
+PFNGLVERTEXATTRIB1DPROC glVertexAttrib1d;
+PFNGLVERTEXATTRIB1DVPROC glVertexAttrib1dv;
+PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f;
+PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv;
+PFNGLVERTEXATTRIB1SPROC glVertexAttrib1s;
+PFNGLVERTEXATTRIB1SVPROC glVertexAttrib1sv;
+PFNGLVERTEXATTRIB2DPROC glVertexAttrib2d;
+PFNGLVERTEXATTRIB2DVPROC glVertexAttrib2dv;
+PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f;
+PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv;
+PFNGLVERTEXATTRIB2SPROC glVertexAttrib2s;
+PFNGLVERTEXATTRIB2SVPROC glVertexAttrib2sv;
+PFNGLVERTEXATTRIB3DPROC glVertexAttrib3d;
+PFNGLVERTEXATTRIB3DVPROC glVertexAttrib3dv;
+PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f;
+PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv;
+PFNGLVERTEXATTRIB3SPROC glVertexAttrib3s;
+PFNGLVERTEXATTRIB3SVPROC glVertexAttrib3sv;
+PFNGLVERTEXATTRIB4NBVPROC glVertexAttrib4Nbv;
+PFNGLVERTEXATTRIB4NIVPROC glVertexAttrib4Niv;
+PFNGLVERTEXATTRIB4NSVPROC glVertexAttrib4Nsv;
+PFNGLVERTEXATTRIB4NUBPROC glVertexAttrib4Nub;
+PFNGLVERTEXATTRIB4NUBVPROC glVertexAttrib4Nubv;
+PFNGLVERTEXATTRIB4NUIVPROC glVertexAttrib4Nuiv;
+PFNGLVERTEXATTRIB4NUSVPROC glVertexAttrib4Nusv;
+PFNGLVERTEXATTRIB4BVPROC glVertexAttrib4bv;
+PFNGLVERTEXATTRIB4DPROC glVertexAttrib4d;
+PFNGLVERTEXATTRIB4DVPROC glVertexAttrib4dv;
+PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f;
+PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv;
+PFNGLVERTEXATTRIB4IVPROC glVertexAttrib4iv;
+PFNGLVERTEXATTRIB4SPROC glVertexAttrib4s;
+PFNGLVERTEXATTRIB4SVPROC glVertexAttrib4sv;
+PFNGLVERTEXATTRIB4UBVPROC glVertexAttrib4ubv;
+PFNGLVERTEXATTRIB4UIVPROC glVertexAttrib4uiv;
+PFNGLVERTEXATTRIB4USVPROC glVertexAttrib4usv;
+PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
+
+// gl_3_0
+PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender;
+PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
+PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation;
+PFNGLCLAMPCOLORPROC glClampColor;
+PFNGLCLEARBUFFERFIPROC glClearBufferfi;
+PFNGLCLEARBUFFERFVPROC glClearBufferfv;
+PFNGLCLEARBUFFERIVPROC glClearBufferiv;
+PFNGLCLEARBUFFERUIVPROC glClearBufferuiv;
+PFNGLCOLORMASKIPROC glColorMaski;
+PFNGLDISABLEIPROC glDisablei;
+PFNGLENABLEIPROC glEnablei;
+PFNGLENDCONDITIONALRENDERPROC glEndConditionalRender;
+PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
+PFNGLGETBOOLEANI_VPROC glGetBooleani_v;
+PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation;
+PFNGLGETSTRINGIPROC glGetStringi;
+PFNGLGETTEXPARAMETERIIVPROC glGetTexParameterIiv;
+PFNGLGETTEXPARAMETERIUIVPROC glGetTexParameterIuiv;
+PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying;
+PFNGLGETUNIFORMUIVPROC glGetUniformuiv;
+PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv;
+PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv;
+PFNGLISENABLEDIPROC glIsEnabledi;
+PFNGLTEXPARAMETERIIVPROC glTexParameterIiv;
+PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv;
+PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
+PFNGLUNIFORM1UIPROC glUniform1ui;
+PFNGLUNIFORM1UIVPROC glUniform1uiv;
+PFNGLUNIFORM2UIPROC glUniform2ui;
+PFNGLUNIFORM2UIVPROC glUniform2uiv;
+PFNGLUNIFORM3UIPROC glUniform3ui;
+PFNGLUNIFORM3UIVPROC glUniform3uiv;
+PFNGLUNIFORM4UIPROC glUniform4ui;
+PFNGLUNIFORM4UIVPROC glUniform4uiv;
+PFNGLVERTEXATTRIBI1IPROC glVertexAttribI1i;
+PFNGLVERTEXATTRIBI1IVPROC glVertexAttribI1iv;
+PFNGLVERTEXATTRIBI1UIPROC glVertexAttribI1ui;
+PFNGLVERTEXATTRIBI1UIVPROC glVertexAttribI1uiv;
+PFNGLVERTEXATTRIBI2IPROC glVertexAttribI2i;
+PFNGLVERTEXATTRIBI2IVPROC glVertexAttribI2iv;
+PFNGLVERTEXATTRIBI2UIPROC glVertexAttribI2ui;
+PFNGLVERTEXATTRIBI2UIVPROC glVertexAttribI2uiv;
+PFNGLVERTEXATTRIBI3IPROC glVertexAttribI3i;
+PFNGLVERTEXATTRIBI3IVPROC glVertexAttribI3iv;
+PFNGLVERTEXATTRIBI3UIPROC glVertexAttribI3ui;
+PFNGLVERTEXATTRIBI3UIVPROC glVertexAttribI3uiv;
+PFNGLVERTEXATTRIBI4BVPROC glVertexAttribI4bv;
+PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i;
+PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv;
+PFNGLVERTEXATTRIBI4SVPROC glVertexAttribI4sv;
+PFNGLVERTEXATTRIBI4UBVPROC glVertexAttribI4ubv;
+PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui;
+PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv;
+PFNGLVERTEXATTRIBI4USVPROC glVertexAttribI4usv;
+PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
+
+// gl_3_1
+PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
+PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
+PFNGLPRIMITIVERESTARTINDEXPROC glPrimitiveRestartIndex;
+PFNGLTEXBUFFERPROC glTexBuffer;
+
+// gl_3_2
+PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
+PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;
+PFNGLGETINTEGER64I_VPROC glGetInteger64i_v;
+
+// ARB_uniform_buffer_object
+PFNGLBINDBUFFERBASEPROC glBindBufferBase;
+PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
+PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glGetActiveUniformBlockName;
+PFNGLGETACTIVEUNIFORMBLOCKIVPROC glGetActiveUniformBlockiv;
+PFNGLGETACTIVEUNIFORMNAMEPROC glGetActiveUniformName;
+PFNGLGETACTIVEUNIFORMSIVPROC glGetActiveUniformsiv;
+PFNGLGETINTEGERI_VPROC glGetIntegeri_v;
+PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+PFNGLGETUNIFORMINDICESPROC glGetUniformIndices;
+PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+
+// ARB_sampler_objects
+PFNGLBINDSAMPLERPROC glBindSampler;
+PFNGLDELETESAMPLERSPROC glDeleteSamplers;
+PFNGLGENSAMPLERSPROC glGenSamplers;
+PFNGLGETSAMPLERPARAMETERIIVPROC glGetSamplerParameterIiv;
+PFNGLGETSAMPLERPARAMETERIUIVPROC glGetSamplerParameterIuiv;
+PFNGLGETSAMPLERPARAMETERFVPROC glGetSamplerParameterfv;
+PFNGLGETSAMPLERPARAMETERIVPROC glGetSamplerParameteriv;
+PFNGLISSAMPLERPROC glIsSampler;
+PFNGLSAMPLERPARAMETERIIVPROC glSamplerParameterIiv;
+PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv;
+PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
+PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+PFNGLSAMPLERPARAMETERIVPROC glSamplerParameteriv;
+
+// ARB_map_buffer_range
+PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+
+// ARB_vertex_array_object
+PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+PFNGLISVERTEXARRAYPROC glIsVertexArray;
+
+// ARB_framebuffer_object
+PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
+PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;
+PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
+PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
+PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers;
+PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
+PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D;
+PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
+PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D;
+PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer;
+PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
+PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers;
+PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
+PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv;
+PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv;
+PFNGLISFRAMEBUFFERPROC glIsFramebuffer;
+PFNGLISRENDERBUFFERPROC glIsRenderbuffer;
+PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
+
+// ARB_get_program_binary
+PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
+PFNGLPROGRAMBINARYPROC glProgramBinary;
+PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
+
+// ARB_sync
+PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+PFNGLDELETESYNCPROC glDeleteSync;
+PFNGLFENCESYNCPROC glFenceSync;
+PFNGLGETINTEGER64VPROC glGetInteger64v;
+PFNGLGETSYNCIVPROC glGetSynciv;
+PFNGLISSYNCPROC glIsSync;
+PFNGLWAITSYNCPROC glWaitSync;
+
+// ARB_texture_multisample
+PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
+PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample;
+PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
+PFNGLSAMPLEMASKIPROC glSampleMaski;
+
+// ARB_ES2_compatibility
+PFNGLCLEARDEPTHFPROC glClearDepthf;
+PFNGLDEPTHRANGEFPROC glDepthRangef;
+PFNGLGETSHADERPRECISIONFORMATPROC glGetShaderPrecisionFormat;
+PFNGLRELEASESHADERCOMPILERPROC glReleaseShaderCompiler;
+PFNGLSHADERBINARYPROC glShaderBinary;
+
+// NV_primitive_restart
+PFNGLPRIMITIVERESTARTINDEXNVPROC glPrimitiveRestartIndexNV;
+PFNGLPRIMITIVERESTARTNVPROC glPrimitiveRestartNV;
+
+// ARB_blend_func_extended
+PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed;
+PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex;
+
+// ARB_viewport_array
+PFNGLDEPTHRANGEARRAYVPROC glDepthRangeArrayv;
+PFNGLDEPTHRANGEINDEXEDPROC glDepthRangeIndexed;
+PFNGLGETDOUBLEI_VPROC glGetDoublei_v;
+PFNGLGETFLOATI_VPROC glGetFloati_v;
+PFNGLSCISSORARRAYVPROC glScissorArrayv;
+PFNGLSCISSORINDEXEDPROC glScissorIndexed;
+PFNGLSCISSORINDEXEDVPROC glScissorIndexedv;
+PFNGLVIEWPORTARRAYVPROC glViewportArrayv;
+PFNGLVIEWPORTINDEXEDFPROC glViewportIndexedf;
+PFNGLVIEWPORTINDEXEDFVPROC glViewportIndexedfv;
+
+// ARB_draw_elements_base_vertex
+PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex;
+PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex;
+
+// ARB_sample_shading
+PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB;
+
+// ARB_debug_output
+PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
+PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;
+PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB;
+PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB;
+
+// KHR_debug
+PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback;
+PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl;
+PFNGLDEBUGMESSAGEINSERTPROC glDebugMessageInsert;
+PFNGLGETDEBUGMESSAGELOGPROC glGetDebugMessageLog;
+PFNGLGETOBJECTLABELPROC glGetObjectLabel;
+PFNGLGETOBJECTPTRLABELPROC glGetObjectPtrLabel;
+PFNGLOBJECTLABELPROC glObjectLabel;
+PFNGLOBJECTPTRLABELPROC glObjectPtrLabel;
+PFNGLPOPDEBUGGROUPPROC glPopDebugGroup;
+PFNGLPUSHDEBUGGROUPPROC glPushDebugGroup;
+
+// ARB_buffer_storage
+PFNGLBUFFERSTORAGEPROC glBufferStorage;
+PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;
+
+// GL_NV_occlusion_query_samples
+PFNGLGENOCCLUSIONQUERIESNVPROC glGenOcclusionQueriesNV;
+PFNGLDELETEOCCLUSIONQUERIESNVPROC glDeleteOcclusionQueriesNV;
+PFNGLISOCCLUSIONQUERYNVPROC glIsOcclusionQueryNV;
+PFNGLBEGINOCCLUSIONQUERYNVPROC glBeginOcclusionQueryNV;
+PFNGLENDOCCLUSIONQUERYNVPROC glEndOcclusionQueryNV;
+PFNGLGETOCCLUSIONQUERYIVNVPROC glGetOcclusionQueryivNV;
+PFNGLGETOCCLUSIONQUERYUIVNVPROC glGetOcclusionQueryuivNV;
+
+// ARB_clip_control
+PFNGLCLIPCONTROLPROC glClipControl;
+
+// Creates a GLFunc object that requires a feature
+#define GLFUNC_REQUIRES(x, y) { (void**)&x, #x, y }
+// Creates a GLFunc object with a different function suffix
+// For when we want to use the same function pointer, but different function name
+#define GLFUNC_SUFFIX(x, y, z) { (void**)&x, #x #y, z }
+// Creates a GLFunc object that should always be able to get grabbed
+// Used for OpenGL functions that should /always/ be provided.
+// aka GL 1.1/1.2/1.3/1.4
+#define GLFUNC_ALWAYS_REQUIRED(x) { (void**)&x, #x, "" }
+
+struct GLFunc
+{
+	void** function_ptr;
+	const std::string function_name;
+	const std::string requirements;
+};
+
+const GLFunc gl_function_array[] =
+{
+	// gl_1_2
+	GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage3D),
+	GLFUNC_ALWAYS_REQUIRED(glDrawRangeElements),
+	GLFUNC_ALWAYS_REQUIRED(glTexImage3D),
+	GLFUNC_ALWAYS_REQUIRED(glTexSubImage3D),
+
+	// gl_1_3
+	GLFUNC_ALWAYS_REQUIRED(glActiveTexture),
+	GLFUNC_ALWAYS_REQUIRED(glClientActiveTexture),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage3D),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexSubImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexSubImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glCompressedTexSubImage3D),
+	GLFUNC_ALWAYS_REQUIRED(glGetCompressedTexImage),
+	GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixd),
+	GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixf),
+	GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixd),
+	GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixf),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1d),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1dv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1f),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1fv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1i),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1iv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1s),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1sv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2d),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2dv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2f),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2fv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2i),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2iv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2s),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2sv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3d),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3dv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3f),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3fv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3i),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3iv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3s),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3sv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4d),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4dv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4f),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4fv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4i),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4iv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4s),
+	GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4sv),
+	GLFUNC_ALWAYS_REQUIRED(glSampleCoverage),
+
+	// gl_1_4
+	GLFUNC_ALWAYS_REQUIRED(glBlendColor),
+	GLFUNC_ALWAYS_REQUIRED(glBlendEquation),
+	GLFUNC_ALWAYS_REQUIRED(glBlendFuncSeparate),
+	GLFUNC_ALWAYS_REQUIRED(glFogCoordPointer),
+	GLFUNC_ALWAYS_REQUIRED(glFogCoordd),
+	GLFUNC_ALWAYS_REQUIRED(glFogCoorddv),
+	GLFUNC_ALWAYS_REQUIRED(glFogCoordf),
+	GLFUNC_ALWAYS_REQUIRED(glFogCoordfv),
+	GLFUNC_ALWAYS_REQUIRED(glMultiDrawArrays),
+	GLFUNC_ALWAYS_REQUIRED(glMultiDrawElements),
+	GLFUNC_ALWAYS_REQUIRED(glPointParameterf),
+	GLFUNC_ALWAYS_REQUIRED(glPointParameterfv),
+	GLFUNC_ALWAYS_REQUIRED(glPointParameteri),
+	GLFUNC_ALWAYS_REQUIRED(glPointParameteriv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3b),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3bv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3d),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3dv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3f),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3fv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3i),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3iv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3s),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3sv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ub),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ubv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ui),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3uiv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3us),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3usv),
+	GLFUNC_ALWAYS_REQUIRED(glSecondaryColorPointer),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2d),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2dv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2f),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2fv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2i),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2iv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2s),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos2sv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3d),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3dv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3f),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3fv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3i),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3iv),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3s),
+	GLFUNC_ALWAYS_REQUIRED(glWindowPos3sv),
+
+	// gl_1_5
+	GLFUNC_ALWAYS_REQUIRED(glBeginQuery),
+	GLFUNC_ALWAYS_REQUIRED(glBindBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glBufferData),
+	GLFUNC_ALWAYS_REQUIRED(glBufferSubData),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteBuffers),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteQueries),
+	GLFUNC_ALWAYS_REQUIRED(glEndQuery),
+	GLFUNC_ALWAYS_REQUIRED(glGenBuffers),
+	GLFUNC_ALWAYS_REQUIRED(glGenQueries),
+	GLFUNC_ALWAYS_REQUIRED(glGetBufferParameteriv),
+	GLFUNC_ALWAYS_REQUIRED(glGetBufferPointerv),
+	GLFUNC_ALWAYS_REQUIRED(glGetBufferSubData),
+	GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectuiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetQueryiv),
+	GLFUNC_ALWAYS_REQUIRED(glIsBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glIsQuery),
+	GLFUNC_ALWAYS_REQUIRED(glMapBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glUnmapBuffer),
+
+	// gl_2_0
+	GLFUNC_ALWAYS_REQUIRED(glAttachShader),
+	GLFUNC_ALWAYS_REQUIRED(glBindAttribLocation),
+	GLFUNC_ALWAYS_REQUIRED(glBlendEquationSeparate),
+	GLFUNC_ALWAYS_REQUIRED(glCompileShader),
+	GLFUNC_ALWAYS_REQUIRED(glCreateProgram),
+	GLFUNC_ALWAYS_REQUIRED(glCreateShader),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteProgram),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteShader),
+	GLFUNC_ALWAYS_REQUIRED(glDetachShader),
+	GLFUNC_ALWAYS_REQUIRED(glDisableVertexAttribArray),
+	GLFUNC_ALWAYS_REQUIRED(glDrawBuffers),
+	GLFUNC_ALWAYS_REQUIRED(glEnableVertexAttribArray),
+	GLFUNC_ALWAYS_REQUIRED(glGetActiveAttrib),
+	GLFUNC_ALWAYS_REQUIRED(glGetActiveUniform),
+	GLFUNC_ALWAYS_REQUIRED(glGetAttachedShaders),
+	GLFUNC_ALWAYS_REQUIRED(glGetAttribLocation),
+	GLFUNC_ALWAYS_REQUIRED(glGetProgramInfoLog),
+	GLFUNC_ALWAYS_REQUIRED(glGetProgramiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetShaderInfoLog),
+	GLFUNC_ALWAYS_REQUIRED(glGetShaderSource),
+	GLFUNC_ALWAYS_REQUIRED(glGetShaderiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetUniformLocation),
+	GLFUNC_ALWAYS_REQUIRED(glGetUniformfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetUniformiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribPointerv),
+	GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribdv),
+	GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribiv),
+	GLFUNC_ALWAYS_REQUIRED(glIsProgram),
+	GLFUNC_ALWAYS_REQUIRED(glIsShader),
+	GLFUNC_ALWAYS_REQUIRED(glLinkProgram),
+	GLFUNC_ALWAYS_REQUIRED(glShaderSource),
+	GLFUNC_ALWAYS_REQUIRED(glStencilFuncSeparate),
+	GLFUNC_ALWAYS_REQUIRED(glStencilMaskSeparate),
+	GLFUNC_ALWAYS_REQUIRED(glStencilOpSeparate),
+	GLFUNC_ALWAYS_REQUIRED(glUniform1f),
+	GLFUNC_ALWAYS_REQUIRED(glUniform1fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform1i),
+	GLFUNC_ALWAYS_REQUIRED(glUniform1iv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform2f),
+	GLFUNC_ALWAYS_REQUIRED(glUniform2fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform2i),
+	GLFUNC_ALWAYS_REQUIRED(glUniform2iv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform3f),
+	GLFUNC_ALWAYS_REQUIRED(glUniform3fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform3i),
+	GLFUNC_ALWAYS_REQUIRED(glUniform3iv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform4f),
+	GLFUNC_ALWAYS_REQUIRED(glUniform4fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniform4i),
+	GLFUNC_ALWAYS_REQUIRED(glUniform4iv),
+	GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3fv),
+	GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4fv),
+	GLFUNC_ALWAYS_REQUIRED(glUseProgram),
+	GLFUNC_ALWAYS_REQUIRED(glValidateProgram),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1d),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1f),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1s),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2d),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2f),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2s),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3d),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3f),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3s),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nbv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Niv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nsv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nub),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nubv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nuiv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nusv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4bv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4d),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4f),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4iv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4s),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4ubv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4uiv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4usv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexAttribPointer),
+
+	// gl_3_0
+	GLFUNC_REQUIRES(glBeginConditionalRender,      "VERSION_3_0"),
+	GLFUNC_REQUIRES(glBeginTransformFeedback,      "VERSION_3_0"),
+	GLFUNC_REQUIRES(glBindFragDataLocation,        "VERSION_3_0"),
+	GLFUNC_REQUIRES(glClampColor,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glClearBufferfi,               "VERSION_3_0"),
+	GLFUNC_REQUIRES(glClearBufferfv,               "VERSION_3_0"),
+	GLFUNC_REQUIRES(glClearBufferiv,               "VERSION_3_0"),
+	GLFUNC_REQUIRES(glClearBufferuiv,              "VERSION_3_0"),
+	GLFUNC_REQUIRES(glColorMaski,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glDisablei,                    "VERSION_3_0"),
+	GLFUNC_REQUIRES(glEnablei,                     "VERSION_3_0"),
+	GLFUNC_REQUIRES(glEndConditionalRender,        "VERSION_3_0"),
+	GLFUNC_REQUIRES(glEndTransformFeedback,        "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetBooleani_v,               "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetFragDataLocation,         "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetStringi,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetTexParameterIiv,          "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetTexParameterIuiv,         "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetTransformFeedbackVarying, "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetUniformuiv,               "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetVertexAttribIiv,          "VERSION_3_0"),
+	GLFUNC_REQUIRES(glGetVertexAttribIuiv,         "VERSION_3_0"),
+	GLFUNC_REQUIRES(glIsEnabledi,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glTexParameterIiv,             "VERSION_3_0"),
+	GLFUNC_REQUIRES(glTexParameterIuiv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glTransformFeedbackVaryings,   "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform1ui,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform1uiv,                 "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform2ui,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform2uiv,                 "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform3ui,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform3uiv,                 "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform4ui,                  "VERSION_3_0"),
+	GLFUNC_REQUIRES(glUniform4uiv,                 "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI1i,             "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI1iv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI1ui,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI1uiv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI2i,             "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI2iv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI2ui,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI2uiv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI3i,             "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI3iv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI3ui,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI3uiv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4bv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4i,             "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4iv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4sv,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4ubv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4ui,            "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4uiv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribI4usv,           "VERSION_3_0"),
+	GLFUNC_REQUIRES(glVertexAttribIPointer,        "VERSION_3_0"),
+
+	// gl_3_1
+	GLFUNC_REQUIRES(glDrawArraysInstanced,   "VERSION_3_1"),
+	GLFUNC_REQUIRES(glDrawElementsInstanced, "VERSION_3_1"),
+	GLFUNC_REQUIRES(glPrimitiveRestartIndex, "VERSION_3_1"),
+	GLFUNC_REQUIRES(glTexBuffer,             "VERSION_3_1"),
+
+	// gl_3_2
+	GLFUNC_REQUIRES(glFramebufferTexture,     "VERSION_3_2"),
+	GLFUNC_REQUIRES(glGetBufferParameteri64v, "VERSION_3_2"),
+	GLFUNC_REQUIRES(glGetInteger64i_v,        "VERSION_3_2"),
+
+	// ARB_uniform_buffer_object
+	GLFUNC_REQUIRES(glBindBufferBase,            "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glBindBufferRange,           "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetActiveUniformBlockName, "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetActiveUniformBlockiv,   "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetActiveUniformName,      "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetActiveUniformsiv,       "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetIntegeri_v,             "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetUniformBlockIndex,      "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glGetUniformIndices,         "GL_ARB_uniform_buffer_object"),
+	GLFUNC_REQUIRES(glUniformBlockBinding,       "GL_ARB_uniform_buffer_object"),
+
+	// ARB_sampler_objects
+	GLFUNC_REQUIRES(glBindSampler,             "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glDeleteSamplers,          "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glGenSamplers,             "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glGetSamplerParameterIiv,  "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glGetSamplerParameterIuiv, "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glGetSamplerParameterfv,   "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glGetSamplerParameteriv,   "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glIsSampler,               "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameterIiv,     "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameterIuiv,    "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameterf,       "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameterfv,      "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameteri,       "GL_ARB_sampler_objects"),
+	GLFUNC_REQUIRES(glSamplerParameteriv,      "GL_ARB_sampler_objects"),
+
+	// ARB_map_buffer_range
+	GLFUNC_REQUIRES(glFlushMappedBufferRange, "GL_ARB_map_buffer_range"),
+	GLFUNC_REQUIRES(glMapBufferRange,         "GL_ARB_map_buffer_range"),
+
+	// ARB_vertex_array_object
+	GLFUNC_REQUIRES(glBindVertexArray,    "GL_ARB_vertex_array_object"),
+	GLFUNC_REQUIRES(glDeleteVertexArrays, "GL_ARB_vertex_array_object"),
+	GLFUNC_REQUIRES(glGenVertexArrays,    "GL_ARB_vertex_array_object"),
+	GLFUNC_REQUIRES(glIsVertexArray,      "GL_ARB_vertex_array_object"),
+
+	// APPLE_vertex_array_object
+	GLFUNC_SUFFIX(glBindVertexArray,    APPLE, "GL_APPLE_vertex_array_object !GL_ARB_vertex_array_object"),
+	GLFUNC_SUFFIX(glDeleteVertexArrays, APPLE, "GL_APPLE_vertex_array_object !GL_ARB_vertex_array_object"),
+	GLFUNC_SUFFIX(glGenVertexArrays,    APPLE, "GL_APPLE_vertex_array_object !GL_ARB_vertex_array_object"),
+	GLFUNC_SUFFIX(glIsVertexArray,      APPLE, "GL_APPLE_vertex_array_object !GL_ARB_vertex_array_object"),
+
+	// ARB_framebuffer_object
+	GLFUNC_REQUIRES(glBindFramebuffer,                     "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glBindRenderbuffer,                    "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glBlitFramebuffer,                     "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glCheckFramebufferStatus,              "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glDeleteFramebuffers,                  "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glDeleteRenderbuffers,                 "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glFramebufferRenderbuffer,             "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glFramebufferTexture1D,                "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glFramebufferTexture2D,                "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glFramebufferTexture3D,                "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glFramebufferTextureLayer,             "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glGenFramebuffers,                     "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glGenRenderbuffers,                    "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glGenerateMipmap,                      "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glGetFramebufferAttachmentParameteriv, "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glGetRenderbufferParameteriv,          "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glIsFramebuffer,                       "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glIsRenderbuffer,                      "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glRenderbufferStorage,                 "GL_ARB_framebuffer_object"),
+	GLFUNC_REQUIRES(glRenderbufferStorageMultisample,      "GL_ARB_framebuffer_object"),
+
+	// ARB_get_program_binary
+	GLFUNC_REQUIRES(glGetProgramBinary,  "GL_ARB_get_program_binary"),
+	GLFUNC_REQUIRES(glProgramBinary,     "GL_ARB_get_program_binary"),
+	GLFUNC_REQUIRES(glProgramParameteri, "GL_ARB_get_program_binary"),
+
+	// ARB_sync
+	GLFUNC_REQUIRES(glClientWaitSync, "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glDeleteSync,     "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glFenceSync,      "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glGetInteger64v,  "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glGetSynciv,      "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glIsSync,         "GL_ARB_sync"),
+	GLFUNC_REQUIRES(glWaitSync,       "GL_ARB_sync"),
+
+	// ARB_texture_multisample
+	GLFUNC_REQUIRES(glTexImage2DMultisample, "GL_ARB_texture_multisample"),
+	GLFUNC_REQUIRES(glTexImage3DMultisample, "GL_ARB_texture_multisample"),
+	GLFUNC_REQUIRES(glGetMultisamplefv,      "GL_ARB_texture_multisample"),
+	GLFUNC_REQUIRES(glSampleMaski,           "GL_ARB_texture_multisample"),
+
+	// ARB_ES2_compatibility
+	GLFUNC_REQUIRES(glClearDepthf,              "GL_ARB_ES2_compatibility"),
+	GLFUNC_REQUIRES(glDepthRangef,              "GL_ARB_ES2_compatibility"),
+	GLFUNC_REQUIRES(glGetShaderPrecisionFormat, "GL_ARB_ES2_compatibility"),
+	GLFUNC_REQUIRES(glReleaseShaderCompiler,    "GL_ARB_ES2_compatibility"),
+	GLFUNC_REQUIRES(glShaderBinary,             "GL_ARB_ES2_compatibility"),
+
+	// NV_primitive_restart
+	GLFUNC_REQUIRES(glPrimitiveRestartIndexNV, "GL_NV_primitive_restart"),
+	GLFUNC_REQUIRES(glPrimitiveRestartNV,      "GL_NV_primitive_restart"),
+
+	// ARB_blend_func_extended
+	GLFUNC_REQUIRES(glBindFragDataLocationIndexed, "GL_ARB_blend_func_extended"),
+	GLFUNC_REQUIRES(glGetFragDataIndex,            "GL_ARB_blend_func_extended"),
+
+	// ARB_viewport_array
+	GLFUNC_REQUIRES(glDepthRangeArrayv,  "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glDepthRangeIndexed, "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glGetDoublei_v,      "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glGetFloati_v,       "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glScissorArrayv,     "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glScissorIndexed,    "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glScissorIndexedv,   "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glViewportArrayv,    "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glViewportIndexedf,  "GL_ARB_viewport_array"),
+	GLFUNC_REQUIRES(glViewportIndexedfv, "GL_ARB_viewport_array"),
+
+	// ARB_draw_elements_base_vertex
+	GLFUNC_REQUIRES(glDrawElementsBaseVertex,          "GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_REQUIRES(glDrawElementsInstancedBaseVertex, "GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_REQUIRES(glDrawRangeElementsBaseVertex,     "GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_REQUIRES(glMultiDrawElementsBaseVertex,     "GL_ARB_draw_elements_base_vertex"),
+
+	// OES_draw_elements_base_vertex
+	GLFUNC_SUFFIX(glDrawElementsBaseVertex,          OES, "GL_OES_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glDrawElementsInstancedBaseVertex, OES, "GL_OES_draw_elements_base_vertex VERSION_GLES3 !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glDrawRangeElementsBaseVertex,     OES, "GL_OES_draw_elements_base_vertex VERSION_GLES3 !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glMultiDrawElementsBaseVertex,     OES, "GL_OES_draw_elements_base_vertex GL_EXT_multi_draw_arrays !GL_ARB_draw_elements_base_vertex"),
+
+	// EXT_draw_elements_base_vertex
+	GLFUNC_SUFFIX(glDrawElementsBaseVertex,          EXT, "GL_EXT_draw_elements_base_vertex !GL_OES_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glDrawElementsInstancedBaseVertex, EXT, "GL_EXT_draw_elements_base_vertex VERSION_GLES3 !GL_OES_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glDrawRangeElementsBaseVertex,     EXT, "GL_EXT_draw_elements_base_vertex VERSION_GLES3 !GL_OES_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"),
+	GLFUNC_SUFFIX(glMultiDrawElementsBaseVertex,     EXT, "GL_EXT_draw_elements_base_vertex GL_EXT_multi_draw_arrays !GL_OES_draw_elements_base_vertex !GL_ARB_draw_elements_base_vertex"),
+
+	// ARB_sample_shading
+	GLFUNC_REQUIRES(glMinSampleShadingARB, "GL_ARB_sample_shading"),
+
+	// ARB_debug_output
+	GLFUNC_REQUIRES(glDebugMessageCallbackARB, "GL_ARB_debug_output"),
+	GLFUNC_REQUIRES(glDebugMessageControlARB,  "GL_ARB_debug_output"),
+	GLFUNC_REQUIRES(glDebugMessageInsertARB,   "GL_ARB_debug_output"),
+	GLFUNC_REQUIRES(glGetDebugMessageLogARB,   "GL_ARB_debug_output"),
+
+	// KHR_debug
+	GLFUNC_SUFFIX(glDebugMessageCallback, KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glDebugMessageControl,  KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glDebugMessageInsert,   KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glGetDebugMessageLog,   KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glGetObjectLabel,       KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glGetObjectPtrLabel,    KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glObjectLabel,          KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glObjectPtrLabel,       KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glPopDebugGroup,        KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_SUFFIX(glPushDebugGroup,       KHR, "GL_KHR_debug VERSION_GLES3"),
+	GLFUNC_REQUIRES(glDebugMessageCallback, "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glDebugMessageControl,  "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glDebugMessageInsert,   "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glGetDebugMessageLog,   "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glGetObjectLabel,       "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glGetObjectPtrLabel,    "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glObjectLabel,          "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glObjectPtrLabel,       "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glPopDebugGroup,        "GL_KHR_debug !VERSION_GLES3"),
+	GLFUNC_REQUIRES(glPushDebugGroup,       "GL_KHR_debug !VERSION_GLES3"),
+
+	// ARB_buffer_storage
+	GLFUNC_REQUIRES(glBufferStorage,         "GL_ARB_buffer_storage"),
+	GLFUNC_REQUIRES(glNamedBufferStorageEXT, "GL_ARB_buffer_storage GL_EXT_direct_state_access"),
+
+	// EXT_buffer_storage
+	GLFUNC_SUFFIX(glBufferStorage, EXT, "GL_EXT_buffer_storage !GL_ARB_buffer_storage"),
+
+	// EXT_geometry_shader
+	GLFUNC_SUFFIX(glFramebufferTexture, EXT, "GL_EXT_geometry_shader !VERSION_3_2"),
+
+	// NV_occlusion_query_samples
+	GLFUNC_REQUIRES(glGenOcclusionQueriesNV,    "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glDeleteOcclusionQueriesNV, "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glIsOcclusionQueryNV,       "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glBeginOcclusionQueryNV,    "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glEndOcclusionQueryNV,      "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glGetOcclusionQueryivNV,    "GL_NV_occlusion_query_samples"),
+	GLFUNC_REQUIRES(glGetOcclusionQueryuivNV,   "GL_NV_occlusion_query_samples"),
+
+	// ARB_clip_control
+	GLFUNC_REQUIRES(glClipControl, "GL_ARB_clip_control"),
+
+	// gl_1_1
+	// OpenGL 1.1 is at the end due to a bug in Android's EGL stack.
+	// eglGetProcAddress can only return a finite amount of function pointers
+	// To work around the issue put GL 1.1 function pointers at the end of the list
+	// We don't use many from GL 1.1, so we don't have the chance of hitting a null pointer
+	// For more information about Android's failing EGL stack, look at the Android issue report
+	// https://code.google.com/p/android/issues/detail?id=80882
+	GLFUNC_ALWAYS_REQUIRED(glClearIndex),
+	GLFUNC_ALWAYS_REQUIRED(glClearColor),
+	GLFUNC_ALWAYS_REQUIRED(glClear),
+	GLFUNC_ALWAYS_REQUIRED(glIndexMask),
+	GLFUNC_ALWAYS_REQUIRED(glColorMask),
+	GLFUNC_ALWAYS_REQUIRED(glAlphaFunc),
+	GLFUNC_ALWAYS_REQUIRED(glBlendFunc),
+	GLFUNC_ALWAYS_REQUIRED(glLogicOp),
+	GLFUNC_ALWAYS_REQUIRED(glCullFace),
+	GLFUNC_ALWAYS_REQUIRED(glFrontFace),
+	GLFUNC_ALWAYS_REQUIRED(glPointSize),
+	GLFUNC_ALWAYS_REQUIRED(glLineWidth),
+	GLFUNC_ALWAYS_REQUIRED(glLineStipple),
+	GLFUNC_ALWAYS_REQUIRED(glPolygonMode),
+	GLFUNC_ALWAYS_REQUIRED(glPolygonOffset),
+	GLFUNC_ALWAYS_REQUIRED(glPolygonStipple),
+	GLFUNC_ALWAYS_REQUIRED(glGetPolygonStipple),
+	GLFUNC_ALWAYS_REQUIRED(glEdgeFlag),
+	GLFUNC_ALWAYS_REQUIRED(glEdgeFlagv),
+	GLFUNC_ALWAYS_REQUIRED(glScissor),
+	GLFUNC_ALWAYS_REQUIRED(glClipPlane),
+	GLFUNC_ALWAYS_REQUIRED(glGetClipPlane),
+	GLFUNC_ALWAYS_REQUIRED(glDrawBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glReadBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glEnable),
+	GLFUNC_ALWAYS_REQUIRED(glDisable),
+	GLFUNC_ALWAYS_REQUIRED(glIsEnabled),
+	GLFUNC_ALWAYS_REQUIRED(glEnableClientState),
+	GLFUNC_ALWAYS_REQUIRED(glDisableClientState),
+	GLFUNC_ALWAYS_REQUIRED(glGetBooleanv),
+	GLFUNC_ALWAYS_REQUIRED(glGetDoublev),
+	GLFUNC_ALWAYS_REQUIRED(glGetFloatv),
+	GLFUNC_ALWAYS_REQUIRED(glPushAttrib),
+	GLFUNC_ALWAYS_REQUIRED(glPopAttrib),
+	GLFUNC_ALWAYS_REQUIRED(glPushClientAttrib),
+	GLFUNC_ALWAYS_REQUIRED(glPopClientAttrib),
+	GLFUNC_ALWAYS_REQUIRED(glRenderMode),
+	GLFUNC_ALWAYS_REQUIRED(glFinish),
+	GLFUNC_ALWAYS_REQUIRED(glFlush),
+	GLFUNC_ALWAYS_REQUIRED(glHint),
+	GLFUNC_ALWAYS_REQUIRED(glClearDepth),
+	GLFUNC_ALWAYS_REQUIRED(glDepthFunc),
+	GLFUNC_ALWAYS_REQUIRED(glDepthMask),
+	GLFUNC_ALWAYS_REQUIRED(glDepthRange),
+	GLFUNC_ALWAYS_REQUIRED(glClearAccum),
+	GLFUNC_ALWAYS_REQUIRED(glAccum),
+	GLFUNC_ALWAYS_REQUIRED(glMatrixMode),
+	GLFUNC_ALWAYS_REQUIRED(glOrtho),
+	GLFUNC_ALWAYS_REQUIRED(glFrustum),
+	GLFUNC_ALWAYS_REQUIRED(glViewport),
+	GLFUNC_ALWAYS_REQUIRED(glPushMatrix),
+	GLFUNC_ALWAYS_REQUIRED(glPopMatrix),
+	GLFUNC_ALWAYS_REQUIRED(glLoadIdentity),
+	GLFUNC_ALWAYS_REQUIRED(glLoadMatrixd),
+	GLFUNC_ALWAYS_REQUIRED(glLoadMatrixf),
+	GLFUNC_ALWAYS_REQUIRED(glMultMatrixd),
+	GLFUNC_ALWAYS_REQUIRED(glMultMatrixf),
+	GLFUNC_ALWAYS_REQUIRED(glRotated),
+	GLFUNC_ALWAYS_REQUIRED(glRotatef),
+	GLFUNC_ALWAYS_REQUIRED(glScaled),
+	GLFUNC_ALWAYS_REQUIRED(glScalef),
+	GLFUNC_ALWAYS_REQUIRED(glTranslated),
+	GLFUNC_ALWAYS_REQUIRED(glTranslatef),
+	GLFUNC_ALWAYS_REQUIRED(glIsList),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteLists),
+	GLFUNC_ALWAYS_REQUIRED(glGenLists),
+	GLFUNC_ALWAYS_REQUIRED(glNewList),
+	GLFUNC_ALWAYS_REQUIRED(glEndList),
+	GLFUNC_ALWAYS_REQUIRED(glCallList),
+	GLFUNC_ALWAYS_REQUIRED(glCallLists),
+	GLFUNC_ALWAYS_REQUIRED(glListBase),
+	GLFUNC_ALWAYS_REQUIRED(glBegin),
+	GLFUNC_ALWAYS_REQUIRED(glEnd),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2d),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2f),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2i),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2s),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3d),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3f),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3i),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3s),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4d),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4f),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4i),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4s),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2iv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex2sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3iv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex3sv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4dv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4fv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4iv),
+	GLFUNC_ALWAYS_REQUIRED(glVertex4sv),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3b),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3d),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3f),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3i),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3s),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3bv),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3dv),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3fv),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3iv),
+	GLFUNC_ALWAYS_REQUIRED(glNormal3sv),
+	GLFUNC_ALWAYS_REQUIRED(glIndexd),
+	GLFUNC_ALWAYS_REQUIRED(glIndexf),
+	GLFUNC_ALWAYS_REQUIRED(glIndexi),
+	GLFUNC_ALWAYS_REQUIRED(glIndexs),
+	GLFUNC_ALWAYS_REQUIRED(glIndexub),
+	GLFUNC_ALWAYS_REQUIRED(glIndexdv),
+	GLFUNC_ALWAYS_REQUIRED(glIndexfv),
+	GLFUNC_ALWAYS_REQUIRED(glIndexiv),
+	GLFUNC_ALWAYS_REQUIRED(glIndexsv),
+	GLFUNC_ALWAYS_REQUIRED(glIndexubv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3b),
+	GLFUNC_ALWAYS_REQUIRED(glColor3d),
+	GLFUNC_ALWAYS_REQUIRED(glColor3f),
+	GLFUNC_ALWAYS_REQUIRED(glColor3i),
+	GLFUNC_ALWAYS_REQUIRED(glColor3s),
+	GLFUNC_ALWAYS_REQUIRED(glColor3ub),
+	GLFUNC_ALWAYS_REQUIRED(glColor3ui),
+	GLFUNC_ALWAYS_REQUIRED(glColor3us),
+	GLFUNC_ALWAYS_REQUIRED(glColor4b),
+	GLFUNC_ALWAYS_REQUIRED(glColor4d),
+	GLFUNC_ALWAYS_REQUIRED(glColor4f),
+	GLFUNC_ALWAYS_REQUIRED(glColor4i),
+	GLFUNC_ALWAYS_REQUIRED(glColor4s),
+	GLFUNC_ALWAYS_REQUIRED(glColor4ub),
+	GLFUNC_ALWAYS_REQUIRED(glColor4ui),
+	GLFUNC_ALWAYS_REQUIRED(glColor4us),
+	GLFUNC_ALWAYS_REQUIRED(glColor3bv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3dv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3fv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3iv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3sv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3ubv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3uiv),
+	GLFUNC_ALWAYS_REQUIRED(glColor3usv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4bv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4dv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4fv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4iv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4sv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4ubv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4uiv),
+	GLFUNC_ALWAYS_REQUIRED(glColor4usv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1d),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1f),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1i),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1s),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2d),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2f),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2i),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2s),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3d),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3f),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3i),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3s),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4d),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4f),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4i),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4s),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1dv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1fv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1iv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord1sv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2dv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2fv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2iv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord2sv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3dv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3fv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3iv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord3sv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4dv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4fv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4iv),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoord4sv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2d),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2f),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2i),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2s),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3d),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3f),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3i),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3s),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4d),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4f),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4i),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4s),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2dv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2fv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2iv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos2sv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3dv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3fv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3iv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos3sv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4dv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4fv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4iv),
+	GLFUNC_ALWAYS_REQUIRED(glRasterPos4sv),
+	GLFUNC_ALWAYS_REQUIRED(glRectd),
+	GLFUNC_ALWAYS_REQUIRED(glRectf),
+	GLFUNC_ALWAYS_REQUIRED(glRecti),
+	GLFUNC_ALWAYS_REQUIRED(glRects),
+	GLFUNC_ALWAYS_REQUIRED(glRectdv),
+	GLFUNC_ALWAYS_REQUIRED(glRectfv),
+	GLFUNC_ALWAYS_REQUIRED(glRectiv),
+	GLFUNC_ALWAYS_REQUIRED(glRectsv),
+	GLFUNC_ALWAYS_REQUIRED(glVertexPointer),
+	GLFUNC_ALWAYS_REQUIRED(glNormalPointer),
+	GLFUNC_ALWAYS_REQUIRED(glColorPointer),
+	GLFUNC_ALWAYS_REQUIRED(glIndexPointer),
+	GLFUNC_ALWAYS_REQUIRED(glTexCoordPointer),
+	GLFUNC_ALWAYS_REQUIRED(glEdgeFlagPointer),
+	GLFUNC_ALWAYS_REQUIRED(glGetPointerv),
+	GLFUNC_ALWAYS_REQUIRED(glArrayElement),
+	GLFUNC_ALWAYS_REQUIRED(glDrawArrays),
+	GLFUNC_ALWAYS_REQUIRED(glDrawElements),
+	GLFUNC_ALWAYS_REQUIRED(glInterleavedArrays),
+	GLFUNC_ALWAYS_REQUIRED(glShadeModel),
+	GLFUNC_ALWAYS_REQUIRED(glLightf),
+	GLFUNC_ALWAYS_REQUIRED(glLighti),
+	GLFUNC_ALWAYS_REQUIRED(glLightfv),
+	GLFUNC_ALWAYS_REQUIRED(glLightiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetLightfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetLightiv),
+	GLFUNC_ALWAYS_REQUIRED(glLightModelf),
+	GLFUNC_ALWAYS_REQUIRED(glLightModeli),
+	GLFUNC_ALWAYS_REQUIRED(glLightModelfv),
+	GLFUNC_ALWAYS_REQUIRED(glLightModeliv),
+	GLFUNC_ALWAYS_REQUIRED(glMaterialf),
+	GLFUNC_ALWAYS_REQUIRED(glMateriali),
+	GLFUNC_ALWAYS_REQUIRED(glMaterialfv),
+	GLFUNC_ALWAYS_REQUIRED(glMaterialiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetMaterialfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetMaterialiv),
+	GLFUNC_ALWAYS_REQUIRED(glColorMaterial),
+	GLFUNC_ALWAYS_REQUIRED(glPixelZoom),
+	GLFUNC_ALWAYS_REQUIRED(glPixelStoref),
+	GLFUNC_ALWAYS_REQUIRED(glPixelStorei),
+	GLFUNC_ALWAYS_REQUIRED(glPixelTransferf),
+	GLFUNC_ALWAYS_REQUIRED(glPixelTransferi),
+	GLFUNC_ALWAYS_REQUIRED(glPixelMapfv),
+	GLFUNC_ALWAYS_REQUIRED(glPixelMapuiv),
+	GLFUNC_ALWAYS_REQUIRED(glPixelMapusv),
+	GLFUNC_ALWAYS_REQUIRED(glGetPixelMapfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetPixelMapuiv),
+	GLFUNC_ALWAYS_REQUIRED(glGetPixelMapusv),
+	GLFUNC_ALWAYS_REQUIRED(glBitmap),
+	GLFUNC_ALWAYS_REQUIRED(glReadPixels),
+	GLFUNC_ALWAYS_REQUIRED(glDrawPixels),
+	GLFUNC_ALWAYS_REQUIRED(glCopyPixels),
+	GLFUNC_ALWAYS_REQUIRED(glStencilFunc),
+	GLFUNC_ALWAYS_REQUIRED(glStencilMask),
+	GLFUNC_ALWAYS_REQUIRED(glStencilOp),
+	GLFUNC_ALWAYS_REQUIRED(glClearStencil),
+	GLFUNC_ALWAYS_REQUIRED(glTexGend),
+	GLFUNC_ALWAYS_REQUIRED(glTexGenf),
+	GLFUNC_ALWAYS_REQUIRED(glTexGeni),
+	GLFUNC_ALWAYS_REQUIRED(glTexGendv),
+	GLFUNC_ALWAYS_REQUIRED(glTexGenfv),
+	GLFUNC_ALWAYS_REQUIRED(glTexGeniv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexGendv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexGenfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexGeniv),
+	GLFUNC_ALWAYS_REQUIRED(glTexEnvf),
+	GLFUNC_ALWAYS_REQUIRED(glTexEnvi),
+	GLFUNC_ALWAYS_REQUIRED(glTexEnvfv),
+	GLFUNC_ALWAYS_REQUIRED(glTexEnviv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexEnvfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexEnviv),
+	GLFUNC_ALWAYS_REQUIRED(glTexParameterf),
+	GLFUNC_ALWAYS_REQUIRED(glTexParameteri),
+	GLFUNC_ALWAYS_REQUIRED(glTexParameterfv),
+	GLFUNC_ALWAYS_REQUIRED(glTexParameteriv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexParameterfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexParameteriv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameterfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameteriv),
+	GLFUNC_ALWAYS_REQUIRED(glTexImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glTexImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glGetTexImage),
+	GLFUNC_ALWAYS_REQUIRED(glGenTextures),
+	GLFUNC_ALWAYS_REQUIRED(glDeleteTextures),
+	GLFUNC_ALWAYS_REQUIRED(glBindTexture),
+	GLFUNC_ALWAYS_REQUIRED(glPrioritizeTextures),
+	GLFUNC_ALWAYS_REQUIRED(glAreTexturesResident),
+	GLFUNC_ALWAYS_REQUIRED(glIsTexture),
+	GLFUNC_ALWAYS_REQUIRED(glTexSubImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glTexSubImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glCopyTexImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glCopyTexImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage1D),
+	GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage2D),
+	GLFUNC_ALWAYS_REQUIRED(glMap1d),
+	GLFUNC_ALWAYS_REQUIRED(glMap1f),
+	GLFUNC_ALWAYS_REQUIRED(glMap2d),
+	GLFUNC_ALWAYS_REQUIRED(glMap2f),
+	GLFUNC_ALWAYS_REQUIRED(glGetMapdv),
+	GLFUNC_ALWAYS_REQUIRED(glGetMapfv),
+	GLFUNC_ALWAYS_REQUIRED(glGetMapiv),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord1d),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord1f),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord1dv),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord1fv),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord2d),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord2f),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord2dv),
+	GLFUNC_ALWAYS_REQUIRED(glEvalCoord2fv),
+	GLFUNC_ALWAYS_REQUIRED(glMapGrid1d),
+	GLFUNC_ALWAYS_REQUIRED(glMapGrid1f),
+	GLFUNC_ALWAYS_REQUIRED(glMapGrid2d),
+	GLFUNC_ALWAYS_REQUIRED(glMapGrid2f),
+	GLFUNC_ALWAYS_REQUIRED(glEvalPoint1),
+	GLFUNC_ALWAYS_REQUIRED(glEvalPoint2),
+	GLFUNC_ALWAYS_REQUIRED(glEvalMesh1),
+	GLFUNC_ALWAYS_REQUIRED(glEvalMesh2),
+	GLFUNC_ALWAYS_REQUIRED(glFogf),
+	GLFUNC_ALWAYS_REQUIRED(glFogi),
+	GLFUNC_ALWAYS_REQUIRED(glFogfv),
+	GLFUNC_ALWAYS_REQUIRED(glFogiv),
+	GLFUNC_ALWAYS_REQUIRED(glFeedbackBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glPassThrough),
+	GLFUNC_ALWAYS_REQUIRED(glSelectBuffer),
+	GLFUNC_ALWAYS_REQUIRED(glInitNames),
+	GLFUNC_ALWAYS_REQUIRED(glLoadName),
+	GLFUNC_ALWAYS_REQUIRED(glPushName),
+	GLFUNC_ALWAYS_REQUIRED(glPopName),
+};
+
+namespace GLExtensions
+{
+	// Private members and functions
+	static bool _isES3;
+	static bool _isES;
+	static u32 _GLVersion;
+	static std::unordered_map<std::string, bool> m_extension_list;
+
+	// Private initialization functions
+	bool InitFunctionPointers();
+
+	// Initializes the extension list the old way
+	static void InitExtensionList21()
+	{
+		const char* extensions = (const char*)glGetString(GL_EXTENSIONS);
+		std::string tmp(extensions);
+		std::istringstream buffer(tmp);
+
+		while (buffer >> tmp)
+			m_extension_list[tmp] = true;
+	}
+
+	static void InitExtensionList()
+	{
+		m_extension_list.clear();
+		if (_isES3)
+		{
+			// XXX: Add all extensions that a base ES3 implementation supports
+			std::string gles3exts[] = {
+				"GL_ARB_uniform_buffer_object",
+				"GL_ARB_sampler_objects",
+				"GL_ARB_map_buffer_range",
+				"GL_ARB_vertex_array_object",
+				"GL_ARB_framebuffer_object",
+				"GL_ARB_occlusion_query",
+				"GL_ARB_get_program_binary",
+				"GL_ARB_sync",
+				"GL_ARB_ES2_compatibility",
+				"VERSION_GLES3",
+				"VERSION_3_0",
+				};
+			for (auto it : gles3exts)
+				m_extension_list[it] = true;
+		}
+		else if (!_isES)
+		{
+			// Some OpenGL implementations chose to not expose core extensions as extensions
+			// Let's add them to the list manually depending on which version of OpenGL we have
+			// We need to be slightly careful here
+			// When an extension got merged in to core, the naming may have changed
+
+			// This has intentional fall through
+			switch (_GLVersion)
+			{
+				default:
+				case 450:
+				{
+					std::string gl450exts[] = {
+						"GL_ARB_ES3_1_compatibility",
+						"GL_ARB_clip_control",
+						"GL_ARB_conditional_render_inverted",
+						"GL_ARB_cull_distance",
+						"GL_ARB_derivative_control",
+						"GL_ARB_direct_state_access",
+						"GL_ARB_get_texture_sub_image",
+						"GL_ARB_robustness",
+						"GL_ARB_shader_texture_image_samples",
+						"GL_ARB_texture_barrier",
+						"VERSION_4_5",
+					};
+					for (auto it : gl450exts)
+						m_extension_list[it] = true;
+				}
+				case 440:
+				{
+					std::string gl440exts[] = {
+						"GL_ARB_buffer_storage",
+						"GL_ARB_clear_texture",
+						"GL_ARB_enhanced_layouts",
+						"GL_ARB_multi_bind",
+						"GL_ARB_query_buffer_object",
+						"GL_ARB_texture_mirror_clamp_to_edge",
+						"GL_ARB_texture_stencil8",
+						"GL_ARB_vertex_type_10f_11f_11f_rev",
+						"VERSION_4_4",
+					};
+					for (auto it : gl440exts)
+						m_extension_list[it] = true;
+				}
+				case 430:
+				{
+					std::string gl430exts[] = {
+						"GL_ARB_ES3_compatibility",
+						"GL_ARB_arrays_of_arrays",
+						"GL_ARB_clear_buffer_object",
+						"GL_ARB_compute_shader",
+						"GL_ARB_copy_image",
+						"GL_ARB_explicit_uniform_location",
+						"GL_ARB_fragment_layer_viewport",
+						"GL_ARB_framebuffer_no_attachments",
+						"GL_ARB_internalformat_query2",
+						"GL_ARB_invalidate_subdata",
+						"GL_ARB_multi_draw_indirect",
+						"GL_ARB_program_interface_query",
+						"GL_ARB_shader_image_size",
+						"GL_ARB_shader_storage_buffer_object",
+						"GL_ARB_stencil_texturing",
+						"GL_ARB_texture_buffer_range",
+						"GL_ARB_texture_query_levels",
+						"GL_ARB_texture_storage_multisample",
+						"GL_ARB_texture_view",
+						"GL_ARB_vertex_attrib_binding",
+						"VERSION_4_3",
+					};
+					for (auto it : gl430exts)
+						m_extension_list[it] = true;
+				}
+				case 420:
+				{
+					std::string gl420exts[] = {
+						"GL_ARB_base_instance",
+						"GL_ARB_compressed_texture_pixel_storage",
+						"GL_ARB_conservative_depth",
+						"GL_ARB_internalformat_query",
+						"GL_ARB_map_buffer_alignment",
+						"GL_ARB_shader_atomic_counters",
+						"GL_ARB_shader_image_load_store",
+						"GL_ARB_shading_language_420pack",
+						"GL_ARB_shading_language_packing",
+						"GL_ARB_texture_compression_BPTC",
+						"GL_ARB_texture_storage",
+						"GL_ARB_transform_feedback_instanced",
+						"VERSION_4_2",
+					};
+					for (auto it : gl420exts)
+						m_extension_list[it] = true;
+				}
+				case 410:
+				{
+					std::string gl410exts[] = {
+						"GL_ARB_ES2_compatibility",
+						"GL_ARB_get_program_binary",
+						"GL_ARB_separate_shader_objects",
+						"GL_ARB_shader_precision",
+						"GL_ARB_vertex_attrib_64_bit",
+						"GL_ARB_viewport_array",
+						"VERSION_4_1",
+					};
+					for (auto it : gl410exts)
+						m_extension_list[it] = true;
+				}
+				case 400:
+				{
+					std::string gl400exts[] = {
+						"GL_ARB_draw_indirect",
+						"GL_ARB_gpu_shader5",
+						"GL_ARB_gpu_shader_fp64",
+						"GL_ARB_sample_shading",
+						"GL_ARB_shader_subroutine",
+						"GL_ARB_tessellation_shader",
+						"GL_ARB_texture_buffer_object_rgb32",
+						"GL_ARB_texture_cube_map_array",
+						"GL_ARB_texture_gather",
+						"GL_ARB_texture_query_lod",
+						"GL_ARB_transform_feedback2",
+						"GL_ARB_transform_feedback3",
+						"VERSION_4_0",
+					};
+					for (auto it : gl400exts)
+						m_extension_list[it] = true;
+				}
+				case 330:
+				{
+					std::string gl330exts[] = {
+						"GL_ARB_shader_bit_encoding",
+						"GL_ARB_blend_func_extended",
+						"GL_ARB_explicit_attrib_location",
+						"GL_ARB_occlusion_query2",
+						"GL_ARB_sampler_objects",
+						"GL_ARB_texture_swizzle",
+						"GL_ARB_timer_query",
+						"GL_ARB_instanced_arrays",
+						"GL_ARB_texture_rgb10_a2ui",
+						"GL_ARB_vertex_type_2_10_10_10_rev",
+						"VERSION_3_3",
+					};
+					for (auto it : gl330exts)
+						m_extension_list[it] = true;
+				}
+				case 320:
+				{
+					std::string gl320exts[] = {
+						"GL_ARB_geometry_shader4",
+						"GL_ARB_sync",
+						"GL_ARB_vertex_array_bgra",
+						"GL_ARB_draw_elements_base_vertex",
+						"GL_ARB_seamless_cube_map",
+						"GL_ARB_texture_multisample",
+						"GL_ARB_fragment_coord_conventions",
+						"GL_ARB_provoking_vertex",
+						"GL_ARB_depth_clamp",
+						"VERSION_3_2",
+					};
+					for (auto it : gl320exts)
+						m_extension_list[it] = true;
+				}
+				case 310:
+				{
+					// Can't add NV_primitive_restart since function name changed
+					std::string gl310exts[] = {
+						"GL_ARB_draw_instanced",
+						"GL_ARB_copy_buffer",
+						"GL_ARB_texture_buffer_object",
+						"GL_ARB_texture_rectangle",
+						"GL_ARB_uniform_buffer_object",
+						//"GL_NV_primitive_restart",
+						"VERSION_3_1",
+					};
+					for (auto it : gl310exts)
+						m_extension_list[it] = true;
+				}
+				case 300:
+				{
+					// Quite a lot of these had their names changed when merged in to core
+					// Disable the ones that have
+					std::string gl300exts[] = {
+						"GL_ARB_map_buffer_range",
+						//"GL_EXT_gpu_shader4",
+						//"GL_APPLE_flush_buffer_range",
+						"GL_ARB_color_buffer_float",
+						//"GL_NV_depth_buffer_float",
+						"GL_ARB_texture_float",
+						//"GL_EXT_packed_float",
+						//"GL_EXT_texture_shared_exponent",
+						"GL_ARB_half_float_pixel",
+						//"GL_NV_half_float",
+						"GL_ARB_framebuffer_object",
+						//"GL_EXT_framebuffer_sRGB",
+						"GL_ARB_texture_float",
+						//"GL_EXT_texture_integer",
+						//"GL_EXT_draw_buffers2",
+						//"GL_EXT_texture_integer",
+						//"GL_EXT_texture_array",
+						//"GL_EXT_texture_compression_rgtc",
+						//"GL_EXT_transform_feedback",
+						"GL_ARB_vertex_array_object",
+						//"GL_NV_conditional_render",
+						"VERSION_3_0",
+					};
+					for (auto it : gl300exts)
+						m_extension_list[it] = true;
+				}
+				case 210:
+				case 200:
+				case 150:
+				case 140:
+				case 130:
+				case 121:
+				case 120:
+				case 110:
+				case 100:
+				break;
+			}
+		}
+
+		if (_GLVersion < 300)
+		{
+			InitExtensionList21();
+			return;
+		}
+		GLint NumExtension = 0;
+		glGetIntegerv(GL_NUM_EXTENSIONS, &NumExtension);
+		for (GLint i = 0; i < NumExtension; ++i)
+			m_extension_list[std::string((const char*)glGetStringi(GL_EXTENSIONS, i))] = true;
+	}
+	static void InitVersion()
+	{
+		GLint major, minor;
+		glGetIntegerv(GL_MAJOR_VERSION, &major);
+		glGetIntegerv(GL_MINOR_VERSION, &minor);
+		if (glGetError() == GL_NO_ERROR)
+			_GLVersion = major * 100 + minor * 10;
+		else
+			_GLVersion = 210;
+		if (_isES3)
+			_GLVersion = 330; // Get all the fun things
+	}
+
+	static void* GetFuncAddress(const std::string& name, void **func)
+	{
+		*func = GLInterface->GetFuncAddress(name);
+		if (*func == nullptr)
+		{
+#if defined(__linux__) || defined(__APPLE__)
+			// Give it a second try with dlsym
+			*func = dlsym(RTLD_NEXT, name.c_str());
+#endif
+			if (*func == nullptr && _isES)
+				*func = (void*)(uintptr_t)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on
+			if (*func == nullptr)
+				ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str());
+		}
+		return *func;
+	}
+
+	// Public members
+	u32 Version() { return _GLVersion; }
+	bool Supports(const std::string& name)
+	{
+		return m_extension_list[name];
+	}
+
+	bool Init()
+	{
+		_isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3;
+		_isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2;
+
+		// Grab a few functions for initial checking
+		// We need them to grab the extension list
+		// Also to check if there is an error grabbing the version
+		if (GetFuncAddress("glGetIntegerv", (void**)&glGetIntegerv) == nullptr)
+			return false;
+		if (GetFuncAddress("glGetString", (void**)&glGetString) == nullptr)
+			return false;
+		if (GetFuncAddress("glGetError", (void**)&glGetError) == nullptr)
+			return false;
+
+		InitVersion();
+
+		// We need to use glGetStringi to get the extension list
+		// if we are using GLES3 or a GL version greater than 2.1
+		if (_GLVersion > 210 && GetFuncAddress("glGetStringi", (void**)&glGetStringi) == nullptr)
+			return false;
+
+		InitExtensionList();
+
+		return InitFunctionPointers();
+	}
+
+	// Private initialization functions
+	static bool HasFeatures(const std::string& extensions)
+	{
+		bool result = true;
+		std::string tmp;
+		std::istringstream buffer(extensions);
+
+		while (buffer >> tmp)
+		{
+			if (tmp[0] == '!')
+				result &= !m_extension_list[tmp.erase(0)];
+			else
+				result &= m_extension_list[tmp];
+		}
+		return result;
+	}
+	bool InitFunctionPointers()
+	{
+		bool result = true;
+		for (const auto &it : gl_function_array)
+			if (HasFeatures(it.requirements))
+				result &= !!GetFuncAddress(it.function_name, it.function_ptr);
+		return result;
+	}
+}
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
new file mode 100644
index 0000000000..869aaefe36
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
@@ -0,0 +1,49 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_clip_control.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_sample_shading.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_sync.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h"
+#include "VideoBackends/OGL/GLExtensions/ARB_viewport_array.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_1.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_2.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_3.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_4.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_5.h"
+#include "VideoBackends/OGL/GLExtensions/gl_2_0.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_0.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_1.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_2.h"
+#include "VideoBackends/OGL/GLExtensions/KHR_debug.h"
+#include "VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h"
+#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
+
+namespace GLExtensions
+{
+	// Initializes the interface
+	bool Init();
+
+	// Function for checking if the hardware supports an extension
+	// example: if (GLExtensions::Supports("GL_ARB_multi_map"))
+	bool Supports(const std::string& name);
+
+	// Returns OpenGL version in format 430
+	u32 Version();
+}
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h b/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h
new file mode 100644
index 0000000000..375b42a1cf
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h
@@ -0,0 +1,75 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+#ifndef GL_VERSION_4_3
+
+#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
+#define GL_DEBUG_SOURCE_API 0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
+#define GL_DEBUG_SOURCE_APPLICATION 0x824A
+#define GL_DEBUG_SOURCE_OTHER 0x824B
+#define GL_DEBUG_TYPE_ERROR 0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY 0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
+#define GL_DEBUG_TYPE_OTHER 0x8251
+#define GL_DEBUG_TYPE_MARKER 0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
+#define GL_DEBUG_TYPE_POP_GROUP 0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D
+#define GL_BUFFER 0x82E0
+#define GL_SHADER 0x82E1
+#define GL_PROGRAM 0x82E2
+#define GL_QUERY 0x82E3
+#define GL_PROGRAM_PIPELINE 0x82E4
+#define GL_SAMPLER 0x82E6
+#define GL_DISPLAY_LIST 0x82E7
+#define GL_MAX_LABEL_LENGTH 0x82E8
+#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
+#define GL_DEBUG_LOGGED_MESSAGES 0x9145
+#define GL_DEBUG_SEVERITY_HIGH 0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
+#define GL_DEBUG_SEVERITY_LOW 0x9148
+#define GL_DEBUG_OUTPUT 0x92E0
+
+typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
+
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const GLvoid *userParam);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled);
+typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf);
+typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPTRLABELPROC) (void* ptr, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar* label);
+typedef void (GLAPIENTRY * PFNGLOBJECTPTRLABELPROC) (void* ptr, GLsizei length, const GLchar* label);
+typedef void (GLAPIENTRY * PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
+
+#endif
+
+extern PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback;
+extern PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl;
+extern PFNGLDEBUGMESSAGEINSERTPROC glDebugMessageInsert;
+extern PFNGLGETDEBUGMESSAGELOGPROC glGetDebugMessageLog;
+extern PFNGLGETOBJECTLABELPROC glGetObjectLabel;
+extern PFNGLGETOBJECTPTRLABELPROC glGetObjectPtrLabel;
+extern PFNGLOBJECTLABELPROC glObjectLabel;
+extern PFNGLOBJECTPTRLABELPROC glObjectPtrLabel;
+extern PFNGLPOPDEBUGGROUPPROC glPopDebugGroup;
+extern PFNGLPUSHDEBUGGROUPPROC glPushDebugGroup;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h b/Source/Core/VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h
new file mode 100644
index 0000000000..f57e622c83
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h
@@ -0,0 +1,13 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLGENOCCLUSIONQUERIESNVPROC glGenOcclusionQueriesNV;
+extern PFNGLDELETEOCCLUSIONQUERIESNVPROC glDeleteOcclusionQueriesNV;
+extern PFNGLISOCCLUSIONQUERYNVPROC glIsOcclusionQueryNV;
+extern PFNGLBEGINOCCLUSIONQUERYNVPROC glBeginOcclusionQueryNV;
+extern PFNGLENDOCCLUSIONQUERYNVPROC glEndOcclusionQueryNV;
+extern PFNGLGETOCCLUSIONQUERYIVNVPROC glGetOcclusionQueryivNV;
+extern PFNGLGETOCCLUSIONQUERYUIVNVPROC glGetOcclusionQueryuivNV;
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h b/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h
new file mode 100644
index 0000000000..9b72621a3b
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h
@@ -0,0 +1,15 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+#define GL_PRIMITIVE_RESTART_NV 0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559
+
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void);
+
+extern PFNGLPRIMITIVERESTARTINDEXNVPROC glPrimitiveRestartIndexNV;
+extern PFNGLPRIMITIVERESTARTNVPROC glPrimitiveRestartNV;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h
new file mode 100644
index 0000000000..7482acc281
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h
@@ -0,0 +1,680 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+typedef void (GLAPIENTRY * PFNGLCLEARINDEXPROC) ( GLfloat c );
+typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+typedef void (GLAPIENTRY * PFNGLCLEARPROC) ( GLbitfield mask );
+typedef void (GLAPIENTRY * PFNGLINDEXMASKPROC) ( GLuint mask );
+typedef void (GLAPIENTRY * PFNGLCOLORMASKPROC) ( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+typedef void (GLAPIENTRY * PFNGLALPHAFUNCPROC) ( GLenum func, GLclampf ref );
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCPROC) ( GLenum sfactor, GLenum dfactor );
+typedef void (GLAPIENTRY * PFNGLLOGICOPPROC) ( GLenum opcode );
+typedef void (GLAPIENTRY * PFNGLCULLFACEPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLFRONTFACEPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLPOINTSIZEPROC) ( GLfloat size );
+typedef void (GLAPIENTRY * PFNGLLINEWIDTHPROC) ( GLfloat width );
+typedef void (GLAPIENTRY * PFNGLLINESTIPPLEPROC) ( GLint factor, GLushort pattern );
+typedef void (GLAPIENTRY * PFNGLPOLYGONMODEPROC) ( GLenum face, GLenum mode );
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETPROC) ( GLfloat factor, GLfloat units );
+typedef void (GLAPIENTRY * PFNGLPOLYGONSTIPPLEPROC) ( const GLubyte *mask );
+typedef void (GLAPIENTRY * PFNGLGETPOLYGONSTIPPLEPROC) ( GLubyte *mask );
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPROC) ( GLboolean flag );
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGVPROC) ( const GLboolean *flag );
+typedef void (GLAPIENTRY * PFNGLSCISSORPROC) ( GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCLIPPLANEPROC) ( GLenum plane, const GLdouble *equation );
+typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEPROC) ( GLenum plane, GLdouble *equation );
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLREADBUFFERPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLENABLEPROC) ( GLenum cap );
+typedef void (GLAPIENTRY * PFNGLDISABLEPROC) ( GLenum cap );
+typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDPROC) ( GLenum cap );
+typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEPROC) ( GLenum cap ); /* 1.1 */
+typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEPROC) ( GLenum cap ); /* 1.1 */
+typedef void (GLAPIENTRY * PFNGLGETBOOLEANVPROC) ( GLenum pname, GLboolean *params );
+typedef void (GLAPIENTRY * PFNGLGETDOUBLEVPROC) ( GLenum pname, GLdouble *params );
+typedef void (GLAPIENTRY * PFNGLGETFLOATVPROC) ( GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETINTEGERVPROC) ( GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLPUSHATTRIBPROC) ( GLbitfield mask );
+typedef void (GLAPIENTRY * PFNGLPOPATTRIBPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLPUSHCLIENTATTRIBPROC) ( GLbitfield mask ); /* 1.1 */
+typedef void (GLAPIENTRY * PFNGLPOPCLIENTATTRIBPROC) ( void ); /* 1.1 */
+typedef GLint (GLAPIENTRY * PFNGLRENDERMODEPROC) ( GLenum mode );
+typedef GLenum (GLAPIENTRY * PFNGLGETERRORPROC) ( void );
+typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGPROC) ( GLenum name );
+typedef void (GLAPIENTRY * PFNGLFINISHPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLFLUSHPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLHINTPROC) ( GLenum target, GLenum mode );
+typedef void (GLAPIENTRY * PFNGLCLEARDEPTHPROC) ( GLclampd depth );
+typedef void (GLAPIENTRY * PFNGLDEPTHFUNCPROC) ( GLenum func );
+typedef void (GLAPIENTRY * PFNGLDEPTHMASKPROC) ( GLboolean flag );
+typedef void (GLAPIENTRY * PFNGLDEPTHRANGEPROC) ( GLclampd near_val, GLclampd far_val );
+typedef void (GLAPIENTRY * PFNGLCLEARACCUMPROC) ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+typedef void (GLAPIENTRY * PFNGLACCUMPROC) ( GLenum op, GLfloat value );
+typedef void (GLAPIENTRY * PFNGLMATRIXMODEPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLORTHOPROC) ( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
+typedef void (GLAPIENTRY * PFNGLFRUSTUMPROC) ( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
+typedef void (GLAPIENTRY * PFNGLVIEWPORTPROC) ( GLint x, GLint y, GLsizei width, GLsizei height );
+typedef void (GLAPIENTRY * PFNGLPUSHMATRIXPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLPOPMATRIXPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLLOADIDENTITYPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLLOADMATRIXDPROC) ( const GLdouble *m );
+typedef void (GLAPIENTRY * PFNGLLOADMATRIXFPROC) ( const GLfloat *m );
+typedef void (GLAPIENTRY * PFNGLMULTMATRIXDPROC) ( const GLdouble *m );
+typedef void (GLAPIENTRY * PFNGLMULTMATRIXFPROC) ( const GLfloat *m );
+typedef void (GLAPIENTRY * PFNGLROTATEDPROC) ( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
+typedef void (GLAPIENTRY * PFNGLROTATEFPROC) ( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
+typedef void (GLAPIENTRY * PFNGLSCALEDPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (GLAPIENTRY * PFNGLSCALEFPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef void (GLAPIENTRY * PFNGLTRANSLATEDPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (GLAPIENTRY * PFNGLTRANSLATEFPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef GLboolean (GLAPIENTRY * PFNGLISLISTPROC) ( GLuint list );
+typedef void (GLAPIENTRY * PFNGLDELETELISTSPROC) ( GLuint list, GLsizei range );
+typedef GLuint (GLAPIENTRY * PFNGLGENLISTSPROC) ( GLsizei range );
+typedef void (GLAPIENTRY * PFNGLNEWLISTPROC) ( GLuint list, GLenum mode );
+typedef void (GLAPIENTRY * PFNGLENDLISTPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLCALLLISTPROC) ( GLuint list );
+typedef void (GLAPIENTRY * PFNGLCALLLISTSPROC) ( GLsizei n, GLenum type, const GLvoid *lists );
+typedef void (GLAPIENTRY * PFNGLLISTBASEPROC) ( GLuint base );
+typedef void (GLAPIENTRY * PFNGLBEGINPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLENDPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLVERTEX2DPROC) ( GLdouble x, GLdouble y );
+typedef void (GLAPIENTRY * PFNGLVERTEX2FPROC) ( GLfloat x, GLfloat y );
+typedef void (GLAPIENTRY * PFNGLVERTEX2IPROC) ( GLint x, GLint y );
+typedef void (GLAPIENTRY * PFNGLVERTEX2SPROC) ( GLshort x, GLshort y );
+typedef void (GLAPIENTRY * PFNGLVERTEX3DPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (GLAPIENTRY * PFNGLVERTEX3FPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef void (GLAPIENTRY * PFNGLVERTEX3IPROC) ( GLint x, GLint y, GLint z );
+typedef void (GLAPIENTRY * PFNGLVERTEX3SPROC) ( GLshort x, GLshort y, GLshort z );
+typedef void (GLAPIENTRY * PFNGLVERTEX4DPROC) ( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+typedef void (GLAPIENTRY * PFNGLVERTEX4FPROC) ( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+typedef void (GLAPIENTRY * PFNGLVERTEX4IPROC) ( GLint x, GLint y, GLint z, GLint w );
+typedef void (GLAPIENTRY * PFNGLVERTEX4SPROC) ( GLshort x, GLshort y, GLshort z, GLshort w );
+typedef void (GLAPIENTRY * PFNGLVERTEX2DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX2FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX2IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX2SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX3DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX3FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX3IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX3SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX4DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX4FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX4IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLVERTEX4SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLNORMAL3BPROC) ( GLbyte nx, GLbyte ny, GLbyte nz );
+typedef void (GLAPIENTRY * PFNGLNORMAL3DPROC) ( GLdouble nx, GLdouble ny, GLdouble nz );
+typedef void (GLAPIENTRY * PFNGLNORMAL3FPROC) ( GLfloat nx, GLfloat ny, GLfloat nz );
+typedef void (GLAPIENTRY * PFNGLNORMAL3IPROC) ( GLint nx, GLint ny, GLint nz );
+typedef void (GLAPIENTRY * PFNGLNORMAL3SPROC) ( GLshort nx, GLshort ny, GLshort nz );
+typedef void (GLAPIENTRY * PFNGLNORMAL3BVPROC) ( const GLbyte *v );
+typedef void (GLAPIENTRY * PFNGLNORMAL3DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLNORMAL3FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLNORMAL3IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLNORMAL3SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLINDEXDPROC) ( GLdouble c );
+typedef void (GLAPIENTRY * PFNGLINDEXFPROC) ( GLfloat c );
+typedef void (GLAPIENTRY * PFNGLINDEXIPROC) ( GLint c );
+typedef void (GLAPIENTRY * PFNGLINDEXSPROC) ( GLshort c );
+typedef void (GLAPIENTRY * PFNGLINDEXUBPROC) ( GLubyte c ); /* 1.1 */
+typedef void (GLAPIENTRY * PFNGLINDEXDVPROC) ( const GLdouble *c );
+typedef void (GLAPIENTRY * PFNGLINDEXFVPROC) ( const GLfloat *c );
+typedef void (GLAPIENTRY * PFNGLINDEXIVPROC) ( const GLint *c );
+typedef void (GLAPIENTRY * PFNGLINDEXSVPROC) ( const GLshort *c );
+typedef void (GLAPIENTRY * PFNGLINDEXUBVPROC) ( const GLubyte *c ); /* 1.1 */
+typedef void (GLAPIENTRY * PFNGLCOLOR3BPROC) ( GLbyte red, GLbyte green, GLbyte blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3DPROC) ( GLdouble red, GLdouble green, GLdouble blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3FPROC) ( GLfloat red, GLfloat green, GLfloat blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3IPROC) ( GLint red, GLint green, GLint blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3SPROC) ( GLshort red, GLshort green, GLshort blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3UBPROC) ( GLubyte red, GLubyte green, GLubyte blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3UIPROC) ( GLuint red, GLuint green, GLuint blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR3USPROC) ( GLushort red, GLushort green, GLushort blue );
+typedef void (GLAPIENTRY * PFNGLCOLOR4BPROC) ( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4DPROC) ( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4FPROC) ( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4IPROC) ( GLint red, GLint green, GLint blue, GLint alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4SPROC) ( GLshort red, GLshort green, GLshort blue, GLshort alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBPROC) ( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4UIPROC) ( GLuint red, GLuint green, GLuint blue, GLuint alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR4USPROC) ( GLushort red, GLushort green, GLushort blue, GLushort alpha );
+typedef void (GLAPIENTRY * PFNGLCOLOR3BVPROC) ( const GLbyte *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3UBVPROC) ( const GLubyte *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3UIVPROC) ( const GLuint *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR3USVPROC) ( const GLushort *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4BVPROC) ( const GLbyte *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVPROC) ( const GLubyte *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4UIVPROC) ( const GLuint *v );
+typedef void (GLAPIENTRY * PFNGLCOLOR4USVPROC) ( const GLushort *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1DPROC) ( GLdouble s );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1FPROC) ( GLfloat s );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1IPROC) ( GLint s );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1SPROC) ( GLshort s );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2DPROC) ( GLdouble s, GLdouble t );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FPROC) ( GLfloat s, GLfloat t );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2IPROC) ( GLint s, GLint t );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2SPROC) ( GLshort s, GLshort t );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3DPROC) ( GLdouble s, GLdouble t, GLdouble r );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3FPROC) ( GLfloat s, GLfloat t, GLfloat r );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3IPROC) ( GLint s, GLint t, GLint r );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3SPROC) ( GLshort s, GLshort t, GLshort r );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4DPROC) ( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FPROC) ( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4IPROC) ( GLint s, GLint t, GLint r, GLint q );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4SPROC) ( GLshort s, GLshort t, GLshort r, GLshort q );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2DPROC) ( GLdouble x, GLdouble y );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2FPROC) ( GLfloat x, GLfloat y );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2IPROC) ( GLint x, GLint y );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2SPROC) ( GLshort x, GLshort y );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3DPROC) ( GLdouble x, GLdouble y, GLdouble z );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3FPROC) ( GLfloat x, GLfloat y, GLfloat z );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3IPROC) ( GLint x, GLint y, GLint z );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3SPROC) ( GLshort x, GLshort y, GLshort z );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4DPROC) ( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4FPROC) ( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4IPROC) ( GLint x, GLint y, GLint z, GLint w );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4SPROC) ( GLshort x, GLshort y, GLshort z, GLshort w );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS2SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS3SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4DVPROC) ( const GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4FVPROC) ( const GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4IVPROC) ( const GLint *v );
+typedef void (GLAPIENTRY * PFNGLRASTERPOS4SVPROC) ( const GLshort *v );
+typedef void (GLAPIENTRY * PFNGLRECTDPROC) ( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+typedef void (GLAPIENTRY * PFNGLRECTFPROC) ( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+typedef void (GLAPIENTRY * PFNGLRECTIPROC) ( GLint x1, GLint y1, GLint x2, GLint y2 );
+typedef void (GLAPIENTRY * PFNGLRECTSPROC) ( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+typedef void (GLAPIENTRY * PFNGLRECTDVPROC) ( const GLdouble *v1, const GLdouble *v2 );
+typedef void (GLAPIENTRY * PFNGLRECTFVPROC) ( const GLfloat *v1, const GLfloat *v2 );
+typedef void (GLAPIENTRY * PFNGLRECTIVPROC) ( const GLint *v1, const GLint *v2 );
+typedef void (GLAPIENTRY * PFNGLRECTSVPROC) ( const GLshort *v1, const GLshort *v2 );
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERPROC) ( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERPROC) ( GLenum type, GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERPROC) ( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTERPROC) ( GLenum type, GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERPROC) ( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERPROC) ( GLsizei stride, const GLvoid *ptr );
+typedef void (GLAPIENTRY * PFNGLGETPOINTERVPROC) ( GLenum pname, GLvoid **params );
+typedef void (GLAPIENTRY * PFNGLARRAYELEMENTPROC) ( GLint i );
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSPROC) ( GLenum mode, GLint first, GLsizei count );
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSPROC) ( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices );
+typedef void (GLAPIENTRY * PFNGLINTERLEAVEDARRAYSPROC) ( GLenum format, GLsizei stride, const GLvoid *pointer );
+typedef void (GLAPIENTRY * PFNGLSHADEMODELPROC) ( GLenum mode );
+typedef void (GLAPIENTRY * PFNGLLIGHTFPROC) ( GLenum light, GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLLIGHTIPROC) ( GLenum light, GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLLIGHTFVPROC) ( GLenum light, GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLLIGHTIVPROC) ( GLenum light, GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETLIGHTFVPROC) ( GLenum light, GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETLIGHTIVPROC) ( GLenum light, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELFPROC) ( GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELIPROC) ( GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELFVPROC) ( GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLLIGHTMODELIVPROC) ( GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLMATERIALFPROC) ( GLenum face, GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLMATERIALIPROC) ( GLenum face, GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLMATERIALFVPROC) ( GLenum face, GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLMATERIALIVPROC) ( GLenum face, GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETMATERIALFVPROC) ( GLenum face, GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETMATERIALIVPROC) ( GLenum face, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLCOLORMATERIALPROC) ( GLenum face, GLenum mode );
+typedef void (GLAPIENTRY * PFNGLPIXELZOOMPROC) ( GLfloat xfactor, GLfloat yfactor );
+typedef void (GLAPIENTRY * PFNGLPIXELSTOREFPROC) ( GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLPIXELSTOREIPROC) ( GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFERFPROC) ( GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFERIPROC) ( GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLPIXELMAPFVPROC) ( GLenum map, GLsizei mapsize, const GLfloat *values );
+typedef void (GLAPIENTRY * PFNGLPIXELMAPUIVPROC) ( GLenum map, GLsizei mapsize, const GLuint *values );
+typedef void (GLAPIENTRY * PFNGLPIXELMAPUSVPROC) ( GLenum map, GLsizei mapsize, const GLushort *values );
+typedef void (GLAPIENTRY * PFNGLGETPIXELMAPFVPROC) ( GLenum map, GLfloat *values );
+typedef void (GLAPIENTRY * PFNGLGETPIXELMAPUIVPROC) ( GLenum map, GLuint *values );
+typedef void (GLAPIENTRY * PFNGLGETPIXELMAPUSVPROC) ( GLenum map, GLushort *values );
+typedef void (GLAPIENTRY * PFNGLBITMAPPROC) ( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap );
+typedef void (GLAPIENTRY * PFNGLREADPIXELSPROC) ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLDRAWPIXELSPROC) ( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLCOPYPIXELSPROC) ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type );
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCPROC) ( GLenum func, GLint ref, GLuint mask );
+typedef void (GLAPIENTRY * PFNGLSTENCILMASKPROC) ( GLuint mask );
+typedef void (GLAPIENTRY * PFNGLSTENCILOPPROC) ( GLenum fail, GLenum zfail, GLenum zpass );
+typedef void (GLAPIENTRY * PFNGLCLEARSTENCILPROC) ( GLint s );
+typedef void (GLAPIENTRY * PFNGLTEXGENDPROC) ( GLenum coord, GLenum pname, GLdouble param );
+typedef void (GLAPIENTRY * PFNGLTEXGENFPROC) ( GLenum coord, GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLTEXGENIPROC) ( GLenum coord, GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLTEXGENDVPROC) ( GLenum coord, GLenum pname, const GLdouble *params );
+typedef void (GLAPIENTRY * PFNGLTEXGENFVPROC) ( GLenum coord, GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLTEXGENIVPROC) ( GLenum coord, GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXGENDVPROC) ( GLenum coord, GLenum pname, GLdouble *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXGENFVPROC) ( GLenum coord, GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXGENIVPROC) ( GLenum coord, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLTEXENVFPROC) ( GLenum target, GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLTEXENVIPROC) ( GLenum target, GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLTEXENVFVPROC) ( GLenum target, GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLTEXENVIVPROC) ( GLenum target, GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXENVFVPROC) ( GLenum target, GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXENVIVPROC) ( GLenum target, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERFPROC) ( GLenum target, GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIPROC) ( GLenum target, GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERFVPROC) ( GLenum target, GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIVPROC) ( GLenum target, GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERFVPROC) ( GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIVPROC) ( GLenum target, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXLEVELPARAMETERFVPROC) ( GLenum target, GLint level, GLenum pname, GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLGETTEXLEVELPARAMETERIVPROC) ( GLenum target, GLint level, GLenum pname, GLint *params );
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE1DPROC) ( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DPROC) ( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLGETTEXIMAGEPROC) ( GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLGENTEXTURESPROC) ( GLsizei n, GLuint *textures );
+typedef void (GLAPIENTRY * PFNGLDELETETEXTURESPROC) ( GLsizei n, const GLuint *textures);
+typedef void (GLAPIENTRY * PFNGLBINDTEXTUREPROC) ( GLenum target, GLuint texture );
+typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESPROC) ( GLsizei n, const GLuint *textures, const GLclampf *priorities );
+typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTPROC) ( GLsizei n, const GLuint *textures, GLboolean *residences );
+typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREPROC) ( GLuint texture );
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DPROC) ( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DPROC) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DPROC) ( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border );
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DPROC) ( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border );
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DPROC) ( GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DPROC) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+typedef void (GLAPIENTRY * PFNGLMAP1DPROC) ( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points );
+typedef void (GLAPIENTRY * PFNGLMAP1FPROC) ( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points );
+typedef void (GLAPIENTRY * PFNGLMAP2DPROC) ( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points );
+typedef void (GLAPIENTRY * PFNGLMAP2FPROC) ( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points );
+typedef void (GLAPIENTRY * PFNGLGETMAPDVPROC) ( GLenum target, GLenum query, GLdouble *v );
+typedef void (GLAPIENTRY * PFNGLGETMAPFVPROC) ( GLenum target, GLenum query, GLfloat *v );
+typedef void (GLAPIENTRY * PFNGLGETMAPIVPROC) ( GLenum target, GLenum query, GLint *v );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD1DPROC) ( GLdouble u );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD1FPROC) ( GLfloat u );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD1DVPROC) ( const GLdouble *u );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD1FVPROC) ( const GLfloat *u );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD2DPROC) ( GLdouble u, GLdouble v );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD2FPROC) ( GLfloat u, GLfloat v );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD2DVPROC) ( const GLdouble *u );
+typedef void (GLAPIENTRY * PFNGLEVALCOORD2FVPROC) ( const GLfloat *u );
+typedef void (GLAPIENTRY * PFNGLMAPGRID1DPROC) ( GLint un, GLdouble u1, GLdouble u2 );
+typedef void (GLAPIENTRY * PFNGLMAPGRID1FPROC) ( GLint un, GLfloat u1, GLfloat u2 );
+typedef void (GLAPIENTRY * PFNGLMAPGRID2DPROC) ( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 );
+typedef void (GLAPIENTRY * PFNGLMAPGRID2FPROC) ( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 );
+typedef void (GLAPIENTRY * PFNGLEVALPOINT1PROC) ( GLint i );
+typedef void (GLAPIENTRY * PFNGLEVALPOINT2PROC) ( GLint i, GLint j );
+typedef void (GLAPIENTRY * PFNGLEVALMESH1PROC) ( GLenum mode, GLint i1, GLint i2 );
+typedef void (GLAPIENTRY * PFNGLEVALMESH2PROC) ( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+typedef void (GLAPIENTRY * PFNGLFOGFPROC) ( GLenum pname, GLfloat param );
+typedef void (GLAPIENTRY * PFNGLFOGIPROC) ( GLenum pname, GLint param );
+typedef void (GLAPIENTRY * PFNGLFOGFVPROC) ( GLenum pname, const GLfloat *params );
+typedef void (GLAPIENTRY * PFNGLFOGIVPROC) ( GLenum pname, const GLint *params );
+typedef void (GLAPIENTRY * PFNGLFEEDBACKBUFFERPROC) ( GLsizei size, GLenum type, GLfloat *buffer );
+typedef void (GLAPIENTRY * PFNGLPASSTHROUGHPROC) ( GLfloat token );
+typedef void (GLAPIENTRY * PFNGLSELECTBUFFERPROC) ( GLsizei size, GLuint *buffer );
+typedef void (GLAPIENTRY * PFNGLINITNAMESPROC) ( void );
+typedef void (GLAPIENTRY * PFNGLLOADNAMEPROC) ( GLuint name );
+typedef void (GLAPIENTRY * PFNGLPUSHNAMEPROC) ( GLuint name );
+typedef void (GLAPIENTRY * PFNGLPOPNAMEPROC) ( void );
+
+extern PFNGLCLEARINDEXPROC glClearIndex;
+extern PFNGLCLEARCOLORPROC glClearColor;
+extern PFNGLCLEARPROC glClear;
+extern PFNGLINDEXMASKPROC glIndexMask;
+extern PFNGLCOLORMASKPROC glColorMask;
+extern PFNGLALPHAFUNCPROC glAlphaFunc;
+extern PFNGLBLENDFUNCPROC glBlendFunc;
+extern PFNGLLOGICOPPROC glLogicOp;
+extern PFNGLCULLFACEPROC glCullFace;
+extern PFNGLFRONTFACEPROC glFrontFace;
+extern PFNGLPOINTSIZEPROC glPointSize;
+extern PFNGLLINEWIDTHPROC glLineWidth;
+extern PFNGLLINESTIPPLEPROC glLineStipple;
+extern PFNGLPOLYGONMODEPROC glPolygonMode;
+extern PFNGLPOLYGONOFFSETPROC glPolygonOffset;
+extern PFNGLPOLYGONSTIPPLEPROC glPolygonStipple;
+extern PFNGLGETPOLYGONSTIPPLEPROC glGetPolygonStipple;
+extern PFNGLEDGEFLAGPROC glEdgeFlag;
+extern PFNGLEDGEFLAGVPROC glEdgeFlagv;
+extern PFNGLSCISSORPROC glScissor;
+extern PFNGLCLIPPLANEPROC glClipPlane;
+extern PFNGLGETCLIPPLANEPROC glGetClipPlane;
+extern PFNGLDRAWBUFFERPROC glDrawBuffer;
+extern PFNGLREADBUFFERPROC glReadBuffer;
+extern PFNGLENABLEPROC glEnable;
+extern PFNGLDISABLEPROC glDisable;
+extern PFNGLISENABLEDPROC glIsEnabled;
+extern PFNGLENABLECLIENTSTATEPROC glEnableClientState;
+extern PFNGLDISABLECLIENTSTATEPROC glDisableClientState;
+extern PFNGLGETBOOLEANVPROC glGetBooleanv;
+extern PFNGLGETDOUBLEVPROC glGetDoublev;
+extern PFNGLGETFLOATVPROC glGetFloatv;
+extern PFNGLGETINTEGERVPROC glGetIntegerv;
+extern PFNGLPUSHATTRIBPROC glPushAttrib;
+extern PFNGLPOPATTRIBPROC glPopAttrib;
+extern PFNGLPUSHCLIENTATTRIBPROC glPushClientAttrib;
+extern PFNGLPOPCLIENTATTRIBPROC glPopClientAttrib;
+extern PFNGLRENDERMODEPROC glRenderMode;
+extern PFNGLGETERRORPROC glGetError;
+extern PFNGLGETSTRINGPROC glGetString;
+extern PFNGLFINISHPROC glFinish;
+extern PFNGLFLUSHPROC glFlush;
+extern PFNGLHINTPROC glHint;
+extern PFNGLCLEARDEPTHPROC glClearDepth;
+extern PFNGLDEPTHFUNCPROC glDepthFunc;
+extern PFNGLDEPTHMASKPROC glDepthMask;
+extern PFNGLDEPTHRANGEPROC glDepthRange;
+extern PFNGLCLEARACCUMPROC glClearAccum;
+extern PFNGLACCUMPROC glAccum;
+extern PFNGLMATRIXMODEPROC glMatrixMode;
+extern PFNGLORTHOPROC glOrtho;
+extern PFNGLFRUSTUMPROC glFrustum;
+extern PFNGLVIEWPORTPROC glViewport;
+extern PFNGLPUSHMATRIXPROC glPushMatrix;
+extern PFNGLPOPMATRIXPROC glPopMatrix;
+extern PFNGLLOADIDENTITYPROC glLoadIdentity;
+extern PFNGLLOADMATRIXDPROC glLoadMatrixd;
+extern PFNGLLOADMATRIXFPROC glLoadMatrixf;
+extern PFNGLMULTMATRIXDPROC glMultMatrixd;
+extern PFNGLMULTMATRIXFPROC glMultMatrixf;
+extern PFNGLROTATEDPROC glRotated;
+extern PFNGLROTATEFPROC glRotatef;
+extern PFNGLSCALEDPROC glScaled;
+extern PFNGLSCALEFPROC glScalef;
+extern PFNGLTRANSLATEDPROC glTranslated;
+extern PFNGLTRANSLATEFPROC glTranslatef;
+extern PFNGLISLISTPROC glIsList;
+extern PFNGLDELETELISTSPROC glDeleteLists;
+extern PFNGLGENLISTSPROC glGenLists;
+extern PFNGLNEWLISTPROC glNewList;
+extern PFNGLENDLISTPROC glEndList;
+extern PFNGLCALLLISTPROC glCallList;
+extern PFNGLCALLLISTSPROC glCallLists;
+extern PFNGLLISTBASEPROC glListBase;
+extern PFNGLBEGINPROC glBegin;
+extern PFNGLENDPROC glEnd;
+extern PFNGLVERTEX2DPROC glVertex2d;
+extern PFNGLVERTEX2FPROC glVertex2f;
+extern PFNGLVERTEX2IPROC glVertex2i;
+extern PFNGLVERTEX2SPROC glVertex2s;
+extern PFNGLVERTEX3DPROC glVertex3d;
+extern PFNGLVERTEX3FPROC glVertex3f;
+extern PFNGLVERTEX3IPROC glVertex3i;
+extern PFNGLVERTEX3SPROC glVertex3s;
+extern PFNGLVERTEX4DPROC glVertex4d;
+extern PFNGLVERTEX4FPROC glVertex4f;
+extern PFNGLVERTEX4IPROC glVertex4i;
+extern PFNGLVERTEX4SPROC glVertex4s;
+extern PFNGLVERTEX2DVPROC glVertex2dv;
+extern PFNGLVERTEX2FVPROC glVertex2fv;
+extern PFNGLVERTEX2IVPROC glVertex2iv;
+extern PFNGLVERTEX2SVPROC glVertex2sv;
+extern PFNGLVERTEX3DVPROC glVertex3dv;
+extern PFNGLVERTEX3FVPROC glVertex3fv;
+extern PFNGLVERTEX3IVPROC glVertex3iv;
+extern PFNGLVERTEX3SVPROC glVertex3sv;
+extern PFNGLVERTEX4DVPROC glVertex4dv;
+extern PFNGLVERTEX4FVPROC glVertex4fv;
+extern PFNGLVERTEX4IVPROC glVertex4iv;
+extern PFNGLVERTEX4SVPROC glVertex4sv;
+extern PFNGLNORMAL3BPROC glNormal3b;
+extern PFNGLNORMAL3DPROC glNormal3d;
+extern PFNGLNORMAL3FPROC glNormal3f;
+extern PFNGLNORMAL3IPROC glNormal3i;
+extern PFNGLNORMAL3SPROC glNormal3s;
+extern PFNGLNORMAL3BVPROC glNormal3bv;
+extern PFNGLNORMAL3DVPROC glNormal3dv;
+extern PFNGLNORMAL3FVPROC glNormal3fv;
+extern PFNGLNORMAL3IVPROC glNormal3iv;
+extern PFNGLNORMAL3SVPROC glNormal3sv;
+extern PFNGLINDEXDPROC glIndexd;
+extern PFNGLINDEXFPROC glIndexf;
+extern PFNGLINDEXIPROC glIndexi;
+extern PFNGLINDEXSPROC glIndexs;
+extern PFNGLINDEXUBPROC glIndexub;
+extern PFNGLINDEXDVPROC glIndexdv;
+extern PFNGLINDEXFVPROC glIndexfv;
+extern PFNGLINDEXIVPROC glIndexiv;
+extern PFNGLINDEXSVPROC glIndexsv;
+extern PFNGLINDEXUBVPROC glIndexubv;
+extern PFNGLCOLOR3BPROC glColor3b;
+extern PFNGLCOLOR3DPROC glColor3d;
+extern PFNGLCOLOR3FPROC glColor3f;
+extern PFNGLCOLOR3IPROC glColor3i;
+extern PFNGLCOLOR3SPROC glColor3s;
+extern PFNGLCOLOR3UBPROC glColor3ub;
+extern PFNGLCOLOR3UIPROC glColor3ui;
+extern PFNGLCOLOR3USPROC glColor3us;
+extern PFNGLCOLOR4BPROC glColor4b;
+extern PFNGLCOLOR4DPROC glColor4d;
+extern PFNGLCOLOR4FPROC glColor4f;
+extern PFNGLCOLOR4IPROC glColor4i;
+extern PFNGLCOLOR4SPROC glColor4s;
+extern PFNGLCOLOR4UBPROC glColor4ub;
+extern PFNGLCOLOR4UIPROC glColor4ui;
+extern PFNGLCOLOR4USPROC glColor4us;
+extern PFNGLCOLOR3BVPROC glColor3bv;
+extern PFNGLCOLOR3DVPROC glColor3dv;
+extern PFNGLCOLOR3FVPROC glColor3fv;
+extern PFNGLCOLOR3IVPROC glColor3iv;
+extern PFNGLCOLOR3SVPROC glColor3sv;
+extern PFNGLCOLOR3UBVPROC glColor3ubv;
+extern PFNGLCOLOR3UIVPROC glColor3uiv;
+extern PFNGLCOLOR3USVPROC glColor3usv;
+extern PFNGLCOLOR4BVPROC glColor4bv;
+extern PFNGLCOLOR4DVPROC glColor4dv;
+extern PFNGLCOLOR4FVPROC glColor4fv;
+extern PFNGLCOLOR4IVPROC glColor4iv;
+extern PFNGLCOLOR4SVPROC glColor4sv;
+extern PFNGLCOLOR4UBVPROC glColor4ubv;
+extern PFNGLCOLOR4UIVPROC glColor4uiv;
+extern PFNGLCOLOR4USVPROC glColor4usv;
+extern PFNGLTEXCOORD1DPROC glTexCoord1d;
+extern PFNGLTEXCOORD1FPROC glTexCoord1f;
+extern PFNGLTEXCOORD1IPROC glTexCoord1i;
+extern PFNGLTEXCOORD1SPROC glTexCoord1s;
+extern PFNGLTEXCOORD2DPROC glTexCoord2d;
+extern PFNGLTEXCOORD2FPROC glTexCoord2f;
+extern PFNGLTEXCOORD2IPROC glTexCoord2i;
+extern PFNGLTEXCOORD2SPROC glTexCoord2s;
+extern PFNGLTEXCOORD3DPROC glTexCoord3d;
+extern PFNGLTEXCOORD3FPROC glTexCoord3f;
+extern PFNGLTEXCOORD3IPROC glTexCoord3i;
+extern PFNGLTEXCOORD3SPROC glTexCoord3s;
+extern PFNGLTEXCOORD4DPROC glTexCoord4d;
+extern PFNGLTEXCOORD4FPROC glTexCoord4f;
+extern PFNGLTEXCOORD4IPROC glTexCoord4i;
+extern PFNGLTEXCOORD4SPROC glTexCoord4s;
+extern PFNGLTEXCOORD1DVPROC glTexCoord1dv;
+extern PFNGLTEXCOORD1FVPROC glTexCoord1fv;
+extern PFNGLTEXCOORD1IVPROC glTexCoord1iv;
+extern PFNGLTEXCOORD1SVPROC glTexCoord1sv;
+extern PFNGLTEXCOORD2DVPROC glTexCoord2dv;
+extern PFNGLTEXCOORD2FVPROC glTexCoord2fv;
+extern PFNGLTEXCOORD2IVPROC glTexCoord2iv;
+extern PFNGLTEXCOORD2SVPROC glTexCoord2sv;
+extern PFNGLTEXCOORD3DVPROC glTexCoord3dv;
+extern PFNGLTEXCOORD3FVPROC glTexCoord3fv;
+extern PFNGLTEXCOORD3IVPROC glTexCoord3iv;
+extern PFNGLTEXCOORD3SVPROC glTexCoord3sv;
+extern PFNGLTEXCOORD4DVPROC glTexCoord4dv;
+extern PFNGLTEXCOORD4FVPROC glTexCoord4fv;
+extern PFNGLTEXCOORD4IVPROC glTexCoord4iv;
+extern PFNGLTEXCOORD4SVPROC glTexCoord4sv;
+extern PFNGLRASTERPOS2DPROC glRasterPos2d;
+extern PFNGLRASTERPOS2FPROC glRasterPos2f;
+extern PFNGLRASTERPOS2IPROC glRasterPos2i;
+extern PFNGLRASTERPOS2SPROC glRasterPos2s;
+extern PFNGLRASTERPOS3DPROC glRasterPos3d;
+extern PFNGLRASTERPOS3FPROC glRasterPos3f;
+extern PFNGLRASTERPOS3IPROC glRasterPos3i;
+extern PFNGLRASTERPOS3SPROC glRasterPos3s;
+extern PFNGLRASTERPOS4DPROC glRasterPos4d;
+extern PFNGLRASTERPOS4FPROC glRasterPos4f;
+extern PFNGLRASTERPOS4IPROC glRasterPos4i;
+extern PFNGLRASTERPOS4SPROC glRasterPos4s;
+extern PFNGLRASTERPOS2DVPROC glRasterPos2dv;
+extern PFNGLRASTERPOS2FVPROC glRasterPos2fv;
+extern PFNGLRASTERPOS2IVPROC glRasterPos2iv;
+extern PFNGLRASTERPOS2SVPROC glRasterPos2sv;
+extern PFNGLRASTERPOS3DVPROC glRasterPos3dv;
+extern PFNGLRASTERPOS3FVPROC glRasterPos3fv;
+extern PFNGLRASTERPOS3IVPROC glRasterPos3iv;
+extern PFNGLRASTERPOS3SVPROC glRasterPos3sv;
+extern PFNGLRASTERPOS4DVPROC glRasterPos4dv;
+extern PFNGLRASTERPOS4FVPROC glRasterPos4fv;
+extern PFNGLRASTERPOS4IVPROC glRasterPos4iv;
+extern PFNGLRASTERPOS4SVPROC glRasterPos4sv;
+extern PFNGLRECTDPROC glRectd;
+extern PFNGLRECTFPROC glRectf;
+extern PFNGLRECTIPROC glRecti;
+extern PFNGLRECTSPROC glRects;
+extern PFNGLRECTDVPROC glRectdv;
+extern PFNGLRECTFVPROC glRectfv;
+extern PFNGLRECTIVPROC glRectiv;
+extern PFNGLRECTSVPROC glRectsv;
+extern PFNGLVERTEXPOINTERPROC glVertexPointer;
+extern PFNGLNORMALPOINTERPROC glNormalPointer;
+extern PFNGLCOLORPOINTERPROC glColorPointer;
+extern PFNGLINDEXPOINTERPROC glIndexPointer;
+extern PFNGLTEXCOORDPOINTERPROC glTexCoordPointer;
+extern PFNGLEDGEFLAGPOINTERPROC glEdgeFlagPointer;
+extern PFNGLGETPOINTERVPROC glGetPointerv;
+extern PFNGLARRAYELEMENTPROC glArrayElement;
+extern PFNGLDRAWARRAYSPROC glDrawArrays;
+extern PFNGLDRAWELEMENTSPROC glDrawElements;
+extern PFNGLINTERLEAVEDARRAYSPROC glInterleavedArrays;
+extern PFNGLSHADEMODELPROC glShadeModel;
+extern PFNGLLIGHTFPROC glLightf;
+extern PFNGLLIGHTIPROC glLighti;
+extern PFNGLLIGHTFVPROC glLightfv;
+extern PFNGLLIGHTIVPROC glLightiv;
+extern PFNGLGETLIGHTFVPROC glGetLightfv;
+extern PFNGLGETLIGHTIVPROC glGetLightiv;
+extern PFNGLLIGHTMODELFPROC glLightModelf;
+extern PFNGLLIGHTMODELIPROC glLightModeli;
+extern PFNGLLIGHTMODELFVPROC glLightModelfv;
+extern PFNGLLIGHTMODELIVPROC glLightModeliv;
+extern PFNGLMATERIALFPROC glMaterialf;
+extern PFNGLMATERIALIPROC glMateriali;
+extern PFNGLMATERIALFVPROC glMaterialfv;
+extern PFNGLMATERIALIVPROC glMaterialiv;
+extern PFNGLGETMATERIALFVPROC glGetMaterialfv;
+extern PFNGLGETMATERIALIVPROC glGetMaterialiv;
+extern PFNGLCOLORMATERIALPROC glColorMaterial;
+extern PFNGLPIXELZOOMPROC glPixelZoom;
+extern PFNGLPIXELSTOREFPROC glPixelStoref;
+extern PFNGLPIXELSTOREIPROC glPixelStorei;
+extern PFNGLPIXELTRANSFERFPROC glPixelTransferf;
+extern PFNGLPIXELTRANSFERIPROC glPixelTransferi;
+extern PFNGLPIXELMAPFVPROC glPixelMapfv;
+extern PFNGLPIXELMAPUIVPROC glPixelMapuiv;
+extern PFNGLPIXELMAPUSVPROC glPixelMapusv;
+extern PFNGLGETPIXELMAPFVPROC glGetPixelMapfv;
+extern PFNGLGETPIXELMAPUIVPROC glGetPixelMapuiv;
+extern PFNGLGETPIXELMAPUSVPROC glGetPixelMapusv;
+extern PFNGLBITMAPPROC glBitmap;
+extern PFNGLREADPIXELSPROC glReadPixels;
+extern PFNGLDRAWPIXELSPROC glDrawPixels;
+extern PFNGLCOPYPIXELSPROC glCopyPixels;
+extern PFNGLSTENCILFUNCPROC glStencilFunc;
+extern PFNGLSTENCILMASKPROC glStencilMask;
+extern PFNGLSTENCILOPPROC glStencilOp;
+extern PFNGLCLEARSTENCILPROC glClearStencil;
+extern PFNGLTEXGENDPROC glTexGend;
+extern PFNGLTEXGENFPROC glTexGenf;
+extern PFNGLTEXGENIPROC glTexGeni;
+extern PFNGLTEXGENDVPROC glTexGendv;
+extern PFNGLTEXGENFVPROC glTexGenfv;
+extern PFNGLTEXGENIVPROC glTexGeniv;
+extern PFNGLGETTEXGENDVPROC glGetTexGendv;
+extern PFNGLGETTEXGENFVPROC glGetTexGenfv;
+extern PFNGLGETTEXGENIVPROC glGetTexGeniv;
+extern PFNGLTEXENVFPROC glTexEnvf;
+extern PFNGLTEXENVIPROC glTexEnvi;
+extern PFNGLTEXENVFVPROC glTexEnvfv;
+extern PFNGLTEXENVIVPROC glTexEnviv;
+extern PFNGLGETTEXENVFVPROC glGetTexEnvfv;
+extern PFNGLGETTEXENVIVPROC glGetTexEnviv;
+extern PFNGLTEXPARAMETERFPROC glTexParameterf;
+extern PFNGLTEXPARAMETERIPROC glTexParameteri;
+extern PFNGLTEXPARAMETERFVPROC glTexParameterfv;
+extern PFNGLTEXPARAMETERIVPROC glTexParameteriv;
+extern PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv;
+extern PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv;
+extern PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv;
+extern PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv;
+extern PFNGLTEXIMAGE1DPROC glTexImage1D;
+extern PFNGLTEXIMAGE2DPROC glTexImage2D;
+extern PFNGLGETTEXIMAGEPROC glGetTexImage;
+extern PFNGLGENTEXTURESPROC glGenTextures;
+extern PFNGLDELETETEXTURESPROC glDeleteTextures;
+extern PFNGLBINDTEXTUREPROC glBindTexture;
+extern PFNGLPRIORITIZETEXTURESPROC glPrioritizeTextures;
+extern PFNGLARETEXTURESRESIDENTPROC glAreTexturesResident;
+extern PFNGLISTEXTUREPROC glIsTexture;
+extern PFNGLTEXSUBIMAGE1DPROC glTexSubImage1D;
+extern PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D;
+extern PFNGLCOPYTEXIMAGE1DPROC glCopyTexImage1D;
+extern PFNGLCOPYTEXIMAGE2DPROC glCopyTexImage2D;
+extern PFNGLCOPYTEXSUBIMAGE1DPROC glCopyTexSubImage1D;
+extern PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D;
+extern PFNGLMAP1DPROC glMap1d;
+extern PFNGLMAP1FPROC glMap1f;
+extern PFNGLMAP2DPROC glMap2d;
+extern PFNGLMAP2FPROC glMap2f;
+extern PFNGLGETMAPDVPROC glGetMapdv;
+extern PFNGLGETMAPFVPROC glGetMapfv;
+extern PFNGLGETMAPIVPROC glGetMapiv;
+extern PFNGLEVALCOORD1DPROC glEvalCoord1d;
+extern PFNGLEVALCOORD1FPROC glEvalCoord1f;
+extern PFNGLEVALCOORD1DVPROC glEvalCoord1dv;
+extern PFNGLEVALCOORD1FVPROC glEvalCoord1fv;
+extern PFNGLEVALCOORD2DPROC glEvalCoord2d;
+extern PFNGLEVALCOORD2FPROC glEvalCoord2f;
+extern PFNGLEVALCOORD2DVPROC glEvalCoord2dv;
+extern PFNGLEVALCOORD2FVPROC glEvalCoord2fv;
+extern PFNGLMAPGRID1DPROC glMapGrid1d;
+extern PFNGLMAPGRID1FPROC glMapGrid1f;
+extern PFNGLMAPGRID2DPROC glMapGrid2d;
+extern PFNGLMAPGRID2FPROC glMapGrid2f;
+extern PFNGLEVALPOINT1PROC glEvalPoint1;
+extern PFNGLEVALPOINT2PROC glEvalPoint2;
+extern PFNGLEVALMESH1PROC glEvalMesh1;
+extern PFNGLEVALMESH2PROC glEvalMesh2;
+extern PFNGLFOGFPROC glFogf;
+extern PFNGLFOGIPROC glFogi;
+extern PFNGLFOGFVPROC glFogfv;
+extern PFNGLFOGIVPROC glFogiv;
+extern PFNGLFEEDBACKBUFFERPROC glFeedbackBuffer;
+extern PFNGLPASSTHROUGHPROC glPassThrough;
+extern PFNGLSELECTBUFFERPROC glSelectBuffer;
+extern PFNGLINITNAMESPROC glInitNames;
+extern PFNGLLOADNAMEPROC glLoadName;
+extern PFNGLPUSHNAMEPROC glPushName;
+extern PFNGLPOPNAMEPROC glPopName;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h
new file mode 100644
index 0000000000..8b863cc6d7
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h
@@ -0,0 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
+extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
+extern PFNGLTEXIMAGE3DPROC glTexImage3D;
+extern PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h
new file mode 100644
index 0000000000..7a4c4b853c
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h
@@ -0,0 +1,53 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;
+extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTexture;
+extern PFNGLCOMPRESSEDTEXIMAGE1DPROC glCompressedTexImage1D;
+extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
+extern PFNGLCOMPRESSEDTEXIMAGE3DPROC glCompressedTexImage3D;
+extern PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glCompressedTexSubImage1D;
+extern PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glCompressedTexSubImage2D;
+extern PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glCompressedTexSubImage3D;
+extern PFNGLGETCOMPRESSEDTEXIMAGEPROC glGetCompressedTexImage;
+extern PFNGLLOADTRANSPOSEMATRIXDARBPROC glLoadTransposeMatrixd;
+extern PFNGLLOADTRANSPOSEMATRIXFARBPROC glLoadTransposeMatrixf;
+extern PFNGLMULTTRANSPOSEMATRIXDARBPROC glMultTransposeMatrixd;
+extern PFNGLMULTTRANSPOSEMATRIXFARBPROC glMultTransposeMatrixf;
+extern PFNGLMULTITEXCOORD1DARBPROC glMultiTexCoord1d;
+extern PFNGLMULTITEXCOORD1DVARBPROC glMultiTexCoord1dv;
+extern PFNGLMULTITEXCOORD1FARBPROC glMultiTexCoord1f;
+extern PFNGLMULTITEXCOORD1FVARBPROC glMultiTexCoord1fv;
+extern PFNGLMULTITEXCOORD1IARBPROC glMultiTexCoord1i;
+extern PFNGLMULTITEXCOORD1IVARBPROC glMultiTexCoord1iv;
+extern PFNGLMULTITEXCOORD1SARBPROC glMultiTexCoord1s;
+extern PFNGLMULTITEXCOORD1SVARBPROC glMultiTexCoord1sv;
+extern PFNGLMULTITEXCOORD2DARBPROC glMultiTexCoord2d;
+extern PFNGLMULTITEXCOORD2DVARBPROC glMultiTexCoord2dv;
+extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2f;
+extern PFNGLMULTITEXCOORD2FVARBPROC glMultiTexCoord2fv;
+extern PFNGLMULTITEXCOORD2IARBPROC glMultiTexCoord2i;
+extern PFNGLMULTITEXCOORD2IVARBPROC glMultiTexCoord2iv;
+extern PFNGLMULTITEXCOORD2SARBPROC glMultiTexCoord2s;
+extern PFNGLMULTITEXCOORD2SVARBPROC glMultiTexCoord2sv;
+extern PFNGLMULTITEXCOORD3DARBPROC glMultiTexCoord3d;
+extern PFNGLMULTITEXCOORD3DVARBPROC glMultiTexCoord3dv;
+extern PFNGLMULTITEXCOORD3FARBPROC glMultiTexCoord3f;
+extern PFNGLMULTITEXCOORD3FVARBPROC glMultiTexCoord3fv;
+extern PFNGLMULTITEXCOORD3IARBPROC glMultiTexCoord3i;
+extern PFNGLMULTITEXCOORD3IVARBPROC glMultiTexCoord3iv;
+extern PFNGLMULTITEXCOORD3SARBPROC glMultiTexCoord3s;
+extern PFNGLMULTITEXCOORD3SVARBPROC glMultiTexCoord3sv;
+extern PFNGLMULTITEXCOORD4DARBPROC glMultiTexCoord4d;
+extern PFNGLMULTITEXCOORD4DVARBPROC glMultiTexCoord4dv;
+extern PFNGLMULTITEXCOORD4FARBPROC glMultiTexCoord4f;
+extern PFNGLMULTITEXCOORD4FVARBPROC glMultiTexCoord4fv;
+extern PFNGLMULTITEXCOORD4IARBPROC glMultiTexCoord4i;
+extern PFNGLMULTITEXCOORD4IVARBPROC glMultiTexCoord4iv;
+extern PFNGLMULTITEXCOORD4SARBPROC glMultiTexCoord4s;
+extern PFNGLMULTITEXCOORD4SVARBPROC glMultiTexCoord4sv;
+extern PFNGLSAMPLECOVERAGEARBPROC glSampleCoverage;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h
new file mode 100644
index 0000000000..079b6db0a1
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h
@@ -0,0 +1,55 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+// These two are provided by ARB_imaging as well
+extern PFNGLBLENDCOLORPROC glBlendColor;
+extern PFNGLBLENDEQUATIONPROC glBlendEquation;
+extern PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate;
+extern PFNGLFOGCOORDPOINTERPROC glFogCoordPointer;
+extern PFNGLFOGCOORDDPROC glFogCoordd;
+extern PFNGLFOGCOORDDVPROC glFogCoorddv;
+extern PFNGLFOGCOORDFPROC glFogCoordf;
+extern PFNGLFOGCOORDFVPROC glFogCoordfv;
+extern PFNGLMULTIDRAWARRAYSPROC glMultiDrawArrays;
+extern PFNGLMULTIDRAWELEMENTSPROC glMultiDrawElements;
+extern PFNGLPOINTPARAMETERFPROC glPointParameterf;
+extern PFNGLPOINTPARAMETERFVPROC glPointParameterfv;
+extern PFNGLPOINTPARAMETERIPROC glPointParameteri;
+extern PFNGLPOINTPARAMETERIVPROC glPointParameteriv;
+extern PFNGLSECONDARYCOLOR3BPROC glSecondaryColor3b;
+extern PFNGLSECONDARYCOLOR3BVPROC glSecondaryColor3bv;
+extern PFNGLSECONDARYCOLOR3DPROC glSecondaryColor3d;
+extern PFNGLSECONDARYCOLOR3DVPROC glSecondaryColor3dv;
+extern PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
+extern PFNGLSECONDARYCOLOR3FVPROC glSecondaryColor3fv;
+extern PFNGLSECONDARYCOLOR3IPROC glSecondaryColor3i;
+extern PFNGLSECONDARYCOLOR3IVPROC glSecondaryColor3iv;
+extern PFNGLSECONDARYCOLOR3SPROC glSecondaryColor3s;
+extern PFNGLSECONDARYCOLOR3SVPROC glSecondaryColor3sv;
+extern PFNGLSECONDARYCOLOR3UBPROC glSecondaryColor3ub;
+extern PFNGLSECONDARYCOLOR3UBVPROC glSecondaryColor3ubv;
+extern PFNGLSECONDARYCOLOR3UIPROC glSecondaryColor3ui;
+extern PFNGLSECONDARYCOLOR3UIVPROC glSecondaryColor3uiv;
+extern PFNGLSECONDARYCOLOR3USPROC glSecondaryColor3us;
+extern PFNGLSECONDARYCOLOR3USVPROC glSecondaryColor3usv;
+extern PFNGLSECONDARYCOLORPOINTERPROC glSecondaryColorPointer;
+extern PFNGLWINDOWPOS2DPROC glWindowPos2d;
+extern PFNGLWINDOWPOS2DVPROC glWindowPos2dv;
+extern PFNGLWINDOWPOS2FPROC glWindowPos2f;
+extern PFNGLWINDOWPOS2FVPROC glWindowPos2fv;
+extern PFNGLWINDOWPOS2IPROC glWindowPos2i;
+extern PFNGLWINDOWPOS2IVPROC glWindowPos2iv;
+extern PFNGLWINDOWPOS2SPROC glWindowPos2s;
+extern PFNGLWINDOWPOS2SVPROC glWindowPos2sv;
+extern PFNGLWINDOWPOS3DPROC glWindowPos3d;
+extern PFNGLWINDOWPOS3DVPROC glWindowPos3dv;
+extern PFNGLWINDOWPOS3FPROC glWindowPos3f;
+extern PFNGLWINDOWPOS3FVPROC glWindowPos3fv;
+extern PFNGLWINDOWPOS3IPROC glWindowPos3i;
+extern PFNGLWINDOWPOS3IVPROC glWindowPos3iv;
+extern PFNGLWINDOWPOS3SPROC glWindowPos3s;
+extern PFNGLWINDOWPOS3SVPROC glWindowPos3sv;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h
new file mode 100644
index 0000000000..d3b427e720
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h
@@ -0,0 +1,26 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBEGINQUERYPROC glBeginQuery;
+extern PFNGLBINDBUFFERPROC glBindBuffer;
+extern PFNGLBUFFERDATAPROC glBufferData;
+extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
+extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
+extern PFNGLDELETEQUERIESPROC glDeleteQueries;
+extern PFNGLENDQUERYPROC glEndQuery;
+extern PFNGLGENBUFFERSPROC glGenBuffers;
+extern PFNGLGENQUERIESPROC glGenQueries;
+extern PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv;
+extern PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv;
+extern PFNGLGETBUFFERSUBDATAPROC glGetBufferSubData;
+extern PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv;
+extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
+extern PFNGLGETQUERYIVPROC glGetQueryiv;
+extern PFNGLISBUFFERPROC glIsBuffer;
+extern PFNGLISQUERYPROC glIsQuery;
+extern PFNGLMAPBUFFERPROC glMapBuffer;
+extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h
new file mode 100644
index 0000000000..eae864462b
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h
@@ -0,0 +1,100 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLATTACHSHADERPROC glAttachShader;
+extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
+extern PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate;
+extern PFNGLCOMPILESHADERPROC glCompileShader;
+extern PFNGLCREATEPROGRAMPROC glCreateProgram;
+extern PFNGLCREATESHADERPROC glCreateShader;
+extern PFNGLDELETEPROGRAMPROC glDeleteProgram;
+extern PFNGLDELETESHADERPROC glDeleteShader;
+extern PFNGLDETACHSHADERPROC glDetachShader;
+extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
+extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
+extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
+extern PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib;
+extern PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
+extern PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders;
+extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
+extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
+extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
+extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
+extern PFNGLGETSHADERSOURCEPROC glGetShaderSource;
+extern PFNGLGETSHADERIVPROC glGetShaderiv;
+extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
+extern PFNGLGETUNIFORMFVPROC glGetUniformfv;
+extern PFNGLGETUNIFORMIVPROC glGetUniformiv;
+extern PFNGLGETVERTEXATTRIBPOINTERVPROC glGetVertexAttribPointerv;
+extern PFNGLGETVERTEXATTRIBDVPROC glGetVertexAttribdv;
+extern PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv;
+extern PFNGLGETVERTEXATTRIBIVPROC glGetVertexAttribiv;
+extern PFNGLISPROGRAMPROC glIsProgram;
+extern PFNGLISSHADERPROC glIsShader;
+extern PFNGLLINKPROGRAMPROC glLinkProgram;
+extern PFNGLSHADERSOURCEPROC glShaderSource;
+extern PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate;
+extern PFNGLSTENCILMASKSEPARATEPROC glStencilMaskSeparate;
+extern PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate;
+extern PFNGLUNIFORM1FPROC glUniform1f;
+extern PFNGLUNIFORM1FVPROC glUniform1fv;
+extern PFNGLUNIFORM1IPROC glUniform1i;
+extern PFNGLUNIFORM1IVPROC glUniform1iv;
+extern PFNGLUNIFORM2FPROC glUniform2f;
+extern PFNGLUNIFORM2FVPROC glUniform2fv;
+extern PFNGLUNIFORM2IPROC glUniform2i;
+extern PFNGLUNIFORM2IVPROC glUniform2iv;
+extern PFNGLUNIFORM3FPROC glUniform3f;
+extern PFNGLUNIFORM3FVPROC glUniform3fv;
+extern PFNGLUNIFORM3IPROC glUniform3i;
+extern PFNGLUNIFORM3IVPROC glUniform3iv;
+extern PFNGLUNIFORM4FPROC glUniform4f;
+extern PFNGLUNIFORM4FVPROC glUniform4fv;
+extern PFNGLUNIFORM4IPROC glUniform4i;
+extern PFNGLUNIFORM4IVPROC glUniform4iv;
+extern PFNGLUNIFORMMATRIX2FVPROC glUniformMatrix2fv;
+extern PFNGLUNIFORMMATRIX3FVPROC glUniformMatrix3fv;
+extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
+extern PFNGLUSEPROGRAMPROC glUseProgram;
+extern PFNGLVALIDATEPROGRAMPROC glValidateProgram;
+extern PFNGLVERTEXATTRIB1DPROC glVertexAttrib1d;
+extern PFNGLVERTEXATTRIB1DVPROC glVertexAttrib1dv;
+extern PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f;
+extern PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv;
+extern PFNGLVERTEXATTRIB1SPROC glVertexAttrib1s;
+extern PFNGLVERTEXATTRIB1SVPROC glVertexAttrib1sv;
+extern PFNGLVERTEXATTRIB2DPROC glVertexAttrib2d;
+extern PFNGLVERTEXATTRIB2DVPROC glVertexAttrib2dv;
+extern PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f;
+extern PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv;
+extern PFNGLVERTEXATTRIB2SPROC glVertexAttrib2s;
+extern PFNGLVERTEXATTRIB2SVPROC glVertexAttrib2sv;
+extern PFNGLVERTEXATTRIB3DPROC glVertexAttrib3d;
+extern PFNGLVERTEXATTRIB3DVPROC glVertexAttrib3dv;
+extern PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f;
+extern PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv;
+extern PFNGLVERTEXATTRIB3SPROC glVertexAttrib3s;
+extern PFNGLVERTEXATTRIB3SVPROC glVertexAttrib3sv;
+extern PFNGLVERTEXATTRIB4NBVPROC glVertexAttrib4Nbv;
+extern PFNGLVERTEXATTRIB4NIVPROC glVertexAttrib4Niv;
+extern PFNGLVERTEXATTRIB4NSVPROC glVertexAttrib4Nsv;
+extern PFNGLVERTEXATTRIB4NUBPROC glVertexAttrib4Nub;
+extern PFNGLVERTEXATTRIB4NUBVPROC glVertexAttrib4Nubv;
+extern PFNGLVERTEXATTRIB4NUIVPROC glVertexAttrib4Nuiv;
+extern PFNGLVERTEXATTRIB4NUSVPROC glVertexAttrib4Nusv;
+extern PFNGLVERTEXATTRIB4BVPROC glVertexAttrib4bv;
+extern PFNGLVERTEXATTRIB4DPROC glVertexAttrib4d;
+extern PFNGLVERTEXATTRIB4DVPROC glVertexAttrib4dv;
+extern PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f;
+extern PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv;
+extern PFNGLVERTEXATTRIB4IVPROC glVertexAttrib4iv;
+extern PFNGLVERTEXATTRIB4SPROC glVertexAttrib4s;
+extern PFNGLVERTEXATTRIB4SVPROC glVertexAttrib4sv;
+extern PFNGLVERTEXATTRIB4UBVPROC glVertexAttrib4ubv;
+extern PFNGLVERTEXATTRIB4UIVPROC glVertexAttrib4uiv;
+extern PFNGLVERTEXATTRIB4USVPROC glVertexAttrib4usv;
+extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h
new file mode 100644
index 0000000000..9e26d763ee
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h
@@ -0,0 +1,62 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender;
+extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
+extern PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation;
+extern PFNGLCLAMPCOLORPROC glClampColor;
+extern PFNGLCLEARBUFFERFIPROC glClearBufferfi;
+extern PFNGLCLEARBUFFERFVPROC glClearBufferfv;
+extern PFNGLCLEARBUFFERIVPROC glClearBufferiv;
+extern PFNGLCLEARBUFFERUIVPROC glClearBufferuiv;
+extern PFNGLCOLORMASKIPROC glColorMaski;
+extern PFNGLDISABLEIPROC glDisablei;
+extern PFNGLENABLEIPROC glEnablei;
+extern PFNGLENDCONDITIONALRENDERPROC glEndConditionalRender;
+extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
+extern PFNGLGETBOOLEANI_VPROC glGetBooleani_v;
+extern PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation;
+extern PFNGLGETSTRINGIPROC glGetStringi;
+extern PFNGLGETTEXPARAMETERIIVPROC glGetTexParameterIiv;
+extern PFNGLGETTEXPARAMETERIUIVPROC glGetTexParameterIuiv;
+extern PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying;
+extern PFNGLGETUNIFORMUIVPROC glGetUniformuiv;
+extern PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv;
+extern PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv;
+extern PFNGLISENABLEDIPROC glIsEnabledi;
+extern PFNGLTEXPARAMETERIIVPROC glTexParameterIiv;
+extern PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv;
+extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
+extern PFNGLUNIFORM1UIPROC glUniform1ui;
+extern PFNGLUNIFORM1UIVPROC glUniform1uiv;
+extern PFNGLUNIFORM2UIPROC glUniform2ui;
+extern PFNGLUNIFORM2UIVPROC glUniform2uiv;
+extern PFNGLUNIFORM3UIPROC glUniform3ui;
+extern PFNGLUNIFORM3UIVPROC glUniform3uiv;
+extern PFNGLUNIFORM4UIPROC glUniform4ui;
+extern PFNGLUNIFORM4UIVPROC glUniform4uiv;
+extern PFNGLVERTEXATTRIBI1IPROC glVertexAttribI1i;
+extern PFNGLVERTEXATTRIBI1IVPROC glVertexAttribI1iv;
+extern PFNGLVERTEXATTRIBI1UIPROC glVertexAttribI1ui;
+extern PFNGLVERTEXATTRIBI1UIVPROC glVertexAttribI1uiv;
+extern PFNGLVERTEXATTRIBI2IPROC glVertexAttribI2i;
+extern PFNGLVERTEXATTRIBI2IVPROC glVertexAttribI2iv;
+extern PFNGLVERTEXATTRIBI2UIPROC glVertexAttribI2ui;
+extern PFNGLVERTEXATTRIBI2UIVPROC glVertexAttribI2uiv;
+extern PFNGLVERTEXATTRIBI3IPROC glVertexAttribI3i;
+extern PFNGLVERTEXATTRIBI3IVPROC glVertexAttribI3iv;
+extern PFNGLVERTEXATTRIBI3UIPROC glVertexAttribI3ui;
+extern PFNGLVERTEXATTRIBI3UIVPROC glVertexAttribI3uiv;
+extern PFNGLVERTEXATTRIBI4BVPROC glVertexAttribI4bv;
+extern PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i;
+extern PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv;
+extern PFNGLVERTEXATTRIBI4SVPROC glVertexAttribI4sv;
+extern PFNGLVERTEXATTRIBI4UBVPROC glVertexAttribI4ubv;
+extern PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui;
+extern PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv;
+extern PFNGLVERTEXATTRIBI4USVPROC glVertexAttribI4usv;
+extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h
new file mode 100644
index 0000000000..9cc9244706
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h
@@ -0,0 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
+extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
+extern PFNGLPRIMITIVERESTARTINDEXPROC glPrimitiveRestartIndex;
+extern PFNGLTEXBUFFERPROC glTexBuffer;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h
new file mode 100644
index 0000000000..f535cc6805
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h
@@ -0,0 +1,10 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLExtensions/gl_common.h"
+
+extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
+extern PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;
+extern PFNGLGETINTEGER64I_VPROC glGetInteger64i_v;
+
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_common.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_common.h
new file mode 100644
index 0000000000..4019b5026b
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_common.h
@@ -0,0 +1,7 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <GL/gl.h>
+#include <GL/glext.h>
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp
new file mode 100644
index 0000000000..924fdea821
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp
@@ -0,0 +1,109 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterface/AGL.h"
+
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+void cInterfaceAGL::Swap()
+{
+	[cocoaCtx flushBuffer];
+}
+
+// Create rendering window.
+// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
+bool cInterfaceAGL::Create(void *window_handle)
+{
+	cocoaWin = reinterpret_cast<NSView*>(window_handle);
+	NSSize size = [cocoaWin frame].size;
+
+	// Enable high-resolution display support.
+	[cocoaWin setWantsBestResolutionOpenGLSurface:YES];
+
+	NSWindow *window = [cocoaWin window];
+
+	float scale = [window backingScaleFactor];
+	size.width *= scale;
+	size.height *= scale;
+
+	// Control window size and picture scaling
+	s_backbuffer_width = size.width;
+	s_backbuffer_height = size.height;
+
+	NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFAAccelerated, 0 };
+	NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
+		initWithAttributes: attr];
+	if (fmt == nil)
+	{
+		ERROR_LOG(VIDEO, "failed to create pixel format");
+		return false;
+	}
+
+	cocoaCtx = [[NSOpenGLContext alloc] initWithFormat: fmt shareContext: nil];
+	[fmt release];
+	if (cocoaCtx == nil)
+	{
+		ERROR_LOG(VIDEO, "failed to create context");
+		return false;
+	}
+
+	if (cocoaWin == nil)
+	{
+		ERROR_LOG(VIDEO, "failed to create window");
+		return false;
+	}
+
+	[window makeFirstResponder:cocoaWin];
+	[cocoaCtx setView: cocoaWin];
+	[window makeKeyAndOrderFront: nil];
+
+	return true;
+}
+
+bool cInterfaceAGL::MakeCurrent()
+{
+	[cocoaCtx makeCurrentContext];
+	return true;
+}
+
+bool cInterfaceAGL::ClearCurrent()
+{
+	[NSOpenGLContext clearCurrentContext];
+	return true;
+}
+
+// Close backend
+void cInterfaceAGL::Shutdown()
+{
+	[cocoaCtx clearDrawable];
+	[cocoaCtx release];
+	cocoaCtx = nil;
+}
+
+void cInterfaceAGL::Update()
+{
+	NSWindow *window = [cocoaWin window];
+	NSSize size = [cocoaWin frame].size;
+
+	float scale = [window backingScaleFactor];
+	size.width *= scale;
+	size.height *= scale;
+
+	if (s_backbuffer_width == size.width &&
+	    s_backbuffer_height == size.height)
+		return;
+
+	s_backbuffer_width = size.width;
+	s_backbuffer_height = size.height;
+
+	[cocoaCtx update];
+}
+
+void cInterfaceAGL::SwapInterval(int interval)
+{
+	[cocoaCtx setValues:(GLint *)&interval forParameter:NSOpenGLCPSwapInterval];
+}
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/AGL.h b/Source/Core/VideoBackends/OGL/GLInterface/AGL.h
new file mode 100644
index 0000000000..f228bcb877
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/AGL.h
@@ -0,0 +1,27 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef __APPLE__
+#import <AppKit/AppKit.h>
+#endif
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+class cInterfaceAGL : public cInterfaceBase
+{
+private:
+	NSView *cocoaWin;
+	NSOpenGLContext *cocoaCtx;
+public:
+	void Swap();
+	bool Create(void *window_handle);
+	bool MakeCurrent();
+	bool ClearCurrent();
+	void Shutdown();
+	void Update();
+	void SwapInterval(int interval);
+
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp
new file mode 100644
index 0000000000..f83b540cbd
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp
@@ -0,0 +1,209 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLInterface/EGL.h"
+#include "VideoCommon/RenderBase.h"
+
+// Show the current FPS
+void cInterfaceEGL::Swap()
+{
+	eglSwapBuffers(egl_dpy, egl_surf);
+}
+void cInterfaceEGL::SwapInterval(int Interval)
+{
+	eglSwapInterval(egl_dpy, Interval);
+}
+
+void* cInterfaceEGL::GetFuncAddress(const std::string& name)
+{
+	return (void*)eglGetProcAddress(name.c_str());
+}
+
+void cInterfaceEGL::DetectMode()
+{
+	if (s_opengl_mode != MODE_DETECT)
+		return;
+
+	EGLint num_configs;
+	EGLConfig *config = nullptr;
+	bool supportsGL = false, supportsGLES2 = false, supportsGLES3 = false;
+
+	// attributes for a visual in RGBA format with at least
+	// 8 bits per color
+	int attribs[] = {
+		EGL_RED_SIZE, 8,
+		EGL_GREEN_SIZE, 8,
+		EGL_BLUE_SIZE, 8,
+		EGL_NONE };
+
+	// Get how many configs there are
+	if (!eglChooseConfig( egl_dpy, attribs, nullptr, 0, &num_configs))
+	{
+		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
+		goto err_exit;
+	}
+
+	config = new EGLConfig[num_configs];
+
+	// Get all the configurations
+	if (!eglChooseConfig(egl_dpy, attribs, config, num_configs, &num_configs))
+	{
+		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
+		goto err_exit;
+	}
+
+	for (int i = 0; i < num_configs; ++i)
+	{
+		EGLint attribVal;
+		bool ret;
+		ret = eglGetConfigAttrib(egl_dpy, config[i], EGL_RENDERABLE_TYPE, &attribVal);
+		if (ret)
+		{
+			if (attribVal & EGL_OPENGL_BIT)
+				supportsGL = true;
+			if (attribVal & (1 << 6)) /* EGL_OPENGL_ES3_BIT_KHR */
+				supportsGLES3 = true;
+			if (attribVal & EGL_OPENGL_ES2_BIT)
+				supportsGLES2 = true;
+		}
+	}
+	if (supportsGL)
+		s_opengl_mode = GLInterfaceMode::MODE_OPENGL;
+	else if (supportsGLES3)
+		s_opengl_mode = GLInterfaceMode::MODE_OPENGLES3;
+	else if (supportsGLES2)
+		s_opengl_mode = GLInterfaceMode::MODE_OPENGLES2;
+err_exit:
+	if (s_opengl_mode == GLInterfaceMode::MODE_DETECT) // Errored before we found a mode
+		s_opengl_mode = GLInterfaceMode::MODE_OPENGL; // Fall back to OpenGL
+	if (config)
+		delete[] config;
+}
+
+// Create rendering window.
+// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
+bool cInterfaceEGL::Create(void *window_handle)
+{
+	const char *s;
+	EGLint egl_major, egl_minor;
+
+	egl_dpy = OpenDisplay();
+
+	if (!egl_dpy)
+	{
+		INFO_LOG(VIDEO, "Error: eglGetDisplay() failed\n");
+		return false;
+	}
+
+	if (!eglInitialize(egl_dpy, &egl_major, &egl_minor))
+	{
+		INFO_LOG(VIDEO, "Error: eglInitialize() failed\n");
+		return false;
+	}
+
+	/* Detection code */
+	EGLConfig config;
+	EGLint num_configs;
+
+	DetectMode();
+
+	// attributes for a visual in RGBA format with at least
+	// 8 bits per color
+	int attribs[] = {
+		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+		EGL_RED_SIZE, 8,
+		EGL_GREEN_SIZE, 8,
+		EGL_BLUE_SIZE, 8,
+		EGL_NONE };
+
+	EGLint ctx_attribs[] = {
+		EGL_CONTEXT_CLIENT_VERSION, 2,
+		EGL_NONE
+	};
+	switch (s_opengl_mode)
+	{
+		case MODE_OPENGL:
+			attribs[1] = EGL_OPENGL_BIT;
+			ctx_attribs[0] = EGL_NONE;
+		break;
+		case MODE_OPENGLES2:
+			attribs[1] = EGL_OPENGL_ES2_BIT;
+			ctx_attribs[1] = 2;
+		break;
+		case MODE_OPENGLES3:
+			attribs[1] = (1 << 6); /* EGL_OPENGL_ES3_BIT_KHR */
+			ctx_attribs[1] = 3;
+		break;
+		default:
+			ERROR_LOG(VIDEO, "Unknown opengl mode set\n");
+			return false;
+		break;
+	}
+
+	if (!eglChooseConfig( egl_dpy, attribs, &config, 1, &num_configs))
+	{
+		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
+		exit(1);
+	}
+
+	if (s_opengl_mode == MODE_OPENGL)
+		eglBindAPI(EGL_OPENGL_API);
+	else
+		eglBindAPI(EGL_OPENGL_ES_API);
+
+	EGLNativeWindowType host_window = (EGLNativeWindowType) window_handle;
+	EGLNativeWindowType native_window = InitializePlatform(host_window, config);
+
+	s = eglQueryString(egl_dpy, EGL_VERSION);
+	INFO_LOG(VIDEO, "EGL_VERSION = %s\n", s);
+
+	s = eglQueryString(egl_dpy, EGL_VENDOR);
+	INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", s);
+
+	s = eglQueryString(egl_dpy, EGL_EXTENSIONS);
+	INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", s);
+
+	s = eglQueryString(egl_dpy, EGL_CLIENT_APIS);
+	INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s);
+
+	egl_ctx = eglCreateContext(egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs );
+	if (!egl_ctx)
+	{
+		INFO_LOG(VIDEO, "Error: eglCreateContext failed\n");
+		exit(1);
+	}
+
+	egl_surf = eglCreateWindowSurface(egl_dpy, config, native_window, nullptr);
+	if (!egl_surf)
+	{
+		INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
+		exit(1);
+	}
+
+	return true;
+}
+
+bool cInterfaceEGL::MakeCurrent()
+{
+	return eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx);
+}
+// Close backend
+void cInterfaceEGL::Shutdown()
+{
+	ShutdownPlatform();
+	if (egl_ctx && !eglMakeCurrent(egl_dpy, egl_surf, egl_surf, egl_ctx))
+		NOTICE_LOG(VIDEO, "Could not release drawing context.");
+	if (egl_ctx)
+	{
+		eglMakeCurrent(egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+		if (!eglDestroyContext(egl_dpy, egl_ctx))
+			NOTICE_LOG(VIDEO, "Could not destroy drawing context.");
+		if (!eglDestroySurface(egl_dpy, egl_surf))
+			NOTICE_LOG(VIDEO, "Could not destroy window surface.");
+		if (!eglTerminate(egl_dpy))
+			NOTICE_LOG(VIDEO, "Could not destroy display connection.");
+		egl_ctx = nullptr;
+	}
+}
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGL.h b/Source/Core/VideoBackends/OGL/GLInterface/EGL.h
new file mode 100644
index 0000000000..2d290bf02f
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGL.h
@@ -0,0 +1,32 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <EGL/egl.h>
+
+#include "Core/ConfigManager.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+class cInterfaceEGL : public cInterfaceBase
+{
+protected:
+	void DetectMode();
+	EGLSurface egl_surf;
+	EGLContext egl_ctx;
+	EGLDisplay egl_dpy;
+
+	virtual EGLDisplay OpenDisplay() = 0;
+	virtual EGLNativeWindowType InitializePlatform(EGLNativeWindowType host_window, EGLConfig config) = 0;
+	virtual void ShutdownPlatform() = 0;
+public:
+	void SwapInterval(int Interval);
+	void Swap();
+	void SetMode(u32 mode) { s_opengl_mode = mode; }
+	void* GetFuncAddress(const std::string& name);
+	bool Create(void *window_handle);
+	bool MakeCurrent();
+	void Shutdown();
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.cpp b/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.cpp
new file mode 100644
index 0000000000..46ceaa9371
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.cpp
@@ -0,0 +1,29 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/Host.h"
+#include "VideoBackends/OGL/GLInterface/EGLAndroid.h"
+
+EGLDisplay cInterfaceEGLAndroid::OpenDisplay()
+{
+	return eglGetDisplay(EGL_DEFAULT_DISPLAY);
+}
+
+EGLNativeWindowType cInterfaceEGLAndroid::InitializePlatform(EGLNativeWindowType host_window, EGLConfig config)
+{
+	EGLint format;
+	eglGetConfigAttrib(egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format);
+	ANativeWindow_setBuffersGeometry(host_window, 0, 0, format);
+
+	const int width = ANativeWindow_getWidth(host_window);
+	const int height = ANativeWindow_getHeight(host_window);
+	GLInterface->SetBackBufferDimensions(width, height);
+
+	return host_window;
+}
+
+void cInterfaceEGLAndroid::ShutdownPlatform()
+{
+}
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.h b/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.h
new file mode 100644
index 0000000000..4167c3d21d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.h
@@ -0,0 +1,15 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/OGL/GLInterface/EGL.h"
+
+class cInterfaceEGLAndroid : public cInterfaceEGL
+{
+protected:
+	EGLDisplay OpenDisplay() override;
+	EGLNativeWindowType InitializePlatform(EGLNativeWindowType host_window, EGLConfig config) override;
+	void ShutdownPlatform() override;
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.cpp b/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.cpp
new file mode 100644
index 0000000000..e4e5b1c7f3
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.cpp
@@ -0,0 +1,44 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterface/EGLX11.h"
+
+EGLDisplay cInterfaceEGLX11::OpenDisplay()
+{
+	dpy = XOpenDisplay(nullptr);
+	XWindow.Initialize(dpy);
+	return eglGetDisplay(dpy);
+}
+
+EGLNativeWindowType cInterfaceEGLX11::InitializePlatform(EGLNativeWindowType host_window, EGLConfig config)
+{
+	EGLint vid;
+	eglGetConfigAttrib(egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid);
+
+	XVisualInfo visTemplate;
+	visTemplate.visualid = vid;
+
+	XVisualInfo *vi;
+	int nVisuals;
+	vi = XGetVisualInfo(dpy, VisualIDMask, &visTemplate, &nVisuals);
+
+	XWindowAttributes attribs;
+	if (!XGetWindowAttributes(dpy, (Window)host_window, &attribs))
+	{
+		ERROR_LOG(VIDEO, "Window attribute retrieval failed");
+		return 0;
+	}
+
+	s_backbuffer_width  = attribs.width;
+	s_backbuffer_height = attribs.height;
+
+	return (EGLNativeWindowType) XWindow.CreateXWindow((Window) host_window, vi);
+}
+
+void cInterfaceEGLX11::ShutdownPlatform()
+{
+	XWindow.DestroyXWindow();
+	XCloseDisplay(dpy);
+}
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.h b/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.h
new file mode 100644
index 0000000000..15d37ae87f
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGLX11.h
@@ -0,0 +1,21 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <X11/Xlib.h>
+
+#include "VideoBackends/OGL/GLInterface/EGL.h"
+#include "VideoBackends/OGL/GLInterface/X11_Util.h"
+
+class cInterfaceEGLX11 : public cInterfaceEGL
+{
+private:
+	cX11Window XWindow;
+	Display *dpy;
+protected:
+	EGLDisplay OpenDisplay() override;
+	EGLNativeWindowType InitializePlatform(EGLNativeWindowType host_window, EGLConfig config) override;
+	void ShutdownPlatform() override;
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/GLInterface.cpp b/Source/Core/VideoBackends/OGL/GLInterface/GLInterface.cpp
new file mode 100644
index 0000000000..525055aaa8
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/GLInterface.cpp
@@ -0,0 +1,40 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+#ifdef ANDROID
+#include "VideoBackends/OGL/GLInterface/EGLAndroid.h"
+#elif defined(__APPLE__)
+#include "VideoBackends/OGL/GLInterface/AGL.h"
+#elif defined(_WIN32)
+#include "VideoBackends/OGL/GLInterface/WGL.h"
+#elif HAVE_X11
+#if defined(USE_EGL) && USE_EGL
+#include "VideoBackends/OGL/GLInterface/EGLX11.h"
+#else
+#include "VideoBackends/OGL/GLInterface/GLX.h"
+#endif
+#else
+#error Platform doesnt have a GLInterface
+#endif
+
+cInterfaceBase* HostGL_CreateGLInterface()
+{
+	#ifdef ANDROID
+		return new cInterfaceEGLAndroid;
+	#elif defined(__APPLE__)
+		return new cInterfaceAGL;
+	#elif defined(_WIN32)
+		return new cInterfaceWGL;
+	#elif defined(HAVE_X11) && HAVE_X11
+	#if defined(USE_EGL) && USE_EGL
+		return new cInterfaceEGLX11;
+	#else
+		return new cInterfaceGLX;
+	#endif
+	#else
+		return nullptr;
+	#endif
+}
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp b/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
new file mode 100644
index 0000000000..623466cdbd
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
@@ -0,0 +1,178 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "VideoBackends/OGL/GLInterface/GLX.h"
+
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+#define GLX_CONTEXT_MAJOR_VERSION_ARB       0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB       0x2092
+
+typedef GLXContext (*PFNGLXCREATECONTEXTATTRIBSPROC)(Display*, GLXFBConfig, GLXContext, Bool, const int*);
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+
+static PFNGLXCREATECONTEXTATTRIBSPROC glXCreateContextAttribs = nullptr;
+static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = nullptr;
+
+static bool s_glxError;
+static int ctxErrorHandler(Display *dpy, XErrorEvent *ev)
+{
+	s_glxError = true;
+	return 0;
+}
+
+void cInterfaceGLX::SwapInterval(int Interval)
+{
+	if (glXSwapIntervalSGI)
+		glXSwapIntervalSGI(Interval);
+	else
+		ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate).");
+}
+void* cInterfaceGLX::GetFuncAddress(const std::string& name)
+{
+	return (void*)glXGetProcAddress((const GLubyte*)name.c_str());
+}
+
+void cInterfaceGLX::Swap()
+{
+	glXSwapBuffers(dpy, win);
+}
+
+// Create rendering window.
+// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
+bool cInterfaceGLX::Create(void *window_handle)
+{
+	dpy = XOpenDisplay(nullptr);
+	int screen = DefaultScreen(dpy);
+
+	// checking glx version
+	int glxMajorVersion, glxMinorVersion;
+	glXQueryVersion(dpy, &glxMajorVersion, &glxMinorVersion);
+	if (glxMajorVersion < 1 || (glxMajorVersion == 1 && glxMinorVersion < 4))
+	{
+		ERROR_LOG(VIDEO, "glX-Version %d.%d detected, but need at least 1.4",
+		          glxMajorVersion, glxMinorVersion);
+		return false;
+	}
+
+	// loading core context creation function
+	glXCreateContextAttribs = (PFNGLXCREATECONTEXTATTRIBSPROC)GetFuncAddress("glXCreateContextAttribsARB");
+	if (!glXCreateContextAttribs)
+	{
+		ERROR_LOG(VIDEO, "glXCreateContextAttribsARB not found, do you support GLX_ARB_create_context?");
+		return false;
+	}
+
+	// choosing framebuffer
+	int visual_attribs[] =
+	{
+		GLX_X_RENDERABLE    , True,
+		GLX_DRAWABLE_TYPE   , GLX_WINDOW_BIT,
+		GLX_X_VISUAL_TYPE   , GLX_TRUE_COLOR,
+		GLX_RED_SIZE        , 8,
+		GLX_GREEN_SIZE      , 8,
+		GLX_BLUE_SIZE       , 8,
+		GLX_DEPTH_SIZE      , 0,
+		GLX_STENCIL_SIZE    , 0,
+		GLX_DOUBLEBUFFER    , True,
+		None
+	};
+	int fbcount = 0;
+	GLXFBConfig* fbc = glXChooseFBConfig(dpy, screen, visual_attribs, &fbcount);
+	if (!fbc || !fbcount)
+	{
+		ERROR_LOG(VIDEO, "Failed to retrieve a framebuffer config");
+		return false;
+	}
+	fbconfig = *fbc;
+	XFree(fbc);
+
+	// Get an appropriate visual
+	XVisualInfo* vi = glXGetVisualFromFBConfig(dpy, fbconfig);
+
+	// Create a GLX context.
+	// We try to get a 3.3 core profile, else we try it with anything we get.
+	int context_attribs[] =
+	{
+		GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+		GLX_CONTEXT_MINOR_VERSION_ARB, 3,
+		GLX_CONTEXT_PROFILE_MASK_ARB,  GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+		GLX_CONTEXT_FLAGS_ARB,         GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
+		None
+	};
+	s_glxError = false;
+	XErrorHandler oldHandler = XSetErrorHandler(&ctxErrorHandler);
+	ctx = glXCreateContextAttribs(dpy, fbconfig, 0, True, context_attribs);
+	XSync(dpy, False);
+	if (!ctx || s_glxError)
+	{
+		int context_attribs_legacy[] =
+		{
+			GLX_CONTEXT_MAJOR_VERSION_ARB, 1,
+			GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+			None
+		};
+		s_glxError = false;
+		ctx = glXCreateContextAttribs(dpy, fbconfig, 0, True, context_attribs_legacy);
+		XSync(dpy, False);
+		if (!ctx || s_glxError)
+		{
+			ERROR_LOG(VIDEO, "Unable to create GL context.");
+			return false;
+		}
+	}
+	XSetErrorHandler(oldHandler);
+
+	XWindow.Initialize(dpy);
+
+	Window parent = (Window)window_handle;
+
+	XWindowAttributes attribs;
+	if (!XGetWindowAttributes(dpy, parent, &attribs))
+	{
+		ERROR_LOG(VIDEO, "Window attribute retrieval failed");
+		return false;
+	}
+
+	s_backbuffer_width  = attribs.width;
+	s_backbuffer_height = attribs.height;
+
+	win = XWindow.CreateXWindow(parent, vi);
+	XFree(vi);
+
+	return true;
+}
+
+bool cInterfaceGLX::MakeCurrent()
+{
+	bool success = glXMakeCurrent(dpy, win, ctx);
+	if (success)
+	{
+		// load this function based on the current bound context
+		glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)GLInterface->GetFuncAddress("glXSwapIntervalSGI");
+	}
+	return success;
+}
+
+bool cInterfaceGLX::ClearCurrent()
+{
+	return glXMakeCurrent(dpy, None, nullptr);
+}
+
+
+// Close backend
+void cInterfaceGLX::Shutdown()
+{
+	XWindow.DestroyXWindow();
+	if (ctx)
+	{
+		glXDestroyContext(dpy, ctx);
+		XCloseDisplay(dpy);
+		ctx = nullptr;
+	}
+}
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/GLX.h b/Source/Core/VideoBackends/OGL/GLInterface/GLX.h
new file mode 100644
index 0000000000..b9d047bc0c
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/GLX.h
@@ -0,0 +1,30 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <GL/glx.h>
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLInterface/X11_Util.h"
+
+class cInterfaceGLX : public cInterfaceBase
+{
+private:
+	cX11Window XWindow;
+	Display *dpy;
+	Window win;
+	GLXContext ctx;
+	GLXFBConfig fbconfig;
+public:
+	friend class cX11Window;
+	void SwapInterval(int Interval) override;
+	void Swap() override;
+	void* GetFuncAddress(const std::string& name) override;
+	bool Create(void *window_handle) override;
+	bool MakeCurrent() override;
+	bool ClearCurrent() override;
+	void Shutdown() override;
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp
new file mode 100644
index 0000000000..b974bb5955
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp
@@ -0,0 +1,182 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Core/Host.h"
+
+#include "VideoBackends/OGL/GLInterface/WGL.h"
+
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+static HDC hDC = nullptr;       // Private GDI Device Context
+static HGLRC hRC = nullptr;     // Permanent Rendering Context
+static HINSTANCE dllHandle = nullptr; // Handle to OpenGL32.dll
+
+// typedef from wglext.h
+typedef BOOL(WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = nullptr;
+
+void cInterfaceWGL::SwapInterval(int Interval)
+{
+	if (wglSwapIntervalEXT)
+		wglSwapIntervalEXT(Interval);
+	else
+		ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate).");
+}
+void cInterfaceWGL::Swap()
+{
+	SwapBuffers(hDC);
+}
+
+void* cInterfaceWGL::GetFuncAddress(const std::string& name)
+{
+	void* func = (void*)wglGetProcAddress((LPCSTR)name.c_str());
+	if (func == nullptr)
+		func = (void*)GetProcAddress(dllHandle, (LPCSTR)name.c_str());
+	return func;
+}
+
+// Draw messages on top of the screen
+bool cInterfaceWGL::PeekMessages()
+{
+	// TODO: peekmessage
+	MSG msg;
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+	{
+		if (msg.message == WM_QUIT)
+			return FALSE;
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+	return TRUE;
+}
+
+// Create rendering window.
+// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
+bool cInterfaceWGL::Create(void *window_handle)
+{
+	if (window_handle == nullptr)
+		return false;
+
+	HWND window_handle_reified = reinterpret_cast<HWND>(window_handle);
+	RECT window_rect = {0};
+
+	if (!GetClientRect(window_handle_reified, &window_rect))
+		return false;
+
+	// Control window size and picture scaling
+	int twidth  = (window_rect.right - window_rect.left);
+	int theight = (window_rect.bottom - window_rect.top);
+	s_backbuffer_width = twidth;
+	s_backbuffer_height = theight;
+
+	m_window_handle = window_handle_reified;
+
+#ifdef _WIN32
+	dllHandle = LoadLibrary(TEXT("OpenGL32.dll"));
+#endif
+
+	PIXELFORMATDESCRIPTOR pfd =         // pfd Tells Windows How We Want Things To Be
+	{
+		sizeof(PIXELFORMATDESCRIPTOR),  // Size Of This Pixel Format Descriptor
+		1,                              // Version Number
+		PFD_DRAW_TO_WINDOW |            // Format Must Support Window
+			PFD_SUPPORT_OPENGL |        // Format Must Support OpenGL
+			PFD_DOUBLEBUFFER,           // Must Support Double Buffering
+		PFD_TYPE_RGBA,                  // Request An RGBA Format
+		32,                             // Select Our Color Depth
+		0, 0, 0, 0, 0, 0,               // Color Bits Ignored
+		0,                              // 8bit Alpha Buffer
+		0,                              // Shift Bit Ignored
+		0,                              // No Accumulation Buffer
+		0, 0, 0, 0,                     // Accumulation Bits Ignored
+		0,                              // 0Bit Z-Buffer (Depth Buffer)
+		0,                              // 0bit Stencil Buffer
+		0,                              // No Auxiliary Buffer
+		PFD_MAIN_PLANE,                 // Main Drawing Layer
+		0,                              // Reserved
+		0, 0, 0                         // Layer Masks Ignored
+	};
+
+	int      PixelFormat;               // Holds The Results After Searching For A Match
+
+	if (!(hDC = GetDC(window_handle_reified)))
+	{
+		PanicAlert("(1) Can't create an OpenGL Device context. Fail.");
+		return false;
+	}
+
+	if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd)))
+	{
+		PanicAlert("(2) Can't find a suitable PixelFormat.");
+		return false;
+	}
+
+	if (!SetPixelFormat(hDC, PixelFormat, &pfd))
+	{
+		PanicAlert("(3) Can't set the PixelFormat.");
+		return false;
+	}
+
+	if (!(hRC = wglCreateContext(hDC)))
+	{
+		PanicAlert("(4) Can't create an OpenGL rendering context.");
+		return false;
+	}
+
+	return true;
+}
+
+bool cInterfaceWGL::MakeCurrent()
+{
+	bool success = wglMakeCurrent(hDC, hRC) ? true : false;
+	if (success)
+	{
+		// Grab the swap interval function pointer
+		wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)GLInterface->GetFuncAddress("wglSwapIntervalEXT");
+	}
+	return success;
+}
+
+bool cInterfaceWGL::ClearCurrent()
+{
+	return wglMakeCurrent(hDC, nullptr) ? true : false;
+}
+
+// Update window width, size and etc. Called from Render.cpp
+void cInterfaceWGL::Update()
+{
+	RECT rcWindow;
+	GetClientRect(m_window_handle, &rcWindow);
+
+	// Get the new window width and height
+	s_backbuffer_width  = (rcWindow.right - rcWindow.left);
+	s_backbuffer_height = (rcWindow.bottom - rcWindow.top);
+}
+
+// Close backend
+void cInterfaceWGL::Shutdown()
+{
+	if (hRC)
+	{
+		if (!wglMakeCurrent(nullptr, nullptr))
+			NOTICE_LOG(VIDEO, "Could not release drawing context.");
+
+		if (!wglDeleteContext(hRC))
+			ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");
+
+		hRC = nullptr;
+	}
+
+	if (hDC && !ReleaseDC(m_window_handle, hDC))
+	{
+		ERROR_LOG(VIDEO, "Attempt to release device context failed.");
+		hDC = nullptr;
+	}
+}
+
+
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/WGL.h b/Source/Core/VideoBackends/OGL/GLInterface/WGL.h
new file mode 100644
index 0000000000..6c1ece457d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/WGL.h
@@ -0,0 +1,25 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+class cInterfaceWGL : public cInterfaceBase
+{
+public:
+	void SwapInterval(int Interval);
+	void Swap();
+	void* GetFuncAddress(const std::string& name);
+	bool Create(void *window_handle);
+	bool MakeCurrent();
+	bool ClearCurrent();
+	void Shutdown();
+
+	void Update();
+	bool PeekMessages();
+
+	HWND m_window_handle;
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.cpp b/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.cpp
new file mode 100644
index 0000000000..1577df5220
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.cpp
@@ -0,0 +1,75 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Thread.h"
+#include "Core/Host.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLInterface/X11_Util.h"
+#include "VideoCommon/VideoConfig.h"
+
+void cX11Window::Initialize(Display *_dpy)
+{
+	dpy = _dpy;
+}
+
+Window cX11Window::CreateXWindow(Window parent, XVisualInfo *vi)
+{
+	XSetWindowAttributes attr;
+
+	colormap = XCreateColormap(dpy, parent, vi->visual, AllocNone);
+
+	// Setup window attributes
+	attr.colormap = colormap;
+
+	XWindowAttributes attribs;
+	if (!XGetWindowAttributes(dpy, parent, &attribs))
+	{
+		ERROR_LOG(VIDEO, "Window attribute retrieval failed");
+		return 0;
+	}
+
+	// Create the window
+	win = XCreateWindow(dpy, parent,
+			    0, 0, attribs.width, attribs.height, 0,
+			    vi->depth, InputOutput, vi->visual,
+			    CWColormap, &attr);
+	XSelectInput(dpy, parent, StructureNotifyMask);
+	XMapWindow(dpy, win);
+	XSync(dpy, True);
+
+	xEventThread = std::thread(&cX11Window::XEventThread, this);
+
+	return win;
+}
+
+void cX11Window::DestroyXWindow(void)
+{
+	XUnmapWindow(dpy, win);
+	win = 0;
+	if (xEventThread.joinable())
+		xEventThread.join();
+	XFreeColormap(dpy, colormap);
+}
+
+void cX11Window::XEventThread()
+{
+	while (win)
+	{
+		XEvent event;
+		for (int num_events = XPending(dpy); num_events > 0; num_events--)
+		{
+			XNextEvent(dpy, &event);
+			switch (event.type)
+			{
+			case ConfigureNotify:
+				XResizeWindow(dpy, win, event.xconfigure.width, event.xconfigure.height);
+				GLInterface->SetBackBufferDimensions(event.xconfigure.width, event.xconfigure.height);
+				break;
+			default:
+				break;
+			}
+		}
+		Common::SleepCurrentThread(20);
+	}
+}
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.h b/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.h
new file mode 100644
index 0000000000..86a5fb1d93
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterface/X11_Util.h
@@ -0,0 +1,26 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <thread>
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+class cX11Window
+{
+private:
+	void XEventThread();
+	std::thread xEventThread;
+	Colormap colormap;
+public:
+	void Initialize(Display *dpy);
+	Window CreateXWindow(Window parent, XVisualInfo *vi);
+	void DestroyXWindow();
+
+	Display *dpy;
+	Window win;
+};
diff --git a/Source/Core/VideoBackends/OGL/GLInterfaceBase.h b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h
new file mode 100644
index 0000000000..31d107ad86
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+enum GLInterfaceMode {
+	MODE_DETECT = 0,
+	MODE_OPENGL,
+	MODE_OPENGLES2,
+	MODE_OPENGLES3,
+};
+
+class cInterfaceBase
+{
+protected:
+	// Window dimensions.
+	u32 s_backbuffer_width;
+	u32 s_backbuffer_height;
+
+	u32 s_opengl_mode;
+public:
+	virtual ~cInterfaceBase() {}
+	virtual void Swap() {}
+	virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
+	virtual u32 GetMode() { return s_opengl_mode; }
+	virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
+	virtual bool Create(void *window_handle) { return true; }
+	virtual bool MakeCurrent() { return true; }
+	virtual bool ClearCurrent() { return true; }
+	virtual void Shutdown() {}
+
+	virtual void SwapInterval(int Interval) { }
+	virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }
+	virtual u32 GetBackBufferHeight() { return s_backbuffer_height; }
+	virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; }
+	virtual void Update() { }
+	virtual bool PeekMessages() { return false; }
+};
+
+extern cInterfaceBase *GLInterface;
+
+// This function has to be defined along the Host_ functions from Core/Host.h.
+// Current canonical implementation: DolphinWX/GLInterface/GLInterface.cpp.
+cInterfaceBase* HostGL_CreateGLInterface();
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp
new file mode 100644
index 0000000000..eff7451788
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp
@@ -0,0 +1,154 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/VideoBackend.h"
+
+#include "VideoCommon/VideoConfig.h"
+
+cInterfaceBase *GLInterface;
+static GLuint attributelessVAO = 0;
+static GLuint attributelessVBO = 0;
+
+namespace OGL
+{
+
+// Draw messages on top of the screen
+unsigned int VideoBackend::PeekMessages()
+{
+	return GLInterface->PeekMessages();
+}
+
+}
+void InitInterface()
+{
+	GLInterface = HostGL_CreateGLInterface();
+}
+
+GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader)
+{
+	// generate objects
+	GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
+	GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
+	GLuint programID = glCreateProgram();
+
+	// compile vertex shader
+	glShaderSource(vertexShaderID, 1, &vertexShader, nullptr);
+	glCompileShader(vertexShaderID);
+#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
+	GLint Result = GL_FALSE;
+	char stringBuffer[1024];
+	GLsizei stringBufferUsage = 0;
+	glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result);
+	glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer);
+
+	if (Result && stringBufferUsage)
+	{
+		ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader);
+	}
+	else if (!Result)
+	{
+		ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader);
+	}
+	else
+	{
+		DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader);
+	}
+
+	bool shader_errors = !Result;
+#endif
+
+	// compile fragment shader
+	glShaderSource(fragmentShaderID, 1, &fragmentShader, nullptr);
+	glCompileShader(fragmentShaderID);
+#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
+	glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result);
+	glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer);
+
+	if (Result && stringBufferUsage)
+	{
+		ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader);
+	}
+	else if (!Result)
+	{
+		ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader);
+	}
+	else
+	{
+		DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader);
+	}
+
+	shader_errors |= !Result;
+#endif
+
+	// link them
+	glAttachShader(programID, vertexShaderID);
+	glAttachShader(programID, fragmentShaderID);
+	glLinkProgram(programID);
+#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
+	glGetProgramiv(programID, GL_LINK_STATUS, &Result);
+	glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer);
+
+	if (Result && stringBufferUsage)
+	{
+		ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
+	}
+	else if (!Result && !shader_errors)
+	{
+		ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
+	}
+#endif
+
+	// cleanup
+	glDeleteShader(vertexShaderID);
+	glDeleteShader(fragmentShaderID);
+
+	return programID;
+}
+
+void OpenGL_CreateAttributelessVAO()
+{
+	glGenVertexArrays(1, &attributelessVAO);
+	_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have been created successfully.")
+
+	// In a compatibility context, we require a valid, bound array buffer.
+	glGenBuffers(1, &attributelessVBO);
+	_dbg_assert_msg_(VIDEO, attributelessVBO != 0, "Attributeless VBO should have been created successfully.")
+
+	// Initialize the buffer with nothing.  16 floats is an arbitrary size that may work around driver issues.
+	glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 16, nullptr, GL_STATIC_DRAW);
+
+	// We must also define vertex attribute 0.
+	glBindVertexArray(attributelessVAO);
+	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
+	glEnableVertexAttribArray(0);
+}
+
+void OpenGL_BindAttributelessVAO()
+{
+	_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have already been created.")
+	glBindVertexArray(attributelessVAO);
+}
+
+void OpenGL_DeleteAttributelessVAO()
+{
+	_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have already been created.")
+	if (attributelessVAO != 0)
+	{
+		glDeleteVertexArrays(1, &attributelessVAO);
+		glDeleteBuffers(1, &attributelessVBO);
+
+		attributelessVAO = 0;
+		attributelessVBO = 0;
+	}
+}
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.h b/Source/Core/VideoBackends/OGL/GLUtil.h
new file mode 100644
index 0000000000..8c0eb27ac6
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/GLUtil.h
@@ -0,0 +1,34 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/MathUtil.h"
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+#include "VideoCommon/VideoConfig.h"
+
+#ifndef _WIN32
+
+#include <sys/types.h>
+
+#endif
+void InitInterface();
+
+// Helpers
+GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
+
+// Creates and deletes a VAO and VBO suitable for attributeless rendering.
+// Called by the Renderer.
+void OpenGL_CreateAttributelessVAO();
+void OpenGL_DeleteAttributelessVAO();
+
+// Binds the VAO suitable for attributeless rendering.
+void OpenGL_BindAttributelessVAO();
+
+// this should be removed in future, but as long as glsl is unstable, we should really read this messages
+#if defined(_DEBUG) || defined(DEBUGFAST)
+#define DEBUG_GLSL 1
+#else
+#define DEBUG_GLSL 0
+#endif
diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
new file mode 100644
index 0000000000..de0eb4f10d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
@@ -0,0 +1,96 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/MemoryUtil.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/VertexManager.h"
+
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/VertexShaderGen.h"
+
+// Here's some global state. We only use this to keep track of what we've sent to the OpenGL state
+// machine.
+
+namespace OGL
+{
+
+NativeVertexFormat* VertexManager::CreateNativeVertexFormat()
+{
+	return new GLVertexFormat();
+}
+
+GLVertexFormat::GLVertexFormat()
+{
+
+}
+
+GLVertexFormat::~GLVertexFormat()
+{
+	glDeleteVertexArrays(1, &VAO);
+}
+
+static inline GLuint VarToGL(VarType t)
+{
+	static const GLuint lookup[5] = {
+		GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_FLOAT
+	};
+	return lookup[t];
+}
+
+static void SetPointer(u32 attrib, u32 stride, const AttributeFormat &format)
+{
+	if (!format.enable)
+		return;
+
+	glEnableVertexAttribArray(attrib);
+	if (format.integer)
+		glVertexAttribIPointer(attrib, format.components, VarToGL(format.type), stride, (u8*)nullptr + format.offset);
+	else
+		glVertexAttribPointer(attrib, format.components, VarToGL(format.type), true, stride, (u8*)nullptr + format.offset);
+}
+
+void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
+{
+	this->vtx_decl = _vtx_decl;
+	u32 vertex_stride = _vtx_decl.stride;
+
+	// We will not allow vertex components causing uneven strides.
+	if (vertex_stride & 3)
+		PanicAlert("Uneven vertex stride: %i", vertex_stride);
+
+	VertexManager *vm = (OGL::VertexManager*)g_vertex_manager;
+
+	glGenVertexArrays(1, &VAO);
+	glBindVertexArray(VAO);
+
+	// the element buffer is bound directly to the vao, so we must it set for every vao
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->m_index_buffers);
+	glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers);
+
+	SetPointer(SHADER_POSITION_ATTRIB, vertex_stride, vtx_decl.position);
+
+	for (int i = 0; i < 3; i++)
+		SetPointer(SHADER_NORM0_ATTRIB+i, vertex_stride, vtx_decl.normals[i]);
+
+	for (int i = 0; i < 2; i++)
+		SetPointer(SHADER_COLOR0_ATTRIB+i, vertex_stride, vtx_decl.colors[i]);
+
+	for (int i = 0; i < 8; i++)
+		SetPointer(SHADER_TEXTURE0_ATTRIB+i, vertex_stride, vtx_decl.texcoords[i]);
+
+	SetPointer(SHADER_POSMTX_ATTRIB, vertex_stride, vtx_decl.posmtx);
+
+	vm->m_last_vao = VAO;
+}
+
+void GLVertexFormat::SetupVertexPointers()
+{
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
new file mode 100644
index 0000000000..2d2cf22cae
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -0,0 +1,118 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EC1A314C-5588-4506-9C1E-2E58E5817F75}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClCompile Include="BoundingBox.cpp" />
+    <ClCompile Include="FramebufferManager.cpp" />
+    <ClCompile Include="GLExtensions\GLExtensions.cpp" />
+    <ClCompile Include="GLInterface\GLInterface.cpp" />
+    <ClCompile Include="GLInterface\WGL.cpp" />
+    <ClCompile Include="GLUtil.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="NativeVertexFormat.cpp" />
+    <ClCompile Include="PerfQuery.cpp" />
+    <ClCompile Include="PostProcessing.cpp" />
+    <ClCompile Include="ProgramShaderCache.cpp" />
+    <ClCompile Include="RasterFont.cpp" />
+    <ClCompile Include="Render.cpp" />
+    <ClCompile Include="SamplerCache.cpp" />
+    <ClCompile Include="StreamBuffer.cpp" />
+    <ClCompile Include="TextureCache.cpp" />
+    <ClCompile Include="TextureConverter.cpp" />
+    <ClCompile Include="VertexManager.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BoundingBox.h" />
+    <ClInclude Include="FramebufferManager.h" />
+    <ClInclude Include="GLExtensions\ARB_blend_func_extended.h" />
+    <ClInclude Include="GLExtensions\ARB_buffer_storage.h" />
+    <ClInclude Include="GLExtensions\ARB_clip_control.h" />
+    <ClInclude Include="GLExtensions\ARB_debug_output.h" />
+    <ClInclude Include="GLExtensions\ARB_draw_elements_base_vertex.h" />
+    <ClInclude Include="GLExtensions\ARB_ES2_compatibility.h" />
+    <ClInclude Include="GLExtensions\ARB_framebuffer_object.h" />
+    <ClInclude Include="GLExtensions\ARB_get_program_binary.h" />
+    <ClInclude Include="GLExtensions\ARB_map_buffer_range.h" />
+    <ClInclude Include="GLExtensions\ARB_sampler_objects.h" />
+    <ClInclude Include="GLExtensions\ARB_sample_shading.h" />
+    <ClInclude Include="GLExtensions\ARB_sync.h" />
+    <ClInclude Include="GLExtensions\ARB_uniform_buffer_object.h" />
+    <ClInclude Include="GLExtensions\ARB_vertex_array_object.h" />
+    <ClInclude Include="GLExtensions\ARB_viewport_array.h" />
+    <ClInclude Include="GLExtensions\GLExtensions.h" />
+    <ClInclude Include="GLExtensions\gl_1_1.h" />
+    <ClInclude Include="GLExtensions\gl_1_2.h" />
+    <ClInclude Include="GLExtensions\gl_1_3.h" />
+    <ClInclude Include="GLExtensions\gl_1_4.h" />
+    <ClInclude Include="GLExtensions\gl_1_5.h" />
+    <ClInclude Include="GLExtensions\gl_2_0.h" />
+    <ClInclude Include="GLExtensions\gl_3_0.h" />
+    <ClInclude Include="GLExtensions\gl_3_1.h" />
+    <ClInclude Include="GLExtensions\gl_3_2.h" />
+    <ClInclude Include="GLExtensions\gl_common.h" />
+    <ClInclude Include="GLExtensions\KHR_debug.h" />
+    <ClInclude Include="GLExtensions\NV_occlusion_query_samples.h" />
+    <ClInclude Include="GLExtensions\NV_primitive_restart.h" />
+    <ClInclude Include="GLInterface\WGL.h" />
+    <ClInclude Include="GLUtil.h" />
+    <ClInclude Include="main.h" />
+    <ClInclude Include="PerfQuery.h" />
+    <ClInclude Include="PostProcessing.h" />
+    <ClInclude Include="ProgramShaderCache.h" />
+    <ClInclude Include="RasterFont.h" />
+    <ClInclude Include="Render.h" />
+    <ClInclude Include="SamplerCache.h" />
+    <ClInclude Include="StreamBuffer.h" />
+    <ClInclude Include="TextureCache.h" />
+    <ClInclude Include="TextureConverter.h" />
+    <ClInclude Include="VertexManager.h" />
+    <ClInclude Include="VideoBackend.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
new file mode 100644
index 0000000000..e176e3f92f
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Decoder">
+      <UniqueIdentifier>{f29f8e7f-21ba-49da-8044-e5279a091c8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GLUtil">
+      <UniqueIdentifier>{5bfec41c-1031-4925-8f98-38c7b49b1924}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Logging">
+      <UniqueIdentifier>{00dadfd8-a906-4b0c-b415-d42a69cf3ca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Render">
+      <UniqueIdentifier>{696df73b-378e-4399-8f21-999b65d78dcd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GLExtensions">
+      <UniqueIdentifier>{4366f285-ded5-48c9-9464-03fb46174526}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GLInterface">
+      <UniqueIdentifier>{1734a626-f6e2-41b1-8753-43447bed39af}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="NativeVertexFormat.cpp">
+      <Filter>Decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexManager.cpp">
+      <Filter>Decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="GLUtil.cpp">
+      <Filter>GLUtil</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureConverter.cpp">
+      <Filter>GLUtil</Filter>
+    </ClCompile>
+    <ClCompile Include="RasterFont.cpp">
+      <Filter>Logging</Filter>
+    </ClCompile>
+    <ClCompile Include="BoundingBox.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="FramebufferManager.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="PerfQuery.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="PostProcessing.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="ProgramShaderCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="Render.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="StreamBuffer.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureCache.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="SamplerCache.cpp" />
+    <ClCompile Include="GLExtensions\GLExtensions.cpp">
+      <Filter>GLExtensions</Filter>
+    </ClCompile>
+    <ClCompile Include="GLInterface\GLInterface.cpp">
+      <Filter>GLInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="GLInterface\WGL.cpp">
+      <Filter>GLInterface</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="VertexManager.h">
+      <Filter>Decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="GLUtil.h">
+      <Filter>GLUtil</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureConverter.h">
+      <Filter>GLUtil</Filter>
+    </ClInclude>
+    <ClInclude Include="RasterFont.h">
+      <Filter>Logging</Filter>
+    </ClInclude>
+    <ClInclude Include="BoundingBox.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="FramebufferManager.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="PerfQuery.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="PostProcessing.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="ProgramShaderCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="Render.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="StreamBuffer.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureCache.h">
+      <Filter>Render</Filter>
+    </ClInclude>
+    <ClInclude Include="main.h" />
+    <ClInclude Include="SamplerCache.h" />
+    <ClInclude Include="VideoBackend.h" />
+    <ClInclude Include="GLExtensions\ARB_blend_func_extended.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_buffer_storage.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_debug_output.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_draw_elements_base_vertex.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_ES2_compatibility.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_framebuffer_object.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_get_program_binary.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_map_buffer_range.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_sample_shading.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_sampler_objects.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_sync.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_uniform_buffer_object.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_vertex_array_object.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_viewport_array.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_1_1.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_1_2.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_1_3.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_1_4.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_1_5.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_2_0.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_3_0.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_3_1.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_3_2.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\gl_common.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\GLExtensions.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\NV_occlusion_query_samples.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\NV_primitive_restart.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\KHR_debug.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+    <ClInclude Include="GLInterface\WGL.h">
+      <Filter>GLInterface</Filter>
+    </ClInclude>
+    <ClInclude Include="GLExtensions\ARB_clip_control.h">
+      <Filter>GLExtensions</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+</Project>
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
new file mode 100644
index 0000000000..a34432aceb
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
@@ -0,0 +1,252 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoCommon/RenderBase.h"
+
+namespace OGL
+{
+PerfQueryBase* GetPerfQuery()
+{
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 &&
+	    GLExtensions::Supports("GL_NV_occlusion_query_samples"))
+		return new PerfQueryGLESNV();
+	else if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
+		return new PerfQueryGL(GL_ANY_SAMPLES_PASSED);
+	else
+		return new PerfQueryGL(GL_SAMPLES_PASSED);
+}
+
+PerfQuery::PerfQuery()
+	: m_query_read_pos()
+{
+	ResetQuery();
+}
+
+void PerfQuery::EnableQuery(PerfQueryGroup type)
+{
+	m_query->EnableQuery(type);
+}
+
+void PerfQuery::DisableQuery(PerfQueryGroup type)
+{
+	m_query->DisableQuery(type);
+}
+
+bool PerfQuery::IsFlushed() const
+{
+	return 0 == m_query_count;
+}
+
+// TODO: could selectively flush things, but I don't think that will do much
+void PerfQuery::FlushResults()
+{
+	m_query->FlushResults();
+}
+
+void PerfQuery::ResetQuery()
+{
+	m_query_count = 0;
+	std::fill_n(m_results, ArraySize(m_results), 0);
+}
+
+u32 PerfQuery::GetQueryResult(PerfQueryType type)
+{
+	u32 result = 0;
+
+	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
+	{
+		result = m_results[PQG_ZCOMP_ZCOMPLOC];
+	}
+	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
+	{
+		result = m_results[PQG_ZCOMP];
+	}
+	else if (type == PQ_BLEND_INPUT)
+	{
+		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
+	}
+	else if (type == PQ_EFB_COPY_CLOCKS)
+	{
+		result = m_results[PQG_EFB_COPY_CLOCKS];
+	}
+
+	return result / 4;
+}
+
+// Implementations
+PerfQueryGL::PerfQueryGL(GLenum query_type)
+	: m_query_type(query_type)
+{
+	for (ActiveQuery& query : m_query_buffer)
+		glGenQueries(1, &query.query_id);
+}
+
+PerfQueryGL::~PerfQueryGL()
+{
+	for (ActiveQuery& query : m_query_buffer)
+		glDeleteQueries(1, &query.query_id);
+}
+
+void PerfQueryGL::EnableQuery(PerfQueryGroup type)
+{
+	// Is this sane?
+	if (m_query_count > m_query_buffer.size() / 2)
+		WeakFlush();
+
+	if (m_query_buffer.size() == m_query_count)
+	{
+		FlushOne();
+		//ERROR_LOG(VIDEO, "Flushed query buffer early!");
+	}
+
+	// start query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % m_query_buffer.size()];
+
+		glBeginQuery(m_query_type, entry.query_id);
+		entry.query_type = type;
+
+		++m_query_count;
+	}
+}
+void PerfQueryGL::DisableQuery(PerfQueryGroup type)
+{
+	// stop query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		glEndQuery(m_query_type);
+	}
+}
+
+void PerfQueryGL::WeakFlush()
+{
+	while (!IsFlushed())
+	{
+		auto& entry = m_query_buffer[m_query_read_pos];
+
+		GLuint result = GL_FALSE;
+		glGetQueryObjectuiv(entry.query_id, GL_QUERY_RESULT_AVAILABLE, &result);
+
+		if (GL_TRUE == result)
+		{
+			FlushOne();
+		}
+		else
+		{
+			break;
+		}
+	}
+}
+
+void PerfQueryGL::FlushOne()
+{
+	auto& entry = m_query_buffer[m_query_read_pos];
+
+	GLuint result = 0;
+	glGetQueryObjectuiv(entry.query_id, GL_QUERY_RESULT, &result);
+
+	// NOTE: Reported pixel metrics should be referenced to native resolution
+	m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
+
+	m_query_read_pos = (m_query_read_pos + 1) % m_query_buffer.size();
+	--m_query_count;
+}
+
+// TODO: could selectively flush things, but I don't think that will do much
+void PerfQueryGL::FlushResults()
+{
+	while (!IsFlushed())
+		FlushOne();
+}
+
+PerfQueryGLESNV::PerfQueryGLESNV()
+{
+	for (ActiveQuery& query : m_query_buffer)
+		glGenOcclusionQueriesNV(1, &query.query_id);
+}
+
+PerfQueryGLESNV::~PerfQueryGLESNV()
+{
+	for (ActiveQuery& query : m_query_buffer)
+		glDeleteOcclusionQueriesNV(1, &query.query_id);
+}
+
+void PerfQueryGLESNV::EnableQuery(PerfQueryGroup type)
+{
+	// Is this sane?
+	if (m_query_count > m_query_buffer.size() / 2)
+		WeakFlush();
+
+	if (m_query_buffer.size() == m_query_count)
+	{
+		FlushOne();
+		//ERROR_LOG(VIDEO, "Flushed query buffer early!");
+	}
+
+	// start query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % m_query_buffer.size()];
+
+		glBeginOcclusionQueryNV(entry.query_id);
+		entry.query_type = type;
+
+		++m_query_count;
+	}
+}
+void PerfQueryGLESNV::DisableQuery(PerfQueryGroup type)
+{
+	// stop query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		glEndOcclusionQueryNV();
+	}
+}
+
+void PerfQueryGLESNV::WeakFlush()
+{
+	while (!IsFlushed())
+	{
+		auto& entry = m_query_buffer[m_query_read_pos];
+
+		GLuint result = GL_FALSE;
+		glGetOcclusionQueryuivNV(entry.query_id, GL_PIXEL_COUNT_AVAILABLE_NV, &result);
+
+		if (GL_TRUE == result)
+		{
+			FlushOne();
+		}
+		else
+		{
+			break;
+		}
+	}
+}
+
+void PerfQueryGLESNV::FlushOne()
+{
+	auto& entry = m_query_buffer[m_query_read_pos];
+
+	GLuint result = 0;
+	glGetOcclusionQueryuivNV(entry.query_id, GL_OCCLUSION_TEST_RESULT_HP, &result);
+
+	// NOTE: Reported pixel metrics should be referenced to native resolution
+	m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
+
+	m_query_read_pos = (m_query_read_pos + 1) % m_query_buffer.size();
+	--m_query_count;
+}
+
+// TODO: could selectively flush things, but I don't think that will do much
+void PerfQueryGLESNV::FlushResults()
+{
+	while (!IsFlushed())
+		FlushOne();
+}
+
+} // namespace
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h
new file mode 100644
index 0000000000..3b16c810e7
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.h
@@ -0,0 +1,87 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <memory>
+
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+#include "VideoCommon/PerfQueryBase.h"
+
+namespace OGL
+{
+PerfQueryBase* GetPerfQuery();
+
+class PerfQuery : public PerfQueryBase
+{
+public:
+	PerfQuery();
+	~PerfQuery() {}
+
+	void EnableQuery(PerfQueryGroup type) override;
+	void DisableQuery(PerfQueryGroup type) override;
+	void ResetQuery() override;
+	u32 GetQueryResult(PerfQueryType type) override;
+	void FlushResults() override;
+	bool IsFlushed() const override;
+
+protected:
+	struct ActiveQuery
+	{
+		GLuint query_id;
+		PerfQueryGroup query_type;
+	};
+
+	// when testing in SMS: 64 was too small, 128 was ok
+	static const u32 PERF_QUERY_BUFFER_SIZE = 512;
+
+	// This contains gl query objects with unretrieved results.
+	std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer;
+	u32 m_query_read_pos;
+
+private:
+	// Implementation
+	std::unique_ptr<PerfQuery> m_query;
+};
+
+// Implementations
+class PerfQueryGL : public PerfQuery
+{
+public:
+	PerfQueryGL(GLenum query_type);
+	~PerfQueryGL();
+
+	void EnableQuery(PerfQueryGroup type) override;
+	void DisableQuery(PerfQueryGroup type) override;
+	void FlushResults() override;
+
+private:
+
+	void WeakFlush();
+	// Only use when non-empty
+	void FlushOne();
+
+	GLenum m_query_type;
+};
+
+class PerfQueryGLESNV : public PerfQuery
+{
+public:
+	PerfQueryGLESNV();
+	~PerfQueryGLESNV();
+
+	void EnableQuery(PerfQueryGroup type) override;
+	void DisableQuery(PerfQueryGroup type) override;
+	void FlushResults() override;
+
+private:
+
+	void WeakFlush();
+	// Only use when non-empty
+	void FlushOne();
+};
+
+
+} // namespace
diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/PostProcessing.cpp
new file mode 100644
index 0000000000..b6715ff0ff
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/PostProcessing.cpp
@@ -0,0 +1,326 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/PostProcessing.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace OGL
+{
+
+static const char s_vertex_workaround_shader[] =
+	"in vec4 rawpos;\n"
+	"out vec2 uv0;\n"
+	"uniform vec4 src_rect;\n"
+	"void main(void) {\n"
+	"	gl_Position = vec4(rawpos.xy, 0.0, 1.0);\n"
+	"	uv0 = rawpos.zw * src_rect.zw + src_rect.xy;\n"
+	"}\n";
+
+static const char s_vertex_shader[] =
+	"out vec2 uv0;\n"
+	"uniform vec4 src_rect;\n"
+	"void main(void) {\n"
+	"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+	"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+	"	uv0 = rawpos * src_rect.zw + src_rect.xy;\n"
+	"}\n";
+
+OpenGLPostProcessing::OpenGLPostProcessing()
+	: m_initialized(false)
+{
+	CreateHeader();
+
+	m_attribute_workaround = DriverDetails::HasBug(DriverDetails::BUG_BROKENATTRIBUTELESS);
+	if (m_attribute_workaround)
+	{
+		glGenBuffers(1, &m_attribute_vbo);
+		glGenVertexArrays(1, &m_attribute_vao);
+	}
+}
+
+OpenGLPostProcessing::~OpenGLPostProcessing()
+{
+	m_shader.Destroy();
+
+	if (m_attribute_workaround)
+	{
+		glDeleteBuffers(1, &m_attribute_vbo);
+		glDeleteVertexArrays(1, &m_attribute_vao);
+	}
+}
+
+void OpenGLPostProcessing::BlitFromTexture(TargetRectangle src, TargetRectangle dst,
+                                           int src_texture, int src_width, int src_height, int layer)
+{
+	ApplyShader();
+
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+
+	glViewport(dst.left, dst.bottom, dst.GetWidth(), dst.GetHeight());
+
+	if (m_attribute_workaround)
+		glBindVertexArray(m_attribute_vao);
+	else
+		OpenGL_BindAttributelessVAO();
+
+	m_shader.Bind();
+
+	glUniform4f(m_uniform_resolution, (float)src_width, (float)src_height, 1.0f / (float)src_width, 1.0f / (float)src_height);
+	glUniform4f(m_uniform_src_rect, src.left / (float) src_width, src.bottom / (float) src_height,
+		    src.GetWidth() / (float) src_width, src.GetHeight() / (float) src_height);
+	glUniform1ui(m_uniform_time, (GLuint)m_timer.GetTimeElapsed());
+	glUniform1i(m_uniform_layer, layer);
+
+	if (m_config.IsDirty())
+	{
+		for (auto& it : m_config.GetOptions())
+		{
+			if (it.second.m_dirty)
+			{
+				switch (it.second.m_type)
+				{
+				case PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_BOOL:
+					glUniform1i(m_uniform_bindings[it.first], it.second.m_bool_value);
+				break;
+				case PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER:
+					switch (it.second.m_integer_values.size())
+					{
+					case 1:
+						glUniform1i(m_uniform_bindings[it.first], it.second.m_integer_values[0]);
+					break;
+					case 2:
+						glUniform2i(m_uniform_bindings[it.first],
+								it.second.m_integer_values[0],
+						            it.second.m_integer_values[1]);
+					break;
+					case 3:
+						glUniform3i(m_uniform_bindings[it.first],
+								it.second.m_integer_values[0],
+								it.second.m_integer_values[1],
+						            it.second.m_integer_values[2]);
+					break;
+					case 4:
+						glUniform4i(m_uniform_bindings[it.first],
+								it.second.m_integer_values[0],
+								it.second.m_integer_values[1],
+								it.second.m_integer_values[2],
+						            it.second.m_integer_values[3]);
+					break;
+					}
+				break;
+				case PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_FLOAT:
+					switch (it.second.m_float_values.size())
+					{
+					case 1:
+						glUniform1f(m_uniform_bindings[it.first], it.second.m_float_values[0]);
+					break;
+					case 2:
+						glUniform2f(m_uniform_bindings[it.first],
+								it.second.m_float_values[0],
+						            it.second.m_float_values[1]);
+					break;
+					case 3:
+						glUniform3f(m_uniform_bindings[it.first],
+								it.second.m_float_values[0],
+								it.second.m_float_values[1],
+						            it.second.m_float_values[2]);
+					break;
+					case 4:
+						glUniform4f(m_uniform_bindings[it.first],
+								it.second.m_float_values[0],
+								it.second.m_float_values[1],
+								it.second.m_float_values[2],
+						            it.second.m_float_values[3]);
+					break;
+					}
+				break;
+				}
+				it.second.m_dirty = false;
+			}
+		}
+		m_config.SetDirty(false);
+	}
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, src_texture);
+	g_sampler_cache->BindLinearSampler(9);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+}
+
+void OpenGLPostProcessing::ApplyShader()
+{
+	// shader didn't changed
+	if (m_initialized && m_config.GetShader() == g_ActiveConfig.sPostProcessingShader)
+		return;
+
+	m_shader.Destroy();
+	m_uniform_bindings.clear();
+
+	// load shader code
+	std::string code = m_config.LoadShader();
+	code = LoadShaderOptions(code);
+
+	const char* vertex_shader = s_vertex_shader;
+
+	if (m_attribute_workaround)
+		vertex_shader = s_vertex_workaround_shader;
+
+	// and compile it
+	if (!ProgramShaderCache::CompileShader(m_shader, vertex_shader, code.c_str()))
+	{
+		ERROR_LOG(VIDEO, "Failed to compile post-processing shader %s", m_config.GetShader().c_str());
+		g_ActiveConfig.sPostProcessingShader.clear();
+		code = m_config.LoadShader();
+		ProgramShaderCache::CompileShader(m_shader, vertex_shader, code.c_str());
+	}
+
+	// read uniform locations
+	m_uniform_resolution = glGetUniformLocation(m_shader.glprogid, "resolution");
+	m_uniform_time = glGetUniformLocation(m_shader.glprogid, "time");
+	m_uniform_src_rect = glGetUniformLocation(m_shader.glprogid, "src_rect");
+	m_uniform_layer = glGetUniformLocation(m_shader.glprogid, "layer");
+
+	if (m_attribute_workaround)
+	{
+		GLfloat vertices[] = {
+			-1.f, -1.f, 0.f, 0.f,
+			 1.f, -1.f, 1.f, 0.f,
+			-1.f,  1.f, 0.f, 1.f,
+			 1.f,  1.f, 1.f, 1.f,
+		};
+
+		glBindBuffer(GL_ARRAY_BUFFER, m_attribute_vbo);
+		glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+
+		glBindVertexArray(m_attribute_vao);
+		glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
+		glVertexAttribPointer(SHADER_POSITION_ATTRIB, 4, GL_FLOAT, 0, 0, nullptr);
+	}
+
+	for (const auto& it : m_config.GetOptions())
+	{
+		std::string glsl_name = "option_" + it.first;
+		m_uniform_bindings[it.first] = glGetUniformLocation(m_shader.glprogid, glsl_name.c_str());
+	}
+	m_initialized = true;
+}
+
+void OpenGLPostProcessing::CreateHeader()
+{
+	m_glsl_header =
+		// Required variables
+		// Shouldn't be accessed directly by the PP shader
+		// Texture sampler
+		"SAMPLER_BINDING(8) uniform sampler2D samp8;\n"
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+
+		// Output variable
+		"out float4 ocol0;\n"
+		// Input coordinates
+		"in float2 uv0;\n"
+		// Resolution
+		"uniform float4 resolution;\n"
+		// Time
+		"uniform uint time;\n"
+		// Layer
+		"uniform int layer;\n"
+
+		// Interfacing functions
+		"float4 Sample()\n"
+		"{\n"
+			"\treturn texture(samp9, float3(uv0, layer));\n"
+		"}\n"
+
+		"float4 SampleLocation(float2 location)\n"
+		"{\n"
+			"\treturn texture(samp9, float3(location, layer));\n"
+		"}\n"
+
+		"float4 SampleLayer(int layer)\n"
+		"{\n"
+			"\treturn texture(samp9, float3(uv0, layer));\n"
+		"}\n"
+
+		"#define SampleOffset(offset) textureOffset(samp9, float3(uv0, layer), offset)\n"
+
+		"float4 SampleFontLocation(float2 location)\n"
+		"{\n"
+			"\treturn texture(samp8, location);\n"
+		"}\n"
+
+		"float2 GetResolution()\n"
+		"{\n"
+			"\treturn resolution.xy;\n"
+		"}\n"
+
+		"float2 GetInvResolution()\n"
+		"{\n"
+			"\treturn resolution.zw;\n"
+		"}\n"
+
+		"float2 GetCoordinates()\n"
+		"{\n"
+			"\treturn uv0;\n"
+		"}\n"
+
+		"uint GetTime()\n"
+		"{\n"
+			"\treturn time;\n"
+		"}\n"
+
+		"void SetOutput(float4 color)\n"
+		"{\n"
+			"\tocol0 = color;\n"
+		"}\n"
+
+		"#define GetOption(x) (option_##x)\n"
+		"#define OptionEnabled(x) (option_##x != 0)\n";
+}
+
+std::string OpenGLPostProcessing::LoadShaderOptions(const std::string& code)
+{
+	std::string glsl_options = "";
+	m_uniform_bindings.clear();
+
+	for (const auto& it : m_config.GetOptions())
+	{
+		if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_BOOL)
+		{
+			glsl_options += StringFromFormat("uniform int     option_%s;\n", it.first.c_str());
+		}
+		else if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_INTEGER)
+		{
+			u32 count = static_cast<u32>(it.second.m_integer_values.size());
+			if (count == 1)
+				glsl_options += StringFromFormat("uniform int     option_%s;\n", it.first.c_str());
+			else
+				glsl_options += StringFromFormat("uniform int%d   option_%s;\n", count, it.first.c_str());
+		}
+		else if (it.second.m_type == PostProcessingShaderConfiguration::ConfigurationOption::OptionType::OPTION_FLOAT)
+		{
+			u32 count = static_cast<u32>(it.second.m_float_values.size());
+			if (count == 1)
+				glsl_options += StringFromFormat("uniform float   option_%s;\n", it.first.c_str());
+			else
+				glsl_options += StringFromFormat("uniform float%d option_%s;\n", count, it.first.c_str());
+		}
+
+		m_uniform_bindings[it.first] = 0;
+	}
+
+	return m_glsl_header + glsl_options + code;
+}
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.h b/Source/Core/VideoBackends/OGL/PostProcessing.h
new file mode 100644
index 0000000000..66ab984d7d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/PostProcessing.h
@@ -0,0 +1,49 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <unordered_map>
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+
+#include "VideoCommon/PostProcessing.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace OGL
+{
+
+class OpenGLPostProcessing : public PostProcessingShaderImplementation
+{
+public:
+	OpenGLPostProcessing();
+	~OpenGLPostProcessing();
+
+	void BlitFromTexture(TargetRectangle src, TargetRectangle dst,
+	                     int src_texture, int src_width, int src_height, int layer) override;
+	void ApplyShader() override;
+
+private:
+	bool m_initialized;
+	SHADER m_shader;
+	GLuint m_uniform_resolution;
+	GLuint m_uniform_src_rect;
+	GLuint m_uniform_time;
+	GLuint m_uniform_layer;
+	std::string m_glsl_header;
+
+	// These are only used when working around Qualcomm's broken attributeless rendering
+	GLuint m_attribute_vao;
+	GLuint m_attribute_vbo;
+	bool m_attribute_workaround = false;
+
+	std::unordered_map<std::string, GLuint> m_uniform_bindings;
+
+	void CreateHeader();
+	std::string LoadShaderOptions(const std::string& code);
+};
+
+}  // namespace
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
new file mode 100644
index 0000000000..4ff8bf28de
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -0,0 +1,610 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/StreamBuffer.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexShaderManager.h"
+
+namespace OGL
+{
+
+static const u32 UBO_LENGTH = 32*1024*1024;
+
+u32 ProgramShaderCache::s_ubo_buffer_size;
+s32 ProgramShaderCache::s_ubo_align;
+
+static StreamBuffer *s_buffer;
+static int num_failures = 0;
+
+static LinearDiskCache<SHADERUID, u8> g_program_disk_cache;
+static GLuint CurrentProgram = 0;
+ProgramShaderCache::PCache ProgramShaderCache::pshaders;
+ProgramShaderCache::PCacheEntry* ProgramShaderCache::last_entry;
+SHADERUID ProgramShaderCache::last_uid;
+UidChecker<PixelShaderUid,PixelShaderCode> ProgramShaderCache::pixel_uid_checker;
+UidChecker<VertexShaderUid,VertexShaderCode> ProgramShaderCache::vertex_uid_checker;
+UidChecker<GeometryShaderUid,ShaderCode> ProgramShaderCache::geometry_uid_checker;
+
+static char s_glsl_header[1024] = "";
+
+static std::string GetGLSLVersionString()
+{
+	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
+	switch(v)
+	{
+		case GLSLES_300:
+			return "#version 300 es";
+		case GLSLES_310:
+			return "#version 310 es";
+		case GLSL_130:
+			return "#version 130";
+		case GLSL_140:
+			return "#version 140";
+		case GLSL_150:
+			return "#version 150";
+		default:
+			// Shouldn't ever hit this
+			return "#version ERROR";
+	}
+}
+
+void SHADER::SetProgramVariables()
+{
+	// Bind UBO and texture samplers
+	if (!g_ActiveConfig.backend_info.bSupportsBindingLayout)
+	{
+		// glsl shader must be bind to set samplers if we don't support binding layout
+		Bind();
+
+		GLint PSBlock_id = glGetUniformBlockIndex(glprogid, "PSBlock");
+		GLint VSBlock_id = glGetUniformBlockIndex(glprogid, "VSBlock");
+		GLint GSBlock_id = glGetUniformBlockIndex(glprogid, "GSBlock");
+
+		if (PSBlock_id != -1)
+			glUniformBlockBinding(glprogid, PSBlock_id, 1);
+		if (VSBlock_id != -1)
+			glUniformBlockBinding(glprogid, VSBlock_id, 2);
+		if (GSBlock_id != -1)
+			glUniformBlockBinding(glprogid, GSBlock_id, 3);
+
+		// Bind Texture Sampler
+		for (int a = 0; a <= 9; ++a)
+		{
+			char name[8];
+			snprintf(name, 8, "samp%d", a);
+
+			// Still need to get sampler locations since we aren't binding them statically in the shaders
+			int loc = glGetUniformLocation(glprogid, name);
+			if (loc != -1)
+				glUniform1i(loc, a);
+		}
+	}
+}
+
+void SHADER::SetProgramBindings()
+{
+	if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
+	{
+		// So we do support extended blending
+		// So we need to set a few more things here.
+		// Bind our out locations
+		glBindFragDataLocationIndexed(glprogid, 0, 0, "ocol0");
+		glBindFragDataLocationIndexed(glprogid, 0, 1, "ocol1");
+	}
+	// Need to set some attribute locations
+	glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos");
+
+	glBindAttribLocation(glprogid, SHADER_POSMTX_ATTRIB,   "posmtx");
+
+	glBindAttribLocation(glprogid, SHADER_COLOR0_ATTRIB,   "color0");
+	glBindAttribLocation(glprogid, SHADER_COLOR1_ATTRIB,   "color1");
+
+	glBindAttribLocation(glprogid, SHADER_NORM0_ATTRIB,    "rawnorm0");
+	glBindAttribLocation(glprogid, SHADER_NORM1_ATTRIB,    "rawnorm1");
+	glBindAttribLocation(glprogid, SHADER_NORM2_ATTRIB,    "rawnorm2");
+
+	for (int i = 0; i < 8; i++)
+	{
+		char attrib_name[8];
+		snprintf(attrib_name, 8, "tex%d", i);
+		glBindAttribLocation(glprogid, SHADER_TEXTURE0_ATTRIB+i, attrib_name);
+	}
+}
+
+void SHADER::Bind()
+{
+	if (CurrentProgram != glprogid)
+	{
+		INCSTAT(stats.thisFrame.numShaderChanges);
+		glUseProgram(glprogid);
+		CurrentProgram = glprogid;
+	}
+}
+
+void ProgramShaderCache::UploadConstants()
+{
+	if (PixelShaderManager::dirty || VertexShaderManager::dirty || GeometryShaderManager::dirty)
+	{
+		auto buffer = s_buffer->Map(s_ubo_buffer_size, s_ubo_align);
+
+		memcpy(buffer.first,
+			&PixelShaderManager::constants, sizeof(PixelShaderConstants));
+
+		memcpy(buffer.first + ROUND_UP(sizeof(PixelShaderConstants), s_ubo_align),
+			&VertexShaderManager::constants, sizeof(VertexShaderConstants));
+
+		memcpy(buffer.first + ROUND_UP(sizeof(PixelShaderConstants), s_ubo_align) + ROUND_UP(sizeof(VertexShaderConstants), s_ubo_align),
+			&GeometryShaderManager::constants, sizeof(GeometryShaderConstants));
+
+		s_buffer->Unmap(s_ubo_buffer_size);
+		glBindBufferRange(GL_UNIFORM_BUFFER, 1, s_buffer->m_buffer, buffer.second,
+					sizeof(PixelShaderConstants));
+		glBindBufferRange(GL_UNIFORM_BUFFER, 2, s_buffer->m_buffer, buffer.second + ROUND_UP(sizeof(PixelShaderConstants), s_ubo_align),
+					sizeof(VertexShaderConstants));
+		glBindBufferRange(GL_UNIFORM_BUFFER, 3, s_buffer->m_buffer, buffer.second + ROUND_UP(sizeof(PixelShaderConstants), s_ubo_align) + ROUND_UP(sizeof(VertexShaderConstants), s_ubo_align),
+					sizeof(GeometryShaderConstants));
+
+		PixelShaderManager::dirty = false;
+		VertexShaderManager::dirty = false;
+		GeometryShaderManager::dirty = false;
+
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, s_ubo_buffer_size);
+	}
+}
+
+GLuint ProgramShaderCache::GetCurrentProgram()
+{
+	return CurrentProgram;
+}
+
+SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type)
+{
+	SHADERUID uid;
+	GetShaderId(&uid, dstAlphaMode, components, primitive_type);
+
+	// Check if the shader is already set
+	if (last_entry)
+	{
+		if (uid == last_uid)
+		{
+			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
+			last_entry->shader.Bind();
+			return &last_entry->shader;
+		}
+	}
+
+	last_uid = uid;
+
+	// Check if shader is already in cache
+	PCache::iterator iter = pshaders.find(uid);
+	if (iter != pshaders.end())
+	{
+		PCacheEntry *entry = &iter->second;
+		last_entry = entry;
+
+		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
+		last_entry->shader.Bind();
+		return &last_entry->shader;
+	}
+
+	// Make an entry in the table
+	PCacheEntry& newentry = pshaders[uid];
+	last_entry = &newentry;
+	newentry.in_cache = 0;
+
+	VertexShaderCode vcode;
+	PixelShaderCode pcode;
+	ShaderCode gcode;
+	GenerateVertexShaderCode(vcode, components, API_OPENGL);
+	GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
+	if (g_ActiveConfig.backend_info.bSupportsGeometryShaders && !uid.guid.GetUidData()->IsPassthrough())
+		GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL);
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		newentry.shader.strvprog = vcode.GetBuffer();
+		newentry.shader.strpprog = pcode.GetBuffer();
+		newentry.shader.strgprog = gcode.GetBuffer();
+	}
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (g_ActiveConfig.iLog & CONF_SAVESHADERS)
+	{
+		static int counter = 0;
+		std::string filename =  StringFromFormat("%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+		SaveData(filename, vcode.GetBuffer());
+
+		filename = StringFromFormat("%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+		SaveData(filename, pcode.GetBuffer());
+
+		if (gcode.GetBuffer() != nullptr)
+		{
+			filename = StringFromFormat("%sgs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+			SaveData(filename, gcode.GetBuffer());
+		}
+	}
+#endif
+
+	if (!CompileShader(newentry.shader, vcode.GetBuffer(), pcode.GetBuffer(), gcode.GetBuffer()))
+	{
+		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
+		return nullptr;
+	}
+
+	INCSTAT(stats.numPixelShadersCreated);
+	SETSTAT(stats.numPixelShadersAlive, pshaders.size());
+	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
+
+	last_entry->shader.Bind();
+	return &last_entry->shader;
+}
+
+bool ProgramShaderCache::CompileShader(SHADER& shader, const char* vcode, const char* pcode, const char* gcode)
+{
+	GLuint vsid = CompileSingleShader(GL_VERTEX_SHADER, vcode);
+	GLuint psid = CompileSingleShader(GL_FRAGMENT_SHADER, pcode);
+
+	// Optional geometry shader
+	GLuint gsid = 0;
+	if (gcode)
+		gsid = CompileSingleShader(GL_GEOMETRY_SHADER, gcode);
+
+	if (!vsid || !psid || (gcode && !gsid))
+	{
+		glDeleteShader(vsid);
+		glDeleteShader(psid);
+		glDeleteShader(gsid);
+		return false;
+	}
+
+	GLuint pid = shader.glprogid = glCreateProgram();
+
+	glAttachShader(pid, vsid);
+	glAttachShader(pid, psid);
+	if (gsid)
+		glAttachShader(pid, gsid);
+
+	if (g_ogl_config.bSupportsGLSLCache)
+		glProgramParameteri(pid, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
+
+	shader.SetProgramBindings();
+
+	glLinkProgram(pid);
+
+	// original shaders aren't needed any more
+	glDeleteShader(vsid);
+	glDeleteShader(psid);
+	glDeleteShader(gsid);
+
+	GLint linkStatus;
+	glGetProgramiv(pid, GL_LINK_STATUS, &linkStatus);
+	GLsizei length = 0;
+	glGetProgramiv(pid, GL_INFO_LOG_LENGTH, &length);
+	if (linkStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
+	{
+		GLsizei charsWritten;
+		GLchar* infoLog = new GLchar[length];
+		glGetProgramInfoLog(pid, length, &charsWritten, infoLog);
+		ERROR_LOG(VIDEO, "Program info log:\n%s", infoLog);
+
+		std::string filename = StringFromFormat("%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+		std::ofstream file;
+		OpenFStream(file, filename, std::ios_base::out);
+		file << s_glsl_header << vcode << s_glsl_header << pcode;
+		if (gcode)
+			file << s_glsl_header << gcode;
+		file << infoLog;
+		file.close();
+
+		if (linkStatus != GL_TRUE)
+		{
+			PanicAlert("Failed to link shaders: %s\n"
+			           "Debug info (%s, %s, %s):\n%s",
+			           filename.c_str(),
+			           g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version, infoLog);
+		}
+
+		delete [] infoLog;
+	}
+	if (linkStatus != GL_TRUE)
+	{
+		// Compile failed
+		ERROR_LOG(VIDEO, "Program linking failed; see info log");
+
+		// Don't try to use this shader
+		glDeleteProgram(pid);
+		return false;
+	}
+
+	shader.SetProgramVariables();
+
+	return true;
+}
+
+GLuint ProgramShaderCache::CompileSingleShader(GLuint type, const char* code)
+{
+	GLuint result = glCreateShader(type);
+
+	const char *src[] = {s_glsl_header, code};
+
+	glShaderSource(result, 2, src, nullptr);
+	glCompileShader(result);
+	GLint compileStatus;
+	glGetShaderiv(result, GL_COMPILE_STATUS, &compileStatus);
+	GLsizei length = 0;
+	glGetShaderiv(result, GL_INFO_LOG_LENGTH, &length);
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENINFOLOG))
+		length = 1024;
+
+	if (compileStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
+	{
+		GLsizei charsWritten;
+		GLchar* infoLog = new GLchar[length];
+		glGetShaderInfoLog(result, length, &charsWritten, infoLog);
+		ERROR_LOG(VIDEO, "%s Shader info log:\n%s", type==GL_VERTEX_SHADER ? "VS" : type==GL_FRAGMENT_SHADER ? "PS" : "GS", infoLog);
+
+		std::string filename = StringFromFormat("%sbad_%s_%04i.txt",
+			File::GetUserPath(D_DUMP_IDX).c_str(),
+			type==GL_VERTEX_SHADER ? "vs" : type==GL_FRAGMENT_SHADER ? "ps" : "gs",
+			num_failures++);
+		std::ofstream file;
+		OpenFStream(file, filename, std::ios_base::out);
+		file << s_glsl_header << code << infoLog;
+		file.close();
+
+		if (compileStatus != GL_TRUE)
+		{
+			PanicAlert("Failed to compile %s shader: %s\n"
+			           "Debug info (%s, %s, %s):\n%s",
+			           type == GL_VERTEX_SHADER ? "vertex" : type==GL_FRAGMENT_SHADER ? "pixel" : "geometry",
+			           filename.c_str(),
+			           g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version, infoLog);
+		}
+
+		delete[] infoLog;
+	}
+	if (compileStatus != GL_TRUE)
+	{
+		// Compile failed
+		ERROR_LOG(VIDEO, "Shader compilation failed; see info log");
+
+		// Don't try to use this shader
+		glDeleteShader(result);
+		return 0;
+	}
+
+	return result;
+}
+
+void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type)
+{
+	GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL, components);
+	GetVertexShaderUid(uid->vuid, components, API_OPENGL);
+	GetGeometryShaderUid(uid->guid, primitive_type, API_OPENGL);
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode pcode;
+		GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
+		pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p");
+
+		VertexShaderCode vcode;
+		GenerateVertexShaderCode(vcode, components, API_OPENGL);
+		vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v");
+
+		ShaderCode gcode;
+		GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL);
+		geometry_uid_checker.AddToIndexAndCheck(gcode, uid->guid, "Geometry", "g");
+	}
+}
+
+ProgramShaderCache::PCacheEntry ProgramShaderCache::GetShaderProgram()
+{
+	return *last_entry;
+}
+
+void ProgramShaderCache::Init()
+{
+	// We have to get the UBO alignment here because
+	// if we generate a buffer that isn't aligned
+	// then the UBO will fail.
+	glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &s_ubo_align);
+
+	s_ubo_buffer_size = ROUND_UP(sizeof(PixelShaderConstants), s_ubo_align) + ROUND_UP(sizeof(VertexShaderConstants), s_ubo_align) + ROUND_UP(sizeof(GeometryShaderConstants), s_ubo_align);
+
+	// We multiply by *4*4 because we need to get down to basic machine units.
+	// So multiply by four to get how many floats we have from vec4s
+	// Then once more to get bytes
+	s_buffer = StreamBuffer::Create(GL_UNIFORM_BUFFER, UBO_LENGTH);
+
+	// Read our shader cache, only if supported
+	if (g_ogl_config.bSupportsGLSLCache && !g_Config.bEnableShaderDebugging)
+	{
+		GLint Supported;
+		glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &Supported);
+		if (!Supported)
+		{
+			ERROR_LOG(VIDEO, "GL_ARB_get_program_binary is supported, but no binary format is known. So disable shader cache.");
+			g_ogl_config.bSupportsGLSLCache = false;
+		}
+		else
+		{
+			if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
+				File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
+
+			std::string cache_filename = StringFromFormat("%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
+
+			ProgramShaderCacheInserter inserter;
+			g_program_disk_cache.OpenAndRead(cache_filename, inserter);
+		}
+		SETSTAT(stats.numPixelShadersAlive, pshaders.size());
+	}
+
+	CreateHeader();
+
+	CurrentProgram = 0;
+	last_entry = nullptr;
+}
+
+void ProgramShaderCache::Shutdown()
+{
+	// store all shaders in cache on disk
+	if (g_ogl_config.bSupportsGLSLCache && !g_Config.bEnableShaderDebugging)
+	{
+		for (auto& entry : pshaders)
+		{
+			// Clear any prior error code
+			glGetError();
+
+			if (entry.second.in_cache)
+			{
+				continue;
+			}
+
+			GLint link_status = GL_FALSE, delete_status = GL_TRUE, binary_size = 0;
+			glGetProgramiv(entry.second.shader.glprogid, GL_LINK_STATUS, &link_status);
+			glGetProgramiv(entry.second.shader.glprogid, GL_DELETE_STATUS, &delete_status);
+			glGetProgramiv(entry.second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size);
+			if (glGetError() != GL_NO_ERROR || link_status == GL_FALSE || delete_status == GL_TRUE || !binary_size)
+			{
+				continue;
+			}
+
+			std::vector<u8> data(binary_size + sizeof(GLenum));
+			u8* binary = &data[sizeof(GLenum)];
+			GLenum* prog_format = (GLenum*)&data[0];
+			glGetProgramBinary(entry.second.shader.glprogid, binary_size, nullptr, prog_format, binary);
+			if (glGetError() != GL_NO_ERROR)
+			{
+				continue;
+			}
+
+			g_program_disk_cache.Append(entry.first, &data[0], binary_size + sizeof(GLenum));
+		}
+
+		g_program_disk_cache.Sync();
+		g_program_disk_cache.Close();
+	}
+
+	glUseProgram(0);
+
+	for (auto& entry : pshaders)
+	{
+		entry.second.Destroy();
+	}
+	pshaders.clear();
+
+	pixel_uid_checker.Invalidate();
+	vertex_uid_checker.Invalidate();
+
+	delete s_buffer;
+	s_buffer = nullptr;
+}
+
+void ProgramShaderCache::CreateHeader()
+{
+	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
+	bool is_glsles = v >= GLSLES_300;
+
+	snprintf(s_glsl_header, sizeof(s_glsl_header),
+		"%s\n"
+		"%s\n" // ubo
+		"%s\n" // early-z
+		"%s\n" // 420pack
+		"%s\n" // msaa
+		"%s\n" // sample shading
+		"%s\n" // Sampler binding
+		"%s\n" // storage buffer
+		"%s\n" // shader5
+		"%s\n" // AEP
+		"%s\n" // texture buffer
+
+		// Precision defines for GLSL ES
+		"%s\n"
+		"%s\n"
+		"%s\n"
+
+		// Silly differences
+		"#define float2 vec2\n"
+		"#define float3 vec3\n"
+		"#define float4 vec4\n"
+		"#define uint2 uvec2\n"
+		"#define uint3 uvec3\n"
+		"#define uint4 uvec4\n"
+		"#define int2 ivec2\n"
+		"#define int3 ivec3\n"
+		"#define int4 ivec4\n"
+
+		// hlsl to glsl function translation
+		"#define frac fract\n"
+		"#define lerp mix\n"
+
+		// Terrible hacks, look at DriverDetails.h
+		"%s\n" // replace textureSize as constant
+		"%s\n" // wipe out all centroid usages
+
+		, GetGLSLVersionString().c_str()
+		, v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
+		, !is_glsles && g_ActiveConfig.backend_info.bSupportsEarlyZ ? "#extension GL_ARB_shader_image_load_store : enable" : ""
+		, (g_ActiveConfig.backend_info.bSupportsBindingLayout && v < GLSLES_310) ? "#extension GL_ARB_shading_language_420pack : enable" : ""
+		, (g_ogl_config.bSupportsMSAA && v < GLSL_150) ? "#extension GL_ARB_texture_multisample : enable" : ""
+		, (g_ogl_config.bSupportSampleShading) ? "#extension GL_ARB_sample_shading : enable" : ""
+		, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "#define SAMPLER_BINDING(x) layout(binding = x)" : "#define SAMPLER_BINDING(x)"
+		, g_ActiveConfig.backend_info.bSupportsBBox ? "#extension GL_ARB_shader_storage_buffer_object : enable" : ""
+		, g_ActiveConfig.backend_info.bSupportsGSInstancing ? "#extension GL_ARB_gpu_shader5 : enable" : ""
+		, g_ogl_config.bSupportsAEP ? "#extension GL_ANDROID_extension_pack_es31a : enable" : ""
+		, v<GLSL_140 && g_ActiveConfig.backend_info.bSupportsPaletteConversion ? "#extension GL_ARB_texture_buffer_object : enable" : ""
+
+		, is_glsles ? "precision highp float;" : ""
+		, is_glsles ? "precision highp int;" : ""
+		, is_glsles ? "precision highp sampler2DArray;" : ""
+
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENTEXTURESIZE) ? "#define textureSize(x, y) ivec2(1, 1)" : ""
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "#define centroid" : ""
+	);
+}
+
+
+void ProgramShaderCache::ProgramShaderCacheInserter::Read(const SHADERUID& key, const u8* value, u32 value_size)
+{
+	const u8 *binary = value+sizeof(GLenum);
+	GLenum *prog_format = (GLenum*)value;
+	GLint binary_size = value_size-sizeof(GLenum);
+
+	PCacheEntry entry;
+	entry.in_cache = 1;
+	entry.shader.glprogid = glCreateProgram();
+	glProgramBinary(entry.shader.glprogid, *prog_format, binary, binary_size);
+
+	GLint success;
+	glGetProgramiv(entry.shader.glprogid, GL_LINK_STATUS, &success);
+
+	if (success)
+	{
+		pshaders[key] = entry;
+		entry.shader.SetProgramVariables();
+	}
+	else
+	{
+		glDeleteProgram(entry.shader.glprogid);
+	}
+}
+
+
+} // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
new file mode 100644
index 0000000000..c5013b4c1e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -0,0 +1,121 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/LinearDiskCache.h"
+#include "Core/ConfigManager.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/VertexShaderGen.h"
+
+namespace OGL
+{
+
+class SHADERUID
+{
+public:
+	VertexShaderUid vuid;
+	PixelShaderUid puid;
+	GeometryShaderUid guid;
+
+	SHADERUID() {}
+
+	SHADERUID(const SHADERUID& r) : vuid(r.vuid), puid(r.puid), guid(r.guid) {}
+
+	bool operator <(const SHADERUID& r) const
+	{
+		if (puid < r.puid)
+			return true;
+
+		if (r.puid < puid)
+			return false;
+
+		if (vuid < r.vuid)
+			return true;
+
+		if (r.vuid < vuid)
+			return false;
+
+		if (guid < r.guid)
+			return true;
+
+		return false;
+	}
+
+	bool operator ==(const SHADERUID& r) const
+	{
+		return puid == r.puid && vuid == r.vuid && guid == r.guid;
+	}
+};
+
+
+struct SHADER
+{
+	SHADER() : glprogid(0) { }
+	void Destroy()
+	{
+		glDeleteProgram(glprogid);
+		glprogid = 0;
+	}
+	GLuint glprogid; // OpenGL program id
+
+	std::string strvprog, strpprog, strgprog;
+
+	void SetProgramVariables();
+	void SetProgramBindings();
+	void Bind();
+};
+
+class ProgramShaderCache
+{
+public:
+
+	struct PCacheEntry
+	{
+		SHADER shader;
+		bool in_cache;
+
+		void Destroy()
+		{
+			shader.Destroy();
+		}
+	};
+
+	typedef std::map<SHADERUID, PCacheEntry> PCache;
+
+	static PCacheEntry GetShaderProgram();
+	static GLuint GetCurrentProgram();
+	static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
+	static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
+
+	static bool CompileShader(SHADER &shader, const char* vcode, const char* pcode, const char* gcode = nullptr);
+	static GLuint CompileSingleShader(GLuint type, const char *code);
+	static void UploadConstants();
+
+	static void Init();
+	static void Shutdown();
+	static void CreateHeader();
+
+private:
+	class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
+	{
+	public:
+		void Read(const SHADERUID &key, const u8 *value, u32 value_size) override;
+	};
+
+	static PCache pshaders;
+	static PCacheEntry* last_entry;
+	static SHADERUID last_uid;
+
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
+	static UidChecker<GeometryShaderUid,ShaderCode> geometry_uid_checker;
+
+	static u32 s_ubo_buffer_size;
+	static s32 s_ubo_align;
+};
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp
new file mode 100644
index 0000000000..ebc303c9d6
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
@@ -0,0 +1,278 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <vector>
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/RasterFont.h"
+
+// globals
+
+namespace OGL
+{
+
+static const int CHAR_WIDTH = 8;
+static const int CHAR_HEIGHT = 13;
+static const int CHAR_OFFSET = 32;
+static const int CHAR_COUNT = 95;
+
+static const u8 rasters[CHAR_COUNT][CHAR_HEIGHT] = {
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
+	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18},
+	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70},
+	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e},
+	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c},
+	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30},
+	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03},
+	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06},
+	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60},
+	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e},
+	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18},
+	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e},
+	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3},
+	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c},
+	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60},
+	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18},
+	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03},
+	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e},
+	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00},
+	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00},
+	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78},
+	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00},
+	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f},
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}
+};
+
+static const char *s_vertexShaderSrc =
+	"uniform vec2 charSize;\n"
+	"uniform vec2 offset;"
+	"in vec2 rawpos;\n"
+	"in vec2 tex0;\n"
+	"out vec2 uv0;\n"
+	"void main(void) {\n"
+	"	gl_Position = vec4(rawpos + offset,0,1);\n"
+	"	uv0 = tex0 * charSize;\n"
+	"}\n";
+
+static const char *s_fragmentShaderSrc =
+	"SAMPLER_BINDING(8) uniform sampler2D samp8;\n"
+	"uniform vec4 color;\n"
+	"in vec2 uv0;\n"
+	"out vec4 ocol0;\n"
+	"void main(void) {\n"
+	"	ocol0 = texture(samp8,uv0) * color;\n"
+	"}\n";
+
+static SHADER s_shader;
+
+RasterFont::RasterFont()
+{
+	// generate the texture
+	glGenTextures(1, &texture);
+	glActiveTexture(GL_TEXTURE8);
+	glBindTexture(GL_TEXTURE_2D, texture);
+	std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
+	for (int y = 0; y < CHAR_HEIGHT; y++)
+	{
+		for (int c = 0; c < CHAR_COUNT; c++)
+		{
+			for (int x = 0; x < CHAR_WIDTH; x++)
+			{
+				bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
+				texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
+			}
+		}
+	}
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
+
+	// generate shader
+	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
+	s_shader.Bind();
+
+	// bound uniforms
+	glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHAR_COUNT), 1.0f);
+	uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
+	glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
+	uniform_offset_id = glGetUniformLocation(s_shader.glprogid, "offset");
+	glUniform2f(uniform_offset_id, 0.0f, 0.0f);
+
+	// generate VBO & VAO
+	glGenBuffers(1, &VBO);
+	glGenVertexArrays(1, &VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, VBO);
+	glBindVertexArray(VAO);
+	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
+	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, nullptr);
+	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
+	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)nullptr+2);
+}
+
+RasterFont::~RasterFont()
+{
+	glDeleteTextures(1, &texture);
+	glDeleteBuffers(1, &VBO);
+	glDeleteVertexArrays(1, &VAO);
+	s_shader.Destroy();
+}
+
+void RasterFont::printMultilineText(const std::string& text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color)
+{
+	std::vector<GLfloat> vertices(text.length() * 6 * 4);
+
+	int usage = 0;
+	GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
+	GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
+	GLfloat border_x = 2.0f / GLfloat(bbWidth);
+	GLfloat border_y = 4.0f / GLfloat(bbHeight);
+
+	GLfloat x = GLfloat(start_x);
+	GLfloat y = GLfloat(start_y);
+
+	for (const char& c : text)
+	{
+		if (c == '\n')
+		{
+			x = GLfloat(start_x);
+			y -= delta_y + border_y;
+			continue;
+		}
+
+		// do not print spaces, they can be skipped easily
+		if (c == ' ')
+		{
+			x += delta_x + border_x;
+			continue;
+		}
+
+		if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
+			continue;
+
+		vertices[usage++] = x;
+		vertices[usage++] = y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+		vertices[usage++] = 0.0f;
+
+		vertices[usage++] = x + delta_x;
+		vertices[usage++] = y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+		vertices[usage++] = 0.0f;
+
+		vertices[usage++] = x + delta_x;
+		vertices[usage++] = y + delta_y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+		vertices[usage++] = 1.0f;
+
+		vertices[usage++] = x;
+		vertices[usage++] = y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+		vertices[usage++] = 0.0f;
+
+		vertices[usage++] = x + delta_x;
+		vertices[usage++] = y + delta_y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+		vertices[usage++] = 1.0f;
+
+		vertices[usage++] = x;
+		vertices[usage++] = y + delta_y;
+		vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+		vertices[usage++] = 1.0f;
+
+		x += delta_x + border_x;
+	}
+
+	if (!usage)
+	{
+		return;
+	}
+
+	glBindVertexArray(VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, VBO);
+	glBufferData(GL_ARRAY_BUFFER, usage*sizeof(GLfloat), vertices.data(), GL_STREAM_DRAW);
+
+	s_shader.Bind();
+
+	// shadows
+	glUniform2f(uniform_offset_id, 2.0f / GLfloat(bbWidth), -2.0f / GLfloat(bbHeight));
+	glUniform4f(uniform_color_id, 0.0f, 0.0f, 0.0f, GLfloat((color>>24)&0xff)/255.f);
+	glDrawArrays(GL_TRIANGLES, 0, usage/4);
+
+	glUniform2f(uniform_offset_id, 0.0f, 0.0f);
+	glUniform4f(uniform_color_id, GLfloat((color>>16)&0xff)/255.f,GLfloat((color>>8)&0xff)/255.f,GLfloat((color>>0)&0xff)/255.f,GLfloat((color>>24)&0xff)/255.f);
+	glDrawArrays(GL_TRIANGLES, 0, usage/4);
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.h b/Source/Core/VideoBackends/OGL/RasterFont.h
new file mode 100644
index 0000000000..ca0e1d6099
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/RasterFont.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+namespace OGL
+{
+
+class RasterFont
+{
+public:
+	RasterFont();
+	~RasterFont();
+	static int debug;
+
+	void printMultilineText(const std::string& text, double x, double y, double z, int bbWidth, int bbHeight, u32 color);
+private:
+
+	u32 VBO;
+	u32 VAO;
+	u32 texture;
+	u32 uniform_color_id;
+	u32 uniform_offset_id;
+};
+
+}
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
new file mode 100644
index 0000000000..6efdd7fd40
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -0,0 +1,1902 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cmath>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Common/Atomic.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+
+#include "VideoBackends/OGL/BoundingBox.h"
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/main.h"
+#include "VideoBackends/OGL/PostProcessing.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/RasterFont.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoBackends/OGL/StreamBuffer.h"
+#include "VideoBackends/OGL/TextureCache.h"
+#include "VideoBackends/OGL/TextureConverter.h"
+#include "VideoBackends/OGL/VertexManager.h"
+
+#include "VideoCommon/BPFunctions.h"
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/FPSCounter.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+#if defined _WIN32 || defined HAVE_LIBAV
+#include "VideoCommon/AVIDump.h"
+#endif
+
+
+void VideoConfig::UpdateProjectionHack()
+{
+	::UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue);
+}
+
+static int OSDInternalW, OSDInternalH;
+
+namespace OGL
+{
+
+enum MultisampleMode
+{
+	MULTISAMPLE_OFF,
+	MULTISAMPLE_2X,
+	MULTISAMPLE_4X,
+	MULTISAMPLE_8X,
+	MULTISAMPLE_SSAA_4X,
+};
+
+
+VideoConfig g_ogl_config;
+
+// Declarations and definitions
+// ----------------------------
+static GLuint s_ShowEFBCopyRegions_VBO = 0;
+static GLuint s_ShowEFBCopyRegions_VAO = 0;
+static SHADER s_ShowEFBCopyRegions;
+
+static RasterFont* s_pfont = nullptr;
+
+// 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA.
+static int s_MSAASamples = 1;
+static int s_last_multisample_mode = 0;
+static bool s_last_stereo_mode = false;
+static bool s_last_xfb_mode = false;
+
+static u32 s_blendMode;
+
+static bool s_vsync;
+
+// EFB cache related
+static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks.
+static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up
+static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE;
+static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT];
+static bool s_efbCacheIsCleared = false;
+static std::vector<u32> s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR
+
+static int GetNumMSAASamples(int MSAAMode)
+{
+	int samples;
+	switch (MSAAMode)
+	{
+		case MULTISAMPLE_OFF:
+			samples = 1;
+			break;
+
+		case MULTISAMPLE_2X:
+			samples = 2;
+			break;
+
+		case MULTISAMPLE_4X:
+		case MULTISAMPLE_SSAA_4X:
+			samples = 4;
+			break;
+
+		case MULTISAMPLE_8X:
+			samples = 8;
+			break;
+
+		default:
+			samples = 1;
+	}
+
+	if (samples <= g_ogl_config.max_samples)
+		return samples;
+
+	// TODO: move this to InitBackendInfo
+	OSD::AddMessage(StringFromFormat("%d Anti Aliasing samples selected, but only %d supported by your GPU.", samples, g_ogl_config.max_samples), 10000);
+	return g_ogl_config.max_samples;
+}
+
+static void ApplySSAASettings()
+{
+	// GLES3 doesn't support SSAA
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+		if (g_ActiveConfig.iMultisampleMode == MULTISAMPLE_SSAA_4X)
+		{
+			if (g_ogl_config.bSupportSampleShading)
+			{
+				glEnable(GL_SAMPLE_SHADING_ARB);
+				GLfloat min_sample_shading_value = static_cast<GLfloat>(s_MSAASamples);
+				glMinSampleShadingARB(min_sample_shading_value);
+			}
+			else
+			{
+				// TODO: move this to InitBackendInfo
+				OSD::AddMessage("SSAA Anti Aliasing isn't supported by your GPU.", 10000);
+			}
+		}
+		else if (g_ogl_config.bSupportSampleShading)
+		{
+			glDisable(GL_SAMPLE_SHADING_ARB);
+		}
+	}
+}
+
+static void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, const void* userParam)
+{
+	const char *s_source;
+	const char *s_type;
+
+	switch (source)
+	{
+		case GL_DEBUG_SOURCE_API_ARB:             s_source = "API"; break;
+		case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:   s_source = "Window System"; break;
+		case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB: s_source = "Shader Compiler"; break;
+		case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:     s_source = "Third Party"; break;
+		case GL_DEBUG_SOURCE_APPLICATION_ARB:     s_source = "Application"; break;
+		case GL_DEBUG_SOURCE_OTHER_ARB:           s_source = "Other"; break;
+		default:                                  s_source = "Unknown"; break;
+	}
+	switch (type)
+	{
+		case GL_DEBUG_TYPE_ERROR_ARB:               s_type = "Error"; break;
+		case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB: s_type = "Deprecated"; break;
+		case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:  s_type = "Undefined"; break;
+		case GL_DEBUG_TYPE_PORTABILITY_ARB:         s_type = "Portability"; break;
+		case GL_DEBUG_TYPE_PERFORMANCE_ARB:         s_type = "Performance"; break;
+		case GL_DEBUG_TYPE_OTHER_ARB:               s_type = "Other"; break;
+		default:                                    s_type = "Unknown"; break;
+	}
+	switch (severity)
+	{
+		case GL_DEBUG_SEVERITY_HIGH_ARB:   ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		case GL_DEBUG_SEVERITY_MEDIUM_ARB: WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		case GL_DEBUG_SEVERITY_LOW_ARB:    WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		default:                           ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+	}
+}
+
+// Two small Fallbacks to avoid GL_ARB_ES2_compatibility
+static void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
+{
+	glDepthRange(neardepth, fardepth);
+}
+static void GLAPIENTRY ClearDepthf(GLfloat depthval)
+{
+	glClearDepth(depthval);
+}
+
+static void InitDriverInfo()
+{
+	std::string svendor = std::string(g_ogl_config.gl_vendor);
+	std::string srenderer = std::string(g_ogl_config.gl_renderer);
+	std::string sversion = std::string(g_ogl_config.gl_version);
+	DriverDetails::Vendor vendor = DriverDetails::VENDOR_UNKNOWN;
+	DriverDetails::Driver driver = DriverDetails::DRIVER_UNKNOWN;
+	double version = 0.0;
+	u32 family = 0;
+
+	// Get the vendor first
+	if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
+	{
+		vendor = DriverDetails::VENDOR_NVIDIA;
+	}
+	else if (svendor == "ATI Technologies Inc." || svendor == "Advanced Micro Devices, Inc.")
+	{
+		vendor = DriverDetails::VENDOR_ATI;
+	}
+	else if (std::string::npos != sversion.find("Mesa"))
+	{
+		vendor = DriverDetails::VENDOR_MESA;
+	}
+	else if (std::string::npos != svendor.find("Intel"))
+	{
+		vendor = DriverDetails::VENDOR_INTEL;
+	}
+	else if (svendor == "ARM")
+	{
+		vendor = DriverDetails::VENDOR_ARM;
+	}
+	else if (svendor == "http://limadriver.org/")
+	{
+		vendor = DriverDetails::VENDOR_ARM;
+		driver = DriverDetails::DRIVER_LIMA;
+	}
+	else if (svendor == "Qualcomm")
+	{
+		vendor = DriverDetails::VENDOR_QUALCOMM;
+	}
+	else if (svendor == "Imagination Technologies")
+	{
+		vendor = DriverDetails::VENDOR_IMGTEC;
+	}
+	else if (svendor == "NVIDIA Corporation" && srenderer == "NVIDIA Tegra")
+	{
+		vendor = DriverDetails::VENDOR_TEGRA;
+	}
+	else if (svendor == "Vivante Corporation")
+	{
+		vendor = DriverDetails::VENDOR_VIVANTE;
+	}
+
+	// Get device family and driver version...if we care about it
+	switch (vendor)
+	{
+		case DriverDetails::VENDOR_QUALCOMM:
+		{
+			driver = DriverDetails::DRIVER_QUALCOMM;
+			double glVersion;
+			sscanf(g_ogl_config.gl_version, "OpenGL ES %lg V@%lg", &glVersion, &version);
+		}
+		break;
+		case DriverDetails::VENDOR_ARM:
+			// Currently the Mali-T line has two families in it.
+			// Mali-T6xx and Mali-T7xx
+			// These two families are similar enough that they share bugs in their drivers.
+			//
+			// Mali drivers provide no way to explicitly find out what video driver is running.
+			// This is similar to how we can't find the Nvidia driver version in Windows.
+			// Good thing is that ARM introduces a new video driver about once every two years so we can
+			// find the driver version by the features it exposes.
+			// r2p0 - No OpenGL ES 3.0 support (We don't support this)
+			// r3p0 - OpenGL ES 3.0 support
+			// r4p0 - Supports 'GL_EXT_shader_pixel_local_storage' extension.
+
+			driver = DriverDetails::DRIVER_ARM;
+			if (GLExtensions::Supports("GL_EXT_shader_pixel_local_storage"))
+				version = 400;
+			else
+				version = 300;
+		break;
+		case DriverDetails::VENDOR_MESA:
+		{
+			if (svendor == "nouveau")
+				driver = DriverDetails::DRIVER_NOUVEAU;
+			else if (svendor == "Intel Open Source Technology Center")
+				driver = DriverDetails::DRIVER_I965;
+			else if (std::string::npos != srenderer.find("AMD") || std::string::npos != srenderer.find("ATI"))
+				driver = DriverDetails::DRIVER_R600;
+
+			int major = 0;
+			int minor = 0;
+			int release = 0;
+			sscanf(g_ogl_config.gl_version, "%*s Mesa %d.%d.%d", &major, &minor, &release);
+			version = 100*major + 10*minor + release;
+		}
+		break;
+		case DriverDetails::VENDOR_INTEL: // Happens in OS X/Windows
+		{
+			sscanf(g_ogl_config.gl_renderer, "Intel HD Graphics %d", &family);
+#ifdef _WIN32
+			int glmajor = 0;
+			int glminor = 0;
+			int major = 0;
+			int minor = 0;
+			int release = 0;
+			int revision = 0;
+			// Example version string: '4.3.0 - Build 10.18.10.3907'
+			sscanf(g_ogl_config.gl_version, "%d.%d.0 - Build %d.%d.%d.%d", &glmajor, &glminor, &major, &minor, &release, &revision);
+			version = 100000000 * major + 1000000 * minor + 10000 * release + revision;
+			version /= 10000;
+#endif
+		}
+		break;
+		case DriverDetails::VENDOR_NVIDIA:
+		{
+			int glmajor = 0;
+			int glminor = 0;
+			int glrelease = 0;
+			int major = 0;
+			int minor = 0;
+			// TODO: this is known to be broken on Windows
+			// Nvidia seems to have removed their driver version from this string, so we can't get it.
+			// hopefully we'll never have to workaround Nvidia bugs
+			sscanf(g_ogl_config.gl_version, "%d.%d.%d NVIDIA %d.%d", &glmajor, &glminor, &glrelease, &major, &minor);
+			version = 100*major + minor;
+		}
+		break;
+		// We don't care about these
+		default:
+		break;
+	}
+	DriverDetails::Init(vendor, driver, version, family);
+}
+
+// Init functions
+Renderer::Renderer()
+{
+	OSDInternalW = 0;
+	OSDInternalH = 0;
+
+	s_ShowEFBCopyRegions_VBO = 0;
+	s_blendMode = 0;
+
+	bool bSuccess = true;
+
+	// Init extension support.
+	if (!GLExtensions::Init())
+	{
+		// OpenGL 2.0 is required for all shader based drawings. There is no way to get this by extensions
+		PanicAlert("GPU: OGL ERROR: Does your video card support OpenGL 2.0?");
+		bSuccess = false;
+	}
+
+	g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
+	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
+	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
+	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
+
+	InitDriverInfo();
+
+	// check for the max vertex attributes
+	GLint numvertexattribs = 0;
+	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs);
+	if (numvertexattribs < 16)
+	{
+		PanicAlert("GPU: OGL ERROR: Number of attributes %d not enough.\n"
+				"GPU: Does your video card support OpenGL 2.x?",
+				numvertexattribs);
+		bSuccess = false;
+	}
+
+	// check the max texture width and height
+	GLint max_texture_size;
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&max_texture_size);
+	if (max_texture_size < 1024)
+	{
+		PanicAlert("GL_MAX_TEXTURE_SIZE too small at %i - must be at least 1024.",
+				max_texture_size);
+		bSuccess = false;
+	}
+
+	if (!GLExtensions::Supports("GL_ARB_framebuffer_object"))
+	{
+		// We want the ogl3 framebuffer instead of the ogl2 one for better blitting support.
+		// It's also compatible with the gles3 one.
+		PanicAlert("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n"
+				"GPU: Does your video card support OpenGL 3.0?");
+		bSuccess = false;
+	}
+
+	if (!GLExtensions::Supports("GL_ARB_vertex_array_object"))
+	{
+		// This extension is used to replace lots of pointer setting function.
+		// Also gles3 requires to use it.
+		PanicAlert("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n"
+				"GPU: Does your video card support OpenGL 3.0?");
+		bSuccess = false;
+	}
+
+	if (!GLExtensions::Supports("GL_ARB_map_buffer_range"))
+	{
+		// ogl3 buffer mapping for better streaming support.
+		// The ogl2 one also isn't in gles3.
+		PanicAlert("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n"
+				"GPU: Does your video card support OpenGL 3.0?");
+		bSuccess = false;
+	}
+
+	if (!GLExtensions::Supports("GL_ARB_uniform_buffer_object"))
+	{
+		// ubo allow us to keep the current constants on shader switches
+		// we also can stream them much nicer and pack into it whatever we want to
+		PanicAlert("GPU: OGL ERROR: Need GL_ARB_uniform_buffer_object.\n"
+				"GPU: Does your video card support OpenGL 3.1?");
+		bSuccess = false;
+	}
+	else if (DriverDetails::HasBug(DriverDetails::BUG_BROKENUBO))
+	{
+		PanicAlert("Buggy GPU driver detected.\n"
+				"Please either install the closed-source GPU driver or update your Mesa 3D version.");
+		bSuccess = false;
+	}
+
+	if (!GLExtensions::Supports("GL_ARB_sampler_objects"))
+	{
+		// Our sampler cache uses this extension. It could easyly be workaround and it's by far the
+		// highest requirement, but it seems that no driver lacks support for it.
+		PanicAlert("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n"
+				"GPU: Does your video card support OpenGL 3.3?");
+		bSuccess = false;
+	}
+
+	if (GLExtensions::Version() < 300)
+	{
+		// integer vertex attributes require a gl3 only function
+		PanicAlert("GPU: OGL ERROR: Need OpenGL version 3.\n"
+				"GPU: Does your video card support OpenGL 3?");
+		bSuccess = false;
+	}
+
+	// OpenGL 3 doesn't provide GLES like float functions for depth.
+	// They are in core in OpenGL 4.1, so almost every driver should support them.
+	// But for the oldest ones, we provide fallbacks to the old double functions.
+	if (!GLExtensions::Supports("GL_ARB_ES2_compatibility") && GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+		glDepthRangef = DepthRangef;
+		glClearDepthf = ClearDepthf;
+	}
+
+	g_Config.backend_info.bSupportsDualSourceBlend = GLExtensions::Supports("GL_ARB_blend_func_extended");
+	g_Config.backend_info.bSupportsPrimitiveRestart = !DriverDetails::HasBug(DriverDetails::BUG_PRIMITIVERESTART) &&
+				((GLExtensions::Version() >= 310) || GLExtensions::Supports("GL_NV_primitive_restart"));
+	g_Config.backend_info.bSupportsEarlyZ = GLExtensions::Supports("GL_ARB_shader_image_load_store");
+	g_Config.backend_info.bSupportsBBox = GLExtensions::Supports("GL_ARB_shader_storage_buffer_object");
+	g_Config.backend_info.bSupportsGSInstancing = GLExtensions::Supports("GL_ARB_gpu_shader5");
+	g_Config.backend_info.bSupportsGeometryShaders = GLExtensions::Version() >= 320;
+	g_Config.backend_info.bSupportsPaletteConversion = GLExtensions::Supports("GL_ARB_texture_buffer_object");
+	g_Config.backend_info.bSupportsClipControl = GLExtensions::Supports("GL_ARB_clip_control");
+
+	// Desktop OpenGL supports the binding layout if it supports 420pack
+	// OpenGL ES 3.1 supports it implicitly without an extension
+	g_Config.backend_info.bSupportsBindingLayout = GLExtensions::Supports("GL_ARB_shading_language_420pack");
+
+	g_ogl_config.bSupportsGLSLCache = GLExtensions::Supports("GL_ARB_get_program_binary");
+	g_ogl_config.bSupportsGLPinnedMemory = GLExtensions::Supports("GL_AMD_pinned_memory");
+	g_ogl_config.bSupportsGLSync = GLExtensions::Supports("GL_ARB_sync");
+	g_ogl_config.bSupportsGLBaseVertex = GLExtensions::Supports("GL_ARB_draw_elements_base_vertex") ||
+	                                     GLExtensions::Supports("GL_EXT_draw_elements_base_vertex") ||
+	                                     GLExtensions::Supports("GL_OES_draw_elements_base_vertex");
+	g_ogl_config.bSupportsGLBufferStorage = GLExtensions::Supports("GL_ARB_buffer_storage") ||
+	                                        GLExtensions::Supports("GL_EXT_buffer_storage");
+	g_ogl_config.bSupportsMSAA = GLExtensions::Supports("GL_ARB_texture_multisample");
+	g_ogl_config.bSupportSampleShading = GLExtensions::Supports("GL_ARB_sample_shading");
+	g_ogl_config.bSupportOGL31 = GLExtensions::Version() >= 310;
+	g_ogl_config.bSupportViewportFloat = GLExtensions::Supports("GL_ARB_viewport_array");
+	g_ogl_config.bSupportsDebug = GLExtensions::Supports("GL_KHR_debug") || GLExtensions::Supports("GL_ARB_debug_output");
+
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
+	{
+		if (strstr(g_ogl_config.glsl_version, "3.0"))
+		{
+			g_ogl_config.eSupportedGLSLVersion = GLSLES_300;
+			g_ogl_config.bSupportsAEP = false;
+			g_Config.backend_info.bSupportsGeometryShaders = false;
+		}
+		else
+		{
+			g_ogl_config.eSupportedGLSLVersion = GLSLES_310;
+			g_ogl_config.bSupportsAEP = GLExtensions::Supports("GL_ANDROID_extension_pack_es31a");
+			g_Config.backend_info.bSupportsBindingLayout = true;
+			g_Config.backend_info.bSupportsEarlyZ = true;
+			g_Config.backend_info.bSupportsGeometryShaders = g_ogl_config.bSupportsAEP;
+			//g_Config.backend_info.bSupportsPaletteConversion = GLExtensions::Supports("GL_EXT_texture_buffer");
+		}
+	}
+	else
+	{
+		if (strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10") || strstr(g_ogl_config.glsl_version, "1.20"))
+		{
+			PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n"
+					"GPU: Does your video card support OpenGL 3.0?\n"
+					"GPU: Your driver supports GLSL %s", g_ogl_config.glsl_version);
+			bSuccess = false;
+		}
+		else if (strstr(g_ogl_config.glsl_version, "1.30"))
+		{
+			g_ogl_config.eSupportedGLSLVersion = GLSL_130;
+			g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
+			g_Config.backend_info.bSupportsGeometryShaders = false; // geometry shaders are only supported on glsl150+
+		}
+		else if (strstr(g_ogl_config.glsl_version, "1.40"))
+		{
+			g_ogl_config.eSupportedGLSLVersion = GLSL_140;
+			g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
+			g_Config.backend_info.bSupportsGeometryShaders = false; // geometry shaders are only supported on glsl150+
+		}
+		else
+		{
+			g_ogl_config.eSupportedGLSLVersion = GLSL_150;
+		}
+
+		// Desktop OpenGL can't have the Android Extension Pack
+		g_ogl_config.bSupportsAEP = false;
+	}
+
+	if (g_ogl_config.bSupportsDebug)
+	{
+		if (GLExtensions::Supports("GL_KHR_debug"))
+		{
+			glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, true);
+			glDebugMessageCallback(ErrorCallback, nullptr);
+		}
+		else
+		{
+			glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, true);
+			glDebugMessageCallbackARB(ErrorCallback, nullptr);
+		}
+		if (LogManager::GetInstance()->IsEnabled(LogTypes::VIDEO, LogTypes::LERROR))
+			glEnable(GL_DEBUG_OUTPUT);
+		else
+			glDisable(GL_DEBUG_OUTPUT);
+	}
+
+	int samples;
+	glGetIntegerv(GL_SAMPLES, &samples);
+	if (samples > 1)
+	{
+		// MSAA on default framebuffer isn't working because of glBlitFramebuffer.
+		// It also isn't useful as we don't render anything to the default framebuffer.
+		// We also try to get a non-msaa fb, so this only happens when forced by the driver.
+		PanicAlert("MSAA on default framebuffer isn't supported.\n"
+			"Please avoid forcing Dolphin to use MSAA by the driver.\n"
+			"%d samples on default framebuffer found.", samples);
+		bSuccess = false;
+	}
+
+	if (!bSuccess)
+	{
+		// Not all needed extensions are supported, so we have to stop here.
+		// Else some of the next calls might crash.
+		return;
+	}
+
+	glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples);
+	if (g_ogl_config.max_samples < 1 || !g_ogl_config.bSupportsMSAA)
+		g_ogl_config.max_samples = 1;
+
+	g_Config.VerifyValidity();
+	UpdateActiveConfig();
+
+	OSD::AddMessage(StringFromFormat("Video Info: %s, %s, %s",
+				g_ogl_config.gl_vendor,
+				g_ogl_config.gl_renderer,
+				g_ogl_config.gl_version), 5000);
+
+	WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s%s%s",
+			g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ",
+			g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ",
+			g_ActiveConfig.backend_info.bSupportsEarlyZ ? "" : "EarlyZ ",
+			g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ",
+			g_ogl_config.bSupportsGLSLCache ? "" : "ShaderCache ",
+			g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ",
+			g_ogl_config.bSupportsGLBufferStorage ? "" : "BufferStorage ",
+			g_ogl_config.bSupportsGLSync ? "" : "Sync ",
+			g_ogl_config.bSupportsMSAA ? "" : "MSAA ",
+			g_ogl_config.bSupportSampleShading ? "" : "SSAA ",
+			g_ActiveConfig.backend_info.bSupportsGSInstancing ? "" : "GSInstancing ",
+			g_ActiveConfig.backend_info.bSupportsClipControl ? "" : "ClipControl "
+			);
+
+	s_last_multisample_mode = g_ActiveConfig.iMultisampleMode;
+	s_MSAASamples = GetNumMSAASamples(s_last_multisample_mode);
+	ApplySSAASettings();
+
+	s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0;
+	s_last_xfb_mode = g_ActiveConfig.bUseRealXFB;
+
+	// Decide framebuffer size
+	s_backbuffer_width = (int)GLInterface->GetBackBufferWidth();
+	s_backbuffer_height = (int)GLInterface->GetBackBufferHeight();
+
+	// Handle VSync on/off
+	s_vsync = g_ActiveConfig.IsVSync();
+	GLInterface->SwapInterval(s_vsync);
+
+	// TODO: Move these somewhere else?
+	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
+	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
+
+	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+
+	s_last_efb_scale = g_ActiveConfig.iEFBScale;
+	CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
+
+	PixelShaderManager::SetEfbScaleChanged();
+
+	// Because of the fixed framebuffer size we need to disable the resolution
+	// options while running
+	g_Config.bRunning = true;
+
+	glStencilFunc(GL_ALWAYS, 0, 0);
+	glBlendFunc(GL_ONE, GL_ONE);
+
+	glViewport(0, 0, GetTargetWidth(), GetTargetHeight()); // Reset The Current Viewport
+	if (g_ActiveConfig.backend_info.bSupportsClipControl)
+		glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE);
+
+	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+	glClearDepthf(1.0f);
+	glEnable(GL_DEPTH_TEST);
+	glDepthFunc(GL_LEQUAL);
+
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
+
+	glDisable(GL_STENCIL_TEST);
+	glEnable(GL_SCISSOR_TEST);
+
+	glScissor(0, 0, GetTargetWidth(), GetTargetHeight());
+	glBlendColor(0, 0, 0, 0.5f);
+	glClearDepthf(1.0f);
+
+	if (g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
+	{
+		if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
+		{
+			glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
+		}
+		else
+		{
+			if (g_ogl_config.bSupportOGL31)
+			{
+				glEnable(GL_PRIMITIVE_RESTART);
+				glPrimitiveRestartIndex(65535);
+			}
+			else
+			{
+				glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+				glPrimitiveRestartIndexNV(65535);
+			}
+		}
+	}
+	UpdateActiveConfig();
+	ClearEFBCache();
+}
+
+Renderer::~Renderer()
+{
+}
+
+void Renderer::Shutdown()
+{
+	delete g_framebuffer_manager;
+
+	g_Config.bRunning = false;
+	UpdateActiveConfig();
+
+	glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO);
+	glDeleteVertexArrays(1, &s_ShowEFBCopyRegions_VAO);
+	s_ShowEFBCopyRegions_VBO = 0;
+
+	delete s_pfont;
+	s_pfont = nullptr;
+	s_ShowEFBCopyRegions.Destroy();
+
+	delete m_post_processor;
+	m_post_processor = nullptr;
+
+	OpenGL_DeleteAttributelessVAO();
+}
+
+void Renderer::Init()
+{
+	// Initialize the FramebufferManager
+	g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
+			s_MSAASamples);
+
+	m_post_processor = new OpenGLPostProcessing();
+
+	s_pfont = new RasterFont();
+
+	ProgramShaderCache::CompileShader(s_ShowEFBCopyRegions,
+		"in vec2 rawpos;\n"
+		"in vec3 color0;\n"
+		"out vec4 c;\n"
+		"void main(void) {\n"
+		"	gl_Position = vec4(rawpos, 0.0, 1.0);\n"
+		"	c = vec4(color0, 1.0);\n"
+		"}\n",
+		"in vec4 c;\n"
+		"out vec4 ocol0;\n"
+		"void main(void) {\n"
+		"	ocol0 = c;\n"
+		"}\n");
+
+	OpenGL_CreateAttributelessVAO();
+
+	// creating buffers
+	glGenBuffers(1, &s_ShowEFBCopyRegions_VBO);
+	glGenVertexArrays(1, &s_ShowEFBCopyRegions_VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO);
+	glBindVertexArray( s_ShowEFBCopyRegions_VAO );
+	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
+	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*5, nullptr);
+	glEnableVertexAttribArray(SHADER_COLOR0_ATTRIB);
+	glVertexAttribPointer(SHADER_COLOR0_ATTRIB, 3, GL_FLOAT, 0, sizeof(GLfloat)*5, (GLfloat*)nullptr+2);
+}
+
+// Create On-Screen-Messages
+void Renderer::ShowEfbCopyRegions()
+{
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL && g_ActiveConfig.bShowEFBCopyRegions)
+	{
+		// Set Line Size
+		glLineWidth(3.0f);
+
+		// 2*Coords + 3*Color
+		GLsizeiptr length = stats.efb_regions.size() * sizeof(GLfloat) * (2 + 3) * 2 * 6;
+		glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO);
+		glBufferData(GL_ARRAY_BUFFER, length, nullptr, GL_STREAM_DRAW);
+		GLfloat *Vertices = (GLfloat*)glMapBufferRange(GL_ARRAY_BUFFER, 0, length, GL_MAP_WRITE_BIT);
+
+		// Draw EFB copy regions rectangles
+		int a = 0;
+		GLfloat color[3] = {0.0f, 1.0f, 1.0f};
+
+		for (const EFBRectangle& rect : stats.efb_regions)
+		{
+			GLfloat halfWidth = EFB_WIDTH / 2.0f;
+			GLfloat halfHeight = EFB_HEIGHT / 2.0f;
+			GLfloat x =  (GLfloat) -1.0f + ((GLfloat)rect.left / halfWidth);
+			GLfloat y =  (GLfloat) 1.0f - ((GLfloat)rect.top / halfHeight);
+			GLfloat x2 = (GLfloat) -1.0f + ((GLfloat)rect.right / halfWidth);
+			GLfloat y2 = (GLfloat) 1.0f - ((GLfloat)rect.bottom / halfHeight);
+
+			Vertices[a++] = x;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+
+			Vertices[a++] = x;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+
+			Vertices[a++] = x;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+
+			Vertices[a++] = x2;
+			Vertices[a++] = y;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			Vertices[a++] = x;
+			Vertices[a++] = y2;
+			Vertices[a++] = color[0];
+			Vertices[a++] = color[1];
+			Vertices[a++] = color[2];
+
+			// TO DO: build something nicer here
+			GLfloat temp = color[0];
+			color[0] = color[1];
+			color[1] = color[2];
+			color[2] = temp;
+		}
+		glUnmapBuffer(GL_ARRAY_BUFFER);
+
+		s_ShowEFBCopyRegions.Bind();
+		glBindVertexArray(s_ShowEFBCopyRegions_VAO);
+		GLsizei count = static_cast<GLsizei>(stats.efb_regions.size() * 2*6);
+		glDrawArrays(GL_LINES, 0, count);
+
+		// Clear stored regions
+		stats.efb_regions.clear();
+	}
+}
+
+void Renderer::RenderText(const std::string& text, int left, int top, u32 color)
+{
+	const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
+	const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
+
+	s_pfont->printMultilineText(text,
+		left * 2.0f / (float)nBackbufferWidth - 1,
+		1 - top * 2.0f / (float)nBackbufferHeight,
+		0, nBackbufferWidth, nBackbufferHeight, color);
+}
+
+TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
+{
+	TargetRectangle result;
+	result.left   = EFBToScaledX(rc.left);
+	result.top    = EFBToScaledY(EFB_HEIGHT - rc.top);
+	result.right  = EFBToScaledX(rc.right);
+	result.bottom = EFBToScaledY(EFB_HEIGHT - rc.bottom);
+	return result;
+}
+
+// Function: This function handles the OpenGL glScissor() function
+// ----------------------------
+// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
+//		case 0x52 > SetScissorRect()
+// ----------------------------
+// bpmem.scissorTL.x, y = 342x342
+// bpmem.scissorBR.x, y = 981x821
+// Renderer::GetTargetHeight() = the fixed ini file setting
+// donkopunchstania - it appears scissorBR is the bottom right pixel inside the scissor box
+// therefore the width and height are (scissorBR + 1) - scissorTL
+void Renderer::SetScissorRect(const EFBRectangle& rc)
+{
+	TargetRectangle trc = g_renderer->ConvertEFBRectangle(rc);
+	glScissor(trc.left, trc.bottom, trc.GetWidth(), trc.GetHeight());
+}
+
+void Renderer::SetColorMask()
+{
+	// Only enable alpha channel if it's supported by the current EFB format
+	GLenum ColorMask = GL_FALSE, AlphaMask = GL_FALSE;
+	if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
+	{
+		if (bpmem.blendmode.colorupdate)
+			ColorMask = GL_TRUE;
+		if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24))
+			AlphaMask = GL_TRUE;
+	}
+	glColorMask(ColorMask,  ColorMask,  ColorMask,  AlphaMask);
+}
+
+void ClearEFBCache()
+{
+	if (!s_efbCacheIsCleared)
+	{
+		s_efbCacheIsCleared = true;
+		memset(s_efbCacheValid, 0, sizeof(s_efbCacheValid));
+	}
+}
+
+void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const void* data)
+{
+	u32 cacheType = (type == PEEK_Z ? 0 : 1);
+
+	if (!s_efbCache[cacheType][cacheRectIdx].size())
+		s_efbCache[cacheType][cacheRectIdx].resize(EFB_CACHE_RECT_SIZE * EFB_CACHE_RECT_SIZE);
+
+	u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left;
+	u32 efbPixelRcHeight = efbPixelRc.bottom - efbPixelRc.top;
+	u32 efbPixelRcWidth = efbPixelRc.right - efbPixelRc.left;
+
+	for (u32 yCache = 0; yCache < efbPixelRcHeight; ++yCache)
+	{
+		u32 yEFB = efbPixelRc.top + yCache;
+		u32 yPixel = (EFBToScaledY(EFB_HEIGHT - yEFB) + EFBToScaledY(EFB_HEIGHT - yEFB - 1)) / 2;
+		u32 yData = yPixel - targetPixelRc.bottom;
+
+		for (u32 xCache = 0; xCache < efbPixelRcWidth; ++xCache)
+		{
+			u32 xEFB = efbPixelRc.left + xCache;
+			u32 xPixel = (EFBToScaledX(xEFB) + EFBToScaledX(xEFB + 1)) / 2;
+			u32 xData = xPixel - targetPixelRc.left;
+			u32 value;
+			if (type == PEEK_Z)
+			{
+				float* ptr = (float*)data;
+				value = MathUtil::Clamp<u32>((u32)(ptr[yData * targetPixelRcWidth + xData] * 16777216.0f), 0, 0xFFFFFF);
+			}
+			else
+			{
+				u32* ptr = (u32*)data;
+				value = ptr[yData * targetPixelRcWidth + xData];
+			}
+			s_efbCache[cacheType][cacheRectIdx][yCache * EFB_CACHE_RECT_SIZE + xCache] = value;
+		}
+	}
+
+	s_efbCacheValid[cacheType][cacheRectIdx] = true;
+	s_efbCacheIsCleared = false;
+}
+
+// This function allows the CPU to directly access the EFB.
+// There are EFB peeks (which will read the color or depth of a pixel)
+// and EFB pokes (which will change the color or depth of a pixel).
+//
+// The behavior of EFB peeks can only be modified by:
+// - GX_PokeAlphaRead
+// The behavior of EFB pokes can be modified by:
+// - GX_PokeAlphaMode (TODO)
+// - GX_PokeAlphaUpdate (TODO)
+// - GX_PokeBlendMode (TODO)
+// - GX_PokeColorUpdate (TODO)
+// - GX_PokeDither (TODO)
+// - GX_PokeDstAlpha (TODO)
+// - GX_PokeZMode (TODO)
+u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
+{
+	u32 cacheRectIdx = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_WIDTH
+	                 + (x / EFB_CACHE_RECT_SIZE);
+
+	EFBRectangle efbPixelRc;
+
+	if (type == PEEK_COLOR || type == PEEK_Z)
+	{
+		// Get the rectangular target region containing the EFB pixel
+		efbPixelRc.left = (x / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE;
+		efbPixelRc.top = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE;
+		efbPixelRc.right = std::min(efbPixelRc.left + EFB_CACHE_RECT_SIZE, (u32)EFB_WIDTH);
+		efbPixelRc.bottom = std::min(efbPixelRc.top + EFB_CACHE_RECT_SIZE, (u32)EFB_HEIGHT);
+	}
+	else
+	{
+		efbPixelRc.left = x;
+		efbPixelRc.top = y;
+		efbPixelRc.right = x+1;
+		efbPixelRc.bottom = y+1;
+	}
+
+	TargetRectangle targetPixelRc = ConvertEFBRectangle(efbPixelRc);
+	u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left;
+	u32 targetPixelRcHeight = targetPixelRc.top - targetPixelRc.bottom;
+
+	// TODO (FIX) : currently, AA path is broken/offset and doesn't return the correct pixel
+	switch (type)
+	{
+	case PEEK_Z:
+		{
+			if (!s_efbCacheValid[0][cacheRectIdx])
+			{
+				if (s_MSAASamples > 1)
+				{
+					g_renderer->ResetAPIState();
+
+					// Resolve our rectangle.
+					FramebufferManager::GetEFBDepthTexture(efbPixelRc);
+					glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetResolvedFramebuffer());
+
+					g_renderer->RestoreAPIState();
+				}
+
+				std::unique_ptr<float> depthMap(new float[targetPixelRcWidth * targetPixelRcHeight]);
+
+				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
+				             GL_DEPTH_COMPONENT, GL_FLOAT, depthMap.get());
+
+				UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, depthMap.get());
+			}
+
+			u32 xRect = x % EFB_CACHE_RECT_SIZE;
+			u32 yRect = y % EFB_CACHE_RECT_SIZE;
+			u32 z = s_efbCache[0][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect];
+
+			// if Z is in 16 bit format you must return a 16 bit integer
+			if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
+				z = z >> 8;
+
+			return z;
+		}
+
+	case PEEK_COLOR: // GXPeekARGB
+		{
+			// Although it may sound strange, this really is A8R8G8B8 and not RGBA or 24-bit...
+
+			// Tested in Killer 7, the first 8bits represent the alpha value which is used to
+			// determine if we're aiming at an enemy (0x80 / 0x88) or not (0x70)
+			// Wind Waker is also using it for the pictograph to determine the color of each pixel
+			if (!s_efbCacheValid[1][cacheRectIdx])
+			{
+				if (s_MSAASamples > 1)
+				{
+					g_renderer->ResetAPIState();
+
+					// Resolve our rectangle.
+					FramebufferManager::GetEFBColorTexture(efbPixelRc);
+					glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetResolvedFramebuffer());
+
+					g_renderer->RestoreAPIState();
+				}
+
+				std::unique_ptr<u32> colorMap(new u32[targetPixelRcWidth * targetPixelRcHeight]);
+
+				if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
+				// XXX: Swap colours
+					glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
+						     GL_RGBA, GL_UNSIGNED_BYTE, colorMap.get());
+				else
+					glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
+						     GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, colorMap.get());
+
+				UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, colorMap.get());
+			}
+
+			u32 xRect = x % EFB_CACHE_RECT_SIZE;
+			u32 yRect = y % EFB_CACHE_RECT_SIZE;
+			u32 color = s_efbCache[1][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect];
+
+			// check what to do with the alpha channel (GX_PokeAlphaRead)
+			PixelEngine::UPEAlphaReadReg alpha_read_mode = PixelEngine::GetAlphaReadMode();
+
+			if (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24)
+			{
+				color = RGBA8ToRGBA6ToRGBA8(color);
+			}
+			else if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
+			{
+				color = RGBA8ToRGB565ToRGBA8(color);
+			}
+			if (bpmem.zcontrol.pixel_format != PEControl::RGBA6_Z24)
+			{
+				color |= 0xFF000000;
+			}
+			if (alpha_read_mode.ReadMode == 2)
+			{
+				// GX_READ_NONE
+				return color;
+			}
+			else if (alpha_read_mode.ReadMode == 1)
+			{
+				// GX_READ_FF
+				return (color | 0xFF000000);
+			}
+			else /*if(alpha_read_mode.ReadMode == 0)*/
+			{
+				// GX_READ_00
+				return (color & 0x00FFFFFF);
+			}
+		}
+
+	case POKE_COLOR:
+	case POKE_Z:
+	{
+		std::vector<EfbPokeData> vector;
+		EfbPokeData d;
+		d.x = x;
+		d.y = y;
+		d.data = poke_data;
+		vector.push_back(d);
+		PokeEFB(type, vector);
+		break;
+	}
+
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+void Renderer::PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data)
+{
+	FramebufferManager::PokeEFB(type, data);
+}
+
+u16 Renderer::BBoxRead(int index)
+{
+	int swapped_index = index;
+	if (index >= 2)
+		swapped_index ^= 1; // swap 2 and 3 for top/bottom
+
+	// Here we get the min/max value of the truncated position of the upscaled and swapped framebuffer.
+	// So we have to correct them to the unscaled EFB sizes.
+	int value = BoundingBox::Get(swapped_index);
+
+	if (index < 2)
+	{
+		// left/right
+		value = value * EFB_WIDTH / s_target_width;
+	}
+	else
+	{
+		// up/down -- we have to swap up and down
+		value = value * EFB_HEIGHT / s_target_height;
+		value = EFB_HEIGHT - value - 1;
+	}
+	if (index & 1)
+		value++; // fix max values to describe the outer border
+
+	return value;
+}
+
+void Renderer::BBoxWrite(int index, u16 _value)
+{
+	int value = _value; // u16 isn't enough to multiply by the efb width
+	if (index & 1)
+		value--;
+	if (index < 2)
+	{
+		value = value * s_target_width / EFB_WIDTH;
+	}
+	else
+	{
+		index ^= 1; // swap 2 and 3 for top/bottom
+		value = EFB_HEIGHT - value - 1;
+		value = value * s_target_height / EFB_HEIGHT;
+	}
+
+	BoundingBox::Set(index, value);
+}
+
+void Renderer::SetViewport()
+{
+	// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
+	// [0] = width/2
+	// [1] = height/2
+	// [2] = 16777215 * (farz - nearz)
+	// [3] = xorig + width/2 + 342
+	// [4] = yorig + height/2 + 342
+	// [5] = 16777215 * farz
+
+	int scissorXOff = bpmem.scissorOffset.x * 2;
+	int scissorYOff = bpmem.scissorOffset.y * 2;
+
+	// TODO: ceil, floor or just cast to int?
+	float X = EFBToScaledXf(xfmem.viewport.xOrig - xfmem.viewport.wd - (float)scissorXOff);
+	float Y = EFBToScaledYf((float)EFB_HEIGHT - xfmem.viewport.yOrig + xfmem.viewport.ht + (float)scissorYOff);
+	float Width = EFBToScaledXf(2.0f * xfmem.viewport.wd);
+	float Height = EFBToScaledYf(-2.0f * xfmem.viewport.ht);
+	float GLNear = MathUtil::Clamp<float>(xfmem.viewport.farZ - MathUtil::Clamp<float>(xfmem.viewport.zRange, 0.0f, 16777215.0f), 0.0f, 16777215.0f) / 16777216.0f;
+	float GLFar = MathUtil::Clamp<float>(xfmem.viewport.farZ, 0.0f, 16777215.0f) / 16777216.0f;
+	if (Width < 0)
+	{
+		X += Width;
+		Width *= -1;
+	}
+	if (Height < 0)
+	{
+		Y += Height;
+		Height *= -1;
+	}
+
+	// Update the view port
+	if (g_ogl_config.bSupportViewportFloat)
+	{
+		glViewportIndexedf(0, X, Y, Width, Height);
+	}
+	else
+	{
+		auto iceilf = [](float f)
+		{
+			return static_cast<GLint>(ceilf(f));
+		};
+		glViewport(iceilf(X), iceilf(Y), iceilf(Width), iceilf(Height));
+	}
+	glDepthRangef(GLFar, GLNear);
+}
+
+void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
+{
+	ResetAPIState();
+
+	// color
+	GLboolean const
+		color_mask = colorEnable ? GL_TRUE : GL_FALSE,
+		alpha_mask = alphaEnable ? GL_TRUE : GL_FALSE;
+	glColorMask(color_mask,  color_mask,  color_mask,  alpha_mask);
+
+	glClearColor(
+		float((color >> 16) & 0xFF) / 255.0f,
+		float((color >> 8) & 0xFF) / 255.0f,
+		float((color >> 0) & 0xFF) / 255.0f,
+		float((color >> 24) & 0xFF) / 255.0f);
+
+	// depth
+	glDepthMask(zEnable ? GL_TRUE : GL_FALSE);
+
+	glClearDepthf(float(z & 0xFFFFFF) / 16777216.0f);
+
+	// Update rect for clearing the picture
+	glEnable(GL_SCISSOR_TEST);
+
+	TargetRectangle const targetRc = ConvertEFBRectangle(rc);
+	glScissor(targetRc.left, targetRc.bottom, targetRc.GetWidth(), targetRc.GetHeight());
+
+	// glColorMask/glDepthMask/glScissor affect glClear (glViewport does not)
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	RestoreAPIState();
+
+	ClearEFBCache();
+}
+
+void Renderer::BlitScreen(TargetRectangle src, TargetRectangle dst, GLuint src_texture, int src_width, int src_height)
+{
+	if (g_ActiveConfig.iStereoMode == STEREO_SBS || g_ActiveConfig.iStereoMode == STEREO_TAB)
+	{
+		TargetRectangle leftRc, rightRc;
+		ConvertStereoRectangle(dst, leftRc, rightRc);
+
+		m_post_processor->BlitFromTexture(src, leftRc, src_texture, src_width, src_height, 0);
+		m_post_processor->BlitFromTexture(src, rightRc, src_texture, src_width, src_height, 1);
+	}
+	else
+	{
+		m_post_processor->BlitFromTexture(src, dst, src_texture, src_width, src_height);
+	}
+}
+
+void Renderer::ReinterpretPixelData(unsigned int convtype)
+{
+	if (convtype == 0 || convtype == 2)
+	{
+		FramebufferManager::ReinterpretPixelData(convtype);
+	}
+	else
+	{
+		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
+	}
+}
+
+void Renderer::SetBlendMode(bool forceUpdate)
+{
+	// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
+	// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
+	bool target_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
+
+	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
+	bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
+
+	const GLenum glSrcFactors[8] =
+	{
+		GL_ZERO,
+		GL_ONE,
+		GL_DST_COLOR,
+		GL_ONE_MINUS_DST_COLOR,
+		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
+		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
+		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
+		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
+	};
+	const GLenum glDestFactors[8] =
+	{
+		GL_ZERO,
+		GL_ONE,
+		GL_SRC_COLOR,
+		GL_ONE_MINUS_SRC_COLOR,
+		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
+		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
+		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
+		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
+	};
+
+	// blend mode bit mask
+	// 0 - blend enable
+	// 1 - dst alpha enabled
+	// 2 - reverse subtract enable (else add)
+	// 3-5 - srcRGB function
+	// 6-8 - dstRGB function
+
+	u32 newval = useDualSource << 1;
+	newval |= bpmem.blendmode.subtract << 2;
+
+	if (bpmem.blendmode.subtract)
+	{
+		newval |= 0x0049;   // enable blending src 1 dst 1
+	}
+	else if (bpmem.blendmode.blendenable)
+	{
+		newval |= 1;    // enable blending
+		newval |= bpmem.blendmode.srcfactor << 3;
+		newval |= bpmem.blendmode.dstfactor << 6;
+	}
+
+	u32 changes = forceUpdate ? 0xFFFFFFFF : newval ^ s_blendMode;
+
+	if (changes & 1)
+	{
+		// blend enable change
+		(newval & 1) ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
+	}
+
+	if (changes & 4)
+	{
+		// subtract enable change
+		GLenum equation = newval & 4 ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD;
+		GLenum equationAlpha = useDualSource ? GL_FUNC_ADD : equation;
+
+		glBlendEquationSeparate(equation, equationAlpha);
+	}
+
+	if (changes & 0x1FA)
+	{
+		u32 srcidx = (newval >> 3) & 7;
+		u32 dstidx = (newval >> 6) & 7;
+		GLenum srcFactor = glSrcFactors[srcidx];
+		GLenum dstFactor = glDestFactors[dstidx];
+
+		// adjust alpha factors
+		if (useDualSource)
+		{
+			srcidx = BlendMode::ONE;
+			dstidx = BlendMode::ZERO;
+		}
+		else
+		{
+			// we can't use GL_DST_COLOR or GL_ONE_MINUS_DST_COLOR for source in alpha channel so use their alpha equivalent instead
+			if (srcidx == BlendMode::DSTCLR)
+				srcidx = BlendMode::DSTALPHA;
+			else if (srcidx == BlendMode::INVDSTCLR)
+				srcidx = BlendMode::INVDSTALPHA;
+
+			// we can't use GL_SRC_COLOR or GL_ONE_MINUS_SRC_COLOR for destination in alpha channel so use their alpha equivalent instead
+			if (dstidx == BlendMode::SRCCLR)
+				dstidx = BlendMode::SRCALPHA;
+			else if (dstidx == BlendMode::INVSRCCLR)
+				dstidx = BlendMode::INVSRCALPHA;
+		}
+		GLenum srcFactorAlpha = glSrcFactors[srcidx];
+		GLenum dstFactorAlpha = glDestFactors[dstidx];
+		// blend RGB change
+		glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha);
+	}
+	s_blendMode = newval;
+}
+
+static void DumpFrame(const std::vector<u8>& data, int w, int h)
+{
+#if defined(HAVE_LIBAV) || defined(_WIN32)
+	if (SConfig::GetInstance().m_DumpFrames && !data.empty())
+	{
+		AVIDump::AddFrame(&data[0], w, h);
+	}
+#endif
+}
+
+// This function has the final picture. We adjust the aspect ratio here.
+void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma)
+{
+	if (g_ogl_config.bSupportsDebug)
+	{
+		if (LogManager::GetInstance()->IsEnabled(LogTypes::VIDEO, LogTypes::LERROR))
+			glEnable(GL_DEBUG_OUTPUT);
+		else
+			glDisable(GL_DEBUG_OUTPUT);
+	}
+
+	static int w = 0, h = 0;
+	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
+	{
+		DumpFrame(frame_data, w, h);
+		Core::Callback_VideoCopiedToXFB(false);
+		return;
+	}
+
+	u32 xfbCount = 0;
+	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbStride, fbHeight, &xfbCount);
+	if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0))
+	{
+		DumpFrame(frame_data, w, h);
+		Core::Callback_VideoCopiedToXFB(false);
+		return;
+	}
+
+	ResetAPIState();
+
+	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+	TargetRectangle flipped_trc = GetTargetRectangle();
+
+	// Flip top and bottom for some reason; TODO: Fix the code to suck less?
+	std::swap(flipped_trc.top, flipped_trc.bottom);
+
+	// Copy the framebuffer to screen.
+	const XFBSource* xfbSource = nullptr;
+
+	if (g_ActiveConfig.bUseXFB)
+	{
+		// draw each xfb source
+		for (u32 i = 0; i < xfbCount; ++i)
+		{
+			xfbSource = (const XFBSource*) xfbSourceList[i];
+
+			TargetRectangle drawRc;
+
+			if (g_ActiveConfig.bUseRealXFB)
+			{
+				drawRc = flipped_trc;
+			}
+			else
+			{
+				// use virtual xfb with offset
+				int xfbHeight = xfbSource->srcHeight;
+				int xfbWidth = xfbSource->srcWidth;
+				int hOffset = ((s32)xfbSource->srcAddr - (s32)xfbAddr) / ((s32)fbStride * 2);
+
+				drawRc.top = flipped_trc.top - hOffset * flipped_trc.GetHeight() / (s32)fbHeight;
+				drawRc.bottom = flipped_trc.top - (hOffset + xfbHeight) * flipped_trc.GetHeight() / (s32)fbHeight;
+				drawRc.left = flipped_trc.left + (flipped_trc.GetWidth() - xfbWidth * flipped_trc.GetWidth() / (s32)fbStride) / 2;
+				drawRc.right = flipped_trc.left + (flipped_trc.GetWidth() + xfbWidth * flipped_trc.GetWidth() / (s32)fbStride) / 2;
+
+				// The following code disables auto stretch.  Kept for reference.
+				// scale draw area for a 1 to 1 pixel mapping with the draw target
+				//float vScale = (float)fbHeight / (float)flipped_trc.GetHeight();
+				//float hScale = (float)fbWidth / (float)flipped_trc.GetWidth();
+				//drawRc.top *= vScale;
+				//drawRc.bottom *= vScale;
+				//drawRc.left *= hScale;
+				//drawRc.right *= hScale;
+			}
+			// Tell the OSD Menu about the current internal resolution
+			OSDInternalW = xfbSource->sourceRc.GetWidth(); OSDInternalH = xfbSource->sourceRc.GetHeight();
+
+			TargetRectangle sourceRc;
+			sourceRc.left = xfbSource->sourceRc.left;
+			sourceRc.right = xfbSource->sourceRc.right;
+			sourceRc.top = xfbSource->sourceRc.top;
+			sourceRc.bottom = xfbSource->sourceRc.bottom;
+
+			sourceRc.right -= Renderer::EFBToScaledX(fbStride - fbWidth);
+
+			BlitScreen(sourceRc, drawRc, xfbSource->texture, xfbSource->texWidth, xfbSource->texHeight);
+		}
+	}
+	else
+	{
+		TargetRectangle targetRc = ConvertEFBRectangle(rc);
+
+		// for msaa mode, we must resolve the efb content to non-msaa
+		GLuint tex = FramebufferManager::ResolveAndGetRenderTarget(rc);
+		BlitScreen(targetRc, flipped_trc, tex, s_target_width, s_target_height);
+	}
+
+	glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
+
+	// Save screenshot
+	if (s_bScreenshot)
+	{
+		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+		SaveScreenshot(s_sScreenshotName, flipped_trc);
+		// Reset settings
+		s_sScreenshotName.clear();
+		s_bScreenshot = false;
+	}
+
+	// Frame dumps are handled a little differently in Windows
+	// Frame dumping disabled entirely on GLES3
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+#if defined _WIN32 || defined HAVE_LIBAV
+		if (SConfig::GetInstance().m_DumpFrames)
+		{
+			std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+			if (frame_data.empty() || w != flipped_trc.GetWidth() ||
+				     h != flipped_trc.GetHeight())
+			{
+				w = flipped_trc.GetWidth();
+				h = flipped_trc.GetHeight();
+				frame_data.resize(3 * w * h);
+			}
+			glPixelStorei(GL_PACK_ALIGNMENT, 1);
+			glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]);
+			if (w > 0 && h > 0)
+			{
+				if (!bLastFrameDumped)
+				{
+					#ifdef _WIN32
+						bAVIDumping = AVIDump::Start(nullptr, w, h);
+					#else
+						bAVIDumping = AVIDump::Start(w, h);
+					#endif
+					if (!bAVIDumping)
+					{
+						OSD::AddMessage("AVIDump Start failed", 2000);
+					}
+					else
+					{
+						OSD::AddMessage(StringFromFormat(
+									"Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
+									File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h), 2000);
+					}
+				}
+				if (bAVIDumping)
+				{
+					#ifndef _WIN32
+						FlipImageData(&frame_data[0], w, h);
+					#endif
+
+						AVIDump::AddFrame(&frame_data[0], w, h);
+				}
+
+				bLastFrameDumped = true;
+			}
+			else
+			{
+				NOTICE_LOG(VIDEO, "Error reading framebuffer");
+			}
+		}
+		else
+		{
+			if (bLastFrameDumped && bAVIDumping)
+			{
+				std::vector<u8>().swap(frame_data);
+				w = h = 0;
+				AVIDump::Stop();
+				bAVIDumping = false;
+				OSD::AddMessage("Stop dumping frames", 2000);
+			}
+			bLastFrameDumped = false;
+		}
+#else
+		if (SConfig::GetInstance().m_DumpFrames)
+		{
+			std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+			std::string movie_file_name;
+			w = GetTargetRectangle().GetWidth();
+			h = GetTargetRectangle().GetHeight();
+			frame_data.resize(3 * w * h);
+			glPixelStorei(GL_PACK_ALIGNMENT, 1);
+			glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]);
+
+			if (!bLastFrameDumped)
+			{
+				movie_file_name = File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump.raw";
+				File::CreateFullPath(movie_file_name);
+				pFrameDump.Open(movie_file_name, "wb");
+				if (!pFrameDump)
+				{
+					OSD::AddMessage("Error opening framedump.raw for writing.", 2000);
+				}
+				else
+				{
+					OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h), 2000);
+				}
+			}
+			if (pFrameDump)
+			{
+				FlipImageData(&frame_data[0], w, h);
+				pFrameDump.WriteBytes(&frame_data[0], w * 3 * h);
+				pFrameDump.Flush();
+			}
+			bLastFrameDumped = true;
+		}
+		else
+		{
+			if (bLastFrameDumped)
+				pFrameDump.Close();
+			bLastFrameDumped = false;
+		}
+#endif
+	}
+	// Finish up the current frame, print some stats
+
+	SetWindowSize(fbStride, fbHeight);
+
+	GLInterface->Update(); // just updates the render window position and the backbuffer size
+
+	bool xfbchanged = s_last_xfb_mode != g_ActiveConfig.bUseRealXFB;
+
+	if (FramebufferManagerBase::LastXfbWidth() != fbStride || FramebufferManagerBase::LastXfbHeight() != fbHeight)
+	{
+		xfbchanged = true;
+		unsigned int const last_w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride;
+		unsigned int const last_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
+		FramebufferManagerBase::SetLastXfbWidth(last_w);
+		FramebufferManagerBase::SetLastXfbHeight(last_h);
+	}
+
+	bool WindowResized = false;
+	int W = (int)GLInterface->GetBackBufferWidth();
+	int H = (int)GLInterface->GetBackBufferHeight();
+	if (W != s_backbuffer_width || H != s_backbuffer_height || s_last_efb_scale != g_ActiveConfig.iEFBScale)
+	{
+		WindowResized = true;
+		s_backbuffer_width = W;
+		s_backbuffer_height = H;
+		s_last_efb_scale = g_ActiveConfig.iEFBScale;
+	}
+
+	if (xfbchanged || WindowResized || (s_last_multisample_mode != g_ActiveConfig.iMultisampleMode) || (s_last_stereo_mode != (g_ActiveConfig.iStereoMode > 0)))
+	{
+		s_last_xfb_mode = g_ActiveConfig.bUseRealXFB;
+
+		UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
+
+		if (CalculateTargetSize(s_backbuffer_width, s_backbuffer_height) || s_last_multisample_mode != g_ActiveConfig.iMultisampleMode || s_last_stereo_mode != (g_ActiveConfig.iStereoMode > 0))
+		{
+			s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0;
+			s_last_multisample_mode = g_ActiveConfig.iMultisampleMode;
+			s_MSAASamples = GetNumMSAASamples(s_last_multisample_mode);
+			ApplySSAASettings();
+
+			delete g_framebuffer_manager;
+			g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
+				s_MSAASamples);
+
+			PixelShaderManager::SetEfbScaleChanged();
+		}
+	}
+
+	// ---------------------------------------------------------------------
+	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP))
+	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		// Reset viewport for drawing text
+		glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
+
+		ShowEfbCopyRegions();
+		DrawDebugText();
+
+		// Do our OSD callbacks
+		OSD::DoCallbacks(OSD::OSD_ONFRAME);
+		OSD::DrawMessages();
+	}
+	// Copy the rendered frame to the real window
+	GLInterface->Swap();
+
+	// Clear framebuffer
+	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP))
+	{
+		glClearColor(0, 0, 0, 0);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	}
+
+	if (s_vsync != g_ActiveConfig.IsVSync())
+	{
+		s_vsync = g_ActiveConfig.IsVSync();
+		GLInterface->SwapInterval(s_vsync);
+	}
+
+	// Clean out old stuff from caches. It's not worth it to clean out the shader caches.
+	TextureCache::Cleanup(frameCount);
+
+	// Render to the framebuffer.
+	FramebufferManager::SetFramebuffer(0);
+
+	RestoreAPIState();
+
+	g_Config.iSaveTargetId = 0;
+
+	UpdateActiveConfig();
+	TextureCache::OnConfigChanged(g_ActiveConfig);
+
+	// For testing zbuffer targets.
+	// Renderer::SetZBufferRender();
+	// SaveTexture("tex.png", GL_TEXTURE_2D, s_FakeZTarget,
+	//	      GetTargetWidth(), GetTargetHeight());
+
+	// Invalidate EFB cache
+	ClearEFBCache();
+}
+
+// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
+void Renderer::ResetAPIState()
+{
+	// Gets us to a reasonably sane state where it's possible to do things like
+	// image copies with textured quads, etc.
+	glDisable(GL_SCISSOR_TEST);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_CULL_FACE);
+	glDisable(GL_BLEND);
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+		glDisable(GL_COLOR_LOGIC_OP);
+	glDepthMask(GL_FALSE);
+	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+}
+
+void Renderer::RestoreAPIState()
+{
+	// Gets us back into a more game-like state.
+	glEnable(GL_SCISSOR_TEST);
+	SetGenerationMode();
+	BPFunctions::SetScissor();
+	SetColorMask();
+	SetDepthMode();
+	SetBlendMode(true);
+	SetLogicOpMode();
+	SetViewport();
+
+	VertexManager *vm = (OGL::VertexManager*)g_vertex_manager;
+	glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers);
+	if (vm->m_last_vao)
+		glBindVertexArray(vm->m_last_vao);
+
+	TextureCache::SetStage();
+}
+
+void Renderer::SetGenerationMode()
+{
+	// none, ccw, cw, ccw
+	if (bpmem.genMode.cullmode > 0)
+	{
+		// TODO: GX_CULL_ALL not supported, yet!
+		glEnable(GL_CULL_FACE);
+		glFrontFace(bpmem.genMode.cullmode == 2 ? GL_CCW : GL_CW);
+	}
+	else
+	{
+		glDisable(GL_CULL_FACE);
+	}
+}
+
+void Renderer::SetDepthMode()
+{
+	const GLenum glCmpFuncs[8] =
+	{
+		GL_NEVER,
+		GL_LESS,
+		GL_EQUAL,
+		GL_LEQUAL,
+		GL_GREATER,
+		GL_NOTEQUAL,
+		GL_GEQUAL,
+		GL_ALWAYS
+	};
+
+	if (bpmem.zmode.testenable)
+	{
+		glEnable(GL_DEPTH_TEST);
+		glDepthMask(bpmem.zmode.updateenable ? GL_TRUE : GL_FALSE);
+		glDepthFunc(glCmpFuncs[bpmem.zmode.func]);
+	}
+	else
+	{
+		// if the test is disabled write is disabled too
+		// TODO: When PE performance metrics are being emulated via occlusion queries, we should (probably?) enable depth test with depth function ALWAYS here
+		glDisable(GL_DEPTH_TEST);
+		glDepthMask(GL_FALSE);
+	}
+}
+
+void Renderer::SetLogicOpMode()
+{
+	if (GLInterface->GetMode() != GLInterfaceMode::MODE_OPENGL)
+		return;
+	// Logic ops aren't available in GLES3/GLES2
+	const GLenum glLogicOpCodes[16] =
+	{
+		GL_CLEAR,
+		GL_AND,
+		GL_AND_REVERSE,
+		GL_COPY,
+		GL_AND_INVERTED,
+		GL_NOOP,
+		GL_XOR,
+		GL_OR,
+		GL_NOR,
+		GL_EQUIV,
+		GL_INVERT,
+		GL_OR_REVERSE,
+		GL_COPY_INVERTED,
+		GL_OR_INVERTED,
+		GL_NAND,
+		GL_SET
+	};
+
+	if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable)
+	{
+		glEnable(GL_COLOR_LOGIC_OP);
+		glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]);
+	}
+	else
+	{
+		glDisable(GL_COLOR_LOGIC_OP);
+	}
+}
+
+void Renderer::SetDitherMode()
+{
+	if (bpmem.blendmode.dither)
+		glEnable(GL_DITHER);
+	else
+		glDisable(GL_DITHER);
+}
+
+void Renderer::SetSamplerState(int stage, int texindex, bool custom_tex)
+{
+	auto const& tex = bpmem.tex[texindex];
+	auto const& tm0 = tex.texMode0[stage];
+	auto const& tm1 = tex.texMode1[stage];
+
+	g_sampler_cache->SetSamplerState((texindex * 4) + stage, tm0, tm1, custom_tex);
+}
+
+void Renderer::SetInterlacingMode()
+{
+	// TODO
+}
+
+void Renderer::FlipImageData(u8 *data, int w, int h, int pixel_width)
+{
+	// Flip image upside down. Damn OpenGL.
+	for (int y = 0; y < h / 2; ++y)
+	{
+		for (int x = 0; x < w; ++x)
+		{
+			for (int delta = 0; delta < pixel_width; ++delta)
+				std::swap(data[(y * w + x) * pixel_width + delta], data[((h - 1 - y) * w + x) * pixel_width + delta]);
+		}
+	}
+}
+
+}
+
+namespace OGL
+{
+
+bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &back_rc)
+{
+	u32 W = back_rc.GetWidth();
+	u32 H = back_rc.GetHeight();
+	std::unique_ptr<u8[]> data(new u8[W * 4 * H]);
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+	glReadPixels(back_rc.left, back_rc.bottom, W, H, GL_RGBA, GL_UNSIGNED_BYTE, data.get());
+
+	// Turn image upside down
+	FlipImageData(data.get(), W, H, 4);
+
+	return TextureToPng(data.get(), W * 4, filename, W, H, false);
+
+}
+
+int Renderer::GetMaxTextureSize()
+{
+	int max_size;
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_size);
+	return max_size;
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h
new file mode 100644
index 0000000000..e2b3d0aa24
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/Render.h
@@ -0,0 +1,104 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoCommon/RenderBase.h"
+
+namespace OGL
+{
+
+void ClearEFBCache();
+
+enum GLSL_VERSION
+{
+	GLSL_130,
+	GLSL_140,
+	GLSL_150,  // and above
+	GLSLES_300,  // GLES 3.0
+	GLSLES_310, // GLES 3.1
+};
+
+// ogl-only config, so not in VideoConfig.h
+struct VideoConfig
+{
+	bool bSupportsGLSLCache;
+	bool bSupportsGLPinnedMemory;
+	bool bSupportsGLSync;
+	bool bSupportsGLBaseVertex;
+	bool bSupportsGLBufferStorage;
+	bool bSupportsMSAA;
+	bool bSupportSampleShading;
+	GLSL_VERSION eSupportedGLSLVersion;
+	bool bSupportOGL31;
+	bool bSupportViewportFloat;
+	bool bSupportsAEP;
+	bool bSupportsDebug;
+
+	const char* gl_vendor;
+	const char* gl_renderer;
+	const char* gl_version;
+	const char* glsl_version;
+
+	s32 max_samples;
+};
+extern VideoConfig g_ogl_config;
+
+class Renderer : public ::Renderer
+{
+public:
+	Renderer();
+	~Renderer();
+
+	static void Init();
+	static void Shutdown();
+
+	void SetColorMask() override;
+	void SetBlendMode(bool forceUpdate) override;
+	void SetScissorRect(const EFBRectangle& rc) override;
+	void SetGenerationMode() override;
+	void SetDepthMode() override;
+	void SetLogicOpMode() override;
+	void SetDitherMode() override;
+	void SetSamplerState(int stage, int texindex, bool custom_tex) override;
+	void SetInterlacingMode() override;
+	void SetViewport() override;
+
+	// TODO: Implement and use these
+	void ApplyState(bool bUseDstAlpha) override {}
+	void RestoreState() override {}
+
+	void RenderText(const std::string& text, int left, int top, u32 color) override;
+	void ShowEfbCopyRegions();
+	void FlipImageData(u8 *data, int w, int h, int pixel_width = 3);
+
+	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override;
+	void PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data) override;
+
+	u16 BBoxRead(int index) override;
+	void BBoxWrite(int index, u16 value) override;
+
+	void ResetAPIState() override;
+	void RestoreAPIState() override;
+
+	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) override;
+
+	void SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma) override;
+
+	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) override;
+
+	void ReinterpretPixelData(unsigned int convtype) override;
+
+	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override;
+
+	int GetMaxTextureSize() override;
+
+private:
+	void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const void* data);
+
+	void BlitScreen(TargetRectangle src, TargetRectangle dst, GLuint src_texture, int src_width, int src_height);
+};
+
+}
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp
new file mode 100644
index 0000000000..3fad7f04b0
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp
@@ -0,0 +1,148 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoCommon/DriverDetails.h"
+
+namespace OGL
+{
+
+SamplerCache *g_sampler_cache;
+
+SamplerCache::SamplerCache()
+	: m_last_max_anisotropy()
+{
+	glGenSamplers(2, m_sampler_id);
+	glSamplerParameteri(m_sampler_id[0], GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glSamplerParameteri(m_sampler_id[0], GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glSamplerParameteri(m_sampler_id[0], GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glSamplerParameteri(m_sampler_id[0], GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glSamplerParameteri(m_sampler_id[1], GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glSamplerParameteri(m_sampler_id[1], GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glSamplerParameteri(m_sampler_id[1], GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glSamplerParameteri(m_sampler_id[1], GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+}
+
+SamplerCache::~SamplerCache()
+{
+	Clear();
+	glDeleteSamplers(2, m_sampler_id);
+}
+
+void SamplerCache::BindNearestSampler(int stage)
+{
+	glBindSampler(stage, m_sampler_id[0]);
+}
+
+void SamplerCache::BindLinearSampler(int stage)
+{
+	glBindSampler(stage, m_sampler_id[1]);
+}
+
+void SamplerCache::SetSamplerState(int stage, const TexMode0& tm0, const TexMode1& tm1, bool custom_tex)
+{
+	// TODO: can this go somewhere else?
+	if (m_last_max_anisotropy != g_ActiveConfig.iMaxAnisotropy)
+	{
+		m_last_max_anisotropy = g_ActiveConfig.iMaxAnisotropy;
+		Clear();
+	}
+
+	Params params(tm0, tm1);
+
+	// take equivalent forced linear when bForceFiltering
+	if (g_ActiveConfig.bForceFiltering)
+	{
+		params.tm0.min_filter |= 0x4;
+		params.tm0.mag_filter |= 0x1;
+	}
+
+	// custom textures may have higher resolution, so disable the max_lod
+	if (custom_tex)
+	{
+		params.tm1.max_lod = 255;
+	}
+
+	// TODO: Should keep a circular buffer for each stage of recently used samplers.
+
+	auto& active_sampler = m_active_samplers[stage];
+	if (active_sampler.first != params || !active_sampler.second.sampler_id)
+	{
+		// Active sampler does not match parameters (or is invalid), bind the proper one.
+		active_sampler.first = params;
+		active_sampler.second = GetEntry(params);
+		glBindSampler(stage, active_sampler.second.sampler_id);
+	}
+}
+
+SamplerCache::Value& SamplerCache::GetEntry(const Params& params)
+{
+	auto& val = m_cache[params];
+	if (!val.sampler_id)
+	{
+		// Sampler not found in cache, create it.
+		glGenSamplers(1, &val.sampler_id);
+		SetParameters(val.sampler_id, params);
+
+		// TODO: Maybe kill old samplers if the cache gets huge. It doesn't seem to get huge though.
+		//ERROR_LOG(VIDEO, "Sampler cache size is now %ld.", m_cache.size());
+	}
+
+	return val;
+}
+
+void SamplerCache::SetParameters(GLuint sampler_id, const Params& params)
+{
+	static const GLint min_filters[8] =
+	{
+		GL_NEAREST,
+		GL_NEAREST_MIPMAP_NEAREST,
+		GL_NEAREST_MIPMAP_LINEAR,
+		GL_NEAREST,
+		GL_LINEAR,
+		GL_LINEAR_MIPMAP_NEAREST,
+		GL_LINEAR_MIPMAP_LINEAR,
+		GL_LINEAR,
+	};
+
+	static const GLint wrap_settings[4] =
+	{
+		GL_CLAMP_TO_EDGE,
+		GL_REPEAT,
+		GL_MIRRORED_REPEAT,
+		GL_REPEAT,
+	};
+
+	auto& tm0 = params.tm0;
+	auto& tm1 = params.tm1;
+
+	glSamplerParameteri(sampler_id, GL_TEXTURE_MIN_FILTER, min_filters[tm0.min_filter % ArraySize(min_filters)]);
+	glSamplerParameteri(sampler_id, GL_TEXTURE_MAG_FILTER, tm0.mag_filter ? GL_LINEAR : GL_NEAREST);
+
+	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_S, wrap_settings[tm0.wrap_s]);
+	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_T, wrap_settings[tm0.wrap_t]);
+
+	glSamplerParameterf(sampler_id, GL_TEXTURE_MIN_LOD, tm1.min_lod / 16.f);
+	glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, tm1.max_lod / 16.f);
+
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+		glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, (s32)tm0.lod_bias / 32.f);
+
+		if (g_ActiveConfig.iMaxAnisotropy > 0)
+			glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy));
+	}
+}
+
+void SamplerCache::Clear()
+{
+	for (auto& p : m_cache)
+	{
+		glDeleteSamplers(1, &p.second.sampler_id);
+	}
+	m_cache.clear();
+}
+
+}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
similarity index 75%
rename from Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.h
rename to Source/Core/VideoBackends/OGL/SamplerCache.h
index 81180d2a7a..ec469a81da 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -1,11 +1,13 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-#ifndef INCLUDE_SAMPLER_CACHE_H_
-#define INCLUDE_SAMPLER_CACHE_H_
+#pragma once
 
 #include <map>
 
-#include "Render.h"
-#include "GLUtil.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/Render.h"
 
 namespace OGL
 {
@@ -15,10 +17,12 @@ class SamplerCache : NonCopyable
 public:
 	SamplerCache();
 	~SamplerCache();
-	
-	void SetSamplerState(int stage, const TexMode0& tm0, const TexMode1& tm1);
+
+	void SetSamplerState(int stage, const TexMode0& tm0, const TexMode1& tm1, bool custom_tex);
 	void Clear();
-	
+	void BindNearestSampler(int stage);
+	void BindLinearSampler(int stage);
+
 private:
 	struct Params
 	{
@@ -29,52 +33,51 @@ private:
 				TexMode0 tm0;
 				TexMode1 tm1;
 			};
-			
+
 			u64 hex;
 		};
-		
+
 		Params()
 			: hex()
 		{}
-		
+
 		Params(const TexMode0& _tm0, const TexMode1& _tm1)
 			: tm0(_tm0)
 			, tm1(_tm1)
 		{
 			static_assert(sizeof(Params) == 8, "Assuming I can treat this as a 64bit int.");
 		}
-		
+
 		bool operator<(const Params& other) const
 		{
 			return hex < other.hex;
 		}
-		
+
 		bool operator!=(const Params& other) const
 		{
 			return hex != other.hex;
 		}
 	};
-	
+
 	struct Value
 	{
 		Value()
 			: sampler_id()
 		{}
-		
+
 		GLuint sampler_id;
 	};
-	
+
 	void SetParameters(GLuint sampler_id, const Params& params);
 	Value& GetEntry(const Params& params);
 
 	std::map<Params, Value> m_cache;
 	std::pair<Params, Value> m_active_samplers[8];
-	
+
 	int m_last_max_anisotropy;
+	u32 m_sampler_id[2];
 };
 
 extern SamplerCache *g_sampler_cache;
 
 }
-
-#endif
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
new file mode 100644
index 0000000000..0caa1e4589
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
@@ -0,0 +1,398 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/MemoryUtil.h"
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/StreamBuffer.h"
+
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/OnScreenDisplay.h"
+
+namespace OGL
+{
+
+// moved out of constructor, so m_buffer is allowed to be const
+static u32 genBuffer()
+{
+	u32 id;
+	glGenBuffers(1, &id);
+	return id;
+}
+
+StreamBuffer::StreamBuffer(u32 type, u32 size)
+: m_buffer(genBuffer()), m_buffertype(type), m_size(ROUND_UP_POW2(size)), m_bit_per_slot(IntLog2(ROUND_UP_POW2(size) / SYNC_POINTS))
+{
+	m_iterator = 0;
+	m_used_iterator = 0;
+	m_free_iterator = 0;
+}
+
+
+StreamBuffer::~StreamBuffer()
+{
+	glDeleteBuffers(1, &m_buffer);
+}
+
+/* Shared synchronization code for ring buffers
+ *
+ * The next three functions are to create/delete/use the OpenGL synchronization.
+ * ARB_sync (OpenGL 3.2) is used and required.
+ *
+ * To reduce overhead, the complete buffer is splitted up into SYNC_POINTS chunks.
+ * For each of this chunks, there is a fence which checks if this chunk is still in use.
+ *
+ * As our API allows to alloc more memory then it has to use, we have to catch how much is already written.
+ *
+ * m_iterator      - writing position
+ * m_free_iterator - last position checked if free
+ * m_used_iterator - last position known to be written
+ *
+ * So on alloc, we have to wait for all slots between m_free_iterator and m_iterator (and set m_free_iterator to m_iterator afterwards).
+ *
+ * We also assume that this buffer is accessed by the GPU between the Unmap and Map function,
+ * so we may create the fences on the start of mapping.
+ * Some here, new fences for the chunks between m_used_iterator and m_iterator (also update m_used_iterator).
+ *
+ * As ring buffers have an ugly behavior on rollover, have fun to read this code ;)
+ */
+
+void StreamBuffer::CreateFences()
+{
+	for (int i=0; i<SYNC_POINTS; i++)
+	{
+		fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+	}
+}
+void StreamBuffer::DeleteFences()
+{
+	for (int i = SLOT(m_free_iterator) + 1; i < SYNC_POINTS; i++)
+	{
+		glDeleteSync(fences[i]);
+	}
+	for (int i = 0; i < SLOT(m_iterator); i++)
+	{
+		glDeleteSync(fences[i]);
+	}
+}
+void StreamBuffer::AllocMemory(u32 size)
+{
+	// insert waiting slots for used memory
+	for (int i = SLOT(m_used_iterator); i < SLOT(m_iterator); i++)
+	{
+		fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+	}
+	m_used_iterator = m_iterator;
+
+	// wait for new slots to end of buffer
+	for (int i = SLOT(m_free_iterator) + 1; i <= SLOT(m_iterator + size) && i < SYNC_POINTS; i++)
+	{
+		glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
+		glDeleteSync(fences[i]);
+	}
+	m_free_iterator = m_iterator + size;
+
+	// if buffer is full
+	if (m_iterator + size >= m_size)
+	{
+		// insert waiting slots in unused space at the end of the buffer
+		for (int i = SLOT(m_used_iterator); i < SYNC_POINTS; i++)
+		{
+			fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+		}
+
+		// move to the start
+		m_used_iterator = m_iterator = 0; // offset 0 is always aligned
+
+		// wait for space at the start
+		for (int i = 0; i <= SLOT(m_iterator + size); i++)
+		{
+			glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
+			glDeleteSync(fences[i]);
+		}
+		m_free_iterator = m_iterator + size;
+	}
+}
+
+/* The usual way to stream data to the GPU.
+ * Described here: https://www.opengl.org/wiki/Buffer_Object_Streaming#Unsynchronized_buffer_mapping
+ * Just do unsync appends until the buffer is full.
+ * When it's full, orphan (alloc a new buffer and free the old one)
+ *
+ * As reallocation is an overhead, this method isn't as fast as it is known to be.
+ */
+class MapAndOrphan : public StreamBuffer
+{
+public:
+	MapAndOrphan(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		glBindBuffer(m_buffertype, m_buffer);
+		glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
+	}
+
+	~MapAndOrphan()
+	{
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		if (m_iterator + size >= m_size)
+		{
+			glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
+			m_iterator = 0;
+		}
+		u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size,
+			GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
+		return std::make_pair(pointer, m_iterator);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		glFlushMappedBufferRange(m_buffertype, 0, used_size);
+		glUnmapBuffer(m_buffertype);
+		m_iterator += used_size;
+	}
+};
+
+/* A modified streaming way without reallocation
+ * This one fixes the reallocation overhead of the MapAndOrphan one.
+ * So it alloc a ring buffer on initialization.
+ * But with this limited resource, we have to care about the CPU-GPU distance.
+ * Else this fifo may overflow.
+ * So we had traded orphan vs syncing.
+ */
+class MapAndSync : public StreamBuffer
+{
+public:
+	MapAndSync(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		CreateFences();
+		glBindBuffer(m_buffertype, m_buffer);
+		glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
+	}
+
+	~MapAndSync()
+	{
+		DeleteFences();
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		AllocMemory(size);
+		u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size,
+			GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
+		return std::make_pair(pointer, m_iterator);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		glFlushMappedBufferRange(m_buffertype, 0, used_size);
+		glUnmapBuffer(m_buffertype);
+		m_iterator += used_size;
+	}
+};
+
+/* Streaming fifo without mapping overhead.
+ * This one usually requires ARB_buffer_storage (OpenGL 4.4).
+ * And is usually not available on OpenGL3 GPUs.
+ *
+ * ARB_buffer_storage allows us to render from a mapped buffer.
+ * So we map it persistently in the initialization.
+ *
+ * Unsync mapping sounds like an easy task, but it isn't for threaded drivers.
+ * So every mapping on current close-source driver _will_ end in
+ * at least a round trip time between two threads.
+ *
+ * As persistently mapped buffer can't use orphaning, we also have to sync.
+ */
+class BufferStorage : public StreamBuffer
+{
+public:
+	BufferStorage(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		CreateFences();
+		glBindBuffer(m_buffertype, m_buffer);
+
+		// PERSISTANT_BIT to make sure that the buffer can be used while mapped
+		// COHERENT_BIT is set so we don't have to use a MemoryBarrier on write
+		// CLIENT_STORAGE_BIT is set since we access the buffer more frequently on the client side then server side
+		glBufferStorage(m_buffertype, m_size, nullptr,
+			GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+		m_pointer = (u8*)glMapBufferRange(m_buffertype, 0, m_size,
+			GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_FLUSH_EXPLICIT_BIT);
+	}
+
+	~BufferStorage()
+	{
+		DeleteFences();
+		glUnmapBuffer(m_buffertype);
+		glBindBuffer(m_buffertype, 0);
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		AllocMemory(size);
+		return std::make_pair(m_pointer + m_iterator, m_iterator);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		glFlushMappedBufferRange(m_buffertype, m_iterator, used_size);
+		m_iterator += used_size;
+	}
+
+	u8* m_pointer;
+};
+
+/* --- AMD only ---
+ * Another streaming fifo without mapping overhead.
+ * As we can't orphan without mapping, we have to sync.
+ *
+ * This one uses AMD_pinned_memory which is available on all AMD GPUs.
+ * OpenGL 4.4 drivers should use BufferStorage.
+ */
+class PinnedMemory : public StreamBuffer
+{
+public:
+	PinnedMemory(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		CreateFences();
+		m_pointer = (u8*)AllocateAlignedMemory(ROUND_UP(m_size,ALIGN_PINNED_MEMORY), ALIGN_PINNED_MEMORY );
+		glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, m_buffer);
+		glBufferData(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, ROUND_UP(m_size,ALIGN_PINNED_MEMORY), m_pointer, GL_STREAM_COPY);
+		glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, 0);
+		glBindBuffer(m_buffertype, m_buffer);
+	}
+
+	~PinnedMemory()
+	{
+		DeleteFences();
+		glBindBuffer(m_buffertype, 0);
+		glFinish(); // ogl pipeline must be flushed, else this buffer can be in use
+		FreeAlignedMemory(m_pointer);
+		m_pointer = nullptr;
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		AllocMemory(size);
+		return std::make_pair(m_pointer + m_iterator, m_iterator);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		m_iterator += used_size;
+	}
+
+	u8* m_pointer;
+	static const u32 ALIGN_PINNED_MEMORY = 4096;
+};
+
+/* Fifo based on the glBufferSubData call.
+ * As everything must be copied before glBufferSubData returns,
+ * an additional memcpy in the driver will be done.
+ * So this is a huge overhead, only use it if required.
+ */
+class BufferSubData : public StreamBuffer
+{
+public:
+	BufferSubData(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		glBindBuffer(m_buffertype, m_buffer);
+		glBufferData(m_buffertype, size, nullptr, GL_STATIC_DRAW);
+		m_pointer = new u8[m_size];
+	}
+
+	~BufferSubData()
+	{
+		delete [] m_pointer;
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		return std::make_pair(m_pointer, 0);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		glBufferSubData(m_buffertype, 0, used_size, m_pointer);
+	}
+
+	u8* m_pointer;
+};
+
+/* Fifo based on the glBufferData call.
+ * Some trashy drivers stall in BufferSubData.
+ * So here we use glBufferData, which realloc this buffer every time.
+ * This may avoid stalls, but it is a bigger overhead than BufferSubData.
+ */
+class BufferData : public StreamBuffer
+{
+public:
+	BufferData(u32 type, u32 size) : StreamBuffer(type, size)
+	{
+		glBindBuffer(m_buffertype, m_buffer);
+		m_pointer = new u8[m_size];
+	}
+
+	~BufferData()
+	{
+		delete [] m_pointer;
+	}
+
+	std::pair<u8*, u32> Map(u32 size) override
+	{
+		return std::make_pair(m_pointer, 0);
+	}
+
+	void Unmap(u32 used_size) override
+	{
+		glBufferData(m_buffertype, used_size, m_pointer, GL_STREAM_DRAW);
+	}
+
+	u8* m_pointer;
+};
+
+// choose best streaming library based on the supported extensions and known issues
+StreamBuffer* StreamBuffer::Create(u32 type, u32 size)
+{
+	// without basevertex support, only streaming methods whith uploads everything to zero works fine:
+	if (!g_ogl_config.bSupportsGLBaseVertex)
+	{
+		if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERSTREAM))
+			return new BufferSubData(type, size);
+
+		// BufferData is by far the worst way, only use it if needed
+		return new BufferData(type, size);
+	}
+
+	// Prefer the syncing buffers over the orphaning one
+	if (g_ogl_config.bSupportsGLSync)
+	{
+		// pinned memory is much faster than buffer storage on AMD cards
+		if (g_ogl_config.bSupportsGLPinnedMemory &&
+			!(DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY) && type == GL_ELEMENT_ARRAY_BUFFER))
+			return new PinnedMemory(type, size);
+
+		// buffer storage works well in most situations
+		if (g_ogl_config.bSupportsGLBufferStorage &&
+			!(DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERSTORAGE) && type == GL_ARRAY_BUFFER) &&
+			!(DriverDetails::HasBug(DriverDetails::BUG_INTELBROKENBUFFERSTORAGE) && type == GL_ELEMENT_ARRAY_BUFFER))
+			return new BufferStorage(type, size);
+
+		// don't fall back to MapAnd* for Nvidia drivers
+		if (DriverDetails::HasBug(DriverDetails::BUG_BROKENUNSYNCMAPPING))
+			return new BufferSubData(type, size);
+
+		// mapping fallback
+		if (g_ogl_config.bSupportsGLSync)
+			return new MapAndSync(type, size);
+	}
+
+	// default fallback, should work everywhere, but isn't the best way to do this job
+	return new MapAndOrphan(type, size);
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h
new file mode 100644
index 0000000000..2abb71c00e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <utility>
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace OGL
+{
+
+class StreamBuffer
+{
+
+public:
+	static StreamBuffer* Create(u32 type, u32 size);
+	virtual ~StreamBuffer();
+
+	/* This mapping function will return a pair of:
+	 * - the pointer to the mapped buffer
+	 * - the offset into the real GPU buffer (always multiple of stride)
+	 * On mapping, the maximum of size for allocation has to be set.
+	 * The size really pushed into this fifo only has to be known on Unmapping.
+	 * Mapping invalidates the current buffer content,
+	 * so it isn't allowed to access the old content any more.
+	 */
+	virtual std::pair<u8*, u32> Map(u32 size) = 0;
+	virtual void Unmap(u32 used_size) = 0;
+
+	inline std::pair<u8*, u32> Map(u32 size, u32 stride)
+	{
+		u32 padding = m_iterator % stride;
+		if (padding)
+		{
+			m_iterator += stride - padding;
+		}
+		return Map(size);
+	}
+
+	const u32 m_buffer;
+
+protected:
+	StreamBuffer(u32 type, u32 size);
+	void CreateFences();
+	void DeleteFences();
+	void AllocMemory(u32 size);
+
+	const u32 m_buffertype;
+	const u32 m_size;
+
+	u32 m_iterator;
+	u32 m_used_iterator;
+	u32 m_free_iterator;
+
+private:
+	static const int SYNC_POINTS = 16;
+	inline int SLOT(u32 x) const { return x >> m_bit_per_slot; }
+	const int m_bit_per_slot;
+
+	GLsync fences[SYNC_POINTS];
+};
+
+}
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp
new file mode 100644
index 0000000000..0256b303e7
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp
@@ -0,0 +1,521 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <fstream>
+#include <vector>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/Memmap.h"
+
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoBackends/OGL/StreamBuffer.h"
+#include "VideoBackends/OGL/TextureCache.h"
+#include "VideoBackends/OGL/TextureConverter.h"
+
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/HiresTextures.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace OGL
+{
+
+static SHADER s_ColorMatrixProgram;
+static SHADER s_DepthMatrixProgram;
+static GLuint s_ColorMatrixUniform;
+static GLuint s_DepthMatrixUniform;
+static GLuint s_ColorCopyPositionUniform;
+static GLuint s_DepthCopyPositionUniform;
+static u32 s_ColorCbufid;
+static u32 s_DepthCbufid;
+
+static u32 s_Textures[8];
+static u32 s_ActiveTexture;
+
+static SHADER s_palette_pixel_shader[3];
+static StreamBuffer* s_palette_stream_buffer = nullptr;
+static GLuint s_palette_resolv_texture;
+static GLuint s_palette_buffer_offset_uniform[3];
+static GLuint s_palette_multiplier_uniform[3];
+static GLuint s_palette_copy_position_uniform[3];
+
+bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level)
+{
+	if (GLInterface->GetMode() != GLInterfaceMode::MODE_OPENGL)
+		return false;
+	int width = std::max(virtual_width >> level, 1);
+	int height = std::max(virtual_height >> level, 1);
+	std::vector<u8> data(width * height * 4);
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(textarget, tex);
+	glGetTexImage(textarget, level, GL_RGBA, GL_UNSIGNED_BYTE, data.data());
+	TextureCache::SetStage();
+
+	return TextureToPng(data.data(), width * 4, filename, width, height, true);
+}
+
+TextureCache::TCacheEntry::~TCacheEntry()
+{
+	if (texture)
+	{
+		for (auto& gtex : s_Textures)
+			if (gtex == texture)
+				gtex = 0;
+		glDeleteTextures(1, &texture);
+		texture = 0;
+	}
+
+	if (framebuffer)
+	{
+		glDeleteFramebuffers(1, &framebuffer);
+		framebuffer = 0;
+	}
+}
+
+TextureCache::TCacheEntry::TCacheEntry(const TCacheEntryConfig& _config)
+: TCacheEntryBase(_config)
+{
+	glGenTextures(1, &texture);
+
+	framebuffer = 0;
+}
+
+void TextureCache::TCacheEntry::Bind(unsigned int stage)
+{
+	if (s_Textures[stage] != texture)
+	{
+		if (s_ActiveTexture != stage)
+		{
+			glActiveTexture(GL_TEXTURE0 + stage);
+			s_ActiveTexture = stage;
+		}
+
+		glBindTexture(GL_TEXTURE_2D_ARRAY, texture);
+		s_Textures[stage] = texture;
+	}
+}
+
+bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int level)
+{
+	return SaveTexture(filename, GL_TEXTURE_2D_ARRAY, texture, config.width, config.height, level);
+}
+
+TextureCache::TCacheEntryBase* TextureCache::CreateTexture(const TCacheEntryConfig& config)
+{
+	TCacheEntry* entry = new TCacheEntry(config);
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, entry->texture);
+
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, config.levels - 1);
+
+	if (config.rendertarget)
+	{
+		for (u32 level = 0; level <= config.levels; level++)
+		{
+			glTexImage3D(GL_TEXTURE_2D_ARRAY, level, GL_RGBA, config.width, config.height, config.layers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+		}
+		glGenFramebuffers(1, &entry->framebuffer);
+		FramebufferManager::SetFramebuffer(entry->framebuffer);
+		FramebufferManager::FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_ARRAY, entry->texture, 0);
+	}
+
+	TextureCache::SetStage();
+	return entry;
+}
+
+void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
+	unsigned int expanded_width, unsigned int level)
+{
+	if (level >= config.levels)
+		PanicAlert("Texture only has %d levels, can't update level %d", config.levels, level);
+	if (width != std::max(1u, config.width >> level) || height != std::max(1u, config.height >> level))
+		PanicAlert("size of level %d must be %dx%d, but %dx%d requested",
+		           level, std::max(1u, config.width >> level), std::max(1u, config.height >> level), width, height);
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, texture);
+
+	if (expanded_width != width)
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, expanded_width);
+
+	glTexImage3D(GL_TEXTURE_2D_ARRAY, level, GL_RGBA, width, height, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
+
+	if (expanded_width != width)
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+	TextureCache::SetStage();
+}
+
+void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
+	PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+	bool isIntensity, bool scaleByHalf, unsigned int cbufid,
+	const float *colmat)
+{
+	g_renderer->ResetAPIState(); // reset any game specific settings
+
+	// Make sure to resolve anything we need to read from.
+	const GLuint read_texture = (srcFormat == PEControl::Z24) ?
+		FramebufferManager::ResolveAndGetDepthTarget(srcRect) :
+		FramebufferManager::ResolveAndGetRenderTarget(srcRect);
+
+	FramebufferManager::SetFramebuffer(framebuffer);
+
+	OpenGL_BindAttributelessVAO();
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, read_texture);
+	if (scaleByHalf)
+		g_sampler_cache->BindLinearSampler(9);
+	else
+		g_sampler_cache->BindNearestSampler(9);
+
+	glViewport(0, 0, config.width, config.height);
+
+	GLuint uniform_location;
+	if (srcFormat == PEControl::Z24)
+	{
+		s_DepthMatrixProgram.Bind();
+		if (s_DepthCbufid != cbufid)
+			glUniform4fv(s_DepthMatrixUniform, 5, colmat);
+		s_DepthCbufid = cbufid;
+		uniform_location = s_DepthCopyPositionUniform;
+	}
+	else
+	{
+		s_ColorMatrixProgram.Bind();
+		if (s_ColorCbufid != cbufid)
+			glUniform4fv(s_ColorMatrixUniform, 7, colmat);
+		s_ColorCbufid = cbufid;
+		uniform_location = s_ColorCopyPositionUniform;
+	}
+
+	TargetRectangle R = g_renderer->ConvertEFBRectangle(srcRect);
+	glUniform4f(uniform_location, static_cast<float>(R.left), static_cast<float>(R.top),
+		static_cast<float>(R.right), static_cast<float>(R.bottom));
+
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	if (!g_ActiveConfig.bSkipEFBCopyToRam)
+	{
+		int encoded_size = TextureConverter::EncodeToRamFromTexture(
+			dstAddr,
+			read_texture,
+			srcFormat == PEControl::Z24,
+			isIntensity,
+			dstFormat,
+			scaleByHalf,
+			srcRect);
+
+		u8* dst = Memory::GetPointer(dstAddr);
+		u64 const new_hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples);
+
+		size_in_bytes = (u32)encoded_size;
+
+		TextureCache::MakeRangeDynamic(dstAddr, encoded_size);
+
+		hash = new_hash;
+	}
+
+	FramebufferManager::SetFramebuffer(0);
+
+	g_renderer->RestoreAPIState();
+}
+
+TextureCache::TextureCache()
+{
+	CompileShaders();
+
+	s_ActiveTexture = -1;
+	for (auto& gtex : s_Textures)
+		gtex = -1;
+
+	if (g_ActiveConfig.backend_info.bSupportsPaletteConversion)
+	{
+		s_palette_stream_buffer = StreamBuffer::Create(GL_TEXTURE_BUFFER, 1024*1024);
+		glGenTextures(1, &s_palette_resolv_texture);
+		glBindTexture(GL_TEXTURE_BUFFER, s_palette_resolv_texture);
+		glTexBuffer(GL_TEXTURE_BUFFER, GL_R16UI, s_palette_stream_buffer->m_buffer);
+	}
+}
+
+
+TextureCache::~TextureCache()
+{
+	DeleteShaders();
+
+	if (g_ActiveConfig.backend_info.bSupportsPaletteConversion)
+	{
+		delete s_palette_stream_buffer;
+		s_palette_stream_buffer = nullptr;
+		glDeleteTextures(1, &s_palette_resolv_texture);
+	}
+}
+
+void TextureCache::DisableStage(unsigned int stage)
+{
+}
+
+void TextureCache::SetStage()
+{
+	// -1 is the initial value as we don't know which texture should be bound
+	if (s_ActiveTexture != (u32)-1)
+		glActiveTexture(GL_TEXTURE0 + s_ActiveTexture);
+}
+
+void TextureCache::CompileShaders()
+{
+	const char *pColorMatrixProg =
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"uniform vec4 colmat[7];\n"
+		"in vec3 f_uv0;\n"
+		"out vec4 ocol0;\n"
+		"\n"
+		"void main(){\n"
+		"	vec4 texcol = texture(samp9, f_uv0);\n"
+		"	texcol = round(texcol * colmat[5]) * colmat[6];\n"
+		"	ocol0 = texcol * mat4(colmat[0], colmat[1], colmat[2], colmat[3]) + colmat[4];\n"
+		"}\n";
+
+	const char *pDepthMatrixProg =
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"uniform vec4 colmat[5];\n"
+		"in vec3 f_uv0;\n"
+		"out vec4 ocol0;\n"
+		"\n"
+		"void main(){\n"
+		"	vec4 texcol = texture(samp9, vec3(f_uv0.xy, %s));\n"
+		"	int depth = clamp(int(texcol.x * 16777216.0), 0, 0xFFFFFF);\n"
+
+		// Convert to Z24 format
+		"	ivec4 workspace;\n"
+		"	workspace.r = (depth >> 16) & 255;\n"
+		"	workspace.g = (depth >> 8) & 255;\n"
+		"	workspace.b = depth & 255;\n"
+
+		// Convert to Z4 format
+		"	workspace.a = (depth >> 16) & 0xF0;\n"
+
+		// Normalize components to [0.0..1.0]
+		"	texcol = vec4(workspace) / 255.0;\n"
+
+		"	ocol0 = texcol * mat4(colmat[0], colmat[1], colmat[2], colmat[3]) + colmat[4];\n"
+		"}\n";
+
+	const char *VProgram =
+		"out vec3 %s_uv0;\n"
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"uniform vec4 copy_position;\n" // left, top, right, bottom
+		"void main()\n"
+		"{\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	%s_uv0 = vec3(mix(copy_position.xy, copy_position.zw, rawpos) / vec2(textureSize(samp9, 0).xy), 0.0);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+		"}\n";
+
+	const char *GProgram = g_ActiveConfig.iStereoMode > 0 ?
+		"layout(triangles) in;\n"
+		"layout(triangle_strip, max_vertices = 6) out;\n"
+		"in vec3 v_uv0[3];\n"
+		"out vec3 f_uv0;\n"
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"void main()\n"
+		"{\n"
+		"	int layers = textureSize(samp9, 0).z;\n"
+		"	for (int layer = 0; layer < layers; ++layer) {\n"
+		"		for (int i = 0; i < 3; ++i) {\n"
+		"			f_uv0 = vec3(v_uv0[i].xy, layer);\n"
+		"			gl_Position = gl_in[i].gl_Position;\n"
+		"			gl_Layer = layer;\n"
+		"			EmitVertex();\n"
+		"		}\n"
+		"		EndPrimitive();\n"
+		"	}\n"
+		"}\n" : nullptr;
+
+	const char* prefix = (GProgram == nullptr) ? "f" : "v";
+	const char* depth_layer = (g_ActiveConfig.bStereoEFBMonoDepth) ? "0.0" : "f_uv0.z";
+
+	ProgramShaderCache::CompileShader(s_ColorMatrixProgram, StringFromFormat(VProgram, prefix, prefix).c_str(), pColorMatrixProg, GProgram);
+	ProgramShaderCache::CompileShader(s_DepthMatrixProgram, StringFromFormat(VProgram, prefix, prefix).c_str(), StringFromFormat(pDepthMatrixProg, depth_layer).c_str(), GProgram);
+
+	s_ColorMatrixUniform = glGetUniformLocation(s_ColorMatrixProgram.glprogid, "colmat");
+	s_DepthMatrixUniform = glGetUniformLocation(s_DepthMatrixProgram.glprogid, "colmat");
+	s_ColorCbufid = -1;
+	s_DepthCbufid = -1;
+
+	s_ColorCopyPositionUniform = glGetUniformLocation(s_ColorMatrixProgram.glprogid, "copy_position");
+	s_DepthCopyPositionUniform = glGetUniformLocation(s_DepthMatrixProgram.glprogid, "copy_position");
+
+	std::string palette_shader =
+		R"GLSL(
+		uniform int texture_buffer_offset;
+		uniform float multiplier;
+		SAMPLER_BINDING(9) uniform sampler2DArray samp9;
+		SAMPLER_BINDING(10) uniform usamplerBuffer samp10;
+
+		in vec3 f_uv0;
+		out vec4 ocol0;
+
+		int Convert3To8(int v)
+		{
+			// Swizzle bits: 00000123 -> 12312312
+			return (v << 5) | (v << 2) | (v >> 1);
+		}
+
+		int Convert4To8(int v)
+		{
+			// Swizzle bits: 00001234 -> 12341234
+			return (v << 4) | v;
+		}
+
+		int Convert5To8(int v)
+		{
+			// Swizzle bits: 00012345 -> 12345123
+			return (v << 3) | (v >> 2);
+		}
+
+		int Convert6To8(int v)
+		{
+			// Swizzle bits: 00123456 -> 12345612
+			return (v << 2) | (v >> 4);
+		}
+
+		float4 DecodePixel_RGB5A3(int val)
+		{
+			int r,g,b,a;
+			if ((val&0x8000) > 0)
+			{
+				r=Convert5To8((val>>10) & 0x1f);
+				g=Convert5To8((val>>5 ) & 0x1f);
+				b=Convert5To8((val    ) & 0x1f);
+				a=0xFF;
+			}
+			else
+			{
+				a=Convert3To8((val>>12) & 0x7);
+				r=Convert4To8((val>>8 ) & 0xf);
+				g=Convert4To8((val>>4 ) & 0xf);
+				b=Convert4To8((val    ) & 0xf);
+			}
+			return float4(r, g, b, a) / 255.0;
+		}
+
+		float4 DecodePixel_RGB565(int val)
+		{
+			int r, g, b, a;
+			r = Convert5To8((val >> 11) & 0x1f);
+			g = Convert6To8((val >> 5) & 0x3f);
+			b = Convert5To8((val) & 0x1f);
+			a = 0xFF;
+			return float4(r, g, b, a) / 255.0;
+		}
+
+		float4 DecodePixel_IA8(int val)
+		{
+			int i = val & 0xFF;
+			int a = val >> 8;
+			return float4(i, i, i, a) / 255.0;
+		}
+
+		void main()
+		{
+			int src = int(round(texture(samp9, f_uv0).r * multiplier));
+			src = int(texelFetch(samp10, src + texture_buffer_offset).r);
+			src = ((src << 8) & 0xFF00) | (src >> 8);
+			ocol0 = DECODE(src);
+		}
+		)GLSL";
+
+	if (g_ActiveConfig.backend_info.bSupportsPaletteConversion)
+	{
+		ProgramShaderCache::CompileShader(
+			s_palette_pixel_shader[GX_TL_IA8],
+			StringFromFormat(VProgram, prefix, prefix).c_str(),
+			("#define DECODE DecodePixel_IA8" + palette_shader).c_str(),
+			GProgram);
+		s_palette_buffer_offset_uniform[GX_TL_IA8] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_IA8].glprogid, "texture_buffer_offset");
+		s_palette_multiplier_uniform[GX_TL_IA8] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_IA8].glprogid, "multiplier");
+		s_palette_copy_position_uniform[GX_TL_IA8] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_IA8].glprogid, "copy_position");
+
+		ProgramShaderCache::CompileShader(
+			s_palette_pixel_shader[GX_TL_RGB565],
+			StringFromFormat(VProgram, prefix, prefix).c_str(),
+			("#define DECODE DecodePixel_RGB565" + palette_shader).c_str(),
+			GProgram);
+		s_palette_buffer_offset_uniform[GX_TL_RGB565] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB565].glprogid, "texture_buffer_offset");
+		s_palette_multiplier_uniform[GX_TL_RGB565] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB565].glprogid, "multiplier");
+		s_palette_copy_position_uniform[GX_TL_RGB565] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB565].glprogid, "copy_position");
+
+		ProgramShaderCache::CompileShader(
+			s_palette_pixel_shader[GX_TL_RGB5A3],
+			StringFromFormat(VProgram, prefix, prefix).c_str(),
+			("#define DECODE DecodePixel_RGB5A3" + palette_shader).c_str(),
+			GProgram);
+		s_palette_buffer_offset_uniform[GX_TL_RGB5A3] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB5A3].glprogid, "texture_buffer_offset");
+		s_palette_multiplier_uniform[GX_TL_RGB5A3] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB5A3].glprogid, "multiplier");
+		s_palette_copy_position_uniform[GX_TL_RGB5A3] = glGetUniformLocation(s_palette_pixel_shader[GX_TL_RGB5A3].glprogid, "copy_position");
+	}
+}
+
+void TextureCache::DeleteShaders()
+{
+	s_ColorMatrixProgram.Destroy();
+	s_DepthMatrixProgram.Destroy();
+
+	if (g_ActiveConfig.backend_info.bSupportsPaletteConversion)
+		for (auto& shader : s_palette_pixel_shader)
+			shader.Destroy();
+}
+
+void TextureCache::ConvertTexture(TCacheEntryBase* _entry, TCacheEntryBase* _unconverted, void* palette, TlutFormat format)
+{
+	if (!g_ActiveConfig.backend_info.bSupportsPaletteConversion)
+		return;
+
+	g_renderer->ResetAPIState();
+
+	TCacheEntry* entry = (TCacheEntry*) _entry;
+	TCacheEntry* unconverted = (TCacheEntry*) _unconverted;
+
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, unconverted->texture);
+	g_sampler_cache->BindNearestSampler(9);
+
+	FramebufferManager::SetFramebuffer(entry->framebuffer);
+	glViewport(0, 0, entry->config.width, entry->config.height);
+	s_palette_pixel_shader[format].Bind();
+
+	int size = unconverted->format == 0 ? 32 : 512;
+	auto buffer = s_palette_stream_buffer->Map(size);
+	memcpy(buffer.first, palette, size);
+	s_palette_stream_buffer->Unmap(size);
+	glUniform1i(s_palette_buffer_offset_uniform[format], buffer.second / 2);
+	glUniform1f(s_palette_multiplier_uniform[format], unconverted->format == 0 ? 15.0f : 255.0f);
+	glUniform4f(s_palette_copy_position_uniform[format], 0.0f, 0.0f, (float)unconverted->config.width, (float)unconverted->config.height);
+
+	glActiveTexture(GL_TEXTURE10);
+	glBindTexture(GL_TEXTURE_BUFFER, s_palette_resolv_texture);
+	g_sampler_cache->BindNearestSampler(10);
+
+	OpenGL_BindAttributelessVAO();
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	FramebufferManager::SetFramebuffer(0);
+	g_renderer->RestoreAPIState();
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h
new file mode 100644
index 0000000000..d957422799
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/TextureCache.h
@@ -0,0 +1,59 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace OGL
+{
+
+class TextureCache : public ::TextureCache
+{
+public:
+	TextureCache();
+	static void DisableStage(unsigned int stage);
+	static void SetStage();
+
+private:
+	struct TCacheEntry : TCacheEntryBase
+	{
+		GLuint texture;
+		GLuint framebuffer;
+
+		//TexMode0 mode; // current filter and clamp modes that texture is set to
+		//TexMode1 mode1; // current filter and clamp modes that texture is set to
+
+		TCacheEntry(const TCacheEntryConfig& config);
+		~TCacheEntry();
+
+		void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int level) override;
+
+		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
+			PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
+			const float *colmat) override;
+
+		void Bind(unsigned int stage) override;
+		bool Save(const std::string& filename, unsigned int level) override;
+	};
+
+	~TextureCache();
+
+	TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) override;
+	void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) override;
+
+	void CompileShaders() override;
+	void DeleteShaders() override;
+};
+
+bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level);
+
+}
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
new file mode 100644
index 0000000000..c696ccf687
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
@@ -0,0 +1,389 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Fast image conversion using OpenGL shaders.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/HW/Memmap.h"
+
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoBackends/OGL/TextureCache.h"
+#include "VideoBackends/OGL/TextureConverter.h"
+
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/TextureConversionShader.h"
+#include "VideoCommon/VideoConfig.h"
+
+
+namespace OGL
+{
+
+namespace TextureConverter
+{
+
+using OGL::TextureCache;
+
+static GLuint s_texConvFrameBuffer[2] = {0,0};
+static GLuint s_srcTexture = 0; // for decoding from RAM
+static GLuint s_dstTexture = 0; // for encoding to RAM
+
+const int renderBufferWidth = EFB_WIDTH * 4;
+const int renderBufferHeight = 1024;
+
+static SHADER s_rgbToYuyvProgram;
+static int s_rgbToYuyvUniform_loc;
+
+static SHADER s_yuyvToRgbProgram;
+
+// Not all slots are taken - but who cares.
+const u32 NUM_ENCODING_PROGRAMS = 64;
+static SHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS];
+static int s_encodingUniforms[NUM_ENCODING_PROGRAMS];
+
+static GLuint s_PBO = 0; // for readback with different strides
+
+static void CreatePrograms()
+{
+	/* TODO: Accuracy Improvements
+	 *
+	 * This shader doesn't really match what the GameCube does internally in the
+	 * copy pipeline.
+	 *  1. It uses OpenGL's built in filtering when yscaling, someone could work
+	 *     out how the copypipeline does it's filtering and implement it correctly
+	 *     in this shader.
+	 *  2. Deflickering isn't implemented, a futher filtering over 3 lines.
+	 *     Isn't really needed on non-interlaced monitors (and would lower quality;
+	 *     But hey, accuracy!)
+	 *  3. Flipper's YUYV conversion implements a 3 pixel horizontal blur on the
+	 *     UV channels, centering the U channel on the Left pixel and the V channel
+	 *     on the Right pixel.
+	 *     The current implementation Centers both UV channels at the same place
+	 *     inbetween the two Pixels, and only blurs over these two pixels.
+	 */
+	// Output is BGRA because that is slightly faster than RGBA.
+	const char *VProgramRgbToYuyv =
+		"out vec2 uv0;\n"
+		"uniform vec4 copy_position;\n" // left, top, right, bottom
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"void main()\n"
+		"{\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+		"	uv0 = mix(copy_position.xy, copy_position.zw, rawpos) / vec2(textureSize(samp9, 0).xy);\n"
+		"}\n";
+	const char *FProgramRgbToYuyv =
+		"SAMPLER_BINDING(9) uniform sampler2DArray samp9;\n"
+		"in vec2 uv0;\n"
+		"out vec4 ocol0;\n"
+		"void main()\n"
+		"{\n"
+		"	vec3 c0 = texture(samp9, vec3(uv0 - dFdx(uv0) * 0.25, 0.0)).rgb;\n"
+		"	vec3 c1 = texture(samp9, vec3(uv0 + dFdx(uv0) * 0.25, 0.0)).rgb;\n"
+		"	vec3 c01 = (c0 + c1) * 0.5;\n"
+		"	vec3 y_const = vec3(0.257,0.504,0.098);\n"
+		"	vec3 u_const = vec3(-0.148,-0.291,0.439);\n"
+		"	vec3 v_const = vec3(0.439,-0.368,-0.071);\n"
+		"	vec4 const3 = vec4(0.0625,0.5,0.0625,0.5);\n"
+		"	ocol0 = vec4(dot(c1,y_const),dot(c01,u_const),dot(c0,y_const),dot(c01, v_const)) + const3;\n"
+		"}\n";
+	ProgramShaderCache::CompileShader(s_rgbToYuyvProgram, VProgramRgbToYuyv, FProgramRgbToYuyv);
+	s_rgbToYuyvUniform_loc = glGetUniformLocation(s_rgbToYuyvProgram.glprogid, "copy_position");
+
+	/* TODO: Accuracy Improvements
+	 *
+	 * The YVYU to RGB conversion here matches the RGB to YUYV done above, but
+	 * if a game modifies or adds images to the XFB then it should be using the
+	 * same algorithm as the flipper, and could result in slight color inaccuracies
+	 * when run back through this shader.
+	 */
+	const char *VProgramYuyvToRgb =
+		"void main()\n"
+		"{\n"
+		"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+		"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+		"}\n";
+	const char *FProgramYuyvToRgb =
+		"SAMPLER_BINDING(9) uniform sampler2D samp9;\n"
+		"in vec2 uv0;\n"
+		"out vec4 ocol0;\n"
+		"void main()\n"
+		"{\n"
+		"	ivec2 uv = ivec2(gl_FragCoord.xy);\n"
+			// We switch top/bottom here. TODO: move this to screen blit.
+		"	ivec2 ts = textureSize(samp9, 0);\n"
+		"	vec4 c0 = texelFetch(samp9, ivec2(uv.x>>1, ts.y-uv.y-1), 0);\n"
+		"	float y = mix(c0.b, c0.r, (uv.x & 1) == 1);\n"
+		"	float yComp = 1.164 * (y - 0.0625);\n"
+		"	float uComp = c0.g - 0.5;\n"
+		"	float vComp = c0.a - 0.5;\n"
+		"	ocol0 = vec4(yComp + (1.596 * vComp),\n"
+		"		yComp - (0.813 * vComp) - (0.391 * uComp),\n"
+		"		yComp + (2.018 * uComp),\n"
+		"		1.0);\n"
+		"}\n";
+	ProgramShaderCache::CompileShader(s_yuyvToRgbProgram, VProgramYuyvToRgb, FProgramYuyvToRgb);
+}
+
+static SHADER &GetOrCreateEncodingShader(u32 format)
+{
+	if (format >= NUM_ENCODING_PROGRAMS)
+	{
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		return s_encodingPrograms[0];
+	}
+
+	if (s_encodingPrograms[format].glprogid == 0)
+	{
+		const char* shader = TextureConversionShader::GenerateEncodingShader(format, API_OPENGL);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+		if (g_ActiveConfig.iLog & CONF_SAVESHADERS && shader)
+		{
+			static int counter = 0;
+			std::string filename = StringFromFormat("%senc_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+
+			SaveData(filename, shader);
+		}
+#endif
+
+		const char *VProgram =
+			"void main()\n"
+			"{\n"
+			"	vec2 rawpos = vec2(gl_VertexID&1, gl_VertexID&2);\n"
+			"	gl_Position = vec4(rawpos*2.0-1.0, 0.0, 1.0);\n"
+			"}\n";
+
+		ProgramShaderCache::CompileShader(s_encodingPrograms[format], VProgram, shader);
+
+		s_encodingUniforms[format] = glGetUniformLocation(s_encodingPrograms[format].glprogid, "position");
+	}
+	return s_encodingPrograms[format];
+}
+
+void Init()
+{
+	glGenFramebuffers(2, s_texConvFrameBuffer);
+
+	glActiveTexture(GL_TEXTURE9);
+	glGenTextures(1, &s_srcTexture);
+	glBindTexture(GL_TEXTURE_2D, s_srcTexture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+
+	glGenTextures(1, &s_dstTexture);
+	glBindTexture(GL_TEXTURE_2D, s_dstTexture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, renderBufferWidth, renderBufferHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+
+	FramebufferManager::SetFramebuffer(s_texConvFrameBuffer[0]);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, s_dstTexture, 0);
+	FramebufferManager::SetFramebuffer(0);
+
+	glGenBuffers(1, &s_PBO);
+
+	CreatePrograms();
+}
+
+void Shutdown()
+{
+	glDeleteTextures(1, &s_srcTexture);
+	glDeleteTextures(1, &s_dstTexture);
+	glDeleteBuffers(1, &s_PBO);
+	glDeleteFramebuffers(2, s_texConvFrameBuffer);
+
+	s_rgbToYuyvProgram.Destroy();
+	s_yuyvToRgbProgram.Destroy();
+
+	for (auto& program : s_encodingPrograms)
+		program.Destroy();
+
+	s_srcTexture = 0;
+	s_dstTexture = 0;
+	s_PBO = 0;
+	s_texConvFrameBuffer[0] = 0;
+	s_texConvFrameBuffer[1] = 0;
+}
+
+static void EncodeToRamUsingShader(GLuint srcTexture,
+						u8* destAddr, int dstWidth, int dstHeight, int readStride,
+						bool linearFilter)
+{
+
+
+	// switch to texture converter frame buffer
+	// attach render buffer as color destination
+	FramebufferManager::SetFramebuffer(s_texConvFrameBuffer[0]);
+
+	OpenGL_BindAttributelessVAO();
+
+	// set source texture
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D_ARRAY, srcTexture);
+
+	if (linearFilter)
+		g_sampler_cache->BindLinearSampler(9);
+	else
+		g_sampler_cache->BindNearestSampler(9);
+
+	glViewport(0, 0, (GLsizei)dstWidth, (GLsizei)dstHeight);
+
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	// .. and then read back the results.
+	// TODO: make this less slow.
+
+	int writeStride = bpmem.copyMipMapStrideChannels * 32;
+	int dstSize = dstWidth*dstHeight*4;
+	int readHeight = readStride / dstWidth / 4; // 4 bytes per pixel
+	int readLoops = dstHeight / readHeight;
+
+	if (writeStride != readStride && readLoops > 1)
+	{
+		// writing to a texture of a different size
+		// also copy more then one block line, so the different strides matters
+		// copy into one pbo first, map this buffer, and then memcpy into GC memory
+		// in this way, we only have one vram->ram transfer, but maybe a bigger
+		// CPU overhead because of the pbo
+		glBindBuffer(GL_PIXEL_PACK_BUFFER, s_PBO);
+		glBufferData(GL_PIXEL_PACK_BUFFER, dstSize, nullptr, GL_STREAM_READ);
+		glReadPixels(0, 0, (GLsizei)dstWidth, (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
+		u8* pbo = (u8*)glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, dstSize, GL_MAP_READ_BIT);
+
+		for (int i = 0; i < readLoops; i++)
+		{
+			memcpy(destAddr, pbo, readStride);
+			pbo += readStride;
+			destAddr += writeStride;
+		}
+
+		glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+		glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+	}
+	else
+	{
+		glReadPixels(0, 0, (GLsizei)dstWidth, (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE, destAddr);
+	}
+}
+
+int EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source)
+{
+	u32 format = copyfmt;
+
+	if (bFromZBuffer)
+	{
+		format |= _GX_TF_ZTF;
+		if (copyfmt == 11)
+			format = GX_TF_Z16;
+		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
+			format |= _GX_TF_CTF;
+	}
+	else
+	{
+		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
+			format |= _GX_TF_CTF;
+	}
+
+	SHADER& texconv_shader = GetOrCreateEncodingShader(format);
+
+	u8 *dest_ptr = Memory::GetPointer(address);
+
+	int width = (source.right - source.left) >> bScaleByHalf;
+	int height = (source.bottom - source.top) >> bScaleByHalf;
+
+	int size_in_bytes = TexDecoder_GetTextureSizeInBytes(width, height, format);
+
+	u16 blkW = TexDecoder_GetBlockWidthInTexels(format) - 1;
+	u16 blkH = TexDecoder_GetBlockHeightInTexels(format) - 1;
+
+	// only copy on cache line boundaries
+	// extra pixels are copied but not displayed in the resulting texture
+	s32 expandedWidth = (width + blkW) & (~blkW);
+	s32 expandedHeight = (height + blkH) & (~blkH);
+
+	texconv_shader.Bind();
+	glUniform4i(s_encodingUniforms[format],
+		source.left, source.top,
+		expandedWidth, bScaleByHalf ? 2 : 1);
+
+	unsigned int numBlocksX = expandedWidth / TexDecoder_GetBlockWidthInTexels(format);
+	unsigned int numBlocksY = expandedHeight / TexDecoder_GetBlockHeightInTexels(format);
+	unsigned int cacheLinesPerRow;
+	if ((format & 0x0f) == 6)
+		cacheLinesPerRow = numBlocksX * 2;
+	else
+		cacheLinesPerRow = numBlocksX;
+
+	EncodeToRamUsingShader(source_texture,
+		dest_ptr, cacheLinesPerRow * 8, numBlocksY, cacheLinesPerRow * 32,
+		bScaleByHalf > 0 && !bFromZBuffer);
+	return size_in_bytes; // TODO: D3D11 is calculating this value differently!
+
+}
+
+void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight)
+{
+	g_renderer->ResetAPIState();
+
+	s_rgbToYuyvProgram.Bind();
+
+	glUniform4f(s_rgbToYuyvUniform_loc, static_cast<float>(sourceRc.left), static_cast<float>(sourceRc.top),
+		static_cast<float>(sourceRc.right), static_cast<float>(sourceRc.bottom));
+
+	// We enable linear filtering, because the GameCube does filtering in the vertical direction when
+	// yscale is enabled.
+	// Otherwise we get jaggies when a game uses yscaling (most PAL games)
+	EncodeToRamUsingShader(srcTexture, destAddr, dstWidth / 2, dstHeight, dstWidth*dstHeight*2, true);
+	FramebufferManager::SetFramebuffer(0);
+	TextureCache::DisableStage(0);
+	g_renderer->RestoreAPIState();
+}
+
+
+// Should be scale free.
+void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTexture)
+{
+	u8* srcAddr = Memory::GetPointer(xfbAddr);
+	if (!srcAddr)
+	{
+		WARN_LOG(VIDEO, "Tried to decode from invalid memory address");
+		return;
+	}
+
+	g_renderer->ResetAPIState(); // reset any game specific settings
+
+	OpenGL_BindAttributelessVAO();
+
+	// switch to texture converter frame buffer
+	// attach destTexture as color destination
+	FramebufferManager::SetFramebuffer(s_texConvFrameBuffer[1]);
+	FramebufferManager::FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_ARRAY, destTexture, 0);
+
+	// activate source texture
+	// set srcAddr as data for source texture
+	glActiveTexture(GL_TEXTURE9);
+	glBindTexture(GL_TEXTURE_2D, s_srcTexture);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, srcWidth / 2, srcHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, srcAddr);
+	g_sampler_cache->BindNearestSampler(9);
+
+	glViewport(0, 0, srcWidth, srcHeight);
+	s_yuyvToRgbProgram.Bind();
+
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	FramebufferManager::SetFramebuffer(0);
+
+	g_renderer->RestoreAPIState();
+}
+
+}  // namespace
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.h b/Source/Core/VideoBackends/OGL/TextureConverter.h
new file mode 100644
index 0000000000..e0c6cbd5fb
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace OGL
+{
+
+// Converts textures between formats using shaders
+// TODO: support multiple texture formats
+namespace TextureConverter
+{
+
+void Init();
+void Shutdown();
+
+void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc,
+					 u8* destAddr, int dstWidth, int dstHeight);
+
+void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTexture);
+
+// returns size of the encoded data (in bytes)
+int EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source);
+
+}
+
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp
new file mode 100644
index 0000000000..b203cd3e7d
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp
@@ -0,0 +1,229 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "Common/FileUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+
+#include "VideoBackends/OGL/main.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/StreamBuffer.h"
+#include "VideoBackends/OGL/TextureCache.h"
+#include "VideoBackends/OGL/VertexManager.h"
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace OGL
+{
+//This are the initially requested size for the buffers expressed in bytes
+const u32 MAX_IBUFFER_SIZE =  2*1024*1024;
+const u32 MAX_VBUFFER_SIZE = 32*1024*1024;
+
+static StreamBuffer *s_vertexBuffer;
+static StreamBuffer *s_indexBuffer;
+static size_t s_baseVertex;
+static size_t s_index_offset;
+
+VertexManager::VertexManager()
+	: m_cpu_v_buffer(MAX_VBUFFER_SIZE), m_cpu_i_buffer(MAX_IBUFFER_SIZE)
+{
+	CreateDeviceObjects();
+}
+
+VertexManager::~VertexManager()
+{
+	DestroyDeviceObjects();
+}
+
+void VertexManager::CreateDeviceObjects()
+{
+	s_vertexBuffer = StreamBuffer::Create(GL_ARRAY_BUFFER, MAX_VBUFFER_SIZE);
+	m_vertex_buffers = s_vertexBuffer->m_buffer;
+
+	s_indexBuffer = StreamBuffer::Create(GL_ELEMENT_ARRAY_BUFFER, MAX_IBUFFER_SIZE);
+	m_index_buffers = s_indexBuffer->m_buffer;
+
+	m_last_vao = 0;
+}
+
+void VertexManager::DestroyDeviceObjects()
+{
+	delete s_vertexBuffer;
+	delete s_indexBuffer;
+}
+
+void VertexManager::PrepareDrawBuffers(u32 stride)
+{
+	u32 vertex_data_size = IndexGenerator::GetNumVerts() * stride;
+	u32 index_data_size = IndexGenerator::GetIndexLen() * sizeof(u16);
+
+	s_vertexBuffer->Unmap(vertex_data_size);
+	s_indexBuffer->Unmap(index_data_size);
+
+	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vertex_data_size);
+	ADDSTAT(stats.thisFrame.bytesIndexStreamed, index_data_size);
+}
+
+void VertexManager::ResetBuffer(u32 stride)
+{
+	if (s_cull_all)
+	{
+		// This buffer isn't getting sent to the GPU. Just allocate it on the cpu.
+		s_pCurBufferPointer = s_pBaseBufferPointer = m_cpu_v_buffer.data();
+		s_pEndBufferPointer = s_pBaseBufferPointer + m_cpu_v_buffer.size();
+
+		IndexGenerator::Start((u16*)m_cpu_i_buffer.data());
+	}
+	else
+	{
+		auto buffer = s_vertexBuffer->Map(MAXVBUFFERSIZE, stride);
+		s_pCurBufferPointer = s_pBaseBufferPointer = buffer.first;
+		s_pEndBufferPointer = buffer.first + MAXVBUFFERSIZE;
+		s_baseVertex = buffer.second / stride;
+
+		buffer = s_indexBuffer->Map(MAXIBUFFERSIZE * sizeof(u16));
+		IndexGenerator::Start((u16*)buffer.first);
+		s_index_offset = buffer.second;
+	}
+}
+
+void VertexManager::Draw(u32 stride)
+{
+	u32 index_size = IndexGenerator::GetIndexLen();
+	u32 max_index = IndexGenerator::GetNumVerts();
+	GLenum primitive_mode = 0;
+
+	switch (current_primitive_type)
+	{
+		case PRIMITIVE_POINTS:
+			primitive_mode = GL_POINTS;
+			glDisable(GL_CULL_FACE);
+			break;
+		case PRIMITIVE_LINES:
+			primitive_mode = GL_LINES;
+			glDisable(GL_CULL_FACE);
+			break;
+		case PRIMITIVE_TRIANGLES:
+			primitive_mode = g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? GL_TRIANGLE_STRIP : GL_TRIANGLES;
+			break;
+	}
+
+	if (g_ogl_config.bSupportsGLBaseVertex)
+	{
+		glDrawRangeElementsBaseVertex(primitive_mode, 0, max_index, index_size, GL_UNSIGNED_SHORT, (u8*)nullptr+s_index_offset, (GLint)s_baseVertex);
+	}
+	else
+	{
+		glDrawRangeElements(primitive_mode, 0, max_index, index_size, GL_UNSIGNED_SHORT, (u8*)nullptr+s_index_offset);
+	}
+
+	INCSTAT(stats.thisFrame.numDrawCalls);
+
+	if (current_primitive_type != PRIMITIVE_TRIANGLES)
+		((OGL::Renderer*)g_renderer)->SetGenerationMode();
+}
+
+void VertexManager::vFlush(bool useDstAlpha)
+{
+	GLVertexFormat *nativeVertexFmt = (GLVertexFormat*)VertexLoaderManager::GetCurrentVertexFormat();
+	u32 stride  = nativeVertexFmt->GetVertexStride();
+
+	if (m_last_vao != nativeVertexFmt->VAO)
+	{
+		glBindVertexArray(nativeVertexFmt->VAO);
+		m_last_vao = nativeVertexFmt->VAO;
+	}
+
+	PrepareDrawBuffers(stride);
+
+	// Makes sure we can actually do Dual source blending
+	bool dualSourcePossible = g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
+
+	// If host supports GL_ARB_blend_func_extended, we can do dst alpha in
+	// the same pass as regular rendering.
+	if (useDstAlpha && dualSourcePossible)
+	{
+		ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, nativeVertexFmt->m_components, current_primitive_type);
+	}
+	else
+	{
+		ProgramShaderCache::SetShader(DSTALPHA_NONE, nativeVertexFmt->m_components, current_primitive_type);
+	}
+
+	// upload global constants
+	ProgramShaderCache::UploadConstants();
+
+	// setup the pointers
+	nativeVertexFmt->SetupVertexPointers();
+
+	Draw(stride);
+
+	// run through vertex groups again to set alpha
+	if (useDstAlpha && !dualSourcePossible)
+	{
+		ProgramShaderCache::SetShader(DSTALPHA_ALPHA_PASS, nativeVertexFmt->m_components, current_primitive_type);
+
+		// only update alpha
+		glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
+
+		glDisable(GL_BLEND);
+
+		Draw(stride);
+
+		// restore color mask
+		g_renderer->SetColorMask();
+
+		if (bpmem.blendmode.blendenable || bpmem.blendmode.subtract)
+			glEnable(GL_BLEND);
+	}
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (g_ActiveConfig.iLog & CONF_SAVESHADERS)
+	{
+		// save the shaders
+		ProgramShaderCache::PCacheEntry prog = ProgramShaderCache::GetShaderProgram();
+		std::string filename = StringFromFormat("%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+		std::ofstream fps;
+		OpenFStream(fps, filename, std::ios_base::out);
+		fps << prog.shader.strpprog.c_str();
+
+		filename = StringFromFormat("%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+		std::ofstream fvs;
+		OpenFStream(fvs, filename, std::ios_base::out);
+		fvs << prog.shader.strvprog.c_str();
+	}
+
+	if (g_ActiveConfig.iLog & CONF_SAVETARGETS)
+	{
+		std::string filename = StringFromFormat("%starg%.3d.png", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+		TargetRectangle tr;
+		tr.left = 0;
+		tr.right = Renderer::GetTargetWidth();
+		tr.top = 0;
+		tr.bottom = Renderer::GetTargetHeight();
+		g_renderer->SaveScreenshot(filename, tr);
+	}
+#endif
+	g_Config.iSaveTargetId++;
+
+	ClearEFBCache();
+}
+
+
+}  // namespace
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h
new file mode 100644
index 0000000000..5c9dd0e81e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/VertexManager.h
@@ -0,0 +1,54 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/VertexManagerBase.h"
+
+namespace OGL
+{
+	class GLVertexFormat : public NativeVertexFormat
+	{
+	public:
+		GLVertexFormat();
+		~GLVertexFormat();
+
+		virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
+		virtual void SetupVertexPointers() override;
+
+		GLuint VAO;
+	};
+
+// Handles the OpenGL details of drawing lots of vertices quickly.
+// Other functionality is moving out.
+class VertexManager : public ::VertexManager
+{
+public:
+	VertexManager();
+	~VertexManager();
+	NativeVertexFormat* CreateNativeVertexFormat() override;
+	void CreateDeviceObjects() override;
+	void DestroyDeviceObjects() override;
+
+	// NativeVertexFormat use this
+	GLuint m_vertex_buffers;
+	GLuint m_index_buffers;
+	GLuint m_last_vao;
+protected:
+	virtual void ResetBuffer(u32 stride) override;
+
+private:
+	void Draw(u32 stride);
+	void vFlush(bool useDstAlpha) override;
+	void PrepareDrawBuffers(u32 stride);
+
+	// Alternative buffers in CPU memory for primatives we are going to discard.
+	std::vector<u8> m_cpu_v_buffer;
+	std::vector<u16> m_cpu_i_buffer;
+};
+
+}
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
new file mode 100644
index 0000000000..e42813c3cb
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -0,0 +1,29 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace OGL
+{
+
+class VideoBackend : public VideoBackendHardware
+{
+	bool Initialize(void *) override;
+	void Shutdown() override;
+
+	std::string GetName() const override;
+	std::string GetDisplayName() const override;
+
+	void Video_Prepare() override;
+	void Video_Cleanup() override;
+
+	void ShowConfig(void* parent) override;
+
+	unsigned int PeekMessages() override;
+};
+
+}
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
new file mode 100644
index 0000000000..464064ebac
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -0,0 +1,240 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+
+// OpenGL Backend Documentation
+/*
+
+1.1 Display settings
+
+Internal and fullscreen resolution: Since the only internal resolutions allowed
+are also fullscreen resolution allowed by the system there is only need for one
+resolution setting that applies to both the internal resolution and the
+fullscreen resolution.  - Apparently no, someone else doesn't agree
+
+Todo: Make the internal resolution option apply instantly, currently only the
+native and 2x option applies instantly. To do this we need to be able to change
+the reinitialize FramebufferManager:Init() while a game is running.
+
+1.2 Screenshots
+
+
+The screenshots should be taken from the internal representation of the picture
+regardless of what the current window size is. Since AA and wireframe is
+applied together with the picture resizing this rule is not currently applied
+to AA or wireframe pictures, they are instead taken from whatever the window
+size is.
+
+Todo: Render AA and wireframe to a separate picture used for the screenshot in
+addition to the one for display.
+
+1.3 AA
+
+Make AA apply instantly during gameplay if possible
+
+*/
+
+#include <algorithm>
+#include <cstdarg>
+#include <regex>
+
+#include "Common/Atomic.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/Thread.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+
+#include "VideoBackends/OGL/BoundingBox.h"
+#include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoBackends/OGL/PostProcessing.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
+#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/SamplerCache.h"
+#include "VideoBackends/OGL/TextureCache.h"
+#include "VideoBackends/OGL/TextureConverter.h"
+#include "VideoBackends/OGL/VertexManager.h"
+#include "VideoBackends/OGL/VideoBackend.h"
+
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/MainBase.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/VideoState.h"
+
+namespace OGL
+{
+
+std::string VideoBackend::GetName() const
+{
+	return "OGL";
+}
+
+std::string VideoBackend::GetDisplayName() const
+{
+	if (GLInterface != nullptr && GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
+		return "OpenGLES";
+	else
+		return "OpenGL";
+}
+
+static std::vector<std::string> GetShaders(const std::string &sub_dir = "")
+{
+	std::vector<std::string> paths = DoFileSearch({"*.glsl"}, {
+		File::GetUserPath(D_SHADERS_IDX) + sub_dir,
+		File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir
+	});
+	std::vector<std::string> result;
+	for (std::string path : paths)
+		result.push_back(std::regex_replace(path, std::regex("^.*/(.*)\\.glsl$"), "$1"));
+	return result;
+}
+
+static void InitBackendInfo()
+{
+	g_Config.backend_info.APIType = API_OPENGL;
+	g_Config.backend_info.bSupportsExclusiveFullscreen = false;
+	g_Config.backend_info.bSupportsOversizedViewports = true;
+	g_Config.backend_info.bSupportsGeometryShaders = true;
+	g_Config.backend_info.bSupports3DVision = false;
+	g_Config.backend_info.bSupportsPostProcessing = true;
+
+	g_Config.backend_info.Adapters.clear();
+
+	// aamodes
+	const char* caamodes[] = {_trans("None"), "2x", "4x", "8x", "4x SSAA"};
+	g_Config.backend_info.AAModes.assign(caamodes, caamodes + sizeof(caamodes)/sizeof(*caamodes));
+
+	// pp shaders
+	g_Config.backend_info.PPShaders = GetShaders("");
+	g_Config.backend_info.AnaglyphShaders = GetShaders(ANAGLYPH_DIR DIR_SEP);
+}
+
+void VideoBackend::ShowConfig(void *_hParent)
+{
+	if (!s_BackendInitialized)
+		InitBackendInfo();
+	Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl");
+}
+
+bool VideoBackend::Initialize(void *window_handle)
+{
+	InitializeShared();
+	InitBackendInfo();
+
+	frameCount = 0;
+
+	g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini");
+	g_Config.GameIniLoad();
+	g_Config.UpdateProjectionHack();
+	g_Config.VerifyValidity();
+	UpdateActiveConfig();
+
+	InitInterface();
+	GLInterface->SetMode(GLInterfaceMode::MODE_DETECT);
+	if (!GLInterface->Create(window_handle))
+		return false;
+
+	// Do our OSD callbacks
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
+	s_BackendInitialized = true;
+
+	return true;
+}
+
+// This is called after Initialize() from the Core
+// Run from the graphics thread
+void VideoBackend::Video_Prepare()
+{
+	GLInterface->MakeCurrent();
+
+	g_renderer = new Renderer;
+
+	CommandProcessor::Init();
+	PixelEngine::Init();
+
+	BPInit();
+	g_vertex_manager = new VertexManager;
+	g_perf_query = GetPerfQuery();
+	Fifo_Init(); // must be done before OpcodeDecoder_Init()
+	OpcodeDecoder_Init();
+	IndexGenerator::Init();
+	VertexShaderManager::Init();
+	PixelShaderManager::Init();
+	GeometryShaderManager::Init();
+	ProgramShaderCache::Init();
+	g_texture_cache = new TextureCache();
+	g_sampler_cache = new SamplerCache();
+	Renderer::Init();
+	VertexLoaderManager::Init();
+	TextureConverter::Init();
+	BoundingBox::Init();
+
+	// Notify the core that the video backend is ready
+	Host_Message(WM_USER_CREATE);
+}
+
+void VideoBackend::Shutdown()
+{
+	s_BackendInitialized = false;
+
+	// Do our OSD callbacks
+	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
+
+	GLInterface->Shutdown();
+	delete GLInterface;
+	GLInterface = nullptr;
+}
+
+void VideoBackend::Video_Cleanup()
+{
+	if (g_renderer)
+	{
+		Fifo_Shutdown();
+
+		// The following calls are NOT Thread Safe
+		// And need to be called from the video thread
+		Renderer::Shutdown();
+		BoundingBox::Shutdown();
+		TextureConverter::Shutdown();
+		VertexLoaderManager::Shutdown();
+		delete g_sampler_cache;
+		g_sampler_cache = nullptr;
+		delete g_texture_cache;
+		g_texture_cache = nullptr;
+		ProgramShaderCache::Shutdown();
+		VertexShaderManager::Shutdown();
+		PixelShaderManager::Shutdown();
+		GeometryShaderManager::Shutdown();
+		delete g_perf_query;
+		g_perf_query = nullptr;
+		delete g_vertex_manager;
+		g_vertex_manager = nullptr;
+		OpcodeDecoder_Shutdown();
+		delete g_renderer;
+		g_renderer = nullptr;
+		GLInterface->ClearCurrent();
+	}
+}
+
+}
diff --git a/Source/Core/VideoBackends/OGL/main.h b/Source/Core/VideoBackends/OGL/main.h
new file mode 100644
index 0000000000..2bae4448ea
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/main.h
@@ -0,0 +1,9 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "VideoCommon/MainBase.h"
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
new file mode 100644
index 0000000000..97f8b2186f
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
@@ -0,0 +1,178 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbCopy.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/Tev.h"
+
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"
+
+
+void InitBPMemory()
+{
+	memset(&bpmem, 0, sizeof(bpmem));
+	bpmem.bpMask = 0xFFFFFF;
+}
+
+void SWLoadBPReg(u32 value)
+{
+	//handle the mask register
+	int address = value >> 24;
+	int oldval = ((u32*)&bpmem)[address];
+	int newval = (oldval & ~bpmem.bpMask) | (value & bpmem.bpMask);
+
+	((u32*)&bpmem)[address] = newval;
+
+	//reset the mask register
+	if (address != 0xFE)
+		bpmem.bpMask = 0xFFFFFF;
+
+	SWBPWritten(address, newval);
+}
+
+void SWBPWritten(int address, int newvalue)
+{
+	switch (address)
+	{
+	case BPMEM_SCISSORTL:
+	case BPMEM_SCISSORBR:
+	case BPMEM_SCISSOROFFSET:
+		Rasterizer::SetScissor();
+		break;
+	case BPMEM_SETDRAWDONE: // This is called when the game is done drawing (eg: like in DX: Begin(); Draw(); End();)
+		switch (bpmem.drawdone & 0xFF)
+		{
+		case 0x02:
+			PixelEngine::SetFinish(); // may generate interrupt
+			DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bpmem.drawdone & 0xFFFF));
+			break;
+
+		default:
+			WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bpmem.drawdone & 0xFFFF));
+			break;
+		}
+		break;
+	case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
+		DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bpmem.petoken & 0xFFFF));
+		PixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), false);
+		break;
+	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
+		DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bpmem.petokenint & 0xFFFF));
+		PixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), true);
+		break;
+	case BPMEM_TRIGGER_EFB_COPY:
+		EfbCopy::CopyEfb();
+		break;
+	case BPMEM_CLEARBBOX1:
+		BoundingBox::coords[BoundingBox::LEFT] = newvalue >> 10;
+		BoundingBox::coords[BoundingBox::RIGHT] = newvalue & 0x3ff;
+		break;
+	case BPMEM_CLEARBBOX2:
+		BoundingBox::coords[BoundingBox::TOP] = newvalue >> 10;
+		BoundingBox::coords[BoundingBox::BOTTOM] = newvalue & 0x3ff;
+		break;
+	case BPMEM_CLEAR_PIXEL_PERF:
+		// TODO: I didn't test if the value written to this register affects the amount of cleared registers
+		memset(EfbInterface::perf_values, 0, sizeof(EfbInterface::perf_values));
+		break;
+	case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
+		break;
+	case BPMEM_LOADTLUT1: // Load a Texture Look Up Table
+		{
+			u32 tlutTMemAddr = (newvalue & 0x3FF) << 9;
+			u32 tlutXferCount = (newvalue & 0x1FFC00) >> 5;
+			u32 addr = bpmem.tmem_config.tlut_src << 5;
+
+			// The GameCube ignores the upper bits of this address. Some games (WW, MKDD) set them.
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+				addr = addr & 0x01FFFFFF;
+
+			Memory::CopyFromEmu(texMem + tlutTMemAddr, addr, tlutXferCount);
+
+			break;
+		}
+
+	case BPMEM_PRELOAD_MODE:
+		if (newvalue != 0)
+		{
+			// TODO: Not quite sure if this is completely correct (likely not)
+			// NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature.
+
+			BPS_TmemConfig& tmem_cfg = bpmem.tmem_config;
+			u32 src_addr = tmem_cfg.preload_addr << 5; // TODO: Should we add mask here on GC?
+			u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE;
+			u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE;
+
+			if (tmem_cfg.preload_tile_info.type != 3)
+			{
+				if (tmem_addr_even + size > TMEM_SIZE)
+					size = TMEM_SIZE - tmem_addr_even;
+
+				Memory::CopyFromEmu(texMem + tmem_addr_even, src_addr, size);
+			}
+			else // RGBA8 tiles (and CI14, but that might just be stupid libogc!)
+			{
+				u8* src_ptr = Memory::GetPointer(src_addr);
+
+				// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
+				u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
+
+				for (unsigned int i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
+				{
+					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
+						tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
+						break;
+
+					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);
+					memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE);
+					tmem_addr_even += TMEM_LINE_SIZE;
+					tmem_addr_odd += TMEM_LINE_SIZE;
+					src_ptr += TMEM_LINE_SIZE * 2;
+				}
+			}
+		}
+		break;
+
+	case BPMEM_TEV_COLOR_RA:
+	case BPMEM_TEV_COLOR_RA + 2:
+	case BPMEM_TEV_COLOR_RA + 4:
+	case BPMEM_TEV_COLOR_RA + 6:
+		{
+			int regNum = (address >> 1 ) & 0x3;
+			TevReg& reg = bpmem.tevregs[regNum];
+			bool is_konst = reg.type_ra != 0;
+
+			Rasterizer::SetTevReg(regNum, Tev::ALP_C, is_konst, static_cast<s16>(reg.alpha));
+			Rasterizer::SetTevReg(regNum, Tev::RED_C, is_konst, static_cast<s16>(reg.red));
+
+			break;
+		}
+
+	case BPMEM_TEV_COLOR_BG:
+	case BPMEM_TEV_COLOR_BG + 2:
+	case BPMEM_TEV_COLOR_BG + 4:
+	case BPMEM_TEV_COLOR_BG + 6:
+		{
+			int regNum = (address >> 1 ) & 0x3;
+			TevReg& reg = bpmem.tevregs[regNum];
+			bool is_konst = reg.type_bg != 0;
+
+			Rasterizer::SetTevReg(regNum, Tev::GRN_C, is_konst, static_cast<s16>(reg.green));
+			Rasterizer::SetTevReg(regNum, Tev::BLU_C, is_konst, static_cast<s16>(reg.blue));
+
+			break;
+		}
+
+	}
+}
+
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h
new file mode 100644
index 0000000000..71cd076d8e
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.h
@@ -0,0 +1,13 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/BPMemory.h"
+
+void InitBPMemory();
+void SWBPWritten(int address, int newvalue);
+void SWLoadBPReg(u32 value);
diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt
new file mode 100644
index 0000000000..089261adcc
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/CMakeLists.txt
@@ -0,0 +1,29 @@
+set(SRCS BPMemLoader.cpp
+	   Clipper.cpp
+	   SWCommandProcessor.cpp
+	   CPMemLoader.cpp
+	   DebugUtil.cpp
+	   EfbCopy.cpp
+	   EfbInterface.cpp
+	   HwRasterizer.cpp
+	   SWmain.cpp
+	   OpcodeDecoder.cpp
+	   RasterFont.cpp
+	   Rasterizer.cpp
+	   SWRenderer.cpp
+	   SetupUnit.cpp
+	   SWStatistics.cpp
+	   Tev.cpp
+	   TextureEncoder.cpp
+	   TextureSampler.cpp
+	   TransformUnit.cpp
+	   SWVertexLoader.cpp
+	   SWVideoConfig.cpp
+	   XFMemLoader.cpp)
+
+set(LIBS videocommon
+         SOIL
+         common
+         ${X11_LIBRARIES})
+
+add_dolphin_library(videosoftware "${SRCS}" "${LIBS}")
diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.cpp b/Source/Core/VideoBackends/Software/CPMemLoader.cpp
new file mode 100644
index 0000000000..c33cd2dd0e
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/CPMemLoader.cpp
@@ -0,0 +1,60 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonFuncs.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoCommon/VideoCommon.h"
+
+
+void SWLoadCPReg(u32 sub_cmd, u32 value)
+{
+	switch (sub_cmd & 0xF0)
+	{
+	case 0x30:
+		g_main_cp_state.matrix_index_a.Hex = value;
+		break;
+
+	case 0x40:
+		g_main_cp_state.matrix_index_b.Hex = value;
+		break;
+
+	case 0x50:
+		g_main_cp_state.vtx_desc.Hex &= ~0x1FFFF;  // keep the Upper bits
+		g_main_cp_state.vtx_desc.Hex |= value;
+		g_main_cp_state.bases_dirty = true;
+		break;
+
+	case 0x60:
+		g_main_cp_state.vtx_desc.Hex &= 0x1FFFF;  // keep the lower 17Bits
+		g_main_cp_state.vtx_desc.Hex |= (u64)value << 17;
+		g_main_cp_state.bases_dirty = true;
+		break;
+
+	case 0x70:
+		_assert_((sub_cmd & 0x0F) < 8);
+		g_main_cp_state.vtx_attr[sub_cmd & 7].g0.Hex = value;
+		break;
+
+	case 0x80:
+		_assert_((sub_cmd & 0x0F) < 8);
+		g_main_cp_state.vtx_attr[sub_cmd & 7].g1.Hex = value;
+		break;
+
+	case 0x90:
+		_assert_((sub_cmd & 0x0F) < 8);
+		g_main_cp_state.vtx_attr[sub_cmd & 7].g2.Hex = value;
+		break;
+
+	// Pointers to vertex arrays in GC RAM
+	case 0xA0:
+		g_main_cp_state.array_bases[sub_cmd & 0xF] = value;
+		g_main_cp_state.bases_dirty = true;
+		break;
+
+	case 0xB0:
+		g_main_cp_state.array_strides[sub_cmd & 0xF] = value & 0xFF;
+		break;
+	}
+}
diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.h b/Source/Core/VideoBackends/Software/CPMemLoader.h
new file mode 100644
index 0000000000..5760505a41
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/CPMemLoader.h
@@ -0,0 +1,10 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/CPMemory.h"
+
+void SWLoadCPReg(u32 sub_cmd, u32 value);
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp
similarity index 77%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
rename to Source/Core/VideoBackends/Software/Clipper.cpp
index ff71ee491d..cb303ad2e0 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
+++ b/Source/Core/VideoBackends/Software/Clipper.cpp
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 /*
@@ -8,18 +8,18 @@ Copyright (c) 2007, 2008 Markus Trenkwalder
 
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
+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, 
+* 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 
+  this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of the library's copyright owner nor the names of its 
-  contributors may be used to endorse or promote products derived from this 
+* Neither the name of the library's copyright owner nor the names of its
+  contributors 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
@@ -35,28 +35,32 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "Clipper.h"
-#include "Rasterizer.h"
-#include "NativeVertexFormat.h"
-#include "XFMemLoader.h"
-#include "BPMemLoader.h"
-#include "SWStatistics.h"
-
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/XFMemLoader.h"
 
 namespace Clipper
 {
-	enum { NUM_CLIPPED_VERTICES = 33, NUM_INDICES = NUM_CLIPPED_VERTICES + 3 };
+	enum
+	{
+		NUM_CLIPPED_VERTICES = 33,
+		NUM_INDICES = NUM_CLIPPED_VERTICES + 3
+	};
 
-	float m_ViewOffset[2];
+	static float m_ViewOffset[2];
 
-	OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES];
-	OutputVertexData *Vertices[NUM_INDICES];
+	static OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES];
+	static OutputVertexData *Vertices[NUM_INDICES];
 
 	void DoState(PointerWrap &p)
 	{
 		p.DoArray(m_ViewOffset,2);
-		for (int i = 0; i< NUM_CLIPPED_VERTICES; ++i)
-			ClippedVertices[i].DoState(p);
+		for (auto& ClippedVertice : ClippedVertices)
+			ClippedVertice.DoState(p);
 	}
 
 	void Init()
@@ -67,12 +71,13 @@ namespace Clipper
 
 	void SetViewOffset()
 	{
-		m_ViewOffset[0] = swxfregs.viewport.xOrig - 342;
-		m_ViewOffset[1] = swxfregs.viewport.yOrig - 342;
+		m_ViewOffset[0] = xfmem.viewport.xOrig - 342;
+		m_ViewOffset[1] = xfmem.viewport.yOrig - 342;
 	}
 
 
-	enum {
+	enum
+	{
 		SKIP_FLAG = -1,
 		CLIP_POS_X_BIT = 0x01,
 		CLIP_NEG_X_BIT = 0x02,
@@ -86,19 +91,31 @@ namespace Clipper
 	{
 		int cmask = 0;
 		Vec4 pos = v->projectedPosition;
-		if (pos.w - pos.x < 0) cmask |= CLIP_POS_X_BIT;
-		if (pos.x + pos.w < 0) cmask |= CLIP_NEG_X_BIT;
-		if (pos.w - pos.y < 0) cmask |= CLIP_POS_Y_BIT;
-		if (pos.y + pos.w < 0) cmask |= CLIP_NEG_Y_BIT;
-		if (pos.w * pos.z > 0) cmask |= CLIP_POS_Z_BIT;
-		if (pos.z + pos.w < 0) cmask |= CLIP_NEG_Z_BIT;
+
+		if (pos.w - pos.x < 0)
+			cmask |= CLIP_POS_X_BIT;
+
+		if (pos.x + pos.w < 0)
+			cmask |= CLIP_NEG_X_BIT;
+
+		if (pos.w - pos.y < 0)
+			cmask |= CLIP_POS_Y_BIT;
+
+		if (pos.y + pos.w < 0)
+			cmask |= CLIP_NEG_Y_BIT;
+
+		if (pos.w * pos.z > 0)
+			cmask |= CLIP_POS_Z_BIT;
+
+		if (pos.z + pos.w < 0)
+			cmask |= CLIP_NEG_Z_BIT;
+
 		return cmask;
 	}
 
-	static inline void AddInterpolatedVertex(float t, int out, int in, int& numVertices)
+	static inline void AddInterpolatedVertex(float t, int out, int in, int* numVertices)
 	{
-		Vertices[numVertices]->Lerp(t, Vertices[out], Vertices[in]);
-		numVertices++;
+		Vertices[(*numVertices)++]->Lerp(t, Vertices[out], Vertices[in]);
 	}
 
 	#define DIFFERENT_SIGNS(x,y) ((x <= 0 && y > 0) || (x > 0 && y <= 0))
@@ -124,10 +141,10 @@ namespace Clipper
 				if (DIFFERENT_SIGNS(dp, dpPrev)) {						\
 					if (dp < 0) {										\
 						float t = dp / (dp - dpPrev);					\
-						AddInterpolatedVertex(t, idx, idxPrev, numVertices);		\
+						AddInterpolatedVertex(t, idx, idxPrev, &numVertices);		\
 					} else {											\
 						float t = dpPrev / (dpPrev - dp);				\
-						AddInterpolatedVertex(t, idxPrev, idx, numVertices);		\
+						AddInterpolatedVertex(t, idxPrev, idx, &numVertices);		\
 					}													\
 					outlist[outcount++] = numVertices - 1;				\
 				}														\
@@ -169,7 +186,7 @@ namespace Clipper
 		}														\
 	}
 
-	void ClipTriangle(int *indices, int &numIndices)
+	static void ClipTriangle(int *indices, int* numIndices)
 	{
 		int mask = 0;
 
@@ -179,7 +196,7 @@ namespace Clipper
 
 		if (mask != 0)
 		{
-			for(int i = 0; i < 3; i += 3)
+			for (int i = 0; i < 3; i += 3)
 			{
 				int vlist[2][2*6+1];
 				int *inlist = vlist[0], *outlist = vlist[1];
@@ -190,7 +207,7 @@ namespace Clipper
 				inlist[1] = 1;
 				inlist[2] = 2;
 
-				// mark this triangle as unused in case it should be completely 
+				// mark this triangle as unused in case it should be completely
 				// clipped
 				indices[0] = SKIP_FLAG;
 				indices[1] = SKIP_FLAG;
@@ -209,16 +226,17 @@ namespace Clipper
 				indices[0] = inlist[0];
 				indices[1] = inlist[1];
 				indices[2] = inlist[2];
-				for (int j = 3; j < n; ++j) {
-					indices[numIndices++] = inlist[0];
-					indices[numIndices++] = inlist[j - 1];
-					indices[numIndices++] = inlist[j];
+				for (int j = 3; j < n; ++j)
+				{
+					indices[(*numIndices)++] = inlist[0];
+					indices[(*numIndices)++] = inlist[j - 1];
+					indices[(*numIndices)++] = inlist[j];
 				}
 			}
 		}
 	}
 
-	void ClipLine(int *indices)
+	static void ClipLine(int *indices)
 	{
 		int mask = 0;
 		int clip_mask[2] = { 0, 0 };
@@ -229,13 +247,13 @@ namespace Clipper
 			mask |= clip_mask[i];
 		}
 
-		if (mask == 0) 
+		if (mask == 0)
 			return;
 
 		float t0 = 0;
 		float t1 = 0;
 
-		// Mark unused in case of early termination 
+		// Mark unused in case of early termination
 		// of the macros below. (When fully clipped)
 		indices[0] = SKIP_FLAG;
 		indices[1] = SKIP_FLAG;
@@ -247,7 +265,7 @@ namespace Clipper
 		LINE_CLIP(CLIP_POS_Z_BIT,  0,  0, -1, 1);
 		LINE_CLIP(CLIP_NEG_Z_BIT,  0,  0,  1, 1);
 
-		// Restore the old values as this line 
+		// Restore the old values as this line
 		// was not fully clipped.
 		indices[0] = 0;
 		indices[1] = 1;
@@ -257,13 +275,13 @@ namespace Clipper
 		if (clip_mask[0])
 		{
 			indices[0] = numVertices;
-			AddInterpolatedVertex(t0, 0, 1, numVertices);
+			AddInterpolatedVertex(t0, 0, 1, &numVertices);
 		}
 
 		if (clip_mask[1])
 		{
 			indices[1] = numVertices;
-			AddInterpolatedVertex(t1, 1, 0, numVertices);
+			AddInterpolatedVertex(t1, 1, 0, &numVertices);
 		}
 	}
 
@@ -273,12 +291,14 @@ namespace Clipper
 
 		bool backface;
 
-		if(!CullTest(v0, v1, v2, backface))
+		if (!CullTest(v0, v1, v2, backface))
 			return;
 
-		int indices[NUM_INDICES] = { 0, 1, 2, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
-										SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
-										SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG };
+		int indices[NUM_INDICES] = {
+			0, 1, 2, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
+			SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
+			SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG
+		};
 		int numIndices = 3;
 
 		if (backface)
@@ -294,23 +314,23 @@ namespace Clipper
 			Vertices[2] = v2;
 		}
 
-		ClipTriangle(indices, numIndices);
+		ClipTriangle(indices, &numIndices);
 
-		for(int i = 0; i+3 <= numIndices; i+=3)
+		for (int i = 0; i+3 <= numIndices; i+=3)
 		{
 			_assert_(i < NUM_INDICES);
-			if(indices[i] != SKIP_FLAG)
+			if (indices[i] != SKIP_FLAG)
 			{
 				PerspectiveDivide(Vertices[indices[i]]);
 				PerspectiveDivide(Vertices[indices[i+1]]);
 				PerspectiveDivide(Vertices[indices[i+2]]);
 
-				Rasterizer::DrawTriangleFrontFace(Vertices[indices[i]], Vertices[indices[i+1]], Vertices[indices[i+2]]);                
+				Rasterizer::DrawTriangleFrontFace(Vertices[indices[i]], Vertices[indices[i+1]], Vertices[indices[i+2]]);
 			}
 		}
 	}
 
-	void CopyVertex(OutputVertexData *dst, OutputVertexData *src, float dx, float dy, unsigned int sOffset)
+	static void CopyVertex(OutputVertexData *dst, OutputVertexData *src, float dx, float dy, unsigned int sOffset)
 	{
 		dst->screenPosition.x = src->screenPosition.x + dx;
 		dst->screenPosition.y = src->screenPosition.y + dy;
@@ -339,7 +359,7 @@ namespace Clipper
 
 		ClipLine(indices);
 
-		if(indices[0] != SKIP_FLAG)
+		if (indices[0] != SKIP_FLAG)
 		{
 			OutputVertexData *v0 = Vertices[indices[0]];
 			OutputVertexData *v1 = Vertices[indices[1]];
@@ -349,20 +369,20 @@ namespace Clipper
 
 			float dx = v1->screenPosition.x - v0->screenPosition.x;
 			float dy = v1->screenPosition.y - v0->screenPosition.y;
-			
+
 			float screenDx = 0;
 			float screenDy = 0;
 
-			if(fabsf(dx) > fabsf(dy))
+			if (fabsf(dx) > fabsf(dy))
 			{
-				if(dx > 0)
+				if (dx > 0)
 					screenDy = bpmem.lineptwidth.linesize / -12.0f;
 				else
 					screenDy = bpmem.lineptwidth.linesize / 12.0f;
 			}
 			else
 			{
-				if(dy > 0)
+				if (dy > 0)
 					screenDx = bpmem.lineptwidth.linesize / 12.0f;
 				else
 					screenDx = bpmem.lineptwidth.linesize / -12.0f;
@@ -389,7 +409,7 @@ namespace Clipper
 		mask &= CalcClipMask(v1);
 		mask &= CalcClipMask(v2);
 
-		if(mask)
+		if (mask)
 		{
 			INCSTAT(swstats.thisFrame.numTrianglesRejected)
 			return false;
@@ -405,7 +425,7 @@ namespace Clipper
 		float w1 = v1->projectedPosition.w;
 		float w2 = v2->projectedPosition.w;
 
-		float normalZDir = (x0*w2 - x2*w0)*y1 + (x2*y0 - x0*y2)*w1 + (y2*w0 - y0*w2)*x1; 
+		float normalZDir = (x0*w2 - x2*w0)*y1 + (x2*y0 - x0*y2)*w1 + (y2*w0 - y0*w2)*x1;
 
 		backface = normalZDir <= 0.0f;
 
@@ -430,9 +450,9 @@ namespace Clipper
 		Vec3 &screen = vertex->screenPosition;
 
 		float wInverse = 1.0f/projected.w;
-		screen.x = projected.x * wInverse * swxfregs.viewport.wd + m_ViewOffset[0];
-		screen.y = projected.y * wInverse * swxfregs.viewport.ht + m_ViewOffset[1];
-		screen.z = projected.z * wInverse * swxfregs.viewport.zRange + swxfregs.viewport.farZ;
+		screen.x = projected.x * wInverse * xfmem.viewport.wd + m_ViewOffset[0];
+		screen.y = projected.y * wInverse * xfmem.viewport.ht + m_ViewOffset[1];
+		screen.z = projected.z * wInverse * xfmem.viewport.zRange + xfmem.viewport.farZ;
 	}
 
 }
diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h
new file mode 100644
index 0000000000..263fbd0854
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Clipper.h
@@ -0,0 +1,25 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+struct OutputVertexData;
+class PointerWrap;
+
+namespace Clipper
+{
+	void Init();
+
+	void SetViewOffset();
+
+	void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
+
+	void ProcessLine(OutputVertexData *v0, OutputVertexData *v1);
+
+	bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface);
+
+	void PerspectiveDivide(OutputVertexData *vertex);
+
+	void DoState(PointerWrap &p);
+}
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp
new file mode 100644
index 0000000000..4f7d732c0b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp
@@ -0,0 +1,266 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/TextureSampler.h"
+
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/ImageWrite.h"
+
+
+namespace DebugUtil
+{
+
+static bool drawingHwTriangles = false;
+
+static const int NUM_OBJECT_BUFFERS = 40;
+
+static u32 *ObjectBuffer[NUM_OBJECT_BUFFERS];
+static u32 TempBuffer[NUM_OBJECT_BUFFERS];
+
+static bool DrawnToBuffer[NUM_OBJECT_BUFFERS];
+static const char* ObjectBufferName[NUM_OBJECT_BUFFERS];
+static int BufferBase[NUM_OBJECT_BUFFERS];
+
+void Init()
+{
+	for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
+	{
+		ObjectBuffer[i] = new u32[EFB_WIDTH*EFB_HEIGHT]();
+		DrawnToBuffer[i] = false;
+		ObjectBufferName[i] = nullptr;
+		BufferBase[i] = 0;
+	}
+}
+
+void Shutdown()
+{
+	for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
+	{
+		delete[] ObjectBuffer[i];
+	}
+}
+
+static void SaveTexture(const std::string& filename, u32 texmap, s32 mip)
+{
+	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
+	u8 subTexmap = texmap & 3;
+
+	TexImage0& ti0 = texUnit.texImage0[subTexmap];
+
+	u32 width = ti0.width + 1;
+	u32 height = ti0.height + 1;
+
+	u8 *data = new u8[width * height * 4];
+
+	GetTextureRGBA(data, texmap, mip, width, height);
+
+	TextureToPng(data, width*4, filename, width, height, true);
+	delete[] data;
+
+}
+
+void GetTextureRGBA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height)
+{
+	for (u32 y = 0; y < height; y++)
+	{
+		for (u32 x = 0; x < width; x++)
+		{
+			TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, dst);
+			dst += 4;
+		}
+	}
+}
+
+static s32 GetMaxTextureLod(u32 texmap)
+{
+	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
+	u8 subTexmap = texmap & 3;
+
+	u8 maxLod = texUnit.texMode1[subTexmap].max_lod;
+	u8 mip = maxLod >> 4;
+	u8 fract = maxLod & 0xf;
+
+	if (fract)
+		++mip;
+
+	return (s32)mip;
+}
+
+void DumpActiveTextures()
+{
+	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
+	{
+		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
+
+		s32 maxLod = GetMaxTextureLod(texmap);
+		for (s32 mip = 0; mip <= maxLod; ++mip)
+		{
+			SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png",
+						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
+						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip), texmap, mip);
+		}
+	}
+
+	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
+
+		int texmap = order.getTexMap(stageOdd);
+
+		s32 maxLod = GetMaxTextureLod(texmap);
+		for (s32 mip = 0; mip <= maxLod; ++mip)
+		{
+			SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png",
+						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
+						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip), texmap, mip);
+		}
+	}
+}
+
+static void DumpEfb(const std::string& filename)
+{
+	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
+	u8 *writePtr = data;
+	u8 sample[4];
+
+	for (int y = 0; y < EFB_HEIGHT; y++)
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
+			EfbInterface::GetColor(x, y, sample);
+			// ABGR to RGBA
+			*(writePtr++) = sample[3];
+			*(writePtr++) = sample[2];
+			*(writePtr++) = sample[1];
+			*(writePtr++) = sample[0];
+		}
+	}
+
+	TextureToPng(data, EFB_WIDTH * 4, filename, EFB_WIDTH, EFB_HEIGHT, true);
+	delete[] data;
+}
+
+
+
+static void DumpColorTexture(const std::string& filename, u32 width, u32 height)
+{
+	TextureToPng(SWRenderer::GetCurrentColorTexture(), width * 4, filename, width, height, true);
+}
+
+void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name)
+{
+	int buffer = bufferBase + subBuffer;
+
+	u32 offset = (x + y * EFB_WIDTH) * 4;
+	u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
+
+	DrawnToBuffer[buffer] = true;
+	ObjectBufferName[buffer] = name;
+	BufferBase[buffer] = bufferBase;
+}
+
+void DrawTempBuffer(u8 *color, int buffer)
+{
+	u8 *dst = (u8*)&TempBuffer[buffer];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
+}
+
+void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name)
+{
+	int buffer = bufferBase + subBuffer;
+
+	u32 offset = (x + y * EFB_WIDTH);
+	ObjectBuffer[buffer][offset] = TempBuffer[buffer];
+
+	DrawnToBuffer[buffer] = true;
+	ObjectBufferName[buffer] = name;
+	BufferBase[buffer] = bufferBase;
+}
+
+void OnObjectBegin()
+{
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+			DumpActiveTextures();
+
+		if (g_SWVideoConfig.bHwRasterizer)
+		{
+			HwRasterizer::BeginTriangles();
+			drawingHwTriangles = true;
+		}
+	}
+}
+
+void OnObjectEnd()
+{
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+			DumpEfb(StringFromFormat("%sobject%i.png",
+						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
+						swstats.thisFrame.numDrawnObjects));
+
+		if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
+		{
+			HwRasterizer::EndTriangles();
+			drawingHwTriangles = false;
+		}
+
+		for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
+		{
+			if (DrawnToBuffer[i])
+			{
+				DrawnToBuffer[i] = false;
+				std::string filename = StringFromFormat("%sobject%i_%s(%i).png",
+					File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
+					swstats.thisFrame.numDrawnObjects, ObjectBufferName[i], i - BufferBase[i]);
+
+				TextureToPng((u8*)ObjectBuffer[i], EFB_WIDTH * 4, filename, EFB_WIDTH, EFB_HEIGHT, true);
+				memset(ObjectBuffer[i], 0, EFB_WIDTH * EFB_HEIGHT * sizeof(u32));
+
+			}
+		}
+
+		swstats.thisFrame.numDrawnObjects++;
+	}
+}
+
+// If frame dumping is enabled, dump whatever is drawn to the screen.
+void OnFrameEnd(u32 width, u32 height)
+{
+	if (!g_bSkipCurrentFrame)
+	{
+		if (SConfig::GetInstance().m_DumpFrames)
+		{
+			DumpColorTexture(StringFromFormat("%sframe%i_color.png",
+					File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount), width, height);
+		}
+	}
+}
+
+}
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h
new file mode 100644
index 0000000000..8607a6e4c0
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/DebugUtil.h
@@ -0,0 +1,27 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+
+namespace DebugUtil
+{
+	void Init();
+	void Shutdown();
+
+	void GetTextureRGBA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height);
+
+	void DumpActiveTextures();
+
+	void OnObjectBegin();
+	void OnObjectEnd();
+
+	void OnFrameEnd(u32 width, u32 height);
+
+	void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name);
+
+	void DrawTempBuffer(u8 *color, int buffer);
+	void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name);
+}
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp
new file mode 100644
index 0000000000..688a5cddb9
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp
@@ -0,0 +1,148 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbCopy.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/TextureEncoder.h"
+#include "VideoCommon/Fifo.h"
+
+static const float s_gammaLUT[] =
+{
+	1.0f,
+	1.7f,
+	2.2f,
+	1.0f
+};
+
+namespace EfbCopy
+{
+	static void CopyToXfb(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
+	{
+		GLInterface->Update(); // update the render window position and the backbuffer size
+
+		if (!g_SWVideoConfig.bHwRasterizer)
+		{
+			INFO_LOG(VIDEO, "xfbaddr: %x, fbwidth: %i, fbheight: %i, source: (%i, %i, %i, %i), Gamma %f",
+					 xfbAddr, fbWidth, fbHeight, sourceRc.top, sourceRc.left, sourceRc.bottom, sourceRc.right, Gamma);
+
+			if (!g_SWVideoConfig.bBypassXFB)
+			{
+				EfbInterface::yuv422_packed* xfb_in_ram = (EfbInterface::yuv422_packed *) Memory::GetPointer(xfbAddr);
+
+				EfbInterface::CopyToXFB(xfb_in_ram, fbWidth, fbHeight, sourceRc, Gamma);
+			}
+			else
+			{
+				// Ask SWRenderer for the next color texture
+				u8 *colorTexture = SWRenderer::GetNextColorTexture();
+
+				EfbInterface::BypassXFB(colorTexture, fbWidth, fbHeight, sourceRc, Gamma);
+
+				// Tell SWRenderer we are now finished with it.
+				SWRenderer::SwapColorTexture();
+
+				// FifoPlayer is broken and never calls BeginFrame/EndFrame.
+				// Hence, we manually force a swap now. This emulates the behavior
+				// of hardware backends with XFB emulation disabled.
+				// TODO: Fix FifoPlayer by making proper use of VideoInterface!
+				//       This requires careful synchronization since GPU commands
+				//       are processed on a different thread than VI commands.
+				SWRenderer::Swap(fbWidth, fbHeight);
+				DebugUtil::OnFrameEnd(fbWidth, fbHeight);
+			}
+		}
+	}
+
+	static void CopyToRam()
+	{
+		if (!g_SWVideoConfig.bHwRasterizer)
+		{
+			u8 *dest_ptr = Memory::GetPointer(bpmem.copyTexDest << 5);
+
+			TextureEncoder::Encode(dest_ptr);
+		}
+	}
+
+	static void ClearEfb()
+	{
+		u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 | (bpmem.clearcolorAR & 0xff00) >> 8;
+
+		int left   = bpmem.copyTexSrcXY.x;
+		int top    = bpmem.copyTexSrcXY.y;
+		int right  = left + bpmem.copyTexSrcWH.x;
+		int bottom = top + bpmem.copyTexSrcWH.y;
+
+		for (u16 y = top; y <= bottom; y++)
+		{
+			for (u16 x = left; x <= right; x++)
+			{
+				EfbInterface::SetColor(x, y, (u8*)(&clearColor));
+				EfbInterface::SetDepth(x, y, bpmem.clearZValue);
+			}
+		}
+	}
+
+	void CopyEfb()
+	{
+		EFBRectangle rc;
+		rc.left = (int)bpmem.copyTexSrcXY.x;
+		rc.top = (int)bpmem.copyTexSrcXY.y;
+
+		// flipper represents the widths internally as last pixel minus starting pixel, so
+		// these are zero indexed.
+		rc.right = rc.left + (int)bpmem.copyTexSrcWH.x + 1;
+		rc.bottom = rc.top + (int)bpmem.copyTexSrcWH.y + 1;
+
+		if (!g_bSkipCurrentFrame)
+		{
+			if (bpmem.triggerEFBCopy.copy_to_xfb)
+			{
+				float yScale;
+				if (bpmem.triggerEFBCopy.scale_invert)
+					yScale = 256.0f / (float)bpmem.dispcopyyscale;
+				else
+					yScale = (float)bpmem.dispcopyyscale / 256.0f;
+
+				float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale);
+
+				if (yScale != 1.0)
+					WARN_LOG(VIDEO, "yScale of %f is currently unsupported", yScale);
+
+				if ((u32)xfbLines > MAX_XFB_HEIGHT)
+				{
+					INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines);
+					xfbLines = MAX_XFB_HEIGHT;
+				}
+
+				CopyToXfb(bpmem.copyTexDest << 5,
+						  bpmem.copyMipMapStrideChannels << 4,
+						  (u32)xfbLines,
+						  rc,
+						  s_gammaLUT[bpmem.triggerEFBCopy.gamma]);
+			}
+			else
+			{
+				CopyToRam(); // FIXME: should use the rectangle we have already created above
+			}
+
+			if (bpmem.triggerEFBCopy.clear)
+			{
+				if (g_SWVideoConfig.bHwRasterizer)
+					HwRasterizer::Clear();
+				else
+					ClearEfb();
+			}
+		}
+	}
+}
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.h b/Source/Core/VideoBackends/Software/EfbCopy.h
new file mode 100644
index 0000000000..3d3b5939ad
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/EfbCopy.h
@@ -0,0 +1,14 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace EfbCopy
+{
+	// Copy the EFB to RAM as a texture format or XFB
+	// Clear the EFB if needed
+	void CopyEfb();
+}
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp
new file mode 100644
index 0000000000..2ad6dbbd86
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp
@@ -0,0 +1,628 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/PixelEngine.h"
+
+
+static u8 efb[EFB_WIDTH*EFB_HEIGHT*6];
+
+namespace EfbInterface
+{
+	u32 perf_values[PQ_NUM_MEMBERS];
+
+	static inline u32 GetColorOffset(u16 x, u16 y)
+	{
+		return (x + y * EFB_WIDTH) * 3;
+	}
+
+	static inline u32 GetDepthOffset(u16 x, u16 y)
+	{
+		return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START;
+	}
+
+	void DoState(PointerWrap &p)
+	{
+		p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6);
+	}
+
+	static void SetPixelAlphaOnly(u32 offset, u8 a)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::Z24:
+		case PEControl::RGB565_Z16:
+			// do nothing
+			break;
+		case PEControl::RGBA6_Z24:
+			{
+				u32 a32 = a;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xffffffc0;
+				val |= (a32 >> 2) & 0x0000003f;
+				*dst = val;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+	}
+
+	static void SetPixelColorOnly(u32 offset, u8 *rgb)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::Z24:
+			{
+				u32 src = *(u32*)rgb;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= src >> 8;
+				*dst = val;
+			}
+			break;
+		case PEControl::RGBA6_Z24:
+			{
+				u32 src = *(u32*)rgb;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff00003f;
+				val |= (src >> 4) & 0x00000fc0; // blue
+				val |= (src >> 6) & 0x0003f000; // green
+				val |= (src >> 8) & 0x00fc0000; // red
+				*dst = val;
+			}
+			break;
+		case PEControl::RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
+				u32 src = *(u32*)rgb;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= src >> 8;
+				*dst = val;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+	}
+
+	static void SetPixelAlphaColor(u32 offset, u8 *color)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::Z24:
+			{
+				u32 src = *(u32*)color;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= src >> 8;
+				*dst = val;
+			}
+			break;
+		case PEControl::RGBA6_Z24:
+			{
+				u32 src = *(u32*)color;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= (src >> 2) & 0x0000003f; // alpha
+				val |= (src >> 4) & 0x00000fc0; // blue
+				val |= (src >> 6) & 0x0003f000; // green
+				val |= (src >> 8) & 0x00fc0000; // red
+				*dst = val;
+			}
+			break;
+		case PEControl::RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
+				u32 src = *(u32*)color;
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= src >> 8;
+				*dst = val;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+	}
+
+	static void GetPixelColor(u32 offset, u8 *color)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::Z24:
+			{
+				u32 src = *(u32*)&efb[offset];
+				u32 *dst = (u32*)color;
+				u32 val = 0xff | ((src & 0x00ffffff) << 8);
+				*dst = val;
+			}
+			break;
+		case PEControl::RGBA6_Z24:
+			{
+				u32 src = *(u32*)&efb[offset];
+				color[ALP_C] = Convert6To8(src & 0x3f);
+				color[BLU_C] = Convert6To8((src >> 6) & 0x3f);
+				color[GRN_C] = Convert6To8((src >> 12) & 0x3f);
+				color[RED_C] = Convert6To8((src >> 18) & 0x3f);
+			}
+			break;
+		case PEControl::RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
+				u32 src = *(u32*)&efb[offset];
+				u32 *dst = (u32*)color;
+				u32 val = 0xff | ((src & 0x00ffffff) << 8);
+				*dst = val;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+	}
+
+	static void SetPixelDepth(u32 offset, u32 depth)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::RGBA6_Z24:
+		case PEControl::Z24:
+			{
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= depth & 0x00ffffff;
+				*dst = val;
+			}
+			break;
+		case PEControl::RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
+				u32 *dst = (u32*)&efb[offset];
+				u32 val = *dst & 0xff000000;
+				val |= depth & 0x00ffffff;
+				*dst = val;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+	}
+
+	static u32 GetPixelDepth(u32 offset)
+	{
+		u32 depth = 0;
+
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PEControl::RGB8_Z24:
+		case PEControl::RGBA6_Z24:
+		case PEControl::Z24:
+			{
+				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
+			}
+			break;
+		case PEControl::RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
+				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
+		}
+
+		return depth;
+	}
+
+	static u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
+	{
+		switch (mode)
+		{
+		case BlendMode::ZERO:
+			return 0;
+		case BlendMode::ONE:
+			return 0xffffffff;
+		case BlendMode::DSTCLR:
+			return *(u32*)dstClr;
+		case BlendMode::INVDSTCLR:
+			return 0xffffffff - *(u32*)dstClr;
+		case BlendMode::SRCALPHA:
+			{
+				u8 alpha = srcClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::INVSRCALPHA:
+			{
+				u8 alpha = 0xff - srcClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::DSTALPHA:
+			{
+				u8 alpha = dstClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::INVDSTALPHA:
+			{
+				u8 alpha = 0xff - dstClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		}
+
+		return 0;
+	}
+
+	static u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
+	{
+		switch (mode)
+		{
+		case BlendMode::ZERO:
+			return 0;
+		case BlendMode::ONE:
+			return 0xffffffff;
+		case BlendMode::SRCCLR:
+			return *(u32*)srcClr;
+		case BlendMode::INVSRCCLR:
+			return 0xffffffff - *(u32*)srcClr;
+		case BlendMode::SRCALPHA:
+			{
+				u8 alpha = srcClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::INVSRCALPHA:
+			{
+				u8 alpha = 0xff - srcClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::DSTALPHA:
+			{
+				u8 alpha = dstClr[ALP_C] & 0xff;
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		case BlendMode::INVDSTALPHA:
+			{
+				u8 alpha = 0xff - dstClr[ALP_C];
+				u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+				return factor;
+			}
+		}
+
+		return 0;
+	}
+
+	static void BlendColor(u8 *srcClr, u8 *dstClr)
+	{
+		u32 srcFactor = GetSourceFactor(srcClr, dstClr, bpmem.blendmode.srcfactor);
+		u32 dstFactor = GetDestinationFactor(srcClr, dstClr, bpmem.blendmode.dstfactor);
+
+		for (int i = 0; i < 4; i++)
+		{
+			// add MSB of factors to make their range 0 -> 256
+			u32 sf = (srcFactor & 0xff);
+			sf += sf >> 7;
+
+			u32 df = (dstFactor & 0xff);
+			df += df >> 7;
+
+			u32 color = (srcClr[i] * sf + dstClr[i] * df) >> 8;
+			dstClr[i] = (color>255)?255:color;
+
+			dstFactor >>= 8;
+			srcFactor >>= 8;
+		}
+	}
+
+	static void LogicBlend(u32 srcClr, u32* dstClr, BlendMode::LogicOp op)
+	{
+		switch (op)
+		{
+		case BlendMode::CLEAR:
+			*dstClr = 0;
+			break;
+		case BlendMode::AND:
+			*dstClr = srcClr & *dstClr;
+			break;
+		case BlendMode::AND_REVERSE:
+			*dstClr = srcClr & (~*dstClr);
+			break;
+		case BlendMode::COPY:
+			*dstClr = srcClr;
+			break;
+		case BlendMode::AND_INVERTED:
+			*dstClr = (~srcClr) & *dstClr;
+			break;
+		case BlendMode::NOOP:
+			// Do nothing
+			break;
+		case BlendMode::XOR:
+			*dstClr = srcClr ^ *dstClr;
+			break;
+		case BlendMode::OR:
+			*dstClr = srcClr | *dstClr;
+			break;
+		case BlendMode::NOR:
+			*dstClr = ~(srcClr | *dstClr);
+			break;
+		case BlendMode::EQUIV:
+			*dstClr = ~(srcClr ^ *dstClr);
+			break;
+		case BlendMode::INVERT:
+			*dstClr = ~*dstClr;
+			break;
+		case BlendMode::OR_REVERSE:
+			*dstClr = srcClr | (~*dstClr);
+			break;
+		case BlendMode::COPY_INVERTED:
+			*dstClr = ~srcClr;
+			break;
+		case BlendMode::OR_INVERTED:
+			*dstClr = (~srcClr) | *dstClr;
+			break;
+		case BlendMode::NAND:
+			*dstClr = ~(srcClr & *dstClr);
+			break;
+		case BlendMode::SET:
+			*dstClr = 0xffffffff;
+			break;
+		}
+	}
+
+	static void SubtractBlend(u8 *srcClr, u8 *dstClr)
+	{
+		for (int i = 0; i < 4; i++)
+		{
+			int c = (int)dstClr[i] - (int)srcClr[i];
+			dstClr[i] = (c < 0)?0:c;
+		}
+	}
+
+	void BlendTev(u16 x, u16 y, u8 *color)
+	{
+		u32 dstClr;
+		u32 offset = GetColorOffset(x, y);
+
+		u8 *dstClrPtr = (u8*)&dstClr;
+
+		GetPixelColor(offset, dstClrPtr);
+
+		if (bpmem.blendmode.blendenable)
+		{
+			if (bpmem.blendmode.subtract)
+				SubtractBlend(color, dstClrPtr);
+			else
+				BlendColor(color, dstClrPtr);
+		}
+		else if (bpmem.blendmode.logicopenable)
+		{
+			LogicBlend(*((u32*)color), &dstClr, bpmem.blendmode.logicmode);
+		}
+		else
+		{
+			dstClrPtr = color;
+		}
+
+		if (bpmem.dstalpha.enable)
+			dstClrPtr[ALP_C] = bpmem.dstalpha.alpha;
+
+		if (bpmem.blendmode.colorupdate)
+		{
+			if (bpmem.blendmode.alphaupdate)
+				SetPixelAlphaColor(offset, dstClrPtr);
+			else
+				SetPixelColorOnly(offset, dstClrPtr);
+		}
+		else if (bpmem.blendmode.alphaupdate)
+		{
+			SetPixelAlphaOnly(offset, dstClrPtr[ALP_C]);
+		}
+	}
+
+	void SetColor(u16 x, u16 y, u8 *color)
+	{
+		u32 offset = GetColorOffset(x, y);
+		if (bpmem.blendmode.colorupdate)
+		{
+			if (bpmem.blendmode.alphaupdate)
+				SetPixelAlphaColor(offset, color);
+			else
+				SetPixelColorOnly(offset, color);
+		}
+		else if (bpmem.blendmode.alphaupdate)
+		{
+			SetPixelAlphaOnly(offset, color[ALP_C]);
+		}
+	}
+
+	void SetDepth(u16 x, u16 y, u32 depth)
+	{
+		if (bpmem.zmode.updateenable)
+			SetPixelDepth(GetDepthOffset(x, y), depth);
+	}
+
+	void GetColor(u16 x, u16 y, u8 *color)
+	{
+		u32 offset = GetColorOffset(x, y);
+		GetPixelColor(offset, color);
+	}
+
+	// For internal used only, return a non-normalized value, which saves work later.
+	void GetColorYUV(u16 x, u16 y, yuv444 *out)
+	{
+		u8 color[4];
+		GetColor(x, y, color);
+
+		// GameCube/Wii uses the BT.601 standard algorithm for converting to YCbCr; see
+		// http://www.equasys.de/colorconversion.html#YCbCr-RGBColorFormatConversion
+		out->Y = (u8)( 0.257f * color[RED_C] +  0.504f * color[GRN_C] +  0.098f * color[BLU_C]);
+		out->U = (u8)(-0.148f * color[RED_C] + -0.291f * color[GRN_C] +  0.439f * color[BLU_C]);
+		out->V = (u8)( 0.439f * color[RED_C] + -0.368f * color[GRN_C] + -0.071f * color[BLU_C]);
+	}
+
+	u32 GetDepth(u16 x, u16 y)
+	{
+		u32 offset = GetDepthOffset(x, y);
+		return GetPixelDepth(offset);
+	}
+
+	u8 *GetPixelPointer(u16 x, u16 y, bool depth)
+	{
+		if (depth)
+			return &efb[GetDepthOffset(x, y)];
+		return &efb[GetColorOffset(x, y)];
+	}
+
+	void CopyToXFB(yuv422_packed* xfb_in_ram, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
+	{
+		// FIXME: We should do Gamma correction
+
+		if (!xfb_in_ram)
+		{
+			WARN_LOG(VIDEO, "Tried to copy to invalid XFB address");
+			return;
+		}
+
+		int left = sourceRc.left;
+		int right = sourceRc.right;
+
+		// this assumes copies will always start on an even (YU) pixel and the
+		// copy always has an even width, which might not be true.
+		if (left & 1 || right & 1)
+		{
+			WARN_LOG(VIDEO, "Trying to copy XFB to from unaligned EFB source");
+			// this will show up as wrongly encoded
+		}
+
+		// Scanline buffer, leave room for borders
+		yuv444 scanline[EFB_WIDTH+2];
+
+		// our internal yuv444 type is not normalized, so black is {0, 0, 0} instead of {16, 128, 128}
+		yuv444 black;
+		black.Y = 0;
+		black.U = 0;
+		black.V = 0;
+
+		scanline[0] = black; // black border at start
+		scanline[right+1] = black; // black border at end
+
+		for (u16 y = sourceRc.top; y < sourceRc.bottom; y++)
+		{
+			// Get a scanline of YUV pixels in 4:4:4 format
+
+			for (int i = 1, x = left; x < right; i++, x++)
+			{
+				GetColorYUV(x, y, &scanline[i]);
+			}
+
+			// And Downsample them to 4:2:2
+			for (int i = 1, x = left; x < right; i+=2, x+=2)
+			{
+				// YU pixel
+				xfb_in_ram[x].Y = scanline[i].Y + 16;
+				// we mix our color differences in 10 bit space so it will round more accurately
+				// U[i] = 1/4 * U[i-1] + 1/2 * U[i] + 1/4 * U[i+1]
+				xfb_in_ram[x].UV = 128 + ((scanline[i-1].U + (scanline[i].U << 1) + scanline[i+1].U) >> 2);
+
+				// YV pixel
+				xfb_in_ram[x+1].Y = scanline[i+1].Y + 16;
+				// V[i] = 1/4 * V[i-1] + 1/2 * V[i] + 1/4 * V[i+1]
+				xfb_in_ram[x+1].UV = 128 + ((scanline[i].V + (scanline[i+1].V << 1) + scanline[i+2].V) >> 2);
+			}
+			xfb_in_ram += fbWidth;
+		}
+	}
+
+	// Like CopyToXFB, but we copy directly into the OpenGL color texture without going via GameCube main memory or doing a yuyv conversion
+	void BypassXFB(u8* texture, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
+	{
+		if (fbWidth*fbHeight > MAX_XFB_WIDTH*MAX_XFB_HEIGHT)
+		{
+			ERROR_LOG(VIDEO, "Framebuffer is too large: %ix%i", fbWidth, fbHeight);
+			return;
+		}
+
+		u32 color;
+		u8* colorPtr = (u8*)&color;
+		u32* texturePtr = (u32*)texture;
+		u32 textureAddress = 0;
+
+		int left = sourceRc.left;
+		int right = sourceRc.right;
+
+		for (u16 y = sourceRc.top; y < sourceRc.bottom; y++)
+		{
+			for (u16 x = left; x < right; x++)
+			{
+				GetColor(x, y, colorPtr);
+				texturePtr[textureAddress++] = Common::swap32(color);
+			}
+		}
+	}
+
+	bool ZCompare(u16 x, u16 y, u32 z)
+	{
+		u32 offset = GetDepthOffset(x, y);
+		u32 depth = GetPixelDepth(offset);
+
+		bool pass;
+
+		switch (bpmem.zmode.func)
+		{
+		case ZMode::NEVER:
+			pass = false;
+			break;
+		case ZMode::LESS:
+			pass = z < depth;
+			break;
+		case ZMode::EQUAL:
+			pass = z == depth;
+			break;
+		case ZMode::LEQUAL:
+			pass = z <= depth;
+			break;
+		case ZMode::GREATER:
+			pass = z > depth;
+			break;
+		case ZMode::NEQUAL:
+			pass = z != depth;
+			break;
+		case ZMode::GEQUAL:
+			pass = z >= depth;
+			break;
+		case ZMode::ALWAYS:
+			pass = true;
+			break;
+		default:
+			pass = false;
+			ERROR_LOG(VIDEO, "Bad Z compare mode %i", (int)bpmem.zmode.func);
+		}
+
+		if (pass && bpmem.zmode.updateenable)
+		{
+			SetPixelDepth(offset, z);
+		}
+
+		return pass;
+	}
+}
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h
new file mode 100644
index 0000000000..999dfbf8c4
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/EfbInterface.h
@@ -0,0 +1,76 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/VideoCommon.h"
+
+namespace EfbInterface
+{
+	const int DEPTH_BUFFER_START = EFB_WIDTH * EFB_HEIGHT * 3;
+
+	// xfb color format - packed so the compiler doesn't mess with alignment
+#pragma pack(push,1)
+	struct yuv422_packed
+	{
+		u8 Y;
+		u8 UV;
+	};
+#pragma pack(pop)
+
+	// But this struct is only used internally, so we could optimise alignment
+	struct yuv444
+	{
+		u8 Y;
+		s8 U;
+		s8 V;
+	};
+
+	enum
+	{
+		ALP_C,
+		BLU_C,
+		GRN_C,
+		RED_C
+	};
+
+	// color order is ABGR in order to emulate RGBA on little-endian hardware
+
+	// does full blending of an incoming pixel
+	void BlendTev(u16 x, u16 y, u8 *color);
+
+	// compare z at location x,y
+	// writes it if it passes
+	// returns result of compare.
+	bool ZCompare(u16 x, u16 y, u32 z);
+
+	// sets the color and alpha
+	void SetColor(u16 x, u16 y, u8 *color);
+	void SetDepth(u16 x, u16 y, u32 depth);
+
+	void GetColor(u16 x, u16 y, u8 *color);
+	void GetColorYUV(u16 x, u16 y, yuv444 *color);
+	u32 GetDepth(u16 x, u16 y);
+
+	u8* GetPixelPointer(u16 x, u16 y, bool depth);
+
+	void CopyToXFB(yuv422_packed* xfb_in_ram, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma);
+	void BypassXFB(u8* texture, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma);
+
+	void DoState(PointerWrap &p);
+
+	extern u32 perf_values[PQ_NUM_MEMBERS];
+	inline void IncPerfCounterQuadCount(PerfQueryType type)
+	{
+		// NOTE: hardware doesn't process individual pixels but quads instead.
+		// Current software renderer architecture works on pixels though, so
+		// we have this "quad" hack here to only increment the registers on
+		// every fourth rendered pixel
+		static u32 quad[PQ_NUM_MEMBERS];
+		if (++quad[type] != 3)
+			return;
+		quad[type] = 0;
+		++perf_values[type];
+	}
+}
diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/HwRasterizer.cpp
new file mode 100644
index 0000000000..7ddf15bb38
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp
@@ -0,0 +1,382 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/MemoryUtil.h"
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+
+#include "VideoCommon/VideoCommon.h"
+
+#define TEMP_SIZE (1024*1024*4)
+
+namespace HwRasterizer
+{
+	static float efbHalfWidth;
+	static float efbHalfHeight;
+	static bool hasTexture;
+
+	static u8 *temp;
+
+	// Programs
+	static GLuint colProg, texProg, clearProg;
+
+	// Texture type
+	static GLenum texType;
+
+	// Color
+	static GLint col_apos = -1, col_atex = -1;
+	// Tex
+	static GLint tex_apos = -1, tex_atex = -1, tex_utex = -1;
+	// Clear shader
+	static GLint clear_apos = -1, clear_ucol = -1;
+
+	static void CreateShaders()
+	{
+		// Color Vertices
+		static const char *fragcolText =
+			"#ifdef GL_ES\n"
+			"precision highp float;\n"
+			"#endif\n"
+			"varying vec4 TexCoordOut;\n"
+			"void main() {\n"
+			"	gl_FragColor = TexCoordOut;\n"
+			"}\n";
+		// Texture Vertices
+		static const char *fragtexText =
+			"#ifdef GL_ES\n"
+			"precision highp float;\n"
+			"#define texture2DRect texture2D\n"
+			"#define sampler2DRect sampler2D\n"
+			"#endif\n"
+			"varying vec4 TexCoordOut;\n"
+			"uniform sampler2DRect Texture;\n"
+			"void main() {\n"
+			"	gl_FragColor = texture2DRect(Texture, TexCoordOut.xy);\n"
+			"}\n";
+		// Clear shader
+		static const char *fragclearText =
+			"#ifdef GL_ES\n"
+			"precision highp float;\n"
+			"#endif\n"
+			"uniform vec4 Color;\n"
+			"void main() {\n"
+			"	gl_FragColor = Color;\n"
+			"}\n";
+		// Generic passthrough vertice shaders
+		static const char *vertShaderText =
+			"attribute vec4 pos;\n"
+			"attribute vec4 TexCoordIn;\n "
+			"varying vec4 TexCoordOut;\n "
+			"void main() {\n"
+			"	gl_Position = pos;\n"
+			"	TexCoordOut = TexCoordIn;\n"
+			"}\n";
+		static const char *vertclearText =
+			"attribute vec4 pos;\n"
+			"void main() {\n"
+			"	gl_Position = pos;\n"
+			"}\n";
+
+		// Color Program
+		colProg = OpenGL_CompileProgram(vertShaderText, fragcolText);
+
+		// Texture Program
+		texProg = OpenGL_CompileProgram(vertShaderText, fragtexText);
+
+		// Clear Program
+		clearProg = OpenGL_CompileProgram(vertclearText, fragclearText);
+
+		// Color attributes
+		col_apos = glGetAttribLocation(colProg, "pos");
+		col_atex = glGetAttribLocation(colProg, "TexCoordIn");
+		// Texture attributes
+		tex_apos = glGetAttribLocation(texProg, "pos");
+		tex_atex = glGetAttribLocation(texProg, "TexCoordIn");
+		tex_utex = glGetUniformLocation(texProg, "Texture");
+		// Clear attributes
+		clear_apos = glGetAttribLocation(clearProg, "pos");
+		clear_ucol = glGetUniformLocation(clearProg, "Color");
+	}
+
+	void Init()
+	{
+		efbHalfWidth = EFB_WIDTH / 2.0f;
+		efbHalfHeight = 480 / 2.0f;
+
+		temp = (u8*)AllocateMemoryPages(TEMP_SIZE);
+	}
+	void Shutdown()
+	{
+		glDeleteProgram(colProg);
+		glDeleteProgram(texProg);
+		glDeleteProgram(clearProg);
+	}
+	void Prepare()
+	{
+		//legacy multitexturing: select texture channel only.
+		glActiveTexture(GL_TEXTURE0);
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
+		if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+		{
+			glShadeModel(GL_SMOOTH);
+			glDisable(GL_BLEND);
+			glClearDepth(1.0f);
+			glEnable(GL_SCISSOR_TEST);
+			glDisable(GL_LIGHTING);
+			glMatrixMode(GL_PROJECTION);
+			glLoadIdentity();
+			glMatrixMode(GL_MODELVIEW);
+			glLoadIdentity();
+
+			glClientActiveTexture(GL_TEXTURE0);
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+			glEnable(GL_TEXTURE_RECTANGLE_ARB);
+			glStencilFunc(GL_ALWAYS, 0, 0);
+			glDisable(GL_STENCIL_TEST);
+		}
+		// used by hw rasterizer if it enables blending and depth test
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glDepthFunc(GL_LEQUAL);
+
+		glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+		CreateShaders();
+		if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+			texType = GL_TEXTURE_RECTANGLE;
+		else
+			texType = GL_TEXTURE_2D;
+	}
+	static float width, height;
+	static void LoadTexture()
+	{
+		FourTexUnits &texUnit = bpmem.tex[0];
+		u32 imageAddr = texUnit.texImage3[0].image_base;
+		// Texture Rectangle uses pixel coordinates
+		// While GLES uses texture coordinates
+		if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+		{
+			width = (float)texUnit.texImage0[0].width;
+			height = (float)texUnit.texImage0[0].height;
+		}
+		else
+		{
+			width = 1;
+			height = 1;
+		}
+		TexCacheEntry &cacheEntry = textures[imageAddr];
+		cacheEntry.Update();
+
+		glBindTexture(texType, cacheEntry.texture);
+		glTexParameteri(texType, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
+		glTexParameteri(texType, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
+	}
+
+	void BeginTriangles()
+	{
+		// disabling depth test sometimes allows more things to be visible
+		glEnable(GL_DEPTH_TEST);
+		glEnable(GL_BLEND);
+
+		hasTexture = bpmem.tevorders[0].enable0;
+
+		if (hasTexture)
+			LoadTexture();
+	}
+
+	void EndTriangles()
+	{
+		glBindTexture(texType, 0);
+		glDisable(GL_DEPTH_TEST);
+		glDisable(GL_BLEND);
+	}
+
+	static void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
+	{
+		float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
+		float z0 = v0->screenPosition.z / (float)0x00ffffff;
+
+		float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
+		float z1 = v1->screenPosition.z / (float)0x00ffffff;
+
+		float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
+		float z2 = v2->screenPosition.z / (float)0x00ffffff;
+
+		float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f;
+		float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f;
+		float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f;
+
+		float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f;
+		float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f;
+		float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f;
+
+		float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f;
+		float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f;
+		float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f;
+
+		static const GLfloat verts[3][3] = {
+			{ x0, y0, z0 },
+			{ x1, y1, z1 },
+			{ x2, y2, z2 }
+		};
+		static const GLfloat col[3][4] = {
+			{ r0, g0, b0, 1.0f },
+			{ r1, g1, b1, 1.0f },
+			{ r2, g2, b2, 1.0f }
+		};
+		{
+			glUseProgram(colProg);
+			glEnableVertexAttribArray(col_apos);
+			glEnableVertexAttribArray(col_atex);
+
+			glVertexAttribPointer(col_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
+			glVertexAttribPointer(col_atex, 4, GL_FLOAT, GL_FALSE, 0, col);
+				glDrawArrays(GL_TRIANGLES, 0, 3);
+			glDisableVertexAttribArray(col_atex);
+			glDisableVertexAttribArray(col_apos);
+		}
+	}
+
+	static void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
+	{
+		float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
+		float z0 = v0->screenPosition.z;
+
+		float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
+		float z1 = v1->screenPosition.z;
+
+		float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
+		float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
+		float z2 = v2->screenPosition.z;
+
+		float s0 = v0->texCoords[0].x / width;
+		float t0 = v0->texCoords[0].y / height;
+
+		float s1 = v1->texCoords[0].x / width;
+		float t1 = v1->texCoords[0].y / height;
+
+		float s2 = v2->texCoords[0].x / width;
+		float t2 = v2->texCoords[0].y / height;
+
+		static const GLfloat verts[3][3] = {
+			{ x0, y0, z0 },
+			{ x1, y1, z1 },
+			{ x2, y2, z2 }
+		};
+		static const GLfloat tex[3][2] = {
+			{ s0, t0 },
+			{ s1, t1 },
+			{ s2, t2 }
+		};
+		{
+			glUseProgram(texProg);
+			glEnableVertexAttribArray(tex_apos);
+			glEnableVertexAttribArray(tex_atex);
+
+			glVertexAttribPointer(tex_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
+			glVertexAttribPointer(tex_atex, 2, GL_FLOAT, GL_FALSE, 0, tex);
+				glUniform1i(tex_utex, 0);
+				glDrawArrays(GL_TRIANGLES, 0, 3);
+			glDisableVertexAttribArray(tex_atex);
+			glDisableVertexAttribArray(tex_apos);
+		}
+	}
+
+	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
+	{
+		if (hasTexture)
+			DrawTextureVertex(v0, v1, v2);
+		else
+			DrawColorVertex(v0, v1, v2);
+	}
+
+	void Clear()
+	{
+		u8 r = (bpmem.clearcolorAR & 0x00ff);
+		u8 g = (bpmem.clearcolorGB & 0xff00) >> 8;
+		u8 b = (bpmem.clearcolorGB & 0x00ff);
+		u8 a = (bpmem.clearcolorAR & 0xff00) >> 8;
+
+		GLfloat left   = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f;
+		GLfloat top    = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight;
+		GLfloat right  = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f;
+		GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight;
+		GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff;
+		static const GLfloat verts[4][3] = {
+			{ left, top, depth },
+			{ right, top, depth },
+			{ right, bottom, depth },
+			{ left, bottom, depth }
+		};
+		{
+			glUseProgram(clearProg);
+			glVertexAttribPointer(clear_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
+			glUniform4f(clear_ucol, r, g, b, a);
+			glEnableVertexAttribArray(col_apos);
+				glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+			glDisableVertexAttribArray(col_apos);
+		}
+	}
+
+	TexCacheEntry::TexCacheEntry()
+	{
+		Create();
+	}
+
+	void TexCacheEntry::Create()
+	{
+		FourTexUnits &texUnit = bpmem.tex[0];
+
+		texImage0.hex = texUnit.texImage0[0].hex;
+		texImage1.hex = texUnit.texImage1[0].hex;
+		texImage2.hex = texUnit.texImage2[0].hex;
+		texImage3.hex = texUnit.texImage3[0].hex;
+		texTlut.hex = texUnit.texTlut[0].hex;
+
+		int image_width = texImage0.width;
+		int image_height = texImage0.height;
+
+		DebugUtil::GetTextureRGBA(temp, 0, 0, image_width, image_height);
+
+		glGenTextures(1, (GLuint *)&texture);
+		glBindTexture(texType, texture);
+		glTexImage2D(texType, 0, GL_RGBA, (GLsizei)image_width, (GLsizei)image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
+	}
+
+	void TexCacheEntry::Destroy()
+	{
+		if (texture == 0)
+			return;
+
+		glDeleteTextures(1, &texture);
+		texture = 0;
+	}
+
+	void TexCacheEntry::Update()
+	{
+		FourTexUnits &texUnit = bpmem.tex[0];
+
+		// extra checks cause textures to be reloaded much more
+		if (texUnit.texImage0[0].hex != texImage0.hex ||
+		//	texUnit.texImage1[0].hex != texImage1.hex ||
+		//	texUnit.texImage2[0].hex != texImage2.hex ||
+			texUnit.texImage3[0].hex != texImage3.hex ||
+			texUnit.texTlut[0].hex   != texTlut.hex)
+		{
+			Destroy();
+			Create();
+		}
+	}
+}
+
diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.h b/Source/Core/VideoBackends/Software/HwRasterizer.h
new file mode 100644
index 0000000000..a58f5416c4
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.h
@@ -0,0 +1,47 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+
+struct OutputVertexData;
+
+namespace HwRasterizer
+{
+	void Init();
+	void Shutdown();
+
+	void Prepare();
+
+	void BeginTriangles();
+	void EndTriangles();
+
+	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
+
+	void Clear();
+
+	struct TexCacheEntry
+	{
+		TexImage0 texImage0;
+		TexImage1 texImage1;
+		TexImage2 texImage2;
+		TexImage3 texImage3;
+		TexTLUT texTlut;
+
+		GLuint texture;
+
+		TexCacheEntry();
+
+		void Create();
+		void Destroy();
+		void Update();
+	};
+
+	typedef std::map<u32, TexCacheEntry> TextureCache;
+	static TextureCache textures;
+}
diff --git a/Source/Core/VideoBackends/Software/NativeVertexFormat.h b/Source/Core/VideoBackends/Software/NativeVertexFormat.h
new file mode 100644
index 0000000000..400a7dabb0
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/NativeVertexFormat.h
@@ -0,0 +1,92 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/Vec3.h"
+
+struct Vec4
+{
+	float x;
+	float y;
+	float z;
+	float w;
+};
+
+struct InputVertexData
+{
+	u8 posMtx;
+	u8 texMtx[8];
+
+	Vec3 position;
+	Vec3 normal[3];
+	u8 color[2][4];
+	float texCoords[8][2];
+};
+
+struct OutputVertexData
+{
+	// components in color channels
+	enum
+	{
+		RED_C,
+		GRN_C,
+		BLU_C,
+		ALP_C
+	};
+
+	Vec3 mvPosition;
+	Vec4 projectedPosition;
+	Vec3 screenPosition;
+	Vec3 normal[3];
+	u8 color[2][4];
+	Vec3 texCoords[8];
+
+	void Lerp(float t, OutputVertexData *a, OutputVertexData *b)
+	{
+		#define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T)
+
+		#define LINTERP_INT(T, OUT, IN) (OUT) + (((IN - OUT) * T) >> 8)
+
+		mvPosition = LINTERP(t, a->mvPosition, b->mvPosition);
+
+		projectedPosition.x = LINTERP(t, a->projectedPosition.x, b->projectedPosition.x);
+		projectedPosition.y = LINTERP(t, a->projectedPosition.y, b->projectedPosition.y);
+		projectedPosition.z = LINTERP(t, a->projectedPosition.z, b->projectedPosition.z);
+		projectedPosition.w = LINTERP(t, a->projectedPosition.w, b->projectedPosition.w);
+
+		for (int i = 0; i < 3; ++i)
+		{
+			normal[i] = LINTERP(t, a->normal[i], b->normal[i]);
+		}
+
+		u16 t_int = (u16)(t * 256);
+		for (int i = 0; i < 4; ++i)
+		{
+			color[0][i] = LINTERP_INT(t_int, a->color[0][i], b->color[0][i]);
+			color[1][i] = LINTERP_INT(t_int, a->color[1][i], b->color[1][i]);
+		}
+
+		for (int i = 0; i < 8; ++i)
+		{
+			texCoords[i] = LINTERP(t, a->texCoords[i], b->texCoords[i]);
+		}
+
+		#undef LINTERP
+		#undef LINTERP_INT
+	}
+	void DoState(PointerWrap &p)
+	{
+		mvPosition.DoState(p);
+		p.Do(projectedPosition);
+		screenPosition.DoState(p);
+		for (auto& vec : normal)
+			vec.DoState(p);
+		p.DoArray(color, sizeof color);
+		for (auto& vec : texCoords)
+			vec.DoState(p);
+	}
+
+};
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
similarity index 75%
rename from Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
rename to Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
index 7c3408a316..2e9cfa984e 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
@@ -1,28 +1,27 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-
-#include "DataReader.h"
-
-#include "OpcodeDecoder.h"
-#include "BPMemLoader.h"
-#include "CPMemLoader.h"
-#include "XFMemLoader.h"
-#include "SWVertexLoader.h"
-#include "SWStatistics.h"
-#include "DebugUtil.h"
-#include "SWCommandProcessor.h"
-#include "CPMemLoader.h"
-#include "SWVideoConfig.h"
-#include "HW/Memmap.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/VertexLoaderUtils.h"
 
 typedef void (*DecodingFunction)(u32);
 
 namespace OpcodeDecoder
 {
-static DecodingFunction currentFunction = NULL;
+static DecodingFunction currentFunction = nullptr;
 static u32 minCommandSize;
 static u16 streamSize;
 static u16 streamAddress;
@@ -35,7 +34,7 @@ static u8 lastPrimCmd;
 void DoState(PointerWrap &p)
 {
 	p.Do(minCommandSize);
-	// Not sure what is wrong with this. Something(s) in here is causing dolphin to crash/hang when loading states saved from another run of dolphin. Doesn't seem too important anyway...
+	// Not sure what is wrong with this. Something(s) in here is causing Dolphin to crash/hang when loading states saved from another run of Dolphin. Doesn't seem too important anyway...
 	//vertexLoader.DoState(p);
 	p.Do(readOpcode);
 	p.Do(inObjectStream);
@@ -46,7 +45,7 @@ void DoState(PointerWrap &p)
 		  ResetDecoding();
 }
 
-void DecodePrimitiveStream(u32 iBufferSize)
+static void DecodePrimitiveStream(u32 iBufferSize)
 {
 	u32 vertexSize = vertexLoader.GetVertexSize();
 
@@ -58,7 +57,7 @@ void DecodePrimitiveStream(u32 iBufferSize)
 	{
 		while (streamSize > 0 && iBufferSize >= vertexSize)
 		{
-			g_pVideoData += vertexSize;
+			g_video_buffer_read_ptr += vertexSize;
 			iBufferSize -= vertexSize;
 			streamSize--;
 		}
@@ -80,9 +79,9 @@ void DecodePrimitiveStream(u32 iBufferSize)
 	}
 }
 
-void ReadXFData(u32 iBufferSize)
+static void ReadXFData(u32 iBufferSize)
 {
-	_assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding"); 
+	_assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding");
 
 	u32 pData[16];
 	for (int i = 0; i < streamSize; i++)
@@ -93,33 +92,33 @@ void ReadXFData(u32 iBufferSize)
 	ResetDecoding();
 }
 
-void ExecuteDisplayList(u32 addr, u32 count)
+static void ExecuteDisplayList(u32 addr, u32 count)
 {
-	u8 *videoDataSave = g_pVideoData;
+	u8 *videoDataSave = g_video_buffer_read_ptr;
 
 	u8 *dlStart = Memory::GetPointer(addr);
 
-	g_pVideoData = dlStart;
+	g_video_buffer_read_ptr = dlStart;
 
 	while (OpcodeDecoder::CommandRunnable(count))
 	{
 		OpcodeDecoder::Run(count);
 
 		// if data was read by the opcode decoder then the video data pointer changed
-		u32 readCount = (u32)(g_pVideoData - dlStart);
-		dlStart = g_pVideoData;
+		u32 readCount = (u32)(g_video_buffer_read_ptr - dlStart);
+		dlStart = g_video_buffer_read_ptr;
 
-		_assert_msg_(VIDEO, count >= readCount, "Display list underrun"); 
+		_assert_msg_(VIDEO, count >= readCount, "Display list underrun");
 
 		count -= readCount;
 	}
 
-	g_pVideoData = videoDataSave;
+	g_video_buffer_read_ptr = videoDataSave;
 }
 
-void DecodeStandard(u32 bufferSize)
+static void DecodeStandard(u32 bufferSize)
 {
-	_assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding"); 
+	_assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding");
 
 	int Cmd = DataReadU8();
 
@@ -142,7 +141,7 @@ void DecodeStandard(u32 bufferSize)
 		DebugUtil::OnObjectBegin();
 	}
 #endif
-	switch(Cmd)
+	switch (Cmd)
 	{
 	case GX_NOP:
 		break;
@@ -191,8 +190,8 @@ void DecodeStandard(u32 bufferSize)
 		// zelda 4 swords calls it and checks the metrics registers after that
 		break;
 
-	case GX_CMD_INVL_VC:// Invalidate	(vertex cache?)	
-		DEBUG_LOG(VIDEO, "Invalidate	(vertex cache?)");
+	case GX_CMD_INVL_VC:// Invalidate (vertex cache?)
+		DEBUG_LOG(VIDEO, "Invalidate  (vertex cache?)");
 		break;
 
 	case GX_LOAD_BP_REG: //0x61
@@ -202,9 +201,9 @@ void DecodeStandard(u32 bufferSize)
 		}
 		break;
 
-	// draw primitives 
+	// draw primitives
 	default:
-		if (Cmd & 0x80)
+		if ((Cmd & 0xC0) == 0x80)
 		{
 			u8 vatIndex = Cmd & GX_VAT_MASK;
 			u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT;
@@ -253,7 +252,7 @@ bool CommandRunnable(u32 iBufferSize)
 		u8 Cmd = DataPeek8(0);
 		u32 minSize = 1;
 
-		switch(Cmd)
+		switch (Cmd)
 		{
 		case GX_LOAD_CP_REG: //0x08
 			minSize = 6;
@@ -284,9 +283,9 @@ bool CommandRunnable(u32 iBufferSize)
 			minSize = 5;
 			break;
 
-		// draw primitives 
+		// draw primitives
 		default:
-			if (Cmd & 0x80)
+			if ((Cmd & 0xC0) == 0x80)
 				minSize = 3;
 			break;
 		}
diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
new file mode 100644
index 0000000000..83630fa202
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
@@ -0,0 +1,52 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class PointerWrap;
+
+namespace OpcodeDecoder
+{
+
+	#define GX_NOP                      0x00
+
+	#define GX_LOAD_BP_REG              0x61
+	#define GX_LOAD_CP_REG              0x08
+	#define GX_LOAD_XF_REG              0x10
+	#define GX_LOAD_INDX_A              0x20
+	#define GX_LOAD_INDX_B              0x28
+	#define GX_LOAD_INDX_C              0x30
+	#define GX_LOAD_INDX_D              0x38
+
+	#define GX_CMD_CALL_DL              0x40
+	#define GX_CMD_INVL_VC              0x48
+
+	#define GX_PRIMITIVE_MASK           0x38
+	#define GX_PRIMITIVE_SHIFT          3
+	#define GX_VAT_MASK                 0x07
+
+	// These values are the values extracted using GX_PRIMITIVE_MASK
+	// and GX_PRIMITIVE_SHIFT.
+	// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
+	#define GX_DRAW_QUADS               0x0   //0x80
+	#define GX_DRAW_QUADS_2             0x1   //0x88
+	#define GX_DRAW_TRIANGLES           0x2   //0x90
+	#define GX_DRAW_TRIANGLE_STRIP      0x3   //0x98
+	#define GX_DRAW_TRIANGLE_FAN        0x4   //0xA0
+	#define GX_DRAW_LINES               0x5   //0xA8
+	#define GX_DRAW_LINE_STRIP          0x6   //0xB0
+	#define GX_DRAW_POINTS              0x7   //0xB8
+
+	void Init();
+
+	void ResetDecoding();
+
+	bool CommandRunnable(u32 iBufferSize);
+
+	void Run(u32 iBufferSize);
+
+	void DoState(PointerWrap &p);
+}
diff --git a/Source/Core/VideoBackends/Software/RasterFont.cpp b/Source/Core/VideoBackends/Software/RasterFont.cpp
new file mode 100644
index 0000000000..70b1f3e05a
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/RasterFont.cpp
@@ -0,0 +1,211 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string.h>
+
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/RasterFont.h"
+
+const GLubyte rasters[][13] = {
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
+	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18},
+	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70},
+	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e},
+	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c},
+	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30},
+	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03},
+	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06},
+	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60},
+	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e},
+	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18},
+	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e},
+	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3},
+	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c},
+	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60},
+	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18},
+	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03},
+	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e},
+	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00},
+	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00},
+	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78},
+	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00},
+	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f},
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}
+};
+
+RasterFont::RasterFont()
+{
+	// set GL modes
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+	// create the raster font
+	fontOffset = glGenLists(128);
+	for (int i = 32; i < 127; i++)
+	{
+		glNewList(i + fontOffset, GL_COMPILE);
+		glBitmap(8, 13, 0.0f, 2.0f, 10.0f, 0.0f, rasters[i - 32]);
+		glEndList();
+	}
+
+	temp_buffer = new char[TEMP_BUFFER_SIZE];
+}
+
+RasterFont::~RasterFont()
+{
+	glDeleteLists(fontOffset, 128);
+	delete [] temp_buffer;
+}
+
+void RasterFont::printString(const char *s, double x, double y, double z)
+{
+	int length = (int)strlen(s);
+	if (!length)
+		return;
+	if (length >= TEMP_BUFFER_SIZE)
+		length = TEMP_BUFFER_SIZE - 1;
+
+	// Sanitize string to avoid GL errors.
+	char *s2 = temp_buffer;
+	memcpy(s2, s, length);
+	s2[length] = 0;
+	for (int i = 0; i < length; i++)
+	{
+		if (s2[i] < 32 || s2[i] > 126)
+			s2[i] = '!';
+	}
+
+	// go to the right spot
+	glRasterPos3d(x, y, z);
+
+	glPushAttrib (GL_LIST_BIT);
+	glListBase(fontOffset);
+	glCallLists((GLsizei)strlen(s2), GL_UNSIGNED_BYTE, (GLubyte *) s2);
+
+	glPopAttrib();
+}
+
+void RasterFont::printCenteredString(const char *s, double y, int screen_width, double z)
+{
+	int length = (int)strlen(s);
+	int x = (int)(screen_width/2.0 - (length/2.0) * CHAR_WIDTH);
+	printString(s, x, y, z);
+}
+
+void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight)
+{
+	double x = start_x;
+	double y = start_y;
+	char temp[1024];
+	char *t = temp;
+	while (*text)
+	{
+		if (*text == '\n')
+		{
+			*t = 0;
+			printString(temp, x, y, z);
+			y -= CHAR_HEIGHT * 2.0f / bbHeight;
+			x = start_x;
+			t = temp;
+		}
+		else if (*text == '\r')
+		{
+			t = temp;
+		}
+		else if (*text == '\t')
+		{
+			//todo: add tabs every something like 4 * CHAR_WIDTH
+			*t = 0;
+			int cpos = (int)strlen(temp);
+			int newpos = (cpos + 4) & (~3);
+			printString(temp, x, y, z);
+			x = start_x + (CHAR_WIDTH * newpos) * 2.0f / bbWidth;
+			t = temp;
+			*t++ = ' ';
+		}
+		else
+		{
+			*t++ = *text;
+		}
+
+		text++;
+	}
+
+	// ????
+	if (t != text)
+	{
+		*t = 0;
+		printString(temp, x, y, z);
+	}
+}
diff --git a/Source/Core/VideoBackends/Software/RasterFont.h b/Source/Core/VideoBackends/Software/RasterFont.h
new file mode 100644
index 0000000000..ceb6a9a222
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/RasterFont.h
@@ -0,0 +1,27 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+class RasterFont
+{
+public:
+	RasterFont();
+	~RasterFont();
+	static int debug;
+
+	// and the happy helper functions
+	void printString(const char *s, double x, double y, double z=0.0);
+	void printCenteredString(const char *s, double y, int screen_width, double z=0.0);
+
+	void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight);
+
+private:
+	int fontOffset;
+	char *temp_buffer;
+
+	static const int TEMP_BUFFER_SIZE = 64 * 1024;
+	static const int CHAR_WIDTH = 10;
+	static const int CHAR_HEIGHT = 15;
+};
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp
new file mode 100644
index 0000000000..4a04e02f7c
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp
@@ -0,0 +1,706 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/Tev.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/BoundingBox.h"
+
+
+#define BLOCK_SIZE 2
+
+#define CLAMP(x, a, b) (x>b)?b:(x<a)?a:x
+
+// returns approximation of log2(f) in s28.4
+// results are close enough to use for LOD
+static inline s32 FixedLog2(float f)
+{
+	u32 *x = (u32*)&f;
+	s32 logInt = ((*x & 0x7F800000) >> 19) - 2032; // integer part
+	s32 logFract = (*x & 0x007fffff) >> 19; // approximate fractional part
+
+	return logInt + logFract;
+}
+
+namespace Rasterizer
+{
+static Slope ZSlope;
+static Slope WSlope;
+static Slope ColorSlopes[2][4];
+static Slope TexSlopes[8][3];
+
+static s32 vertex0X;
+static s32 vertex0Y;
+static float vertexOffsetX;
+static float vertexOffsetY;
+
+static s32 scissorLeft = 0;
+static s32 scissorTop = 0;
+static s32 scissorRight = 0;
+static s32 scissorBottom = 0;
+
+static Tev tev;
+static RasterBlock rasterBlock;
+
+void DoState(PointerWrap &p)
+{
+	ZSlope.DoState(p);
+	WSlope.DoState(p);
+	for (auto& color_slopes_1d : ColorSlopes)
+		for (Slope& color_slope : color_slopes_1d)
+			color_slope.DoState(p);
+	for (auto& tex_slopes_1d : TexSlopes)
+		for (Slope& tex_slope : tex_slopes_1d)
+			tex_slope.DoState(p);
+	p.Do(vertex0X);
+	p.Do(vertex0Y);
+	p.Do(vertexOffsetX);
+	p.Do(vertexOffsetY);
+	p.Do(scissorLeft);
+	p.Do(scissorTop);
+	p.Do(scissorRight);
+	p.Do(scissorBottom);
+	tev.DoState(p);
+	p.Do(rasterBlock);
+}
+
+void Init()
+{
+	tev.Init();
+
+	// Set initial z reference plane in the unlikely case that zfreeze is enabled when drawing the first primitive.
+	// TODO: This is just a guess!
+	ZSlope.dfdx = ZSlope.dfdy = 0.f;
+	ZSlope.f0 = 1.f;
+}
+
+static inline int iround(float x)
+{
+	int t = (int)x;
+	if ((x - t) >= 0.5)
+		return t + 1;
+
+	return t;
+}
+
+void SetScissor()
+{
+	int xoff = bpmem.scissorOffset.x * 2 - 342;
+	int yoff = bpmem.scissorOffset.y * 2 - 342;
+
+	scissorLeft = bpmem.scissorTL.x - xoff - 342;
+	if (scissorLeft < 0)
+		scissorLeft = 0;
+
+	scissorTop = bpmem.scissorTL.y - yoff - 342;
+	if (scissorTop < 0)
+		scissorTop = 0;
+
+	scissorRight = bpmem.scissorBR.x - xoff - 341;
+	if (scissorRight > EFB_WIDTH)
+		scissorRight = EFB_WIDTH;
+
+	scissorBottom = bpmem.scissorBR.y - yoff - 341;
+	if (scissorBottom > EFB_HEIGHT)
+		scissorBottom = EFB_HEIGHT;
+}
+
+void SetTevReg(int reg, int comp, bool konst, s16 color)
+{
+	tev.SetRegColor(reg, comp, konst, color);
+}
+
+inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
+{
+	INCSTAT(swstats.thisFrame.rasterizedPixels);
+
+	float dx = vertexOffsetX + (float)(x - vertex0X);
+	float dy = vertexOffsetY + (float)(y - vertex0Y);
+
+	s32 z = (s32)MathUtil::Clamp<float>(ZSlope.GetValue(dx, dy), 0.0f, 16777215.0f);
+
+	if (!BoundingBox::active && bpmem.UseEarlyDepthTest() && g_SWVideoConfig.bZComploc)
+	{
+		// TODO: Test if perf regs are incremented even if test is disabled
+		EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_INPUT_ZCOMPLOC);
+		if (bpmem.zmode.testenable)
+		{
+			// early z
+			if (!EfbInterface::ZCompare(x, y, z))
+				return;
+		}
+		EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_OUTPUT_ZCOMPLOC);
+	}
+
+	RasterBlockPixel& pixel = rasterBlock.Pixel[xi][yi];
+
+	tev.Position[0] = x;
+	tev.Position[1] = y;
+	tev.Position[2] = z;
+
+	//  colors
+	for (unsigned int i = 0; i < bpmem.genMode.numcolchans; i++)
+	{
+		for (int comp = 0; comp < 4; comp++)
+		{
+			u16 color = (u16)ColorSlopes[i][comp].GetValue(dx, dy);
+
+			// clamp color value to 0
+			u16 mask = ~(color >> 8);
+
+			tev.Color[i][comp] = color & mask;
+		}
+	}
+
+	// tex coords
+	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
+	{
+		// multiply by 128 because TEV stores UVs as s17.7
+		tev.Uv[i].s = (s32)(pixel.Uv[i][0] * 128);
+		tev.Uv[i].t = (s32)(pixel.Uv[i][1] * 128);
+	}
+
+	for (unsigned int i = 0; i < bpmem.genMode.numindstages; i++)
+	{
+		tev.IndirectLod[i] = rasterBlock.IndirectLod[i];
+		tev.IndirectLinear[i] = rasterBlock.IndirectLinear[i];
+	}
+
+	for (unsigned int i = 0; i <= bpmem.genMode.numtevstages; i++)
+	{
+		tev.TextureLod[i] = rasterBlock.TextureLod[i];
+		tev.TextureLinear[i] = rasterBlock.TextureLinear[i];
+	}
+
+	tev.Draw();
+}
+
+static void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
+{
+	vertex0X = xi;
+	vertex0Y = yi;
+
+	// adjust a little less than 0.5
+	const float adjust = 0.495f;
+
+	vertexOffsetX = ((float)xi - X1) + adjust;
+	vertexOffsetY = ((float)yi - Y1) + adjust;
+}
+
+static void InitSlope(Slope *slope, float f1, float f2, float f3, float DX31, float DX12, float DY12, float DY31)
+{
+	float DF31 = f3 - f1;
+	float DF21 = f2 - f1;
+	float a = DF31 * -DY12 - DF21 * DY31;
+	float b = DX31 * DF21 + DX12 * DF31;
+	float c = -DX12 * DY31 - DX31 * -DY12;
+	slope->dfdx = -a / c;
+	slope->dfdy = -b / c;
+	slope->f0 = f1;
+}
+
+static inline void CalculateLOD(s32* lodp, bool* linear, u32 texmap, u32 texcoord)
+{
+	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
+	u8 subTexmap = texmap & 3;
+
+	// LOD calculation requires data from the texture mode for bias, etc.
+	// it does not seem to use the actual texture size
+	TexMode0& tm0 = texUnit.texMode0[subTexmap];
+	TexMode1& tm1 = texUnit.texMode1[subTexmap];
+
+	float sDelta, tDelta;
+	if (tm0.diag_lod)
+	{
+		float *uv0 = rasterBlock.Pixel[0][0].Uv[texcoord];
+		float *uv1 = rasterBlock.Pixel[1][1].Uv[texcoord];
+
+		sDelta = fabsf(uv0[0] - uv1[0]);
+		tDelta = fabsf(uv0[1] - uv1[1]);
+	}
+	else
+	{
+		float *uv0 = rasterBlock.Pixel[0][0].Uv[texcoord];
+		float *uv1 = rasterBlock.Pixel[1][0].Uv[texcoord];
+		float *uv2 = rasterBlock.Pixel[0][1].Uv[texcoord];
+
+		sDelta = std::max(fabsf(uv0[0] - uv1[0]), fabsf(uv0[0] - uv2[0]));
+		tDelta = std::max(fabsf(uv0[1] - uv1[1]), fabsf(uv0[1] - uv2[1]));
+	}
+
+	// get LOD in s28.4
+	s32 lod = FixedLog2(std::max(sDelta, tDelta));
+
+	// bias is s2.5
+	int bias = tm0.lod_bias;
+	bias >>= 1;
+	lod += bias;
+
+	*linear = ((lod > 0 && (tm0.min_filter & 4)) || (lod <= 0 && tm0.mag_filter));
+
+	// order of checks matters
+	// should be:
+	// if lod > max then max
+	// else if lod < min then min
+	lod = CLAMP(lod, (s32)tm1.min_lod, (s32)tm1.max_lod);
+	*lodp = lod;
+}
+
+static void BuildBlock(s32 blockX, s32 blockY)
+{
+	for (s32 yi = 0; yi < BLOCK_SIZE; yi++)
+	{
+		for (s32 xi = 0; xi < BLOCK_SIZE; xi++)
+		{
+			RasterBlockPixel& pixel = rasterBlock.Pixel[xi][yi];
+
+			float dx = vertexOffsetX + (float)(xi + blockX - vertex0X);
+			float dy = vertexOffsetY + (float)(yi + blockY - vertex0Y);
+
+			float invW = 1.0f / WSlope.GetValue(dx, dy);
+			pixel.InvW = invW;
+
+			// tex coords
+			for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
+			{
+				float projection = invW;
+				if (xfmem.texMtxInfo[i].projection)
+				{
+					float q = TexSlopes[i][2].GetValue(dx, dy) * invW;
+					if (q != 0.0f)
+						projection = invW / q;
+				}
+
+				pixel.Uv[i][0] = TexSlopes[i][0].GetValue(dx, dy) * projection;
+				pixel.Uv[i][1] = TexSlopes[i][1].GetValue(dx, dy) * projection;
+			}
+		}
+	}
+
+	u32 indref = bpmem.tevindref.hex;
+	for (unsigned int i = 0; i < bpmem.genMode.numindstages; i++)
+	{
+		u32 texmap = indref & 3;
+		indref >>= 3;
+		u32 texcoord = indref & 3;
+		indref >>= 3;
+
+		CalculateLOD(&rasterBlock.IndirectLod[i], &rasterBlock.IndirectLinear[i], texmap, texcoord);
+	}
+
+	for (unsigned int i = 0; i <= bpmem.genMode.numtevstages; i++)
+	{
+		int stageOdd = i&1;
+		TwoTevStageOrders &order = bpmem.tevorders[i >> 1];
+		if (order.getEnable(stageOdd))
+		{
+			u32 texmap = order.getTexMap(stageOdd);
+			u32 texcoord = order.getTexCoord(stageOdd);
+
+			CalculateLOD(&rasterBlock.TextureLod[i], &rasterBlock.TextureLinear[i], texmap, texcoord);
+		}
+	}
+}
+
+static inline void PrepareBlock(s32 blockX, s32 blockY)
+{
+	static s32 x = -1;
+	static s32 y = -1;
+
+	blockX &= ~(BLOCK_SIZE - 1);
+	blockY &= ~(BLOCK_SIZE - 1);
+
+	if (x != blockX || y != blockY)
+	{
+		x = blockX;
+		y = blockY;
+		BuildBlock(x, y);
+	}
+}
+
+void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
+{
+	INCSTAT(swstats.thisFrame.numTrianglesDrawn);
+
+	if (g_SWVideoConfig.bHwRasterizer && !BoundingBox::active)
+	{
+		HwRasterizer::DrawTriangleFrontFace(v0, v1, v2);
+		return;
+	}
+
+	// adapted from http://devmaster.net/posts/6145/advanced-rasterization
+
+	// 28.4 fixed-pou32 coordinates. rounded to nearest and adjusted to match hardware output
+	// could also take floor and adjust -8
+	const s32 Y1 = iround(16.0f * v0->screenPosition[1]) - 9;
+	const s32 Y2 = iround(16.0f * v1->screenPosition[1]) - 9;
+	const s32 Y3 = iround(16.0f * v2->screenPosition[1]) - 9;
+
+	const s32 X1 = iround(16.0f * v0->screenPosition[0]) - 9;
+	const s32 X2 = iround(16.0f * v1->screenPosition[0]) - 9;
+	const s32 X3 = iround(16.0f * v2->screenPosition[0]) - 9;
+
+	// Deltas
+	const s32 DX12 = X1 - X2;
+	const s32 DX23 = X2 - X3;
+	const s32 DX31 = X3 - X1;
+
+	const s32 DY12 = Y1 - Y2;
+	const s32 DY23 = Y2 - Y3;
+	const s32 DY31 = Y3 - Y1;
+
+	// Fixed-pos32 deltas
+	const s32 FDX12 = DX12 << 4;
+	const s32 FDX23 = DX23 << 4;
+	const s32 FDX31 = DX31 << 4;
+
+	const s32 FDY12 = DY12 << 4;
+	const s32 FDY23 = DY23 << 4;
+	const s32 FDY31 = DY31 << 4;
+
+	// Bounding rectangle
+	s32 minx = (std::min(std::min(X1, X2), X3) + 0xF) >> 4;
+	s32 maxx = (std::max(std::max(X1, X2), X3) + 0xF) >> 4;
+	s32 miny = (std::min(std::min(Y1, Y2), Y3) + 0xF) >> 4;
+	s32 maxy = (std::max(std::max(Y1, Y2), Y3) + 0xF) >> 4;
+
+	// scissor
+	minx = std::max(minx, scissorLeft);
+	maxx = std::min(maxx, scissorRight);
+	miny = std::max(miny, scissorTop);
+	maxy = std::min(maxy, scissorBottom);
+
+	if (minx >= maxx || miny >= maxy)
+		return;
+
+	// Setup slopes
+	float fltx1 = v0->screenPosition.x;
+	float flty1 = v0->screenPosition.y;
+	float fltdx31 = v2->screenPosition.x - fltx1;
+	float fltdx12 = fltx1 - v1->screenPosition.x;
+	float fltdy12 = flty1 - v1->screenPosition.y;
+	float fltdy31 = v2->screenPosition.y - flty1;
+
+	InitTriangle(fltx1, flty1, (X1 + 0xF) >> 4, (Y1 + 0xF) >> 4);
+
+	float w[3] = { 1.0f / v0->projectedPosition.w, 1.0f / v1->projectedPosition.w, 1.0f / v2->projectedPosition.w };
+	InitSlope(&WSlope, w[0], w[1], w[2], fltdx31, fltdx12, fltdy12, fltdy31);
+
+	// TODO: The zfreeze emulation is not quite correct, yet!
+	// Many things might prevent us from reaching this line (culling, clipping, scissoring).
+	// However, the zslope is always guaranteed to be calculated unless all vertices are trivially rejected during clipping!
+	// We're currently sloppy at this since we abort early if any of the culling/clipping/scissoring tests fail.
+	if (!bpmem.genMode.zfreeze || !g_SWVideoConfig.bZFreeze)
+		InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31);
+
+	for (unsigned int i = 0; i < bpmem.genMode.numcolchans; i++)
+	{
+		for (int comp = 0; comp < 4; comp++)
+			InitSlope(&ColorSlopes[i][comp], v0->color[i][comp], v1->color[i][comp], v2->color[i][comp], fltdx31, fltdx12, fltdy12, fltdy31);
+	}
+
+	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
+	{
+		for (int comp = 0; comp < 3; comp++)
+			InitSlope(&TexSlopes[i][comp], v0->texCoords[i][comp] * w[0], v1->texCoords[i][comp] * w[1], v2->texCoords[i][comp] * w[2], fltdx31, fltdx12, fltdy12, fltdy31);
+	}
+
+	// Half-edge constants
+	s32 C1 = DY12 * X1 - DX12 * Y1;
+	s32 C2 = DY23 * X2 - DX23 * Y2;
+	s32 C3 = DY31 * X3 - DX31 * Y3;
+
+	// Correct for fill convention
+	if (DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++;
+	if (DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++;
+	if (DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++;
+
+	// If drawing, rasterize every block
+	if (!BoundingBox::active)
+	{
+		// Start in corner of 8x8 block
+		minx &= ~(BLOCK_SIZE - 1);
+		miny &= ~(BLOCK_SIZE - 1);
+
+		// Loop through blocks
+		for (s32 y = miny; y < maxy; y += BLOCK_SIZE)
+		{
+			for (s32 x = minx; x < maxx; x += BLOCK_SIZE)
+			{
+				// Corners of block
+				s32 x0 = x << 4;
+				s32 x1 = (x + BLOCK_SIZE - 1) << 4;
+				s32 y0 = y << 4;
+				s32 y1 = (y + BLOCK_SIZE - 1) << 4;
+
+				// Evaluate half-space functions
+				bool a00 = C1 + DX12 * y0 - DY12 * x0 > 0;
+				bool a10 = C1 + DX12 * y0 - DY12 * x1 > 0;
+				bool a01 = C1 + DX12 * y1 - DY12 * x0 > 0;
+				bool a11 = C1 + DX12 * y1 - DY12 * x1 > 0;
+				int a = (a00 << 0) | (a10 << 1) | (a01 << 2) | (a11 << 3);
+
+				bool b00 = C2 + DX23 * y0 - DY23 * x0 > 0;
+				bool b10 = C2 + DX23 * y0 - DY23 * x1 > 0;
+				bool b01 = C2 + DX23 * y1 - DY23 * x0 > 0;
+				bool b11 = C2 + DX23 * y1 - DY23 * x1 > 0;
+				int b = (b00 << 0) | (b10 << 1) | (b01 << 2) | (b11 << 3);
+
+				bool c00 = C3 + DX31 * y0 - DY31 * x0 > 0;
+				bool c10 = C3 + DX31 * y0 - DY31 * x1 > 0;
+				bool c01 = C3 + DX31 * y1 - DY31 * x0 > 0;
+				bool c11 = C3 + DX31 * y1 - DY31 * x1 > 0;
+				int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3);
+
+				// Skip block when outside an edge
+				if (a == 0x0 || b == 0x0 || c == 0x0)
+					continue;
+
+				BuildBlock(x, y);
+
+				// Accept whole block when totally covered
+				if (a == 0xF && b == 0xF && c == 0xF)
+				{
+					for (s32 iy = 0; iy < BLOCK_SIZE; iy++)
+					{
+						for (s32 ix = 0; ix < BLOCK_SIZE; ix++)
+						{
+							Draw(x + ix, y + iy, ix, iy);
+						}
+					}
+				}
+				else // Partially covered block
+				{
+					s32 CY1 = C1 + DX12 * y0 - DY12 * x0;
+					s32 CY2 = C2 + DX23 * y0 - DY23 * x0;
+					s32 CY3 = C3 + DX31 * y0 - DY31 * x0;
+
+					for (s32 iy = 0; iy < BLOCK_SIZE; iy++)
+					{
+						s32 CX1 = CY1;
+						s32 CX2 = CY2;
+						s32 CX3 = CY3;
+
+						for (s32 ix = 0; ix < BLOCK_SIZE; ix++)
+						{
+							if (CX1 > 0 && CX2 > 0 && CX3 > 0)
+							{
+								Draw(x + ix, y + iy, ix, iy);
+							}
+
+							CX1 -= FDY12;
+							CX2 -= FDY23;
+							CX3 -= FDY31;
+						}
+
+						CY1 += FDX12;
+						CY2 += FDX23;
+						CY3 += FDX31;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		// Calculating bbox
+		// First check for alpha channel - don't do anything it if always fails,
+		// Change bbox to primitive size if it always passes
+		AlphaTest::TEST_RESULT alphaRes = bpmem.alpha_test.TestResult();
+
+		if (alphaRes != AlphaTest::UNDETERMINED)
+		{
+			if (alphaRes == AlphaTest::PASS)
+			{
+				BoundingBox::coords[BoundingBox::TOP]    = std::min(BoundingBox::coords[BoundingBox::TOP],    (u16) miny);
+				BoundingBox::coords[BoundingBox::LEFT]   = std::min(BoundingBox::coords[BoundingBox::LEFT],   (u16) minx);
+				BoundingBox::coords[BoundingBox::BOTTOM] = std::max(BoundingBox::coords[BoundingBox::BOTTOM], (u16) maxy);
+				BoundingBox::coords[BoundingBox::RIGHT]  = std::max(BoundingBox::coords[BoundingBox::RIGHT],  (u16) maxx);
+			}
+			return;
+		}
+
+		// If we are calculating bbox with alpha, we only need to find the
+		// topmost, leftmost, bottom most and rightmost pixels to be drawn.
+		// So instead of drawing every single one of the triangle's pixels,
+		// four loops are run: one for the top pixel, one for the left, one for
+		// the bottom and one for the right. As soon as a pixel that is to be
+		// drawn is found, the loop breaks. This enables a ~150% speedbost in
+		// bbox calculation, albeit at the cost of some ugly repetitive code.
+		const s32 FLEFT   = minx << 4;
+		const s32 FRIGHT  = maxx << 4;
+		s32 FTOP    = miny << 4;
+		s32 FBOTTOM = maxy << 4;
+
+		// Start checking for bbox top
+		s32 CY1 = C1 + DX12 * FTOP - DY12 * FLEFT;
+		s32 CY2 = C2 + DX23 * FTOP - DY23 * FLEFT;
+		s32 CY3 = C3 + DX31 * FTOP - DY31 * FLEFT;
+
+		// Loop
+		for (s32 y = miny; y <= maxy; ++y)
+		{
+			if (y >= BoundingBox::coords[BoundingBox::TOP])
+				break;
+
+			s32 CX1 = CY1;
+			s32 CX2 = CY2;
+			s32 CX3 = CY3;
+
+			for (s32 x = minx; x <= maxx; ++x)
+			{
+				if (CX1 > 0 && CX2 > 0 && CX3 > 0)
+				{
+					// Build the new raster block every other pixel
+					PrepareBlock(x, y);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
+
+					if (y >= BoundingBox::coords[BoundingBox::TOP])
+						break;
+				}
+
+				CX1 -= FDY12;
+				CX2 -= FDY23;
+				CX3 -= FDY31;
+			}
+
+			CY1 += FDX12;
+			CY2 += FDX23;
+			CY3 += FDX31;
+		}
+
+		// Update top limit
+		miny = std::max((s32) BoundingBox::coords[BoundingBox::TOP], miny);
+		FTOP = miny << 4;
+
+		// Checking for bbox left
+		s32 CX1 = C1 + DX12 * FTOP - DY12 * FLEFT;
+		s32 CX2 = C2 + DX23 * FTOP - DY23 * FLEFT;
+		s32 CX3 = C3 + DX31 * FTOP - DY31 * FLEFT;
+
+		// Loop
+		for (s32 x = minx; x <= maxx; ++x)
+		{
+			if (x >= BoundingBox::coords[BoundingBox::LEFT])
+				break;
+
+			CY1 = CX1;
+			CY2 = CX2;
+			CY3 = CX3;
+
+			for (s32 y = miny; y <= maxy; ++y)
+			{
+				if (CY1 > 0 && CY2 > 0 && CY3 > 0)
+				{
+					PrepareBlock(x, y);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
+
+					if (x >= BoundingBox::coords[BoundingBox::LEFT])
+						break;
+				}
+
+				CY1 += FDX12;
+				CY2 += FDX23;
+				CY3 += FDX31;
+			}
+
+			CX1 -= FDY12;
+			CX2 -= FDY23;
+			CX3 -= FDY31;
+		}
+
+		// Update left limit
+		minx = std::max((s32) BoundingBox::coords[BoundingBox::LEFT], minx);
+
+		// Checking for bbox bottom
+		CY1 = C1 + DX12 * FBOTTOM - DY12 * FRIGHT;
+		CY2 = C2 + DX23 * FBOTTOM - DY23 * FRIGHT;
+		CY3 = C3 + DX31 * FBOTTOM - DY31 * FRIGHT;
+
+		// Loop
+		for (s32 y = maxy; y >= miny; --y)
+		{
+			CX1 = CY1;
+			CX2 = CY2;
+			CX3 = CY3;
+
+			if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
+				break;
+
+			for (s32 x = maxx; x >= minx; --x)
+			{
+				if (CX1 > 0 && CX2 > 0 && CX3 > 0)
+				{
+					// Build the new raster block every other pixel
+					PrepareBlock(x, y);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
+
+					if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
+						break;
+				}
+
+				CX1 += FDY12;
+				CX2 += FDY23;
+				CX3 += FDY31;
+			}
+
+			CY1 -= FDX12;
+			CY2 -= FDX23;
+			CY3 -= FDX31;
+		}
+
+		// Update bottom limit
+		maxy = std::min((s32) BoundingBox::coords[BoundingBox::BOTTOM], maxy);
+		FBOTTOM = maxy << 4;
+
+		// Checking for bbox right
+		CX1 = C1 + DX12 * FBOTTOM - DY12 * FRIGHT;
+		CX2 = C2 + DX23 * FBOTTOM - DY23 * FRIGHT;
+		CX3 = C3 + DX31 * FBOTTOM - DY31 * FRIGHT;
+
+		// Loop
+		for (s32 x = maxx; x >= minx; --x)
+		{
+			if (x <= BoundingBox::coords[BoundingBox::RIGHT])
+				break;
+
+			CY1 = CX1;
+			CY2 = CX2;
+			CY3 = CX3;
+
+			for (s32 y = maxy; y >= miny; --y)
+			{
+				if (CY1 > 0 && CY2 > 0 && CY3 > 0)
+				{
+					// Build the new raster block every other pixel
+					PrepareBlock(x, y);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
+
+					if (x <= BoundingBox::coords[BoundingBox::RIGHT])
+						break;
+				}
+
+				CY1 -= FDX12;
+				CY2 -= FDX23;
+				CY3 -= FDX31;
+			}
+
+			CX1 += FDY12;
+			CX2 += FDY23;
+			CX3 += FDY31;
+		}
+	}
+}
+
+
+}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h
similarity index 80%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
rename to Source/Core/VideoBackends/Software/Rasterizer.h
index 3f61fcaefe..3a6a72852f 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
+++ b/Source/Core/VideoBackends/Software/Rasterizer.h
@@ -1,12 +1,12 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _RASTERIZER_H_
-#define _RASTERIZER_H_
+#pragma once
 
-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+
+struct OutputVertexData;
 
 namespace Rasterizer
 {
@@ -50,5 +50,3 @@ namespace Rasterizer
 
 	void DoState(PointerWrap &p);
 }
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
new file mode 100644
index 0000000000..d60e488e5c
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
@@ -0,0 +1,354 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/FPURoundMode.h"
+#include "Common/MathUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/VideoBackend.h"
+
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/VertexLoaderUtils.h"
+
+namespace SWCommandProcessor
+{
+
+enum
+{
+	GATHER_PIPE_SIZE = 32,
+	INT_CAUSE_CP =  0x800
+};
+
+// STATE_TO_SAVE
+// variables
+
+static const int commandBufferSize = 1024 * 1024;
+static const int maxCommandBufferWrite = commandBufferSize - GATHER_PIPE_SIZE;
+static u8 commandBuffer[commandBufferSize];
+static u32 readPos;
+static u32 writePos;
+static int et_UpdateInterrupts;
+static std::atomic<bool> interruptSet;
+static std::atomic<bool> interruptWaiting;
+
+static CPReg cpreg; // shared between gfx and emulator thread
+
+void DoState(PointerWrap &p)
+{
+	p.DoPOD(cpreg);
+	p.DoArray(commandBuffer, commandBufferSize);
+	p.Do(readPos);
+	p.Do(writePos);
+	p.Do(et_UpdateInterrupts);
+	p.Do(interruptSet);
+	p.Do(interruptWaiting);
+
+	// Is this right?
+	p.DoArray(g_video_buffer_read_ptr,writePos);
+}
+
+static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
+{
+	UpdateInterrupts(userdata);
+}
+
+static inline bool AtBreakpoint()
+{
+	return cpreg.ctrl.BPEnable && (cpreg.readptr == cpreg.breakpt);
+}
+
+void Init()
+{
+	cpreg.status.Hex = 0;
+	cpreg.status.CommandIdle = 1;
+	cpreg.status.ReadIdle = 1;
+
+	cpreg.ctrl.Hex = 0;
+	cpreg.clear.Hex = 0;
+
+	cpreg.bboxleft = 0;
+	cpreg.bboxtop  = 0;
+	cpreg.bboxright = 0;
+	cpreg.bboxbottom = 0;
+
+	cpreg.token = 0;
+
+	et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper);
+
+	// internal buffer position
+	readPos = 0;
+	writePos = 0;
+
+	interruptSet.store(false);
+	interruptWaiting.store(false);
+
+	g_video_buffer_read_ptr = nullptr;
+	g_bSkipCurrentFrame = false;
+}
+
+void Shutdown()
+{
+}
+
+void RunGpu()
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+	{
+		// We are going to do FP math on the main thread so have to save the current state
+		FPURoundMode::SaveSIMDState();
+		FPURoundMode::LoadDefaultSIMDState();
+
+		// run the opcode decoder
+		do
+		{
+			RunBuffer();
+		} while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
+
+		FPURoundMode::LoadSIMDState();
+	}
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	// Directly map reads and writes to the cpreg structure.
+	for (u32 i = 0; i < sizeof (cpreg) / sizeof (u16); ++i)
+	{
+		u16* ptr = ((u16*)&cpreg) + i;
+		mmio->Register(base | (i * 2),
+			MMIO::DirectRead<u16>(ptr),
+			MMIO::DirectWrite<u16>(ptr)
+		);
+	}
+
+	// Bleh. Apparently SWCommandProcessor does not know about regs 0x40 to
+	// 0x64...
+	for (u32 i = 0x40; i < 0x64; ++i)
+	{
+		mmio->Register(base | i,
+			MMIO::Constant<u16>(0),
+			MMIO::Nop<u16>()
+		);
+	}
+
+	// The low part of MMIO regs for FIFO addresses needs to be aligned to 32
+	// bytes.
+	u32 fifo_addr_lo_regs[] = {
+		CommandProcessor::FIFO_BASE_LO,
+		CommandProcessor::FIFO_END_LO,
+		CommandProcessor::FIFO_WRITE_POINTER_LO,
+		CommandProcessor::FIFO_READ_POINTER_LO,
+		CommandProcessor::FIFO_BP_LO,
+		CommandProcessor::FIFO_RW_DISTANCE_LO,
+	};
+	for (u32 reg : fifo_addr_lo_regs)
+	{
+		mmio->RegisterWrite(base | reg,
+			MMIO::DirectWrite<u16>(((u16*)&cpreg) + (reg / 2), 0xFFE0)
+		);
+	}
+
+	// The clear register needs to perform some more complicated operations on
+	// writes.
+	mmio->RegisterWrite(base | CommandProcessor::CLEAR_REGISTER,
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UCPClearReg tmpClear(val);
+
+			if (tmpClear.ClearFifoOverflow)
+				cpreg.status.OverflowHiWatermark = 0;
+			if (tmpClear.ClearFifoUnderflow)
+				cpreg.status.UnderflowLoWatermark = 0;
+		})
+	);
+}
+
+void GatherPipeBursted()
+{
+	if (cpreg.ctrl.GPLinkEnable)
+	{
+		DEBUG_LOG(COMMANDPROCESSOR,"\t WGP burst. write thru : %08x", cpreg.writeptr);
+
+		if (cpreg.writeptr == cpreg.fifoend)
+			cpreg.writeptr = cpreg.fifobase;
+		else
+			cpreg.writeptr += GATHER_PIPE_SIZE;
+
+		Common::AtomicAdd(cpreg.rwdistance, GATHER_PIPE_SIZE);
+	}
+
+	RunGpu();
+}
+
+void UpdateInterrupts(u64 userdata)
+{
+	if (userdata)
+	{
+		interruptSet.store(true);
+		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
+	}
+	else
+	{
+		interruptSet.store(false);
+		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
+	}
+	interruptWaiting.store(false);
+}
+
+void UpdateInterruptsFromVideoBackend(u64 userdata)
+{
+	CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
+}
+
+static void ReadFifo()
+{
+	bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
+	bool atBreakpoint = AtBreakpoint();
+
+	if (canRead && !atBreakpoint)
+	{
+		// read from fifo
+		u8 *ptr = Memory::GetPointer(cpreg.readptr);
+		int bytesRead = 0;
+
+		do
+		{
+			// copy to buffer
+			memcpy(&commandBuffer[writePos], ptr, GATHER_PIPE_SIZE);
+			writePos += GATHER_PIPE_SIZE;
+			bytesRead += GATHER_PIPE_SIZE;
+
+			if (cpreg.readptr == cpreg.fifoend)
+			{
+				cpreg.readptr = cpreg.fifobase;
+				ptr = Memory::GetPointer(cpreg.readptr);
+			}
+			else
+			{
+				cpreg.readptr += GATHER_PIPE_SIZE;
+				ptr += GATHER_PIPE_SIZE;
+			}
+
+			canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
+			atBreakpoint = AtBreakpoint();
+		} while (canRead && !atBreakpoint);
+
+		Common::AtomicAdd(cpreg.rwdistance, -bytesRead);
+	}
+}
+
+static void SetStatus()
+{
+	// overflow check
+	if (cpreg.rwdistance > cpreg.hiwatermark)
+		cpreg.status.OverflowHiWatermark = 1;
+
+	// underflow check
+	if (cpreg.rwdistance < cpreg.lowatermark)
+		cpreg.status.UnderflowLoWatermark = 1;
+
+	// breakpoint
+	if (cpreg.ctrl.BPEnable)
+	{
+		if (cpreg.breakpt == cpreg.readptr)
+		{
+			if (!cpreg.status.Breakpoint)
+				INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %x", cpreg.readptr);
+			cpreg.status.Breakpoint = 1;
+		}
+	}
+	else
+	{
+		if (cpreg.status.Breakpoint)
+			INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %x", cpreg.readptr);
+		cpreg.status.Breakpoint = 0;
+	}
+
+	cpreg.status.ReadIdle = cpreg.readptr == cpreg.writeptr;
+
+	bool bpInt = cpreg.status.Breakpoint && cpreg.ctrl.BPInt;
+	bool ovfInt = cpreg.status.OverflowHiWatermark && cpreg.ctrl.FifoOverflowIntEnable;
+	bool undfInt = cpreg.status.UnderflowLoWatermark && cpreg.ctrl.FifoUnderflowIntEnable;
+
+	bool interrupt = bpInt || ovfInt || undfInt;
+
+	if (interrupt != interruptSet.load() && !interruptWaiting.load())
+	{
+		u64 userdata = interrupt?1:0;
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+		{
+			interruptWaiting.store(true);
+			SWCommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
+		}
+		else
+		{
+			SWCommandProcessor::UpdateInterrupts(userdata);
+		}
+	}
+}
+
+bool RunBuffer()
+{
+	// fifo is read 32 bytes at a time
+	// read fifo data to internal buffer
+	if (cpreg.ctrl.GPReadEnable)
+		ReadFifo();
+
+	SetStatus();
+
+	_dbg_assert_(COMMANDPROCESSOR, writePos >= readPos);
+
+	g_video_buffer_read_ptr = &commandBuffer[readPos];
+
+	u32 availableBytes = writePos - readPos;
+
+	while (OpcodeDecoder::CommandRunnable(availableBytes))
+	{
+		cpreg.status.CommandIdle = 0;
+
+		OpcodeDecoder::Run(availableBytes);
+
+		// if data was read by the opcode decoder then the video data pointer changed
+		readPos = (u32)(g_video_buffer_read_ptr - &commandBuffer[0]);
+		_dbg_assert_(VIDEO, writePos >= readPos);
+		availableBytes = writePos - readPos;
+	}
+
+	cpreg.status.CommandIdle = 1;
+
+	bool ranDecoder = false;
+
+	// move data remaining in the command buffer
+	if (readPos > 0)
+	{
+		memmove(&commandBuffer[0], &commandBuffer[readPos], availableBytes);
+		writePos -= readPos;
+		readPos = 0;
+
+		ranDecoder = true;
+	}
+
+	return ranDecoder;
+}
+
+void SetRendering(bool enabled)
+{
+	g_bSkipCurrentFrame = !enabled;
+}
+
+} // end of namespace SWCommandProcessor
+
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
new file mode 100644
index 0000000000..539be4263f
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
@@ -0,0 +1,61 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/CommandProcessor.h"
+
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+namespace SWCommandProcessor
+{
+	using UCPStatusReg = CommandProcessor::UCPStatusReg;
+	using UCPCtrlReg = CommandProcessor::UCPCtrlReg;
+	using UCPClearReg = CommandProcessor::UCPClearReg;
+
+	struct CPReg
+	{
+		UCPStatusReg status;    // 0x00
+		UCPCtrlReg ctrl;        // 0x02
+		UCPClearReg clear;      // 0x04
+		u32 unk0;               // 0x08
+		u16 unk1;               // 0x0c
+		u16 token;              // 0x0e
+		u16 bboxleft;           // 0x10
+		u16 bboxtop;            // 0x12
+		u16 bboxright;          // 0x14
+		u16 bboxbottom;         // 0x16
+		u32 unk2;               // 0x18
+		u32 unk3;               // 0x1c
+		u32 fifobase;           // 0x20
+		u32 fifoend;            // 0x24
+		u32 hiwatermark;        // 0x28
+		u32 lowatermark;        // 0x2c
+		u32 rwdistance;         // 0x30
+		u32 writeptr;           // 0x34
+		u32 readptr;            // 0x38
+		u32 breakpt;            // 0x3c
+	};
+
+	// Init
+	void Init();
+	void Shutdown();
+	void DoState(PointerWrap &p);
+
+	void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+	bool RunBuffer();
+	void RunGpu();
+
+	// for CGPFIFO
+	void GatherPipeBursted();
+	void UpdateInterrupts(u64 userdata);
+	void UpdateInterruptsFromVideoBackend(u64 userdata);
+
+	void SetRendering(bool enabled);
+
+} // end of namespace SWCommandProcessor
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
new file mode 100644
index 0000000000..761cc667df
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -0,0 +1,291 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <atomic>
+#include <mutex>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "Core/Core.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/RasterFont.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/OnScreenDisplay.h"
+
+static GLuint s_RenderTarget = 0;
+
+static GLint attr_pos = -1, attr_tex = -1;
+static GLint uni_tex = -1;
+static GLuint program;
+
+static u8 *s_xfbColorTexture[2];
+static int s_currentColorTexture = 0;
+
+static std::atomic<bool> s_bScreenshot;
+static std::mutex s_criticalScreenshot;
+static std::string s_sScreenshotName;
+
+
+// Rasterfont isn't compatible with GLES
+// degasus: I think it does, but I can't test it
+static RasterFont* s_pfont = nullptr;
+
+void SWRenderer::Init()
+{
+	s_bScreenshot.store(false);
+}
+
+void SWRenderer::Shutdown()
+{
+	delete[] s_xfbColorTexture[0];
+	delete[] s_xfbColorTexture[1];
+	glDeleteProgram(program);
+	glDeleteTextures(1, &s_RenderTarget);
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+		delete s_pfont;
+		s_pfont = nullptr;
+	}
+}
+
+static void CreateShaders()
+{
+	static const char *fragShaderText =
+		"#ifdef GL_ES\n"
+		"precision highp float;\n"
+		"#endif\n"
+		"varying vec2 TexCoordOut;\n"
+		"uniform sampler2D Texture;\n"
+		"void main() {\n"
+		"	gl_FragColor = texture2D(Texture, TexCoordOut);\n"
+		"}\n";
+	static const char *vertShaderText =
+		"#ifdef GL_ES\n"
+		"precision highp float;\n"
+		"#endif\n"
+		"attribute vec4 pos;\n"
+		"attribute vec2 TexCoordIn;\n "
+		"varying vec2 TexCoordOut;\n "
+		"void main() {\n"
+		"	gl_Position = pos;\n"
+		"	TexCoordOut = TexCoordIn;\n"
+		"}\n";
+
+	program = OpenGL_CompileProgram(vertShaderText, fragShaderText);
+
+	glUseProgram(program);
+
+	uni_tex = glGetUniformLocation(program, "Texture");
+	attr_pos = glGetAttribLocation(program, "pos");
+	attr_tex = glGetAttribLocation(program, "TexCoordIn");
+}
+
+void SWRenderer::Prepare()
+{
+	s_xfbColorTexture[0] = new u8[MAX_XFB_WIDTH * MAX_XFB_HEIGHT * 4];
+	s_xfbColorTexture[1] = new u8[MAX_XFB_WIDTH * MAX_XFB_HEIGHT * 4];
+
+	s_currentColorTexture = 0;
+
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
+	glGenTextures(1, &s_RenderTarget);
+
+	CreateShaders();
+	// TODO: Enable for GLES once RasterFont supports GLES
+	if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
+	{
+		s_pfont = new RasterFont();
+		glEnable(GL_TEXTURE_2D);
+	}
+}
+
+void SWRenderer::SetScreenshot(const char *_szFilename)
+{
+	std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+	s_sScreenshotName = _szFilename;
+	s_bScreenshot.store(true);
+}
+
+void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
+{
+	if (GLInterface->GetMode() != GLInterfaceMode::MODE_OPENGL)
+		return;
+	int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
+	int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
+	glColor4f(((color >> 16) & 0xff) / 255.0f, ((color >> 8) & 0xff) / 255.0f,
+			((color >> 0) & 0xff) / 255.0f, ((color >> 24) & 0xFF) / 255.0f);
+	s_pfont->printMultilineText(pstr,
+			left * 2.0f / (float)nBackbufferWidth - 1,
+			1 - top * 2.0f / (float)nBackbufferHeight,
+			0, nBackbufferWidth, nBackbufferHeight);
+}
+
+void SWRenderer::DrawDebugText()
+{
+	std::string debugtext;
+
+	if (g_SWVideoConfig.bShowStats)
+	{
+		debugtext += StringFromFormat("Objects:            %i\n", swstats.thisFrame.numDrawnObjects);
+		debugtext += StringFromFormat("Primitives:         %i\n", swstats.thisFrame.numPrimatives);
+		debugtext += StringFromFormat("Vertices Loaded:    %i\n", swstats.thisFrame.numVerticesLoaded);
+
+		debugtext += StringFromFormat("Triangles Input:    %i\n", swstats.thisFrame.numTrianglesIn);
+		debugtext += StringFromFormat("Triangles Rejected: %i\n", swstats.thisFrame.numTrianglesRejected);
+		debugtext += StringFromFormat("Triangles Culled:   %i\n", swstats.thisFrame.numTrianglesCulled);
+		debugtext += StringFromFormat("Triangles Clipped:  %i\n", swstats.thisFrame.numTrianglesClipped);
+		debugtext += StringFromFormat("Triangles Drawn:    %i\n", swstats.thisFrame.numTrianglesDrawn);
+
+		debugtext += StringFromFormat("Rasterized Pix:     %i\n", swstats.thisFrame.rasterizedPixels);
+		debugtext += StringFromFormat("TEV Pix In:         %i\n", swstats.thisFrame.tevPixelsIn);
+		debugtext += StringFromFormat("TEV Pix Out:        %i\n", swstats.thisFrame.tevPixelsOut);
+	}
+
+	// Render a shadow, and then the text.
+	SWRenderer::RenderText(debugtext.c_str(), 21, 21, 0xDD000000);
+	SWRenderer::RenderText(debugtext.c_str(), 20, 20, 0xFFFFFF00);
+}
+
+u8* SWRenderer::GetNextColorTexture()
+{
+	return s_xfbColorTexture[!s_currentColorTexture];
+}
+
+u8* SWRenderer::GetCurrentColorTexture()
+{
+	return s_xfbColorTexture[s_currentColorTexture];
+}
+
+void SWRenderer::SwapColorTexture()
+{
+	s_currentColorTexture = !s_currentColorTexture;
+}
+
+void SWRenderer::UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidth, u32 fbHeight)
+{
+	if (fbWidth * fbHeight > MAX_XFB_WIDTH * MAX_XFB_HEIGHT)
+	{
+		ERROR_LOG(VIDEO, "Framebuffer is too large: %ix%i", fbWidth, fbHeight);
+		return;
+	}
+
+	u32 offset = 0;
+	u8 *TexturePointer = GetNextColorTexture();
+
+	for (u16 y = 0; y < fbHeight; y++)
+	{
+		for (u16 x = 0; x < fbWidth; x+=2)
+		{
+			// We do this one color sample (aka 2 RGB pixles) at a time
+			int Y1 = xfb[x].Y - 16;
+			int Y2 = xfb[x + 1].Y - 16;
+			int U  = int(xfb[x].UV) - 128;
+			int V  = int(xfb[x + 1].UV) - 128;
+
+			// We do the inverse BT.601 conversion for YCbCr to RGB
+			// http://www.equasys.de/colorconversion.html#YCbCr-RGBColorFormatConversion
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y1              + 1.596f * V), 0, 255);
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y1 - 0.392f * U - 0.813f * V), 0, 255);
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y1 + 2.017f * U             ), 0, 255);
+			TexturePointer[offset++] = 255;
+
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y2              + 1.596f * V), 0, 255);
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y2 - 0.392f * U - 0.813f * V), 0, 255);
+			TexturePointer[offset++] = MathUtil::Clamp(int(1.164f * Y2 + 2.017f * U             ), 0, 255);
+			TexturePointer[offset++] = 255;
+		}
+		xfb += fbWidth;
+	}
+	SwapColorTexture();
+}
+
+// Called on the GPU thread
+void SWRenderer::Swap(u32 fbWidth, u32 fbHeight)
+{
+	GLInterface->Update(); // just updates the render window position and the backbuffer size
+	if (!g_SWVideoConfig.bHwRasterizer)
+		SWRenderer::DrawTexture(GetCurrentColorTexture(), fbWidth, fbHeight);
+
+	swstats.frameCount++;
+	SWRenderer::SwapBuffer();
+	Core::Callback_VideoCopiedToXFB(true); // FIXME: should this function be called FrameRendered?
+}
+
+void SWRenderer::DrawTexture(u8 *texture, int width, int height)
+{
+	// FIXME: This should add black bars when the game has set the VI to render less than the full xfb.
+
+	// Save screenshot
+	if (s_bScreenshot.load())
+	{
+		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+		TextureToPng(texture, width * 4, s_sScreenshotName, width, height, false);
+		// Reset settings
+		s_sScreenshotName.clear();
+		s_bScreenshot.store(false);
+	}
+
+	GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth();
+	GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight();
+
+
+	// Update GLViewPort
+	glViewport(0, 0, glWidth, glHeight);
+	glScissor(0, 0, glWidth, glHeight);
+
+	glBindTexture(GL_TEXTURE_2D, s_RenderTarget);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+	glUseProgram(program);
+	static const GLfloat verts[4][2] = {
+		{ -1, -1}, // Left top
+		{ -1,  1}, // left bottom
+		{  1,  1}, // right bottom
+		{  1, -1} // right top
+	};
+	static const GLfloat texverts[4][2] = {
+		{0, 1},
+		{0, 0},
+		{1, 0},
+		{1, 1}
+	};
+
+	glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts);
+	glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts);
+	glEnableVertexAttribArray(attr_pos);
+	glEnableVertexAttribArray(attr_tex);
+	glUniform1i(uni_tex, 0);
+	glActiveTexture(GL_TEXTURE0);
+	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+	glDisableVertexAttribArray(attr_pos);
+	glDisableVertexAttribArray(attr_tex);
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void SWRenderer::SwapBuffer()
+{
+	// Do our OSD callbacks
+	OSD::DoCallbacks(OSD::OSD_ONFRAME);
+
+	DrawDebugText();
+
+	glFlush();
+
+	GLInterface->Swap();
+
+	swstats.ResetFrame();
+
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h
new file mode 100644
index 0000000000..a320ea6a8b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWRenderer.h
@@ -0,0 +1,29 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "VideoBackends/Software/EfbInterface.h"
+
+namespace SWRenderer
+{
+	void Init();
+	void Prepare();
+	void Shutdown();
+
+	void SetScreenshot(const char *_szFilename);
+	void RenderText(const char* pstr, int left, int top, u32 color);
+	void DrawDebugText();
+
+	u8* GetNextColorTexture();
+	u8* GetCurrentColorTexture();
+	void SwapColorTexture();
+	void UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidth, u32 fbHeight);
+	void DrawTexture(u8 *texture, int width, int height);
+
+	void Swap(u32 fbWidth, u32 fbHeight);
+	void SwapBuffer();
+}
diff --git a/Source/Core/VideoBackends/Software/SWStatistics.cpp b/Source/Core/VideoBackends/Software/SWStatistics.cpp
new file mode 100644
index 0000000000..44892d6b94
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWStatistics.cpp
@@ -0,0 +1,18 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstring>
+#include "VideoBackends/Software/SWStatistics.h"
+
+SWStatistics swstats;
+
+SWStatistics::SWStatistics()
+{
+	frameCount = 0;
+}
+
+void SWStatistics::ResetFrame()
+{
+	memset(&thisFrame, 0, sizeof(ThisFrame));
+}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h b/Source/Core/VideoBackends/Software/SWStatistics.h
similarity index 78%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
rename to Source/Core/VideoBackends/Software/SWStatistics.h
index d6d889337f..6b343ca44b 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
+++ b/Source/Core/VideoBackends/Software/SWStatistics.h
@@ -1,12 +1,11 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "CommonTypes.h"
-#include "SWVideoConfig.h"
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
 
-#ifndef _STATISTICS_H
-#define _STATISTICS_H
+#pragma once
 
 struct SWStatistics
 {
@@ -46,5 +45,3 @@ extern SWStatistics swstats;
 #define ADDSTAT(a,b) ;
 #define SETSTAT(a,x) ;
 #endif
-
-#endif  // _STATISTICS_H
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
new file mode 100644
index 0000000000..d745ed9507
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -0,0 +1,220 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <limits>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/SetupUnit.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/TransformUnit.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+
+#include "VideoCommon/VertexLoaderBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexLoaderUtils.h"
+
+
+SWVertexLoader::SWVertexLoader() :
+	m_VertexSize(0)
+{
+	m_SetupUnit = new SetupUnit;
+}
+
+SWVertexLoader::~SWVertexLoader()
+{
+	delete m_SetupUnit;
+	m_SetupUnit = nullptr;
+}
+
+void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
+{
+	m_attributeIndex = attributeIndex;
+
+	VertexLoaderUID uid(g_main_cp_state.vtx_desc, g_main_cp_state.vtx_attr[m_attributeIndex]);
+	m_CurrentLoader = m_VertexLoaderMap[uid].get();
+
+	if (!m_CurrentLoader)
+	{
+		m_CurrentLoader = VertexLoaderBase::CreateVertexLoader(g_main_cp_state.vtx_desc, g_main_cp_state.vtx_attr[m_attributeIndex]);
+		m_VertexLoaderMap[uid] = std::unique_ptr<VertexLoaderBase>(m_CurrentLoader);
+	}
+
+	m_VertexSize = m_CurrentLoader->m_VertexSize;
+	m_CurrentVat = &g_main_cp_state.vtx_attr[m_attributeIndex];
+
+
+	// matrix index from xf regs or cp memory?
+	if (xfmem.MatrixIndexA.PosNormalMtxIdx != g_main_cp_state.matrix_index_a.PosNormalMtxIdx ||
+		xfmem.MatrixIndexA.Tex0MtxIdx != g_main_cp_state.matrix_index_a.Tex0MtxIdx ||
+		xfmem.MatrixIndexA.Tex1MtxIdx != g_main_cp_state.matrix_index_a.Tex1MtxIdx ||
+		xfmem.MatrixIndexA.Tex2MtxIdx != g_main_cp_state.matrix_index_a.Tex2MtxIdx ||
+		xfmem.MatrixIndexA.Tex3MtxIdx != g_main_cp_state.matrix_index_a.Tex3MtxIdx ||
+		xfmem.MatrixIndexB.Tex4MtxIdx != g_main_cp_state.matrix_index_b.Tex4MtxIdx ||
+		xfmem.MatrixIndexB.Tex5MtxIdx != g_main_cp_state.matrix_index_b.Tex5MtxIdx ||
+		xfmem.MatrixIndexB.Tex6MtxIdx != g_main_cp_state.matrix_index_b.Tex6MtxIdx ||
+		xfmem.MatrixIndexB.Tex7MtxIdx != g_main_cp_state.matrix_index_b.Tex7MtxIdx)
+	{
+		WARN_LOG(VIDEO, "Matrix indices don't match");
+
+		// Just show the assert once
+		static bool showedAlert = false;
+		_assert_msg_(VIDEO, showedAlert, "Matrix indices don't match");
+		showedAlert = true;
+	}
+
+	m_Vertex.posMtx = xfmem.MatrixIndexA.PosNormalMtxIdx;
+	m_Vertex.texMtx[0] = xfmem.MatrixIndexA.Tex0MtxIdx;
+	m_Vertex.texMtx[1] = xfmem.MatrixIndexA.Tex1MtxIdx;
+	m_Vertex.texMtx[2] = xfmem.MatrixIndexA.Tex2MtxIdx;
+	m_Vertex.texMtx[3] = xfmem.MatrixIndexA.Tex3MtxIdx;
+	m_Vertex.texMtx[4] = xfmem.MatrixIndexB.Tex4MtxIdx;
+	m_Vertex.texMtx[5] = xfmem.MatrixIndexB.Tex5MtxIdx;
+	m_Vertex.texMtx[6] = xfmem.MatrixIndexB.Tex6MtxIdx;
+	m_Vertex.texMtx[7] = xfmem.MatrixIndexB.Tex7MtxIdx;
+
+
+	// special case if only pos and tex coord 0 and tex coord input is AB11
+	m_TexGenSpecialCase =
+		((g_main_cp_state.vtx_desc.Hex & 0x60600L) == g_main_cp_state.vtx_desc.Hex) && // only pos and tex coord 0
+		(g_main_cp_state.vtx_desc.Tex0Coord != NOT_PRESENT) &&
+		(xfmem.texMtxInfo[0].projection == XF_TEXPROJ_ST);
+
+	m_SetupUnit->Init(primitiveType);
+}
+
+template <typename T, typename I>
+static T ReadNormalized(I value)
+{
+	T casted = (T) value;
+	if (!std::numeric_limits<T>::is_integer && std::numeric_limits<I>::is_integer)
+	{
+		// normalize if non-float is converted to a float
+		casted *= (T) (1.0 / std::numeric_limits<I>::max());
+	}
+	return casted;
+}
+
+template <typename T, bool swap = false>
+static void ReadVertexAttribute(T* dst, DataReader src, const AttributeFormat& format, int base_component, int components, bool reverse)
+{
+	if (format.enable)
+	{
+		src.Skip(format.offset);
+		src.Skip(base_component * (1<<(format.type>>1)));
+
+		int i;
+		for (i = 0; i < std::min(format.components - base_component, components); i++)
+		{
+			int i_dst = reverse ? components - i - 1 : i;
+			switch (format.type)
+			{
+				case VAR_UNSIGNED_BYTE:
+					dst[i_dst] = ReadNormalized<T, u8>(src.Read<u8, swap>());
+					break;
+				case VAR_BYTE:
+					dst[i_dst] = ReadNormalized<T, s8>(src.Read<s8, swap>());
+					break;
+				case VAR_UNSIGNED_SHORT:
+					dst[i_dst] = ReadNormalized<T, u16>(src.Read<u16, swap>());
+					break;
+				case VAR_SHORT:
+					dst[i_dst] = ReadNormalized<T, s16>(src.Read<s16, swap>());
+					break;
+				case VAR_FLOAT:
+					dst[i_dst] = ReadNormalized<T, float>(src.Read<float, swap>());
+					break;
+			}
+
+			_assert_msg_(VIDEO, !format.integer || format.type != VAR_FLOAT, "only non-float values are allowed to be streamed as integer");
+		}
+		for (; i < components; i++)
+		{
+			int i_dst = reverse ? components - i - 1 : i;
+			dst[i_dst] = i == 3;
+		}
+	}
+}
+
+void SWVertexLoader::ParseVertex(const PortableVertexDeclaration& vdec)
+{
+	DataReader src(m_LoadedVertices.data(), m_LoadedVertices.data() + m_LoadedVertices.size());
+
+	ReadVertexAttribute<float>(&m_Vertex.position[0], src, vdec.position, 0, 3, false);
+
+	for (int i = 0; i < 3; i++)
+	{
+		ReadVertexAttribute<float>(&m_Vertex.normal[i][0], src, vdec.normals[i], 0, 3, false);
+	}
+
+	for (int i = 0; i < 2; i++)
+	{
+		ReadVertexAttribute<u8>(m_Vertex.color[i], src, vdec.colors[i], 0, 4, true);
+	}
+
+	for (int i = 0; i < 8; i++)
+	{
+		ReadVertexAttribute<float>(m_Vertex.texCoords[i], src, vdec.texcoords[i], 0, 2, false);
+
+		// the texmtr is stored as third component of the texCoord
+		if (vdec.texcoords[i].components >= 3)
+		{
+			ReadVertexAttribute<u8>(&m_Vertex.texMtx[i], src, vdec.texcoords[i], 2, 1, false);
+		}
+	}
+
+	ReadVertexAttribute<u8>(&m_Vertex.posMtx, src, vdec.posmtx, 0, 1, false);
+}
+
+void SWVertexLoader::LoadVertex()
+{
+	const PortableVertexDeclaration& vdec = m_CurrentLoader->m_native_vtx_decl;
+
+	// reserve memory for the destination of the vertex loader
+	m_LoadedVertices.resize(vdec.stride + 4);
+
+	VertexLoaderManager::UpdateVertexArrayPointers();
+
+	// convert the vertex from the gc format to the videocommon (hardware optimized) format
+	u8* old = g_video_buffer_read_ptr;
+	int converted_vertices = m_CurrentLoader->RunVertices(
+		DataReader(g_video_buffer_read_ptr, nullptr), // src
+		DataReader(m_LoadedVertices.data(), m_LoadedVertices.data() + m_LoadedVertices.size()), // dst
+		1 // vertices
+	);
+	g_video_buffer_read_ptr = old + m_CurrentLoader->m_VertexSize;
+
+	if (converted_vertices == 0)
+		return;
+
+	// parse the videocommon format to our own struct format (m_Vertex)
+	ParseVertex(vdec);
+
+	// transform this vertex so that it can be used for rasterization (outVertex)
+	OutputVertexData* outVertex = m_SetupUnit->GetVertex();
+	TransformUnit::TransformPosition(&m_Vertex, outVertex);
+	if (g_main_cp_state.vtx_desc.Normal != NOT_PRESENT)
+	{
+		TransformUnit::TransformNormal(&m_Vertex, m_CurrentVat->g0.NormalElements, outVertex);
+	}
+	TransformUnit::TransformColor(&m_Vertex, outVertex);
+	TransformUnit::TransformTexCoord(&m_Vertex, outVertex, m_TexGenSpecialCase);
+
+	// assemble and rasterize the primitive
+	m_SetupUnit->SetupVertex();
+
+	INCSTAT(swstats.thisFrame.numVerticesLoaded)
+}
+
+void SWVertexLoader::DoState(PointerWrap &p)
+{
+	p.Do(m_VertexSize);
+	p.Do(*m_CurrentVat);
+	m_SetupUnit->DoState(p);
+	p.Do(m_TexGenSpecialCase);
+}
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h
new file mode 100644
index 0000000000..4972364c1b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h
@@ -0,0 +1,50 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <unordered_map>
+
+#include "Common/CommonTypes.h"
+
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+
+#include "VideoCommon/VertexLoaderBase.h"
+
+class PointerWrap;
+class SetupUnit;
+
+class SWVertexLoader
+{
+	u32 m_VertexSize;
+
+	VAT* m_CurrentVat;
+
+	InputVertexData m_Vertex;
+
+	void ParseVertex(const PortableVertexDeclaration& vdec);
+
+	SetupUnit *m_SetupUnit;
+
+	bool m_TexGenSpecialCase;
+
+	std::unordered_map<VertexLoaderUID, std::unique_ptr<VertexLoaderBase>> m_VertexLoaderMap;
+	std::vector<u8> m_LoadedVertices;
+	VertexLoaderBase* m_CurrentLoader;
+
+	u8 m_attributeIndex;
+
+public:
+	SWVertexLoader();
+	~SWVertexLoader();
+
+	void SetFormat(u8 attributeIndex, u8 primitiveType);
+
+	u32 GetVertexSize() { return m_VertexSize; }
+
+	void LoadVertex();
+	void DoState(PointerWrap &p);
+};
diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
new file mode 100644
index 0000000000..0d5fd12489
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
@@ -0,0 +1,94 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+
+SWVideoConfig g_SWVideoConfig;
+
+SWVideoConfig::SWVideoConfig()
+{
+	bFullscreen = false;
+	bHideCursor = false;
+	renderToMainframe = false;
+
+	bHwRasterizer = false;
+	bBypassXFB = false;
+
+	bShowStats = false;
+
+	bDumpTextures = false;
+	bDumpObjects = false;
+
+	bZComploc = true;
+	bZFreeze = true;
+
+	bDumpTevStages = false;
+	bDumpTevTextureFetches = false;
+
+	drawStart = 0;
+	drawEnd = 100000;
+}
+
+void SWVideoConfig::Load(const char* ini_file)
+{
+	IniFile iniFile;
+	iniFile.Load(ini_file);
+
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Get("Fullscreen", &bFullscreen, 0); // Hardware
+	hardware->Get("RenderToMainframe", &renderToMainframe, false);
+
+	IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering");
+	rendering->Get("HwRasterizer", &bHwRasterizer, false);
+	rendering->Get("BypassXFB", &bBypassXFB, false);
+	rendering->Get("ZComploc", &bZComploc, true);
+	rendering->Get("ZFreeze", &bZFreeze, true);
+
+	IniFile::Section* info = iniFile.GetOrCreateSection("Info");
+	info->Get("ShowStats", &bShowStats, false);
+
+	IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
+	utility->Get("DumpTexture", &bDumpTextures, false);
+	utility->Get("DumpObjects", &bDumpObjects, false);
+	utility->Get("DumpTevStages", &bDumpTevStages, false);
+	utility->Get("DumpTevTexFetches", &bDumpTevTextureFetches, false);
+
+	IniFile::Section* misc = iniFile.GetOrCreateSection("Misc");
+	misc->Get("DrawStart", &drawStart, 0);
+	misc->Get("DrawEnd", &drawEnd, 100000);
+}
+
+void SWVideoConfig::Save(const char* ini_file)
+{
+	IniFile iniFile;
+	iniFile.Load(ini_file);
+
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Set("Fullscreen", bFullscreen);
+	hardware->Set("RenderToMainframe", renderToMainframe);
+
+	IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering");
+	rendering->Set("HwRasterizer", bHwRasterizer);
+	rendering->Set("BypassXFB", bBypassXFB);
+	rendering->Set("ZComploc", bZComploc);
+	rendering->Set("ZFreeze", bZFreeze);
+
+	IniFile::Section* info = iniFile.GetOrCreateSection("Info");
+	info->Set("ShowStats", bShowStats);
+
+	IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
+	utility->Set("DumpTexture", bDumpTextures);
+	utility->Set("DumpObjects", bDumpObjects);
+	utility->Set("DumpTevStages", bDumpTevStages);
+	utility->Set("DumpTevTexFetches", bDumpTevTextureFetches);
+
+	IniFile::Section* misc = iniFile.GetOrCreateSection("Misc");
+	misc->Set("DrawStart", drawStart);
+	misc->Set("DrawEnd", drawEnd);
+
+	iniFile.Save(ini_file);
+}
+
diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h
new file mode 100644
index 0000000000..cd3ec9f0c3
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h
@@ -0,0 +1,43 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+
+#define STATISTICS 1
+
+// NEVER inherit from this class.
+struct SWVideoConfig : NonCopyable
+{
+	SWVideoConfig();
+	void Load(const char* ini_file);
+	void Save(const char* ini_file);
+
+	// General
+	bool bFullscreen;
+	bool bHideCursor;
+	bool renderToMainframe;
+
+	bool bHwRasterizer;
+	bool bBypassXFB;
+
+	// Emulation features
+	bool bZComploc;
+	bool bZFreeze;
+
+	bool bShowStats;
+
+	bool bDumpTextures;
+	bool bDumpObjects;
+
+	// Debug only
+	bool bDumpTevStages;
+	bool bDumpTevTextureFetches;
+
+	u32 drawStart;
+	u32 drawEnd;
+};
+
+extern SWVideoConfig g_SWVideoConfig;
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
new file mode 100644
index 0000000000..e0afd7d857
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -0,0 +1,374 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/VideoInterface.h"
+
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/VideoBackend.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/XFMemory.h"
+
+#define VSYNC_ENABLED 0
+
+static std::atomic<bool> s_swapRequested;
+
+static volatile struct
+{
+	u32 xfbAddr;
+	u32 fbWidth;
+	u32 fbHeight;
+} s_beginFieldArgs;
+
+namespace SW
+{
+
+static std::atomic<bool> fifoStateRun;
+static std::atomic<bool> emuRunningState;
+static std::mutex m_csSWVidOccupied;
+
+std::string VideoSoftware::GetName() const
+{
+	return "Software Renderer";
+}
+
+std::string VideoSoftware::GetDisplayName() const
+{
+	return "Software Renderer";
+}
+
+void VideoSoftware::ShowConfig(void *hParent)
+{
+	Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software");
+}
+
+bool VideoSoftware::Initialize(void *window_handle)
+{
+	g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
+
+	InitInterface();
+	GLInterface->SetMode(GLInterfaceMode::MODE_DETECT);
+	if (!GLInterface->Create(window_handle))
+	{
+		INFO_LOG(VIDEO, "GLInterface::Create failed.");
+		return false;
+	}
+
+	InitBPMemory();
+	InitXFMemory();
+	SWCommandProcessor::Init();
+	PixelEngine::Init();
+	OpcodeDecoder::Init();
+	Clipper::Init();
+	Rasterizer::Init();
+	HwRasterizer::Init();
+	SWRenderer::Init();
+	DebugUtil::Init();
+
+	return true;
+}
+
+void VideoSoftware::DoState(PointerWrap& p)
+{
+	bool software = true;
+	p.Do(software);
+	if (p.GetMode() == PointerWrap::MODE_READ && software == false)
+		// change mode to abort load of incompatible save state.
+		p.SetMode(PointerWrap::MODE_VERIFY);
+
+	// TODO: incomplete?
+	SWCommandProcessor::DoState(p);
+	PixelEngine::DoState(p);
+	EfbInterface::DoState(p);
+	OpcodeDecoder::DoState(p);
+	Clipper::DoState(p);
+	p.Do(xfmem);
+	p.Do(bpmem);
+	p.DoPOD(swstats);
+
+	// CP Memory
+	DoCPState(p);
+}
+
+void VideoSoftware::CheckInvalidState()
+{
+	// there is no state to invalidate
+}
+
+void VideoSoftware::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	if (doLock)
+	{
+		EmuStateChange(EMUSTATE_CHANGE_PAUSE);
+		if (!Core::IsGPUThread())
+			m_csSWVidOccupied.lock();
+	}
+	else
+	{
+		if (unpauseOnUnlock)
+			EmuStateChange(EMUSTATE_CHANGE_PLAY);
+		if (!Core::IsGPUThread())
+			m_csSWVidOccupied.unlock();
+	}
+}
+
+void VideoSoftware::RunLoop(bool enable)
+{
+	emuRunningState.store(enable);
+}
+
+void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState)
+{
+	emuRunningState.store(newState == EMUSTATE_CHANGE_PLAY);
+}
+
+void VideoSoftware::Shutdown()
+{
+	// TODO: should be in Video_Cleanup
+	HwRasterizer::Shutdown();
+	SWRenderer::Shutdown();
+	DebugUtil::Shutdown();
+
+	// Do our OSD callbacks
+	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
+
+	GLInterface->Shutdown();
+	delete GLInterface;
+	GLInterface = nullptr;
+}
+
+void VideoSoftware::Video_Cleanup()
+{
+	GLInterface->ClearCurrent();
+}
+
+// This is called after Video_Initialize() from the Core
+void VideoSoftware::Video_Prepare()
+{
+	GLInterface->MakeCurrent();
+
+	// Init extension support.
+	if (!GLExtensions::Init())
+	{
+		ERROR_LOG(VIDEO, "GLExtensions::Init failed!Does your video card support OpenGL 2.0?");
+		return;
+	}
+
+	// Handle VSync on/off
+	GLInterface->SwapInterval(VSYNC_ENABLED);
+
+	// Do our OSD callbacks
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
+	HwRasterizer::Prepare();
+	SWRenderer::Prepare();
+
+	INFO_LOG(VIDEO, "Video backend initialized.");
+}
+
+// Run from the CPU thread (from VideoInterface.cpp)
+void VideoSoftware::Video_BeginField(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight)
+{
+	// XXX: fbStride should be implemented properly here
+	// If stride isn't implemented then there are problems with XFB
+	// Animal Crossing is a good example for this.
+	s_beginFieldArgs.xfbAddr = xfbAddr;
+	s_beginFieldArgs.fbWidth = fbWidth;
+	s_beginFieldArgs.fbHeight = fbHeight;
+}
+
+// Run from the CPU thread (from VideoInterface.cpp)
+void VideoSoftware::Video_EndField()
+{
+	// Techincally the XFB is continually rendered out scanline by scanline between
+	// BeginField and EndFeild, We could possibly get away with copying out the whole thing
+	// at BeginField for less lag, but for the safest emulation we run it here.
+
+	if (g_bSkipCurrentFrame || s_beginFieldArgs.xfbAddr == 0)
+	{
+		swstats.frameCount++;
+		swstats.ResetFrame();
+		Core::Callback_VideoCopiedToXFB(false);
+		return;
+	}
+	if (!g_SWVideoConfig.bHwRasterizer)
+	{
+		if (!g_SWVideoConfig.bBypassXFB)
+		{
+			EfbInterface::yuv422_packed *xfb = (EfbInterface::yuv422_packed *) Memory::GetPointer(s_beginFieldArgs.xfbAddr);
+
+			SWRenderer::UpdateColorTexture(xfb, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight);
+		}
+	}
+
+	// Ideally we would just move all the OpenGL context stuff to the CPU thread,
+	// but this gets messy when the hardware rasterizer is enabled.
+	// And neobrain loves his hardware rasterizer.
+
+	// If BypassXFB has already done a swap (cf. EfbCopy::CopyToXfb), skip this.
+	if (!g_SWVideoConfig.bBypassXFB)
+	{
+		// Dump frame if needed
+		DebugUtil::OnFrameEnd(s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight);
+
+		// If we are in dual core mode, notify the GPU thread about the new color texture.
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+			s_swapRequested.store(true);
+		else
+			SWRenderer::Swap(s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight);
+	}
+}
+
+u32 VideoSoftware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
+{
+	u32 value = 0;
+
+	switch (type)
+	{
+	case PEEK_Z:
+		{
+			value = EfbInterface::GetDepth(x, y);
+			break;
+		}
+
+	case POKE_Z:
+		break;
+
+	case PEEK_COLOR:
+		{
+			u32 color = 0;
+			EfbInterface::GetColor(x, y, (u8*)&color);
+
+			// rgba to argb
+			value = (color >> 8) | (color & 0xff) << 24;
+			break;
+		}
+
+	case POKE_COLOR:
+		break;
+	}
+
+	return value;
+}
+
+u32 VideoSoftware::Video_GetQueryResult(PerfQueryType type)
+{
+	return EfbInterface::perf_values[type];
+}
+
+u16 VideoSoftware::Video_GetBoundingBox(int index)
+{
+	return BoundingBox::coords[index];
+}
+
+bool VideoSoftware::Video_Screenshot(const std::string& filename)
+{
+	SWRenderer::SetScreenshot(filename.c_str());
+	return true;
+}
+
+// Run from the graphics thread
+static void VideoFifo_CheckSwapRequest()
+{
+	if (s_swapRequested.load())
+	{
+		SWRenderer::Swap(s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight);
+		s_swapRequested.store(false);
+	}
+}
+
+// -------------------------------
+// Enter and exit the video loop
+// -------------------------------
+void VideoSoftware::Video_EnterLoop()
+{
+	std::lock_guard<std::mutex> lk(m_csSWVidOccupied);
+	fifoStateRun.store(true);
+
+	while (fifoStateRun.load())
+	{
+		VideoFifo_CheckSwapRequest();
+		g_video_backend->PeekMessages();
+
+		if (!SWCommandProcessor::RunBuffer())
+		{
+			Common::YieldCPU();
+		}
+
+		while (!emuRunningState.load() && fifoStateRun.load())
+		{
+			g_video_backend->PeekMessages();
+			VideoFifo_CheckSwapRequest();
+			m_csSWVidOccupied.unlock();
+			Common::SleepCurrentThread(1);
+			m_csSWVidOccupied.lock();
+		}
+	}
+}
+
+void VideoSoftware::Video_ExitLoop()
+{
+	fifoStateRun.store(false);
+}
+
+// TODO : could use the OSD class in video common, we would need to implement the Renderer class
+//        however most of it is useless for the SW backend so we could as well move it to its own class
+void VideoSoftware::Video_AddMessage(const std::string& msg, u32 milliseconds)
+{
+}
+void VideoSoftware::Video_ClearMessages()
+{
+}
+
+void VideoSoftware::Video_SetRendering(bool bEnabled)
+{
+	SWCommandProcessor::SetRendering(bEnabled);
+}
+
+void VideoSoftware::Video_GatherPipeBursted()
+{
+	SWCommandProcessor::GatherPipeBursted();
+}
+
+void VideoSoftware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	SWCommandProcessor::RegisterMMIO(mmio, base);
+}
+
+// Draw messages on top of the screen
+unsigned int VideoSoftware::PeekMessages()
+{
+	return GLInterface->PeekMessages();
+}
+
+}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Core/VideoBackends/Software/SetupUnit.cpp
similarity index 84%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
rename to Source/Core/VideoBackends/Software/SetupUnit.cpp
index f0cc179f25..e8604d78ee 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
+++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp
@@ -1,13 +1,13 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "SetupUnit.h"
-
-#include "CPMemLoader.h"
-#include "OpcodeDecoder.h"
-#include "SWStatistics.h"
-#include "Clipper.h"
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SetupUnit.h"
+#include "VideoBackends/Software/SWStatistics.h"
 
 
 void SetupUnit::Init(u8 primitiveType)
@@ -23,11 +23,15 @@ void SetupUnit::Init(u8 primitiveType)
 
 void SetupUnit::SetupVertex()
 {
-	switch(m_PrimType)
+	switch (m_PrimType)
 	{
 	case GX_DRAW_QUADS:
 		SetupQuad();
 		break;
+	case GX_DRAW_QUADS_2:
+		WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
+		SetupQuad();
+		break;
 	case GX_DRAW_TRIANGLES:
 		SetupTriangle();
 		break;
@@ -50,8 +54,8 @@ void SetupUnit::SetupVertex()
 }
 
 
-	void SetupUnit::SetupQuad()
-	{
+void SetupUnit::SetupQuad()
+{
 	if (m_VertexCounter < 2)
 	{
 		m_VertexCounter++;
@@ -99,7 +103,7 @@ void SetupUnit::SetupTriStrip()
 	m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
 	m_VertWritePointer = m_VertPointer[0];
 
-	m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];  
+	m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];
 }
 
 void SetupUnit::SetupTriFan()
@@ -159,7 +163,7 @@ void SetupUnit::SetupPoint()
 
 void SetupUnit::DoState(PointerWrap &p)
 {
-	// TODO: some or all of this is making the save states stop working once dolphin is closed...sometimes (usually)
+	// TODO: some or all of this is making the save states stop working once Dolphin is closed...sometimes (usually)
 	// I have no idea what specifically is wrong, or if this is even important. Disabling it doesn't seem to make any noticible difference...
 /*	p.Do(m_PrimType);
 	p.Do(m_VertexCounter);
diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h
new file mode 100644
index 0000000000..9ee22f5412
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/SetupUnit.h
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+
+class PointerWrap;
+
+class SetupUnit
+{
+	u8 m_PrimType;
+	int m_VertexCounter;
+
+	OutputVertexData m_Vertices[3];
+	OutputVertexData *m_VertPointer[3];
+	OutputVertexData *m_VertWritePointer;
+
+	void SetupQuad();
+	void SetupTriangle();
+	void SetupTriStrip();
+	void SetupTriFan();
+	void SetupLine();
+	void SetupLineStrip();
+	void SetupPoint();
+
+public:
+	void Init(u8 primitiveType);
+
+	OutputVertexData* GetVertex() { return m_VertWritePointer; }
+
+	void SetupVertex();
+	void DoState(PointerWrap &p);
+};
diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj
new file mode 100644
index 0000000000..4fa9e6971c
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Software.vcxproj
@@ -0,0 +1,98 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A4C423AA-F57C-46C7-A172-D1A777017D29}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClCompile Include="BPMemLoader.cpp" />
+    <ClCompile Include="Clipper.cpp" />
+    <ClCompile Include="CPMemLoader.cpp" />
+    <ClCompile Include="DebugUtil.cpp" />
+    <ClCompile Include="EfbCopy.cpp" />
+    <ClCompile Include="EfbInterface.cpp" />
+    <ClCompile Include="HwRasterizer.cpp" />
+    <ClCompile Include="OpcodeDecoder.cpp" />
+    <ClCompile Include="RasterFont.cpp" />
+    <ClCompile Include="Rasterizer.cpp" />
+    <ClCompile Include="SetupUnit.cpp" />
+    <ClCompile Include="SWCommandProcessor.cpp" />
+    <ClCompile Include="SWmain.cpp" />
+    <ClCompile Include="SWRenderer.cpp" />
+    <ClCompile Include="SWStatistics.cpp" />
+    <ClCompile Include="SWVertexLoader.cpp" />
+    <ClCompile Include="SWVideoConfig.cpp" />
+    <ClCompile Include="Tev.cpp" />
+    <ClCompile Include="TextureEncoder.cpp" />
+    <ClCompile Include="TextureSampler.cpp" />
+    <ClCompile Include="TransformUnit.cpp" />
+    <ClCompile Include="XFMemLoader.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BPMemLoader.h" />
+    <ClInclude Include="Clipper.h" />
+    <ClInclude Include="CPMemLoader.h" />
+    <ClInclude Include="DebugUtil.h" />
+    <ClInclude Include="EfbCopy.h" />
+    <ClInclude Include="EfbInterface.h" />
+    <ClInclude Include="HwRasterizer.h" />
+    <ClInclude Include="NativeVertexFormat.h" />
+    <ClInclude Include="OpcodeDecoder.h" />
+    <ClInclude Include="RasterFont.h" />
+    <ClInclude Include="Rasterizer.h" />
+    <ClInclude Include="SetupUnit.h" />
+    <ClInclude Include="SWCommandProcessor.h" />
+    <ClInclude Include="SWRenderer.h" />
+    <ClInclude Include="SWStatistics.h" />
+    <ClInclude Include="SWVertexLoader.h" />
+    <ClInclude Include="SWVideoConfig.h" />
+    <ClInclude Include="Tev.h" />
+    <ClInclude Include="TextureEncoder.h" />
+    <ClInclude Include="TextureSampler.h" />
+    <ClInclude Include="TransformUnit.h" />
+    <ClInclude Include="Vec3.h" />
+    <ClInclude Include="VideoBackend.h" />
+    <ClInclude Include="XFMemLoader.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp
new file mode 100644
index 0000000000..6ea6eab051
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Tev.cpp
@@ -0,0 +1,850 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/Tev.h"
+#include "VideoBackends/Software/TextureSampler.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/BoundingBox.h"
+
+#ifdef _DEBUG
+#define ALLOW_TEV_DUMPS 1
+#else
+#define ALLOW_TEV_DUMPS 0
+#endif
+
+void Tev::Init()
+{
+	FixedConstants[0] = 0;
+	FixedConstants[1] = 32;
+	FixedConstants[2] = 64;
+	FixedConstants[3] = 96;
+	FixedConstants[4] = 128;
+	FixedConstants[5] = 159;
+	FixedConstants[6] = 191;
+	FixedConstants[7] = 223;
+	FixedConstants[8] = 255;
+
+	for (s16& comp : Zero16)
+	{
+		comp = 0;
+	}
+
+	m_ColorInputLUT[0][RED_INP] = &Reg[0][RED_C]; m_ColorInputLUT[0][GRN_INP] = &Reg[0][GRN_C]; m_ColorInputLUT[0][BLU_INP] = &Reg[0][BLU_C]; // prev.rgb
+	m_ColorInputLUT[1][RED_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][GRN_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][BLU_INP] = &Reg[0][ALP_C]; // prev.aaa
+	m_ColorInputLUT[2][RED_INP] = &Reg[1][RED_C]; m_ColorInputLUT[2][GRN_INP] = &Reg[1][GRN_C]; m_ColorInputLUT[2][BLU_INP] = &Reg[1][BLU_C]; // c0.rgb
+	m_ColorInputLUT[3][RED_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][GRN_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][BLU_INP] = &Reg[1][ALP_C]; // c0.aaa
+	m_ColorInputLUT[4][RED_INP] = &Reg[2][RED_C]; m_ColorInputLUT[4][GRN_INP] = &Reg[2][GRN_C]; m_ColorInputLUT[4][BLU_INP] = &Reg[2][BLU_C]; // c1.rgb
+	m_ColorInputLUT[5][RED_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][GRN_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][BLU_INP] = &Reg[2][ALP_C]; // c1.aaa
+	m_ColorInputLUT[6][RED_INP] = &Reg[3][RED_C]; m_ColorInputLUT[6][GRN_INP] = &Reg[3][GRN_C]; m_ColorInputLUT[6][BLU_INP] = &Reg[3][BLU_C]; // c2.rgb
+	m_ColorInputLUT[7][RED_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][GRN_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][BLU_INP] = &Reg[3][ALP_C]; // c2.aaa
+	m_ColorInputLUT[8][RED_INP] = &TexColor[RED_C]; m_ColorInputLUT[8][GRN_INP] = &TexColor[GRN_C]; m_ColorInputLUT[8][BLU_INP] = &TexColor[BLU_C]; // tex.rgb
+	m_ColorInputLUT[9][RED_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][GRN_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][BLU_INP] = &TexColor[ALP_C]; // tex.aaa
+	m_ColorInputLUT[10][RED_INP] = &RasColor[RED_C]; m_ColorInputLUT[10][GRN_INP] = &RasColor[GRN_C]; m_ColorInputLUT[10][BLU_INP] = &RasColor[BLU_C]; // ras.rgb
+	m_ColorInputLUT[11][RED_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][GRN_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][BLU_INP] = &RasColor[ALP_C]; // ras.rgb
+	m_ColorInputLUT[12][RED_INP] = &FixedConstants[8]; m_ColorInputLUT[12][GRN_INP] = &FixedConstants[8]; m_ColorInputLUT[12][BLU_INP] = &FixedConstants[8]; // one
+	m_ColorInputLUT[13][RED_INP] = &FixedConstants[4]; m_ColorInputLUT[13][GRN_INP] = &FixedConstants[4]; m_ColorInputLUT[13][BLU_INP] = &FixedConstants[4]; // half
+	m_ColorInputLUT[14][RED_INP] = &StageKonst[RED_C]; m_ColorInputLUT[14][GRN_INP] = &StageKonst[GRN_C]; m_ColorInputLUT[14][BLU_INP] = &StageKonst[BLU_C]; // konst
+	m_ColorInputLUT[15][RED_INP] = &FixedConstants[0]; m_ColorInputLUT[15][GRN_INP] = &FixedConstants[0]; m_ColorInputLUT[15][BLU_INP] = &FixedConstants[0]; // zero
+
+	m_AlphaInputLUT[0] = &Reg[0][ALP_C]; // prev
+	m_AlphaInputLUT[1] = &Reg[1][ALP_C]; // c0
+	m_AlphaInputLUT[2] = &Reg[2][ALP_C]; // c1
+	m_AlphaInputLUT[3] = &Reg[3][ALP_C]; // c2
+	m_AlphaInputLUT[4] = &TexColor[ALP_C]; // tex
+	m_AlphaInputLUT[5] = &RasColor[ALP_C]; // ras
+	m_AlphaInputLUT[6] = &StageKonst[ALP_C]; // konst
+	m_AlphaInputLUT[7] = &Zero16[ALP_C]; // zero
+
+	for (int comp = 0; comp < 4; comp++)
+	{
+		m_KonstLUT[0][comp] = &FixedConstants[8];
+		m_KonstLUT[1][comp] = &FixedConstants[7];
+		m_KonstLUT[2][comp] = &FixedConstants[6];
+		m_KonstLUT[3][comp] = &FixedConstants[5];
+		m_KonstLUT[4][comp] = &FixedConstants[4];
+		m_KonstLUT[5][comp] = &FixedConstants[3];
+		m_KonstLUT[6][comp] = &FixedConstants[2];
+		m_KonstLUT[7][comp] = &FixedConstants[1];
+
+		// These are "invalid" values, not meant to be used. On hardware,
+		// they all output zero.
+		for (int i = 8; i < 16; ++i)
+		{
+			m_KonstLUT[i][comp] = &FixedConstants[0];
+		}
+
+		if (comp != ALP_C)
+		{
+			m_KonstLUT[12][comp] = &KonstantColors[0][comp];
+			m_KonstLUT[13][comp] = &KonstantColors[1][comp];
+			m_KonstLUT[14][comp] = &KonstantColors[2][comp];
+			m_KonstLUT[15][comp] = &KonstantColors[3][comp];
+		}
+
+		m_KonstLUT[16][comp] = &KonstantColors[0][RED_C];
+		m_KonstLUT[17][comp] = &KonstantColors[1][RED_C];
+		m_KonstLUT[18][comp] = &KonstantColors[2][RED_C];
+		m_KonstLUT[19][comp] = &KonstantColors[3][RED_C];
+		m_KonstLUT[20][comp] = &KonstantColors[0][GRN_C];
+		m_KonstLUT[21][comp] = &KonstantColors[1][GRN_C];
+		m_KonstLUT[22][comp] = &KonstantColors[2][GRN_C];
+		m_KonstLUT[23][comp] = &KonstantColors[3][GRN_C];
+		m_KonstLUT[24][comp] = &KonstantColors[0][BLU_C];
+		m_KonstLUT[25][comp] = &KonstantColors[1][BLU_C];
+		m_KonstLUT[26][comp] = &KonstantColors[2][BLU_C];
+		m_KonstLUT[27][comp] = &KonstantColors[3][BLU_C];
+		m_KonstLUT[28][comp] = &KonstantColors[0][ALP_C];
+		m_KonstLUT[29][comp] = &KonstantColors[1][ALP_C];
+		m_KonstLUT[30][comp] = &KonstantColors[2][ALP_C];
+		m_KonstLUT[31][comp] = &KonstantColors[3][ALP_C];
+	}
+
+	m_BiasLUT[0] = 0;
+	m_BiasLUT[1] = 128;
+	m_BiasLUT[2] = -128;
+	m_BiasLUT[3] = 0;
+
+	m_ScaleLShiftLUT[0] = 0;
+	m_ScaleLShiftLUT[1] = 1;
+	m_ScaleLShiftLUT[2] = 2;
+	m_ScaleLShiftLUT[3] = 0;
+
+	m_ScaleRShiftLUT[0] = 0;
+	m_ScaleRShiftLUT[1] = 0;
+	m_ScaleRShiftLUT[2] = 0;
+	m_ScaleRShiftLUT[3] = 1;
+}
+
+static inline s16 Clamp255(s16 in)
+{
+	return in>255?255:(in<0?0:in);
+}
+
+static inline s16 Clamp1024(s16 in)
+{
+	return in>1023?1023:(in<-1024?-1024:in);
+}
+
+void Tev::SetRasColor(int colorChan, int swaptable)
+{
+	switch (colorChan)
+	{
+	case 0: // Color0
+		{
+			u8 *color = Color[0];
+			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
+		}
+		break;
+	case 1: // Color1
+		{
+			u8 *color = Color[1];
+			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
+		}
+		break;
+	case 5: // alpha bump
+		{
+			for (s16& comp : RasColor)
+			{
+				comp = AlphaBump;
+			}
+		}
+		break;
+	case 6: // alpha bump normalized
+		{
+			u8 normalized = AlphaBump | AlphaBump >> 5;
+			for (s16& comp : RasColor)
+			{
+				comp = normalized;
+			}
+		}
+		break;
+	default: // zero
+		{
+			for (s16& comp : RasColor)
+			{
+				comp = 0;
+			}
+		}
+		break;
+	}
+}
+
+void Tev::DrawColorRegular(TevStageCombiner::ColorCombiner &cc, const InputRegType inputs[4])
+{
+	for (int i = 0; i < 3; i++)
+	{
+		const InputRegType& InputReg = inputs[BLU_C + i];
+
+		u16 c = InputReg.c + (InputReg.c >> 7);
+
+		s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
+		temp <<= m_ScaleLShiftLUT[cc.shift];
+		temp += (cc.shift == 3) ? 0 : (cc.op == 1) ? 127 : 128;
+		temp >>= 8;
+		temp = cc.op ? -temp : temp;
+
+		s32 result = ((InputReg.d + m_BiasLUT[cc.bias]) << m_ScaleLShiftLUT[cc.shift]) + temp;
+		result = result >> m_ScaleRShiftLUT[cc.shift];
+
+		Reg[cc.dest][BLU_C + i] = result;
+	}
+}
+
+void Tev::DrawColorCompare(TevStageCombiner::ColorCombiner &cc, const InputRegType inputs[4])
+{
+	for (int i = BLU_C; i <= RED_C; i++)
+	{
+		switch ((cc.shift<<1)|cc.op|8)  // encoded compare mode
+		{
+		case TEVCMP_R8_GT:
+			Reg[cc.dest][i] = inputs[i].d + ((inputs[RED_C].a > inputs[RED_C].b) ? inputs[i].c : 0);
+			break;
+
+		case TEVCMP_R8_EQ:
+			Reg[cc.dest][i] = inputs[i].d + ((inputs[RED_C].a == inputs[RED_C].b) ? inputs[i].c : 0);
+			break;
+
+		case TEVCMP_GR16_GT:
+			{
+				u32 a = (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+				u32 b = (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+				Reg[cc.dest][i] = inputs[i].d + ((a > b) ? inputs[i].c : 0);
+			}
+			break;
+
+		case TEVCMP_GR16_EQ:
+			{
+				u32 a = (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+				u32 b = (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+				Reg[cc.dest][i] = inputs[i].d + ((a == b) ? inputs[i].c : 0);
+			}
+			break;
+
+		case TEVCMP_BGR24_GT:
+			{
+				u32 a = (inputs[BLU_C].a << 16) | (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+				u32 b = (inputs[BLU_C].b << 16) | (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+				Reg[cc.dest][i] = inputs[i].d + ((a > b) ? inputs[i].c : 0);
+			}
+			break;
+
+		case TEVCMP_BGR24_EQ:
+			{
+				u32 a = (inputs[BLU_C].a << 16) | (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+				u32 b = (inputs[BLU_C].b << 16) | (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+				Reg[cc.dest][i] = inputs[i].d + ((a == b) ? inputs[i].c : 0);
+			}
+			break;
+
+		case TEVCMP_RGB8_GT:
+			Reg[cc.dest][i] = inputs[i].d + ((inputs[i].a > inputs[i].b) ? inputs[i].c : 0);
+			break;
+
+		case TEVCMP_RGB8_EQ:
+			Reg[cc.dest][i] = inputs[i].d + ((inputs[i].a == inputs[i].b) ? inputs[i].c : 0);
+			break;
+		}
+	}
+}
+
+void Tev::DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac, const InputRegType inputs[4])
+{
+	const InputRegType& InputReg = inputs[ALP_C];
+
+	u16 c = InputReg.c + (InputReg.c >> 7);
+
+	s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
+	temp <<= m_ScaleLShiftLUT[ac.shift];
+	temp += (ac.shift != 3) ? 0 : (ac.op == 1) ? 127 : 128;
+	temp = ac.op ? (-temp >> 8) : (temp >> 8);
+
+	s32 result = ((InputReg.d + m_BiasLUT[ac.bias]) << m_ScaleLShiftLUT[ac.shift]) + temp;
+	result = result >> m_ScaleRShiftLUT[ac.shift];
+
+	Reg[ac.dest][ALP_C] = result;
+}
+
+void Tev::DrawAlphaCompare(TevStageCombiner::AlphaCombiner& ac, const InputRegType inputs[4])
+{
+	switch ((ac.shift<<1)|ac.op|8)  // encoded compare mode
+	{
+	case TEVCMP_R8_GT:
+		Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((inputs[RED_C].a > inputs[RED_C].b) ? inputs[ALP_C].c : 0);
+		break;
+
+	case TEVCMP_R8_EQ:
+		Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((inputs[RED_C].a == inputs[RED_C].b) ? inputs[ALP_C].c : 0);
+		break;
+
+	case TEVCMP_GR16_GT:
+		{
+			u32 a = (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+			u32 b = (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+			Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((a > b) ? inputs[ALP_C].c : 0);
+		}
+		break;
+
+	case TEVCMP_GR16_EQ:
+		{
+			u32 a = (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+			u32 b = (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+			Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((a == b) ? inputs[ALP_C].c : 0);
+		}
+		break;
+
+	case TEVCMP_BGR24_GT:
+		{
+			u32 a = (inputs[BLU_C].a << 16) | (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+			u32 b = (inputs[BLU_C].b << 16) | (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+			Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((a > b) ? inputs[ALP_C].c : 0);
+		}
+		break;
+
+	case TEVCMP_BGR24_EQ:
+		{
+			u32 a = (inputs[BLU_C].a << 16) | (inputs[GRN_C].a << 8) | inputs[RED_C].a;
+			u32 b = (inputs[BLU_C].b << 16) | (inputs[GRN_C].b << 8) | inputs[RED_C].b;
+			Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((a == b) ? inputs[ALP_C].c : 0);
+		}
+		break;
+
+	case TEVCMP_A8_GT:
+		Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((inputs[ALP_C].a > inputs[ALP_C].b) ? inputs[ALP_C].c : 0);
+		break;
+
+	case TEVCMP_A8_EQ:
+		Reg[ac.dest][ALP_C] = inputs[ALP_C].d + ((inputs[ALP_C].a == inputs[ALP_C].b) ? inputs[ALP_C].c : 0);
+		break;
+	}
+}
+
+static bool AlphaCompare(int alpha, int ref, AlphaTest::CompareMode comp)
+{
+	switch (comp)
+	{
+	case AlphaTest::ALWAYS:  return true;
+	case AlphaTest::NEVER:   return false;
+	case AlphaTest::LEQUAL:  return alpha <= ref;
+	case AlphaTest::LESS:    return alpha < ref;
+	case AlphaTest::GEQUAL:  return alpha >= ref;
+	case AlphaTest::GREATER: return alpha > ref;
+	case AlphaTest::EQUAL:   return alpha == ref;
+	case AlphaTest::NEQUAL:  return alpha != ref;
+	default: return true;
+	}
+}
+
+static bool TevAlphaTest(int alpha)
+{
+	bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0);
+	bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1);
+
+	switch (bpmem.alpha_test.logic)
+	{
+	case 0: return comp0 && comp1;   // and
+	case 1: return comp0 || comp1;   // or
+	case 2: return comp0 ^ comp1;    // xor
+	case 3: return !(comp0 ^ comp1); // xnor
+	default: return true;
+	}
+}
+
+static inline s32 WrapIndirectCoord(s32 coord, int wrapMode)
+{
+	switch (wrapMode)
+	{
+		case ITW_OFF:
+			return coord;
+		case ITW_256:
+			return (coord % (256 << 7));
+		case ITW_128:
+			return (coord % (128 << 7));
+		case ITW_64:
+			return (coord % (64 << 7));
+		case ITW_32:
+			return (coord % (32 << 7));
+		case ITW_16:
+			return (coord % (16 << 7));
+		case ITW_0:
+			return 0;
+		default:
+			return 0;
+	}
+}
+
+void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
+{
+	TevStageIndirect &indirect = bpmem.tevind[stageNum];
+	u8 *indmap = IndirectTex[indirect.bt];
+
+	s32 indcoord[3];
+
+	// alpha bump select
+	switch (indirect.bs)
+	{
+		case ITBA_OFF:
+			AlphaBump = 0;
+			break;
+		case ITBA_S:
+			AlphaBump = indmap[TextureSampler::ALP_SMP];
+			break;
+		case ITBA_T:
+			AlphaBump = indmap[TextureSampler::BLU_SMP];
+			break;
+		case ITBA_U:
+			AlphaBump = indmap[TextureSampler::GRN_SMP];
+			break;
+	}
+
+	// bias select
+	s16 biasValue = indirect.fmt==ITF_8?-128:1;
+	s16 bias[3];
+	bias[0] = indirect.bias&1?biasValue:0;
+	bias[1] = indirect.bias&2?biasValue:0;
+	bias[2] = indirect.bias&4?biasValue:0;
+
+	// format
+	switch (indirect.fmt)
+	{
+		case ITF_8:
+			indcoord[0] = indmap[TextureSampler::ALP_SMP] + bias[0];
+			indcoord[1] = indmap[TextureSampler::BLU_SMP] + bias[1];
+			indcoord[2] = indmap[TextureSampler::GRN_SMP] + bias[2];
+			AlphaBump = AlphaBump & 0xf8;
+			break;
+		case ITF_5:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x1f) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x1f) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x1f) + bias[2];
+			AlphaBump = AlphaBump & 0xe0;
+			break;
+		case ITF_4:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x0f) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x0f) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x0f) + bias[2];
+			AlphaBump = AlphaBump & 0xf0;
+			break;
+		case ITF_3:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x07) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x07) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x07) + bias[2];
+			AlphaBump = AlphaBump & 0xf8;
+			break;
+		default:
+			PanicAlert("Tev::Indirect");
+			return;
+	}
+
+	s32 indtevtrans[2] = { 0,0 };
+
+	// matrix multiply - results might overflow, but we don't care since we only use the lower 24 bits of the result.
+	int indmtxid = indirect.mid & 3;
+	if (indmtxid)
+	{
+		IND_MTX &indmtx = bpmem.indmtx[indmtxid - 1];
+		int scale = ((u32)indmtx.col0.s0 << 0) |
+					((u32)indmtx.col1.s1 << 2) |
+					((u32)indmtx.col2.s2 << 4);
+
+		int shift;
+
+		switch (indirect.mid & 12)
+		{
+			case 0:
+				// matrix values are S0.10, output format is S17.7, so divide by 8
+				shift = (17 - scale);
+				indtevtrans[0] = (indmtx.col0.ma * indcoord[0] + indmtx.col1.mc * indcoord[1] + indmtx.col2.me * indcoord[2]) >> 3;
+				indtevtrans[1] = (indmtx.col0.mb * indcoord[0] + indmtx.col1.md * indcoord[1] + indmtx.col2.mf * indcoord[2]) >> 3;
+				break;
+			case 4: // s matrix
+				// s is S17.7, matrix elements are divided by 256, output is S17.7, so divide by 256. - TODO: Maybe, since s is actually stored as S24, we should divide by 256*64?
+				shift = (17 - scale);
+				indtevtrans[0] = s * indcoord[0] / 256;
+				indtevtrans[1] = t * indcoord[0] / 256;
+				break;
+			case 8: // t matrix
+				shift = (17 - scale);
+				indtevtrans[0] = s * indcoord[1] / 256;
+				indtevtrans[1] = t * indcoord[1] / 256;
+				break;
+			default:
+				return;
+		}
+
+		indtevtrans[0] = shift >= 0 ? indtevtrans[0] >> shift : indtevtrans[0] << -shift;
+		indtevtrans[1] = shift >= 0 ? indtevtrans[1] >> shift : indtevtrans[1] << -shift;
+	}
+
+	if (indirect.fb_addprev)
+	{
+		TexCoord.s += (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
+		TexCoord.t += (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
+	}
+	else
+	{
+		TexCoord.s = (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
+		TexCoord.t = (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
+	}
+}
+
+void Tev::Draw()
+{
+	_assert_(Position[0] >= 0 && Position[0] < EFB_WIDTH);
+	_assert_(Position[1] >= 0 && Position[1] < EFB_HEIGHT);
+
+	INCSTAT(swstats.thisFrame.tevPixelsIn);
+
+	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+
+		u32 texcoordSel = bpmem.tevindref.getTexCoord(stageNum);
+		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
+
+		const TEXSCALE& texscale = bpmem.texscale[stageNum2];
+		s32 scaleS = stageOdd ? texscale.ss1:texscale.ss0;
+		s32 scaleT = stageOdd ? texscale.ts1:texscale.ts0;
+
+		TextureSampler::Sample(Uv[texcoordSel].s >> scaleS, Uv[texcoordSel].t >> scaleT,
+			IndirectLod[stageNum], IndirectLinear[stageNum], texmap, IndirectTex[stageNum]);
+
+#if ALLOW_TEV_DUMPS
+		if (g_SWVideoConfig.bDumpTevStages)
+		{
+			u8 stage[4] = {
+				IndirectTex[stageNum][TextureSampler::ALP_SMP],
+				IndirectTex[stageNum][TextureSampler::BLU_SMP],
+				IndirectTex[stageNum][TextureSampler::GRN_SMP],
+				255
+			};
+			DebugUtil::DrawTempBuffer(stage, INDIRECT + stageNum);
+		}
+#endif
+	}
+
+	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
+		TevKSel &kSel = bpmem.tevksel[stageNum2];
+
+		// stage combiners
+		TevStageCombiner::ColorCombiner &cc = bpmem.combiners[stageNum].colorC;
+		TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[stageNum].alphaC;
+
+		int texcoordSel = order.getTexCoord(stageOdd);
+		int texmap = order.getTexMap(stageOdd);
+
+		Indirect(stageNum, Uv[texcoordSel].s, Uv[texcoordSel].t);
+
+		// sample texture
+		if (order.getEnable(stageOdd))
+		{
+			// RGBA
+			u8 texel[4];
+
+			TextureSampler::Sample(TexCoord.s, TexCoord.t, TextureLod[stageNum], TextureLinear[stageNum], texmap, texel);
+
+#if ALLOW_TEV_DUMPS
+			if (g_SWVideoConfig.bDumpTevTextureFetches)
+				DebugUtil::DrawTempBuffer(texel, DIRECT_TFETCH + stageNum);
+#endif
+
+			int swaptable = ac.tswap * 2;
+
+			TexColor[RED_C] = texel[bpmem.tevksel[swaptable].swap1];
+			TexColor[GRN_C] = texel[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			TexColor[BLU_C] = texel[bpmem.tevksel[swaptable].swap1];
+			TexColor[ALP_C] = texel[bpmem.tevksel[swaptable].swap2];
+		}
+
+		// set konst for this stage
+		int kc = kSel.getKC(stageOdd);
+		int ka = kSel.getKA(stageOdd);
+		StageKonst[RED_C] = *(m_KonstLUT[kc][RED_C]);
+		StageKonst[GRN_C] = *(m_KonstLUT[kc][GRN_C]);
+		StageKonst[BLU_C] = *(m_KonstLUT[kc][BLU_C]);
+		StageKonst[ALP_C] = *(m_KonstLUT[ka][ALP_C]);
+
+		// set color
+		SetRasColor(order.getColorChan(stageOdd), ac.rswap * 2);
+
+		// combine inputs
+		InputRegType inputs[4];
+		for (int i = 0; i < 3; i++)
+		{
+			inputs[BLU_C + i].a = *m_ColorInputLUT[cc.a][i];
+			inputs[BLU_C + i].b = *m_ColorInputLUT[cc.b][i];
+			inputs[BLU_C + i].c = *m_ColorInputLUT[cc.c][i];
+			inputs[BLU_C + i].d = *m_ColorInputLUT[cc.d][i];
+		}
+		inputs[ALP_C].a = *m_AlphaInputLUT[ac.a];
+		inputs[ALP_C].b = *m_AlphaInputLUT[ac.b];
+		inputs[ALP_C].c = *m_AlphaInputLUT[ac.c];
+		inputs[ALP_C].d = *m_AlphaInputLUT[ac.d];
+
+		if (cc.bias != 3)
+			DrawColorRegular(cc, inputs);
+		else
+			DrawColorCompare(cc, inputs);
+
+		if (cc.clamp)
+		{
+			Reg[cc.dest][RED_C] = Clamp255(Reg[cc.dest][RED_C]);
+			Reg[cc.dest][GRN_C] = Clamp255(Reg[cc.dest][GRN_C]);
+			Reg[cc.dest][BLU_C] = Clamp255(Reg[cc.dest][BLU_C]);
+		}
+		else
+		{
+			Reg[cc.dest][RED_C] = Clamp1024(Reg[cc.dest][RED_C]);
+			Reg[cc.dest][GRN_C] = Clamp1024(Reg[cc.dest][GRN_C]);
+			Reg[cc.dest][BLU_C] = Clamp1024(Reg[cc.dest][BLU_C]);
+		}
+
+		if (ac.bias != 3)
+			DrawAlphaRegular(ac, inputs);
+		else
+			DrawAlphaCompare(ac, inputs);
+
+		if (ac.clamp)
+			Reg[ac.dest][ALP_C] = Clamp255(Reg[ac.dest][ALP_C]);
+		else
+			Reg[ac.dest][ALP_C] = Clamp1024(Reg[ac.dest][ALP_C]);
+
+#if ALLOW_TEV_DUMPS
+		if (g_SWVideoConfig.bDumpTevStages)
+		{
+			u8 stage[4] = {(u8)Reg[0][RED_C], (u8)Reg[0][GRN_C], (u8)Reg[0][BLU_C], (u8)Reg[0][ALP_C]};
+			DebugUtil::DrawTempBuffer(stage, DIRECT + stageNum);
+		}
+#endif
+	}
+
+	// convert to 8 bits per component
+	// the results of the last tev stage are put onto the screen,
+	// regardless of the used destination register - TODO: Verify!
+	u32 color_index = bpmem.combiners[bpmem.genMode.numtevstages].colorC.dest;
+	u32 alpha_index = bpmem.combiners[bpmem.genMode.numtevstages].alphaC.dest;
+	u8 output[4] = {(u8)Reg[alpha_index][ALP_C], (u8)Reg[color_index][BLU_C], (u8)Reg[color_index][GRN_C], (u8)Reg[color_index][RED_C]};
+
+	if (!TevAlphaTest(output[ALP_C]))
+		return;
+
+	// This part is only needed if we are not simply computing bbox
+	// (i. e., only needed when using the SW renderer)
+	if (!BoundingBox::active)
+	{
+		// z texture
+		if (bpmem.ztex2.op)
+		{
+			u32 ztex = bpmem.ztex1.bias;
+			switch (bpmem.ztex2.type)
+			{
+				case 0: // 8 bit
+					ztex += TexColor[ALP_C];
+					break;
+				case 1: // 16 bit
+					ztex += TexColor[ALP_C] << 8 | TexColor[RED_C];
+					break;
+				case 2: // 24 bit
+					ztex += TexColor[RED_C] << 16 | TexColor[GRN_C] << 8 | TexColor[BLU_C];
+					break;
+			}
+
+			if (bpmem.ztex2.op == ZTEXTURE_ADD)
+				ztex += Position[2];
+
+			Position[2] = ztex & 0x00ffffff;
+		}
+
+		// fog
+		if (bpmem.fog.c_proj_fsel.fsel)
+		{
+			float ze;
+
+			if (bpmem.fog.c_proj_fsel.proj == 0)
+			{
+				// perspective
+				// ze = A/(B - (Zs >> B_SHF))
+				s32 denom = bpmem.fog.b_magnitude - (Position[2] >> bpmem.fog.b_shift);
+				//in addition downscale magnitude and zs to 0.24 bits
+				ze = (bpmem.fog.a.GetA() * 16777215.0f) / (float)denom;
+			}
+			else
+			{
+				// orthographic
+				// ze = a*Zs
+				//in addition downscale zs to 0.24 bits
+				ze = bpmem.fog.a.GetA() * ((float)Position[2] / 16777215.0f);
+
+			}
+
+			if (bpmem.fogRange.Base.Enabled)
+			{
+				// TODO: This is untested and should definitely be checked against real hw.
+				// - No idea if offset is really normalized against the viewport width or against the projection matrix or yet something else
+				// - scaling of the "k" coefficient isn't clear either.
+
+				// First, calculate the offset from the viewport center (normalized to 0..1)
+				float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)xfmem.viewport.wd;
+
+				// Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value.
+				float floatindex = 9.f - std::abs(offset) * 9.f;
+				floatindex = (floatindex < 0.f) ? 0.f : (floatindex > 9.f) ? 9.f : floatindex; // TODO: This shouldn't be necessary!
+
+				// Get the two closest integer indices, look up the corresponding samples
+				int indexlower = (int)floor(floatindex);
+				int indexupper = indexlower + 1;
+				// Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor)
+				float klower = bpmem.fogRange.K[indexlower/2].GetValue(indexlower%2) * 4.f;
+				float kupper = bpmem.fogRange.K[indexupper/2].GetValue(indexupper%2) * 4.f;
+
+				// linearly interpolate the samples and multiple ze by the resulting adjustment factor
+				float factor = indexupper - floatindex;
+				float k = klower * factor + kupper * (1.f - factor);
+				float x_adjust = sqrt(offset*offset + k*k)/k;
+				ze *= x_adjust; // NOTE: This is basically dividing by a cosine (hidden behind GXInitFogAdjTable): 1/cos = c/b = sqrt(a^2+b^2)/b
+			}
+
+			ze -= bpmem.fog.c_proj_fsel.GetC();
+
+			// clamp 0 to 1
+			float fog = (ze<0.0f) ? 0.0f : ((ze>1.0f) ? 1.0f : ze);
+
+			switch (bpmem.fog.c_proj_fsel.fsel)
+			{
+				case 4: // exp
+					fog = 1.0f - pow(2.0f, -8.0f * fog);
+					break;
+				case 5: // exp2
+					fog = 1.0f - pow(2.0f, -8.0f * fog * fog);
+					break;
+				case 6: // backward exp
+					fog = 1.0f - fog;
+					fog = pow(2.0f, -8.0f * fog);
+					break;
+				case 7: // backward exp2
+					fog = 1.0f - fog;
+					fog = pow(2.0f, -8.0f * fog * fog);
+					break;
+			}
+
+			// lerp from output to fog color
+			u32 fogInt = (u32)(fog * 256);
+			u32 invFog = 256 - fogInt;
+
+			output[RED_C] = (output[RED_C] * invFog + fogInt * bpmem.fog.color.r) >> 8;
+			output[GRN_C] = (output[GRN_C] * invFog + fogInt * bpmem.fog.color.g) >> 8;
+			output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8;
+		}
+
+		bool late_ztest = !bpmem.zcontrol.early_ztest || !g_SWVideoConfig.bZComploc;
+		if (late_ztest && bpmem.zmode.testenable)
+		{
+			// TODO: Check against hw if these values get incremented even if depth testing is disabled
+			EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_INPUT);
+
+			if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2]))
+				return;
+
+			EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_OUTPUT);
+		}
+	}
+
+	// branchless bounding box update
+	BoundingBox::coords[BoundingBox::LEFT] = std::min((u16)Position[0], BoundingBox::coords[BoundingBox::LEFT]);
+	BoundingBox::coords[BoundingBox::RIGHT] = std::max((u16)Position[0], BoundingBox::coords[BoundingBox::RIGHT]);
+	BoundingBox::coords[BoundingBox::TOP] = std::min((u16)Position[1], BoundingBox::coords[BoundingBox::TOP]);
+	BoundingBox::coords[BoundingBox::BOTTOM] = std::max((u16)Position[1], BoundingBox::coords[BoundingBox::BOTTOM]);
+
+	// if we are only calculating the bounding box,
+	// there's no need to actually draw anything
+	if (BoundingBox::active)
+		return;
+
+
+#if ALLOW_TEV_DUMPS
+	if (g_SWVideoConfig.bDumpTevStages)
+	{
+		for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
+			DebugUtil::CopyTempBuffer(Position[0], Position[1], INDIRECT, i, "Indirect");
+		for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
+			DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT, i, "Stage");
+	}
+
+	if (g_SWVideoConfig.bDumpTevTextureFetches)
+	{
+		for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
+		{
+			TwoTevStageOrders &order = bpmem.tevorders[i >> 1];
+			if (order.getEnable(i & 1))
+				DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT_TFETCH, i, "TFetch");
+		}
+	}
+#endif
+
+	INCSTAT(swstats.thisFrame.tevPixelsOut);
+	EfbInterface::IncPerfCounterQuadCount(PQ_BLEND_INPUT);
+
+	EfbInterface::BlendTev(Position[0], Position[1], output);
+}
+
+void Tev::SetRegColor(int reg, int comp, bool konst, s16 color)
+{
+	if (konst)
+	{
+		KonstantColors[reg][comp] = color;
+	}
+	else
+	{
+		Reg[reg][comp] = color;
+	}
+}
+
+void Tev::DoState(PointerWrap &p)
+{
+	p.DoArray(Reg, sizeof(Reg));
+
+	p.DoArray(KonstantColors, sizeof(KonstantColors));
+	p.DoArray(TexColor,4);
+	p.DoArray(RasColor,4);
+	p.DoArray(StageKonst,4);
+	p.DoArray(Zero16,4);
+
+	p.DoArray(FixedConstants,9);
+	p.Do(AlphaBump);
+	p.DoArray(IndirectTex, sizeof(IndirectTex));
+	p.Do(TexCoord);
+
+	p.DoArray(m_BiasLUT,4);
+	p.DoArray(m_ScaleLShiftLUT,4);
+	p.DoArray(m_ScaleRShiftLUT,4);
+
+	p.DoArray(Position,3);
+	p.DoArray(Color, sizeof(Color));
+	p.DoArray(Uv, 8);
+	p.DoArray(IndirectLod,4);
+	p.DoArray(IndirectLinear,4);
+	p.DoArray(TextureLod,16);
+	p.DoArray(TextureLinear,16);
+}
diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h
new file mode 100644
index 0000000000..9da27acc52
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Tev.h
@@ -0,0 +1,95 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoBackends/Software/BPMemLoader.h"
+
+class PointerWrap;
+
+class Tev
+{
+	struct InputRegType
+	{
+		unsigned a : 8;
+		unsigned b : 8;
+		unsigned c : 8;
+		signed   d : 11;
+	};
+
+	struct TextureCoordinateType
+	{
+		signed s : 24;
+		signed t : 24;
+	};
+
+	// color order: ABGR
+	s16 Reg[4][4];
+	s16 KonstantColors[4][4];
+	s16 TexColor[4];
+	s16 RasColor[4];
+	s16 StageKonst[4];
+	s16 Zero16[4];
+
+	s16 FixedConstants[9];
+	u8 AlphaBump;
+	u8 IndirectTex[4][4];
+	TextureCoordinateType TexCoord;
+
+	s16 *m_ColorInputLUT[16][3];
+	s16 *m_AlphaInputLUT[8];        // values must point to ABGR color
+	s16 *m_KonstLUT[32][4];
+	s16 m_BiasLUT[4];
+	u8 m_ScaleLShiftLUT[4];
+	u8 m_ScaleRShiftLUT[4];
+
+	// enumeration for color input LUT
+	enum
+	{
+		BLU_INP,
+		GRN_INP,
+		RED_INP
+	};
+
+	enum BufferBase
+	{
+		DIRECT = 0,
+		DIRECT_TFETCH = 16,
+		INDIRECT = 32
+	};
+
+	void SetRasColor(int colorChan, int swaptable);
+
+	void DrawColorRegular(TevStageCombiner::ColorCombiner& cc, const InputRegType inputs[4]);
+	void DrawColorCompare(TevStageCombiner::ColorCombiner& cc, const InputRegType inputs[4]);
+	void DrawAlphaRegular(TevStageCombiner::AlphaCombiner& ac, const InputRegType inputs[4]);
+	void DrawAlphaCompare(TevStageCombiner::AlphaCombiner& ac, const InputRegType inputs[4]);
+
+	void Indirect(unsigned int stageNum, s32 s, s32 t);
+
+public:
+	s32 Position[3];
+	u8 Color[2][4]; // must be RGBA for correct swap table ordering
+	TextureCoordinateType Uv[8];
+	s32 IndirectLod[4];
+	bool IndirectLinear[4];
+	s32 TextureLod[16];
+	bool TextureLinear[16];
+
+	enum
+	{
+		ALP_C,
+		BLU_C,
+		GRN_C,
+		RED_C
+	};
+
+	void Init();
+
+	void Draw();
+
+	void SetRegColor(int reg, int comp, bool konst, s16 color);
+
+	void DoState(PointerWrap &p);
+};
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
new file mode 100644
index 0000000000..13c5973c95
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
@@ -0,0 +1,1435 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/TextureEncoder.h"
+
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"
+
+
+namespace TextureEncoder
+{
+
+static inline void RGBA_to_RGBA8(const u8 *src, u8* r, u8* g, u8* b, u8* a)
+{
+	u32 srcColor = *(u32*)src;
+	*a = Convert6To8(srcColor & 0x3f);
+	*b = Convert6To8((srcColor >> 6) & 0x3f);
+	*g = Convert6To8((srcColor >> 12)& 0x3f);
+	*r = Convert6To8((srcColor >> 18)& 0x3f);
+}
+
+static inline void RGBA_to_RGB8(const u8 *src, u8* r, u8* g, u8* b)
+{
+	u32 srcColor = *(u32*)src;
+	*b = Convert6To8((srcColor >> 6) & 0x3f);
+	*g = Convert6To8((srcColor >> 12)& 0x3f);
+	*r = Convert6To8((srcColor >> 18)& 0x3f);
+}
+
+static inline u8 RGB8_to_I(u8 r, u8 g, u8 b)
+{
+	// values multiplied by 256 to keep math integer
+	u16 val = 4096 + 66 * r + 129 * g + 25 * b;
+	return val >> 8;
+}
+
+// box filter sampling averages 4 samples with the source texel being the top left of the box
+// components are scaled to the range 0-255 after all samples are taken
+
+static inline void BoxfilterRGBA_to_RGBA8(const u8* src, u8* r, u8* g, u8* b, u8* a)
+{
+	u16 r16 = 0, g16 = 0, b16 = 0, a16 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
+
+			a16 += srcColor & 0x3f;
+			b16 += (srcColor >> 6) & 0x3f;
+			g16 += (srcColor >> 12) & 0x3f;
+			r16 += (srcColor >> 18) & 0x3f;
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*r = r16 + (r16 >> 6);
+	*g = g16 + (g16 >> 6);
+	*b = b16 + (b16 >> 6);
+	*a = a16 + (a16 >> 6);
+}
+
+static inline void BoxfilterRGBA_to_RGB8(const u8* src, u8* r, u8* g, u8* b)
+{
+	u16 r16 = 0, g16 = 0, b16 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
+
+			b16 += (srcColor >> 6) & 0x3f;
+			g16 += (srcColor >> 12) & 0x3f;
+			r16 += (srcColor >> 18) & 0x3f;
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*r = r16 + (r16 >> 6);
+	*g = g16 + (g16 >> 6);
+	*b = b16 + (b16 >> 6);
+}
+
+static inline void BoxfilterRGBA_to_x8(const u8* src, u8* x8, int shift)
+{
+	u16 x16 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
+
+			x16 += (srcColor >> shift) & 0x3f;
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*x8 = x16 + (x16 >> 6);
+}
+
+static inline void BoxfilterRGBA_to_xx8(const u8* src, u8* x1, u8* x2, int shift1, int shift2)
+{
+	u16 x16_1 = 0;
+	u16 x16_2 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
+
+			x16_1 += (srcColor >> shift1) & 0x3f;
+			x16_2 += (srcColor >> shift2) & 0x3f;
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*x1 = x16_1 + (x16_1 >> 6);
+	*x2 = x16_2 + (x16_2 >> 6);
+}
+
+static inline void BoxfilterRGB_to_RGB8(const u8* src, u8* r, u8* g, u8* b)
+{
+	u16 r16 = 0, g16 = 0, b16 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			b16 += src[0];
+			g16 += src[1];
+			r16 += src[2];
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*r = r16 >> 2;
+	*g = g16 >> 2;
+	*b = b16 >> 2;
+}
+
+static inline void BoxfilterRGB_to_x8(u8 *src, u8* x8, int comp)
+{
+	u16 x16 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+
+			x16 += src[comp];
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*x8 = x16 >> 2;
+}
+
+static inline void BoxfilterRGB_to_xx8(const u8* src, u8* x1, u8* x2, int comp1, int comp2)
+{
+	u16 x16_1 = 0;
+	u16 x16_2 = 0;
+
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+
+			x16_1 += src[comp1];
+			x16_2 += src[comp2];
+
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
+
+	*x1 = x16_1 >> 2;
+	*x2 = x16_2 >> 2;
+}
+
+static void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16* sBlkCount, u16* tBlkCount, u16* sBlkSize, u16* tBlkSize)
+{
+	// if half_scale is 1 then the size is cut in half
+	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
+	u32 height = bpmem.copyTexSrcWH.y >> bpmem.triggerEFBCopy.half_scale;
+
+	*sBlkCount = (width >> blkWidthLog2) + 1;
+	*tBlkCount = (height >> blkHeightLog2) + 1;
+
+	*sBlkSize = 1 << blkWidthLog2;
+	*tBlkSize = 1 << blkHeightLog2;
+}
+
+static void SetSpans(int sBlkSize, int tBlkSize, s32* tSpan, s32* sBlkSpan, s32* tBlkSpan, s32* writeStride)
+{
+	// width is 1 less than the number of pixels of width
+	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
+	u32 alignedWidth = (width + sBlkSize) & (~(sBlkSize-1));
+
+	u32 readStride = 3 << bpmem.triggerEFBCopy.half_scale;
+
+	*tSpan = (640 - sBlkSize) * readStride; // bytes to advance src pointer after each row of texels in a block
+	*sBlkSpan = ((-640 * tBlkSize) + sBlkSize) * readStride; // bytes to advance src pointer after each block
+	*tBlkSpan = ((640 * tBlkSize) - alignedWidth) * readStride; // bytes to advance src pointer after each row of blocks
+
+	*writeStride = bpmem.copyMipMapStrideChannels * 32;
+}
+
+#define ENCODE_LOOP_BLOCKS									\
+		for (int tBlk = 0; tBlk < tBlkCount; tBlk++) {		\
+			dst = dstBlockStart;							\
+			for (int sBlk = 0; sBlk < sBlkCount; sBlk++) {	\
+				for (int t = 0; t < tBlkSize; t++) {		\
+					for (int s = 0; s < sBlkSize; s++) {	\
+
+
+#define ENCODE_LOOP_SPANS									\
+					}										\
+					src += tSpan;							\
+				}											\
+				src += sBlkSpan;							\
+			}												\
+			src += tBlkSpan;								\
+			dstBlockStart += writeStride;					\
+		}													\
+
+#define ENCODE_LOOP_SPANS2									\
+					}										\
+					src += tSpan;							\
+				}											\
+				src += sBlkSpan;							\
+				dst += 32;									\
+			}												\
+			src += tBlkSpan;								\
+			dstBlockStart += writeStride;					\
+		}													\
+
+static void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b, a;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
+
+			RGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, &r, &g, &b, &a);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, &r, &g, &b, &a);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+
+			u16 val = ((srcColor >> 8) & 0xf800) | ((srcColor >> 7) & 0x07e0) | ((srcColor >> 7) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+
+			u16 alpha = (srcColor << 9) & 0x7000;
+			u16 val;
+			if (alpha == 0x7000) // 555
+				val = 0x8000 | ((srcColor >> 9) & 0x7c00) | ((srcColor >> 8) & 0x03e0) | ((srcColor >> 7) & 0x001e);
+			else // 4443
+				val = alpha | ((srcColor >> 12) & 0x0f00) | ((srcColor >> 10) & 0x00f0) | ((srcColor >> 8) & 0x000f);
+
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, &dst[1], &dst[32], &dst[33], &dst[0]);
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst = (srcColor >> 16) & 0xf0;
+
+			srcColor = *(u32*)src;
+			src += readStride;
+			*dst |= (srcColor >> 20) & 0x0f;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = ((srcColor << 2) & 0xf0) | ((srcColor >> 20) & 0x0f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8(srcColor & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8(srcColor & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+
+static void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b, a;
+	u32 readStride = 6;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
+
+			BoxfilterRGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGBA8(src, &r, &g, &b, &a);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGBA8(src, &r, &g, &b, &a);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGB8(src, &r, &g, &b);
+			src += readStride;
+
+			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGBA8(src, &r, &g, &b, &a);
+			src += readStride;
+
+			u16 val;
+			if (a >= 224) // 5551
+				val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
+			else // 4443
+				val = ((a << 7) & 0x7000) | ((r << 4) & 0x0f00) | (g & 0x00f0) | ((b >> 4) & 0x000f);
+
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_RGBA8(src, &dst[1], &dst[32], &dst[33], &dst[0]);
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_x8(src, &r, 18);
+			src += readStride;
+			*dst = r & 0xf0;
+
+			BoxfilterRGBA_to_x8(src, &r, 18);
+			src += readStride;
+			*dst |= r >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_xx8(src, &r, &a, 18, 0);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (r >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_xx8(src, &r, &a, 18, 0);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = r;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_x8(src, &a, 0);
+			*dst++ = a;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_x8(src, &r, 18);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_x8(src, &g, 12);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_x8(src, &b, 6);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_xx8(src, &r, &g, 18, 12);
+			src += readStride;
+			*dst++ = g;
+			*dst++ = r;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGBA_to_xx8(src, &g, &b, 12, 6);
+			src += readStride;
+			*dst++ = b;
+			*dst++ = g;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+static void EncodeRGB8(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = RGB8_to_I(src[2], src[1], src[0]) & 0xf0;
+			src += readStride;
+
+			*dst |= RGB8_to_I(src[2], src[1], src[0]) >> 4;
+			src += readStride;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xf0 | (RGB8_to_I(src[2], src[1], src[0]) >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
+
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u16 val = ((src[2] << 8) & 0xf800) | ((src[1] << 3) & 0x07e0) | ((src[0] >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u16 val = 0x8000 | ((src[2] << 7) & 0x7c00) | ((src[1] << 2) & 0x03e0) | ((src[0] >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			dst[0] = 0xff;
+			dst[1] = src[2];
+			dst[32] = src[1];
+			dst[33] = src[0];
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = src[2] & 0xf0;
+			src += readStride;
+
+			*dst |= src[2] >> 4;
+			src += readStride;
+
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xf0 | (src[2] >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+static void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b;
+	u32 readStride = 6;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
+			src += readStride;
+
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			src += readStride;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			*dst++ = RGB8_to_I(r, g, b);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			*dst++ = 0xf0 | (RGB8_to_I(r, g, b) >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			*dst++ = 0xff;
+			*dst++ = RGB8_to_I(r, g, b);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			u16 val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &r, &g, &b);
+			dst[0] = 0xff;
+			dst[1] = r;
+			dst[32] = g;
+			dst[33] = b;
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &r, 2);
+			*dst = r & 0xf0;
+			src += readStride;
+
+			BoxfilterRGB_to_x8(src, &r, 2);
+			*dst |= r >> 4;
+			src += readStride;
+
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &r, 2);
+			*dst++ = 0xf0 | (r >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &r, 2);
+			*dst++ = 0xff;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &r, 2);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &g, 1);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &b, 0);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_xx8(src, &r, &g, 2, 1);
+			*dst++ = g;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_xx8(src, &g, &b, 1, 0);
+			*dst++ = b;
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+static void EncodeZ24(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_Z8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_Z16:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_Z24X8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			dst[0] = 0xff;
+			dst[1] = src[2];
+			dst[32] = src[1];
+			dst[33] = src[0];
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_Z4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = src[2] & 0xf0;
+			src += readStride;
+
+			*dst |= src[2] >> 4;
+			src += readStride;
+
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z8M:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z8L:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z16L:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+static void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
+{
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 6;
+	u8 r, g, b;
+	u8 *dstBlockStart = dst;
+
+	switch (format)
+	{
+	case GX_TF_Z8:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &b, 2);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_Z16:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_xx8(src, &g, &b, 1, 2);
+			*dst++ = b;
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_TF_Z24X8:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_RGB8(src, &dst[33], &dst[32], &dst[1]);
+			dst[0] = 255;
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
+
+	case GX_CTF_Z4:
+		SetBlockDimensions(3, 3, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &b, 2);
+			*dst = b & 0xf0;
+			src += readStride;
+
+			BoxfilterRGB_to_x8(src, &b, 2);
+			*dst |= b >> 4;
+			src += readStride;
+
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z8M:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &g, 1);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z8L:
+		SetBlockDimensions(3, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_x8(src, &r, 0);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_Z16L:
+		SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, &tSpan, &sBlkSpan, &tBlkSpan, &writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			BoxfilterRGB_to_xx8(src, &r, &g, 0, 1);
+			*dst++ = g;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+}
+
+void Encode(u8 *dest_ptr)
+{
+	auto pixelformat = bpmem.zcontrol.pixel_format;
+	bool bFromZBuffer = pixelformat == PEControl::Z24;
+	bool bIsIntensityFmt = bpmem.triggerEFBCopy.intensity_fmt > 0;
+	u32 copyfmt = ((bpmem.triggerEFBCopy.target_pixel_format / 2) + ((bpmem.triggerEFBCopy.target_pixel_format & 1) * 8));
+
+	// pack copy format information into a single variable
+	u32 format = copyfmt;
+	if (bFromZBuffer)
+	{
+		format |= _GX_TF_ZTF;
+		if (copyfmt == 11)
+			format = GX_TF_Z16;
+		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
+			format |= _GX_TF_CTF;
+	}
+	else
+		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
+			format |= _GX_TF_CTF;
+
+	u8 *src = EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer);
+
+	if (bpmem.triggerEFBCopy.half_scale)
+	{
+		if (pixelformat == PEControl::RGBA6_Z24)
+			EncodeRGBA6halfscale(dest_ptr, src, format);
+		else if (pixelformat == PEControl::RGB8_Z24)
+			EncodeRGB8halfscale(dest_ptr, src, format);
+		else if (pixelformat == PEControl::RGB565_Z16)  // not supported
+			EncodeRGB8halfscale(dest_ptr, src, format);
+		else if (pixelformat == PEControl::Z24)
+			EncodeZ24halfscale(dest_ptr, src, format);
+	}
+	else
+	{
+		if (pixelformat == PEControl::RGBA6_Z24)
+			EncodeRGBA6(dest_ptr, src, format);
+		else if (pixelformat == PEControl::RGB8_Z24)
+			EncodeRGB8(dest_ptr, src, format);
+		else if (pixelformat == PEControl::RGB565_Z16)  // not supported
+			EncodeRGB8(dest_ptr, src, format);
+		else if (pixelformat == PEControl::Z24)
+			EncodeZ24(dest_ptr, src, format);
+	}
+}
+
+
+}
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h
new file mode 100644
index 0000000000..5fb8731c4b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.h
@@ -0,0 +1,12 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace TextureEncoder
+{
+	void Encode(u8 *dest_ptr);
+}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp
similarity index 80%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
rename to Source/Core/VideoBackends/Software/TextureSampler.cpp
index f7c87ba513..3490133942 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -1,22 +1,24 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "TextureSampler.h"
-
-#include "BPMemLoader.h"
-#include "TextureDecoder.h"
-#include "HW/Memmap.h"
-
+#include <algorithm>
 #include <cmath>
 
+#include "Common/Common.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/TextureSampler.h"
+#include "VideoCommon/TextureDecoder.h"
+
 #define ALLOW_MIPMAP 1
 
 namespace TextureSampler
 {
 
-inline void WrapCoord(int &coord, int wrapMode, int imageSize)
+static inline void WrapCoord(int* coordp, int wrapMode, int imageSize)
 {
+	int coord = *coordp;
 	switch (wrapMode)
 	{
 		case 0: // clamp
@@ -36,9 +38,10 @@ inline void WrapCoord(int &coord, int wrapMode, int imageSize)
 			}
 			break;
 	}
+	*coordp = coord;
 }
 
-inline void SetTexel(u8 *inTexel, u32 *outTexel, u32 fract)
+static inline void SetTexel(u8 *inTexel, u32 *outTexel, u32 fract)
 {
 	outTexel[0] = inTexel[0] * fract;
 	outTexel[1] = inTexel[1] * fract;
@@ -46,7 +49,7 @@ inline void SetTexel(u8 *inTexel, u32 *outTexel, u32 fract)
 	outTexel[3] = inTexel[3] * fract;
 }
 
-inline void AddTexel(u8 *inTexel, u32 *outTexel, u32 fract)
+static inline void AddTexel(u8 *inTexel, u32 *outTexel, u32 fract)
 {
 	outTexel[0] += inTexel[0] * fract;
 	outTexel[1] += inTexel[1] * fract;
@@ -106,8 +109,9 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 	TexMode0& tm0 = texUnit.texMode0[subTexmap];
 	TexImage0& ti0 = texUnit.texImage0[subTexmap];
 	TexTLUT& texTlut = texUnit.texTlut[subTexmap];
+	TlutFormat tlutfmt = (TlutFormat) texTlut.tlut_format;
 
-	u8 *imageSrc, *imageSrcOdd = NULL;
+	u8 *imageSrc, *imageSrcOdd = nullptr;
 	if (texUnit.texImage1[subTexmap].image_type)
 	{
 		imageSrc = &texMem[texUnit.texImage1[subTexmap].tmem_even * TMEM_LINE_SIZE];
@@ -124,7 +128,8 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 	int imageHeight = ti0.height;
 
 	int tlutAddress = texTlut.tmem_offset << 9;
-	
+	const u8* tlut = &texMem[tlutAddress];
+
 	// reduce sample location and texture size to mip level
 	// move texture pointer to mip location
 	if (mip)
@@ -143,8 +148,8 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 
 		while (mip)
 		{
-			mipWidth = max(mipWidth, fmtWidth);
-			mipHeight = max(mipHeight, fmtHeight);
+			mipWidth = std::max(mipWidth, fmtWidth);
+			mipHeight = std::max(mipHeight, fmtHeight);
 			u32 size = (mipWidth * mipHeight * fmtDepth) >> 1;
 
 			imageSrc += size;
@@ -174,23 +179,23 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 		u8 sampledTex[4];
 		u32 texel[4];
 
-		WrapCoord(imageS, tm0.wrap_s, imageWidth);
-		WrapCoord(imageT, tm0.wrap_t, imageHeight);
-		WrapCoord(imageSPlus1, tm0.wrap_s, imageWidth);
-		WrapCoord(imageTPlus1, tm0.wrap_t, imageHeight);
+		WrapCoord(&imageS, tm0.wrap_s, imageWidth);
+		WrapCoord(&imageT, tm0.wrap_t, imageHeight);
+		WrapCoord(&imageSPlus1, tm0.wrap_s, imageWidth);
+		WrapCoord(&imageTPlus1, tm0.wrap_t, imageHeight);
 
 		if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type))
 		{
-			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
+			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlut, tlutfmt);
 			SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT));
 
-			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
+			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlut, tlutfmt);
 			AddTexel(sampledTex, texel, (fractS) * (128 - fractT));
 
-			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
+			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlut, tlutfmt);
 			AddTexel(sampledTex, texel, (128 - fractS) * (fractT));
 
-			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
+			TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlut, tlutfmt);
 			AddTexel(sampledTex, texel, (fractS) * (fractT));
 		}
 		else
@@ -220,11 +225,11 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 		int imageT = t >> 7;
 
 		// nearest neighbor sampling
-		WrapCoord(imageS, tm0.wrap_s, imageWidth);
-		WrapCoord(imageT, tm0.wrap_t, imageHeight);
+		WrapCoord(&imageS, tm0.wrap_s, imageWidth);
+		WrapCoord(&imageT, tm0.wrap_t, imageHeight);
 
 		if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type))
-			TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
+			TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlut, tlutfmt);
 		else
 			TexDecoder_DecodeTexelRGBA8FromTmem(sample, imageSrc, imageSrcOdd, imageS, imageT, imageWidth);
 	}
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h
new file mode 100644
index 0000000000..bd6a69766b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/TextureSampler.h
@@ -0,0 +1,22 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+namespace TextureSampler
+{
+	void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample);
+
+	void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample);
+
+	enum
+	{
+		RED_SMP,
+		GRN_SMP,
+		BLU_SMP,
+		ALP_SMP
+	};
+}
diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp
new file mode 100644
index 0000000000..e7e46691fd
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp
@@ -0,0 +1,447 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cmath>
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/TransformUnit.h"
+#include "VideoBackends/Software/Vec3.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+
+
+namespace TransformUnit
+{
+
+static void MultiplyVec2Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
+{
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
+	result.z = 1.0f;
+}
+
+static void MultiplyVec2Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
+{
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
+	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] + mat[11];
+}
+
+static void MultiplyVec3Mat33(const Vec3 &vec, const float *mat, Vec3 &result)
+{
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z;
+	result.y = mat[3] * vec.x + mat[4] * vec.y + mat[5] * vec.z;
+	result.z = mat[6] * vec.x + mat[7] * vec.y + mat[8] * vec.z;
+}
+
+static void MultiplyVec3Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
+{
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
+	result.z = 1.0f;
+}
+
+static void MultiplyVec3Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
+{
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
+	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] * vec.z + mat[11];
+}
+
+static void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
+{
+	result.x = proj[0] * vec.x + proj[1] * vec.z;
+	result.y = proj[2] * vec.y + proj[3] * vec.z;
+	//result.z = (proj[4] * vec.z + proj[5]);
+	result.z = (proj[4] * vec.z + proj[5]) * (1.0f - (float)1e-7);
+	result.w = -vec.z;
+}
+
+static void MultipleVec3Ortho(const Vec3 &vec, const float *proj, Vec4 &result)
+{
+	result.x = proj[0] * vec.x + proj[1];
+	result.y = proj[2] * vec.y + proj[3];
+	result.z = proj[4] * vec.z + proj[5];
+	result.w = 1;
+}
+
+void TransformPosition(const InputVertexData *src, OutputVertexData *dst)
+{
+	const float* mat = (const float*)&xfmem.posMatrices[src->posMtx * 4];
+	MultiplyVec3Mat34(src->position, mat, dst->mvPosition);
+
+	if (xfmem.projection.type == GX_PERSPECTIVE)
+	{
+		MultipleVec3Perspective(dst->mvPosition, xfmem.projection.rawProjection, dst->projectedPosition);
+	}
+	else
+	{
+		MultipleVec3Ortho(dst->mvPosition, xfmem.projection.rawProjection, dst->projectedPosition);
+	}
+}
+
+void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst)
+{
+	const float* mat = (const float*)&xfmem.normalMatrices[(src->posMtx & 31)  * 3];
+
+	if (nbt)
+	{
+		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
+		MultiplyVec3Mat33(src->normal[1], mat, dst->normal[1]);
+		MultiplyVec3Mat33(src->normal[2], mat, dst->normal[2]);
+		dst->normal[0].Normalize();
+	}
+	else
+	{
+		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
+		dst->normal[0].Normalize();
+	}
+}
+
+static void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
+{
+	const Vec3 *src;
+	switch (texinfo.sourcerow)
+	{
+		case XF_SRCGEOM_INROW:
+			src = &srcVertex->position;
+			break;
+		case XF_SRCNORMAL_INROW:
+			src = &srcVertex->normal[0];
+			break;
+		case XF_SRCBINORMAL_T_INROW:
+			src = &srcVertex->normal[1];
+			break;
+		case XF_SRCBINORMAL_B_INROW:
+			src = &srcVertex->normal[2];
+			break;
+		default:
+			_assert_(texinfo.sourcerow >= XF_SRCTEX0_INROW && texinfo.sourcerow <= XF_SRCTEX7_INROW);
+			src = (Vec3*)srcVertex->texCoords[texinfo.sourcerow - XF_SRCTEX0_INROW];
+			break;
+	}
+
+	const float *mat = (const float*)&xfmem.posMatrices[srcVertex->texMtx[coordNum] * 4];
+	Vec3 *dst = &dstVertex->texCoords[coordNum];
+
+	if (texinfo.projection == XF_TEXPROJ_ST)
+	{
+		if (texinfo.inputform == XF_TEXINPUT_AB11 || specialCase)
+			MultiplyVec2Mat24(*src, mat, *dst);
+		else
+			MultiplyVec3Mat24(*src, mat, *dst);
+	}
+	else // texinfo.projection == XF_TEXPROJ_STQ
+	{
+		_assert_(!specialCase);
+
+		if (texinfo.inputform == XF_TEXINPUT_AB11)
+			MultiplyVec2Mat34(*src, mat, *dst);
+		else
+			MultiplyVec3Mat34(*src, mat, *dst);
+	}
+
+	if (xfmem.dualTexTrans.enabled)
+	{
+		Vec3 tempCoord;
+
+		// normalize
+		const PostMtxInfo &postInfo = xfmem.postMtxInfo[coordNum];
+		const float *postMat = (const float*)&xfmem.postMatrices[postInfo.index * 4];
+
+		if (specialCase)
+		{
+			// no normalization
+			// q of input is 1
+			// q of output is unknown
+			tempCoord.x = dst->x;
+			tempCoord.y = dst->y;
+
+			dst->x = postMat[0] * tempCoord.x + postMat[1] * tempCoord.y + postMat[2] + postMat[3];
+			dst->y = postMat[4] * tempCoord.x + postMat[5] * tempCoord.y + postMat[6] + postMat[7];
+			dst->z = 1.0f;
+		}
+		else
+		{
+			if (postInfo.normalize)
+				tempCoord = dst->Normalized();
+			else
+				tempCoord = *dst;
+
+			MultiplyVec3Mat34(tempCoord, postMat, *dst);
+		}
+	}
+}
+
+struct LightPointer
+{
+	u32 reserved[3];
+	u8 color[4];
+	Vec3 cosatt;
+	Vec3 distatt;
+	Vec3 pos;
+	Vec3 dir;
+};
+
+static inline void AddIntegerColor(const u8 *src, Vec3 &dst)
+{
+	dst.x += src[1];
+	dst.y += src[2];
+	dst.z += src[3];
+}
+
+static inline void AddScaledIntegerColor(const u8 *src, float scale, Vec3 &dst)
+{
+	dst.x += src[1] * scale;
+	dst.y += src[2] * scale;
+	dst.z += src[3] * scale;
+}
+
+static inline float SafeDivide(float n, float d)
+{
+	return (d==0) ? (n>0?1:0) : n/d;
+}
+
+static float CalculateLightAttn(const LightPointer *light, Vec3* _ldir, const Vec3 &normal, const LitChannel &chan)
+{
+	float attn = 1.0f;
+	Vec3& ldir = *_ldir;
+
+	switch (chan.attnfunc)
+	{
+		case LIGHTATTN_NONE:
+		case LIGHTATTN_DIR:
+		{
+			ldir = ldir.Normalized();
+			if (ldir == Vec3(0.0f, 0.0f, 0.0f))
+				ldir = normal;
+			break;
+		}
+		case LIGHTATTN_SPEC:
+		{
+			ldir = ldir.Normalized();
+			attn = (ldir * normal) >= 0.0 ? std::max(0.0f, light->dir * normal) : 0;
+			Vec3 attLen = Vec3(1.0, attn, attn*attn);
+			Vec3 cosAttn = light->cosatt;
+			Vec3 distAttn = light->distatt;
+			if (chan.diffusefunc != LIGHTDIF_NONE)
+				distAttn = distAttn.Normalized();
+
+			attn = SafeDivide(std::max(0.0f, attLen * cosAttn), attLen * distAttn);
+			break;
+		}
+		case LIGHTATTN_SPOT:
+		{
+			float dist2 = ldir.Length2();
+			float dist = sqrtf(dist2);
+			ldir = ldir / dist;
+			attn = std::max(0.0f, ldir * light->dir);
+
+			float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
+			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
+			attn = SafeDivide(std::max(0.0f, cosAtt), distAtt);
+			break;
+		}
+		default:
+			PanicAlert("LightColor");
+	}
+
+	return attn;
+}
+
+static void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, LitChannel &chan, Vec3 &lightCol)
+{
+	const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];
+
+	Vec3 ldir = light->pos - pos;
+	float attn = CalculateLightAttn(light, &ldir, normal, chan);
+
+	float difAttn = ldir * normal;
+	switch (chan.diffusefunc)
+	{
+		case LIGHTDIF_NONE:
+			AddScaledIntegerColor(light->color, attn, lightCol);
+			break;
+		case LIGHTDIF_SIGN:
+			AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
+			break;
+		case LIGHTDIF_CLAMP:
+			difAttn = std::max(0.0f, difAttn);
+			AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
+			break;
+		default: _assert_(0);
+	}
+}
+
+static void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
+{
+	const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];
+
+	Vec3 ldir = light->pos - pos;
+	float attn = CalculateLightAttn(light, &ldir, normal, chan);
+
+	float difAttn = ldir * normal;
+	switch (chan.diffusefunc)
+	{
+		case LIGHTDIF_NONE:
+			lightCol += light->color[0] * attn;
+			break;
+		case LIGHTDIF_SIGN:
+			lightCol += light->color[0] * attn * difAttn;
+			break;
+		case LIGHTDIF_CLAMP:
+			difAttn = std::max(0.0f, difAttn);
+			lightCol += light->color[0] * attn * difAttn;
+			break;
+		default: _assert_(0);
+	}
+}
+
+void TransformColor(const InputVertexData *src, OutputVertexData *dst)
+{
+	for (u32 chan = 0; chan < xfmem.numChan.numColorChans; chan++)
+	{
+		// abgr
+		u8 matcolor[4];
+		u8 chancolor[4];
+
+		// color
+		LitChannel &colorchan = xfmem.color[chan];
+		if (colorchan.matsource)
+			*(u32*)matcolor = *(u32*)src->color[chan];  // vertex
+		else
+			*(u32*)matcolor = xfmem.matColor[chan];
+
+		if (colorchan.enablelighting)
+		{
+			Vec3 lightCol;
+			if (colorchan.ambsource)
+			{
+				// vertex
+				lightCol.x = src->color[chan][1];
+				lightCol.y = src->color[chan][2];
+				lightCol.z = src->color[chan][3];
+			}
+			else
+			{
+				u8 *ambColor = (u8*)&xfmem.ambColor[chan];
+				lightCol.x = ambColor[1];
+				lightCol.y = ambColor[2];
+				lightCol.z = ambColor[3];
+			}
+
+			u8 mask = colorchan.GetFullLightMask();
+			for (int i = 0; i < 8; ++i)
+			{
+				if (mask&(1<<i))
+					LightColor(dst->mvPosition, dst->normal[0], i, colorchan, lightCol);
+			}
+
+			int light_x = int(lightCol.x);
+			int light_y = int(lightCol.y);
+			int light_z = int(lightCol.z);
+			MathUtil::Clamp(&light_x, 0, 255);
+			MathUtil::Clamp(&light_y, 0, 255);
+			MathUtil::Clamp(&light_z, 0, 255);
+			chancolor[1] = (matcolor[1] * (light_x + (light_x >> 7))) >> 8;
+			chancolor[2] = (matcolor[2] * (light_y + (light_y >> 7))) >> 8;
+			chancolor[3] = (matcolor[3] * (light_z + (light_z >> 7))) >> 8;
+		}
+		else
+		{
+			*(u32*)chancolor = *(u32*)matcolor;
+		}
+
+		// alpha
+		LitChannel &alphachan = xfmem.alpha[chan];
+		if (alphachan.matsource)
+			matcolor[0] = src->color[chan][0];  // vertex
+		else
+			matcolor[0] = xfmem.matColor[chan] & 0xff;
+
+		if (xfmem.alpha[chan].enablelighting)
+		{
+			float lightCol;
+			if (alphachan.ambsource)
+				lightCol = src->color[chan][0]; // vertex
+			else
+				lightCol = (float)(xfmem.ambColor[chan] & 0xff);
+
+			u8 mask = alphachan.GetFullLightMask();
+			for (int i = 0; i < 8; ++i)
+			{
+				if (mask&(1<<i))
+					LightAlpha(dst->mvPosition, dst->normal[0], i, alphachan, lightCol);
+			}
+
+			int light_a = int(lightCol);
+			MathUtil::Clamp(&light_a, 0, 255);
+			chancolor[0] = (matcolor[0] * (light_a + (light_a >> 7))) >> 8;
+		}
+		else
+		{
+			chancolor[0] = matcolor[0];
+		}
+
+		// abgr -> rgba
+		*(u32*)dst->color[chan] = Common::swap32(*(u32*)chancolor);
+	}
+}
+
+void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase)
+{
+	for (u32 coordNum = 0; coordNum < xfmem.numTexGen.numTexGens; coordNum++)
+	{
+		const TexMtxInfo &texinfo = xfmem.texMtxInfo[coordNum];
+
+		switch (texinfo.texgentype)
+		{
+		case XF_TEXGEN_REGULAR:
+			TransformTexCoordRegular(texinfo, coordNum, specialCase, src, dst);
+			break;
+		case XF_TEXGEN_EMBOSS_MAP:
+			{
+				const LightPointer *light = (const LightPointer*)&xfmem.lights[texinfo.embosslightshift];
+
+				Vec3 ldir = (light->pos - dst->mvPosition).Normalized();
+				float d1 = ldir * dst->normal[1];
+				float d2 = ldir * dst->normal[2];
+
+				dst->texCoords[coordNum].x = dst->texCoords[texinfo.embosssourceshift].x + d1;
+				dst->texCoords[coordNum].y = dst->texCoords[texinfo.embosssourceshift].y + d2;
+				dst->texCoords[coordNum].z = dst->texCoords[texinfo.embosssourceshift].z;
+			}
+			break;
+		case XF_TEXGEN_COLOR_STRGBC0:
+			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
+			dst->texCoords[coordNum].x = (float)dst->color[0][0] / 255.0f;
+			dst->texCoords[coordNum].y = (float)dst->color[0][1] / 255.0f;
+			dst->texCoords[coordNum].z = 1.0f;
+			break;
+		case XF_TEXGEN_COLOR_STRGBC1:
+			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
+			dst->texCoords[coordNum].x = (float)dst->color[1][0] / 255.0f;
+			dst->texCoords[coordNum].y = (float)dst->color[1][1] / 255.0f;
+			dst->texCoords[coordNum].z = 1.0f;
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Bad tex gen type %i", texinfo.texgentype);
+		}
+	}
+
+	for (u32 coordNum = 0; coordNum < xfmem.numTexGen.numTexGens; coordNum++)
+	{
+		dst->texCoords[coordNum][0] *= (bpmem.texcoords[coordNum].s.scale_minus_1 + 1);
+		dst->texCoords[coordNum][1] *= (bpmem.texcoords[coordNum].t.scale_minus_1 + 1);
+	}
+}
+
+}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h b/Source/Core/VideoBackends/Software/TransformUnit.h
similarity index 85%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
rename to Source/Core/VideoBackends/Software/TransformUnit.h
index 974e44372d..4cd2695afb 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
+++ b/Source/Core/VideoBackends/Software/TransformUnit.h
@@ -1,9 +1,8 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _TRANSFORM_UNIT_H_
-#define _TRANSFORM_UNIT_H_
+#pragma once
 
 struct InputVertexData;
 struct OutputVertexData;
@@ -20,5 +19,3 @@ namespace TransformUnit
 	void TransformColor(const InputVertexData *src, OutputVertexData *dst);
 	void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase);
 }
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/Vec3.h b/Source/Core/VideoBackends/Software/Vec3.h
new file mode 100644
index 0000000000..a5857ffbd6
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/Vec3.h
@@ -0,0 +1,170 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cmath>
+#include <cstdlib>
+
+#include "Common/ChunkFile.h"
+
+class Vec3
+{
+public:
+	float x, y, z;
+
+	Vec3()
+	{
+	}
+
+	explicit Vec3(float f)
+	{
+		x = y = z = f;
+	}
+
+	explicit Vec3(const float *f)
+	{
+		x = f[0];
+		y = f[1];
+		z = f[2];
+	}
+
+	Vec3(const float _x, const float _y, const float _z)
+	{
+		x = _x;
+		y = _y;
+		z = _z;
+	}
+
+	void set(const float _x, const float _y, const float _z)
+	{
+		x = _x;
+		y = _y;
+		z = _z;
+	}
+
+	Vec3 operator+(const Vec3 &other) const
+	{
+		return Vec3(x + other.x, y + other.y, z + other.z);
+	}
+
+	void operator+=(const Vec3 &other)
+	{
+		x += other.x;
+		y += other.y;
+		z += other.z;
+	}
+
+	Vec3 operator-(const Vec3 &v) const
+	{
+		return Vec3(x - v.x, y - v.y, z - v.z);
+	}
+
+	void operator-=(const Vec3 &other)
+	{
+		x -= other.x;
+		y -= other.y;
+		z -= other.z;
+	}
+
+	Vec3 operator-() const
+	{
+		return Vec3(-x, -y, -z);
+	}
+
+	Vec3 operator*(const float f) const
+	{
+		return Vec3(x * f, y * f, z * f);
+	}
+
+	Vec3 operator/(const float f) const
+	{
+		float invf = (1.0f / f);
+		return Vec3(x * invf, y * invf, z * invf);
+	}
+
+	void operator/=(const float f)
+	{
+		*this = *this / f;
+	}
+
+	float operator*(const Vec3 &other) const
+	{
+		return (x * other.x) +
+		       (y * other.y) +
+		       (z * other.z);
+	}
+
+	void operator*=(const float f)
+	{
+		*this = *this * f;
+	}
+
+	Vec3 ScaledBy(const Vec3 &other) const
+	{
+		return Vec3(x * other.x, y * other.y, z * other.z);
+	}
+
+	Vec3 operator%(const Vec3 &v) const
+	{
+		return Vec3((y * v.z) - (z * v.y),
+		            (z * v.x) - (x * v.z),
+		            (x * v.y) - (y * v.x));
+	}
+
+	float Length2() const
+	{
+		return (x * x) + (y * y) + (z * z);
+	}
+
+	float Length() const
+	{
+		return sqrtf(Length2());
+	}
+
+	float Distance2To(Vec3 &other)
+	{
+		return (other - (*this)).Length2();
+	}
+
+	Vec3 Normalized() const
+	{
+		return (*this) / Length();
+	}
+
+	void Normalize()
+	{
+		(*this) /= Length();
+	}
+
+	float &operator[](int i)
+	{
+		return *((&x) + i);
+	}
+
+	float operator[](const int i) const
+	{
+		return *((&x) + i);
+	}
+
+	bool operator==(const Vec3 &other) const
+	{
+		if (x == other.x && y == other.y && z == other.z)
+			return true;
+		else
+			return false;
+	}
+
+	void SetZero()
+	{
+		memset((void*)this, 0, sizeof(float) * 3);
+	}
+
+	void DoState(PointerWrap &p)
+	{
+		p.Do(x);
+		p.Do(y);
+		p.Do(z);
+	}
+};
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
new file mode 100644
index 0000000000..c7c502995b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -0,0 +1,65 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "VideoCommon/VideoBackendBase.h"
+
+namespace MMIO { class Mapping; }
+
+namespace SW
+{
+
+class VideoSoftware : public VideoBackend
+{
+	bool Initialize(void *window_handle) override;
+	void Shutdown() override;
+
+	std::string GetName() const override;
+	std::string GetDisplayName() const override;
+
+	void EmuStateChange(EMUSTATE_CHANGE newState) override;
+
+	void RunLoop(bool enable) override;
+
+	void ShowConfig(void* parent) override;
+
+	void Video_Prepare() override;
+	void Video_Cleanup() override;
+
+	void Video_EnterLoop() override;
+	void Video_ExitLoop() override;
+	void Video_BeginField(u32, u32, u32, u32) override;
+	void Video_EndField() override;
+
+	u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) override;
+	u32 Video_GetQueryResult(PerfQueryType type) override;
+	u16 Video_GetBoundingBox(int index) override;
+
+	void Video_AddMessage(const std::string& msg, unsigned int milliseconds) override;
+	void Video_ClearMessages() override;
+	bool Video_Screenshot(const std::string& filename) override;
+
+	int Video_LoadTexture(char *imagedata, u32 width, u32 height);
+	void Video_DeleteTexture(int texID);
+	void Video_DrawTexture(int texID, float *coords);
+
+	void Video_SetRendering(bool bEnabled) override;
+
+	void Video_GatherPipeBursted() override;
+	int Video_Sync(int ticks) override { return 0; }
+
+	void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
+
+	unsigned int PeekMessages() override;
+
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
+	void DoState(PointerWrap &p) override;
+
+public:
+	void CheckInvalidState() override;
+};
+
+}
diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/XFMemLoader.cpp
new file mode 100644
index 0000000000..7c7b5e9514
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/XFMemLoader.cpp
@@ -0,0 +1,85 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonFuncs.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/VideoCommon.h"
+
+void InitXFMemory()
+{
+	memset(&xfmem, 0, sizeof(xfmem));
+}
+
+void XFWritten(u32 transferSize, u32 baseAddress)
+{
+	u32 topAddress = baseAddress + transferSize;
+
+	if (baseAddress <= 0x1026 && topAddress >= 0x1020)
+		Clipper::SetViewOffset();
+
+	// fix lights so invalid values don't trash the lighting computations
+	if (baseAddress <= 0x067f && topAddress >= 0x0604)
+	{
+		u32* x = (u32*)xfmem.lights;
+
+		// go through all lights
+		for (int light = 0; light < 8; light++)
+		{
+			// skip to floating point values
+			x += 4;
+
+			for (int i = 0; i < 12; i++)
+			{
+				u32 xVal = *x;
+
+				// if the exponent is 255 then the number is inf or nan
+				if ((xVal & 0x7f800000) == 0x7f800000)
+					*x = 0;
+
+				x++;
+			}
+		}
+	}
+}
+
+void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
+{
+	// do not allow writes past registers
+	if (baseAddress + transferSize > 0x1058)
+	{
+		INFO_LOG(VIDEO, "XF load exceeds address space: %x %d bytes", baseAddress, transferSize);
+
+		if (baseAddress >= 0x1058)
+			transferSize = 0;
+		else
+			transferSize = 0x1058 - baseAddress;
+	}
+
+	// write to XF regs
+	if (transferSize > 0)
+	{
+		memcpy((u32*)(&xfmem) + baseAddress, pData, transferSize * 4);
+		XFWritten(transferSize, baseAddress);
+	}
+}
+
+void SWLoadIndexedXF(u32 val, int array)
+{
+	int index = val >> 16;
+	int address = val & 0xFFF; //check mask
+	int size = ((val >> 12) & 0xF) + 1;
+	//load stuff from array to address in xf mem
+
+	u32 *pData = (u32*)Memory::GetPointer(g_main_cp_state.array_bases[array] + g_main_cp_state.array_strides[array]*index);
+
+	// byteswap data
+	u32 buffer[16];
+	for (int i = 0; i < size; ++i)
+		buffer[i] = Common::swap32(*(pData + i));
+
+	SWLoadXFReg(size, address, buffer);
+}
diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.h b/Source/Core/VideoBackends/Software/XFMemLoader.h
new file mode 100644
index 0000000000..cfbaecfd1b
--- /dev/null
+++ b/Source/Core/VideoBackends/Software/XFMemLoader.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/XFMemory.h"
+
+void InitXFMemory();
+
+void XFWritten(u32 transferSize, u32 baseAddress);
+
+void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData);
+
+void SWLoadIndexedXF(u32 val, int array);
diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp
new file mode 100644
index 0000000000..fe5b0050e7
--- /dev/null
+++ b/Source/Core/VideoCommon/AVIDump.cpp
@@ -0,0 +1,552 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#if defined(__FreeBSD__)
+#define __STDC_CONSTANT_MACROS 1
+#endif
+
+#include <string>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+
+#include "Core/CoreTiming.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h" //for TargetRefreshRate
+#include "VideoCommon/AVIDump.h"
+#include "VideoCommon/VideoConfig.h"
+
+#ifdef _WIN32
+
+#include "tchar.h"
+
+#include <cstdio>
+#include <cstring>
+#include <vfw.h>
+#include <winerror.h>
+
+#include "Core/ConfigManager.h" // for PAL60
+#include "Core/CoreTiming.h"
+
+static HWND s_emu_wnd;
+static LONG s_byte_buffer;
+static LONG s_frame_count;
+static LONG s_total_bytes;
+static PAVIFILE s_file;
+static int s_width;
+static int s_height;
+static int s_file_count;
+static u64 s_last_frame;
+static PAVISTREAM s_stream;
+static PAVISTREAM s_stream_compressed;
+static int s_frame_rate;
+static AVISTREAMINFO s_header;
+static AVICOMPRESSOPTIONS s_options;
+static AVICOMPRESSOPTIONS* s_array_options[1];
+static BITMAPINFOHEADER s_bitmap;
+// the CFR dump design doesn't let you dump until you know the NEXT timecode.
+// so we have to save a frame and always be behind
+static void* s_stored_frame = nullptr;
+static u64 s_stored_frame_size = 0;
+static bool s_start_dumping = false;
+
+bool AVIDump::Start(HWND hWnd, int w, int h)
+{
+	s_emu_wnd = hWnd;
+	s_file_count = 0;
+
+	s_width = w;
+	s_height = h;
+
+	s_last_frame = CoreTiming::GetTicks();
+
+	if (SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"))
+		s_frame_rate = 60; // always 60, for either pal60 or ntsc
+	else
+		s_frame_rate = VideoInterface::TargetRefreshRate; // 50 or 60, depending on region
+
+	// clear CFR frame cache on start, not on file create (which is also segment switch)
+	SetBitmapFormat();
+	StoreFrame(nullptr);
+
+	return CreateFile();
+}
+
+bool AVIDump::CreateFile()
+{
+	s_total_bytes = 0;
+	s_frame_count = 0;
+
+	std::string movie_file_name = StringFromFormat("%sframedump%d.avi", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_file_count);
+
+	// Create path
+	File::CreateFullPath(movie_file_name);
+
+	// Ask to delete file
+	if (File::Exists(movie_file_name))
+	{
+		if (SConfig::GetInstance().m_DumpFramesSilent ||
+		    AskYesNoT("Delete the existing file '%s'?", movie_file_name.c_str()))
+		{
+			File::Delete(movie_file_name);
+		}
+	}
+
+	AVIFileInit();
+	NOTICE_LOG(VIDEO, "Opening AVI file (%s) for dumping", movie_file_name.c_str());
+	// TODO: Make this work with AVIFileOpenW without it throwing REGDB_E_CLASSNOTREG
+	HRESULT hr = AVIFileOpenA(&s_file, movie_file_name.c_str(), OF_WRITE | OF_CREATE, nullptr);
+	if (FAILED(hr))
+	{
+		if (hr == AVIERR_BADFORMAT) NOTICE_LOG(VIDEO, "The file couldn't be read, indicating a corrupt file or an unrecognized format.");
+		if (hr == AVIERR_MEMORY)  NOTICE_LOG(VIDEO, "The file could not be opened because of insufficient memory.");
+		if (hr == AVIERR_FILEREAD) NOTICE_LOG(VIDEO, "A disk error occurred while reading the file.");
+		if (hr == AVIERR_FILEOPEN) NOTICE_LOG(VIDEO, "A disk error occurred while opening the file.");
+		if (hr == REGDB_E_CLASSNOTREG) NOTICE_LOG(VIDEO, "AVI class not registered");
+		Stop();
+		return false;
+	}
+
+	SetBitmapFormat();
+	NOTICE_LOG(VIDEO, "Setting video format...");
+	if (!SetVideoFormat())
+	{
+		NOTICE_LOG(VIDEO, "Setting video format failed");
+		Stop();
+		return false;
+	}
+
+	if (!s_file_count)
+	{
+		if (!SetCompressionOptions())
+		{
+			NOTICE_LOG(VIDEO, "SetCompressionOptions failed");
+			Stop();
+			return false;
+		}
+	}
+
+	if (FAILED(AVIMakeCompressedStream(&s_stream_compressed, s_stream, &s_options, nullptr)))
+	{
+		NOTICE_LOG(VIDEO, "AVIMakeCompressedStream failed");
+		Stop();
+		return false;
+	}
+
+	if (FAILED(AVIStreamSetFormat(s_stream_compressed, 0, &s_bitmap, s_bitmap.biSize)))
+	{
+		NOTICE_LOG(VIDEO, "AVIStreamSetFormat failed");
+		Stop();
+		return false;
+	}
+
+	return true;
+}
+
+void AVIDump::CloseFile()
+{
+	if (s_stream_compressed)
+	{
+		AVIStreamClose(s_stream_compressed);
+		s_stream_compressed = nullptr;
+	}
+
+	if (s_stream)
+	{
+		AVIStreamClose(s_stream);
+		s_stream = nullptr;
+	}
+
+	if (s_file)
+	{
+		AVIFileRelease(s_file);
+		s_file = nullptr;
+	}
+
+	AVIFileExit();
+}
+
+void AVIDump::Stop()
+{
+	// store one copy of the last video frame, CFR case
+	if (s_stream_compressed)
+		AVIStreamWrite(s_stream_compressed, s_frame_count++, 1, GetFrame(), s_bitmap.biSizeImage, AVIIF_KEYFRAME, nullptr, &s_byte_buffer);
+	s_start_dumping = false;
+	CloseFile();
+	s_file_count = 0;
+	NOTICE_LOG(VIDEO, "Stop");
+}
+
+void AVIDump::StoreFrame(const void* data)
+{
+	if (s_bitmap.biSizeImage > s_stored_frame_size)
+	{
+		void* temp_stored_frame = realloc(s_stored_frame, s_bitmap.biSizeImage);
+		if (temp_stored_frame)
+		{
+			s_stored_frame = temp_stored_frame;
+		}
+		else
+		{
+			free(s_stored_frame);
+			PanicAlertT("Something has gone seriously wrong.\n"
+			            "Stopping video recording.\n"
+			            "Your video will likely be broken.");
+			Stop();
+		}
+		s_stored_frame_size = s_bitmap.biSizeImage;
+		memset(s_stored_frame, 0, s_bitmap.biSizeImage);
+	}
+	if (s_stored_frame)
+	{
+		if (data)
+			memcpy(s_stored_frame, data, s_bitmap.biSizeImage);
+		else // pitch black frame
+			memset(s_stored_frame, 0, s_bitmap.biSizeImage);
+	}
+}
+
+void* AVIDump::GetFrame()
+{
+	return s_stored_frame;
+}
+
+void AVIDump::AddFrame(const u8* data, int w, int h)
+{
+	static bool shown_error = false;
+	if ((w != s_bitmap.biWidth || h != s_bitmap.biHeight) && !shown_error)
+	{
+		PanicAlertT("You have resized the window while dumping frames.\n"
+		            "Nothing can be done to handle this properly.\n"
+		            "Your video will likely be broken.");
+		shown_error = true;
+
+		s_bitmap.biWidth = w;
+		s_bitmap.biHeight = h;
+	}
+	// no timecodes, instead dump each frame as many/few times as needed to keep sync
+	u64 one_cfr = SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
+	int nplay = 0;
+	s64 delta;
+	if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond())
+	{
+		delta = CoreTiming::GetTicks();
+		s_start_dumping = true;
+	}
+	else
+	{
+		delta = CoreTiming::GetTicks() - s_last_frame;
+	}
+	bool b_frame_dumped = false;
+	// try really hard to place one copy of frame in stream (otherwise it's dropped)
+	if (delta > (s64)one_cfr * 1 / 10) // place if 1/10th of a frame space
+	{
+		delta -= one_cfr;
+		nplay++;
+	}
+	// try not nearly so hard to place additional copies of the frame
+	while (delta > (s64)one_cfr * 9 / 10) // place if 9/10th of a frame space
+	{
+		delta -= one_cfr;
+		nplay++;
+	}
+	while (nplay--)
+	{
+		if (!b_frame_dumped)
+		{
+			AVIStreamWrite(s_stream_compressed, s_frame_count++, 1, GetFrame(), s_bitmap.biSizeImage, AVIIF_KEYFRAME, nullptr, &s_byte_buffer);
+			b_frame_dumped = true;
+		}
+		else
+		{
+			AVIStreamWrite(s_stream, s_frame_count++, 1, nullptr, 0, 0, nullptr, nullptr);
+		}
+		s_total_bytes += s_byte_buffer;
+		// Close the recording if the file is larger than 2gb
+		// VfW can't properly save files over 2gb in size, but can keep writing to them up to 4gb.
+		if (s_total_bytes >= 2000000000)
+		{
+			CloseFile();
+			s_file_count++;
+			CreateFile();
+		}
+	}
+	StoreFrame(data);
+	s_last_frame = CoreTiming::GetTicks();
+}
+
+void AVIDump::SetBitmapFormat()
+{
+	memset(&s_bitmap, 0, sizeof(s_bitmap));
+	s_bitmap.biSize = 0x28;
+	s_bitmap.biPlanes = 1;
+	s_bitmap.biBitCount = 24;
+	s_bitmap.biWidth = s_width;
+	s_bitmap.biHeight = s_height;
+	s_bitmap.biSizeImage = 3 * s_width * s_height;
+}
+
+bool AVIDump::SetCompressionOptions()
+{
+	memset(&s_options, 0, sizeof(s_options));
+	s_array_options[0] = &s_options;
+
+	if (SConfig::GetInstance().m_DumpFramesSilent)
+	{
+		s_options.fccType = streamtypeVIDEO;
+		s_options.fccHandler = mmioFOURCC('D', 'I', 'B', ' ');  // Uncompressed
+		return true;
+	}
+	else
+	{
+		return (AVISaveOptions(s_emu_wnd, 0, 1, &s_stream, s_array_options) != 0);
+	}
+}
+
+bool AVIDump::SetVideoFormat()
+{
+	memset(&s_header, 0, sizeof(s_header));
+	s_header.fccType = streamtypeVIDEO;
+	s_header.dwScale = 1;
+	s_header.dwRate = s_frame_rate;
+	s_header.dwSuggestedBufferSize  = s_bitmap.biSizeImage;
+
+	return SUCCEEDED(AVIFileCreateStream(s_file, &s_stream, &s_header));
+}
+
+#else
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavutil/mathematics.h>
+}
+
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
+#define av_frame_alloc avcodec_alloc_frame
+#define av_frame_free avcodec_free_frame
+#endif
+
+static AVFormatContext* s_format_context = nullptr;
+static AVStream* s_stream = nullptr;
+static AVFrame* s_src_frame = nullptr;
+static AVFrame* s_scaled_frame = nullptr;
+static uint8_t* s_yuv_buffer = nullptr;
+static SwsContext* s_sws_context = nullptr;
+static int s_width;
+static int s_height;
+static int s_size;
+static u64 s_last_frame;
+static bool s_start_dumping = false;
+static u64 s_last_pts;
+
+static void InitAVCodec()
+{
+	static bool first_run = true;
+	if (first_run)
+	{
+		av_register_all();
+		first_run = false;
+	}
+}
+
+bool AVIDump::Start(int w, int h)
+{
+	s_width = w;
+	s_height = h;
+
+	s_last_frame = CoreTiming::GetTicks();
+	s_last_pts = 0;
+
+	InitAVCodec();
+	bool success = CreateFile();
+	if (!success)
+		CloseFile();
+	return success;
+}
+
+bool AVIDump::CreateFile()
+{
+	AVCodec* codec = nullptr;
+
+	s_format_context = avformat_alloc_context();
+	snprintf(s_format_context->filename, sizeof(s_format_context->filename), "%s",
+	         (File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump0.avi").c_str());
+	File::CreateFullPath(s_format_context->filename);
+
+	if (!(s_format_context->oformat = av_guess_format("avi", nullptr, nullptr)) ||
+	    !(s_stream = avformat_new_stream(s_format_context, codec)))
+	{
+		return false;
+	}
+
+	s_stream->codec->codec_id = g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1
+	                                              : s_format_context->oformat->video_codec;
+	s_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+	s_stream->codec->bit_rate = 400000;
+	s_stream->codec->width = s_width;
+	s_stream->codec->height = s_height;
+	s_stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)};
+	s_stream->codec->gop_size = 12;
+	s_stream->codec->pix_fmt = g_Config.bUseFFV1 ? AV_PIX_FMT_BGRA : AV_PIX_FMT_YUV420P;
+
+	if (!(codec = avcodec_find_encoder(s_stream->codec->codec_id)) ||
+	    (avcodec_open2(s_stream->codec, codec, nullptr) < 0))
+	{
+		return false;
+	}
+
+	s_src_frame = av_frame_alloc();
+	s_scaled_frame = av_frame_alloc();
+
+	s_size = avpicture_get_size(s_stream->codec->pix_fmt, s_width, s_height);
+
+	s_yuv_buffer = new uint8_t[s_size];
+	avpicture_fill((AVPicture*)s_scaled_frame, s_yuv_buffer, s_stream->codec->pix_fmt, s_width, s_height);
+
+	NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_format_context->filename);
+	if (avio_open(&s_format_context->pb, s_format_context->filename, AVIO_FLAG_WRITE) < 0)
+	{
+		WARN_LOG(VIDEO, "Could not open %s", s_format_context->filename);
+		return false;
+	}
+
+	avformat_write_header(s_format_context, nullptr);
+
+	return true;
+}
+
+static void PreparePacket(AVPacket* pkt)
+{
+	av_init_packet(pkt);
+	pkt->data = nullptr;
+	pkt->size = 0;
+}
+
+void AVIDump::AddFrame(const u8* data, int width, int height)
+{
+	avpicture_fill((AVPicture*)s_src_frame, const_cast<u8*>(data), AV_PIX_FMT_BGR24, width, height);
+
+	// Convert image from BGR24 to desired pixel format, and scale to initial
+	// width and height
+	if ((s_sws_context = sws_getCachedContext(s_sws_context,
+	                                          width, height, AV_PIX_FMT_BGR24,
+	                                          s_width, s_height, s_stream->codec->pix_fmt,
+	                                          SWS_BICUBIC, nullptr, nullptr, nullptr)))
+	{
+		sws_scale(s_sws_context, s_src_frame->data, s_src_frame->linesize, 0,
+		          height, s_scaled_frame->data, s_scaled_frame->linesize);
+	}
+
+	s_scaled_frame->format = s_stream->codec->pix_fmt;
+	s_scaled_frame->width = s_width;
+	s_scaled_frame->height = s_height;
+
+	// Encode and write the image.
+	AVPacket pkt;
+	PreparePacket(&pkt);
+	int got_packet = 0;
+	int error = 0;
+	u64 delta;
+	s64 last_pts;
+	if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond())
+	{
+		delta = CoreTiming::GetTicks();
+		last_pts = AV_NOPTS_VALUE;
+		s_start_dumping = true;
+	}
+	else
+	{
+		delta = CoreTiming::GetTicks() - s_last_frame;
+		last_pts = (s_last_pts * s_stream->codec->time_base.den) / SystemTimers::GetTicksPerSecond();
+	}
+	u64 pts_in_ticks = s_last_pts + delta;
+	s_scaled_frame->pts = (pts_in_ticks * s_stream->codec->time_base.den) / SystemTimers::GetTicksPerSecond();
+	if (s_scaled_frame->pts != last_pts)
+	{
+		s_last_frame = CoreTiming::GetTicks();
+		s_last_pts = pts_in_ticks;
+		error = avcodec_encode_video2(s_stream->codec, &pkt, s_scaled_frame, &got_packet);
+	}
+	while (!error && got_packet)
+	{
+		// Write the compressed frame in the media file.
+		if (pkt.pts != AV_NOPTS_VALUE)
+		{
+			pkt.pts = av_rescale_q(pkt.pts,
+			                       s_stream->codec->time_base, s_stream->time_base);
+		}
+		if (pkt.dts != AV_NOPTS_VALUE)
+		{
+			pkt.dts = av_rescale_q(pkt.dts,
+			                       s_stream->codec->time_base, s_stream->time_base);
+		}
+		if (s_stream->codec->coded_frame->key_frame)
+			pkt.flags |= AV_PKT_FLAG_KEY;
+		pkt.stream_index = s_stream->index;
+		av_interleaved_write_frame(s_format_context, &pkt);
+
+		// Handle delayed frames.
+		PreparePacket(&pkt);
+		error = avcodec_encode_video2(s_stream->codec, &pkt, nullptr, &got_packet);
+	}
+	if (error)
+		ERROR_LOG(VIDEO, "Error while encoding video: %d", error);
+}
+
+void AVIDump::Stop()
+{
+	av_write_trailer(s_format_context);
+	CloseFile();
+	NOTICE_LOG(VIDEO, "Stopping frame dump");
+}
+
+void AVIDump::CloseFile()
+{
+	if (s_stream)
+	{
+		if (s_stream->codec)
+			avcodec_close(s_stream->codec);
+		av_free(s_stream);
+		s_stream = nullptr;
+	}
+
+	if (s_yuv_buffer)
+	{
+		delete[] s_yuv_buffer;
+		s_yuv_buffer = nullptr;
+	}
+
+	av_frame_free(&s_src_frame);
+	av_frame_free(&s_scaled_frame);
+
+	if (s_format_context)
+	{
+		if (s_format_context->pb)
+			avio_close(s_format_context->pb);
+		av_free(s_format_context);
+		s_format_context = nullptr;
+	}
+
+	if (s_sws_context)
+	{
+		sws_freeContext(s_sws_context);
+		s_sws_context = nullptr;
+	}
+}
+
+#endif
+
+void AVIDump::DoState()
+{
+	s_last_frame = CoreTiming::GetTicks();
+}
diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h
new file mode 100644
index 0000000000..510f6a4224
--- /dev/null
+++ b/Source/Core/VideoCommon/AVIDump.h
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <stdint.h>
+#endif
+
+#include "Common/CommonTypes.h"
+
+class AVIDump
+{
+private:
+	static bool CreateFile();
+	static void CloseFile();
+	static void SetBitmapFormat();
+	static bool SetCompressionOptions();
+	static bool SetVideoFormat();
+
+	static void StoreFrame(const void* data);
+	static void* GetFrame();
+
+public:
+#ifdef _WIN32
+	static bool Start(HWND hWnd, int w, int h);
+#else
+	static bool Start(int w, int h);
+#endif
+	static void AddFrame(const u8* data, int width, int height);
+	static void Stop();
+	static void DoState();
+};
diff --git a/Source/Core/VideoCommon/AsyncRequests.cpp b/Source/Core/VideoCommon/AsyncRequests.cpp
new file mode 100644
index 0000000000..993b6bce2c
--- /dev/null
+++ b/Source/Core/VideoCommon/AsyncRequests.cpp
@@ -0,0 +1,147 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoCommon/AsyncRequests.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/RenderBase.h"
+
+AsyncRequests AsyncRequests::s_singleton;
+
+AsyncRequests::AsyncRequests()
+: m_enable(false), m_passthrough(true)
+{
+}
+
+void AsyncRequests::PullEventsInternal()
+{
+	std::unique_lock<std::mutex> lock(m_mutex);
+	m_empty.store(true);
+
+	while (!m_queue.empty())
+	{
+		Event e = m_queue.front();
+
+		// try to merge as many efb pokes as possible
+		// it's a bit hacky, but some games render a complete frame in this way
+		if ((e.type == Event::EFB_POKE_COLOR || e.type == Event::EFB_POKE_Z))
+		{
+			m_merged_efb_pokes.clear();
+			Event first_event = m_queue.front();
+			EFBAccessType t = first_event.type == Event::EFB_POKE_COLOR ? POKE_COLOR : POKE_Z;
+
+			do
+			{
+				e = m_queue.front();
+
+				EfbPokeData d;
+				d.data = e.efb_poke.data;
+				d.x = e.efb_poke.x;
+				d.y = e.efb_poke.y;
+				m_merged_efb_pokes.push_back(d);
+
+				m_queue.pop();
+			} while(!m_queue.empty() && m_queue.front().type == first_event.type);
+
+			lock.unlock();
+			g_renderer->PokeEFB(t, m_merged_efb_pokes);
+			lock.lock();
+			continue;
+		}
+
+		lock.unlock();
+		HandleEvent(e);
+		lock.lock();
+
+		m_queue.pop();
+	}
+
+	if (m_wake_me_up_again)
+	{
+		m_wake_me_up_again = false;
+		m_cond.notify_all();
+	}
+}
+
+void AsyncRequests::PushEvent(const AsyncRequests::Event& event, bool blocking)
+{
+	std::unique_lock<std::mutex> lock(m_mutex);
+
+	if (m_passthrough)
+	{
+		HandleEvent(event);
+		return;
+	}
+
+	m_empty.store(false);
+	m_wake_me_up_again |= blocking;
+
+	if (!m_enable)
+		return;
+
+	m_queue.push(event);
+
+	RunGpu();
+	if (blocking)
+	{
+		m_cond.wait(lock, [this]{return m_queue.empty();});
+	}
+}
+
+void AsyncRequests::SetEnable(bool enable)
+{
+	std::unique_lock<std::mutex> lock(m_mutex);
+	m_enable = enable;
+
+	if (!enable)
+	{
+		// flush the queue on disabling
+		while (!m_queue.empty())
+			m_queue.pop();
+		if (m_wake_me_up_again)
+			m_cond.notify_all();
+	}
+}
+
+void AsyncRequests::HandleEvent(const AsyncRequests::Event& e)
+{
+	EFBRectangle rc;
+	switch (e.type)
+	{
+		case Event::EFB_POKE_COLOR:
+			g_renderer->AccessEFB(POKE_COLOR, e.efb_poke.x, e.efb_poke.y, e.efb_poke.data);
+			break;
+
+		case Event::EFB_POKE_Z:
+			g_renderer->AccessEFB(POKE_Z, e.efb_poke.x, e.efb_poke.y, e.efb_poke.data);
+			break;
+
+		case Event::EFB_PEEK_COLOR:
+			*e.efb_peek.data = g_renderer->AccessEFB(PEEK_COLOR, e.efb_peek.x, e.efb_peek.y, 0);
+			break;
+
+		case Event::EFB_PEEK_Z:
+			*e.efb_peek.data = g_renderer->AccessEFB(PEEK_Z, e.efb_peek.x, e.efb_peek.y, 0);
+			break;
+
+		case Event::SWAP_EVENT:
+			Renderer::Swap(e.swap_event.xfbAddr, e.swap_event.fbWidth, e.swap_event.fbStride, e.swap_event.fbHeight, rc);
+			break;
+
+		case Event::BBOX_READ:
+			*e.bbox.data = g_renderer->BBoxRead(e.bbox.index);
+			break;
+
+		case Event::PERF_QUERY:
+			g_perf_query->FlushResults();
+			break;
+
+	}
+}
+
+void AsyncRequests::SetPassthrough(bool enable)
+{
+	std::unique_lock<std::mutex> lock(m_mutex);
+	m_passthrough = enable;
+}
+
diff --git a/Source/Core/VideoCommon/AsyncRequests.h b/Source/Core/VideoCommon/AsyncRequests.h
new file mode 100644
index 0000000000..39e79ab8e3
--- /dev/null
+++ b/Source/Core/VideoCommon/AsyncRequests.h
@@ -0,0 +1,98 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <queue>
+
+#include "Common/CommonTypes.h"
+
+struct EfbPokeData;
+
+class AsyncRequests
+{
+public:
+	struct Event
+	{
+		enum Type
+		{
+			EFB_POKE_COLOR,
+			EFB_POKE_Z,
+			EFB_PEEK_COLOR,
+			EFB_PEEK_Z,
+			SWAP_EVENT,
+			BBOX_READ,
+			PERF_QUERY,
+		} type;
+		u64 time;
+
+		union
+		{
+			struct
+			{
+				u16 x;
+				u16 y;
+				u32 data;
+			} efb_poke;
+
+			struct
+			{
+				u16 x;
+				u16 y;
+				u32* data;
+			} efb_peek;
+
+			struct
+			{
+				u32 xfbAddr;
+				u32 fbWidth;
+				u32 fbStride;
+				u32 fbHeight;
+			} swap_event;
+
+			struct
+			{
+				int index;
+				u16* data;
+			} bbox;
+
+			struct
+			{
+			} perf_query;
+		};
+	};
+
+	AsyncRequests();
+
+	void PullEvents()
+	{
+		if (!m_empty.load())
+			PullEventsInternal();
+	}
+	void PushEvent(const Event& event, bool blocking = false);
+	void SetEnable(bool enable);
+	void SetPassthrough(bool enable);
+
+	static AsyncRequests* GetInstance() { return &s_singleton; }
+
+private:
+	void PullEventsInternal();
+	void HandleEvent(const Event& e);
+
+	static AsyncRequests s_singleton;
+
+	std::atomic<bool> m_empty;
+	std::queue<Event> m_queue;
+	std::mutex m_mutex;
+	std::condition_variable m_cond;
+
+	bool m_wake_me_up_again;
+	bool m_enable;
+	bool m_passthrough;
+
+	std::vector<EfbPokeData> m_merged_efb_pokes;
+};
diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp
new file mode 100644
index 0000000000..4150a7cf31
--- /dev/null
+++ b/Source/Core/VideoCommon/BPFunctions.cpp
@@ -0,0 +1,248 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoCommon/BPFunctions.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace BPFunctions
+{
+// ----------------------------------------------
+// State translation lookup tables
+// Reference: Yet Another GameCube Documentation
+// ----------------------------------------------
+
+
+void FlushPipeline()
+{
+	VertexManager::Flush();
+}
+
+void SetGenerationMode()
+{
+	g_renderer->SetGenerationMode();
+}
+
+void SetScissor()
+{
+	/* NOTE: the minimum value here for the scissor rect and offset is -342.
+	 * GX internally adds on an offset of 342 to both the offset and scissor
+	 * coords to ensure that the register was always unsigned.
+	 *
+	 * The code that was here before tried to "undo" this offset, but
+	 * since we always take the difference, the +342 added to both
+	 * sides cancels out. */
+
+	/* The scissor offset is always even, so to save space, the scissor offset
+	 * register is scaled down by 2. So, if somebody calls
+	 * GX_SetScissorBoxOffset(20, 20); the registers will be set to 10, 10. */
+	const int xoff = bpmem.scissorOffset.x * 2;
+	const int yoff = bpmem.scissorOffset.y * 2;
+
+	EFBRectangle rc (bpmem.scissorTL.x - xoff,     bpmem.scissorTL.y - yoff,
+	                 bpmem.scissorBR.x - xoff + 1, bpmem.scissorBR.y - yoff + 1);
+
+	if (rc.left < 0) rc.left = 0;
+	if (rc.top < 0) rc.top = 0;
+	if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH;
+	if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT;
+
+	if (rc.left > rc.right) rc.right = rc.left;
+	if (rc.top > rc.bottom) rc.bottom = rc.top;
+
+	g_renderer->SetScissorRect(rc);
+}
+
+void SetDepthMode()
+{
+	g_renderer->SetDepthMode();
+}
+
+void SetBlendMode()
+{
+	g_renderer->SetBlendMode(false);
+}
+void SetDitherMode()
+{
+	g_renderer->SetDitherMode();
+}
+void SetLogicOpMode()
+{
+	g_renderer->SetLogicOpMode();
+}
+
+void SetColorMask()
+{
+	g_renderer->SetColorMask();
+}
+
+void CopyEFB(u32 dstAddr, const EFBRectangle& srcRect,
+	     unsigned int dstFormat, PEControl::PixelFormat srcFormat,
+	     bool isIntensity, bool scaleByHalf)
+{
+	// bpmem.zcontrol.pixel_format to PEControl::Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format)
+	TextureCache::CopyRenderTargetToTexture(dstAddr, dstFormat, srcFormat,
+		srcRect, isIntensity, scaleByHalf);
+}
+
+/* Explanation of the magic behind ClearScreen:
+	There's numerous possible formats for the pixel data in the EFB.
+	However, in the HW accelerated backends we're always using RGBA8
+	for the EFB format, which causes some problems:
+	- We're using an alpha channel although the game doesn't
+	- If the actual EFB format is RGBA6_Z24 or R5G6B5_Z16, we are using more bits per channel than the native HW
+
+	To properly emulate the above points, we're doing the following:
+	(1)
+		- disable alpha channel writing of any kind of rendering if the actual EFB format doesn't use an alpha channel
+		- NOTE: Always make sure that the EFB has been cleared to an alpha value of 0xFF in this case!
+		- Same for color channels, these need to be cleared to 0x00 though.
+	(2)
+		- convert the RGBA8 color to RGBA6/RGB8/RGB565 and convert it to RGBA8 again
+		- convert the Z24 depth value to Z16 and back to Z24
+*/
+void ClearScreen(const EFBRectangle &rc)
+{
+	bool colorEnable = (bpmem.blendmode.colorupdate != 0);
+	bool alphaEnable = (bpmem.blendmode.alphaupdate != 0);
+	bool zEnable = (bpmem.zmode.updateenable != 0);
+	auto pixel_format = bpmem.zcontrol.pixel_format;
+
+	// (1): Disable unused color channels
+	if (pixel_format == PEControl::RGB8_Z24 ||
+		pixel_format == PEControl::RGB565_Z16 ||
+		pixel_format == PEControl::Z24)
+	{
+		alphaEnable = false;
+	}
+
+	if (colorEnable || alphaEnable || zEnable)
+	{
+		u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
+		u32 z = bpmem.clearZValue;
+
+		// (2) drop additional accuracy
+		if (pixel_format == PEControl::RGBA6_Z24)
+		{
+			color = RGBA8ToRGBA6ToRGBA8(color);
+		}
+		else if (pixel_format == PEControl::RGB565_Z16)
+		{
+			color = RGBA8ToRGB565ToRGBA8(color);
+			z = Z24ToZ16ToZ24(z);
+		}
+		g_renderer->ClearScreen(rc, colorEnable, alphaEnable, zEnable, color, z);
+	}
+}
+
+void OnPixelFormatChange()
+{
+	int convtype = -1;
+
+	// TODO : Check for Z compression format change
+	// When using 16bit Z, the game may enable a special compression format which we need to handle
+	// If we don't, Z values will be completely screwed up, currently only Star Wars:RS2 uses that.
+
+	/*
+	 * When changing the EFB format, the pixel data won't get converted to the new format but stays the same.
+	 * Since we are always using an RGBA8 buffer though, this causes issues in some games.
+	 * Thus, we reinterpret the old EFB data with the new format here.
+	 */
+	if (!g_ActiveConfig.bEFBEmulateFormatChanges)
+		return;
+
+	auto old_format = Renderer::GetPrevPixelFormat();
+	auto new_format = bpmem.zcontrol.pixel_format;
+
+	// no need to reinterpret pixel data in these cases
+	if (new_format == old_format || old_format == PEControl::INVALID_FMT)
+		goto skip;
+
+	// Check for pixel format changes
+	switch (old_format)
+	{
+		case PEControl::RGB8_Z24:
+		case PEControl::Z24:
+			// Z24 and RGB8_Z24 are treated equal, so just return in this case
+			if (new_format == PEControl::RGB8_Z24 || new_format == PEControl::Z24)
+				goto skip;
+
+			if (new_format == PEControl::RGBA6_Z24)
+				convtype = 0;
+			else if (new_format == PEControl::RGB565_Z16)
+				convtype = 1;
+			break;
+
+		case PEControl::RGBA6_Z24:
+			if (new_format == PEControl::RGB8_Z24 ||
+				new_format == PEControl::Z24)
+				convtype = 2;
+			else if (new_format == PEControl::RGB565_Z16)
+				convtype = 3;
+			break;
+
+		case PEControl::RGB565_Z16:
+			if (new_format == PEControl::RGB8_Z24 ||
+				new_format == PEControl::Z24)
+				convtype = 4;
+			else if (new_format == PEControl::RGBA6_Z24)
+				convtype = 5;
+			break;
+
+		default:
+			break;
+	}
+
+	if (convtype == -1)
+	{
+		ERROR_LOG(VIDEO, "Unhandled EFB format change: %d to %d\n", static_cast<int>(old_format), static_cast<int>(new_format));
+		goto skip;
+	}
+
+	g_renderer->ReinterpretPixelData(convtype);
+
+skip:
+	DEBUG_LOG(VIDEO, "pixelfmt: pixel=%d, zc=%d", static_cast<int>(new_format), static_cast<int>(bpmem.zcontrol.zformat));
+
+	Renderer::StorePixelFormat(new_format);
+}
+
+void SetInterlacingMode(const BPCmd &bp)
+{
+	// TODO
+	switch (bp.address)
+	{
+	case BPMEM_FIELDMODE:
+		{
+			// SDK always sets bpmem.lineptwidth.lineaspect via BPMEM_LINEPTWIDTH
+			// just before this cmd
+			const char *action[] = { "don't adjust", "adjust" };
+			DEBUG_LOG(VIDEO, "BPMEM_FIELDMODE texLOD:%s lineaspect:%s",
+				action[bpmem.fieldmode.texLOD],
+				action[bpmem.lineptwidth.lineaspect]);
+		}
+		break;
+	case BPMEM_FIELDMASK:
+		{
+			// Determines if fields will be written to EFB (always computed)
+			const char *action[] = { "skip", "write" };
+			DEBUG_LOG(VIDEO, "BPMEM_FIELDMASK even:%s odd:%s",
+				action[bpmem.fieldmask.even], action[bpmem.fieldmask.odd]);
+		}
+		break;
+	default:
+		ERROR_LOG(VIDEO, "SetInterlacingMode default");
+		break;
+	}
+}
+
+};
diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h
new file mode 100644
index 0000000000..890f734deb
--- /dev/null
+++ b/Source/Core/VideoCommon/BPFunctions.h
@@ -0,0 +1,32 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// ------------------------------------------
+// Video backend must define these functions
+// ------------------------------------------
+
+#pragma once
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace BPFunctions
+{
+
+void FlushPipeline();
+void SetGenerationMode();
+void SetScissor();
+void SetDepthMode();
+void SetBlendMode();
+void SetDitherMode();
+void SetLogicOpMode();
+void SetColorMask();
+void CopyEFB(u32 dstAddr, const EFBRectangle& srcRect,
+             unsigned int dstFormat, PEControl::PixelFormat srcFormat,
+             bool isIntensity, bool scaleByHalf);
+void ClearScreen(const EFBRectangle &rc);
+void OnPixelFormatChange();
+void SetInterlacingMode(const BPCmd &bp);
+}
diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp
new file mode 100644
index 0000000000..f1371545b8
--- /dev/null
+++ b/Source/Core/VideoCommon/BPMemory.cpp
@@ -0,0 +1,10 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/BPMemory.h"
+
+// BP state
+// STATE_TO_SAVE
+BPMemory bpmem;
diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h
new file mode 100644
index 0000000000..50a95791ce
--- /dev/null
+++ b/Source/Core/VideoCommon/BPMemory.h
@@ -0,0 +1,1100 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/BitField.h"
+#include "Common/CommonTypes.h"
+
+#pragma pack(4)
+
+#define BPMEM_GENMODE           0x00
+#define BPMEM_DISPLAYCOPYFILTER 0x01 // 0x01 + 4
+#define BPMEM_IND_MTXA          0x06 // 0x06 + (3 * 3)
+#define BPMEM_IND_MTXB          0x07 // 0x07 + (3 * 3)
+#define BPMEM_IND_MTXC          0x08 // 0x08 + (3 * 3)
+#define BPMEM_IND_IMASK         0x0F
+#define BPMEM_IND_CMD           0x10 // 0x10 + 16
+#define BPMEM_SCISSORTL         0x20
+#define BPMEM_SCISSORBR         0x21
+#define BPMEM_LINEPTWIDTH       0x22
+#define BPMEM_PERF0_TRI         0x23
+#define BPMEM_PERF0_QUAD        0x24
+#define BPMEM_RAS1_SS0          0x25
+#define BPMEM_RAS1_SS1          0x26
+#define BPMEM_IREF              0x27
+#define BPMEM_TREF              0x28 // 0x28 + 8
+#define BPMEM_SU_SSIZE          0x30 // 0x30 + (2 * 8)
+#define BPMEM_SU_TSIZE          0x31 // 0x31 + (2 * 8)
+#define BPMEM_ZMODE             0x40
+#define BPMEM_BLENDMODE         0x41
+#define BPMEM_CONSTANTALPHA     0x42
+#define BPMEM_ZCOMPARE          0x43
+#define BPMEM_FIELDMASK         0x44
+#define BPMEM_SETDRAWDONE       0x45
+#define BPMEM_BUSCLOCK0         0x46
+#define BPMEM_PE_TOKEN_ID       0x47
+#define BPMEM_PE_TOKEN_INT_ID   0x48
+#define BPMEM_EFB_TL            0x49
+#define BPMEM_EFB_BR            0x4A
+#define BPMEM_EFB_ADDR          0x4B
+#define BPMEM_MIPMAP_STRIDE     0x4D
+#define BPMEM_COPYYSCALE        0x4E
+#define BPMEM_CLEAR_AR          0x4F
+#define BPMEM_CLEAR_GB          0x50
+#define BPMEM_CLEAR_Z           0x51
+#define BPMEM_TRIGGER_EFB_COPY  0x52
+#define BPMEM_COPYFILTER0       0x53
+#define BPMEM_COPYFILTER1       0x54
+#define BPMEM_CLEARBBOX1        0x55
+#define BPMEM_CLEARBBOX2        0x56
+#define BPMEM_CLEAR_PIXEL_PERF  0x57
+#define BPMEM_REVBITS           0x58
+#define BPMEM_SCISSOROFFSET     0x59
+#define BPMEM_PRELOAD_ADDR      0x60
+#define BPMEM_PRELOAD_TMEMEVEN  0x61
+#define BPMEM_PRELOAD_TMEMODD   0x62
+#define BPMEM_PRELOAD_MODE      0x63
+#define BPMEM_LOADTLUT0         0x64
+#define BPMEM_LOADTLUT1         0x65
+#define BPMEM_TEXINVALIDATE     0x66
+#define BPMEM_PERF1             0x67
+#define BPMEM_FIELDMODE         0x68
+#define BPMEM_BUSCLOCK1         0x69
+#define BPMEM_TX_SETMODE0       0x80 // 0x80 + 4
+#define BPMEM_TX_SETMODE1       0x84 // 0x84 + 4
+#define BPMEM_TX_SETIMAGE0      0x88 // 0x88 + 4
+#define BPMEM_TX_SETIMAGE1      0x8C // 0x8C + 4
+#define BPMEM_TX_SETIMAGE2      0x90 // 0x90 + 4
+#define BPMEM_TX_SETIMAGE3      0x94 // 0x94 + 4
+#define BPMEM_TX_SETTLUT        0x98 // 0x98 + 4
+#define BPMEM_TX_SETMODE0_4     0xA0 // 0xA0 + 4
+#define BPMEM_TX_SETMODE1_4     0xA4 // 0xA4 + 4
+#define BPMEM_TX_SETIMAGE0_4    0xA8 // 0xA8 + 4
+#define BPMEM_TX_SETIMAGE1_4    0xAC // 0xA4 + 4
+#define BPMEM_TX_SETIMAGE2_4    0xB0 // 0xB0 + 4
+#define BPMEM_TX_SETIMAGE3_4    0xB4 // 0xB4 + 4
+#define BPMEM_TX_SETTLUT_4      0xB8 // 0xB8 + 4
+#define BPMEM_TEV_COLOR_ENV     0xC0 // 0xC0 + (2 * 16)
+#define BPMEM_TEV_ALPHA_ENV     0xC1 // 0xC1 + (2 * 16)
+#define BPMEM_TEV_COLOR_RA      0xE0 // 0xE0 + (2 * 4)
+#define BPMEM_TEV_COLOR_BG      0xE1 // 0xE1 + (2 * 4)
+#define BPMEM_FOGRANGE          0xE8 // 0xE8 + 6
+#define BPMEM_FOGPARAM0         0xEE
+#define BPMEM_FOGBMAGNITUDE     0xEF
+#define BPMEM_FOGBEXPONENT      0xF0
+#define BPMEM_FOGPARAM3         0xF1
+#define BPMEM_FOGCOLOR          0xF2
+#define BPMEM_ALPHACOMPARE      0xF3
+#define BPMEM_BIAS              0xF4
+#define BPMEM_ZTEX2             0xF5
+#define BPMEM_TEV_KSEL          0xF6 // 0xF6 + 8
+#define BPMEM_BP_MASK           0xFE
+
+
+// Tev/combiner things
+
+#define TEVSCALE_1  0
+#define TEVSCALE_2  1
+#define TEVSCALE_4  2
+#define TEVDIVIDE_2 3
+
+#define TEVCMP_R8    0
+#define TEVCMP_GR16  1
+#define TEVCMP_BGR24 2
+#define TEVCMP_RGB8  3
+
+#define TEVOP_ADD 0
+#define TEVOP_SUB 1
+#define TEVCMP_R8_GT 8
+#define TEVCMP_R8_EQ 9
+#define TEVCMP_GR16_GT 10
+#define TEVCMP_GR16_EQ 11
+#define TEVCMP_BGR24_GT 12
+#define TEVCMP_BGR24_EQ 13
+#define TEVCMP_RGB8_GT  14
+#define TEVCMP_RGB8_EQ  15
+#define TEVCMP_A8_GT 14
+#define TEVCMP_A8_EQ 15
+
+#define TEVCOLORARG_CPREV 0
+#define TEVCOLORARG_APREV 1
+#define TEVCOLORARG_C0 2
+#define TEVCOLORARG_A0 3
+#define TEVCOLORARG_C1 4
+#define TEVCOLORARG_A1 5
+#define TEVCOLORARG_C2 6
+#define TEVCOLORARG_A2 7
+#define TEVCOLORARG_TEXC 8
+#define TEVCOLORARG_TEXA 9
+#define TEVCOLORARG_RASC 10
+#define TEVCOLORARG_RASA 11
+#define TEVCOLORARG_ONE 12
+#define TEVCOLORARG_HALF 13
+#define TEVCOLORARG_KONST 14
+#define TEVCOLORARG_ZERO 15
+
+#define TEVALPHAARG_APREV 0
+#define TEVALPHAARG_A0    1
+#define TEVALPHAARG_A1    2
+#define TEVALPHAARG_A2    3
+#define TEVALPHAARG_TEXA  4
+#define TEVALPHAARG_RASA  5
+#define TEVALPHAARG_KONST 6
+#define TEVALPHAARG_ZERO  7
+
+#define GX_TEVPREV       0
+#define GX_TEVREG0       1
+#define GX_TEVREG1       2
+#define GX_TEVREG2       3
+
+#define ZTEXTURE_DISABLE 0
+#define ZTEXTURE_ADD 1
+#define ZTEXTURE_REPLACE 2
+
+#define TevBias_ZERO     0
+#define TevBias_ADDHALF  1
+#define TevBias_SUBHALF  2
+#define TevBias_COMPARE  3
+
+union IND_MTXA
+{
+	struct
+	{
+		s32 ma : 11;
+		s32 mb : 11;
+		u32 s0 : 2; // bits 0-1 of scale factor
+		u32 rid : 8;
+	};
+	u32 hex;
+};
+
+union IND_MTXB
+{
+	struct
+	{
+		s32 mc : 11;
+		s32 md : 11;
+		u32 s1 : 2; // bits 2-3 of scale factor
+		u32 rid : 8;
+	};
+	u32 hex;
+};
+
+union IND_MTXC
+{
+	struct
+	{
+		s32 me : 11;
+		s32 mf : 11;
+		u32 s2 : 2; // bits 4-5 of scale factor
+		u32 rid : 8;
+	};
+	u32 hex;
+};
+
+struct IND_MTX
+{
+	IND_MTXA col0;
+	IND_MTXB col1;
+	IND_MTXC col2;
+};
+
+union IND_IMASK
+{
+	struct
+	{
+		u32 mask : 24;
+		u32 rid : 8;
+	};
+	u32 hex;
+};
+
+#define TEVSELCC_CPREV 0
+#define TEVSELCC_APREV 1
+#define TEVSELCC_C0 2
+#define TEVSELCC_A0 3
+#define TEVSELCC_C1 4
+#define TEVSELCC_A1 5
+#define TEVSELCC_C2 6
+#define TEVSELCC_A2 7
+#define TEVSELCC_TEXC 8
+#define TEVSELCC_TEXA 9
+#define TEVSELCC_RASC 10
+#define TEVSELCC_RASA 11
+#define TEVSELCC_ONE 12
+#define TEVSELCC_HALF 13
+#define TEVSELCC_KONST 14
+#define TEVSELCC_ZERO 15
+
+#define TEVSELCA_APREV 0
+#define TEVSELCA_A0 1
+#define TEVSELCA_A1 2
+#define TEVSELCA_A2 3
+#define TEVSELCA_TEXA 4
+#define TEVSELCA_RASA 5
+#define TEVSELCA_KONST 6
+#define TEVSELCA_ZERO 7
+
+struct TevStageCombiner
+{
+	union ColorCombiner
+	{
+		struct  //abc=8bit,d=10bit
+		{
+			u32 d : 4; // TEVSELCC_X
+			u32 c : 4; // TEVSELCC_X
+			u32 b : 4; // TEVSELCC_X
+			u32 a : 4; // TEVSELCC_X
+
+			u32 bias : 2;
+			u32 op : 1;
+			u32 clamp : 1;
+
+			u32 shift : 2;
+			u32 dest : 2;  //1,2,3
+
+		};
+		u32 hex;
+	};
+	union AlphaCombiner
+	{
+		struct
+		{
+			u32 rswap : 2;
+			u32 tswap : 2;
+			u32 d : 3; // TEVSELCA_
+			u32 c : 3; // TEVSELCA_
+			u32 b : 3; // TEVSELCA_
+			u32 a : 3; // TEVSELCA_
+
+			u32 bias : 2; //GXTevBias
+			u32 op : 1;
+			u32 clamp : 1;
+
+			u32 shift : 2;
+			u32 dest : 2;  //1,2,3
+		};
+		u32 hex;
+	};
+
+	ColorCombiner colorC;
+	AlphaCombiner alphaC;
+};
+
+#define ITF_8 0
+#define ITF_5 1
+#define ITF_4 2
+#define ITF_3 3
+
+#define ITB_NONE 0
+#define ITB_S    1
+#define ITB_T    2
+#define ITB_ST   3
+#define ITB_U    4
+#define ITB_SU   5
+#define ITB_TU   6
+#define ITB_STU  7
+
+#define ITBA_OFF 0
+#define ITBA_S   1
+#define ITBA_T   2
+#define ITBA_U   3
+
+#define ITW_OFF 0
+#define ITW_256 1
+#define ITW_128 2
+#define ITW_64  3
+#define ITW_32  4
+#define ITW_16  5
+#define ITW_0   6
+
+// several discoveries:
+// GXSetTevIndBumpST(tevstage, indstage, matrixind)
+//  if ( matrix == 2 ) realmat = 6; // 10
+//  else if ( matrix == 3 ) realmat = 7; // 11
+//  else if ( matrix == 1 ) realmat = 5; // 9
+//  GXSetTevIndirect(tevstage, indstage, 0, 3, realmat, 6, 6, 0, 0, 0)
+//  GXSetTevIndirect(tevstage+1, indstage, 0, 3, realmat+4, 6, 6, 1, 0, 0)
+//  GXSetTevIndirect(tevstage+2, indstage, 0, 0, 0, 0, 0, 1, 0, 0)
+
+	union TevStageIndirect
+	{
+		struct
+		{
+			u32 bt          : 2; // Indirect tex stage ID
+			u32 fmt         : 2; // Format: ITF_X
+			u32 bias        : 3; // ITB_X
+			u32 bs          : 2; // ITBA_X, indicates which coordinate will become the 'bump alpha'
+			u32 mid         : 4; // Matrix ID to multiply offsets with
+			u32 sw          : 3; // ITW_X, wrapping factor for S of regular coord
+			u32 tw          : 3; // ITW_X, wrapping factor for T of regular coord
+			u32 lb_utclod   : 1; // Use modified or unmodified texture coordinates for LOD computation
+			u32 fb_addprev  : 1; // 1 if the texture coordinate results from the previous TEV stage should be added
+			u32 pad0        : 3;
+			u32 rid         : 8;
+		};
+		struct
+		{
+			u32 hex : 21;
+			u32 unused : 11;
+		};
+
+		// If bs and mid are zero, the result of the stage is independent of
+		// the texture sample data, so we can skip sampling the texture.
+		bool IsActive() { return bs != ITBA_OFF || mid != 0; }
+	};
+
+	union TwoTevStageOrders
+	{
+		struct
+		{
+			u32 texmap0    : 3; // Indirect tex stage texmap
+			u32 texcoord0  : 3;
+			u32 enable0    : 1; // 1 if should read from texture
+			u32 colorchan0 : 3; // RAS1_CC_X
+
+			u32 pad0       : 2;
+
+			u32 texmap1    : 3;
+			u32 texcoord1  : 3;
+			u32 enable1    : 1; // 1 if should read from texture
+			u32 colorchan1 : 3; // RAS1_CC_X
+
+			u32 pad1       : 2;
+			u32 rid        : 8;
+		};
+		u32 hex;
+		int getTexMap(int i){return i?texmap1:texmap0;}
+		int getTexCoord(int i){return i?texcoord1:texcoord0;}
+		int getEnable(int i){return i?enable1:enable0;}
+		int getColorChan(int i){return i?colorchan1:colorchan0;}
+	};
+
+union TEXSCALE
+{
+	struct
+	{
+		u32 ss0 : 4; // Indirect tex stage 0, 2^(-ss0)
+		u32 ts0 : 4; // Indirect tex stage 0
+		u32 ss1 : 4; // Indirect tex stage 1
+		u32 ts1 : 4; // Indirect tex stage 1
+		u32 pad : 8;
+		u32 rid : 8;
+	};
+	u32 hex;
+};
+
+union RAS1_IREF
+{
+	struct
+	{
+		u32 bi0 : 3; // Indirect tex stage 0 ntexmap
+		u32 bc0 : 3; // Indirect tex stage 0 ntexcoord
+		u32 bi1 : 3;
+		u32 bc1 : 3;
+		u32 bi2 : 3;
+		u32 bc3 : 3;
+		u32 bi4 : 3;
+		u32 bc4 : 3;
+		u32 rid : 8;
+	};
+	u32 hex;
+
+	u32 getTexCoord(int i) { return (hex>>(6*i+3))&7; }
+	u32 getTexMap(int i) { return (hex>>(6*i))&7; }
+};
+
+
+// Texture structs
+
+union TexMode0
+{
+	enum TextureFilter : u32
+	{
+		TEXF_NONE = 0,
+		TEXF_POINT = 1,
+		TEXF_LINEAR = 2
+	};
+
+	struct
+	{
+		u32 wrap_s     : 2;
+		u32 wrap_t     : 2;
+		u32 mag_filter : 1;
+		u32 min_filter : 3;
+		u32 diag_lod   : 1;
+		s32 lod_bias   : 8;
+		u32 pad0       : 2;
+		u32 max_aniso  : 2;
+		u32 lod_clamp  : 1;
+	};
+	u32 hex;
+};
+union TexMode1
+{
+	struct
+	{
+		u32 min_lod : 8;
+		u32 max_lod : 8;
+	};
+	u32 hex;
+};
+union TexImage0
+{
+	struct
+	{
+		u32 width  : 10; // Actually w-1
+		u32 height : 10; // Actually h-1
+		u32 format : 4;
+	};
+	u32 hex;
+};
+union TexImage1
+{
+	struct
+	{
+		u32 tmem_even    : 15; // TMEM line index for even LODs
+		u32 cache_width  : 3;
+		u32 cache_height : 3;
+		u32 image_type   : 1;  // 1 if this texture is managed manually (0 means we'll autofetch the texture data whenever it changes)
+	};
+	u32 hex;
+};
+
+union TexImage2
+{
+	struct
+	{
+		u32 tmem_odd     : 15; // tmem line index for odd LODs
+		u32 cache_width  : 3;
+		u32 cache_height : 3;
+	};
+	u32 hex;
+};
+
+union TexImage3
+{
+	struct
+	{
+		u32 image_base: 24;  //address in memory >> 5 (was 20 for GC)
+	};
+	u32 hex;
+};
+union TexTLUT
+{
+	struct
+	{
+		u32 tmem_offset : 10;
+		u32 tlut_format : 2;
+	};
+	u32 hex;
+};
+
+union ZTex1
+{
+	struct
+	{
+		u32 bias : 24;
+	};
+	u32 hex;
+};
+
+union ZTex2
+{
+	struct
+	{
+		u32 type : 2; // TEV_Z_TYPE_X
+		u32 op : 2; // GXZTexOp
+	};
+	u32 hex;
+};
+
+//  Z-texture types (formats)
+#define TEV_ZTEX_TYPE_U8  0
+#define TEV_ZTEX_TYPE_U16 1
+#define TEV_ZTEX_TYPE_U24 2
+
+#define TEV_ZTEX_DISABLE  0
+#define TEV_ZTEX_ADD      1
+#define TEV_ZTEX_REPLACE  2
+
+
+struct FourTexUnits
+{
+	TexMode0 texMode0[4];
+	TexMode1 texMode1[4];
+	TexImage0 texImage0[4];
+	TexImage1 texImage1[4];
+	TexImage2 texImage2[4];
+	TexImage3 texImage3[4];
+	TexTLUT texTlut[4];
+	u32 unknown[4];
+};
+
+
+
+// Geometry/other structs
+
+union GenMode
+{
+	enum CullMode : u32
+	{
+		CULL_NONE = 0,
+		CULL_BACK = 1, // cull back-facing primitives
+		CULL_FRONT = 2, // cull front-facing primitives
+		CULL_ALL = 3, // cull all primitives
+	};
+
+	BitField< 0,4,u32> numtexgens;
+	BitField< 4,3,u32> numcolchans;
+	// 1 bit unused?
+	BitField< 8,1,u32> flat_shading; // unconfirmed
+	BitField< 9,1,u32> multisampling;
+	BitField<10,4,u32> numtevstages;
+	BitField<14,2,CullMode> cullmode;
+	BitField<16,3,u32> numindstages;
+	BitField<19,1,u32> zfreeze;
+
+	u32 hex;
+};
+
+union LPSize
+{
+	struct
+	{
+		u32 linesize   : 8; // in 1/6th pixels
+		u32 pointsize  : 8; // in 1/6th pixels
+		u32 lineoff    : 3;
+		u32 pointoff   : 3;
+		u32 lineaspect : 1; // interlacing: adjust for pixels having AR of 1/2
+		u32 padding    : 1;
+	};
+	u32 hex;
+};
+
+
+union X12Y12
+{
+	struct
+	{
+		u32 y : 12;
+		u32 x : 12;
+	};
+	u32 hex;
+};
+union X10Y10
+{
+	struct
+	{
+		u32 x : 10;
+		u32 y : 10;
+	};
+	u32 hex;
+};
+
+
+// Framebuffer/pixel stuff (incl fog)
+
+union BlendMode
+{
+	enum BlendFactor : u32
+	{
+		ZERO        = 0,
+		ONE         = 1,
+		SRCCLR      = 2,         // for dst factor
+		INVSRCCLR   = 3,         // for dst factor
+		DSTCLR      = SRCCLR,    // for src factor
+		INVDSTCLR   = INVSRCCLR, // for src factor
+		SRCALPHA    = 4,
+		INVSRCALPHA = 5,
+		DSTALPHA    = 6,
+		INVDSTALPHA = 7
+	};
+
+	enum LogicOp : u32
+	{
+		CLEAR         =  0,
+		AND           =  1,
+		AND_REVERSE   =  2,
+		COPY          =  3,
+		AND_INVERTED  =  4,
+		NOOP          =  5,
+		XOR           =  6,
+		OR            =  7,
+		NOR           =  8,
+		EQUIV         =  9,
+		INVERT        = 10,
+		OR_REVERSE    = 11,
+		COPY_INVERTED = 12,
+		OR_INVERTED   = 13,
+		NAND          = 14,
+		SET           = 15
+	};
+
+	BitField< 0,1,u32>         blendenable;
+	BitField< 1,1,u32>         logicopenable;
+	BitField< 2,1,u32>         dither;
+	BitField< 3,1,u32>         colorupdate;
+	BitField< 4,1,u32>         alphaupdate;
+	BitField< 5,3,BlendFactor> dstfactor;
+	BitField< 8,3,BlendFactor> srcfactor;
+	BitField<11,1,u32>         subtract;
+	BitField<12,4,LogicOp>     logicmode;
+
+	u32 hex;
+};
+
+
+union FogParam0
+{
+	struct
+	{
+		u32 mantissa : 11;
+		u32 exponent : 8;
+		u32 sign : 1;
+	};
+
+	float GetA()
+	{
+		union { u32 i; float f; } dummy;
+		dummy.i = ((u32)sign << 31) | ((u32)exponent << 23) | ((u32)mantissa << 12); // scale mantissa from 11 to 23 bits
+		return dummy.f;
+	}
+
+	u32 hex;
+};
+
+union FogParam3
+{
+	struct
+	{
+		u32 c_mant : 11;
+		u32 c_exp  : 8;
+		u32 c_sign : 1;
+		u32 proj   : 1; // 0 - perspective, 1 - orthographic
+		u32 fsel   : 3; // 0 - off, 2 - linear, 4 - exp, 5 - exp2, 6 - backward exp, 7 - backward exp2
+	};
+
+	// amount to subtract from eyespacez after range adjustment
+	float GetC()
+	{
+		union { u32 i; float f; } dummy;
+		dummy.i = ((u32)c_sign << 31) | ((u32)c_exp << 23) | ((u32)c_mant << 12); // scale mantissa from 11 to 23 bits
+		return dummy.f;
+	}
+
+	u32 hex;
+};
+
+union FogRangeKElement
+{
+	struct
+	{
+		u32 HI : 12;
+		u32 LO : 12;
+		u32 regid : 8;
+	};
+
+	// TODO: Which scaling coefficient should we use here? This is just a guess!
+	float GetValue(int i) { return (i ? HI : LO) / 256.f; }
+	u32 HEX;
+};
+
+struct FogRangeParams
+{
+	union RangeBase
+	{
+		struct
+		{
+			u32 Center  : 10; // viewport center + 342
+			u32 Enabled : 1;
+			u32 unused  : 13;
+			u32 regid   : 8;
+		};
+		u32 hex;
+	};
+	RangeBase Base;
+	FogRangeKElement K[5];
+};
+// final eq: ze = A/(B_MAG - (Zs>>B_SHF));
+struct FogParams
+{
+	FogParam0 a;
+	u32 b_magnitude;
+	u32 b_shift; // b's exp + 1?
+	FogParam3 c_proj_fsel;
+
+	union FogColor
+	{
+		struct
+		{
+			u32 b  : 8;
+			u32 g  : 8;
+			u32 r  : 8;
+		};
+		u32 hex;
+	};
+
+	FogColor color;  //0:b 8:g 16:r - nice!
+};
+
+union ZMode
+{
+	enum CompareMode : u32
+	{
+		NEVER   = 0,
+		LESS    = 1,
+		EQUAL   = 2,
+		LEQUAL  = 3,
+		GREATER = 4,
+		NEQUAL  = 5,
+		GEQUAL  = 6,
+		ALWAYS  = 7
+	};
+
+	BitField<0,1,u32>         testenable;
+	BitField<1,3,CompareMode> func;
+	BitField<4,1,u32>         updateenable;
+
+	u32 hex;
+};
+
+union ConstantAlpha
+{
+	struct
+	{
+		u32 alpha : 8;
+		u32 enable : 1;
+	};
+	u32 hex;
+};
+
+union FieldMode
+{
+	struct
+	{
+		u32 texLOD : 1; // adjust vert tex LOD computation to account for interlacing
+	};
+	u32 hex;
+};
+
+union FieldMask
+{
+	struct
+	{
+		// If bit is not set, do not write field to EFB
+		u32 odd : 1;
+		u32 even : 1;
+	};
+	u32 hex;
+};
+
+union PEControl
+{
+	enum PixelFormat : u32
+	{
+		RGB8_Z24    = 0,
+		RGBA6_Z24   = 1,
+		RGB565_Z16  = 2,
+		Z24         = 3,
+		Y8          = 4,
+		U8          = 5,
+		V8          = 6,
+		YUV420      = 7,
+		INVALID_FMT = 0xffffffff, // Used by Dolphin to represent a missing value.
+	};
+
+	enum DepthFormat : u32
+	{
+		ZLINEAR     = 0,
+		ZNEAR       = 1,
+		ZMID        = 2,
+		ZFAR        = 3,
+
+		// It seems these Z formats aren't supported/were removed ?
+		ZINV_LINEAR = 4,
+		ZINV_NEAR   = 5,
+		ZINV_MID    = 6,
+		ZINV_FAR    = 7
+	};
+
+	BitField< 0,3,PixelFormat> pixel_format;
+	BitField< 3,3,DepthFormat> zformat;
+	BitField< 6,1,u32>         early_ztest;
+
+	u32 hex;
+};
+
+
+// Texture coordinate stuff
+
+union TCInfo
+{
+	struct
+	{
+		u32 scale_minus_1  : 16;
+		u32 range_bias     : 1;
+		u32 cylindric_wrap : 1;
+		// These bits only have effect in the s field of TCoordInfo
+		u32 line_offset    : 1;
+		u32 point_offset   : 1;
+	};
+	u32 hex;
+};
+struct TCoordInfo
+{
+	TCInfo s;
+	TCInfo t;
+};
+
+
+union TevReg
+{
+	u64 hex;
+
+	// Access to individual registers
+	BitField< 0, 32,u64> low;
+	BitField<32, 32,u64> high;
+
+	// TODO: Check if Konst uses all 11 bits or just 8
+
+	// Low register
+	BitField< 0,11,s64> red;
+
+	BitField<12,11,s64> alpha;
+	BitField<23, 1,u64> type_ra;
+
+	// High register
+	BitField<32,11,s64> blue;
+
+	BitField<44,11,s64> green;
+	BitField<55, 1,u64> type_bg;
+};
+
+union TevKSel
+{
+	struct {
+		u32 swap1 : 2;
+		u32 swap2 : 2;
+		u32 kcsel0 : 5;
+		u32 kasel0 : 5;
+		u32 kcsel1 : 5;
+		u32 kasel1 : 5;
+	};
+	u32 hex;
+
+	int getKC(int i) {return i?kcsel1:kcsel0;}
+	int getKA(int i) {return i?kasel1:kasel0;}
+};
+
+union AlphaTest
+{
+	enum CompareMode : u32
+	{
+		NEVER   = 0,
+		LESS    = 1,
+		EQUAL   = 2,
+		LEQUAL  = 3,
+		GREATER = 4,
+		NEQUAL  = 5,
+		GEQUAL  = 6,
+		ALWAYS  = 7
+	};
+
+	enum Op : u32
+	{
+		AND  = 0,
+		OR   = 1,
+		XOR  = 2,
+		XNOR = 3
+	};
+
+	BitField< 0,8, u32>         ref0;
+	BitField< 8,8, u32>         ref1;
+	BitField<16,3, CompareMode> comp0;
+	BitField<19,3, CompareMode> comp1;
+	BitField<22,2, Op>          logic;
+
+	u32 hex;
+
+	enum TEST_RESULT
+	{
+		UNDETERMINED = 0,
+		FAIL = 1,
+		PASS = 2,
+	};
+
+	__forceinline TEST_RESULT TestResult() const
+	{
+		switch (logic)
+		{
+		case AND:
+			if (comp0 == ALWAYS && comp1 == ALWAYS)
+				return PASS;
+			if (comp0 == NEVER || comp1 == NEVER)
+				return FAIL;
+			break;
+
+		case OR:
+			if (comp0 == ALWAYS || comp1 == ALWAYS)
+				return PASS;
+			if (comp0 == NEVER && comp1 == NEVER)
+				return FAIL;
+			break;
+
+		case XOR:
+			if ((comp0 == ALWAYS && comp1 == NEVER) || (comp0 == NEVER && comp1 == ALWAYS))
+				return PASS;
+			if ((comp0 == ALWAYS && comp1 == ALWAYS) || (comp0 == NEVER && comp1 == NEVER))
+				return FAIL;
+			break;
+
+		case XNOR:
+			if ((comp0 == ALWAYS && comp1 == NEVER) || (comp0 == NEVER && comp1 == ALWAYS))
+				return FAIL;
+			if ((comp0 == ALWAYS && comp1 == ALWAYS) || (comp0 == NEVER && comp1 == NEVER))
+				return PASS;
+			break;
+
+		default:
+			return UNDETERMINED;
+		}
+		return UNDETERMINED;
+	}
+};
+
+union UPE_Copy
+{
+	u32 Hex;
+
+	BitField< 0,1,u32> clamp0;               // if set clamp top
+	BitField< 1,1,u32> clamp1;               // if set clamp bottom
+	BitField< 2,1,u32> yuv;                  // if set, color conversion from RGB to YUV
+	BitField< 3,4,u32> target_pixel_format;  // realformat is (fmt/2)+((fmt&1)*8).... for some reason the msb is the lsb (pattern: cycling right shift)
+	BitField< 7,2,u32> gamma;                // gamma correction.. 0 = 1.0 ; 1 = 1.7 ; 2 = 2.2 ; 3 is reserved
+	BitField< 9,1,u32> half_scale;           // "mipmap" filter... 0 = no filter (scale 1:1) ; 1 = box filter (scale 2:1)
+	BitField<10,1,u32> scale_invert;         // if set vertical scaling is on
+	BitField<11,1,u32> clear;
+	BitField<12,2,u32> frame_to_field;       // 0 progressive ; 1 is reserved ; 2 = interlaced (even lines) ; 3 = interlaced 1 (odd lines)
+	BitField<14,1,u32> copy_to_xfb;
+	BitField<15,1,u32> intensity_fmt;        // if set, is an intensity format (I4,I8,IA4,IA8)
+	BitField<16,1,u32> auto_conv;            // if 0 automatic color conversion by texture format and pixel type
+
+	u32 tp_realFormat()
+	{
+		return target_pixel_format / 2 + (target_pixel_format & 1) * 8;
+	}
+};
+
+union BPU_PreloadTileInfo
+{
+	u32 hex;
+	struct
+	{
+		u32 count : 15;
+		u32 type : 2;
+	};
+};
+
+struct BPS_TmemConfig
+{
+	u32 preload_addr;
+	u32 preload_tmem_even;
+	u32 preload_tmem_odd;
+	BPU_PreloadTileInfo preload_tile_info;
+	u32 tlut_src;
+	u32 tlut_dest;
+	u32 texinvalidate;
+};
+
+// All of BP memory
+
+
+struct BPCmd
+{
+	int address;
+	int changes;
+	int newvalue;
+};
+
+struct BPMemory
+{
+	GenMode genMode;
+	u32 display_copy_filter[4]; // 01-04
+	u32 unknown; // 05
+	// indirect matrices (set by GXSetIndTexMtx, selected by TevStageIndirect::mid)
+	// abc form a 2x3 offset matrix, there's 3 such matrices
+	// the 3 offset matrices can either be indirect type, S-type, or T-type
+	// 6bit scale factor s is distributed across IND_MTXA/B/C.
+	// before using matrices scale by 2^-(s-17)
+	IND_MTX indmtx[3];//06-0e GXSetIndTexMtx, 2x3 matrices
+	IND_IMASK imask;//0f
+	TevStageIndirect tevind[16];//10 GXSetTevIndirect
+	X12Y12 scissorTL; //20
+	X12Y12 scissorBR; //21
+	LPSize lineptwidth; //22 line and point width
+	u32 sucounter; //23
+	u32 rascounter; //24
+	TEXSCALE texscale[2]; //25-26 GXSetIndTexCoordScale
+	RAS1_IREF tevindref; //27 GXSetIndTexOrder
+	TwoTevStageOrders tevorders[8]; //28-2F
+	TCoordInfo texcoords[8]; //0x30 s,t,s,t,s,t,s,t...
+	ZMode zmode; //40
+	BlendMode blendmode; //41
+	ConstantAlpha dstalpha;  //42
+	PEControl zcontrol; //43 GXSetZCompLoc, GXPixModeSync
+	FieldMask fieldmask; //44
+	u32 drawdone;  //45, bit1=1 if end of list
+	u32 unknown5;  //46 clock?
+	u32 petoken; //47
+	u32 petokenint; // 48
+	X10Y10 copyTexSrcXY; // 49
+	X10Y10 copyTexSrcWH; // 4a
+	u32 copyTexDest; //4b// 4b == CopyAddress (GXDispCopy and GXTexCopy use it)
+	u32 unknown6; //4c
+	u32 copyMipMapStrideChannels; // 4d usually set to 4 when dest is single channel, 8 when dest is 2 channel, 16 when dest is RGBA
+	                              // also, doubles whenever mipmap box filter option is set (excent on RGBA). Probably to do with number of bytes to look at when smoothing
+	u32 dispcopyyscale; //4e
+	u32 clearcolorAR; //4f
+	u32 clearcolorGB; //50
+	u32 clearZValue; //51
+	UPE_Copy triggerEFBCopy; //52
+	u32 copyfilter[2]; //53,54
+	u32 boundbox0;//55
+	u32 boundbox1;//56
+	u32 unknown7[2];//57,58
+	X10Y10 scissorOffset; //59
+	u32 unknown8[6]; //5a,5b,5c,5d, 5e,5f
+	BPS_TmemConfig tmem_config; // 60-66
+	u32 metric; //67
+	FieldMode fieldmode;//68
+	u32 unknown10[7];//69-6F
+	u32 unknown11[16];//70-7F
+	FourTexUnits tex[2]; //80-bf
+	TevStageCombiner combiners[16]; //0xC0-0xDF
+	TevReg tevregs[4];  //0xE0
+	FogRangeParams fogRange;  // 0xE8
+	FogParams fog; //0xEE,0xEF,0xF0,0xF1,0xF2
+	AlphaTest alpha_test; //0xF3
+	ZTex1 ztex1; //0xf4,0xf5
+	ZTex2 ztex2;
+	TevKSel tevksel[8];//0xf6,0xf7,f8,f9,fa,fb,fc,fd
+	u32 bpMask; //0xFE
+	u32 unknown18; //ff
+
+	bool UseEarlyDepthTest() const { return zcontrol.early_ztest && zmode.testenable; }
+	bool UseLateDepthTest() const { return !zcontrol.early_ztest && zmode.testenable; }
+};
+
+#pragma pack()
+
+extern BPMemory bpmem;
+
+void LoadBPReg(u32 value0);
+void LoadBPRegPreprocess(u32 value0);
+
+void GetBPRegInfo(const u8* data, std::string* name, std::string* desc);
diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp
new file mode 100644
index 0000000000..3b883fb205
--- /dev/null
+++ b/Source/Core/VideoCommon/BPStructs.cpp
@@ -0,0 +1,1374 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/BPFunctions.h"
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/PerfQueryBase.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+using namespace BPFunctions;
+
+static const float s_gammaLUT[] =
+{
+	1.0f,
+	1.7f,
+	2.2f,
+	1.0f
+};
+
+void BPInit()
+{
+	memset(&bpmem, 0, sizeof(bpmem));
+	bpmem.bpMask = 0xFFFFFF;
+}
+
+static void BPWritten(const BPCmd& bp)
+{
+	/*
+	----------------------------------------------------------------------------------------------------------------
+	Purpose: Writes to the BP registers
+	Called: At the end of every: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg
+	How It Works: First the pipeline is flushed then update the bpmem with the new value.
+				  Some of the BP cases have to call certain functions while others just update the bpmem.
+				  some bp cases check the changes variable, because they might not have to be updated all the time
+	NOTE: it seems not all bp cases like checking changes, so calling if (bp.changes == 0 ? false : true)
+		  had to be ditched and the games seem to work fine with out it.
+	NOTE2: Yet Another GameCube Documentation calls them Bypass Raster State Registers but possibly completely wrong
+	NOTE3: This controls the register groups: RAS1/2, SU, TF, TEV, C/Z, PEC
+	TODO: Turn into function table. The (future) DisplayList (DL) jit can then call the functions directly,
+		  getting rid of dynamic dispatch. Unfortunately, few games use DLs properly - most\
+		  just stuff geometry in them and don't put state changes there
+	----------------------------------------------------------------------------------------------------------------
+	*/
+
+	// check for invalid state, else unneeded configuration are built
+	g_video_backend->CheckInvalidState();
+
+	if (((s32*)&bpmem)[bp.address] == bp.newvalue)
+	{
+		if (!(bp.address == BPMEM_TRIGGER_EFB_COPY ||
+		      bp.address == BPMEM_CLEARBBOX1 ||
+		      bp.address == BPMEM_CLEARBBOX2 ||
+		      bp.address == BPMEM_SETDRAWDONE ||
+		      bp.address == BPMEM_PE_TOKEN_ID ||
+		      bp.address == BPMEM_PE_TOKEN_INT_ID ||
+		      bp.address == BPMEM_LOADTLUT0 ||
+		      bp.address == BPMEM_LOADTLUT1 ||
+		      bp.address == BPMEM_TEXINVALIDATE ||
+		      bp.address == BPMEM_PRELOAD_MODE ||
+		      bp.address == BPMEM_CLEAR_PIXEL_PERF))
+		{
+			return;
+		}
+	}
+
+	FlushPipeline();
+
+	((u32*)&bpmem)[bp.address] = bp.newvalue;
+
+	switch (bp.address)
+	{
+	case BPMEM_GENMODE: // Set the Generation Mode
+		PRIM_LOG("genmode: texgen=%d, col=%d, multisampling=%d, tev=%d, cullmode=%d, ind=%d, zfeeze=%d",
+		         (u32)bpmem.genMode.numtexgens, (u32)bpmem.genMode.numcolchans,
+		         (u32)bpmem.genMode.multisampling, (u32)bpmem.genMode.numtevstages+1, (u32)bpmem.genMode.cullmode,
+		         (u32)bpmem.genMode.numindstages, (u32)bpmem.genMode.zfreeze);
+
+		// Only call SetGenerationMode when cull mode changes.
+		if (bp.changes & 0xC000)
+			SetGenerationMode();
+		return;
+	case BPMEM_IND_MTXA: // Index Matrix Changed
+	case BPMEM_IND_MTXB:
+	case BPMEM_IND_MTXC:
+	case BPMEM_IND_MTXA+3:
+	case BPMEM_IND_MTXB+3:
+	case BPMEM_IND_MTXC+3:
+	case BPMEM_IND_MTXA+6:
+	case BPMEM_IND_MTXB+6:
+	case BPMEM_IND_MTXC+6:
+		if (bp.changes)
+			PixelShaderManager::SetIndMatrixChanged((bp.address - BPMEM_IND_MTXA) / 3);
+		return;
+	case BPMEM_RAS1_SS0: // Index Texture Coordinate Scale 0
+		if (bp.changes)
+			PixelShaderManager::SetIndTexScaleChanged(false);
+		return;
+	case BPMEM_RAS1_SS1: // Index Texture Coordinate Scale 1
+		if (bp.changes)
+			PixelShaderManager::SetIndTexScaleChanged(true);
+		return;
+	// ----------------
+	// Scissor Control
+	// ----------------
+	case BPMEM_SCISSORTL: // Scissor Rectable Top, Left
+	case BPMEM_SCISSORBR: // Scissor Rectable Bottom, Right
+	case BPMEM_SCISSOROFFSET: // Scissor Offset
+		SetScissor();
+		VertexShaderManager::SetViewportChanged();
+		GeometryShaderManager::SetViewportChanged();
+		return;
+	case BPMEM_LINEPTWIDTH: // Line Width
+		GeometryShaderManager::SetLinePtWidthChanged();
+		return;
+	case BPMEM_ZMODE: // Depth Control
+		PRIM_LOG("zmode: test=%d, func=%d, upd=%d", (int)bpmem.zmode.testenable,
+		         (int)bpmem.zmode.func, (int)bpmem.zmode.updateenable);
+		SetDepthMode();
+		return;
+	case BPMEM_BLENDMODE: // Blending Control
+		if (bp.changes & 0xFFFF)
+		{
+			PRIM_LOG("blendmode: en=%d, open=%d, colupd=%d, alphaupd=%d, dst=%d, src=%d, sub=%d, mode=%d",
+			         (int)bpmem.blendmode.blendenable, (int)bpmem.blendmode.logicopenable, (int)bpmem.blendmode.colorupdate,
+			         (int)bpmem.blendmode.alphaupdate, (int)bpmem.blendmode.dstfactor, (int)bpmem.blendmode.srcfactor,
+			         (int)bpmem.blendmode.subtract, (int)bpmem.blendmode.logicmode);
+
+			// Set LogicOp Blending Mode
+			if (bp.changes & 0xF002) // logicopenable | logicmode
+				SetLogicOpMode();
+
+			// Set Dithering Mode
+			if (bp.changes & 4) // dither
+				SetDitherMode();
+
+			// Set Blending Mode
+			if (bp.changes & 0xFF1) // blendenable | alphaupdate | dstfactor | srcfactor | subtract
+				SetBlendMode();
+
+			// Set Color Mask
+			if (bp.changes & 0x18) // colorupdate | alphaupdate
+				SetColorMask();
+		}
+		return;
+	case BPMEM_CONSTANTALPHA: // Set Destination Alpha
+		PRIM_LOG("constalpha: alp=%d, en=%d", bpmem.dstalpha.alpha, bpmem.dstalpha.enable);
+		if (bp.changes & 0xFF)
+			PixelShaderManager::SetDestAlpha();
+		if (bp.changes & 0x100)
+			SetBlendMode();
+		return;
+
+	// This is called when the game is done drawing the new frame (eg: like in DX: Begin(); Draw(); End();)
+	// Triggers an interrupt on the PPC side so that the game knows when the GPU has finished drawing.
+	// Tokens are similar.
+	case BPMEM_SETDRAWDONE:
+		switch (bp.newvalue & 0xFF)
+		{
+		case 0x02:
+			if (!g_use_deterministic_gpu_thread)
+				PixelEngine::SetFinish(); // may generate interrupt
+			DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bp.newvalue & 0xFFFF));
+			return;
+
+		default:
+			WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bp.newvalue & 0xFFFF));
+			return;
+		}
+		return;
+	case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
+		if (!g_use_deterministic_gpu_thread)
+			PixelEngine::SetToken(static_cast<u16>(bp.newvalue & 0xFFFF), false);
+		DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bp.newvalue & 0xFFFF));
+		return;
+	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
+		if (!g_use_deterministic_gpu_thread)
+			PixelEngine::SetToken(static_cast<u16>(bp.newvalue & 0xFFFF), true);
+		DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bp.newvalue & 0xFFFF));
+		return;
+
+	// ------------------------
+	// EFB copy command. This copies a rectangle from the EFB to either RAM in a texture format or to XFB as YUYV.
+	// It can also optionally clear the EFB while copying from it. To emulate this, we of course copy first and clear afterwards.
+	case BPMEM_TRIGGER_EFB_COPY: // Copy EFB Region or Render to the XFB or Clear the screen.
+		{
+			// The bottom right is within the rectangle
+			// The values in bpmem.copyTexSrcXY and bpmem.copyTexSrcWH are updated in case 0x49 and 0x4a in this function
+
+			u32 destAddr = bpmem.copyTexDest << 5;
+
+			EFBRectangle srcRect;
+			srcRect.left = (int)bpmem.copyTexSrcXY.x;
+			srcRect.top = (int)bpmem.copyTexSrcXY.y;
+
+			// Here Width+1 like Height, otherwise some textures are corrupted already since the native resolution.
+			// TODO: What's the behavior of out of bound access?
+			srcRect.right = (int)(bpmem.copyTexSrcXY.x + bpmem.copyTexSrcWH.x + 1);
+			srcRect.bottom = (int)(bpmem.copyTexSrcXY.y + bpmem.copyTexSrcWH.y + 1);
+
+			UPE_Copy PE_copy = bpmem.triggerEFBCopy;
+
+			// Check if we are to copy from the EFB or draw to the XFB
+			if (PE_copy.copy_to_xfb == 0)
+			{
+				if (g_ActiveConfig.bShowEFBCopyRegions)
+					stats.efb_regions.push_back(srcRect);
+
+				CopyEFB(destAddr, srcRect,
+					PE_copy.tp_realFormat(), bpmem.zcontrol.pixel_format,
+					!!PE_copy.intensity_fmt, !!PE_copy.half_scale);
+			}
+			else
+			{
+				// We should be able to get away with deactivating the current bbox tracking
+				// here. Not sure if there's a better spot to put this.
+				// the number of lines copied is determined by the y scale * source efb height
+
+				BoundingBox::active = false;
+
+				float yScale;
+				if (PE_copy.scale_invert)
+					yScale = 256.0f / (float)bpmem.dispcopyyscale;
+				else
+					yScale = (float)bpmem.dispcopyyscale / 256.0f;
+
+				float num_xfb_lines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale);
+
+				u32 height = static_cast<u32>(num_xfb_lines);
+				if (height > MAX_XFB_HEIGHT)
+				{
+					INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines: %d (%f)",
+							 height, num_xfb_lines);
+					height = MAX_XFB_HEIGHT;
+				}
+
+				u32 width = bpmem.copyMipMapStrideChannels << 4;
+
+				Renderer::RenderToXFB(destAddr, srcRect, width, height, s_gammaLUT[PE_copy.gamma]);
+			}
+
+			// Clear the rectangular region after copying it.
+			if (PE_copy.clear)
+			{
+				ClearScreen(srcRect);
+			}
+
+			return;
+		}
+	case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
+		return;
+	case BPMEM_LOADTLUT1: // Load a Texture Look Up Table
+		{
+			u32 tlutTMemAddr = (bp.newvalue & 0x3FF) << 9;
+			u32 tlutXferCount = (bp.newvalue & 0x1FFC00) >> 5;
+			u32 addr = bpmem.tmem_config.tlut_src << 5;
+
+			// The GameCube ignores the upper bits of this address. Some games (WW, MKDD) set them.
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
+				addr = addr & 0x01FFFFFF;
+
+			Memory::CopyFromEmu(texMem + tlutTMemAddr, addr, tlutXferCount);
+
+			return;
+		}
+	case BPMEM_FOGRANGE: // Fog Settings Control
+	case BPMEM_FOGRANGE+1:
+	case BPMEM_FOGRANGE+2:
+	case BPMEM_FOGRANGE+3:
+	case BPMEM_FOGRANGE+4:
+	case BPMEM_FOGRANGE+5:
+		if (bp.changes)
+			PixelShaderManager::SetFogRangeAdjustChanged();
+		return;
+	case BPMEM_FOGPARAM0:
+	case BPMEM_FOGBMAGNITUDE:
+	case BPMEM_FOGBEXPONENT:
+	case BPMEM_FOGPARAM3:
+		if (bp.changes)
+			PixelShaderManager::SetFogParamChanged();
+		return;
+	case BPMEM_FOGCOLOR: // Fog Color
+		if (bp.changes)
+			PixelShaderManager::SetFogColorChanged();
+		return;
+	case BPMEM_ALPHACOMPARE: // Compare Alpha Values
+		PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d",
+		         (int)bpmem.alpha_test.ref0, (int)bpmem.alpha_test.ref1,
+		         (int)bpmem.alpha_test.comp0, (int)bpmem.alpha_test.comp1,
+		         (int)bpmem.alpha_test.logic);
+		if (bp.changes & 0xFFFF)
+			PixelShaderManager::SetAlpha();
+		if (bp.changes)
+			g_renderer->SetColorMask();
+		return;
+	case BPMEM_BIAS: // BIAS
+		PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);
+		if (bp.changes)
+			PixelShaderManager::SetZTextureBias();
+		return;
+	case BPMEM_ZTEX2: // Z Texture type
+		{
+			if (bp.changes & 3)
+				PixelShaderManager::SetZTextureTypeChanged();
+			#if defined(_DEBUG) || defined(DEBUGFAST)
+			const char* pzop[] = {"DISABLE", "ADD", "REPLACE", "?"};
+			const char* pztype[] = {"Z8", "Z16", "Z24", "?"};
+			PRIM_LOG("ztex op=%s, type=%s", pzop[bpmem.ztex2.op], pztype[bpmem.ztex2.type]);
+			#endif
+		}
+		return;
+	// ----------------------------------
+	// Display Copy Filtering Control - GX_SetCopyFilter(u8 aa,u8 sample_pattern[12][2],u8 vf,u8 vfilter[7])
+	// Fields: Destination, Frame2Field, Gamma, Source
+	// ----------------------------------
+	case BPMEM_DISPLAYCOPYFILTER:   // if (aa) { use sample_pattern } else { use 666666 }
+	case BPMEM_DISPLAYCOPYFILTER+1: // if (aa) { use sample_pattern } else { use 666666 }
+	case BPMEM_DISPLAYCOPYFILTER+2: // if (aa) { use sample_pattern } else { use 666666 }
+	case BPMEM_DISPLAYCOPYFILTER+3: // if (aa) { use sample_pattern } else { use 666666 }
+	case BPMEM_COPYFILTER0:	        // if (vf) { use vfilter } else { use 595000 }
+	case BPMEM_COPYFILTER1:	        // if (vf) { use vfilter } else { use 000015 }
+		return;
+	// -----------------------------------
+	// Interlacing Control
+	// -----------------------------------
+	case BPMEM_FIELDMASK: // GX_SetFieldMask(u8 even_mask,u8 odd_mask)
+	case BPMEM_FIELDMODE: // GX_SetFieldMode(u8 field_mode,u8 half_aspect_ratio)
+		// TODO
+		return;
+	// ----------------------------------------
+	// Unimportant regs (Clock, Perf, ...)
+	// ----------------------------------------
+	case BPMEM_BUSCLOCK0:      // TB Bus Clock ?
+	case BPMEM_BUSCLOCK1:      // TB Bus Clock ?
+	case BPMEM_PERF0_TRI:      // Perf: Triangles
+	case BPMEM_PERF0_QUAD:     // Perf: Quads
+	case BPMEM_PERF1:          // Perf: Some Clock, Texels, TX, TC
+		break;
+	// ----------------
+	// EFB Copy config
+	// ----------------
+	case BPMEM_EFB_TL:   // EFB Source Rect. Top, Left
+	case BPMEM_EFB_BR:   // EFB Source Rect. Bottom, Right (w, h - 1)
+	case BPMEM_EFB_ADDR: // EFB Target Address
+		return;
+	// --------------
+	// Clear Config
+	// --------------
+	case BPMEM_CLEAR_AR: // Alpha and Red Components
+	case BPMEM_CLEAR_GB: // Green and Blue Components
+	case BPMEM_CLEAR_Z:  // Z Components (24-bit Zbuffer)
+		return;
+	// -------------------------
+	// Bounding Box Control
+	// -------------------------
+	case BPMEM_CLEARBBOX1:
+	case BPMEM_CLEARBBOX2:
+		// Don't compute bounding box if this frame is being skipped!
+		// Wrong but valid values are better than bogus values...
+		if (!g_bSkipCurrentFrame)
+		{
+			u8 offset = bp.address & 2;
+			BoundingBox::active = true;
+
+			if (g_ActiveConfig.backend_info.bSupportsBBox && g_ActiveConfig.bBBoxEnable)
+			{
+				g_renderer->BBoxWrite(offset, bp.newvalue & 0x3ff);
+				g_renderer->BBoxWrite(offset + 1, bp.newvalue >> 10);
+			}
+		}
+		return;
+	case BPMEM_TEXINVALIDATE:
+		// TODO: Needs some restructuring in TextureCacheBase.
+		return;
+
+	case BPMEM_ZCOMPARE:      // Set the Z-Compare and EFB pixel format
+		OnPixelFormatChange();
+		if (bp.changes & 7)
+		{
+			SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24
+			g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel
+		}
+		return;
+
+	case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel
+	case BPMEM_COPYYSCALE:    // Display Copy Y Scale
+
+	/* 24 RID
+	 * 21 BC3 - Ind. Tex Stage 3 NTexCoord
+	 * 18 BI3 - Ind. Tex Stage 3 NTexMap
+	 * 15 BC2 - Ind. Tex Stage 2 NTexCoord
+	 * 12 BI2 - Ind. Tex Stage 2 NTexMap
+	 * 9 BC1 - Ind. Tex Stage 1 NTexCoord
+	 * 6 BI1 - Ind. Tex Stage 1 NTexMap
+	 * 3 BC0 - Ind. Tex Stage 0 NTexCoord
+	 * 0 BI0 - Ind. Tex Stage 0 NTexMap */
+	case BPMEM_IREF:
+
+	case BPMEM_TEV_KSEL:   // Texture Environment Swap Mode Table 0
+	case BPMEM_TEV_KSEL+1: // Texture Environment Swap Mode Table 1
+	case BPMEM_TEV_KSEL+2: // Texture Environment Swap Mode Table 2
+	case BPMEM_TEV_KSEL+3: // Texture Environment Swap Mode Table 3
+	case BPMEM_TEV_KSEL+4: // Texture Environment Swap Mode Table 4
+	case BPMEM_TEV_KSEL+5: // Texture Environment Swap Mode Table 5
+	case BPMEM_TEV_KSEL+6: // Texture Environment Swap Mode Table 6
+	case BPMEM_TEV_KSEL+7: // Texture Environment Swap Mode Table 7
+
+	/* This Register can be used to limit to which bits of BP registers is
+	 * actually written to. The mask is only valid for the next BP write,
+	 * and will reset itself afterwards. It's handled as a special case in
+	 * LoadBPReg. */
+	case BPMEM_BP_MASK:
+
+	case BPMEM_IND_IMASK: // Index Mask ?
+	case BPMEM_REVBITS: // Always set to 0x0F when GX_InitRevBits() is called.
+		return;
+
+	case BPMEM_CLEAR_PIXEL_PERF:
+		// GXClearPixMetric writes 0xAAA here, Sunshine alternates this register between values 0x000 and 0xAAA
+		if (PerfQueryBase::ShouldEmulate())
+			g_perf_query->ResetQuery();
+		return;
+
+	case BPMEM_PRELOAD_ADDR:
+	case BPMEM_PRELOAD_TMEMEVEN:
+	case BPMEM_PRELOAD_TMEMODD: // Used when PRELOAD_MODE is set
+		return;
+
+	case BPMEM_PRELOAD_MODE: // Set to 0 when GX_TexModeSync() is called.
+		// if this is different from 0, manual TMEM management is used (GX_PreloadEntireTexture).
+		if (bp.newvalue != 0)
+		{
+			// TODO: Not quite sure if this is completely correct (likely not)
+			// NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature.
+
+			BPS_TmemConfig& tmem_cfg = bpmem.tmem_config;
+			u32 src_addr = tmem_cfg.preload_addr << 5; // TODO: Should we add mask here on GC?
+			u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE;
+			u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE;
+
+			if (tmem_cfg.preload_tile_info.type != 3)
+			{
+				if (tmem_addr_even + size > TMEM_SIZE)
+					size = TMEM_SIZE - tmem_addr_even;
+
+				Memory::CopyFromEmu(texMem + tmem_addr_even, src_addr, size);
+			}
+			else // RGBA8 tiles (and CI14, but that might just be stupid libogc!)
+			{
+				u8* src_ptr = Memory::GetPointer(src_addr);
+
+				// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
+				u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
+
+				for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
+				{
+					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
+					    tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
+						return;
+
+					// TODO: This isn't very optimised, does a whole lot of small memcpys
+					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);
+					memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE);
+					tmem_addr_even += TMEM_LINE_SIZE;
+					tmem_addr_odd += TMEM_LINE_SIZE;
+					src_ptr += TMEM_LINE_SIZE * 2;
+				}
+			}
+		}
+		return;
+
+	// ---------------------------------------------------
+	// Set the TEV Color
+	// ---------------------------------------------------
+	//
+	// NOTE: Each of these registers actually maps to two variables internally.
+	//       There's a bit that specifies which one is currently written to.
+	//
+	// NOTE: Some games write only to the RA register (or only to the BG register).
+	//       We may not assume that the unwritten register holds a valid value, hence
+	//       both component pairs need to be loaded individually.
+	case BPMEM_TEV_COLOR_RA:
+	case BPMEM_TEV_COLOR_RA + 2:
+	case BPMEM_TEV_COLOR_RA + 4:
+	case BPMEM_TEV_COLOR_RA + 6:
+	{
+		int num = (bp.address >> 1) & 0x3;
+		if (bpmem.tevregs[num].type_ra)
+		{
+			PixelShaderManager::SetTevKonstColor(num, 0, (s32)bpmem.tevregs[num].red);
+			PixelShaderManager::SetTevKonstColor(num, 3, (s32)bpmem.tevregs[num].alpha);
+		}
+		else
+		{
+			PixelShaderManager::SetTevColor(num, 0, (s32)bpmem.tevregs[num].red);
+			PixelShaderManager::SetTevColor(num, 3, (s32)bpmem.tevregs[num].alpha);
+		}
+		return;
+	}
+
+	case BPMEM_TEV_COLOR_BG:
+	case BPMEM_TEV_COLOR_BG + 2:
+	case BPMEM_TEV_COLOR_BG + 4:
+	case BPMEM_TEV_COLOR_BG + 6:
+	{
+		int num = (bp.address >> 1) & 0x3;
+		if (bpmem.tevregs[num].type_bg)
+		{
+			PixelShaderManager::SetTevKonstColor(num, 1, (s32)bpmem.tevregs[num].green);
+			PixelShaderManager::SetTevKonstColor(num, 2, (s32)bpmem.tevregs[num].blue);
+		}
+		else
+		{
+			PixelShaderManager::SetTevColor(num, 1, (s32)bpmem.tevregs[num].green);
+			PixelShaderManager::SetTevColor(num, 2, (s32)bpmem.tevregs[num].blue);
+		}
+		return;
+	}
+
+	default:
+		break;
+	}
+
+	switch (bp.address & 0xFC)  // Texture sampler filter
+	{
+	// -------------------------
+	// Texture Environment Order
+	// -------------------------
+	case BPMEM_TREF:
+	case BPMEM_TREF+4:
+		return;
+	// ----------------------
+	// Set wrap size
+	// ----------------------
+	case BPMEM_SU_SSIZE:
+	case BPMEM_SU_TSIZE:
+	case BPMEM_SU_SSIZE+2:
+	case BPMEM_SU_TSIZE+2:
+	case BPMEM_SU_SSIZE+4:
+	case BPMEM_SU_TSIZE+4:
+	case BPMEM_SU_SSIZE+6:
+	case BPMEM_SU_TSIZE+6:
+	case BPMEM_SU_SSIZE+8:
+	case BPMEM_SU_TSIZE+8:
+	case BPMEM_SU_SSIZE+10:
+	case BPMEM_SU_TSIZE+10:
+	case BPMEM_SU_SSIZE+12:
+	case BPMEM_SU_TSIZE+12:
+	case BPMEM_SU_SSIZE+14:
+	case BPMEM_SU_TSIZE+14:
+		if (bp.changes)
+		{
+			PixelShaderManager::SetTexCoordChanged((bp.address - BPMEM_SU_SSIZE) >> 1);
+			GeometryShaderManager::SetTexCoordChanged((bp.address - BPMEM_SU_SSIZE) >> 1);
+		}
+		return;
+	// ------------------------
+	// BPMEM_TX_SETMODE0 - (Texture lookup and filtering mode) LOD/BIAS Clamp, MaxAnsio, LODBIAS, DiagLoad, Min Filter, Mag Filter, Wrap T, S
+	// BPMEM_TX_SETMODE1 - (LOD Stuff) - Max LOD, Min LOD
+	// ------------------------
+	case BPMEM_TX_SETMODE0: // (0x90 for linear)
+	case BPMEM_TX_SETMODE0_4:
+		return;
+
+	case BPMEM_TX_SETMODE1:
+	case BPMEM_TX_SETMODE1_4:
+		return;
+	// --------------------------------------------
+	// BPMEM_TX_SETIMAGE0 - Texture width, height, format
+	// BPMEM_TX_SETIMAGE1 - even LOD address in TMEM - Image Type, Cache Height, Cache Width, TMEM Offset
+	// BPMEM_TX_SETIMAGE2 - odd LOD address in TMEM - Cache Height, Cache Width, TMEM Offset
+	// BPMEM_TX_SETIMAGE3 - Address of Texture in main memory
+	// --------------------------------------------
+	case BPMEM_TX_SETIMAGE0:
+	case BPMEM_TX_SETIMAGE0_4:
+	case BPMEM_TX_SETIMAGE1:
+	case BPMEM_TX_SETIMAGE1_4:
+	case BPMEM_TX_SETIMAGE2:
+	case BPMEM_TX_SETIMAGE2_4:
+	case BPMEM_TX_SETIMAGE3:
+	case BPMEM_TX_SETIMAGE3_4:
+		return;
+	// -------------------------------
+	// Set a TLUT
+	// BPMEM_TX_SETTLUT - Format, TMEM Offset (offset of TLUT from start of TMEM high bank > > 5)
+	// -------------------------------
+	case BPMEM_TX_SETTLUT:
+	case BPMEM_TX_SETTLUT_4:
+		return;
+
+	default:
+		break;
+	}
+
+	switch (bp.address & 0xF0)
+	{
+	// --------------
+	// Indirect Tev
+	// --------------
+	case BPMEM_IND_CMD:
+	case BPMEM_IND_CMD+1:
+	case BPMEM_IND_CMD+2:
+	case BPMEM_IND_CMD+3:
+	case BPMEM_IND_CMD+4:
+	case BPMEM_IND_CMD+5:
+	case BPMEM_IND_CMD+6:
+	case BPMEM_IND_CMD+7:
+	case BPMEM_IND_CMD+8:
+	case BPMEM_IND_CMD+9:
+	case BPMEM_IND_CMD+10:
+	case BPMEM_IND_CMD+11:
+	case BPMEM_IND_CMD+12:
+	case BPMEM_IND_CMD+13:
+	case BPMEM_IND_CMD+14:
+	case BPMEM_IND_CMD+15:
+		return;
+	// --------------------------------------------------
+	// Set Color/Alpha of a Tev
+	// BPMEM_TEV_COLOR_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D
+	// BPMEM_TEV_ALPHA_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D, T Swap, R Swap
+	// --------------------------------------------------
+	case BPMEM_TEV_COLOR_ENV:    // Texture Environment 1
+	case BPMEM_TEV_ALPHA_ENV:
+	case BPMEM_TEV_COLOR_ENV+2:  // Texture Environment 2
+	case BPMEM_TEV_ALPHA_ENV+2:
+	case BPMEM_TEV_COLOR_ENV+4:  // Texture Environment 3
+	case BPMEM_TEV_ALPHA_ENV+4:
+	case BPMEM_TEV_COLOR_ENV+6:  // Texture Environment 4
+	case BPMEM_TEV_ALPHA_ENV+6:
+	case BPMEM_TEV_COLOR_ENV+8:  // Texture Environment 5
+	case BPMEM_TEV_ALPHA_ENV+8:
+	case BPMEM_TEV_COLOR_ENV+10: // Texture Environment 6
+	case BPMEM_TEV_ALPHA_ENV+10:
+	case BPMEM_TEV_COLOR_ENV+12: // Texture Environment 7
+	case BPMEM_TEV_ALPHA_ENV+12:
+	case BPMEM_TEV_COLOR_ENV+14: // Texture Environment 8
+	case BPMEM_TEV_ALPHA_ENV+14:
+	case BPMEM_TEV_COLOR_ENV+16: // Texture Environment 9
+	case BPMEM_TEV_ALPHA_ENV+16:
+	case BPMEM_TEV_COLOR_ENV+18: // Texture Environment 10
+	case BPMEM_TEV_ALPHA_ENV+18:
+	case BPMEM_TEV_COLOR_ENV+20: // Texture Environment 11
+	case BPMEM_TEV_ALPHA_ENV+20:
+	case BPMEM_TEV_COLOR_ENV+22: // Texture Environment 12
+	case BPMEM_TEV_ALPHA_ENV+22:
+	case BPMEM_TEV_COLOR_ENV+24: // Texture Environment 13
+	case BPMEM_TEV_ALPHA_ENV+24:
+	case BPMEM_TEV_COLOR_ENV+26: // Texture Environment 14
+	case BPMEM_TEV_ALPHA_ENV+26:
+	case BPMEM_TEV_COLOR_ENV+28: // Texture Environment 15
+	case BPMEM_TEV_ALPHA_ENV+28:
+	case BPMEM_TEV_COLOR_ENV+30: // Texture Environment 16
+	case BPMEM_TEV_ALPHA_ENV+30:
+		return;
+	default:
+		break;
+	}
+
+	WARN_LOG(VIDEO, "Unknown BP opcode: address = 0x%08x value = 0x%08x", bp.address, bp.newvalue);
+}
+
+// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
+void LoadBPReg(u32 value0)
+{
+	int regNum = value0 >> 24;
+	int oldval = ((u32*)&bpmem)[regNum];
+	int newval = (oldval & ~bpmem.bpMask) | (value0 & bpmem.bpMask);
+	int changes = (oldval ^ newval) & 0xFFFFFF;
+
+	BPCmd bp = {regNum, changes, newval};
+
+	// Reset the mask register if we're not trying to set it ourselves.
+	if (regNum != BPMEM_BP_MASK)
+		bpmem.bpMask = 0xFFFFFF;
+
+	BPWritten(bp);
+}
+
+void LoadBPRegPreprocess(u32 value0)
+{
+	int regNum = value0 >> 24;
+	// masking could hypothetically be a problem
+	u32 newval = value0 & 0xffffff;
+	switch (regNum)
+	{
+	case BPMEM_SETDRAWDONE:
+		if ((newval & 0xff) == 0x02)
+			PixelEngine::SetFinish();
+		break;
+	case BPMEM_PE_TOKEN_ID:
+		PixelEngine::SetToken(newval & 0xffff, false);
+		break;
+	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
+		PixelEngine::SetToken(newval & 0xffff, true);
+		break;
+	}
+}
+
+void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
+{
+	const char* no_yes[2] = { "No", "Yes" };
+
+	u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF;
+	switch (data[0])
+	{
+	 // Macro to set the register name and make sure it was written correctly via compile time assertion
+	#define SetRegName(reg) \
+		*name = #reg; \
+		(void)(reg);
+
+	case BPMEM_GENMODE: // 0x00
+		SetRegName(BPMEM_GENMODE);
+		// TODO: Description
+		break;
+
+	case BPMEM_DISPLAYCOPYFILTER: // 0x01
+		// TODO: This is actually the sample pattern used for copies from an antialiased EFB
+		SetRegName(BPMEM_DISPLAYCOPYFILTER);
+		// TODO: Description
+		break;
+
+	case 0x02: // 0x02
+	case 0x03: // 0x03
+	case 0x04: // 0x04
+		// TODO: same as BPMEM_DISPLAYCOPYFILTER
+		break;
+
+	case BPMEM_IND_MTXA: // 0x06
+	case BPMEM_IND_MTXA+3:
+	case BPMEM_IND_MTXA+6:
+		SetRegName(BPMEM_IND_MTXA);
+		// TODO: Description
+		break;
+
+	case BPMEM_IND_MTXB: // 0x07
+	case BPMEM_IND_MTXB+3:
+	case BPMEM_IND_MTXB+6:
+		SetRegName(BPMEM_IND_MTXB);
+		// TODO: Descriptio
+		break;
+
+	case BPMEM_IND_MTXC: // 0x08
+	case BPMEM_IND_MTXC+3:
+	case BPMEM_IND_MTXC+6:
+		SetRegName(BPMEM_IND_MTXC);
+		// TODO: Description
+		break;
+
+	case BPMEM_IND_IMASK: // 0x0F
+		SetRegName(BPMEM_IND_IMASK);
+		// TODO: Description
+		break;
+
+	case BPMEM_IND_CMD: // 0x10
+	case BPMEM_IND_CMD+1:
+	case BPMEM_IND_CMD+2:
+	case BPMEM_IND_CMD+3:
+	case BPMEM_IND_CMD+4:
+	case BPMEM_IND_CMD+5:
+	case BPMEM_IND_CMD+6:
+	case BPMEM_IND_CMD+7:
+	case BPMEM_IND_CMD+8:
+	case BPMEM_IND_CMD+9:
+	case BPMEM_IND_CMD+10:
+	case BPMEM_IND_CMD+11:
+	case BPMEM_IND_CMD+12:
+	case BPMEM_IND_CMD+13:
+	case BPMEM_IND_CMD+14:
+	case BPMEM_IND_CMD+15:
+		SetRegName(BPMEM_IND_CMD);
+		// TODO: Description
+		break;
+
+	case BPMEM_SCISSORTL: // 0x20
+		SetRegName(BPMEM_SCISSORTL);
+		// TODO: Description
+		break;
+
+	case BPMEM_SCISSORBR: // 0x21
+		SetRegName(BPMEM_SCISSORBR);
+		// TODO: Description
+		break;
+
+	case BPMEM_LINEPTWIDTH: // 0x22
+		SetRegName(BPMEM_LINEPTWIDTH);
+		// TODO: Description
+		break;
+
+	case BPMEM_PERF0_TRI: // 0x23
+		SetRegName(BPMEM_PERF0_TRI);
+		// TODO: Description
+		break;
+
+	case BPMEM_PERF0_QUAD: // 0x24
+		SetRegName(BPMEM_PERF0_QUAD);
+		// TODO: Description
+		break;
+
+	case BPMEM_RAS1_SS0: // 0x25
+		SetRegName(BPMEM_RAS1_SS0);
+		// TODO: Description
+		break;
+
+	case BPMEM_RAS1_SS1: // 0x26
+		SetRegName(BPMEM_RAS1_SS1);
+		// TODO: Description
+		break;
+
+	case BPMEM_IREF: // 0x27
+		SetRegName(BPMEM_IREF);
+		// TODO: Description
+		break;
+
+	case BPMEM_TREF: // 0x28
+	case BPMEM_TREF+1:
+	case BPMEM_TREF+2:
+	case BPMEM_TREF+3:
+	case BPMEM_TREF+4:
+	case BPMEM_TREF+5:
+	case BPMEM_TREF+6:
+	case BPMEM_TREF+7:
+		SetRegName(BPMEM_TREF);
+		// TODO: Description
+		break;
+
+	case BPMEM_SU_SSIZE: // 0x30
+	case BPMEM_SU_SSIZE+2:
+	case BPMEM_SU_SSIZE+4:
+	case BPMEM_SU_SSIZE+6:
+	case BPMEM_SU_SSIZE+8:
+	case BPMEM_SU_SSIZE+10:
+	case BPMEM_SU_SSIZE+12:
+	case BPMEM_SU_SSIZE+14:
+		SetRegName(BPMEM_SU_SSIZE);
+		// TODO: Description
+		break;
+
+	case BPMEM_SU_TSIZE: // 0x31
+	case BPMEM_SU_TSIZE+2:
+	case BPMEM_SU_TSIZE+4:
+	case BPMEM_SU_TSIZE+6:
+	case BPMEM_SU_TSIZE+8:
+	case BPMEM_SU_TSIZE+10:
+	case BPMEM_SU_TSIZE+12:
+	case BPMEM_SU_TSIZE+14:
+		SetRegName(BPMEM_SU_TSIZE);
+		// TODO: Description
+		break;
+
+	case BPMEM_ZMODE: // 0x40
+		SetRegName(BPMEM_ZMODE);
+		// TODO: Description
+		break;
+
+	case BPMEM_BLENDMODE: // 0x41
+		{
+			SetRegName(BPMEM_BLENDMODE);
+			BlendMode mode; mode.hex = cmddata;
+			const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
+			const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
+			const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" };
+			*desc = StringFromFormat("Enable: %s\n"
+			                         "Logic ops: %s\n"
+			                         "Dither: %s\n"
+			                         "Color write: %s\n"
+			                         "Alpha write: %s\n"
+			                         "Dest factor: %s\n"
+			                         "Source factor: %s\n"
+			                         "Subtract: %s\n"
+			                         "Logic mode: %s\n",
+			                         no_yes[mode.blendenable], no_yes[mode.logicopenable], no_yes[mode.dither],
+			                         no_yes[mode.colorupdate], no_yes[mode.alphaupdate], dstfactors[mode.dstfactor],
+			                         srcfactors[mode.srcfactor], no_yes[mode.subtract], logicmodes[mode.logicmode]);
+		}
+		break;
+
+	case BPMEM_CONSTANTALPHA: // 0x42
+		SetRegName(BPMEM_CONSTANTALPHA);
+		// TODO: Description
+		break;
+
+	case BPMEM_ZCOMPARE: // 0x43
+		{
+			SetRegName(BPMEM_ZCOMPARE);
+			PEControl config; config.hex = cmddata;
+			const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" };
+			const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
+			*desc = StringFromFormat("EFB pixel format: %s\n"
+			                         "Depth format: %s\n"
+			                         "Early depth test: %s\n",
+			                         pixel_formats[config.pixel_format], zformats[config.zformat], no_yes[config.early_ztest]);
+		}
+		break;
+
+	case BPMEM_FIELDMASK: // 0x44
+		SetRegName(BPMEM_FIELDMASK);
+		// TODO: Description
+		break;
+
+	case BPMEM_SETDRAWDONE: // 0x45
+		SetRegName(BPMEM_SETDRAWDONE);
+		// TODO: Description
+		break;
+
+	case BPMEM_BUSCLOCK0: // 0x46
+		SetRegName(BPMEM_BUSCLOCK0);
+		// TODO: Description
+		break;
+
+	case BPMEM_PE_TOKEN_ID: // 0x47
+		SetRegName(BPMEM_PE_TOKEN_ID);
+		// TODO: Description
+		break;
+
+	case BPMEM_PE_TOKEN_INT_ID: // 0x48
+		SetRegName(BPMEM_PE_TOKEN_INT_ID);
+		// TODO: Description
+		break;
+
+	case BPMEM_EFB_TL: // 0x49
+		{
+			SetRegName(BPMEM_EFB_TL);
+			X10Y10 left_top; left_top.hex = cmddata;
+			*desc = StringFromFormat("Left: %d\nTop: %d", left_top.x, left_top.y);
+		}
+		break;
+
+	case BPMEM_EFB_BR: // 0x4A
+		{
+			// TODO: Misleading name, should be BPMEM_EFB_WH instead
+			SetRegName(BPMEM_EFB_BR);
+			X10Y10 width_height; width_height.hex = cmddata;
+			*desc = StringFromFormat("Width: %d\nHeight: %d", width_height.x+1, width_height.y+1);
+		}
+		break;
+
+	case BPMEM_EFB_ADDR: // 0x4B
+		SetRegName(BPMEM_EFB_ADDR);
+		*desc = StringFromFormat("Target address (32 byte aligned): 0x%06X", cmddata << 5);
+		break;
+
+	case BPMEM_MIPMAP_STRIDE: // 0x4D
+		SetRegName(BPMEM_MIPMAP_STRIDE);
+		// TODO: Description
+		break;
+
+	case BPMEM_COPYYSCALE: // 0x4E
+		SetRegName(BPMEM_COPYYSCALE);
+		*desc = StringFromFormat("Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata);
+		break;
+
+	case BPMEM_CLEAR_AR: // 0x4F
+		SetRegName(BPMEM_CLEAR_AR);
+		*desc = StringFromFormat("Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
+		break;
+
+	case BPMEM_CLEAR_GB: // 0x50
+		SetRegName(BPMEM_CLEAR_GB);
+		*desc = StringFromFormat("Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
+		break;
+
+	case BPMEM_CLEAR_Z: // 0x51
+		SetRegName(BPMEM_CLEAR_Z);
+		*desc = StringFromFormat("Z value: 0x%06X", cmddata);
+		break;
+
+	case BPMEM_TRIGGER_EFB_COPY: // 0x52
+		{
+			SetRegName(BPMEM_TRIGGER_EFB_COPY);
+			UPE_Copy copy; copy.Hex = cmddata;
+			*desc = StringFromFormat("Clamping: %s\n"
+			                         "Converting from RGB to YUV: %s\n"
+			                         "Target pixel format: 0x%X\n"
+			                         "Gamma correction: %s\n"
+			                         "Mipmap filter: %s\n"
+			                         "Vertical scaling: %s\n"
+			                         "Clear: %s\n"
+			                         "Frame to field: 0x%01X\n"
+			                         "Copy to XFB: %s\n"
+			                         "Intensity format: %s\n"
+			                         "Automatic color conversion: %s",
+			                         (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None",
+			                         no_yes[copy.yuv],
+			                         copy.tp_realFormat(),
+			                         (copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?",
+			                         no_yes[copy.half_scale],
+			                         no_yes[copy.scale_invert],
+			                         no_yes[copy.clear],
+			                         (u32)copy.frame_to_field,
+			                         no_yes[copy.copy_to_xfb],
+			                         no_yes[copy.intensity_fmt],
+			                         no_yes[copy.auto_conv]);
+		}
+		break;
+
+	case BPMEM_COPYFILTER0: // 0x53
+		SetRegName(BPMEM_COPYFILTER0);
+		// TODO: Description
+		break;
+
+	case BPMEM_COPYFILTER1: // 0x54
+		SetRegName(BPMEM_COPYFILTER1);
+		// TODO: Description
+		break;
+
+	case BPMEM_CLEARBBOX1: // 0x55
+		SetRegName(BPMEM_CLEARBBOX1);
+		// TODO: Description
+		break;
+
+	case BPMEM_CLEARBBOX2: // 0x56
+		SetRegName(BPMEM_CLEARBBOX2);
+		// TODO: Description
+		break;
+
+	case BPMEM_CLEAR_PIXEL_PERF: // 0x57
+		SetRegName(BPMEM_CLEAR_PIXEL_PERF);
+		// TODO: Description
+		break;
+
+	case BPMEM_REVBITS: // 0x58
+		SetRegName(BPMEM_REVBITS);
+		// TODO: Description
+		break;
+
+	case BPMEM_SCISSOROFFSET: // 0x59
+		SetRegName(BPMEM_SCISSOROFFSET);
+		// TODO: Description
+		break;
+
+	case BPMEM_PRELOAD_ADDR: // 0x60
+		SetRegName(BPMEM_PRELOAD_ADDR);
+		// TODO: Description
+		break;
+
+	case BPMEM_PRELOAD_TMEMEVEN: // 0x61
+		SetRegName(BPMEM_PRELOAD_TMEMEVEN);
+		// TODO: Description
+		break;
+
+	case BPMEM_PRELOAD_TMEMODD: // 0x62
+		SetRegName(BPMEM_PRELOAD_TMEMODD);
+		// TODO: Description
+		break;
+
+	case BPMEM_PRELOAD_MODE: // 0x63
+		SetRegName(BPMEM_PRELOAD_MODE);
+		// TODO: Description
+		break;
+
+	case BPMEM_LOADTLUT0: // 0x64
+		SetRegName(BPMEM_LOADTLUT0);
+		// TODO: Description
+		break;
+
+	case BPMEM_LOADTLUT1: // 0x65
+		SetRegName(BPMEM_LOADTLUT1);
+		// TODO: Description
+		break;
+
+	case BPMEM_TEXINVALIDATE: // 0x66
+		SetRegName(BPMEM_TEXINVALIDATE);
+		// TODO: Description
+		break;
+
+	case BPMEM_PERF1: // 0x67
+		SetRegName(BPMEM_PERF1);
+		// TODO: Description
+		break;
+
+	case BPMEM_FIELDMODE: // 0x68
+		SetRegName(BPMEM_FIELDMODE);
+		// TODO: Description
+		break;
+
+	case BPMEM_BUSCLOCK1: // 0x69
+		SetRegName(BPMEM_BUSCLOCK1);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETMODE0: // 0x80
+	case BPMEM_TX_SETMODE0+1:
+	case BPMEM_TX_SETMODE0+2:
+	case BPMEM_TX_SETMODE0+3:
+		SetRegName(BPMEM_TX_SETMODE0);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETMODE1: // 0x84
+	case BPMEM_TX_SETMODE1+1:
+	case BPMEM_TX_SETMODE1+2:
+	case BPMEM_TX_SETMODE1+3:
+		SetRegName(BPMEM_TX_SETMODE1);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETIMAGE0: // 0x88
+	case BPMEM_TX_SETIMAGE0+1:
+	case BPMEM_TX_SETIMAGE0+2:
+	case BPMEM_TX_SETIMAGE0+3:
+	case BPMEM_TX_SETIMAGE0_4: // 0xA8
+	case BPMEM_TX_SETIMAGE0_4+1:
+	case BPMEM_TX_SETIMAGE0_4+2:
+	case BPMEM_TX_SETIMAGE0_4+3:
+		SetRegName(BPMEM_TX_SETIMAGE0);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETIMAGE1: // 0x8C
+	case BPMEM_TX_SETIMAGE1+1:
+	case BPMEM_TX_SETIMAGE1+2:
+	case BPMEM_TX_SETIMAGE1+3:
+	case BPMEM_TX_SETIMAGE1_4: // 0xAC
+	case BPMEM_TX_SETIMAGE1_4+1:
+	case BPMEM_TX_SETIMAGE1_4+2:
+	case BPMEM_TX_SETIMAGE1_4+3:
+		SetRegName(BPMEM_TX_SETIMAGE1);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETIMAGE2: // 0x90
+	case BPMEM_TX_SETIMAGE2+1:
+	case BPMEM_TX_SETIMAGE2+2:
+	case BPMEM_TX_SETIMAGE2+3:
+	case BPMEM_TX_SETIMAGE2_4: // 0xB0
+	case BPMEM_TX_SETIMAGE2_4+1:
+	case BPMEM_TX_SETIMAGE2_4+2:
+	case BPMEM_TX_SETIMAGE2_4+3:
+		SetRegName(BPMEM_TX_SETIMAGE2);
+		// TODO: Description
+		break;
+
+	case BPMEM_TX_SETIMAGE3: // 0x94
+	case BPMEM_TX_SETIMAGE3+1:
+	case BPMEM_TX_SETIMAGE3+2:
+	case BPMEM_TX_SETIMAGE3+3:
+	case BPMEM_TX_SETIMAGE3_4: // 0xB4
+	case BPMEM_TX_SETIMAGE3_4+1:
+	case BPMEM_TX_SETIMAGE3_4+2:
+	case BPMEM_TX_SETIMAGE3_4+3:
+		{
+			SetRegName(BPMEM_TX_SETIMAGE3);
+			TexImage3 teximg; teximg.hex = cmddata;
+			*desc = StringFromFormat("Source address (32 byte aligned): 0x%06X", teximg.image_base << 5);
+		}
+		break;
+
+	case BPMEM_TX_SETTLUT: // 0x98
+	case BPMEM_TX_SETTLUT+1:
+	case BPMEM_TX_SETTLUT+2:
+	case BPMEM_TX_SETTLUT+3:
+	case BPMEM_TX_SETTLUT_4: // 0xB8
+	case BPMEM_TX_SETTLUT_4+1:
+	case BPMEM_TX_SETTLUT_4+2:
+	case BPMEM_TX_SETTLUT_4+3:
+		SetRegName(BPMEM_TX_SETTLUT);
+		// TODO: Description
+		break;
+
+	case BPMEM_TEV_COLOR_ENV: // 0xC0
+	case BPMEM_TEV_COLOR_ENV+2:
+	case BPMEM_TEV_COLOR_ENV+4:
+	case BPMEM_TEV_COLOR_ENV+8:
+	case BPMEM_TEV_COLOR_ENV+10:
+	case BPMEM_TEV_COLOR_ENV+12:
+	case BPMEM_TEV_COLOR_ENV+14:
+	case BPMEM_TEV_COLOR_ENV+16:
+	case BPMEM_TEV_COLOR_ENV+18:
+	case BPMEM_TEV_COLOR_ENV+20:
+	case BPMEM_TEV_COLOR_ENV+22:
+	case BPMEM_TEV_COLOR_ENV+24:
+	case BPMEM_TEV_COLOR_ENV+26:
+	case BPMEM_TEV_COLOR_ENV+28:
+	case BPMEM_TEV_COLOR_ENV+30:
+		{
+			SetRegName(BPMEM_TEV_COLOR_ENV);
+			TevStageCombiner::ColorCombiner cc; cc.hex = cmddata;
+			const char* tevin[] =
+			{
+				"prev.rgb", "prev.aaa",
+				"c0.rgb", "c0.aaa",
+				"c1.rgb", "c1.aaa",
+				"c2.rgb", "c2.aaa",
+				"tex.rgb", "tex.aaa",
+				"ras.rgb", "ras.aaa",
+				"ONE", "HALF", "konst.rgb", "ZERO",
+			};
+			const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" };
+			const char* tevop[] = { "add", "sub" };
+			const char* tevscale[] = { "1", "2", "4", "0.5" };
+			const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" };
+			*desc = StringFromFormat("Tev stage: %d\n"
+			                         "a: %s\n"
+			                         "b: %s\n"
+			                         "c: %s\n"
+			                         "d: %s\n"
+			                         "Bias: %s\n"
+			                         "Op: %s\n"
+			                         "Clamp: %s\n"
+			                         "Scale factor: %s\n"
+			                         "Dest: %s\n",
+			                         (data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d],
+			                         tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]);
+			break;
+		}
+
+	case BPMEM_TEV_ALPHA_ENV: // 0xC1
+	case BPMEM_TEV_ALPHA_ENV+2:
+	case BPMEM_TEV_ALPHA_ENV+4:
+	case BPMEM_TEV_ALPHA_ENV+6:
+	case BPMEM_TEV_ALPHA_ENV+8:
+	case BPMEM_TEV_ALPHA_ENV+10:
+	case BPMEM_TEV_ALPHA_ENV+12:
+	case BPMEM_TEV_ALPHA_ENV+14:
+	case BPMEM_TEV_ALPHA_ENV+16:
+	case BPMEM_TEV_ALPHA_ENV+18:
+	case BPMEM_TEV_ALPHA_ENV+20:
+	case BPMEM_TEV_ALPHA_ENV+22:
+	case BPMEM_TEV_ALPHA_ENV+24:
+	case BPMEM_TEV_ALPHA_ENV+26:
+	case BPMEM_TEV_ALPHA_ENV+28:
+	case BPMEM_TEV_ALPHA_ENV+30:
+		{
+			SetRegName(BPMEM_TEV_ALPHA_ENV);
+			TevStageCombiner::AlphaCombiner ac; ac.hex = cmddata;
+			const char* tevin[] =
+			{
+				"prev", "c0", "c1", "c2",
+				"tex", "ras", "konst", "ZERO",
+			};
+			const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" };
+			const char* tevop[] = { "add", "sub" };
+			const char* tevscale[] = { "1", "2", "4", "0.5" };
+			const char* tevout[] = { "prev", "c0", "c1", "c2" };
+			*desc = StringFromFormat("Tev stage: %d\n"
+			                         "a: %s\n"
+			                         "b: %s\n"
+			                         "c: %s\n"
+			                         "d: %s\n"
+			                         "Bias: %s\n"
+			                         "Op: %s\n"
+			                         "Clamp: %s\n"
+			                         "Scale factor: %s\n"
+			                         "Dest: %s\n"
+			                         "Ras sel: %d\n"
+			                         "Tex sel: %d\n",
+			                         (data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d],
+			                         tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest],
+			                         ac.rswap, ac.tswap);
+			break;
+		}
+
+	case BPMEM_TEV_COLOR_RA: // 0xE0
+	case BPMEM_TEV_COLOR_RA + 2: // 0xE2
+	case BPMEM_TEV_COLOR_RA + 4: // 0xE4
+	case BPMEM_TEV_COLOR_RA + 6: // 0xE6
+		SetRegName(BPMEM_TEV_COLOR_RA);
+		// TODO: Description
+		break;
+
+	case BPMEM_TEV_COLOR_BG: // 0xE1
+	case BPMEM_TEV_COLOR_BG + 2: // 0xE3
+	case BPMEM_TEV_COLOR_BG + 4: // 0xE5
+	case BPMEM_TEV_COLOR_BG + 6: // 0xE7
+		SetRegName(BPMEM_TEV_COLOR_BG);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGRANGE: // 0xE8
+	case BPMEM_FOGRANGE+1:
+	case BPMEM_FOGRANGE+2:
+	case BPMEM_FOGRANGE+3:
+	case BPMEM_FOGRANGE+4:
+	case BPMEM_FOGRANGE+5:
+		SetRegName(BPMEM_FOGRANGE);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGPARAM0: // 0xEE
+		SetRegName(BPMEM_FOGPARAM0);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGBMAGNITUDE: // 0xEF
+		SetRegName(BPMEM_FOGBMAGNITUDE);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGBEXPONENT: // 0xF0
+		SetRegName(BPMEM_FOGBEXPONENT);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGPARAM3: // 0xF1
+		SetRegName(BPMEM_FOGPARAM3);
+		// TODO: Description
+		break;
+
+	case BPMEM_FOGCOLOR: // 0xF2
+		SetRegName(BPMEM_FOGCOLOR);
+		// TODO: Description
+		break;
+
+	case BPMEM_ALPHACOMPARE: // 0xF3
+		{
+			SetRegName(BPMEM_ALPHACOMPARE);
+			AlphaTest test; test.hex = cmddata;
+			const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" };
+			const char* logic[] = { "AND", "OR", "XOR", "XNOR" };
+			*desc = StringFromFormat("Test 1: %s (ref: %#02x)\n"
+			                         "Test 2: %s (ref: %#02x)\n"
+			                         "Logic: %s\n",
+			                         functions[test.comp0], (int)test.ref0, functions[test.comp1], (int)test.ref1, logic[test.logic]);
+			break;
+		}
+
+	case BPMEM_BIAS: // 0xF4
+		SetRegName(BPMEM_BIAS);
+		// TODO: Description
+		break;
+
+	case BPMEM_ZTEX2: // 0xF5
+		SetRegName(BPMEM_ZTEX2);
+		// TODO: Description
+		break;
+
+	case BPMEM_TEV_KSEL: // 0xF6
+	case BPMEM_TEV_KSEL+1:
+	case BPMEM_TEV_KSEL+2:
+	case BPMEM_TEV_KSEL+3:
+	case BPMEM_TEV_KSEL+4:
+	case BPMEM_TEV_KSEL+5:
+	case BPMEM_TEV_KSEL+6:
+	case BPMEM_TEV_KSEL+7:
+		SetRegName(BPMEM_TEV_KSEL);
+		// TODO: Description
+		break;
+
+#undef SetRegName
+	}
+}
+
+// Called when loading a saved state.
+void BPReload()
+{
+	// restore anything that goes straight to the renderer.
+	// let's not risk actually replaying any writes.
+	// note that PixelShaderManager is already covered since it has its own DoState.
+	SetGenerationMode();
+	SetScissor();
+	SetDepthMode();
+	SetLogicOpMode();
+	SetDitherMode();
+	SetBlendMode();
+	SetColorMask();
+	OnPixelFormatChange();
+}
diff --git a/Source/Core/VideoCommon/BPStructs.h b/Source/Core/VideoCommon/BPStructs.h
new file mode 100644
index 0000000000..6721cbefe9
--- /dev/null
+++ b/Source/Core/VideoCommon/BPStructs.h
@@ -0,0 +1,10 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/BPMemory.h"
+
+void BPInit();
+void BPReload();
diff --git a/Source/Core/VideoCommon/BoundingBox.cpp b/Source/Core/VideoCommon/BoundingBox.cpp
new file mode 100644
index 0000000000..f1bf5d066e
--- /dev/null
+++ b/Source/Core/VideoCommon/BoundingBox.cpp
@@ -0,0 +1,29 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SetupUnit.h"
+#include "VideoBackends/Software/TransformUnit.h"
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/PixelShaderManager.h"
+
+
+namespace BoundingBox
+{
+
+// External vars
+bool active = false;
+u16 coords[4] = { 0x80, 0xA0, 0x80, 0xA0 };
+
+// Save state
+void DoState(PointerWrap &p)
+{
+	p.Do(active);
+	p.Do(coords);
+}
+
+} // namespace BoundingBox
diff --git a/Source/Core/VideoCommon/BoundingBox.h b/Source/Core/VideoCommon/BoundingBox.h
new file mode 100644
index 0000000000..af649b8971
--- /dev/null
+++ b/Source/Core/VideoCommon/BoundingBox.h
@@ -0,0 +1,31 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/VertexLoader.h"
+
+// Bounding Box manager
+
+namespace BoundingBox
+{
+
+// Determines if bounding box is active
+extern bool active;
+
+// Bounding box current coordinates
+extern u16 coords[4];
+
+enum
+{
+	LEFT   = 0,
+	RIGHT  = 1,
+	TOP    = 2,
+	BOTTOM = 3
+};
+
+// Save state
+void DoState(PointerWrap &p);
+
+}; // end of namespace BoundingBox
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 8503377779..f3ef98a741 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -1,72 +1,66 @@
-set(SRCS	Src/BPFunctions.cpp
-			Src/BPMemory.cpp
-			Src/BPStructs.cpp
-			Src/CPMemory.cpp
-			Src/CommandProcessor.cpp
-			Src/Debugger.cpp
-			Src/DriverDetails.cpp
-			Src/Fifo.cpp
-			Src/FPSCounter.cpp
-			Src/FramebufferManagerBase.cpp
-			Src/HiresTextures.cpp
-			Src/ImageWrite.cpp
-			Src/IndexGenerator.cpp
-			Src/MainBase.cpp
-			Src/OnScreenDisplay.cpp
-			Src/OpcodeDecoding.cpp
-			Src/OpenCL.cpp
-			Src/OpenCL/OCLTextureDecoder.cpp
-			Src/PerfQueryBase.cpp
-			Src/PixelEngine.cpp
-			Src/PixelShaderGen.cpp
-			Src/PixelShaderManager.cpp
-			Src/RenderBase.cpp
-			Src/Statistics.cpp
-			Src/TextureCacheBase.cpp
-			Src/TextureConversionShader.cpp
-			Src/VertexLoader.cpp
-			Src/VertexLoaderManager.cpp
-			Src/VertexLoader_Color.cpp
-			Src/VertexLoader_Normal.cpp
-			Src/VertexLoader_Position.cpp
-			Src/VertexLoader_TextCoord.cpp
-			Src/VertexManagerBase.cpp
-			Src/VertexShaderGen.cpp
-			Src/VertexShaderManager.cpp
-			Src/VideoBackendBase.cpp
-			Src/VideoConfig.cpp
-			Src/VideoState.cpp
-			Src/XFMemory.cpp
-			Src/XFStructs.cpp
-			Src/memcpy_amd.cpp)
+set(SRCS	AsyncRequests.cpp
+			BoundingBox.cpp
+			BPFunctions.cpp
+			BPMemory.cpp
+			BPStructs.cpp
+			CPMemory.cpp
+			CommandProcessor.cpp
+			Debugger.cpp
+			DriverDetails.cpp
+			Fifo.cpp
+			FPSCounter.cpp
+			FramebufferManagerBase.cpp
+			GeometryShaderGen.cpp
+			GeometryShaderManager.cpp
+			HiresTextures.cpp
+			ImageWrite.cpp
+			IndexGenerator.cpp
+			MainBase.cpp
+			OnScreenDisplay.cpp
+			OpcodeDecoding.cpp
+			PerfQueryBase.cpp
+			PixelEngine.cpp
+			PixelShaderGen.cpp
+			PixelShaderManager.cpp
+			PostProcessing.cpp
+			RenderBase.cpp
+			Statistics.cpp
+			TextureCacheBase.cpp
+			TextureConversionShader.cpp
+			TextureDecoder_Common.cpp
+			VertexLoader.cpp
+			VertexLoaderBase.cpp
+			VertexLoaderManager.cpp
+			VertexLoader_Color.cpp
+			VertexLoader_Normal.cpp
+			VertexLoader_Position.cpp
+			VertexLoader_TextCoord.cpp
+			VertexManagerBase.cpp
+			VertexShaderGen.cpp
+			VertexShaderManager.cpp
+			VideoBackendBase.cpp
+			VideoConfig.cpp
+			VideoState.cpp
+			XFMemory.cpp
+			XFStructs.cpp)
+set(LIBS core png)
 
-set(LIBS core)
-
-if(NOT _M_GENERIC)
-	set(SRCS ${SRCS}	Src/x64TextureDecoder.cpp
-						Src/x64DLCache.cpp)
+if(_M_X86)
+	set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp)
+elseif(_M_ARM_64)
+	set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp)
 else()
-	set(SRCS ${SRCS}	Src/GenericTextureDecoder.cpp
-						Src/GenericDLCache.cpp)
-endif()
-if(NOT ${CL} STREQUAL CL-NOTFOUND)
-	list(APPEND LIBS ${CL})
-endif()
-
-if(wxWidgets_FOUND AND WIN32)
-	set(SRCS ${SRCS} Src/EmuWindow.cpp)
+	set(SRCS ${SRCS} TextureDecoder_Generic.cpp)
 endif()
 
 if(LIBAV_FOUND OR WIN32)
-	set(SRCS ${SRCS} Src/AVIDump.cpp)
+	set(SRCS ${SRCS} AVIDump.cpp)
 endif()
 
-add_library(videocommon STATIC ${SRCS})
-target_link_libraries(videocommon ${LIBS})
+add_dolphin_library(videocommon "${SRCS}" "${LIBS}")
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	if(LIBAV_FOUND)
 		target_link_libraries(videocommon ${LIBS} ${LIBAV_LIBRARIES})
-		add_definitions(-D__STDC_CONSTANT_MACROS)
 	endif()
 endif()
diff --git a/Source/Core/VideoCommon/CPMemory.cpp b/Source/Core/VideoCommon/CPMemory.cpp
new file mode 100644
index 0000000000..5fc7bbe98d
--- /dev/null
+++ b/Source/Core/VideoCommon/CPMemory.cpp
@@ -0,0 +1,34 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "VideoCommon/CPMemory.h"
+
+// CP state
+CPState g_main_cp_state;
+CPState g_preprocess_cp_state;
+
+void DoCPState(PointerWrap& p)
+{
+	// We don't save g_preprocess_cp_state separately because the GPU should be
+	// synced around state save/load.
+	p.DoArray(g_main_cp_state.array_bases, 16);
+	p.DoArray(g_main_cp_state.array_strides, 16);
+	p.Do(g_main_cp_state.matrix_index_a);
+	p.Do(g_main_cp_state.matrix_index_b);
+	p.Do(g_main_cp_state.vtx_desc.Hex);
+	p.DoArray(g_main_cp_state.vtx_attr, 8);
+	p.DoMarker("CP Memory");
+	if (p.mode == PointerWrap::MODE_READ)
+	{
+		CopyPreprocessCPStateFromMain();
+		g_main_cp_state.bases_dirty = true;
+	}
+}
+
+void CopyPreprocessCPStateFromMain()
+{
+	memcpy(&g_preprocess_cp_state, &g_main_cp_state, sizeof(CPState));
+}
diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h
new file mode 100644
index 0000000000..491f818305
--- /dev/null
+++ b/Source/Core/VideoCommon/CPMemory.h
@@ -0,0 +1,276 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+
+// Vertex array numbers
+enum
+{
+	ARRAY_POSITION  = 0,
+	ARRAY_NORMAL    = 1,
+	ARRAY_COLOR     = 2,
+	ARRAY_COLOR2    = 3,
+	ARRAY_TEXCOORD0 = 4,
+};
+
+// Vertex components
+enum
+{
+	NOT_PRESENT  = 0,
+	DIRECT       = 1,
+	INDEX8       = 2,
+	INDEX16      = 3,
+
+	MASK_INDEXED = 2,
+};
+
+enum
+{
+	FORMAT_UBYTE   = 0, // 2 Cmp
+	FORMAT_BYTE    = 1, // 3 Cmp
+	FORMAT_USHORT  = 2,
+	FORMAT_SHORT   = 3,
+	FORMAT_FLOAT   = 4,
+};
+
+enum
+{
+	FORMAT_16B_565  = 0, // NA
+	FORMAT_24B_888  = 1,
+	FORMAT_32B_888x = 2,
+	FORMAT_16B_4444 = 3,
+	FORMAT_24B_6666 = 4,
+	FORMAT_32B_8888 = 5,
+};
+
+#pragma pack(4)
+union TVtxDesc
+{
+	u64 Hex;
+	struct
+	{
+		// 0: not present
+		// 1: present
+		u64 PosMatIdx   : 1;
+		u64 Tex0MatIdx  : 1;
+		u64 Tex1MatIdx  : 1;
+		u64 Tex2MatIdx  : 1;
+		u64 Tex3MatIdx  : 1;
+		u64 Tex4MatIdx  : 1;
+		u64 Tex5MatIdx  : 1;
+		u64 Tex6MatIdx  : 1;
+		u64 Tex7MatIdx  : 1;
+
+		// 00: not present
+		// 01: direct
+		// 10: 8 bit index
+		// 11: 16 bit index
+		u64 Position    : 2;
+		u64 Normal      : 2;
+		u64 Color0      : 2;
+		u64 Color1      : 2;
+		u64 Tex0Coord   : 2;
+		u64 Tex1Coord   : 2;
+		u64 Tex2Coord   : 2;
+		u64 Tex3Coord   : 2;
+		u64 Tex4Coord   : 2;
+		u64 Tex5Coord   : 2;
+		u64 Tex6Coord   : 2;
+		u64 Tex7Coord   : 2;
+		u64             :31;
+	};
+
+	struct
+	{
+		u32 Hex0, Hex1;
+	};
+
+	// Easily index into the Position..Tex7Coord fields.
+	u32 GetVertexArrayStatus(int idx)
+	{
+		return (Hex >> (9 + idx * 2)) & 0x3;
+	}
+};
+
+union UVAT_group0
+{
+	u32 Hex;
+	struct
+	{
+		// 0:8
+		u32 PosElements         : 1;
+		u32 PosFormat           : 3;
+		u32 PosFrac             : 5;
+		// 9:12
+		u32 NormalElements      : 1;
+		u32 NormalFormat        : 3;
+		// 13:16
+		u32 Color0Elements      : 1;
+		u32 Color0Comp          : 3;
+		// 17:20
+		u32 Color1Elements      : 1;
+		u32 Color1Comp          : 3;
+		// 21:29
+		u32 Tex0CoordElements   : 1;
+		u32 Tex0CoordFormat     : 3;
+		u32 Tex0Frac            : 5;
+		// 30:31
+		u32 ByteDequant         : 1;
+		u32 NormalIndex3        : 1;
+	};
+};
+
+union UVAT_group1
+{
+	u32 Hex;
+	struct
+	{
+		// 0:8
+		u32 Tex1CoordElements   : 1;
+		u32 Tex1CoordFormat     : 3;
+		u32 Tex1Frac            : 5;
+		// 9:17
+		u32 Tex2CoordElements   : 1;
+		u32 Tex2CoordFormat     : 3;
+		u32 Tex2Frac            : 5;
+		// 18:26
+		u32 Tex3CoordElements   : 1;
+		u32 Tex3CoordFormat     : 3;
+		u32 Tex3Frac            : 5;
+		// 27:30
+		u32 Tex4CoordElements   : 1;
+		u32 Tex4CoordFormat     : 3;
+		//
+		u32                     : 1;
+	};
+};
+
+union UVAT_group2
+{
+	u32 Hex;
+	struct
+	{
+		// 0:4
+		u32 Tex4Frac          : 5;
+		// 5:13
+		u32 Tex5CoordElements : 1;
+		u32 Tex5CoordFormat   : 3;
+		u32 Tex5Frac          : 5;
+		// 14:22
+		u32 Tex6CoordElements : 1;
+		u32 Tex6CoordFormat   : 3;
+		u32 Tex6Frac          : 5;
+		// 23:31
+		u32 Tex7CoordElements : 1;
+		u32 Tex7CoordFormat   : 3;
+		u32 Tex7Frac          : 5;
+	};
+};
+
+struct ColorAttr
+{
+	u8 Elements;
+	u8 Comp;
+};
+
+struct TexAttr
+{
+	u8 Elements;
+	u8 Format;
+	u8 Frac;
+};
+
+struct TVtxAttr
+{
+	u8 PosElements;
+	u8 PosFormat;
+	u8 PosFrac;
+	u8 NormalElements;
+	u8 NormalFormat;
+	ColorAttr color[2];
+	TexAttr texCoord[8];
+	bool ByteDequant;
+	u8 NormalIndex3;
+};
+
+// Matrix indices
+union TMatrixIndexA
+{
+	struct
+	{
+		u32 PosNormalMtxIdx : 6;
+		u32 Tex0MtxIdx : 6;
+		u32 Tex1MtxIdx : 6;
+		u32 Tex2MtxIdx : 6;
+		u32 Tex3MtxIdx : 6;
+	};
+	struct
+	{
+		u32 Hex : 30;
+		u32 unused : 2;
+	};
+};
+
+union TMatrixIndexB
+{
+	struct
+	{
+		u32 Tex4MtxIdx : 6;
+		u32 Tex5MtxIdx : 6;
+		u32 Tex6MtxIdx : 6;
+		u32 Tex7MtxIdx : 6;
+	};
+	struct
+	{
+		u32 Hex : 24;
+		u32 unused : 8;
+	};
+};
+
+#pragma pack()
+
+struct VAT
+{
+	UVAT_group0 g0;
+	UVAT_group1 g1;
+	UVAT_group2 g2;
+};
+
+class VertexLoaderBase;
+
+// STATE_TO_SAVE
+struct CPState final
+{
+	u32 array_bases[16];
+	u32 array_strides[16];
+	TMatrixIndexA matrix_index_a;
+	TMatrixIndexB matrix_index_b;
+	TVtxDesc vtx_desc;
+	// Most games only use the first VtxAttr and simply reconfigure it all the time as needed.
+	VAT vtx_attr[8];
+
+	// Attributes that actually belong to VertexLoaderManager:
+	BitSet32 attr_dirty;
+	bool bases_dirty;
+	VertexLoaderBase* vertex_loaders[8];
+};
+
+class PointerWrap;
+
+extern void DoCPState(PointerWrap& p);
+
+extern void CopyPreprocessCPStateFromMain();
+
+extern CPState g_main_cp_state;
+extern CPState g_preprocess_cp_state;
+
+
+// Might move this into its own file later.
+void LoadCPReg(u32 SubCmd, u32 Value, bool is_preprocess = false);
+
+// Fills memory with data from CP regs
+void FillCPMemoryArray(u32 *memory);
diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp
new file mode 100644
index 0000000000..e16484de4d
--- /dev/null
+++ b/Source/Core/VideoCommon/CommandProcessor.cpp
@@ -0,0 +1,546 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "Common/Thread.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace CommandProcessor
+{
+
+static int et_UpdateInterrupts;
+
+// TODO(ector): Warn on bbox read/write
+
+// STATE_TO_SAVE
+SCPFifoStruct fifo;
+static UCPStatusReg m_CPStatusReg;
+static UCPCtrlReg  m_CPCtrlReg;
+static UCPClearReg m_CPClearReg;
+
+static u16 m_bboxleft;
+static u16 m_bboxtop;
+static u16 m_bboxright;
+static u16 m_bboxbottom;
+static u16 m_tokenReg;
+
+static std::atomic<bool> s_interrupt_set;
+static std::atomic<bool> s_interrupt_waiting;
+static std::atomic<bool> s_interrupt_token_waiting;
+static std::atomic<bool> s_interrupt_finish_waiting;
+
+static bool IsOnThread()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
+}
+
+static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
+{
+	UpdateInterrupts(userdata);
+}
+
+void DoState(PointerWrap &p)
+{
+	p.DoPOD(m_CPStatusReg);
+	p.DoPOD(m_CPCtrlReg);
+	p.DoPOD(m_CPClearReg);
+	p.Do(m_bboxleft);
+	p.Do(m_bboxtop);
+	p.Do(m_bboxright);
+	p.Do(m_bboxbottom);
+	p.Do(m_tokenReg);
+	p.Do(fifo);
+
+	p.Do(s_interrupt_set);
+	p.Do(s_interrupt_waiting);
+	p.Do(s_interrupt_token_waiting);
+	p.Do(s_interrupt_finish_waiting);
+}
+
+static inline void WriteLow(volatile u32& _reg, u16 lowbits)
+{
+	Common::AtomicStore(_reg, (_reg & 0xFFFF0000) | lowbits);
+}
+static inline void WriteHigh(volatile u32& _reg, u16 highbits)
+{
+	Common::AtomicStore(_reg, (_reg & 0x0000FFFF) | ((u32)highbits << 16));
+}
+static inline u16 ReadLow(u32 _reg)
+{
+	return (u16)(_reg & 0xFFFF);
+}
+static inline u16 ReadHigh(u32 _reg)
+{
+	return (u16)(_reg >> 16);
+}
+
+void Init()
+{
+	m_CPStatusReg.Hex = 0;
+	m_CPStatusReg.CommandIdle = 1;
+	m_CPStatusReg.ReadIdle = 1;
+
+	m_CPCtrlReg.Hex = 0;
+
+	m_CPClearReg.Hex = 0;
+
+	m_bboxleft = 0;
+	m_bboxtop  = 0;
+	m_bboxright = 640;
+	m_bboxbottom = 480;
+
+	m_tokenReg = 0;
+
+	memset(&fifo,0,sizeof(fifo));
+	fifo.bFF_Breakpoint = 0;
+	fifo.bFF_HiWatermark = 0;
+	fifo.bFF_HiWatermarkInt = 0;
+	fifo.bFF_LoWatermark = 0;
+	fifo.bFF_LoWatermarkInt = 0;
+
+	s_interrupt_set.store(false);
+	s_interrupt_waiting.store(false);
+	s_interrupt_finish_waiting.store(false);
+	s_interrupt_token_waiting.store(false);
+
+	et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	struct {
+		u32 addr;
+		u16* ptr;
+		bool readonly;
+		bool writes_align_to_32_bytes;
+	} directly_mapped_vars[] = {
+		{ FIFO_TOKEN_REGISTER, &m_tokenReg },
+
+		// Bounding box registers are read only.
+		{ FIFO_BOUNDING_BOX_LEFT, &m_bboxleft, true },
+		{ FIFO_BOUNDING_BOX_RIGHT, &m_bboxright, true },
+		{ FIFO_BOUNDING_BOX_TOP, &m_bboxtop, true },
+		{ FIFO_BOUNDING_BOX_BOTTOM, &m_bboxbottom, true },
+
+		// Some FIFO addresses need to be aligned on 32 bytes on write - only
+		// the high part can be written directly without a mask.
+		{ FIFO_BASE_LO, MMIO::Utils::LowPart(&fifo.CPBase), false, true },
+		{ FIFO_BASE_HI, MMIO::Utils::HighPart(&fifo.CPBase) },
+		{ FIFO_END_LO, MMIO::Utils::LowPart(&fifo.CPEnd), false, true },
+		{ FIFO_END_HI, MMIO::Utils::HighPart(&fifo.CPEnd) },
+		{ FIFO_HI_WATERMARK_LO, MMIO::Utils::LowPart(&fifo.CPHiWatermark) },
+		{ FIFO_HI_WATERMARK_HI, MMIO::Utils::HighPart(&fifo.CPHiWatermark) },
+		{ FIFO_LO_WATERMARK_LO, MMIO::Utils::LowPart(&fifo.CPLoWatermark) },
+		{ FIFO_LO_WATERMARK_HI, MMIO::Utils::HighPart(&fifo.CPLoWatermark) },
+		// FIFO_RW_DISTANCE has some complex read code different for
+		// single/dual core.
+		{ FIFO_WRITE_POINTER_LO, MMIO::Utils::LowPart(&fifo.CPWritePointer), false, true },
+		{ FIFO_WRITE_POINTER_HI, MMIO::Utils::HighPart(&fifo.CPWritePointer) },
+		// FIFO_READ_POINTER has different code for single/dual core.
+	};
+
+	for (auto& mapped_var : directly_mapped_vars)
+	{
+		u16 wmask = mapped_var.writes_align_to_32_bytes ? 0xFFE0 : 0xFFFF;
+		mmio->Register(base | mapped_var.addr,
+			MMIO::DirectRead<u16>(mapped_var.ptr),
+			mapped_var.readonly
+				? MMIO::InvalidWrite<u16>()
+				: MMIO::DirectWrite<u16>(mapped_var.ptr, wmask)
+		);
+	}
+
+	mmio->Register(base | FIFO_BP_LO,
+		MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPBreakpoint)),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			WriteLow(fifo.CPBreakpoint, val & 0xffe0);
+		})
+	);
+	mmio->Register(base | FIFO_BP_HI,
+		MMIO::DirectRead<u16>(MMIO::Utils::HighPart(&fifo.CPBreakpoint)),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			WriteHigh(fifo.CPBreakpoint, val);
+		})
+	);
+
+	// Timing and metrics MMIOs are stubbed with fixed values.
+	struct {
+		u32 addr;
+		u16 value;
+	} metrics_mmios[] = {
+		{ XF_RASBUSY_L, 0 },
+		{ XF_RASBUSY_H, 0 },
+		{ XF_CLKS_L, 0 },
+		{ XF_CLKS_H, 0 },
+		{ XF_WAIT_IN_L, 0 },
+		{ XF_WAIT_IN_H, 0 },
+		{ XF_WAIT_OUT_L, 0 },
+		{ XF_WAIT_OUT_H, 0 },
+		{ VCACHE_METRIC_CHECK_L, 0 },
+		{ VCACHE_METRIC_CHECK_H, 0 },
+		{ VCACHE_METRIC_MISS_L, 0 },
+		{ VCACHE_METRIC_MISS_H, 0 },
+		{ VCACHE_METRIC_STALL_L, 0 },
+		{ VCACHE_METRIC_STALL_H, 0 },
+		{ CLKS_PER_VTX_OUT, 4 },
+	};
+	for (auto& metrics_mmio : metrics_mmios)
+	{
+		mmio->Register(base | metrics_mmio.addr,
+			MMIO::Constant<u16>(metrics_mmio.value),
+			MMIO::InvalidWrite<u16>()
+		);
+	}
+
+	mmio->Register(base | STATUS_REGISTER,
+		MMIO::ComplexRead<u16>([](u32) {
+			SetCpStatusRegister();
+			return m_CPStatusReg.Hex;
+		}),
+		MMIO::InvalidWrite<u16>()
+	);
+
+	mmio->Register(base | CTRL_REGISTER,
+		MMIO::DirectRead<u16>(&m_CPCtrlReg.Hex),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UCPCtrlReg tmp(val);
+			m_CPCtrlReg.Hex = tmp.Hex;
+			SetCpControlRegister();
+			RunGpu();
+		})
+	);
+
+	mmio->Register(base | CLEAR_REGISTER,
+		MMIO::DirectRead<u16>(&m_CPClearReg.Hex),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UCPClearReg tmp(val);
+			m_CPClearReg.Hex = tmp.Hex;
+			SetCpClearRegister();
+			RunGpu();
+		})
+	);
+
+	mmio->Register(base | PERF_SELECT,
+		MMIO::InvalidRead<u16>(),
+		MMIO::Nop<u16>()
+	);
+
+	// Some MMIOs have different handlers for single core vs. dual core mode.
+	mmio->Register(base | FIFO_RW_DISTANCE_LO,
+		IsOnThread()
+			? MMIO::ComplexRead<u16>([](u32) {
+				if (fifo.CPWritePointer >= fifo.SafeCPReadPointer)
+					return ReadLow(fifo.CPWritePointer - fifo.SafeCPReadPointer);
+				else
+					return ReadLow(fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
+			  })
+			: MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPReadWriteDistance)),
+		MMIO::DirectWrite<u16>(MMIO::Utils::LowPart(&fifo.CPReadWriteDistance), 0xFFE0)
+	);
+	mmio->Register(base | FIFO_RW_DISTANCE_HI,
+		IsOnThread()
+			? MMIO::ComplexRead<u16>([](u32) {
+				if (fifo.CPWritePointer >= fifo.SafeCPReadPointer)
+					return ReadHigh(fifo.CPWritePointer - fifo.SafeCPReadPointer);
+				else
+					return ReadHigh(fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
+			  })
+			: MMIO::DirectRead<u16>(MMIO::Utils::HighPart(&fifo.CPReadWriteDistance)),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			WriteHigh(fifo.CPReadWriteDistance, val);
+			SyncGPU(SYNC_GPU_OTHER);
+			if (fifo.CPReadWriteDistance == 0)
+			{
+				GPFifo::ResetGatherPipe();
+				ResetVideoBuffer();
+			}
+			else
+			{
+				ResetVideoBuffer();
+			}
+			RunGpu();
+		})
+	);
+	mmio->Register(base | FIFO_READ_POINTER_LO,
+		IsOnThread()
+			? MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.SafeCPReadPointer))
+			: MMIO::DirectRead<u16>(MMIO::Utils::LowPart(&fifo.CPReadPointer)),
+		MMIO::DirectWrite<u16>(MMIO::Utils::LowPart(&fifo.CPReadPointer), 0xFFE0)
+	);
+	mmio->Register(base | FIFO_READ_POINTER_HI,
+		IsOnThread()
+			? MMIO::DirectRead<u16>(MMIO::Utils::HighPart(&fifo.SafeCPReadPointer))
+			: MMIO::DirectRead<u16>(MMIO::Utils::HighPart(&fifo.CPReadPointer)),
+		IsOnThread()
+			? MMIO::ComplexWrite<u16>([](u32, u16 val) {
+				WriteHigh(fifo.CPReadPointer, val);
+				fifo.SafeCPReadPointer = fifo.CPReadPointer;
+			  })
+			: MMIO::DirectWrite<u16>(MMIO::Utils::HighPart(&fifo.CPReadPointer))
+	);
+}
+
+void GatherPipeBursted()
+{
+	if (IsOnThread())
+		SetCPStatusFromCPU();
+
+	ProcessFifoEvents();
+	// if we aren't linked, we don't care about gather pipe data
+	if (!m_CPCtrlReg.GPLinkEnable)
+	{
+		if (IsOnThread() && !g_use_deterministic_gpu_thread)
+		{
+			// In multibuffer mode is not allowed write in the same FIFO attached to the GPU.
+			// Fix Pokemon XD in DC mode.
+			if ((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) &&
+			    (ProcessorInterface::Fifo_CPUBase == fifo.CPBase) &&
+			    fifo.CPReadWriteDistance > 0)
+			{
+				FlushGpu();
+			}
+		}
+		RunGpu();
+		return;
+	}
+
+	// update the fifo pointer
+	if (fifo.CPWritePointer == fifo.CPEnd)
+		fifo.CPWritePointer = fifo.CPBase;
+	else
+		fifo.CPWritePointer += GATHER_PIPE_SIZE;
+
+	if (m_CPCtrlReg.GPReadEnable && m_CPCtrlReg.GPLinkEnable)
+	{
+		ProcessorInterface::Fifo_CPUWritePointer = fifo.CPWritePointer;
+		ProcessorInterface::Fifo_CPUBase = fifo.CPBase;
+		ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd;
+	}
+
+	// If the game is running close to overflowing, make the exception checking more frequent.
+	if (fifo.bFF_HiWatermark)
+		CoreTiming::ForceExceptionCheck(0);
+
+	Common::AtomicAdd(fifo.CPReadWriteDistance, GATHER_PIPE_SIZE);
+
+	RunGpu();
+
+	_assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase,
+	"FIFO is overflowed by GatherPipe !\nCPU thread is too fast!");
+
+	// check if we are in sync
+	_assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer == ProcessorInterface::Fifo_CPUWritePointer, "FIFOs linked but out of sync");
+	_assert_msg_(COMMANDPROCESSOR, fifo.CPBase         == ProcessorInterface::Fifo_CPUBase, "FIFOs linked but out of sync");
+	_assert_msg_(COMMANDPROCESSOR, fifo.CPEnd          == ProcessorInterface::Fifo_CPUEnd, "FIFOs linked but out of sync");
+}
+
+void UpdateInterrupts(u64 userdata)
+{
+	if (userdata)
+	{
+		s_interrupt_set.store(true);
+		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
+	}
+	else
+	{
+		s_interrupt_set.store(false);
+		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
+	}
+	CoreTiming::ForceExceptionCheck(0);
+	s_interrupt_waiting.store(false);
+	RunGpu();
+}
+
+void UpdateInterruptsFromVideoBackend(u64 userdata)
+{
+	if (!g_use_deterministic_gpu_thread)
+		CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
+}
+
+bool IsInterruptWaiting()
+{
+	return s_interrupt_waiting.load();
+}
+
+void SetInterruptTokenWaiting(bool waiting)
+{
+	s_interrupt_token_waiting.store(waiting);
+}
+
+void SetInterruptFinishWaiting(bool waiting)
+{
+	s_interrupt_finish_waiting.store(waiting);
+}
+
+void SetCPStatusFromGPU()
+{
+	// breakpoint
+	if (fifo.bFF_BPEnable)
+	{
+		if (fifo.CPBreakpoint == fifo.CPReadPointer)
+		{
+			if (!fifo.bFF_Breakpoint)
+			{
+				INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer);
+				fifo.bFF_Breakpoint = true;
+			}
+		}
+		else
+		{
+			if (fifo.bFF_Breakpoint)
+				INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer);
+			fifo.bFF_Breakpoint = false;
+		}
+	}
+	else
+	{
+		if (fifo.bFF_Breakpoint)
+			INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer);
+		fifo.bFF_Breakpoint = false;
+	}
+
+	// overflow & underflow check
+	fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark);
+	fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark);
+
+	bool bpInt = fifo.bFF_Breakpoint && fifo.bFF_BPInt;
+	bool ovfInt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt;
+	bool undfInt = fifo.bFF_LoWatermark && fifo.bFF_LoWatermarkInt;
+
+	bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable;
+
+	if (interrupt != s_interrupt_set.load() && !s_interrupt_waiting.load())
+	{
+		u64 userdata = interrupt ? 1 : 0;
+		if (IsOnThread())
+		{
+			if (!interrupt || bpInt || undfInt || ovfInt)
+			{
+				// Schedule the interrupt asynchronously
+				s_interrupt_waiting.store(true);
+				CommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
+			}
+		}
+		else
+		{
+			CommandProcessor::UpdateInterrupts(userdata);
+		}
+	}
+}
+
+void SetCPStatusFromCPU()
+{
+	// overflow & underflow check
+	fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark);
+	fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark);
+
+	bool bpInt = fifo.bFF_Breakpoint && fifo.bFF_BPInt;
+	bool ovfInt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt;
+	bool undfInt = fifo.bFF_LoWatermark && fifo.bFF_LoWatermarkInt;
+
+	bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable;
+
+	if (interrupt != s_interrupt_set.load() && !s_interrupt_waiting.load())
+	{
+		u64 userdata = interrupt ? 1 : 0;
+		if (IsOnThread())
+		{
+			if (!interrupt || bpInt || undfInt || ovfInt)
+			{
+				s_interrupt_set.store(interrupt);
+				INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
+				ProcessorInterface::SetInterrupt(INT_CAUSE_CP, interrupt);
+			}
+		}
+		else
+		{
+			CommandProcessor::UpdateInterrupts(userdata);
+		}
+	}
+}
+
+void ProcessFifoEvents()
+{
+	if (IsOnThread() && (s_interrupt_waiting.load() || s_interrupt_finish_waiting.load() || s_interrupt_token_waiting.load()))
+		CoreTiming::ProcessFifoWaitEvents();
+}
+
+void Shutdown()
+{
+
+}
+
+void SetCpStatusRegister()
+{
+	// Here always there is one fifo attached to the GPU
+	m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint;
+	m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance || (fifo.CPReadPointer == fifo.CPWritePointer);
+	m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || AtBreakpoint() || !fifo.bFF_GPReadEnable;
+	m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark;
+	m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark;
+
+	INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex);
+	DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s"
+		, m_CPStatusReg.Breakpoint           ? "ON" : "OFF"
+		, m_CPStatusReg.ReadIdle             ? "ON" : "OFF"
+		, m_CPStatusReg.CommandIdle          ? "ON" : "OFF"
+		, m_CPStatusReg.OverflowHiWatermark  ? "ON" : "OFF"
+		, m_CPStatusReg.UnderflowLoWatermark ? "ON" : "OFF"
+			);
+}
+
+void SetCpControlRegister()
+{
+	fifo.bFF_BPInt = m_CPCtrlReg.BPInt;
+	fifo.bFF_BPEnable = m_CPCtrlReg.BPEnable;
+	fifo.bFF_HiWatermarkInt = m_CPCtrlReg.FifoOverflowIntEnable;
+	fifo.bFF_LoWatermarkInt = m_CPCtrlReg.FifoUnderflowIntEnable;
+	fifo.bFF_GPLinkEnable = m_CPCtrlReg.GPLinkEnable;
+
+	if (fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable)
+	{
+		fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable;
+		FlushGpu();
+	}
+	else
+	{
+		fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable;
+	}
+
+	DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | BP %s | Int %s | OvF %s | UndF %s | LINK %s"
+		, fifo.bFF_GPReadEnable              ? "ON" : "OFF"
+		, fifo.bFF_BPEnable                  ? "ON" : "OFF"
+		, fifo.bFF_BPInt                     ? "ON" : "OFF"
+		, m_CPCtrlReg.FifoOverflowIntEnable  ? "ON" : "OFF"
+		, m_CPCtrlReg.FifoUnderflowIntEnable ? "ON" : "OFF"
+		, m_CPCtrlReg.GPLinkEnable           ? "ON" : "OFF"
+		);
+
+}
+
+// NOTE: We intentionally don't emulate this function at the moment.
+// We don't emulate proper GP timing anyway at the moment, so it would just slow down emulation.
+void SetCpClearRegister()
+{
+}
+
+} // end of namespace CommandProcessor
diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h
new file mode 100644
index 0000000000..d5061efd02
--- /dev/null
+++ b/Source/Core/VideoCommon/CommandProcessor.h
@@ -0,0 +1,146 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "Common/Flag.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+extern bool MT;
+
+namespace CommandProcessor
+{
+
+extern SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread.
+
+// internal hardware addresses
+enum
+{
+	STATUS_REGISTER          = 0x00,
+	CTRL_REGISTER            = 0x02,
+	CLEAR_REGISTER           = 0x04,
+	PERF_SELECT              = 0x06,
+	FIFO_TOKEN_REGISTER      = 0x0E,
+	FIFO_BOUNDING_BOX_LEFT   = 0x10,
+	FIFO_BOUNDING_BOX_RIGHT  = 0x12,
+	FIFO_BOUNDING_BOX_TOP    = 0x14,
+	FIFO_BOUNDING_BOX_BOTTOM = 0x16,
+	FIFO_BASE_LO             = 0x20,
+	FIFO_BASE_HI             = 0x22,
+	FIFO_END_LO              = 0x24,
+	FIFO_END_HI              = 0x26,
+	FIFO_HI_WATERMARK_LO     = 0x28,
+	FIFO_HI_WATERMARK_HI     = 0x2a,
+	FIFO_LO_WATERMARK_LO     = 0x2c,
+	FIFO_LO_WATERMARK_HI     = 0x2e,
+	FIFO_RW_DISTANCE_LO      = 0x30,
+	FIFO_RW_DISTANCE_HI      = 0x32,
+	FIFO_WRITE_POINTER_LO    = 0x34,
+	FIFO_WRITE_POINTER_HI    = 0x36,
+	FIFO_READ_POINTER_LO     = 0x38,
+	FIFO_READ_POINTER_HI     = 0x3A,
+	FIFO_BP_LO               = 0x3C,
+	FIFO_BP_HI               = 0x3E,
+	XF_RASBUSY_L             = 0x40,
+	XF_RASBUSY_H             = 0x42,
+	XF_CLKS_L                = 0x44,
+	XF_CLKS_H                = 0x46,
+	XF_WAIT_IN_L             = 0x48,
+	XF_WAIT_IN_H             = 0x4a,
+	XF_WAIT_OUT_L            = 0x4c,
+	XF_WAIT_OUT_H            = 0x4e,
+	VCACHE_METRIC_CHECK_L    = 0x50,
+	VCACHE_METRIC_CHECK_H    = 0x52,
+	VCACHE_METRIC_MISS_L     = 0x54,
+	VCACHE_METRIC_MISS_H     = 0x56,
+	VCACHE_METRIC_STALL_L    = 0x58,
+	VCACHE_METRIC_STALL_H    = 0x5A,
+	CLKS_PER_VTX_IN_L        = 0x60,
+	CLKS_PER_VTX_IN_H        = 0x62,
+	CLKS_PER_VTX_OUT         = 0x64,
+};
+
+enum
+{
+	GATHER_PIPE_SIZE = 32,
+	INT_CAUSE_CP =  0x800
+};
+
+// Fifo Status Register
+union UCPStatusReg
+{
+	struct
+	{
+		u16 OverflowHiWatermark  : 1;
+		u16 UnderflowLoWatermark : 1;
+		u16 ReadIdle             : 1;
+		u16 CommandIdle          : 1;
+		u16 Breakpoint           : 1;
+		u16                      : 11;
+	};
+	u16 Hex;
+	UCPStatusReg() {Hex = 0; }
+	UCPStatusReg(u16 _hex) {Hex = _hex; }
+};
+
+// Fifo Control Register
+union UCPCtrlReg
+{
+	struct
+	{
+		u16 GPReadEnable           : 1;
+		u16 BPEnable               : 1;
+		u16 FifoOverflowIntEnable  : 1;
+		u16 FifoUnderflowIntEnable : 1;
+		u16 GPLinkEnable           : 1;
+		u16 BPInt                  : 1;
+		u16                        : 10;
+	};
+	u16 Hex;
+	UCPCtrlReg() {Hex = 0; }
+	UCPCtrlReg(u16 _hex) {Hex = _hex; }
+};
+
+// Fifo Clear Register
+union UCPClearReg
+{
+	struct
+	{
+		u16 ClearFifoOverflow  : 1;
+		u16 ClearFifoUnderflow : 1;
+		u16 ClearMetrices      : 1;
+		u16                    : 13;
+	};
+	u16 Hex;
+	UCPClearReg() {Hex = 0; }
+	UCPClearReg(u16 _hex) {Hex = _hex; }
+};
+
+// Init
+void Init();
+void Shutdown();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+void SetCPStatusFromGPU();
+void SetCPStatusFromCPU();
+void GatherPipeBursted();
+void UpdateInterrupts(u64 userdata);
+void UpdateInterruptsFromVideoBackend(u64 userdata);
+
+bool IsInterruptWaiting();
+void SetInterruptTokenWaiting(bool waiting);
+void SetInterruptFinishWaiting(bool waiting);
+
+void SetCpClearRegister();
+void SetCpControlRegister();
+void SetCpStatusRegister();
+void ProcessFifoEvents();
+
+} // namespace CommandProcessor
diff --git a/Source/Core/VideoCommon/ConstantManager.h b/Source/Core/VideoCommon/ConstantManager.h
new file mode 100644
index 0000000000..e44fd55424
--- /dev/null
+++ b/Source/Core/VideoCommon/ConstantManager.h
@@ -0,0 +1,55 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+// all constant buffer attributes must be 16 bytes aligned, so this are the only allowed components:
+typedef float float4[4];
+typedef u32 uint4[4];
+typedef s32 int4[4];
+
+struct PixelShaderConstants
+{
+	int4 colors[4];
+	int4 kcolors[4];
+	int4 alpha;
+	float4 texdims[8];
+	int4 zbias[2];
+	int4 indtexscale[2];
+	int4 indtexmtx[6];
+	int4 fogcolor;
+	int4 fogi;
+	float4 fogf[2];
+	float4 zslope;
+	float4 efbscale;
+};
+
+struct VertexShaderConstants
+{
+	float4 posnormalmatrix[6];
+	float4 projection[4];
+	int4 materials[4];
+	struct Light
+	{
+		int4 color;
+		float4 cosatt;
+		float4 distatt;
+		float4 pos;
+		float4 dir;
+	} lights [8];
+	float4 texmatrices[24];
+	float4 transformmatrices[64];
+	float4 normalmatrices[32];
+	float4 posttransformmatrices[64];
+	float4 pixelcentercorrection;
+};
+
+struct GeometryShaderConstants
+{
+	float4 stereoparams;
+	float4 lineptparams;
+	int4 texoffset;
+};
diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h
new file mode 100644
index 0000000000..0737a9bf1d
--- /dev/null
+++ b/Source/Core/VideoCommon/DataReader.h
@@ -0,0 +1,65 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+
+class DataReader
+{
+public:
+	__forceinline DataReader()
+	: buffer(nullptr), end(nullptr) {}
+
+	__forceinline DataReader(u8* src, u8* _end)
+	: buffer(src), end(_end) {}
+
+	__forceinline u8* GetPointer()
+	{
+		return buffer;
+	}
+
+	__forceinline u8* operator=(u8* src)
+	{
+		buffer = src;
+		return src;
+	}
+
+	__forceinline size_t size()
+	{
+		return end - buffer;
+	}
+
+	template <typename T, bool swapped = true> __forceinline T Peek(int offset = 0)
+	{
+		T data = *(T*)(buffer + offset);
+		if (swapped)
+			data = Common::FromBigEndian(data);
+		return data;
+	}
+
+	template <typename T, bool swapped = true> __forceinline T Read()
+	{
+		const T result = Peek<T, swapped>();
+		buffer += sizeof(T);
+		return result;
+	}
+
+	template <typename T, bool swapped = false> __forceinline void Write(T data)
+	{
+		if (swapped)
+			data = Common::FromBigEndian(data);
+		*(T*)(buffer) = data;
+		buffer += sizeof(T);
+	}
+
+	template <typename T = u8> __forceinline void Skip(size_t data = 1)
+	{
+		buffer += sizeof(T) * data;
+	}
+
+private:
+	u8* __restrict buffer;
+	u8* end;
+};
diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp
new file mode 100644
index 0000000000..0c88be57f5
--- /dev/null
+++ b/Source/Core/VideoCommon/Debugger.cpp
@@ -0,0 +1,156 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+
+GFXDebuggerBase *g_pdebugger = nullptr;
+volatile bool GFXDebuggerPauseFlag = false; // if true, the GFX thread will be spin locked until it's false again
+volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; // Event which will trigger spin locking the GFX thread
+volatile int GFXDebuggerEventToPauseCount = 0; // Number of events to wait for until GFX thread will be paused
+
+void GFXDebuggerUpdateScreen()
+{
+	// TODO: Implement this in a backend-independent way
+/*	// update screen
+	if (D3D::bFrameInProgress)
+	{
+		D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
+		D3D::dev->SetDepthStencilSurface(nullptr);
+
+		D3D::dev->StretchRect(FramebufferManager::GetEFBColorRTSurface(), nullptr,
+			D3D::GetBackBufferSurface(), nullptr,
+			D3DTEXF_LINEAR);
+
+		D3D::dev->EndScene();
+		D3D::dev->Present(nullptr, nullptr, nullptr, nullptr);
+
+		D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
+		D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
+		D3D::dev->BeginScene();
+	}
+	else
+	{
+		D3D::dev->EndScene();
+		D3D::dev->Present(nullptr, nullptr, nullptr, nullptr);
+		D3D::dev->BeginScene();
+	}*/
+}
+
+// GFX thread
+void GFXDebuggerCheckAndPause(bool update)
+{
+	if (GFXDebuggerPauseFlag)
+	{
+		g_pdebugger->OnPause();
+		while ( GFXDebuggerPauseFlag )
+		{
+			if (update) GFXDebuggerUpdateScreen();
+			SLEEP(5);
+		}
+		g_pdebugger->OnContinue();
+	}
+}
+
+// GFX thread
+void GFXDebuggerToPause(bool update)
+{
+	GFXDebuggerToPauseAtNext = NOT_PAUSE;
+	GFXDebuggerPauseFlag = true;
+	GFXDebuggerCheckAndPause(update);
+}
+
+void ContinueGFXDebugger()
+{
+	GFXDebuggerPauseFlag = false;
+}
+
+
+void GFXDebuggerBase::DumpPixelShader(const std::string& path)
+{
+	const std::string filename = StringFromFormat("%sdump_ps.txt", path.c_str());
+
+	std::string output;
+	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
+	if (!useDstAlpha)
+	{
+		output = "Destination alpha disabled:\n";
+///		output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+	}
+	else
+	{
+		if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
+		{
+			output = "Using dual source blending for destination alpha:\n";
+///			output += GeneratePixelShaderCode(DSTALPHA_DUAL_SOURCE_BLEND, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+		}
+		else
+		{
+			output = "Using two passes for emulating destination alpha:\n";
+///			output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+			output += "\n\nDestination alpha pass shader:\n";
+///			output += GeneratePixelShaderCode(DSTALPHA_ALPHA_PASS, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+		}
+	}
+
+	File::CreateEmptyFile(filename);
+	File::WriteStringToFile(output, filename);
+}
+
+void GFXDebuggerBase::DumpVertexShader(const std::string& path)
+{
+	const std::string filename = StringFromFormat("%sdump_vs.txt", path.c_str());
+
+	File::CreateEmptyFile(filename);
+///	File::WriteStringToFile(GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
+}
+
+void GFXDebuggerBase::DumpPixelShaderConstants(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpVertexShaderConstants(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpTextures(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpFrameBuffer(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpGeometry(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpVertexDecl(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpMatrices(const std::string& path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpStats(const std::string& path)
+{
+	// TODO
+}
diff --git a/Source/Core/VideoCommon/Debugger.h b/Source/Core/VideoCommon/Debugger.h
new file mode 100644
index 0000000000..4147758983
--- /dev/null
+++ b/Source/Core/VideoCommon/Debugger.h
@@ -0,0 +1,66 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+class GFXDebuggerBase
+{
+public:
+	virtual ~GFXDebuggerBase() {}
+
+	// if paused, debugging functions can be enabled
+	virtual void OnPause() {}
+	virtual void OnContinue() {}
+
+	void DumpPixelShader(const std::string& path);
+	void DumpVertexShader(const std::string& path);
+	void DumpPixelShaderConstants(const std::string& path);
+	void DumpVertexShaderConstants(const std::string& path);
+	void DumpTextures(const std::string& path);
+	void DumpFrameBuffer(const std::string& path);
+	void DumpGeometry(const std::string& path);
+	void DumpVertexDecl(const std::string& path);
+	void DumpMatrices(const std::string& path);
+	void DumpStats(const std::string& path);
+};
+
+enum PauseEvent
+{
+	NOT_PAUSE                 = 0,
+	NEXT_FRAME                = 1<<0,
+	NEXT_FLUSH                = 1<<1,
+
+	NEXT_PIXEL_SHADER_CHANGE  = 1<<2,
+	NEXT_VERTEX_SHADER_CHANGE = 1<<3,
+	NEXT_TEXTURE_CHANGE       = 1<<4,
+	NEXT_NEW_TEXTURE          = 1<<5,
+
+	NEXT_XFB_CMD              = 1<<6,  // TODO
+	NEXT_EFB_CMD              = 1<<7,  // TODO
+
+	NEXT_MATRIX_CMD           = 1<<8,  // TODO
+	NEXT_VERTEX_CMD           = 1<<9,  // TODO
+	NEXT_TEXTURE_CMD          = 1<<10, // TODO
+	NEXT_LIGHT_CMD            = 1<<11, // TODO
+	NEXT_FOG_CMD              = 1<<12, // TODO
+
+	NEXT_SET_TLUT             = 1<<13, // TODO
+
+	NEXT_ERROR                = 1<<14, // TODO
+};
+
+extern GFXDebuggerBase *g_pdebugger;
+extern volatile bool GFXDebuggerPauseFlag;
+extern volatile PauseEvent GFXDebuggerToPauseAtNext;
+extern volatile int GFXDebuggerEventToPauseCount;
+void ContinueGFXDebugger();
+void GFXDebuggerCheckAndPause(bool update);
+void GFXDebuggerToPause(bool update);
+void GFXDebuggerUpdateScreen();
+
+#define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);}
+#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}}
+#define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}}
diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp
new file mode 100644
index 0000000000..aa2e34d184
--- /dev/null
+++ b/Source/Core/VideoCommon/DriverDetails.cpp
@@ -0,0 +1,117 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <map>
+
+#include "Common/Logging/LogManager.h"
+#include "VideoCommon/DriverDetails.h"
+
+namespace DriverDetails
+{
+	struct BugInfo
+	{
+		u32 m_os; // Which OS has the issue
+		Vendor m_vendor; // Which vendor has the error
+		Driver m_driver; // Which driver has the error
+		s32 m_family; // Which family of hardware has the issue
+		Bug m_bug; // Which bug it is
+		double m_versionstart; // When it started
+		double m_versionend; // When it ended
+		bool m_hasbug; // Does it have it?
+	};
+
+	// Local members
+#ifdef _WIN32
+	const u32 m_os = OS_ALL | OS_WINDOWS;
+#elif ANDROID
+	const u32 m_os = OS_ALL | OS_ANDROID;
+#elif __APPLE__
+	const u32 m_os = OS_ALL | OS_OSX;
+#elif __linux__
+	const u32 m_os = OS_ALL | OS_LINUX;
+#endif
+
+	static Vendor m_vendor = VENDOR_UNKNOWN;
+	static Driver m_driver = DRIVER_UNKNOWN;
+	static s32    m_family = 0;
+	static double m_version = 0.0;
+
+	// This is a list of all known bugs for each vendor
+	// We use this to check if the device and driver has a issue
+	static BugInfo m_known_bugs[] = {
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_NODYNUBOACCESS,      14.0, 94.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENCENTROID,      14.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENINFOLOG,       -1.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_ANNIHILATEDUBOS,     41.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENSWAP,          -1.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENTEXTURESIZE,   -1.0, 65.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENATTRIBUTELESS, -1.0, 94.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENNEGATEDBOOLEAN,-1.0, -1.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM,     -1, BUG_BROKENIVECSHIFTS,    -1.0, 46.0, true},
+		{OS_ALL,    VENDOR_ARM,      DRIVER_ARM,          -1, BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_NOUVEAU,      -1, BUG_BROKENUBO,           900,  916, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_R600,         -1, BUG_BROKENUBO,           900,  913, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_I965,         -1, BUG_BROKENUBO,           900,  920, true},
+		{OS_LINUX,  VENDOR_ATI,      DRIVER_ATI,          -1, BUG_BROKENPINNEDMEMORY,  -1.0, -1.0, true},
+		{OS_LINUX,  VENDOR_NVIDIA,   DRIVER_NVIDIA,       -1, BUG_BROKENBUFFERSTORAGE, -1.0, 33138.0, true},
+		{OS_OSX,    VENDOR_INTEL,    DRIVER_INTEL,      3000, BUG_PRIMITIVERESTART,    -1.0, -1.0, true},
+		{OS_WINDOWS,VENDOR_NVIDIA,   DRIVER_NVIDIA,       -1, BUG_BROKENUNSYNCMAPPING, -1.0, -1.0, true},
+		{OS_LINUX,  VENDOR_NVIDIA,   DRIVER_NVIDIA,       -1, BUG_BROKENUNSYNCMAPPING, -1.0, -1.0, true},
+		{OS_WINDOWS,VENDOR_INTEL,    DRIVER_INTEL,        -1, BUG_INTELBROKENBUFFERSTORAGE, 101810.3907, 101810.3960, true},
+	};
+
+	static std::map<Bug, BugInfo> m_bugs;
+
+	void Init(Vendor vendor, Driver driver, const double version, const s32 family)
+	{
+		m_vendor = vendor;
+		m_driver = driver;
+		m_version = version;
+		m_family = family;
+
+		if (driver == DRIVER_UNKNOWN)
+			switch (vendor)
+			{
+				case VENDOR_NVIDIA:
+				case VENDOR_TEGRA:
+					m_driver = DRIVER_NVIDIA;
+					break;
+				case VENDOR_ATI:
+					m_driver = DRIVER_ATI;
+					break;
+				case VENDOR_INTEL:
+					m_driver = DRIVER_INTEL;
+					break;
+				case VENDOR_IMGTEC:
+					m_driver = DRIVER_IMGTEC;
+					break;
+				case VENDOR_VIVANTE:
+					m_driver = DRIVER_VIVANTE;
+					break;
+				default:
+					break;
+			}
+
+		for (auto& bug : m_known_bugs)
+		{
+			if (( bug.m_os & m_os ) &&
+			    ( bug.m_vendor == m_vendor || bug.m_vendor == VENDOR_ALL ) &&
+			    ( bug.m_driver == m_driver || bug.m_driver == DRIVER_ALL ) &&
+			    ( bug.m_family == m_family || bug.m_family == -1) &&
+			    ( bug.m_versionstart <= m_version || bug.m_versionstart == -1 ) &&
+			    ( bug.m_versionend > m_version || bug.m_versionend == -1 )
+			)
+				m_bugs.insert(std::make_pair(bug.m_bug, bug));
+		}
+	}
+
+	bool HasBug(Bug bug)
+	{
+		auto it = m_bugs.find(bug);
+		if (it == m_bugs.end())
+			return false;
+		return it->second.m_hasbug;
+	}
+}
diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h
new file mode 100644
index 0000000000..86fc2b04b6
--- /dev/null
+++ b/Source/Core/VideoCommon/DriverDetails.h
@@ -0,0 +1,243 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+#pragma once
+#include "Common/CommonTypes.h"
+
+namespace DriverDetails
+{
+	// Enum of supported operating systems
+	enum OS
+	{
+		OS_ALL     = (1 << 0),
+		OS_WINDOWS = (1 << 1),
+		OS_LINUX   = (1 << 2),
+		OS_OSX     = (1 << 3),
+		OS_ANDROID = (1 << 4),
+	};
+	// Enum of known vendors
+	// Tegra and Nvidia are separated out due to such substantial differences
+	enum Vendor
+	{
+		VENDOR_ALL = 0,
+		VENDOR_NVIDIA,
+		VENDOR_ATI,
+		VENDOR_INTEL,
+		VENDOR_ARM,
+		VENDOR_QUALCOMM,
+		VENDOR_IMGTEC,
+		VENDOR_TEGRA,
+		VENDOR_VIVANTE,
+		VENDOR_MESA,
+		VENDOR_UNKNOWN
+	};
+
+	// Enum of known drivers
+	enum Driver
+	{
+		DRIVER_ALL = 0,
+		DRIVER_NVIDIA,       // Official Nvidia, including mobile GPU
+		DRIVER_NOUVEAU,      // OSS nouveau
+		DRIVER_ATI,          // Official ATI
+		DRIVER_R600,         // OSS Radeon
+		DRIVER_INTEL,        // Official Intel
+		DRIVER_I965,         // OSS Intel
+		DRIVER_ARM,          // Official Mali driver
+		DRIVER_LIMA,         // OSS Mali driver
+		DRIVER_QUALCOMM,     // Official Adreno driver
+		DRIVER_FREEDRENO,    // OSS Adreno driver
+		DRIVER_IMGTEC,       // Official PowerVR driver
+		DRIVER_VIVANTE,      // Official Vivante driver
+		DRIVER_UNKNOWN       // Unknown driver, default to official hardware driver
+	};
+
+	// Enum of known bugs
+	// These can be vendor specific, but we put them all in here
+	// For putting a new bug in here, make sure to put a detailed comment above the enum
+	// This'll ensure we know exactly what the issue is.
+	enum Bug
+	{
+		// Bug: No Dynamic UBO array object access
+		// Affected Devices: Qualcomm/Adreno
+		// Started Version: 14
+		// Ended Version: 95
+		// Accessing UBO array members dynamically causes the Adreno shader compiler to crash
+		// Errors out with "Internal Error"
+		// With v53 video drivers, dynamic member access "works." It works to the extent that it doesn't crash.
+		// With v95 drivers everything works as it should.
+		BUG_NODYNUBOACCESS = 0,
+		// Bug: Centroid is broken in shaders
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: 14
+		// Ended Version: 53
+		// Centroid in/out, used in the shaders, is used for multisample buffers to get the texel correctly
+		// When MSAA is disabled, it acts like a regular in/out
+		// Tends to cause the driver to render full white or black
+		BUG_BROKENCENTROID,
+		// Bug: INFO_LOG_LENGTH broken
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: ? (Noticed on v14)
+		// Ended Version: 53
+		// When compiling a shader, it is important that when it fails,
+		// you first get the length of the information log prior to grabbing it.
+		// This allows you to allocate an array to store all of the log
+		// Adreno devices /always/ return 0 when querying GL_INFO_LOG_LENGTH
+		// They also max out at 1024 bytes(1023 characters + null terminator) for the log
+		BUG_BROKENINFOLOG,
+		// Bug: UBO buffer offset broken
+		// Affected devices: all mesa drivers
+		// Started Version: 9.0 (mesa doesn't support ubo before)
+		// Ended Version: up to 9.2
+		// The offset of glBindBufferRange was ignored on all Mesa Gallium3D drivers until 9.1.3
+		// Nouveau stored the offset as u16 which isn't enough for all cases with range until 9.1.6
+		// I965 has broken data fetches from uniform buffers which results in a dithering until 9.2.0
+		BUG_BROKENUBO,
+		// Bug: The pinned memory extension isn't working for index buffers
+		// Affected devices: AMD as they are the only vendor providing this extension
+		// Started Version: ?
+		// Ended Version: 13.9 working for me (neobrain).
+		// Affected OS: Linux
+		// Pinned memory is disabled for index buffer as the AMD driver (the only one with pinned memory support) seems
+		// to be broken. We just get flickering/black rendering when using pinned memory here -- degasus - 2013/08/20
+		// This bug only happens when paired with base_vertex.
+		// Please see issue #6105 on Google Code. Let's hope buffer storage solves this issues.
+		// TODO: Detect broken drivers.
+		BUG_BROKENPINNEDMEMORY,
+		// Bug: Entirely broken UBOs
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: ? (Noticed on v45)
+		// Ended Version: 53
+		// Uniform buffers are entirely broken on Qualcomm drivers with v45
+		// Trying to use the uniform buffers causes a malloc to fail inside the driver
+		// To be safe, blanket drivers from v41 - v45
+		BUG_ANNIHILATEDUBOS,
+		// Bug : Can't draw on screen text and clear correctly.
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: ?
+		// Ended Version: 53
+		// Current code for drawing on screen text and clearing the framebuffer doesn't work on Adreno
+		// Drawing on screen text causes the whole screen to swizzle in a terrible fashion
+		// Clearing the framebuffer causes one to never see a frame.
+		BUG_BROKENSWAP,
+		// Bug: glBufferSubData/glMapBufferRange stalls + OOM
+		// Affected devices: Adreno a3xx/Mali-t6xx
+		// Started Version: -1
+		// Ended Version: -1
+		// Both Adreno and Mali have issues when you call glBufferSubData or glMapBufferRange
+		// The driver stalls in each instance no matter what you do
+		// Apparently Mali and Adreno share code in this regard since it was wrote by the same person.
+		BUG_BROKENBUFFERSTREAM,
+		// Bug: GLSL ES 3.0 textureSize causes abort
+		// Affected devices: Adreno a3xx
+		// Started Version: -1 (Noticed in v53)
+		// Ended Version: 66
+		// If a shader includes a textureSize function call then the shader compiler will call abort()
+		BUG_BROKENTEXTURESIZE,
+		// Bug: ARB_buffer_storage doesn't work with ARRAY_BUFFER type streams
+		// Affected devices: GeForce 4xx+
+		// Started Version: -1
+		// Ended Version: 332.21
+		// The buffer_storage streaming method is required for greater speed gains in our buffer streaming
+		// It reduces what is needed for streaming to basically a memcpy call
+		// It seems to work for all buffer types except GL_ARRAY_BUFFER
+		BUG_BROKENBUFFERSTORAGE,
+		// Bug: Intel HD 3000 on OS X has broken primitive restart
+		// Affected devices: Intel HD 3000
+		// Affected OS: OS X
+		// Started Version: -1
+		// Ended Version: -1
+		// The drivers on OS X has broken primitive restart.
+		// Intel HD 4000 series isn't affected by the bug
+		BUG_PRIMITIVERESTART,
+		// Bug: unsync mapping doesn't work fine
+		// Affected devices: Nvidia driver
+		// Started Version: -1
+		// Ended Version: -1
+		// The Nvidia driver (both Windows + Linux) doesn't like unsync mapping performance wise.
+		// Because of their threaded behavior, they seem not to handle unsync mapping complete unsync,
+		// in fact, they serialize the driver which adds a much bigger overhead.
+		// Workaround: Use BufferSubData
+		// TODO: some Windows AMD driver/GPU combination seems also affected
+		//       but as they all support pinned memory, it doesn't matter
+		BUG_BROKENUNSYNCMAPPING,
+		// Bug: Intel's Window driver broke buffer_storage with GL_ELEMENT_ARRAY_BUFFER
+		// Affected devices: Intel (Windows)
+		// Started Version: 15.36.3.64.3907 (10.18.10.3907)
+		// Ended Version: 15.36.7.64.3960 (10.18.10.3960)
+		// Intel implemented buffer_storage in their GL 4.3 driver.
+		// It works for all the buffer types we use except GL_ELEMENT_ARRAY_BUFFER.
+		// Causes complete blackscreen issues.
+		BUG_INTELBROKENBUFFERSTORAGE,
+		// Bug: Qualcomm has broken attributeless rendering
+		// Affected devices: Adreno
+		// Started Version: -1
+		// Ended Version: v66 (07-09-2014 dev version), v95 shipping
+		// Qualcomm has had attributeless rendering broken forever
+		// This was fixed in a v66 development version, the first shipping driver version with the release was v95.
+		// To be safe, make v95 the minimum version to work around this issue
+		BUG_BROKENATTRIBUTELESS,
+		// Bug: Qualcomm has broken boolean negation
+		// Affected devices: Adreno
+		// Started Version: -1
+		// Ended Version: -1
+		// Qualcomm has the boolean negation broken in their shader compiler
+		// Instead of inverting the boolean value it does a binary negation on the full 32bit register
+		// This causes a compare against zero to fail in their shader since it is no longer a 0 or 1 value
+		// but 0xFFFFFFFF or 0xFFFFFFFE depending on what the boolean value was before the negation.
+		//
+		// This bug has a secondary issue tied to it unlike other bugs.
+		// The correction of this bug is to check the boolean value against false which results in us
+		// not doing a negation of the source but instead checking against the boolean value we want.
+		// The issue with this is that Intel's Window driver is broken when checking if a boolean value is
+		// equal to true or false, so one has to do a boolean negation of the source
+		//
+		// eg.
+		// Broken on Qualcomm
+		// Works on Windows Intel
+		// if (!cond)
+		//
+		// Works on Qualcomm
+		// Broken on Windows Intel
+		// if (cond == false)
+		BUG_BROKENNEGATEDBOOLEAN,
+
+		// Bug: Qualcomm has broken ivec to scalar and ivec to ivec bitshifts
+		// Affected devices: Adreno
+		// Started Version: -1
+		// Ended Version: 46 (TODO: Test more devices, the real end is currently unknown)
+		// Qualcomm has broken integer vector to integer bitshifts, and integer vector to integer vector bitshifts
+		// A compilation error is generated when trying to compile the shaders.
+		//
+		// For example:
+		//	Broken on Qualcomm:
+		//		ivec4 ab = ivec4(1,1,1,1);
+		//		ab <<= 2;
+		//
+		//	Working on Qualcomm:
+		//		ivec4 ab = ivec4(1,1,1,1);
+		//		ab.x <<= 2;
+		//		ab.y <<= 2;
+		//		ab.z <<= 2;
+		//		ab.w <<= 2;
+		//
+		//	Broken on Qualcomm:
+		//		ivec4 ab = ivec4(1,1,1,1);
+		//		ivec4 cd = ivec4(1,2,3,4);
+		//		ab <<= cd;
+		//
+		//	Working on Qualcomm:
+		//		ivec4 ab = ivec4(1,1,1,1);
+		//		ivec4 cd = ivec4(1,2,3,4);
+		//		ab.x <<= cd.x;
+		//		ab.y <<= cd.y;
+		//		ab.z <<= cd.z;
+		//		ab.w <<= cd.w;
+		BUG_BROKENIVECSHIFTS,
+	};
+
+	// Initializes our internal vendor, device family, and driver version
+	void Init(Vendor vendor, Driver driver, const double version, const s32 family);
+
+	// Once Vendor and driver version is set, this will return if it has the applicable bug passed to it.
+	bool HasBug(Bug bug);
+}
diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp
new file mode 100644
index 0000000000..54817a7c0e
--- /dev/null
+++ b/Source/Core/VideoCommon/FPSCounter.cpp
@@ -0,0 +1,50 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <fstream>
+
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
+#include "VideoCommon/FPSCounter.h"
+#include "VideoCommon/VideoConfig.h"
+
+#define FPS_REFRESH_INTERVAL 1000
+
+FPSCounter::FPSCounter()
+	: m_fps(0)
+	, m_counter(0)
+	, m_fps_last_counter(0)
+{
+	m_update_time.Update();
+	m_render_time.Update();
+}
+
+void FPSCounter::LogRenderTimeToFile(u64 val)
+{
+	if (!m_bench_file.is_open())
+		m_bench_file.open(File::GetUserPath(D_LOGS_IDX) + "render_time.txt");
+
+	m_bench_file << val << std::endl;
+}
+
+int FPSCounter::Update()
+{
+	if (m_update_time.GetTimeDifference() >= FPS_REFRESH_INTERVAL)
+	{
+		m_update_time.Update();
+		m_fps = m_counter - m_fps_last_counter;
+		m_fps_last_counter = m_counter;
+		m_bench_file.flush();
+	}
+
+	if (g_ActiveConfig.bLogRenderTimeToFile)
+	{
+		LogRenderTimeToFile(m_render_time.GetTimeDifference());
+		m_render_time.Update();
+	}
+
+	m_counter++;
+	return m_fps;
+}
diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h
new file mode 100644
index 0000000000..21539099db
--- /dev/null
+++ b/Source/Core/VideoCommon/FPSCounter.h
@@ -0,0 +1,32 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <fstream>
+
+#include "Common/Timer.h"
+
+class FPSCounter
+{
+public:
+	unsigned int m_fps;
+
+	// Initializes the FPS counter.
+	FPSCounter();
+
+	// Called when a frame is rendered. Returns the value to be displayed on
+	// screen as the FPS counter (updated every second).
+	int Update();
+
+private:
+	unsigned int m_counter;
+	unsigned int m_fps_last_counter;
+	Common::Timer m_update_time;
+
+	Common::Timer m_render_time;
+	std::ofstream m_bench_file;
+
+	void LogRenderTimeToFile(u64 val);
+};
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp
new file mode 100644
index 0000000000..cf1e51219f
--- /dev/null
+++ b/Source/Core/VideoCommon/Fifo.cpp
@@ -0,0 +1,528 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+
+#include "Common/Atomic.h"
+#include "Common/BlockingLoop.h"
+#include "Common/ChunkFile.h"
+#include "Common/CPUDetect.h"
+#include "Common/Event.h"
+#include "Common/FPURoundMode.h"
+#include "Common/MemoryUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoCommon/AsyncRequests.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+bool g_bSkipCurrentFrame = false;
+
+static Common::BlockingLoop s_gpu_mainloop;
+
+static std::atomic<bool> s_emu_running_state;
+
+// Most of this array is unlikely to be faulted in...
+static u8 s_fifo_aux_data[FIFO_SIZE];
+static u8* s_fifo_aux_write_ptr;
+static u8* s_fifo_aux_read_ptr;
+
+bool g_use_deterministic_gpu_thread;
+
+// STATE_TO_SAVE
+static u8* s_video_buffer;
+static u8* s_video_buffer_read_ptr;
+static std::atomic<u8*> s_video_buffer_write_ptr;
+static std::atomic<u8*> s_video_buffer_seen_ptr;
+static u8* s_video_buffer_pp_read_ptr;
+// The read_ptr is always owned by the GPU thread.  In normal mode, so is the
+// write_ptr, despite it being atomic.  In g_use_deterministic_gpu_thread mode,
+// things get a bit more complicated:
+// - The seen_ptr is written by the GPU thread, and points to what it's already
+// processed as much of as possible - in the case of a partial command which
+// caused it to stop, not the same as the read ptr.  It's written by the GPU,
+// under the lock, and updating the cond.
+// - The write_ptr is written by the CPU thread after it copies data from the
+// FIFO.  Maybe someday it will be under the lock.  For now, because RunGpuLoop
+// polls, it's just atomic.
+// - The pp_read_ptr is the CPU preprocessing version of the read_ptr.
+
+static std::atomic<int> s_sync_ticks;
+static Common::Event s_sync_wakeup_event;
+
+void Fifo_DoState(PointerWrap &p)
+{
+	p.DoArray(s_video_buffer, FIFO_SIZE);
+	u8* write_ptr = s_video_buffer_write_ptr;
+	p.DoPointer(write_ptr, s_video_buffer);
+	s_video_buffer_write_ptr = write_ptr;
+	p.DoPointer(s_video_buffer_read_ptr, s_video_buffer);
+	if (p.mode == PointerWrap::MODE_READ && g_use_deterministic_gpu_thread)
+	{
+		// We're good and paused, right?
+		s_video_buffer_seen_ptr = s_video_buffer_pp_read_ptr = s_video_buffer_read_ptr;
+	}
+	p.Do(g_bSkipCurrentFrame);
+}
+
+void Fifo_PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	if (doLock)
+	{
+		SyncGPU(SYNC_GPU_OTHER);
+		EmulatorState(false);
+		FlushGpu();
+	}
+	else
+	{
+		if (unpauseOnUnlock)
+			EmulatorState(true);
+	}
+}
+
+
+void Fifo_Init()
+{
+	// Padded so that SIMD overreads in the vertex loader are safe
+	s_video_buffer = (u8*)AllocateMemoryPages(FIFO_SIZE + 4);
+	ResetVideoBuffer();
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+		s_gpu_mainloop.Prepare();
+	s_sync_ticks.store(0);
+}
+
+void Fifo_Shutdown()
+{
+	if (s_gpu_mainloop.IsRunning())
+		PanicAlert("Fifo shutting down while active");
+
+	FreeMemoryPages(s_video_buffer, FIFO_SIZE + 4);
+	s_video_buffer = nullptr;
+	s_video_buffer_write_ptr = nullptr;
+	s_video_buffer_pp_read_ptr = nullptr;
+	s_video_buffer_read_ptr = nullptr;
+	s_video_buffer_seen_ptr = nullptr;
+	s_fifo_aux_write_ptr = nullptr;
+	s_fifo_aux_read_ptr = nullptr;
+}
+
+void Fifo_SetRendering(bool enabled)
+{
+	g_bSkipCurrentFrame = !enabled;
+}
+
+// May be executed from any thread, even the graphics thread.
+// Created to allow for self shutdown.
+void ExitGpuLoop()
+{
+	// This should break the wait loop in CPU thread
+	CommandProcessor::fifo.bFF_GPReadEnable = false;
+	FlushGpu();
+
+	// Terminate GPU thread loop
+	s_emu_running_state.store(true);
+	s_gpu_mainloop.Stop(false);
+}
+
+void EmulatorState(bool running)
+{
+	s_emu_running_state.store(running);
+	s_gpu_mainloop.Wakeup();
+}
+
+void SyncGPU(SyncGPUReason reason, bool may_move_read_ptr)
+{
+	if (g_use_deterministic_gpu_thread)
+	{
+		s_gpu_mainloop.Wait();
+		if (!s_gpu_mainloop.IsRunning())
+			return;
+
+		// Opportunistically reset FIFOs so we don't wrap around.
+		if (may_move_read_ptr && s_fifo_aux_write_ptr != s_fifo_aux_read_ptr)
+			PanicAlert("aux fifo not synced (%p, %p)", s_fifo_aux_write_ptr, s_fifo_aux_read_ptr);
+
+		memmove(s_fifo_aux_data, s_fifo_aux_read_ptr, s_fifo_aux_write_ptr - s_fifo_aux_read_ptr);
+		s_fifo_aux_write_ptr -= (s_fifo_aux_read_ptr - s_fifo_aux_data);
+		s_fifo_aux_read_ptr = s_fifo_aux_data;
+
+		if (may_move_read_ptr)
+		{
+			u8* write_ptr = s_video_buffer_write_ptr;
+
+			// what's left over in the buffer
+			size_t size = write_ptr - s_video_buffer_pp_read_ptr;
+
+			memmove(s_video_buffer, s_video_buffer_pp_read_ptr, size);
+			// This change always decreases the pointers.  We write seen_ptr
+			// after write_ptr here, and read it before in RunGpuLoop, so
+			// 'write_ptr > seen_ptr' there cannot become spuriously true.
+			s_video_buffer_write_ptr = write_ptr = s_video_buffer + size;
+			s_video_buffer_pp_read_ptr = s_video_buffer;
+			s_video_buffer_read_ptr = s_video_buffer;
+			s_video_buffer_seen_ptr = write_ptr;
+		}
+	}
+}
+
+void PushFifoAuxBuffer(void* ptr, size_t size)
+{
+	if (size > (size_t) (s_fifo_aux_data + FIFO_SIZE - s_fifo_aux_write_ptr))
+	{
+		SyncGPU(SYNC_GPU_AUX_SPACE, /* may_move_read_ptr */ false);
+		if (!s_gpu_mainloop.IsRunning())
+		{
+			// GPU is shutting down
+			return;
+		}
+		if (size > (size_t) (s_fifo_aux_data + FIFO_SIZE - s_fifo_aux_write_ptr))
+		{
+			// That will sync us up to the last 32 bytes, so this short region
+			// of FIFO would have to point to a 2MB display list or something.
+			PanicAlert("absurdly large aux buffer");
+			return;
+		}
+	}
+	memcpy(s_fifo_aux_write_ptr, ptr, size);
+	s_fifo_aux_write_ptr += size;
+}
+
+void* PopFifoAuxBuffer(size_t size)
+{
+	void* ret = s_fifo_aux_read_ptr;
+	s_fifo_aux_read_ptr += size;
+	return ret;
+}
+
+// Description: RunGpuLoop() sends data through this function.
+static void ReadDataFromFifo(u32 readPtr)
+{
+	size_t len = 32;
+	if (len > (size_t)(s_video_buffer + FIFO_SIZE - s_video_buffer_write_ptr))
+	{
+		size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr;
+		if (len > (size_t)(FIFO_SIZE - existing_len))
+		{
+			PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE);
+			return;
+		}
+		memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len);
+		s_video_buffer_write_ptr = s_video_buffer + existing_len;
+		s_video_buffer_read_ptr = s_video_buffer;
+	}
+	// Copy new video instructions to s_video_buffer for future use in rendering the new picture
+	Memory::CopyFromEmu(s_video_buffer_write_ptr, readPtr, len);
+	s_video_buffer_write_ptr += len;
+}
+
+// The deterministic_gpu_thread version.
+static void ReadDataFromFifoOnCPU(u32 readPtr)
+{
+	size_t len = 32;
+	u8 *write_ptr = s_video_buffer_write_ptr;
+	if (len > (size_t)(s_video_buffer + FIFO_SIZE - write_ptr))
+	{
+		// We can't wrap around while the GPU is working on the data.
+		// This should be very rare due to the reset in SyncGPU.
+		SyncGPU(SYNC_GPU_WRAPAROUND);
+		if (!s_gpu_mainloop.IsRunning())
+		{
+			// GPU is shutting down, so the next asserts may fail
+			return;
+		}
+
+		if (s_video_buffer_pp_read_ptr != s_video_buffer_read_ptr)
+		{
+			PanicAlert("desynced read pointers");
+			return;
+		}
+		write_ptr = s_video_buffer_write_ptr;
+		size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr;
+		if (len > (size_t)(FIFO_SIZE - existing_len))
+		{
+			PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE);
+			return;
+		}
+	}
+	Memory::CopyFromEmu(s_video_buffer_write_ptr, readPtr, len);
+	s_video_buffer_pp_read_ptr = OpcodeDecoder_Run<true>(DataReader(s_video_buffer_pp_read_ptr, write_ptr + len), nullptr, false);
+	// This would have to be locked if the GPU thread didn't spin.
+	s_video_buffer_write_ptr = write_ptr + len;
+}
+
+void ResetVideoBuffer()
+{
+	s_video_buffer_read_ptr = s_video_buffer;
+	s_video_buffer_write_ptr = s_video_buffer;
+	s_video_buffer_seen_ptr = s_video_buffer;
+	s_video_buffer_pp_read_ptr = s_video_buffer;
+	s_fifo_aux_write_ptr = s_fifo_aux_data;
+	s_fifo_aux_read_ptr = s_fifo_aux_data;
+}
+
+
+// Description: Main FIFO update loop
+// Purpose: Keep the Core HW updated about the CPU-GPU distance
+void RunGpuLoop()
+{
+
+	AsyncRequests::GetInstance()->SetEnable(true);
+	AsyncRequests::GetInstance()->SetPassthrough(false);
+
+	s_gpu_mainloop.Run(
+	[] {
+		const SCoreStartupParameter& param = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+		g_video_backend->PeekMessages();
+
+		// Do nothing while paused
+		if (!s_emu_running_state.load())
+			return;
+
+		if (g_use_deterministic_gpu_thread)
+		{
+			AsyncRequests::GetInstance()->PullEvents();
+
+			// All the fifo/CP stuff is on the CPU.  We just need to run the opcode decoder.
+			u8* seen_ptr = s_video_buffer_seen_ptr;
+			u8* write_ptr = s_video_buffer_write_ptr;
+			// See comment in SyncGPU
+			if (write_ptr > seen_ptr)
+			{
+				s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, write_ptr), nullptr, false);
+				s_video_buffer_seen_ptr = write_ptr;
+			}
+		}
+		else
+		{
+			SCPFifoStruct &fifo = CommandProcessor::fifo;
+
+			AsyncRequests::GetInstance()->PullEvents();
+
+			CommandProcessor::SetCPStatusFromGPU();
+
+			// check if we are able to run this buffer
+			while (!CommandProcessor::IsInterruptWaiting() && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint())
+			{
+				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU && s_sync_ticks.load() < param.iSyncGpuMinDistance)
+					break;
+
+				u32 cyclesExecuted = 0;
+				u32 readPtr = fifo.CPReadPointer;
+				ReadDataFromFifo(readPtr);
+
+				if (readPtr == fifo.CPEnd)
+					readPtr = fifo.CPBase;
+				else
+					readPtr += 32;
+
+				_assert_msg_(COMMANDPROCESSOR, (s32)fifo.CPReadWriteDistance - 32 >= 0 ,
+					"Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instability in the game. Please report it.", fifo.CPReadWriteDistance - 32);
+
+				u8* write_ptr = s_video_buffer_write_ptr;
+				s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, write_ptr), &cyclesExecuted, false);
+
+				Common::AtomicStore(fifo.CPReadPointer, readPtr);
+				Common::AtomicAdd(fifo.CPReadWriteDistance, -32);
+				if ((write_ptr - s_video_buffer_read_ptr) == 0)
+					Common::AtomicStore(fifo.SafeCPReadPointer, fifo.CPReadPointer);
+
+				CommandProcessor::SetCPStatusFromGPU();
+
+				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
+				{
+					cyclesExecuted = (int)(cyclesExecuted / param.fSyncGpuOverclock);
+					int old = s_sync_ticks.fetch_sub(cyclesExecuted);
+					if (old > 0 && old - (int)cyclesExecuted <= 0)
+						s_sync_wakeup_event.Set();
+				}
+
+				// This call is pretty important in DualCore mode and must be called in the FIFO Loop.
+				// If we don't, s_swapRequested or s_efbAccessRequested won't be set to false
+				// leading the CPU thread to wait in Video_BeginField or Video_AccessEFB thus slowing things down.
+				AsyncRequests::GetInstance()->PullEvents();
+			}
+
+			// fast skip remaining GPU time if fifo is empty
+			if (s_sync_ticks.load() > 0)
+			{
+				int old = s_sync_ticks.exchange(0);
+				if (old > 0)
+					s_sync_wakeup_event.Set();
+			}
+
+			// The fifo is empty and it's unlikely we will get any more work in the near future.
+			// Make sure VertexManager finishes drawing any primitives it has stored in it's buffer.
+			VertexManager::Flush();
+		}
+	}, 100);
+
+	AsyncRequests::GetInstance()->SetEnable(false);
+	AsyncRequests::GetInstance()->SetPassthrough(true);
+}
+
+void FlushGpu()
+{
+	const SCoreStartupParameter& param = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (!param.bCPUThread || g_use_deterministic_gpu_thread)
+		return;
+
+	s_gpu_mainloop.Wait();
+}
+
+void GpuMaySleep()
+{
+	s_gpu_mainloop.AllowSleep();
+}
+
+bool AtBreakpoint()
+{
+	SCPFifoStruct &fifo = CommandProcessor::fifo;
+	return fifo.bFF_BPEnable && (fifo.CPReadPointer == fifo.CPBreakpoint);
+}
+
+void RunGpu()
+{
+	SCPFifoStruct &fifo = CommandProcessor::fifo;
+	const SCoreStartupParameter& param = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	// execute GPU
+	if (!param.bCPUThread || g_use_deterministic_gpu_thread)
+	{
+		bool reset_simd_state = false;
+		while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint() )
+		{
+			if (g_use_deterministic_gpu_thread)
+			{
+				ReadDataFromFifoOnCPU(fifo.CPReadPointer);
+				s_gpu_mainloop.Wakeup();
+			}
+			else
+			{
+				if (!reset_simd_state)
+				{
+					FPURoundMode::SaveSIMDState();
+					FPURoundMode::LoadDefaultSIMDState();
+					reset_simd_state = true;
+				}
+				ReadDataFromFifo(fifo.CPReadPointer);
+				s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, s_video_buffer_write_ptr), nullptr, false);
+			}
+
+			//DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base");
+
+			if (fifo.CPReadPointer == fifo.CPEnd)
+				fifo.CPReadPointer = fifo.CPBase;
+			else
+				fifo.CPReadPointer += 32;
+
+			fifo.CPReadWriteDistance -= 32;
+		}
+		CommandProcessor::SetCPStatusFromGPU();
+
+		if (reset_simd_state)
+		{
+			FPURoundMode::LoadSIMDState();
+		}
+	}
+
+	// wake up GPU thread
+	if (param.bCPUThread)
+	{
+		s_gpu_mainloop.Wakeup();
+	}
+}
+
+void Fifo_UpdateWantDeterminism(bool want)
+{
+	// We are paused (or not running at all yet), so
+	// it should be safe to change this.
+	const SCoreStartupParameter& param = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	bool gpu_thread = false;
+	switch (param.m_GPUDeterminismMode)
+	{
+		case GPU_DETERMINISM_AUTO:
+			gpu_thread = want;
+
+			// Hack: For now movies are an exception to this being on (but not
+			// to wanting determinism in general).  Once vertex arrays are
+			// fixed, there should be no reason to want this off for movies by
+			// default, so this can be removed.
+			if (!NetPlay::IsNetPlayRunning())
+				gpu_thread = false;
+
+			break;
+		case GPU_DETERMINISM_NONE:
+			gpu_thread = false;
+			break;
+		case GPU_DETERMINISM_FAKE_COMPLETION:
+			gpu_thread = true;
+			break;
+	}
+
+	gpu_thread = gpu_thread && param.bCPUThread;
+
+	if (g_use_deterministic_gpu_thread != gpu_thread)
+	{
+		g_use_deterministic_gpu_thread = gpu_thread;
+		if (gpu_thread)
+		{
+			// These haven't been updated in non-deterministic mode.
+			s_video_buffer_seen_ptr = s_video_buffer_pp_read_ptr = s_video_buffer_read_ptr;
+			CopyPreprocessCPStateFromMain();
+			VertexLoaderManager::MarkAllDirty();
+		}
+	}
+}
+
+int Fifo_Update(int ticks)
+{
+	const SCoreStartupParameter& param = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
+	if (ticks == 0)
+	{
+		FlushGpu();
+		return param.iSyncGpuMaxDistance;
+	}
+
+	// GPU is sleeping, so no need for synchronization
+	if (s_gpu_mainloop.IsDone() || g_use_deterministic_gpu_thread)
+	{
+		if (s_sync_ticks.load() < 0)
+		{
+			int old = s_sync_ticks.fetch_add(ticks);
+			if (old < param.iSyncGpuMinDistance && old + ticks >= param.iSyncGpuMinDistance)
+				RunGpu();
+		}
+		return param.iSyncGpuMaxDistance;
+	}
+
+	int old = s_sync_ticks.fetch_add(ticks);
+	if (old < param.iSyncGpuMinDistance && old + ticks >= param.iSyncGpuMinDistance)
+		RunGpu();
+
+	if (s_sync_ticks.load() >= param.iSyncGpuMaxDistance)
+	{
+		while (s_sync_ticks.load() > 0)
+		{
+			s_sync_wakeup_event.Wait();
+		}
+	}
+
+	return param.iSyncGpuMaxDistance - s_sync_ticks.load();
+}
diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h
new file mode 100644
index 0000000000..57980b24d1
--- /dev/null
+++ b/Source/Core/VideoCommon/Fifo.h
@@ -0,0 +1,53 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+class PointerWrap;
+
+#define FIFO_SIZE (2*1024*1024)
+
+extern bool g_bSkipCurrentFrame;
+
+// This could be in SCoreStartupParameter, but it depends on multiple settings
+// and can change at runtime.
+extern bool g_use_deterministic_gpu_thread;
+extern std::atomic<u8*> g_video_buffer_write_ptr_xthread;
+
+void Fifo_Init();
+void Fifo_Shutdown();
+void Fifo_DoState(PointerWrap &f);
+void Fifo_PauseAndLock(bool doLock, bool unpauseOnUnlock);
+void Fifo_UpdateWantDeterminism(bool want);
+
+// Used for diagnostics.
+enum SyncGPUReason
+{
+	SYNC_GPU_OTHER,
+	SYNC_GPU_WRAPAROUND,
+	SYNC_GPU_EFB_POKE,
+	SYNC_GPU_PERFQUERY,
+	SYNC_GPU_BBOX,
+	SYNC_GPU_SWAP,
+	SYNC_GPU_AUX_SPACE,
+};
+// In g_use_deterministic_gpu_thread mode, waits for the GPU to be done with pending work.
+void SyncGPU(SyncGPUReason reason, bool may_move_read_ptr = true);
+
+void PushFifoAuxBuffer(void* ptr, size_t size);
+void* PopFifoAuxBuffer(size_t size);
+
+void FlushGpu();
+void RunGpu();
+void GpuMaySleep();
+void RunGpuLoop();
+void ExitGpuLoop();
+void EmulatorState(bool running);
+bool AtBreakpoint();
+void ResetVideoBuffer();
+void Fifo_SetRendering(bool bEnabled);
+int Fifo_Update(int ticks);
diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
similarity index 76%
rename from Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
rename to Source/Core/VideoCommon/FramebufferManagerBase.cpp
index a975da624c..10d1cfa414 100644
--- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
+++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp
@@ -1,8 +1,11 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-#include "FramebufferManagerBase.h"
 
-#include "RenderBase.h"
-#include "VideoConfig.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"
 
 FramebufferManagerBase *g_framebuffer_manager;
 
@@ -13,9 +16,11 @@ const XFBSourceBase* FramebufferManagerBase::m_overlappingXFBArray[MAX_VIRTUAL_X
 unsigned int FramebufferManagerBase::s_last_xfb_width = 1;
 unsigned int FramebufferManagerBase::s_last_xfb_height = 1;
 
+unsigned int FramebufferManagerBase::m_EFBLayers = 1;
+
 FramebufferManagerBase::FramebufferManagerBase()
 {
-	m_realXFBSource = NULL;
+	m_realXFBSource = nullptr;
 
 	// can't hurt
 	memset(m_overlappingXFBArray, 0, sizeof(m_overlappingXFBArray));
@@ -23,34 +28,39 @@ FramebufferManagerBase::FramebufferManagerBase()
 
 FramebufferManagerBase::~FramebufferManagerBase()
 {
-	VirtualXFBListType::iterator
-		it = m_virtualXFBList.begin(),
-		vlend = m_virtualXFBList.end();
-	for (; it != vlend; ++it)
-		delete it->xfbSource;
-
+	for (VirtualXFB& vxfb : m_virtualXFBList)
+	{
+		delete vxfb.xfbSource;
+	}
 	m_virtualXFBList.clear();
 
 	delete m_realXFBSource;
 }
 
-const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount)
+const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP)
 {
 	if (!g_ActiveConfig.bUseXFB)
-		return NULL;
+		return nullptr;
 
 	if (g_ActiveConfig.bUseRealXFB)
-		return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
+		return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCountP);
 	else
-		return GetVirtualXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
+		return GetVirtualXFBSource(xfbAddr, fbWidth, fbHeight, xfbCountP);
 }
 
-const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount)
+const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP)
 {
-	xfbCount = 1;
+	*xfbCountP = 1;
+
+	// recreate if needed
+	if (m_realXFBSource && (m_realXFBSource->texWidth != fbWidth || m_realXFBSource->texHeight != fbHeight))
+	{
+		delete m_realXFBSource;
+		m_realXFBSource = nullptr;
+	}
 
 	if (!m_realXFBSource)
-		m_realXFBSource = g_framebuffer_manager->CreateXFBSource(fbWidth, fbHeight);
+		m_realXFBSource = g_framebuffer_manager->CreateXFBSource(fbWidth, fbHeight, 1);
 
 	m_realXFBSource->srcAddr = xfbAddr;
 
@@ -60,7 +70,6 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr
 	m_realXFBSource->texWidth = fbWidth;
 	m_realXFBSource->texHeight = fbHeight;
 
-	// TODO: stuff only used by OGL... :/
 	// OpenGL texture coordinates originate at the lower left, which is why
 	// sourceRc.top = fbHeight and sourceRc.bottom = 0.
 	m_realXFBSource->sourceRc.left = 0;
@@ -75,12 +84,12 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr
 	return &m_overlappingXFBArray[0];
 }
 
-const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount)
+const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP)
 {
-	xfbCount = 0;
+	u32 xfbCount = 0;
 
 	if (m_virtualXFBList.empty())  // no Virtual XFBs available
-		return NULL;
+		return nullptr;
 
 	u32 srcLower = xfbAddr;
 	u32 srcUpper = xfbAddr + 2 * fbWidth * fbHeight;
@@ -95,13 +104,14 @@ const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbA
 		u32 dstLower = vxfb->xfbAddr;
 		u32 dstUpper = vxfb->xfbAddr + 2 * vxfb->xfbWidth * vxfb->xfbHeight;
 
-		if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
+		if (AddressRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
 		{
 			m_overlappingXFBArray[xfbCount] = vxfb->xfbSource;
 			++xfbCount;
 		}
 	}
 
+	*xfbCountP = xfbCount;
 	return &m_overlappingXFBArray[0];
 }
 
@@ -122,9 +132,7 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe
 		if (m_virtualXFBList.size() < MAX_VIRTUAL_XFB)
 		{
 			// create a new Virtual XFB and place it at the front of the list
-			VirtualXFB v;
-			memset(&v, 0, sizeof v);
-			m_virtualXFBList.push_front(v);
+			m_virtualXFBList.emplace_front();
 			vxfb = m_virtualXFBList.begin();
 		}
 		else
@@ -140,18 +148,18 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe
 		m_virtualXFBList.splice(m_virtualXFBList.begin(), m_virtualXFBList, vxfb);
 
 	unsigned int target_width, target_height;
-	g_framebuffer_manager->GetTargetSize(&target_width, &target_height, sourceRc);
+	g_framebuffer_manager->GetTargetSize(&target_width, &target_height);
 
 	// recreate if needed
 	if (vxfb->xfbSource && (vxfb->xfbSource->texWidth != target_width || vxfb->xfbSource->texHeight != target_height))
 	{
-		//delete vxfb->xfbSource;
-		//vxfb->xfbSource = NULL;
+		delete vxfb->xfbSource;
+		vxfb->xfbSource = nullptr;
 	}
 
 	if (!vxfb->xfbSource)
 	{
-		vxfb->xfbSource = g_framebuffer_manager->CreateXFBSource(target_width, target_height);
+		vxfb->xfbSource = g_framebuffer_manager->CreateXFBSource(target_width, target_height, m_EFBLayers);
 		vxfb->xfbSource->texWidth = target_width;
 		vxfb->xfbSource->texHeight = target_height;
 	}
@@ -209,7 +217,7 @@ void FramebufferManagerBase::ReplaceVirtualXFB()
 			it->xfbHeight = 0;
 			it->xfbWidth = 0;
 		}
-		else if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
+		else if (AddressRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
 		{
 			s32 upperOverlap = (srcUpper - dstLower) / lineSize;
 			s32 lowerOverlap = (dstUpper - srcLower) / lineSize;
@@ -227,34 +235,18 @@ void FramebufferManagerBase::ReplaceVirtualXFB()
 	}
 }
 
-int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width)
+int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x)
 {
 	if (g_ActiveConfig.RealXFBEnabled())
 		return x;
 
-	if (g_ActiveConfig.b3DVision)
-	{
-		// This works, yet the version in the else doesn't. No idea why.
-		return x * (int)backbuffer_width / (int)FramebufferManagerBase::LastXfbWidth();
-	}
-	else
-	{
-		return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth();
-	}
+	return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth();
 }
 
-int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height)
+int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y)
 {
 	if (g_ActiveConfig.RealXFBEnabled())
 		return y;
 
-	if (g_ActiveConfig.b3DVision)
-	{
-		// This works, yet the version in the else doesn't. No idea why.
-		return y * (int)backbuffer_height / (int)FramebufferManagerBase::LastXfbHeight();
-	}
-	else
-	{
-		return y * (int)Renderer::GetTargetRectangle().GetHeight() / (int)FramebufferManagerBase::LastXfbHeight();
-	}
+	return y * (int)Renderer::GetTargetRectangle().GetHeight() / (int)FramebufferManagerBase::LastXfbHeight();
 }
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h
new file mode 100644
index 0000000000..bd6360877c
--- /dev/null
+++ b/Source/Core/VideoCommon/FramebufferManagerBase.h
@@ -0,0 +1,105 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <list>
+
+#include "VideoCommon/VideoCommon.h"
+
+inline bool AddressRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper)
+{
+	return !((aLower >= bUpper) || (bLower >= aUpper));
+}
+
+struct XFBSourceBase
+{
+	virtual ~XFBSourceBase() {}
+
+	virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0;
+
+	virtual void CopyEFB(float Gamma) = 0;
+
+	u32 srcAddr;
+	u32 srcWidth;
+	u32 srcHeight;
+
+	unsigned int texWidth;
+	unsigned int texHeight;
+
+	// TODO: only used by OGL
+	TargetRectangle sourceRc;
+};
+
+class FramebufferManagerBase
+{
+public:
+	enum
+	{
+		// There may be multiple XFBs in GameCube RAM. This is the maximum number to
+		// virtualize.
+		MAX_VIRTUAL_XFB = 8
+	};
+
+	FramebufferManagerBase();
+	virtual ~FramebufferManagerBase();
+
+	static void CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
+	static const XFBSourceBase* const* GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCount);
+
+	static void SetLastXfbWidth(unsigned int width) { s_last_xfb_width = width; }
+	static void SetLastXfbHeight(unsigned int height) { s_last_xfb_height = height; }
+	static unsigned int LastXfbWidth() { return s_last_xfb_width; }
+	static unsigned int LastXfbHeight() { return s_last_xfb_height; }
+
+	static int ScaleToVirtualXfbWidth(int x);
+	static int ScaleToVirtualXfbHeight(int y);
+
+	static unsigned int GetEFBLayers() { return m_EFBLayers; }
+
+protected:
+	struct VirtualXFB
+	{
+		VirtualXFB()
+		{
+		}
+
+		// Address and size in GameCube RAM
+		u32 xfbAddr = 0;
+		u32 xfbWidth = 0;
+		u32 xfbHeight = 0;
+
+		XFBSourceBase* xfbSource = nullptr;
+	};
+
+	typedef std::list<VirtualXFB> VirtualXFBListType;
+
+	static unsigned int m_EFBLayers;
+
+private:
+	virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height, unsigned int layers) = 0;
+	// TODO: figure out why OGL is different for this guy
+	virtual void GetTargetSize(unsigned int *width, unsigned int *height) = 0;
+
+	static VirtualXFBListType::iterator FindVirtualXFB(u32 xfbAddr, u32 width, u32 height);
+
+	static void ReplaceVirtualXFB();
+
+	// TODO: merge these virtual funcs, they are nearly all the same
+	virtual void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma = 1.0f) = 0;
+	static void CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma = 1.0f);
+
+	static const XFBSourceBase* const* GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCount);
+	static const XFBSourceBase* const* GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCount);
+
+	static XFBSourceBase *m_realXFBSource; // Only used in Real XFB mode
+	static VirtualXFBListType m_virtualXFBList; // Only used in Virtual XFB mode
+
+	static const XFBSourceBase* m_overlappingXFBArray[MAX_VIRTUAL_XFB];
+
+	static unsigned int s_last_xfb_width;
+	static unsigned int s_last_xfb_height;
+};
+
+extern FramebufferManagerBase *g_framebuffer_manager;
diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
new file mode 100644
index 0000000000..8462822511
--- /dev/null
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -0,0 +1,338 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+
+static char text[16384];
+
+static const char* primitives_ogl[] =
+{
+	"points",
+	"lines",
+	"triangles"
+};
+
+static const char* primitives_d3d[] =
+{
+	"point",
+	"line",
+	"triangle"
+};
+
+template<class T> static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex = false);
+template<class T> static inline void EndPrimitive(T& out, API_TYPE ApiType);
+
+template<class T>
+static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE ApiType)
+{
+	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
+	geometry_shader_uid_data dummy_data;
+	geometry_shader_uid_data* uid_data = out.template GetUidData<geometry_shader_uid_data>();
+	if (uid_data == nullptr)
+		uid_data = &dummy_data;
+
+	out.SetBuffer(text);
+	const bool is_writing_shadercode = (out.GetBuffer() != nullptr);
+
+	if (is_writing_shadercode)
+		text[sizeof(text) - 1] = 0x7C;  // canary
+
+	uid_data->primitive_type = primitive_type;
+	const unsigned int vertex_in = primitive_type + 1;
+	unsigned int vertex_out = primitive_type == PRIMITIVE_TRIANGLES ? 3 : 4;
+
+	uid_data->wireframe = g_ActiveConfig.bWireFrame;
+	if (g_ActiveConfig.bWireFrame)
+		vertex_out++;
+
+	uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
+	if (ApiType == API_OPENGL)
+	{
+		// Insert layout parameters
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+		{
+			out.Write("layout(%s, invocations = %d) in;\n", primitives_ogl[primitive_type], g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+			out.Write("layout(%s_strip, max_vertices = %d) out;\n", g_ActiveConfig.bWireFrame ? "line" : "triangle", vertex_out);
+		}
+		else
+		{
+			out.Write("layout(%s) in;\n", primitives_ogl[primitive_type]);
+			out.Write("layout(%s_strip, max_vertices = %d) out;\n", g_ActiveConfig.bWireFrame ? "line" : "triangle", g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+		}
+	}
+
+	out.Write("%s", s_lighting_struct);
+
+	// uniforms
+	if (ApiType == API_OPENGL)
+		out.Write("layout(std140%s) uniform GSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 3" : "");
+	else
+		out.Write("cbuffer GSBlock {\n");
+	out.Write(
+		"\tfloat4 " I_STEREOPARAMS";\n"
+		"\tfloat4 " I_LINEPTPARAMS";\n"
+		"\tint4 " I_TEXOFFSET";\n"
+		"};\n");
+
+	uid_data->numTexGens = bpmem.genMode.numtexgens;
+	uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
+
+	out.Write("struct VS_OUTPUT {\n");
+	GenerateVSOutputMembers<T>(out, ApiType);
+	out.Write("};\n");
+
+	if (ApiType == API_OPENGL)
+	{
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+			out.Write("#define InstanceID gl_InvocationID\n");
+
+		out.Write("in VertexData {\n");
+		GenerateVSOutputMembers<T>(out, ApiType, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid in");
+		out.Write("} vs[%d];\n", vertex_in);
+
+		out.Write("out VertexData {\n");
+		GenerateVSOutputMembers<T>(out, ApiType, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid out");
+
+		if (g_ActiveConfig.iStereoMode > 0)
+			out.Write("\tflat int layer;\n");
+
+		out.Write("} ps;\n");
+
+		out.Write("void main()\n{\n");
+	}
+	else // D3D
+	{
+		out.Write("struct VertexData {\n");
+		out.Write("\tVS_OUTPUT o;\n");
+
+		if (g_ActiveConfig.iStereoMode > 0)
+			out.Write("\tuint layer : SV_RenderTargetArrayIndex;\n");
+
+		out.Write("};\n");
+
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+		{
+			out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out, g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+			out.Write("void main(%s VS_OUTPUT o[%d], inout %sStream<VertexData> output, in uint InstanceID : SV_GSInstanceID)\n{\n", primitives_d3d[primitive_type], vertex_in, g_ActiveConfig.bWireFrame ? "Line" : "Triangle");
+		}
+		else
+		{
+			out.Write("[maxvertexcount(%d)]\n", g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+			out.Write("void main(%s VS_OUTPUT o[%d], inout %sStream<VertexData> output)\n{\n", primitives_d3d[primitive_type], vertex_in, g_ActiveConfig.bWireFrame ? "Line" : "Triangle");
+		}
+
+		out.Write("\tVertexData ps;\n");
+	}
+
+	if (primitive_type == PRIMITIVE_LINES)
+	{
+		if (ApiType == API_OPENGL)
+		{
+			out.Write("\tVS_OUTPUT start, end;\n");
+			AssignVSOutputMembers(out, "start", "vs[0]");
+			AssignVSOutputMembers(out, "end", "vs[1]");
+		}
+		else
+		{
+			out.Write("\tVS_OUTPUT start = o[0];\n");
+			out.Write("\tVS_OUTPUT end = o[1];\n");
+		}
+
+		// GameCube/Wii's line drawing algorithm is a little quirky. It does not
+		// use the correct line caps. Instead, the line caps are vertical or
+		// horizontal depending the slope of the line.
+		out.Write(
+			"\tfloat2 offset;\n"
+			"\tfloat2 to = abs(end.pos.xy / end.pos.w - start.pos.xy / start.pos.w);\n"
+			// FIXME: What does real hardware do when line is at a 45-degree angle?
+			// FIXME: Lines aren't drawn at the correct width. See Twilight Princess map.
+			"\tif (" I_LINEPTPARAMS".y * to.y > " I_LINEPTPARAMS".x * to.x) {\n"
+			// Line is more tall. Extend geometry left and right.
+			// Lerp LineWidth/2 from [0..VpWidth] to [-1..1]
+			"\t\toffset = float2(" I_LINEPTPARAMS".z / " I_LINEPTPARAMS".x, 0);\n"
+			"\t} else {\n"
+			// Line is more wide. Extend geometry up and down.
+			// Lerp LineWidth/2 from [0..VpHeight] to [1..-1]
+			"\t\toffset = float2(0, -" I_LINEPTPARAMS".z / " I_LINEPTPARAMS".y);\n"
+			"\t}\n");
+	}
+	else if (primitive_type == PRIMITIVE_POINTS)
+	{
+		if (ApiType == API_OPENGL)
+		{
+			out.Write("\tVS_OUTPUT center;\n");
+			AssignVSOutputMembers(out, "center", "vs[0]");
+		}
+		else
+		{
+			out.Write("\tVS_OUTPUT center = o[0];\n");
+		}
+
+		// Offset from center to upper right vertex
+		// Lerp PointSize/2 from [0,0..VpWidth,VpHeight] to [-1,1..1,-1]
+		out.Write("\tfloat2 offset = float2(" I_LINEPTPARAMS".w / " I_LINEPTPARAMS".x, -" I_LINEPTPARAMS".w / " I_LINEPTPARAMS".y) * center.pos.w;\n");
+	}
+
+	if (g_ActiveConfig.iStereoMode > 0)
+	{
+		// If the GPU supports invocation we don't need a for loop and can simply use the
+		// invocation identifier to determine which layer we're rendering.
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+			out.Write("\tint eye = InstanceID;\n");
+		else
+			out.Write("\tfor (int eye = 0; eye < 2; ++eye) {\n");
+	}
+
+	if (g_ActiveConfig.bWireFrame)
+		out.Write("\tVS_OUTPUT first;\n");
+
+	out.Write("\tfor (int i = 0; i < %d; ++i) {\n", vertex_in);
+
+	if (ApiType == API_OPENGL)
+	{
+		out.Write("\tVS_OUTPUT f;\n");
+		AssignVSOutputMembers(out, "f", "vs[i]");
+	}
+	else
+	{
+		out.Write("\tVS_OUTPUT f = o[i];\n");
+	}
+
+	if (g_ActiveConfig.iStereoMode > 0)
+	{
+		// Select the output layer
+		out.Write("\tps.layer = eye;\n");
+		if (ApiType == API_OPENGL)
+			out.Write("\tgl_Layer = eye;\n");
+
+		// For stereoscopy add a small horizontal offset in Normalized Device Coordinates proportional
+		// to the depth of the vertex. We retrieve the depth value from the w-component of the projected
+		// vertex which contains the negated z-component of the original vertex.
+		// For negative parallax (out-of-screen effects) we subtract a convergence value from
+		// the depth value. This results in objects at a distance smaller than the convergence
+		// distance to seemingly appear in front of the screen.
+		// This formula is based on page 13 of the "Nvidia 3D Vision Automatic, Best Practices Guide"
+		out.Write("\tf.pos.x += " I_STEREOPARAMS"[eye] * (f.pos.w - " I_STEREOPARAMS"[2]);\n");
+	}
+
+	if (primitive_type == PRIMITIVE_LINES)
+	{
+		out.Write("\tVS_OUTPUT l = f;\n"
+		          "\tVS_OUTPUT r = f;\n");
+
+		out.Write("\tl.pos.xy -= offset * l.pos.w;\n"
+		          "\tr.pos.xy += offset * r.pos.w;\n");
+
+		out.Write("\tif (" I_TEXOFFSET"[2] != 0) {\n");
+		out.Write("\tfloat texOffset = 1.0 / float(" I_TEXOFFSET"[2]);\n");
+
+		for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i)
+		{
+			out.Write("\tif (((" I_TEXOFFSET"[0] >> %d) & 0x1) != 0)\n", i);
+			out.Write("\t\tr.tex%d.x += texOffset;\n", i);
+		}
+		out.Write("\t}\n");
+
+		EmitVertex<T>(out, "l", ApiType, true);
+		EmitVertex<T>(out, "r", ApiType);
+	}
+	else if (primitive_type == PRIMITIVE_POINTS)
+	{
+		out.Write("\tVS_OUTPUT ll = f;\n"
+		          "\tVS_OUTPUT lr = f;\n"
+		          "\tVS_OUTPUT ul = f;\n"
+		          "\tVS_OUTPUT ur = f;\n");
+
+		out.Write("\tll.pos.xy += float2(-1,-1) * offset;\n"
+		          "\tlr.pos.xy += float2(1,-1) * offset;\n"
+		          "\tul.pos.xy += float2(-1,1) * offset;\n"
+		          "\tur.pos.xy += offset;\n");
+
+		out.Write("\tif (" I_TEXOFFSET"[3] != 0) {\n");
+		out.Write("\tfloat2 texOffset = float2(1.0 / float(" I_TEXOFFSET"[3]), 1.0 / float(" I_TEXOFFSET"[3]));\n");
+
+		for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i)
+		{
+			out.Write("\tif (((" I_TEXOFFSET"[1] >> %d) & 0x1) != 0) {\n", i);
+			out.Write("\t\tll.tex%d.xy += float2(0,1) * texOffset;\n", i);
+			out.Write("\t\tlr.tex%d.xy += texOffset;\n", i);
+			out.Write("\t\tur.tex%d.xy += float2(1,0) * texOffset;\n", i);
+			out.Write("\t}\n");
+		}
+		out.Write("\t}\n");
+
+		EmitVertex<T>(out, "ll", ApiType, true);
+		EmitVertex<T>(out, "lr", ApiType);
+		EmitVertex<T>(out, "ul", ApiType);
+		EmitVertex<T>(out, "ur", ApiType);
+	}
+	else
+	{
+		EmitVertex<T>(out, "f", ApiType, true);
+	}
+
+	out.Write("\t}\n");
+
+	EndPrimitive<T>(out, ApiType);
+
+	if (g_ActiveConfig.iStereoMode > 0 && !g_ActiveConfig.backend_info.bSupportsGSInstancing)
+		out.Write("\t}\n");
+
+	out.Write("}\n");
+
+	if (is_writing_shadercode)
+	{
+		if (text[sizeof(text) - 1] != 0x7C)
+			PanicAlert("GeometryShader generator - buffer too small, canary has been eaten!");
+	}
+}
+
+template<class T>
+static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex)
+{
+	if (g_ActiveConfig.bWireFrame && first_vertex)
+		out.Write("\tif (i == 0) first = %s;\n", vertex);
+
+	if (ApiType == API_OPENGL)
+	{
+		out.Write("\tgl_Position = %s.pos;\n", vertex);
+		AssignVSOutputMembers(out, "ps", vertex);
+	}
+	else
+	{
+		out.Write("\tps.o = %s;\n", vertex);
+	}
+
+	if (ApiType == API_OPENGL)
+		out.Write("\tEmitVertex();\n");
+	else
+		out.Write("\toutput.Append(ps);\n");
+}
+template<class T>
+static inline void EndPrimitive(T& out, API_TYPE ApiType)
+{
+	if (g_ActiveConfig.bWireFrame)
+		EmitVertex<T>(out, "first", ApiType);
+
+	if (ApiType == API_OPENGL)
+		out.Write("\tEndPrimitive();\n");
+	else
+		out.Write("\toutput.RestartStrip();\n");
+}
+
+void GetGeometryShaderUid(GeometryShaderUid& object, u32 primitive_type, API_TYPE ApiType)
+{
+	GenerateGeometryShader<GeometryShaderUid>(object, primitive_type, ApiType);
+}
+
+void GenerateGeometryShaderCode(ShaderCode& object, u32 primitive_type, API_TYPE ApiType)
+{
+	GenerateGeometryShader<ShaderCode>(object, primitive_type, ApiType);
+}
diff --git a/Source/Core/VideoCommon/GeometryShaderGen.h b/Source/Core/VideoCommon/GeometryShaderGen.h
new file mode 100644
index 0000000000..fc4653f380
--- /dev/null
+++ b/Source/Core/VideoCommon/GeometryShaderGen.h
@@ -0,0 +1,30 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/ShaderGenCommon.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+#pragma pack(1)
+
+struct geometry_shader_uid_data
+{
+	u32 NumValues() const { return sizeof(geometry_shader_uid_data); }
+	bool IsPassthrough() const { return primitive_type == PRIMITIVE_TRIANGLES && !stereo && !wireframe; }
+
+	u32 stereo : 1;
+	u32 numTexGens : 4;
+	u32 pixel_lighting : 1;
+	u32 primitive_type : 2;
+	u32 wireframe : 1;
+};
+
+#pragma pack()
+
+typedef ShaderUid<geometry_shader_uid_data> GeometryShaderUid;
+
+void GenerateGeometryShaderCode(ShaderCode& object, u32 primitive_type, API_TYPE ApiType);
+void GetGeometryShaderUid(GeometryShaderUid& object, u32 primitive_type, API_TYPE ApiType);
diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp
new file mode 100644
index 0000000000..19a480692f
--- /dev/null
+++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp
@@ -0,0 +1,125 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cfloat>
+#include <cmath>
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+static const int LINE_PT_TEX_OFFSETS[8] = {
+	0, 16, 8, 4, 2, 1, 1, 1
+};
+
+GeometryShaderConstants GeometryShaderManager::constants;
+bool GeometryShaderManager::dirty;
+
+static bool s_projection_changed;
+static bool s_viewport_changed;
+
+void GeometryShaderManager::Init()
+{
+	memset(&constants, 0, sizeof(constants));
+
+	// Init any intial constants which aren't zero when bpmem is zero.
+	SetViewportChanged();
+	SetProjectionChanged();
+
+	dirty = true;
+}
+
+void GeometryShaderManager::Shutdown()
+{
+}
+
+void GeometryShaderManager::Dirty()
+{
+	// This function is called after a savestate is loaded.
+	// Any constants that can changed based on settings should be re-calculated
+	s_projection_changed = true;
+
+	dirty = true;
+}
+
+void GeometryShaderManager::SetConstants()
+{
+	if (s_projection_changed && g_ActiveConfig.iStereoMode > 0)
+	{
+		s_projection_changed = false;
+
+		if (xfmem.projection.type == GX_PERSPECTIVE)
+		{
+			float offset = (g_ActiveConfig.iStereoDepth / 1000.0f) * (g_ActiveConfig.iStereoDepthPercentage / 100.0f);
+			constants.stereoparams[0] = g_ActiveConfig.bStereoSwapEyes ? offset : -offset;
+			constants.stereoparams[1] = g_ActiveConfig.bStereoSwapEyes ? -offset : offset;
+		}
+		else
+		{
+			constants.stereoparams[0] = constants.stereoparams[1] = 0;
+		}
+
+		constants.stereoparams[2] = (float)(g_ActiveConfig.iStereoConvergenceMinimum + g_ActiveConfig.iStereoConvergence);
+
+		dirty = true;
+	}
+
+	if (s_viewport_changed)
+	{
+		s_viewport_changed = false;
+
+		constants.lineptparams[0] = 2.0f * xfmem.viewport.wd;
+		constants.lineptparams[1] = -2.0f * xfmem.viewport.ht;
+
+		dirty = true;
+	}
+}
+
+void GeometryShaderManager::SetViewportChanged()
+{
+	s_viewport_changed = true;
+}
+
+void GeometryShaderManager::SetProjectionChanged()
+{
+	s_projection_changed = true;
+}
+
+void GeometryShaderManager::SetLinePtWidthChanged()
+{
+	constants.lineptparams[2] = bpmem.lineptwidth.linesize / 6.f;
+	constants.lineptparams[3] = bpmem.lineptwidth.pointsize / 6.f;
+	constants.texoffset[2] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff];
+	constants.texoffset[3] = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff];
+	dirty = true;
+}
+
+void GeometryShaderManager::SetTexCoordChanged(u8 texmapid)
+{
+	TCoordInfo& tc = bpmem.texcoords[texmapid];
+	int bitmask = 1 << texmapid;
+	constants.texoffset[0] &= ~bitmask;
+	constants.texoffset[0] |= tc.s.line_offset << texmapid;
+	constants.texoffset[1] &= ~bitmask;
+	constants.texoffset[1] |= tc.s.point_offset << texmapid;
+	dirty = true;
+}
+
+void GeometryShaderManager::DoState(PointerWrap &p)
+{
+	p.Do(s_projection_changed);
+	p.Do(s_viewport_changed);
+
+	p.Do(constants);
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		// Fixup the current state from global GPU state
+		// NOTE: This requires that all GPU memory has been loaded already.
+		Dirty();
+	}
+}
diff --git a/Source/Core/VideoCommon/GeometryShaderManager.h b/Source/Core/VideoCommon/GeometryShaderManager.h
new file mode 100644
index 0000000000..56773a22fc
--- /dev/null
+++ b/Source/Core/VideoCommon/GeometryShaderManager.h
@@ -0,0 +1,29 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/GeometryShaderGen.h"
+
+class PointerWrap;
+
+// The non-API dependent parts.
+class GeometryShaderManager
+{
+public:
+	static void Init();
+	static void Dirty();
+	static void Shutdown();
+	static void DoState(PointerWrap &p);
+
+	static void SetConstants();
+	static void SetViewportChanged();
+	static void SetProjectionChanged();
+	static void SetLinePtWidthChanged();
+	static void SetTexCoordChanged(u8 texmapid);
+
+	static GeometryShaderConstants constants;
+	static bool dirty;
+};
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
new file mode 100644
index 0000000000..953052eb5d
--- /dev/null
+++ b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -0,0 +1,438 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <utility>
+#include <xxhash.h>
+#include <SOIL/SOIL.h>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/Flag.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoCommon/HiresTextures.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VideoConfig.h"
+
+static std::unordered_map<std::string, std::string> s_textureMap;
+static std::unordered_map<std::string, std::shared_ptr<HiresTexture>> s_textureCache;
+static std::mutex s_textureCacheMutex;
+static std::mutex s_textureCacheAquireMutex; // for high priority access
+static Common::Flag s_textureCacheAbortLoading;
+static bool s_check_native_format;
+static bool s_check_new_format;
+
+static std::thread s_prefetcher;
+
+static const std::string s_format_prefix = "tex1_";
+
+void HiresTexture::Init()
+{
+	s_check_native_format = false;
+	s_check_new_format = false;
+
+	Update();
+}
+
+void HiresTexture::Shutdown()
+{
+	if (s_prefetcher.joinable())
+	{
+		s_textureCacheAbortLoading.Set();
+		s_prefetcher.join();
+	}
+
+	s_textureMap.clear();
+	s_textureCache.clear();
+}
+
+void HiresTexture::Update()
+{
+	if (s_prefetcher.joinable())
+	{
+		s_textureCacheAbortLoading.Set();
+		s_prefetcher.join();
+	}
+
+	if (!g_ActiveConfig.bHiresTextures)
+	{
+		s_textureMap.clear();
+		s_textureCache.clear();
+		return;
+	}
+
+	if (!g_ActiveConfig.bCacheHiresTextures)
+	{
+		s_textureCache.clear();
+	}
+
+	std::vector<std::string> Directories;
+	const std::string& gameCode = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
+
+	std::string szDir = StringFromFormat("%s%s", File::GetUserPath(D_HIRESTEXTURES_IDX).c_str(), gameCode.c_str());
+
+	std::vector<std::string> Extensions {
+		"*.png",
+		"*.bmp",
+		"*.tga",
+		"*.dds",
+		"*.jpg" // Why not? Could be useful for large photo-like textures
+	};
+
+	auto rFilenames = DoFileSearch(Extensions, {szDir}, /*recursive*/ true);
+
+	const std::string code = StringFromFormat("%s_", gameCode.c_str());
+	const std::string code2 = "";
+
+	for (auto& rFilename : rFilenames)
+	{
+		std::string FileName;
+		SplitPath(rFilename, nullptr, &FileName, nullptr);
+
+		if (FileName.substr(0, code.length()) == code)
+		{
+			s_textureMap[FileName] = rFilename;
+			s_check_native_format = true;
+		}
+
+		if (FileName.substr(0, s_format_prefix.length()) == s_format_prefix)
+		{
+			s_textureMap[FileName] = rFilename;
+			s_check_new_format = true;
+		}
+	}
+
+	if (g_ActiveConfig.bCacheHiresTextures)
+	{
+		// remove cached but deleted textures
+		auto iter = s_textureCache.begin();
+		while (iter != s_textureCache.end())
+		{
+			if (s_textureMap.find(iter->first) == s_textureMap.end())
+			{
+				iter = s_textureCache.erase(iter);
+			}
+			else
+			{
+				iter++;
+			}
+		}
+
+		s_textureCacheAbortLoading.Clear();
+		s_prefetcher = std::thread(Prefetch);
+	}
+}
+
+void HiresTexture::Prefetch()
+{
+	Common::SetCurrentThreadName("Prefetcher");
+
+	size_t size_sum = 0;
+	size_t max_mem = MemPhysical() / 2;
+	u32 starttime = Common::Timer::GetTimeMs();
+	for (const auto& entry : s_textureMap)
+	{
+		const std::string& base_filename = entry.first;
+
+		if (base_filename.find("_mip") == std::string::npos)
+		{
+			{
+				// try to get this mutex first, so the video thread is allow to get the real mutex faster
+				std::unique_lock<std::mutex> lk(s_textureCacheAquireMutex);
+			}
+			std::unique_lock<std::mutex> lk(s_textureCacheMutex);
+
+			auto iter = s_textureCache.find(base_filename);
+			if (iter == s_textureCache.end())
+			{
+				// unlock while loading a texture. This may result in a race condition where we'll load a texture twice,
+				// but it reduces the stuttering a lot. Notice: The loading library _must_ be thread safe now.
+				// But bad luck, SOIL isn't, so TODO: remove SOIL usage here and use libpng directly
+				// Also TODO: remove s_textureCacheAquireMutex afterwards. It won't be needed as the main mutex will be locked rarely
+				//lk.unlock();
+				HiresTexture* t = Load(base_filename, 0, 0);
+				//lk.lock();
+				if (t)
+				{
+					std::shared_ptr<HiresTexture> ptr(t);
+					iter = s_textureCache.insert(iter, std::make_pair(base_filename, ptr));
+				}
+			}
+			if (iter != s_textureCache.end())
+			{
+				for (const Level& l : iter->second->m_levels)
+				{
+					size_sum += l.data_size;
+				}
+			}
+		}
+
+		if (s_textureCacheAbortLoading.IsSet())
+		{
+			return;
+		}
+
+		if (size_sum > max_mem)
+		{
+			g_Config.bCacheHiresTextures = false;
+
+			OSD::AddMessage(StringFromFormat("Custom Textures prefetching after %.1f MB aborted, not enough RAM available", size_sum / (1024.0 * 1024.0)), 10000);
+			return;
+		}
+	}
+	u32 stoptime = Common::Timer::GetTimeMs();
+	OSD::AddMessage(StringFromFormat("Custom Textures loaded, %.1f MB in %.1f s", size_sum / (1024.0 * 1024.0), (stoptime - starttime) / 1000.0), 10000);
+}
+
+std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps, bool dump)
+{
+	std::string name = "";
+	bool convert = false;
+	if (!dump && s_check_native_format)
+	{
+		// try to load the old format first
+		u64 tex_hash = GetHashHiresTexture(texture, (int)texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
+		u64 tlut_hash = tlut_size ? GetHashHiresTexture(tlut, (int)tlut_size, g_ActiveConfig.iSafeTextureCache_ColorSamples) : 0;
+		name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32)(tex_hash ^ tlut_hash), (u16)format);
+		if (s_textureMap.find(name) != s_textureMap.end())
+		{
+			if (g_ActiveConfig.bConvertHiresTextures)
+				convert = true;
+			else
+				return name;
+		}
+	}
+
+	if (dump || s_check_new_format || convert)
+	{
+		// checking for min/max on paletted textures
+		u32 min = 0xffff;
+		u32 max = 0;
+		switch(tlut_size)
+		{
+			case 0: break;
+			case 16 * 2:
+				for (size_t i = 0; i < texture_size; i++)
+				{
+					min = std::min<u32>(min, texture[i] & 0xf);
+					min = std::min<u32>(min, texture[i] >> 4);
+					max = std::max<u32>(max, texture[i] & 0xf);
+					max = std::max<u32>(max, texture[i] >> 4);
+				}
+				break;
+			case 256 * 2:
+				for (size_t i = 0; i < texture_size; i++)
+				{
+					min = std::min<u32>(min, texture[i]);
+					max = std::max<u32>(max, texture[i]);
+				}
+				break;
+			case 16384 * 2:
+				for (size_t i = 0; i < texture_size/2; i++)
+				{
+					min = std::min<u32>(min, Common::swap16(((u16*)texture)[i]) & 0x3fff);
+					max = std::max<u32>(max, Common::swap16(((u16*)texture)[i]) & 0x3fff);
+				}
+				break;
+		}
+		if (tlut_size > 0)
+		{
+			tlut_size = 2 * (max + 1 - min);
+			tlut += 2 * min;
+		}
+
+		u64 tex_hash = XXH64(texture, texture_size, 0);
+		u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
+
+		std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height, has_mipmaps ? "_m" : "", tex_hash);
+		std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : "";
+		std::string formatname = StringFromFormat("_%d", format);
+		std::string fullname = basename + tlutname + formatname;
+
+		for (int level = 0; level < 10 && convert; level++)
+		{
+			std::string oldname = name;
+			if (level)
+				oldname += StringFromFormat("_mip%d", level);
+
+			// skip not existing levels
+			if (s_textureMap.find(oldname) == s_textureMap.end())
+				continue;
+
+			for (int i = 0;; i++)
+			{
+				// for hash collisions, padd with an integer
+				std::string newname = fullname;
+				if (level)
+					newname += StringFromFormat("_mip%d", level);
+				if (i)
+					newname += StringFromFormat(".%d", i);
+
+				// new texture
+				if (s_textureMap.find(newname) == s_textureMap.end())
+				{
+					std::string src = s_textureMap[oldname];
+					size_t postfix = src.find_last_of('.');
+					std::string dst = src.substr(0, postfix - oldname.length()) + newname + src.substr(postfix, src.length() - postfix);
+					if (File::Rename(src, dst))
+					{
+						s_textureMap.erase(oldname);
+						s_textureMap[newname] = dst;
+						s_check_new_format = true;
+						OSD::AddMessage(StringFromFormat("Rename custom texture %s to %s", oldname.c_str(), newname.c_str()), 5000);
+					}
+					else
+					{
+						ERROR_LOG(VIDEO, "rename failed");
+					}
+					break;
+				}
+				else
+				{
+					// dst fail already exist, compare content
+					std::string a, b;
+					File::ReadFileToString(s_textureMap[oldname], a);
+					File::ReadFileToString(s_textureMap[newname], b);
+
+					if (a == b && a != "")
+					{
+						// equal, so remove
+						if (File::Delete(s_textureMap[oldname]))
+						{
+							s_textureMap.erase(oldname);
+							OSD::AddMessage(StringFromFormat("Delete double old custom texture %s", oldname.c_str()), 5000);
+						}
+						else
+						{
+							ERROR_LOG(VIDEO, "delete failed");
+						}
+						break;
+					}
+
+					// else continue in this loop with the next higher padding variable
+				}
+			}
+		}
+
+		// try to match a wildcard template
+		if (!dump && s_textureMap.find(basename + "_*" + formatname) != s_textureMap.end())
+			return basename + "_*" + formatname;
+
+		// else generate the complete texture
+		if (dump || s_textureMap.find(fullname) != s_textureMap.end())
+			return fullname;
+	}
+
+	return name;
+}
+
+std::shared_ptr<HiresTexture> HiresTexture::Search(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps)
+{
+	std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps);
+
+	std::lock_guard<std::mutex> lk2(s_textureCacheAquireMutex);
+	std::lock_guard<std::mutex> lk(s_textureCacheMutex);
+
+	auto iter = s_textureCache.find(base_filename);
+	if (iter != s_textureCache.end())
+	{
+		return iter->second;
+	}
+
+	std::shared_ptr<HiresTexture> ptr(Load(base_filename, width, height));
+
+	if (ptr && g_ActiveConfig.bCacheHiresTextures)
+	{
+		s_textureCache[base_filename] = ptr;
+	}
+
+	return ptr;
+}
+
+HiresTexture* HiresTexture::Load(const std::string& base_filename, u32 width, u32 height)
+{
+	HiresTexture* ret = nullptr;
+	for (int level = 0;; level++)
+	{
+		std::string filename = base_filename;
+		if (level)
+		{
+			filename += StringFromFormat("_mip%u", level);
+		}
+
+		if (s_textureMap.find(filename) != s_textureMap.end())
+		{
+			Level l;
+
+			File::IOFile file;
+			file.Open(s_textureMap[filename], "rb");
+			std::vector<u8> buffer(file.GetSize());
+			file.ReadBytes(buffer.data(), file.GetSize());
+
+			int channels;
+			l.data = SOIL_load_image_from_memory(buffer.data(), (int)buffer.size(), (int*)&l.width, (int*)&l.height, &channels, SOIL_LOAD_RGBA);
+			l.data_size = (size_t)l.width * l.height * 4;
+
+			if (l.data == nullptr)
+			{
+				ERROR_LOG(VIDEO, "Custom texture %s failed to load", filename.c_str());
+				break;
+			}
+
+			if (!level)
+			{
+				if (l.width * height != l.height * width)
+					ERROR_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. The aspect differs from the native size %dx%d.",
+					          l.width, l.height, filename.c_str(), width, height);
+				if (width && height && (l.width % width || l.height % height))
+					WARN_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. Please use an integer upscaling factor based on the native size %dx%d.",
+					         l.width, l.height, filename.c_str(), width, height);
+				width = l.width;
+				height = l.height;
+			}
+			else if (width != l.width || height != l.height)
+			{
+				ERROR_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. This mipmap layer _must_ be %dx%d.",
+				          l.width, l.height, filename.c_str(), width, height);
+				SOIL_free_image_data(l.data);
+				break;
+			}
+
+			// calculate the size of the next mipmap
+			width >>= 1;
+			height >>= 1;
+
+			if (!ret)
+				ret = new HiresTexture();
+			ret->m_levels.push_back(l);
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	return ret;
+}
+
+HiresTexture::~HiresTexture()
+{
+	for (auto& l : m_levels)
+	{
+		SOIL_free_image_data(l.data);
+	}
+}
+
diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h
new file mode 100644
index 0000000000..65a033de7d
--- /dev/null
+++ b/Source/Core/VideoCommon/HiresTextures.h
@@ -0,0 +1,51 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"
+
+class HiresTexture
+{
+public:
+	static void Init();
+	static void Update();
+	static void Shutdown();
+
+	static std::shared_ptr<HiresTexture> Search(
+		const u8* texture, size_t texture_size,
+		const u8* tlut, size_t tlut_size,
+		u32 width, u32 height,
+		int format, bool has_mipmaps
+	);
+
+	static std::string GenBaseName(
+		const u8* texture, size_t texture_size,
+		const u8* tlut, size_t tlut_size,
+		u32 width, u32 height,
+		int format, bool has_mipmaps,
+		bool dump = false
+	);
+
+	~HiresTexture();
+
+	struct Level
+	{
+		u8* data;
+		size_t data_size;
+		u32 width, height;
+	};
+	std::vector<Level> m_levels;
+
+private:
+	static HiresTexture* Load(const std::string& base_filename, u32 width, u32 height);
+	static void Prefetch();
+
+	HiresTexture() {}
+
+};
diff --git a/Source/Core/VideoCommon/ImageWrite.cpp b/Source/Core/VideoCommon/ImageWrite.cpp
new file mode 100644
index 0000000000..38ca509c3e
--- /dev/null
+++ b/Source/Core/VideoCommon/ImageWrite.cpp
@@ -0,0 +1,112 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <list>
+#include <string>
+#include <vector>
+
+#include "png.h"
+#include "Common/FileUtil.h"
+#include "VideoCommon/ImageWrite.h"
+
+bool SaveData(const std::string& filename, const char* data)
+{
+	std::ofstream f;
+	OpenFStream(f, filename, std::ios::binary);
+	f << data;
+
+	return true;
+}
+
+
+/*
+TextureToPng
+
+Inputs:
+data      : This is an array of RGBA with 8 bits per channel. 4 bytes for each pixel.
+row_stride: Determines the amount of bytes per row of pixels.
+*/
+bool TextureToPng(u8* data, int row_stride, const std::string& filename, int width, int height, bool saveAlpha)
+{
+	bool success = false;
+
+	if (!data)
+		return false;
+
+	char title[] = "Dolphin Screenshot";
+	char title_key[] = "Title";
+	png_structp png_ptr = nullptr;
+	png_infop info_ptr = nullptr;
+
+	// Open file for writing (binary mode)
+	File::IOFile fp(filename, "wb");
+	if (!fp.IsOpen())
+	{
+		PanicAlertT("Screenshot failed: Could not open file \"%s\" (error %d)", filename.c_str(), errno);
+		goto finalise;
+	}
+
+	// Initialize write structure
+	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+	if (png_ptr == nullptr)
+	{
+		PanicAlert("Screenshot failed: Could not allocate write struct");
+		goto finalise;
+	}
+
+	// Initialize info structure
+	info_ptr = png_create_info_struct(png_ptr);
+	if (info_ptr == nullptr)
+	{
+		PanicAlert("Screenshot failed: Could not allocate info struct");
+		goto finalise;
+	}
+
+	// Setup Exception handling
+	if (setjmp(png_jmpbuf(png_ptr)))
+	{
+		PanicAlert("Screenshot failed: Error during PNG creation");
+		goto finalise;
+	}
+
+	png_init_io(png_ptr, fp.GetHandle());
+
+	// Write header (8 bit color depth)
+	png_set_IHDR(png_ptr, info_ptr, width, height,
+		8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+		PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+	png_text title_text;
+	title_text.compression = PNG_TEXT_COMPRESSION_NONE;
+	title_text.key = title_key;
+	title_text.text = title;
+	png_set_text(png_ptr, info_ptr, &title_text, 1);
+
+	png_write_info(png_ptr, info_ptr);
+
+	// Write image data
+	for (auto y = 0; y < height; ++y)
+	{
+		u8* row_ptr = (u8*)data + y * row_stride;
+		u8* ptr = row_ptr;
+		for (auto x = 0; x < row_stride / 4; ++x)
+		{
+			if (!saveAlpha)
+				ptr[3] = 0xff;
+			ptr += 4;
+		}
+		png_write_row(png_ptr, row_ptr);
+	}
+
+	// End write
+	png_write_end(png_ptr, nullptr);
+
+	success = true;
+
+finalise:
+	if (info_ptr != nullptr) png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+	if (png_ptr != nullptr) png_destroy_write_struct(&png_ptr, (png_infopp)nullptr);
+
+	return success;
+}
diff --git a/Source/Core/VideoCommon/ImageWrite.h b/Source/Core/VideoCommon/ImageWrite.h
new file mode 100644
index 0000000000..730b3f7540
--- /dev/null
+++ b/Source/Core/VideoCommon/ImageWrite.h
@@ -0,0 +1,11 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include "Common/CommonTypes.h"
+
+bool SaveData(const std::string& filename, const char* pdata);
+bool TextureToPng(u8* data, int row_stride, const std::string& filename, int width, int height, bool saveAlpha = true);
diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp
new file mode 100644
index 0000000000..19a6642f66
--- /dev/null
+++ b/Source/Core/VideoCommon/IndexGenerator.cpp
@@ -0,0 +1,246 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/VideoConfig.h"
+
+//Init
+u16 *IndexGenerator::index_buffer_current;
+u16 *IndexGenerator::BASEIptr;
+u32 IndexGenerator::base_index;
+
+static const u16 s_primitive_restart = -1;
+
+static u16* (*primitive_table[8])(u16*, u32, u32);
+
+void IndexGenerator::Init()
+{
+	if (g_Config.backend_info.bSupportsPrimitiveRestart)
+	{
+		primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<true>;
+		primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<true>;
+		primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<true>;
+		primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<true>;
+		primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<true>;
+	}
+	else
+	{
+		primitive_table[GX_DRAW_QUADS] = IndexGenerator::AddQuads<false>;
+		primitive_table[GX_DRAW_QUADS_2] = IndexGenerator::AddQuads_nonstandard<false>;
+		primitive_table[GX_DRAW_TRIANGLES] = IndexGenerator::AddList<false>;
+		primitive_table[GX_DRAW_TRIANGLE_STRIP] = IndexGenerator::AddStrip<false>;
+		primitive_table[GX_DRAW_TRIANGLE_FAN] = IndexGenerator::AddFan<false>;
+	}
+	primitive_table[GX_DRAW_LINES] = &IndexGenerator::AddLineList;
+	primitive_table[GX_DRAW_LINE_STRIP] = &IndexGenerator::AddLineStrip;
+	primitive_table[GX_DRAW_POINTS] = &IndexGenerator::AddPoints;
+}
+
+void IndexGenerator::Start(u16* Indexptr)
+{
+	index_buffer_current = Indexptr;
+	BASEIptr = Indexptr;
+	base_index = 0;
+}
+
+void IndexGenerator::AddIndices(int primitive, u32 numVerts)
+{
+	index_buffer_current = primitive_table[primitive](index_buffer_current, numVerts, base_index);
+	base_index += numVerts;
+}
+
+// Triangles
+template <bool pr> __forceinline u16* IndexGenerator::WriteTriangle(u16 *Iptr, u32 index1, u32 index2, u32 index3)
+{
+	*Iptr++ = index1;
+	*Iptr++ = index2;
+	*Iptr++ = index3;
+	if (pr)
+		*Iptr++ = s_primitive_restart;
+	return Iptr;
+}
+
+template <bool pr> u16* IndexGenerator::AddList(u16 *Iptr, u32 const numVerts, u32 index)
+{
+	for (u32 i = 2; i < numVerts; i+=3)
+	{
+		Iptr = WriteTriangle<pr>(Iptr, index + i - 2, index + i - 1, index + i);
+	}
+	return Iptr;
+}
+
+template <bool pr> u16* IndexGenerator::AddStrip(u16 *Iptr, u32 const numVerts, u32 index)
+{
+	if (pr)
+	{
+		for (u32 i = 0; i < numVerts; ++i)
+		{
+			*Iptr++ = index + i;
+		}
+		*Iptr++ = s_primitive_restart;
+
+	}
+	else
+	{
+		bool wind = false;
+		for (u32 i = 2; i < numVerts; ++i)
+		{
+			Iptr = WriteTriangle<pr>(Iptr,
+				index + i - 2,
+				index + i - !wind,
+				index + i - wind);
+
+			wind ^= true;
+		}
+	}
+	return Iptr;
+}
+
+/**
+ * FAN simulator:
+ *
+ *   2---3
+ *  / \ / \
+ * 1---0---4
+ *
+ * would generate this triangles:
+ * 012, 023, 034
+ *
+ * rotated (for better striping):
+ * 120, 302, 034
+ *
+ * as odd ones have to winded, following strip is fine:
+ * 12034
+ *
+ * so we use 6 indices for 3 triangles
+ */
+
+template <bool pr> u16* IndexGenerator::AddFan(u16 *Iptr, u32 numVerts, u32 index)
+{
+	u32 i = 2;
+
+	if (pr)
+	{
+		for (; i+3<=numVerts; i+=3)
+		{
+			*Iptr++ = index + i - 1;
+			*Iptr++ = index + i + 0;
+			*Iptr++ = index;
+			*Iptr++ = index + i + 1;
+			*Iptr++ = index + i + 2;
+			*Iptr++ = s_primitive_restart;
+		}
+
+		for (; i+2<=numVerts; i+=2)
+		{
+			*Iptr++ = index + i - 1;
+			*Iptr++ = index + i + 0;
+			*Iptr++ = index;
+			*Iptr++ = index + i + 1;
+			*Iptr++ = s_primitive_restart;
+		}
+	}
+
+	for (; i < numVerts; ++i)
+	{
+		Iptr = WriteTriangle<pr>(Iptr, index, index + i - 1, index + i);
+	}
+	return Iptr;
+}
+
+/*
+ * QUAD simulator
+ *
+ * 0---1   4---5
+ * |\  |   |\  |
+ * | \ |   | \ |
+ * |  \|   |  \|
+ * 3---2   7---6
+ *
+ * 012,023, 456,467 ...
+ * or 120,302, 564,746
+ * or as strip: 1203, 5647
+ *
+ * Warning:
+ * A simple triangle has to be rendered for three vertices.
+ * ZWW do this for sun rays
+ */
+template <bool pr> u16* IndexGenerator::AddQuads(u16 *Iptr, u32 numVerts, u32 index)
+{
+	u32 i = 3;
+	for (; i < numVerts; i+=4)
+	{
+		if (pr)
+		{
+			*Iptr++ = index + i - 2;
+			*Iptr++ = index + i - 1;
+			*Iptr++ = index + i - 3;
+			*Iptr++ = index + i - 0;
+			*Iptr++ = s_primitive_restart;
+		}
+		else
+		{
+			Iptr = WriteTriangle<pr>(Iptr, index + i - 3, index + i - 2, index + i - 1);
+			Iptr = WriteTriangle<pr>(Iptr, index + i - 3, index + i - 1, index + i - 0);
+		}
+	}
+
+	// three vertices remaining, so render a triangle
+	if (i == numVerts)
+	{
+		Iptr = WriteTriangle<pr>(Iptr, index+numVerts-3, index+numVerts-2, index+numVerts-1);
+	}
+	return Iptr;
+}
+
+template <bool pr> u16* IndexGenerator::AddQuads_nonstandard(u16 *Iptr, u32 numVerts, u32 index)
+{
+	WARN_LOG(VIDEO, "Non-standard primitive drawing command GL_DRAW_QUADS_2");
+	return AddQuads<pr>(Iptr, numVerts, index);
+}
+
+// Lines
+u16* IndexGenerator::AddLineList(u16 *Iptr, u32 numVerts, u32 index)
+{
+	for (u32 i = 1; i < numVerts; i+=2)
+	{
+		*Iptr++ = index + i - 1;
+		*Iptr++ = index + i;
+	}
+	return Iptr;
+
+}
+
+// shouldn't be used as strips as LineLists are much more common
+// so converting them to lists
+u16* IndexGenerator::AddLineStrip(u16 *Iptr, u32 numVerts, u32 index)
+{
+	for (u32 i = 1; i < numVerts; ++i)
+	{
+		*Iptr++ = index + i - 1;
+		*Iptr++ = index + i;
+	}
+	return Iptr;
+}
+
+// Points
+u16* IndexGenerator::AddPoints(u16 *Iptr, u32 numVerts, u32 index)
+{
+	for (u32 i = 0; i != numVerts; ++i)
+	{
+		*Iptr++ = index + i;
+	}
+	return Iptr;
+}
+
+
+u32 IndexGenerator::GetRemainingIndices()
+{
+	u32 max_index = 65534; // -1 is reserved for primitive restart (ogl + dx11)
+	return max_index - base_index;
+}
diff --git a/Source/Core/VideoCommon/IndexGenerator.h b/Source/Core/VideoCommon/IndexGenerator.h
new file mode 100644
index 0000000000..8390935b46
--- /dev/null
+++ b/Source/Core/VideoCommon/IndexGenerator.h
@@ -0,0 +1,48 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// This is currently only used by the DX backend, but it may make sense to
+// use it in the GL backend or a future DX10 backend too.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+class IndexGenerator
+{
+public:
+	// Init
+	static void Init();
+	static void Start(u16 *Indexptr);
+
+	static void AddIndices(int primitive, u32 numVertices);
+
+	// returns numprimitives
+	static u32 GetNumVerts() {return base_index;}
+
+	static u32 GetIndexLen() {return (u32)(index_buffer_current - BASEIptr);}
+
+	static u32 GetRemainingIndices();
+
+private:
+	// Triangles
+	template <bool pr> static u16* AddList(u16 *Iptr, u32 numVerts, u32 index);
+	template <bool pr> static u16* AddStrip(u16 *Iptr, u32 numVerts, u32 index);
+	template <bool pr> static u16* AddFan(u16 *Iptr, u32 numVerts, u32 index);
+	template <bool pr> static u16* AddQuads(u16 *Iptr, u32 numVerts, u32 index);
+	template <bool pr> static u16* AddQuads_nonstandard(u16 *Iptr, u32 numVerts, u32 index);
+
+	// Lines
+	static u16* AddLineList(u16 *Iptr, u32 numVerts, u32 index);
+	static u16* AddLineStrip(u16 *Iptr, u32 numVerts, u32 index);
+
+	// Points
+	static u16* AddPoints(u16 *Iptr, u32 numVerts, u32 index);
+
+	template <bool pr> static u16* WriteTriangle(u16 *Iptr, u32 index1, u32 index2, u32 index3);
+
+	static u16 *index_buffer_current;
+	static u16 *BASEIptr;
+	static u32 base_index;
+};
diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h
new file mode 100644
index 0000000000..83ecfb4174
--- /dev/null
+++ b/Source/Core/VideoCommon/LightingShaderGen.h
@@ -0,0 +1,262 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/ShaderGenCommon.h"
+#include "VideoCommon/XFMemory.h"
+
+
+#define LIGHT_COL "%s[%d].color.%s"
+#define LIGHT_COL_PARAMS(index, swizzle) (I_LIGHTS), (index), (swizzle)
+
+#define LIGHT_COSATT "%s[%d].cosatt"
+#define LIGHT_COSATT_PARAMS(index) (I_LIGHTS), (index)
+
+#define LIGHT_DISTATT "%s[%d].distatt"
+#define LIGHT_DISTATT_PARAMS(index) (I_LIGHTS), (index)
+
+#define LIGHT_POS "%s[%d].pos"
+#define LIGHT_POS_PARAMS(index) (I_LIGHTS), (index)
+
+#define LIGHT_DIR "%s[%d].dir"
+#define LIGHT_DIR_PARAMS(index) (I_LIGHTS), (index)
+
+/**
+ * Common uid data used for shader generators that use lighting calculations.
+ */
+struct LightingUidData
+{
+	u32 matsource      : 4;  // 4x1 bit
+	u32 enablelighting : 4;  // 4x1 bit
+	u32 ambsource      : 4;  // 4x1 bit
+	u32 diffusefunc    : 8;  // 4x2 bits
+	u32 attnfunc       : 8;  // 4x2 bits
+	u32 light_mask     : 32; // 4x8 bits
+};
+
+static const char s_lighting_struct[] =
+	"struct Light {\n"
+	"\tint4 color;\n"
+	"\tfloat4 cosatt;\n"
+	"\tfloat4 distatt;\n"
+	"\tfloat4 pos;\n"
+	"\tfloat4 dir;\n"
+	"};\n";
+
+template<class T>
+static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, int litchan_index, int coloralpha)
+{
+	const LitChannel& chan = (litchan_index > 1) ? xfmem.alpha[litchan_index-2] : xfmem.color[litchan_index];
+	const char* swizzle = (coloralpha == 1) ? "xyz" : (coloralpha == 2) ? "w" : "xyzw";
+	const char* swizzle_components = (coloralpha == 1) ? "3" : (coloralpha == 2) ? "" : "4";
+
+	uid_data.attnfunc |= chan.attnfunc << (2*litchan_index);
+	uid_data.diffusefunc |= chan.diffusefunc << (2*litchan_index);
+
+	switch (chan.attnfunc)
+	{
+		case LIGHTATTN_NONE:
+		case LIGHTATTN_DIR:
+			object.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(index));
+			object.Write("attn = 1.0;\n");
+			object.Write("if (length(ldir) == 0.0)\n\t ldir = _norm0;\n");
+			break;
+		case LIGHTATTN_SPEC:
+			object.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(index));
+			object.Write("attn = (dot(_norm0, ldir) >= 0.0) ? max(0.0, dot(_norm0, " LIGHT_DIR".xyz)) : 0.0;\n", LIGHT_DIR_PARAMS(index));
+			object.Write("cosAttn = " LIGHT_COSATT".xyz;\n", LIGHT_COSATT_PARAMS(index));
+			object.Write("distAttn = %s(" LIGHT_DISTATT".xyz);\n", (chan.diffusefunc == LIGHTDIF_NONE) ? "" : "normalize", LIGHT_DISTATT_PARAMS(index));
+			object.Write("attn = max(0.0f, dot(cosAttn, float3(1.0, attn, attn*attn))) / dot(distAttn, float3(1.0, attn, attn*attn));\n");
+			break;
+		case LIGHTATTN_SPOT:
+			object.Write("ldir = " LIGHT_POS".xyz - pos.xyz;\n", LIGHT_POS_PARAMS(index));
+			object.Write("dist2 = dot(ldir, ldir);\n"
+				"dist = sqrt(dist2);\n"
+				"ldir = ldir / dist;\n"
+				"attn = max(0.0, dot(ldir, " LIGHT_DIR".xyz));\n",	LIGHT_DIR_PARAMS(index));
+			// attn*attn may overflow
+			object.Write("attn = max(0.0, " LIGHT_COSATT".x + " LIGHT_COSATT".y*attn + " LIGHT_COSATT".z*attn*attn) / dot(" LIGHT_DISTATT".xyz, float3(1.0,dist,dist2));\n",
+				LIGHT_COSATT_PARAMS(index), LIGHT_COSATT_PARAMS(index), LIGHT_COSATT_PARAMS(index), LIGHT_DISTATT_PARAMS(index));
+			break;
+		default: _assert_(0);
+	}
+
+	switch (chan.diffusefunc)
+	{
+		case LIGHTDIF_NONE:
+			object.Write("lacc.%s += int%s(round(attn * float%s(" LIGHT_COL")));\n",
+				            swizzle, swizzle_components,
+				            swizzle_components, LIGHT_COL_PARAMS(index, swizzle));
+			break;
+		case LIGHTDIF_SIGN:
+		case LIGHTDIF_CLAMP:
+			object.Write("lacc.%s += int%s(round(attn * %sdot(ldir, _norm0)) * float%s(" LIGHT_COL")));\n",
+				            swizzle, swizzle_components,
+				            chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0," :"(",
+				            swizzle_components, LIGHT_COL_PARAMS(index, swizzle));
+			break;
+		default: _assert_(0);
+	}
+
+	object.Write("\n");
+}
+
+// vertex shader
+// lights/colors
+// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
+// inColorName is color in vs and colors_ in ps
+// dest is o.colors_ in vs and colors_ in ps
+template<class T>
+static void GenerateLightingShader(T& object, LightingUidData& uid_data, int components, const char* inColorName, const char* dest)
+{
+	for (unsigned int j = 0; j < xfmem.numChan.numColorChans; j++)
+	{
+		const LitChannel& color = xfmem.color[j];
+		const LitChannel& alpha = xfmem.alpha[j];
+
+		object.Write("{\n");
+
+		uid_data.matsource |= xfmem.color[j].matsource << j;
+		if (color.matsource) // from vertex
+		{
+			if (components & (VB_HAS_COL0 << j))
+				object.Write("int4 mat = int4(round(%s%d * 255.0));\n", inColorName, j);
+			else if (components & VB_HAS_COL0)
+				object.Write("int4 mat = int4(round(%s0 * 255.0));\n", inColorName);
+			else
+				object.Write("int4 mat = int4(255, 255, 255, 255);\n");
+		}
+		else // from color
+		{
+			object.Write("int4 mat = %s[%d];\n", I_MATERIALS, j+2);
+		}
+
+		uid_data.enablelighting |= xfmem.color[j].enablelighting << j;
+		if (color.enablelighting)
+		{
+			uid_data.ambsource |= xfmem.color[j].ambsource << j;
+			if (color.ambsource) // from vertex
+			{
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc = int4(round(%s%d * 255.0));\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc = int4(round(%s0 * 255.0));\n", inColorName);
+				else
+					// TODO: this isn't verified. Here we want to read the ambient from the vertex,
+					// but the vertex itself has no color. So we don't know which value to read.
+					// Returing 1.0 is the same as disabled lightning, so this could be fine
+					object.Write("lacc = int4(255, 255, 255, 255);\n");
+			}
+			else // from color
+			{
+				object.Write("lacc = %s[%d];\n", I_MATERIALS, j);
+			}
+		}
+		else
+		{
+			object.Write("lacc = int4(255, 255, 255, 255);\n");
+		}
+
+		// check if alpha is different
+		uid_data.matsource |= xfmem.alpha[j].matsource << (j+2);
+		if (alpha.matsource != color.matsource)
+		{
+			if (alpha.matsource) // from vertex
+			{
+				if (components & (VB_HAS_COL0<<j))
+					object.Write("mat.w = int(round(%s%d.w * 255.0));\n", inColorName, j);
+				else if (components & VB_HAS_COL0)
+					object.Write("mat.w = int(round(%s0.w * 255.0));\n", inColorName);
+				else object.Write("mat.w = 255;\n");
+			}
+			else // from color
+			{
+				object.Write("mat.w = %s[%d].w;\n", I_MATERIALS, j+2);
+			}
+		}
+
+		uid_data.enablelighting |= xfmem.alpha[j].enablelighting << (j+2);
+		if (alpha.enablelighting)
+		{
+			uid_data.ambsource |= xfmem.alpha[j].ambsource << (j+2);
+			if (alpha.ambsource) // from vertex
+			{
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc.w = int(round(%s%d.w * 255.0));\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc.w = int(round(%s0.w * 255.0));\n", inColorName);
+				else
+					// TODO: The same for alpha: We want to read from vertex, but the vertex has no color
+					object.Write("lacc.w = 255;\n");
+			}
+			else // from color
+			{
+				object.Write("lacc.w = %s[%d].w;\n", I_MATERIALS, j);
+			}
+		}
+		else
+		{
+			object.Write("lacc.w = 255;\n");
+		}
+
+		if (color.enablelighting && alpha.enablelighting)
+		{
+			// both have lighting, test if they use the same lights
+			int mask = 0;
+			uid_data.attnfunc |= color.attnfunc << (2*j);
+			uid_data.attnfunc |= alpha.attnfunc << (2*(j+2));
+			uid_data.diffusefunc |= color.diffusefunc << (2*j);
+			uid_data.diffusefunc |= alpha.diffusefunc << (2*(j+2));
+			uid_data.light_mask |= color.GetFullLightMask() << (8*j);
+			uid_data.light_mask |= alpha.GetFullLightMask() << (8*(j+2));
+			if (color.lightparams == alpha.lightparams)
+			{
+				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
+				if (mask)
+				{
+					for (int i = 0; i < 8; ++i)
+					{
+						if (mask & (1<<i))
+						{
+							GenerateLightShader<T>(object, uid_data, i, j, 3);
+						}
+					}
+				}
+			}
+
+			// no shared lights
+			for (int i = 0; i < 8; ++i)
+			{
+				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
+					GenerateLightShader<T>(object, uid_data, i, j, 1);
+				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
+					GenerateLightShader<T>(object, uid_data, i, j+2, 2);
+			}
+		}
+		else if (color.enablelighting || alpha.enablelighting)
+		{
+			// lights are disabled on one channel so process only the active ones
+			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
+			const int lit_index = color.enablelighting ? j : (j+2);
+			int coloralpha = color.enablelighting ? 1 : 2;
+
+			uid_data.light_mask |= workingchannel.GetFullLightMask() << (8*lit_index);
+			for (int i = 0; i < 8; ++i)
+			{
+				if (workingchannel.GetFullLightMask() & (1<<i))
+					GenerateLightShader<T>(object, uid_data, i, lit_index, coloralpha);
+			}
+		}
+		object.Write("lacc = clamp(lacc, 0, 255);\n");
+		if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+			object.Write("%s%d = float4(irshift((mat * (lacc + irshift(lacc, 7))), 8)) / 255.0;\n", dest, j);
+		else
+			object.Write("%s%d = float4((mat * (lacc + (lacc >> 7))) >> 8) / 255.0;\n", dest, j);
+		object.Write("}\n");
+	}
+}
diff --git a/Source/Core/VideoCommon/LookUpTables.h b/Source/Core/VideoCommon/LookUpTables.h
new file mode 100644
index 0000000000..d821597c8f
--- /dev/null
+++ b/Source/Core/VideoCommon/LookUpTables.h
@@ -0,0 +1,31 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+inline u8 Convert3To8(u8 v)
+{
+	// Swizzle bits: 00000123 -> 12312312
+	return (v << 5) | (v << 2) | (v >> 1);
+}
+
+inline u8 Convert4To8(u8 v)
+{
+	// Swizzle bits: 00001234 -> 12341234
+	return (v << 4) | v;
+}
+
+inline u8 Convert5To8(u8 v)
+{
+	// Swizzle bits: 00012345 -> 12345123
+	return (v << 3) | (v >> 2);
+}
+
+inline u8 Convert6To8(u8 v)
+{
+	// Swizzle bits: 00123456 -> 12345612
+	return (v << 2) | (v >> 4);
+}
diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp
new file mode 100644
index 0000000000..c92e7d5dab
--- /dev/null
+++ b/Source/Core/VideoCommon/MainBase.cpp
@@ -0,0 +1,262 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Event.h"
+#include "Core/ConfigManager.h"
+
+#include "VideoCommon/AsyncRequests.h"
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+#include "VideoCommon/MainBase.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VideoBackendBase.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/VideoState.h"
+
+bool s_BackendInitialized = false;
+
+static Common::Flag s_FifoShuttingDown;
+
+static volatile struct
+{
+	u32 xfbAddr;
+	u32 fbWidth;
+	u32 fbStride;
+	u32 fbHeight;
+} s_beginFieldArgs;
+
+void VideoBackendHardware::EmuStateChange(EMUSTATE_CHANGE newState)
+{
+	EmulatorState((newState == EMUSTATE_CHANGE_PLAY) ? true : false);
+}
+
+// Enter and exit the video loop
+void VideoBackendHardware::Video_EnterLoop()
+{
+	RunGpuLoop();
+}
+
+void VideoBackendHardware::Video_ExitLoop()
+{
+	ExitGpuLoop();
+	s_FifoShuttingDown.Set();
+}
+
+void VideoBackendHardware::Video_SetRendering(bool bEnabled)
+{
+	Fifo_SetRendering(bEnabled);
+}
+
+// Run from the CPU thread (from VideoInterface.cpp)
+void VideoBackendHardware::Video_BeginField(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight)
+{
+	if (s_BackendInitialized && g_ActiveConfig.bUseXFB)
+	{
+		s_beginFieldArgs.xfbAddr = xfbAddr;
+		s_beginFieldArgs.fbWidth = fbWidth;
+		s_beginFieldArgs.fbStride = fbStride;
+		s_beginFieldArgs.fbHeight = fbHeight;
+	}
+}
+
+// Run from the CPU thread (from VideoInterface.cpp)
+void VideoBackendHardware::Video_EndField()
+{
+	if (s_BackendInitialized && g_ActiveConfig.bUseXFB && g_renderer)
+	{
+		SyncGPU(SYNC_GPU_SWAP);
+
+		AsyncRequests::Event e;
+		e.time = 0;
+		e.type = AsyncRequests::Event::SWAP_EVENT;
+
+		e.swap_event.xfbAddr = s_beginFieldArgs.xfbAddr;
+		e.swap_event.fbWidth = s_beginFieldArgs.fbWidth;
+		e.swap_event.fbStride = s_beginFieldArgs.fbStride;
+		e.swap_event.fbHeight = s_beginFieldArgs.fbHeight;
+		AsyncRequests::GetInstance()->PushEvent(e, false);
+	}
+}
+
+void VideoBackendHardware::Video_AddMessage(const std::string& msg, u32 milliseconds)
+{
+	OSD::AddMessage(msg, milliseconds);
+}
+
+void VideoBackendHardware::Video_ClearMessages()
+{
+	OSD::ClearMessages();
+}
+
+// Screenshot
+bool VideoBackendHardware::Video_Screenshot(const std::string& filename)
+{
+	Renderer::SetScreenshot(filename.c_str());
+	return true;
+}
+
+u32 VideoBackendHardware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
+{
+	if (!g_ActiveConfig.bEFBAccessEnable)
+	{
+		return 0;
+	}
+
+	if (type == POKE_COLOR || type == POKE_Z)
+	{
+		AsyncRequests::Event e;
+		e.type = type == POKE_COLOR ? AsyncRequests::Event::EFB_POKE_COLOR : AsyncRequests::Event::EFB_POKE_Z;
+		e.time = 0;
+		e.efb_poke.data = InputData;
+		e.efb_poke.x = x;
+		e.efb_poke.y = y;
+		AsyncRequests::GetInstance()->PushEvent(e, false);
+		return 0;
+	}
+	else
+	{
+		AsyncRequests::Event e;
+		u32 result;
+		e.type = type == PEEK_COLOR ? AsyncRequests::Event::EFB_PEEK_COLOR : AsyncRequests::Event::EFB_PEEK_Z;
+		e.time = 0;
+		e.efb_peek.x = x;
+		e.efb_peek.y = y;
+		e.efb_peek.data = &result;
+		AsyncRequests::GetInstance()->PushEvent(e, true);
+		return result;
+	}
+}
+
+u32 VideoBackendHardware::Video_GetQueryResult(PerfQueryType type)
+{
+	if (!g_perf_query->ShouldEmulate())
+	{
+		return 0;
+	}
+
+	SyncGPU(SYNC_GPU_PERFQUERY);
+
+	AsyncRequests::Event e;
+	e.time = 0;
+	e.type = AsyncRequests::Event::PERF_QUERY;
+
+	if (!g_perf_query->IsFlushed())
+		AsyncRequests::GetInstance()->PushEvent(e, true);
+
+	return g_perf_query->GetQueryResult(type);
+}
+
+u16 VideoBackendHardware::Video_GetBoundingBox(int index)
+{
+	if (!g_ActiveConfig.backend_info.bSupportsBBox)
+		return 0;
+
+	if (!g_ActiveConfig.bBBoxEnable)
+	{
+		static bool warn_once = true;
+		if (warn_once)
+			ERROR_LOG(VIDEO, "BBox shall be used but it is disabled. Please use a gameini to enable it for this game.");
+		warn_once = false;
+		return 0;
+	}
+
+	SyncGPU(SYNC_GPU_BBOX);
+
+	AsyncRequests::Event e;
+	u16 result;
+	e.time = 0;
+	e.type = AsyncRequests::Event::BBOX_READ;
+	e.bbox.index = index;
+	e.bbox.data = &result;
+	AsyncRequests::GetInstance()->PushEvent(e, true);
+
+	return result;
+}
+
+void VideoBackendHardware::InitializeShared()
+{
+	VideoCommon_Init();
+
+	s_FifoShuttingDown.Clear();
+	memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs));
+	m_invalid = false;
+}
+
+// Run from the CPU thread
+void VideoBackendHardware::DoState(PointerWrap& p)
+{
+	bool software = false;
+	p.Do(software);
+
+	if (p.GetMode() == PointerWrap::MODE_READ && software == true)
+	{
+		// change mode to abort load of incompatible save state.
+		p.SetMode(PointerWrap::MODE_VERIFY);
+	}
+
+	VideoCommon_DoState(p);
+	p.DoMarker("VideoCommon");
+
+	p.Do(s_beginFieldArgs);
+	p.DoMarker("VideoBackendHardware");
+
+	// Refresh state.
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		m_invalid = true;
+
+		// Clear all caches that touch RAM
+		// (? these don't appear to touch any emulation state that gets saved. moved to on load only.)
+		VertexLoaderManager::MarkAllDirty();
+	}
+}
+
+void VideoBackendHardware::CheckInvalidState()
+{
+	if (m_invalid)
+	{
+		m_invalid = false;
+
+		BPReload();
+		TextureCache::Invalidate();
+	}
+}
+
+void VideoBackendHardware::PauseAndLock(bool doLock, bool unpauseOnUnlock)
+{
+	Fifo_PauseAndLock(doLock, unpauseOnUnlock);
+}
+
+void VideoBackendHardware::RunLoop(bool enable)
+{
+	VideoCommon_RunLoop(enable);
+}
+
+void VideoBackendHardware::Video_GatherPipeBursted()
+{
+	CommandProcessor::GatherPipeBursted();
+}
+
+int VideoBackendHardware::Video_Sync(int ticks)
+{
+	return Fifo_Update(ticks);
+}
+
+void VideoBackendHardware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	CommandProcessor::RegisterMMIO(mmio, base);
+}
+
+void VideoBackendHardware::UpdateWantDeterminism(bool want)
+{
+	Fifo_UpdateWantDeterminism(want);
+}
+
diff --git a/Source/Core/VideoCommon/MainBase.h b/Source/Core/VideoCommon/MainBase.h
new file mode 100644
index 0000000000..8e30d82a49
--- /dev/null
+++ b/Source/Core/VideoCommon/MainBase.h
@@ -0,0 +1,10 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "Common/Flag.h"
+
+extern bool s_BackendInitialized;
diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h
new file mode 100644
index 0000000000..c64d94fa77
--- /dev/null
+++ b/Source/Core/VideoCommon/NativeVertexFormat.h
@@ -0,0 +1,123 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional> // for hash
+
+#include "Common/Common.h"
+#include "Common/Hash.h"
+
+// m_components
+enum
+{
+	VB_HAS_POSMTXIDX =(1<<1),
+	VB_HAS_TEXMTXIDX0=(1<<2),
+	VB_HAS_TEXMTXIDX1=(1<<3),
+	VB_HAS_TEXMTXIDX2=(1<<4),
+	VB_HAS_TEXMTXIDX3=(1<<5),
+	VB_HAS_TEXMTXIDX4=(1<<6),
+	VB_HAS_TEXMTXIDX5=(1<<7),
+	VB_HAS_TEXMTXIDX6=(1<<8),
+	VB_HAS_TEXMTXIDX7=(1<<9),
+	VB_HAS_TEXMTXIDXALL=(0xff<<2),
+
+	//VB_HAS_POS=0, // Implied, it always has pos! don't bother testing
+	VB_HAS_NRM0=(1<<10),
+	VB_HAS_NRM1=(1<<11),
+	VB_HAS_NRM2=(1<<12),
+	VB_HAS_NRMALL=(7<<10),
+
+	VB_HAS_COL0=(1<<13),
+	VB_HAS_COL1=(1<<14),
+
+	VB_HAS_UV0=(1<<15),
+	VB_HAS_UV1=(1<<16),
+	VB_HAS_UV2=(1<<17),
+	VB_HAS_UV3=(1<<18),
+	VB_HAS_UV4=(1<<19),
+	VB_HAS_UV5=(1<<20),
+	VB_HAS_UV6=(1<<21),
+	VB_HAS_UV7=(1<<22),
+	VB_HAS_UVALL=(0xff<<15),
+	VB_HAS_UVTEXMTXSHIFT=13,
+};
+
+enum VarType
+{
+	VAR_UNSIGNED_BYTE,  // GX_U8  = 0
+	VAR_BYTE,           // GX_S8  = 1
+	VAR_UNSIGNED_SHORT, // GX_U16 = 2
+	VAR_SHORT,          // GX_S16 = 3
+	VAR_FLOAT,          // GX_F32 = 4
+};
+
+struct AttributeFormat
+{
+	VarType type;
+	int components;
+	int offset;
+	bool enable;
+	bool integer;
+};
+
+struct PortableVertexDeclaration
+{
+	int stride;
+
+	AttributeFormat position;
+	AttributeFormat normals[3];
+	AttributeFormat colors[2];
+	AttributeFormat texcoords[8];
+	AttributeFormat posmtx;
+
+	inline bool operator<(const PortableVertexDeclaration& b) const
+	{
+		return memcmp(this, &b, sizeof(PortableVertexDeclaration)) < 0;
+	}
+	inline bool operator==(const PortableVertexDeclaration& b) const
+	{
+		return memcmp(this, &b, sizeof(PortableVertexDeclaration)) == 0;
+	}
+};
+
+namespace std
+{
+
+template <>
+struct hash<PortableVertexDeclaration>
+{
+	size_t operator()(const PortableVertexDeclaration& decl) const
+	{
+		return HashFletcher((u8 *) &decl, sizeof(decl));
+	}
+};
+
+}
+
+// The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp
+// is in the respective backend, not here in VideoCommon.
+
+// Note that this class can't just invent arbitrary vertex formats out of its input -
+// all the data loading code must always be made compatible.
+class NativeVertexFormat : NonCopyable
+{
+public:
+	virtual ~NativeVertexFormat() {}
+
+	virtual void Initialize(const PortableVertexDeclaration &vtx_decl) = 0;
+	virtual void SetupVertexPointers() = 0;
+
+	u32 GetVertexStride() const { return vtx_decl.stride; }
+	const PortableVertexDeclaration& GetVertexDeclaration() const { return vtx_decl; }
+
+	// TODO: move this under private:
+	u32 m_components;  // VB_HAS_X. Bitmask telling what vertex components are present.
+
+protected:
+	// Let subclasses construct.
+	NativeVertexFormat() {}
+
+	PortableVertexDeclaration vtx_decl;
+};
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp
new file mode 100644
index 0000000000..2f59cf50dd
--- /dev/null
+++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp
@@ -0,0 +1,90 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <list>
+#include <map>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/RenderBase.h"
+
+
+namespace OSD
+{
+
+struct Message
+{
+	Message() {}
+	Message(const std::string& s, u32 ts, u32 rgba) : m_str(s), m_timestamp(ts), m_rgba(rgba)
+	{
+	}
+
+	std::string m_str;
+	u32 m_timestamp;
+	u32 m_rgba;
+};
+
+static std::multimap<CallbackType, Callback> s_callbacks;
+static std::list<Message> s_msgList;
+
+void AddMessage(const std::string& str, u32 ms, u32 rgba)
+{
+	s_msgList.emplace_back(str, Common::Timer::GetTimeMs() + ms, rgba);
+}
+
+void DrawMessages()
+{
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages)
+		return;
+
+	int left = 25, top = 15;
+	auto it = s_msgList.begin();
+	while (it != s_msgList.end())
+	{
+		int time_left = (int)(it->m_timestamp - Common::Timer::GetTimeMs());
+		float alpha = std::max(1.0f, std::min(0.0f, time_left / 1024.0f));
+		u32 color = (it->m_rgba & 0xFFFFFF) | ((u32)((it->m_rgba >> 24) * alpha) << 24);
+
+		g_renderer->RenderText(it->m_str, left, top, color);
+
+		top += 15;
+
+		if (time_left <= 0)
+			it = s_msgList.erase(it);
+		else
+			++it;
+	}
+}
+
+void ClearMessages()
+{
+	s_msgList.clear();
+}
+
+// On-Screen Display Callbacks
+void AddCallback(CallbackType type, Callback cb)
+{
+	s_callbacks.insert(std::pair<CallbackType, Callback>(type, cb));
+}
+
+void DoCallbacks(CallbackType type)
+{
+	auto it_bounds = s_callbacks.equal_range(type);
+	for (auto it = it_bounds.first; it != it_bounds.second; ++it)
+	{
+		it->second();
+	}
+
+	// Wipe all callbacks on shutdown
+	if (type == OSD_SHUTDOWN)
+		s_callbacks.clear();
+}
+
+}  // namespace
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.h b/Source/Core/VideoCommon/OnScreenDisplay.h
new file mode 100644
index 0000000000..17a5494345
--- /dev/null
+++ b/Source/Core/VideoCommon/OnScreenDisplay.h
@@ -0,0 +1,30 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+namespace OSD
+{
+// On-screen message display (colored yellow by default)
+void AddMessage(const std::string& str, u32 ms = 2000, u32 rgba = 0xFFFFFF30);
+void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
+void ClearMessages();
+
+// On-screen callbacks
+enum CallbackType
+{
+	OSD_INIT = 0,
+	OSD_ONFRAME,
+	OSD_SHUTDOWN
+};
+typedef std::function<void()> Callback;
+
+void AddCallback(CallbackType type, Callback cb);
+void DoCallbacks(CallbackType type);
+}  // namespace OSD
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
new file mode 100644
index 0000000000..3f2bd68eb3
--- /dev/null
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -0,0 +1,321 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+//DL facts:
+//  Ikaruga uses (nearly) NO display lists!
+//  Zelda WW uses TONS of display lists
+//  Zelda TP uses almost 100% display lists except menus (we like this!)
+//  Super Mario Galaxy has nearly all geometry and more than half of the state in DLs (great!)
+
+// Note that it IS NOT GENERALLY POSSIBLE to precompile display lists! You can compile them as they are
+// while interpreting them, and hope that the vertex format doesn't change, though, if you do it right
+// when they are called. The reason is that the vertex format affects the sizes of the vertices.
+
+#include "Common/CommonTypes.h"
+#include "Common/CPUDetect.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/HW/Memmap.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+
+bool g_bRecordFifoData = false;
+static bool s_bFifoErrorSeen = false;
+
+static u32 InterpretDisplayList(u32 address, u32 size)
+{
+	u8* startAddress;
+
+	if (g_use_deterministic_gpu_thread)
+		startAddress = (u8*)PopFifoAuxBuffer(size);
+	else
+		startAddress = Memory::GetPointer(address);
+
+	u32 cycles = 0;
+
+	// Avoid the crash if Memory::GetPointer failed ..
+	if (startAddress != nullptr)
+	{
+		// temporarily swap dl and non-dl (small "hack" for the stats)
+		Statistics::SwapDL();
+
+		OpcodeDecoder_Run(DataReader(startAddress, startAddress + size), &cycles, true);
+		INCSTAT(stats.thisFrame.numDListsCalled);
+
+		// un-swap
+		Statistics::SwapDL();
+	}
+
+	return cycles;
+}
+
+static void InterpretDisplayListPreprocess(u32 address, u32 size)
+{
+	u8* startAddress = Memory::GetPointer(address);
+
+	PushFifoAuxBuffer(startAddress, size);
+
+	if (startAddress != nullptr)
+	{
+		OpcodeDecoder_Run<true>(DataReader(startAddress, startAddress + size), nullptr, true);
+	}
+}
+
+static void UnknownOpcode(u8 cmd_byte, void *buffer, bool preprocess)
+{
+	// TODO(Omega): Maybe dump FIFO to file on this error
+	PanicAlert(
+	    "GFX FIFO: Unknown Opcode (0x%02x @ %p, preprocessing=%s).\n"
+	    "This means one of the following:\n"
+	    "* The emulated GPU got desynced, disabling dual core can help\n"
+	    "* Command stream corrupted by some spurious memory bug\n"
+	    "* This really is an unknown opcode (unlikely)\n"
+	    "* Some other sort of bug\n\n"
+	    "Further errors will be sent to the Video Backend log and\n"
+	    "Dolphin will now likely crash or hang. Enjoy." ,
+	    cmd_byte,
+	    buffer,
+	    preprocess ? "yes" : "no");
+
+	{
+		SCPFifoStruct &fifo = CommandProcessor::fifo;
+
+		PanicAlert(
+		    "Illegal command %02x\n"
+		    "CPBase: 0x%08x\n"
+		    "CPEnd: 0x%08x\n"
+		    "CPHiWatermark: 0x%08x\n"
+		    "CPLoWatermark: 0x%08x\n"
+		    "CPReadWriteDistance: 0x%08x\n"
+		    "CPWritePointer: 0x%08x\n"
+		    "CPReadPointer: 0x%08x\n"
+		    "CPBreakpoint: 0x%08x\n"
+		    "bFF_GPReadEnable: %s\n"
+		    "bFF_BPEnable: %s\n"
+		    "bFF_BPInt: %s\n"
+		    "bFF_Breakpoint: %s\n"
+		    "bFF_GPLinkEnable: %s\n"
+		    "bFF_HiWatermarkInt: %s\n"
+		    "bFF_LoWatermarkInt: %s\n"
+		    ,cmd_byte, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
+		    ,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint
+		    ,fifo.bFF_GPReadEnable ? "true" : "false"
+		    ,fifo.bFF_BPEnable ? "true" : "false"
+		    ,fifo.bFF_BPInt ? "true" : "false"
+		    ,fifo.bFF_Breakpoint ? "true" : "false"
+		    ,fifo.bFF_GPLinkEnable ? "true" : "false"
+		    ,fifo.bFF_HiWatermarkInt ? "true" : "false"
+		    ,fifo.bFF_LoWatermarkInt ? "true" : "false"
+		    );
+	}
+}
+
+void OpcodeDecoder_Init()
+{
+	s_bFifoErrorSeen = false;
+}
+
+
+void OpcodeDecoder_Shutdown()
+{
+}
+
+template <bool is_preprocess>
+u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list)
+{
+	u32 totalCycles = 0;
+	u8* opcodeStart;
+	while (true)
+	{
+		opcodeStart = src.GetPointer();
+
+		if (!src.size())
+			goto end;
+
+		u8 cmd_byte = src.Read<u8>();
+		int refarray;
+		switch (cmd_byte)
+		{
+		case GX_NOP:
+			totalCycles += 6; // Hm, this means that we scan over nop streams pretty slowly...
+			break;
+
+		case GX_UNKNOWN_RESET:
+			totalCycles += 6; // Datel software uses this command
+			DEBUG_LOG(VIDEO, "GX Reset?: %08x", cmd_byte);
+			break;
+
+		case GX_LOAD_CP_REG:
+			{
+				if (src.size() < 1 + 4)
+					goto end;
+				totalCycles += 12;
+				u8 sub_cmd = src.Read<u8>();
+				u32 value =  src.Read<u32>();
+				LoadCPReg(sub_cmd, value, is_preprocess);
+				if (!is_preprocess)
+					INCSTAT(stats.thisFrame.numCPLoads);
+			}
+			break;
+
+		case GX_LOAD_XF_REG:
+			{
+				if (src.size() < 4)
+					goto end;
+				u32 Cmd2 =  src.Read<u32>();
+				int transfer_size = ((Cmd2 >> 16) & 15) + 1;
+				if (src.size() < transfer_size * sizeof(u32))
+					goto end;
+				totalCycles += 18 + 6 * transfer_size;
+				if (!is_preprocess)
+				{
+					u32 xf_address = Cmd2 & 0xFFFF;
+					LoadXFReg(transfer_size, xf_address, src);
+
+					INCSTAT(stats.thisFrame.numXFLoads);
+				}
+				src.Skip<u32>(transfer_size);
+			}
+			break;
+
+		case GX_LOAD_INDX_A: //used for position matrices
+			refarray = 0xC;
+			goto load_indx;
+		case GX_LOAD_INDX_B: //used for normal matrices
+			refarray = 0xD;
+			goto load_indx;
+		case GX_LOAD_INDX_C: //used for postmatrices
+			refarray = 0xE;
+			goto load_indx;
+		case GX_LOAD_INDX_D: //used for lights
+			refarray = 0xF;
+			goto load_indx;
+		load_indx:
+			if (src.size() < 4)
+				goto end;
+			totalCycles += 6;
+			if (is_preprocess)
+				PreprocessIndexedXF(src.Read<u32>(), refarray);
+			else
+				LoadIndexedXF(src.Read<u32>(), refarray);
+			break;
+
+		case GX_CMD_CALL_DL:
+			{
+				if (src.size() < 8)
+					goto end;
+				u32 address = src.Read<u32>();
+				u32 count = src.Read<u32>();
+
+				if (in_display_list)
+				{
+					totalCycles += 6;
+					WARN_LOG(VIDEO,"recursive display list detected");
+				}
+				else
+				{
+					if (is_preprocess)
+						InterpretDisplayListPreprocess(address, count);
+					else
+						totalCycles += 6 + InterpretDisplayList(address, count);
+				}
+			}
+			break;
+
+		case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
+			totalCycles += 6;
+			DEBUG_LOG(VIDEO, "GX 0x44: %08x", cmd_byte);
+			break;
+
+		case GX_CMD_INVL_VC: // Invalidate Vertex Cache
+			totalCycles += 6;
+			DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)");
+			break;
+
+		case GX_LOAD_BP_REG:
+			// In skipped_frame case: We have to let BP writes through because they set
+			// tokens and stuff.  TODO: Call a much simplified LoadBPReg instead.
+			{
+				if (src.size() < 4)
+					goto end;
+				totalCycles += 12;
+				u32 bp_cmd = src.Read<u32>();
+				if (is_preprocess)
+				{
+					LoadBPRegPreprocess(bp_cmd);
+				}
+				else
+				{
+					LoadBPReg(bp_cmd);
+					INCSTAT(stats.thisFrame.numBPLoads);
+				}
+			}
+			break;
+
+		// draw primitives
+		default:
+			if ((cmd_byte & 0xC0) == 0x80)
+			{
+				// load vertices
+				if (src.size() < 2)
+					goto end;
+				u16 num_vertices = src.Read<u16>();
+				int bytes = VertexLoaderManager::RunVertices(
+					cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
+					(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
+					num_vertices,
+					src,
+					g_bSkipCurrentFrame,
+					is_preprocess);
+
+				if (bytes < 0)
+					goto end;
+
+				src.Skip(bytes);
+
+				// 4 GPU ticks per vertex, 3 CPU ticks per GPU tick
+				totalCycles += num_vertices * 4 * 3 + 6;
+			}
+			else
+			{
+				if (!s_bFifoErrorSeen)
+					UnknownOpcode(cmd_byte, opcodeStart, is_preprocess);
+				ERROR_LOG(VIDEO, "FIFO: Unknown Opcode(0x%02x @ %p, preprocessing = %s)", cmd_byte, opcodeStart, is_preprocess ? "yes" : "no");
+				s_bFifoErrorSeen = true;
+				totalCycles += 1;
+			}
+			break;
+		}
+
+		// Display lists get added directly into the FIFO stream
+		if (!is_preprocess && g_bRecordFifoData && cmd_byte != GX_CMD_CALL_DL)
+		{
+			u8* opcodeEnd;
+			opcodeEnd = src.GetPointer();
+			FifoRecorder::GetInstance().WriteGPCommand(opcodeStart, u32(opcodeEnd - opcodeStart));
+		}
+	}
+
+end:
+	if (cycles)
+	{
+		*cycles = totalCycles;
+	}
+	return opcodeStart;
+}
+
+template u8* OpcodeDecoder_Run<true>(DataReader src, u32* cycles, bool in_display_list);
+template u8* OpcodeDecoder_Run<false>(DataReader src, u32* cycles, bool in_display_list);
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h
new file mode 100644
index 0000000000..ec1b2652e4
--- /dev/null
+++ b/Source/Core/VideoCommon/OpcodeDecoding.h
@@ -0,0 +1,47 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/DataReader.h"
+
+#define GX_NOP                      0x00
+#define GX_UNKNOWN_RESET            0x01
+
+#define GX_LOAD_BP_REG              0x61
+#define GX_LOAD_CP_REG              0x08
+#define GX_LOAD_XF_REG              0x10
+#define GX_LOAD_INDX_A              0x20
+#define GX_LOAD_INDX_B              0x28
+#define GX_LOAD_INDX_C              0x30
+#define GX_LOAD_INDX_D              0x38
+
+#define GX_CMD_CALL_DL              0x40
+#define GX_CMD_UNKNOWN_METRICS      0x44
+#define GX_CMD_INVL_VC              0x48
+
+#define GX_PRIMITIVE_MASK           0x78
+#define GX_PRIMITIVE_SHIFT          3
+#define GX_VAT_MASK                 0x07
+
+// These values are the values extracted using GX_PRIMITIVE_MASK
+// and GX_PRIMITIVE_SHIFT.
+// GX_DRAW_QUADS_2 behaves the same way as GX_DRAW_QUADS.
+#define GX_DRAW_QUADS               0x0   // 0x80
+#define GX_DRAW_QUADS_2             0x1   // 0x88
+#define GX_DRAW_TRIANGLES           0x2   // 0x90
+#define GX_DRAW_TRIANGLE_STRIP      0x3   // 0x98
+#define GX_DRAW_TRIANGLE_FAN        0x4   // 0xA0
+#define GX_DRAW_LINES               0x5   // 0xA8
+#define GX_DRAW_LINE_STRIP          0x6   // 0xB0
+#define GX_DRAW_POINTS              0x7   // 0xB8
+
+extern bool g_bRecordFifoData;
+
+void OpcodeDecoder_Init();
+void OpcodeDecoder_Shutdown();
+
+template <bool is_preprocess = false>
+u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list);
diff --git a/Source/Core/VideoCommon/OpenCL.rules b/Source/Core/VideoCommon/OpenCL.rules
deleted file mode 100644
index cf695455ef..0000000000
--- a/Source/Core/VideoCommon/OpenCL.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="OpenCL"
-	Version="8,00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="OpenCL source"
-			DisplayName="OpenCL"
-			CommandLine='xcopy /I /Y "$(InputPath)" "$(SolutionDir)\..\Binary\$(PlatformName)\User\OpenCL\"'
-			Outputs='"$(SolutionDir)\..\Binary\$(PlatformName)\User\OpenCL\$(InputFileName)"'
-			FileExtensions="*.cl"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/Source/Core/VideoCommon/PerfQueryBase.cpp b/Source/Core/VideoCommon/PerfQueryBase.cpp
new file mode 100644
index 0000000000..76bec0ef46
--- /dev/null
+++ b/Source/Core/VideoCommon/PerfQueryBase.cpp
@@ -0,0 +1,13 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoCommon/PerfQueryBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+PerfQueryBase* g_perf_query = nullptr;
+
+bool PerfQueryBase::ShouldEmulate()
+{
+	return g_ActiveConfig.bPerfQueriesEnable;
+}
diff --git a/Source/Core/VideoCommon/Src/PerfQueryBase.h b/Source/Core/VideoCommon/PerfQueryBase.h
similarity index 76%
rename from Source/Core/VideoCommon/Src/PerfQueryBase.h
rename to Source/Core/VideoCommon/PerfQueryBase.h
index bf5474b4db..ca9243d1d0 100644
--- a/Source/Core/VideoCommon/Src/PerfQueryBase.h
+++ b/Source/Core/VideoCommon/PerfQueryBase.h
@@ -1,7 +1,10 @@
-#ifndef _PERFQUERY_BASE_H_
-#define _PERFQUERY_BASE_H_
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-#include "CommonTypes.h"
+#pragma once
+
+#include "Common/CommonTypes.h"
 
 enum PerfQueryType
 {
@@ -25,11 +28,16 @@ enum PerfQueryGroup
 class PerfQueryBase
 {
 public:
-	PerfQueryBase() {}
+	PerfQueryBase()
+		: m_query_count(0)
+	{
+	}
+
 	virtual ~PerfQueryBase() {}
 
 	// Checks if performance queries are enabled in the gameini configuration.
-	bool ShouldEmulate() const;
+	// NOTE: Called from CPU+GPU thread
+	static bool ShouldEmulate();
 
 	// Begin querying the specified value for the following host GPU commands
 	virtual void EnableQuery(PerfQueryGroup type) {}
@@ -50,8 +58,11 @@ public:
 	// True if there are no further pending query results
 	// NOTE: Called from CPU thread
 	virtual bool IsFlushed() const { return true; }
+
+protected:
+	// TODO: sloppy
+	volatile u32 m_query_count;
+	volatile u32 m_results[PQG_NUM_MEMBERS];
 };
 
 extern PerfQueryBase* g_perf_query;
-
-#endif // _PERFQUERY_H_
diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
new file mode 100644
index 0000000000..91662e9931
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -0,0 +1,326 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// http://www.nvidia.com/object/General_FAQ.html#t6 !!!!!
+
+#include <atomic>
+
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/State.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace PixelEngine
+{
+
+union UPEZConfReg
+{
+	u16 Hex;
+	struct
+	{
+		u16 ZCompEnable : 1; // Z Comparator Enable
+		u16 Function    : 3;
+		u16 ZUpdEnable  : 1;
+		u16             : 11;
+	};
+};
+
+union UPEAlphaConfReg
+{
+	u16 Hex;
+	struct
+	{
+		u16 BMMath         : 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
+		u16 BMLogic        : 1; // GX_BM_LOGIC
+		u16 Dither         : 1;
+		u16 ColorUpdEnable : 1;
+		u16 AlphaUpdEnable : 1;
+		u16 DstFactor      : 3;
+		u16 SrcFactor      : 3;
+		u16 Substract      : 1; // Additive mode by default
+		u16 BlendOperator  : 4;
+	};
+};
+
+union UPEDstAlphaConfReg
+{
+	u16 Hex;
+	struct
+	{
+		u16 DstAlpha : 8;
+		u16 Enable   : 1;
+		u16          : 7;
+	};
+};
+
+union UPEAlphaModeConfReg
+{
+	u16 Hex;
+	struct
+	{
+		u16 Threshold   : 8;
+		u16 CompareMode : 8;
+	};
+};
+
+// fifo Control Register
+union UPECtrlReg
+{
+	struct
+	{
+		u16 PETokenEnable  : 1;
+		u16 PEFinishEnable : 1;
+		u16 PEToken        : 1; // write only
+		u16 PEFinish       : 1; // write only
+		u16                : 12;
+	};
+	u16 Hex;
+	UPECtrlReg() {Hex = 0; }
+	UPECtrlReg(u16 _hex) {Hex = _hex; }
+};
+
+// STATE_TO_SAVE
+static UPEZConfReg         m_ZConf;
+static UPEAlphaConfReg     m_AlphaConf;
+static UPEDstAlphaConfReg  m_DstAlphaConf;
+static UPEAlphaModeConfReg m_AlphaModeConf;
+static UPEAlphaReadReg     m_AlphaRead;
+static UPECtrlReg          m_Control;
+//static u16                 m_Token; // token value most recently encountered
+
+static std::atomic<u32> s_signal_token_interrupt;
+static std::atomic<u32> s_signal_finish_interrupt;
+
+static int et_SetTokenOnMainThread;
+static int et_SetFinishOnMainThread;
+
+enum
+{
+	INT_CAUSE_PE_TOKEN  = 0x200, // GP Token
+	INT_CAUSE_PE_FINISH = 0x400, // GP Finished
+};
+
+void DoState(PointerWrap &p)
+{
+	p.Do(m_ZConf);
+	p.Do(m_AlphaConf);
+	p.Do(m_DstAlphaConf);
+	p.Do(m_AlphaModeConf);
+	p.Do(m_AlphaRead);
+	p.DoPOD(m_Control);
+
+	p.Do(s_signal_token_interrupt);
+	p.Do(s_signal_finish_interrupt);
+}
+
+void UpdateInterrupts();
+void UpdateTokenInterrupt(bool active);
+void UpdateFinishInterrupt(bool active);
+void SetToken_OnMainThread(u64 userdata, int cyclesLate);
+void SetFinish_OnMainThread(u64 userdata, int cyclesLate);
+
+void Init()
+{
+	m_Control.Hex = 0;
+	m_ZConf.Hex = 0;
+	m_AlphaConf.Hex = 0;
+	m_DstAlphaConf.Hex = 0;
+	m_AlphaModeConf.Hex = 0;
+	m_AlphaRead.Hex = 0;
+
+	s_signal_token_interrupt.store(0);
+	s_signal_finish_interrupt.store(0);
+
+	et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
+	et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
+}
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
+{
+	// Directly mapped registers.
+	struct {
+		u32 addr;
+		u16* ptr;
+	} directly_mapped_vars[] = {
+		{ PE_ZCONF, &m_ZConf.Hex },
+		{ PE_ALPHACONF, &m_AlphaConf.Hex },
+		{ PE_DSTALPHACONF, &m_DstAlphaConf.Hex },
+		{ PE_ALPHAMODE, &m_AlphaModeConf.Hex },
+		{ PE_ALPHAREAD, &m_AlphaRead.Hex },
+	};
+	for (auto& mapped_var : directly_mapped_vars)
+	{
+		mmio->Register(base | mapped_var.addr,
+			MMIO::DirectRead<u16>(mapped_var.ptr),
+			MMIO::DirectWrite<u16>(mapped_var.ptr)
+		);
+	}
+
+	// Performance queries registers: read only, need to call the video backend
+	// to get the results.
+	struct {
+		u32 addr;
+		PerfQueryType pqtype;
+	} pq_regs[] = {
+		{ PE_PERF_ZCOMP_INPUT_ZCOMPLOC_L, PQ_ZCOMP_INPUT_ZCOMPLOC },
+		{ PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_L, PQ_ZCOMP_OUTPUT_ZCOMPLOC },
+		{ PE_PERF_ZCOMP_INPUT_L, PQ_ZCOMP_INPUT },
+		{ PE_PERF_ZCOMP_OUTPUT_L, PQ_ZCOMP_OUTPUT },
+		{ PE_PERF_BLEND_INPUT_L, PQ_BLEND_INPUT },
+		{ PE_PERF_EFB_COPY_CLOCKS_L, PQ_EFB_COPY_CLOCKS },
+	};
+	for (auto& pq_reg : pq_regs)
+	{
+		mmio->Register(base | pq_reg.addr,
+			MMIO::ComplexRead<u16>([pq_reg](u32) {
+				return g_video_backend->Video_GetQueryResult(pq_reg.pqtype) & 0xFFFF;
+			}),
+			MMIO::InvalidWrite<u16>()
+		);
+		mmio->Register(base | (pq_reg.addr + 2),
+			MMIO::ComplexRead<u16>([pq_reg](u32) {
+				return g_video_backend->Video_GetQueryResult(pq_reg.pqtype) >> 16;
+			}),
+			MMIO::InvalidWrite<u16>()
+		);
+	}
+
+	// Control register
+	mmio->Register(base | PE_CTRL_REGISTER,
+		MMIO::DirectRead<u16>(&m_Control.Hex),
+		MMIO::ComplexWrite<u16>([](u32, u16 val) {
+			UPECtrlReg tmpCtrl(val);
+
+			if (tmpCtrl.PEToken)
+				s_signal_token_interrupt.store(0);
+
+			if (tmpCtrl.PEFinish)
+				s_signal_finish_interrupt.store(0);
+
+			m_Control.PETokenEnable  = tmpCtrl.PETokenEnable;
+			m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable;
+			m_Control.PEToken = 0;  // this flag is write only
+			m_Control.PEFinish = 0; // this flag is write only
+
+			DEBUG_LOG(PIXELENGINE, "(w16) CTRL_REGISTER: 0x%04x", val);
+			UpdateInterrupts();
+		})
+	);
+
+	// Token register, readonly.
+	mmio->Register(base | PE_TOKEN_REG,
+		MMIO::DirectRead<u16>(&CommandProcessor::fifo.PEToken),
+		MMIO::InvalidWrite<u16>()
+	);
+
+	// BBOX registers, readonly and need to update a flag.
+	for (int i = 0; i < 4; ++i)
+	{
+		mmio->Register(base | (PE_BBOX_LEFT + 2 * i),
+			MMIO::ComplexRead<u16>([i](u32) {
+				BoundingBox::active = false;
+				return g_video_backend->Video_GetBoundingBox(i);
+			}),
+			MMIO::InvalidWrite<u16>()
+		);
+	}
+}
+
+void UpdateInterrupts()
+{
+	// check if there is a token-interrupt
+	UpdateTokenInterrupt((s_signal_token_interrupt.load() & m_Control.PETokenEnable) != 0);
+
+	// check if there is a finish-interrupt
+	UpdateFinishInterrupt((s_signal_finish_interrupt.load() & m_Control.PEFinishEnable) != 0);
+}
+
+void UpdateTokenInterrupt(bool active)
+{
+	ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active);
+}
+
+void UpdateFinishInterrupt(bool active)
+{
+	ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active);
+}
+
+// TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate).
+//            Think about the right order between tokenVal and tokenINT... one day maybe.
+//            Cleanup++
+
+// Called only if BPMEM_PE_TOKEN_INT_ID is ack by GP
+void SetToken_OnMainThread(u64 userdata, int cyclesLate)
+{
+	// XXX: No 16-bit atomic store available, so cheat and use 32-bit.
+	// That's what we've always done. We're counting on fifo.PEToken to be
+	// 4-byte padded.
+	Common::AtomicStore(*(volatile u32*)&CommandProcessor::fifo.PEToken, userdata & 0xffff);
+	INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken);
+	if (userdata >> 16)
+	{
+		s_signal_token_interrupt.store(1);
+		UpdateInterrupts();
+	}
+	CommandProcessor::SetInterruptTokenWaiting(false);
+}
+
+void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
+{
+	s_signal_finish_interrupt.store(1);
+	UpdateInterrupts();
+	CommandProcessor::SetInterruptFinishWaiting(false);
+
+	Core::FrameUpdateOnCPUThread();
+}
+
+// SetToken
+// THIS IS EXECUTED FROM VIDEO THREAD
+void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
+{
+	if (_bSetTokenAcknowledge) // set token INT
+	{
+		s_signal_token_interrupt.store(1);
+	}
+
+	CommandProcessor::SetInterruptTokenWaiting(true);
+
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || g_use_deterministic_gpu_thread)
+		CoreTiming::ScheduleEvent(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
+	else
+		CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
+}
+
+// SetFinish
+// THIS IS EXECUTED FROM VIDEO THREAD (BPStructs.cpp) when a new frame has been drawn
+void SetFinish()
+{
+	CommandProcessor::SetInterruptFinishWaiting(true);
+
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || g_use_deterministic_gpu_thread)
+		CoreTiming::ScheduleEvent(0, et_SetFinishOnMainThread, 0);
+	else
+		CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0);
+
+	INFO_LOG(PIXELENGINE, "VIDEO Set Finish");
+}
+
+UPEAlphaReadReg GetAlphaReadMode()
+{
+	return m_AlphaRead;
+}
+
+} // end of namespace PixelEngine
diff --git a/Source/Core/VideoCommon/PixelEngine.h b/Source/Core/VideoCommon/PixelEngine.h
new file mode 100644
index 0000000000..501974ef2b
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelEngine.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+class PointerWrap;
+namespace MMIO { class Mapping; }
+
+// internal hardware addresses
+enum
+{
+	PE_ZCONF         = 0x00, // Z Config
+	PE_ALPHACONF     = 0x02, // Alpha Config
+	PE_DSTALPHACONF  = 0x04, // Destination Alpha Config
+	PE_ALPHAMODE     = 0x06, // Alpha Mode Config
+	PE_ALPHAREAD     = 0x08, // Alpha Read
+	PE_CTRL_REGISTER = 0x0a, // Control
+	PE_TOKEN_REG     = 0x0e, // Token
+	PE_BBOX_LEFT     = 0x10, // Bounding Box Left Pixel
+	PE_BBOX_RIGHT    = 0x12, // Bounding Box Right Pixel
+	PE_BBOX_TOP      = 0x14, // Bounding Box Top Pixel
+	PE_BBOX_BOTTOM   = 0x16, // Bounding Box Bottom Pixel
+
+	// NOTE: Order not verified
+	// These indicate the number of quads that are being used as input/output for each particular stage
+	PE_PERF_ZCOMP_INPUT_ZCOMPLOC_L  = 0x18,
+	PE_PERF_ZCOMP_INPUT_ZCOMPLOC_H  = 0x1a,
+	PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_L = 0x1c,
+	PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_H = 0x1e,
+	PE_PERF_ZCOMP_INPUT_L           = 0x20,
+	PE_PERF_ZCOMP_INPUT_H           = 0x22,
+	PE_PERF_ZCOMP_OUTPUT_L          = 0x24,
+	PE_PERF_ZCOMP_OUTPUT_H          = 0x26,
+	PE_PERF_BLEND_INPUT_L           = 0x28,
+	PE_PERF_BLEND_INPUT_H           = 0x2a,
+	PE_PERF_EFB_COPY_CLOCKS_L       = 0x2c,
+	PE_PERF_EFB_COPY_CLOCKS_H       = 0x2e,
+};
+
+namespace PixelEngine
+{
+
+// ReadMode specifies the returned alpha channel for EFB peeks
+union UPEAlphaReadReg
+{
+	u16 Hex;
+	struct
+	{
+		u16 ReadMode : 2;
+		u16          : 14;
+	};
+};
+
+void Init();
+void DoState(PointerWrap &p);
+
+void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
+
+// gfx backend support
+void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
+void SetFinish();
+UPEAlphaReadReg GetAlphaReadMode();
+
+} // end of namespace PixelEngine
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp
new file mode 100644
index 0000000000..ad251203f9
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelShaderGen.cpp
@@ -0,0 +1,1251 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"  // for texture projection mode
+
+
+static const char *tevKSelTableC[] =
+{
+	"255,255,255",  // 1   = 0x00
+	"223,223,223",  // 7_8 = 0x01
+	"191,191,191",  // 3_4 = 0x02
+	"159,159,159",  // 5_8 = 0x03
+	"128,128,128",  // 1_2 = 0x04
+	"96,96,96",     // 3_8 = 0x05
+	"64,64,64",     // 1_4 = 0x06
+	"32,32,32",     // 1_8 = 0x07
+	"0,0,0",        // INVALID = 0x08
+	"0,0,0",        // INVALID = 0x09
+	"0,0,0",        // INVALID = 0x0a
+	"0,0,0",        // INVALID = 0x0b
+	I_KCOLORS"[0].rgb", // K0 = 0x0C
+	I_KCOLORS"[1].rgb", // K1 = 0x0D
+	I_KCOLORS"[2].rgb", // K2 = 0x0E
+	I_KCOLORS"[3].rgb", // K3 = 0x0F
+	I_KCOLORS"[0].rrr", // K0_R = 0x10
+	I_KCOLORS"[1].rrr", // K1_R = 0x11
+	I_KCOLORS"[2].rrr", // K2_R = 0x12
+	I_KCOLORS"[3].rrr", // K3_R = 0x13
+	I_KCOLORS"[0].ggg", // K0_G = 0x14
+	I_KCOLORS"[1].ggg", // K1_G = 0x15
+	I_KCOLORS"[2].ggg", // K2_G = 0x16
+	I_KCOLORS"[3].ggg", // K3_G = 0x17
+	I_KCOLORS"[0].bbb", // K0_B = 0x18
+	I_KCOLORS"[1].bbb", // K1_B = 0x19
+	I_KCOLORS"[2].bbb", // K2_B = 0x1A
+	I_KCOLORS"[3].bbb", // K3_B = 0x1B
+	I_KCOLORS"[0].aaa", // K0_A = 0x1C
+	I_KCOLORS"[1].aaa", // K1_A = 0x1D
+	I_KCOLORS"[2].aaa", // K2_A = 0x1E
+	I_KCOLORS"[3].aaa", // K3_A = 0x1F
+};
+
+static const char *tevKSelTableA[] =
+{
+	"255",  // 1   = 0x00
+	"223",  // 7_8 = 0x01
+	"191",  // 3_4 = 0x02
+	"159",  // 5_8 = 0x03
+	"128",  // 1_2 = 0x04
+	"96",   // 3_8 = 0x05
+	"64",   // 1_4 = 0x06
+	"32",   // 1_8 = 0x07
+	"0",    // INVALID = 0x08
+	"0",    // INVALID = 0x09
+	"0",    // INVALID = 0x0a
+	"0",    // INVALID = 0x0b
+	"0",    // INVALID = 0x0c
+	"0",    // INVALID = 0x0d
+	"0",    // INVALID = 0x0e
+	"0",    // INVALID = 0x0f
+	I_KCOLORS"[0].r", // K0_R = 0x10
+	I_KCOLORS"[1].r", // K1_R = 0x11
+	I_KCOLORS"[2].r", // K2_R = 0x12
+	I_KCOLORS"[3].r", // K3_R = 0x13
+	I_KCOLORS"[0].g", // K0_G = 0x14
+	I_KCOLORS"[1].g", // K1_G = 0x15
+	I_KCOLORS"[2].g", // K2_G = 0x16
+	I_KCOLORS"[3].g", // K3_G = 0x17
+	I_KCOLORS"[0].b", // K0_B = 0x18
+	I_KCOLORS"[1].b", // K1_B = 0x19
+	I_KCOLORS"[2].b", // K2_B = 0x1A
+	I_KCOLORS"[3].b", // K3_B = 0x1B
+	I_KCOLORS"[0].a", // K0_A = 0x1C
+	I_KCOLORS"[1].a", // K1_A = 0x1D
+	I_KCOLORS"[2].a", // K2_A = 0x1E
+	I_KCOLORS"[3].a", // K3_A = 0x1F
+};
+
+static const char *tevCInputTable[] =
+{
+	"prev.rgb",          // CPREV,
+	"prev.aaa",          // APREV,
+	"c0.rgb",            // C0,
+	"c0.aaa",            // A0,
+	"c1.rgb",            // C1,
+	"c1.aaa",            // A1,
+	"c2.rgb",            // C2,
+	"c2.aaa",            // A2,
+	"textemp.rgb",       // TEXC,
+	"textemp.aaa",       // TEXA,
+	"rastemp.rgb",       // RASC,
+	"rastemp.aaa",       // RASA,
+	"int3(255,255,255)", // ONE
+	"int3(128,128,128)", // HALF
+	"konsttemp.rgb",     // KONST
+	"int3(0,0,0)",       // ZERO
+};
+
+static const char *tevAInputTable[] =
+{
+	"prev.a",        // APREV,
+	"c0.a",          // A0,
+	"c1.a",          // A1,
+	"c2.a",          // A2,
+	"textemp.a",     // TEXA,
+	"rastemp.a",     // RASA,
+	"konsttemp.a",   // KONST,  (hw1 had quarter)
+	"0",             // ZERO
+};
+
+static const char *tevRasTable[] =
+{
+	"iround(col0 * 255.0)",
+	"iround(col1 * 255.0)",
+	"ERROR13", //2
+	"ERROR14", //3
+	"ERROR15", //4
+	"(int4(1, 1, 1, 1) * alphabump)", // bump alpha (0..248)
+	"(int4(1, 1, 1, 1) * (alphabump | (alphabump >> 5)))", // normalized bump alpha (0..255)
+	"int4(0, 0, 0, 0)", // zero
+};
+
+static const char *tevCOutputTable[]  = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" };
+static const char *tevAOutputTable[]  = { "prev.a", "c0.a", "c1.a", "c2.a" };
+
+static char text[16384];
+
+template<class T> static inline void WriteStage(T& out, pixel_shader_uid_data* uid_data, int n, API_TYPE ApiType, const char swapModeTable[4][5]);
+template<class T> static inline void WriteTevRegular(T& out, const char* components, int bias, int op, int clamp, int shift);
+template<class T> static inline void SampleTexture(T& out, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
+template<class T> static inline void WriteAlphaTest(T& out, pixel_shader_uid_data* uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
+template<class T> static inline void WriteFog(T& out, pixel_shader_uid_data* uid_data);
+
+template<class T>
+static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+{
+	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
+	pixel_shader_uid_data dummy_data;
+	pixel_shader_uid_data* uid_data = out.template GetUidData<pixel_shader_uid_data>();
+	if (uid_data == nullptr)
+		uid_data = &dummy_data;
+
+	out.SetBuffer(text);
+	const bool is_writing_shadercode = (out.GetBuffer() != nullptr);
+
+	if (is_writing_shadercode)
+		text[sizeof(text) - 1] = 0x7C;  // canary
+
+	unsigned int numStages = bpmem.genMode.numtevstages + 1;
+	unsigned int numTexgen = bpmem.genMode.numtexgens;
+
+	out.Write("//Pixel Shader for TEV stages\n");
+	out.Write("//%i TEV stages, %i texgens, %i IND stages\n",
+		numStages, numTexgen, bpmem.genMode.numindstages);
+
+	uid_data->dstAlphaMode = dstAlphaMode;
+	uid_data->genMode_numindstages = bpmem.genMode.numindstages;
+	uid_data->genMode_numtevstages = bpmem.genMode.numtevstages;
+	uid_data->genMode_numtexgens = bpmem.genMode.numtexgens;
+
+	// dot product for integer vectors
+	out.Write("int idot(int3 x, int3 y)\n"
+	          "{\n"
+	          "\tint3 tmp = x * y;\n"
+	          "\treturn tmp.x + tmp.y + tmp.z;\n"
+	          "}\n");
+
+	out.Write("int idot(int4 x, int4 y)\n"
+	          "{\n"
+	          "\tint4 tmp = x * y;\n"
+	          "\treturn tmp.x + tmp.y + tmp.z + tmp.w;\n"
+	          "}\n\n");
+
+	// rounding + casting to integer at once in a single function
+	out.Write("int  iround(float  x) { return int (round(x)); }\n"
+	          "int2 iround(float2 x) { return int2(round(x)); }\n"
+	          "int3 iround(float3 x) { return int3(round(x)); }\n"
+	          "int4 iround(float4 x) { return int4(round(x)); }\n\n");
+
+	out.Write("int  itrunc(float  x) { return int (trunc(x)); }\n"
+	          "int2 itrunc(float2 x) { return int2(trunc(x)); }\n"
+	          "int3 itrunc(float3 x) { return int3(trunc(x)); }\n"
+	          "int4 itrunc(float4 x) { return int4(trunc(x)); }\n\n");
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+	{
+		// Add functions to do shifts on scalars and ivecs.
+		// These functions all have the same name to enable them to be used no matter what code is generated.
+		// For example: tev color op code uses .rgb as a swizzle, but alpha code only uses .a.
+		out.Write("int ilshift(int a, int b) { return a << b; }\n"
+		          "int irshift(int a, int b) { return a >> b; }\n"
+
+		          "int2 ilshift(int2 a, int2 b) { return int2(a.x << b.x, a.y << b.y); }\n"
+		          "int2 ilshift(int2 a, int b) { return int2(a.x << b, a.y << b); }\n"
+		          "int2 irshift(int2 a, int2 b) { return int2(a.x >> b.x, a.y >> b.y); }\n"
+		          "int2 irshift(int2 a, int b) { return int2(a.x >> b, a.y >> b); }\n"
+
+		          "int3 ilshift(int3 a, int3 b) { return int3(a.x << b.x, a.y << b.y, a.z << b.z); }\n"
+		          "int3 ilshift(int3 a, int b) { return int3(a.x << b, a.y << b, a.z << b); }\n"
+		          "int3 irshift(int3 a, int3 b) { return int3(a.x >> b.x, a.y >> b.y, a.z >> b.z); }\n"
+		          "int3 irshift(int3 a, int b) { return int3(a.x >> b, a.y >> b, a.z >> b); }\n"
+
+		          "int4 ilshift(int4 a, int4 b) { return int4(a.x << b.x, a.y << b.y, a.z << b.z, a.w << b.w); }\n"
+		          "int4 ilshift(int4 a, int b) { return int4(a.x << b, a.y << b, a.z << b, a.w << b); }\n"
+		          "int4 irshift(int4 a, int4 b) { return int4(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); }\n"
+		          "int4 irshift(int4 a, int b) { return int4(a.x >> b, a.y >> b, a.z >> b, a.w >> b); }\n\n");
+	}
+
+	if (ApiType == API_OPENGL)
+	{
+		// Declare samplers
+		for (int i = 0; i < 8; ++i)
+			out.Write("SAMPLER_BINDING(%d) uniform sampler2DArray samp%d;\n", i, i);
+	}
+	else // D3D
+	{
+		// Declare samplers
+		for (int i = 0; i < 8; ++i)
+			out.Write("sampler samp%d : register(s%d);\n", i, i);
+
+		out.Write("\n");
+		for (int i = 0; i < 8; ++i)
+			out.Write("Texture2DArray Tex%d : register(t%d);\n", i, i);
+	}
+	out.Write("\n");
+
+	if (ApiType == API_OPENGL)
+	{
+		out.Write("layout(std140%s) uniform PSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 1" : "");
+	}
+	else
+	{
+		out.Write("cbuffer PSBlock : register(b0) {\n");
+	}
+	out.Write(
+		"\tint4 " I_COLORS"[4];\n"
+		"\tint4 " I_KCOLORS"[4];\n"
+		"\tint4 " I_ALPHA";\n"
+		"\tfloat4 " I_TEXDIMS"[8];\n"
+		"\tint4 " I_ZBIAS"[2];\n"
+		"\tint4 " I_INDTEXSCALE"[2];\n"
+		"\tint4 " I_INDTEXMTX"[6];\n"
+		"\tint4 " I_FOGCOLOR";\n"
+		"\tint4 " I_FOGI";\n"
+		"\tfloat4 " I_FOGF"[2];\n"
+		"\tfloat4 " I_ZSLOPE";\n"
+		"\tfloat4 " I_EFBSCALE";\n"
+		"};\n");
+
+	if (g_ActiveConfig.bEnablePixelLighting)
+	{
+		out.Write("%s", s_lighting_struct);
+
+		if (ApiType == API_OPENGL)
+		{
+			out.Write("layout(std140%s) uniform VSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 2" : "");
+		}
+		else
+		{
+			out.Write("cbuffer VSBlock : register(b1) {\n");
+		}
+		out.Write(s_shader_uniforms);
+		out.Write("};\n");
+	}
+
+	if (g_ActiveConfig.backend_info.bSupportsBBox && g_ActiveConfig.bBBoxEnable)
+	{
+		if (ApiType == API_OPENGL)
+		{
+			out.Write(
+				"layout(std140, binding = 3) buffer BBox {\n"
+				"\tint4 bbox_data;\n"
+				"};\n"
+				);
+		}
+		else
+		{
+			out.Write(
+				"globallycoherent RWBuffer<int> bbox_data : register(u2);\n"
+				);
+		}
+	}
+
+	out.Write("struct VS_OUTPUT {\n");
+	GenerateVSOutputMembers<T>(out, ApiType);
+	out.Write("};\n");
+
+	const bool forced_early_z = g_ActiveConfig.backend_info.bSupportsEarlyZ && bpmem.UseEarlyDepthTest()
+	                            && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED)
+	                            // We can't allow early_ztest for zfreeze because depth is overridden per-pixel.
+	                            // This means it's impossible for zcomploc to be emulated on a zfrozen polygon.
+	                            && !(bpmem.zmode.testenable && bpmem.genMode.zfreeze);
+	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && bpmem.UseLateDepthTest())
+	                             || (!g_ActiveConfig.bFastDepthCalc && bpmem.zmode.testenable && !forced_early_z)
+	                             || (bpmem.zmode.testenable && bpmem.genMode.zfreeze);
+
+	if (forced_early_z)
+	{
+		// Zcomploc (aka early_ztest) is a way to control whether depth test is done before
+		// or after texturing and alpha test. PC graphics APIs used to provide no way to emulate
+		// this feature properly until 2012: Depth tests were always done after alpha testing.
+		// Most importantly, it was not possible to write to the depth buffer without also writing
+		// a color value (unless color writing was disabled altogether).
+
+		// OpenGL has a flag which allows the driver to still update the depth buffer if alpha
+		// test fails. The driver isn't required to do this, but I (degasus) assume all of them do
+		// because it's the much faster code path for the GPU.
+
+		// D3D11 also has a way to force the driver to enable early-z, so we're fine here.
+		if(ApiType == API_OPENGL)
+		{
+			out.Write("layout(early_fragment_tests) in;\n");
+		}
+		else
+		{
+			out.Write("[earlydepthstencil]\n");
+		}
+	}
+	else if (bpmem.UseEarlyDepthTest() && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED) && is_writing_shadercode)
+	{
+		static bool warn_once = true;
+		if (warn_once)
+			WARN_LOG(VIDEO, "Early z test enabled but not possible to emulate with current configuration. Make sure to enable fast depth calculations. If this message still shows up your hardware isn't able to emulate the feature properly (a GPU with D3D 11.0 / OGL 4.2 support is required).");
+		warn_once = false;
+	}
+
+	if (ApiType == API_OPENGL)
+	{
+		out.Write("out vec4 ocol0;\n");
+		if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
+			out.Write("out vec4 ocol1;\n");
+
+		if (per_pixel_depth)
+			out.Write("#define depth gl_FragDepth\n");
+
+		// We use the flag "centroid" to fix some MSAA rendering bugs. With MSAA, the
+		// pixel shader will be executed for each pixel which has at least one passed sample.
+		// So there may be rendered pixels where the center of the pixel isn't in the primitive.
+		// As the pixel shader usually renders at the center of the pixel, this position may be
+		// outside the primitive. This will lead to sampling outside the texture, sign changes, ...
+		// As a workaround, we interpolate at the centroid of the coveraged pixel, which
+		// is always inside the primitive.
+		// Without MSAA, this flag is defined to have no effect.
+		uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
+		if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
+		{
+			out.Write("in VertexData {\n");
+			GenerateVSOutputMembers<T>(out, ApiType, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid in");
+
+			if (g_ActiveConfig.iStereoMode > 0)
+				out.Write("\tflat int layer;\n");
+
+			out.Write("};\n");
+		}
+		else
+		{
+			out.Write("centroid in float4 colors_0;\n");
+			out.Write("centroid in float4 colors_1;\n");
+			// compute window position if needed because binding semantic WPOS is not widely supported
+			// Let's set up attributes
+			for (unsigned int i = 0; i < numTexgen; ++i)
+			{
+				out.Write("centroid in float3 uv%d;\n", i);
+			}
+			out.Write("centroid in float4 clipPos;\n");
+			if (g_ActiveConfig.bEnablePixelLighting)
+			{
+				out.Write("centroid in float3 Normal;\n");
+				out.Write("centroid in float3 WorldPos;\n");
+			}
+		}
+
+		out.Write("void main()\n{\n");
+
+		if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
+		{
+			for (unsigned int i = 0; i < numTexgen; ++i)
+				out.Write("\tfloat3 uv%d = tex%d;\n", i, i);
+		}
+
+		out.Write("\tfloat4 rawpos = gl_FragCoord;\n");
+	}
+	else // D3D
+	{
+		out.Write("void main(\n");
+		out.Write("  out float4 ocol0 : SV_Target0,%s%s\n  in float4 rawpos : SV_Position,\n",
+			dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n  out float4 ocol1 : SV_Target1," : "",
+			per_pixel_depth ? "\n  out float depth : SV_Depth," : "");
+
+		out.Write("  in centroid float4 colors_0 : COLOR0,\n");
+		out.Write("  in centroid float4 colors_1 : COLOR1\n");
+
+		// compute window position if needed because binding semantic WPOS is not widely supported
+		for (unsigned int i = 0; i < numTexgen; ++i)
+			out.Write(",\n  in centroid float3 uv%d : TEXCOORD%d", i, i);
+		out.Write(",\n  in centroid float4 clipPos : TEXCOORD%d", numTexgen);
+		if (g_ActiveConfig.bEnablePixelLighting)
+		{
+			out.Write(",\n  in centroid float3 Normal : TEXCOORD%d", numTexgen + 1);
+			out.Write(",\n  in centroid float3 WorldPos : TEXCOORD%d", numTexgen + 2);
+		}
+		uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
+		if (g_ActiveConfig.iStereoMode > 0)
+			out.Write(",\n  in uint layer : SV_RenderTargetArrayIndex\n");
+		out.Write("        ) {\n");
+	}
+
+	out.Write("\tint4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = " I_COLORS"[0];\n"
+	          "\tint4 rastemp = int4(0, 0, 0, 0), textemp = int4(0, 0, 0, 0), konsttemp = int4(0, 0, 0, 0);\n"
+	          "\tint3 comp16 = int3(1, 256, 0), comp24 = int3(1, 256, 256*256);\n"
+	          "\tint alphabump=0;\n"
+	          "\tint3 tevcoord=int3(0, 0, 0);\n"
+	          "\tint2 wrappedcoord=int2(0,0), tempcoord=int2(0,0);\n"
+	          "\tint4 tevin_a=int4(0,0,0,0),tevin_b=int4(0,0,0,0),tevin_c=int4(0,0,0,0),tevin_d=int4(0,0,0,0);\n\n"); // tev combiner inputs
+
+	// On GLSL, input variables must not be assigned to.
+	// This is why we declare these variables locally instead.
+	out.Write("\tfloat4 col0 = colors_0;\n");
+	out.Write("\tfloat4 col1 = colors_1;\n");
+
+	if (g_ActiveConfig.bEnablePixelLighting)
+	{
+		out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n");
+		out.Write("\tfloat3 pos = WorldPos;\n");
+
+		out.Write("\tint4 lacc;\n"
+				"\tfloat3 ldir, h, cosAttn, distAttn;\n"
+				"\tfloat dist, dist2, attn;\n");
+
+		// TODO: Our current constant usage code isn't able to handle more than one buffer.
+		//       So we can't mark the VS constant as used here. But keep them here as reference.
+		//out.SetConstantsUsed(C_PLIGHT_COLORS, C_PLIGHT_COLORS+7); // TODO: Can be optimized further
+		//out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+31); // TODO: Can be optimized further
+		//out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
+		uid_data->components = components;
+		GenerateLightingShader<T>(out, uid_data->lighting, components, "colors_", "col");
+	}
+
+	// HACK to handle cases where the tex gen is not enabled
+	if (numTexgen == 0)
+	{
+		out.Write("\tint2 fixpoint_uv0 = int2(0, 0);\n\n");
+	}
+	else
+	{
+		out.SetConstantsUsed(C_TEXDIMS, C_TEXDIMS+numTexgen-1);
+		for (unsigned int i = 0; i < numTexgen; ++i)
+		{
+			out.Write("\tint2 fixpoint_uv%d = itrunc(", i);
+			// optional perspective divides
+			uid_data->texMtxInfo_n_projection |= xfmem.texMtxInfo[i].projection << i;
+			if (xfmem.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
+			{
+				out.Write("(uv%d.z == 0.0 ? uv%d.xy : uv%d.xy / uv%d.z)", i, i, i, i);
+			}
+			else
+			{
+				out.Write("uv%d.xy", i);
+			}
+			out.Write(" * " I_TEXDIMS"[%d].zw * 128.0);\n", i);
+			// TODO: S24 overflows here?
+		}
+	}
+
+	// indirect texture map lookup
+	int nIndirectStagesUsed = 0;
+	if (bpmem.genMode.numindstages > 0)
+	{
+		for (unsigned int i = 0; i < numStages; ++i)
+		{
+			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
+		}
+	}
+
+	uid_data->nIndirectStagesUsed = nIndirectStagesUsed;
+	for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
+	{
+		if (nIndirectStagesUsed & (1 << i))
+		{
+			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
+			unsigned int texmap = bpmem.tevindref.getTexMap(i);
+
+			uid_data->SetTevindrefValues(i, texcoord, texmap);
+			if (texcoord < numTexgen)
+			{
+				out.SetConstantsUsed(C_INDTEXSCALE+i/2,C_INDTEXSCALE+i/2);
+
+				if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+					out.Write("\ttempcoord = irshift(fixpoint_uv%d, " I_INDTEXSCALE"[%d].%s);\n", texcoord, i / 2, (i & 1) ? "zw" : "xy");
+				else
+					out.Write("\ttempcoord = fixpoint_uv%d >> " I_INDTEXSCALE"[%d].%s;\n", texcoord, i / 2, (i & 1) ? "zw" : "xy");
+			}
+			else
+				out.Write("\ttempcoord = int2(0, 0);\n");
+
+			out.Write("\tint3 iindtex%d = ", i);
+			SampleTexture<T>(out, "(float2(tempcoord)/128.0)", "abg", texmap, ApiType);
+		}
+	}
+
+	// Uid fields for BuildSwapModeTable are set in WriteStage
+	char swapModeTable[4][5];
+	const char* swapColors = "rgba";
+	for (int i = 0; i < 4; i++)
+	{
+		swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1];
+		swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2];
+		swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1];
+		swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2];
+		swapModeTable[i][4] = '\0';
+	}
+
+	for (unsigned int i = 0; i < numStages; i++)
+		WriteStage<T>(out, uid_data, i, ApiType, swapModeTable); // build the equation for this stage
+
+#define MY_STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
+	bool enable_pl = g_ActiveConfig.bEnablePixelLighting;
+	uid_data->num_values = (enable_pl) ? sizeof(*uid_data) : MY_STRUCT_OFFSET(*uid_data,stagehash[numStages]);
+
+
+	if (numStages)
+	{
+		// The results of the last texenv stage are put onto the screen,
+		// regardless of the used destination register
+		if (bpmem.combiners[numStages - 1].colorC.dest != 0)
+		{
+			out.Write("\tprev.rgb = %s;\n", tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
+		}
+		if (bpmem.combiners[numStages - 1].alphaC.dest != 0)
+		{
+			out.Write("\tprev.a = %s;\n", tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]);
+		}
+	}
+	out.Write("\tprev = prev & 255;\n");
+
+	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
+	uid_data->Pretest = Pretest;
+
+	// NOTE: Fragment may not be discarded if alpha test always fails and early depth test is enabled
+	// (in this case we need to write a depth value if depth test passes regardless of the alpha testing result)
+	if (Pretest == AlphaTest::UNDETERMINED || (Pretest == AlphaTest::FAIL && bpmem.UseLateDepthTest()))
+		WriteAlphaTest<T>(out, uid_data, ApiType, dstAlphaMode, per_pixel_depth);
+
+	if (bpmem.genMode.zfreeze)
+	{
+		out.SetConstantsUsed(C_ZSLOPE, C_ZSLOPE);
+		out.SetConstantsUsed(C_EFBSCALE, C_EFBSCALE);
+
+		out.Write("\tfloat2 screenpos = rawpos.xy * " I_EFBSCALE".xy;\n");
+
+		// Opengl has reversed vertical screenspace coordiantes
+		if (ApiType == API_OPENGL)
+			out.Write("\tscreenpos.y = %i - screenpos.y;\n", EFB_HEIGHT);
+
+		out.Write("\tint zCoord = int(" I_ZSLOPE".z + " I_ZSLOPE".x * screenpos.x + " I_ZSLOPE".y * screenpos.y);\n");
+	}
+	else if (!g_ActiveConfig.bFastDepthCalc)
+	{
+		// FastDepth means to trust the depth generated in perspective division.
+		// It should be correct, but it seems not to be as accurate as required. TODO: Find out why!
+		// For disabled FastDepth we just calculate the depth value again.
+		// The performance impact of this additional calculation doesn't matter, but it prevents
+		// the host GPU driver from performing any early depth test optimizations.
+		out.SetConstantsUsed(C_ZBIAS+1, C_ZBIAS+1);
+		// the screen space depth value = far z + (clip z / clip w) * z range
+		out.Write("\tint zCoord = " I_ZBIAS"[1].x + int((clipPos.z / clipPos.w) * float(" I_ZBIAS"[1].y));\n");
+	}
+	else
+	{
+		if (ApiType == API_D3D)
+			out.Write("\tint zCoord = int((1.0 - rawpos.z) * 16777216.0);\n");
+		else
+			out.Write("\tint zCoord = int(rawpos.z * 16777216.0);\n");
+	}
+	out.Write("\tzCoord = clamp(zCoord, 0, 0xFFFFFF);\n");
+
+	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
+	const bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
+
+	uid_data->ztex_op = bpmem.ztex2.op;
+	uid_data->per_pixel_depth = per_pixel_depth;
+	uid_data->forced_early_z = forced_early_z;
+	uid_data->fast_depth_calc = g_ActiveConfig.bFastDepthCalc;
+	uid_data->early_ztest = bpmem.UseEarlyDepthTest();
+	uid_data->fog_fsel = bpmem.fog.c_proj_fsel.fsel;
+	uid_data->zfreeze = bpmem.genMode.zfreeze;
+
+	// Note: z-textures are not written to depth buffer if early depth test is used
+	if (per_pixel_depth && bpmem.UseEarlyDepthTest())
+	{
+		if (ApiType == API_D3D)
+			out.Write("\tdepth = 1.0 - float(zCoord) / 16777216.0;\n");
+		else
+			out.Write("\tdepth = float(zCoord) / 16777216.0;\n");
+	}
+
+	// Note: depth texture output is only written to depth buffer if late depth test is used
+	// theoretical final depth value is used for fog calculation, though, so we have to emulate ztextures anyway
+	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !skip_ztexture)
+	{
+		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
+		out.SetConstantsUsed(C_ZBIAS, C_ZBIAS+1);
+		out.Write("\tzCoord = idot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
+									(bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : "");
+		out.Write("\tzCoord = zCoord & 0xFFFFFF;\n");
+	}
+
+	if (per_pixel_depth && bpmem.UseLateDepthTest())
+	{
+		if (ApiType == API_D3D)
+			out.Write("\tdepth = 1.0 - float(zCoord) / 16777216.0;\n");
+		else
+			out.Write("\tdepth = float(zCoord) / 16777216.0;\n");
+	}
+
+	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
+	{
+		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
+		out.Write("\tocol0 = float4(float3(prev.rgb), float(" I_ALPHA".a)) / 255.0;\n");
+	}
+	else
+	{
+		WriteFog<T>(out, uid_data);
+		out.Write("\tocol0 = float4(prev) / 255.0;\n");
+	}
+
+	// Use dual-source color blending to perform dst alpha in a single pass
+	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
+	{
+		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
+
+		// Colors will be blended against the alpha from ocol1 and
+		// the alpha from ocol0 will be written to the framebuffer.
+		out.Write("\tocol1 = float4(prev) / 255.0;\n");
+		out.Write("\tocol0.a = float(" I_ALPHA".a) / 255.0;\n");
+	}
+
+	if (g_ActiveConfig.backend_info.bSupportsBBox && g_ActiveConfig.bBBoxEnable && BoundingBox::active)
+	{
+		uid_data->bounding_box = true;
+		const char* atomic_op = ApiType == API_OPENGL ? "atomic" : "Interlocked";
+		out.Write(
+			"\tif(bbox_data[0] > int(rawpos.x)) %sMin(bbox_data[0], int(rawpos.x));\n"
+			"\tif(bbox_data[1] < int(rawpos.x)) %sMax(bbox_data[1], int(rawpos.x));\n"
+			"\tif(bbox_data[2] > int(rawpos.y)) %sMin(bbox_data[2], int(rawpos.y));\n"
+			"\tif(bbox_data[3] < int(rawpos.y)) %sMax(bbox_data[3], int(rawpos.y));\n",
+			atomic_op, atomic_op, atomic_op, atomic_op);
+	}
+
+	out.Write("}\n");
+
+	if (is_writing_shadercode)
+	{
+		if (text[sizeof(text) - 1] != 0x7C)
+			PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
+	}
+}
+
+
+template<class T>
+static inline void WriteStage(T& out, pixel_shader_uid_data* uid_data, int n, API_TYPE ApiType, const char swapModeTable[4][5])
+{
+	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
+	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
+	bool bHasIndStage = bpmem.tevind[n].bt < bpmem.genMode.numindstages;
+	// HACK to handle cases where the tex gen is not enabled
+	if (!bHasTexCoord)
+		texcoord = 0;
+
+	out.Write("\n\t// TEV stage %d\n", n);
+
+	uid_data->stagehash[n].hasindstage = bHasIndStage;
+	uid_data->stagehash[n].tevorders_texcoord = texcoord;
+	if (bHasIndStage)
+	{
+		uid_data->stagehash[n].tevind = bpmem.tevind[n].hex & 0x7FFFFF;
+
+		out.Write("\t// indirect op\n");
+		// perform the indirect op on the incoming regular coordinates using iindtex%d as the offset coords
+		if (bpmem.tevind[n].bs != ITBA_OFF)
+		{
+			const char *tevIndAlphaSel[]   = {"", "x", "y", "z"};
+			const char *tevIndAlphaMask[] = {"248", "224", "240", "248"}; // 0b11111000, 0b11100000, 0b11110000, 0b11111000
+			out.Write("alphabump = iindtex%d.%s & %s;\n",
+					bpmem.tevind[n].bt,
+					tevIndAlphaSel[bpmem.tevind[n].bs],
+					tevIndAlphaMask[bpmem.tevind[n].fmt]);
+		}
+		else
+		{
+			// TODO: Should we reset alphabump to 0 here?
+		}
+
+		if (bpmem.tevind[n].mid != 0)
+		{
+			// format
+			const char *tevIndFmtMask[] = { "255", "31", "15", "7" };
+			out.Write("\tint3 iindtevcrd%d = iindtex%d & %s;\n", n, bpmem.tevind[n].bt, tevIndFmtMask[bpmem.tevind[n].fmt]);
+
+			// bias - TODO: Check if this needs to be this complicated..
+			const char *tevIndBiasField[] = { "", "x", "y", "xy", "z", "xz", "yz", "xyz" }; // indexed by bias
+			const char *tevIndBiasAdd[] = { "-128", "1", "1", "1" }; // indexed by fmt
+			if (bpmem.tevind[n].bias == ITB_S || bpmem.tevind[n].bias == ITB_T || bpmem.tevind[n].bias == ITB_U)
+				out.Write("\tiindtevcrd%d.%s += int(%s);\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
+			else if (bpmem.tevind[n].bias == ITB_ST || bpmem.tevind[n].bias == ITB_SU || bpmem.tevind[n].bias == ITB_TU)
+				out.Write("\tiindtevcrd%d.%s += int2(%s, %s);\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt], tevIndBiasAdd[bpmem.tevind[n].fmt]);
+			else if (bpmem.tevind[n].bias == ITB_STU)
+				out.Write("\tiindtevcrd%d.%s += int3(%s, %s, %s);\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt], tevIndBiasAdd[bpmem.tevind[n].fmt], tevIndBiasAdd[bpmem.tevind[n].fmt]);
+
+			// multiply by offset matrix and scale - calculations are likely to overflow badly,
+			// yet it works out since we only care about the lower 23 bits (+1 sign bit) of the result
+			if (bpmem.tevind[n].mid <= 3)
+			{
+				int mtxidx = 2*(bpmem.tevind[n].mid-1);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
+
+				if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+				{
+					out.Write("\tint2 indtevtrans%d = irshift(int2(idot(" I_INDTEXMTX"[%d].xyz, iindtevcrd%d), idot(" I_INDTEXMTX"[%d].xyz, iindtevcrd%d)), 3);\n", n, mtxidx, n, mtxidx+1, n);
+
+					// TODO: should use a shader uid branch for this for better performance
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = irshift(indtevtrans%d, " I_INDTEXMTX"[%d].w);\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = ilshift(indtevtrans%d, -" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+				else
+				{
+					out.Write("\tint2 indtevtrans%d = int2(idot(" I_INDTEXMTX"[%d].xyz, iindtevcrd%d), idot(" I_INDTEXMTX"[%d].xyz, iindtevcrd%d)) >> 3;\n", n, mtxidx, n, mtxidx+1, n);
+
+					// TODO: should use a shader uid branch for this for better performance
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = indtevtrans%d >> " I_INDTEXMTX"[%d].w;\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = indtevtrans%d << (-" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+			}
+			else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord)
+			{ // s matrix
+				_assert_(bpmem.tevind[n].mid >= 5);
+				int mtxidx = 2*(bpmem.tevind[n].mid-5);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
+
+				if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+				{
+					out.Write("\tint2 indtevtrans%d = irshift(int2(fixpoint_uv%d * iindtevcrd%d.xx), 8);\n", n, texcoord, n);
+
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = irshift(indtevtrans%d, " I_INDTEXMTX"[%d].w);\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = ilshift(indtevtrans%d, -" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+				else
+				{
+					out.Write("\tint2 indtevtrans%d = int2(fixpoint_uv%d * iindtevcrd%d.xx) >> 8;\n", n, texcoord, n);
+
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = indtevtrans%d >> " I_INDTEXMTX"[%d].w;\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = indtevtrans%d << (-" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+			}
+			else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord)
+			{ // t matrix
+				_assert_(bpmem.tevind[n].mid >= 9);
+				int mtxidx = 2*(bpmem.tevind[n].mid-9);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
+
+				if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+				{
+					out.Write("\tint2 indtevtrans%d = irshift(int2(fixpoint_uv%d * iindtevcrd%d.yy), 8);\n", n, texcoord, n);
+
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = irshift(indtevtrans%d, " I_INDTEXMTX"[%d].w);\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = ilshift(indtevtrans%d, -" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+				else
+				{
+					out.Write("\tint2 indtevtrans%d = int2(fixpoint_uv%d * iindtevcrd%d.yy) >> 8;\n", n, texcoord, n);
+
+					out.Write("\tif (" I_INDTEXMTX"[%d].w >= 0) indtevtrans%d = indtevtrans%d >> " I_INDTEXMTX"[%d].w;\n", mtxidx, n, n, mtxidx);
+					out.Write("\telse indtevtrans%d = indtevtrans%d << (-" I_INDTEXMTX"[%d].w);\n", n, n, mtxidx);
+				}
+			}
+			else
+			{
+				out.Write("\tint2 indtevtrans%d = int2(0, 0);\n", n);
+			}
+		}
+		else
+		{
+			out.Write("\tint2 indtevtrans%d = int2(0, 0);\n", n);
+		}
+
+		// ---------
+		// Wrapping
+		// ---------
+		const char *tevIndWrapStart[]  = {"0", "(256<<7)", "(128<<7)", "(64<<7)", "(32<<7)", "(16<<7)", "1" }; // TODO: Should the last one be 1 or (1<<7)?
+
+		// wrap S
+		if (bpmem.tevind[n].sw == ITW_OFF)
+			out.Write("\twrappedcoord.x = fixpoint_uv%d.x;\n", texcoord);
+		else if (bpmem.tevind[n].sw == ITW_0)
+			out.Write("\twrappedcoord.x = 0;\n");
+		else
+			out.Write("\twrappedcoord.x = fixpoint_uv%d.x %% %s;\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]);
+
+		// wrap T
+		if (bpmem.tevind[n].tw == ITW_OFF)
+			out.Write("\twrappedcoord.y = fixpoint_uv%d.y;\n", texcoord);
+		else if (bpmem.tevind[n].tw == ITW_0)
+			out.Write("\twrappedcoord.y = 0;\n");
+		else
+			out.Write("\twrappedcoord.y = fixpoint_uv%d.y %% %s;\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]);
+
+		if (bpmem.tevind[n].fb_addprev) // add previous tevcoord
+			out.Write("\ttevcoord.xy += wrappedcoord + indtevtrans%d;\n", n);
+		else
+			out.Write("\ttevcoord.xy = wrappedcoord + indtevtrans%d;\n", n);
+
+		// Emulate s24 overflows
+		if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+			out.Write("\ttevcoord.xy = irshift(ilshift(tevcoord.xy, 8), 8);\n");
+		else
+			out.Write("\ttevcoord.xy = (tevcoord.xy << 8) >> 8;\n");
+	}
+
+	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
+	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
+
+	uid_data->stagehash[n].cc = cc.hex & 0xFFFFFF;
+	uid_data->stagehash[n].ac = ac.hex & 0xFFFFF0; // Storing rswap and tswap later
+
+	if (cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC ||
+	   cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC ||
+	   cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC ||
+	   cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC ||
+	   ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA ||
+	   ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
+	{
+		const int i = bpmem.combiners[n].alphaC.rswap;
+		uid_data->stagehash[n].ac |= bpmem.combiners[n].alphaC.rswap;
+		uid_data->stagehash[n].tevksel_swap1a = bpmem.tevksel[i*2].swap1;
+		uid_data->stagehash[n].tevksel_swap2a = bpmem.tevksel[i*2].swap2;
+		uid_data->stagehash[n].tevksel_swap1b = bpmem.tevksel[i*2+1].swap1;
+		uid_data->stagehash[n].tevksel_swap2b = bpmem.tevksel[i*2+1].swap2;
+		uid_data->stagehash[n].tevorders_colorchan = bpmem.tevorders[n / 2].getColorChan(n & 1);
+
+		const char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
+		out.Write("\trastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
+	}
+
+	uid_data->stagehash[n].tevorders_enable = bpmem.tevorders[n / 2].getEnable(n & 1);
+	if (bpmem.tevorders[n/2].getEnable(n&1))
+	{
+		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
+		if (!bHasIndStage)
+		{
+			// calc tevcord
+			if (bHasTexCoord)
+				out.Write("\ttevcoord.xy = fixpoint_uv%d;\n", texcoord);
+			else
+				out.Write("\ttevcoord.xy = int2(0, 0);\n");
+		}
+
+		const int i = bpmem.combiners[n].alphaC.tswap;
+		uid_data->stagehash[n].ac |= bpmem.combiners[n].alphaC.tswap << 2;
+		uid_data->stagehash[n].tevksel_swap1c = bpmem.tevksel[i*2].swap1;
+		uid_data->stagehash[n].tevksel_swap2c = bpmem.tevksel[i*2].swap2;
+		uid_data->stagehash[n].tevksel_swap1d = bpmem.tevksel[i*2+1].swap1;
+		uid_data->stagehash[n].tevksel_swap2d = bpmem.tevksel[i*2+1].swap2;
+
+		uid_data->stagehash[n].tevorders_texmap= bpmem.tevorders[n/2].getTexMap(n&1);
+
+		const char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
+		uid_data->SetTevindrefTexmap(i, texmap);
+
+		out.Write("\ttextemp = ");
+		SampleTexture<T>(out, "(float2(tevcoord.xy)/128.0)", texswap, texmap, ApiType);
+	}
+	else
+	{
+		out.Write("\ttextemp = int4(255, 255, 255, 255);\n");
+	}
+
+
+	if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST ||
+	    cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST ||
+	    ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST ||
+	    ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST)
+	{
+		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
+		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
+		uid_data->stagehash[n].tevksel_kc = kc;
+		uid_data->stagehash[n].tevksel_ka = ka;
+		out.Write("\tkonsttemp = int4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
+
+		if (kc > 7)
+			out.SetConstantsUsed(C_KCOLORS+((kc-0xc)%4),C_KCOLORS+((kc-0xc)%4));
+		if (ka > 7)
+			out.SetConstantsUsed(C_KCOLORS+((ka-0xc)%4),C_KCOLORS+((ka-0xc)%4));
+	}
+
+	if (cc.d == TEVCOLORARG_C0 || cc.d == TEVCOLORARG_A0 || ac.d == TEVALPHAARG_A0)
+		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
+
+	if (cc.d == TEVCOLORARG_C1 || cc.d == TEVCOLORARG_A1 || ac.d == TEVALPHAARG_A1)
+		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
+
+	if (cc.d == TEVCOLORARG_C2 || cc.d == TEVCOLORARG_A2 || ac.d == TEVALPHAARG_A2)
+		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
+
+	if (cc.dest >= GX_TEVREG0 && cc.dest <= GX_TEVREG2)
+		out.SetConstantsUsed(C_COLORS+cc.dest, C_COLORS+cc.dest);
+
+	if (ac.dest >= GX_TEVREG0 && ac.dest <= GX_TEVREG2)
+		out.SetConstantsUsed(C_COLORS+ac.dest, C_COLORS+ac.dest);
+
+
+	out.Write("\ttevin_a = int4(%s, %s)&255;\n", tevCInputTable[cc.a], tevAInputTable[ac.a]);
+	out.Write("\ttevin_b = int4(%s, %s)&255;\n", tevCInputTable[cc.b], tevAInputTable[ac.b]);
+	out.Write("\ttevin_c = int4(%s, %s)&255;\n", tevCInputTable[cc.c], tevAInputTable[ac.c]);
+	out.Write("\ttevin_d = int4(%s, %s);\n", tevCInputTable[cc.d], tevAInputTable[ac.d]);
+
+	out.Write("\t// color combine\n");
+	out.Write("\t%s = clamp(", tevCOutputTable[cc.dest]);
+	if (cc.bias != TevBias_COMPARE)
+	{
+		WriteTevRegular(out, "rgb", cc.bias, cc.op, cc.clamp, cc.shift);
+	}
+	else
+	{
+		const char *function_table[] =
+		{
+			"((tevin_a.r > tevin_b.r) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_R8_GT
+			"((tevin_a.r == tevin_b.r) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_R8_EQ
+			"((idot(tevin_a.rgb, comp16) >  idot(tevin_b.rgb, comp16)) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_GR16_GT
+			"((idot(tevin_a.rgb, comp16) == idot(tevin_b.rgb, comp16)) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_GR16_EQ
+			"((idot(tevin_a.rgb, comp24) >  idot(tevin_b.rgb, comp24)) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_BGR24_GT
+			"((idot(tevin_a.rgb, comp24) == idot(tevin_b.rgb, comp24)) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_BGR24_EQ
+			"(max(sign(tevin_a.rgb - tevin_b.rgb), int3(0,0,0)) * tevin_c.rgb)", // TEVCMP_RGB8_GT
+			"((int3(1,1,1) - sign(abs(tevin_a.rgb - tevin_b.rgb))) * tevin_c.rgb)" // TEVCMP_RGB8_EQ
+		};
+
+		int mode = (cc.shift<<1)|cc.op;
+		out.Write("   tevin_d.rgb + ");
+		out.Write(function_table[mode]);
+	}
+	if (cc.clamp)
+		out.Write(", int3(0,0,0), int3(255,255,255))");
+	else
+		out.Write(", int3(-1024,-1024,-1024), int3(1023,1023,1023))");
+	out.Write(";\n");
+
+	out.Write("\t// alpha combine\n");
+	out.Write("\t%s = clamp(", tevAOutputTable[ac.dest]);
+	if (ac.bias != TevBias_COMPARE)
+	{
+		WriteTevRegular(out, "a", ac.bias, ac.op, ac.clamp, ac.shift);
+	}
+	else
+	{
+		const char *function_table[] =
+		{
+			"((tevin_a.r > tevin_b.r) ? tevin_c.a : 0)", // TEVCMP_R8_GT
+			"((tevin_a.r == tevin_b.r) ? tevin_c.a : 0)", // TEVCMP_R8_EQ
+			"((idot(tevin_a.rgb, comp16) >  idot(tevin_b.rgb, comp16)) ? tevin_c.a : 0)", // TEVCMP_GR16_GT
+			"((idot(tevin_a.rgb, comp16) == idot(tevin_b.rgb, comp16)) ? tevin_c.a : 0)", // TEVCMP_GR16_EQ
+			"((idot(tevin_a.rgb, comp24) >  idot(tevin_b.rgb, comp24)) ? tevin_c.a : 0)", // TEVCMP_BGR24_GT
+			"((idot(tevin_a.rgb, comp24) == idot(tevin_b.rgb, comp24)) ? tevin_c.a : 0)", // TEVCMP_BGR24_EQ
+			"((tevin_a.a >  tevin_b.a) ? tevin_c.a : 0)", // TEVCMP_A8_GT
+			"((tevin_a.a == tevin_b.a) ? tevin_c.a : 0)" // TEVCMP_A8_EQ
+		};
+
+		int mode = (ac.shift<<1)|ac.op;
+		out.Write("   tevin_d.a + ");
+		out.Write(function_table[mode]);
+	}
+	if (ac.clamp)
+		out.Write(", 0, 255)");
+	else
+		out.Write(", -1024, 1023)");
+
+	out.Write(";\n");
+}
+
+template<class T>
+static inline void WriteTevRegular(T& out, const char* components, int bias, int op, int clamp, int shift)
+{
+	const char *tevScaleTableLeft[] =
+	{
+		"",       // SCALE_1
+		" << 1",  // SCALE_2
+		" << 2",  // SCALE_4
+		"",       // DIVIDE_2
+	};
+
+	const char *tevScaleTableRight[] =
+	{
+		"",       // SCALE_1
+		"",       // SCALE_2
+		"",       // SCALE_4
+		" >> 1",  // DIVIDE_2
+	};
+
+	const char *tevLerpBias[] = // indexed by 2*op+(shift==3)
+	{
+		"",
+		" + 128",
+		"",
+		" + 127",
+	};
+
+	const char *tevBiasTable[] =
+	{
+		"",        // ZERO,
+		" + 128",  // ADDHALF,
+		" - 128",  // SUBHALF,
+		"",
+	};
+
+	const char *tevOpTable[] = {
+		"+",      // TEVOP_ADD = 0,
+		"-",      // TEVOP_SUB = 1,
+	};
+
+	// Regular TEV stage: (d + bias + lerp(a,b,c)) * scale
+	// The GameCube/Wii GPU uses a very sophisticated algorithm for scale-lerping:
+	// - c is scaled from 0..255 to 0..256, which allows dividing the result by 256 instead of 255
+	// - if scale is bigger than one, it is moved inside the lerp calculation for increased accuracy
+	// - a rounding bias is added before dividing by 256
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+	{
+		// Haxx - cleaner code by not having irshift and ilshift in the emitted code by omitting them if not used.
+		const char* leftShift = tevScaleTableLeft[shift];
+		const char* rightShift = tevScaleTableRight[shift];
+
+		if (rightShift[0])
+			out.Write("irshift(((tevin_d.%s%s)%s)", components, tevBiasTable[bias], tevScaleTableLeft[shift]);
+		else
+			out.Write("((tevin_d.%s%s)%s)", components, tevBiasTable[bias], tevScaleTableLeft[shift]);
+		out.Write(" %s ", tevOpTable[op]);
+		if (leftShift[0])
+			out.Write("irshift((ilshift((ilshift(tevin_a.%s, 8) + (tevin_b.%s-tevin_a.%s)*(tevin_c.%s+irshift(tevin_c.%s, 7))), %s)%s), 8)",
+					  components, components, components, components, components,
+					  leftShift+4, tevLerpBias[2*op+(shift!=3)]);
+		else
+			out.Write("irshift(((ilshift(tevin_a.%s, 8) + (tevin_b.%s-tevin_a.%s)*(tevin_c.%s+irshift(tevin_c.%s, 7)))%s), 8)",
+					  components, components, components, components, components, tevLerpBias[2*op+(shift!=3)]);
+		if (rightShift[0])
+			out.Write(", %s)", rightShift+4);
+	}
+	else
+	{
+		out.Write("(((tevin_d.%s%s)%s)", components, tevBiasTable[bias], tevScaleTableLeft[shift]);
+		out.Write(" %s ", tevOpTable[op]);
+		out.Write("(((((tevin_a.%s<<8) + (tevin_b.%s-tevin_a.%s)*(tevin_c.%s+(tevin_c.%s>>7)))%s)%s)>>8)",
+				  components, components, components, components, components,
+				  tevScaleTableLeft[shift], tevLerpBias[2*op+(shift!=3)]);
+		out.Write(")%s", tevScaleTableRight[shift]);
+	}
+}
+
+template<class T>
+static inline void SampleTexture(T& out, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
+{
+	out.SetConstantsUsed(C_TEXDIMS+texmap,C_TEXDIMS+texmap);
+
+	if (ApiType == API_D3D)
+		out.Write("iround(255.0 * Tex%d.Sample(samp%d, float3(%s.xy * " I_TEXDIMS"[%d].xy, %s))).%s;\n", texmap, texmap, texcoords, texmap, g_ActiveConfig.iStereoMode > 0 ? "layer" : "0.0", texswap);
+	else
+		out.Write("iround(255.0 * texture(samp%d, float3(%s.xy * " I_TEXDIMS"[%d].xy, %s))).%s;\n", texmap, texcoords, texmap, g_ActiveConfig.iStereoMode > 0 ? "layer" : "0.0", texswap);
+}
+
+static const char *tevAlphaFuncsTable[] =
+{
+	"(false)",					// NEVER
+	"(prev.a <  %s)",			// LESS
+	"(prev.a == %s)",			// EQUAL
+	"(prev.a <= %s)",			// LEQUAL
+	"(prev.a >  %s)",			// GREATER
+	"(prev.a != %s)",			// NEQUAL
+	"(prev.a >= %s)",			// GEQUAL
+	"(true)"					// ALWAYS
+};
+
+static const char *tevAlphaFunclogicTable[] =
+{
+	" && ", // and
+	" || ", // or
+	" != ", // xor
+	" == "  // xnor
+};
+
+template<class T>
+static inline void WriteAlphaTest(T& out, pixel_shader_uid_data* uid_data, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth)
+{
+	static const char *alphaRef[2] =
+	{
+		I_ALPHA".r",
+		I_ALPHA".g"
+	};
+
+	out.SetConstantsUsed(C_ALPHA, C_ALPHA);
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENNEGATEDBOOLEAN))
+		out.Write("\tif(( ");
+	else
+		out.Write("\tif(!( ");
+
+	uid_data->alpha_test_comp0 = bpmem.alpha_test.comp0;
+	uid_data->alpha_test_comp1 = bpmem.alpha_test.comp1;
+	uid_data->alpha_test_logic = bpmem.alpha_test.logic;
+
+	// Lookup the first component from the alpha function table
+	int compindex = bpmem.alpha_test.comp0;
+	out.Write(tevAlphaFuncsTable[compindex], alphaRef[0]);
+
+	out.Write("%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]); // lookup the logic op
+
+	// Lookup the second component from the alpha function table
+	compindex = bpmem.alpha_test.comp1;
+	out.Write(tevAlphaFuncsTable[compindex], alphaRef[1]);
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENNEGATEDBOOLEAN))
+		out.Write(") == false) {\n");
+	else
+		out.Write(")) {\n");
+
+	out.Write("\t\tocol0 = float4(0.0, 0.0, 0.0, 0.0);\n");
+	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
+		out.Write("\t\tocol1 = float4(0.0, 0.0, 0.0, 0.0);\n");
+	if (per_pixel_depth)
+		out.Write("\t\tdepth = %s;\n", (ApiType == API_D3D) ? "0.0" : "1.0");
+
+	// ZCOMPLOC HACK:
+	// The only way to emulate alpha test + early-z is to force early-z in the shader.
+	// As this isn't available on all drivers and as we can't emulate this feature otherwise,
+	// we are only able to choose which one we want to respect more.
+	// Tests seem to have proven that writing depth even when the alpha test fails is more
+	// important that a reliable alpha test, so we just force the alpha test to always succeed.
+	// At least this seems to be less buggy.
+	uid_data->alpha_test_use_zcomploc_hack = bpmem.UseEarlyDepthTest()
+	                                         && bpmem.zmode.updateenable
+	                                         && !g_ActiveConfig.backend_info.bSupportsEarlyZ
+	                                         && !bpmem.genMode.zfreeze;
+
+	if (!uid_data->alpha_test_use_zcomploc_hack)
+	{
+		out.Write("\t\tdiscard;\n");
+		if (ApiType != API_D3D)
+			out.Write("\t\treturn;\n");
+	}
+
+	out.Write("\t}\n");
+}
+
+static const char *tevFogFuncsTable[] =
+{
+	"",                                                      // No Fog
+	"",                                                      // ?
+	"",                                                      // Linear
+	"",                                                      // ?
+	"\tfog = 1.0 - exp2(-8.0 * fog);\n",                     // exp
+	"\tfog = 1.0 - exp2(-8.0 * fog * fog);\n",               // exp2
+	"\tfog = exp2(-8.0 * (1.0 - fog));\n",                   // backward exp
+	"\tfog = 1.0 - fog;\n   fog = exp2(-8.0 * fog * fog);\n" // backward exp2
+};
+
+template<class T>
+static inline void WriteFog(T& out, pixel_shader_uid_data* uid_data)
+{
+	uid_data->fog_fsel = bpmem.fog.c_proj_fsel.fsel;
+	if (bpmem.fog.c_proj_fsel.fsel == 0)
+		return; // no Fog
+
+	uid_data->fog_proj = bpmem.fog.c_proj_fsel.proj;
+
+	out.SetConstantsUsed(C_FOGCOLOR, C_FOGCOLOR);
+	out.SetConstantsUsed(C_FOGI, C_FOGI);
+	out.SetConstantsUsed(C_FOGF, C_FOGF+1);
+	if (bpmem.fog.c_proj_fsel.proj == 0)
+	{
+		// perspective
+		// ze = A/(B - (Zs >> B_SHF)
+		// TODO: Verify that we want to drop lower bits here! (currently taken over from software renderer)
+		//       Maybe we want to use "ze = (A << B_SHF)/((B << B_SHF) - Zs)" instead?
+		//       That's equivalent, but keeps the lower bits of Zs.
+		out.Write("\tfloat ze = (" I_FOGF"[1].x * 16777216.0) / float(" I_FOGI".y - (zCoord >> " I_FOGI".w));\n");
+	}
+	else
+	{
+		// orthographic
+		// ze = a*Zs    (here, no B_SHF)
+		out.Write("\tfloat ze = " I_FOGF"[1].x * float(zCoord) / 16777216.0;\n");
+	}
+
+	// x_adjust = sqrt((x-center)^2 + k^2)/k
+	// ze *= x_adjust
+	// TODO Instead of this theoretical calculation, we should use the
+	//      coefficient table given in the fog range BP registers!
+	uid_data->fog_RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
+	if (bpmem.fogRange.Base.Enabled)
+	{
+		out.SetConstantsUsed(C_FOGF, C_FOGF);
+		out.Write("\tfloat x_adjust = (2.0 * (rawpos.x / " I_FOGF"[0].y)) - 1.0 - " I_FOGF"[0].x;\n");
+		out.Write("\tx_adjust = sqrt(x_adjust * x_adjust + " I_FOGF"[0].z * " I_FOGF"[0].z) / " I_FOGF"[0].z;\n");
+		out.Write("\tze *= x_adjust;\n");
+	}
+
+	out.Write("\tfloat fog = clamp(ze - " I_FOGF"[1].z, 0.0, 1.0);\n");
+
+	if (bpmem.fog.c_proj_fsel.fsel > 3)
+	{
+		out.Write("%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]);
+	}
+	else
+	{
+		if (bpmem.fog.c_proj_fsel.fsel != 2 && out.GetBuffer() != nullptr)
+			WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel);
+	}
+
+	out.Write("\tint ifog = iround(fog * 256.0);\n");
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+		out.Write("\tprev.rgb = irshift((prev.rgb * (256 - ifog) + " I_FOGCOLOR".rgb * ifog), 8);\n");
+	else
+		out.Write("\tprev.rgb = (prev.rgb * (256 - ifog) + " I_FOGCOLOR".rgb * ifog) >> 8;\n");
+}
+
+void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType, components);
+}
+
+void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderCode>(object, dstAlphaMode, ApiType, components);
+}
+
+void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderConstantProfile>(object, dstAlphaMode, ApiType, components);
+}
+
diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h
new file mode 100644
index 0000000000..5a871fce6d
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelShaderGen.h
@@ -0,0 +1,137 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/ShaderGenCommon.h"
+#include "VideoCommon/VideoCommon.h"
+
+// TODO: get rid of them as they aren't used
+#define C_COLORMATRIX   0                   // 0
+#define C_COLORS        0                   // 0
+#define C_KCOLORS       (C_COLORS + 4)      // 4
+#define C_ALPHA         (C_KCOLORS + 4)     // 8
+#define C_TEXDIMS       (C_ALPHA + 1)       // 9
+#define C_ZBIAS         (C_TEXDIMS + 8)     //17
+#define C_INDTEXSCALE   (C_ZBIAS + 2)       //19
+#define C_INDTEXMTX     (C_INDTEXSCALE + 2) //21
+#define C_FOGCOLOR      (C_INDTEXMTX + 6)   //27
+#define C_FOGI          (C_FOGCOLOR + 1)    //28
+#define C_FOGF          (C_FOGI + 1)        //29
+#define C_ZSLOPE        (C_FOGF + 2)        //31
+#define C_EFBSCALE      (C_ZSLOPE + 1)      //32
+
+#define C_PENVCONST_END (C_EFBSCALE + 1)
+
+// Different ways to achieve rendering with destination alpha
+enum DSTALPHA_MODE
+{
+	DSTALPHA_NONE, // Render normally, without destination alpha
+	DSTALPHA_ALPHA_PASS, // Render normally first, then render again for alpha
+	DSTALPHA_DUAL_SOURCE_BLEND // Use dual-source blending
+};
+
+#pragma pack(1)
+struct pixel_shader_uid_data
+{
+	// TODO: Optimize field order for easy access!
+
+	u32 num_values; // TODO: Shouldn't be a u32
+	u32 NumValues() const { return num_values; }
+
+	u32 components : 23;
+	u32 dstAlphaMode : 2;
+	u32 Pretest : 2;
+	u32 nIndirectStagesUsed : 4;
+	u32 stereo : 1;
+
+	u32 genMode_numtexgens : 4;
+	u32 genMode_numtevstages : 4;
+	u32 genMode_numindstages : 3;
+	u32 alpha_test_comp0 : 3;
+	u32 alpha_test_comp1 : 3;
+	u32 alpha_test_logic : 2;
+	u32 alpha_test_use_zcomploc_hack : 1;
+	u32 fog_proj : 1;
+	u32 fog_fsel : 3;
+	u32 fog_RangeBaseEnabled : 1;
+	u32 ztex_op : 2;
+	u32 fast_depth_calc : 1;
+	u32 per_pixel_depth : 1;
+	u32 forced_early_z : 1;
+	u32 early_ztest : 1;
+	u32 bounding_box : 1;
+
+	// TODO: 31 bits of padding is a waste. Can we free up some bits elseware?
+	u32 zfreeze : 1;
+	u32 pad : 31;
+
+	u32 texMtxInfo_n_projection : 8; // 8x1 bit
+	u32 tevindref_bi0 : 3;
+	u32 tevindref_bc0 : 3;
+	u32 tevindref_bi1 : 3;
+	u32 tevindref_bc1 : 3;
+	u32 tevindref_bi2 : 3;
+	u32 tevindref_bc3 : 3;
+	u32 tevindref_bi4 : 3;
+	u32 tevindref_bc4 : 3;
+
+	inline void SetTevindrefValues(int index, u32 texcoord, u32 texmap)
+	{
+		if (index == 0) { tevindref_bc0 = texcoord; tevindref_bi0 = texmap; }
+		else if (index == 1) { tevindref_bc1 = texcoord; tevindref_bi1 = texmap; }
+		else if (index == 2) { tevindref_bc3 = texcoord; tevindref_bi2 = texmap; }
+		else if (index == 3) { tevindref_bc4 = texcoord; tevindref_bi4 = texmap; }
+	}
+	inline void SetTevindrefTexmap(int index, u32 texmap)
+	{
+		if (index == 0) { tevindref_bi0 = texmap; }
+		else if (index == 1) { tevindref_bi1 = texmap; }
+		else if (index == 2) { tevindref_bi2 = texmap; }
+		else if (index == 3) { tevindref_bi4 = texmap; }
+	}
+
+	struct {
+		// TODO: Can save a lot space by removing the padding bits
+		u32 cc : 24;
+		u32 ac : 24;
+
+		u32 tevorders_texmap : 3;
+		u32 tevorders_texcoord : 3;
+		u32 tevorders_enable : 1;
+		u32 tevorders_colorchan : 3;
+		u32 pad1 : 6;
+
+		// TODO: Clean up the swapXY mess
+		u32 hasindstage : 1;
+		u32 tevind : 21;
+		u32 tevksel_swap1a : 2;
+		u32 tevksel_swap2a : 2;
+		u32 tevksel_swap1b : 2;
+		u32 tevksel_swap2b : 2;
+		u32 pad2 : 2;
+
+		u32 tevksel_swap1c : 2;
+		u32 tevksel_swap2c : 2;
+		u32 tevksel_swap1d : 2;
+		u32 tevksel_swap2d : 2;
+		u32 tevksel_kc : 5;
+		u32 tevksel_ka : 5;
+		u32 pad3 : 14;
+	} stagehash[16];
+
+	// TODO: I think we're fine without an enablePixelLighting field, should probably double check, though..
+	LightingUidData lighting;
+};
+#pragma pack()
+
+typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
+typedef ShaderCode PixelShaderCode; // TODO: Obsolete
+typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete
+
+void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
diff --git a/Source/Core/VideoCommon/PixelShaderManager.cpp b/Source/Core/VideoCommon/PixelShaderManager.cpp
new file mode 100644
index 0000000000..e388c15fcf
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelShaderManager.cpp
@@ -0,0 +1,296 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+bool PixelShaderManager::s_bFogRangeAdjustChanged;
+bool PixelShaderManager::s_bViewPortChanged;
+
+PixelShaderConstants PixelShaderManager::constants;
+bool PixelShaderManager::dirty;
+
+void PixelShaderManager::Init()
+{
+	memset(&constants, 0, sizeof(constants));
+
+	// Init any intial constants which aren't zero when bpmem is zero.
+	s_bFogRangeAdjustChanged = true;
+	s_bViewPortChanged = false;
+
+	SetEfbScaleChanged();
+	SetIndMatrixChanged(0);
+	SetIndMatrixChanged(1);
+	SetIndMatrixChanged(2);
+	SetZTextureTypeChanged();
+	SetTexCoordChanged(0);
+	SetTexCoordChanged(1);
+	SetTexCoordChanged(2);
+	SetTexCoordChanged(3);
+	SetTexCoordChanged(4);
+	SetTexCoordChanged(5);
+	SetTexCoordChanged(6);
+	SetTexCoordChanged(7);
+
+	dirty = true;
+}
+
+void PixelShaderManager::Dirty()
+{
+	// This function is called after a savestate is loaded.
+	// Any constants that can changed based on settings should be re-calculated
+	s_bFogRangeAdjustChanged = true;
+
+	SetEfbScaleChanged();
+	SetFogParamChanged();
+
+	dirty = true;
+}
+
+void PixelShaderManager::Shutdown()
+{
+
+}
+
+void PixelShaderManager::SetConstants()
+{
+	if (s_bFogRangeAdjustChanged)
+	{
+		// set by two components, so keep changed flag here
+		// TODO: try to split both registers and move this logic to the shader
+		if (!g_ActiveConfig.bDisableFog && bpmem.fogRange.Base.Enabled == 1)
+		{
+			//bpmem.fogRange.Base.Center : center of the viewport in x axis. observation: bpmem.fogRange.Base.Center = realcenter + 342;
+			int center = ((u32)bpmem.fogRange.Base.Center) - 342;
+			// normalize center to make calculations easy
+			float ScreenSpaceCenter = center / (2.0f * xfmem.viewport.wd);
+			ScreenSpaceCenter = (ScreenSpaceCenter * 2.0f) - 1.0f;
+			//bpmem.fogRange.K seems to be  a table of precalculated coefficients for the adjust factor
+			//observations: bpmem.fogRange.K[0].LO appears to be the lowest value and bpmem.fogRange.K[4].HI the largest
+			// they always seems to be larger than 256 so my theory is :
+			// they are the coefficients from the center to the border of the screen
+			// so to simplify I use the hi coefficient as K in the shader taking 256 as the scale
+			// TODO: Shouldn't this be EFBToScaledXf?
+			constants.fogf[0][0] = ScreenSpaceCenter;
+			constants.fogf[0][1] = (float)Renderer::EFBToScaledX((int)(2.0f * xfmem.viewport.wd));
+			constants.fogf[0][2] = bpmem.fogRange.K[4].HI / 256.0f;
+		}
+		else
+		{
+			constants.fogf[0][0] = 0;
+			constants.fogf[0][1] = 1;
+			constants.fogf[0][2] = 1;
+		}
+		dirty = true;
+
+		s_bFogRangeAdjustChanged = false;
+	}
+
+	if (s_bViewPortChanged)
+	{
+		constants.zbias[1][0] = (u32)xfmem.viewport.farZ;
+		constants.zbias[1][1] = (u32)xfmem.viewport.zRange;
+		dirty = true;
+		s_bViewPortChanged = false;
+	}
+}
+
+void PixelShaderManager::SetTevColor(int index, int component, s32 value)
+{
+	auto& c = constants.colors[index];
+	c[component] = value;
+	dirty = true;
+
+	PRIM_LOG("tev color%d: %d %d %d %d\n", index, c[0], c[1], c[2], c[3]);
+}
+
+void PixelShaderManager::SetTevKonstColor(int index, int component, s32 value)
+{
+	auto& c = constants.kcolors[index];
+	c[component] = value;
+	dirty = true;
+
+	PRIM_LOG("tev konst color%d: %d %d %d %d\n", index, c[0], c[1], c[2], c[3]);
+}
+
+void PixelShaderManager::SetAlpha()
+{
+	constants.alpha[0] = bpmem.alpha_test.ref0;
+	constants.alpha[1] = bpmem.alpha_test.ref1;
+	dirty = true;
+}
+
+void PixelShaderManager::SetDestAlpha()
+{
+	constants.alpha[3] = bpmem.dstalpha.alpha;
+	dirty = true;
+}
+
+void PixelShaderManager::SetTexDims(int texmapid, u32 width, u32 height)
+{
+	// TODO: move this check out to callee. There we could just call this function on texture changes
+	// or better, use textureSize() in glsl
+	if (constants.texdims[texmapid][0] != 1.0f/width || constants.texdims[texmapid][1] != 1.0f/height)
+		dirty = true;
+
+	constants.texdims[texmapid][0] = 1.0f/width;
+	constants.texdims[texmapid][1] = 1.0f/height;
+}
+
+void PixelShaderManager::SetZTextureBias()
+{
+	constants.zbias[1][3] = bpmem.ztex1.bias;
+	dirty = true;
+}
+
+void PixelShaderManager::SetViewportChanged()
+{
+	s_bViewPortChanged = true;
+	s_bFogRangeAdjustChanged = true; // TODO: Shouldn't be necessary with an accurate fog range adjust implementation
+}
+
+void PixelShaderManager::SetEfbScaleChanged()
+{
+	constants.efbscale[0] = 1.0f / Renderer::EFBToScaledXf(1);
+	constants.efbscale[1] = 1.0f / Renderer::EFBToScaledYf(1);
+	dirty = true;
+}
+
+void PixelShaderManager::SetZSlope(float dfdx, float dfdy, float f0)
+{
+	constants.zslope[0] = dfdx;
+	constants.zslope[1] = dfdy;
+	constants.zslope[2] = f0;
+	dirty = true;
+}
+
+void PixelShaderManager::SetIndTexScaleChanged(bool high)
+{
+	constants.indtexscale[high][0] = bpmem.texscale[high].ss0;
+	constants.indtexscale[high][1] = bpmem.texscale[high].ts0;
+	constants.indtexscale[high][2] = bpmem.texscale[high].ss1;
+	constants.indtexscale[high][3] = bpmem.texscale[high].ts1;
+	dirty = true;
+}
+
+void PixelShaderManager::SetIndMatrixChanged(int matrixidx)
+{
+	int scale = ((u32)bpmem.indmtx[matrixidx].col0.s0 << 0) |
+				((u32)bpmem.indmtx[matrixidx].col1.s1 << 2) |
+				((u32)bpmem.indmtx[matrixidx].col2.s2 << 4);
+
+	// xyz - static matrix
+	// w - dynamic matrix scale / 128
+	constants.indtexmtx[2*matrixidx  ][0] = bpmem.indmtx[matrixidx].col0.ma;
+	constants.indtexmtx[2*matrixidx  ][1] = bpmem.indmtx[matrixidx].col1.mc;
+	constants.indtexmtx[2*matrixidx  ][2] = bpmem.indmtx[matrixidx].col2.me;
+	constants.indtexmtx[2*matrixidx  ][3] = 17 - scale;
+	constants.indtexmtx[2*matrixidx+1][0] = bpmem.indmtx[matrixidx].col0.mb;
+	constants.indtexmtx[2*matrixidx+1][1] = bpmem.indmtx[matrixidx].col1.md;
+	constants.indtexmtx[2*matrixidx+1][2] = bpmem.indmtx[matrixidx].col2.mf;
+	constants.indtexmtx[2*matrixidx+1][3] = 17 - scale;
+	dirty = true;
+
+	PRIM_LOG("indmtx%d: scale=%d, mat=(%d %d %d; %d %d %d)\n",
+			matrixidx, scale,
+			bpmem.indmtx[matrixidx].col0.ma, bpmem.indmtx[matrixidx].col1.mc, bpmem.indmtx[matrixidx].col2.me,
+			bpmem.indmtx[matrixidx].col0.mb, bpmem.indmtx[matrixidx].col1.md, bpmem.indmtx[matrixidx].col2.mf);
+
+}
+
+void PixelShaderManager::SetZTextureTypeChanged()
+{
+	switch (bpmem.ztex2.type)
+	{
+		case TEV_ZTEX_TYPE_U8:
+			constants.zbias[0][0] = 0;
+			constants.zbias[0][1] = 0;
+			constants.zbias[0][2] = 0;
+			constants.zbias[0][3] = 1;
+			break;
+		case TEV_ZTEX_TYPE_U16:
+			constants.zbias[0][0] = 1;
+			constants.zbias[0][1] = 0;
+			constants.zbias[0][2] = 0;
+			constants.zbias[0][3] = 256;
+			break;
+		case TEV_ZTEX_TYPE_U24:
+			constants.zbias[0][0] = 65536;
+			constants.zbias[0][1] = 256;
+			constants.zbias[0][2] = 1;
+			constants.zbias[0][3] = 0;
+			break;
+		default:
+			break;
+	}
+	dirty = true;
+}
+
+void PixelShaderManager::SetTexCoordChanged(u8 texmapid)
+{
+	TCoordInfo& tc = bpmem.texcoords[texmapid];
+	constants.texdims[texmapid][2] = (float)(tc.s.scale_minus_1 + 1);
+	constants.texdims[texmapid][3] = (float)(tc.t.scale_minus_1 + 1);
+	dirty = true;
+}
+
+void PixelShaderManager::SetFogColorChanged()
+{
+	if (g_ActiveConfig.bDisableFog)
+		return;
+
+	constants.fogcolor[0] = bpmem.fog.color.r;
+	constants.fogcolor[1] = bpmem.fog.color.g;
+	constants.fogcolor[2] = bpmem.fog.color.b;
+	dirty = true;
+}
+
+void PixelShaderManager::SetFogParamChanged()
+{
+	if (!g_ActiveConfig.bDisableFog)
+	{
+		constants.fogf[1][0] = bpmem.fog.a.GetA();
+		constants.fogi[1] = bpmem.fog.b_magnitude;
+		constants.fogf[1][2] = bpmem.fog.c_proj_fsel.GetC();
+		constants.fogi[3] = bpmem.fog.b_shift;
+	}
+	else
+	{
+		constants.fogf[1][0] = 0.f;
+		constants.fogi[1] = 1;
+		constants.fogf[1][2] = 0.f;
+		constants.fogi[3] = 1;
+	}
+	dirty = true;
+}
+
+void PixelShaderManager::SetFogRangeAdjustChanged()
+{
+	if (g_ActiveConfig.bDisableFog)
+		return;
+
+	s_bFogRangeAdjustChanged = true;
+}
+
+void PixelShaderManager::DoState(PointerWrap &p)
+{
+	p.Do(s_bFogRangeAdjustChanged);
+	p.Do(s_bViewPortChanged);
+
+	p.Do(constants);
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		// Fixup the current state from global GPU state
+		// NOTE: This requires that all GPU memory has been loaded already.
+		Dirty();
+	}
+}
diff --git a/Source/Core/VideoCommon/PixelShaderManager.h b/Source/Core/VideoCommon/PixelShaderManager.h
new file mode 100644
index 0000000000..149b9cc55b
--- /dev/null
+++ b/Source/Core/VideoCommon/PixelShaderManager.h
@@ -0,0 +1,55 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/XFMemory.h"
+
+class PointerWrap;
+
+
+
+// The non-API dependent parts.
+class PixelShaderManager
+{
+public:
+	static void Init();
+	static void Dirty();
+	static void Shutdown();
+	static void DoState(PointerWrap &p);
+
+	static void SetConstants(); // sets pixel shader constants
+
+	// constant management
+	// Some of these functions grab the constant values from global state,
+	// so make sure to call them after memory is committed
+	static void SetTevColor(int index, int component, s32 value);
+	static void SetTevKonstColor(int index, int component, s32 value);
+	static void SetAlpha();
+	static void SetDestAlpha();
+	static void SetTexDims(int texmapid, u32 width, u32 height);
+	static void SetZTextureBias();
+	static void SetViewportChanged();
+	static void SetEfbScaleChanged();
+	static void SetZSlope(float dfdx, float dfdy, float f0);
+	static void SetIndMatrixChanged(int matrixidx);
+	static void SetTevKSelChanged(int id);
+	static void SetZTextureTypeChanged();
+	static void SetIndTexScaleChanged(bool high);
+	static void SetTexCoordChanged(u8 texmapid);
+	static void SetFogColorChanged();
+	static void SetFogParamChanged();
+	static void SetFogRangeAdjustChanged();
+
+	static PixelShaderConstants constants;
+	static bool dirty;
+
+	static bool s_bFogRangeAdjustChanged;
+	static bool s_bViewPortChanged;
+};
diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp
new file mode 100644
index 0000000000..1ee7e142dd
--- /dev/null
+++ b/Source/Core/VideoCommon/PostProcessing.cpp
@@ -0,0 +1,321 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+
+#include "VideoCommon/PostProcessing.h"
+#include "VideoCommon/VideoConfig.h"
+
+
+static const char s_default_shader[] = "void main() { SetOutput(Sample()); }\n";
+
+PostProcessingShaderImplementation::PostProcessingShaderImplementation()
+{
+	m_timer.Start();
+}
+
+PostProcessingShaderImplementation::~PostProcessingShaderImplementation()
+{
+	m_timer.Stop();
+}
+
+std::string PostProcessingShaderConfiguration::LoadShader(std::string shader)
+{
+	// Load the shader from the configuration if there isn't one sent to us.
+	if (shader == "")
+		shader = g_ActiveConfig.sPostProcessingShader;
+	m_current_shader = shader;
+
+	const std::string sub_dir = (g_Config.iStereoMode == STEREO_ANAGLYPH) ? ANAGLYPH_DIR DIR_SEP : "";
+
+	// loading shader code
+	std::string code;
+	std::string path = File::GetUserPath(D_SHADERS_IDX) + sub_dir + shader + ".glsl";
+
+	if (shader == "")
+	{
+		code = s_default_shader;
+	}
+	else
+	{
+		if (!File::Exists(path))
+		{
+			// Fallback to shared user dir
+			path = File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir + shader + ".glsl";
+		}
+
+		if (!File::ReadFileToString(path, code))
+		{
+			ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str());
+			code = s_default_shader;
+		}
+	}
+
+	LoadOptions(code);
+	LoadOptionsConfiguration();
+
+	return code;
+}
+
+void PostProcessingShaderConfiguration::LoadOptions(const std::string& code)
+{
+	const std::string config_start_delimiter = "[configuration]";
+	const std::string config_end_delimiter = "[/configuration]";
+	size_t configuration_start = code.find(config_start_delimiter);
+	size_t configuration_end = code.find(config_end_delimiter);
+
+	m_options.clear();
+	m_any_options_dirty = true;
+
+	if (configuration_start == std::string::npos ||
+	    configuration_end == std::string::npos)
+	{
+		// Issue loading configuration or there isn't one.
+		return;
+	}
+
+	std::string configuration_string = code.substr(configuration_start + config_start_delimiter.size(),
+	                                               configuration_end - configuration_start - config_start_delimiter.size());
+
+	std::istringstream in(configuration_string);
+
+	struct GLSLStringOption
+	{
+		std::string m_type;
+		std::vector<std::pair<std::string, std::string>> m_options;
+	};
+
+	std::vector<GLSLStringOption> option_strings;
+	GLSLStringOption* current_strings = nullptr;
+	while (!in.eof())
+	{
+		std::string line;
+
+		if (std::getline(in, line))
+		{
+#ifndef _WIN32
+			// Check for CRLF eol and convert it to LF
+			if (!line.empty() && line.at(line.size()-1) == '\r')
+			{
+				line.erase(line.size()-1);
+			}
+#endif
+
+			if (line.size() > 0)
+			{
+				if (line[0] == '[')
+				{
+					size_t endpos = line.find("]");
+
+					if (endpos != std::string::npos)
+					{
+						// New section!
+						std::string sub = line.substr(1, endpos - 1);
+						option_strings.push_back({ sub });
+						current_strings = &option_strings.back();
+					}
+				}
+				else
+				{
+					if (current_strings)
+					{
+						std::string key, value;
+						IniFile::ParseLine(line, &key, &value);
+
+						if (!(key == "" && value == ""))
+							current_strings->m_options.emplace_back(key, value);
+					}
+				}
+			}
+		}
+	}
+
+	for (const auto& it : option_strings)
+	{
+		ConfigurationOption option;
+		option.m_dirty = true;
+
+		if (it.m_type == "OptionBool")
+			option.m_type = ConfigurationOption::OptionType::OPTION_BOOL;
+		else if (it.m_type == "OptionRangeFloat")
+			option.m_type = ConfigurationOption::OptionType::OPTION_FLOAT;
+		else if (it.m_type == "OptionRangeInteger")
+			option.m_type = ConfigurationOption::OptionType::OPTION_INTEGER;
+
+		for (const auto& string_option : it.m_options)
+		{
+			if (string_option.first == "GUIName")
+			{
+				option.m_gui_name = string_option.second;
+			}
+			else if (string_option.first == "OptionName")
+			{
+				option.m_option_name = string_option.second;
+			}
+			else if (string_option.first == "DependentOption")
+			{
+				option.m_dependent_option = string_option.second;
+			}
+			else if (string_option.first == "MinValue" ||
+			         string_option.first == "MaxValue" ||
+			         string_option.first == "DefaultValue" ||
+			         string_option.first == "StepAmount")
+			{
+				std::vector<s32>* output_integer = nullptr;
+				std::vector<float>* output_float = nullptr;
+
+				if (string_option.first == "MinValue")
+				{
+					output_integer = &option.m_integer_min_values;
+					output_float = &option.m_float_min_values;
+				}
+				else if (string_option.first == "MaxValue")
+				{
+					output_integer = &option.m_integer_max_values;
+					output_float = &option.m_float_max_values;
+				}
+				else if (string_option.first == "DefaultValue")
+				{
+					output_integer = &option.m_integer_values;
+					output_float = &option.m_float_values;
+				}
+				else if (string_option.first == "StepAmount")
+				{
+					output_integer = &option.m_integer_step_values;
+					output_float = &option.m_float_step_values;
+				}
+
+				if (option.m_type == ConfigurationOption::OptionType::OPTION_BOOL)
+				{
+					TryParse(string_option.second, &option.m_bool_value);
+				}
+				else if (option.m_type == ConfigurationOption::OptionType::OPTION_INTEGER)
+				{
+					TryParseVector(string_option.second, output_integer);
+					if (output_integer->size() > 4)
+						output_integer->erase(output_integer->begin() + 4, output_integer->end());
+				}
+				else if (option.m_type == ConfigurationOption::OptionType::OPTION_FLOAT)
+				{
+					TryParseVector(string_option.second, output_float);
+					if (output_float->size() > 4)
+						output_float->erase(output_float->begin() + 4, output_float->end());
+				}
+			}
+		}
+		m_options[option.m_option_name] = option;
+	}
+}
+
+void PostProcessingShaderConfiguration::LoadOptionsConfiguration()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	std::string section = m_current_shader + "-options";
+
+	for (auto& it : m_options)
+	{
+		switch (it.second.m_type)
+		{
+		case ConfigurationOption::OptionType::OPTION_BOOL:
+			ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &it.second.m_bool_value, it.second.m_bool_value);
+		break;
+		case ConfigurationOption::OptionType::OPTION_INTEGER:
+		{
+			std::string value;
+			ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value);
+			if (value != "")
+				TryParseVector(value, &it.second.m_integer_values);
+		}
+		break;
+		case ConfigurationOption::OptionType::OPTION_FLOAT:
+		{
+			std::string value;
+			ini.GetOrCreateSection(section)->Get(it.second.m_option_name, &value);
+			if (value != "")
+				TryParseVector(value, &it.second.m_float_values);
+		}
+		break;
+		}
+	}
+}
+
+void PostProcessingShaderConfiguration::SaveOptionsConfiguration()
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	std::string section = m_current_shader + "-options";
+
+	for (auto& it : m_options)
+	{
+		switch (it.second.m_type)
+		{
+		case ConfigurationOption::OptionType::OPTION_BOOL:
+		{
+			ini.GetOrCreateSection(section)->Set(it.second.m_option_name, it.second.m_bool_value);
+		}
+		break;
+		case ConfigurationOption::OptionType::OPTION_INTEGER:
+		{
+			std::string value = "";
+			for (size_t i = 0; i < it.second.m_integer_values.size(); ++i)
+				value += StringFromFormat("%d%s", it.second.m_integer_values[i], i == (it.second.m_integer_values.size() - 1) ? "": ", ");
+			ini.GetOrCreateSection(section)->Set(it.second.m_option_name, value);
+		}
+		break;
+		case ConfigurationOption::OptionType::OPTION_FLOAT:
+		{
+			std::ostringstream value;
+			value.imbue(std::locale("C"));
+
+			for (size_t i = 0; i < it.second.m_float_values.size(); ++i)
+			{
+				value << it.second.m_float_values[i];
+				if (i != (it.second.m_float_values.size() - 1))
+					value << ", ";
+			}
+			ini.GetOrCreateSection(section)->Set(it.second.m_option_name, value.str());
+		}
+		break;
+		}
+	}
+	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+}
+
+void PostProcessingShaderConfiguration::ReloadShader()
+{
+	m_current_shader = "";
+}
+
+void PostProcessingShaderConfiguration::SetOptionf(const std::string& option, int index, float value)
+{
+	auto it = m_options.find(option);
+
+	it->second.m_float_values[index] = value;
+	it->second.m_dirty = true;
+	m_any_options_dirty = true;
+}
+
+void PostProcessingShaderConfiguration::SetOptioni(const std::string& option, int index, s32 value)
+{
+	auto it = m_options.find(option);
+
+	it->second.m_integer_values[index] = value;
+	it->second.m_dirty = true;
+	m_any_options_dirty = true;
+}
+
+void PostProcessingShaderConfiguration::SetOptionb(const std::string& option, bool value)
+{
+	auto it = m_options.find(option);
+
+	it->second.m_bool_value = value;
+	it->second.m_dirty = true;
+	m_any_options_dirty = true;
+}
diff --git a/Source/Core/VideoCommon/PostProcessing.h b/Source/Core/VideoCommon/PostProcessing.h
new file mode 100644
index 0000000000..52ebf1b71b
--- /dev/null
+++ b/Source/Core/VideoCommon/PostProcessing.h
@@ -0,0 +1,102 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
+
+#include "VideoCommon/VideoCommon.h"
+
+class PostProcessingShaderConfiguration
+{
+public:
+	struct ConfigurationOption
+	{
+		enum OptionType
+		{
+			OPTION_BOOL = 0,
+			OPTION_FLOAT,
+			OPTION_INTEGER,
+		};
+
+		bool m_bool_value;
+
+		std::vector<float> m_float_values;
+		std::vector<s32> m_integer_values;
+
+		std::vector<float> m_float_min_values;
+		std::vector<s32> m_integer_min_values;
+
+		std::vector<float> m_float_max_values;
+		std::vector<s32> m_integer_max_values;
+
+		std::vector<float> m_float_step_values;
+		std::vector<s32> m_integer_step_values;
+
+		OptionType m_type;
+
+		std::string m_gui_name;
+		std::string m_option_name;
+		std::string m_dependent_option;
+		bool m_dirty;
+	};
+
+	typedef std::map<std::string, ConfigurationOption> ConfigMap;
+
+	PostProcessingShaderConfiguration() : m_current_shader("") {}
+	virtual ~PostProcessingShaderConfiguration() {}
+
+	// Loads the configuration with a shader
+	// If the argument is "" the class will load the shader from the g_activeConfig option.
+	// Returns the loaded shader source from file
+	std::string LoadShader(std::string shader = "");
+	void SaveOptionsConfiguration();
+	void ReloadShader();
+	std::string GetShader() { return m_current_shader; }
+
+	bool IsDirty() { return m_any_options_dirty; }
+	void SetDirty(bool dirty) { m_any_options_dirty = dirty; }
+
+	bool HasOptions() { return m_options.size() > 0; }
+	ConfigMap& GetOptions() { return m_options; }
+	const ConfigurationOption& GetOption(const std::string& option) { return m_options[option]; }
+
+	// For updating option's values
+	void SetOptionf(const std::string& option, int index, float value);
+	void SetOptioni(const std::string& option, int index, s32 value);
+	void SetOptionb(const std::string& option, bool value);
+
+private:
+	bool m_any_options_dirty;
+	std::string m_current_shader;
+	ConfigMap m_options;
+
+	void LoadOptions(const std::string& code);
+	void LoadOptionsConfiguration();
+};
+
+class PostProcessingShaderImplementation
+{
+public:
+	PostProcessingShaderImplementation();
+	virtual ~PostProcessingShaderImplementation();
+
+	PostProcessingShaderConfiguration* GetConfig() { return &m_config; }
+
+	// Should be implemented by the backends for backend specific code
+	virtual void BlitFromTexture(TargetRectangle src, TargetRectangle dst,
+	                             int src_texture, int src_width, int src_height, int layer = 0) = 0;
+	virtual void ApplyShader() = 0;
+
+protected:
+	// Timer for determining our time value
+	Common::Timer m_timer;
+
+	PostProcessingShaderConfiguration m_config;
+};
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
new file mode 100644
index 0000000000..dba0667b64
--- /dev/null
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -0,0 +1,609 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// ---------------------------------------------------------------------------------------------
+// GC graphics pipeline
+// ---------------------------------------------------------------------------------------------
+// 3d commands are issued through the fifo. The GPU draws to the 2MB EFB.
+// The efb can be copied back into ram in two forms: as textures or as XFB.
+// The XFB is the region in RAM that the VI chip scans out to the television.
+// So, after all rendering to EFB is done, the image is copied into one of two XFBs in RAM.
+// Next frame, that one is scanned out and the other one gets the copy. = double buffering.
+// ---------------------------------------------------------------------------------------------
+
+#include <cinttypes>
+#include <cmath>
+#include <string>
+
+#include "Common/Atomic.h"
+#include "Common/Profiler.h"
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+
+#include "VideoCommon/AVIDump.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/FPSCounter.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+#include "VideoCommon/MainBase.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+// TODO: Move these out of here.
+int frameCount;
+int OSDChoice;
+static int OSDTime;
+
+Renderer *g_renderer = nullptr;
+
+std::mutex Renderer::s_criticalScreenshot;
+std::string Renderer::s_sScreenshotName;
+
+volatile bool Renderer::s_bScreenshot;
+
+// The framebuffer size
+int Renderer::s_target_width;
+int Renderer::s_target_height;
+
+// TODO: Add functionality to reinit all the render targets when the window is resized.
+int Renderer::s_backbuffer_width;
+int Renderer::s_backbuffer_height;
+
+PostProcessingShaderImplementation* Renderer::m_post_processor;
+
+TargetRectangle Renderer::target_rc;
+
+int Renderer::s_last_efb_scale;
+
+bool Renderer::XFBWrited;
+
+PEControl::PixelFormat Renderer::prev_efb_format = PEControl::INVALID_FMT;
+unsigned int Renderer::efb_scale_numeratorX = 1;
+unsigned int Renderer::efb_scale_numeratorY = 1;
+unsigned int Renderer::efb_scale_denominatorX = 1;
+unsigned int Renderer::efb_scale_denominatorY = 1;
+
+
+Renderer::Renderer()
+	: frame_data()
+	, bLastFrameDumped(false)
+{
+	UpdateActiveConfig();
+	TextureCache::OnConfigChanged(g_ActiveConfig);
+
+#if defined _WIN32 || defined HAVE_LIBAV
+	bAVIDumping = false;
+#endif
+
+	OSDChoice = 0;
+	OSDTime = 0;
+}
+
+Renderer::~Renderer()
+{
+	// invalidate previous efb format
+	prev_efb_format = PEControl::INVALID_FMT;
+
+	efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = 1;
+
+#if defined _WIN32 || defined HAVE_LIBAV
+	if (SConfig::GetInstance().m_DumpFrames && bLastFrameDumped && bAVIDumping)
+		AVIDump::Stop();
+#else
+	if (pFrameDump.IsOpen())
+		pFrameDump.Close();
+#endif
+}
+
+void Renderer::RenderToXFB(u32 xfbAddr, const EFBRectangle& sourceRc, u32 fbWidth, u32 fbHeight, float Gamma)
+{
+	CheckFifoRecording();
+
+	if (!fbWidth || !fbHeight)
+		return;
+
+	XFBWrited = true;
+
+	if (g_ActiveConfig.bUseXFB)
+	{
+		FramebufferManagerBase::CopyToXFB(xfbAddr, fbWidth, fbHeight, sourceRc, Gamma);
+	}
+	else
+	{
+		Swap(xfbAddr, fbWidth, fbWidth, fbHeight, sourceRc, Gamma);
+	}
+}
+
+int Renderer::EFBToScaledX(int x)
+{
+	switch (g_ActiveConfig.iEFBScale)
+	{
+		case SCALE_AUTO: // fractional
+			return FramebufferManagerBase::ScaleToVirtualXfbWidth(x);
+
+		default:
+			return x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
+	};
+}
+
+int Renderer::EFBToScaledY(int y)
+{
+	switch (g_ActiveConfig.iEFBScale)
+	{
+		case SCALE_AUTO: // fractional
+			return FramebufferManagerBase::ScaleToVirtualXfbHeight(y);
+
+		default:
+			return y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
+	};
+}
+
+void Renderer::CalculateTargetScale(int x, int y, int* scaledX, int* scaledY)
+{
+	if (g_ActiveConfig.iEFBScale == SCALE_AUTO || g_ActiveConfig.iEFBScale == SCALE_AUTO_INTEGRAL)
+	{
+		*scaledX = x;
+		*scaledY = y;
+	}
+	else
+	{
+		*scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
+		*scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
+	}
+}
+
+// return true if target size changed
+bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height)
+{
+	int newEFBWidth, newEFBHeight;
+	newEFBWidth = newEFBHeight = 0;
+
+	// TODO: Ugly. Clean up
+	switch (s_last_efb_scale)
+	{
+		case SCALE_AUTO:
+		case SCALE_AUTO_INTEGRAL:
+			newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH);
+			newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT);
+
+			if (s_last_efb_scale == SCALE_AUTO_INTEGRAL)
+			{
+				newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH;
+				newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT;
+			}
+			efb_scale_numeratorX = newEFBWidth;
+			efb_scale_denominatorX = EFB_WIDTH;
+			efb_scale_numeratorY = newEFBHeight;
+			efb_scale_denominatorY = EFB_HEIGHT;
+			break;
+
+		case SCALE_1X:
+			efb_scale_numeratorX = efb_scale_numeratorY = 1;
+			efb_scale_denominatorX = efb_scale_denominatorY = 1;
+			break;
+
+		case SCALE_1_5X:
+			efb_scale_numeratorX = efb_scale_numeratorY = 3;
+			efb_scale_denominatorX = efb_scale_denominatorY = 2;
+			break;
+
+		case SCALE_2X:
+			efb_scale_numeratorX = efb_scale_numeratorY = 2;
+			efb_scale_denominatorX = efb_scale_denominatorY = 1;
+			break;
+
+		case SCALE_2_5X:
+			efb_scale_numeratorX = efb_scale_numeratorY = 5;
+			efb_scale_denominatorX = efb_scale_denominatorY = 2;
+			break;
+
+		case SCALE_3X:
+		case SCALE_4X:
+		default:
+			efb_scale_numeratorX = efb_scale_numeratorY = s_last_efb_scale - 3;
+			efb_scale_denominatorX = efb_scale_denominatorY = 1;
+
+
+			int maxSize;
+			maxSize = GetMaxTextureSize();
+			if ((unsigned)maxSize < EFB_WIDTH * efb_scale_numeratorX / efb_scale_denominatorX)
+			{
+				efb_scale_numeratorX = efb_scale_numeratorY = (maxSize / EFB_WIDTH);
+				efb_scale_denominatorX = efb_scale_denominatorY = 1;
+			}
+
+			break;
+	}
+	if (s_last_efb_scale > SCALE_AUTO_INTEGRAL)
+		CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, &newEFBWidth, &newEFBHeight);
+
+	if (newEFBWidth != s_target_width || newEFBHeight != s_target_height)
+	{
+		s_target_width  = newEFBWidth;
+		s_target_height = newEFBHeight;
+		return true;
+	}
+	return false;
+}
+
+void Renderer::ConvertStereoRectangle(const TargetRectangle& rc, TargetRectangle& leftRc, TargetRectangle& rightRc)
+{
+	// Resize target to half its original size
+	TargetRectangle drawRc = rc;
+	if (g_ActiveConfig.iStereoMode == STEREO_TAB)
+	{
+		// The height may be negative due to flipped rectangles
+		int height = rc.bottom - rc.top;
+		drawRc.top += height / 4;
+		drawRc.bottom -= height / 4;
+	}
+	else
+	{
+		int width = rc.right - rc.left;
+		drawRc.left += width / 4;
+		drawRc.right -= width / 4;
+	}
+
+	// Create two target rectangle offset to the sides of the backbuffer
+	leftRc = drawRc, rightRc = drawRc;
+	if (g_ActiveConfig.iStereoMode == STEREO_TAB)
+	{
+		leftRc.top -= s_backbuffer_height / 4;
+		leftRc.bottom -= s_backbuffer_height / 4;
+		rightRc.top += s_backbuffer_height / 4;
+		rightRc.bottom += s_backbuffer_height / 4;
+	}
+	else
+	{
+		leftRc.left -= s_backbuffer_width / 4;
+		leftRc.right -= s_backbuffer_width / 4;
+		rightRc.left += s_backbuffer_width / 4;
+		rightRc.right += s_backbuffer_width / 4;
+	}
+}
+
+void Renderer::SetScreenshot(const std::string& filename)
+{
+	std::lock_guard<std::mutex> lk(s_criticalScreenshot);
+	s_sScreenshotName = filename;
+	s_bScreenshot = true;
+}
+
+// Create On-Screen-Messages
+void Renderer::DrawDebugText()
+{
+	std::string final_yellow, final_cyan;
+
+	if (g_ActiveConfig.bShowFPS || SConfig::GetInstance().m_ShowFrameCount)
+	{
+		std::string fps = "";
+		if (g_ActiveConfig.bShowFPS)
+			final_cyan += StringFromFormat("FPS: %d", g_renderer->m_fps_counter.m_fps);
+
+		if (g_ActiveConfig.bShowFPS && SConfig::GetInstance().m_ShowFrameCount)
+			final_cyan += " - ";
+		if (SConfig::GetInstance().m_ShowFrameCount)
+		{
+			final_cyan += StringFromFormat("Frame: %llu", (unsigned long long) Movie::g_currentFrame);
+			if (Movie::IsPlayingInput())
+				final_cyan += StringFromFormat(" / %llu", (unsigned long long) Movie::g_totalFrames);
+		}
+
+		final_cyan += "\n";
+		final_yellow += "\n";
+	}
+
+	if (SConfig::GetInstance().m_ShowLag)
+	{
+		final_cyan += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);
+		final_yellow += "\n";
+	}
+
+	if (SConfig::GetInstance().m_ShowInputDisplay)
+	{
+		final_cyan += Movie::GetInputDisplay();
+		final_yellow += "\n";
+	}
+
+	// OSD Menu messages
+	if (OSDChoice > 0)
+	{
+		OSDTime = Common::Timer::GetTimeMs() + 3000;
+		OSDChoice = -OSDChoice;
+	}
+
+	if ((u32)OSDTime > Common::Timer::GetTimeMs())
+	{
+		const char* res_text = "";
+		switch (g_ActiveConfig.iEFBScale)
+		{
+		case SCALE_AUTO:
+			res_text = "Auto (fractional)";
+			break;
+		case SCALE_AUTO_INTEGRAL:
+			res_text = "Auto (integral)";
+			break;
+		case SCALE_1X:
+			res_text = "Native";
+			break;
+		case SCALE_1_5X:
+			res_text = "1.5x";
+			break;
+		case SCALE_2X:
+			res_text = "2x";
+			break;
+		case SCALE_2_5X:
+			res_text = "2.5x";
+			break;
+		case SCALE_3X:
+			res_text = "3x";
+			break;
+		case SCALE_4X:
+			res_text = "4x";
+			break;
+		}
+
+		const char* ar_text = "";
+		switch (g_ActiveConfig.iAspectRatio)
+		{
+		case ASPECT_AUTO:
+			ar_text = "Auto";
+			break;
+		case ASPECT_FORCE_16_9:
+			ar_text = "16:9";
+			break;
+		case ASPECT_FORCE_4_3:
+			ar_text = "4:3";
+			break;
+		case ASPECT_STRETCH:
+			ar_text = "Stretch";
+			break;
+		}
+
+		const char* const efbcopy_text = g_ActiveConfig.bSkipEFBCopyToRam ? "to Texture" : "to RAM";
+
+		// The rows
+		const std::string lines[] =
+		{
+			std::string("Internal Resolution: ") + res_text,
+			std::string("Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""),
+			std::string("Copy EFB: ") + efbcopy_text,
+			std::string("Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"),
+		};
+
+		enum { lines_count = sizeof(lines) / sizeof(*lines) };
+
+		// The latest changed setting in yellow
+		for (int i = 0; i != lines_count; ++i)
+		{
+			if (OSDChoice == -i - 1)
+				final_yellow += lines[i];
+			final_yellow += '\n';
+		}
+
+		// The other settings in cyan
+		for (int i = 0; i != lines_count; ++i)
+		{
+			if (OSDChoice != -i - 1)
+				final_cyan += lines[i];
+			final_cyan += '\n';
+		}
+	}
+
+	final_cyan += Profiler::ToString();
+
+	if (g_ActiveConfig.bOverlayStats)
+		final_cyan += Statistics::ToString();
+
+	if (g_ActiveConfig.bOverlayProjStats)
+		final_cyan += Statistics::ToStringProj();
+
+	//and then the text
+	g_renderer->RenderText(final_cyan, 20, 20, 0xFF00FFFF);
+	g_renderer->RenderText(final_yellow, 20, 20, 0xFFFFFF00);
+}
+
+void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height)
+{
+	float FloatGLWidth = (float)backbuffer_width;
+	float FloatGLHeight = (float)backbuffer_height;
+	float FloatXOffset = 0;
+	float FloatYOffset = 0;
+
+	// The rendering window size
+	const float WinWidth = FloatGLWidth;
+	const float WinHeight = FloatGLHeight;
+
+	// Handle aspect ratio.
+	// Default to auto.
+	bool use16_9 = g_aspect_wide;
+
+	// Update aspect ratio hack values
+	// Won't take effect until next frame
+	// Don't know if there is a better place for this code so there isn't a 1 frame delay
+	if (g_ActiveConfig.bWidescreenHack)
+	{
+		float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f);
+		float target_aspect;
+
+		switch (g_ActiveConfig.iAspectRatio)
+		{
+		case ASPECT_FORCE_16_9:
+			target_aspect = 16.0f / 9.0f;
+			break;
+		case ASPECT_FORCE_4_3:
+			target_aspect = 4.0f / 3.0f;
+			break;
+		case ASPECT_STRETCH:
+			target_aspect = WinWidth / WinHeight;
+			break;
+		default:
+			// ASPECT_AUTO == no hacking
+			target_aspect = source_aspect;
+			break;
+		}
+
+		float adjust = source_aspect / target_aspect;
+		if (adjust > 1)
+		{
+			// Vert+
+			g_Config.fAspectRatioHackW = 1;
+			g_Config.fAspectRatioHackH = 1 / adjust;
+		}
+		else
+		{
+			// Hor+
+			g_Config.fAspectRatioHackW = adjust;
+			g_Config.fAspectRatioHackH = 1;
+		}
+	}
+	else
+	{
+		// Hack is disabled
+		g_Config.fAspectRatioHackW = 1;
+		g_Config.fAspectRatioHackH = 1;
+	}
+
+	// Check for force-settings and override.
+	if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9)
+		use16_9 = true;
+	else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3)
+		use16_9 = false;
+
+	if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH)
+	{
+		// The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio
+		float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f));
+		// Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width.
+		if (Ratio > 1.0f)
+		{
+			// Scale down and center in the X direction.
+			FloatGLWidth /= Ratio;
+			FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f;
+		}
+		// The window is too high, we have to limit the height
+		else
+		{
+			// Scale down and center in the Y direction.
+			FloatGLHeight *= Ratio;
+			FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f;
+		}
+	}
+
+	// -----------------------------------------------------------------------
+	// Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.
+	// Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset
+	// ------------------
+	if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop)
+	{
+		float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f)));
+		// The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted)
+		float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth;
+		float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight;
+		// The new width and height
+		FloatGLWidth = FloatGLWidth * Ratio;
+		FloatGLHeight = FloatGLHeight * Ratio;
+		// Adjust the X and Y offset
+		FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f);
+		FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f);
+	}
+
+	int XOffset = (int)(FloatXOffset + 0.5f);
+	int YOffset = (int)(FloatYOffset + 0.5f);
+	int iWhidth = (int)ceil(FloatGLWidth);
+	int iHeight = (int)ceil(FloatGLHeight);
+	iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders
+	iHeight -= iHeight % 4;
+
+	target_rc.left = XOffset;
+	target_rc.top = YOffset;
+	target_rc.right = XOffset + iWhidth;
+	target_rc.bottom = YOffset + iHeight;
+}
+
+void Renderer::SetWindowSize(int width, int height)
+{
+	if (width < 1)
+		width = 1;
+	if (height < 1)
+		height = 1;
+
+	// Scale the window size by the EFB scale.
+	CalculateTargetScale(width, height, &width, &height);
+
+	Host_RequestRenderWindowSize(width, height);
+}
+
+void Renderer::CheckFifoRecording()
+{
+	bool wasRecording = g_bRecordFifoData;
+	g_bRecordFifoData = FifoRecorder::GetInstance().IsRecording();
+
+	if (g_bRecordFifoData)
+	{
+		if (!wasRecording)
+		{
+			RecordVideoMemory();
+		}
+
+		FifoRecorder::GetInstance().EndFrame(CommandProcessor::fifo.CPBase, CommandProcessor::fifo.CPEnd);
+	}
+}
+
+void Renderer::RecordVideoMemory()
+{
+	u32 *bpmem_ptr = (u32*)&bpmem;
+	u32 cpmem[256];
+	// The FIFO recording format splits XF memory into xfmem and xfregs; follow
+	// that split here.
+	u32 *xfmem_ptr = (u32*)&xfmem;
+	u32 *xfregs_ptr = (u32*)&xfmem + FifoDataFile::XF_MEM_SIZE;
+	u32 xfregs_size = sizeof(XFMemory) / 4 - FifoDataFile::XF_MEM_SIZE;
+
+	memset(cpmem, 0, 256 * 4);
+	FillCPMemoryArray(cpmem);
+
+	FifoRecorder::GetInstance().SetVideoMemory(bpmem_ptr, cpmem, xfmem_ptr, xfregs_ptr, xfregs_size);
+}
+
+void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma)
+{
+	// TODO: merge more generic parts into VideoCommon
+	g_renderer->SwapImpl(xfbAddr, fbWidth, fbStride, fbHeight, rc, Gamma);
+
+	if (XFBWrited)
+		g_renderer->m_fps_counter.Update();
+
+	frameCount++;
+	GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);
+
+	// Begin new frame
+	// Set default viewport and scissor, for the clear to work correctly
+	// New frame
+	stats.ResetFrame();
+
+	Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB));
+	XFBWrited = false;
+}
+
+void Renderer::PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data)
+{
+	for (EfbPokeData poke : data)
+	{
+		AccessEFB(type, poke.x, poke.y, poke.data);
+	}
+}
diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h
new file mode 100644
index 0000000000..8e3e830d3f
--- /dev/null
+++ b/Source/Core/VideoCommon/RenderBase.h
@@ -0,0 +1,184 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// ---------------------------------------------------------------------------------------------
+// GC graphics pipeline
+// ---------------------------------------------------------------------------------------------
+// 3d commands are issued through the fifo. The GPU draws to the 2MB EFB.
+// The efb can be copied back into ram in two forms: as textures or as XFB.
+// The XFB is the region in RAM that the VI chip scans out to the television.
+// So, after all rendering to EFB is done, the image is copied into one of two XFBs in RAM.
+// Next frame, that one is scanned out and the other one gets the copy. = double buffering.
+// ---------------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <mutex>
+#include <string>
+
+#include "Common/MathUtil.h"
+#include "Common/Thread.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/FPSCounter.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/VideoCommon.h"
+
+class PostProcessingShaderImplementation;
+
+struct EfbPokeData
+{
+	u16 x,y;
+	u32 data;
+};
+
+// TODO: Move these out of here.
+extern int frameCount;
+extern int OSDChoice;
+
+extern bool bLastFrameDumped;
+
+// Renderer really isn't a very good name for this class - it's more like "Misc".
+// The long term goal is to get rid of this class and replace it with others that make
+// more sense.
+class Renderer
+{
+public:
+	Renderer();
+	virtual ~Renderer();
+
+	enum PixelPerfQuery {
+		PP_ZCOMP_INPUT_ZCOMPLOC,
+		PP_ZCOMP_OUTPUT_ZCOMPLOC,
+		PP_ZCOMP_INPUT,
+		PP_ZCOMP_OUTPUT,
+		PP_BLEND_INPUT,
+		PP_EFB_COPY_CLOCKS
+	};
+
+	virtual void SetColorMask() = 0;
+	virtual void SetBlendMode(bool forceUpdate) = 0;
+	virtual void SetScissorRect(const EFBRectangle& rc) = 0;
+	virtual void SetGenerationMode() = 0;
+	virtual void SetDepthMode() = 0;
+	virtual void SetLogicOpMode() = 0;
+	virtual void SetDitherMode() = 0;
+	virtual void SetSamplerState(int stage, int texindex, bool custom_tex) = 0;
+	virtual void SetInterlacingMode() = 0;
+	virtual void SetViewport() = 0;
+
+	virtual void ApplyState(bool bUseDstAlpha) = 0;
+	virtual void RestoreState() = 0;
+
+	// Ideal internal resolution - determined by display resolution (automatic scaling) and/or a multiple of the native EFB resolution
+	static int GetTargetWidth() { return s_target_width; }
+	static int GetTargetHeight() { return s_target_height; }
+
+	// Display resolution
+	static int GetBackbufferWidth() { return s_backbuffer_width; }
+	static int GetBackbufferHeight() { return s_backbuffer_height; }
+
+	static void SetWindowSize(int width, int height);
+
+	// EFB coordinate conversion functions
+
+	// Use this to convert a whole native EFB rect to backbuffer coordinates
+	virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0;
+
+	static const TargetRectangle& GetTargetRectangle() { return target_rc; }
+	static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height);
+
+	// Use this to convert a single target rectangle to two stereo rectangles
+	static void ConvertStereoRectangle(const TargetRectangle& rc, TargetRectangle& leftRc, TargetRectangle& rightRc);
+
+	// Use this to upscale native EFB coordinates to IDEAL internal resolution
+	static int EFBToScaledX(int x);
+	static int EFBToScaledY(int y);
+
+	// Floating point versions of the above - only use them if really necessary
+	static float EFBToScaledXf(float x) { return x * ((float)GetTargetWidth() / (float)EFB_WIDTH); }
+	static float EFBToScaledYf(float y) { return y * ((float)GetTargetHeight() / (float)EFB_HEIGHT); }
+
+	// Random utilities
+	static void SetScreenshot(const std::string& filename);
+	static void DrawDebugText();
+
+	virtual void RenderText(const std::string& text, int left, int top, u32 color) = 0;
+
+	virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) = 0;
+	virtual void ReinterpretPixelData(unsigned int convtype) = 0;
+	static void RenderToXFB(u32 xfbAddr, const EFBRectangle& sourceRc, u32 fbWidth, u32 fbHeight, float Gamma = 1.0f);
+
+	virtual u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) = 0;
+	virtual void PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data);
+
+	virtual u16 BBoxRead(int index) = 0;
+	virtual void BBoxWrite(int index, u16 value) = 0;
+
+	// What's the real difference between these? Too similar names.
+	virtual void ResetAPIState() = 0;
+	virtual void RestoreAPIState() = 0;
+
+	// Finish up the current frame, print some stats
+	static void Swap(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc,float Gamma = 1.0f);
+	virtual void SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma = 1.0f) = 0;
+
+	virtual bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) = 0;
+
+	static PEControl::PixelFormat GetPrevPixelFormat() { return prev_efb_format; }
+	static void StorePixelFormat(PEControl::PixelFormat new_format) { prev_efb_format = new_format; }
+
+	PostProcessingShaderImplementation* GetPostProcessor() { return m_post_processor; }
+	// Max height/width
+	virtual int GetMaxTextureSize() = 0;
+
+protected:
+
+	static void CalculateTargetScale(int x, int y, int* scaledX, int* scaledY);
+	bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height);
+
+	static void CheckFifoRecording();
+	static void RecordVideoMemory();
+
+	static volatile bool s_bScreenshot;
+	static std::mutex s_criticalScreenshot;
+	static std::string s_sScreenshotName;
+
+#if defined _WIN32 || defined HAVE_LIBAV
+	bool bAVIDumping;
+#else
+	File::IOFile pFrameDump;
+#endif
+	std::vector<u8> frame_data;
+	bool bLastFrameDumped;
+
+	// The framebuffer size
+	static int s_target_width;
+	static int s_target_height;
+
+	// TODO: Add functionality to reinit all the render targets when the window is resized.
+	static int s_backbuffer_width;
+	static int s_backbuffer_height;
+
+	static TargetRectangle target_rc;
+
+	// TODO: Can probably eliminate this static var.
+	static int s_last_efb_scale;
+
+	static bool XFBWrited;
+
+	FPSCounter m_fps_counter;
+
+	static PostProcessingShaderImplementation* m_post_processor;
+
+private:
+	static PEControl::PixelFormat prev_efb_format;
+	static unsigned int efb_scale_numeratorX;
+	static unsigned int efb_scale_numeratorY;
+	static unsigned int efb_scale_denominatorX;
+	static unsigned int efb_scale_denominatorY;
+};
+
+extern Renderer *g_renderer;
+
diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h
new file mode 100644
index 0000000000..218d9b98b5
--- /dev/null
+++ b/Source/Core/VideoCommon/ShaderGenCommon.h
@@ -0,0 +1,319 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <algorithm>
+#include <cstdarg>
+#include <cstdio>
+#include <iomanip>
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/StringUtil.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+/**
+ * Common interface for classes that need to go through the shader generation path (GenerateVertexShader, GeneratePixelShader)
+ * In particular, this includes the shader code generator (ShaderCode).
+ * A different class (ShaderUid) can be used to uniquely identify each ShaderCode object.
+ * More interesting things can be done with this, e.g. ShaderConstantProfile checks what shader constants are being used. This can be used to optimize buffer management.
+ * Each of the ShaderCode, ShaderUid and ShaderConstantProfile child classes only implement the subset of ShaderGeneratorInterface methods that are required for the specific tasks.
+ */
+class ShaderGeneratorInterface
+{
+public:
+	/*
+	 * Used when the shader generator would write a piece of ShaderCode.
+	 * Can be used like printf.
+	 * @note In the ShaderCode implementation, this does indeed write the parameter string to an internal buffer. However, you're free to do whatever you like with the parameter.
+	 */
+	template<typename... Args>
+	void Write(const char*, Args...) {}
+
+	/*
+	 * Returns a read pointer to the internal buffer.
+	 * @note When implementing this method in a child class, you likely want to return the argument of the last SetBuffer call here
+	 * @note SetBuffer() should be called before using GetBuffer().
+	 */
+	const char* GetBuffer() { return nullptr; }
+
+	/*
+	 * Can be used to give the object a place to write to. This should be called before using Write().
+	 * @param buffer pointer to a char buffer that the object can write to
+	 */
+	void SetBuffer(char* buffer) { }
+
+	/*
+	 * Tells us that a specific constant range (including last_index) is being used by the shader
+	 */
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
+
+	/*
+	 * Returns a pointer to an internally stored object of the uid_data type.
+	 * @warning since most child classes use the default implementation you shouldn't access this directly without adding precautions against nullptr access (e.g. via adding a dummy structure, cf. the vertex/pixel shader generators)
+	 */
+	template<class uid_data>
+	uid_data* GetUidData() { return nullptr; }
+};
+
+/**
+ * Shader UID class used to uniquely identify the ShaderCode output written in the shader generator.
+ * uid_data can be any struct of parameters that uniquely identify each shader code output.
+ * Unless performance is not an issue, uid_data should be tightly packed to reduce memory footprint.
+ * Shader generators will write to specific uid_data fields; ShaderUid methods will only read raw u32 values from a union.
+ */
+template<class uid_data>
+class ShaderUid : public ShaderGeneratorInterface
+{
+public:
+	ShaderUid()
+	{
+		// TODO: Move to Shadergen => can be optimized out
+		memset(values, 0, sizeof(values));
+	}
+
+	bool operator == (const ShaderUid& obj) const
+	{
+		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) == 0;
+	}
+
+	bool operator != (const ShaderUid& obj) const
+	{
+		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) != 0;
+	}
+
+	// determines the storage order inside STL containers
+	bool operator < (const ShaderUid& obj) const
+	{
+		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) < 0;
+	}
+
+	template<class uid_data2>
+	uid_data2* GetUidData() { return &data; }
+	const uid_data* GetUidData() const { return &data; }
+	const u8* GetUidDataRaw() const { return &values[0]; }
+
+	size_t GetUidDataSize() const { return sizeof(values); }
+
+private:
+	union
+	{
+		uid_data data;
+		u8 values[sizeof(uid_data)];
+	};
+};
+
+class ShaderCode : public ShaderGeneratorInterface
+{
+public:
+	ShaderCode() : buf(nullptr), write_ptr(nullptr)
+	{
+	}
+
+	void Write(const char* fmt, ...)
+	{
+		va_list arglist;
+		va_start(arglist, fmt);
+		write_ptr += vsprintf(write_ptr, fmt, arglist);
+		va_end(arglist);
+	}
+
+	const char* GetBuffer() { return buf; }
+	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
+
+private:
+	const char* buf;
+	char* write_ptr;
+};
+
+/**
+ * Generates a shader constant profile which can be used to query which constants are used in a shader
+ */
+class ShaderConstantProfile : public ShaderGeneratorInterface
+{
+public:
+	ShaderConstantProfile(int num_constants) { constant_usage.resize(num_constants); }
+
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index)
+	{
+		for (unsigned int i = first_index; i < last_index + 1; ++i)
+			constant_usage[i] = true;
+	}
+
+	inline bool ConstantIsUsed(unsigned int index)
+	{
+		// TODO: Not ready for usage yet
+		return true;
+		//return constant_usage[index];
+	}
+private:
+	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
+};
+/**
+ * Checks if there has been
+ */
+template<class UidT, class CodeT>
+class UidChecker
+{
+public:
+	void Invalidate()
+	{
+		m_shaders.clear();
+		m_uids.clear();
+	}
+
+	void AddToIndexAndCheck(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
+	{
+		bool uid_is_indexed = std::find(m_uids.begin(), m_uids.end(), new_uid) != m_uids.end();
+		if (!uid_is_indexed)
+		{
+			m_uids.push_back(new_uid);
+			m_shaders[new_uid] = new_code.GetBuffer();
+		}
+		else
+		{
+			// uid is already in the index => check if there's a shader with the same uid but different code
+			auto& old_code = m_shaders[new_uid];
+			if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
+			{
+				static int num_failures = 0;
+
+				std::string temp = StringFromFormat("%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
+						dump_prefix, ++num_failures);
+
+				// TODO: Should also dump uids
+				std::ofstream file;
+				OpenFStream(file, temp, std::ios_base::out);
+				file << "Old shader code:\n" << old_code;
+				file << "\n\nNew shader code:\n" << new_code.GetBuffer();
+				file << "\n\nShader uid:\n";
+				for (unsigned int i = 0; i < new_uid.GetUidDataSize(); ++i)
+				{
+					u8 value = new_uid.GetUidDataRaw()[i];
+					if ((i % 4) == 0)
+					{
+						auto last_value = (i + 3 < new_uid.GetUidDataSize() - 1) ? i + 3 : new_uid.GetUidDataSize();
+						file << std::setfill(' ') << std::dec;
+						file << "Values " << std::setw(2) << i << " - " << last_value << ": ";
+					}
+
+					file << std::setw(2) << std::setfill('0') << std::hex << value << std::setw(1);
+					if ((i % 4) < 3)
+						file << ' ';
+					else
+						file << std::endl;
+				}
+
+				ERROR_LOG(VIDEO, "%s shader uid mismatch! See %s for details", shader_type, temp.c_str());
+			}
+		}
+	}
+
+private:
+	std::map<UidT, std::string> m_shaders;
+	std::vector<UidT> m_uids;
+};
+
+template<class T>
+static void DefineOutputMember(T& object, API_TYPE api_type, const char* qualifier, const char* type, const char* name, int var_index, const char* semantic = "", int semantic_index = -1)
+{
+	if (qualifier != nullptr)
+		object.Write("\t%s %s %s", qualifier, type, name);
+	else
+		object.Write("\t%s %s", type, name);
+
+	if (var_index != -1)
+		object.Write("%d", var_index);
+
+	if (api_type == API_D3D && strlen(semantic) > 0)
+	{
+		if (semantic_index != -1)
+			object.Write(" : %s%d", semantic, semantic_index);
+		else
+			object.Write(" : %s", semantic);
+	}
+
+	object.Write(";\n");
+}
+
+template<class T>
+static inline void GenerateVSOutputMembers(T& object, API_TYPE api_type, const char* qualifier = nullptr)
+{
+	DefineOutputMember(object, api_type, qualifier, "float4", "pos", -1, "POSITION");
+	DefineOutputMember(object, api_type, qualifier, "float4", "colors_", 0, "COLOR", 0);
+	DefineOutputMember(object, api_type, qualifier, "float4", "colors_", 1, "COLOR", 1);
+
+	for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+		DefineOutputMember(object, api_type, qualifier, "float3", "tex", i, "TEXCOORD", i);
+
+	DefineOutputMember(object, api_type, qualifier, "float4", "clipPos", -1, "TEXCOORD", xfmem.numTexGen.numTexGens);
+
+	if (g_ActiveConfig.bEnablePixelLighting)
+	{
+		DefineOutputMember(object, api_type, qualifier, "float3", "Normal", -1, "TEXCOORD", xfmem.numTexGen.numTexGens + 1);
+		DefineOutputMember(object, api_type, qualifier, "float3", "WorldPos", -1, "TEXCOORD", xfmem.numTexGen.numTexGens + 2);
+	}
+}
+
+template<class T>
+static inline void AssignVSOutputMembers(T& object, const char* a, const char* b)
+{
+	object.Write("\t%s.pos = %s.pos;\n", a, b);
+	object.Write("\t%s.colors_0 = %s.colors_0;\n", a, b);
+	object.Write("\t%s.colors_1 = %s.colors_1;\n", a, b);
+
+	for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+		object.Write("\t%s.tex%d = %s.tex%d;\n", a, i, b, i);
+
+	object.Write("\t%s.clipPos = %s.clipPos;\n", a, b);
+
+	if (g_ActiveConfig.bEnablePixelLighting)
+	{
+		object.Write("\t%s.Normal = %s.Normal;\n", a, b);
+		object.Write("\t%s.WorldPos = %s.WorldPos;\n", a, b);
+	}
+}
+
+// Constant variable names
+#define I_COLORS        "color"
+#define I_KCOLORS       "k"
+#define I_ALPHA         "alphaRef"
+#define I_TEXDIMS       "texdim"
+#define I_ZBIAS         "czbias"
+#define I_INDTEXSCALE   "cindscale"
+#define I_INDTEXMTX     "cindmtx"
+#define I_FOGCOLOR      "cfogcolor"
+#define I_FOGI          "cfogi"
+#define I_FOGF          "cfogf"
+#define I_ZSLOPE        "czslope"
+#define I_EFBSCALE      "cefbscale"
+
+#define I_POSNORMALMATRIX       "cpnmtx"
+#define I_PROJECTION            "cproj"
+#define I_MATERIALS             "cmtrl"
+#define I_LIGHTS                "clights"
+#define I_TEXMATRICES           "ctexmtx"
+#define I_TRANSFORMMATRICES     "ctrmtx"
+#define I_NORMALMATRICES        "cnmtx"
+#define I_POSTTRANSFORMMATRICES "cpostmtx"
+#define I_PIXELCENTERCORRECTION "cpixelcenter"
+
+#define I_STEREOPARAMS  "cstereo"
+#define I_LINEPTPARAMS  "clinept"
+#define I_TEXOFFSET     "ctexoffset"
+
+static const char s_shader_uniforms[] =
+	"\tfloat4 " I_POSNORMALMATRIX"[6];\n"
+	"\tfloat4 " I_PROJECTION"[4];\n"
+	"\tint4 " I_MATERIALS"[4];\n"
+	"\tLight " I_LIGHTS"[8];\n"
+	"\tfloat4 " I_TEXMATRICES"[24];\n"
+	"\tfloat4 " I_TRANSFORMMATRICES"[64];\n"
+	"\tfloat4 " I_NORMALMATRICES"[32];\n"
+	"\tfloat4 " I_POSTTRANSFORMMATRICES"[64];\n"
+	"\tfloat4 " I_PIXELCENTERCORRECTION";\n";
diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
deleted file mode 100644
index 0910381d74..0000000000
--- a/Source/Core/VideoCommon/Src/AVIDump.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#if defined(__FreeBSD__)
-#define __STDC_CONSTANT_MACROS 1
-#endif 
-
-#include "AVIDump.h"
-#include "HW/VideoInterface.h" //for TargetRefreshRate
-#include "VideoConfig.h"
-
-#ifdef _WIN32
-
-#include "tchar.h"
-
-#include <cstdio>
-#include <cstring>
-#include <vfw.h>
-#include <winerror.h>
-
-#include "FileUtil.h"
-#include "CommonPaths.h"
-#include "Log.h"
-
-HWND m_emuWnd;
-LONG m_byteBuffer;
-LONG m_frameCount;
-LONG m_totalBytes;
-PAVIFILE m_file;
-int m_width;
-int m_height;
-int m_fileCount;
-PAVISTREAM m_stream;
-PAVISTREAM m_streamCompressed;
-AVISTREAMINFO m_header;
-AVICOMPRESSOPTIONS m_options;
-AVICOMPRESSOPTIONS *m_arrayOptions[1];
-BITMAPINFOHEADER m_bitmap;
-
-bool AVIDump::Start(HWND hWnd, int w, int h)
-{
-	m_emuWnd = hWnd;
-	m_fileCount = 0;
-
-	m_width = w;
-	m_height = h;
-
-	return CreateFile();
-}
-
-bool AVIDump::CreateFile()
-{
-	m_totalBytes = 0;
-	m_frameCount = 0;
-	char movie_file_name[255];
-	sprintf(movie_file_name, "%sframedump%d.avi", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), m_fileCount);
-	// Create path
-	File::CreateFullPath(movie_file_name);
-
-	// Ask to delete file
-	if (File::Exists(movie_file_name))
-	{
-		if (AskYesNoT("Delete the existing file '%s'?", movie_file_name))
-			File::Delete(movie_file_name);
-	}
-
-	AVIFileInit();
-	NOTICE_LOG(VIDEO, "Opening AVI file (%s) for dumping", movie_file_name);
-	// TODO: Make this work with AVIFileOpenW without it throwing REGDB_E_CLASSNOTREG
-	HRESULT hr = AVIFileOpenA(&m_file, movie_file_name, OF_WRITE | OF_CREATE, NULL);
-	if (FAILED(hr))
-	{
-		if (hr == AVIERR_BADFORMAT) NOTICE_LOG(VIDEO, "The file couldn't be read, indicating a corrupt file or an unrecognized format."); 
-		if (hr == AVIERR_MEMORY)  NOTICE_LOG(VIDEO, "The file could not be opened because of insufficient memory."); 
-		if (hr == AVIERR_FILEREAD) NOTICE_LOG(VIDEO, "A disk error occurred while reading the file."); 
-		if (hr == AVIERR_FILEOPEN) NOTICE_LOG(VIDEO, "A disk error occurred while opening the file.");
-		if (hr == REGDB_E_CLASSNOTREG) NOTICE_LOG(VIDEO, "AVI class not registered");
-		Stop();
-		return false;
-	}
-
-	SetBitmapFormat();
-	NOTICE_LOG(VIDEO, "Setting video format...");
-	if (!SetVideoFormat())
-	{
-		NOTICE_LOG(VIDEO, "Setting video format failed");
-		Stop();
-		return false;
-	}
-
-	if (!m_fileCount)
-	{
-		if (!SetCompressionOptions())
-		{
-			NOTICE_LOG(VIDEO, "SetCompressionOptions failed");
-			Stop();
-			return false;
-		}
-	}
-
-	if (FAILED(AVIMakeCompressedStream(&m_streamCompressed, m_stream, &m_options, NULL)))
-	{
-		NOTICE_LOG(VIDEO, "AVIMakeCompressedStream failed");
-		Stop();
-		return false;
-	}
-
-	if (FAILED(AVIStreamSetFormat(m_streamCompressed, 0, &m_bitmap, m_bitmap.biSize)))
-	{
-		NOTICE_LOG(VIDEO, "AVIStreamSetFormat failed");
-		Stop();
-		return false;
-	}
-
-	return true;
-}
-
-void AVIDump::CloseFile()
-{
-	if (m_streamCompressed)
-	{
-		AVIStreamClose(m_streamCompressed);
-		m_streamCompressed = NULL;
-	}
-
-	if (m_stream)
-	{
-		AVIStreamClose(m_stream);
-		m_stream = NULL;
-	}
-
-	if (m_file)
-	{
-		AVIFileRelease(m_file);
-		m_file = NULL;
-	}
-
-	AVIFileExit();
-}
-
-void AVIDump::Stop()
-{
-	CloseFile();
-	m_fileCount = 0;
-	NOTICE_LOG(VIDEO, "Stop");
-}
-
-void AVIDump::AddFrame(const u8* data, int w, int h)
-{
-	static bool shown_error = false;
-	if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !shown_error)
-	{
-		PanicAlert("You have resized the window while dumping frames.\n"
-			"Nothing sane can be done to handle this.\n"
-			"Your video will likely be broken.");
-		shown_error = true;
-
-		m_bitmap.biWidth = w;
-		m_bitmap.biHeight = h;
-	}
-
-	AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, const_cast<u8*>(data), m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer);
-	m_totalBytes += m_byteBuffer;
-	// Close the recording if the file is more than 2gb
-	// VfW can't properly save files over 2gb in size, but can keep writing to them up to 4gb.
-	if (m_totalBytes >= 2000000000)
-	{
-		CloseFile();
-		m_fileCount++;
-		CreateFile();
-	}
-}
-
-void AVIDump::SetBitmapFormat()
-{
-	memset(&m_bitmap, 0, sizeof(m_bitmap));
-	m_bitmap.biSize = 0x28;
-	m_bitmap.biPlanes = 1;
-	m_bitmap.biBitCount = 24;
-	m_bitmap.biWidth = m_width;
-	m_bitmap.biHeight = m_height;
-	m_bitmap.biSizeImage = 3 * m_width * m_height;
-}
-
-bool AVIDump::SetCompressionOptions()
-{
-	memset(&m_options, 0, sizeof(m_options));
-	m_arrayOptions[0] = &m_options;
-
-	return (AVISaveOptions(m_emuWnd, 0, 1, &m_stream, m_arrayOptions) != 0);
-}
-
-bool AVIDump::SetVideoFormat()
-{
-	memset(&m_header, 0, sizeof(m_header));
-	m_header.fccType = streamtypeVIDEO;
-	m_header.dwScale = 1;
-	m_header.dwRate = VideoInterface::TargetRefreshRate;
-	m_header.dwSuggestedBufferSize  = m_bitmap.biSizeImage;
-
-	return SUCCEEDED(AVIFileCreateStream(m_file, &m_stream, &m_header));
-}
-
-#else
-
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "Log.h"
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#include <libavutil/mathematics.h>
-}
-
-AVFormatContext *s_FormatContext = NULL;
-AVStream *s_Stream = NULL;
-AVFrame *s_BGRFrame = NULL, *s_YUVFrame = NULL;
-uint8_t *s_YUVBuffer = NULL;
-uint8_t *s_OutBuffer = NULL;
-int s_width;
-int s_height;
-int s_size;
-
-static void InitAVCodec()
-{
-	static bool first_run = true;
-	if (first_run)
-	{
-		av_register_all();
-		first_run = false;
-	}
-}
-
-bool AVIDump::Start(int w, int h)
-{
-	s_width = w;
-	s_height = h;
-
-	InitAVCodec();
-	return CreateFile();
-}
-
-bool AVIDump::CreateFile()
-{
-	AVCodec *codec = NULL;
-
-	s_FormatContext = avformat_alloc_context();
-	snprintf(s_FormatContext->filename, sizeof(s_FormatContext->filename), "%s",
-			(File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump0.avi").c_str());
-	File::CreateFullPath(s_FormatContext->filename);
-
-	if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) ||
-			!(s_Stream = avformat_new_stream(s_FormatContext, codec)))
-	{
-		CloseFile();
-		return false;
-	}
-
-	s_Stream->codec->codec_id =
-		g_Config.bUseFFV1 ?  CODEC_ID_FFV1 : s_FormatContext->oformat->video_codec;
-	s_Stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	s_Stream->codec->bit_rate = 400000;
-	s_Stream->codec->width = s_width;
-	s_Stream->codec->height = s_height;
-	s_Stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)};
-	s_Stream->codec->gop_size = 12;
-	s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;
-
-	if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) ||
-			(avcodec_open2(s_Stream->codec, codec, NULL) < 0))
-	{
-		CloseFile();
-		return false;
-	}
-
-	s_BGRFrame = avcodec_alloc_frame();
-	s_YUVFrame = avcodec_alloc_frame();
-
-	s_size = avpicture_get_size(s_Stream->codec->pix_fmt, s_width, s_height);
-
-	s_YUVBuffer = new uint8_t[s_size];
-	avpicture_fill((AVPicture *)s_YUVFrame, s_YUVBuffer, s_Stream->codec->pix_fmt, s_width, s_height);
-
-	s_OutBuffer = new uint8_t[s_size];
-
-	NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_FormatContext->filename);
-	if (avio_open(&s_FormatContext->pb, s_FormatContext->filename, AVIO_FLAG_WRITE) < 0)
-	{
-		WARN_LOG(VIDEO, "Could not open %s", s_FormatContext->filename);
-		CloseFile();
-		return false;
-	}
-
-	avformat_write_header(s_FormatContext, NULL);
-
-	return true;
-}
-
-void AVIDump::AddFrame(const u8* data, int width, int height)
-{
-	avpicture_fill((AVPicture *)s_BGRFrame, const_cast<u8*>(data), PIX_FMT_BGR24, width, height);
-
-	// Convert image from BGR24 to desired pixel format, and scale to initial
-	// width and height
-	struct SwsContext *s_SwsContext;
-	if ((s_SwsContext = sws_getContext(width, height, PIX_FMT_BGR24, s_width, s_height,
-					s_Stream->codec->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL)))
-	{
-		sws_scale(s_SwsContext, s_BGRFrame->data, s_BGRFrame->linesize, 0,
-				height, s_YUVFrame->data, s_YUVFrame->linesize);
-		sws_freeContext(s_SwsContext);
-	}
-
-	// Encode and write the image
-	int outsize = avcodec_encode_video(s_Stream->codec, s_OutBuffer, s_size, s_YUVFrame);
-	while (outsize > 0)
-	{
-		AVPacket pkt;
-		av_init_packet(&pkt);
-
-		if (s_Stream->codec->coded_frame->pts != (unsigned int)AV_NOPTS_VALUE)
-			pkt.pts = av_rescale_q(s_Stream->codec->coded_frame->pts,
-					s_Stream->codec->time_base, s_Stream->time_base);
-		if(s_Stream->codec->coded_frame->key_frame)
-			pkt.flags |= AV_PKT_FLAG_KEY;
-		pkt.stream_index = s_Stream->index;
-		pkt.data = s_OutBuffer;
-		pkt.size = outsize;
-
-		// Write the compressed frame in the media file
-		av_interleaved_write_frame(s_FormatContext, &pkt);
-
-		// Encode delayed frames
-		outsize = avcodec_encode_video(s_Stream->codec, s_OutBuffer, s_size, NULL);
-	}
-}
-
-void AVIDump::Stop()
-{
-	av_write_trailer(s_FormatContext);
-	CloseFile();
-	NOTICE_LOG(VIDEO, "Stopping frame dump");
-}
-
-void AVIDump::CloseFile()
-{
-	if (s_Stream)
-	{
-		if (s_Stream->codec)
-			avcodec_close(s_Stream->codec);
-		av_free(s_Stream);
-		s_Stream = NULL;
-	}
-
-	if (s_YUVBuffer)
-		delete[] s_YUVBuffer;
-	s_YUVBuffer = NULL;
-
-	if (s_OutBuffer)
-		delete[] s_OutBuffer;
-	s_OutBuffer = NULL;
-
-	if (s_BGRFrame)
-		av_free(s_BGRFrame);
-	s_BGRFrame = NULL;
-
-	if (s_YUVFrame)
-		av_free(s_YUVFrame);
-	s_YUVFrame = NULL;
-
-	if (s_FormatContext)
-	{
-		if (s_FormatContext->pb)
-			avio_close(s_FormatContext->pb);
-		av_free(s_FormatContext);
-		s_FormatContext = NULL;
-	}
-}
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/AVIDump.h b/Source/Core/VideoCommon/Src/AVIDump.h
deleted file mode 100644
index dced69887e..0000000000
--- a/Source/Core/VideoCommon/Src/AVIDump.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _AVIDUMP_H
-#define _AVIDUMP_H
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <stdint.h>
-#endif
-
-#include "CommonTypes.h"
-
-class AVIDump
-{
-	private:
-		static bool CreateFile();
-		static void CloseFile();
-		static void SetBitmapFormat();
-		static bool SetCompressionOptions();
-		static bool SetVideoFormat();
-
-	public:
-#ifdef _WIN32
-		static bool Start(HWND hWnd, int w, int h);
-#else
-		static bool Start(int w, int h);
-#endif
-		static void AddFrame(const u8* data, int width, int height);
-		
-		static void Stop();
-};
-
-#endif // _AVIDUMP_H
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
deleted file mode 100644
index 9f4f4f3060..0000000000
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "BPFunctions.h"
-#include "Common.h"
-#include "RenderBase.h"
-#include "TextureCacheBase.h"
-#include "VertexManagerBase.h"
-#include "VertexShaderManager.h"
-#include "VideoConfig.h"
-#include "HW/Memmap.h"
-#include "ConfigManager.h"
-
-const bool renderFog = false;
-namespace BPFunctions
-{
-// ----------------------------------------------
-// State translation lookup tables
-// Reference: Yet Another Gamecube Documentation
-// ----------------------------------------------
-
-
-void FlushPipeline()
-{
-	VertexManager::Flush();
-}
-
-void SetGenerationMode()
-{
-	g_renderer->SetGenerationMode();
-}
-
-void SetScissor()
-{
-	const int xoff = bpmem.scissorOffset.x * 2 - 342;
-	const int yoff = bpmem.scissorOffset.y * 2 - 342;
-
-	EFBRectangle rc (bpmem.scissorTL.x - xoff - 342, bpmem.scissorTL.y - yoff - 342,
-					bpmem.scissorBR.x - xoff - 341, bpmem.scissorBR.y - yoff - 341);
-
-	if (rc.left < 0) rc.left = 0;
-	if (rc.top < 0) rc.top = 0;
-	if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH;
-	if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT;
-
-	if (rc.left > rc.right) rc.right = rc.left;
-	if (rc.top > rc.bottom) rc.bottom = rc.top;
-
-	TargetRectangle trc = g_renderer->ConvertEFBRectangle(rc);
-	g_renderer->SetScissorRect(trc);
-
-	UpdateViewportWithCorrection();
-}
-
-void SetLineWidth()
-{
-	g_renderer->SetLineWidth();
-}
-
-void SetDepthMode()
-{
-	g_renderer->SetDepthMode();
-}
-
-void SetBlendMode()
-{
-	g_renderer->SetBlendMode(false);
-}
-void SetDitherMode()
-{
-	g_renderer->SetDitherMode();
-}
-void SetLogicOpMode()
-{
-	g_renderer->SetLogicOpMode();
-}
-
-void SetColorMask()
-{
-	g_renderer->SetColorMask();
-}
-
-void CopyEFB(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat,
-	const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf)
-{
-	// bpmem.zcontrol.pixel_format to PIXELFMT_Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format)
-	if (g_ActiveConfig.bEFBCopyEnable)
-	{
-		TextureCache::CopyRenderTargetToTexture(dstAddr, dstFormat, srcFormat,
-			srcRect, isIntensity, scaleByHalf);
-	}
-}
-
-/* Explanation of the magic behind ClearScreen:
-	There's numerous possible formats for the pixel data in the EFB.
-	However, in the HW accelerated backends we're always using RGBA8
-	for the EFB format, which causes some problems:
-	- We're using an alpha channel although the game doesn't
-	- If the actual EFB format is RGBA6_Z24 or R5G6B5_Z16, we are using more bits per channel than the native HW
-
-	To properly emulate the above points, we're doing the following:
-	(1)
-		- disable alpha channel writing of any kind of rendering if the actual EFB format doesn't use an alpha channel
-		- NOTE: Always make sure that the EFB has been cleared to an alpha value of 0xFF in this case!
-		- Same for color channels, these need to be cleared to 0x00 though.
-	(2)
-		- convert the RGBA8 color to RGBA6/RGB8/RGB565 and convert it to RGBA8 again
-		- convert the Z24 depth value to Z16 and back to Z24
-*/
-void ClearScreen(const EFBRectangle &rc)
-{
-	bool colorEnable = bpmem.blendmode.colorupdate;
-	bool alphaEnable = bpmem.blendmode.alphaupdate;
-	bool zEnable = bpmem.zmode.updateenable;
-
-	// (1): Disable unused color channels
-	if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB8_Z24 ||
-		bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16 ||
-		bpmem.zcontrol.pixel_format == PIXELFMT_Z24)
-	{
-		alphaEnable = false;
-	}
-
-	if (colorEnable || alphaEnable || zEnable)
-	{
-		u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
-		u32 z = bpmem.clearZValue;
-
-		// (2) drop additional accuracy
-		if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
-		{
-			color = RGBA8ToRGBA6ToRGBA8(color);
-		}
-		else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-		{
-			color = RGBA8ToRGB565ToRGBA8(color);
-			z = Z24ToZ16ToZ24(z);
-		}
-		g_renderer->ClearScreen(rc, colorEnable, alphaEnable, zEnable, color, z);
-	}
-}
-
-void OnPixelFormatChange()
-{
-	int convtype = -1;
-
-	// TODO : Check for Z compression format change
-	// When using 16bit Z, the game may enable a special compression format which we need to handle
-	// If we don't, Z values will be completely screwed up, currently only Star Wars:RS2 uses that.
-
-	/*
-	 * When changing the EFB format, the pixel data won't get converted to the new format but stays the same.
-	 * Since we are always using an RGBA8 buffer though, this causes issues in some games.
-	 * Thus, we reinterpret the old EFB data with the new format here.
-	 */
-	if (!g_ActiveConfig.bEFBEmulateFormatChanges ||
-		!g_ActiveConfig.backend_info.bSupportsFormatReinterpretation)
-		return;
-
-	u32 old_format = Renderer::GetPrevPixelFormat();
-	u32 new_format = bpmem.zcontrol.pixel_format;
-
-	// no need to reinterpret pixel data in these cases
-	if (new_format == old_format || old_format == (unsigned int)-1)
-		goto skip;
-
-	// Check for pixel format changes
-	switch (old_format)
-	{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_Z24:
-			// Z24 and RGB8_Z24 are treated equal, so just return in this case
-			if (new_format == PIXELFMT_RGB8_Z24 || new_format == PIXELFMT_Z24)
-				goto skip;
-
-			if (new_format == PIXELFMT_RGBA6_Z24)
-				convtype = 0;
-			else if (new_format == PIXELFMT_RGB565_Z16)
-				convtype = 1;
-			break;
-
-		case PIXELFMT_RGBA6_Z24:
-			if (new_format == PIXELFMT_RGB8_Z24 ||
-				new_format == PIXELFMT_Z24)
-				convtype = 2;
-			else if (new_format == PIXELFMT_RGB565_Z16)
-				convtype = 3;
-			break;
-
-		case PIXELFMT_RGB565_Z16:
-			if (new_format == PIXELFMT_RGB8_Z24 ||
-				new_format == PIXELFMT_Z24)
-				convtype = 4;
-			else if (new_format == PIXELFMT_RGBA6_Z24)
-				convtype = 5;
-			break;
-
-		default:
-			break;
-	}
-
-	if (convtype == -1)
-	{
-		ERROR_LOG(VIDEO, "Unhandled EFB format change: %d to %d\n", old_format, new_format);
-		goto skip;
-	}
-
-	g_renderer->ReinterpretPixelData(convtype);
-
-skip:
-	DEBUG_LOG(VIDEO, "pixelfmt: pixel=%d, zc=%d", new_format, bpmem.zcontrol.zformat);
-
-	Renderer::StorePixelFormat(new_format);
-}
-
-bool GetConfig(const int &type)
-{
-	switch (type)
-	{
-	case CONFIG_ISWII:
-		return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii;
-	case CONFIG_DISABLEFOG:
-		return g_ActiveConfig.bDisableFog;
-	case CONFIG_SHOWEFBREGIONS:
-		return g_ActiveConfig.bShowEFBCopyRegions;
-	default:
-		PanicAlert("GetConfig Error: Unknown Config Type!");
-		return false;
-	}
-}
-
-u8 *GetPointer(const u32 &address)
-{
-	return Memory::GetPointer(address);
-}
-
-// Never used. All backends call SetSamplerState in VertexManager::Flush
-void SetTextureMode(const BPCmd &bp)
-{
-	g_renderer->SetSamplerState(bp.address & 3, (bp.address & 0xE0) == 0xA0);
-}
-
-void SetInterlacingMode(const BPCmd &bp)
-{
-	// TODO
-	switch (bp.address)
-	{
-	case BPMEM_FIELDMODE:
-		{
-			// SDK always sets bpmem.lineptwidth.lineaspect via BPMEM_LINEPTWIDTH
-			// just before this cmd
-			const char *action[] = { "don't adjust", "adjust" };
-			DEBUG_LOG(VIDEO, "BPMEM_FIELDMODE texLOD:%s lineaspect:%s",
-				action[bpmem.fieldmode.texLOD],
-				action[bpmem.lineptwidth.lineaspect]);
-		}
-		break;
-	case BPMEM_FIELDMASK:
-		{
-			// Determines if fields will be written to EFB (always computed)
-			const char *action[] = { "skip", "write" };
-			DEBUG_LOG(VIDEO, "BPMEM_FIELDMASK even:%s odd:%s",
-				action[bpmem.fieldmask.even], action[bpmem.fieldmask.odd]);
-		}
-		break;
-	default:
-		ERROR_LOG(VIDEO, "SetInterlacingMode default");
-		break;
-	}
-}
-
-};
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.h b/Source/Core/VideoCommon/Src/BPFunctions.h
deleted file mode 100644
index addf1cf741..0000000000
--- a/Source/Core/VideoCommon/Src/BPFunctions.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// ------------------------------------------
-// Video backend must define these functions
-// ------------------------------------------
-
-#ifndef _BPFUNCTIONS_H
-#define _BPFUNCTIONS_H
-
-#include "BPMemory.h"
-#include "VideoCommon.h"
-
-namespace BPFunctions
-{
-
-enum
-{
-	CONFIG_ISWII = 0,
-	CONFIG_DISABLEFOG,
-	CONFIG_SHOWEFBREGIONS
-};
-
-void FlushPipeline();
-void SetGenerationMode();
-void SetScissor();
-void SetLineWidth();
-void SetDepthMode();
-void SetBlendMode();
-void SetDitherMode();
-void SetLogicOpMode();
-void SetColorMask();
-void CopyEFB(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat,
-	const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
-void ClearScreen(const EFBRectangle &rc);
-void OnPixelFormatChange();
-u8 *GetPointer(const u32 &address);
-bool GetConfig(const int &type);
-void SetTextureMode(const BPCmd &bp);
-void SetInterlacingMode(const BPCmd &bp);
-};
-
-#endif // _BPFUNCTIONS_H
diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp
deleted file mode 100644
index 7272ed0993..0000000000
--- a/Source/Core/VideoCommon/Src/BPMemory.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "BPMemory.h"
-
-// BP state
-// STATE_TO_SAVE
-BPMemory bpmem;
-
-// The backend must implement this.
-void BPWritten(const BPCmd& bp);
-
-// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
-void LoadBPReg(u32 value0)
-{
-	//handle the mask register
-	int opcode = value0 >> 24;
-	int oldval = ((u32*)&bpmem)[opcode];
-	int newval = (oldval & ~bpmem.bpMask) | (value0 & bpmem.bpMask);
-	int changes = (oldval ^ newval) & 0xFFFFFF;
-
-	BPCmd bp = {opcode, changes, newval};
-
-	//reset the mask register
-	if (opcode != 0xFE)
-		bpmem.bpMask = 0xFFFFFF;
-
-	BPWritten(bp);
-}
-
-void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size)
-{
-	const char* no_yes[2] = { "No", "Yes" };
-
-	u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF;
-	switch (data[0])
-	{
-	 // Macro to set the register name and make sure it was written correctly via compile time assertion
-	#define SetRegName(reg) \
-		snprintf(name, name_size, #reg); \
-		(void)(reg);
-
-	case BPMEM_GENMODE: // 0x00
-		SetRegName(BPMEM_GENMODE);
-		// TODO: Description
-		break;
-
-	case BPMEM_DISPLAYCOPYFILER: // 0x01
-		// TODO: This is actually the sample pattern used for copies from an antialiased EFB
-		SetRegName(BPMEM_DISPLAYCOPYFILER);
-		// TODO: Description
-		break;
-
-	case 0x02: // 0x02
-	case 0x03: // 0x03
-	case 0x04: // 0x04
-		// TODO: same as BPMEM_DISPLAYCOPYFILER
-		break;
-
-	case BPMEM_EFB_TL: // 0x49
-		{
-			SetRegName(BPMEM_EFB_TL);
-			X10Y10 left_top; left_top.hex = cmddata;
-			snprintf(desc, desc_size, "Left: %d\nTop: %d", left_top.x, left_top.y);
-		}
-		break;
-
-	case BPMEM_BLENDMODE: // 0x41
-		{
-			SetRegName(BPMEM_BLENDMODE);
-			BlendMode mode; mode.hex = cmddata;
-			const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
-			const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
-			const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" };
-			snprintf(desc, desc_size, "Enable: %s\n"
-									"Logic ops: %s\n"
-									"Dither: %s\n"
-									"Color write: %s\n"
-									"Alpha write: %s\n"
-									"Dest factor: %s\n"
-									"Source factor: %s\n"
-									"Subtract: %s\n"
-									"Logic mode: %s\n",
-									no_yes[mode.blendenable], no_yes[mode.logicopenable], no_yes[mode.dither],
-									no_yes[mode.colorupdate], no_yes[mode.alphaupdate], dstfactors[mode.dstfactor],
-									srcfactors[mode.srcfactor], no_yes[mode.subtract], logicmodes[mode.logicmode]);
-		}
-		break;
-
-	case BPMEM_ZCOMPARE:
-		{
-			SetRegName(BPMEM_ZCOMPARE);
-			PE_CONTROL config; config.hex = cmddata;
-			const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" };
-			const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
-			snprintf(desc, desc_size, "EFB pixel format: %s\n"
-									"Depth format: %s\n"
-									"Early depth test: %s\n",
-									pixel_formats[config.pixel_format], zformats[config.zformat], no_yes[config.early_ztest]);
-		}
-		break;
-
-	case BPMEM_EFB_BR: // 0x4A
-		{
-			// TODO: Misleading name, should be BPMEM_EFB_WH instead
-			SetRegName(BPMEM_EFB_BR);
-			X10Y10 width_height; width_height.hex = cmddata;
-			snprintf(desc, desc_size, "Width: %d\nHeight: %d", width_height.x+1, width_height.y+1);
-		}
-		break;
-
-	case BPMEM_EFB_ADDR: // 0x4B
-		SetRegName(BPMEM_EFB_ADDR);
-		snprintf(desc, desc_size, "Target address (32 byte aligned): 0x%06X", cmddata << 5);
-		break;
-
-	case BPMEM_COPYYSCALE: // 0x4E
-		SetRegName(BPMEM_COPYYSCALE);
-		snprintf(desc, desc_size, "Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata);
-		break;
-
-	case BPMEM_CLEAR_AR: // 0x4F
-		SetRegName(BPMEM_CLEAR_AR);
-		snprintf(desc, desc_size, "Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
-		break;
-
-	case BPMEM_CLEAR_GB: // 0x50
-		SetRegName(BPMEM_CLEAR_GB);
-		snprintf(desc, desc_size, "Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
-		break;
-
-	case BPMEM_CLEAR_Z: // 0x51
-		SetRegName(BPMEM_CLEAR_Z);
-		snprintf(desc, desc_size, "Z value: 0x%06X", cmddata);
-		break;
-
-	case BPMEM_TRIGGER_EFB_COPY: // 0x52
-		{
-			SetRegName(BPMEM_TRIGGER_EFB_COPY);
-			UPE_Copy copy; copy.Hex = cmddata;
-			snprintf(desc, desc_size, "Clamping: %s\n"
-								"Converting from RGB to YUV: %s\n"
-								"Target pixel format: 0x%X\n"
-								"Gamma correction: %s\n"
-								"Mipmap filter: %s\n"
-								"Vertical scaling: %s\n"
-								"Clear: %s\n"
-								"Frame to field: 0x%01X\n"
-								"Copy to XFB: %s\n"
-								"Intensity format: %s\n"
-								"Automatic color conversion: %s",
-								(copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None",
-								no_yes[copy.yuv],
-								copy.tp_realFormat(),
-								(copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?",
-								no_yes[copy.half_scale],
-								no_yes[copy.scale_invert],
-								no_yes[copy.clear],
-								copy.frame_to_field,
-								no_yes[copy.copy_to_xfb],
-								no_yes[copy.intensity_fmt],
-								no_yes[copy.auto_conv]);
-		}
-		break;
-
-	case BPMEM_COPYFILTER0: // 0x53
-		SetRegName(BPMEM_COPYFILTER0);
-		// TODO: Description
-		break;
-
-	case BPMEM_COPYFILTER1: // 0x54
-		SetRegName(BPMEM_COPYFILTER1);
-		// TODO: Description
-		break;
-
-	case BPMEM_TX_SETIMAGE3: // 0x94
-	case BPMEM_TX_SETIMAGE3+1:
-	case BPMEM_TX_SETIMAGE3+2:
-	case BPMEM_TX_SETIMAGE3+3:
-	case BPMEM_TX_SETIMAGE3_4: // 0xB4
-	case BPMEM_TX_SETIMAGE3_4+1:
-	case BPMEM_TX_SETIMAGE3_4+2:
-	case BPMEM_TX_SETIMAGE3_4+3:
-		{
-			SetRegName(BPMEM_TX_SETIMAGE3);
-			TexImage3 teximg; teximg.hex = cmddata;
-			snprintf(desc, desc_size, "Source address (32 byte aligned): 0x%06X", teximg.image_base << 5);
-		}
-		break;
-
-	case BPMEM_TEV_COLOR_ENV: // 0xC0
-	case BPMEM_TEV_COLOR_ENV+2:
-	case BPMEM_TEV_COLOR_ENV+4:
-	case BPMEM_TEV_COLOR_ENV+8:
-	case BPMEM_TEV_COLOR_ENV+10:
-	case BPMEM_TEV_COLOR_ENV+12:
-	case BPMEM_TEV_COLOR_ENV+14:
-	case BPMEM_TEV_COLOR_ENV+16:
-	case BPMEM_TEV_COLOR_ENV+18:
-	case BPMEM_TEV_COLOR_ENV+20:
-	case BPMEM_TEV_COLOR_ENV+22:
-	case BPMEM_TEV_COLOR_ENV+24:
-	case BPMEM_TEV_COLOR_ENV+26:
-	case BPMEM_TEV_COLOR_ENV+28:
-	case BPMEM_TEV_COLOR_ENV+30:
-		{
-			SetRegName(BPMEM_TEV_COLOR_ENV);
-			TevStageCombiner::ColorCombiner cc; cc.hex = cmddata;
-			const char* tevin[] =
-			{
-				"prev.rgb", "prev.aaa",
-				"c0.rgb", "c0.aaa",
-				"c1.rgb", "c1.aaa",
-				"c2.rgb", "c2.aaa",
-				"tex.rgb", "tex.aaa",
-				"ras.rgb", "ras.aaa",
-				"ONE", "HALF", "konst.rgb", "ZERO",
-			};
-			const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" };
-			const char* tevop[] = { "add", "sub" };
-			const char* tevscale[] = { "1", "2", "4", "0.5" };
-			const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" };
-			snprintf(desc, desc_size, "tev stage: %d\n"
-									"a: %s\n"
-									"b: %s\n"
-									"c: %s\n"
-									"d: %s\n"
-									"bias: %s\n"
-									"op: %s\n"
-									"clamp: %s\n"
-									"scale factor: %s\n"
-									"dest: %s\n",
-									(data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d],
-									tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]);
-			break;
-		}
-
-	case BPMEM_TEV_ALPHA_ENV: // 0xC1
-	case BPMEM_TEV_ALPHA_ENV+2:
-	case BPMEM_TEV_ALPHA_ENV+4:
-	case BPMEM_TEV_ALPHA_ENV+6:
-	case BPMEM_TEV_ALPHA_ENV+8:
-	case BPMEM_TEV_ALPHA_ENV+10:
-	case BPMEM_TEV_ALPHA_ENV+12:
-	case BPMEM_TEV_ALPHA_ENV+14:
-	case BPMEM_TEV_ALPHA_ENV+16:
-	case BPMEM_TEV_ALPHA_ENV+18:
-	case BPMEM_TEV_ALPHA_ENV+20:
-	case BPMEM_TEV_ALPHA_ENV+22:
-	case BPMEM_TEV_ALPHA_ENV+24:
-	case BPMEM_TEV_ALPHA_ENV+26:
-	case BPMEM_TEV_ALPHA_ENV+28:
-	case BPMEM_TEV_ALPHA_ENV+30:
-		{
-			SetRegName(BPMEM_TEV_ALPHA_ENV);
-			TevStageCombiner::AlphaCombiner ac; ac.hex = cmddata;
-			const char* tevin[] =
-			{
-				"prev", "c0", "c1", "c2",
-				"tex", "ras", "konst", "ZERO",
-			};
-			const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" };
-			const char* tevop[] = { "add", "sub" };
-			const char* tevscale[] = { "1", "2", "4", "0.5" };
-			const char* tevout[] = { "prev", "c0", "c1", "c2" };
-			snprintf(desc, desc_size, "tev stage: %d\n"
-									"a: %s\n"
-									"b: %s\n"
-									"c: %s\n"
-									"d: %s\n"
-									"bias: %s\n"
-									"op: %s\n"
-									"clamp: %s\n"
-									"scale factor: %s\n"
-									"dest: %s\n"
-									"ras sel: %d\n"
-									"tex sel: %d\n",
-									(data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d],
-									tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest],
-									ac.rswap, ac.tswap);
-			break;
-		}
-
-		case BPMEM_ALPHACOMPARE: // 0xF3
-			{
-				SetRegName(BPMEM_ALPHACOMPARE);
-				AlphaTest test; test.hex = cmddata;
-				const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" };
-				const char* logic[] = { "AND", "OR", "XOR", "XNOR" };
-				snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n"
-										"test 2: %s (ref: %#02x)\n"
-										"logic: %s\n",
-										functions[test.comp0], test.ref0, functions[test.comp1], test.ref1, logic[test.logic]);
-				break;
-			}
-
-#undef SetRegName
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h
deleted file mode 100644
index 83dbefed50..0000000000
--- a/Source/Core/VideoCommon/Src/BPMemory.h
+++ /dev/null
@@ -1,1055 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BPMEMORY_H
-#define _BPMEMORY_H
-
-#include "Common.h"
-
-#pragma pack(4)
-
-#define BPMEM_GENMODE          0x00
-#define BPMEM_DISPLAYCOPYFILER 0x01 // 0x01 + 4
-#define BPMEM_IND_MTXA         0x06 // 0x06 + (3 * 3)
-#define BPMEM_IND_MTXB         0x07 // 0x07 + (3 * 3)
-#define BPMEM_IND_MTXC         0x08 // 0x08 + (3 * 3)
-#define BPMEM_IND_IMASK        0x0F
-#define BPMEM_IND_CMD          0x10 // 0x10 + 16
-#define BPMEM_SCISSORTL        0x20
-#define BPMEM_SCISSORBR        0x21
-#define BPMEM_LINEPTWIDTH      0x22
-#define BPMEM_PERF0_TRI        0x23
-#define BPMEM_PERF0_QUAD       0x24
-#define BPMEM_RAS1_SS0         0x25 
-#define BPMEM_RAS1_SS1         0x26
-#define BPMEM_IREF             0x27
-#define BPMEM_TREF             0x28 // 0x28 + 8
-#define BPMEM_SU_SSIZE         0x30 // 0x30 + (2 * 8)
-#define BPMEM_SU_TSIZE         0x31 // 0x31 + (2 * 8)
-#define BPMEM_ZMODE            0x40
-#define BPMEM_BLENDMODE        0x41
-#define BPMEM_CONSTANTALPHA    0x42
-#define BPMEM_ZCOMPARE         0x43
-#define BPMEM_FIELDMASK        0x44
-#define BPMEM_SETDRAWDONE      0x45
-#define BPMEM_BUSCLOCK0        0x46
-#define BPMEM_PE_TOKEN_ID	   0x47
-#define BPMEM_PE_TOKEN_INT_ID  0x48
-#define BPMEM_EFB_TL           0x49
-#define BPMEM_EFB_BR           0x4A
-#define BPMEM_EFB_ADDR         0x4B
-#define BPMEM_MIPMAP_STRIDE    0x4D
-#define BPMEM_COPYYSCALE       0x4E
-#define BPMEM_CLEAR_AR         0x4F
-#define BPMEM_CLEAR_GB         0x50
-#define BPMEM_CLEAR_Z          0x51
-#define BPMEM_TRIGGER_EFB_COPY 0x52
-#define BPMEM_COPYFILTER0      0x53
-#define BPMEM_COPYFILTER1      0x54
-#define BPMEM_CLEARBBOX1       0x55 
-#define BPMEM_CLEARBBOX2       0x56
-#define BPMEM_CLEAR_PIXEL_PERF 0x57
-#define BPMEM_REVBITS          0x58
-#define BPMEM_SCISSOROFFSET    0x59
-#define BPMEM_PRELOAD_ADDR     0x60
-#define BPMEM_PRELOAD_TMEMEVEN 0x61
-#define BPMEM_PRELOAD_TMEMODD  0x62
-#define BPMEM_PRELOAD_MODE     0x63
-#define BPMEM_LOADTLUT0        0x64
-#define BPMEM_LOADTLUT1        0x65
-#define BPMEM_TEXINVALIDATE    0x66
-#define BPMEM_PERF1            0x67
-#define BPMEM_FIELDMODE        0x68
-#define BPMEM_BUSCLOCK1        0x69
-#define BPMEM_TX_SETMODE0      0x80 // 0x80 + 4
-#define BPMEM_TX_SETMODE1      0x84 // 0x84 + 4
-#define BPMEM_TX_SETIMAGE0     0x88 // 0x88 + 4
-#define BPMEM_TX_SETIMAGE1     0x8C // 0x8C + 4
-#define BPMEM_TX_SETIMAGE2     0x90 // 0x90 + 4
-#define BPMEM_TX_SETIMAGE3     0x94 // 0x94 + 4
-#define BPMEM_TX_SETTLUT       0x98 // 0x98 + 4
-#define BPMEM_TX_SETMODE0_4    0xA0 // 0xA0 + 4
-#define BPMEM_TX_SETMODE1_4    0xA4 // 0xA4 + 4
-#define BPMEM_TX_SETIMAGE0_4   0xA8 // 0xA8 + 4
-#define BPMEM_TX_SETIMAGE1_4   0xAC // 0xA4 + 4
-#define BPMEM_TX_SETIMAGE2_4   0xB0 // 0xB0 + 4
-#define BPMEM_TX_SETIMAGE3_4   0xB4 // 0xB4 + 4
-#define BPMEM_TX_SETLUT_4      0xB8 // 0xB8 + 4
-#define BPMEM_TEV_COLOR_ENV    0xC0 // 0xC0 + (2 * 16)
-#define BPMEM_TEV_ALPHA_ENV    0xC1 // 0xC1 + (2 * 16)
-#define BPMEM_TEV_REGISTER_L   0xE0 // 0xE0 + (2 * 4)
-#define BPMEM_TEV_REGISTER_H   0xE1 // 0xE1 + (2 * 4)
-#define BPMEM_FOGRANGE         0xE8 // 0xE8 + 6
-#define BPMEM_FOGPARAM0        0xEE
-#define BPMEM_FOGBMAGNITUDE    0xEF
-#define BPMEM_FOGBEXPONENT     0xF0
-#define BPMEM_FOGPARAM3        0xF1
-#define BPMEM_FOGCOLOR         0xF2
-#define BPMEM_ALPHACOMPARE     0xF3
-#define BPMEM_BIAS             0xF4
-#define BPMEM_ZTEX2            0xF5
-#define BPMEM_TEV_KSEL         0xF6 // 0xF6 + 8
-#define BPMEM_BP_MASK          0xFE
-
-
-// Tev/combiner things
-
-#define TEVSCALE_1  0
-#define TEVSCALE_2  1
-#define TEVSCALE_4  2
-#define TEVDIVIDE_2 3
-
-#define TEVCMP_R8    0
-#define TEVCMP_GR16  1
-#define TEVCMP_BGR24 2
-#define TEVCMP_RGB8  3
-
-#define TEVOP_ADD 0
-#define TEVOP_SUB 1
-#define TEVCMP_R8_GT 8
-#define TEVCMP_R8_EQ 9
-#define TEVCMP_GR16_GT 10
-#define TEVCMP_GR16_EQ 11
-#define TEVCMP_BGR24_GT 12
-#define TEVCMP_BGR24_EQ 13
-#define TEVCMP_RGB8_GT  14
-#define TEVCMP_RGB8_EQ  15
-#define TEVCMP_A8_GT 14
-#define TEVCMP_A8_EQ 15
-
-#define TEVCOLORARG_CPREV 0
-#define TEVCOLORARG_APREV 1
-#define TEVCOLORARG_C0 2
-#define TEVCOLORARG_A0 3
-#define TEVCOLORARG_C1 4
-#define TEVCOLORARG_A1 5
-#define TEVCOLORARG_C2 6
-#define TEVCOLORARG_A2 7
-#define TEVCOLORARG_TEXC 8
-#define TEVCOLORARG_TEXA 9
-#define TEVCOLORARG_RASC 10
-#define TEVCOLORARG_RASA 11
-#define TEVCOLORARG_ONE 12
-#define TEVCOLORARG_HALF 13
-#define TEVCOLORARG_KONST 14
-#define TEVCOLORARG_ZERO 15
-
-#define TEVALPHAARG_APREV 0
-#define TEVALPHAARG_A0    1
-#define TEVALPHAARG_A1    2
-#define TEVALPHAARG_A2    3
-#define TEVALPHAARG_TEXA  4
-#define TEVALPHAARG_RASA  5
-#define TEVALPHAARG_KONST 6
-#define TEVALPHAARG_ZERO  7
-
-#define GX_TEVPREV       0
-#define GX_TEVREG0       1
-#define GX_TEVREG1       2
-#define GX_TEVREG2       3
-
-#define ALPHACMP_NEVER   0
-#define ALPHACMP_LESS    1
-#define ALPHACMP_EQUAL   2
-#define ALPHACMP_LEQUAL  3
-#define ALPHACMP_GREATER 4
-#define ALPHACMP_NEQUAL  5
-#define ALPHACMP_GEQUAL  6
-#define ALPHACMP_ALWAYS  7
-
-enum Compare
-{
-	COMPARE_NEVER = 0,
-	COMPARE_LESS,
-	COMPARE_EQUAL,
-	COMPARE_LEQUAL,
-	COMPARE_GREATER,
-	COMPARE_NEQUAL,
-	COMPARE_GEQUAL,
-	COMPARE_ALWAYS
-};
-
-#define ZTEXTURE_DISABLE 0
-#define ZTEXTURE_ADD 1
-#define ZTEXTURE_REPLACE 2
-
-#define TevBias_ZERO     0
-#define TevBias_ADDHALF  1
-#define TevBias_SUBHALF  2
-#define TevBias_COMPARE  3
-
-enum AlphaOp
-{
-	ALPHAOP_AND = 0, 
-	ALPHAOP_OR,
-	ALPHAOP_XOR,
-	ALPHAOP_XNOR,
-};
-
-union IND_MTXA
-{
-	struct
-	{
-		s32 ma : 11;
-		s32 mb : 11;
-		u32 s0 : 2; // bits 0-1 of scale factor
-		u32 rid : 8;
-	};
-	u32 hex;
-};
-
-union IND_MTXB
-{
-	struct
-	{
-		s32 mc : 11;
-		s32 md : 11;
-		u32 s1 : 2; // bits 2-3 of scale factor
-		u32 rid : 8;
-	};
-	u32 hex;
-};
-
-union IND_MTXC
-{
-	struct
-	{
-		s32 me : 11;
-		s32 mf : 11;
-		u32 s2 : 2; // bits 4-5 of scale factor
-		u32 rid : 8;
-	};
-	u32 hex;
-};
-
-struct IND_MTX
-{
-	IND_MTXA col0;
-	IND_MTXB col1;
-	IND_MTXC col2;
-};
-
-union IND_IMASK
-{
-	struct
-	{
-		u32 mask : 24;
-		u32 rid : 8;
-	};
-	u32 hex;
-};
-
-#define TEVSELCC_CPREV 0
-#define TEVSELCC_APREV 1
-#define TEVSELCC_C0 2
-#define TEVSELCC_A0 3
-#define TEVSELCC_C1 4
-#define TEVSELCC_A1 5
-#define TEVSELCC_C2 6
-#define TEVSELCC_A2 7
-#define TEVSELCC_TEXC 8
-#define TEVSELCC_TEXA 9
-#define TEVSELCC_RASC 10
-#define TEVSELCC_RASA 11
-#define TEVSELCC_ONE 12
-#define TEVSELCC_HALF 13
-#define TEVSELCC_KONST 14
-#define TEVSELCC_ZERO 15
-
-#define TEVSELCA_APREV 0
-#define TEVSELCA_A0 1
-#define TEVSELCA_A1 2
-#define TEVSELCA_A2 3
-#define TEVSELCA_TEXA 4
-#define TEVSELCA_RASA 5
-#define TEVSELCA_KONST 6
-#define TEVSELCA_ZERO 7
-
-struct TevStageCombiner
-{
-	union ColorCombiner
-	{
-		struct  //abc=8bit,d=10bit
-		{
-			u32 d : 4; // TEVSELCC_X
-			u32 c : 4; // TEVSELCC_X
-			u32 b : 4; // TEVSELCC_X
-			u32 a : 4; // TEVSELCC_X
-
-			u32 bias : 2;
-			u32 op : 1;
-			u32 clamp : 1;
-
-			u32 shift : 2;
-			u32 dest : 2;  //1,2,3
-
-		};
-		u32 hex;
-	};
-	union AlphaCombiner
-	{
-		struct 
-		{
-			u32 rswap : 2;
-			u32 tswap : 2;
-			u32 d : 3; // TEVSELCA_
-			u32 c : 3; // TEVSELCA_
-			u32 b : 3; // TEVSELCA_
-			u32 a : 3; // TEVSELCA_
-
-			u32 bias : 2; //GXTevBias
-			u32 op : 1;
-			u32 clamp : 1;
-
-			u32 shift : 2;
-			u32 dest : 2;  //1,2,3
-		};
-		u32 hex;
-	};
-
-	ColorCombiner colorC;
-	AlphaCombiner alphaC;
-};
-
-#define ITF_8 0
-#define ITF_5 1
-#define ITF_4 2
-#define ITF_3 3
-
-#define ITB_NONE 0
-#define ITB_S    1
-#define ITB_T    2
-#define ITB_ST   3
-#define ITB_U    4
-#define ITB_SU   5
-#define ITB_TU   6
-#define ITB_STU  7
-
-#define ITBA_OFF 0
-#define ITBA_S   1
-#define ITBA_T   2
-#define ITBA_U   3
-
-#define ITW_OFF 0
-#define ITW_256 1
-#define ITW_128 2
-#define ITW_64  3
-#define ITW_32  4
-#define ITW_16  5
-#define ITW_0   6
-
-// several discoveries:
-// GXSetTevIndBumpST(tevstage, indstage, matrixind)
-//  if( matrix == 2 ) realmat = 6; // 10
-//  else if( matrix == 3 ) realmat = 7; // 11
-//  else if( matrix == 1 ) realmat = 5; // 9
-//  GXSetTevIndirect(tevstage, indstage, 0, 3, realmat, 6, 6, 0, 0, 0)
-//  GXSetTevIndirect(tevstage+1, indstage, 0, 3, realmat+4, 6, 6, 1, 0, 0)
-//  GXSetTevIndirect(tevstage+2, indstage, 0, 0, 0, 0, 0, 1, 0, 0)
-
-	union TevStageIndirect
-	{
-		// if mid, sw, tw, and addprev are 0, then no indirect stage is used, mask = 0x17fe00
-		struct
-		{
-			u32 bt			: 2; // indirect tex stage ID
-			u32 fmt			: 2; // format: ITF_X
-			u32 bias		: 3; // ITB_X
-			u32 bs			: 2; // ITBA_X, indicates which coordinate will become the 'bump alpha'
-			u32 mid			: 4; // matrix id to multiply offsets with
-			u32 sw			: 3; // ITW_X, wrapping factor for S of regular coord
-			u32 tw			: 3; // ITW_X, wrapping factor for T of regular coord
-			u32 lb_utclod	: 1; // use modified or unmodified texture coordinates for LOD computation
-			u32 fb_addprev	: 1; // 1 if the texture coordinate results from the previous TEV stage should be added
-			u32 pad0		: 3;
-			u32 rid			: 8;
-		};
-		struct
-		{
-			u32 hex : 21; 
-			u32 unused : 11;
-		};
-
-		bool IsActive() { return (hex & 0x17fe00) != 0; }
-	};
-
-	union TwoTevStageOrders
-	{
-		struct
-		{
-			u32 texmap0    : 3; // indirect tex stage texmap
-			u32 texcoord0  : 3;
-			u32 enable0    : 1; // 1 if should read from texture
-			u32 colorchan0 : 3; // RAS1_CC_X
-
-			u32 pad0       : 2;
-
-			u32 texmap1    : 3;
-			u32 texcoord1  : 3;
-			u32 enable1    : 1; // 1 if should read from texture
-			u32 colorchan1 : 3; // RAS1_CC_X
-
-			u32 pad1       : 2;
-			u32 rid        : 8;
-		};
-		u32 hex;
-		int getTexMap(int i){return i?texmap1:texmap0;}
-		int getTexCoord(int i){return i?texcoord1:texcoord0;}
-		int getEnable(int i){return i?enable1:enable0;}
-		int getColorChan(int i){return i?colorchan1:colorchan0;}
-	};
-
-union TEXSCALE
-{
-	struct
-	{
-		u32 ss0 : 4; // indirect tex stage 0, 2^(-ss0)
-		u32 ts0 : 4; // indirect tex stage 0
-		u32 ss1 : 4; // indirect tex stage 1
-		u32 ts1 : 4; // indirect tex stage 1
-		u32 pad : 8;
-		u32 rid : 8;
-	};
-	u32 hex;
-
-	float getScaleS(int i){return 1.0f/(float)(1<<(i?ss1:ss0));}
-	float getScaleT(int i){return 1.0f/(float)(1<<(i?ts1:ts0));}
-};
-
-union RAS1_IREF
-{
-	struct
-	{
-		u32 bi0 : 3; // indirect tex stage 0 ntexmap
-		u32 bc0 : 3; // indirect tex stage 0 ntexcoord
-		u32 bi1 : 3;
-		u32 bc1 : 3;
-		u32 bi2 : 3;
-		u32 bc3 : 3;
-		u32 bi4 : 3;
-		u32 bc4 : 3;
-		u32 rid : 8;
-	};
-	u32 hex;
-
-	u32 getTexCoord(int i) { return (hex>>(6*i+3))&3; }
-	u32 getTexMap(int i) { return (hex>>(6*i))&3; }
-};
-
-
-// Texture structs
-
-union TexMode0
-{
-	struct 
-	{
-		u32 wrap_s : 2;
-		u32 wrap_t : 2;
-		u32 mag_filter : 1;
-		u32 min_filter : 3;
-		u32 diag_lod : 1;
-		s32 lod_bias : 8;
-		u32 pad0 : 2;
-		u32 max_aniso : 2;
-		u32 lod_clamp : 1;
-	};
-	u32 hex;
-};
-union TexMode1
-{
-	struct 
-	{
-		u32 min_lod : 8;
-		u32 max_lod : 8;
-	};
-	u32 hex;
-};
-union TexImage0
-{
-	struct 
-	{
-		u32 width  : 10; //actually w-1
-		u32 height : 10; //actually h-1
-		u32 format : 4;
-	};
-	u32 hex;
-};
-union TexImage1
-{
-	struct 
-	{
-		u32 tmem_even : 15; // tmem line index for even LODs
-		u32 cache_width : 3;
-		u32 cache_height : 3;
-		u32 image_type : 1; // 1 if this texture is managed manually (0 means we'll autofetch the texture data whenever it changes)
-	};
-	u32 hex;
-};
-
-union TexImage2
-{
-	struct 
-	{
-		u32 tmem_odd : 15; // tmem line index for odd LODs
-		u32 cache_width : 3; 
-		u32 cache_height : 3;
-	};
-	u32 hex;
-};
-
-union TexImage3
-{
-	struct 
-	{
-		u32 image_base: 24;  //address in memory >> 5 (was 20 for GC)
-	};
-	u32 hex;
-};
-union TexTLUT
-{
-	struct 
-	{
-		u32 tmem_offset : 10;
-		u32 tlut_format : 2;
-	};
-	u32 hex;
-};
-
-union ZTex1
-{
-	struct 
-	{
-		u32 bias : 24;
-	};
-	u32 hex;
-};
-
-union ZTex2
-{
-	struct 
-	{
-		u32 type : 2; // TEV_Z_TYPE_X
-		u32 op : 2; // GXZTexOp
-	};
-	u32 hex;
-};
-
-//  Z-texture types (formats)
-#define TEV_ZTEX_TYPE_U8	0
-#define TEV_ZTEX_TYPE_U16	1
-#define TEV_ZTEX_TYPE_U24	2
-
-#define TEV_ZTEX_DISABLE  0
-#define TEV_ZTEX_ADD      1
-#define TEV_ZTEX_REPLACE  2
-
-
-struct FourTexUnits
-{
-	TexMode0 texMode0[4];
-	TexMode1 texMode1[4];
-	TexImage0 texImage0[4];
-	TexImage1 texImage1[4];
-	TexImage2 texImage2[4];
-	TexImage3 texImage3[4];
-	TexTLUT texTlut[4];
-	u32 unknown[4];
-};
-
-
-
-// Geometry/other structs
-
-union GenMode
-{
-	struct 
-	{
-		u32 numtexgens : 4;    //     0xF
-		u32 numcolchans : 5;   //   0x1E0
-		u32 multisampling : 1; //   0x200
-		u32 numtevstages : 4;  //  0x3C00
-		u32 cullmode : 2;      //  0xC000
-		u32 numindstages : 3;  // 0x30000
-		u32 zfreeze : 5;       //0x3C0000
-	};
-	u32 hex;
-};
-
-union LPSize
-{
-	struct 
-	{
-		u32 linesize : 8; // in 1/6th pixels
-		u32 pointsize : 8; // in 1/6th pixels
-		u32 lineoff : 3;
-		u32 pointoff : 3;
-		u32 lineaspect : 1; // interlacing: adjust for pixels having AR of 1/2
-		u32 padding : 1;
-	};
-	u32 hex;
-};
-
-
-union X12Y12
-{
-	struct 
-	{
-		u32 y : 12;
-		u32 x : 12;
-	};
-	u32 hex;
-};
-union X10Y10
-{
-	struct 
-	{
-		u32 x : 10;
-		u32 y : 10;
-	};
-	u32 hex;
-};
-
-
-// Framebuffer/pixel stuff (incl fog)
-
-#define GX_BL_ZERO         0
-#define GX_BL_ONE          1
-#define GX_BL_SRCCLR       2 // for dst factor
-#define GX_BL_INVSRCCLR    3 // for dst factor
-#define GX_BL_SRCALPHA     4
-#define GX_BL_INVSRCALPHA  5
-#define GX_BL_DSTALPHA     6
-#define GX_BL_INVDSTALPHA  7
-#define GX_BL_DSTCLR       GX_BL_SRCCLR // for src factor
-#define GX_BL_INVDSTCLR    GX_BL_INVSRCCLR // for src factor
-
-union BlendMode
-{
-	struct 
-	{
-		u32 blendenable   : 1;
-		u32 logicopenable : 1;
-		u32 dither : 1;
-		u32 colorupdate : 1;
-		u32 alphaupdate : 1;
-		u32 dstfactor : 3; //BLEND_ONE, BLEND_INV_SRc etc
-		u32 srcfactor : 3;
-		u32 subtract : 1;
-		u32 logicmode : 4;
-	};
-	u32 hex;
-};
-
-
-union FogParam0
-{
-	struct 
-	{
-		u32 mantissa : 11;
-		u32 exponent : 8;
-		u32 sign : 1;
-	};
-
-	float GetA()
-	{
-		union { u32 i; float f; } dummy;
-		dummy.i = ((u32)sign << 31) | ((u32)exponent << 23) | ((u32)mantissa << 12); // scale mantissa from 11 to 23 bits
-		return dummy.f;
-	}
-
-	u32 hex;
-};
-
-union FogParam3
-{
-	struct
-	{
-		u32 c_mant : 11;
-		u32 c_exp : 8;
-		u32 c_sign : 1;
-		u32 proj : 1; // 0 - perspective, 1 - orthographic
-		u32 fsel : 3; // 0 - off, 2 - linear, 4 - exp, 5 - exp2, 6 - backward exp, 7 - backward exp2
-	};
-
-	// amount to subtract from eyespacez after range adjustment
-	float GetC()
-	{ 
-		union { u32 i; float f; } dummy;
-		dummy.i = ((u32)c_sign << 31) | ((u32)c_exp << 23) | ((u32)c_mant << 12); // scale mantissa from 11 to 23 bits
-		return dummy.f;
-	}
-
-	u32 hex;
-};
-
-union FogRangeKElement
-{
-	struct
-	{
-		u32 HI : 12;
-		u32 LO : 12;
-		u32 regid : 8;
-	};
-
-	// TODO: Which scaling coefficient should we use here? This is just a guess!
-	float GetValue(int i) { return (i ? HI : LO) / 256.f; }
-	u32 HEX;
-};
-
-struct FogRangeParams
-{
-	union RangeBase
-	{
-		struct
-		{
-			u32 Center : 10; // viewport center + 342
-			u32 Enabled : 1;
-			u32 unused : 13;
-			u32 regid : 8;
-		};
-		u32 hex;
-	};
-	RangeBase Base;
-	FogRangeKElement K[5];
-};
-// final eq: ze = A/(B_MAG - (Zs>>B_SHF));
-struct FogParams
-{
-	FogParam0 a;
-	u32 b_magnitude;
-	u32 b_shift; // b's exp + 1?
-	FogParam3 c_proj_fsel;
-
-	union FogColor
-	{
-		struct
-		{
-			u32 b  : 8;
-			u32 g  : 8;
-			u32 r  : 8;
-		};
-		u32 hex;
-	};
-
-	FogColor color;  //0:b 8:g 16:r - nice!
-};
-
-union ZMode
-{
-	struct
-	{
-		u32 testenable		: 1;
-		u32 func			: 3;
-		u32 updateenable	: 1;  //size?
-	};
-	u32 hex;
-};
-
-union ConstantAlpha
-{
-	struct
-	{
-		u32 alpha : 8;
-		u32 enable : 1;
-	};
-	u32 hex;
-};
-
-union FieldMode
-{
-	struct
-	{
-		u32 texLOD : 1; // adjust vert tex LOD computation to account for interlacing
-	};
-	u32 hex;
-};
-
-union FieldMask
-{
-	struct
-	{
-		// If bit is not set, do not write field to EFB
-		u32 odd : 1;
-		u32 even : 1;
-	};
-	u32 hex;
-};
-
-#define PIXELFMT_RGB8_Z24 0
-#define PIXELFMT_RGBA6_Z24 1
-#define PIXELFMT_RGB565_Z16 2
-#define PIXELFMT_Z24 3
-#define PIXELFMT_Y8 4
-#define PIXELFMT_U8 5
-#define PIXELFMT_V8 6
-#define PIXELFMT_YUV420 7
-
-#define ZC_LINEAR 0
-#define ZC_NEAR 1
-#define ZC_MID 2
-#define ZC_FAR 3
-// It seems these Z formats aren't supported/were removed ?
-#define ZC_INV_LINEAR 4
-#define ZC_INV_NEAR 5
-#define ZC_INV_MID 6
-#define ZC_INV_FAR 7
-
-union PE_CONTROL
-{
-	struct
-	{
-		u32 pixel_format : 3;	// PIXELFMT_X
-		u32 zformat : 3;		// Z Compression for 16bit Z format
-		u32 early_ztest : 1;	// 1: before tex stage
-		u32 unused : 17;
-		u32 rid : 8;
-	};
-
-	u32 hex;
-};
-
-
-// Texture coordinate stuff
-
-union TCInfo
-{
-	struct 
-	{
-		u32 scale_minus_1 : 16;
-		u32 range_bias : 1;
-		u32 cylindric_wrap : 1;
-		// These bits only have effect in the s field of TCoordInfo
-		u32 line_offset : 1;
-		u32 point_offset : 1;
-	};
-	u32 hex;
-};
-struct TCoordInfo
-{
-	TCInfo s;
-	TCInfo t;
-};
-
-
-union ColReg
-{
-	u32 hex;
-	struct
-	{
-		s32 a : 11;
-		u32 : 1;
-		s32 b : 11;
-		u32 type : 1;
-	};
-};
-
-struct TevReg
-{
-	ColReg low;
-	ColReg high;
-};
-
-union TevKSel
-{
-	struct {
-		u32 swap1 : 2;
-		u32 swap2 : 2;
-		u32 kcsel0 : 5;
-		u32 kasel0 : 5;
-		u32 kcsel1 : 5;
-		u32 kasel1 : 5;
-	};
-	u32 hex;
-
-	int getKC(int i) {return i?kcsel1:kcsel0;}
-	int getKA(int i) {return i?kasel1:kasel0;}
-};
-
-union AlphaTest
-{
-	struct
-	{
-		u32 ref0 : 8;
-		u32 ref1 : 8;
-		u32 comp0 : 3;
-		u32 comp1 : 3;
-		u32 logic : 2;
-	};
-	u32 hex;
-
-	enum TEST_RESULT
-	{
-		UNDETERMINED = 0,
-		FAIL = 1,
-		PASS = 2,
-	};
-
-	inline TEST_RESULT TestResult() const
-	{
-		switch(logic)
-		{
-		case 0: // AND
-			if (comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS)
-				return PASS;
-			if (comp0 == ALPHACMP_NEVER || comp1 == ALPHACMP_NEVER)
-				return FAIL;
-			break;
-
-		case 1: // OR
-			if (comp0 == ALPHACMP_ALWAYS || comp1 == ALPHACMP_ALWAYS)
-				return PASS;
-			if (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER)
-				return FAIL;
-			break;
-
-		case 2: // XOR
-			if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS))
-				return PASS;
-			if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER))
-				return FAIL;
-			break;
-
-		case 3: // XNOR
-			if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS))
-				return FAIL;
-			if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER))
-				return PASS;
-			break;
-		}
-		return UNDETERMINED;
-	}
-};
-
-union UPE_Copy
-{
-	u32 Hex;
-	struct 
-	{
-		u32 clamp0				: 1; // if set clamp top
-		u32 clamp1				: 1; // if set clamp bottom
-		u32 yuv					: 1; // if set, color conversion from RGB to YUV
-		u32 target_pixel_format	: 4; // realformat is (fmt/2)+((fmt&1)*8).... for some reason the msb is the lsb (pattern: cycling right shift)
-		u32 gamma				: 2; // gamma correction.. 0 = 1.0 ; 1 = 1.7 ; 2 = 2.2 ; 3 is reserved
-		u32 half_scale			: 1; // "mipmap" filter... 0 = no filter (scale 1:1) ; 1 = box filter (scale 2:1)
-		u32 scale_invert		: 1; // if set vertical scaling is on
-		u32 clear				: 1;
-		u32 frame_to_field		: 2; // 0 progressive ; 1 is reserved ; 2 = interlaced (even lines) ; 3 = interlaced 1 (odd lines)
-		u32 copy_to_xfb			: 1;
-		u32 intensity_fmt		: 1; // if set, is an intensity format (I4,I8,IA4,IA8)
-		u32	auto_conv			: 1; // if 0 automatic color conversion by texture format and pixel type
-	};
-	u32 tp_realFormat() { 
-		return target_pixel_format / 2 + (target_pixel_format & 1) * 8;
-	}
-};
-
-union BPU_PreloadTileInfo
-{
-	u32 hex;
-	struct
-	{
-		u32 count : 15;
-		u32 type : 2;
-	};
-};
-
-struct BPS_TmemConfig
-{
-	u32 preload_addr;
-	u32 preload_tmem_even;
-	u32 preload_tmem_odd;
-	BPU_PreloadTileInfo preload_tile_info;
-	u32 tlut_src;
-	u32 tlut_dest;
-	u32 texinvalidate;
-};
-
-// All of BP memory
-
-
-struct BPCmd
-{
-	int address;
-	int changes;
-	int newvalue;
-};
-
-struct BPMemory
-{
-	GenMode genMode;
-	u32 display_copy_filter[4]; // 01-04
-	u32 unknown; // 05
-	// indirect matrices (set by GXSetIndTexMtx, selected by TevStageIndirect::mid)
-	// abc form a 2x3 offset matrix, there's 3 such matrices
-	// the 3 offset matrices can either be indirect type, S-type, or T-type
-	// 6bit scale factor s is distributed across IND_MTXA/B/C. 
-	// before using matrices scale by 2^-(s-17)
-	IND_MTX indmtx[3];//06-0e GXSetIndTexMtx, 2x3 matrices
-	IND_IMASK imask;//0f
-	TevStageIndirect tevind[16];//10 GXSetTevIndirect
-	X12Y12 scissorTL; //20
-	X12Y12 scissorBR; //21
-	LPSize lineptwidth; //22 line and point width
-	u32 sucounter; //23
-	u32 rascounter; //24
-	TEXSCALE texscale[2]; //25-26 GXSetIndTexCoordScale
-	RAS1_IREF tevindref; //27 GXSetIndTexOrder
-	TwoTevStageOrders tevorders[8]; //28-2F
-	TCoordInfo texcoords[8]; //0x30 s,t,s,t,s,t,s,t...
-	ZMode zmode; //40
-	BlendMode blendmode; //41
-	ConstantAlpha dstalpha;  //42
-	PE_CONTROL zcontrol; //43 GXSetZCompLoc, GXPixModeSync
-	FieldMask fieldmask; //44
-	u32 drawdone;  //45, bit1=1 if end of list
-	u32 unknown5;  //46 clock?
-	u32 petoken; //47
-	u32 petokenint; // 48
-	X10Y10 copyTexSrcXY; // 49
-	X10Y10 copyTexSrcWH; // 4a
-	u32 copyTexDest; //4b// 4b == CopyAddress (GXDispCopy and GXTexCopy use it)
-	u32 unknown6; //4c
-	u32 copyMipMapStrideChannels; // 4d usually set to 4 when dest is single channel, 8 when dest is 2 channel, 16 when dest is RGBA
-								// also, doubles whenever mipmap box filter option is set (excent on RGBA). Probably to do with number of bytes to look at when smoothing
-	u32 dispcopyyscale; //4e
-	u32 clearcolorAR; //4f
-	u32 clearcolorGB; //50
-	u32 clearZValue; //51
-	UPE_Copy triggerEFBCopy; //52
-	u32 copyfilter[2]; //53,54
-	u32 boundbox0;//55
-	u32 boundbox1;//56
-	u32 unknown7[2];//57,58
-	X10Y10 scissorOffset; //59
-	u32 unknown8[6]; //5a,5b,5c,5d, 5e,5f
-	BPS_TmemConfig tmem_config; // 60-66
-	u32 metric; //67
-	FieldMode fieldmode;//68
-	u32 unknown10[7];//69-6F
-	u32 unknown11[16];//70-7F
-	FourTexUnits tex[2]; //80-bf
-	TevStageCombiner combiners[16]; //0xC0-0xDF
-	TevReg tevregs[4];  //0xE0
-	FogRangeParams fogRange;  // 0xE8
-	FogParams fog; //0xEE,0xEF,0xF0,0xF1,0xF2
-	AlphaTest alpha_test; //0xF3
-	ZTex1 ztex1; //0xf4,0xf5
-	ZTex2 ztex2;
-	TevKSel tevksel[8];//0xf6,0xf7,f8,f9,fa,fb,fc,fd
-	u32 bpMask; //0xFE
-	u32 unknown18; //ff
-
-	bool UseEarlyDepthTest() const { return zcontrol.early_ztest && zmode.testenable; }
-	bool UseLateDepthTest() const { return !zcontrol.early_ztest && zmode.testenable; }
-};
-
-#pragma pack()
-
-extern BPMemory bpmem;
-
-void LoadBPReg(u32 value0);
-
-void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size);
-
-#endif // _BPMEMORY_H
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
deleted file mode 100644
index 9f885e7953..0000000000
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ /dev/null
@@ -1,733 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-
-#include "VideoConfig.h"
-#include "Statistics.h"
-#include "RenderBase.h"
-#include "VideoCommon.h"
-#include "PixelShaderManager.h"
-#include "PixelEngine.h"
-#include "BPFunctions.h"
-#include "BPStructs.h"
-#include "TextureDecoder.h"
-#include "OpcodeDecoding.h"
-#include "VertexLoader.h"
-#include "VertexShaderManager.h"
-#include "Thread.h"
-#include "HW/Memmap.h"
-#include "PerfQueryBase.h"
-
-using namespace BPFunctions;
-
-static u32 mapTexAddress;
-static bool mapTexFound;
-static int numWrites;
-
-extern volatile bool g_bSkipCurrentFrame;
-
-static const float s_gammaLUT[] = 
-{
-	1.0f,
-	1.7f,
-	2.2f,
-	1.0f
-};
-
-void BPInit()
-{
-	memset(&bpmem, 0, sizeof(bpmem));
-	bpmem.bpMask = 0xFFFFFF;
-
-	mapTexAddress = 0;
-	numWrites = 0;
-	mapTexFound = false;
-}
-
-void RenderToXFB(const BPCmd &bp, const EFBRectangle &rc, float yScale, float xfbLines, u32 xfbAddr, const u32 dstWidth, const u32 dstHeight, float gamma)
-{
-	Renderer::RenderToXFB(xfbAddr, dstWidth, dstHeight, rc, gamma);
-}
-void BPWritten(const BPCmd& bp)
-{
-	/*
-	----------------------------------------------------------------------------------------------------------------
-	Purpose: Writes to the BP registers
-	Called: At the end of every: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg
-	How It Works: First the pipeline is flushed then update the bpmem with the new value.
-				  Some of the BP cases have to call certain functions while others just update the bpmem.
-				  some bp cases check the changes variable, because they might not have to be updated all the time
-	NOTE: it seems not all bp cases like checking changes, so calling if (bp.changes == 0 ? false : true)
-		  had to be ditched and the games seem to work fine with out it.
-	NOTE2: Yet Another Gamecube Documentation calls them Bypass Raster State Registers but possibly completely wrong
-	NOTE3: This controls the register groups: RAS1/2, SU, TF, TEV, C/Z, PEC
-	TODO: Turn into function table. The (future) DisplayList (DL) jit can then call the functions directly,
-		  getting rid of dynamic dispatch. Unfortunately, few games use DLs properly - most\
-		  just stuff geometry in them and don't put state changes there
-	----------------------------------------------------------------------------------------------------------------
-	*/
-	
-	// check for invalid state, else unneeded configuration are built
-	g_video_backend->CheckInvalidState();
-
-	// Debugging only, this lets you skip a bp update
-	//static int times = 0;
-	//static bool enable = false;
-
-	//switch (bp.address)
-	//{
-	//case BPMEM_CONSTANTALPHA:
-	//	{
-	//	if (times-- == 0 && enable)
-	//		return;
-	//	else
-	//		break;
-	//	}
-	//default: break;
-	//}
-
-	// FIXME: Hangs load-state, but should fix graphic-heavy games state loading
-	//std::lock_guard<std::mutex> lk(s_bpCritical);
-
-	// BEGIN ZTP SPEEDUP HACK CHANGES
-	// This hunk of code disables the usual pipeline flush for certain BP Writes
-	// that occur while the minimap is being drawn in Zelda: Twilight Princess.
-	// This significantly increases speed while in hyrule field. In depth discussion
-	// on how this Hack came to be can be found at: http://forums.dolphin-emu.com/thread-10638.html
-	// -fircrestsk8
-	if (g_ActiveConfig.bZTPSpeedHack)
-	{
-		if (!mapTexFound)
-		{
-			if (bp.address != BPMEM_TEV_COLOR_ENV && bp.address != BPMEM_TEV_ALPHA_ENV)
-			{
-				numWrites = 0;
-			}
-			else if (++numWrites >= 100)	// seem that if 100 consecutive BP writes are called to either of these addresses in ZTP, 
-			{								// then it is safe to assume the map texture address is currently loaded into the BP memory
-				mapTexAddress = bpmem.tex[0].texImage3[0].hex << 5;
-				mapTexFound = true;
-				WARN_LOG(VIDEO, "\nZTP map texture found at address %08x\n", mapTexAddress);
-			}
-			FlushPipeline();
-		}
-		else if ( (bpmem.tex[0].texImage3[0].hex << 5) != mapTexAddress ||
-					bpmem.tevorders[0].getEnable(0) == 0 ||
-					bp.address == BPMEM_TREF)
-		{
-			FlushPipeline();
-		}
-	}  // END ZTP SPEEDUP HACK
-	else 
-	{
-		if (((s32*)&bpmem)[bp.address] == bp.newvalue)
-		{
-			if (!(bp.address == BPMEM_TRIGGER_EFB_COPY
-					|| bp.address == BPMEM_CLEARBBOX1
-					|| bp.address == BPMEM_CLEARBBOX2
-					|| bp.address == BPMEM_SETDRAWDONE
-					|| bp.address == BPMEM_PE_TOKEN_ID
-					|| bp.address == BPMEM_PE_TOKEN_INT_ID
-					|| bp.address == BPMEM_LOADTLUT0
-					|| bp.address == BPMEM_LOADTLUT1
-					|| bp.address == BPMEM_TEXINVALIDATE
-					|| bp.address == BPMEM_PRELOAD_MODE
-					|| bp.address == BPMEM_CLEAR_PIXEL_PERF))
-			{
-				return;
-			}
-		}
-
-		FlushPipeline();
-	}
-
-	((u32*)&bpmem)[bp.address] = bp.newvalue;
-	
-	switch (bp.address)
-	{
-	case BPMEM_GENMODE: // Set the Generation Mode
-		{
-			PRIM_LOG("genmode: texgen=%d, col=%d, multisampling=%d, tev=%d, cullmode=%d, ind=%d, zfeeze=%d",
-			bpmem.genMode.numtexgens, bpmem.genMode.numcolchans,
-			bpmem.genMode.multisampling, bpmem.genMode.numtevstages+1, bpmem.genMode.cullmode,
-			bpmem.genMode.numindstages, bpmem.genMode.zfreeze);
-
-			// Only call SetGenerationMode when cull mode changes.
-			if (bp.changes & 0xC000)
-				SetGenerationMode();
-			break;
-		}
-	case BPMEM_IND_MTXA: // Index Matrix Changed
-	case BPMEM_IND_MTXB:
-	case BPMEM_IND_MTXC:
-	case BPMEM_IND_MTXA+3:
-	case BPMEM_IND_MTXB+3:
-	case BPMEM_IND_MTXC+3:
-	case BPMEM_IND_MTXA+6:
-	case BPMEM_IND_MTXB+6:
-	case BPMEM_IND_MTXC+6:
-		PixelShaderManager::SetIndMatrixChanged((bp.address - BPMEM_IND_MTXA) / 3);
-		break;
-	case BPMEM_RAS1_SS0: // Index Texture Coordinate Scale 0
-		PixelShaderManager::SetIndTexScaleChanged(0x03);
-	case BPMEM_RAS1_SS1: // Index Texture Coordinate Scale 1
-		PixelShaderManager::SetIndTexScaleChanged(0x0c);
-		break;
-	// ----------------
-	// Scissor Control
-	// ----------------
-	case BPMEM_SCISSORTL: // Scissor Rectable Top, Left
-	case BPMEM_SCISSORBR: // Scissor Rectable Bottom, Right
-	case BPMEM_SCISSOROFFSET: // Scissor Offset
-		SetScissor();
-		break;
-	case BPMEM_LINEPTWIDTH: // Line Width
-		SetLineWidth();
-		break;
-	case BPMEM_ZMODE: // Depth Control
-		PRIM_LOG("zmode: test=%d, func=%d, upd=%d", bpmem.zmode.testenable, bpmem.zmode.func,
-		bpmem.zmode.updateenable);
-		SetDepthMode();
-		break;
-	case BPMEM_BLENDMODE: // Blending Control
-		{
-			if (bp.changes & 0xFFFF)
-			{
-				PRIM_LOG("blendmode: en=%d, open=%d, colupd=%d, alphaupd=%d, dst=%d, src=%d, sub=%d, mode=%d", 
-					bpmem.blendmode.blendenable, bpmem.blendmode.logicopenable, bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate,
-					bpmem.blendmode.dstfactor, bpmem.blendmode.srcfactor, bpmem.blendmode.subtract, bpmem.blendmode.logicmode);
-
-				// Set LogicOp Blending Mode
-				if (bp.changes & 0xF002) // logicopenable | logicmode
-					SetLogicOpMode();
-
-				// Set Dithering Mode
-				if (bp.changes & 4) // dither
-					SetDitherMode();
-
-				// Set Blending Mode
-				if (bp.changes & 0xFF1) // blendenable | alphaupdate | dstfactor | srcfactor | subtract
-					SetBlendMode();
-
-				// Set Color Mask
-				if (bp.changes & 0x18) // colorupdate | alphaupdate
-					SetColorMask();
-			}
-			break;
-		}
-	case BPMEM_CONSTANTALPHA: // Set Destination Alpha
-		{
-			PRIM_LOG("constalpha: alp=%d, en=%d", bpmem.dstalpha.alpha, bpmem.dstalpha.enable);
-			PixelShaderManager::SetDestAlpha(bpmem.dstalpha);
-			if(bp.changes & 0x100)
-				SetBlendMode();
-			break;
-		}
-	// This is called when the game is done drawing the new frame (eg: like in DX: Begin(); Draw(); End();)
-	// Triggers an interrupt on the PPC side so that the game knows when the GPU has finished drawing.
-	// Tokens are similar.
-	case BPMEM_SETDRAWDONE:
-		switch (bp.newvalue & 0xFF)
-		{
-		case 0x02:
-			PixelEngine::SetFinish(); // may generate interrupt
-			DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bp.newvalue & 0xFFFF));
-			break;
-
-		default:
-			WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bp.newvalue & 0xFFFF));
-			break;
-		}
-		break;
-	case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
-		PixelEngine::SetToken(static_cast<u16>(bp.newvalue & 0xFFFF), false);
-		DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bp.newvalue & 0xFFFF));
-		break;
-	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
-		PixelEngine::SetToken(static_cast<u16>(bp.newvalue & 0xFFFF), true);
-		DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bp.newvalue & 0xFFFF));
-		break;
-	// ------------------------
-	// EFB copy command. This copies a rectangle from the EFB to either RAM in a texture format or to XFB as YUYV.
-	// It can also optionally clear the EFB while copying from it. To emulate this, we of course copy first and clear afterwards.
-	case BPMEM_TRIGGER_EFB_COPY: // Copy EFB Region or Render to the XFB or Clear the screen.
-		{
-			// The bottom right is within the rectangle
-			// The values in bpmem.copyTexSrcXY and bpmem.copyTexSrcWH are updated in case 0x49 and 0x4a in this function
-
-			EFBRectangle rc;
-			rc.left = (int)bpmem.copyTexSrcXY.x;
-			rc.top = (int)bpmem.copyTexSrcXY.y;
-			
-			// Here Width+1 like Height, otherwise some textures are corrupted already since the native resolution.
-			rc.right = (int)(bpmem.copyTexSrcXY.x + bpmem.copyTexSrcWH.x + 1);
-			rc.bottom = (int)(bpmem.copyTexSrcXY.y + bpmem.copyTexSrcWH.y + 1);
-
-			UPE_Copy PE_copy = bpmem.triggerEFBCopy;
-
-			// Check if we are to copy from the EFB or draw to the XFB
-			if (PE_copy.copy_to_xfb == 0)
-			{
-				if (GetConfig(CONFIG_SHOWEFBREGIONS))
-					stats.efb_regions.push_back(rc);
-
-				CopyEFB(bpmem.copyTexDest << 5, PE_copy.tp_realFormat(),
-					bpmem.zcontrol.pixel_format, rc, PE_copy.intensity_fmt,
-					PE_copy.half_scale);
-			}
-			else
-			{
-				// We should be able to get away with deactivating the current bbox tracking
-				// here. Not sure if there's a better spot to put this.
-				// the number of lines copied is determined by the y scale * source efb height
-			
-				PixelEngine::bbox_active = false;
-
-				float yScale;
-				if (PE_copy.scale_invert)
-					yScale = 256.0f / (float)bpmem.dispcopyyscale;
-				else
-					yScale = (float)bpmem.dispcopyyscale / 256.0f;
-
-				float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale);
-				if ((u32)xfbLines > MAX_XFB_HEIGHT)
-				{
-					INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines);
-					xfbLines = MAX_XFB_HEIGHT;
-				}
-
-				RenderToXFB(bp, rc, yScale, xfbLines, 
-									 bpmem.copyTexDest << 5, 
-									 bpmem.copyMipMapStrideChannels << 4,
-									 (u32)xfbLines,
-									 s_gammaLUT[PE_copy.gamma]);
-			}
-
-			// Clear the rectangular region after copying it.
-			if (PE_copy.clear)
-			{
-				ClearScreen(rc);
-			}
-
-			break;
-		}
-	case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
-		break;
-	case BPMEM_LOADTLUT1: // Load a Texture Look Up Table
-		{
-			u32 tlutTMemAddr = (bp.newvalue & 0x3FF) << 9;
-			u32 tlutXferCount = (bp.newvalue & 0x1FFC00) >> 5;
-
-			u8 *ptr = 0;
-
-			// TODO - figure out a cleaner way.
-			if (GetConfig(CONFIG_ISWII))
-				ptr = GetPointer(bpmem.tmem_config.tlut_src << 5);
-			else
-				ptr = GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5);
-
-			if (ptr)
-				memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount);
-			else
-				PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5);
-
-			break;
-		}
-	case BPMEM_FOGRANGE: // Fog Settings Control
-	case BPMEM_FOGRANGE+1:
-	case BPMEM_FOGRANGE+2:
-	case BPMEM_FOGRANGE+3:
-	case BPMEM_FOGRANGE+4:
-	case BPMEM_FOGRANGE+5:
-		if (!GetConfig(CONFIG_DISABLEFOG))
-			PixelShaderManager::SetFogRangeAdjustChanged();
-		break;
-	case BPMEM_FOGPARAM0:
-	case BPMEM_FOGBMAGNITUDE:
-	case BPMEM_FOGBEXPONENT:
-	case BPMEM_FOGPARAM3:
-		if (!GetConfig(CONFIG_DISABLEFOG))
-			PixelShaderManager::SetFogParamChanged();
-		break;
-	case BPMEM_FOGCOLOR: // Fog Color
-		if (!GetConfig(CONFIG_DISABLEFOG))
-			PixelShaderManager::SetFogColorChanged();
-		break;
-	case BPMEM_ALPHACOMPARE: // Compare Alpha Values
-		PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0,
-				bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic);
-		PixelShaderManager::SetAlpha(bpmem.alpha_test);
-		g_renderer->SetColorMask();
-		break;
-	case BPMEM_BIAS: // BIAS
-		PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);
-		PixelShaderManager::SetZTextureBias(bpmem.ztex1.bias);
-		break;
-	case BPMEM_ZTEX2: // Z Texture type
-		{
-			if (bp.changes & 3)
-				PixelShaderManager::SetZTextureTypeChanged();
-			#if defined(_DEBUG) || defined(DEBUGFAST) 
-			const char* pzop[] = {"DISABLE", "ADD", "REPLACE", "?"};
-			const char* pztype[] = {"Z8", "Z16", "Z24", "?"};
-			PRIM_LOG("ztex op=%s, type=%s", pzop[bpmem.ztex2.op], pztype[bpmem.ztex2.type]);
-			#endif
-			break;
-		}
-	// ----------------------------------
-	// Display Copy Filtering Control - GX_SetCopyFilter(u8 aa,u8 sample_pattern[12][2],u8 vf,u8 vfilter[7])
-	// Fields: Destination, Frame2Field, Gamma, Source
-	// ----------------------------------
-	case BPMEM_DISPLAYCOPYFILER:   // if (aa) { use sample_pattern } else { use 666666 }
-	case BPMEM_DISPLAYCOPYFILER+1: // if (aa) { use sample_pattern } else { use 666666 }
-	case BPMEM_DISPLAYCOPYFILER+2: // if (aa) { use sample_pattern } else { use 666666 }
-	case BPMEM_DISPLAYCOPYFILER+3: // if (aa) { use sample_pattern } else { use 666666 }
-	case BPMEM_COPYFILTER0:        // if (vf) { use vfilter } else { use 595000 }
-	case BPMEM_COPYFILTER1:        // if (vf) { use vfilter } else { use 000015 }
-		break;
-	// -----------------------------------
-	// Interlacing Control
-	// -----------------------------------
-	case BPMEM_FIELDMASK: // GX_SetFieldMask(u8 even_mask,u8 odd_mask)
-	case BPMEM_FIELDMODE: // GX_SetFieldMode(u8 field_mode,u8 half_aspect_ratio)
-		SetInterlacingMode(bp);
-		break;
-	// ----------------------------------------
-	// Unimportant regs (Clock, Perf, ...)
-	// ----------------------------------------
-	case BPMEM_BUSCLOCK0:      // TB Bus Clock ?
-	case BPMEM_BUSCLOCK1:      // TB Bus Clock ?
-	case BPMEM_PERF0_TRI:      // Perf: Triangles
-	case BPMEM_PERF0_QUAD:     // Perf: Quads
-	case BPMEM_PERF1:          // Perf: Some Clock, Texels, TX, TC
-		break;
-	// ----------------
-	// EFB Copy config
-	// ----------------
-	case BPMEM_EFB_TL:   // EFB Source Rect. Top, Left
-	case BPMEM_EFB_BR:   // EFB Source Rect. Bottom, Right (w, h - 1)
-	case BPMEM_EFB_ADDR: // EFB Target Address
-		break;
-	// --------------
-	// Clear Config
-	// --------------
-	case BPMEM_CLEAR_AR: // Alpha and Red Components
-	case BPMEM_CLEAR_GB: // Green and Blue Components
-	case BPMEM_CLEAR_Z:  // Z Components (24-bit Zbuffer)
-		break;
-	// -------------------------
-	// Bounding Box Control
-	// -------------------------
-	case BPMEM_CLEARBBOX1:
-	case BPMEM_CLEARBBOX2:
-		{
-			if(g_ActiveConfig.bUseBBox)
-			{
-				// Don't compute bounding box if this frame is being skipped!
-				// Wrong but valid values are better than bogus values...
-				if(g_bSkipCurrentFrame)
-					break;
-
-				if (bp.address == BPMEM_CLEARBBOX1)
-				{
-					int right = bp.newvalue >> 10;
-					int left = bp.newvalue & 0x3ff;
-			
-					// We should only set these if bbox is calculated properly.
-					PixelEngine::bbox[0] = left;
-					PixelEngine::bbox[1] = right;
-					PixelEngine::bbox_active = true;
-				}
-				else
-				{
-					int bottom = bp.newvalue >> 10;
-					int top = bp.newvalue & 0x3ff;
-
-					// We should only set these if bbox is calculated properly.
-					PixelEngine::bbox[2] = top;
-					PixelEngine::bbox[3] = bottom;
-					PixelEngine::bbox_active = true;
-				}
-			}
-		}
-		break;
-	case BPMEM_TEXINVALIDATE:
-		// TODO: Needs some restructuring in TextureCacheBase.
-		break;
-
-	case BPMEM_ZCOMPARE:      // Set the Z-Compare and EFB pixel format
-		OnPixelFormatChange();
-		if(bp.changes & 7)
-		{
-			SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24
-			g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel
-		}
-		break;
-
-	case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel
-	case BPMEM_COPYYSCALE:    // Display Copy Y Scale
-	case BPMEM_IREF:          /* 24 RID
-								 21 BC3 - Ind. Tex Stage 3 NTexCoord
-								 18 BI3 - Ind. Tex Stage 3 NTexMap
-								 15 BC2 - Ind. Tex Stage 2 NTexCoord
-								 12 BI2 - Ind. Tex Stage 2 NTexMap
-								 9 BC1 - Ind. Tex Stage 1 NTexCoord
-								 6 BI1 - Ind. Tex Stage 1 NTexMap
-								 3 BC0 - Ind. Tex Stage 0 NTexCoord
-								 0 BI0 - Ind. Tex Stage 0 NTexMap*/
-	case BPMEM_TEV_KSEL:  // Texture Environment Swap Mode Table 0
-	case BPMEM_TEV_KSEL+1:// Texture Environment Swap Mode Table 1
-	case BPMEM_TEV_KSEL+2:// Texture Environment Swap Mode Table 2
-	case BPMEM_TEV_KSEL+3:// Texture Environment Swap Mode Table 3
-	case BPMEM_TEV_KSEL+4:// Texture Environment Swap Mode Table 4
-	case BPMEM_TEV_KSEL+5:// Texture Environment Swap Mode Table 5
-	case BPMEM_TEV_KSEL+6:// Texture Environment Swap Mode Table 6
-	case BPMEM_TEV_KSEL+7:// Texture Environment Swap Mode Table 7
-	case BPMEM_BP_MASK:   // This Register can be used to limit to which bits of BP registers is actually written to. the mask is
-						  // only valid for the next BP command, and will reset itself.
-	case BPMEM_IND_IMASK: // Index Mask ?
-	case BPMEM_REVBITS: // Always set to 0x0F when GX_InitRevBits() is called.
-		break;
- 
-	case BPMEM_CLEAR_PIXEL_PERF:
-		// GXClearPixMetric writes 0xAAA here, Sunshine alternates this register between values 0x000 and 0xAAA
-		g_perf_query->ResetQuery();
-		break;
-
-	case BPMEM_PRELOAD_ADDR:
-	case BPMEM_PRELOAD_TMEMEVEN:
-	case BPMEM_PRELOAD_TMEMODD: // Used when PRELOAD_MODE is set
-		break;
-
-	case BPMEM_PRELOAD_MODE: // Set to 0 when GX_TexModeSync() is called.
-		// if this is different from 0, manual TMEM management is used (GX_PreloadEntireTexture).
-		if (bp.newvalue != 0)
-		{
-			// TODO: Not quite sure if this is completely correct (likely not)
-			// NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature.
-
-			BPS_TmemConfig& tmem_cfg = bpmem.tmem_config;
-			u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC?
-			u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE;
-			u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE;
-
-			if (tmem_cfg.preload_tile_info.type != 3)
-			{
-				if (tmem_addr_even + size > TMEM_SIZE)
-					size = TMEM_SIZE - tmem_addr_even;
-
-				memcpy(texMem + tmem_addr_even, src_ptr, size);
-			}
-			else // RGBA8 tiles (and CI14, but that might just be stupid libogc!)
-			{
-				// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
-				u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
-
-				for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
-				{
-					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
-						tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
-						break;
-
-					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);
-					memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE);
-					tmem_addr_even += TMEM_LINE_SIZE;
-					tmem_addr_odd += TMEM_LINE_SIZE;
-					src_ptr += TMEM_LINE_SIZE * 2;
-				}
-			}
-		}
-		break;
-
-		// ------------------------------------------------
-		// On Default, we try to look for other things
-		// before we give up and say its an unknown opcode
-		// ------------------------------------------------
-	default:
-		switch (bp.address & 0xFC)  // Texture sampler filter
-		{
-		// -------------------------
-		// Texture Environment Order
-		// -------------------------
-		case BPMEM_TREF:
-		case BPMEM_TREF+4:
-			break;
-		// ----------------------
-		// Set wrap size
-		// ----------------------
-		case BPMEM_SU_SSIZE:
-		case BPMEM_SU_TSIZE:
-		case BPMEM_SU_SSIZE+2:
-		case BPMEM_SU_TSIZE+2:
-		case BPMEM_SU_SSIZE+4:
-		case BPMEM_SU_TSIZE+4:
-		case BPMEM_SU_SSIZE+6:
-		case BPMEM_SU_TSIZE+6:
-		case BPMEM_SU_SSIZE+8:
-		case BPMEM_SU_TSIZE+8:
-		case BPMEM_SU_SSIZE+10:
-		case BPMEM_SU_TSIZE+10:
-		case BPMEM_SU_SSIZE+12:
-		case BPMEM_SU_TSIZE+12:
-		case BPMEM_SU_SSIZE+14:
-		case BPMEM_SU_TSIZE+14:
-			PixelShaderManager::SetTexCoordChanged((bp.address - BPMEM_SU_SSIZE) >> 1);
-			break;
-		// ------------------------
-		// BPMEM_TX_SETMODE0 - (Texture lookup and filtering mode) LOD/BIAS Clamp, MaxAnsio, LODBIAS, DiagLoad, Min Filter, Mag Filter, Wrap T, S
-		// BPMEM_TX_SETMODE1 - (LOD Stuff) - Max LOD, Min LOD
-		// ------------------------
-		case BPMEM_TX_SETMODE0: // (0x90 for linear)
-		case BPMEM_TX_SETMODE0_4:
-			break;
-
-		case BPMEM_TX_SETMODE1:
-		case BPMEM_TX_SETMODE1_4:
-			break;
-		// --------------------------------------------
-		// BPMEM_TX_SETIMAGE0 - Texture width, height, format
-		// BPMEM_TX_SETIMAGE1 - even LOD address in TMEM - Image Type, Cache Height, Cache Width, TMEM Offset
-		// BPMEM_TX_SETIMAGE2 - odd LOD address in TMEM - Cache Height, Cache Width, TMEM Offset
-		// BPMEM_TX_SETIMAGE3 - Address of Texture in main memory
-		// --------------------------------------------
-		case BPMEM_TX_SETIMAGE0:
-		case BPMEM_TX_SETIMAGE0_4:
-		case BPMEM_TX_SETIMAGE1:
-		case BPMEM_TX_SETIMAGE1_4:
-		case BPMEM_TX_SETIMAGE2:
-		case BPMEM_TX_SETIMAGE2_4:
-		case BPMEM_TX_SETIMAGE3:
-		case BPMEM_TX_SETIMAGE3_4:
-			break;
-		// -------------------------------
-		// Set a TLUT
-		// BPMEM_TX_SETTLUT - Format, TMEM Offset (offset of TLUT from start of TMEM high bank > > 5)
-		// -------------------------------
-		case BPMEM_TX_SETTLUT:
-		case BPMEM_TX_SETLUT_4:
-			break;
-
-		// ---------------------------------------------------
-		// Set the TEV Color
-		// ---------------------------------------------------
-		case BPMEM_TEV_REGISTER_L:   // Reg 1
-		case BPMEM_TEV_REGISTER_H:
-		case BPMEM_TEV_REGISTER_L+2: // Reg 2
-		case BPMEM_TEV_REGISTER_H+2:
-		case BPMEM_TEV_REGISTER_L+4: // Reg 3
-		case BPMEM_TEV_REGISTER_H+4:
-		case BPMEM_TEV_REGISTER_L+6: // Reg 4
-		case BPMEM_TEV_REGISTER_H+6:
-			// some games only send the _L part, so always update
-			// there actually are 2 register behind each of these
-			// addresses, selected by the type bit.
-			{
-				// don't compare with changes!
-				int num = (bp.address >> 1) & 0x3;
-				if ((bp.address & 1) == 0)
-					PixelShaderManager::SetColorChanged(bpmem.tevregs[num].low.type, num, false);
-				else
-					PixelShaderManager::SetColorChanged(bpmem.tevregs[num].high.type, num, true);
-			}
-			break;
-
-		// ------------------------------------------------
-		// On Default, we try to look for other things
-		// before we give up and say its an unknown opcode
-		// again ...
-		// ------------------------------------------------
-		default:
-			switch (bp.address & 0xF0)
-			{
-			// --------------
-			// Indirect Tev
-			// --------------
-			case BPMEM_IND_CMD:
-			case BPMEM_IND_CMD+1:
-			case BPMEM_IND_CMD+2:
-			case BPMEM_IND_CMD+3:
-			case BPMEM_IND_CMD+4:
-			case BPMEM_IND_CMD+5:
-			case BPMEM_IND_CMD+6:
-			case BPMEM_IND_CMD+7:
-			case BPMEM_IND_CMD+8:
-			case BPMEM_IND_CMD+9:
-			case BPMEM_IND_CMD+10:
-			case BPMEM_IND_CMD+11:
-			case BPMEM_IND_CMD+12:
-			case BPMEM_IND_CMD+13:
-			case BPMEM_IND_CMD+14:
-			case BPMEM_IND_CMD+15:
-				break;
-			// --------------------------------------------------
-			// Set Color/Alpha of a Tev
-			// BPMEM_TEV_COLOR_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D
-			// BPMEM_TEV_ALPHA_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D, T Swap, R Swap
-			// --------------------------------------------------
-			case BPMEM_TEV_COLOR_ENV:    // Texture Environment 1
-			case BPMEM_TEV_ALPHA_ENV:
-			case BPMEM_TEV_COLOR_ENV+2:  // Texture Environment 2
-			case BPMEM_TEV_ALPHA_ENV+2:
-			case BPMEM_TEV_COLOR_ENV+4:  // Texture Environment 3
-			case BPMEM_TEV_ALPHA_ENV+4:
-			case BPMEM_TEV_COLOR_ENV+6:  // Texture Environment 4
-			case BPMEM_TEV_ALPHA_ENV+6:
-			case BPMEM_TEV_COLOR_ENV+8:  // Texture Environment 5
-			case BPMEM_TEV_ALPHA_ENV+8:
-			case BPMEM_TEV_COLOR_ENV+10: // Texture Environment 6
-			case BPMEM_TEV_ALPHA_ENV+10:
-			case BPMEM_TEV_COLOR_ENV+12: // Texture Environment 7
-			case BPMEM_TEV_ALPHA_ENV+12:
-			case BPMEM_TEV_COLOR_ENV+14: // Texture Environment 8
-			case BPMEM_TEV_ALPHA_ENV+14:
-			case BPMEM_TEV_COLOR_ENV+16: // Texture Environment 9
-			case BPMEM_TEV_ALPHA_ENV+16:
-			case BPMEM_TEV_COLOR_ENV+18: // Texture Environment 10
-			case BPMEM_TEV_ALPHA_ENV+18:
-			case BPMEM_TEV_COLOR_ENV+20: // Texture Environment 11
-			case BPMEM_TEV_ALPHA_ENV+20:
-			case BPMEM_TEV_COLOR_ENV+22: // Texture Environment 12
-			case BPMEM_TEV_ALPHA_ENV+22:
-			case BPMEM_TEV_COLOR_ENV+24: // Texture Environment 13
-			case BPMEM_TEV_ALPHA_ENV+24:
-			case BPMEM_TEV_COLOR_ENV+26: // Texture Environment 14
-			case BPMEM_TEV_ALPHA_ENV+26:
-			case BPMEM_TEV_COLOR_ENV+28: // Texture Environment 15
-			case BPMEM_TEV_ALPHA_ENV+28:
-			case BPMEM_TEV_COLOR_ENV+30: // Texture Environment 16
-			case BPMEM_TEV_ALPHA_ENV+30:
-				break;
-			default:
-				WARN_LOG(VIDEO, "Unknown BP opcode: address = 0x%08x value = 0x%08x", bp.address, bp.newvalue);
-				break;
-			}
-	}
-}
-}
-
-// Called when loading a saved state.
-void BPReload()
-{
-	// restore anything that goes straight to the renderer.
-	// let's not risk actually replaying any writes.
-	// note that PixelShaderManager is already covered since it has its own DoState.
-	SetGenerationMode();
-	SetScissor();
-	SetLineWidth();
-	SetDepthMode();
-	SetLogicOpMode();
-	SetDitherMode();
-	SetBlendMode();
-	SetColorMask();
-	OnPixelFormatChange();
-	{
-		BPCmd bp = {BPMEM_FIELDMASK, 0xFFFFFF, static_cast<int>(((u32*)&bpmem)[BPMEM_FIELDMASK])};
-		SetInterlacingMode(bp);
-	}
-	{
-		BPCmd bp = {BPMEM_FIELDMODE, 0xFFFFFF, static_cast<int>(((u32*)&bpmem)[BPMEM_FIELDMODE])};
-		SetInterlacingMode(bp);
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/BPStructs.h b/Source/Core/VideoCommon/Src/BPStructs.h
deleted file mode 100644
index 72a0409f8b..0000000000
--- a/Source/Core/VideoCommon/Src/BPStructs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BPSTRUCTS_H_
-#define _BPSTRUCTS_H_
-
-#include "BPMemory.h"
-
-void BPInit();
-void LoadBPReg(u32 value0);
-void BPReload();
-
-#endif // _BPSTRUCTS_H_
diff --git a/Source/Core/VideoCommon/Src/CPMemory.cpp b/Source/Core/VideoCommon/Src/CPMemory.cpp
deleted file mode 100644
index fd8874d156..0000000000
--- a/Source/Core/VideoCommon/Src/CPMemory.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "CPMemory.h"
-
-// CP state
-u8 *cached_arraybases[16];
-
-// STATE_TO_SAVE
-u32 arraybases[16];
-u32 arraystrides[16];
-TMatrixIndexA MatrixIndexA;
-TMatrixIndexB MatrixIndexB;
-TVtxDesc g_VtxDesc;
-// Most games only use the first VtxAttr and simply reconfigure it all the time as needed.
-VAT g_VtxAttr[8];
diff --git a/Source/Core/VideoCommon/Src/CPMemory.h b/Source/Core/VideoCommon/Src/CPMemory.h
deleted file mode 100644
index 28bc3d7d95..0000000000
--- a/Source/Core/VideoCommon/Src/CPMemory.h
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CPMEMORY_H
-#define _CPMEMORY_H
-
-#include "Common.h"
-
-// Vertex array numbers
-enum
-{
-	ARRAY_POSITION	= 0,
-	ARRAY_NORMAL	= 1,
-	ARRAY_COLOR		= 2,
-	ARRAY_COLOR2	= 3,
-	ARRAY_TEXCOORD0	= 4,
-};
-
-// Vertex components
-enum
-{
-	NOT_PRESENT = 0,
-	DIRECT		= 1,
-	INDEX8		= 2,
-	INDEX16		= 3,
-};
-
-enum
-{
-	FORMAT_UBYTE		= 0,	// 2 Cmp
-	FORMAT_BYTE			= 1,	// 3 Cmp
-	FORMAT_USHORT		= 2,
-	FORMAT_SHORT		= 3,
-	FORMAT_FLOAT		= 4,
-};
-
-enum
-{
-	FORMAT_16B_565		= 0,	// NA
-	FORMAT_24B_888		= 1,	
-	FORMAT_32B_888x		= 2,
-	FORMAT_16B_4444		= 3,
-	FORMAT_24B_6666		= 4,
-	FORMAT_32B_8888		= 5,
-};
-
-enum
-{
-	VAT_0_FRACBITS = 0x3e0001f0,
-	VAT_1_FRACBITS = 0x07c3e1f0,
-	VAT_2_FRACBITS = 0xf87c3e1f,
-};
-
-#pragma pack(4)
-union TVtxDesc
-{
-	u64 Hex;
-	struct 
-	{
-		// 0: not present
-		// 1: present
-		u32 PosMatIdx	: 1;
-		u32 Tex0MatIdx	: 1;
-		u32 Tex1MatIdx	: 1;
-		u32 Tex2MatIdx	: 1;
-		u32 Tex3MatIdx	: 1;
-		u32 Tex4MatIdx	: 1;
-		u32 Tex5MatIdx	: 1;
-		u32 Tex6MatIdx	: 1;
-		u32 Tex7MatIdx	: 1;
-
-		// 00: not present 
-		// 01: direct 
-		// 10: 8 bit index 
-		// 11: 16 bit index
-		u32 Position	: 2;
-		u32 Normal		: 2;
-		u32 Color0		: 2;
-		u32 Color1		: 2;
-		u32 Tex0Coord	: 2;
-		u32 Tex1Coord	: 2;
-		u32 Tex2Coord	: 2;
-		u32 Tex3Coord	: 2;
-		u32 Tex4Coord	: 2;
-		u32 Tex5Coord	: 2;
-		u32 Tex6Coord	: 2;
-		u32 Tex7Coord	: 2;
-		u32				:31;
-	};
-
-	struct
-	{
-		u32 Hex0, Hex1;
-	};
-};
-
-union UVAT_group0
-{
-	u32 Hex;
-	struct 
-	{
-		// 0:8
-		u32 PosElements			: 1;
-		u32 PosFormat			: 3; 
-		u32 PosFrac				: 5; 
-		// 9:12
-		u32 NormalElements		: 1; 
-		u32 NormalFormat		: 3; 
-		// 13:16
-		u32 Color0Elements		: 1;
-		u32 Color0Comp			: 3; 
-		// 17:20
-		u32 Color1Elements		: 1;
-		u32 Color1Comp			: 3; 
-		// 21:29
-		u32 Tex0CoordElements	: 1;
-		u32 Tex0CoordFormat		: 3;
-		u32 Tex0Frac			: 5;
-		// 30:31
-		u32 ByteDequant			: 1;
-		u32 NormalIndex3		: 1;
-	};
-};
-
-union UVAT_group1
-{
-	u32 Hex;
-	struct 
-	{
-		// 0:8
-		u32 Tex1CoordElements	: 1;
-		u32 Tex1CoordFormat		: 3;
-		u32 Tex1Frac			: 5;
-		// 9:17
-		u32 Tex2CoordElements	: 1;
-		u32 Tex2CoordFormat		: 3;
-		u32 Tex2Frac			: 5;
-		// 18:26
-		u32 Tex3CoordElements	: 1;
-		u32 Tex3CoordFormat		: 3;
-		u32 Tex3Frac			: 5;
-		// 27:30
-		u32 Tex4CoordElements	: 1;
-		u32 Tex4CoordFormat		: 3;
-		// 
-		u32						: 1;
-	};
-};
-
-union UVAT_group2
-{
-	u32 Hex;
-	struct 
-	{
-		// 0:4
-		u32 Tex4Frac			: 5;
-		// 5:13
-		u32 Tex5CoordElements	: 1;
-		u32 Tex5CoordFormat		: 3;
-		u32 Tex5Frac			: 5;
-		// 14:22
-		u32 Tex6CoordElements	: 1;
-		u32 Tex6CoordFormat		: 3;
-		u32 Tex6Frac			: 5;
-		// 23:31
-		u32 Tex7CoordElements	: 1;
-		u32 Tex7CoordFormat		: 3;
-		u32 Tex7Frac			: 5;
-	};
-};
-
-struct ColorAttr
-{
-	u8 Elements;
-	u8 Comp;
-};
-
-struct TexAttr
-{
-	u8 Elements;
-	u8 Format;
-	u8 Frac;
-};
-
-struct TVtxAttr
-{
-	u8 PosElements;
-	u8 PosFormat; 
-	u8 PosFrac; 
-	u8 NormalElements;
-	u8 NormalFormat; 
-	ColorAttr color[2];
-	TexAttr texCoord[8];
-	u8 ByteDequant;
-	u8 NormalIndex3;
-};
-
-// Matrix indices
-union TMatrixIndexA
-{
-	struct
-	{
-		u32 PosNormalMtxIdx : 6;
-		u32 Tex0MtxIdx : 6;
-		u32 Tex1MtxIdx : 6;
-		u32 Tex2MtxIdx : 6;
-		u32 Tex3MtxIdx : 6;
-	};
-	struct
-	{
-		u32 Hex : 30;
-		u32 unused : 2;
-	};
-};
-
-union TMatrixIndexB
-{
-	struct
-	{
-		u32 Tex4MtxIdx : 6;
-		u32 Tex5MtxIdx : 6;
-		u32 Tex6MtxIdx : 6;
-		u32 Tex7MtxIdx : 6;
-	};
-	struct
-	{
-		u32 Hex : 24;
-		u32 unused : 8;
-	};
-};
-
-#pragma pack()
-
-extern u32 arraybases[16];
-extern u8 *cached_arraybases[16];
-extern u32 arraystrides[16];
-extern TMatrixIndexA MatrixIndexA;
-extern TMatrixIndexB MatrixIndexB;
-
-struct VAT
-{
-	UVAT_group0 g0;
-	UVAT_group1 g1;
-	UVAT_group2 g2;
-};
-
-extern TVtxDesc g_VtxDesc;
-extern VAT g_VtxAttr[8];
-
-// Might move this into its own file later.
-void LoadCPReg(u32 SubCmd, u32 Value);
-
-// Fills memory with data from CP regs
-void FillCPMemoryArray(u32 *memory);
-
-#endif // _CPMEMORY_H
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
deleted file mode 100644
index 5c3848de4f..0000000000
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "VideoConfig.h"
-#include "MathUtil.h"
-#include "Thread.h"
-#include "Atomic.h"
-#include "OpcodeDecoding.h"
-#include "Fifo.h"
-#include "ChunkFile.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "CoreTiming.h"
-#include "ConfigManager.h"
-#include "HW/ProcessorInterface.h"
-#include "HW/GPFifo.h"
-#include "HW/Memmap.h"
-#include "DLCache.h"
-#include "HW/SystemTimers.h"
-#include "Core.h"
-
-namespace CommandProcessor
-{
-
-int et_UpdateInterrupts;
-
-// TODO(ector): Warn on bbox read/write
-
-// STATE_TO_SAVE
-SCPFifoStruct fifo;
-UCPStatusReg m_CPStatusReg;
-UCPCtrlReg	m_CPCtrlReg;
-UCPClearReg	m_CPClearReg;
-
-int m_bboxleft;
-int m_bboxtop;
-int m_bboxright;
-int m_bboxbottom;
-u16 m_tokenReg;
-
-static bool bProcessFifoToLoWatermark = false;
-static bool bProcessFifoAllDistance = false;
-
-volatile bool isPossibleWaitingSetDrawDone = false;
-volatile bool isHiWatermarkActive = false;
-volatile bool isLoWatermarkActive = false;
-volatile bool interruptSet= false;
-volatile bool interruptWaiting= false;
-volatile bool interruptTokenWaiting = false;
-volatile bool interruptFinishWaiting = false;
-volatile bool waitingForPEInterruptDisable = false;
-
-volatile u32 VITicks = CommandProcessor::m_cpClockOrigin;
-
-bool IsOnThread()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
-}
-
-void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
-{
-	UpdateInterrupts(userdata);
-}
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(m_CPStatusReg);
-	p.DoPOD(m_CPCtrlReg);
-	p.DoPOD(m_CPClearReg);
-	p.Do(m_bboxleft);
-	p.Do(m_bboxtop);
-	p.Do(m_bboxright);
-	p.Do(m_bboxbottom);
-	p.Do(m_tokenReg);
-	p.Do(fifo);
-
-	p.Do(bProcessFifoToLoWatermark);
-	p.Do(bProcessFifoAllDistance);
-	p.Do(isHiWatermarkActive);
-	p.Do(isLoWatermarkActive);
-	p.Do(isPossibleWaitingSetDrawDone);
-	p.Do(interruptSet);
-	p.Do(interruptWaiting);
-	p.Do(interruptTokenWaiting);
-	p.Do(interruptFinishWaiting);
-}
-
-inline void WriteLow (volatile u32& _reg, u16 lowbits)  {Common::AtomicStore(_reg,(_reg & 0xFFFF0000) | lowbits);}
-inline void WriteHigh(volatile u32& _reg, u16 highbits) {Common::AtomicStore(_reg,(_reg & 0x0000FFFF) | ((u32)highbits << 16));}
-
-inline u16 ReadLow  (u32 _reg)  {return (u16)(_reg & 0xFFFF);}
-inline u16 ReadHigh (u32 _reg)  {return (u16)(_reg >> 16);}
-
-void Init()
-{
-	m_CPStatusReg.Hex = 0;
-	m_CPStatusReg.CommandIdle = 1;
-	m_CPStatusReg.ReadIdle = 1;
-
-	m_CPCtrlReg.Hex = 0;
-
-	m_CPClearReg.Hex = 0;
-
-	m_bboxleft = 0;
-	m_bboxtop  = 0;
-	m_bboxright = 640;
-	m_bboxbottom = 480;
-
-	m_tokenReg = 0;
-	
-	memset(&fifo,0,sizeof(fifo));
-	fifo.CPCmdIdle  = 1;
-	fifo.CPReadIdle = 1;
-	fifo.bFF_Breakpoint = 0;
-	fifo.bFF_HiWatermark = 0;
-	fifo.bFF_HiWatermarkInt = 0;
-	fifo.bFF_LoWatermark = 0;
-	fifo.bFF_LoWatermarkInt = 0;
-
-	interruptSet = false;
-	interruptWaiting = false;
-	interruptFinishWaiting = false;
-	interruptTokenWaiting = false;
-
-	bProcessFifoToLoWatermark = false;
-	bProcessFifoAllDistance = false;
-	isPossibleWaitingSetDrawDone = false;
-	isHiWatermarkActive = false;
-	isLoWatermarkActive = false;
-
-	et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
-}
-
-void Read16(u16& _rReturnValue, const u32 _Address)
-{
-	INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address);
-	switch (_Address & 0xFFF)
-	{
-	case STATUS_REGISTER:
-		SetCpStatusRegister();
-		_rReturnValue = m_CPStatusReg.Hex;
-		return;
-	case CTRL_REGISTER:		_rReturnValue = m_CPCtrlReg.Hex; return;
-	case CLEAR_REGISTER:
-		_rReturnValue = m_CPClearReg.Hex;
-		PanicAlert("CommandProcessor:: CPU reads from CLEAR_REGISTER!");
-		ERROR_LOG(COMMANDPROCESSOR, "(r) clear: 0x%04x", _rReturnValue);
-		return;
-	case FIFO_TOKEN_REGISTER:		_rReturnValue = m_tokenReg; return;
-	case FIFO_BOUNDING_BOX_LEFT:	_rReturnValue = m_bboxleft; return;
-	case FIFO_BOUNDING_BOX_RIGHT:	_rReturnValue = m_bboxright; return;
-	case FIFO_BOUNDING_BOX_TOP:		_rReturnValue = m_bboxtop; return;
-	case FIFO_BOUNDING_BOX_BOTTOM:	_rReturnValue = m_bboxbottom; return;
-
-	case FIFO_BASE_LO:			_rReturnValue = ReadLow (fifo.CPBase); return;
-	case FIFO_BASE_HI:			_rReturnValue = ReadHigh(fifo.CPBase); return;
-	case FIFO_END_LO:			_rReturnValue = ReadLow (fifo.CPEnd);  return;
-	case FIFO_END_HI:			_rReturnValue = ReadHigh(fifo.CPEnd);  return;
-	case FIFO_HI_WATERMARK_LO:	_rReturnValue = ReadLow (fifo.CPHiWatermark); return;
-	case FIFO_HI_WATERMARK_HI:	_rReturnValue = ReadHigh(fifo.CPHiWatermark); return;
-	case FIFO_LO_WATERMARK_LO:	_rReturnValue = ReadLow (fifo.CPLoWatermark); return;
-	case FIFO_LO_WATERMARK_HI:	_rReturnValue = ReadHigh(fifo.CPLoWatermark); return;
-
-	case FIFO_RW_DISTANCE_LO:
-		if (IsOnThread())
-		{
-			if(fifo.CPWritePointer >= fifo.SafeCPReadPointer)
-				_rReturnValue = ReadLow (fifo.CPWritePointer - fifo.SafeCPReadPointer);
-			else
-				_rReturnValue = ReadLow (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
-		}
-		else
-		{
-			_rReturnValue = ReadLow (fifo.CPReadWriteDistance);
-		}
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue);
-		return;
-	case FIFO_RW_DISTANCE_HI:
-		if (IsOnThread())
-		{
-			if(fifo.CPWritePointer >= fifo.SafeCPReadPointer)
-				_rReturnValue = ReadHigh (fifo.CPWritePointer - fifo.SafeCPReadPointer);
-			else
-				_rReturnValue = ReadHigh (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
-		}
-		else
-		{
-			_rReturnValue = ReadHigh(fifo.CPReadWriteDistance);
-		}
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue);
-		return;
-	case FIFO_WRITE_POINTER_LO:
-		_rReturnValue = ReadLow (fifo.CPWritePointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_LO : %04x", _rReturnValue);
-		return;
-	case FIFO_WRITE_POINTER_HI:
-		_rReturnValue = ReadHigh(fifo.CPWritePointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_HI : %04x", _rReturnValue);
-		return;
-	case FIFO_READ_POINTER_LO:
-		if (IsOnThread())
-			_rReturnValue = ReadLow (fifo.SafeCPReadPointer);
-		else
-			_rReturnValue = ReadLow (fifo.CPReadPointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
-		return;
-	case FIFO_READ_POINTER_HI:
-		if (IsOnThread())
-			_rReturnValue = ReadHigh (fifo.SafeCPReadPointer);
-		else
-			_rReturnValue = ReadHigh (fifo.CPReadPointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
-		return;
-
-	case FIFO_BP_LO: _rReturnValue = ReadLow (fifo.CPBreakpoint); return;
-	case FIFO_BP_HI: _rReturnValue = ReadHigh(fifo.CPBreakpoint); return;
-
-	case XF_RASBUSY_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_RASBUSY_L: %04x", _rReturnValue);
-		return;
-	case XF_RASBUSY_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_RASBUSY_H: %04x", _rReturnValue);
-		return;
-
-	case XF_CLKS_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_CLKS_L: %04x", _rReturnValue);
-		return;
-	case XF_CLKS_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_CLKS_H: %04x", _rReturnValue);
-		return;
-
-	case XF_WAIT_IN_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_WAIT_IN_L: %04x", _rReturnValue);
-		return;
-	case XF_WAIT_IN_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_WAIT_IN_H: %04x", _rReturnValue);
-		return;
-
-	case XF_WAIT_OUT_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_WAIT_OUT_L: %04x", _rReturnValue);
-		return;
-	case XF_WAIT_OUT_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from XF_WAIT_OUT_H: %04x", _rReturnValue);
-		return;
-
-	case VCACHE_METRIC_CHECK_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_CHECK_L: %04x", _rReturnValue);
-		return;
-	case VCACHE_METRIC_CHECK_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_CHECK_H: %04x", _rReturnValue);
-		return;
-
-	case VCACHE_METRIC_MISS_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_MISS_L: %04x", _rReturnValue);
-		return;
-	case VCACHE_METRIC_MISS_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_MISS_H: %04x", _rReturnValue);
-		return;
-
-	case VCACHE_METRIC_STALL_L:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_STALL_L: %04x", _rReturnValue);
-		return;
-	case VCACHE_METRIC_STALL_H:
-		_rReturnValue = 0;	// TODO: Figure out the true value
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from VCACHE_METRIC_STALL_H: %04x", _rReturnValue);
-		return;
-
-	case CLKS_PER_VTX_OUT:
-		_rReturnValue = 4; //Number of clocks per vertex.. TODO: Calculate properly
-		DEBUG_LOG(COMMANDPROCESSOR, "Read from CLKS_PER_VTX_OUT: %04x", _rReturnValue);
-		return;
-	default:
-		_rReturnValue = 0;
-		WARN_LOG(COMMANDPROCESSOR, "(r16) unknown CP reg @ %08x", _Address);
-		return;
-	}
-
-	return;
-}
-
-void Write16(const u16 _Value, const u32 _Address)
-{
-	INFO_LOG(COMMANDPROCESSOR, "(write16): 0x%04x @ 0x%08x",_Value,_Address);
-
-	switch (_Address & 0xFFF)
-	{
-	case STATUS_REGISTER:
-		{
-			// This should be Read-Only
-			ERROR_LOG(COMMANDPROCESSOR,"\t write to STATUS_REGISTER : %04x", _Value);
-			PanicAlert("CommandProcessor:: CPU writes to STATUS_REGISTER!");
-		}
-		break;
-
-	case CTRL_REGISTER:
-		{
-			UCPCtrlReg tmpCtrl(_Value);
-			m_CPCtrlReg.Hex = tmpCtrl.Hex;
-			INFO_LOG(COMMANDPROCESSOR,"\t Write to CTRL_REGISTER : %04x", _Value);
-			SetCpControlRegister();
-		}
-		break;
-
-	case CLEAR_REGISTER:
-		{
-			UCPClearReg tmpCtrl(_Value);
-			m_CPClearReg.Hex = tmpCtrl.Hex;
-			DEBUG_LOG(COMMANDPROCESSOR,"\t Write to CLEAR_REGISTER : %04x", _Value);
-			SetCpClearRegister();
-		}
-		break;
-
-	case PERF_SELECT:
-		// Seems to select which set of perf registers should be exposed.
-		DEBUG_LOG(COMMANDPROCESSOR, "Write to PERF_SELECT: %04x", _Value);
-		break;
-
-	// Fifo Registers
-	case FIFO_TOKEN_REGISTER:
-		m_tokenReg = _Value;
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_TOKEN_REGISTER : %04x", _Value);
-		break;
-	case FIFO_BASE_LO:
-		WriteLow ((u32 &)fifo.CPBase, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_LO : %04x", _Value);
-		break;
-	case FIFO_BASE_HI:
-		WriteHigh((u32 &)fifo.CPBase, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_HI : %04x", _Value);
-		break;
-
-	case FIFO_END_LO:
-		WriteLow ((u32 &)fifo.CPEnd,  _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_LO : %04x", _Value);
-		break;
-	case FIFO_END_HI:
-		WriteHigh((u32 &)fifo.CPEnd,  _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_HI : %04x", _Value);
-		break;
-
-	case FIFO_WRITE_POINTER_LO:
-		WriteLow ((u32 &)fifo.CPWritePointer, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_LO : %04x", _Value);
-		break;
-	case FIFO_WRITE_POINTER_HI:
-		WriteHigh((u32 &)fifo.CPWritePointer, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_HI : %04x", _Value);
-		break;
-
-	case FIFO_READ_POINTER_LO:
-		WriteLow ((u32 &)fifo.CPReadPointer, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_LO : %04x", _Value);
-		break;
-	case FIFO_READ_POINTER_HI:
-		WriteHigh((u32 &)fifo.CPReadPointer, _Value);
-		fifo.SafeCPReadPointer = fifo.CPReadPointer;
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_HI : %04x", _Value);
-		break;
-
-	case FIFO_HI_WATERMARK_LO:
-		WriteLow ((u32 &)fifo.CPHiWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_LO : %04x", _Value);
-		break;
-	case FIFO_HI_WATERMARK_HI:
-		WriteHigh((u32 &)fifo.CPHiWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_HI : %04x", _Value);
-		break;
-
-	case FIFO_LO_WATERMARK_LO:
-		WriteLow ((u32 &)fifo.CPLoWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_LO : %04x", _Value);
-		break;
-	case FIFO_LO_WATERMARK_HI:
-		WriteHigh((u32 &)fifo.CPLoWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_HI : %04x", _Value);
-		break;
-
-	case FIFO_BP_LO:
-		WriteLow ((u32 &)fifo.CPBreakpoint, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_LO : %04x", _Value);
-		break;
-	case FIFO_BP_HI:
-		WriteHigh((u32 &)fifo.CPBreakpoint, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_HI : %04x", _Value);
-		break;
-
-	case FIFO_RW_DISTANCE_HI:
-		WriteHigh((u32 &)fifo.CPReadWriteDistance, _Value);
-		if (fifo.CPReadWriteDistance == 0)
-		{
-			GPFifo::ResetGatherPipe();
-			ResetVideoBuffer();
-		}
-		else
-		{
-			ResetVideoBuffer();
-		}
-		IncrementCheckContextId();
-		DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_HI : %04x", _Value);
-		break;
-	case FIFO_RW_DISTANCE_LO:
-		WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_LO : %04x", _Value);
-		break;
-
-	default:
-		WARN_LOG(COMMANDPROCESSOR, "(w16) unknown CP reg write %04x @ %08x", _Value, _Address);
-	}
-
-	if (!IsOnThread())
-		RunGpu();
-}
-
-void Read32(u32& _rReturnValue, const u32 _Address)
-{
-	_rReturnValue = 0;
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProccessor at 0x%08x", _Address);
-}
-
-void Write32(const u32 _Data, const u32 _Address)
-{
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProccessor at 0x%08x", _Address);
-}
-
-void STACKALIGN GatherPipeBursted()
-{
-	ProcessFifoEvents();
-	// if we aren't linked, we don't care about gather pipe data
-	if (!m_CPCtrlReg.GPLinkEnable)
-	{
-		if (!IsOnThread())
-		{
-			RunGpu();
-		}
-		else
-		{
-			// In multibuffer mode is not allowed write in the same FIFO attached to the GPU.
-			// Fix Pokemon XD in DC mode.
-			if((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) && (ProcessorInterface::Fifo_CPUBase == fifo.CPBase)
-				 && fifo.CPReadWriteDistance > 0)
-			{
-				waitingForPEInterruptDisable = true;
-				ProcessFifoAllDistance();
-				waitingForPEInterruptDisable = false;
-			}
-		}
-		return;
-	}
-
-	if (IsOnThread())
-		SetCpStatus(true);
-
-	// update the fifo pointer
-	if (fifo.CPWritePointer >= fifo.CPEnd)
-		fifo.CPWritePointer = fifo.CPBase;
-	else
-		fifo.CPWritePointer += GATHER_PIPE_SIZE;
-
-	Common::AtomicAdd(fifo.CPReadWriteDistance, GATHER_PIPE_SIZE);
-
-	if (!IsOnThread())
-		RunGpu();
-
-	_assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase,
-	"FIFO is overflowed by GatherPipe !\nCPU thread is too fast!");
-
-	// check if we are in sync
-	_assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer	== ProcessorInterface::Fifo_CPUWritePointer, "FIFOs linked but out of sync");
-	_assert_msg_(COMMANDPROCESSOR, fifo.CPBase			== ProcessorInterface::Fifo_CPUBase, "FIFOs linked but out of sync");
-	_assert_msg_(COMMANDPROCESSOR, fifo.CPEnd			== ProcessorInterface::Fifo_CPUEnd, "FIFOs linked but out of sync");
-}
-
-void UpdateInterrupts(u64 userdata)
-{
-	if (userdata)
-	{
-		interruptSet = true;
-		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
-	}
-	else
-	{
-		interruptSet = false;
-		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
-	}
-	interruptWaiting = false;
-}
-
-void UpdateInterruptsFromVideoBackend(u64 userdata)
-{
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
-}
-
-// This is called by the ProcessorInterface when PI_FIFO_RESET is written to.
-void AbortFrame()
-{
-
-}
-
-void SetCpStatus(bool isCPUThread)
-{
-	// overflow & underflow check
-	fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark);
-	fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark);
-
-	// breakpoint
-	if (!isCPUThread)
-	{
-		if (fifo.bFF_BPEnable)
-		{
-			if (fifo.CPBreakpoint == fifo.CPReadPointer)
-			{
-				if (!fifo.bFF_Breakpoint)
-				{
-					INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer);
-					fifo.bFF_Breakpoint = true;
-					IncrementCheckContextId();
-				}
-			}
-			else
-			{
-				if (fifo.bFF_Breakpoint)
-					INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer);
-				fifo.bFF_Breakpoint = false;
-			}
-		}
-		else
-		{
-			if (fifo.bFF_Breakpoint)
-				INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer);
-			fifo.bFF_Breakpoint = false;
-		}
-	}
-
-	bool bpInt = fifo.bFF_Breakpoint && fifo.bFF_BPInt;
-	bool ovfInt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt;
-	bool undfInt = fifo.bFF_LoWatermark && fifo.bFF_LoWatermarkInt;
-
-	bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable;
-
-	isHiWatermarkActive = ovfInt && m_CPCtrlReg.GPReadEnable;
-	isLoWatermarkActive = undfInt && m_CPCtrlReg.GPReadEnable;
-
-	if (interrupt != interruptSet && !interruptWaiting)
-	{
-		u64 userdata = interrupt?1:0;
-		if (IsOnThread())
-		{
-			if (!interrupt || bpInt || undfInt || ovfInt)
-			{
-				if (!isCPUThread)
-				{
-					// GPU thread:
-					interruptWaiting = true;
-					CommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
-				}
-				else
-				{
-					// CPU thread:
-					interruptSet = interrupt;
-					INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
-					ProcessorInterface::SetInterrupt(INT_CAUSE_CP, interrupt);
-				}
-			}
-		}
-		else
-		{
-			CommandProcessor::UpdateInterrupts(userdata);
-		}
-	}
-}
-
-void ProcessFifoToLoWatermark()
-{
-	if (IsOnThread())
-	{
-		while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable &&
-			fifo.CPReadWriteDistance > fifo.CPLoWatermark && !AtBreakpoint())
-			Common::YieldCPU();
-	}
-	bProcessFifoToLoWatermark = false;
-}
-
-void ProcessFifoAllDistance()
-{
-	if (IsOnThread())
-	{
-		while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable &&
-			fifo.CPReadWriteDistance && !AtBreakpoint())
-			Common::YieldCPU();
-	}
-	bProcessFifoAllDistance = false;
-}
-
-void ProcessFifoEvents()
-{
-	if (IsOnThread() && (interruptWaiting || interruptFinishWaiting || interruptTokenWaiting))
-		CoreTiming::ProcessFifoWaitEvents();
-}
-
-void Shutdown()
-{
- 
-}
-
-void SetCpStatusRegister()
-{
-	// Here always there is one fifo attached to the GPU
-	m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint;
-	m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance ||  AtBreakpoint() || (fifo.CPReadPointer == fifo.CPWritePointer);
-	m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || AtBreakpoint() || !fifo.bFF_GPReadEnable;
-	m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark;
-	m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark;
-
-	INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex);
-	DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s"
-		, m_CPStatusReg.Breakpoint ?			"ON" : "OFF"
-		, m_CPStatusReg.ReadIdle ?				"ON" : "OFF"
-		, m_CPStatusReg.CommandIdle ?			"ON" : "OFF"
-		, m_CPStatusReg.OverflowHiWatermark ?	"ON" : "OFF"
-		, m_CPStatusReg.UnderflowLoWatermark ?	"ON" : "OFF"
-			);
-}
-
-void SetCpControlRegister()
-{
-	// If the new fifo is being attached, force an exception check
-	// This fixes the hang while booting Eternal Darkness
-	if (!fifo.bFF_GPReadEnable && m_CPCtrlReg.GPReadEnable && !m_CPCtrlReg.BPEnable)
-	{
-		CoreTiming::ForceExceptionCheck(0);
-	}
-
-	fifo.bFF_BPInt = m_CPCtrlReg.BPInt;
-	fifo.bFF_BPEnable = m_CPCtrlReg.BPEnable;
-	fifo.bFF_HiWatermarkInt = m_CPCtrlReg.FifoOverflowIntEnable;
-	fifo.bFF_LoWatermarkInt = m_CPCtrlReg.FifoUnderflowIntEnable;
-	fifo.bFF_GPLinkEnable = m_CPCtrlReg.GPLinkEnable;
-
-	if(m_CPCtrlReg.GPReadEnable && m_CPCtrlReg.GPLinkEnable)
-	{
-		ProcessorInterface::Fifo_CPUWritePointer = fifo.CPWritePointer;
-		ProcessorInterface::Fifo_CPUBase = fifo.CPBase;
-		ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd;
-	}
-			
-	if(fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable)
-	{
-		fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable;
-		while(fifo.isGpuReadingData) Common::YieldCPU();
-	}
-	else
-	{
-		fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable;
-	}
-
-	DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | BP %s | Int %s | OvF %s | UndF %s | LINK %s"
-		, fifo.bFF_GPReadEnable ?				"ON" : "OFF"
-		, fifo.bFF_BPEnable ?					"ON" : "OFF"
-		, fifo.bFF_BPInt ?						"ON" : "OFF"
-		, m_CPCtrlReg.FifoOverflowIntEnable ?	"ON" : "OFF"
-		, m_CPCtrlReg.FifoUnderflowIntEnable ?	"ON" : "OFF"
-		, m_CPCtrlReg.GPLinkEnable ?			"ON" : "OFF"
-		);
-
-}
-
-// NOTE: The implementation of this function should be correct, but we intentionally aren't using it at the moment.
-// We don't emulate proper GP timing anyway at the moment, so this code would just slow down emulation.
-void SetCpClearRegister()
-{
-//	if (IsOnThread())
-//	{
-//		if (!m_CPClearReg.ClearFifoUnderflow && m_CPClearReg.ClearFifoOverflow)
-//			bProcessFifoToLoWatermark = true;
-//	}
-}
-
-void Update()
-{
-	while (VITicks > m_cpClockOrigin && fifo.isGpuReadingData && IsOnThread())
-		Common::YieldCPU();
-
-	if (fifo.isGpuReadingData)
-		Common::AtomicAdd(VITicks, SystemTimers::GetTicksPerSecond() / 10000);
-}
-} // end of namespace CommandProcessor
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h
deleted file mode 100644
index ce18da4686..0000000000
--- a/Source/Core/VideoCommon/Src/CommandProcessor.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COMMANDPROCESSOR_H
-#define _COMMANDPROCESSOR_H
-
-#include "Common.h"
-#include "VideoBackendBase.h"
-
-class PointerWrap;
-
-extern bool MT;
-
-namespace CommandProcessor
-{
-
-extern SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread.
-extern volatile bool isPossibleWaitingSetDrawDone; //This one is used for sync gfx thread and emulator thread.
-extern volatile bool isHiWatermarkActive;
-extern volatile bool isLoWatermarkActive;
-extern volatile bool interruptSet;
-extern volatile bool interruptWaiting;
-extern volatile bool interruptTokenWaiting;
-extern volatile bool interruptFinishWaiting;
-extern volatile bool waitingForPEInterruptDisable;
- 
-// internal hardware addresses
-enum
-{
-	STATUS_REGISTER				= 0x00,
-	CTRL_REGISTER				= 0x02,
-	CLEAR_REGISTER				= 0x04,
-	PERF_SELECT					= 0x06,
-	FIFO_TOKEN_REGISTER			= 0x0E,
-	FIFO_BOUNDING_BOX_LEFT		= 0x10,
-	FIFO_BOUNDING_BOX_RIGHT		= 0x12,
-	FIFO_BOUNDING_BOX_TOP		= 0x14,
-	FIFO_BOUNDING_BOX_BOTTOM	= 0x16,
-	FIFO_BASE_LO				= 0x20,
-	FIFO_BASE_HI				= 0x22,
-	FIFO_END_LO					= 0x24,
-	FIFO_END_HI					= 0x26,
-	FIFO_HI_WATERMARK_LO		= 0x28,
-	FIFO_HI_WATERMARK_HI		= 0x2a,
-	FIFO_LO_WATERMARK_LO		= 0x2c,
-	FIFO_LO_WATERMARK_HI		= 0x2e,
-	FIFO_RW_DISTANCE_LO			= 0x30,
-	FIFO_RW_DISTANCE_HI			= 0x32,
-	FIFO_WRITE_POINTER_LO		= 0x34,
-	FIFO_WRITE_POINTER_HI		= 0x36,
-	FIFO_READ_POINTER_LO		= 0x38,
-	FIFO_READ_POINTER_HI		= 0x3A,
-	FIFO_BP_LO					= 0x3C,
-	FIFO_BP_HI					= 0x3E,
-	XF_RASBUSY_L				= 0x40,
-	XF_RASBUSY_H				= 0x42,
-	XF_CLKS_L					= 0x44,
-	XF_CLKS_H					= 0x46,
-	XF_WAIT_IN_L				= 0x48,
-	XF_WAIT_IN_H				= 0x4a,
-	XF_WAIT_OUT_L				= 0x4c,
-	XF_WAIT_OUT_H				= 0x4e,
-	VCACHE_METRIC_CHECK_L		= 0x50,
-	VCACHE_METRIC_CHECK_H		= 0x52,
-	VCACHE_METRIC_MISS_L		= 0x54,
-	VCACHE_METRIC_MISS_H		= 0x56,
-	VCACHE_METRIC_STALL_L		= 0x58,
-	VCACHE_METRIC_STALL_H		= 0x5A,
-	CLKS_PER_VTX_IN_L			= 0x60,
-	CLKS_PER_VTX_IN_H			= 0x62,
-	CLKS_PER_VTX_OUT			= 0x64,
-};
-
-enum
-{
-	GATHER_PIPE_SIZE = 32,
-	INT_CAUSE_CP =  0x800
-};
-
-// Fifo Status Register
-union UCPStatusReg
-{
-	struct
-	{
-		u16 OverflowHiWatermark	:	1;
-		u16 UnderflowLoWatermark:	1;
-		u16 ReadIdle			:	1;
-		u16 CommandIdle			:	1;
-		u16 Breakpoint			:	1;
-		u16						:	11;
-	};
-	u16 Hex;
-	UCPStatusReg() {Hex = 0; }
-	UCPStatusReg(u16 _hex) {Hex = _hex; }
-};
-
-// Fifo Control Register
-union UCPCtrlReg
-{
-	struct
-	{
-		u16 GPReadEnable			:	1;
-		u16 BPEnable				:	1;
-		u16 FifoOverflowIntEnable	:	1;
-		u16 FifoUnderflowIntEnable	:	1;
-		u16 GPLinkEnable			:	1;
-		u16 BPInt					:	1;
-		u16							:	10;
-	};
-	u16 Hex;
-	UCPCtrlReg() {Hex = 0; }
-	UCPCtrlReg(u16 _hex) {Hex = _hex; }
-};
-
-// Fifo Clear Register
-union UCPClearReg
-{
-	struct
-	{
-		u16 ClearFifoOverflow		:	1;
-		u16 ClearFifoUnderflow		:	1;
-		u16 ClearMetrices			:	1;
-		u16							:	13;
-	};
-	u16 Hex;
-	UCPClearReg() {Hex = 0; }
-	UCPClearReg(u16 _hex) {Hex = _hex; }
-};
-
-// Can be any number, low enough to not be below the number of clocks executed by the GPU per CP_PERIOD
-const static u32 m_cpClockOrigin = 200000;
-
-// Init
-void Init();
-void Shutdown();
-void DoState(PointerWrap &p);
-
-// Read
-void Read16(u16& _rReturnValue, const u32 _Address);
-void Write16(const u16 _Data, const u32 _Address);
-void Read32(u32& _rReturnValue, const u32 _Address);
-void Write32(const u32 _Data, const u32 _Address);
-
-void SetCpStatus(bool isCPUThread = false);
-void GatherPipeBursted();
-void UpdateInterrupts(u64 userdata);
-void UpdateInterruptsFromVideoBackend(u64 userdata);
-
-bool AllowIdleSkipping();
-
-void SetCpClearRegister();
-void SetCpControlRegister();
-void SetCpStatusRegister();
-void ProcessFifoToLoWatermark();
-void ProcessFifoAllDistance();
-void ProcessFifoEvents();
-void AbortFrame();
-
-void Update();
-extern volatile u32 VITicks;
-
-} // namespace CommandProcessor
-
-#endif // _COMMANDPROCESSOR_H
-
-
diff --git a/Source/Core/VideoCommon/Src/DLCache.h b/Source/Core/VideoCommon/Src/DLCache.h
deleted file mode 100644
index 3e12c24ad8..0000000000
--- a/Source/Core/VideoCommon/Src/DLCache.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DLCACHE_H
-#define _DLCACHE_H
-
-bool HandleDisplayList(u32 address, u32 size);
-void IncrementCheckContextId();
-
-namespace DLCache {
-
-void Init();
-void Shutdown();
-void ProgressiveCleanup();
-void Clear();
-
-}  // namespace
-
-#endif  // _DLCACHE_H
diff --git a/Source/Core/VideoCommon/Src/DataReader.h b/Source/Core/VideoCommon/Src/DataReader.h
deleted file mode 100644
index 3488642385..0000000000
--- a/Source/Core/VideoCommon/Src/DataReader.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DATAREADER_H
-#define _DATAREADER_H
-
-#include "VertexManagerBase.h"
-
-extern u8* g_pVideoData;
-
-#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-__forceinline void DataSkip(u32 skip)
-{
-	g_pVideoData += skip;
-}
-
-// probably unnecessary
-template <int count>
-__forceinline void DataSkip()
-{
-	g_pVideoData += count;
-}
-
-template <typename T>
-__forceinline T DataPeek(int _uOffset)
-{
-	auto const result = Common::FromBigEndian(*reinterpret_cast<T*>(g_pVideoData + _uOffset));
-	return result;
-}
-
-// TODO: kill these
-__forceinline u8 DataPeek8(int _uOffset)
-{
-	return DataPeek<u8>(_uOffset);
-}
-
-__forceinline u16 DataPeek16(int _uOffset)
-{
-	return DataPeek<u16>(_uOffset);
-}
-
-__forceinline u32 DataPeek32(int _uOffset)	
-{
-	return DataPeek<u32>(_uOffset);
-}
-
-template <typename T>
-__forceinline T DataRead()
-{
-	auto const result = DataPeek<T>(0);
-	DataSkip<sizeof(T)>();
-	return result;
-}
-
-// TODO: kill these
-__forceinline u8 DataReadU8()
-{
-	return DataRead<u8>();
-}
-
-__forceinline s8 DataReadS8()
-{
-	return DataRead<s8>();
-}
-
-__forceinline u16 DataReadU16()
-{
-	return DataRead<u16>();
-}
-
-__forceinline u32 DataReadU32()
-{
-	return DataRead<u32>();
-}
-
-typedef void (*DataReadU32xNfunc)(u32 *buf);
-extern DataReadU32xNfunc DataReadU32xFuncs[16];
-
-#if _M_SSE >= 0x301
-const __m128i bs_mask = _mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL, 0x04050607L, 0x00010203L);
-
-template<unsigned int N>
-void DataReadU32xN_SSSE3(u32 *bufx16)
-{
-	memcpy(bufx16, g_pVideoData, sizeof(u32) * N);
-	__m128i* buf = (__m128i *)bufx16;
-	if (N>12) { _mm_store_si128(buf, _mm_shuffle_epi8(_mm_load_si128(buf), bs_mask)); buf++; }
-	if (N>8)  { _mm_store_si128(buf, _mm_shuffle_epi8(_mm_load_si128(buf), bs_mask)); buf++; }
-	if (N>4)  { _mm_store_si128(buf, _mm_shuffle_epi8(_mm_load_si128(buf), bs_mask)); buf++; }
-	_mm_store_si128(buf, _mm_shuffle_epi8(_mm_load_si128(buf), bs_mask));
-	g_pVideoData += (sizeof(u32) * N);
-}
-
-#endif
-
-template<unsigned int N>
-void DataReadU32xN(u32 *bufx16)
-{
-	memcpy(bufx16, g_pVideoData, sizeof(u32) * N);
-	if (N >= 1) bufx16[0] = Common::swap32(bufx16[0]);
-	if (N >= 2) bufx16[1] = Common::swap32(bufx16[1]);
-	if (N >= 3) bufx16[2] = Common::swap32(bufx16[2]);
-	if (N >= 4) bufx16[3] = Common::swap32(bufx16[3]);
-	if (N >= 5) bufx16[4] = Common::swap32(bufx16[4]);
-	if (N >= 6) bufx16[5] = Common::swap32(bufx16[5]);
-	if (N >= 7) bufx16[6] = Common::swap32(bufx16[6]);
-	if (N >= 8) bufx16[7] = Common::swap32(bufx16[7]);
-	if (N >= 9) bufx16[8] = Common::swap32(bufx16[8]);
-	if (N >= 10) bufx16[9] = Common::swap32(bufx16[9]);
-	if (N >= 11) bufx16[10] = Common::swap32(bufx16[10]);
-	if (N >= 12) bufx16[11] = Common::swap32(bufx16[11]);
-	if (N >= 13) bufx16[12] = Common::swap32(bufx16[12]);
-	if (N >= 14) bufx16[13] = Common::swap32(bufx16[13]);
-	if (N >= 15) bufx16[14] = Common::swap32(bufx16[14]);
-	if (N >= 16) bufx16[15] = Common::swap32(bufx16[15]);
-	g_pVideoData += (sizeof(u32) * N);
-}
-
-__forceinline u32 DataReadU32Unswapped()
-{
-	u32 tmp = *(u32*)g_pVideoData;
-	g_pVideoData += 4;
-	return tmp;
-}
-
-__forceinline u8* DataGetPosition()
-{
-	return g_pVideoData;
-}
-
-template <typename T>
-__forceinline void DataWrite(T data)
-{
-	*(T*)VertexManager::s_pCurBufferPointer = data;
-	VertexManager::s_pCurBufferPointer += sizeof(T);
-}
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
deleted file mode 100644
index 85a9ba61f6..0000000000
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "IniFile.h"
-#include "Debugger.h"
-#include "FileUtil.h"
-
-#include "VideoConfig.h"
-#include "TextureCacheBase.h"
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
-#include "NativeVertexFormat.h"
-
-//void UpdateFPSDisplay(const char *text);
-extern NativeVertexFormat *g_nativeVertexFmt;
-
-GFXDebuggerBase *g_pdebugger = NULL;
-volatile bool GFXDebuggerPauseFlag = false; // if true, the GFX thread will be spin locked until it's false again
-volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE; // Event which will trigger spin locking the GFX thread
-volatile int GFXDebuggerEventToPauseCount = 0; // Number of events to wait for until GFX thread will be paused
-
-void GFXDebuggerUpdateScreen()
-{
-	// TODO: Implement this in a backend-independent way
-/*	// update screen
-	if (D3D::bFrameInProgress)
-	{
-		D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
-		D3D::dev->SetDepthStencilSurface(NULL);
-
-		D3D::dev->StretchRect(FramebufferManager::GetEFBColorRTSurface(), NULL,
-			D3D::GetBackBufferSurface(), NULL,
-			D3DTEXF_LINEAR);
-
-		D3D::dev->EndScene();
-		D3D::dev->Present(NULL, NULL, NULL, NULL);
-
-		D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-		D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-		D3D::dev->BeginScene();
-	}
-	else
-	{
-		D3D::dev->EndScene();
-		D3D::dev->Present(NULL, NULL, NULL, NULL);
-		D3D::dev->BeginScene();
-	}*/
-}
-
-// GFX thread
-void GFXDebuggerCheckAndPause(bool update)
-{
-	if (GFXDebuggerPauseFlag)
-	{
-		g_pdebugger->OnPause();
-		while( GFXDebuggerPauseFlag )
-		{
-			g_video_backend->UpdateFPSDisplay("Paused by Video Debugger");
-
-			if (update)	GFXDebuggerUpdateScreen();
-			SLEEP(5);
-		}
-		g_pdebugger->OnContinue();
-	}
-}
-
-// GFX thread
-void GFXDebuggerToPause(bool update)
-{
-	GFXDebuggerToPauseAtNext = NOT_PAUSE;
-	GFXDebuggerPauseFlag = true;
-	GFXDebuggerCheckAndPause(update);
-}
-
-void ContinueGFXDebugger()
-{
-	GFXDebuggerPauseFlag = false;
-}
-
-
-void GFXDebuggerBase::DumpPixelShader(const char* path)
-{
-	char filename[MAX_PATH];
-	sprintf(filename, "%sdump_ps.txt", path);
-
-	std::string output;
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	if (!useDstAlpha)
-	{
-		output = "Destination alpha disabled:\n";
-///		output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
-	}
-	else
-	{
-		if(g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
-		{
-			output = "Using dual source blending for destination alpha:\n";
-///			output += GeneratePixelShaderCode(DSTALPHA_DUAL_SOURCE_BLEND, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
-		}
-		else
-		{
-			output = "Using two passes for emulating destination alpha:\n";
-///			output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
-			output += "\n\nDestination alpha pass shader:\n";
-///			output += GeneratePixelShaderCode(DSTALPHA_ALPHA_PASS, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
-		}
-	}
-
-	File::CreateEmptyFile(filename);
-	File::WriteStringToFile(true, output, filename);
-}
-
-void GFXDebuggerBase::DumpVertexShader(const char* path)
-{
-	char filename[MAX_PATH];
-	sprintf(filename, "%sdump_vs.txt", path);
-
-	File::CreateEmptyFile(filename);
-///	File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
-}
-
-void GFXDebuggerBase::DumpPixelShaderConstants(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpVertexShaderConstants(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpTextures(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpFrameBuffer(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpGeometry(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpVertexDecl(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpMatrices(const char* path)
-{
-	// TODO
-}
-
-void GFXDebuggerBase::DumpStats(const char* path)
-{
-	// TODO
-}
diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h
deleted file mode 100644
index f8eb6105a1..0000000000
--- a/Source/Core/VideoCommon/Src/Debugger.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GFX_DEBUGGER_H_
-#define _GFX_DEBUGGER_H_
-
-class GFXDebuggerBase
-{
-public:
-	virtual ~GFXDebuggerBase() {}
-
-	// if paused, debugging functions can be enabled
-	virtual void OnPause() {};
-	virtual void OnContinue() {};
-
-	void DumpPixelShader(const char* path);
-	void DumpVertexShader(const char* path);
-	void DumpPixelShaderConstants(const char* path);
-	void DumpVertexShaderConstants(const char* path);
-	void DumpTextures(const char* path);
-	void DumpFrameBuffer(const char* path);
-	void DumpGeometry(const char* path);
-	void DumpVertexDecl(const char* path);
-	void DumpMatrices(const char* path);
-	void DumpStats(const char* path);
-};
-
-enum PauseEvent {
-	NOT_PAUSE	=	0,
-	NEXT_FRAME	=	1<<0,
-	NEXT_FLUSH	=	1<<1,
-
-	NEXT_PIXEL_SHADER_CHANGE	=	1<<2,
-	NEXT_VERTEX_SHADER_CHANGE	=	1<<3,
-	NEXT_TEXTURE_CHANGE	=	1<<4,
-	NEXT_NEW_TEXTURE	=	1<<5,
-
-	NEXT_XFB_CMD	=	1<<6, // TODO
-	NEXT_EFB_CMD	=	1<<7, // TODO
-
-	NEXT_MATRIX_CMD	=	1<<8, // TODO
-	NEXT_VERTEX_CMD	=	1<<9, // TODO
-	NEXT_TEXTURE_CMD	=	1<<10, // TODO
-	NEXT_LIGHT_CMD	=	1<<11, // TODO
-	NEXT_FOG_CMD	=	1<<12, // TODO
-
-	NEXT_SET_TLUT	=	1<<13, // TODO
-
-	NEXT_ERROR	=	1<<14, // TODO
-};
-
-extern GFXDebuggerBase *g_pdebugger;
-extern volatile bool GFXDebuggerPauseFlag;
-extern volatile PauseEvent GFXDebuggerToPauseAtNext;
-extern volatile int GFXDebuggerEventToPauseCount;
-void ContinueGFXDebugger();
-void GFXDebuggerCheckAndPause(bool update);
-void GFXDebuggerToPause(bool update);
-void GFXDebuggerUpdateScreen();
-
-#define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);}
-#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}}
-#define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}}
-
-
-#endif // _GFX_DEBUGGER_H_
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
deleted file mode 100644
index 779edf91e8..0000000000
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-
-#include "LogManager.h"
-#include "DriverDetails.h"
-
-namespace DriverDetails
-{
-	struct BugInfo
-	{
-		Vendor m_vendor; // which vendor has the error
-		Driver m_driver; // which driver has the error
-		Bug m_bug; // Which bug it is
-		double m_versionstart; // When it started
-		double m_versionend; // When it ended
-		bool m_hasbug; // Does it have it?
-	};
-
-	// Local members
-	Vendor	m_vendor = VENDOR_UNKNOWN;
-	Driver	m_driver = DRIVER_UNKNOWN;
-	double	m_version = 0.0;
-
-	// This is a list of all known bugs for each vendor
-	// We use this to check if the device and driver has a issue
-	BugInfo m_known_bugs[] = {
-		{VENDOR_QUALCOMM,  DRIVER_QUALCOMM_3XX, BUG_NODYNUBOACCESS,     14.0, -1.0, true},
-		{VENDOR_QUALCOMM,  DRIVER_QUALCOMM_3XX, BUG_BROKENCENTROID,     14.0, -1.0, true},
-		{VENDOR_QUALCOMM,  DRIVER_QUALCOMM_3XX, BUG_BROKENINFOLOG,      -1.0, -1.0, true},
-		{VENDOR_QUALCOMM,  DRIVER_QUALCOMM_3XX, BUG_ANNIHILATEDUBOS,	41.0, 46.0, true},
-		{VENDOR_QUALCOMM,  DRIVER_QUALCOMM_3XX, BUG_BROKENSWAP,		-1.0, -1.0, true},
-		{VENDOR_MESA,      DRIVER_NOUVEAU,      BUG_BROKENUBO,           900,  916, true},
-		{VENDOR_MESA,      DRIVER_R600,         BUG_BROKENUBO,           900,  913, true},
-		{VENDOR_MESA,      DRIVER_I965,         BUG_BROKENUBO,           900,  920, true},
-		{VENDOR_ATI,       DRIVER_ATI,          BUG_BROKENHACKEDBUFFER, -1.0, -1.0, true},
-		{VENDOR_MESA,      DRIVER_NOUVEAU,      BUG_BROKENHACKEDBUFFER, -1.0, -1.0, true},
-		{VENDOR_ATI,       DRIVER_ATI,          BUG_BROKENPINNEDMEMORY, -1.0, -1.0, true}
-	};
-
-	std::map<Bug, BugInfo> m_bugs;
-
-	void Init(Vendor vendor, Driver driver, const double version)
-	{
-		m_vendor = vendor;
-		m_driver = driver;
-		m_version = version;
-		
-		if (driver == DRIVER_UNKNOWN)
-			switch(vendor)
-			{
-				case VENDOR_NVIDIA:
-				case VENDOR_TEGRA:
-					m_driver = DRIVER_NVIDIA;
-				break;
-				case VENDOR_ATI:
-					m_driver = DRIVER_ATI;
-				break;
-				case VENDOR_INTEL:
-					m_driver = DRIVER_INTEL;
-				break;
-				case VENDOR_IMGTEC:
-					m_driver = DRIVER_IMGTEC;
-				break;
-				case VENDOR_VIVANTE:
-					m_driver = DRIVER_VIVANTE;
-				break;
-				default:
-				break;
-			}
-			
-		for(unsigned int a = 0; a < (sizeof(m_known_bugs) / sizeof(BugInfo)); ++a)
-		{
-			if(
-				( m_known_bugs[a].m_vendor == m_vendor || m_known_bugs[a].m_vendor == VENDOR_ALL ) &&
-				( m_known_bugs[a].m_driver == m_driver || m_known_bugs[a].m_driver == DRIVER_ALL ) &&
-				( m_known_bugs[a].m_versionstart <= m_version || m_known_bugs[a].m_versionstart == -1 ) &&
-				( m_known_bugs[a].m_versionend > m_version || m_known_bugs[a].m_versionend == -1 )
-			)
-				m_bugs.insert(std::make_pair(m_known_bugs[a].m_bug, m_known_bugs[a]));
-		}
-	}
-
-	bool HasBug(Bug bug)
-	{
-		auto it = m_bugs.find(bug);
-		if (it == m_bugs.end())
-			return false;	
-		return it->second.m_hasbug;
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
deleted file mode 100644
index a9a9b40f54..0000000000
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-#pragma once
-#include "CommonTypes.h"
-
-namespace DriverDetails
-{
-	// Enum of known vendors
-	// Tegra and Nvidia are separated out due to such substantial differences
-	enum Vendor
-	{
-		VENDOR_ALL = 0,
-		VENDOR_NVIDIA,
-		VENDOR_ATI,
-		VENDOR_INTEL,
-		VENDOR_ARM,
-		VENDOR_QUALCOMM,
-		VENDOR_IMGTEC,
-		VENDOR_TEGRA,
-		VENDOR_VIVANTE,
-		VENDOR_MESA,
-		VENDOR_UNKNOWN
-	};
-
-	// Enum of known drivers
-	enum Driver
-	{
-		DRIVER_ALL = 0,
-		DRIVER_NVIDIA, // Official Nvidia, including mobile GPU
-		DRIVER_NOUVEAU, // OSS nouveau
-		DRIVER_ATI, // Official ATI
-		DRIVER_R600, // OSS Radeon
-		DRIVER_INTEL, // Official Intel
-		DRIVER_I965, // OSS Intel
-		DRIVER_ARM_4XX, // Official Mali driver
-		DRIVER_ARM_T6XX, // Official Mali driver
-		DRIVER_LIMA, // OSS Mali driver
-		DRIVER_QUALCOMM_3XX, // Official Adreno driver 3xx
-		DRIVER_QUALCOMM_2XX, // Official Adreno driver 2xx
-		DRIVER_FREEDRENO, // OSS Adreno driver
-		DRIVER_IMGTEC, // OSS PowerVR driver
-		DRIVER_VIVANTE, // Official vivante driver
-		DRIVER_UNKNOWN // Unknown driver, default to official hardware driver
-	};
-
-	// Enum of known bugs
-	// These can be vendor specific, but we put them all in here
-	// For putting a new bug in here, make sure to put a detailed comment above the enum
-	// This'll ensure we know exactly what the issue is.
-	enum Bug
-	{
-		// Bug: No Dynamic UBO array object access
-		// Affected Devices: Qualcomm/Adreno
-		// Started Version: 14
-		// Ended Version: -1
-		// Accessing UBO array members dynamically causes the Adreno shader compiler to crash
-		// Errors out with "Internal Error"
-		BUG_NODYNUBOACCESS = 0,
-		// Bug: Centroid is broken in shaders
-		// Affected devices: Qualcomm/Adreno
-		// Started Version: 14
-		// Ended Version: -1
-		// Centroid in/out, used in the shaders, is used for multisample buffers to get the texel correctly
-		// When MSAA is disabled, it acts like a regular in/out
-		// Tends to cause the driver to render full white or black
-		BUG_BROKENCENTROID,
-		// Bug: INFO_LOG_LENGTH broken
-		// Affected devices: Qualcomm/Adreno
-		// Started Version: ? (Noticed on v14)
-		// Ended Version: -1
-		// When compiling a shader, it is important that when it fails, 
-		// you first get the length of the information log prior to grabbing it.
-		// This allows you to allocate an array to store all of the log
-		// Adreno devices /always/ return 0 when querying GL_INFO_LOG_LENGTH
-		// They also max out at 1024 bytes(1023 characters + null terminator) for the log
-		BUG_BROKENINFOLOG,
-		// Bug: UBO buffer offset broken
-		// Affected devices: all mesa drivers
-		// Started Version: 9.0 (mesa doesn't support ubo before)
-		// Ended Version: up to 9.2
-		// The offset of glBindBufferRange was ignored on all Mesa Gallium3D drivers until 9.1.3
-		// Nouveau stored the offset as u16 which isn't enough for all cases with range until 9.1.6
-		// I965 has broken data fetches from uniform buffers which results in a dithering until 9.2.0
-		BUG_BROKENUBO,
-		// Bug: The hacked buffer upload method isn't working
-		//      This isn't a bug as the hacked buffer itself isn't used to work.
-		//      I'm still surprised that it works on so many drivers.
-		// Affected devices: - amd close sourced driver
-		//                   - nouveau
-		//                   - maybe also some others
-		// This hack is evil. It's like free(pointer); *pointer = data;
-		BUG_BROKENHACKEDBUFFER,
-		// Bug: The pinned memory extension isn't working for index buffers
-		// Affected devices: AMD as they are the only vendor providing this extension
-		// Started Version: ?
-		// Ended Version: -1
-		// Pinned memory is disabled for index buffer as the amd driver (the only one with pinned memory support) seems
-		// to be broken. We just get flickering/black rendering when using pinned memory here -- degasus - 2013/08/20
-		// Please see issue #6105 on google code. Let's hope buffer storage solves this issues.
-		BUG_BROKENPINNEDMEMORY,
-		// Bug: Entirely broken UBOs
-		// Affected devices: Qualcomm/Adreno
-		// Started Version: ? (Noticed on v45)
-		// Ended Version: -1
-		// Uniform buffers are entirely broken on Qualcomm drivers with v45
-		// Trying to use the uniform buffers causes a malloc to fail inside the driver
-		// To be safe, blanket drivers from v41 - v45
-		BUG_ANNIHILATEDUBOS,
-		// Bug : Can't draw on screen text and clear correctly.
-		// Affected devices: Qualcomm/Adreno
-		// Started Version: ?
-		// Ended Version: ?
-		// Current code for drawing on screen text and clearing the framebuffer doesn't work on Adreno
-		// Drawing on screen text causes the whole screen to swizzle in a terrible fashion
-		// Clearing the framebuffer causes one to never see a frame.
-		BUG_BROKENSWAP,
-	};
-	
-	// Initializes our internal vendor, device family, and driver version	
-	void Init(Vendor vendor, Driver driver, const double version);
-	
-	// Once Vendor and driver version is set, this will return if it has the applicable bug passed to it.
-	bool HasBug(Bug bug);
-}
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp
deleted file mode 100644
index fc4c049c80..0000000000
--- a/Source/Core/VideoCommon/Src/EmuWindow.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <windows.h>
-
-#include "VideoConfig.h"
-#include "EmuWindow.h"
-#include "Fifo.h"
-#include "VertexShaderManager.h"
-#include "VideoBackendBase.h"
-#include "Core.h"
-#include "Host.h"
-#include "ConfigManager.h"
-
-namespace EmuWindow
-{
-HWND m_hWnd = NULL;
-HWND m_hParent = NULL;
-HINSTANCE m_hInstance = NULL;
-WNDCLASSEX wndClass;
-const TCHAR m_szClassName[] = _T("DolphinEmuWnd");
-int g_winstyle;
-static volatile bool s_sizing;
-static const int TITLE_TEXT_BUF_SIZE = 1024;
-TCHAR m_titleTextBuffer[TITLE_TEXT_BUF_SIZE];
-static const int WM_SETTEXT_CUSTOM = WM_USER + WM_SETTEXT;
-
-bool IsSizing()
-{
-	return s_sizing;
-}
-
-HWND GetWnd()
-{
-	return m_hWnd;
-}
-
-HWND GetParentWnd()
-{
-	return m_hParent;
-}
-
-void FreeLookInput( UINT iMsg, WPARAM wParam )
-{
-	static bool mouseLookEnabled = false;
-	static bool mouseMoveEnabled = false;
-	static float lastMouse[2];
-	POINT point;
-
-	switch(iMsg)
-	{
-	case WM_MOUSEMOVE:
-		if (mouseLookEnabled)
-		{
-			GetCursorPos(&point);
-			VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f);
-			lastMouse[0] = (float)point.x;
-			lastMouse[1] = (float)point.y;
-		}
-
-		if (mouseMoveEnabled)
-		{
-			GetCursorPos(&point);
-			VertexShaderManager::TranslateView((point.x - lastMouse[0]) / 50.0f, (point.y - lastMouse[1]) / 50.0f);
-			lastMouse[0] = (float)point.x;
-			lastMouse[1] = (float)point.y;
-		}
-		break;
-
-	case WM_RBUTTONDOWN:
-		GetCursorPos(&point);
-		lastMouse[0] = (float)point.x;
-		lastMouse[1] = (float)point.y;
-		mouseLookEnabled= true;
-		break;
-	case WM_MBUTTONDOWN:
-		GetCursorPos(&point);
-		lastMouse[0] = (float)point.x;
-		lastMouse[1] = (float)point.y;
-		mouseMoveEnabled= true;
-		break;
-	case WM_RBUTTONUP:
-		mouseLookEnabled = false;
-		break;
-	case WM_MBUTTONUP:
-		mouseMoveEnabled = false;
-		break;
-	}
-}
-
-
-LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
-{
-	if (g_ActiveConfig.bFreeLook)
-		FreeLookInput( iMsg, wParam );
-
-	switch( iMsg )
-	{
-	case WM_PAINT:
-		{
-			HDC hdc;
-			PAINTSTRUCT ps;
-			hdc = BeginPaint(hWnd, &ps);
-			EndPaint(hWnd, &ps);
-		}
-		break;
-
-	case WM_ENTERSIZEMOVE:
-		s_sizing = true;
-		break;
-
-	case WM_EXITSIZEMOVE:
-		s_sizing = false;
-		break;
-
-	/* Post the mouse events to the main window, it's necessary, because the difference between the
-	   keyboard inputs is that these events only appear here, not in the parent window or any other WndProc()*/
-	case WM_LBUTTONDOWN:
-		if(g_ActiveConfig.backend_info.bSupports3DVision && g_ActiveConfig.b3DVision)
-		{
-			// This basically throws away the left button down input when b3DVision is activated so WX
-			// can't get access to it, stopping focus pulling on mouse click.
-			// (Input plugins use a different system so it doesn't cause too much weirdness)
-			break;
-		}
-	case WM_LBUTTONUP:
-	case WM_LBUTTONDBLCLK:
-		PostMessage(GetParentWnd(), iMsg, wParam, lParam);
-		break;
-
-	// This is called when we close the window when we render to a separate window
-	case WM_CLOSE:
-		// When the user closes the window, we post an event to the main window to call Stop()
-		// Which then handles all the necessary steps to Shutdown the core
-		if (m_hParent == NULL)
-		{
-			// Stop the game
-			//PostMessage(m_hParent, WM_USER, WM_USER_STOP, 0);
-		}
-		break;
-
-	case WM_USER:
-		break;
-
-	// Called when a screensaver wants to show up while this window is active
-	case WM_SYSCOMMAND:
-	
-		switch (wParam) 
-		{
-		case SC_SCREENSAVE:
-		case SC_MONITORPOWER:
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
-			break;
-		default:
-			return DefWindowProc(hWnd, iMsg, wParam, lParam);
-		}
-		break;
-	case WM_SETCURSOR:
-		PostMessage(m_hParent, WM_USER, WM_USER_SETCURSOR, 0);
-		return true;
-
-	case WM_SETTEXT_CUSTOM:
-		SendMessage(hWnd, WM_SETTEXT, wParam, lParam);
-		break;
-
-	default:
-		return DefWindowProc(hWnd, iMsg, wParam, lParam);
-	}
-	return 0;
-}
-
-HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const TCHAR *title)
-{
-	wndClass.cbSize = sizeof( wndClass );
-	wndClass.style  = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
-	wndClass.lpfnWndProc = WndProc;
-	wndClass.cbClsExtra = 0;
-	wndClass.cbWndExtra = 0;
-	wndClass.hInstance = hInstance;
-	wndClass.hIcon = LoadIcon( NULL, IDI_APPLICATION );
-	wndClass.hCursor = NULL;
-	wndClass.hbrBackground = (HBRUSH)GetStockObject( BLACK_BRUSH );
-	wndClass.lpszMenuName = NULL;
-	wndClass.lpszClassName = m_szClassName;
-	wndClass.hIconSm = LoadIcon( NULL, IDI_APPLICATION );
-
-	m_hInstance = hInstance;
-	RegisterClassEx( &wndClass );
-
-	m_hParent = parent;
-
-	m_hWnd = CreateWindow(m_szClassName, title, (g_ActiveConfig.backend_info.bSupports3DVision && g_ActiveConfig.b3DVision) ? WS_EX_TOPMOST | WS_POPUP : WS_CHILD,
-		0, 0, width, height, m_hParent, NULL, hInstance, NULL);
-
-	return m_hWnd;
-}
-
-void Show()
-{
-	ShowWindow(m_hWnd, SW_SHOW);
-	BringWindowToTop(m_hWnd);
-	UpdateWindow(m_hWnd);
-	SetFocus(m_hParent);
-}
-
-HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title)
-{
-	// TODO:
-	// 1. Remove redundant window manipulation,
-	// 2. Make DX9 in fullscreen can be overlapped by other dialogs
-	// 3. Request window sizes which actually make the client area map to a common resolution
-	HWND Ret;
-	int x=0, y=0, width=640, height=480;
-	Host_GetRenderWindowSize(x, y, width, height);
-
-	 // TODO: Don't show if fullscreen
-	Ret = OpenWindow(hParent, hInstance, width, height, title);
-
-	if (Ret)
-	{
-		Show();
-	}
-	return Ret;
-}
-
-void Close()
-{
-	DestroyWindow(m_hWnd);
-	UnregisterClass(m_szClassName, m_hInstance);
-}
-
-void SetSize(int width, int height)
-{
-	RECT rc = {0, 0, width, height};
-	DWORD style = GetWindowLong(m_hWnd, GWL_STYLE);
-	AdjustWindowRect(&rc, style, false);
-
-	int w = rc.right - rc.left;
-	int h = rc.bottom - rc.top;
-
-	rc.left = (1280 - w)/2;
-	rc.right = rc.left + w;
-	rc.top = (1024 - h)/2;
-	rc.bottom = rc.top + h;
-	MoveWindow(m_hWnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
-}
-
-void SetWindowText(const TCHAR* text)
-{
-	// the simple way.
-	// we don't do this because it's a blocking call and the GUI thread might be waiting for us.
-	//::SetWindowText(m_hWnd, text);
-
-	// copy to m_titleTextBuffer in such a way that
-	// it remains null-terminated and without garbage data at every point in time,
-	// in case another thread reads it while we're doing this.
-	for (int i = 0; i < TITLE_TEXT_BUF_SIZE-1; ++i)
-	{
-		m_titleTextBuffer[i+1] = 0;
-		TCHAR c = text[i];
-		m_titleTextBuffer[i] = c;
-		if (!c)
-			break;
-	}
-
-	// the OS doesn't allow posting WM_SETTEXT,
-	// so we post our own message and convert it to that in WndProc
-	PostMessage(m_hWnd, WM_SETTEXT_CUSTOM, 0, (LPARAM)m_titleTextBuffer);
-}
-
-}
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.h b/Source/Core/VideoCommon/Src/EmuWindow.h
deleted file mode 100644
index bf5aa73cdf..0000000000
--- a/Source/Core/VideoCommon/Src/EmuWindow.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _EMUWINDOW_H
-#define _EMUWINDOW_H
-
-#include <windows.h>
-
-namespace EmuWindow
-{
-
-HWND GetWnd();
-HWND GetParentWnd();
-HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title);
-void Show();
-void Close();
-void SetSize(int displayWidth, int displayHeight);
-bool IsSizing();
-void OSDMenu(WPARAM wParam);
-void SetWindowText(const TCHAR* text);
-
-}
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/FPSCounter.cpp b/Source/Core/VideoCommon/Src/FPSCounter.cpp
deleted file mode 100644
index d9464afedc..0000000000
--- a/Source/Core/VideoCommon/Src/FPSCounter.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FPSCounter.h"
-#include "FileUtil.h"
-#include "Timer.h"
-#include "VideoConfig.h"
-
-#define FPS_REFRESH_INTERVAL 1000
-
-static unsigned int s_counter = 0;
-static unsigned int s_fps = 0;
-static unsigned int s_fps_last_counter = 0;
-static unsigned long s_last_update_time = 0;
-static File::IOFile s_bench_file;
-
-void InitFPSCounter()
-{
-	s_counter = s_fps_last_counter = 0;
-	s_fps = 0;
-	s_last_update_time = Common::Timer::GetTimeMs();
-
-	if (s_bench_file.IsOpen())
-		s_bench_file.Close();
-}
-
-static void LogFPSToFile(unsigned long val)
-{
-	if (!s_bench_file.IsOpen())
-		s_bench_file.Open(File::GetUserPath(D_LOGS_IDX) + "fps.txt", "w");
-
-	char buffer[256];
-	snprintf(buffer, 256, "%ld\n", val);
-	s_bench_file.WriteArray(buffer, strlen(buffer));
-}
-
-int UpdateFPSCounter()
-{
-	if (Common::Timer::GetTimeMs() - s_last_update_time >= FPS_REFRESH_INTERVAL)
-	{
-		s_last_update_time = Common::Timer::GetTimeMs();
-		s_fps = s_counter - s_fps_last_counter;
-		s_fps_last_counter = s_counter;
-		if (g_ActiveConfig.bLogFPSToFile)
-			LogFPSToFile(s_fps);
-	}
-
-	s_counter++;
-	return s_fps;
-}
\ No newline at end of file
diff --git a/Source/Core/VideoCommon/Src/FPSCounter.h b/Source/Core/VideoCommon/Src/FPSCounter.h
deleted file mode 100644
index d90540bccf..0000000000
--- a/Source/Core/VideoCommon/Src/FPSCounter.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FPS_COUNTER_H_
-#define _FPS_COUNTER_H_
-
-// Initializes the FPS counter.
-void InitFPSCounter();
-
-// Called when a frame is rendered. Returns the value to be displayed on
-// screen as the FPS counter (updated every second).
-int UpdateFPSCounter();
-
-#endif // _FPS_COUNTER_H_
\ No newline at end of file
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
deleted file mode 100644
index b7e00e128a..0000000000
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoConfig.h"
-#include "MemoryUtil.h"
-#include "Thread.h"
-#include "Atomic.h"
-#include "OpcodeDecoding.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "ChunkFile.h"
-#include "Fifo.h"
-#include "HW/Memmap.h"
-#include "Core.h"
-#include "CoreTiming.h"
-
-volatile bool g_bSkipCurrentFrame = false;
-extern u8* g_pVideoData;
-
-namespace
-{
-static volatile bool GpuRunningState = false;
-static volatile bool EmuRunningState = false;
-static std::mutex m_csHWVidOccupied;
-// STATE_TO_SAVE
-static u8 *videoBuffer;
-static int size = 0;
-}  // namespace
-
-void Fifo_DoState(PointerWrap &p) 
-{
-	p.DoArray(videoBuffer, FIFO_SIZE);
-	p.Do(size);
-	p.DoPointer(g_pVideoData, videoBuffer);
-	p.Do(g_bSkipCurrentFrame);
-}
-
-void Fifo_PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	if (doLock)
-	{
-		EmulatorState(false);
-		if (!Core::IsGPUThread())
-			m_csHWVidOccupied.lock();
-		_dbg_assert_(COMMON, !CommandProcessor::fifo.isGpuReadingData);
-	}
-	else
-	{
-		if (unpauseOnUnlock)
-			EmulatorState(true);
-		if (!Core::IsGPUThread())
-			m_csHWVidOccupied.unlock();
-	}
-}
-
-
-void Fifo_Init()
-{
-	videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE);
-	size = 0;
-	GpuRunningState = false;
-	Common::AtomicStore(CommandProcessor::VITicks, CommandProcessor::m_cpClockOrigin);
-}
-
-void Fifo_Shutdown()
-{
-	if (GpuRunningState) PanicAlert("Fifo shutting down while active");
-	FreeMemoryPages(videoBuffer, FIFO_SIZE);
-}
-
-u8* GetVideoBufferStartPtr()
-{
-	return videoBuffer;
-}
-
-u8* GetVideoBufferEndPtr()
-{
-	return &videoBuffer[size];
-}
-
-void Fifo_SetRendering(bool enabled)
-{
-	g_bSkipCurrentFrame = !enabled;
-}
-
-// May be executed from any thread, even the graphics thread.
-// Created to allow for self shutdown.
-void ExitGpuLoop()
-{
-	// This should break the wait loop in CPU thread
-	CommandProcessor::fifo.bFF_GPReadEnable = false;
-	SCPFifoStruct &fifo = CommandProcessor::fifo;
-	while(fifo.isGpuReadingData) Common::YieldCPU();
-	// Terminate GPU thread loop
-	GpuRunningState = false;
-	EmuRunningState = true;
-}
-
-void EmulatorState(bool running)
-{
-	EmuRunningState = running;
-}
-
-
-// Description: RunGpuLoop() sends data through this function.
-void ReadDataFromFifo(u8* _uData, u32 len)
-{
-	if (size + len >= FIFO_SIZE)
-	{
-		int pos = (int)(g_pVideoData - videoBuffer);
-		size -= pos;
-		if (size + len > FIFO_SIZE)
-		{
-			PanicAlert("FIFO out of bounds (size = %i, len = %i at %08x)", size, len, pos);
-		}
-		memmove(&videoBuffer[0], &videoBuffer[pos], size);
-		g_pVideoData = videoBuffer;
-	}
-	// Copy new video instructions to videoBuffer for future use in rendering the new picture
-	memcpy(videoBuffer + size, _uData, len);
-	size += len;
-}
-
-void ResetVideoBuffer()
-{
-	g_pVideoData = videoBuffer;
-	size = 0;
-}
-
-
-// Description: Main FIFO update loop
-// Purpose: Keep the Core HW updated about the CPU-GPU distance
-void RunGpuLoop()
-{
-	std::lock_guard<std::mutex> lk(m_csHWVidOccupied);
-	GpuRunningState = true;
-	SCPFifoStruct &fifo = CommandProcessor::fifo;
-	u32 cyclesExecuted = 0;
-
-	while (GpuRunningState)
-	{
-		g_video_backend->PeekMessages();
-
-		VideoFifo_CheckAsyncRequest();
-
-		CommandProcessor::SetCpStatus();
-
-		Common::AtomicStore(CommandProcessor::VITicks, CommandProcessor::m_cpClockOrigin);
-
-		// check if we are able to run this buffer	
-		while (GpuRunningState && !CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint())
-		{
-			fifo.isGpuReadingData = true;
-			CommandProcessor::isPossibleWaitingSetDrawDone = fifo.bFF_GPLinkEnable ? true : false;
-
-			if (!Core::g_CoreStartupParameter.bSyncGPU || Common::AtomicLoad(CommandProcessor::VITicks) > CommandProcessor::m_cpClockOrigin)
-			{
-				u32 readPtr = fifo.CPReadPointer;
-				u8 *uData = Memory::GetPointer(readPtr);
-
-				if (readPtr == fifo.CPEnd)
-					readPtr = fifo.CPBase;
-				else
-					readPtr += 32;
-
-				_assert_msg_(COMMANDPROCESSOR, (s32)fifo.CPReadWriteDistance - 32 >= 0 ,
-					"Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instability in the game. Please report it.", fifo.CPReadWriteDistance - 32);
-
-				ReadDataFromFifo(uData, 32);
-
-				cyclesExecuted = OpcodeDecoder_Run(g_bSkipCurrentFrame);
-
-				if (Core::g_CoreStartupParameter.bSyncGPU && Common::AtomicLoad(CommandProcessor::VITicks) > cyclesExecuted)
-					Common::AtomicAdd(CommandProcessor::VITicks, -(s32)cyclesExecuted);
-
-				Common::AtomicStore(fifo.CPReadPointer, readPtr);
-				Common::AtomicAdd(fifo.CPReadWriteDistance, -32);
-				if((GetVideoBufferEndPtr() - g_pVideoData) == 0)
-					Common::AtomicStore(fifo.SafeCPReadPointer, fifo.CPReadPointer);
-			}
-
-			CommandProcessor::SetCpStatus();
-		
-			// This call is pretty important in DualCore mode and must be called in the FIFO Loop.
-			// If we don't, s_swapRequested or s_efbAccessRequested won't be set to false
-			// leading the CPU thread to wait in Video_BeginField or Video_AccessEFB thus slowing things down.
-			VideoFifo_CheckAsyncRequest();		
-			CommandProcessor::isPossibleWaitingSetDrawDone = false;
-		}
-
-		fifo.isGpuReadingData = false;
-
-		if (EmuRunningState)
-		{
-			// NOTE(jsd): Calling SwitchToThread() on Windows 7 x64 is a hot spot, according to profiler.
-			// See https://docs.google.com/spreadsheet/ccc?key=0Ah4nh0yGtjrgdFpDeF9pS3V6RUotRVE3S3J4TGM1NlE#gid=0
-			// for benchmark details.
-#if 0
-			Common::YieldCPU();
-#endif
-		}
-		else
-		{
-			// While the emu is paused, we still handle async requests then sleep.
-			while (!EmuRunningState)
-			{
-				g_video_backend->PeekMessages();
-				m_csHWVidOccupied.unlock();
-				Common::SleepCurrentThread(1);
-				m_csHWVidOccupied.lock();
-			}
-		}
-	}
-}
-
-
-bool AtBreakpoint()
-{
-	SCPFifoStruct &fifo = CommandProcessor::fifo;
-	return fifo.bFF_BPEnable && (fifo.CPReadPointer == fifo.CPBreakpoint);
-}
-
-void RunGpu()
-{
-	SCPFifoStruct &fifo = CommandProcessor::fifo;
-	while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint() )
-	{
-		u8 *uData = Memory::GetPointer(fifo.CPReadPointer);
-
-		FPURoundMode::SaveSIMDState();
-		FPURoundMode::LoadDefaultSIMDState();
-		ReadDataFromFifo(uData, 32);
-		OpcodeDecoder_Run(g_bSkipCurrentFrame);
-		FPURoundMode::LoadSIMDState();
-
-		//DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base");
-
-		if (fifo.CPReadPointer == fifo.CPEnd)
-			fifo.CPReadPointer = fifo.CPBase;
-		else
-			fifo.CPReadPointer += 32;
-
-		fifo.CPReadWriteDistance -= 32;
-	}
-	CommandProcessor::SetCpStatus();
-}
diff --git a/Source/Core/VideoCommon/Src/Fifo.h b/Source/Core/VideoCommon/Src/Fifo.h
deleted file mode 100644
index 229e2ff46d..0000000000
--- a/Source/Core/VideoCommon/Src/Fifo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FIFO_H
-#define _FIFO_H
-
-#include "Common.h"
-#include "VideoBackendBase.h"
-
-class PointerWrap;
-
-#define FIFO_SIZE (2*1024*1024)
-
-extern volatile bool g_bSkipCurrentFrame;
-
-
-void Fifo_Init();
-void Fifo_Shutdown();
-
-void Fifo_DoState(PointerWrap &f);
-void Fifo_PauseAndLock(bool doLock, bool unpauseOnUnlock);
-
-void ReadDataFromFifo(u8* _uData, u32 len);
-
-void RunGpu();
-void RunGpuLoop();
-void ExitGpuLoop();
-void EmulatorState(bool running);
-bool AtBreakpoint();
-void ResetVideoBuffer();
-void Fifo_SetRendering(bool bEnabled);
-
-
-// Implemented by the Video Backend
-void VideoFifo_CheckAsyncRequest();
-
-#endif // _FIFO_H
diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h
deleted file mode 100644
index e529bb1a39..0000000000
--- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#ifndef _FRAMEBUFFERMANAGERBASE_H
-#define _FRAMEBUFFERMANAGERBASE_H
-
-#include <list>
-
-#include "VideoCommon.h"
-
-inline bool addrRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper)
-{
-	return !((aLower >= bUpper) || (bLower >= aUpper));
-}
-
-struct XFBSourceBase
-{
-	virtual ~XFBSourceBase() {}
-
-	// TODO: only DX9 uses the width/height params
-	virtual void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const = 0;
-
-	virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0;
-
-	virtual void CopyEFB(float Gamma) = 0;
-
-	u32 srcAddr;
-	u32 srcWidth;
-	u32 srcHeight;
-
-	unsigned int texWidth;
-	unsigned int texHeight;
-
-	// TODO: only used by OGL
-	TargetRectangle sourceRc;
-};
-
-class FramebufferManagerBase
-{
-public:
-	enum
-	{
-		// There may be multiple XFBs in GameCube RAM. This is the maximum number to
-		// virtualize.
-		MAX_VIRTUAL_XFB = 8
-	};
-
-	FramebufferManagerBase();
-	virtual ~FramebufferManagerBase();
-
-	static void CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
-	static const XFBSourceBase* const* GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount);
-
-	static void SetLastXfbWidth(unsigned int width) { s_last_xfb_width = width; }
-	static void SetLastXfbHeight(unsigned int height) { s_last_xfb_height = height; }
-	static unsigned int LastXfbWidth() { return s_last_xfb_width; }
-	static unsigned int LastXfbHeight() { return s_last_xfb_height; }
-
-	static int ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width);
-	static int ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height);
-
-protected:
-	struct VirtualXFB
-	{
-		VirtualXFB() : xfbSource(NULL) {}
-
-		// Address and size in GameCube RAM
-		u32 xfbAddr;
-		u32 xfbWidth;
-		u32 xfbHeight;
-
-		XFBSourceBase *xfbSource;
-	};
-
-	typedef std::list<VirtualXFB> VirtualXFBListType;
-
-private:
-	virtual XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height) = 0;
-	// TODO: figure out why OGL is different for this guy
-	virtual void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) = 0;
-
-	static VirtualXFBListType::iterator FindVirtualXFB(u32 xfbAddr, u32 width, u32 height);
-
-	static void ReplaceVirtualXFB();
-
-	// TODO: merge these virtual funcs, they are nearly all the same
-	virtual void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma = 1.0f) = 0;
-	static void CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma = 1.0f);
-
-	static const XFBSourceBase* const* GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount);
-	static const XFBSourceBase* const* GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount);
-
-	static XFBSourceBase *m_realXFBSource; // Only used in Real XFB mode
-	static VirtualXFBListType m_virtualXFBList; // Only used in Virtual XFB mode
-
-	static const XFBSourceBase* m_overlappingXFBArray[MAX_VIRTUAL_XFB];
-
-	static unsigned int s_last_xfb_width;
-	static unsigned int s_last_xfb_height;
-};
-
-extern FramebufferManagerBase *g_framebuffer_manager;
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/GenericDLCache.cpp b/Source/Core/VideoCommon/Src/GenericDLCache.cpp
deleted file mode 100644
index d6826bbbde..0000000000
--- a/Source/Core/VideoCommon/Src/GenericDLCache.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2003-2009 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// TODO: Handle cache-is-full condition :p
-
-
-#include "Common.h"
-#include "DLCache.h"
-
-namespace DLCache
-{
-
-void Init()
-{
-}
-
-void Shutdown()
-{
-}
-
-void Clear() 
-{
-}
-
-void ProgressiveCleanup()
-{
-}
-}  // namespace
-
-// NOTE - outside the namespace on purpose.
-bool HandleDisplayList(u32 address, u32 size)
-{
-	return false;
-}
-
-void IncrementCheckContextId()
-{
-}
diff --git a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp b/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp
deleted file mode 100644
index c5d14bfe9e..0000000000
--- a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp
+++ /dev/null
@@ -1,2210 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-//#include "VideoCommon.h" // to get debug logs
-
-#include "CPUDetect.h"
-#include "TextureDecoder.h"
-#include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
-#include "VideoConfig.h"
-
-#include "LookUpTables.h"
-
-#include <cmath>
-
-
-
-bool TexFmt_Overlay_Enable=false;
-bool TexFmt_Overlay_Center=false;
-
-extern const char* texfmt[];
-extern const unsigned char sfont_map[];
-extern const unsigned char sfont_raw[][9*10];
-
-// TRAM
-// STATE_TO_SAVE
- GC_ALIGNED16(u8 texMem[TMEM_SIZE]);
-
-
-// Gamecube/Wii texture decoder
-
-// Decodes all known Gamecube/Wii texture formats.
-// by ector
-
-int TexDecoder_GetTexelSizeInNibbles(int format)
-{
-	switch (format & 0x3f) {
-	case GX_TF_I4: return 1;   
-	case GX_TF_I8: return 2;
-	case GX_TF_IA4: return 2;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return 8;
-	case GX_TF_C4: return 1;
-	case GX_TF_C8: return 2;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 1;
-	case GX_CTF_R4:    return 1;   
-	case GX_CTF_RA4:   return 2;
-	case GX_CTF_RA8:   return 4;
-	case GX_CTF_YUVA8: return 8;
-	case GX_CTF_A8:    return 2;
-	case GX_CTF_R8:    return 2;
-	case GX_CTF_G8:    return 2;
-	case GX_CTF_B8:    return 2;
-	case GX_CTF_RG8:   return 4;
-	case GX_CTF_GB8:   return 4;
-
-	case GX_TF_Z8:     return 2;
-	case GX_TF_Z16:    return 4;
-	case GX_TF_Z24X8:  return 8;
-
-	case GX_CTF_Z4:    return 1;   
-	case GX_CTF_Z8M:   return 2;
-	case GX_CTF_Z8L:   return 2;
-	case GX_CTF_Z16L:  return 4;
-	default: return 1;
-	}
-}
-
-int TexDecoder_GetTextureSizeInBytes(int width, int height, int format)
-{
-	return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2;
-}
-
-int TexDecoder_GetBlockWidthInTexels(u32 format)
-{
-	switch (format)
-	{
-	case GX_TF_I4: return 8;   
-	case GX_TF_I8: return 8;
-	case GX_TF_IA4: return 8;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return  4;
-	case GX_TF_C4: return 8;
-	case GX_TF_C8: return 8;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 8;
-	case GX_CTF_R4: return 8;
-	case GX_CTF_RA4: return 8;
-	case GX_CTF_RA8: return 4;
-	case GX_CTF_A8: return 8;
-	case GX_CTF_R8: return 8;
-	case GX_CTF_G8: return 8;
-	case GX_CTF_B8: return 8;
-	case GX_CTF_RG8: return 4;
-	case GX_CTF_GB8: return 4;
-	case GX_TF_Z8: return 8;
-	case GX_TF_Z16: return 4;
-	case GX_TF_Z24X8: return 4;
-	case GX_CTF_Z4: return 8;
-	case GX_CTF_Z8M: return 8;
-	case GX_CTF_Z8L: return 8;
-	case GX_CTF_Z16L: return 4;
-	default:
-		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockWidthInTexels)", format);
-		return 8;
-	}
-}
-
-int TexDecoder_GetBlockHeightInTexels(u32 format)
-{
-	switch (format)
-	{
-	case GX_TF_I4: return 8;   
-	case GX_TF_I8: return 4;
-	case GX_TF_IA4: return 4;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return  4;
-	case GX_TF_C4: return 8;
-	case GX_TF_C8: return 4;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 8;
-	case GX_CTF_R4: return 8;
-	case GX_CTF_RA4: return 4;
-	case GX_CTF_RA8: return 4;
-	case GX_CTF_A8: return 4;
-	case GX_CTF_R8: return 4;
-	case GX_CTF_G8: return 4;
-	case GX_CTF_B8: return 4;
-	case GX_CTF_RG8: return 4;
-	case GX_CTF_GB8: return 4;
-	case GX_TF_Z8: return 4;
-	case GX_TF_Z16: return 4;
-	case GX_TF_Z24X8: return 4;
-	case GX_CTF_Z4: return 8;
-	case GX_CTF_Z8M: return 4;
-	case GX_CTF_Z8L: return 4;
-	case GX_CTF_Z16L: return 4;
-	default:
-		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format);
-		return 4;
-	}
-}
-
-//returns bytes
-int TexDecoder_GetPaletteSize(int format)
-{
-	switch (format)
-	{
-	case GX_TF_C4: return 16 * 2;
-	case GX_TF_C8: return 256 * 2;
-	case GX_TF_C14X2: return 16384 * 2;
-	default:
-		return 0;
-	}
-}
-
-static inline u32 decodeIA8(u16 val)
-{
-	int a = val >> 8;
-	int i = val & 0xFF;
-	return (a << 24) | (i << 16) | (i << 8) | i;
-}
-
-static inline u32 decode5A3(u16 val)
-{
-	int r,g,b,a;
-	if ((val & 0x8000))
-	{
-		a = 0xFF;
-		r = Convert5To8((val >> 10) & 0x1F);
-		g = Convert5To8((val >> 5) & 0x1F);
-		b = Convert5To8(val & 0x1F);
-	}
-	else
-	{
-		a = Convert3To8((val >> 12) & 0x7);
-		r = Convert4To8((val >> 8) & 0xF);
-		g = Convert4To8((val >> 4) & 0xF);
-		b = Convert4To8(val & 0xF);
-	}
-	return (a << 24) | (r << 16) | (g << 8) | b;
-}
-
-static inline u32 decode5A3RGBA(u16 val)
-{
-	int r,g,b,a;
-	if ((val&0x8000))
-	{
-		r=Convert5To8((val>>10) & 0x1f);
-		g=Convert5To8((val>>5 ) & 0x1f);
-		b=Convert5To8((val    ) & 0x1f);
-		a=0xFF;
-	}
-	else
-	{
-		a=Convert3To8((val>>12) & 0x7);
-		r=Convert4To8((val>>8 ) & 0xf);
-		g=Convert4To8((val>>4 ) & 0xf);
-		b=Convert4To8((val    ) & 0xf);
-	}
-	return r | (g<<8) | (b << 16) | (a << 24);
-}
-
-static inline u32 decode565RGBA(u16 val)
-{
-	int r,g,b,a;
-	r=Convert5To8((val>>11) & 0x1f);
-	g=Convert6To8((val>>5 ) & 0x3f);
-	b=Convert5To8((val    ) & 0x1f);
-	a=0xFF;
-	return  r | (g<<8) | (b << 16) | (a << 24);
-}
-
-static inline u32 decodeIA8Swapped(u16 val)
-{
-	int a = val & 0xFF;
-	int i = val >> 8;
-	return i | (i<<8) | (i<<16) | (a<<24);
-}
-
-
-
-struct DXTBlock
-{
-	u16 color1;
-	u16 color2;
-	u8 lines[4];
-};
-
-//inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
-inline void decodebytesC4_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode5A3(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-inline void decodebytesC4_5A3_To_rgba32(u32 *dst, const u8 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-inline void decodebytesC4_To_Raw16(u16* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = Common::swap16(tlut[val >> 4]);
-		*dst++ = Common::swap16(tlut[val & 0xF]);
-	}
-}
-
-inline void decodebytesC4IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decodeIA8Swapped(tlut[val >> 4]);
-		*dst++ = decodeIA8Swapped(tlut[val & 0xF]);
-	}
-}
-
-inline void decodebytesC4RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode565RGBA(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode565RGBA(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-//inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
-inline void decodebytesC8_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
-{ 
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3(Common::swap16(tlut[val]));
-	}
-}
-
-inline void decodebytesC8_5A3_To_RGBA32(u32 *dst, const u8 *src, int tlutaddr)
-{ 
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val]));
-	}
-}
-
-inline void decodebytesC8_To_Raw16(u16* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = Common::swap16(tlut[val]);
-	}
-}
-
-inline void decodebytesC8IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		*dst++ = decodeIA8Swapped(tlut[src[x]]);
-	}
-}
-
-inline void decodebytesC8RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		*dst++ = decode565RGBA(Common::swap16(tlut[src[x]]));
-	}
-}
-
-inline void decodebytesC14X2_5A3_To_BGRA32(u32 *dst, const u16 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode5A3(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-inline void decodebytesC14X2_5A3_To_RGBA(u32 *dst, const u16 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-inline void decodebytesC14X2_To_Raw16(u16* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = Common::swap16(tlut[(val & 0x3FFF)]);
-	}
-}
-
-inline void decodebytesC14X2IA8_To_RGBA(u32* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decodeIA8Swapped(tlut[(val & 0x3FFF)]);
-	}
-}
-
-inline void decodebytesC14X2rgb565_To_RGBA(u32* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode565RGBA(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-// Needs more speed.
-inline void decodebytesIA4(u16 *dst, const u8 *src)
-{
-	for (int x = 0; x < 8; x++)
-	{
-		const u8 val = src[x];
-		u8 a = Convert4To8(val >> 4);
-		u8 l = Convert4To8(val & 0xF);
-		dst[x] = (a << 8) | l;
-	}
-}
-
-inline void decodebytesIA4RGBA(u32 *dst, const u8 *src)
-{
-	for (int x = 0; x < 8; x++)
-	{
-		const u8 val = src[x];
-		u8 a = Convert4To8(val >> 4);
-		u8 l = Convert4To8(val & 0xF);
-		dst[x] = (a << 24) | l << 16 | l << 8 | l;
-	}
-}
-
-inline void decodebytesRGB5A3(u32 *dst, const u16 *src)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = decode5A3(Common::swap16(src[x]));
-#else
-	dst[0] = decode5A3(Common::swap16(src[0]));
-	dst[1] = decode5A3(Common::swap16(src[1]));
-	dst[2] = decode5A3(Common::swap16(src[2]));
-	dst[3] = decode5A3(Common::swap16(src[3]));
-#endif
-}
-
-inline void decodebytesRGB5A3rgba(u32 *dst, const u16 *src)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = decode5A3RGBA(Common::swap16(src[x]));
-#else
-	dst[0] = decode5A3RGBA(Common::swap16(src[0]));
-	dst[1] = decode5A3RGBA(Common::swap16(src[1]));
-	dst[2] = decode5A3RGBA(Common::swap16(src[2]));
-	dst[3] = decode5A3RGBA(Common::swap16(src[3]));
-#endif
-}
-
-// This one is used by many video formats. It'd therefore be good if it was fast.
-// Needs more speed.
-inline void decodebytesARGB8_4(u32 *dst, const u16 *src, const u16 *src2)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = Common::swap32((src2[x] << 16) | src[x]);
-#else
-	dst[0] = Common::swap32((src2[0] << 16) | src[0]);
-	dst[1] = Common::swap32((src2[1] << 16) | src[1]);
-	dst[2] = Common::swap32((src2[2] << 16) | src[2]);
-	dst[3] = Common::swap32((src2[3] << 16) | src[3]);
-#endif
-
-	// This can probably be done in a few SSE pack/unpack instructions + pshufb
-	// some unpack instruction x2:
-	// ABABABABABABABAB 1212121212121212 ->
-	// AB12AB12AB12AB12 AB12AB12AB12AB12
-	// 2x pshufb-> 
-	// 21BA21BA21BA21BA 21BA21BA21BA21BA
-	// and we are done.
-}
-
-inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16 * src2)
-{
-#if 0
-	for (int x = 0; x < 4; x++) {
-		dst[x] =  ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8)  | (src2[x] << 8);
-	}
-#else
-	dst[0] =  ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8)  | (src2[0] << 8);
-	dst[1] =  ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8)  | (src2[1] << 8);
-	dst[2] =  ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8)  | (src2[2] << 8);
-	dst[3] =  ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8)  | (src2[3] << 8);
-#endif
-}
-
-inline u32 makecol(int r, int g, int b, int a)
-{
-	return (a << 24)|(r << 16)|(g << 8)|b;
-}
-
-inline u32 makeRGBA(int r, int g, int b, int a)
-{
-	return (a<<24)|(b<<16)|(g<<8)|r;
-}
-
-void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
-{
-	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
-	// Needs more speed.
-	u16 c1 = Common::swap16(src->color1);
-	u16 c2 = Common::swap16(src->color2);
-	int blue1 = Convert5To8(c1 & 0x1F);
-	int blue2 = Convert5To8(c2 & 0x1F);
-	int green1 = Convert6To8((c1 >> 5) & 0x3F);
-	int green2 = Convert6To8((c2 >> 5) & 0x3F);
-	int red1 = Convert5To8((c1 >> 11) & 0x1F);
-	int red2 = Convert5To8((c2 >> 11) & 0x1F);
-	int colors[4];
-	colors[0] = makecol(red1, green1, blue1, 255);
-	colors[1] = makecol(red2, green2, blue2, 255);
-	if (c1 > c2)
-	{
-		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
-		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
-		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
-		colors[2] = makecol(red1 + red3, green1 + green3, blue1 + blue3, 255);
-		colors[3] = makecol(red2 - red3, green2 - green3, blue2 - blue3, 255); 
-	}
-	else
-	{
-		colors[2] = makecol((red1 + red2 + 1) / 2, // Average
-							(green1 + green2 + 1) / 2,
-							(blue1 + blue2 + 1) / 2, 255);
-		colors[3] = makecol(red2, green2, blue2, 0);  // Color2 but transparent
-	}
-
-	for (int y = 0; y < 4; y++)
-	{ 
-		int val = src->lines[y];
-		for (int x = 0; x < 4; x++)
-		{
-			dst[x] = colors[(val >> 6) & 3];
-			val <<= 2;
-		}
-		dst += pitch;
-	}
-}
-
-void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
-{
-	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
-	// Needs more speed.
-	u16 c1 = Common::swap16(src->color1);
-	u16 c2 = Common::swap16(src->color2);
-	int blue1 = Convert5To8(c1 & 0x1F);
-	int blue2 = Convert5To8(c2 & 0x1F);
-	int green1 = Convert6To8((c1 >> 5) & 0x3F);
-	int green2 = Convert6To8((c2 >> 5) & 0x3F);
-	int red1 = Convert5To8((c1 >> 11) & 0x1F);
-	int red2 = Convert5To8((c2 >> 11) & 0x1F);
-	int colors[4];
-	colors[0] = makeRGBA(red1, green1, blue1, 255);
-	colors[1] = makeRGBA(red2, green2, blue2, 255);
-	if (c1 > c2)
-	{
-		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
-		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
-		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
-		colors[2] = makeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
-		colors[3] = makeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255); 
-	}
-	else
-	{
-		colors[2] = makeRGBA((red1 + red2 + 1) / 2, // Average
-							(green1 + green2 + 1) / 2,
-							(blue1 + blue2 + 1) / 2, 255);
-		colors[3] = makeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
-	}
-
-	for (int y = 0; y < 4; y++)
-	{ 
-		int val = src->lines[y];
-		for (int x = 0; x < 4; x++)
-		{
-			dst[x] = colors[(val >> 6) & 3];
-			val <<= 2;
-		}
-		dst += pitch;
-	}
-}
-
-#if 0   // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8
-static void copyDXTBlock(u8* dst, const u8* src)
-{
-	((u16*)dst)[0] = Common::swap16(((u16*)src)[0]);
-	((u16*)dst)[1] = Common::swap16(((u16*)src)[1]);
-	u32 pixels = ((u32*)src)[1];
-	// A bit of trickiness here: the row are in the same order
-	// between the two formats, but the ordering within the rows
-	// is reversed.
-	pixels = ((pixels >> 4) & 0x0F0F0F0F) | ((pixels << 4) & 0xF0F0F0F0);
-	pixels = ((pixels >> 2) & 0x33333333) | ((pixels << 2) & 0xCCCCCCCC);
-	((u32*)dst)[1] = pixels;
-}
-#endif
-
-static PC_TexFormat GetPCFormatFromTLUTFormat(int tlutfmt)
-{
-	switch (tlutfmt)
-	{
-	case 0: return PC_TEX_FMT_IA8;    // IA8
-	case 1: return PC_TEX_FMT_RGB565; // RGB565
-	case 2: return PC_TEX_FMT_BGRA32; // RGB5A3: This TLUT format requires
-									  // extra work to decode.
-	}
-	return PC_TEX_FMT_NONE; // Error
-}
-
-PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt)
-{
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_I4:
-		return PC_TEX_FMT_IA8;
-	case GX_TF_I8:  // speed critical
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C8:
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_IA4:
-		return PC_TEX_FMT_IA4_AS_IA8;
-	case GX_TF_IA8:
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C14X2: 
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_RGB565:
-		return PC_TEX_FMT_RGB565;
-	case GX_TF_RGB5A3:
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_RGBA8:  // speed critical
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-			return PC_TEX_FMT_BGRA32;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_NONE;
-}
-
-
-//switch endianness, unswizzle
-//TODO: to save memory, don't blindly convert everything to argb8888
-//also ARGB order needs to be swapped later, to accommodate modern hardware better
-//need to add DXT support too
-PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
-{
-	const int Wsteps4 = (width + 3) / 4;
-	const int Wsteps8 = (width + 7) / 8;
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++)
-						decodebytesC4_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-		}
-		else
-		{
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++)
-						decodebytesC4_To_Raw16((u16*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_I4:
-		{
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8 ; iy < 8; iy++,xStep++)
-						for (int ix = 0; ix < 4; ix++)
-						{
-							int val = src[4 * xStep + ix];
-							dst[(y + iy) * width + x + ix * 2] = Convert4To8(val >> 4);
-							dst[(y + iy) * width + x + ix * 2 + 1] = Convert4To8(val & 0xF);
-						}
-		}
-	   return PC_TEX_FMT_I4_AS_I8;
-	case GX_TF_I8:  // speed critical
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						((u64*)(dst + (y + iy) * width + x))[0] = ((u64*)(src + 8 * xStep))[0];
-		}
-		return PC_TEX_FMT_I8;
-	case GX_TF_C8:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-		}
-		else
-		{
-
-			{
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesC8_To_Raw16((u16*)dst + (y + iy) * width + x, src  + 8 * xStep, tlutaddr);
-			}
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_IA4:
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesIA4((u16*)dst + (y + iy) * width + x, src + 8 * xStep);
-		}
-		return PC_TEX_FMT_IA4_AS_IA8;
-	case GX_TF_IA8:
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = yStep * 4; iy < 4; iy++, xStep++)
-					{
-						u16 *ptr = (u16 *)dst + (y + iy) * width + x;
-						u16 *s = (u16 *)(src + 8 * xStep);
-						for(int j = 0; j < 4; j++)
-							*ptr++ = Common::swap16(*s++);
-					}
-		}
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C14X2: 
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_To_Raw16((u16*)dst + (y + iy) * width + x,(u16*)(src + 8 * xStep), tlutaddr);
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_RGB565:
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					{
-						u16 *ptr = (u16 *)dst + (y + iy) * width + x;
-						u16 *s = (u16 *)(src + 8 * xStep);
-						for(int j = 0; j < 4; j++)
-							*ptr++ = Common::swap16(*s++);
-					}
-		}
-		return PC_TEX_FMT_RGB565;
-	case GX_TF_RGB5A3:
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						//decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)src, 4);
-						decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)(src + 8 * xStep));
-		}
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_RGBA8:  // speed critical
-		{
-			for (int y = 0; y < height; y += 4)
-			{
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-				{
-					const u8* src2 = src + 64 * yStep;
-					for (int iy = 0; iy < 4; iy++)
-						decodebytesARGB8_4((u32*)dst + (y+iy)*width + x, (u16*)src2 + 4 * iy, (u16*)src2 + 4 * iy + 16);
-				}
-			}
-		}
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-#if 0   // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8
-			// 11111111 22222222 55555555 66666666
-			// 33333333 44444444 77777777 88888888
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0; x < width; x += 8)
-				{
-					copyDXTBlock(dst+(y/2)*width+x*2, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2)*width+x*2+8, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2+2)*width+x*2, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2+2)*width+x*2+8, src);
-					src += 8;
-				}
-			}
-			return PC_TEX_FMT_DXT1;
-#else
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-				{
-					const u8* src2 = src + 4 * sizeof(DXTBlock) * yStep; 
-					decodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src2, width);										
-				}
-			}
-#endif
-			return PC_TEX_FMT_BGRA32;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_NONE;
-}
-
-
-
-// JSD 01/06/11:
-// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to
-// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128
-// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples
-// of 16 in the aligned case.
-// TODO: complete SSE2 optimization of less often used texture formats.
-// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads.
-
-PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
-{
-
-	const int Wsteps4 = (width + 3) / 4;
-	const int Wsteps8 = (width + 7) / 8;
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4_5A3_To_rgba32(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-		}
-		else if(tlutfmt == 0)
-		{
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4IA8_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-		}
-		else
-		{
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4RGB565_To_RGBA(dst + (y + iy) * width + x, src  + 4 * xStep, tlutaddr);
-		}
-		break;
-	case GX_TF_I4:
-		{
-			// Reference C implementation:
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0; x < width; x += 8)
-					for (int iy = 0; iy < 8; iy++, src += 4)
-						for (int ix = 0; ix < 4; ix++)
-						{
-							int val = src[ix];
-							u8 i1 = Convert4To8(val >> 4);
-							u8 i2 = Convert4To8(val & 0xF);
-							memset(dst+(y + iy) * width + x + ix * 2 , i1,4);
-							memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4);
-						}
-		}
-	   break;
-	case GX_TF_I8:  // speed critical
-		{
-			// Reference C implementation
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0; x < width; x += 8)
-					for (int iy = 0; iy < 4; ++iy, src += 8)
-					{
-						u32 *  newdst = dst + (y + iy)*width+x;
-						const u8 *  newsrc = src;
-						u8 srcval;
-
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-						srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
-					}
-		}
-		break;
-	case GX_TF_C8:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8_5A3_To_RGBA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-		}
-		else if(tlutfmt == 0)
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8IA8_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-		}
-		else
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8RGB565_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);			
-
-		}
-		break;
-	case GX_TF_IA4:
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesIA4RGBA(dst + (y + iy) * width + x, src + 8 * xStep);
-		}
-		break;
-	case GX_TF_IA8:
-		{
-			// Reference C implementation:
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0; x < width; x += 4)
-					for (int iy = 0; iy < 4; iy++, src += 8)
-					{
-						u32 *ptr = dst + (y + iy) * width + x;
-						u16 *s = (u16 *)src;
-						ptr[0] = decodeIA8Swapped(s[0]);
-						ptr[1] = decodeIA8Swapped(s[1]);
-						ptr[2] = decodeIA8Swapped(s[2]);
-						ptr[3] = decodeIA8Swapped(s[3]);
-					}
-		}
-		break;
-	case GX_TF_C14X2:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_5A3_To_BGRA32(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else if (tlutfmt == 0)
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2IA8_To_RGBA(dst + (y + iy) * width + x,  (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else
-		{
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2rgb565_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		break;
-	case GX_TF_RGB565:
-		{
-			// Reference C implementation.
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0; x < width; x += 4)
-					for (int iy = 0; iy < 4; iy++, src += 8)
-					{
-						u32 *ptr = dst + (y + iy) * width + x;
-						u16 *s = (u16 *)src;
-						for(int j = 0; j < 4; j++)
-							*ptr++ = decode565RGBA(Common::swap16(*s++));
-					}
-		}
-		break;
-	case GX_TF_RGB5A3:
-		{
-			// Reference C implementation:
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0; x < width; x += 4)
-					for (int iy = 0; iy < 4; iy++, src += 8)
-						decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src);
-		}
-		break;
-	case GX_TF_RGBA8:  // speed critical
-		{
-			// Reference C implementation.
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0; x < width; x += 4)
-				{
-					for (int iy = 0; iy < 4; iy++)
-						decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16);
-					src += 64;
-				}
-		}
-		break;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0; x < width; x += 8)
-				{
-					decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-					decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width);
-										src += sizeof(DXTBlock);
-				}
-			}
-			break;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_RGBA32;
-}
-
-
-
-
-void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center)
-{
-	TexFmt_Overlay_Enable = enable;
-	TexFmt_Overlay_Center = center;
-}
-
-PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly)
-{
-	PC_TexFormat retval = TexDecoder_Decode_OpenCL(dst, src,
-		width, height, texformat, tlutaddr, tlutfmt, rgbaOnly);
-	if (retval == PC_TEX_FMT_NONE)
-		retval = rgbaOnly ? TexDecoder_Decode_RGBA((u32*)dst, src,
-				width, height, texformat, tlutaddr, tlutfmt)
-			: TexDecoder_Decode_real(dst, src,
-				width, height, texformat, tlutaddr, tlutfmt);
-
-	if ((!TexFmt_Overlay_Enable)|| (retval == PC_TEX_FMT_NONE))
-		return retval;
-
-	int w = min(width, 40);
-	int h = min(height, 10);
-
-	int xoff = (width - w) >> 1;
-	int yoff = (height - h) >> 1;
-
-	if (!TexFmt_Overlay_Center)
-	{
-		xoff=0;
-		yoff=0;
-	}
-
-	const char* fmt = texfmt[texformat&15];
-	while (*fmt)
-	{
-		int xcnt = 0;
-		int nchar = sfont_map[(int)*fmt];
-		
-		const unsigned char *ptr = sfont_raw[nchar]; // each char is up to 9x10
-
-		for (int x = 0; x < 9;x++)
-		{
-			if (ptr[x] == 0x78)
-				break;
-			xcnt++;
-		}
-
-		for (int y=0; y < 10; y++)
-		{
-			for (int x=0; x < xcnt; x++)
-			{
-				switch(retval)
-				{
-				case PC_TEX_FMT_I8:
-					{
-						// TODO: Is this an acceptable way to draw in I8?
-						u8  *dtp = (u8*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFF : 0x88;
-						break;
-					}
-				case PC_TEX_FMT_IA8:
-				case PC_TEX_FMT_IA4_AS_IA8:
-					{
-						u16  *dtp = (u16*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFF : 0xFF00;
-						break;
-					}
-				case PC_TEX_FMT_RGB565:
-					{
-						u16  *dtp = (u16*)dst;
-						dtp[(y + yoff)*width + x + xoff] = ptr[x] ? 0xFFFF : 0x0000;
-						break;
-					}
-				default:
-				case PC_TEX_FMT_BGRA32:
-					{
-						int  *dtp = (int*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFFFFFF : 0xFF000000;
-						break;
-					}
-				}
-			}
-			ptr += 9;
-		}
-		xoff += xcnt;
-		fmt++;
-	}
-
-	return retval;
-}
-
-
-
-void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt)
-{
-	/* General formula for computing texture offset
-	// 
-	u16 sBlk = s / blockWidth;
-	u16 tBlk = t / blockHeight;
-	u16 widthBlks = (width / blockWidth) + 1;
-	u32 base = (tBlk * widthBlks + sBlk) * blockWidth * blockHeight;
-	u16 blkS = s & (blockWidth - 1);
-	u16 blkT =  t & (blockHeight - 1);
-	u32 blkOff = blkT * blockWidth + blkS;
-	*/
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 3;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 7;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			int rs = (blkOff & 1)?0:4;
-			u32 offset = base + (blkOff >> 1);
-
-			u8 val = (*(src + offset) >> rs) & 0xF;
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_I4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 3;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 7;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			int rs = (blkOff & 1)?0:4;
-			u32 offset = base + (blkOff >> 1);
-
-			u8 val = (*(src + offset) >> rs) & 0xF;
-			val = Convert4To8(val);
-			dst[0] = val;
-			dst[1] = val;
-			dst[2] = val;
-			dst[3] = val;
-		}
-	   break;
-	case GX_TF_I8:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			dst[0] = val;
-			dst[1] = val;
-			dst[2] = val;
-			dst[3] = val;
-		}
-		break;
-	case GX_TF_C8:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_IA4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			const u8 a = Convert4To8(val>>4);
-			const u8 l = Convert4To8(val&0xF);
-			dst[0] = l;
-			dst[1] = l;
-			dst[2] = l;
-			dst[3] = a;
-		}
-		break;
-	case GX_TF_IA8:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decodeIA8Swapped(*valAddr);
-		}
-		break;
-	case GX_TF_C14X2: 
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			u16 val = Common::swap16(*valAddr) & 0x3FFF;
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_RGB565:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decode565RGBA(Common::swap16(*valAddr));
-		}
-		break;
-	case GX_TF_RGB5A3:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decode5A3RGBA(Common::swap16(*valAddr));
-		}
-		break;
-	case GX_TF_RGBA8:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5; // shift by 5 is correct
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1 ;
-			const u8* valAddr = src + offset;
-
-			dst[3] = valAddr[0];
-			dst[0] = valAddr[1];
-			dst[1] = valAddr[32];
-			dst[2] = valAddr[33];
-		}
-		break;
-	case GX_TF_CMPR:
-		{
-			u16 sDxt = s >> 2;
-			u16 tDxt = t >> 2;
-
-			u16 sBlk = sDxt >> 1;
-			u16 tBlk = tDxt >> 1;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 2;
-			u16 blkS = sDxt & 1;
-			u16 blkT =  tDxt & 1;
-			u32 blkOff = (blkT << 1) + blkS;
-
-			u32 offset = (base + blkOff) << 3;
-
-			const DXTBlock* dxtBlock = (const DXTBlock*)(src + offset);
-
-			u16 c1 = Common::swap16(dxtBlock->color1);
-			u16 c2 = Common::swap16(dxtBlock->color2);
-			int blue1 = Convert5To8(c1 & 0x1F);
-			int blue2 = Convert5To8(c2 & 0x1F);
-			int green1 = Convert6To8((c1 >> 5) & 0x3F);
-			int green2 = Convert6To8((c2 >> 5) & 0x3F);
-			int red1 = Convert5To8((c1 >> 11) & 0x1F);
-			int red2 = Convert5To8((c2 >> 11) & 0x1F);
-
-			u16 ss = s & 3;
-			u16 tt = t & 3;
-
-			int colorSel = dxtBlock->lines[tt];
-			int rs = 6 - (ss << 1);
-			colorSel = (colorSel >> rs) & 3;
-			colorSel |= c1 > c2?0:4;
-
-			u32 color = 0;
-
-			switch (colorSel)
-			{
-				case 0:
-				case 4:
-					color = makeRGBA(red1, green1, blue1, 255);
-					break;
-				case 1:
-				case 5:
-					color = makeRGBA(red2, green2, blue2, 255);
-					break;
-				case 2:
-					color = makeRGBA(red1+(red2-red1)/3, green1+(green2-green1)/3, blue1+(blue2-blue1)/3, 255);
-					break;
-				case 3:
-					color = makeRGBA(red2+(red1-red2)/3, green2+(green1-green2)/3, blue2+(blue1-blue2)/3, 255);
-					break;
-				case 6:
-					color = makeRGBA((int)ceil((float)(red1+red2)/2), (int)ceil((float)(green1+green2)/2), (int)ceil((float)(blue1+blue2)/2), 255);
-					break;
-				case 7:
-					color = makeRGBA(red2, green2, blue2, 0);
-					break;
-			}
-
-			*((u32*)dst) = color;
-		}
-		break;
-	}
-}
-
-void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth)
-{
-	u16 sBlk = s >> 2;
-	u16 tBlk = t >> 2;
-	u16 widthBlks = (imageWidth >> 2) + 1; // TODO: Looks wrong. Shouldn't this be ((imageWidth-1)>>2)+1 ?
-	u32 base_ar = (tBlk * widthBlks + sBlk) << 4;
-	u32 base_gb = (tBlk * widthBlks + sBlk) << 4;
-	u16 blkS = s & 3;
-	u16 blkT =  t & 3;
-	u32 blk_off = (blkT << 2) + blkS;
-
-	u32 offset_ar = (base_ar + blk_off) << 1;
-	u32 offset_gb = (base_gb + blk_off) << 1;
-	const u8* val_addr_ar = src_ar + offset_ar;
-	const u8* val_addr_gb = src_gb + offset_gb;
-
-	dst[3] = val_addr_ar[0]; // A
-	dst[0] = val_addr_ar[1]; // R
-	dst[1] = val_addr_gb[0]; // G
-	dst[2] = val_addr_gb[1]; // B
-}
-
-PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height)
-{
-	// TODO for someone who cares: Make this less slow!
-	for (int y = 0; y < height; ++y)
-		for (int x = 0; x < width; ++x)
-		{
-			TexDecoder_DecodeTexelRGBA8FromTmem(dst, src_ar, src_gb, x, y, width-1);
-			dst += 4;
-		}
-
-	return PC_TEX_FMT_RGBA32;
-}
-
-const char* texfmt[] = {
-	// pixel
-	"I4",		"I8",		"IA4",		"IA8",
-	"RGB565",	"RGB5A3",	"RGBA8",	"0x07",
-	"C4",		"C8",		"C14X2",	"0x0B",
-	"0x0C",		"0x0D",		"CMPR",		"0x0F",
-	// Z-buffer
-	"0x10",		"Z8",		"0x12",		"Z16",
-	"0x14",		"0x15",		"Z24X8",	"0x17",
-	"0x18",		"0x19",		"0x1A",		"0x1B",
-	"0x1C",		"0x1D",		"0x1E",		"0x1F",
-	// pixel + copy
-	"CR4",		"0x21",		"CRA4",		"CRA8",
-	"0x24",		"0x25",		"CYUVA8",	"CA8",
-	"CR8",		"CG8",		"CB8",		"CRG8",
-	"CGB8",		"0x2D",		"0x2E",		"0x2F",
-	// Z + copy
-	"CZ4",		"0x31",		"0x32",		"0x33",
-	"0x34",		"0x35",		"0x36",		"0x37",
-	"0x38",		"CZ8M",		"CZ8L",		"0x3B",
-	"CZ16L",	"0x3D",		"0x3E",		"0x3F",
-};
-
-const unsigned char sfont_map[] = {
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,10,10,10,10,
-	10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,
-	26,27,28,29,30,31,32,33,34,35,36,10,10,10,10,10,
-	10,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,
-	52,53,54,55,56,57,58,59,60,61,62,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-};
-
-const unsigned char sfont_raw[][9*10] = {
-	{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},
-};
diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
deleted file mode 100644
index 80bc41f089..0000000000
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "HiresTextures.h"
-
-#include <cstring>
-#include <utility>
-#include <algorithm>
-#include <SOIL/SOIL.h>
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "FileSearch.h"
-#include "StringUtil.h"
-
-namespace HiresTextures
-{
-
-std::map<std::string, std::string> textureMap;
-
-void Init(const char *gameCode)
-{
-	textureMap.clear();
-
-	CFileSearch::XStringVector Directories;
-	//Directories.push_back(File::GetUserPath(D_HIRESTEXTURES_IDX));
-	char szDir[MAX_PATH];
-	sprintf(szDir, "%s%s", File::GetUserPath(D_HIRESTEXTURES_IDX).c_str(), gameCode);
-	Directories.push_back(std::string(szDir));
-	
-
-	for (u32 i = 0; i < Directories.size(); i++)
-	{
-		File::FSTEntry FST_Temp;
-		File::ScanDirectoryTree(Directories[i], FST_Temp);
-		for (u32 j = 0; j < FST_Temp.children.size(); j++)
-		{
-			if (FST_Temp.children.at(j).isDirectory)
-			{
-				bool duplicate = false;
-				for (u32 k = 0; k < Directories.size(); k++)
-				{
-					if (strcmp(Directories[k].c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0)
-					{
-						duplicate = true;
-						break;
-					}
-				}
-				if (!duplicate)
-					Directories.push_back(FST_Temp.children.at(j).physicalName.c_str());
-			}
-		}
-	}
-
-	CFileSearch::XStringVector Extensions;
-	Extensions.push_back("*.png");
-	Extensions.push_back("*.bmp");
-	Extensions.push_back("*.tga");
-	Extensions.push_back("*.dds");
-	Extensions.push_back("*.jpg"); // Why not? Could be useful for large photo-like textures
-
-	CFileSearch FileSearch(Extensions, Directories);
-	const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();
-	char code[MAX_PATH];
-	sprintf(code, "%s_", gameCode);
-
-	if (rFilenames.size() > 0)
-	{
-		for (u32 i = 0; i < rFilenames.size(); i++)
-		{
-			std::string FileName;
-			SplitPath(rFilenames[i], NULL, &FileName, NULL);
-
-			if (FileName.substr(0, strlen(code)).compare(code) == 0 && textureMap.find(FileName) == textureMap.end())
-				textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilenames[i]));
-		}
-	}
-}
-
-bool HiresTexExists(const char* filename)
-{
-	std::string key(filename);
-	return textureMap.find(key) != textureMap.end();
-}
-
-PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned int *pHeight, unsigned int *required_size, int texformat, unsigned int data_size, u8 *data)
-{
-	std::string key(fileName);
-	if (textureMap.find(key) == textureMap.end())
-		return PC_TEX_FMT_NONE;
-
-	int width;
-	int height;
-	int channels;
-
-	u8 *temp = SOIL_load_image(textureMap[key].c_str(), &width, &height, &channels, SOIL_LOAD_RGBA);
-	if (temp == NULL)
-	{
-		ERROR_LOG(VIDEO, "Custom texture %s failed to load", textureMap[key].c_str());
-		return PC_TEX_FMT_NONE;
-	}
-
-	*pWidth = width;
-	*pHeight = height;
-
-	int offset = 0;
-	PC_TexFormat returnTex = PC_TEX_FMT_NONE;
-
-	switch (texformat)
-	{
-	case GX_TF_I4:
-	case GX_TF_I8:
-	case GX_TF_IA4:
-	case GX_TF_IA8:
-		*required_size = width * height * 8;
-		if (data_size < *required_size)
-			goto cleanup;
-
-		for (int i = 0; i < width * height * 4; i += 4)
-		{
-			// Rather than use a luminosity function, just use the most intense color for luminance
-			// TODO(neobrain): Isn't this kind of.. stupid?
-			data[offset++] = *std::max_element(temp+i, temp+i+3);
-			data[offset++] = temp[i+3];
-		}
-		returnTex = PC_TEX_FMT_IA8;
-		break;
-	default:
-		*required_size = width * height * 4;
-		if (data_size < *required_size)
-			goto cleanup;
-
-		memcpy(data, temp, width * height * 4);
-		returnTex = PC_TEX_FMT_RGBA32;
-		break;
-	}
-
-	INFO_LOG(VIDEO, "Loading custom texture from %s", textureMap[key].c_str());
-cleanup:
-	SOIL_free_image_data(temp);
-	return returnTex;
-}
-
-}
diff --git a/Source/Core/VideoCommon/Src/HiresTextures.h b/Source/Core/VideoCommon/Src/HiresTextures.h
deleted file mode 100644
index f2249a3c18..0000000000
--- a/Source/Core/VideoCommon/Src/HiresTextures.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _HIRESTEXTURES_H
-#define _HIRESTEXTURES_H
-
-#include <map>
-#include "VideoCommon.h"
-#include "TextureDecoder.h"
-
-namespace HiresTextures
-{
-void Init(const char *gameCode);
-bool HiresTexExists(const char *filename);
-PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned int *pHeight, unsigned int *required_size, int texformat, unsigned int data_size, u8 *data);
-
-};
-
-#endif // _HIRESTEXTURES_H
diff --git a/Source/Core/VideoCommon/Src/ImageWrite.cpp b/Source/Core/VideoCommon/Src/ImageWrite.cpp
deleted file mode 100644
index e8f3f68123..0000000000
--- a/Source/Core/VideoCommon/Src/ImageWrite.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <list>
-#include <vector>
-
-#include "ImageWrite.h"
-#include "FileUtil.h"
-
-#pragma pack(push, 1)
-
-struct TGA_HEADER
-{
-	u8  identsize;          // size of ID field that follows 18 u8 header (0 usually)
-	u8  colourmaptype;      // type of colour map 0=none, 1=has palette
-	u8  imagetype;          // type of image 0=none,1=indexed,2=rgb,3=grey,+8=rle packed
-
-	s16 colourmapstart;     // first colour map entry in palette
-	s16 colourmaplength;    // number of colours in palette
-	u8  colourmapbits;      // number of bits per palette entry 15,16,24,32
-
-	s16 xstart;             // image x origin
-	s16 ystart;             // image y origin
-	s16 width;              // image width in pixels
-	s16 height;             // image height in pixels
-	u8  bits;               // image bits per pixel 8,16,24,32
-	u8  descriptor;         // image descriptor bits (vh flip bits)
-	
-	// pixel data follows header
-};
-
-#pragma pack(pop)
-
-bool SaveTGA(const char* filename, int width, int height, void* pdata)
-{
-	TGA_HEADER hdr;
-	File::IOFile f(filename, "wb");
-	if (!f)
-		return false;
-
-	_assert_(sizeof(TGA_HEADER) == 18 && sizeof(hdr) == 18);
-
-	memset(&hdr, 0, sizeof(hdr));
-	hdr.imagetype = 2;
-	hdr.bits = 32;
-	hdr.width = width;
-	hdr.height = height;
-	hdr.descriptor |= 8|(1<<5); // 8bit alpha, flip vertical
-
-	f.WriteArray(&hdr, 1);
-	f.WriteBytes(pdata, width * height * 4);
-
-	return true;
-}
-
-bool SaveData(const char* filename, const char* data)
-{
-	std::ofstream f;
-	OpenFStream(f, filename, std::ios::binary);
-	f << data;
-
-	return true;
-}
diff --git a/Source/Core/VideoCommon/Src/ImageWrite.h b/Source/Core/VideoCommon/Src/ImageWrite.h
deleted file mode 100644
index 7d1d6fa1e8..0000000000
--- a/Source/Core/VideoCommon/Src/ImageWrite.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _IMAGEWRITE_H
-#define _IMAGEWRITE_H
-
-#include "Common.h"
-
-bool SaveTGA(const char* filename, int width, int height, void* pdata);
-bool SaveData(const char* filename, const char* pdata);
-
-#endif  // _IMAGEWRITE_H
-
diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.cpp b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
deleted file mode 100644
index 25597862e0..0000000000
--- a/Source/Core/VideoCommon/Src/IndexGenerator.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cstddef>
-
-#include "Common.h"
-#include "VideoConfig.h"
-#include "IndexGenerator.h"
-
-//Init
-u16 *IndexGenerator::Tptr;
-u16 *IndexGenerator::BASETptr;
-u16 *IndexGenerator::Lptr;
-u16 *IndexGenerator::BASELptr;
-u16 *IndexGenerator::Pptr;
-u16 *IndexGenerator::BASEPptr;
-u32 IndexGenerator::numT;
-u32 IndexGenerator::numL;
-u32 IndexGenerator::numP;
-u32 IndexGenerator::index;
-
-static const u16 s_primitive_restart = -1;
-
-static void (*primitive_table[8])(u32);
-
-void IndexGenerator::Init()
-{
-	if(g_Config.backend_info.bSupportsPrimitiveRestart)
-	{
-		primitive_table[0] = IndexGenerator::AddQuads<true>;
-		primitive_table[2] = IndexGenerator::AddList<true>;
-		primitive_table[3] = IndexGenerator::AddStrip<true>;
-		primitive_table[4] = IndexGenerator::AddFan<true>;
-	}
-	else
-	{
-		primitive_table[0] = IndexGenerator::AddQuads<false>;
-		primitive_table[2] = IndexGenerator::AddList<false>;
-		primitive_table[3] = IndexGenerator::AddStrip<false>;
-		primitive_table[4] = IndexGenerator::AddFan<false>;
-	}
-	primitive_table[1] = NULL;
-	primitive_table[5] = &IndexGenerator::AddLineList;
-	primitive_table[6] = &IndexGenerator::AddLineStrip;
-	primitive_table[7] = &IndexGenerator::AddPoints;
-}
-
-void IndexGenerator::Start(u16* Triangleptr, u16* Lineptr, u16* Pointptr)
-{
-	Tptr = Triangleptr;
-	Lptr = Lineptr;
-	Pptr = Pointptr;
-	BASETptr = Triangleptr;
-	BASELptr = Lineptr;
-	BASEPptr = Pointptr;
-	index = 0;
-	numT = 0;
-	numL = 0;
-	numP = 0;
-}
-
-void IndexGenerator::AddIndices(int primitive, u32 numVerts)
-{
-	primitive_table[primitive](numVerts);
-	index += numVerts;
-}
-
-// Triangles
-template <bool pr> __forceinline void IndexGenerator::WriteTriangle(u32 index1, u32 index2, u32 index3)
-{
-	*Tptr++ = index1;
-	*Tptr++ = index2;
-	*Tptr++ = index3;
-	if(pr)
-		*Tptr++ = s_primitive_restart;
-	
-	++numT;
-}
-
-template <bool pr> void IndexGenerator::AddList(u32 const numVerts)
-{
-	for (u32 i = 2; i < numVerts; i+=3)
-	{
-		WriteTriangle<pr>(index + i - 2, index + i - 1, index + i);
-	}
-}
-
-template <bool pr> void IndexGenerator::AddStrip(u32 const numVerts)
-{
-	if(pr)
-	{
-		for (u32 i = 0; i < numVerts; ++i)
-		{
-			*Tptr++ = index + i;
-		}
-		*Tptr++ = s_primitive_restart;
-		numT += numVerts - 2;
-		
-	}
-	else
-	{
-		bool wind = false;
-		for (u32 i = 2; i < numVerts; ++i)
-		{
-			WriteTriangle<pr>(
-				index + i - 2,
-				index + i - !wind,
-				index + i - wind);
-
-			wind ^= true;
-		}
-	}
-}
-
-/**
- * FAN simulator:
- * 
- *   2---3
- *  / \ / \
- * 1---0---4
- * 
- * would generate this triangles:
- * 012, 023, 034
- * 
- * rotated (for better striping):
- * 120, 302, 034
- * 
- * as odd ones have to winded, following strip is fine:
- * 12034
- * 
- * so we use 6 indices for 3 triangles
- */
-
-template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
-{
-	u32 i = 2;
-	
-	if(pr)
-	{
-		for(; i+3<=numVerts; i+=3)
-		{
-			*Tptr++ = index + i - 1;
-			*Tptr++ = index + i + 0;
-			*Tptr++ = index;
-			*Tptr++ = index + i + 1;
-			*Tptr++ = index + i + 2;
-			*Tptr++ = s_primitive_restart;
-			numT += 3;
-		}
-		
-		for(; i+2<=numVerts; i+=2)
-		{
-			*Tptr++ = index + i - 1;
-			*Tptr++ = index + i + 0;
-			*Tptr++ = index;
-			*Tptr++ = index + i + 1;
-			*Tptr++ = s_primitive_restart;
-			numT += 2;
-		}
-	}
-	
-	for (; i < numVerts; ++i)
-	{
-		WriteTriangle<pr>(index, index + i - 1, index + i);
-	}
-}
-
-/*
- * QUAD simulator
- * 
- * 0---1   4---5
- * |\  |   |\  |
- * | \ |   | \ |
- * |  \|   |  \|
- * 3---2   7---6
- * 
- * 012,023, 456,467 ...
- * or 120,302, 564,746
- * or as strip: 1203, 5647
- * 
- * Warning: 
- * A simple triangle has to be rendered for three vertices.
- * ZWW do this for sun rays
- */
-template <bool pr> void IndexGenerator::AddQuads(u32 numVerts)
-{
-	u32 i = 3;
-	for (; i < numVerts; i+=4)
-	{
-		if(pr)
-		{
-			*Tptr++ = index + i - 2;
-			*Tptr++ = index + i - 1;
-			*Tptr++ = index + i - 3;
-			*Tptr++ = index + i - 0;
-			*Tptr++ = s_primitive_restart;
-			numT += 2;
-		}
-		else
-		{
-			WriteTriangle<pr>(index + i - 3, index + i - 2, index + i - 1);
-			WriteTriangle<pr>(index + i - 3, index + i - 1, index + i - 0);
-		}
-	}
-
-	// three vertices remaining, so render a triangle
-	if(i == numVerts)
-	{
-		WriteTriangle<pr>(index+numVerts-3, index+numVerts-2, index+numVerts-1);
-	}
-}
-
-// Lines
-void IndexGenerator::AddLineList(u32 numVerts)
-{
-	for (u32 i = 1; i < numVerts; i+=2)
-	{
-		*Lptr++ = index + i - 1;
-		*Lptr++ = index + i;
-		++numL;
-	}
-	
-}
-
-// shouldn't be used as strips as LineLists are much more common
-// so converting them to lists
-void IndexGenerator::AddLineStrip(u32 numVerts)
-{
-	for (u32 i = 1; i < numVerts; ++i)
-	{
-		*Lptr++ = index + i - 1;
-		*Lptr++ = index + i;
-		++numL;
-	}
-}
-
-// Points
-void IndexGenerator::AddPoints(u32 numVerts)
-{
-	for (u32 i = 0; i != numVerts; ++i)
-	{
-		*Pptr++ = index + i;
-		++numP;
-	}
-}
-
-
-u32 IndexGenerator::GetRemainingIndices()
-{
-	u32 max_index = 65534; // -1 is reserved for primitive restart (ogl + dx11)
-	return max_index - index;
-}
diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.h b/Source/Core/VideoCommon/Src/IndexGenerator.h
deleted file mode 100644
index 1f25119bc0..0000000000
--- a/Source/Core/VideoCommon/Src/IndexGenerator.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// This is currently only used by the DX backend, but it may make sense to
-// use it in the GL backend or a future DX10 backend too.
-
-#ifndef _INDEXGENERATOR_H
-#define _INDEXGENERATOR_H
-#include "CommonTypes.h"
-
-class IndexGenerator
-{
-public:
-	// Init
-	static void Init();
-	static void Start(u16 *Triangleptr,u16 *Lineptr,u16 *Pointptr);
-
-	static void AddIndices(int primitive, u32 numVertices);
-
-	// Interface
-	static u32 GetNumTriangles() {return numT;}
-	static u32 GetNumLines() {return numL;}
-	static u32 GetNumPoints() {return numP;}
-
-	// returns numprimitives
-	static u32 GetNumVerts() {return index;}
-
-	static u32 GetTriangleindexLen() {return (u32)(Tptr - BASETptr);}
-	static u32 GetLineindexLen() {return (u32)(Lptr - BASELptr);}
-	static u32 GetPointindexLen() {return (u32)(Pptr - BASEPptr);}
-	
-	static u32 GetRemainingIndices();
-/*
-	enum IndexPrimitiveType
-	{
-		Prim_None = 0,
-		Prim_List,
-		Prim_Strip,
-		Prim_Fan
-	};
-*/
-private:
-	// Triangles
-	template <bool pr> static void AddList(u32 numVerts);
-	template <bool pr> static void AddStrip(u32 numVerts);
-	template <bool pr> static void AddFan(u32 numVerts);
-	template <bool pr> static void AddQuads(u32 numVerts);
-
-	// Lines
-	static void AddLineList(u32 numVerts);
-	static void AddLineStrip(u32 numVerts);
-
-	// Points
-	static void AddPoints(u32 numVerts);
-
-	template <bool pr> static void WriteTriangle(u32 index1, u32 index2, u32 index3);
-
-	static u16 *Tptr;
-	static u16 *BASETptr;
-	static u16 *Lptr;
-	static u16 *BASELptr;
-	static u16 *Pptr;
-	static u16 *BASEPptr;
-	// TODO: redundant variables
-	static u32 numT;
-	static u32 numL;
-	static u32 numP;
-	static u32 index;
-};
-
-#endif  // _INDEXGENERATOR_H
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
deleted file mode 100644
index 17dd0a6273..0000000000
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LIGHTINGSHADERGEN_H_
-#define _LIGHTINGSHADERGEN_H_
-
-#include "ShaderGenCommon.h"
-#include "NativeVertexFormat.h"
-#include "XFMemory.h"
-
-
-#define LIGHT_COL "%s[5*%d].%s"
-#define LIGHT_COL_PARAMS(lightsName, index, swizzle) (lightsName), (index), (swizzle)
-
-#define LIGHT_COSATT "%s[5*%d+1]"
-#define LIGHT_COSATT_PARAMS(lightsName, index) (lightsName), (index)
-
-#define LIGHT_DISTATT "%s[5*%d+2]"
-#define LIGHT_DISTATT_PARAMS(lightsName, index) (lightsName), (index)
-
-#define LIGHT_POS "%s[5*%d+3]"
-#define LIGHT_POS_PARAMS(lightsName, index) (lightsName), (index)
-
-#define LIGHT_DIR "%s[5*%d+4]"
-#define LIGHT_DIR_PARAMS(lightsName, index) (lightsName), (index)
-
-/**
- * Common uid data used for shader generators that use lighting calculations.
- */
-struct LightingUidData
-{
-	u32 matsource : 4; // 4x1 bit
-	u32 enablelighting : 4; // 4x1 bit
-	u32 ambsource : 4; // 4x1 bit
-	u32 diffusefunc : 8; // 4x2 bits
-	u32 attnfunc : 8; // 4x2 bits
-	u32 light_mask : 32; // 4x8 bits
-};
-
-
-template<class T>
-static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
-{
-	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
-	const char* swizzle = "xyzw";
-	if (coloralpha == 1)
-		swizzle = "xyz";
-	else if (coloralpha == 2)
-		swizzle = "w";
-
-	uid_data.attnfunc |= chan.attnfunc << (2*litchan_index);
-	uid_data.diffusefunc |= chan.diffusefunc << (2*litchan_index);
-	if (!(chan.attnfunc & 1))
-	{
-		// atten disabled
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += " LIGHT_COL";\n", swizzle, LIGHT_COL_PARAMS(lightsName, index, swizzle));
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(lightsName, index));
-				object.Write("lacc.%s += %sdot(ldir, _norm0)) * " LIGHT_COL";\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", LIGHT_COL_PARAMS(lightsName, index, swizzle));
-				break;
-			default: _assert_(0);
-		}
-	}
-	else // spec and spot
-	{
-		if (chan.attnfunc == 3)
-		{ // spot
-			object.Write("ldir = " LIGHT_POS".xyz - pos.xyz;\n", LIGHT_POS_PARAMS(lightsName, index));
-			object.Write("dist2 = dot(ldir, ldir);\n"
-						"dist = sqrt(dist2);\n"
-						"ldir = ldir / dist;\n"
-						"attn = max(0.0f, dot(ldir, " LIGHT_DIR".xyz));\n",
-						LIGHT_DIR_PARAMS(lightsName, index));
-			// attn*attn may overflow
-			object.Write("attn = max(0.0f, " LIGHT_COSATT".x + " LIGHT_COSATT".y*attn + " LIGHT_COSATT".z*attn*attn) / dot(" LIGHT_DISTATT".xyz, float3(1.0f,dist,dist2));\n",
-						LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index));
-		}
-		else if (chan.attnfunc == 1)
-		{ // specular
-			object.Write("ldir = normalize(" LIGHT_POS".xyz);\n", LIGHT_POS_PARAMS(lightsName, index));
-			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, " LIGHT_DIR".xyz)) : 0.0f;\n", LIGHT_DIR_PARAMS(lightsName, index));
-			// attn*attn may overflow
-			object.Write("attn = max(0.0f, " LIGHT_COSATT".x + " LIGHT_COSATT".y*attn + " LIGHT_COSATT".z*attn*attn) / (" LIGHT_DISTATT".x + " LIGHT_DISTATT".y*attn + " LIGHT_DISTATT".z*attn*attn);\n",
-						LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index), LIGHT_COSATT_PARAMS(lightsName, index),
-						LIGHT_DISTATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index), LIGHT_DISTATT_PARAMS(lightsName, index));
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += attn * " LIGHT_COL";\n", swizzle, LIGHT_COL_PARAMS(lightsName, index, swizzle));
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * " LIGHT_COL";\n",
-					swizzle,
-					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
-					LIGHT_COL_PARAMS(lightsName, index, swizzle));
-				break;
-			default: _assert_(0);
-		}
-	}
-	object.Write("\n");
-}
-
-// vertex shader
-// lights/colors
-// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
-// inColorName is color in vs and colors_ in ps
-// dest is o.colors_ in vs and colors_ in ps
-template<class T>
-static void GenerateLightingShader(T& object, LightingUidData& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
-{
-	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
-	{
-		const LitChannel& color = xfregs.color[j];
-		const LitChannel& alpha = xfregs.alpha[j];
-
-		object.Write("{\n");
-
-		uid_data.matsource |= xfregs.color[j].matsource << j;
-		if (color.matsource) // from vertex
-		{
-			if (components & (VB_HAS_COL0 << j))
-				object.Write("mat = %s%d;\n", inColorName, j);
-			else if (components & VB_HAS_COL0)
-				object.Write("mat = %s0;\n", inColorName);
-			else
-				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-		else // from color
-		{
-			object.Write("mat = %s[%d];\n", materialsName, j+2);
-		}
-
-		uid_data.enablelighting |= xfregs.color[j].enablelighting << j;
-		if (color.enablelighting)
-		{
-			uid_data.ambsource |= xfregs.color[j].ambsource << j;
-			if (color.ambsource) // from vertex
-			{
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc = %s%d;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc = %s0;\n", inColorName);
-				else
-					// TODO: this isn't verified. Here we want to read the ambient from the vertex,
-					// but the vertex itself has no color. So we don't know which value to read.
-					// Returing 1.0 is the same as disabled lightning, so this could be fine
-					object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-			}
-			else // from color
-			{
-				object.Write("lacc = %s[%d];\n", materialsName, j);
-			}
-		}
-		else
-		{
-			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-
-		// check if alpha is different
-		uid_data.matsource |= xfregs.alpha[j].matsource << (j+2);
-		if (alpha.matsource != color.matsource)
-		{
-			if (alpha.matsource) // from vertex
-			{
-				if (components & (VB_HAS_COL0<<j))
-					object.Write("mat.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0)
-					object.Write("mat.w = %s0.w;\n", inColorName);
-				else object.Write("mat.w = 1.0f;\n");
-			}
-			else // from color
-			{
-				object.Write("mat.w = %s[%d].w;\n", materialsName, j+2);
-			}
-		}
-
-		uid_data.enablelighting |= xfregs.alpha[j].enablelighting << (j+2);
-		if (alpha.enablelighting)
-		{
-			uid_data.ambsource |= xfregs.alpha[j].ambsource << (j+2);
-			if (alpha.ambsource) // from vertex
-			{
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc.w = %s0.w;\n", inColorName);
-				else
-					// TODO: The same for alpha: We want to read from vertex, but the vertex has no color
-					object.Write("lacc.w = 1.0f;\n");
-			}
-			else // from color
-			{
-				object.Write("lacc.w = %s[%d].w;\n", materialsName, j);
-			}
-		}
-		else
-		{
-			object.Write("lacc.w = 1.0f;\n");
-		}
-
-		if(color.enablelighting && alpha.enablelighting)
-		{
-			// both have lighting, test if they use the same lights
-			int mask = 0;
-			uid_data.attnfunc |= color.attnfunc << (2*j);
-			uid_data.attnfunc |= alpha.attnfunc << (2*(j+2));
-			uid_data.diffusefunc |= color.diffusefunc << (2*j);
-			uid_data.diffusefunc |= alpha.diffusefunc << (2*(j+2));
-			uid_data.light_mask |= color.GetFullLightMask() << (8*j);
-			uid_data.light_mask |= alpha.GetFullLightMask() << (8*(j+2));
-			if(color.lightparams == alpha.lightparams)
-			{
-				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
-				if(mask)
-				{
-					for (int i = 0; i < 8; ++i)
-					{
-						if (mask & (1<<i))
-						{
-							GenerateLightShader<T>(object, uid_data, i, j, lightsName, 3);
-						}
-					}
-				}
-			}
-
-			// no shared lights
-			for (int i = 0; i < 8; ++i)
-			{
-				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T>(object, uid_data, i, j, lightsName, 1);
-				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T>(object, uid_data, i, j+2, lightsName, 2);
-			}
-		}
-		else if (color.enablelighting || alpha.enablelighting)
-		{
-			// lights are disabled on one channel so process only the active ones
-			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
-			const int lit_index = color.enablelighting ? j : (j+2);
-			int coloralpha = color.enablelighting ? 1 : 2;
-
-			uid_data.light_mask |= workingchannel.GetFullLightMask() << (8*lit_index);
-			for (int i = 0; i < 8; ++i)
-			{
-				if (workingchannel.GetFullLightMask() & (1<<i))
-					GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha);
-			}
-		}
-		object.Write("%s%d = mat * clamp(lacc, 0.0f, 1.0f);\n", dest, j);
-		object.Write("}\n");
-	}
-}
-
-#endif // _LIGHTINGSHADERGEN_H_
diff --git a/Source/Core/VideoCommon/Src/LookUpTables.h b/Source/Core/VideoCommon/Src/LookUpTables.h
deleted file mode 100644
index 1d9153b2d1..0000000000
--- a/Source/Core/VideoCommon/Src/LookUpTables.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LOOKUPTABLES_H
-#define _LOOKUPTABLES_H
-
-#include "Common.h"
-
-inline u8 Convert3To8(u8 v)
-{
-	// Swizzle bits: 00000123 -> 12312312
-	return (v << 5) | (v << 2) | (v >> 1);
-}
-
-inline u8 Convert4To8(u8 v)
-{
-	// Swizzle bits: 00001234 -> 12341234
-	return (v << 4) | v;
-}
-
-inline u8 Convert5To8(u8 v)
-{
-	// Swizzle bits: 00012345 -> 12345123
-	return (v << 3) | (v >> 2);
-}
-
-inline u8 Convert6To8(u8 v)
-{
-	// Swizzle bits: 00123456 -> 12345612
-	return (v << 2) | (v >> 4);
-}
-
-#endif // _LOOKUPTABLES_H
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
deleted file mode 100644
index 1739683562..0000000000
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-
-#include "MainBase.h"
-#include "VideoState.h"
-#include "VideoConfig.h"
-#include "RenderBase.h"
-#include "FramebufferManagerBase.h"
-#include "TextureCacheBase.h"
-#include "VertexLoaderManager.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "Atomic.h"
-#include "Fifo.h"
-#include "BPStructs.h"
-#include "OnScreenDisplay.h"
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-
-bool s_BackendInitialized = false;
-
-volatile u32 s_swapRequested = false;
-u32 s_efbAccessRequested = false;
-volatile u32 s_FifoShuttingDown = false;
-
-std::condition_variable s_perf_query_cond;
-std::mutex s_perf_query_lock;
-static volatile bool s_perf_query_requested;
-
-static volatile struct
-{
-	u32 xfbAddr;
-	FieldType field;
-	u32 fbWidth;
-	u32 fbHeight;
-} s_beginFieldArgs;
-
-static struct
-{
-	EFBAccessType type;
-	u32 x;
-	u32 y;
-	u32 Data;
-} s_accessEFBArgs;
-
-static u32 s_AccessEFBResult = 0;
-
-void VideoBackendHardware::EmuStateChange(EMUSTATE_CHANGE newState)
-{
-	EmulatorState((newState == EMUSTATE_CHANGE_PLAY) ? true : false);
-}
-
-// Enter and exit the video loop
-void VideoBackendHardware::Video_EnterLoop()
-{
-	RunGpuLoop();
-}
-
-void VideoBackendHardware::Video_ExitLoop()
-{
-	ExitGpuLoop();
-	s_FifoShuttingDown = true;
-}
-
-void VideoBackendHardware::Video_SetRendering(bool bEnabled)
-{
-	Fifo_SetRendering(bEnabled);
-}
-
-// Run from the graphics thread (from Fifo.cpp)
-void VideoFifo_CheckSwapRequest()
-{
-	if(g_ActiveConfig.bUseXFB)
-	{
-		if (Common::AtomicLoadAcquire(s_swapRequested))
-		{
-			EFBRectangle rc;
-			g_renderer->Swap(s_beginFieldArgs.xfbAddr, s_beginFieldArgs.field, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight,rc);
-			Common::AtomicStoreRelease(s_swapRequested, false);
-		}
-	}
-}
-
-// Run from the graphics thread (from Fifo.cpp)
-void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
-{
-	if (g_ActiveConfig.bUseXFB)
-	{
-		if(Common::AtomicLoadAcquire(s_swapRequested))
-		{
-			u32 aLower = xfbAddr;
-			u32 aUpper = xfbAddr + 2 * fbWidth * fbHeight;
-			u32 bLower = s_beginFieldArgs.xfbAddr;
-			u32 bUpper = s_beginFieldArgs.xfbAddr + 2 * s_beginFieldArgs.fbWidth * s_beginFieldArgs.fbHeight;
-
-			if (addrRangesOverlap(aLower, aUpper, bLower, bUpper))
-				VideoFifo_CheckSwapRequest();
-		}
-	}
-}
-
-// Run from the CPU thread (from VideoInterface.cpp)
-void VideoBackendHardware::Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
-{
-	if (s_BackendInitialized && g_ActiveConfig.bUseXFB)
-	{
-		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-			VideoFifo_CheckSwapRequest();
-		s_beginFieldArgs.xfbAddr = xfbAddr;
-		s_beginFieldArgs.field = field;
-		s_beginFieldArgs.fbWidth = fbWidth;
-		s_beginFieldArgs.fbHeight = fbHeight;
-	}
-}
-
-// Run from the CPU thread (from VideoInterface.cpp)
-void VideoBackendHardware::Video_EndField()
-{
-	if (s_BackendInitialized)
-	{
-		Common::AtomicStoreRelease(s_swapRequested, true);
-	}
-}
-
-void VideoBackendHardware::Video_AddMessage(const char* pstr, u32 milliseconds)
-{
-	OSD::AddMessage(pstr, milliseconds);
-}
-
-void VideoBackendHardware::Video_ClearMessages()
-{
-	OSD::ClearMessages();
-}
-
-// Screenshot
-bool VideoBackendHardware::Video_Screenshot(const char *_szFilename)
-{
-	Renderer::SetScreenshot(_szFilename);
-	return true;
-}
-
-void VideoFifo_CheckEFBAccess()
-{
-	if (Common::AtomicLoadAcquire(s_efbAccessRequested))
-	{
-		s_AccessEFBResult = g_renderer->AccessEFB(s_accessEFBArgs.type, s_accessEFBArgs.x, s_accessEFBArgs.y, s_accessEFBArgs.Data);
-
-		Common::AtomicStoreRelease(s_efbAccessRequested, false);
-	}
-}
-
-u32 VideoBackendHardware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
-{
-	if (s_BackendInitialized)
-	{
-		s_accessEFBArgs.type = type;
-		s_accessEFBArgs.x = x;
-		s_accessEFBArgs.y = y;
-		s_accessEFBArgs.Data = InputData;
-
-		Common::AtomicStoreRelease(s_efbAccessRequested, true);
-
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-		{
-			while (Common::AtomicLoadAcquire(s_efbAccessRequested) && !s_FifoShuttingDown)
-				//Common::SleepCurrentThread(1);
-				Common::YieldCPU();
-		}
-		else
-			VideoFifo_CheckEFBAccess();
-
-		return s_AccessEFBResult;
-	}
-
-	return 0;
-}
-
-static bool QueryResultIsReady()
-{
-	return !s_perf_query_requested || s_FifoShuttingDown;
-}
-
-void VideoFifo_CheckPerfQueryRequest()
-{
-	if (s_perf_query_requested)
-	{
-		g_perf_query->FlushResults();
-		
-		{
-		std::lock_guard<std::mutex> lk(s_perf_query_lock);
-		s_perf_query_requested = false;
-		}
-		
-		s_perf_query_cond.notify_one();
-	}
-}
-
-u32 VideoBackendHardware::Video_GetQueryResult(PerfQueryType type)
-{
-	// TODO: Is this check sane?
-	if (!g_perf_query->IsFlushed())
-	{
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-		{
-			s_perf_query_requested = true;
-			std::unique_lock<std::mutex> lk(s_perf_query_lock);
-			s_perf_query_cond.wait(lk, QueryResultIsReady);
-		}
-		else
-			g_perf_query->FlushResults();
-	}
-
-	return g_perf_query->GetQueryResult(type);
-}
-
-void VideoBackendHardware::InitializeShared()
-{
-	VideoCommon_Init();
-
-	s_swapRequested = 0;
-	s_efbAccessRequested = 0;
-	s_perf_query_requested = false;
-	s_FifoShuttingDown = 0;
-	memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs));
-	memset(&s_accessEFBArgs, 0, sizeof(s_accessEFBArgs));
-	s_AccessEFBResult = 0;
-	m_invalid = false;
-}
-
-// Run from the CPU thread
-void VideoBackendHardware::DoState(PointerWrap& p)
-{
-	bool software = false;
-	p.Do(software);
-
-	if (p.GetMode() == PointerWrap::MODE_READ && software == true)
-	{
-		// change mode to abort load of incompatible save state.
-		p.SetMode(PointerWrap::MODE_VERIFY);
-	}
-
-	VideoCommon_DoState(p);
-	p.DoMarker("VideoCommon");
-
-	p.Do(s_swapRequested);
-	p.Do(s_efbAccessRequested);
-	p.Do(s_beginFieldArgs);
-	p.Do(s_accessEFBArgs);
-	p.Do(s_AccessEFBResult);
-	p.DoMarker("VideoBackendHardware");
-
-	// Refresh state.
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		m_invalid = true;
-		RecomputeCachedArraybases();
-
-		// Clear all caches that touch RAM
-		// (? these don't appear to touch any emulation state that gets saved. moved to on load only.)
-		VertexLoaderManager::MarkAllDirty();
-	}
-}
-
-void VideoBackendHardware::CheckInvalidState()
-{
-	if (m_invalid)
-	{
-		m_invalid = false;
-		
-		BPReload();
-		TextureCache::Invalidate();
-	}
-}
-
-void VideoBackendHardware::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	Fifo_PauseAndLock(doLock, unpauseOnUnlock);
-}
-
-
-void VideoBackendHardware::RunLoop(bool enable)
-{
-	VideoCommon_RunLoop(enable);
-}
-
-void VideoFifo_CheckAsyncRequest()
-{
-	VideoFifo_CheckSwapRequest();
-	VideoFifo_CheckEFBAccess();
-	VideoFifo_CheckPerfQueryRequest();
-}
-
-void VideoBackendHardware::Video_GatherPipeBursted()
-{
-	CommandProcessor::GatherPipeBursted();
-}
-
-bool VideoBackendHardware::Video_IsPossibleWaitingSetDrawDone()
-{
-	return CommandProcessor::isPossibleWaitingSetDrawDone;
-}
-
-bool VideoBackendHardware::Video_IsHiWatermarkActive()
-{
-	return CommandProcessor::isHiWatermarkActive;
-}
-
-void VideoBackendHardware::Video_AbortFrame()
-{
-	CommandProcessor::AbortFrame();
-}
-
-readFn16 VideoBackendHardware::Video_CPRead16()
-{
-	return CommandProcessor::Read16;
-}
-writeFn16 VideoBackendHardware::Video_CPWrite16()
-{
-	return CommandProcessor::Write16;
-}
-
-readFn16  VideoBackendHardware::Video_PERead16()
-{
-	return PixelEngine::Read16;
-}
-writeFn16 VideoBackendHardware::Video_PEWrite16()
-{
-	return PixelEngine::Write16;
-}
-writeFn32 VideoBackendHardware::Video_PEWrite32()
-{
-	return PixelEngine::Write32;
-}
diff --git a/Source/Core/VideoCommon/Src/MainBase.h b/Source/Core/VideoCommon/Src/MainBase.h
deleted file mode 100644
index ed48db4b75..0000000000
--- a/Source/Core/VideoCommon/Src/MainBase.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef _VIDEOCOMMON_MAINBASE_H_
-#define _VIDEOCOMMON_MAINBASE_H_
-
-#include "CommonTypes.h"
-
-extern bool s_BackendInitialized;
-extern u32 s_efbAccessRequested;
-extern volatile u32 s_FifoShuttingDown;
-extern volatile u32 s_swapRequested;
-
-void VideoFifo_CheckEFBAccess();
-void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
deleted file mode 100644
index f97b493e67..0000000000
--- a/Source/Core/VideoCommon/Src/NativeVertexFormat.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _NATIVEVERTEXFORMAT_H
-#define _NATIVEVERTEXFORMAT_H
-
-#include "Common.h"
-
-// m_components
-enum
-{
-	VB_HAS_POSMTXIDX =(1<<1),
-	VB_HAS_TEXMTXIDX0=(1<<2),
-	VB_HAS_TEXMTXIDX1=(1<<3),
-	VB_HAS_TEXMTXIDX2=(1<<4),
-	VB_HAS_TEXMTXIDX3=(1<<5),
-	VB_HAS_TEXMTXIDX4=(1<<6),
-	VB_HAS_TEXMTXIDX5=(1<<7),
-	VB_HAS_TEXMTXIDX6=(1<<8),
-	VB_HAS_TEXMTXIDX7=(1<<9),
-	VB_HAS_TEXMTXIDXALL=(0xff<<2),
-
-	//VB_HAS_POS=0, // Implied, it always has pos! don't bother testing
-	VB_HAS_NRM0=(1<<10),
-	VB_HAS_NRM1=(1<<11),
-	VB_HAS_NRM2=(1<<12),
-	VB_HAS_NRMALL=(7<<10),
-
-	VB_HAS_COL0=(1<<13),
-	VB_HAS_COL1=(1<<14),
-
-	VB_HAS_UV0=(1<<15),
-	VB_HAS_UV1=(1<<16),
-	VB_HAS_UV2=(1<<17),
-	VB_HAS_UV3=(1<<18),
-	VB_HAS_UV4=(1<<19),
-	VB_HAS_UV5=(1<<20),
-	VB_HAS_UV6=(1<<21),
-	VB_HAS_UV7=(1<<22),
-	VB_HAS_UVALL=(0xff<<15),
-	VB_HAS_UVTEXMTXSHIFT=13,
-};
-
-#ifdef WIN32
-#define LOADERDECL __cdecl
-#else
-#define LOADERDECL
-#endif
-
-typedef void (LOADERDECL *TPipelineFunction)();
-
-enum VarType
-{
-	VAR_BYTE,
-	VAR_UNSIGNED_BYTE,
-	VAR_SHORT,
-	VAR_UNSIGNED_SHORT,
-	VAR_FLOAT,
-};
-
-struct PortableVertexDeclaration
-{
-	int stride;
-
-	int num_normals;
-	int normal_offset[3];
-	VarType normal_gl_type;
-	int normal_gl_size;
-	VarType color_gl_type;  // always GL_UNSIGNED_BYTE
-	int color_offset[2];
-	VarType texcoord_gl_type[8];
-	//int texcoord_gl_size[8];
-	int texcoord_offset[8];
-	int texcoord_size[8];
-	int posmtx_offset;
-};
-
-// The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp
-// is in the respective backend, not here in VideoCommon.
-
-// Note that this class can't just invent arbitrary vertex formats out of its input - 
-// all the data loading code must always be made compatible.
-class NativeVertexFormat : NonCopyable
-{
-public:
-	virtual ~NativeVertexFormat() {}
-
-	virtual void Initialize(const PortableVertexDeclaration &vtx_decl) = 0;
-	virtual void SetupVertexPointers() = 0;
-	virtual void EnableComponents(u32 components) {}
-
-	u32 GetVertexStride() const { return vertex_stride; }
-
-	// TODO: move this under private:
-	u32 m_components;  // VB_HAS_X. Bitmask telling what vertex components are present.
-
-protected:
-	// Let subclasses construct.
-	NativeVertexFormat() {}
-
-	u32 vertex_stride;
-};
-
-#endif  // _NATIVEVERTEXFORMAT_H
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
deleted file mode 100644
index b66c2019c9..0000000000
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <list>
-
-#include "Common.h"
-
-#include "ConfigManager.h"
-#include "OnScreenDisplay.h"
-#include "RenderBase.h"
-#include "Timer.h"
-
-#include <map>
-#include <string>
-
-namespace OSD
-{
-
-struct Message
-{
-    Message() {}
-    Message(const std::string& s, u32 ts) : str(s), timestamp(ts) {}
-
-	std::string str;
-	u32 timestamp;
-};
-
-static std::multimap<CallbackType, Callback> s_callbacks;
-static std::list<Message> s_msgList;
-
-void AddMessage(const std::string& str, u32 ms)
-{
-	s_msgList.push_back(Message(str, Common::Timer::GetTimeMs() + ms));
-}
-
-void DrawMessages()
-{
-	if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages)
-		return;
-
-	int left = 25, top = 15;
-	auto it = s_msgList.begin();
-	while (it != s_msgList.end())
-	{
-		int time_left = (int)(it->timestamp - Common::Timer::GetTimeMs());
-		u32 alpha = 255;
-
-		if (time_left < 1024)
-		{
-			alpha = time_left >> 2;
-			if (time_left < 0)
-				alpha = 0;
-		}
-
-		alpha <<= 24;
-
-		g_renderer->RenderText(it->str.c_str(), left + 1, top + 1, 0x000000 | alpha);
-		g_renderer->RenderText(it->str.c_str(), left, top, 0xffff30 | alpha);
-		top += 15;
-
-		if (time_left <= 0)
-			it = s_msgList.erase(it);
-		else
-			++it;
-	}
-}
-
-void ClearMessages()
-{
-	s_msgList.clear();
-}
-
-// On-Screen Display Callbacks
-void AddCallback(CallbackType type, Callback cb)
-{
-	s_callbacks.insert(std::pair<CallbackType, Callback>(type, cb));
-}
-
-void DoCallbacks(CallbackType type)
-{
-	auto it_bounds = s_callbacks.equal_range(type);
-	for (auto it = it_bounds.first; it != it_bounds.second; ++it)
-	{
-		it->second();
-	}
-}
-
-}  // namespace
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.h b/Source/Core/VideoCommon/Src/OnScreenDisplay.h
deleted file mode 100644
index a4a377b5d7..0000000000
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OSD_H_
-#define _OSD_H_
-
-#include <functional>
-#include <string>
-
-namespace OSD
-{
-// On-screen message display
-void AddMessage(const std::string& str, u32 ms = 2000);
-void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
-void ClearMessages();
-
-// On-screen callbacks
-enum CallbackType
-{
-	OSD_INIT = 0,
-	OSD_ONFRAME,
-	OSD_SHUTDOWN
-};
-typedef std::function<void()> Callback;
-
-void AddCallback(CallbackType type, Callback cb);
-void DoCallbacks(CallbackType type);
-}  // namespace OSD
-
-#endif // _OSD_H_
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
deleted file mode 100644
index 818a2365fe..0000000000
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-//DL facts:
-//	Ikaruga uses (nearly) NO display lists!
-//  Zelda WW uses TONS of display lists
-//  Zelda TP uses almost 100% display lists except menus (we like this!)
-//  Super Mario Galaxy has nearly all geometry and more than half of the state in DLs (great!)
-
-// Note that it IS NOT GENERALLY POSSIBLE to precompile display lists! You can compile them as they are
-// while interpreting them, and hope that the vertex format doesn't change, though, if you do it right
-// when they are called. The reason is that the vertex format affects the sizes of the vertices.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "OpcodeDecoding.h"
-#include "CommandProcessor.h"
-#include "CPUDetect.h"
-#include "Core.h"
-#include "Host.h"
-#include "HW/Memmap.h"
-#include "FifoPlayer/FifoRecorder.h"
-
-#include "VertexLoaderManager.h"
-
-#include "Statistics.h"
-
-#include "XFMemory.h"
-#include "CPMemory.h"
-#include "BPMemory.h"
-
-#include "Fifo.h"
-#include "DataReader.h"
-
-#include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
-#include "VideoConfig.h"
-
-u8* g_pVideoData = 0;
-bool g_bRecordFifoData = false;
-
-#if _M_SSE >= 0x301
-DataReadU32xNfunc DataReadU32xFuncs_SSSE3[16] = {
-	DataReadU32xN_SSSE3<1>,
-	DataReadU32xN_SSSE3<2>,
-	DataReadU32xN_SSSE3<3>,
-	DataReadU32xN_SSSE3<4>,
-	DataReadU32xN_SSSE3<5>,
-	DataReadU32xN_SSSE3<6>,
-	DataReadU32xN_SSSE3<7>,
-	DataReadU32xN_SSSE3<8>,
-	DataReadU32xN_SSSE3<9>,
-	DataReadU32xN_SSSE3<10>,
-	DataReadU32xN_SSSE3<11>,
-	DataReadU32xN_SSSE3<12>,
-	DataReadU32xN_SSSE3<13>,
-	DataReadU32xN_SSSE3<14>,
-	DataReadU32xN_SSSE3<15>,
-	DataReadU32xN_SSSE3<16>
-};
-#endif
-
-DataReadU32xNfunc DataReadU32xFuncs[16] = {
-	DataReadU32xN<1>,
-	DataReadU32xN<2>,
-	DataReadU32xN<3>,
-	DataReadU32xN<4>,
-	DataReadU32xN<5>,
-	DataReadU32xN<6>,
-	DataReadU32xN<7>,
-	DataReadU32xN<8>,
-	DataReadU32xN<9>,
-	DataReadU32xN<10>,
-	DataReadU32xN<11>,
-	DataReadU32xN<12>,
-	DataReadU32xN<13>,
-	DataReadU32xN<14>,
-	DataReadU32xN<15>,
-	DataReadU32xN<16>
-};
-
-extern u8* GetVideoBufferStartPtr();
-extern u8* GetVideoBufferEndPtr();
-
-static void Decode();
-
-void InterpretDisplayList(u32 address, u32 size)
-{
-	u8* old_pVideoData = g_pVideoData;
-	u8* startAddress = Memory::GetPointer(address);
-
-	// Avoid the crash if Memory::GetPointer failed ..
-	if (startAddress != 0)
-	{
-		g_pVideoData = startAddress;
-
-		// temporarily swap dl and non-dl (small "hack" for the stats)
-		Statistics::SwapDL();
-
-		u8 *end = g_pVideoData + size;
-		while (g_pVideoData < end)
-		{
-			Decode();
-		}
-		INCSTAT(stats.numDListsCalled);
-		INCSTAT(stats.thisFrame.numDListsCalled);
-
-		// un-swap
-		Statistics::SwapDL();
-	}
-
-	// reset to the old pointer
-	g_pVideoData = old_pVideoData;
-}
-
-// Defer to backend-specific DL cache.
-extern bool HandleDisplayList(u32 address, u32 size);
-
-void ExecuteDisplayList(u32 address, u32 size)
-{
-	if (!HandleDisplayList(address, size))
-		InterpretDisplayList(address, size);
-}
-
-u32 FifoCommandRunnable(u32 &command_size)
-{
-	u32 cycleTime = 0;
-	u32 buffer_size = (u32)(GetVideoBufferEndPtr() - g_pVideoData);
-	if (buffer_size == 0)
-		return 0;  // can't peek
-
-	u8 cmd_byte = DataPeek8(0);	
-
-	switch (cmd_byte)
-	{
-	case GX_NOP: // Hm, this means that we scan over nop streams pretty slowly...
-		command_size = 1;
-		cycleTime = 6;
-		break;
-	case GX_CMD_INVL_VC: // Invalidate Vertex Cache - no parameters
-		command_size = 1;
-		cycleTime = 6;
-		break;
-	case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
-		command_size = 1;
-		cycleTime = 6;
-		break;
-
-	case GX_LOAD_BP_REG:
-		command_size = 5;
-		cycleTime = 12;
-		break;
-
-	case GX_LOAD_CP_REG:
-		command_size = 6;
-		cycleTime = 12;
-		break;
-
-	case GX_LOAD_INDX_A:
-	case GX_LOAD_INDX_B:
-	case GX_LOAD_INDX_C:
-	case GX_LOAD_INDX_D:
-		command_size = 5;
-		cycleTime = 6; // TODO
-		break;
-
-	case GX_CMD_CALL_DL:
-		{
-			// FIXME: Calculate the cycle time of the display list.
-			//u32 address = DataPeek32(1);
-			//u32 size = DataPeek32(5);
-			//u8* old_pVideoData = g_pVideoData;
-			//u8* startAddress = Memory::GetPointer(address);
-
-			//// Avoid the crash if Memory::GetPointer failed ..
-			//if (startAddress != 0)
-			//{
-			//	g_pVideoData = startAddress;
-			//	u8 *end = g_pVideoData + size;
-			//	u32 step = 0;
-			//	while (g_pVideoData < end)
-			//	{
-			//		cycleTime += FifoCommandRunnable(step);
-			//		g_pVideoData += step;
-			//	}
-			//}
-			//else
-			//{
-			//	cycleTime = 45;
-			//}
-
-			//// reset to the old pointer
-			//g_pVideoData = old_pVideoData;
-			command_size = 9;
-			cycleTime = 45;  // This is unverified
-		}
-		break;
-
-	case GX_LOAD_XF_REG:
-		{
-			// check if we can read the header
-			if (buffer_size >= 5)
-			{
-				command_size = 1 + 4;
-				u32 Cmd2 = DataPeek32(1);
-				int transfer_size = ((Cmd2 >> 16) & 15) + 1;
-				command_size += transfer_size * 4;
-				cycleTime = 18 + 6 * transfer_size;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		break;
-
-	default:
-		if (cmd_byte & 0x80)
-		{
-			// check if we can read the header
-			if (buffer_size >= 3)
-			{
-				command_size = 1 + 2;
-				u16 numVertices = DataPeek16(1);
-				command_size += numVertices * VertexLoaderManager::GetVertexSize(cmd_byte & GX_VAT_MASK);
-				cycleTime = 1600; // This depends on the number of pixels rendered
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			// TODO(Omega): Maybe dump FIFO to file on this error
-			char szTemp[1024];
-			sprintf(szTemp, "GFX FIFO: Unknown Opcode (0x%x).\n"
-				"This means one of the following:\n"
-				"* The emulated GPU got desynced, disabling dual core can help\n"
-				"* Command stream corrupted by some spurious memory bug\n"
-				"* This really is an unknown opcode (unlikely)\n"
-				"* Some other sort of bug\n\n"
-				"Dolphin will now likely crash or hang. Enjoy." , cmd_byte);
-			Host_SysMessage(szTemp);
-			INFO_LOG(VIDEO, "%s", szTemp);
-			{
-				SCPFifoStruct &fifo = CommandProcessor::fifo;
-
-				char szTmp[512];
-				// sprintf(szTmp, "Illegal command %02x (at %08x)",cmd_byte,g_pDataReader->GetPtr());
-				sprintf(szTmp, "Illegal command %02x\n"
-					"CPBase: 0x%08x\n"
-					"CPEnd: 0x%08x\n"
-					"CPHiWatermark: 0x%08x\n"
-					"CPLoWatermark: 0x%08x\n"
-					"CPReadWriteDistance: 0x%08x\n"
-					"CPWritePointer: 0x%08x\n"
-					"CPReadPointer: 0x%08x\n"
-					"CPBreakpoint: 0x%08x\n"
-					"bFF_GPReadEnable: %s\n"
-					"bFF_BPEnable: %s\n"
-					"bFF_BPInt: %s\n"
-					"bFF_Breakpoint: %s\n"
-					,cmd_byte, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
-					,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint, fifo.bFF_GPReadEnable ? "true" : "false"
-					,fifo.bFF_BPEnable ? "true" : "false" ,fifo.bFF_BPInt ? "true" : "false"
-					,fifo.bFF_Breakpoint ? "true" : "false");
-
-				Host_SysMessage(szTmp);
-				INFO_LOG(VIDEO, "%s", szTmp);
-			}
-		}
-		break;
-	}
-
-	if (command_size > buffer_size)
-		return 0;
-
-	// INFO_LOG("OP detected: cmd_byte 0x%x  size %i  buffer %i",cmd_byte, command_size, buffer_size);
-	if (cycleTime == 0)
-		cycleTime = 6;
-
-	return cycleTime;
-}
-
-u32 FifoCommandRunnable()
-{
-	u32 command_size = 0;
-	return FifoCommandRunnable(command_size);
-}
-
-static void Decode()
-{
-	u8 *opcodeStart = g_pVideoData;
-
-	int cmd_byte = DataReadU8();
-	switch (cmd_byte)
-	{
-	case GX_NOP:
-		break;
-
-	case GX_LOAD_CP_REG: //0x08
-		{
-			u8 sub_cmd = DataReadU8();
-			u32 value = DataReadU32();
-			LoadCPReg(sub_cmd, value);
-			INCSTAT(stats.thisFrame.numCPLoads);
-		}
-		break;
-
-	case GX_LOAD_XF_REG:
-		{
-			u32 Cmd2 = DataReadU32();
-			int transfer_size = ((Cmd2 >> 16) & 15) + 1;
-			u32 xf_address = Cmd2 & 0xFFFF;
-			GC_ALIGNED128(u32 data_buffer[16]);
-			DataReadU32xFuncs[transfer_size-1](data_buffer);
-			LoadXFReg(transfer_size, xf_address, data_buffer);
-
-			INCSTAT(stats.thisFrame.numXFLoads);
-		}
-		break;
-
-	case GX_LOAD_INDX_A: //used for position matrices
-		LoadIndexedXF(DataReadU32(), 0xC);
-		break;
-	case GX_LOAD_INDX_B: //used for normal matrices
-		LoadIndexedXF(DataReadU32(), 0xD);
-		break;
-	case GX_LOAD_INDX_C: //used for postmatrices
-		LoadIndexedXF(DataReadU32(), 0xE);
-		break;
-	case GX_LOAD_INDX_D: //used for lights
-		LoadIndexedXF(DataReadU32(), 0xF);
-		break;
-
-	case GX_CMD_CALL_DL:
-		{
-			u32 address = DataReadU32();
-			u32 count = DataReadU32();
-			ExecuteDisplayList(address, count);
-		}			
-		break;
-
-	case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
-		DEBUG_LOG(VIDEO, "GX 0x44: %08x", cmd_byte);
-		break;
-
-	case GX_CMD_INVL_VC: // Invalidate Vertex Cache	
-		DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)");
-		break;
-
-	case GX_LOAD_BP_REG: //0x61
-		{
-			u32 bp_cmd = DataReadU32();
-			LoadBPReg(bp_cmd);
-			INCSTAT(stats.thisFrame.numBPLoads);
-		}
-		break;
-
-	// draw primitives 
-	default:
-		if (cmd_byte & 0x80)
-		{
-			// load vertices (use computed vertex size from FifoCommandRunnable above)
-			u16 numVertices = DataReadU16();
-
-			VertexLoaderManager::RunVertices(
-				cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
-				(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
-				numVertices);
-		}
-		else
-		{
-			ERROR_LOG(VIDEO, "OpcodeDecoding::Decode: Illegal command %02x", cmd_byte);
-			break;
-		}
-		break;
-	}
-
-	// Display lists get added directly into the FIFO stream
-	if (g_bRecordFifoData && cmd_byte != GX_CMD_CALL_DL)
-		FifoRecorder::GetInstance().WriteGPCommand(opcodeStart, u32(g_pVideoData - opcodeStart));
-}
-
-static void DecodeSemiNop()
-{
-	u8 *opcodeStart = g_pVideoData;
-
-	int cmd_byte = DataReadU8();
-	switch (cmd_byte)
-	{
-	case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
-	case GX_CMD_INVL_VC: // Invalidate Vertex Cache	
-	case GX_NOP:
-		break;
-
-	case GX_LOAD_CP_REG: //0x08
-		// We have to let CP writes through because they determine the size of vertices.
-		{
-			u8 sub_cmd = DataReadU8();
-			u32 value = DataReadU32();
-			LoadCPReg(sub_cmd, value);
-			INCSTAT(stats.thisFrame.numCPLoads);
-		}
-		break;
-
-	case GX_LOAD_XF_REG:
-		{
-			u32 Cmd2 = DataReadU32();
-			int transfer_size = ((Cmd2 >> 16) & 15) + 1;
-			u32 address = Cmd2 & 0xFFFF;
-			GC_ALIGNED128(u32 data_buffer[16]);
-			DataReadU32xFuncs[transfer_size-1](data_buffer);
-			LoadXFReg(transfer_size, address, data_buffer);
-			INCSTAT(stats.thisFrame.numXFLoads);
-		}
-		break;
-
-	case GX_LOAD_INDX_A: //used for position matrices
-		LoadIndexedXF(DataReadU32(), 0xC);
-		break;
-	case GX_LOAD_INDX_B: //used for normal matrices
-		LoadIndexedXF(DataReadU32(), 0xD);
-		break;
-	case GX_LOAD_INDX_C: //used for postmatrices
-		LoadIndexedXF(DataReadU32(), 0xE);
-		break;
-	case GX_LOAD_INDX_D: //used for lights
-		LoadIndexedXF(DataReadU32(), 0xF);
-		break;
-
-	case GX_CMD_CALL_DL:
-		// Hm, wonder if any games put tokens in display lists - in that case, 
-		// we'll have to parse them too.
-		DataSkip(8);
-		break;
-
-	case GX_LOAD_BP_REG: //0x61
-		// We have to let BP writes through because they set tokens and stuff.
-		// TODO: Call a much simplified LoadBPReg instead.
-		{
-			u32 bp_cmd = DataReadU32();
-			LoadBPReg(bp_cmd);
-			INCSTAT(stats.thisFrame.numBPLoads);
-		}
-		break;
-
-	// draw primitives 
-	default:
-		if (cmd_byte & 0x80)
-		{
-			// load vertices (use computed vertex size from FifoCommandRunnable above)
-			u16 numVertices = DataReadU16();
-			DataSkip(numVertices * VertexLoaderManager::GetVertexSize(cmd_byte & GX_VAT_MASK));
-		}
-		else
-		{
-			ERROR_LOG(VIDEO, "OpcodeDecoding::Decode: Illegal command %02x", cmd_byte);
-			break;
-		}
-		break;
-	}
-
-	if (g_bRecordFifoData && cmd_byte != GX_CMD_CALL_DL)
-		FifoRecorder::GetInstance().WriteGPCommand(opcodeStart, u32(g_pVideoData - opcodeStart));
-}
-
-void OpcodeDecoder_Init()
-{
-	g_pVideoData = GetVideoBufferStartPtr();
-
-#if _M_SSE >= 0x301
-	if (cpu_info.bSSSE3)
-	{
-		for (int i = 0; i < 16; ++i)
-			DataReadU32xFuncs[i] = DataReadU32xFuncs_SSSE3[i];
-	}
-#endif
-
-	if (g_Config.bEnableOpenCL)
-	{
-		OpenCL::Initialize();
-		TexDecoder_OpenCL_Initialize();
-	}
-}
-
-
-void OpcodeDecoder_Shutdown()
-{
-	if (g_Config.bEnableOpenCL)
-	{
-		TexDecoder_OpenCL_Shutdown();
-		OpenCL::Destroy();
-	}
-}
-
-u32 OpcodeDecoder_Run(bool skipped_frame)
-{
-	u32 totalCycles = 0;
-	u32 cycles = FifoCommandRunnable();
-	while (cycles > 0)
-	{
-		skipped_frame ? DecodeSemiNop() : Decode();
-		totalCycles += cycles;
-		cycles = FifoCommandRunnable();
-	}
-	return totalCycles;
-}
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h
deleted file mode 100644
index 3263d2c7b0..0000000000
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OPCODE_DECODING_H
-#define _OPCODE_DECODING_H
-
-#define GX_NOP                      0x00
-
-#define GX_LOAD_BP_REG              0x61
-#define GX_LOAD_CP_REG              0x08
-#define GX_LOAD_XF_REG              0x10
-#define GX_LOAD_INDX_A              0x20
-#define GX_LOAD_INDX_B              0x28
-#define GX_LOAD_INDX_C              0x30
-#define GX_LOAD_INDX_D              0x38
-
-#define GX_CMD_CALL_DL              0x40
-#define GX_CMD_UNKNOWN_METRICS      0x44
-#define GX_CMD_INVL_VC              0x48
-
-#define GX_PRIMITIVE_MASK           0x78
-#define GX_PRIMITIVE_SHIFT          3
-#define GX_VAT_MASK                 0x07
-
-//these are defined 1/8th of their real values and without their top bit
-#define GX_DRAW_QUADS               0x0   // 0x80
-#define GX_DRAW_TRIANGLES           0x2   // 0x90
-#define GX_DRAW_TRIANGLE_STRIP      0x3   // 0x98
-#define GX_DRAW_TRIANGLE_FAN        0x4   // 0xA0
-#define GX_DRAW_LINES               0x5   // 0xA8
-#define GX_DRAW_LINE_STRIP          0x6   // 0xB0
-#define GX_DRAW_POINTS              0x7   // 0xB8
-#define GX_DRAW_NONE                0x1;  // This is a fake value to used in the backends
-
-extern bool g_bRecordFifoData;
-
-void OpcodeDecoder_Init();
-void OpcodeDecoder_Shutdown();
-u32 OpcodeDecoder_Run(bool skipped_frame);
-void ExecuteDisplayList(u32 address, u32 size);
-#endif // _OPCODE_DECODING_H
diff --git a/Source/Core/VideoCommon/Src/OpenCL.cpp b/Source/Core/VideoCommon/Src/OpenCL.cpp
deleted file mode 100644
index 6dac8725af..0000000000
--- a/Source/Core/VideoCommon/Src/OpenCL.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO: Make a more centralized version of this (for now every backend that will use it will create its own context, which is weird). An object maybe?
-
-#include "OpenCL.h"
-#include "Common.h"
-#include "Timer.h"
-
-namespace OpenCL
-{
-
-cl_device_id device_id = NULL;
-cl_context g_context = NULL;
-cl_command_queue g_cmdq = NULL;
-
-bool g_bInitialized = false;
-
-bool Initialize()
-{
-	if(g_bInitialized)
-		return true;
-
-	if(g_context)
-		return false;
-	int err;			// error code returned from api calls
-
-#ifdef __APPLE__
-	// If OpenCL is weakly linked and not found, its symbols will be NULL
-	if (clGetPlatformIDs == NULL)
-		return false;
-#else
-	clrInit();
-	if(!clrHasOpenCL())
-		return false;
-#endif
-
-	// Connect to a compute device
-	cl_uint numPlatforms;
-	cl_platform_id platform = NULL;
-	err = clGetPlatformIDs(0, NULL, &numPlatforms);
-
-	if (err != CL_SUCCESS)
-	{
-		HandleCLError(err, "clGetPlatformIDs failed.");
-		return false;
-	}
-
-	if (0 < numPlatforms)
-	{
-		cl_platform_id* platforms = new cl_platform_id[numPlatforms];
-		err = clGetPlatformIDs(numPlatforms, platforms, NULL);
-
-		if (err != CL_SUCCESS)
-		{
-			HandleCLError(err, "clGetPlatformIDs failed.");
-			return false;
-		}
-
-		char pbuf[100];
-		err = clGetPlatformInfo(platforms[0], CL_PLATFORM_VENDOR, sizeof(pbuf),
-			pbuf, NULL);
-
-		if (err != CL_SUCCESS)
-		{
-			HandleCLError(err, "clGetPlatformInfo failed.");
-			return false;
-		}
-
-		platform = platforms[0];
-		delete[] platforms;
-	}
-	else
-	{
-		PanicAlert("No OpenCL platform found.");
-		return false;
-	}
-
-	cl_context_properties cps[3] = {CL_CONTEXT_PLATFORM,
-		(cl_context_properties)platform, 0};
-
-	cl_context_properties* cprops = (NULL == platform) ? NULL : cps;
-
-	err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_DEFAULT, 1, &device_id, NULL);
-	if (err != CL_SUCCESS)
-	{
-		HandleCLError(err, "Failed to create a device group!");
-		return false;
-	}
-
-	// Create a compute context
-	g_context = clCreateContext(cprops, 1, &device_id, NULL, NULL, &err);
-	if (!g_context)
-	{
-		HandleCLError(err, "Failed to create a compute context!");
-		return false;
-	}
-
-	// Create a command commands
-	g_cmdq = clCreateCommandQueue(g_context, device_id, 0, &err);
-	if (!g_cmdq)
-	{
-		HandleCLError(err, "Failed to create a command commands!");
-		return false;
-	}
-
-	g_bInitialized = true;
-	return true;
-}
-
-cl_context GetContext()
-{
-	return g_context;
-}
-
-cl_command_queue GetCommandQueue()
-{
-	return g_cmdq;
-}
-
-cl_program CompileProgram(const char *Kernel)
-{
-	u32 compileStart = Common::Timer::GetTimeMs();
-	cl_int err;
-	cl_program program;
-	program = clCreateProgramWithSource(OpenCL::g_context, 1,
-		(const char **) & Kernel, NULL, &err);
-
-	if (!program)
-	{
-		HandleCLError(err, "Error: Failed to create compute program!");
-	}
-
-	// Build the program executable
-	err = clBuildProgram(program , 0, NULL, NULL, NULL, NULL);
-	if(err != CL_SUCCESS) {
-		HandleCLError(err, "Error: failed to build program");
-
-		char *buildlog = NULL;
-		size_t buildlog_size = 0;
-
-		clGetProgramBuildInfo(program, OpenCL::device_id, CL_PROGRAM_BUILD_LOG, 0, NULL, &buildlog_size);
-		buildlog = new char[buildlog_size + 1];
-		err = clGetProgramBuildInfo(program, OpenCL::device_id, CL_PROGRAM_BUILD_LOG, buildlog_size, buildlog, NULL);
-		buildlog[buildlog_size] = 0;
-		
-		if(err != CL_SUCCESS)
-		{
-			HandleCLError(err, "Error: can't get build log");
-		} else
-		{
-			ERROR_LOG(COMMON, "Error log:\n%s\n", buildlog);
-		}
-
-		delete[] buildlog;
-		return NULL;
-	}
-
-	INFO_LOG(COMMON, "OpenCL CompileProgram took %.3f seconds",
-		(float)(Common::Timer::GetTimeMs() - compileStart) / 1000.0);
-	return program;
-}
-
-cl_kernel CompileKernel(cl_program program, const char *Function)
-{
-	u32 compileStart = Common::Timer::GetTimeMs();
-	int err;
-
-	// Create the compute kernel in the program we wish to run
-	cl_kernel kernel = clCreateKernel(program, Function, &err);
-	if (!kernel || err != CL_SUCCESS)
-	{
-		char buffer[1024];
-		sprintf(buffer, "Failed to create compute kernel '%s' !", Function);
-		HandleCLError(err, buffer);
-		return NULL;
-	}
-	INFO_LOG(COMMON, "OpenCL CompileKernel took %.3f seconds",
-		(float)(Common::Timer::GetTimeMs() - compileStart) / 1000.0);
-	return kernel;
-}
-
-void Destroy()
-{
-	if (g_cmdq)
-	{
-		clReleaseCommandQueue(g_cmdq);
-		g_cmdq = NULL;
-	}
-	if (g_context)
-	{
-		clReleaseContext(g_context);
-		g_context = NULL;
-	}		
-	g_bInitialized = false;
-}
-
-void HandleCLError(cl_int error, const char* str)
-{
-	const char* name;
-	switch(error)
-	{
-#define CL_ERROR(x) case (x): name = #x; break
-		CL_ERROR(CL_SUCCESS);
-		CL_ERROR(CL_DEVICE_NOT_FOUND);
-		CL_ERROR(CL_DEVICE_NOT_AVAILABLE);
-		CL_ERROR(CL_COMPILER_NOT_AVAILABLE);
-		CL_ERROR(CL_MEM_OBJECT_ALLOCATION_FAILURE);
-		CL_ERROR(CL_OUT_OF_RESOURCES);
-		CL_ERROR(CL_OUT_OF_HOST_MEMORY);
-		CL_ERROR(CL_PROFILING_INFO_NOT_AVAILABLE);
-		CL_ERROR(CL_MEM_COPY_OVERLAP);
-		CL_ERROR(CL_IMAGE_FORMAT_MISMATCH);
-		CL_ERROR(CL_IMAGE_FORMAT_NOT_SUPPORTED);
-		CL_ERROR(CL_BUILD_PROGRAM_FAILURE);
-		CL_ERROR(CL_MAP_FAILURE);
-		CL_ERROR(CL_INVALID_VALUE);
-		CL_ERROR(CL_INVALID_DEVICE_TYPE);
-		CL_ERROR(CL_INVALID_PLATFORM);
-		CL_ERROR(CL_INVALID_DEVICE);
-		CL_ERROR(CL_INVALID_CONTEXT);
-		CL_ERROR(CL_INVALID_QUEUE_PROPERTIES);
-		CL_ERROR(CL_INVALID_COMMAND_QUEUE);
-		CL_ERROR(CL_INVALID_HOST_PTR);
-		CL_ERROR(CL_INVALID_MEM_OBJECT);
-		CL_ERROR(CL_INVALID_IMAGE_FORMAT_DESCRIPTOR);
-		CL_ERROR(CL_INVALID_IMAGE_SIZE);
-		CL_ERROR(CL_INVALID_SAMPLER);
-		CL_ERROR(CL_INVALID_BINARY);
-		CL_ERROR(CL_INVALID_BUILD_OPTIONS);
-		CL_ERROR(CL_INVALID_PROGRAM);
-		CL_ERROR(CL_INVALID_PROGRAM_EXECUTABLE);
-		CL_ERROR(CL_INVALID_KERNEL_NAME);
-		CL_ERROR(CL_INVALID_KERNEL_DEFINITION);
-		CL_ERROR(CL_INVALID_KERNEL);
-		CL_ERROR(CL_INVALID_ARG_INDEX);
-		CL_ERROR(CL_INVALID_ARG_VALUE);
-		CL_ERROR(CL_INVALID_ARG_SIZE);
-		CL_ERROR(CL_INVALID_KERNEL_ARGS);
-		CL_ERROR(CL_INVALID_WORK_DIMENSION);
-		CL_ERROR(CL_INVALID_WORK_GROUP_SIZE);
-		CL_ERROR(CL_INVALID_WORK_ITEM_SIZE);
-		CL_ERROR(CL_INVALID_GLOBAL_OFFSET);
-		CL_ERROR(CL_INVALID_EVENT_WAIT_LIST);
-		CL_ERROR(CL_INVALID_EVENT);
-		CL_ERROR(CL_INVALID_OPERATION);
-		CL_ERROR(CL_INVALID_GL_OBJECT);
-		CL_ERROR(CL_INVALID_BUFFER_SIZE);
-		CL_ERROR(CL_INVALID_MIP_LEVEL);
-#undef CL_ERROR
-	default:
-		name = "Unknown error code";
-	}
-	if(!str)
-		str = "";
-	ERROR_LOG(COMMON, "OpenCL error: %s %s (%d)", str, name, error);
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/OpenCL.h b/Source/Core/VideoCommon/Src/OpenCL.h
deleted file mode 100644
index 4ba172bb9c..0000000000
--- a/Source/Core/VideoCommon/Src/OpenCL.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef __OPENCL_H__
-#define __OPENCL_H__
-
-#include "Common.h"
-
-#ifdef __APPLE__
-#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER WEAK_IMPORT_ATTRIBUTE
-#include <OpenCL/cl.h>
-#else
-// The CLRun library provides the headers and all the imports.
-#include <CL/cl.h>
-#include <clrun.h>
-#endif
-
-namespace OpenCL
-{
-
-extern cl_device_id device_id;
-extern cl_context g_context;
-extern cl_command_queue g_cmdq;
-
-bool Initialize();
-
-cl_context GetContext();
-
-cl_command_queue GetCommandQueue();
-
-void Destroy();
-
-cl_program CompileProgram(const char *Kernel);
-cl_kernel CompileKernel(cl_program program, const char *Function);
-
-void HandleCLError(cl_int error, const char* str = 0);
-}
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
deleted file mode 100644
index 211244c457..0000000000
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "OCLTextureDecoder.h"
-
-#include "../OpenCL.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <sys/types.h>
-#include <string>
-
-//#define DEBUG_OPENCL
-
-cl_program g_program;
-
-struct sDecoderParameter
-{
-	const char *name;
-	cl_kernel kernel;
-	float sizeOfSrc;
-	float sizeOfDst;
-	int xSkip;
-	int ySkip;
-	PC_TexFormat format;
-};
-
-sDecoderParameter g_DecodeParametersNative[] = {
-	/* GX_TF_I4     */ { "DecodeI4",     NULL, 0.5f, 1, 8, 8, PC_TEX_FMT_I4_AS_I8 },
-	/* GX_TF_I8     */ { "DecodeI8",     NULL,    1, 1, 8, 4, PC_TEX_FMT_I8 },
-	/* GX_TF_IA4    */ { "DecodeIA4",    NULL,    1, 2, 8, 4, PC_TEX_FMT_IA4_AS_IA8 },
-	/* GX_TF_IA8    */ { "DecodeIA8",    NULL,    2, 2, 4, 4, PC_TEX_FMT_IA8 },
-	/* GX_TF_RGB565 */ { "DecodeRGB565", NULL,    2, 2, 4, 4, PC_TEX_FMT_RGB565 },
-	/* GX_TF_RGB5A3 */ { "DecodeRGB5A3", NULL,    2, 4, 4, 4, PC_TEX_FMT_BGRA32 },
-	/* GX_TF_RGBA8  */ { "DecodeRGBA8",  NULL,    4, 4, 4, 4, PC_TEX_FMT_BGRA32 },
-	/* 7            */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C4     */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C8     */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C14X2  */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* B            */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* C            */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* D            */ { NULL,           NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_CMPR   */ { "DecodeCMPR",   NULL, 0.5f, 4, 8, 8, PC_TEX_FMT_BGRA32 },
-};
-
-sDecoderParameter g_DecodeParametersRGBA[] = {
-	/* GX_TF_I4     */ { "DecodeI4_RGBA",     NULL, 0.5f, 4, 8, 8, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_I8     */ { "DecodeI8_RGBA",     NULL,    1, 4, 8, 4, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_IA4    */ { "DecodeIA4_RGBA",    NULL,    1, 4, 8, 4, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_IA8    */ { "DecodeIA8_RGBA",    NULL,    2, 4, 4, 4, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_RGB565 */ { "DecodeRGB565_RGBA", NULL,    2, 4, 4, 4, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_RGB5A3 */ { "DecodeRGB5A3_RGBA", NULL,    2, 4, 4, 4, PC_TEX_FMT_RGBA32 },
-	/* GX_TF_RGBA8  */ { "DecodeRGBA8_RGBA",  NULL,    4, 4, 4, 4, PC_TEX_FMT_RGBA32 },
-	/* 7            */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C4     */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C8     */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_C14X2  */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* B            */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* C            */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* D            */ { NULL,                NULL,    0, 0, 0, 0, PC_TEX_FMT_NONE },
-	/* GX_TF_CMPR   */ { "DecodeCMPR_RGBA",   NULL, 0.5f, 4, 8, 8, PC_TEX_FMT_RGBA32 },
-};
-
-bool g_Inited = false;
-cl_mem g_clsrc, g_cldst;                    // texture buffer memory objects
-
-#define HEADER_SIZE	32
-
-void TexDecoder_OpenCL_Initialize()
-{
-	if(!g_Inited)
-	{
-		if(!OpenCL::Initialize())
-			return;
-
-		cl_int err = 1;
-		size_t binary_size = 0;
-		char *binary = NULL;
-		char *header = NULL;
-		size_t nDevices = 0;
-		cl_device_id *devices = NULL;
-		size_t *binary_sizes = NULL;
-		char **binaries = NULL;
-		std::string filename;
-		char dolphin_rev[HEADER_SIZE];
-
-		filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin";
-		snprintf(dolphin_rev, HEADER_SIZE, "%-31s", scm_rev_str);
-
-		{
-		File::IOFile input(filename, "rb");
-		if (!input)
-		{
-			binary_size = 0;
-		}
-		else
-		{
-			binary_size = input.GetSize();
-			header = new char[HEADER_SIZE];
-			binary = new char[binary_size];
-			input.ReadBytes(header, HEADER_SIZE);
-			input.ReadBytes(binary, binary_size);
-		}
-		}
-
-		if (binary_size > 0)
-		{
-			if (binary_size > HEADER_SIZE)
-			{
-				if (strncmp(header, dolphin_rev, HEADER_SIZE) == 0)
-				{
-					g_program = clCreateProgramWithBinary(OpenCL::GetContext(), 1, &OpenCL::device_id, &binary_size, (const unsigned char**)&binary, NULL, &err);
-					if (err != CL_SUCCESS)
-					{
-						OpenCL::HandleCLError(err, "clCreateProgramWithBinary");
-					}
-
-					if (!err)
-					{
-						err = clBuildProgram(g_program, 1, &OpenCL::device_id, NULL, NULL, NULL);
-						if (err != CL_SUCCESS)
-						{
-							OpenCL::HandleCLError(err, "clBuildProgram");
-						}
-					}
-				}
-			}
-			delete [] header;
-			delete [] binary;
-		}
-
-		// If an error occurred using the kernel binary, recompile the kernels
-		if (err)
-		{
-			std::string code;
-			filename = File::GetSysDirectory() + OPENCL_DIR DIR_SEP "TextureDecoder.cl";
-			if (!File::ReadFileToString(true, filename.c_str(), code))
-			{
-				ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename.c_str());
-				return;
-			}
-
-			g_program = OpenCL::CompileProgram(code.c_str());
-
-			err = clGetProgramInfo(g_program, CL_PROGRAM_NUM_DEVICES, sizeof(nDevices), &nDevices, NULL);
-			if (err != CL_SUCCESS)
-			{
-				OpenCL::HandleCLError(err, "clGetProgramInfo");
-			}
-			devices = (cl_device_id *)malloc( sizeof(cl_device_id) *nDevices);
-
-			err = clGetProgramInfo(g_program, CL_PROGRAM_DEVICES, sizeof(cl_device_id)*nDevices, devices, NULL);
-			if (err != CL_SUCCESS)
-			{
-				OpenCL::HandleCLError(err, "clGetProgramInfo");
-			}
-
-			binary_sizes = (size_t *)malloc(sizeof(size_t)*nDevices);
-			err = clGetProgramInfo(g_program, CL_PROGRAM_BINARY_SIZES,	sizeof(size_t)*nDevices, binary_sizes, NULL);
-			if (err != CL_SUCCESS)
-			{
-				OpenCL::HandleCLError(err, "clGetProgramInfo");
-			}
-
-			binaries = (char **)malloc(sizeof(char *)*nDevices);
-			for (u32 i = 0; i < nDevices; ++i)
-			{
-				if (binary_sizes[i] != 0)
-				{
-					binaries[i] = (char *)malloc(HEADER_SIZE + binary_sizes[i]);
-				}
-				else
-				{
-					binaries[i] = NULL;
-				}
-			}
-			err = clGetProgramInfo( g_program, CL_PROGRAM_BINARIES,	sizeof(char *)*nDevices, binaries, NULL );
-			if (err != CL_SUCCESS)
-			{
-				OpenCL::HandleCLError(err, "clGetProgramInfo");
-			}
-
-			if (!err)
-			{
-				filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin";
-
-				File::IOFile output(filename, "wb");
-				if (!output)
-				{
-					binary_size = 0;
-				}
-				else
-				{
-					// Supporting one OpenCL device for now
-					output.WriteBytes(dolphin_rev, HEADER_SIZE);
-					output.WriteBytes(binaries[0], binary_sizes[0]);
-				}
-			}
-			for (u32 i = 0; i < nDevices; ++i)
-			{
-				if (binary_sizes[i] != 0)
-				{
-					free(binaries[i]);
-				}
-			}
-			if (binaries != NULL)
-				free(binaries);
-			if (binary_sizes != NULL)
-				free(binary_sizes);
-			if (devices != NULL)
-				free(devices);
-		}
-
-		for (int i = 0; i <= GX_TF_CMPR; ++i)
-		{
-			if (g_DecodeParametersNative[i].name)
-				g_DecodeParametersNative[i].kernel =
-				OpenCL::CompileKernel(g_program,
-				g_DecodeParametersNative[i].name);
-
-			if (g_DecodeParametersRGBA[i].name)
-				g_DecodeParametersRGBA[i].kernel =
-				OpenCL::CompileKernel(g_program,
-				g_DecodeParametersRGBA[i].name);
-		}
-
-		// Allocating maximal Wii texture size in advance, so that we don't have to allocate/deallocate per texture
-#ifndef DEBUG_OPENCL
-		g_clsrc = clCreateBuffer(OpenCL::GetContext(), CL_MEM_READ_ONLY , 1024 * 1024 * sizeof(u32), NULL, NULL);
-		g_cldst = clCreateBuffer(OpenCL::GetContext(), CL_MEM_WRITE_ONLY, 1024 * 1024 * sizeof(u32), NULL, NULL);
-#endif
-
-		g_Inited = true;
-	}
-}
-
-void TexDecoder_OpenCL_Shutdown()
-{
-	if (g_program)
-		clReleaseProgram(g_program);
-
-	for (int i = 0; i < GX_TF_CMPR; ++i) {
-		if (g_DecodeParametersNative[i].kernel)
-			clReleaseKernel(g_DecodeParametersNative[i].kernel);
-
-		if(g_DecodeParametersRGBA[i].kernel)
-			clReleaseKernel(g_DecodeParametersRGBA[i].kernel);
-	}
-
-	if(g_clsrc)
-		clReleaseMemObject(g_clsrc);
-
-	if(g_cldst)
-		clReleaseMemObject(g_cldst);
-
-	g_Inited = false;
-}
-
-PC_TexFormat TexDecoder_Decode_OpenCL(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt, bool rgba)
-{
-	cl_int err;
-	sDecoderParameter& decoder = rgba ? g_DecodeParametersRGBA[texformat] : g_DecodeParametersNative[texformat];
-	if(!g_Inited || !decoder.name || !decoder.kernel || decoder.format == PC_TEX_FMT_NONE)
-		return PC_TEX_FMT_NONE;
-
-#ifdef DEBUG_OPENCL
-	g_clsrc = clCreateBuffer(OpenCL::GetContext(), CL_MEM_READ_ONLY , 1024 * 1024 * sizeof(u32), NULL, NULL);
-	g_cldst = clCreateBuffer(OpenCL::GetContext(), CL_MEM_WRITE_ONLY, 1024 * 1024 * sizeof(u32), NULL, NULL);
-#endif
-
-	clEnqueueWriteBuffer(OpenCL::GetCommandQueue(), g_clsrc, CL_TRUE, 0, (size_t)(width * height * decoder.sizeOfSrc), src, 0, NULL, NULL);
-
-	clSetKernelArg(decoder.kernel, 0, sizeof(cl_mem), &g_cldst);
-	clSetKernelArg(decoder.kernel, 1, sizeof(cl_mem), &g_clsrc);
-	clSetKernelArg(decoder.kernel, 2, sizeof(cl_int), &width);
-
-	size_t global[] = { (size_t)(width / decoder.xSkip), (size_t)(height / decoder.ySkip) };
-
-	// No work-groups for now
-	/*
-	size_t local;
-	err = clGetKernelWorkGroupInfo(kernelToRun, OpenCL::device_id, CL_KERNEL_WORK_GROUP_SIZE, sizeof(local), &local, NULL);
-	if(err)
-		PanicAlert("Error obtaining work-group information");
-	*/
-
-	err = clEnqueueNDRangeKernel(OpenCL::GetCommandQueue(), decoder.kernel, 2, NULL, global, NULL, 0, NULL, NULL);
-	if(err)
-		OpenCL::HandleCLError(err, "Failed to enqueue kernel");
-
-	clFinish(OpenCL::GetCommandQueue());
-
-	clEnqueueReadBuffer(OpenCL::GetCommandQueue(), g_cldst, CL_TRUE, 0, (size_t)(width * height * decoder.sizeOfDst), dst, 0, NULL, NULL);
-
-#ifdef DEBUG_OPENCL
-	clReleaseMemObject(g_clsrc);
-	clReleaseMemObject(g_cldst);
-#endif
-
-	return decoder.format;
-}
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
deleted file mode 100644
index aacccd3885..0000000000
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef OPENCL_TEXTURE_DECODER
-#define OPENCL_TEXTURE_DECODER
-#include "Common.h"
-#include "../TextureDecoder.h"
-
-void TexDecoder_OpenCL_Initialize();
-void TexDecoder_OpenCL_Shutdown();
-
-PC_TexFormat TexDecoder_Decode_OpenCL(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt, bool rgba);
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/PerfQueryBase.cpp b/Source/Core/VideoCommon/Src/PerfQueryBase.cpp
deleted file mode 100644
index af8bfa72e5..0000000000
--- a/Source/Core/VideoCommon/Src/PerfQueryBase.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "PerfQueryBase.h"
-#include "VideoConfig.h"
-
-PerfQueryBase* g_perf_query = 0;
-
-bool PerfQueryBase::ShouldEmulate() const
-{
-	return g_ActiveConfig.bPerfQueriesEnable;
-}
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
deleted file mode 100644
index 5819f64a83..0000000000
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!
-
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "ChunkFile.h"
-#include "Atomic.h"
-#include "CoreTiming.h"
-#include "ConfigManager.h"
-
-#include "PixelEngine.h"
-#include "RenderBase.h"
-#include "CommandProcessor.h"
-#include "HW/ProcessorInterface.h"
-#include "DLCache.h"
-#include "State.h"
-
-namespace PixelEngine
-{
-
-union UPEZConfReg
-{
-	u16 Hex;
-	struct 
-	{
-		u16 ZCompEnable		: 1; // Z Comparator Enable
-		u16 Function		: 3;
-		u16 ZUpdEnable		: 1;
-		u16					: 11;
-	};
-};
-
-union UPEAlphaConfReg
-{
-	u16 Hex;
-	struct 
-	{
-		u16 BMMath			: 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
-		u16 BMLogic			: 1; // GX_BM_LOGIC
-		u16 Dither			: 1;
-		u16 ColorUpdEnable	: 1;
-		u16 AlphaUpdEnable	: 1;
-		u16 DstFactor		: 3;
-		u16 SrcFactor		: 3;
-		u16 Substract		: 1; // Additive mode by default
-		u16 BlendOperator	: 4;
-	};
-};
-
-union UPEDstAlphaConfReg
-{
-	u16 Hex;
-	struct 
-	{
-		u16 DstAlpha		: 8;
-		u16 Enable			: 1;
-		u16					: 7;
-	};
-};
-
-union UPEAlphaModeConfReg
-{
-	u16 Hex;
-	struct 
-	{
-		u16 Threshold		: 8;
-		u16 CompareMode		: 8;
-	};
-};
-
-// fifo Control Register
-union UPECtrlReg
-{
-	struct 
-	{
-		u16 PETokenEnable	:	1;
-		u16 PEFinishEnable	:	1;
-		u16 PEToken			:	1; // write only
-		u16 PEFinish		:	1; // write only
-		u16					:	12;
-	};
-	u16 Hex;
-	UPECtrlReg() {Hex = 0; }
-	UPECtrlReg(u16 _hex) {Hex = _hex; }
-};
-
-// STATE_TO_SAVE
-static UPEZConfReg			m_ZConf;
-static UPEAlphaConfReg		m_AlphaConf;
-static UPEDstAlphaConfReg	m_DstAlphaConf;
-static UPEAlphaModeConfReg	m_AlphaModeConf;
-static UPEAlphaReadReg		m_AlphaRead;
-static UPECtrlReg			m_Control;
-//static u16					m_Token; // token value most recently encountered
-
-volatile u32 g_bSignalTokenInterrupt;
-volatile u32 g_bSignalFinishInterrupt;
-
-static int et_SetTokenOnMainThread;
-static int et_SetFinishOnMainThread;
-
-volatile u32 interruptSetToken = 0;
-volatile u32 interruptSetFinish = 0;
-
-u16 bbox[4];
-bool bbox_active;
-
-enum
-{
-	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
-};
-
-void DoState(PointerWrap &p)
-{
-	p.Do(m_ZConf);
-	p.Do(m_AlphaConf);
-	p.Do(m_DstAlphaConf);
-	p.Do(m_AlphaModeConf);
-	p.Do(m_AlphaRead);
-	p.DoPOD(m_Control);
-
-	p.Do(g_bSignalTokenInterrupt);
-	p.Do(g_bSignalFinishInterrupt);
-	p.Do(interruptSetToken);
-	p.Do(interruptSetFinish);
-	
-	p.Do(bbox);
-	p.Do(bbox_active);
-}
-
-void UpdateInterrupts();
-void UpdateTokenInterrupt(bool active);
-void UpdateFinishInterrupt(bool active);
-void SetToken_OnMainThread(u64 userdata, int cyclesLate);
-void SetFinish_OnMainThread(u64 userdata, int cyclesLate);
-
-void Init()
-{
-	m_Control.Hex = 0;
-	m_ZConf.Hex = 0;
-	m_AlphaConf.Hex = 0;
-	m_DstAlphaConf.Hex = 0;
-	m_AlphaModeConf.Hex = 0;
-	m_AlphaRead.Hex = 0;
-
-	g_bSignalTokenInterrupt = 0;
-	g_bSignalFinishInterrupt = 0;
-	interruptSetToken = 0;
-	interruptSetFinish = 0;
-
-	et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
-	et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
-
-	bbox[0] = 0x80;
-	bbox[1] = 0xA0;
-	bbox[2] = 0x80;
-	bbox[3] = 0xA0;
-
-	bbox_active = false;
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	DEBUG_LOG(PIXELENGINE, "(r16) 0x%08x", _iAddress);
-	switch (_iAddress & 0xFFF)
-	{
-		// CPU Direct Access EFB Raster State Config
-	case PE_ZCONF:
-		_uReturnValue = m_ZConf.Hex;
-		INFO_LOG(PIXELENGINE, "(r16) ZCONF");
-		break;
-	case PE_ALPHACONF:
-		// Most games read this early. no idea why.
-		_uReturnValue = m_AlphaConf.Hex;
-		INFO_LOG(PIXELENGINE, "(r16) ALPHACONF");
-		break;
-	case PE_DSTALPHACONF:
-		_uReturnValue = m_DstAlphaConf.Hex;
-		INFO_LOG(PIXELENGINE, "(r16) DSTALPHACONF");
-		break;
-	case PE_ALPHAMODE:
-		_uReturnValue = m_AlphaModeConf.Hex;
-		INFO_LOG(PIXELENGINE, "(r16) ALPHAMODE");
-		break;	
-	case PE_ALPHAREAD:
-		_uReturnValue = m_AlphaRead.Hex;
-		WARN_LOG(PIXELENGINE, "(r16) ALPHAREAD");
-		break;
-
-	case PE_CTRL_REGISTER:
-		_uReturnValue = m_Control.Hex;
-		INFO_LOG(PIXELENGINE, "(r16) CTRL_REGISTER : %04x", _uReturnValue);
-		break;
-
-	case PE_TOKEN_REG:
-		_uReturnValue = Common::AtomicLoad(*(volatile u32*)&CommandProcessor::fifo.PEToken);
-		INFO_LOG(PIXELENGINE, "(r16) TOKEN_REG : %04x", _uReturnValue);
-		break;
-
-	case PE_BBOX_LEFT:
-	{
-		// Left must be even and 606px max
-		_uReturnValue = std::min((u16) 606, bbox[0]) & ~1;
-
-		INFO_LOG(PIXELENGINE, "R: BBOX_LEFT   = %i", _uReturnValue);
-		bbox_active = false;
-		break;
-	}
-
-	case PE_BBOX_RIGHT:
-	{
-		// Right must be odd and 607px max
-		_uReturnValue = std::min((u16) 607, bbox[1]) | 1;
-
-		INFO_LOG(PIXELENGINE, "R: BBOX_RIGHT  = %i", _uReturnValue);
-		bbox_active = false;
-		break;
-	}
-
-	case PE_BBOX_TOP:
-	{
-		// Top must be even and 478px max
-		_uReturnValue = std::min((u16) 478, bbox[2]) & ~1;
-
-		INFO_LOG(PIXELENGINE, "R: BBOX_TOP    = %i", _uReturnValue);
-		bbox_active = false;
-		break;
-	}
-
-	case PE_BBOX_BOTTOM:
-	{
-		// Bottom must be odd and 479px max
-		_uReturnValue = std::min((u16) 479, bbox[3]) | 1;
-
-		INFO_LOG(PIXELENGINE, "R: BBOX_BOTTOM = %i", _uReturnValue);
-		bbox_active = false;
-		break;
-	}
-
-	// NOTE(neobrain): only PE_PERF_ZCOMP_OUTPUT is implemented in D3D11, but the other values shouldn't be contradictionary to the value of that register (i.e. INPUT registers should always be greater or equal to their corresponding OUTPUT registers).
-	case PE_PERF_ZCOMP_INPUT_ZCOMPLOC_L:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_INPUT_ZCOMPLOC) & 0xFFFF;
-		break;
-
-	case PE_PERF_ZCOMP_INPUT_ZCOMPLOC_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_INPUT_ZCOMPLOC) >> 16;
-		break;
-
-	case PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_L:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_OUTPUT_ZCOMPLOC) & 0xFFFF;
-		break;
-
-	case PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_OUTPUT_ZCOMPLOC) >> 16;
-		break;
-
-	case PE_PERF_ZCOMP_INPUT_L:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_INPUT) & 0xFFFF;
-		break;
-
-	case PE_PERF_ZCOMP_INPUT_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_INPUT) >> 16;
-		break;
-
-	case PE_PERF_ZCOMP_OUTPUT_L:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_OUTPUT) & 0xFFFF;
-		break;
-
-	case PE_PERF_ZCOMP_OUTPUT_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_ZCOMP_OUTPUT) >> 16;
-		break;
-
-	case PE_PERF_BLEND_INPUT_L:
-		// Super Mario Sunshine uses this register in episode 6 of Sirena Beach:
-		// The amount of remaining goop is determined by checking how many pixels reach the blending stage.
-		// Once this register falls below a particular value (around 0x90), the game regards the challenge finished.
-		// In very old builds, Dolphin only returned 0. That caused the challenge to be immediately finished without any goop being cleaned (the timer just didn't even start counting from 3:00:00).
-		// Later builds returned 1 for the high register. That caused the timer to actually count down, but made the challenge unbeatable because the game always thought you didn't clear any goop at all.
-		// Note that currently this functionality is only implemented in the D3D11 backend.
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_BLEND_INPUT) & 0xFFFF;
-		break;
-
-	case PE_PERF_BLEND_INPUT_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_BLEND_INPUT) >> 16;
-		break;
-
-	case PE_PERF_EFB_COPY_CLOCKS_L:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_EFB_COPY_CLOCKS) & 0xFFFF;
-		break;
-
-	case PE_PERF_EFB_COPY_CLOCKS_H:
-		_uReturnValue = g_video_backend->Video_GetQueryResult(PQ_EFB_COPY_CLOCKS) >> 16;
-		break;
-
-	default:
-		INFO_LOG(PIXELENGINE, "(r16) unknown @ %08x", _iAddress);
-		_uReturnValue = 1;
-		break;
-	}
-	
-}
-
-void Write16(const u16 _iValue, const u32 _iAddress)
-{
-	switch (_iAddress & 0xFFF)
-	{
-		// CPU Direct Access EFB Raster State Config
-	case PE_ZCONF:
-		m_ZConf.Hex = _iValue;
-		INFO_LOG(PIXELENGINE, "(w16) ZCONF: %02x", _iValue);
-		break;
-	case PE_ALPHACONF:
-		m_AlphaConf.Hex = _iValue;
-		INFO_LOG(PIXELENGINE, "(w16) ALPHACONF: %02x", _iValue);
-		break;
-	case PE_DSTALPHACONF:
-		m_DstAlphaConf.Hex = _iValue;
-		INFO_LOG(PIXELENGINE, "(w16) DSTALPHACONF: %02x", _iValue);
-		break;
-	case PE_ALPHAMODE:
-		m_AlphaModeConf.Hex = _iValue;
-		INFO_LOG(PIXELENGINE, "(w16) ALPHAMODE: %02x", _iValue);
-		break;
-	case PE_ALPHAREAD:
-		m_AlphaRead.Hex = _iValue;
-		INFO_LOG(PIXELENGINE, "(w16) ALPHAREAD: %02x", _iValue);
-		break;
-
-	case PE_CTRL_REGISTER:	
-		{
-			UPECtrlReg tmpCtrl(_iValue);
-
-			if (tmpCtrl.PEToken)	g_bSignalTokenInterrupt = 0;
-			if (tmpCtrl.PEFinish)	g_bSignalFinishInterrupt = 0;
-
-			m_Control.PETokenEnable  = tmpCtrl.PETokenEnable;
-			m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable;
-			m_Control.PEToken = 0;		// this flag is write only
-			m_Control.PEFinish = 0;		// this flag is write only
-
-			DEBUG_LOG(PIXELENGINE, "(w16) CTRL_REGISTER: 0x%04x", _iValue);
-			UpdateInterrupts();
-		}
-		break;
-
-	case PE_TOKEN_REG:
-		PanicAlert("(w16) WTF? PowerPC program wrote token: %i", _iValue);
-		//only the gx pipeline is supposed to be able to write here
-		//g_token = _iValue;
-		break;
-
-	default:
-		WARN_LOG(PIXELENGINE, "(w16) unknown %04x @ %08x", _iValue, _iAddress);
-		break;
-	}
-
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	WARN_LOG(PIXELENGINE, "(w32) 0x%08x @ 0x%08x IGNORING...",_iValue,_iAddress);
-}
-
-bool AllowIdleSkipping()
-{
-	return !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || (!m_Control.PETokenEnable && !m_Control.PEFinishEnable);
-}
-
-void UpdateInterrupts()
-{
-	// check if there is a token-interrupt
-	UpdateTokenInterrupt((g_bSignalTokenInterrupt & m_Control.PETokenEnable));
-	
-	// check if there is a finish-interrupt
-	UpdateFinishInterrupt((g_bSignalFinishInterrupt & m_Control.PEFinishEnable));
-}
-
-void UpdateTokenInterrupt(bool active)
-{
-	ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active);
-	Common::AtomicStore(interruptSetToken, active ? 1 : 0);
-}
-
-void UpdateFinishInterrupt(bool active)
-{
-	ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active);
-	Common::AtomicStore(interruptSetFinish, active ? 1 : 0);
-}
-
-// TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate).
-//			  Think about the right order between tokenVal and tokenINT... one day maybe.
-//			  Cleanup++
-
-// Called only if BPMEM_PE_TOKEN_INT_ID is ack by GP
-void SetToken_OnMainThread(u64 userdata, int cyclesLate)
-{
-	// XXX: No 16-bit atomic store available, so cheat and use 32-bit.
-	// That's what we've always done. We're counting on fifo.PEToken to be
-	// 4-byte padded.
-	Common::AtomicStore(*(volatile u32*)&CommandProcessor::fifo.PEToken, userdata & 0xffff);
-	INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken);
-	if (userdata >> 16)
-	{
-		Common::AtomicStore(*(volatile u32*)&g_bSignalTokenInterrupt, 1);
-		UpdateInterrupts();
-	}
-	CommandProcessor::interruptTokenWaiting = false;
-	IncrementCheckContextId();
-}
-
-void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
-{
-	Common::AtomicStore(*(volatile u32*)&g_bSignalFinishInterrupt, 1);
-	UpdateInterrupts();
-	CommandProcessor::interruptFinishWaiting = false;
-	CommandProcessor::isPossibleWaitingSetDrawDone = false;
-}
-
-// SetToken
-// THIS IS EXECUTED FROM VIDEO THREAD
-void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
-{
-	if (_bSetTokenAcknowledge) // set token INT
-	{
-		Common::AtomicStore(*(volatile u32*)&g_bSignalTokenInterrupt, 1);
-	}
-
-	CommandProcessor::interruptTokenWaiting = true;
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
-	IncrementCheckContextId();
-}
-
-// SetFinish
-// THIS IS EXECUTED FROM VIDEO THREAD (BPStructs.cpp) when a new frame has been drawn
-void SetFinish()
-{
-	CommandProcessor::interruptFinishWaiting = true;
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0);
-	INFO_LOG(PIXELENGINE, "VIDEO Set Finish");
-	IncrementCheckContextId();
-}
-
-//This function is used in CommandProcessor when write CTRL_REGISTER and the new fifo is attached.
-void ResetSetFinish()
-{
-	//if SetFinish happened but PE_CTRL_REGISTER not, I reset the interrupt else
-	//remove event from the queue
-	if (g_bSignalFinishInterrupt)
-	{
-		UpdateFinishInterrupt(false);
-		g_bSignalFinishInterrupt = false;
-	}
-	else
-	{
-		CoreTiming::RemoveEvent(et_SetFinishOnMainThread);
-	}
-	CommandProcessor::interruptFinishWaiting = false;
-}
-
-void ResetSetToken()
-{
-	if (g_bSignalTokenInterrupt)
-	{
-		UpdateTokenInterrupt(false);
-		g_bSignalTokenInterrupt = 0;
-	}
-	else
-	{
-		CoreTiming::RemoveEvent(et_SetTokenOnMainThread);
-	}
-	CommandProcessor::interruptTokenWaiting = false;
-}
-} // end of namespace PixelEngine
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h
deleted file mode 100644
index 65323590a1..0000000000
--- a/Source/Core/VideoCommon/Src/PixelEngine.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PIXELENGINE_H
-#define _PIXELENGINE_H
-
-#include "CommonTypes.h"
-class PointerWrap;
-
-// internal hardware addresses
-enum
-{
-	PE_ZCONF		 = 0x00, // Z Config
-	PE_ALPHACONF	 = 0x02, // Alpha Config
-	PE_DSTALPHACONF	 = 0x04, // Destination Alpha Config
-	PE_ALPHAMODE	 = 0x06, // Alpha Mode Config
-	PE_ALPHAREAD	 = 0x08, // Alpha Read
-	PE_CTRL_REGISTER = 0x0a, // Control
-	PE_TOKEN_REG	 = 0x0e, // Token
-	PE_BBOX_LEFT	 = 0x10, // Flip Left
-	PE_BBOX_RIGHT	 = 0x12, // Flip Right
-	PE_BBOX_TOP		 = 0x14, // Flip Top
-	PE_BBOX_BOTTOM	 = 0x16, // Flip Bottom
-
-	// NOTE: Order not verified
-	// These indicate the number of quads that are being used as input/output for each particular stage
-	PE_PERF_ZCOMP_INPUT_ZCOMPLOC_L	= 0x18, 
-	PE_PERF_ZCOMP_INPUT_ZCOMPLOC_H	= 0x1a,
-	PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_L	= 0x1c, 
-	PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_H	= 0x1e, 
-	PE_PERF_ZCOMP_INPUT_L			= 0x20, 
-	PE_PERF_ZCOMP_INPUT_H			= 0x22,
-	PE_PERF_ZCOMP_OUTPUT_L			= 0x24, 
-	PE_PERF_ZCOMP_OUTPUT_H			= 0x26, 
-	PE_PERF_BLEND_INPUT_L			= 0x28, 
-	PE_PERF_BLEND_INPUT_H			= 0x2a, 
-	PE_PERF_EFB_COPY_CLOCKS_L		= 0x2c, 
-	PE_PERF_EFB_COPY_CLOCKS_H		= 0x2e, 
-};
-
-namespace PixelEngine
-{
-
-// ReadMode specifies the returned alpha channel for EFB peeks
-union UPEAlphaReadReg
-{
-	u16 Hex;
-	struct
-	{
-		u16 ReadMode		: 2;
-		u16					: 14;
-	};
-};
-
-void Init();
-void DoState(PointerWrap &p);
-
-// Read
-void Read16(u16& _uReturnValue, const u32 _iAddress);
-
-// Write
-void Write16(const u16 _iValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-
-// gfx backend support
-void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
-void SetFinish(void);
-void ResetSetFinish(void);
-void ResetSetToken(void);
-
-// Bounding box functionality. Paper Mario (both) are a couple of the few games that use it.
-extern u16 bbox[4];
-extern bool bbox_active;
-
-} // end of namespace PixelEngine
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
deleted file mode 100644
index 459ae0733c..0000000000
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ /dev/null
@@ -1,1297 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <stdio.h>
-#include <cmath>
-#include <assert.h>
-#include <locale.h>
-#ifdef __APPLE__
-	#include <xlocale.h>
-#endif
-
-#include "LightingShaderGen.h"
-#include "PixelShaderGen.h"
-#include "XFMemory.h"  // for texture projection mode
-#include "BPMemory.h"
-#include "VideoConfig.h"
-#include "NativeVertexFormat.h"
-
-
-//   old tev->pixelshader notes
-//
-//   color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0
-//   konstant for this stage (alpha, color) is given by bpmem.tevksel
-//   inputs are given by bpmem.combiners[0].colorC.a/b/c/d     << could be current channel color
-//   according to GXTevColorArg table above
-//   output is given by .outreg
-//   tevtemp is set according to swapmodetables and
-
-static const char *tevKSelTableC[] = // KCSEL
-{
-	"1.0f,1.0f,1.0f",       // 1   = 0x00
-	"0.875f,0.875f,0.875f", // 7_8 = 0x01
-	"0.75f,0.75f,0.75f",    // 3_4 = 0x02
-	"0.625f,0.625f,0.625f", // 5_8 = 0x03
-	"0.5f,0.5f,0.5f",       // 1_2 = 0x04
-	"0.375f,0.375f,0.375f", // 3_8 = 0x05
-	"0.25f,0.25f,0.25f",    // 1_4 = 0x06
-	"0.125f,0.125f,0.125f", // 1_8 = 0x07
-	"ERROR1", // 0x08
-	"ERROR2", // 0x09
-	"ERROR3", // 0x0a
-	"ERROR4", // 0x0b
-	I_KCOLORS"[0].rgb", // K0 = 0x0C
-	I_KCOLORS"[1].rgb", // K1 = 0x0D
-	I_KCOLORS"[2].rgb", // K2 = 0x0E
-	I_KCOLORS"[3].rgb", // K3 = 0x0F
-	I_KCOLORS"[0].rrr", // K0_R = 0x10
-	I_KCOLORS"[1].rrr", // K1_R = 0x11
-	I_KCOLORS"[2].rrr", // K2_R = 0x12
-	I_KCOLORS"[3].rrr", // K3_R = 0x13
-	I_KCOLORS"[0].ggg", // K0_G = 0x14
-	I_KCOLORS"[1].ggg", // K1_G = 0x15
-	I_KCOLORS"[2].ggg", // K2_G = 0x16
-	I_KCOLORS"[3].ggg", // K3_G = 0x17
-	I_KCOLORS"[0].bbb", // K0_B = 0x18
-	I_KCOLORS"[1].bbb", // K1_B = 0x19
-	I_KCOLORS"[2].bbb", // K2_B = 0x1A
-	I_KCOLORS"[3].bbb", // K3_B = 0x1B
-	I_KCOLORS"[0].aaa", // K0_A = 0x1C
-	I_KCOLORS"[1].aaa", // K1_A = 0x1D
-	I_KCOLORS"[2].aaa", // K2_A = 0x1E
-	I_KCOLORS"[3].aaa", // K3_A = 0x1F
-};
-
-static const char *tevKSelTableA[] = // KASEL
-{
-	"1.0f",  // 1   = 0x00
-	"0.875f",// 7_8 = 0x01
-	"0.75f", // 3_4 = 0x02
-	"0.625f",// 5_8 = 0x03
-	"0.5f",  // 1_2 = 0x04
-	"0.375f",// 3_8 = 0x05
-	"0.25f", // 1_4 = 0x06
-	"0.125f",// 1_8 = 0x07
-	"ERROR5", // 0x08
-	"ERROR6", // 0x09
-	"ERROR7", // 0x0a
-	"ERROR8", // 0x0b
-	"ERROR9", // 0x0c
-	"ERROR10", // 0x0d
-	"ERROR11", // 0x0e
-	"ERROR12", // 0x0f
-	I_KCOLORS"[0].r", // K0_R = 0x10
-	I_KCOLORS"[1].r", // K1_R = 0x11
-	I_KCOLORS"[2].r", // K2_R = 0x12
-	I_KCOLORS"[3].r", // K3_R = 0x13
-	I_KCOLORS"[0].g", // K0_G = 0x14
-	I_KCOLORS"[1].g", // K1_G = 0x15
-	I_KCOLORS"[2].g", // K2_G = 0x16
-	I_KCOLORS"[3].g", // K3_G = 0x17
-	I_KCOLORS"[0].b", // K0_B = 0x18
-	I_KCOLORS"[1].b", // K1_B = 0x19
-	I_KCOLORS"[2].b", // K2_B = 0x1A
-	I_KCOLORS"[3].b", // K3_B = 0x1B
-	I_KCOLORS"[0].a", // K0_A = 0x1C
-	I_KCOLORS"[1].a", // K1_A = 0x1D
-	I_KCOLORS"[2].a", // K2_A = 0x1E
-	I_KCOLORS"[3].a", // K3_A = 0x1F
-};
-
-static const char *tevScaleTable[] = // CS
-{
-	"1.0f",  // SCALE_1
-	"2.0f",  // SCALE_2
-	"4.0f",  // SCALE_4
-	"0.5f",  // DIVIDE_2
-};
-
-static const char *tevBiasTable[] = // TB
-{
-	"",       // ZERO,
-	"+0.5f",  // ADDHALF,
-	"-0.5f",  // SUBHALF,
-	"",
-};
-
-static const char *tevOpTable[] = { // TEV
-	"+",      // TEVOP_ADD = 0,
-	"-",      // TEVOP_SUB = 1,
-};
-
-static const char *tevCInputTable[] = // CC
-{
-	"(prev.rgb)",         // CPREV,
-	"(prev.aaa)",         // APREV,
-	"(c0.rgb)",           // C0,
-	"(c0.aaa)",           // A0,
-	"(c1.rgb)",           // C1,
-	"(c1.aaa)",           // A1,
-	"(c2.rgb)",           // C2,
-	"(c2.aaa)",           // A2,
-	"(textemp.rgb)",      // TEXC,
-	"(textemp.aaa)",      // TEXA,
-	"(rastemp.rgb)",      // RASC,
-	"(rastemp.aaa)",      // RASA,
-	"float3(1.0f, 1.0f, 1.0f)",              // ONE
-	"float3(0.5f, 0.5f, 0.5f)",              // HALF
-	"(konsttemp.rgb)", //"konsttemp.rgb",    // KONST
-	"float3(0.0f, 0.0f, 0.0f)",              // ZERO
-	///added extra values to map clamped values
-	"(cprev.rgb)",        // CPREV,
-	"(cprev.aaa)",        // APREV,
-	"(cc0.rgb)",          // C0,
-	"(cc0.aaa)",          // A0,
-	"(cc1.rgb)",          // C1,
-	"(cc1.aaa)",          // A1,
-	"(cc2.rgb)",          // C2,
-	"(cc2.aaa)",          // A2,
-	"(textemp.rgb)",      // TEXC,
-	"(textemp.aaa)",      // TEXA,
-	"(crastemp.rgb)",     // RASC,
-	"(crastemp.aaa)",     // RASA,
-	"float3(1.0f, 1.0f, 1.0f)",              // ONE
-	"float3(0.5f, 0.5f, 0.5f)",              // HALF
-	"(ckonsttemp.rgb)", //"konsttemp.rgb",   // KONST
-	"float3(0.0f, 0.0f, 0.0f)",              // ZERO
-	"PADERROR1", "PADERROR2", "PADERROR3", "PADERROR4"
-};
-
-static const char *tevAInputTable[] = // CA
-{
-	"prev",            // APREV,
-	"c0",              // A0,
-	"c1",              // A1,
-	"c2",              // A2,
-	"textemp",         // TEXA,
-	"rastemp",         // RASA,
-	"konsttemp",       // KONST,  (hw1 had quarter)
-	"float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO
-	///added extra values to map clamped values
-	"cprev",            // APREV,
-	"cc0",              // A0,
-	"cc1",              // A1,
-	"cc2",              // A2,
-	"textemp",          // TEXA,
-	"crastemp",         // RASA,
-	"ckonsttemp",       // KONST,  (hw1 had quarter)
-	"float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO
-	"PADERROR5", "PADERROR6", "PADERROR7", "PADERROR8",
-	"PADERROR9", "PADERROR10", "PADERROR11", "PADERROR12",
-};
-
-static const char *tevRasTable[] =
-{
-	"colors_0",
-	"colors_1",
-	"ERROR13", //2
-	"ERROR14", //3
-	"ERROR15", //4
-	"float4(alphabump,alphabump,alphabump,alphabump)", // use bump alpha
-	"(float4(alphabump,alphabump,alphabump,alphabump)*(255.0f/248.0f))", //normalized
-	"float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero
-};
-
-//static const char *tevTexFunc[] = { "tex2D", "texRECT" };
-
-static const char *tevCOutputTable[]  = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" };
-static const char *tevAOutputTable[]  = { "prev.a", "c0.a", "c1.a", "c2.a" };
-static const char *tevIndAlphaSel[]   = {"", "x", "y", "z"};
-//static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"};
-static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"};
-static const char *tevIndBiasField[]  = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias
-static const char *tevIndBiasAdd[]    = {"-128.0f", "1.0f", "1.0f", "1.0f" }; // indexed by fmt
-static const char *tevIndWrapStart[]  = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" };
-static const char *tevIndFmtScale[]   = {"255.0f", "31.0f", "15.0f", "7.0f" };
-
-struct RegisterState
-{
-	bool ColorNeedOverflowControl;
-	bool AlphaNeedOverflowControl;
-	bool AuxStored;
-};
-
-static char text[16384];
-
-template<class T> static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4], const char swapModeTable[4][5]);
-template<class T> static inline void SampleTexture(T& out, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
-template<class T> static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-template<class T> static inline void WriteFog(T& out, pixel_shader_uid_data& uid_data);
-
-template<class T>
-static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
-{
-	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
-	pixel_shader_uid_data dummy_data;
-	pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
-										? out.template GetUidData<pixel_shader_uid_data>() : dummy_data;
-
-	out.SetBuffer(text);
-	const bool is_writing_shadercode = (out.GetBuffer() != NULL);
-#ifndef ANDROID
-	locale_t locale;
-	locale_t old_locale;
-	if (is_writing_shadercode)
-	{
-		locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
-		old_locale = uselocale(locale); // Apply the locale for this thread
-	}
-#endif
-
-	if (is_writing_shadercode)
-		text[sizeof(text) - 1] = 0x7C;  // canary
-
-	unsigned int numStages = bpmem.genMode.numtevstages + 1;
-	unsigned int numTexgen = bpmem.genMode.numtexgens;
-
-	const bool forced_early_z = g_ActiveConfig.backend_info.bSupportsEarlyZ && bpmem.UseEarlyDepthTest() && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED);
-	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && bpmem.UseLateDepthTest()) || (!g_ActiveConfig.bFastDepthCalc && bpmem.zmode.testenable && !forced_early_z);
-
-	out.Write("//Pixel Shader for TEV stages\n");
-	out.Write("//%i TEV stages, %i texgens, %i IND stages\n",
-		numStages, numTexgen, bpmem.genMode.numindstages);
-
-	uid_data.dstAlphaMode = dstAlphaMode;
-	uid_data.genMode_numindstages = bpmem.genMode.numindstages;
-	uid_data.genMode_numtevstages = bpmem.genMode.numtevstages;
-	uid_data.genMode_numtexgens = bpmem.genMode.numtexgens;
-
-	if (ApiType == API_OPENGL)
-	{
-		// Fmod implementation gleaned from Nvidia
-		// At http://http.developer.nvidia.com/Cg/fmod.html
-		out.Write("float fmod( float x, float y )\n");
-		out.Write("{\n");
-		out.Write("\tfloat z = fract( abs( x / y) ) * abs( y );\n");
-		out.Write("\treturn (x < 0.0) ? -z : z;\n");
-		out.Write("}\n");
-
-		// Declare samplers
-		for (int i = 0; i < 8; ++i)
-			out.Write("uniform sampler2D samp%d;\n", i);
-	}
-	else
-	{
-		// Declare samplers
-		for (int i = 0; i < 8; ++i)
-			out.Write("%s samp%d : register(s%d);\n", (ApiType == API_D3D11) ? "sampler" : "uniform sampler2D", i, i);
-
-		if (ApiType == API_D3D11)
-		{
-			out.Write("\n");
-			for (int i = 0; i < 8; ++i)
-			{
-				out.Write("Texture2D Tex%d : register(t%d);\n", i, i);
-			}
-		}
-	}
-	out.Write("\n");
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		out.Write("layout(std140) uniform PSBlock {\n");
-
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_COLORS, "float4", I_COLORS"[4]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_KCOLORS, "float4", I_KCOLORS"[4]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_ALPHA, "float4", I_ALPHA"[1]");  // TODO: Why is this an array...-.-
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TEXDIMS, "float4", I_TEXDIMS"[8]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_ZBIAS, "float4", I_ZBIAS"[2]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_INDTEXSCALE, "float4", I_INDTEXSCALE"[2]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_INDTEXMTX, "float4", I_INDTEXMTX"[6]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_FOG, "float4", I_FOG"[3]");
-
-	// For pixel lighting - TODO: Should only be defined when per pixel lighting is enabled!
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PLIGHTS, "float4", I_PLIGHTS"[40]");
-	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PMATERIALS, "float4", I_PMATERIALS"[4]");
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		out.Write("};\n");
-
-	if (ApiType == API_OPENGL)
-	{
-		out.Write("COLOROUT(ocol0)\n");
-		if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-			out.Write("COLOROUT(ocol1)\n");
-
-		if (per_pixel_depth)
-			out.Write("#define depth gl_FragDepth\n");
-
-		out.Write("VARYIN float4 colors_02;\n");
-		out.Write("VARYIN float4 colors_12;\n");
-
-		// compute window position if needed because binding semantic WPOS is not widely supported
-		// Let's set up attributes
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			for (int i = 0; i < 8; ++i)
-			{
-				out.Write("VARYIN float3 uv%d_2;\n", i);
-			}
-			out.Write("VARYIN float4 clipPos_2;\n");
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				out.Write("VARYIN float4 Normal_2;\n");
-			}
-		}
-		else
-		{
-			// wpos is in w of first 4 texcoords
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				for (int i = 0; i < 8; ++i)
-				{
-					out.Write("VARYIN float4 uv%d_2;\n", i);
-				}
-			}
-			else
-			{
-				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				{
-					out.Write("VARYIN float%d uv%d_2;\n", i < 4 ? 4 : 3 , i);
-				}
-			}
-			out.Write("float4 clipPos;\n");
-		}
-
-		if (forced_early_z)
-		{
-			// HACK: This doesn't force the driver to write to depth buffer if alpha test fails.
-			// It just allows it, but it seems that all drivers do.
-			out.Write("layout(early_fragment_tests) in;\n");
-		}
-		else if (bpmem.UseEarlyDepthTest() && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED) && is_writing_shadercode)
-		{
-			static bool warn_once = true;
-			if (warn_once)
-				WARN_LOG(VIDEO, "Early z test enabled but not possible to emulate with current configuration. Make sure to use the D3D11 or OpenGL backend and enable fast depth calculations. If this message still shows up your hardware isn't able to emulate the feature properly (a GPU which supports D3D 11.0 / OGL 4.2 is required).");
-			warn_once = false;
-		}
-
-		out.Write("void main()\n{\n");
-	}
-	else
-	{
-		if (forced_early_z)
-		{
-			out.Write("[earlydepthstencil]\n");
-		}
-		else if (bpmem.UseEarlyDepthTest() && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED) && is_writing_shadercode)
-		{
-			static bool warn_once = true;
-			if (warn_once)
-				WARN_LOG(VIDEO, "Early z test enabled but not possible to emulate with current configuration. Make sure to use the D3D11 or OpenGL backend and enable fast depth calculations. If this message still shows up your hardware isn't able to emulate the feature properly (a GPU which supports D3D 11.0 / OGL 4.2 is required).");
-			warn_once = false;
-		}
-
-		out.Write("void main(\n");
-		if(ApiType != API_D3D11)
-		{
-			out.Write("  out float4 ocol0 : COLOR0,%s%s\n  in float4 rawpos : %s,\n",
-				dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n  out float4 ocol1 : COLOR1," : "",
-				per_pixel_depth ? "\n  out float depth : DEPTH," : "",
-				ApiType & API_D3D9_SM20 ? "POSITION" : "VPOS");
-		}
-		else
-		{
-			out.Write("  out float4 ocol0 : SV_Target0,%s%s\n  in float4 rawpos : SV_Position,\n",
-				dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n  out float4 ocol1 : SV_Target1," : "",
-				per_pixel_depth ? "\n  out float depth : SV_Depth," : "");
-		}
-
-		// "centroid" attribute is only supported by D3D11
-		const char* optCentroid = (ApiType == API_D3D11 ? "centroid" : "");
-
-		out.Write("  in %s float4 colors_0 : COLOR0,\n", optCentroid);
-		out.Write("  in %s float4 colors_1 : COLOR1", optCentroid);
-
-		// compute window position if needed because binding semantic WPOS is not widely supported
-		if (numTexgen < 7)
-		{
-			for (unsigned int i = 0; i < numTexgen; ++i)
-				out.Write(",\n  in %s float3 uv%d : TEXCOORD%d", optCentroid, i, i);
-			out.Write(",\n  in %s float4 clipPos : TEXCOORD%d", optCentroid, numTexgen);
-			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-				out.Write(",\n  in %s float4 Normal : TEXCOORD%d", optCentroid, numTexgen + 1);
-			out.Write("        ) {\n");
-		}
-		else
-		{
-			// wpos is in w of first 4 texcoords
-			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				for (int i = 0; i < 8; ++i)
-					out.Write(",\n  in float4 uv%d : TEXCOORD%d", i, i);
-			}
-			else
-			{
-				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-					out.Write(",\n  in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i);
-			}
-			out.Write("        ) {\n");
-			out.Write("\tfloat4 clipPos = float4(0.0f, 0.0f, 0.0f, 0.0f);");
-		}
-	}
-
-	out.Write("  float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n"
-			"  float3 comp16 = float3(1.0f, 255.0f, 0.0f), comp24 = float3(1.0f, 255.0f, 255.0f*255.0f);\n"
-			"  float alphabump=0.0f;\n"
-			"  float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n"
-			"  float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n"
-			"  float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n"
-			"  float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n"
-			"  float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n");
-
-	if (ApiType == API_OPENGL)
-	{
-		// On Mali, global variables must be initialized as constants.
-		// This is why we initialize these variables locally instead.
-		out.Write("float4 rawpos = gl_FragCoord;\n");
-		out.Write("float4 colors_0 = colors_02;\n");
-		out.Write("float4 colors_1 = colors_12;\n");
-		// compute window position if needed because binding semantic WPOS is not widely supported
-		// Let's set up attributes
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			if(numTexgen)
-			{
-			for (int i = 0; i < 8; ++i)
-			{
-				out.Write("float3 uv%d = uv%d_2;\n", i, i);
-			}
-			}
-			out.Write("float4 clipPos = clipPos_2;\n");
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				out.Write("float4 Normal = Normal_2;\n");
-			}
-		}
-		else
-		{
-			// wpos is in w of first 4 texcoords
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				for (int i = 0; i < 8; ++i)
-				{
-					out.Write("float4 uv%d = uv%d_2;\n", i, i);
-				}
-			}
-			else
-			{
-				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				{
-					out.Write("float%d uv%d = uv%d_2;\n", i < 4 ? 4 : 3 , i, i);
-				}
-			}
-		}
-	}
-
-	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-	{
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n");
-			out.Write("\tfloat3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n");
-		}
-		else
-		{
-			out.Write("\tfloat3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n");
-			out.Write("\tfloat3 pos = float3(uv0.w,uv1.w,uv7.w);\n");
-		}
-
-		out.Write("\tfloat4 mat, lacc;\n"
-				"\tfloat3 ldir, h;\n"
-				"\tfloat dist, dist2, attn;\n");
-
-		out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further
-		out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
-		uid_data.components = components;
-		GenerateLightingShader<T>(out, uid_data.lighting, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
-	}
-
-	if (numTexgen < 7)
-		out.Write("\tclipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n");
-	else
-		out.Write("\tclipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n");
-
-	// HACK to handle cases where the tex gen is not enabled
-	if (numTexgen == 0)
-	{
-		out.Write("\tfloat3 uv0 = float3(0.0f, 0.0f, 0.0f);\n");
-	}
-	else
-	{
-		out.SetConstantsUsed(C_TEXDIMS, C_TEXDIMS+numTexgen-1);
-		for (unsigned int i = 0; i < numTexgen; ++i)
-		{
-			// optional perspective divides
-			uid_data.texMtxInfo_n_projection |= xfregs.texMtxInfo[i].projection << i;
-			if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
-			{
-				out.Write("\tif (uv%d.z != 0.0f)", i);
-				out.Write("\t\tuv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i);
-			}
-
-			out.Write("uv%d.xy = uv%d.xy * " I_TEXDIMS"[%d].zw;\n", i, i, i);
-		}
-	}
-
-	// indirect texture map lookup
-	int nIndirectStagesUsed = 0;
-	if (bpmem.genMode.numindstages > 0)
-	{
-		for (unsigned int i = 0; i < numStages; ++i)
-		{
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
-		}
-	}
-
-	uid_data.nIndirectStagesUsed = nIndirectStagesUsed;
-	for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
-	{
-		if (nIndirectStagesUsed & (1 << i))
-		{
-			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
-			unsigned int texmap = bpmem.tevindref.getTexMap(i);
-
-			uid_data.SetTevindrefValues(i, texcoord, texmap);
-			if (texcoord < numTexgen)
-			{
-				out.SetConstantsUsed(C_INDTEXSCALE+i/2,C_INDTEXSCALE+i/2);
-				out.Write("\ttempcoord = uv%d.xy * " I_INDTEXSCALE"[%d].%s;\n", texcoord, i/2, (i&1)?"zw":"xy");
-			}
-			else
-				out.Write("\ttempcoord = float2(0.0f, 0.0f);\n");
-
-			out.Write("float3 indtex%d = ", i);
-			SampleTexture<T>(out, "tempcoord", "abg", texmap, ApiType);
-		}
-	}
-
-	RegisterState RegisterStates[4];
-	RegisterStates[0].AlphaNeedOverflowControl = false;
-	RegisterStates[0].ColorNeedOverflowControl = false;
-	RegisterStates[0].AuxStored = false;
-	for(int i = 1; i < 4; i++)
-	{
-		RegisterStates[i].AlphaNeedOverflowControl = true;
-		RegisterStates[i].ColorNeedOverflowControl = true;
-		RegisterStates[i].AuxStored = false;
-	}
-
-	// Uid fields for BuildSwapModeTable are set in WriteStage
-	char swapModeTable[4][5];
-	const char* swapColors = "rgba";
-	for (int i = 0; i < 4; i++)
-	{
-		swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1];
-		swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2];
-		swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1];
-		swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2];
-		swapModeTable[i][4] = '\0';
-	}
-
-	for (unsigned int i = 0; i < numStages; i++)
-		WriteStage<T>(out, uid_data, i, ApiType, RegisterStates, swapModeTable); // build the equation for this stage
-
-#define MY_STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
-	bool enable_pl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-	uid_data.num_values = (enable_pl) ? sizeof(uid_data) : MY_STRUCT_OFFSET(uid_data,stagehash[numStages]);
-
-
-	if (numStages)
-	{
-		// The results of the last texenv stage are put onto the screen,
-		// regardless of the used destination register
-		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
-		{
-			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored;
-			out.Write("\tprev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
-			RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl;
-		}
-		if(bpmem.combiners[numStages - 1].alphaC.dest != 0)
-		{
-			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AuxStored;
-			out.Write("\tprev.a = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]);
-			RegisterStates[0].AlphaNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl;
-		}
-	}
-	// emulation of unsigned 8 overflow when casting if needed
-	if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
-		out.Write("\tprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-
-	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
-	uid_data.Pretest = Pretest;
-
-	// NOTE: Fragment may not be discarded if alpha test always fails and early depth test is enabled 
-	// (in this case we need to write a depth value if depth test passes regardless of the alpha testing result)
-	if (Pretest == AlphaTest::UNDETERMINED || (Pretest == AlphaTest::FAIL && bpmem.UseLateDepthTest()))
-		WriteAlphaTest<T>(out, uid_data, ApiType, dstAlphaMode, per_pixel_depth);
-
-
-	// D3D9 doesn't support readback of depth in pixel shader, so we always have to calculate it again.
-	// This shouldn't be a performance issue as the written depth is usually still from perspective division
-	// but this isn't true for z-textures, so there will be depth issues between enabled and disabled z-textures fragments
-	if ((ApiType == API_OPENGL || ApiType == API_D3D11) && g_ActiveConfig.bFastDepthCalc)
-		out.Write("float zCoord = rawpos.z;\n");
-	else
-	{
-		out.SetConstantsUsed(C_ZBIAS+1, C_ZBIAS+1);
-		// the screen space depth value = far z + (clip z / clip w) * z range
-		out.Write("float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
-	}
-
-	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
-	const bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
-
-	uid_data.ztex_op = bpmem.ztex2.op;
-	uid_data.per_pixel_depth = per_pixel_depth;
-	uid_data.forced_early_z = forced_early_z;
-	uid_data.fast_depth_calc = g_ActiveConfig.bFastDepthCalc;
-	uid_data.early_ztest = bpmem.UseEarlyDepthTest();
-	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
-
-	// Note: z-textures are not written to depth buffer if early depth test is used
-	if (per_pixel_depth && bpmem.UseEarlyDepthTest())
-		out.Write("depth = zCoord;\n");
-
-	// Note: depth texture output is only written to depth buffer if late depth test is used
-	// theoretical final depth value is used for fog calculation, though, so we have to emulate ztextures anyway
-	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !skip_ztexture)
-	{
-		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
-		out.SetConstantsUsed(C_ZBIAS, C_ZBIAS+1);
-		out.Write("zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
-									(bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : "");
-
-		// U24 overflow emulation
-		out.Write("zCoord = zCoord * (16777215.0f/16777216.0f);\n");
-		out.Write("zCoord = frac(zCoord);\n");
-		out.Write("zCoord = zCoord * (16777216.0f/16777215.0f);\n");
-	}
-
-	if (per_pixel_depth && bpmem.UseLateDepthTest())
-		out.Write("depth = zCoord;\n");
-
-	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
-	{
-		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
-		out.Write("\tocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n");
-	}
-	else
-	{
-		WriteFog<T>(out, uid_data);
-		out.Write("\tocol0 = prev;\n");
-	}
-
-	// Use dual-source color blending to perform dst alpha in a single pass
-	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-	{
-		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
-		if(ApiType & API_D3D9)
-		{
-			// alpha component must be 0 or the shader will not compile (Direct3D 9Ex restriction)
-			// Colors will be blended against the color from ocol1 in D3D 9...
-			out.Write("\tocol1 = float4(prev.a, prev.a, prev.a, 0.0f);\n");
-		}
-		else
-		{
-			// Colors will be blended against the alpha from ocol1...
-			out.Write("\tocol1 = prev;\n");
-		}
-		// ...and the alpha from ocol0 will be written to the framebuffer.
-		out.Write("\tocol0.a = " I_ALPHA"[0].a;\n");
-	}
-
-	out.Write("}\n");
-
-	if (is_writing_shadercode)
-	{
-		if (text[sizeof(text) - 1] != 0x7C)
-			PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
-
-#ifndef ANDROID
-		uselocale(old_locale); // restore locale
-		freelocale(locale);
-#endif
-	}
-}
-
-
-
-//table with the color compare operations
-static const char *TEVCMPColorOPTable[16] =
-{
-	"float3(0.0f, 0.0f, 0.0f)",//0
-	"float3(0.0f, 0.0f, 0.0f)",//1
-	"float3(0.0f, 0.0f, 0.0f)",//2
-	"float3(0.0f, 0.0f, 0.0f)",//3
-	"float3(0.0f, 0.0f, 0.0f)",//4
-	"float3(0.0f, 0.0f, 0.0f)",//5
-	"float3(0.0f, 0.0f, 0.0f)",//6
-	"float3(0.0f, 0.0f, 0.0f)",//7
-	"   %s + ((%s.r >= %s.r + (0.25f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_GT 8
-	"   %s + ((abs(%s.r - %s.r) < (0.5f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_EQ 9
-	"   %s + (( dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_GT 10
-	"   %s + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_EQ 11
-	"   %s + (( dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_GT 12
-	"   %s + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_EQ 13
-	"   %s + (max(sign(%s.rgb - %s.rgb - (0.25f/255.0f)), float3(0.0f, 0.0f, 0.0f)) * %s)",//#define TEVCMP_RGB8_GT  14
-	"   %s + ((float3(1.0f, 1.0f, 1.0f) - max(sign(abs(%s.rgb - %s.rgb) - (0.5f/255.0f)), float3(0.0f, 0.0f, 0.0f))) * %s)"//#define TEVCMP_RGB8_EQ  15
-};
-
-//table with the alpha compare operations
-static const char *TEVCMPAlphaOPTable[16] =
-{
-	"0.0f",//0
-	"0.0f",//1
-	"0.0f",//2
-	"0.0f",//3
-	"0.0f",//4
-	"0.0f",//5
-	"0.0f",//6
-	"0.0f",//7
-	"   %s.a + ((%s.r >= (%s.r + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_R8_GT 8
-	"   %s.a + (abs(%s.r - %s.r) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_R8_EQ 9
-	"   %s.a + ((dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_GR16_GT 10
-	"   %s.a + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_GR16_EQ 11
-	"   %s.a + ((dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_GT 12
-	"   %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13
-	"   %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14
-	"   %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15
-};
-
-template<class T>
-static inline void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4], const char swapModeTable[4][5])
-{
-	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
-	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
-	bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages;
-	// HACK to handle cases where the tex gen is not enabled
-	if (!bHasTexCoord)
-		texcoord = 0;
-
-	out.Write("// TEV stage %d\n", n);
-
-	uid_data.stagehash[n].hasindstage = bHasIndStage;
-	uid_data.stagehash[n].tevorders_texcoord = texcoord;
-	if (bHasIndStage)
-	{
-		uid_data.stagehash[n].tevind = bpmem.tevind[n].hex & 0x7FFFFF;
-
-		out.Write("// indirect op\n");
-		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
-		if (bpmem.tevind[n].bs != ITBA_OFF)
-		{
-			out.Write("alphabump = indtex%d.%s %s;\n",
-					bpmem.tevind[n].bt,
-					tevIndAlphaSel[bpmem.tevind[n].bs],
-					tevIndAlphaScale[bpmem.tevind[n].fmt]);
-		}
-		// format
-		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
-
-		// bias
-		if (bpmem.tevind[n].bias != ITB_NONE )
-			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
-
-		// multiply by offset matrix and scale
-		if (bpmem.tevind[n].mid != 0)
-		{
-			if (bpmem.tevind[n].mid <= 3)
-			{
-				int mtxidx = 2*(bpmem.tevind[n].mid-1);
-				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
-				out.Write("float2 indtevtrans%d = float2(dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n",
-							n, mtxidx, n, mtxidx+1, n);
-			}
-			else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord)
-			{ // s matrix
-				_assert_(bpmem.tevind[n].mid >= 5);
-				int mtxidx = 2*(bpmem.tevind[n].mid-5);
-				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
-				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n);
-			}
-			else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord)
-			{ // t matrix
-				_assert_(bpmem.tevind[n].mid >= 9);
-				int mtxidx = 2*(bpmem.tevind[n].mid-9);
-				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
-				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n);
-			}
-			else
-			{
-				out.Write("float2 indtevtrans%d = float2(0.0f, 0.0f);\n", n);
-			}
-		}
-		else
-		{
-			out.Write("float2 indtevtrans%d = float2(0.0f, 0.0f);\n", n);
-		}
-
-		// ---------
-		// Wrapping
-		// ---------
-
-		// wrap S
-		if (bpmem.tevind[n].sw == ITW_OFF)
-			out.Write("wrappedcoord.x = uv%d.x;\n", texcoord);
-		else if (bpmem.tevind[n].sw == ITW_0)
-			out.Write("wrappedcoord.x = 0.0f;\n");
-		else
-			out.Write("wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]);
-
-		// wrap T
-		if (bpmem.tevind[n].tw == ITW_OFF)
-			out.Write("wrappedcoord.y = uv%d.y;\n", texcoord);
-		else if (bpmem.tevind[n].tw == ITW_0)
-			out.Write("wrappedcoord.y = 0.0f;\n");
-		else
-			out.Write("wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]);
-
-		if (bpmem.tevind[n].fb_addprev) // add previous tevcoord
-			out.Write("tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n);
-		else
-			out.Write("tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n);
-	}
-
-	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
-	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
-
-	uid_data.stagehash[n].cc = cc.hex & 0xFFFFFF;
-	uid_data.stagehash[n].ac = ac.hex & 0xFFFFF0; // Storing rswap and tswap later
-
-	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
-		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
-		|| cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC
-		|| cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC
-		|| ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA
-		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
-	{
-		const int i = bpmem.combiners[n].alphaC.rswap;
-		uid_data.stagehash[n].ac |= bpmem.combiners[n].alphaC.rswap;
-		uid_data.stagehash[n].tevksel_swap1a = bpmem.tevksel[i*2].swap1;
-		uid_data.stagehash[n].tevksel_swap2a = bpmem.tevksel[i*2].swap2;
-		uid_data.stagehash[n].tevksel_swap1b = bpmem.tevksel[i*2+1].swap1;
-		uid_data.stagehash[n].tevksel_swap2b = bpmem.tevksel[i*2+1].swap2;
-		uid_data.stagehash[n].tevorders_colorchan = bpmem.tevorders[n / 2].getColorChan(n & 1);
-
-		const char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
-		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
-		out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-	}
-
-	uid_data.stagehash[n].tevorders_enable = bpmem.tevorders[n / 2].getEnable(n & 1);
-	if (bpmem.tevorders[n/2].getEnable(n&1))
-	{
-		if (!bHasIndStage)
-		{
-			// calc tevcord
-			if(bHasTexCoord)
-				out.Write("tevcoord.xy = uv%d.xy;\n", texcoord);
-			else
-				out.Write("tevcoord.xy = float2(0.0f, 0.0f);\n");
-		}
-
-		const int i = bpmem.combiners[n].alphaC.tswap;
-		uid_data.stagehash[n].ac |= bpmem.combiners[n].alphaC.tswap << 2;
-		uid_data.stagehash[n].tevksel_swap1c = bpmem.tevksel[i*2].swap1;
-		uid_data.stagehash[n].tevksel_swap2c = bpmem.tevksel[i*2].swap2;
-		uid_data.stagehash[n].tevksel_swap1d = bpmem.tevksel[i*2+1].swap1;
-		uid_data.stagehash[n].tevksel_swap2d = bpmem.tevksel[i*2+1].swap2;
-
-		uid_data.stagehash[n].tevorders_texmap= bpmem.tevorders[n/2].getTexMap(n&1);
-
-		const char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
-		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
-		uid_data.SetTevindrefTexmap(i, texmap);
-
-		out.Write("textemp = ");
-		SampleTexture<T>(out, "tevcoord", texswap, texmap, ApiType);
-	}
-	else
-	{
-		out.Write("textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-	}
-
-
-	if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST
-		|| ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST || ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST)
-	{
-		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
-		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
-		uid_data.stagehash[n].tevksel_kc = kc;
-		uid_data.stagehash[n].tevksel_ka = ka;
-		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
-		if(kc > 7 || ka > 7)
-		{
-			out.Write("ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-		}
-		else
-		{
-			out.Write("ckonsttemp = konsttemp;\n");
-		}
-		if (kc > 7)
-			out.SetConstantsUsed(C_KCOLORS+((kc-0xc)%4),C_KCOLORS+((kc-0xc)%4));
-		if (ka > 7)
-			out.SetConstantsUsed(C_KCOLORS+((ka-0xc)%4),C_KCOLORS+((ka-0xc)%4));
-	}
-
-	if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV
-		|| cc.b == TEVCOLORARG_CPREV || cc.b == TEVCOLORARG_APREV
-		|| cc.c == TEVCOLORARG_CPREV || cc.c == TEVCOLORARG_APREV
-		|| ac.a == TEVALPHAARG_APREV || ac.b == TEVALPHAARG_APREV || ac.c == TEVALPHAARG_APREV)
-	{
-		if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
-		{
-			out.Write("cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-			RegisterStates[0].AlphaNeedOverflowControl = false;
-			RegisterStates[0].ColorNeedOverflowControl = false;
-		}
-		else
-		{
-			out.Write("cprev = prev;\n");
-		}
-		RegisterStates[0].AuxStored = true;
-	}
-
-	if(cc.a == TEVCOLORARG_C0 || cc.a == TEVCOLORARG_A0
-	|| cc.b == TEVCOLORARG_C0 || cc.b == TEVCOLORARG_A0
-	|| cc.c == TEVCOLORARG_C0 || cc.c == TEVCOLORARG_A0
-	|| ac.a == TEVALPHAARG_A0 || ac.b == TEVALPHAARG_A0 || ac.c == TEVALPHAARG_A0)
-	{
-		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
-		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
-		{
-			out.Write("cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-			RegisterStates[1].AlphaNeedOverflowControl = false;
-			RegisterStates[1].ColorNeedOverflowControl = false;
-		}
-		else
-		{
-			out.Write("cc0 = c0;\n");
-		}
-		RegisterStates[1].AuxStored = true;
-	}
-
-	if(cc.a == TEVCOLORARG_C1 || cc.a == TEVCOLORARG_A1
-	|| cc.b == TEVCOLORARG_C1 || cc.b == TEVCOLORARG_A1
-	|| cc.c == TEVCOLORARG_C1 || cc.c == TEVCOLORARG_A1
-	|| ac.a == TEVALPHAARG_A1 || ac.b == TEVALPHAARG_A1 || ac.c == TEVALPHAARG_A1)
-	{
-		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
-		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
-		{
-			out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-			RegisterStates[2].AlphaNeedOverflowControl = false;
-			RegisterStates[2].ColorNeedOverflowControl = false;
-		}
-		else
-		{
-			out.Write("cc1 = c1;\n");
-		}
-		RegisterStates[2].AuxStored = true;
-	}
-
-	if(cc.a == TEVCOLORARG_C2 || cc.a == TEVCOLORARG_A2
-	|| cc.b == TEVCOLORARG_C2 || cc.b == TEVCOLORARG_A2
-	|| cc.c == TEVCOLORARG_C2 || cc.c == TEVCOLORARG_A2
-	|| ac.a == TEVALPHAARG_A2 || ac.b == TEVALPHAARG_A2 || ac.c == TEVALPHAARG_A2)
-	{
-		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
-		if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl)
-		{
-			out.Write("cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
-			RegisterStates[3].AlphaNeedOverflowControl = false;
-			RegisterStates[3].ColorNeedOverflowControl = false;
-		}
-		else
-		{
-			out.Write("cc2 = c2;\n");
-		}
-		RegisterStates[3].AuxStored = true;
-	}
-
-	RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0);
-	RegisterStates[cc.dest].AuxStored = false;
-
-	if (cc.d == TEVCOLORARG_C0 || cc.d == TEVCOLORARG_A0 || ac.d == TEVALPHAARG_A0)
-		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
-
-	if (cc.d == TEVCOLORARG_C1 || cc.d == TEVCOLORARG_A1 || ac.d == TEVALPHAARG_A1)
-		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
-
-	if (cc.d == TEVCOLORARG_C2 || cc.d == TEVCOLORARG_A2 || ac.d == TEVALPHAARG_A2)
-		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
-
-	if (cc.dest >= GX_TEVREG0 && cc.dest <= GX_TEVREG2)
-		out.SetConstantsUsed(C_COLORS+cc.dest, C_COLORS+cc.dest);
-
-	if (ac.dest >= GX_TEVREG0 && ac.dest <= GX_TEVREG2)
-		out.SetConstantsUsed(C_COLORS+ac.dest, C_COLORS+ac.dest);
-
-	out.Write("// color combine\n");
-	if (cc.clamp)
-		out.Write("%s = clamp(", tevCOutputTable[cc.dest]);
-	else
-		out.Write("%s = ", tevCOutputTable[cc.dest]);
-
-	// combine the color channel
-	if (cc.bias != TevBias_COMPARE) // if not compare
-	{
-		//normal color combiner goes here
-		if (cc.shift > TEVSCALE_1)
-			out.Write("%s*(", tevScaleTable[cc.shift]);
-
-		if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD))
-			out.Write("%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]);
-
-		if (cc.a == cc.b)
-			out.Write("%s", tevCInputTable[cc.a + 16]);
-		else if (cc.c == TEVCOLORARG_ZERO)
-			out.Write("%s", tevCInputTable[cc.a + 16]);
-		else if (cc.c == TEVCOLORARG_ONE)
-			out.Write("%s", tevCInputTable[cc.b + 16]);
-		else if (cc.a == TEVCOLORARG_ZERO)
-			out.Write("%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
-		else if (cc.b == TEVCOLORARG_ZERO)
-			out.Write("%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]);
-		else
-			out.Write("lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
-
-		out.Write("%s", tevBiasTable[cc.bias]);
-
-		if (cc.shift > TEVSCALE_1)
-			out.Write(")");
-	}
-	else
-	{
-		int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here
-		out.Write(TEVCMPColorOPTable[cmp],//lookup the function from the op table
-				tevCInputTable[cc.d],
-				tevCInputTable[cc.a + 16],
-				tevCInputTable[cc.b + 16],
-				tevCInputTable[cc.c + 16]);
-	}
-	if (cc.clamp)
-		out.Write(", 0.0f, 1.0f)");
-	out.Write(";\n");
-
-	RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0);
-	RegisterStates[ac.dest].AuxStored = false;
-
-	out.Write("// alpha combine\n");
-	if (ac.clamp)
-		out.Write("%s = clamp(", tevAOutputTable[ac.dest]);
-	else
-		out.Write("%s = ", tevAOutputTable[ac.dest]);
-
-	if (ac.bias != TevBias_COMPARE) // if not compare
-	{
-		//normal alpha combiner goes here
-		if (ac.shift > TEVSCALE_1)
-			out.Write("%s*(", tevScaleTable[ac.shift]);
-
-		if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD))
-			out.Write("%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]);
-
-		if (ac.a == ac.b)
-			out.Write("%s.a", tevAInputTable[ac.a + 8]);
-		else if (ac.c == TEVALPHAARG_ZERO)
-			out.Write("%s.a", tevAInputTable[ac.a + 8]);
-		else if (ac.a == TEVALPHAARG_ZERO)
-			out.Write("%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
-		else if (ac.b == TEVALPHAARG_ZERO)
-			out.Write("%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]);
-		else
-			out.Write("lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
-
-		out.Write("%s",tevBiasTable[ac.bias]);
-
-		if (ac.shift>0)
-			out.Write(")");
-
-	}
-	else
-	{
-		//compare alpha combiner goes here
-		int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here
-		out.Write(TEVCMPAlphaOPTable[cmp],
-				tevAInputTable[ac.d],
-				tevAInputTable[ac.a + 8],
-				tevAInputTable[ac.b + 8],
-				tevAInputTable[ac.c + 8]);
-	}
-	if (ac.clamp)
-		out.Write(", 0.0f, 1.0f)");
-	out.Write(";\n\n");
-	out.Write("// TEV done\n");
-}
-
-template<class T>
-void SampleTexture(T& out, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
-{
-	out.SetConstantsUsed(C_TEXDIMS+texmap,C_TEXDIMS+texmap);
-
-	if (ApiType == API_D3D11)
-		out.Write("Tex%d.Sample(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", texmap,texmap, texcoords, texmap, texswap);
-	else
-		out.Write("%s(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", ApiType == API_OPENGL ? "texture" : "tex2D", texmap, texcoords, texmap, texswap);
-}
-
-static const char *tevAlphaFuncsTable[] =
-{
-	"(false)",									// NEVER
-	"(prev.a <= %s - (0.25f/255.0f))",			// LESS
-	"(abs( prev.a - %s ) < (0.5f/255.0f))",		// EQUAL
-	"(prev.a < %s + (0.25f/255.0f))",			// LEQUAL
-	"(prev.a >= %s + (0.25f/255.0f))",			// GREATER
-	"(abs( prev.a - %s ) >= (0.5f/255.0f))",	// NEQUAL
-	"(prev.a > %s - (0.25f/255.0f))",			// GEQUAL
-	"(true)"									// ALWAYS
-};
-
-static const char *tevAlphaFunclogicTable[] =
-{
-	" && ", // and
-	" || ", // or
-	" != ", // xor
-	" == "  // xnor
-};
-
-template<class T>
-static inline void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth)
-{
-	static const char *alphaRef[2] =
-	{
-		I_ALPHA"[0].r",
-		I_ALPHA"[0].g"
-	};
-
-	out.SetConstantsUsed(C_ALPHA, C_ALPHA);
-
-	// using discard then return works the same in cg and dx9 but not in dx11
-	out.Write("\tif(!( ");
-
-	uid_data.alpha_test_comp0 = bpmem.alpha_test.comp0;
-	uid_data.alpha_test_comp1 = bpmem.alpha_test.comp1;
-	uid_data.alpha_test_logic = bpmem.alpha_test.logic;
-
-	// Lookup the first component from the alpha function table
-	int compindex = bpmem.alpha_test.comp0;
-	out.Write(tevAlphaFuncsTable[compindex], alphaRef[0]);
-
-	out.Write("%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op
-
-	// Lookup the second component from the alpha function table
-	compindex = bpmem.alpha_test.comp1;
-	out.Write(tevAlphaFuncsTable[compindex], alphaRef[1]);
-	out.Write(")) {\n");
-
-	out.Write("\t\tocol0 = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
-	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-		out.Write("\t\tocol1 = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
-	if(per_pixel_depth)
-		out.Write("\t\tdepth = 1.f;\n");
-
-	// HAXX: zcomploc (aka early_ztest) is a way to control whether depth test is done before
-	// or after texturing and alpha test. PC graphics APIs have no way to support this
-	// feature properly as of 2012: Depth buffer and depth test are not
-	// programmable and the depth test is always done after texturing.
-	// Most importantly, they do not allow writing to the z-buffer without
-	// writing a color value (unless color writing is disabled altogether).
-	// We implement "depth test before texturing" by disabling alpha test when early-z is in use.
-	// It seems to be less buggy than not to update the depth buffer if alpha test fails,
-	// but both ways wouldn't be accurate.
-
-	// OpenGL 4.2 has a flag which allows the driver to still update the depth buffer 
-	// if alpha test fails. The driver doesn't have to, but I assume they all do because
-	// it's the much faster code path for the GPU.
-	uid_data.alpha_test_use_zcomploc_hack = bpmem.UseEarlyDepthTest() && bpmem.zmode.updateenable && !g_ActiveConfig.backend_info.bSupportsEarlyZ;
-	if (!uid_data.alpha_test_use_zcomploc_hack)
-	{
-		out.Write("\t\tdiscard;\n");
-		if (ApiType != API_D3D11)
-			out.Write("\t\treturn;\n");
-	}
-
-	out.Write("}\n");
-}
-
-static const char *tevFogFuncsTable[] =
-{
-	"",																// No Fog
-	"",																// ?
-	"",																// Linear
-	"",																// ?
-	"\tfog = 1.0f - pow(2.0f, -8.0f * fog);\n",						// exp
-	"\tfog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n",				// exp2
-	"\tfog = pow(2.0f, -8.0f * (1.0f - fog));\n",					// backward exp
-	"\tfog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	// backward exp2
-};
-
-template<class T>
-static inline void WriteFog(T& out, pixel_shader_uid_data& uid_data)
-{
-	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
-	if(bpmem.fog.c_proj_fsel.fsel == 0)
-		return; // no Fog
-
-	uid_data.fog_proj = bpmem.fog.c_proj_fsel.proj;
-
-	out.SetConstantsUsed(C_FOG, C_FOG+1);
-	if (bpmem.fog.c_proj_fsel.proj == 0)
-	{
-		// perspective
-		// ze = A/(B - (Zs >> B_SHF)
-		out.Write("\tfloat ze = " I_FOG"[1].x / (" I_FOG"[1].y - (zCoord / " I_FOG"[1].w));\n");
-	}
-	else
-	{
-		// orthographic
-		// ze = a*Zs	(here, no B_SHF)
-		out.Write("\tfloat ze = " I_FOG"[1].x * zCoord;\n");
-	}
-
-	// x_adjust = sqrt((x-center)^2 + k^2)/k
-	// ze *= x_adjust
-	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
-	uid_data.fog_RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
-	if (bpmem.fogRange.Base.Enabled)
-	{
-		out.SetConstantsUsed(C_FOG+2, C_FOG+2);
-		out.Write("\tfloat x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
-		out.Write("\tx_adjust = sqrt(x_adjust * x_adjust + " I_FOG"[2].z * " I_FOG"[2].z) / " I_FOG"[2].z;\n");
-		out.Write("\tze *= x_adjust;\n");
-	}
-
-	out.Write("\tfloat fog = clamp(ze - " I_FOG"[1].z, 0.0f, 1.0f);\n");
-
-	if (bpmem.fog.c_proj_fsel.fsel > 3)
-	{
-		out.Write("%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]);
-	}
-	else
-	{
-		if (bpmem.fog.c_proj_fsel.fsel != 2 && out.GetBuffer() != NULL)
-			WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel);
-	}
-
-	out.Write("\tprev.rgb = lerp(prev.rgb, " I_FOG"[0].rgb, fog);\n");
-}
-
-void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
-{
-	GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType, components);
-}
-
-void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
-{
-	GeneratePixelShader<PixelShaderCode>(object, dstAlphaMode, ApiType, components);
-}
-
-void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
-{
-	GeneratePixelShader<PixelShaderConstantProfile>(object, dstAlphaMode, ApiType, components);
-}
-
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
deleted file mode 100644
index 5fbf28cd69..0000000000
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef GCOGL_PIXELSHADER_H
-#define GCOGL_PIXELSHADER_H
-
-#include "VideoCommon.h"
-#include "ShaderGenCommon.h"
-#include "BPMemory.h"
-#include "LightingShaderGen.h"
-
-#define I_COLORS      "color"
-#define I_KCOLORS     "k"
-#define I_ALPHA       "alphaRef"
-#define I_TEXDIMS     "texdim"
-#define I_ZBIAS       "czbias"
-#define I_INDTEXSCALE "cindscale"
-#define I_INDTEXMTX   "cindmtx"
-#define I_FOG         "cfog"
-#define I_PLIGHTS     "cPLights"
-#define I_PMATERIALS  "cPmtrl"
-
-#define C_COLORMATRIX	0						// 0
-#define C_COLORS		0						// 0
-#define C_KCOLORS		(C_COLORS + 4)			// 4
-#define C_ALPHA			(C_KCOLORS + 4)			// 8
-#define C_TEXDIMS		(C_ALPHA + 1)			// 9
-#define C_ZBIAS			(C_TEXDIMS + 8)			//17
-#define C_INDTEXSCALE	(C_ZBIAS + 2)			//19
-#define C_INDTEXMTX		(C_INDTEXSCALE + 2)		//21
-#define C_FOG			(C_INDTEXMTX + 6)		//27
-
-#define C_PLIGHTS		(C_FOG + 3)
-#define C_PMATERIALS	(C_PLIGHTS + 40)
-#define C_PENVCONST_END (C_PMATERIALS + 4)
-
-// Different ways to achieve rendering with destination alpha
-enum DSTALPHA_MODE
-{
-	DSTALPHA_NONE, // Render normally, without destination alpha
-	DSTALPHA_ALPHA_PASS, // Render normally first, then render again for alpha
-	DSTALPHA_DUAL_SOURCE_BLEND // Use dual-source blending
-};
-
-// Annoying sure, can be removed once we get up to GLSL ~1.3
-const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
-						{I_KCOLORS, C_KCOLORS, 4 },
-						{I_ALPHA, C_ALPHA, 1 },
-						{I_TEXDIMS, C_TEXDIMS, 8 },
-						{I_ZBIAS , C_ZBIAS, 2  },
-						{I_INDTEXSCALE , C_INDTEXSCALE, 2  },
-						{I_INDTEXMTX, C_INDTEXMTX, 6 },
-						{I_FOG, C_FOG, 3 },
-						{I_PLIGHTS, C_PLIGHTS, 40 },
-						{I_PMATERIALS, C_PMATERIALS, 4 },
-						};
-
-#pragma pack(1)
-struct pixel_shader_uid_data
-{
-	// TODO: Optimize field order for easy access!
-
-	u32 num_values; // TODO: Shouldn't be a u32
-	u32 NumValues() const { return num_values; }
-
-	u32 components : 23;
-	u32 dstAlphaMode : 2;
-	u32 Pretest : 2;
-	u32 nIndirectStagesUsed : 4;
-	u32 pad0 : 1;
-
-	u32 genMode_numtexgens : 4;
-	u32 genMode_numtevstages : 4;
-	u32 genMode_numindstages : 3;
-	u32 alpha_test_comp0 : 3;
-	u32 alpha_test_comp1 : 3;
-	u32 alpha_test_logic : 2;
-	u32 alpha_test_use_zcomploc_hack : 1;
-	u32 fog_proj : 1;
-	u32 fog_fsel : 3;
-	u32 fog_RangeBaseEnabled : 1;
-	u32 ztex_op : 2;
-	u32 fast_depth_calc : 1;
-	u32 per_pixel_depth : 1;
-	u32 forced_early_z : 1;
-	u32 early_ztest : 1;
-	u32 pad1 : 1;
-
-	u32 texMtxInfo_n_projection : 8; // 8x1 bit
-	u32 tevindref_bi0 : 3;
-	u32 tevindref_bc0 : 3;
-	u32 tevindref_bi1 : 3;
-	u32 tevindref_bc1 : 3;
-	u32 tevindref_bi2 : 3;
-	u32 tevindref_bc3 : 3;
-	u32 tevindref_bi4 : 3;
-	u32 tevindref_bc4 : 3;
-
-	inline void SetTevindrefValues(int index, u32 texcoord, u32 texmap)
-	{
-		if (index == 0) { tevindref_bc0 = texcoord; tevindref_bi0 = texmap; }
-		else if (index == 1) { tevindref_bc1 = texcoord; tevindref_bi1 = texmap; }
-		else if (index == 2) { tevindref_bc3 = texcoord; tevindref_bi2 = texmap; }
-		else if (index == 3) { tevindref_bc4 = texcoord; tevindref_bi4 = texmap; }
-	}
-	inline void SetTevindrefTexmap(int index, u32 texmap)
-	{
-		if (index == 0) { tevindref_bi0 = texmap; }
-		else if (index == 1) { tevindref_bi1 = texmap; }
-		else if (index == 2) { tevindref_bi2 = texmap; }
-		else if (index == 3) { tevindref_bi4 = texmap; }
-	}
-
-	struct {
-		// TODO: Can save a lot space by removing the padding bits
-		u32 cc : 24;
-		u32 ac : 24;
-
-		u32 tevorders_texmap : 3;
-		u32 tevorders_texcoord : 3;
-		u32 tevorders_enable : 1;
-		u32 tevorders_colorchan : 3;
-		u32 pad1 : 6;
-
-		// TODO: Clean up the swapXY mess
-		u32 hasindstage : 1;
-		u32 tevind : 21;
-		u32 tevksel_swap1a : 2;
-		u32 tevksel_swap2a : 2;
-		u32 tevksel_swap1b : 2;
-		u32 tevksel_swap2b : 2;
-		u32 pad2 : 2;
-
-		u32 tevksel_swap1c : 2;
-		u32 tevksel_swap2c : 2;
-		u32 tevksel_swap1d : 2;
-		u32 tevksel_swap2d : 2;
-		u32 tevksel_kc : 5;
-		u32 tevksel_ka : 5;
-		u32 pad3 : 14;
-	} stagehash[16];
-
-	// TODO: I think we're fine without an enablePixelLighting field, should probably double check, though..
-	LightingUidData lighting;
-};
-#pragma pack()
-
-typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
-typedef ShaderCode PixelShaderCode; // TODO: Obsolete
-typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete
-
-void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
-void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
-void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
-
-#endif // GCOGL_PIXELSHADER_H
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
deleted file mode 100644
index aef4baa14c..0000000000
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-
-#include "Common.h"
-#include "Statistics.h"
-#include "PixelShaderManager.h"
-#include "VideoCommon.h"
-#include "VideoConfig.h"
-
-#include "RenderBase.h"
-static int s_nColorsChanged[2]; // 0 - regular colors, 1 - k colors
-static int s_nIndTexMtxChanged;
-static bool s_bAlphaChanged;
-static bool s_bZBiasChanged;
-static bool s_bZTextureTypeChanged;
-static bool s_bDepthRangeChanged;
-static bool s_bFogColorChanged;
-static bool s_bFogParamChanged;
-static bool s_bFogRangeAdjustChanged;
-static int nLightsChanged[2]; // min,max
-static float lastRGBAfull[2][4][4];
-static u8 s_nTexDimsChanged;
-static u8 s_nIndTexScaleChanged;
-static u32 lastAlpha;
-static u32 lastTexDims[8]; // width | height << 16 | wrap_s << 28 | wrap_t << 30
-static u32 lastZBias;
-static int nMaterialsChanged;
-
-inline void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	g_renderer->SetPSConstant4f(const_number, f1, f2, f3, f4);
-}
-
-inline void SetPSConstant4fv(unsigned int const_number, const float *f)
-{
-	g_renderer->SetPSConstant4fv(const_number, f);
-}
-
-inline void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	g_renderer->SetMultiPSConstant4fv(const_number, count, f);
-}
-
-void PixelShaderManager::Init()
-{
-	lastAlpha = 0;
-	memset(lastTexDims, 0, sizeof(lastTexDims));
-	lastZBias = 0;
-	memset(lastRGBAfull, 0, sizeof(lastRGBAfull));
-	Dirty();
-}
-
-void PixelShaderManager::Dirty()
-{
-	s_nColorsChanged[0] = s_nColorsChanged[1] = 15;
-	s_nTexDimsChanged = 0xFF;
-	s_nIndTexScaleChanged = 0xFF;
-	s_nIndTexMtxChanged = 15;
-	s_bAlphaChanged = s_bZBiasChanged = s_bZTextureTypeChanged = s_bDepthRangeChanged = true;
-	s_bFogRangeAdjustChanged = s_bFogColorChanged = s_bFogParamChanged = true;
-	nLightsChanged[0] = 0; nLightsChanged[1] = 0x80;
-	nMaterialsChanged = 15;
-}
-
-void PixelShaderManager::Shutdown()
-{
-
-}
-
-void PixelShaderManager::SetConstants(u32 components)
-{
-	if (g_ActiveConfig.backend_info.APIType == API_OPENGL && !g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		Dirty();
-
-	for (int i = 0; i < 2; ++i)
-	{
-		if (s_nColorsChanged[i])
-		{
-			int baseind = i ? C_KCOLORS : C_COLORS;
-			for (int j = 0; j < 4; ++j)
-			{
-				if ((s_nColorsChanged[i] & (1 << j)))
-				{
-					SetPSConstant4fv(baseind+j, &lastRGBAfull[i][j][0]);
-					s_nColorsChanged[i] &= ~(1<<j);
-				}
-			}
-		}
-	}
-
-    if (s_nTexDimsChanged)
-	{
-		for (int i = 0; i < 8; ++i)
-		{
-            if ((s_nTexDimsChanged & (1<<i)))
-			{
-				SetPSTextureDims(i);
-				s_nTexDimsChanged &= ~(1<<i);
-			}
-        }
-    }
-
-    if (s_bAlphaChanged)
-	{
-		SetPSConstant4f(C_ALPHA, (lastAlpha&0xff)/255.0f, ((lastAlpha>>8)&0xff)/255.0f, 0, ((lastAlpha>>16)&0xff)/255.0f);
-		s_bAlphaChanged = false;
-    }
-
-	if (s_bZTextureTypeChanged)
-	{
-		float ftemp[4];
-		switch (bpmem.ztex2.type)
-		{
-			 case 0:
-				// 8 bits
-				ftemp[0] = 0; ftemp[1] = 0; ftemp[2] = 0; ftemp[3] = 255.0f/16777215.0f;
-				break;
-			case 1:
-				// 16 bits
-				ftemp[0] = 255.0f/16777215.0f; ftemp[1] = 0; ftemp[2] = 0; ftemp[3] = 65280.0f/16777215.0f;
-				break;
-			case 2:
-				// 24 bits
-				ftemp[0] = 16711680.0f/16777215.0f; ftemp[1] = 65280.0f/16777215.0f; ftemp[2] = 255.0f/16777215.0f; ftemp[3] = 0;
-                break;
-        }
-		SetPSConstant4fv(C_ZBIAS, ftemp);
-		s_bZTextureTypeChanged = false;
-	}
-
-	if (s_bZBiasChanged || s_bDepthRangeChanged)
-	{
-		// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
-		// [0] = width/2
-		// [1] = height/2
-		// [2] = 16777215 * (farz - nearz)
-		// [3] = xorig + width/2 + 342
-		// [4] = yorig + height/2 + 342
-		// [5] = 16777215 * farz
-
-		//ERROR_LOG("pixel=%x,%x, bias=%x\n", bpmem.zcontrol.pixel_format, bpmem.ztex2.type, lastZBias);
-		SetPSConstant4f(C_ZBIAS+1, xfregs.viewport.farZ / 16777216.0f, xfregs.viewport.zRange / 16777216.0f, 0, (float)(lastZBias)/16777215.0f);
-		s_bZBiasChanged = s_bDepthRangeChanged = false;
-	}
-
-	// indirect incoming texture scales
-	if (s_nIndTexScaleChanged)
-	{
-		// set as two sets of vec4s, each containing S and T of two ind stages.
-		float f[8];
-
-        if (s_nIndTexScaleChanged & 0x03)
-		{
-			for (u32 i = 0; i < 2; ++i)
-			{
-                f[2 * i] = bpmem.texscale[0].getScaleS(i & 1);
-                f[2 * i + 1] = bpmem.texscale[0].getScaleT(i & 1);
-                PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
-            }
-			SetPSConstant4fv(C_INDTEXSCALE, f);
-        }
-
-		if (s_nIndTexScaleChanged & 0x0c)
-		{
-            for (u32 i = 2; i < 4; ++i)
-			{
-                f[2 * i] = bpmem.texscale[1].getScaleS(i & 1);
-                f[2 * i + 1] = bpmem.texscale[1].getScaleT(i & 1);
-                PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
-            }
-			SetPSConstant4fv(C_INDTEXSCALE+1, &f[4]);
-        }
-		s_nIndTexScaleChanged = 0;
-    }
-
-	if (s_nIndTexMtxChanged)
-	{
-		for (int i = 0; i < 3; ++i)
-		{
-            if (s_nIndTexMtxChanged & (1 << i))
-			{
-                int scale = ((u32)bpmem.indmtx[i].col0.s0 << 0) |
-					        ((u32)bpmem.indmtx[i].col1.s1 << 2) |
-					        ((u32)bpmem.indmtx[i].col2.s2 << 4);
-                float fscale = powf(2.0f, (float)(scale - 17)) / 1024.0f;
-
-                // xyz - static matrix
-                // TODO w - dynamic matrix scale / 256...... somehow / 4 works better
-                // rev 2972 - now using / 256.... verify that this works
-				SetPSConstant4f(C_INDTEXMTX + 2 * i,
-					bpmem.indmtx[i].col0.ma * fscale,
-					bpmem.indmtx[i].col1.mc * fscale,
-					bpmem.indmtx[i].col2.me * fscale,
-					fscale * 4.0f);
-				SetPSConstant4f(C_INDTEXMTX + 2 * i + 1,
-					bpmem.indmtx[i].col0.mb * fscale,
-					bpmem.indmtx[i].col1.md * fscale,
-					bpmem.indmtx[i].col2.mf * fscale,
-					fscale * 4.0f);
-
-                PRIM_LOG("indmtx%d: scale=%f, mat=(%f %f %f; %f %f %f)\n",
-                	i, 1024.0f*fscale,
-                	bpmem.indmtx[i].col0.ma * fscale, bpmem.indmtx[i].col1.mc * fscale, bpmem.indmtx[i].col2.me * fscale,
-                	bpmem.indmtx[i].col0.mb * fscale, bpmem.indmtx[i].col1.md * fscale, bpmem.indmtx[i].col2.mf * fscale);
-
-				s_nIndTexMtxChanged &= ~(1 << i);
-			}
-        }
-    }
-
-    if (s_bFogColorChanged)
-	{
-		SetPSConstant4f(C_FOG, bpmem.fog.color.r / 255.0f, bpmem.fog.color.g / 255.0f, bpmem.fog.color.b / 255.0f, 0);
-		s_bFogColorChanged = false;
-    }
-
-    if (s_bFogParamChanged)
-	{
-		if(!g_ActiveConfig.bDisableFog)
-		{
-			//downscale magnitude to 0.24 bits
-			float b = (float)bpmem.fog.b_magnitude / 0xFFFFFF;
-
-			float b_shf = (float)(1 << bpmem.fog.b_shift);
-			SetPSConstant4f(C_FOG + 1, bpmem.fog.a.GetA(), b, bpmem.fog.c_proj_fsel.GetC(), b_shf);
-		}
-		else
-			SetPSConstant4f(C_FOG + 1, 0.0, 1.0, 0.0, 1.0);
-
-        s_bFogParamChanged = false;
-    }
-
-	if (s_bFogRangeAdjustChanged)
-	{
-		if(!g_ActiveConfig.bDisableFog && bpmem.fogRange.Base.Enabled == 1)
-		{
-			//bpmem.fogRange.Base.Center : center of the viewport in x axis. observation: bpmem.fogRange.Base.Center = realcenter + 342;
-			int center = ((u32)bpmem.fogRange.Base.Center) - 342;
-			// normalize center to make calculations easy
-			float ScreenSpaceCenter = center / (2.0f * xfregs.viewport.wd);
-			ScreenSpaceCenter = (ScreenSpaceCenter * 2.0f) - 1.0f;
-			//bpmem.fogRange.K seems to be  a table of precalculated coefficients for the adjust factor
-			//observations: bpmem.fogRange.K[0].LO appears to be the lowest value and bpmem.fogRange.K[4].HI the largest
-			// they always seems to be larger than 256 so my theory is :
-			// they are the coefficients from the center to the border of the screen
-			// so to simplify I use the hi coefficient as K in the shader taking 256 as the scale
-			SetPSConstant4f(C_FOG + 2, ScreenSpaceCenter, (float)Renderer::EFBToScaledX((int)(2.0f * xfregs.viewport.wd)), bpmem.fogRange.K[4].HI / 256.0f,0.0f);
-		}
-		else
-		{
-			SetPSConstant4f(C_FOG + 2, 0.0f, 1.0f, 1.0f, 0.0f); // Need to update these values for older hardware that fails to divide by zero in shaders.
-		}
-
-		s_bFogRangeAdjustChanged = false;
-	}
-
-	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)  // config check added because the code in here was crashing for me inside SetPSConstant4f
-	{
-		if (nLightsChanged[0] >= 0)
-		{
-			// lights don't have a 1 to 1 mapping, the color component needs to be converted to 4 floats
-			int istart = nLightsChanged[0] / 0x10;
-			int iend = (nLightsChanged[1] + 15) / 0x10;
-			const float* xfmemptr = (const float*)&xfmem[0x10 * istart + XFMEM_LIGHTS];
-
-			for (int i = istart; i < iend; ++i)
-			{
-				u32 color = *(const u32*)(xfmemptr + 3);
-				float NormalizationCoef = 1 / 255.0f;
-				SetPSConstant4f(C_PLIGHTS + 5 * i,
-					((color >> 24) & 0xFF) * NormalizationCoef,
-					((color >> 16) & 0xFF) * NormalizationCoef,
-					((color >> 8)  & 0xFF) * NormalizationCoef,
-					((color)       & 0xFF) * NormalizationCoef);
-				xfmemptr += 4;
-
-				for (int j = 0; j < 4; ++j, xfmemptr += 3)
-				{
-					if (j == 1 &&
-						fabs(xfmemptr[0]) < 0.00001f &&
-						fabs(xfmemptr[1]) < 0.00001f &&
-						fabs(xfmemptr[2]) < 0.00001f)
-					{
-						// dist attenuation, make sure not equal to 0!!!
-						SetPSConstant4f(C_PLIGHTS+5*i+j+1, 0.00001f, xfmemptr[1], xfmemptr[2], 0);
-					}
-					else
-					{
-						SetPSConstant4fv(C_PLIGHTS+5*i+j+1, xfmemptr);
-					}
-				}
-			}
-
-			nLightsChanged[0] = nLightsChanged[1] = -1;
-		}
-
-		if (nMaterialsChanged)
-		{
-			float GC_ALIGNED16(material[4]);
-			float NormalizationCoef = 1 / 255.0f;
-
-			for (int i = 0; i < 2; ++i)
-			{
-				if (nMaterialsChanged & (1 << i))
-				{
-					u32 data = *(xfregs.ambColor + i);
-
-					material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
-					material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
-					material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
-					material[3] = ( data        & 0xFF) * NormalizationCoef;
-
-					SetPSConstant4fv(C_PMATERIALS + i, material);
-				}
-			}
-
-			for (int i = 0; i < 2; ++i)
-			{
-				if (nMaterialsChanged & (1 << (i + 2)))
-				{
-					u32 data = *(xfregs.matColor + i);
-
-					material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
-					material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
-					material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
-					material[3] = ( data        & 0xFF) * NormalizationCoef;
-
-					SetPSConstant4fv(C_PMATERIALS + i + 2, material);
-				}
-			}
-
-			nMaterialsChanged = 0;
-		}
-	}
-}
-
-void PixelShaderManager::SetPSTextureDims(int texid)
-{
-	// texdims.xy are reciprocals of the real texture dimensions
-	// texdims.zw are the scaled dimensions
-	float fdims[4];
-
-	TCoordInfo& tc = bpmem.texcoords[texid];
-	fdims[0] = 1.0f / (float)(lastTexDims[texid] & 0xffff);
-	fdims[1] = 1.0f / (float)((lastTexDims[texid] >> 16) & 0xfff);
-	fdims[2] = (float)(tc.s.scale_minus_1 + 1);
-	fdims[3] = (float)(tc.t.scale_minus_1 + 1);
-
-	PRIM_LOG("texdims%d: %f %f %f %f\n", texid, fdims[0], fdims[1], fdims[2], fdims[3]);
-	SetPSConstant4fv(C_TEXDIMS + texid, fdims);
-}
-
-// This one is high in profiles (0.5%).
-// TODO: Move conversion out, only store the raw color value
-// and update it when the shader constant is set, only.
-// TODO: Conversion should be checked in the context of tev_fixes..
-void PixelShaderManager::SetColorChanged(int type, int num, bool high)
-{
-	float *pf = &lastRGBAfull[type][num][0];
-
-	if (!high)
-	{
-		int r = bpmem.tevregs[num].low.a;
-		int a = bpmem.tevregs[num].low.b;
-		pf[0] = (float)r * (1.0f / 255.0f);
-		pf[3] = (float)a * (1.0f / 255.0f);
-	}
-	else
-	{
-		int b = bpmem.tevregs[num].high.a;
-		int g = bpmem.tevregs[num].high.b;
-		pf[1] = (float)g * (1.0f / 255.0f);
-		pf[2] = (float)b * (1.0f / 255.0f);
-	}
-
-	s_nColorsChanged[type] |= 1 << num;
-	PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, pf[0], pf[1], pf[2], pf[3]);
-}
-
-void PixelShaderManager::SetAlpha(const AlphaTest& alpha)
-{
-	if ((alpha.hex & 0xffff) != lastAlpha)
-	{
-		lastAlpha = (lastAlpha & ~0xffff) | (alpha.hex & 0xffff);
-		s_bAlphaChanged = true;
-	}
-}
-
-void PixelShaderManager::SetDestAlpha(const ConstantAlpha& alpha)
-{
-	if (alpha.alpha != (lastAlpha >> 16))
-	{
-		lastAlpha = (lastAlpha & ~0xff0000) | ((alpha.hex & 0xff) << 16);
-		s_bAlphaChanged = true;
-	}
-}
-
-void PixelShaderManager::SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt)
-{
-	u32 wh = width | (height << 16) | (wraps << 28) | (wrapt << 30);
-	if (lastTexDims[texmapid] != wh)
-	{
-		lastTexDims[texmapid] = wh;
-		s_nTexDimsChanged |= 1 << texmapid;
-	}
-}
-
-void PixelShaderManager::SetZTextureBias(u32 bias)
-{
-	if (lastZBias != bias)
-	{
-		s_bZBiasChanged = true;
-		lastZBias = bias;
-	}
-}
-
-void PixelShaderManager::SetViewportChanged()
-{
-	s_bDepthRangeChanged = true;
-	s_bFogRangeAdjustChanged = true; // TODO: Shouldn't be necessary with an accurate fog range adjust implementation
-}
-
-void PixelShaderManager::SetIndTexScaleChanged(u8 stagemask)
-{
-	s_nIndTexScaleChanged |= stagemask;
-}
-
-void PixelShaderManager::SetIndMatrixChanged(int matrixidx)
-{
-	s_nIndTexMtxChanged |= 1 << matrixidx;
-}
-
-void PixelShaderManager::SetZTextureTypeChanged()
-{
-	s_bZTextureTypeChanged = true;
-}
-
-void PixelShaderManager::SetTexCoordChanged(u8 texmapid)
-{
-	s_nTexDimsChanged |= 1 << texmapid;
-}
-
-void PixelShaderManager::SetFogColorChanged()
-{
-	s_bFogColorChanged = true;
-}
-
-void PixelShaderManager::SetFogParamChanged()
-{
-	s_bFogParamChanged = true;
-}
-
-void PixelShaderManager::SetFogRangeAdjustChanged()
-{
-	s_bFogRangeAdjustChanged = true;
-}
-
-void PixelShaderManager::SetColorMatrix(const float* pmatrix)
-{
-	SetMultiPSConstant4fv(C_COLORMATRIX,7,pmatrix);
-	s_nColorsChanged[0] = s_nColorsChanged[1] = 15;
-}
-
-void PixelShaderManager::InvalidateXFRange(int start, int end)
-{
-	if (start < XFMEM_LIGHTS_END && end > XFMEM_LIGHTS)
-	{
-		int _start = start < XFMEM_LIGHTS ? XFMEM_LIGHTS : start-XFMEM_LIGHTS;
-		int _end = end < XFMEM_LIGHTS_END ? end-XFMEM_LIGHTS : XFMEM_LIGHTS_END-XFMEM_LIGHTS;
-
-		if (nLightsChanged[0] == -1 )
-		{
-			nLightsChanged[0] = _start;
-			nLightsChanged[1] = _end;
-		}
-		else
-		{
-			if (nLightsChanged[0] > _start) nLightsChanged[0] = _start;
-			if (nLightsChanged[1] < _end)   nLightsChanged[1] = _end;
-		}
-	}
-}
-
-void PixelShaderManager::SetMaterialColorChanged(int index)
-{
-	nMaterialsChanged  |= (1 << index);
-}
-
-void PixelShaderManager::DoState(PointerWrap &p)
-{
-	p.Do(lastRGBAfull);
-	p.Do(lastAlpha);
-	p.Do(lastTexDims);
-	p.Do(lastZBias);
-
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		Dirty();
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h
deleted file mode 100644
index 7f63fb3f46..0000000000
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PIXELSHADERMANAGER_H
-#define _PIXELSHADERMANAGER_H
-
-#include "BPMemory.h"
-#include "XFMemory.h"
-#include "PixelShaderGen.h"
-
-class PointerWrap;
-
-// The non-API dependent parts.
-class PixelShaderManager
-{
-	static void SetPSTextureDims(int texid);
-public:
-	static void Init();
-	static void Dirty();
-	static void Shutdown();
-	static void DoState(PointerWrap &p);
-
-	static void SetConstants(u32 components); // sets pixel shader constants
-
-	// constant management, should be called after memory is committed
-	static void SetColorChanged(int type, int index, bool high);
-	static void SetAlpha(const AlphaTest& alpha);
-	static void SetDestAlpha(const ConstantAlpha& alpha);
-	static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt);
-	static void SetZTextureBias(u32 bias);
-	static void SetViewportChanged();
-	static void SetIndMatrixChanged(int matrixidx);
-	static void SetTevKSelChanged(int id);
-	static void SetZTextureTypeChanged();
-	static void SetIndTexScaleChanged(u8 stagemask);
-	static void SetTexCoordChanged(u8 texmapid);
-	static void SetFogColorChanged();
-	static void SetFogParamChanged();
-	static void SetFogRangeAdjustChanged();
-	static void SetColorMatrix(const float* pmatrix);
-	static void InvalidateXFRange(int start, int end);
-	static void SetMaterialColorChanged(int index);
-};
-
-
-#endif // _PIXELSHADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
deleted file mode 100644
index e4e330d6f5..0000000000
--- a/Source/Core/VideoCommon/Src/RenderBase.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// ---------------------------------------------------------------------------------------------
-// GC graphics pipeline
-// ---------------------------------------------------------------------------------------------
-// 3d commands are issued through the fifo. The gpu draws to the 2MB EFB.
-// The efb can be copied back into ram in two forms: as textures or as XFB.
-// The XFB is the region in RAM that the VI chip scans out to the television.
-// So, after all rendering to EFB is done, the image is copied into one of two XFBs in RAM.
-// Next frame, that one is scanned out and the other one gets the copy. = double buffering.
-// ---------------------------------------------------------------------------------------------
-
-
-#include "RenderBase.h"
-#include "Atomic.h"
-#include "BPMemory.h"
-#include "CommandProcessor.h"
-#include "CPMemory.h"
-#include "MainBase.h"
-#include "VideoConfig.h"
-#include "FramebufferManagerBase.h"
-#include "TextureCacheBase.h"
-#include "Fifo.h"
-#include "OpcodeDecoding.h"
-#include "Timer.h"
-#include "StringUtil.h"
-#include "Host.h"
-#include "XFMemory.h"
-#include "FifoPlayer/FifoRecorder.h"
-#include "AVIDump.h"
-#include "VertexShaderManager.h"
-
-#include <cmath>
-#include <string>
-
-// TODO: Move these out of here.
-int frameCount;
-int OSDChoice, OSDTime;
-
-Renderer *g_renderer = NULL;
-
-std::mutex Renderer::s_criticalScreenshot;
-std::string Renderer::s_sScreenshotName;
-
-volatile bool Renderer::s_bScreenshot;
-
-// The framebuffer size
-int Renderer::s_target_width;
-int Renderer::s_target_height;
-
-// TODO: Add functionality to reinit all the render targets when the window is resized.
-int Renderer::s_backbuffer_width;
-int Renderer::s_backbuffer_height;
-
-TargetRectangle Renderer::target_rc;
-
-int Renderer::s_LastEFBScale;
-
-bool Renderer::s_skipSwap;
-bool Renderer::XFBWrited;
-bool Renderer::s_EnableDLCachingAfterRecording;
-
-unsigned int Renderer::prev_efb_format = (unsigned int)-1;
-unsigned int Renderer::efb_scale_numeratorX = 1;
-unsigned int Renderer::efb_scale_numeratorY = 1;
-unsigned int Renderer::efb_scale_denominatorX = 1;
-unsigned int Renderer::efb_scale_denominatorY = 1;
-unsigned int Renderer::ssaa_multiplier = 1;
-
-
-Renderer::Renderer()
-	: frame_data()
-	, bLastFrameDumped(false)
-{
-	UpdateActiveConfig();
-	TextureCache::OnConfigChanged(g_ActiveConfig);
-
-#if defined _WIN32 || defined HAVE_LIBAV
-	bAVIDumping = false;
-#endif
-
-	OSDChoice = 0;
-	OSDTime = 0;
-}
-
-Renderer::~Renderer()
-{
-	// invalidate previous efb format
-	prev_efb_format = (unsigned int)-1;
-
-	efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = ssaa_multiplier = 1;
-
-#if defined _WIN32 || defined HAVE_LIBAV
-	if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping)
-		AVIDump::Stop();
-#else
-	if (pFrameDump.IsOpen())
-		pFrameDump.Close();
-#endif
-}
-
-void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
-{
-	CheckFifoRecording();
-
-	if (!fbWidth || !fbHeight)
-		return;
-
-	s_skipSwap = g_bSkipCurrentFrame;
-
-	VideoFifo_CheckEFBAccess();
-	VideoFifo_CheckSwapRequestAt(xfbAddr, fbWidth, fbHeight);
-	XFBWrited = true;
-
-	if (g_ActiveConfig.bUseXFB)
-	{
-		FramebufferManagerBase::CopyToXFB(xfbAddr, fbWidth, fbHeight, sourceRc,Gamma);
-	}
-	else
-	{
-		// XXX: Without the VI, how would we know what kind of field this is? So
-		// just use progressive.
-		g_renderer->Swap(xfbAddr, FIELD_PROGRESSIVE, fbWidth, fbHeight,sourceRc,Gamma);
-		Common::AtomicStoreRelease(s_swapRequested, false);
-	}
-}
-
-int Renderer::EFBToScaledX(int x)
-{
-	switch (g_ActiveConfig.iEFBScale)
-	{
-	case SCALE_AUTO: // fractional
-			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width);
-
-		default:
-			return x * (int)ssaa_multiplier * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
-	};
-}
-
-int Renderer::EFBToScaledY(int y)
-{
-	switch (g_ActiveConfig.iEFBScale)
-	{
-		case SCALE_AUTO: // fractional
-			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height);
-
-		default:
-			return y * (int)ssaa_multiplier * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
-	};
-}
-
-void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY)
-{
-	if (g_ActiveConfig.iEFBScale == SCALE_AUTO || g_ActiveConfig.iEFBScale == SCALE_AUTO_INTEGRAL)
-	{
-		scaledX = x;
-		scaledY = y;
-	}
-	else
-	{
-		scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX;
-		scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY;
-	}
-}
-
-// return true if target size changed
-bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier)
-{
-	int newEFBWidth, newEFBHeight;
-
-	// TODO: Ugly. Clean up
-	switch (s_LastEFBScale)
-	{
-		case 2: // 1x
-			efb_scale_numeratorX = efb_scale_numeratorY = 1;
-			efb_scale_denominatorX = efb_scale_denominatorY = 1;
-			break;
-
-		case 3: // 1.5x
-			efb_scale_numeratorX = efb_scale_numeratorY = 3;
-			efb_scale_denominatorX = efb_scale_denominatorY = 2;
-			break;
-
-		case 4: // 2x
-			efb_scale_numeratorX = efb_scale_numeratorY = 2;
-			efb_scale_denominatorX = efb_scale_denominatorY = 1;
-			break;
-
-		case 5: // 2.5x
-			efb_scale_numeratorX = efb_scale_numeratorY = 5;
-			efb_scale_denominatorX = efb_scale_denominatorY = 2;
-			break;
-
-		case 6: // 3x
-			efb_scale_numeratorX = efb_scale_numeratorY = 3;
-			efb_scale_denominatorX = efb_scale_denominatorY = 1;
-			break;
-
-		case 7: // 4x
-			efb_scale_numeratorX = efb_scale_numeratorY = 4;
-			efb_scale_denominatorX = efb_scale_denominatorY = 1;
-			break;
-
-		default: // fractional & integral handled later
-			break;
-	}
-
-	switch (s_LastEFBScale)
-	{
-		case 0: // fractional
-		case 1: // integral
-			newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH, framebuffer_width);
-			newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT, framebuffer_height);
-
-			if (s_LastEFBScale == 1)
-			{
-				newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH;
-				newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT;
-			}
-			efb_scale_numeratorX = newEFBWidth;
-			efb_scale_denominatorX = EFB_WIDTH;
-			efb_scale_numeratorY = newEFBHeight;
-			efb_scale_denominatorY = EFB_HEIGHT;
-			break;
-
-		default:
-			CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, newEFBWidth, newEFBHeight);
-			break;
-	}
-
-	newEFBWidth *= multiplier;
-	newEFBHeight *= multiplier;
-	ssaa_multiplier = multiplier;
-
-	if (newEFBWidth != s_target_width || newEFBHeight != s_target_height)
-	{
-		s_target_width  = newEFBWidth;
-		s_target_height = newEFBHeight;
-		VertexShaderManager::SetViewportChanged();
-		return true;
-	}
-	return false;
-}
-
-void Renderer::SetScreenshot(const char *filename)
-{
-	std::lock_guard<std::mutex> lk(s_criticalScreenshot);
-	s_sScreenshotName = filename;
-	s_bScreenshot = true;
-}
-
-// Create On-Screen-Messages
-void Renderer::DrawDebugText()
-{
-	// OSD Menu messages
-	if (OSDChoice > 0)
-	{
-		OSDTime = Common::Timer::GetTimeMs() + 3000;
-		OSDChoice = -OSDChoice;
-	}
-
-	if ((u32)OSDTime <= Common::Timer::GetTimeMs())
-		return;
-
-	const char* res_text = "";
-	switch (g_ActiveConfig.iEFBScale)
-	{
-	case SCALE_AUTO:
-		res_text = "Auto (fractional)";
-		break;
-	case SCALE_AUTO_INTEGRAL:
-		res_text = "Auto (integral)";
-		break;
-	case SCALE_1X:
-		res_text = "Native";
-		break;
-	case SCALE_1_5X:
-		res_text = "1.5x";
-		break;
-	case SCALE_2X:
-		res_text = "2x";
-		break;
-	case SCALE_2_5X:
-		res_text = "2.5x";
-		break;
-	case SCALE_3X:
-		res_text = "3x";
-		break;
-	case SCALE_4X:
-		res_text = "4x";
-		break;
-	}
-
-	const char* ar_text = "";
-	switch(g_ActiveConfig.iAspectRatio)
-	{
-	case ASPECT_AUTO:
-		ar_text = "Auto";
-		break;
-	case ASPECT_FORCE_16_9:
-		ar_text = "16:9";
-		break;
-	case ASPECT_FORCE_4_3:
-		ar_text = "4:3";
-		break;
-	case ASPECT_STRETCH:
-		ar_text = "Stretch";
-		break;
-	}
-
-	const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ?
-		(g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled";
-
-	// The rows
-	const std::string lines[] =
-	{
-		std::string("3: Internal Resolution: ") + res_text,
-		std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""),
-		std::string("5: Copy EFB: ") + efbcopy_text,
-		std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"),
-	};
-
-	enum { lines_count = sizeof(lines)/sizeof(*lines) };
-
-	std::string final_yellow, final_cyan;
-
-	// If there is more text than this we will have a collision
-	if (g_ActiveConfig.bShowFPS)
-	{
-		final_yellow = final_cyan = "\n\n";
-	}
-
-	// The latest changed setting in yellow
-	for (int i = 0; i != lines_count; ++i)
-	{
-		if (OSDChoice == -i - 1)
-			final_yellow += lines[i];
-		final_yellow += '\n';
-	}
-
-	// The other settings in cyan
-	for (int i = 0; i != lines_count; ++i)
-	{
-		if (OSDChoice != -i - 1)
-			final_cyan += lines[i];
-		final_cyan += '\n';
-	}
-
-	// Render a shadow
-	g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000);
-	g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000);
-	//and then the text
-	g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF);
-	g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00);
-}
-
-// TODO: remove
-extern bool g_aspect_wide;
-
-void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height)
-{
-	float FloatGLWidth = (float)backbuffer_width;
-	float FloatGLHeight = (float)backbuffer_height;
-	float FloatXOffset = 0;
-	float FloatYOffset = 0;
-
-	// The rendering window size
-	const float WinWidth = FloatGLWidth;
-	const float WinHeight = FloatGLHeight;
-
-	// Handle aspect ratio.
-	// Default to auto.
-	bool use16_9 = g_aspect_wide;
-
-	// Update aspect ratio hack values
-	// Won't take effect until next frame
-	// Don't know if there is a better place for this code so there isn't a 1 frame delay
-	if ( g_ActiveConfig.bWidescreenHack )
-	{
-		float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f);
-		float target_aspect;
-
-		switch ( g_ActiveConfig.iAspectRatio )
-		{
-		case ASPECT_FORCE_16_9 :
-			target_aspect = 16.0f / 9.0f;
-			break;
-		case ASPECT_FORCE_4_3 :
-			target_aspect = 4.0f / 3.0f;
-			break;
-		case ASPECT_STRETCH :
-			target_aspect = WinWidth / WinHeight;
-			break;
-		default :
-			// ASPECT_AUTO == no hacking
-			target_aspect = source_aspect;
-			break;
-		}
-
-		float adjust = source_aspect / target_aspect;
-		if ( adjust > 1 )
-		{
-			// Vert+
-			g_Config.fAspectRatioHackW = 1;
-			g_Config.fAspectRatioHackH = 1/adjust;
-		}
-		else
-		{
-			// Hor+
-			g_Config.fAspectRatioHackW = adjust;
-			g_Config.fAspectRatioHackH = 1;
-		}
-	}
-	else
-	{
-		// Hack is disabled
-		g_Config.fAspectRatioHackW = 1;
-		g_Config.fAspectRatioHackH = 1;
-	}
-
-	// Check for force-settings and override.
-	if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9)
-		use16_9 = true;
-	else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3)
-		use16_9 = false;
-
-	if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH)
-	{
-		// The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio
-		float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f));
-		// Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width.
-		if (Ratio > 1.0f)
-		{
-			// Scale down and center in the X direction.
-			FloatGLWidth /= Ratio;
-			FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f;
-		}
-		// The window is too high, we have to limit the height
-		else
-		{
-			// Scale down and center in the Y direction.
-			FloatGLHeight *= Ratio;
-			FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f;
-		}
-	}
-
-	// -----------------------------------------------------------------------
-	// Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.
-	//		Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset
-	// ------------------
-	if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop)
-	{
-		float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f)));
-		// The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted)
-		float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth;
-		float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight;
-		// The new width and height
-		FloatGLWidth = FloatGLWidth * Ratio;
-		FloatGLHeight = FloatGLHeight * Ratio;
-		// Adjust the X and Y offset
-		FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f);
-		FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f);
-	}
-
-	int XOffset = (int)(FloatXOffset + 0.5f);
-	int YOffset = (int)(FloatYOffset + 0.5f);
-	int iWhidth = (int)ceil(FloatGLWidth);
-	int iHeight = (int)ceil(FloatGLHeight);
-	iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders
-	iHeight -= iHeight % 4;
-
-	target_rc.left = XOffset;
-	target_rc.top = YOffset;
-	target_rc.right = XOffset + iWhidth;
-	target_rc.bottom = YOffset + iHeight;
-}
-
-void Renderer::SetWindowSize(int width, int height)
-{
-	if (width < 1)
-		width = 1;
-	if (height < 1)
-		height = 1;
-
-	// Scale the window size by the EFB scale.
-	CalculateTargetScale(width, height, width, height);
-
-	Host_RequestRenderWindowSize(width, height);
-}
-
-void Renderer::CheckFifoRecording()
-{
-	bool wasRecording = g_bRecordFifoData;
-	g_bRecordFifoData = FifoRecorder::GetInstance().IsRecording();
-
-	if (g_bRecordFifoData)
-	{
-		if (!wasRecording)
-		{
-			// Disable display list caching because the recorder does not handle it
-			s_EnableDLCachingAfterRecording = g_ActiveConfig.bDlistCachingEnable;
-			g_ActiveConfig.bDlistCachingEnable = false;
-
-			RecordVideoMemory();
-		}
-
-		FifoRecorder::GetInstance().EndFrame(CommandProcessor::fifo.CPBase, CommandProcessor::fifo.CPEnd);
-	}
-	else if (wasRecording)
-	{
-		g_ActiveConfig.bDlistCachingEnable = s_EnableDLCachingAfterRecording;
-	}
-}
-
-void Renderer::RecordVideoMemory()
-{
-	u32 *bpMem = (u32*)&bpmem;
-	u32 cpMem[256];
-	u32 *xfMem = (u32*)xfmem;
-	u32 *xfRegs = (u32*)&xfregs;
-
-	memset(cpMem, 0, 256 * 4);
-	FillCPMemoryArray(cpMem);
-
-	FifoRecorder::GetInstance().SetVideoMemory(bpMem, cpMem, xfMem, xfRegs, sizeof(XFRegisters) / 4);
-}
-
-void UpdateViewport(Matrix44& vpCorrection)
-{
-	if (xfregs.viewport.wd != 0 && xfregs.viewport.ht != 0)
-		g_renderer->UpdateViewport(vpCorrection);
-}
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
deleted file mode 100644
index 84849f476e..0000000000
--- a/Source/Core/VideoCommon/Src/RenderBase.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// ---------------------------------------------------------------------------------------------
-// GC graphics pipeline
-// ---------------------------------------------------------------------------------------------
-// 3d commands are issued through the fifo. The gpu draws to the 2MB EFB.
-// The efb can be copied back into ram in two forms: as textures or as XFB.
-// The XFB is the region in RAM that the VI chip scans out to the television.
-// So, after all rendering to EFB is done, the image is copied into one of two XFBs in RAM.
-// Next frame, that one is scanned out and the other one gets the copy. = double buffering.
-// ---------------------------------------------------------------------------------------------
-
-#ifndef _COMMON_RENDERBASE_H_
-#define _COMMON_RENDERBASE_H_
-
-#include "VideoCommon.h"
-#include "Thread.h"
-#include "MathUtil.h"
-#include "NativeVertexFormat.h"
-#include "FramebufferManagerBase.h"
-#include "BPMemory.h"
-
-#include <string>
-
-// TODO: Move these out of here.
-extern int frameCount;
-extern int OSDChoice;
-
-extern bool bLastFrameDumped;
-
-// Renderer really isn't a very good name for this class - it's more like "Misc".
-// The long term goal is to get rid of this class and replace it with others that make
-// more sense.
-class Renderer
-{
-public:
-	Renderer();
-	virtual ~Renderer();
-
-	enum PixelPerfQuery {
-		PP_ZCOMP_INPUT_ZCOMPLOC,
-		PP_ZCOMP_OUTPUT_ZCOMPLOC,
-		PP_ZCOMP_INPUT,
-		PP_ZCOMP_OUTPUT,
-		PP_BLEND_INPUT,
-		PP_EFB_COPY_CLOCKS
-	};
-
-	virtual void SetColorMask() = 0;
-	virtual void SetBlendMode(bool forceUpdate) = 0;
-	virtual void SetScissorRect(const TargetRectangle& rc) = 0;
-	virtual void SetGenerationMode() = 0;
-	virtual void SetDepthMode() = 0;
-	virtual void SetLogicOpMode() = 0;
-	virtual void SetDitherMode() = 0;
-	virtual void SetLineWidth() = 0;
-	virtual void SetSamplerState(int stage,int texindex) = 0;
-	virtual void SetInterlacingMode() = 0;
-
-	virtual void ApplyState(bool bUseDstAlpha) = 0;
-	virtual void RestoreState() = 0;
-
-	// Ideal internal resolution - determined by display resolution (automatic scaling) and/or a multiple of the native EFB resolution
-	static int GetTargetWidth() { return s_target_width; }
-	static int GetTargetHeight() { return s_target_height; }
-
-	// Display resolution
-	static int GetBackbufferWidth() { return s_backbuffer_width; }
-	static int GetBackbufferHeight() { return s_backbuffer_height; }
-
-	static void SetWindowSize(int width, int height);
-
-	// EFB coordinate conversion functions
-
-	// Use this to convert a whole native EFB rect to backbuffer coordinates
-	virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0;
-
-	static const TargetRectangle& GetTargetRectangle() { return target_rc; }
-	static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height);
-
-
-	// Use this to upscale native EFB coordinates to IDEAL internal resolution
-	static int EFBToScaledX(int x);
-	static int EFBToScaledY(int y);
-
-	// Floating point versions of the above - only use them if really necessary
-	static float EFBToScaledXf(float x) { return x * ((float)GetTargetWidth() / (float)EFB_WIDTH); }
-	static float EFBToScaledYf(float y) { return y * ((float)GetTargetHeight() / (float)EFB_HEIGHT); }
-
-	// Random utilities
-	static void SetScreenshot(const char *filename);
-	static void DrawDebugText();
-
-	virtual void RenderText(const char* pstr, int left, int top, u32 color) = 0;
-
-	virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) = 0;
-	virtual void ReinterpretPixelData(unsigned int convtype) = 0;
-	static void RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma = 1.0f);
-
-	virtual u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) = 0;
-
-	// What's the real difference between these? Too similar names.
-	virtual void ResetAPIState() = 0;
-	virtual void RestoreAPIState() = 0;
-
-	// Finish up the current frame, print some stats
-	virtual void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma = 1.0f) = 0;
-
-	virtual void UpdateViewport(Matrix44& vpCorrection) = 0;
-
-	virtual bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) = 0;
-
-	static unsigned int GetPrevPixelFormat() { return prev_efb_format; }
-	static void StorePixelFormat(unsigned int new_format) { prev_efb_format = new_format; }
-
-	// TODO: doesn't belong here
-	virtual void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) = 0;
-	virtual void SetPSConstant4fv(unsigned int const_number, const float *f) = 0;
-	virtual void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f) = 0;
-
-	// TODO: doesn't belong here
-	virtual void SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) = 0;
-	virtual void SetVSConstant4fv(unsigned int const_number, const float *f) = 0;
-	virtual void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f) = 0;
-	virtual void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f) = 0;
-
-protected:
-
-	static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY);
-	static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1);
-
-	static void CheckFifoRecording();
-	static void RecordVideoMemory();
-
-	static volatile bool s_bScreenshot;
-	static std::mutex s_criticalScreenshot;
-	static std::string s_sScreenshotName;
-
-#if defined _WIN32 || defined HAVE_LIBAV
-	bool bAVIDumping;
-#else
-	File::IOFile pFrameDump;
-#endif
-	std::vector<u8> frame_data;
-	bool bLastFrameDumped;
-
-	// The framebuffer size
-	static int s_target_width;
-	static int s_target_height;
-
-	// TODO: Add functionality to reinit all the render targets when the window is resized.
-	static int s_backbuffer_width;
-	static int s_backbuffer_height;
-
-	static TargetRectangle target_rc;
-
-	// can probably eliminate this static var
-	static int s_LastEFBScale;
-
-	static bool s_skipSwap;
-	static bool XFBWrited;
-
-	static bool s_EnableDLCachingAfterRecording;
-
-private:
-	static unsigned int prev_efb_format;
-	static unsigned int efb_scale_numeratorX;
-	static unsigned int efb_scale_numeratorY;
-	static unsigned int efb_scale_denominatorX;
-	static unsigned int efb_scale_denominatorY;
-	static unsigned int ssaa_multiplier;
-};
-
-extern Renderer *g_renderer;
-
-void UpdateViewport(Matrix44& vpCorrection);
-
-#endif // _COMMON_RENDERBASE_H_
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
deleted file mode 100644
index 31ec8d3e71..0000000000
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _SHADERGENCOMMON_H
-#define _SHADERGENCOMMON_H
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include "CommonTypes.h"
-#include "VideoCommon.h"
-
-/**
- * Common interface for classes that need to go through the shader generation path (GenerateVertexShader, GeneratePixelShader)
- * In particular, this includes the shader code generator (ShaderCode).
- * A different class (ShaderUid) can be used to uniquely identify each ShaderCode object.
- * More interesting things can be done with this, e.g. ShaderConstantProfile checks what shader constants are being used. This can be used to optimize buffer management.
- * Each of the ShaderCode, ShaderUid and ShaderConstantProfile child classes only implement the subset of ShaderGeneratorInterface methods that are required for the specific tasks.
- */
-class ShaderGeneratorInterface
-{
-public:
-	/*
-	 * Used when the shader generator would write a piece of ShaderCode.
-	 * Can be used like printf.
-	 * @note In the ShaderCode implementation, this does indeed write the parameter string to an internal buffer. However, you're free to do whatever you like with the parameter.
-	 */
-	void Write(const char* fmt, ...) {}
-
-	/*
-	 * Returns a read pointer to the internal buffer.
-	 * @note When implementing this method in a child class, you likely want to return the argument of the last SetBuffer call here
-	 * @note SetBuffer() should be called before using GetBuffer().
-	 */
-	const char* GetBuffer() { return NULL; }
-
-	/*
-	 * Can be used to give the object a place to write to. This should be called before using Write().
-	 * @param buffer pointer to a char buffer that the object can write to
-	 */
-	void SetBuffer(char* buffer) { }
-
-	/*
-	 * Tells us that a specific constant range (including last_index) is being used by the shader
-	 */
-	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
-
-	/*
-	 * Returns a pointer to an internally stored object of the uid_data type.
-	 * @warning since most child classes use the default implementation you shouldn't access this directly without adding precautions against NULL access (e.g. via adding a dummy structure, cf. the vertex/pixel shader generators)
-	 */
-	template<class uid_data>
-	uid_data& GetUidData() { return *(uid_data*)NULL; }
-};
-
-/**
- * Shader UID class used to uniquely identify the ShaderCode output written in the shader generator.
- * uid_data can be any struct of parameters that uniquely identify each shader code output.
- * Unless performance is not an issue, uid_data should be tightly packed to reduce memory footprint.
- * Shader generators will write to specific uid_data fields; ShaderUid methods will only read raw u32 values from a union.
- */
-template<class uid_data>
-class ShaderUid : public ShaderGeneratorInterface
-{
-public:
-	ShaderUid()
-	{
-		// TODO: Move to Shadergen => can be optimized out
-		memset(values, 0, sizeof(values));
-	}
-
-	bool operator == (const ShaderUid& obj) const
-	{
-		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) == 0;
-	}
-
-	bool operator != (const ShaderUid& obj) const
-	{
-		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) != 0;
-	}
-
-	// determines the storage order inside STL containers
-	bool operator < (const ShaderUid& obj) const
-	{
-		return memcmp(this->values, obj.values, data.NumValues() * sizeof(*values)) < 0;
-	}
-
-	template<class T>
-	inline T& GetUidData() { return data; }
-
-	const uid_data& GetUidData() const { return data; }
-	size_t GetUidDataSize() const { return sizeof(values); }
-
-private:
-	union
-	{
-		uid_data data;
-		u8 values[sizeof(uid_data)];
-	};
-};
-
-class ShaderCode : public ShaderGeneratorInterface
-{
-public:
-	ShaderCode() : buf(NULL), write_ptr(NULL)
-	{
-
-	}
-
-	void Write(const char* fmt, ...)
-	{
-		va_list arglist;
-		va_start(arglist, fmt);
-		write_ptr += vsprintf(write_ptr, fmt, arglist);
-		va_end(arglist);
-	}
-
-	const char* GetBuffer() { return buf; }
-	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
-
-private:
-	const char* buf;
-	char* write_ptr;
-};
-
-/**
- * Generates a shader constant profile which can be used to query which constants are used in a shader
- */
-class ShaderConstantProfile : public ShaderGeneratorInterface
-{
-public:
-	ShaderConstantProfile(int num_constants) { constant_usage.resize(num_constants); }
-
-	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index)
-	{
-		for (unsigned int i = first_index; i < last_index+1; ++i)
-			constant_usage[i] = true;
-	}
-
-	inline bool ConstantIsUsed(unsigned int index)
-	{
-		// TODO: Not ready for usage yet
-		return true;
-//		return constant_usage[index];
-	}
-private:
-	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
-};
-
-template<class T>
-static inline void WriteRegister(T& object, API_TYPE ApiType, const char *prefix, const u32 num)
-{
-	if (ApiType == API_OPENGL)
-		return; // Nothing to do here
-
-	object.Write(" : register(%s%d)", prefix, num);
-}
-
-template<class T>
-static inline void WriteLocation(T& object, API_TYPE ApiType, bool using_ubos)
-{
-	if (using_ubos)
-		return;
-
-	object.Write("uniform ");
-}
-
-template<class T>
-static inline void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const u32 num, const char* type, const char* name)
-{
-	WriteLocation(object, api_type, using_ubos);
-	object.Write("%s %s ", type, name);
-	WriteRegister(object, api_type, "c", num);
-	object.Write(";\n");
-}
-
-/**
- * Checks if there has been
- */
-template<class UidT, class CodeT>
-class UidChecker
-{
-public:
-	void Invalidate()
-	{
-		m_shaders.clear();
-		m_uids.clear();
-	}
-
-	void AddToIndexAndCheck(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
-	{
-		bool uid_is_indexed = std::find(m_uids.begin(), m_uids.end(), new_uid) != m_uids.end();
-		if (!uid_is_indexed)
-		{
-			m_uids.push_back(new_uid);
-			m_shaders[new_uid] = new_code.GetBuffer();
-		}
-		else
-		{
-			// uid is already in the index => check if there's a shader with the same uid but different code
-			auto& old_code = m_shaders[new_uid];
-			if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
-			{
-				static int num_failures = 0;
-
-				char szTemp[MAX_PATH];
-				sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
-						dump_prefix,
-						++num_failures);
-
-				// TODO: Should also dump uids
-				std::ofstream file;
-				OpenFStream(file, szTemp, std::ios_base::out);
-				file << "Old shader code:\n" << old_code;
-				file << "\n\nNew shader code:\n" << new_code.GetBuffer();
-				file << "\n\nShader uid:\n";
-				for (unsigned int i = 0; i < new_uid.GetUidDataSize(); ++i)
-				{
-					u32 value = ((u32*)&new_uid.GetUidData())[i];
-					if ((i % 4) == 0)
-					{
-						unsigned int last_value = (i+3 < new_uid.GetUidDataSize()-1) ? i+3 : new_uid.GetUidDataSize();
-						file << std::setfill(' ') << std::dec;
-						file << "Values " << std::setw(2) << i << " - " << last_value << ": ";
-					}
-
-					file << std::setw(8) << std::setfill('0') << std::hex << value << std::setw(1);
-					if ((i % 4) < 3)
-						file << ' ';
-					else
-						file << std::endl;
-				}
-				file.close();
-
-				ERROR_LOG(VIDEO, "%s shader uid mismatch! See %s for details", shader_type, szTemp);
-			}
-		}
-	}
-	
-private:
-	std::map<UidT,std::string> m_shaders;
-	std::vector<UidT> m_uids;
-};
-
-#endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp
deleted file mode 100644
index 0c69499355..0000000000
--- a/Source/Core/VideoCommon/Src/Statistics.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string.h>
-
-#include "Statistics.h"
-#include "VertexLoaderManager.h"
-
-Statistics stats;
-
-template <class T>
-void Xchg(T& a, T&b)
-{
-	T c = a;
-	a = b;
-	b = c;
-}
-
-void Statistics::ResetFrame()
-{
-	memset(&thisFrame, 0, sizeof(ThisFrame));
-}
-
-void Statistics::SwapDL()
-{
-	Xchg(stats.thisFrame.numDLPrims, stats.thisFrame.numPrims);
-	Xchg(stats.thisFrame.numXFLoadsInDL, stats.thisFrame.numXFLoads);
-	Xchg(stats.thisFrame.numCPLoadsInDL, stats.thisFrame.numCPLoads);
-	Xchg(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
-}
-
-char *Statistics::ToString(char *ptr)
-{
-	char *p = ptr;
-	ptr+=sprintf(ptr,"Textures created: %i\n",stats.numTexturesCreated);
-	ptr+=sprintf(ptr,"Textures alive: %i\n",stats.numTexturesAlive);
-	ptr+=sprintf(ptr,"pshaders created: %i\n",stats.numPixelShadersCreated);
-	ptr+=sprintf(ptr,"pshaders alive: %i\n",stats.numPixelShadersAlive);
-	ptr+=sprintf(ptr,"pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders);
-	ptr+=sprintf(ptr,"vshaders created: %i\n",stats.numVertexShadersCreated);
-	ptr+=sprintf(ptr,"vshaders alive: %i\n",stats.numVertexShadersAlive);
-	ptr+=sprintf(ptr,"dlists called:    %i\n",stats.numDListsCalled);
-	ptr+=sprintf(ptr,"dlists called(f): %i\n",stats.thisFrame.numDListsCalled);
-	ptr+=sprintf(ptr,"dlists alive:     %i\n",stats.numDListsAlive);
-	ptr+=sprintf(ptr,"Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins);
-	ptr+=sprintf(ptr,"Draw calls:       %i\n",stats.thisFrame.numDrawCalls);
-	ptr+=sprintf(ptr,"Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls);
-	ptr+=sprintf(ptr,"Buffer splits:    %i\n",stats.thisFrame.numBufferSplits);
-	ptr+=sprintf(ptr,"Primitives: %i\n",stats.thisFrame.numPrims);
-	ptr+=sprintf(ptr,"Primitives (DL): %i\n",stats.thisFrame.numDLPrims);
-	ptr+=sprintf(ptr,"XF loads: %i\n",stats.thisFrame.numXFLoads);
-	ptr+=sprintf(ptr,"XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL);
-	ptr+=sprintf(ptr,"CP loads: %i\n",stats.thisFrame.numCPLoads);
-	ptr+=sprintf(ptr,"CP loads (DL): %i\n",stats.thisFrame.numCPLoadsInDL);
-	ptr+=sprintf(ptr,"BP loads: %i\n",stats.thisFrame.numBPLoads);
-	ptr+=sprintf(ptr,"BP loads (DL): %i\n",stats.thisFrame.numBPLoadsInDL);
-	ptr+=sprintf(ptr,"Vertex streamed: %i kB\n",stats.thisFrame.bytesVertexStreamed/1024);
-	ptr+=sprintf(ptr,"Index streamed: %i kB\n",stats.thisFrame.bytesIndexStreamed/1024);
-	ptr+=sprintf(ptr,"Uniform streamed: %i kB\n",stats.thisFrame.bytesUniformStreamed/1024);
-	ptr+=sprintf(ptr,"Vertex Loaders: %i\n",stats.numVertexLoaders);
-
-	std::string text1;
-	VertexLoaderManager::AppendListToString(&text1);
-
-	// TODO : at some point text1 just becomes too huge and overflows, we can't even read the added stuff
-	// since it gets added at the far bottom of the screen anyway (actually outside the rendering window)
-	// we should really reset the list instead of using substr
-	if (text1.size() + ptr - p > 8170)
-		text1 = text1.substr(0, 8170 - (ptr - p));
-
-	ptr+=sprintf(ptr,"%s",text1.c_str());
-
-	return ptr;
-}
-
-// Is this really needed?
-char *Statistics::ToStringProj(char *ptr)
-{
-	char *p = ptr;
-	p+=sprintf(p,"Projection #: X for Raw 6=0 (X for Raw 6!=0)\n\n");
-	p+=sprintf(p,"Projection 0: %f (%f) Raw 0: %f\n", stats.gproj_0, stats.g2proj_0, stats.proj_0);
-	p+=sprintf(p,"Projection 1: %f (%f)\n", stats.gproj_1, stats.g2proj_1);
-	p+=sprintf(p,"Projection 2: %f (%f) Raw 1: %f\n", stats.gproj_2, stats.g2proj_2, stats.proj_1);
-	p+=sprintf(p,"Projection 3: %f (%f)\n\n", stats.gproj_3, stats.g2proj_3);
-	p+=sprintf(p,"Projection 4: %f (%f)\n", stats.gproj_4, stats.g2proj_4);
-	p+=sprintf(p,"Projection 5: %f (%f) Raw 2: %f\n", stats.gproj_5, stats.g2proj_5, stats.proj_2);
-	p+=sprintf(p,"Projection 6: %f (%f) Raw 3: %f\n", stats.gproj_6, stats.g2proj_6, stats.proj_3);
-	p+=sprintf(p,"Projection 7: %f (%f)\n\n", stats.gproj_7, stats.g2proj_7);
-	p+=sprintf(p,"Projection 8: %f (%f)\n", stats.gproj_8, stats.g2proj_8);
-	p+=sprintf(p,"Projection 9: %f (%f)\n", stats.gproj_9, stats.g2proj_9);
-	p+=sprintf(p,"Projection 10: %f (%f) Raw 4: %f\n\n", stats.gproj_10, stats.g2proj_10, stats.proj_4);
-	p+=sprintf(p,"Projection 11: %f (%f) Raw 5: %f\n\n", stats.gproj_11, stats.g2proj_11, stats.proj_5);
-	p+=sprintf(p,"Projection 12: %f (%f)\n", stats.gproj_12, stats.g2proj_12);
-	p+=sprintf(p,"Projection 13: %f (%f)\n", stats.gproj_13, stats.g2proj_13);
-	p+=sprintf(p,"Projection 14: %f (%f)\n", stats.gproj_14, stats.g2proj_14);
-	p+=sprintf(p,"Projection 15: %f (%f)\n", stats.gproj_15, stats.g2proj_15);
-	return p;
-}
diff --git a/Source/Core/VideoCommon/Src/Statistics.h b/Source/Core/VideoCommon/Src/Statistics.h
deleted file mode 100644
index a7976651a5..0000000000
--- a/Source/Core/VideoCommon/Src/Statistics.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "CommonTypes.h"
-#include "VideoCommon.h"
-#include <vector>
-
-#ifndef _STATISTICS_H
-#define _STATISTICS_H
-
-struct Statistics
-{
-	int numPixelShadersCreated;
-	int numPixelShadersAlive;
-	int numVertexShadersCreated;
-	int numVertexShadersAlive;
-
-	int numTexturesCreated;
-	int numTexturesAlive;
-
-	int numRenderTargetsCreated;
-	int numRenderTargetsAlive;
-	
-	int numDListsCalled;
-	int numDListsCreated;
-	int numDListsAlive;
-
-	int numVertexLoaders;
-
-	int numUniquePixelShaders;
-
-	float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5;
-	float gproj_0, gproj_1, gproj_2, gproj_3, gproj_4, gproj_5;
-	float gproj_6, gproj_7, gproj_8, gproj_9, gproj_10, gproj_11, gproj_12, gproj_13, gproj_14, gproj_15;
-
-	float g2proj_0, g2proj_1, g2proj_2, g2proj_3, g2proj_4, g2proj_5;
-	float g2proj_6, g2proj_7, g2proj_8, g2proj_9, g2proj_10, g2proj_11, g2proj_12, g2proj_13, g2proj_14, g2proj_15;
-
-	std::vector<EFBRectangle> efb_regions;
-
-	struct ThisFrame
-	{
-		int numBPLoads;
-		int numCPLoads;
-		int numXFLoads;
-		
-		int numBPLoadsInDL;
-		int numCPLoadsInDL;
-		int numXFLoadsInDL;
-		
-		int numDLs;
-		int numPrims;
-		int numDLPrims;
-		int numShaderChanges;
-
-		int numPrimitiveJoins;
-		int numDrawCalls;
-		int numIndexedDrawCalls;
-		int numBufferSplits;
-
-		int numDListsCalled;
-		
-		int bytesVertexStreamed;
-		int bytesIndexStreamed;
-		int bytesUniformStreamed;
-	};
-	ThisFrame thisFrame;
-	void ResetFrame();
-	static void SwapDL();
-
-	// Yeah, this is unsafe, but we really don't wanna faff around allocating
-	// buffers here.
-	static char *ToString(char *ptr);
-	static char *ToStringProj(char *ptr);
-};
-
-extern Statistics stats;
-
-#define STATISTICS
-
-#ifdef STATISTICS
-#define INCSTAT(a) (a)++;
-#define DECSTAT(a) (a)--;
-#define ADDSTAT(a,b) (a)+=(b);
-#define SETSTAT(a,x) (a)=(int)(x);
-#define SETSTAT_UINT(a,x) (a)=(u32)(x);
-#define SETSTAT_FT(a,x) (a)=(float)(x);
-#else
-#define INCSTAT(a) ;
-#define ADDSTAT(a,b) ;
-#define SETSTAT(a,x) ;
-#endif
-
-#endif  // _STATISTICS_H
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
deleted file mode 100644
index 7d5b9354ad..0000000000
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
+++ /dev/null
@@ -1,845 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "MemoryUtil.h"
-
-#include "VideoConfig.h"
-#include "Statistics.h"
-#include "HiresTextures.h"
-#include "RenderBase.h"
-#include "FileUtil.h"
-
-#include "TextureCacheBase.h"
-#include "Debugger.h"
-#include "ConfigManager.h"
-#include "HW/Memmap.h"
-
-// ugly
-extern int frameCount;
-
-enum
-{
-	TEXTURE_KILL_THRESHOLD = 200,
-};
-
-TextureCache *g_texture_cache;
-
-GC_ALIGNED16(u8 *TextureCache::temp) = NULL;
-unsigned int TextureCache::temp_size;
-
-TextureCache::TexCache TextureCache::textures;
-
-TextureCache::BackupConfig TextureCache::backup_config;
-
-bool invalidate_texture_cache_requested;
-
-TextureCache::TCacheEntryBase::~TCacheEntryBase()
-{
-}
-
-TextureCache::TextureCache()
-{
-	temp_size = 2048 * 2048 * 4;
-	if (!temp)
-		temp = (u8*)AllocateAlignedMemory(temp_size, 16);
-
-	TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
-
-	if(g_ActiveConfig.bHiresTextures && !g_ActiveConfig.bDumpTextures)
-		HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-
-	SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures);
-
-	invalidate_texture_cache_requested = false;
-}
-
-void TextureCache::RequestInvalidateTextureCache()
-{
-	invalidate_texture_cache_requested = true;
-}
-
-void TextureCache::Invalidate()
-{
-	TexCache::iterator
-		iter = textures.begin(),
-		tcend = textures.end();
-	for (; iter != tcend; ++iter)
-		delete iter->second;
-
-	textures.clear();
-}
-
-TextureCache::~TextureCache()
-{
-	Invalidate();
-	if (temp)
-	{
-		FreeAlignedMemory(temp);
-		temp = NULL;
-	}
-}
-
-void TextureCache::OnConfigChanged(VideoConfig& config)
-{
-	if (g_texture_cache)
-	{
-		// TODO: Invalidating texcache is really stupid in some of these cases
-		if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples ||
-			config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay ||
-			config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center ||
-			config.bHiresTextures != backup_config.s_hires_textures ||
-			invalidate_texture_cache_requested)
-		{
-			g_texture_cache->Invalidate();
-
-			if(g_ActiveConfig.bHiresTextures)
-				HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-
-			SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures);
-			TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
-
-			invalidate_texture_cache_requested = false;
-		}
-
-		// TODO: Probably shouldn't clear all render targets here, just mark them dirty or something.
-		if (config.bEFBCopyCacheEnable != backup_config.s_copy_cache_enable || // TODO: not sure if this is needed?
-			config.bCopyEFBToTexture != backup_config.s_copy_efb_to_texture ||
-			config.bCopyEFBScaled != backup_config.s_copy_efb_scaled ||
-			config.bEFBCopyEnable != backup_config.s_copy_efb ||
-			config.iEFBScale != backup_config.s_efb_scale)
-		{
-			g_texture_cache->ClearRenderTargets();
-		}
-	}
-	
-	backup_config.s_colorsamples = config.iSafeTextureCache_ColorSamples;
-	backup_config.s_copy_efb_to_texture = config.bCopyEFBToTexture;
-	backup_config.s_copy_efb_scaled = config.bCopyEFBScaled;
-	backup_config.s_copy_efb = config.bEFBCopyEnable;
-	backup_config.s_efb_scale = config.iEFBScale;
-	backup_config.s_texfmt_overlay = config.bTexFmtOverlayEnable;
-	backup_config.s_texfmt_overlay_center = config.bTexFmtOverlayCenter;
-	backup_config.s_hires_textures = config.bHiresTextures;
-	backup_config.s_copy_cache_enable = config.bEFBCopyCacheEnable;
-}
-
-void TextureCache::Cleanup()
-{
-	TexCache::iterator iter = textures.begin();
-	TexCache::iterator tcend = textures.end();
-	while (iter != tcend)
-	{
-		if (	frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount
-			
-			// EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted
-			&& ! iter->second->IsEfbCopy() )
-		{
-			delete iter->second;
-			textures.erase(iter++);
-		}
-		else
-		{
-			++iter;
-		}
-	}
-}
-
-void TextureCache::InvalidateRange(u32 start_address, u32 size)
-{
-	TexCache::iterator
-		iter = textures.begin(),
-		tcend = textures.end();
-	while (iter != tcend)
-	{
-		const int rangePosition = iter->second->IntersectsMemoryRange(start_address, size);
-		if (0 == rangePosition)
-		{
-			delete iter->second;
-			textures.erase(iter++);
-		}
-		else
-		{
-			++iter;
-		}
-	}
-}
-
-void TextureCache::MakeRangeDynamic(u32 start_address, u32 size)
-{
-	TexCache::iterator
-		iter = textures.lower_bound(start_address),
-		tcend = textures.upper_bound(start_address + size);
-
-	if (iter != textures.begin())
-		iter--;
-
-	for (; iter != tcend; ++iter)
-	{
-		const int rangePosition = iter->second->IntersectsMemoryRange(start_address, size);
-		if (0 == rangePosition)
-		{
-			iter->second->SetHashes(TEXHASH_INVALID);
-		}
-	}
-}
-
-bool TextureCache::Find(u32 start_address, u64 hash)
-{
-	TexCache::iterator iter = textures.lower_bound(start_address);
-
-	if (iter->second->hash == hash)
-		return true;
-
-	return false;
-}
-
-int TextureCache::TCacheEntryBase::IntersectsMemoryRange(u32 range_address, u32 range_size) const
-{
-	if (addr + size_in_bytes < range_address)
-		return -1;
-
-	if (addr >= range_address + range_size)
-		return 1;
-
-	return 0;
-}
-
-void TextureCache::ClearRenderTargets()
-{
-	TexCache::iterator
-		iter = textures.begin(),
-		tcend = textures.end();
-
-	while (iter != tcend)
-	{
-		if (iter->second->type == TCET_EC_VRAM)
-		{
-			delete iter->second;
-			textures.erase(iter++);
-		}
-		else
-		{
-			++iter;
-		}
-	}
-}
-
-bool TextureCache::CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels)
-{
-	if (levels == 1)
-		return false;
-
-	// Just checking if the necessary files exist, if they can't be loaded or have incorrect dimensions LODs will be black
-	char texBasePathTemp[MAX_PATH];
-	char texPathTemp[MAX_PATH];
-
-	sprintf(texBasePathTemp, "%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32) (tex_hash & 0x00000000FFFFFFFFLL), texformat);
-
-	for (unsigned int level = 1; level < levels; ++level)
-	{
-		sprintf(texPathTemp, "%s_mip%i", texBasePathTemp, level);
-		if (!HiresTextures::HiresTexExists(texPathTemp))
-		{
-			if (level > 1)
-				WARN_LOG(VIDEO, "Couldn't find custom texture LOD with index %i (filename: %s), disabling custom LODs for this texture", level, texPathTemp);
-
-			return false;
-		}
-	}
-	return true;
-}
-
-PC_TexFormat TextureCache::LoadCustomTexture(u64 tex_hash, int texformat, unsigned int level, unsigned int& width, unsigned int& height)
-{
-	char texPathTemp[MAX_PATH];
-	unsigned int newWidth = 0;
-	unsigned int newHeight = 0;
-
-	if (level == 0)
-		sprintf(texPathTemp, "%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32) (tex_hash & 0x00000000FFFFFFFFLL), texformat);
-	else
-		sprintf(texPathTemp, "%s_%08x_%i_mip%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32) (tex_hash & 0x00000000FFFFFFFFLL), texformat, level);
-
-	unsigned int required_size = 0;
-	PC_TexFormat ret = HiresTextures::GetHiresTex(texPathTemp, &newWidth, &newHeight, &required_size, texformat, temp_size, temp);
-	if (ret == PC_TEX_FMT_NONE && temp_size < required_size)
-	{
-		// Allocate more memory and try again
-		// TODO: Should probably check if newWidth and newHeight are texture dimensions which are actually supported by the current video backend
-		temp_size = required_size;
-		FreeAlignedMemory(temp);
-		temp = (u8*)AllocateAlignedMemory(temp_size, 16);
-		ret = HiresTextures::GetHiresTex(texPathTemp, &newWidth, &newHeight, &required_size, texformat, temp_size, temp);
-	}
-
-	if (ret != PC_TEX_FMT_NONE)
-	{
-		width = newWidth;
-		height = newHeight;
-	}
-	return ret;
-}
-
-void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level)
-{
-	char szTemp[MAX_PATH];
-	std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) +
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
-
-	// make sure that the directory exists
-	if (false == File::Exists(szDir) || false == File::IsDirectory(szDir))
-		File::CreateDir(szDir.c_str());
-
-	// For compatibility with old texture packs, don't print the LOD index for level 0.
-	 // TODO: TLUT format should actually be stored in filename? :/
-	if (level == 0)
-	{
-		sprintf(szTemp, "%s/%s_%08x_%i.png", szDir.c_str(),
-				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(),
-				(u32) (entry->hash & 0x00000000FFFFFFFFLL), entry->format & 0xFFFF);
-	}
-	else
-	{
-		sprintf(szTemp, "%s/%s_%08x_%i_mip%i.png", szDir.c_str(),
-				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(),
-				(u32) (entry->hash & 0x00000000FFFFFFFFLL), entry->format & 0xFFFF, level);
-	}
-
-	if (false == File::Exists(szTemp))
-		entry->Save(szTemp, level);
-}
-
-static u32 CalculateLevelSize(u32 level_0_size, u32 level)
-{
-	return (level_0_size + ((1 << level) - 1)) >> level;
-}
-
-// Used by TextureCache::Load
-static TextureCache::TCacheEntryBase* ReturnEntry(unsigned int stage, TextureCache::TCacheEntryBase* entry)
-{
-	entry->frameCount = frameCount;
-	entry->Bind(stage);
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true);
-
-	return entry;
-}
-
-TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
-	u32 const address, unsigned int width, unsigned int height, int const texformat,
-	unsigned int const tlutaddr, int const tlutfmt, bool const use_mipmaps, unsigned int maxlevel, bool const from_tmem)
-{
-	if (0 == address)
-		return NULL;
-
-	// TexelSizeInNibbles(format) * width * height / 16;
-	const unsigned int bsw = TexDecoder_GetBlockWidthInTexels(texformat) - 1;
-	const unsigned int bsh = TexDecoder_GetBlockHeightInTexels(texformat) - 1;
-
-	unsigned int expandedWidth  = (width  + bsw) & (~bsw);
-	unsigned int expandedHeight = (height + bsh) & (~bsh);
-	const unsigned int nativeW = width;
-	const unsigned int nativeH = height;
-
-	u32 texID = address;
-	// Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup)
-	u64 tex_hash = TEXHASH_INVALID;
-	u64 tlut_hash = TEXHASH_INVALID;
-
-	u32 full_format = texformat;
-	PC_TexFormat pcfmt = PC_TEX_FMT_NONE;
-
-	const bool isPaletteTexture = (texformat == GX_TF_C4 || texformat == GX_TF_C8 || texformat == GX_TF_C14X2);
-	if (isPaletteTexture)
-		full_format = texformat | (tlutfmt << 16);
-
-	const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat);
-
-	const u8* src_data;
-	if (from_tmem)
-		src_data = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE];
-	else
-		src_data = Memory::GetPointer(address);
-
-	// TODO: This doesn't hash GB tiles for preloaded RGBA8 textures (instead, it's hashing more data from the low tmem bank than it should)
-	tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
-	if (isPaletteTexture)
-	{
-		const u32 palette_size = TexDecoder_GetPaletteSize(texformat);
-		tlut_hash = GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
-
-		// NOTE: For non-paletted textures, texID is equal to the texture address.
-		//		A paletted texture, however, may have multiple texIDs assigned though depending on the currently used tlut.
-		//		This (changing texID depending on the tlut_hash) is a trick to get around
-		//		an issue with Metroid Prime's fonts (it has multiple sets of fonts on each other
-		//		stored in a single texture and uses the palette to make different characters
-		//		visible or invisible. Thus, unless we want to recreate the textures for every drawn character,
-		//		we must make sure that a paletted texture gets assigned multiple IDs for each tlut used.
-		//
-		// TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now
-		texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32);
-		tex_hash ^= tlut_hash;
-	}
-
-	// D3D doesn't like when the specified mipmap count would require more than one 1x1-sized LOD in the mipmap chain
-	// e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,1x1, so we limit the mipmap count to 6 there
-	while (g_ActiveConfig.backend_info.bUseMinimalMipCount && max(expandedWidth, expandedHeight) >> maxlevel == 0)
-		--maxlevel;
-
-	TCacheEntryBase *entry = textures[texID];
-	if (entry)
-	{
-		// 1. Calculate reference hash:
-		// calculated from RAM texture data for normal textures. Hashes for paletted textures are modified by tlut_hash. 0 for virtual EFB copies.
-		if (g_ActiveConfig.bCopyEFBToTexture && entry->IsEfbCopy())
-			tex_hash = TEXHASH_INVALID;
-
-		// 2. a) For EFB copies, only the hash and the texture address need to match
-		if (entry->IsEfbCopy() && tex_hash == entry->hash && address == entry->addr)
-		{
-			entry->type = TCET_EC_VRAM;
-
-			// TODO: Print a warning if the format changes! In this case,
-			// we could reinterpret the internal texture object data to the new pixel format
-			// (similar to what is already being done in Renderer::ReinterpretPixelFormat())
-			return ReturnEntry(stage, entry);
-		}
-
-		// 2. b) For normal textures, all texture parameters need to match
-		if (address == entry->addr && tex_hash == entry->hash && full_format == entry->format &&
-			entry->num_mipmaps > maxlevel && entry->native_width == nativeW && entry->native_height == nativeH)
-		{
-			return ReturnEntry(stage, entry);
-		}
-
-		// 3. If we reach this line, we'll have to upload the new texture data to VRAM.
-		//    If we're lucky, the texture parameters didn't change and we can reuse the internal texture object instead of destroying and recreating it.
-		//
-		// TODO: Don't we need to force texture decoding to RGBA8 for dynamic EFB copies?
-		// TODO: Actually, it should be enough if the internal texture format matches...
-		if ((entry->type == TCET_NORMAL && width == entry->virtual_width && height == entry->virtual_height
-			&& full_format == entry->format && entry->num_mipmaps > maxlevel)
-			|| (entry->type == TCET_EC_DYNAMIC && entry->native_width == width && entry->native_height == height))
-		{
-			// reuse the texture
-		}
-		else
-		{
-			// delete the texture and make a new one
-			delete entry;
-			entry = NULL;
-		}
-	}
-
-	bool using_custom_texture = false;
-
-	if (g_ActiveConfig.bHiresTextures)
-	{
-		// This function may modify width/height.
-		pcfmt = LoadCustomTexture(tex_hash, texformat, 0, width, height);
-		if (pcfmt != PC_TEX_FMT_NONE)
-		{
-			if (expandedWidth != width || expandedHeight != height)
-			{
-				expandedWidth = width;
-				expandedHeight = height;
-
-				// If we thought we could reuse the texture before, make sure to delete it now!
-				delete entry;
-				entry = NULL;
-			}
-			using_custom_texture = true;
-		}
-	}
-
-	if (!using_custom_texture)
-	{
-		if (!(texformat == GX_TF_RGBA8 && from_tmem))
-		{
-			pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth,
-						expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures);
-		}
-		else
-		{
-			u8* src_data_gb = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE];
-			pcfmt = TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight);
-		}
-	}
-
-	u32 texLevels = use_mipmaps ? (maxlevel + 1) : 1;
-	const bool using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels);
-	// Only load native mips if their dimensions fit to our virtual texture dimensions
-	const bool use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH);
-	texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // TODO: Should be forced to 1 for non-pow2 textures (e.g. efb copies with automatically adjusted IR)
-
-	// create the entry/texture
-	if (NULL == entry)
-	{
-		textures[texID] = entry = g_texture_cache->CreateTexture(width, height, expandedWidth, texLevels, pcfmt);
-
-		// Sometimes, we can get around recreating a texture if only the number of mip levels changes
-		// e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states
-		// Thus, we don't update this member for every Load, but just whenever the texture gets recreated
-		// TODO: D3D9 doesn't support min_lod. We should add a workaround for that here!
-		
-		// TODO: This is the wrong value. We should be storing the number of levels our actual texture has.
-		// But that will currently make the above "existing entry" tests fail as "texLevels" is not calculated until after.
-		// Currently, we might try to reuse a texture which appears to have more levels than actual, maybe..
-		entry->num_mipmaps = maxlevel + 1;
-		entry->type = TCET_NORMAL;
-
-		GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true);
-	}
-	else
-	{
-		// load texture (CreateTexture also loads level 0)
-		entry->Load(width, height, expandedWidth, 0);
-	}
-
-	entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps);
-	entry->SetDimensions(nativeW, nativeH, width, height);
-	entry->hash = tex_hash;
-	
-	if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture)
-		entry->type = TCET_EC_DYNAMIC;
-	else
-		entry->type = TCET_NORMAL;
-
-	if (g_ActiveConfig.bDumpTextures && !using_custom_texture)
-		DumpTexture(entry, 0);
-
-	u32 level = 1;
-	// load mips - TODO: Loading mipmaps from tmem is untested!
-	if (pcfmt != PC_TEX_FMT_NONE)
-	{
-		if (use_native_mips)
-		{
-			src_data += texture_size;
-			
-			const u8* ptr_even = NULL;
-			const u8* ptr_odd = NULL;
-			if (from_tmem)
-			{
-				ptr_even = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE + texture_size];
-				ptr_odd = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE];
-			}
-
-			for (; level != texLevels; ++level)
-			{
-				const u32 mip_width = CalculateLevelSize(width, level);
-				const u32 mip_height = CalculateLevelSize(height, level);
-				const u32 expanded_mip_width = (mip_width + bsw) & (~bsw);
-				const u32 expanded_mip_height = (mip_height + bsh) & (~bsh);
-				
-				const u8*& mip_src_data = from_tmem
-					? ((level % 2) ? ptr_odd : ptr_even)
-					: src_data;
-				TexDecoder_Decode(temp, mip_src_data, expanded_mip_width, expanded_mip_height, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures);
-				mip_src_data += TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);
-				
-				entry->Load(mip_width, mip_height, expanded_mip_width, level);
-
-				if (g_ActiveConfig.bDumpTextures)
-					DumpTexture(entry, level);
-			}
-		}
-		else if (using_custom_lods)
-		{
-			for (; level != texLevels; ++level)
-			{
-				unsigned int mip_width = CalculateLevelSize(width, level);
-				unsigned int mip_height = CalculateLevelSize(height, level);
-
-				LoadCustomTexture(tex_hash, texformat, level, mip_width, mip_height);
-				entry->Load(mip_width, mip_height, mip_width, level);
-			}
-		}
-	}
-
-	INCSTAT(stats.numTexturesCreated);
-	SETSTAT(stats.numTexturesAlive, textures.size());
-
-	return ReturnEntry(stage, entry);
-}
-
-void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat,
-	const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf)
-{
-	// Emulation methods:
-	// 
-	// - EFB to RAM:
-	//		Encodes the requested EFB data at its native resolution to the emulated RAM using shaders.
-	//		Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again.
-	//		Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture
-	//		Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures.
-	// 
-	// - EFB to texture:
-	//		Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders.
-	//		Advantage:	Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again.
-	//					Since we don't do any further encoding or decoding here, this method is much faster.
-	//					It also allows enhancing the visual quality by doing scaled EFB copies.
-	// 
-	// - Hybrid EFB copies:
-	//		1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM)
-	//		1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range.
-	//			If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies.
-	//		2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before):
-	//		2a) Entry doesn't exist:
-	//			- Also copy the requested EFB data to a texture object in VRAM (like EFB to texture)
-	//			- Create a texture cache entry for the target (type = TCET_EC_VRAM)
-	//			- Store a hash of the encoded RAM data in the texcache entry.
-	//		2b) Entry exists AND type is TCET_EC_VRAM:
-	//			- Like case 2a, but reuse the old texcache entry instead of creating a new one.
-	//		2c) Entry exists AND type is TCET_EC_DYNAMIC:
-	//			- Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry.
-	//			- Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway.
-	//		3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM.
-	//		3a) If the two hashes match AND type is TCET_EC_VRAM, reuse the VRAM copy you created
-	//		3b) If the two hashes differ AND type is TCET_EC_VRAM, screw your existing VRAM copy. Set type to TCET_EC_DYNAMIC.
-	//			Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now.
-	//		3c) If type is TCET_EC_DYNAMIC, treat the EFB copy like a normal texture.
-	//		Advantage: 	Non-dynamic EFB copies can be visually enhanced like with EFB to texture.
-	//					Compatibility is as good as EFB to RAM.
-	//		Disadvantage:	Slower than EFB to texture and often even slower than EFB to RAM.
-	//						EFB copy cache depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as without a copy cache anyway.
-	//
-	// Disadvantage of all methods: Calling this function requires the GPU to perform a pipeline flush which stalls any further CPU processing.
-	//
-	// For historical reasons, Dolphin doesn't actually implement "pure" EFB to RAM emulation, but only EFB to texture and hybrid EFB copies.
-
-	float colmat[28] = {0};
-	float *const fConstAdd = colmat + 16;
-	float *const ColorMask = colmat + 20;
-	ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f;
-	ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f;
-	unsigned int cbufid = -1;
-
-	if (srcFormat == PIXELFMT_Z24)
-	{
-		switch (dstFormat)
-		{
-		case 0: // Z4
-			colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f;
-			cbufid = 0;
-			break;
-		case 1: // Z8
-		case 8: // Z8
-			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1.0f;
-			cbufid = 1;
-			break;
-
-		case 3: // Z16
-			colmat[1] = colmat[5] = colmat[9] = colmat[12] = 1.0f;
-			cbufid = 24;
-			break;
-
-		case 11: // Z16 (reverse order)
-			colmat[0] = colmat[4] = colmat[8] = colmat[13] = 1.0f;
-			cbufid = 2;
-			break;
-
-		case 6: // Z24X8
-			colmat[0] = colmat[5] = colmat[10] = 1.0f;
-			cbufid = 3;
-			break;
-
-		case 9: // Z8M
-			colmat[1] = colmat[5] = colmat[9] = colmat[13] = 1.0f;
-			cbufid = 4;
-			break;
-
-		case 10: // Z8L
-			colmat[2] = colmat[6] = colmat[10] = colmat[14] = 1.0f;
-			cbufid = 5;
-			break;
-
-		case 12: // Z16L - copy lower 16 depth bits
-			// expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha)
-			// Used e.g. in Zelda: Skyward Sword
-			colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f;
-			cbufid = 6;
-			break;
-
-		default:
-			ERROR_LOG(VIDEO, "Unknown copy zbuf format: 0x%x", dstFormat);
-			colmat[2] = colmat[5] = colmat[8] = 1.0f;
-			cbufid = 7;
-			break;
-		}
-	}
-	else if (isIntensity) 
-	{
-		fConstAdd[0] = fConstAdd[1] = fConstAdd[2] = 16.0f/255.0f;
-		switch (dstFormat) 
-		{
-		case 0: // I4
-		case 1: // I8
-		case 2: // IA4
-		case 3: // IA8
-		case 8: // I8
-			// TODO - verify these coefficients
-			colmat[0] = 0.257f; colmat[1] = 0.504f; colmat[2] = 0.098f;
-			colmat[4] = 0.257f; colmat[5] = 0.504f; colmat[6] = 0.098f;
-			colmat[8] = 0.257f; colmat[9] = 0.504f; colmat[10] = 0.098f;
-
-			if (dstFormat < 2 || dstFormat == 8) 
-			{
-				colmat[12] = 0.257f; colmat[13] = 0.504f; colmat[14] = 0.098f;
-				fConstAdd[3] = 16.0f/255.0f;
-				if (dstFormat == 0)
-				{
-					ColorMask[0] = ColorMask[1] = ColorMask[2] = 15.0f;
-					ColorMask[4] = ColorMask[5] = ColorMask[6] = 1.0f / 15.0f;
-					cbufid = 8;
-				}
-				else
-				{
-					cbufid = 9;
-				}
-			}
-			else// alpha
-			{
-				colmat[15] = 1;
-				if (dstFormat == 2)
-				{
-					ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 15.0f;
-					ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 15.0f;
-					cbufid = 10;
-				}
-				else
-				{
-					cbufid = 11;
-				}
-				
-			}
-			break;
-
-		default:
-			ERROR_LOG(VIDEO, "Unknown copy intensity format: 0x%x", dstFormat);
-			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
-			cbufid = 23;
-			break;
-		}
-	}
-	else
-	{
-		switch (dstFormat) 
-		{
-		case 0: // R4
-			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1;
-			ColorMask[0] = 15.0f;
-			ColorMask[4] = 1.0f / 15.0f;
-			cbufid = 12;
-			break;
-		case 1: // R8
-		case 8: // R8
-			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1;
-			cbufid = 13;
-			break;
-
-		case 2: // RA4
-			colmat[0] = colmat[4] = colmat[8] = colmat[15] = 1.0f;
-			ColorMask[0] = ColorMask[3] = 15.0f;
-			ColorMask[4] = ColorMask[7] = 1.0f / 15.0f;
-			cbufid = 14;
-			break;
-		case 3: // RA8
-			colmat[0] = colmat[4] = colmat[8] = colmat[15] = 1.0f;
-			cbufid = 15;
-			break;
-
-		case 7: // A8
-			colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f;
-			cbufid = 16;
-			break;
-
-		case 9: // G8
-			colmat[1] = colmat[5] = colmat[9] = colmat[13] = 1.0f;
-			cbufid = 17;
-			break;
-		case 10: // B8
-			colmat[2] = colmat[6] = colmat[10] = colmat[14] = 1.0f;
-			cbufid = 18;
-			break;
-
-		case 11: // RG8
-			colmat[0] = colmat[4] = colmat[8] = colmat[13] = 1.0f;
-			cbufid = 19;
-			break;
-
-		case 12: // GB8
-			colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f;
-			cbufid = 20;
-			break;
-
-		case 4: // RGB565
-			colmat[0] = colmat[5] = colmat[10] = 1.0f;
-			ColorMask[0] = ColorMask[2] = 31.0f;
-			ColorMask[4] = ColorMask[6] = 1.0f / 31.0f;
-			ColorMask[1] = 63.0f;
-			ColorMask[5] = 1.0f / 63.0f;
-			fConstAdd[3] = 1.0f; // set alpha to 1
-			cbufid = 21;
-			break;
-
-		case 5: // RGB5A3
-			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
-			ColorMask[0] = ColorMask[1] = ColorMask[2] = 31.0f;
-			ColorMask[4] = ColorMask[5] = ColorMask[6] = 1.0f / 31.0f;
-			ColorMask[3] = 7.0f;
-			ColorMask[7] = 1.0f / 7.0f;
-			cbufid = 22;
-			break;
-		case 6: // RGBA8
-			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
-			cbufid = 23;
-			break;
-
-		default:
-			ERROR_LOG(VIDEO, "Unknown copy color format: 0x%x", dstFormat);
-			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
-			cbufid = 23;
-			break;
-		}
-	}
-
-	const unsigned int tex_w = scaleByHalf ? srcRect.GetWidth()/2 : srcRect.GetWidth();
-	const unsigned int tex_h = scaleByHalf ? srcRect.GetHeight()/2 : srcRect.GetHeight();
-
-	unsigned int scaled_tex_w = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledX(tex_w) : tex_w;
-	unsigned int scaled_tex_h = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledY(tex_h) : tex_h;
-
-
-	TCacheEntryBase *entry = textures[dstAddr];
-	if (entry)
-	{
-		if (entry->type == TCET_EC_DYNAMIC && entry->native_width == tex_w && entry->native_height == tex_h)
-		{
-			scaled_tex_w = tex_w;
-			scaled_tex_h = tex_h;
-		}
-		else if (!(entry->type == TCET_EC_VRAM && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h))
-		{
-			// remove it and recreate it as a render target
-			delete entry;
-			entry = NULL;
-		}
-	}
-
-	if (NULL == entry)
-	{
-		// create the texture
-		textures[dstAddr] = entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h);
-
-		// TODO: Using the wrong dstFormat, dumb...
-		entry->SetGeneralParameters(dstAddr, 0, dstFormat, 1);
-		entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h);
-		entry->SetHashes(TEXHASH_INVALID);
-		entry->type = TCET_EC_VRAM;
-	}
-
-	entry->frameCount = frameCount;
-
-	entry->FromRenderTarget(dstAddr, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf, cbufid, colmat);
-}
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h
deleted file mode 100644
index 1afcb8cd2d..0000000000
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURECACHEBASE_H
-#define _TEXTURECACHEBASE_H
-
-#include <map>
-
-#include "VideoCommon.h"
-#include "TextureDecoder.h"
-#include "BPMemory.h"
-#include "Thread.h"
-
-#include "CommonTypes.h"
-
-struct VideoConfig;
-
-class TextureCache
-{
-public:
-	enum TexCacheEntryType
-	{
-		TCET_NORMAL,
-		TCET_EC_VRAM,		// EFB copy which sits in VRAM and is ready to be used
-		TCET_EC_DYNAMIC,	// EFB copy which sits in RAM and needs to be decoded before being used
-	};
-
-	struct TCacheEntryBase
-	{
-#define TEXHASH_INVALID 0
-
-		// common members
-		u32 addr;
-		u32 size_in_bytes;
-		u64 hash;
-		//u32 pal_hash;
-		u32 format;
-
-		enum TexCacheEntryType type;
-
-		unsigned int num_mipmaps;
-		unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view
-		unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies
-
-		// used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames
-		int frameCount;
-
-
-		void SetGeneralParameters(u32 _addr, u32 _size, u32 _format, unsigned int _num_mipmaps)
-		{
-			addr = _addr;
-			size_in_bytes = _size;
-			format = _format;
-			num_mipmaps = _num_mipmaps;
-		}
-
-		void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _virtual_width, unsigned int _virtual_height)
-		{
-			native_width = _native_width;
-			native_height = _native_height;
-			virtual_width = _virtual_width;
-			virtual_height = _virtual_height;
-		}
-
-		void SetHashes(u64 _hash/*, u32 _pal_hash*/)
-		{
-			hash = _hash;
-			//pal_hash = _pal_hash;
-		}
-
-
-		virtual ~TCacheEntryBase();
-
-		virtual void Bind(unsigned int stage) = 0;
-		virtual bool Save(const char filename[], unsigned int level) = 0;
-
-		virtual void Load(unsigned int width, unsigned int height,
-			unsigned int expanded_width, unsigned int level) = 0;
-		virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-			unsigned int srcFormat, const EFBRectangle& srcRect,
-			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-			const float *colmat) = 0;
-
-		int IntersectsMemoryRange(u32 range_address, u32 range_size) const;
-
-		bool IsEfbCopy() { return (type == TCET_EC_VRAM || type == TCET_EC_DYNAMIC); }
-	};
-
-	virtual ~TextureCache(); // needs virtual for DX11 dtor
-
-	static void OnConfigChanged(VideoConfig& config);
-	static void Cleanup();
-
-	static void Invalidate();
-	static void InvalidateRange(u32 start_address, u32 size);
-	static void MakeRangeDynamic(u32 start_address, u32 size);
-	static void ClearRenderTargets();	// currently only used by OGL
-	static bool Find(u32 start_address, u64 hash);
-
-	virtual TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
-		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt) = 0;
-	virtual TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) = 0;
-
-	static TCacheEntryBase* Load(unsigned int stage, u32 address, unsigned int width, unsigned int height,
-		int format, unsigned int tlutaddr, int tlutfmt, bool use_mipmaps, unsigned int maxlevel, bool from_tmem);
-	static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat,
-		const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
-
-	static void RequestInvalidateTextureCache();
-
-protected:
-	TextureCache();
-
-	static  GC_ALIGNED16(u8 *temp);
-	static unsigned int temp_size;
-
-private:
-	static bool CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels);
-	static PC_TexFormat LoadCustomTexture(u64 tex_hash, int texformat, unsigned int level, unsigned int& width, unsigned int& height);
-	static void DumpTexture(TCacheEntryBase* entry, unsigned int level);
-
-	typedef std::map<u32, TCacheEntryBase*> TexCache;
-
-	static TexCache textures;
-
-	// Backup configuration values
-	static struct BackupConfig
-	{
-		int s_colorsamples;
-		bool s_copy_efb_to_texture;
-		bool s_copy_efb_scaled;
-		bool s_copy_efb;
-		int s_efb_scale;
-		bool s_texfmt_overlay;
-		bool s_texfmt_overlay_center;
-		bool s_hires_textures;
-		bool s_copy_cache_enable;
-	} backup_config;
-};
-
-extern TextureCache *g_texture_cache;
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
deleted file mode 100644
index de5198c9fe..0000000000
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ /dev/null
@@ -1,910 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include <stdio.h>
-#include <math.h>
-#include <locale.h>
-#ifdef __APPLE__
-	#include <xlocale.h>
-#endif
-
-#include "TextureConversionShader.h"
-#include "TextureDecoder.h"
-#include "PixelShaderManager.h"
-#include "PixelShaderGen.h"
-#include "BPMemory.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
-
-#define WRITE p+=sprintf
-
-static char text[16384];
-static bool IntensityConstantAdded =  false;
-static int s_incrementSampleXCount = 0;
-
-namespace TextureConversionShader
-{
-
-u16 GetEncodedSampleCount(u32 format)
-{
-	switch (format)
-	{
-	case GX_TF_I4: return 8;
-	case GX_TF_I8: return 4;
-	case GX_TF_IA4: return 4;
-	case GX_TF_IA8: return 2;
-	case GX_TF_RGB565: return 2;
-	case GX_TF_RGB5A3: return 2;
-	case GX_TF_RGBA8: return 1;
-	case GX_CTF_R4: return 8;
-	case GX_CTF_RA4: return 4;
-	case GX_CTF_RA8: return 2;
-	case GX_CTF_A8: return 4;
-	case GX_CTF_R8: return 4;
-	case GX_CTF_G8: return 4;
-	case GX_CTF_B8: return 4;
-	case GX_CTF_RG8: return 2;
-	case GX_CTF_GB8: return 2;
-	case GX_TF_Z8: return 4;
-	case GX_TF_Z16: return 2;
-	case GX_TF_Z24X8: return 1;
-	case GX_CTF_Z4: return 8;
-	case GX_CTF_Z8M: return 4;
-	case GX_CTF_Z8L: return 4;
-	case GX_CTF_Z16L: return 2;
-	default: return 1;
-	}
-}
-
-const char* WriteRegister(API_TYPE ApiType, const char *prefix, const u32 num)
-{
-	if (ApiType == API_OPENGL)
-		return ""; // Once we switch to GLSL 1.3 we can do something here
-	static char result[64];
-	sprintf(result, " : register(%s%d)", prefix, num);
-	return result;
-}
-
-// block dimensions : widthStride, heightStride 
-// texture dims : width, height, x offset, y offset
-void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
-{
-	// [0] left, top, right, bottom of source rectangle within source texture
-	// [1] width and height of destination texture in pixels
-	// Two were merged for GLSL
-	WRITE(p, "uniform float4 " I_COLORS"[2] %s;\n", WriteRegister(ApiType, "c", C_COLORS));
-
-	float blkW = (float)TexDecoder_GetBlockWidthInTexels(format);
-	float blkH = (float)TexDecoder_GetBlockHeightInTexels(format);
-	float samples = (float)GetEncodedSampleCount(format);
-	if (ApiType == API_OPENGL)
-	{
-		WRITE(p, "#define samp0 samp9\n");
-		WRITE(p, "uniform sampler2DRect samp0;\n");
-	}
-	else if (ApiType & API_D3D9)
-	{
-		WRITE(p,"uniform sampler samp0 : register(s0);\n");
-	}
-	else
-	{
-		WRITE(p,"sampler samp0 : register(s0);\n");
-		WRITE(p, "Texture2D Tex0 : register(t0);\n");
-	}
-
-	if (ApiType == API_OPENGL)
-	{
-		WRITE(p, "  COLOROUT(ocol0)\n");
-		WRITE(p, "  VARYIN float2 uv0;\n");
-		WRITE(p, "void main()\n");
-	}
-	else
-	{
-		WRITE(p,"void main(\n");
-		if (ApiType != API_D3D11)
-		{
-			WRITE(p,"  out float4 ocol0 : COLOR0,\n");
-		}
-		else
-		{
-			WRITE(p,"  out float4 ocol0 : SV_Target,\n");
-		}
-		WRITE(p,"  in float2 uv0 : TEXCOORD0)\n");
-	}
-
-	WRITE(p, "{\n"    
-	"  float2 sampleUv;\n"
-	"  float2 uv1 = floor(uv0);\n");
-
-	WRITE(p, "  uv1.x = uv1.x * %f;\n", samples);
-
-	WRITE(p, "  float xl =  floor(uv1.x / %f);\n", blkW);
-	WRITE(p, "  float xib = uv1.x - (xl * %f);\n", blkW);
-	WRITE(p, "  float yl = floor(uv1.y / %f);\n", blkH);
-	WRITE(p, "  float yb = yl * %f;\n", blkH);
-	WRITE(p, "  float yoff = uv1.y - yb;\n");
-	WRITE(p, "  float xp = uv1.x + (yoff * " I_COLORS"[1].x);\n");
-	WRITE(p, "  float xel = floor(xp / %f);\n", blkW);
-	WRITE(p, "  float xb = floor(xel / %f);\n", blkH);
-	WRITE(p, "  float xoff = xel - (xb * %f);\n", blkH);
-
-	WRITE(p, "  sampleUv.x = xib + (xb * %f);\n", blkW);
-	WRITE(p, "  sampleUv.y = yb + xoff;\n");
-
-	WRITE(p, "  sampleUv = sampleUv * " I_COLORS"[0].xy;\n");
-
-	if (ApiType == API_OPENGL)
-		WRITE(p,"  sampleUv.y = " I_COLORS"[1].y - sampleUv.y;\n");
-
-	WRITE(p, "  sampleUv = sampleUv + " I_COLORS"[1].zw;\n");
-
-	if (ApiType != API_OPENGL)
-	{
-		WRITE(p, "  sampleUv = sampleUv + float2(0.0f,1.0f);\n");// still to determine the reason for this
-		WRITE(p, "  sampleUv = sampleUv / " I_COLORS"[0].zw;\n");
-	}
-}
-
-// block dimensions : widthStride, heightStride 
-// texture dims : width, height, x offset, y offset
-void Write32BitSwizzler(char*& p, u32 format, API_TYPE ApiType)
-{	
-	// [0] left, top, right, bottom of source rectangle within source texture
-	// [1] width and height of destination texture in pixels
-	// Two were merged for GLSL
-	WRITE(p, "uniform float4 " I_COLORS"[2] %s;\n", WriteRegister(ApiType, "c", C_COLORS));
-
-	float blkW = (float)TexDecoder_GetBlockWidthInTexels(format);
-	float blkH = (float)TexDecoder_GetBlockHeightInTexels(format);
-
-	// 32 bit textures (RGBA8 and Z24) are store in 2 cache line increments
-	if (ApiType == API_OPENGL)
-	{
-		WRITE(p, "#define samp0 samp9\n");
-		WRITE(p, "uniform sampler2DRect samp0;\n");
-	}
-	else if (ApiType & API_D3D9)
-	{
-		WRITE(p,"uniform sampler samp0 : register(s0);\n");
-	}
-	else
-	{
-		WRITE(p,"sampler samp0 : register(s0);\n");
-		WRITE(p, "Texture2D Tex0 : register(t0);\n");
-	}
-
-	if (ApiType == API_OPENGL)
-	{
-		WRITE(p, "  out float4 ocol0;\n");
-		WRITE(p, "  VARYIN float2 uv0;\n");
-		WRITE(p, "void main()\n");
-	}
-	else
-	{
-		WRITE(p,"void main(\n");
-		if(ApiType != API_D3D11)
-		{
-			WRITE(p,"  out float4 ocol0 : COLOR0,\n");
-		}
-		else
-		{
-			WRITE(p,"  out float4 ocol0 : SV_Target,\n");
-		}
-		WRITE(p,"  in float2 uv0 : TEXCOORD0)\n");
-	}
-
-
-	WRITE(p, "{\n"    
-	"  float2 sampleUv;\n"
-	"  float2 uv1 = floor(uv0);\n");
-
-	WRITE(p, "  float yl = floor(uv1.y / %f);\n", blkH);
-	WRITE(p, "  float yb = yl * %f;\n", blkH);
-	WRITE(p, "  float yoff = uv1.y - yb;\n");
-	WRITE(p, "  float xp = uv1.x + (yoff * " I_COLORS"[1].x);\n");
-	WRITE(p, "  float xel = floor(xp / 2.0f);\n");
-	WRITE(p, "  float xb = floor(xel / %f);\n", blkH);
-	WRITE(p, "  float xoff = xel - (xb * %f);\n", blkH);
-
-	WRITE(p, "  float x2 = uv1.x * 2.0f;\n");
-	WRITE(p, "  float xl = floor(x2 / %f);\n", blkW);	
-	WRITE(p, "  float xib = x2 - (xl * %f);\n", blkW);
-	WRITE(p, "  float halfxb = floor(xb / 2.0f);\n");
-
-	WRITE(p, "  sampleUv.x = xib + (halfxb * %f);\n", blkW);
-	WRITE(p, "  sampleUv.y = yb + xoff;\n");
-	WRITE(p, "  sampleUv = sampleUv * " I_COLORS"[0].xy;\n");
-
-	if (ApiType == API_OPENGL)
-		WRITE(p,"  sampleUv.y = " I_COLORS"[1].y - sampleUv.y;\n");
-
-	WRITE(p, "  sampleUv = sampleUv + " I_COLORS"[1].zw;\n");
-
-	if (ApiType != API_OPENGL)
-	{
-		WRITE(p, "  sampleUv = sampleUv + float2(0.0f,1.0f);\n");// still to determine the reason for this
-		WRITE(p, "  sampleUv = sampleUv / " I_COLORS"[0].zw;\n");
-	}
-}
-
-void WriteSampleColor(char*& p, const char* colorComp, const char* dest, API_TYPE ApiType)
-{
-	const char* texSampleOpName;
-	if (ApiType & API_D3D9)
-		texSampleOpName = "tex2D";
-	else if (ApiType == API_D3D11)
-		texSampleOpName = "tex0.Sample";
-	else
-		texSampleOpName = "texture2DRect";
-
-	// the increment of sampleUv.x is delayed, so we perform it here. see WriteIncrementSampleX.
-	const char* texSampleIncrementUnit;
-	if (ApiType != API_OPENGL)
-		texSampleIncrementUnit = I_COLORS"[0].x / " I_COLORS"[0].z";
-	else
-		texSampleIncrementUnit = I_COLORS"[0].x";
-
-	WRITE(p, "  %s = %s(samp0, sampleUv + float2(%d.0f * (%s), 0.0f)).%s;\n",
-		dest, texSampleOpName, s_incrementSampleXCount, texSampleIncrementUnit, colorComp);
-}
-
-void WriteColorToIntensity(char*& p, const char* src, const char* dest)
-{
-	if (!IntensityConstantAdded)
-	{
-		WRITE(p, "  float4 IntensityConst = float4(0.257f,0.504f,0.098f,0.0625f);\n");
-		IntensityConstantAdded = true;
-	}
-	WRITE(p, "  %s = dot(IntensityConst.rgb, %s.rgb);\n", dest, src);
-	// don't add IntensityConst.a yet, because doing it later is faster and uses less instructions, due to vectorization
-}
-
-void WriteIncrementSampleX(char*& p,API_TYPE ApiType)
-{
-	// the shader compiler apparently isn't smart or aggressive enough to recognize that:
-	//    foo1 = lookup(x)
-	//    x = x + increment;
-	//    foo2 = lookup(x)
-	//    x = x + increment;
-	//    foo3 = lookup(x)
-	// can be replaced with this:
-	//    foo1 = lookup(x + 0.0 * increment)
-	//    foo2 = lookup(x + 1.0 * increment)
-	//    foo3 = lookup(x + 2.0 * increment)
-	// which looks like the same operations but uses considerably fewer ALU instruction slots.
-	// thus, instead of using the former method, we only increment a counter internally here,
-	// and we wait until WriteSampleColor to write out the constant multiplier
-	// to achieve the increment as in the latter case.
-	s_incrementSampleXCount++;
-}
-
-void WriteToBitDepth(char*& p, u8 depth, const char* src, const char* dest)
-{
-	float result = 255 / pow(2.0f, (8 - depth));
-	WRITE(p, "  %s = floor(%s * %ff);\n", dest, src, result);
-}
-
-void WriteEncoderEnd(char* p, API_TYPE ApiType)
-{
-	WRITE(p, "}\n");
-	IntensityConstantAdded = false;
-	s_incrementSampleXCount = 0;
-}
-
-void WriteI8Encoder(char* p, API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_I8, ApiType);
-	WRITE(p, "  float3 texSample;\n");	
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "ocol0.b");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "ocol0.g");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "ocol0.r");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "ocol0.a");
-
-	WRITE(p, "  ocol0.rgba += IntensityConst.aaaa;\n"); // see WriteColorToIntensity
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteI4Encoder(char* p, API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_I4, ApiType);
-	WRITE(p, "  float3 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color0.b");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color1.b");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color0.g");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color1.g");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color0.r");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color1.r");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color0.a");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgb", "texSample", ApiType);
-	WriteColorToIntensity(p, "texSample", "color1.a");
-
-	WRITE(p, "  color0.rgba += IntensityConst.aaaa;\n");
-	WRITE(p, "  color1.rgba += IntensityConst.aaaa;\n");
-
-	WriteToBitDepth(p, 4, "color0", "color0");
-	WriteToBitDepth(p, 4, "color1", "color1");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0f + color1) / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteIA8Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_IA8, ApiType);
-	WRITE(p, "  float4 texSample;\n");	
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  ocol0.b = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "ocol0.g");
-	WriteIncrementSampleX(p, ApiType);	
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  ocol0.r = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "ocol0.a");
-
-	WRITE(p, "  ocol0.ga += IntensityConst.aa;\n");
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteIA4Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_IA4, ApiType);
-	WRITE(p, "  float4 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.b = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "color1.b");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.g = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "color1.g");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.r = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "color1.r");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.a = texSample.a;\n");
-	WriteColorToIntensity(p, "texSample", "color1.a");
-
-	WRITE(p, "  color1.rgba += IntensityConst.aaaa;\n");
-
-	WriteToBitDepth(p, 4, "color0", "color0");
-	WriteToBitDepth(p, 4, "color1", "color1");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0f + color1) / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteRGB565Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_RGB565, ApiType);
-
-	WriteSampleColor(p, "rgb", "float3 texSample0", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-	WriteSampleColor(p, "rgb", "float3 texSample1", ApiType);
-	WRITE(p, "  float2 texRs = float2(texSample0.r, texSample1.r);\n");
-	WRITE(p, "  float2 texGs = float2(texSample0.g, texSample1.g);\n");
-	WRITE(p, "  float2 texBs = float2(texSample0.b, texSample1.b);\n");
-  
-	WriteToBitDepth(p, 6, "texGs", "float2 gInt");
-	WRITE(p, "  float2 gUpper = floor(gInt / 8.0f);\n");
-	WRITE(p, "  float2 gLower = gInt - gUpper * 8.0f;\n");
-
-	WriteToBitDepth(p, 5, "texRs", "ocol0.br");
-	WRITE(p, "  ocol0.br = ocol0.br * 8.0f + gUpper;\n");
-	WriteToBitDepth(p, 5, "texBs", "ocol0.ga");
-	WRITE(p, "  ocol0.ga = ocol0.ga + gLower * 32.0f;\n");
-
-	WRITE(p, "  ocol0 = ocol0 / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteRGB5A3Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_RGB5A3, ApiType);
-
-	WRITE(p, "  float4 texSample;\n");
-	WRITE(p, "  float color0;\n");
-	WRITE(p, "  float gUpper;\n");
-	WRITE(p, "  float gLower;\n");
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-
-	// 0.8784 = 224 / 255 which is the maximum alpha value that can be represented in 3 bits
-	WRITE(p, "if(texSample.a > 0.878f) {\n");
-
-	WriteToBitDepth(p, 5, "texSample.g", "color0");
-	WRITE(p, "  gUpper = floor(color0 / 8.0f);\n");
-	WRITE(p, "  gLower = color0 - gUpper * 8.0f;\n");
-
-	WriteToBitDepth(p, 5, "texSample.r", "ocol0.b");
-	WRITE(p, "  ocol0.b = ocol0.b * 4.0f + gUpper + 128.0f;\n");
-	WriteToBitDepth(p, 5, "texSample.b", "ocol0.g");
-	WRITE(p, "  ocol0.g = ocol0.g + gLower * 32.0f;\n");
-
-	WRITE(p, "} else {\n");
-
-	WriteToBitDepth(p, 4, "texSample.r", "ocol0.b");
-	WriteToBitDepth(p, 4, "texSample.b", "ocol0.g");
-
-	WriteToBitDepth(p, 3, "texSample.a", "color0");
-	WRITE(p, "ocol0.b = ocol0.b + color0 * 16.0f;\n");
-	WriteToBitDepth(p, 4, "texSample.g", "color0");
-	WRITE(p, "ocol0.g = ocol0.g + color0 * 16.0f;\n");
-
-	WRITE(p, "}\n");
-
-
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-
-	WRITE(p, "if(texSample.a > 0.878f) {\n");
-
-	WriteToBitDepth(p, 5, "texSample.g", "color0");
-	WRITE(p, "  gUpper = floor(color0 / 8.0f);\n");
-	WRITE(p, "  gLower = color0 - gUpper * 8.0f;\n");
-
-	WriteToBitDepth(p, 5, "texSample.r", "ocol0.r");
-	WRITE(p, "  ocol0.r = ocol0.r * 4.0f + gUpper + 128.0f;\n");
-	WriteToBitDepth(p, 5, "texSample.b", "ocol0.a");
-	WRITE(p, "  ocol0.a = ocol0.a + gLower * 32.0f;\n");
-
-	WRITE(p, "} else {\n");
-
-	WriteToBitDepth(p, 4, "texSample.r", "ocol0.r");
-	WriteToBitDepth(p, 4, "texSample.b", "ocol0.a");
-
-	WriteToBitDepth(p, 3, "texSample.a", "color0");
-	WRITE(p, "ocol0.r = ocol0.r + color0 * 16.0f;\n");
-	WriteToBitDepth(p, 4, "texSample.g", "color0");
-	WRITE(p, "ocol0.a = ocol0.a + color0 * 16.0f;\n");
-
-	WRITE(p, "}\n");
-
-	WRITE(p, "  ocol0 = ocol0 / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteRGBA4443Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_RGB5A3, ApiType);
-
-	WRITE(p, "  float4 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WriteToBitDepth(p, 3, "texSample.a", "color0.b");
-	WriteToBitDepth(p, 4, "texSample.r", "color1.b");
-	WriteToBitDepth(p, 4, "texSample.g", "color0.g");
-	WriteToBitDepth(p, 4, "texSample.b", "color1.g");
-
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WriteToBitDepth(p, 3, "texSample.a", "color0.r");
-	WriteToBitDepth(p, 4, "texSample.r", "color1.r");
-	WriteToBitDepth(p, 4, "texSample.g", "color0.a");
-	WriteToBitDepth(p, 4, "texSample.b", "color1.a");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0f + color1) / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteRGBA8Encoder(char* p,API_TYPE ApiType)
-{
-	Write32BitSwizzler(p, GX_TF_RGBA8, ApiType);
-
-	WRITE(p, "  float cl1 = xb - (halfxb * 2.0f);\n");
-	WRITE(p, "  float cl0 = 1.0f - cl1;\n");
-
-	WRITE(p, "  float4 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.b = texSample.a;\n");
-	WRITE(p, "  color0.g = texSample.r;\n");
-	WRITE(p, "  color1.b = texSample.g;\n");
-	WRITE(p, "  color1.g = texSample.b;\n");
-
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "rgba", "texSample", ApiType);
-	WRITE(p, "  color0.r = texSample.a;\n");
-	WRITE(p, "  color0.a = texSample.r;\n");
-	WRITE(p, "  color1.r = texSample.g;\n");
-	WRITE(p, "  color1.a = texSample.b;\n");
-
-	WRITE(p, "  ocol0 = (cl0 * color0) + (cl1 * color1);\n");
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteC4Encoder(char* p, const char* comp,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_R4, ApiType);
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, comp, "color0.b", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color1.b", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color0.g", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color1.g", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color0.r", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color1.r", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color0.a", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "color1.a", ApiType);
-
-	WriteToBitDepth(p, 4, "color0", "color0");
-	WriteToBitDepth(p, 4, "color1", "color1");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0f + color1) / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteC8Encoder(char* p, const char* comp,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_R8, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.b", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.g", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.r", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.a", ApiType);
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteCC4Encoder(char* p, const char* comp,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_RA4, ApiType);
-	WRITE(p, "  float2 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, comp, "texSample", ApiType);
-	WRITE(p, "  color0.b = texSample.x;\n");
-	WRITE(p, "  color1.b = texSample.y;\n");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "texSample", ApiType);
-	WRITE(p, "  color0.g = texSample.x;\n");
-	WRITE(p, "  color1.g = texSample.y;\n");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "texSample", ApiType);
-	WRITE(p, "  color0.r = texSample.x;\n");
-	WRITE(p, "  color1.r = texSample.y;\n");
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "texSample", ApiType);
-	WRITE(p, "  color0.a = texSample.x;\n");
-	WRITE(p, "  color1.a = texSample.y;\n");
-
-	WriteToBitDepth(p, 4, "color0", "color0");
-	WriteToBitDepth(p, 4, "color1", "color1");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0f + color1) / 255.0f;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteCC8Encoder(char* p, const char* comp, API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_RA8, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.bg", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, comp, "ocol0.ra", ApiType);
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteZ8Encoder(char* p, const char* multiplier,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_Z8M, ApiType);
-
-	WRITE(p, " float depth;\n");
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-	WRITE(p, "ocol0.b = frac(depth * %s);\n", multiplier);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-	WRITE(p, "ocol0.g = frac(depth * %s);\n", multiplier);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-	WRITE(p, "ocol0.r = frac(depth * %s);\n", multiplier);
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-	WRITE(p, "ocol0.a = frac(depth * %s);\n", multiplier);
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteZ16Encoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_Z16, ApiType);
-
-	WRITE(p, "  float depth;\n");
-	WRITE(p, "  float3 expanded;\n");
-
-	// byte order is reversed
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-
-	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
-	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
-
-	WRITE(p, "  ocol0.b = expanded.g / 255.0f;\n");
-	WRITE(p, "  ocol0.g = expanded.r / 255.0f;\n");
-
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-
-	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
-	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
-
-	WRITE(p, "  ocol0.r = expanded.g / 255.0f;\n");
-	WRITE(p, "  ocol0.a = expanded.r / 255.0f;\n");
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteZ16LEncoder(char* p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_CTF_Z16L, ApiType);
-
-	WRITE(p, "  float depth;\n");
-	WRITE(p, "  float3 expanded;\n");
-
-	// byte order is reversed
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-
-	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
-	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
-	WRITE(p, "  depth -= expanded.g * 256.0f;\n");
-	WRITE(p, "  expanded.b = depth;\n");
-
-	WRITE(p, "  ocol0.b = expanded.b / 255.0f;\n");
-	WRITE(p, "  ocol0.g = expanded.g / 255.0f;\n");
-
-	WriteIncrementSampleX(p, ApiType);
-
-	WriteSampleColor(p, "b", "depth", ApiType);
-
-	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
-	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
-	WRITE(p, "  depth -= expanded.g * 256.0f;\n");
-	WRITE(p, "  expanded.b = depth;\n");
-
-	WRITE(p, "  ocol0.r = expanded.b;\n");
-	WRITE(p, "  ocol0.a = expanded.g;\n");
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-void WriteZ24Encoder(char* p, API_TYPE ApiType)
-{
-	Write32BitSwizzler(p, GX_TF_Z24X8, ApiType);
-
-	WRITE(p, "  float cl = xb - (halfxb * 2.0f);\n");
-
-	WRITE(p, "  float depth0;\n");
-	WRITE(p, "  float depth1;\n");
-	WRITE(p, "  float3 expanded0;\n");
-	WRITE(p, "  float3 expanded1;\n");
-
-	WriteSampleColor(p, "b", "depth0", ApiType);
-	WriteIncrementSampleX(p, ApiType);
-	WriteSampleColor(p, "b", "depth1", ApiType);
-
-	for (int i = 0; i < 2; i++)
-	{
-		WRITE(p, "  depth%i *= 16777215.0f;\n", i);
-
-		WRITE(p, "  expanded%i.r = floor(depth%i / (256.0f * 256.0f));\n", i, i);
-		WRITE(p, "  depth%i -= expanded%i.r * 256.0f * 256.0f;\n", i, i);
-		WRITE(p, "  expanded%i.g = floor(depth%i / 256.0f);\n", i, i);
-		WRITE(p, "  depth%i -= expanded%i.g * 256.0f;\n", i, i);
-		WRITE(p, "  expanded%i.b = depth%i;\n", i, i);
-	}
-
-	WRITE(p, "  if(cl > 0.5f) {\n");
-	// upper 16
-	WRITE(p, "     ocol0.b = expanded0.g / 255.0f;\n");
-	WRITE(p, "     ocol0.g = expanded0.b / 255.0f;\n");
-	WRITE(p, "     ocol0.r = expanded1.g / 255.0f;\n");
-	WRITE(p, "     ocol0.a = expanded1.b / 255.0f;\n");
-	WRITE(p, "  } else {\n");
-	// lower 8
-	WRITE(p, "     ocol0.b = 1.0f;\n");
-	WRITE(p, "     ocol0.g = expanded0.r / 255.0f;\n");
-	WRITE(p, "     ocol0.r = 1.0f;\n");
-	WRITE(p, "     ocol0.a = expanded1.r / 255.0f;\n");
-	WRITE(p, "  }\n");
-
-	WriteEncoderEnd(p, ApiType);
-}
-
-const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
-{
-#ifndef ANDROID
-	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
-	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
-#endif
-	text[sizeof(text) - 1] = 0x7C;  // canary
-
-	char *p = text;
-
-	switch (format)
-	{
-	case GX_TF_I4:
-		WriteI4Encoder(p, ApiType);
-		break;
-	case GX_TF_I8:
-		WriteI8Encoder(p, ApiType);
-		break;
-	case GX_TF_IA4:
-		WriteIA4Encoder(p, ApiType);
-		break;
-	case GX_TF_IA8:
-		WriteIA8Encoder(p, ApiType);
-		break;
-	case GX_TF_RGB565:
-		WriteRGB565Encoder(p, ApiType);
-		break;
-	case GX_TF_RGB5A3:
-		WriteRGB5A3Encoder(p, ApiType);
-		break;
-	case GX_TF_RGBA8:
-		WriteRGBA8Encoder(p, ApiType);
-		break;
-	case GX_CTF_R4:
-		WriteC4Encoder(p, "r", ApiType);
-		break;
-	case GX_CTF_RA4:
-		WriteCC4Encoder(p, "ar", ApiType);
-		break;
-	case GX_CTF_RA8:
-		WriteCC8Encoder(p, "ar", ApiType);
-		break;
-	case GX_CTF_A8:
-		WriteC8Encoder(p, "a", ApiType);
-		break;
-	case GX_CTF_R8:
-		WriteC8Encoder(p, "r", ApiType);
-		break;
-	case GX_CTF_G8:
-		WriteC8Encoder(p, "g", ApiType);
-		break;
-	case GX_CTF_B8:
-		WriteC8Encoder(p, "b", ApiType);
-		break;
-	case GX_CTF_RG8:
-		WriteCC8Encoder(p, "rg", ApiType);
-		break;
-	case GX_CTF_GB8:
-		WriteCC8Encoder(p, "gb", ApiType);
-		break;
-	case GX_TF_Z8:
-		WriteC8Encoder(p, "b", ApiType);
-		break;
-	case GX_TF_Z16:
-		WriteZ16Encoder(p, ApiType);
-		break;
-	case GX_TF_Z24X8:
-		WriteZ24Encoder(p, ApiType);
-		break;
-	case GX_CTF_Z4:
-		WriteC4Encoder(p, "b", ApiType);
-		break;
-	case GX_CTF_Z8M:
-		WriteZ8Encoder(p, "256.0f", ApiType);
-		break;
-	case GX_CTF_Z8L:
-		WriteZ8Encoder(p, "65536.0f" , ApiType);
-		break;
-	case GX_CTF_Z16L:
-		WriteZ16LEncoder(p, ApiType);
-		break;
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-
-	if (text[sizeof(text) - 1] != 0x7C)
-		PanicAlert("TextureConversionShader generator - buffer too small, canary has been eaten!");
-	
-#ifndef ANDROID
-	uselocale(old_locale); // restore locale
-	freelocale(locale);
-#endif
-	return text;
-}
-
-void SetShaderParameters(float width, float height, float offsetX, float offsetY, float widthStride, float heightStride,float buffW,float buffH)
-{
-	g_renderer->SetPSConstant4f(C_COLORMATRIX, widthStride, heightStride, buffW, buffH);
-	g_renderer->SetPSConstant4f(C_COLORMATRIX + 1, width, (height - 1), offsetX, offsetY);
-}
-
-}  // namespace
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.h b/Source/Core/VideoCommon/Src/TextureConversionShader.h
deleted file mode 100644
index aa42726b2c..0000000000
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURECONVERSIONSHADER_H_
-#define _TEXTURECONVERSIONSHADER_H_
-
-#include "Common.h"
-#include "TextureDecoder.h"
-#include "VideoCommon.h"
-
-namespace TextureConversionShader
-{
-u16 GetEncodedSampleCount(u32 format);
-
-const char *GenerateEncodingShader(u32 format, API_TYPE ApiType = API_OPENGL);
-
-void SetShaderParameters(float width, float height, float offsetX, float offsetY, float widthStride, float heightStride,float buffW = 0.0f,float buffH = 0.0f);
-
-}
-
-#endif // _TEXTURECONVERSIONSHADER_H_
-
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h
deleted file mode 100644
index 968570a084..0000000000
--- a/Source/Core/VideoCommon/Src/TextureDecoder.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTUREDECODER_H
-#define _TEXTUREDECODER_H
-#include "Hash.h"
-enum 
-{
-	TMEM_SIZE = 1024*1024,
-	TMEM_LINE_SIZE = 32,
-};
-extern  GC_ALIGNED16(u8 texMem[TMEM_SIZE]);
-
-enum TextureFormat
-{
-	GX_TF_I4     = 0x0,
-	GX_TF_I8     = 0x1,
-	GX_TF_IA4    = 0x2,
-	GX_TF_IA8    = 0x3,
-	GX_TF_RGB565 = 0x4,
-	GX_TF_RGB5A3 = 0x5,
-	GX_TF_RGBA8  = 0x6,
-	GX_TF_C4     = 0x8,
-	GX_TF_C8     = 0x9,
-	GX_TF_C14X2  = 0xA,
-	GX_TF_CMPR   = 0xE,
-
-	_GX_TF_CTF   = 0x20,  // copy-texture-format only (simply means linear?)
-	_GX_TF_ZTF   = 0x10,  // Z-texture-format
-
-	// these formats are also valid when copying targets
-	GX_CTF_R4    = 0x0 | _GX_TF_CTF,
-	GX_CTF_RA4   = 0x2 | _GX_TF_CTF,
-	GX_CTF_RA8   = 0x3 | _GX_TF_CTF,
-	GX_CTF_YUVA8 = 0x6 | _GX_TF_CTF,
-	GX_CTF_A8    = 0x7 | _GX_TF_CTF,
-	GX_CTF_R8    = 0x8 | _GX_TF_CTF,
-	GX_CTF_G8    = 0x9 | _GX_TF_CTF,
-	GX_CTF_B8    = 0xA | _GX_TF_CTF,
-	GX_CTF_RG8   = 0xB | _GX_TF_CTF,
-	GX_CTF_GB8   = 0xC | _GX_TF_CTF,
-
-	GX_TF_Z8     = 0x1 | _GX_TF_ZTF,
-	GX_TF_Z16    = 0x3 | _GX_TF_ZTF,
-	GX_TF_Z24X8  = 0x6 | _GX_TF_ZTF,
-
-	GX_CTF_Z4    = 0x0 | _GX_TF_ZTF | _GX_TF_CTF,
-	GX_CTF_Z8M   = 0x9 | _GX_TF_ZTF | _GX_TF_CTF,
-	GX_CTF_Z8L   = 0xA | _GX_TF_ZTF | _GX_TF_CTF,
-	GX_CTF_Z16L  = 0xC | _GX_TF_ZTF | _GX_TF_CTF,
-};
-
-int TexDecoder_GetTexelSizeInNibbles(int format);
-int TexDecoder_GetTextureSizeInBytes(int width, int height, int format);
-int TexDecoder_GetBlockWidthInTexels(u32 format);
-int TexDecoder_GetBlockHeightInTexels(u32 format);
-int TexDecoder_GetPaletteSize(int fmt);
-
-enum PC_TexFormat
-{
-	PC_TEX_FMT_NONE = 0,
-	PC_TEX_FMT_BGRA32,
-	PC_TEX_FMT_RGBA32,
-	PC_TEX_FMT_I4_AS_I8,
-	PC_TEX_FMT_IA4_AS_IA8,
-	PC_TEX_FMT_I8,
-	PC_TEX_FMT_IA8,
-	PC_TEX_FMT_RGB565,
-	PC_TEX_FMT_DXT1,
-};
-
-PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly = false);
-PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt);
-void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt);
-void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth);
-PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height);
-void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center);
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp
deleted file mode 100644
index 825e9c6558..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader.cpp
+++ /dev/null
@@ -1,739 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <assert.h>
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "VideoConfig.h"
-#include "MemoryUtil.h"
-#include "StringUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "PixelEngine.h"
-#include "Host.h"
-
-#include "LookUpTables.h"
-#include "Statistics.h"
-#include "VertexLoaderManager.h"
-#include "VertexLoader.h"
-#include "BPMemory.h"
-#include "DataReader.h"
-#include "VertexManagerBase.h"
-
-#include "VertexLoader_Position.h"
-#include "VertexLoader_Normal.h"
-#include "VertexLoader_Color.h"
-#include "VertexLoader_TextCoord.h"
-
-//BBox
-#include "XFMemory.h"
-extern float GC_ALIGNED16(g_fProjectionMatrix[16]);
-#ifndef _M_GENERIC
-#ifndef __APPLE__
-#define USE_JIT
-#endif
-#endif
-
-#define COMPILED_CODE_SIZE 4096
-
-NativeVertexFormat *g_nativeVertexFmt;
-
-#ifndef _WIN32
-	#undef inline
-	#define inline
-#endif
-
-// Matrix components are first in GC format but later in PC format - we need to store it temporarily
-// when decoding each vertex.
-static u8 s_curposmtx;
-static u8 s_curtexmtx[8];
-static int s_texmtxwrite = 0;
-static int s_texmtxread = 0;
-
-static int loop_counter;
-
-// Vertex loaders read these. Although the scale ones should be baked into the shader.
-int tcIndex;
-int colIndex;
-TVtxAttr* pVtxAttr;
-int colElements[2];
-float posScale;
-float tcScale[8];
-
-// bbox must read vertex position, so convert it to this buffer
-static float s_bbox_vertex_buffer[3];
-static u8 *s_bbox_pCurBufferPointer_orig;
-
-static const float fractionTable[32] = {
-	1.0f / (1U << 0), 1.0f / (1U << 1), 1.0f / (1U << 2), 1.0f / (1U << 3),
-	1.0f / (1U << 4), 1.0f / (1U << 5), 1.0f / (1U << 6), 1.0f / (1U << 7),
-	1.0f / (1U << 8), 1.0f / (1U << 9), 1.0f / (1U << 10), 1.0f / (1U << 11),
-	1.0f / (1U << 12), 1.0f / (1U << 13), 1.0f / (1U << 14), 1.0f / (1U << 15),
-	1.0f / (1U << 16), 1.0f / (1U << 17), 1.0f / (1U << 18), 1.0f / (1U << 19),
-	1.0f / (1U << 20), 1.0f / (1U << 21), 1.0f / (1U << 22), 1.0f / (1U << 23),
-	1.0f / (1U << 24), 1.0f / (1U << 25), 1.0f / (1U << 26), 1.0f / (1U << 27),
-	1.0f / (1U << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31),
-};
-
-using namespace Gen;
-
-void LOADERDECL PosMtx_ReadDirect_UByte()
-{
-	s_curposmtx = DataReadU8() & 0x3f;
-	PRIM_LOG("posmtx: %d, ", s_curposmtx);
-}
-
-void LOADERDECL PosMtx_Write()
-{
-	DataWrite<u8>(s_curposmtx);
-	DataWrite<u8>(0);
-	DataWrite<u8>(0);
-	DataWrite<u8>(0);
-}
-
-void LOADERDECL UpdateBoundingBoxPrepare() 
-{
-	if (!PixelEngine::bbox_active)
-		return;
-	
-	// set our buffer as videodata buffer, so we will get a copy of the vertex positions
-	// this is a big hack, but so we can use the same converting function then without bbox
-	s_bbox_pCurBufferPointer_orig = VertexManager::s_pCurBufferPointer;
-	VertexManager::s_pCurBufferPointer = (u8*)s_bbox_vertex_buffer;
-}
-
-void LOADERDECL UpdateBoundingBox() 
-{
-	if (!PixelEngine::bbox_active)
-		return;
-
-	// reset videodata pointer
-	VertexManager::s_pCurBufferPointer = s_bbox_pCurBufferPointer_orig;
-
-	// copy vertex pointers
-	memcpy(VertexManager::s_pCurBufferPointer, s_bbox_vertex_buffer, 12);
-	VertexManager::s_pCurBufferPointer += 12;
-
-	// We must transform the just loaded point by the current world and projection matrix - in software.
-	// Then convert to screen space and update the bounding box.
-	float p[3] = {s_bbox_vertex_buffer[0], s_bbox_vertex_buffer[1], s_bbox_vertex_buffer[2]};
-
-	const float *world_matrix  = (float*)xfmem + MatrixIndexA.PosNormalMtxIdx * 4;
-	const float *proj_matrix = &g_fProjectionMatrix[0];
-
-	float t[3];
-	t[0] = p[0] * world_matrix[0] + p[1] * world_matrix[1] + p[2] * world_matrix[2] + world_matrix[3];
-	t[1] = p[0] * world_matrix[4] + p[1] * world_matrix[5] + p[2] * world_matrix[6] + world_matrix[7];
-	t[2] = p[0] * world_matrix[8] + p[1] * world_matrix[9] + p[2] * world_matrix[10] + world_matrix[11];
-
-	float o[3];
-	o[0] = t[0] * proj_matrix[0]  + t[1] * proj_matrix[1]  + t[2] * proj_matrix[2] + proj_matrix[3];
-	o[1] = t[0] * proj_matrix[4]  + t[1] * proj_matrix[5]  + t[2] * proj_matrix[6] + proj_matrix[7];
-	o[2] = t[0] * proj_matrix[12] + t[1] * proj_matrix[13] + t[2] * proj_matrix[14] + proj_matrix[15];
-
-	o[0] /= o[2];
-	o[1] /= o[2];
-
-	// Max width seems to be 608, while max height is 480
-	// Here height is set to 484 as BBox bottom always seems to be off by a few pixels
-	o[0] = (o[0] + 1.0f) * 304.0f;
-	o[1] = (1.0f - o[1]) * 242.0f;
-
-	if (o[0] < PixelEngine::bbox[0]) PixelEngine::bbox[0] = (u16) std::max(0.0f, o[0]);
-	if (o[0] > PixelEngine::bbox[1]) PixelEngine::bbox[1] = (u16) o[0]; 
-	if (o[1] < PixelEngine::bbox[2]) PixelEngine::bbox[2] = (u16) std::max(0.0f, o[1]);
-	if (o[1] > PixelEngine::bbox[3]) PixelEngine::bbox[3] = (u16) o[1];
-}
-
-void LOADERDECL TexMtx_ReadDirect_UByte()
-{
-	s_curtexmtx[s_texmtxread] = DataReadU8() & 0x3f;
-	PRIM_LOG("texmtx%d: %d, ", s_texmtxread, s_curtexmtx[s_texmtxread]);
-	s_texmtxread++;
-}
-
-void LOADERDECL TexMtx_Write_Float()
-{
-	DataWrite(float(s_curtexmtx[s_texmtxwrite++]));
-}
-
-void LOADERDECL TexMtx_Write_Float2()
-{
-	DataWrite(0.f);
-	DataWrite(float(s_curtexmtx[s_texmtxwrite++]));
-}
-
-void LOADERDECL TexMtx_Write_Float4()
-{
-	DataWrite(0.f);
-	DataWrite(0.f);
-	DataWrite(float(s_curtexmtx[s_texmtxwrite++]));
-	// Just to fill out with 0.
-	DataWrite(0.f);
-}
-
-VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr) 
-{
-	m_compiledCode = NULL;
-	m_numLoadedVertices = 0;
-	m_VertexSize = 0;
-	m_numPipelineStages = 0;
-	m_NativeFmt = g_vertex_manager->CreateNativeVertexFormat();
-	loop_counter = 0;
-	VertexLoader_Normal::Init();
-	VertexLoader_Position::Init();
-	VertexLoader_TextCoord::Init();
-
-	m_VtxDesc = vtx_desc;
-	SetVAT(vtx_attr.g0.Hex, vtx_attr.g1.Hex, vtx_attr.g2.Hex);
-
-	#ifdef USE_JIT
-	AllocCodeSpace(COMPILED_CODE_SIZE);
-	CompileVertexTranslator();
-	WriteProtect();
-	#else
-	CompileVertexTranslator();
-	#endif
-
-}
-
-VertexLoader::~VertexLoader() 
-{
-	#ifdef USE_JIT
-	FreeCodeSpace();
-	#endif
-	delete m_NativeFmt;
-}
-
-void VertexLoader::CompileVertexTranslator()
-{
-	m_VertexSize = 0;
-	const TVtxAttr &vtx_attr = m_VtxAttr;
-
-#ifdef USE_JIT
-	if (m_compiledCode)
-		PanicAlert("Trying to recompile a vertex translator");
-
-	m_compiledCode = GetCodePtr();
-	ABI_PushAllCalleeSavedRegsAndAdjustStack();
-
-	// Start loop here
-	const u8 *loop_start = GetCodePtr();
-
-	// Reset component counters if present in vertex format only.
-	if (m_VtxDesc.Tex0Coord || m_VtxDesc.Tex1Coord || m_VtxDesc.Tex2Coord || m_VtxDesc.Tex3Coord ||
-		m_VtxDesc.Tex4Coord || m_VtxDesc.Tex5Coord || m_VtxDesc.Tex6Coord || m_VtxDesc.Tex7Coord)
-	{
-		WriteSetVariable(32, &tcIndex, Imm32(0));
-	}
-	if (m_VtxDesc.Color0 || m_VtxDesc.Color1)
-	{
-		WriteSetVariable(32, &colIndex, Imm32(0));
-	}
-	if (m_VtxDesc.Tex0MatIdx || m_VtxDesc.Tex1MatIdx || m_VtxDesc.Tex2MatIdx || m_VtxDesc.Tex3MatIdx ||
-		m_VtxDesc.Tex4MatIdx || m_VtxDesc.Tex5MatIdx || m_VtxDesc.Tex6MatIdx || m_VtxDesc.Tex7MatIdx)
-	{
-		WriteSetVariable(32, &s_texmtxwrite, Imm32(0));
-		WriteSetVariable(32, &s_texmtxread, Imm32(0));
-	}
-#endif
-
-	// Colors
-	const u32 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
-	// TextureCoord
-	// Since m_VtxDesc.Text7Coord is broken across a 32 bit word boundary, retrieve its value manually.
-	// If we didn't do this, the vertex format would be read as one bit offset from where it should be, making
-	// 01 become 00, and 10/11 become 01
-	const u32 tc[8] = {
-		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
-		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const u32)((m_VtxDesc.Hex >> 31) & 3)
-	};
-	
-	// Reset pipeline
-	m_numPipelineStages = 0;
-
-	// It's a bit ugly that we poke inside m_NativeFmt in this function. Planning to fix this.
-	m_NativeFmt->m_components = 0;
-
-	// Position in pc vertex format.
-	int nat_offset = 0;
-	PortableVertexDeclaration vtx_decl;
-	memset(&vtx_decl, 0, sizeof(vtx_decl));
-	for (int i = 0; i < 8; i++)
-	{
-		vtx_decl.texcoord_offset[i] = -1;
-	}
-
-	// m_VBVertexStride for texmtx and posmtx is computed later when writing.
-	
-	// Position Matrix Index
-	if (m_VtxDesc.PosMatIdx)
-	{
-		WriteCall(PosMtx_ReadDirect_UByte);
-		m_NativeFmt->m_components |= VB_HAS_POSMTXIDX;
-		m_VertexSize += 1;
-	}
-
-	if (m_VtxDesc.Tex0MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX0; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex1MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX1; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex2MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX2; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex3MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX3; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex4MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX4; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex5MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX5; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex6MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX6; WriteCall(TexMtx_ReadDirect_UByte); }
-	if (m_VtxDesc.Tex7MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX7; WriteCall(TexMtx_ReadDirect_UByte); }
-
-	// Write vertex position loader
-	if(g_ActiveConfig.bUseBBox)
-	{
-		WriteCall(UpdateBoundingBoxPrepare);
-		WriteCall(VertexLoader_Position::GetFunction(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements));
-		WriteCall(UpdateBoundingBox);
-	}
-	else
-	{
-		WriteCall(VertexLoader_Position::GetFunction(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements));
-	}
-	m_VertexSize += VertexLoader_Position::GetSize(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements);
-	nat_offset += 12;
-
-	// Normals
-	vtx_decl.num_normals = 0;
-	if (m_VtxDesc.Normal != NOT_PRESENT)
-	{
-		m_VertexSize += VertexLoader_Normal::GetSize(m_VtxDesc.Normal,
-			m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
-		
-		TPipelineFunction pFunc = VertexLoader_Normal::GetFunction(m_VtxDesc.Normal,
-			m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
-
-		if (pFunc == 0)
-		{
-			char temp[256];
-			sprintf(temp,"%i %i %i %i", m_VtxDesc.Normal, m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
-			Host_SysMessage("VertexLoader_Normal::GetFunction returned zero!");
-		}
-		WriteCall(pFunc);
-
-		vtx_decl.num_normals = vtx_attr.NormalElements ? 3 : 1;
-		vtx_decl.normal_offset[0] = -1;
-		vtx_decl.normal_offset[1] = -1;
-		vtx_decl.normal_offset[2] = -1;
-		vtx_decl.normal_gl_type = VAR_FLOAT;
-		vtx_decl.normal_gl_size = 3;
-		vtx_decl.normal_offset[0] = nat_offset;
-		nat_offset += 12;
-
-		if (vtx_attr.NormalElements)
-		{
-			vtx_decl.normal_offset[1] = nat_offset;
-			nat_offset += 12;
-			vtx_decl.normal_offset[2] = nat_offset;
-			nat_offset += 12;
-		}
-
-		int numNormals = (m_VtxAttr.NormalElements == 1) ? NRM_THREE : NRM_ONE;
-		m_NativeFmt->m_components |= VB_HAS_NRM0;
-
-		if (numNormals == NRM_THREE)
-			m_NativeFmt->m_components |= VB_HAS_NRM1 | VB_HAS_NRM2;
-	}
-
-	vtx_decl.color_gl_type = VAR_UNSIGNED_BYTE;
-	vtx_decl.color_offset[0] = -1;
-	vtx_decl.color_offset[1] = -1;
-	for (int i = 0; i < 2; i++)
-	{
-		m_NativeFmt->m_components |= VB_HAS_COL0 << i;
-		switch (col[i])
-		{
-		case NOT_PRESENT: 
-			m_NativeFmt->m_components &= ~(VB_HAS_COL0 << i);
-			vtx_decl.color_offset[i] = -1;
-			break;
-		case DIRECT:
-			switch (m_VtxAttr.color[i].Comp)
-			{
-			case FORMAT_16B_565:	m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_565); break;
-			case FORMAT_24B_888:	m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_888); break;
-			case FORMAT_32B_888x:	m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_888x); break;
-			case FORMAT_16B_4444:	m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_4444); break;
-			case FORMAT_24B_6666:	m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_6666); break;
-			case FORMAT_32B_8888:	m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			break;
-		case INDEX8:
-			m_VertexSize += 1;
-			switch (m_VtxAttr.color[i].Comp)
-			{
-			case FORMAT_16B_565:	WriteCall(Color_ReadIndex8_16b_565); break;
-			case FORMAT_24B_888:	WriteCall(Color_ReadIndex8_24b_888); break;
-			case FORMAT_32B_888x:	WriteCall(Color_ReadIndex8_32b_888x); break;
-			case FORMAT_16B_4444:	WriteCall(Color_ReadIndex8_16b_4444); break;
-			case FORMAT_24B_6666:	WriteCall(Color_ReadIndex8_24b_6666); break;
-			case FORMAT_32B_8888:	WriteCall(Color_ReadIndex8_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			break;
-		case INDEX16:
-			m_VertexSize += 2;
-			switch (m_VtxAttr.color[i].Comp)
-			{
-			case FORMAT_16B_565:	WriteCall(Color_ReadIndex16_16b_565); break;
-			case FORMAT_24B_888:	WriteCall(Color_ReadIndex16_24b_888); break;
-			case FORMAT_32B_888x:	WriteCall(Color_ReadIndex16_32b_888x); break;
-			case FORMAT_16B_4444:	WriteCall(Color_ReadIndex16_16b_4444); break;
-			case FORMAT_24B_6666:	WriteCall(Color_ReadIndex16_24b_6666); break;
-			case FORMAT_32B_8888:	WriteCall(Color_ReadIndex16_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			break;
-		}
-		// Common for the three bottom cases
-		if (col[i] != NOT_PRESENT)
-		{
-			vtx_decl.color_offset[i] = nat_offset;
-			nat_offset += 4;
-		}
-	}
-
-	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
-	for (int i = 0; i < 8; i++)
-	{
-		vtx_decl.texcoord_offset[i] = -1;
-		const int format = m_VtxAttr.texCoord[i].Format;
-		const int elements = m_VtxAttr.texCoord[i].Elements;
-
-		if (tc[i] == NOT_PRESENT)
-		{
-			m_NativeFmt->m_components &= ~(VB_HAS_UV0 << i);
-		}
-		else
-		{
-			_assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", tc[i]);
-			_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
-			_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
-
-			m_NativeFmt->m_components |= VB_HAS_UV0 << i;
-			WriteCall(VertexLoader_TextCoord::GetFunction(tc[i], format, elements));
-			m_VertexSize += VertexLoader_TextCoord::GetSize(tc[i], format, elements);
-		}
-
-		if (m_NativeFmt->m_components & (VB_HAS_TEXMTXIDX0 << i))
-		{
-			if (tc[i] != NOT_PRESENT)
-			{
-				// if texmtx is included, texcoord will always be 3 floats, z will be the texmtx index
-				vtx_decl.texcoord_offset[i] = nat_offset;
-				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
-				vtx_decl.texcoord_size[i] = 3;
-				nat_offset += 12;
-				WriteCall(m_VtxAttr.texCoord[i].Elements ? TexMtx_Write_Float : TexMtx_Write_Float2);
-			}
-			else
-			{
-				m_NativeFmt->m_components |= VB_HAS_UV0 << i; // have to include since using now
-				vtx_decl.texcoord_offset[i] = nat_offset;
-				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
-				vtx_decl.texcoord_size[i] = 4;
-				nat_offset += 16; // still include the texture coordinate, but this time as 6 + 2 bytes
-				WriteCall(TexMtx_Write_Float4);
-			}
-		}
-		else
-		{
-			if (tc[i] != NOT_PRESENT)
-			{
-				vtx_decl.texcoord_offset[i] = nat_offset;
-				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
-				vtx_decl.texcoord_size[i] = vtx_attr.texCoord[i].Elements ? 2 : 1;
-				nat_offset += 4 * (vtx_attr.texCoord[i].Elements ? 2 : 1);
-			}
-		}
-
-		if (tc[i] == NOT_PRESENT)
-		{
-			// if there's more tex coords later, have to write a dummy call 
-			int j = i + 1;
-			for (; j < 8; ++j)
-			{
-				if (tc[j] != NOT_PRESENT)
-				{
-					WriteCall(VertexLoader_TextCoord::GetDummyFunction()); // important to get indices right!
-					break;
-				}
-			}
-			// tricky!
-			if (j == 8 && !((m_NativeFmt->m_components & VB_HAS_TEXMTXIDXALL) & (VB_HAS_TEXMTXIDXALL << (i + 1))))
-			{
-				// no more tex coords and tex matrices, so exit loop
-				break;
-			}
-		}
-	}
-
-	if (m_VtxDesc.PosMatIdx)
-	{
-		WriteCall(PosMtx_Write);
-		vtx_decl.posmtx_offset = nat_offset;
-		nat_offset += 4;
-	}
-	else
-	{
-		vtx_decl.posmtx_offset = -1;
-	}
-
-	native_stride = nat_offset;
-	vtx_decl.stride = native_stride;
-
-#ifdef USE_JIT
-	// End loop here
-#ifdef _M_X64
-	MOV(64, R(RAX), Imm64((u64)&loop_counter));
-	SUB(32, MatR(RAX), Imm8(1));
-#else
-	SUB(32, M(&loop_counter), Imm8(1));
-#endif
-
-	J_CC(CC_NZ, loop_start, true);
-	ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	RET();
-#endif
-	m_NativeFmt->Initialize(vtx_decl);
-}
-
-void VertexLoader::WriteCall(TPipelineFunction func)
-{
-#ifdef USE_JIT
-#ifdef _M_X64
-	MOV(64, R(RAX), Imm64((u64)func));
-	CALLptr(R(RAX));
-#else
-	CALL((void*)func);
-#endif
-#else
-	m_PipelineStages[m_numPipelineStages++] = func;
-#endif
-}
-// ARMTODO: This should be done in a better way
-#ifndef _M_GENERIC
-void VertexLoader::WriteGetVariable(int bits, OpArg dest, void *address)
-{
-#ifdef USE_JIT
-#ifdef _M_X64
-	MOV(64, R(RAX), Imm64((u64)address));
-	MOV(bits, dest, MatR(RAX));
-#else
-	MOV(bits, dest, M(address));
-#endif
-#endif
-}
-
-void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value)
-{
-#ifdef USE_JIT
-#ifdef _M_X64
-	MOV(64, R(RAX), Imm64((u64)address));
-	MOV(bits, MatR(RAX), value);
-#else
-	MOV(bits, M(address), value);
-#endif
-#endif
-}
-#endif
-
-int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count)
-{
-	m_numLoadedVertices += count;
-
-	// Flush if our vertex format is different from the currently set.
-	if (g_nativeVertexFmt != NULL && g_nativeVertexFmt != m_NativeFmt)
-	{
-		// We really must flush here. It's possible that the native representations
-		// of the two vtx formats are the same, but we have no way to easily check that 
-		// now. 
-		VertexManager::Flush();
-		// Also move the Set() here?
-	}
-	g_nativeVertexFmt = m_NativeFmt;
-
-	if (bpmem.genMode.cullmode == 3 && primitive < 5)
-	{
-		// if cull mode is none, ignore triangles and quads
-		DataSkip(count * m_VertexSize);
-		return 0;
-	}
-
-	m_NativeFmt->EnableComponents(m_NativeFmt->m_components);
-
-	// Load position and texcoord scale factors.
-	m_VtxAttr.PosFrac				= g_VtxAttr[vtx_attr_group].g0.PosFrac;
-	m_VtxAttr.texCoord[0].Frac		= g_VtxAttr[vtx_attr_group].g0.Tex0Frac;
-	m_VtxAttr.texCoord[1].Frac		= g_VtxAttr[vtx_attr_group].g1.Tex1Frac;
-	m_VtxAttr.texCoord[2].Frac		= g_VtxAttr[vtx_attr_group].g1.Tex2Frac;
-	m_VtxAttr.texCoord[3].Frac		= g_VtxAttr[vtx_attr_group].g1.Tex3Frac;
-	m_VtxAttr.texCoord[4].Frac		= g_VtxAttr[vtx_attr_group].g2.Tex4Frac;
-	m_VtxAttr.texCoord[5].Frac		= g_VtxAttr[vtx_attr_group].g2.Tex5Frac;
-	m_VtxAttr.texCoord[6].Frac		= g_VtxAttr[vtx_attr_group].g2.Tex6Frac;
-	m_VtxAttr.texCoord[7].Frac		= g_VtxAttr[vtx_attr_group].g2.Tex7Frac;
-
-	pVtxAttr = &m_VtxAttr;
-	posScale = fractionTable[m_VtxAttr.PosFrac];
-	if (m_NativeFmt->m_components & VB_HAS_UVALL)
-		for (int i = 0; i < 8; i++)
-			tcScale[i] = fractionTable[m_VtxAttr.texCoord[i].Frac];
-	for (int i = 0; i < 2; i++)
-		colElements[i] = m_VtxAttr.color[i].Elements;
-
-	VertexManager::PrepareForAdditionalData(primitive, count, native_stride);
-	
-	return count;
-}
-
-void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count)
-{
-	auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count);
-	ConvertVertices(new_count);
-	VertexManager::AddVertices(primitive, new_count);
-}
-
-void VertexLoader::ConvertVertices ( int count )
-{
-#ifdef USE_JIT
-	if (count > 0)
-	{
-		loop_counter = count;
-		((void (*)())(void*)m_compiledCode)();
-	}
-#else
-	for (int s = 0; s < count; s++)
-	{
-		tcIndex = 0;
-		colIndex = 0;
-		s_texmtxwrite = s_texmtxread = 0;
-		for (int i = 0; i < m_numPipelineStages; i++)
-			m_PipelineStages[i]();
-		PRIM_LOG("\n");
-	}
-#endif
-}
-
-void VertexLoader::RunCompiledVertices(int vtx_attr_group, int primitive, int const count, u8* Data)
-{
-	auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count);
-
-	memcpy_gc(VertexManager::s_pCurBufferPointer, Data, native_stride * new_count);
-	VertexManager::s_pCurBufferPointer += native_stride * new_count;
-	DataSkip(new_count * m_VertexSize);
-
-	VertexManager::AddVertices(primitive, new_count);	
-}
-
-void VertexLoader::SetVAT(u32 _group0, u32 _group1, u32 _group2) 
-{
-	VAT vat;
-	vat.g0.Hex = _group0;
-	vat.g1.Hex = _group1;
-	vat.g2.Hex = _group2;
-
-	m_VtxAttr.PosElements			= vat.g0.PosElements;
-	m_VtxAttr.PosFormat				= vat.g0.PosFormat;
-	m_VtxAttr.PosFrac				= vat.g0.PosFrac;
-	m_VtxAttr.NormalElements		= vat.g0.NormalElements;
-	m_VtxAttr.NormalFormat			= vat.g0.NormalFormat;
-	m_VtxAttr.color[0].Elements		= vat.g0.Color0Elements;
-	m_VtxAttr.color[0].Comp			= vat.g0.Color0Comp;
-	m_VtxAttr.color[1].Elements		= vat.g0.Color1Elements;
-	m_VtxAttr.color[1].Comp			= vat.g0.Color1Comp;
-	m_VtxAttr.texCoord[0].Elements	= vat.g0.Tex0CoordElements;
-	m_VtxAttr.texCoord[0].Format	= vat.g0.Tex0CoordFormat;
-	m_VtxAttr.texCoord[0].Frac		= vat.g0.Tex0Frac;
-	m_VtxAttr.ByteDequant			= vat.g0.ByteDequant;
-	m_VtxAttr.NormalIndex3			= vat.g0.NormalIndex3;
-
-	m_VtxAttr.texCoord[1].Elements	= vat.g1.Tex1CoordElements;
-	m_VtxAttr.texCoord[1].Format	= vat.g1.Tex1CoordFormat;
-	m_VtxAttr.texCoord[1].Frac		= vat.g1.Tex1Frac;
-	m_VtxAttr.texCoord[2].Elements	= vat.g1.Tex2CoordElements;
-	m_VtxAttr.texCoord[2].Format	= vat.g1.Tex2CoordFormat;
-	m_VtxAttr.texCoord[2].Frac		= vat.g1.Tex2Frac;
-	m_VtxAttr.texCoord[3].Elements	= vat.g1.Tex3CoordElements;
-	m_VtxAttr.texCoord[3].Format	= vat.g1.Tex3CoordFormat;
-	m_VtxAttr.texCoord[3].Frac		= vat.g1.Tex3Frac;
-	m_VtxAttr.texCoord[4].Elements	= vat.g1.Tex4CoordElements;
-	m_VtxAttr.texCoord[4].Format	= vat.g1.Tex4CoordFormat;
-
-	m_VtxAttr.texCoord[4].Frac		= vat.g2.Tex4Frac;
-	m_VtxAttr.texCoord[5].Elements	= vat.g2.Tex5CoordElements;
-	m_VtxAttr.texCoord[5].Format	= vat.g2.Tex5CoordFormat;
-	m_VtxAttr.texCoord[5].Frac		= vat.g2.Tex5Frac;
-	m_VtxAttr.texCoord[6].Elements	= vat.g2.Tex6CoordElements;
-	m_VtxAttr.texCoord[6].Format	= vat.g2.Tex6CoordFormat;
-	m_VtxAttr.texCoord[6].Frac		= vat.g2.Tex6Frac;
-	m_VtxAttr.texCoord[7].Elements	= vat.g2.Tex7CoordElements;
-	m_VtxAttr.texCoord[7].Format	= vat.g2.Tex7CoordFormat;
-	m_VtxAttr.texCoord[7].Frac		= vat.g2.Tex7Frac;
-	
-	if(!m_VtxAttr.ByteDequant) {
-		ERROR_LOG(VIDEO, "ByteDequant is set to zero");
-	}
-};
-
-void VertexLoader::AppendToString(std::string *dest) const
-{
-	dest->reserve(250);
-	static const char *posMode[4] = {
-		"Inv",
-		"Dir",
-		"I8",
-		"I16",
-	};
-	static const char *posFormats[5] = {
-		"u8", "s8", "u16", "s16", "flt",
-	};
-	static const char *colorFormat[8] = {
-		"565",
-		"888",
-		"888x",
-		"4444",
-		"6666",
-		"8888",
-		"Inv",
-		"Inv",
-	};
-
-	dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ",
-		m_VertexSize, m_VtxDesc.PosMatIdx,
-		m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat]));
-
-	if (m_VtxDesc.Normal)
-	{
-		dest->append(StringFromFormat("Nrm: %i %s-%s ",
-			m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat]));
-	}
-
-	u32 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
-	for (int i = 0; i < 2; i++)
-	{
-		if (color_mode[i])
-		{
-			dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp]));
-		}
-	}
-	u32 tex_mode[8] = {
-		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, 
-		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord
-	};
-	for (int i = 0; i < 8; i++)
-	{
-		if (tex_mode[i])
-		{
-			dest->append(StringFromFormat("T%i: %i %s-%s ",
-				i, m_VtxAttr.texCoord[i].Elements, posMode[tex_mode[i]], posFormats[m_VtxAttr.texCoord[i].Format]));
-		}
-	}
-	dest->append(StringFromFormat(" - %i v\n", m_numLoadedVertices));
-}
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h
deleted file mode 100644
index 06c5508040..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXLOADER_H
-#define _VERTEXLOADER_H
-
-// Top vertex loaders
-// Metroid Prime: P I16-flt N I16-s16 T0 I16-u16 T1 i16-flt
-
-#include <algorithm>
-#include <string>
-
-#include "Common.h"
-
-#include "CPMemory.h"
-#include "DataReader.h"
-#include "NativeVertexFormat.h"
-
-#include "x64Emitter.h"
-
-class VertexLoaderUID
-{
-	u32 vid[5];
-	size_t hash;
-public:
-	VertexLoaderUID() 
-	{
-	}
-
-	void InitFromCurrentState(int vtx_attr_group)
-	{
-		vid[0] = g_VtxDesc.Hex & 0xFFFFFFFF;
-		vid[1] = g_VtxDesc.Hex >> 32;
-		vid[2] = g_VtxAttr[vtx_attr_group].g0.Hex & ~VAT_0_FRACBITS;
-		vid[3] = g_VtxAttr[vtx_attr_group].g1.Hex & ~VAT_1_FRACBITS;
-		vid[4] = g_VtxAttr[vtx_attr_group].g2.Hex & ~VAT_2_FRACBITS;
-		hash = CalculateHash();
-	}
-
-	bool operator < (const VertexLoaderUID &other) const
-	{
-		// This is complex because of speed.
-		if (vid[0] < other.vid[0])
-			return true;
-		else if (vid[0] > other.vid[0])
-			return false;
-
-		for (int i = 1; i < 5; ++i)
-		{
-			if (vid[i] < other.vid[i])
-				return true;
-			else if (vid[i] > other.vid[i])
-				return false;
-		}
-
-		return false;
-	}
-
-	bool operator == (const VertexLoaderUID& rh) const
-	{
-		return hash == rh.hash && std::equal(vid, vid + sizeof(vid) / sizeof(vid[0]), rh.vid);
-	}
-
-	size_t GetHash() const
-	{
-		return hash;
-	}
-
-private:
-
-	size_t CalculateHash()
-	{
-		size_t h = -1;
-
-		for (unsigned int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i)
-		{
-			h = h * 137 + vid[i];
-		}
-
-		return h;
-	}
-};
-
-// ARMTODO: This should be done in a better way
-#ifndef _M_GENERIC
-class VertexLoader : public Gen::XCodeBlock, NonCopyable
-#else
-class VertexLoader
-#endif
-{
-public:
-	VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr);
-	~VertexLoader();
-
-	int GetVertexSize() const {return m_VertexSize;}
-	
-	int SetupRunVertices(int vtx_attr_group, int primitive, int const count);
-	void RunVertices(int vtx_attr_group, int primitive, int count);
-	void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data);
-
-	// For debugging / profiling
-	void AppendToString(std::string *dest) const;
-	int GetNumLoadedVerts() const { return m_numLoadedVertices; }
-
-private:
-	enum
-	{
-		NRM_ZERO = 0,
-		NRM_ONE = 1,
-		NRM_THREE = 3,
-	};
-
-	int m_VertexSize;      // number of bytes of a raw GC vertex. Computed by CompileVertexTranslator.
-
-	// GC vertex format
-	TVtxAttr m_VtxAttr;  // VAT decoded into easy format
-	TVtxDesc m_VtxDesc;  // Not really used currently - or well it is, but could be easily avoided.
-
-	// PC vertex format
-	NativeVertexFormat *m_NativeFmt;
-	int native_stride;
-
-	// Pipeline. To be JIT compiled in the future.
-	TPipelineFunction m_PipelineStages[64];  // TODO - figure out real max. it's lower.
-	int m_numPipelineStages;
-
-	const u8 *m_compiledCode;
-
-	int m_numLoadedVertices;
-
-	void SetVAT(u32 _group0, u32 _group1, u32 _group2);
-
-	void CompileVertexTranslator();
-	void ConvertVertices(int count);
-
-	void WriteCall(TPipelineFunction);
-
-#ifndef _M_GENERIC
-	void WriteGetVariable(int bits, Gen::OpArg dest, void *address);
-	void WriteSetVariable(int bits, void *address, Gen::OpArg dest);
-#endif
-};
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
deleted file mode 100644
index 856b5d9fa5..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <algorithm>
-#include <unordered_map>
-#include <vector>
-
-#include "VideoCommon.h"
-#include "Statistics.h"
-
-#include "VertexShaderManager.h"
-#include "VertexLoader.h"
-#include "VertexLoaderManager.h"
-#include "HW/Memmap.h"
-
-static int s_attr_dirty;  // bitfield
-
-static VertexLoader *g_VertexLoaders[8];
-
-namespace std
-{
-
-template <>
-struct hash<VertexLoaderUID>
-{
-	size_t operator()(const VertexLoaderUID& uid) const
-	{
-		return uid.GetHash();
-	}
-};
-
-}
-
-typedef std::unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
-
-namespace VertexLoaderManager
-{
-
-static VertexLoaderMap g_VertexLoaderMap;
-// TODO - change into array of pointers. Keep a map of all seen so far.
-
-void Init()
-{
-	MarkAllDirty();
-	for (int i = 0; i < 8; i++)
-		g_VertexLoaders[i] = NULL;
-	RecomputeCachedArraybases();
-}
-
-void Shutdown()
-{
-	for (VertexLoaderMap::iterator iter = g_VertexLoaderMap.begin(); iter != g_VertexLoaderMap.end(); ++iter)
-	{
-		delete iter->second;
-	}
-	g_VertexLoaderMap.clear();
-}
-
-namespace
-{
-struct entry
-{
-	std::string text;
-	u64 num_verts;
-	bool operator < (const entry &other) const
-	{
-		return num_verts > other.num_verts;
-	}
-};
-}
-
-void AppendListToString(std::string *dest)
-{
-	std::vector<entry> entries;
-
-	size_t total_size = 0;
-	for (VertexLoaderMap::const_iterator iter = g_VertexLoaderMap.begin(); iter != g_VertexLoaderMap.end(); ++iter)
-	{
-		entry e;
-		iter->second->AppendToString(&e.text);
-		e.num_verts = iter->second->GetNumLoadedVerts();
-		entries.push_back(e);
-		total_size += e.text.size() + 1;
-	}
-	sort(entries.begin(), entries.end());
-	dest->reserve(dest->size() + total_size);
-	for (std::vector<entry>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter)
-	{
-		dest->append(iter->text);
-	}
-}
-
-void MarkAllDirty()
-{
-	s_attr_dirty = 0xff;
-}
-
-static void RefreshLoader(int vtx_attr_group)
-{
-	if ((s_attr_dirty >> vtx_attr_group) & 1)
-	{
-		VertexLoaderUID uid;
-		uid.InitFromCurrentState(vtx_attr_group);
-		VertexLoaderMap::iterator iter = g_VertexLoaderMap.find(uid);
-		if (iter != g_VertexLoaderMap.end())
-		{
-			g_VertexLoaders[vtx_attr_group] = iter->second;
-		}
-		else
-		{
-			VertexLoader *loader = new VertexLoader(g_VtxDesc, g_VtxAttr[vtx_attr_group]);
-			g_VertexLoaderMap[uid] = loader;
-			g_VertexLoaders[vtx_attr_group] = loader;
-			INCSTAT(stats.numVertexLoaders);
-		}
-	}
-	s_attr_dirty &= ~(1 << vtx_attr_group);
-}
-
-void RunVertices(int vtx_attr_group, int primitive, int count)
-{
-	if (!count)
-		return;
-
-	RefreshLoader(vtx_attr_group);
-	g_VertexLoaders[vtx_attr_group]->RunVertices(vtx_attr_group, primitive, count);
-}
-
-void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data)
-{
-	if (!count || !Data)
-		return;
-	RefreshLoader(vtx_attr_group);
-	g_VertexLoaders[vtx_attr_group]->RunCompiledVertices(vtx_attr_group, primitive, count,Data);
-}
-
-int GetVertexSize(int vtx_attr_group)
-{
-	RefreshLoader(vtx_attr_group);
-	return g_VertexLoaders[vtx_attr_group]->GetVertexSize();
-}
-
-}  // namespace
-
-void LoadCPReg(u32 sub_cmd, u32 value)
-{
-	switch (sub_cmd & 0xF0)
-	{
-	case 0x30:
-		VertexShaderManager::SetTexMatrixChangedA(value);
-		break;
-
-	case 0x40:
-		VertexShaderManager::SetTexMatrixChangedB(value);
-		break;
-
-	case 0x50:
-		g_VtxDesc.Hex &= ~0x1FFFF;  // keep the Upper bits
-		g_VtxDesc.Hex |= value;
-		s_attr_dirty = 0xFF;
-		break;
-
-	case 0x60:
-		g_VtxDesc.Hex &= 0x1FFFF;  // keep the lower 17Bits
-		g_VtxDesc.Hex |= (u64)value << 17;
-		s_attr_dirty = 0xFF;
-		break;
-
-	case 0x70:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g0.Hex = value;
-		s_attr_dirty |= 1 << (sub_cmd & 7);
-		break;
-
-	case 0x80:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g1.Hex = value;
-		s_attr_dirty |= 1 << (sub_cmd & 7);
-		break;
-
-	case 0x90:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g2.Hex = value;
-		s_attr_dirty |= 1 << (sub_cmd & 7);
-		break;
-
-	// Pointers to vertex arrays in GC RAM
-	case 0xA0:
-		arraybases[sub_cmd & 0xF] = value;
-		cached_arraybases[sub_cmd & 0xF] = Memory::GetPointer(value);
-		break;
-
-	case 0xB0:
-		arraystrides[sub_cmd & 0xF] = value & 0xFF;
-		break;
-	}
-}
-
-void FillCPMemoryArray(u32 *memory)
-{
-	memory[0x30] = MatrixIndexA.Hex;
-	memory[0x40] = MatrixIndexB.Hex;
-	memory[0x50] = (u32)g_VtxDesc.Hex;
-	memory[0x60] = (u32)(g_VtxDesc.Hex >> 17);
-
-	for (int i = 0; i < 8; ++i)
-	{
-		memory[0x70 + i] = g_VtxAttr[i].g0.Hex;
-		memory[0x80 + i] = g_VtxAttr[i].g1.Hex;
-		memory[0x90 + i] = g_VtxAttr[i].g2.Hex;
-	}
-
-	for (int i = 0; i < 16; ++i)
-	{
-		memory[0xA0 + i] = arraybases[i];
-		memory[0xB0 + i] = arraystrides[i];
-	}
-}
-
-void RecomputeCachedArraybases()
-{
-	for (int i = 0; i < 16; i++)
-	{
-		cached_arraybases[i] = Memory::GetPointer(arraybases[i]);
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.h b/Source/Core/VideoCommon/Src/VertexLoaderManager.h
deleted file mode 100644
index ca795f0d18..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoaderManager.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXLOADERMANAGER_H
-#define _VERTEXLOADERMANAGER_H
-
-#include "Common.h"
-#include <string>
-
-namespace VertexLoaderManager
-{
-	void Init();
-	void Shutdown();
-
-	void MarkAllDirty();
-
-	int GetVertexSize(int vtx_attr_group);
-	void RunVertices(int vtx_attr_group, int primitive, int count);
-	void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data);
-
-	// For debugging
-	void AppendListToString(std::string *dest);
-};
-
-void RecomputeCachedArraybases();
-
-#endif  // _VERTEXLOADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
deleted file mode 100644
index 45af21138f..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "LookUpTables.h"
-#include "VertexLoader.h"
-#include "VertexLoader_Color.h"
-#include "VertexManagerBase.h"
-
-#define RSHIFT 0
-#define GSHIFT 8
-#define BSHIFT 16
-#define ASHIFT 24
-#define AMASK 0xFF000000
-
-extern int colIndex;
-extern int colElements[2];
-
-
-__forceinline void _SetCol(u32 val)
-{
-	DataWrite(val);
-	colIndex++;
-}
-
-//color comes in format BARG in 16 bits
-//BARG -> AABBGGRR
-__forceinline void _SetCol4444(u16 val)
-{
-	u32 col = (val & 0xF0);				// col  = 000000R0;
-	col |=    (val & 0xF ) << 12;		// col |= 0000G000;
-	col |= (((u32)val) & 0xF000) << 8;	// col |= 00B00000;
-	col |= (((u32)val) & 0x0F00) << 20;	// col |= A0000000;
-	col |= col >> 4;					// col =  A0B0G0R0 | 0A0B0G0R;
-	_SetCol(col);
-}
-
-//color comes in format RGBA
-//RRRRRRGG GGGGBBBB BBAAAAAA
-__forceinline void _SetCol6666(u32 val)
-{
-	u32 col = (val >> 16) & 0xFC;
-	col |=    (val >>  2) & 0xFC00;
-	col |=    (val << 12) & 0xFC0000;
-	col |=    (val << 26) & 0xFC000000;
-	col |=    (col >>  6) & 0x03030303;
-	_SetCol(col);
-}
-
-//color comes in RGB
-//RRRRRGGG GGGBBBBB
-__forceinline void _SetCol565(u16 val)
-{
-	u32 col =   (val  >>  8) & 0xF8;
-	col |=      (val  <<  5) & 0xFC00;
-	col |=(((u32)val) << 19) & 0xF80000;
-	col |= (col >> 5) & 0x070007;
-	col |= (col >> 6) & 0x000300;
-	_SetCol(col | AMASK);
-}
-
-__forceinline u32 _Read24(const u8 *addr)
-{
-	return (*(const u32 *)addr) | AMASK;
-}
-
-__forceinline u32 _Read32(const u8 *addr)
-{
-	return *(const u32 *)addr;
-}
-
-
-void LOADERDECL Color_ReadDirect_24b_888()
-{
-	_SetCol(_Read24(DataGetPosition()));
-	DataSkip(3);
-}
-
-void LOADERDECL Color_ReadDirect_32b_888x()
-{
-	_SetCol(_Read24(DataGetPosition()));
-	DataSkip(4);
-}
-void LOADERDECL Color_ReadDirect_16b_565()
-{
-	_SetCol565(DataReadU16());
-}
-void LOADERDECL Color_ReadDirect_16b_4444()
-{
-	_SetCol4444(*(u16*)DataGetPosition());
-	DataSkip(2);
-}
-void LOADERDECL Color_ReadDirect_24b_6666()
-{
-	_SetCol6666(Common::swap32(DataGetPosition() - 1));
-	DataSkip(3);
-}
-// F|RES: i am not 100 percent sure, but the colElements seems to be important for rendering only
-// at least it fixes mario party 4
-//
-//	if (colElements[colIndex])	
-//	else
-//		col |= 0xFF<<ASHIFT;
-//
-void LOADERDECL Color_ReadDirect_32b_8888()
-{
-	// TODO (mb2): check this
-	u32 col = DataReadU32Unswapped();
-
-	// "kill" the alpha
-	if (!colElements[colIndex])	
-		col |= 0xFF << ASHIFT;
-
-	_SetCol(col);
-}
-
-template <typename I>
-void Color_ReadIndex_16b_565()
-{
-	auto const Index = DataRead<I>();
-	u16 val = Common::swap16(*(const u16 *)(cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex])));
-	_SetCol565(val);
-}
-
-template <typename I>
-void Color_ReadIndex_24b_888()
-{
-	auto const Index = DataRead<I>();
-	const u8 *iAddress = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]);
-	_SetCol(_Read24(iAddress));
-}
-
-template <typename I>
-void Color_ReadIndex_32b_888x()
-{
-	auto const Index = DataRead<I>();
-	const u8 *iAddress = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]);
-	_SetCol(_Read24(iAddress));
-}
-
-template <typename I>
-void Color_ReadIndex_16b_4444()
-{
-	auto const Index = DataRead<I>();
-	u16 val = *(const u16 *)(cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]));
-	_SetCol4444(val);
-}
-
-template <typename I>
-void Color_ReadIndex_24b_6666()
-{
-	auto const Index = DataRead<I>();
-	const u8* pData = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]) - 1;
-	u32 val = Common::swap32(pData);
-	_SetCol6666(val);
-}
-
-template <typename I>
-void Color_ReadIndex_32b_8888()
-{
-	auto const Index = DataRead<I>();
-	const u8 *iAddress = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]);
-	_SetCol(_Read32(iAddress));
-}
-
-void LOADERDECL Color_ReadIndex8_16b_565() { Color_ReadIndex_16b_565<u8>(); }
-void LOADERDECL Color_ReadIndex8_24b_888() { Color_ReadIndex_24b_888<u8>(); }
-void LOADERDECL Color_ReadIndex8_32b_888x() { Color_ReadIndex_32b_888x<u8>(); }
-void LOADERDECL Color_ReadIndex8_16b_4444() { Color_ReadIndex_16b_4444<u8>(); }
-void LOADERDECL Color_ReadIndex8_24b_6666() { Color_ReadIndex_24b_6666<u8>(); }
-void LOADERDECL Color_ReadIndex8_32b_8888() { Color_ReadIndex_32b_8888<u8>(); }
-
-void LOADERDECL Color_ReadIndex16_16b_565() { Color_ReadIndex_16b_565<u16>(); }
-void LOADERDECL Color_ReadIndex16_24b_888() { Color_ReadIndex_24b_888<u16>(); }
-void LOADERDECL Color_ReadIndex16_32b_888x() { Color_ReadIndex_32b_888x<u16>(); }
-void LOADERDECL Color_ReadIndex16_16b_4444() { Color_ReadIndex_16b_4444<u16>(); }
-void LOADERDECL Color_ReadIndex16_24b_6666() { Color_ReadIndex_24b_6666<u16>(); }
-void LOADERDECL Color_ReadIndex16_32b_8888() { Color_ReadIndex_32b_8888<u16>(); }
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Color.h b/Source/Core/VideoCommon/Src/VertexLoader_Color.h
deleted file mode 100644
index ac590b4c0e..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Color.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXLOADERCOLOR_H
-#define _VERTEXLOADERCOLOR_H
-
-void LOADERDECL Color_ReadDirect_24b_888();
-void LOADERDECL Color_ReadDirect_32b_888x();
-void LOADERDECL Color_ReadDirect_16b_565();
-void LOADERDECL Color_ReadDirect_16b_4444();
-void LOADERDECL Color_ReadDirect_24b_6666();
-void LOADERDECL Color_ReadDirect_32b_8888();
-
-void LOADERDECL Color_ReadIndex8_16b_565();
-void LOADERDECL Color_ReadIndex8_24b_888();
-void LOADERDECL Color_ReadIndex8_32b_888x();
-void LOADERDECL Color_ReadIndex8_16b_4444();
-void LOADERDECL Color_ReadIndex8_24b_6666();
-void LOADERDECL Color_ReadIndex8_32b_8888();
-
-void LOADERDECL Color_ReadIndex16_16b_565();
-void LOADERDECL Color_ReadIndex16_24b_888();
-void LOADERDECL Color_ReadIndex16_32b_888x();
-void LOADERDECL Color_ReadIndex16_16b_4444();
-void LOADERDECL Color_ReadIndex16_24b_6666();
-void LOADERDECL Color_ReadIndex16_32b_8888();
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
deleted file mode 100644
index ba1219b2ee..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "VertexLoader.h"
-#include "VertexLoader_Normal.h"
-#include "VertexManagerBase.h"
-#include "CPUDetect.h"
-#include <cmath>
-#include <limits>
-
-#if _M_SSE >= 0x401
-#include <smmintrin.h>
-#include <emmintrin.h>
-#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-// warning: mapping buffer should be disabled to use this
-#define LOG_NORM()  // PRIM_LOG("norm: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-3], ((float*)VertexManager::s_pCurBufferPointer)[-2], ((float*)VertexManager::s_pCurBufferPointer)[-1]);
-
-VertexLoader_Normal::Set VertexLoader_Normal::m_Table[NUM_NRM_TYPE][NUM_NRM_INDICES][NUM_NRM_ELEMENTS][NUM_NRM_FORMAT];
-
-namespace
-{
-
-template <typename T>
-__forceinline float FracAdjust(T val)
-{
-	//auto const S8FRAC = 1.f / (1u << 6);
-	//auto const U8FRAC = 1.f / (1u << 7);
-	//auto const S16FRAC = 1.f / (1u << 14);
-	//auto const U16FRAC = 1.f / (1u << 15);
-
-	// TODO: is this right?
-	return val / float(1u << (sizeof(T) * 8 - std::numeric_limits<T>::is_signed - 1));
-}
-
-template <>
-__forceinline float FracAdjust(float val)
-{
-	return val;
-}
-
-template <typename T, int N>
-__forceinline void ReadIndirect(const T* data)
-{
-	static_assert(3 == N || 9 == N, "N is only sane as 3 or 9!");
-
-	for (int i = 0; i != N; ++i)
-	{
-		DataWrite(FracAdjust(Common::FromBigEndian(data[i])));
-	}
-
-	LOG_NORM();
-}
-
-template <typename T, int N>
-struct Normal_Direct
-{
-	static void LOADERDECL function()
-	{
-		auto const source = reinterpret_cast<const T*>(DataGetPosition());
-		ReadIndirect<T, N * 3>(source);
-		DataSkip<N * 3 * sizeof(T)>();
-	}
-
-	static const int size = sizeof(T) * N * 3;
-};
-
-template <typename I, typename T, int N, int Offset>
-__forceinline void Normal_Index_Offset()
-{
-	static_assert(!std::numeric_limits<I>::is_signed, "Only unsigned I is sane!");
-	
-	auto const index = DataRead<I>();
-	auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_NORMAL]
-		+ (index * arraystrides[ARRAY_NORMAL]) + sizeof(T) * 3 * Offset);
-	ReadIndirect<T, N * 3>(data);
-}
-
-template <typename I, typename T, int N>
-struct Normal_Index
-{
-	static void LOADERDECL function()
-	{
-		Normal_Index_Offset<I, T, N, 0>();
-	}
-
-	static const int size = sizeof(I);
-};
-
-template <typename I, typename T>
-struct Normal_Index_Indices3
-{
-	static void LOADERDECL function()
-	{
-		Normal_Index_Offset<I, T, 1, 0>();
-		Normal_Index_Offset<I, T, 1, 1>();
-		Normal_Index_Offset<I, T, 1, 2>();
-	}
-
-	static const int size = sizeof(I) * 3;
-};
-
-}
-
-void VertexLoader_Normal::Init(void)
-{
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Direct<u8, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]   = Normal_Direct<s8, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT]	= Normal_Direct<u16, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] 	= Normal_Direct<s16, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Direct<float, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Direct<u8, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]  	= Normal_Direct<s8, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT]	= Normal_Direct<u16, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] 	= Normal_Direct<s16, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Direct<float, 3>();
-
-	// Same as above
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Direct<u8, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]  	= Normal_Direct<s8, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT]	= Normal_Direct<u16, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] 	= Normal_Direct<s16, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Direct<float, 1>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Direct<u8, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]  	= Normal_Direct<s8, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT]	= Normal_Direct<u16, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] 	= Normal_Direct<s16, 3>();
-	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Direct<float, 3>();
-
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Index<u8, u8, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]  	= Normal_Index<u8, s8, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT]	= Normal_Index<u8, u16, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] 	= Normal_Index<u8, s16, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Index<u8, float, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Index<u8, u8, 3>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]  	= Normal_Index<u8, s8, 3>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT]	= Normal_Index<u8, u16, 3>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] 	= Normal_Index<u8, s16, 3>();
-	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Index<u8, float, 3>();
-
-	// Same as above for NRM_NBT
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Index<u8, u8, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]  	= Normal_Index<u8, s8, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT]	= Normal_Index<u8, u16, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] 	= Normal_Index<u8, s16, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Index<u8, float, 1>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Index_Indices3<u8, u8>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]  	= Normal_Index_Indices3<u8, s8>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT]	= Normal_Index_Indices3<u8, u16>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] 	= Normal_Index_Indices3<u8, s16>();
-	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Index_Indices3<u8, float>();
-
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Index<u16, u8, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]  	= Normal_Index<u16, s8, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_USHORT]	= Normal_Index<u16, u16, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] 	= Normal_Index<u16, s16, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Index<u16, float, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Index<u16, u8, 3>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]  	= Normal_Index<u16, s8, 3>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_USHORT]	= Normal_Index<u16, u16, 3>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] 	= Normal_Index<u16, s16, 3>();
-	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Index<u16, float, 3>();
-
-	// Same as above for NRM_NBT
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] 	= Normal_Index<u16, u8, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]  	= Normal_Index<u16, s8, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_USHORT]	= Normal_Index<u16, u16, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] 	= Normal_Index<u16, s16, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] 	= Normal_Index<u16, float, 1>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] 	= Normal_Index_Indices3<u16, u8>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]  	= Normal_Index_Indices3<u16, s8>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_USHORT]	= Normal_Index_Indices3<u16, u16>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] 	= Normal_Index_Indices3<u16, s16>();
-	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] 	= Normal_Index_Indices3<u16, float>();
-}
-
-unsigned int VertexLoader_Normal::GetSize(unsigned int _type,
-	unsigned int _format, unsigned int _elements, unsigned int _index3)
-{
-	return m_Table[_type][_index3][_elements][_format].gc_size;
-}
-
-TPipelineFunction VertexLoader_Normal::GetFunction(unsigned int _type,
-	unsigned int _format, unsigned int _elements, unsigned int _index3)
-{
-	TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function;
-	return pFunc;
-}
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Normal.h b/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
deleted file mode 100644
index 40fd8cac06..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXLOADER_NORMAL_H
-#define _VERTEXLOADER_NORMAL_H
-
-#include "Common.h"
-#include "CommonTypes.h"
-
-class VertexLoader_Normal
-{
-public:
-
-	// Init
-	static void Init(void);
-
-	// GetSize
-	static unsigned int GetSize(unsigned int _type, unsigned int _format,
-		unsigned int _elements, unsigned int _index3);
-
-	// GetFunction
-	static TPipelineFunction GetFunction(unsigned int _type,
-		unsigned int _format, unsigned int _elements, unsigned int _index3);
-
-private:
-	enum ENormalType
-	{
-		NRM_NOT_PRESENT		= 0,
-		NRM_DIRECT			= 1,
-		NRM_INDEX8			= 2,
-		NRM_INDEX16			= 3,
-		NUM_NRM_TYPE
-	};
-
-	enum ENormalFormat
-	{
-		FORMAT_UBYTE		= 0,
-		FORMAT_BYTE			= 1,
-		FORMAT_USHORT		= 2,
-		FORMAT_SHORT		= 3,
-		FORMAT_FLOAT		= 4,
-		NUM_NRM_FORMAT
-	};
-
-	enum ENormalElements
-	{
-		NRM_NBT				= 0,
-		NRM_NBT3			= 1,
-		NUM_NRM_ELEMENTS
-	};
-
-	enum ENormalIndices
-	{
-		NRM_INDICES1		= 0,
-		NRM_INDICES3		= 1,
-		NUM_NRM_INDICES
-	};
-
-	struct Set
-	{
-		template <typename T>
-		void operator=(const T&)
-		{
-			gc_size = T::size;
-			function = T::function;
-		}
-		
-		int gc_size;
-		TPipelineFunction function;
-	};
-
-	static Set m_Table[NUM_NRM_TYPE][NUM_NRM_INDICES][NUM_NRM_ELEMENTS][NUM_NRM_FORMAT];
-};
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
deleted file mode 100644
index 2b383fc3f8..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <limits>
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "VertexLoader.h"
-#include "VertexLoader_Position.h"
-#include "VertexManagerBase.h"
-#include "CPUDetect.h"
-
-extern float posScale;
-extern TVtxAttr *pVtxAttr;
-
-// Thoughts on the implementation of a vertex loader compiler.
-// s_pCurBufferPointer should definitely be in a register.
-// Could load the position scale factor in XMM7, for example.
-
-// The pointer inside DataReadU8 in another.
-// Let's check out Pos_ReadDirect_UByte(). For Byte, replace MOVZX with MOVSX.
-
-/*
-MOVZX(32, R(EAX), MOffset(ESI, 0));
-MOVZX(32, R(EBX), MOffset(ESI, 1));
-MOVZX(32, R(ECX), MOffset(ESI, 2));
-MOVD(XMM0, R(EAX));
-MOVD(XMM1, R(EBX));
-MOVD(XMM2, R(ECX));                   
-CVTDQ2PS(XMM0, XMM0);
-CVTDQ2PS(XMM1, XMM1);
-CVTDQ2PS(XMM2, XMM2);
-MULSS(XMM0, XMM7);
-MULSS(XMM1, XMM7);
-MULSS(XMM2, XMM7);
-MOVSS(MOffset(EDI, 0), XMM0);
-MOVSS(MOffset(EDI, 4), XMM1);
-MOVSS(MOffset(EDI, 8), XMM2);
-
-Alternatively, lookup table:
-MOVZX(32, R(EAX), MOffset(ESI, 0));
-MOVZX(32, R(EBX), MOffset(ESI, 1));
-MOVZX(32, R(ECX), MOffset(ESI, 2));
-MOV(32, R(EAX), MComplex(LUTREG, EAX, 4));
-MOV(32, R(EBX), MComplex(LUTREG, EBX, 4));
-MOV(32, R(ECX), MComplex(LUTREG, ECX, 4));
-MOV(MOffset(EDI, 0), XMM0);
-MOV(MOffset(EDI, 4), XMM1);
-MOV(MOffset(EDI, 8), XMM2);
-
-SSE4:
-PINSRB(XMM0, MOffset(ESI, 0), 0);
-PINSRB(XMM0, MOffset(ESI, 1), 4);
-PINSRB(XMM0, MOffset(ESI, 2), 8);
-CVTDQ2PS(XMM0, XMM0);
-<two unpacks here to sign extend>
-MULPS(XMM0, XMM7);
-MOVUPS(MOffset(EDI, 0), XMM0);
-
-									 */
-
-template <typename T>
-float PosScale(T val)
-{
-	return val * posScale;
-}
-
-template <>
-float PosScale(float val)
-{
-	return val;
-}
-
-template <typename T, int N>
-void LOADERDECL Pos_ReadDirect()
-{
-	static_assert(N <= 3, "N > 3 is not sane!");
-
-	for (int i = 0; i < 3; ++i)
-		DataWrite(i<N ? PosScale(DataRead<T>()) : 0.f);
-
-	LOG_VTX();
-}
-
-template <typename I, typename T, int N>
-void LOADERDECL Pos_ReadIndex()
-{
-	static_assert(!std::numeric_limits<I>::is_signed, "Only unsigned I is sane!");
-	static_assert(N <= 3, "N > 3 is not sane!");
-
-	auto const index = DataRead<I>();
-	if (index < std::numeric_limits<I>::max())
-	{
-		auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_POSITION] + (index * arraystrides[ARRAY_POSITION]));
-
-		for (int i = 0; i < 3; ++i)
-			DataWrite(i<N ? PosScale(Common::FromBigEndian(data[i])) : 0.f);
-
-		LOG_VTX();
-	}
-}
-
-#if _M_SSE >= 0x301
-static const __m128i kMaskSwap32_3 = _mm_set_epi32(0xFFFFFFFFL, 0x08090A0BL, 0x04050607L, 0x00010203L);
-static const __m128i kMaskSwap32_2 = _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x04050607L, 0x00010203L);
-
-template <typename I, bool three>
-void LOADERDECL Pos_ReadIndex_Float_SSSE3()
-{
-	auto const index = DataRead<I>();
-	if (index < std::numeric_limits<I>::max())
-	{
-		const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (index * arraystrides[ARRAY_POSITION]));
-		GC_ALIGNED128(const __m128i a = _mm_loadu_si128((__m128i*)pData));
-		GC_ALIGNED128(__m128i b = _mm_shuffle_epi8(a, three ? kMaskSwap32_3 : kMaskSwap32_2));
-		_mm_storeu_si128((__m128i*)VertexManager::s_pCurBufferPointer, b);
-		VertexManager::s_pCurBufferPointer += sizeof(float) * 3;
-		LOG_VTX();
-	}
-}
-#endif
-
-static TPipelineFunction tableReadPosition[4][8][2] = {
-	{
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-	},
-	{
-		{Pos_ReadDirect<u8, 2>, Pos_ReadDirect<u8, 3>,},
-		{Pos_ReadDirect<s8, 2>, Pos_ReadDirect<s8, 3>,},
-		{Pos_ReadDirect<u16, 2>, Pos_ReadDirect<u16, 3>,},
-		{Pos_ReadDirect<s16, 2>, Pos_ReadDirect<s16, 3>,},
-		{Pos_ReadDirect<float, 2>, Pos_ReadDirect<float, 3>,},
-	},
-	{
-		{Pos_ReadIndex<u8, u8, 2>, Pos_ReadIndex<u8, u8, 3>,},
-		{Pos_ReadIndex<u8, s8, 2>, Pos_ReadIndex<u8, s8, 3>,},
-		{Pos_ReadIndex<u8, u16, 2>, Pos_ReadIndex<u8, u16, 3>,},
-		{Pos_ReadIndex<u8, s16, 2>, Pos_ReadIndex<u8, s16, 3>,},
-		{Pos_ReadIndex<u8, float, 2>, Pos_ReadIndex<u8, float, 3>,},
-	},
-	{
-		{Pos_ReadIndex<u16, u8, 2>, Pos_ReadIndex<u16, u8, 3>,},
-		{Pos_ReadIndex<u16, s8, 2>, Pos_ReadIndex<u16, s8, 3>,},
-		{Pos_ReadIndex<u16, u16, 2>, Pos_ReadIndex<u16, u16, 3>,},
-		{Pos_ReadIndex<u16, s16, 2>, Pos_ReadIndex<u16, s16, 3>,},
-		{Pos_ReadIndex<u16, float, 2>, Pos_ReadIndex<u16, float, 3>,},
-	},
-};
-
-static int tableReadPositionVertexSize[4][8][2] = {
-	{
-		{0, 0,}, {0, 0,}, {0, 0,}, {0, 0,}, {0, 0,},
-	},
-	{
-		{2, 3,}, {2, 3,}, {4, 6,}, {4, 6,}, {8, 12,},
-	},
-	{
-		{1, 1,}, {1, 1,}, {1, 1,}, {1, 1,}, {1, 1,},
-	},
-	{
-		{2, 2,}, {2, 2,}, {2, 2,}, {2, 2,}, {2, 2,},
-	},
-};
-
-
-void VertexLoader_Position::Init(void)
-{
-
-#if _M_SSE >= 0x301
-
-	if (cpu_info.bSSSE3)
-	{
-		tableReadPosition[2][4][0] = Pos_ReadIndex_Float_SSSE3<u8, false>;
-		tableReadPosition[2][4][1] = Pos_ReadIndex_Float_SSSE3<u8, true>;
-		tableReadPosition[3][4][0] = Pos_ReadIndex_Float_SSSE3<u16, false>;
-		tableReadPosition[3][4][1] = Pos_ReadIndex_Float_SSSE3<u16, true>;
-	}
-
-#endif
-
-}
-
-unsigned int VertexLoader_Position::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements)
-{
-	return tableReadPositionVertexSize[_type][_format][_elements];
-}
-
-TPipelineFunction VertexLoader_Position::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements)
-{
-	return tableReadPosition[_type][_format][_elements];
-}
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.h b/Source/Core/VideoCommon/Src/VertexLoader_Position.h
deleted file mode 100644
index 41e6028f13..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_Position.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef VERTEXLOADER_POSITION_H
-#define VERTEXLOADER_POSITION_H
-
-class VertexLoader_Position {
-public:
-
-	// Init
-	static void Init(void);
-
-	// GetSize
-	static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements);
-
-	// GetFunction
-	static TPipelineFunction GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements);
-};
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
deleted file mode 100644
index 2d956b242a..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "VertexLoader.h"
-#include "VertexLoader_TextCoord.h"
-#include "VertexManagerBase.h"
-#include "CPUDetect.h"
-
-#if _M_SSE >= 0x401
-#include <smmintrin.h>
-#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-template <int N>
-void LOG_TEX();
-
-template <>
-__forceinline void LOG_TEX<1>()
-{
-	// warning: mapping buffer should be disabled to use this
-	// PRIM_LOG("tex: %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-1]);
-}
-
-template <>
-__forceinline void LOG_TEX<2>()
-{
-	// warning: mapping buffer should be disabled to use this
-	// PRIM_LOG("tex: %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-2], ((float*)VertexManager::s_pCurBufferPointer)[-1]);
-}
-
-extern int tcIndex;
-extern float tcScale[8];
-
-void LOADERDECL TexCoord_Read_Dummy()
-{
-	tcIndex++;
-}
-
-template <typename T>
-float TCScale(T val)
-{
-	return val * tcScale[tcIndex];
-}
-
-template <>
-float TCScale(float val)
-{
-	return val;
-}
-
-template <typename T, int N>
-void LOADERDECL TexCoord_ReadDirect()
-{
-	for (int i = 0; i != N; ++i)
-		DataWrite(TCScale(DataRead<T>()));
-
-	LOG_TEX<N>();
-
-	++tcIndex;
-}
-
-template <typename I, typename T, int N>
-void LOADERDECL TexCoord_ReadIndex()
-{
-	static_assert(!std::numeric_limits<I>::is_signed, "Only unsigned I is sane!");
-	
-	auto const index = DataRead<I>();
-	auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_TEXCOORD0 + tcIndex]
-		+ (index * arraystrides[ARRAY_TEXCOORD0 + tcIndex]));
-
-	for (int i = 0; i != N; ++i)
-		DataWrite(TCScale(Common::FromBigEndian(data[i])));
-
-	LOG_TEX<N>();
-	++tcIndex;
-}
-
-#if _M_SSE >= 0x401
-static const __m128i kMaskSwap16_2 = _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0x02030001L);
-
-template <typename I>
-void LOADERDECL TexCoord_ReadIndex_Short2_SSE4()
-{
-	static_assert(!std::numeric_limits<I>::is_signed, "Only unsigned I is sane!");
-
-	// Heavy in ZWW
-	auto const index = DataRead<I>();
-	const s32 *pData = (const s32*)(cached_arraybases[ARRAY_TEXCOORD0+tcIndex] + (index * arraystrides[ARRAY_TEXCOORD0+tcIndex]));
-	const __m128i a = _mm_cvtsi32_si128(*pData);
-	const __m128i b = _mm_shuffle_epi8(a, kMaskSwap16_2);
-	const __m128i c = _mm_cvtepi16_epi32(b);
-	const __m128 d = _mm_cvtepi32_ps(c);
-	const __m128 e = _mm_load1_ps(&tcScale[tcIndex]);
-	const __m128 f = _mm_mul_ps(d, e);
-	_mm_storeu_ps((float*)VertexManager::s_pCurBufferPointer, f);
-	VertexManager::s_pCurBufferPointer += sizeof(float) * 2;
-	LOG_TEX<2>();
-	tcIndex++;
-}
-#endif
-
-#if _M_SSE >= 0x301
-static const __m128i kMaskSwap32 = _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x04050607L, 0x00010203L);
-
-template <typename I>
-void LOADERDECL TexCoord_ReadIndex_Float2_SSSE3()
-{
-	static_assert(!std::numeric_limits<I>::is_signed, "Only unsigned I is sane!");
-
-	auto const index = DataRead<I>();
-	const u32 *pData = (const u32 *)(cached_arraybases[ARRAY_TEXCOORD0+tcIndex] + (index * arraystrides[ARRAY_TEXCOORD0+tcIndex]));
-	GC_ALIGNED128(const __m128i a = _mm_loadl_epi64((__m128i*)pData));
-	GC_ALIGNED128(const __m128i b = _mm_shuffle_epi8(a, kMaskSwap32));
-	_mm_storel_epi64((__m128i*)VertexManager::s_pCurBufferPointer, b);
-	VertexManager::s_pCurBufferPointer += sizeof(float) * 2;
-	LOG_TEX<2>();
-	tcIndex++;
-}
-#endif
-
-static TPipelineFunction tableReadTexCoord[4][8][2] = {
-	{
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-		{NULL, NULL,},
-	},
-	{
-		{TexCoord_ReadDirect<u8, 1>,  TexCoord_ReadDirect<u8, 2>,},
-		{TexCoord_ReadDirect<s8, 1>,   TexCoord_ReadDirect<s8, 2>,},
-		{TexCoord_ReadDirect<u16, 1>, TexCoord_ReadDirect<u16, 2>,},
-		{TexCoord_ReadDirect<s16, 1>,  TexCoord_ReadDirect<s16, 2>,},
-		{TexCoord_ReadDirect<float, 1>,  TexCoord_ReadDirect<float, 2>,},
-	},
-	{
-		{TexCoord_ReadIndex<u8, u8, 1>,  TexCoord_ReadIndex<u8, u8, 2>,},
-		{TexCoord_ReadIndex<u8, s8, 1>,   TexCoord_ReadIndex<u8, s8, 2>,},
-		{TexCoord_ReadIndex<u8, u16, 1>, TexCoord_ReadIndex<u8, u16, 2>,},
-		{TexCoord_ReadIndex<u8, s16, 1>,  TexCoord_ReadIndex<u8, s16, 2>,},
-		{TexCoord_ReadIndex<u8, float, 1>,  TexCoord_ReadIndex<u8, float, 2>,},
-	},
-	{
-		{TexCoord_ReadIndex<u16, u8, 1>,  TexCoord_ReadIndex<u16, u8, 2>,},
-		{TexCoord_ReadIndex<u16, s8, 1>,   TexCoord_ReadIndex<u16, s8, 2>,},
-		{TexCoord_ReadIndex<u16, u16, 1>, TexCoord_ReadIndex<u16, u16, 2>,},
-		{TexCoord_ReadIndex<u16, s16, 1>,  TexCoord_ReadIndex<u16, s16, 2>,},
-		{TexCoord_ReadIndex<u16, float, 1>,  TexCoord_ReadIndex<u16, float, 2>,},
-	},
-};
-
-static int tableReadTexCoordVertexSize[4][8][2] = {
-	{
-		{0, 0,}, {0, 0,}, {0, 0,}, {0, 0,}, {0, 0,},
-	},
-	{
-		{1, 2,}, {1, 2,}, {2, 4,}, {2, 4,}, {4, 8,},
-	},
-	{
-		{1, 1,}, {1, 1,}, {1, 1,}, {1, 1,}, {1, 1,},
-	},
-	{
-		{2, 2,}, {2, 2,}, {2, 2,}, {2, 2,}, {2, 2,},
-	},
-};
-
-void VertexLoader_TextCoord::Init(void)
-{
-
-#if _M_SSE >= 0x301
-
-	if (cpu_info.bSSSE3)
-	{
-		tableReadTexCoord[2][4][1] = TexCoord_ReadIndex_Float2_SSSE3<u8>;
-		tableReadTexCoord[3][4][1] = TexCoord_ReadIndex_Float2_SSSE3<u16>;
-	}
-
-#endif
-
-#if _M_SSE >= 0x401
-
-	if (cpu_info.bSSE4_1)
-	{
-		tableReadTexCoord[2][3][1] = TexCoord_ReadIndex_Short2_SSE4<u8>;
-		tableReadTexCoord[3][3][1] = TexCoord_ReadIndex_Short2_SSE4<u16>;
-	}
-
-#endif
-
-}
-
-unsigned int VertexLoader_TextCoord::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements)
-{
-	return tableReadTexCoordVertexSize[_type][_format][_elements];
-}
-
-TPipelineFunction VertexLoader_TextCoord::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements)
-{
-	return tableReadTexCoord[_type][_format][_elements];
-}
-
-TPipelineFunction VertexLoader_TextCoord::GetDummyFunction()
-{
-	return TexCoord_Read_Dummy;
-}
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
deleted file mode 100644
index 7bbafab8db..0000000000
--- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef VERTEXLOADER_TEXCOORD_H
-#define VERTEXLOADER_TEXCOORD_H
-
-#include "NativeVertexFormat.h"
-
-class VertexLoader_TextCoord
-{
-public:
-
-	// Init
-	static void Init(void);
-
-	// GetSize
-	static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements);
-
-	// GetFunction
-	static TPipelineFunction GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements);
-
-	// GetDummyFunction
-	// It is important to synchronize tcIndex.
-	static TPipelineFunction GetDummyFunction();
-};
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp
deleted file mode 100644
index 13fbd55641..0000000000
--- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-
-#include "Common.h"
-
-#include "Statistics.h"
-#include "OpcodeDecoding.h"
-#include "IndexGenerator.h"
-#include "VertexShaderManager.h"
-#include "PixelShaderManager.h"
-#include "NativeVertexFormat.h"
-#include "TextureCacheBase.h"
-#include "RenderBase.h"
-#include "BPStructs.h"
-
-#include "VertexManagerBase.h"
-#include "MainBase.h"
-#include "VideoConfig.h"
-
-VertexManager *g_vertex_manager;
-
-u8 *VertexManager::s_pCurBufferPointer;
-u8 *VertexManager::s_pBaseBufferPointer;
-u8 *VertexManager::s_pEndBufferPointer;
-
-VertexManager::VertexManager()
-{
-	LocalVBuffer.resize(MAXVBUFFERSIZE);
-	s_pCurBufferPointer = s_pBaseBufferPointer = &LocalVBuffer[0];
-	s_pEndBufferPointer = s_pBaseBufferPointer + LocalVBuffer.size();
-
-	TIBuffer.resize(MAXIBUFFERSIZE);
-	LIBuffer.resize(MAXIBUFFERSIZE);
-	PIBuffer.resize(MAXIBUFFERSIZE);
-
-	ResetBuffer();
-}
-
-VertexManager::~VertexManager()
-{
-}
-
-void VertexManager::ResetBuffer()
-{
-	s_pCurBufferPointer = s_pBaseBufferPointer;
-	IndexGenerator::Start(GetTriangleIndexBuffer(), GetLineIndexBuffer(), GetPointIndexBuffer());
-}
-
-u32 VertexManager::GetRemainingSize()
-{
-	return (u32)(s_pEndBufferPointer - s_pCurBufferPointer);
-}
-
-void VertexManager::PrepareForAdditionalData(int primitive, u32 count, u32 stride)
-{	
-	u32 const needed_vertex_bytes = count * stride;
-	
-	if (count > IndexGenerator::GetRemainingIndices() || count > GetRemainingIndices(primitive) || needed_vertex_bytes > GetRemainingSize())
-	{
-		Flush();
-		
-		if(count > IndexGenerator::GetRemainingIndices())
-			ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush.");
-		if (count > GetRemainingIndices(primitive))
-			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! "
-				"Increase MAXIBUFFERSIZE or we need primitive breaking after all.");
-		if (needed_vertex_bytes > GetRemainingSize())
-			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! "
-				"Increase MAXVBUFFERSIZE or we need primitive breaking after all.");
-	}
-}
-
-bool VertexManager::IsFlushed() const
-{
-	return s_pBaseBufferPointer == s_pCurBufferPointer;
-}
-
-u32 VertexManager::GetRemainingIndices(int primitive)
-{
-	
-	if(g_Config.backend_info.bSupportsPrimitiveRestart)
-	{
-		switch (primitive)
-		{
-		case GX_DRAW_QUADS:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 5 * 4;
-		case GX_DRAW_TRIANGLES:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 4 * 3;
-		case GX_DRAW_TRIANGLE_STRIP:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 1 - 1;
-		case GX_DRAW_TRIANGLE_FAN:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 6 * 4 + 1;
-
-		case GX_DRAW_LINES:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen());
-		case GX_DRAW_LINE_STRIP:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen()) / 2 + 1;
-
-		case GX_DRAW_POINTS:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
-
-		default:
-			return 0;
-		}
-	}
-	else
-	{
-		switch (primitive)
-		{
-		case GX_DRAW_QUADS:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 6 * 4;
-		case GX_DRAW_TRIANGLES:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen());
-		case GX_DRAW_TRIANGLE_STRIP:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
-		case GX_DRAW_TRIANGLE_FAN:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
-
-		case GX_DRAW_LINES:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen());
-		case GX_DRAW_LINE_STRIP:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen()) / 2 + 1;
-
-		case GX_DRAW_POINTS:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
-
-		default:
-			return 0;
-		}
-	} 
-}
-
-void VertexManager::AddVertices(int primitive, u32 numVertices)
-{
-	if (numVertices <= 0)
-		return;
-
-	ADDSTAT(stats.thisFrame.numPrims, numVertices);
-	INCSTAT(stats.thisFrame.numPrimitiveJoins);
-
-	IndexGenerator::AddIndices(primitive, numVertices);
-}
-
-void VertexManager::Flush()
-{
-	if (g_vertex_manager->IsFlushed())
-		return;
-
-	// loading a state will invalidate BP, so check for it
-	g_video_backend->CheckInvalidState();
-
-	VideoFifo_CheckEFBAccess();
-
-	g_vertex_manager->vFlush();
-
-	g_vertex_manager->ResetBuffer();
-}
-
-// TODO: need to merge more stuff into VideoCommon to use this
-#if (0)
-void VertexManager::Flush()
-{
-#if defined(_DEBUG) || defined(DEBUGFAST) 
-	PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfregs.numTexGens,
-		xfregs.nNumChans, (int)xfregs.bEnableDualTexTransform, bpmem.ztex2.op,
-		bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable);
-
-	for (int i = 0; i < xfregs.nNumChans; ++i) 
-	{
-		LitChannel* ch = &xfregs.colChans[i].color;
-		PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
-		ch = &xfregs.colChans[i].alpha;
-		PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
-	}
-
-	for (int i = 0; i < xfregs.numTexGens; ++i) 
-	{
-		TexMtxInfo tinfo = xfregs.texcoords[i].texmtxinfo;
-		if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff;
-		if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0;
-
-		PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d",
-			i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift,
-			xfregs.texcoords[i].postmtxinfo.index, xfregs.texcoords[i].postmtxinfo.normalize);
-	}
-
-	PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages,
-		bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
-#endif
-
-	u32 usedtextures = 0;
-	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-		if (bpmem.tevorders[i / 2].getEnable(i & 1))
-			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
-
-	if (bpmem.genMode.numindstages > 0)
-		for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
-
-	for (u32 i = 0; i < 8; ++i)
-	{
-		if (usedtextures & (1 << i))
-		{
-			// TODO:
-			//glActiveTexture(GL_TEXTURE0 + i);
-
-			Renderer::SetSamplerState(i & 3, i >> 2);
-			FourTexUnits &tex = bpmem.tex[i >> 2];
-
-			TCacheEntry::TCacheEntryBase* tentry = TextureCache::Load(i, 
-				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
-				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
-				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
-				tex.texTlut[i&3].tlut_format,
-				(tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8),
-				(tex.texMode1[i&3].max_lod >> 4));
-
-			if (tentry)
-			{
-				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
-			}
-			else
-			{
-				ERROR_LOG(VIDEO, "Error loading texture");
-			}
-		}
-	}
-
-	// set global constants
-	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants();
-
-	// finally bind
-	if (false == PixelShaderCache::SetShader(false, g_nativeVertexFmt->m_components))
-		return;
-	if (false == VertexShaderCache::SetShader(g_nativeVertexFmt->m_components))
-		return;
-
-	const int stride = g_nativeVertexFmt->GetVertexStride();
-	//if (g_nativeVertexFmt)
-		g_nativeVertexFmt->SetupVertexPointers();
-
-	g_renderer->ResumePixelPerf(false);
-	g_vertex_manager->Draw(stride, false);
-	g_renderer->PausePixelPerf(false);
-
-	// run through vertex groups again to set alpha
-	if (false == g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate)
-	{
-		if (false == PixelShaderCache::SetShader(true, g_nativeVertexFmt->m_components))
-			return;
-
-		g_vertex_manager->Draw(stride, true);
-	}
-
-	// TODO:
-	//IndexGenerator::Start(TIBuffer, LIBuffer, PIBuffer);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) 
-	{
-		// save the shaders
-		char strfile[255];
-		sprintf(strfile, "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		std::ofstream fps;
-		OpenFStream(fps, strfile, std::ios_base::out);
-		fps << ps->strprog.c_str();
-		sprintf(strfile, "%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		std::ofstream fvs;
-		OpenFStream(fvs, strfile, std::ios_base::out);
-		fvs << vs->strprog.c_str();
-	}
-
-	if (g_ActiveConfig.iLog & CONF_SAVETARGETS) 
-	{
-		char str[128];
-		sprintf(str, "%starg%.3d.tga", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		TargetRectangle tr;
-		tr.left = 0;
-		tr.right = Renderer::GetTargetWidth();
-		tr.top = 0;
-		tr.bottom = Renderer::GetTargetHeight();
-		Renderer::SaveRenderTarget(str, tr);
-	}
-#endif
-	++g_Config.iSaveTargetId;
-}
-#endif
-
-void VertexManager::DoState(PointerWrap& p)
-{
-	g_vertex_manager->vDoState(p);
-}
-
-void VertexManager::DoStateShared(PointerWrap& p)
-{
-	// It seems we half-assume to be flushed here
-	// We update s_pCurBufferPointer yet don't worry about IndexGenerator's outdated pointers
-	// and maybe other things are overlooked
-	
-	p.Do(LocalVBuffer);
-	p.Do(TIBuffer);
-	p.Do(LIBuffer);
-	p.Do(PIBuffer);
-	
-	s_pBaseBufferPointer = &LocalVBuffer[0];
-	s_pEndBufferPointer = s_pBaseBufferPointer + LocalVBuffer.size();
-	p.DoPointer(s_pCurBufferPointer, s_pBaseBufferPointer);
-}
diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.h b/Source/Core/VideoCommon/Src/VertexManagerBase.h
deleted file mode 100644
index fafde8de44..0000000000
--- a/Source/Core/VideoCommon/Src/VertexManagerBase.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#ifndef _VERTEXMANAGERBASE_H
-#define _VERTEXMANAGERBASE_H
-
-#include "Common.h"
-#include <vector>
-
-class NativeVertexFormat;
-class PointerWrap;
-
-class VertexManager
-{
-private:
-	static const u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float)*3;                 // 3 pos
-	static const u32 LARGEST_POSSIBLE_VERTEX = sizeof(float)*45 + sizeof(u32)*2; // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat 
-	
-	static const u32 MAX_PRIMITIVES_PER_COMMAND = (u16)-1;
-	
-public:
-	static const u32 MAXVBUFFERSIZE = ROUND_UP_POW2 (MAX_PRIMITIVES_PER_COMMAND * LARGEST_POSSIBLE_VERTEX);
-	
-	// We may convert triangle-fans to triangle-lists, almost 3x as many indices.
-	static const u32 MAXIBUFFERSIZE = ROUND_UP_POW2 (MAX_PRIMITIVES_PER_COMMAND * 3);
-
-	VertexManager();
-	// needs to be virtual for DX11's dtor
-	virtual ~VertexManager();
-
-	static void AddVertices(int _primitive, u32 _numVertices);
-
-	static u8 *s_pCurBufferPointer;
-	static u8 *s_pBaseBufferPointer;
-	static u8 *s_pEndBufferPointer;
-
-	static u32 GetRemainingSize();
-	static void PrepareForAdditionalData(int primitive, u32 count, u32 stride);
-	static u32 GetRemainingIndices(int primitive);
-
-	static void Flush();
-
-	virtual ::NativeVertexFormat* CreateNativeVertexFormat() = 0;
-
-	static void DoState(PointerWrap& p);
-	virtual void CreateDeviceObjects(){};
-	virtual void DestroyDeviceObjects(){};
-	
-protected:
-	u16* GetTriangleIndexBuffer() { return &TIBuffer[0]; }
-	u16* GetLineIndexBuffer() { return &LIBuffer[0]; }
-	u16* GetPointIndexBuffer() { return &PIBuffer[0]; }
-	u8* GetVertexBuffer() { return &s_pBaseBufferPointer[0]; }
-
-	virtual void vDoState(PointerWrap& p) { DoStateShared(p); }
-	void DoStateShared(PointerWrap& p);
-
-private:
-	bool IsFlushed() const;
-	
-	void ResetBuffer();
-	
-	//virtual void Draw(u32 stride, bool alphapass) = 0;
-	// temp
-	virtual void vFlush() = 0;
-	
-	std::vector<u8> LocalVBuffer;
-	std::vector<u16> TIBuffer;
-	std::vector<u16> LIBuffer;
-	std::vector<u16> PIBuffer;
-};
-
-extern VertexManager *g_vertex_manager;
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
deleted file mode 100644
index ad090fb839..0000000000
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-#include <locale.h>
-#ifdef __APPLE__
-	#include <xlocale.h>
-#endif
-
-#include "NativeVertexFormat.h"
-
-#include "BPMemory.h"
-#include "CPMemory.h"
-#include "DriverDetails.h"
-#include "LightingShaderGen.h"
-#include "VertexShaderGen.h"
-#include "VideoConfig.h"
-
-static char text[16768];
-
-template<class T>
-static void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char* type, const char* name, int var_index, const char* semantic, int semantic_index = -1)
-{
-	object.Write("  %s %s", type, name);
-	if (var_index != -1)
-		object.Write("%d", var_index);
-
-	if (api_type == API_OPENGL)
-		object.Write(";\n");
-	else
-	{
-		if (semantic_index != -1)
-			object.Write(" : %s%d;\n", semantic, semantic_index);
-		else
-			object.Write(" : %s;\n", semantic);
-	}
-}
-
-template<class T>
-static inline void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
-{
-	object.Write("struct VS_OUTPUT {\n");
-	DefineVSOutputStructMember(object, api_type, "float4", "pos", -1, "POSITION");
-	DefineVSOutputStructMember(object, api_type, "float4", "colors_", 0, "COLOR", 0);
-	DefineVSOutputStructMember(object, api_type, "float4", "colors_", 1, "COLOR", 1);
-
-	if (xfregs.numTexGen.numTexGens < 7)
-	{
-		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-			DefineVSOutputStructMember(object, api_type, "float3", "tex", i, "TEXCOORD", i);
-
-		DefineVSOutputStructMember(object, api_type, "float4", "clipPos", -1, "TEXCOORD", xfregs.numTexGen.numTexGens);
-
-		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			DefineVSOutputStructMember(object, api_type, "float4", "Normal", -1, "TEXCOORD", xfregs.numTexGen.numTexGens + 1);
-	}
-	else
-	{
-		// Store clip position in the w component of first 4 texcoords
-		bool ppl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-		int num_texcoords = ppl ? 8 : xfregs.numTexGen.numTexGens;
-		for (int i = 0; i < num_texcoords; ++i)
-			DefineVSOutputStructMember(object, api_type, (ppl || i < 4) ? "float4" : "float3", "tex", i, "TEXCOORD", i);
-	}
-	object.Write("};\n");
-}
-
-template<class T>
-static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
-{
-	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
-	vertex_shader_uid_data dummy_data;
-	vertex_shader_uid_data& uid_data = (&out.template GetUidData<vertex_shader_uid_data>() != NULL)
-											? out.template GetUidData<vertex_shader_uid_data>() : dummy_data;
-
-	out.SetBuffer(text);
-	const bool is_writing_shadercode = (out.GetBuffer() != NULL);
-#ifndef ANDROID
-	locale_t locale;
-	locale_t old_locale;
-	if (is_writing_shadercode)
-	{
-		locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
-		old_locale = uselocale(locale); // Apply the locale for this thread
-	}
-#endif
-
-	if (is_writing_shadercode)
-		text[sizeof(text) - 1] = 0x7C;  // canary
-
-	_assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens);
-	_assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans);
-
-	// uniforms
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		out.Write("layout(std140) uniform VSBlock {\n");
-
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_POSNORMALMATRIX, "float4", I_POSNORMALMATRIX"[6]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PROJECTION, "float4", I_PROJECTION"[4]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_MATERIALS, "float4", I_MATERIALS"[4]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_LIGHTS,  "float4", I_LIGHTS"[40]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TEXMATRICES, "float4", I_TEXMATRICES"[24]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TRANSFORMMATRICES, "float4", I_TRANSFORMMATRICES"[64]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_NORMALMATRICES, "float4", I_NORMALMATRICES"[32]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_POSTTRANSFORMMATRICES, "float4", I_POSTTRANSFORMMATRICES"[64]");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_DEPTHPARAMS, "float4", I_DEPTHPARAMS);
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		out.Write("};\n");
-
-	GenerateVSOutputStruct(out, components, api_type);
-
-	uid_data.numTexGens = xfregs.numTexGen.numTexGens;
-	uid_data.components = components;
-	uid_data.pixel_lighting = (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting);
-
-	if(api_type == API_OPENGL)
-	{
-		out.Write("ATTRIN float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB);
-		if (components & VB_HAS_POSMTXIDX)
-			out.Write("ATTRIN float fposmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
-		if (components & VB_HAS_NRM0)
-			out.Write("ATTRIN float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB);
-		if (components & VB_HAS_NRM1)
-			out.Write("ATTRIN float3 rawnorm1; // ATTR%d,\n", SHADER_NORM1_ATTRIB);
-		if (components & VB_HAS_NRM2)
-			out.Write("ATTRIN float3 rawnorm2; // ATTR%d,\n", SHADER_NORM2_ATTRIB);
-
-		if (components & VB_HAS_COL0)
-			out.Write("ATTRIN float4 color0; // ATTR%d,\n", SHADER_COLOR0_ATTRIB);
-		if (components & VB_HAS_COL1)
-			out.Write("ATTRIN float4 color1; // ATTR%d,\n", SHADER_COLOR1_ATTRIB);
-
-		for (int i = 0; i < 8; ++i)
-		{
-			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
-			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
-				out.Write("ATTRIN float%d tex%d; // ATTR%d,\n", hastexmtx ? 3 : 2, i, SHADER_TEXTURE0_ATTRIB + i);
-		}
-
-		// Let's set up attributes
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			for (int i = 0; i < 8; ++i)
-				out.Write("VARYOUT  float3 uv%d_2;\n", i);
-			out.Write("VARYOUT   float4 clipPos_2;\n");
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-				out.Write("VARYOUT   float4 Normal_2;\n");
-		}
-		else
-		{
-			// wpos is in w of first 4 texcoords
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				for (int i = 0; i < 8; ++i)
-					out.Write("VARYOUT   float4 uv%d_2;\n", i);
-			}
-			else
-			{
-				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-					out.Write("VARYOUT   float%d uv%d_2;\n", i < 4 ? 4 : 3 , i);
-			}
-		}
-		out.Write("VARYOUT   float4 colors_02;\n");
-		out.Write("VARYOUT   float4 colors_12;\n");
-
-		out.Write("void main()\n{\n");
-	}
-	else
-	{
-		out.Write("VS_OUTPUT main(\n");
-
-		// inputs
-		if (components & VB_HAS_NRM0)
-			out.Write("  float3 rawnorm0 : NORMAL0,\n");
-		if (components & VB_HAS_NRM1)
-			out.Write("  float3 rawnorm1 : NORMAL1,\n");
-		if (components & VB_HAS_NRM2)
-			out.Write("  float3 rawnorm2 : NORMAL2,\n");
-		if (components & VB_HAS_COL0)
-			out.Write("  float4 color0 : COLOR0,\n");
-		if (components & VB_HAS_COL1)
-			out.Write("  float4 color1 : COLOR1,\n");
-		for (int i = 0; i < 8; ++i)
-		{
-			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
-			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
-				out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
-		}
-		if (components & VB_HAS_POSMTXIDX)
-			out.Write("  float4 blend_indices : BLENDINDICES,\n");
-		out.Write("  float4 rawpos : POSITION) {\n");
-	}
-	out.Write("VS_OUTPUT o;\n");
-
-	// transforms
-	if (components & VB_HAS_POSMTXIDX)
-	{
-		if (api_type & API_D3D9)
-		{
-			out.Write("int4 indices = D3DCOLORtoUBYTE4(blend_indices);\n");
-			out.Write("int posmtx = indices.x;\n");
-		}
-		else if (api_type == API_D3D11)
-		{
-			out.Write("int posmtx = blend_indices.x * 255.0f;\n");
-		}
-		else
-		{
-			out.Write("int posmtx = int(fposmtx);\n");
-		}
-
-		if (is_writing_shadercode && DriverDetails::HasBug(DriverDetails::BUG_NODYNUBOACCESS))
-		{
-			// This'll cause issues, but  it can't be helped
-			out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[0], rawpos), dot(" I_TRANSFORMMATRICES"[1], rawpos), dot(" I_TRANSFORMMATRICES"[2], rawpos), 1);\n");
-			if (components & VB_HAS_NRMALL)
-				out.Write("float3 N0 = " I_NORMALMATRICES"[0].xyz, N1 = " I_NORMALMATRICES"[1].xyz, N2 = " I_NORMALMATRICES"[2].xyz;\n");
-		}
-		else
-		{
-			out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");
-
-			if (components & VB_HAS_NRMALL) {
-				out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
-				out.Write("float3 N0 = " I_NORMALMATRICES"[normidx].xyz, N1 = " I_NORMALMATRICES"[normidx+1].xyz, N2 = " I_NORMALMATRICES"[normidx+2].xyz;\n");
-			}
-		}
-		if (components & VB_HAS_NRM0)
-			out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
-		if (components & VB_HAS_NRM1)
-			out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
-		if (components & VB_HAS_NRM2)
-			out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
-	}
-	else
-	{
-		out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX"[0], rawpos), dot(" I_POSNORMALMATRIX"[1], rawpos), dot(" I_POSNORMALMATRIX"[2], rawpos), 1.0f);\n");
-		if (components & VB_HAS_NRM0)
-			out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm0), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm0), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm0)));\n");
-		if (components & VB_HAS_NRM1)
-			out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm1), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm1), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm1));\n");
-		if (components & VB_HAS_NRM2)
-			out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm2), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm2), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm2));\n");
-	}
-
-	if (!(components & VB_HAS_NRM0))
-		out.Write("float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n");
-
-
-	out.Write("o.pos = float4(dot(" I_PROJECTION"[0], pos), dot(" I_PROJECTION"[1], pos), dot(" I_PROJECTION"[2], pos), dot(" I_PROJECTION"[3], pos));\n");
-
-	out.Write("float4 mat, lacc;\n"
-			"float3 ldir, h;\n"
-			"float dist, dist2, attn;\n");
-
-	uid_data.numColorChans = xfregs.numChan.numColorChans;
-	if (xfregs.numChan.numColorChans == 0)
-	{
-		if (components & VB_HAS_COL0)
-			out.Write("o.colors_0 = color0;\n");
-		else
-			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-	}
-
-	GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
-
-	if (xfregs.numChan.numColorChans < 2)
-	{
-		if (components & VB_HAS_COL1)
-			out.Write("o.colors_1 = color1;\n");
-		else
-			out.Write("o.colors_1 = o.colors_0;\n");
-	}
-	// special case if only pos and tex coord 0 and tex coord input is AB11
-	// donko - this has caused problems in some games. removed for now.
-	bool texGenSpecialCase = false;
-	/*bool texGenSpecialCase =
-		((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0
-		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
-		(xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11);
-		*/
-
-	// transform texcoords
-	out.Write("float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-	{
-		TexMtxInfo& texinfo = xfregs.texMtxInfo[i];
-
-		out.Write("{\n");
-		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-		uid_data.texMtxInfo[i].sourcerow = xfregs.texMtxInfo[i].sourcerow;
-		switch (texinfo.sourcerow)
-		{
-		case XF_SRCGEOM_INROW:
-			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-			out.Write("coord = rawpos;\n"); // pos.w is 1
-			break;
-		case XF_SRCNORMAL_INROW:
-			if (components & VB_HAS_NRM0)
-			{
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm0.xyz, 1.0f);\n");
-			}
-			break;
-		case XF_SRCCOLORS_INROW:
-			_assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 );
-			break;
-		case XF_SRCBINORMAL_T_INROW:
-			if (components & VB_HAS_NRM1)
-			{
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm1.xyz, 1.0f);\n");
-			}
-			break;
-		case XF_SRCBINORMAL_B_INROW:
-			if (components & VB_HAS_NRM2)
-			{
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm2.xyz, 1.0f);\n");
-			}
-			break;
-		default:
-			_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
-			if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) )
-				out.Write("coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
-			break;
-		}
-
-		// first transformation
-		uid_data.texMtxInfo[i].texgentype = xfregs.texMtxInfo[i].texgentype;
-		switch (texinfo.texgentype)
-		{
-			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
-
-				if (components & (VB_HAS_NRM1|VB_HAS_NRM2))
-				{
-					// transform the light dir into tangent space
-					uid_data.texMtxInfo[i].embosslightshift = xfregs.texMtxInfo[i].embosslightshift;
-					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
-					out.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(I_LIGHTS, texinfo.embosslightshift));
-					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
-				}
-				else
-				{
-					_assert_(0); // should have normals
-					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
-					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
-				}
-
-				break;
-			case XF_TEXGEN_COLOR_STRGBC0:
-				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				out.Write("o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
-				break;
-			case XF_TEXGEN_COLOR_STRGBC1:
-				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				out.Write("o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
-				break;
-			case XF_TEXGEN_REGULAR:
-			default:
-				uid_data.texMtxInfo_n_projection |= xfregs.texMtxInfo[i].projection << i;
-				if (components & (VB_HAS_TEXMTXIDX0<<i))
-				{
-					out.Write("int tmp = int(tex%d.z);\n", i);
-					if (texinfo.projection == XF_TEXPROJ_STQ)
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), dot(coord, " I_TRANSFORMMATRICES"[tmp+2]));\n", i);
-					else
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), 1);\n", i);
-				}
-				else
-				{
-					if (texinfo.projection == XF_TEXPROJ_STQ)
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]));\n", i, 3*i, 3*i+1, 3*i+2);
-					else
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), 1);\n", i, 3*i, 3*i+1);
-				}
-				break;
-		}
-
-		uid_data.dualTexTrans_enabled = xfregs.dualTexTrans.enabled;
-		// CHECKME: does this only work for regular tex gen types?
-		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR)
-		{
-			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
-
-			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
-			int postidx = postInfo.index;
-			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
-				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
-				"float4 P2 = " I_POSTTRANSFORMMATRICES"[%d];\n",
-				postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
-
-			if (texGenSpecialCase)
-			{
-				// no normalization
-				// q of input is 1
-				// q of output is unknown
-
-				// multiply by postmatrix
-				out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0f);\n", i, i, i);
-			}
-			else
-			{
-				uid_data.postMtxInfo[i].normalize = xfregs.postMtxInfo[i].normalize;
-				if (postInfo.normalize)
-					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
-
-				// multiply by postmatrix
-				out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
-			}
-		}
-
-		out.Write("}\n");
-	}
-
-	// clipPos/w needs to be done in pixel shader, not here
-	if (xfregs.numTexGen.numTexGens < 7)
-	{
-		out.Write("o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
-	}
-	else
-	{
-		out.Write("o.tex0.w = pos.x;\n");
-		out.Write("o.tex1.w = pos.y;\n");
-		out.Write("o.tex2.w = o.pos.z;\n");
-		out.Write("o.tex3.w = o.pos.w;\n");
-	}
-
-	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-	{
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
-		}
-		else
-		{
-			out.Write("o.tex4.w = _norm0.x;\n");
-			out.Write("o.tex5.w = _norm0.y;\n");
-			out.Write("o.tex6.w = _norm0.z;\n");
-			if (xfregs.numTexGen.numTexGens < 8)
-				out.Write("o.tex7 = pos.xyzz;\n");
-			else
-				out.Write("o.tex7.w = pos.z;\n");
-		}
-
-		if (components & VB_HAS_COL0)
-			out.Write("o.colors_0 = color0;\n");
-
-		if (components & VB_HAS_COL1)
-			out.Write("o.colors_1 = color1;\n");
-	}
-
-	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
-	//if not early z culling will improve speed
-	if (api_type & API_D3D9 || api_type == API_D3D11)
-	{
-		out.Write("o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n");
-	}
-	else
-	{
-		// this results in a scale from -1..0 to -1..1 after perspective
-		// divide
-		out.Write("o.pos.z = o.pos.w + o.pos.z * 2.0f;\n");
-
-		// Sonic Unleashed puts its final rendering at the near or
-		// far plane of the viewing frustrum(actually box, they use
-		// orthogonal projection for that), and we end up putting it
-		// just beyond, and the rendering gets clipped away. (The
-		// primitive gets dropped)
-		out.Write("o.pos.z = o.pos.z * 1048575.0f/1048576.0f;\n");
-
-		// the next steps of the OGL pipeline are:
-		// (x_c,y_c,z_c,w_c) = o.pos  //switch to OGL spec terminology
-		// clipping to -w_c <= (x_c,y_c,z_c) <= w_c
-		// (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
-		// z_w = (f-n)/2*z_d + (n+f)/2
-		// z_w now contains the value to go to the 0..1 depth buffer
-
-		//trying to get the correct semantic while not using glDepthRange
-		//seems to get rather complicated
-	}
-
-	if (api_type & API_D3D9)
-	{
-		// D3D9 is addressing pixel centers instead of pixel boundaries in clip space.
-		// Thus we need to offset the final position by half a pixel
-		out.Write("o.pos = o.pos + float4(" I_DEPTHPARAMS".z, " I_DEPTHPARAMS".w, 0.f, 0.f);\n");
-	}
-
-	if(api_type == API_OPENGL)
-	{
-		// Bit ugly here
-		// TODO: Make pretty
-		// Will look better when we bind uniforms in GLSL 1.3
-		// clipPos/w needs to be done in pixel shader, not here
-
-		if (xfregs.numTexGen.numTexGens < 7)
-		{
-			for (unsigned int i = 0; i < 8; ++i)
-			{
-				if(i < xfregs.numTexGen.numTexGens)
-					out.Write(" uv%d_2.xyz =  o.tex%d;\n", i, i);
-				else
-					out.Write(" uv%d_2.xyz =  float3(0.0f, 0.0f, 0.0f);\n", i);
-			}
-			out.Write("  clipPos_2 = o.clipPos;\n");
-			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-				out.Write("  Normal_2 = o.Normal;\n");
-		}
-		else
-		{
-			// clip position is in w of first 4 texcoords
-			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			{
-				for (int i = 0; i < 8; ++i)
-					out.Write(" uv%d_2 = o.tex%d;\n", i, i);
-			}
-			else
-			{
-				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-					out.Write("  uv%d_2%s = o.tex%d;\n", i, i < 4 ? ".xyzw" : ".xyz" , i);
-			}
-		}
-		out.Write("colors_02 = o.colors_0;\n");
-		out.Write("colors_12 = o.colors_1;\n");
-		out.Write("gl_Position = o.pos;\n");
-		out.Write("}\n");
-	}
-	else
-	{
-		out.Write("return o;\n}\n");
-	}
-
-	if (is_writing_shadercode)
-	{
-		if (text[sizeof(text) - 1] != 0x7C)
-			PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-
-#ifndef ANDROID
-		uselocale(old_locale); // restore locale
-		freelocale(locale);
-#endif
-	}
-}
-
-void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
-{
-	GenerateVertexShader<VertexShaderUid>(object, components, api_type);
-}
-
-void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
-{
-	GenerateVertexShader<VertexShaderCode>(object, components, api_type);
-}
-
-void GenerateVSOutputStructForGS(ShaderCode& object, u32 components, API_TYPE api_type)
-{
-	GenerateVSOutputStruct<ShaderCode>(object, components, api_type);
-}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
deleted file mode 100644
index 0ec703c07f..0000000000
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef GCOGL_VERTEXSHADER_H
-#define GCOGL_VERTEXSHADER_H
-
-#include <stdarg.h>
-#include "XFMemory.h"
-#include "VideoCommon.h"
-#include "ShaderGenCommon.h"
-#include "LightingShaderGen.h"
-
-// TODO should be reordered
-#define SHADER_POSITION_ATTRIB  0
-#define SHADER_POSMTX_ATTRIB    1
-#define SHADER_NORM0_ATTRIB     2
-#define SHADER_NORM1_ATTRIB     3
-#define SHADER_NORM2_ATTRIB     4
-#define SHADER_COLOR0_ATTRIB    5
-#define SHADER_COLOR1_ATTRIB    6
-
-#define SHADER_TEXTURE0_ATTRIB  8
-#define SHADER_TEXTURE1_ATTRIB  9
-#define SHADER_TEXTURE2_ATTRIB  10
-#define SHADER_TEXTURE3_ATTRIB  11
-#define SHADER_TEXTURE4_ATTRIB  12
-#define SHADER_TEXTURE5_ATTRIB  13
-#define SHADER_TEXTURE6_ATTRIB  14
-#define SHADER_TEXTURE7_ATTRIB  15
-
-
-
-// shader variables
-#define I_POSNORMALMATRIX       "cpnmtx"
-#define I_PROJECTION            "cproj"
-#define I_MATERIALS             "cmtrl"
-#define I_LIGHTS                "clights"
-#define I_TEXMATRICES           "ctexmtx"
-#define I_TRANSFORMMATRICES     "ctrmtx"
-#define I_NORMALMATRICES        "cnmtx"
-#define I_POSTTRANSFORMMATRICES "cpostmtx"
-#define I_DEPTHPARAMS           "cDepth" // farZ, zRange, scaled viewport width, scaled viewport height
-
-#define C_POSNORMALMATRIX        0
-#define C_PROJECTION            (C_POSNORMALMATRIX + 6)
-#define C_MATERIALS             (C_PROJECTION + 4)
-#define C_LIGHTS                (C_MATERIALS + 4)
-#define C_TEXMATRICES           (C_LIGHTS + 40)
-#define C_TRANSFORMMATRICES     (C_TEXMATRICES + 24)
-#define C_NORMALMATRICES        (C_TRANSFORMMATRICES + 64)
-#define C_POSTTRANSFORMMATRICES (C_NORMALMATRICES + 32)
-#define C_DEPTHPARAMS           (C_POSTTRANSFORMMATRICES + 64)
-#define C_VENVCONST_END			(C_DEPTHPARAMS + 1)
-
-const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
-						{I_PROJECTION , C_PROJECTION, 4  },
-						{I_MATERIALS, C_MATERIALS, 4 },
-						{I_LIGHTS, C_LIGHTS, 40 },
-						{I_TEXMATRICES, C_TEXMATRICES, 24 },
-						{I_TRANSFORMMATRICES , C_TRANSFORMMATRICES, 64  },
-						{I_NORMALMATRICES , C_NORMALMATRICES, 32  },
-						{I_POSTTRANSFORMMATRICES, C_POSTTRANSFORMMATRICES, 64 },
-						{I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
-						};
-
-#pragma pack(1)
-
-struct vertex_shader_uid_data
-{
-	u32 NumValues() const { return sizeof(vertex_shader_uid_data); }
-
-	u32 components : 23;
-	u32 numTexGens : 4;
-	u32 numColorChans : 2;
-	u32 dualTexTrans_enabled : 1;
-	u32 pixel_lighting : 1;
-	u32 pad0 : 1;
-
-	u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is 8 bits wide
-	struct {
-		u32 inputform : 2;
-		u32 texgentype : 3;
-		u32 sourcerow : 5;
-		u32 embosssourceshift : 3;
-		u32 embosslightshift : 3;
-	} texMtxInfo[8];
-
-	struct {
-		u32 index : 6;
-		u32 normalize : 1;
-		u32 pad : 1;
-	} postMtxInfo[8];
-
-	LightingUidData lighting;
-};
-#pragma pack()
-
-typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
-typedef ShaderCode VertexShaderCode; // TODO: Obsolete..
-
-void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
-void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
-void GenerateVSOutputStructForGS(ShaderCode& object, u32 components, API_TYPE api_type);
-
-#endif // GCOGL_VERTEXSHADER_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
deleted file mode 100644
index c07286d58f..0000000000
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
+++ /dev/null
@@ -1,677 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoConfig.h"
-#include "MathUtil.h"
-
-#include <cmath>
-#include <sstream>
-
-#include "Statistics.h"
-
-#include "VertexShaderGen.h"
-#include "VertexShaderManager.h"
-#include "BPMemory.h"
-#include "CPMemory.h"
-#include "XFMemory.h"
-#include "VideoCommon.h"
-#include "VertexManagerBase.h"
-
-#include "RenderBase.h"
-float GC_ALIGNED16(g_fProjectionMatrix[16]);
-
-// track changes
-static bool bTexMatricesChanged[2], bPosNormalMatrixChanged, bProjectionChanged, bViewportChanged;
-static int nMaterialsChanged;
-static int nTransformMatricesChanged[2]; // min,max
-static int nNormalMatricesChanged[2]; // min,max
-static int nPostTransformMatricesChanged[2]; // min,max
-static int nLightsChanged[2]; // min,max
-
-static Matrix44 s_viewportCorrection;
-static Matrix33 s_viewRotationMatrix;
-static Matrix33 s_viewInvRotationMatrix;
-static float s_fViewTranslationVector[3];
-static float s_fViewRotation[2];
-
-void UpdateViewport(Matrix44& vpCorrection);
-
-void UpdateViewportWithCorrection()
-{
-	UpdateViewport(s_viewportCorrection);
-}
-
-inline void SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	g_renderer->SetVSConstant4f(const_number, f1, f2, f3, f4);
-}
-
-inline void SetVSConstant4fv(unsigned int const_number, const float *f)
-{
-	g_renderer->SetVSConstant4fv(const_number, f);
-}
-
-inline void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	g_renderer->SetMultiVSConstant3fv(const_number, count, f);
-}
-
-inline void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	g_renderer->SetMultiVSConstant4fv(const_number, count, f);
-}
-
-struct ProjectionHack
-{
-	float sign;
-	float value;
-	ProjectionHack() { }
-	ProjectionHack(float new_sign, float new_value)
-		: sign(new_sign), value(new_value) {}
-};
-
-namespace
-{
-// Control Variables
-static ProjectionHack g_ProjHack1;
-static ProjectionHack g_ProjHack2;
-static bool g_ProjHack3;
-} // Namespace
-
-float PHackValue(std::string sValue)
-{
-	float f = 0;
-	bool fp = false;
-	const char *cStr = sValue.c_str();
-	char *c = new char[strlen(cStr)+1];
-	std::istringstream sTof("");
-
-	for (unsigned int i=0; i<=strlen(cStr); ++i)
-	{
-		if (i == 20)
-		{
-			c[i] = '\0';
-			break;
-		}
-
-		c[i] = (cStr[i] == ',') ? '.' : *(cStr+i);
-		if (c[i] == '.')
-			fp = true;
-	}
-
-	cStr = c;
-	sTof.str(cStr);
-	sTof >> f;
-
-	if (!fp)
-		f /= 0xF4240;
-
-	delete [] c;
-	return f;
-}
-
-void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[])
-{
-	float fhackvalue1 = 0, fhackvalue2 = 0;
-	float fhacksign1 = 1.0, fhacksign2 = 1.0;
-	bool bProjHack3 = false;
-	const char *sTemp[2];
-
-	if (iPhackvalue[0] == 1)
-	{
-		NOTICE_LOG(VIDEO, "\t\t--- Orthographic Projection Hack ON ---");
-
-		fhacksign1 *= (iPhackvalue[1] == 1) ? -1.0f : fhacksign1;
-		sTemp[0] = (iPhackvalue[1] == 1) ? " * (-1)" : "";
-		fhacksign2 *= (iPhackvalue[2] == 1) ? -1.0f : fhacksign2;
-		sTemp[1] = (iPhackvalue[2] == 1) ? " * (-1)" : "";
-
-		fhackvalue1 = PHackValue(sPhackvalue[0]);
-		NOTICE_LOG(VIDEO, "- zNear Correction = (%f + zNear)%s", fhackvalue1, sTemp[0]);
-
-		fhackvalue2 = PHackValue(sPhackvalue[1]);
-		NOTICE_LOG(VIDEO, "- zFar Correction =  (%f + zFar)%s", fhackvalue2, sTemp[1]);
-
-		sTemp[0] = "DISABLED";
-		bProjHack3 = (iPhackvalue[3] == 1) ? true : bProjHack3;
-		if (bProjHack3)
-			sTemp[0] = "ENABLED";
-		NOTICE_LOG(VIDEO, "- Extra Parameter: %s", sTemp[0]);
-	}
-
-	// Set the projections hacks
-	g_ProjHack1 = ProjectionHack(fhacksign1, fhackvalue1);
-	g_ProjHack2 = ProjectionHack(fhacksign2, fhackvalue2);
-	g_ProjHack3 = bProjHack3;
-}
-
-void VertexShaderManager::Init()
-{
-	Dirty();
-
-	memset(&xfregs, 0, sizeof(xfregs));
-	memset(xfmem, 0, sizeof(xfmem));
-	ResetView();
-
-	// TODO: should these go inside ResetView()?
-	Matrix44::LoadIdentity(s_viewportCorrection);
-	memset(g_fProjectionMatrix, 0, sizeof(g_fProjectionMatrix));
-	for (int i = 0; i < 4; ++i)
-		g_fProjectionMatrix[i*5] = 1.0f;
-}
-
-void VertexShaderManager::Shutdown()
-{
-}
-
-void VertexShaderManager::Dirty()
-{
-	nTransformMatricesChanged[0] = 0; 
-	nTransformMatricesChanged[1] = 256;
-
-	nNormalMatricesChanged[0] = 0;
-	nNormalMatricesChanged[1] = 96;
-
-	nPostTransformMatricesChanged[0] = 0; 
-	nPostTransformMatricesChanged[1] = 256;
-
-	nLightsChanged[0] = 0; 
-	nLightsChanged[1] = 0x80;
-
-	bPosNormalMatrixChanged = true;
-	bTexMatricesChanged[0] = true;
-	bTexMatricesChanged[1] = true;
-
-	bProjectionChanged = true;
-
-	nMaterialsChanged = 15;
-}
-
-// Syncs the shader constant buffers with xfmem
-// TODO: A cleaner way to control the matrices without making a mess in the parameters field
-void VertexShaderManager::SetConstants()
-{
-	if (g_ActiveConfig.backend_info.APIType == API_OPENGL && !g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		Dirty();
-
-	if (nTransformMatricesChanged[0] >= 0)
-	{
-		int startn = nTransformMatricesChanged[0] / 4;
-		int endn = (nTransformMatricesChanged[1] + 3) / 4;
-		const float* pstart = (const float*)&xfmem[startn * 4];
-		SetMultiVSConstant4fv(C_TRANSFORMMATRICES + startn, endn - startn, pstart);
-		nTransformMatricesChanged[0] = nTransformMatricesChanged[1] = -1;
-	}
-
-	if (nNormalMatricesChanged[0] >= 0)
-	{
-		int startn = nNormalMatricesChanged[0] / 3;
-		int endn = (nNormalMatricesChanged[1] + 2) / 3;
-		const float *pnstart = (const float*)&xfmem[XFMEM_NORMALMATRICES+3*startn];
-		SetMultiVSConstant3fv(C_NORMALMATRICES + startn, endn - startn, pnstart);
-		nNormalMatricesChanged[0] = nNormalMatricesChanged[1] = -1;
-	}
-
-	if (nPostTransformMatricesChanged[0] >= 0)
-	{
-		int startn = nPostTransformMatricesChanged[0] / 4;
-		int endn = (nPostTransformMatricesChanged[1] + 3 ) / 4;
-		const float* pstart = (const float*)&xfmem[XFMEM_POSTMATRICES + startn * 4];
-		SetMultiVSConstant4fv(C_POSTTRANSFORMMATRICES + startn, endn - startn, pstart);
-		nPostTransformMatricesChanged[0] = nPostTransformMatricesChanged[1] = -1;
-	}
-
-	if (nLightsChanged[0] >= 0)
-	{
-		// lights don't have a 1 to 1 mapping, the color component needs to be converted to 4 floats
-		int istart = nLightsChanged[0] / 0x10;
-		int iend = (nLightsChanged[1] + 15) / 0x10;
-		const float* xfmemptr = (const float*)&xfmem[0x10 * istart + XFMEM_LIGHTS];
-
-		for (int i = istart; i < iend; ++i)
-		{
-			u32 color = *(const u32*)(xfmemptr + 3);
-			float NormalizationCoef = 1 / 255.0f;
-			SetVSConstant4f(C_LIGHTS + 5 * i,
-				((color >> 24) & 0xFF) * NormalizationCoef,
-				((color >> 16) & 0xFF) * NormalizationCoef,
-				((color >> 8)  & 0xFF) * NormalizationCoef,
-				((color)       & 0xFF) * NormalizationCoef);
-			xfmemptr += 4;
-
-			for (int j = 0; j < 4; ++j, xfmemptr += 3)
-			{
-				if (j == 1 &&
-					fabs(xfmemptr[0]) < 0.00001f &&
-					fabs(xfmemptr[1]) < 0.00001f &&
-					fabs(xfmemptr[2]) < 0.00001f)
-				{
-					// dist attenuation, make sure not equal to 0!!!
-					SetVSConstant4f(C_LIGHTS+5*i+j+1, 0.00001f, xfmemptr[1], xfmemptr[2], 0);
-				}
-				else
-				{
-					SetVSConstant4fv(C_LIGHTS+5*i+j+1, xfmemptr);
-				}
-			}
-		}
-
-		nLightsChanged[0] = nLightsChanged[1] = -1;
-	}
-
-	if (nMaterialsChanged)
-	{
-		float GC_ALIGNED16(material[4]);
-		float NormalizationCoef = 1 / 255.0f;
-
-		for (int i = 0; i < 2; ++i)
-		{
-			if (nMaterialsChanged & (1 << i))
-			{
-				u32 data = *(xfregs.ambColor + i);
-
-				material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
-				material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
-				material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
-				material[3] = ( data        & 0xFF) * NormalizationCoef;
-
-				SetVSConstant4fv(C_MATERIALS + i, material);
-			}
-		}
-		
-		for (int i = 0; i < 2; ++i)
-		{
-			if (nMaterialsChanged & (1 << (i + 2)))
-			{
-				u32 data = *(xfregs.matColor + i);
-
-				material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
-				material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
-				material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
-				material[3] = ( data        & 0xFF) * NormalizationCoef;
-
-				SetVSConstant4fv(C_MATERIALS + i + 2, material);
-			}
-		}
-
-		nMaterialsChanged = 0;
-	}
-
-	if (bPosNormalMatrixChanged)
-	{
-		bPosNormalMatrixChanged = false;
-
-		const float *pos = (const float *)xfmem + MatrixIndexA.PosNormalMtxIdx * 4;
-		const float *norm = (const float *)xfmem + XFMEM_NORMALMATRICES + 3 * (MatrixIndexA.PosNormalMtxIdx & 31);
-
-		SetMultiVSConstant4fv(C_POSNORMALMATRIX, 3, pos);
-		SetMultiVSConstant3fv(C_POSNORMALMATRIX + 3, 3, norm);
-	}
-
-	if (bTexMatricesChanged[0])
-	{
-		bTexMatricesChanged[0] = false;
-		const float *fptrs[] = 
-		{
-			(const float *)xfmem + MatrixIndexA.Tex0MtxIdx * 4, (const float *)xfmem + MatrixIndexA.Tex1MtxIdx * 4,
-			(const float *)xfmem + MatrixIndexA.Tex2MtxIdx * 4, (const float *)xfmem + MatrixIndexA.Tex3MtxIdx * 4
-		};
-
-		for (int i = 0; i < 4; ++i)
-		{
-			SetMultiVSConstant4fv(C_TEXMATRICES + 3 * i, 3, fptrs[i]);
-		}
-	}
-
-	if (bTexMatricesChanged[1])
-	{
-		bTexMatricesChanged[1] = false;
-		const float *fptrs[] = {
-			(const float *)xfmem + MatrixIndexB.Tex4MtxIdx * 4, (const float *)xfmem + MatrixIndexB.Tex5MtxIdx * 4,
-			(const float *)xfmem + MatrixIndexB.Tex6MtxIdx * 4, (const float *)xfmem + MatrixIndexB.Tex7MtxIdx * 4
-		};
-
-		for (int i = 0; i < 4; ++i)
-		{
-			SetMultiVSConstant4fv(C_TEXMATRICES+3 * i + 12, 3, fptrs[i]);
-		}
-	}
-
-	if (bViewportChanged)
-	{
-		bViewportChanged = false;
-		SetVSConstant4f(C_DEPTHPARAMS,
-						xfregs.viewport.farZ / 16777216.0f,
-						xfregs.viewport.zRange / 16777216.0f,
-						-1.f / (float)g_renderer->EFBToScaledX((int)ceil(2.0f * xfregs.viewport.wd)),
-						1.f / (float)g_renderer->EFBToScaledY((int)ceil(-2.0f * xfregs.viewport.ht)));
-		// This is so implementation-dependent that we can't have it here.
-		UpdateViewport(s_viewportCorrection);
-		bProjectionChanged = true;
-	}
-
-	if (bProjectionChanged)
-	{
-		bProjectionChanged = false;
-		
-		float *rawProjection = xfregs.projection.rawProjection;
-
-		switch(xfregs.projection.type)
-		{
-		case GX_PERSPECTIVE:
-
-			g_fProjectionMatrix[0] = rawProjection[0] * g_ActiveConfig.fAspectRatioHackW;
-			g_fProjectionMatrix[1] = 0.0f;
-			g_fProjectionMatrix[2] = rawProjection[1];
-			g_fProjectionMatrix[3] = 0.0f;
-
-			g_fProjectionMatrix[4] = 0.0f;
-			g_fProjectionMatrix[5] = rawProjection[2] * g_ActiveConfig.fAspectRatioHackH;
-			g_fProjectionMatrix[6] = rawProjection[3];
-			g_fProjectionMatrix[7] = 0.0f;
-
-			g_fProjectionMatrix[8] = 0.0f;
-			g_fProjectionMatrix[9] = 0.0f;
-			g_fProjectionMatrix[10] = rawProjection[4];
-
-			g_fProjectionMatrix[11] = rawProjection[5];
-
-			g_fProjectionMatrix[12] = 0.0f;
-			g_fProjectionMatrix[13] = 0.0f;
-			// donkopunchstania: GC GPU rounds differently?
-			// -(1 + epsilon) so objects are clipped as they are on the real HW
-			g_fProjectionMatrix[14] = -1.00000011921f;
-			g_fProjectionMatrix[15] = 0.0f;
-
-			SETSTAT_FT(stats.gproj_0, g_fProjectionMatrix[0]);
-			SETSTAT_FT(stats.gproj_1, g_fProjectionMatrix[1]);
-			SETSTAT_FT(stats.gproj_2, g_fProjectionMatrix[2]);
-			SETSTAT_FT(stats.gproj_3, g_fProjectionMatrix[3]);
-			SETSTAT_FT(stats.gproj_4, g_fProjectionMatrix[4]);
-			SETSTAT_FT(stats.gproj_5, g_fProjectionMatrix[5]);
-			SETSTAT_FT(stats.gproj_6, g_fProjectionMatrix[6]);
-			SETSTAT_FT(stats.gproj_7, g_fProjectionMatrix[7]);
-			SETSTAT_FT(stats.gproj_8, g_fProjectionMatrix[8]);
-			SETSTAT_FT(stats.gproj_9, g_fProjectionMatrix[9]);
-			SETSTAT_FT(stats.gproj_10, g_fProjectionMatrix[10]);
-			SETSTAT_FT(stats.gproj_11, g_fProjectionMatrix[11]);
-			SETSTAT_FT(stats.gproj_12, g_fProjectionMatrix[12]);
-			SETSTAT_FT(stats.gproj_13, g_fProjectionMatrix[13]);
-			SETSTAT_FT(stats.gproj_14, g_fProjectionMatrix[14]);
-			SETSTAT_FT(stats.gproj_15, g_fProjectionMatrix[15]);
-			break;
-
-		case GX_ORTHOGRAPHIC:
-
-			g_fProjectionMatrix[0] = rawProjection[0];
-			g_fProjectionMatrix[1] = 0.0f;
-			g_fProjectionMatrix[2] = 0.0f;
-			g_fProjectionMatrix[3] = rawProjection[1];
-
-			g_fProjectionMatrix[4] = 0.0f;
-			g_fProjectionMatrix[5] = rawProjection[2];
-			g_fProjectionMatrix[6] = 0.0f;
-			g_fProjectionMatrix[7] = rawProjection[3];
-
-			g_fProjectionMatrix[8] = 0.0f;
-			g_fProjectionMatrix[9] = 0.0f;
-			g_fProjectionMatrix[10] = (g_ProjHack1.value + rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign);
-			g_fProjectionMatrix[11] = (g_ProjHack2.value + rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign);
-
-			g_fProjectionMatrix[12] = 0.0f;
-			g_fProjectionMatrix[13] = 0.0f;
-
-			/*
-			projection hack for metroid other m...attempt to remove black projection layer from cut scenes.
-			g_fProjectionMatrix[15] = 1.0f was the default setting before
-			this hack was added...setting g_fProjectionMatrix[14] to -1 might make the hack more stable, needs more testing.
-			Only works for OGL and DX9...this is not helping DX11
-			*/
-
-			g_fProjectionMatrix[14] = 0.0f;
-			g_fProjectionMatrix[15] = (g_ProjHack3 && rawProjection[0] == 2.0f ? 0.0f : 1.0f);  //causes either the efb copy or bloom layer not to show if proj hack enabled
-
-			SETSTAT_FT(stats.g2proj_0, g_fProjectionMatrix[0]);
-			SETSTAT_FT(stats.g2proj_1, g_fProjectionMatrix[1]);
-			SETSTAT_FT(stats.g2proj_2, g_fProjectionMatrix[2]);
-			SETSTAT_FT(stats.g2proj_3, g_fProjectionMatrix[3]);
-			SETSTAT_FT(stats.g2proj_4, g_fProjectionMatrix[4]);
-			SETSTAT_FT(stats.g2proj_5, g_fProjectionMatrix[5]);
-			SETSTAT_FT(stats.g2proj_6, g_fProjectionMatrix[6]);
-			SETSTAT_FT(stats.g2proj_7, g_fProjectionMatrix[7]);
-			SETSTAT_FT(stats.g2proj_8, g_fProjectionMatrix[8]);
-			SETSTAT_FT(stats.g2proj_9, g_fProjectionMatrix[9]);
-			SETSTAT_FT(stats.g2proj_10, g_fProjectionMatrix[10]);
-			SETSTAT_FT(stats.g2proj_11, g_fProjectionMatrix[11]);
-			SETSTAT_FT(stats.g2proj_12, g_fProjectionMatrix[12]);
-			SETSTAT_FT(stats.g2proj_13, g_fProjectionMatrix[13]);
-			SETSTAT_FT(stats.g2proj_14, g_fProjectionMatrix[14]);
-			SETSTAT_FT(stats.g2proj_15, g_fProjectionMatrix[15]);
-			SETSTAT_FT(stats.proj_0, rawProjection[0]);
-			SETSTAT_FT(stats.proj_1, rawProjection[1]);
-			SETSTAT_FT(stats.proj_2, rawProjection[2]);
-			SETSTAT_FT(stats.proj_3, rawProjection[3]);
-			SETSTAT_FT(stats.proj_4, rawProjection[4]);
-			SETSTAT_FT(stats.proj_5, rawProjection[5]);
-			break;
-
-		default:
-			ERROR_LOG(VIDEO, "Unknown projection type: %d", xfregs.projection.type);
-		}
-
-		PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]);
-
-		if ((g_ActiveConfig.bFreeLook || g_ActiveConfig.bAnaglyphStereo ) && xfregs.projection.type == GX_PERSPECTIVE)
-		{
-			Matrix44 mtxA;
-			Matrix44 mtxB;
-			Matrix44 viewMtx;
-
-			Matrix44::Translate(mtxA, s_fViewTranslationVector);
-			Matrix44::LoadMatrix33(mtxB, s_viewRotationMatrix);
-			Matrix44::Multiply(mtxB, mtxA, viewMtx); // view = rotation x translation
-			Matrix44::Set(mtxB, g_fProjectionMatrix);
-			Matrix44::Multiply(mtxB, viewMtx, mtxA); // mtxA = projection x view
-			Matrix44::Multiply(s_viewportCorrection, mtxA, mtxB); // mtxB = viewportCorrection x mtxA
-
-			SetMultiVSConstant4fv(C_PROJECTION, 4, mtxB.data);
-		}
-		else
-		{
-			Matrix44 projMtx;
-			Matrix44::Set(projMtx, g_fProjectionMatrix);
-
-			Matrix44 correctedMtx;
-			Matrix44::Multiply(s_viewportCorrection, projMtx, correctedMtx);
-			SetMultiVSConstant4fv(C_PROJECTION, 4, correctedMtx.data);
-		}
-	}
-}
-
-void VertexShaderManager::InvalidateXFRange(int start, int end)
-{
-	if (((u32)start >= (u32)MatrixIndexA.PosNormalMtxIdx * 4 &&
-		 (u32)start <  (u32)MatrixIndexA.PosNormalMtxIdx * 4 + 12) ||
-		((u32)start >= XFMEM_NORMALMATRICES + ((u32)MatrixIndexA.PosNormalMtxIdx & 31) * 3 &&
-		 (u32)start <  XFMEM_NORMALMATRICES + ((u32)MatrixIndexA.PosNormalMtxIdx & 31) * 3 + 9))
-	{
-		bPosNormalMatrixChanged = true;
-	}
-
-	if (((u32)start >= (u32)MatrixIndexA.Tex0MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex0MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexA.Tex1MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex1MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexA.Tex2MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex2MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexA.Tex3MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex3MtxIdx*4+12))
-	{
-		bTexMatricesChanged[0] = true;
-	}
-
-	if (((u32)start >= (u32)MatrixIndexB.Tex4MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex4MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexB.Tex5MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex5MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexB.Tex6MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex6MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexB.Tex7MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex7MtxIdx*4+12))
-	{
-		bTexMatricesChanged[1] = true;
-	}
-
-	if (start < XFMEM_POSMATRICES_END)
-	{
-		if (nTransformMatricesChanged[0] == -1)
-		{
-			nTransformMatricesChanged[0] = start;
-			nTransformMatricesChanged[1] = end>XFMEM_POSMATRICES_END?XFMEM_POSMATRICES_END:end;
-		}
-		else
-		{
-			if (nTransformMatricesChanged[0] > start) nTransformMatricesChanged[0] = start;
-			if (nTransformMatricesChanged[1] < end) nTransformMatricesChanged[1] = end>XFMEM_POSMATRICES_END?XFMEM_POSMATRICES_END:end;
-		}
-	}
-
-	if (start < XFMEM_NORMALMATRICES_END && end > XFMEM_NORMALMATRICES)
-	{
-		int _start = start < XFMEM_NORMALMATRICES ? 0 : start-XFMEM_NORMALMATRICES;
-		int _end = end < XFMEM_NORMALMATRICES_END ? end-XFMEM_NORMALMATRICES : XFMEM_NORMALMATRICES_END-XFMEM_NORMALMATRICES;
-
-		if (nNormalMatricesChanged[0] == -1)
-		{
-			nNormalMatricesChanged[0] = _start;
-			nNormalMatricesChanged[1] = _end;
-		}
-		else
-		{
-			if (nNormalMatricesChanged[0] > _start) nNormalMatricesChanged[0] = _start;
-			if (nNormalMatricesChanged[1] < _end) nNormalMatricesChanged[1] = _end;
-		}
-	}
-
-	if (start < XFMEM_POSTMATRICES_END && end > XFMEM_POSTMATRICES)
-	{
-		int _start = start < XFMEM_POSTMATRICES ? XFMEM_POSTMATRICES : start-XFMEM_POSTMATRICES;
-		int _end = end < XFMEM_POSTMATRICES_END ? end-XFMEM_POSTMATRICES : XFMEM_POSTMATRICES_END-XFMEM_POSTMATRICES;
-
-		if (nPostTransformMatricesChanged[0] == -1)
-		{
-			nPostTransformMatricesChanged[0] = _start;
-			nPostTransformMatricesChanged[1] = _end;
-		}
-		else
-		{
-			if (nPostTransformMatricesChanged[0] > _start) nPostTransformMatricesChanged[0] = _start;
-			if (nPostTransformMatricesChanged[1] < _end) nPostTransformMatricesChanged[1] = _end;
-		}
-	}
-
-	if (start < XFMEM_LIGHTS_END && end > XFMEM_LIGHTS)
-	{
-		int _start = start < XFMEM_LIGHTS ? XFMEM_LIGHTS : start-XFMEM_LIGHTS;
-		int _end = end < XFMEM_LIGHTS_END ? end-XFMEM_LIGHTS : XFMEM_LIGHTS_END-XFMEM_LIGHTS;
-
-		if (nLightsChanged[0] == -1 )
-		{
-			nLightsChanged[0] = _start;
-			nLightsChanged[1] = _end;
-		}
-		else
-		{
-			if (nLightsChanged[0] > _start) nLightsChanged[0] = _start;
-			if (nLightsChanged[1] < _end)   nLightsChanged[1] = _end;
-		}
-	}
-}
-
-void VertexShaderManager::SetTexMatrixChangedA(u32 Value)
-{
-	if (MatrixIndexA.Hex != Value)
-	{
-		VertexManager::Flush();
-		if (MatrixIndexA.PosNormalMtxIdx != (Value&0x3f))
-			bPosNormalMatrixChanged = true;
-		bTexMatricesChanged[0] = true;
-		MatrixIndexA.Hex = Value;
-	}
-}
-
-void VertexShaderManager::SetTexMatrixChangedB(u32 Value)
-{
-	if (MatrixIndexB.Hex != Value)
-	{
-		VertexManager::Flush();
-		bTexMatricesChanged[1] = true;
-		MatrixIndexB.Hex = Value;
-	}
-}
-
-void VertexShaderManager::SetViewportChanged()
-{
-	bViewportChanged = true;
-}
-
-void VertexShaderManager::SetProjectionChanged()
-{
-	bProjectionChanged = true;
-}
-
-void VertexShaderManager::SetMaterialColorChanged(int index)
-{
-	nMaterialsChanged  |= (1 << index);
-}
-
-void VertexShaderManager::TranslateView(float x, float y, float z)
-{
-	float result[3];
-	float vector[3] = { x,z,y };
-
-	Matrix33::Multiply(s_viewInvRotationMatrix, vector, result);
-
-	for (int i = 0; i < 3; i++)
-		s_fViewTranslationVector[i] += result[i];
-
-	bProjectionChanged = true;
-}
-
-void VertexShaderManager::RotateView(float x, float y)
-{
-	s_fViewRotation[0] += x;
-	s_fViewRotation[1] += y;
-
-	Matrix33 mx;
-	Matrix33 my;
-	Matrix33::RotateX(mx, s_fViewRotation[1]);
-	Matrix33::RotateY(my, s_fViewRotation[0]);
-	Matrix33::Multiply(mx, my, s_viewRotationMatrix);
-
-	// reverse rotation
-	Matrix33::RotateX(mx, -s_fViewRotation[1]);
-	Matrix33::RotateY(my, -s_fViewRotation[0]);
-	Matrix33::Multiply(my, mx, s_viewInvRotationMatrix);
-
-	bProjectionChanged = true;
-}
-
-void VertexShaderManager::ResetView()
-{
-	memset(s_fViewTranslationVector, 0, sizeof(s_fViewTranslationVector));
-	Matrix33::LoadIdentity(s_viewRotationMatrix);
-	Matrix33::LoadIdentity(s_viewInvRotationMatrix);
-	s_fViewRotation[0] = s_fViewRotation[1] = 0.0f;
-
-	bProjectionChanged = true;
-}
-
-void VertexShaderManager::DoState(PointerWrap &p)
-{
-	p.Do(g_fProjectionMatrix);
-	p.Do(s_viewportCorrection);
-	p.Do(s_viewRotationMatrix);
-	p.Do(s_viewInvRotationMatrix);
-	p.Do(s_fViewTranslationVector);
-	p.Do(s_fViewRotation);
-
-	if (p.GetMode() == PointerWrap::MODE_READ)
-	{
-		Dirty();
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h
deleted file mode 100644
index b4c5d3907c..0000000000
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXSHADERMANAGER_H
-#define _VERTEXSHADERMANAGER_H
-
-#include "VertexShaderGen.h"
-
-class PointerWrap;
-
-void UpdateProjectionHack(int iParams[], std::string sParams[]);
-
-void UpdateViewportWithCorrection();
-
-// The non-API dependent parts.
-class VertexShaderManager
-{
-public:
-	static void Init();
-	static void Dirty();
-	static void Shutdown();
-	static void DoState(PointerWrap &p);
-
-	// constant management
-	static void SetConstants();
-
-	static void InvalidateXFRange(int start, int end);
-	static void SetTexMatrixChangedA(u32 value);
-	static void SetTexMatrixChangedB(u32 value);
-	static void SetViewportChanged();
-	static void SetProjectionChanged();
-	static void SetMaterialColorChanged(int index);
-
-	static void TranslateView(float x, float y, float z = 0.0f);
-	static void RotateView(float x, float y);
-	static void ResetView();
-};
-
-#endif // _VERTEXSHADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.cpp b/Source/Core/VideoCommon/Src/VideoBackendBase.cpp
deleted file mode 100644
index 4769ede3a0..0000000000
--- a/Source/Core/VideoCommon/Src/VideoBackendBase.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoBackendBase.h"
-
-// TODO: ugly
-#ifdef _WIN32
-#include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h"
-#include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
-#endif
-#if !defined(USE_GLES) || USE_GLES3
-#include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
-#endif
-#include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
-
-std::vector<VideoBackend*> g_available_video_backends;
-VideoBackend* g_video_backend = NULL;
-static VideoBackend* s_default_backend = NULL;
-
-#ifdef _WIN32
-#include <windows.h>
-
-// http://msdn.microsoft.com/en-us/library/ms725491.aspx
-static bool IsGteVista() 
-{
-	OSVERSIONINFOEX osvi;
-	DWORDLONG dwlConditionMask = 0;
-
-	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-	osvi.dwMajorVersion = 6;
-
-	VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
-
-	return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE;
-}
-#endif
-
-void VideoBackend::PopulateList()
-{
-	VideoBackend* backends[4] = { NULL };
-
-	// D3D11 > OGL > D3D9 > SW
-#ifdef _WIN32
-	g_available_video_backends.push_back(backends[2] = new DX9::VideoBackend);
-	if (IsGteVista())
-		g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend);
-#endif
-#if !defined(USE_GLES) || USE_GLES3
-	g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend);
-#endif
-	g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
-
-	for (int i = 0; i < 4; ++i)
-	{
-		if (backends[i])
-		{
-			s_default_backend = g_video_backend = backends[i];
-			break;
-		}
-	}
-}
-
-void VideoBackend::ClearList()
-{
-	while (!g_available_video_backends.empty())
-	{
-		delete g_available_video_backends.back();
-		g_available_video_backends.pop_back();
-	}
-}
-
-void VideoBackend::ActivateBackend(const std::string& name)
-{
-	if (name.length() == 0) // If NULL, set it to the default backend (expected behavior)
-		g_video_backend = s_default_backend;
-
-	for (std::vector<VideoBackend*>::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it)
-		if (name == (*it)->GetName())
-			g_video_backend = *it;
-}
diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.h b/Source/Core/VideoCommon/Src/VideoBackendBase.h
deleted file mode 100644
index 9c591d05a5..0000000000
--- a/Source/Core/VideoCommon/Src/VideoBackendBase.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef VIDEO_BACKEND_H_
-#define VIDEO_BACKEND_H_
-
-#include <string>
-#include <vector>
-
-#include "ChunkFile.h"
-#include "../../VideoCommon/Src/PerfQueryBase.h"
-
-typedef void (*writeFn16)(const u16,const u32);
-typedef void (*writeFn32)(const u32,const u32);
-typedef void (*readFn16)(u16&, const u32);
-
-
-enum FieldType
-{
-	FIELD_PROGRESSIVE = 0,
-	FIELD_UPPER,
-	FIELD_LOWER
-};
-
-enum EFBAccessType
-{
-	PEEK_Z = 0,
-	POKE_Z,
-	PEEK_COLOR,
-	POKE_COLOR
-};
-
-struct SCPFifoStruct
-{
-	// fifo registers
-	volatile u32 CPBase;
-	volatile u32 CPEnd;
-	u32 CPHiWatermark;
-	u32 CPLoWatermark;
-	volatile u32 CPReadWriteDistance;
-	volatile u32 CPWritePointer;
-	volatile u32 CPReadPointer;
-	volatile u32 CPBreakpoint;
-	volatile u32 SafeCPReadPointer;
-	// Super Monkey Ball Adventure require this.
-	// Because the read&check-PEToken-loop stays in its JITed block I suppose.
-	// So no possiblity to ack the Token irq by the scheduler until some sort of PPC watchdog do its mess.
-	volatile u16 PEToken;
-
-	volatile u32 bFF_GPLinkEnable;
-	volatile u32 bFF_GPReadEnable;
-	volatile u32 bFF_BPEnable;
-	volatile u32 bFF_BPInt;
-	volatile u32 bFF_Breakpoint;
-
-	volatile u32 CPCmdIdle;
-	volatile u32 CPReadIdle;        
-
-	volatile u32 bFF_LoWatermarkInt;
-	volatile u32 bFF_HiWatermarkInt;
-
-	volatile u32 bFF_LoWatermark;
-	volatile u32 bFF_HiWatermark;
-
-	// for GP watchdog hack
-	volatile u32 Fake_GPWDToken; // cicular incrementer
-	volatile u32 isGpuReadingData;
-};
-
-class VideoBackend
-{
-public:
-	virtual ~VideoBackend() {}
-
-	virtual void EmuStateChange(EMUSTATE_CHANGE) = 0;
-
-	virtual void UpdateFPSDisplay(const char*) = 0;
-
-	virtual unsigned int PeekMessages() = 0;
-
-	virtual bool Initialize(void *&) = 0;
-	virtual void Shutdown() = 0;
-	virtual void RunLoop(bool enable) = 0;
-
-	virtual std::string GetName() = 0;
-	virtual std::string GetDisplayName() { return GetName(); }
-
-	virtual void ShowConfig(void*) {}
-
-	virtual void Video_Prepare() = 0;
-	virtual void Video_EnterLoop() = 0;
-	virtual void Video_ExitLoop() = 0;
-	virtual void Video_Cleanup() = 0; // called from gl/d3d thread
-
-	virtual void Video_BeginField(u32, FieldType, u32, u32) = 0;
-	virtual void Video_EndField() = 0;
-
-	virtual u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) = 0;
-	virtual u32 Video_GetQueryResult(PerfQueryType type) = 0;
-
-	virtual void Video_AddMessage(const char* pstr, unsigned int milliseconds) = 0;
-	virtual void Video_ClearMessages() = 0;
-	virtual bool Video_Screenshot(const char* filename) = 0;
-
-	virtual void Video_SetRendering(bool bEnabled) = 0;
-
-	virtual void Video_GatherPipeBursted() = 0;
-
-	virtual bool Video_IsPossibleWaitingSetDrawDone() = 0;
-	virtual bool Video_IsHiWatermarkActive() = 0;
-	virtual void Video_AbortFrame() = 0;
-
-	virtual readFn16  Video_CPRead16() = 0;
-	virtual writeFn16 Video_CPWrite16() = 0;
-	virtual readFn16  Video_PERead16() = 0;
-	virtual writeFn16 Video_PEWrite16() = 0;
-	virtual writeFn32 Video_PEWrite32() = 0;
-
-	static void PopulateList();
-	static void ClearList();
-	static void ActivateBackend(const std::string& name);
-
-	// waits until is paused and fully idle, and acquires a lock on that state.
-	// or, if doLock is false, releases a lock on that state and optionally unpauses.
-	// calls must be balanced and non-recursive (once with doLock true, then once with doLock false).
-	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) = 0;
-
-	// the implementation needs not do synchronization logic, because calls to it are surrounded by PauseAndLock now
-	virtual void DoState(PointerWrap &p) = 0;
-	
-	virtual void CheckInvalidState() = 0;
-};
-
-extern std::vector<VideoBackend*> g_available_video_backends;
-extern VideoBackend* g_video_backend;
-
-// inherited by dx9/dx11/ogl backends
-class VideoBackendHardware : public VideoBackend
-{
-	void RunLoop(bool enable);
-	bool Initialize(void *&) { InitializeShared(); return true; }
-
-	void EmuStateChange(EMUSTATE_CHANGE);
-
-	void Video_EnterLoop();
-	void Video_ExitLoop();
-	void Video_BeginField(u32, FieldType, u32, u32);
-	void Video_EndField();
-
-	u32 Video_AccessEFB(EFBAccessType, u32, u32, u32);
-	u32 Video_GetQueryResult(PerfQueryType type);
-	
-	void Video_AddMessage(const char* pstr, unsigned int milliseconds);
-	void Video_ClearMessages();
-	bool Video_Screenshot(const char* filename);
-
-	void Video_SetRendering(bool bEnabled);
-
-	void Video_GatherPipeBursted();
-
-	bool Video_IsPossibleWaitingSetDrawDone();
-	bool Video_IsHiWatermarkActive();
-	void Video_AbortFrame();
-
-	readFn16  Video_CPRead16();
-	writeFn16 Video_CPWrite16();
-	readFn16  Video_PERead16();
-	writeFn16 Video_PEWrite16();
-	writeFn32 Video_PEWrite32();
-
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-	void DoState(PointerWrap &p);
-	
-	bool m_invalid;
-	
-public:
-	 void CheckInvalidState();
-
-protected:
-	void InitializeShared();
-	void InvalidState();
-};
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
deleted file mode 100644
index c85a6e382a..0000000000
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VIDEOCOMMON_H
-#define _VIDEOCOMMON_H
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include "Common.h"
-#include "MathUtil.h"
-#include "VideoBackendBase.h"
-
-#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64)
-void * memcpy_amd(void *dest, const void *src, size_t n);
-unsigned char memcmp_mmx(const void* src1, const void* src2, int cmpsize);
-#define memcpy_gc memcpy_amd
-#define memcmp_gc memcmp_mmx
-#else
-#define memcpy_gc memcpy
-#define memcmp_gc memcmp
-#endif
-
-// These are accurate (disregarding AA modes).
-enum
-{
-	EFB_WIDTH = 640,
-	EFB_HEIGHT = 528,
-};
-
-// XFB width is decided by EFB copy operation. The VI can do horizontal
-// scaling (TODO: emulate).
-const u32 MAX_XFB_WIDTH = EFB_WIDTH;
-
-// Although EFB height is 528, 574-line XFB's can be created either with
-// vertical scaling by the EFB copy operation or copying to multiple XFB's
-// that are next to each other in memory (TODO: handle that situation).
-const u32 MAX_XFB_HEIGHT = 574;
-
-// Logging
-// ----------
-void HandleGLError();
-
-
-// This structure should only be used to represent a rectangle in EFB
-// coordinates, where the origin is at the upper left and the frame dimensions
-// are 640 x 528.
-typedef MathUtil::Rectangle<int> EFBRectangle;
-
-// This structure should only be used to represent a rectangle in standard target
-// coordinates, where the origin is at the lower left and the frame dimensions
-// depend on the resolution settings. Use Renderer::ConvertEFBRectangle to
-// convert an EFBRectangle to a TargetRectangle.
-struct TargetRectangle : public MathUtil::Rectangle<int>
-{
-#ifdef _WIN32
-	// Only used by D3D backend.
-	const RECT *AsRECT() const
-	{
-		// The types are binary compatible so this works.
-		return (const RECT *)this;
-	}
-	RECT *AsRECT()
-	{
-		// The types are binary compatible so this works.
-		return (RECT *)this;
-	}
-#endif
-};
-
-#ifdef _WIN32
-#define PRIM_LOG(...) DEBUG_LOG(VIDEO, __VA_ARGS__)
-#else
-#define PRIM_LOG(...) DEBUG_LOG(VIDEO, ##__VA_ARGS__)
-#endif
-
-// warning: mapping buffer should be disabled to use this
-// #define LOG_VTX() DEBUG_LOG(VIDEO, "vtx: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[-3], ((float*)VertexManager::s_pCurBufferPointer)[-2], ((float*)VertexManager::s_pCurBufferPointer)[-1]);
-
-#define LOG_VTX()
-
-typedef enum
-{
-	API_OPENGL = 1,
-	API_D3D9_SM30 = 2,
-	API_D3D9_SM20 = 4,
-	API_D3D9 = 6,	
-	API_D3D11 = 8,
-	API_NONE = 16
-} API_TYPE;
-
-inline u32 RGBA8ToRGBA6ToRGBA8(u32 src)
-{
-	u32 color = src;
-	color &= 0xFCFCFCFC;
-	color |= (color >> 6) & 0x03030303;
-	return color;
-}
-
-inline u32 RGBA8ToRGB565ToRGBA8(u32 src)
-{
-	u32 color = (src & 0xF8FCF8);
-	color |= (color >> 5) & 0x070007;
-	color |= (color >> 6) & 0x000300;
-	color |= 0xFF000000;
-	return color;
-}
-
-inline u32 Z24ToZ16ToZ24(u32 src)
-{
-	return (src & 0xFFFF00) | (src >> 16);
-}
-
-/* Returns the smallest power of 2 which is greater than or equal to num */
-inline u32 MakePow2(u32 num)
-{
-	--num;
-	num |= num >> 1;
-	num |= num >> 2;
-	num |= num >> 4;
-	num |= num >> 8;
-	num |= num >> 16;
-	++num;
-	return num;
-}
-
-// returns the exponent of the smallest power of two which is greater than val
-inline unsigned int GetPow2(unsigned int val)
-{
-	unsigned int ret = 0;
-	for (; val; val >>= 1)
-		++ret;
-	return ret;
-}
-struct s_svar
-{
-	const char *name;
-	const unsigned int reg;
-	const unsigned int size;
-};
-
-#endif  // _VIDEOCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
deleted file mode 100644
index e81807985a..0000000000
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <cmath>
-
-#include "Common.h"
-#include "IniFile.h"
-#include "VideoConfig.h"
-#include "VideoCommon.h"
-#include "FileUtil.h"
-#include "Core.h"
-#include "Movie.h"
-#include "OnScreenDisplay.h"
-
-VideoConfig g_Config;
-VideoConfig g_ActiveConfig;
-
-void UpdateActiveConfig()
-{
-	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
-		Movie::SetGraphicsConfig();
-	g_ActiveConfig = g_Config;
-}
-
-VideoConfig::VideoConfig()
-{
-	bRunning = false;
-
-	// Needed for the first frame, I think
-	fAspectRatioHackW = 1;
-	fAspectRatioHackH = 1;
-
-	// disable all features by default
-	backend_info.APIType = API_NONE;
-	backend_info.bUseRGBATextures = false;
-	backend_info.bUseMinimalMipCount = false;
-	backend_info.bSupports3DVision = false;
-}
-
-void VideoConfig::Load(const char *ini_file)
-{
-	IniFile iniFile;
-	iniFile.Load(ini_file);
-
-	iniFile.Get("Hardware", "VSync", &bVSync, 0); // Hardware
-	iniFile.Get("Settings", "wideScreenHack", &bWidescreenHack, false);
-	iniFile.Get("Settings", "AspectRatio", &iAspectRatio, (int)ASPECT_AUTO);
-	iniFile.Get("Settings", "Crop", &bCrop, false);
-	iniFile.Get("Settings", "UseXFB", &bUseXFB, 0);
-	iniFile.Get("Settings", "UseRealXFB", &bUseRealXFB, 0);
-	iniFile.Get("Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples,128);
-	iniFile.Get("Settings", "ShowFPS", &bShowFPS, false); // Settings
-	iniFile.Get("Settings", "LogFPSToFile", &bLogFPSToFile, false);
-	iniFile.Get("Settings", "ShowInputDisplay", &bShowInputDisplay, false);
-	iniFile.Get("Settings", "OverlayStats", &bOverlayStats, false);
-	iniFile.Get("Settings", "OverlayProjStats", &bOverlayProjStats, false);
-	iniFile.Get("Settings", "ShowEFBCopyRegions", &bShowEFBCopyRegions, false);
-	iniFile.Get("Settings", "DLOptimize", &iCompileDLsLevel, 0);
-	iniFile.Get("Settings", "DumpTextures", &bDumpTextures, 0);
-	iniFile.Get("Settings", "HiresTextures", &bHiresTextures, 0);
-	iniFile.Get("Settings", "DumpEFBTarget", &bDumpEFBTarget, 0);
-	iniFile.Get("Settings", "DumpFrames", &bDumpFrames, 0);
-	iniFile.Get("Settings", "FreeLook", &bFreeLook, 0);
-	iniFile.Get("Settings", "UseFFV1", &bUseFFV1, 0);
-	iniFile.Get("Settings", "AnaglyphStereo", &bAnaglyphStereo, false);
-	iniFile.Get("Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation, 200);
-	iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0);
-	iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0);
-	iniFile.Get("Settings", "HackedBufferUpload", &bHackedBufferUpload, 0);
-	iniFile.Get("Settings", "FastDepthCalc", &bFastDepthCalc, true);
-
-	iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0);
-	iniFile.Get("Settings", "EFBScale", &iEFBScale, (int) SCALE_1X); // native
-
-	iniFile.Get("Settings", "DstAlphaPass", &bDstAlphaPass, false);
-
-	iniFile.Get("Settings", "TexFmtOverlayEnable", &bTexFmtOverlayEnable, 0);
-	iniFile.Get("Settings", "TexFmtOverlayCenter", &bTexFmtOverlayCenter, 0);
-	iniFile.Get("Settings", "WireFrame", &bWireFrame, 0);
-	iniFile.Get("Settings", "DisableFog", &bDisableFog, 0);
-
-	iniFile.Get("Settings", "EnableOpenCL", &bEnableOpenCL, false);
-	iniFile.Get("Settings", "OMPDecoder", &bOMPDecoder, false);
-
-	iniFile.Get("Settings", "EnableShaderDebugging", &bEnableShaderDebugging, false);
-
-	iniFile.Get("Enhancements", "ForceFiltering", &bForceFiltering, 0);
-	iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 0);  // NOTE - this is x in (1 << x)
-	iniFile.Get("Enhancements", "PostProcessingShader", &sPostProcessingShader, "");
-	iniFile.Get("Enhancements", "Enable3dVision", &b3DVision, false);
-
-	iniFile.Get("Hacks", "EFBAccessEnable", &bEFBAccessEnable, true);
-	iniFile.Get("Hacks", "DlistCachingEnable", &bDlistCachingEnable,false);
-	iniFile.Get("Hacks", "EFBCopyEnable", &bEFBCopyEnable, true);
-	iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToTexture, true);
-	iniFile.Get("Hacks", "EFBScaledCopy", &bCopyEFBScaled, true);
-	iniFile.Get("Hacks", "EFBCopyCacheEnable", &bEFBCopyCacheEnable, false);
-	iniFile.Get("Hacks", "EFBEmulateFormatChanges", &bEFBEmulateFormatChanges, false);
-	iniFile.Get("Hacks", "ForceDualSourceBlend", &bForceDualSourceBlend, false);
-
-	iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
-
-	// Load common settings
-	iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
-	bool bTmp;
-	iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true);
-	SetEnableAlert(bTmp);
-
-	// Shader Debugging causes a huge slowdown and it's easy to forget about it
-	// since it's not exposed in the settings dialog. It's only used by
-	// developers, so displaying an obnoxious message avoids some confusion and
-	// is not too annoying/confusing for users.
-	//
-	// XXX(delroth): This is kind of a bad place to put this, but the current
-	// VideoCommon is a mess and we don't have a central initialization
-	// function to do these kind of checks. Instead, the init code is
-	// triplicated for each video backend.
-	if (bEnableShaderDebugging)
-		OSD::AddMessage("Warning: Shader Debugging is enabled, performance will suffer heavily", 15000);
-}
-
-void VideoConfig::GameIniLoad(const char* default_ini_file, const char* local_ini_file)
-{
-	bool gfx_override_exists = false;
-
-	// XXX: Again, bad place to put OSD messages at (see delroth's comment above)
-	// XXX: This will add an OSD message for each projection hack value... meh
-#define CHECK_SETTING(section, key, var) do { \
-		decltype(var) temp = var; \
-		if (iniFile.GetIfExists(section, key, &var) && var != temp) { \
-			char buf[256]; \
-			snprintf(buf, sizeof(buf), "Note: Option \"%s\" is overridden by game ini.", key); \
-			OSD::AddMessage(buf, 7500); \
-			gfx_override_exists = true; \
-		} \
-	} while (0)
-
-	IniFile iniFile;
-	iniFile.Load(default_ini_file);
-	iniFile.Load(local_ini_file, true);
-
-	CHECK_SETTING("Video_Hardware", "VSync", bVSync);
-
-	CHECK_SETTING("Video_Settings", "wideScreenHack", bWidescreenHack);
-	CHECK_SETTING("Video_Settings", "AspectRatio", iAspectRatio);
-	CHECK_SETTING("Video_Settings", "Crop", bCrop);
-	CHECK_SETTING("Video_Settings", "UseXFB", bUseXFB);
-	CHECK_SETTING("Video_Settings", "UseRealXFB", bUseRealXFB);
-	CHECK_SETTING("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
-	CHECK_SETTING("Video_Settings", "DLOptimize", iCompileDLsLevel);
-	CHECK_SETTING("Video_Settings", "HiresTextures", bHiresTextures);
-	CHECK_SETTING("Video_Settings", "AnaglyphStereo", bAnaglyphStereo);
-	CHECK_SETTING("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation);
-	CHECK_SETTING("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
-	CHECK_SETTING("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
-	CHECK_SETTING("Video_Settings", "HackedBufferUpload", bHackedBufferUpload);
-	CHECK_SETTING("Video_Settings", "FastDepthCalc", bFastDepthCalc);
-	CHECK_SETTING("Video_Settings", "MSAA", iMultisampleMode);
-	int tmp = -9000;
-	CHECK_SETTING("Video_Settings", "EFBScale", tmp); // integral
-	if (tmp != -9000)
-	{
-		if (tmp != SCALE_FORCE_INTEGRAL)
-		{
-			iEFBScale = tmp;
-		}
-		else // Round down to multiple of native IR
-		{
-			switch (iEFBScale)
-			{
-			case SCALE_AUTO:
-				iEFBScale = SCALE_AUTO_INTEGRAL;
-				break;
-			case SCALE_1_5X:
-				iEFBScale = SCALE_1X;
-				break;
-			case SCALE_2_5X:
-				iEFBScale = SCALE_2X;
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	CHECK_SETTING("Video_Settings", "DstAlphaPass", bDstAlphaPass);
-	CHECK_SETTING("Video_Settings", "DisableFog", bDisableFog);
-	CHECK_SETTING("Video_Settings", "EnableOpenCL", bEnableOpenCL);
-	CHECK_SETTING("Video_Settings", "OMPDecoder", bOMPDecoder);
-
-	CHECK_SETTING("Video_Enhancements", "ForceFiltering", bForceFiltering);
-	CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy);  // NOTE - this is x in (1 << x)
-	CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
-	CHECK_SETTING("Video_Enhancements", "Enable3dVision", b3DVision);
-
-	CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable);
-	CHECK_SETTING("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable);
-	CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable);
-	CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
-	CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled);
-	CHECK_SETTING("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable);
-	CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
-
-	CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]);
-	CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]);
-	CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]);
-	CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]);
-	CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]);
-	CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]);
-	CHECK_SETTING("Video", "ZTPSpeedupHack", bZTPSpeedHack);
-	CHECK_SETTING("Video", "UseBBox", bUseBBox);
-	CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable);
-
-	if (gfx_override_exists)
-		OSD::AddMessage("Warning: Opening the graphics configuration will reset settings and might cause issues!", 10000);
-}
-
-void VideoConfig::VerifyValidity()
-{
-	// TODO: Check iMaxAnisotropy value
-	if (iAdapter < 0 || iAdapter > ((int)backend_info.Adapters.size() - 1)) iAdapter = 0;
-	if (iMultisampleMode < 0 || iMultisampleMode >= (int)backend_info.AAModes.size()) iMultisampleMode = 0;
-	if (!backend_info.bSupports3DVision) b3DVision = false;
-	if (!backend_info.bSupportsFormatReinterpretation) bEFBEmulateFormatChanges = false;
-	if (!backend_info.bSupportsPixelLighting) bEnablePixelLighting = false;
-	if (backend_info.APIType != API_OPENGL) backend_info.bSupportsGLSLUBO = false;
-}
-
-void VideoConfig::Save(const char *ini_file)
-{
-	IniFile iniFile;
-	iniFile.Load(ini_file);
-	iniFile.Set("Hardware", "VSync", bVSync);
-	iniFile.Set("Settings", "AspectRatio", iAspectRatio);
-	iniFile.Set("Settings", "Crop", bCrop);
-	iniFile.Set("Settings", "wideScreenHack", bWidescreenHack);
-	iniFile.Set("Settings", "UseXFB", bUseXFB);
-	iniFile.Set("Settings", "UseRealXFB", bUseRealXFB);
-	iniFile.Set("Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
-	iniFile.Set("Settings", "ShowFPS", bShowFPS);
-	iniFile.Set("Settings", "LogFPSToFile", bLogFPSToFile);
-	iniFile.Set("Settings", "ShowInputDisplay", bShowInputDisplay);
-	iniFile.Set("Settings", "OverlayStats", bOverlayStats);
-	iniFile.Set("Settings", "OverlayProjStats", bOverlayProjStats);
-	iniFile.Set("Settings", "DLOptimize", iCompileDLsLevel);
-	iniFile.Set("Settings", "Show", iCompileDLsLevel);
-	iniFile.Set("Settings", "DumpTextures", bDumpTextures);
-	iniFile.Set("Settings", "HiresTextures", bHiresTextures);
-	iniFile.Set("Settings", "DumpEFBTarget", bDumpEFBTarget);
-	iniFile.Set("Settings", "DumpFrames", bDumpFrames);
-	iniFile.Set("Settings", "FreeLook", bFreeLook);
-	iniFile.Set("Settings", "UseFFV1", bUseFFV1);
-	iniFile.Set("Settings", "AnaglyphStereo", bAnaglyphStereo);
-	iniFile.Set("Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation);
-	iniFile.Set("Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
-	iniFile.Set("Settings", "EnablePixelLighting", bEnablePixelLighting);
-	iniFile.Set("Settings", "HackedBufferUpload", bHackedBufferUpload);
-	iniFile.Set("Settings", "FastDepthCalc", bFastDepthCalc);
-
-	iniFile.Set("Settings", "ShowEFBCopyRegions", bShowEFBCopyRegions);
-	iniFile.Set("Settings", "MSAA", iMultisampleMode);
-	iniFile.Set("Settings", "EFBScale", iEFBScale);
-	iniFile.Set("Settings", "TexFmtOverlayEnable", bTexFmtOverlayEnable);
-	iniFile.Set("Settings", "TexFmtOverlayCenter", bTexFmtOverlayCenter);
-	iniFile.Set("Settings", "Wireframe", bWireFrame);
-	iniFile.Set("Settings", "DstAlphaPass", bDstAlphaPass);
-	iniFile.Set("Settings", "DisableFog", bDisableFog);
-
-	iniFile.Set("Settings", "EnableOpenCL", bEnableOpenCL);
-	iniFile.Set("Settings", "OMPDecoder", bOMPDecoder);
-
-	iniFile.Set("Settings", "EnableShaderDebugging", bEnableShaderDebugging);
-
-	iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering);
-	iniFile.Set("Enhancements", "MaxAnisotropy", iMaxAnisotropy);
-	iniFile.Set("Enhancements", "PostProcessingShader", sPostProcessingShader);
-	iniFile.Set("Enhancements", "Enable3dVision", b3DVision);
-
-	iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable);
-	iniFile.Set("Hacks", "DlistCachingEnable", bDlistCachingEnable);
-	iniFile.Set("Hacks", "EFBCopyEnable", bEFBCopyEnable);
-	iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
-	iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled);
-	iniFile.Set("Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable);
-	iniFile.Set("Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
-	iniFile.Set("Hacks", "ForceDualSourceBlend", bForceDualSourceBlend);
-
-	iniFile.Set("Hardware", "Adapter", iAdapter);
-
-	iniFile.Save(ini_file);
-}
-
-bool VideoConfig::IsVSync()
-{
-	return Core::isTabPressed ? false : bVSync;
-}
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
deleted file mode 100644
index cfb4a1ccde..0000000000
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// IMPORTANT: UI etc should modify g_Config. Graphics code should read g_ActiveConfig.
-// The reason for this is to get rid of race conditions etc when the configuration
-// changes in the middle of a frame. This is done by copying g_Config to g_ActiveConfig
-// at the start of every frame. Noone should ever change members of g_ActiveConfig 
-// directly.
-
-#ifndef _VIDEO_CONFIG_H_
-#define _VIDEO_CONFIG_H_
-
-#include "Common.h"
-#include "VideoCommon.h"
-
-#include <vector>
-#include <string>
-
-// Log in two categories, and save three other options in the same byte
-#define CONF_LOG			1
-#define CONF_PRIMLOG		2
-#define CONF_SAVETARGETS	8
-#define CONF_SAVESHADERS	16
-
-enum AspectMode {
-	ASPECT_AUTO = 0,
-	ASPECT_FORCE_16_9 = 1,
-	ASPECT_FORCE_4_3 = 2,
-	ASPECT_STRETCH = 3,
-};
-
-enum EFBScale {
-	SCALE_FORCE_INTEGRAL = -1,
-	SCALE_AUTO,
-	SCALE_AUTO_INTEGRAL,
-	SCALE_1X,
-	SCALE_1_5X,
-	SCALE_2X,
-	SCALE_2_5X,
-	SCALE_3X,
-	SCALE_4X,
-};
-
-class IniFile;
-
-// NEVER inherit from this class.
-struct VideoConfig
-{
-	VideoConfig();
-	void Load(const char *ini_file);
-	void GameIniLoad(const char* default_ini, const char* game_ini);
-	void VerifyValidity();
-	void Save(const char *ini_file);
-	void GameIniSave(const char* default_ini, const char* game_ini);
-	void UpdateProjectionHack();
-	bool IsVSync();
-
-	// General
-	bool bVSync;
-
-	bool bRunning;
-	bool bWidescreenHack;
-	int iAspectRatio;
-	bool bCrop;   // Aspect ratio controls.
-	bool bUseXFB;
-	bool bUseRealXFB;
-
-	// OpenCL/OpenMP
-	bool bEnableOpenCL;
-	bool bOMPDecoder;
-
-	// Enhancements
-	int iMultisampleMode;
-	int iEFBScale;
-	bool bForceFiltering;
-	int iMaxAnisotropy;
-	std::string sPostProcessingShader;
-
-	// Information
-	bool bShowFPS;
-	bool bShowInputDisplay;
-	bool bOverlayStats;
-	bool bOverlayProjStats;
-	bool bTexFmtOverlayEnable;
-	bool bTexFmtOverlayCenter;
-	bool bShowEFBCopyRegions;
-	bool bLogFPSToFile;
-
-	// Render
-	bool bWireFrame;
-	bool bDstAlphaPass;
-	bool bDisableFog;
-
-	// Utility
-	bool bDumpTextures;
-	bool bHiresTextures;
-	bool bDumpEFBTarget;
-	bool bDumpFrames;
-	bool bUseFFV1;
-	bool bFreeLook;
-	bool bAnaglyphStereo;
-	int iAnaglyphStereoSeparation;
-	int iAnaglyphFocalAngle;
-	bool b3DVision;
-
-	// Hacks
-	bool bEFBAccessEnable;
-	bool bDlistCachingEnable;
-	bool bPerfQueriesEnable;
-
-	bool bEFBCopyEnable;
-	bool bEFBCopyCacheEnable;
-	bool bEFBEmulateFormatChanges;
-	bool bCopyEFBToTexture;	
-	bool bCopyEFBScaled;
-	int iSafeTextureCache_ColorSamples;
-	int iPhackvalue[4];
-	std::string sPhackvalue[2];
-	float fAspectRatioHackW, fAspectRatioHackH;
-	bool bZTPSpeedHack; // The Legend of Zelda: Twilight Princess
-	bool bUseBBox;
-	bool bEnablePixelLighting;
-	bool bHackedBufferUpload;
-	bool bFastDepthCalc;
-	//for dx9-backend
-	bool bForceDualSourceBlend;
-	int iLog; // CONF_ bits
-	int iSaveTargetId; // TODO: Should be dropped
-
-	//currently unused:
-	int iCompileDLsLevel;
-
-	// D3D only config, mostly to be merged into the above
-	int iAdapter;
-
-	// Debugging
-	bool bEnableShaderDebugging;
-
-	// Static config per API
-	// TODO: Move this out of VideoConfig
-	struct
-	{
-		API_TYPE APIType;
-
-		std::vector<std::string> Adapters; // for D3D9 and D3D11
-		std::vector<std::string> AAModes;
-		std::vector<std::string> PPShaders; // post-processing shaders
-
-		bool bUseRGBATextures; // used for D3D11 in TextureCache
-		bool bUseMinimalMipCount;
-		bool bSupports3DVision;
-		bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL
-		bool bSupportsFormatReinterpretation;
-		bool bSupportsPixelLighting;
-		bool bSupportsPrimitiveRestart;
-		bool bSupportsSeparateAlphaFunction;
-		bool bSupportsGLSLUBO; // needed by PixelShaderGen, so must stay in VideoCommon
-		bool bSupportsEarlyZ; // needed by PixelShaderGen, so must stay in VideoCommon
-	} backend_info;
-
-	// Utility
-	bool RealXFBEnabled() const { return bUseXFB && bUseRealXFB; }
-	bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; }
-	bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; }
-	bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; }
-};
-
-extern VideoConfig g_Config;
-extern VideoConfig g_ActiveConfig;
-
-// Called every frame.
-void UpdateActiveConfig();
-
-#endif  // _VIDEO_CONFIG_H_
diff --git a/Source/Core/VideoCommon/Src/VideoState.cpp b/Source/Core/VideoCommon/Src/VideoState.cpp
deleted file mode 100644
index 00d6eba320..0000000000
--- a/Source/Core/VideoCommon/Src/VideoState.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoState.h"
-
-#include "BPMemory.h"
-#include "CPMemory.h"
-#include "XFMemory.h"
-#include "TextureDecoder.h"
-#include "Fifo.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderManager.h"
-#include "VertexManagerBase.h"
-
-static void DoState(PointerWrap &p)
-{
-	// BP Memory
-	p.Do(bpmem);
-	p.DoMarker("BP Memory");
-
-	// CP Memory
-	p.DoArray(arraybases, 16);
-	p.DoArray(arraystrides, 16);
-	p.Do(MatrixIndexA);
-	p.Do(MatrixIndexB);
-	p.Do(g_VtxDesc.Hex);
-	p.DoArray(g_VtxAttr, 8);
-	p.DoMarker("CP Memory");
-
-	// XF Memory
-	p.Do(xfregs);
-	p.DoArray(xfmem, XFMEM_SIZE);
-	p.DoMarker("XF Memory");
-
-	// Texture decoder
-	p.DoArray(texMem, TMEM_SIZE);
-	p.DoMarker("texMem");
- 
-	// FIFO
-	Fifo_DoState(p);
-	p.DoMarker("Fifo");
-
-	CommandProcessor::DoState(p);
-	p.DoMarker("CommandProcessor");
-
-	PixelEngine::DoState(p);
-	p.DoMarker("PixelEngine");
-
-	// the old way of replaying current bpmem as writes to push side effects to pixel shader manager doesn't really work.
-	PixelShaderManager::DoState(p);
-	p.DoMarker("PixelShaderManager");
-
-	VertexShaderManager::DoState(p);
-	p.DoMarker("VertexShaderManager");
-
-	VertexManager::DoState(p);
-	p.DoMarker("VertexManager");
-
-	// TODO: search for more data that should be saved and add it here
-}
-
-void VideoCommon_DoState(PointerWrap &p)
-{
-	DoState(p);
-}
-
-void VideoCommon_RunLoop(bool enable)
-{
-	EmulatorState(enable);
-}
-
-void VideoCommon_Init()
-{
-	memset(arraybases, 0, sizeof(arraybases));
-	memset(arraystrides, 0, sizeof(arraystrides));
-	memset(&MatrixIndexA, 0, sizeof(MatrixIndexA));
-	memset(&MatrixIndexB, 0, sizeof(MatrixIndexB));
-	memset(&g_VtxDesc, 0, sizeof(g_VtxDesc));
-	memset(g_VtxAttr, 0, sizeof(g_VtxAttr));
-	memset(texMem, 0, TMEM_SIZE);
-}
diff --git a/Source/Core/VideoCommon/Src/VideoState.h b/Source/Core/VideoCommon/Src/VideoState.h
deleted file mode 100644
index 2c18460ac8..0000000000
--- a/Source/Core/VideoCommon/Src/VideoState.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VIDEOSTATE_H
-#define _VIDEOSTATE_H
-
-#include "Common.h"
-#include "ChunkFile.h"
-
-void VideoCommon_DoState(PointerWrap &p);
-void VideoCommon_RunLoop(bool enable);
-void VideoCommon_Init();
-
-#endif // _VIDEOSTATE_H
diff --git a/Source/Core/VideoCommon/Src/XFMemory.cpp b/Source/Core/VideoCommon/Src/XFMemory.cpp
deleted file mode 100644
index 139cc35940..0000000000
--- a/Source/Core/VideoCommon/Src/XFMemory.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "XFMemory.h"
-
-// STATE_TO_SAVE
-XFRegisters xfregs;
-u32 xfmem[XFMEM_SIZE];
diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp
deleted file mode 100644
index a2f2097e07..0000000000
--- a/Source/Core/VideoCommon/Src/XFStructs.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "XFMemory.h"
-#include "CPMemory.h"
-#include "VertexManagerBase.h"
-#include "VertexShaderManager.h"
-#include "PixelShaderManager.h"
-#include "HW/Memmap.h"
-
-void XFMemWritten(u32 transferSize, u32 baseAddress)
-{
-	VertexManager::Flush();
-	VertexShaderManager::InvalidateXFRange(baseAddress, baseAddress + transferSize);
-	PixelShaderManager::InvalidateXFRange(baseAddress, baseAddress + transferSize);
-}
-
-void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData)
-{
-	u32 address = baseAddress;
-	u32 dataIndex = 0;
-
-	while (transferSize > 0 && address < 0x1058)
-	{
-		u32 newValue = pData[dataIndex];
-		u32 nextAddress = address + 1;
-
-		switch (address)
-		{
-		case XFMEM_ERROR:
-		case XFMEM_DIAG:
-		case XFMEM_STATE0: // internal state 0
-		case XFMEM_STATE1: // internal state 1
-		case XFMEM_CLOCK:
-		case XFMEM_SETGPMETRIC:
-			nextAddress = 0x1007;
-			break;
-
-		case XFMEM_CLIPDISABLE:
-			//if (data & 1) {} // disable clipping detection
-			//if (data & 2) {} // disable trivial rejection
-			//if (data & 4) {} // disable cpoly clipping acceleration
-			break;
-
-		case XFMEM_VTXSPECS: //__GXXfVtxSpecs, wrote 0004
-			break;
-
-		case XFMEM_SETNUMCHAN:
-			if (xfregs.numChan.numColorChans != (newValue & 3))
-				VertexManager::Flush();
-			break;
-
-		case XFMEM_SETCHAN0_AMBCOLOR: // Channel Ambient Color
-		case XFMEM_SETCHAN1_AMBCOLOR:
-			{
-				u8 chan = address - XFMEM_SETCHAN0_AMBCOLOR;
-				if (xfregs.ambColor[chan] != newValue) 
-				{
-					VertexManager::Flush();
-					VertexShaderManager::SetMaterialColorChanged(chan);
-					PixelShaderManager::SetMaterialColorChanged(chan);
-				}
-				break;
-			}
-
-		case XFMEM_SETCHAN0_MATCOLOR: // Channel Material Color
-		case XFMEM_SETCHAN1_MATCOLOR:
-			{
-				u8 chan = address - XFMEM_SETCHAN0_MATCOLOR;
-				if (xfregs.matColor[chan] != newValue)
-				{
-					VertexManager::Flush();
-					VertexShaderManager::SetMaterialColorChanged(chan + 2);
-					PixelShaderManager::SetMaterialColorChanged(chan + 2);
-				}
-				break;
-			}
-
-		case XFMEM_SETCHAN0_COLOR: // Channel Color
-		case XFMEM_SETCHAN1_COLOR:
-		case XFMEM_SETCHAN0_ALPHA: // Channel Alpha
-		case XFMEM_SETCHAN1_ALPHA:
-			if (((u32*)&xfregs)[address - 0x1000] != (newValue & 0x7fff))
-				VertexManager::Flush();
-			break;
-
-		case XFMEM_DUALTEX:
-			if (xfregs.dualTexTrans.enabled != (newValue & 1))
-				VertexManager::Flush();
-			break;
-
-
-		case XFMEM_SETMATRIXINDA:
-			//_assert_msg_(GX_XF, 0, "XF matrixindex0");
-			VertexShaderManager::SetTexMatrixChangedA(newValue);
-			break;
-		case XFMEM_SETMATRIXINDB:
-			//_assert_msg_(GX_XF, 0, "XF matrixindex1");
-			VertexShaderManager::SetTexMatrixChangedB(newValue);
-			break;
-
-		case XFMEM_SETVIEWPORT:
-		case XFMEM_SETVIEWPORT+1:
-		case XFMEM_SETVIEWPORT+2:
-		case XFMEM_SETVIEWPORT+3:
-		case XFMEM_SETVIEWPORT+4:
-		case XFMEM_SETVIEWPORT+5:
-			VertexManager::Flush();
-			VertexShaderManager::SetViewportChanged();
-			PixelShaderManager::SetViewportChanged();
-
-			nextAddress = XFMEM_SETVIEWPORT + 6;
-			break;
-
-		case XFMEM_SETPROJECTION:
-		case XFMEM_SETPROJECTION+1:
-		case XFMEM_SETPROJECTION+2:
-		case XFMEM_SETPROJECTION+3:
-		case XFMEM_SETPROJECTION+4:
-		case XFMEM_SETPROJECTION+5:
-		case XFMEM_SETPROJECTION+6:
-			VertexManager::Flush();
-			VertexShaderManager::SetProjectionChanged();
-
-			nextAddress = XFMEM_SETPROJECTION + 7;
-			break;
-
-		case XFMEM_SETNUMTEXGENS: // GXSetNumTexGens
-			if (xfregs.numTexGen.numTexGens != (newValue & 15))
-				VertexManager::Flush();
-			break;
-
-		case XFMEM_SETTEXMTXINFO:
-		case XFMEM_SETTEXMTXINFO+1:
-		case XFMEM_SETTEXMTXINFO+2:
-		case XFMEM_SETTEXMTXINFO+3:
-		case XFMEM_SETTEXMTXINFO+4:
-		case XFMEM_SETTEXMTXINFO+5:
-		case XFMEM_SETTEXMTXINFO+6:
-		case XFMEM_SETTEXMTXINFO+7:
-			VertexManager::Flush();
-
-			nextAddress = XFMEM_SETTEXMTXINFO + 8;
-			break;
-
-		case XFMEM_SETPOSMTXINFO:
-		case XFMEM_SETPOSMTXINFO+1:
-		case XFMEM_SETPOSMTXINFO+2:
-		case XFMEM_SETPOSMTXINFO+3:
-		case XFMEM_SETPOSMTXINFO+4:
-		case XFMEM_SETPOSMTXINFO+5:
-		case XFMEM_SETPOSMTXINFO+6:
-		case XFMEM_SETPOSMTXINFO+7:
-			VertexManager::Flush();
-
-			nextAddress = XFMEM_SETPOSMTXINFO + 8;
-			break;
-
-		// --------------
-		// Unknown Regs
-		// --------------
-
-		// Maybe these are for Normals?
-		case 0x1048: //xfregs.texcoords[0].nrmmtxinfo.hex = data; break; ??
-		case 0x1049:
-		case 0x104a:
-		case 0x104b:
-		case 0x104c:
-		case 0x104d:
-		case 0x104e:
-		case 0x104f:
-			DEBUG_LOG(VIDEO, "Possible Normal Mtx XF reg?: %x=%x", address, newValue);
-			break;
-
-		case 0x1013:
-		case 0x1014:
-		case 0x1015:
-		case 0x1016:
-		case 0x1017:
-
-		default:
-			WARN_LOG(VIDEO, "Unknown XF Reg: %x=%x", address, newValue);
-			break;
-		}
-
-		int transferred = nextAddress - address;
-		address = nextAddress;
-
-		transferSize -= transferred;
-		dataIndex += transferred;
-	}
-}
-
-void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
-{
-	// do not allow writes past registers
-	if (baseAddress + transferSize > 0x1058)
-	{
-		INFO_LOG(VIDEO, "XF load exceeds address space: %x %d bytes", baseAddress, transferSize);
-
-		if (baseAddress >= 0x1058)
-			transferSize = 0;
-		else
-			transferSize = 0x1058 - baseAddress;
-	}
-
-	// write to XF mem
-	if (baseAddress < 0x1000 && transferSize > 0)
-	{
-		u32 end = baseAddress + transferSize;
-
-		u32 xfMemBase = baseAddress;
-		u32 xfMemTransferSize = transferSize;
-
-		if (end >= 0x1000)
-		{
-			xfMemTransferSize = 0x1000 - baseAddress;
-
-			baseAddress = 0x1000;
-			transferSize = end - 0x1000;
-		}
-		else
-		{
-			transferSize = 0;
-		}
-		
-		XFMemWritten(xfMemTransferSize, xfMemBase);
-		memcpy_gc(&xfmem[xfMemBase], pData, xfMemTransferSize * 4);
-
-		pData += xfMemTransferSize;
-	}
-
-	// write to XF regs
-	if (transferSize > 0)
-	{	
-		XFRegWritten(transferSize, baseAddress, pData);
-		memcpy_gc((u32*)(&xfregs) + (baseAddress - 0x1000), pData, transferSize * 4);        
-	}
-}
-
-// TODO - verify that it is correct. Seems to work, though.
-void LoadIndexedXF(u32 val, int refarray)
-{
-	int index = val >> 16;
-	int address = val & 0xFFF; // check mask
-	int size = ((val >> 12) & 0xF) + 1;
-	//load stuff from array to address in xf mem
-
-	u32* currData = (u32*)(xfmem + address);
-	u32* newData = (u32*)Memory::GetPointer(arraybases[refarray] + arraystrides[refarray] * index);
-	bool changed = false;
-	for (int i = 0; i < size; ++i)
-	{
-		if (currData[i] != Common::swap32(newData[i]))
-		{
-			changed = true;
-			XFMemWritten(size, address);
-			break;
-		}
-	}
-	if (changed)
-	{
-		for (int i = 0; i < size; ++i)
-			currData[i] = Common::swap32(newData[i]);
-	}
-}
diff --git a/Source/Core/VideoCommon/Src/XFStructs.h b/Source/Core/VideoCommon/Src/XFStructs.h
deleted file mode 100644
index 48b92a9741..0000000000
--- a/Source/Core/VideoCommon/Src/XFStructs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _XFSTRUCTS_H
-#define _XFSTRUCTS_H
-
-#include "XFMemory.h"
-
-#endif // _XFSTRUCTS_H
diff --git a/Source/Core/VideoCommon/Src/memcpy_amd.cpp b/Source/Core/VideoCommon/Src/memcpy_amd.cpp
deleted file mode 100644
index bd393560d4..0000000000
--- a/Source/Core/VideoCommon/Src/memcpy_amd.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-/******************************************************************************
-
- Copyright (c) 2001 Advanced Micro Devices, Inc.
-
- LIMITATION OF LIABILITY:  THE MATERIALS ARE PROVIDED *AS IS* WITHOUT ANY
- EXPRESS OR IMPLIED WARRANTY OF ANY KIND INCLUDING WARRANTIES OF MERCHANTABILITY,
- NONINFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY, OR FITNESS FOR ANY
- PARTICULAR PURPOSE.  IN NO EVENT SHALL AMD OR ITS SUPPLIERS BE LIABLE FOR ANY
- DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS,
- BUSINESS INTERRUPTION, LOSS OF INFORMATION) ARISING OUT OF THE USE OF OR
- INABILITY TO USE THE MATERIALS, EVEN IF AMD HAS BEEN ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGES.  BECAUSE SOME JURISDICTIONS PROHIBIT THE EXCLUSION OR LIMITATION
- OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY
- NOT APPLY TO YOU.
-
- AMD does not assume any responsibility for any errors which may appear in the
- Materials nor any responsibility to support or update the Materials.  AMD retains
- the right to make changes to its test specifications at any time, without notice.
-
- NO SUPPORT OBLIGATION: AMD is not obligated to furnish, support, or make any
- further information, software, technical information, know-how, or show-how
- available to you.
-
- So that all may benefit from your experience, please report  any  problems
- or  suggestions about this software to 3dsdk.support@amd.com
-
- AMD Developer Technologies, M/S 585
- Advanced Micro Devices, Inc.
- 5900 E. Ben White Blvd.
- Austin, TX 78741
- 3dsdk.support@amd.com
-******************************************************************************/
-
-#include <assert.h>
-
-/*****************************************************************************
-MEMCPY_AMD.CPP
-******************************************************************************/
-
-// Very optimized memcpy() routine for AMD Athlon and Duron family.
-// This code uses any of FOUR different basic copy methods, depending
-// on the transfer size.
-// NOTE:  Since this code uses MOVNTQ (also known as "Non-Temporal MOV" or
-// "Streaming Store"), and also uses the software prefetch instructions,
-// be sure you're running on Athlon/Duron or other recent CPU before calling!
-
-#define TINY_BLOCK_COPY 64       // upper limit for movsd type copy
-// The smallest copy uses the X86 "movsd" instruction, in an optimized
-// form which is an "unrolled loop".
-
-#define IN_CACHE_COPY 2 * 1024  // upper limit for movq/movq copy w/SW prefetch
-// Next is a copy that uses the MMX registers to copy 8 bytes at a time,
-// also using the "unrolled loop" optimization.   This code uses
-// the software prefetch instruction to get the data into the cache.
-
-#define UNCACHED_COPY 4 * 1024 // upper limit for movq/movntq w/SW prefetch
-// For larger blocks, which will spill beyond the cache, it's faster to
-// use the Streaming Store instruction MOVNTQ.   This write instruction
-// bypasses the cache and writes straight to main memory.  This code also
-// uses the software prefetch instruction to pre-read the data.
-// USE 64 * 1024 FOR THIS VALUE IF YOU'RE ALWAYS FILLING A "CLEAN CACHE"
-
-#define BLOCK_PREFETCH_COPY  infinity // no limit for movq/movntq w/block prefetch 
-#define CACHEBLOCK 80h // number of 64-byte blocks (cache lines) for block prefetch
-// For the largest size blocks, a special technique called Block Prefetch
-// can be used to accelerate the read operations.   Block Prefetch reads
-// one address per cache line, for a series of cache lines, in a short loop.
-// This is faster than using software prefetch.  The technique is great for
-// getting maximum read bandwidth, especially in DDR memory systems.
-
-//#include <stddef.h>
-
-// Inline assembly syntax for use with Visual C++
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64)
-
-void * memcpy_amd(void *dest, const void *src, size_t n)
-{
-    __asm {
-	mov		ecx, [n]		; number of bytes to copy
-	mov		edi, [dest]		; destination
-	mov		esi, [src]		; source
-	mov		ebx, ecx		; keep a copy of count
-
-	cld
-	cmp		ecx, TINY_BLOCK_COPY
-	jb		$memcpy_ic_3	; tiny? skip mmx copy
-
-	cmp		ecx, 32*1024		; do not align between 32k-64k because
-	jbe		$memcpy_do_align	;  it appears to be slower
-	cmp		ecx, 64*1024
-	jbe		$memcpy_align_done
-$memcpy_do_align:
-	mov		ecx, 8			; a trick that is faster than rep movsb...
-	sub		ecx, edi		; align destination to qword
-	and		ecx, 111b		; get the low bits
-	sub		ebx, ecx		; update copy count
-	neg		ecx				; set up to jump into the array
-	add		ecx, offset $memcpy_align_done
-	jmp		ecx				; jump to array of movsb''s
-
-align 4
-	movsb
-	movsb
-	movsb
-	movsb
-	movsb
-	movsb
-	movsb
-	movsb
-
-$memcpy_align_done:			; destination is dword aligned
-	mov		ecx, ebx		; number of bytes left to copy
-	shr		ecx, 6			; get 64-byte block count
-	jz		$memcpy_ic_2	; finish the last few bytes
-
-	cmp		ecx, IN_CACHE_COPY/64	; too big 4 cache? use uncached copy
-	jae		$memcpy_uc_test
-
-// This is small block copy that uses the MMX registers to copy 8 bytes
-// at a time.  It uses the "unrolled loop" optimization, and also uses
-// the software prefetch instruction to get the data into the cache.
-align 16
-$memcpy_ic_1:			; 64-byte block copies, in-cache copy
-
-	prefetchnta [esi + (200*64/34+192)]		; start reading ahead
-
-	movq	mm0, [esi+0]	; read 64 bits
-	movq	mm1, [esi+8]
-	movq	[edi+0], mm0	; write 64 bits
-	movq	[edi+8], mm1	;    note:  the normal movq writes the
-	movq	mm2, [esi+16]	;    data to cache; a cache line will be
-	movq	mm3, [esi+24]	;    allocated as needed, to store the data
-	movq	[edi+16], mm2
-	movq	[edi+24], mm3
-	movq	mm0, [esi+32]
-	movq	mm1, [esi+40]
-	movq	[edi+32], mm0
-	movq	[edi+40], mm1
-	movq	mm2, [esi+48]
-	movq	mm3, [esi+56]
-	movq	[edi+48], mm2
-	movq	[edi+56], mm3
-
-	add		esi, 64			; update source pointer
-	add		edi, 64			; update destination pointer
-	dec		ecx				; count down
-	jnz		$memcpy_ic_1	; last 64-byte block?
-
-$memcpy_ic_2:
-	mov		ecx, ebx		; has valid low 6 bits of the byte count
-$memcpy_ic_3:
-	shr		ecx, 2			; dword count
-	and		ecx, 1111b		; only look at the "remainder" bits
-	neg		ecx				; set up to jump into the array
-	add		ecx, offset $memcpy_last_few
-	jmp		ecx				; jump to array of movsd''s
-
-$memcpy_uc_test:
-	cmp		ecx, UNCACHED_COPY/64	; big enough? use block prefetch copy
-	jae		$memcpy_bp_1
-
-$memcpy_64_test:
-	or		ecx, ecx		; tail end of block prefetch will jump here
-	jz		$memcpy_ic_2	; no more 64-byte blocks left
-
-// For larger blocks, which will spill beyond the cache, it's faster to
-// use the Streaming Store instruction MOVNTQ.   This write instruction
-// bypasses the cache and writes straight to main memory.  This code also
-// uses the software prefetch instruction to pre-read the data.
-align 16
-$memcpy_uc_1:				; 64-byte blocks, uncached copy
-
-	prefetchnta [esi + (200*64/34+192)]		; start reading ahead
-
-	movq	mm0,[esi+0]		; read 64 bits
-	add		edi,64			; update destination pointer
-	movq	mm1,[esi+8]
-	add		esi,64			; update source pointer
-	movq	mm2,[esi-48]
-	movntq	[edi-64], mm0	; write 64 bits, bypassing the cache
-	movq	mm0,[esi-40]	;    note: movntq also prevents the CPU
-	movntq	[edi-56], mm1	;    from READING the destination address
-	movq	mm1,[esi-32]	;    into the cache, only to be over-written
-	movntq	[edi-48], mm2	;    so that also helps performance
-	movq	mm2,[esi-24]
-	movntq	[edi-40], mm0
-	movq	mm0,[esi-16]
-	movntq	[edi-32], mm1
-	movq	mm1,[esi-8]
-	movntq	[edi-24], mm2
-	movntq	[edi-16], mm0
-	dec		ecx
-	movntq	[edi-8], mm1
-	jnz		$memcpy_uc_1	; last 64-byte block?
-
-	jmp		$memcpy_ic_2		; almost done
-
-// For the largest size blocks, a special technique called Block Prefetch
-// can be used to accelerate the read operations.   Block Prefetch reads
-// one address per cache line, for a series of cache lines, in a short loop.
-// This is faster than using software prefetch.  The technique is great for
-// getting maximum read bandwidth, especially in DDR memory systems.
-$memcpy_bp_1:			; large blocks, block prefetch copy
-
-	cmp		ecx, CACHEBLOCK			; big enough to run another prefetch loop?
-	jl		$memcpy_64_test			; no, back to regular uncached copy
-
-	mov		eax, CACHEBLOCK / 2		; block prefetch loop, unrolled 2X
-	add		esi, CACHEBLOCK * 64	; move to the top of the block
-align 16
-$memcpy_bp_2:
-	mov		edx, [esi-64]		; grab one address per cache line
-	mov		edx, [esi-128]		; grab one address per cache line
-	sub		esi, 128			; go reverse order to suppress HW prefetcher
-	dec		eax					; count down the cache lines
-	jnz		$memcpy_bp_2		; keep grabbing more lines into cache
-
-	mov		eax, CACHEBLOCK		; now that it is in cache, do the copy
-align 16
-$memcpy_bp_3:
-	movq	mm0, [esi   ]		; read 64 bits
-	movq	mm1, [esi+ 8]
-	movq	mm2, [esi+16]
-	movq	mm3, [esi+24]
-	movq	mm4, [esi+32]
-	movq	mm5, [esi+40]
-	movq	mm6, [esi+48]
-	movq	mm7, [esi+56]
-	add		esi, 64				; update source pointer
-	movntq	[edi   ], mm0		; write 64 bits, bypassing cache
-	movntq	[edi+ 8], mm1		;    note: movntq also prevents the CPU
-	movntq	[edi+16], mm2		;    from READING the destination address 
-	movntq	[edi+24], mm3		;    into the cache, only to be over-written,
-	movntq	[edi+32], mm4		;    so that also helps performance
-	movntq	[edi+40], mm5
-	movntq	[edi+48], mm6
-	movntq	[edi+56], mm7
-	add		edi, 64				; update dest pointer
-
-	dec		eax					; count down
-
-	jnz		$memcpy_bp_3		; keep copying
-	sub		ecx, CACHEBLOCK		; update the 64-byte block count
-	jmp		$memcpy_bp_1		; keep processing chunks
-
-// The smallest copy uses the X86 "movsd" instruction, in an optimized
-// form which is an "unrolled loop".   Then it handles the last few bytes.
-align 4
-	movsd
-	movsd			; perform last 1-15 dword copies
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd			; perform last 1-7 dword copies
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd
-	movsd
-
-$memcpy_last_few:		; dword aligned from before movsd''s
-	mov		ecx, ebx	; has valid low 2 bits of the byte count
-	and		ecx, 11b	; the last few cows must come home
-	jz		$memcpy_final	; no more, lets leave
-	rep		movsb		; the last 1, 2, or 3 bytes
-
-$memcpy_final: 
-	emms				; clean up the MMX state
-	sfence				; flush the write buffer
-	mov		eax, [dest]	; ret value = destination pointer
-
-    }
-}
-
-// mmx memcmp implementation, size has to be a multiple of 8
-// returns 0 is equal, nonzero value if not equal
-// ~10 times faster than standard memcmp
-// (zerofrog)
-unsigned char memcmp_mmx(const void* src1, const void* src2, int cmpsize)
-{
-	assert( (cmpsize&7) == 0 );
-
-	__asm {
-		push esi
-		mov ecx, cmpsize
-		mov edx, src1
-		mov esi, src2
-		
-		cmp ecx, 32
-		jl Done4
-
-		// custom test first 8 to make sure things are ok
-		movq mm0, [esi]
-		movq mm1, [esi+8]
-		pcmpeqd mm0, [edx]
-		pcmpeqd mm1, [edx+8]
-		pand mm0, mm1
-		movq mm2, [esi+16]
-		pmovmskb eax, mm0
-		movq mm3, [esi+24]
-
-		// check if eq
-		cmp eax, 0xff
-		je NextComp
-		mov eax, 1
-		jmp End
-
-NextComp:
-		pcmpeqd mm2, [edx+16]
-		pcmpeqd mm3, [edx+24]
-		pand mm2, mm3
-		pmovmskb eax, mm2
-
-		sub ecx, 32
-		add esi, 32
-		add edx, 32
-
-		// check if eq
-		cmp eax, 0xff
-		je ContinueTest
-		mov eax, 1
-		jmp End
-
-		cmp ecx, 64
-		jl Done8
-
-Cmp8:
-		movq mm0, [esi]
-		movq mm1, [esi+8]
-		movq mm2, [esi+16]
-		movq mm3, [esi+24]
-		movq mm4, [esi+32]
-		movq mm5, [esi+40]
-		movq mm6, [esi+48]
-		movq mm7, [esi+56]
-		pcmpeqd mm0, [edx]
-		pcmpeqd mm1, [edx+8]
-		pcmpeqd mm2, [edx+16]
-		pcmpeqd mm3, [edx+24]
-		pand mm0, mm1
-		pcmpeqd mm4, [edx+32]
-		pand mm0, mm2
-		pcmpeqd mm5, [edx+40]
-		pand mm0, mm3
-		pcmpeqd mm6, [edx+48]
-		pand mm0, mm4
-		pcmpeqd mm7, [edx+56]
-		pand mm0, mm5
-		pand mm0, mm6
-		pand mm0, mm7
-		pmovmskb eax, mm0
-		
-		// check if eq
-		cmp eax, 0xff
-		je Continue
-		mov eax, 1
-		jmp End
-
-Continue:
-		sub ecx, 64
-		add esi, 64
-		add edx, 64
-ContinueTest:
-		cmp ecx, 64
-		jge Cmp8
-
-Done8:
-		test ecx, 0x20
-		jz Done4
-		movq mm0, [esi]
-		movq mm1, [esi+8]
-		movq mm2, [esi+16]
-		movq mm3, [esi+24]
-		pcmpeqd mm0, [edx]
-		pcmpeqd mm1, [edx+8]
-		pcmpeqd mm2, [edx+16]
-		pcmpeqd mm3, [edx+24]
-		pand mm0, mm1
-		pand mm0, mm2
-		pand mm0, mm3
-		pmovmskb eax, mm0
-		sub ecx, 32
-		add esi, 32
-		add edx, 32
-
-		// check if eq
-		cmp eax, 0xff
-		je Done4
-		mov eax, 1
-		jmp End
-
-Done4:
-		cmp ecx, 24
-		jne Done2
-		movq mm0, [esi]
-		movq mm1, [esi+8]
-		movq mm2, [esi+16]
-		pcmpeqd mm0, [edx]
-		pcmpeqd mm1, [edx+8]
-		pcmpeqd mm2, [edx+16]
-		pand mm0, mm1
-		pand mm0, mm2
-		pmovmskb eax, mm0
-
-		// check if eq
-		cmp eax, 0xff
-		setne al
-		jmp End
-
-Done2:
-		cmp ecx, 16
-		jne Done1
-
-		movq mm0, [esi]
-		movq mm1, [esi+8]
-		pcmpeqd mm0, [edx]
-		pcmpeqd mm1, [edx+8]
-		pand mm0, mm1
-		pmovmskb eax, mm0
-
-		// check if eq
-		cmp eax, 0xff
-		setne al
-		jmp End
-
-Done1:
-		cmp ecx, 8
-		jne Done
-
-		mov eax, [esi]
-		mov esi, [esi+4]
-		cmp eax, [edx]
-		je Next
-		mov eax, 1
-		jmp End
-
-Next:
-		cmp esi, [edx+4]
-		setne al
-		jmp End
-
-Done:
-		xor eax, eax
-
-End:
-		pop esi
-		emms
-	}
-}
-
-#else // _MSC_VER
-// assume gcc or mingw or win x64
-
-#include <memory.h>
-#include <string.h>
-
-void * memcpy_amd(void *dest, const void *src, size_t n)
-{
-	memcpy(dest, src, n);
-	return dest;
-}
-
-
-#endif
diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp
deleted file mode 100644
index b412c2e274..0000000000
--- a/Source/Core/VideoCommon/Src/x64DLCache.cpp
+++ /dev/null
@@ -1,775 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// TODO: Handle cache-is-full condition :p
-
-#include <map>
-
-#include "Common.h"
-#include "VideoCommon.h"
-#include "Hash.h"
-#include "MemoryUtil.h"
-#include "DataReader.h"
-#include "Statistics.h"
-#include "OpcodeDecoding.h"   // For the GX_ constants.
-#include "HW/Memmap.h"
-
-#include "XFMemory.h"
-#include "CPMemory.h"
-#include "BPMemory.h"
-
-#include "VertexLoaderManager.h"
-#include "VertexManagerBase.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
-#include "DLCache.h"
-#include "VideoConfig.h"
-
-#define DL_CODE_CACHE_SIZE (1024*1024*16)
-#define DL_CODE_CLEAR_THRESHOLD (16 * 1024)
-extern int frameCount;
-static u32 CheckContextId;
-using namespace Gen;
-
-namespace DLCache
-{
-
-enum DisplayListPass {
-	DLPASS_ANALYZE,
-	DLPASS_COMPILE,
-	DLPASS_RUN,
-};
-
-#define DL_HASH_STEPS 512
-
-struct ReferencedDataRegion
-{
-	ReferencedDataRegion()
-		:hash(0),
-		start_address(NULL),
-		NextRegion(NULL),
-		size(0),
-		MustClean(0)
-	{}
-	u64 hash;
-	u8* start_address;
-	ReferencedDataRegion* NextRegion;
-	u32 size;
-	u32 MustClean;
-	
-
-	int IntersectsMemoryRange(u8* range_address, u32 range_size)
-	{
-		if (start_address + size < range_address)
-			return -1;
-		if (start_address >= range_address + range_size)
-			return 1;
-		return 0;
-	}
-};
-
-struct CachedDisplayList
-{
-	CachedDisplayList()
-			: Regions(NULL),
-			LastRegion(NULL),
-			uncachable(false),
-			num_xf_reg(0),
-			num_cp_reg(0),
-			num_bp_reg(0), 
-			num_index_xf(0),
-			num_draw_call(0),
-			pass(DLPASS_ANALYZE),
-			BufferCount(0)
-	{
-		frame_count = frameCount;
-	}
-	u64 dl_hash;
-	// ... Something containing cached vertex buffers here ...
-	ReferencedDataRegion* Regions;
-	ReferencedDataRegion* LastRegion;
-	// Compile the commands themselves down to native code.
-	const u8* compiled_code;
-	u32 uncachable;  // if set, this DL will always be interpreted. This gets set if hash ever changes.
-	// Analytic data
-	u32 num_xf_reg;
-	u32 num_cp_reg;
-	u32 num_bp_reg; 
-	u32 num_index_xf;
-	u32 num_draw_call;
-	u32 pass;
-	u32 check;
-	int frame_count;
-	u32 BufferCount;
-
-	void InsertRegion(ReferencedDataRegion* NewRegion)
-	{
-		if(LastRegion)
-		{
-			LastRegion->NextRegion = NewRegion;
-		}
-		LastRegion = NewRegion;
-		if(!Regions)
-		{
-			Regions = LastRegion;
-		}
-		BufferCount++;
-	}
-
-	void InsertOverlapingRegion(u8* RegionStartAddress, u32 Size)
-	{
-		ReferencedDataRegion* NewRegion = FindOverlapingRegion(RegionStartAddress, Size);
-		if(NewRegion)
-		{
-			bool RegionChanged = false;
-			if(RegionStartAddress < NewRegion->start_address)
-			{
-				NewRegion->start_address = RegionStartAddress;
-				RegionChanged = true;
-			}
-			if(RegionStartAddress + Size > NewRegion->start_address + NewRegion->size)
-			{
-				NewRegion->size += (u32)((RegionStartAddress + Size) - (NewRegion->start_address + NewRegion->size));
-				RegionChanged = true;
-			}
-			if(RegionChanged)
-				NewRegion->hash = GetHash64(NewRegion->start_address, NewRegion->size, DL_HASH_STEPS);
-		}
-		else
-		{
-			NewRegion = new ReferencedDataRegion;
-			NewRegion->MustClean = false;
-			NewRegion->size = Size;
-			NewRegion->start_address = RegionStartAddress; 
-			NewRegion->hash = GetHash64(RegionStartAddress, Size, DL_HASH_STEPS);
-			InsertRegion(NewRegion);
-		}
-	}
-
-	bool CheckRegions()
-	{
-		ReferencedDataRegion* Current = Regions;
-		while(Current)
-		{
-			if(Current->hash)
-			{
-				if(Current->hash != GetHash64(Current->start_address,  Current->size, DL_HASH_STEPS))
-					return false;
-			}
-			Current = Current->NextRegion;
-		}
-		return true;
-	}
-
-	ReferencedDataRegion* FindOverlapingRegion(u8* RegionStart, u32 Regionsize)
-	{
-		ReferencedDataRegion* Current = Regions;
-		while(Current)
-		{
-			if(!Current->IntersectsMemoryRange(RegionStart, Regionsize))
-				return Current;
-			Current = Current->NextRegion;
-		}
-		return Current;
-	}
-
-	void ClearRegions()
-	{
-		ReferencedDataRegion* Current = Regions;
-		while(Current)
-		{
-			ReferencedDataRegion* temp = Current;
-			Current = Current->NextRegion;
-			if(temp->MustClean)
-				delete [] temp->start_address;
-			delete temp;
-		}
-		LastRegion = NULL;
-		Regions = NULL;
-	}
-};
-
-// We want to allow caching DLs that start at the same address but have different lengths,
-// so the size has to be in the ID.
-inline u64 CreateMapId(u32 address, u32 size)
-{
-	return ((u64)address << 32) | size;
-}
-
-inline u64 CreateVMapId(u32 VATUSED)
-{
-	u64 vmap_id = 0x9368e53c2f6af274ULL ^ g_VtxDesc.Hex;
-	for(int i = 0; i < 8 ; i++)
-	{
-		if(VATUSED & (1 << i))
-		{
-			vmap_id ^= (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << i);
-		}
-	}
-	for(int i = 0; i < 12; i++)
-	{
-		if(VATUSED & (1 << (i + 16)))
-			vmap_id  ^= (((u64)arraybases[i]) ^ (((u64)arraystrides[i]) << 32));
-	}
-	return vmap_id;
-}
-
-typedef std::map<u64, CachedDisplayList> DLMap;
-
-struct VDlist
-{
-	DLMap dl_map;
-	u32 VATUsed;
-	u32 count;
-};
-
-typedef std::map<u64, VDlist> VDLMap;
-
-static VDLMap dl_map;
-static u8* dlcode_cache;
-
-static Gen::XEmitter emitter;
-
-
-
-// First pass - analyze
-u32 AnalyzeAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl)
-{
-	u8* old_pVideoData = g_pVideoData;
-	u8* startAddress = Memory::GetPointer(address);
-	u32 num_xf_reg = 0;
-	u32 num_cp_reg = 0;
-	u32 num_bp_reg = 0; 
-	u32 num_index_xf = 0;
-	u32 num_draw_call = 0;
-	u32 result = 0;
-	
-
-	// Avoid the crash if Memory::GetPointer failed ..
-	if (startAddress != 0)
-	{
-		g_pVideoData = startAddress;
-
-		// temporarily swap dl and non-dl (small "hack" for the stats)
-		Statistics::SwapDL();
-
-		u8 *end = g_pVideoData + size;
-		while (g_pVideoData < end)
-		{
-			// Yet another reimplementation of the DL reading...
-			int cmd_byte = DataReadU8();
-			switch (cmd_byte)
-			{
-			case GX_NOP:
-				break;
-
-			case GX_LOAD_CP_REG: //0x08
-				{
-					u8 sub_cmd = DataReadU8();
-					u32 value = DataReadU32();
-					LoadCPReg(sub_cmd, value);
-					INCSTAT(stats.thisFrame.numCPLoads);
-					num_cp_reg++;
-				}
-				break;
-
-			case GX_LOAD_XF_REG:
-				{
-					u32 Cmd2 = DataReadU32();
-					int transfer_size = ((Cmd2 >> 16) & 15) + 1;
-					u32 xf_address = Cmd2 & 0xFFFF;
-					GC_ALIGNED128(u32 data_buffer[16]);
-					DataReadU32xFuncs[transfer_size-1](data_buffer);
-					LoadXFReg(transfer_size, xf_address, data_buffer);
-					INCSTAT(stats.thisFrame.numXFLoads);
-					num_xf_reg++;
-				}
-				break;
-
-			case GX_LOAD_INDX_A: //used for position matrices
-				{
-					LoadIndexedXF(DataReadU32(), 0xC);
-					num_index_xf++;
-				}
-				break;
-			case GX_LOAD_INDX_B: //used for normal matrices
-				{
-					LoadIndexedXF(DataReadU32(), 0xD);
-					num_index_xf++;
-				}
-				break;
-			case GX_LOAD_INDX_C: //used for postmatrices
-				{
-					LoadIndexedXF(DataReadU32(), 0xE);
-					num_index_xf++;
-				}
-				break;
-			case GX_LOAD_INDX_D: //used for lights
-				{
-					LoadIndexedXF(DataReadU32(), 0xF);
-					num_index_xf++;
-				}
-				break;
-			case GX_CMD_CALL_DL:
-				{
-					u32 addr = DataReadU32();
-					u32 count = DataReadU32();
-					ExecuteDisplayList(addr, count);
-				}
-				break;
-			case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
-				DEBUG_LOG(VIDEO, "GX 0x44: %08x", cmd_byte);
-				break;
-			case GX_CMD_INVL_VC: // Invalidate Vertex Cache	
-				DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)");
-				break;
-			case GX_LOAD_BP_REG: //0x61
-				{
-					u32 bp_cmd = DataReadU32();
-					LoadBPReg(bp_cmd);
-					INCSTAT(stats.thisFrame.numBPLoads);
-					num_bp_reg++;
-				}
-				break;
-
-			// draw primitives 
-			default:
-				if (cmd_byte & 0x80)
-				{
-					// load vertices (use computed vertex size from FifoCommandRunnable above)
-					u16 numVertices = DataReadU16();
-					if(numVertices > 0)
-					{
-						result |= 1 << (cmd_byte & GX_VAT_MASK);
-						VertexLoaderManager::RunVertices(
-							cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
-							(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
-							numVertices);
-						num_draw_call++;
-						const u32 tc[12] = {
-							g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, 
-							g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3)
-						};
-						for(int i = 0; i < 12; i++)
-						{
-							if(tc[i] > 1)
-							{
-								result |= 1 << (i + 16);
-							}
-						}
-					}
-				}
-				else
-				{
-					ERROR_LOG(VIDEO, "OpcodeDecoding::Decode: Illegal command %02x", cmd_byte);
-					break;
-				}
-				break;
-			}
-		}
-		INCSTAT(stats.numDListsCalled);
-		INCSTAT(stats.thisFrame.numDListsCalled);
-		// un-swap
-		Statistics::SwapDL();
-	}
-	dl->num_bp_reg = num_bp_reg;
-	dl->num_cp_reg = num_cp_reg;
-	dl->num_draw_call = num_draw_call;
-	dl->num_index_xf = num_index_xf;
-	dl->num_xf_reg = num_xf_reg;
-	// reset to the old pointer
-	g_pVideoData = old_pVideoData;	
-	return result;
-}
-
-// The only sensible way to detect changes to vertex data is to convert several times 
-// and hash the output.
-
-// Second pass - compile
-// Since some commands can affect the size of other commands, we really have no choice
-// but to compile as we go, interpreting the list. We can't compile and then execute, we must
-// compile AND execute at the same time. The second time the display list gets called, we already
-// have the compiled code so we don't have to interpret anymore, we just run it.
-void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl)
-{
-	u8* old_pVideoData = g_pVideoData;
-	u8* startAddress = Memory::GetPointer(address);
-
-	// Avoid the crash if Memory::GetPointer failed ..
-	if (startAddress != 0)
-	{
-		g_pVideoData = startAddress;
-
-		// temporarily swap dl and non-dl (small "hack" for the stats)
-		Statistics::SwapDL();
-
-		u8 *end = g_pVideoData + size;
-
-		emitter.AlignCode4();
-		dl->compiled_code = emitter.GetCodePtr();
-		emitter.ABI_PushAllCalleeSavedRegsAndAdjustStack();
-
-		while (g_pVideoData < end)
-		{
-			// Yet another reimplementation of the DL reading...
-			int cmd_byte = DataReadU8();
-			switch (cmd_byte)
-			{
-			case GX_NOP:
-				// Execute
-				// Compile
-				break;
-
-			case GX_LOAD_CP_REG: //0x08
-				{
-					// Execute
-					u8 sub_cmd = DataReadU8();
-					u32 value = DataReadU32();
-					LoadCPReg(sub_cmd, value);
-					INCSTAT(stats.thisFrame.numCPLoads);
-
-					// Compile
-					emitter.ABI_CallFunctionCC((void *)&LoadCPReg, sub_cmd, value);
-				}
-				break;
-
-			case GX_LOAD_XF_REG:
-				{
-					// Execute
-					u32 Cmd2 = DataReadU32();
-					int transfer_size = ((Cmd2 >> 16) & 15) + 1;
-					u32 xf_address = Cmd2 & 0xFFFF;
-					ReferencedDataRegion* NewRegion = new ReferencedDataRegion;
-					NewRegion->MustClean = true;
-					NewRegion->size = transfer_size * 4;
-					NewRegion->start_address = (u8*) new u8[NewRegion->size+15+12];  // alignment and guaranteed space
-					NewRegion->hash = 0;
-					dl->InsertRegion(NewRegion);
-					u32 *data_buffer = (u32*)(u8*)(((size_t)NewRegion->start_address+0xf)&~0xf);
-					DataReadU32xFuncs[transfer_size-1](data_buffer);
-					LoadXFReg(transfer_size, xf_address, data_buffer);
-					INCSTAT(stats.thisFrame.numXFLoads);
-					// Compile
-					emitter.ABI_CallFunctionCCP((void *)&LoadXFReg, transfer_size, xf_address, data_buffer);
-				}
-				break;
-
-			case GX_LOAD_INDX_A: //used for position matrices
-				{
-					u32 value = DataReadU32();
-					// Execute
-					LoadIndexedXF(value, 0xC);
-					// Compile
-					emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xC);
-				}
-				break;
-			case GX_LOAD_INDX_B: //used for normal matrices
-				{
-					u32 value = DataReadU32();
-					// Execute
-					LoadIndexedXF(value, 0xD);
-					// Compile
-					emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xD);
-				}
-				break;
-			case GX_LOAD_INDX_C: //used for postmatrices
-				{
-					u32 value = DataReadU32();
-					// Execute
-					LoadIndexedXF(value, 0xE);
-					// Compile
-					emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xE);
-				}
-				break;
-			case GX_LOAD_INDX_D: //used for lights
-				{
-					u32 value = DataReadU32();
-					// Execute
-					LoadIndexedXF(value, 0xF);
-					// Compile
-					emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xF);
-				}
-				break;
-
-			case GX_CMD_CALL_DL:
-				{
-					u32 addr= DataReadU32();
-					u32 count = DataReadU32();
-					ExecuteDisplayList(addr, count);
-					emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, addr, count);
-				}
-				break;
-
-			case GX_CMD_UNKNOWN_METRICS:
-				// zelda 4 swords calls it and checks the metrics registers after that
-				break;
-
-			case GX_CMD_INVL_VC:// Invalidate	(vertex cache?)	
-				DEBUG_LOG(VIDEO, "Invalidate	(vertex cache?)");
-				break;
-
-			case GX_LOAD_BP_REG: //0x61
-				{
-					u32 bp_cmd = DataReadU32();
-					// Execute
-					LoadBPReg(bp_cmd);
-					INCSTAT(stats.thisFrame.numBPLoads);
-					// Compile
-					emitter.ABI_CallFunctionC((void *)&LoadBPReg, bp_cmd);
-				}
-				break;
-
-				// draw primitives 
-			default:
-				if (cmd_byte & 0x80)
-				{
-					// load vertices (use computed vertex size from FifoCommandRunnable above)
-					u16 numVertices = DataReadU16();
-					if(numVertices > 0)
-					{
-						// Execute
-						u8* StartAddress = VertexManager::s_pBaseBufferPointer;
-						VertexManager::Flush();
-						VertexLoaderManager::RunVertices(
-							cmd_byte & GX_VAT_MASK,   // Vertex loader index (0 - 7)
-							(cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT,
-							numVertices);
-						u32 Vdatasize = (u32)(VertexManager::s_pCurBufferPointer - StartAddress);
-						if (Vdatasize > 0)
-						{
-							// Compile
-							ReferencedDataRegion* NewRegion = new ReferencedDataRegion;
-							NewRegion->MustClean = true;
-							NewRegion->size = Vdatasize;
-							NewRegion->start_address = (u8*)new u8[Vdatasize]; 
-							NewRegion->hash = 0;
-							dl->InsertRegion(NewRegion);
-							memcpy(NewRegion->start_address, StartAddress, Vdatasize);
-							emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices, cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewRegion->start_address);
-							const u32 tc[12] = {
-							g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, 
-							g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3)
-							};
-							for(int i = 0; i < 12; i++)
-							{
-								if(tc[i] > 1)
-								{
-									u8* saddr = cached_arraybases[i];
-									int arraySize = arraystrides[i] * ((tc[i] == 2)? numVertices : ((numVertices < 1024)? 2 * numVertices : numVertices));
-									dl->InsertOverlapingRegion(saddr, arraySize);
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					ERROR_LOG(VIDEO, "DLCache::CompileAndRun: Illegal command %02x", cmd_byte);
-					break;
-				}
-				break;
-			}
-		}
-		emitter.ABI_PopAllCalleeSavedRegsAndAdjustStack();
-		emitter.RET();
-		INCSTAT(stats.numDListsCalled);
-		INCSTAT(stats.thisFrame.numDListsCalled);
-		Statistics::SwapDL();
-	}
-	g_pVideoData = old_pVideoData;
-}
-
-
-void Init()
-{
-	CheckContextId = 0;
-	dlcode_cache = (u8*)AllocateExecutableMemory(DL_CODE_CACHE_SIZE, false);  // Don't need low memory.
-	emitter.SetCodePtr(dlcode_cache);
-}
-
-void Shutdown()
-{
-	Clear();
-	FreeMemoryPages(dlcode_cache, DL_CODE_CACHE_SIZE);	
-	dlcode_cache = NULL;
-}
-
-void Clear() 
-{
-	VDLMap::iterator iter = dl_map.begin();
-	while (iter != dl_map.end())
-	{
-		VDlist &ParentEntry = iter->second;
-		DLMap::iterator childiter = ParentEntry.dl_map.begin();
-		while (childiter != ParentEntry.dl_map.end())
-		{
-			CachedDisplayList &entry = childiter->second;
-			entry.ClearRegions();
-			childiter++;
-		}
-
-		ParentEntry.dl_map.clear();
-		iter++;
-	}
-	dl_map.clear();
-	// Reset the cache pointers.
-	emitter.SetCodePtr(dlcode_cache);
-}
-
-void ProgressiveCleanup()
-{
-	VDLMap::iterator iter = dl_map.begin();
-	while (iter != dl_map.end())
-	{
-		VDlist &ParentEntry = iter->second;
-		DLMap::iterator childiter = ParentEntry.dl_map.begin();
-		while (childiter != ParentEntry.dl_map.end()) 
-		{
-			CachedDisplayList &entry = childiter->second;
-			int limit = 3600;
-			if (entry.frame_count < frameCount - limit)
-			{
-				entry.ClearRegions();
-				ParentEntry.dl_map.erase(childiter++);  // (this is gcc standard!)
-			}
-			else
-			{
-				++childiter;
-			}
-		}
-
-		if(ParentEntry.dl_map.empty())
-		{
-			dl_map.erase(iter++);
-		}
-		else
-		{
-			iter++;
-		}
-	}
-}
-
-static size_t GetSpaceLeft()
-{
-	return DL_CODE_CACHE_SIZE - (emitter.GetCodePtr() - dlcode_cache);
-}
-
-}  // namespace
-
-// NOTE - outside the namespace on purpose.
-bool HandleDisplayList(u32 address, u32 size)
-{
-	//Fixed DlistCaching now is fully functional still some things to workout
-	if(!g_ActiveConfig.bDlistCachingEnable)
-		return false;
-	if(size == 0)
-		return false;
-
-	// TODO: Is this thread safe?
-	if (DLCache::GetSpaceLeft() < DL_CODE_CLEAR_THRESHOLD)
-	{
-		DLCache::Clear();
-	}
-
-	u64 dl_id = DLCache::CreateMapId(address, size);
-	u64 vhash = 0;
-	DLCache::VDLMap::iterator Parentiter = DLCache::dl_map.find(dl_id);
-	DLCache::DLMap::iterator iter;
-	bool childexist = false;
-
-	if (Parentiter != DLCache::dl_map.end())
-	{
-		vhash = DLCache::CreateVMapId(Parentiter->second.VATUsed);
-		iter = 	Parentiter->second.dl_map.find(vhash);
-		childexist = iter != Parentiter->second.dl_map.end();
-	}
-
-	if (Parentiter != DLCache::dl_map.end() && childexist)
-	{
-		DLCache::CachedDisplayList &dl = iter->second;
-		if (dl.uncachable)
-		{
-			return false;
-		}
-
-		switch (dl.pass)
-		{
-		case DLCache::DLPASS_COMPILE:
-			// First, check that the hash is the same as the last time.
-			if (dl.dl_hash != GetHash64(Memory::GetPointer(address), size, 0))
-			{
-				dl.uncachable = true;
-				return false;
-			}
-			DLCache::CompileAndRunDisplayList(address, size, &dl);
-			dl.pass = DLCache::DLPASS_RUN;
-			break;
-		case DLCache::DLPASS_RUN:
-			{
-				bool DlistChanged = false;
-				if (dl.check != CheckContextId)
-				{
-					dl.check = CheckContextId;
-					DlistChanged = !dl.CheckRegions() || dl.dl_hash != GetHash64(Memory::GetPointer(address), size, 0);					
-				}
-				if (DlistChanged) 
-				{
-					dl.uncachable = true;
-					dl.ClearRegions();
-					return false;
-				}
-				dl.frame_count= frameCount;
-				u8 *old_datareader = g_pVideoData;
-				((void (*)())(void*)(dl.compiled_code))();
-				Statistics::SwapDL();
-				ADDSTAT(stats.thisFrame.numCPLoadsInDL, dl.num_cp_reg);
-				ADDSTAT(stats.thisFrame.numXFLoadsInDL, dl.num_xf_reg);
-				ADDSTAT(stats.thisFrame.numBPLoadsInDL, dl.num_bp_reg);
-
-				ADDSTAT(stats.thisFrame.numCPLoads, dl.num_cp_reg);
-				ADDSTAT(stats.thisFrame.numXFLoads, dl.num_xf_reg);
-				ADDSTAT(stats.thisFrame.numBPLoads, dl.num_bp_reg);
-
-				INCSTAT(stats.numDListsCalled);
-				INCSTAT(stats.thisFrame.numDListsCalled);
-				
-				Statistics::SwapDL();
-				g_pVideoData = old_datareader;
-				break;
-			}
-		}
-		return true;
-	}
-
-	DLCache::CachedDisplayList dl;
-	
-	u32 dlvatused = DLCache::AnalyzeAndRunDisplayList(address, size, &dl);
-	dl.dl_hash = GetHash64(Memory::GetPointer(address), size,0);
-	dl.pass = DLCache::DLPASS_COMPILE;
-	dl.check = CheckContextId;
-	vhash = DLCache::CreateVMapId(dlvatused);
-	if(Parentiter != DLCache::dl_map.end())
-	{
-		DLCache::VDlist &vdl = Parentiter->second;
-		vdl.dl_map[vhash] = dl;
-		vdl.VATUsed = dlvatused; 
-		vdl.count++;
-	}
-	else
-	{
-		DLCache::VDlist vdl;
-		vdl.dl_map[vhash] = dl;
-		vdl.VATUsed = dlvatused; 
-		vdl.count = 1;
-		DLCache::dl_map[dl_id] = vdl;
-	}
-
-	return true;
-}
-
-void IncrementCheckContextId()
-{
-	CheckContextId++;
-}
diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
deleted file mode 100644
index 4c26509878..0000000000
--- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
+++ /dev/null
@@ -1,3189 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-//#include "VideoCommon.h" // to get debug logs
-
-#include "CPUDetect.h"
-#include "TextureDecoder.h"
-#include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
-#include "VideoConfig.h"
-
-#include "LookUpTables.h"
-
-#include <cmath>
-
-#ifdef _OPENMP
-#include <omp.h>
-#elif defined __GNUC__
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#endif
-
-#if _M_SSE >= 0x401
-#include <smmintrin.h>
-#include <emmintrin.h>
-#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-// This avoids a harmless warning from a system header in Clang;
-// see http://llvm.org/bugs/show_bug.cgi?id=16093
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-bool TexFmt_Overlay_Enable=false;
-bool TexFmt_Overlay_Center=false;
-
-extern const char* texfmt[];
-extern const unsigned char sfont_map[];
-extern const unsigned char sfont_raw[][9*10];
-
-// TRAM
-// STATE_TO_SAVE
- GC_ALIGNED16(u8 texMem[TMEM_SIZE]);
-
-
-// Gamecube/Wii texture decoder
-
-// Decodes all known Gamecube/Wii texture formats.
-// by ector
-
-int TexDecoder_GetTexelSizeInNibbles(int format)
-{
-	switch (format & 0x3f) {
-	case GX_TF_I4: return 1;   
-	case GX_TF_I8: return 2;
-	case GX_TF_IA4: return 2;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return 8;
-	case GX_TF_C4: return 1;
-	case GX_TF_C8: return 2;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 1;
-	case GX_CTF_R4:    return 1;   
-	case GX_CTF_RA4:   return 2;
-	case GX_CTF_RA8:   return 4;
-	case GX_CTF_YUVA8: return 8;
-	case GX_CTF_A8:    return 2;
-	case GX_CTF_R8:    return 2;
-	case GX_CTF_G8:    return 2;
-	case GX_CTF_B8:    return 2;
-	case GX_CTF_RG8:   return 4;
-	case GX_CTF_GB8:   return 4;
-
-	case GX_TF_Z8:     return 2;
-	case GX_TF_Z16:    return 4;
-	case GX_TF_Z24X8:  return 8;
-
-	case GX_CTF_Z4:    return 1;   
-	case GX_CTF_Z8M:   return 2;
-	case GX_CTF_Z8L:   return 2;
-	case GX_CTF_Z16L:  return 4;
-	default: return 1;
-	}
-}
-
-int TexDecoder_GetTextureSizeInBytes(int width, int height, int format)
-{
-	return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2;
-}
-
-int TexDecoder_GetBlockWidthInTexels(u32 format)
-{
-	switch (format)
-	{
-	case GX_TF_I4: return 8;   
-	case GX_TF_I8: return 8;
-	case GX_TF_IA4: return 8;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return  4;
-	case GX_TF_C4: return 8;
-	case GX_TF_C8: return 8;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 8;
-	case GX_CTF_R4: return 8;
-	case GX_CTF_RA4: return 8;
-	case GX_CTF_RA8: return 4;
-	case GX_CTF_A8: return 8;
-	case GX_CTF_R8: return 8;
-	case GX_CTF_G8: return 8;
-	case GX_CTF_B8: return 8;
-	case GX_CTF_RG8: return 4;
-	case GX_CTF_GB8: return 4;
-	case GX_TF_Z8: return 8;
-	case GX_TF_Z16: return 4;
-	case GX_TF_Z24X8: return 4;
-	case GX_CTF_Z4: return 8;
-	case GX_CTF_Z8M: return 8;
-	case GX_CTF_Z8L: return 8;
-	case GX_CTF_Z16L: return 4;
-	default:
-		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockWidthInTexels)", format);
-		return 8;
-	}
-}
-
-int TexDecoder_GetBlockHeightInTexels(u32 format)
-{
-	switch (format)
-	{
-	case GX_TF_I4: return 8;   
-	case GX_TF_I8: return 4;
-	case GX_TF_IA4: return 4;
-	case GX_TF_IA8: return 4;
-	case GX_TF_RGB565: return 4;
-	case GX_TF_RGB5A3: return 4;
-	case GX_TF_RGBA8: return  4;
-	case GX_TF_C4: return 8;
-	case GX_TF_C8: return 4;
-	case GX_TF_C14X2: return 4;
-	case GX_TF_CMPR: return 8;
-	case GX_CTF_R4: return 8;
-	case GX_CTF_RA4: return 4;
-	case GX_CTF_RA8: return 4;
-	case GX_CTF_A8: return 4;
-	case GX_CTF_R8: return 4;
-	case GX_CTF_G8: return 4;
-	case GX_CTF_B8: return 4;
-	case GX_CTF_RG8: return 4;
-	case GX_CTF_GB8: return 4;
-	case GX_TF_Z8: return 4;
-	case GX_TF_Z16: return 4;
-	case GX_TF_Z24X8: return 4;
-	case GX_CTF_Z4: return 8;
-	case GX_CTF_Z8M: return 4;
-	case GX_CTF_Z8L: return 4;
-	case GX_CTF_Z16L: return 4;
-	default:
-		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format);
-		return 4;
-	}
-}
-
-//returns bytes
-int TexDecoder_GetPaletteSize(int format)
-{
-	switch (format)
-	{
-	case GX_TF_C4: return 16 * 2;
-	case GX_TF_C8: return 256 * 2;
-	case GX_TF_C14X2: return 16384 * 2;
-	default:
-		return 0;
-	}
-}
-
-static inline u32 decodeIA8(u16 val)
-{
-	int a = val >> 8;
-	int i = val & 0xFF;
-	return (a << 24) | (i << 16) | (i << 8) | i;
-}
-
-static inline u32 decode5A3(u16 val)
-{
-	int r,g,b,a;
-	if ((val & 0x8000))
-	{
-		a = 0xFF;
-		r = Convert5To8((val >> 10) & 0x1F);
-		g = Convert5To8((val >> 5) & 0x1F);
-		b = Convert5To8(val & 0x1F);
-	}
-	else
-	{
-		a = Convert3To8((val >> 12) & 0x7);
-		r = Convert4To8((val >> 8) & 0xF);
-		g = Convert4To8((val >> 4) & 0xF);
-		b = Convert4To8(val & 0xF);
-	}
-	return (a << 24) | (r << 16) | (g << 8) | b;
-}
-
-static inline u32 decode5A3RGBA(u16 val)
-{
-	int r,g,b,a;
-	if ((val&0x8000))
-	{
-		r=Convert5To8((val>>10) & 0x1f);
-		g=Convert5To8((val>>5 ) & 0x1f);
-		b=Convert5To8((val    ) & 0x1f);
-		a=0xFF;
-	}
-	else
-	{
-		a=Convert3To8((val>>12) & 0x7);
-		r=Convert4To8((val>>8 ) & 0xf);
-		g=Convert4To8((val>>4 ) & 0xf);
-		b=Convert4To8((val    ) & 0xf);
-	}
-	return r | (g<<8) | (b << 16) | (a << 24);
-}
-
-static inline u32 decode565RGBA(u16 val)
-{
-	int r,g,b,a;
-	r=Convert5To8((val>>11) & 0x1f);
-	g=Convert6To8((val>>5 ) & 0x3f);
-	b=Convert5To8((val    ) & 0x1f);
-	a=0xFF;
-	return  r | (g<<8) | (b << 16) | (a << 24);
-}
-
-static inline u32 decodeIA8Swapped(u16 val)
-{
-	int a = val & 0xFF;
-	int i = val >> 8;
-	return i | (i<<8) | (i<<16) | (a<<24);
-}
-
-
-
-struct DXTBlock
-{
-	u16 color1;
-	u16 color2;
-	u8 lines[4];
-};
-
-//inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
-inline void decodebytesC4_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode5A3(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-inline void decodebytesC4_5A3_To_rgba32(u32 *dst, const u8 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-inline void decodebytesC4_To_Raw16(u16* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = Common::swap16(tlut[val >> 4]);
-		*dst++ = Common::swap16(tlut[val & 0xF]);
-	}
-}
-
-inline void decodebytesC4IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decodeIA8Swapped(tlut[val >> 4]);
-		*dst++ = decodeIA8Swapped(tlut[val & 0xF]);
-	}
-}
-
-inline void decodebytesC4RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem+tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode565RGBA(Common::swap16(tlut[val >> 4]));
-		*dst++ = decode565RGBA(Common::swap16(tlut[val & 0xF]));
-	}
-}
-
-//inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
-inline void decodebytesC8_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr)
-{ 
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3(Common::swap16(tlut[val]));
-	}
-}
-
-inline void decodebytesC8_5A3_To_RGBA32(u32 *dst, const u8 *src, int tlutaddr)
-{ 
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[val]));
-	}
-}
-
-inline void decodebytesC8_To_Raw16(u16* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		u8 val = src[x];
-		*dst++ = Common::swap16(tlut[val]);
-	}
-}
-
-inline void decodebytesC8IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		*dst++ = decodeIA8Swapped(tlut[src[x]]);
-	}
-}
-
-inline void decodebytesC8RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 8; x++)
-	{
-		*dst++ = decode565RGBA(Common::swap16(tlut[src[x]]));
-	}
-}
-
-#if _M_SSE >= 0x301
-static const __m128i kMaskSwap16 = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L);
-
-inline void decodebytesC8_To_Raw16_SSSE3(u16* dst, const u8* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-
-	// Make 8 16-bits unsigned integer values
-	__m128i a = _mm_setzero_si128();
-	a = _mm_insert_epi16(a, tlut[src[0]], 0);
-	a = _mm_insert_epi16(a, tlut[src[1]], 1);
-	a = _mm_insert_epi16(a, tlut[src[2]], 2);
-	a = _mm_insert_epi16(a, tlut[src[3]], 3);
-	a = _mm_insert_epi16(a, tlut[src[4]], 4);
-	a = _mm_insert_epi16(a, tlut[src[5]], 5);
-	a = _mm_insert_epi16(a, tlut[src[6]], 6);
-	a = _mm_insert_epi16(a, tlut[src[7]], 7);
-
-	// Apply Common::swap16() to 16-bits unsigned integers at once
-	const __m128i b = _mm_shuffle_epi8(a, kMaskSwap16);
-
-	// Store values to dst without polluting the caches
-	_mm_stream_si128((__m128i*)dst, b);
-}
-#endif
-
-inline void decodebytesC14X2_5A3_To_BGRA32(u32 *dst, const u16 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode5A3(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-inline void decodebytesC14X2_5A3_To_RGBA(u32 *dst, const u16 *src, int tlutaddr)
-{
-	u16 *tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode5A3RGBA(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-inline void decodebytesC14X2_To_Raw16(u16* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = Common::swap16(tlut[(val & 0x3FFF)]);
-	}
-}
-
-inline void decodebytesC14X2IA8_To_RGBA(u32* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decodeIA8Swapped(tlut[(val & 0x3FFF)]);
-	}
-}
-
-inline void decodebytesC14X2rgb565_To_RGBA(u32* dst, const u16* src, int tlutaddr)
-{
-	u16* tlut = (u16*)(texMem + tlutaddr);
-	for (int x = 0; x < 4; x++)
-	{
-		u16 val = Common::swap16(src[x]);
-		*dst++ = decode565RGBA(Common::swap16(tlut[(val & 0x3FFF)]));
-	}
-}
-
-// Needs more speed.
-inline void decodebytesIA4(u16 *dst, const u8 *src)
-{
-	for (int x = 0; x < 8; x++)
-	{
-		const u8 val = src[x];
-		u8 a = Convert4To8(val >> 4);
-		u8 l = Convert4To8(val & 0xF);
-		dst[x] = (a << 8) | l;
-	}
-}
-
-inline void decodebytesIA4RGBA(u32 *dst, const u8 *src)
-{
-	for (int x = 0; x < 8; x++)
-	{
-		const u8 val = src[x];
-		u8 a = Convert4To8(val >> 4);
-		u8 l = Convert4To8(val & 0xF);
-		dst[x] = (a << 24) | l << 16 | l << 8 | l;
-	}
-}
-
-inline void decodebytesRGB5A3(u32 *dst, const u16 *src)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = decode5A3(Common::swap16(src[x]));
-#else
-	dst[0] = decode5A3(Common::swap16(src[0]));
-	dst[1] = decode5A3(Common::swap16(src[1]));
-	dst[2] = decode5A3(Common::swap16(src[2]));
-	dst[3] = decode5A3(Common::swap16(src[3]));
-#endif
-}
-
-inline void decodebytesRGB5A3rgba(u32 *dst, const u16 *src)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = decode5A3RGBA(Common::swap16(src[x]));
-#else
-	dst[0] = decode5A3RGBA(Common::swap16(src[0]));
-	dst[1] = decode5A3RGBA(Common::swap16(src[1]));
-	dst[2] = decode5A3RGBA(Common::swap16(src[2]));
-	dst[3] = decode5A3RGBA(Common::swap16(src[3]));
-#endif
-}
-
-// This one is used by many video formats. It'd therefore be good if it was fast.
-// Needs more speed.
-inline void decodebytesARGB8_4(u32 *dst, const u16 *src, const u16 *src2)
-{
-#if 0
-	for (int x = 0; x < 4; x++)
-		dst[x] = Common::swap32((src2[x] << 16) | src[x]);
-#else
-	dst[0] = Common::swap32((src2[0] << 16) | src[0]);
-	dst[1] = Common::swap32((src2[1] << 16) | src[1]);
-	dst[2] = Common::swap32((src2[2] << 16) | src[2]);
-	dst[3] = Common::swap32((src2[3] << 16) | src[3]);
-#endif
-
-	// This can probably be done in a few SSE pack/unpack instructions + pshufb
-	// some unpack instruction x2:
-	// ABABABABABABABAB 1212121212121212 ->
-	// AB12AB12AB12AB12 AB12AB12AB12AB12
-	// 2x pshufb-> 
-	// 21BA21BA21BA21BA 21BA21BA21BA21BA
-	// and we are done.
-}
-
-inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16 * src2)
-{
-#if 0
-	for (int x = 0; x < 4; x++) {
-		dst[x] =  ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8)  | (src2[x] << 8);
-	}
-#else
-	dst[0] =  ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8)  | (src2[0] << 8);
-	dst[1] =  ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8)  | (src2[1] << 8);
-	dst[2] =  ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8)  | (src2[2] << 8);
-	dst[3] =  ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8)  | (src2[3] << 8);
-#endif
-}
-
-inline u32 makecol(int r, int g, int b, int a)
-{
-	return (a << 24)|(r << 16)|(g << 8)|b;
-}
-
-inline u32 makeRGBA(int r, int g, int b, int a)
-{
-	return (a<<24)|(b<<16)|(g<<8)|r;
-}
-
-void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
-{
-	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
-	// Needs more speed.
-	u16 c1 = Common::swap16(src->color1);
-	u16 c2 = Common::swap16(src->color2);
-	int blue1 = Convert5To8(c1 & 0x1F);
-	int blue2 = Convert5To8(c2 & 0x1F);
-	int green1 = Convert6To8((c1 >> 5) & 0x3F);
-	int green2 = Convert6To8((c2 >> 5) & 0x3F);
-	int red1 = Convert5To8((c1 >> 11) & 0x1F);
-	int red2 = Convert5To8((c2 >> 11) & 0x1F);
-	int colors[4];
-	colors[0] = makecol(red1, green1, blue1, 255);
-	colors[1] = makecol(red2, green2, blue2, 255);
-	if (c1 > c2)
-	{
-		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
-		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
-		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
-		colors[2] = makecol(red1 + red3, green1 + green3, blue1 + blue3, 255);
-		colors[3] = makecol(red2 - red3, green2 - green3, blue2 - blue3, 255); 
-	}
-	else
-	{
-		colors[2] = makecol((red1 + red2 + 1) / 2, // Average
-							(green1 + green2 + 1) / 2,
-							(blue1 + blue2 + 1) / 2, 255);
-		colors[3] = makecol(red2, green2, blue2, 0);  // Color2 but transparent
-	}
-
-	for (int y = 0; y < 4; y++)
-	{ 
-		int val = src->lines[y];
-		for (int x = 0; x < 4; x++)
-		{
-			dst[x] = colors[(val >> 6) & 3];
-			val <<= 2;
-		}
-		dst += pitch;
-	}
-}
-
-void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
-{
-	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
-	// Needs more speed.
-	u16 c1 = Common::swap16(src->color1);
-	u16 c2 = Common::swap16(src->color2);
-	int blue1 = Convert5To8(c1 & 0x1F);
-	int blue2 = Convert5To8(c2 & 0x1F);
-	int green1 = Convert6To8((c1 >> 5) & 0x3F);
-	int green2 = Convert6To8((c2 >> 5) & 0x3F);
-	int red1 = Convert5To8((c1 >> 11) & 0x1F);
-	int red2 = Convert5To8((c2 >> 11) & 0x1F);
-	int colors[4];
-	colors[0] = makeRGBA(red1, green1, blue1, 255);
-	colors[1] = makeRGBA(red2, green2, blue2, 255);
-	if (c1 > c2)
-	{
-		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
-		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
-		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);        
-		colors[2] = makeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
-		colors[3] = makeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255); 
-	}
-	else
-	{
-		colors[2] = makeRGBA((red1 + red2 + 1) / 2, // Average
-							(green1 + green2 + 1) / 2,
-							(blue1 + blue2 + 1) / 2, 255);
-		colors[3] = makeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
-	}
-
-	for (int y = 0; y < 4; y++)
-	{ 
-		int val = src->lines[y];
-		for (int x = 0; x < 4; x++)
-		{
-			dst[x] = colors[(val >> 6) & 3];
-			val <<= 2;
-		}
-		dst += pitch;
-	}
-}
-
-#if 0   // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8
-static void copyDXTBlock(u8* dst, const u8* src)
-{
-	((u16*)dst)[0] = Common::swap16(((u16*)src)[0]);
-	((u16*)dst)[1] = Common::swap16(((u16*)src)[1]);
-	u32 pixels = ((u32*)src)[1];
-	// A bit of trickiness here: the row are in the same order
-	// between the two formats, but the ordering within the rows
-	// is reversed.
-	pixels = ((pixels >> 4) & 0x0F0F0F0F) | ((pixels << 4) & 0xF0F0F0F0);
-	pixels = ((pixels >> 2) & 0x33333333) | ((pixels << 2) & 0xCCCCCCCC);
-	((u32*)dst)[1] = pixels;
-}
-#endif
-
-static PC_TexFormat GetPCFormatFromTLUTFormat(int tlutfmt)
-{
-	switch (tlutfmt)
-	{
-	case 0: return PC_TEX_FMT_IA8;    // IA8
-	case 1: return PC_TEX_FMT_RGB565; // RGB565
-	case 2: return PC_TEX_FMT_BGRA32; // RGB5A3: This TLUT format requires
-									  // extra work to decode.
-	}
-	return PC_TEX_FMT_NONE; // Error
-}
-
-PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt)
-{
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_I4:
-		return PC_TEX_FMT_IA8;
-	case GX_TF_I8:  // speed critical
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C8:
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_IA4:
-		return PC_TEX_FMT_IA4_AS_IA8;
-	case GX_TF_IA8:
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C14X2: 
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_RGB565:
-		return PC_TEX_FMT_RGB565;
-	case GX_TF_RGB5A3:
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_RGBA8:  // speed critical
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-			return PC_TEX_FMT_BGRA32;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_NONE;
-}
-
-inline void SetOpenMPThreadCount(int width, int height)
-{
-#ifdef _OPENMP
-	// Don't use multithreading in small Textures
-	if (g_ActiveConfig.bOMPDecoder && width > 127 && height > 127)
-	{
-		// don't span to many threads they will kill the rest of the emu :)
-		omp_set_num_threads((omp_get_num_procs() + 2) / 3);
-	}
-	else
-	{
-		omp_set_num_threads(1);
-	}
-#endif
-}
-
-//switch endianness, unswizzle
-//TODO: to save memory, don't blindly convert everything to argb8888
-//also ARGB order needs to be swapped later, to accommodate modern hardware better
-//need to add DXT support too
-PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
-{
-	SetOpenMPThreadCount(width, height);
-
-	const int Wsteps4 = (width + 3) / 4;
-	const int Wsteps8 = (width + 7) / 8;
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++)
-						decodebytesC4_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);				
-		}
-		else
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++)
-						decodebytesC4_To_Raw16((u16*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);						
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_I4:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = yStep * 8 ; iy < 8; iy++,xStep++)
-						for (int ix = 0; ix < 4; ix++)
-						{
-							int val = src[4 * xStep + ix];
-							dst[(y + iy) * width + x + ix * 2] = Convert4To8(val >> 4);
-							dst[(y + iy) * width + x + ix * 2 + 1] = Convert4To8(val & 0xF);
-						}
-		}
-	   return PC_TEX_FMT_I4_AS_I8;
-	case GX_TF_I8:  // speed critical
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					{
-						((u64*)(dst + (y + iy) * width + x))[0] = ((u64*)(src + 8 * xStep))[0];
-					}
-		}
-		return PC_TEX_FMT_I8;
-	case GX_TF_C8:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-		}
-		else
-		{
-
-#if _M_SSE >= 0x301
-
-			if (cpu_info.bSSSE3) {
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesC8_To_Raw16_SSSE3((u16*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-			} else
-#endif
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesC8_To_Raw16((u16*)dst + (y + iy) * width + x, src  + 8 * xStep, tlutaddr);
-			}
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_IA4:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesIA4((u16*)dst + (y + iy) * width + x, src + 8 * xStep);
-		}
-		return PC_TEX_FMT_IA4_AS_IA8;
-	case GX_TF_IA8:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = yStep * 4; iy < 4; iy++, xStep++)
-					{
-						u16 *ptr = (u16 *)dst + (y + iy) * width + x;
-						u16 *s = (u16 *)(src + 8 * xStep);
-						for(int j = 0; j < 4; j++)
-							*ptr++ = Common::swap16(*s++);
-					}
-
-		}
-		return PC_TEX_FMT_IA8;
-	case GX_TF_C14X2: 
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_To_Raw16((u16*)dst + (y + iy) * width + x,(u16*)(src + 8 * xStep), tlutaddr);
-		}
-		return GetPCFormatFromTLUTFormat(tlutfmt);
-	case GX_TF_RGB565:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					{
-						u16 *ptr = (u16 *)dst + (y + iy) * width + x;
-						u16 *s = (u16 *)(src + 8 * xStep);
-						for(int j = 0; j < 4; j++)
-							*ptr++ = Common::swap16(*s++);
-					}
-		}
-		return PC_TEX_FMT_RGB565;
-	case GX_TF_RGB5A3:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						//decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)src, 4);
-						decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)(src + 8 * xStep));
-		}
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_RGBA8:  // speed critical
-		{
-
-#if _M_SSE >= 0x301
-
-			if (cpu_info.bSSSE3) {
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4) {
-					__m128i* p = (__m128i*)(src + y * width * 4);
-					for (int x = 0; x < width; x += 4) {
-
-						// We use _mm_loadu_si128 instead of _mm_load_si128
-						// because "p" may not be aligned in 16-bytes alignment.
-						// See Issue 3493.
-						const __m128i a0 = _mm_loadu_si128(p++);
-						const __m128i a1 = _mm_loadu_si128(p++);
-						const __m128i a2 = _mm_loadu_si128(p++);
-						const __m128i a3 = _mm_loadu_si128(p++);
-
-						// Shuffle 16-bit integeres by _mm_unpacklo_epi16()/_mm_unpackhi_epi16(),
-						// apply Common::swap32() by _mm_shuffle_epi8() and
-						// store them by _mm_stream_si128().
-						// See decodebytesARGB8_4() about the idea.
-
-						static const __m128i kMaskSwap32 = _mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL, 0x04050607L, 0x00010203L);
-
-						const __m128i b0 = _mm_unpacklo_epi16(a0, a2);
-						const __m128i c0 = _mm_shuffle_epi8(b0, kMaskSwap32);
-						_mm_stream_si128((__m128i*)((u32*)dst + (y + 0) * width + x), c0);
-
-						const __m128i b1 = _mm_unpackhi_epi16(a0, a2);
-						const __m128i c1 = _mm_shuffle_epi8(b1, kMaskSwap32);
-						_mm_stream_si128((__m128i*)((u32*)dst + (y + 1) * width + x), c1);
-
-						const __m128i b2 = _mm_unpacklo_epi16(a1, a3);
-						const __m128i c2 = _mm_shuffle_epi8(b2, kMaskSwap32);
-						_mm_stream_si128((__m128i*)((u32*)dst + (y + 2) * width + x), c2);
-
-						const __m128i b3 = _mm_unpackhi_epi16(a1, a3);
-						const __m128i c3 = _mm_shuffle_epi8(b3, kMaskSwap32);
-						_mm_stream_si128((__m128i*)((u32*)dst + (y + 3) * width + x), c3);
-					}
-				}
-			} else
-
-#endif
-
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					{
-						const u8* src2 = src + 64 * yStep;
-						for (int iy = 0; iy < 4; iy++)
-							decodebytesARGB8_4((u32*)dst + (y+iy)*width + x, (u16*)src2 + 4 * iy, (u16*)src2 + 4 * iy + 16);						
-					}
-			}
-		}
-		return PC_TEX_FMT_BGRA32;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-#if 0   // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8
-			// 11111111 22222222 55555555 66666666
-			// 33333333 44444444 77777777 88888888
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0; x < width; x += 8)
-				{
-					copyDXTBlock(dst+(y/2)*width+x*2, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2)*width+x*2+8, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2+2)*width+x*2, src);
-					src += 8;
-					copyDXTBlock(dst+(y/2+2)*width+x*2+8, src);
-					src += 8;
-				}
-			}
-			return PC_TEX_FMT_DXT1;
-#else
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++)
-				{
-					const u8* src2 = src + 4 * sizeof(DXTBlock) * yStep; 
-					decodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src2, width);
-										src2 += sizeof(DXTBlock);
-					decodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src2, width);										
-				}
-			}
-#endif
-			return PC_TEX_FMT_BGRA32;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_NONE;
-}
-
-
-
-// JSD 01/06/11:
-// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to
-// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128
-// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples
-// of 16 in the aligned case.
-// TODO: complete SSE2 optimization of less often used texture formats.
-// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads.
-
-PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
-{
-	SetOpenMPThreadCount(width, height);
-
-	const int Wsteps4 = (width + 3) / 4;
-	const int Wsteps8 = (width + 7) / 8;
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4_5A3_To_rgba32(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-		}
-		else if(tlutfmt == 0)
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4IA8_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr);
-				
-		}
-		else
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
-						decodebytesC4RGB565_To_RGBA(dst + (y + iy) * width + x, src  + 4 * xStep, tlutaddr);
-		}
-		break;
-	case GX_TF_I4:
-		{
-			const __m128i kMask_x0f = _mm_set1_epi32(0x0f0f0f0fL);
-			const __m128i kMask_xf0 = _mm_set1_epi32(0xf0f0f0f0L);
-#if _M_SSE >= 0x301
-			// xsacha optimized with SSSE3 intrinsics
-			// Produces a ~40% speed improvement over SSE2 implementation
-			if (cpu_info.bSSSE3) {
-				const __m128i mask9180 = _mm_set_epi8(9,9,9,9,1,1,1,1,8,8,8,8,0,0,0,0);
-				const __m128i maskB3A2 = _mm_set_epi8(11,11,11,11,3,3,3,3,10,10,10,10,2,2,2,2);
-				const __m128i maskD5C4 = _mm_set_epi8(13,13,13,13,5,5,5,5,12,12,12,12,4,4,4,4);
-				const __m128i maskF7E6 = _mm_set_epi8(15,15,15,15,7,7,7,7,14,14,14,14,6,6,6,6);
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 8)
-					for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-						for (int iy = 0, xStep =  4 * yStep; iy < 8; iy += 2,xStep++)
-						{
-							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
-							// We want the hi 4 bits of each 8-bit word replicated to 32-bit words:
-							// (00000000 00000000 HhGgFfEe DdCcBbAa) -> (00000000 00000000 HHGGFFEE DDCCBBAA)
-							const __m128i i1 = _mm_and_si128(r0, kMask_xf0);
-							const __m128i i11 = _mm_or_si128(i1, _mm_srli_epi16(i1, 4));
-
-							// Now we do same as above for the second half of the byte
-							const __m128i i2 = _mm_and_si128(r0, kMask_x0f);
-							const __m128i i22 = _mm_or_si128(i2, _mm_slli_epi16(i2,4));
-
-							// Combine both sides
-							const __m128i base = _mm_unpacklo_epi64(i11,i22);
-							// Achieve the pattern visible in the masks.
-							const __m128i o1 = _mm_shuffle_epi8(base, mask9180);
-							const __m128i o2 = _mm_shuffle_epi8(base, maskB3A2);
-							const __m128i o3 = _mm_shuffle_epi8(base, maskD5C4);
-							const __m128i o4 = _mm_shuffle_epi8(base, maskF7E6);
-
-							// Write row 0:
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x ), o1 );
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x + 4 ), o2 );
-							// Write row 1:
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x ), o3 );
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 );
-						}
-			} else
-#endif
-			// JSD optimized with SSE2 intrinsics.
-			// Produces a ~76% speed improvement over reference C implementation.
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 8)
-					for (int x = 0, yStep = (y / 8) * Wsteps8 ; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 8; iy += 2, xStep++)
-						{
-							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
-							// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
-							const __m128i r1 = _mm_unpacklo_epi8(r0, r0);
-
-							// We want the hi 4 bits of each 8-bit word replicated to 32-bit words:
-							// (HhHhGgGg FfFfEeEe DdDdCcCc BbBbAaAa) & kMask_xf0 -> (H0H0G0G0 F0F0E0E0 D0D0C0C0 B0B0A0A0)
-							const __m128i i1 = _mm_and_si128(r1, kMask_xf0);
-							// -> (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA)
-							const __m128i i11 = _mm_or_si128(i1, _mm_srli_epi16(i1, 4));
-
-							// Shuffle low 64-bits with itself to expand from (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA) to (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA)
-							const __m128i i15 = _mm_unpacklo_epi8(i11, i11);
-							// (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA) -> (BBBBBBBB BBBBBBBB AAAAAAAA AAAAAAAA)
-							const __m128i i151 = _mm_unpacklo_epi8(i15, i15);
-							// (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA) -> (DDDDDDDD DDDDDDDD CCCCCCCC CCCCCCCC)
-							const __m128i i152 = _mm_unpackhi_epi8(i15, i15);
-
-							// Shuffle hi  64-bits with itself to expand from (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA) to (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE)
-							const __m128i i16 = _mm_unpackhi_epi8(i11, i11);
-							// (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE) -> (FFFFFFFF FFFFFFFF EEEEEEEE EEEEEEEE)
-							const __m128i i161 = _mm_unpacklo_epi8(i16, i16);
-							// (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE) -> (HHHHHHHH HHHHHHHH GGGGGGGG GGGGGGGG)
-							const __m128i i162 = _mm_unpackhi_epi8(i16, i16);
-
-							// Now find the lo 4 bits of each input 8-bit word:
-							const __m128i i2 = _mm_and_si128(r1, kMask_x0f);
-							const __m128i i22 = _mm_or_si128(i2, _mm_slli_epi16(i2,4));
-
-							const __m128i i25 = _mm_unpacklo_epi8(i22, i22);
-							const __m128i i251 = _mm_unpacklo_epi8(i25, i25);
-							const __m128i i252 = _mm_unpackhi_epi8(i25, i25);
-
-							const __m128i i26 = _mm_unpackhi_epi8(i22, i22);
-							const __m128i i261 = _mm_unpacklo_epi8(i26, i26);
-							const __m128i i262 = _mm_unpackhi_epi8(i26, i26);
-
-							// _mm_and_si128(i151, kMask_x00000000ffffffff) takes i151 and masks off 1st and 3rd 32-bit words
-							// (BBBBBBBB BBBBBBBB AAAAAAAA AAAAAAAA) -> (00000000 BBBBBBBB 00000000 AAAAAAAA)
-							// _mm_and_si128(i251, kMask_xffffffff00000000) takes i251 and masks off 2nd and 4th 32-bit words
-							// (bbbbbbbb bbbbbbbb aaaaaaaa aaaaaaaa) -> (bbbbbbbb 00000000 aaaaaaaa 00000000)
-							// And last but not least, _mm_or_si128 ORs those two together, giving us the interleaving we desire:
-							// (00000000 BBBBBBBB 00000000 AAAAAAAA) | (bbbbbbbb 00000000 aaaaaaaa 00000000) -> (bbbbbbbb BBBBBBBB aaaaaaaa AAAAAAAA)
-							const __m128i kMask_x00000000ffffffff = _mm_set_epi32(0x00000000L, 0xffffffffL, 0x00000000L, 0xffffffffL);
-							const __m128i kMask_xffffffff00000000 = _mm_set_epi32(0xffffffffL, 0x00000000L, 0xffffffffL, 0x00000000L);
-							const __m128i o1 = _mm_or_si128(_mm_and_si128(i151, kMask_x00000000ffffffff), _mm_and_si128(i251, kMask_xffffffff00000000));
-							const __m128i o2 = _mm_or_si128(_mm_and_si128(i152, kMask_x00000000ffffffff), _mm_and_si128(i252, kMask_xffffffff00000000));
-
-							// These two are for the next row; same pattern as above. We batched up two rows because our input was 64 bits.
-							const __m128i o3 = _mm_or_si128(_mm_and_si128(i161, kMask_x00000000ffffffff), _mm_and_si128(i261, kMask_xffffffff00000000));
-							const __m128i o4 = _mm_or_si128(_mm_and_si128(i162, kMask_x00000000ffffffff), _mm_and_si128(i262, kMask_xffffffff00000000));
-							// Write row 0:
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x ), o1 );
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x + 4 ), o2 );
-							// Write row 1:
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x ), o3 );
-							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 );
-						}
-			}
-		}
-	   break;
-	case GX_TF_I8:  // speed critical
-		{
-#if _M_SSE >= 0x301
-			// xsacha optimized with SSSE3 intrinsics
-			// Produces a ~10% speed improvement over SSE2 implementation
-			if (cpu_info.bSSSE3)
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8,yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; ++iy, xStep++)
-						{
-							const __m128i mask3210 = _mm_set_epi8(3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0);
-
-							const __m128i mask7654 = _mm_set_epi8(7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4);
-							__m128i *quaddst, r, rgba0, rgba1;
-							// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-							r = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
-							// Shuffle select bytes to expand from (0000 0000 hgfe dcba) to:
-							rgba0 = _mm_shuffle_epi8(r, mask3210); // (dddd cccc bbbb aaaa)
-							rgba1 = _mm_shuffle_epi8(r, mask7654); // (hhhh gggg ffff eeee)
-
-							quaddst = (__m128i *)(dst + (y + iy)*width + x);
-							_mm_storeu_si128(quaddst, rgba0);
-							_mm_storeu_si128(quaddst+1, rgba1);
-						}
-				
-			} else
-#endif
-			// JSD optimized with SSE2 intrinsics.
-			// Produces an ~86% speed improvement over reference C implementation.
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8,yStep++)
-					{
-						// Each loop iteration processes 4 rows from 4 64-bit reads.
-						const u8* src2 = src + 32 * yStep;
-						// TODO: is it more efficient to group the loads together sequentially and also the stores at the end?
-						// _mm_stream instead of _mm_store on my AMD Phenom II x410 made performance significantly WORSE, so I
-						// went with _mm_stores. Perhaps there is some edge case here creating the terrible performance or we're
-						// not aligned to 16-byte boundaries. I don't know.
-						__m128i *quaddst;
-
-						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-						const __m128i r0 = _mm_loadl_epi64((const __m128i *)src2);
-						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
-						const __m128i r1 = _mm_unpacklo_epi8(r0, r0);
-
-						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
-						const __m128i rgba0 = _mm_unpacklo_epi8(r1, r1);
-						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
-						const __m128i rgba1 = _mm_unpackhi_epi8(r1, r1);
-
-						// Store (dddd cccc bbbb aaaa) out:
-						quaddst = (__m128i *)(dst + (y + 0)*width + x);
-						_mm_storeu_si128(quaddst, rgba0);
-						// Store (hhhh gggg ffff eeee) out:
-						_mm_storeu_si128(quaddst+1, rgba1);
-
-						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-						src2 += 8;
-						const __m128i r2 = _mm_loadl_epi64((const __m128i *)src2);
-						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
-						const __m128i r3 = _mm_unpacklo_epi8(r2, r2);
-
-						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
-						const __m128i rgba2 = _mm_unpacklo_epi8(r3, r3);
-						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
-						const __m128i rgba3 = _mm_unpackhi_epi8(r3, r3);
-
-						// Store (dddd cccc bbbb aaaa) out:
-						quaddst = (__m128i *)(dst + (y + 1)*width + x);
-						_mm_storeu_si128(quaddst, rgba2);
-						// Store (hhhh gggg ffff eeee) out:
-						_mm_storeu_si128(quaddst+1, rgba3);
-
-						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-						src2 += 8;
-						const __m128i r4 = _mm_loadl_epi64((const __m128i *)src2);
-						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
-						const __m128i r5 = _mm_unpacklo_epi8(r4, r4);
-
-						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
-						const __m128i rgba4 = _mm_unpacklo_epi8(r5, r5);
-						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
-						const __m128i rgba5 = _mm_unpackhi_epi8(r5, r5);
-
-						// Store (dddd cccc bbbb aaaa) out:
-						quaddst = (__m128i *)(dst + (y + 2)*width + x);
-						_mm_storeu_si128(quaddst, rgba4);
-						// Store (hhhh gggg ffff eeee) out:
-						_mm_storeu_si128(quaddst+1, rgba5);
-
-						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-						src2 += 8;
-						const __m128i r6 = _mm_loadl_epi64((const __m128i *)src2);
-						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
-						const __m128i r7 = _mm_unpacklo_epi8(r6, r6);
-
-						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
-						const __m128i rgba6 = _mm_unpacklo_epi8(r7, r7);
-						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
-						const __m128i rgba7 = _mm_unpackhi_epi8(r7, r7);
-
-						// Store (dddd cccc bbbb aaaa) out:
-						quaddst = (__m128i *)(dst + (y + 3)*width + x);
-						_mm_storeu_si128(quaddst, rgba6);
-						// Store (hhhh gggg ffff eeee) out:
-						_mm_storeu_si128(quaddst+1, rgba7);
-						
-					}
-			}
-		}
-		break;
-	case GX_TF_C8:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC8_5A3_To_RGBA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-		}
-		else if(tlutfmt == 0)
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesC8IA8_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);
-			
-		}
-		else
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesC8RGB565_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr);			
-
-		}
-		break;
-	case GX_TF_IA4:
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-							decodebytesIA4RGBA(dst + (y + iy) * width + x, src + 8 * xStep);
-		}
-		break;
-	case GX_TF_IA8:
-		{
-#if _M_SSE >= 0x301
-			// xsacha optimized with SSSE3 intrinsics.
-			// Produces an ~50% speed improvement over SSE2 implementation.
-			if (cpu_info.bSSSE3)
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						{
-							const __m128i mask = _mm_set_epi8(6, 7, 7, 7, 4, 5, 5, 5, 2, 3, 3, 3, 0, 1, 1, 1);
-							// Load 4x 16-bit IA8 samples from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
-							// Shuffle to (ghhh efff cddd abbb)
-							const __m128i r1 = _mm_shuffle_epi8(r0, mask);
-							_mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 );
-						}
-			} else
-#endif
-			// JSD optimized with SSE2 intrinsics.
-			// Produces an ~80% speed improvement over reference C implementation.
-			{
-				const __m128i kMask_xf0 = _mm_set_epi32(0x00000000L, 0x00000000L, 0xff00ff00L, 0xff00ff00L);
-				const __m128i kMask_x0f = _mm_set_epi32(0x00000000L, 0x00000000L, 0x00ff00ffL, 0x00ff00ffL);
-				const __m128i kMask_xf000 = _mm_set_epi32(0xff000000L, 0xff000000L, 0xff000000L, 0xff000000L);
-				const __m128i kMask_x0fff = _mm_set_epi32(0x00ffffffL, 0x00ffffffL, 0x00ffffffL, 0x00ffffffL);
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						{
-							// Expands a 16-bit "IA" to a 32-bit "AIII". Each char is an 8-bit value.
-
-							// Load 4x 16-bit IA8 samples from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
-							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src+ 8 * xStep));
-
-							// Logical shift all 16-bit words right by 8 bits (0000 0000 hgfe dcba) to (0000 0000 0h0f 0d0b)
-							// This gets us only the I components.
-							const __m128i i0 = _mm_srli_epi16(r0, 8);
-
-							// Now join up the I components from their original positions but mask out the A components.
-							// (0000 0000 hgfe dcba) &      kMask_xFF00      -> (0000 0000 h0f0 d0b0)
-							// (0000 0000 h0f0 d0b0) | (0000 0000 0h0f 0d0b) -> (0000 0000 hhff ddbb)
-							const __m128i i1 = _mm_or_si128(_mm_and_si128(r0, kMask_xf0), i0);
-
-							// Shuffle low 64-bits with itself to expand from (0000 0000 hhff ddbb) to (hhhh ffff dddd bbbb)
-							const __m128i i2 = _mm_unpacklo_epi8(i1, i1);
-							// (hhhh ffff dddd bbbb) & kMask_x0fff -> (0hhh 0fff 0ddd 0bbb)
-							const __m128i i3 = _mm_and_si128(i2, kMask_x0fff);
-
-							// Now that we have the I components in 32-bit word form, time work out the A components into
-							// their final positions.
-
-							// (0000 0000 hgfe dcba) &      kMask_x00FF      -> (0000 0000 0g0e 0c0a)
-							const __m128i a0 = _mm_and_si128(r0, kMask_x0f);
-							// (0000 0000 0g0e 0c0a) -> (00gg 00ee 00cc 00aa)
-							const __m128i a1 = _mm_unpacklo_epi8(a0, a0);
-							// (00gg 00ee 00cc 00aa) << 16 -> (gg00 ee00 cc00 aa00)
-							const __m128i a2 = _mm_slli_epi32(a1, 16);
-							// (gg00 ee00 cc00 aa00) & kMask_xf000 -> (g000 e000 c000 a000)
-							const __m128i a3 = _mm_and_si128(a2, kMask_xf000);
-
-							// Simply OR up i3 and a3 now and that's our result:
-							// (0hhh 0fff 0ddd 0bbb) | (g000 e000 c000 a000) -> (ghhh efff cddd abbb)
-							const __m128i r1 = _mm_or_si128(i3, a3);
-
-							// write out the 128-bit result:
-							_mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 );
-						}
-			}
-		}
-		break;
-	case GX_TF_C14X2:
-		if (tlutfmt == 2)
-		{
-			// Special decoding is required for TLUT format 5A3
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2_5A3_To_BGRA32(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else if (tlutfmt == 0)
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2IA8_To_RGBA(dst + (y + iy) * width + x,  (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		else
-		{
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						decodebytesC14X2rgb565_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr);
-		}
-		break;
-	case GX_TF_RGB565:
-		{
-			// JSD optimized with SSE2 intrinsics.
-			// Produces an ~78% speed improvement over reference C implementation.
-			const __m128i kMaskR0 = _mm_set1_epi32(0x000000F8);
-			const __m128i kMaskG0 = _mm_set1_epi32(0x0000FC00);
-			const __m128i kMaskG1 = _mm_set1_epi32(0x00000300);
-			const __m128i kMaskB0 = _mm_set1_epi32(0x00F80000);
-			const __m128i kAlpha  = _mm_set1_epi32(0xFF000000);
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 4)
-				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-					{
-						__m128i *dxtsrc = (__m128i *)(src + 8 * xStep);
-						// Load 4x 16-bit colors: (0000 0000 hgfe dcba)
-						// where hg, fe, ba, and dc are 16-bit colors in big-endian order
-						const __m128i rgb565x4 = _mm_loadl_epi64(dxtsrc);
-
-						// The big-endian 16-bit colors `ba` and `dc` look like 0b_gggBBBbb_RRRrrGGg in a little endian xmm register
-						// Unpack `hgfe dcba` to `hhgg ffee ddcc bbaa`, where each 32-bit word is now 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg
-						const __m128i c0 = _mm_unpacklo_epi16(rgb565x4, rgb565x4);
-
-						// swizzle 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg
-						//      to 0b_11111111_BBBbbBBB_GGggggGG_RRRrrRRR
-
-						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg &
-						// 0b_00000000_00000000_00000000_11111000 =
-						// 0b_00000000_00000000_00000000_RRRrr000
-						const __m128i r0 = _mm_and_si128(c0, kMaskR0);
-						// 0b_00000000_00000000_00000000_RRRrr000 >> 5 [32] =
-						// 0b_00000000_00000000_00000000_00000RRR
-						const __m128i r1 = _mm_srli_epi32(r0, 5);
-
-						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg >> 3 [32] =
-						// 0b_000gggBB_BbbRRRrr_GGggggBB_BbbRRRrr &
-						// 0b_00000000_00000000_11111100_00000000 = 
-						// 0b_00000000_00000000_GGgggg00_00000000
-						const __m128i gtmp = _mm_srli_epi32(c0, 3);
-						const __m128i g0 = _mm_and_si128(gtmp, kMaskG0);
-						// 0b_GGggggBB_BbbRRRrr_GGggggBB_Bbb00000 >> 6 [32] =
-						// 0b_000000GG_ggggBBBb_bRRRrrGG_ggggBBBb &
-						// 0b_00000000_00000000_00000011_00000000 =
-						// 0b_00000000_00000000_000000GG_00000000 =
-						const __m128i g1 = _mm_and_si128(_mm_srli_epi32(gtmp, 6), kMaskG1);
-
-						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg >> 5 [32] =
-						// 0b_00000ggg_BBBbbRRR_rrGGgggg_BBBbbRRR &
-						// 0b_00000000_11111000_00000000_00000000 =
-						// 0b_00000000_BBBbb000_00000000_00000000
-						const __m128i b0 = _mm_and_si128(_mm_srli_epi32(c0, 5), kMaskB0);
-						// 0b_00000000_BBBbb000_00000000_00000000 >> 5 [16] =
-						// 0b_00000000_00000BBB_00000000_00000000
-						const __m128i b1 = _mm_srli_epi16(b0, 5);
-
-						// OR together the final RGB bits and the alpha component:
-						const __m128i abgr888x4 = _mm_or_si128(
-							_mm_or_si128(
-								_mm_or_si128(r0, r1),
-								_mm_or_si128(g0, g1)
-							),
-							_mm_or_si128(
-								_mm_or_si128(b0, b1),
-								kAlpha
-							)
-						);
-
-						__m128i *ptr = (__m128i *)(dst + (y + iy) * width + x);
-						_mm_storeu_si128(ptr, abgr888x4);
-					}
-		}
-		break;
-	case GX_TF_RGB5A3:
-		{
-			const __m128i kMask_x1f = _mm_set1_epi32(0x0000001fL);
-			const __m128i kMask_x0f = _mm_set1_epi32(0x0000000fL);
-			const __m128i kMask_x07 = _mm_set1_epi32(0x00000007L);
-			// This is the hard-coded 0xFF alpha constant that is ORed in place after the RGB are calculated
-			// for the RGB555 case when (s[x] & 0x8000) is true for all pixels.
-			const __m128i aVxff00   = _mm_set1_epi32(0xFF000000L);
-
-#if _M_SSE >= 0x301
-			// xsacha optimized with SSSE3 intrinsics (2 in 4 cases)
-			// Produces a ~10% speed improvement over SSE2 implementation
-			if (cpu_info.bSSSE3)
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						{
-							u32 *newdst = dst+(y+iy)*width+x;
-							const __m128i mask = _mm_set_epi8(128,128,6,7,128,128,4,5,128,128,2,3,128,128,0,1);
-								const __m128i valV = _mm_shuffle_epi8(_mm_loadl_epi64((const __m128i*)(src + 8 * xStep)),mask);
-								int cmp = _mm_movemask_epi8(valV); //MSB: 0x2 = val0; 0x20=val1; 0x200 = val2; 0x2000=val3
-								if ((cmp&0x2222)==0x2222) // SSSE3 case #1: all 4 pixels are in RGB555 and alpha = 0xFF.
-								{
-									// Swizzle bits: 00012345 -> 12345123
-
-									//r0 = (((val0>>10) & 0x1f) << 3) | (((val0>>10) & 0x1f) >> 2);
-									const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 10), kMask_x1f);
-									const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 3), _mm_srli_epi16(tmprV, 2) );
-
-									//g0 = (((val0>>5 ) & 0x1f) << 3) | (((val0>>5 ) & 0x1f) >> 2);
-									const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 5), kMask_x1f);
-									const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 3), _mm_srli_epi16(tmpgV, 2) );
-
-									//b0 = (((val0    ) & 0x1f) << 3) | (((val0    ) & 0x1f) >> 2);
-									const __m128i tmpbV = _mm_and_si128(valV, kMask_x1f);
-									const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) );
-
-									//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
-									const __m128i final = _mm_or_si128(	_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
-														_mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00));
-									_mm_storeu_si128( (__m128i*)newdst, final );
-								}
-								else if (!(cmp&0x2222)) // SSSE3 case #2: all 4 pixels are in RGBA4443.
-								{
-									// Swizzle bits: 00001234 -> 12341234
-
-									//r0 = (((val0>>8 ) & 0xf) << 4) | ((val0>>8 ) & 0xf);
-									const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 8), kMask_x0f);
-									const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 4), tmprV );
-
-									//g0 = (((val0>>4 ) & 0xf) << 4) | ((val0>>4 ) & 0xf);
-									const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 4), kMask_x0f);
-									const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 4), tmpgV );
-
-									//b0 = (((val0    ) & 0xf) << 4) | ((val0    ) & 0xf);
-									const __m128i tmpbV = _mm_and_si128(valV, kMask_x0f);
-									const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 4), tmpbV );
-									//a0 = (((val0>>12) & 0x7) << 5) | (((val0>>12) & 0x7) << 2) | (((val0>>12) & 0x7) >> 1);
-									const __m128i tmpaV = _mm_and_si128(_mm_srli_epi16(valV, 12), kMask_x07);
-									const __m128i aV = _mm_or_si128(
-										_mm_slli_epi16(tmpaV, 5),
-										_mm_or_si128(
-											_mm_slli_epi16(tmpaV, 2),
-											_mm_srli_epi16(tmpaV, 1)
-										)
-									);
-
-									//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
-									const __m128i final = _mm_or_si128(	_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
-																_mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24)));
-									_mm_storeu_si128( (__m128i*)newdst, final );
-								}
-								else
-								{
-									// TODO: Vectorise (Either 4-way branch or do both and select is better than this)
-									u32 *vals = (u32*) &valV;
-									int r,g,b,a;
-									for (int i=0; i < 4; ++i)
-									{
-										if (vals[i] & 0x8000)
-										{
-											// Swizzle bits: 00012345 -> 12345123
-											r = (((vals[i]>>10) & 0x1f) << 3) | (((vals[i]>>10) & 0x1f) >> 2);
-											g = (((vals[i]>>5 ) & 0x1f) << 3) | (((vals[i]>>5 ) & 0x1f) >> 2);
-											b = (((vals[i]    ) & 0x1f) << 3) | (((vals[i]    ) & 0x1f) >> 2);
-											a = 0xFF;
-										}
-										else
-										{
-											a = (((vals[i]>>12) & 0x7) << 5) | (((vals[i]>>12) & 0x7) << 2) | (((vals[i]>>12) & 0x7) >> 1);
-											// Swizzle bits: 00001234 -> 12341234
-											r = (((vals[i]>>8 ) & 0xf) << 4) | ((vals[i]>>8 ) & 0xf);
-											g = (((vals[i]>>4 ) & 0xf) << 4) | ((vals[i]>>4 ) & 0xf);
-											b = (((vals[i]    ) & 0xf) << 4) | ((vals[i]    ) & 0xf);
-										}
-										newdst[i] = r | (g << 8) | (b << 16) | (a << 24);
-									}
-								}
-						}
-			} else
-#endif
-			// JSD optimized with SSE2 intrinsics (2 in 4 cases)
-			// Produces a ~25% speed improvement over reference C implementation.
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
-						{
-							u32 *newdst = dst+(y+iy)*width+x;
-							const u16 *newsrc = (const u16*)(src + 8 * xStep);
-
-							// TODO: weak point
-							const u16 val0 = Common::swap16(newsrc[0]);
-							const u16 val1 = Common::swap16(newsrc[1]);
-							const u16 val2 = Common::swap16(newsrc[2]);
-							const u16 val3 = Common::swap16(newsrc[3]);
-
-							const __m128i valV = _mm_set_epi16(0, val3, 0, val2, 0, val1, 0, val0);
-
-							// Need to check all 4 pixels' MSBs to ensure we can do data-parallelism:
-							if (((val0 & 0x8000) & (val1 & 0x8000) & (val2 & 0x8000) & (val3 & 0x8000)) == 0x8000)
-							{
-								// SSE2 case #1: all 4 pixels are in RGB555 and alpha = 0xFF.
-
-								// Swizzle bits: 00012345 -> 12345123
-
-								//r0 = (((val0>>10) & 0x1f) << 3) | (((val0>>10) & 0x1f) >> 2);
-								const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 10), kMask_x1f);
-								const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 3), _mm_srli_epi16(tmprV, 2) );
-
-								//g0 = (((val0>>5 ) & 0x1f) << 3) | (((val0>>5 ) & 0x1f) >> 2);
-								const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 5), kMask_x1f);
-								const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 3), _mm_srli_epi16(tmpgV, 2) );
-
-								//b0 = (((val0    ) & 0x1f) << 3) | (((val0    ) & 0x1f) >> 2);
-								const __m128i tmpbV = _mm_and_si128(valV, kMask_x1f);
-								const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) );
-
-								//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
-								const __m128i final = _mm_or_si128(	_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
-													_mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00));
-
-								// write the final result:
-								_mm_storeu_si128( (__m128i*)newdst, final );
-							}
-							else if (((val0 & 0x8000) | (val1 & 0x8000) | (val2 & 0x8000) | (val3 & 0x8000)) == 0x0000)
-							{
-								// SSE2 case #2: all 4 pixels are in RGBA4443.
-
-								// Swizzle bits: 00001234 -> 12341234
-
-								//r0 = (((val0>>8 ) & 0xf) << 4) | ((val0>>8 ) & 0xf);
-								const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 8), kMask_x0f);
-								const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 4), tmprV );
-
-								//g0 = (((val0>>4 ) & 0xf) << 4) | ((val0>>4 ) & 0xf);
-								const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 4), kMask_x0f);
-								const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 4), tmpgV );
-
-								//b0 = (((val0    ) & 0xf) << 4) | ((val0    ) & 0xf);
-								const __m128i tmpbV = _mm_and_si128(valV, kMask_x0f);
-								const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 4), tmpbV );
-
-								//a0 = (((val0>>12) & 0x7) << 5) | (((val0>>12) & 0x7) << 2) | (((val0>>12) & 0x7) >> 1);
-								const __m128i tmpaV = _mm_and_si128(_mm_srli_epi16(valV, 12), kMask_x07);
-								const __m128i aV = _mm_or_si128(
-									_mm_slli_epi16(tmpaV, 5),
-									_mm_or_si128(
-										_mm_slli_epi16(tmpaV, 2),
-										_mm_srli_epi16(tmpaV, 1)
-									)
-								);
-
-								//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
-								const __m128i final = _mm_or_si128(	_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
-													_mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24)));
-
-								// write the final result:
-								_mm_storeu_si128( (__m128i*)newdst, final );
-							}
-							else
-							{
-								// TODO: Vectorise (Either 4-way branch or do both and select is better than this)
-								u32 *vals = (u32*) &valV;
-								int r,g,b,a;
-								for (int i=0; i < 4; ++i)
-								{
-									if (vals[i] & 0x8000)
-									{
-										// Swizzle bits: 00012345 -> 12345123
-										r = (((vals[i]>>10) & 0x1f) << 3) | (((vals[i]>>10) & 0x1f) >> 2);
-										g = (((vals[i]>>5 ) & 0x1f) << 3) | (((vals[i]>>5 ) & 0x1f) >> 2);
-										b = (((vals[i]    ) & 0x1f) << 3) | (((vals[i]    ) & 0x1f) >> 2);
-										a = 0xFF;
-									}
-									else
-									{
-										a = (((vals[i]>>12) & 0x7) << 5) | (((vals[i]>>12) & 0x7) << 2) | (((vals[i]>>12) & 0x7) >> 1);
-										// Swizzle bits: 00001234 -> 12341234
-										r = (((vals[i]>>8 ) & 0xf) << 4) | ((vals[i]>>8 ) & 0xf);
-										g = (((vals[i]>>4 ) & 0xf) << 4) | ((vals[i]>>4 ) & 0xf);
-										b = (((vals[i]    ) & 0xf) << 4) | ((vals[i]    ) & 0xf);
-									}
-									newdst[i] = r | (g << 8) | (b << 16) | (a << 24);
-								}
-							}
-						}
-				}
-		}
-		break;
-	case GX_TF_RGBA8:  // speed critical
-		{
-#if _M_SSE >= 0x301
-			// xsacha optimized with SSSE3 instrinsics
-			// Produces a ~30% speed improvement over SSE2 implementation
-			if (cpu_info.bSSSE3)
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					{
-						const u8* src2 = src + 64 * yStep;
-						const __m128i mask0312 = _mm_set_epi8(12,15,13,14,8,11,9,10,4,7,5,6,0,3,1,2);
-						const __m128i ar0 = _mm_loadu_si128((__m128i*)src2);
-						const __m128i ar1 = _mm_loadu_si128((__m128i*)src2+1);
-						const __m128i gb0 = _mm_loadu_si128((__m128i*)src2+2);
-						const __m128i gb1 = _mm_loadu_si128((__m128i*)src2+3);
-
-
-						const __m128i rgba00 = _mm_shuffle_epi8(_mm_unpacklo_epi8(ar0,gb0),mask0312);
-						const __m128i rgba01 = _mm_shuffle_epi8(_mm_unpackhi_epi8(ar0,gb0),mask0312);
-						const __m128i rgba10 = _mm_shuffle_epi8(_mm_unpacklo_epi8(ar1,gb1),mask0312);
-						const __m128i rgba11 = _mm_shuffle_epi8(_mm_unpackhi_epi8(ar1,gb1),mask0312);
-
-						__m128i	*dst128 = (__m128i*)( dst + (y + 0) * width + x );
-						_mm_storeu_si128(dst128, rgba00);
-						dst128 = (__m128i*)( dst + (y + 1) * width + x );
-						_mm_storeu_si128(dst128, rgba01);
-						dst128 = (__m128i*)( dst + (y + 2) * width + x );
-						_mm_storeu_si128(dst128, rgba10);
-						dst128 = (__m128i*)( dst + (y + 3) * width + x );
-						_mm_storeu_si128(dst128, rgba11);
-					}
-			} else
-#endif
-			// JSD optimized with SSE2 intrinsics
-			// Produces a ~68% speed improvement over reference C implementation.
-			{
-				#pragma omp parallel for
-				for (int y = 0; y < height; y += 4)
-					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
-					{
-						// Input is divided up into 16-bit words. The texels are split up into AR and GB components where all
-						// AR components come grouped up first in 32 bytes followed by the GB components in 32 bytes. We are
-						// processing 16 texels per each loop iteration, numbered from 0-f.
-						//
-						// Convention is:
-						//   one byte is [component-name texel-number]
-						//    __m128i is (4-bytes 4-bytes 4-bytes 4-bytes)
-						//
-						// Input  is ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0])
-						//           ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8])
-						//           ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0])
-						//           ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8])
-						//
-						// Output is (RGBA3 RGBA2 RGBA1 RGBA0)
-						//           (RGBA7 RGBA6 RGBA5 RGBA4)
-						//           (RGBAb RGBAa RGBA9 RGBA8)
-						//           (RGBAf RGBAe RGBAd RGBAc)
-						const u8* src2 = src + 64 * yStep;
-						// Loads the 1st half of AR components ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0])
-						const __m128i ar0 = _mm_loadu_si128((__m128i*)src2);
-						// Loads the 2nd half of AR components ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8])
-						const __m128i ar1 = _mm_loadu_si128((__m128i*)src2+1);
-						// Loads the 1st half of GB components ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0])
-						const __m128i gb0 = _mm_loadu_si128((__m128i*)src2+2);
-						// Loads the 2nd half of GB components ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8])
-						const __m128i gb1 = _mm_loadu_si128((__m128i*)src2+3);
-						__m128i rgba00, rgba01, rgba10, rgba11;
-						const __m128i kMask_x000f = _mm_set_epi32(0x000000FFL, 0x000000FFL, 0x000000FFL, 0x000000FFL);
-						const __m128i kMask_xf000 = _mm_set_epi32(0xFF000000L, 0xFF000000L, 0xFF000000L, 0xFF000000L);
-						const __m128i kMask_x0ff0 = _mm_set_epi32(0x00FFFF00L, 0x00FFFF00L, 0x00FFFF00L, 0x00FFFF00L);
-						// Expand the AR components to fill out 32-bit words:
-						// ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0]) -> ([A 3][A 3][R 3][R 3] [A 2][A 2][R 2][R 2] [A 1][A 1][R 1][R 1] [A 0][A 0][R 0][R 0])
-						const __m128i aarr00 = _mm_unpacklo_epi8(ar0, ar0);
-						// ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0]) -> ([A 7][A 7][R 7][R 7] [A 6][A 6][R 6][R 6] [A 5][A 5][R 5][R 5] [A 4][A 4][R 4][R 4])
-						const __m128i aarr01 = _mm_unpackhi_epi8(ar0, ar0);
-						// ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8]) -> ([A b][A b][R b][R b] [A a][A a][R a][R a] [A 9][A 9][R 9][R 9] [A 8][A 8][R 8][R 8])
-						const __m128i aarr10 = _mm_unpacklo_epi8(ar1, ar1);
-						// ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8]) -> ([A f][A f][R f][R f] [A e][A e][R e][R e] [A d][A d][R d][R d] [A c][A c][R c][R c])
-						const __m128i aarr11 = _mm_unpackhi_epi8(ar1, ar1);
-
-						// Move A right 16 bits and mask off everything but the lowest  8 bits to get A in its final place:
-						const __m128i ___a00 = _mm_and_si128(_mm_srli_epi32(aarr00, 16), kMask_x000f);
-						// Move R left  16 bits and mask off everything but the highest 8 bits to get R in its final place:
-						const __m128i r___00 = _mm_and_si128(_mm_slli_epi32(aarr00, 16), kMask_xf000);
-						// OR the two together to get R and A in their final places:
-						const __m128i r__a00 = _mm_or_si128(r___00, ___a00);
-
-						const __m128i ___a01 = _mm_and_si128(_mm_srli_epi32(aarr01, 16), kMask_x000f);
-						const __m128i r___01 = _mm_and_si128(_mm_slli_epi32(aarr01, 16), kMask_xf000);
-						const __m128i r__a01 = _mm_or_si128(r___01, ___a01);
-
-						const __m128i ___a10 = _mm_and_si128(_mm_srli_epi32(aarr10, 16), kMask_x000f);
-						const __m128i r___10 = _mm_and_si128(_mm_slli_epi32(aarr10, 16), kMask_xf000);
-						const __m128i r__a10 = _mm_or_si128(r___10, ___a10);
-
-						const __m128i ___a11 = _mm_and_si128(_mm_srli_epi32(aarr11, 16), kMask_x000f);
-						const __m128i r___11 = _mm_and_si128(_mm_slli_epi32(aarr11, 16), kMask_xf000);
-						const __m128i r__a11 = _mm_or_si128(r___11, ___a11);
-
-						// Expand the GB components to fill out 32-bit words:
-						// ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0]) -> ([G 3][G 3][B 3][B 3] [G 2][G 2][B 2][B 2] [G 1][G 1][B 1][B 1] [G 0][G 0][B 0][B 0])
-						const __m128i ggbb00 = _mm_unpacklo_epi8(gb0, gb0);
-						// ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0]) -> ([G 7][G 7][B 7][B 7] [G 6][G 6][B 6][B 6] [G 5][G 5][B 5][B 5] [G 4][G 4][B 4][B 4])
-						const __m128i ggbb01 = _mm_unpackhi_epi8(gb0, gb0);
-						// ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8]) -> ([G b][G b][B b][B b] [G a][G a][B a][B a] [G 9][G 9][B 9][B 9] [G 8][G 8][B 8][B 8])
-						const __m128i ggbb10 = _mm_unpacklo_epi8(gb1, gb1);
-						// ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8]) -> ([G f][G f][B f][B f] [G e][G e][B e][B e] [G d][G d][B d][B d] [G c][G c][B c][B c])
-						const __m128i ggbb11 = _mm_unpackhi_epi8(gb1, gb1);
-
-						// G and B are already in perfect spots in the center, just remove the extra copies in the 1st and 4th positions:
-						const __m128i _gb_00 = _mm_and_si128(ggbb00, kMask_x0ff0);
-						const __m128i _gb_01 = _mm_and_si128(ggbb01, kMask_x0ff0);
-						const __m128i _gb_10 = _mm_and_si128(ggbb10, kMask_x0ff0);
-						const __m128i _gb_11 = _mm_and_si128(ggbb11, kMask_x0ff0);
-
-						// Now join up R__A and _GB_ to get RGBA!
-						rgba00 = _mm_or_si128(r__a00, _gb_00);
-						rgba01 = _mm_or_si128(r__a01, _gb_01);
-						rgba10 = _mm_or_si128(r__a10, _gb_10);
-						rgba11 = _mm_or_si128(r__a11, _gb_11);
-						// Write em out!
-						__m128i	*dst128 = (__m128i*)( dst + (y + 0) * width + x );
-						_mm_storeu_si128(dst128, rgba00);
-						dst128 = (__m128i*)( dst + (y + 1) * width + x );
-						_mm_storeu_si128(dst128, rgba01);
-						dst128 = (__m128i*)( dst + (y + 2) * width + x );
-						_mm_storeu_si128(dst128, rgba10);
-						dst128 = (__m128i*)( dst + (y + 3) * width + x );
-						_mm_storeu_si128(dst128, rgba11);
-					}				
-			}
-		}
-		break;
-	case GX_TF_CMPR:  // speed critical
-		// The metroid games use this format almost exclusively.
-		{
-			// JSD optimized with SSE2 intrinsics.
-			// Produces a ~50% improvement for x86 and a ~40% improvement for x64 in speed over reference C implementation.
-			// The x64 compiled reference C code is faster than the x86 compiled reference C code, but the SSE2 is
-			// faster than both.
-			#pragma omp parallel for
-			for (int y = 0; y < height; y += 8)
-			{
-				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
-				{
-					// We handle two DXT blocks simultaneously to take full advantage of SSE2's 128-bit registers.
-					// This is ideal because a single DXT block contains 2 RGBA colors when decoded from their 16-bit.
-					// Two DXT blocks therefore contain 4 RGBA colors to be processed. The processing is parallelizable
-					// at this level, so we do.
-					for (int z = 0, xStep = 2 * yStep; z < 2; ++z, xStep++)
-					{
-						// JSD NOTE: You may see many strange patterns of behavior in the below code, but they
-						// are for performance reasons. Sometimes, calculating what should be obvious hard-coded
-						// constants is faster than loading their values from memory. Unfortunately, there is no
-						// way to inline 128-bit constants from opcodes so they must be loaded from memory. This
-						// seems a little ridiculous to me in that you can't even generate a constant value of 1 without
-						// having to load it from memory. So, I stored the minimal constant I could, 128-bits worth
-						// of 1s :). Then I use sequences of shifts to squash it to the appropriate size and bit
-						// positions that I need.
-
-						const __m128i allFFs128 = _mm_cmpeq_epi32(_mm_setzero_si128(), _mm_setzero_si128());
-
-						// Load 128 bits, i.e. two DXTBlocks (64-bits each)
-						const __m128i dxt = _mm_loadu_si128((__m128i *)(src + sizeof(struct DXTBlock) * 2 * xStep));
-
-						// Copy the 2-bit indices from each DXT block:
-						GC_ALIGNED16( u32 dxttmp[4] );
-						_mm_store_si128((__m128i *)dxttmp, dxt);
-
-						u32 dxt0sel = dxttmp[1];
-						u32 dxt1sel = dxttmp[3];
-
-						__m128i argb888x4;
-						__m128i c1 = _mm_unpackhi_epi16(dxt, dxt);
-						c1 = _mm_slli_si128(c1, 8);
-						const __m128i c0 = _mm_or_si128(c1, _mm_srli_si128(_mm_slli_si128(_mm_unpacklo_epi16(dxt, dxt), 8), 8));
-
-						// Compare rgb0 to rgb1:
-						// Each 32-bit word will contain either 0xFFFFFFFF or 0x00000000 for true/false.
-						const __m128i c0cmp = _mm_srli_epi32(_mm_slli_epi32(_mm_srli_epi64(c0, 8), 16), 16);
-						const __m128i c0shr = _mm_srli_epi64(c0cmp, 32);
-						const __m128i cmprgb0rgb1 = _mm_cmpgt_epi32(c0cmp, c0shr);
-
-						int cmp0 = _mm_extract_epi16(cmprgb0rgb1, 0);
-						int cmp1 = _mm_extract_epi16(cmprgb0rgb1, 4);
-
-						// green:
-						// NOTE: We start with the larger number of bits (6) firts for G and shift the mask down 1 bit to get a 5-bit mask
-						// later for R and B components.
-						// low6mask == _mm_set_epi32(0x0000FC00, 0x0000FC00, 0x0000FC00, 0x0000FC00)
-						const __m128i low6mask = _mm_slli_epi32( _mm_srli_epi32(allFFs128, 24 + 2), 8 + 2);
-						const __m128i gtmp = _mm_srli_epi32(c0, 3);
-						const __m128i g0 = _mm_and_si128(gtmp, low6mask);
-						// low3mask == _mm_set_epi32(0x00000300, 0x00000300, 0x00000300, 0x00000300)
-						const __m128i g1 = _mm_and_si128(_mm_srli_epi32(gtmp, 6), _mm_set_epi32(0x00000300, 0x00000300, 0x00000300, 0x00000300));
-						argb888x4 = _mm_or_si128(g0, g1);
-						// red:
-						// low5mask == _mm_set_epi32(0x000000F8, 0x000000F8, 0x000000F8, 0x000000F8)
-						const __m128i low5mask = _mm_slli_epi32( _mm_srli_epi32(low6mask, 8 + 3), 3);
-						const __m128i r0 = _mm_and_si128(c0, low5mask);
-						const __m128i r1 = _mm_srli_epi32(r0, 5);
-						argb888x4 = _mm_or_si128(argb888x4, _mm_or_si128(r0, r1));
-						// blue:
-						// _mm_slli_epi32(low5mask, 16) == _mm_set_epi32(0x00F80000, 0x00F80000, 0x00F80000, 0x00F80000)
-						const __m128i b0 = _mm_and_si128(_mm_srli_epi32(c0, 5), _mm_slli_epi32(low5mask, 16));
-						const __m128i b1 = _mm_srli_epi16(b0, 5);
-						// OR in the fixed alpha component
-						// _mm_slli_epi32( allFFs128, 24 ) == _mm_set_epi32(0xFF000000, 0xFF000000, 0xFF000000, 0xFF000000)
-						argb888x4 = _mm_or_si128(_mm_or_si128(argb888x4, _mm_slli_epi32( allFFs128, 24 ) ), _mm_or_si128(b0, b1));
-						// calculate RGB2 and RGB3:
-						const __m128i rgb0 = _mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(2, 2, 0, 0));
-						const __m128i rgb1 = _mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(3, 3, 1, 1));
-						const __m128i rrggbb0 = _mm_and_si128(_mm_unpacklo_epi8(rgb0, rgb0), _mm_srli_epi16( allFFs128, 8 ));
-						const __m128i rrggbb1 = _mm_and_si128(_mm_unpacklo_epi8(rgb1, rgb1), _mm_srli_epi16( allFFs128, 8 ));
-						const __m128i rrggbb01 = _mm_and_si128(_mm_unpackhi_epi8(rgb0, rgb0), _mm_srli_epi16( allFFs128, 8 ));
-						const __m128i rrggbb11 = _mm_and_si128(_mm_unpackhi_epi8(rgb1, rgb1), _mm_srli_epi16( allFFs128, 8 ));
-
-						__m128i rgb2, rgb3;
-
-						// if (rgb0 > rgb1):
-						if (cmp0 != 0)
-						{
-							// RGB2a = ((RGB1 - RGB0) >> 1) - ((RGB1 - RGB0) >> 3)  using arithmetic shifts to extend sign (not logical shifts)
-							const __m128i rrggbbsub = _mm_subs_epi16(rrggbb1, rrggbb0);
-							const __m128i rrggbbsubshr1 = _mm_srai_epi16(rrggbbsub, 1);
-							const __m128i rrggbbsubshr3 = _mm_srai_epi16(rrggbbsub, 3);
-							const __m128i shr1subshr3 = _mm_sub_epi16(rrggbbsubshr1, rrggbbsubshr3);
-							// low8mask16 == _mm_set_epi16(0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff)
-							const __m128i low8mask16 = _mm_srli_epi16( allFFs128, 8 );
-							const __m128i rrggbbdelta = _mm_and_si128(shr1subshr3, low8mask16);
-							const __m128i rgbdeltadup = _mm_packus_epi16(rrggbbdelta, rrggbbdelta);
-							const __m128i rgbdelta = _mm_srli_si128(_mm_slli_si128(rgbdeltadup, 8), 8);
-
-							rgb2 = _mm_and_si128(_mm_add_epi8(rgb0, rgbdelta), _mm_srli_si128(allFFs128, 8));
-							rgb3 = _mm_and_si128(_mm_sub_epi8(rgb1, rgbdelta), _mm_srli_si128(allFFs128, 8));
-						}
-						else
-						{
-							// RGB2b = avg(RGB0, RGB1)
-							const __m128i rrggbb21  = _mm_avg_epu16(rrggbb0, rrggbb1);
-							const __m128i rgb210 = _mm_srli_si128(_mm_packus_epi16(rrggbb21, rrggbb21), 8);
-							rgb2 = rgb210;
-							rgb3 = _mm_and_si128(_mm_srli_si128(_mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(1, 1, 1, 1)), 8), _mm_srli_epi32( allFFs128, 8 ));
-						}
-
-						// if (rgb0 > rgb1):
-						if (cmp1 != 0)
-						{
-							// RGB2a = ((RGB1 - RGB0) >> 1) - ((RGB1 - RGB0) >> 3)  using arithmetic shifts to extend sign (not logical shifts)
-							const __m128i rrggbbsub1 = _mm_subs_epi16(rrggbb11, rrggbb01);
-							const __m128i rrggbbsubshr11 = _mm_srai_epi16(rrggbbsub1, 1);
-							const __m128i rrggbbsubshr31 = _mm_srai_epi16(rrggbbsub1, 3);
-							const __m128i shr1subshr31 = _mm_sub_epi16(rrggbbsubshr11, rrggbbsubshr31);
-							// low8mask16 == _mm_set_epi16(0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff)
-							const __m128i low8mask16 = _mm_srli_epi16( allFFs128, 8 );
-							const __m128i rrggbbdelta1 = _mm_and_si128(shr1subshr31, low8mask16);
-							__m128i rgbdelta1 = _mm_packus_epi16(rrggbbdelta1, rrggbbdelta1);
-							rgbdelta1 = _mm_slli_si128(rgbdelta1, 8);
-
-							rgb2 = _mm_or_si128(rgb2, _mm_and_si128(_mm_add_epi8(rgb0, rgbdelta1), _mm_slli_si128(allFFs128, 8)));
-							rgb3 = _mm_or_si128(rgb3, _mm_and_si128(_mm_sub_epi8(rgb1, rgbdelta1), _mm_slli_si128(allFFs128, 8)));
-						}
-						else
-						{
-							// RGB2b = avg(RGB0, RGB1)
-							const __m128i rrggbb211 = _mm_avg_epu16(rrggbb01, rrggbb11);
-							const __m128i rgb211 = _mm_slli_si128(_mm_packus_epi16(rrggbb211, rrggbb211), 8);
-							rgb2 = _mm_or_si128(rgb2, rgb211);
-
-							// _mm_srli_epi32( allFFs128, 8 ) == _mm_set_epi32(0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF)
-							// Make this color fully transparent:
-							rgb3 = _mm_or_si128(rgb3, _mm_and_si128(_mm_and_si128(rgb1, _mm_srli_epi32( allFFs128, 8 ) ), _mm_slli_si128(allFFs128, 8)));
-						}
-
-						// Create an array for color lookups for DXT0 so we can use the 2-bit indices:
-						const __m128i mmcolors0 = _mm_or_si128(
-							_mm_or_si128(
-								_mm_srli_si128(_mm_slli_si128(argb888x4, 8), 8),
-								_mm_slli_si128(_mm_srli_si128(_mm_slli_si128(rgb2, 8), 8 + 4), 8)
-							),
-							_mm_slli_si128(_mm_srli_si128(rgb3, 4), 8 + 4)
-						);
-
-						// Create an array for color lookups for DXT1 so we can use the 2-bit indices:
-						const __m128i mmcolors1 = _mm_or_si128(
-							_mm_or_si128(
-								_mm_srli_si128(argb888x4, 8),
-								_mm_slli_si128(_mm_srli_si128(rgb2, 8 + 4), 8)
-							),
-							_mm_slli_si128(_mm_srli_si128(rgb3, 8 + 4), 8 + 4)
-						);
-
-						// The #ifdef CHECKs here and below are to compare correctness of output against the reference code.
-						// Don't use them in a normal build.
-#ifdef CHECK
-						// REFERENCE:
-						u32 tmp0[4][4], tmp1[4][4];
-
-						decodeDXTBlockRGBA(&(tmp0[0][0]), (const DXTBlock *)src, 4);
-						decodeDXTBlockRGBA(&(tmp1[0][0]), (const DXTBlock *)(src + 8), 4);
-#endif
-
-						u32 *dst32 = ( dst + (y + z*4) * width + x );
-
-						// Copy the colors here:
-						GC_ALIGNED16( u32 colors0[4] );
-						GC_ALIGNED16( u32 colors1[4] );
-						_mm_store_si128((__m128i *)colors0, mmcolors0);
-						_mm_store_si128((__m128i *)colors1, mmcolors1);
-
-						// Row 0:
-						dst32[(width * 0) + 0] = colors0[(dxt0sel >> ((0*8)+6)) & 3];
-						dst32[(width * 0) + 1] = colors0[(dxt0sel >> ((0*8)+4)) & 3];
-						dst32[(width * 0) + 2] = colors0[(dxt0sel >> ((0*8)+2)) & 3];
-						dst32[(width * 0) + 3] = colors0[(dxt0sel >> ((0*8)+0)) & 3];
-						dst32[(width * 0) + 4] = colors1[(dxt1sel >> ((0*8)+6)) & 3];
-						dst32[(width * 0) + 5] = colors1[(dxt1sel >> ((0*8)+4)) & 3];
-						dst32[(width * 0) + 6] = colors1[(dxt1sel >> ((0*8)+2)) & 3];
-						dst32[(width * 0) + 7] = colors1[(dxt1sel >> ((0*8)+0)) & 3];
-#ifdef CHECK
-						assert( memcmp(&(tmp0[0]), &dst32[(width * 0)], 16) == 0 );
-						assert( memcmp(&(tmp1[0]), &dst32[(width * 0) + 4], 16) == 0 );
-#endif
-						// Row 1:
-						dst32[(width * 1) + 0] = colors0[(dxt0sel >> ((1*8)+6)) & 3];
-						dst32[(width * 1) + 1] = colors0[(dxt0sel >> ((1*8)+4)) & 3];
-						dst32[(width * 1) + 2] = colors0[(dxt0sel >> ((1*8)+2)) & 3];
-						dst32[(width * 1) + 3] = colors0[(dxt0sel >> ((1*8)+0)) & 3];
-						dst32[(width * 1) + 4] = colors1[(dxt1sel >> ((1*8)+6)) & 3];
-						dst32[(width * 1) + 5] = colors1[(dxt1sel >> ((1*8)+4)) & 3];
-						dst32[(width * 1) + 6] = colors1[(dxt1sel >> ((1*8)+2)) & 3];
-						dst32[(width * 1) + 7] = colors1[(dxt1sel >> ((1*8)+0)) & 3];
-#ifdef CHECK
-						assert( memcmp(&(tmp0[1]), &dst32[(width * 1)], 16) == 0 );
-						assert( memcmp(&(tmp1[1]), &dst32[(width * 1) + 4], 16) == 0 );
-#endif
-						// Row 2:
-						dst32[(width * 2) + 0] = colors0[(dxt0sel >> ((2*8)+6)) & 3];
-						dst32[(width * 2) + 1] = colors0[(dxt0sel >> ((2*8)+4)) & 3];
-						dst32[(width * 2) + 2] = colors0[(dxt0sel >> ((2*8)+2)) & 3];
-						dst32[(width * 2) + 3] = colors0[(dxt0sel >> ((2*8)+0)) & 3];
-						dst32[(width * 2) + 4] = colors1[(dxt1sel >> ((2*8)+6)) & 3];
-						dst32[(width * 2) + 5] = colors1[(dxt1sel >> ((2*8)+4)) & 3];
-						dst32[(width * 2) + 6] = colors1[(dxt1sel >> ((2*8)+2)) & 3];
-						dst32[(width * 2) + 7] = colors1[(dxt1sel >> ((2*8)+0)) & 3];
-#ifdef CHECK
-						assert( memcmp(&(tmp0[2]), &dst32[(width * 2)], 16) == 0 );
-						assert( memcmp(&(tmp1[2]), &dst32[(width * 2) + 4], 16) == 0 );
-#endif
-						// Row 3:
-						dst32[(width * 3) + 0] = colors0[(dxt0sel >> ((3*8)+6)) & 3];
-						dst32[(width * 3) + 1] = colors0[(dxt0sel >> ((3*8)+4)) & 3];
-						dst32[(width * 3) + 2] = colors0[(dxt0sel >> ((3*8)+2)) & 3];
-						dst32[(width * 3) + 3] = colors0[(dxt0sel >> ((3*8)+0)) & 3];
-						dst32[(width * 3) + 4] = colors1[(dxt1sel >> ((3*8)+6)) & 3];
-						dst32[(width * 3) + 5] = colors1[(dxt1sel >> ((3*8)+4)) & 3];
-						dst32[(width * 3) + 6] = colors1[(dxt1sel >> ((3*8)+2)) & 3];
-						dst32[(width * 3) + 7] = colors1[(dxt1sel >> ((3*8)+0)) & 3];
-#ifdef CHECK
-						assert( memcmp(&(tmp0[3]), &dst32[(width * 3)], 16) == 0 );
-						assert( memcmp(&(tmp1[3]), &dst32[(width * 3) + 4], 16) == 0 );
-#endif
-					}					
-				}
-			}
-			break;
-		}
-	}
-
-	// The "copy" texture formats, too?
-	return PC_TEX_FMT_RGBA32;
-}
-
-
-
-
-void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center)
-{
-	TexFmt_Overlay_Enable = enable;
-	TexFmt_Overlay_Center = center;
-}
-
-PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly)
-{
-	PC_TexFormat retval = TexDecoder_Decode_OpenCL(dst, src,
-		width, height, texformat, tlutaddr, tlutfmt, rgbaOnly);
-	if (retval == PC_TEX_FMT_NONE)
-		retval = rgbaOnly ? TexDecoder_Decode_RGBA((u32*)dst, src,
-				width, height, texformat, tlutaddr, tlutfmt)
-			: TexDecoder_Decode_real(dst, src,
-				width, height, texformat, tlutaddr, tlutfmt);
-
-	if ((!TexFmt_Overlay_Enable)|| (retval == PC_TEX_FMT_NONE))
-		return retval;
-
-	int w = min(width, 40);
-	int h = min(height, 10);
-
-	int xoff = (width - w) >> 1;
-	int yoff = (height - h) >> 1;
-
-	if (!TexFmt_Overlay_Center)
-	{
-		xoff=0;
-		yoff=0;
-	}
-
-	const char* fmt = texfmt[texformat&15];
-	while (*fmt)
-	{
-		int xcnt = 0;
-		int nchar = sfont_map[(int)*fmt];
-		
-		const unsigned char *ptr = sfont_raw[nchar]; // each char is up to 9x10
-
-		for (int x = 0; x < 9;x++)
-		{
-			if (ptr[x] == 0x78)
-				break;
-			xcnt++;
-		}
-
-		for (int y=0; y < 10; y++)
-		{
-			for (int x=0; x < xcnt; x++)
-			{
-				switch(retval)
-				{
-				case PC_TEX_FMT_I8:
-					{
-						// TODO: Is this an acceptable way to draw in I8?
-						u8  *dtp = (u8*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFF : 0x88;
-						break;
-					}
-				case PC_TEX_FMT_IA8:
-				case PC_TEX_FMT_IA4_AS_IA8:
-					{
-						u16  *dtp = (u16*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFF : 0xFF00;
-						break;
-					}
-				case PC_TEX_FMT_RGB565:
-					{
-						u16  *dtp = (u16*)dst;
-						dtp[(y + yoff)*width + x + xoff] = ptr[x] ? 0xFFFF : 0x0000;
-						break;
-					}
-				default:				
-				case PC_TEX_FMT_BGRA32:
-					{
-						int  *dtp = (int*)dst;
-						dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFFFFFF : 0xFF000000;
-						break;
-					}
-				}
-			}
-			ptr += 9;
-		}
-		xoff += xcnt;
-		fmt++;
-	}
-
-	return retval;
-}
-
-
-
-void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt)
-{
-	/* General formula for computing texture offset
-	// 
-	u16 sBlk = s / blockWidth;
-	u16 tBlk = t / blockHeight;
-	u16 widthBlks = (width / blockWidth) + 1;
-	u32 base = (tBlk * widthBlks + sBlk) * blockWidth * blockHeight;
-	u16 blkS = s & (blockWidth - 1);
-	u16 blkT =  t & (blockHeight - 1);
-	u32 blkOff = blkT * blockWidth + blkS;
-	*/
-
-	switch (texformat)
-	{
-	case GX_TF_C4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 3;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 7;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			int rs = (blkOff & 1)?0:4;
-			u32 offset = base + (blkOff >> 1);
-
-			u8 val = (*(src + offset) >> rs) & 0xF;
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_I4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 3;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 7;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			int rs = (blkOff & 1)?0:4;
-			u32 offset = base + (blkOff >> 1);
-
-			u8 val = (*(src + offset) >> rs) & 0xF;
-			val = Convert4To8(val);
-			dst[0] = val;
-			dst[1] = val;
-			dst[2] = val;
-			dst[3] = val;
-		}
-	   break;
-	case GX_TF_I8:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			dst[0] = val;
-			dst[1] = val;
-			dst[2] = val;
-			dst[3] = val;
-		}
-		break;
-	case GX_TF_C8:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_IA4:
-		{
-			u16 sBlk = s >> 3;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5;
-			u16 blkS = s & 7;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 3) + blkS;
-
-			u8 val = *(src + base + blkOff);
-			const u8 a = Convert4To8(val>>4);
-			const u8 l = Convert4To8(val&0xF);
-			dst[0] = l;
-			dst[1] = l;
-			dst[2] = l;
-			dst[3] = a;
-		}
-		break;
-	case GX_TF_IA8:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decodeIA8Swapped(*valAddr);
-		}
-		break;
-	case GX_TF_C14X2: 
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			u16 val = Common::swap16(*valAddr) & 0x3FFF;
-			u16 *tlut = (u16*)(texMem + tlutaddr);
-
-			switch (tlutfmt)
-			{
-			case 0:
-				*((u32*)dst) = decodeIA8Swapped(tlut[val]);
-				break;
-			case 1:
-				*((u32*)dst) = decode565RGBA(Common::swap16(tlut[val]));
-				break;
-			case 2:
-				*((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val]));
-				break;
-			}
-		}
-		break;
-	case GX_TF_RGB565:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decode565RGBA(Common::swap16(*valAddr));
-		}
-		break;
-	case GX_TF_RGB5A3:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 4;
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1;
-			const u16* valAddr = (u16*)(src + offset);
-
-			*((u32*)dst) = decode5A3RGBA(Common::swap16(*valAddr));
-		}
-		break;
-	case GX_TF_RGBA8:
-		{
-			u16 sBlk = s >> 2;
-			u16 tBlk = t >> 2;
-			u16 widthBlks = (imageWidth >> 2) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 5; // shift by 5 is correct
-			u16 blkS = s & 3;
-			u16 blkT =  t & 3;
-			u32 blkOff = (blkT << 2) + blkS;
-
-			u32 offset = (base + blkOff) << 1 ;
-			const u8* valAddr = src + offset;
-
-			dst[3] = valAddr[0];
-			dst[0] = valAddr[1];
-			dst[1] = valAddr[32];
-			dst[2] = valAddr[33];
-		}
-		break;
-	case GX_TF_CMPR:
-		{
-			u16 sDxt = s >> 2;
-			u16 tDxt = t >> 2;
-
-			u16 sBlk = sDxt >> 1;
-			u16 tBlk = tDxt >> 1;
-			u16 widthBlks = (imageWidth >> 3) + 1;
-			u32 base = (tBlk * widthBlks + sBlk) << 2;
-			u16 blkS = sDxt & 1;
-			u16 blkT =  tDxt & 1;
-			u32 blkOff = (blkT << 1) + blkS;
-
-			u32 offset = (base + blkOff) << 3;
-
-			const DXTBlock* dxtBlock = (const DXTBlock*)(src + offset);
-
-			u16 c1 = Common::swap16(dxtBlock->color1);
-			u16 c2 = Common::swap16(dxtBlock->color2);
-			int blue1 = Convert5To8(c1 & 0x1F);
-			int blue2 = Convert5To8(c2 & 0x1F);
-			int green1 = Convert6To8((c1 >> 5) & 0x3F);
-			int green2 = Convert6To8((c2 >> 5) & 0x3F);
-			int red1 = Convert5To8((c1 >> 11) & 0x1F);
-			int red2 = Convert5To8((c2 >> 11) & 0x1F);
-
-			u16 ss = s & 3;
-			u16 tt = t & 3;
-
-			int colorSel = dxtBlock->lines[tt];
-			int rs = 6 - (ss << 1);
-			colorSel = (colorSel >> rs) & 3;
-			colorSel |= c1 > c2?0:4;
-
-			u32 color = 0;
-
-			switch (colorSel)
-			{
-				case 0:
-				case 4:
-					color = makeRGBA(red1, green1, blue1, 255);
-					break;
-				case 1:
-				case 5:
-					color = makeRGBA(red2, green2, blue2, 255);
-					break;
-				case 2:
-					color = makeRGBA(red1+(red2-red1)/3, green1+(green2-green1)/3, blue1+(blue2-blue1)/3, 255);
-					break;
-				case 3:
-					color = makeRGBA(red2+(red1-red2)/3, green2+(green1-green2)/3, blue2+(blue1-blue2)/3, 255);
-					break;
-				case 6:
-					color = makeRGBA((int)ceil((float)(red1+red2)/2), (int)ceil((float)(green1+green2)/2), (int)ceil((float)(blue1+blue2)/2), 255);
-					break;
-				case 7:
-					color = makeRGBA(red2, green2, blue2, 0);
-					break;
-			}
-
-			*((u32*)dst) = color;
-		}
-		break;
-	}
-}
-
-void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth)
-{
-	u16 sBlk = s >> 2;
-	u16 tBlk = t >> 2;
-	u16 widthBlks = (imageWidth >> 2) + 1; // TODO: Looks wrong. Shouldn't this be ((imageWidth-1)>>2)+1 ?
-	u32 base_ar = (tBlk * widthBlks + sBlk) << 4;
-	u32 base_gb = (tBlk * widthBlks + sBlk) << 4;
-	u16 blkS = s & 3;
-	u16 blkT =  t & 3;
-	u32 blk_off = (blkT << 2) + blkS;
-
-	u32 offset_ar = (base_ar + blk_off) << 1;
-	u32 offset_gb = (base_gb + blk_off) << 1;
-	const u8* val_addr_ar = src_ar + offset_ar;
-	const u8* val_addr_gb = src_gb + offset_gb;
-
-	dst[3] = val_addr_ar[0]; // A
-	dst[0] = val_addr_ar[1]; // R
-	dst[1] = val_addr_gb[0]; // G
-	dst[2] = val_addr_gb[1]; // B
-}
-
-PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height)
-{
-	// TODO for someone who cares: Make this less slow!
-	for (int y = 0; y < height; ++y)
-		for (int x = 0; x < width; ++x)
-		{
-			TexDecoder_DecodeTexelRGBA8FromTmem(dst, src_ar, src_gb, x, y, width-1);
-			dst += 4;
-		}
-
-	return PC_TEX_FMT_RGBA32;
-}
-
-const char* texfmt[] = {
-	// pixel
-	"I4",		"I8",		"IA4",		"IA8",
-	"RGB565",	"RGB5A3",	"RGBA8",	"0x07",
-	"C4",		"C8",		"C14X2",	"0x0B",
-	"0x0C",		"0x0D",		"CMPR",		"0x0F",
-	// Z-buffer
-	"0x10",		"Z8",		"0x12",		"Z16",
-	"0x14",		"0x15",		"Z24X8",	"0x17",
-	"0x18",		"0x19",		"0x1A",		"0x1B",
-	"0x1C",		"0x1D",		"0x1E",		"0x1F",
-	// pixel + copy
-	"CR4",		"0x21",		"CRA4",		"CRA8",
-	"0x24",		"0x25",		"CYUVA8",	"CA8",
-	"CR8",		"CG8",		"CB8",		"CRG8",
-	"CGB8",		"0x2D",		"0x2E",		"0x2F",
-	// Z + copy
-	"CZ4",		"0x31",		"0x32",		"0x33",
-	"0x34",		"0x35",		"0x36",		"0x37",
-	"0x38",		"CZ8M",		"CZ8L",		"0x3B",
-	"CZ16L",	"0x3D",		"0x3E",		"0x3F",
-};
-
-const unsigned char sfont_map[] = {
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,10,10,10,10,
-	10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,
-	26,27,28,29,30,31,32,33,34,35,36,10,10,10,10,10,
-	10,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,
-	52,53,54,55,56,57,58,59,60,61,62,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-};
-
-const unsigned char sfont_raw[][9*10] = {
-	{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},{
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 
-	},
-};
diff --git a/Source/Core/VideoCommon/Statistics.cpp b/Source/Core/VideoCommon/Statistics.cpp
new file mode 100644
index 0000000000..04164cdaed
--- /dev/null
+++ b/Source/Core/VideoCommon/Statistics.cpp
@@ -0,0 +1,92 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <string>
+#include <utility>
+
+#include "Common/StringUtil.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexLoaderManager.h"
+
+Statistics stats;
+
+void Statistics::ResetFrame()
+{
+	memset(&thisFrame, 0, sizeof(ThisFrame));
+}
+
+void Statistics::SwapDL()
+{
+	std::swap(stats.thisFrame.numDLPrims, stats.thisFrame.numPrims);
+	std::swap(stats.thisFrame.numXFLoadsInDL, stats.thisFrame.numXFLoads);
+	std::swap(stats.thisFrame.numCPLoadsInDL, stats.thisFrame.numCPLoads);
+	std::swap(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
+}
+
+std::string Statistics::ToString()
+{
+	std::string str;
+	str += StringFromFormat("Textures created: %i\n", stats.numTexturesCreated);
+	str += StringFromFormat("Textures uploaded: %i\n", stats.numTexturesUploaded);
+	str += StringFromFormat("Textures alive: %i\n", stats.numTexturesAlive);
+	str += StringFromFormat("pshaders created: %i\n", stats.numPixelShadersCreated);
+	str += StringFromFormat("pshaders alive: %i\n", stats.numPixelShadersAlive);
+	str += StringFromFormat("vshaders created: %i\n", stats.numVertexShadersCreated);
+	str += StringFromFormat("vshaders alive: %i\n", stats.numVertexShadersAlive);
+	str += StringFromFormat("shaders changes: %i\n", stats.thisFrame.numShaderChanges);
+	str += StringFromFormat("dlists called: %i\n", stats.thisFrame.numDListsCalled);
+	str += StringFromFormat("Primitive joins: %i\n", stats.thisFrame.numPrimitiveJoins);
+	str += StringFromFormat("Draw calls: %i\n", stats.thisFrame.numDrawCalls);
+	str += StringFromFormat("Primitives: %i\n", stats.thisFrame.numPrims);
+	str += StringFromFormat("Primitives (DL): %i\n", stats.thisFrame.numDLPrims);
+	str += StringFromFormat("XF loads: %i\n", stats.thisFrame.numXFLoads);
+	str += StringFromFormat("XF loads (DL): %i\n", stats.thisFrame.numXFLoadsInDL);
+	str += StringFromFormat("CP loads: %i\n", stats.thisFrame.numCPLoads);
+	str += StringFromFormat("CP loads (DL): %i\n", stats.thisFrame.numCPLoadsInDL);
+	str += StringFromFormat("BP loads: %i\n", stats.thisFrame.numBPLoads);
+	str += StringFromFormat("BP loads (DL): %i\n", stats.thisFrame.numBPLoadsInDL);
+	str += StringFromFormat("Vertex streamed: %i kB\n", stats.thisFrame.bytesVertexStreamed / 1024);
+	str += StringFromFormat("Index streamed: %i kB\n", stats.thisFrame.bytesIndexStreamed / 1024);
+	str += StringFromFormat("Uniform streamed: %i kB\n", stats.thisFrame.bytesUniformStreamed / 1024);
+	str += StringFromFormat("Vertex Loaders: %i\n", stats.numVertexLoaders);
+
+	std::string vertex_list;
+	VertexLoaderManager::AppendListToString(&vertex_list);
+
+	// TODO : at some point text1 just becomes too huge and overflows, we can't even read the added stuff
+	// since it gets added at the far bottom of the screen anyway (actually outside the rendering window)
+	// we should really reset the list instead of using substr
+	if (vertex_list.size() + str.size() > 8170)
+		vertex_list = vertex_list.substr(0, 8170 - str.size());
+
+	str += vertex_list;
+
+	return str;
+}
+
+// Is this really needed?
+std::string Statistics::ToStringProj()
+{
+	std::string projections;
+
+	projections += "Projection #: X for Raw 6=0 (X for Raw 6!=0)\n\n";
+	projections += StringFromFormat("Projection 0: %f (%f) Raw 0: %f\n", stats.gproj_0, stats.g2proj_0, stats.proj_0);
+	projections += StringFromFormat("Projection 1: %f (%f)\n", stats.gproj_1, stats.g2proj_1);
+	projections += StringFromFormat("Projection 2: %f (%f) Raw 1: %f\n", stats.gproj_2, stats.g2proj_2, stats.proj_1);
+	projections += StringFromFormat("Projection 3: %f (%f)\n\n", stats.gproj_3, stats.g2proj_3);
+	projections += StringFromFormat("Projection 4: %f (%f)\n", stats.gproj_4, stats.g2proj_4);
+	projections += StringFromFormat("Projection 5: %f (%f) Raw 2: %f\n", stats.gproj_5, stats.g2proj_5, stats.proj_2);
+	projections += StringFromFormat("Projection 6: %f (%f) Raw 3: %f\n", stats.gproj_6, stats.g2proj_6, stats.proj_3);
+	projections += StringFromFormat("Projection 7: %f (%f)\n\n", stats.gproj_7, stats.g2proj_7);
+	projections += StringFromFormat("Projection 8: %f (%f)\n", stats.gproj_8, stats.g2proj_8);
+	projections += StringFromFormat("Projection 9: %f (%f)\n", stats.gproj_9, stats.g2proj_9);
+	projections += StringFromFormat("Projection 10: %f (%f) Raw 4: %f\n\n", stats.gproj_10, stats.g2proj_10, stats.proj_4);
+	projections += StringFromFormat("Projection 11: %f (%f) Raw 5: %f\n\n", stats.gproj_11, stats.g2proj_11, stats.proj_5);
+	projections += StringFromFormat("Projection 12: %f (%f)\n", stats.gproj_12, stats.g2proj_12);
+	projections += StringFromFormat("Projection 13: %f (%f)\n", stats.gproj_13, stats.g2proj_13);
+	projections += StringFromFormat("Projection 14: %f (%f)\n", stats.gproj_14, stats.g2proj_14);
+	projections += StringFromFormat("Projection 15: %f (%f)\n", stats.gproj_15, stats.g2proj_15);
+
+	return projections;
+}
diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h
new file mode 100644
index 0000000000..cfb8891152
--- /dev/null
+++ b/Source/Core/VideoCommon/Statistics.h
@@ -0,0 +1,81 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VideoCommon.h"
+
+struct Statistics
+{
+	int numPixelShadersCreated;
+	int numPixelShadersAlive;
+	int numVertexShadersCreated;
+	int numVertexShadersAlive;
+
+	int numTexturesCreated;
+	int numTexturesUploaded;
+	int numTexturesAlive;
+
+	int numVertexLoaders;
+
+	float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5;
+	float gproj_0, gproj_1, gproj_2, gproj_3, gproj_4, gproj_5;
+	float gproj_6, gproj_7, gproj_8, gproj_9, gproj_10, gproj_11, gproj_12, gproj_13, gproj_14, gproj_15;
+
+	float g2proj_0, g2proj_1, g2proj_2, g2proj_3, g2proj_4, g2proj_5;
+	float g2proj_6, g2proj_7, g2proj_8, g2proj_9, g2proj_10, g2proj_11, g2proj_12, g2proj_13, g2proj_14, g2proj_15;
+
+	std::vector<EFBRectangle> efb_regions;
+
+	struct ThisFrame
+	{
+		int numBPLoads;
+		int numCPLoads;
+		int numXFLoads;
+
+		int numBPLoadsInDL;
+		int numCPLoadsInDL;
+		int numXFLoadsInDL;
+
+		int numPrims;
+		int numDLPrims;
+		int numShaderChanges;
+
+		int numPrimitiveJoins;
+		int numDrawCalls;
+
+		int numDListsCalled;
+
+		int bytesVertexStreamed;
+		int bytesIndexStreamed;
+		int bytesUniformStreamed;
+	};
+	ThisFrame thisFrame;
+	void ResetFrame();
+	static void SwapDL();
+
+	static std::string ToString();
+	static std::string ToStringProj();
+};
+
+extern Statistics stats;
+
+#define STATISTICS
+
+#ifdef STATISTICS
+#define INCSTAT(a) (a)++;
+#define DECSTAT(a) (a)--;
+#define ADDSTAT(a,b) (a)+=(b);
+#define SETSTAT(a,x) (a)=(int)(x);
+#define SETSTAT_UINT(a,x) (a)=(u32)(x);
+#define SETSTAT_FT(a,x) (a)=(float)(x);
+#else
+#define INCSTAT(a) ;
+#define ADDSTAT(a,b) ;
+#define SETSTAT(a,x) ;
+#endif
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
new file mode 100644
index 0000000000..6ca71d037c
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -0,0 +1,956 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <string>
+
+#include "Common/FileUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/FramebufferManagerBase.h"
+#include "VideoCommon/HiresTextures.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+static const u64 TEXHASH_INVALID = 0;
+static const int TEXTURE_KILL_THRESHOLD = 60;
+static const int TEXTURE_POOL_KILL_THRESHOLD = 3;
+static const int FRAMECOUNT_INVALID = 0;
+
+TextureCache *g_texture_cache;
+
+GC_ALIGNED16(u8 *TextureCache::temp) = nullptr;
+size_t TextureCache::temp_size;
+
+TextureCache::TexCache TextureCache::textures_by_address;
+TextureCache::TexCache TextureCache::textures_by_hash;
+TextureCache::TexPool TextureCache::texture_pool;
+TextureCache::TCacheEntryBase* TextureCache::bound_textures[8];
+
+TextureCache::BackupConfig TextureCache::backup_config;
+
+static bool invalidate_texture_cache_requested;
+
+TextureCache::TCacheEntryBase::~TCacheEntryBase()
+{
+}
+
+void TextureCache::CheckTempSize(size_t required_size)
+{
+	if (required_size <= temp_size)
+		return;
+
+	temp_size = required_size;
+	FreeAlignedMemory(temp);
+	temp = (u8*)AllocateAlignedMemory(temp_size, 16);
+}
+
+TextureCache::TextureCache()
+{
+	temp_size = 2048 * 2048 * 4;
+	if (!temp)
+		temp = (u8*)AllocateAlignedMemory(temp_size, 16);
+
+	TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
+
+	HiresTexture::Init();
+
+	SetHash64Function();
+
+	invalidate_texture_cache_requested = false;
+}
+
+void TextureCache::RequestInvalidateTextureCache()
+{
+	invalidate_texture_cache_requested = true;
+}
+
+void TextureCache::Invalidate()
+{
+	UnbindTextures();
+
+	for (auto& tex : textures_by_address)
+	{
+		delete tex.second;
+	}
+	textures_by_address.clear();
+	textures_by_hash.clear();
+
+	for (auto& rt : texture_pool)
+	{
+		delete rt.second;
+	}
+	texture_pool.clear();
+}
+
+TextureCache::~TextureCache()
+{
+	HiresTexture::Shutdown();
+	Invalidate();
+	FreeAlignedMemory(temp);
+	temp = nullptr;
+}
+
+void TextureCache::OnConfigChanged(VideoConfig& config)
+{
+	if (g_texture_cache)
+	{
+		if (config.bHiresTextures != backup_config.s_hires_textures ||
+			config.bCacheHiresTextures != backup_config.s_cache_hires_textures)
+		{
+			HiresTexture::Update();
+		}
+
+		// TODO: Invalidating texcache is really stupid in some of these cases
+		if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples ||
+			config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay ||
+			config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center ||
+			config.bHiresTextures != backup_config.s_hires_textures ||
+			invalidate_texture_cache_requested)
+		{
+			g_texture_cache->Invalidate();
+
+			TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
+
+			invalidate_texture_cache_requested = false;
+		}
+
+		if ((config.iStereoMode > 0) != backup_config.s_stereo_3d ||
+			config.bStereoEFBMonoDepth != backup_config.s_efb_mono_depth)
+		{
+			g_texture_cache->DeleteShaders();
+			g_texture_cache->CompileShaders();
+		}
+	}
+
+	backup_config.s_colorsamples = config.iSafeTextureCache_ColorSamples;
+	backup_config.s_texfmt_overlay = config.bTexFmtOverlayEnable;
+	backup_config.s_texfmt_overlay_center = config.bTexFmtOverlayCenter;
+	backup_config.s_hires_textures = config.bHiresTextures;
+	backup_config.s_cache_hires_textures = config.bCacheHiresTextures;
+	backup_config.s_stereo_3d = config.iStereoMode > 0;
+	backup_config.s_efb_mono_depth = config.bStereoEFBMonoDepth;
+}
+
+void TextureCache::Cleanup(int _frameCount)
+{
+	TexCache::iterator iter = textures_by_address.begin();
+	TexCache::iterator tcend = textures_by_address.end();
+	while (iter != tcend)
+	{
+		if (iter->second->frameCount == FRAMECOUNT_INVALID)
+		{
+			iter->second->frameCount = _frameCount;
+		}
+		if (_frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount &&
+		    // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted
+		    !iter->second->IsEfbCopy())
+		{
+			iter = RemoveTextureFromCache(iter);
+		}
+		else
+		{
+			++iter;
+		}
+	}
+
+	TexPool::iterator iter2 = texture_pool.begin();
+	TexPool::iterator tcend2 = texture_pool.end();
+	while (iter2 != tcend2)
+	{
+		if (iter2->second->frameCount == FRAMECOUNT_INVALID)
+		{
+			iter2->second->frameCount = _frameCount;
+		}
+		if (_frameCount > TEXTURE_POOL_KILL_THRESHOLD + iter2->second->frameCount)
+		{
+			delete iter2->second;
+			iter2 = texture_pool.erase(iter2);
+		}
+		else
+		{
+			++iter2;
+		}
+	}
+}
+
+void TextureCache::MakeRangeDynamic(u32 start_address, u32 size)
+{
+	TexCache::iterator
+		iter = textures_by_address.begin();
+
+	while (iter != textures_by_address.end())
+	{
+		if (iter->second->OverlapsMemoryRange(start_address, size))
+		{
+			iter = RemoveTextureFromCache(iter);
+		}
+		else
+		{
+			++iter;
+		}
+	}
+}
+
+bool TextureCache::TCacheEntryBase::OverlapsMemoryRange(u32 range_address, u32 range_size) const
+{
+	if (addr + size_in_bytes <= range_address)
+		return false;
+
+	if (addr >= range_address + range_size)
+		return false;
+
+	return true;
+}
+
+void TextureCache::DumpTexture(TCacheEntryBase* entry, std::string basename, unsigned int level)
+{
+	std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) +
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
+
+	// make sure that the directory exists
+	if (!File::Exists(szDir) || !File::IsDirectory(szDir))
+		File::CreateDir(szDir);
+
+	if (level > 0)
+	{
+		basename += StringFromFormat("_mip%i", level);
+	}
+	std::string filename = szDir + "/" + basename + ".png";
+
+	if (!File::Exists(filename))
+		entry->Save(filename, level);
+}
+
+static u32 CalculateLevelSize(u32 level_0_size, u32 level)
+{
+	return (level_0_size + ((1 << level) - 1)) >> level;
+}
+
+// Used by TextureCache::Load
+TextureCache::TCacheEntryBase* TextureCache::ReturnEntry(unsigned int stage, TCacheEntryBase* entry)
+{
+	entry->frameCount = FRAMECOUNT_INVALID;
+	bound_textures[stage] = entry;
+
+	GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true);
+
+	return entry;
+}
+
+void TextureCache::BindTextures()
+{
+	for (int i = 0; i < 8; ++i)
+	{
+		if (bound_textures[i])
+			bound_textures[i]->Bind(i);
+	}
+}
+
+void TextureCache::UnbindTextures()
+{
+	std::fill(std::begin(bound_textures), std::end(bound_textures), nullptr);
+}
+
+TextureCache::TCacheEntryBase* TextureCache::Load(const u32 stage)
+{
+	const FourTexUnits &tex = bpmem.tex[stage >> 2];
+	const u32 id = stage & 3;
+	const u32 address = (tex.texImage3[id].image_base/* & 0x1FFFFF*/) << 5;
+	u32 width = tex.texImage0[id].width + 1;
+	u32 height = tex.texImage0[id].height + 1;
+	const int texformat = tex.texImage0[id].format;
+	const u32 tlutaddr = tex.texTlut[id].tmem_offset << 9;
+	const u32 tlutfmt = tex.texTlut[id].tlut_format;
+	const bool use_mipmaps = (tex.texMode0[id].min_filter & 3) != 0;
+	u32 tex_levels = use_mipmaps ? ((tex.texMode1[id].max_lod + 0xf) / 0x10 + 1) : 1;
+	const bool from_tmem = tex.texImage1[id].image_type != 0;
+
+	if (0 == address)
+		return nullptr;
+
+	// TexelSizeInNibbles(format) * width * height / 16;
+	const unsigned int bsw = TexDecoder_GetBlockWidthInTexels(texformat) - 1;
+	const unsigned int bsh = TexDecoder_GetBlockHeightInTexels(texformat) - 1;
+
+	unsigned int expandedWidth  = (width  + bsw) & (~bsw);
+	unsigned int expandedHeight = (height + bsh) & (~bsh);
+	const unsigned int nativeW = width;
+	const unsigned int nativeH = height;
+
+	// Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup)
+	u64 tex_hash = TEXHASH_INVALID;
+	u64 full_hash = TEXHASH_INVALID;
+
+	u32 full_format = texformat;
+
+	const bool isPaletteTexture = (texformat == GX_TF_C4 || texformat == GX_TF_C8 || texformat == GX_TF_C14X2);
+
+	// Reject invalid tlut format.
+	if (isPaletteTexture && tlutfmt > GX_TL_RGB5A3)
+		return nullptr;
+
+	if (isPaletteTexture)
+		full_format = texformat | (tlutfmt << 16);
+
+	const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat);
+
+	const u8* src_data;
+	if (from_tmem)
+		src_data = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE];
+	else
+		src_data = Memory::GetPointer(address);
+
+	// TODO: This doesn't hash GB tiles for preloaded RGBA8 textures (instead, it's hashing more data from the low tmem bank than it should)
+	tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
+	u32 palette_size = 0;
+	if (isPaletteTexture)
+	{
+		palette_size = TexDecoder_GetPaletteSize(texformat);
+		full_hash = tex_hash ^ GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
+	}
+	else
+	{
+		full_hash = tex_hash;
+	}
+
+	// GPUs don't like when the specified mipmap count would require more than one 1x1-sized LOD in the mipmap chain
+	// e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,0x0, so we limit the mipmap count to 6 there
+	tex_levels = std::min<u32>(IntLog2(std::max(width, height)) + 1, tex_levels);
+
+	// Search the texture cache for textures by address
+	//
+	// Find all texture cache entries for the current texture address, and decide whether to use one of
+	// them, or to create a new one
+	//
+	// In most cases, the fastest way is to use only one texture cache entry for the same address. Usually,
+	// when a texture changes, the old version of the texture is unlikely to be used again. If there were
+	// new cache entries created for normal texture updates, there would be a slowdown due to a huge amount
+	// of unused cache entries. Also thanks to texture pooling, overwriting an existing cache entry is
+	// faster than creating a new one from scratch.
+	//
+	// Some games use the same address for different textures though. If the same cache entry was used in
+	// this case, it would be constantly overwritten, and effectively there wouldn't be any caching for
+	// those textures. Examples for this are Metroid Prime and Castlevania 3. Metroid Prime has multiple
+	// sets of fonts on each other stored in a single texture and uses the palette to make different
+	// characters visible or invisible. In Castlevania 3 some textures are used for 2 different things or
+	// at least in 2 different ways(size 1024x1024 vs 1024x256).
+	//
+	// To determine whether to use multiple cache entries or a single entry, use the following heuristic:
+	// If the same texture address is used several times during the same frame, assume the address is used
+	// for different purposes and allow creating an additional cache entry. If there's at least one entry
+	// that hasn't been used for the same frame, then overwrite it, in order to keep the cache as small as
+	// possible. If the current texture is found in the cache, use that entry.
+	//
+	// For efb copies, the entry created in CopyRenderTargetToTexture always has to be used, or else it was
+	// done in vain.
+	std::pair<TexCache::iterator, TexCache::iterator> iter_range = textures_by_address.equal_range((u64)address);
+	TexCache::iterator iter = iter_range.first;
+	TexCache::iterator oldest_entry = iter;
+	int temp_frameCount = 0x7fffffff;
+	TexCache::iterator unconverted_copy = textures_by_address.end();
+
+	while (iter != iter_range.second)
+	{
+		TCacheEntryBase* entry = iter->second;
+		if (entry->IsEfbCopy())
+		{
+			// EFB copies have slightly different rules: the hash doesn't need to match
+			// in EFB2Tex mode, and EFB copy formats have different meanings from texture
+			// formats.
+			if (g_ActiveConfig.bSkipEFBCopyToRam ||
+				(tex_hash == entry->hash && (!isPaletteTexture || g_Config.backend_info.bSupportsPaletteConversion)))
+			{
+				// TODO: We should check format/width/height/levels for EFB copies. Checking
+				// format is complicated because EFB copy formats don't exactly match
+				// texture formats. I'm not sure what effect checking width/height/levels
+				// would have.
+				if (!isPaletteTexture || !g_Config.backend_info.bSupportsPaletteConversion)
+					return ReturnEntry(stage, entry);
+
+				// Note that we found an unconverted EFB copy, then continue.  We'll
+				// perform the conversion later.  Currently, we only convert EFB copies to
+				// palette textures; we could do other conversions if it proved to be
+				// beneficial.
+				unconverted_copy = iter;
+			}
+			else
+			{
+				// Aggressively prune EFB copies: if it isn't useful here, it will probably
+				// never be useful again.  It's theoretically possible for a game to do
+				// something weird where the copy could become useful in the future, but in
+				// practice it doesn't happen.
+				FreeTexture(entry);
+				iter = textures_by_address.erase(iter);
+				continue;
+			}
+		}
+		else
+		{
+			// For normal textures, all texture parameters need to match
+			if (entry->hash == full_hash && entry->format == full_format && entry->native_levels >= tex_levels &&
+				entry->native_width == nativeW && entry->native_height == nativeH)
+			{
+				return ReturnEntry(stage, entry);
+			}
+		}
+
+		// Find the entry which hasn't been used for the longest time
+		if (entry->frameCount != FRAMECOUNT_INVALID && entry->frameCount < temp_frameCount)
+		{
+			temp_frameCount = entry->frameCount;
+			oldest_entry = iter;
+		}
+		++iter;
+	}
+
+	if (unconverted_copy != textures_by_address.end())
+	{
+		// Perform palette decoding.
+		TCacheEntryBase *entry = unconverted_copy->second;
+
+		TCacheEntryConfig config;
+		config.rendertarget = true;
+		config.width = entry->config.width;
+		config.height = entry->config.height;
+		config.layers = FramebufferManagerBase::GetEFBLayers();
+		TCacheEntryBase *decoded_entry = AllocateTexture(config);
+
+		decoded_entry->SetGeneralParameters(address, texture_size, full_format);
+		decoded_entry->SetDimensions(entry->native_width, entry->native_height, 1);
+		decoded_entry->SetHashes(full_hash);
+		decoded_entry->frameCount = FRAMECOUNT_INVALID;
+		decoded_entry->is_efb_copy = false;
+
+		g_texture_cache->ConvertTexture(decoded_entry, entry, &texMem[tlutaddr], (TlutFormat)tlutfmt);
+		textures_by_address.insert(TexCache::value_type((u64)address, decoded_entry));
+		return ReturnEntry(stage, decoded_entry);
+	}
+
+	// Search the texture cache for normal textures by hash
+	//
+	// If the texture was fully hashed, the address does not need to match. Identical duplicate textures cause unnecessary slowdowns
+	// Example: Tales of Symphonia (GC) uses over 500 small textures in menus, but only around 70 different ones
+	if (g_ActiveConfig.iSafeTextureCache_ColorSamples == 0 ||
+		std::max(texture_size, palette_size) <= (u32)g_ActiveConfig.iSafeTextureCache_ColorSamples * 8)
+	{
+		iter_range = textures_by_hash.equal_range(full_hash);
+		iter = iter_range.first;
+		while (iter != iter_range.second)
+		{
+			TCacheEntryBase* entry = iter->second;
+			// All parameters, except the address, need to match here
+			if (entry->format == full_format && entry->native_levels >= tex_levels &&
+				entry->native_width == nativeW && entry->native_height == nativeH)
+			{
+				return ReturnEntry(stage, entry);
+			}
+			++iter;
+		}
+	}
+
+	// If at least one entry was not used for the same frame, overwrite the oldest one
+	if (temp_frameCount != 0x7fffffff)
+	{
+		// pool this texture and make a new one later
+		RemoveTextureFromCache(oldest_entry);
+	}
+
+	std::shared_ptr<HiresTexture> hires_tex;
+	if (g_ActiveConfig.bHiresTextures)
+	{
+		hires_tex = HiresTexture::Search(
+			src_data, texture_size,
+			&texMem[tlutaddr], palette_size,
+			width, height,
+			texformat, use_mipmaps
+		);
+
+		if (hires_tex)
+		{
+			auto& l = hires_tex->m_levels[0];
+			if (l.width != width || l.height != height)
+			{
+				width = l.width;
+				height = l.height;
+			}
+			expandedWidth = l.width;
+			expandedHeight = l.height;
+			CheckTempSize(l.data_size);
+			memcpy(temp, l.data, l.data_size);
+		}
+	}
+
+	if (!hires_tex)
+	{
+		if (!(texformat == GX_TF_RGBA8 && from_tmem))
+		{
+			const u8* tlut = &texMem[tlutaddr];
+			TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlut, (TlutFormat) tlutfmt);
+		}
+		else
+		{
+			u8* src_data_gb = &texMem[bpmem.tex[stage / 4].texImage2[stage % 4].tmem_odd * TMEM_LINE_SIZE];
+			TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight);
+		}
+	}
+
+	// how many levels the allocated texture shall have
+	const u32 texLevels = hires_tex ? (u32)hires_tex->m_levels.size() : tex_levels;
+
+	// create the entry/texture
+	TCacheEntryConfig config;
+	config.width = width;
+	config.height = height;
+	config.levels = texLevels;
+
+	TCacheEntryBase* entry = AllocateTexture(config);
+	GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true);
+
+	textures_by_address.insert(TexCache::value_type((u64)address, entry));
+	if (g_ActiveConfig.iSafeTextureCache_ColorSamples == 0 ||
+		std::max(texture_size, palette_size) <= (u32)g_ActiveConfig.iSafeTextureCache_ColorSamples * 8)
+	{
+		entry->textures_by_hash_iter = textures_by_hash.insert(TexCache::value_type(full_hash, entry));
+	}
+
+	entry->SetGeneralParameters(address, texture_size, full_format);
+	entry->SetDimensions(nativeW, nativeH, tex_levels);
+	entry->hash = full_hash;
+	entry->is_efb_copy = false;
+	entry->is_custom_tex = hires_tex != nullptr;
+
+	// load texture
+	entry->Load(width, height, expandedWidth, 0);
+
+	std::string basename = "";
+	if (g_ActiveConfig.bDumpTextures && !hires_tex)
+	{
+		basename = HiresTexture::GenBaseName(
+			src_data, texture_size,
+			&texMem[tlutaddr], palette_size,
+			width, height,
+			texformat, use_mipmaps,
+			true
+		);
+		DumpTexture(entry, basename, 0);
+	}
+
+	if (hires_tex)
+	{
+		for (u32 level = 1; level != texLevels; ++level)
+		{
+			auto& l = hires_tex->m_levels[level];
+			CheckTempSize(l.data_size);
+			memcpy(temp, l.data, l.data_size);
+			entry->Load(l.width, l.height, l.width, level);
+		}
+	}
+	else
+	{
+		// load mips - TODO: Loading mipmaps from tmem is untested!
+		src_data += texture_size;
+
+		const u8* ptr_even = nullptr;
+		const u8* ptr_odd = nullptr;
+		if (from_tmem)
+		{
+			ptr_even = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE + texture_size];
+			ptr_odd = &texMem[bpmem.tex[stage / 4].texImage2[stage % 4].tmem_odd * TMEM_LINE_SIZE];
+		}
+
+		for (u32 level = 1; level != texLevels; ++level)
+		{
+			const u32 mip_width = CalculateLevelSize(width, level);
+			const u32 mip_height = CalculateLevelSize(height, level);
+			const u32 expanded_mip_width = (mip_width + bsw) & (~bsw);
+			const u32 expanded_mip_height = (mip_height + bsh) & (~bsh);
+
+			const u8*& mip_src_data = from_tmem
+				? ((level % 2) ? ptr_odd : ptr_even)
+				: src_data;
+			const u8* tlut = &texMem[tlutaddr];
+			TexDecoder_Decode(temp, mip_src_data, expanded_mip_width, expanded_mip_height, texformat, tlut, (TlutFormat)tlutfmt);
+			mip_src_data += TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);
+
+			entry->Load(mip_width, mip_height, expanded_mip_width, level);
+
+			if (g_ActiveConfig.bDumpTextures)
+				DumpTexture(entry, basename, level);
+		}
+	}
+
+	INCSTAT(stats.numTexturesUploaded);
+	SETSTAT(stats.numTexturesAlive, textures_by_address.size());
+
+	return ReturnEntry(stage, entry);
+}
+
+void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, PEControl::PixelFormat srcFormat,
+	const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf)
+{
+	// Emulation methods:
+	//
+	// - EFB to RAM:
+	//      Encodes the requested EFB data at its native resolution to the emulated RAM using shaders.
+	//      Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again.
+	//      Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture
+	//      Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures.
+	//
+	// - EFB to texture:
+	//      Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders.
+	//      Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again.
+	//                 Since we don't do any further encoding or decoding here, this method is much faster.
+	//                 It also allows enhancing the visual quality by doing scaled EFB copies.
+	//
+	// - Hybrid EFB copies:
+	//      1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM)
+	//      1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range.
+	//          If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies.
+	//      2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before):
+	//      2a) Entry doesn't exist:
+	//          - Also copy the requested EFB data to a texture object in VRAM (like EFB to texture)
+	//          - Create a texture cache entry for the target (type = TCET_EC_VRAM)
+	//          - Store a hash of the encoded RAM data in the texcache entry.
+	//      2b) Entry exists AND type is TCET_EC_VRAM:
+	//          - Like case 2a, but reuse the old texcache entry instead of creating a new one.
+	//      2c) Entry exists AND type is TCET_EC_DYNAMIC:
+	//          - Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry.
+	//          - Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway.
+	//      3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM.
+	//      3a) If the two hashes match AND type is TCET_EC_VRAM, reuse the VRAM copy you created
+	//      3b) If the two hashes differ AND type is TCET_EC_VRAM, screw your existing VRAM copy. Set type to TCET_EC_DYNAMIC.
+	//          Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now.
+	//      3c) If type is TCET_EC_DYNAMIC, treat the EFB copy like a normal texture.
+	//      Advantage: Non-dynamic EFB copies can be visually enhanced like with EFB to texture.
+	//                 Compatibility is as good as EFB to RAM.
+	//      Disadvantage: Slower than EFB to texture and often even slower than EFB to RAM.
+	//                    EFB copy cache depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as without a copy cache anyway.
+	//
+	// Disadvantage of all methods: Calling this function requires the GPU to perform a pipeline flush which stalls any further CPU processing.
+	//
+	// For historical reasons, Dolphin doesn't actually implement "pure" EFB to RAM emulation, but only EFB to texture and hybrid EFB copies.
+
+	float colmat[28] = {0};
+	float *const fConstAdd = colmat + 16;
+	float *const ColorMask = colmat + 20;
+	ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f;
+	ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f;
+	unsigned int cbufid = -1;
+	bool efbHasAlpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
+
+	if (srcFormat == PEControl::Z24)
+	{
+		switch (dstFormat)
+		{
+		case 0: // Z4
+			colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f;
+			cbufid = 0;
+			break;
+		case 1: // Z8
+		case 8: // Z8
+			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1.0f;
+			cbufid = 1;
+			break;
+
+		case 3: // Z16
+			colmat[1] = colmat[5] = colmat[9] = colmat[12] = 1.0f;
+			cbufid = 2;
+			break;
+
+		case 11: // Z16 (reverse order)
+			colmat[0] = colmat[4] = colmat[8] = colmat[13] = 1.0f;
+			cbufid = 3;
+			break;
+
+		case 6: // Z24X8
+			colmat[0] = colmat[5] = colmat[10] = 1.0f;
+			cbufid = 4;
+			break;
+
+		case 9: // Z8M
+			colmat[1] = colmat[5] = colmat[9] = colmat[13] = 1.0f;
+			cbufid = 5;
+			break;
+
+		case 10: // Z8L
+			colmat[2] = colmat[6] = colmat[10] = colmat[14] = 1.0f;
+			cbufid = 6;
+			break;
+
+		case 12: // Z16L - copy lower 16 depth bits
+			// expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha)
+			// Used e.g. in Zelda: Skyward Sword
+			colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f;
+			cbufid = 7;
+			break;
+
+		default:
+			ERROR_LOG(VIDEO, "Unknown copy zbuf format: 0x%x", dstFormat);
+			colmat[2] = colmat[5] = colmat[8] = 1.0f;
+			cbufid = 8;
+			break;
+		}
+	}
+	else if (isIntensity)
+	{
+		fConstAdd[0] = fConstAdd[1] = fConstAdd[2] = 16.0f / 255.0f;
+		switch (dstFormat)
+		{
+		case 0: // I4
+		case 1: // I8
+		case 2: // IA4
+		case 3: // IA8
+		case 8: // I8
+			// TODO - verify these coefficients
+			colmat[0] = 0.257f; colmat[1] = 0.504f; colmat[2] = 0.098f;
+			colmat[4] = 0.257f; colmat[5] = 0.504f; colmat[6] = 0.098f;
+			colmat[8] = 0.257f; colmat[9] = 0.504f; colmat[10] = 0.098f;
+
+			if (dstFormat < 2 || dstFormat == 8)
+			{
+				colmat[12] = 0.257f; colmat[13] = 0.504f; colmat[14] = 0.098f;
+				fConstAdd[3] = 16.0f / 255.0f;
+				if (dstFormat == 0)
+				{
+					ColorMask[0] = ColorMask[1] = ColorMask[2] = 15.0f;
+					ColorMask[4] = ColorMask[5] = ColorMask[6] = 1.0f / 15.0f;
+					cbufid = 9;
+				}
+				else
+				{
+					cbufid = 10;
+				}
+			}
+			else// alpha
+			{
+				colmat[15] = 1;
+				if (dstFormat == 2)
+				{
+					ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 15.0f;
+					ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 15.0f;
+					cbufid = 11;
+				}
+				else
+				{
+					cbufid = 12;
+				}
+
+			}
+			break;
+
+		default:
+			ERROR_LOG(VIDEO, "Unknown copy intensity format: 0x%x", dstFormat);
+			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
+			cbufid = 13;
+			break;
+		}
+	}
+	else
+	{
+		switch (dstFormat)
+		{
+		case 0: // R4
+			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1;
+			ColorMask[0] = 15.0f;
+			ColorMask[4] = 1.0f / 15.0f;
+			cbufid = 14;
+			break;
+		case 1: // R8
+		case 8: // R8
+			colmat[0] = colmat[4] = colmat[8] = colmat[12] = 1;
+			cbufid = 15;
+			break;
+
+		case 2: // RA4
+			colmat[0] = colmat[4] = colmat[8] = colmat[15] = 1.0f;
+			ColorMask[0] = ColorMask[3] = 15.0f;
+			ColorMask[4] = ColorMask[7] = 1.0f / 15.0f;
+
+			cbufid = 16;
+			if (!efbHasAlpha)
+			{
+				ColorMask[3] = 0.0f;
+				fConstAdd[3] = 1.0f;
+				cbufid = 17;
+			}
+			break;
+		case 3: // RA8
+			colmat[0] = colmat[4] = colmat[8] = colmat[15] = 1.0f;
+
+			cbufid = 18;
+			if (!efbHasAlpha)
+			{
+				ColorMask[3] = 0.0f;
+				fConstAdd[3] = 1.0f;
+				cbufid = 19;
+			}
+			break;
+
+		case 7: // A8
+			colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f;
+
+			cbufid = 20;
+			if (!efbHasAlpha)
+			{
+				ColorMask[3] = 0.0f;
+				fConstAdd[0] = 1.0f;
+				fConstAdd[1] = 1.0f;
+				fConstAdd[2] = 1.0f;
+				fConstAdd[3] = 1.0f;
+				cbufid = 21;
+			}
+			break;
+
+		case 9: // G8
+			colmat[1] = colmat[5] = colmat[9] = colmat[13] = 1.0f;
+			cbufid = 22;
+			break;
+		case 10: // B8
+			colmat[2] = colmat[6] = colmat[10] = colmat[14] = 1.0f;
+			cbufid = 23;
+			break;
+
+		case 11: // RG8
+			colmat[0] = colmat[4] = colmat[8] = colmat[13] = 1.0f;
+			cbufid = 24;
+			break;
+
+		case 12: // GB8
+			colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f;
+			cbufid = 25;
+			break;
+
+		case 4: // RGB565
+			colmat[0] = colmat[5] = colmat[10] = 1.0f;
+			ColorMask[0] = ColorMask[2] = 31.0f;
+			ColorMask[4] = ColorMask[6] = 1.0f / 31.0f;
+			ColorMask[1] = 63.0f;
+			ColorMask[5] = 1.0f / 63.0f;
+			fConstAdd[3] = 1.0f; // set alpha to 1
+			cbufid = 26;
+			break;
+
+		case 5: // RGB5A3
+			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
+			ColorMask[0] = ColorMask[1] = ColorMask[2] = 31.0f;
+			ColorMask[4] = ColorMask[5] = ColorMask[6] = 1.0f / 31.0f;
+			ColorMask[3] = 7.0f;
+			ColorMask[7] = 1.0f / 7.0f;
+
+			cbufid = 27;
+			if (!efbHasAlpha)
+			{
+				ColorMask[3] = 0.0f;
+				fConstAdd[3] = 1.0f;
+				cbufid = 28;
+			}
+			break;
+		case 6: // RGBA8
+			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
+
+			cbufid = 29;
+			if (!efbHasAlpha)
+			{
+				ColorMask[3] = 0.0f;
+				fConstAdd[3] = 1.0f;
+				cbufid = 30;
+			}
+			break;
+
+		default:
+			ERROR_LOG(VIDEO, "Unknown copy color format: 0x%x", dstFormat);
+			colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1.0f;
+			cbufid = 31;
+			break;
+		}
+	}
+
+	const unsigned int tex_w = scaleByHalf ? srcRect.GetWidth() / 2 : srcRect.GetWidth();
+	const unsigned int tex_h = scaleByHalf ? srcRect.GetHeight() / 2 : srcRect.GetHeight();
+
+	unsigned int scaled_tex_w = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledX(tex_w) : tex_w;
+	unsigned int scaled_tex_h = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledY(tex_h) : tex_h;
+
+	// remove all texture cache entries at dstAddr
+	std::pair<TexCache::iterator, TexCache::iterator> iter_range = textures_by_address.equal_range((u64)dstAddr);
+	TexCache::iterator iter = iter_range.first;
+	while (iter != iter_range.second)
+	{
+		iter = RemoveTextureFromCache(iter);
+	}
+
+	// create the texture
+	TCacheEntryConfig config;
+	config.rendertarget = true;
+	config.width = scaled_tex_w;
+	config.height = scaled_tex_h;
+	config.layers = FramebufferManagerBase::GetEFBLayers();
+
+	TCacheEntryBase* entry = AllocateTexture(config);
+
+	// TODO: Using the wrong dstFormat, dumb...
+	entry->SetGeneralParameters(dstAddr, 0, dstFormat);
+	entry->SetDimensions(tex_w, tex_h, 1);
+	entry->SetHashes(TEXHASH_INVALID);
+
+	entry->frameCount = FRAMECOUNT_INVALID;
+	entry->is_efb_copy = true;
+	entry->is_custom_tex = false;
+
+	entry->FromRenderTarget(dstAddr, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf, cbufid, colmat);
+
+	if (g_ActiveConfig.bDumpEFBTarget)
+	{
+		static int count = 0;
+		entry->Save(StringFromFormat("%sefb_frame_%i.png", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
+			count++), 0);
+	}
+
+	textures_by_address.insert(TexCache::value_type((u64)dstAddr, entry));
+}
+
+TextureCache::TCacheEntryBase* TextureCache::AllocateTexture(const TCacheEntryConfig& config)
+{
+	TexPool::iterator iter = texture_pool.find(config);
+	TextureCache::TCacheEntryBase* entry;
+	if (iter != texture_pool.end())
+	{
+		entry = iter->second;
+		texture_pool.erase(iter);
+	}
+	else
+	{
+		entry = g_texture_cache->CreateTexture(config);
+		INCSTAT(stats.numTexturesCreated);
+	}
+
+	entry->textures_by_hash_iter = textures_by_address.end();
+	return entry;
+}
+
+TextureCache::TexCache::iterator TextureCache::RemoveTextureFromCache(TexCache::iterator iter)
+{
+	if (iter->second->textures_by_hash_iter != textures_by_address.end())
+	{
+		textures_by_hash.erase(iter->second->textures_by_hash_iter);
+		iter->second->textures_by_hash_iter = textures_by_address.end();
+	}
+
+	FreeTexture(iter->second);
+	return textures_by_address.erase(iter);
+}
+
+void TextureCache::FreeTexture(TCacheEntryBase* entry)
+{
+	entry->frameCount = FRAMECOUNT_INVALID;
+	texture_pool.insert(TexPool::value_type(entry->config, entry));
+}
diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h
new file mode 100644
index 0000000000..37bbe2764e
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureCacheBase.h
@@ -0,0 +1,167 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+#include <map>
+#include <unordered_map>
+
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"
+
+struct VideoConfig;
+
+class TextureCache
+{
+public:
+	struct TCacheEntryConfig
+	{
+		TCacheEntryConfig() : width(0), height(0), levels(1), layers(1), rendertarget(false) {}
+
+		u32 width, height;
+		u32 levels, layers;
+		bool rendertarget;
+
+		bool operator == (const TCacheEntryConfig& b) const
+		{
+			return width == b.width && height == b.height && levels == b.levels && layers == b.layers && rendertarget == b.rendertarget;
+		}
+
+		struct Hasher : std::hash<u64>
+		{
+			size_t operator()(const TextureCache::TCacheEntryConfig& c) const
+			{
+				u64 id = (u64)c.rendertarget << 63 | (u64)c.layers << 48 | (u64)c.levels << 32 | (u64)c.height << 16 | (u64)c.width;
+				return std::hash<u64>::operator()(id);
+			}
+		};
+	};
+	struct TCacheEntryBase
+	{
+		const TCacheEntryConfig config;
+
+		// common members
+		u32 addr;
+		u32 size_in_bytes;
+		u64 hash;
+		u32 format;
+		bool is_efb_copy;
+		bool is_custom_tex;
+
+		unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view
+		unsigned int native_levels;
+
+		// used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames
+		int frameCount;
+
+		// Keep an iterator to the entry in textures_by_hash, so it does not need to be searched when removing the cache entry
+		std::multimap<u64, TCacheEntryBase*>::iterator textures_by_hash_iter;
+
+		void SetGeneralParameters(u32 _addr, u32 _size, u32 _format)
+		{
+			addr = _addr;
+			size_in_bytes = _size;
+			format = _format;
+		}
+
+		void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _native_levels)
+		{
+			native_width = _native_width;
+			native_height = _native_height;
+			native_levels = _native_levels;
+		}
+
+		void SetHashes(u64 _hash)
+		{
+			hash = _hash;
+		}
+
+		TCacheEntryBase(const TCacheEntryConfig& c) : config(c) {}
+		virtual ~TCacheEntryBase();
+
+		virtual void Bind(unsigned int stage) = 0;
+		virtual bool Save(const std::string& filename, unsigned int level) = 0;
+
+		virtual void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int level) = 0;
+		virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
+			PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
+			const float *colmat) = 0;
+
+		bool OverlapsMemoryRange(u32 range_address, u32 range_size) const;
+
+		bool IsEfbCopy() const { return is_efb_copy; }
+	};
+
+	virtual ~TextureCache(); // needs virtual for DX11 dtor
+
+	static void OnConfigChanged(VideoConfig& config);
+
+	// Removes textures which aren't used for more than TEXTURE_KILL_THRESHOLD frames,
+	// frameCount is the current frame number.
+	static void Cleanup(int _frameCount);
+
+	static void Invalidate();
+	static void MakeRangeDynamic(u32 start_address, u32 size);
+
+	virtual TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) = 0;
+
+	virtual void CompileShaders() = 0; // currently only implemented by OGL
+	virtual void DeleteShaders() = 0; // currently only implemented by OGL
+
+	static TCacheEntryBase* Load(const u32 stage);
+	static void UnbindTextures();
+	static void BindTextures();
+	static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, PEControl::PixelFormat srcFormat,
+		const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
+
+	static void RequestInvalidateTextureCache();
+
+	virtual void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) = 0;
+
+protected:
+	TextureCache();
+
+	static GC_ALIGNED16(u8 *temp);
+	static size_t temp_size;
+
+private:
+	typedef std::multimap<u64, TCacheEntryBase*> TexCache;
+	typedef std::unordered_multimap<TCacheEntryConfig, TCacheEntryBase*, TCacheEntryConfig::Hasher> TexPool;
+
+	static void DumpTexture(TCacheEntryBase* entry, std::string basename, unsigned int level);
+	static void CheckTempSize(size_t required_size);
+
+	static TCacheEntryBase* AllocateTexture(const TCacheEntryConfig& config);
+	static TexCache::iterator RemoveTextureFromCache(TexCache::iterator t_iter);
+	static void FreeTexture(TCacheEntryBase* entry);
+
+	static TCacheEntryBase* ReturnEntry(unsigned int stage, TCacheEntryBase* entry);
+
+	static TexCache textures_by_address;
+	static TexCache textures_by_hash;
+	static TexPool texture_pool;
+	static TCacheEntryBase* bound_textures[8];
+
+	// Backup configuration values
+	static struct BackupConfig
+	{
+		int s_colorsamples;
+		bool s_texfmt_overlay;
+		bool s_texfmt_overlay_center;
+		bool s_hires_textures;
+		bool s_cache_hires_textures;
+		bool s_copy_cache_enable;
+		bool s_stereo_3d;
+		bool s_efb_mono_depth;
+	} backup_config;
+};
+
+extern TextureCache *g_texture_cache;
diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp
new file mode 100644
index 0000000000..f93d465a16
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureConversionShader.cpp
@@ -0,0 +1,685 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <cstdio>
+
+#include "Common/MathUtil.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/TextureConversionShader.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoConfig.h"
+
+#define WRITE p+=sprintf
+
+static char text[16384];
+static bool IntensityConstantAdded =  false;
+
+namespace TextureConversionShader
+{
+
+u16 GetEncodedSampleCount(u32 format)
+{
+	switch (format)
+	{
+	case GX_TF_I4: return 8;
+	case GX_TF_I8: return 4;
+	case GX_TF_IA4: return 4;
+	case GX_TF_IA8: return 2;
+	case GX_TF_RGB565: return 2;
+	case GX_TF_RGB5A3: return 2;
+	case GX_TF_RGBA8: return 1;
+	case GX_CTF_R4: return 8;
+	case GX_CTF_RA4: return 4;
+	case GX_CTF_RA8: return 2;
+	case GX_CTF_A8: return 4;
+	case GX_CTF_R8: return 4;
+	case GX_CTF_G8: return 4;
+	case GX_CTF_B8: return 4;
+	case GX_CTF_RG8: return 2;
+	case GX_CTF_GB8: return 2;
+	case GX_TF_Z8: return 4;
+	case GX_TF_Z16: return 2;
+	case GX_TF_Z24X8: return 1;
+	case GX_CTF_Z4: return 8;
+	case GX_CTF_Z8M: return 4;
+	case GX_CTF_Z8L: return 4;
+	case GX_CTF_Z16L: return 2;
+	default: return 1;
+	}
+}
+
+// block dimensions : widthStride, heightStride
+// texture dims : width, height, x offset, y offset
+static void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
+{
+	// left, top, of source rectangle within source texture
+	// width of the destination rectangle, scale_factor (1 or 2)
+	WRITE(p, "uniform int4 position;\n");
+
+	int blkW = TexDecoder_GetBlockWidthInTexels(format);
+	int blkH = TexDecoder_GetBlockHeightInTexels(format);
+	int samples = GetEncodedSampleCount(format);
+
+	if (ApiType == API_OPENGL)
+	{
+		WRITE(p, "#define samp0 samp9\n");
+		WRITE(p, "SAMPLER_BINDING(9) uniform sampler2DArray samp0;\n");
+
+		WRITE(p, "  out vec4 ocol0;\n");
+		WRITE(p, "void main()\n");
+		WRITE(p, "{\n"
+			"  int2 sampleUv;\n"
+			"  int2 uv1 = int2(gl_FragCoord.xy);\n"
+			);
+	}
+	else // D3D
+	{
+		WRITE(p, "sampler samp0 : register(s0);\n");
+		WRITE(p, "Texture2DArray Tex0 : register(t0);\n");
+
+		WRITE(p, "void main(\n");
+		WRITE(p, "  out float4 ocol0 : SV_Target, in float4 rawpos : SV_Position)\n");
+		WRITE(p, "{\n"
+			"  int2 sampleUv;\n"
+			"  int2 uv1 = int2(rawpos.xy);\n"
+			);
+	}
+
+	WRITE(p, "  int x_block_position = (uv1.x >> %d) << %d;\n", IntLog2(blkH * blkW / samples), IntLog2(blkW));
+	WRITE(p, "  int y_block_position = uv1.y << %d;\n", IntLog2(blkH));
+	if (samples == 1)
+	{
+		// With samples == 1, we write out pairs of blocks; one A8R8, one G8B8.
+		WRITE(p, "  bool first = (uv1.x & %d) == 0;\n", blkH * blkW / 2);
+		samples = 2;
+	}
+	WRITE(p, "  int offset_in_block = uv1.x & %d;\n", (blkH * blkW / samples) - 1);
+	WRITE(p, "  int y_offset_in_block = offset_in_block >> %d;\n", IntLog2(blkW / samples));
+	WRITE(p, "  int x_offset_in_block = (offset_in_block & %d) << %d;\n", (blkW / samples) - 1, IntLog2(samples));
+
+	WRITE(p, "  sampleUv.x = x_block_position + x_offset_in_block;\n");
+	WRITE(p, "  sampleUv.y = y_block_position + y_offset_in_block;\n");
+
+	WRITE(p, "  float2 uv0 = float2(sampleUv);\n");                // sampleUv is the sample position in (int)gx_coords
+	WRITE(p, "  uv0 += float2(0.5, 0.5);\n");                      // move to center of pixel
+	WRITE(p, "  uv0 *= float(position.w);\n");                     // scale by two if needed (also move to pixel borders so that linear filtering will average adjacent pixel)
+	WRITE(p, "  uv0 += float2(position.xy);\n");                   // move to copied rect
+	WRITE(p, "  uv0 /= float2(%d, %d);\n", EFB_WIDTH, EFB_HEIGHT); // normalize to [0:1]
+	if (ApiType == API_OPENGL)                                     // ogl has to flip up and down
+	{
+		WRITE(p, "  uv0.y = 1.0-uv0.y;\n");
+	}
+
+	WRITE(p, "  float sample_offset = float(position.w) / float(%d);\n", EFB_WIDTH);
+}
+
+static void WriteSampleColor(char*& p, const char* colorComp, const char* dest, int xoffset, API_TYPE ApiType)
+{
+	if (ApiType == API_OPENGL)
+	{
+		WRITE(p, "  %s = texture(samp0, float3(uv0 + float2(%d, 0) * sample_offset, 0.0)).%s;\n",
+			dest, xoffset, colorComp
+			);
+	}
+	else
+	{
+		WRITE(p, "  %s = Tex0.Sample(samp0, float3(uv0 + float2(%d, 0) * sample_offset, 0.0)).%s;\n",
+			dest, xoffset, colorComp
+			);
+	}
+}
+
+static void WriteColorToIntensity(char*& p, const char* src, const char* dest)
+{
+	if (!IntensityConstantAdded)
+	{
+		WRITE(p, "  float4 IntensityConst = float4(0.257f,0.504f,0.098f,0.0625f);\n");
+		IntensityConstantAdded = true;
+	}
+	WRITE(p, "  %s = dot(IntensityConst.rgb, %s.rgb);\n", dest, src);
+	// don't add IntensityConst.a yet, because doing it later is faster and uses less instructions, due to vectorization
+}
+
+static void WriteToBitDepth(char*& p, u8 depth, const char* src, const char* dest)
+{
+	WRITE(p, "  %s = floor(%s * 255.0 / exp2(8.0 - %d.0));\n", dest, src, depth);
+}
+
+static void WriteEncoderEnd(char*& p, API_TYPE ApiType)
+{
+	WRITE(p, "}\n");
+	IntensityConstantAdded = false;
+}
+
+static void WriteI8Encoder(char*& p, API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_I8, ApiType);
+	WRITE(p, "  float3 texSample;\n");
+
+	WriteSampleColor(p, "rgb", "texSample", 0, ApiType);
+	WriteColorToIntensity(p, "texSample", "ocol0.b");
+
+	WriteSampleColor(p, "rgb", "texSample", 1, ApiType);
+	WriteColorToIntensity(p, "texSample", "ocol0.g");
+
+	WriteSampleColor(p, "rgb", "texSample", 2, ApiType);
+	WriteColorToIntensity(p, "texSample", "ocol0.r");
+
+	WriteSampleColor(p, "rgb", "texSample", 3, ApiType);
+	WriteColorToIntensity(p, "texSample", "ocol0.a");
+
+	WRITE(p, "  ocol0.rgba += IntensityConst.aaaa;\n"); // see WriteColorToIntensity
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteI4Encoder(char*& p, API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_I4, ApiType);
+	WRITE(p, "  float3 texSample;\n");
+	WRITE(p, "  float4 color0;\n");
+	WRITE(p, "  float4 color1;\n");
+
+	WriteSampleColor(p, "rgb", "texSample", 0, ApiType);
+	WriteColorToIntensity(p, "texSample", "color0.b");
+
+	WriteSampleColor(p, "rgb", "texSample", 1, ApiType);
+	WriteColorToIntensity(p, "texSample", "color1.b");
+
+	WriteSampleColor(p, "rgb", "texSample", 2, ApiType);
+	WriteColorToIntensity(p, "texSample", "color0.g");
+
+	WriteSampleColor(p, "rgb", "texSample", 3, ApiType);
+	WriteColorToIntensity(p, "texSample", "color1.g");
+
+	WriteSampleColor(p, "rgb", "texSample", 4, ApiType);
+	WriteColorToIntensity(p, "texSample", "color0.r");
+
+	WriteSampleColor(p, "rgb", "texSample", 5, ApiType);
+	WriteColorToIntensity(p, "texSample", "color1.r");
+
+	WriteSampleColor(p, "rgb", "texSample", 6, ApiType);
+	WriteColorToIntensity(p, "texSample", "color0.a");
+
+	WriteSampleColor(p, "rgb", "texSample", 7, ApiType);
+	WriteColorToIntensity(p, "texSample", "color1.a");
+
+	WRITE(p, "  color0.rgba += IntensityConst.aaaa;\n");
+	WRITE(p, "  color1.rgba += IntensityConst.aaaa;\n");
+
+	WriteToBitDepth(p, 4, "color0", "color0");
+	WriteToBitDepth(p, 4, "color1", "color1");
+
+	WRITE(p, "  ocol0 = (color0 * 16.0 + color1) / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteIA8Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_IA8, ApiType);
+	WRITE(p, "  float4 texSample;\n");
+
+	WriteSampleColor(p, "rgba", "texSample", 0, ApiType);
+	WRITE(p, "  ocol0.b = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "ocol0.g");
+
+	WriteSampleColor(p, "rgba", "texSample", 1, ApiType);
+	WRITE(p, "  ocol0.r = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "ocol0.a");
+
+	WRITE(p, "  ocol0.ga += IntensityConst.aa;\n");
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteIA4Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_IA4, ApiType);
+	WRITE(p, "  float4 texSample;\n");
+	WRITE(p, "  float4 color0;\n");
+	WRITE(p, "  float4 color1;\n");
+
+	WriteSampleColor(p, "rgba", "texSample", 0, ApiType);
+	WRITE(p, "  color0.b = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "color1.b");
+
+	WriteSampleColor(p, "rgba", "texSample", 1, ApiType);
+	WRITE(p, "  color0.g = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "color1.g");
+
+	WriteSampleColor(p, "rgba", "texSample", 2, ApiType);
+	WRITE(p, "  color0.r = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "color1.r");
+
+	WriteSampleColor(p, "rgba", "texSample", 3, ApiType);
+	WRITE(p, "  color0.a = texSample.a;\n");
+	WriteColorToIntensity(p, "texSample", "color1.a");
+
+	WRITE(p, "  color1.rgba += IntensityConst.aaaa;\n");
+
+	WriteToBitDepth(p, 4, "color0", "color0");
+	WriteToBitDepth(p, 4, "color1", "color1");
+
+	WRITE(p, "  ocol0 = (color0 * 16.0 + color1) / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteRGB565Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_RGB565, ApiType);
+
+	WriteSampleColor(p, "rgb", "float3 texSample0", 0, ApiType);
+	WriteSampleColor(p, "rgb", "float3 texSample1", 1, ApiType);
+	WRITE(p, "  float2 texRs = float2(texSample0.r, texSample1.r);\n");
+	WRITE(p, "  float2 texGs = float2(texSample0.g, texSample1.g);\n");
+	WRITE(p, "  float2 texBs = float2(texSample0.b, texSample1.b);\n");
+
+	WriteToBitDepth(p, 6, "texGs", "float2 gInt");
+	WRITE(p, "  float2 gUpper = floor(gInt / 8.0);\n");
+	WRITE(p, "  float2 gLower = gInt - gUpper * 8.0;\n");
+
+	WriteToBitDepth(p, 5, "texRs", "ocol0.br");
+	WRITE(p, "  ocol0.br = ocol0.br * 8.0 + gUpper;\n");
+	WriteToBitDepth(p, 5, "texBs", "ocol0.ga");
+	WRITE(p, "  ocol0.ga = ocol0.ga + gLower * 32.0;\n");
+
+	WRITE(p, "  ocol0 = ocol0 / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteRGB5A3Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_RGB5A3, ApiType);
+
+	WRITE(p, "  float4 texSample;\n");
+	WRITE(p, "  float color0;\n");
+	WRITE(p, "  float gUpper;\n");
+	WRITE(p, "  float gLower;\n");
+
+	WriteSampleColor(p, "rgba", "texSample", 0, ApiType);
+
+	// 0.8784 = 224 / 255 which is the maximum alpha value that can be represented in 3 bits
+	WRITE(p, "if(texSample.a > 0.878f) {\n");
+
+	WriteToBitDepth(p, 5, "texSample.g", "color0");
+	WRITE(p, "  gUpper = floor(color0 / 8.0);\n");
+	WRITE(p, "  gLower = color0 - gUpper * 8.0;\n");
+
+	WriteToBitDepth(p, 5, "texSample.r", "ocol0.b");
+	WRITE(p, "  ocol0.b = ocol0.b * 4.0 + gUpper + 128.0;\n");
+	WriteToBitDepth(p, 5, "texSample.b", "ocol0.g");
+	WRITE(p, "  ocol0.g = ocol0.g + gLower * 32.0;\n");
+
+	WRITE(p, "} else {\n");
+
+	WriteToBitDepth(p, 4, "texSample.r", "ocol0.b");
+	WriteToBitDepth(p, 4, "texSample.b", "ocol0.g");
+
+	WriteToBitDepth(p, 3, "texSample.a", "color0");
+	WRITE(p, "ocol0.b = ocol0.b + color0 * 16.0;\n");
+	WriteToBitDepth(p, 4, "texSample.g", "color0");
+	WRITE(p, "ocol0.g = ocol0.g + color0 * 16.0;\n");
+
+	WRITE(p, "}\n");
+
+
+
+	WriteSampleColor(p, "rgba", "texSample", 1, ApiType);
+
+	WRITE(p, "if(texSample.a > 0.878f) {\n");
+
+	WriteToBitDepth(p, 5, "texSample.g", "color0");
+	WRITE(p, "  gUpper = floor(color0 / 8.0);\n");
+	WRITE(p, "  gLower = color0 - gUpper * 8.0;\n");
+
+	WriteToBitDepth(p, 5, "texSample.r", "ocol0.r");
+	WRITE(p, "  ocol0.r = ocol0.r * 4.0 + gUpper + 128.0;\n");
+	WriteToBitDepth(p, 5, "texSample.b", "ocol0.a");
+	WRITE(p, "  ocol0.a = ocol0.a + gLower * 32.0;\n");
+
+	WRITE(p, "} else {\n");
+
+	WriteToBitDepth(p, 4, "texSample.r", "ocol0.r");
+	WriteToBitDepth(p, 4, "texSample.b", "ocol0.a");
+
+	WriteToBitDepth(p, 3, "texSample.a", "color0");
+	WRITE(p, "ocol0.r = ocol0.r + color0 * 16.0;\n");
+	WriteToBitDepth(p, 4, "texSample.g", "color0");
+	WRITE(p, "ocol0.a = ocol0.a + color0 * 16.0;\n");
+
+	WRITE(p, "}\n");
+
+	WRITE(p, "  ocol0 = ocol0 / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteRGBA8Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_RGBA8, ApiType);
+
+	WRITE(p, "  float4 texSample;\n");
+	WRITE(p, "  float4 color0;\n");
+	WRITE(p, "  float4 color1;\n");
+
+	WriteSampleColor(p, "rgba", "texSample", 0, ApiType);
+	WRITE(p, "  color0.b = texSample.a;\n");
+	WRITE(p, "  color0.g = texSample.r;\n");
+	WRITE(p, "  color1.b = texSample.g;\n");
+	WRITE(p, "  color1.g = texSample.b;\n");
+
+	WriteSampleColor(p, "rgba", "texSample", 1, ApiType);
+	WRITE(p, "  color0.r = texSample.a;\n");
+	WRITE(p, "  color0.a = texSample.r;\n");
+	WRITE(p, "  color1.r = texSample.g;\n");
+	WRITE(p, "  color1.a = texSample.b;\n");
+
+	WRITE(p, "  ocol0 = first ? color0 : color1;\n");
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteC4Encoder(char*& p, const char* comp,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_R4, ApiType);
+	WRITE(p, "  float4 color0;\n");
+	WRITE(p, "  float4 color1;\n");
+
+	WriteSampleColor(p, comp, "color0.b", 0, ApiType);
+	WriteSampleColor(p, comp, "color1.b", 1, ApiType);
+	WriteSampleColor(p, comp, "color0.g", 2, ApiType);
+	WriteSampleColor(p, comp, "color1.g", 3, ApiType);
+	WriteSampleColor(p, comp, "color0.r", 4, ApiType);
+	WriteSampleColor(p, comp, "color1.r", 5, ApiType);
+	WriteSampleColor(p, comp, "color0.a", 6, ApiType);
+	WriteSampleColor(p, comp, "color1.a", 7, ApiType);
+
+	WriteToBitDepth(p, 4, "color0", "color0");
+	WriteToBitDepth(p, 4, "color1", "color1");
+
+	WRITE(p, "  ocol0 = (color0 * 16.0 + color1) / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteC8Encoder(char*& p, const char* comp,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_R8, ApiType);
+
+	WriteSampleColor(p, comp, "ocol0.b", 0, ApiType);
+	WriteSampleColor(p, comp, "ocol0.g", 1, ApiType);
+	WriteSampleColor(p, comp, "ocol0.r", 2, ApiType);
+	WriteSampleColor(p, comp, "ocol0.a", 3, ApiType);
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteCC4Encoder(char*& p, const char* comp,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_RA4, ApiType);
+	WRITE(p, "  float2 texSample;\n");
+	WRITE(p, "  float4 color0;\n");
+	WRITE(p, "  float4 color1;\n");
+
+	WriteSampleColor(p, comp, "texSample", 0, ApiType);
+	WRITE(p, "  color0.b = texSample.x;\n");
+	WRITE(p, "  color1.b = texSample.y;\n");
+
+	WriteSampleColor(p, comp, "texSample", 1, ApiType);
+	WRITE(p, "  color0.g = texSample.x;\n");
+	WRITE(p, "  color1.g = texSample.y;\n");
+
+	WriteSampleColor(p, comp, "texSample", 2, ApiType);
+	WRITE(p, "  color0.r = texSample.x;\n");
+	WRITE(p, "  color1.r = texSample.y;\n");
+
+	WriteSampleColor(p, comp, "texSample", 3, ApiType);
+	WRITE(p, "  color0.a = texSample.x;\n");
+	WRITE(p, "  color1.a = texSample.y;\n");
+
+	WriteToBitDepth(p, 4, "color0", "color0");
+	WriteToBitDepth(p, 4, "color1", "color1");
+
+	WRITE(p, "  ocol0 = (color0 * 16.0 + color1) / 255.0;\n");
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteCC8Encoder(char*& p, const char* comp, API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_RA8, ApiType);
+
+	WriteSampleColor(p, comp, "ocol0.bg", 0, ApiType);
+	WriteSampleColor(p, comp, "ocol0.ra", 1, ApiType);
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteZ8Encoder(char*& p, const char* multiplier,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_Z8M, ApiType);
+
+	WRITE(p, " float depth;\n");
+
+	WriteSampleColor(p, "r", "depth", 0, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+	WRITE(p, "ocol0.b = frac(depth * %s);\n", multiplier);
+
+	WriteSampleColor(p, "r", "depth", 1, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+	WRITE(p, "ocol0.g = frac(depth * %s);\n", multiplier);
+
+	WriteSampleColor(p, "r", "depth", 2, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+	WRITE(p, "ocol0.r = frac(depth * %s);\n", multiplier);
+
+	WriteSampleColor(p, "r", "depth", 3, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+	WRITE(p, "ocol0.a = frac(depth * %s);\n", multiplier);
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteZ16Encoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_Z16, ApiType);
+
+	WRITE(p, "  float depth;\n");
+	WRITE(p, "  float3 expanded;\n");
+
+	// byte order is reversed
+
+	WriteSampleColor(p, "r", "depth", 0, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+
+	WRITE(p, "  depth = clamp(depth * 16777216.0, 0.0, float(0xFFFFFF));\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0 * 256.0));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0 * 256.0;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0);\n");
+
+	WRITE(p, "  ocol0.b = expanded.g / 255.0;\n");
+	WRITE(p, "  ocol0.g = expanded.r / 255.0;\n");
+
+	WriteSampleColor(p, "r", "depth", 1, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+
+	WRITE(p, "  depth = clamp(depth * 16777216.0, 0.0, float(0xFFFFFF));\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0 * 256.0));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0 * 256.0;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0);\n");
+
+	WRITE(p, "  ocol0.r = expanded.g / 255.0;\n");
+	WRITE(p, "  ocol0.a = expanded.r / 255.0;\n");
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteZ16LEncoder(char*& p,API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_CTF_Z16L, ApiType);
+
+	WRITE(p, "  float depth;\n");
+	WRITE(p, "  float3 expanded;\n");
+
+	// byte order is reversed
+
+	WriteSampleColor(p, "r", "depth", 0, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+
+	WRITE(p, "  depth = clamp(depth * 16777216.0, 0.0, float(0xFFFFFF));\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0 * 256.0));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0 * 256.0;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0);\n");
+	WRITE(p, "  depth -= expanded.g * 256.0;\n");
+	WRITE(p, "  expanded.b = depth;\n");
+
+	WRITE(p, "  ocol0.b = expanded.b / 255.0;\n");
+	WRITE(p, "  ocol0.g = expanded.g / 255.0;\n");
+
+	WriteSampleColor(p, "r", "depth", 1, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth = 1.0f - depth;\n");
+
+	WRITE(p, "  depth = clamp(depth * 16777216.0, 0.0, float(0xFFFFFF));\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0 * 256.0));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0 * 256.0;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0);\n");
+	WRITE(p, "  depth -= expanded.g * 256.0;\n");
+	WRITE(p, "  expanded.b = depth;\n");
+
+	WRITE(p, "  ocol0.r = expanded.b / 255.0;\n");
+	WRITE(p, "  ocol0.a = expanded.g / 255.0;\n");
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+static void WriteZ24Encoder(char*& p, API_TYPE ApiType)
+{
+	WriteSwizzler(p, GX_TF_Z24X8, ApiType);
+
+	WRITE(p, "  float depth0;\n");
+	WRITE(p, "  float depth1;\n");
+	WRITE(p, "  float3 expanded0;\n");
+	WRITE(p, "  float3 expanded1;\n");
+
+	WriteSampleColor(p, "r", "depth0", 0, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth0 = 1.0f - depth0;\n");
+	WriteSampleColor(p, "r", "depth1", 1, ApiType);
+	if (ApiType == API_D3D) WRITE(p, "depth1 = 1.0f - depth1;\n");
+
+	for (int i = 0; i < 2; i++)
+	{
+		WRITE(p, "  depth%i = clamp(depth%i * 16777216.0, 0.0, float(0xFFFFFF));\n", i, i);
+
+		WRITE(p, "  expanded%i.r = floor(depth%i / (256.0 * 256.0));\n", i, i);
+		WRITE(p, "  depth%i -= expanded%i.r * 256.0 * 256.0;\n", i, i);
+		WRITE(p, "  expanded%i.g = floor(depth%i / 256.0);\n", i, i);
+		WRITE(p, "  depth%i -= expanded%i.g * 256.0;\n", i, i);
+		WRITE(p, "  expanded%i.b = depth%i;\n", i, i);
+	}
+
+	WRITE(p, "  if (!first) {\n");
+	// upper 16
+	WRITE(p, "     ocol0.b = expanded0.g / 255.0;\n");
+	WRITE(p, "     ocol0.g = expanded0.b / 255.0;\n");
+	WRITE(p, "     ocol0.r = expanded1.g / 255.0;\n");
+	WRITE(p, "     ocol0.a = expanded1.b / 255.0;\n");
+	WRITE(p, "  } else {\n");
+	// lower 8
+	WRITE(p, "     ocol0.b = 1.0;\n");
+	WRITE(p, "     ocol0.g = expanded0.r / 255.0;\n");
+	WRITE(p, "     ocol0.r = 1.0;\n");
+	WRITE(p, "     ocol0.a = expanded1.r / 255.0;\n");
+	WRITE(p, "  }\n");
+
+	WriteEncoderEnd(p, ApiType);
+}
+
+const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
+{
+	text[sizeof(text) - 1] = 0x7C;  // canary
+
+	char *p = text;
+
+	switch (format)
+	{
+	case GX_TF_I4:
+		WriteI4Encoder(p, ApiType);
+		break;
+	case GX_TF_I8:
+		WriteI8Encoder(p, ApiType);
+		break;
+	case GX_TF_IA4:
+		WriteIA4Encoder(p, ApiType);
+		break;
+	case GX_TF_IA8:
+		WriteIA8Encoder(p, ApiType);
+		break;
+	case GX_TF_RGB565:
+		WriteRGB565Encoder(p, ApiType);
+		break;
+	case GX_TF_RGB5A3:
+		WriteRGB5A3Encoder(p, ApiType);
+		break;
+	case GX_TF_RGBA8:
+		WriteRGBA8Encoder(p, ApiType);
+		break;
+	case GX_CTF_R4:
+		WriteC4Encoder(p, "r", ApiType);
+		break;
+	case GX_CTF_RA4:
+		WriteCC4Encoder(p, "ar", ApiType);
+		break;
+	case GX_CTF_RA8:
+		WriteCC8Encoder(p, "ar", ApiType);
+		break;
+	case GX_CTF_A8:
+		WriteC8Encoder(p, "a", ApiType);
+		break;
+	case GX_CTF_R8:
+		WriteC8Encoder(p, "r", ApiType);
+		break;
+	case GX_CTF_G8:
+		WriteC8Encoder(p, "g", ApiType);
+		break;
+	case GX_CTF_B8:
+		WriteC8Encoder(p, "b", ApiType);
+		break;
+	case GX_CTF_RG8:
+		WriteCC8Encoder(p, "rg", ApiType);
+		break;
+	case GX_CTF_GB8:
+		WriteCC8Encoder(p, "gb", ApiType);
+		break;
+	case GX_TF_Z8:
+		WriteC8Encoder(p, "r", ApiType);
+		break;
+	case GX_TF_Z16:
+		WriteZ16Encoder(p, ApiType);
+		break;
+	case GX_TF_Z24X8:
+		WriteZ24Encoder(p, ApiType);
+		break;
+	case GX_CTF_Z4:
+		WriteC4Encoder(p, "r", ApiType);
+		break;
+	case GX_CTF_Z8M:
+		WriteZ8Encoder(p, "256.0", ApiType);
+		break;
+	case GX_CTF_Z8L:
+		WriteZ8Encoder(p, "65536.0" , ApiType);
+		break;
+	case GX_CTF_Z16L:
+		WriteZ16LEncoder(p, ApiType);
+		break;
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
+
+	if (text[sizeof(text) - 1] != 0x7C)
+		PanicAlert("TextureConversionShader generator - buffer too small, canary has been eaten!");
+
+	return text;
+}
+
+}  // namespace
diff --git a/Source/Core/VideoCommon/TextureConversionShader.h b/Source/Core/VideoCommon/TextureConversionShader.h
new file mode 100644
index 0000000000..a45275256d
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureConversionShader.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace TextureConversionShader
+{
+u16 GetEncodedSampleCount(u32 format);
+
+const char *GenerateEncodingShader(u32 format, API_TYPE ApiType = API_OPENGL);
+
+}
diff --git a/Source/Core/VideoCommon/TextureDecoder.h b/Source/Core/VideoCommon/TextureDecoder.h
new file mode 100644
index 0000000000..1abcc5705c
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureDecoder.h
@@ -0,0 +1,77 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+#include "Common/Hash.h"
+
+enum
+{
+	TMEM_SIZE = 1024 * 1024,
+	TMEM_LINE_SIZE = 32,
+};
+extern  GC_ALIGNED16(u8 texMem[TMEM_SIZE]);
+
+enum TextureFormat
+{
+	GX_TF_I4     = 0x0,
+	GX_TF_I8     = 0x1,
+	GX_TF_IA4    = 0x2,
+	GX_TF_IA8    = 0x3,
+	GX_TF_RGB565 = 0x4,
+	GX_TF_RGB5A3 = 0x5,
+	GX_TF_RGBA8  = 0x6,
+	GX_TF_C4     = 0x8,
+	GX_TF_C8     = 0x9,
+	GX_TF_C14X2  = 0xA,
+	GX_TF_CMPR   = 0xE,
+
+	_GX_TF_CTF   = 0x20,  // copy-texture-format only (simply means linear?)
+	_GX_TF_ZTF   = 0x10,  // Z-texture-format
+
+	// these formats are also valid when copying targets
+	GX_CTF_R4    = 0x0 | _GX_TF_CTF,
+	GX_CTF_RA4   = 0x2 | _GX_TF_CTF,
+	GX_CTF_RA8   = 0x3 | _GX_TF_CTF,
+	GX_CTF_YUVA8 = 0x6 | _GX_TF_CTF,
+	GX_CTF_A8    = 0x7 | _GX_TF_CTF,
+	GX_CTF_R8    = 0x8 | _GX_TF_CTF,
+	GX_CTF_G8    = 0x9 | _GX_TF_CTF,
+	GX_CTF_B8    = 0xA | _GX_TF_CTF,
+	GX_CTF_RG8   = 0xB | _GX_TF_CTF,
+	GX_CTF_GB8   = 0xC | _GX_TF_CTF,
+
+	GX_TF_Z8     = 0x1 | _GX_TF_ZTF,
+	GX_TF_Z16    = 0x3 | _GX_TF_ZTF,
+	GX_TF_Z24X8  = 0x6 | _GX_TF_ZTF,
+
+	GX_CTF_Z4    = 0x0 | _GX_TF_ZTF | _GX_TF_CTF,
+	GX_CTF_Z8M   = 0x9 | _GX_TF_ZTF | _GX_TF_CTF,
+	GX_CTF_Z8L   = 0xA | _GX_TF_ZTF | _GX_TF_CTF,
+	GX_CTF_Z16L  = 0xC | _GX_TF_ZTF | _GX_TF_CTF,
+};
+
+enum TlutFormat
+{
+	GX_TL_IA8    = 0x0,
+	GX_TL_RGB565 = 0x1,
+	GX_TL_RGB5A3 = 0x2,
+};
+
+int TexDecoder_GetTexelSizeInNibbles(int format);
+int TexDecoder_GetTextureSizeInBytes(int width, int height, int format);
+int TexDecoder_GetBlockWidthInTexels(u32 format);
+int TexDecoder_GetBlockHeightInTexels(u32 format);
+int TexDecoder_GetPaletteSize(int fmt);
+
+void TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt);
+void TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height);
+void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, const u8* tlut, TlutFormat tlutfmt);
+void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth);
+
+void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center);
+
+/* Internal method, implemented by TextureDecoder_Generic and TextureDecoder_x64. */
+void _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt);
diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
new file mode 100644
index 0000000000..092b8ec1e0
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
@@ -0,0 +1,589 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cmath>
+
+#include "Common/Common.h"
+
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/sfont.inc"
+#include "VideoCommon/TextureDecoder.h"
+
+static bool TexFmt_Overlay_Enable = false;
+static bool TexFmt_Overlay_Center = false;
+
+// TRAM
+// STATE_TO_SAVE
+GC_ALIGNED16(u8 texMem[TMEM_SIZE]);
+
+int TexDecoder_GetTexelSizeInNibbles(int format)
+{
+	switch (format & 0x3f) {
+	case GX_TF_I4: return 1;
+	case GX_TF_I8: return 2;
+	case GX_TF_IA4: return 2;
+	case GX_TF_IA8: return 4;
+	case GX_TF_RGB565: return 4;
+	case GX_TF_RGB5A3: return 4;
+	case GX_TF_RGBA8: return 8;
+	case GX_TF_C4: return 1;
+	case GX_TF_C8: return 2;
+	case GX_TF_C14X2: return 4;
+	case GX_TF_CMPR: return 1;
+	case GX_CTF_R4:    return 1;
+	case GX_CTF_RA4:   return 2;
+	case GX_CTF_RA8:   return 4;
+	case GX_CTF_YUVA8: return 8;
+	case GX_CTF_A8:    return 2;
+	case GX_CTF_R8:    return 2;
+	case GX_CTF_G8:    return 2;
+	case GX_CTF_B8:    return 2;
+	case GX_CTF_RG8:   return 4;
+	case GX_CTF_GB8:   return 4;
+
+	case GX_TF_Z8:     return 2;
+	case GX_TF_Z16:    return 4;
+	case GX_TF_Z24X8:  return 8;
+
+	case GX_CTF_Z4:    return 1;
+	case GX_CTF_Z8M:   return 2;
+	case GX_CTF_Z8L:   return 2;
+	case GX_CTF_Z16L:  return 4;
+	default: return 1;
+	}
+}
+
+int TexDecoder_GetTextureSizeInBytes(int width, int height, int format)
+{
+	return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2;
+}
+
+int TexDecoder_GetBlockWidthInTexels(u32 format)
+{
+	switch (format)
+	{
+	case GX_TF_I4: return 8;
+	case GX_TF_I8: return 8;
+	case GX_TF_IA4: return 8;
+	case GX_TF_IA8: return 4;
+	case GX_TF_RGB565: return 4;
+	case GX_TF_RGB5A3: return 4;
+	case GX_TF_RGBA8: return  4;
+	case GX_TF_C4: return 8;
+	case GX_TF_C8: return 8;
+	case GX_TF_C14X2: return 4;
+	case GX_TF_CMPR: return 8;
+	case GX_CTF_R4: return 8;
+	case GX_CTF_RA4: return 8;
+	case GX_CTF_RA8: return 4;
+	case GX_CTF_A8: return 8;
+	case GX_CTF_R8: return 8;
+	case GX_CTF_G8: return 8;
+	case GX_CTF_B8: return 8;
+	case GX_CTF_RG8: return 4;
+	case GX_CTF_GB8: return 4;
+	case GX_TF_Z8: return 8;
+	case GX_TF_Z16: return 4;
+	case GX_TF_Z24X8: return 4;
+	case GX_CTF_Z4: return 8;
+	case GX_CTF_Z8M: return 8;
+	case GX_CTF_Z8L: return 8;
+	case GX_CTF_Z16L: return 4;
+	default:
+		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockWidthInTexels)", format);
+		return 8;
+	}
+}
+
+int TexDecoder_GetBlockHeightInTexels(u32 format)
+{
+	switch (format)
+	{
+	case GX_TF_I4: return 8;
+	case GX_TF_I8: return 4;
+	case GX_TF_IA4: return 4;
+	case GX_TF_IA8: return 4;
+	case GX_TF_RGB565: return 4;
+	case GX_TF_RGB5A3: return 4;
+	case GX_TF_RGBA8: return  4;
+	case GX_TF_C4: return 8;
+	case GX_TF_C8: return 4;
+	case GX_TF_C14X2: return 4;
+	case GX_TF_CMPR: return 8;
+	case GX_CTF_R4: return 8;
+	case GX_CTF_RA4: return 4;
+	case GX_CTF_RA8: return 4;
+	case GX_CTF_A8: return 4;
+	case GX_CTF_R8: return 4;
+	case GX_CTF_G8: return 4;
+	case GX_CTF_B8: return 4;
+	case GX_CTF_RG8: return 4;
+	case GX_CTF_GB8: return 4;
+	case GX_TF_Z8: return 4;
+	case GX_TF_Z16: return 4;
+	case GX_TF_Z24X8: return 4;
+	case GX_CTF_Z4: return 8;
+	case GX_CTF_Z8M: return 4;
+	case GX_CTF_Z8L: return 4;
+	case GX_CTF_Z16L: return 4;
+	default:
+		ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format);
+		return 4;
+	}
+}
+
+//returns bytes
+int TexDecoder_GetPaletteSize(int format)
+{
+	switch (format)
+	{
+	case GX_TF_C4: return 16 * 2;
+	case GX_TF_C8: return 256 * 2;
+	case GX_TF_C14X2: return 16384 * 2;
+	default:
+		return 0;
+	}
+}
+
+void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center)
+{
+	TexFmt_Overlay_Enable = enable;
+	TexFmt_Overlay_Center = center;
+}
+
+static const char* texfmt[] = {
+	// pixel
+	"I4",      "I8",      "IA4",      "IA8",
+	"RGB565",  "RGB5A3",  "RGBA8",    "0x07",
+	"C4",      "C8",      "C14X2",    "0x0B",
+	"0x0C",    "0x0D",    "CMPR",     "0x0F",
+	// Z-buffer
+	"0x10",    "Z8",      "0x12",     "Z16",
+	"0x14",    "0x15",    "Z24X8",    "0x17",
+	"0x18",    "0x19",    "0x1A",     "0x1B",
+	"0x1C",    "0x1D",    "0x1E",     "0x1F",
+	// pixel + copy
+	"CR4",     "0x21",    "CRA4",    "CRA8",
+	"0x24",    "0x25",    "CYUVA8",  "CA8",
+	"CR8",     "CG8",     "CB8",     "CRG8",
+	"CGB8",    "0x2D",    "0x2E",    "0x2F",
+	// Z + copy
+	"CZ4",     "0x31",    "0x32",    "0x33",
+	"0x34",    "0x35",    "0x36",    "0x37",
+	"0x38",    "CZ8M",    "CZ8L",    "0x3B",
+	"CZ16L",   "0x3D",    "0x3E",    "0x3F",
+};
+
+static void TexDecoder_DrawOverlay(u8 *dst, int width, int height, int texformat)
+{
+	int w = std::min(width, 40);
+	int h = std::min(height, 10);
+
+	int xoff = (width - w) >> 1;
+	int yoff = (height - h) >> 1;
+
+	if (!TexFmt_Overlay_Center)
+	{
+		xoff = 0;
+		yoff = 0;
+	}
+
+	const char* fmt = texfmt[texformat & 15];
+	while (*fmt)
+	{
+		int xcnt = 0;
+		int nchar = sfont_map[(int)*fmt];
+
+		const unsigned char *ptr = sfont_raw[nchar]; // each char is up to 9x10
+
+		for (int x = 0; x < 9; x++)
+		{
+			if (ptr[x] == 0x78)
+				break;
+			xcnt++;
+		}
+
+		for (int y = 0; y < 10; y++)
+		{
+			for (int x = 0; x < xcnt; x++)
+			{
+				int  *dtp = (int*)dst;
+				dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFFFFFF : 0xFF000000;
+			}
+			ptr += 9;
+		}
+		xoff += xcnt;
+		fmt++;
+	}
+}
+
+void TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt)
+{
+	_TexDecoder_DecodeImpl((u32*)dst, src, width, height, texformat, tlut, tlutfmt);
+
+	if (TexFmt_Overlay_Enable)
+		TexDecoder_DrawOverlay(dst, width, height, texformat);
+}
+
+static inline u32 DecodePixel_IA8(u16 val)
+{
+	int a = val & 0xFF;
+	int i = val >> 8;
+	return i | (i << 8) | (i << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_RGB565(u16 val)
+{
+	int r,g,b,a;
+	r=Convert5To8((val>>11) & 0x1f);
+	g=Convert6To8((val>>5 ) & 0x3f);
+	b=Convert5To8((val    ) & 0x1f);
+	a=0xFF;
+	return  r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_RGB5A3(u16 val)
+{
+	int r,g,b,a;
+	if ((val&0x8000))
+	{
+		r=Convert5To8((val>>10) & 0x1f);
+		g=Convert5To8((val>>5 ) & 0x1f);
+		b=Convert5To8((val    ) & 0x1f);
+		a=0xFF;
+	}
+	else
+	{
+		a=Convert3To8((val>>12) & 0x7);
+		r=Convert4To8((val>>8 ) & 0xf);
+		g=Convert4To8((val>>4 ) & 0xf);
+		b=Convert4To8((val    ) & 0xf);
+	}
+	return r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_Paletted(u16 pixel, TlutFormat tlutfmt)
+{
+	switch (tlutfmt)
+	{
+	case GX_TL_IA8:
+		return DecodePixel_IA8(pixel);
+	case GX_TL_RGB565:
+		return DecodePixel_RGB565(Common::swap16(pixel));
+	case GX_TL_RGB5A3:
+		return DecodePixel_RGB5A3(Common::swap16(pixel));
+	default:
+		return 0;
+	}
+}
+
+struct DXTBlock
+{
+	u16 color1;
+	u16 color2;
+	u8 lines[4];
+};
+
+static inline u32 MakeRGBA(int r, int g, int b, int a)
+{
+	return (a<<24)|(b<<16)|(g<<8)|r;
+}
+
+void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, const u8* tlut_, TlutFormat tlutfmt)
+{
+	/* General formula for computing texture offset
+	//
+	u16 sBlk = s / blockWidth;
+	u16 tBlk = t / blockHeight;
+	u16 widthBlks = (width / blockWidth) + 1;
+	u32 base = (tBlk * widthBlks + sBlk) * blockWidth * blockHeight;
+	u16 blkS = s & (blockWidth - 1);
+	u16 blkT =  t & (blockHeight - 1);
+	u32 blkOff = blkT * blockWidth + blkS;
+	*/
+
+	switch (texformat)
+	{
+	case GX_TF_C4:
+		{
+			u16 sBlk = s >> 3;
+			u16 tBlk = t >> 3;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5;
+			u16 blkS = s & 7;
+			u16 blkT =  t & 7;
+			u32 blkOff = (blkT << 3) + blkS;
+
+			int rs = (blkOff & 1)?0:4;
+			u32 offset = base + (blkOff >> 1);
+
+			u8 val = (*(src + offset) >> rs) & 0xF;
+			u16 *tlut = (u16*) tlut_;
+
+			*((u32*)dst) = DecodePixel_Paletted(tlut[val], tlutfmt);
+		}
+		break;
+	case GX_TF_I4:
+		{
+			u16 sBlk = s >> 3;
+			u16 tBlk = t >> 3;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5;
+			u16 blkS = s & 7;
+			u16 blkT =  t & 7;
+			u32 blkOff = (blkT << 3) + blkS;
+
+			int rs = (blkOff & 1)?0:4;
+			u32 offset = base + (blkOff >> 1);
+
+			u8 val = (*(src + offset) >> rs) & 0xF;
+			val = Convert4To8(val);
+			dst[0] = val;
+			dst[1] = val;
+			dst[2] = val;
+			dst[3] = val;
+		}
+	   break;
+	case GX_TF_I8:
+		{
+			u16 sBlk = s >> 3;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5;
+			u16 blkS = s & 7;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 3) + blkS;
+
+			u8 val = *(src + base + blkOff);
+			dst[0] = val;
+			dst[1] = val;
+			dst[2] = val;
+			dst[3] = val;
+		}
+		break;
+	case GX_TF_C8:
+		{
+			u16 sBlk = s >> 3;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5;
+			u16 blkS = s & 7;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 3) + blkS;
+
+			u8 val = *(src + base + blkOff);
+			u16 *tlut = (u16*) tlut_;
+
+			*((u32*)dst) = DecodePixel_Paletted(tlut[val], tlutfmt);
+		}
+		break;
+	case GX_TF_IA4:
+		{
+			u16 sBlk = s >> 3;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5;
+			u16 blkS = s & 7;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 3) + blkS;
+
+			u8 val = *(src + base + blkOff);
+			const u8 a = Convert4To8(val>>4);
+			const u8 l = Convert4To8(val&0xF);
+			dst[0] = l;
+			dst[1] = l;
+			dst[2] = l;
+			dst[3] = a;
+		}
+		break;
+	case GX_TF_IA8:
+		{
+			u16 sBlk = s >> 2;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 2) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 4;
+			u16 blkS = s & 3;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 2) + blkS;
+
+			u32 offset = (base + blkOff) << 1;
+			const u16* valAddr = (u16*)(src + offset);
+
+			*((u32*)dst) = DecodePixel_IA8(*valAddr);
+		}
+		break;
+	case GX_TF_C14X2:
+		{
+			u16 sBlk = s >> 2;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 2) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 4;
+			u16 blkS = s & 3;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 2) + blkS;
+
+			u32 offset = (base + blkOff) << 1;
+			const u16* valAddr = (u16*)(src + offset);
+
+			u16 val = Common::swap16(*valAddr) & 0x3FFF;
+			u16 *tlut = (u16*) tlut_;
+
+			*((u32*)dst) = DecodePixel_Paletted(tlut[val], tlutfmt);
+		}
+		break;
+	case GX_TF_RGB565:
+		{
+			u16 sBlk = s >> 2;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 2) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 4;
+			u16 blkS = s & 3;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 2) + blkS;
+
+			u32 offset = (base + blkOff) << 1;
+			const u16* valAddr = (u16*)(src + offset);
+
+			*((u32*)dst) = DecodePixel_RGB565(Common::swap16(*valAddr));
+		}
+		break;
+	case GX_TF_RGB5A3:
+		{
+			u16 sBlk = s >> 2;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 2) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 4;
+			u16 blkS = s & 3;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 2) + blkS;
+
+			u32 offset = (base + blkOff) << 1;
+			const u16* valAddr = (u16*)(src + offset);
+
+			*((u32*)dst) = DecodePixel_RGB5A3(Common::swap16(*valAddr));
+		}
+		break;
+	case GX_TF_RGBA8:
+		{
+			u16 sBlk = s >> 2;
+			u16 tBlk = t >> 2;
+			u16 widthBlks = (imageWidth >> 2) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 5; // shift by 5 is correct
+			u16 blkS = s & 3;
+			u16 blkT =  t & 3;
+			u32 blkOff = (blkT << 2) + blkS;
+
+			u32 offset = (base + blkOff) << 1 ;
+			const u8* valAddr = src + offset;
+
+			dst[3] = valAddr[0];
+			dst[0] = valAddr[1];
+			dst[1] = valAddr[32];
+			dst[2] = valAddr[33];
+		}
+		break;
+	case GX_TF_CMPR:
+		{
+			u16 sDxt = s >> 2;
+			u16 tDxt = t >> 2;
+
+			u16 sBlk = sDxt >> 1;
+			u16 tBlk = tDxt >> 1;
+			u16 widthBlks = (imageWidth >> 3) + 1;
+			u32 base = (tBlk * widthBlks + sBlk) << 2;
+			u16 blkS = sDxt & 1;
+			u16 blkT =  tDxt & 1;
+			u32 blkOff = (blkT << 1) + blkS;
+
+			u32 offset = (base + blkOff) << 3;
+
+			const DXTBlock* dxtBlock = (const DXTBlock*)(src + offset);
+
+			u16 c1 = Common::swap16(dxtBlock->color1);
+			u16 c2 = Common::swap16(dxtBlock->color2);
+			int blue1 = Convert5To8(c1 & 0x1F);
+			int blue2 = Convert5To8(c2 & 0x1F);
+			int green1 = Convert6To8((c1 >> 5) & 0x3F);
+			int green2 = Convert6To8((c2 >> 5) & 0x3F);
+			int red1 = Convert5To8((c1 >> 11) & 0x1F);
+			int red2 = Convert5To8((c2 >> 11) & 0x1F);
+
+			u16 ss = s & 3;
+			u16 tt = t & 3;
+
+			int colorSel = dxtBlock->lines[tt];
+			int rs = 6 - (ss << 1);
+			colorSel = (colorSel >> rs) & 3;
+			colorSel |= c1 > c2?0:4;
+
+			u32 color = 0;
+
+			switch (colorSel)
+			{
+				case 0:
+				case 4:
+					color = MakeRGBA(red1, green1, blue1, 255);
+					break;
+				case 1:
+				case 5:
+					color = MakeRGBA(red2, green2, blue2, 255);
+					break;
+				case 2:
+					color = MakeRGBA(red1+(red2-red1)/3, green1+(green2-green1)/3, blue1+(blue2-blue1)/3, 255);
+					break;
+				case 3:
+					color = MakeRGBA(red2+(red1-red2)/3, green2+(green1-green2)/3, blue2+(blue1-blue2)/3, 255);
+					break;
+				case 6:
+					color = MakeRGBA((int)ceil((float)(red1+red2)/2), (int)ceil((float)(green1+green2)/2), (int)ceil((float)(blue1+blue2)/2), 255);
+					break;
+				case 7:
+					color = MakeRGBA(red2, green2, blue2, 0);
+					break;
+				default:
+					color = 0;
+					break;
+			}
+
+			*((u32*)dst) = color;
+		}
+		break;
+	}
+}
+
+void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth)
+{
+	u16 sBlk = s >> 2;
+	u16 tBlk = t >> 2;
+	u16 widthBlks = (imageWidth >> 2) + 1; // TODO: Looks wrong. Shouldn't this be ((imageWidth-1)>>2)+1 ?
+	u32 base_ar = (tBlk * widthBlks + sBlk) << 4;
+	u32 base_gb = (tBlk * widthBlks + sBlk) << 4;
+	u16 blkS = s & 3;
+	u16 blkT =  t & 3;
+	u32 blk_off = (blkT << 2) + blkS;
+
+	u32 offset_ar = (base_ar + blk_off) << 1;
+	u32 offset_gb = (base_gb + blk_off) << 1;
+	const u8* val_addr_ar = src_ar + offset_ar;
+	const u8* val_addr_gb = src_gb + offset_gb;
+
+	dst[3] = val_addr_ar[0]; // A
+	dst[0] = val_addr_ar[1]; // R
+	dst[1] = val_addr_gb[0]; // G
+	dst[2] = val_addr_gb[1]; // B
+}
+
+void TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height)
+{
+	// TODO for someone who cares: Make this less slow!
+	for (int y = 0; y < height; ++y)
+	{
+		for (int x = 0; x < width; ++x)
+		{
+			TexDecoder_DecodeTexelRGBA8FromTmem(dst, src_ar, src_gb, x, y, width-1);
+			dst += 4;
+		}
+	}
+}
diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
new file mode 100644
index 0000000000..f69fefe6c5
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp
@@ -0,0 +1,347 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cmath>
+
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"
+//#include "VideoCommon/VideoCommon.h" // to get debug logs
+#include "VideoCommon/VideoConfig.h"
+
+// GameCube/Wii texture decoder
+
+// Decodes all known GameCube/Wii texture formats.
+// by ector
+
+static inline u32 DecodePixel_IA8(u16 val)
+{
+	int a = val & 0xFF;
+	int i = val >> 8;
+	return i | (i<<8) | (i<<16) | (a<<24);
+}
+
+static inline u32 DecodePixel_RGB565(u16 val)
+{
+	int r,g,b,a;
+	r=Convert5To8((val>>11) & 0x1f);
+	g=Convert6To8((val>>5 ) & 0x3f);
+	b=Convert5To8((val    ) & 0x1f);
+	a=0xFF;
+	return  r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_RGB5A3(u16 val)
+{
+	int r,g,b,a;
+	if ((val&0x8000))
+	{
+		r=Convert5To8((val>>10) & 0x1f);
+		g=Convert5To8((val>>5 ) & 0x1f);
+		b=Convert5To8((val    ) & 0x1f);
+		a=0xFF;
+	}
+	else
+	{
+		a=Convert3To8((val>>12) & 0x7);
+		r=Convert4To8((val>>8 ) & 0xf);
+		g=Convert4To8((val>>4 ) & 0xf);
+		b=Convert4To8((val    ) & 0xf);
+	}
+	return r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_Paletted(u16 pixel, TlutFormat tlutfmt)
+{
+	switch (tlutfmt)
+	{
+	case GX_TL_IA8:
+		return DecodePixel_IA8(pixel);
+	case GX_TL_RGB565:
+		return DecodePixel_RGB565(Common::swap16(pixel));
+	case GX_TL_RGB5A3:
+		return DecodePixel_RGB5A3(Common::swap16(pixel));
+	default:
+		return 0;
+	}
+}
+
+static inline void DecodeBytes_C4(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_Paletted(tlut[val >> 4], tlutfmt);
+		*dst++ = DecodePixel_Paletted(tlut[val & 0xF], tlutfmt);
+	}
+}
+
+static inline void DecodeBytes_C8(u32 *dst, const u8 *src, const u8* tlut_, TlutFormat tlutfmt)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 8; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_Paletted(tlut[val], tlutfmt);
+	}
+}
+
+static inline void DecodeBytes_C14X2(u32 *dst, const u16 *src, const u8* tlut_, TlutFormat tlutfmt)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u16 val = Common::swap16(src[x]);
+		*dst++ = DecodePixel_Paletted(tlut[(val & 0x3FFF)], tlutfmt);
+	}
+}
+
+static inline void DecodeBytes_IA4(u32 *dst, const u8 *src)
+{
+	for (int x = 0; x < 8; x++)
+	{
+		const u8 val = src[x];
+		u8 a = Convert4To8(val >> 4);
+		u8 l = Convert4To8(val & 0xF);
+		dst[x] = (a << 24) | l << 16 | l << 8 | l;
+	}
+}
+
+static inline void DecodeBytes_RGB5A3(u32 *dst, const u16 *src)
+{
+#if 0
+	for (int x = 0; x < 4; x++)
+		dst[x] = DecodePixel_RGB5A3(Common::swap16(src[x]));
+#else
+	dst[0] = DecodePixel_RGB5A3(Common::swap16(src[0]));
+	dst[1] = DecodePixel_RGB5A3(Common::swap16(src[1]));
+	dst[2] = DecodePixel_RGB5A3(Common::swap16(src[2]));
+	dst[3] = DecodePixel_RGB5A3(Common::swap16(src[3]));
+#endif
+}
+
+static inline void DecodeBytes_RGBA8(u32 *dst, const u16 *src, const u16 * src2)
+{
+#if 0
+	for (int x = 0; x < 4; x++)
+	{
+		dst[x] =  ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8)  | (src2[x] << 8);
+	}
+#else
+	dst[0] =  ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8)  | (src2[0] << 8);
+	dst[1] =  ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8)  | (src2[1] << 8);
+	dst[2] =  ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8)  | (src2[2] << 8);
+	dst[3] =  ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8)  | (src2[3] << 8);
+#endif
+}
+
+struct DXTBlock
+{
+	u16 color1;
+	u16 color2;
+	u8 lines[4];
+};
+
+static inline u32 MakeRGBA(int r, int g, int b, int a)
+{
+	return (a<<24)|(b<<16)|(g<<8)|r;
+}
+
+static void DecodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
+{
+	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
+	// Needs more speed.
+	u16 c1 = Common::swap16(src->color1);
+	u16 c2 = Common::swap16(src->color2);
+	int blue1 = Convert5To8(c1 & 0x1F);
+	int blue2 = Convert5To8(c2 & 0x1F);
+	int green1 = Convert6To8((c1 >> 5) & 0x3F);
+	int green2 = Convert6To8((c2 >> 5) & 0x3F);
+	int red1 = Convert5To8((c1 >> 11) & 0x1F);
+	int red2 = Convert5To8((c2 >> 11) & 0x1F);
+	int colors[4];
+	colors[0] = MakeRGBA(red1, green1, blue1, 255);
+	colors[1] = MakeRGBA(red2, green2, blue2, 255);
+	if (c1 > c2)
+	{
+		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
+		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
+		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
+		colors[2] = MakeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
+		colors[3] = MakeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255);
+	}
+	else
+	{
+		colors[2] = MakeRGBA((red1 + red2 + 1) / 2, // Average
+							(green1 + green2 + 1) / 2,
+							(blue1 + blue2 + 1) / 2, 255);
+		colors[3] = MakeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
+	}
+
+	for (int y = 0; y < 4; y++)
+	{
+		int val = src->lines[y];
+		for (int x = 0; x < 4; x++)
+		{
+			dst[x] = colors[(val >> 6) & 3];
+			val <<= 2;
+		}
+		dst += pitch;
+	}
+}
+
+// JSD 01/06/11:
+// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to
+// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128
+// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples
+// of 16 in the aligned case.
+// TODO: complete SSE2 optimization of less often used texture formats.
+// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads.
+
+void _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt)
+{
+	const int Wsteps4 = (width + 3) / 4;
+	const int Wsteps8 = (width + 7) / 8;
+
+	switch (texformat)
+	{
+	case GX_TF_C4:
+		for (int y = 0; y < height; y += 8)
+			for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+				for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
+					DecodeBytes_C4(dst + (y + iy) * width + x, src + 4 * xStep, tlut, tlutfmt);
+		break;
+	case GX_TF_I4:
+		{
+			// Reference C implementation:
+			for (int y = 0; y < height; y += 8)
+				for (int x = 0; x < width; x += 8)
+					for (int iy = 0; iy < 8; iy++, src += 4)
+						for (int ix = 0; ix < 4; ix++)
+						{
+							int val = src[ix];
+							u8 i1 = Convert4To8(val >> 4);
+							u8 i2 = Convert4To8(val & 0xF);
+							memset(dst+(y + iy) * width + x + ix * 2 , i1,4);
+							memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4);
+						}
+		}
+		break;
+	case GX_TF_I8:  // speed critical
+		{
+			// Reference C implementation
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0; x < width; x += 8)
+					for (int iy = 0; iy < 4; ++iy, src += 8)
+					{
+						u32 *  newdst = dst + (y + iy)*width+x;
+						const u8 *  newsrc = src;
+						u8 srcval;
+
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+						srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24);
+					}
+		}
+		break;
+	case GX_TF_C8:
+		for (int y = 0; y < height; y += 4)
+			for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+				for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+					DecodeBytes_C8((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlut, tlutfmt);
+		break;
+	case GX_TF_IA4:
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_IA4(dst + (y + iy) * width + x, src + 8 * xStep);
+		}
+		break;
+	case GX_TF_IA8:
+		{
+			// Reference C implementation:
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0; x < width; x += 4)
+					for (int iy = 0; iy < 4; iy++, src += 8)
+					{
+						u32 *ptr = dst + (y + iy) * width + x;
+						u16 *s = (u16 *)src;
+						ptr[0] = DecodePixel_IA8(s[0]);
+						ptr[1] = DecodePixel_IA8(s[1]);
+						ptr[2] = DecodePixel_IA8(s[2]);
+						ptr[3] = DecodePixel_IA8(s[3]);
+					}
+		}
+		break;
+	case GX_TF_C14X2:
+		for (int y = 0; y < height; y += 4)
+			for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+				for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+					DecodeBytes_C14X2(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlut, tlutfmt);
+		break;
+	case GX_TF_RGB565:
+		{
+			// Reference C implementation.
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0; x < width; x += 4)
+					for (int iy = 0; iy < 4; iy++, src += 8)
+					{
+						u32 *ptr = dst + (y + iy) * width + x;
+						u16 *s = (u16 *)src;
+						for (int j = 0; j < 4; j++)
+							*ptr++ = DecodePixel_RGB565(Common::swap16(*s++));
+					}
+		}
+		break;
+	case GX_TF_RGB5A3:
+		{
+			// Reference C implementation:
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0; x < width; x += 4)
+					for (int iy = 0; iy < 4; iy++, src += 8)
+						DecodeBytes_RGB5A3(dst+(y+iy)*width+x, (u16*)src);
+		}
+		break;
+	case GX_TF_RGBA8:  // speed critical
+		{
+			// Reference C implementation.
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0; x < width; x += 4)
+				{
+					for (int iy = 0; iy < 4; iy++)
+						DecodeBytes_RGBA8(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16);
+					src += 64;
+				}
+		}
+		break;
+	case GX_TF_CMPR:  // speed critical
+		// The metroid games use this format almost exclusively.
+		{
+			for (int y = 0; y < height; y += 8)
+			{
+				for (int x = 0; x < width; x += 8)
+				{
+					DecodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+					DecodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width);
+					src += sizeof(DXTBlock);
+				}
+			}
+			break;
+		}
+	}
+}
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
new file mode 100644
index 0000000000..f68d35f842
--- /dev/null
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -0,0 +1,1270 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <cmath>
+
+#include "Common/Common.h"
+//#include "VideoCommon.h" // to get debug logs
+#include "Common/CPUDetect.h"
+#include "Common/Intrinsics.h"
+
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoConfig.h"
+
+// This avoids a harmless warning from a system header in Clang;
+// see http://llvm.org/bugs/show_bug.cgi?id=16093
+#if defined(__clang__) && (__clang_major__ * 100 + __clang_minor__ < 304)
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// GameCube/Wii texture decoder
+
+// Decodes all known GameCube/Wii texture formats.
+// by ector
+
+static inline u32 DecodePixel_IA8(u16 val)
+{
+	int a = val & 0xFF;
+	int i = val >> 8;
+	return i | (i<<8) | (i<<16) | (a<<24);
+}
+
+static inline u32 DecodePixel_RGB565(u16 val)
+{
+	int r,g,b,a;
+	r=Convert5To8((val>>11) & 0x1f);
+	g=Convert6To8((val>>5 ) & 0x3f);
+	b=Convert5To8((val    ) & 0x1f);
+	a=0xFF;
+	return  r | (g<<8) | (b << 16) | (a << 24);
+}
+
+static inline u32 DecodePixel_RGB5A3(u16 val)
+{
+	int r,g,b,a;
+	if ((val&0x8000))
+	{
+		r=Convert5To8((val>>10) & 0x1f);
+		g=Convert5To8((val>>5 ) & 0x1f);
+		b=Convert5To8((val    ) & 0x1f);
+		a=0xFF;
+	}
+	else
+	{
+		a=Convert3To8((val>>12) & 0x7);
+		r=Convert4To8((val>>8 ) & 0xf);
+		g=Convert4To8((val>>4 ) & 0xf);
+		b=Convert4To8((val    ) & 0xf);
+	}
+	return r | (g<<8) | (b << 16) | (a << 24);
+}
+
+struct DXTBlock
+{
+	u16 color1;
+	u16 color2;
+	u8 lines[4];
+};
+
+static inline void DecodeBytes_C4_IA8(u32* dst, const u8* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_IA8(tlut[val >> 4]);
+		*dst++ = DecodePixel_IA8(tlut[val & 0xF]);
+	}
+}
+
+static inline void DecodeBytes_C4_RGB565(u32* dst, const u8* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_RGB565(Common::swap16(tlut[val >> 4]));
+		*dst++ = DecodePixel_RGB565(Common::swap16(tlut[val & 0xF]));
+	}
+}
+
+static inline void DecodeBytes_C4_RGB5A3(u32 *dst, const u8 *src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_RGB5A3(Common::swap16(tlut[val >> 4]));
+		*dst++ = DecodePixel_RGB5A3(Common::swap16(tlut[val & 0xF]));
+	}
+}
+
+static inline void DecodeBytes_C8_IA8(u32* dst, const u8* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 8; x++)
+	{
+		*dst++ = DecodePixel_IA8(tlut[src[x]]);
+	}
+}
+
+static inline void DecodeBytes_C8_RGB565(u32* dst, const u8* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 8; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_RGB565(Common::swap16(tlut[val]));
+	}
+}
+
+static inline void DecodeBytes_C8_RGB5A3(u32 *dst, const u8 *src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 8; x++)
+	{
+		u8 val = src[x];
+		*dst++ = DecodePixel_RGB5A3(Common::swap16(tlut[val]));
+	}
+}
+
+static inline void DecodeBytes_C14X2_IA8(u32* dst, const u16* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u16 val = Common::swap16(src[x]);
+		*dst++ = DecodePixel_IA8(tlut[(val & 0x3FFF)]);
+	}
+}
+
+static inline void DecodeBytes_C14X2_RGB565(u32* dst, const u16* src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u16 val = Common::swap16(src[x]);
+		*dst++ = DecodePixel_RGB565(Common::swap16(tlut[(val & 0x3FFF)]));
+	}
+}
+
+static inline void DecodeBytes_C14X2_RGB5A3(u32 *dst, const u16 *src, const u8* tlut_)
+{
+	const u16* tlut = (u16*) tlut_;
+	for (int x = 0; x < 4; x++)
+	{
+		u16 val = Common::swap16(src[x]);
+		*dst++ = DecodePixel_RGB5A3(Common::swap16(tlut[(val & 0x3FFF)]));
+	}
+}
+
+static inline void DecodeBytes_IA4(u32 *dst, const u8 *src)
+{
+	for (int x = 0; x < 8; x++)
+	{
+		const u8 val = src[x];
+		u8 a = Convert4To8(val >> 4);
+		u8 l = Convert4To8(val & 0xF);
+		dst[x] = (a << 24) | l << 16 | l << 8 | l;
+	}
+}
+
+#ifdef CHECK
+static inline u32 makeRGBA(int r, int g, int b, int a)
+{
+	return (a<<24)|(b<<16)|(g<<8)|r;
+}
+
+static void DecodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
+{
+	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
+	// Needs more speed.
+	u16 c1 = Common::swap16(src->color1);
+	u16 c2 = Common::swap16(src->color2);
+	int blue1 = Convert5To8(c1 & 0x1F);
+	int blue2 = Convert5To8(c2 & 0x1F);
+	int green1 = Convert6To8((c1 >> 5) & 0x3F);
+	int green2 = Convert6To8((c2 >> 5) & 0x3F);
+	int red1 = Convert5To8((c1 >> 11) & 0x1F);
+	int red2 = Convert5To8((c2 >> 11) & 0x1F);
+	int colors[4];
+	colors[0] = MakeRGBA(red1, green1, blue1, 255);
+	colors[1] = MakeRGBA(red2, green2, blue2, 255);
+	if (c1 > c2)
+	{
+		int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3);
+		int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3);
+		int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3);
+		colors[2] = MakeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255);
+		colors[3] = MakeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255);
+	}
+	else
+	{
+		colors[2] = MakeRGBA((red1 + red2 + 1) / 2, // Average
+							(green1 + green2 + 1) / 2,
+							(blue1 + blue2 + 1) / 2, 255);
+		colors[3] = MakeRGBA(red2, green2, blue2, 0);  // Color2 but transparent
+	}
+
+	for (int y = 0; y < 4; y++)
+	{
+		int val = src->lines[y];
+		for (int x = 0; x < 4; x++)
+		{
+			dst[x] = colors[(val >> 6) & 3];
+			val <<= 2;
+		}
+		dst += pitch;
+	}
+}
+#endif
+
+// JSD 01/06/11:
+// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to
+// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128
+// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples
+// of 16 in the aligned case.
+// TODO: complete SSE2 optimization of less often used texture formats.
+// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads.
+
+void _TexDecoder_DecodeImpl(u32 * dst, const u8 * src, int width, int height, int texformat, const u8* tlut, TlutFormat tlutfmt)
+{
+	const int Wsteps4 = (width + 3) / 4;
+	const int Wsteps8 = (width + 7) / 8;
+
+	switch (texformat)
+	{
+	case GX_TF_C4:
+		if (tlutfmt == GX_TL_RGB5A3)
+		{
+			for (int y = 0; y < height; y += 8)
+				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
+						DecodeBytes_C4_RGB5A3(dst + (y + iy) * width + x, src + 4 * xStep, tlut);
+		}
+		else if (tlutfmt == GX_TL_IA8)
+		{
+			for (int y = 0; y < height; y += 8)
+				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
+						DecodeBytes_C4_IA8(dst + (y + iy) * width + x, src + 4 * xStep, tlut);
+
+		}
+		else if (tlutfmt == GX_TL_RGB565)
+		{
+			for (int y = 0; y < height; y += 8)
+				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+					for (int iy = 0, xStep =  8 * yStep; iy < 8; iy++,xStep++)
+						DecodeBytes_C4_RGB565(dst + (y + iy) * width + x, src  + 4 * xStep, tlut);
+		}
+		break;
+	case GX_TF_I4:
+		{
+			const __m128i kMask_x0f = _mm_set1_epi32(0x0f0f0f0fL);
+			const __m128i kMask_xf0 = _mm_set1_epi32(0xf0f0f0f0L);
+#if _M_SSE >= 0x301
+			// xsacha optimized with SSSE3 intrinsics
+			// Produces a ~40% speed improvement over SSE2 implementation
+			if (cpu_info.bSSSE3)
+			{
+				const __m128i mask9180 = _mm_set_epi8(9,9,9,9,1,1,1,1,8,8,8,8,0,0,0,0);
+				const __m128i maskB3A2 = _mm_set_epi8(11,11,11,11,3,3,3,3,10,10,10,10,2,2,2,2);
+				const __m128i maskD5C4 = _mm_set_epi8(13,13,13,13,5,5,5,5,12,12,12,12,4,4,4,4);
+				const __m128i maskF7E6 = _mm_set_epi8(15,15,15,15,7,7,7,7,14,14,14,14,6,6,6,6);
+				for (int y = 0; y < height; y += 8)
+					for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+						for (int iy = 0, xStep =  4 * yStep; iy < 8; iy += 2,xStep++)
+						{
+							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
+							// We want the hi 4 bits of each 8-bit word replicated to 32-bit words:
+							// (00000000 00000000 HhGgFfEe DdCcBbAa) -> (00000000 00000000 HHGGFFEE DDCCBBAA)
+							const __m128i i1 = _mm_and_si128(r0, kMask_xf0);
+							const __m128i i11 = _mm_or_si128(i1, _mm_srli_epi16(i1, 4));
+
+							// Now we do same as above for the second half of the byte
+							const __m128i i2 = _mm_and_si128(r0, kMask_x0f);
+							const __m128i i22 = _mm_or_si128(i2, _mm_slli_epi16(i2,4));
+
+							// Combine both sides
+							const __m128i base = _mm_unpacklo_epi64(i11,i22);
+							// Achieve the pattern visible in the masks.
+							const __m128i o1 = _mm_shuffle_epi8(base, mask9180);
+							const __m128i o2 = _mm_shuffle_epi8(base, maskB3A2);
+							const __m128i o3 = _mm_shuffle_epi8(base, maskD5C4);
+							const __m128i o4 = _mm_shuffle_epi8(base, maskF7E6);
+
+							// Write row 0:
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x ), o1 );
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x + 4 ), o2 );
+							// Write row 1:
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x ), o3 );
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 );
+						}
+			}
+			else
+#endif
+			// JSD optimized with SSE2 intrinsics.
+			// Produces a ~76% speed improvement over reference C implementation.
+			{
+				for (int y = 0; y < height; y += 8)
+					for (int x = 0, yStep = (y / 8) * Wsteps8 ; x < width; x += 8, yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 8; iy += 2, xStep++)
+						{
+							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
+							// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
+							const __m128i r1 = _mm_unpacklo_epi8(r0, r0);
+
+							// We want the hi 4 bits of each 8-bit word replicated to 32-bit words:
+							// (HhHhGgGg FfFfEeEe DdDdCcCc BbBbAaAa) & kMask_xf0 -> (H0H0G0G0 F0F0E0E0 D0D0C0C0 B0B0A0A0)
+							const __m128i i1 = _mm_and_si128(r1, kMask_xf0);
+							// -> (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA)
+							const __m128i i11 = _mm_or_si128(i1, _mm_srli_epi16(i1, 4));
+
+							// Shuffle low 64-bits with itself to expand from (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA) to (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA)
+							const __m128i i15 = _mm_unpacklo_epi8(i11, i11);
+							// (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA) -> (BBBBBBBB BBBBBBBB AAAAAAAA AAAAAAAA)
+							const __m128i i151 = _mm_unpacklo_epi8(i15, i15);
+							// (DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA) -> (DDDDDDDD DDDDDDDD CCCCCCCC CCCCCCCC)
+							const __m128i i152 = _mm_unpackhi_epi8(i15, i15);
+
+							// Shuffle hi  64-bits with itself to expand from (HHHHGGGG FFFFEEEE DDDDCCCC BBBBAAAA) to (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE)
+							const __m128i i16 = _mm_unpackhi_epi8(i11, i11);
+							// (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE) -> (FFFFFFFF FFFFFFFF EEEEEEEE EEEEEEEE)
+							const __m128i i161 = _mm_unpacklo_epi8(i16, i16);
+							// (HHHHHHHH GGGGGGGG FFFFFFFF EEEEEEEE) -> (HHHHHHHH HHHHHHHH GGGGGGGG GGGGGGGG)
+							const __m128i i162 = _mm_unpackhi_epi8(i16, i16);
+
+							// Now find the lo 4 bits of each input 8-bit word:
+							const __m128i i2 = _mm_and_si128(r1, kMask_x0f);
+							const __m128i i22 = _mm_or_si128(i2, _mm_slli_epi16(i2,4));
+
+							const __m128i i25 = _mm_unpacklo_epi8(i22, i22);
+							const __m128i i251 = _mm_unpacklo_epi8(i25, i25);
+							const __m128i i252 = _mm_unpackhi_epi8(i25, i25);
+
+							const __m128i i26 = _mm_unpackhi_epi8(i22, i22);
+							const __m128i i261 = _mm_unpacklo_epi8(i26, i26);
+							const __m128i i262 = _mm_unpackhi_epi8(i26, i26);
+
+							// _mm_and_si128(i151, kMask_x00000000ffffffff) takes i151 and masks off 1st and 3rd 32-bit words
+							// (BBBBBBBB BBBBBBBB AAAAAAAA AAAAAAAA) -> (00000000 BBBBBBBB 00000000 AAAAAAAA)
+							// _mm_and_si128(i251, kMask_xffffffff00000000) takes i251 and masks off 2nd and 4th 32-bit words
+							// (bbbbbbbb bbbbbbbb aaaaaaaa aaaaaaaa) -> (bbbbbbbb 00000000 aaaaaaaa 00000000)
+							// And last but not least, _mm_or_si128 ORs those two together, giving us the interleaving we desire:
+							// (00000000 BBBBBBBB 00000000 AAAAAAAA) | (bbbbbbbb 00000000 aaaaaaaa 00000000) -> (bbbbbbbb BBBBBBBB aaaaaaaa AAAAAAAA)
+							const __m128i kMask_x00000000ffffffff = _mm_set_epi32(0x00000000L, 0xffffffffL, 0x00000000L, 0xffffffffL);
+							const __m128i kMask_xffffffff00000000 = _mm_set_epi32(0xffffffffL, 0x00000000L, 0xffffffffL, 0x00000000L);
+							const __m128i o1 = _mm_or_si128(_mm_and_si128(i151, kMask_x00000000ffffffff), _mm_and_si128(i251, kMask_xffffffff00000000));
+							const __m128i o2 = _mm_or_si128(_mm_and_si128(i152, kMask_x00000000ffffffff), _mm_and_si128(i252, kMask_xffffffff00000000));
+
+							// These two are for the next row; same pattern as above. We batched up two rows because our input was 64 bits.
+							const __m128i o3 = _mm_or_si128(_mm_and_si128(i161, kMask_x00000000ffffffff), _mm_and_si128(i261, kMask_xffffffff00000000));
+							const __m128i o4 = _mm_or_si128(_mm_and_si128(i162, kMask_x00000000ffffffff), _mm_and_si128(i262, kMask_xffffffff00000000));
+							// Write row 0:
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x ), o1 );
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy) * width + x + 4 ), o2 );
+							// Write row 1:
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x ), o3 );
+							_mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 );
+						}
+			}
+		}
+		break;
+	case GX_TF_I8:  // speed critical
+		{
+#if _M_SSE >= 0x301
+			// xsacha optimized with SSSE3 intrinsics
+			// Produces a ~10% speed improvement over SSE2 implementation
+			if (cpu_info.bSSSE3)
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8,yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 4; ++iy, xStep++)
+						{
+							const __m128i mask3210 = _mm_set_epi8(3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0);
+
+							const __m128i mask7654 = _mm_set_epi8(7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4);
+							__m128i *quaddst, r, rgba0, rgba1;
+							// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+							r = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
+							// Shuffle select bytes to expand from (0000 0000 hgfe dcba) to:
+							rgba0 = _mm_shuffle_epi8(r, mask3210); // (dddd cccc bbbb aaaa)
+							rgba1 = _mm_shuffle_epi8(r, mask7654); // (hhhh gggg ffff eeee)
+
+							quaddst = (__m128i *)(dst + (y + iy)*width + x);
+							_mm_storeu_si128(quaddst, rgba0);
+							_mm_storeu_si128(quaddst+1, rgba1);
+						}
+
+			}
+			else
+#endif
+			// JSD optimized with SSE2 intrinsics.
+			// Produces an ~86% speed improvement over reference C implementation.
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8,yStep++)
+					{
+						// Each loop iteration processes 4 rows from 4 64-bit reads.
+						const u8* src2 = src + 32 * yStep;
+						// TODO: is it more efficient to group the loads together sequentially and also the stores at the end?
+						// _mm_stream instead of _mm_store on my AMD Phenom II x410 made performance significantly WORSE, so I
+						// went with _mm_stores. Perhaps there is some edge case here creating the terrible performance or we're
+						// not aligned to 16-byte boundaries. I don't know.
+						__m128i *quaddst;
+
+						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+						const __m128i r0 = _mm_loadl_epi64((const __m128i *)src2);
+						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
+						const __m128i r1 = _mm_unpacklo_epi8(r0, r0);
+
+						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
+						const __m128i rgba0 = _mm_unpacklo_epi8(r1, r1);
+						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
+						const __m128i rgba1 = _mm_unpackhi_epi8(r1, r1);
+
+						// Store (dddd cccc bbbb aaaa) out:
+						quaddst = (__m128i *)(dst + (y + 0)*width + x);
+						_mm_storeu_si128(quaddst, rgba0);
+						// Store (hhhh gggg ffff eeee) out:
+						_mm_storeu_si128(quaddst+1, rgba1);
+
+						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+						src2 += 8;
+						const __m128i r2 = _mm_loadl_epi64((const __m128i *)src2);
+						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
+						const __m128i r3 = _mm_unpacklo_epi8(r2, r2);
+
+						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
+						const __m128i rgba2 = _mm_unpacklo_epi8(r3, r3);
+						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
+						const __m128i rgba3 = _mm_unpackhi_epi8(r3, r3);
+
+						// Store (dddd cccc bbbb aaaa) out:
+						quaddst = (__m128i *)(dst + (y + 1)*width + x);
+						_mm_storeu_si128(quaddst, rgba2);
+						// Store (hhhh gggg ffff eeee) out:
+						_mm_storeu_si128(quaddst+1, rgba3);
+
+						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+						src2 += 8;
+						const __m128i r4 = _mm_loadl_epi64((const __m128i *)src2);
+						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
+						const __m128i r5 = _mm_unpacklo_epi8(r4, r4);
+
+						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
+						const __m128i rgba4 = _mm_unpacklo_epi8(r5, r5);
+						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
+						const __m128i rgba5 = _mm_unpackhi_epi8(r5, r5);
+
+						// Store (dddd cccc bbbb aaaa) out:
+						quaddst = (__m128i *)(dst + (y + 2)*width + x);
+						_mm_storeu_si128(quaddst, rgba4);
+						// Store (hhhh gggg ffff eeee) out:
+						_mm_storeu_si128(quaddst+1, rgba5);
+
+						// Load 64 bits from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+						src2 += 8;
+						const __m128i r6 = _mm_loadl_epi64((const __m128i *)src2);
+						// Shuffle low 64-bits with itself to expand from (0000 0000 hgfe dcba) to (hhgg ffee ddcc bbaa)
+						const __m128i r7 = _mm_unpacklo_epi8(r6, r6);
+
+						// Shuffle low 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (dddd cccc bbbb aaaa)
+						const __m128i rgba6 = _mm_unpacklo_epi8(r7, r7);
+						// Shuffle hi 64-bits with itself to expand from (hhgg ffee ddcc bbaa) to (hhhh gggg ffff eeee)
+						const __m128i rgba7 = _mm_unpackhi_epi8(r7, r7);
+
+						// Store (dddd cccc bbbb aaaa) out:
+						quaddst = (__m128i *)(dst + (y + 3)*width + x);
+						_mm_storeu_si128(quaddst, rgba6);
+						// Store (hhhh gggg ffff eeee) out:
+						_mm_storeu_si128(quaddst+1, rgba7);
+
+					}
+			}
+		}
+		break;
+	case GX_TF_C8:
+		if (tlutfmt == GX_TL_RGB5A3)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C8_RGB5A3((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlut);
+		}
+		else if (tlutfmt == GX_TL_IA8)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C8_IA8(dst + (y + iy) * width + x, src + 8 * xStep, tlut);
+
+		}
+		else if (tlutfmt == GX_TL_RGB565)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C8_RGB565(dst + (y + iy) * width + x, src + 8 * xStep, tlut);
+
+		}
+		break;
+	case GX_TF_IA4:
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_IA4(dst + (y + iy) * width + x, src + 8 * xStep);
+		}
+		break;
+	case GX_TF_IA8:
+		{
+#if _M_SSE >= 0x301
+			// xsacha optimized with SSSE3 intrinsics.
+			// Produces an ~50% speed improvement over SSE2 implementation.
+			if (cpu_info.bSSSE3)
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						{
+							const __m128i mask = _mm_set_epi8(6, 7, 7, 7, 4, 5, 5, 5, 2, 3, 3, 3, 0, 1, 1, 1);
+							// Load 4x 16-bit IA8 samples from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src + 8 * xStep));
+							// Shuffle to (ghhh efff cddd abbb)
+							const __m128i r1 = _mm_shuffle_epi8(r0, mask);
+							_mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 );
+						}
+			}
+			else
+#endif
+			// JSD optimized with SSE2 intrinsics.
+			// Produces an ~80% speed improvement over reference C implementation.
+			{
+				const __m128i kMask_xf0 = _mm_set_epi32(0x00000000L, 0x00000000L, 0xff00ff00L, 0xff00ff00L);
+				const __m128i kMask_x0f = _mm_set_epi32(0x00000000L, 0x00000000L, 0x00ff00ffL, 0x00ff00ffL);
+				const __m128i kMask_xf000 = _mm_set_epi32(0xff000000L, 0xff000000L, 0xff000000L, 0xff000000L);
+				const __m128i kMask_x0fff = _mm_set_epi32(0x00ffffffL, 0x00ffffffL, 0x00ffffffL, 0x00ffffffL);
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						{
+							// Expands a 16-bit "IA" to a 32-bit "AIII". Each char is an 8-bit value.
+
+							// Load 4x 16-bit IA8 samples from `src` into an __m128i with upper 64 bits zeroed: (0000 0000 hgfe dcba)
+							const __m128i r0 = _mm_loadl_epi64((const __m128i *)(src+ 8 * xStep));
+
+							// Logical shift all 16-bit words right by 8 bits (0000 0000 hgfe dcba) to (0000 0000 0h0f 0d0b)
+							// This gets us only the I components.
+							const __m128i i0 = _mm_srli_epi16(r0, 8);
+
+							// Now join up the I components from their original positions but mask out the A components.
+							// (0000 0000 hgfe dcba) &      kMask_xFF00      -> (0000 0000 h0f0 d0b0)
+							// (0000 0000 h0f0 d0b0) | (0000 0000 0h0f 0d0b) -> (0000 0000 hhff ddbb)
+							const __m128i i1 = _mm_or_si128(_mm_and_si128(r0, kMask_xf0), i0);
+
+							// Shuffle low 64-bits with itself to expand from (0000 0000 hhff ddbb) to (hhhh ffff dddd bbbb)
+							const __m128i i2 = _mm_unpacklo_epi8(i1, i1);
+							// (hhhh ffff dddd bbbb) & kMask_x0fff -> (0hhh 0fff 0ddd 0bbb)
+							const __m128i i3 = _mm_and_si128(i2, kMask_x0fff);
+
+							// Now that we have the I components in 32-bit word form, time work out the A components into
+							// their final positions.
+
+							// (0000 0000 hgfe dcba) &      kMask_x00FF      -> (0000 0000 0g0e 0c0a)
+							const __m128i a0 = _mm_and_si128(r0, kMask_x0f);
+							// (0000 0000 0g0e 0c0a) -> (00gg 00ee 00cc 00aa)
+							const __m128i a1 = _mm_unpacklo_epi8(a0, a0);
+							// (00gg 00ee 00cc 00aa) << 16 -> (gg00 ee00 cc00 aa00)
+							const __m128i a2 = _mm_slli_epi32(a1, 16);
+							// (gg00 ee00 cc00 aa00) & kMask_xf000 -> (g000 e000 c000 a000)
+							const __m128i a3 = _mm_and_si128(a2, kMask_xf000);
+
+							// Simply OR up i3 and a3 now and that's our result:
+							// (0hhh 0fff 0ddd 0bbb) | (g000 e000 c000 a000) -> (ghhh efff cddd abbb)
+							const __m128i r1 = _mm_or_si128(i3, a3);
+
+							// write out the 128-bit result:
+							_mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 );
+						}
+			}
+		}
+		break;
+	case GX_TF_C14X2:
+		if (tlutfmt == GX_TL_RGB5A3)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C14X2_RGB5A3(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlut);
+		}
+		else if (tlutfmt == GX_TL_IA8)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C14X2_IA8(dst + (y + iy) * width + x,  (u16*)(src + 8 * xStep), tlut);
+		}
+		else if (tlutfmt == GX_TL_RGB565)
+		{
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						DecodeBytes_C14X2_RGB565(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlut);
+		}
+		break;
+	case GX_TF_RGB565:
+		{
+			// JSD optimized with SSE2 intrinsics.
+			// Produces an ~78% speed improvement over reference C implementation.
+			const __m128i kMaskR0 = _mm_set1_epi32(0x000000F8);
+			const __m128i kMaskG0 = _mm_set1_epi32(0x0000FC00);
+			const __m128i kMaskG1 = _mm_set1_epi32(0x00000300);
+			const __m128i kMaskB0 = _mm_set1_epi32(0x00F80000);
+			const __m128i kAlpha  = _mm_set1_epi32(0xFF000000);
+			for (int y = 0; y < height; y += 4)
+				for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+					{
+						__m128i *dxtsrc = (__m128i *)(src + 8 * xStep);
+						// Load 4x 16-bit colors: (0000 0000 hgfe dcba)
+						// where hg, fe, ba, and dc are 16-bit colors in big-endian order
+						const __m128i rgb565x4 = _mm_loadl_epi64(dxtsrc);
+
+						// The big-endian 16-bit colors `ba` and `dc` look like 0b_gggBBBbb_RRRrrGGg in a little endian xmm register
+						// Unpack `hgfe dcba` to `hhgg ffee ddcc bbaa`, where each 32-bit word is now 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg
+						const __m128i c0 = _mm_unpacklo_epi16(rgb565x4, rgb565x4);
+
+						// swizzle 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg
+						//      to 0b_11111111_BBBbbBBB_GGggggGG_RRRrrRRR
+
+						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg &
+						// 0b_00000000_00000000_00000000_11111000 =
+						// 0b_00000000_00000000_00000000_RRRrr000
+						const __m128i r0 = _mm_and_si128(c0, kMaskR0);
+						// 0b_00000000_00000000_00000000_RRRrr000 >> 5 [32] =
+						// 0b_00000000_00000000_00000000_00000RRR
+						const __m128i r1 = _mm_srli_epi32(r0, 5);
+
+						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg >> 3 [32] =
+						// 0b_000gggBB_BbbRRRrr_GGggggBB_BbbRRRrr &
+						// 0b_00000000_00000000_11111100_00000000 =
+						// 0b_00000000_00000000_GGgggg00_00000000
+						const __m128i gtmp = _mm_srli_epi32(c0, 3);
+						const __m128i g0 = _mm_and_si128(gtmp, kMaskG0);
+						// 0b_GGggggBB_BbbRRRrr_GGggggBB_Bbb00000 >> 6 [32] =
+						// 0b_000000GG_ggggBBBb_bRRRrrGG_ggggBBBb &
+						// 0b_00000000_00000000_00000011_00000000 =
+						// 0b_00000000_00000000_000000GG_00000000 =
+						const __m128i g1 = _mm_and_si128(_mm_srli_epi32(gtmp, 6), kMaskG1);
+
+						// 0b_gggBBBbb_RRRrrGGg_gggBBBbb_RRRrrGGg >> 5 [32] =
+						// 0b_00000ggg_BBBbbRRR_rrGGgggg_BBBbbRRR &
+						// 0b_00000000_11111000_00000000_00000000 =
+						// 0b_00000000_BBBbb000_00000000_00000000
+						const __m128i b0 = _mm_and_si128(_mm_srli_epi32(c0, 5), kMaskB0);
+						// 0b_00000000_BBBbb000_00000000_00000000 >> 5 [16] =
+						// 0b_00000000_00000BBB_00000000_00000000
+						const __m128i b1 = _mm_srli_epi16(b0, 5);
+
+						// OR together the final RGB bits and the alpha component:
+						const __m128i abgr888x4 = _mm_or_si128(
+							_mm_or_si128(
+								_mm_or_si128(r0, r1),
+								_mm_or_si128(g0, g1)
+							),
+							_mm_or_si128(
+								_mm_or_si128(b0, b1),
+								kAlpha
+							)
+						);
+
+						__m128i *ptr = (__m128i *)(dst + (y + iy) * width + x);
+						_mm_storeu_si128(ptr, abgr888x4);
+					}
+		}
+		break;
+	case GX_TF_RGB5A3:
+		{
+			const __m128i kMask_x1f = _mm_set1_epi32(0x0000001fL);
+			const __m128i kMask_x0f = _mm_set1_epi32(0x0000000fL);
+			const __m128i kMask_x07 = _mm_set1_epi32(0x00000007L);
+			// This is the hard-coded 0xFF alpha constant that is ORed in place after the RGB are calculated
+			// for the RGB555 case when (s[x] & 0x8000) is true for all pixels.
+			const __m128i aVxff00   = _mm_set1_epi32(0xFF000000L);
+
+#if _M_SSE >= 0x301
+			// xsacha optimized with SSSE3 intrinsics (2 in 4 cases)
+			// Produces a ~10% speed improvement over SSE2 implementation
+			if (cpu_info.bSSSE3)
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						{
+							u32 *newdst = dst+(y+iy)*width+x;
+							const __m128i mask = _mm_set_epi8(-128,-128,6,7,-128,-128,4,5,-128,-128,2,3,-128,-128,0,1);
+								const __m128i valV = _mm_shuffle_epi8(_mm_loadl_epi64((const __m128i*)(src + 8 * xStep)),mask);
+								int cmp = _mm_movemask_epi8(valV); //MSB: 0x2 = val0; 0x20=val1; 0x200 = val2; 0x2000=val3
+								if ((cmp&0x2222)==0x2222) // SSSE3 case #1: all 4 pixels are in RGB555 and alpha = 0xFF.
+								{
+									// Swizzle bits: 00012345 -> 12345123
+
+									//r0 = (((val0>>10) & 0x1f) << 3) | (((val0>>10) & 0x1f) >> 2);
+									const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 10), kMask_x1f);
+									const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 3), _mm_srli_epi16(tmprV, 2) );
+
+									//g0 = (((val0>>5 ) & 0x1f) << 3) | (((val0>>5 ) & 0x1f) >> 2);
+									const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 5), kMask_x1f);
+									const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 3), _mm_srli_epi16(tmpgV, 2) );
+
+									//b0 = (((val0    ) & 0x1f) << 3) | (((val0    ) & 0x1f) >> 2);
+									const __m128i tmpbV = _mm_and_si128(valV, kMask_x1f);
+									const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) );
+
+									//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
+									const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
+														_mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00));
+									_mm_storeu_si128( (__m128i*)newdst, final );
+								}
+								else if (!(cmp&0x2222)) // SSSE3 case #2: all 4 pixels are in RGBA4443.
+								{
+									// Swizzle bits: 00001234 -> 12341234
+
+									//r0 = (((val0>>8 ) & 0xf) << 4) | ((val0>>8 ) & 0xf);
+									const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 8), kMask_x0f);
+									const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 4), tmprV );
+
+									//g0 = (((val0>>4 ) & 0xf) << 4) | ((val0>>4 ) & 0xf);
+									const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 4), kMask_x0f);
+									const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 4), tmpgV );
+
+									//b0 = (((val0    ) & 0xf) << 4) | ((val0    ) & 0xf);
+									const __m128i tmpbV = _mm_and_si128(valV, kMask_x0f);
+									const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 4), tmpbV );
+									//a0 = (((val0>>12) & 0x7) << 5) | (((val0>>12) & 0x7) << 2) | (((val0>>12) & 0x7) >> 1);
+									const __m128i tmpaV = _mm_and_si128(_mm_srli_epi16(valV, 12), kMask_x07);
+									const __m128i aV = _mm_or_si128(
+										_mm_slli_epi16(tmpaV, 5),
+										_mm_or_si128(
+											_mm_slli_epi16(tmpaV, 2),
+											_mm_srli_epi16(tmpaV, 1)
+										)
+									);
+
+									//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
+									const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
+																_mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24)));
+									_mm_storeu_si128( (__m128i*)newdst, final );
+								}
+								else
+								{
+									// TODO: Vectorise (Either 4-way branch or do both and select is better than this)
+									u32 *vals = (u32*) &valV;
+									int r,g,b,a;
+									for (int i=0; i < 4; ++i)
+									{
+										if (vals[i] & 0x8000)
+										{
+											// Swizzle bits: 00012345 -> 12345123
+											r = (((vals[i]>>10) & 0x1f) << 3) | (((vals[i]>>10) & 0x1f) >> 2);
+											g = (((vals[i]>>5 ) & 0x1f) << 3) | (((vals[i]>>5 ) & 0x1f) >> 2);
+											b = (((vals[i]    ) & 0x1f) << 3) | (((vals[i]    ) & 0x1f) >> 2);
+											a = 0xFF;
+										}
+										else
+										{
+											a = (((vals[i]>>12) & 0x7) << 5) | (((vals[i]>>12) & 0x7) << 2) | (((vals[i]>>12) & 0x7) >> 1);
+											// Swizzle bits: 00001234 -> 12341234
+											r = (((vals[i]>>8 ) & 0xf) << 4) | ((vals[i]>>8 ) & 0xf);
+											g = (((vals[i]>>4 ) & 0xf) << 4) | ((vals[i]>>4 ) & 0xf);
+											b = (((vals[i]    ) & 0xf) << 4) | ((vals[i]    ) & 0xf);
+										}
+										newdst[i] = r | (g << 8) | (b << 16) | (a << 24);
+									}
+								}
+						}
+			}
+			else
+#endif
+			// JSD optimized with SSE2 intrinsics (2 in 4 cases)
+			// Produces a ~25% speed improvement over reference C implementation.
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+						for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++)
+						{
+							u32 *newdst = dst+(y+iy)*width+x;
+							const u16 *newsrc = (const u16*)(src + 8 * xStep);
+
+							// TODO: weak point
+							const u16 val0 = Common::swap16(newsrc[0]);
+							const u16 val1 = Common::swap16(newsrc[1]);
+							const u16 val2 = Common::swap16(newsrc[2]);
+							const u16 val3 = Common::swap16(newsrc[3]);
+
+							const __m128i valV = _mm_set_epi16(0, val3, 0, val2, 0, val1, 0, val0);
+
+							// Need to check all 4 pixels' MSBs to ensure we can do data-parallelism:
+							if (((val0 & 0x8000) & (val1 & 0x8000) & (val2 & 0x8000) & (val3 & 0x8000)) == 0x8000)
+							{
+								// SSE2 case #1: all 4 pixels are in RGB555 and alpha = 0xFF.
+
+								// Swizzle bits: 00012345 -> 12345123
+
+								//r0 = (((val0>>10) & 0x1f) << 3) | (((val0>>10) & 0x1f) >> 2);
+								const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 10), kMask_x1f);
+								const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 3), _mm_srli_epi16(tmprV, 2) );
+
+								//g0 = (((val0>>5 ) & 0x1f) << 3) | (((val0>>5 ) & 0x1f) >> 2);
+								const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 5), kMask_x1f);
+								const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 3), _mm_srli_epi16(tmpgV, 2) );
+
+								//b0 = (((val0    ) & 0x1f) << 3) | (((val0    ) & 0x1f) >> 2);
+								const __m128i tmpbV = _mm_and_si128(valV, kMask_x1f);
+								const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) );
+
+								//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
+								const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
+													_mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00));
+
+								// write the final result:
+								_mm_storeu_si128( (__m128i*)newdst, final );
+							}
+							else if (((val0 & 0x8000) | (val1 & 0x8000) | (val2 & 0x8000) | (val3 & 0x8000)) == 0x0000)
+							{
+								// SSE2 case #2: all 4 pixels are in RGBA4443.
+
+								// Swizzle bits: 00001234 -> 12341234
+
+								//r0 = (((val0>>8 ) & 0xf) << 4) | ((val0>>8 ) & 0xf);
+								const __m128i tmprV = _mm_and_si128(_mm_srli_epi16(valV, 8), kMask_x0f);
+								const __m128i rV = _mm_or_si128( _mm_slli_epi16(tmprV, 4), tmprV );
+
+								//g0 = (((val0>>4 ) & 0xf) << 4) | ((val0>>4 ) & 0xf);
+								const __m128i tmpgV = _mm_and_si128(_mm_srli_epi16(valV, 4), kMask_x0f);
+								const __m128i gV = _mm_or_si128( _mm_slli_epi16(tmpgV, 4), tmpgV );
+
+								//b0 = (((val0    ) & 0xf) << 4) | ((val0    ) & 0xf);
+								const __m128i tmpbV = _mm_and_si128(valV, kMask_x0f);
+								const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 4), tmpbV );
+
+								//a0 = (((val0>>12) & 0x7) << 5) | (((val0>>12) & 0x7) << 2) | (((val0>>12) & 0x7) >> 1);
+								const __m128i tmpaV = _mm_and_si128(_mm_srli_epi16(valV, 12), kMask_x07);
+								const __m128i aV = _mm_or_si128(
+									_mm_slli_epi16(tmpaV, 5),
+									_mm_or_si128(
+										_mm_slli_epi16(tmpaV, 2),
+										_mm_srli_epi16(tmpaV, 1)
+									)
+								);
+
+								//newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24);
+								const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)),
+													_mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24)));
+
+								// write the final result:
+								_mm_storeu_si128( (__m128i*)newdst, final );
+							}
+							else
+							{
+								// TODO: Vectorise (Either 4-way branch or do both and select is better than this)
+								u32 *vals = (u32*) &valV;
+								int r,g,b,a;
+								for (int i=0; i < 4; ++i)
+								{
+									if (vals[i] & 0x8000)
+									{
+										// Swizzle bits: 00012345 -> 12345123
+										r = (((vals[i]>>10) & 0x1f) << 3) | (((vals[i]>>10) & 0x1f) >> 2);
+										g = (((vals[i]>>5 ) & 0x1f) << 3) | (((vals[i]>>5 ) & 0x1f) >> 2);
+										b = (((vals[i]    ) & 0x1f) << 3) | (((vals[i]    ) & 0x1f) >> 2);
+										a = 0xFF;
+									}
+									else
+									{
+										a = (((vals[i]>>12) & 0x7) << 5) | (((vals[i]>>12) & 0x7) << 2) | (((vals[i]>>12) & 0x7) >> 1);
+										// Swizzle bits: 00001234 -> 12341234
+										r = (((vals[i]>>8 ) & 0xf) << 4) | ((vals[i]>>8 ) & 0xf);
+										g = (((vals[i]>>4 ) & 0xf) << 4) | ((vals[i]>>4 ) & 0xf);
+										b = (((vals[i]    ) & 0xf) << 4) | ((vals[i]    ) & 0xf);
+									}
+									newdst[i] = r | (g << 8) | (b << 16) | (a << 24);
+								}
+							}
+						}
+				}
+		}
+		break;
+	case GX_TF_RGBA8:  // speed critical
+		{
+#if _M_SSE >= 0x301
+			// xsacha optimized with SSSE3 instrinsics
+			// Produces a ~30% speed improvement over SSE2 implementation
+			if (cpu_info.bSSSE3)
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					{
+						const u8* src2 = src + 64 * yStep;
+						const __m128i mask0312 = _mm_set_epi8(12,15,13,14,8,11,9,10,4,7,5,6,0,3,1,2);
+						const __m128i ar0 = _mm_loadu_si128((__m128i*)src2);
+						const __m128i ar1 = _mm_loadu_si128((__m128i*)src2+1);
+						const __m128i gb0 = _mm_loadu_si128((__m128i*)src2+2);
+						const __m128i gb1 = _mm_loadu_si128((__m128i*)src2+3);
+
+
+						const __m128i rgba00 = _mm_shuffle_epi8(_mm_unpacklo_epi8(ar0,gb0),mask0312);
+						const __m128i rgba01 = _mm_shuffle_epi8(_mm_unpackhi_epi8(ar0,gb0),mask0312);
+						const __m128i rgba10 = _mm_shuffle_epi8(_mm_unpacklo_epi8(ar1,gb1),mask0312);
+						const __m128i rgba11 = _mm_shuffle_epi8(_mm_unpackhi_epi8(ar1,gb1),mask0312);
+
+						__m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x );
+						_mm_storeu_si128(dst128, rgba00);
+						dst128 = (__m128i*)( dst + (y + 1) * width + x );
+						_mm_storeu_si128(dst128, rgba01);
+						dst128 = (__m128i*)( dst + (y + 2) * width + x );
+						_mm_storeu_si128(dst128, rgba10);
+						dst128 = (__m128i*)( dst + (y + 3) * width + x );
+						_mm_storeu_si128(dst128, rgba11);
+					}
+			}
+			else
+#endif
+			// JSD optimized with SSE2 intrinsics
+			// Produces a ~68% speed improvement over reference C implementation.
+			{
+				for (int y = 0; y < height; y += 4)
+					for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++)
+					{
+						// Input is divided up into 16-bit words. The texels are split up into AR and GB components where all
+						// AR components come grouped up first in 32 bytes followed by the GB components in 32 bytes. We are
+						// processing 16 texels per each loop iteration, numbered from 0-f.
+						//
+						// Convention is:
+						//   one byte is [component-name texel-number]
+						//    __m128i is (4-bytes 4-bytes 4-bytes 4-bytes)
+						//
+						// Input  is ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0])
+						//           ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8])
+						//           ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0])
+						//           ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8])
+						//
+						// Output is (RGBA3 RGBA2 RGBA1 RGBA0)
+						//           (RGBA7 RGBA6 RGBA5 RGBA4)
+						//           (RGBAb RGBAa RGBA9 RGBA8)
+						//           (RGBAf RGBAe RGBAd RGBAc)
+						const u8* src2 = src + 64 * yStep;
+						// Loads the 1st half of AR components ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0])
+						const __m128i ar0 = _mm_loadu_si128((__m128i*)src2);
+						// Loads the 2nd half of AR components ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8])
+						const __m128i ar1 = _mm_loadu_si128((__m128i*)src2+1);
+						// Loads the 1st half of GB components ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0])
+						const __m128i gb0 = _mm_loadu_si128((__m128i*)src2+2);
+						// Loads the 2nd half of GB components ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8])
+						const __m128i gb1 = _mm_loadu_si128((__m128i*)src2+3);
+						__m128i rgba00, rgba01, rgba10, rgba11;
+						const __m128i kMask_x000f = _mm_set_epi32(0x000000FFL, 0x000000FFL, 0x000000FFL, 0x000000FFL);
+						const __m128i kMask_xf000 = _mm_set_epi32(0xFF000000L, 0xFF000000L, 0xFF000000L, 0xFF000000L);
+						const __m128i kMask_x0ff0 = _mm_set_epi32(0x00FFFF00L, 0x00FFFF00L, 0x00FFFF00L, 0x00FFFF00L);
+						// Expand the AR components to fill out 32-bit words:
+						// ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0]) -> ([A 3][A 3][R 3][R 3] [A 2][A 2][R 2][R 2] [A 1][A 1][R 1][R 1] [A 0][A 0][R 0][R 0])
+						const __m128i aarr00 = _mm_unpacklo_epi8(ar0, ar0);
+						// ([A 7][R 7][A 6][R 6] [A 5][R 5][A 4][R 4] [A 3][R 3][A 2][R 2] [A 1][R 1][A 0][R 0]) -> ([A 7][A 7][R 7][R 7] [A 6][A 6][R 6][R 6] [A 5][A 5][R 5][R 5] [A 4][A 4][R 4][R 4])
+						const __m128i aarr01 = _mm_unpackhi_epi8(ar0, ar0);
+						// ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8]) -> ([A b][A b][R b][R b] [A a][A a][R a][R a] [A 9][A 9][R 9][R 9] [A 8][A 8][R 8][R 8])
+						const __m128i aarr10 = _mm_unpacklo_epi8(ar1, ar1);
+						// ([A f][R f][A e][R e] [A d][R d][A c][R c] [A b][R b][A a][R a] [A 9][R 9][A 8][R 8]) -> ([A f][A f][R f][R f] [A e][A e][R e][R e] [A d][A d][R d][R d] [A c][A c][R c][R c])
+						const __m128i aarr11 = _mm_unpackhi_epi8(ar1, ar1);
+
+						// Move A right 16 bits and mask off everything but the lowest  8 bits to get A in its final place:
+						const __m128i ___a00 = _mm_and_si128(_mm_srli_epi32(aarr00, 16), kMask_x000f);
+						// Move R left  16 bits and mask off everything but the highest 8 bits to get R in its final place:
+						const __m128i r___00 = _mm_and_si128(_mm_slli_epi32(aarr00, 16), kMask_xf000);
+						// OR the two together to get R and A in their final places:
+						const __m128i r__a00 = _mm_or_si128(r___00, ___a00);
+
+						const __m128i ___a01 = _mm_and_si128(_mm_srli_epi32(aarr01, 16), kMask_x000f);
+						const __m128i r___01 = _mm_and_si128(_mm_slli_epi32(aarr01, 16), kMask_xf000);
+						const __m128i r__a01 = _mm_or_si128(r___01, ___a01);
+
+						const __m128i ___a10 = _mm_and_si128(_mm_srli_epi32(aarr10, 16), kMask_x000f);
+						const __m128i r___10 = _mm_and_si128(_mm_slli_epi32(aarr10, 16), kMask_xf000);
+						const __m128i r__a10 = _mm_or_si128(r___10, ___a10);
+
+						const __m128i ___a11 = _mm_and_si128(_mm_srli_epi32(aarr11, 16), kMask_x000f);
+						const __m128i r___11 = _mm_and_si128(_mm_slli_epi32(aarr11, 16), kMask_xf000);
+						const __m128i r__a11 = _mm_or_si128(r___11, ___a11);
+
+						// Expand the GB components to fill out 32-bit words:
+						// ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0]) -> ([G 3][G 3][B 3][B 3] [G 2][G 2][B 2][B 2] [G 1][G 1][B 1][B 1] [G 0][G 0][B 0][B 0])
+						const __m128i ggbb00 = _mm_unpacklo_epi8(gb0, gb0);
+						// ([G 7][B 7][G 6][B 6] [G 5][B 5][G 4][B 4] [G 3][B 3][G 2][B 2] [G 1][B 1][G 0][B 0]) -> ([G 7][G 7][B 7][B 7] [G 6][G 6][B 6][B 6] [G 5][G 5][B 5][B 5] [G 4][G 4][B 4][B 4])
+						const __m128i ggbb01 = _mm_unpackhi_epi8(gb0, gb0);
+						// ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8]) -> ([G b][G b][B b][B b] [G a][G a][B a][B a] [G 9][G 9][B 9][B 9] [G 8][G 8][B 8][B 8])
+						const __m128i ggbb10 = _mm_unpacklo_epi8(gb1, gb1);
+						// ([G f][B f][G e][B e] [G d][B d][G c][B c] [G b][B b][G a][B a] [G 9][B 9][G 8][B 8]) -> ([G f][G f][B f][B f] [G e][G e][B e][B e] [G d][G d][B d][B d] [G c][G c][B c][B c])
+						const __m128i ggbb11 = _mm_unpackhi_epi8(gb1, gb1);
+
+						// G and B are already in perfect spots in the center, just remove the extra copies in the 1st and 4th positions:
+						const __m128i _gb_00 = _mm_and_si128(ggbb00, kMask_x0ff0);
+						const __m128i _gb_01 = _mm_and_si128(ggbb01, kMask_x0ff0);
+						const __m128i _gb_10 = _mm_and_si128(ggbb10, kMask_x0ff0);
+						const __m128i _gb_11 = _mm_and_si128(ggbb11, kMask_x0ff0);
+
+						// Now join up R__A and _GB_ to get RGBA!
+						rgba00 = _mm_or_si128(r__a00, _gb_00);
+						rgba01 = _mm_or_si128(r__a01, _gb_01);
+						rgba10 = _mm_or_si128(r__a10, _gb_10);
+						rgba11 = _mm_or_si128(r__a11, _gb_11);
+						// Write em out!
+						__m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x );
+						_mm_storeu_si128(dst128, rgba00);
+						dst128 = (__m128i*)( dst + (y + 1) * width + x );
+						_mm_storeu_si128(dst128, rgba01);
+						dst128 = (__m128i*)( dst + (y + 2) * width + x );
+						_mm_storeu_si128(dst128, rgba10);
+						dst128 = (__m128i*)( dst + (y + 3) * width + x );
+						_mm_storeu_si128(dst128, rgba11);
+					}
+			}
+		}
+		break;
+	case GX_TF_CMPR:  // speed critical
+		// The metroid games use this format almost exclusively.
+		{
+			// JSD optimized with SSE2 intrinsics.
+			// Produces a ~50% improvement for x86 and a ~40% improvement for x64 in speed over reference C implementation.
+			// The x64 compiled reference C code is faster than the x86 compiled reference C code, but the SSE2 is
+			// faster than both.
+			for (int y = 0; y < height; y += 8)
+			{
+				for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++)
+				{
+					// We handle two DXT blocks simultaneously to take full advantage of SSE2's 128-bit registers.
+					// This is ideal because a single DXT block contains 2 RGBA colors when decoded from their 16-bit.
+					// Two DXT blocks therefore contain 4 RGBA colors to be processed. The processing is parallelizable
+					// at this level, so we do.
+					for (int z = 0, xStep = 2 * yStep; z < 2; ++z, xStep++)
+					{
+						// JSD NOTE: You may see many strange patterns of behavior in the below code, but they
+						// are for performance reasons. Sometimes, calculating what should be obvious hard-coded
+						// constants is faster than loading their values from memory. Unfortunately, there is no
+						// way to inline 128-bit constants from opcodes so they must be loaded from memory. This
+						// seems a little ridiculous to me in that you can't even generate a constant value of 1 without
+						// having to load it from memory. So, I stored the minimal constant I could, 128-bits worth
+						// of 1s :). Then I use sequences of shifts to squash it to the appropriate size and bit
+						// positions that I need.
+
+						const __m128i allFFs128 = _mm_cmpeq_epi32(_mm_setzero_si128(), _mm_setzero_si128());
+
+						// Load 128 bits, i.e. two DXTBlocks (64-bits each)
+						const __m128i dxt = _mm_loadu_si128((__m128i *)(src + sizeof(struct DXTBlock) * 2 * xStep));
+
+						// Copy the 2-bit indices from each DXT block:
+						GC_ALIGNED16( u32 dxttmp[4] );
+						_mm_store_si128((__m128i *)dxttmp, dxt);
+
+						u32 dxt0sel = dxttmp[1];
+						u32 dxt1sel = dxttmp[3];
+
+						__m128i argb888x4;
+						__m128i c1 = _mm_unpackhi_epi16(dxt, dxt);
+						c1 = _mm_slli_si128(c1, 8);
+						const __m128i c0 = _mm_or_si128(c1, _mm_srli_si128(_mm_slli_si128(_mm_unpacklo_epi16(dxt, dxt), 8), 8));
+
+						// Compare rgb0 to rgb1:
+						// Each 32-bit word will contain either 0xFFFFFFFF or 0x00000000 for true/false.
+						const __m128i c0cmp = _mm_srli_epi32(_mm_slli_epi32(_mm_srli_epi64(c0, 8), 16), 16);
+						const __m128i c0shr = _mm_srli_epi64(c0cmp, 32);
+						const __m128i cmprgb0rgb1 = _mm_cmpgt_epi32(c0cmp, c0shr);
+
+						int cmp0 = _mm_extract_epi16(cmprgb0rgb1, 0);
+						int cmp1 = _mm_extract_epi16(cmprgb0rgb1, 4);
+
+						// green:
+						// NOTE: We start with the larger number of bits (6) firts for G and shift the mask down 1 bit to get a 5-bit mask
+						// later for R and B components.
+						// low6mask == _mm_set_epi32(0x0000FC00, 0x0000FC00, 0x0000FC00, 0x0000FC00)
+						const __m128i low6mask = _mm_slli_epi32( _mm_srli_epi32(allFFs128, 24 + 2), 8 + 2);
+						const __m128i gtmp = _mm_srli_epi32(c0, 3);
+						const __m128i g0 = _mm_and_si128(gtmp, low6mask);
+						// low3mask == _mm_set_epi32(0x00000300, 0x00000300, 0x00000300, 0x00000300)
+						const __m128i g1 = _mm_and_si128(_mm_srli_epi32(gtmp, 6), _mm_set_epi32(0x00000300, 0x00000300, 0x00000300, 0x00000300));
+						argb888x4 = _mm_or_si128(g0, g1);
+						// red:
+						// low5mask == _mm_set_epi32(0x000000F8, 0x000000F8, 0x000000F8, 0x000000F8)
+						const __m128i low5mask = _mm_slli_epi32( _mm_srli_epi32(low6mask, 8 + 3), 3);
+						const __m128i r0 = _mm_and_si128(c0, low5mask);
+						const __m128i r1 = _mm_srli_epi32(r0, 5);
+						argb888x4 = _mm_or_si128(argb888x4, _mm_or_si128(r0, r1));
+						// blue:
+						// _mm_slli_epi32(low5mask, 16) == _mm_set_epi32(0x00F80000, 0x00F80000, 0x00F80000, 0x00F80000)
+						const __m128i b0 = _mm_and_si128(_mm_srli_epi32(c0, 5), _mm_slli_epi32(low5mask, 16));
+						const __m128i b1 = _mm_srli_epi16(b0, 5);
+						// OR in the fixed alpha component
+						// _mm_slli_epi32( allFFs128, 24 ) == _mm_set_epi32(0xFF000000, 0xFF000000, 0xFF000000, 0xFF000000)
+						argb888x4 = _mm_or_si128(_mm_or_si128(argb888x4, _mm_slli_epi32( allFFs128, 24 ) ), _mm_or_si128(b0, b1));
+						// calculate RGB2 and RGB3:
+						const __m128i rgb0 = _mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(2, 2, 0, 0));
+						const __m128i rgb1 = _mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(3, 3, 1, 1));
+						const __m128i rrggbb0 = _mm_and_si128(_mm_unpacklo_epi8(rgb0, rgb0), _mm_srli_epi16( allFFs128, 8 ));
+						const __m128i rrggbb1 = _mm_and_si128(_mm_unpacklo_epi8(rgb1, rgb1), _mm_srli_epi16( allFFs128, 8 ));
+						const __m128i rrggbb01 = _mm_and_si128(_mm_unpackhi_epi8(rgb0, rgb0), _mm_srli_epi16( allFFs128, 8 ));
+						const __m128i rrggbb11 = _mm_and_si128(_mm_unpackhi_epi8(rgb1, rgb1), _mm_srli_epi16( allFFs128, 8 ));
+
+						__m128i rgb2, rgb3;
+
+						// if (rgb0 > rgb1):
+						if (cmp0 != 0)
+						{
+							// RGB2a = ((RGB1 - RGB0) >> 1) - ((RGB1 - RGB0) >> 3)  using arithmetic shifts to extend sign (not logical shifts)
+							const __m128i rrggbbsub = _mm_subs_epi16(rrggbb1, rrggbb0);
+							const __m128i rrggbbsubshr1 = _mm_srai_epi16(rrggbbsub, 1);
+							const __m128i rrggbbsubshr3 = _mm_srai_epi16(rrggbbsub, 3);
+							const __m128i shr1subshr3 = _mm_sub_epi16(rrggbbsubshr1, rrggbbsubshr3);
+							// low8mask16 == _mm_set_epi16(0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff)
+							const __m128i low8mask16 = _mm_srli_epi16( allFFs128, 8 );
+							const __m128i rrggbbdelta = _mm_and_si128(shr1subshr3, low8mask16);
+							const __m128i rgbdeltadup = _mm_packus_epi16(rrggbbdelta, rrggbbdelta);
+							const __m128i rgbdelta = _mm_srli_si128(_mm_slli_si128(rgbdeltadup, 8), 8);
+
+							rgb2 = _mm_and_si128(_mm_add_epi8(rgb0, rgbdelta), _mm_srli_si128(allFFs128, 8));
+							rgb3 = _mm_and_si128(_mm_sub_epi8(rgb1, rgbdelta), _mm_srli_si128(allFFs128, 8));
+						}
+						else
+						{
+							// RGB2b = avg(RGB0, RGB1)
+							const __m128i rrggbb21  = _mm_avg_epu16(rrggbb0, rrggbb1);
+							const __m128i rgb210 = _mm_srli_si128(_mm_packus_epi16(rrggbb21, rrggbb21), 8);
+							rgb2 = rgb210;
+							rgb3 = _mm_and_si128(_mm_srli_si128(_mm_shuffle_epi32(argb888x4, _MM_SHUFFLE(1, 1, 1, 1)), 8), _mm_srli_epi32( allFFs128, 8 ));
+						}
+
+						// if (rgb0 > rgb1):
+						if (cmp1 != 0)
+						{
+							// RGB2a = ((RGB1 - RGB0) >> 1) - ((RGB1 - RGB0) >> 3)  using arithmetic shifts to extend sign (not logical shifts)
+							const __m128i rrggbbsub1 = _mm_subs_epi16(rrggbb11, rrggbb01);
+							const __m128i rrggbbsubshr11 = _mm_srai_epi16(rrggbbsub1, 1);
+							const __m128i rrggbbsubshr31 = _mm_srai_epi16(rrggbbsub1, 3);
+							const __m128i shr1subshr31 = _mm_sub_epi16(rrggbbsubshr11, rrggbbsubshr31);
+							// low8mask16 == _mm_set_epi16(0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff)
+							const __m128i low8mask16 = _mm_srli_epi16( allFFs128, 8 );
+							const __m128i rrggbbdelta1 = _mm_and_si128(shr1subshr31, low8mask16);
+							__m128i rgbdelta1 = _mm_packus_epi16(rrggbbdelta1, rrggbbdelta1);
+							rgbdelta1 = _mm_slli_si128(rgbdelta1, 8);
+
+							rgb2 = _mm_or_si128(rgb2, _mm_and_si128(_mm_add_epi8(rgb0, rgbdelta1), _mm_slli_si128(allFFs128, 8)));
+							rgb3 = _mm_or_si128(rgb3, _mm_and_si128(_mm_sub_epi8(rgb1, rgbdelta1), _mm_slli_si128(allFFs128, 8)));
+						}
+						else
+						{
+							// RGB2b = avg(RGB0, RGB1)
+							const __m128i rrggbb211 = _mm_avg_epu16(rrggbb01, rrggbb11);
+							const __m128i rgb211 = _mm_slli_si128(_mm_packus_epi16(rrggbb211, rrggbb211), 8);
+							rgb2 = _mm_or_si128(rgb2, rgb211);
+
+							// _mm_srli_epi32( allFFs128, 8 ) == _mm_set_epi32(0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF)
+							// Make this color fully transparent:
+							rgb3 = _mm_or_si128(rgb3, _mm_and_si128(_mm_and_si128(rgb1, _mm_srli_epi32( allFFs128, 8 ) ), _mm_slli_si128(allFFs128, 8)));
+						}
+
+						// Create an array for color lookups for DXT0 so we can use the 2-bit indices:
+						const __m128i mmcolors0 = _mm_or_si128(
+							_mm_or_si128(
+								_mm_srli_si128(_mm_slli_si128(argb888x4, 8), 8),
+								_mm_slli_si128(_mm_srli_si128(_mm_slli_si128(rgb2, 8), 8 + 4), 8)
+							),
+							_mm_slli_si128(_mm_srli_si128(rgb3, 4), 8 + 4)
+						);
+
+						// Create an array for color lookups for DXT1 so we can use the 2-bit indices:
+						const __m128i mmcolors1 = _mm_or_si128(
+							_mm_or_si128(
+								_mm_srli_si128(argb888x4, 8),
+								_mm_slli_si128(_mm_srli_si128(rgb2, 8 + 4), 8)
+							),
+							_mm_slli_si128(_mm_srli_si128(rgb3, 8 + 4), 8 + 4)
+						);
+
+						// The #ifdef CHECKs here and below are to compare correctness of output against the reference code.
+						// Don't use them in a normal build.
+#ifdef CHECK
+						// REFERENCE:
+						u32 tmp0[4][4], tmp1[4][4];
+
+						DecodeDXTBlock(&(tmp0[0][0]), (const DXTBlock *)src, 4);
+						DecodeDXTBlock(&(tmp1[0][0]), (const DXTBlock *)(src + 8), 4);
+#endif
+
+						u32 *dst32 = ( dst + (y + z*4) * width + x );
+
+						// Copy the colors here:
+						GC_ALIGNED16( u32 colors0[4] );
+						GC_ALIGNED16( u32 colors1[4] );
+						_mm_store_si128((__m128i *)colors0, mmcolors0);
+						_mm_store_si128((__m128i *)colors1, mmcolors1);
+
+						// Row 0:
+						dst32[(width * 0) + 0] = colors0[(dxt0sel >> ((0*8)+6)) & 3];
+						dst32[(width * 0) + 1] = colors0[(dxt0sel >> ((0*8)+4)) & 3];
+						dst32[(width * 0) + 2] = colors0[(dxt0sel >> ((0*8)+2)) & 3];
+						dst32[(width * 0) + 3] = colors0[(dxt0sel >> ((0*8)+0)) & 3];
+						dst32[(width * 0) + 4] = colors1[(dxt1sel >> ((0*8)+6)) & 3];
+						dst32[(width * 0) + 5] = colors1[(dxt1sel >> ((0*8)+4)) & 3];
+						dst32[(width * 0) + 6] = colors1[(dxt1sel >> ((0*8)+2)) & 3];
+						dst32[(width * 0) + 7] = colors1[(dxt1sel >> ((0*8)+0)) & 3];
+#ifdef CHECK
+						assert( memcmp(&(tmp0[0]), &dst32[(width * 0)], 16) == 0 );
+						assert( memcmp(&(tmp1[0]), &dst32[(width * 0) + 4], 16) == 0 );
+#endif
+						// Row 1:
+						dst32[(width * 1) + 0] = colors0[(dxt0sel >> ((1*8)+6)) & 3];
+						dst32[(width * 1) + 1] = colors0[(dxt0sel >> ((1*8)+4)) & 3];
+						dst32[(width * 1) + 2] = colors0[(dxt0sel >> ((1*8)+2)) & 3];
+						dst32[(width * 1) + 3] = colors0[(dxt0sel >> ((1*8)+0)) & 3];
+						dst32[(width * 1) + 4] = colors1[(dxt1sel >> ((1*8)+6)) & 3];
+						dst32[(width * 1) + 5] = colors1[(dxt1sel >> ((1*8)+4)) & 3];
+						dst32[(width * 1) + 6] = colors1[(dxt1sel >> ((1*8)+2)) & 3];
+						dst32[(width * 1) + 7] = colors1[(dxt1sel >> ((1*8)+0)) & 3];
+#ifdef CHECK
+						assert( memcmp(&(tmp0[1]), &dst32[(width * 1)], 16) == 0 );
+						assert( memcmp(&(tmp1[1]), &dst32[(width * 1) + 4], 16) == 0 );
+#endif
+						// Row 2:
+						dst32[(width * 2) + 0] = colors0[(dxt0sel >> ((2*8)+6)) & 3];
+						dst32[(width * 2) + 1] = colors0[(dxt0sel >> ((2*8)+4)) & 3];
+						dst32[(width * 2) + 2] = colors0[(dxt0sel >> ((2*8)+2)) & 3];
+						dst32[(width * 2) + 3] = colors0[(dxt0sel >> ((2*8)+0)) & 3];
+						dst32[(width * 2) + 4] = colors1[(dxt1sel >> ((2*8)+6)) & 3];
+						dst32[(width * 2) + 5] = colors1[(dxt1sel >> ((2*8)+4)) & 3];
+						dst32[(width * 2) + 6] = colors1[(dxt1sel >> ((2*8)+2)) & 3];
+						dst32[(width * 2) + 7] = colors1[(dxt1sel >> ((2*8)+0)) & 3];
+#ifdef CHECK
+						assert( memcmp(&(tmp0[2]), &dst32[(width * 2)], 16) == 0 );
+						assert( memcmp(&(tmp1[2]), &dst32[(width * 2) + 4], 16) == 0 );
+#endif
+						// Row 3:
+						dst32[(width * 3) + 0] = colors0[(dxt0sel >> ((3*8)+6)) & 3];
+						dst32[(width * 3) + 1] = colors0[(dxt0sel >> ((3*8)+4)) & 3];
+						dst32[(width * 3) + 2] = colors0[(dxt0sel >> ((3*8)+2)) & 3];
+						dst32[(width * 3) + 3] = colors0[(dxt0sel >> ((3*8)+0)) & 3];
+						dst32[(width * 3) + 4] = colors1[(dxt1sel >> ((3*8)+6)) & 3];
+						dst32[(width * 3) + 5] = colors1[(dxt1sel >> ((3*8)+4)) & 3];
+						dst32[(width * 3) + 6] = colors1[(dxt1sel >> ((3*8)+2)) & 3];
+						dst32[(width * 3) + 7] = colors1[(dxt1sel >> ((3*8)+0)) & 3];
+#ifdef CHECK
+						assert( memcmp(&(tmp0[3]), &dst32[(width * 3)], 16) == 0 );
+						assert( memcmp(&(tmp1[3]), &dst32[(width * 3) + 4], 16) == 0 );
+#endif
+					}
+				}
+			}
+			break;
+		}
+	}
+}
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp
new file mode 100644
index 0000000000..b8c8fab4de
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader.cpp
@@ -0,0 +1,333 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+#include "Common/MemoryUtil.h"
+
+#include "Core/Host.h"
+
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Color.h"
+#include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoader_Position.h"
+#include "VideoCommon/VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+// This pointer is used as the source/dst for all fixed function loader calls
+u8* g_video_buffer_read_ptr;
+u8* g_vertex_manager_write_ptr;
+
+static void LOADERDECL PosMtx_ReadDirect_UByte(VertexLoader* loader)
+{
+	u32 posmtx = DataReadU8() & 0x3f;
+	if (loader->m_counter < 3)
+		VertexLoaderManager::position_matrix_index[loader->m_counter] = posmtx;
+	DataWrite<u32>(posmtx);
+	PRIM_LOG("posmtx: %d, ", posmtx);
+}
+
+static void LOADERDECL TexMtx_ReadDirect_UByte(VertexLoader* loader)
+{
+	loader->m_curtexmtx[loader->m_texmtxread] = DataReadU8() & 0x3f;
+
+	PRIM_LOG("texmtx%d: %d, ", loader->m_texmtxread, loader->m_curtexmtx[loader->m_texmtxread]);
+	loader->m_texmtxread++;
+}
+
+static void LOADERDECL TexMtx_Write_Float(VertexLoader* loader)
+{
+	DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
+}
+
+static void LOADERDECL TexMtx_Write_Float2(VertexLoader* loader)
+{
+	DataWrite(0.f);
+	DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
+}
+
+static void LOADERDECL TexMtx_Write_Float3(VertexLoader* loader)
+{
+	DataWrite(0.f);
+	DataWrite(0.f);
+	DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
+}
+
+static void LOADERDECL SkipVertex(VertexLoader* loader)
+{
+	if (loader->m_vertexSkip)
+	{
+		// reset the output buffer
+		g_vertex_manager_write_ptr -= loader->m_native_vtx_decl.stride;
+
+		loader->m_skippedVertices++;
+	}
+}
+
+VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr)
+: VertexLoaderBase(vtx_desc, vtx_attr)
+{
+	VertexLoader_Normal::Init();
+
+	CompileVertexTranslator();
+
+	// generate frac factors
+	m_posScale = 1.0f / (1U << m_VtxAttr.PosFrac);
+	for (int i = 0; i < 8; i++)
+		m_tcScale[i] = 1.0f / (1U << m_VtxAttr.texCoord[i].Frac);
+}
+
+void VertexLoader::CompileVertexTranslator()
+{
+	m_VertexSize = 0;
+	const TVtxAttr &vtx_attr = m_VtxAttr;
+
+	// Reset pipeline
+	m_numPipelineStages = 0;
+
+	// Colors
+	const u64 col[2] = { m_VtxDesc.Color0, m_VtxDesc.Color1 };
+	// TextureCoord
+	const u64 tc[8] = {
+		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
+		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord
+	};
+
+	u32 components = 0;
+
+	// Position in pc vertex format.
+	int nat_offset = 0;
+
+	// Position Matrix Index
+	if (m_VtxDesc.PosMatIdx)
+	{
+		WriteCall(PosMtx_ReadDirect_UByte);
+		components |= VB_HAS_POSMTXIDX;
+		m_native_vtx_decl.posmtx.components = 4;
+		m_native_vtx_decl.posmtx.enable = true;
+		m_native_vtx_decl.posmtx.offset = nat_offset;
+		m_native_vtx_decl.posmtx.type = VAR_UNSIGNED_BYTE;
+		m_native_vtx_decl.posmtx.integer = true;
+		nat_offset += 4;
+		m_VertexSize += 1;
+	}
+
+	if (m_VtxDesc.Tex0MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX0; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex1MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX1; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex2MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX2; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex3MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX3; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex4MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX4; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex5MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX5; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex6MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX6; WriteCall(TexMtx_ReadDirect_UByte); }
+	if (m_VtxDesc.Tex7MatIdx) { m_VertexSize += 1; components |= VB_HAS_TEXMTXIDX7; WriteCall(TexMtx_ReadDirect_UByte); }
+
+	// Write vertex position loader
+	WriteCall(VertexLoader_Position::GetFunction(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements));
+
+	m_VertexSize += VertexLoader_Position::GetSize(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements);
+	int pos_elements = m_VtxAttr.PosElements + 2;
+	m_native_vtx_decl.position.components = pos_elements;
+	m_native_vtx_decl.position.enable = true;
+	m_native_vtx_decl.position.offset = nat_offset;
+	m_native_vtx_decl.position.type = VAR_FLOAT;
+	m_native_vtx_decl.position.integer = false;
+	nat_offset += pos_elements * sizeof(float);
+
+	// Normals
+	if (m_VtxDesc.Normal != NOT_PRESENT)
+	{
+		m_VertexSize += VertexLoader_Normal::GetSize(m_VtxDesc.Normal,
+			m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
+
+		TPipelineFunction pFunc = VertexLoader_Normal::GetFunction(m_VtxDesc.Normal,
+			m_VtxAttr.NormalFormat, m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
+
+		if (pFunc == nullptr)
+		{
+			PanicAlert("VertexLoader_Normal::GetFunction(%i %i %i %i) returned zero!",
+				(u32)m_VtxDesc.Normal, m_VtxAttr.NormalFormat,
+				m_VtxAttr.NormalElements, m_VtxAttr.NormalIndex3);
+		}
+		WriteCall(pFunc);
+
+		for (int i = 0; i < (vtx_attr.NormalElements ? 3 : 1); i++)
+		{
+			m_native_vtx_decl.normals[i].components = 3;
+			m_native_vtx_decl.normals[i].enable = true;
+			m_native_vtx_decl.normals[i].offset = nat_offset;
+			m_native_vtx_decl.normals[i].type = VAR_FLOAT;
+			m_native_vtx_decl.normals[i].integer = false;
+			nat_offset += 12;
+		}
+
+		components |= VB_HAS_NRM0;
+		if (m_VtxAttr.NormalElements == 1)
+			components |= VB_HAS_NRM1 | VB_HAS_NRM2;
+	}
+
+	for (int i = 0; i < 2; i++)
+	{
+		m_native_vtx_decl.colors[i].components = 4;
+		m_native_vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE;
+		m_native_vtx_decl.colors[i].integer = false;
+		switch (col[i])
+		{
+		case NOT_PRESENT:
+			break;
+		case DIRECT:
+			switch (m_VtxAttr.color[i].Comp)
+			{
+			case FORMAT_16B_565:  m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_565); break;
+			case FORMAT_24B_888:  m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_888); break;
+			case FORMAT_32B_888x: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_888x); break;
+			case FORMAT_16B_4444: m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_4444); break;
+			case FORMAT_24B_6666: m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_6666); break;
+			case FORMAT_32B_8888: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_8888); break;
+			default: _assert_(0); break;
+			}
+			break;
+		case INDEX8:
+			m_VertexSize += 1;
+			switch (m_VtxAttr.color[i].Comp)
+			{
+			case FORMAT_16B_565:  WriteCall(Color_ReadIndex8_16b_565); break;
+			case FORMAT_24B_888:  WriteCall(Color_ReadIndex8_24b_888); break;
+			case FORMAT_32B_888x: WriteCall(Color_ReadIndex8_32b_888x); break;
+			case FORMAT_16B_4444: WriteCall(Color_ReadIndex8_16b_4444); break;
+			case FORMAT_24B_6666: WriteCall(Color_ReadIndex8_24b_6666); break;
+			case FORMAT_32B_8888: WriteCall(Color_ReadIndex8_32b_8888); break;
+			default: _assert_(0); break;
+			}
+			break;
+		case INDEX16:
+			m_VertexSize += 2;
+			switch (m_VtxAttr.color[i].Comp)
+			{
+			case FORMAT_16B_565:  WriteCall(Color_ReadIndex16_16b_565); break;
+			case FORMAT_24B_888:  WriteCall(Color_ReadIndex16_24b_888); break;
+			case FORMAT_32B_888x: WriteCall(Color_ReadIndex16_32b_888x); break;
+			case FORMAT_16B_4444: WriteCall(Color_ReadIndex16_16b_4444); break;
+			case FORMAT_24B_6666: WriteCall(Color_ReadIndex16_24b_6666); break;
+			case FORMAT_32B_8888: WriteCall(Color_ReadIndex16_32b_8888); break;
+			default: _assert_(0); break;
+			}
+			break;
+		}
+		// Common for the three bottom cases
+		if (col[i] != NOT_PRESENT)
+		{
+			components |= VB_HAS_COL0 << i;
+			m_native_vtx_decl.colors[i].offset = nat_offset;
+			m_native_vtx_decl.colors[i].enable = true;
+			nat_offset += 4;
+		}
+	}
+
+	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
+	for (int i = 0; i < 8; i++)
+	{
+		m_native_vtx_decl.texcoords[i].offset = nat_offset;
+		m_native_vtx_decl.texcoords[i].type = VAR_FLOAT;
+		m_native_vtx_decl.texcoords[i].integer = false;
+
+		const int format = m_VtxAttr.texCoord[i].Format;
+		const int elements = m_VtxAttr.texCoord[i].Elements;
+
+		if (tc[i] != NOT_PRESENT)
+		{
+			_assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", (u32)tc[i]);
+			_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
+			_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
+
+			components |= VB_HAS_UV0 << i;
+			WriteCall(VertexLoader_TextCoord::GetFunction(tc[i], format, elements));
+			m_VertexSize += VertexLoader_TextCoord::GetSize(tc[i], format, elements);
+		}
+
+		if (components & (VB_HAS_TEXMTXIDX0 << i))
+		{
+			m_native_vtx_decl.texcoords[i].enable = true;
+			if (tc[i] != NOT_PRESENT)
+			{
+				// if texmtx is included, texcoord will always be 3 floats, z will be the texmtx index
+				m_native_vtx_decl.texcoords[i].components = 3;
+				nat_offset += 12;
+				WriteCall(m_VtxAttr.texCoord[i].Elements ? TexMtx_Write_Float : TexMtx_Write_Float2);
+			}
+			else
+			{
+				m_native_vtx_decl.texcoords[i].components = 3;
+				nat_offset += 12;
+				WriteCall(TexMtx_Write_Float3);
+			}
+		}
+		else
+		{
+			if (tc[i] != NOT_PRESENT)
+			{
+				m_native_vtx_decl.texcoords[i].enable = true;
+				m_native_vtx_decl.texcoords[i].components = vtx_attr.texCoord[i].Elements ? 2 : 1;
+				nat_offset += 4 * (vtx_attr.texCoord[i].Elements ? 2 : 1);
+			}
+		}
+
+		if (tc[i] == NOT_PRESENT)
+		{
+			// if there's more tex coords later, have to write a dummy call
+			int j = i + 1;
+			for (; j < 8; ++j)
+			{
+				if (tc[j] != NOT_PRESENT)
+				{
+					WriteCall(VertexLoader_TextCoord::GetDummyFunction()); // important to get indices right!
+					break;
+				}
+			}
+			// tricky!
+			if (j == 8 && !((components & VB_HAS_TEXMTXIDXALL) & (VB_HAS_TEXMTXIDXALL << (i + 1))))
+			{
+				// no more tex coords and tex matrices, so exit loop
+				break;
+			}
+		}
+	}
+
+	// indexed position formats may skip a the vertex
+	if (m_VtxDesc.Position & 2)
+	{
+		WriteCall(SkipVertex);
+	}
+
+	m_native_components = components;
+	m_native_vtx_decl.stride = nat_offset;
+}
+
+void VertexLoader::WriteCall(TPipelineFunction func)
+{
+	m_PipelineStages[m_numPipelineStages++] = func;
+}
+
+int VertexLoader::RunVertices(DataReader src, DataReader dst, int count)
+{
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	g_video_buffer_read_ptr = src.GetPointer();
+
+	m_numLoadedVertices += count;
+	m_skippedVertices = 0;
+
+	for (m_counter = count - 1; m_counter >= 0; m_counter--)
+	{
+		m_tcIndex = 0;
+		m_colIndex = 0;
+		m_texmtxwrite = m_texmtxread = 0;
+		for (int i = 0; i < m_numPipelineStages; i++)
+			m_PipelineStages[i](this);
+		PRIM_LOG("\n");
+	}
+
+	return count - m_skippedVertices;
+}
diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h
new file mode 100644
index 0000000000..50ece53095
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader.h
@@ -0,0 +1,62 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// Top vertex loaders
+// Metroid Prime: P I16-flt N I16-s16 T0 I16-u16 T1 i16-flt
+
+#include <algorithm>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/VertexLoaderBase.h"
+#include "VideoCommon/VertexLoaderUtils.h"
+
+#ifdef WIN32
+#define LOADERDECL __cdecl
+#else
+#define LOADERDECL
+#endif
+
+class VertexLoader;
+typedef void (LOADERDECL *TPipelineFunction)(VertexLoader* loader);
+
+class VertexLoader : public VertexLoaderBase
+{
+public:
+	VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr);
+
+	int RunVertices(DataReader src, DataReader dst, int count) override;
+	std::string GetName() const override { return "OldLoader"; }
+	bool IsInitialized() override { return true; } // This vertex loader supports all formats
+
+	// They are used for the communication with the loader functions
+	float m_posScale;
+	float m_tcScale[8];
+	int m_tcIndex;
+	int m_colIndex;
+
+	// Matrix components are first in GC format but later in PC format - we need to store it temporarily
+	// when decoding each vertex.
+	u8 m_curtexmtx[8];
+	int m_texmtxwrite;
+	int m_texmtxread;
+	bool m_vertexSkip;
+	int m_skippedVertices;
+	int m_counter;
+
+private:
+	// Pipeline.
+	TPipelineFunction m_PipelineStages[64];  // TODO - figure out real max. it's lower.
+	int m_numPipelineStages;
+
+	void CompileVertexTranslator();
+
+	void WriteCall(TPipelineFunction);
+};
diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.cpp b/Source/Core/VideoCommon/VertexLoaderARM64.cpp
new file mode 100644
index 0000000000..35d3a989e7
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderARM64.cpp
@@ -0,0 +1,563 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoCommon/VertexLoaderARM64.h"
+#include "VideoCommon/VertexLoaderManager.h"
+
+using namespace Arm64Gen;
+
+ARM64Reg src_reg = X0;
+ARM64Reg dst_reg = X1;
+ARM64Reg count_reg = W2;
+ARM64Reg skipped_reg = W17;
+ARM64Reg scratch1_reg = W16;
+ARM64Reg scratch2_reg = W15;
+ARM64Reg scratch3_reg = W14;
+ARM64Reg scratch4_reg = W13;
+ARM64Reg saved_count = W12;
+
+ARM64Reg stride_reg = X11;
+ARM64Reg arraybase_reg = X10;
+ARM64Reg scale_reg = X9;
+
+static const float GC_ALIGNED16(scale_factors[]) =
+{
+	1.0 / (1ULL <<  0), 1.0 / (1ULL <<  1), 1.0 / (1ULL <<  2), 1.0 / (1ULL <<  3),
+	1.0 / (1ULL <<  4), 1.0 / (1ULL <<  5), 1.0 / (1ULL <<  6), 1.0 / (1ULL <<  7),
+	1.0 / (1ULL <<  8), 1.0 / (1ULL <<  9), 1.0 / (1ULL << 10), 1.0 / (1ULL << 11),
+	1.0 / (1ULL << 12), 1.0 / (1ULL << 13), 1.0 / (1ULL << 14), 1.0 / (1ULL << 15),
+	1.0 / (1ULL << 16), 1.0 / (1ULL << 17), 1.0 / (1ULL << 18), 1.0 / (1ULL << 19),
+	1.0 / (1ULL << 20), 1.0 / (1ULL << 21), 1.0 / (1ULL << 22), 1.0 / (1ULL << 23),
+	1.0 / (1ULL << 24), 1.0 / (1ULL << 25), 1.0 / (1ULL << 26), 1.0 / (1ULL << 27),
+	1.0 / (1ULL << 28), 1.0 / (1ULL << 29), 1.0 / (1ULL << 30), 1.0 / (1ULL << 31),
+};
+
+VertexLoaderARM64::VertexLoaderARM64(const TVtxDesc& vtx_desc, const VAT& vtx_att)
+	: VertexLoaderBase(vtx_desc, vtx_att), m_float_emit(this)
+{
+	if (!IsInitialized())
+		return;
+
+	AllocCodeSpace(4096);
+	ClearCodeSpace();
+	GenerateVertexLoader();
+	WriteProtect();
+}
+
+void VertexLoaderARM64::GetVertexAddr(int array, u64 attribute, ARM64Reg reg)
+{
+	ADD(reg, src_reg, m_src_ofs);
+	if (attribute & MASK_INDEXED)
+	{
+		if (attribute == INDEX8)
+		{
+			LDRB(INDEX_UNSIGNED, scratch1_reg, reg, 0);
+			m_src_ofs += 1;
+		}
+		else
+		{
+			LDRH(INDEX_UNSIGNED, scratch1_reg, reg, 0);
+			m_src_ofs += 2;
+			REV16(scratch1_reg, scratch1_reg);
+		}
+
+		if (array == ARRAY_POSITION)
+		{
+			EOR(scratch2_reg, scratch1_reg, 0, attribute == INDEX8 ? 7 : 15); // 0xFF : 0xFFFF
+			m_skip_vertex = CBZ(scratch2_reg);
+		}
+
+		LDR(INDEX_UNSIGNED, scratch2_reg, stride_reg, array * 4);
+		MUL(scratch1_reg, scratch1_reg, scratch2_reg);
+
+		LDR(INDEX_UNSIGNED, EncodeRegTo64(scratch2_reg), arraybase_reg, array * 8);
+		ADD(EncodeRegTo64(reg), EncodeRegTo64(scratch1_reg), EncodeRegTo64(scratch2_reg));
+	}
+}
+
+s32 VertexLoaderARM64::GetAddressImm(int array, u64 attribute, Arm64Gen::ARM64Reg reg, u32 align)
+{
+	if (attribute & MASK_INDEXED ||
+	    (m_src_ofs > 255 && (m_src_ofs & (align - 1))))
+		GetVertexAddr(array, attribute, reg);
+	else
+		return m_src_ofs;
+	return -1;
+}
+
+int VertexLoaderARM64::ReadVertex(u64 attribute, int format, int count_in, int count_out, bool dequantize, u8 scaling_exponent, AttributeFormat* native_format, s32 offset)
+{
+	ARM64Reg coords = count_in == 3 ? Q31 : D31;
+	ARM64Reg scale = count_in == 3 ? Q30 : D30;
+
+	int elem_size = 1 << (format / 2);
+	int load_bytes = elem_size * count_in;
+	int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16;
+	load_size <<= 3;
+	elem_size <<= 3;
+
+	if (offset == -1)
+	{
+		if (count_in == 1)
+			m_float_emit.LDR(elem_size, INDEX_UNSIGNED, coords, EncodeRegTo64(scratch1_reg), 0);
+		else
+			m_float_emit.LD1(elem_size, 1, coords, EncodeRegTo64(scratch1_reg));
+	}
+	else if (offset & (load_size - 1)) // Not aligned - unscaled
+	{
+		m_float_emit.LDUR(load_size, coords, src_reg, offset);
+	}
+	else
+	{
+		m_float_emit.LDR(load_size, INDEX_UNSIGNED, coords, src_reg, offset);
+	}
+
+	if (format != FORMAT_FLOAT)
+	{
+		// Extend and convert to float
+		switch (format)
+		{
+		case FORMAT_UBYTE:
+			m_float_emit.UXTL(8, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+			m_float_emit.UXTL(16, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+		break;
+		case FORMAT_BYTE:
+			m_float_emit.SXTL(8, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+			m_float_emit.SXTL(16, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+		break;
+		case FORMAT_USHORT:
+			m_float_emit.REV16(8, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+			m_float_emit.UXTL(16, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+		break;
+		case FORMAT_SHORT:
+			m_float_emit.REV16(8, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+			m_float_emit.SXTL(16, EncodeRegToDouble(coords), EncodeRegToDouble(coords));
+		break;
+		}
+
+		m_float_emit.SCVTF(32, coords, coords);
+
+		if (dequantize && scaling_exponent)
+		{
+			m_float_emit.LDR(32, INDEX_UNSIGNED, scale, scale_reg, scaling_exponent * 4);
+			m_float_emit.FMUL(32, coords, coords, scale, 0);
+		}
+	}
+	else
+	{
+		m_float_emit.REV32(8, coords, coords);
+	}
+
+	const u32 write_size = count_out == 3 ? 128 : count_out * 32;
+	const u32 mask = count_out == 3 ? 0xF : count_out == 2 ? 0x7 : 0x3;
+	if (m_dst_ofs < 256)
+	{
+		m_float_emit.STUR(write_size, coords, dst_reg, m_dst_ofs);
+	}
+	else if (!(m_dst_ofs & mask))
+	{
+		m_float_emit.STR(write_size, INDEX_UNSIGNED, coords, dst_reg, m_dst_ofs);
+	}
+	else
+	{
+		ADD(EncodeRegTo64(scratch2_reg), dst_reg, m_dst_ofs);
+		m_float_emit.ST1(32, 1, coords, EncodeRegTo64(scratch2_reg));
+	}
+
+	// Z-Freeze
+	if (native_format == &m_native_vtx_decl.position)
+	{
+		CMP(count_reg, 3);
+		FixupBranch dont_store = B(CC_GT);
+		MOVI2R(EncodeRegTo64(scratch2_reg), (u64)VertexLoaderManager::position_cache);
+		ORR(scratch1_reg, WSP, count_reg, ArithOption(count_reg, ST_LSL, 4));
+		ADD(EncodeRegTo64(scratch1_reg), EncodeRegTo64(scratch1_reg), EncodeRegTo64(scratch2_reg));
+		m_float_emit.STUR(write_size, coords, EncodeRegTo64(scratch1_reg), -16);
+		SetJumpTarget(dont_store);
+	}
+
+	native_format->components = count_out;
+	native_format->enable = true;
+	native_format->offset = m_dst_ofs;
+	native_format->type = VAR_FLOAT;
+	native_format->integer = false;
+	m_dst_ofs += sizeof(float) * count_out;
+
+	if (attribute == DIRECT)
+		m_src_ofs += load_bytes;
+
+	return load_bytes;
+}
+
+void VertexLoaderARM64::ReadColor(u64 attribute, int format, s32 offset)
+{
+	int load_bytes = 0;
+	switch (format)
+	{
+		case FORMAT_24B_888:
+		case FORMAT_32B_888x:
+		case FORMAT_32B_8888:
+			if (offset == -1)
+				LDR(INDEX_UNSIGNED, scratch2_reg, EncodeRegTo64(scratch1_reg), 0);
+			else if (offset & 3) // Not aligned - unscaled
+				LDUR(scratch2_reg, src_reg, offset);
+			else
+				LDR(INDEX_UNSIGNED, scratch2_reg, src_reg, offset);
+
+			if (format != FORMAT_32B_8888)
+				ORR(scratch2_reg, scratch2_reg, 8, 7); // 0xFF000000
+			STR(INDEX_UNSIGNED, scratch2_reg, dst_reg, m_dst_ofs);
+			load_bytes = 3 + (format != FORMAT_24B_888);
+			break;
+
+		case FORMAT_16B_565:
+			//                   RRRRRGGG GGGBBBBB
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			if (offset == -1)
+				LDRH(INDEX_UNSIGNED, scratch3_reg, EncodeRegTo64(scratch1_reg), 0);
+			else if (offset & 1) // Not aligned - unscaled
+				LDURH(scratch2_reg, src_reg, offset);
+			else
+				LDRH(INDEX_UNSIGNED, scratch3_reg, src_reg, offset);
+
+			REV16(scratch3_reg, scratch3_reg);
+
+			// B
+			AND(scratch2_reg, scratch3_reg, 32, 4);
+			ORR(scratch2_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 3));
+			ORR(scratch2_reg, scratch2_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 5));
+			ORR(scratch1_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 16));
+
+			// G
+			UBFM(scratch2_reg, scratch3_reg, 5, 10);
+			ORR(scratch2_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 2));
+			ORR(scratch2_reg, scratch2_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 6));
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 8));
+
+			// R
+			UBFM(scratch2_reg, scratch3_reg, 11, 15);
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 3));
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 2));
+
+			// A
+			ORR(scratch2_reg, scratch2_reg, 8, 7); // 0xFF000000
+
+			STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs);
+			load_bytes = 2;
+			break;
+
+		case FORMAT_16B_4444:
+			//                   BBBBAAAA RRRRGGGG
+			//           REV16 - RRRRGGGG BBBBAAAA
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			if (offset == -1)
+				LDRH(INDEX_UNSIGNED, scratch3_reg, EncodeRegTo64(scratch1_reg), 0);
+			else if (offset & 1) // Not aligned - unscaled
+				LDURH(scratch2_reg, src_reg, offset);
+			else
+				LDRH(INDEX_UNSIGNED, scratch3_reg, src_reg, offset);
+
+			// R
+			UBFM(scratch1_reg, scratch3_reg, 4, 7);
+
+			// G
+			AND(scratch2_reg, scratch3_reg, 32, 3);
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 8));
+
+			// B
+			UBFM(scratch2_reg, scratch3_reg, 12, 15);
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 16));
+
+			// A
+			UBFM(scratch2_reg, scratch3_reg, 8, 11);
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 24));
+
+			// Final duplication
+			ORR(scratch1_reg, scratch1_reg, scratch1_reg, ArithOption(scratch1_reg, ST_LSL, 4));
+
+			STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs);
+			load_bytes = 2;
+			break;
+
+		case FORMAT_24B_6666:
+			//          RRRRRRGG GGGGBBBB BBAAAAAA
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			if (offset == -1)
+				LDR(INDEX_UNSIGNED, scratch3_reg, EncodeRegTo64(scratch1_reg), 0);
+			else if (offset & 3) // Not aligned - unscaled
+				LDUR(scratch2_reg, src_reg, offset);
+			else
+				LDR(INDEX_UNSIGNED, scratch3_reg, src_reg, m_src_ofs);
+
+			REV32(scratch3_reg, scratch3_reg);
+
+			// A
+			AND(scratch2_reg, scratch3_reg, 32, 5);
+			ORR(scratch2_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 2));
+			ORR(scratch2_reg, scratch2_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 6));
+			ORR(scratch1_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 24));
+
+			// B
+			UBFM(scratch2_reg, scratch3_reg, 6, 11);
+			ORR(scratch2_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 2));
+			ORR(scratch2_reg, scratch2_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 6));
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 16));
+
+			// G
+			UBFM(scratch2_reg, scratch3_reg, 12, 17);
+			ORR(scratch2_reg, WSP, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 2));
+			ORR(scratch2_reg, scratch2_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 6));
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 8));
+
+			// R
+			UBFM(scratch2_reg, scratch3_reg, 18, 23);
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSL, 2));
+			ORR(scratch1_reg, scratch1_reg, scratch2_reg, ArithOption(scratch2_reg, ST_LSR, 4));
+
+			STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs);
+			load_bytes = 3;
+			break;
+	}
+	if (attribute == DIRECT)
+		m_src_ofs += load_bytes;
+}
+
+void VertexLoaderARM64::GenerateVertexLoader()
+{
+	// R0 - Source pointer
+	// R1 - Destination pointer
+	// R2 - Count
+	// R30 - LR
+	//
+	// R0 return how many
+	//
+	// Registers we don't have to worry about saving
+	// R9-R17 are caller saved temporaries
+	// R18 is a temporary or platform specific register(iOS)
+	//
+	// VFP registers
+	// We can touch all except v8-v15
+	// If we need to use those, we need to retain the lower 64bits(!) of the register
+
+	MOV(skipped_reg, WSP);
+	MOV(saved_count, count_reg);
+
+	MOVI2R(stride_reg, (u64)&g_main_cp_state.array_strides);
+	MOVI2R(arraybase_reg, (u64)&VertexLoaderManager::cached_arraybases);
+	MOVI2R(scale_reg, (u64)&scale_factors);
+
+	const u8* loop_start = GetCodePtr();
+
+	if (m_VtxDesc.PosMatIdx)
+	{
+		LDRB(INDEX_UNSIGNED, scratch1_reg, src_reg, m_src_ofs);
+		AND(scratch1_reg, scratch1_reg, 0, 5);
+		STR(INDEX_UNSIGNED, scratch1_reg, dst_reg, m_dst_ofs);
+
+		// Z-Freeze
+		CMP(count_reg, 3);
+		FixupBranch dont_store = B(CC_GT);
+		MOVI2R(EncodeRegTo64(scratch2_reg), (u64)VertexLoaderManager::position_matrix_index - sizeof(u32));
+		STR(INDEX_UNSIGNED, scratch1_reg, EncodeRegTo64(scratch2_reg), 0);
+		SetJumpTarget(dont_store);
+
+		m_native_components |= VB_HAS_POSMTXIDX;
+		m_native_vtx_decl.posmtx.components = 4;
+		m_native_vtx_decl.posmtx.enable = true;
+		m_native_vtx_decl.posmtx.offset = m_dst_ofs;
+		m_native_vtx_decl.posmtx.type = VAR_UNSIGNED_BYTE;
+		m_native_vtx_decl.posmtx.integer = true;
+		m_src_ofs += sizeof(u8);
+		m_dst_ofs += sizeof(u32);
+	}
+
+	u32 texmatidx_ofs[8];
+	const u64 tm[8] = {
+		m_VtxDesc.Tex0MatIdx, m_VtxDesc.Tex1MatIdx, m_VtxDesc.Tex2MatIdx, m_VtxDesc.Tex3MatIdx,
+		m_VtxDesc.Tex4MatIdx, m_VtxDesc.Tex5MatIdx, m_VtxDesc.Tex6MatIdx, m_VtxDesc.Tex7MatIdx,
+	};
+	for (int i = 0; i < 8; i++)
+	{
+		if (tm[i])
+			texmatidx_ofs[i] = m_src_ofs++;
+	}
+
+	// Position
+	{
+		int elem_size = 1 << (m_VtxAttr.PosFormat / 2);
+		int load_bytes = elem_size * (m_VtxAttr.PosElements + 2);
+		int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16;
+		load_size <<= 3;
+
+		s32 offset = GetAddressImm(ARRAY_POSITION, m_VtxDesc.Position, EncodeRegTo64(scratch1_reg), load_size);
+		int pos_elements = m_VtxAttr.PosElements + 2;
+		ReadVertex(m_VtxDesc.Position, m_VtxAttr.PosFormat, pos_elements, pos_elements,
+		           m_VtxAttr.ByteDequant, m_VtxAttr.PosFrac, &m_native_vtx_decl.position, offset);
+	}
+
+	if (m_VtxDesc.Normal)
+	{
+		static const u8 map[8] = {7, 6, 15, 14};
+		u8 scaling_exponent = map[m_VtxAttr.NormalFormat];
+
+		s32 offset = -1;
+		for (int i = 0; i < (m_VtxAttr.NormalElements ? 3 : 1); i++)
+		{
+			if (!i || m_VtxAttr.NormalIndex3)
+			{
+				int elem_size = 1 << (m_VtxAttr.NormalFormat / 2);
+
+				int load_bytes = elem_size * 3;
+				int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16;
+
+				offset = GetAddressImm(ARRAY_NORMAL, m_VtxDesc.Normal, EncodeRegTo64(scratch1_reg), load_size << 3);
+
+				if (offset == -1)
+					ADD(EncodeRegTo64(scratch1_reg), EncodeRegTo64(scratch1_reg), i * elem_size * 3);
+				else
+					offset += i * elem_size * 3;
+			}
+			int bytes_read = ReadVertex(m_VtxDesc.Normal, m_VtxAttr.NormalFormat, 3, 3,
+			                            true, scaling_exponent, &m_native_vtx_decl.normals[i], offset);
+
+			if (offset == -1)
+				ADD(EncodeRegTo64(scratch1_reg), EncodeRegTo64(scratch1_reg), bytes_read);
+			else
+				offset += bytes_read;
+		}
+
+		m_native_components |= VB_HAS_NRM0;
+		if (m_VtxAttr.NormalElements)
+			m_native_components |= VB_HAS_NRM1 | VB_HAS_NRM2;
+	}
+
+	const u64 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
+	for (int i = 0; i < 2; i++)
+	{
+		m_native_vtx_decl.colors[i].components = 4;
+		m_native_vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE;
+		m_native_vtx_decl.colors[i].integer = false;
+
+		if (col[i])
+		{
+			u32 align = 4;
+			if (m_VtxAttr.color[i].Comp == FORMAT_16B_565 ||
+			    m_VtxAttr.color[i].Comp == FORMAT_16B_4444)
+				align = 2;
+
+			s32 offset = GetAddressImm(ARRAY_COLOR + i, col[i], EncodeRegTo64(scratch1_reg), align);
+			ReadColor(col[i], m_VtxAttr.color[i].Comp, offset);
+			m_native_components |= VB_HAS_COL0 << i;
+			m_native_vtx_decl.colors[i].components = 4;
+			m_native_vtx_decl.colors[i].enable = true;
+			m_native_vtx_decl.colors[i].offset = m_dst_ofs;
+			m_native_vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE;
+			m_native_vtx_decl.colors[i].integer = false;
+			m_dst_ofs += 4;
+		}
+	}
+
+	const u64 tc[8] = {
+		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
+		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord,
+	};
+
+	for (int i = 0; i < 8; i++)
+	{
+		m_native_vtx_decl.texcoords[i].offset = m_dst_ofs;
+		m_native_vtx_decl.texcoords[i].type = VAR_FLOAT;
+		m_native_vtx_decl.texcoords[i].integer = false;
+
+		int elements = m_VtxAttr.texCoord[i].Elements + 1;
+		if (tc[i])
+		{
+			m_native_components |= VB_HAS_UV0 << i;
+
+			int elem_size = 1 << (m_VtxAttr.texCoord[i].Format / 2);
+			int load_bytes = elem_size * (elements + 2);
+			int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16;
+			load_size <<= 3;
+
+			s32 offset = GetAddressImm(ARRAY_TEXCOORD0 + i, tc[i], EncodeRegTo64(scratch1_reg), load_size);
+			u8 scaling_exponent = m_VtxAttr.texCoord[i].Frac;
+			ReadVertex(tc[i], m_VtxAttr.texCoord[i].Format, elements, tm[i] ? 2 : elements,
+			           m_VtxAttr.ByteDequant, scaling_exponent, &m_native_vtx_decl.texcoords[i], offset);
+		}
+		if (tm[i])
+		{
+			m_native_components |= VB_HAS_TEXMTXIDX0 << i;
+			m_native_vtx_decl.texcoords[i].components = 3;
+			m_native_vtx_decl.texcoords[i].enable = true;
+			m_native_vtx_decl.texcoords[i].type = VAR_FLOAT;
+			m_native_vtx_decl.texcoords[i].integer = false;
+
+			LDRB(INDEX_UNSIGNED, scratch2_reg, src_reg, texmatidx_ofs[i]);
+			m_float_emit.UCVTF(S31, scratch2_reg);
+
+			if (tc[i])
+			{
+				m_float_emit.STR(32, INDEX_UNSIGNED, D31, dst_reg, m_dst_ofs);
+				m_dst_ofs += sizeof(float);
+			}
+			else
+			{
+				m_native_vtx_decl.texcoords[i].offset = m_dst_ofs;
+
+				if (m_dst_ofs < 256)
+				{
+					STUR(SP, dst_reg, m_dst_ofs);
+				}
+				else if (!(m_dst_ofs & 7))
+				{
+					// If m_dst_ofs isn't 8byte aligned we can't store an 8byte zero register
+					// So store two 4byte zero registers
+					// The destination is always 4byte aligned
+					STR(INDEX_UNSIGNED, WSP, dst_reg, m_dst_ofs);
+					STR(INDEX_UNSIGNED, WSP, dst_reg, m_dst_ofs + 4);
+				}
+				else
+				{
+					STR(INDEX_UNSIGNED, SP, dst_reg, m_dst_ofs);
+				}
+				m_float_emit.STR(32, INDEX_UNSIGNED, D31, dst_reg, m_dst_ofs + 8);
+
+				m_dst_ofs += sizeof(float) * 3;
+			}
+		}
+	}
+
+	// Prepare for the next vertex.
+	ADD(dst_reg, dst_reg, m_dst_ofs);
+	const u8* cont = GetCodePtr();
+	ADD(src_reg, src_reg, m_src_ofs);
+
+	SUB(count_reg, count_reg, 1);
+	CBNZ(count_reg, loop_start);
+
+	if (m_VtxDesc.Position & MASK_INDEXED)
+	{
+		SUB(W0, saved_count, skipped_reg);
+		RET(X30);
+
+		SetJumpTarget(m_skip_vertex);
+		ADD(skipped_reg, skipped_reg, 1);
+		B(cont);
+	}
+	else
+	{
+		MOV(W0, saved_count);
+		RET(X30);
+	}
+
+	FlushIcache();
+
+	m_VertexSize = m_src_ofs;
+	m_native_vtx_decl.stride = m_dst_ofs;
+}
+
+int VertexLoaderARM64::RunVertices(DataReader src, DataReader dst, int count)
+{
+	m_numLoadedVertices += count;
+	return ((int (*)(u8* src, u8* dst, int count))region)(src.GetPointer(), dst.GetPointer(), count);
+}
diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.h b/Source/Core/VideoCommon/VertexLoaderARM64.h
new file mode 100644
index 0000000000..cbcf7bf06d
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderARM64.h
@@ -0,0 +1,29 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+#include "Common/Arm64Emitter.h"
+#include "VideoCommon/VertexLoaderBase.h"
+
+class VertexLoaderARM64 : public VertexLoaderBase, public Arm64Gen::ARM64CodeBlock
+{
+public:
+	VertexLoaderARM64(const TVtxDesc& vtx_desc, const VAT& vtx_att);
+
+protected:
+	std::string GetName() const override { return "VertexLoaderARM64"; }
+	bool IsInitialized() override { return true; }
+	int RunVertices(DataReader src, DataReader dst, int count) override;
+
+private:
+	u32 m_src_ofs = 0;
+	u32 m_dst_ofs = 0;
+	Arm64Gen::FixupBranch m_skip_vertex;
+	Arm64Gen::ARM64FloatEmitter m_float_emit;
+	void GetVertexAddr(int array, u64 attribute, Arm64Gen::ARM64Reg reg);
+	s32 GetAddressImm(int array, u64 attribute, Arm64Gen::ARM64Reg reg, u32 align);
+	int ReadVertex(u64 attribute, int format, int count_in, int count_out, bool dequantize, u8 scaling_exponent, AttributeFormat* native_format, s32 offset = -1);
+	void ReadColor(u64 attribute, int format, s32 offset);
+	void GenerateVertexLoader();
+};
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp
new file mode 100644
index 0000000000..d5831bc8e5
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp
@@ -0,0 +1,228 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cinttypes>
+#include <vector>
+
+#include "Common/StringUtil.h"
+
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoaderBase.h"
+
+#ifdef _M_X86_64
+#include "VideoCommon/VertexLoaderX64.h"
+#elif defined(_M_ARM_64)
+#include "VideoCommon/VertexLoaderARM64.h"
+#endif
+
+VertexLoaderBase::VertexLoaderBase(const TVtxDesc &vtx_desc, const VAT &vtx_attr)
+{
+	m_numLoadedVertices = 0;
+	m_VertexSize = 0;
+	m_native_vertex_format = nullptr;
+	m_native_components = 0;
+	memset(&m_native_vtx_decl, 0, sizeof(m_native_vtx_decl));
+
+	SetVAT(vtx_attr);
+	m_VtxDesc = vtx_desc;
+	m_vat = vtx_attr;
+}
+
+void VertexLoaderBase::SetVAT(const VAT& vat)
+{
+	m_VtxAttr.PosElements          = vat.g0.PosElements;
+	m_VtxAttr.PosFormat            = vat.g0.PosFormat;
+	m_VtxAttr.PosFrac              = vat.g0.PosFrac;
+	m_VtxAttr.NormalElements       = vat.g0.NormalElements;
+	m_VtxAttr.NormalFormat         = vat.g0.NormalFormat;
+	m_VtxAttr.color[0].Elements    = vat.g0.Color0Elements;
+	m_VtxAttr.color[0].Comp        = vat.g0.Color0Comp;
+	m_VtxAttr.color[1].Elements    = vat.g0.Color1Elements;
+	m_VtxAttr.color[1].Comp        = vat.g0.Color1Comp;
+	m_VtxAttr.texCoord[0].Elements = vat.g0.Tex0CoordElements;
+	m_VtxAttr.texCoord[0].Format   = vat.g0.Tex0CoordFormat;
+	m_VtxAttr.texCoord[0].Frac     = vat.g0.Tex0Frac;
+	m_VtxAttr.ByteDequant          = vat.g0.ByteDequant;
+	m_VtxAttr.NormalIndex3         = vat.g0.NormalIndex3;
+
+	m_VtxAttr.texCoord[1].Elements = vat.g1.Tex1CoordElements;
+	m_VtxAttr.texCoord[1].Format   = vat.g1.Tex1CoordFormat;
+	m_VtxAttr.texCoord[1].Frac     = vat.g1.Tex1Frac;
+	m_VtxAttr.texCoord[2].Elements = vat.g1.Tex2CoordElements;
+	m_VtxAttr.texCoord[2].Format   = vat.g1.Tex2CoordFormat;
+	m_VtxAttr.texCoord[2].Frac     = vat.g1.Tex2Frac;
+	m_VtxAttr.texCoord[3].Elements = vat.g1.Tex3CoordElements;
+	m_VtxAttr.texCoord[3].Format   = vat.g1.Tex3CoordFormat;
+	m_VtxAttr.texCoord[3].Frac     = vat.g1.Tex3Frac;
+	m_VtxAttr.texCoord[4].Elements = vat.g1.Tex4CoordElements;
+	m_VtxAttr.texCoord[4].Format   = vat.g1.Tex4CoordFormat;
+
+	m_VtxAttr.texCoord[4].Frac     = vat.g2.Tex4Frac;
+	m_VtxAttr.texCoord[5].Elements = vat.g2.Tex5CoordElements;
+	m_VtxAttr.texCoord[5].Format   = vat.g2.Tex5CoordFormat;
+	m_VtxAttr.texCoord[5].Frac     = vat.g2.Tex5Frac;
+	m_VtxAttr.texCoord[6].Elements = vat.g2.Tex6CoordElements;
+	m_VtxAttr.texCoord[6].Format   = vat.g2.Tex6CoordFormat;
+	m_VtxAttr.texCoord[6].Frac     = vat.g2.Tex6Frac;
+	m_VtxAttr.texCoord[7].Elements = vat.g2.Tex7CoordElements;
+	m_VtxAttr.texCoord[7].Format   = vat.g2.Tex7CoordFormat;
+	m_VtxAttr.texCoord[7].Frac     = vat.g2.Tex7Frac;
+};
+
+void VertexLoaderBase::AppendToString(std::string *dest) const
+{
+	dest->reserve(250);
+
+	dest->append(GetName());
+	dest->append(": ");
+
+	static const char *posMode[4] = {
+		"Inv",
+		"Dir", "I8", "I16",
+	};
+	static const char *posFormats[8] = {
+		"u8", "s8", "u16", "s16", "flt",
+		"Inv", "Inv", "Inv",
+	};
+	static const char *colorFormat[8] = {
+		"565", "888", "888x", "4444", "6666", "8888",
+		"Inv", "Inv",
+	};
+
+	dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ",
+		m_VertexSize, (u32)m_VtxDesc.PosMatIdx,
+		m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat]));
+
+	if (m_VtxDesc.Normal)
+	{
+		dest->append(StringFromFormat("Nrm: %i %s-%s ",
+			m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat]));
+	}
+
+	u64 color_mode[2] = { m_VtxDesc.Color0, m_VtxDesc.Color1 };
+	for (int i = 0; i < 2; i++)
+	{
+		if (color_mode[i])
+		{
+			dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp]));
+		}
+	}
+	u64 tex_mode[8] = {
+		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
+		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord
+	};
+	for (int i = 0; i < 8; i++)
+	{
+		if (tex_mode[i])
+		{
+			dest->append(StringFromFormat("T%i: %i %s-%s ",
+				i, m_VtxAttr.texCoord[i].Elements, posMode[tex_mode[i]], posFormats[m_VtxAttr.texCoord[i].Format]));
+		}
+	}
+	dest->append(StringFromFormat(" - %i v\n", m_numLoadedVertices));
+}
+
+// a hacky implementation to compare two vertex loaders
+class VertexLoaderTester : public VertexLoaderBase
+{
+public:
+	VertexLoaderTester(VertexLoaderBase* _a, VertexLoaderBase* _b, const TVtxDesc& vtx_desc, const VAT& vtx_attr)
+	: VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b)
+	{
+		m_initialized = a && b && a->IsInitialized() && b->IsInitialized();
+		bool can_test = a->m_VertexSize == b->m_VertexSize &&
+		                a->m_native_components == b->m_native_components &&
+		                a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride;
+
+		if (m_initialized)
+		{
+			if (can_test)
+			{
+				m_VertexSize = a->m_VertexSize;
+				m_native_components = a->m_native_components;
+				memcpy(&m_native_vtx_decl, &a->m_native_vtx_decl, sizeof(PortableVertexDeclaration));
+			}
+			else
+			{
+				ERROR_LOG(VIDEO, "Can't compare vertex loaders that expect different vertex formats!");
+				ERROR_LOG(VIDEO, "a: m_VertexSize %d, m_native_components 0x%08x, stride %d\n",
+				                 a->m_VertexSize, a->m_native_components, a->m_native_vtx_decl.stride);
+				ERROR_LOG(VIDEO, "b: m_VertexSize %d, m_native_components 0x%08x, stride %d\n",
+				                 b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride);
+			}
+		}
+
+		m_initialized &= can_test;
+	}
+	~VertexLoaderTester() override
+	{
+		delete a;
+		delete b;
+	}
+
+	int RunVertices(DataReader src, DataReader dst, int count) override
+	{
+		buffer_a.resize(count * a->m_native_vtx_decl.stride + 4);
+		buffer_b.resize(count * b->m_native_vtx_decl.stride + 4);
+
+		int count_a = a->RunVertices(src, DataReader(buffer_a.data(), buffer_a.data()+buffer_a.size()), count);
+		int count_b = b->RunVertices(src, DataReader(buffer_b.data(), buffer_b.data()+buffer_b.size()), count);
+
+		if (count_a != count_b)
+			ERROR_LOG(VIDEO, "The two vertex loaders have loaded a different amount of vertices (a: %d, b: %d).", count_a, count_b);
+
+		if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride))
+			ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data "
+			                 "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).",
+			                 m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex);
+
+		memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride);
+		m_numLoadedVertices += count;
+		return count_a;
+	}
+	std::string GetName() const override { return "CompareLoader"; }
+	bool IsInitialized() override { return m_initialized; }
+
+private:
+	VertexLoaderBase *a, *b;
+	bool m_initialized;
+	std::vector<u8> buffer_a, buffer_b;
+};
+
+VertexLoaderBase* VertexLoaderBase::CreateVertexLoader(const TVtxDesc& vtx_desc, const VAT& vtx_attr)
+{
+	VertexLoaderBase* loader;
+
+//#define COMPARE_VERTEXLOADERS
+
+#if defined(COMPARE_VERTEXLOADERS) && defined(_M_X86_64)
+	// first try: Any new VertexLoader vs the old one
+	loader = new VertexLoaderTester(
+			new VertexLoader(vtx_desc, vtx_attr), // the software one
+			new VertexLoaderX64(vtx_desc, vtx_attr), // the new one to compare
+			vtx_desc, vtx_attr);
+	if (loader->IsInitialized())
+		return loader;
+	delete loader;
+#elif defined(_M_X86_64)
+	loader = new VertexLoaderX64(vtx_desc, vtx_attr);
+	if (loader->IsInitialized())
+		return loader;
+	delete loader;
+#elif defined(_M_ARM_64)
+	loader = new VertexLoaderARM64(vtx_desc, vtx_attr);
+	if (loader->IsInitialized())
+		return loader;
+	delete loader;
+#endif
+
+	// last try: The old VertexLoader
+	loader = new VertexLoader(vtx_desc, vtx_attr);
+	if (loader->IsInitialized())
+		return loader;
+	delete loader;
+
+	PanicAlert("No Vertex Loader found.");
+	return nullptr;
+}
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h
new file mode 100644
index 0000000000..46f7509c0f
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderBase.h
@@ -0,0 +1,103 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <array>
+#include <string>
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/NativeVertexFormat.h"
+
+class VertexLoaderUID
+{
+	std::array<u32, 5> vid;
+	size_t hash;
+public:
+	VertexLoaderUID()
+	{
+	}
+
+	VertexLoaderUID(const TVtxDesc& vtx_desc, const VAT& vat)
+	{
+		vid[0] = vtx_desc.Hex & 0xFFFFFFFF;
+		vid[1] = vtx_desc.Hex >> 32;
+		vid[2] = vat.g0.Hex;
+		vid[3] = vat.g1.Hex;
+		vid[4] = vat.g2.Hex;
+		hash = CalculateHash();
+	}
+
+	bool operator == (const VertexLoaderUID& rh) const
+	{
+		return vid == rh.vid;
+	}
+
+	size_t GetHash() const
+	{
+		return hash;
+	}
+
+private:
+
+	size_t CalculateHash() const
+	{
+		size_t h = -1;
+
+		for (auto word : vid)
+		{
+			h = h * 137 + word;
+		}
+
+		return h;
+	}
+};
+
+namespace std
+{
+template <> struct hash<VertexLoaderUID>
+{
+	size_t operator()(const VertexLoaderUID& uid) const
+	{
+		return uid.GetHash();
+	}
+};
+}
+
+class VertexLoaderBase
+{
+public:
+	static VertexLoaderBase* CreateVertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr);
+	virtual ~VertexLoaderBase() {}
+
+	virtual int RunVertices(DataReader src, DataReader dst, int count) = 0;
+
+	virtual bool IsInitialized() = 0;
+
+	// For debugging / profiling
+	void AppendToString(std::string *dest) const;
+
+	virtual std::string GetName() const = 0;
+
+	// per loader public state
+	int m_VertexSize;      // number of bytes of a raw GC vertex
+	PortableVertexDeclaration m_native_vtx_decl;
+	u32 m_native_components;
+
+	// used by VertexLoaderManager
+	NativeVertexFormat* m_native_vertex_format;
+	int m_numLoadedVertices;
+
+protected:
+	VertexLoaderBase(const TVtxDesc &vtx_desc, const VAT &vtx_attr);
+	void SetVAT(const VAT& vat);
+
+	// GC vertex format
+	TVtxAttr m_VtxAttr;  // VAT decoded into easy format
+	TVtxDesc m_VtxDesc;  // Not really used currently - or well it is, but could be easily avoided.
+	VAT m_vat;
+};
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp
new file mode 100644
index 0000000000..46a0eeaab0
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp
@@ -0,0 +1,295 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "Common/CommonFuncs.h"
+#include "Core/HW/Memmap.h"
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexLoaderBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+
+
+
+namespace VertexLoaderManager
+{
+
+float position_cache[3][4];
+u32 position_matrix_index[3];
+
+typedef std::unordered_map<PortableVertexDeclaration, std::unique_ptr<NativeVertexFormat>> NativeVertexFormatMap;
+static NativeVertexFormatMap s_native_vertex_map;
+static NativeVertexFormat* s_current_vtx_fmt;
+
+typedef std::unordered_map<VertexLoaderUID, std::unique_ptr<VertexLoaderBase>> VertexLoaderMap;
+static std::mutex s_vertex_loader_map_lock;
+static VertexLoaderMap s_vertex_loader_map;
+// TODO - change into array of pointers. Keep a map of all seen so far.
+
+u8 *cached_arraybases[12];
+
+void Init()
+{
+	MarkAllDirty();
+	for (auto& map_entry : g_main_cp_state.vertex_loaders)
+		map_entry = nullptr;
+	for (auto& map_entry : g_preprocess_cp_state.vertex_loaders)
+		map_entry = nullptr;
+	SETSTAT(stats.numVertexLoaders, 0);
+}
+
+void Shutdown()
+{
+	std::lock_guard<std::mutex> lk(s_vertex_loader_map_lock);
+	s_vertex_loader_map.clear();
+	s_native_vertex_map.clear();
+}
+
+void UpdateVertexArrayPointers()
+{
+	// Anything to update?
+	if (!g_main_cp_state.bases_dirty)
+		return;
+
+	// Some games such as Burnout 2 can put invalid addresses into
+	// the array base registers. (see issue 8591)
+	// But the vertex arrays with invalid addresses aren't actually enabled.
+	// Note: Only array bases 0 through 11 are used by the Vertex loaders.
+	//       12 through 15 are used for loading data into xfmem.
+	for (int i = 0; i < 12; i++)
+	{
+		// Only update the array base if the vertex description states we are going to use it.
+		if (g_main_cp_state.vtx_desc.GetVertexArrayStatus(i) >= 0x2)
+			cached_arraybases[i] = Memory::GetPointer(g_main_cp_state.array_bases[i]);
+	}
+
+	g_main_cp_state.bases_dirty = false;
+}
+
+namespace
+{
+struct entry
+{
+	std::string text;
+	u64 num_verts;
+	bool operator < (const entry &other) const
+	{
+		return num_verts > other.num_verts;
+	}
+};
+}
+
+void AppendListToString(std::string *dest)
+{
+	std::lock_guard<std::mutex> lk(s_vertex_loader_map_lock);
+	std::vector<entry> entries;
+
+	size_t total_size = 0;
+	for (const auto& map_entry : s_vertex_loader_map)
+	{
+		entry e;
+		map_entry.second->AppendToString(&e.text);
+		e.num_verts = map_entry.second->m_numLoadedVertices;
+		entries.push_back(e);
+		total_size += e.text.size() + 1;
+	}
+	sort(entries.begin(), entries.end());
+	dest->reserve(dest->size() + total_size);
+	for (const entry& entry : entries)
+	{
+		dest->append(entry.text);
+	}
+}
+
+void MarkAllDirty()
+{
+	g_main_cp_state.attr_dirty = BitSet32::AllTrue(8);
+	g_preprocess_cp_state.attr_dirty = BitSet32::AllTrue(8);
+}
+
+static VertexLoaderBase* RefreshLoader(int vtx_attr_group, bool preprocess = false)
+{
+	CPState* state = preprocess ? &g_preprocess_cp_state : &g_main_cp_state;
+
+	VertexLoaderBase* loader;
+	if (state->attr_dirty[vtx_attr_group])
+	{
+		// We are not allowed to create a native vertex format on preprocessing as this is on the wrong thread
+		bool check_for_native_format = !preprocess;
+
+		VertexLoaderUID uid(state->vtx_desc, state->vtx_attr[vtx_attr_group]);
+		std::lock_guard<std::mutex> lk(s_vertex_loader_map_lock);
+		VertexLoaderMap::iterator iter = s_vertex_loader_map.find(uid);
+		if (iter != s_vertex_loader_map.end())
+		{
+			loader = iter->second.get();
+			check_for_native_format &= !loader->m_native_vertex_format;
+		}
+		else
+		{
+			loader = VertexLoaderBase::CreateVertexLoader(state->vtx_desc, state->vtx_attr[vtx_attr_group]);
+			s_vertex_loader_map[uid] = std::unique_ptr<VertexLoaderBase>(loader);
+			INCSTAT(stats.numVertexLoaders);
+		}
+		if (check_for_native_format)
+		{
+			// search for a cached native vertex format
+			const PortableVertexDeclaration& format = loader->m_native_vtx_decl;
+			std::unique_ptr<NativeVertexFormat>& native = s_native_vertex_map[format];
+			if (!native)
+			{
+				native.reset(g_vertex_manager->CreateNativeVertexFormat());
+				native->Initialize(format);
+				native->m_components = loader->m_native_components;
+			}
+			loader->m_native_vertex_format = native.get();
+		}
+		state->vertex_loaders[vtx_attr_group] = loader;
+		state->attr_dirty[vtx_attr_group] = false;
+	} else {
+		loader = state->vertex_loaders[vtx_attr_group];
+	}
+
+	// Lookup pointers for any vertex arrays.
+	if (!preprocess)
+		UpdateVertexArrayPointers();
+
+	return loader;
+}
+
+int RunVertices(int vtx_attr_group, int primitive, int count, DataReader src, bool skip_drawing, bool is_preprocess)
+{
+	if (!count)
+		return 0;
+
+	VertexLoaderBase* loader = RefreshLoader(vtx_attr_group, is_preprocess);
+
+	int size = count * loader->m_VertexSize;
+	if ((int)src.size() < size)
+		return -1;
+
+	if (skip_drawing || is_preprocess)
+		return size;
+
+	// If the native vertex format changed, force a flush.
+	if (loader->m_native_vertex_format != s_current_vtx_fmt)
+		VertexManager::Flush();
+	s_current_vtx_fmt = loader->m_native_vertex_format;
+
+	// if cull mode is CULL_ALL, tell VertexManager to skip triangles and quads.
+	// They still need to go through vertex loading, because we need to calculate a zfreeze refrence slope.
+	bool cullall = (bpmem.genMode.cullmode == GenMode::CULL_ALL && primitive < 5);
+
+	DataReader dst = VertexManager::PrepareForAdditionalData(primitive, count,
+			loader->m_native_vtx_decl.stride, cullall);
+
+	count = loader->RunVertices(src, dst, count);
+
+	IndexGenerator::AddIndices(primitive, count);
+
+	VertexManager::FlushData(count, loader->m_native_vtx_decl.stride);
+
+	ADDSTAT(stats.thisFrame.numPrims, count);
+	INCSTAT(stats.thisFrame.numPrimitiveJoins);
+	return size;
+}
+
+NativeVertexFormat* GetCurrentVertexFormat()
+{
+	return s_current_vtx_fmt;
+}
+
+}  // namespace
+
+void LoadCPReg(u32 sub_cmd, u32 value, bool is_preprocess)
+{
+	bool update_global_state = !is_preprocess;
+	CPState* state = is_preprocess ? &g_preprocess_cp_state : &g_main_cp_state;
+	switch (sub_cmd & 0xF0)
+	{
+	case 0x30:
+		if (update_global_state)
+			VertexShaderManager::SetTexMatrixChangedA(value);
+		break;
+
+	case 0x40:
+		if (update_global_state)
+			VertexShaderManager::SetTexMatrixChangedB(value);
+		break;
+
+	case 0x50:
+		state->vtx_desc.Hex &= ~0x1FFFF;  // keep the Upper bits
+		state->vtx_desc.Hex |= value;
+		state->attr_dirty = BitSet32::AllTrue(8);
+		state->bases_dirty = true;
+		break;
+
+	case 0x60:
+		state->vtx_desc.Hex &= 0x1FFFF;  // keep the lower 17Bits
+		state->vtx_desc.Hex |= (u64)value << 17;
+		state->attr_dirty = BitSet32::AllTrue(8);
+		state->bases_dirty = true;
+		break;
+
+	case 0x70:
+		_assert_((sub_cmd & 0x0F) < 8);
+		state->vtx_attr[sub_cmd & 7].g0.Hex = value;
+		state->attr_dirty[sub_cmd & 7] = true;
+		break;
+
+	case 0x80:
+		_assert_((sub_cmd & 0x0F) < 8);
+		state->vtx_attr[sub_cmd & 7].g1.Hex = value;
+		state->attr_dirty[sub_cmd & 7] = true;
+		break;
+
+	case 0x90:
+		_assert_((sub_cmd & 0x0F) < 8);
+		state->vtx_attr[sub_cmd & 7].g2.Hex = value;
+		state->attr_dirty[sub_cmd & 7] = true;
+		break;
+
+	// Pointers to vertex arrays in GC RAM
+	case 0xA0:
+		state->array_bases[sub_cmd & 0xF] = value;
+		state->bases_dirty = true;
+		break;
+
+	case 0xB0:
+		state->array_strides[sub_cmd & 0xF] = value & 0xFF;
+		break;
+	}
+}
+
+void FillCPMemoryArray(u32 *memory)
+{
+	memory[0x30] = g_main_cp_state.matrix_index_a.Hex;
+	memory[0x40] = g_main_cp_state.matrix_index_b.Hex;
+	memory[0x50] = (u32)g_main_cp_state.vtx_desc.Hex;
+	memory[0x60] = (u32)(g_main_cp_state.vtx_desc.Hex >> 17);
+
+	for (int i = 0; i < 8; ++i)
+	{
+		memory[0x70 + i] = g_main_cp_state.vtx_attr[i].g0.Hex;
+		memory[0x80 + i] = g_main_cp_state.vtx_attr[i].g1.Hex;
+		memory[0x90 + i] = g_main_cp_state.vtx_attr[i].g2.Hex;
+	}
+
+	for (int i = 0; i < 16; ++i)
+	{
+		memory[0xA0 + i] = g_main_cp_state.array_bases[i];
+		memory[0xB0 + i] = g_main_cp_state.array_strides[i];
+	}
+}
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h
new file mode 100644
index 0000000000..92d7e6da8f
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderManager.h
@@ -0,0 +1,37 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/NativeVertexFormat.h"
+
+namespace VertexLoaderManager
+{
+	void Init();
+	void Shutdown();
+
+	void MarkAllDirty();
+
+	// Returns -1 if buf_size is insufficient, else the amount of bytes consumed
+	int RunVertices(int vtx_attr_group, int primitive, int count, DataReader src, bool skip_drawing, bool is_preprocess);
+
+	// For debugging
+	void AppendListToString(std::string *dest);
+
+	NativeVertexFormat* GetCurrentVertexFormat();
+
+	// Resolved pointers to array bases. Used by vertex loaders.
+	extern u8 *cached_arraybases[12];
+	void UpdateVertexArrayPointers();
+
+	// Position cache for zfreeze (3 vertices, 4 floats each to allow SIMD overwrite).
+	// These arrays are in reverse order.
+	extern float position_cache[3][4];
+	extern u32 position_matrix_index[3];
+}
+
diff --git a/Source/Core/VideoCommon/VertexLoaderUtils.h b/Source/Core/VideoCommon/VertexLoaderUtils.h
new file mode 100644
index 0000000000..143740ddf4
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderUtils.h
@@ -0,0 +1,95 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Common.h"
+#include "VideoCommon/VertexManagerBase.h"
+
+extern u8* g_video_buffer_read_ptr;
+extern u8* g_vertex_manager_write_ptr;
+
+
+__forceinline void DataSkip(u32 skip)
+{
+	g_video_buffer_read_ptr += skip;
+}
+
+// probably unnecessary
+template <int count>
+__forceinline void DataSkip()
+{
+	g_video_buffer_read_ptr += count;
+}
+
+template <typename T>
+__forceinline T DataPeek(int _uOffset, u8** bufp = &g_video_buffer_read_ptr)
+{
+	auto const result = Common::FromBigEndian(*reinterpret_cast<T*>(*bufp + _uOffset));
+	return result;
+}
+
+// TODO: kill these
+__forceinline u8 DataPeek8(int _uOffset)
+{
+	return DataPeek<u8>(_uOffset);
+}
+
+__forceinline u16 DataPeek16(int _uOffset)
+{
+	return DataPeek<u16>(_uOffset);
+}
+
+__forceinline u32 DataPeek32(int _uOffset)
+{
+	return DataPeek<u32>(_uOffset);
+}
+
+template <typename T>
+__forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr)
+{
+	auto const result = DataPeek<T>(0, bufp);
+	*bufp += sizeof(T);
+	return result;
+}
+
+// TODO: kill these
+__forceinline u8 DataReadU8()
+{
+	return DataRead<u8>();
+}
+
+__forceinline s8 DataReadS8()
+{
+	return DataRead<s8>();
+}
+
+__forceinline u16 DataReadU16()
+{
+	return DataRead<u16>();
+}
+
+__forceinline u32 DataReadU32()
+{
+	return DataRead<u32>();
+}
+
+__forceinline u32 DataReadU32Unswapped()
+{
+	u32 tmp = *(u32*)g_video_buffer_read_ptr;
+	g_video_buffer_read_ptr += 4;
+	return tmp;
+}
+
+__forceinline u8* DataGetPosition()
+{
+	return g_video_buffer_read_ptr;
+}
+
+template <typename T>
+__forceinline void DataWrite(T data)
+{
+	*(T*)g_vertex_manager_write_ptr = data;
+	g_vertex_manager_write_ptr += sizeof(T);
+}
diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp
new file mode 100644
index 0000000000..a298d7e1dd
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp
@@ -0,0 +1,583 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/BitSet.h"
+#include "Common/CPUDetect.h"
+#include "Common/Intrinsics.h"
+#include "Common/JitRegister.h"
+#include "Common/x64ABI.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexLoaderX64.h"
+
+using namespace Gen;
+
+static const X64Reg src_reg = ABI_PARAM1;
+static const X64Reg dst_reg = ABI_PARAM2;
+static const X64Reg scratch1 = RAX;
+static const X64Reg scratch2 = ABI_PARAM3;
+static const X64Reg scratch3 = ABI_PARAM4;
+static const X64Reg count_reg = R10;
+static const X64Reg skipped_reg = R11;
+static const X64Reg base_reg = RBX;
+
+static const u8* memory_base_ptr = (u8*)&g_main_cp_state.array_strides;
+
+static OpArg MPIC(const void* ptr, X64Reg scale_reg, int scale = SCALE_1)
+{
+	return MComplex(base_reg, scale_reg, scale, (s32)((u8*)ptr - memory_base_ptr));
+}
+
+static OpArg MPIC(const void* ptr)
+{
+	return MDisp(base_reg, (s32)((u8*)ptr - memory_base_ptr));
+}
+
+VertexLoaderX64::VertexLoaderX64(const TVtxDesc& vtx_desc, const VAT& vtx_att) : VertexLoaderBase(vtx_desc, vtx_att)
+{
+	if (!IsInitialized())
+		return;
+
+	AllocCodeSpace(4096);
+	ClearCodeSpace();
+	GenerateVertexLoader();
+	WriteProtect();
+
+	std::string name;
+	AppendToString(&name);
+	JitRegister::Register(region, GetCodePtr(), name.c_str());
+}
+
+OpArg VertexLoaderX64::GetVertexAddr(int array, u64 attribute)
+{
+	OpArg data = MDisp(src_reg, m_src_ofs);
+	if (attribute & MASK_INDEXED)
+	{
+		if (attribute == INDEX8)
+		{
+			MOVZX(64, 8, scratch1, data);
+			m_src_ofs += 1;
+		}
+		else
+		{
+			MOV(16, R(scratch1), data);
+			m_src_ofs += 2;
+			BSWAP(16, scratch1);
+			MOVZX(64, 16, scratch1, R(scratch1));
+		}
+		if (array == ARRAY_POSITION)
+		{
+			CMP(attribute == INDEX8 ? 8 : 16, R(scratch1), Imm8(-1));
+			m_skip_vertex = J_CC(CC_E, true);
+		}
+		IMUL(32, scratch1, MPIC(&g_main_cp_state.array_strides[array]));
+		MOV(64, R(scratch2), MPIC(&VertexLoaderManager::cached_arraybases[array]));
+		return MRegSum(scratch1, scratch2);
+	}
+	else
+	{
+		return data;
+	}
+}
+
+int VertexLoaderX64::ReadVertex(OpArg data, u64 attribute, int format, int count_in, int count_out, bool dequantize, u8 scaling_exponent, AttributeFormat* native_format)
+{
+	static const __m128i shuffle_lut[5][3] = {
+		{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFF00L),  // 1x u8
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFF01L, 0xFFFFFF00L),  // 2x u8
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFF02L, 0xFFFFFF01L, 0xFFFFFF00L)}, // 3x u8
+		{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0x00FFFFFFL),  // 1x s8
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x01FFFFFFL, 0x00FFFFFFL),  // 2x s8
+		 _mm_set_epi32(0xFFFFFFFFL, 0x02FFFFFFL, 0x01FFFFFFL, 0x00FFFFFFL)}, // 3x s8
+		{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFF0001L),  // 1x u16
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFF0203L, 0xFFFF0001L),  // 2x u16
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFF0405L, 0xFFFF0203L, 0xFFFF0001L)}, // 3x u16
+		{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0x0001FFFFL),  // 1x s16
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x0203FFFFL, 0x0001FFFFL),  // 2x s16
+		 _mm_set_epi32(0xFFFFFFFFL, 0x0405FFFFL, 0x0203FFFFL, 0x0001FFFFL)}, // 3x s16
+		{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0x00010203L),  // 1x float
+		 _mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0x04050607L, 0x00010203L),  // 2x float
+		 _mm_set_epi32(0xFFFFFFFFL, 0x08090A0BL, 0x04050607L, 0x00010203L)}, // 3x float
+	};
+	static const __m128 scale_factors[32] = {
+		_mm_set_ps1(1./(1u<< 0)), _mm_set_ps1(1./(1u<< 1)), _mm_set_ps1(1./(1u<< 2)), _mm_set_ps1(1./(1u<< 3)),
+		_mm_set_ps1(1./(1u<< 4)), _mm_set_ps1(1./(1u<< 5)), _mm_set_ps1(1./(1u<< 6)), _mm_set_ps1(1./(1u<< 7)),
+		_mm_set_ps1(1./(1u<< 8)), _mm_set_ps1(1./(1u<< 9)), _mm_set_ps1(1./(1u<<10)), _mm_set_ps1(1./(1u<<11)),
+		_mm_set_ps1(1./(1u<<12)), _mm_set_ps1(1./(1u<<13)), _mm_set_ps1(1./(1u<<14)), _mm_set_ps1(1./(1u<<15)),
+		_mm_set_ps1(1./(1u<<16)), _mm_set_ps1(1./(1u<<17)), _mm_set_ps1(1./(1u<<18)), _mm_set_ps1(1./(1u<<19)),
+		_mm_set_ps1(1./(1u<<20)), _mm_set_ps1(1./(1u<<21)), _mm_set_ps1(1./(1u<<22)), _mm_set_ps1(1./(1u<<23)),
+		_mm_set_ps1(1./(1u<<24)), _mm_set_ps1(1./(1u<<25)), _mm_set_ps1(1./(1u<<26)), _mm_set_ps1(1./(1u<<27)),
+		_mm_set_ps1(1./(1u<<28)), _mm_set_ps1(1./(1u<<29)), _mm_set_ps1(1./(1u<<30)), _mm_set_ps1(1./(1u<<31)),
+	};
+
+	X64Reg coords = XMM0;
+
+	int elem_size = 1 << (format / 2);
+	int load_bytes = elem_size * count_in;
+	OpArg dest = MDisp(dst_reg, m_dst_ofs);
+
+	native_format->components = count_out;
+	native_format->enable = true;
+	native_format->offset = m_dst_ofs;
+	native_format->type = VAR_FLOAT;
+	native_format->integer = false;
+
+	m_dst_ofs += sizeof(float) * count_out;
+
+	if (attribute == DIRECT)
+		m_src_ofs += load_bytes;
+
+	if (cpu_info.bSSSE3)
+	{
+		if (load_bytes > 8)
+			MOVDQU(coords, data);
+		else if (load_bytes > 4)
+			MOVQ_xmm(coords, data);
+		else
+			MOVD_xmm(coords, data);
+
+		PSHUFB(coords, MPIC(&shuffle_lut[format][count_in - 1]));
+
+		// Sign-extend.
+		if (format == FORMAT_BYTE)
+			PSRAD(coords, 24);
+		if (format == FORMAT_SHORT)
+			PSRAD(coords, 16);
+	}
+	else
+	{
+		// SSE2
+		X64Reg temp = XMM1;
+		switch (format)
+		{
+		case FORMAT_UBYTE:
+			MOVD_xmm(coords, data);
+			PXOR(temp, R(temp));
+			PUNPCKLBW(coords, R(temp));
+			PUNPCKLWD(coords, R(temp));
+			break;
+		case FORMAT_BYTE:
+			MOVD_xmm(coords, data);
+			PUNPCKLBW(coords, R(coords));
+			PUNPCKLWD(coords, R(coords));
+			PSRAD(coords, 24);
+			break;
+		case FORMAT_USHORT:
+		case FORMAT_SHORT:
+			switch (count_in)
+			{
+			case 1:
+				LoadAndSwap(32, scratch3, data);
+				MOVD_xmm(coords, R(scratch3));    // ......X.
+				break;
+			case 2:
+				LoadAndSwap(32, scratch3, data);
+				MOVD_xmm(coords, R(scratch3));    // ......XY
+				PSHUFLW(coords, R(coords), 0x24); // ....Y.X.
+				break;
+			case 3:
+				LoadAndSwap(64, scratch3, data);
+				MOVQ_xmm(coords, R(scratch3));    // ....XYZ.
+				PUNPCKLQDQ(coords, R(coords));    // ..Z.XYZ.
+				PSHUFLW(coords, R(coords), 0xAC); // ..Z.Y.X.
+				break;
+			}
+			if (format == FORMAT_SHORT)
+				PSRAD(coords, 16);
+			else
+				PSRLD(coords, 16);
+			break;
+		case FORMAT_FLOAT:
+			// Floats don't need to be scaled or converted,
+			// so we can just load/swap/store them directly
+			// and return early.
+			// (In SSSE3 we still need to store them.)
+			for (int i = 0; i < count_in; i++)
+			{
+				LoadAndSwap(32, scratch3, data);
+				MOV(32, dest, R(scratch3));
+				data.AddMemOffset(sizeof(float));
+				dest.AddMemOffset(sizeof(float));
+
+				// zfreeze
+				if (native_format == &m_native_vtx_decl.position)
+				{
+					if (cpu_info.bSSE4_1)
+					{
+						PINSRD(coords, R(scratch3), i);
+					}
+					else
+					{
+						PINSRW(coords, R(scratch3), 2 * i + 0);
+						SHR(32, R(scratch3), Imm8(16));
+						PINSRW(coords, R(scratch3), 2 * i + 1);
+					}
+				}
+			}
+
+			// zfreeze
+			if (native_format == &m_native_vtx_decl.position)
+			{
+				CMP(32, R(count_reg), Imm8(3));
+				FixupBranch dont_store = J_CC(CC_A);
+				LEA(32, scratch3, MScaled(count_reg, SCALE_4, -4));
+				MOVUPS(MPIC(VertexLoaderManager::position_cache, scratch3, SCALE_4), coords);
+				SetJumpTarget(dont_store);
+			}
+			return load_bytes;
+		}
+	}
+
+	if (format != FORMAT_FLOAT)
+	{
+		CVTDQ2PS(coords, R(coords));
+
+		if (dequantize && scaling_exponent)
+			MULPS(coords, MPIC(&scale_factors[scaling_exponent]));
+	}
+
+	switch (count_out)
+	{
+	case 1: MOVSS(dest, coords); break;
+	case 2: MOVLPS(dest, coords); break;
+	case 3: MOVUPS(dest, coords); break;
+	}
+
+	// zfreeze
+	if (native_format == &m_native_vtx_decl.position)
+	{
+		CMP(32, R(count_reg), Imm8(3));
+		FixupBranch dont_store = J_CC(CC_A);
+		LEA(32, scratch3, MScaled(count_reg, SCALE_4, -4));
+		MOVUPS(MPIC(VertexLoaderManager::position_cache, scratch3, SCALE_4), coords);
+		SetJumpTarget(dont_store);
+	}
+
+	return load_bytes;
+}
+
+void VertexLoaderX64::ReadColor(OpArg data, u64 attribute, int format)
+{
+	int load_bytes = 0;
+	switch (format)
+	{
+		case FORMAT_24B_888:
+		case FORMAT_32B_888x:
+		case FORMAT_32B_8888:
+			MOV(32, R(scratch1), data);
+			if (format != FORMAT_32B_8888)
+				OR(32, R(scratch1), Imm32(0xFF000000));
+			MOV(32, MDisp(dst_reg, m_dst_ofs), R(scratch1));
+			load_bytes = 3 + (format != FORMAT_24B_888);
+			break;
+
+		case FORMAT_16B_565:
+			//                   RRRRRGGG GGGBBBBB
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			LoadAndSwap(16, scratch1, data);
+			if (cpu_info.bBMI1 && cpu_info.bBMI2)
+			{
+				MOV(32, R(scratch2), Imm32(0x07C3F7C0));
+				PDEP(32, scratch3, scratch1, R(scratch2));
+
+				MOV(32, R(scratch2), Imm32(0xF8FCF800));
+				PDEP(32, scratch1, scratch1, R(scratch2));
+				ANDN(32, scratch2, scratch2, R(scratch3));
+
+				OR(32, R(scratch1), R(scratch2));
+			}
+			else
+			{
+				MOV(32, R(scratch3), R(scratch1));
+				SHL(32, R(scratch1), Imm8(16));
+				AND(32, R(scratch1), Imm32(0xF8000000));
+
+				MOV(32, R(scratch2), R(scratch3));
+				SHL(32, R(scratch2), Imm8(13));
+				AND(32, R(scratch2), Imm32(0x00FC0000));
+				OR(32, R(scratch1), R(scratch2));
+
+				SHL(32, R(scratch3), Imm8(11));
+				AND(32, R(scratch3), Imm32(0x0000F800));
+				OR(32, R(scratch1), R(scratch3));
+
+				MOV(32, R(scratch2), R(scratch1));
+				SHR(32, R(scratch1), Imm8(5));
+				AND(32, R(scratch1), Imm32(0x07000700));
+				OR(32, R(scratch1), R(scratch2));
+
+				SHR(32, R(scratch2), Imm8(6));
+				AND(32, R(scratch2), Imm32(0x00030000));
+				OR(32, R(scratch1), R(scratch2));
+			}
+
+			OR(32, R(scratch1), Imm32(0x000000FF));
+			SwapAndStore(32, MDisp(dst_reg, m_dst_ofs), scratch1);
+			load_bytes = 2;
+			break;
+
+		case FORMAT_16B_4444:
+			//                   RRRRGGGG BBBBAAAA
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			LoadAndSwap(16, scratch1, data);
+			if (cpu_info.bBMI2)
+			{
+				MOV(32, R(scratch3), Imm32(0x0F0F0F0F));
+				PDEP(32, scratch2, scratch1, R(scratch3));
+				MOV(32, R(scratch3), Imm32(0xF0F0F0F0));
+				PDEP(32, scratch1, scratch1, R(scratch3));
+			}
+			else
+			{
+				MOV(32, R(scratch3), R(scratch1));
+				SHL(32, R(scratch1), Imm8(12));
+				AND(32, R(scratch1), Imm32(0x0F000000));
+				MOV(32, R(scratch2), R(scratch1));
+
+				MOV(32, R(scratch1), R(scratch3));
+				SHL(32, R(scratch1), Imm8(8));
+				AND(32, R(scratch1), Imm32(0x000F0000));
+				OR(32, R(scratch2), R(scratch1));
+
+				MOV(32, R(scratch1), R(scratch3));
+				SHL(32, R(scratch1), Imm8(4));
+				AND(32, R(scratch1), Imm32(0x00000F00));
+				OR(32, R(scratch2), R(scratch1));
+
+				AND(32, R(scratch3), Imm8(0x0F));
+				OR(32, R(scratch2), R(scratch3));
+
+				MOV(32, R(scratch1), R(scratch2));
+				SHL(32, R(scratch1), Imm8(4));
+			}
+			OR(32, R(scratch1), R(scratch2));
+			SwapAndStore(32, MDisp(dst_reg, m_dst_ofs), scratch1);
+			load_bytes = 2;
+			break;
+
+		case FORMAT_24B_6666:
+			//          RRRRRRGG GGGGBBBB BBAAAAAA
+			// AAAAAAAA BBBBBBBB GGGGGGGG RRRRRRRR
+			data.AddMemOffset(-1); // subtract one from address so we can use a 32bit load and bswap
+			LoadAndSwap(32, scratch1, data);
+			if (cpu_info.bBMI2)
+			{
+				MOV(32, R(scratch2), Imm32(0xFCFCFCFC));
+				PDEP(32, scratch1, scratch1, R(scratch2));
+				MOV(32, R(scratch2), R(scratch1));
+			}
+			else
+			{
+				MOV(32, R(scratch3), R(scratch1));
+				SHL(32, R(scratch1), Imm8(8));
+				AND(32, R(scratch1), Imm32(0xFC000000));
+				MOV(32, R(scratch2), R(scratch1));
+
+				MOV(32, R(scratch1), R(scratch3));
+				SHL(32, R(scratch1), Imm8(6));
+				AND(32, R(scratch1), Imm32(0x00FC0000));
+				OR(32, R(scratch2), R(scratch1));
+
+				MOV(32, R(scratch1), R(scratch3));
+				SHL(32, R(scratch1), Imm8(4));
+				AND(32, R(scratch1), Imm32(0x0000FC00));
+				OR(32, R(scratch2), R(scratch1));
+
+				SHL(32, R(scratch3), Imm8(2));
+				AND(32, R(scratch3), Imm32(0x000000FC));
+				OR(32, R(scratch2), R(scratch3));
+
+				MOV(32, R(scratch1), R(scratch2));
+			}
+
+			SHR(32, R(scratch1), Imm8(6));
+			AND(32, R(scratch1), Imm32(0x03030303));
+			OR(32, R(scratch1), R(scratch2));
+
+			SwapAndStore(32, MDisp(dst_reg, m_dst_ofs), scratch1);
+			load_bytes = 3;
+			break;
+	}
+	if (attribute == DIRECT)
+		m_src_ofs += load_bytes;
+}
+
+void VertexLoaderX64::GenerateVertexLoader()
+{
+	BitSet32 regs = {src_reg, dst_reg, scratch1, scratch2, scratch3, count_reg, skipped_reg, base_reg};
+	regs &= ABI_ALL_CALLEE_SAVED;
+	ABI_PushRegistersAndAdjustStack(regs, 0);
+
+	// Backup count since we're going to count it down.
+	PUSH(32, R(ABI_PARAM3));
+
+	// ABI_PARAM3 is one of the lower registers, so free it for scratch2.
+	MOV(32, R(count_reg), R(ABI_PARAM3));
+
+	MOV(64, R(base_reg), R(ABI_PARAM4));
+
+	if (m_VtxDesc.Position & MASK_INDEXED)
+		XOR(32, R(skipped_reg), R(skipped_reg));
+
+	// TODO: load constants into registers outside the main loop
+
+	const u8* loop_start = GetCodePtr();
+
+	if (m_VtxDesc.PosMatIdx)
+	{
+		MOVZX(32, 8, scratch1, MDisp(src_reg, m_src_ofs));
+		AND(32, R(scratch1), Imm8(0x3F));
+		MOV(32, MDisp(dst_reg, m_dst_ofs), R(scratch1));
+
+		// zfreeze
+		CMP(32, R(count_reg), Imm8(3));
+		FixupBranch dont_store = J_CC(CC_A);
+		MOV(32, MPIC(VertexLoaderManager::position_matrix_index - 1, count_reg, SCALE_4), R(scratch1));
+		SetJumpTarget(dont_store);
+
+		m_native_components |= VB_HAS_POSMTXIDX;
+		m_native_vtx_decl.posmtx.components = 4;
+		m_native_vtx_decl.posmtx.enable = true;
+		m_native_vtx_decl.posmtx.offset = m_dst_ofs;
+		m_native_vtx_decl.posmtx.type = VAR_UNSIGNED_BYTE;
+		m_native_vtx_decl.posmtx.integer = true;
+		m_src_ofs += sizeof(u8);
+		m_dst_ofs += sizeof(u32);
+	}
+
+	u32 texmatidx_ofs[8];
+	const u64 tm[8] = {
+		m_VtxDesc.Tex0MatIdx, m_VtxDesc.Tex1MatIdx, m_VtxDesc.Tex2MatIdx, m_VtxDesc.Tex3MatIdx,
+		m_VtxDesc.Tex4MatIdx, m_VtxDesc.Tex5MatIdx, m_VtxDesc.Tex6MatIdx, m_VtxDesc.Tex7MatIdx,
+	};
+	for (int i = 0; i < 8; i++)
+	{
+		if (tm[i])
+			texmatidx_ofs[i] = m_src_ofs++;
+	}
+
+	OpArg data = GetVertexAddr(ARRAY_POSITION, m_VtxDesc.Position);
+	int pos_elements = 2 + m_VtxAttr.PosElements;
+	ReadVertex(data, m_VtxDesc.Position, m_VtxAttr.PosFormat, pos_elements, pos_elements,
+	           m_VtxAttr.ByteDequant, m_VtxAttr.PosFrac, &m_native_vtx_decl.position);
+
+	if (m_VtxDesc.Normal)
+	{
+		static const u8 map[8] = { 7, 6, 15, 14 };
+		u8 scaling_exponent = map[m_VtxAttr.NormalFormat];
+
+		for (int i = 0; i < (m_VtxAttr.NormalElements ? 3 : 1); i++)
+		{
+			if (!i || m_VtxAttr.NormalIndex3)
+			{
+				data = GetVertexAddr(ARRAY_NORMAL, m_VtxDesc.Normal);
+				int elem_size = 1 << (m_VtxAttr.NormalFormat / 2);
+				data.AddMemOffset(i * elem_size * 3);
+			}
+			data.AddMemOffset(ReadVertex(data, m_VtxDesc.Normal, m_VtxAttr.NormalFormat, 3, 3,
+			                             true, scaling_exponent, &m_native_vtx_decl.normals[i]));
+		}
+
+		m_native_components |= VB_HAS_NRM0;
+		if (m_VtxAttr.NormalElements)
+			m_native_components |= VB_HAS_NRM1 | VB_HAS_NRM2;
+	}
+
+	const u64 col[2] = { m_VtxDesc.Color0, m_VtxDesc.Color1 };
+	for (int i = 0; i < 2; i++)
+	{
+		if (col[i])
+		{
+			data = GetVertexAddr(ARRAY_COLOR + i, col[i]);
+			ReadColor(data, col[i], m_VtxAttr.color[i].Comp);
+			m_native_components |= VB_HAS_COL0 << i;
+			m_native_vtx_decl.colors[i].components = 4;
+			m_native_vtx_decl.colors[i].enable = true;
+			m_native_vtx_decl.colors[i].offset = m_dst_ofs;
+			m_native_vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE;
+			m_native_vtx_decl.colors[i].integer = false;
+			m_dst_ofs += 4;
+		}
+	}
+
+	const u64 tc[8] = {
+		m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord,
+		m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord,
+	};
+	for (int i = 0; i < 8; i++)
+	{
+		int elements = m_VtxAttr.texCoord[i].Elements + 1;
+		if (tc[i])
+		{
+			data = GetVertexAddr(ARRAY_TEXCOORD0 + i, tc[i]);
+			u8 scaling_exponent = m_VtxAttr.texCoord[i].Frac;
+			ReadVertex(data, tc[i], m_VtxAttr.texCoord[i].Format, elements, tm[i] ? 2 : elements,
+			           m_VtxAttr.ByteDequant, scaling_exponent, &m_native_vtx_decl.texcoords[i]);
+			m_native_components |= VB_HAS_UV0 << i;
+		}
+		if (tm[i])
+		{
+			m_native_components |= VB_HAS_TEXMTXIDX0 << i;
+			m_native_vtx_decl.texcoords[i].components = 3;
+			m_native_vtx_decl.texcoords[i].enable = true;
+			m_native_vtx_decl.texcoords[i].type = VAR_FLOAT;
+			m_native_vtx_decl.texcoords[i].integer = false;
+			MOVZX(64, 8, scratch1, MDisp(src_reg, texmatidx_ofs[i]));
+			if (tc[i])
+			{
+				CVTSI2SS(XMM0, R(scratch1));
+				MOVSS(MDisp(dst_reg, m_dst_ofs), XMM0);
+				m_dst_ofs += sizeof(float);
+			}
+			else
+			{
+				m_native_vtx_decl.texcoords[i].offset = m_dst_ofs;
+				PXOR(XMM0, R(XMM0));
+				CVTSI2SS(XMM0, R(scratch1));
+				SHUFPS(XMM0, R(XMM0), 0x45); // 000X -> 0X00
+				MOVUPS(MDisp(dst_reg, m_dst_ofs), XMM0);
+				m_dst_ofs += sizeof(float) * 3;
+			}
+		}
+	}
+
+	// Prepare for the next vertex.
+	ADD(64, R(dst_reg), Imm32(m_dst_ofs));
+	const u8* cont = GetCodePtr();
+	ADD(64, R(src_reg), Imm32(m_src_ofs));
+
+	SUB(32, R(count_reg), Imm8(1));
+	J_CC(CC_NZ, loop_start);
+
+	// Get the original count.
+	POP(32, R(ABI_RETURN));
+
+	ABI_PopRegistersAndAdjustStack(regs, 0);
+
+	if (m_VtxDesc.Position & MASK_INDEXED)
+	{
+		SUB(32, R(ABI_RETURN), R(skipped_reg));
+		RET();
+
+		SetJumpTarget(m_skip_vertex);
+		ADD(32, R(skipped_reg), Imm8(1));
+		JMP(cont);
+	}
+	else
+	{
+		RET();
+	}
+
+	m_VertexSize = m_src_ofs;
+	m_native_vtx_decl.stride = m_dst_ofs;
+}
+
+int VertexLoaderX64::RunVertices(DataReader src, DataReader dst, int count)
+{
+	m_numLoadedVertices += count;
+	return ((int (*)(u8*, u8*, int, const void*))region)(
+		src.GetPointer(),
+		dst.GetPointer(),
+		count,
+		memory_base_ptr);
+}
diff --git a/Source/Core/VideoCommon/VertexLoaderX64.h b/Source/Core/VideoCommon/VertexLoaderX64.h
new file mode 100644
index 0000000000..2d5ff72beb
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoaderX64.h
@@ -0,0 +1,26 @@
+// Copyright 2015 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/x64Emitter.h"
+#include "VideoCommon/VertexLoaderBase.h"
+
+class VertexLoaderX64 : public VertexLoaderBase, public Gen::X64CodeBlock
+{
+public:
+	VertexLoaderX64(const TVtxDesc& vtx_desc, const VAT& vtx_att);
+
+protected:
+	std::string GetName() const override { return "VertexLoaderX64"; }
+	bool IsInitialized() override { return true; }
+	int RunVertices(DataReader src, DataReader dst, int count) override;
+
+private:
+	u32 m_src_ofs = 0;
+	u32 m_dst_ofs = 0;
+	Gen::FixupBranch m_skip_vertex;
+	Gen::OpArg GetVertexAddr(int array, u64 attribute);
+	int ReadVertex(Gen::OpArg data, u64 attribute, int format, int count_in, int count_out, bool dequantize, u8 scaling_exponent, AttributeFormat* native_format);
+	void ReadColor(Gen::OpArg data, u64 attribute, int format);
+	void GenerateVertexLoader();
+};
diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp
new file mode 100644
index 0000000000..cf9ca88280
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp
@@ -0,0 +1,161 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Color.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+#define AMASK 0xFF000000
+
+__forceinline void _SetCol(VertexLoader* loader, u32 val)
+{
+	DataWrite(val);
+	loader->m_colIndex++;
+}
+
+//color comes in format BARG in 16 bits
+//BARG -> AABBGGRR
+__forceinline void _SetCol4444(VertexLoader* loader, u16 val_)
+{
+	u32 col, val = val_;
+	col  =  val & 0x00F0;        // col  = 000000R0;
+	col |= (val & 0x000F) << 12; // col |= 0000G000;
+	col |= (val & 0xF000) << 8;  // col |= 00B00000;
+	col |= (val & 0x0F00) << 20; // col |= A0000000;
+	col |= col >> 4;             // col  = A0B0G0R0 | 0A0B0G0R;
+	_SetCol(loader, col);
+}
+
+//color comes in format RGBA
+//RRRRRRGG GGGGBBBB BBAAAAAA
+__forceinline void _SetCol6666(VertexLoader* loader, u32 val)
+{
+	u32 col = (val >> 16) & 0x000000FC;
+	col |=    (val >>  2) & 0x0000FC00;
+	col |=    (val << 12) & 0x00FC0000;
+	col |=    (val << 26) & 0xFC000000;
+	col |=    (col >>  6) & 0x03030303;
+	_SetCol(loader, col);
+}
+
+//color comes in RGB
+//RRRRRGGG GGGBBBBB
+__forceinline void _SetCol565(VertexLoader* loader, u16 val_)
+{
+	u32 col, val = val_;
+	col  = (val >>  8) & 0x0000F8;
+	col |= (val <<  5) & 0x00FC00;
+	col |= (val << 19) & 0xF80000;
+	col |= (col >>  5) & 0x070007;
+	col |= (col >>  6) & 0x000300;
+	_SetCol(loader, col | AMASK);
+}
+
+__forceinline u32 _Read24(const u8 *addr)
+{
+	return (*(const u32 *)addr) | AMASK;
+}
+
+__forceinline u32 _Read32(const u8 *addr)
+{
+	return *(const u32 *)addr;
+}
+
+
+void LOADERDECL Color_ReadDirect_24b_888(VertexLoader* loader)
+{
+	_SetCol(loader, _Read24(DataGetPosition()));
+	DataSkip(3);
+}
+
+void LOADERDECL Color_ReadDirect_32b_888x(VertexLoader* loader)
+{
+	_SetCol(loader, _Read24(DataGetPosition()));
+	DataSkip(4);
+}
+void LOADERDECL Color_ReadDirect_16b_565(VertexLoader* loader)
+{
+	_SetCol565(loader, DataReadU16());
+}
+void LOADERDECL Color_ReadDirect_16b_4444(VertexLoader* loader)
+{
+	_SetCol4444(loader, *(u16*)DataGetPosition());
+	DataSkip(2);
+}
+void LOADERDECL Color_ReadDirect_24b_6666(VertexLoader* loader)
+{
+	_SetCol6666(loader, Common::swap32(DataGetPosition() - 1));
+	DataSkip(3);
+}
+void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader)
+{
+	_SetCol(loader, DataReadU32Unswapped());
+}
+
+template <typename I>
+void Color_ReadIndex_16b_565(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	u16 val = Common::swap16(*(const u16 *)(VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex])));
+	_SetCol565(loader, val);
+}
+
+template <typename I>
+void Color_ReadIndex_24b_888(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	const u8 *iAddress = VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex]);
+	_SetCol(loader, _Read24(iAddress));
+}
+
+template <typename I>
+void Color_ReadIndex_32b_888x(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	const u8 *iAddress = VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex]);
+	_SetCol(loader, _Read24(iAddress));
+}
+
+template <typename I>
+void Color_ReadIndex_16b_4444(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	u16 val = *(const u16 *)(VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex]));
+	_SetCol4444(loader, val);
+}
+
+template <typename I>
+void Color_ReadIndex_24b_6666(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	const u8* pData = VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex]) - 1;
+	u32 val = Common::swap32(pData);
+	_SetCol6666(loader, val);
+}
+
+template <typename I>
+void Color_ReadIndex_32b_8888(VertexLoader* loader)
+{
+	auto const Index = DataRead<I>();
+	const u8 *iAddress = VertexLoaderManager::cached_arraybases[ARRAY_COLOR + loader->m_colIndex] + (Index * g_main_cp_state.array_strides[ARRAY_COLOR + loader->m_colIndex]);
+	_SetCol(loader, _Read32(iAddress));
+}
+
+void LOADERDECL Color_ReadIndex8_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u8>(loader); }
+void LOADERDECL Color_ReadIndex8_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u8>(loader); }
+void LOADERDECL Color_ReadIndex8_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u8>(loader); }
+void LOADERDECL Color_ReadIndex8_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u8>(loader); }
+void LOADERDECL Color_ReadIndex8_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u8>(loader); }
+void LOADERDECL Color_ReadIndex8_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u8>(loader); }
+
+void LOADERDECL Color_ReadIndex16_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u16>(loader); }
+void LOADERDECL Color_ReadIndex16_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u16>(loader); }
+void LOADERDECL Color_ReadIndex16_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u16>(loader); }
+void LOADERDECL Color_ReadIndex16_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u16>(loader); }
+void LOADERDECL Color_ReadIndex16_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u16>(loader); }
+void LOADERDECL Color_ReadIndex16_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u16>(loader); }
diff --git a/Source/Core/VideoCommon/VertexLoader_Color.h b/Source/Core/VideoCommon/VertexLoader_Color.h
new file mode 100644
index 0000000000..6bf21e548f
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Color.h
@@ -0,0 +1,30 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/NativeVertexFormat.h"
+
+class VertexLoader;
+
+void LOADERDECL Color_ReadDirect_24b_888(VertexLoader* loader);
+void LOADERDECL Color_ReadDirect_32b_888x(VertexLoader* loader);
+void LOADERDECL Color_ReadDirect_16b_565(VertexLoader* loader);
+void LOADERDECL Color_ReadDirect_16b_4444(VertexLoader* loader);
+void LOADERDECL Color_ReadDirect_24b_6666(VertexLoader* loader);
+void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader);
+
+void LOADERDECL Color_ReadIndex8_16b_565(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex8_24b_888(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex8_32b_888x(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex8_16b_4444(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex8_24b_6666(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex8_32b_8888(VertexLoader* loader);
+
+void LOADERDECL Color_ReadIndex16_16b_565(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex16_24b_888(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex16_32b_888x(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex16_16b_4444(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex16_24b_6666(VertexLoader* loader);
+void LOADERDECL Color_ReadIndex16_32b_8888(VertexLoader* loader);
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
new file mode 100644
index 0000000000..939b902a9d
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -0,0 +1,189 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+#include <type_traits>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+// warning: mapping buffer should be disabled to use this
+#define LOG_NORM()  // PRIM_LOG("norm: %f %f %f, ", ((float*)g_vertex_manager_write_ptr)[-3], ((float*)g_vertex_manager_write_ptr)[-2], ((float*)g_vertex_manager_write_ptr)[-1]);
+
+VertexLoader_Normal::Set VertexLoader_Normal::m_Table[NUM_NRM_TYPE][NUM_NRM_INDICES][NUM_NRM_ELEMENTS][NUM_NRM_FORMAT];
+
+namespace
+{
+
+template <typename T>
+__forceinline float FracAdjust(T val)
+{
+	//auto const S8FRAC = 1.f / (1u << 6);
+	//auto const U8FRAC = 1.f / (1u << 7);
+	//auto const S16FRAC = 1.f / (1u << 14);
+	//auto const U16FRAC = 1.f / (1u << 15);
+
+	// TODO: is this right?
+	return val / float(1u << (sizeof(T) * 8 - std::is_signed<T>::value - 1));
+}
+
+template <>
+__forceinline float FracAdjust(float val)
+{
+	return val;
+}
+
+template <typename T, int N>
+__forceinline void ReadIndirect(const T* data)
+{
+	static_assert(3 == N || 9 == N, "N is only sane as 3 or 9!");
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
+
+	for (int i = 0; i != N; ++i)
+	{
+		dst.Write(FracAdjust(Common::FromBigEndian(data[i])));
+	}
+
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	LOG_NORM();
+}
+
+template <typename T, int N>
+struct Normal_Direct
+{
+	static void LOADERDECL function(VertexLoader* loader)
+	{
+		auto const source = reinterpret_cast<const T*>(DataGetPosition());
+		ReadIndirect<T, N * 3>(source);
+		DataSkip<N * 3 * sizeof(T)>();
+	}
+
+	static const int size = sizeof(T) * N * 3;
+};
+
+template <typename I, typename T, int N, int Offset>
+__forceinline void Normal_Index_Offset()
+{
+	static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!");
+
+	auto const index = DataRead<I>();
+	auto const data = reinterpret_cast<const T*>(VertexLoaderManager::cached_arraybases[ARRAY_NORMAL]
+	                + (index * g_main_cp_state.array_strides[ARRAY_NORMAL]) + sizeof(T) * 3 * Offset);
+	ReadIndirect<T, N * 3>(data);
+}
+
+template <typename I, typename T, int N>
+struct Normal_Index
+{
+	static void LOADERDECL function(VertexLoader* loader)
+	{
+		Normal_Index_Offset<I, T, N, 0>();
+	}
+
+	static const int size = sizeof(I);
+};
+
+template <typename I, typename T>
+struct Normal_Index_Indices3
+{
+	static void LOADERDECL function(VertexLoader* loader)
+	{
+		Normal_Index_Offset<I, T, 1, 0>();
+		Normal_Index_Offset<I, T, 1, 1>();
+		Normal_Index_Offset<I, T, 1, 2>();
+	}
+
+	static const int size = sizeof(I) * 3;
+};
+
+}
+
+void VertexLoader_Normal::Init()
+{
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE]  = Normal_Direct<u8, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]   = Normal_Direct<s8, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT]  = Normal_Direct<s16, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT]  = Normal_Direct<float, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE]  = Normal_Direct<u8, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]   = Normal_Direct<s8, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT]  = Normal_Direct<s16, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT]  = Normal_Direct<float, 3>();
+
+	// Same as above
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE]  = Normal_Direct<u8, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]   = Normal_Direct<s8, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT]  = Normal_Direct<s16, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT]  = Normal_Direct<float, 1>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE]  = Normal_Direct<u8, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]   = Normal_Direct<s8, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT]  = Normal_Direct<s16, 3>();
+	m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT]  = Normal_Direct<float, 3>();
+
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE]  = Normal_Index<u8, u8, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]   = Normal_Index<u8, s8, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT]  = Normal_Index<u8, s16, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT]  = Normal_Index<u8, float, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE]  = Normal_Index<u8, u8, 3>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]   = Normal_Index<u8, s8, 3>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u8, u16, 3>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT]  = Normal_Index<u8, s16, 3>();
+	m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT]  = Normal_Index<u8, float, 3>();
+
+	// Same as above for NRM_NBT
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE]  = Normal_Index<u8, u8, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]   = Normal_Index<u8, s8, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT]  = Normal_Index<u8, s16, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT]  = Normal_Index<u8, float, 1>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE]  = Normal_Index_Indices3<u8, u8>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]   = Normal_Index_Indices3<u8, s8>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u8, u16>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT]  = Normal_Index_Indices3<u8, s16>();
+	m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT]  = Normal_Index_Indices3<u8, float>();
+
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE]  = Normal_Index<u16, u8, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]   = Normal_Index<u16, s8, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_SHORT]  = Normal_Index<u16, s16, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT]  = Normal_Index<u16, float, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE]  = Normal_Index<u16, u8, 3>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_BYTE]   = Normal_Index<u16, s8, 3>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u16, u16, 3>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_SHORT]  = Normal_Index<u16, s16, 3>();
+	m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT]  = Normal_Index<u16, float, 3>();
+
+	// Same as above for NRM_NBT
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE]  = Normal_Index<u16, u8, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_BYTE]   = Normal_Index<u16, s8, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_SHORT]  = Normal_Index<u16, s16, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT]  = Normal_Index<u16, float, 1>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE]  = Normal_Index_Indices3<u16, u8>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_BYTE]   = Normal_Index_Indices3<u16, s8>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u16, u16>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_SHORT]  = Normal_Index_Indices3<u16, s16>();
+	m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT]  = Normal_Index_Indices3<u16, float>();
+}
+
+unsigned int VertexLoader_Normal::GetSize(u64 _type,
+	unsigned int _format, unsigned int _elements, unsigned int _index3)
+{
+	return m_Table[_type][_index3][_elements][_format].gc_size;
+}
+
+TPipelineFunction VertexLoader_Normal::GetFunction(u64 _type,
+	unsigned int _format, unsigned int _elements, unsigned int _index3)
+{
+	TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function;
+	return pFunc;
+}
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
new file mode 100644
index 0000000000..ff9532272b
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -0,0 +1,72 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/NativeVertexFormat.h"
+
+class VertexLoader_Normal
+{
+public:
+
+	// Init
+	static void Init();
+
+	// GetSize
+	static unsigned int GetSize(u64 _type, unsigned int _format,
+		unsigned int _elements, unsigned int _index3);
+
+	// GetFunction
+	static TPipelineFunction GetFunction(u64 _type,
+		unsigned int _format, unsigned int _elements, unsigned int _index3);
+
+private:
+	enum ENormalType
+	{
+		NRM_NOT_PRESENT = 0,
+		NRM_DIRECT      = 1,
+		NRM_INDEX8      = 2,
+		NRM_INDEX16     = 3,
+		NUM_NRM_TYPE
+	};
+
+	enum ENormalFormat
+	{
+		FORMAT_UBYTE   = 0,
+		FORMAT_BYTE    = 1,
+		FORMAT_USHORT  = 2,
+		FORMAT_SHORT   = 3,
+		FORMAT_FLOAT   = 4,
+		NUM_NRM_FORMAT
+	};
+
+	enum ENormalElements
+	{
+		NRM_NBT          = 0,
+		NRM_NBT3         = 1,
+		NUM_NRM_ELEMENTS
+	};
+
+	enum ENormalIndices
+	{
+		NRM_INDICES1    = 0,
+		NRM_INDICES3    = 1,
+		NUM_NRM_INDICES
+	};
+
+	struct Set
+	{
+		template <typename T>
+		void operator=(const T&)
+		{
+			gc_size = T::size;
+			function = T::function;
+		}
+
+		int gc_size;
+		TPipelineFunction function;
+	};
+
+	static Set m_Table[NUM_NRM_TYPE][NUM_NRM_INDICES][NUM_NRM_ELEMENTS][NUM_NRM_FORMAT];
+};
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
new file mode 100644
index 0000000000..fd17fbf4d7
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -0,0 +1,125 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <type_traits>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Position.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+template <typename T>
+float PosScale(T val, float scale)
+{
+	return val * scale;
+}
+
+template <>
+float PosScale(float val, float scale)
+{
+	return val;
+}
+
+template <typename T, int N>
+void LOADERDECL Pos_ReadDirect(VertexLoader* loader)
+{
+	static_assert(N <= 3, "N > 3 is not sane!");
+	auto const scale = loader->m_posScale;
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
+	DataReader src(g_video_buffer_read_ptr, nullptr);
+
+	for (int i = 0; i < N; ++i)
+	{
+		float value = PosScale(src.Read<T>(), scale);
+		if (loader->m_counter < 3)
+			VertexLoaderManager::position_cache[loader->m_counter][i] = value;
+		dst.Write(value);
+	}
+
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	g_video_buffer_read_ptr = src.GetPointer();
+	LOG_VTX();
+}
+
+template <typename I, typename T, int N>
+void LOADERDECL Pos_ReadIndex(VertexLoader* loader)
+{
+	static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!");
+	static_assert(N <= 3, "N > 3 is not sane!");
+
+	auto const index = DataRead<I>();
+	loader->m_vertexSkip = index == std::numeric_limits<I>::max();
+	auto const data = reinterpret_cast<const T*>(VertexLoaderManager::cached_arraybases[ARRAY_POSITION] + (index * g_main_cp_state.array_strides[ARRAY_POSITION]));
+	auto const scale = loader->m_posScale;
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
+
+	for (int i = 0; i < N; ++i)
+	{
+		float value = PosScale(Common::FromBigEndian(data[i]), scale);
+		if (loader->m_counter < 3)
+			VertexLoaderManager::position_cache[loader->m_counter][i] = value;
+		dst.Write(value);
+	}
+
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	LOG_VTX();
+}
+
+static TPipelineFunction tableReadPosition[4][8][2] = {
+	{
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+	},
+	{
+		{Pos_ReadDirect<u8, 2>, Pos_ReadDirect<u8, 3>,},
+		{Pos_ReadDirect<s8, 2>, Pos_ReadDirect<s8, 3>,},
+		{Pos_ReadDirect<u16, 2>, Pos_ReadDirect<u16, 3>,},
+		{Pos_ReadDirect<s16, 2>, Pos_ReadDirect<s16, 3>,},
+		{Pos_ReadDirect<float, 2>, Pos_ReadDirect<float, 3>,},
+	},
+	{
+		{Pos_ReadIndex<u8, u8, 2>, Pos_ReadIndex<u8, u8, 3>,},
+		{Pos_ReadIndex<u8, s8, 2>, Pos_ReadIndex<u8, s8, 3>,},
+		{Pos_ReadIndex<u8, u16, 2>, Pos_ReadIndex<u8, u16, 3>,},
+		{Pos_ReadIndex<u8, s16, 2>, Pos_ReadIndex<u8, s16, 3>,},
+		{Pos_ReadIndex<u8, float, 2>, Pos_ReadIndex<u8, float, 3>,},
+	},
+	{
+		{Pos_ReadIndex<u16, u8, 2>, Pos_ReadIndex<u16, u8, 3>,},
+		{Pos_ReadIndex<u16, s8, 2>, Pos_ReadIndex<u16, s8, 3>,},
+		{Pos_ReadIndex<u16, u16, 2>, Pos_ReadIndex<u16, u16, 3>,},
+		{Pos_ReadIndex<u16, s16, 2>, Pos_ReadIndex<u16, s16, 3>,},
+		{Pos_ReadIndex<u16, float, 2>, Pos_ReadIndex<u16, float, 3>,},
+	},
+};
+
+static int tableReadPositionVertexSize[4][8][2] = {
+	{
+		{0, 0,}, {0, 0,}, {0, 0,}, {0, 0,}, {0, 0,},
+	},
+	{
+		{2, 3,}, {2, 3,}, {4, 6,}, {4, 6,}, {8, 12,},
+	},
+	{
+		{1, 1,}, {1, 1,}, {1, 1,}, {1, 1,}, {1, 1,},
+	},
+	{
+		{2, 2,}, {2, 2,}, {2, 2,}, {2, 2,}, {2, 2,},
+	},
+};
+
+unsigned int VertexLoader_Position::GetSize(u64 _type, unsigned int _format, unsigned int _elements)
+{
+	return tableReadPositionVertexSize[_type][_format][_elements];
+}
+
+TPipelineFunction VertexLoader_Position::GetFunction(u64 _type, unsigned int _format, unsigned int _elements)
+{
+	return tableReadPosition[_type][_format][_elements];
+}
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.h b/Source/Core/VideoCommon/VertexLoader_Position.h
new file mode 100644
index 0000000000..65a97e5bde
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_Position.h
@@ -0,0 +1,21 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/NativeVertexFormat.h"
+
+class VertexLoader_Position {
+public:
+
+	// Init
+	static void Init();
+
+	// GetSize
+	static unsigned int GetSize(u64 _type, unsigned int _format, unsigned int _elements);
+
+	// GetFunction
+	static TPipelineFunction GetFunction(u64 _type, unsigned int _format, unsigned int _elements);
+};
+
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
new file mode 100644
index 0000000000..7904a5ce88
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
@@ -0,0 +1,143 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <type_traits>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VideoCommon.h"
+
+template <int N>
+void LOG_TEX();
+
+template <>
+__forceinline void LOG_TEX<1>()
+{
+	// warning: mapping buffer should be disabled to use this
+	// PRIM_LOG("tex: %f, ", ((float*)g_vertex_manager_write_ptr)[-1]);
+}
+
+template <>
+__forceinline void LOG_TEX<2>()
+{
+	// warning: mapping buffer should be disabled to use this
+	// PRIM_LOG("tex: %f %f, ", ((float*)g_vertex_manager_write_ptr)[-2], ((float*)g_vertex_manager_write_ptr)[-1]);
+}
+
+static void LOADERDECL TexCoord_Read_Dummy(VertexLoader* loader)
+{
+	loader->m_tcIndex++;
+}
+
+template <typename T>
+float TCScale(T val, float scale)
+{
+	return val * scale;
+}
+
+template <>
+float TCScale(float val, float scale)
+{
+	return val;
+}
+
+template <typename T, int N>
+void LOADERDECL TexCoord_ReadDirect(VertexLoader* loader)
+{
+	auto const scale = loader->m_tcScale[loader->m_tcIndex];
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
+	DataReader src(g_video_buffer_read_ptr, nullptr);
+
+	for (int i = 0; i != N; ++i)
+		dst.Write(TCScale(src.Read<T>(), scale));
+
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	g_video_buffer_read_ptr = src.GetPointer();
+	LOG_TEX<N>();
+
+	++loader->m_tcIndex;
+}
+
+template <typename I, typename T, int N>
+void LOADERDECL TexCoord_ReadIndex(VertexLoader* loader)
+{
+	static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!");
+
+	auto const index = DataRead<I>();
+	auto const data = reinterpret_cast<const T*>(VertexLoaderManager::cached_arraybases[ARRAY_TEXCOORD0 + loader->m_tcIndex]
+	                + (index * g_main_cp_state.array_strides[ARRAY_TEXCOORD0 + loader->m_tcIndex]));
+	auto const scale = loader->m_tcScale[loader->m_tcIndex];
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
+
+	for (int i = 0; i != N; ++i)
+		dst.Write(TCScale(Common::FromBigEndian(data[i]), scale));
+
+	g_vertex_manager_write_ptr = dst.GetPointer();
+	LOG_TEX<N>();
+	++loader->m_tcIndex;
+}
+
+static TPipelineFunction tableReadTexCoord[4][8][2] = {
+	{
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+		{nullptr, nullptr,},
+	},
+	{
+		{TexCoord_ReadDirect<u8, 1>,  TexCoord_ReadDirect<u8, 2>,},
+		{TexCoord_ReadDirect<s8, 1>,   TexCoord_ReadDirect<s8, 2>,},
+		{TexCoord_ReadDirect<u16, 1>, TexCoord_ReadDirect<u16, 2>,},
+		{TexCoord_ReadDirect<s16, 1>,  TexCoord_ReadDirect<s16, 2>,},
+		{TexCoord_ReadDirect<float, 1>,  TexCoord_ReadDirect<float, 2>,},
+	},
+	{
+		{TexCoord_ReadIndex<u8, u8, 1>,  TexCoord_ReadIndex<u8, u8, 2>,},
+		{TexCoord_ReadIndex<u8, s8, 1>,   TexCoord_ReadIndex<u8, s8, 2>,},
+		{TexCoord_ReadIndex<u8, u16, 1>, TexCoord_ReadIndex<u8, u16, 2>,},
+		{TexCoord_ReadIndex<u8, s16, 1>,  TexCoord_ReadIndex<u8, s16, 2>,},
+		{TexCoord_ReadIndex<u8, float, 1>,  TexCoord_ReadIndex<u8, float, 2>,},
+	},
+	{
+		{TexCoord_ReadIndex<u16, u8, 1>,  TexCoord_ReadIndex<u16, u8, 2>,},
+		{TexCoord_ReadIndex<u16, s8, 1>,   TexCoord_ReadIndex<u16, s8, 2>,},
+		{TexCoord_ReadIndex<u16, u16, 1>, TexCoord_ReadIndex<u16, u16, 2>,},
+		{TexCoord_ReadIndex<u16, s16, 1>,  TexCoord_ReadIndex<u16, s16, 2>,},
+		{TexCoord_ReadIndex<u16, float, 1>,  TexCoord_ReadIndex<u16, float, 2>,},
+	},
+};
+
+static int tableReadTexCoordVertexSize[4][8][2] = {
+	{
+		{0, 0,}, {0, 0,}, {0, 0,}, {0, 0,}, {0, 0,},
+	},
+	{
+		{1, 2,}, {1, 2,}, {2, 4,}, {2, 4,}, {4, 8,},
+	},
+	{
+		{1, 1,}, {1, 1,}, {1, 1,}, {1, 1,}, {1, 1,},
+	},
+	{
+		{2, 2,}, {2, 2,}, {2, 2,}, {2, 2,}, {2, 2,},
+	},
+};
+
+unsigned int VertexLoader_TextCoord::GetSize(u64 _type, unsigned int _format, unsigned int _elements)
+{
+	return tableReadTexCoordVertexSize[_type][_format][_elements];
+}
+
+TPipelineFunction VertexLoader_TextCoord::GetFunction(u64 _type, unsigned int _format, unsigned int _elements)
+{
+	return tableReadTexCoord[_type][_format][_elements];
+}
+
+TPipelineFunction VertexLoader_TextCoord::GetDummyFunction()
+{
+	return TexCoord_Read_Dummy;
+}
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
new file mode 100644
index 0000000000..0e3c7bac62
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
@@ -0,0 +1,25 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/NativeVertexFormat.h"
+
+class VertexLoader_TextCoord
+{
+public:
+
+	// Init
+	static void Init();
+
+	// GetSize
+	static unsigned int GetSize(u64 _type, unsigned int _format, unsigned int _elements);
+
+	// GetFunction
+	static TPipelineFunction GetFunction(u64 _type, unsigned int _format, unsigned int _elements);
+
+	// GetDummyFunction
+	// It is important to synchronize tcIndex.
+	static TPipelineFunction GetDummyFunction();
+};
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
new file mode 100644
index 0000000000..e9e8ebf901
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -0,0 +1,338 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/BPStructs.h"
+#include "VideoCommon/Debugger.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/IndexGenerator.h"
+#include "VideoCommon/MainBase.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/PerfQueryBase.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+VertexManager *g_vertex_manager;
+
+u8 *VertexManager::s_pCurBufferPointer;
+u8 *VertexManager::s_pBaseBufferPointer;
+u8 *VertexManager::s_pEndBufferPointer;
+
+PrimitiveType VertexManager::current_primitive_type;
+
+Slope VertexManager::s_zslope;
+
+bool VertexManager::s_is_flushed;
+bool VertexManager::s_cull_all;
+
+static const PrimitiveType primitive_from_gx[8] = {
+	PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS
+	PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS_2
+	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLES
+	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_STRIP
+	PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_FAN
+	PRIMITIVE_LINES,     // GX_DRAW_LINES
+	PRIMITIVE_LINES,     // GX_DRAW_LINE_STRIP
+	PRIMITIVE_POINTS,    // GX_DRAW_POINTS
+};
+
+VertexManager::VertexManager()
+{
+	s_is_flushed = true;
+	s_cull_all = false;
+}
+
+VertexManager::~VertexManager()
+{
+}
+
+u32 VertexManager::GetRemainingSize()
+{
+	return (u32)(s_pEndBufferPointer - s_pCurBufferPointer);
+}
+
+DataReader VertexManager::PrepareForAdditionalData(int primitive, u32 count, u32 stride, bool cullall)
+{
+	// The SSE vertex loader can write up to 4 bytes past the end
+	u32 const needed_vertex_bytes = count * stride + 4;
+
+	// We can't merge different kinds of primitives, so we have to flush here
+	if (current_primitive_type != primitive_from_gx[primitive])
+		Flush();
+	current_primitive_type = primitive_from_gx[primitive];
+
+	// Check for size in buffer, if the buffer gets full, call Flush()
+	if (!s_is_flushed && ( count > IndexGenerator::GetRemainingIndices() ||
+	     count > GetRemainingIndices(primitive) || needed_vertex_bytes > GetRemainingSize()))
+	{
+		Flush();
+
+		if (count > IndexGenerator::GetRemainingIndices())
+			ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush.");
+		if (count > GetRemainingIndices(primitive))
+			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! "
+				"Increase MAXIBUFFERSIZE or we need primitive breaking after all.");
+		if (needed_vertex_bytes > GetRemainingSize())
+			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! "
+				"Increase MAXVBUFFERSIZE or we need primitive breaking after all.");
+	}
+
+	s_cull_all = cullall;
+
+	// need to alloc new buffer
+	if (s_is_flushed)
+	{
+		g_vertex_manager->ResetBuffer(stride);
+		s_is_flushed = false;
+	}
+
+	return DataReader(s_pCurBufferPointer, s_pEndBufferPointer);
+}
+
+void VertexManager::FlushData(u32 count, u32 stride)
+{
+	s_pCurBufferPointer += count * stride;
+}
+
+u32 VertexManager::GetRemainingIndices(int primitive)
+{
+	u32 index_len = MAXIBUFFERSIZE - IndexGenerator::GetIndexLen();
+
+	if (g_Config.backend_info.bSupportsPrimitiveRestart)
+	{
+		switch (primitive)
+		{
+		case GX_DRAW_QUADS:
+		case GX_DRAW_QUADS_2:
+			return index_len / 5 * 4;
+		case GX_DRAW_TRIANGLES:
+			return index_len / 4 * 3;
+		case GX_DRAW_TRIANGLE_STRIP:
+			return index_len / 1 - 1;
+		case GX_DRAW_TRIANGLE_FAN:
+			return index_len / 6 * 4 + 1;
+
+		case GX_DRAW_LINES:
+			return index_len;
+		case GX_DRAW_LINE_STRIP:
+			return index_len / 2 + 1;
+
+		case GX_DRAW_POINTS:
+			return index_len;
+
+		default:
+			return 0;
+		}
+	}
+	else
+	{
+		switch (primitive)
+		{
+		case GX_DRAW_QUADS:
+		case GX_DRAW_QUADS_2:
+			return index_len / 6 * 4;
+		case GX_DRAW_TRIANGLES:
+			return index_len;
+		case GX_DRAW_TRIANGLE_STRIP:
+			return index_len / 3 + 2;
+		case GX_DRAW_TRIANGLE_FAN:
+			return index_len / 3 + 2;
+
+		case GX_DRAW_LINES:
+			return index_len;
+		case GX_DRAW_LINE_STRIP:
+			return index_len / 2 + 1;
+
+		case GX_DRAW_POINTS:
+			return index_len;
+
+		default:
+			return 0;
+		}
+	}
+}
+
+void VertexManager::Flush()
+{
+	if (s_is_flushed)
+		return;
+
+	// loading a state will invalidate BP, so check for it
+	g_video_backend->CheckInvalidState();
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfmem.numTexGen.numTexGens,
+		xfmem.numChan.numColorChans, xfmem.dualTexTrans.enabled, bpmem.ztex2.op,
+		(int)bpmem.blendmode.colorupdate, (int)bpmem.blendmode.alphaupdate, (int)bpmem.zmode.updateenable);
+
+	for (unsigned int i = 0; i < xfmem.numChan.numColorChans; ++i)
+	{
+		LitChannel* ch = &xfmem.color[i];
+		PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
+		ch = &xfmem.alpha[i];
+		PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
+	}
+
+	for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+	{
+		TexMtxInfo tinfo = xfmem.texMtxInfo[i];
+		if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff;
+		if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0;
+
+		PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d",
+			i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift,
+			xfmem.postMtxInfo[i].index, xfmem.postMtxInfo[i].normalize);
+	}
+
+	PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", (int)bpmem.genMode.numtevstages+1, (int)bpmem.genMode.numindstages,
+		(int)bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
+#endif
+
+	// If the primitave is marked CullAll. All we need to do is update the vertex constants and calculate the zfreeze refrence slope
+	if (!s_cull_all)
+	{
+		BitSet32 usedtextures;
+		for (u32 i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
+			if (bpmem.tevorders[i / 2].getEnable(i & 1))
+				usedtextures[bpmem.tevorders[i/2].getTexMap(i & 1)] = true;
+
+		if (bpmem.genMode.numindstages > 0)
+			for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
+				if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+					usedtextures[bpmem.tevindref.getTexMap(bpmem.tevind[i].bt)] = true;
+
+		TextureCache::UnbindTextures();
+		for (unsigned int i : usedtextures)
+		{
+			const TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i);
+
+			if (tentry)
+			{
+				g_renderer->SetSamplerState(i & 3, i >> 2, tentry->is_custom_tex);
+				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height);
+			}
+			else
+			{
+				ERROR_LOG(VIDEO, "error loading texture");
+			}
+		}
+		TextureCache::BindTextures();
+	}
+
+	// set global vertex constants
+	VertexShaderManager::SetConstants();
+
+	// Calculate ZSlope for zfreeze
+	if (!bpmem.genMode.zfreeze)
+	{
+		// Must be done after VertexShaderManager::SetConstants()
+		CalculateZSlope(VertexLoaderManager::GetCurrentVertexFormat());
+	}
+	else if (s_zslope.dirty && !s_cull_all) // or apply any dirty ZSlopes
+	{
+		PixelShaderManager::SetZSlope(s_zslope.dfdx, s_zslope.dfdy, s_zslope.f0);
+		s_zslope.dirty = false;
+	}
+
+	if (!s_cull_all)
+	{
+		// set the rest of the global constants
+		GeometryShaderManager::SetConstants();
+		PixelShaderManager::SetConstants();
+
+		bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass &&
+						   bpmem.dstalpha.enable &&
+						   bpmem.blendmode.alphaupdate &&
+						   bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
+
+		if (PerfQueryBase::ShouldEmulate())
+			g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
+		g_vertex_manager->vFlush(useDstAlpha);
+		if (PerfQueryBase::ShouldEmulate())
+			g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
+	}
+
+	GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
+
+	if (xfmem.numTexGen.numTexGens != bpmem.genMode.numtexgens)
+		ERROR_LOG(VIDEO, "xf.numtexgens (%d) does not match bp.numtexgens (%d). Error in command stream.", xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value());
+
+	s_is_flushed = true;
+	s_cull_all = false;
+}
+
+void VertexManager::DoState(PointerWrap& p)
+{
+	p.Do(s_zslope);
+	g_vertex_manager->vDoState(p);
+}
+
+void VertexManager::CalculateZSlope(NativeVertexFormat* format)
+{
+	float out[12];
+	float viewOffset[2] = { xfmem.viewport.xOrig - bpmem.scissorOffset.x * 2,
+	                        xfmem.viewport.yOrig - bpmem.scissorOffset.y * 2};
+
+	if (current_primitive_type != PRIMITIVE_TRIANGLES)
+		return;
+
+	// Global matrix ID.
+	u32 mtxIdx = g_main_cp_state.matrix_index_a.PosNormalMtxIdx;
+	const PortableVertexDeclaration vert_decl = format->GetVertexDeclaration();
+
+	// Make sure the buffer contains at least 3 vertices.
+	if ((s_pCurBufferPointer - s_pBaseBufferPointer) < (vert_decl.stride * 3))
+		return;
+
+	// Lookup vertices of the last rendered triangle and software-transform them
+	// This allows us to determine the depth slope, which will be used if z-freeze
+	// is enabled in the following flush.
+	for (unsigned int i = 0; i < 3; ++i)
+	{
+		// If this vertex format has per-vertex position matrix IDs, look it up.
+		if (vert_decl.posmtx.enable)
+			mtxIdx = VertexLoaderManager::position_matrix_index[2 - i];
+
+		if (vert_decl.position.components == 2)
+			VertexLoaderManager::position_cache[2 - i][2] = 0;
+
+		VertexShaderManager::TransformToClipSpace(&VertexLoaderManager::position_cache[2 - i][0], &out[i * 4], mtxIdx);
+
+		// Transform to Screenspace
+		float inv_w = 1.0f / out[3 + i * 4];
+
+		out[0 + i * 4] = out[0 + i * 4] * inv_w * xfmem.viewport.wd + viewOffset[0];
+		out[1 + i * 4] = out[1 + i * 4] * inv_w * xfmem.viewport.ht + viewOffset[1];
+		out[2 + i * 4] = out[2 + i * 4] * inv_w * xfmem.viewport.zRange + xfmem.viewport.farZ;
+	}
+
+	float dx31 = out[8] - out[0];
+	float dx12 = out[0] - out[4];
+	float dy12 = out[1] - out[5];
+	float dy31 = out[9] - out[1];
+
+	float DF31 = out[10] - out[2];
+	float DF21 = out[6] - out[2];
+	float a = DF31 * -dy12 - DF21 * dy31;
+	float b = dx31 * DF21 + dx12 * DF31;
+	float c = -dx12 * dy31 - dx31 * -dy12;
+
+	// Sometimes we process de-generate triangles. Stop any divide by zeros
+	if (c == 0)
+		return;
+
+	s_zslope.dfdx = -a / c;
+	s_zslope.dfdy = -b / c;
+	s_zslope.f0 = out[2] - (out[0] * s_zslope.dfdx + out[1] * s_zslope.dfdy);
+	s_zslope.dirty = true;
+}
diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h
new file mode 100644
index 0000000000..29a9dec5e1
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexManagerBase.h
@@ -0,0 +1,85 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/NativeVertexFormat.h"
+
+class NativeVertexFormat;
+class PointerWrap;
+
+enum PrimitiveType {
+	PRIMITIVE_POINTS,
+	PRIMITIVE_LINES,
+	PRIMITIVE_TRIANGLES,
+};
+
+struct Slope
+{
+	float dfdx;
+	float dfdy;
+	float f0;
+	bool dirty;
+};
+
+class VertexManager
+{
+private:
+	static const u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float)*3;                 // 3 pos
+	static const u32 LARGEST_POSSIBLE_VERTEX = sizeof(float)*45 + sizeof(u32)*2; // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat
+
+	static const u32 MAX_PRIMITIVES_PER_COMMAND = (u16)-1;
+
+public:
+	static const u32 MAXVBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * LARGEST_POSSIBLE_VERTEX);
+
+	// We may convert triangle-fans to triangle-lists, almost 3x as many indices.
+	static const u32 MAXIBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * 3);
+
+	VertexManager();
+	// needs to be virtual for DX11's dtor
+	virtual ~VertexManager();
+
+	static DataReader PrepareForAdditionalData(int primitive, u32 count, u32 stride, bool cullall);
+	static void FlushData(u32 count, u32 stride);
+
+	static void Flush();
+
+	virtual ::NativeVertexFormat* CreateNativeVertexFormat() = 0;
+
+	static void DoState(PointerWrap& p);
+
+protected:
+	virtual void vDoState(PointerWrap& p) {  }
+
+	static PrimitiveType current_primitive_type;
+
+	virtual void ResetBuffer(u32 stride) = 0;
+
+	static u8* s_pCurBufferPointer;
+	static u8* s_pBaseBufferPointer;
+	static u8* s_pEndBufferPointer;
+
+	static u32 GetRemainingSize();
+	static u32 GetRemainingIndices(int primitive);
+
+	static Slope s_zslope;
+	static void CalculateZSlope(NativeVertexFormat* format);
+
+	static bool s_cull_all;
+
+private:
+	static bool s_is_flushed;
+
+	virtual void vFlush(bool useDstAlpha) = 0;
+
+	virtual void CreateDeviceObjects() {}
+	virtual void DestroyDeviceObjects() {}
+};
+
+extern VertexManager *g_vertex_manager;
diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp
new file mode 100644
index 0000000000..084ac48aaf
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexShaderGen.cpp
@@ -0,0 +1,460 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+
+static char text[16768];
+
+template<class T>
+static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
+{
+	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
+	vertex_shader_uid_data dummy_data;
+	vertex_shader_uid_data* uid_data = out.template GetUidData<vertex_shader_uid_data>();
+	if (uid_data == nullptr)
+		uid_data = &dummy_data;
+
+	out.SetBuffer(text);
+	const bool is_writing_shadercode = (out.GetBuffer() != nullptr);
+
+	if (is_writing_shadercode)
+		text[sizeof(text) - 1] = 0x7C;  // canary
+
+	_assert_(bpmem.genMode.numtexgens == xfmem.numTexGen.numTexGens);
+	_assert_(bpmem.genMode.numcolchans == xfmem.numChan.numColorChans);
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
+	{
+		// Add functions to do shifts on scalars and ivecs.
+		// This is included in the vertex shader for lighting shader generation.
+		out.Write("int ilshift(int a, int b) { return a << b; }\n"
+		          "int irshift(int a, int b) { return a >> b; }\n"
+
+		          "int2 ilshift(int2 a, int2 b) { return int2(a.x << b.x, a.y << b.y); }\n"
+		          "int2 ilshift(int2 a, int b) { return int2(a.x << b, a.y << b); }\n"
+		          "int2 irshift(int2 a, int2 b) { return int2(a.x >> b.x, a.y >> b.y); }\n"
+		          "int2 irshift(int2 a, int b) { return int2(a.x >> b, a.y >> b); }\n"
+
+		          "int3 ilshift(int3 a, int3 b) { return int3(a.x << b.x, a.y << b.y, a.z << b.z); }\n"
+		          "int3 ilshift(int3 a, int b) { return int3(a.x << b, a.y << b, a.z << b); }\n"
+		          "int3 irshift(int3 a, int3 b) { return int3(a.x >> b.x, a.y >> b.y, a.z >> b.z); }\n"
+		          "int3 irshift(int3 a, int b) { return int3(a.x >> b, a.y >> b, a.z >> b); }\n"
+
+		          "int4 ilshift(int4 a, int4 b) { return int4(a.x << b.x, a.y << b.y, a.z << b.z, a.w << b.w); }\n"
+		          "int4 ilshift(int4 a, int b) { return int4(a.x << b, a.y << b, a.z << b, a.w << b); }\n"
+		          "int4 irshift(int4 a, int4 b) { return int4(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); }\n"
+		          "int4 irshift(int4 a, int b) { return int4(a.x >> b, a.y >> b, a.z >> b, a.w >> b); }\n\n");
+	}
+
+	out.Write("%s", s_lighting_struct);
+
+	// uniforms
+	if (api_type == API_OPENGL)
+		out.Write("layout(std140%s) uniform VSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 2" : "");
+	else
+		out.Write("cbuffer VSBlock {\n");
+	out.Write(s_shader_uniforms);
+	out.Write("};\n");
+
+	out.Write("struct VS_OUTPUT {\n");
+	GenerateVSOutputMembers<T>(out, api_type);
+	out.Write("};\n");
+
+	uid_data->numTexGens = xfmem.numTexGen.numTexGens;
+	uid_data->components = components;
+	uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
+
+	if (api_type == API_OPENGL)
+	{
+		out.Write("in float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB);
+		if (components & VB_HAS_POSMTXIDX)
+			out.Write("in int posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
+		if (components & VB_HAS_NRM0)
+			out.Write("in float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB);
+		if (components & VB_HAS_NRM1)
+			out.Write("in float3 rawnorm1; // ATTR%d,\n", SHADER_NORM1_ATTRIB);
+		if (components & VB_HAS_NRM2)
+			out.Write("in float3 rawnorm2; // ATTR%d,\n", SHADER_NORM2_ATTRIB);
+
+		if (components & VB_HAS_COL0)
+			out.Write("in float4 color0; // ATTR%d,\n", SHADER_COLOR0_ATTRIB);
+		if (components & VB_HAS_COL1)
+			out.Write("in float4 color1; // ATTR%d,\n", SHADER_COLOR1_ATTRIB);
+
+		for (int i = 0; i < 8; ++i)
+		{
+			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
+			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
+				out.Write("in float%d tex%d; // ATTR%d,\n", hastexmtx ? 3 : 2, i, SHADER_TEXTURE0_ATTRIB + i);
+		}
+
+		if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
+		{
+			out.Write("out VertexData {\n");
+			GenerateVSOutputMembers<T>(out, api_type, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid out");
+			out.Write("} vs;\n");
+		}
+		else
+		{
+			// Let's set up attributes
+			for (size_t i = 0; i < 8; ++i)
+			{
+				if (i < xfmem.numTexGen.numTexGens)
+				{
+					out.Write("centroid out float3 uv%d;\n", i);
+				}
+			}
+			out.Write("centroid out float4 clipPos;\n");
+			if (g_ActiveConfig.bEnablePixelLighting)
+			{
+				out.Write("centroid out float3 Normal;\n");
+				out.Write("centroid out float3 WorldPos;\n");
+			}
+			out.Write("centroid out float4 colors_0;\n");
+			out.Write("centroid out float4 colors_1;\n");
+		}
+
+		out.Write("void main()\n{\n");
+	}
+	else // D3D
+	{
+		out.Write("VS_OUTPUT main(\n");
+
+		// inputs
+		if (components & VB_HAS_NRM0)
+			out.Write("  float3 rawnorm0 : NORMAL0,\n");
+		if (components & VB_HAS_NRM1)
+			out.Write("  float3 rawnorm1 : NORMAL1,\n");
+		if (components & VB_HAS_NRM2)
+			out.Write("  float3 rawnorm2 : NORMAL2,\n");
+		if (components & VB_HAS_COL0)
+			out.Write("  float4 color0 : COLOR0,\n");
+		if (components & VB_HAS_COL1)
+			out.Write("  float4 color1 : COLOR1,\n");
+		for (int i = 0; i < 8; ++i)
+		{
+			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
+			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
+				out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
+		}
+		if (components & VB_HAS_POSMTXIDX)
+			out.Write("  int posmtx : BLENDINDICES,\n");
+		out.Write("  float4 rawpos : POSITION) {\n");
+	}
+
+	out.Write("VS_OUTPUT o;\n");
+
+	// transforms
+	if (components & VB_HAS_POSMTXIDX)
+	{
+		if (is_writing_shadercode && (DriverDetails::HasBug(DriverDetails::BUG_NODYNUBOACCESS) && !DriverDetails::HasBug(DriverDetails::BUG_ANNIHILATEDUBOS)))
+		{
+			// This'll cause issues, but  it can't be helped
+			out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[0], rawpos), dot(" I_TRANSFORMMATRICES"[1], rawpos), dot(" I_TRANSFORMMATRICES"[2], rawpos), 1);\n");
+			if (components & VB_HAS_NRMALL)
+				out.Write("float3 N0 = " I_NORMALMATRICES"[0].xyz, N1 = " I_NORMALMATRICES"[1].xyz, N2 = " I_NORMALMATRICES"[2].xyz;\n");
+		}
+		else
+		{
+			out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");
+
+			if (components & VB_HAS_NRMALL)
+			{
+				out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
+				out.Write("float3 N0 = " I_NORMALMATRICES"[normidx].xyz, N1 = " I_NORMALMATRICES"[normidx+1].xyz, N2 = " I_NORMALMATRICES"[normidx+2].xyz;\n");
+			}
+		}
+
+		if (components & VB_HAS_NRM0)
+			out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
+		if (components & VB_HAS_NRM1)
+			out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
+		if (components & VB_HAS_NRM2)
+			out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
+	}
+	else
+	{
+		out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX"[0], rawpos), dot(" I_POSNORMALMATRIX"[1], rawpos), dot(" I_POSNORMALMATRIX"[2], rawpos), 1.0);\n");
+		if (components & VB_HAS_NRM0)
+			out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm0), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm0), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm0)));\n");
+		if (components & VB_HAS_NRM1)
+			out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm1), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm1), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm1));\n");
+		if (components & VB_HAS_NRM2)
+			out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX"[3].xyz, rawnorm2), dot(" I_POSNORMALMATRIX"[4].xyz, rawnorm2), dot(" I_POSNORMALMATRIX"[5].xyz, rawnorm2));\n");
+	}
+
+	if (!(components & VB_HAS_NRM0))
+		out.Write("float3 _norm0 = float3(0.0, 0.0, 0.0);\n");
+
+
+	out.Write("o.pos = float4(dot(" I_PROJECTION"[0], pos), dot(" I_PROJECTION"[1], pos), dot(" I_PROJECTION"[2], pos), dot(" I_PROJECTION"[3], pos));\n");
+
+	out.Write("int4 lacc;\n"
+			"float3 ldir, h, cosAttn, distAttn;\n"
+			"float dist, dist2, attn;\n");
+
+	uid_data->numColorChans = xfmem.numChan.numColorChans;
+	if (xfmem.numChan.numColorChans == 0)
+	{
+		if (components & VB_HAS_COL0)
+			out.Write("o.colors_0 = color0;\n");
+		else
+			out.Write("o.colors_0 = float4(1.0, 1.0, 1.0, 1.0);\n");
+	}
+
+	GenerateLightingShader<T>(out, uid_data->lighting, components, "color", "o.colors_");
+
+	if (xfmem.numChan.numColorChans < 2)
+	{
+		if (components & VB_HAS_COL1)
+			out.Write("o.colors_1 = color1;\n");
+		else
+			out.Write("o.colors_1 = o.colors_0;\n");
+	}
+	// special case if only pos and tex coord 0 and tex coord input is AB11
+	// donko - this has caused problems in some games. removed for now.
+	bool texGenSpecialCase = false;
+	/*bool texGenSpecialCase =
+		((g_main_cp_state.vtx_desc.Hex & 0x60600L) == g_main_cp_state.vtx_desc.Hex) && // only pos and tex coord 0
+		(g_main_cp_state.vtx_desc.Tex0Coord != NOT_PRESENT) &&
+		(xfmem.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11);
+		*/
+
+	// transform texcoords
+	out.Write("float4 coord = float4(0.0, 0.0, 1.0, 1.0);\n");
+	for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+	{
+		TexMtxInfo& texinfo = xfmem.texMtxInfo[i];
+
+		out.Write("{\n");
+		out.Write("coord = float4(0.0, 0.0, 1.0, 1.0);\n");
+		uid_data->texMtxInfo[i].sourcerow = xfmem.texMtxInfo[i].sourcerow;
+		switch (texinfo.sourcerow)
+		{
+		case XF_SRCGEOM_INROW:
+			_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
+			out.Write("coord = rawpos;\n"); // pos.w is 1
+			break;
+		case XF_SRCNORMAL_INROW:
+			if (components & VB_HAS_NRM0)
+			{
+				_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
+				out.Write("coord = float4(rawnorm0.xyz, 1.0);\n");
+			}
+			break;
+		case XF_SRCCOLORS_INROW:
+			_assert_(texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1);
+			break;
+		case XF_SRCBINORMAL_T_INROW:
+			if (components & VB_HAS_NRM1)
+			{
+				_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
+				out.Write("coord = float4(rawnorm1.xyz, 1.0);\n");
+			}
+			break;
+		case XF_SRCBINORMAL_B_INROW:
+			if (components & VB_HAS_NRM2)
+			{
+				_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
+				out.Write("coord = float4(rawnorm2.xyz, 1.0);\n");
+			}
+			break;
+		default:
+			_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
+			if (components & (VB_HAS_UV0 << (texinfo.sourcerow - XF_SRCTEX0_INROW)))
+				out.Write("coord = float4(tex%d.x, tex%d.y, 1.0, 1.0);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
+			break;
+		}
+
+		// first transformation
+		uid_data->texMtxInfo[i].texgentype = xfmem.texMtxInfo[i].texgentype;
+		switch (texinfo.texgentype)
+		{
+			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
+
+				if (components & (VB_HAS_NRM1|VB_HAS_NRM2))
+				{
+					// transform the light dir into tangent space
+					uid_data->texMtxInfo[i].embosslightshift = xfmem.texMtxInfo[i].embosslightshift;
+					uid_data->texMtxInfo[i].embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
+					out.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(texinfo.embosslightshift));
+					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0);\n", i, texinfo.embosssourceshift);
+				}
+				else
+				{
+					_assert_(0); // should have normals
+					uid_data->texMtxInfo[i].embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
+					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
+				}
+
+				break;
+			case XF_TEXGEN_COLOR_STRGBC0:
+				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+				out.Write("o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
+				break;
+			case XF_TEXGEN_COLOR_STRGBC1:
+				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+				out.Write("o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
+				break;
+			case XF_TEXGEN_REGULAR:
+			default:
+				uid_data->texMtxInfo_n_projection |= xfmem.texMtxInfo[i].projection << i;
+				if (components & (VB_HAS_TEXMTXIDX0<<i))
+				{
+					out.Write("int tmp = int(tex%d.z);\n", i);
+					if (texinfo.projection == XF_TEXPROJ_STQ)
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), dot(coord, " I_TRANSFORMMATRICES"[tmp+2]));\n", i);
+					else
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), 1);\n", i);
+				}
+				else
+				{
+					if (texinfo.projection == XF_TEXPROJ_STQ)
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]));\n", i, 3*i, 3*i+1, 3*i+2);
+					else
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), 1);\n", i, 3*i, 3*i+1);
+				}
+				break;
+		}
+
+		uid_data->dualTexTrans_enabled = xfmem.dualTexTrans.enabled;
+		// CHECKME: does this only work for regular tex gen types?
+		if (xfmem.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR)
+		{
+			const PostMtxInfo& postInfo = xfmem.postMtxInfo[i];
+
+			uid_data->postMtxInfo[i].index = xfmem.postMtxInfo[i].index;
+			int postidx = postInfo.index;
+			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
+				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
+				"float4 P2 = " I_POSTTRANSFORMMATRICES"[%d];\n",
+				postidx & 0x3f, (postidx + 1) & 0x3f, (postidx + 2) & 0x3f);
+
+			if (texGenSpecialCase)
+			{
+				// no normalization
+				// q of input is 1
+				// q of output is unknown
+
+				// multiply by postmatrix
+				out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0);\n", i, i, i);
+			}
+			else
+			{
+				uid_data->postMtxInfo[i].normalize = xfmem.postMtxInfo[i].normalize;
+				if (postInfo.normalize)
+					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
+
+				// multiply by postmatrix
+				out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
+			}
+		}
+
+		out.Write("}\n");
+	}
+
+	// clipPos/w needs to be done in pixel shader, not here
+	out.Write("o.clipPos = o.pos;\n");
+
+	if (g_ActiveConfig.bEnablePixelLighting)
+	{
+		out.Write("o.Normal = _norm0;\n");
+		out.Write("o.WorldPos = pos.xyz;\n");
+
+		if (components & VB_HAS_COL0)
+			out.Write("o.colors_0 = color0;\n");
+
+		if (components & VB_HAS_COL1)
+			out.Write("o.colors_1 = color1;\n");
+	}
+
+	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
+	//if not early z culling will improve speed
+	if (g_ActiveConfig.backend_info.bSupportsClipControl)
+	{
+		out.Write("o.pos.z = -o.pos.z;\n");
+	}
+	else if (api_type == API_D3D)
+	{
+		out.Write("o.pos.z = -o.pos.z;\n");
+	}
+	else // OGL
+	{
+		// this results in a scale from -1..0 to -1..1 after perspective
+		// divide
+		out.Write("o.pos.z = o.pos.z * -2.0 - o.pos.w;\n");
+
+		// the next steps of the OGL pipeline are:
+		// (x_c,y_c,z_c,w_c) = o.pos  //switch to OGL spec terminology
+		// clipping to -w_c <= (x_c,y_c,z_c) <= w_c
+		// (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
+		// z_w = (f-n)/2*z_d + (n+f)/2
+		// z_w now contains the value to go to the 0..1 depth buffer
+
+		//trying to get the correct semantic while not using glDepthRange
+		//seems to get rather complicated
+	}
+
+	// The console GPU places the pixel center at 7/12 in screen space unless
+	// antialiasing is enabled, while D3D and OpenGL place it at 0.5. This results
+	// in some primitives being placed one pixel too far to the bottom-right,
+	// which in turn can be critical if it happens for clear quads.
+	// Hence, we compensate for this pixel center difference so that primitives
+	// get rasterized correctly.
+	out.Write("o.pos.xy = o.pos.xy - o.pos.w * " I_PIXELCENTERCORRECTION".xy;\n");
+
+	if (api_type == API_OPENGL)
+	{
+		if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
+		{
+			AssignVSOutputMembers(out, "vs", "o");
+		}
+		else
+		{
+			// TODO: Pass interface blocks between shader stages even if geometry shaders
+			// are not supported, however that will require at least OpenGL 3.2 support.
+			for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+				out.Write("uv%d.xyz = o.tex%d;\n", i, i);
+			out.Write("clipPos = o.clipPos;\n");
+			if (g_ActiveConfig.bEnablePixelLighting)
+			{
+				out.Write("Normal = o.Normal;\n");
+				out.Write("WorldPos = o.WorldPos;\n");
+			}
+			out.Write("colors_0 = o.colors_0;\n");
+			out.Write("colors_1 = o.colors_1;\n");
+		}
+
+		out.Write("gl_Position = o.pos;\n");
+	}
+	else // D3D
+	{
+		out.Write("return o;\n");
+	}
+	out.Write("}\n");
+
+	if (is_writing_shadercode)
+	{
+		if (text[sizeof(text) - 1] != 0x7C)
+			PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+	}
+}
+
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
+{
+	GenerateVertexShader<VertexShaderUid>(object, components, api_type);
+}
+
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
+{
+	GenerateVertexShader<VertexShaderCode>(object, components, api_type);
+}
diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h
new file mode 100644
index 0000000000..c93d4a99c5
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexShaderGen.h
@@ -0,0 +1,65 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/ShaderGenCommon.h"
+#include "VideoCommon/VideoCommon.h"
+
+// TODO should be reordered
+#define SHADER_POSITION_ATTRIB  0
+#define SHADER_POSMTX_ATTRIB    1
+#define SHADER_NORM0_ATTRIB     2
+#define SHADER_NORM1_ATTRIB     3
+#define SHADER_NORM2_ATTRIB     4
+#define SHADER_COLOR0_ATTRIB    5
+#define SHADER_COLOR1_ATTRIB    6
+
+#define SHADER_TEXTURE0_ATTRIB  8
+#define SHADER_TEXTURE1_ATTRIB  9
+#define SHADER_TEXTURE2_ATTRIB  10
+#define SHADER_TEXTURE3_ATTRIB  11
+#define SHADER_TEXTURE4_ATTRIB  12
+#define SHADER_TEXTURE5_ATTRIB  13
+#define SHADER_TEXTURE6_ATTRIB  14
+#define SHADER_TEXTURE7_ATTRIB  15
+
+#pragma pack(1)
+
+struct vertex_shader_uid_data
+{
+	u32 NumValues() const { return sizeof(vertex_shader_uid_data); }
+
+	u32 components           : 23;
+	u32 numTexGens           : 4;
+	u32 numColorChans        : 2;
+	u32 dualTexTrans_enabled : 1;
+	u32 pixel_lighting       : 1;
+	u32 pad                  : 1;
+
+	u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is 8 bits wide
+	struct {
+		u32 inputform         : 2;
+		u32 texgentype        : 3;
+		u32 sourcerow         : 5;
+		u32 embosssourceshift : 3;
+		u32 embosslightshift  : 3;
+	} texMtxInfo[8];
+
+	struct {
+		u32 index     : 6;
+		u32 normalize : 1;
+		u32 pad       : 1;
+	} postMtxInfo[8];
+
+	LightingUidData lighting;
+};
+#pragma pack()
+
+typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
+typedef ShaderCode VertexShaderCode; // TODO: Obsolete..
+
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp
new file mode 100644
index 0000000000..509974c373
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexShaderManager.cpp
@@ -0,0 +1,749 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cfloat>
+#include <cmath>
+#include <sstream>
+
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/Statistics.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
+static float GC_ALIGNED16(g_fProjectionMatrix[16]);
+
+// track changes
+static bool bTexMatricesChanged[2], bPosNormalMatrixChanged, bProjectionChanged, bViewportChanged;
+static BitSet32 nMaterialsChanged;
+static int nTransformMatricesChanged[2]; // min,max
+static int nNormalMatricesChanged[2]; // min,max
+static int nPostTransformMatricesChanged[2]; // min,max
+static int nLightsChanged[2]; // min,max
+
+static Matrix44 s_viewportCorrection;
+static Matrix33 s_viewRotationMatrix;
+static Matrix33 s_viewInvRotationMatrix;
+static float s_fViewTranslationVector[3];
+static float s_fViewRotation[2];
+
+VertexShaderConstants VertexShaderManager::constants;
+bool VertexShaderManager::dirty;
+
+struct ProjectionHack
+{
+	float sign;
+	float value;
+	ProjectionHack() { }
+	ProjectionHack(float new_sign, float new_value)
+		: sign(new_sign), value(new_value) {}
+};
+
+namespace
+{
+// Control Variables
+static ProjectionHack g_ProjHack1;
+static ProjectionHack g_ProjHack2;
+} // Namespace
+
+static float PHackValue(std::string sValue)
+{
+	float f = 0;
+	bool fp = false;
+	const char *cStr = sValue.c_str();
+	char *c = new char[strlen(cStr) + 1];
+	std::istringstream sTof("");
+
+	for (unsigned int i = 0; i <= strlen(cStr); ++i)
+	{
+		if (i == 20)
+		{
+			c[i] = '\0';
+			break;
+		}
+
+		c[i] = (cStr[i] == ',') ? '.' : *(cStr + i);
+		if (c[i] == '.')
+			fp = true;
+	}
+
+	cStr = c;
+	sTof.str(cStr);
+	sTof >> f;
+
+	if (!fp)
+		f /= 0xF4240;
+
+	delete[] c;
+	return f;
+}
+
+void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[])
+{
+	float fhackvalue1 = 0, fhackvalue2 = 0;
+	float fhacksign1 = 1.0, fhacksign2 = 1.0;
+	const char *sTemp[2];
+
+	if (iPhackvalue[0] == 1)
+	{
+		NOTICE_LOG(VIDEO, "\t\t--- Orthographic Projection Hack ON ---");
+
+		fhacksign1 *= (iPhackvalue[1] == 1) ? -1.0f : fhacksign1;
+		sTemp[0] = (iPhackvalue[1] == 1) ? " * (-1)" : "";
+		fhacksign2 *= (iPhackvalue[2] == 1) ? -1.0f : fhacksign2;
+		sTemp[1] = (iPhackvalue[2] == 1) ? " * (-1)" : "";
+
+		fhackvalue1 = PHackValue(sPhackvalue[0]);
+		NOTICE_LOG(VIDEO, "- zNear Correction = (%f + zNear)%s", fhackvalue1, sTemp[0]);
+
+		fhackvalue2 = PHackValue(sPhackvalue[1]);
+		NOTICE_LOG(VIDEO, "- zFar Correction =  (%f + zFar)%s", fhackvalue2, sTemp[1]);
+
+	}
+
+	// Set the projections hacks
+	g_ProjHack1 = ProjectionHack(fhacksign1, fhackvalue1);
+	g_ProjHack2 = ProjectionHack(fhacksign2, fhackvalue2);
+}
+
+
+// Viewport correction:
+// In D3D, the viewport rectangle must fit within the render target.
+// Say you want a viewport at (ix, iy) with size (iw, ih),
+// but your viewport must be clamped at (ax, ay) with size (aw, ah).
+// Just multiply the projection matrix with the following to get the same
+// effect:
+// [   (iw/aw)         0     0    ((iw - 2*(ax-ix)) / aw - 1)   ]
+// [         0   (ih/ah)     0   ((-ih + 2*(ay-iy)) / ah + 1)   ]
+// [         0         0     1                              0   ]
+// [         0         0     0                              1   ]
+static void ViewportCorrectionMatrix(Matrix44& result)
+{
+	int scissorXOff = bpmem.scissorOffset.x * 2;
+	int scissorYOff = bpmem.scissorOffset.y * 2;
+
+	// TODO: ceil, floor or just cast to int?
+	// TODO: Directly use the floats instead of rounding them?
+	float intendedX = xfmem.viewport.xOrig - xfmem.viewport.wd - scissorXOff;
+	float intendedY = xfmem.viewport.yOrig + xfmem.viewport.ht - scissorYOff;
+	float intendedWd = 2.0f * xfmem.viewport.wd;
+	float intendedHt = -2.0f * xfmem.viewport.ht;
+
+	if (intendedWd < 0.f)
+	{
+		intendedX += intendedWd;
+		intendedWd = -intendedWd;
+	}
+	if (intendedHt < 0.f)
+	{
+		intendedY += intendedHt;
+		intendedHt = -intendedHt;
+	}
+
+	// fit to EFB size
+	float X = (intendedX >= 0.f) ? intendedX : 0.f;
+	float Y = (intendedY >= 0.f) ? intendedY : 0.f;
+	float Wd = (X + intendedWd <= EFB_WIDTH) ? intendedWd : (EFB_WIDTH - X);
+	float Ht = (Y + intendedHt <= EFB_HEIGHT) ? intendedHt : (EFB_HEIGHT - Y);
+
+	Matrix44::LoadIdentity(result);
+	if (Wd == 0 || Ht == 0)
+		return;
+
+	result.data[4*0 + 0] = intendedWd / Wd;
+	result.data[4*0 + 3] = (intendedWd - 2.f * (X - intendedX)) / Wd - 1.f;
+	result.data[4*1 + 1] = intendedHt / Ht;
+	result.data[4*1 + 3] = (-intendedHt + 2.f * (Y - intendedY)) / Ht + 1.f;
+}
+
+void VertexShaderManager::Init()
+{
+	// Initialize state tracking variables
+	nTransformMatricesChanged[0] = -1;
+	nTransformMatricesChanged[1] = -1;
+	nNormalMatricesChanged[0] = -1;
+	nNormalMatricesChanged[1] = -1;
+	nPostTransformMatricesChanged[0] = -1;
+	nPostTransformMatricesChanged[1] = -1;
+	nLightsChanged[0] = -1;
+	nLightsChanged[1] = -1;
+	nMaterialsChanged = BitSet32(0);
+	bTexMatricesChanged[0] = false;
+	bTexMatricesChanged[1] = false;
+	bPosNormalMatrixChanged = false;
+	bProjectionChanged = true;
+	bViewportChanged = false;
+
+	memset(&xfmem, 0, sizeof(xfmem));
+	memset(&constants, 0, sizeof(constants));
+	ResetView();
+
+	// TODO: should these go inside ResetView()?
+	Matrix44::LoadIdentity(s_viewportCorrection);
+	memset(g_fProjectionMatrix, 0, sizeof(g_fProjectionMatrix));
+	for (int i = 0; i < 4; ++i)
+		g_fProjectionMatrix[i*5] = 1.0f;
+
+	dirty = true;
+}
+
+void VertexShaderManager::Shutdown()
+{
+}
+
+void VertexShaderManager::Dirty()
+{
+	// This function is called after a savestate is loaded.
+	// Any constants that can changed based on settings should be re-calculated
+	bProjectionChanged = true;
+
+	dirty = true;
+}
+
+// Syncs the shader constant buffers with xfmem
+// TODO: A cleaner way to control the matrices without making a mess in the parameters field
+void VertexShaderManager::SetConstants()
+{
+	if (nTransformMatricesChanged[0] >= 0)
+	{
+		int startn = nTransformMatricesChanged[0] / 4;
+		int endn = (nTransformMatricesChanged[1] + 3) / 4;
+		memcpy(constants.transformmatrices[startn], &xfmem.posMatrices[startn * 4], (endn - startn) * 16);
+		dirty = true;
+		nTransformMatricesChanged[0] = nTransformMatricesChanged[1] = -1;
+	}
+
+	if (nNormalMatricesChanged[0] >= 0)
+	{
+		int startn = nNormalMatricesChanged[0] / 3;
+		int endn = (nNormalMatricesChanged[1] + 2) / 3;
+		for (int i = startn; i < endn; i++)
+		{
+			memcpy(constants.normalmatrices[i], &xfmem.normalMatrices[3*i], 12);
+		}
+		dirty = true;
+		nNormalMatricesChanged[0] = nNormalMatricesChanged[1] = -1;
+	}
+
+	if (nPostTransformMatricesChanged[0] >= 0)
+	{
+		int startn = nPostTransformMatricesChanged[0] / 4;
+		int endn = (nPostTransformMatricesChanged[1] + 3) / 4;
+		memcpy(constants.posttransformmatrices[startn], &xfmem.postMatrices[startn * 4], (endn - startn) * 16);
+		dirty = true;
+		nPostTransformMatricesChanged[0] = nPostTransformMatricesChanged[1] = -1;
+	}
+
+	if (nLightsChanged[0] >= 0)
+	{
+		// TODO: Outdated comment
+		// lights don't have a 1 to 1 mapping, the color component needs to be converted to 4 floats
+		int istart = nLightsChanged[0] / 0x10;
+		int iend = (nLightsChanged[1] + 15) / 0x10;
+
+		for (int i = istart; i < iend; ++i)
+		{
+			const Light& light = xfmem.lights[i];
+			VertexShaderConstants::Light& dstlight = constants.lights[i];
+
+			// xfmem.light.color is packed as abgr in u8[4], so we have to swap the order
+			dstlight.color[0] = light.color[3];
+			dstlight.color[1] = light.color[2];
+			dstlight.color[2] = light.color[1];
+			dstlight.color[3] = light.color[0];
+
+			dstlight.cosatt[0] = light.cosatt[0];
+			dstlight.cosatt[1] = light.cosatt[1];
+			dstlight.cosatt[2] = light.cosatt[2];
+
+			if (fabs(light.distatt[0]) < 0.00001f &&
+			    fabs(light.distatt[1]) < 0.00001f &&
+			    fabs(light.distatt[2]) < 0.00001f)
+			{
+				// dist attenuation, make sure not equal to 0!!!
+				dstlight.distatt[0] = .00001f;
+			}
+			else
+			{
+				dstlight.distatt[0] = light.distatt[0];
+			}
+			dstlight.distatt[1] = light.distatt[1];
+			dstlight.distatt[2] = light.distatt[2];
+
+			dstlight.pos[0] = light.dpos[0];
+			dstlight.pos[1] = light.dpos[1];
+			dstlight.pos[2] = light.dpos[2];
+
+			double norm = double(light.ddir[0]) * double(light.ddir[0]) +
+			              double(light.ddir[1]) * double(light.ddir[1]) +
+			              double(light.ddir[2]) * double(light.ddir[2]);
+			norm = 1.0 / sqrt(norm);
+			float norm_float = static_cast<float>(norm);
+			dstlight.dir[0] = light.ddir[0] * norm_float;
+			dstlight.dir[1] = light.ddir[1] * norm_float;
+			dstlight.dir[2] = light.ddir[2] * norm_float;
+		}
+		dirty = true;
+
+		nLightsChanged[0] = nLightsChanged[1] = -1;
+	}
+
+	for (int i : nMaterialsChanged)
+	{
+		u32 data = i >= 2 ? xfmem.matColor[i - 2] : xfmem.ambColor[i];
+		constants.materials[i][0] = (data >> 24) & 0xFF;
+		constants.materials[i][1] = (data >> 16) & 0xFF;
+		constants.materials[i][2] = (data >>  8) & 0xFF;
+		constants.materials[i][3] =  data        & 0xFF;
+		dirty = true;
+	}
+	nMaterialsChanged = BitSet32(0);
+
+	if (bPosNormalMatrixChanged)
+	{
+		bPosNormalMatrixChanged = false;
+
+		const float *pos = (const float *)xfmem.posMatrices + g_main_cp_state.matrix_index_a.PosNormalMtxIdx * 4;
+		const float *norm = (const float *)xfmem.normalMatrices + 3 * (g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31);
+
+		memcpy(constants.posnormalmatrix,    pos,    3*16);
+		memcpy(constants.posnormalmatrix[3], norm,   12);
+		memcpy(constants.posnormalmatrix[4], norm+3, 12);
+		memcpy(constants.posnormalmatrix[5], norm+6, 12);
+		dirty = true;
+	}
+
+	if (bTexMatricesChanged[0])
+	{
+		bTexMatricesChanged[0] = false;
+		const float *fptrs[] =
+		{
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex0MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex1MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex2MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_a.Tex3MtxIdx * 4]
+		};
+
+		for (int i = 0; i < 4; ++i)
+		{
+			memcpy(constants.texmatrices[3 * i], fptrs[i], 3 * 16);
+		}
+		dirty = true;
+	}
+
+	if (bTexMatricesChanged[1])
+	{
+		bTexMatricesChanged[1] = false;
+		const float *fptrs[] = {
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex4MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex5MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex6MtxIdx * 4],
+			(const float *)&xfmem.posMatrices[g_main_cp_state.matrix_index_b.Tex7MtxIdx * 4]
+		};
+
+		for (int i = 0; i < 4; ++i)
+		{
+			memcpy(constants.texmatrices[3*i + 12], fptrs[i], 3*16);
+		}
+		dirty = true;
+	}
+
+	if (bViewportChanged)
+	{
+		bViewportChanged = false;
+
+		// The console GPU places the pixel center at 7/12 unless antialiasing
+		// is enabled, while D3D and OpenGL place it at 0.5. See the comment
+		// in VertexShaderGen.cpp for details.
+		// NOTE: If we ever emulate antialiasing, the sample locations set by
+		// BP registers 0x01-0x04 need to be considered here.
+		const float pixel_center_correction = 7.0f / 12.0f - 0.5f;
+		const float pixel_size_x = 2.f / Renderer::EFBToScaledXf(2.f * xfmem.viewport.wd);
+		const float pixel_size_y = 2.f / Renderer::EFBToScaledXf(2.f * xfmem.viewport.ht);
+		constants.pixelcentercorrection[0] = pixel_center_correction * pixel_size_x;
+		constants.pixelcentercorrection[1] = pixel_center_correction * pixel_size_y;
+		dirty = true;
+		// This is so implementation-dependent that we can't have it here.
+		g_renderer->SetViewport();
+
+		// Update projection if the viewport isn't 1:1 useable
+		if (!g_ActiveConfig.backend_info.bSupportsOversizedViewports)
+		{
+			ViewportCorrectionMatrix(s_viewportCorrection);
+			bProjectionChanged = true;
+		}
+	}
+
+	if (bProjectionChanged)
+	{
+		bProjectionChanged = false;
+
+		float *rawProjection = xfmem.projection.rawProjection;
+
+		switch (xfmem.projection.type)
+		{
+		case GX_PERSPECTIVE:
+
+			g_fProjectionMatrix[0] = rawProjection[0] * g_ActiveConfig.fAspectRatioHackW;
+			g_fProjectionMatrix[1] = 0.0f;
+			g_fProjectionMatrix[2] = rawProjection[1];
+			g_fProjectionMatrix[3] = 0.0f;
+
+			g_fProjectionMatrix[4] = 0.0f;
+			g_fProjectionMatrix[5] = rawProjection[2] * g_ActiveConfig.fAspectRatioHackH;
+			g_fProjectionMatrix[6] = rawProjection[3];
+			g_fProjectionMatrix[7] = 0.0f;
+
+			g_fProjectionMatrix[8] = 0.0f;
+			g_fProjectionMatrix[9] = 0.0f;
+			g_fProjectionMatrix[10] = rawProjection[4];
+
+			g_fProjectionMatrix[11] = rawProjection[5];
+
+			g_fProjectionMatrix[12] = 0.0f;
+			g_fProjectionMatrix[13] = 0.0f;
+			// donkopunchstania suggested the GC GPU might round differently
+			// He had thus changed this to -(1 + epsilon) to fix clipping issues.
+			// I (neobrain) don't think his conjecture is true and thus reverted his change.
+			g_fProjectionMatrix[14] = -1.0f;
+			g_fProjectionMatrix[15] = 0.0f;
+
+			SETSTAT_FT(stats.gproj_0,  g_fProjectionMatrix[0]);
+			SETSTAT_FT(stats.gproj_1,  g_fProjectionMatrix[1]);
+			SETSTAT_FT(stats.gproj_2,  g_fProjectionMatrix[2]);
+			SETSTAT_FT(stats.gproj_3,  g_fProjectionMatrix[3]);
+			SETSTAT_FT(stats.gproj_4,  g_fProjectionMatrix[4]);
+			SETSTAT_FT(stats.gproj_5,  g_fProjectionMatrix[5]);
+			SETSTAT_FT(stats.gproj_6,  g_fProjectionMatrix[6]);
+			SETSTAT_FT(stats.gproj_7,  g_fProjectionMatrix[7]);
+			SETSTAT_FT(stats.gproj_8,  g_fProjectionMatrix[8]);
+			SETSTAT_FT(stats.gproj_9,  g_fProjectionMatrix[9]);
+			SETSTAT_FT(stats.gproj_10, g_fProjectionMatrix[10]);
+			SETSTAT_FT(stats.gproj_11, g_fProjectionMatrix[11]);
+			SETSTAT_FT(stats.gproj_12, g_fProjectionMatrix[12]);
+			SETSTAT_FT(stats.gproj_13, g_fProjectionMatrix[13]);
+			SETSTAT_FT(stats.gproj_14, g_fProjectionMatrix[14]);
+			SETSTAT_FT(stats.gproj_15, g_fProjectionMatrix[15]);
+			break;
+
+		case GX_ORTHOGRAPHIC:
+
+			g_fProjectionMatrix[0] = rawProjection[0];
+			g_fProjectionMatrix[1] = 0.0f;
+			g_fProjectionMatrix[2] = 0.0f;
+			g_fProjectionMatrix[3] = rawProjection[1];
+
+			g_fProjectionMatrix[4] = 0.0f;
+			g_fProjectionMatrix[5] = rawProjection[2];
+			g_fProjectionMatrix[6] = 0.0f;
+			g_fProjectionMatrix[7] = rawProjection[3];
+
+			g_fProjectionMatrix[8] = 0.0f;
+			g_fProjectionMatrix[9] = 0.0f;
+			g_fProjectionMatrix[10] = (g_ProjHack1.value + rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign);
+			g_fProjectionMatrix[11] = (g_ProjHack2.value + rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign);
+
+			g_fProjectionMatrix[12] = 0.0f;
+			g_fProjectionMatrix[13] = 0.0f;
+
+			g_fProjectionMatrix[14] = 0.0f;
+
+			// Hack to fix depth clipping precision issues (such as Sonic Unleashed UI)
+			g_fProjectionMatrix[15] = 1.0f + FLT_EPSILON;
+
+			SETSTAT_FT(stats.g2proj_0,  g_fProjectionMatrix[0]);
+			SETSTAT_FT(stats.g2proj_1,  g_fProjectionMatrix[1]);
+			SETSTAT_FT(stats.g2proj_2,  g_fProjectionMatrix[2]);
+			SETSTAT_FT(stats.g2proj_3,  g_fProjectionMatrix[3]);
+			SETSTAT_FT(stats.g2proj_4,  g_fProjectionMatrix[4]);
+			SETSTAT_FT(stats.g2proj_5,  g_fProjectionMatrix[5]);
+			SETSTAT_FT(stats.g2proj_6,  g_fProjectionMatrix[6]);
+			SETSTAT_FT(stats.g2proj_7,  g_fProjectionMatrix[7]);
+			SETSTAT_FT(stats.g2proj_8,  g_fProjectionMatrix[8]);
+			SETSTAT_FT(stats.g2proj_9,  g_fProjectionMatrix[9]);
+			SETSTAT_FT(stats.g2proj_10, g_fProjectionMatrix[10]);
+			SETSTAT_FT(stats.g2proj_11, g_fProjectionMatrix[11]);
+			SETSTAT_FT(stats.g2proj_12, g_fProjectionMatrix[12]);
+			SETSTAT_FT(stats.g2proj_13, g_fProjectionMatrix[13]);
+			SETSTAT_FT(stats.g2proj_14, g_fProjectionMatrix[14]);
+			SETSTAT_FT(stats.g2proj_15, g_fProjectionMatrix[15]);
+			SETSTAT_FT(stats.proj_0,    rawProjection[0]);
+			SETSTAT_FT(stats.proj_1,    rawProjection[1]);
+			SETSTAT_FT(stats.proj_2,    rawProjection[2]);
+			SETSTAT_FT(stats.proj_3,    rawProjection[3]);
+			SETSTAT_FT(stats.proj_4,    rawProjection[4]);
+			SETSTAT_FT(stats.proj_5,    rawProjection[5]);
+			break;
+
+		default:
+			ERROR_LOG(VIDEO, "Unknown projection type: %d", xfmem.projection.type);
+		}
+
+		PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]);
+
+		if (g_ActiveConfig.bFreeLook && xfmem.projection.type == GX_PERSPECTIVE)
+		{
+			Matrix44 mtxA;
+			Matrix44 mtxB;
+			Matrix44 viewMtx;
+
+			Matrix44::Translate(mtxA, s_fViewTranslationVector);
+			Matrix44::LoadMatrix33(mtxB, s_viewRotationMatrix);
+			Matrix44::Multiply(mtxB, mtxA, viewMtx); // view = rotation x translation
+			Matrix44::Set(mtxB, g_fProjectionMatrix);
+			Matrix44::Multiply(mtxB, viewMtx, mtxA); // mtxA = projection x view
+			Matrix44::Multiply(s_viewportCorrection, mtxA, mtxB); // mtxB = viewportCorrection x mtxA
+			memcpy(constants.projection, mtxB.data, 4*16);
+		}
+		else
+		{
+			Matrix44 projMtx;
+			Matrix44::Set(projMtx, g_fProjectionMatrix);
+
+			Matrix44 correctedMtx;
+			Matrix44::Multiply(s_viewportCorrection, projMtx, correctedMtx);
+			memcpy(constants.projection, correctedMtx.data, 4*16);
+		}
+
+		dirty = true;
+	}
+}
+
+void VertexShaderManager::InvalidateXFRange(int start, int end)
+{
+	if (((u32)start >= (u32)g_main_cp_state.matrix_index_a.PosNormalMtxIdx * 4 &&
+		 (u32)start <  (u32)g_main_cp_state.matrix_index_a.PosNormalMtxIdx * 4 + 12) ||
+		((u32)start >= XFMEM_NORMALMATRICES + ((u32)g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31) * 3 &&
+		 (u32)start <  XFMEM_NORMALMATRICES + ((u32)g_main_cp_state.matrix_index_a.PosNormalMtxIdx & 31) * 3 + 9))
+	{
+		bPosNormalMatrixChanged = true;
+	}
+
+	if (((u32)start >= (u32)g_main_cp_state.matrix_index_a.Tex0MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_a.Tex0MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_a.Tex1MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_a.Tex1MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_a.Tex2MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_a.Tex2MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_a.Tex3MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_a.Tex3MtxIdx*4+12))
+	{
+		bTexMatricesChanged[0] = true;
+	}
+
+	if (((u32)start >= (u32)g_main_cp_state.matrix_index_b.Tex4MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_b.Tex4MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_b.Tex5MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_b.Tex5MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_b.Tex6MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_b.Tex6MtxIdx*4+12) ||
+		((u32)start >= (u32)g_main_cp_state.matrix_index_b.Tex7MtxIdx*4 && (u32)start < (u32)g_main_cp_state.matrix_index_b.Tex7MtxIdx*4+12))
+	{
+		bTexMatricesChanged[1] = true;
+	}
+
+	if (start < XFMEM_POSMATRICES_END)
+	{
+		if (nTransformMatricesChanged[0] == -1)
+		{
+			nTransformMatricesChanged[0] = start;
+			nTransformMatricesChanged[1] = end > XFMEM_POSMATRICES_END ? XFMEM_POSMATRICES_END : end;
+		}
+		else
+		{
+			if (nTransformMatricesChanged[0] > start)
+				nTransformMatricesChanged[0] = start;
+
+			if (nTransformMatricesChanged[1] < end)
+				nTransformMatricesChanged[1] = end>XFMEM_POSMATRICES_END ? XFMEM_POSMATRICES_END : end;
+		}
+	}
+
+	if (start < XFMEM_NORMALMATRICES_END && end > XFMEM_NORMALMATRICES)
+	{
+		int _start = start < XFMEM_NORMALMATRICES ? 0 : start-XFMEM_NORMALMATRICES;
+		int _end = end < XFMEM_NORMALMATRICES_END ? end-XFMEM_NORMALMATRICES : XFMEM_NORMALMATRICES_END-XFMEM_NORMALMATRICES;
+
+		if (nNormalMatricesChanged[0] == -1)
+		{
+			nNormalMatricesChanged[0] = _start;
+			nNormalMatricesChanged[1] = _end;
+		}
+		else
+		{
+			if (nNormalMatricesChanged[0] > _start)
+				nNormalMatricesChanged[0] = _start;
+
+			if (nNormalMatricesChanged[1] < _end)
+				nNormalMatricesChanged[1] = _end;
+		}
+	}
+
+	if (start < XFMEM_POSTMATRICES_END && end > XFMEM_POSTMATRICES)
+	{
+		int _start = start < XFMEM_POSTMATRICES ? XFMEM_POSTMATRICES : start-XFMEM_POSTMATRICES;
+		int _end = end < XFMEM_POSTMATRICES_END ? end-XFMEM_POSTMATRICES : XFMEM_POSTMATRICES_END-XFMEM_POSTMATRICES;
+
+		if (nPostTransformMatricesChanged[0] == -1)
+		{
+			nPostTransformMatricesChanged[0] = _start;
+			nPostTransformMatricesChanged[1] = _end;
+		}
+		else
+		{
+			if (nPostTransformMatricesChanged[0] > _start)
+				nPostTransformMatricesChanged[0] = _start;
+
+			if (nPostTransformMatricesChanged[1] < _end)
+				nPostTransformMatricesChanged[1] = _end;
+		}
+	}
+
+	if (start < XFMEM_LIGHTS_END && end > XFMEM_LIGHTS)
+	{
+		int _start = start < XFMEM_LIGHTS ? XFMEM_LIGHTS : start-XFMEM_LIGHTS;
+		int _end = end < XFMEM_LIGHTS_END ? end-XFMEM_LIGHTS : XFMEM_LIGHTS_END-XFMEM_LIGHTS;
+
+		if (nLightsChanged[0] == -1)
+		{
+			nLightsChanged[0] = _start;
+			nLightsChanged[1] = _end;
+		}
+		else
+		{
+			if (nLightsChanged[0] > _start)
+				nLightsChanged[0] = _start;
+
+			if (nLightsChanged[1] < _end)
+				nLightsChanged[1] = _end;
+		}
+	}
+}
+
+void VertexShaderManager::SetTexMatrixChangedA(u32 Value)
+{
+	if (g_main_cp_state.matrix_index_a.Hex != Value)
+	{
+		VertexManager::Flush();
+		if (g_main_cp_state.matrix_index_a.PosNormalMtxIdx != (Value & 0x3f))
+			bPosNormalMatrixChanged = true;
+		bTexMatricesChanged[0] = true;
+		g_main_cp_state.matrix_index_a.Hex = Value;
+	}
+}
+
+void VertexShaderManager::SetTexMatrixChangedB(u32 Value)
+{
+	if (g_main_cp_state.matrix_index_b.Hex != Value)
+	{
+		VertexManager::Flush();
+		bTexMatricesChanged[1] = true;
+		g_main_cp_state.matrix_index_b.Hex = Value;
+	}
+}
+
+void VertexShaderManager::SetViewportChanged()
+{
+	bViewportChanged = true;
+}
+
+void VertexShaderManager::SetProjectionChanged()
+{
+	bProjectionChanged = true;
+}
+
+void VertexShaderManager::SetMaterialColorChanged(int index, u32 color)
+{
+	nMaterialsChanged[index] = true;
+}
+
+void VertexShaderManager::TranslateView(float x, float y, float z)
+{
+	float result[3];
+	float vector[3] = { x, z, y };
+
+	Matrix33::Multiply(s_viewInvRotationMatrix, vector, result);
+
+	for (int i = 0; i < 3; i++)
+		s_fViewTranslationVector[i] += result[i];
+
+	bProjectionChanged = true;
+}
+
+void VertexShaderManager::RotateView(float x, float y)
+{
+	s_fViewRotation[0] += x;
+	s_fViewRotation[1] += y;
+
+	Matrix33 mx;
+	Matrix33 my;
+	Matrix33::RotateX(mx, s_fViewRotation[1]);
+	Matrix33::RotateY(my, s_fViewRotation[0]);
+	Matrix33::Multiply(mx, my, s_viewRotationMatrix);
+
+	// reverse rotation
+	Matrix33::RotateX(mx, -s_fViewRotation[1]);
+	Matrix33::RotateY(my, -s_fViewRotation[0]);
+	Matrix33::Multiply(my, mx, s_viewInvRotationMatrix);
+
+	bProjectionChanged = true;
+}
+
+void VertexShaderManager::ResetView()
+{
+	memset(s_fViewTranslationVector, 0, sizeof(s_fViewTranslationVector));
+	Matrix33::LoadIdentity(s_viewRotationMatrix);
+	Matrix33::LoadIdentity(s_viewInvRotationMatrix);
+	s_fViewRotation[0] = s_fViewRotation[1] = 0.0f;
+
+	bProjectionChanged = true;
+}
+
+void VertexShaderManager::TransformToClipSpace(const float* data, float* out, u32 MtxIdx)
+{
+	const float* world_matrix = (const float*)xfmem.posMatrices + (MtxIdx & 0x3f) * 4;
+	// We use the projection matrix calculated by vertexShaderManager, because it
+	// includes any free look transformations.
+	// Make sure VertexManager::SetConstants() has been called first.
+	const float* proj_matrix = &g_fProjectionMatrix[0];
+
+	float t[3];
+	t[0] = data[0] * world_matrix[0] + data[1] * world_matrix[1] + data[2] * world_matrix[2] + world_matrix[3];
+	t[1] = data[0] * world_matrix[4] + data[1] * world_matrix[5] + data[2] * world_matrix[6] + world_matrix[7];
+	t[2] = data[0] * world_matrix[8] + data[1] * world_matrix[9] + data[2] * world_matrix[10] + world_matrix[11];
+
+	out[0] = t[0] * proj_matrix[0] + t[1] * proj_matrix[1] + t[2] * proj_matrix[2] + proj_matrix[3];
+	out[1] = t[0] * proj_matrix[4] + t[1] * proj_matrix[5] + t[2] * proj_matrix[6] + proj_matrix[7];
+	out[2] = t[0] * proj_matrix[8] + t[1] * proj_matrix[9] + t[2] * proj_matrix[10] + proj_matrix[11];
+	out[3] = t[0] * proj_matrix[12] + t[1] * proj_matrix[13] + t[2] * proj_matrix[14] + proj_matrix[15];
+}
+
+void VertexShaderManager::DoState(PointerWrap &p)
+{
+	p.Do(g_fProjectionMatrix);
+	p.Do(s_viewportCorrection);
+	p.Do(s_viewRotationMatrix);
+	p.Do(s_viewInvRotationMatrix);
+	p.Do(s_fViewTranslationVector);
+	p.Do(s_fViewRotation);
+
+	p.Do(nTransformMatricesChanged);
+	p.Do(nNormalMatricesChanged);
+	p.Do(nPostTransformMatricesChanged);
+	p.Do(nLightsChanged);
+
+	p.Do(nMaterialsChanged);
+	p.Do(bTexMatricesChanged);
+	p.Do(bPosNormalMatrixChanged);
+	p.Do(bProjectionChanged);
+	p.Do(bViewportChanged);
+
+	p.Do(constants);
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+	{
+		Dirty();
+	}
+}
diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h
new file mode 100644
index 0000000000..325b18a2cd
--- /dev/null
+++ b/Source/Core/VideoCommon/VertexShaderManager.h
@@ -0,0 +1,45 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/VertexShaderGen.h"
+
+class PointerWrap;
+
+void UpdateProjectionHack(int iParams[], std::string sParams[]);
+
+// The non-API dependent parts.
+class VertexShaderManager
+{
+public:
+	static void Init();
+	static void Dirty();
+	static void Shutdown();
+	static void DoState(PointerWrap &p);
+
+	// constant management
+	static void SetConstants();
+
+	static void InvalidateXFRange(int start, int end);
+	static void SetTexMatrixChangedA(u32 value);
+	static void SetTexMatrixChangedB(u32 value);
+	static void SetViewportChanged();
+	static void SetProjectionChanged();
+	static void SetMaterialColorChanged(int index, u32 color);
+
+	static void TranslateView(float x, float y, float z = 0.0f);
+	static void RotateView(float x, float y);
+	static void ResetView();
+
+	// data: 3 floats representing the X, Y and Z vertex model coordinates and the posmatrix index.
+	// out:  4 floats which will be initialized with the corresponding clip space coordinates
+	// NOTE: g_fProjectionMatrix must be up to date when this is called
+	//       (i.e. VertexShaderManager::SetConstants needs to be called before using this!)
+	static void TransformToClipSpace(const float* data, float* out, u32 mtxIdx);
+
+	static VertexShaderConstants constants;
+	static bool dirty;
+};
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp
new file mode 100644
index 0000000000..c0e466cb5c
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoBackendBase.cpp
@@ -0,0 +1,83 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// TODO: ugly
+#ifdef _WIN32
+#include "VideoBackends/D3D/VideoBackend.h"
+#endif
+#include "VideoBackends/OGL/VideoBackend.h"
+#include "VideoBackends/Software/VideoBackend.h"
+
+#include "VideoCommon/VideoBackendBase.h"
+
+std::vector<VideoBackend*> g_available_video_backends;
+VideoBackend* g_video_backend = nullptr;
+static VideoBackend* s_default_backend = nullptr;
+
+#ifdef _WIN32
+#include <windows.h>
+
+// http://msdn.microsoft.com/en-us/library/ms725491.aspx
+static bool IsGteVista()
+{
+	OSVERSIONINFOEX osvi;
+	DWORDLONG dwlConditionMask = 0;
+
+	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+	osvi.dwMajorVersion = 6;
+
+	VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+
+	return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE;
+}
+
+// Nvidia drivers >= v302 will check if the application exports a global
+// variable named NvOptimusEnablement to know if it should run the app in high
+// performance graphics mode or using the IGP.
+extern "C" {
+__declspec(dllexport) DWORD NvOptimusEnablement = 1;
+}
+#endif
+
+void VideoBackend::PopulateList()
+{
+	VideoBackend* backends[4] = { nullptr };
+
+	// OGL > D3D11 > SW
+	g_available_video_backends.push_back(backends[0] = new OGL::VideoBackend);
+#ifdef _WIN32
+	if (IsGteVista())
+		g_available_video_backends.push_back(backends[1] = new DX11::VideoBackend);
+#endif
+	g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
+
+	for (VideoBackend* backend : backends)
+	{
+		if (backend)
+		{
+			s_default_backend = g_video_backend = backend;
+			break;
+		}
+	}
+}
+
+void VideoBackend::ClearList()
+{
+	while (!g_available_video_backends.empty())
+	{
+		delete g_available_video_backends.back();
+		g_available_video_backends.pop_back();
+	}
+}
+
+void VideoBackend::ActivateBackend(const std::string& name)
+{
+	if (name.length() == 0) // If nullptr, set it to the default backend (expected behavior)
+		g_video_backend = s_default_backend;
+
+	for (VideoBackend* backend : g_available_video_backends)
+		if (name == backend->GetName())
+			g_video_backend = backend;
+}
diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h
new file mode 100644
index 0000000000..4671afdc6b
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoBackendBase.h
@@ -0,0 +1,165 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/ChunkFile.h"
+#include "VideoCommon/PerfQueryBase.h"
+
+namespace MMIO { class Mapping; }
+
+
+enum FieldType
+{
+	FIELD_PROGRESSIVE = 0,
+	FIELD_UPPER,
+	FIELD_LOWER
+};
+
+enum EFBAccessType
+{
+	PEEK_Z = 0,
+	POKE_Z,
+	PEEK_COLOR,
+	POKE_COLOR
+};
+
+struct SCPFifoStruct
+{
+	// fifo registers
+	volatile u32 CPBase;
+	volatile u32 CPEnd;
+	u32 CPHiWatermark;
+	u32 CPLoWatermark;
+	volatile u32 CPReadWriteDistance;
+	volatile u32 CPWritePointer;
+	volatile u32 CPReadPointer;
+	volatile u32 CPBreakpoint;
+	volatile u32 SafeCPReadPointer;
+	// Super Monkey Ball Adventure require this.
+	// Because the read&check-PEToken-loop stays in its JITed block I suppose.
+	// So no possiblity to ack the Token irq by the scheduler until some sort of PPC watchdog do its mess.
+	volatile u16 PEToken;
+
+	volatile u32 bFF_GPLinkEnable;
+	volatile u32 bFF_GPReadEnable;
+	volatile u32 bFF_BPEnable;
+	volatile u32 bFF_BPInt;
+	volatile u32 bFF_Breakpoint;
+
+	volatile u32 bFF_LoWatermarkInt;
+	volatile u32 bFF_HiWatermarkInt;
+
+	volatile u32 bFF_LoWatermark;
+	volatile u32 bFF_HiWatermark;
+};
+
+class VideoBackend
+{
+public:
+	virtual ~VideoBackend() {}
+
+	virtual void EmuStateChange(EMUSTATE_CHANGE) = 0;
+
+	virtual unsigned int PeekMessages() = 0;
+
+	virtual bool Initialize(void *window_handle) = 0;
+	virtual void Shutdown() = 0;
+	virtual void RunLoop(bool enable) = 0;
+
+	virtual std::string GetName() const = 0;
+	virtual std::string GetDisplayName() const { return GetName(); }
+
+	virtual void ShowConfig(void*) = 0;
+
+	virtual void Video_Prepare() = 0;
+	virtual void Video_EnterLoop() = 0;
+	virtual void Video_ExitLoop() = 0;
+	virtual void Video_Cleanup() = 0; // called from gl/d3d thread
+
+	virtual void Video_BeginField(u32, u32, u32, u32) = 0;
+	virtual void Video_EndField() = 0;
+
+	virtual u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) = 0;
+	virtual u32 Video_GetQueryResult(PerfQueryType type) = 0;
+	virtual u16 Video_GetBoundingBox(int index) = 0;
+
+	virtual void Video_AddMessage(const std::string& msg, unsigned int milliseconds) = 0;
+	virtual void Video_ClearMessages() = 0;
+	virtual bool Video_Screenshot(const std::string& filename) = 0;
+
+	virtual void Video_SetRendering(bool bEnabled) = 0;
+
+	virtual void Video_GatherPipeBursted() = 0;
+
+	virtual int Video_Sync(int ticks) = 0;
+
+	// Registers MMIO handlers for the CommandProcessor registers.
+	virtual void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) = 0;
+
+	static void PopulateList();
+	static void ClearList();
+	static void ActivateBackend(const std::string& name);
+
+	// waits until is paused and fully idle, and acquires a lock on that state.
+	// or, if doLock is false, releases a lock on that state and optionally unpauses.
+	// calls must be balanced and non-recursive (once with doLock true, then once with doLock false).
+	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock = true) = 0;
+
+	// the implementation needs not do synchronization logic, because calls to it are surrounded by PauseAndLock now
+	virtual void DoState(PointerWrap &p) = 0;
+
+	virtual void CheckInvalidState() = 0;
+
+	virtual void UpdateWantDeterminism(bool want) {}
+};
+
+extern std::vector<VideoBackend*> g_available_video_backends;
+extern VideoBackend* g_video_backend;
+
+// inherited by D3D/OGL backends
+class VideoBackendHardware : public VideoBackend
+{
+	void RunLoop(bool enable) override;
+
+	void EmuStateChange(EMUSTATE_CHANGE) override;
+
+	void Video_EnterLoop() override;
+	void Video_ExitLoop() override;
+	void Video_BeginField(u32, u32, u32, u32) override;
+	void Video_EndField() override;
+
+	u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) override;
+	u32 Video_GetQueryResult(PerfQueryType type) override;
+	u16 Video_GetBoundingBox(int index) override;
+
+	void Video_AddMessage(const std::string& pstr, unsigned int milliseconds) override;
+	void Video_ClearMessages() override;
+	bool Video_Screenshot(const std::string& filename) override;
+
+	void Video_SetRendering(bool bEnabled) override;
+
+	void Video_GatherPipeBursted() override;
+
+	int Video_Sync(int ticks) override;
+
+	void RegisterCPMMIO(MMIO::Mapping* mmio, u32 base) override;
+
+	void PauseAndLock(bool doLock, bool unpauseOnUnlock = true) override;
+	void DoState(PointerWrap &p) override;
+
+	void UpdateWantDeterminism(bool want) override;
+
+	bool m_invalid;
+
+public:
+	void CheckInvalidState() override;
+
+protected:
+	void InitializeShared();
+	void InvalidState();
+};
diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h
new file mode 100644
index 0000000000..b81ebb8929
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoCommon.h
@@ -0,0 +1,117 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "Common/CommonTypes.h"
+#include "Common/MathUtil.h"
+#include "VideoCommon/VideoBackendBase.h"
+
+// These are accurate (disregarding AA modes).
+enum
+{
+	EFB_WIDTH = 640,
+	EFB_HEIGHT = 528,
+};
+
+// XFB width is decided by EFB copy operation. The VI can do horizontal
+// scaling (TODO: emulate).
+const u32 MAX_XFB_WIDTH = EFB_WIDTH;
+
+// Although EFB height is 528, 574-line XFB's can be created either with
+// vertical scaling by the EFB copy operation or copying to multiple XFB's
+// that are next to each other in memory (TODO: handle that situation).
+const u32 MAX_XFB_HEIGHT = 574;
+
+// This structure should only be used to represent a rectangle in EFB
+// coordinates, where the origin is at the upper left and the frame dimensions
+// are 640 x 528.
+typedef MathUtil::Rectangle<int> EFBRectangle;
+
+// This structure should only be used to represent a rectangle in standard target
+// coordinates, where the origin is at the lower left and the frame dimensions
+// depend on the resolution settings. Use Renderer::ConvertEFBRectangle to
+// convert an EFBRectangle to a TargetRectangle.
+struct TargetRectangle : public MathUtil::Rectangle<int>
+{
+#ifdef _WIN32
+	// Only used by D3D backend.
+	const RECT *AsRECT() const
+	{
+		// The types are binary compatible so this works.
+		return (const RECT *)this;
+	}
+	RECT *AsRECT()
+	{
+		// The types are binary compatible so this works.
+		return (RECT *)this;
+	}
+#endif
+};
+
+#ifdef _WIN32
+#define PRIM_LOG(...) DEBUG_LOG(VIDEO, __VA_ARGS__)
+#else
+#define PRIM_LOG(...) DEBUG_LOG(VIDEO, ##__VA_ARGS__)
+#endif
+
+// warning: mapping buffer should be disabled to use this
+// #define LOG_VTX() DEBUG_LOG(VIDEO, "vtx: %f %f %f, ", ((float*)g_vertex_manager_write_ptr)[-3], ((float*)g_vertex_manager_write_ptr)[-2], ((float*)g_vertex_manager_write_ptr)[-1]);
+
+#define LOG_VTX()
+
+typedef enum
+{
+	API_OPENGL = 1,
+	API_D3D    = 2,
+	API_NONE   = 3
+} API_TYPE;
+
+inline u32 RGBA8ToRGBA6ToRGBA8(u32 src)
+{
+	u32 color = src;
+	color &= 0xFCFCFCFC;
+	color |= (color >> 6) & 0x03030303;
+	return color;
+}
+
+inline u32 RGBA8ToRGB565ToRGBA8(u32 src)
+{
+	u32 color = (src & 0xF8FCF8);
+	color |= (color >> 5) & 0x070007;
+	color |= (color >> 6) & 0x000300;
+	color |= 0xFF000000;
+	return color;
+}
+
+inline u32 Z24ToZ16ToZ24(u32 src)
+{
+	return (src & 0xFFFF00) | (src >> 16);
+}
+
+/* Returns the smallest power of 2 which is greater than or equal to num */
+inline u32 MakePow2(u32 num)
+{
+	--num;
+	num |= num >> 1;
+	num |= num >> 2;
+	num |= num >> 4;
+	num |= num >> 8;
+	num |= num >> 16;
+	++num;
+	return num;
+}
+
+// returns the exponent of the smallest power of two which is greater than val
+inline unsigned int GetPow2(unsigned int val)
+{
+	unsigned int ret = 0;
+	for (; val; val >>= 1)
+		++ret;
+	return ret;
+}
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index c5896af1a6..ff56a97703 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -1,306 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}</ProjectGuid>
-    <RootNamespace>VideoCommon</RootNamespace>
+    <ProjectGuid>{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup 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\CodeGen_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\CodeGen_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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.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\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>false</OpenMPSupport>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>false</OpenMPSupport>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>false</OpenMPSupport>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>true</OpenMPSupport>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Src\AVIDump.cpp" />
-    <ClCompile Include="Src\BPFunctions.cpp" />
-    <ClCompile Include="Src\BPMemory.cpp" />
-    <ClCompile Include="Src\BPStructs.cpp" />
-    <ClCompile Include="Src\CommandProcessor.cpp" />
-    <ClCompile Include="Src\CPMemory.cpp" />
-    <ClCompile Include="Src\Debugger.cpp" />
-    <ClCompile Include="Src\DriverDetails.cpp" />
-    <ClCompile Include="Src\EmuWindow.cpp" />
-    <ClCompile Include="Src\Fifo.cpp" />
-    <ClCompile Include="Src\FPSCounter.cpp" />
-    <ClCompile Include="Src\FramebufferManagerBase.cpp" />
-    <ClCompile Include="Src\HiresTextures.cpp" />
-    <ClCompile Include="Src\ImageWrite.cpp" />
-    <ClCompile Include="Src\IndexGenerator.cpp" />
-    <ClCompile Include="Src\MainBase.cpp" />
-    <ClCompile Include="Src\memcpy_amd.cpp" />
-    <ClCompile Include="Src\OnScreenDisplay.cpp" />
-    <ClCompile Include="Src\OpcodeDecoding.cpp" />
-    <ClCompile Include="Src\OpenCL.cpp" />
-    <ClCompile Include="Src\OpenCL\OCLTextureDecoder.cpp" />
-    <ClCompile Include="Src\PerfQueryBase.cpp" />
-    <ClCompile Include="Src\PixelEngine.cpp" />
-    <ClCompile Include="Src\PixelShaderGen.cpp" />
-    <ClCompile Include="Src\PixelShaderManager.cpp" />
-    <ClCompile Include="Src\RenderBase.cpp" />
-    <ClCompile Include="Src\Statistics.cpp" />
-    <ClCompile Include="Src\TextureCacheBase.cpp" />
-    <ClCompile Include="Src\TextureConversionShader.cpp" />
-    <ClCompile Include="Src\VertexLoader.cpp" />
-    <ClCompile Include="Src\VertexLoaderManager.cpp" />
-    <ClCompile Include="Src\VertexLoader_Color.cpp" />
-    <ClCompile Include="Src\VertexLoader_Normal.cpp" />
-    <ClCompile Include="Src\VertexLoader_Position.cpp" />
-    <ClCompile Include="Src\VertexLoader_TextCoord.cpp" />
-    <ClCompile Include="Src\VertexManagerBase.cpp" />
-    <ClCompile Include="Src\VertexShaderGen.cpp" />
-    <ClCompile Include="Src\VertexShaderManager.cpp" />
-    <ClCompile Include="Src\VideoBackendBase.cpp" />
-    <ClCompile Include="Src\VideoConfig.cpp" />
-    <ClCompile Include="Src\VideoState.cpp" />
-    <ClCompile Include="Src\x64DLCache.cpp" />
-    <ClCompile Include="Src\x64TextureDecoder.cpp" />
-    <ClCompile Include="Src\XFMemory.cpp" />
-    <ClCompile Include="Src\XFStructs.cpp" />
+    <ClCompile Include="AsyncRequests.cpp" />
+    <ClCompile Include="AVIDump.cpp" />
+    <ClCompile Include="BoundingBox.cpp" />
+    <ClCompile Include="BPFunctions.cpp" />
+    <ClCompile Include="BPMemory.cpp" />
+    <ClCompile Include="BPStructs.cpp" />
+    <ClCompile Include="CommandProcessor.cpp" />
+    <ClCompile Include="CPMemory.cpp" />
+    <ClCompile Include="Debugger.cpp" />
+    <ClCompile Include="DriverDetails.cpp" />
+    <ClCompile Include="Fifo.cpp" />
+    <ClCompile Include="FPSCounter.cpp" />
+    <ClCompile Include="FramebufferManagerBase.cpp" />
+    <ClCompile Include="HiresTextures.cpp" />
+    <ClCompile Include="ImageWrite.cpp" />
+    <ClCompile Include="IndexGenerator.cpp" />
+    <ClCompile Include="MainBase.cpp" />
+    <ClCompile Include="OnScreenDisplay.cpp" />
+    <ClCompile Include="OpcodeDecoding.cpp" />
+    <ClCompile Include="PerfQueryBase.cpp" />
+    <ClCompile Include="PixelEngine.cpp" />
+    <ClCompile Include="PixelShaderGen.cpp" />
+    <ClCompile Include="PixelShaderManager.cpp" />
+    <ClCompile Include="PostProcessing.cpp" />
+    <ClCompile Include="RenderBase.cpp" />
+    <ClCompile Include="Statistics.cpp" />
+    <ClCompile Include="GeometryShaderGen.cpp" />
+    <ClCompile Include="GeometryShaderManager.cpp" />
+    <ClCompile Include="TextureCacheBase.cpp" />
+    <ClCompile Include="TextureConversionShader.cpp" />
+    <ClCompile Include="VertexLoader.cpp" />
+    <ClCompile Include="VertexLoaderBase.cpp" />
+    <ClCompile Include="VertexLoaderX64.cpp" />
+    <ClCompile Include="VertexLoaderManager.cpp" />
+    <ClCompile Include="VertexLoader_Color.cpp" />
+    <ClCompile Include="VertexLoader_Normal.cpp" />
+    <ClCompile Include="VertexLoader_Position.cpp" />
+    <ClCompile Include="VertexLoader_TextCoord.cpp" />
+    <ClCompile Include="VertexManagerBase.cpp" />
+    <ClCompile Include="VertexShaderGen.cpp" />
+    <ClCompile Include="VertexShaderManager.cpp" />
+    <ClCompile Include="VideoBackendBase.cpp" />
+    <ClCompile Include="VideoConfig.cpp" />
+    <ClCompile Include="VideoState.cpp" />
+    <ClCompile Include="TextureDecoder_Common.cpp" />
+    <ClCompile Include="TextureDecoder_x64.cpp" />
+    <ClCompile Include="XFMemory.cpp" />
+    <ClCompile Include="XFStructs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\AVIDump.h" />
-    <ClInclude Include="Src\BPFunctions.h" />
-    <ClInclude Include="Src\BPMemory.h" />
-    <ClInclude Include="Src\BPStructs.h" />
-    <ClInclude Include="Src\CommandProcessor.h" />
-    <ClInclude Include="Src\CPMemory.h" />
-    <ClInclude Include="Src\DataReader.h" />
-    <ClInclude Include="Src\Debugger.h" />
-    <ClInclude Include="Src\DriverDetails.h" />
-    <ClInclude Include="Src\DLCache.h" />
-    <ClInclude Include="Src\EmuWindow.h" />
-    <ClInclude Include="Src\Fifo.h" />
-    <ClInclude Include="Src\FPSCounter.h" />
-    <ClInclude Include="Src\FramebufferManagerBase.h" />
-    <ClInclude Include="Src\HiresTextures.h" />
-    <ClInclude Include="Src\ImageWrite.h" />
-    <ClInclude Include="Src\IndexGenerator.h" />
-    <ClInclude Include="Src\LightingShaderGen.h" />
-    <ClInclude Include="Src\LookUpTables.h" />
-    <ClInclude Include="Src\MainBase.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\OnScreenDisplay.h" />
-    <ClInclude Include="Src\OpcodeDecoding.h" />
-    <ClInclude Include="Src\OpenCL.h" />
-    <ClInclude Include="Src\OpenCL\OCLTextureDecoder.h" />
-    <ClInclude Include="Src\PerfQueryBase.h" />
-    <ClInclude Include="Src\PixelEngine.h" />
-    <ClInclude Include="Src\PixelShaderGen.h" />
-    <ClInclude Include="Src\PixelShaderManager.h" />
-    <ClInclude Include="Src\RenderBase.h" />
-    <ClInclude Include="Src\ShaderGenCommon.h" />
-    <ClInclude Include="Src\Statistics.h" />
-    <ClInclude Include="Src\TextureCacheBase.h" />
-    <ClInclude Include="Src\TextureConversionShader.h" />
-    <ClInclude Include="Src\TextureDecoder.h" />
-    <ClInclude Include="Src\VertexLoader.h" />
-    <ClInclude Include="Src\VertexLoaderManager.h" />
-    <ClInclude Include="Src\VertexLoader_Color.h" />
-    <ClInclude Include="Src\VertexLoader_Normal.h" />
-    <ClInclude Include="Src\VertexLoader_Position.h" />
-    <ClInclude Include="Src\VertexLoader_TextCoord.h" />
-    <ClInclude Include="Src\VertexManagerBase.h" />
-    <ClInclude Include="Src\VertexShaderGen.h" />
-    <ClInclude Include="Src\VertexShaderManager.h" />
-    <ClInclude Include="Src\VideoCommon.h" />
-    <ClInclude Include="Src\VideoBackendBase.h" />
-    <ClInclude Include="Src\VideoConfig.h" />
-    <ClInclude Include="Src\VideoState.h" />
-    <ClInclude Include="Src\XFMemory.h" />
-    <ClInclude Include="Src\XFStructs.h" />
+    <ClInclude Include="AsyncRequests.h" />
+    <ClInclude Include="AVIDump.h" />
+    <ClInclude Include="BoundingBox.h" />
+    <ClInclude Include="BPFunctions.h" />
+    <ClInclude Include="BPMemory.h" />
+    <ClInclude Include="BPStructs.h" />
+    <ClInclude Include="CommandProcessor.h" />
+    <ClInclude Include="CPMemory.h" />
+    <ClInclude Include="DataReader.h" />
+    <ClInclude Include="Debugger.h" />
+    <ClInclude Include="DriverDetails.h" />
+    <ClInclude Include="Fifo.h" />
+    <ClInclude Include="FPSCounter.h" />
+    <ClInclude Include="FramebufferManagerBase.h" />
+    <ClInclude Include="HiresTextures.h" />
+    <ClInclude Include="ImageWrite.h" />
+    <ClInclude Include="IndexGenerator.h" />
+    <ClInclude Include="LightingShaderGen.h" />
+    <ClInclude Include="LookUpTables.h" />
+    <ClInclude Include="MainBase.h" />
+    <ClInclude Include="NativeVertexFormat.h" />
+    <ClInclude Include="OnScreenDisplay.h" />
+    <ClInclude Include="OpcodeDecoding.h" />
+    <ClInclude Include="PerfQueryBase.h" />
+    <ClInclude Include="PixelEngine.h" />
+    <ClInclude Include="PixelShaderGen.h" />
+    <ClInclude Include="PixelShaderManager.h" />
+    <ClInclude Include="PostProcessing.h" />
+    <ClInclude Include="RenderBase.h" />
+    <ClInclude Include="ShaderGenCommon.h" />
+    <ClInclude Include="Statistics.h" />
+    <ClInclude Include="GeometryShaderGen.h" />
+    <ClInclude Include="GeometryShaderManager.h" />
+    <ClInclude Include="TextureCacheBase.h" />
+    <ClInclude Include="TextureConversionShader.h" />
+    <ClInclude Include="TextureDecoder.h" />
+    <ClInclude Include="VertexLoader.h" />
+    <ClInclude Include="VertexLoaderBase.h" />
+    <ClInclude Include="VertexLoaderManager.h" />
+    <ClInclude Include="VertexLoaderUtils.h" />
+    <ClInclude Include="VertexLoader_Color.h" />
+    <ClInclude Include="VertexLoader_Normal.h" />
+    <ClInclude Include="VertexLoader_Position.h" />
+    <ClInclude Include="VertexLoader_TextCoord.h" />
+    <ClInclude Include="VertexManagerBase.h" />
+    <ClInclude Include="VertexShaderGen.h" />
+    <ClInclude Include="VertexShaderManager.h" />
+    <ClInclude Include="VideoBackendBase.h" />
+    <ClInclude Include="VideoCommon.h" />
+    <ClInclude Include="VideoConfig.h" />
+    <ClInclude Include="VideoState.h" />
+    <ClInclude Include="XFMemory.h" />
+    <ClInclude Include="XFStructs.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Data\User\OpenCL\TextureDecoder.cl" />
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\CLRun\clrun\CLRun.vcxproj">
-      <Project>{aa862e5e-a993-497a-b6a0-0e8e94b10050}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
+      <Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\SOIL\SOIL.vcxproj">
-      <Project>{8544f1ff-f2a5-42d8-a568-c56b5d3b4181}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(ExternalsDir)SOIL\SOIL.vcxproj">
+      <Project>{b441cc62-877e-4b3f-93e0-0de80544f705}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(ExternalsDir)xxhash\xxhash.vcxproj">
+      <Project>{677EA016-1182-440C-9345-DC88D1E98C0C}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
index 3f864b0e7e..1998fce1cc 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
@@ -1,296 +1,312 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="Src\CommandProcessor.cpp" />
-    <ClCompile Include="Src\memcpy_amd.cpp" />
-    <ClCompile Include="Src\PixelEngine.cpp" />
-    <ClCompile Include="Src\VideoBackendBase.cpp" />
-    <ClCompile Include="Src\VideoConfig.cpp" />
-    <ClCompile Include="Src\VertexLoader.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Color.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Normal.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexLoader_Position.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexLoader_TextCoord.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexLoaderManager.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\AVIDump.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HiresTextures.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ImageWrite.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\IndexGenerator.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\OnScreenDisplay.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Statistics.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VideoState.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PixelShaderManager.cpp">
-      <Filter>Shader Managers</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderManager.cpp">
-      <Filter>Shader Managers</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PixelShaderGen.cpp">
-      <Filter>Shader Generators</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureConversionShader.cpp">
-      <Filter>Shader Generators</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderGen.cpp">
-      <Filter>Shader Generators</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BPFunctions.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BPMemory.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\BPStructs.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\CPMemory.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\XFMemory.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\XFStructs.cpp">
-      <Filter>Register Sections</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\OpenCL.cpp">
-      <Filter>Decoding\OpenCL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\OpenCL\OCLTextureDecoder.cpp">
-      <Filter>Decoding\OpenCL</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Fifo.cpp">
-      <Filter>Decoding</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\OpcodeDecoding.cpp">
-      <Filter>Decoding</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\EmuWindow.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FramebufferManagerBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\MainBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PerfQueryBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\RenderBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCacheBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexManagerBase.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FPSCounter.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\x64TextureDecoder.cpp">
-      <Filter>Decoding</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\x64DLCache.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\CommandProcessor.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\PixelEngine.h" />
-    <ClInclude Include="Src\VideoCommon.h" />
-    <ClInclude Include="Src\VideoBackendBase.h" />
-    <ClInclude Include="Src\VideoConfig.h" />
-    <ClInclude Include="Src\DataReader.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\DLCache.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoader.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Color.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Normal.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoader_Position.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoader_TextCoord.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexLoaderManager.h">
-      <Filter>Vertex Loading</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\AVIDump.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HiresTextures.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ImageWrite.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\IndexGenerator.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LookUpTables.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\OnScreenDisplay.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Statistics.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VideoState.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PixelShaderManager.h">
-      <Filter>Shader Managers</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexShaderManager.h">
-      <Filter>Shader Managers</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PixelShaderGen.h">
-      <Filter>Shader Generators</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureConversionShader.h">
-      <Filter>Shader Generators</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexShaderGen.h">
-      <Filter>Shader Generators</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BPStructs.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BPFunctions.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\BPMemory.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\CPMemory.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\XFMemory.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\XFStructs.h">
-      <Filter>Register Sections</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\OpenCL.h">
-      <Filter>Decoding\OpenCL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\OpenCL\OCLTextureDecoder.h">
-      <Filter>Decoding\OpenCL</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Fifo.h">
-      <Filter>Decoding</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\OpcodeDecoding.h">
-      <Filter>Decoding</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureDecoder.h">
-      <Filter>Decoding</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\EmuWindow.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FramebufferManagerBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\MainBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PerfQueryBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\RenderBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureCacheBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexManagerBase.h">
-      <Filter>Base</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LightingShaderGen.h">
-      <Filter>Shader Generators</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FPSCounter.h">
-      <Filter>Util</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ShaderGenCommon.h">
-      <Filter>Shader Generators</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="..\..\..\Data\User\OpenCL\TextureDecoder.cl">
-      <Filter>Decoding\OpenCL</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Vertex Loading">
-      <UniqueIdentifier>{7520d766-5816-4e85-8068-3744850718d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Util">
-      <UniqueIdentifier>{ba650466-ae40-45ba-89f4-c3d4919d1f31}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Shader Managers">
-      <UniqueIdentifier>{9b5b4ba1-ee30-4cdc-86b2-2c6b15bb47f5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Shader Generators">
-      <UniqueIdentifier>{a833e7b4-e178-4ed6-9692-ebb05e2196b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Register Sections">
-      <UniqueIdentifier>{b7c0a925-0c89-4a92-9f07-8b60bd44a8bb}</UniqueIdentifier>
+    <Filter Include="Base">
+      <UniqueIdentifier>{23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Decoding">
-      <UniqueIdentifier>{2e8e6b8a-0d42-48a7-8a44-085830c6d033}</UniqueIdentifier>
+      <UniqueIdentifier>{2baa29c2-a528-4981-abcb-e0842c311f63}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Base">
-      <UniqueIdentifier>{448cb71f-7edd-4a5a-ab31-a6505f5a5820}</UniqueIdentifier>
+    <Filter Include="Register Sections">
+      <UniqueIdentifier>{6a88e4a0-754c-43df-98e6-405c99cd2ca7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Decoding\OpenCL">
-      <UniqueIdentifier>{e2a527a2-ccc8-4ab8-a93e-dd2628c0f3b6}</UniqueIdentifier>
+    <Filter Include="Shader Generators">
+      <UniqueIdentifier>{7ce5076f-4e85-4f4d-b3f0-8c88267b8b2d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Shader Managers">
+      <UniqueIdentifier>{8c17624b-2ccb-4ee4-9ec0-593f8f3d1dd2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Util">
+      <UniqueIdentifier>{8edd4982-cce6-406e-9029-f7a6449311b1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Vertex Loading">
+      <UniqueIdentifier>{cefc166b-1f5e-4e96-863d-1448e14c0741}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CommandProcessor.cpp" />
+    <ClCompile Include="DriverDetails.cpp" />
+    <ClCompile Include="PixelEngine.cpp" />
+    <ClCompile Include="VideoBackendBase.cpp" />
+    <ClCompile Include="VideoConfig.cpp" />
+    <ClCompile Include="Debugger.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="FramebufferManagerBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="MainBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="PerfQueryBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="RenderBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureCacheBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexManagerBase.cpp">
+      <Filter>Base</Filter>
+    </ClCompile>
+    <ClCompile Include="Fifo.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
+    <ClCompile Include="OpcodeDecoding.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
+    <ClCompile Include="BPFunctions.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="BPMemory.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="BPStructs.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="CPMemory.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="XFMemory.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="XFStructs.cpp">
+      <Filter>Register Sections</Filter>
+    </ClCompile>
+    <ClCompile Include="PixelShaderGen.cpp">
+      <Filter>Shader Generators</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureConversionShader.cpp">
+      <Filter>Shader Generators</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexShaderGen.cpp">
+      <Filter>Shader Generators</Filter>
+    </ClCompile>
+    <ClCompile Include="PixelShaderManager.cpp">
+      <Filter>Shader Managers</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexShaderManager.cpp">
+      <Filter>Shader Managers</Filter>
+    </ClCompile>
+    <ClCompile Include="AVIDump.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="FPSCounter.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="HiresTextures.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="ImageWrite.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="IndexGenerator.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="OnScreenDisplay.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="PostProcessing.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Statistics.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="VideoState.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoader.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoaderBase.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoaderX64.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoader_Color.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoader_Normal.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoader_Position.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoader_TextCoord.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="VertexLoaderManager.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureDecoder_Common.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureDecoder_x64.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
+    <ClCompile Include="AsyncRequests.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="BoundingBox.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="GeometryShaderGen.cpp">
+      <Filter>Shader Generators</Filter>
+    </ClCompile>
+    <ClCompile Include="GeometryShaderManager.cpp">
+      <Filter>Shader Managers</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CommandProcessor.h" />
+    <ClInclude Include="DriverDetails.h" />
+    <ClInclude Include="NativeVertexFormat.h" />
+    <ClInclude Include="PixelEngine.h" />
+    <ClInclude Include="VideoBackendBase.h" />
+    <ClInclude Include="VideoCommon.h" />
+    <ClInclude Include="VideoConfig.h" />
+    <ClInclude Include="Debugger.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="FramebufferManagerBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="MainBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="PerfQueryBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="RenderBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureCacheBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexManagerBase.h">
+      <Filter>Base</Filter>
+    </ClInclude>
+    <ClInclude Include="Fifo.h">
+      <Filter>Decoding</Filter>
+    </ClInclude>
+    <ClInclude Include="OpcodeDecoding.h">
+      <Filter>Decoding</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureDecoder.h">
+      <Filter>Decoding</Filter>
+    </ClInclude>
+    <ClInclude Include="BPFunctions.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="BPMemory.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="BPStructs.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="CPMemory.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="XFMemory.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="XFStructs.h">
+      <Filter>Register Sections</Filter>
+    </ClInclude>
+    <ClInclude Include="LightingShaderGen.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="PixelShaderGen.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="ShaderGenCommon.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureConversionShader.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexShaderGen.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="PixelShaderManager.h">
+      <Filter>Shader Managers</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexShaderManager.h">
+      <Filter>Shader Managers</Filter>
+    </ClInclude>
+    <ClInclude Include="AVIDump.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="FPSCounter.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="HiresTextures.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="ImageWrite.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="IndexGenerator.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="LookUpTables.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="OnScreenDisplay.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="PostProcessing.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Statistics.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoState.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="DataReader.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoader.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoaderBase.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoader_Color.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoader_Normal.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoader_Position.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoader_TextCoord.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoaderManager.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="VertexLoaderUtils.h">
+      <Filter>Vertex Loading</Filter>
+    </ClInclude>
+    <ClInclude Include="AsyncRequests.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="BoundingBox.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="GeometryShaderGen.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
+    <ClInclude Include="GeometryShaderManager.h">
+      <Filter>Shader Managers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
 </Project>
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
new file mode 100644
index 0000000000..1a989878f5
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -0,0 +1,302 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cmath>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Movie.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+
+VideoConfig g_Config;
+VideoConfig g_ActiveConfig;
+
+void UpdateActiveConfig()
+{
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
+		Movie::SetGraphicsConfig();
+	g_ActiveConfig = g_Config;
+}
+
+VideoConfig::VideoConfig()
+{
+	bRunning = false;
+
+	// Exclusive fullscreen flags
+	bFullscreen = false;
+	bExclusiveMode = false;
+
+	// Needed for the first frame, I think
+	fAspectRatioHackW = 1;
+	fAspectRatioHackH = 1;
+
+	// disable all features by default
+	backend_info.APIType = API_NONE;
+	backend_info.bSupportsExclusiveFullscreen = false;
+
+	// Game-specific stereoscopy settings
+	bStereoEFBMonoDepth = false;
+	iStereoDepthPercentage = 100;
+	iStereoConvergenceMinimum = 0;
+}
+
+void VideoConfig::Load(const std::string& ini_file)
+{
+	IniFile iniFile;
+	iniFile.Load(ini_file);
+
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Get("VSync", &bVSync, 0);
+	hardware->Get("Adapter", &iAdapter, 0);
+
+	IniFile::Section* settings = iniFile.GetOrCreateSection("Settings");
+	settings->Get("wideScreenHack", &bWidescreenHack, false);
+	settings->Get("AspectRatio", &iAspectRatio, (int)ASPECT_AUTO);
+	settings->Get("Crop", &bCrop, false);
+	settings->Get("UseXFB", &bUseXFB, 0);
+	settings->Get("UseRealXFB", &bUseRealXFB, 0);
+	settings->Get("SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples, 128);
+	settings->Get("ShowFPS", &bShowFPS, false);
+	settings->Get("LogRenderTimeToFile", &bLogRenderTimeToFile, false);
+	settings->Get("OverlayStats", &bOverlayStats, false);
+	settings->Get("OverlayProjStats", &bOverlayProjStats, false);
+	settings->Get("ShowEFBCopyRegions", &bShowEFBCopyRegions, false);
+	settings->Get("DumpTextures", &bDumpTextures, 0);
+	settings->Get("HiresTextures", &bHiresTextures, 0);
+	settings->Get("ConvertHiresTextures", &bConvertHiresTextures, 0);
+	settings->Get("CacheHiresTextures", &bCacheHiresTextures, 0);
+	settings->Get("DumpEFBTarget", &bDumpEFBTarget, 0);
+	settings->Get("FreeLook", &bFreeLook, 0);
+	settings->Get("UseFFV1", &bUseFFV1, 0);
+	settings->Get("EnablePixelLighting", &bEnablePixelLighting, 0);
+	settings->Get("FastDepthCalc", &bFastDepthCalc, true);
+	settings->Get("MSAA", &iMultisampleMode, 0);
+	settings->Get("EFBScale", &iEFBScale, (int)SCALE_1X); // native
+	settings->Get("DstAlphaPass", &bDstAlphaPass, false);
+	settings->Get("TexFmtOverlayEnable", &bTexFmtOverlayEnable, 0);
+	settings->Get("TexFmtOverlayCenter", &bTexFmtOverlayCenter, 0);
+	settings->Get("WireFrame", &bWireFrame, 0);
+	settings->Get("DisableFog", &bDisableFog, 0);
+	settings->Get("EnableShaderDebugging", &bEnableShaderDebugging, false);
+	settings->Get("BorderlessFullscreen", &bBorderlessFullscreen, false);
+
+	IniFile::Section* enhancements = iniFile.GetOrCreateSection("Enhancements");
+	enhancements->Get("ForceFiltering", &bForceFiltering, 0);
+	enhancements->Get("MaxAnisotropy", &iMaxAnisotropy, 0);  // NOTE - this is x in (1 << x)
+	enhancements->Get("PostProcessingShader", &sPostProcessingShader, "");
+	enhancements->Get("StereoMode", &iStereoMode, 0);
+	enhancements->Get("StereoDepth", &iStereoDepth, 20);
+	enhancements->Get("StereoConvergence", &iStereoConvergence, 20);
+	enhancements->Get("StereoSwapEyes", &bStereoSwapEyes, false);
+
+	IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks");
+	hacks->Get("EFBAccessEnable", &bEFBAccessEnable, true);
+	hacks->Get("BBoxEnable", &bBBoxEnable, false);
+	hacks->Get("EFBToTextureEnable", &bSkipEFBCopyToRam, true);
+	hacks->Get("EFBScaledCopy", &bCopyEFBScaled, true);
+	hacks->Get("EFBEmulateFormatChanges", &bEFBEmulateFormatChanges, false);
+
+	// Load common settings
+	iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	IniFile::Section* interface = iniFile.GetOrCreateSection("Interface");
+	bool bTmp;
+	interface->Get("UsePanicHandlers", &bTmp, true);
+	SetEnableAlert(bTmp);
+
+	// Shader Debugging causes a huge slowdown and it's easy to forget about it
+	// since it's not exposed in the settings dialog. It's only used by
+	// developers, so displaying an obnoxious message avoids some confusion and
+	// is not too annoying/confusing for users.
+	//
+	// XXX(delroth): This is kind of a bad place to put this, but the current
+	// VideoCommon is a mess and we don't have a central initialization
+	// function to do these kind of checks. Instead, the init code is
+	// triplicated for each video backend.
+	if (bEnableShaderDebugging)
+		OSD::AddMessage("Warning: Shader Debugging is enabled, performance will suffer heavily", 15000);
+
+	VerifyValidity();
+}
+
+void VideoConfig::GameIniLoad()
+{
+	bool gfx_override_exists = false;
+
+	// XXX: Again, bad place to put OSD messages at (see delroth's comment above)
+	// XXX: This will add an OSD message for each projection hack value... meh
+#define CHECK_SETTING(section, key, var) do { \
+		decltype(var) temp = var; \
+		if (iniFile.GetIfExists(section, key, &var) && var != temp) { \
+			std::string msg = StringFromFormat("Note: Option \"%s\" is overridden by game ini.", key); \
+			OSD::AddMessage(msg, 7500); \
+			gfx_override_exists = true; \
+		} \
+	} while (0)
+
+	IniFile iniFile = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
+
+	CHECK_SETTING("Video_Hardware", "VSync", bVSync);
+
+	CHECK_SETTING("Video_Settings", "wideScreenHack", bWidescreenHack);
+	CHECK_SETTING("Video_Settings", "AspectRatio", iAspectRatio);
+	CHECK_SETTING("Video_Settings", "Crop", bCrop);
+	CHECK_SETTING("Video_Settings", "UseXFB", bUseXFB);
+	CHECK_SETTING("Video_Settings", "UseRealXFB", bUseRealXFB);
+	CHECK_SETTING("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
+	CHECK_SETTING("Video_Settings", "HiresTextures", bHiresTextures);
+	CHECK_SETTING("Video_Settings", "ConvertHiresTextures", bConvertHiresTextures);
+	CHECK_SETTING("Video_Settings", "CacheHiresTextures", bCacheHiresTextures);
+	CHECK_SETTING("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
+	CHECK_SETTING("Video_Settings", "FastDepthCalc", bFastDepthCalc);
+	CHECK_SETTING("Video_Settings", "MSAA", iMultisampleMode);
+	int tmp = -9000;
+	CHECK_SETTING("Video_Settings", "EFBScale", tmp); // integral
+	if (tmp != -9000)
+	{
+		if (tmp != SCALE_FORCE_INTEGRAL)
+		{
+			iEFBScale = tmp;
+		}
+		else // Round down to multiple of native IR
+		{
+			switch (iEFBScale)
+			{
+			case SCALE_AUTO:
+				iEFBScale = SCALE_AUTO_INTEGRAL;
+				break;
+			case SCALE_1_5X:
+				iEFBScale = SCALE_1X;
+				break;
+			case SCALE_2_5X:
+				iEFBScale = SCALE_2X;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	CHECK_SETTING("Video_Settings", "DstAlphaPass", bDstAlphaPass);
+	CHECK_SETTING("Video_Settings", "DisableFog", bDisableFog);
+
+	CHECK_SETTING("Video_Enhancements", "ForceFiltering", bForceFiltering);
+	CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy);  // NOTE - this is x in (1 << x)
+	CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
+	CHECK_SETTING("Video_Enhancements", "StereoMode", iStereoMode);
+	CHECK_SETTING("Video_Enhancements", "StereoDepth", iStereoDepth);
+	CHECK_SETTING("Video_Enhancements", "StereoConvergence", iStereoConvergence);
+	CHECK_SETTING("Video_Enhancements", "StereoSwapEyes", bStereoSwapEyes);
+
+	CHECK_SETTING("Video_Stereoscopy", "StereoEFBMonoDepth", bStereoEFBMonoDepth);
+	CHECK_SETTING("Video_Stereoscopy", "StereoDepthPercentage", iStereoDepthPercentage);
+	CHECK_SETTING("Video_Stereoscopy", "StereoConvergenceMinimum", iStereoConvergenceMinimum);
+
+	CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable);
+	CHECK_SETTING("Video_Hacks", "BBoxEnable", bBBoxEnable);
+	CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bSkipEFBCopyToRam);
+	CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled);
+	CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
+
+	CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]);
+	CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]);
+	CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]);
+	CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]);
+	CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]);
+	CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable);
+
+	if (gfx_override_exists)
+		OSD::AddMessage("Warning: Opening the graphics configuration will reset settings and might cause issues!", 10000);
+}
+
+void VideoConfig::VerifyValidity()
+{
+	// TODO: Check iMaxAnisotropy value
+	if (iAdapter < 0 || iAdapter > ((int)backend_info.Adapters.size() - 1)) iAdapter = 0;
+	if (iMultisampleMode < 0 || iMultisampleMode >= (int)backend_info.AAModes.size()) iMultisampleMode = 0;
+
+	if (iStereoMode > 0)
+	{
+		if (!backend_info.bSupportsGeometryShaders)
+		{
+			OSD::AddMessage("Stereoscopic 3D isn't supported by your GPU, support for OpenGL 3.2 is required.", 10000);
+			iStereoMode = 0;
+		}
+
+		if (bUseXFB && bUseRealXFB)
+		{
+			OSD::AddMessage("Stereoscopic 3D isn't supported with Real XFB, turning off stereoscopy.", 10000);
+			iStereoMode = 0;
+		}
+	}
+}
+
+void VideoConfig::Save(const std::string& ini_file)
+{
+	IniFile iniFile;
+	iniFile.Load(ini_file);
+
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Set("VSync", bVSync);
+	hardware->Set("Adapter", iAdapter);
+
+	IniFile::Section* settings = iniFile.GetOrCreateSection("Settings");
+	settings->Set("AspectRatio", iAspectRatio);
+	settings->Set("Crop", bCrop);
+	settings->Set("wideScreenHack", bWidescreenHack);
+	settings->Set("UseXFB", bUseXFB);
+	settings->Set("UseRealXFB", bUseRealXFB);
+	settings->Set("SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
+	settings->Set("ShowFPS", bShowFPS);
+	settings->Set("LogRenderTimeToFile", bLogRenderTimeToFile);
+	settings->Set("OverlayStats", bOverlayStats);
+	settings->Set("OverlayProjStats", bOverlayProjStats);
+	settings->Set("DumpTextures", bDumpTextures);
+	settings->Set("HiresTextures", bHiresTextures);
+	settings->Set("ConvertHiresTextures", bConvertHiresTextures);
+	settings->Set("CacheHiresTextures", bCacheHiresTextures);
+	settings->Set("DumpEFBTarget", bDumpEFBTarget);
+	settings->Set("FreeLook", bFreeLook);
+	settings->Set("UseFFV1", bUseFFV1);
+	settings->Set("EnablePixelLighting", bEnablePixelLighting);
+	settings->Set("FastDepthCalc", bFastDepthCalc);
+	settings->Set("ShowEFBCopyRegions", bShowEFBCopyRegions);
+	settings->Set("MSAA", iMultisampleMode);
+	settings->Set("EFBScale", iEFBScale);
+	settings->Set("TexFmtOverlayEnable", bTexFmtOverlayEnable);
+	settings->Set("TexFmtOverlayCenter", bTexFmtOverlayCenter);
+	settings->Set("Wireframe", bWireFrame);
+	settings->Set("DstAlphaPass", bDstAlphaPass);
+	settings->Set("DisableFog", bDisableFog);
+	settings->Set("EnableShaderDebugging", bEnableShaderDebugging);
+	settings->Set("BorderlessFullscreen", bBorderlessFullscreen);
+
+	IniFile::Section* enhancements = iniFile.GetOrCreateSection("Enhancements");
+	enhancements->Set("ForceFiltering", bForceFiltering);
+	enhancements->Set("MaxAnisotropy", iMaxAnisotropy);
+	enhancements->Set("PostProcessingShader", sPostProcessingShader);
+	enhancements->Set("StereoMode", iStereoMode);
+	enhancements->Set("StereoDepth", iStereoDepth);
+	enhancements->Set("StereoConvergence", iStereoConvergence);
+	enhancements->Set("StereoSwapEyes", bStereoSwapEyes);
+
+	IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks");
+	hacks->Set("EFBAccessEnable", bEFBAccessEnable);
+	hacks->Set("BBoxEnable", bBBoxEnable);
+	hacks->Set("EFBToTextureEnable", bSkipEFBCopyToRam);
+	hacks->Set("EFBScaledCopy", bCopyEFBScaled);
+	hacks->Set("EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
+
+	iniFile.Save(ini_file);
+}
+
+bool VideoConfig::IsVSync()
+{
+	return bVSync && !Core::GetIsFramelimiterTempDisabled();
+}
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
new file mode 100644
index 0000000000..9635c90d19
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -0,0 +1,177 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+// IMPORTANT: UI etc should modify g_Config. Graphics code should read g_ActiveConfig.
+// The reason for this is to get rid of race conditions etc when the configuration
+// changes in the middle of a frame. This is done by copying g_Config to g_ActiveConfig
+// at the start of every frame. Noone should ever change members of g_ActiveConfig
+// directly.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "VideoCommon/VideoCommon.h"
+
+// Log in two categories, and save three other options in the same byte
+#define CONF_LOG          1
+#define CONF_PRIMLOG      2
+#define CONF_SAVETARGETS  8
+#define CONF_SAVESHADERS  16
+
+enum AspectMode
+{
+	ASPECT_AUTO       = 0,
+	ASPECT_FORCE_16_9 = 1,
+	ASPECT_FORCE_4_3  = 2,
+	ASPECT_STRETCH    = 3,
+};
+
+enum EFBScale
+{
+	SCALE_FORCE_INTEGRAL = -1,
+	SCALE_AUTO,
+	SCALE_AUTO_INTEGRAL,
+	SCALE_1X,
+	SCALE_1_5X,
+	SCALE_2X,
+	SCALE_2_5X,
+	SCALE_3X,
+	SCALE_4X,
+};
+
+enum StereoMode
+{
+	STEREO_OFF = 0,
+	STEREO_SBS,
+	STEREO_TAB,
+	STEREO_ANAGLYPH,
+	STEREO_3DVISION
+};
+
+// NEVER inherit from this class.
+struct VideoConfig final
+{
+	VideoConfig();
+	void Load(const std::string& ini_file);
+	void GameIniLoad();
+	void VerifyValidity();
+	void Save(const std::string& ini_file);
+	void UpdateProjectionHack();
+	bool IsVSync();
+
+	// General
+	bool bVSync;
+	bool bFullscreen;
+	bool bExclusiveMode;
+	bool bRunning;
+	bool bWidescreenHack;
+	int iAspectRatio;
+	bool bCrop;   // Aspect ratio controls.
+	bool bUseXFB;
+	bool bUseRealXFB;
+
+	// Enhancements
+	int iMultisampleMode;
+	int iEFBScale;
+	bool bForceFiltering;
+	int iMaxAnisotropy;
+	std::string sPostProcessingShader;
+	int iStereoMode;
+	int iStereoDepth;
+	int iStereoConvergence;
+	bool bStereoSwapEyes;
+
+	// Information
+	bool bShowFPS;
+	bool bOverlayStats;
+	bool bOverlayProjStats;
+	bool bTexFmtOverlayEnable;
+	bool bTexFmtOverlayCenter;
+	bool bShowEFBCopyRegions;
+	bool bLogRenderTimeToFile;
+
+	// Render
+	bool bWireFrame;
+	bool bDstAlphaPass;
+	bool bDisableFog;
+
+	// Utility
+	bool bDumpTextures;
+	bool bHiresTextures;
+	bool bConvertHiresTextures;
+	bool bCacheHiresTextures;
+	bool bDumpEFBTarget;
+	bool bUseFFV1;
+	bool bFreeLook;
+	bool bBorderlessFullscreen;
+
+	// Hacks
+	bool bEFBAccessEnable;
+	bool bPerfQueriesEnable;
+	bool bBBoxEnable;
+
+	bool bEFBEmulateFormatChanges;
+	bool bSkipEFBCopyToRam;
+	bool bCopyEFBScaled;
+	int iSafeTextureCache_ColorSamples;
+	int iPhackvalue[3];
+	std::string sPhackvalue[2];
+	float fAspectRatioHackW, fAspectRatioHackH;
+	bool bEnablePixelLighting;
+	bool bFastDepthCalc;
+	int iLog; // CONF_ bits
+	int iSaveTargetId; // TODO: Should be dropped
+
+	// Stereoscopy
+	bool bStereoEFBMonoDepth;
+	int iStereoDepthPercentage;
+	int iStereoConvergenceMinimum;
+
+	// D3D only config, mostly to be merged into the above
+	int iAdapter;
+
+	// Debugging
+	bool bEnableShaderDebugging;
+
+	// Static config per API
+	// TODO: Move this out of VideoConfig
+	struct
+	{
+		API_TYPE APIType;
+
+		std::vector<std::string> Adapters; // for D3D
+		std::vector<std::string> AAModes;
+		std::vector<std::string> PPShaders; // post-processing shaders
+		std::vector<std::string> AnaglyphShaders; // anaglyph shaders
+
+		bool bSupportsExclusiveFullscreen;
+		bool bSupportsDualSourceBlend;
+		bool bSupportsPrimitiveRestart;
+		bool bSupportsOversizedViewports;
+		bool bSupportsGeometryShaders;
+		bool bSupports3DVision;
+		bool bSupportsEarlyZ; // needed by PixelShaderGen, so must stay in VideoCommon
+		bool bSupportsBindingLayout; // Needed by ShaderGen, so must stay in VideoCommon
+		bool bSupportsBBox;
+		bool bSupportsGSInstancing; // Needed by GeometryShaderGen, so must stay in VideoCommon
+		bool bSupportsPostProcessing;
+		bool bSupportsPaletteConversion;
+		bool bSupportsClipControl; // Needed by VertexShaderGen, so must stay in VideoCommon
+	} backend_info;
+
+	// Utility
+	bool RealXFBEnabled() const { return bUseXFB && bUseRealXFB; }
+	bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; }
+	bool ExclusiveFullscreenEnabled() const { return backend_info.bSupportsExclusiveFullscreen && !bBorderlessFullscreen; }
+};
+
+extern VideoConfig g_Config;
+extern VideoConfig g_ActiveConfig;
+
+// Called every frame.
+void UpdateActiveConfig();
diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp
new file mode 100644
index 0000000000..27280ace23
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoState.cpp
@@ -0,0 +1,82 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/ChunkFile.h"
+#include "VideoCommon/BoundingBox.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/PixelEngine.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoState.h"
+#include "VideoCommon/XFMemory.h"
+
+static void DoState(PointerWrap &p)
+{
+	// BP Memory
+	p.Do(bpmem);
+	p.DoMarker("BP Memory");
+
+	// CP Memory
+	DoCPState(p);
+
+	// XF Memory
+	p.Do(xfmem);
+	p.DoMarker("XF Memory");
+
+	// Texture decoder
+	p.DoArray(texMem, TMEM_SIZE);
+	p.DoMarker("texMem");
+
+	// FIFO
+	Fifo_DoState(p);
+	p.DoMarker("Fifo");
+
+	CommandProcessor::DoState(p);
+	p.DoMarker("CommandProcessor");
+
+	PixelEngine::DoState(p);
+	p.DoMarker("PixelEngine");
+
+	// the old way of replaying current bpmem as writes to push side effects to pixel shader manager doesn't really work.
+	PixelShaderManager::DoState(p);
+	p.DoMarker("PixelShaderManager");
+
+	VertexShaderManager::DoState(p);
+	p.DoMarker("VertexShaderManager");
+
+	GeometryShaderManager::DoState(p);
+	p.DoMarker("GeometryShaderManager");
+
+	VertexManager::DoState(p);
+	p.DoMarker("VertexManager");
+
+	BoundingBox::DoState(p);
+	p.DoMarker("BoundingBox");
+
+
+	// TODO: search for more data that should be saved and add it here
+}
+
+void VideoCommon_DoState(PointerWrap &p)
+{
+	DoState(p);
+}
+
+void VideoCommon_RunLoop(bool enable)
+{
+	EmulatorState(enable);
+}
+
+void VideoCommon_Init()
+{
+	memset(&g_main_cp_state, 0, sizeof(g_main_cp_state));
+	memset(&g_preprocess_cp_state, 0, sizeof(g_preprocess_cp_state));
+	memset(texMem, 0, TMEM_SIZE);
+}
diff --git a/Source/Core/VideoCommon/VideoState.h b/Source/Core/VideoCommon/VideoState.h
new file mode 100644
index 0000000000..b77b3e529d
--- /dev/null
+++ b/Source/Core/VideoCommon/VideoState.h
@@ -0,0 +1,11 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+class PointerWrap;
+
+void VideoCommon_DoState(PointerWrap &p);
+void VideoCommon_RunLoop(bool enable);
+void VideoCommon_Init();
diff --git a/Source/Core/VideoCommon/XFMemory.cpp b/Source/Core/VideoCommon/XFMemory.cpp
new file mode 100644
index 0000000000..0e54fea373
--- /dev/null
+++ b/Source/Core/VideoCommon/XFMemory.cpp
@@ -0,0 +1,8 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoCommon/XFMemory.h"
+
+// STATE_TO_SAVE
+XFMemory xfmem;
diff --git a/Source/Core/VideoCommon/Src/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h
similarity index 84%
rename from Source/Core/VideoCommon/Src/XFMemory.h
rename to Source/Core/VideoCommon/XFMemory.h
index c350f67395..29a3aa9a65 100644
--- a/Source/Core/VideoCommon/Src/XFMemory.h
+++ b/Source/Core/VideoCommon/XFMemory.h
@@ -1,11 +1,12 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#ifndef _XFMEMORY_H
-#define _XFMEMORY_H
+#pragma once
 
-#include "Common.h"
+#include "Common/CommonTypes.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
 
 
 // Lighting
@@ -43,15 +44,14 @@
 #define LIGHTDIF_SIGN  1
 #define LIGHTDIF_CLAMP 2
 
-#define LIGHTATTN_SPEC 0 // specular attenuation
-#define LIGHTATTN_SPOT 1 // distance/spotlight attenuation
-#define LIGHTATTN_NONE 2
-#define LIGHTATTN_DIR  3
+#define LIGHTATTN_NONE 0 // no attenuation
+#define LIGHTATTN_SPEC 1 // point light attenuation
+#define LIGHTATTN_DIR  2 // directional light attenuation
+#define LIGHTATTN_SPOT 3 // spot light attenuation
 
 #define GX_PERSPECTIVE  0
 #define GX_ORTHOGRAPHIC 1
 
-#define XFMEM_SIZE               0x8000
 #define XFMEM_POSMATRICES        0x000
 #define XFMEM_POSMATRICES_END    0x100
 #define XFMEM_NORMALMATRICES     0x400
@@ -139,7 +139,7 @@ union INVTXSPEC
 
 union TexMtxInfo
 {
-	struct 
+	struct
 	{
 		u32 unknown    : 1;
 		u32 projection : 1; // XF_TEXPROJ_X
@@ -154,7 +154,7 @@ union TexMtxInfo
 
 union PostMtxInfo
 {
-	struct 
+	struct
 	{
 		u32 index     : 6; // base row of dual transform matrix
 		u32 unused    : 2;
@@ -194,14 +194,10 @@ union DualTexInfo
 
 struct Light
 {
-	u32 useless[3]; 
-	u32 color; // rgba
-	float a0;  // attenuation
-	float a1; 
-	float a2; 
-	float k0;  // k stuff
-	float k1; 
-	float k2; 
+	u32 useless[3];
+	u8 color[4];
+	float cosatt[3]; // cos attenuation
+	float distatt[3]; // dist attenuation
 
 	union
 	{
@@ -235,8 +231,15 @@ struct Projection
 	u32 type;                      // only GX_PERSPECTIVE or GX_ORTHOGRAPHIC are allowed
 };
 
-struct XFRegisters
+struct XFMemory
 {
+	u32 posMatrices[256];           // 0x0000 - 0x00ff
+	u32 unk0[768];                  // 0x0100 - 0x03ff
+	u32 normalMatrices[96];         // 0x0400 - 0x045f
+	u32 unk1[160];                  // 0x0460 - 0x04ff
+	u32 postMatrices[256];          // 0x0500 - 0x05ff
+	Light lights[8];                // 0x0600 - 0x067f
+	u32 unk2[2432];                 // 0x0680 - 0x0fff
 	u32 error;                      // 0x1000
 	u32 diag;                       // 0x1001
 	u32 state0;                     // 0x1002
@@ -257,8 +260,8 @@ struct XFRegisters
 	u32 unk5;                       // 0x1015
 	u32 unk6;                       // 0x1016
 	u32 unk7;                       // 0x1017
-	u32 MatrixIndexA;               // 0x1018
-	u32 MatrixIndexB;               // 0x1019
+	TMatrixIndexA MatrixIndexA;     // 0x1018
+	TMatrixIndexB MatrixIndexB;     // 0x1019
 	Viewport viewport;              // 0x101a - 0x101f
 	Projection projection;          // 0x1020 - 0x1026
 	u32 unk8[24];                   // 0x1027 - 0x103e
@@ -269,10 +272,8 @@ struct XFRegisters
 };
 
 
-extern XFRegisters xfregs;
-extern u32 xfmem[XFMEM_SIZE];
+extern XFMemory xfmem;
 
-void LoadXFReg(u32 transferSize, u32 address, u32 *pData);
+void LoadXFReg(u32 transferSize, u32 address, DataReader src);
 void LoadIndexedXF(u32 val, int array);
-
-#endif // _XFMEMORY_H
+void PreprocessIndexedXF(u32 val, int refarray);
diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp
new file mode 100644
index 0000000000..089a458683
--- /dev/null
+++ b/Source/Core/VideoCommon/XFStructs.cpp
@@ -0,0 +1,294 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/Common.h"
+#include "Core/HW/Memmap.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/Fifo.h"
+#include "VideoCommon/GeometryShaderManager.h"
+#include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/VertexManagerBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/XFMemory.h"
+
+static void XFMemWritten(u32 transferSize, u32 baseAddress)
+{
+	VertexManager::Flush();
+	VertexShaderManager::InvalidateXFRange(baseAddress, baseAddress + transferSize);
+}
+
+static void XFRegWritten(int transferSize, u32 baseAddress, DataReader src)
+{
+	u32 address = baseAddress;
+	u32 dataIndex = 0;
+
+	while (transferSize > 0 && address < 0x1058)
+	{
+		u32 newValue = src.Peek<u32>(dataIndex * sizeof(u32));
+		u32 nextAddress = address + 1;
+
+		switch (address)
+		{
+		case XFMEM_ERROR:
+		case XFMEM_DIAG:
+		case XFMEM_STATE0: // internal state 0
+		case XFMEM_STATE1: // internal state 1
+		case XFMEM_CLOCK:
+		case XFMEM_SETGPMETRIC:
+			nextAddress = 0x1007;
+			break;
+
+		case XFMEM_CLIPDISABLE:
+			//if (data & 1) {} // disable clipping detection
+			//if (data & 2) {} // disable trivial rejection
+			//if (data & 4) {} // disable cpoly clipping acceleration
+			break;
+
+		case XFMEM_VTXSPECS: //__GXXfVtxSpecs, wrote 0004
+			break;
+
+		case XFMEM_SETNUMCHAN:
+			if (xfmem.numChan.numColorChans != (newValue & 3))
+				VertexManager::Flush();
+			break;
+
+		case XFMEM_SETCHAN0_AMBCOLOR: // Channel Ambient Color
+		case XFMEM_SETCHAN1_AMBCOLOR:
+			{
+				u8 chan = address - XFMEM_SETCHAN0_AMBCOLOR;
+				if (xfmem.ambColor[chan] != newValue)
+				{
+					VertexManager::Flush();
+					VertexShaderManager::SetMaterialColorChanged(chan, newValue);
+				}
+				break;
+			}
+
+		case XFMEM_SETCHAN0_MATCOLOR: // Channel Material Color
+		case XFMEM_SETCHAN1_MATCOLOR:
+			{
+				u8 chan = address - XFMEM_SETCHAN0_MATCOLOR;
+				if (xfmem.matColor[chan] != newValue)
+				{
+					VertexManager::Flush();
+					VertexShaderManager::SetMaterialColorChanged(chan + 2, newValue);
+				}
+				break;
+			}
+
+		case XFMEM_SETCHAN0_COLOR: // Channel Color
+		case XFMEM_SETCHAN1_COLOR:
+		case XFMEM_SETCHAN0_ALPHA: // Channel Alpha
+		case XFMEM_SETCHAN1_ALPHA:
+			if (((u32*)&xfmem)[address] != (newValue & 0x7fff))
+				VertexManager::Flush();
+			break;
+
+		case XFMEM_DUALTEX:
+			if (xfmem.dualTexTrans.enabled != (newValue & 1))
+				VertexManager::Flush();
+			break;
+
+
+		case XFMEM_SETMATRIXINDA:
+			//_assert_msg_(GX_XF, 0, "XF matrixindex0");
+			VertexShaderManager::SetTexMatrixChangedA(newValue);
+			break;
+		case XFMEM_SETMATRIXINDB:
+			//_assert_msg_(GX_XF, 0, "XF matrixindex1");
+			VertexShaderManager::SetTexMatrixChangedB(newValue);
+			break;
+
+		case XFMEM_SETVIEWPORT:
+		case XFMEM_SETVIEWPORT+1:
+		case XFMEM_SETVIEWPORT+2:
+		case XFMEM_SETVIEWPORT+3:
+		case XFMEM_SETVIEWPORT+4:
+		case XFMEM_SETVIEWPORT+5:
+			VertexManager::Flush();
+			VertexShaderManager::SetViewportChanged();
+			PixelShaderManager::SetViewportChanged();
+			GeometryShaderManager::SetViewportChanged();
+
+			nextAddress = XFMEM_SETVIEWPORT + 6;
+			break;
+
+		case XFMEM_SETPROJECTION:
+		case XFMEM_SETPROJECTION+1:
+		case XFMEM_SETPROJECTION+2:
+		case XFMEM_SETPROJECTION+3:
+		case XFMEM_SETPROJECTION+4:
+		case XFMEM_SETPROJECTION+5:
+		case XFMEM_SETPROJECTION+6:
+			VertexManager::Flush();
+			VertexShaderManager::SetProjectionChanged();
+			GeometryShaderManager::SetProjectionChanged();
+
+			nextAddress = XFMEM_SETPROJECTION + 7;
+			break;
+
+		case XFMEM_SETNUMTEXGENS: // GXSetNumTexGens
+			if (xfmem.numTexGen.numTexGens != (newValue & 15))
+				VertexManager::Flush();
+			break;
+
+		case XFMEM_SETTEXMTXINFO:
+		case XFMEM_SETTEXMTXINFO+1:
+		case XFMEM_SETTEXMTXINFO+2:
+		case XFMEM_SETTEXMTXINFO+3:
+		case XFMEM_SETTEXMTXINFO+4:
+		case XFMEM_SETTEXMTXINFO+5:
+		case XFMEM_SETTEXMTXINFO+6:
+		case XFMEM_SETTEXMTXINFO+7:
+			VertexManager::Flush();
+
+			nextAddress = XFMEM_SETTEXMTXINFO + 8;
+			break;
+
+		case XFMEM_SETPOSMTXINFO:
+		case XFMEM_SETPOSMTXINFO+1:
+		case XFMEM_SETPOSMTXINFO+2:
+		case XFMEM_SETPOSMTXINFO+3:
+		case XFMEM_SETPOSMTXINFO+4:
+		case XFMEM_SETPOSMTXINFO+5:
+		case XFMEM_SETPOSMTXINFO+6:
+		case XFMEM_SETPOSMTXINFO+7:
+			VertexManager::Flush();
+
+			nextAddress = XFMEM_SETPOSMTXINFO + 8;
+			break;
+
+		// --------------
+		// Unknown Regs
+		// --------------
+
+		// Maybe these are for Normals?
+		case 0x1048: //xfmem.texcoords[0].nrmmtxinfo.hex = data; break; ??
+		case 0x1049:
+		case 0x104a:
+		case 0x104b:
+		case 0x104c:
+		case 0x104d:
+		case 0x104e:
+		case 0x104f:
+			DEBUG_LOG(VIDEO, "Possible Normal Mtx XF reg?: %x=%x", address, newValue);
+			break;
+
+		case 0x1013:
+		case 0x1014:
+		case 0x1015:
+		case 0x1016:
+		case 0x1017:
+
+		default:
+			WARN_LOG(VIDEO, "Unknown XF Reg: %x=%x", address, newValue);
+			break;
+		}
+
+		int transferred = nextAddress - address;
+		address = nextAddress;
+
+		transferSize -= transferred;
+		dataIndex += transferred;
+	}
+}
+
+void LoadXFReg(u32 transferSize, u32 baseAddress, DataReader src)
+{
+	// do not allow writes past registers
+	if (baseAddress + transferSize > 0x1058)
+	{
+		INFO_LOG(VIDEO, "XF load exceeds address space: %x %d bytes", baseAddress, transferSize);
+
+		if (baseAddress >= 0x1058)
+			transferSize = 0;
+		else
+			transferSize = 0x1058 - baseAddress;
+	}
+
+	// write to XF mem
+	if (baseAddress < 0x1000 && transferSize > 0)
+	{
+		u32 end = baseAddress + transferSize;
+
+		u32 xfMemBase = baseAddress;
+		u32 xfMemTransferSize = transferSize;
+
+		if (end >= 0x1000)
+		{
+			xfMemTransferSize = 0x1000 - baseAddress;
+
+			baseAddress = 0x1000;
+			transferSize = end - 0x1000;
+		}
+		else
+		{
+			transferSize = 0;
+		}
+
+		XFMemWritten(xfMemTransferSize, xfMemBase);
+		for (u32 i = 0; i < xfMemTransferSize; i++)
+		{
+			((u32*)&xfmem)[xfMemBase + i] = src.Read<u32>();
+		}
+	}
+
+	// write to XF regs
+	if (transferSize > 0)
+	{
+		XFRegWritten(transferSize, baseAddress, src);
+		for (u32 i = 0; i < transferSize; i++)
+		{
+			((u32*)&xfmem)[baseAddress + i] = src.Read<u32>();
+		}
+	}
+}
+
+// TODO - verify that it is correct. Seems to work, though.
+void LoadIndexedXF(u32 val, int refarray)
+{
+	int index = val >> 16;
+	int address = val & 0xFFF; // check mask
+	int size = ((val >> 12) & 0xF) + 1;
+	//load stuff from array to address in xf mem
+
+	u32* currData = (u32*)(&xfmem) + address;
+	u32* newData;
+	if (g_use_deterministic_gpu_thread)
+	{
+		newData = (u32*)PopFifoAuxBuffer(size * sizeof(u32));
+	}
+	else
+	{
+		newData = (u32*)Memory::GetPointer(g_main_cp_state.array_bases[refarray] + g_main_cp_state.array_strides[refarray] * index);
+	}
+	bool changed = false;
+	for (int i = 0; i < size; ++i)
+	{
+		if (currData[i] != Common::swap32(newData[i]))
+		{
+			changed = true;
+			XFMemWritten(size, address);
+			break;
+		}
+	}
+	if (changed)
+	{
+		for (int i = 0; i < size; ++i)
+			currData[i] = Common::swap32(newData[i]);
+	}
+}
+
+void PreprocessIndexedXF(u32 val, int refarray)
+{
+	int index = val >> 16;
+	int size = ((val >> 12) & 0xF) + 1;
+
+	u32* new_data = (u32*)Memory::GetPointer(g_preprocess_cp_state.array_bases[refarray] + g_preprocess_cp_state.array_strides[refarray] * index);
+
+	size_t buf_size = size * sizeof(u32);
+	PushFifoAuxBuffer(new_data, buf_size);
+}
diff --git a/Source/Core/VideoCommon/XFStructs.h b/Source/Core/VideoCommon/XFStructs.h
new file mode 100644
index 0000000000..d6f8d48d46
--- /dev/null
+++ b/Source/Core/VideoCommon/XFStructs.h
@@ -0,0 +1,7 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "VideoCommon/XFMemory.h"
diff --git a/Source/Core/VideoCommon/sfont.inc b/Source/Core/VideoCommon/sfont.inc
new file mode 100644
index 0000000000..7e93208e6b
--- /dev/null
+++ b/Source/Core/VideoCommon/sfont.inc
@@ -0,0 +1,718 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+static const unsigned char sfont_map[] = {
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,10,10,10,10,
+	10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,
+	26,27,28,29,30,31,32,33,34,35,36,10,10,10,10,10,
+	10,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,
+	52,53,54,55,56,57,58,59,60,61,62,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+};
+
+static const unsigned char sfont_raw[][9*10] = {
+	{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},{
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78,
+	},
+};
diff --git a/Source/DSPSpy/Config.h b/Source/DSPSpy/Config.h
index 34d115e323..a490afc949 100644
--- a/Source/DSPSpy/Config.h
+++ b/Source/DSPSpy/Config.h
@@ -1,18 +1,5 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 // Dummy file for common to compile
diff --git a/Source/DSPSpy/ConsoleHelper.h b/Source/DSPSpy/ConsoleHelper.h
index 6c64035c7a..129adb401c 100644
--- a/Source/DSPSpy/ConsoleHelper.h
+++ b/Source/DSPSpy/ConsoleHelper.h
@@ -1,27 +1,13 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _CONSOLEHELPER_H_
-#define _CONSOLEHELPER_H_
+#pragma once
 
+#include <iostream>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
-#include <iostream>
 
 #define CON_BLACK 		0
 #define CON_RED			1
@@ -86,5 +72,3 @@ inline void CON_BlankRow(const int y)
 	CON_BlankRow(y); \
 	CON_Printf(x, y, __VA_ARGS__); \
 }
-
-#endif
diff --git a/Source/DSPSpy/DSPSpy.vcxproj b/Source/DSPSpy/DSPSpy.vcxproj
index ace19b38aa..cae9d356f0 100644
--- a/Source/DSPSpy/DSPSpy.vcxproj
+++ b/Source/DSPSpy/DSPSpy.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="GC|Win32">
diff --git a/Source/DSPSpy/DSPSpy.vcxproj.filters b/Source/DSPSpy/DSPSpy.vcxproj.filters
index 4686436e75..874f584ddd 100644
--- a/Source/DSPSpy/DSPSpy.vcxproj.filters
+++ b/Source/DSPSpy/DSPSpy.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="tests">
diff --git a/Source/DSPSpy/Makefile b/Source/DSPSpy/Makefile
index b17b77f97f..cbf9f85dfa 100644
--- a/Source/DSPSpy/Makefile
+++ b/Source/DSPSpy/Makefile
@@ -26,14 +26,14 @@ BUILD		:=	build
 SOURCES		:=	. emu
 RESOURCES	:=	../resources
 DATA		:=	data
-INCLUDES	:=	include ../Core/Common/Src .
+INCLUDES	:=	include ../Core/Common .
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
 
 CFLAGS	= -save-temps -O2 -Wall --no-strict-aliasing $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
+CXXFLAGS	=	-std=c++0x $(CFLAGS)
 
 LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 
diff --git a/Source/DSPSpy/Stubs.cpp b/Source/DSPSpy/Stubs.cpp
index 016af4546f..83f1bc1444 100644
--- a/Source/DSPSpy/Stubs.cpp
+++ b/Source/DSPSpy/Stubs.cpp
@@ -1,25 +1,12 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2003 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 // Stubs to make DSPCore compile as part of DSPSpy.
 
 /*
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <string>
 
@@ -119,4 +106,4 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
 
 }
 
-*/
\ No newline at end of file
+*/
diff --git a/Source/DSPSpy/build.sh b/Source/DSPSpy/build.sh
index fa6165d6c8..a6fbaf9015 100644
--- a/Source/DSPSpy/build.sh
+++ b/Source/DSPSpy/build.sh
@@ -1,6 +1,6 @@
 ../../Binary/x64/DSPTool.exe -h dsp_code tests/mul_test.ds
 mkdir emu
-cp ../Core/Core/Src/DSP/Src/*.cpp emu
-cp ../Core/Core/Src/DSP/Src/*.h emu
+cp ../Core/Core/DSP/*.cpp emu
+cp ../Core/Core/DSP/*.h emu
 make
 
diff --git a/Source/DSPSpy/dsp_interface.cpp b/Source/DSPSpy/dsp_interface.cpp
index 5a935f12ef..f960b6d6f0 100644
--- a/Source/DSPSpy/dsp_interface.cpp
+++ b/Source/DSPSpy/dsp_interface.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 #include "dsp_interface.h"
 
@@ -23,7 +10,7 @@ void IDSP::SendTask(void *addr, u16 iram_addr, u16 len, u16 start)
 	// iram_addr	dsp addr				4byte aligned (2 DSP words)
 	// len			block length in bytes	multiple of 4 (wtf? if you want to fill whole iram, you need 8191)
 	//											(8191 % 4 = 3) wtffff
-	// start		dsp iram entry point	
+	// start		dsp iram entry point
 	while (CheckMailTo());
 	SendMailTo(0x80F3A001);
 	while (CheckMailTo());
diff --git a/Source/DSPSpy/dsp_interface.h b/Source/DSPSpy/dsp_interface.h
index 03ce9c4f60..94d3e4404d 100644
--- a/Source/DSPSpy/dsp_interface.h
+++ b/Source/DSPSpy/dsp_interface.h
@@ -1,28 +1,14 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _DSP_INTERFACE_H
-#define _DSP_INTERFACE_H
+#pragma once
 
 #include <gccore.h>
 
 // DSPCR bits
 #define DSPCR_DSPRESET      0x0800        // Reset DSP
-#define DSPCR_ARDMA         0x0200        // ARAM dma in progress, if set
+#define DSPCR_ARDMA         0x0200        // ARAM DMA in progress, if set
 #define DSPCR_DSPINTMSK     0x0100        // * interrupt mask   (RW)
 #define DSPCR_DSPINT        0x0080        // * interrupt active (RWC)
 #define DSPCR_ARINTMSK      0x0040
@@ -36,7 +22,7 @@
 class IDSP {
 public:
 	virtual ~IDSP() {}
-	
+
 	virtual void Init() = 0;
 	virtual void Reset() = 0;
 	virtual u32 CheckMailTo() = 0;
@@ -46,5 +32,3 @@ public:
 	// the implementation does nothing but calling the virtual methods above.
 	void SendTask(void *addr, u16 iram_addr, u16 len, u16 start);
 };
-
-#endif  // _DSP_INTERFACE_H
diff --git a/Source/DSPSpy/dspregs.h b/Source/DSPSpy/dspregs.h
index e9a96c1a6f..bcaf099c52 100644
--- a/Source/DSPSpy/dspregs.h
+++ b/Source/DSPSpy/dspregs.h
@@ -1,22 +1,8 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _DSPREGS_H
-#define _DSPREGS_H
+#pragma once
 
 #define DSP_REG_AR0		0x00 // address registers
 #define DSP_REG_AR1		0x01
@@ -60,5 +46,3 @@
 #define DSP_REG_ACM1	0x1f
 #define DSP_REG_ACH0	0x10 // Sign extended 8 bit register 0
 #define DSP_REG_ACH1	0x11 // Sign extended 8 bit register 1
-
-#endif
\ No newline at end of file
diff --git a/Source/DSPSpy/gba.txt b/Source/DSPSpy/gba.txt
index ebf62fe2f5..d4f1a9c333 100644
--- a/Source/DSPSpy/gba.txt
+++ b/Source/DSPSpy/gba.txt
@@ -35,12 +35,12 @@ clr15
 ;step 1: context setup
 call		send_back_40
 
-call        0x807e			; loop until dsp->cpu mailbox is empty
+call        0x807e			; loop until DSP->CPU mailbox is empty
 si          @DMBH, #0xdcd1
 si          @DMBL, #0x0000	; sendmail 0xdcd10000
 si          @DIRQ, #0x0001
 
-; wait for cpu mail == 0xabbaxxxx
+; wait for CPU mail == 0xabbaxxxx
 wait_cpu_init:
 call        0x8078
 lrs         $AC0.L, @CMBL
@@ -53,28 +53,28 @@ call        0x8078
 lrs         $AX0.L, @CMBL
 andi        $AC0.M, #0x0fff
 mrr         $AX0.H, $AC0.M
-lri         $AX1.H, #0x0000	; DSP-dram addr
+lri         $AX1.H, #0x0000	; DSP-DRAM addr
 lri         $AX1.L, #0x0020	; length (32 bytes = 16 words, word 9 and 10 are addr where result should DMA'd to in main mem)
 lri         $IX3, #0x0000	; there will be no ucode/iram upload
-lri         $AR0, #do_main	; return addr after dram upload
+lri         $AR0, #do_main	; return addr after DRAM upload
 jmp         0x80bc			; DRAM upload !!
 ; $AX0.H-$AX0.L - CPU(PPC) addr = mail & 0x0fffffff
-; upload data from mainmem to dsp dram and jump to 0x41 after that
+; upload data from mainmem to DSP DRAM and jump to 0x41 after that
 
 ; ucode addr 0x0041
 do_main:
-;step 2: got data from cpu, before going into BigCrazyFunction
+;step 2: got data from CPU, before going into BigCrazyFunction
 call		send_back
 
 call        BigCrazyFunction		; <<------------- main crap is here!!!!!!!!!
-call        0x807e					; loop until dsp->cpu mailbox is empty
+call        0x807e					; loop until DSP->CPU mailbox is empty
 
 si          @DMBH, #0xdcd1
 si          @DMBL, #0x0003			; sendmail 0xdcd10003 (aka... calc is over, result is in main mem now)
 si          @DIRQ, #0x0001
 set40       
 
-; wait for cpu to tell us what to do after calc'ing
+; wait for CPU to tell us what to do after calc'ing
 wait_cpu_end:
 call        0x8078
 cmpi        $AC0.M, #0xcdd1
@@ -82,16 +82,16 @@ jnz         wait_cpu_end
 
 lrs         $AC0.M, @CMBL
 cmpi        $AC0.M, #0x0001
-jz          PrepareBootUcode		; if cpu->dsp mail was 0xcdd10001 -> 005e_PrepareBootUcode()
+jz          PrepareBootUcode		; if CPU->DSP mail was 0xcdd10001 -> 005e_PrepareBootUcode()
 
 cmpi        $AC0.M, #0x0002
-jz          0x8000					; if cpu->dsp mail was 0xcdd10002 -> dsp reset ( jmp to irom(0x8000))
+jz          0x8000					; if CPU->DSP mail was 0xcdd10002 -> DSP reset ( jmp to irom(0x8000))
 
 ; THIS IS CUSTOM CODE
 cmpi        $AC0.M, #0xbabe
-jz          end_of_test				; wait for dsp to be reset by cpu
+jz          end_of_test				; wait for DSP to be reset by CPU
 
-jmp         wait_cpu_end			; wait for next mail from cpu
+jmp         wait_cpu_end			; wait for next mail from CPU
 halt        
 
 
@@ -127,7 +127,7 @@ jmp         0x80b5		; BootUcode()
 halt     
 
 
-; does some crazy stuff with data at dram @0x3/0x5/0x6/0x7 with help of some values from drom :)
+; does some crazy stuff with data at DRAM @0x3/0x5/0x6/0x7 with help of some values from drom :)
 ; result is @0x22,@0x23 and written back to main memory to dmem-0x08:dmem-0x09
 BigCrazyFunction:
 ; {
@@ -574,21 +574,21 @@ call		send_back
 
 Unk_01a5:
 ; this is where result is written to main memory
-; dsp mem 0x20-0x23 (8 bytes) are written back (DMA limitation),
+; DSP mem 0x20-0x23 (8 bytes) are written back (DMA limitation),
 ; but only values @22 and @23 were modified (result is 32bit)
 sr          @0x0023, $AC0.M
 call		send_back
-lr          $AX0.H, @0x0008	; cpu addr high
+lr          $AX0.H, @0x0008	; CPU addr high
 call		send_back
-lr          $AX0.L, @0x0009	; cpu addr low
+lr          $AX0.L, @0x0009	; CPU addr low
 call		send_back
-lri         $AX1.H, #0x0020	; dsp addr
+lri         $AX1.H, #0x0020	; DSP addr
 call		send_back
 lri         $AX1.L, #0x0008	; length
 call		send_back
-lri         $IX3, #0x0000	; there will be no iram dma
+lri         $IX3, #0x0000	; there will be no iram DMA
 call		send_back
-call        0x808b			; dram->cpu <<<--- important!!
+call        0x808b			; DRAM->CPU <<<--- important!!
 call		send_back
 ret         
 ; }
diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp
index aba2007852..108ab93212 100644
--- a/Source/DSPSpy/main_spy.cpp
+++ b/Source/DSPSpy/main_spy.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 // This is a test program for running code on the Wii DSP, with full control over input
 // and automatic compare with output. VERY useful for figuring out what those little
@@ -21,18 +8,18 @@
 // It's very unpolished though
 // Use Dolphin's dsptool to generate a new dsp_code.h.
 // Originally written by duddie and modified by FIRES. Then further modified by ector.
- 
+
+#include <debug.h>
+#include <fat.h>
+#include <fcntl.h>
 #include <gccore.h>
 #include <malloc.h>
+#include <network.h>
+#include <ogcsys.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <network.h>
-#include <ogcsys.h>
 #include <time.h>
-#include <fat.h>
-#include <fcntl.h>
-#include <debug.h>
 
 #include <unistd.h>
 #include <ogc/color.h>
@@ -64,7 +51,7 @@
 // Used for communications with the DSP, such as dumping registers etc.
 u16 dspbuffer[16 * 1024] __attribute__ ((aligned (0x4000)));
 
-static void *xfb = NULL;
+static void *xfb = nullptr;
 void (*reboot)() = (void(*)())0x80001800;
 GXRModeObj *rmode;
 
@@ -75,7 +62,7 @@ u16 *dspbufC;
 u32 *dspbufU;
 
 u16 dspreg_in[32] = {
-	0x0410, 0x0510, 0x0610, 0x0710, 0x0810, 0x0910, 0x0a10, 0x0b10, 
+	0x0410, 0x0510, 0x0610, 0x0710, 0x0810, 0x0910, 0x0a10, 0x0b10,
 	0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0855, 0x0966, 0x0a77, 0x0b88,
 	0x0014, 0xfff5, 0x00ff, 0x2200, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0003, 0x0004, 0x8000, 0x000C, 0x0007, 0x0008, 0x0009, 0x000a,
@@ -84,22 +71,22 @@ u16 dspreg_in[32] = {
 /* ttt ?
 
 u16 dspreg_in[32] = {
-0x0e4c, 0x03c0, 0x0bd9, 0x06a3, 0x0c06, 0x0240, 0x0010, 0x0ecc, 
+0x0e4c, 0x03c0, 0x0bd9, 0x06a3, 0x0c06, 0x0240, 0x0010, 0x0ecc,
 0x0000, 0x0000, 0x0000, 0x0000, 0x0322, 0x0000, 0x0000, 0x0000,
 0x0000, 0x0000, 0x00ff, 0x1b41, 0x0000, 0x0040, 0x00ff, 0x0000,
 0x1000, 0x96cc, 0x0000, 0x0000, 0x3fc0, 0x96cc, 0x0000, 0x0000,
 }; */
 
-// if i set bit 0x4000 of SR my tests crashes :(               
+// if i set bit 0x4000 of SR my tests crashes :(
 
 /*
 // zelda 0x00da
 u16 dspreg_in[32] = {
-0x0a50, 0x0ca2, 0x04f8, 0x0ab0, 0x8039, 0x0000, 0x0000, 0x0000, 
+0x0a50, 0x0ca2, 0x04f8, 0x0ab0, 0x8039, 0x0000, 0x0000, 0x0000,
 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x03d1, 0x0000, 0x0418, 0x0002,     // r08 must have a value ... no idea why (ector: it's the looped addressing regs)
 0x0000, 0x0000, 0x00ff, 0x1804, 0xdb70, 0x4ddb, 0x0000, 0x0000,
 0x0000, 0x0000, 0x0000, 0xde6d, 0x0000, 0x0000, 0x0000, 0x004e,
-};*/ 
+};*/
 
 u16 dspreg_out[1000][32];
 
@@ -237,19 +224,23 @@ void DumpDSP_ROMs(const u16* rom, const u16* coef)
 	FILE *fROM = fopen(filename, "wb");
 	sprintf(filename, "sd:/dsp_coef.bin");
 	FILE *fCOEF = fopen(filename, "wb");
+
 	if (fROM && fCOEF)
 	{
 		fwrite(MEM_PHYSICAL_TO_K0(rom), 0x2000, 1, fROM);
-		fclose(fROM);
+		fwrite(MEM_PHYSICAL_TO_K0(coef), 0x1000, 1, fCOEF);
 
- 		fwrite(MEM_PHYSICAL_TO_K0(coef), 0x1000, 1, fCOEF);
- 		fclose(fCOEF);
 		UpdateLastMessage("DSP ROMs dumped to SD");
 	}
 	else
 	{
 		UpdateLastMessage("SD Write Error");
 	}
+
+	if (fROM)
+		fclose(fROM);
+	if (fCOEF)
+		fclose(fCOEF);
 #else
 	// Allow to connect to gdb (dump ram... :s)
 	_break();
@@ -362,7 +353,7 @@ void handle_dsp_mail(void)
 		}
 		else if (mail == 0x8888dead)
 		{
-			// Send memory dump (dsp dram from someone's cube?)
+			// Send memory dump (DSP DRAM from someone's GameCube?)
 			// not really sure why this is important - I guess just to try to keep tests predictable
 			u16* tmpBuf = (u16 *)MEM_VIRTUAL_TO_PHYSICAL(mem_dump);
 
@@ -372,7 +363,7 @@ void handle_dsp_mail(void)
 		}
 		else if (mail == 0x8888beef)
 		{
-			// Provide register base to dsp (if using dsp_base.inc, it will dma them to the correct place)
+			// Provide register base to DSP (if using dsp_base.inc, it will DMA them to the correct place)
 			while (real_dsp.CheckMailTo());
 			real_dsp.SendMailTo((u32)dspbufP);
 			while (real_dsp.CheckMailTo());
@@ -394,14 +385,14 @@ void handle_dsp_mail(void)
 		// ROM dumping mails
 		else if (mail == 0x8888c0de)
 		{
-			// DSP has copied irom to its dram...send address so it can dma it back
+			// DSP has copied irom to its DRAM...send address so it can dma it back
 			while (real_dsp.CheckMailTo());
 			real_dsp.SendMailTo((u32)dspbufP);
 			while (real_dsp.CheckMailTo());
 		}
 		else if (mail == 0x8888da7a)
 		{
-			// DSP has copied coef to its dram...send address so it can dma it back
+			// DSP has copied coef to its DRAM...send address so it can DMA it back
 			while (real_dsp.CheckMailTo());
 			real_dsp.SendMailTo((u32)&dspbufP[0x1000]);
 			while (real_dsp.CheckMailTo());
@@ -424,7 +415,7 @@ void handle_dsp_mail(void)
 		}
 		else if (mail == 0xdcd10003) // DSP_DONE
 		{
-			real_dsp.SendMailTo(0xcdd1babe); // custom mail to tell dsp to halt (calls end_of_test)
+			real_dsp.SendMailTo(0xcdd1babe); // custom mail to tell DSP to halt (calls end_of_test)
 			while (real_dsp.CheckMailTo());
 
 			DCInvalidateRange(SecParams_out, sizeof(SecParams_out));
@@ -470,16 +461,16 @@ void dump_all_ucodes(bool fastmode)
 		sprintf(filename, "sd:/dsp_dump_all.bin");
 		FILE *f2 = fopen(filename, "ab");
 
-		if (fastmode == false) 
+		if (fastmode == false)
 		{
 			// Then write microcode dump to file
 			sprintf(filename, "sd:/dsp_dump%d.bin", UCodeToDump);
 			FILE *f = fopen(filename, "wb");
-			if (f)  
+			if (f)
 			{
 				// First write initial regs
 				written = fwrite(dspreg_in, 1, 32 * 2, f);
-				
+
 				// Then write all the dumps.
 				written += fwrite(dspreg_out, 1, dsp_steps * 32 * 2, f);
 				fclose(f);
@@ -534,8 +525,8 @@ void InitGeneral()
 #endif
 
 	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
+	// This will correspond to the settings in the Wii Menu
+	rmode = VIDEO_GetPreferredMode(nullptr);
 
 	// Allocate memory for the display in the uncached region
 	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
@@ -695,7 +686,7 @@ int main()
 #endif
 		{
 			curUcode++;
-			if(curUcode == NUM_UCODES)
+			if (curUcode == NUM_UCODES)
 				curUcode = 0;
 
 			// Reset step counters since we're in a new ucode.
diff --git a/Source/DSPSpy/mem_dump.h b/Source/DSPSpy/mem_dump.h
index b3768f28ca..418064627e 100644
--- a/Source/DSPSpy/mem_dump.h
+++ b/Source/DSPSpy/mem_dump.h
@@ -1,532 +1,521 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+#pragma once
 
 unsigned int mem_dump[] __attribute__ ((aligned (64)))  =
 {
-	0x0c3966ad, 0x0d46ffdf, 0x0b396696, 0x0e5fffd8, 
-	0x0a446669, 0x0f83ffd0, 0x095a6626, 0x10b4ffc8, 
-	0x087d65cd, 0x11f0ffbf, 0x07ab655e, 0x1338ffb6, 
-	0x06e464d9, 0x148cffac, 0x0628643f, 0x15ebffa1, 
-	0x0577638f, 0x1756ff96, 0x04d162cb, 0x18cbff8a, 
-	0x043561f3, 0x1a4cff7e, 0x03a46106, 0x1bd7ff71, 
-	0x031c6007, 0x1d6cff64, 0x029f5ef5, 0x1f0bff56, 
-	0x022a5dd0, 0x20b3ff48, 0x01be5c9a, 0x2264ff3a, 
-	0x015b5b53, 0x241eff2c, 0x010159fc, 0x25e0ff1e, 
-	0x00ae5896, 0x27a9ff10, 0x00635720, 0x297aff02, 
-	0x001f559d, 0x2b50fef4, 0xffe2540d, 0x2d2cfee8, 
-	0xffac5270, 0x2f0dfedb, 0xff7c50c7, 0x30f3fed0, 
-	0xff534f14, 0x32dcfec6, 0xff2e4d57, 0x34c8febd, 
-	0xff0f4b91, 0x36b6feb6, 0xfef549c2, 0x38a5feb0, 
-	0xfedf47ed, 0x3a95feac, 0xfece4611, 0x3c85feab, 
-	0xfec04430, 0x3e74feac, 0xfeb6424a, 0x4060feaf, 
-	0xfeaf4060, 0x424afeb6, 0xfeac3e74, 0x4430fec0, 
-	0xfeab3c85, 0x4611fece, 0xfeac3a95, 0x47edfedf, 
-	0xfeb038a5, 0x49c2fef5, 0xfeb636b6, 0x4b91ff0f, 
-	0xfebd34c8, 0x4d57ff2e, 0xfec632dc, 0x4f14ff53, 
-	0xfed030f3, 0x50c7ff7c, 0xfedb2f0d, 0x5270ffac, 
-	0xfee82d2c, 0x540dffe2, 0xfef42b50, 0x559d001f, 
-	0xff02297a, 0x57200063, 0xff1027a9, 0x589600ae, 
-	0xff1e25e0, 0x59fc0101, 0xff2c241e, 0x5b53015b, 
-	0xff3a2264, 0x5c9a01be, 0xff4820b3, 0x5dd0022a, 
-	0xff561f0b, 0x5ef5029f, 0xff641d6c, 0x6007031c, 
-	0xff711bd7, 0x610603a4, 0xff7e1a4c, 0x61f30435, 
-	0xff8a18cb, 0x62cb04d1, 0xff961756, 0x638f0577, 
-	0xffa115eb, 0x643f0628, 0xffac148c, 0x64d906e4, 
-	0xffb61338, 0x655e07ab, 0xffbf11f0, 0x65cd087d, 
-	0xffc810b4, 0x6626095a, 0xffd00f83, 0x66690a44, 
-	0xffd80e5f, 0x66960b39, 0xffdf0d46, 0x66ad0c39, 
-	0x00000c8b, 0x18f82527, 0x30fb3c56, 0x471c5133, 
-	0x5a8262f1, 0x6a6d70e2, 0x76417a7c, 0x7d897f61, 
-	0x7fff7f61, 0x7d897a7c, 0x764170e2, 0x6a6d62f1, 
-	0x5a825133, 0x471c3c56, 0x30fb2527, 0x18f80c8b, 
-	0x0000f375, 0xe708dad9, 0xcf05c3aa, 0xb8e4aecd, 
-	0xa57e9d0f, 0x95938f1e, 0x89bf8584, 0x8277809f, 
-	0x8001809f, 0x82778584, 0x89bf8f1e, 0x95939d0f, 
-	0xa57eaecd, 0xb8e4c3aa, 0xcf05dad9, 0xe708f375, 
-	0x000007ff, 0x0fff17ff, 0x1fff27ff, 0x2fff37ff, 
-	0x3fff47ff, 0x4fff57ff, 0x5fff67ff, 0x6fff77ff, 
-	0x7fff7800, 0x70006800, 0x60005800, 0x50004800, 
-	0x40003800, 0x30002800, 0x20001800, 0x10000800, 
-	0x0000f801, 0xf001e801, 0xe001d801, 0xd001c801, 
-	0xc001b801, 0xb001a801, 0xa0019801, 0x90018801, 
-	0x80018800, 0x90009800, 0xa000a800, 0xb000b800, 
-	0xc000c800, 0xd000d800, 0xe000e800, 0xf000f800, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x682e469b, 0x25080375, 0xe1e2c04f, 0x9ebc7d29, 
-	0x5b963a03, 0x1870f6dd, 0xd54ab3b7, 0x92247091, 
-	0x4efe2d6b, 0x0bd8ea45, 0xc8b2a71f, 0x858c63f9, 
-	0x426620d3, 0xff40ddad, 0xbc1a9a87, 0x78f45761, 
-	0x35ce143b, 0xf2a8d115, 0xaf828def, 0x6c5c4ac9, 
-	0x293607a3, 0xe610c47d, 0xa2ea8157, 0x5fc43e31, 
-	0x1c9efb0b, 0xd978b7e5, 0x965274bf, 0x532c3199, 
-	0x1006ee73, 0xcce0ab4d, 0x89ba6827, 0x46942501, 
-	0x00000001, 0x00020003, 0x00040005, 0x00060007, 
-	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f, 
-	0x00000001, 0x00020003, 0x00040005, 0x00060007, 
-	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f, 
-	0x00000001, 0x00020003, 0x00040005, 0x00060007, 
-	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f, 
-	0x00000001, 0x00020003, 0x00040005, 0x00060007, 
-	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f, 
-	0x5a825b9c, 0x5cb35dc7, 0x5ed75fe3, 0x60eb61f0, 
-	0x62f163ee, 0x64e865dd, 0x66cf67bc, 0x68a6698b, 
-	0x6a6d6b4a, 0x6c236cf8, 0x6dc96e96, 0x6f5e7022, 
-	0x70e2719d, 0x72547307, 0x73b5745f, 0x750475a5, 
-	0x764176d8, 0x776b77fa, 0x78847909, 0x79897a05, 
-	0x7a7c7aee, 0x7b5c7bc5, 0x7c297c88, 0x7ce37d39, 
-	0x7d897dd5, 0x7e1d7e5f, 0x7e9c7ed5, 0x7f097f37, 
-	0x7f617f86, 0x7fa67fc1, 0x7fd87fe9, 0x7ff57ffd, 
-	0x00058100, 0x0040806a, 0x19e08039, 0x8f208039, 
-	0x8ee0806a, 0x79e00002, 0x8d00000a, 0x803ea5e0, 
-	0x00038207, 0x5ffb8069, 0xffa0806a, 0x04000003, 
-	0x82075ffb, 0x806a0860, 0x806a0cc0, 0x00038207, 
-	0x5ffb806a, 0x1120806a, 0x15800003, 0x82075ffb, 
-	0x8069ffa0, 0x806a0400, 0x00038207, 0x5ffb806a, 
-	0x0860806a, 0x0cc00003, 0x82075ffb, 0x806a1120, 
-	0x806a1580, 0x00038207, 0x5ffb8069, 0xffa0806a, 
-	0x04000003, 0x82075ffb, 0x806a0860, 0x806a0cc0, 
-	0x00038207, 0x5ffb806a, 0x1120806a, 0x15800003, 
-	0x82075ffb, 0x8069ffa0, 0x806a0400, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x08000000, 0x00000800, 0x04000400, 
-	0x1000f800, 0x0e00fa00, 0x0c00fc00, 0x1200f600, 
-	0x1068f738, 0x12c0f704, 0x1400f400, 0x0800f800, 
-	0x0400fc00, 0xfc000400, 0xfc000000, 0xf8000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000002, 0x00400004, 0x00075ffb, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00400000, 
-	0x02d602d6, 0x00000000, 0x00400006, 0x82075ffb, 
-	0x8069ffa0, 0x806a0400, 0x80398ee0, 0x806a79e0, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x803ea5e0, 0x000a0001, 
-	0x00000000, 0x00000000, 0x00010000, 0x00000000, 
-	0x806a19e0, 0x80398f20, 0x80398ee0, 0x806a79e0, 
-	0x806a02c0, 0x806a0720, 0x00000000, 0x5ffb0000, 
-	0x00010038, 0x80758e80, 0x0d000000, 0x0d604000, 
-	0x00000000, 0x00000000, 0x00000000, 0x58000000, 
-	0x03a80f40, 0x03e80000, 0x003d003d, 0x003d003d, 
-	0x00010020, 0x80754380, 0x0d002000, 0x0d600000, 
-	0x00000000, 0x00000000, 0x00000000, 0x3fff0000, 
-	0x00010020, 0x80755780, 0x0d000000, 0x0d602000, 
-	0x00000000, 0x00000000, 0x00000000, 0x3fff0000, 
-	0x00010038, 0x80756b80, 0x0d004000, 0x0d600000, 
-	0x00000000, 0x00000000, 0x00000000, 0x58000000, 
-	0x00010038, 0x80758e80, 0x0d000000, 0x0d604000, 
-	0x00000000, 0x00000000, 0x00000000, 0x58000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x58000000, 
-	0x00501568, 0xffff0030, 0x00107f00, 0x08000100, 
-	0x0000002d, 0xabb80500, 0xffff0000, 0xff06f000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x82407fff, 0x7dbf843f, 0x00000000, 0x00000000, 
-	0xb23b7fff, 0x4dc4d808, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 
+	0x0c3966ad, 0x0d46ffdf, 0x0b396696, 0x0e5fffd8,
+	0x0a446669, 0x0f83ffd0, 0x095a6626, 0x10b4ffc8,
+	0x087d65cd, 0x11f0ffbf, 0x07ab655e, 0x1338ffb6,
+	0x06e464d9, 0x148cffac, 0x0628643f, 0x15ebffa1,
+	0x0577638f, 0x1756ff96, 0x04d162cb, 0x18cbff8a,
+	0x043561f3, 0x1a4cff7e, 0x03a46106, 0x1bd7ff71,
+	0x031c6007, 0x1d6cff64, 0x029f5ef5, 0x1f0bff56,
+	0x022a5dd0, 0x20b3ff48, 0x01be5c9a, 0x2264ff3a,
+	0x015b5b53, 0x241eff2c, 0x010159fc, 0x25e0ff1e,
+	0x00ae5896, 0x27a9ff10, 0x00635720, 0x297aff02,
+	0x001f559d, 0x2b50fef4, 0xffe2540d, 0x2d2cfee8,
+	0xffac5270, 0x2f0dfedb, 0xff7c50c7, 0x30f3fed0,
+	0xff534f14, 0x32dcfec6, 0xff2e4d57, 0x34c8febd,
+	0xff0f4b91, 0x36b6feb6, 0xfef549c2, 0x38a5feb0,
+	0xfedf47ed, 0x3a95feac, 0xfece4611, 0x3c85feab,
+	0xfec04430, 0x3e74feac, 0xfeb6424a, 0x4060feaf,
+	0xfeaf4060, 0x424afeb6, 0xfeac3e74, 0x4430fec0,
+	0xfeab3c85, 0x4611fece, 0xfeac3a95, 0x47edfedf,
+	0xfeb038a5, 0x49c2fef5, 0xfeb636b6, 0x4b91ff0f,
+	0xfebd34c8, 0x4d57ff2e, 0xfec632dc, 0x4f14ff53,
+	0xfed030f3, 0x50c7ff7c, 0xfedb2f0d, 0x5270ffac,
+	0xfee82d2c, 0x540dffe2, 0xfef42b50, 0x559d001f,
+	0xff02297a, 0x57200063, 0xff1027a9, 0x589600ae,
+	0xff1e25e0, 0x59fc0101, 0xff2c241e, 0x5b53015b,
+	0xff3a2264, 0x5c9a01be, 0xff4820b3, 0x5dd0022a,
+	0xff561f0b, 0x5ef5029f, 0xff641d6c, 0x6007031c,
+	0xff711bd7, 0x610603a4, 0xff7e1a4c, 0x61f30435,
+	0xff8a18cb, 0x62cb04d1, 0xff961756, 0x638f0577,
+	0xffa115eb, 0x643f0628, 0xffac148c, 0x64d906e4,
+	0xffb61338, 0x655e07ab, 0xffbf11f0, 0x65cd087d,
+	0xffc810b4, 0x6626095a, 0xffd00f83, 0x66690a44,
+	0xffd80e5f, 0x66960b39, 0xffdf0d46, 0x66ad0c39,
+	0x00000c8b, 0x18f82527, 0x30fb3c56, 0x471c5133,
+	0x5a8262f1, 0x6a6d70e2, 0x76417a7c, 0x7d897f61,
+	0x7fff7f61, 0x7d897a7c, 0x764170e2, 0x6a6d62f1,
+	0x5a825133, 0x471c3c56, 0x30fb2527, 0x18f80c8b,
+	0x0000f375, 0xe708dad9, 0xcf05c3aa, 0xb8e4aecd,
+	0xa57e9d0f, 0x95938f1e, 0x89bf8584, 0x8277809f,
+	0x8001809f, 0x82778584, 0x89bf8f1e, 0x95939d0f,
+	0xa57eaecd, 0xb8e4c3aa, 0xcf05dad9, 0xe708f375,
+	0x000007ff, 0x0fff17ff, 0x1fff27ff, 0x2fff37ff,
+	0x3fff47ff, 0x4fff57ff, 0x5fff67ff, 0x6fff77ff,
+	0x7fff7800, 0x70006800, 0x60005800, 0x50004800,
+	0x40003800, 0x30002800, 0x20001800, 0x10000800,
+	0x0000f801, 0xf001e801, 0xe001d801, 0xd001c801,
+	0xc001b801, 0xb001a801, 0xa0019801, 0x90018801,
+	0x80018800, 0x90009800, 0xa000a800, 0xb000b800,
+	0xc000c800, 0xd000d800, 0xe000e800, 0xf000f800,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x682e469b, 0x25080375, 0xe1e2c04f, 0x9ebc7d29,
+	0x5b963a03, 0x1870f6dd, 0xd54ab3b7, 0x92247091,
+	0x4efe2d6b, 0x0bd8ea45, 0xc8b2a71f, 0x858c63f9,
+	0x426620d3, 0xff40ddad, 0xbc1a9a87, 0x78f45761,
+	0x35ce143b, 0xf2a8d115, 0xaf828def, 0x6c5c4ac9,
+	0x293607a3, 0xe610c47d, 0xa2ea8157, 0x5fc43e31,
+	0x1c9efb0b, 0xd978b7e5, 0x965274bf, 0x532c3199,
+	0x1006ee73, 0xcce0ab4d, 0x89ba6827, 0x46942501,
+	0x00000001, 0x00020003, 0x00040005, 0x00060007,
+	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f,
+	0x00000001, 0x00020003, 0x00040005, 0x00060007,
+	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f,
+	0x00000001, 0x00020003, 0x00040005, 0x00060007,
+	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f,
+	0x00000001, 0x00020003, 0x00040005, 0x00060007,
+	0x00080009, 0x000a000b, 0x000c000d, 0x000e000f,
+	0x5a825b9c, 0x5cb35dc7, 0x5ed75fe3, 0x60eb61f0,
+	0x62f163ee, 0x64e865dd, 0x66cf67bc, 0x68a6698b,
+	0x6a6d6b4a, 0x6c236cf8, 0x6dc96e96, 0x6f5e7022,
+	0x70e2719d, 0x72547307, 0x73b5745f, 0x750475a5,
+	0x764176d8, 0x776b77fa, 0x78847909, 0x79897a05,
+	0x7a7c7aee, 0x7b5c7bc5, 0x7c297c88, 0x7ce37d39,
+	0x7d897dd5, 0x7e1d7e5f, 0x7e9c7ed5, 0x7f097f37,
+	0x7f617f86, 0x7fa67fc1, 0x7fd87fe9, 0x7ff57ffd,
+	0x00058100, 0x0040806a, 0x19e08039, 0x8f208039,
+	0x8ee0806a, 0x79e00002, 0x8d00000a, 0x803ea5e0,
+	0x00038207, 0x5ffb8069, 0xffa0806a, 0x04000003,
+	0x82075ffb, 0x806a0860, 0x806a0cc0, 0x00038207,
+	0x5ffb806a, 0x1120806a, 0x15800003, 0x82075ffb,
+	0x8069ffa0, 0x806a0400, 0x00038207, 0x5ffb806a,
+	0x0860806a, 0x0cc00003, 0x82075ffb, 0x806a1120,
+	0x806a1580, 0x00038207, 0x5ffb8069, 0xffa0806a,
+	0x04000003, 0x82075ffb, 0x806a0860, 0x806a0cc0,
+	0x00038207, 0x5ffb806a, 0x1120806a, 0x15800003,
+	0x82075ffb, 0x8069ffa0, 0x806a0400, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x08000000, 0x00000800, 0x04000400,
+	0x1000f800, 0x0e00fa00, 0x0c00fc00, 0x1200f600,
+	0x1068f738, 0x12c0f704, 0x1400f400, 0x0800f800,
+	0x0400fc00, 0xfc000400, 0xfc000000, 0xf8000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000002, 0x00400004, 0x00075ffb, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00400000,
+	0x02d602d6, 0x00000000, 0x00400006, 0x82075ffb,
+	0x8069ffa0, 0x806a0400, 0x80398ee0, 0x806a79e0,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x803ea5e0, 0x000a0001,
+	0x00000000, 0x00000000, 0x00010000, 0x00000000,
+	0x806a19e0, 0x80398f20, 0x80398ee0, 0x806a79e0,
+	0x806a02c0, 0x806a0720, 0x00000000, 0x5ffb0000,
+	0x00010038, 0x80758e80, 0x0d000000, 0x0d604000,
+	0x00000000, 0x00000000, 0x00000000, 0x58000000,
+	0x03a80f40, 0x03e80000, 0x003d003d, 0x003d003d,
+	0x00010020, 0x80754380, 0x0d002000, 0x0d600000,
+	0x00000000, 0x00000000, 0x00000000, 0x3fff0000,
+	0x00010020, 0x80755780, 0x0d000000, 0x0d602000,
+	0x00000000, 0x00000000, 0x00000000, 0x3fff0000,
+	0x00010038, 0x80756b80, 0x0d004000, 0x0d600000,
+	0x00000000, 0x00000000, 0x00000000, 0x58000000,
+	0x00010038, 0x80758e80, 0x0d000000, 0x0d604000,
+	0x00000000, 0x00000000, 0x00000000, 0x58000000,
+	0x00000000, 0x00000000, 0x00000000, 0x58000000,
+	0x00501568, 0xffff0030, 0x00107f00, 0x08000100,
+	0x0000002d, 0xabb80500, 0xffff0000, 0xff06f000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x82407fff, 0x7dbf843f, 0x00000000, 0x00000000,
+	0xb23b7fff, 0x4dc4d808, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 };
diff --git a/Source/DSPSpy/real_dsp.cpp b/Source/DSPSpy/real_dsp.cpp
index c7aba4179f..4df33fcb57 100644
--- a/Source/DSPSpy/real_dsp.cpp
+++ b/Source/DSPSpy/real_dsp.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
 #include <gccore.h>
 #include <ogcsys.h>
@@ -41,7 +28,7 @@ void RealDSP::Init()
 
 	u32 level;
 	_CPU_ISR_Disable(level);
-	IRQ_Request(IRQ_DSP_DSP, dsp_irq_handler, NULL);
+	IRQ_Request(IRQ_DSP_DSP, dsp_irq_handler, nullptr);
 	_CPU_ISR_Restore(level);
 }
 
diff --git a/Source/DSPSpy/real_dsp.h b/Source/DSPSpy/real_dsp.h
index 6ea25c16fe..cc43e88622 100644
--- a/Source/DSPSpy/real_dsp.h
+++ b/Source/DSPSpy/real_dsp.h
@@ -1,31 +1,16 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _REAL_DSP_H
-#define _REAL_DSP_H
+#pragma once
 
 #include "dsp_interface.h"
 
-class RealDSP : public IDSP {
+class RealDSP : public IDSP
+{
 public:
 	virtual void Init();
 	virtual void Reset();
 	virtual u32 CheckMailTo();
 	virtual void SendMailTo(u32 mail);
 };
-
-#endif  // _REAL_DSP_H
diff --git a/Source/DSPTool/CMakeLists.txt b/Source/DSPTool/CMakeLists.txt
index b7415ff703..d18ed8def0 100644
--- a/Source/DSPTool/CMakeLists.txt
+++ b/Source/DSPTool/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_executable(dsptool Src/DSPTool.cpp)
+add_executable(dsptool DSPTool.cpp)
 target_link_libraries(dsptool core)
-if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+if(NOT APPLE)
 	install(TARGETS dsptool RUNTIME DESTINATION ${bindir})
 endif()
diff --git a/Source/DSPTool/Src/DSPTool.cpp b/Source/DSPTool/DSPTool.cpp
similarity index 81%
rename from Source/DSPTool/Src/DSPTool.cpp
rename to Source/DSPTool/DSPTool.cpp
index 78335d3026..163af14e09 100644
--- a/Source/DSPTool/Src/DSPTool.cpp
+++ b/Source/DSPTool/DSPTool.cpp
@@ -1,25 +1,27 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "DSP/DSPCodeUtil.h"
-#include "DSP/DSPTables.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "Core/DSP/DSPCodeUtil.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPTables.h"
 
 // Stub out the dsplib host stuff, since this is just a simple cmdline tools.
-u8 DSPHost_ReadHostMemory(u32 addr) { return 0; }
-void DSPHost_WriteHostMemory(u8 value, u32 addr) {}
-bool DSPHost_OnThread() { return false; }
-bool DSPHost_Wii() { return false; }
-void DSPHost_CodeLoaded(const u8 *ptr, int size) {}
-void DSPHost_InterruptRequest() {}
-void DSPHost_UpdateDebugger() {}
+u8 DSPHost::ReadHostMemory(u32 addr) { return 0; }
+void DSPHost::WriteHostMemory(u8 value, u32 addr) {}
+void DSPHost::OSD_AddMessage(const std::string& str, u32 ms) {}
+bool DSPHost::OnThread() { return false; }
+bool DSPHost::IsWiiHost() { return false; }
+void DSPHost::CodeLoaded(const u8 *ptr, int size) {}
+void DSPHost::InterruptRequest() {}
+void DSPHost::UpdateDebugger() {}
 
 // This test goes from text ASM to binary to text ASM and once again back to binary.
 // Then the two binaries are compared.
-bool RoundTrip(const std::vector<u16> &code1)
+static bool RoundTrip(const std::vector<u16> &code1)
 {
 	std::vector<u16> code2;
 	std::string text;
@@ -43,7 +45,7 @@ bool RoundTrip(const std::vector<u16> &code1)
 
 // This test goes from text ASM to binary to text ASM and once again back to binary.
 // Very convenient for testing. Then the two binaries are compared.
-bool SuperTrip(const char *asm_code)
+static bool SuperTrip(const char *asm_code)
 {
 	std::vector<u16> code1, code2;
 	std::string text;
@@ -72,13 +74,13 @@ bool SuperTrip(const char *asm_code)
 	std::string text2;
 	Disassemble(code1, true, &text1);
 	Disassemble(code2, true, &text2);
-	File::WriteStringToFile(true, text1, "code1.txt");
-	File::WriteStringToFile(true, text2, "code2.txt");
+	File::WriteStringToFile(text1, "code1.txt");
+	File::WriteStringToFile(text2, "code2.txt");
 	*/
 	return true;
 }
 
-void RunAsmTests()
+static void RunAsmTests()
 {
 	bool fail = false;
 #define CHK(a) if (!SuperTrip(a)) printf("FAIL\n%s\n", a), fail = true;
@@ -126,7 +128,7 @@ void RunAsmTests()
 	/*
 	std::vector<u16> code;
 	std::string text_orig;
-	File::ReadFileToString(false, "testdata/dsp_test.S", &text_orig);
+	File::ReadFileToString("testdata/dsp_test.S", &text_orig);
 	if (!Assemble(text_orig.c_str(), &code))
 	{
 		printf("SuperTrip: First assembly failed\n");
@@ -168,15 +170,15 @@ void RunAsmTests()
 	RoundTrip(rand_code);
 
 
-	if (File::ReadFileToString(true, "C:/devkitPro/examples/wii/asndlib/dsptest/dsp_test.ds", &dsp_test))
+	if (File::ReadFileToString("C:/devkitPro/examples/wii/asndlib/dsptest/dsp_test.ds", &dsp_test))
 		SuperTrip(dsp_test.c_str());
 
-	//.File::ReadFileToString(true, "C:/devkitPro/trunk/libogc/libasnd/dsp_mixer/dsp_mixer.s", &dsp_test);
+	//.File::ReadFileToString("C:/devkitPro/trunk/libogc/libasnd/dsp_mixer/dsp_mixer.s", &dsp_test);
 	// This is CLOSE to working. Sorry about the local path btw. This is preliminary code.
 */
-	
+
 	std::string dsp_test;
-	if (File::ReadFileToString(true, "Testdata/dsp_test.s", dsp_test))
+	if (File::ReadFileToString("Testdata/dsp_test.s", dsp_test))
 		fail = fail || !SuperTrip(dsp_test.c_str());
 	if (!fail)
 		printf("All passed!\n");
@@ -199,7 +201,7 @@ void RunAsmTests()
 // So far, all this binary can do is test partially that itself works correctly.
 int main(int argc, const char *argv[])
 {
-	if(argc == 1 || (argc == 2 && (!strcmp(argv[1], "--help") || (!strcmp(argv[1], "-?")))))
+	if (argc == 1 || (argc == 2 && (!strcmp(argv[1], "--help") || (!strcmp(argv[1], "-?")))))
 	{
 		printf("USAGE: DSPTool [-?] [--help] [-f] [-d] [-m] [-p <FILE>] [-o <FILE>] [-h <FILE>] <DSP ASSEMBLER FILE>\n");
 		printf("-? / --help: Prints this message\n");
@@ -213,7 +215,7 @@ int main(int argc, const char *argv[])
 		printf("-ps <DUMP FILE>: Print results of DSPSpy register dump (disable SR output)\n");
 		printf("-pm <DUMP FILE>: Print results of DSPSpy register dump (convert PROD values)\n");
 		printf("-psm <DUMP FILE>: Print results of DSPSpy register dump (convert PROD values/disable SR output)\n");
-	
+
 		return 0;
 	}
 
@@ -227,7 +229,7 @@ int main(int argc, const char *argv[])
 	std::string output_header_name;
 	std::string output_name;
 
-	bool disassemble = false, compare = false, multiple = false, outputSize = false, 
+	bool disassemble = false, compare = false, multiple = false, outputSize = false,
 		force = false, print_results = false, print_results_prodhack = false, print_results_srhack = false;
 	for (int i = 1; i < argc; i++)
 	{
@@ -260,7 +262,7 @@ int main(int argc, const char *argv[])
 			print_results_srhack = true;
 			print_results_prodhack = true;
 		}
-		else 
+		else
 		{
 			if (!input_name.empty())
 			{
@@ -276,7 +278,7 @@ int main(int argc, const char *argv[])
 		}
 	}
 
-	if(multiple && (compare || disassemble || !output_name.empty() ||
+	if (multiple && (compare || disassemble || !output_name.empty() ||
 					input_name.empty())) {
 		printf("ERROR: Multiple files can only be used with assembly "
 			"and must compile a header file.\n");
@@ -288,9 +290,9 @@ int main(int argc, const char *argv[])
 		// Two binary inputs, let's diff.
 		std::string binary_code;
 		std::vector<u16> code1, code2;
-		File::ReadFileToString(false, input_name.c_str(), binary_code);
+		File::ReadFileToString(input_name.c_str(), binary_code);
 		BinaryStringBEToCode(binary_code, code1);
-		File::ReadFileToString(false, output_name.c_str(), binary_code);
+		File::ReadFileToString(output_name.c_str(), binary_code);
 		BinaryStringBEToCode(binary_code, code2);
 		Compare(code1, code2);
 		return 0;
@@ -301,7 +303,7 @@ int main(int argc, const char *argv[])
 		std::string dumpfile, results;
 		std::vector<u16> reg_vector;
 
-		File::ReadFileToString(false, input_name.c_str(), dumpfile);
+		File::ReadFileToString(input_name.c_str(), dumpfile);
 		BinaryStringBEToCode(dumpfile, reg_vector);
 
 		results.append("Start:\n");
@@ -325,17 +327,17 @@ int main(int argc, const char *argv[])
 			{
 				if ((reg >= 0x0c) && (reg <= 0x0f)) continue;
 				if (print_results_srhack && (reg == 0x13)) continue;
-				
+
 				if ((print_results_prodhack) && (reg >= 0x15) && (reg <= 0x17)) {
 					switch (reg) {
 						case 0x15: //DSP_REG_PRODM
 							last_reg = reg_vector.at((step*32-32)+reg) + reg_vector.at((step*32-32)+reg+2);
-							current_reg = reg_vector.at(step*32+reg) + reg_vector.at(step*32+reg+2); 
+							current_reg = reg_vector.at(step*32+reg) + reg_vector.at(step*32+reg+2);
 							break;
 						case 0x16: //DSP_REG_PRODH
-							htemp = ((reg_vector.at(step*32+reg-1) + reg_vector.at(step*32+reg+1))&~0xffff)>>16; 
+							htemp = ((reg_vector.at(step*32+reg-1) + reg_vector.at(step*32+reg+1))&~0xffff)>>16;
 							current_reg = (u8)(reg_vector.at(step*32+reg) + htemp);
-							htemp = ((reg_vector.at(step*32-32+reg-1) + reg_vector.at(step*32-32+reg+1))&~0xffff)>>16; 
+							htemp = ((reg_vector.at(step*32-32+reg-1) + reg_vector.at(step*32-32+reg+1))&~0xffff)>>16;
 							last_reg = (u8)(reg_vector.at(step*32-32+reg) + htemp);
 							break;
 						case 0x17: //DSP_REG_PRODM2
@@ -362,7 +364,7 @@ int main(int argc, const char *argv[])
 		}
 
 		if (!output_name.empty())
-			File::WriteStringToFile(true, results, output_name.c_str());
+			File::WriteStringToFile(results, output_name.c_str());
 		else
 			printf("%s", results.c_str());
 		return 0;
@@ -377,16 +379,16 @@ int main(int argc, const char *argv[])
 		}
 		std::string binary_code;
 		std::vector<u16> code;
-		File::ReadFileToString(false, input_name.c_str(), binary_code);
+		File::ReadFileToString(input_name.c_str(), binary_code);
 		BinaryStringBEToCode(binary_code, code);
 		std::string text;
 		Disassemble(code, true, text);
 		if (!output_name.empty())
-			File::WriteStringToFile(true, text, output_name.c_str());
+			File::WriteStringToFile(text, output_name.c_str());
 		else
 			printf("%s", text.c_str());
 	}
-	else 
+	else
 	{
 		if (input_name.empty())
 		{
@@ -394,9 +396,9 @@ int main(int argc, const char *argv[])
 			return 1;
 		}
 		std::string source;
-		if (File::ReadFileToString(true, input_name.c_str(), source))
+		if (File::ReadFileToString(input_name.c_str(), source))
 		{
-			if(multiple) 
+			if (multiple)
 			{
 				// When specifying a list of files we must compile a header
 				// (we can't assemble multiple files to one binary)
@@ -408,37 +410,37 @@ int main(int argc, const char *argv[])
 				size_t lastPos = 0, pos = 0;
 
 				source.append("\n");
-				
-				while((pos = source.find('\n', lastPos)) != std::string::npos) 
+
+				while ((pos = source.find('\n', lastPos)) != std::string::npos)
 				{
 					std::string temp = source.substr(lastPos, pos - lastPos);
-					if(!temp.empty())
+					if (!temp.empty())
 						files.push_back(temp);
 					lastPos = pos + 1;
 				}
 
 				lines = (int)files.size();
 
-				if(lines == 0) 
+				if (lines == 0)
 				{
 					printf("ERROR: Must specify at least one file\n");
 					return 1;
 				}
-				
+
 				codes = new std::vector<u16>[lines];
 
-				for (int i = 0; i < lines; i++) 
+				for (int i = 0; i < lines; i++)
 				{
-					if (!File::ReadFileToString(true, files[i].c_str(), currentSource))
+					if (!File::ReadFileToString(files[i].c_str(), currentSource))
 					{
 						printf("ERROR reading %s, skipping...\n", files[i].c_str());
 						lines--;
 					}
-					else 
+					else
 					{
-						if (!Assemble(currentSource.c_str(), codes[i], force)) 
+						if (!Assemble(currentSource.c_str(), codes[i], force))
 						{
-							printf("Assemble: Assembly of %s failed due to errors\n", 
+							printf("Assemble: Assembly of %s failed due to errors\n",
 									files[i].c_str());
 							lines--;
 						}
@@ -447,10 +449,10 @@ int main(int argc, const char *argv[])
 						}
 					}
 				}
-				
+
 
 				CodesToHeader(codes, &files, lines, output_header_name.c_str(), header);
-				File::WriteStringToFile(true, header, (output_header_name + ".h").c_str());
+				File::WriteStringToFile(header, (output_header_name + ".h").c_str());
 
 				delete[] codes;
 			}
@@ -466,26 +468,33 @@ int main(int argc, const char *argv[])
 				if (outputSize) {
 					printf("%s: %d\n", input_name.c_str(), (int)code.size());
 				}
-				
+
 				if (!output_name.empty())
 				{
 					std::string binary_code;
 					CodeToBinaryStringBE(code, binary_code);
-					File::WriteStringToFile(false, binary_code, output_name.c_str());
+					File::WriteStringToFile(binary_code, output_name.c_str());
 				}
 				if (!output_header_name.empty())
 				{
 					std::string header;
 					CodeToHeader(code, input_name, output_header_name.c_str(), header);
-					File::WriteStringToFile(true, header, (output_header_name + ".h").c_str());
+					File::WriteStringToFile(header, (output_header_name + ".h").c_str());
 				}
 			}
 		}
 		source.clear();
 	}
 
-	if(!outputSize)
-		printf("Assembly completed successfully!\n");
+	if (disassemble)
+	{
+		printf("Disassembly completed successfully!\n");
+	}
+	else
+	{
+		if (!outputSize)
+			printf("Assembly completed successfully!\n");
+	}
 
 	return 0;
 }
diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj
index e72c055233..d962c51247 100644
--- a/Source/DSPTool/DSPTool.vcxproj
+++ b/Source/DSPTool/DSPTool.vcxproj
@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>
@@ -28,164 +12,29 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1970D175-3DE8-4738-942A-4D98D1CDBF64}</ProjectGuid>
-    <RootNamespace>DSPTool</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
+  <ImportGroup 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\CodeGen_DebugFast.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\VSProps\Base.props" />
-    <Import Project="..\VSProps\CodeGen_Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\VSProps\Base.props" />
-    <Import Project="..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.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\CodeGen_Release.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\CodeGen_Debug.props" />
+    <Import Project="..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">../../Binary/$(Platform)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../Binary/$(Platform)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../Binary/$(Platform)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">../../Binary/$(Platform)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../Binary/$(Platform)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../Binary/$(Platform)/</OutDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">$(ProjectName)DF</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">$(ProjectName)DF</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
+  <ItemDefinitionGroup>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
@@ -198,27 +47,28 @@
     <None Include="Testdata\hermes.s" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\DSPTool.cpp" />
+    <ClCompile Include="DSPTool.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Core\Core\Core.vcxproj">
-      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <!--Copy the .exe to binary output folder-->
+  <ItemGroup>
+    <SourceFiles Include="$(TargetPath)" />
+  </ItemGroup>
+  <Target Name="AfterBuild" Inputs="@(SourceFiles)" Outputs="@(SourceFiles -> '$(BinaryOutputDir)%(Filename)%(Extension)')">
+    <Message Text="Copy: @(SourceFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
+    <Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(BinaryOutputDir)" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Source/DSPTool/DSPTool.vcxproj.filters b/Source/DSPTool/DSPTool.vcxproj.filters
index c5b78da492..0aac9b1684 100644
--- a/Source/DSPTool/DSPTool.vcxproj.filters
+++ b/Source/DSPTool/DSPTool.vcxproj.filters
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="TestData">
       <UniqueIdentifier>{0b70242b-1d98-432f-a60e-d4ca0674852e}</UniqueIdentifier>
@@ -20,6 +20,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\DSPTool.cpp" />
+    <ClCompile Include="DSPTool.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln
deleted file mode 100644
index 3eff8830fe..0000000000
--- a/Source/Dolphin_2010.sln
+++ /dev/null
@@ -1,448 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\Dolphin.vcxproj", "{1B099EF8-6F87-47A2-A3E7-898A24584F49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-		{9E9DA440-E9AD-413C-B648-91030E792211} = {9E9DA440-E9AD-413C-B648-91030E792211}
-		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
-		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}"
-	ProjectSection(ProjectDependencies) = postProject
-		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}
-		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
-		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20} = {D8890B98-26F7-4CFF-BBFB-B95F371B5F20}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{01573C36-AC6E-49F6-94BA-572517EB9740} = {01573C36-AC6E-49F6-94BA-572517EB9740}
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\png\png.vcxproj", "{01573C36-AC6E-49F6-94BA-572517EB9740}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\SoundTouch\SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolarSSL", "..\Externals\polarssl\visualc\VS2010\PolarSSL.vcxproj", "{46CF2D25-6A36-4189-B59C-E4815388E554}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{A680190D-0764-485B-9CF3-A82C5EDD5715}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DebugFast|Win32 = DebugFast|Win32
-		DebugFast|x64 = DebugFast|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.Build.0 = Debug|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.ActiveCfg = Debug|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.Build.0 = Debug|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.ActiveCfg = Release|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.Build.0 = Release|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.ActiveCfg = Release|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.Build.0 = Release|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.Build.0 = Debug|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.ActiveCfg = Debug|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.Build.0 = Debug|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.Build.0 = DebugFast|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.ActiveCfg = Release|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.Build.0 = Debug|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.Build.0 = DebugFast|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.ActiveCfg = Release|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.Build.0 = Release|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.ActiveCfg = Release|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.Build.0 = Release|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.Build.0 = Debug|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.ActiveCfg = Debug|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.Build.0 = Debug|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.Build.0 = DebugFast|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.ActiveCfg = Release|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.Build.0 = Release|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.ActiveCfg = Release|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.Build.0 = Release|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.Build.0 = Debug|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.ActiveCfg = Debug|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.Build.0 = Debug|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.Build.0 = DebugFast|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.ActiveCfg = Release|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.Build.0 = Release|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.ActiveCfg = Release|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.Build.0 = Release|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.Build.0 = Debug|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.ActiveCfg = Debug|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.Build.0 = Debug|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.Build.0 = DebugFast|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.ActiveCfg = Release|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.Build.0 = Release|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.ActiveCfg = Release|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.Build.0 = Release|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.Build.0 = Debug|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.ActiveCfg = Debug|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.Build.0 = Debug|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.Build.0 = DebugFast|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.ActiveCfg = Release|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.Build.0 = Release|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.ActiveCfg = Release|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.Build.0 = Release|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.Build.0 = Debug|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.ActiveCfg = Debug|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.Build.0 = Debug|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.Build.0 = DebugFast|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.ActiveCfg = Release|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.Build.0 = Release|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.ActiveCfg = Release|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.Build.0 = Release|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.Build.0 = Debug|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.ActiveCfg = Debug|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.Build.0 = Debug|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.Build.0 = DebugFast|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.ActiveCfg = Release|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.Build.0 = Release|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.ActiveCfg = Release|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.Build.0 = Release|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.Build.0 = Debug|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.ActiveCfg = Debug|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.Build.0 = Debug|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.Build.0 = DebugFast|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.ActiveCfg = Release|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.Build.0 = Release|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.ActiveCfg = Release|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.Build.0 = Release|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.Build.0 = Debug|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.ActiveCfg = Debug|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.Build.0 = Debug|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.Build.0 = DebugFast|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.ActiveCfg = Release|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.Build.0 = Release|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.ActiveCfg = Release|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.Build.0 = Release|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.Build.0 = Debug|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.ActiveCfg = Debug|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.Build.0 = Debug|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.Build.0 = DebugFast|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.ActiveCfg = Release|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.Build.0 = Release|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.ActiveCfg = Release|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.Build.0 = Release|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.Build.0 = Debug|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.ActiveCfg = Debug|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.Build.0 = Debug|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.Build.0 = DebugFast|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.ActiveCfg = Release|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.Build.0 = Release|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.ActiveCfg = Release|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.Build.0 = Release|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.Build.0 = Debug|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.ActiveCfg = Debug|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.Build.0 = Debug|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.Build.0 = DebugFast|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.ActiveCfg = Release|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.Build.0 = Release|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.ActiveCfg = Release|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.Build.0 = Release|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.Build.0 = Debug|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.ActiveCfg = Debug|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.Build.0 = Debug|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.ActiveCfg = Release|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.Build.0 = Release|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.ActiveCfg = Release|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.Build.0 = Release|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.Build.0 = Debug|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.ActiveCfg = Debug|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.Build.0 = Debug|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.Build.0 = DebugFast|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.ActiveCfg = Release|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.Build.0 = Release|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.ActiveCfg = Release|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.Build.0 = Release|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.Build.0 = Debug|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.ActiveCfg = Debug|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.Build.0 = Debug|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.Build.0 = DebugFast|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.ActiveCfg = Release|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.Build.0 = Release|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.ActiveCfg = Release|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.Build.0 = Release|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.Build.0 = Debug|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.ActiveCfg = Release|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.Build.0 = Debug|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.ActiveCfg = Debug|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.Build.0 = Debug|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.Build.0 = DebugFast|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.ActiveCfg = Release|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.Build.0 = Release|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.ActiveCfg = Release|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64
-		{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}.DebugFast|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.Build.0 = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.Build.0 = Debug|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.ActiveCfg = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.Build.0 = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.ActiveCfg = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.Build.0 = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.Build.0 = Release|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.Build.0 = Release|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.Build.0 = Debug|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.ActiveCfg = Debug|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.Build.0 = Debug|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.DebugFast|x64.Build.0 = DebugFast|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.ActiveCfg = Release|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.Build.0 = Release|Win32
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.ActiveCfg = Release|x64
-		{46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.Build.0 = Release|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|Win32.Build.0 = Debug|Win32
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|x64.ActiveCfg = Debug|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|x64.Build.0 = Debug|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|Win32.ActiveCfg = Debug|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|x64.ActiveCfg = Debug|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|x64.Build.0 = Debug|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.ActiveCfg = Release|Win32
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.Build.0 = Release|Win32
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.ActiveCfg = Release|x64
-		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.Build.0 = Release|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.Build.0 = Debug|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.ActiveCfg = Debug|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.Build.0 = Debug|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.ActiveCfg = Debug|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.Build.0 = Debug|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.ActiveCfg = Debug|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.Build.0 = Debug|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.ActiveCfg = Release|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.Build.0 = Release|Win32
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.ActiveCfg = Release|x64
-		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Source/PCH/pch.cpp b/Source/PCH/pch.cpp
new file mode 100644
index 0000000000..b5b8f5cc0f
--- /dev/null
+++ b/Source/PCH/pch.cpp
@@ -0,0 +1,5 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "pch.h"
diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
new file mode 100644
index 0000000000..2d0bce224a
--- /dev/null
+++ b/Source/PCH/pch.h
@@ -0,0 +1,79 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <algorithm>
+#include <array>
+#include <assert.h>
+#include <bitset>
+#include <cassert>
+#include <cctype>
+#include <cerrno>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <ctype.h>
+#include <deque>
+#include <errno.h>
+#if !defined ANDROID && !defined _WIN32
+#include <execinfo.h>
+#endif
+#include <fcntl.h>
+#include <float.h>
+#include <fstream>
+#include <functional>
+#ifndef _WIN32
+#include <getopt.h>
+#endif
+#include <iomanip>
+#include <iostream>
+#include <limits>
+#include <limits.h>
+#include <list>
+#include <locale.h>
+#include <map>
+#include <math.h>
+#include <memory>
+#include <memory.h>
+#include <mutex>
+#include <numeric>
+#ifndef _WIN32
+#include <pthread.h>
+#endif
+#include <queue>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <thread>
+#include <time.h>
+#include <type_traits>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+#ifdef _WIN32
+
+#if _MSC_FULL_VER < 180030723
+#error Please update your build environment to VS2013 with Update 3 or later!
+#endif
+
+#include <Windows.h>
+
+#endif
+
+#include "Common/Common.h"
+#include "Common/Thread.h"
diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj
new file mode 100644
index 0000000000..8959e7f180
--- /dev/null
+++ b/Source/PCH/pch.vcxproj
@@ -0,0 +1,46 @@
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{76563A7F-1011-4EAD-B667-7BB18D09568E}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHCreate.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/CMakeLists.txt b/Source/Plugins/CMakeLists.txt
deleted file mode 100644
index 3a58c3aab1..0000000000
--- a/Source/Plugins/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-if(NOT USE_GLES OR USE_GLES3)
-	add_subdirectory(Plugin_VideoOGL)
-endif()
-add_subdirectory(Plugin_VideoSoftware)
-# TODO: Add other backends here!
diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj
deleted file mode 100644
index aab9345ef7..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{9A4C733C-BADE-4AC6-B58A-6E274395E90E}</ProjectGuid>
-    <RootNamespace>Plugin_VideoDX11</RootNamespace>
-    <ProjectName>VideoDX11</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\D3DBase.cpp" />
-    <ClCompile Include="Src\D3DBlob.cpp" />
-    <ClCompile Include="Src\D3DShader.cpp" />
-    <ClCompile Include="Src\D3DTexture.cpp" />
-    <ClCompile Include="Src\D3DUtil.cpp" />
-    <ClCompile Include="Src\FramebufferManager.cpp" />
-    <ClCompile Include="Src\GfxState.cpp" />
-    <ClCompile Include="Src\LineGeometryShader.cpp" />
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\NativeVertexFormat.cpp" />
-    <ClCompile Include="Src\PerfQuery.cpp" />
-    <ClCompile Include="Src\PixelShaderCache.cpp" />
-    <ClCompile Include="Src\PointGeometryShader.cpp" />
-    <ClCompile Include="Src\PSTextureEncoder.cpp" />
-    <ClCompile Include="Src\Render.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\Television.cpp" />
-    <ClCompile Include="Src\TextureCache.cpp" />
-    <ClCompile Include="Src\VertexManager.cpp" />
-    <ClCompile Include="Src\VertexShaderCache.cpp" />
-    <ClCompile Include="Src\XFBEncoder.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\D3DBase.h" />
-    <ClInclude Include="Src\D3DBlob.h" />
-    <ClInclude Include="Src\D3DShader.h" />
-    <ClInclude Include="Src\D3DTexture.h" />
-    <ClInclude Include="Src\D3DUtil.h" />
-    <ClInclude Include="Src\FramebufferManager.h" />
-    <ClInclude Include="Src\GfxState.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\LineGeometryShader.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\PerfQuery.h" />
-    <ClInclude Include="Src\PixelShaderCache.h" />
-    <ClInclude Include="Src\PointGeometryShader.h" />
-    <ClInclude Include="Src\PSTextureEncoder.h" />
-    <ClInclude Include="Src\Render.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Television.h" />
-    <ClInclude Include="Src\TextureCache.h" />
-    <ClInclude Include="Src\TextureEncoder.h" />
-    <ClInclude Include="Src\VertexManager.h" />
-    <ClInclude Include="Src\VertexShaderCache.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\XFBEncoder.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters
deleted file mode 100644
index 4b8efac92b..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\D3DBase.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DBlob.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DShader.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DTexture.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DUtil.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GfxState.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FramebufferManager.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NativeVertexFormat.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PixelShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Render.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexManager.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PSTextureEncoder.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\XFBEncoder.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Television.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\LineGeometryShader.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PointGeometryShader.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PerfQuery.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\D3DUtil.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DBase.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DBlob.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DShader.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DTexture.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GfxState.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FramebufferManager.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Render.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PixelShaderCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexShaderCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexManager.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PSTextureEncoder.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureEncoder.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\XFBEncoder.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Television.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LineGeometryShader.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PointGeometryShader.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PerfQuery.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="D3D">
-      <UniqueIdentifier>{8dda993d-a0ed-4c2e-9651-c13c743e3e27}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Render">
-      <UniqueIdentifier>{41d3f9d1-16f3-4a48-a486-292b1593dc92}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
deleted file mode 100644
index 0bd9a14ed8..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "StringUtil.h"
-#include "VideoConfig.h"
-
-#include "D3DBase.h"
-#include "D3DTexture.h"
-#include "GfxState.h"
-
-namespace DX11
-{
-
-HINSTANCE hD3DCompilerDll = NULL;
-D3DREFLECT PD3DReflect = NULL;
-int d3dcompiler_dll_ref = 0;
-
-HINSTANCE hD3DXDll = NULL;
-D3DX11COMPILEFROMMEMORYTYPE PD3DX11CompileFromMemory = NULL;
-D3DX11FILTERTEXTURETYPE PD3DX11FilterTexture = NULL;
-D3DX11SAVETEXTURETOFILEATYPE PD3DX11SaveTextureToFileA = NULL;
-D3DX11SAVETEXTURETOFILEWTYPE PD3DX11SaveTextureToFileW = NULL;
-int d3dx_dll_ref = 0;
-
-CREATEDXGIFACTORY PCreateDXGIFactory = NULL;
-HINSTANCE hDXGIDll = NULL;
-int dxgi_dll_ref = 0;
-
-typedef HRESULT (WINAPI* D3D11CREATEDEVICEANDSWAPCHAIN)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, CONST DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-D3D11CREATEDEVICE PD3D11CreateDevice = NULL;
-D3D11CREATEDEVICEANDSWAPCHAIN PD3D11CreateDeviceAndSwapChain = NULL;
-HINSTANCE hD3DDll = NULL;
-int d3d_dll_ref = 0;
-
-namespace D3D
-{
-
-ID3D11Device* device = NULL;
-ID3D11DeviceContext* context = NULL;
-IDXGISwapChain* swapchain = NULL;
-D3D_FEATURE_LEVEL featlevel;
-D3DTexture2D* backbuf = NULL;
-HWND hWnd;
-
-std::vector<DXGI_SAMPLE_DESC> aa_modes; // supported AA modes of the current adapter
-
-bool bgra_textures_supported;
-
-#define NUM_SUPPORTED_FEATURE_LEVELS 3
-const D3D_FEATURE_LEVEL supported_feature_levels[NUM_SUPPORTED_FEATURE_LEVELS] = {
-	D3D_FEATURE_LEVEL_11_0,
-	D3D_FEATURE_LEVEL_10_1,
-	D3D_FEATURE_LEVEL_10_0
-};
-
-unsigned int xres, yres;
-
-bool bFrameInProgress = false;
-
-HRESULT LoadDXGI()
-{
-	if (dxgi_dll_ref++ > 0) return S_OK;
-
-	if (hDXGIDll) return S_OK;
-	hDXGIDll = LoadLibraryA("dxgi.dll");
-	if (!hDXGIDll)
-	{
-		MessageBoxA(NULL, "Failed to load dxgi.dll", "Critical error", MB_OK | MB_ICONERROR);
-		--dxgi_dll_ref;
-		return E_FAIL;
-	}
-	PCreateDXGIFactory = (CREATEDXGIFACTORY)GetProcAddress(hDXGIDll, "CreateDXGIFactory");
-	if (PCreateDXGIFactory == NULL) MessageBoxA(NULL, "GetProcAddress failed for CreateDXGIFactory!", "Critical error", MB_OK | MB_ICONERROR);
-
-	return S_OK;
-}
-
-HRESULT LoadD3D()
-{
-	if (d3d_dll_ref++ > 0) return S_OK;
-
-	if (hD3DDll) return S_OK;
-	hD3DDll = LoadLibraryA("d3d11.dll");
-	if (!hD3DDll)
-	{
-		MessageBoxA(NULL, "Failed to load d3d11.dll", "Critical error", MB_OK | MB_ICONERROR);
-		--d3d_dll_ref;
-		return E_FAIL;
-	}
-	PD3D11CreateDevice = (D3D11CREATEDEVICE)GetProcAddress(hD3DDll, "D3D11CreateDevice");
-	if (PD3D11CreateDevice == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3D11CreateDevice!", "Critical error", MB_OK | MB_ICONERROR);
-
-	PD3D11CreateDeviceAndSwapChain = (D3D11CREATEDEVICEANDSWAPCHAIN)GetProcAddress(hD3DDll, "D3D11CreateDeviceAndSwapChain");
-	if (PD3D11CreateDeviceAndSwapChain == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3D11CreateDeviceAndSwapChain!", "Critical error", MB_OK | MB_ICONERROR);
-
-	return S_OK;
-}
-
-HRESULT LoadD3DX()
-{
-	if (d3dx_dll_ref++ > 0) return S_OK;
-	if (hD3DXDll) return S_OK;
-
-	// try to load D3DX11 first to check whether we have proper runtime support
-	// try to use the dll the backend was compiled against first - don't bother about debug runtimes
-	hD3DXDll = LoadLibraryA(D3DX11_DLL_A);
-	if (!hD3DXDll)
-	{
-		// if that fails, use the dll which should be available in every SDK which officially supports DX11.
-		hD3DXDll = LoadLibraryA("d3dx11_42.dll");
-		if (!hD3DXDll)
-		{
-			MessageBoxA(NULL, "Failed to load d3dx11_42.dll, update your DX11 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
-			return E_FAIL;
-		}
-		else
-		{
-			NOTICE_LOG(VIDEO, "Successfully loaded d3dx11_42.dll. If you're having trouble, try updating your DX runtime first.");
-		}
-	}
-
-	PD3DX11CompileFromMemory = (D3DX11COMPILEFROMMEMORYTYPE)GetProcAddress(hD3DXDll, "D3DX11CompileFromMemory");
-	if (PD3DX11CompileFromMemory == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DX11CompileFromMemory!", "Critical error", MB_OK | MB_ICONERROR);
-
-	PD3DX11FilterTexture = (D3DX11FILTERTEXTURETYPE)GetProcAddress(hD3DXDll, "D3DX11FilterTexture");
-	if (PD3DX11FilterTexture == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DX11FilterTexture!", "Critical error", MB_OK | MB_ICONERROR);
-
-	PD3DX11SaveTextureToFileA = (D3DX11SAVETEXTURETOFILEATYPE)GetProcAddress(hD3DXDll, "D3DX11SaveTextureToFileA");
-	if (PD3DX11SaveTextureToFileA == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DX11SaveTextureToFileA!", "Critical error", MB_OK | MB_ICONERROR);
-
-	PD3DX11SaveTextureToFileW = (D3DX11SAVETEXTURETOFILEWTYPE)GetProcAddress(hD3DXDll, "D3DX11SaveTextureToFileW");
-	if (PD3DX11SaveTextureToFileW == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DX11SaveTextureToFileW!", "Critical error", MB_OK | MB_ICONERROR);
-
-	return S_OK;
-}
-
-HRESULT LoadD3DCompiler()
-{
-	if (d3dcompiler_dll_ref++ > 0) return S_OK;
-	if (hD3DCompilerDll) return S_OK;
-
-	// try to load D3DCompiler first to check whether we have proper runtime support
-	// try to use the dll the backend was compiled against first - don't bother about debug runtimes
-	hD3DCompilerDll = LoadLibraryA(D3DCOMPILER_DLL_A);
-	if (!hD3DCompilerDll)
-	{
-		// if that fails, use the dll which should be available in every SDK which officially supports DX11.
-		hD3DCompilerDll = LoadLibraryA("D3DCompiler_42.dll");
-		if (!hD3DCompilerDll)
-		{
-			MessageBoxA(NULL, "Failed to load D3DCompiler_42.dll, update your DX11 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
-			return E_FAIL;
-		}
-		else
-		{
-			NOTICE_LOG(VIDEO, "Successfully loaded D3DCompiler_42.dll. If you're having trouble, try updating your DX runtime first.");
-		}
-	}
-
-	PD3DReflect = (D3DREFLECT)GetProcAddress(hD3DCompilerDll, "D3DReflect");
-	if (PD3DReflect == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DReflect!", "Critical error", MB_OK | MB_ICONERROR);
-
-	return S_OK;
-}
-
-void UnloadDXGI()
-{
-	if (!dxgi_dll_ref) return;
-	if (--dxgi_dll_ref != 0) return;
-
-	if(hDXGIDll) FreeLibrary(hDXGIDll);
-	hDXGIDll = NULL;
-	PCreateDXGIFactory = NULL;
-}
-
-void UnloadD3DX()
-{
-	if (!d3dx_dll_ref) return;
-	if (--d3dx_dll_ref != 0) return;
-
-	if(hD3DXDll) FreeLibrary(hD3DXDll);
-	hD3DXDll = NULL;
-	PD3DX11FilterTexture = NULL;
-	PD3DX11SaveTextureToFileA = NULL;
-	PD3DX11SaveTextureToFileW = NULL;
-}
-
-void UnloadD3D()
-{
-	if (!d3d_dll_ref) return;
-	if (--d3d_dll_ref != 0) return;
-
-	if(hD3DDll) FreeLibrary(hD3DDll);
-	hD3DDll = NULL;
-	PD3D11CreateDevice = NULL;
-	PD3D11CreateDeviceAndSwapChain = NULL;
-}
-
-void UnloadD3DCompiler()
-{
-	if (!d3dcompiler_dll_ref) return;
-	if (--d3dcompiler_dll_ref != 0) return;
-
-	if (hD3DCompilerDll) FreeLibrary(hD3DCompilerDll);
-	hD3DCompilerDll = NULL;
-	PD3DReflect = NULL;
-}
-
-std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter)
-{
-	std::vector<DXGI_SAMPLE_DESC> aa_modes;
-
-	// NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND shader resources.
-	// Thus, we can't have MSAA with 10.0 level hardware.
-	ID3D11Device* device;
-	ID3D11DeviceContext* context;
-	D3D_FEATURE_LEVEL feat_level;
-	HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &device, &feat_level, &context);
-	if (FAILED(hr) || feat_level == D3D_FEATURE_LEVEL_10_0)
-	{
-		DXGI_SAMPLE_DESC desc;
-		desc.Count = 1;
-		desc.Quality = 0;
-		aa_modes.push_back(desc);
-		SAFE_RELEASE(context);
-		SAFE_RELEASE(device);
-	}
-	else
-	{
-		for (int samples = 0; samples < D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples)
-		{
-			UINT quality_levels = 0;
-			device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, &quality_levels);
-			if (quality_levels > 0) {
-				DXGI_SAMPLE_DESC desc;
-				desc.Count = samples;
-				for (desc.Quality = 0; desc.Quality < quality_levels; ++desc.Quality)
-					aa_modes.push_back(desc);
-			}
-		}
-		context->Release();
-		device->Release();
-	}
-	return aa_modes;
-}
-
-D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter)
-{
-	D3D_FEATURE_LEVEL feat_level = D3D_FEATURE_LEVEL_9_1;
-	PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, NULL, &feat_level, NULL);
-	return feat_level;
-}
-
-DXGI_SAMPLE_DESC GetAAMode(int index)
-{
-	return aa_modes[index];
-}
-
-HRESULT Create(HWND wnd)
-{
-	hWnd = wnd;
-	HRESULT hr;
-
-	RECT client;
-	GetClientRect(hWnd, &client);
-	xres = client.right - client.left;
-	yres = client.bottom - client.top;
-
-	hr = LoadDXGI();
-	if (SUCCEEDED(hr)) hr = LoadD3D();
-	if (SUCCEEDED(hr)) hr = LoadD3DX();
-	if (SUCCEEDED(hr)) hr = LoadD3DCompiler();
-	if (FAILED(hr))
-	{
-		UnloadDXGI();
-		UnloadD3D();
-		UnloadD3DX();
-		UnloadD3DCompiler();
-		return hr;
-	}
-
-	IDXGIFactory* factory;
-	IDXGIAdapter* adapter;
-	IDXGIOutput* output;
-	hr = PCreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&factory);
-	if (FAILED(hr)) MessageBox(wnd, _T("Failed to create IDXGIFactory object"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-
-	hr = factory->EnumAdapters(g_ActiveConfig.iAdapter, &adapter);
-	if (FAILED(hr))
-	{
-		// try using the first one
-		hr = factory->EnumAdapters(0, &adapter);
-		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate adapters"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-	}
-
-	// TODO: Make this configurable
-	hr = adapter->EnumOutputs(0, &output);
-	if (FAILED(hr))
-	{
-		// try using the first one
-		hr = adapter->EnumOutputs(0, &output);
-		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate outputs"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-	}
-
-	// get supported AA modes
-	aa_modes = EnumAAModes(adapter);
-	if (g_Config.iMultisampleMode >= (int)aa_modes.size())
-	{
-		g_Config.iMultisampleMode = 0;
-		UpdateActiveConfig();
-	}
-
-	DXGI_SWAP_CHAIN_DESC swap_chain_desc;
-	memset(&swap_chain_desc, 0, sizeof(swap_chain_desc));
-	swap_chain_desc.BufferCount = 1;
-	swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-	swap_chain_desc.OutputWindow = wnd;
-	swap_chain_desc.SampleDesc.Count = 1;
-	swap_chain_desc.SampleDesc.Quality = 0;
-	swap_chain_desc.Windowed = TRUE;
-
-	DXGI_MODE_DESC mode_desc;
-	memset(&mode_desc, 0, sizeof(mode_desc));
-	mode_desc.Width = xres;
-	mode_desc.Height = yres;
-	mode_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-	mode_desc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-	hr = output->FindClosestMatchingMode(&mode_desc, &swap_chain_desc.BufferDesc, NULL);
-	if (FAILED(hr)) MessageBox(wnd, _T("Failed to find a supported video mode"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-
-	// forcing buffer resolution to xres and yres.. TODO: The new video mode might not actually be supported!
-	swap_chain_desc.BufferDesc.Width = xres;
-	swap_chain_desc.BufferDesc.Height = yres;
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	// Creating debug devices can sometimes fail if the user doesn't have the correct
-	// version of the DirectX SDK. If it does, simply fallback to a non-debug device.
-	{
-		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
-											D3D11_CREATE_DEVICE_SINGLETHREADED | D3D11_CREATE_DEVICE_DEBUG,
-											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
-											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
-											&featlevel, &context);
-	}
-
-	if (FAILED(hr))
-#endif
-	{
-		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
-											D3D11_CREATE_DEVICE_SINGLETHREADED,
-											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
-											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
-											&featlevel, &context);
-	}
-
-	if (FAILED(hr))
-	{
-		MessageBox(wnd, _T("Failed to initialize Direct3D.\nMake sure your video card supports at least D3D 10.0"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-		SAFE_RELEASE(device);
-		SAFE_RELEASE(context);
-		SAFE_RELEASE(swapchain);
-		return E_FAIL;
-	}
-	SetDebugObjectName((ID3D11DeviceChild*)context, "device context");
-	SAFE_RELEASE(factory);
-	SAFE_RELEASE(output);
-	SAFE_RELEASE(adapter);
-
-	ID3D11Texture2D* buf;
-	hr = swapchain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&buf);
-	if (FAILED(hr))
-	{
-		MessageBox(wnd, _T("Failed to get swapchain buffer"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-		SAFE_RELEASE(device);
-		SAFE_RELEASE(context);
-		SAFE_RELEASE(swapchain);
-		return E_FAIL;
-	}
-	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
-	SAFE_RELEASE(buf);
-	CHECK(backbuf!=NULL, "Create back buffer texture");
-	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
-	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
-
-	context->OMSetRenderTargets(1, &backbuf->GetRTV(), NULL);
-
-	// BGRA textures are easier to deal with in TextureCache, but might not be supported by the hardware
-	UINT format_support;
-	device->CheckFormatSupport(DXGI_FORMAT_B8G8R8A8_UNORM, &format_support);
-	bgra_textures_supported = (format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
-
-	stateman = new StateManager;
-	return S_OK;
-}
-
-void Close()
-{
-	// release all bound resources
-	context->ClearState();
-	SAFE_RELEASE(backbuf);
-	SAFE_RELEASE(swapchain);
-	SAFE_DELETE(stateman);
-	context->Flush();  // immediately destroy device objects
-
-	SAFE_RELEASE(context);
-	ULONG references = device->Release();
-	if (references)
-	{
-		ERROR_LOG(VIDEO, "Unreleased references: %i.", references);
-	}
-	else
-	{
-		NOTICE_LOG(VIDEO, "Successfully released all device references!");
-	}
-	device = NULL;
-
-	// unload DLLs
-	UnloadD3DX();
-	UnloadD3D();
-	UnloadDXGI();
-}
-
-const char* VertexShaderVersionString()
-{
-	if(featlevel == D3D_FEATURE_LEVEL_11_0) return "vs_5_0";
-	else if(featlevel == D3D_FEATURE_LEVEL_10_1) return "vs_4_1";
-	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "vs_4_0";
-}
-
-const char* GeometryShaderVersionString()
-{
-	if(featlevel == D3D_FEATURE_LEVEL_11_0) return "gs_5_0";
-	else if(featlevel == D3D_FEATURE_LEVEL_10_1) return "gs_4_1";
-	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "gs_4_0";
-}
-
-const char* PixelShaderVersionString()
-{
-	if(featlevel == D3D_FEATURE_LEVEL_11_0) return "ps_5_0";
-	else if(featlevel == D3D_FEATURE_LEVEL_10_1) return "ps_4_1";
-	else /*if(featlevel == D3D_FEATURE_LEVEL_10_0)*/ return "ps_4_0";
-}
-
-D3DTexture2D* &GetBackBuffer() { return backbuf; }
-unsigned int GetBackBufferWidth() { return xres; }
-unsigned int GetBackBufferHeight() { return yres; }
-
-bool BGRATexturesSupported() { return bgra_textures_supported; }
-
-// Returns the maximum width/height of a texture. This value only depends upon the feature level in DX11
-unsigned int GetMaxTextureSize()
-{
-	switch (featlevel)
-	{
-		case D3D_FEATURE_LEVEL_11_0:
-			return D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
-
-		case D3D_FEATURE_LEVEL_10_1:
-		case D3D_FEATURE_LEVEL_10_0:
-			return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION;
-
-		case D3D_FEATURE_LEVEL_9_3:
-			return 4096;
-
-		case D3D_FEATURE_LEVEL_9_2:
-		case D3D_FEATURE_LEVEL_9_1:
-			return 2048;
-
-		default:
-			return 0;
-	}
-}
-
-void Reset()
-{
-	// release all back buffer references
-	SAFE_RELEASE(backbuf);
-
-	// resize swapchain buffers
-	RECT client;
-	GetClientRect(hWnd, &client);
-	xres = client.right - client.left;
-	yres = client.bottom - client.top;
-	D3D::swapchain->ResizeBuffers(1, xres, yres, DXGI_FORMAT_R8G8B8A8_UNORM, 0);
-
-	// recreate back buffer texture
-	ID3D11Texture2D* buf;
-	HRESULT hr = swapchain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&buf);
-	if (FAILED(hr))
-	{
-		MessageBox(hWnd, _T("Failed to get swapchain buffer"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
-		SAFE_RELEASE(device);
-		SAFE_RELEASE(context);
-		SAFE_RELEASE(swapchain);
-		return;
-	}
-	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
-	SAFE_RELEASE(buf);
-	CHECK(backbuf!=NULL, "Create back buffer texture");
-	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
-	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
-}
-
-bool BeginFrame()
-{
-	if (bFrameInProgress)
-	{
-		PanicAlert("BeginFrame called although a frame is already in progress");
-		return false;
-	}
-	bFrameInProgress = true;
-	return (device != NULL);
-}
-
-void EndFrame()
-{
-	if (!bFrameInProgress)
-	{
-		PanicAlert("EndFrame called although no frame is in progress");
-		return;
-	}
-	bFrameInProgress = false;
-}
-
-void Present()
-{
-	// TODO: Is 1 the correct value for vsyncing?
-	swapchain->Present((UINT)g_ActiveConfig.IsVSync(), 0);
-}
-
-}  // namespace D3D
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
deleted file mode 100644
index 03c1ed9d13..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <D3DX11.h>
-#include <D3Dcompiler.h>
-#include "Common.h"
-#include <vector>
-
-namespace DX11 
-{
-
-#define SAFE_RELEASE(x) { if (x) (x)->Release(); (x) = NULL; }
-#define SAFE_DELETE(x) { delete (x); (x) = NULL; }
-#define SAFE_DELETE_ARRAY(x) { delete[] (x); (x) = NULL; }
-#define CHECK(cond, Message, ...) if (!(cond)) { PanicAlert(__FUNCTION__ "Failed in %s at line %d: " Message, __FILE__, __LINE__, __VA_ARGS__); }
-
-class D3DTexture2D;
-
-namespace D3D
-{
-
-HRESULT LoadDXGI();
-HRESULT LoadD3D();
-HRESULT LoadD3DX();
-HRESULT LoadD3DCompiler();
-void UnloadDXGI();
-void UnloadD3D();
-void UnloadD3DX();
-void UnloadD3DCompiler();
-
-D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter);
-std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter);
-DXGI_SAMPLE_DESC GetAAMode(int index);
-
-HRESULT Create(HWND wnd);
-void Close();
-
-extern ID3D11Device* device;
-extern ID3D11DeviceContext* context;
-extern IDXGISwapChain* swapchain;
-extern bool bFrameInProgress;
-
-void Reset();
-bool BeginFrame();
-void EndFrame();
-void Present();
-
-unsigned int GetBackBufferWidth();
-unsigned int GetBackBufferHeight();
-D3DTexture2D* &GetBackBuffer();
-const char* PixelShaderVersionString();
-const char* GeometryShaderVersionString();
-const char* VertexShaderVersionString();
-bool BGRATexturesSupported();
-
-unsigned int GetMaxTextureSize();
-
-// Ihis function will assign a name to the given resource.
-// The DirectX debug layer will make it easier to identify resources that way,
-// e.g. when listing up all resources who have unreleased references.
-template <typename T>
-void SetDebugObjectName(T resource, const char* name)
-{
-	static_assert(std::is_convertible<T, ID3D11DeviceChild*>::value,
-		"resource must be convertible to ID3D11DeviceChild*");
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	resource->SetPrivateData(WKPDID_D3DDebugObjectName, (UINT)strlen(name), name);
-#endif
-}
-
-}  // namespace
-
-
-// Used to not require the SDK and runtime versions to match:
-// Linking with d3dx11.lib makes the most recent d3dx11_xx.dll of the
-// compiler's SDK a requirement, but this backend works with DX11 runtimes
-// back to August 2009 even if the backend was built with June 2010.
-// Add any d3dx11 functions which you want to use here and load them in Create()
-typedef HRESULT (WINAPI* D3DX11COMPILEFROMMEMORYTYPE)(LPCSTR, SIZE_T, LPCSTR, const D3D10_SHADER_MACRO*, LPD3D10INCLUDE, LPCSTR, LPCSTR, UINT, UINT, ID3DX11ThreadPump*, ID3D10Blob**, ID3D10Blob**, HRESULT*);
-typedef HRESULT (WINAPI* D3DX11FILTERTEXTURETYPE)(ID3D11DeviceContext*, ID3D11Resource*, UINT, UINT);
-typedef HRESULT (WINAPI* D3DX11SAVETEXTURETOFILEATYPE)(ID3D11DeviceContext*, ID3D11Resource*, D3DX11_IMAGE_FILE_FORMAT, LPCSTR);
-typedef HRESULT (WINAPI* D3DX11SAVETEXTURETOFILEWTYPE)(ID3D11DeviceContext*, ID3D11Resource*, D3DX11_IMAGE_FILE_FORMAT, LPCWSTR);
-
-extern D3DX11COMPILEFROMMEMORYTYPE PD3DX11CompileFromMemory;
-extern D3DX11FILTERTEXTURETYPE PD3DX11FilterTexture;
-extern D3DX11SAVETEXTURETOFILEATYPE PD3DX11SaveTextureToFileA;
-extern D3DX11SAVETEXTURETOFILEWTYPE PD3DX11SaveTextureToFileW;
-
-#ifdef UNICODE
-#define PD3DX11SaveTextureToFile PD3DX11SaveTextureToFileW
-#else
-#define PD3DX11SaveTextureToFile PD3DX11SaveTextureToFileA
-#endif
-
-typedef HRESULT (WINAPI* CREATEDXGIFACTORY)(REFIID, void**);
-extern CREATEDXGIFACTORY PCreateDXGIFactory;
-typedef HRESULT (WINAPI* D3D11CREATEDEVICE)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-extern D3D11CREATEDEVICE PD3D11CreateDevice;
-
-typedef HRESULT (WINAPI *D3DREFLECT)(LPCVOID, SIZE_T, REFIID, void**);
-extern D3DREFLECT PD3DReflect;
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
deleted file mode 100644
index b91907a1b3..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "CommonTypes.h"
-
-struct ID3D10Blob;
-
-namespace DX11
-{
-
-// use this class instead ID3D10Blob or ID3D11Blob whenever possible
-class D3DBlob
-{
-public:
-	// memory will be copied into an own buffer
-	D3DBlob(unsigned int blob_size, const u8* init_data = NULL);
-
-	// d3dblob will be AddRef'd
-	D3DBlob(ID3D10Blob* d3dblob);
-
-	void AddRef();
-	unsigned int Release();
-
-	unsigned int Size();
-	u8* Data();
-
-private:
-	~D3DBlob();
-
-	unsigned int ref;
-	unsigned int size;
-
-	u8* data;
-	ID3D10Blob* blob;
-};
-
-}  // namespace
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
deleted file mode 100644
index 602dcf9807..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <string>
-
-#include "VideoConfig.h"
-
-#include "D3DBase.h"
-#include "D3DShader.h"
-
-namespace DX11
-{
-
-namespace D3D
-{
-
-// bytecode->shader
-ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigned int len)
-{
-	ID3D11VertexShader* v_shader;
-	HRESULT hr = D3D::device->CreateVertexShader(bytecode, len, NULL, &v_shader);
-	if (FAILED(hr))
-		return NULL;
-
-	return v_shader;
-}
-
-// code->bytecode
-bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
-{
-	ID3D10Blob* shaderBuffer = NULL;
-	ID3D10Blob* errorBuffer = NULL;
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
-#else
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
-#endif
-	HRESULT hr = PD3DX11CompileFromMemory(code, len, NULL, NULL, NULL, "main", D3D::VertexShaderVersionString(),
-							flags, 0, NULL, &shaderBuffer, &errorBuffer, NULL);
-	
-	if (errorBuffer)
-	{
-		INFO_LOG(VIDEO, "Vertex shader compiler messages:\n%s\n",
-			(const char*)errorBuffer->GetBufferPointer());
-	}
-
-	if (FAILED(hr))
-	{
-		static int num_failures = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << code;
-		file.close();
-
-		PanicAlert("Failed to compile vertex shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
-						szTemp,
-						D3D::VertexShaderVersionString(),
-						(char*)errorBuffer->GetBufferPointer());
-
-		*blob = NULL;
-		errorBuffer->Release();
-	}
-	else
-	{
-		*blob = new D3DBlob(shaderBuffer);
-		shaderBuffer->Release();
-	}
-	return SUCCEEDED(hr);
-}
-
-// bytecode->shader
-ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, unsigned int len)
-{
-	ID3D11GeometryShader* g_shader;
-	HRESULT hr = D3D::device->CreateGeometryShader(bytecode, len, NULL, &g_shader);
-	if (FAILED(hr))
-		return NULL;
-
-	return g_shader;
-}
-
-// code->bytecode
-bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
-	const D3D_SHADER_MACRO* pDefines)
-{
-	ID3D10Blob* shaderBuffer = NULL;
-	ID3D10Blob* errorBuffer = NULL;
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
-#else
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
-#endif
-	HRESULT hr = PD3DX11CompileFromMemory(code, len, NULL, pDefines, NULL, "main", D3D::GeometryShaderVersionString(),
-							flags, 0, NULL, &shaderBuffer, &errorBuffer, NULL);
-	
-	if (errorBuffer)
-	{
-		INFO_LOG(VIDEO, "Geometry shader compiler messages:\n%s\n",
-			(const char*)errorBuffer->GetBufferPointer());
-	}
-
-	if (FAILED(hr))
-	{
-		static int num_failures = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_gs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << code;
-		file.close();
-
-		PanicAlert("Failed to compile geometry shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
-						szTemp,
-						D3D::GeometryShaderVersionString(),
-						(char*)errorBuffer->GetBufferPointer());
-
-		*blob = NULL;
-		errorBuffer->Release();
-	}
-	else
-	{
-		*blob = new D3DBlob(shaderBuffer);
-		shaderBuffer->Release();
-	}
-	return SUCCEEDED(hr);
-}
-
-// bytecode->shader
-ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned int len)
-{
-	ID3D11PixelShader* p_shader;
-	HRESULT hr = D3D::device->CreatePixelShader(bytecode, len, NULL, &p_shader);
-	if (FAILED(hr))
-	{
-		PanicAlert("CreatePixelShaderFromByteCode failed at %s %d\n", __FILE__, __LINE__);
-		p_shader = NULL;
-	}
-	return p_shader;
-}
-
-// code->bytecode
-bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
-	const D3D_SHADER_MACRO* pDefines)
-{
-	ID3D10Blob* shaderBuffer = NULL;
-	ID3D10Blob* errorBuffer = NULL;
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
-#else
-	UINT flags = D3D10_SHADER_OPTIMIZATION_LEVEL3;
-#endif
-	HRESULT hr = PD3DX11CompileFromMemory(code, len, NULL, pDefines, NULL, "main", D3D::PixelShaderVersionString(),
-							flags, 0, NULL, &shaderBuffer, &errorBuffer, NULL);
-	
-	if (errorBuffer)
-	{
-		INFO_LOG(VIDEO, "Pixel shader compiler messages:\n%s",
-			(const char*)errorBuffer->GetBufferPointer());
-	}
-
-	if (FAILED(hr))
-	{
-		static int num_failures = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_ps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << code;
-		file.close();
-
-		PanicAlert("Failed to compile pixel shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
-						szTemp,
-						D3D::PixelShaderVersionString(),
-						(char*)errorBuffer->GetBufferPointer());
-
-		*blob = NULL;
-		errorBuffer->Release();
-	}
-	else
-	{
-		*blob = new D3DBlob(shaderBuffer);
-		shaderBuffer->Release();
-	}
-
-	return SUCCEEDED(hr);
-}
-
-ID3D11VertexShader* CompileAndCreateVertexShader(const char* code,
-	unsigned int len)
-{
-	D3DBlob* blob = NULL;
-	if (CompileVertexShader(code, len, &blob))
-	{
-		ID3D11VertexShader* v_shader = CreateVertexShaderFromByteCode(blob);
-		blob->Release();
-		return v_shader;
-	}
-	return NULL;
-}
-
-ID3D11GeometryShader* CompileAndCreateGeometryShader(const char* code,
-	unsigned int len, const D3D_SHADER_MACRO* pDefines)
-{
-	D3DBlob* blob = NULL;
-	if (CompileGeometryShader(code, len, &blob, pDefines))
-	{
-		ID3D11GeometryShader* g_shader = CreateGeometryShaderFromByteCode(blob);
-		blob->Release();
-		return g_shader;
-	}
-	return NULL;
-}
-
-ID3D11PixelShader* CompileAndCreatePixelShader(const char* code,
-	unsigned int len)
-{
-	D3DBlob* blob = NULL;
-	CompilePixelShader(code, len, &blob);
-	if (blob)
-	{
-		ID3D11PixelShader* p_shader = CreatePixelShaderFromByteCode(blob);
-		blob->Release();
-		return p_shader;
-	}
-	return NULL;
-}
-
-}  // namespace
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
deleted file mode 100644
index 84fb03aad8..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "D3DBase.h"
-#include "D3DBlob.h"
-
-struct ID3D11PixelShader;
-struct ID3D11VertexShader;
-
-namespace DX11
-{
-
-namespace D3D
-{
-	ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigned int len);
-	ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, unsigned int len);
-	ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned int len);
-
-	// The returned bytecode buffers should be Release()d.
-	bool CompileVertexShader(const char* code, unsigned int len,
-		D3DBlob** blob);
-	bool CompileGeometryShader(const char* code, unsigned int len,
-		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = NULL);
-	bool CompilePixelShader(const char* code, unsigned int len,
-		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = NULL);
-
-	// Utility functions
-	ID3D11VertexShader* CompileAndCreateVertexShader(const char* code,
-		unsigned int len);
-	ID3D11GeometryShader* CompileAndCreateGeometryShader(const char* code,
-		unsigned int len, const D3D_SHADER_MACRO* pDefines = NULL);
-	ID3D11PixelShader* CompileAndCreatePixelShader(const char* code,
-		unsigned int len);
-
-	inline ID3D11VertexShader* CreateVertexShaderFromByteCode(D3DBlob* bytecode)
-	{ return CreateVertexShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
-	inline ID3D11GeometryShader* CreateGeometryShaderFromByteCode(D3DBlob* bytecode)
-	{ return CreateGeometryShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
-	inline ID3D11PixelShader* CreatePixelShaderFromByteCode(D3DBlob* bytecode)
-	{ return CreatePixelShaderFromByteCode(bytecode->Data(), bytecode->Size()); }
-
-	inline ID3D11VertexShader* CompileAndCreateVertexShader(D3DBlob* code)
-	{ return CompileAndCreateVertexShader((const char*)code->Data(), code->Size()); }
-	inline ID3D11GeometryShader* CompileAndCreateGeometryShader(D3DBlob* code, const D3D_SHADER_MACRO* pDefines = NULL)
-	{ return CompileAndCreateGeometryShader((const char*)code->Data(), code->Size(), pDefines); }
-	inline ID3D11PixelShader* CompileAndCreatePixelShader(D3DBlob* code)
-	{ return CompileAndCreatePixelShader((const char*)code->Data(), code->Size()); }
-}
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
deleted file mode 100644
index abf34b3cca..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "D3DTexture.h"
-
-namespace DX11
-{
-
-namespace D3D
-{
-
-void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage)
-{
-	if (usage == D3D11_USAGE_DYNAMIC || usage == D3D11_USAGE_STAGING)
-	{
-		D3D11_MAPPED_SUBRESOURCE map;
-		D3D::context->Map(pTexture, level, D3D11_MAP_WRITE_DISCARD, 0, &map);
-		if (4 * pitch == map.RowPitch)
-		{
-			memcpy(map.pData, buffer, map.RowPitch * height);
-		}
-		else
-		{
-			for (unsigned int y = 0; y < height; ++y)
-				memcpy((u8*)map.pData + y * map.RowPitch, (u32*)buffer + y * pitch, 4 * pitch);
-		}
-		D3D::context->Unmap(pTexture, level);
-	}
-	else
-	{
-		D3D11_BOX dest_region = CD3D11_BOX(0, 0, 0, width, height, 1);
-		D3D::context->UpdateSubresource(pTexture, level, &dest_region, buffer, 4*pitch, 4*pitch*height);
-	}
-}
-
-}  // namespace
-
-D3DTexture2D* D3DTexture2D::Create(unsigned int width, unsigned int height, D3D11_BIND_FLAG bind, D3D11_USAGE usage, DXGI_FORMAT fmt, unsigned int levels)
-{
-	ID3D11Texture2D* pTexture = NULL;
-	HRESULT hr;
-
-	D3D11_CPU_ACCESS_FLAG cpuflags;
-	if (usage == D3D11_USAGE_STAGING) cpuflags = (D3D11_CPU_ACCESS_FLAG)((int)D3D11_CPU_ACCESS_WRITE|(int)D3D11_CPU_ACCESS_READ);
-	else if (usage == D3D11_USAGE_DYNAMIC) cpuflags = D3D11_CPU_ACCESS_WRITE;
-	else cpuflags = (D3D11_CPU_ACCESS_FLAG)0;
-	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(fmt, width, height, 1, levels, bind, usage, cpuflags);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &pTexture);
-	if (FAILED(hr))
-	{
-		PanicAlert("Failed to create texture at %s, line %d: hr=%#x\n", __FILE__, __LINE__, hr);
-		return NULL;
-	}
-
-	D3DTexture2D* ret = new D3DTexture2D(pTexture, bind);
-	SAFE_RELEASE(pTexture);
-	return ret;
-}
-
-void D3DTexture2D::AddRef()
-{
-	++ref;
-}
-
-UINT D3DTexture2D::Release()
-{
-	--ref;
-	if (ref == 0)
-	{
-		delete this;
-		return 0;
-	}
-	return ref;
-}
-
-ID3D11Texture2D* &D3DTexture2D::GetTex() { return tex; }
-ID3D11ShaderResourceView* &D3DTexture2D::GetSRV() { return srv; }
-ID3D11RenderTargetView* &D3DTexture2D::GetRTV() { return rtv; }
-ID3D11DepthStencilView* &D3DTexture2D::GetDSV() { return dsv; }
-
-D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind,
-							DXGI_FORMAT srv_format, DXGI_FORMAT dsv_format, DXGI_FORMAT rtv_format, bool multisampled)
-							: ref(1), tex(texptr), srv(NULL), rtv(NULL), dsv(NULL)
-{
-	D3D11_SRV_DIMENSION srv_dim = multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMS : D3D11_SRV_DIMENSION_TEXTURE2D;
-	D3D11_DSV_DIMENSION dsv_dim = multisampled ? D3D11_DSV_DIMENSION_TEXTURE2DMS : D3D11_DSV_DIMENSION_TEXTURE2D;
-	D3D11_RTV_DIMENSION rtv_dim = multisampled ? D3D11_RTV_DIMENSION_TEXTURE2DMS : D3D11_RTV_DIMENSION_TEXTURE2D;
-	D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = CD3D11_SHADER_RESOURCE_VIEW_DESC(srv_dim, srv_format);
-	D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc = CD3D11_DEPTH_STENCIL_VIEW_DESC(dsv_dim, dsv_format);
-	D3D11_RENDER_TARGET_VIEW_DESC rtv_desc = CD3D11_RENDER_TARGET_VIEW_DESC(rtv_dim, rtv_format);
-	if (bind & D3D11_BIND_SHADER_RESOURCE) D3D::device->CreateShaderResourceView(tex, &srv_desc, &srv);
-	if (bind & D3D11_BIND_RENDER_TARGET) D3D::device->CreateRenderTargetView(tex, &rtv_desc, &rtv);
-	if (bind & D3D11_BIND_DEPTH_STENCIL) D3D::device->CreateDepthStencilView(tex, &dsv_desc, &dsv);
-	tex->AddRef();
-}
-
-D3DTexture2D::~D3DTexture2D()
-{
-	SAFE_RELEASE(srv);
-	SAFE_RELEASE(rtv);
-	SAFE_RELEASE(dsv);
-	SAFE_RELEASE(tex);
-}
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
deleted file mode 100644
index 5c2aa57f4a..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <d3d11.h>
-
-namespace DX11
-{
-
-namespace D3D
-{
-	void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage);
-}
-
-class D3DTexture2D
-{
-public:
-	// there are two ways to create a D3DTexture2D object:
-	//     either create an ID3D11Texture2D object, pass it to the constructor and specify what views to create
-	//     or let the texture automatically be created by D3DTexture2D::Create
-
-	D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind, DXGI_FORMAT srv_format = DXGI_FORMAT_UNKNOWN, DXGI_FORMAT dsv_format = DXGI_FORMAT_UNKNOWN, DXGI_FORMAT rtv_format = DXGI_FORMAT_UNKNOWN, bool multisampled = false);
-	static D3DTexture2D* Create(unsigned int width, unsigned int height, D3D11_BIND_FLAG bind, D3D11_USAGE usage, DXGI_FORMAT, unsigned int levels = 1);
-
-	// reference counting, use AddRef() when creating a new reference and Release() it when you don't need it anymore
-	void AddRef();
-	UINT Release();
-
-	ID3D11Texture2D* &GetTex();
-	ID3D11ShaderResourceView* &GetSRV();
-	ID3D11RenderTargetView* &GetRTV();
-	ID3D11DepthStencilView* &GetDSV();
-
-private:
-	~D3DTexture2D();
-
-	ID3D11Texture2D* tex;
-	ID3D11ShaderResourceView* srv;
-	ID3D11RenderTargetView* rtv;
-	ID3D11DepthStencilView* dsv;
-	D3D11_BIND_FLAG bindflags;
-	UINT ref;
-};
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
deleted file mode 100644
index 687198b6a3..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <list>
-
-#include "D3DBase.h"
-#include "D3DUtil.h"
-#include "PixelShaderCache.h"
-#include "VertexShaderCache.h"
-#include "D3DShader.h"
-#include "GfxState.h"
-
-namespace DX11
-{
-
-namespace D3D
-{
-
-// Ring buffer class, shared between the draw* functions
-class UtilVertexBuffer
-{
-public:
-	UtilVertexBuffer(int size) : buf(NULL), offset(0), max_size(size)
-	{
-		D3D11_BUFFER_DESC desc = CD3D11_BUFFER_DESC(max_size, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-		device->CreateBuffer(&desc, NULL, &buf);
-	}
-	~UtilVertexBuffer()
-	{
-		buf->Release();
-	}
-
-	// returns vertex offset to the new data
-	int AppendData(void* data, int size, int vertex_size)
-	{
-		D3D11_MAPPED_SUBRESOURCE map;
-		if(offset + size >= max_size)
-		{
-			// wrap buffer around and notify observers
-			offset = 0;
-			context->Map(buf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-
-			for(std::list<bool*>::iterator it = observers.begin(); it != observers.end(); ++it)
-				**it = true;
-		}
-		else
-		{
-			context->Map(buf, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map);
-		}
-		offset = ((offset+vertex_size-1)/vertex_size)*vertex_size; // align offset to vertex_size bytes
-		memcpy((u8*)map.pData + offset, data, size);
-		context->Unmap(buf, 0);
-
-		offset += size;
-		return (offset - size) / vertex_size;
-	}
-
-	void AddWrapObserver(bool* observer)
-	{
-		observers.push_back(observer);
-	}
-
-	inline ID3D11Buffer* &GetBuffer() { return buf; }
-
-private:
-	ID3D11Buffer* buf;
-	int offset;
-	int max_size;
-
-	std::list<bool*> observers;
-};
-
-CD3DFont font;
-UtilVertexBuffer* util_vbuf = NULL;
-
-#define MAX_NUM_VERTICES 50*6
-struct FONT2DVERTEX {
-	float x,y,z;
-	float col[4];
-	float tu, tv;
-};
-
-inline FONT2DVERTEX InitFont2DVertex(float x, float y, u32 color, float tu, float tv)
-{
-	FONT2DVERTEX v;   v.x=x; v.y=y; v.z=0;  v.tu = tu; v.tv = tv;
-	v.col[0] = ((float)((color >> 16) & 0xFF)) / 255.f;
-	v.col[1] = ((float)((color >>  8) & 0xFF)) / 255.f;
-	v.col[2] = ((float)((color >>  0) & 0xFF)) / 255.f;
-	v.col[3] = ((float)((color >> 24) & 0xFF)) / 255.f;
-	return v;
-}
-
-CD3DFont::CD3DFont() : m_dwTexWidth(512), m_dwTexHeight(512)
-{
-	m_pTexture    = NULL;
-	m_pVB         = NULL;
-	m_InputLayout = NULL;
-	m_pshader     = NULL;
-	m_vshader     = NULL;
-}
-
-const char fontpixshader[] = {
-	"Texture2D tex2D;\n"
-	"SamplerState linearSampler\n"
-	"{\n"
-	"	Filter = MIN_MAG_MIP_LINEAR;\n"
-	"	AddressU = D3D11_TEXTURE_ADDRESS_BORDER;\n"
-	"	AddressV = D3D11_TEXTURE_ADDRESS_BORDER;\n"
-	"	BorderColor = float4(0.f, 0.f, 0.f, 0.f);\n"
-	"};\n"
-	"struct PS_INPUT\n"
-	"{\n"
-	"	float4 pos : SV_POSITION;\n"
-	"	float4 col : COLOR;\n"
-	"	float2 tex : TEXCOORD;\n"
-	"};\n"
-	"float4 main( PS_INPUT input ) : SV_Target\n"
-	"{\n"
-	"	return tex2D.Sample( linearSampler, input.tex ) * input.col;\n"
-	"};\n"
-};
-
-const char fontvertshader[] = {
-	"struct VS_INPUT\n"
-	"{\n"
-	"	float4 pos : POSITION;\n"
-	"	float4 col : COLOR;\n"
-	"	float2 tex : TEXCOORD;\n"
-	"};\n"
-	"struct PS_INPUT\n"
-	"{\n"
-	"	float4 pos : SV_POSITION;\n"
-	"	float4 col : COLOR;\n"
-	"	float2 tex : TEXCOORD;\n"
-	"};\n"
-	"PS_INPUT main( VS_INPUT input )\n"
-	"{\n"
-	"	PS_INPUT output;\n"
-	"	output.pos = input.pos;\n"
-	"	output.col = input.col;\n"
-	"	output.tex = input.tex;\n"
-	"	return output;\n"
-	"};\n"
-};
-
-int CD3DFont::Init()
-{
-	// Create vertex buffer for the letters
-	HRESULT hr;
-
-	// Prepare to create a bitmap
-	unsigned int* pBitmapBits;
-	BITMAPINFO bmi;
-	ZeroMemory(&bmi.bmiHeader, sizeof(BITMAPINFOHEADER));
-	bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
-	bmi.bmiHeader.biWidth       =  (int)m_dwTexWidth;
-	bmi.bmiHeader.biHeight      = -(int)m_dwTexHeight;
-	bmi.bmiHeader.biPlanes      = 1;
-	bmi.bmiHeader.biCompression = BI_RGB;
-	bmi.bmiHeader.biBitCount    = 32;
-
-	// Create a DC and a bitmap for the font
-	HDC hDC = CreateCompatibleDC(NULL);
-	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, NULL, 0);
-	SetMapMode(hDC, MM_TEXT);
-
-	// create a GDI font
-	HFONT hFont = CreateFont(24, 0, 0, 0, FW_NORMAL, FALSE,
-							FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
-							CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
-							VARIABLE_PITCH, _T("Tahoma"));
-	if (NULL == hFont) return E_FAIL;
-
-	HGDIOBJ hOldbmBitmap = SelectObject(hDC, hbmBitmap);
-	HGDIOBJ hOldFont = SelectObject(hDC, hFont);
-
-	// Set text properties
-	SetTextColor(hDC, 0xFFFFFF);
-	SetBkColor  (hDC, 0);
-	SetTextAlign(hDC, TA_TOP);
-
-	TEXTMETRICW tm;
-	GetTextMetricsW(hDC, &tm);
-	m_LineHeight = tm.tmHeight;
-
-	// Loop through all printable characters and output them to the bitmap
-	// Meanwhile, keep track of the corresponding tex coords for each character.
-	int x = 0, y = 0;
-	char str[2] = "\0";
-	for (int c = 0; c < 127 - 32; c++)
-	{
-		str[0] = c + 32;
-		SIZE size;
-		GetTextExtentPoint32A(hDC, str, 1, &size);
-		if ((int)(x+size.cx+1) > m_dwTexWidth)
-		{
-			x  = 0;
-			y += m_LineHeight;
-		}
-
-		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, NULL, str, 1, NULL);
-		m_fTexCoords[c][0] = ((float)(x+0))/m_dwTexWidth;
-		m_fTexCoords[c][1] = ((float)(y+0))/m_dwTexHeight;
-		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
-		m_fTexCoords[c][3] = ((float)(y+0+size.cy))/m_dwTexHeight;
-
-		x += size.cx + 3;  // 3 to work around annoying ij conflict (part of the j ends up with the i)
-	}
-
-	// Create a new texture for the font
-	// possible optimization: store the converted data in a buffer and fill the texture on creation.
-	//							That way, we can use a static texture
-	ID3D11Texture2D* buftex;
-	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_dwTexWidth, m_dwTexHeight,
-										1, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DYNAMIC,
-										D3D11_CPU_ACCESS_WRITE);
-	hr = device->CreateTexture2D(&texdesc, NULL, &buftex);
-	if (FAILED(hr))
-	{
-		PanicAlert("Failed to create font texture");
-		return hr;
-	}
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)buftex, "texture of a CD3DFont object");
-
-	// Lock the surface and write the alpha values for the set pixels
-	D3D11_MAPPED_SUBRESOURCE texmap;
-	hr = context->Map(buftex, 0, D3D11_MAP_WRITE_DISCARD, 0, &texmap);
-	if (FAILED(hr)) PanicAlert("Failed to map a texture at %s %d\n", __FILE__, __LINE__);
-
-	for (y = 0; y < m_dwTexHeight; y++)
-	{
-		u32* pDst32 = (u32*)((u8*)texmap.pData + y * texmap.RowPitch);
-		for (x = 0; x < m_dwTexWidth; x++)
-		{
-			const u8 bAlpha = (pBitmapBits[m_dwTexWidth * y + x] & 0xff);
-			*pDst32++ = (((bAlpha << 4) | bAlpha) << 24) | 0xFFFFFF;
-		}
-	}
-
-	// Done updating texture, so clean up used objects
-	context->Unmap(buftex, 0);
-	hr = D3D::device->CreateShaderResourceView(buftex, NULL, &m_pTexture);
-	if (FAILED(hr)) PanicAlert("Failed to create shader resource view at %s %d\n", __FILE__, __LINE__);
-	SAFE_RELEASE(buftex);
-
-	SelectObject(hDC, hOldbmBitmap);
-	DeleteObject(hbmBitmap);
-
-	SelectObject(hDC, hOldFont);
-	DeleteObject(hFont);
-
-	// setup device objects for drawing
-	m_pshader = D3D::CompileAndCreatePixelShader(fontpixshader, sizeof(fontpixshader));
-	if (m_pshader == NULL) PanicAlert("Failed to create pixel shader, %s %d\n", __FILE__, __LINE__);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_pshader, "pixel shader of a CD3DFont object");
-
-	D3DBlob* vsbytecode;
-	D3D::CompileVertexShader(fontvertshader, sizeof(fontvertshader), &vsbytecode);
-	if (vsbytecode == NULL) PanicAlert("Failed to compile vertex shader, %s %d\n", __FILE__, __LINE__);
-	m_vshader = D3D::CreateVertexShaderFromByteCode(vsbytecode);
-	if (m_vshader == NULL) PanicAlert("Failed to create vertex shader, %s %d\n", __FILE__, __LINE__);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vshader, "vertex shader of a CD3DFont object");
-
-	const D3D11_INPUT_ELEMENT_DESC desc[] =
-	{
-		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "COLOR",    0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	};
-	hr = D3D::device->CreateInputLayout(desc, 3, vsbytecode->Data(), vsbytecode->Size(), &m_InputLayout);
-	if (FAILED(hr)) PanicAlert("Failed to create input layout, %s %d\n", __FILE__, __LINE__);
-	SAFE_RELEASE(vsbytecode);
-
-	D3D11_BLEND_DESC blenddesc;
-	blenddesc.AlphaToCoverageEnable = FALSE;
-	blenddesc.IndependentBlendEnable = FALSE;
-	blenddesc.RenderTarget[0].BlendEnable = TRUE;
-	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-	blenddesc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-	blenddesc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
-	blenddesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-	blenddesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-	blenddesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-	blenddesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-	hr = D3D::device->CreateBlendState(&blenddesc, &m_blendstate);
-	CHECK(hr==S_OK, "Create font blend state");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_blendstate, "blend state of a CD3DFont object");
-
-	D3D11_RASTERIZER_DESC rastdesc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, D3D11_CULL_NONE, false, 0, 0.f, 0.f, false, false, false, false);
-	hr = D3D::device->CreateRasterizerState(&rastdesc, &m_raststate);
-	CHECK(hr==S_OK, "Create font rasterizer state");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_raststate, "rasterizer state of a CD3DFont object");
-
-	D3D11_BUFFER_DESC vbdesc = CD3D11_BUFFER_DESC(MAX_NUM_VERTICES*sizeof(FONT2DVERTEX), D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-	if (FAILED(hr = device->CreateBuffer(&vbdesc, NULL, &m_pVB)))
-	{
-		PanicAlert("Failed to create font vertex buffer at %s, line %d\n", __FILE__, __LINE__);
-		return hr;
-	}
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_pVB, "vertex buffer of a CD3DFont object");
-	return S_OK;
-}
-
-int CD3DFont::Shutdown()
-{
-	SAFE_RELEASE(m_pVB);
-	SAFE_RELEASE(m_pTexture);
-	SAFE_RELEASE(m_InputLayout);
-	SAFE_RELEASE(m_pshader);
-	SAFE_RELEASE(m_vshader);
-
-	SAFE_RELEASE(m_blendstate);
-	SAFE_RELEASE(m_raststate);
-
-	return S_OK;
-}
-
-int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dwColor, const char* strText)
-{
-	if (!m_pVB)
-		return 0;
-
-	UINT stride = sizeof(FONT2DVERTEX);
-	UINT bufoffset = 0;
-
-	float scalex = 1 / (float)D3D::GetBackBufferWidth() * 2.f;
-	float scaley = 1 / (float)D3D::GetBackBufferHeight() * 2.f;
-	float sizeratio = size / (float)m_LineHeight;
-
-	// translate starting positions
-	float sx = x * scalex - 1.f;
-	float sy = 1.f - y * scaley;
-	char c;
-
-	// Fill vertex buffer
-	FONT2DVERTEX* pVertices;
-	int dwNumTriangles = 0L;
-
-	D3D11_MAPPED_SUBRESOURCE vbmap;
-	HRESULT hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vbmap);
-	if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__);
-	pVertices = (D3D::FONT2DVERTEX*)vbmap.pData;
-
-	// set general pipeline state
-	D3D::stateman->PushBlendState(m_blendstate);
-	D3D::stateman->PushRasterizerState(m_raststate);
-	D3D::stateman->Apply();
-
-	D3D::context->PSSetShader(m_pshader, NULL, 0);
-	D3D::context->VSSetShader(m_vshader, NULL, 0);
-
-	D3D::context->IASetInputLayout(m_InputLayout);
-	D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-	D3D::context->PSSetShaderResources(0, 1, &m_pTexture);
-
-	float fStartX = sx;
-	while (c = *strText++)
-	{
-		if (c == ('\n'))
-		{
-			sx  = fStartX;
-			sy -= scaley * size;
-		}
-		if (c < (' '))
-			continue;
-
-		c -= 32;
-		float tx1 = m_fTexCoords[c][0];
-		float ty1 = m_fTexCoords[c][1];
-		float tx2 = m_fTexCoords[c][2];
-		float ty2 = m_fTexCoords[c][3];
-
-		float w = (float)(tx2-tx1) * m_dwTexWidth * scalex * sizeratio;
-		float h = (float)(ty1-ty2) * m_dwTexHeight * scaley * sizeratio;
-
-		FONT2DVERTEX v[6];
-		v[0] = InitFont2DVertex(sx,   sy+h, dwColor, tx1, ty2);
-		v[1] = InitFont2DVertex(sx,   sy,   dwColor, tx1, ty1);
-		v[2] = InitFont2DVertex(sx+w, sy+h, dwColor, tx2, ty2);
-		v[3] = InitFont2DVertex(sx+w, sy,   dwColor, tx2, ty1);
-		v[4] = v[2];
-		v[5] = v[1];
-
-		memcpy(pVertices, v, 6*sizeof(FONT2DVERTEX));
-
-		pVertices+=6;
-		dwNumTriangles += 2;
-
-		if (dwNumTriangles * 3 > (MAX_NUM_VERTICES - 6))
-		{
-			context->Unmap(m_pVB, 0);
-
-			D3D::context->IASetVertexBuffers(0, 1, &m_pVB, &stride, &bufoffset);
-			D3D::context->Draw(3 * dwNumTriangles, 0);
-
-			dwNumTriangles = 0;
-			D3D11_MAPPED_SUBRESOURCE vbmap;
-			hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vbmap);
-			if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__);
-			pVertices = (D3D::FONT2DVERTEX*)vbmap.pData;
-		}
-		sx += w + spacing * scalex * size;
-	}
-
-	// Unlock and render the vertex buffer
-	context->Unmap(m_pVB, 0);
-	if (dwNumTriangles > 0)
-	{
-		D3D::context->IASetVertexBuffers(0, 1, &m_pVB, &stride, &bufoffset);
-		D3D::context->Draw(3 * dwNumTriangles, 0);
-	}
-	D3D::stateman->PopBlendState();
-	D3D::stateman->PopRasterizerState();
-	return S_OK;
-}
-
-ID3D11SamplerState* linear_copy_sampler = NULL;
-ID3D11SamplerState* point_copy_sampler = NULL;
-
-typedef struct { float x,y,z,u,v,w; } STQVertex;
-typedef struct { float x,y,z,u,v,w; } STSQVertex;
-typedef struct { float x,y,z; u32 col; } ClearVertex;
-typedef struct { float x,y,z; u32 col; } ColVertex;
-
-struct
-{
-	float u1, v1, u2, v2, G;
-} tex_quad_data;
-
-struct
-{
-	MathUtil::Rectangle<float> rdest;
-	float u1, v1, u2, v2, G;
-} tex_sub_quad_data;
-
-struct
-{
-	float x1, y1, x2, y2;
-	u32 col;
-} draw_quad_data;
-
-struct
-{
-	u32 col;
-	float z;
-} clear_quad_data;
-
-// ring buffer offsets
-int stq_offset, stsq_offset, cq_offset, clearq_offset;
-
-// observer variables for ring buffer wraps
-bool stq_observer, stsq_observer, cq_observer, clearq_observer;
-
-void InitUtils()
-{
-	util_vbuf = new UtilVertexBuffer(0x4000);
-
-	float border[4] = { 0.f, 0.f, 0.f, 0.f };
-	D3D11_SAMPLER_DESC samDesc = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_POINT, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, 0.f, 1, D3D11_COMPARISON_ALWAYS, border, 0.f, 0.f);
-	HRESULT hr = D3D::device->CreateSamplerState(&samDesc, &point_copy_sampler);
-	if (FAILED(hr)) PanicAlert("Failed to create sampler state at %s %d\n", __FILE__, __LINE__);
-	else SetDebugObjectName((ID3D11DeviceChild*)point_copy_sampler, "point copy sampler state");
-
-	samDesc = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_LINEAR, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, D3D11_TEXTURE_ADDRESS_BORDER, 0.f, 1, D3D11_COMPARISON_ALWAYS, border, 0.f, 0.f);
-	hr = D3D::device->CreateSamplerState(&samDesc, &linear_copy_sampler);
-	if (FAILED(hr)) PanicAlert("Failed to create sampler state at %s %d\n", __FILE__, __LINE__);
-	else SetDebugObjectName((ID3D11DeviceChild*)linear_copy_sampler, "linear copy sampler state");
-
-	// cached data used to avoid unnecessarily reloading the vertex buffers
-	memset(&tex_quad_data, 0, sizeof(tex_quad_data));
-	memset(&tex_sub_quad_data, 0, sizeof(tex_sub_quad_data));
-	memset(&draw_quad_data, 0, sizeof(draw_quad_data));
-	memset(&clear_quad_data, 0, sizeof(clear_quad_data));
-
-	// make sure to properly load the vertex data whenever the corresponding functions get called the first time
-	stq_observer = stsq_observer = cq_observer = clearq_observer = true;
-	util_vbuf->AddWrapObserver(&stq_observer);
-	util_vbuf->AddWrapObserver(&stsq_observer);
-	util_vbuf->AddWrapObserver(&cq_observer);
-	util_vbuf->AddWrapObserver(&clearq_observer);
-
-	font.Init();
-}
-
-void ShutdownUtils()
-{
-	font.Shutdown();
-	SAFE_RELEASE(point_copy_sampler);
-	SAFE_RELEASE(linear_copy_sampler);
-	SAFE_DELETE(util_vbuf);
-}
-
-void SetPointCopySampler()
-{
-	D3D::context->PSSetSamplers(0, 1, &point_copy_sampler);
-}
-
-void SetLinearCopySampler()
-{
-	D3D::context->PSSetSamplers(0, 1, &linear_copy_sampler);
-}
-
-void drawShadedTexQuad(ID3D11ShaderResourceView* texture,
-						const D3D11_RECT* rSource,
-						int SourceWidth,
-						int SourceHeight,
-						ID3D11PixelShader* PShader,
-						ID3D11VertexShader* Vshader,
-						ID3D11InputLayout* layout,
-						float Gamma)
-{
-	float sw = 1.0f /(float) SourceWidth;
-	float sh = 1.0f /(float) SourceHeight;
-	float u1 = ((float)rSource->left) * sw;
-	float u2 = ((float)rSource->right) * sw;
-	float v1 = ((float)rSource->top) * sh;
-	float v2 = ((float)rSource->bottom) * sh;
-	float G = 1.0f / Gamma;
-
-	STQVertex coords[4] = {
-		{-1.0f, 1.0f, 0.0f,  u1, v1, G},
-		{ 1.0f, 1.0f, 0.0f,  u2, v1, G},
-		{-1.0f,-1.0f, 0.0f,  u1, v2, G},
-		{ 1.0f,-1.0f, 0.0f,  u2, v2, G},
-	};
-
-	// only upload the data to VRAM if it changed
-	if (stq_observer ||
-		tex_quad_data.u1 != u1 || tex_quad_data.v1 != v1 ||
-		tex_quad_data.u2 != u2 || tex_quad_data.v2 != v2 || tex_quad_data.G != G)
-	{
-		stq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(STQVertex));
-		stq_observer = false;
-
-		tex_quad_data.u1 = u1;
-		tex_quad_data.v1 = v1;
-		tex_quad_data.u2 = u2;
-		tex_quad_data.v2 = v2;
-		tex_quad_data.G  =  G;
-	}
-	UINT stride = sizeof(STQVertex);
-	UINT offset = 0;
-
-	D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	D3D::context->IASetInputLayout(layout);
-	D3D::context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
-	D3D::context->PSSetShader(PShader, NULL, 0);
-	D3D::context->PSSetShaderResources(0, 1, &texture);
-	D3D::context->VSSetShader(Vshader, NULL, 0);
-	D3D::stateman->Apply();
-	D3D::context->Draw(4, stq_offset);
-
-	ID3D11ShaderResourceView* texres = NULL;
-	context->PSSetShaderResources(0, 1, &texres); // immediately unbind the texture
-}
-
-void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture,
-							const MathUtil::Rectangle<float>* rSource,
-							int SourceWidth,
-							int SourceHeight,
-							const MathUtil::Rectangle<float>* rDest,
-							ID3D11PixelShader* PShader,
-							ID3D11VertexShader* Vshader,
-							ID3D11InputLayout* layout,
-							float Gamma)
-{
-	float sw = 1.0f /(float) SourceWidth;
-	float sh = 1.0f /(float) SourceHeight;
-	float u1 = (rSource->left  ) * sw;
-	float u2 = (rSource->right ) * sw;
-	float v1 = (rSource->top   ) * sh;
-	float v2 = (rSource->bottom) * sh;
-	float G = 1.0f / Gamma;
-
-	STSQVertex coords[4] = {
-		{ rDest->left , rDest->bottom, 0.0f, u1, v2, G},
-		{ rDest->right, rDest->bottom, 0.0f, u2, v2, G},
-		{ rDest->left , rDest->top   , 0.0f, u1, v1, G},
-		{ rDest->right, rDest->top   , 0.0f, u2, v1, G},
-	};
-
-	// only upload the data to VRAM if it changed
-	if (stsq_observer ||
-		memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(*rDest)) != 0 ||
-		tex_sub_quad_data.u1 != u1 || tex_sub_quad_data.v1 != v1 ||
-		tex_sub_quad_data.u2 != u2 || tex_sub_quad_data.v2 != v2 || tex_sub_quad_data.G != G)
-	{
-		stsq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(STSQVertex));
-		stsq_observer = false;
-
-		tex_sub_quad_data.u1 = u1;
-		tex_sub_quad_data.v1 = v1;
-		tex_sub_quad_data.u2 = u2;
-		tex_sub_quad_data.v2 = v2;
-		tex_sub_quad_data.G  = G;
-		memcpy(&tex_sub_quad_data.rdest, &rDest, sizeof(rDest));
-	}
-	UINT stride = sizeof(STSQVertex);
-	UINT offset = 0;
-
-	context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
-	context->IASetInputLayout(layout);
-	context->PSSetShaderResources(0, 1, &texture);
-	context->PSSetShader(PShader, NULL, 0);
-	context->VSSetShader(Vshader, NULL, 0);
-	stateman->Apply();
-	context->Draw(4, stsq_offset);
-
-	ID3D11ShaderResourceView* texres = NULL;
-	context->PSSetShaderResources(0, 1, &texres); // immediately unbind the texture
-}
-
-// Fills a certain area of the current render target with the specified color
-// destination coordinates normalized to (-1;1)
-void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2)
-{
-	ColVertex coords[4] = {
-		{ x1, y2, 0.f, Color },
-		{ x2, y2, 0.f, Color },
-		{ x1, y1, 0.f, Color },
-		{ x2, y1, 0.f, Color },
-	};
-
-	if(cq_observer ||
-		draw_quad_data.x1 != x1 || draw_quad_data.y1 != y1 ||
-		draw_quad_data.x2 != x2 || draw_quad_data.y2 != y2 ||
-		draw_quad_data.col != Color)
-	{
-		cq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(ColVertex));
-		cq_observer = false;
-
-		draw_quad_data.x1 = x1;
-		draw_quad_data.y1 = y1;
-		draw_quad_data.x2 = x2;
-		draw_quad_data.y2 = y2;
-		draw_quad_data.col = Color;
-	}
-
-	context->VSSetShader(VertexShaderCache::GetClearVertexShader(), NULL, 0);
-	context->PSSetShader(PixelShaderCache::GetClearProgram(), NULL, 0);
-	context->IASetInputLayout(VertexShaderCache::GetClearInputLayout());
-
-	UINT stride = sizeof(ColVertex);
-	UINT offset = 0;
-	context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
-
-	stateman->Apply();
-	context->Draw(4, cq_offset);
-}
-
-void drawClearQuad(u32 Color, float z, ID3D11PixelShader* PShader, ID3D11VertexShader* Vshader, ID3D11InputLayout* layout)
-{
-	ClearVertex coords[4] = {
-		{-1.0f,  1.0f, z, Color},
-		{ 1.0f,  1.0f, z, Color},
-		{-1.0f, -1.0f, z, Color},
-		{ 1.0f, -1.0f, z, Color},
-	};
-
-	if (clearq_observer || clear_quad_data.col != Color || clear_quad_data.z != z)
-	{
-		clearq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(ClearVertex));
-		clearq_observer = false;
-
-		clear_quad_data.col = Color;
-		clear_quad_data.z = z;
-	}
-	context->VSSetShader(Vshader, NULL, 0);
-	context->PSSetShader(PShader, NULL, 0);
-	context->IASetInputLayout(layout);
-
-	UINT stride = sizeof(ClearVertex);
-	UINT offset = 0;
-	context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-	context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
-	stateman->Apply();
-	context->Draw(4, clearq_offset);
-}
-
-}  // namespace D3D
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
deleted file mode 100644
index 6e47854164..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma	once
-
-#include <d3d11.h>
-#include <MathUtil.h>
-
-namespace DX11
-{
-
-namespace D3D
-{
-	// Font creation flags
-	#define D3DFONT_BOLD        0x0001
-	#define D3DFONT_ITALIC      0x0002
-
-	// Font rendering flags
-	#define D3DFONT_CENTERED    0x0001
-
-	class CD3DFont
-	{
-		ID3D11ShaderResourceView* m_pTexture;
-		ID3D11Buffer* m_pVB;
-		ID3D11InputLayout* m_InputLayout;
-		ID3D11PixelShader* m_pshader;
-		ID3D11VertexShader* m_vshader;
-		ID3D11BlendState* m_blendstate;
-		ID3D11RasterizerState* m_raststate;
-		const int m_dwTexWidth;
-		const int m_dwTexHeight;
-		unsigned int m_LineHeight;
-		float m_fTexCoords[128-32][4];
-
-	public:
-		CD3DFont();
-		// 2D text drawing function
-		// Initializing and destroying device-dependent objects
-		int Init();
-		int Shutdown();
-		int DrawTextScaled(float x, float y,
-							float size,
-							float spacing, u32 dwColor,
-							const char* strText);
-	};
-
-	extern CD3DFont font;
-
-	void InitUtils();
-	void ShutdownUtils();
-
-	void SetPointCopySampler();
-	void SetLinearCopySampler();
-
-	void drawShadedTexQuad(ID3D11ShaderResourceView* texture,
-						const D3D11_RECT* rSource,
-						int SourceWidth,
-						int SourceHeight,
-						ID3D11PixelShader* PShader,
-						ID3D11VertexShader* VShader,
-						ID3D11InputLayout* layout,
-						float Gamma = 1.0f);
-	void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture,
-							const MathUtil::Rectangle<float>* rSource,
-							int SourceWidth,
-							int SourceHeight,
-							const MathUtil::Rectangle<float>* rDest,
-							ID3D11PixelShader* PShader,
-							ID3D11VertexShader* Vshader,
-							ID3D11InputLayout* layout,
-							float Gamma = 1.0f);
-	void drawClearQuad(u32 Color, float z, ID3D11PixelShader* PShader, ID3D11VertexShader* Vshader, ID3D11InputLayout* layout);
-	void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2);
-}
-
-}
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
deleted file mode 100644
index 2e72380603..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoConfig.h"
-
-#include "D3DBase.h"
-#include "D3DUtil.h"
-#include "FramebufferManager.h"
-#include "PixelShaderCache.h"
-#include "Render.h"
-#include "VertexShaderCache.h"
-#include "XFBEncoder.h"
-#include "HW/Memmap.h"
-
-namespace DX11 {
-
-static XFBEncoder s_xfbEncoder;
-
-FramebufferManager::Efb FramebufferManager::m_efb;
-
-D3DTexture2D* &FramebufferManager::GetEFBColorTexture() { return m_efb.color_tex; }
-ID3D11Texture2D* &FramebufferManager::GetEFBColorStagingBuffer() { return m_efb.color_staging_buf; }
-
-D3DTexture2D* &FramebufferManager::GetEFBDepthTexture() { return m_efb.depth_tex; }
-D3DTexture2D* &FramebufferManager::GetEFBDepthReadTexture() { return m_efb.depth_read_texture; }
-ID3D11Texture2D* &FramebufferManager::GetEFBDepthStagingBuffer() { return m_efb.depth_staging_buf; }
-
-D3DTexture2D* &FramebufferManager::GetResolvedEFBColorTexture()
-{
-	if (g_ActiveConfig.iMultisampleMode)
-	{
-		D3D::context->ResolveSubresource(m_efb.resolved_color_tex->GetTex(), 0, m_efb.color_tex->GetTex(), 0, DXGI_FORMAT_R8G8B8A8_UNORM);
-		return m_efb.resolved_color_tex;
-	}
-	else
-		return m_efb.color_tex;
-}
-
-D3DTexture2D* &FramebufferManager::GetResolvedEFBDepthTexture()
-{
-	if (g_ActiveConfig.iMultisampleMode)
-	{
-		D3D::context->ResolveSubresource(m_efb.resolved_color_tex->GetTex(), 0, m_efb.color_tex->GetTex(), 0, DXGI_FORMAT_R8G8B8A8_UNORM);
-		return m_efb.resolved_color_tex;
-	}
-	else
-		return m_efb.depth_tex;
-}
-
-FramebufferManager::FramebufferManager()
-{
-	unsigned int target_width = Renderer::GetTargetWidth();
-	unsigned int target_height = Renderer::GetTargetHeight();
-	DXGI_SAMPLE_DESC sample_desc = D3D::GetAAMode(g_ActiveConfig.iMultisampleMode);
-
-	ID3D11Texture2D* buf;
-	D3D11_TEXTURE2D_DESC texdesc;
-	HRESULT hr;
-
-	// EFB color texture - primary render target
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-	CHECK(hr==S_OK, "create EFB color texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-	m_efb.color_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
-	CHECK(m_efb.color_tex!=NULL, "create EFB color texture (size: %dx%d)", target_width, target_height);
-	SAFE_RELEASE(buf);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetTex(), "EFB color texture");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetSRV(), "EFB color texture shader resource view");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetRTV(), "EFB color texture render target view");
-
-	// Temporary EFB color texture - used in ReinterpretPixelData
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-	CHECK(hr==S_OK, "create EFB color temp texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-	m_efb.color_temp_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
-	CHECK(m_efb.color_temp_tex!=NULL, "create EFB color temp texture (size: %dx%d)", target_width, target_height);
-	SAFE_RELEASE(buf);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetTex(), "EFB color temp texture");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetSRV(), "EFB color temp texture shader resource view");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetRTV(), "EFB color temp texture render target view");
-
-	// AccessEFB - Sysmem buffer used to retrieve the pixel data from color_tex
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &m_efb.color_staging_buf);
-	CHECK(hr==S_OK, "create EFB color staging buffer (hr=%#x)", hr);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_staging_buf, "EFB color staging texture (used for Renderer::AccessEFB)");
-
-	// EFB depth buffer - primary depth buffer
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, target_width, target_height, 1, 1, D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-	CHECK(hr==S_OK, "create EFB depth texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-	m_efb.depth_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_SHADER_RESOURCE), DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_UNKNOWN, (sample_desc.Count > 1));
-	SAFE_RELEASE(buf);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetTex(), "EFB depth texture");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetDSV(), "EFB depth texture depth stencil view");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_tex->GetSRV(), "EFB depth texture shader resource view");
-
-	// Render buffer for AccessEFB (depth data)
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, 1, 1, D3D11_BIND_RENDER_TARGET);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-	CHECK(hr==S_OK, "create EFB depth read texture (hr=%#x)", hr);
-	m_efb.depth_read_texture = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
-	SAFE_RELEASE(buf);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_read_texture->GetTex(), "EFB depth read texture (used in Renderer::AccessEFB)");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_read_texture->GetRTV(), "EFB depth read texture render target view (used in Renderer::AccessEFB)");
-
-	// AccessEFB - Sysmem buffer used to retrieve the pixel data from depth_read_texture
-	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
-	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &m_efb.depth_staging_buf);
-	CHECK(hr==S_OK, "create EFB depth staging buffer (hr=%#x)", hr);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_staging_buf, "EFB depth staging texture (used for Renderer::AccessEFB)");
-
-	if (g_ActiveConfig.iMultisampleMode)
-	{
-		// Framebuffer resolve textures (color+depth)
-		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, 1);
-		hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-		m_efb.resolved_color_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R8G8B8A8_UNORM);
-		CHECK(m_efb.resolved_color_tex!=NULL, "create EFB color resolve texture (size: %dx%d)", target_width, target_height);
-		SAFE_RELEASE(buf);
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetTex(), "EFB color resolve texture");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetSRV(), "EFB color resolve texture shader resource view");
-
-		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE);
-		hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
-		CHECK(hr==S_OK, "create EFB depth resolve texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-		m_efb.resolved_depth_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R24_UNORM_X8_TYPELESS);
-		SAFE_RELEASE(buf);
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_depth_tex->GetTex(), "EFB depth resolve texture");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_depth_tex->GetSRV(), "EFB depth resolve texture shader resource view");
-	}
-	else
-	{
-		m_efb.resolved_color_tex = NULL;
-		m_efb.resolved_depth_tex = NULL;
-	}
-
-	s_xfbEncoder.Init();
-}
-
-FramebufferManager::~FramebufferManager()
-{
-	s_xfbEncoder.Shutdown();
-
-	SAFE_RELEASE(m_efb.color_tex);
-	SAFE_RELEASE(m_efb.color_temp_tex);
-	SAFE_RELEASE(m_efb.color_staging_buf);
-	SAFE_RELEASE(m_efb.resolved_color_tex);
-	SAFE_RELEASE(m_efb.depth_tex);
-	SAFE_RELEASE(m_efb.depth_staging_buf);
-	SAFE_RELEASE(m_efb.depth_read_texture);
-	SAFE_RELEASE(m_efb.resolved_depth_tex);
-}
-
-void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma)
-{
-	u8* dst = Memory::GetPointer(xfbAddr);
-	s_xfbEncoder.Encode(dst, fbWidth, fbHeight, sourceRc, Gamma);
-}
-
-XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height)
-{
-	return new XFBSource(D3DTexture2D::Create(target_width, target_height,
-		(D3D11_BIND_FLAG)(D3D11_BIND_RENDER_TARGET|D3D11_BIND_SHADER_RESOURCE),
-		D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM));
-}
-
-void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc)
-{
-	TargetRectangle targetSource;
-
-	targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight());
-	targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight());
-	targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth());
-	targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth());
-
-	*width = targetSource.right - targetSource.left;
-	*height = targetSource.bottom - targetSource.top;
-}
-
-void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
-	const MathUtil::Rectangle<float> &drawrc, int width, int height) const
-{
-	D3D::drawShadedTexSubQuad(tex->GetSRV(), &sourcerc,
-		texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false),
-		VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
-}
-
-void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
-{
-	// DX11's XFB decoder does not use this function.
-	// YUYV data is decoded in Render::Swap.
-}
-
-void XFBSource::CopyEFB(float Gamma)
-{
-	g_renderer->ResetAPIState(); // reset any game specific settings
-	
-	// Copy EFB data to XFB and restore render target again
-	const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)texWidth, (float)texHeight);
-
-	D3D::context->RSSetViewports(1, &vp);
-	D3D::context->OMSetRenderTargets(1, &tex->GetRTV(), NULL);
-	D3D::SetLinearCopySampler();
-
-	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), sourceRc.AsRECT(),
-		Renderer::GetTargetWidth(), Renderer::GetTargetHeight(),
-		PixelShaderCache::GetColorCopyProgram(true), VertexShaderCache::GetSimpleVertexShader(),
-		VertexShaderCache::GetSimpleInputLayout(),Gamma);
-
-	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(),
-		FramebufferManager::GetEFBDepthTexture()->GetDSV());
-	
-	g_renderer->RestoreAPIState();
-}
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
deleted file mode 100644
index 2b14ec2b66..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FBMANAGER_D3D_H_
-#define _FBMANAGER_D3D_H_
-
-#include "d3d11.h"
-
-#include "FramebufferManagerBase.h"
-
-#include "D3DTexture.h"
-
-namespace DX11 {
-
-// On the GameCube, the game sends a request for the graphics processor to
-// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
-// called the XFB (External Framebuffer). The size and location of the XFB is
-// decided at the time of the copy, and the format is always YUYV. The video
-// interface is given a pointer to the XFB, which will be decoded and
-// displayed on the TV.
-//
-// There are two ways for Dolphin to emulate this:
-//
-// Real XFB mode:
-//
-// Dolphin will behave like the GameCube and encode the EFB to
-// a portion of GameCube RAM. The emulated video interface will decode the data
-// for output to the screen.
-//
-// Advantages: Behaves exactly like the GameCube.
-// Disadvantages: Resolution will be limited.
-//
-// Virtual XFB mode:
-//
-// When a request is made to copy the EFB to an XFB, Dolphin
-// will remember the RAM location and size of the XFB in a Virtual XFB list.
-// The video interface will look up the XFB in the list and use the enhanced
-// data stored there, if available.
-//
-// Advantages: Enables high resolution graphics, better than real hardware.
-// Disadvantages: If the GameCube CPU writes directly to the XFB (which is
-// possible but uncommon), the Virtual XFB will not capture this information.
-
-// There may be multiple XFBs in GameCube RAM. This is the maximum number to
-// virtualize.
-
-struct XFBSource : public XFBSourceBase
-{
-	XFBSource(D3DTexture2D *_tex) : tex(_tex) {}
-	~XFBSource() { tex->Release(); }
-
-	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
-	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
-	void CopyEFB(float Gamma);
-
-	D3DTexture2D* const tex;
-};
-
-class FramebufferManager : public FramebufferManagerBase
-{
-public:
-	FramebufferManager();
-	~FramebufferManager();
-
-	static D3DTexture2D* &GetEFBColorTexture();
-	static ID3D11Texture2D* &GetEFBColorStagingBuffer();
-
-	static D3DTexture2D* &GetEFBDepthTexture();
-	static D3DTexture2D* &GetEFBDepthReadTexture();
-	static ID3D11Texture2D* &GetEFBDepthStagingBuffer();
-
-	static D3DTexture2D* &GetResolvedEFBColorTexture();
-	static D3DTexture2D* &GetResolvedEFBDepthTexture();
-
-	static D3DTexture2D* &GetEFBColorTempTexture() { return m_efb.color_temp_tex; }
-	static void SwapReinterpretTexture()
-	{
-		D3DTexture2D* swaptex = GetEFBColorTempTexture();
-		m_efb.color_temp_tex = GetEFBColorTexture();
-		m_efb.color_tex = swaptex;
-	}
-
-private:
-	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
-	void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc);
-
-	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
-
-	static struct Efb
-	{
-		D3DTexture2D* color_tex;
-		ID3D11Texture2D* color_staging_buf;
-
-		D3DTexture2D* depth_tex;
-		ID3D11Texture2D* depth_staging_buf;
-		D3DTexture2D* depth_read_texture;
-
-		D3DTexture2D* color_temp_tex;
-
-		D3DTexture2D* resolved_color_tex;
-		D3DTexture2D* resolved_depth_tex;
-	} m_efb;
-};
-
-}  // namespace DX11
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
deleted file mode 100644
index cc0b74d1e1..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Log.h"
-
-#include "D3DBase.h"
-#include "GfxState.h"
-
-namespace DX11
-{
-
-namespace D3D
-{
-
-StateManager* stateman;
-
-
-template<typename T> AutoState<T>::AutoState(const T* object) : state(object)
-{
-	((IUnknown*)state)->AddRef();
-}
-
-template<typename T> AutoState<T>::AutoState(const AutoState<T> &source)
-{
-	state = source.GetPtr();
-	((T*)state)->AddRef();
-}
-
-template<typename T> AutoState<T>::~AutoState()
-{
-	if(state) ((T*)state)->Release();
-	state = NULL;
-}
-
-StateManager::StateManager() : cur_blendstate(NULL), cur_depthstate(NULL), cur_raststate(NULL) {}
-
-void StateManager::PushBlendState(const ID3D11BlendState* state) { blendstates.push(AutoBlendState(state)); }
-void StateManager::PushDepthState(const ID3D11DepthStencilState* state) { depthstates.push(AutoDepthStencilState(state)); }
-void StateManager::PushRasterizerState(const ID3D11RasterizerState* state) { raststates.push(AutoRasterizerState(state)); }
-void StateManager::PopBlendState() { blendstates.pop(); }
-void StateManager::PopDepthState() { depthstates.pop(); }
-void StateManager::PopRasterizerState() { raststates.pop(); }
-
-void StateManager::Apply()
-{
-	if (!blendstates.empty())
-	{
-		if (cur_blendstate != blendstates.top().GetPtr())
-		{
-			cur_blendstate = (ID3D11BlendState*)blendstates.top().GetPtr();
-			D3D::context->OMSetBlendState(cur_blendstate, NULL, 0xFFFFFFFF);
-		}
-	}
-	else ERROR_LOG(VIDEO, "Tried to apply without blend state!");
-
-	if (!depthstates.empty())
-	{
-		if (cur_depthstate != depthstates.top().GetPtr())
-		{
-			cur_depthstate = (ID3D11DepthStencilState*)depthstates.top().GetPtr();
-			D3D::context->OMSetDepthStencilState(cur_depthstate, 0);
-		}
-	}
-	else ERROR_LOG(VIDEO, "Tried to apply without depth state!");
-
-	if (!raststates.empty())
-	{
-		if (cur_raststate != raststates.top().GetPtr())
-		{
-			cur_raststate = (ID3D11RasterizerState*)raststates.top().GetPtr();
-			D3D::context->RSSetState(cur_raststate);
-		}
-	}
-	else ERROR_LOG(VIDEO, "Tried to apply without rasterizer state!");
-}
-
-}  // namespace
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
deleted file mode 100644
index 977b53dab6..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <stack>
-
-struct ID3D11BlendState;
-struct ID3D11DepthStencilState;
-struct ID3D11RasterizerState;
-
-namespace DX11
-{
-
-namespace D3D
-{
-
-template<typename T> class AutoState
-{
-public:
-	AutoState(const T* object);
-	AutoState(const AutoState<T> &source);
-	~AutoState();
-
-	const inline T* GetPtr() const { return state; }
-
-private:
-	const T* state;
-};
-
-typedef AutoState<ID3D11BlendState> AutoBlendState;
-typedef AutoState<ID3D11DepthStencilState> AutoDepthStencilState;
-typedef AutoState<ID3D11RasterizerState> AutoRasterizerState;
-
-class StateManager
-{
-public:
-	StateManager();
-
-	// call any of these to change the affected states
-	void PushBlendState(const ID3D11BlendState* state);
-	void PushDepthState(const ID3D11DepthStencilState* state);
-	void PushRasterizerState(const ID3D11RasterizerState* state);
-
-	// call these after drawing
-	void PopBlendState();
-	void PopDepthState();
-	void PopRasterizerState();
-
-	// call this before any drawing operation if states could have changed meanwhile
-	void Apply();
-
-private:
-	std::stack<AutoBlendState> blendstates;
-	std::stack<AutoDepthStencilState> depthstates;
-	std::stack<AutoRasterizerState> raststates;
-	ID3D11BlendState* cur_blendstate;
-	ID3D11DepthStencilState* cur_depthstate;
-	ID3D11RasterizerState* cur_raststate;
-};
-
-extern StateManager* stateman;
-
-}  // namespace
-
-}  // namespace DX11
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Globals.h b/Source/Plugins/Plugin_VideoDX11/Src/Globals.h
deleted file mode 100644
index 89800694e8..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/Globals.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-
-#include "Common.h"
-#include "VideoConfig.h"
-#include "main.h"
-
-#include "VideoCommon.h"
-
-#endif // _GLOBALS_H_
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
deleted file mode 100644
index 9009d39029..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "LineGeometryShader.h"
-
-#include <sstream>
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "VertexShaderGen.h"
-
-namespace DX11
-{
-
-struct LineGSParams
-{
-	FLOAT LineWidth; // In units of 1/6 of an EFB pixel
-	FLOAT TexOffset;
-	FLOAT VpWidth; // Width and height of the viewport in EFB pixels
-	FLOAT VpHeight;
-	FLOAT TexOffsetEnable[8]; // For each tex coordinate, whether to apply offset to it (1 on, 0 off)
-};
-
-union LineGSParams_Padded
-{
-	LineGSParams params;
-	// Constant buffers must be a multiple of 16 bytes in size.
-	u8 pad[(sizeof(LineGSParams) + 15) & ~15];
-};
-
-static const char LINE_GS_COMMON[] =
-// The struct VS_OUTPUT used by the vertex shader goes here.
-"// dolphin-emu line geometry shader common part\n"
-
-"cbuffer cbParams : register(b0)\n"
-"{\n"
-	"struct\n" // Should match LineGSParams above
-	"{\n"
-		"float LineWidth;\n"
-		"float TexOffset;\n"
-		"float VpWidth;\n"
-		"float VpHeight;\n"
-		"float TexOffsetEnable[8];\n"
-	"} Params;\n"
-"}\n"
-
-"[maxvertexcount(4)]\n"
-"void main(line VS_OUTPUT input[2], inout TriangleStream<VS_OUTPUT> outStream)\n"
-"{\n"
-	// Pretend input[0] is on the bottom and input[1] is on top.
-	// We generate vertices to the left and right.
-
-	"VS_OUTPUT l0 = input[0];\n"
-	"VS_OUTPUT r0 = l0;\n"
-	"VS_OUTPUT l1 = input[1];\n"
-	"VS_OUTPUT r1 = l1;\n"
-
-	// GameCube/Wii's line drawing algorithm is a little quirky. It does not
-	// use the correct line caps. Instead, the line caps are vertical or
-	// horizontal depending the slope of the line.
-
-	"float2 offset;\n"
-	"float2 to = abs(input[1].pos.xy - input[0].pos.xy);\n"
-	// FIXME: What does real hardware do when line is at a 45-degree angle?
-	// FIXME: Lines aren't drawn at the correct width. See Twilight Princess map.
-	"if (Params.VpHeight*to.y > Params.VpWidth*to.x) {\n"
-		// Line is more tall. Extend geometry left and right.
-		// Lerp Params.LineWidth/2 from [0..VpWidth] to [-1..1]
-		"offset = float2(Params.LineWidth/Params.VpWidth, 0);\n"
-	"} else {\n"
-		// Line is more wide. Extend geometry up and down.
-		// Lerp Params.LineWidth/2 from [0..VpHeight] to [1..-1]
-		"offset = float2(0, -Params.LineWidth/Params.VpHeight);\n"
-	"}\n"
-
-	"l0.pos.xy -= offset * input[0].pos.w;\n"
-	"r0.pos.xy += offset * input[0].pos.w;\n"
-	"l1.pos.xy -= offset * input[1].pos.w;\n"
-	"r1.pos.xy += offset * input[1].pos.w;\n"
-
-"#ifndef NUM_TEXCOORDS\n"
-"#error NUM_TEXCOORDS not defined\n"
-"#endif\n"
-
-	// Apply TexOffset to all tex coordinates in the vertex.
-	// They can each be enabled seperately.
-"#if NUM_TEXCOORDS >= 1\n"
-	"r0.tex0.x += Params.TexOffset * Params.TexOffsetEnable[0];\n"
-	"r1.tex0.x += Params.TexOffset * Params.TexOffsetEnable[0];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 2\n"
-	"r0.tex1.x += Params.TexOffset * Params.TexOffsetEnable[1];\n"
-	"r1.tex1.x += Params.TexOffset * Params.TexOffsetEnable[1];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 3\n"
-	"r0.tex2.x += Params.TexOffset * Params.TexOffsetEnable[2];\n"
-	"r1.tex2.x += Params.TexOffset * Params.TexOffsetEnable[2];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 4\n"
-	"r0.tex3.x += Params.TexOffset * Params.TexOffsetEnable[3];\n"
-	"r1.tex3.x += Params.TexOffset * Params.TexOffsetEnable[3];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 5\n"
-	"r0.tex4.x += Params.TexOffset * Params.TexOffsetEnable[4];\n"
-	"r1.tex4.x += Params.TexOffset * Params.TexOffsetEnable[4];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 6\n"
-	"r0.tex5.x += Params.TexOffset * Params.TexOffsetEnable[5];\n"
-	"r1.tex5.x += Params.TexOffset * Params.TexOffsetEnable[5];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 7\n"
-	"r0.tex6.x += Params.TexOffset * Params.TexOffsetEnable[6];\n"
-	"r1.tex6.x += Params.TexOffset * Params.TexOffsetEnable[6];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 8\n"
-	"r0.tex7.x += Params.TexOffset * Params.TexOffsetEnable[7];\n"
-	"r1.tex7.x += Params.TexOffset * Params.TexOffsetEnable[7];\n"
-"#endif\n"
-
-	"outStream.Append(l0);\n"
-	"outStream.Append(r0);\n"
-	"outStream.Append(l1);\n"
-	"outStream.Append(r1);\n"
-"}\n"
-;
-
-LineGeometryShader::LineGeometryShader()
-	: m_ready(false), m_paramsBuffer(NULL)
-{ }
-
-void LineGeometryShader::Init()
-{
-	m_ready = false;
-
-	HRESULT hr;
-
-	// Create constant buffer for uploading data to geometry shader
-
-	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(LineGSParams_Padded),
-		D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-	hr = D3D::device->CreateBuffer(&bd, NULL, &m_paramsBuffer);
-	CHECK(SUCCEEDED(hr), "create line geometry shader params buffer");
-	D3D::SetDebugObjectName(m_paramsBuffer, "line geometry shader params buffer");
-
-	m_ready = true;
-}
-
-void LineGeometryShader::Shutdown()
-{
-	m_ready = false;
-
-	for (ComboMap::iterator it = m_shaders.begin(); it != m_shaders.end(); ++it)
-	{
-		SAFE_RELEASE(it->second);
-	}
-	m_shaders.clear();
-
-	SAFE_RELEASE(m_paramsBuffer);
-}
-
-bool LineGeometryShader::SetShader(u32 components, float lineWidth,
-	float texOffset, float vpWidth, float vpHeight, const bool* texOffsetEnable)
-{
-	if (!m_ready)
-		return false;
-
-	// Make sure geometry shader for "components" is available
-	ComboMap::iterator shaderIt = m_shaders.find(components);
-	if (shaderIt == m_shaders.end())
-	{
-		// Generate new shader. Warning: not thread-safe.
-		static char buffer[16384];
-		ShaderCode code;
-		code.SetBuffer(buffer);
-		GenerateVSOutputStructForGS(code, components, API_D3D11);
-		code.Write("\n%s", LINE_GS_COMMON);
-
-		std::stringstream numTexCoordsStream;
-		numTexCoordsStream << xfregs.numTexGen.numTexGens;
-		
-		INFO_LOG(VIDEO, "Compiling line geometry shader for components 0x%.08X (num texcoords %d)",
-			components, xfregs.numTexGen.numTexGens);
-
-		const std::string& numTexCoordsStr = numTexCoordsStream.str();
-		D3D_SHADER_MACRO macros[] = {
-			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
-			{ NULL, NULL }
-		};
-		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
-		if (!newShader)
-		{
-			WARN_LOG(VIDEO, "Line geometry shader for components 0x%.08X failed to compile", components);
-			// Add dummy shader to prevent trying to compile again
-			m_shaders[components] = NULL;
-			return false;
-		}
-
-		shaderIt = m_shaders.insert(std::make_pair(components, newShader)).first;
-	}
-
-	if (shaderIt != m_shaders.end())
-	{
-		if (shaderIt->second)
-		{
-			D3D11_MAPPED_SUBRESOURCE map;
-			HRESULT hr = D3D::context->Map(m_paramsBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-			if (SUCCEEDED(hr))
-			{
-				LineGSParams* params = (LineGSParams*)map.pData;
-				params->LineWidth = lineWidth;
-
-				params->TexOffset = texOffset;
-				params->VpWidth = vpWidth;
-				params->VpHeight = vpHeight;
-				for (int i = 0; i < 8; ++i)
-					params->TexOffsetEnable[i] = texOffsetEnable[i] ? 1.f : 0.f;
-
-				D3D::context->Unmap(m_paramsBuffer, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "Failed to map line gs params buffer");
-
-			DEBUG_LOG(VIDEO, "Line params: width %f, texOffset %f, vpWidth %f, vpHeight %f",
-				lineWidth, texOffset, vpWidth, vpHeight);
-
-			D3D::context->GSSetShader(shaderIt->second, NULL, 0);
-			D3D::context->GSSetConstantBuffers(0, 1, &m_paramsBuffer);
-
-			return true;
-		}
-		else
-			return false;
-	}
-	else
-		return false;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
deleted file mode 100644
index a92e7983fc..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _LINEGEOMETRYSHADER_H
-#define _LINEGEOMETRYSHADER_H
-
-#include "VideoCommon.h"
-
-struct ID3D11Buffer;
-struct ID3D11GeometryShader;
-
-namespace DX11
-{
-
-// This class manages a collection of line geometry shaders, one for each
-// vertex format.
-class LineGeometryShader
-{
-
-public:
-
-	LineGeometryShader();
-
-	void Init();
-	void Shutdown();
-	// Returns true on success, false on failure
-	bool SetShader(u32 components, float lineWidth, float texOffset,
-		float vpWidth, float vpHeight, const bool* texOffsetEnable);
-
-private:
-
-	bool m_ready;
-
-	ID3D11Buffer* m_paramsBuffer;
-
-	typedef std::map<u32, ID3D11GeometryShader*> ComboMap;
-
-	ComboMap m_shaders;
-
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
deleted file mode 100644
index 373026bcd3..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "D3DBlob.h"
-#include "NativeVertexFormat.h"
-#include "VertexManager.h"
-#include "VertexShaderCache.h"
-
-namespace DX11
-{
-
-class D3DVertexFormat : public NativeVertexFormat
-{
-	D3D11_INPUT_ELEMENT_DESC m_elems[32];
-	UINT m_num_elems;
-
-	DX11::D3DBlob* m_vs_bytecode;
-	ID3D11InputLayout* m_layout;
-
-public:
-	D3DVertexFormat() : m_num_elems(0), m_vs_bytecode(NULL), m_layout(NULL) {}
-	~D3DVertexFormat() { SAFE_RELEASE(m_vs_bytecode); SAFE_RELEASE(m_layout); }
-
-	void Initialize(const PortableVertexDeclaration &_vtx_decl);
-	void SetupVertexPointers();
-};
-
-NativeVertexFormat* VertexManager::CreateNativeVertexFormat()
-{
-	return new D3DVertexFormat();
-}
-
-DXGI_FORMAT VarToD3D(VarType t, int size)
-{
-	DXGI_FORMAT retval = DXGI_FORMAT_UNKNOWN;
-	static const DXGI_FORMAT lookup1[5] = {
-		DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R32_FLOAT
-	};
-	static const DXGI_FORMAT lookup2[5] = {
-		DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R32G32_FLOAT
-	};
-	static const DXGI_FORMAT lookup3[5] = {
-		DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R32G32B32_FLOAT
-	};
-	static const DXGI_FORMAT lookup4[5] = {
-		DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R16G16B16A16_SNORM, DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R32G32B32A32_FLOAT
-	};
-
-	switch (size)
-	{
-	case 1: retval = lookup1[t]; break;
-	case 2: retval = lookup2[t]; break;
-	case 3: retval = lookup3[t]; break;
-	case 4: retval = lookup4[t]; break;
-	default: break;
-	}
-	if (retval == DXGI_FORMAT_UNKNOWN)
-	{
-		PanicAlert("VarToD3D: Invalid type/size combo %i , %i", (int)t, size);
-	}
-	return retval;
-}
-
-void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
-{
-	vertex_stride = _vtx_decl.stride;
-	memset(m_elems, 0, sizeof(m_elems));
-
-	m_elems[m_num_elems].SemanticName = "POSITION";
-	m_elems[m_num_elems].AlignedByteOffset = 0;
-	m_elems[m_num_elems].Format = DXGI_FORMAT_R32G32B32_FLOAT;
-	m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-	++m_num_elems;
-
-	for (int i = 0; i < 3; i++)
-	{
-		if (_vtx_decl.normal_offset[i] > 0) 
-		{
-			m_elems[m_num_elems].SemanticName = "NORMAL";
-			m_elems[m_num_elems].SemanticIndex = i;
-			m_elems[m_num_elems].AlignedByteOffset = _vtx_decl.normal_offset[i];
-			m_elems[m_num_elems].Format = VarToD3D(_vtx_decl.normal_gl_type, _vtx_decl.normal_gl_size);
-			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-			++m_num_elems;
-		}
-	}
-
-	for (int i = 0; i < 2; i++)
-	{
-		if (_vtx_decl.color_offset[i] > 0) 
-		{
-			m_elems[m_num_elems].SemanticName = "COLOR";
-			m_elems[m_num_elems].SemanticIndex = i;
-			m_elems[m_num_elems].AlignedByteOffset = _vtx_decl.color_offset[i];
-			m_elems[m_num_elems].Format = VarToD3D(_vtx_decl.color_gl_type, 4);
-			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-			++m_num_elems;
-		}
-	}
-
-	for (int i = 0; i < 8; i++)
-	{
-		if (_vtx_decl.texcoord_offset[i] > 0)
-		{
-			m_elems[m_num_elems].SemanticName = "TEXCOORD";
-			m_elems[m_num_elems].SemanticIndex = i;
-			m_elems[m_num_elems].AlignedByteOffset = _vtx_decl.texcoord_offset[i];
-			m_elems[m_num_elems].Format = VarToD3D(_vtx_decl.texcoord_gl_type[i], _vtx_decl.texcoord_size[i]);
-			m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-			++m_num_elems;
-		}
-	}
-
-	if (_vtx_decl.posmtx_offset != -1)
-	{
-		m_elems[m_num_elems].SemanticName = "BLENDINDICES";
-		m_elems[m_num_elems].AlignedByteOffset = _vtx_decl.posmtx_offset;
-		m_elems[m_num_elems].Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-		m_elems[m_num_elems].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-		++m_num_elems;
-	}
-}
-
-void D3DVertexFormat::SetupVertexPointers()
-{
-	if (m_vs_bytecode != DX11::VertexShaderCache::GetActiveShaderBytecode())
-	{
-		SAFE_RELEASE(m_vs_bytecode);
-		SAFE_RELEASE(m_layout);
-
-		m_vs_bytecode = DX11::VertexShaderCache::GetActiveShaderBytecode();
-		m_vs_bytecode->AddRef();
-
-		HRESULT hr = DX11::D3D::device->CreateInputLayout(m_elems, m_num_elems, m_vs_bytecode->Data(), m_vs_bytecode->Size(), &m_layout);
-		if (FAILED(hr)) PanicAlert("Failed to create input layout, %s %d\n", __FILE__, __LINE__);
-		DX11::D3D::SetDebugObjectName((ID3D11DeviceChild*)m_layout, "input layout used to emulate the GX pipeline");
-	}
-	DX11::D3D::context->IASetInputLayout(m_layout);
-}
-
-} // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
deleted file mode 100644
index 5282c4cbb7..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
+++ /dev/null
@@ -1,1449 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "PSTextureEncoder.h"
-
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "GfxState.h"
-#include "BPMemory.h"
-#include "FramebufferManager.h"
-#include "Render.h"
-#include "HW/Memmap.h"
-#include "TextureCache.h"
-
-// "Static mode" will compile a new EFB encoder shader for every combination of
-// encoding configurations. It's compatible with Shader Model 4.
-
-// "Dynamic mode" will use the dynamic-linking feature of Shader Model 5. Only
-// one shader needs to be compiled.
-
-// Unfortunately, the June 2010 DirectX SDK includes a broken HLSL compiler
-// which cripples dynamic linking for us.
-// See <http://www.gamedev.net/topic/587232-dx11-dynamic-linking-compilation-warnings/>.
-// Dynamic mode is disabled for now. To enable it, uncomment the line below.
-
-//#define USE_DYNAMIC_MODE
-
-// FIXME: When Microsoft fixes their HLSL compiler, make Dolphin enable dynamic
-// mode on Shader Model 5-compatible cards.
-
-namespace DX11
-{
-	
-union EFBEncodeParams
-{
-	struct
-	{
-		FLOAT NumHalfCacheLinesX;
-		FLOAT NumBlocksY;
-		FLOAT PosX;
-		FLOAT PosY;
-		FLOAT TexLeft;
-		FLOAT TexTop;
-		FLOAT TexRight;
-		FLOAT TexBottom;
-	};
-	// Constant buffers must be a multiple of 16 bytes in size.
-	u8 pad[32]; // Pad to the next multiple of 16 bytes
-};
-
-static const char EFB_ENCODE_VS[] =
-"// dolphin-emu EFB encoder vertex shader\n"
-
-"cbuffer cbParams : register(b0)\n"
-"{\n"
-	"struct\n" // Should match EFBEncodeParams above
-	"{\n"
-		"float NumHalfCacheLinesX;\n"
-		"float NumBlocksY;\n"
-		"float PosX;\n" // Upper-left corner of source
-		"float PosY;\n"
-		"float TexLeft;\n" // Rectangle within EFBTexture representing the actual EFB (normalized)
-		"float TexTop;\n"
-		"float TexRight;\n"
-		"float TexBottom;\n"
-	"} Params;\n"
-"}\n"
-
-"struct Output\n"
-"{\n"
-	"float4 Pos : SV_Position;\n"
-	"float2 Coord : ENCODECOORD;\n"
-"};\n"
-
-"Output main(in float2 Pos : POSITION)\n"
-"{\n"
-	"Output result;\n"
-	"result.Pos = float4(2*Pos.x-1, -2*Pos.y+1, 0.0, 1.0);\n"
-	"result.Coord = Pos * float2(Params.NumHalfCacheLinesX, Params.NumBlocksY);\n"
-	"return result;\n"
-"}\n"
-;
-
-static const char EFB_ENCODE_PS[] =
-"// dolphin-emu EFB encoder pixel shader\n"
-
-// Input
-
-"cbuffer cbParams : register(b0)\n"
-"{\n"
-	"struct\n" // Should match EFBEncodeParams above
-	"{\n"
-		"float NumHalfCacheLinesX;\n"
-		"float NumBlocksY;\n"
-		"float PosX;\n" // Upper-left corner of source
-		"float PosY;\n"
-		"float TexLeft;\n" // Rectangle within EFBTexture representing the actual EFB (normalized)
-		"float TexTop;\n"
-		"float TexRight;\n"
-		"float TexBottom;\n"
-	"} Params;\n"
-"}\n"
-
-"Texture2D EFBTexture : register(t0);\n"
-"sampler EFBSampler : register(s0);\n"
-
-// Constants
-
-"static const float2 INV_EFB_DIMS = float2(1.0/640.0, 1.0/528.0);\n"
-
-// FIXME: Is this correct?
-"static const float3 INTENSITY_COEFFS = float3(0.257, 0.504, 0.098);\n"
-"static const float INTENSITY_ADD = 16.0/255.0;\n"
-
-// Utility functions
-
-"uint4 Swap4_32(uint4 v) {\n"
-	"return (((v >> 24) & 0xFF) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000));\n"
-"}\n"
-
-"uint4 UINT4_8888_BE(uint4 a, uint4 b, uint4 c, uint4 d) {\n"
-	"return (d << 24) | (c << 16) | (b << 8) | a;\n"
-"}\n"
-
-"uint UINT_44444444_BE(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h) {\n"
-	"return (g << 28) | (h << 24) | (e << 20) | (f << 16) | (c << 12) | (d << 8) | (a << 4) | b;\n"
-"}\n"
-
-"uint UINT_1555(uint a, uint b, uint c, uint d) {\n"
-	"return (a << 15) | (b << 10) | (c << 5) | d;\n"
-"}\n"
-
-"uint UINT_3444(uint a, uint b, uint c, uint d) {\n"
-	"return (a << 12) | (b << 8) | (c << 4) | d;\n"
-"}\n"
-
-"uint UINT_565(uint a, uint b, uint c) {\n"
-	"return (a << 11) | (b << 5) | c;\n"
-"}\n"
-
-"uint UINT_1616(uint a, uint b) {\n"
-	"return (a << 16) | b;\n"
-"}\n"
-
-"uint Float8ToUint3(float v) {\n"
-	"return (uint)(v*255.0) >> 5;\n"
-"}\n"
-
-"uint Float8ToUint4(float v) {\n"
-	"return (uint)(v*255.0) >> 4;\n"
-"}\n"
-
-"uint Float8ToUint5(float v) {\n"
-	"return (uint)(v*255.0) >> 3;\n"
-"}\n"
-
-"uint Float8ToUint6(float v) {\n"
-	"return (uint)(v*255.0) >> 2;\n"
-"}\n"
-
-"uint EncodeRGB5A3(float4 pixel) {\n"
-	"if (pixel.a >= 224.0/255.0) {\n"
-		// Encode to ARGB1555
-		"return UINT_1555(1, Float8ToUint5(pixel.r), Float8ToUint5(pixel.g), Float8ToUint5(pixel.b));\n"
-	"} else {\n"
-		// Encode to ARGB3444
-		"return UINT_3444(Float8ToUint3(pixel.a), Float8ToUint4(pixel.r), Float8ToUint4(pixel.g), Float8ToUint4(pixel.b));\n"
-	"}\n"
-"}\n"
-
-"uint EncodeRGB565(float4 pixel) {\n"
-	"return UINT_565(Float8ToUint5(pixel.r), Float8ToUint6(pixel.g), Float8ToUint5(pixel.b));\n"
-"}\n"
-
-"float2 CalcTexCoord(float2 coord)\n"
-"{\n"
-	// Add 0.5,0.5 to sample from the center of the EFB pixel
-	"float2 efbCoord = coord + float2(0.5,0.5);\n"
-	"return lerp(float2(Params.TexLeft,Params.TexTop), float2(Params.TexRight,Params.TexBottom), efbCoord * INV_EFB_DIMS);\n"
-"}\n"
-
-// Interface and classes for different source formats
-
-"float4 Fetch_0(float2 coord)\n"
-"{\n"
-	"float2 texCoord = CalcTexCoord(coord);\n"
-	"float4 result = EFBTexture.Sample(EFBSampler, texCoord);\n"
-	"result.a = 1.0;\n"
-	"return result;\n"
-"}\n"
-
-"float4 Fetch_1(float2 coord)\n"
-"{\n"
-	"float2 texCoord = CalcTexCoord(coord);\n"
-	"return EFBTexture.Sample(EFBSampler, texCoord);\n"
-"}\n"
-
-"float4 Fetch_2(float2 coord)\n"
-"{\n"
-	"float2 texCoord = CalcTexCoord(coord);\n"
-	"float4 result = EFBTexture.Sample(EFBSampler, texCoord);\n"
-	"result.a = 1.0;\n"
-	"return result;\n"
-"}\n"
-
-"float4 Fetch_3(float2 coord)\n"
-"{\n"
-	"float2 texCoord = CalcTexCoord(coord);\n"
-
-	"uint depth24 = 0xFFFFFF * EFBTexture.Sample(EFBSampler, texCoord).r;\n"
-	"uint4 bytes = uint4(\n"
-		"(depth24 >> 16) & 0xFF,\n" // r
-		"(depth24 >> 8) & 0xFF,\n"  // g
-		"depth24 & 0xFF,\n"         // b
-		"255);\n"                   // a
-	"return bytes / 255.0;\n"
-"}\n"
-
-"#ifdef DYNAMIC_MODE\n"
-"interface iFetch\n"
-"{\n"
-	"float4 Fetch(float2 coord);\n"
-"};\n"
-
-// Source format 0
-"class cFetch_0 : iFetch\n"
-"{\n"
-	"float4 Fetch(float2 coord)\n"
-	"{ return Fetch_0(coord); }\n"
-"};\n"
-
-
-// Source format 1
-"class cFetch_1 : iFetch\n"
-"{\n"
-	"float4 Fetch(float2 coord)\n"
-	"{ return Fetch_1(coord); }\n"
-"};\n"
-
-// Source format 2
-"class cFetch_2 : iFetch\n"
-"{\n"
-	"float4 Fetch(float2 coord)\n"
-	"{ return Fetch_2(coord); }\n"
-"};\n"
-
-// Source format 3
-"class cFetch_3 : iFetch\n"
-"{\n"
-	"float4 Fetch(float2 coord)\n"
-	"{ return Fetch_3(coord); }\n"
-"};\n"
-
-// Declare fetch interface; must be set by application
-"iFetch g_fetch;\n"
-"#define IMP_FETCH g_fetch.Fetch\n"
-
-"#endif\n" // #ifdef DYNAMIC_MODE
-
-"#ifndef IMP_FETCH\n"
-"#error No Fetch specified\n"
-"#endif\n"
-
-// Interface and classes for different intensity settings (on or off)
-
-"float4 Intensity_0(float4 sample)\n"
-"{\n"
-	"return sample;\n"
-"}\n"
-
-"float4 Intensity_1(float4 sample)\n"
-"{\n"
-	"sample.r = dot(INTENSITY_COEFFS, sample.rgb) + INTENSITY_ADD;\n"
-	// FIXME: Is this correct? What happens if you use one of the non-R
-	// formats with intensity on?
-	"sample = sample.rrrr;\n"
-	"return sample;\n"
-"}\n"
-
-"#ifdef DYNAMIC_MODE\n"
-"interface iIntensity\n"
-"{\n"
-	"float4 Intensity(float4 sample);\n"
-"};\n"
-
-// Intensity off
-"class cIntensity_0 : iIntensity\n"
-"{\n"
-	"float4 Intensity(float4 sample)\n"
-	"{ return Intensity_0(sample); }\n"
-"};\n"
-
-// Intensity on
-"class cIntensity_1 : iIntensity\n"
-"{\n"
-	"float4 Intensity(float4 sample)\n"
-	"{ return Intensity_1(sample); }\n"
-"};\n"
-
-// Declare intensity interface; must be set by application
-"iIntensity g_intensity;\n"
-"#define IMP_INTENSITY g_intensity.Intensity\n"
-
-"#endif\n" // #ifdef DYNAMIC_MODE
-
-"#ifndef IMP_INTENSITY\n"
-"#error No Intensity specified\n"
-"#endif\n"
-
-
-// Interface and classes for different scale/filter settings (on or off)
-
-"float4 ScaledFetch_0(float2 coord)\n"
-"{\n"
-	"return IMP_FETCH(float2(Params.PosX,Params.PosY) + coord);\n"
-"}\n"
-
-"float4 ScaledFetch_1(float2 coord)\n"
-"{\n"
-	"float2 ul = float2(Params.PosX,Params.PosY) + 2*coord;\n"
-	"float4 sample0 = IMP_FETCH(ul+float2(0,0));\n"
-	"float4 sample1 = IMP_FETCH(ul+float2(1,0));\n"
-	"float4 sample2 = IMP_FETCH(ul+float2(0,1));\n"
-	"float4 sample3 = IMP_FETCH(ul+float2(1,1));\n"
-	// Average all four samples together
-	// FIXME: Is this correct?
-	"return 0.25 * (sample0+sample1+sample2+sample3);\n"
-"}\n"
-
-"#ifdef DYNAMIC_MODE\n"
-"interface iScaledFetch\n"
-"{\n"
-	"float4 ScaledFetch(float2 coord);\n"
-"};\n"
-
-// Scale off
-"class cScaledFetch_0 : iScaledFetch\n"
-"{\n"
-	"float4 ScaledFetch(float2 coord)\n"
-	"{ return ScaledFetch_0(coord); }\n"
-"};\n"
-
-// Scale on
-"class cScaledFetch_1 : iScaledFetch\n"
-"{\n"
-	"float4 ScaledFetch(float2 coord)\n"
-	"{ return ScaledFetch_1(coord); }\n"
-"};\n"
-
-// Declare scaled fetch interface; must be set by application code
-"iScaledFetch g_scaledFetch;\n"
-"#define IMP_SCALEDFETCH g_scaledFetch.ScaledFetch\n"
-
-"#endif\n" // #ifdef DYNAMIC_MODE
-
-"#ifndef IMP_SCALEDFETCH\n"
-"#error No ScaledFetch specified\n"
-"#endif\n"
-
-// Main EFB-sampling function: performs all steps of fetching pixels, scaling,
-// applying intensity function
-
-"float4 SampleEFB(float2 coord)\n"
-"{\n"
-	// FIXME: Does intensity happen before or after scaling? Or does
-	// it matter?
-	"float4 sample = IMP_SCALEDFETCH(coord);\n"
-	"return IMP_INTENSITY(sample);\n"
-"}\n"
-
-// Interfaces and classes for different destination formats
-
-"uint4 Generate_0(float2 cacheCoord)\n" // R4
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,8);\n"
-	"float2 subBlockUL = blockUL + float2(0, 4*(cacheCoord.x%2));\n"
-
-	"float4 sample[32];\n"
-	"for (uint y = 0; y < 4; ++y) {\n"
-		"for (uint x = 0; x < 8; ++x) {\n"
-			"sample[y*8+x] = SampleEFB(subBlockUL+float2(x,y));\n"
-		"}\n"
-	"}\n"
-		
-	"uint dw[4];\n"
-	"for (uint i = 0; i < 4; ++i) {\n"
-		"dw[i] = UINT_44444444_BE(\n"
-			"Float8ToUint4(sample[8*i+0].r),\n"
-			"Float8ToUint4(sample[8*i+1].r),\n"
-			"Float8ToUint4(sample[8*i+2].r),\n"
-			"Float8ToUint4(sample[8*i+3].r),\n"
-			"Float8ToUint4(sample[8*i+4].r),\n"
-			"Float8ToUint4(sample[8*i+5].r),\n"
-			"Float8ToUint4(sample[8*i+6].r),\n"
-			"Float8ToUint4(sample[8*i+7].r)\n"
-			");\n"
-	"}\n"
-
-	"return uint4(dw[0], dw[1], dw[2], dw[3]);\n"
-"}\n"
-
-// FIXME: Untested
-"uint4 Generate_1(float2 cacheCoord)\n" // R8 (FIXME: Duplicate of R8 below?)
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.r, sample4.r, sample8.r, sampleC.r),\n"
-		"255*float4(sample1.r, sample5.r, sample9.r, sampleD.r),\n"
-		"255*float4(sample2.r, sample6.r, sampleA.r, sampleE.r),\n"
-		"255*float4(sample3.r, sample7.r, sampleB.r, sampleF.r)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-// FIXME: Untested
-"uint4 Generate_2(float2 cacheCoord)\n" // A4 R4
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-	
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint dw0 = UINT_44444444_BE(\n"
-		"Float8ToUint4(sample0.a), Float8ToUint4(sample0.r),\n"
-		"Float8ToUint4(sample1.a), Float8ToUint4(sample1.r),\n"
-		"Float8ToUint4(sample2.a), Float8ToUint4(sample2.r),\n"
-		"Float8ToUint4(sample3.a), Float8ToUint4(sample3.r)\n"
-		");\n"
-	"uint dw1 = UINT_44444444_BE(\n"
-		"Float8ToUint4(sample4.a), Float8ToUint4(sample4.r),\n"
-		"Float8ToUint4(sample5.a), Float8ToUint4(sample5.r),\n"
-		"Float8ToUint4(sample6.a), Float8ToUint4(sample6.r),\n"
-		"Float8ToUint4(sample7.a), Float8ToUint4(sample7.r)\n"
-		");\n"
-	"uint dw2 = UINT_44444444_BE(\n"
-		"Float8ToUint4(sample8.a), Float8ToUint4(sample8.r),\n"
-		"Float8ToUint4(sample9.a), Float8ToUint4(sample9.r),\n"
-		"Float8ToUint4(sampleA.a), Float8ToUint4(sampleA.r),\n"
-		"Float8ToUint4(sampleB.a), Float8ToUint4(sampleB.r)\n"
-		");\n"
-	"uint dw3 = UINT_44444444_BE(\n"
-		"Float8ToUint4(sampleC.a), Float8ToUint4(sampleC.r),\n"
-		"Float8ToUint4(sampleD.a), Float8ToUint4(sampleD.r),\n"
-		"Float8ToUint4(sampleE.a), Float8ToUint4(sampleE.r),\n"
-		"Float8ToUint4(sampleF.a), Float8ToUint4(sampleF.r)\n"
-		");\n"
-	
-	"return uint4(dw0, dw1, dw2, dw3);\n"
-"}\n"
-
-// FIXME: Untested
-"uint4 Generate_3(float2 cacheCoord)\n" // A8 R8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.a, sample2.a, sample4.a, sample6.a),\n"
-		"255*float4(sample0.r, sample2.r, sample4.r, sample6.r),\n"
-		"255*float4(sample1.a, sample3.a, sample5.a, sample7.a),\n"
-		"255*float4(sample1.r, sample3.r, sample5.r, sample7.r)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"uint4 Generate_4(float2 cacheCoord)\n" // R5 G6 B5
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-		
-	"uint dw0 = UINT_1616(EncodeRGB565(sample0), EncodeRGB565(sample1));\n"
-	"uint dw1 = UINT_1616(EncodeRGB565(sample2), EncodeRGB565(sample3));\n"
-	"uint dw2 = UINT_1616(EncodeRGB565(sample4), EncodeRGB565(sample5));\n"
-	"uint dw3 = UINT_1616(EncodeRGB565(sample6), EncodeRGB565(sample7));\n"
-
-	"return Swap4_32(uint4(dw0, dw1, dw2, dw3));\n"
-"}\n"
-
-"uint4 Generate_5(float2 cacheCoord)\n" // 1 R5 G5 B5 or 0 A3 R4 G4 G4
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-		
-	"uint dw0 = UINT_1616(EncodeRGB5A3(sample0), EncodeRGB5A3(sample1));\n"
-	"uint dw1 = UINT_1616(EncodeRGB5A3(sample2), EncodeRGB5A3(sample3));\n"
-	"uint dw2 = UINT_1616(EncodeRGB5A3(sample4), EncodeRGB5A3(sample5));\n"
-	"uint dw3 = UINT_1616(EncodeRGB5A3(sample6), EncodeRGB5A3(sample7));\n"
-	
-	"return Swap4_32(uint4(dw0, dw1, dw2, dw3));\n"
-"}\n"
-
-"uint4 Generate_6(float2 cacheCoord)\n" // A8 R8 A8 R8 | G8 B8 G8 B8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(4,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-
-	"uint4 dw4;\n"
-	"if (cacheCoord.x % 4 < 2)\n"
-	"{\n"
-		// First cache line gets AR
-		"dw4 = UINT4_8888_BE(\n"
-			"255*float4(sample0.a, sample2.a, sample4.a, sample6.a),\n"
-			"255*float4(sample0.r, sample2.r, sample4.r, sample6.r),\n"
-			"255*float4(sample1.a, sample3.a, sample5.a, sample7.a),\n"
-			"255*float4(sample1.r, sample3.r, sample5.r, sample7.r)\n"
-			");\n"
-	"}\n"
-	"else\n"
-	"{\n"
-		// Second cache line gets GB
-		"dw4 = UINT4_8888_BE(\n"
-			"255*float4(sample0.g, sample2.g, sample4.g, sample6.g),\n"
-			"255*float4(sample0.b, sample2.b, sample4.b, sample6.b),\n"
-			"255*float4(sample1.g, sample3.g, sample5.g, sample7.g),\n"
-			"255*float4(sample1.b, sample3.b, sample5.b, sample7.b)\n"
-			");\n"
-	"}\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"uint4 Generate_7(float2 cacheCoord)\n" // A8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-	
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.a, sample4.a, sample8.a, sampleC.a),\n"
-		"255*float4(sample1.a, sample5.a, sample9.a, sampleD.a),\n"
-		"255*float4(sample2.a, sample6.a, sampleA.a, sampleE.a),\n"
-		"255*float4(sample3.a, sample7.a, sampleB.a, sampleF.a)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"uint4 Generate_8(float2 cacheCoord)\n" // R8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.r, sample4.r, sample8.r, sampleC.r),\n"
-		"255*float4(sample1.r, sample5.r, sample9.r, sampleD.r),\n"
-		"255*float4(sample2.r, sample6.r, sampleA.r, sampleE.r),\n"
-		"255*float4(sample3.r, sample7.r, sampleB.r, sampleF.r)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-// FIXME: Untested
-"uint4 Generate_9(float2 cacheCoord)\n" // G8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.g, sample4.g, sample8.g, sampleC.g),\n"
-		"255*float4(sample1.g, sample5.g, sample9.g, sampleD.g),\n"
-		"255*float4(sample2.g, sample6.g, sampleA.g, sampleE.g),\n"
-		"255*float4(sample3.g, sample7.g, sampleB.g, sampleF.g)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"uint4 Generate_A(float2 cacheCoord)\n" // B8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(8,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-	
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(4,0));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(5,0));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(6,0));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(7,0));\n"
-	"float4 sample8 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample9 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sampleA = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sampleB = SampleEFB(subBlockUL+float2(3,1));\n"
-	"float4 sampleC = SampleEFB(subBlockUL+float2(4,1));\n"
-	"float4 sampleD = SampleEFB(subBlockUL+float2(5,1));\n"
-	"float4 sampleE = SampleEFB(subBlockUL+float2(6,1));\n"
-	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.b, sample4.b, sample8.b, sampleC.b),\n"
-		"255*float4(sample1.b, sample5.b, sample9.b, sampleD.b),\n"
-		"255*float4(sample2.b, sample6.b, sampleA.b, sampleE.b),\n"
-		"255*float4(sample3.b, sample7.b, sampleB.b, sampleF.b)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"uint4 Generate_B(float2 cacheCoord)\n" // G8 R8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.g, sample2.g, sample4.g, sample6.g),\n"
-		"255*float4(sample0.r, sample2.r, sample4.r, sample6.r),\n"
-		"255*float4(sample1.g, sample3.g, sample5.g, sample7.g),\n"
-		"255*float4(sample1.r, sample3.r, sample5.r, sample7.r)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-// FIXME: Untested
-"uint4 Generate_C(float2 cacheCoord)\n" // B8 G8
-"{\n"
-	"float2 blockCoord = floor(cacheCoord / float2(2,1));\n"
-
-	"float2 blockUL = blockCoord * float2(4,4);\n"
-	"float2 subBlockUL = blockUL + float2(0, 2*(cacheCoord.x%2));\n"
-
-	"float4 sample0 = SampleEFB(subBlockUL+float2(0,0));\n"
-	"float4 sample1 = SampleEFB(subBlockUL+float2(1,0));\n"
-	"float4 sample2 = SampleEFB(subBlockUL+float2(2,0));\n"
-	"float4 sample3 = SampleEFB(subBlockUL+float2(3,0));\n"
-	"float4 sample4 = SampleEFB(subBlockUL+float2(0,1));\n"
-	"float4 sample5 = SampleEFB(subBlockUL+float2(1,1));\n"
-	"float4 sample6 = SampleEFB(subBlockUL+float2(2,1));\n"
-	"float4 sample7 = SampleEFB(subBlockUL+float2(3,1));\n"
-
-	"uint4 dw4 = UINT4_8888_BE(\n"
-		"255*float4(sample0.b, sample2.b, sample4.b, sample6.b),\n"
-		"255*float4(sample0.g, sample2.g, sample4.g, sample6.g),\n"
-		"255*float4(sample1.b, sample3.b, sample5.b, sample7.b),\n"
-		"255*float4(sample1.g, sample3.g, sample5.g, sample7.g)\n"
-		");\n"
-	
-	"return dw4;\n"
-"}\n"
-
-"#ifdef DYNAMIC_MODE\n"
-"interface iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord);\n"
-"};\n"
-
-"class cGenerator_4 : iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord)\n"
-	"{ return Generate_4(cacheCoord); }\n"
-"};\n"
-
-"class cGenerator_5 : iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord)\n"
-	"{ return Generate_5(cacheCoord); }\n"
-"};\n"
-
-"class cGenerator_6 : iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord)\n"
-	"{ return Generate_6(cacheCoord); }\n"
-"};\n"
-
-"class cGenerator_8 : iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord)\n"
-	"{ return Generate_8(cacheCoord); }\n"
-"};\n"
-
-"class cGenerator_B : iGenerator\n"
-"{\n"
-	"uint4 Generate(float2 cacheCoord)\n"
-	"{ return Generate_B(cacheCoord); }\n"
-"};\n"
-
-// Declare generator interface; must be set by application
-"iGenerator g_generator;\n"
-"#define IMP_GENERATOR g_generator.Generate\n"
-
-"#endif\n"
-
-"#ifndef IMP_GENERATOR\n"
-"#error No generator specified\n"
-"#endif\n"
-
-"void main(out uint4 ocol0 : SV_Target, in float4 Pos : SV_Position, in float2 fCacheCoord : ENCODECOORD)\n"
-"{\n"
-	"float2 cacheCoord = floor(fCacheCoord);\n"
-	"ocol0 = IMP_GENERATOR(cacheCoord);\n"
-"}\n"
-;
-
-PSTextureEncoder::PSTextureEncoder()
-	: m_ready(false), m_out(NULL), m_outRTV(NULL), m_outStage(NULL),
-	m_encodeParams(NULL),
-	m_quad(NULL), m_vShader(NULL), m_quadLayout(NULL),
-	m_efbEncodeBlendState(NULL), m_efbEncodeDepthState(NULL),
-	m_efbEncodeRastState(NULL), m_efbSampler(NULL),
-	m_dynamicShader(NULL), m_classLinkage(NULL)
-{
-	for (size_t i = 0; i < 4; ++i)
-		m_fetchClass[i] = NULL;
-	for (size_t i = 0; i < 2; ++i)
-		m_scaledFetchClass[i] = NULL;
-	for (size_t i = 0; i < 2; ++i)
-		m_intensityClass[i] = NULL;
-	for (size_t i = 0; i < 16; ++i)
-		m_generatorClass[i] = NULL;
-}
-
-static const D3D11_INPUT_ELEMENT_DESC QUAD_LAYOUT_DESC[] = {
-	{ "POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }
-};
-
-static const struct QuadVertex
-{
-	float posX;
-	float posY;
-} QUAD_VERTS[4] = { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } };
-
-void PSTextureEncoder::Init()
-{
-	m_ready = false;
-
-	HRESULT hr;
-
-	// Create output texture RGBA format
-
-	// This format allows us to generate one cache line in two pixels.
-	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
-		DXGI_FORMAT_R32G32B32A32_UINT,
-		EFB_WIDTH, EFB_HEIGHT/4, 1, 1, D3D11_BIND_RENDER_TARGET);
-	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_out);
-	CHECK(SUCCEEDED(hr), "create efb encode output texture");
-	D3D::SetDebugObjectName(m_out, "efb encoder output texture");
-
-	// Create output render target view
-
-	D3D11_RENDER_TARGET_VIEW_DESC rtvd = CD3D11_RENDER_TARGET_VIEW_DESC(m_out,
-		D3D11_RTV_DIMENSION_TEXTURE2D, DXGI_FORMAT_R32G32B32A32_UINT);
-	hr = D3D::device->CreateRenderTargetView(m_out, &rtvd, &m_outRTV);
-	CHECK(SUCCEEDED(hr), "create efb encode output render target view");
-	D3D::SetDebugObjectName(m_outRTV, "efb encoder output rtv");
-
-	// Create output staging buffer
-	
-	t2dd.Usage = D3D11_USAGE_STAGING;
-	t2dd.BindFlags = 0;
-	t2dd.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_outStage);
-	CHECK(SUCCEEDED(hr), "create efb encode output staging buffer");
-	D3D::SetDebugObjectName(m_outStage, "efb encoder output staging buffer");
-
-	// Create constant buffer for uploading data to shaders
-
-	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(EFBEncodeParams),
-		D3D11_BIND_CONSTANT_BUFFER);
-	hr = D3D::device->CreateBuffer(&bd, NULL, &m_encodeParams);
-	CHECK(SUCCEEDED(hr), "create efb encode params buffer");
-	D3D::SetDebugObjectName(m_encodeParams, "efb encoder params buffer");
-
-	// Create vertex quad
-
-	bd = CD3D11_BUFFER_DESC(sizeof(QUAD_VERTS), D3D11_BIND_VERTEX_BUFFER,
-		D3D11_USAGE_IMMUTABLE);
-	D3D11_SUBRESOURCE_DATA srd = { QUAD_VERTS, 0, 0 };
-
-	hr = D3D::device->CreateBuffer(&bd, &srd, &m_quad);
-	CHECK(SUCCEEDED(hr), "create efb encode quad vertex buffer");
-	D3D::SetDebugObjectName(m_quad, "efb encoder quad vertex buffer");
-
-	// Create vertex shader
-
-	D3DBlob* bytecode = NULL;
-	if (!D3D::CompileVertexShader(EFB_ENCODE_VS, sizeof(EFB_ENCODE_VS), &bytecode))
-	{
-		ERROR_LOG(VIDEO, "EFB encode vertex shader failed to compile");
-		return;
-	}
-
-	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), NULL, &m_vShader);
-	CHECK(SUCCEEDED(hr), "create efb encode vertex shader");
-	D3D::SetDebugObjectName(m_vShader, "efb encoder vertex shader");
-
-	// Create input layout for vertex quad using bytecode from vertex shader
-
-	hr = D3D::device->CreateInputLayout(QUAD_LAYOUT_DESC,
-		sizeof(QUAD_LAYOUT_DESC)/sizeof(D3D11_INPUT_ELEMENT_DESC),
-		bytecode->Data(), bytecode->Size(), &m_quadLayout);
-	CHECK(SUCCEEDED(hr), "create efb encode quad vertex layout");
-	D3D::SetDebugObjectName(m_quadLayout, "efb encoder quad layout");
-
-	bytecode->Release();
-
-	// Create pixel shader
-
-#ifdef USE_DYNAMIC_MODE
-	if (!InitDynamicMode())
-#else
-	if (!InitStaticMode())
-#endif
-		return;
-
-	// Create blend state
-
-	D3D11_BLEND_DESC bld = CD3D11_BLEND_DESC(CD3D11_DEFAULT());
-	hr = D3D::device->CreateBlendState(&bld, &m_efbEncodeBlendState);
-	CHECK(SUCCEEDED(hr), "create efb encode blend state");
-	D3D::SetDebugObjectName(m_efbEncodeBlendState, "efb encoder blend state");
-
-	// Create depth state
-
-	D3D11_DEPTH_STENCIL_DESC dsd = CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT());
-	dsd.DepthEnable = FALSE;
-	hr = D3D::device->CreateDepthStencilState(&dsd, &m_efbEncodeDepthState);
-	CHECK(SUCCEEDED(hr), "create efb encode depth state");
-	D3D::SetDebugObjectName(m_efbEncodeDepthState, "efb encoder depth state");
-
-	// Create rasterizer state
-
-	D3D11_RASTERIZER_DESC rd = CD3D11_RASTERIZER_DESC(CD3D11_DEFAULT());
-	rd.CullMode = D3D11_CULL_NONE;
-	rd.DepthClipEnable = FALSE;
-	hr = D3D::device->CreateRasterizerState(&rd, &m_efbEncodeRastState);
-	CHECK(SUCCEEDED(hr), "create efb encode rast state");
-	D3D::SetDebugObjectName(m_efbEncodeRastState, "efb encoder rast state");
-
-	// Create efb texture sampler
-
-	D3D11_SAMPLER_DESC sd = CD3D11_SAMPLER_DESC(CD3D11_DEFAULT());
-	sd.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-	hr = D3D::device->CreateSamplerState(&sd, &m_efbSampler);
-	CHECK(SUCCEEDED(hr), "create efb encode texture sampler");
-	D3D::SetDebugObjectName(m_efbSampler, "efb encoder texture sampler");
-
-	m_ready = true;
-}
-
-void PSTextureEncoder::Shutdown()
-{
-	m_ready = false;
-	
-	for (size_t i = 0; i < 4; ++i)
-		SAFE_RELEASE(m_fetchClass[i]);
-	for (size_t i = 0; i < 2; ++i)
-		SAFE_RELEASE(m_scaledFetchClass[i]);
-	for (size_t i = 0; i < 2; ++i)
-		SAFE_RELEASE(m_intensityClass[i]);
-	for (size_t i = 0; i < 16; ++i)
-		SAFE_RELEASE(m_generatorClass[i]);
-	m_linkageArray.clear();
-	
-	SAFE_RELEASE(m_classLinkage);
-	SAFE_RELEASE(m_dynamicShader);
-
-	for (ComboMap::iterator it = m_staticShaders.begin();
-		it != m_staticShaders.end(); ++it)
-	{
-		SAFE_RELEASE(it->second);
-	}
-	m_staticShaders.clear();
-
-	SAFE_RELEASE(m_efbSampler);
-	SAFE_RELEASE(m_efbEncodeRastState);
-	SAFE_RELEASE(m_efbEncodeDepthState);
-	SAFE_RELEASE(m_efbEncodeBlendState);
-	SAFE_RELEASE(m_quadLayout);
-	SAFE_RELEASE(m_vShader);
-	SAFE_RELEASE(m_quad);
-	SAFE_RELEASE(m_encodeParams);
-	SAFE_RELEASE(m_outStage);
-	SAFE_RELEASE(m_outRTV);
-	SAFE_RELEASE(m_out);
-}
-
-size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
-	unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
-	bool scaleByHalf)
-{
-	if (!m_ready) // Make sure we initialized OK
-		return 0;
-
-	// Clamp srcRect to 640x528. BPS: The Strike tries to encode an 800x600
-	// texture, which is invalid.
-	EFBRectangle correctSrc = srcRect;
-	correctSrc.ClampUL(0, 0, EFB_WIDTH, EFB_HEIGHT);
-
-	// Validate source rect size
-	if (correctSrc.GetWidth() <= 0 || correctSrc.GetHeight() <= 0)
-		return 0;
-
-	HRESULT hr;
-
-	unsigned int blockW = BLOCK_WIDTHS[dstFormat];
-	unsigned int blockH = BLOCK_HEIGHTS[dstFormat];
-
-	// Round up source dims to multiple of block size
-	unsigned int actualWidth = correctSrc.GetWidth() / (scaleByHalf ? 2 : 1);
-	actualWidth = (actualWidth + blockW-1) & ~(blockW-1);
-	unsigned int actualHeight = correctSrc.GetHeight() / (scaleByHalf ? 2 : 1);
-	actualHeight = (actualHeight + blockH-1) & ~(blockH-1);
-
-	unsigned int numBlocksX = actualWidth/blockW;
-	unsigned int numBlocksY = actualHeight/blockH;
-
-	unsigned int cacheLinesPerRow;
-	if (dstFormat == 0x6) // RGBA takes two cache lines per block; all others take one
-		cacheLinesPerRow = numBlocksX*2;
-	else
-		cacheLinesPerRow = numBlocksX;
-	_assert_msg_(VIDEO, cacheLinesPerRow*32 <= MAX_BYTES_PER_BLOCK_ROW, "cache lines per row sanity check");
-
-	unsigned int totalCacheLines = cacheLinesPerRow * numBlocksY;
-	_assert_msg_(VIDEO, totalCacheLines*32 <= MAX_BYTES_PER_ENCODE, "total encode size sanity check");
-
-	size_t encodeSize = 0;
-	
-	// Reset API
-
-	g_renderer->ResetAPIState();
-
-	// Set up all the state for EFB encoding
-	
-#ifdef USE_DYNAMIC_MODE
-	if (SetDynamicShader(dstFormat, srcFormat, isIntensity, scaleByHalf))
-#else
-	if (SetStaticShader(dstFormat, srcFormat, isIntensity, scaleByHalf))
-#endif
-	{
-		D3D::context->VSSetShader(m_vShader, NULL, 0);
-
-		D3D::stateman->PushBlendState(m_efbEncodeBlendState);
-		D3D::stateman->PushDepthState(m_efbEncodeDepthState);
-		D3D::stateman->PushRasterizerState(m_efbEncodeRastState);
-		D3D::stateman->Apply();
-	
-		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, FLOAT(cacheLinesPerRow*2), FLOAT(numBlocksY));
-		D3D::context->RSSetViewports(1, &vp);
-
-		D3D::context->IASetInputLayout(m_quadLayout);
-		D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-		UINT stride = sizeof(QuadVertex);
-		UINT offset = 0;
-		D3D::context->IASetVertexBuffers(0, 1, &m_quad, &stride, &offset);
-	
-		EFBRectangle fullSrcRect;
-		fullSrcRect.left = 0;
-		fullSrcRect.top = 0;
-		fullSrcRect.right = EFB_WIDTH;
-		fullSrcRect.bottom = EFB_HEIGHT;
-		TargetRectangle targetRect = g_renderer->ConvertEFBRectangle(fullSrcRect);
-	
-		EFBEncodeParams params = { 0 };
-		params.NumHalfCacheLinesX = FLOAT(cacheLinesPerRow*2);
-		params.NumBlocksY = FLOAT(numBlocksY);
-		params.PosX = FLOAT(correctSrc.left);
-		params.PosY = FLOAT(correctSrc.top);
-		params.TexLeft = float(targetRect.left) / g_renderer->GetTargetWidth();
-		params.TexTop = float(targetRect.top) / g_renderer->GetTargetHeight();
-		params.TexRight = float(targetRect.right) / g_renderer->GetTargetWidth();
-		params.TexBottom = float(targetRect.bottom) / g_renderer->GetTargetHeight();
-		D3D::context->UpdateSubresource(m_encodeParams, 0, NULL, &params, 0, 0);
-
-		D3D::context->VSSetConstantBuffers(0, 1, &m_encodeParams);
-	
-		D3D::context->OMSetRenderTargets(1, &m_outRTV, NULL);
-
-		ID3D11ShaderResourceView* pEFB = (srcFormat == PIXELFMT_Z24) ?
-			FramebufferManager::GetEFBDepthTexture()->GetSRV() :
-			// FIXME: Instead of resolving EFB, it would be better to pick out a
-			// single sample from each pixel. The game may break if it isn't
-			// expecting the blurred edges around multisampled shapes.
-			FramebufferManager::GetResolvedEFBColorTexture()->GetSRV();
-
-		D3D::context->PSSetConstantBuffers(0, 1, &m_encodeParams);
-		D3D::context->PSSetShaderResources(0, 1, &pEFB);
-		D3D::context->PSSetSamplers(0, 1, &m_efbSampler);
-
-		// Encode!
-
-		D3D::context->Draw(4, 0);
-
-		// Copy to staging buffer
-
-		D3D11_BOX srcBox = CD3D11_BOX(0, 0, 0, cacheLinesPerRow*2, numBlocksY, 1);
-		D3D::context->CopySubresourceRegion(m_outStage, 0, 0, 0, 0, m_out, 0, &srcBox);
-
-		// Clean up state
-	
-		IUnknown* nullDummy = NULL;
-
-		D3D::context->PSSetSamplers(0, 1, (ID3D11SamplerState**)&nullDummy);
-		D3D::context->PSSetShaderResources(0, 1, (ID3D11ShaderResourceView**)&nullDummy);
-		D3D::context->PSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
-	
-		D3D::context->OMSetRenderTargets(0, NULL, NULL);
-
-		D3D::context->VSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
-		
-		D3D::stateman->PopRasterizerState();
-		D3D::stateman->PopDepthState();
-		D3D::stateman->PopBlendState();
-
-		D3D::context->PSSetShader(NULL, NULL, 0);
-		D3D::context->VSSetShader(NULL, NULL, 0);
-
-		// Transfer staging buffer to GameCube/Wii RAM
-
-		D3D11_MAPPED_SUBRESOURCE map = { 0 };
-		hr = D3D::context->Map(m_outStage, 0, D3D11_MAP_READ, 0, &map);
-		CHECK(SUCCEEDED(hr), "map staging buffer");
-
-		u8* src = (u8*)map.pData;
-		for (unsigned int y = 0; y < numBlocksY; ++y)
-		{
-			memcpy(dst, src, cacheLinesPerRow*32);
-			dst += bpmem.copyMipMapStrideChannels*32;
-			src += map.RowPitch;
-		}
-
-		D3D::context->Unmap(m_outStage, 0);
-
-		encodeSize = bpmem.copyMipMapStrideChannels*32 * numBlocksY;
-	}
-
-	// Restore API
-
-	g_renderer->RestoreAPIState();
-	D3D::context->OMSetRenderTargets(1,
-		&FramebufferManager::GetEFBColorTexture()->GetRTV(),
-		FramebufferManager::GetEFBDepthTexture()->GetDSV());
-
-	return encodeSize;
-}
-
-bool PSTextureEncoder::InitStaticMode()
-{
-	// Nothing to really do.
-	return true;
-}
-
-static const char* FETCH_FUNC_NAMES[4] = {
-	"Fetch_0", "Fetch_1", "Fetch_2", "Fetch_3"
-};
-
-static const char* SCALEDFETCH_FUNC_NAMES[2] = {
-	"ScaledFetch_0", "ScaledFetch_1"
-};
-
-static const char* INTENSITY_FUNC_NAMES[2] = {
-	"Intensity_0", "Intensity_1"
-};
-
-bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcFormat,
-	bool isIntensity, bool scaleByHalf)
-{
-	size_t fetchNum = srcFormat;
-	size_t scaledFetchNum = scaleByHalf ? 1 : 0;
-	size_t intensityNum = isIntensity ? 1 : 0;
-	size_t generatorNum = dstFormat;
-
-	ComboKey key = MakeComboKey(dstFormat, srcFormat, isIntensity, scaleByHalf);
-
-	ComboMap::iterator it = m_staticShaders.find(key);
-	if (it == m_staticShaders.end())
-	{
-		const char* generatorFuncName = NULL;
-		switch (generatorNum)
-		{
-		case 0x0: generatorFuncName = "Generate_0"; break;
-		case 0x1: generatorFuncName = "Generate_1"; break;
-		case 0x2: generatorFuncName = "Generate_2"; break;
-		case 0x3: generatorFuncName = "Generate_3"; break;
-		case 0x4: generatorFuncName = "Generate_4"; break;
-		case 0x5: generatorFuncName = "Generate_5"; break;
-		case 0x6: generatorFuncName = "Generate_6"; break;
-		case 0x7: generatorFuncName = "Generate_7"; break;
-		case 0x8: generatorFuncName = "Generate_8"; break;
-		case 0x9: generatorFuncName = "Generate_9"; break;
-		case 0xA: generatorFuncName = "Generate_A"; break;
-		case 0xB: generatorFuncName = "Generate_B"; break;
-		case 0xC: generatorFuncName = "Generate_C"; break;
-		default:
-			WARN_LOG(VIDEO, "No generator available for dst format 0x%X; aborting", generatorNum);
-			m_staticShaders[key] = NULL;
-			return false;
-		}
-
-		INFO_LOG(VIDEO, "Compiling efb encoding shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d",
-			dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
-
-		// Shader permutation not found, so compile it
-		D3DBlob* bytecode = NULL;
-		D3D_SHADER_MACRO macros[] = {
-			{ "IMP_FETCH", FETCH_FUNC_NAMES[fetchNum] },
-			{ "IMP_SCALEDFETCH", SCALEDFETCH_FUNC_NAMES[scaledFetchNum] },
-			{ "IMP_INTENSITY", INTENSITY_FUNC_NAMES[intensityNum] },
-			{ "IMP_GENERATOR", generatorFuncName },
-			{ NULL, NULL }
-		};
-		if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros))
-		{
-			WARN_LOG(VIDEO, "EFB encoder shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d failed to compile",
-				dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
-			// Add dummy shader to map to prevent trying to compile over and
-			// over again
-			m_staticShaders[key] = NULL;
-			return false;
-		}
-
-		ID3D11PixelShader* newShader;
-		HRESULT hr = D3D::device->CreatePixelShader(bytecode->Data(), bytecode->Size(), NULL, &newShader);
-		CHECK(SUCCEEDED(hr), "create efb encoder pixel shader");
-
-		it = m_staticShaders.insert(std::make_pair(key, newShader)).first;
-		bytecode->Release();
-	}
-
-	if (it != m_staticShaders.end())
-	{
-		if (it->second)
-		{
-			D3D::context->PSSetShader(it->second, NULL, 0);
-			return true;
-		}
-		else
-			return false;
-	}
-	else
-		return false;
-}
-
-bool PSTextureEncoder::InitDynamicMode()
-{
-	HRESULT hr;
-
-	D3D_SHADER_MACRO macros[] = {
-		{ "DYNAMIC_MODE", NULL },
-		{ NULL, NULL }
-	};
-
-	D3DBlob* bytecode = NULL;
-	if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros))
-	{
-		ERROR_LOG(VIDEO, "EFB encode pixel shader failed to compile");
-		return false;
-	}
-
-	hr = D3D::device->CreateClassLinkage(&m_classLinkage);
-	CHECK(SUCCEEDED(hr), "create efb encode class linkage");
-	D3D::SetDebugObjectName(m_classLinkage, "efb encoder class linkage");
-
-	hr = D3D::device->CreatePixelShader(bytecode->Data(), bytecode->Size(), m_classLinkage, &m_dynamicShader);
-	CHECK(SUCCEEDED(hr), "create efb encode pixel shader");
-	D3D::SetDebugObjectName(m_dynamicShader, "efb encoder pixel shader");
-	
-	// Use D3DReflect
-
-	ID3D11ShaderReflection* reflect = NULL;
-	hr = PD3DReflect(bytecode->Data(), bytecode->Size(), IID_ID3D11ShaderReflection, (void**)&reflect);
-	CHECK(SUCCEEDED(hr), "reflect on efb encoder shader");
-
-	// Get number of slots and create dynamic linkage array
-
-	UINT numSlots = reflect->GetNumInterfaceSlots();
-	m_linkageArray.resize(numSlots, NULL);
-
-	// Get interface slots
-
-	ID3D11ShaderReflectionVariable* var = reflect->GetVariableByName("g_fetch");
-	m_fetchSlot = var->GetInterfaceSlot(0);
-
-	var = reflect->GetVariableByName("g_scaledFetch");
-	m_scaledFetchSlot = var->GetInterfaceSlot(0);
-
-	var = reflect->GetVariableByName("g_intensity");
-	m_intensitySlot = var->GetInterfaceSlot(0);
-
-	var = reflect->GetVariableByName("g_generator");
-	m_generatorSlot = var->GetInterfaceSlot(0);
-
-	INFO_LOG(VIDEO, "Fetch slot %d, scaledFetch slot %d, intensity slot %d, generator slot %d",
-		m_fetchSlot, m_scaledFetchSlot, m_intensitySlot, m_generatorSlot);
-
-	// Class instances will be created at the time they are used
-
-	for (size_t i = 0; i < 4; ++i)
-		m_fetchClass[i] = NULL;
-	for (size_t i = 0; i < 2; ++i)
-		m_scaledFetchClass[i] = NULL;
-	for (size_t i = 0; i < 2; ++i)
-		m_intensityClass[i] = NULL;
-	for (size_t i = 0; i < 16; ++i)
-		m_generatorClass[i] = NULL;
-
-	reflect->Release();
-	bytecode->Release();
-
-	return true;
-}
-
-static const char* FETCH_CLASS_NAMES[4] = {
-	"cFetch_0", "cFetch_1", "cFetch_2", "cFetch_3"
-};
-
-static const char* SCALEDFETCH_CLASS_NAMES[2] = {
-	"cScaledFetch_0", "cScaledFetch_1"
-};
-
-static const char* INTENSITY_CLASS_NAMES[2] = {
-	"cIntensity_0", "cIntensity_1"
-};
-
-bool PSTextureEncoder::SetDynamicShader(unsigned int dstFormat,
-	unsigned int srcFormat, bool isIntensity, bool scaleByHalf)
-{
-	size_t fetchNum = srcFormat;
-	size_t scaledFetchNum = scaleByHalf ? 1 : 0;
-	size_t intensityNum = isIntensity ? 1 : 0;
-	size_t generatorNum = dstFormat;
-
-	// FIXME: Not all the possible generators are available as classes yet.
-	// When dynamic mode is usable, implement them.
-	const char* generatorName = NULL;
-	switch (generatorNum)
-	{
-	case 0x4: generatorName = "cGenerator_4"; break;
-	case 0x5: generatorName = "cGenerator_5"; break;
-	case 0x6: generatorName = "cGenerator_6"; break;
-	case 0x8: generatorName = "cGenerator_8"; break;
-	case 0xB: generatorName = "cGenerator_B"; break;
-	default:
-		WARN_LOG(VIDEO, "No generator available for dst format 0x%X; aborting", generatorNum);
-		return false;
-	}
-
-	// Make sure class instances are available
-	if (!m_fetchClass[fetchNum])
-	{
-		INFO_LOG(VIDEO, "Creating %s class instance for encoder 0x%X",
-			FETCH_CLASS_NAMES[fetchNum], dstFormat);
-		HRESULT hr = m_classLinkage->CreateClassInstance(
-			FETCH_CLASS_NAMES[fetchNum], 0, 0, 0, 0, &m_fetchClass[fetchNum]);
-		CHECK(SUCCEEDED(hr), "create fetch class instance");
-	}
-	if (!m_scaledFetchClass[scaledFetchNum])
-	{
-		INFO_LOG(VIDEO, "Creating %s class instance for encoder 0x%X",
-			SCALEDFETCH_CLASS_NAMES[scaledFetchNum], dstFormat);
-		HRESULT hr = m_classLinkage->CreateClassInstance(
-			SCALEDFETCH_CLASS_NAMES[scaledFetchNum], 0, 0, 0, 0,
-			&m_scaledFetchClass[scaledFetchNum]);
-		CHECK(SUCCEEDED(hr), "create scaled fetch class instance");
-	}
-	if (!m_intensityClass[intensityNum])
-	{
-		INFO_LOG(VIDEO, "Creating %s class instance for encoder 0x%X",
-			INTENSITY_CLASS_NAMES[intensityNum], dstFormat);
-		HRESULT hr = m_classLinkage->CreateClassInstance(
-			INTENSITY_CLASS_NAMES[intensityNum], 0, 0, 0, 0,
-			&m_intensityClass[intensityNum]);
-		CHECK(SUCCEEDED(hr), "create intensity class instance");
-	}
-	if (!m_generatorClass[generatorNum])
-	{
-		INFO_LOG(VIDEO, "Creating %s class instance for encoder 0x%X",
-			generatorName, dstFormat);
-		HRESULT hr = m_classLinkage->CreateClassInstance(
-			generatorName, 0, 0, 0, 0, &m_generatorClass[generatorNum]);
-		CHECK(SUCCEEDED(hr), "create generator class instance");
-	}
-
-	// Assemble dynamic linkage array
-	if (m_fetchSlot != UINT(-1))
-		m_linkageArray[m_fetchSlot] = m_fetchClass[fetchNum];
-	if (m_scaledFetchSlot != UINT(-1))
-		m_linkageArray[m_scaledFetchSlot] = m_scaledFetchClass[scaledFetchNum];
-	if (m_intensitySlot != UINT(-1))
-		m_linkageArray[m_intensitySlot] = m_intensityClass[intensityNum];
-	if (m_generatorSlot != UINT(-1))
-		m_linkageArray[m_generatorSlot] = m_generatorClass[generatorNum];
-	
-	D3D::context->PSSetShader(m_dynamicShader,
-		m_linkageArray.empty() ? NULL : &m_linkageArray[0],
-		(UINT)m_linkageArray.size());
-
-	return true;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
deleted file mode 100644
index 14cdfa8bae..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PSTEXTUREENCODER_H
-#define _PSTEXTUREENCODER_H
-
-#include "TextureEncoder.h"
-
-struct ID3D11Texture2D;
-struct ID3D11RenderTargetView;
-struct ID3D11Buffer;
-struct ID3D11InputLayout;
-struct ID3D11VertexShader;
-struct ID3D11PixelShader;
-struct ID3D11ClassLinkage;
-struct ID3D11ClassInstance;
-struct ID3D11BlendState;
-struct ID3D11DepthStencilState;
-struct ID3D11RasterizerState;
-struct ID3D11SamplerState;
-
-namespace DX11
-{
-
-class PSTextureEncoder : public TextureEncoder
-{
-
-public:
-
-	PSTextureEncoder();
-
-	void Init();
-	void Shutdown();
-	size_t Encode(u8* dst, unsigned int dstFormat,
-		unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
-		bool scaleByHalf);
-
-private:
-	
-	bool m_ready;
-
-	ID3D11Texture2D* m_out;
-	ID3D11RenderTargetView* m_outRTV;
-	ID3D11Texture2D* m_outStage;
-	ID3D11Buffer* m_encodeParams;
-	ID3D11Buffer* m_quad;
-	ID3D11VertexShader* m_vShader;
-	ID3D11InputLayout* m_quadLayout;
-	ID3D11BlendState* m_efbEncodeBlendState;
-	ID3D11DepthStencilState* m_efbEncodeDepthState;
-	ID3D11RasterizerState* m_efbEncodeRastState;
-	ID3D11SamplerState* m_efbSampler;
-
-	// Stuff only used in static-linking mode (SM4.0-compatible)
-
-	bool InitStaticMode();
-	bool SetStaticShader(unsigned int dstFormat, unsigned int srcFormat,
-		bool isIntensity, bool scaleByHalf);
-
-	typedef unsigned int ComboKey; // Key for a shader combination
-
-	ComboKey MakeComboKey(unsigned int dstFormat, unsigned int srcFormat,
-		bool isIntensity, bool scaleByHalf)
-	{
-		return (dstFormat << 4) | (srcFormat << 2) | (isIntensity ? (1<<1) : 0)
-			| (scaleByHalf ? (1<<0) : 0);
-	}
-
-	typedef std::map<ComboKey, ID3D11PixelShader*> ComboMap;
-
-	ComboMap m_staticShaders;
-
-	// Stuff only used for dynamic-linking mode (SM5.0+, available as soon as
-	// Microsoft fixes their bloody HLSL compiler)
-	
-	bool InitDynamicMode();
-	bool SetDynamicShader(unsigned int dstFormat, unsigned int srcFormat,
-		bool isIntensity, bool scaleByHalf);
-
-	ID3D11PixelShader* m_dynamicShader;
-	ID3D11ClassLinkage* m_classLinkage;
-
-	// Interface slots
-	UINT m_fetchSlot;
-	UINT m_scaledFetchSlot;
-	UINT m_intensitySlot;
-	UINT m_generatorSlot;
-
-	// Class instances
-	// Fetch: 0 is RGB, 1 is RGBA, 2 is RGB565, 3 is Z
-	ID3D11ClassInstance* m_fetchClass[4];
-	// ScaledFetch: 0 is off, 1 is on
-	ID3D11ClassInstance* m_scaledFetchClass[2];
-	// Intensity: 0 is off, 1 is on
-	ID3D11ClassInstance* m_intensityClass[2];
-	// Generator: one for each dst format, 16 total
-	ID3D11ClassInstance* m_generatorClass[16];
-
-	std::vector<ID3D11ClassInstance*> m_linkageArray;
-
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
deleted file mode 100644
index 1bcd314291..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#include "RenderBase.h"
-
-#include "D3DBase.h"
-#include "PerfQuery.h"
-
-namespace DX11 {
-
-PerfQuery::PerfQuery()
-	: m_query_read_pos()
-	, m_query_count()
-{
-	for (int i = 0; i != ArraySize(m_query_buffer); ++i)
-	{
-		D3D11_QUERY_DESC qdesc = CD3D11_QUERY_DESC(D3D11_QUERY_OCCLUSION, 0);
-		D3D::device->CreateQuery(&qdesc, &m_query_buffer[i].query);
-	}
-	ResetQuery();
-}
-
-PerfQuery::~PerfQuery()
-{
-	for (int i = 0; i != ArraySize(m_query_buffer); ++i)
-	{
-		// TODO: EndQuery?
-		m_query_buffer[i].query->Release();
-	}
-}
-
-void PerfQuery::EnableQuery(PerfQueryGroup type)
-{
-	if (!ShouldEmulate())
-		return;
-
-	// Is this sane?
-	if (m_query_count > ArraySize(m_query_buffer) / 2)
-		WeakFlush();
-
-	if (ArraySize(m_query_buffer) == m_query_count)
-	{
-		// TODO
-		FlushOne();
-		ERROR_LOG(VIDEO, "Flushed query buffer early!");
-	}
-
-	// start query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)];
-
-		D3D::context->Begin(entry.query);
-		entry.query_type = type;
-
-		++m_query_count;
-	}
-}
-
-void PerfQuery::DisableQuery(PerfQueryGroup type)
-{
-	if (!ShouldEmulate())
-		return;
-
-	// stop query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ArraySize(m_query_buffer)-1) % ArraySize(m_query_buffer)];
-		D3D::context->End(entry.query);
-	}
-}
-
-void PerfQuery::ResetQuery()
-{
-	m_query_count = 0;
-	std::fill_n(m_results, ArraySize(m_results), 0);
-}
-
-u32 PerfQuery::GetQueryResult(PerfQueryType type)
-{
-	if (!ShouldEmulate())
-		return 0;
-
-	u32 result = 0;
-
-	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
-	{
-		result = m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
-	{
-		result = m_results[PQG_ZCOMP];
-	}
-	else if (type == PQ_BLEND_INPUT)
-	{
-		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_EFB_COPY_CLOCKS)
-	{
-		result = m_results[PQG_EFB_COPY_CLOCKS];
-	}
-
-	return result / 4;
-}
-
-void PerfQuery::FlushOne()
-{
-	if (!ShouldEmulate())
-		return;
-
-	auto& entry = m_query_buffer[m_query_read_pos];
-
-	UINT64 result = 0;
-	HRESULT hr = S_FALSE;
-	while (hr != S_OK)
-	{
-		// TODO: Might cause us to be stuck in an infinite loop!
-		hr = D3D::context->GetData(entry.query, &result, sizeof(result), 0);
-	}
-
-	// NOTE: Reported pixel metrics should be referenced to native resolution
-	m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
-
-	m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer);
-	--m_query_count;
-}
-
-// TODO: could selectively flush things, but I don't think that will do much
-void PerfQuery::FlushResults()
-{
-	if (!ShouldEmulate())
-		return;
-
-	while (!IsFlushed())
-		FlushOne();
-}
-
-void PerfQuery::WeakFlush()
-{
-	if (!ShouldEmulate())
-		return;
-
-	while (!IsFlushed())
-	{
-		auto& entry = m_query_buffer[m_query_read_pos];
-
-		UINT64 result = 0;
-		HRESULT hr = D3D::context->GetData(entry.query, &result, sizeof(result), D3D11_ASYNC_GETDATA_DONOTFLUSH);
-
-		if (hr == S_OK)
-		{
-			// NOTE: Reported pixel metrics should be referenced to native resolution
-			m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
-
-			m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer);
-			--m_query_count;
-		}
-		else
-		{
-			break;
-		}
-	}
-}
-
-bool PerfQuery::IsFlushed() const
-{
-	if (!ShouldEmulate())
-		return true;
-
-	return 0 == m_query_count;
-}
-
-
-} // namespace
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.h b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.h
deleted file mode 100644
index b3709d1013..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _PERFQUERY_H_
-#define _PERFQUERY_H_
-
-#include "PerfQueryBase.h"
-
-namespace DX11 {
-
-class PerfQuery : public PerfQueryBase
-{
-public:
-	PerfQuery();
-	~PerfQuery();
-
-	void EnableQuery(PerfQueryGroup type);
-	void DisableQuery(PerfQueryGroup type);
-	void ResetQuery();
-	u32 GetQueryResult(PerfQueryType type);
-	void FlushResults();
-	bool IsFlushed() const;
-
-private:
-	struct ActiveQuery
-	{
-		ID3D11Query* query;
-		PerfQueryGroup query_type;
-	};
-
-	void WeakFlush();
-
-	// Only use when non-empty
-	void FlushOne();
-
-	// when testing in SMS: 64 was too small, 128 was ok
-	static const int PERF_QUERY_BUFFER_SIZE = 512;
-
-	ActiveQuery m_query_buffer[PERF_QUERY_BUFFER_SIZE];
-	int m_query_read_pos;
-
-	// TODO: sloppy
-	volatile int m_query_count;
-	volatile u32 m_results[PQG_NUM_MEMBERS];
-};
-
-} // namespace
-
-#endif // _PERFQUERY_H_
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
deleted file mode 100644
index 1dd98edd2e..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FileUtil.h"
-#include "LinearDiskCache.h"
-
-#include "Debugger.h"
-#include "Statistics.h"
-#include "VideoConfig.h"
-
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "Globals.h"
-#include "PixelShaderGen.h"
-#include "PixelShaderCache.h"
-
-#include "ConfigManager.h"
-
-extern int frameCount;
-
-// See comment near the bottom of this file.
-float psconstants[C_PENVCONST_END*4];
-bool pscbufchanged = true;
-
-namespace DX11
-{
-
-PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
-const PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry;
-PixelShaderUid PixelShaderCache::last_uid;
-UidChecker<PixelShaderUid,PixelShaderCode> PixelShaderCache::pixel_uid_checker;
-
-LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
-
-ID3D11PixelShader* s_ColorMatrixProgram[2] = {NULL};
-ID3D11PixelShader* s_ColorCopyProgram[2] = {NULL};
-ID3D11PixelShader* s_DepthMatrixProgram[2] = {NULL};
-ID3D11PixelShader* s_ClearProgram = NULL;
-ID3D11PixelShader* s_rgba6_to_rgb8[2] = {NULL};
-ID3D11PixelShader* s_rgb8_to_rgba6[2] = {NULL};
-ID3D11Buffer* pscbuf = NULL;
-
-const char clear_program_code[] = {
-	"void main(\n"
-	"out float4 ocol0 : SV_Target,\n"
-	"in float4 pos : SV_Position,\n"
-	"in float4 incol0 : COLOR0){\n"
-	"ocol0 = incol0;\n"
-	"}\n"
-};
-
-// TODO: Find some way to avoid having separate shaders for non-MSAA and MSAA...
-const char color_copy_program_code[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2D Tex0 : register(t0);\n"
-	"void main(\n"
-	"out float4 ocol0 : SV_Target,\n"
-	"in float4 pos : SV_Position,\n"
-	"in float2 uv0 : TEXCOORD0){\n"
-	"ocol0 = Tex0.Sample(samp0,uv0);\n"
-	"}\n"
-};
-
-// TODO: Improve sampling algorithm!
-const char color_copy_program_code_msaa[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2DMS<float4, %d> Tex0 : register(t0);\n"
-	"void main(\n"
-	"out float4 ocol0 : SV_Target,\n"
-	"in float4 pos : SV_Position,\n"
-	"in float2 uv0 : TEXCOORD0){\n"
-	"int width, height, samples;\n"
-	"Tex0.GetDimensions(width, height, samples);\n"
-	"ocol0 = 0;\n"
-	"for(int i = 0; i < samples; ++i)\n"
-	"	ocol0 += Tex0.Load(int2(uv0.x*(width), uv0.y*(height)), i);\n"
-	"ocol0 /= samples;\n"
-	"}\n"
-};
-
-const char color_matrix_program_code[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2D Tex0 : register(t0);\n"
-	"uniform float4 cColMatrix[7] : register(c0);\n"
-	"void main(\n" 
-	"out float4 ocol0 : SV_Target,\n"
-	"in float4 pos : SV_Position,\n"
-	" in float2 uv0 : TEXCOORD0){\n"
-	"float4 texcol = Tex0.Sample(samp0,uv0);\n"
-	"texcol = round(texcol * cColMatrix[5])*cColMatrix[6];\n"
-	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
-	"}\n"
-};
-
-const char color_matrix_program_code_msaa[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2DMS<float4, %d> Tex0 : register(t0);\n"
-	"uniform float4 cColMatrix[7] : register(c0);\n"
-	"void main(\n" 
-	"out float4 ocol0 : SV_Target,\n"
-	"in float4 pos : SV_Position,\n"
-	" in float2 uv0 : TEXCOORD0){\n"
-	"int width, height, samples;\n"
-	"Tex0.GetDimensions(width, height, samples);\n"
-	"float4 texcol = 0;\n"
-	"for(int i = 0; i < samples; ++i)\n"
-	"	texcol += Tex0.Load(int2(uv0.x*(width), uv0.y*(height)), i);\n"
-	"texcol /= samples;\n"
-	"texcol = round(texcol * cColMatrix[5])*cColMatrix[6];\n"
-	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
-	"}\n"
-};
-
-const char depth_matrix_program[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2D Tex0 : register(t0);\n"
-	"uniform float4 cColMatrix[7] : register(c0);\n"
-	"void main(\n"
-	"out float4 ocol0 : SV_Target,\n"
-	" in float4 pos : SV_Position,\n"
-	" in float2 uv0 : TEXCOORD0){\n"
-	"float4 texcol = Tex0.Sample(samp0,uv0);\n"
-	"float4 EncodedDepth = frac((texcol.r * (16777215.0f/16777216.0f)) * float4(1.0f,256.0f,256.0f*256.0f,1.0f));\n"
-	"texcol = round(EncodedDepth * (16777216.0f/16777215.0f) * float4(255.0f,255.0f,255.0f,15.0f)) / float4(255.0f,255.0f,255.0f,15.0f);\n"
-	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
-	"}\n"
-};
-
-const char depth_matrix_program_msaa[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2DMS<float4, %d> Tex0 : register(t0);\n"
-	"uniform float4 cColMatrix[7] : register(c0);\n"
-	"void main(\n"
-	"out float4 ocol0 : SV_Target,\n"
-	" in float4 pos : SV_Position,\n"
-	" in float2 uv0 : TEXCOORD0){\n"
-	"int width, height, samples;\n"
-	"Tex0.GetDimensions(width, height, samples);\n"
-	"float4 texcol = 0;\n"
-	"for(int i = 0; i < samples; ++i)\n"
-	"	texcol += Tex0.Load(int2(uv0.x*(width), uv0.y*(height)), i);\n"
-	"texcol /= samples;\n"
-	"float4 EncodedDepth = frac((texcol.r * (16777215.0f/16777216.0f)) * float4(1.0f,256.0f,256.0f*256.0f,16.0f));\n"
-	"texcol = round(EncodedDepth * (16777216.0f/16777215.0f) * float4(255.0f,255.0f,255.0f,15.0f)) / float4(255.0f,255.0f,255.0f,15.0f);\n"
-	"ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n"
-	"}\n"
-};
-
-const char reint_rgba6_to_rgb8[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2D Tex0 : register(t0);\n"
-	"void main(\n"
-	"	out float4 ocol0 : SV_Target,\n"
-	"	in float4 pos : SV_Position,\n"
-	"	in float2 uv0 : TEXCOORD0)\n"
-	"{\n"
-	"	int4 src6 = round(Tex0.Sample(samp0,uv0) * 63.f);\n"
-	"	int4 dst8;\n"
-	"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
-	"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
-	"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
-	"	dst8.a = 255;\n"
-	"	ocol0 = (float4)dst8 / 255.f;\n"
-	"}"
-};
-
-const char reint_rgba6_to_rgb8_msaa[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2DMS<float4, %d> Tex0 : register(t0);\n"
-	"void main(\n"
-	"	out float4 ocol0 : SV_Target,\n"
-	"	in float4 pos : SV_Position,\n"
-	"	in float2 uv0 : TEXCOORD0)\n"
-	"{\n"
-	"	int width, height, samples;\n"
-	"	Tex0.GetDimensions(width, height, samples);\n"
-	"	float4 texcol = 0;\n"
-	"	for(int i = 0; i < samples; ++i)\n"
-	"		texcol += Tex0.Load(int2(uv0.x*(width), uv0.y*(height)), i);\n"
-	"	texcol /= samples;\n"
-	"	int4 src6 = round(texcol * 63.f);\n"
-	"	int4 dst8;\n"
-	"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
-	"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
-	"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
-	"	dst8.a = 255;\n"
-	"	ocol0 = (float4)dst8 / 255.f;\n"
-	"}"
-};
-
-const char reint_rgb8_to_rgba6[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2D Tex0 : register(t0);\n"
-	"void main(\n"
-	"	out float4 ocol0 : SV_Target,\n"
-	"	in float4 pos : SV_Position,\n"
-	"	in float2 uv0 : TEXCOORD0)\n"
-	"{\n"
-	"	int4 src8 = round(Tex0.Sample(samp0,uv0) * 255.f);\n"
-	"	int4 dst6;\n"
-	"	dst6.r = src8.r >> 2;\n"
-	"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
-	"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
-	"	dst6.a = src8.b & 0x3F;\n"
-	"	ocol0 = (float4)dst6 / 63.f;\n"
-	"}\n"
-};
-
-const char reint_rgb8_to_rgba6_msaa[] = {
-	"sampler samp0 : register(s0);\n"
-	"Texture2DMS<float4, %d> Tex0 : register(t0);\n"
-	"void main(\n"
-	"	out float4 ocol0 : SV_Target,\n"
-	"	in float4 pos : SV_Position,\n"
-	"	in float2 uv0 : TEXCOORD0)\n"
-	"{\n"
-	"	int width, height, samples;\n"
-	"	Tex0.GetDimensions(width, height, samples);\n"
-	"	float4 texcol = 0;\n"
-	"	for(int i = 0; i < samples; ++i)\n"
-	"		texcol += Tex0.Load(int2(uv0.x*(width), uv0.y*(height)), i);\n"
-	"	texcol /= samples;\n"
-	"	int4 src8 = round(texcol * 255.f);\n"
-	"	int4 dst6;\n"
-	"	dst6.r = src8.r >> 2;\n"
-	"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
-	"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
-	"	dst6.a = src8.b & 0x3F;\n"
-	"	ocol0 = (float4)dst6 / 63.f;\n"
-	"}\n"
-};
-
-ID3D11PixelShader* PixelShaderCache::ReinterpRGBA6ToRGB8(bool multisampled)
-{
-	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
-	{
-		if (!s_rgba6_to_rgb8[0])
-		{
-			s_rgba6_to_rgb8[0] = D3D::CompileAndCreatePixelShader(reint_rgba6_to_rgb8, sizeof(reint_rgba6_to_rgb8));
-			CHECK(s_rgba6_to_rgb8[0], "Create RGBA6 to RGB8 pixel shader");
-			D3D::SetDebugObjectName(s_rgba6_to_rgb8[0], "RGBA6 to RGB8 pixel shader");
-		}
-		return s_rgba6_to_rgb8[0];
-	}
-	else if (!s_rgba6_to_rgb8[1])
-	{
-		// create MSAA shader for current AA mode
-		char buf[1024];
-		const int l = sprintf_s(buf, 1024, reint_rgba6_to_rgb8_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
-
-		s_rgba6_to_rgb8[1] = D3D::CompileAndCreatePixelShader(buf, l);
-
-		CHECK(s_rgba6_to_rgb8[1], "Create RGBA6 to RGB8 MSAA pixel shader");
-		D3D::SetDebugObjectName(s_rgba6_to_rgb8[1], "RGBA6 to RGB8 MSAA pixel shader");
-	}
-	return s_rgba6_to_rgb8[1];
-}
-
-ID3D11PixelShader* PixelShaderCache::ReinterpRGB8ToRGBA6(bool multisampled)
-{
-	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1)
-	{
-		if (!s_rgb8_to_rgba6[0])
-		{
-			s_rgb8_to_rgba6[0] = D3D::CompileAndCreatePixelShader(reint_rgb8_to_rgba6, sizeof(reint_rgb8_to_rgba6));
-			CHECK(s_rgb8_to_rgba6[0], "Create RGB8 to RGBA6 pixel shader");
-			D3D::SetDebugObjectName(s_rgb8_to_rgba6[0], "RGB8 to RGBA6 pixel shader");
-		}
-		return s_rgb8_to_rgba6[0];
-	}
-	else if (!s_rgb8_to_rgba6[1])
-	{
-		// create MSAA shader for current AA mode
-		char buf[1024];
-		const int l = sprintf_s(buf, 1024, reint_rgb8_to_rgba6_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
-
-		s_rgb8_to_rgba6[1] = D3D::CompileAndCreatePixelShader(buf, l);
-
-		CHECK(s_rgb8_to_rgba6[1], "Create RGB8 to RGBA6 MSAA pixel shader");
-		D3D::SetDebugObjectName(s_rgb8_to_rgba6[1], "RGB8 to RGBA6 MSAA pixel shader");
-	}
-	return s_rgb8_to_rgba6[1];
-}
-
-ID3D11PixelShader* PixelShaderCache::GetColorCopyProgram(bool multisampled)
-{
-	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1) return s_ColorCopyProgram[0];
-	else if (s_ColorCopyProgram[1]) return s_ColorCopyProgram[1];
-	else
-	{
-		// create MSAA shader for current AA mode
-		char buf[1024];
-		int l = sprintf_s(buf, 1024, color_copy_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
-		s_ColorCopyProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
-		CHECK(s_ColorCopyProgram[1]!=NULL, "Create color copy MSAA pixel shader");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[1], "color copy MSAA pixel shader");
-		return s_ColorCopyProgram[1];
-	}
-}
-
-ID3D11PixelShader* PixelShaderCache::GetColorMatrixProgram(bool multisampled)
-{
-	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1) return s_ColorMatrixProgram[0];
-	else if (s_ColorMatrixProgram[1]) return s_ColorMatrixProgram[1];
-	else
-	{
-		// create MSAA shader for current AA mode
-		char buf[1024];
-		int l = sprintf_s(buf, 1024, color_matrix_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
-		s_ColorMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
-		CHECK(s_ColorMatrixProgram[1]!=NULL, "Create color matrix MSAA pixel shader");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[1], "color matrix MSAA pixel shader");
-		return s_ColorMatrixProgram[1];
-	}
-}
-
-ID3D11PixelShader* PixelShaderCache::GetDepthMatrixProgram(bool multisampled)
-{
-	if (!multisampled || D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count == 1) return s_DepthMatrixProgram[0];
-	else if (s_DepthMatrixProgram[1]) return s_DepthMatrixProgram[1];
-	else
-	{
-		// create MSAA shader for current AA mode
-		char buf[1024];
-		int l = sprintf_s(buf, 1024, depth_matrix_program_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
-		s_DepthMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
-		CHECK(s_DepthMatrixProgram[1]!=NULL, "Create depth matrix MSAA pixel shader");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[1], "depth matrix MSAA pixel shader");
-		return s_DepthMatrixProgram[1];
-	}
-}
-
-ID3D11PixelShader* PixelShaderCache::GetClearProgram()
-{
-	return s_ClearProgram;
-}
-
-ID3D11Buffer* &PixelShaderCache::GetConstantBuffer()
-{
-	// TODO: divide the global variables of the generated shaders into about 5 constant buffers to speed this up
-	if (pscbufchanged)
-	{
-		D3D11_MAPPED_SUBRESOURCE map;
-		D3D::context->Map(pscbuf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-		memcpy(map.pData, psconstants, sizeof(psconstants));
-		D3D::context->Unmap(pscbuf, 0);
-		pscbufchanged = false;
-		
-		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(psconstants));
-	}
-	return pscbuf;
-}
-
-// this class will load the precompiled shaders into our cache
-class PixelShaderCacheInserter : public LinearDiskCacheReader<PixelShaderUid, u8>
-{
-public:
-	void Read(const PixelShaderUid &key, const u8 *value, u32 value_size)
-	{
-		PixelShaderCache::InsertByteCode(key, value, value_size);
-	}
-};
-
-void PixelShaderCache::Init()
-{
-	unsigned int cbsize = ((sizeof(psconstants))&(~0xf))+0x10; // must be a multiple of 16
-	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-	D3D::device->CreateBuffer(&cbdesc, NULL, &pscbuf);
-	CHECK(pscbuf!=NULL, "Create pixel shader constant buffer");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)pscbuf, "pixel shader constant buffer used to emulate the GX pipeline");
-
-	// used when drawing clear quads
-	s_ClearProgram = D3D::CompileAndCreatePixelShader(clear_program_code, sizeof(clear_program_code));	
-	CHECK(s_ClearProgram!=NULL, "Create clear pixel shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ClearProgram, "clear pixel shader");
-
-	// used when copying/resolving the color buffer
-	s_ColorCopyProgram[0] = D3D::CompileAndCreatePixelShader(color_copy_program_code, sizeof(color_copy_program_code));
-	CHECK(s_ColorCopyProgram[0]!=NULL, "Create color copy pixel shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[0], "color copy pixel shader");
-
-	// used for color conversion
-	s_ColorMatrixProgram[0] = D3D::CompileAndCreatePixelShader(color_matrix_program_code, sizeof(color_matrix_program_code));
-	CHECK(s_ColorMatrixProgram[0]!=NULL, "Create color matrix pixel shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[0], "color matrix pixel shader");
-
-	// used for depth copy
-	s_DepthMatrixProgram[0] = D3D::CompileAndCreatePixelShader(depth_matrix_program, sizeof(depth_matrix_program));
-	CHECK(s_DepthMatrixProgram[0]!=NULL, "Create depth matrix pixel shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[0], "depth matrix pixel shader");
-
-	Clear();
-
-	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX).c_str());
-
-	SETSTAT(stats.numPixelShadersCreated, 0);
-	SETSTAT(stats.numPixelShadersAlive, 0);
-
-	char cache_filename[MAX_PATH];
-	sprintf(cache_filename, "%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-	PixelShaderCacheInserter inserter;
-	g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
-
-	if (g_Config.bEnableShaderDebugging)
-		Clear();
-
-	last_entry = NULL;
-}
-
-// ONLY to be used during shutdown.
-void PixelShaderCache::Clear()
-{
-	for (PSCache::iterator iter = PixelShaders.begin(); iter != PixelShaders.end(); iter++)
-		iter->second.Destroy();
-	PixelShaders.clear();
-	pixel_uid_checker.Invalidate();
-
-	last_entry = NULL;
-}
-
-// Used in Swap() when AA mode has changed
-void PixelShaderCache::InvalidateMSAAShaders()
-{
-	SAFE_RELEASE(s_ColorCopyProgram[1]);
-	SAFE_RELEASE(s_ColorMatrixProgram[1]);
-	SAFE_RELEASE(s_DepthMatrixProgram[1]);
-	SAFE_RELEASE(s_rgb8_to_rgba6[1]);
-	SAFE_RELEASE(s_rgba6_to_rgb8[1]);
-}
-
-void PixelShaderCache::Shutdown()
-{
-	SAFE_RELEASE(pscbuf);
-
-	SAFE_RELEASE(s_ClearProgram);
-	for (int i = 0; i < 2; ++i)
-	{
-		SAFE_RELEASE(s_ColorCopyProgram[i]);
-		SAFE_RELEASE(s_ColorMatrixProgram[i]);
-		SAFE_RELEASE(s_DepthMatrixProgram[i]);
-		SAFE_RELEASE(s_rgba6_to_rgb8[i]);
-		SAFE_RELEASE(s_rgb8_to_rgba6[i]);
-	}
-	
-	Clear();
-	g_ps_disk_cache.Sync();
-	g_ps_disk_cache.Close();
-}
-
-bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	PixelShaderUid uid;
-	GetPixelShaderUid(uid, dstAlphaMode, API_D3D11, components);
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		PixelShaderCode code;
-		GeneratePixelShaderCode(code, dstAlphaMode, API_D3D11, components);
-		pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
-	}
-
-	// Check if the shader is already set
-	if (last_entry)
-	{
-		if (uid == last_uid)
-		{
-			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
-			return (last_entry->shader != NULL);
-		}
-	}
-
-	last_uid = uid;
-
-	// Check if the shader is already in the cache
-	PSCache::iterator iter;
-	iter = PixelShaders.find(uid);
-	if (iter != PixelShaders.end())
-	{
-		const PSCacheEntry &entry = iter->second;
-		last_entry = &entry;
-		
-		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
-		return (entry.shader != NULL);
-	}
-
-	// Need to compile a new shader
-	PixelShaderCode code;
-	GeneratePixelShaderCode(code, dstAlphaMode, API_D3D11, components);
-
-	D3DBlob* pbytecode;
-	if (!D3D::CompilePixelShader(code.GetBuffer(), (unsigned int)strlen(code.GetBuffer()), &pbytecode))
-	{
-		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
-		return false;
-	}
-
-	// Insert the bytecode into the caches
-	g_ps_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size());
-
-	bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size());
-	pbytecode->Release();
-
-	if (g_ActiveConfig.bEnableShaderDebugging && success)
-	{
-		PixelShaders[uid].code = code.GetBuffer();
-	}
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-	return success;
-}
-
-bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen)
-{
-	ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
-	if (shader == NULL)
-		return false;
-
-	// TODO: Somehow make the debug name a bit more specific
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of PixelShaderCache");
-
-	// Make an entry in the table
-	PSCacheEntry newentry;
-	newentry.shader = shader;
-	PixelShaders[uid] = newentry;
-	last_entry = &PixelShaders[uid];
-
-	if (!shader) {
-		// INCSTAT(stats.numPixelShadersFailed);
-		return false;
-	}
-
-	INCSTAT(stats.numPixelShadersCreated);
-	SETSTAT(stats.numPixelShadersAlive, PixelShaders.size());
-	return true;
-}
-
-// These are "callbacks" from VideoCommon and thus must be outside namespace DX11.
-// This will have to be changed when we merge.
-
-// HACK to avoid some invasive VideoCommon changes
-// these values are hardcoded, they depend on internal D3DCompile behavior; TODO: Solve this with D3DReflect or something
-// offset given in floats, table index is float4
-static const unsigned int ps_constant_offset_table[] = {
-	0, 4, 8, 12,					// C_COLORS, 16
-	16, 20, 24, 28,					// C_KCOLORS, 16
-	32,								// C_ALPHA, 4
-	36, 40, 44, 48, 52, 56, 60, 64,	// C_TEXDIMS, 32
-	68, 72,							// C_ZBIAS, 8
-	76, 80,							// C_INDTEXSCALE, 8
-	84, 88, 92, 96, 100, 104,		// C_INDTEXMTX, 24
-	108, 112, 116,					// C_FOG, 12
-	120, 124, 128, 132, 136,		// C_PLIGHTS0, 20
-	140, 144, 148, 152, 156,		// C_PLIGHTS1, 20
-	160, 164, 168, 172,	176,		// C_PLIGHTS2, 20
-	180, 184, 188, 192, 196,		// C_PLIGHTS3, 20		
-	200, 204, 208, 212, 216,		// C_PLIGHTS4, 20
-	220, 224, 228, 232, 236,		// C_PLIGHTS5, 20
-	240, 244, 248, 252,	256,		// C_PLIGHTS6, 20
-	260, 264, 268, 272, 276,		// C_PLIGHTS7, 20
-	280, 284, 288, 292				// C_PMATERIALS, 16	
-};
-void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	psconstants[ps_constant_offset_table[const_number]  ] = f1;
-	psconstants[ps_constant_offset_table[const_number]+1] = f2;
-	psconstants[ps_constant_offset_table[const_number]+2] = f3;
-	psconstants[ps_constant_offset_table[const_number]+3] = f4;
-	pscbufchanged = true;
-}
-
-void Renderer::SetPSConstant4fv(unsigned int const_number, const float* f)
-{
-	memcpy(&psconstants[ps_constant_offset_table[const_number]], f, sizeof(float)*4);
-	pscbufchanged = true;
-}
-
-void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float* f)
-{
-	memcpy(&psconstants[ps_constant_offset_table[const_number]], f, sizeof(float)*4*count);
-	pscbufchanged = true;
-}
-
-}  // DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
deleted file mode 100644
index dee930ccfe..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "PixelShaderGen.h"
-
-#include <d3d11.h>
-
-#include <map>
-
-enum DSTALPHA_MODE;
-
-namespace DX11
-{
-
-class PixelShaderCache
-{
-public:
-	static void Init();
-	static void Clear();
-	static void Shutdown();
-	static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 components); // TODO: Should be renamed to LoadShader
-	static bool InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen);
-
-	static ID3D11PixelShader* GetActiveShader() { return last_entry->shader; }
-	static ID3D11Buffer* &GetConstantBuffer();
-
-	static ID3D11PixelShader* GetColorMatrixProgram(bool multisampled);
-	static ID3D11PixelShader* GetColorCopyProgram(bool multisampled);
-	static ID3D11PixelShader* GetDepthMatrixProgram(bool multisampled);
-	static ID3D11PixelShader* GetClearProgram();
-	static ID3D11PixelShader* ReinterpRGBA6ToRGB8(bool multisampled);
-	static ID3D11PixelShader* ReinterpRGB8ToRGBA6(bool multisampled);
-
-	static void InvalidateMSAAShaders();
-
-private:
-	struct PSCacheEntry
-	{
-		ID3D11PixelShader* shader;
-
-		std::string code;
-
-		PSCacheEntry() : shader(NULL) {}
-		void Destroy() { SAFE_RELEASE(shader); }
-	};
-
-	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
-
-	static PSCache PixelShaders;
-	static const PSCacheEntry* last_entry;
-	static PixelShaderUid last_uid;
-
-	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
-};
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
deleted file mode 100644
index 9d6e02104e..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "PointGeometryShader.h"
-
-#include <sstream>
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "VertexShaderGen.h"
-
-namespace DX11
-{
-
-struct PointGSParams
-{
-	FLOAT PointSize; // In units of 1/6 of an EFB pixel
-	FLOAT TexOffset;
-	FLOAT VpWidth; // Width and height of viewport in EFB pixels
-	FLOAT VpHeight;
-	FLOAT TexOffsetEnable[8]; // For each tex coordinate, whether to apply offset to it (1 on, 0 off)
-};
-
-union PointGSParams_Padded
-{
-	PointGSParams params;
-	// Constant buffers must be a multiple of 16 bytes in size.
-	u8 pad[(sizeof(PointGSParams) + 15) & ~15];
-};
-
-static const char POINT_GS_COMMON[] =
-// The struct VS_OUTPUT used by the vertex shader goes here.
-"// dolphin-emu point geometry shader common part\n"
-
-"cbuffer cbParams : register(b0)\n"
-"{\n"
-	"struct\n" // Should match PointGSParams above
-	"{\n"
-		"float PointSize;\n"
-		"float TexOffset;\n"
-		"float VpWidth;\n"
-		"float VpHeight;\n"
-		"float TexOffsetEnable[8];\n"
-	"} Params;\n"
-"}\n"
-
-"[maxvertexcount(4)]\n"
-"void main(point VS_OUTPUT input[1], inout TriangleStream<VS_OUTPUT> outStream)\n"
-"{\n"
-	"VS_OUTPUT ptLL = input[0];\n"
-	"VS_OUTPUT ptLR = ptLL;\n"
-	"VS_OUTPUT ptUL = ptLL;\n"
-	"VS_OUTPUT ptUR = ptLL;\n"
-
-	// Offset from center to upper right vertex
-	// Lerp Params.PointSize/2 from [0,0..VpWidth,VpHeight] to [-1,1..1,-1]
-	"float2 offset = float2(Params.PointSize/Params.VpWidth, -Params.PointSize/Params.VpHeight) * input[0].pos.w;\n"
-
-	"ptLL.pos.xy += float2(-1,-1) * offset;\n"
-	"ptLR.pos.xy += float2(1,-1) * offset;\n"
-	"ptUL.pos.xy += float2(-1,1) * offset;\n"
-	"ptUR.pos.xy += offset;\n"
-
-	"float2 texOffset = float2(Params.TexOffset, Params.TexOffset);\n"
-
-"#ifndef NUM_TEXCOORDS\n"
-"#error NUM_TEXCOORDS not defined\n"
-"#endif\n"
-
-	// Apply TexOffset to all tex coordinates in the vertex
-	// FIXME: The game may be able to enable TexOffset for some coords and
-	// disable for others, but where is that information stored?
-"#if NUM_TEXCOORDS >= 1\n"
-	"ptLL.tex0.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[0];\n"
-	"ptLR.tex0.xy += texOffset * Params.TexOffsetEnable[0];\n"
-	"ptUR.tex0.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[0];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 2\n"
-	"ptLL.tex1.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[1];\n"
-	"ptLR.tex1.xy += texOffset * Params.TexOffsetEnable[1];\n"
-	"ptUR.tex1.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[1];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 3\n"
-	"ptLL.tex2.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[2];\n"
-	"ptLR.tex2.xy += texOffset * Params.TexOffsetEnable[2];\n"
-	"ptUR.tex2.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[2];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 4\n"
-	"ptLL.tex3.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[3];\n"
-	"ptLR.tex3.xy += texOffset * Params.TexOffsetEnable[3];\n"
-	"ptUR.tex3.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[3];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 5\n"
-	"ptLL.tex4.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[4];\n"
-	"ptLR.tex4.xy += texOffset * Params.TexOffsetEnable[4];\n"
-	"ptUR.tex4.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[4];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 6\n"
-	"ptLL.tex5.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[5];\n"
-	"ptLR.tex5.xy += texOffset * Params.TexOffsetEnable[5];\n"
-	"ptUR.tex5.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[5];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 7\n"
-	"ptLL.tex6.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[6];\n"
-	"ptLR.tex6.xy += texOffset * Params.TexOffsetEnable[6];\n"
-	"ptUR.tex6.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[6];\n"
-"#endif\n"
-"#if NUM_TEXCOORDS >= 8\n"
-	"ptLL.tex7.xy += float2(0,1) * texOffset * Params.TexOffsetEnable[7];\n"
-	"ptLR.tex7.xy += texOffset * Params.TexOffsetEnable[7];\n"
-	"ptUR.tex7.xy += float2(1,0) * texOffset * Params.TexOffsetEnable[7];\n"
-"#endif\n"
-
-	"outStream.Append(ptLL);\n"
-	"outStream.Append(ptLR);\n"
-	"outStream.Append(ptUL);\n"
-	"outStream.Append(ptUR);\n"
-"}\n"
-;
-
-PointGeometryShader::PointGeometryShader()
-	: m_ready(false), m_paramsBuffer(NULL)
-{ }
-
-void PointGeometryShader::Init()
-{
-	m_ready = false;
-
-	HRESULT hr;
-
-	// Create constant buffer for uploading data to geometry shader
-
-	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(PointGSParams_Padded),
-		D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-	hr = D3D::device->CreateBuffer(&bd, NULL, &m_paramsBuffer);
-	CHECK(SUCCEEDED(hr), "create point geometry shader params buffer");
-	D3D::SetDebugObjectName(m_paramsBuffer, "point geometry shader params buffer");
-
-	m_ready = true;
-}
-
-void PointGeometryShader::Shutdown()
-{
-	m_ready = false;
-
-	for (ComboMap::iterator it = m_shaders.begin(); it != m_shaders.end(); ++it)
-	{
-		SAFE_RELEASE(it->second);
-	}
-	m_shaders.clear();
-
-	SAFE_RELEASE(m_paramsBuffer);
-}
-
-bool PointGeometryShader::SetShader(u32 components, float pointSize,
-	float texOffset, float vpWidth, float vpHeight, const bool* texOffsetEnable)
-{
-	if (!m_ready)
-		return false;
-
-	// Make sure geometry shader for "components" is available
-	ComboMap::iterator shaderIt = m_shaders.find(components);
-	if (shaderIt == m_shaders.end())
-	{
-		// Generate new shader. Warning: not thread-safe.
-		static char buffer[16384];
-		ShaderCode code;
-		code.SetBuffer(buffer);
-		GenerateVSOutputStructForGS(code, components, API_D3D11);
-		code.Write("\n%s", POINT_GS_COMMON);
-		
-		std::stringstream numTexCoordsStream;
-		numTexCoordsStream << xfregs.numTexGen.numTexGens;
-
-		INFO_LOG(VIDEO, "Compiling point geometry shader for components 0x%.08X (num texcoords %d)",
-			components, xfregs.numTexGen.numTexGens);
-
-		const std::string& numTexCoordsStr = numTexCoordsStream.str();
-		D3D_SHADER_MACRO macros[] = {
-			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
-			{ NULL, NULL }
-		};
-		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
-		if (!newShader)
-		{
-			WARN_LOG(VIDEO, "Point geometry shader for components 0x%.08X failed to compile", components);
-			// Add dummy shader to prevent trying to compile again
-			m_shaders[components] = NULL;
-			return false;
-		}
-
-		shaderIt = m_shaders.insert(std::make_pair(components, newShader)).first;
-	}
-
-	if (shaderIt != m_shaders.end())
-	{
-		if (shaderIt->second)
-		{
-			D3D11_MAPPED_SUBRESOURCE map;
-			HRESULT hr = D3D::context->Map(m_paramsBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-			if (SUCCEEDED(hr))
-			{
-				PointGSParams* params = (PointGSParams*)map.pData;
-				params->PointSize = pointSize;
-
-				params->TexOffset = texOffset;
-				params->VpWidth = vpWidth;
-				params->VpHeight = vpHeight;
-				for (int i = 0; i < 8; ++i)
-					params->TexOffsetEnable[i] = texOffsetEnable[i] ? 1.f : 0.f;
-
-				D3D::context->Unmap(m_paramsBuffer, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "Failed to map point gs params buffer");
-
-			DEBUG_LOG(VIDEO, "Point params: size %f, texOffset %f, vpWidth %f, vpHeight %f",
-				pointSize, texOffset, vpWidth, vpHeight);
-
-			D3D::context->GSSetShader(shaderIt->second, NULL, 0);
-			D3D::context->GSSetConstantBuffers(0, 1, &m_paramsBuffer);
-
-			return true;
-		}
-		else
-			return false;
-	}
-	else
-		return false;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
deleted file mode 100644
index 4fc59801c7..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _POINTGEOMETRYSHADER_H
-#define _POINTGEOMETRYSHADER_H
-
-#include "VideoCommon.h"
-
-struct ID3D11Buffer;
-struct ID3D11GeometryShader;
-
-namespace DX11
-{
-
-// This class manages a collection of point geometry shaders, one for each
-// vertex format.
-class PointGeometryShader
-{
-
-public:
-
-	PointGeometryShader();
-
-	void Init();
-	void Shutdown();
-	// Returns true on success, false on failure
-	bool SetShader(u32 components, float pointSize, float texOffset,
-		float vpWidth, float vpHeight, const bool* texOffsetEnable);
-
-private:
-
-	bool m_ready;
-
-	ID3D11Buffer* m_paramsBuffer;
-
-	typedef std::map<u32, ID3D11GeometryShader*> ComboMap;
-
-	ComboMap m_shaders;
-
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
deleted file mode 100644
index 4e412641b8..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
+++ /dev/null
@@ -1,1428 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-
-#include "Timer.h"
-
-#include "Debugger.h"
-#include "DLCache.h"
-#include "EmuWindow.h"
-#include "Fifo.h"
-#include "OnScreenDisplay.h"
-#include "PixelEngine.h"
-#include "Statistics.h"
-#include "VertexShaderManager.h"
-#include "VideoConfig.h"
-
-#include "D3DBase.h"
-#include "D3DUtil.h"
-#include "FramebufferManager.h"
-#include "GfxState.h"
-#include "PixelShaderCache.h"
-#include "Render.h"
-#include "TextureCache.h"
-#include "VertexShaderCache.h"
-#include "Core.h"
-#include "Movie.h"
-#include "Television.h"
-#include "Host.h"
-#include "BPFunctions.h"
-#include "AVIDump.h"
-#include "FPSCounter.h"
-#include "ConfigManager.h"
-#include <strsafe.h>
-
-namespace DX11
-{
-
-static int s_fps = 0;
-
-static u32 s_LastAA = 0;
-
-static Television s_television;
-
-ID3D11Buffer* access_efb_cbuf = NULL;
-ID3D11BlendState* clearblendstates[4] = {NULL};
-ID3D11DepthStencilState* cleardepthstates[3] = {NULL};
-ID3D11BlendState* resetblendstate = NULL;
-ID3D11DepthStencilState* resetdepthstate = NULL;
-ID3D11RasterizerState* resetraststate = NULL;
-
-static ID3D11Texture2D* s_screenshot_texture = NULL;
-
-
-// GX pipeline state
-struct
-{
-	D3D11_SAMPLER_DESC sampdc[8];
-	D3D11_BLEND_DESC blenddc;
-	D3D11_DEPTH_STENCIL_DESC depthdc;
-	D3D11_RASTERIZER_DESC rastdc;
-} gx_state;
-
-
-void SetupDeviceObjects()
-{
-	s_television.Init();
-
-	g_framebuffer_manager = new FramebufferManager;
-
-	HRESULT hr;
-	float colmat[20]= {0.0f};
-	colmat[0] = colmat[5] = colmat[10] = 1.0f;
-	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(20*sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
-	D3D11_SUBRESOURCE_DATA data;
-	data.pSysMem = colmat;
-	hr = D3D::device->CreateBuffer(&cbdesc, &data, &access_efb_cbuf);
-	CHECK(hr==S_OK, "Create constant buffer for Renderer::AccessEFB");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)access_efb_cbuf, "constant buffer for Renderer::AccessEFB");
-
-	D3D11_DEPTH_STENCIL_DESC ddesc;
-	ddesc.DepthEnable	  = FALSE;
-	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ZERO;
-	ddesc.DepthFunc		= D3D11_COMPARISON_ALWAYS;
-	ddesc.StencilEnable	= FALSE;
-	ddesc.StencilReadMask  = D3D11_DEFAULT_STENCIL_READ_MASK;
-	ddesc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[0]);
-	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
-	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ALL;
-	ddesc.DepthEnable	  = TRUE;
-	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[1]);
-	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
-	ddesc.DepthWriteMask   = D3D11_DEPTH_WRITE_MASK_ZERO;
-	hr = D3D::device->CreateDepthStencilState(&ddesc, &cleardepthstates[2]);
-	CHECK(hr==S_OK, "Create depth state for Renderer::ClearScreen");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[0], "depth state for Renderer::ClearScreen (depth buffer disabled)");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[1], "depth state for Renderer::ClearScreen (depth buffer enabled, writing enabled)");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)cleardepthstates[2], "depth state for Renderer::ClearScreen (depth buffer enabled, writing disabled)");
-
-	D3D11_BLEND_DESC blenddesc;
-	blenddesc.AlphaToCoverageEnable = FALSE;
-	blenddesc.IndependentBlendEnable = FALSE;
-	blenddesc.RenderTarget[0].BlendEnable = FALSE;
-	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-	blenddesc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE;
-	blenddesc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO;
-	blenddesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-	blenddesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-	blenddesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-	blenddesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-	hr = D3D::device->CreateBlendState(&blenddesc, &resetblendstate);
-	CHECK(hr==S_OK, "Create blend state for Renderer::ResetAPIState");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetblendstate, "blend state for Renderer::ResetAPIState");
-
-	clearblendstates[0] = resetblendstate;
-	resetblendstate->AddRef();
-
-	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_RED|D3D11_COLOR_WRITE_ENABLE_GREEN|D3D11_COLOR_WRITE_ENABLE_BLUE;
-	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[1]);
-	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
-
-	blenddesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALPHA;
-	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[2]);
-	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
-
-	blenddesc.RenderTarget[0].RenderTargetWriteMask = 0;
-	hr = D3D::device->CreateBlendState(&blenddesc, &clearblendstates[3]);
-	CHECK(hr==S_OK, "Create blend state for Renderer::ClearScreen");
-
-	ddesc.DepthEnable	   = FALSE;
-	ddesc.DepthWriteMask	= D3D11_DEPTH_WRITE_MASK_ZERO;
-	ddesc.DepthFunc		 = D3D11_COMPARISON_LESS;
-	ddesc.StencilEnable	 = FALSE;
-	ddesc.StencilReadMask   = D3D11_DEFAULT_STENCIL_READ_MASK;
-	ddesc.StencilWriteMask  = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-	hr = D3D::device->CreateDepthStencilState(&ddesc, &resetdepthstate);
-	CHECK(hr==S_OK, "Create depth state for Renderer::ResetAPIState");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetdepthstate, "depth stencil state for Renderer::ResetAPIState");
-
-	D3D11_RASTERIZER_DESC rastdesc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, D3D11_CULL_NONE, false, 0, 0.f, 0.f, false, false, false, false);
-	hr = D3D::device->CreateRasterizerState(&rastdesc, &resetraststate);
-	CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState");
-
-	s_screenshot_texture = NULL;
-}
-
-// Kill off all device objects
-void TeardownDeviceObjects()
-{
-	delete g_framebuffer_manager;
-
-	SAFE_RELEASE(access_efb_cbuf);
-	SAFE_RELEASE(clearblendstates[0]);
-	SAFE_RELEASE(clearblendstates[1]);
-	SAFE_RELEASE(clearblendstates[2]);
-	SAFE_RELEASE(clearblendstates[3]);
-	SAFE_RELEASE(cleardepthstates[0]);
-	SAFE_RELEASE(cleardepthstates[1]);
-	SAFE_RELEASE(cleardepthstates[2]);
-	SAFE_RELEASE(resetblendstate);
-	SAFE_RELEASE(resetdepthstate);
-	SAFE_RELEASE(resetraststate);
-	SAFE_RELEASE(s_screenshot_texture);
-
-	s_television.Shutdown();
-}
-
-void CreateScreenshotTexture(const TargetRectangle& rc)
-{
-	D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, rc.GetWidth(), rc.GetHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE);
-	HRESULT hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture);
-	CHECK(hr==S_OK, "Create screenshot staging texture");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture");
-}
-
-Renderer::Renderer()
-{
-	int x, y, w_temp, h_temp;
-
-	InitFPSCounter();
-
-	Host_GetRenderWindowSize(x, y, w_temp, h_temp);
-
-	D3D::Create(EmuWindow::GetWnd());
-
-	s_backbuffer_width = D3D::GetBackBufferWidth();
-	s_backbuffer_height = D3D::GetBackBufferHeight();
-
-	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
-	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
-
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-	s_LastAA = g_ActiveConfig.iMultisampleMode;
-	s_LastEFBScale = g_ActiveConfig.iEFBScale;
-	CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
-
-	SetupDeviceObjects();
-
-
-	// Setup GX pipeline state
-	memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc));
-	gx_state.blenddc.AlphaToCoverageEnable = FALSE;
-	gx_state.blenddc.IndependentBlendEnable = FALSE;
-	gx_state.blenddc.RenderTarget[0].BlendEnable = FALSE;
-	gx_state.blenddc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-	gx_state.blenddc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE;
-	gx_state.blenddc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO;
-	gx_state.blenddc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-	gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-	gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-	gx_state.blenddc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-
-	memset(&gx_state.depthdc, 0, sizeof(gx_state.depthdc));
-	gx_state.depthdc.DepthEnable        = TRUE;
-	gx_state.depthdc.DepthWriteMask     = D3D11_DEPTH_WRITE_MASK_ALL;
-	gx_state.depthdc.DepthFunc          = D3D11_COMPARISON_LESS;
-	gx_state.depthdc.StencilEnable      = FALSE;
-	gx_state.depthdc.StencilReadMask    = D3D11_DEFAULT_STENCIL_READ_MASK;
-	gx_state.depthdc.StencilWriteMask   = D3D11_DEFAULT_STENCIL_WRITE_MASK;
-
-	// TODO: Do we need to enable multisampling here?
-	gx_state.rastdc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, D3D11_CULL_NONE, false, 0, 0.f, 0, false, true, false, false);
-
-	for (unsigned int k = 0;k < 8;k++)
-	{
-		float border[4] = {0.f, 0.f, 0.f, 0.f};
-		gx_state.sampdc[k] = CD3D11_SAMPLER_DESC(D3D11_FILTER_MIN_MAG_MIP_LINEAR, D3D11_TEXTURE_ADDRESS_CLAMP, D3D11_TEXTURE_ADDRESS_CLAMP, D3D11_TEXTURE_ADDRESS_CLAMP,
-											0.f, 1 << g_ActiveConfig.iMaxAnisotropy,
-											D3D11_COMPARISON_ALWAYS, border,
-											-D3D11_FLOAT32_MAX, D3D11_FLOAT32_MAX);
-		if(g_ActiveConfig.iMaxAnisotropy != 0) gx_state.sampdc[k].Filter = D3D11_FILTER_ANISOTROPIC;
-	}
-
-	// Clear EFB textures
-	float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };
-	D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(), ClearColor);
-	D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(), D3D11_CLEAR_DEPTH, 1.f, 0);
-
-	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)s_target_width, (float)s_target_height);
-	D3D::context->RSSetViewports(1, &vp);
-	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
-	D3D::BeginFrame();
-}
-
-Renderer::~Renderer()
-{
-	TeardownDeviceObjects();
-	D3D::EndFrame();
-	D3D::Present();
-	D3D::Close();
-}
-
-void Renderer::RenderText(const char *text, int left, int top, u32 color)
-{
-	D3D::font.DrawTextScaled((float)left, (float)top, 20.f, 0.0f, color, text);
-}
-
-TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
-{
-	TargetRectangle result;
-	result.left   = EFBToScaledX(rc.left);
-	result.top    = EFBToScaledY(rc.top);
-	result.right  = EFBToScaledX(rc.right);
-	result.bottom = EFBToScaledY(rc.bottom);
-	return result;
-}
-
-// With D3D, we have to resize the backbuffer if the window changed
-// size.
-bool Renderer::CheckForResize()
-{
-	while (EmuWindow::IsSizing())
-		Sleep(10);
-
-	if (EmuWindow::GetParentWnd())
-	{
-		// Re-stretch window to parent window size again, if it has a parent window.
-		RECT rcParentWindow;
-		GetWindowRect(EmuWindow::GetParentWnd(), &rcParentWindow);
-		int width = rcParentWindow.right - rcParentWindow.left;
-		int height = rcParentWindow.bottom - rcParentWindow.top;
-		if (width != Renderer::GetBackbufferWidth() || height != Renderer::GetBackbufferHeight())
-			MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
-	}
-	RECT rcWindow;
-	GetClientRect(EmuWindow::GetWnd(), &rcWindow);
-	int client_width = rcWindow.right - rcWindow.left;
-	int client_height = rcWindow.bottom - rcWindow.top;
-
-	// Sanity check
-	if ((client_width != Renderer::GetBackbufferWidth() ||
-		client_height != Renderer::GetBackbufferHeight()) && 
-		client_width >= 4 && client_height >= 4)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-void Renderer::SetScissorRect(const TargetRectangle& rc)
-{
-	D3D::context->RSSetScissorRects(1, rc.AsRECT());
-}
-
-void Renderer::SetColorMask()
-{
-	// Only enable alpha channel if it's supported by the current EFB format
-	UINT8 color_mask = 0;
-	if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
-	{
-		if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24))
-			color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA;
-		if (bpmem.blendmode.colorupdate)
-			color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE;
-	}
-	gx_state.blenddc.RenderTarget[0].RenderTargetWriteMask = color_mask;
-}
-
-// This function allows the CPU to directly access the EFB.
-// There are EFB peeks (which will read the color or depth of a pixel)
-// and EFB pokes (which will change the color or depth of a pixel).
-//
-// The behavior of EFB peeks can only be modified by:
-//	- GX_PokeAlphaRead
-// The behavior of EFB pokes can be modified by:
-//	- GX_PokeAlphaMode (TODO)
-//	- GX_PokeAlphaUpdate (TODO)
-//	- GX_PokeBlendMode (TODO)
-//	- GX_PokeColorUpdate (TODO)
-//	- GX_PokeDither (TODO)
-//	- GX_PokeDstAlpha (TODO)
-//	- GX_PokeZMode (TODO)
-u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
-{
-	// TODO: This function currently is broken if anti-aliasing is enabled
-	D3D11_MAPPED_SUBRESOURCE map;
-	ID3D11Texture2D* read_tex;
-
-	if (!g_ActiveConfig.bEFBAccessEnable)
-		return 0;
-
-	if (type == POKE_Z)
-	{
-		static bool alert_only_once = true;
-		if (!alert_only_once) return 0;
-		PanicAlert("EFB: Poke Z not implemented (tried to poke z value %#x at (%d,%d))", poke_data, x, y);
-		alert_only_once = false;
-		return 0;
-	}
-
-	// Convert EFB dimensions to the ones of our render target
-	EFBRectangle efbPixelRc;
-	efbPixelRc.left = x;
-	efbPixelRc.top = y;
-	efbPixelRc.right = x + 1;
-	efbPixelRc.bottom = y + 1;
-	TargetRectangle targetPixelRc = Renderer::ConvertEFBRectangle(efbPixelRc);
-
-	// Take the mean of the resulting dimensions; TODO: Don't use the center pixel, compute the average color instead
-	D3D11_RECT RectToLock;
-	if(type == PEEK_COLOR || type == PEEK_Z)
-	{
-		RectToLock.left = (targetPixelRc.left + targetPixelRc.right) / 2;
-		RectToLock.top = (targetPixelRc.top + targetPixelRc.bottom) / 2;
-		RectToLock.right = RectToLock.left + 1;
-		RectToLock.bottom = RectToLock.top + 1;
-	}
-	else
-	{
-		RectToLock.left = targetPixelRc.left;
-		RectToLock.right = targetPixelRc.right;
-		RectToLock.top = targetPixelRc.top;
-		RectToLock.bottom = targetPixelRc.bottom;
-	}
-
-	if (type == PEEK_Z)
-	{
-		ResetAPIState(); // Reset any game specific settings
-
-		// depth buffers can only be completely CopySubresourceRegion'ed, so we're using drawShadedTexQuad instead
-		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, 1.f, 1.f);
-		D3D::context->RSSetViewports(1, &vp);
-		D3D::context->PSSetConstantBuffers(0, 1, &access_efb_cbuf);
-		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBDepthReadTexture()->GetRTV(), NULL);
-		D3D::SetPointCopySampler();
-		D3D::drawShadedTexQuad(FramebufferManager::GetEFBDepthTexture()->GetSRV(),
-								&RectToLock,
-								Renderer::GetTargetWidth(),
-								Renderer::GetTargetHeight(),
-								PixelShaderCache::GetDepthMatrixProgram(true),
-								VertexShaderCache::GetSimpleVertexShader(),
-								VertexShaderCache::GetSimpleInputLayout());
-
-		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
-
-		// copy to system memory
-		D3D11_BOX box = CD3D11_BOX(0, 0, 0, 1, 1, 1);
-		read_tex = FramebufferManager::GetEFBDepthStagingBuffer();
-		D3D::context->CopySubresourceRegion(read_tex, 0, 0, 0, 0, FramebufferManager::GetEFBDepthReadTexture()->GetTex(), 0, &box);
-
-		RestoreAPIState(); // restore game state
-
-		// read the data from system memory
-		D3D::context->Map(read_tex, 0, D3D11_MAP_READ, 0, &map);
-
-		float val = *(float*)map.pData;
-		u32 ret = 0;
-		if(bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-		{
-			// if Z is in 16 bit format you must return a 16 bit integer
-			ret = ((u32)(val * 0xffff));
-		}
-		else
-		{
-			ret = ((u32)(val * 0xffffff));
-		}
-		D3D::context->Unmap(read_tex, 0);
-
-		// TODO: in RE0 this value is often off by one in Video_DX9 (where this code is derived from), which causes lighting to disappear
-		return ret;
-	}
-	else if (type == PEEK_COLOR)
-	{
-		// we can directly copy to system memory here
-		read_tex = FramebufferManager::GetEFBColorStagingBuffer();
-		D3D11_BOX box = CD3D11_BOX(RectToLock.left, RectToLock.top, 0, RectToLock.right, RectToLock.bottom, 1);
-		D3D::context->CopySubresourceRegion(read_tex, 0, 0, 0, 0, FramebufferManager::GetEFBColorTexture()->GetTex(), 0, &box);
-
-		// read the data from system memory
-		D3D::context->Map(read_tex, 0, D3D11_MAP_READ, 0, &map);
-		u32 ret = 0;
-		if(map.pData)
-			ret = *(u32*)map.pData;
-		D3D::context->Unmap(read_tex, 0);
-
-		// check what to do with the alpha channel (GX_PokeAlphaRead)
-		PixelEngine::UPEAlphaReadReg alpha_read_mode;
-		PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD);
-
-		if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
-		{
-			ret = RGBA8ToRGBA6ToRGBA8(ret);
-		}
-		else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-		{
-			ret = RGBA8ToRGB565ToRGBA8(ret);
-		}			
-		if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24)
-		{
-			ret |= 0xFF000000;
-		}
-
-		if(alpha_read_mode.ReadMode == 2) return ret; // GX_READ_NONE
-		else if(alpha_read_mode.ReadMode == 1) return (ret | 0xFF000000); // GX_READ_FF
-		else /*if(alpha_read_mode.ReadMode == 0)*/ return (ret & 0x00FFFFFF); // GX_READ_00
-	}
-	else //if(type == POKE_COLOR)
-	{
-		u32 rgbaColor = (poke_data & 0xFF00FF00) | ((poke_data >> 16) & 0xFF) | ((poke_data << 16) & 0xFF0000);
-
-		// TODO: The first five PE registers may change behavior of EFB pokes, this isn't implemented, yet.
-		ResetAPIState();
-
-		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), NULL);
-		D3D::drawColorQuad(rgbaColor, (float)RectToLock.left   * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
-									- (float)RectToLock.top	* 2.f / (float)Renderer::GetTargetHeight() + 1.f,
-									  (float)RectToLock.right  * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
-									- (float)RectToLock.bottom * 2.f / (float)Renderer::GetTargetHeight() + 1.f);
-
-		RestoreAPIState();
-		return 0;
-	}
-}
-
-// Viewport correction:
-// Say you want a viewport at (ix, iy) with size (iw, ih),
-// but your viewport must be clamped at (ax, ay) with size (aw, ah).
-// Just multiply the projection matrix with the following to get the same
-// effect:
-// [   (iw/aw)         0     0    ((iw - 2*(ax-ix)) / aw - 1)   ]
-// [         0   (ih/ah)     0   ((-ih + 2*(ay-iy)) / ah + 1)   ]
-// [         0         0     1                              0   ]
-// [         0         0     0                              1   ]
-static void ViewportCorrectionMatrix(Matrix44& result,
-	float ix, float iy, float iw, float ih, // Intended viewport (x, y, width, height)
-	float ax, float ay, float aw, float ah) // Actual viewport (x, y, width, height)
-{
-	Matrix44::LoadIdentity(result);
-	if (aw == 0.f || ah == 0.f)
-		return;
-	result.data[4*0+0] = iw / aw;
-	result.data[4*0+3] = (iw - 2.f * (ax - ix)) / aw - 1.f;
-	result.data[4*1+1] = ih / ah;
-	result.data[4*1+3] = (-ih + 2.f * (ay - iy)) / ah + 1.f;
-}
-
-// Called from VertexShaderManager
-void Renderer::UpdateViewport(Matrix44& vpCorrection)
-{
-	// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
-	// [0] = width/2
-	// [1] = height/2
-	// [2] = 16777215 * (farz - nearz)
-	// [3] = xorig + width/2 + 342
-	// [4] = yorig + height/2 + 342
-	// [5] = 16777215 * farz
-
-	int scissorXOff = bpmem.scissorOffset.x * 2;
-	int scissorYOff = bpmem.scissorOffset.y * 2;
-
-	// TODO: ceil, floor or just cast to int?
-	// TODO: Directly use the floats instead of rounding them?
-	int intendedX = Renderer::EFBToScaledX((int)ceil(xfregs.viewport.xOrig - xfregs.viewport.wd - scissorXOff));
-	int intendedY = Renderer::EFBToScaledY((int)ceil(xfregs.viewport.yOrig + xfregs.viewport.ht - scissorYOff));
-	int intendedWd = Renderer::EFBToScaledX((int)ceil(2.0f * xfregs.viewport.wd));
-	int intendedHt = Renderer::EFBToScaledY((int)ceil(-2.0f * xfregs.viewport.ht));
-	if (intendedWd < 0)
-	{
-		intendedX += intendedWd;
-		intendedWd = -intendedWd;
-	}
-	if (intendedHt < 0)
-	{
-		intendedY += intendedHt;
-		intendedHt = -intendedHt;
-	}
-
-	// In D3D, the viewport rectangle must fit within the render target.
-	int X = intendedX;
-	if (X < 0)
-		X = 0;
-
-	int Y = intendedY;
-	if (Y < 0)
-		Y = 0;
-
-	int Wd = intendedWd;
-	if (X + Wd > GetTargetWidth())
-		Wd = GetTargetWidth() - X;
-	int Ht = intendedHt;
-	if (Y + Ht > GetTargetHeight())
-		Ht = GetTargetHeight() - Y;
-	
-	// If GX viewport is off the render target, we must clamp our viewport
-	// within the bounds. Use the correction matrix to compensate.
-	ViewportCorrectionMatrix(vpCorrection,
-		(float)intendedX, (float)intendedY,
-		(float)intendedWd, (float)intendedHt,
-		(float)X, (float)Y,
-		(float)Wd, (float)Ht);
-
-	// Some games set invalid values for z-min and z-max so fix them to the max and min allowed and let the shaders do this work
-	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y,
-										(float)Wd, (float)Ht,
-										0.f,	// (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f;
-										1.f);   //  xfregs.viewport.farZ / 16777216.0f;
-	D3D::context->RSSetViewports(1, &vp);
-}
-
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
-{
-	ResetAPIState();
-
-	if (colorEnable && alphaEnable) D3D::stateman->PushBlendState(clearblendstates[0]);
-	else if (colorEnable) D3D::stateman->PushBlendState(clearblendstates[1]);
-	else if (alphaEnable) D3D::stateman->PushBlendState(clearblendstates[2]);
-	else D3D::stateman->PushBlendState(clearblendstates[3]);
-
-	// TODO: Should we enable Z testing here?
-	/*if (!bpmem.zmode.testenable) D3D::stateman->PushDepthState(cleardepthstates[0]);
-	else */if (zEnable) D3D::stateman->PushDepthState(cleardepthstates[1]);
-	else /*if (!zEnable)*/ D3D::stateman->PushDepthState(cleardepthstates[2]);
-
-	// Update the view port for clearing the picture
-	TargetRectangle targetRc = Renderer::ConvertEFBRectangle(rc);
-	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)targetRc.left, (float)targetRc.top, (float)targetRc.GetWidth(), (float)targetRc.GetHeight(), 0.f, 1.f); 
-	D3D::context->RSSetViewports(1, &vp);
-
-	// Color is passed in bgra mode so we need to convert it to rgba
-	u32 rgbaColor = (color & 0xFF00FF00) | ((color >> 16) & 0xFF) | ((color << 16) & 0xFF0000);
-	D3D::drawClearQuad(rgbaColor, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader(), VertexShaderCache::GetClearInputLayout());
-
-	D3D::stateman->PopDepthState();
-	D3D::stateman->PopBlendState();
-
-	RestoreAPIState();
-}
-
-void Renderer::ReinterpretPixelData(unsigned int convtype)
-{
-	// TODO: MSAA support..
-	D3D11_RECT source = CD3D11_RECT(0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight());
-
-	ID3D11PixelShader* pixel_shader;
-	if (convtype == 0) pixel_shader = PixelShaderCache::ReinterpRGB8ToRGBA6(true);
-	else if (convtype == 2) pixel_shader = PixelShaderCache::ReinterpRGBA6ToRGB8(true);
-	else
-	{
-		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
-		return;
-	}
-
-	// convert data and set the target texture as our new EFB
-	g_renderer->ResetAPIState();
-
-	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)g_renderer->GetTargetWidth(), (float)g_renderer->GetTargetHeight());
-	D3D::context->RSSetViewports(1, &vp);
-
-	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTempTexture()->GetRTV(), NULL);
-	D3D::SetPointCopySampler();
-	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), &source, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight(), pixel_shader, VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
-
-	g_renderer->RestoreAPIState();
-
-	FramebufferManager::SwapReinterpretTexture();
-	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
-}
-
-void SetSrcBlend(D3D11_BLEND val)
-{
-	// Colors should blend against SRC_ALPHA
-	if (val == D3D11_BLEND_SRC1_ALPHA)
-		val = D3D11_BLEND_SRC_ALPHA;
-	else if (val == D3D11_BLEND_INV_SRC1_ALPHA)
-		val = D3D11_BLEND_INV_SRC_ALPHA;
-
-	if (val == D3D11_BLEND_SRC_COLOR)
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-	else if (val == D3D11_BLEND_INV_SRC_COLOR)
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-	else if (val == D3D11_BLEND_DEST_COLOR)
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA;
-	else if (val == D3D11_BLEND_INV_DEST_COLOR)
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
-	else
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = val;
-
-	gx_state.blenddc.RenderTarget[0].SrcBlend = val;
-}
-
-void SetDestBlend(D3D11_BLEND val)
-{
-	// Colors should blend against SRC_ALPHA
-	if (val == D3D11_BLEND_SRC1_ALPHA)
-		val = D3D11_BLEND_SRC_ALPHA;
-	else if (val == D3D11_BLEND_INV_SRC1_ALPHA)
-		val = D3D11_BLEND_INV_SRC_ALPHA;
-
-	if (val == D3D11_BLEND_SRC_COLOR)
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-	else if (val == D3D11_BLEND_INV_SRC_COLOR)
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-	else if (val == D3D11_BLEND_DEST_COLOR)
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA;
-	else if (val == D3D11_BLEND_INV_DEST_COLOR)
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA;
-	else
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = val;
-
-	gx_state.blenddc.RenderTarget[0].DestBlend = val;
-}
-
-void SetBlendOp(D3D11_BLEND_OP val)
-{
-	gx_state.blenddc.RenderTarget[0].BlendOp = val;
-	gx_state.blenddc.RenderTarget[0].BlendOpAlpha = val;
-}
-
-void Renderer::SetBlendMode(bool forceUpdate)
-{
-	// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
-	// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
-	bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	const D3D11_BLEND d3dSrcFactors[8] =
-	{
-		D3D11_BLEND_ZERO,
-		D3D11_BLEND_ONE,
-		D3D11_BLEND_DEST_COLOR,
-		D3D11_BLEND_INV_DEST_COLOR,
-		D3D11_BLEND_SRC_ALPHA,
-		D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled!
-		(target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE,
-		(target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO
-	};
-	const D3D11_BLEND d3dDestFactors[8] =
-	{
-		D3D11_BLEND_ZERO,
-		D3D11_BLEND_ONE,
-		D3D11_BLEND_SRC_COLOR,
-		D3D11_BLEND_INV_SRC_COLOR,
-		D3D11_BLEND_SRC_ALPHA,
-		D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled!
-		(target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE,
-		(target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO
-	};
-
-	if (bpmem.blendmode.logicopenable && !forceUpdate)
-		return;
-
-	if (bpmem.blendmode.subtract)
-	{
-		gx_state.blenddc.RenderTarget[0].BlendEnable = true;
-		SetBlendOp(D3D11_BLEND_OP_REV_SUBTRACT);
-		SetSrcBlend(D3D11_BLEND_ONE);
-		SetDestBlend(D3D11_BLEND_ONE);
-	}
-	else
-	{
-		gx_state.blenddc.RenderTarget[0].BlendEnable = bpmem.blendmode.blendenable;
-		if (bpmem.blendmode.blendenable)
-		{
-			SetBlendOp(D3D11_BLEND_OP_ADD);
-			SetSrcBlend(d3dSrcFactors[bpmem.blendmode.srcfactor]);
-			SetDestBlend(d3dDestFactors[bpmem.blendmode.dstfactor]);
-		}
-	}
-}
-
-bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle& rc)
-{
-	if (!s_screenshot_texture)
-		CreateScreenshotTexture(rc);
-
-	// copy back buffer to system memory
-	D3D11_BOX box = CD3D11_BOX(rc.left, rc.top, 0, rc.right, rc.bottom, 1);
-	D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box);
-
-	// D3DX11SaveTextureToFileA doesn't allow us to ignore the alpha channel, so we need to strip it out ourselves
-	D3D11_MAPPED_SUBRESOURCE map;
-	D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map);
-	for (unsigned int y = 0; y < rc.GetHeight(); ++y)
-	{
-		u8* ptr = (u8*)map.pData + y * map.RowPitch + 3;
-		for (unsigned int x = 0; x < rc.GetWidth(); ++x)
-		{
-			*ptr = 0xFF;
-			ptr += 4;
-		}
-	}
-	D3D::context->Unmap(s_screenshot_texture, 0);
-
-	// ready to be saved
-	HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str());
-	if (SUCCEEDED(hr))
-	{
-		OSD::AddMessage(StringFromFormat("Saved %i x %i %s", rc.GetWidth(),
-		                                 rc.GetHeight(), filename.c_str()));
-	}
-	else
-	{
-		OSD::AddMessage(StringFromFormat("Error saving %s", filename.c_str()));
-	}
-
-	return SUCCEEDED(hr);
-}
-
-void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
-{
-	for (int y = 0; y < h; ++y)
-	{
-		auto line = (in + (h - y - 1) * p);
-		for (int x = 0; x < w; ++x)
-		{
-			out[0] = line[2];
-			out[1] = line[1];
-			out[2] = line[0];
-			out += 3;
-			line += 4;
-		}
-	}
-}
-
-// This function has the final picture. We adjust the aspect ratio here.
-void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma)
-{
-	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
-	{
-		if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
-			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
-
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2;
-	u32 xfbCount = 0;
-	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
-	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
-	{
-		if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
-			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
-
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	ResetAPIState();
-
-	// Prepare to copy the XFBs to our backbuffer
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-	int X = GetTargetRectangle().left;
-	int Y = GetTargetRectangle().top;
-	int Width  = GetTargetRectangle().right - GetTargetRectangle().left;
-	int Height = GetTargetRectangle().bottom - GetTargetRectangle().top;
-
-	// TODO: Redundant checks...
-	if (X < 0) X = 0;
-	if (Y < 0) Y = 0;
-	if (X > s_backbuffer_width) X = s_backbuffer_width;
-	if (Y > s_backbuffer_height) Y = s_backbuffer_height;
-	if (Width < 0) Width = 0;
-	if (Height < 0) Height = 0;
-	if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X;
-	if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y;
-	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height);
-	D3D::context->RSSetViewports(1, &vp);
-	D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL);
-
-	float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };
-	D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor);
-
-	// activate linear filtering for the buffer copies
-	D3D::SetLinearCopySampler();
-
-	if (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB)
-	{
-		// TODO: Television should be used to render Virtual XFB mode as well.
-		s_television.Submit(xfbAddr, fbWidth, fbHeight);
-		s_television.Render();
-	}
-	else if(g_ActiveConfig.bUseXFB)
-	{
-		const XFBSourceBase* xfbSource;
-
-		// draw each xfb source
-		for (u32 i = 0; i < xfbCount; ++i)
-		{
-			xfbSource = xfbSourceList[i];
-			MathUtil::Rectangle<float> sourceRc;
-			
-			sourceRc.left = 0;
-			sourceRc.top = 0;
-			sourceRc.right = (float)xfbSource->texWidth;
-			sourceRc.bottom = (float)xfbSource->texHeight;
-
-			MathUtil::Rectangle<float> drawRc;
-
-			if (g_ActiveConfig.bUseRealXFB)
-			{
-				drawRc.top = 1;
-				drawRc.bottom = -1;
-				drawRc.left = -1;
-				drawRc.right = 1;
-			}
-			else
-			{
-				// use virtual xfb with offset
-				int xfbHeight = xfbSource->srcHeight;
-				int xfbWidth = xfbSource->srcWidth;
-				int hOffset = ((s32)xfbSource->srcAddr - (s32)xfbAddr) / ((s32)fbWidth * 2);
-
-				drawRc.top = 1.0f - (2.0f * (hOffset) / (float)fbHeight);
-				drawRc.bottom = 1.0f - (2.0f * (hOffset + xfbHeight) / (float)fbHeight);
-				drawRc.left = -(xfbWidth / (float)fbWidth);
-				drawRc.right = (xfbWidth / (float)fbWidth);
-
-				// The following code disables auto stretch.  Kept for reference.
-				// scale draw area for a 1 to 1 pixel mapping with the draw target
-				//float vScale = (float)fbHeight / (float)s_backbuffer_height;
-				//float hScale = (float)fbWidth / (float)s_backbuffer_width;
-				//drawRc.top *= vScale;
-				//drawRc.bottom *= vScale;
-				//drawRc.left *= hScale;
-				//drawRc.right *= hScale;
-			}
-
-			xfbSource->Draw(sourceRc, drawRc, 0, 0);
-		}
-	}
-	else
-	{
-		TargetRectangle targetRc = Renderer::ConvertEFBRectangle(rc);
-
-		// TODO: Improve sampling algorithm for the pixel shader so that we can use the multisampled EFB texture as source
-		D3DTexture2D* read_texture = FramebufferManager::GetResolvedEFBColorTexture();
-		D3D::drawShadedTexQuad(read_texture->GetSRV(), targetRc.AsRECT(), Renderer::GetTargetWidth(), Renderer::GetTargetHeight(), PixelShaderCache::GetColorCopyProgram(false),VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), Gamma);
-	}
-
-	// done with drawing the game stuff, good moment to save a screenshot
-	if (s_bScreenshot)
-	{
-		SaveScreenshot(s_sScreenshotName, GetTargetRectangle());
-		s_bScreenshot = false;
-	}
-
-	// Dump frames
-	static int w = 0, h = 0;
-	if (g_ActiveConfig.bDumpFrames)
-	{
-		static int s_recordWidth;
-		static int s_recordHeight;
-
-		if (!s_screenshot_texture)
-			CreateScreenshotTexture(GetTargetRectangle());
-
-		D3D11_BOX box = CD3D11_BOX(GetTargetRectangle().left, GetTargetRectangle().top, 0, GetTargetRectangle().right, GetTargetRectangle().bottom, 1);
-		D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0, &box);
-		if (!bLastFrameDumped)
-		{
-			s_recordWidth = GetTargetRectangle().GetWidth();
-			s_recordHeight = GetTargetRectangle().GetHeight();
-			bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight);
-			if (!bAVIDumping)
-			{
-				PanicAlert("Error dumping frames to AVI.");
-			}
-			else
-			{
-				char msg [255];
-				sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
-						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight);
-				OSD::AddMessage(msg, 2000);
-			}
-		}
-		if (bAVIDumping)
-		{
-			D3D11_MAPPED_SUBRESOURCE map;
-			D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map);
-
-			if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight)
-			{
-				frame_data.resize(3 * s_recordWidth * s_recordHeight);
-				w = s_recordWidth;
-				h = s_recordHeight;
-			}
-			formatBufferDump((u8*)map.pData, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch);
-			AVIDump::AddFrame(&frame_data[0], GetTargetRectangle().GetWidth(), GetTargetRectangle().GetHeight());
-			D3D::context->Unmap(s_screenshot_texture, 0);
-		}
-		bLastFrameDumped = true;
-	}
-	else
-	{
-		if (bLastFrameDumped && bAVIDumping)
-		{
-			std::vector<u8>().swap(frame_data);
-			w = h = 0;
-
-			AVIDump::Stop();
-			bAVIDumping = false;
-			OSD::AddMessage("Stop dumping frames to AVI", 2000);
-		}
-		bLastFrameDumped = false;
-	}
-
-	// Finish up the current frame, print some stats
-	if (g_ActiveConfig.bShowFPS)
-	{
-		char fps[20];
-		StringCchPrintfA(fps, 20, "FPS: %d\n", s_fps);
-		D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps);
-	}
-
-	if (SConfig::GetInstance().m_ShowLag)
-	{
-		char lag[10];
-		StringCchPrintfA(lag, 10, "Lag: %llu\n", Movie::g_currentLagCount);
-		D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag);
-	}
-
-	if (g_ActiveConfig.bShowInputDisplay)
-	{
-		char inputDisplay[1000];
-		StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str());
-		D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, inputDisplay);
-	}
-	Renderer::DrawDebugText();
-
-	if (g_ActiveConfig.bOverlayStats)
-	{
-		char buf[32768];
-		Statistics::ToString(buf);
-		D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf);
-	}
-	else if (g_ActiveConfig.bOverlayProjStats)
-	{
-		char buf[32768];
-		Statistics::ToStringProj(buf);
-		D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf);
-	}
-
-	OSD::DrawMessages();
-	D3D::EndFrame();
-	frameCount++;
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);
-
-	DLCache::ProgressiveCleanup();
-	TextureCache::Cleanup();
-
-	// Enable configuration changes
-	UpdateActiveConfig();
-	TextureCache::OnConfigChanged(g_ActiveConfig);
-
-	SetWindowSize(fbWidth, fbHeight);
-
-	const bool windowResized = CheckForResize();
-
-	bool xfbchanged = false;
-
-	if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight)
-	{
-		xfbchanged = true;
-		unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth;
-		unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
-		FramebufferManagerBase::SetLastXfbWidth(w);
-		FramebufferManagerBase::SetLastXfbHeight(h);
-	}
-
-	// update FPS counter
-	if (XFBWrited)
-		s_fps = UpdateFPSCounter();
-
-	// Begin new frame
-	// Set default viewport and scissor, for the clear to work correctly
-	// New frame
-	stats.ResetFrame();
-
-	// Flip/present backbuffer to frontbuffer here
-	D3D::Present();
-
-	// resize the back buffers NOW to avoid flickering
-	if (xfbchanged ||
-		windowResized ||
-		s_LastEFBScale != g_ActiveConfig.iEFBScale ||
-		s_LastAA != g_ActiveConfig.iMultisampleMode)
-	{
-		s_LastAA = g_ActiveConfig.iMultisampleMode;
-		PixelShaderCache::InvalidateMSAAShaders();
-
-		if (windowResized)
-		{
-			// TODO: Aren't we still holding a reference to the back buffer right now?
-			D3D::Reset();
-			SAFE_RELEASE(s_screenshot_texture);
-			s_backbuffer_width = D3D::GetBackBufferWidth();
-			s_backbuffer_height = D3D::GetBackBufferHeight();
-		}
-
-		UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-		s_LastEFBScale = g_ActiveConfig.iEFBScale;
-		CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
-
-		D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL);
-
-		delete g_framebuffer_manager;
-		g_framebuffer_manager = new FramebufferManager;
-		float clear_col[4] = { 0.f, 0.f, 0.f, 1.f };
-		D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(), clear_col);
-		D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(), D3D11_CLEAR_DEPTH, 1.f, 0);
-	}
-
-	// begin next frame
-	Renderer::RestoreAPIState();
-	D3D::BeginFrame();
-	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
-	VertexShaderManager::SetViewportChanged();
-
-	Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB));
-	XFBWrited = false;
-}
-
-// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
-void Renderer::ResetAPIState()
-{
-	D3D::stateman->PushBlendState(resetblendstate);
-	D3D::stateman->PushDepthState(resetdepthstate);
-	D3D::stateman->PushRasterizerState(resetraststate);
-}
-
-void Renderer::RestoreAPIState()
-{
-	// Gets us back into a more game-like state.
-	D3D::stateman->PopBlendState();
-	D3D::stateman->PopDepthState();
-	D3D::stateman->PopRasterizerState();
-	VertexShaderManager::SetViewportChanged();
-	BPFunctions::SetScissor();
-}
-
-void Renderer::ApplyState(bool bUseDstAlpha)
-{
-	HRESULT hr;
-
-	if (bUseDstAlpha)
-	{
-		// Colors should blend against SRC1_ALPHA
-		if (gx_state.blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_SRC_ALPHA)
-			gx_state.blenddc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC1_ALPHA;
-		else if (gx_state.blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_INV_SRC_ALPHA)
-			gx_state.blenddc.RenderTarget[0].SrcBlend = D3D11_BLEND_INV_SRC1_ALPHA;
-
-		// Colors should blend against SRC1_ALPHA
-		if (gx_state.blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_SRC_ALPHA)
-			gx_state.blenddc.RenderTarget[0].DestBlend = D3D11_BLEND_SRC1_ALPHA;
-		else if (gx_state.blenddc.RenderTarget[0].DestBlend == D3D11_BLEND_INV_SRC_ALPHA)
-			gx_state.blenddc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC1_ALPHA;
-
-		gx_state.blenddc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
-		gx_state.blenddc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-		gx_state.blenddc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-	}
-
-	ID3D11BlendState* blstate;
-	hr = D3D::device->CreateBlendState(&gx_state.blenddc, &blstate);
-	if (FAILED(hr)) PanicAlert("Failed to create blend state at %s %d\n", __FILE__, __LINE__);
-	D3D::stateman->PushBlendState(blstate);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)blstate, "blend state used to emulate the GX pipeline");
-	SAFE_RELEASE(blstate);
-
-	ID3D11DepthStencilState* depth_state;
-	hr = D3D::device->CreateDepthStencilState(&gx_state.depthdc, &depth_state);
-	if (SUCCEEDED(hr)) D3D::SetDebugObjectName((ID3D11DeviceChild*)depth_state, "depth-stencil state used to emulate the GX pipeline");
-	else PanicAlert("Failed to create depth state at %s %d\n", __FILE__, __LINE__);
-	D3D::stateman->PushDepthState(depth_state);
-	SAFE_RELEASE(depth_state);
-
-	gx_state.rastdc.FillMode = (g_ActiveConfig.bWireFrame) ? D3D11_FILL_WIREFRAME : D3D11_FILL_SOLID;
-	ID3D11RasterizerState* raststate;
-	hr = D3D::device->CreateRasterizerState(&gx_state.rastdc, &raststate);
-	if (FAILED(hr)) PanicAlert("Failed to create rasterizer state at %s %d\n", __FILE__, __LINE__);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)raststate, "rasterizer state used to emulate the GX pipeline");
-	D3D::stateman->PushRasterizerState(raststate);
-	SAFE_RELEASE(raststate);
-
-	ID3D11SamplerState* samplerstate[8];
-	for (unsigned int stage = 0; stage < 8; stage++)
-	{
-		// TODO: unnecessary state changes, we should store a list of shader resources
-		//if (shader_resources[stage])
-		{
-			if(g_ActiveConfig.iMaxAnisotropy > 0) gx_state.sampdc[stage].Filter = D3D11_FILTER_ANISOTROPIC;
-			hr = D3D::device->CreateSamplerState(&gx_state.sampdc[stage], &samplerstate[stage]);
-			if (FAILED(hr)) PanicAlert("Fail %s %d, stage=%d\n", __FILE__, __LINE__, stage);
-			else D3D::SetDebugObjectName((ID3D11DeviceChild*)samplerstate[stage], "sampler state used to emulate the GX pipeline");
-		}
-		// else samplerstate[stage] = NULL;
-	}
-	D3D::context->PSSetSamplers(0, 8, samplerstate);
-	for (unsigned int stage = 0; stage < 8; stage++)
-		SAFE_RELEASE(samplerstate[stage]);
-
-	D3D::stateman->Apply();
-
-	if (bUseDstAlpha)
-	{
-		// restore actual state
-		SetBlendMode(false);
-		SetLogicOpMode();
-	}
-
-	D3D::context->PSSetConstantBuffers(0, 1, &PixelShaderCache::GetConstantBuffer());
-	D3D::context->VSSetConstantBuffers(0, 1, &VertexShaderCache::GetConstantBuffer());
-
-	D3D::context->PSSetShader(PixelShaderCache::GetActiveShader(), NULL, 0);
-	D3D::context->VSSetShader(VertexShaderCache::GetActiveShader(), NULL, 0);
-}
-
-void Renderer::RestoreState()
-{
-	ID3D11ShaderResourceView* shader_resources[8] = { NULL };
-	D3D::context->PSSetShaderResources(0, 8, shader_resources);
-
-	D3D::stateman->PopBlendState();
-	D3D::stateman->PopDepthState();
-	D3D::stateman->PopRasterizerState();
-}
-
-void Renderer::ApplyCullDisable()
-{
-	D3D11_RASTERIZER_DESC rastDesc = gx_state.rastdc;
-	rastDesc.CullMode = D3D11_CULL_NONE;
-
-	ID3D11RasterizerState* raststate;
-	HRESULT hr = D3D::device->CreateRasterizerState(&rastDesc, &raststate);
-	if (FAILED(hr)) PanicAlert("Failed to create culling-disabled rasterizer state at %s %d\n", __FILE__, __LINE__);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)raststate, "rasterizer state (culling disabled) used to emulate the GX pipeline");
-
-	D3D::stateman->PushRasterizerState(raststate);
-	SAFE_RELEASE(raststate);
-
-	D3D::stateman->Apply();
-}
-
-void Renderer::RestoreCull()
-{
-	D3D::stateman->PopRasterizerState();
-}
-
-void Renderer::SetGenerationMode()
-{
-	const D3D11_CULL_MODE d3dCullModes[4] =
-	{
-		D3D11_CULL_NONE,
-		D3D11_CULL_BACK,
-		D3D11_CULL_FRONT,
-		D3D11_CULL_BACK
-	};
-
-	// rastdc.FrontCounterClockwise must be false for this to work
-	gx_state.rastdc.CullMode = d3dCullModes[bpmem.genMode.cullmode];
-}
-
-void Renderer::SetDepthMode()
-{
-	const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] =
-	{
-		D3D11_COMPARISON_NEVER,
-		D3D11_COMPARISON_LESS,
-		D3D11_COMPARISON_EQUAL,
-		D3D11_COMPARISON_LESS_EQUAL,
-		D3D11_COMPARISON_GREATER,
-		D3D11_COMPARISON_NOT_EQUAL,
-		D3D11_COMPARISON_GREATER_EQUAL,
-		D3D11_COMPARISON_ALWAYS
-	};
-
-	if (bpmem.zmode.testenable)
-	{
-		gx_state.depthdc.DepthEnable = TRUE;
-		gx_state.depthdc.DepthWriteMask = bpmem.zmode.updateenable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO;
-		gx_state.depthdc.DepthFunc = d3dCmpFuncs[bpmem.zmode.func];
-	}
-	else
-	{
-		// if the test is disabled write is disabled too
-		gx_state.depthdc.DepthEnable = FALSE;
-		gx_state.depthdc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
-	}
-}
-
-void Renderer::SetLogicOpMode()
-{
-	// D3D11 doesn't support logic blending, so this is a huge hack
-	// TODO: Make use of D3D11.1's logic blending support
-
-	//		0	0x00
-	//		1	Source & destination
-	//		2	Source & ~destination
-	//		3	Source
-	//		4	~Source & destination
-	//		5	Destination
-	//		6	Source ^ destination =  Source & ~destination | ~Source & destination
-	//		7	Source | destination
-	//		8	~(Source | destination)
-	//		9	~(Source ^ destination) = ~Source & ~destination | Source & destination
-	//		10	~Destination
-	//		11	Source | ~destination
-	//		12	~Source
-	//		13	~Source | destination
-	//		14	~(Source & destination)
-	//		15	0xff
-	const D3D11_BLEND_OP d3dLogicOps[16] =
-	{
-		D3D11_BLEND_OP_ADD,//0
-		D3D11_BLEND_OP_ADD,//1
-		D3D11_BLEND_OP_SUBTRACT,//2
-		D3D11_BLEND_OP_ADD,//3
-		D3D11_BLEND_OP_REV_SUBTRACT,//4
-		D3D11_BLEND_OP_ADD,//5
-		D3D11_BLEND_OP_MAX,//6
-		D3D11_BLEND_OP_ADD,//7
-		D3D11_BLEND_OP_MAX,//8
-		D3D11_BLEND_OP_MAX,//9
-		D3D11_BLEND_OP_ADD,//10
-		D3D11_BLEND_OP_ADD,//11
-		D3D11_BLEND_OP_ADD,//12
-		D3D11_BLEND_OP_ADD,//13
-		D3D11_BLEND_OP_ADD,//14
-		D3D11_BLEND_OP_ADD//15
-	};
-	const D3D11_BLEND d3dLogicOpSrcFactors[16] =
-	{
-		D3D11_BLEND_ZERO,//0
-		D3D11_BLEND_DEST_COLOR,//1
-		D3D11_BLEND_ONE,//2
-		D3D11_BLEND_ONE,//3
-		D3D11_BLEND_DEST_COLOR,//4
-		D3D11_BLEND_ZERO,//5
-		D3D11_BLEND_INV_DEST_COLOR,//6
-		D3D11_BLEND_INV_DEST_COLOR,//7
-		D3D11_BLEND_INV_SRC_COLOR,//8
-		D3D11_BLEND_INV_SRC_COLOR,//9
-		D3D11_BLEND_INV_DEST_COLOR,//10
-		D3D11_BLEND_ONE,//11
-		D3D11_BLEND_INV_SRC_COLOR,//12
-		D3D11_BLEND_INV_SRC_COLOR,//13 
-		D3D11_BLEND_INV_DEST_COLOR,//14
-		D3D11_BLEND_ONE//15
-	};
-	const D3D11_BLEND d3dLogicOpDestFactors[16] =
-	{
-		D3D11_BLEND_ZERO,//0
-		D3D11_BLEND_ZERO,//1
-		D3D11_BLEND_INV_SRC_COLOR,//2
-		D3D11_BLEND_ZERO,//3
-		D3D11_BLEND_ONE,//4
-		D3D11_BLEND_ONE,//5
-		D3D11_BLEND_INV_SRC_COLOR,//6
-		D3D11_BLEND_ONE,//7
-		D3D11_BLEND_INV_DEST_COLOR,//8
-		D3D11_BLEND_SRC_COLOR,//9
-		D3D11_BLEND_INV_DEST_COLOR,//10
-		D3D11_BLEND_INV_DEST_COLOR,//11
-		D3D11_BLEND_INV_SRC_COLOR,//12
-		D3D11_BLEND_ONE,//13 
-		D3D11_BLEND_INV_SRC_COLOR,//14
-		D3D11_BLEND_ONE//15
-	};
-
-	if (bpmem.blendmode.logicopenable)
-	{
-		gx_state.blenddc.RenderTarget[0].BlendEnable = true;
-		SetBlendOp(d3dLogicOps[bpmem.blendmode.logicmode]);
-		SetSrcBlend(d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]);
-		SetDestBlend(d3dLogicOpDestFactors[bpmem.blendmode.logicmode]);
-	}
-	else
-	{
-		SetBlendMode(true);
-	}
-}
-
-void Renderer::SetDitherMode()
-{
-	// TODO: Set dither mode to bpmem.blendmode.dither
-}
-
-void Renderer::SetLineWidth()
-{
-	// TODO
-}
-
-void Renderer::SetSamplerState(int stage, int texindex)
-{
-#define TEXF_NONE   0
-#define TEXF_POINT  1
-#define TEXF_LINEAR 2
-	const unsigned int d3dMipFilters[4] =
-	{
-		TEXF_NONE,
-		TEXF_POINT,
-		TEXF_LINEAR,
-		TEXF_NONE, //reserved
-	};
-	const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] =
-	{
-		D3D11_TEXTURE_ADDRESS_CLAMP,
-		D3D11_TEXTURE_ADDRESS_WRAP,
-		D3D11_TEXTURE_ADDRESS_MIRROR,
-		D3D11_TEXTURE_ADDRESS_WRAP //reserved
-	};
-
-	const FourTexUnits &tex = bpmem.tex[texindex];
-	const TexMode0 &tm0 = tex.texMode0[stage];
-	const TexMode1 &tm1 = tex.texMode1[stage];
-	
-	unsigned int mip = d3dMipFilters[tm0.min_filter & 3];
-
-	if (texindex) stage += 4;
-
-	if (g_ActiveConfig.bForceFiltering)
-	{
-		gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-	}
-	else if (tm0.min_filter & 4) // linear min filter
-	{
-		if (tm0.mag_filter) // linear mag filter
-		{
-			if (mip == TEXF_NONE) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
-			else if (mip == TEXF_POINT) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
-			else if (mip == TEXF_LINEAR) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-		}
-		else // point mag filter
-		{
-			if (mip == TEXF_NONE) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT;
-			else if (mip == TEXF_POINT) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT;
-			else if (mip == TEXF_LINEAR) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR;
-		}
-	}
-	else // point min filter
-	{
-		if (tm0.mag_filter) // linear mag filter
-		{
-			if (mip == TEXF_NONE) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
-			else if (mip == TEXF_POINT) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
-			else if (mip == TEXF_LINEAR) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR;
-		}
-		else // point mag filter
-		{
-			if (mip == TEXF_NONE) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-			else if (mip == TEXF_POINT) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-			else if (mip == TEXF_LINEAR) gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR;
-		}
-	}
-
-	gx_state.sampdc[stage].AddressU = d3dClamps[tm0.wrap_s];
-	gx_state.sampdc[stage].AddressV = d3dClamps[tm0.wrap_t];
-
-	// When mipfilter is set to "none", just disable mipmapping altogether
-	gx_state.sampdc[stage].MaxLOD = (mip == TEXF_NONE) ? 0.0f : (float)tm1.max_lod/16.f;
-	gx_state.sampdc[stage].MinLOD = (float)tm1.min_lod/16.f;
-	gx_state.sampdc[stage].MipLODBias = (s32)tm0.lod_bias/32.0f;
-}
-
-void Renderer::SetInterlacingMode()
-{
-	// TODO
-}
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.h b/Source/Plugins/Plugin_VideoDX11/Src/Render.h
deleted file mode 100644
index 8f6c78fae1..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#ifndef _RENDER_H_
-#define _RENDER_H_
-
-#include "RenderBase.h"
-
-namespace DX11
-{
-
-class Renderer : public ::Renderer
-{
-public:
-	Renderer();
-	~Renderer();
-
-	void SetColorMask();
-	void SetBlendMode(bool forceUpdate);
-	void SetScissorRect(const TargetRectangle& rc);
-	void SetGenerationMode();
-	void SetDepthMode();
-	void SetLogicOpMode();
-	void SetDitherMode();
-	void SetLineWidth();
-	void SetSamplerState(int stage,int texindex);
-	void SetInterlacingMode();
-
-	// TODO: Fix confusing names (see ResetAPIState and RestoreAPIState)
-	void ApplyState(bool bUseDstAlpha);
-	void RestoreState();
-
-	void ApplyCullDisable();
-	void RestoreCull();
-
-	void RenderText(const char* pstr, int left, int top, u32 color);
-
-	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data);
-
-	void ResetAPIState();
-	void RestoreAPIState();
-
-	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc);
-
-	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
-
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
-
-	void ReinterpretPixelData(unsigned int convtype);
-
-	void UpdateViewport(Matrix44& vpCorrection);
-
-	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
-
-	static bool CheckForResize();
-
-	void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetPSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-
-	void SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetVSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f);
-	void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
deleted file mode 100644
index e1feec595b..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Television.h"
-
-#include "VideoConfig.h"
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "D3DUtil.h"
-#include "VertexShaderCache.h"
-#include "HW/Memmap.h"
-
-namespace DX11
-{
-
-static const char YUYV_DECODER_PS[] =
-"// dolphin-emu YUYV decoder pixel shader\n"
-
-"Texture2D Tex0 : register(t0);\n"
-"sampler Samp0 : register(s0);\n"
-
-"static const float3x3 YCBCR_TO_RGB = float3x3(\n"
-	"1.164, 0.000, 1.596,\n"
-	"1.164, -0.392, -0.813,\n"
-	"1.164, 2.017, 0.000\n"
-	");\n"
-
-"void main(out float4 ocol0 : SV_Target, in float4 pos : SV_Position, in float2 uv0 : TEXCOORD0)\n"
-"{\n"
-	"float3 sample = Tex0.Sample(Samp0, uv0).rgb;\n"
-
-	// GameCube/Wii XFB data is in YUYV format with ITU-R Rec. BT.601 color
-	// primaries, compressed to the range Y in 16..235, U and V in 16..240.
-	// We want to convert it to RGB format with sRGB color primaries, with
-	// range 0..255.
-
-	// Recover RGB components
-	"float3 yuv_601_sub = sample.grb - float3(16.0/255.0, 128.0/255.0, 128.0/255.0);\n"
-	"float3 rgb_601 = mul(YCBCR_TO_RGB, yuv_601_sub);\n"
-
-	// If we were really obsessed with accuracy, we would correct for the
-	// differing color primaries between BT.601 and sRGB. However, this may not
-	// be worth the trouble because:
-	// - BT.601 defines two sets of primaries: one for NTSC and one for PAL.
-	// - sRGB's color primaries are actually an intermediate between BT.601's
-	//   NTSC and PAL primaries.
-	// - If users even noticed any difference at all, they would be confused by
-	//   the slightly-different colors in the NTSC and PAL versions of the same
-	//   game.
-	// - Even the game designers probably don't pay close attention to this
-	//   stuff.
-	// Still, instructions on how to do it can be found at
-	// <http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC20>
-
-	"ocol0 = float4(rgb_601, 1);\n"
-"}\n"
-;
-
-Television::Television()
-	: m_yuyvTexture(NULL), m_yuyvTextureSRV(NULL), m_pShader(NULL)
-{ }
-
-void Television::Init()
-{
-	HRESULT hr;
-
-	// Create YUYV texture for real XFB mode
-
-	// This texture format is designed for YUYV data.
-	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
-		DXGI_FORMAT_G8R8_G8B8_UNORM, MAX_XFB_WIDTH, MAX_XFB_HEIGHT, 1, 1);
-	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_yuyvTexture);
-	CHECK(SUCCEEDED(hr), "create tv yuyv texture");
-	D3D::SetDebugObjectName(m_yuyvTexture, "tv yuyv texture");
-
-	// Create shader resource view for YUYV texture
-
-	D3D11_SHADER_RESOURCE_VIEW_DESC srvd = CD3D11_SHADER_RESOURCE_VIEW_DESC(
-		m_yuyvTexture, D3D11_SRV_DIMENSION_TEXTURE2D,
-		DXGI_FORMAT_G8R8_G8B8_UNORM);
-	hr = D3D::device->CreateShaderResourceView(m_yuyvTexture, &srvd, &m_yuyvTextureSRV);
-	CHECK(SUCCEEDED(hr), "create tv yuyv texture srv");
-	D3D::SetDebugObjectName(m_yuyvTextureSRV, "tv yuyv texture srv");
-
-	// Create YUYV-decoding pixel shader
-
-	m_pShader = D3D::CompileAndCreatePixelShader(YUYV_DECODER_PS, sizeof(YUYV_DECODER_PS));
-	CHECK(m_pShader != NULL, "compile and create yuyv decoder pixel shader");
-	D3D::SetDebugObjectName(m_pShader, "yuyv decoder pixel shader");
-}
-
-void Television::Shutdown()
-{
-	SAFE_RELEASE(m_pShader);
-	SAFE_RELEASE(m_yuyvTextureSRV);
-	SAFE_RELEASE(m_yuyvTexture);
-}
-
-void Television::Submit(u32 xfbAddr, u32 width, u32 height)
-{
-	m_curAddr = xfbAddr;
-	m_curWidth = width;
-	m_curHeight = height;
-
-	// Load data from GameCube RAM to YUYV texture
-	u8* yuyvSrc = Memory::GetPointer(xfbAddr);
-	D3D11_BOX box = CD3D11_BOX(0, 0, 0, width, height, 1);
-	D3D::context->UpdateSubresource(m_yuyvTexture, 0, &box, yuyvSrc, 2*width, 2*width*height);
-}
-
-void Television::Render()
-{
-	if (g_ActiveConfig.bUseRealXFB && g_ActiveConfig.bUseXFB)
-	{
-		// Use real XFB mode
-		// TODO: If this is the lower field, render at a vertical offset of 1
-		// line down. We could even consider implementing a deinterlacing
-		// algorithm.
-
-		MathUtil::Rectangle<float> sourceRc(0.f, 0.f, float(m_curWidth), float(m_curHeight));
-		MathUtil::Rectangle<float> destRc(-1.f, 1.f, 1.f, -1.f);
-
-		D3D::drawShadedTexSubQuad(
-			m_yuyvTextureSRV, &sourceRc,
-			MAX_XFB_WIDTH, MAX_XFB_HEIGHT,
-			&destRc,
-			m_pShader,
-			VertexShaderCache::GetSimpleVertexShader(),
-			VertexShaderCache::GetSimpleInputLayout());
-	}
-	else if (g_ActiveConfig.bUseXFB)
-	{
-		// Use virtual XFB mode
-
-		// TODO: Eventually, Television should render the Virtual XFB mode
-		// display as well.
-	}
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
deleted file mode 100644
index e803f4a8f2..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "RenderBase.h"
-
-#include "D3DBase.h"
-#include "D3DUtil.h"
-#include "FramebufferManager.h"
-#include "PixelShaderCache.h"
-#include "TextureCache.h"
-#include "VertexShaderCache.h"
-#include "TextureEncoder.h"
-#include "PSTextureEncoder.h"
-#include "HW/Memmap.h"
-#include "VideoConfig.h"
-
-namespace DX11
-{
-
-static TextureEncoder* g_encoder = NULL;
-const size_t MAX_COPY_BUFFERS = 25;
-ID3D11Buffer* efbcopycbuf[MAX_COPY_BUFFERS] = { 0 };
-
-TextureCache::TCacheEntry::~TCacheEntry()
-{
-	texture->Release();
-}
-
-void TextureCache::TCacheEntry::Bind(unsigned int stage)
-{
-	D3D::context->PSSetShaderResources(stage, 1, &texture->GetSRV());
-}
-
-bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
-{
-	// TODO: Somehow implement this (D3DX11 doesn't support dumping individual LODs)
-	static bool warn_once = true;
-	if (level && warn_once)
-	{
-		WARN_LOG(VIDEO, "Dumping individual LOD not supported by D3D11 backend!");
-		warn_once = false;
-		return false;
-	}
-	return SUCCEEDED(PD3DX11SaveTextureToFileA(D3D::context, texture->GetTex(), D3DX11_IFF_PNG, filename));
-}
-
-void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
-	unsigned int expanded_width, unsigned int level)
-{
-	D3D::ReplaceRGBATexture2D(texture->GetTex(), TextureCache::temp, width, height, expanded_width, level, usage);
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
-	unsigned int height, unsigned int expanded_width,
-	unsigned int tex_levels, PC_TexFormat pcfmt)
-{
-	D3D11_USAGE usage = D3D11_USAGE_DEFAULT;
-	D3D11_CPU_ACCESS_FLAG cpu_access = (D3D11_CPU_ACCESS_FLAG)0;
-	D3D11_SUBRESOURCE_DATA srdata, *data = NULL;
-
-	if (tex_levels == 1)
-	{
-		usage = D3D11_USAGE_DYNAMIC;
-		cpu_access = D3D11_CPU_ACCESS_WRITE;
-
-		srdata.pSysMem = TextureCache::temp;
-		srdata.SysMemPitch = 4 * expanded_width;
-
-		data = &srdata;
-	}
-
-	const D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM,
-		width, height, 1, tex_levels, D3D11_BIND_SHADER_RESOURCE, usage, cpu_access);
-
-	ID3D11Texture2D *pTexture;
-	const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, data, &pTexture);
-	CHECK(SUCCEEDED(hr), "Create texture of the TextureCache");
-
-	TCacheEntry* const entry = new TCacheEntry(new D3DTexture2D(pTexture, D3D11_BIND_SHADER_RESOURCE));
-	entry->usage = usage;
-
-	// TODO: better debug names
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetTex(), "a texture of the TextureCache");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetSRV(), "shader resource view of a texture of the TextureCache");	
-
-	SAFE_RELEASE(pTexture);
-	
-	if (tex_levels != 1)
-		entry->Load(width, height, expanded_width, 0);
-
-	return entry;
-}
-
-void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-	unsigned int srcFormat, const EFBRectangle& srcRect,
-	bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-	const float *colmat)
-{
-	if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture)
-	{
-		g_renderer->ResetAPIState();
-
-		// stretch picture with increased internal resolution
-		const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)virtual_width, (float)virtual_height);
-		D3D::context->RSSetViewports(1, &vp);
-
-		// set transformation
-		if (NULL == efbcopycbuf[cbufid])
-		{
-			const D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(28 * sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
-			D3D11_SUBRESOURCE_DATA data;
-			data.pSysMem = colmat;
-			HRESULT hr = D3D::device->CreateBuffer(&cbdesc, &data, &efbcopycbuf[cbufid]);
-			CHECK(SUCCEEDED(hr), "Create efb copy constant buffer %d", cbufid);
-			D3D::SetDebugObjectName((ID3D11DeviceChild*)efbcopycbuf[cbufid], "a constant buffer used in TextureCache::CopyRenderTargetToTexture");
-		}
-		D3D::context->PSSetConstantBuffers(0, 1, &efbcopycbuf[cbufid]);
-
-		const TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
-		// TODO: try targetSource.asRECT();
-		const D3D11_RECT sourcerect = CD3D11_RECT(targetSource.left, targetSource.top, targetSource.right, targetSource.bottom);
-
-		// Use linear filtering if (bScaleByHalf), use point filtering otherwise
-		if (scaleByHalf)
-			D3D::SetLinearCopySampler();
-		else
-			D3D::SetPointCopySampler();
-
-		D3D::context->OMSetRenderTargets(1, &texture->GetRTV(), NULL);
-
-		// Create texture copy
-		D3D::drawShadedTexQuad(
-			(srcFormat == PIXELFMT_Z24) ? FramebufferManager::GetEFBDepthTexture()->GetSRV() : FramebufferManager::GetEFBColorTexture()->GetSRV(),
-			&sourcerect, Renderer::GetTargetWidth(), Renderer::GetTargetHeight(),
-			(srcFormat == PIXELFMT_Z24) ? PixelShaderCache::GetDepthMatrixProgram(true) : PixelShaderCache::GetColorMatrixProgram(true),
-			VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
-
-		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
-	
-		g_renderer->RestoreAPIState();
-	}
-
-	if (!g_ActiveConfig.bCopyEFBToTexture)
-	{
-		u8* dst = Memory::GetPointer(dstAddr);
-		size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf);
-
-		u64 hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
-
-		// Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date
-		if (!g_ActiveConfig.bEFBCopyCacheEnable)
-			TextureCache::MakeRangeDynamic(addr, (u32)encoded_size);
-		else if (!TextureCache::Find(addr, hash))
-			TextureCache::MakeRangeDynamic(addr, (u32)encoded_size);
-
-		this->hash = hash;
-	}
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
-	unsigned int scaled_tex_w, unsigned int scaled_tex_h)
-{
-	return new TCacheEntry(D3DTexture2D::Create(scaled_tex_w, scaled_tex_h,
-		(D3D11_BIND_FLAG)((int)D3D11_BIND_RENDER_TARGET | (int)D3D11_BIND_SHADER_RESOURCE),
-		D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM));
-}
-
-TextureCache::TextureCache()
-{
-	// FIXME: Is it safe here?
-	g_encoder = new PSTextureEncoder;
-	g_encoder->Init();
-}
-
-TextureCache::~TextureCache()
-{
-	for (unsigned int k = 0; k < MAX_COPY_BUFFERS; ++k)
-		SAFE_RELEASE(efbcopycbuf[k]);
-
-	g_encoder->Shutdown();
-	delete g_encoder;
-	g_encoder = NULL;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
deleted file mode 100644
index 94adfe8cce..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "TextureCacheBase.h"
-
-#include "D3DTexture.h"
-
-namespace DX11
-{
-
-class TextureCache : public ::TextureCache
-{
-public:
-	TextureCache();
-	~TextureCache();
-
-private:
-	struct TCacheEntry : TCacheEntryBase
-	{
-		D3DTexture2D *const texture;
-
-		D3D11_USAGE usage;
-
-		TCacheEntry(D3DTexture2D *_tex) : texture(_tex) {}
-		~TCacheEntry();
-
-		void Load(unsigned int width, unsigned int height,
-			unsigned int expanded_width, unsigned int levels);
-
-		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-			unsigned int srcFormat, const EFBRectangle& srcRect,
-			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-			const float *colmat);
-
-		void Bind(unsigned int stage);
-		bool Save(const char filename[], unsigned int level);
-	};
-
-	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
-		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
-
-	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
-	u64 EncodeToRamFromTexture(u32 address, void* source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) {return 0;};
-};
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
deleted file mode 100644
index d97434d380..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTUREENCODER_H
-#define _TEXTUREENCODER_H
-
-#include "VideoCommon.h"
-
-namespace DX11
-{
-
-// 4-bit format: 8x8 texels / cache line
-// 8-bit format: 8x4 texels / cache line
-// 16-bit format: 4x4 texels / cache line
-// 32-bit format: 4x4 texels / 2 cache lines
-// Compressed format: 8x8 texels / cache line
-
-// Document EFB encoding formats here with examples of where they are used.
-
-// Format: 0 - R4
-// Used in The Legend of Zelda: The Wind Waker for character shadows (srcFormat 1,
-// isIntensity 1, scaleByHalf 1).
-
-// Format: 1 - R8
-// FIXME: Unseen. May or may not be a duplicate of format 8.
-
-// Format: 2 - A4 R4
-// FIXME: Unseen.
-
-// Format: 3 - A8 R8
-// FIXME: Unseen.
-
-// Format: 4 - R5 G6 B5
-// Used in Wind Waker for most render-to-texture effects like heat shimmer and
-// depth-of-field.
-
-// Format: 5 - 1 R5 G5 B5 or 0 A3 R4 G4 B4
-// Used in Twilight Princess for character shadows.
-
-// Format: 6 - A8 R8 A8 R8 | G8 B8 G8 B8
-// Used in Twilight Princess for bloom effect.
-
-// Format: 7 - A8
-// Used in Metroid Prime 2 for the scan visor.
-
-// Format: 8 - R8
-// Used in Twilight Princess for the map.
-
-// Format: 9 - G8
-// FIXME: Unseen.
-
-// Format: A - B8
-// Used in Metroid Prime 2 for the scan visor.
-
-// Format: B - G8 R8
-// Used in Wind Waker for depth-of-field. Usually used with srcFormat 3 to
-// render depth textures. The bytes are swapped, so games have to correct it
-// in RAM before using it as a texture.
-
-// Format: C - B8 G8
-// FIXME: Unseen.
-
-const unsigned int BLOCK_WIDTHS[16] = {
-	8, // R4
-	8, // R8 (FIXME: duplicate of R8 below?)
-	8, // A4 R4
-	4, // A8 R8
-	4, // R5 G6 B5
-	4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4
-	4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines)
-	8, // A8
-	8, // R8 (FIXME: duplicate of R8 above?)
-	8, // G8
-	8, // B8
-	4, // G8 R8
-	4, // B8 G8
-	0, 0, 0 // Unknown formats
-};
-
-const unsigned int BLOCK_HEIGHTS[16] = {
-	8, // R4
-	4, // R8 (FIXME: duplicate of R8 below?)
-	4, // A4 R4
-	4, // A8 R8
-	4, // R5 G6 B5
-	4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4
-	4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines)
-	4, // A8
-	4, // R8 (FIXME: duplicate of R8 above?)
-	4, // G8
-	4, // B8
-	4, // G8 R8
-	4, // B8 G8
-	0, 0, 0 // Unknown formats
-};
-
-// Maximum number of bytes that can occur in a texture block-row generated by
-// the encoder
-static const UINT MAX_BYTES_PER_BLOCK_ROW = (EFB_WIDTH/4)*64;
-// The maximum amount of data that the texture encoder can generate in one call
-static const UINT MAX_BYTES_PER_ENCODE = MAX_BYTES_PER_BLOCK_ROW*(EFB_HEIGHT/4);
-
-class TextureEncoder
-{
-
-public:
-
-	virtual ~TextureEncoder() { }
-
-	virtual void Init() = 0;
-	virtual void Shutdown() = 0;
-	// Returns size in bytes of encoded block of memory
-	virtual size_t Encode(u8* dst, unsigned int dstFormat,
-		unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
-		bool scaleByHalf) = 0;
-
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
deleted file mode 100644
index b16a91ad95..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "PixelShaderCache.h"
-#include "VertexManager.h"
-#include "VertexShaderCache.h"
-
-#include "BPMemory.h"
-#include "Debugger.h"
-#include "IndexGenerator.h"
-#include "MainBase.h"
-#include "PixelShaderManager.h"
-#include "RenderBase.h"
-#include "Render.h"
-#include "Statistics.h"
-#include "TextureCacheBase.h"
-#include "VertexShaderManager.h"
-#include "VideoConfig.h"
-
-// internal state for loading vertices
-extern NativeVertexFormat *g_nativeVertexFmt;
-
-namespace DX11
-{
-
-// TODO: Find sensible values for these two
-const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * sizeof(u16) * 8;
-const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE;
-const UINT MAX_VBUFFER_COUNT = 2;
-
-void VertexManager::CreateDeviceObjects()
-{
-	D3D11_BUFFER_DESC bufdesc = CD3D11_BUFFER_DESC(IBUFFER_SIZE,
-		D3D11_BIND_INDEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-
-	m_vertex_draw_offset = 0;
-	m_triangle_draw_index = 0;
-	m_line_draw_index = 0;
-	m_point_draw_index = 0;
-	m_index_buffers = new PID3D11Buffer[MAX_VBUFFER_COUNT];
-	m_vertex_buffers = new PID3D11Buffer[MAX_VBUFFER_COUNT];	
-	for (m_current_index_buffer = 0; m_current_index_buffer < MAX_VBUFFER_COUNT; m_current_index_buffer++)
-	{
-		m_index_buffers[m_current_index_buffer] = NULL;
-		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_index_buffers[m_current_index_buffer])),
-		"Failed to create index buffer.");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_index_buffers[m_current_index_buffer], "index buffer of VertexManager");
-	}
-	bufdesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-	bufdesc.ByteWidth = VBUFFER_SIZE;
-	for (m_current_vertex_buffer = 0; m_current_vertex_buffer < MAX_VBUFFER_COUNT; m_current_vertex_buffer++)
-	{
-		m_vertex_buffers[m_current_vertex_buffer] = NULL;
-		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertex_buffers[m_current_vertex_buffer])),
-		"Failed to create vertex buffer.");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertex_buffers[m_current_vertex_buffer], "Vertex buffer of VertexManager");
-	}
-	m_current_vertex_buffer = 0;
-	m_current_index_buffer = 0;
-	m_index_buffer_cursor = IBUFFER_SIZE;
-	m_vertex_buffer_cursor = VBUFFER_SIZE;
-	m_lineShader.Init();
-	m_pointShader.Init();
-}
-
-void VertexManager::DestroyDeviceObjects()
-{
-	m_pointShader.Shutdown();
-	m_lineShader.Shutdown();
-	for (m_current_vertex_buffer = 0; m_current_vertex_buffer < MAX_VBUFFER_COUNT; m_current_vertex_buffer++)
-	{
-		SAFE_RELEASE(m_vertex_buffers[m_current_vertex_buffer]);
-		SAFE_RELEASE(m_index_buffers[m_current_vertex_buffer]);
-	}
-	
-}
-
-VertexManager::VertexManager()
-{
-	CreateDeviceObjects();
-}
-
-VertexManager::~VertexManager()
-{
-	DestroyDeviceObjects();
-}
-
-void VertexManager::PrepareDrawBuffers()
-{
-	D3D11_MAPPED_SUBRESOURCE map;
-
-	UINT vSize = UINT(s_pCurBufferPointer - s_pBaseBufferPointer);
-	D3D11_MAP MapType = D3D11_MAP_WRITE_NO_OVERWRITE;
-	if (m_vertex_buffer_cursor + vSize >= VBUFFER_SIZE)
-	{
-		// Wrap around
-		m_current_vertex_buffer = (m_current_vertex_buffer + 1) % MAX_VBUFFER_COUNT;		
-		m_vertex_buffer_cursor = 0;
-		MapType = D3D11_MAP_WRITE_DISCARD;
-	}
-
-	D3D::context->Map(m_vertex_buffers[m_current_vertex_buffer], 0, MapType, 0, &map);
-
-	memcpy((u8*)map.pData + m_vertex_buffer_cursor, s_pBaseBufferPointer, vSize);
-	D3D::context->Unmap(m_vertex_buffers[m_current_vertex_buffer], 0);
-	m_vertex_draw_offset = m_vertex_buffer_cursor;
-	m_vertex_buffer_cursor += vSize;
-
-	UINT iCount = IndexGenerator::GetTriangleindexLen() +
-		IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen();
-	MapType = D3D11_MAP_WRITE_NO_OVERWRITE;
-	if (m_index_buffer_cursor + iCount >= (IBUFFER_SIZE / sizeof(u16)))
-	{
-		// Wrap around
-		m_current_index_buffer = (m_current_index_buffer + 1) % MAX_VBUFFER_COUNT;		
-		m_index_buffer_cursor = 0;
-		MapType = D3D11_MAP_WRITE_DISCARD;
-	}
-	D3D::context->Map(m_index_buffers[m_current_index_buffer], 0, MapType, 0, &map);
-
-	m_triangle_draw_index = m_index_buffer_cursor;
-	m_line_draw_index = m_triangle_draw_index + IndexGenerator::GetTriangleindexLen();
-	m_point_draw_index = m_line_draw_index + IndexGenerator::GetLineindexLen();
-	memcpy((u16*)map.pData + m_triangle_draw_index, GetTriangleIndexBuffer(), sizeof(u16) * IndexGenerator::GetTriangleindexLen());
-	memcpy((u16*)map.pData + m_line_draw_index, GetLineIndexBuffer(), sizeof(u16) * IndexGenerator::GetLineindexLen());
-	memcpy((u16*)map.pData + m_point_draw_index, GetPointIndexBuffer(), sizeof(u16) * IndexGenerator::GetPointindexLen());
-	D3D::context->Unmap(m_index_buffers[m_current_index_buffer], 0);
-	m_index_buffer_cursor += iCount;
-	
-	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vSize);
-	ADDSTAT(stats.thisFrame.bytesIndexStreamed, iCount*sizeof(u16));
-}
-
-static const float LINE_PT_TEX_OFFSETS[8] = {
-	0.f, 0.0625f, 0.125f, 0.25f, 0.5f, 1.f, 1.f, 1.f
-};
-
-void VertexManager::Draw(UINT stride)
-{
-	D3D::context->IASetVertexBuffers(0, 1, &m_vertex_buffers[m_current_vertex_buffer], &stride, &m_vertex_draw_offset);
-	D3D::context->IASetIndexBuffer(m_index_buffers[m_current_index_buffer], DXGI_FORMAT_R16_UINT, 0);
-	
-	if (IndexGenerator::GetNumTriangles() > 0)
-	{
-		D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-		D3D::context->DrawIndexed(IndexGenerator::GetTriangleindexLen(), m_triangle_draw_index, 0);
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}
-	// Disable culling for lines and points
-	if (IndexGenerator::GetNumLines() > 0 || IndexGenerator::GetNumPoints() > 0)
-		((DX11::Renderer*)g_renderer)->ApplyCullDisable();
-	if (IndexGenerator::GetNumLines() > 0)
-	{
-		float lineWidth = float(bpmem.lineptwidth.linesize) / 6.f;
-		float texOffset = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.lineoff];
-		float vpWidth = 2.0f * xfregs.viewport.wd;
-		float vpHeight = -2.0f * xfregs.viewport.ht;
-
-		bool texOffsetEnable[8];
-
-		for (int i = 0; i < 8; ++i)
-			texOffsetEnable[i] = bpmem.texcoords[i].s.line_offset;
-
-		if (m_lineShader.SetShader(g_nativeVertexFmt->m_components, lineWidth,
-			texOffset, vpWidth, vpHeight, texOffsetEnable))
-		{
-			D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
-			D3D::context->DrawIndexed(IndexGenerator::GetLineindexLen(), m_line_draw_index, 0);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-
-			D3D::context->GSSetShader(NULL, NULL, 0);
-		}
-	}
-	if (IndexGenerator::GetNumPoints() > 0)
-	{
-		float pointSize = float(bpmem.lineptwidth.pointsize) / 6.f;
-		float texOffset = LINE_PT_TEX_OFFSETS[bpmem.lineptwidth.pointoff];
-		float vpWidth = 2.0f * xfregs.viewport.wd;
-		float vpHeight = -2.0f * xfregs.viewport.ht;
-
-		bool texOffsetEnable[8];
-
-		for (int i = 0; i < 8; ++i)
-			texOffsetEnable[i] = bpmem.texcoords[i].s.point_offset;
-
-		if (m_pointShader.SetShader(g_nativeVertexFmt->m_components, pointSize,
-			texOffset, vpWidth, vpHeight, texOffsetEnable))
-		{
-			D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
-			D3D::context->DrawIndexed(IndexGenerator::GetPointindexLen(), m_point_draw_index, 0);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-
-			D3D::context->GSSetShader(NULL, NULL, 0);
-		}
-	}
-	if (IndexGenerator::GetNumLines() > 0 || IndexGenerator::GetNumPoints() > 0)
-		((DX11::Renderer*)g_renderer)->RestoreCull();
-}
-
-void VertexManager::vFlush()
-{
-	u32 usedtextures = 0;
-	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-		if (bpmem.tevorders[i / 2].getEnable(i & 1))
-			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
-
-	if (bpmem.genMode.numindstages > 0)
-		for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1; ++i)
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
-
-	for (unsigned int i = 0; i < 8; i++)
-	{
-		if (usedtextures & (1 << i))
-		{
-			g_renderer->SetSamplerState(i & 3, i >> 2);
-			const FourTexUnits &tex = bpmem.tex[i >> 2];
-			const TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i, 
-				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
-				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
-				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
-				tex.texTlut[i&3].tlut_format,
-				(tex.texMode0[i&3].min_filter & 3),
-				(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
-				tex.texImage1[i&3].image_type);
-
-			if (tentry)
-			{
-				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "error loading texture");
-		}
-	}
-
-	// set global constants
-	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
-
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
-		bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-
-	if (!PixelShaderCache::SetShader(
-		useDstAlpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE,
-		g_nativeVertexFmt->m_components))
-	{
-		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
-		return;
-	}
-	if (!VertexShaderCache::SetShader(g_nativeVertexFmt->m_components))
-	{
-		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
-		return;
-	}
-	PrepareDrawBuffers();
-	unsigned int stride = g_nativeVertexFmt->GetVertexStride();
-	g_nativeVertexFmt->SetupVertexPointers();
-	g_renderer->ApplyState(useDstAlpha);
-
-	g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-	Draw(stride);
-	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
-
-	g_renderer->RestoreState();
-}
-
-}  // namespace
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
deleted file mode 100644
index 889c2ee0eb..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXMANAGER_H
-#define _VERTEXMANAGER_H
-
-#include "VertexManagerBase.h"
-#include "LineGeometryShader.h"
-#include "PointGeometryShader.h"
-
-namespace DX11
-{
-
-class VertexManager : public ::VertexManager
-{
-public:
-	VertexManager();
-	~VertexManager();
-
-	NativeVertexFormat* CreateNativeVertexFormat();
-	void CreateDeviceObjects();
-	void DestroyDeviceObjects();
-
-private:
-	
-	void PrepareDrawBuffers();
-	void Draw(u32 stride);
-	// temp
-	void vFlush();
-
-	u32 m_vertex_buffer_cursor;
-	u32 m_vertex_draw_offset;
-	u32 m_index_buffer_cursor;
-	u32 m_current_vertex_buffer;
-	u32 m_current_index_buffer;
-	u32 m_triangle_draw_index;
-	u32 m_line_draw_index;
-	u32 m_point_draw_index;
-	typedef ID3D11Buffer* PID3D11Buffer;
-	PID3D11Buffer* m_index_buffers;
-	PID3D11Buffer* m_vertex_buffers;
-
-	LineGeometryShader m_lineShader;
-	PointGeometryShader m_pointShader;
-};
-
-}  // namespace
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
deleted file mode 100644
index 6121824b8e..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FileUtil.h"
-#include "LinearDiskCache.h"
-
-#include "Debugger.h"
-#include "Statistics.h"
-#include "VertexShaderGen.h"
-
-#include "D3DShader.h"
-#include "Globals.h"
-#include "VertexShaderCache.h"
-
-#include "ConfigManager.h"
-
-// See comment near the bottom of this file
-static unsigned int vs_constant_offset_table[C_VENVCONST_END];
-float vsconstants[C_VENVCONST_END*4];
-bool vscbufchanged = true;
-
-namespace DX11 {
-
-VertexShaderCache::VSCache VertexShaderCache::vshaders;
-const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
-VertexShaderUid VertexShaderCache::last_uid;
-UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
-
-static ID3D11VertexShader* SimpleVertexShader = NULL;
-static ID3D11VertexShader* ClearVertexShader = NULL;
-static ID3D11InputLayout* SimpleLayout = NULL;
-static ID3D11InputLayout* ClearLayout = NULL;
-
-LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
-
-ID3D11VertexShader* VertexShaderCache::GetSimpleVertexShader() { return SimpleVertexShader; }
-ID3D11VertexShader* VertexShaderCache::GetClearVertexShader() { return ClearVertexShader; }
-ID3D11InputLayout* VertexShaderCache::GetSimpleInputLayout() { return SimpleLayout; }
-ID3D11InputLayout* VertexShaderCache::GetClearInputLayout() { return ClearLayout; }
-
-ID3D11Buffer* vscbuf = NULL;
-
-ID3D11Buffer* &VertexShaderCache::GetConstantBuffer()
-{
-	// TODO: divide the global variables of the generated shaders into about 5 constant buffers to speed this up
-	if (vscbufchanged)
-	{
-		D3D11_MAPPED_SUBRESOURCE map;
-		D3D::context->Map(vscbuf, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-		memcpy(map.pData, vsconstants, sizeof(vsconstants));
-		D3D::context->Unmap(vscbuf, 0);
-		vscbufchanged = false;
-		
-		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(vsconstants));
-	}
-	return vscbuf;
-}
-
-// this class will load the precompiled shaders into our cache
-class VertexShaderCacheInserter : public LinearDiskCacheReader<VertexShaderUid, u8>
-{
-public:
-	void Read(const VertexShaderUid &key, const u8 *value, u32 value_size)
-	{
-		D3DBlob* blob = new D3DBlob(value_size, value);
-		VertexShaderCache::InsertByteCode(key, blob);
-		blob->Release();
-
-	}
-};
-
-const char simple_shader_code[] = {
-	"struct VSOUTPUT\n"
-	"{\n"
-	"float4 vPosition : POSITION;\n"
-	"float2 vTexCoord : TEXCOORD0;\n"
-	"float  vTexCoord1 : TEXCOORD1;\n"
-	"};\n"
-	"VSOUTPUT main(float4 inPosition : POSITION,float3 inTEX0 : TEXCOORD0)\n"
-	"{\n"
-	"VSOUTPUT OUT;\n"
-	"OUT.vPosition = inPosition;\n"
-	"OUT.vTexCoord = inTEX0.xy;\n"
-	"OUT.vTexCoord1 = inTEX0.z;\n"
-	"return OUT;\n"
-	"}\n"
-};
-
-const char clear_shader_code[] = {
-	"struct VSOUTPUT\n"
-	"{\n"
-	"float4 vPosition   : POSITION;\n"
-	"float4 vColor0   : COLOR0;\n"						   
-	"};\n"
-	"VSOUTPUT main(float4 inPosition : POSITION,float4 inColor0: COLOR0)\n"
-	"{\n"
-	"VSOUTPUT OUT;\n"
-	"OUT.vPosition = inPosition;\n"
-	"OUT.vColor0 = inColor0;\n"
-	"return OUT;\n"
-	"}\n"
-};
-
-void VertexShaderCache::Init()
-{
-	const D3D11_INPUT_ELEMENT_DESC simpleelems[2] =
-	{
-		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		
-	};
-	const D3D11_INPUT_ELEMENT_DESC clearelems[2] =
-	{
-		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	};
-
-	unsigned int cbsize = ((sizeof(vsconstants))&(~0xf))+0x10; // must be a multiple of 16
-	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
-	HRESULT hr = D3D::device->CreateBuffer(&cbdesc, NULL, &vscbuf);
-	CHECK(hr==S_OK, "Create vertex shader constant buffer (size=%u)", cbsize);
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)vscbuf, "vertex shader constant buffer used to emulate the GX pipeline");
-
-	D3DBlob* blob;
-	D3D::CompileVertexShader(simple_shader_code, sizeof(simple_shader_code), &blob);
-	D3D::device->CreateInputLayout(simpleelems, 2, blob->Data(), blob->Size(), &SimpleLayout);
-	SimpleVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
-	if (SimpleLayout == NULL || SimpleVertexShader == NULL) PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
-	blob->Release();
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleVertexShader, "simple vertex shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleLayout, "simple input layout");
-
-	D3D::CompileVertexShader(clear_shader_code, sizeof(clear_shader_code), &blob);
-	D3D::device->CreateInputLayout(clearelems, 2, blob->Data(), blob->Size(), &ClearLayout);
-	ClearVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
-	if (ClearLayout == NULL || ClearVertexShader == NULL) PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
-	blob->Release();
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearVertexShader, "clear vertex shader");
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearLayout, "clear input layout");
-
-	Clear();
-
-	// these values are hardcoded, they depend on internal D3DCompile behavior
-	// TODO: Do this with D3DReflect or something instead
-	unsigned int k;
-	for (k = 0;k <  6;k++) vs_constant_offset_table[C_POSNORMALMATRIX+k]       =   0+4*k;
-	for (k = 0;k <  4;k++) vs_constant_offset_table[C_PROJECTION+k]            =  24+4*k;
-	for (k = 0;k <  4;k++) vs_constant_offset_table[C_MATERIALS+k]             =  40+4*k;
-	for (k = 0;k < 40;k++) vs_constant_offset_table[C_LIGHTS+k]                =  56+4*k;
-	for (k = 0;k < 24;k++) vs_constant_offset_table[C_TEXMATRICES+k]           = 216+4*k;
-	for (k = 0;k < 64;k++) vs_constant_offset_table[C_TRANSFORMMATRICES+k]     = 312+4*k;	
-	for (k = 0;k < 32;k++) vs_constant_offset_table[C_NORMALMATRICES+k]        = 568+4*k;	
-	for (k = 0;k < 64;k++) vs_constant_offset_table[C_POSTTRANSFORMMATRICES+k] = 696+4*k;
-	vs_constant_offset_table[C_DEPTHPARAMS] = 952;
-
-	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX).c_str());
-
-	SETSTAT(stats.numVertexShadersCreated, 0);
-	SETSTAT(stats.numVertexShadersAlive, 0);
-
-	char cache_filename[MAX_PATH];
-	sprintf(cache_filename, "%sdx11-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-	VertexShaderCacheInserter inserter;
-	g_vs_disk_cache.OpenAndRead(cache_filename, inserter);
-
-	if (g_Config.bEnableShaderDebugging)
-		Clear();
-
-	last_entry = NULL;
-}
-
-void VertexShaderCache::Clear()
-{
-	for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
-		iter->second.Destroy();
-	vshaders.clear();
-	vertex_uid_checker.Invalidate();
-
-	last_entry = NULL;
-}
-
-void VertexShaderCache::Shutdown()
-{
-	SAFE_RELEASE(vscbuf);
-
-	SAFE_RELEASE(SimpleVertexShader);
-	SAFE_RELEASE(ClearVertexShader);
-
-	SAFE_RELEASE(SimpleLayout);
-	SAFE_RELEASE(ClearLayout);
-
-	Clear();
-	g_vs_disk_cache.Sync();
-	g_vs_disk_cache.Close();
-}
-
-bool VertexShaderCache::SetShader(u32 components)
-{
-	VertexShaderUid uid;
-	GetVertexShaderUid(uid, components, API_D3D11);
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		VertexShaderCode code;
-		GenerateVertexShaderCode(code, components, API_D3D11);
-		vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
-	}
-
-	if (last_entry)
-	{
-		if (uid == last_uid)
-		{
-			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-			return (last_entry->shader != NULL);
-		}
-	}
-
-	last_uid = uid;
-
-	VSCache::iterator iter = vshaders.find(uid);
-	if (iter != vshaders.end())
-	{
-		const VSCacheEntry &entry = iter->second;
-		last_entry = &entry;
-
-		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-		return (entry.shader != NULL);
-	}
-
-	VertexShaderCode code;
-	GenerateVertexShaderCode(code, components, API_D3D11);
-
-	D3DBlob* pbytecode = NULL;
-	D3D::CompileVertexShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &pbytecode);
-
-	if (pbytecode == NULL)
-	{
-		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
-		return false;
-	}
-	g_vs_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size());
-
-	bool success = InsertByteCode(uid, pbytecode);
-	pbytecode->Release();
-
-	if (g_ActiveConfig.bEnableShaderDebugging && success)
-	{
-		vshaders[uid].code = code.GetBuffer();
-	}
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-	return success;
-}
-
-bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob)
-{
-	ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob);
-	if (shader == NULL)
-		return false;
-
-	// TODO: Somehow make the debug name a bit more specific
-	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a vertex shader of VertexShaderCache");
-
-	// Make an entry in the table
-	VSCacheEntry entry;
-	entry.shader = shader;
-	entry.SetByteCode(bcodeblob);
-
-	vshaders[uid] = entry;
-	last_entry = &vshaders[uid];
-
-	INCSTAT(stats.numVertexShadersCreated);
-	SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
-
-	return true;
-}
-
-// These are "callbacks" from VideoCommon and thus must be outside namespace DX11.
-// This will have to be changed when we merge.
-
-// maps the constant numbers to float indices in the constant buffer
-void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	vsconstants[vs_constant_offset_table[const_number]  ] = f1;
-	vsconstants[vs_constant_offset_table[const_number]+1] = f2;
-	vsconstants[vs_constant_offset_table[const_number]+2] = f3;
-	vsconstants[vs_constant_offset_table[const_number]+3] = f4;
-	vscbufchanged = true;
-}
-
-void Renderer::SetVSConstant4fv(unsigned int const_number, const float* f)
-{
-	memcpy(&vsconstants[vs_constant_offset_table[const_number]], f, sizeof(float)*4);
-	vscbufchanged = true;
-}
-
-void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float* f)
-{
-	for (unsigned int i = 0; i < count; i++)
-	{
-		memcpy(&vsconstants[vs_constant_offset_table[const_number+i]], f+3*i, sizeof(float)*3);
-		vsconstants[vs_constant_offset_table[const_number+i]+3] = 0.f;		
-	}
-	vscbufchanged = true;
-}
-
-void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float* f)
-{
-	memcpy(&vsconstants[vs_constant_offset_table[const_number]], f, sizeof(float)*4*count);
-	vscbufchanged = true;
-}
-
-}  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
deleted file mode 100644
index b80dbcd7b1..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXSHADERCACHE_H
-#define _VERTEXSHADERCACHE_H
-
-#include "VertexShaderGen.h"
-
-#include "D3DBase.h"
-#include "D3DBlob.h"
-
-#include <map>
-
-namespace DX11 {
-
-class VertexShaderCache
-{
-public:
-	static void Init();
-	static void Clear();
-	static void Shutdown();
-	static bool SetShader(u32 components); // TODO: Should be renamed to LoadShader
-
-	static ID3D11VertexShader* GetActiveShader() { return last_entry->shader; }
-	static D3DBlob* GetActiveShaderBytecode() { return last_entry->bytecode; }
-	static ID3D11Buffer* &GetConstantBuffer();
-
-	static ID3D11VertexShader* GetSimpleVertexShader();
-	static ID3D11VertexShader* GetClearVertexShader();
-	static ID3D11InputLayout* GetSimpleInputLayout();
-	static ID3D11InputLayout* GetClearInputLayout();
-
-	static bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob);
-
-private:
-	struct VSCacheEntry
-	{ 
-		ID3D11VertexShader* shader;
-		D3DBlob* bytecode; // needed to initialize the input layout
-
-		std::string code;
-
-		VSCacheEntry() : shader(NULL), bytecode(NULL) {}
-		void SetByteCode(D3DBlob* blob)
-		{
-			SAFE_RELEASE(bytecode);
-			bytecode = blob;
-			blob->AddRef();
-		}
-		void Destroy()
-		{
-			SAFE_RELEASE(shader);
-			SAFE_RELEASE(bytecode);
-		}
-	};
-	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
-	
-	static VSCache vshaders;
-	static const VSCacheEntry* last_entry;
-	static VertexShaderUid last_uid;
-
-	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
-};
-
-}  // namespace DX11
-
-#endif  // _VERTEXSHADERCACHE_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
deleted file mode 100644
index f714dbe05a..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifndef DX11_VIDEO_BACKEND_H_
-#define DX11_VIDEO_BACKEND_H_
-
-#include "VideoBackendBase.h"
-
-namespace DX11
-{
-
-class VideoBackend : public VideoBackendHardware
-{
-	bool Initialize(void *&);
-	void Shutdown();
-
-	std::string GetName();
-	std::string GetDisplayName();
-
-	void Video_Prepare();
-	void Video_Cleanup();
-
-	void ShowConfig(void* parent);
-
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
deleted file mode 100644
index 328cb5fa31..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <wx/wx.h>
-
-#include "LogManager.h"
-
-#include "BPStructs.h"
-#include "CommandProcessor.h"
-#include "Fifo.h"
-#include "OnScreenDisplay.h"
-#include "OpcodeDecoding.h"
-#include "PixelEngine.h"
-#include "PixelShaderManager.h"
-#include "VideoConfig.h"
-#include "VertexLoaderManager.h"
-#include "VertexShaderManager.h"
-#include "Core.h"
-#include "Host.h"
-
-#include "Debugger/DebuggerPanel.h"
-#include "DLCache.h"
-#include "EmuWindow.h"
-#include "IndexGenerator.h"
-#include "FileUtil.h"
-#include "Globals.h"
-#include "IniFile.h"
-#include "VideoConfigDiag.h"
-
-#include "D3DUtil.h"
-#include "D3DBase.h"
-#include "PerfQuery.h"
-#include "PixelShaderCache.h"
-#include "TextureCache.h"
-#include "VertexManager.h"
-#include "VertexShaderCache.h"
-
-#include "VideoBackend.h"
-#include "ConfigManager.h"
-
-namespace DX11
-{
-
-unsigned int VideoBackend::PeekMessages()
-{
-	MSG msg;
-	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-	{
-		if (msg.message == WM_QUIT)
-			return FALSE;
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-	return TRUE;
-}
-
-void VideoBackend::UpdateFPSDisplay(const char *text)
-{
-	TCHAR temp[512];
-	swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX11 | %hs"), scm_rev_str, text);
-	EmuWindow::SetWindowText(temp);
-}
-
-std::string VideoBackend::GetName()
-{
-	return "DX11";
-}
-
-std::string VideoBackend::GetDisplayName()
-{
-	return "Direct3D11";
-}
-
-void InitBackendInfo()
-{
-	HRESULT hr = DX11::D3D::LoadDXGI();
-	if (SUCCEEDED(hr)) hr = DX11::D3D::LoadD3D();
-	if (FAILED(hr))
-	{
-		DX11::D3D::UnloadDXGI();
-		return;
-	}
-
-	g_Config.backend_info.APIType = API_D3D11;
-	g_Config.backend_info.bUseRGBATextures = true; // the GX formats barely match any D3D11 formats
-	g_Config.backend_info.bUseMinimalMipCount = true;
-	g_Config.backend_info.bSupports3DVision = false;
-	g_Config.backend_info.bSupportsDualSourceBlend = true;
-	g_Config.backend_info.bSupportsFormatReinterpretation = true;
-	g_Config.backend_info.bSupportsPixelLighting = true;
-	g_Config.backend_info.bSupportsPrimitiveRestart = true;
-
-	IDXGIFactory* factory;
-	IDXGIAdapter* ad;
-	hr = DX11::PCreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&factory);
-	if (FAILED(hr))
-		PanicAlert("Failed to create IDXGIFactory object");
-
-	// adapters
-	g_Config.backend_info.Adapters.clear();
-	g_Config.backend_info.AAModes.clear();
-	while (factory->EnumAdapters((UINT)g_Config.backend_info.Adapters.size(), &ad) != DXGI_ERROR_NOT_FOUND)
-	{
-		const size_t adapter_index = g_Config.backend_info.Adapters.size();
-
-		DXGI_ADAPTER_DESC desc;
-		ad->GetDesc(&desc);
-
-		// TODO: These don't get updated on adapter change, yet
-		if (adapter_index == g_Config.iAdapter)
-		{
-			char buf[32];
-			std::vector<DXGI_SAMPLE_DESC> modes;
-			modes = DX11::D3D::EnumAAModes(ad);
-			for (unsigned int i = 0; i < modes.size(); ++i)
-			{
-				if (i == 0) sprintf_s(buf, 32, _trans("None"));
-				else if (modes[i].Quality) sprintf_s(buf, 32, _trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality);
-				else sprintf_s(buf, 32, _trans("%d samples"), modes[i].Count);
-				g_Config.backend_info.AAModes.push_back(buf);
-			}
-
-			// Requires the earlydepthstencil attribute (only available in shader model 5)
-			g_Config.backend_info.bSupportsEarlyZ = (DX11::D3D::GetFeatureLevel(ad) == D3D_FEATURE_LEVEL_11_0);
-		}
-
-		g_Config.backend_info.Adapters.push_back(UTF16ToUTF8(desc.Description));
-		ad->Release();
-	}
-
-	factory->Release();
-
-	// Clear ppshaders string vector
-	g_Config.backend_info.PPShaders.clear();
-
-	DX11::D3D::UnloadDXGI();
-	DX11::D3D::UnloadD3D();
-}
-
-void VideoBackend::ShowConfig(void *_hParent)
-{
-#if defined(HAVE_WX) && HAVE_WX
-	InitBackendInfo();
-	VideoConfigDiag diag((wxWindow*)_hParent, _trans("Direct3D11"), "gfx_dx11");
-	diag.ShowModal();
-#endif
-}
-
-bool VideoBackend::Initialize(void *&window_handle)
-{
-	InitializeShared();
-	InitBackendInfo();
-
-	frameCount = 0;
-
-	const SCoreStartupParameter& core_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
-
-	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini").c_str());
-	g_Config.GameIniLoad(core_params.m_strGameIniDefault.c_str(), core_params.m_strGameIniLocal.c_str());
-	g_Config.UpdateProjectionHack();
-	g_Config.VerifyValidity();
-	UpdateActiveConfig();
-
-	window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Loading - Please wait."));
-	if (window_handle == NULL)
-	{
-		ERROR_LOG(VIDEO, "An error has occurred while trying to create the window.");
-		return false;
-	}
-
-	s_BackendInitialized = true;
-
-	return true;
-}
-
-void VideoBackend::Video_Prepare()
-{
-	// Better be safe...
-	s_efbAccessRequested = FALSE;
-	s_FifoShuttingDown = FALSE;
-	s_swapRequested = FALSE;
-
-	// internal interfaces
-	g_renderer = new Renderer;
-	g_texture_cache = new TextureCache;
-	g_vertex_manager = new VertexManager;
-	g_perf_query = new PerfQuery;
-	VertexShaderCache::Init();
-	PixelShaderCache::Init();
-	D3D::InitUtils();
-
-	// VideoCommon
-	BPInit();
-	Fifo_Init();
-	IndexGenerator::Init();
-	VertexLoaderManager::Init();
-	OpcodeDecoder_Init();
-	VertexShaderManager::Init();
-	PixelShaderManager::Init();
-	CommandProcessor::Init();
-	PixelEngine::Init();
-	DLCache::Init();
-
-	// Tell the host that the window is ready
-	Host_Message(WM_USER_CREATE);
-}
-
-void VideoBackend::Shutdown()
-{
-	s_BackendInitialized = false;
-
-	// TODO: should be in Video_Cleanup
-	if (g_renderer)
-	{
-		s_efbAccessRequested = FALSE;
-		s_FifoShuttingDown = FALSE;
-		s_swapRequested = FALSE;
-
-		// VideoCommon
-		DLCache::Shutdown();
-		Fifo_Shutdown();
-		CommandProcessor::Shutdown();
-		PixelShaderManager::Shutdown();
-		VertexShaderManager::Shutdown();
-		OpcodeDecoder_Shutdown();
-		VertexLoaderManager::Shutdown();
-
-		// internal interfaces
-		D3D::ShutdownUtils();
-		PixelShaderCache::Shutdown();
-		VertexShaderCache::Shutdown();
-		delete g_perf_query;
-		delete g_vertex_manager;
-		delete g_texture_cache;
-		delete g_renderer;
-		g_renderer = NULL;
-		g_texture_cache = NULL;
-	}
-}
-
-void VideoBackend::Video_Cleanup() {
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.h b/Source/Plugins/Plugin_VideoDX11/Src/main.h
deleted file mode 100644
index 061ed8ef3f..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef MAIN_H
-#define MAIN_H
-
-#include "Render.h"
-#include "MainBase.h"
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
deleted file mode 100644
index 7c408e10b9..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
deleted file mode 100644
index 2431184aaf..0000000000
--- a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#include <tchar.h>
-#include <windows.h> 
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
deleted file mode 100644
index 02d39e314f..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}</ProjectGuid>
-    <RootNamespace>Plugin_VideoDX9</RootNamespace>
-    <ProjectName>VideoDX9</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\D3DBase.cpp" />
-    <ClCompile Include="Src\D3DShader.cpp" />
-    <ClCompile Include="Src\D3DTexture.cpp" />
-    <ClCompile Include="Src\D3DUtil.cpp" />
-    <ClCompile Include="Src\FramebufferManager.cpp" />
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\NativeVertexFormat.cpp" />
-    <ClCompile Include="Src\PerfQuery.cpp" />
-    <ClCompile Include="Src\PixelShaderCache.cpp" />
-    <ClCompile Include="Src\Render.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCache.cpp" />
-    <ClCompile Include="Src\TextureConverter.cpp" />
-    <ClCompile Include="Src\VertexManager.cpp" />
-    <ClCompile Include="Src\VertexShaderCache.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\D3DBase.h" />
-    <ClInclude Include="Src\D3DShader.h" />
-    <ClInclude Include="Src\D3DTexture.h" />
-    <ClInclude Include="Src\D3DUtil.h" />
-    <ClInclude Include="Src\FramebufferManager.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\PerfQuery.h" />
-    <ClInclude Include="Src\PixelShaderCache.h" />
-    <ClInclude Include="Src\Render.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TextureCache.h" />
-    <ClInclude Include="Src\TextureConverter.h" />
-    <ClInclude Include="Src\VertexManager.h" />
-    <ClInclude Include="Src\VertexShaderCache.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters
deleted file mode 100644
index c1d091c239..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\FramebufferManager.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NativeVertexFormat.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PixelShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Render.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexManager.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DBase.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DUtil.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DShader.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\D3DTexture.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureConverter.cpp">
-      <Filter>D3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PerfQuery.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\FramebufferManager.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PixelShaderCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Render.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexManager.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VertexShaderCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DBase.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DShader.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DTexture.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\D3DUtil.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureConverter.h">
-      <Filter>D3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PerfQuery.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="D3D">
-      <UniqueIdentifier>{7acd5e48-186b-4788-ab0a-3551205635f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Render">
-      <UniqueIdentifier>{46f1aa47-0eaf-4c32-bdbb-f61c587cd233}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
deleted file mode 100644
index 44e5abd317..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
+++ /dev/null
@@ -1,955 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "VideoConfig.h"
-#include "Render.h"
-#include "XFStructs.h"
-#include "StringUtil.h"
-#include "VideoCommon.h"
-
-D3DXSAVESURFACETOFILEATYPE PD3DXSaveSurfaceToFileA = NULL;
-D3DXSAVETEXTURETOFILEATYPE PD3DXSaveTextureToFileA = NULL;
-D3DXCOMPILESHADERTYPE PD3DXCompileShader = NULL;
-
-namespace DX9
-{
-static char vsVersions[5][7] = {"ERROR", "vs_1_4", "vs_2_a", "vs_3_0", "vs_4_0"};
-static char psVersions[5][7] = {"ERROR", "ps_1_4", "ps_2_a", "ps_3_0", "ps_4_0"};
-// D3DX
-HINSTANCE hD3DXDll = NULL;
-int d3dx_dll_ref = 0;
-
-typedef IDirect3D9* (WINAPI* DIRECT3DCREATE9)(UINT);
-DIRECT3DCREATE9 PDirect3DCreate9 = NULL;
-HINSTANCE hD3DDll = NULL;
-int d3d_dll_ref = 0;
-
-namespace D3D
-{
-
-LPDIRECT3D9        D3D = NULL; // Used to create the D3DDevice
-LPDIRECT3DDEVICE9  dev = NULL; // Our rendering device
-LPDIRECT3DSURFACE9 back_buffer;
-LPDIRECT3DSURFACE9 back_buffer_z;
-D3DCAPS9 caps;
-HWND hWnd;
-
-static int multisample;
-static int resolution;
-static int xres, yres;
-static bool auto_depth_stencil = false;
-
-#define VENDOR_NVIDIA 4318
-#define VENDOR_ATI    4098
-#define VENDOR_INTEL  32902
-
-bool bFrameInProgress = false;
-
-#define MAX_ADAPTERS 4
-static Adapter adapters[MAX_ADAPTERS];
-static int numAdapters;
-static int cur_adapter;
-
-// Value caches for state filtering
-const int MaxStreamSources = 16;
-const int MaxTextureStages = 9;
-const int MaxRenderStates = 210 + 46;
-const int MaxTextureTypes = 33;
-const int MaxSamplerSize = 13;
-const int MaxSamplerTypes = 15;
-static bool m_RenderStatesSet[MaxRenderStates];
-static DWORD m_RenderStates[MaxRenderStates];
-static bool m_RenderStatesChanged[MaxRenderStates];
-
-static DWORD m_TextureStageStates[MaxTextureStages][MaxTextureTypes];
-static bool m_TextureStageStatesSet[MaxTextureStages][MaxTextureTypes];
-static bool m_TextureStageStatesChanged[MaxTextureStages][MaxTextureTypes];
-
-static DWORD m_SamplerStates[MaxSamplerSize][MaxSamplerTypes];
-static bool m_SamplerStatesSet[MaxSamplerSize][MaxSamplerTypes];
-static bool m_SamplerStatesChanged[MaxSamplerSize][MaxSamplerTypes];
-
-static LPDIRECT3DBASETEXTURE9 m_Textures[16];
-static LPDIRECT3DVERTEXDECLARATION9 m_VtxDecl;
-static bool m_VtxDeclChanged;
-static LPDIRECT3DPIXELSHADER9 m_PixelShader;
-static bool m_PixelShaderChanged;
-static LPDIRECT3DVERTEXSHADER9 m_VertexShader;
-static bool m_VertexShaderChanged;
-struct StreamSourceDescriptor
-{
-	LPDIRECT3DVERTEXBUFFER9 pStreamData;
-	UINT OffsetInBytes;
-	UINT Stride;
-};
-static StreamSourceDescriptor m_stream_sources[MaxStreamSources];
-static bool m_stream_sources_Changed[MaxStreamSources];
-static LPDIRECT3DINDEXBUFFER9 m_index_buffer;
-static bool m_index_buffer_Changed;
-
-// Z buffer formats to be used for EFB depth surface
-D3DFORMAT DepthFormats[] = {
-	FOURCC_INTZ,
-	FOURCC_DF24,
-	FOURCC_RAWZ,
-	FOURCC_DF16,
-	D3DFMT_D24X8,
-	D3DFMT_D24X4S4,
-	D3DFMT_D24S8,
-	D3DFMT_D24FS8,
-	D3DFMT_D32,		// too much precision, but who cares
-	D3DFMT_D16,		// much lower precision, but better than nothing
-	D3DFMT_D15S1,
-};
-
-
-void Enumerate();
-
-int GetNumAdapters() { return numAdapters; }
-const Adapter &GetAdapter(int i) { return adapters[i]; }
-const Adapter &GetCurAdapter() { return adapters[cur_adapter]; }
-
-bool IsATIDevice()
-{
-	return GetCurAdapter().ident.VendorId == VENDOR_ATI;
-}
-bool IsIntelDevice()
-{
-	return GetCurAdapter().ident.VendorId == VENDOR_INTEL;
-}
-
-
-HRESULT Init()
-{
-	if (d3d_dll_ref++ > 0) return S_OK;
-
-	hD3DDll = LoadLibraryA("d3d9.dll");
-	if (!hD3DDll)
-	{
-		MessageBoxA(NULL, "Failed to load d3d9.dll", "Critical error", MB_OK | MB_ICONERROR);
-		return E_FAIL;
-	}
-	PDirect3DCreate9 = (DIRECT3DCREATE9)GetProcAddress(hD3DDll, "Direct3DCreate9");
-	if (PDirect3DCreate9 == NULL) MessageBoxA(NULL, "GetProcAddress failed for Direct3DCreate9!", "Critical error", MB_OK | MB_ICONERROR);
-
-	// Create the D3D object, which is needed to create the D3DDevice.
-	D3D = PDirect3DCreate9(D3D_SDK_VERSION);
-	if (!D3D)
-	{
-		--d3d_dll_ref;
-		return E_FAIL;
-	}
-
-	// Init the caps structure using data from the currently selected device
-	int adapter = g_Config.iAdapter;
-	D3D->GetDeviceCaps((adapter >= 0 && adapter < std::min(MAX_ADAPTERS, numAdapters)) ? adapter : D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps);
-	Enumerate();
-	if(IsIntelDevice()){
-		// Murder the a because Intel doesn't support 2.0a because the 'a' part was a ATI and Nvidia war going on
-		psVersions[2][5] = '0';
-		vsVersions[2][5] = '0';
-	}
-
-	return S_OK;
-}
-
-void Shutdown()
-{
-	if (!d3d_dll_ref) return;
-	if (--d3d_dll_ref != 0) return;
-
-	if (D3D) D3D->Release();
-	D3D = NULL;
-
-	if (hD3DDll) FreeLibrary(hD3DDll);
-	PDirect3DCreate9 = NULL;
-}
-
-void EnableAlphaToCoverage()
-{
-	// Each vendor has their own specific little hack.
-	if (GetCurAdapter().ident.VendorId == VENDOR_ATI)
-		SetRenderState(D3DRS_POINTSIZE, (D3DFORMAT)MAKEFOURCC('A', '2', 'M', '1'));
-	else
-		SetRenderState(D3DRS_ADAPTIVETESS_Y, (D3DFORMAT)MAKEFOURCC('A', 'T', 'O', 'C'));
-}
-
-void InitPP(int adapter, int f, int aa_mode, D3DPRESENT_PARAMETERS *pp)
-{
-	ZeroMemory(pp, sizeof(D3DPRESENT_PARAMETERS));
-	pp->hDeviceWindow = hWnd;
-	if (auto_depth_stencil)
-	{
-		pp->EnableAutoDepthStencil = TRUE;
-		pp->AutoDepthStencilFormat = D3DFMT_D24S8;
-	} else {
-		pp->EnableAutoDepthStencil = FALSE;
-		pp->AutoDepthStencilFormat = D3DFMT_UNKNOWN;
-	}
-	pp->BackBufferFormat = D3DFMT_X8R8G8B8;
-	if (aa_mode >= (int)adapters[adapter].aa_levels.size())
-		aa_mode = 0;
-
-	pp->MultiSampleType = adapters[adapter].aa_levels[aa_mode].ms_setting;
-	pp->MultiSampleQuality = adapters[adapter].aa_levels[aa_mode].qual_setting;
-
-	pp->Flags = auto_depth_stencil ? D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL : 0;
-
-	if(g_Config.b3DVision)
-	{
-		xres = pp->BackBufferWidth  = adapters[adapter].resolutions[f].xres;
-		yres = pp->BackBufferHeight = adapters[adapter].resolutions[f].yres;
-	}
-	else
-	{
-		RECT client;
-		GetClientRect(hWnd, &client);
-		xres = pp->BackBufferWidth  = client.right - client.left;
-		yres = pp->BackBufferHeight = client.bottom - client.top;
-	}
-	pp->SwapEffect = D3DSWAPEFFECT_DISCARD;
-	pp->PresentationInterval = g_Config.IsVSync() ? D3DPRESENT_INTERVAL_DEFAULT : D3DPRESENT_INTERVAL_IMMEDIATE;
-	pp->Windowed = !g_Config.b3DVision;
-}
-
-void Enumerate()
-{
-	numAdapters = D3D->GetAdapterCount();
-
-	for (int i = 0; i < std::min(MAX_ADAPTERS, numAdapters); i++)
-	{
-		Adapter &a = adapters[i];
-		a.aa_levels.clear();
-		a.resolutions.clear();
-		D3D->GetAdapterIdentifier(i, 0, &a.ident);
-		bool isNvidia = a.ident.VendorId == VENDOR_NVIDIA;
-
-		// Add SuperSamples modes
-		a.aa_levels.push_back(AALevel("None", D3DMULTISAMPLE_NONE, 0));
-		a.aa_levels.push_back(AALevel("4x SSAA", D3DMULTISAMPLE_NONE, 0));
-		a.aa_levels.push_back(AALevel("9x SSAA", D3DMULTISAMPLE_NONE, 0));
-		//Add multisample modes
-		//disable them will they are not implemnted
-		/*
-		DWORD qlevels = 0;
-		if (D3DERR_NOTAVAILABLE != D3D->CheckDeviceMultiSampleType(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &qlevels))
-			if (qlevels > 0)
-				a.aa_levels.push_back(AALevel("2x MSAA", D3DMULTISAMPLE_2_SAMPLES, 0));
-
-		if (D3DERR_NOTAVAILABLE != D3D->CheckDeviceMultiSampleType(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &qlevels))
-			if (qlevels > 0)
-				a.aa_levels.push_back(AALevel("4x MSAA", D3DMULTISAMPLE_4_SAMPLES, 0));
-
-		if (D3DERR_NOTAVAILABLE != D3D->CheckDeviceMultiSampleType(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_8_SAMPLES, &qlevels))
-			if (qlevels > 0)
-				a.aa_levels.push_back(AALevel("8x MSAA", D3DMULTISAMPLE_8_SAMPLES, 0));
-
-		if (isNvidia)
-		{
-			// CSAA support
-			if (D3DERR_NOTAVAILABLE != D3D->CheckDeviceMultiSampleType(
-				i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_4_SAMPLES, &qlevels))
-			{
-				if (qlevels > 2)
-				{
-					// 8x, 8xQ are available
-					// See http://developer.nvidia.com/object/coverage-sampled-aa.html
-					a.aa_levels.push_back(AALevel("8x CSAA", D3DMULTISAMPLE_4_SAMPLES, 2));
-					a.aa_levels.push_back(AALevel("8xQ CSAA", D3DMULTISAMPLE_8_SAMPLES, 0));
-				}
-			}
-			if (D3DERR_NOTAVAILABLE != D3D->CheckDeviceMultiSampleType(
-				i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_8_SAMPLES, &qlevels))
-			{
-				if (qlevels > 2)
-				{
-					// 16x, 16xQ are available
-					// See http://developer.nvidia.com/object/coverage-sampled-aa.html
-					a.aa_levels.push_back(AALevel("16x CSAA", D3DMULTISAMPLE_4_SAMPLES, 4));
-					a.aa_levels.push_back(AALevel("16xQ CSAA", D3DMULTISAMPLE_8_SAMPLES, 2));
-				}
-			}
-		}
-		*/
-		// Determine if INTZ is supported. Code from ATI's doc.
-		// http://developer.amd.com/gpu_assets/Advanced%20DX9%20Capabilities%20for%20ATI%20Radeon%20Cards.pdf
-		a.supports_intz = D3D_OK == D3D->CheckDeviceFormat(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-			D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, FOURCC_INTZ);
-		// Also check for RAWZ (nvidia only, but the only option to get Z24 textures on sub GF8800
-		a.supports_rawz = D3D_OK == D3D->CheckDeviceFormat(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-			D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, FOURCC_RAWZ);
-		// Might as well check for RESZ and NULL too.
-		a.supports_resz = D3D_OK == D3D->CheckDeviceFormat(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-			D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, FOURCC_RESZ);
-		a.supports_null = D3D_OK == D3D->CheckDeviceFormat(
-			i, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8,
-			D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, FOURCC_NULL);
-
-		if (a.aa_levels.size() == 1)
-		{
-			strcpy(a.aa_levels[0].name, "(Not supported on this device)");
-		}
-		int numModes = D3D->GetAdapterModeCount(i, D3DFMT_X8R8G8B8);
-		for (int m = 0; m < numModes; m++)
-		{
-			D3DDISPLAYMODE mode;
-			D3D->EnumAdapterModes(i, D3DFMT_X8R8G8B8, m, &mode);
-
-			int found = -1;
-			for (int x = 0; x < (int)a.resolutions.size(); x++)
-			{
-				if (a.resolutions[x].xres == mode.Width && a.resolutions[x].yres == mode.Height)
-				{
-					found = x;
-					break;
-				}
-			}
-
-			Resolution temp;
-			Resolution &r = found==-1 ? temp : a.resolutions[found];
-
-			sprintf(r.name, "%ix%i", mode.Width, mode.Height);
-			r.bitdepths.insert(mode.Format);
-			r.refreshes.insert(mode.RefreshRate);
-			if (found == -1 && mode.Width >= 640 && mode.Height >= 480)
-			{
-				r.xres = mode.Width;
-				r.yres = mode.Height;
-				a.resolutions.push_back(r);
-			}
-		}
-	}
-}
-
-// dynamically picks one of the available d3dx9 dlls and loads it.
-// we're first trying to load the dll Dolphin was compiled with, otherwise the most up-to-date one
-HRESULT LoadD3DX9()
-{
-	if (d3dx_dll_ref++ > 0) return S_OK;
-
-	HRESULT hr = E_FAIL;
-	hD3DXDll = LoadLibraryA(StringFromFormat("d3dx9_%d.dll", D3DX_SDK_VERSION).c_str());
-	if (hD3DXDll != NULL)
-	{
-		hr = S_OK;
-	}
-	else
-	{
-		// if that fails, try loading older dlls (no need to look for newer ones)
-		for (unsigned int num = D3DX_SDK_VERSION-1; num >= 24; --num)
-		{
-			hD3DXDll = LoadLibraryA(StringFromFormat("d3dx9_%d.dll", num).c_str());
-			if (hD3DXDll != NULL)
-			{
-				NOTICE_LOG(VIDEO, "Successfully loaded %s. If you're having trouble, try updating your DX runtime first.", StringFromFormat("d3dx9_%d.dll", num).c_str());
-				hr = S_OK;
-				break;
-			}
-		}
-		if (FAILED(hr))
-		{
-			MessageBoxA(NULL, "Failed to load any D3DX9 dll, update your DX9 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
-			return hr;
-		}
-	}
-	PD3DXCompileShader = (D3DXCOMPILESHADERTYPE)GetProcAddress(hD3DXDll, "D3DXCompileShader");
-	if (PD3DXCompileShader == NULL)
-	{
-		MessageBoxA(NULL, "GetProcAddress failed for D3DXCompileShader!", "Critical error", MB_OK | MB_ICONERROR);
-		goto fail;
-	}
-
-	PD3DXSaveSurfaceToFileA = (D3DXSAVESURFACETOFILEATYPE)GetProcAddress(hD3DXDll, "D3DXSaveSurfaceToFileA");
-	if (PD3DXSaveSurfaceToFileA == NULL)
-	{
-		MessageBoxA(NULL, "GetProcAddress failed for D3DXSaveSurfaceToFileA!", "Critical error", MB_OK | MB_ICONERROR);
-		goto fail;
-	}
-
-	PD3DXSaveTextureToFileA = (D3DXSAVETEXTURETOFILEATYPE)GetProcAddress(hD3DXDll, "D3DXSaveTextureToFileA");
-	if (PD3DXSaveTextureToFileA == NULL)
-	{
-		MessageBoxA(NULL, "GetProcAddress failed for D3DXSaveTextureToFileA!", "Critical error", MB_OK | MB_ICONERROR);
-		goto fail;
-	}
-	return S_OK;
-
-fail:
-	--d3dx_dll_ref;
-	FreeLibrary(hD3DXDll);
-	PD3DXCompileShader = NULL;
-	PD3DXSaveSurfaceToFileA = NULL;
-	PD3DXSaveTextureToFileA = NULL;
-	return E_FAIL;
-}
-
-void UnloadD3DX9()
-{
-	if (!d3dx_dll_ref) return;
-	if (--d3dx_dll_ref != 0) return;
-
-	FreeLibrary(hD3DXDll);
-	PD3DXCompileShader = NULL;
-	PD3DXSaveSurfaceToFileA = NULL;
-	PD3DXSaveTextureToFileA = NULL;
-}
-
-HRESULT Create(int adapter, HWND wnd, int _resolution, int aa_mode, bool auto_depth)
-{
-	hWnd = wnd;
-	multisample = aa_mode;
-	resolution = _resolution;
-	auto_depth_stencil = auto_depth;
-	cur_adapter = adapter;
-	D3DPRESENT_PARAMETERS d3dpp;
-
-	HRESULT hr = LoadD3DX9();
-	if (FAILED(hr)) return hr;
-
-	InitPP(adapter, resolution, aa_mode, &d3dpp);
-
-	if (FAILED(D3D->CreateDevice(
-		adapter,
-		D3DDEVTYPE_HAL,
-		wnd,
-		D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE,  //doesn't seem to make a difference
-		&d3dpp, &dev)))
-	{
-		if (FAILED(D3D->CreateDevice(
-			adapter,
-			D3DDEVTYPE_HAL,
-			wnd,
-			D3DCREATE_SOFTWARE_VERTEXPROCESSING,
-			&d3dpp, &dev)))
-		{
-			MessageBox(wnd,
-				_T("Failed to initialize Direct3D."),
-				_T("Dolphin Direct3D Backend"), MB_OK | MB_ICONERROR);
-			return E_FAIL;
-		}
-	}
-
-	dev->GetDeviceCaps(&caps);
-	dev->GetRenderTarget(0, &back_buffer);
-	if (dev->GetDepthStencilSurface(&back_buffer_z) == D3DERR_NOTFOUND)
-		back_buffer_z = NULL;
-	SetRenderState(D3DRS_ZENABLE, D3DZB_TRUE );
-	SetRenderState(D3DRS_FILLMODE, g_Config.bWireFrame ? D3DFILL_WIREFRAME : D3DFILL_SOLID);
-	memset(m_Textures, 0, sizeof(m_Textures));
-	memset(m_TextureStageStatesSet, 0, sizeof(m_TextureStageStatesSet));
-	memset(m_RenderStatesSet, 0, sizeof(m_RenderStatesSet));
-	memset(m_SamplerStatesSet, 0, sizeof(m_SamplerStatesSet));
-	memset(m_TextureStageStatesChanged, 0, sizeof(m_TextureStageStatesChanged));
-	memset(m_RenderStatesChanged, 0, sizeof(m_RenderStatesChanged));
-	memset(m_SamplerStatesChanged, 0, sizeof(m_SamplerStatesChanged));
-	m_VtxDecl = NULL;
-	m_PixelShader = NULL;
-	m_VertexShader = NULL;
-	m_index_buffer = NULL;
-	memset(m_stream_sources, 0, sizeof(m_stream_sources));
-	m_index_buffer = NULL;
-	
-	m_VtxDeclChanged = false;
-	m_PixelShaderChanged = false;
-	m_VertexShaderChanged = false;
-	memset(m_stream_sources_Changed, 0 , sizeof(m_stream_sources_Changed));
-	m_index_buffer_Changed = false;
-	// Device state would normally be set here
-	return S_OK;
-}
-
-void Close()
-{
-	UnloadD3DX9();
-
-	if (back_buffer_z)
-		back_buffer_z->Release();
-	back_buffer_z = NULL;
-	if( back_buffer )
-		back_buffer->Release();
-	back_buffer = NULL;
-
-	ULONG references = dev->Release();
-	if (references)
-		ERROR_LOG(VIDEO, "Unreleased references: %i.", references);
-
-	dev = NULL;
-}
-
-const D3DCAPS9 &GetCaps()
-{
-	return caps;
-}
-
-// returns true if size was changed
-bool FixTextureSize(int& width, int& height)
-{
-	int oldw = width, oldh = height;
-
-	// conditional nonpow2 support should work fine for us
-	if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL))
-	{
-		// all texture dimensions need to be powers of two
-		width = (int)MakePow2((u32)width);
-		height = (int)MakePow2((u32)height);
-	}
-	if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY)
-	{
-		width = height = max(width, height);
-	}
-
-	width = min(width, (int)caps.MaxTextureWidth);
-	height = min(height, (int)caps.MaxTextureHeight);
-
-	return (width != oldw) || (height != oldh);
-}
-
-// returns true if format is supported
-bool CheckTextureSupport(DWORD usage, D3DFORMAT tex_format)
-{
-	return D3D_OK == D3D->CheckDeviceFormat(cur_adapter, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, usage, D3DRTYPE_TEXTURE, tex_format);
-}
-
-bool CheckDepthStencilSupport(D3DFORMAT target_format, D3DFORMAT depth_format)
-{
-	return D3D_OK == D3D->CheckDepthStencilMatch(cur_adapter, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, target_format, depth_format);
-}
-
-D3DFORMAT GetSupportedDepthTextureFormat()
-{
-	for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i)
-		if (CheckTextureSupport(D3DUSAGE_DEPTHSTENCIL, DepthFormats[i]))
-			return DepthFormats[i];
-
-	return D3DFMT_UNKNOWN;
-}
-
-D3DFORMAT GetSupportedDepthSurfaceFormat(D3DFORMAT target_format)
-{
-	for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i)
-		if (CheckDepthStencilSupport(target_format, DepthFormats[i]))
-			return DepthFormats[i];
-
-	return D3DFMT_UNKNOWN;
-}
-
-const char *VertexShaderVersionString()
-{
-	int version = ((caps.VertexShaderVersion >> 8) & 0xFF);
-	return vsVersions[std::min(4, version)];
-}
-
-const char *PixelShaderVersionString()
-{
-	int version = ((caps.PixelShaderVersion >> 8) & 0xFF);
-	return psVersions[std::min(4, version)];
-}
-
-LPDIRECT3DSURFACE9 GetBackBufferSurface()
-{
-	return back_buffer;
-}
-
-LPDIRECT3DSURFACE9 GetBackBufferDepthSurface()
-{
-	return back_buffer_z;
-}
-
-void ShowD3DError(HRESULT err)
-{
-	switch (err)
-	{
-	case D3DERR_DEVICELOST:
-		PanicAlert("Device Lost");
-		break;
-	case D3DERR_INVALIDCALL:
-		PanicAlert("Invalid Call");
-		break;
-	case D3DERR_DRIVERINTERNALERROR:
-		PanicAlert("Driver Internal Error");
-		break;
-	case D3DERR_OUTOFVIDEOMEMORY:
-		PanicAlert("Out of vid mem");
-		break;
-	default:
-		// MessageBox(0,_T("Other error or success"),_T("ERROR"),0);
-		break;
-	}
-}
-
-void Reset()
-{
-	if (dev)
-	{
-		// ForgetCachedState();
-
-		// Can't keep a pointer around to the backbuffer surface when resetting.
-		if (back_buffer_z)
-			back_buffer_z->Release();
-		back_buffer_z = NULL;
-		back_buffer->Release();
-		back_buffer = NULL;
-
-		D3DPRESENT_PARAMETERS d3dpp;
-		InitPP(cur_adapter, resolution, multisample, &d3dpp);
-		HRESULT hr = dev->Reset(&d3dpp);
-		ShowD3DError(hr);
-
-		dev->GetRenderTarget(0, &back_buffer);
-		if (dev->GetDepthStencilSurface(&back_buffer_z) == D3DERR_NOTFOUND)
-			back_buffer_z = NULL;
-		ApplyCachedState();
-	}
-}
-
-int GetBackBufferWidth()
-{
-	return xres;
-}
-
-int GetBackBufferHeight()
-{
-	return yres;
-}
-
-bool BeginFrame()
-{
-	if (bFrameInProgress)
-	{
-		PanicAlert("BeginFrame WTF");
-		return false;
-	}
-	bFrameInProgress = true;
-	if (dev)
-	{
-		dev->BeginScene();
-		return true;
-	}
-	else
-		return false;
-}
-
-void EndFrame()
-{
-	if (!bFrameInProgress)
-	{
-		PanicAlert("EndFrame WTF");
-		return;
-	}
-	bFrameInProgress = false;
-	dev->EndScene();
-}
-
-void Present()
-{
-	if (dev)
-	{
-		dev->Present(NULL, NULL, NULL, NULL);
-	}
-}
-
-void ApplyCachedState()
-{
-	for (int sampler = 0; sampler < 8; sampler++)
-	{
-		for (int type = 0; type < MaxSamplerTypes; type++)
-		{
-			if(m_SamplerStatesSet[sampler][type])
-				dev->SetSamplerState(sampler, (D3DSAMPLERSTATETYPE)type, m_SamplerStates[sampler][type]);
-		}
-	}
-
-	for (int rs = 0; rs < MaxRenderStates; rs++)
-	{
-		if (m_RenderStatesSet[rs])
-			dev->SetRenderState((D3DRENDERSTATETYPE)rs, m_RenderStates[rs]);
-	}
-
-	// We don't bother restoring these so let's just wipe the state copy
-	// so no stale state is around.
-	memset(m_Textures, 0, sizeof(m_Textures));
-	memset(m_TextureStageStatesSet, 0, sizeof(m_TextureStageStatesSet));
-	memset(m_TextureStageStatesChanged, 0, sizeof(m_TextureStageStatesChanged));
-	m_VtxDecl = NULL;
-	m_PixelShader = NULL;
-	m_VertexShader = NULL;
-	memset(m_stream_sources, 0, sizeof(m_stream_sources));
-	m_index_buffer = NULL;
-	m_VtxDeclChanged = false;
-	m_PixelShaderChanged = false;
-	m_VertexShaderChanged = false;
-	memset(m_stream_sources_Changed, 0 , sizeof(m_stream_sources_Changed));
-	m_index_buffer_Changed = false;
-}
-
-void SetTexture(DWORD Stage, LPDIRECT3DBASETEXTURE9 pTexture)
-{
-	if (m_Textures[Stage] != pTexture)
-	{
-		m_Textures[Stage] = pTexture;
-		dev->SetTexture(Stage, pTexture);
-	}
-}
-
-void RefreshRenderState(D3DRENDERSTATETYPE State)
-{
-	if(m_RenderStatesSet[State] && m_RenderStatesChanged[State])
-	{
-		dev->SetRenderState(State, m_RenderStates[State]);
-		m_RenderStatesChanged[State] = false;
-	}
-}
-
-void SetRenderState(D3DRENDERSTATETYPE State, DWORD Value)
-{
-	if (m_RenderStates[State] != Value || !m_RenderStatesSet[State])
-	{
-		m_RenderStates[State] = Value;
-		m_RenderStatesSet[State] = true;
-		m_RenderStatesChanged[State] = false;
-		dev->SetRenderState(State, Value);
-	}
-}
-
-void ChangeRenderState(D3DRENDERSTATETYPE State, DWORD Value)
-{
-	if (m_RenderStates[State] != Value || !m_RenderStatesSet[State])
-	{
-		m_RenderStatesChanged[State] = m_RenderStatesSet[State];
-		dev->SetRenderState(State, Value);
-	}
-	else
-	{
-		m_RenderStatesChanged[State] = false;
-	}
-}
-
-void SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value)
-{
-	if (m_TextureStageStates[Stage][Type] != Value || !m_TextureStageStatesSet[Stage][Type])
-	{
-		m_TextureStageStates[Stage][Type] = Value;
-		m_TextureStageStatesSet[Stage][Type]=true;
-		m_TextureStageStatesChanged[Stage][Type]=false;
-		dev->SetTextureStageState(Stage, Type, Value);
-	}
-}
-
-void RefreshTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type)
-{
-	if(m_TextureStageStatesSet[Stage][Type] && m_TextureStageStatesChanged[Stage][Type])
-	{
-		dev->SetTextureStageState(Stage, Type, m_TextureStageStates[Stage][Type]);
-		m_TextureStageStatesChanged[Stage][Type] = false;
-	}
-}
-
-void ChangeTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value)
-{
-	if (m_TextureStageStates[Stage][Type] != Value || !m_TextureStageStatesSet[Stage][Type])
-	{
-		m_TextureStageStatesChanged[Stage][Type] = m_TextureStageStatesSet[Stage][Type];
-		dev->SetTextureStageState(Stage, Type, Value);
-	}
-	else
-	{
-		m_TextureStageStatesChanged[Stage][Type] = false;
-	}
-}
-
-void SetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value)
-{
-	if (m_SamplerStates[Sampler][Type] != Value || !m_SamplerStatesSet[Sampler][Type])
-	{
-		m_SamplerStates[Sampler][Type] = Value;
-		m_SamplerStatesSet[Sampler][Type] = true;
-		m_SamplerStatesChanged[Sampler][Type] = false;
-		dev->SetSamplerState(Sampler, Type, Value);
-	}
-}
-
-void RefreshSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type)
-{
-	if(m_SamplerStatesSet[Sampler][Type] && m_SamplerStatesChanged[Sampler][Type])
-	{
-		dev->SetSamplerState(Sampler, Type, m_SamplerStates[Sampler][Type]);
-		m_SamplerStatesChanged[Sampler][Type] = false;
-	}
-}
-
-void ChangeSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value)
-{
-	if (m_SamplerStates[Sampler][Type] != Value || !m_SamplerStatesSet[Sampler][Type])
-	{
-		m_SamplerStatesChanged[Sampler][Type] = m_SamplerStatesSet[Sampler][Type];
-		dev->SetSamplerState(Sampler, Type, Value);
-	}
-	else
-	{
-		m_SamplerStatesChanged[Sampler][Type] = false;
-	}
-}
-
-void RefreshVertexDeclaration()
-{
-	if (m_VtxDeclChanged)
-	{
-		dev->SetVertexDeclaration(m_VtxDecl);
-		m_VtxDeclChanged = false;
-	}
-}
-
-void SetVertexDeclaration(LPDIRECT3DVERTEXDECLARATION9 decl)
-{
-	if (decl != m_VtxDecl)
-	{
-		dev->SetVertexDeclaration(decl);
-		m_VtxDecl = decl;
-		m_VtxDeclChanged = false;
-	}
-}
-
-void ChangeVertexDeclaration(LPDIRECT3DVERTEXDECLARATION9 decl)
-{
-	if (decl != m_VtxDecl) {
-		dev->SetVertexDeclaration(decl);
-		m_VtxDeclChanged = true;
-	}
-}
-
-void ChangeVertexShader(LPDIRECT3DVERTEXSHADER9 shader)
-{
-	if (shader != m_VertexShader)
-	{
-		dev->SetVertexShader(shader);
-		m_VertexShaderChanged = true;
-	}
-}
-
-void RefreshVertexShader()
-{
-	if (m_VertexShaderChanged)
-	{
-		dev->SetVertexShader(m_VertexShader);
-		m_VertexShaderChanged = false;
-	}
-}
-
-void SetVertexShader(LPDIRECT3DVERTEXSHADER9 shader)
-{
-	if (shader != m_VertexShader)
-	{
-		dev->SetVertexShader(shader);
-		m_VertexShader = shader;
-		m_VertexShaderChanged = false;
-	}
-}
-
-void RefreshPixelShader()
-{
-	if (m_PixelShaderChanged)
-	{
-		dev->SetPixelShader(m_PixelShader);
-		m_PixelShaderChanged = false;
-	}
-}
-
-void SetPixelShader(LPDIRECT3DPIXELSHADER9 shader)
-{
-	if (shader != m_PixelShader)
-	{
-		dev->SetPixelShader(shader);
-		m_PixelShader = shader;
-		m_PixelShaderChanged = false;
-	}
-}
-
-void ChangePixelShader(LPDIRECT3DPIXELSHADER9 shader)
-{
-	if (shader != m_PixelShader)
-	{
-		dev->SetPixelShader(shader);
-		m_PixelShaderChanged = true;
-	}
-}
-
-void SetStreamSource(UINT StreamNumber,IDirect3DVertexBuffer9* pStreamData,UINT OffsetInBytes,UINT Stride)
-{
-	if (m_stream_sources[StreamNumber].OffsetInBytes != OffsetInBytes
-		|| m_stream_sources[StreamNumber].pStreamData != pStreamData
-		|| m_stream_sources[StreamNumber].Stride != Stride)
-	{
-		m_stream_sources[StreamNumber].OffsetInBytes = OffsetInBytes;
-		m_stream_sources[StreamNumber].pStreamData = pStreamData;
-		m_stream_sources[StreamNumber].Stride = Stride;
-		dev->SetStreamSource(StreamNumber, pStreamData, OffsetInBytes, Stride);
-		m_stream_sources_Changed[StreamNumber] = false;
-	}
-}
-
-void ChangeStreamSource(UINT StreamNumber,IDirect3DVertexBuffer9* pStreamData,UINT OffsetInBytes,UINT Stride)
-{
-	if (m_stream_sources[StreamNumber].OffsetInBytes != OffsetInBytes
-		|| m_stream_sources[StreamNumber].pStreamData != pStreamData
-		|| m_stream_sources[StreamNumber].Stride != Stride)
-	{
-		dev->SetStreamSource(StreamNumber, pStreamData, OffsetInBytes, Stride);
-		m_stream_sources_Changed[StreamNumber] = true;
-	}
-	
-}
-
-void RefreshStreamSource(UINT StreamNumber)
-{
-	if (m_PixelShaderChanged)
-	{
-		dev->SetStreamSource(
-			StreamNumber, 
-			m_stream_sources[StreamNumber].pStreamData, 
-			m_stream_sources[StreamNumber].OffsetInBytes, 
-			m_stream_sources[StreamNumber].Stride);
-		m_stream_sources_Changed[StreamNumber] = false;
-	}
-}
-
-void SetIndices(LPDIRECT3DINDEXBUFFER9 pIndexData)
-{
-	if(pIndexData != m_index_buffer)
-	{
-		m_index_buffer = pIndexData;
-		dev->SetIndices(pIndexData);
-		m_index_buffer_Changed = false;
-	}
-}
-
-void ChangeIndices(LPDIRECT3DINDEXBUFFER9 pIndexData)
-{
-	if(pIndexData != m_index_buffer)
-	{
-		dev->SetIndices(pIndexData);
-		m_index_buffer_Changed = true;
-	}
-}
-
-void RefreshIndices()
-{
-	if (m_index_buffer_Changed)
-	{
-		dev->SetIndices(m_index_buffer);
-		m_index_buffer_Changed = false;
-	}
-}
-
-
-
-}  // namespace
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
deleted file mode 100644
index b5a6649989..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <vector>
-#include <set>
-
-#include <d3dx9.h>
-
-#include "Common.h"
-
-namespace DX9
-{
-
-namespace D3D
-{
-
-// From http://developer.amd.com/gpu_assets/Advanced%20DX9%20Capabilities%20for%20ATI%20Radeon%20Cards.pdf
-// Magic FourCC's to unlock undocumented D3D9 features:
-
-// Z texture formats
-#define FOURCC_INTZ ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z')))
-#define FOURCC_RAWZ ((D3DFORMAT)(MAKEFOURCC('R','A','W','Z')))
-#define FOURCC_DF24 ((D3DFORMAT)(MAKEFOURCC('D','F','2','4')))
-#define FOURCC_DF16 ((D3DFORMAT)(MAKEFOURCC('D','F','1','6')))
-
-// Depth buffer resolve:
-#define FOURCC_RESZ ((D3DFORMAT)(MAKEFOURCC('R','E','S','Z')))
-#define RESZ_CODE 0x7fa05000
-
-// Null render target to do Z-only shadow maps: (probably not useful for Dolphin)
-#define FOURCC_NULL ((D3DFORMAT)(MAKEFOURCC('N','U','L','L')))
-
-bool IsATIDevice();
-bool IsIntelDevice();
-HRESULT Init();
-HRESULT Create(int adapter, HWND wnd, int resolution, int aa_mode, bool auto_depth);
-void Close();
-void Shutdown();
-
-// Direct access to the device.
-extern LPDIRECT3DDEVICE9 dev;
-extern bool bFrameInProgress;
-
-void Reset();
-bool BeginFrame();
-void EndFrame();
-void Present();
-bool CanUseINTZ();
-
-int GetBackBufferWidth();
-int GetBackBufferHeight();
-LPDIRECT3DSURFACE9 GetBackBufferSurface();
-LPDIRECT3DSURFACE9 GetBackBufferDepthSurface();
-LPDIRECT3DVERTEXBUFFER9  GetquadVB();
-LPDIRECT3DVERTEXDECLARATION9 GetBasicvertexDecl();
-const D3DCAPS9 &GetCaps();
-const char *PixelShaderVersionString();
-const char *VertexShaderVersionString();
-void ShowD3DError(HRESULT err);
-
-// returns true if size was changed
-bool FixTextureSize(int& width, int& height);
-
-// returns true if format is supported
-bool CheckTextureSupport(DWORD usage, D3DFORMAT tex_format);
-bool CheckDepthStencilSupport(D3DFORMAT target_format, D3DFORMAT depth_format);
-
-D3DFORMAT GetSupportedDepthTextureFormat();
-D3DFORMAT GetSupportedDepthSurfaceFormat(D3DFORMAT target_format);
-
-// The following are "filtered" versions of the corresponding D3Ddev-> functions.
-void SetTexture(DWORD Stage, IDirect3DBaseTexture9 *pTexture);
-void SetRenderState(D3DRENDERSTATETYPE State, DWORD Value);
-void RefreshRenderState(D3DRENDERSTATETYPE State);
-void ChangeRenderState(D3DRENDERSTATETYPE State, DWORD Value);
-
-void SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value);
-void RefreshTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type);
-void ChangeTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value);
-
-void SetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value);
-void RefreshSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type);
-void ChangeSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value);
-
-void RefreshVertexDeclaration();
-void SetVertexDeclaration(LPDIRECT3DVERTEXDECLARATION9 decl);
-void ChangeVertexDeclaration(LPDIRECT3DVERTEXDECLARATION9 decl);
-
-void RefreshVertexShader();
-void SetVertexShader(LPDIRECT3DVERTEXSHADER9 shader);
-void ChangeVertexShader(LPDIRECT3DVERTEXSHADER9 shader);
-
-void RefreshPixelShader();
-void SetPixelShader(LPDIRECT3DPIXELSHADER9 shader);
-void ChangePixelShader(LPDIRECT3DPIXELSHADER9 shader);
-
-void SetStreamSource(UINT StreamNumber,IDirect3DVertexBuffer9* pStreamData,UINT OffsetInBytes,UINT Stride);
-void ChangeStreamSource(UINT StreamNumber,IDirect3DVertexBuffer9* pStreamData,UINT OffsetInBytes,UINT Stride);
-void RefreshStreamSource(UINT StreamNumber);
-
-void SetIndices(LPDIRECT3DINDEXBUFFER9 pIndexData);
-void ChangeIndices(LPDIRECT3DINDEXBUFFER9 pIndexData);
-void RefreshIndices();
-
-void ApplyCachedState();
-
-// Utility functions for vendor specific hacks. So far, just the one.
-void EnableAlphaToCoverage();
-
-struct Resolution
-{
-	char name[32];
-	int xres;
-	int yres;
-	std::set<D3DFORMAT> bitdepths;
-	std::set<int> refreshes;
-};
-
-struct AALevel
-{
-	AALevel(const char *n, D3DMULTISAMPLE_TYPE m, int q) {
-		strncpy(name, n, 32);
-		name[31] = '\0';
-		ms_setting = m; 
-		qual_setting = q;
-	}
-	char name[32];
-	D3DMULTISAMPLE_TYPE ms_setting;
-	int qual_setting;
-};
-
-struct Adapter
-{
-	D3DADAPTER_IDENTIFIER9 ident;
-	std::vector<Resolution> resolutions;
-	std::vector<AALevel> aa_levels;
-	bool supports_alpha_to_coverage;
-
-	// Magic render targets, see the top of this file.
-	bool supports_intz;
-	bool supports_rawz;
-	bool supports_resz;
-	bool supports_null;
-};
-
-const Adapter &GetAdapter(int i);
-const Adapter &GetCurAdapter();
-int GetNumAdapters();
-
-}  // namespace
-
-}  // namespace DX9
-
-
-// Used to not require the SDK and runtime versions to match:
-// Linking with d3dx9.lib makes the most recent d3dx9_xx.dll of the
-// compiler's SDK an actually unnecessary requirement.
-// Add any d3dx9 functions which you want to use here and load them in LoadD3DX9()
-typedef HRESULT (WINAPI* D3DXSAVESURFACETOFILEATYPE)(LPCSTR, D3DXIMAGE_FILEFORMAT, LPDIRECT3DSURFACE9, CONST PALETTEENTRY*, CONST RECT*);
-typedef HRESULT (WINAPI* D3DXSAVETEXTURETOFILEATYPE)(LPCSTR, D3DXIMAGE_FILEFORMAT, LPDIRECT3DBASETEXTURE9, CONST PALETTEENTRY*);
-typedef HRESULT (WINAPI* D3DXCOMPILESHADERTYPE)(LPCSTR, UINT, CONST D3DXMACRO*, LPD3DXINCLUDE, LPCSTR, LPCSTR, DWORD, LPD3DXBUFFER*, LPD3DXBUFFER*, LPD3DXCONSTANTTABLE*);
-
-extern D3DXSAVESURFACETOFILEATYPE PD3DXSaveSurfaceToFileA;
-extern D3DXSAVETEXTURETOFILEATYPE PD3DXSaveTextureToFileA;
-extern D3DXCOMPILESHADERTYPE PD3DXCompileShader;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
deleted file mode 100644
index 8649ebfac2..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <d3dx9.h>
-#include <string>
-
-#include "VideoConfig.h"
-#include "D3DShader.h"
-
-namespace DX9
-{
-
-namespace D3D
-{
-
-// bytecode->shader.
-LPDIRECT3DVERTEXSHADER9 CreateVertexShaderFromByteCode(const u8 *bytecode, int len)
-{
-	LPDIRECT3DVERTEXSHADER9 v_shader;
-	HRESULT hr = D3D::dev->CreateVertexShader((DWORD *)bytecode, &v_shader);
-	if (FAILED(hr))
-		return NULL;
-
-	return v_shader;
-}
-
-// code->bytecode.
-bool CompileVertexShader(const char *code, int len, u8 **bytecode, int *bytecodelen)
-{
-	LPD3DXBUFFER shaderBuffer = NULL;
-	LPD3DXBUFFER errorBuffer = NULL;
-	HRESULT hr = PD3DXCompileShader(code, len, 0, 0, "main", D3D::VertexShaderVersionString(),
-						           0, &shaderBuffer, &errorBuffer, 0);
-	if (FAILED(hr))
-	{
-		static int num_failures = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << code;
-		file.close();
-
-		PanicAlert("Failed to compile vertex shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
-						szTemp,
-						D3D::VertexShaderVersionString(),
-						(char*)errorBuffer->GetBufferPointer());
-
-		*bytecode = NULL;
-		*bytecodelen = 0;
-	}
-	else
-	{
-		*bytecodelen = shaderBuffer->GetBufferSize();
-		*bytecode = new u8[*bytecodelen];
-		memcpy(*bytecode, shaderBuffer->GetBufferPointer(), *bytecodelen);
-	}
-
-	//cleanup
-	if (shaderBuffer)
-		shaderBuffer->Release();
-	if (errorBuffer)
-		errorBuffer->Release();
-	return SUCCEEDED(hr) ? true : false;
-}
-
-// bytecode->shader
-LPDIRECT3DPIXELSHADER9 CreatePixelShaderFromByteCode(const u8 *bytecode, int len)
-{
-	LPDIRECT3DPIXELSHADER9 p_shader;
-	HRESULT hr = D3D::dev->CreatePixelShader((DWORD *)bytecode, &p_shader);
-	if (FAILED(hr))
-		return NULL;
-
-	return p_shader;
-}
-
-// code->bytecode
-bool CompilePixelShader(const char *code, int len, u8 **bytecode, int *bytecodelen)
-{
-	LPD3DXBUFFER shaderBuffer = 0;
-	LPD3DXBUFFER errorBuffer = 0;
-
-	// Someone:
-	// For some reason, I had this kind of errors : "Shader uses texture addressing operations
-	// in a dependency chain that is too complex for the target shader model (ps_2_0) to handle."
-	HRESULT hr = PD3DXCompileShader(code, len, 0, 0, "main", D3D::PixelShaderVersionString(), 
-				 		           0, &shaderBuffer, &errorBuffer, 0);
-
-	if (FAILED(hr))
-	{
-		static int num_failures = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_ps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << code;
-		file.close();
-
-		PanicAlert("Failed to compile pixel shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
-						szTemp,
-						D3D::PixelShaderVersionString(),
-						(char*)errorBuffer->GetBufferPointer());
-
-		*bytecode = NULL;
-		*bytecodelen = 0;
-	}
-	else
-	{
-		*bytecodelen = shaderBuffer->GetBufferSize();
-		*bytecode = new u8[*bytecodelen];
-		memcpy(*bytecode, shaderBuffer->GetBufferPointer(), *bytecodelen);
-	}
-
-	//cleanup
-	if (shaderBuffer)
-		shaderBuffer->Release();
-	if (errorBuffer)
-		errorBuffer->Release();
-	return SUCCEEDED(hr) ? true : false;
-}
-
-LPDIRECT3DVERTEXSHADER9 CompileAndCreateVertexShader(const char *code, int len)
-{
-	u8 *bytecode;
-	int bytecodelen;
-	if (CompileVertexShader(code, len, &bytecode, &bytecodelen))
-	{
-		LPDIRECT3DVERTEXSHADER9 v_shader = CreateVertexShaderFromByteCode(bytecode, len);
-		delete [] bytecode;
-		return v_shader;
-	}
-	return NULL;
-}
-
-LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char* code, unsigned int len)
-{
-	u8 *bytecode;
-	int bytecodelen;
-	if (CompilePixelShader(code, len, &bytecode, &bytecodelen))
-	{
-		LPDIRECT3DPIXELSHADER9 p_shader = CreatePixelShaderFromByteCode(bytecode, len);
-		delete [] bytecode;
-		return p_shader;
-	}
-	return NULL;
-}
-
-}  // namespace
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h
deleted file mode 100644
index 449f2dacea..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "D3DBase.h"
-
-namespace DX9
-{
-
-namespace D3D
-{
-	LPDIRECT3DVERTEXSHADER9 CreateVertexShaderFromByteCode(const u8 *bytecode, int len);
-	LPDIRECT3DPIXELSHADER9 CreatePixelShaderFromByteCode(const u8 *bytecode, int len);
-
-	// The returned bytecode buffers should be delete[]-d.
-	bool CompileVertexShader(const char *code, int len, u8 **bytecode, int *bytecodelen);
-	bool CompilePixelShader(const char *code, int len, u8 **bytecode, int *bytecodelen);
-
-	// Utility functions
-	LPDIRECT3DVERTEXSHADER9 CompileAndCreateVertexShader(const char *code, int len);
-	LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char *code, unsigned int len);
-}
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
deleted file mode 100644
index f16e308eef..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "D3DTexture.h"
-
-#include "CPUDetect.h"
-
-#if _M_SSE >= 0x401
-#include <smmintrin.h>
-#include <emmintrin.h>
-#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
-#include <tmmintrin.h>
-#endif
-
-namespace DX9
-{
-
-namespace D3D
-{
-
-void ConvertRGBA_BGRA_SSE2(u32 *dst, const int dstPitch, u32 *pIn, const int width, const int height, const int pitch)
-{
-	// Converts RGBA to BGRA:
-	// TODO: this would be totally unnecessary if we just change the TextureDecoder_RGBA to decode
-	// to BGRA instead.
-	for (int y = 0; y < height; y++, pIn += pitch)
-	{
-		u8 *pIn8 = (u8 *)pIn;
-		u8 *pBits = (u8 *)((u8*)dst + (y * dstPitch));
-
-		// Batch up loads/stores into 16 byte chunks to use SSE2 efficiently:
-		int sse2blocks = (width * 4) / 16;
-		int sse2remainder = (width * 4) & 15;
-
-		// Do conversions in batches of 16 bytes:
-		if (sse2blocks > 0)
-		{
-			// Generate a constant of all FF bytes:
-			const __m128i allFFs128 = _mm_cmpeq_epi32(_mm_setzero_si128(), _mm_setzero_si128());
-			__m128i *src128 = (__m128i *)pIn8;
-			__m128i *dst128 = (__m128i *)pBits;
-
-			// Increment by 16 bytes at a time:
-			for (int i = 0; i < sse2blocks; ++i, ++dst128, ++src128)
-			{
-				// Load up 4 colors simultaneously:
-				__m128i rgba = _mm_loadu_si128(src128);
-				// Swap the R and B components:
-				// Isolate the B component and shift it left 16 bits:
-				// ABGR
-				const __m128i bMask = _mm_srli_epi32(allFFs128, 24);
-				const __m128i bNew = _mm_slli_epi32(_mm_and_si128(rgba, bMask), 16);
-				// Isolate the R component and shift it right 16 bits:
-				const __m128i rMask = _mm_slli_epi32(bMask, 16);
-				const __m128i rNew = _mm_srli_epi32(_mm_and_si128(rgba, rMask), 16);
-				// Now mask off the old R and B components from the rgba data to get 0g0a:
-				const __m128i _g_a = _mm_or_si128(
-					_mm_and_si128(
-						rgba,
-						_mm_or_si128(
-							_mm_slli_epi32(bMask, 8),
-							_mm_slli_epi32(rMask, 8)
-						)
-					),
-					_mm_or_si128(rNew, bNew)
-				);
-				// Finally, OR up all the individual components to get BGRA:
-				const __m128i bgra = _mm_or_si128(_g_a, _mm_or_si128(rNew, bNew));
-				_mm_storeu_si128(dst128, bgra);
-			}
-		}
-
-		// Take the remainder colors at the end of the row that weren't able to
-		// be included into the last 16 byte chunk:
-		if (sse2remainder > 0)
-		{
-			for (int x = (sse2blocks * 16); x < (width * 4); x += 4)
-			{
-				pBits[x + 0] = pIn8[x + 2];
-				pBits[x + 1] = pIn8[x + 1];
-				pBits[x + 2] = pIn8[x + 0];
-				pBits[x + 3] = pIn8[x + 3];
-			}
-		}
-	}
-
-	// Memory fence to make sure the stores are good:
-	_mm_mfence();
-}
-
-void ConvertRGBA_BGRA_SSSE3(u32 *dst, const int dstPitch, u32 *pIn, const int width, const int height, const int pitch)
-{
-	__m128i mask = _mm_set_epi8(15, 12, 13, 14, 11, 8, 9, 10, 7, 4, 5, 6, 3, 0, 1, 2);
-	for (int y = 0; y < height; y++, pIn += pitch)
-	{
-		u8 *pIn8 = (u8 *)pIn;
-		u8 *pBits = (u8 *)((u8*)dst + (y * dstPitch));
-
-		// Batch up loads/stores into 16 byte chunks to use SSE2 efficiently:
-		int ssse3blocks = (width * 4) / 16;
-		int ssse3remainder = (width * 4) & 15;
-
-		// Do conversions in batches of 16 bytes:
-		if (ssse3blocks > 0)
-		{
-			__m128i *src128 = (__m128i *)pIn8;
-			__m128i *dst128 = (__m128i *)pBits;
-
-			// Increment by 16 bytes at a time:
-			for (int i = 0; i < ssse3blocks; ++i, ++dst128, ++src128)
-			{
-				_mm_storeu_si128(dst128, _mm_shuffle_epi8(_mm_loadu_si128(src128), mask));
-			}
-		}
-
-		// Take the remainder colors at the end of the row that weren't able to
-		// be included into the last 16 byte chunk:
-		if (ssse3remainder > 0)
-		{
-			for (int x = (ssse3blocks * 16); x < (width * 4); x += 4)
-			{
-				pBits[x + 0] = pIn8[x + 2];
-				pBits[x + 1] = pIn8[x + 1];
-				pBits[x + 2] = pIn8[x + 0];
-				pBits[x + 3] = pIn8[x + 3];
-			}
-		}
-	}
-
-	// Memory fence to make sure the stores are good:
-	_mm_mfence();
-}
-
-LPDIRECT3DTEXTURE9 CreateTexture2D(const u8* buffer, const int width, const int height, const int pitch, D3DFORMAT fmt, bool swap_r_b, int levels)
-{
-	u32* pBuffer = (u32*)buffer;
-	LPDIRECT3DTEXTURE9 pTexture;
-
-	// crazy bitmagic, sorry :)
-	bool isPow2 = !((width&(width-1)) || (height&(height-1)));
-	bool bExpand = false;
-
-	if (fmt == D3DFMT_A8P8) {
-		fmt = D3DFMT_A8L8;
-		bExpand = true;
-	}
-
-	HRESULT hr;
-	if (levels > 0)
-		hr = dev->CreateTexture(width, height, levels, 0, fmt, D3DPOOL_MANAGED, &pTexture, NULL);
-	else
-		hr = dev->CreateTexture(width, height, 0, D3DUSAGE_AUTOGENMIPMAP, fmt, D3DPOOL_MANAGED, &pTexture, NULL);
-
-	if (FAILED(hr))
-		return 0;
-	int level = 0;
-	D3DLOCKED_RECT Lock;
-	pTexture->LockRect(level, &Lock, NULL, 0);
-	switch (fmt) 
-	{
-	case D3DFMT_L8:
-	case D3DFMT_A8:
-	case D3DFMT_A4L4:
-		{
-			const u8 *pIn = buffer;
-			for (int y = 0; y < height; y++)
-			{
-				u8* pBits = ((u8*)Lock.pBits + (y * Lock.Pitch));
-				memcpy(pBits, pIn, width);
-				pIn += pitch;
-			}
-		}
-		break;
-	case D3DFMT_R5G6B5:
-		{
-			const u16 *pIn = (u16*)buffer;
-			for (int y = 0; y < height; y++)
-			{
-				u16* pBits = (u16*)((u8*)Lock.pBits + (y * Lock.Pitch));
-				memcpy(pBits, pIn, width * 2);
-				pIn += pitch;
-			}
-		}
-		break;
-	case D3DFMT_A8L8:
-		{
-			if (bExpand) { // I8
-				const u8 *pIn = buffer;
-				// TODO(XK): Find a better way that does not involve either unpacking
-				//           or downsampling (i.e. A4L4)
-				for (int y = 0; y < height; y++)
-				{
-					u8* pBits = ((u8*)Lock.pBits + (y * Lock.Pitch));
-					for(int i = 0; i < width * 2; i += 2) {
-						pBits[i] = pIn[i / 2];
-						pBits[i + 1] = pIn[i / 2];
-					}
-					pIn += pitch;
-				}
-			} else { // IA8
-				const u16 *pIn = (u16*)buffer;
-
-				for (int y = 0; y < height; y++)
-				{
-					u16* pBits = (u16*)((u8*)Lock.pBits + (y * Lock.Pitch));
-					memcpy(pBits, pIn, width * 2);
-					pIn += pitch;
-				}
-			}
-		}
-		break;
-	case D3DFMT_A8R8G8B8:
-		{
-			if(pitch * 4 == Lock.Pitch && !swap_r_b)
-			{
-				memcpy(Lock.pBits,buffer,Lock.Pitch*height);
-			}
-			else
-			{
-				u32* pIn = pBuffer;
-				if (!swap_r_b) {
-					for (int y = 0; y < height; y++)
-					{
-						u32 *pBits = (u32*)((u8*)Lock.pBits + (y * Lock.Pitch));
-						memcpy(pBits, pIn, width * 4);
-						pIn += pitch;
-					}
-				} else {
-#if _M_SSE >= 0x301
-					// Uses SSSE3 intrinsics to optimize RGBA -> BGRA swizzle:
-					if (cpu_info.bSSSE3) {
-						ConvertRGBA_BGRA_SSSE3((u32 *)Lock.pBits, Lock.Pitch, pIn, width, height, pitch);
-					} else
-#endif
-					// Uses SSE2 intrinsics to optimize RGBA -> BGRA swizzle:
-					{
-						ConvertRGBA_BGRA_SSE2((u32 *)Lock.pBits, Lock.Pitch, pIn, width, height, pitch);
-					}
-#if 0
-					for (int y = 0; y < height; y++)
-					{
-						u8 *pIn8 = (u8 *)pIn;
-						u8 *pBits = (u8 *)((u8*)Lock.pBits + (y * Lock.Pitch));
-						for (int x = 0; x < width * 4; x += 4) {
-							pBits[x + 0] = pIn8[x + 2];
-							pBits[x + 1] = pIn8[x + 1];
-							pBits[x + 2] = pIn8[x + 0];
-							pBits[x + 3] = pIn8[x + 3];
-						}
-						pIn += pitch;
-					}
-#endif
-				}
-			}
-		}
-		break;
-	case D3DFMT_DXT1:
-		memcpy(Lock.pBits,buffer,((width+3)/4)*((height+3)/4)*8);
-		break;
-	default:
-		PanicAlert("D3D: Invalid texture format %i", fmt);
-	}
-	pTexture->UnlockRect(level); 
-	return pTexture;
-}
-
-LPDIRECT3DTEXTURE9 CreateOnlyTexture2D(const int width, const int height, D3DFORMAT fmt)
-{
-	LPDIRECT3DTEXTURE9 pTexture;
-	// crazy bitmagic, sorry :)
-	bool isPow2 = !((width&(width-1)) || (height&(height-1)));
-	bool bExpand = false;
-	HRESULT hr;
-	// TODO(ector): Allow mipmaps for non-pow textures on newer cards?
-	// TODO(ector): Use the game-specified mipmaps?
-	if (!isPow2)
-		hr = dev->CreateTexture(width, height, 1, 0, fmt, D3DPOOL_MANAGED, &pTexture, NULL);
-	else
-		hr = dev->CreateTexture(width, height, 0, D3DUSAGE_AUTOGENMIPMAP, fmt, D3DPOOL_MANAGED, &pTexture, NULL);
-
-	if (FAILED(hr))
-		return 0;
-	return pTexture;
-}
-
-void ReplaceTexture2D(LPDIRECT3DTEXTURE9 pTexture, const u8* buffer, const int width, const int height, const int pitch, D3DFORMAT fmt, bool swap_r_b, int level)
-{
-	u32* pBuffer = (u32*)buffer;
-	D3DLOCKED_RECT Lock;
-	pTexture->LockRect(level, &Lock, NULL, 0);
-	u32* pIn = pBuffer;
-
-	bool bExpand = false;
-
-	if (fmt == D3DFMT_A8P8) {
-		fmt = D3DFMT_A8L8;
-		bExpand = true;
-	}
-	switch (fmt) 
-	{
-	case D3DFMT_A8R8G8B8:
-		if(pitch * 4 == Lock.Pitch && !swap_r_b)
-		{
-			memcpy(Lock.pBits, pBuffer, Lock.Pitch*height);
-		}
-		else if (!swap_r_b)
-		{
-			for (int y = 0; y < height; y++)
-			{
-				u32 *pBits = (u32*)((u8*)Lock.pBits + (y * Lock.Pitch));
-				memcpy(pBits, pIn, width * 4);
-				pIn += pitch;
-			}
-		}
-		else
-		{
-#if _M_SSE >= 0x301
-			// Uses SSSE3 intrinsics to optimize RGBA -> BGRA swizzle:
-			if (cpu_info.bSSSE3) {
-				ConvertRGBA_BGRA_SSSE3((u32 *)Lock.pBits, Lock.Pitch, pIn, width, height, pitch);
-			} else
-#endif
-			// Uses SSE2 intrinsics to optimize RGBA -> BGRA swizzle:
-			{
-				ConvertRGBA_BGRA_SSE2((u32 *)Lock.pBits, Lock.Pitch, pIn, width, height, pitch);
-			}
-#if 0
-			for (int y = 0; y < height; y++)
-			{
-				u8 *pIn8 = (u8 *)pIn;
-				u8 *pBits = (u8 *)((u8*)Lock.pBits + (y * Lock.Pitch));
-				for (int x = 0; x < width * 4; x += 4)
-				{
-					pBits[x + 0] = pIn8[x + 2];
-					pBits[x + 1] = pIn8[x + 1];
-					pBits[x + 2] = pIn8[x + 0];
-					pBits[x + 3] = pIn8[x + 3];
-				}
-				pIn += pitch;
-			}
-#endif
-		}
-		break;
-	case D3DFMT_L8:
-	case D3DFMT_A8:
-	case D3DFMT_A4L4:
-		{
-			const u8 *pIn = buffer;
-			for (int y = 0; y < height; y++)
-			{
-				u8* pBits = ((u8*)Lock.pBits + (y * Lock.Pitch));
-				memcpy(pBits, pIn, width);
-				pIn += pitch;
-			}
-		}
-		break;
-	case D3DFMT_R5G6B5:
-		{
-			const u16 *pIn = (u16*)buffer;
-			for (int y = 0; y < height; y++)
-			{
-				u16* pBits = (u16*)((u8*)Lock.pBits + (y * Lock.Pitch));
-				memcpy(pBits, pIn, width * 2);
-				pIn += pitch;
-			}
-		}
-		break;
-	case D3DFMT_A8L8:
-		{
-			if (bExpand) { // I8
-				const u8 *pIn = buffer;
-				// TODO(XK): Find a better way that does not involve either unpacking
-				//           or downsampling (i.e. A4L4)
-				for (int y = 0; y < height; y++)
-				{
-					u8* pBits = ((u8*)Lock.pBits + (y * Lock.Pitch));
-					for(int i = 0; i < width * 2; i += 2) {
-						pBits[i] = pIn[i / 2];
-						pBits[i + 1] = pIn[i / 2];
-					}
-					pIn += pitch;
-				}
-			} else { // IA8
-				const u16 *pIn = (u16*)buffer;
-
-				for (int y = 0; y < height; y++)
-				{
-					u16* pBits = (u16*)((u8*)Lock.pBits + (y * Lock.Pitch));
-					memcpy(pBits, pIn, width * 2);
-					pIn += pitch;
-				}
-			}
-		}
-		break;
-	case D3DFMT_DXT1:
-		memcpy(Lock.pBits,buffer,((width+3)/4)*((height+3)/4)*8);
-		break;
-	}
-	pTexture->UnlockRect(level); 
-}
-
-}  // namespace
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h
deleted file mode 100644
index 54ed57000a..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "D3DBase.h"
-
-namespace DX9
-{
-
-namespace D3D
-{
-	LPDIRECT3DTEXTURE9 CreateTexture2D(const u8* buffer, const int width, const int height, const int pitch, D3DFORMAT fmt = D3DFMT_A8R8G8B8, bool swap_r_b = false, int levels = 1);
-	void ReplaceTexture2D(LPDIRECT3DTEXTURE9 pTexture, const u8* buffer, const int width, const int height, const int pitch, D3DFORMAT fmt, bool swap_r_b, int level = 0);
-	LPDIRECT3DTEXTURE9 CreateRenderTarget(const int width, const int height);
-	LPDIRECT3DSURFACE9 CreateDepthStencilSurface(const int width, const int height);
-	LPDIRECT3DTEXTURE9 CreateOnlyTexture2D(const int width, const int height, D3DFORMAT fmt);
-}
-
-}  //  namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
deleted file mode 100644
index 066f99ad3f..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "StringUtil.h"
-
-#include "D3DBase.h"
-#include "D3DUtil.h"
-#include "Render.h"
-#include "PixelShaderCache.h"
-#include "VertexShaderCache.h"
-
-namespace DX9
-{
-
-namespace D3D
-{
-CD3DFont font;
-
-#define MAX_NUM_VERTICES 50*6
-struct FONT2DVERTEX {
-	float x,y,z;
-	float rhw;
-	u32 color;
-	float tu, tv;
-};
-
-#define D3DFVF_FONT2DVERTEX (D3DFVF_XYZRHW|D3DFVF_DIFFUSE|D3DFVF_TEX1)
-#define D3DFVF_FONT3DVERTEX (D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_NORMAL|D3DFVF_TEX1)
-
-inline FONT2DVERTEX InitFont2DVertex(float x, float y, u32 color, float tu, float tv)
-{
-	FONT2DVERTEX v;   v.x=x; v.y=y; v.z=0; v.rhw=1.0f;  v.color = color;   v.tu = tu;   v.tv = tv;
-	return v;
-}
-
-CD3DFont::CD3DFont()
-{
-	m_pTexture			   = NULL;
-	m_pVB				   = NULL;
-}
-
-enum {m_dwTexWidth = 512, m_dwTexHeight = 512};
-
-int CD3DFont::Init()
-{
-	// Create vertex buffer for the letters
-	HRESULT hr;
-	if (FAILED(hr = dev->CreateVertexBuffer(MAX_NUM_VERTICES*sizeof(FONT2DVERTEX),
-		D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &m_pVB, NULL)))
-	{
-		return hr;
-	}
-	m_fTextScale  = 1.0f; // Draw fonts into texture without scaling
-
-	// Prepare to create a bitmap
-	unsigned int* pBitmapBits;
-	BITMAPINFO bmi;
-	ZeroMemory(&bmi.bmiHeader, sizeof(BITMAPINFOHEADER));
-	bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
-	bmi.bmiHeader.biWidth       =  (int)m_dwTexWidth;
-	bmi.bmiHeader.biHeight      = -(int)m_dwTexHeight;
-	bmi.bmiHeader.biPlanes      = 1;
-	bmi.bmiHeader.biCompression = BI_RGB;
-	bmi.bmiHeader.biBitCount    = 32;
-
-	// Create a DC and a bitmap for the font
-	HDC hDC = CreateCompatibleDC(NULL);
-	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, NULL, 0);
-	SetMapMode(hDC, MM_TEXT);
-
-	// Create a font.  By specifying ANTIALIASED_QUALITY, we might get an
-	// antialiased font, but this is not guaranteed.
-	// We definitely don't want to get it cleartype'd, anyway.
-	int m_dwFontHeight = 24;
-	int nHeight = -MulDiv(m_dwFontHeight, int(GetDeviceCaps(hDC, LOGPIXELSY) * m_fTextScale), 72);
-	int dwBold = FW_NORMAL; ///FW_BOLD
-	HFONT hFont = CreateFont(nHeight, 0, 0, 0, dwBold, 0,
-		FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
-		CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
-		VARIABLE_PITCH, _T("Tahoma"));
-	if (NULL == hFont)
-		return E_FAIL;
-
-	HGDIOBJ hOldbmBitmap = SelectObject(hDC, hbmBitmap);
-	HGDIOBJ hOldFont = SelectObject(hDC, hFont);
-
-	// Set text properties
-	SetTextColor(hDC, 0xFFFFFF);
-	SetBkColor  (hDC, 0);
-	SetTextAlign(hDC, TA_TOP);
-
-	// Loop through all printable characters and output them to the bitmap
-	// Meanwhile, keep track of the corresponding tex coords for each character.
-	int x = 0, y = 0;
-	char str[2] = "\0";
-	for (int c = 0; c < 127 - 32; c++)
-	{
-		str[0] = c + 32;
-		SIZE size;
-		GetTextExtentPoint32A(hDC, str, 1, &size);
-		if ((int)(x+size.cx+1) > m_dwTexWidth)
-		{
-			x  = 0;
-			y += size.cy + 1;
-		}
-
-		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, NULL, str, 1, NULL);
-		m_fTexCoords[c][0] = ((float)(x+0))/m_dwTexWidth;
-		m_fTexCoords[c][1] = ((float)(y+0))/m_dwTexHeight;
-		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
-		m_fTexCoords[c][3] = ((float)(y+0+size.cy))/m_dwTexHeight;
-
-		x += size.cx + 3;  // 3 to work around annoying ij conflict (part of the j ends up with the i)
-	}
-
-	// Create a new texture for the font
-	// possible optimization: store the converted data in a buffer and fill the texture on creation.
-	//							That way, we can use a static texture
-	hr = dev->CreateTexture(m_dwTexWidth, m_dwTexHeight, 1, D3DUSAGE_DYNAMIC,
-							D3DFMT_A4R4G4B4, D3DPOOL_DEFAULT, &m_pTexture, NULL);
-	if (FAILED(hr))
-	{
-		PanicAlert("Failed to create font texture");
-		return hr;
-	}
-
-	// Lock the surface and write the alpha values for the set pixels
-	D3DLOCKED_RECT d3dlr;
-	m_pTexture->LockRect(0, &d3dlr, 0, D3DLOCK_DISCARD);
-	int bAlpha; // 4-bit measure of pixel intensity
-
-	for (y = 0; y < m_dwTexHeight; y++)
-	{
-		u16 *pDst16 = (u16*)((u8 *)d3dlr.pBits + y * d3dlr.Pitch);
-		for (x = 0; x < m_dwTexWidth; x++)
-		{
-			bAlpha = ((pBitmapBits[m_dwTexWidth * y + x] & 0xff) >> 4);
-			pDst16[x] = (bAlpha << 12) | 0x0fff;
-		}
-	}
-
-	// Done updating texture, so clean up used objects
-	m_pTexture->UnlockRect(0);
-
-	SelectObject(hDC, hOldbmBitmap);
-	DeleteObject(hbmBitmap);
-
-	SelectObject(hDC, hOldFont);
-	DeleteObject(hFont);
-
-	return S_OK;
-}
-
-int CD3DFont::Shutdown()
-{
-	m_pVB->Release();
-	m_pVB = NULL;
-	m_pTexture->Release();
-	m_pTexture = NULL;
-	return S_OK;
-}
-
-
-const int RS[6][2] =
-{
-	{D3DRS_ALPHABLENDENABLE, TRUE},
-	{D3DRS_SRCBLEND,		 D3DBLEND_SRCALPHA},
-	{D3DRS_DESTBLEND,		 D3DBLEND_INVSRCALPHA},
-	{D3DRS_CULLMODE,		 D3DCULL_NONE},
-	{D3DRS_ZENABLE,			 FALSE},
-	{D3DRS_FOGENABLE,		 FALSE},
-};
-const int TS[6][2] = 
-{
-	{D3DTSS_COLOROP,   D3DTOP_MODULATE},
-	{D3DTSS_COLORARG1, D3DTA_TEXTURE},
-	{D3DTSS_COLORARG2, D3DTA_DIFFUSE },
-	{D3DTSS_ALPHAOP,   D3DTOP_MODULATE },
-	{D3DTSS_ALPHAARG1, D3DTA_TEXTURE },
-	{D3DTSS_ALPHAARG2, D3DTA_DIFFUSE },
-};
-
-void RestoreShaders()
-{
-	D3D::SetTexture(0, 0);
-	D3D::RefreshStreamSource(0);
-	D3D::RefreshIndices();
-	D3D::RefreshVertexDeclaration();
-	D3D::RefreshPixelShader();
-	D3D::RefreshVertexShader();
-}
-
-void RestoreRenderStates()
-{
-	RestoreShaders();
-	for (int i = 0; i < 6; i++)
-	{
-		D3D::RefreshRenderState((_D3DRENDERSTATETYPE)RS[i][0]);
-		D3D::RefreshTextureStageState(0, (_D3DTEXTURESTAGESTATETYPE)int(TS[i][0]));
-	}
-}
-
-void CD3DFont::SetRenderStates()
-{
-	D3D::SetTexture(0, m_pTexture);
-
-	D3D::ChangePixelShader(0);
-	D3D::ChangeVertexShader(0);
-	D3D::ChangeVertexDeclaration(0);
-	dev->SetFVF(D3DFVF_FONT2DVERTEX);
-
-	for (int i = 0; i < 6; i++)
-	{
-		D3D::ChangeRenderState((_D3DRENDERSTATETYPE)RS[i][0], RS[i][1]);
-		D3D::ChangeTextureStageState(0, (_D3DTEXTURESTAGESTATETYPE)int(TS[i][0]), TS[i][1]);
-	}
-}
-
-
-int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, float spacing, u32 dwColor, const char* strText)
-{
-	if (!m_pVB)
-		return 0;
-
-	SetRenderStates();
-	D3D::ChangeStreamSource(0, m_pVB, 0, sizeof(FONT2DVERTEX));
-
-	float vpWidth = 1;
-	float vpHeight = 1;
-
-	float sx = x*vpWidth-0.5f;
-	float sy = y*vpHeight-0.5f;
-
-	float fStartX = sx;
-
-	float invLineHeight = 1.0f / ((m_fTexCoords[0][3] - m_fTexCoords[0][1]) * m_dwTexHeight);
-	// Fill vertex buffer
-	FONT2DVERTEX* pVertices;
-	int dwNumTriangles = 0L;
-	m_pVB->Lock(0, 0, (void**)&pVertices, D3DLOCK_DISCARD);
-
-	const char *oldstrText=strText;
-	//First, let's measure the text
-	float tw=0;
-	float mx=0;
-	float maxx=0;
-
-	while (*strText)
-	{
-		char c = *strText++;
-
-		if (c == ('\n'))
-			mx = 0;
-		if (c < (' '))
-			continue;
-
-		float tx1 = m_fTexCoords[c-32][0];
-		float tx2 = m_fTexCoords[c-32][2];
-
-		float w = (tx2-tx1)*m_dwTexWidth;
-		w *= (fXScale*vpHeight)*invLineHeight;
-		mx += w + spacing*fXScale*vpWidth;
-		if (mx > maxx) maxx = mx;
-	}
-
-	float offset = -maxx/2;
-	strText = oldstrText;
-
-	float wScale = (fXScale*vpHeight)*invLineHeight;
-	float hScale = (fYScale*vpHeight)*invLineHeight;
-
-	// Let's draw it
-	while (*strText)
-	{
-		char c = *strText++;
-
-		if (c == ('\n'))
-		{
-			sx  = fStartX;
-			sy += fYScale*vpHeight;
-		}
-		if (c < (' '))
-			continue;
-
-		c -= 32;
-		float tx1 = m_fTexCoords[c][0];
-		float ty1 = m_fTexCoords[c][1];
-		float tx2 = m_fTexCoords[c][2];
-		float ty2 = m_fTexCoords[c][3];
-
-		float w = (tx2-tx1)*m_dwTexWidth;
-		float h = (ty2-ty1)*m_dwTexHeight;
-
-		w *= wScale;
-		h *= hScale;
-
-		FONT2DVERTEX v[6];
-		v[0] = InitFont2DVertex(sx,   sy+h, dwColor, tx1, ty2);
-		v[1] = InitFont2DVertex(sx,   sy,   dwColor, tx1, ty1);
-		v[2] = InitFont2DVertex(sx+w, sy+h, dwColor, tx2, ty2);
-		v[3] = InitFont2DVertex(sx+w, sy,   dwColor, tx2, ty1);
-		v[4] = v[2];
-		v[5] = v[1];
-
-		memcpy(pVertices, v, 6*sizeof(FONT2DVERTEX));
-
-		pVertices+=6;
-		dwNumTriangles += 2;
-
-		if (dwNumTriangles * 3 > (MAX_NUM_VERTICES - 6))
-		{
-			// Unlock, render, and relock the vertex buffer
-			m_pVB->Unlock();
-			dev->DrawPrimitive(D3DPT_TRIANGLELIST, 0, dwNumTriangles);
-			m_pVB->Lock(0, 0, (void**)&pVertices, D3DLOCK_DISCARD);
-			dwNumTriangles = 0;
-		}
-		sx += w + spacing*fXScale*vpWidth;
-	}
-
-	// Unlock and render the vertex buffer
-	m_pVB->Unlock();
-	if (dwNumTriangles > 0)
-		dev->DrawPrimitive(D3DPT_TRIANGLELIST, 0, dwNumTriangles);
-	RestoreRenderStates();
-	return S_OK;
-}
-
-/* Explanation of texture copying via drawShadedTexQuad and drawShadedTexSubQuad:
-	From MSDN: "When rendering 2D output using pre-transformed vertices,
-				care must be taken to ensure that each texel area correctly corresponds
-				to a single pixel area, otherwise texture distortion can occur."
-	=> We need to subtract 0.5 from the vertex positions to properly map texels to pixels.
-	HOWEVER, the MSDN article talks about D3DFVF_XYZRHW vertices, which bypass the programmable pipeline.
-	Since we're using D3DFVF_XYZW and the programmable pipeline though, the vertex positions
-	are normalized to [-1;+1], i.e. we need to scale the -0.5 offset by the texture dimensions.
-	For example see a texture with a width of 640 pixels:
-	"Expected" coordinate range when using D3DFVF_XYZRHW: [0;640]
-	Normalizing this coordinate range for D3DFVF_XYZW: [0;640]->[-320;320]->[-1;1]
-		i.e. we're subtracting width/2 and dividing by width/2
-	BUT: The actual range when using D3DFVF_XYZRHW needs to be [-0.5;639.5] because of the need for exact texel->pixel mapping.
-	We can still apply the same normalizing procedure though:
-		[-0.5;639.5]->[-320-0.5;320-0.5]->[-1-0.5/320;1-0.5/320]
-
-	So generally speaking the correct coordinate range is [-1-0.5/(w/2);1-0.5/(w/2)]
-	which can be simplified to [-1-1/w;1-1/w].
-
-	Note that while for D3DFVF_XYZRHW the y coordinate of the bottom of the screen is positive,
-		it's negative for D3DFVF_XYZW. This is why we need to _add_ 1/h for the second position component instead of subtracting it.
-
-	For a detailed explanation of this read the MSDN article "Directly Mapping Texels to Pixels (Direct3D 9)".
-*/
-void drawShadedTexQuad(IDirect3DTexture9 *texture,
-					   const RECT *rSource,
-					   int SourceWidth,
-					   int SourceHeight,
-					   int DestWidth,
-					   int DestHeight,
-					   IDirect3DPixelShader9 *PShader,
-					   IDirect3DVertexShader9 *Vshader,
-					   float Gamma)
-{
-	float sw = 1.0f /(float) SourceWidth;
-	float sh = 1.0f /(float) SourceHeight;
-	float dw = 1.0f /(float) DestWidth;
-	float dh = 1.0f /(float) DestHeight;
-	float u1=((float)rSource->left) * sw;
-	float u2=((float)rSource->right) * sw;
-	float v1=((float)rSource->top) * sh;
-	float v2=((float)rSource->bottom) * sh;
-	float g = 1.0f/Gamma;
-
-	const struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = {
-		{-1.0f - dw,-1.0f + dh, 0.0f,1.0f, u1, v2, sw, sh, g},
-		{-1.0f - dw, 1.0f + dh, 0.0f,1.0f, u1, v1, sw, sh, g},
-		{ 1.0f - dw,-1.0f + dh, 0.0f,1.0f, u2, v2, sw, sh, g},
-		{ 1.0f - dw, 1.0f + dh, 0.0f,1.0f, u2, v1, sw, sh, g}
-	};
-	D3D::ChangeVertexShader(Vshader);
-	D3D::ChangePixelShader(PShader);
-	D3D::SetTexture(0, texture);
-	D3D::ChangeVertexDeclaration(0);
-	dev->SetFVF(D3DFVF_XYZW | D3DFVF_TEX3 |  D3DFVF_TEXCOORDSIZE1(2));
-	dev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, coords, sizeof(Q2DVertex));
-	RestoreShaders();
-}
-
-void drawShadedTexSubQuad(IDirect3DTexture9 *texture,
-							const MathUtil::Rectangle<float> *rSource,
-							int SourceWidth,
-							int SourceHeight,
-							const MathUtil::Rectangle<float> *rDest,
-							int DestWidth,
-							int DestHeight,
-							IDirect3DPixelShader9 *PShader,
-							IDirect3DVertexShader9 *Vshader,
-							float Gamma)
-{
-	float sw = 1.0f /(float) SourceWidth;
-	float sh = 1.0f /(float) SourceHeight;
-	float dw = 1.0f /(float) DestWidth;
-	float dh = 1.0f /(float) DestHeight;
-	float u1= rSource->left * sw;
-	float u2= rSource->right * sw;
-	float v1= rSource->top * sh;
-	float v2= rSource->bottom * sh;
-	float g = 1.0f/Gamma;
-
-	struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = {
-		{ rDest->left  - dw , rDest->top    + dh, 1.0f,1.0f, u1, v2, sw, sh, g},
-		{ rDest->left  - dw , rDest->bottom + dh, 1.0f,1.0f, u1, v1, sw, sh, g},
-		{ rDest->right - dw , rDest->top    + dh, 1.0f,1.0f, u2, v2, sw, sh, g},
-		{ rDest->right - dw , rDest->bottom + dh, 1.0f,1.0f, u2, v1, sw, sh, g}
-	};
-	D3D::ChangeVertexShader(Vshader);
-	D3D::ChangePixelShader(PShader);
-	D3D::SetTexture(0, texture);
-	D3D::ChangeVertexDeclaration(0);
-	dev->SetFVF(D3DFVF_XYZW | D3DFVF_TEX3 |  D3DFVF_TEXCOORDSIZE1(2));
-	dev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, coords, sizeof(Q2DVertex));
-	RestoreShaders();
-}
-
-// Fills a certain area of the current render target with the specified color
-// Z buffer disabled; destination coordinates normalized to (-1;1)
-void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2)
-{
-	struct CQVertex { float x, y, z, rhw; u32 col; } coords[4] = {
-		{ x1, y2, 0.f, 1.f, Color },
-		{ x2, y2, 0.f, 1.f, Color },
-		{ x1, y1, 0.f, 1.f, Color },
-		{ x2, y1, 0.f, 1.f, Color },
-	};
-	D3D::ChangeVertexShader(VertexShaderCache::GetClearVertexShader());
-	D3D::ChangePixelShader(PixelShaderCache::GetClearProgram());
-	D3D::ChangeVertexDeclaration(0);
-	dev->SetFVF(D3DFVF_XYZW | D3DFVF_DIFFUSE);
-	dev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, coords, sizeof(CQVertex));
-	RestoreShaders();
-}
-
-void drawClearQuad(u32 Color,float z,IDirect3DPixelShader9 *PShader,IDirect3DVertexShader9 *Vshader)
-{
-	struct Q2DVertex { float x,y,z,rhw;u32 color;} coords[4] = {
-		{-1.0f,  1.0f, z, 1.0f, Color},
-		{ 1.0f,  1.0f, z, 1.0f, Color},
-		{ 1.0f, -1.0f, z, 1.0f, Color},
-		{-1.0f, -1.0f, z, 1.0f, Color}
-	};
-	D3D::ChangeVertexShader(Vshader);
-	D3D::ChangePixelShader(PShader);
-	D3D::ChangeVertexDeclaration(0);
-	dev->SetFVF(D3DFVF_XYZW | D3DFVF_DIFFUSE);
-	dev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, coords, sizeof(Q2DVertex));
-	RestoreShaders();
-}
-
-
-}  // namespace
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h
deleted file mode 100644
index 35cc63a5f0..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma	once
-
-#include "D3DBase.h"
-#include <math.h>
-#include <MathUtil.h>
-
-namespace DX9
-{
-
-namespace D3D
-{
-	// Font creation flags
-	#define D3DFONT_BOLD        0x0001
-	#define D3DFONT_ITALIC      0x0002
-
-	// Font rendering flags
-	#define D3DFONT_CENTERED    0x0001
-
-	//a cut-down variant of the DXSDK CD3DFont class
-	class CD3DFont
-	{
-		LPDIRECT3DTEXTURE9      m_pTexture;   // The d3d texture for this font
-		LPDIRECT3DVERTEXBUFFER9 m_pVB;        // VertexBuffer for rendering text
-		//int     m_dwTexWidth;                 // Texture dimensions
-		//int     m_dwTexHeight;
-		float   m_fTextScale;
-		float   m_fTexCoords[128-32][4];
-		  
-	public:
-		CD3DFont();
-		// 2D (no longer 3D) text drawing function
-		// Initializing and destroying device-dependent objects
-		void SetRenderStates();
-		int Init();
-		int Shutdown();
-		int DrawTextScaled( float x, float y,
-							float fXScale, float fYScale, 
-							float spacing, u32 dwColor,
-							const char* strText);
-		  
-		  
-		// Constructor / destructor
-		//~CD3DFont();
-	};
-
-	extern CD3DFont font;
-
-	void quad2d(float x1, float y1, float x2, float y2, u32 color, float u1=0, float v1=0, float u2=1, float v2=1);
-	void drawShadedTexQuad(IDirect3DTexture9 *texture,
-					   const RECT *rSource,
-					   int SourceWidth,
-					   int SourceHeight,
-					   int DestWidth,
-					   int DestHeight,
-					   IDirect3DPixelShader9 *PShader,
-					   IDirect3DVertexShader9 *Vshader,
-					   float Gamma = 1.0f);
-	void drawShadedTexSubQuad(IDirect3DTexture9 *texture,
-							const MathUtil::Rectangle<float> *rSource,
-							int SourceWidth,
-							int SourceHeight,
-							const MathUtil::Rectangle<float> *rDest,
-							int DestWidth,
-							int DestHeight,
-							IDirect3DPixelShader9 *PShader,
-							IDirect3DVertexShader9 *Vshader,
-							float Gamma = 1.0f);
-	void drawClearQuad(u32 Color, float z, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader);
-	void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2);
-
-	void SaveRenderStates();
-	void RestoreRenderStates();
-}
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
deleted file mode 100644
index 6b83b0e0d6..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-#include "Render.h"
-#include "FramebufferManager.h"
-#include "VideoConfig.h"
-#include "PixelShaderCache.h"
-#include "VertexShaderCache.h"
-#include "TextureConverter.h"
-#include "HW/Memmap.h"
-
-namespace DX9
-{
-
-// TODO: this is probably somewhere else
-#define SAFE_RELEASE(p) if (p) { (p)->Release(); (p) = NULL; }
-
-#undef CHECK
-#define CHECK(hr, Message, ...) if (FAILED(hr)) { PanicAlert(__FUNCTION__ "Failed in %s at line %d: " Message, __FILE__, __LINE__, __VA_ARGS__); }
-
-inline void GetSurface(IDirect3DTexture9* texture, IDirect3DSurface9** surface)
-{
-	if (!texture) return;
-	texture->GetSurfaceLevel(0, surface);
-}
-
-FramebufferManager::Efb FramebufferManager::s_efb;
-
-FramebufferManager::FramebufferManager()
-{
-	bool depth_textures_supported = true;
-	int target_width = Renderer::GetTargetWidth();
-	int target_height = Renderer::GetTargetHeight();
-	s_efb.color_surface_Format = D3DFMT_A8R8G8B8;
-
-	// EFB color texture - primary render target
-	HRESULT hr = D3D::dev->CreateTexture(target_width, target_height, 1, D3DUSAGE_RENDERTARGET, s_efb.color_surface_Format, 
-										D3DPOOL_DEFAULT, &s_efb.color_texture, NULL);
-	GetSurface(s_efb.color_texture, &s_efb.color_surface);
-	CHECK(hr, "Create color texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-
-	// Render buffer for AccessEFB (color data)
-	hr = D3D::dev->CreateTexture(1, 1, 1, D3DUSAGE_RENDERTARGET, s_efb.color_surface_Format, 
-									D3DPOOL_DEFAULT, &s_efb.colorRead_texture, NULL);
-	GetSurface(s_efb.colorRead_texture, &s_efb.color_ReadBuffer);
-	CHECK(hr, "Create Color Read Texture (hr=%#x)", hr);
-
-	// AccessEFB - Sysmem buffer used to retrieve the pixel data from color_ReadBuffer
-	hr = D3D::dev->CreateOffscreenPlainSurface(1, 1, s_efb.color_surface_Format, D3DPOOL_SYSTEMMEM, &s_efb.color_OffScreenReadBuffer, NULL);
-	CHECK(hr, "Create offscreen color surface (hr=%#x)", hr);
-
-	// Select a Z-buffer texture format with hardware support
-	s_efb.depth_surface_Format = D3D::GetSupportedDepthTextureFormat();
-	if (s_efb.depth_surface_Format == D3DFMT_UNKNOWN)
-	{
-		// workaround for Intel GPUs etc: only create a depth _surface_
-		depth_textures_supported = false;
-		s_efb.depth_surface_Format = D3D::GetSupportedDepthSurfaceFormat(s_efb.color_surface_Format);
-		ERROR_LOG(VIDEO, "No supported depth texture format found, disabling Z peeks for EFB access.");
-	}
-
-	if (depth_textures_supported)
-	{
-		// EFB depth buffer - primary depth buffer
-		hr = D3D::dev->CreateTexture(target_width, target_height, 1, D3DUSAGE_DEPTHSTENCIL, s_efb.depth_surface_Format, 
-									 D3DPOOL_DEFAULT, &s_efb.depth_texture, NULL);
-		GetSurface(s_efb.depth_texture, &s_efb.depth_surface);
-		CHECK(hr, "Framebuffer depth texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-
-		// Render buffer for AccessEFB (depth data)
-		D3DFORMAT DepthTexFormats[2];
-		DepthTexFormats[0] = D3DFMT_D24X8;
-		// This is expected to work on all hardware
-		DepthTexFormats[1] = D3DFMT_A8R8G8B8;
-
-		for (int i = 0; i < 2; ++i)
-		{
-			if (D3D::CheckTextureSupport(D3DUSAGE_RENDERTARGET, DepthTexFormats[i]))
-			{
-				s_efb.depth_ReadBuffer_Format = DepthTexFormats[i];
-				break;
-			}
-		}
-		hr = D3D::dev->CreateTexture(4, 4, 1, D3DUSAGE_RENDERTARGET, s_efb.depth_ReadBuffer_Format, 
-									D3DPOOL_DEFAULT, &s_efb.depthRead_texture, NULL);
-		GetSurface(s_efb.depthRead_texture, &s_efb.depth_ReadBuffer);
-		CHECK(hr, "Create depth read texture (hr=%#x)", hr);
-
-		// AccessEFB - Sysmem buffer used to retrieve the pixel data from depth_ReadBuffer
-		hr = D3D::dev->CreateOffscreenPlainSurface(4, 4, s_efb.depth_ReadBuffer_Format, D3DPOOL_SYSTEMMEM, &s_efb.depth_OffScreenReadBuffer, NULL);
-		CHECK(hr, "Create depth offscreen surface (hr=%#x)", hr);
-	}
-	else if (s_efb.depth_surface_Format)
-	{
-		// just create a depth surface
-		hr = D3D::dev->CreateDepthStencilSurface(target_width, target_height, s_efb.depth_surface_Format, D3DMULTISAMPLE_NONE, 0, FALSE, &s_efb.depth_surface, NULL);
-		CHECK(hr, "Framebuffer depth surface (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-	}
-
-	// ReinterpretPixelData - EFB color data will be copy-converted to this texture and the buffers are swapped then
-	hr = D3D::dev->CreateTexture(target_width, target_height, 1, D3DUSAGE_RENDERTARGET, s_efb.color_surface_Format,
-										D3DPOOL_DEFAULT, &s_efb.color_reinterpret_texture, NULL);
-	GetSurface(s_efb.color_reinterpret_texture, &s_efb.color_reinterpret_surface);
-	CHECK(hr, "Create color reinterpret texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
-}
-
-FramebufferManager::~FramebufferManager()
-{
-	SAFE_RELEASE(s_efb.depth_surface);
-	SAFE_RELEASE(s_efb.color_surface);
-	SAFE_RELEASE(s_efb.color_ReadBuffer);
-	SAFE_RELEASE(s_efb.depth_ReadBuffer);
-	SAFE_RELEASE(s_efb.color_OffScreenReadBuffer);
-	SAFE_RELEASE(s_efb.depth_OffScreenReadBuffer);
-	SAFE_RELEASE(s_efb.color_texture);
-	SAFE_RELEASE(s_efb.colorRead_texture);
-	SAFE_RELEASE(s_efb.depth_texture);
-	SAFE_RELEASE(s_efb.depthRead_texture);
-	SAFE_RELEASE(s_efb.color_reinterpret_texture);
-	SAFE_RELEASE(s_efb.color_reinterpret_surface);
-	s_efb.color_surface_Format = D3DFMT_UNKNOWN;
-	s_efb.depth_surface_Format = D3DFMT_UNKNOWN;
-	s_efb.depth_ReadBuffer_Format = D3DFMT_UNKNOWN;
-}
-
-XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height)
-{
-	LPDIRECT3DTEXTURE9 tex;
-	D3D::dev->CreateTexture(target_width, target_height, 1, D3DUSAGE_RENDERTARGET,
-		s_efb.color_surface_Format, D3DPOOL_DEFAULT, &tex, NULL);
-
-	return new XFBSource(tex);
-}
-
-void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc)
-{
-	TargetRectangle targetSource;
-
-	targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight());
-	targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight());
-	targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth());
-	targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth());
-
-	*width = targetSource.right - targetSource.left;
-	*height = targetSource.bottom - targetSource.top;
-}
-
-void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
-	const MathUtil::Rectangle<float> &drawrc, int width, int height) const
-{
-	D3D::drawShadedTexSubQuad(texture, &sourcerc, texWidth, texHeight, &drawrc, width , height,
-		PixelShaderCache::GetColorCopyProgram(0), VertexShaderCache::GetSimpleVertexShader(0));
-}
-
-void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
-{
-	TextureConverter::DecodeToTexture(xfbAddr, fbWidth, fbHeight, texture);
-}
-
-void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma)
-{
-	u8* xfb_in_ram = Memory::GetPointer(xfbAddr);
-	if (!xfb_in_ram)
-	{
-		WARN_LOG(VIDEO, "Tried to copy to invalid XFB address");
-		return;
-	}
-
-	TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
-	TextureConverter::EncodeToRamYUYV(GetEFBColorTexture(), targetRc, xfb_in_ram, fbWidth, fbHeight,Gamma);
-}
-
-void XFBSource::CopyEFB(float Gamma)
-{
-	g_renderer->ResetAPIState(); // reset any game specific settings
-	
-	// Copy EFB data to XFB and restore render target again
-	LPDIRECT3DSURFACE9 Rendersurf = NULL;
-	texture->GetSurfaceLevel(0, &Rendersurf);
-	D3D::dev->SetDepthStencilSurface(NULL);
-	D3D::dev->SetRenderTarget(0, Rendersurf);
-
-	D3DVIEWPORT9 vp;
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = texWidth;
-	vp.Height = texHeight;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-	D3D::dev->SetViewport(&vp);
-
-	RECT sourcerect;
-	sourcerect.bottom = sourceRc.bottom;
-	sourcerect.left = sourceRc.left;
-	sourcerect.right = sourceRc.right;
-	sourcerect.top = sourceRc.top;
-
-	D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-	D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-
-	D3D::drawShadedTexQuad(
-		FramebufferManager::GetEFBColorTexture(), 
-		&sourcerect, 
-		Renderer::GetTargetWidth(), 
-		Renderer::GetTargetHeight(), 
-		texWidth, 
-		texHeight, 
-		PixelShaderCache::GetColorCopyProgram( g_ActiveConfig.iMultisampleMode), 
-		VertexShaderCache::GetSimpleVertexShader( g_ActiveConfig.iMultisampleMode),
-		Gamma);
-
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-	D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER);
-	D3D::SetTexture(0, NULL);
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-
-	Rendersurf->Release();
-	
-	g_renderer->RestoreAPIState();
-}
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h
deleted file mode 100644
index 66cdc2ec99..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "D3DBase.h"
-#include "FramebufferManagerBase.h"
-
-// On the GameCube, the game sends a request for the graphics processor to
-// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
-// called the XFB (External Framebuffer). The size and location of the XFB is
-// decided at the time of the copy, and the format is always YUYV. The video
-// interface is given a pointer to the XFB, which will be decoded and
-// displayed on the TV.
-//
-// There are two ways for Dolphin to emulate this:
-//
-// Real XFB mode:
-//
-// Dolphin will behave like the GameCube and encode the EFB to
-// a portion of GameCube RAM. The emulated video interface will decode the data
-// for output to the screen.
-//
-// Advantages: Behaves exactly like the GameCube.
-// Disadvantages: Resolution will be limited.
-//
-// Virtual XFB mode:
-//
-// When a request is made to copy the EFB to an XFB, Dolphin
-// will remember the RAM location and size of the XFB in a Virtual XFB list.
-// The video interface will look up the XFB in the list and use the enhanced
-// data stored there, if available.
-//
-// Advantages: Enables high resolution graphics, better than real hardware.
-// Disadvantages: If the GameCube CPU writes directly to the XFB (which is
-// possible but uncommon), the Virtual XFB will not capture this information.
-
-namespace DX9
-{
-
-struct XFBSource : public XFBSourceBase
-{
-	XFBSource(LPDIRECT3DTEXTURE9 tex) : texture(tex) {}
-	~XFBSource() { texture->Release(); }
-
-	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
-	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
-	void CopyEFB(float Gamma);
-
-	LPDIRECT3DTEXTURE9 const texture;
-};
-
-class FramebufferManager : public FramebufferManagerBase
-{
-public:
-	FramebufferManager();
-	~FramebufferManager();
-
-	static LPDIRECT3DTEXTURE9 GetEFBColorTexture() { return s_efb.color_texture; }
-	static LPDIRECT3DTEXTURE9 GetEFBDepthTexture() { return s_efb.depth_texture; }
-
-	static LPDIRECT3DSURFACE9 GetEFBColorRTSurface() { return s_efb.color_surface; }
-	static LPDIRECT3DSURFACE9 GetEFBDepthRTSurface() { return s_efb.depth_surface; }
-
-	static LPDIRECT3DSURFACE9 GetEFBColorOffScreenRTSurface() { return s_efb.color_OffScreenReadBuffer; }
-	static LPDIRECT3DSURFACE9 GetEFBDepthOffScreenRTSurface() { return s_efb.depth_OffScreenReadBuffer; }
-
-	static D3DFORMAT GetEFBDepthRTSurfaceFormat() { return s_efb.depth_surface_Format; }
-	static D3DFORMAT GetEFBColorRTSurfaceFormat() { return s_efb.color_surface_Format; }
-	static D3DFORMAT GetEFBDepthReadSurfaceFormat() { return s_efb.depth_ReadBuffer_Format; }
-
-	static LPDIRECT3DSURFACE9 GetEFBColorReadSurface() { return s_efb.color_ReadBuffer; }
-	static LPDIRECT3DSURFACE9 GetEFBDepthReadSurface() { return s_efb.depth_ReadBuffer; }
-
-	static LPDIRECT3DTEXTURE9 GetEFBColorReinterpretTexture() { return s_efb.color_reinterpret_texture; }
-	static LPDIRECT3DSURFACE9 GetEFBColorReinterpretSurface() { return s_efb.color_reinterpret_surface; }
-	static void SwapReinterpretTexture()
-	{
-		LPDIRECT3DSURFACE9 swapsurf = GetEFBColorReinterpretSurface();
-		LPDIRECT3DTEXTURE9 swaptex = GetEFBColorReinterpretTexture();
-		s_efb.color_reinterpret_surface = GetEFBColorRTSurface();
-		s_efb.color_reinterpret_texture = GetEFBColorTexture();
-		s_efb.color_surface = swapsurf;
-		s_efb.color_texture = swaptex;
-	}
-
-private:
-	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
-	void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc);
-
-	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
-
-	static struct Efb
-	{
-		Efb() : color_texture(NULL), colorRead_texture(NULL), depth_texture(NULL), depthRead_texture(NULL),
-				color_reinterpret_texture(NULL), color_reinterpret_surface(NULL),
-				depth_surface(NULL), color_surface(NULL), color_ReadBuffer(NULL), depth_ReadBuffer(NULL),
-				color_OffScreenReadBuffer(NULL), depth_OffScreenReadBuffer(NULL),
-				color_surface_Format(D3DFMT_UNKNOWN), depth_surface_Format(D3DFMT_UNKNOWN),
-				depth_ReadBuffer_Format(D3DFMT_UNKNOWN) {}
-
-		LPDIRECT3DTEXTURE9 color_texture;//Texture that contains the color data of the render target
-		LPDIRECT3DTEXTURE9 colorRead_texture;//1 pixel texture for temporal data store
-		LPDIRECT3DTEXTURE9 depth_texture;//Texture that contains the depth data of the render target
-		LPDIRECT3DTEXTURE9 depthRead_texture;//4 pixel texture for temporal data store
-
-		LPDIRECT3DTEXTURE9 color_reinterpret_texture;//buffer used for ReinterpretPixelData
-		LPDIRECT3DSURFACE9 color_reinterpret_surface;//corresponding surface
-
-		LPDIRECT3DSURFACE9 depth_surface;//Depth Surface
-		LPDIRECT3DSURFACE9 color_surface;//Color Surface
-		LPDIRECT3DSURFACE9 color_ReadBuffer;//Surface 0 of colorRead_texture
-		LPDIRECT3DSURFACE9 depth_ReadBuffer;//Surface 0 of depthRead_texture
-		LPDIRECT3DSURFACE9 color_OffScreenReadBuffer;//System memory Surface that can be locked to retrieve the data
-		LPDIRECT3DSURFACE9 depth_OffScreenReadBuffer;//System memory Surface that can be locked to retrieve the data
-
-		D3DFORMAT color_surface_Format;//Format of the color Surface
-		D3DFORMAT depth_surface_Format;//Format of the Depth Surface
-		D3DFORMAT depth_ReadBuffer_Format;//Format of the Depth color Read Surface
-	} s_efb;
-};
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h b/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
deleted file mode 100644
index 89800694e8..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-
-#include "Common.h"
-#include "VideoConfig.h"
-#include "main.h"
-
-#include "VideoCommon.h"
-
-#endif // _GLOBALS_H_
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
deleted file mode 100644
index 69de7e0a58..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "D3DBase.h"
-
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "MemoryUtil.h"
-#include "VertexShaderGen.h"
-
-#include "CPMemory.h"
-#include "NativeVertexFormat.h"
-#include "VertexManager.h"
-
-namespace DX9
-{
-
-class D3DVertexFormat : public NativeVertexFormat
-{
-	LPDIRECT3DVERTEXDECLARATION9 d3d_decl;
-
-public:
-	D3DVertexFormat() : d3d_decl(NULL) {}
-	~D3DVertexFormat();
-	virtual void Initialize(const PortableVertexDeclaration &_vtx_decl);
-	virtual void SetupVertexPointers();
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	D3DVERTEXELEMENT9 elements[32];
-	int num_elements;
-#endif
-};
-
-NativeVertexFormat* VertexManager::CreateNativeVertexFormat()
-{
-	return new D3DVertexFormat();
-}
-
-void DX9::VertexManager::GetElements(NativeVertexFormat* format, D3DVERTEXELEMENT9** elems, int* num)
-{
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	*elems = ((D3DVertexFormat*)format)->elements;
-	*num = ((D3DVertexFormat*)format)->num_elements;
-#else
-	*elems = NULL;
-	*num = 0;
-#endif
-}
-
-D3DVertexFormat::~D3DVertexFormat()
-{
-	if (d3d_decl)
-	{
-		d3d_decl->Release();
-		d3d_decl = NULL;
-	}
-}
-
-D3DDECLTYPE VarToD3D(VarType t, int size)
-{
-	if (t < 0 || t > 4) {
-		PanicAlert("VarToD3D: Invalid VarType %i", t);
-	}
-	static const D3DDECLTYPE lookup1[5] = {
-		D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_FLOAT1,
-	};
-	static const D3DDECLTYPE lookup2[5] = {
-		D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_SHORT2N, D3DDECLTYPE_USHORT2N, D3DDECLTYPE_FLOAT2,
-	};
-	static const D3DDECLTYPE lookup3[5] = {
-		D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_FLOAT3,
-	};
-	// Sadly, D3D9 has no SBYTE4N. D3D10 does, though.
-	static const D3DDECLTYPE lookup4[5] = {
-		D3DDECLTYPE_UNUSED, D3DDECLTYPE_UBYTE4N, D3DDECLTYPE_SHORT4N, D3DDECLTYPE_USHORT4N, D3DDECLTYPE_FLOAT4,
-	};
-	D3DDECLTYPE retval = D3DDECLTYPE_UNUSED;
-	switch (size)
-	{
-	case 1: retval = lookup1[t]; break;
-	case 2: retval = lookup2[t]; break;
-	case 3: retval = lookup3[t]; break;
-	case 4: retval = lookup4[t]; break;
-	default: break;
-	}
-	if (retval == D3DDECLTYPE_UNUSED) {
-		PanicAlert("VarToD3D: Invalid type/size combo %i , %i", (int)t, size);
-	}
-	return retval;
-}
-
-void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
-{
-	vertex_stride = _vtx_decl.stride;
-
-	D3DVERTEXELEMENT9 elems[32];
-	memset(elems, 0, sizeof(elems));
-
-	// There's only one stream and it's 0, so the above memset takes care of that - no need to set Stream.
-	// Same for method.
-	
-	// So, here we go. First position:
-	int elem_idx = 0;
-	elems[elem_idx].Offset = 0;  // Positions are always first, at position 0. Always float3.
-	elems[elem_idx].Type = D3DDECLTYPE_FLOAT3;
-	elems[elem_idx].Usage = D3DDECLUSAGE_POSITION;
-	++elem_idx;
-
-	for (int i = 0; i < 3; i++)
-	{
-		if (_vtx_decl.normal_offset[i] > 0) 
-		{
-			elems[elem_idx].Offset = _vtx_decl.normal_offset[i];
-			elems[elem_idx].Type = VarToD3D(_vtx_decl.normal_gl_type, _vtx_decl.normal_gl_size);
-			elems[elem_idx].Usage = D3DDECLUSAGE_NORMAL;
-			elems[elem_idx].UsageIndex = i;
-			++elem_idx;
-		}
-	}
-
-	for (int i = 0; i < 2; i++)
-	{
-		if (_vtx_decl.color_offset[i] > 0) 
-		{
-			elems[elem_idx].Offset = _vtx_decl.color_offset[i];
-			elems[elem_idx].Type = VarToD3D(_vtx_decl.color_gl_type, 4);
-			elems[elem_idx].Usage = D3DDECLUSAGE_COLOR;
-			elems[elem_idx].UsageIndex = i;
-			++elem_idx;
-		}
-	}
-
-	for (int i = 0; i < 8; i++)
-	{
-		if (_vtx_decl.texcoord_offset[i] > 0)
-		{
-			elems[elem_idx].Offset = _vtx_decl.texcoord_offset[i];
-			elems[elem_idx].Type = VarToD3D(_vtx_decl.texcoord_gl_type[i], _vtx_decl.texcoord_size[i]);
-			elems[elem_idx].Usage = D3DDECLUSAGE_TEXCOORD;
-			elems[elem_idx].UsageIndex = i;
-			++elem_idx;
-		}
-	}
-
-	if (_vtx_decl.posmtx_offset != -1)
-	{
-		elems[elem_idx].Offset = _vtx_decl.posmtx_offset;
-		elems[elem_idx].Usage = D3DDECLUSAGE_BLENDINDICES;
-		elems[elem_idx].Type = D3DDECLTYPE_D3DCOLOR;
-		elems[elem_idx].UsageIndex = 0;
-		++elem_idx;
-	}
-
-	// End marker
-	elems[elem_idx].Stream = 0xff;
-	elems[elem_idx].Type = D3DDECLTYPE_UNUSED;
-	++elem_idx;
-
-	if (FAILED(DX9::D3D::dev->CreateVertexDeclaration(elems, &d3d_decl)))
-	{
-		PanicAlert("Failed to create D3D vertex declaration!");
-		return;
-	}
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	memcpy(&elements, elems, sizeof(elems));
-	num_elements = elem_idx;
-#endif
-}
-
-void D3DVertexFormat::SetupVertexPointers()
-{
-	if (d3d_decl)
-		DX9::D3D::SetVertexDeclaration(d3d_decl);
-	else
-		ERROR_LOG(VIDEO, "Invalid D3D decl");
-}
-
-} // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp
deleted file mode 100644
index 3e6f058fdd..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "RenderBase.h"
-
-#include "D3DBase.h"
-#include "PerfQuery.h"
-
-namespace DX9 {
-
-PerfQuery::PerfQuery()
-	: m_query_read_pos()
-	, m_query_count()
-{
-	
-}
-
-PerfQuery::~PerfQuery()
-{
-	
-}
-
-void PerfQuery::CreateDeviceObjects()
-{
-	for (int i = 0; i != ArraySize(m_query_buffer); ++i)
-	{
-		D3D::dev->CreateQuery(D3DQUERYTYPE_OCCLUSION, &m_query_buffer[i].query);
-	}
-	ResetQuery();
-}
-void PerfQuery::DestroyDeviceObjects()
-{
-	for (int i = 0; i != ArraySize(m_query_buffer); ++i)
-	{
-		m_query_buffer[i].query->Release();
-	}
-}
-
-void PerfQuery::EnableQuery(PerfQueryGroup type)
-{
-    if (!ShouldEmulate())
-		return;
-	// Is this sane?
-	if (m_query_count > ArraySize(m_query_buffer) / 2)
-		WeakFlush();
-
-	if (ArraySize(m_query_buffer) == m_query_count)
-	{
-		// TODO
-		FlushOne();
-		ERROR_LOG(VIDEO, "Flushed query buffer early!");
-	}
-
-	// start query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)];
-		entry.query->Issue(D3DISSUE_BEGIN);
-		entry.query_type = type;
-		++m_query_count;
-	}
-}
-
-void PerfQuery::DisableQuery(PerfQueryGroup type)
-{
-    if (!ShouldEmulate())
-		return;
-	// stop query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ArraySize(m_query_buffer)-1) % ArraySize(m_query_buffer)];
-		entry.query->Issue(D3DISSUE_END);
-	}
-}
-
-void PerfQuery::ResetQuery()
-{
-	m_query_count = 0;
-	std::fill_n(m_results, ArraySize(m_results), 0);
-}
-
-u32 PerfQuery::GetQueryResult(PerfQueryType type)
-{
-    if (!ShouldEmulate())
-		return 0;
-	u32 result = 0;
-
-	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
-	{
-		result = m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
-	{
-		result = m_results[PQG_ZCOMP];
-	}
-	else if (type == PQ_BLEND_INPUT)
-	{
-		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_EFB_COPY_CLOCKS)
-	{
-		result = m_results[PQG_EFB_COPY_CLOCKS];
-	}
-
-	return result / 4;
-}
-
-void PerfQuery::FlushOne()
-{
-    if (!ShouldEmulate())
-		return;
-	auto& entry = m_query_buffer[m_query_read_pos];
-
-	DWORD result = 0;
-	HRESULT hr = S_FALSE;
-	while (hr != S_OK && hr != D3DERR_DEVICELOST)
-	{
-		// TODO: Might cause us to be stuck in an infinite loop!
-		hr = entry.query->GetData(&result, sizeof(result), D3DGETDATA_FLUSH);
-	}
-
-	// NOTE: Reported pixel metrics should be referenced to native resolution
-	m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
-
-	m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer);
-	--m_query_count;
-}
-
-// TODO: could selectively flush things, but I don't think that will do much
-void PerfQuery::FlushResults()
-{
-    if (!ShouldEmulate())
-		return;
-	while (!IsFlushed())
-		FlushOne();
-}
-
-void PerfQuery::WeakFlush()
-{
-    if (!ShouldEmulate())
-		return;
-	while (!IsFlushed())
-	{
-		auto& entry = m_query_buffer[m_query_read_pos];
-
-		DWORD result = 0;
-		HRESULT hr = entry.query->GetData(&result, sizeof(result), 0);
-
-		if (hr == S_OK)
-		{
-			// NOTE: Reported pixel metrics should be referenced to native resolution
-			m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
-
-			m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer);
-			--m_query_count;
-		}
-		else
-		{
-			break;
-		}
-	}
-}
-
-bool PerfQuery::IsFlushed() const
-{
-    if (!ShouldEmulate())
-		return true;
-	return 0 == m_query_count;
-}
-
-
-} // namespace
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h
deleted file mode 100644
index 9b8f637655..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _PERFQUERY_H_
-#define _PERFQUERY_H_
-
-#include "PerfQueryBase.h"
-
-namespace DX9 {
-
-class PerfQuery : public PerfQueryBase
-{
-public:
-	PerfQuery();
-	~PerfQuery();
-
-	void EnableQuery(PerfQueryGroup type);
-	void DisableQuery(PerfQueryGroup type);
-	void ResetQuery();
-	u32 GetQueryResult(PerfQueryType type);
-	void FlushResults();
-	bool IsFlushed() const;
-	void CreateDeviceObjects();
-	void DestroyDeviceObjects();
-
-private:
-	struct ActiveQuery
-	{
-		IDirect3DQuery9* query;
-		PerfQueryGroup query_type;
-	};
-
-	void WeakFlush();	
-	// Only use when non-empty
-	void FlushOne();
-
-	// when testing in SMS: 64 was too small, 128 was ok
-	static const int PERF_QUERY_BUFFER_SIZE = 512;
-
-	ActiveQuery m_query_buffer[PERF_QUERY_BUFFER_SIZE];
-	int m_query_read_pos;
-
-	// TODO: sloppy
-	volatile int m_query_count;
-	volatile u32 m_results[PQG_NUM_MEMBERS];
-};
-
-} // namespace
-
-#endif // _PERFQUERY_H_
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
deleted file mode 100644
index ea6503e9e0..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-#include <set>
-#include <locale.h>
-
-#include "Common.h"
-#include "Hash.h"
-#include "FileUtil.h"
-#include "LinearDiskCache.h"
-
-#include "Globals.h"
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "Statistics.h"
-#include "VideoConfig.h"
-#include "PixelShaderGen.h"
-#include "PixelShaderManager.h"
-#include "PixelShaderCache.h"
-#include "VertexLoader.h"
-#include "BPMemory.h"
-#include "XFMemory.h"
-#include "ImageWrite.h"
-#include "Debugger.h"
-#include "ConfigManager.h"
-
-namespace DX9
-{
-
-PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
-const PixelShaderCache::PSCacheEntry *PixelShaderCache::last_entry;
-PixelShaderUid PixelShaderCache::last_uid;
-UidChecker<PixelShaderUid,PixelShaderCode> PixelShaderCache::pixel_uid_checker;
-
-static LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
-static std::set<u32> unique_shaders;
-
-#define MAX_SSAA_SHADERS 3
-enum
-{
-	COPY_TYPE_DIRECT,
-	COPY_TYPE_MATRIXCOLOR,
-	NUM_COPY_TYPES
-};
-enum
-{
-	DEPTH_CONVERSION_TYPE_NONE,
-	DEPTH_CONVERSION_TYPE_ON,
-	NUM_DEPTH_CONVERSION_TYPES
-};
-
-static LPDIRECT3DPIXELSHADER9 s_CopyProgram[NUM_COPY_TYPES][NUM_DEPTH_CONVERSION_TYPES][MAX_SSAA_SHADERS];
-static LPDIRECT3DPIXELSHADER9 s_ClearProgram = NULL;
-static LPDIRECT3DPIXELSHADER9 s_rgba6_to_rgb8 = NULL;
-static LPDIRECT3DPIXELSHADER9 s_rgb8_to_rgba6 = NULL;
-
-class PixelShaderCacheInserter : public LinearDiskCacheReader<PixelShaderUid, u8>
-{
-public:
-	void Read(const PixelShaderUid &key, const u8 *value, u32 value_size)
-	{
-		PixelShaderCache::InsertByteCode(key, value, value_size, false);
-	}
-};
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::GetColorMatrixProgram(int SSAAMode)
-{
-	return s_CopyProgram[COPY_TYPE_MATRIXCOLOR][DEPTH_CONVERSION_TYPE_NONE][SSAAMode % MAX_SSAA_SHADERS];
-}
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::GetDepthMatrixProgram(int SSAAMode, bool depthConversion)
-{
-	return s_CopyProgram[COPY_TYPE_MATRIXCOLOR][depthConversion ? DEPTH_CONVERSION_TYPE_ON : DEPTH_CONVERSION_TYPE_NONE][SSAAMode % MAX_SSAA_SHADERS];
-}
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::GetColorCopyProgram(int SSAAMode)
-{
-	return s_CopyProgram[COPY_TYPE_DIRECT][DEPTH_CONVERSION_TYPE_NONE][SSAAMode % MAX_SSAA_SHADERS];
-}
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::GetClearProgram()
-{
-	return s_ClearProgram;
-}
-
-static LPDIRECT3DPIXELSHADER9 s_rgb8 = NULL;
-static LPDIRECT3DPIXELSHADER9 s_rgba6 = NULL;
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::ReinterpRGBA6ToRGB8()
-{
-	const char code[] =
-	{
-		"uniform sampler samp0 : register(s0);\n"
-		"void main(\n"
-		"			out float4 ocol0 : COLOR0,\n"
-		"			in float2 uv0 : TEXCOORD0){\n"
-		"	ocol0 = tex2D(samp0,uv0);\n"
-		"	float4 src6 = round(ocol0 * 63.f);\n"
-		"	ocol0.r = floor(src6.r*4.f) + floor(src6.g/16.f);\n" // dst8r = (src6r<<2)|(src6g>>4);
-		"	ocol0.g = frac(src6.g/16.f)*16.f*16.f + floor(src6.b/4.f);\n" // dst8g = ((src6g&0xF)<<4)|(src6b>>2);
-		"	ocol0.b = frac(src6.b/4.f)*4.f*64.f + src6.a;\n" // dst8b = ((src6b&0x3)<<6)|src6a;
-		"	ocol0.a = 255.f;\n"
-		"	ocol0 /= 255.f;\n"
-		"}\n"
-	};
-
-	if (!s_rgba6_to_rgb8)
-		s_rgba6_to_rgb8 = D3D::CompileAndCreatePixelShader(code, (int)strlen(code));
-
-	return s_rgba6_to_rgb8;
-}
-
-LPDIRECT3DPIXELSHADER9 PixelShaderCache::ReinterpRGB8ToRGBA6()
-{
-	/* old code here for reference
-	const char code[] =
-	{
-	"uniform sampler samp0 : register(s0);\n"
-	"void main(\n"
-	"			out float4 ocol0 : COLOR0,\n"
-	"			in float2 uv0 : TEXCOORD0){\n"
-	"	ocol0 = tex2D(samp0,uv0);\n"
-	"	float4 src8 = round(ocol0*255.f);\n"
-	"	ocol0.r = floor(src8.r/4.f);\n" // dst6r = src8r>>2;
-	"	ocol0.g = frac(src8.r/4.f)*4.f*16.f + floor(src8.g/16.f);\n" // dst6g = ((src8r&0x3)<<4)|(src8g>>4);
-	"	ocol0.b = frac(src8.g/16.f)*16.f*4.f + floor(src8.b/64.f);\n" // dst6b = ((src8g&0xF)<<2)|(src8b>>6);
-	"	ocol0.a = frac(src8.b/64.f)*64.f;\n" // dst6a = src8b&0x3F;
-	"	ocol0 /= 63.f;\n"
-	"}\n"
-	};
-	*/
-	const char code[] =
-	{
-		"uniform sampler samp0 : register(s0);\n"
-		"void main(\n"
-		"out float4 ocol0 : COLOR0,\n"
-		"in float2 uv0 : TEXCOORD0){\n"
-		"float4 temp1 = float4(1.0f/4.0f,1.0f/16.0f,1.0f/64.0f,0.0f);\n"
-		"float4 temp2 = float4(1.0f,64.0f,255.0f,1.0f/63.0f);\n"
-		"float4 src8 = round(tex2D(samp0,uv0)*temp2.z) * temp1;\n"
-		"ocol0 = (frac(src8.wxyz) * temp2.xyyy + floor(src8)) * temp2.w;\n"
-		"}\n"
-	};
-	if (!s_rgb8_to_rgba6) s_rgb8_to_rgba6 = D3D::CompileAndCreatePixelShader(code, (int)strlen(code));
-	return s_rgb8_to_rgba6;
-}
-
-#define WRITE p+=sprintf
-
-static LPDIRECT3DPIXELSHADER9 CreateCopyShader(int copyMatrixType, int depthConversionType, int SSAAMode)
-{
-	//Used for Copy/resolve the color buffer
-	//Color conversion Programs
-	//Depth copy programs
-	// this should create the same shaders as before (plus some extras added for DF16), just... more manageably than listing the full program for each combination
-	char text[3072];
-
-	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
-	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
-	text[sizeof(text) - 1] = 0x7C;  // canary
-
-	char* p = text;
-	WRITE(p, "// Copy/Color Matrix/Depth Matrix shader (matrix=%d, depth=%d, ssaa=%d)\n", copyMatrixType, depthConversionType, SSAAMode);
-
-	WRITE(p, "uniform sampler samp0 : register(s0);\n");
-	if(copyMatrixType == COPY_TYPE_MATRIXCOLOR)
-		WRITE(p, "uniform float4 cColMatrix[7] : register(c%d);\n", C_COLORMATRIX);
-	WRITE(p, "void main(\n"
-		"out float4 ocol0 : COLOR0,\n");
-
-	switch(SSAAMode % MAX_SSAA_SHADERS)
-	{
-	case 0: // 1 Sample
-		WRITE(p, "in float2 uv0 : TEXCOORD0,\n"
-			"in float uv1 : TEXCOORD1){\n"
-			"float4 texcol = tex2D(samp0,uv0.xy);\n");
-		break;
-	case 1: // 4 Samples in 4x SSAA buffer
-		WRITE(p, "in float4 uv0 : TEXCOORD0,\n"
-			"in float uv1 : TEXCOORD1,\n"
-			"in float4 uv2 : TEXCOORD2,\n"
-			"in float4 uv3 : TEXCOORD3){\n"
-			"float4 texcol = (tex2D(samp0,uv2.xy) + tex2D(samp0,uv2.wz) + tex2D(samp0,uv3.xy) + tex2D(samp0,uv3.wz))*0.25f;\n");
-		break;
-	case 2: // 4 Samples in 9x SSAA buffer
-		WRITE(p, "in float4 uv0 : TEXCOORD0,\n"
-			"in float uv1 : TEXCOORD1,\n"
-			"in float4 uv2 : TEXCOORD2,\n"
-			"in float4 uv3 : TEXCOORD3){\n"
-			"float4 texcol = (tex2D(samp0,uv2.xy) + tex2D(samp0,uv2.wz) + tex2D(samp0,uv3.xy) + tex2D(samp0,uv3.wz))*0.25f;\n");
-		break;
-	}
-
-	if(depthConversionType != DEPTH_CONVERSION_TYPE_NONE)
-	{
-		// Watch out for the fire fumes effect in Metroid it's really sensitive to this,
-		// the lighting in RE0 is also way beyond sensitive since the "good value" is hardcoded and Dolphin is almost always off.
-		WRITE(p, "float4 EncodedDepth = frac(texcol.r * (16777215.f/16777216.f) * float4(1.0f,256.0f,256.0f*256.0f,1.0f));\n"
-			"texcol = floor(EncodedDepth * float4(256.f,256.f,256.f,15.0f)) / float4(255.0f,255.0f,255.0f,15.0f);\n");
-	}
-	else
-	{
-		//Apply Gamma Correction
-		WRITE(p, "texcol = pow(texcol,uv1.xxxx);\n");
-	}
-
-	if(copyMatrixType == COPY_TYPE_MATRIXCOLOR)
-	{
-		if(depthConversionType == DEPTH_CONVERSION_TYPE_NONE)
-			WRITE(p, "texcol = round(texcol * cColMatrix[5])*cColMatrix[6];\n");
-
-		WRITE(p, "ocol0 = float4(dot(texcol,cColMatrix[0]),dot(texcol,cColMatrix[1]),dot(texcol,cColMatrix[2]),dot(texcol,cColMatrix[3])) + cColMatrix[4];\n");
-	}
-	else
-		WRITE(p, "ocol0 = texcol;\n");
-
-	WRITE(p, "}\n");
-	if (text[sizeof(text) - 1] != 0x7C)
-		PanicAlert("PixelShaderCache copy shader generator - buffer too small, canary has been eaten!");
-
-	uselocale(old_locale); // restore locale
-	freelocale(locale);
-	return D3D::CompileAndCreatePixelShader(text, (int)strlen(text));
-}
-
-void PixelShaderCache::Init()
-{
-	last_entry = NULL;
-
-	//program used for clear screen
-	{
-		char pprog[3072];
-		sprintf(pprog, "void main(\n"
-			"out float4 ocol0 : COLOR0,\n"
-			" in float4 incol0 : COLOR0){\n"
-			"ocol0 = incol0;\n"
-			"}\n");
-		s_ClearProgram = D3D::CompileAndCreatePixelShader(pprog, (int)strlen(pprog));
-	}
-
-	int shaderModel = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF);
-	int maxConstants = (shaderModel < 3) ? 32 : ((shaderModel < 4) ? 224 : 65536);
-
-	// other screen copy/convert programs
-	for(int copyMatrixType = 0; copyMatrixType < NUM_COPY_TYPES; copyMatrixType++)
-	{
-		for(int depthType = 0; depthType < NUM_DEPTH_CONVERSION_TYPES; depthType++)
-		{
-			for(int ssaaMode = 0; ssaaMode < MAX_SSAA_SHADERS; ssaaMode++)
-			{
-				if(ssaaMode && !s_CopyProgram[copyMatrixType][depthType][ssaaMode-1]
-				|| depthType && !s_CopyProgram[copyMatrixType][depthType-1][ssaaMode]
-				|| copyMatrixType && !s_CopyProgram[copyMatrixType-1][depthType][ssaaMode])
-				{
-					// if it failed at a lower setting, it's going to fail here for the same reason it did there,
-					// so skip this attempt to avoid duplicate error messages.
-					s_CopyProgram[copyMatrixType][depthType][ssaaMode] = NULL;
-				}
-				else
-				{
-					s_CopyProgram[copyMatrixType][depthType][ssaaMode] = CreateCopyShader(copyMatrixType, depthType, ssaaMode);
-				}
-			}
-		}
-	}
-
-	Clear();
-
-	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX).c_str());
-
-	SETSTAT(stats.numPixelShadersCreated, 0);
-	SETSTAT(stats.numPixelShadersAlive, 0);
-
-	char cache_filename[MAX_PATH];
-	sprintf(cache_filename, "%sdx9-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-	PixelShaderCacheInserter inserter;
-	g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
-
-	if (g_Config.bEnableShaderDebugging)
-		Clear();
-}
-
-// ONLY to be used during shutdown.
-void PixelShaderCache::Clear()
-{
-	for (PSCache::iterator iter = PixelShaders.begin(); iter != PixelShaders.end(); iter++)
-		iter->second.Destroy();
-	PixelShaders.clear();
-	pixel_uid_checker.Invalidate();
-
-	last_entry = NULL;
-}
-
-void PixelShaderCache::Shutdown()
-{
-	for(int copyMatrixType = 0; copyMatrixType < NUM_COPY_TYPES; copyMatrixType++)
-		for(int depthType = 0; depthType < NUM_DEPTH_CONVERSION_TYPES; depthType++)
-			for(int ssaaMode = 0; ssaaMode < MAX_SSAA_SHADERS; ssaaMode++)
-				if(s_CopyProgram[copyMatrixType][depthType][ssaaMode]
-				&& (copyMatrixType == 0 || s_CopyProgram[copyMatrixType][depthType][ssaaMode] != s_CopyProgram[copyMatrixType-1][depthType][ssaaMode]))
-					s_CopyProgram[copyMatrixType][depthType][ssaaMode]->Release();
-
-				for(int copyMatrixType = 0; copyMatrixType < NUM_COPY_TYPES; copyMatrixType++)
-					for(int depthType = 0; depthType < NUM_DEPTH_CONVERSION_TYPES; depthType++)
-						for(int ssaaMode = 0; ssaaMode < MAX_SSAA_SHADERS; ssaaMode++)
-							s_CopyProgram[copyMatrixType][depthType][ssaaMode] = NULL;
-
-				if (s_ClearProgram) s_ClearProgram->Release();
-				s_ClearProgram = NULL;
-				if (s_rgb8_to_rgba6) s_rgb8_to_rgba6->Release();
-				s_rgb8_to_rgba6 = NULL;
-				if (s_rgba6_to_rgb8) s_rgba6_to_rgb8->Release();
-				s_rgba6_to_rgb8 = NULL;
-
-
-				Clear();
-				g_ps_disk_cache.Sync();
-				g_ps_disk_cache.Close();
-
-				unique_shaders.clear();
-}
-
-bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30;
-	PixelShaderUid uid;
-	GetPixelShaderUid(uid, dstAlphaMode, API_D3D9, components);
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		PixelShaderCode code;
-		GeneratePixelShaderCode(code, dstAlphaMode, API_D3D9, components);
-		pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
-	}
-
-	// Check if the shader is already set
-	if (last_entry)
-	{
-		if (uid == last_uid)
-		{
-			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-			return last_entry->shader != NULL;
-		}
-	}
-
-	last_uid = uid;
-
-	// Check if the shader is already in the cache
-	PSCache::iterator iter;
-	iter = PixelShaders.find(uid);
-	if (iter != PixelShaders.end())
-	{
-		const PSCacheEntry &entry = iter->second;
-		last_entry = &entry;
-
-		if (entry.shader) D3D::SetPixelShader(entry.shader);
-		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-		return (entry.shader != NULL);
-	}
-
-
-	// Need to compile a new shader
-	PixelShaderCode code;
-	GeneratePixelShaderCode(code, dstAlphaMode, api, components);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		u32 code_hash = HashAdler32((const u8 *)code.GetBuffer(), strlen(code.GetBuffer()));
-		unique_shaders.insert(code_hash);
-		SETSTAT(stats.numUniquePixelShaders, unique_shaders.size());
-	}
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) {
-		static int counter = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
-
-		SaveData(szTemp, code.GetBuffer());
-	}
-#endif
-
-	u8 *bytecode = 0;
-	int bytecodelen = 0;
-	if (!D3D::CompilePixelShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &bytecode, &bytecodelen)) {
-		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
-		return false;
-	}
-
-	// Insert the bytecode into the caches
-	g_ps_disk_cache.Append(uid, bytecode, bytecodelen);
-
-	// And insert it into the shader cache.
-	bool success = InsertByteCode(uid, bytecode, bytecodelen, true);
-	delete [] bytecode;
-
-	if (g_ActiveConfig.bEnableShaderDebugging && success)
-	{
-		PixelShaders[uid].code = code.GetBuffer();
-	}
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-	return success;
-}
-
-bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate)
-{
-	LPDIRECT3DPIXELSHADER9 shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
-
-	// Make an entry in the table
-	PSCacheEntry newentry;
-	newentry.shader = shader;
-	PixelShaders[uid] = newentry;
-	last_entry = &PixelShaders[uid];
-
-	if (!shader) {
-		// INCSTAT(stats.numPixelShadersFailed);
-		return false;
-	}
-
-	INCSTAT(stats.numPixelShadersCreated);
-	SETSTAT(stats.numPixelShadersAlive, PixelShaders.size());
-	if (activate)
-	{
-		D3D::SetPixelShader(shader);
-	}
-	return true;
-}
-
-void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	float f[4] = { f1, f2, f3, f4 };
-	DX9::D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
-}
-
-void Renderer::SetPSConstant4fv(unsigned int const_number, const float *f)
-{
-	DX9::D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
-}
-
-void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	DX9::D3D::dev->SetPixelShaderConstantF(const_number, f, count);
-}
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
deleted file mode 100644
index 733a68233a..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "Common.h"
-#include "LinearDiskCache.h"
-#include "D3DBase.h"
-
-#include <map>
-
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
-
-namespace DX9
-{
-
-typedef u32 tevhash;
-
-tevhash GetCurrentTEV();
-
-class PixelShaderCache
-{
-private:
-	struct PSCacheEntry
-	{
-		LPDIRECT3DPIXELSHADER9 shader;
-		bool owns_shader;
-
-		std::string code;
-
-		PSCacheEntry() : shader(NULL), owns_shader(true) {}
-		void Destroy()
-		{
-			if (shader && owns_shader)
-				shader->Release();
-			shader = NULL;
-		}
-	};
-
-	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
-
-	static PSCache PixelShaders;
-	static const PSCacheEntry *last_entry;
-	static PixelShaderUid last_uid;
-	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
-
-	static void Clear();
-
-public:
-	static void Init();
-	static void Shutdown();
-	static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 componets);
-	static bool InsertByteCode(const PixelShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate);
-	static LPDIRECT3DPIXELSHADER9 GetColorMatrixProgram(int SSAAMode);
-	static LPDIRECT3DPIXELSHADER9 GetColorCopyProgram(int SSAAMode);
-	static LPDIRECT3DPIXELSHADER9 GetDepthMatrixProgram(int SSAAMode, bool depthConversion);
-	static LPDIRECT3DPIXELSHADER9 GetClearProgram();	
-	static LPDIRECT3DPIXELSHADER9 ReinterpRGBA6ToRGB8();
-	static LPDIRECT3DPIXELSHADER9 ReinterpRGB8ToRGBA6();
-};
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
deleted file mode 100644
index 44c19dcace..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ /dev/null
@@ -1,1387 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <list>
-#include <d3dx9.h>
-
-#include "StringUtil.h"
-#include "Common.h"
-#include "Atomic.h"
-#include "FileUtil.h"
-#include "Thread.h"
-#include "Timer.h"
-#include "Statistics.h"
-#include "Host.h"
-
-#include "VideoConfig.h"
-#include "main.h"
-#include "VertexManager.h"
-#include "PixelEngine.h"
-#include "Render.h"
-#include "OpcodeDecoding.h"
-#include "BPStructs.h"
-#include "XFStructs.h"
-#include "D3DUtil.h"
-#include "VertexShaderManager.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderCache.h"
-#include "PixelShaderCache.h"
-#include "VertexLoaderManager.h"
-#include "TextureCache.h"
-#include "EmuWindow.h"
-#include "AVIDump.h"
-#include "OnScreenDisplay.h"
-#include "FramebufferManager.h"
-#include "Fifo.h"
-#include "TextureConverter.h"
-#include "DLCache.h"
-#include "Debugger.h"
-#include "Core.h"
-#include "Movie.h"
-#include "BPFunctions.h"
-#include "FPSCounter.h"
-#include "ConfigManager.h"
-#include "PerfQuery.h"
-#include <strsafe.h>
-
-
-namespace DX9
-{
-
-static int s_fps = 0;
-
-static u32 s_blendMode;
-static u32 s_LastAA;
-static bool IS_AMD;
-static float m_fMaxPointSize;
-static bool s_vsync;
-static char *st;
-
-static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL;
-
-
-void SetupDeviceObjects()
-{
-	D3D::font.Init();
-	VertexLoaderManager::Init();
-	g_framebuffer_manager = new FramebufferManager;
-
-	VertexShaderManager::Dirty();
-	PixelShaderManager::Dirty();
-	TextureConverter::Init();
-
-	// To avoid shader compilation stutters, read back all shaders from cache.
-	VertexShaderCache::Init();
-	PixelShaderCache::Init();
-	g_vertex_manager->CreateDeviceObjects();
-	((PerfQuery*)g_perf_query)->CreateDeviceObjects();
-	// Texture cache will recreate themselves over time.
-}
-
-// Kill off all POOL_DEFAULT device objects.
-void TeardownDeviceObjects()
-{
-	if(ScreenShootMEMSurface)
-		ScreenShootMEMSurface->Release();
-	ScreenShootMEMSurface = NULL;
-	D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
-	D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface());
-	delete g_framebuffer_manager;
-	((PerfQuery*)g_perf_query)->DestroyDeviceObjects();
-	D3D::font.Shutdown();
-	TextureCache::Invalidate();
-	VertexLoaderManager::Shutdown();
-	VertexShaderCache::Shutdown();
-	PixelShaderCache::Shutdown();
-	TextureConverter::Shutdown();
-	g_vertex_manager->DestroyDeviceObjects();
-}
-
-// Init functions
-Renderer::Renderer()
-{
-	InitFPSCounter();
-
-	st = new char[32768];
-
-	int fullScreenRes, x, y, w_temp, h_temp;
-	s_blendMode = 0;
-	// Multisample Anti-aliasing hasn't been implemented yet use supersamling instead
-	int backbuffer_ms_mode = 0;
-
-	Host_GetRenderWindowSize(x, y, w_temp, h_temp);
-
-	for (fullScreenRes = 0; fullScreenRes < (int)D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size(); fullScreenRes++)
-	{
-		if ((D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].xres == w_temp) && 
-			(D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].yres == h_temp))
-			break;
-	}
-	if (fullScreenRes == D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size())
-		fullScreenRes = 0;
-
-	D3D::Create(g_ActiveConfig.iAdapter, EmuWindow::GetWnd(), 
-		fullScreenRes, backbuffer_ms_mode, false);
-
-	IS_AMD = D3D::IsATIDevice();
-
-	// Decide framebuffer size
-	s_backbuffer_width = D3D::GetBackBufferWidth();
-	s_backbuffer_height = D3D::GetBackBufferHeight();
-
-	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
-	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
-
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-	s_LastAA = g_ActiveConfig.iMultisampleMode;
-	int SupersampleCoeficient = (s_LastAA % 3) + 1;
-
-	s_LastEFBScale = g_ActiveConfig.iEFBScale;
-	CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient);
-
-	// Make sure to use valid texture sizes
-	D3D::FixTextureSize(s_target_width, s_target_height);
-
-	// We're not using fixed function.
-	// Let's just set the matrices to identity to be sure.
-	D3DXMATRIX mtx;
-	D3DXMatrixIdentity(&mtx);
-	D3D::dev->SetTransform(D3DTS_VIEW, &mtx);
-	D3D::dev->SetTransform(D3DTS_WORLD, &mtx);
-
-	SetupDeviceObjects();
-
-	for (int stage = 0; stage < 8; stage++)
-		D3D::SetSamplerState(stage, D3DSAMP_MAXANISOTROPY, 1 << g_ActiveConfig.iMaxAnisotropy);
-
-	D3DVIEWPORT9 vp;
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = s_backbuffer_width;
-	vp.Height = s_backbuffer_height;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-	D3D::dev->SetViewport(&vp);
-	D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, 0x0, 0, 0);
-
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = s_target_width;
-	vp.Height = s_target_height;
-	D3D::dev->SetViewport(&vp);
-	D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0);
-	D3D::BeginFrame();
-	D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, true);
-	D3D::dev->CreateOffscreenPlainSurface(s_backbuffer_width,s_backbuffer_height, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &ScreenShootMEMSurface, NULL );
-	D3D::SetRenderState(D3DRS_POINTSCALEENABLE,false);
-	m_fMaxPointSize = D3D::GetCaps().MaxPointSize;
-	// Handle VSync on/off 
-	s_vsync = g_ActiveConfig.IsVSync();
-}
-
-Renderer::~Renderer()
-{
-	TeardownDeviceObjects();
-	D3D::EndFrame();
-	D3D::Present();
-	D3D::Close();
-
-	delete[] st;
-}
-
-void Renderer::RenderText(const char *text, int left, int top, u32 color)
-{
-	D3D::font.DrawTextScaled((float)left, (float)top, 20, 20, 0.0f, color, text);
-}
-
-TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
-{
-	TargetRectangle result;
-	result.left   = EFBToScaledX(rc.left);
-	result.top    = EFBToScaledY(rc.top);
-	result.right  = EFBToScaledX(rc.right);
-	result.bottom = EFBToScaledY(rc.bottom);
-	return result;
-}
-
-}
-
-void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
-{
-	for (int y = 0; y < h; y++)
-	{
-		auto line = in + (h - y - 1) * p;
-		for (int x = 0; x < w; x++)
-		{
-			memcpy(out, line, 3);
-			out += 3;
-			line += 4;
-		}
-	}
-}
-
-namespace DX9
-{
-
-// With D3D, we have to resize the backbuffer if the window changed
-// size.
-bool Renderer::CheckForResize()
-{
-	while (EmuWindow::IsSizing())
-		Sleep(10);
-
-	if (EmuWindow::GetParentWnd())
-	{
-		// Re-stretch window to parent window size again, if it has a parent window.
-		RECT rcParentWindow;
-		GetWindowRect(EmuWindow::GetParentWnd(), &rcParentWindow);
-		int width = rcParentWindow.right - rcParentWindow.left;
-		int height = rcParentWindow.bottom - rcParentWindow.top;
-		if (width != Renderer::GetBackbufferWidth() || height != Renderer::GetBackbufferHeight())
-			MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
-	}
-
-	RECT rcWindow;
-	GetClientRect(EmuWindow::GetWnd(), &rcWindow);
-	int client_width = rcWindow.right - rcWindow.left;
-	int client_height = rcWindow.bottom - rcWindow.top;
-
-	// Sanity check
-	if ((client_width != Renderer::GetBackbufferWidth() ||
-		client_height != Renderer::GetBackbufferHeight()) && 
-		client_width >= 4 && client_height >= 4)
-	{
-		TeardownDeviceObjects();
-
-		D3D::Reset();
-		s_backbuffer_width = D3D::GetBackBufferWidth();
-		s_backbuffer_height = D3D::GetBackBufferHeight();
-		if(ScreenShootMEMSurface)
-			ScreenShootMEMSurface->Release();
-		D3D::dev->CreateOffscreenPlainSurface(Renderer::GetBackbufferWidth(), Renderer::GetBackbufferHeight(),
-			D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &ScreenShootMEMSurface, NULL );
-
-		return true;
-	}
-
-	return false;
-}
-
-void Renderer::SetScissorRect(const TargetRectangle& rc)
-{
-	D3D::dev->SetScissorRect(rc.AsRECT());
-}
-
-void Renderer::SetColorMask()
-{
-	// Only enable alpha channel if it's supported by the current EFB format
-	DWORD color_mask = 0;
-	if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
-	{
-		if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24))
-			color_mask = D3DCOLORWRITEENABLE_ALPHA;
-		if (bpmem.blendmode.colorupdate)
-			color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE;
-	}
-	D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask);
-}
-
-// This function allows the CPU to directly access the EFB.
-// There are EFB peeks (which will read the color or depth of a pixel)
-// and EFB pokes (which will change the color or depth of a pixel).
-//
-// The behavior of EFB peeks can only be modified by:
-//	- GX_PokeAlphaRead
-// The behavior of EFB pokes can be modified by:
-//	- GX_PokeAlphaMode (TODO)
-//	- GX_PokeAlphaUpdate (TODO)
-//	- GX_PokeBlendMode (TODO)
-//	- GX_PokeColorUpdate (TODO)
-//	- GX_PokeDither (TODO)
-//	- GX_PokeDstAlpha (TODO)
-//	- GX_PokeZMode (TODO)
-u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
-{
-	if (!g_ActiveConfig.bEFBAccessEnable)
-		return 0;
-
-	if (type == POKE_Z)
-	{
-		static bool alert_only_once = true;
-		if (!alert_only_once) return 0;
-		PanicAlert("EFB: Poke Z not implemented (tried to poke z value %#x at (%d,%d))", poke_data, x, y);
-		alert_only_once = false;
-		return 0;
-	}
-
-	// if depth textures aren't supported by the hardware, just return
-	if (type == PEEK_Z)
-		if (FramebufferManager::GetEFBDepthTexture() == NULL)
-			return 0;
-
-	// We're using three surfaces here:
-	// - pEFBSurf: EFB Surface. Source surface when peeking, destination surface when poking.
-	// - pBufferRT: A render target surface. When peeking, we render a textured quad to this surface.
-	// - pSystemBuf: An offscreen surface. Used to retrieve the pixel data from pBufferRT.
-	LPDIRECT3DSURFACE9 pEFBSurf, pBufferRT, pSystemBuf;
-	if(type == PEEK_Z || type == POKE_Z)
-	{
-		pEFBSurf = FramebufferManager::GetEFBDepthRTSurface();
-		pBufferRT = FramebufferManager::GetEFBDepthReadSurface();
-		pSystemBuf = FramebufferManager::GetEFBDepthOffScreenRTSurface();
-	}
-	else //if(type == PEEK_COLOR || type == POKE_COLOR)
-	{
-		pEFBSurf = FramebufferManager::GetEFBColorRTSurface();
-		pBufferRT = FramebufferManager::GetEFBColorReadSurface();
-		pSystemBuf = FramebufferManager::GetEFBColorOffScreenRTSurface();
-	}
-
-	// Buffer not found alert
-	if (!pEFBSurf) {
-		PanicAlert("No %s!", (type == PEEK_Z || type == POKE_Z) ? "Z-Buffer" : "Color EFB");
-		return 0;
-	}
-
-	// Convert EFB dimensions to the ones of our render target
-	EFBRectangle efbPixelRc;
-	efbPixelRc.left = x;
-	efbPixelRc.top = y;
-	efbPixelRc.right = x + 1;
-	efbPixelRc.bottom = y + 1;
-
-	TargetRectangle targetPixelRc = ConvertEFBRectangle(efbPixelRc);
-
-	HRESULT hr;
-	RECT RectToLock;
-	RectToLock.bottom = targetPixelRc.bottom;
-	RectToLock.left = targetPixelRc.left;
-	RectToLock.right = targetPixelRc.right;
-	RectToLock.top = targetPixelRc.top;	
-	if (type == PEEK_Z)
-	{
-		// TODO: why is D3DFMT_D24X8 singled out here? why not D3DFMT_D24X4S4/D24S8/D24FS8/D32/D16/D15S1 too, or none of them?
-		if (FramebufferManager::GetEFBDepthRTSurfaceFormat() == D3DFMT_D24X8)
-			return 0;
-
-		RECT PixelRect;
-		PixelRect.bottom = 4;
-		PixelRect.left = 0;
-		PixelRect.right = 4;
-		PixelRect.top = 0;
-		RectToLock.bottom+=2;
-		RectToLock.right+=1;
-		RectToLock.top-=1;
-		RectToLock.left-=2;
-		if ((RectToLock.bottom - RectToLock.top) > 4)
-			RectToLock.bottom--;
-		if ((RectToLock.right - RectToLock.left) > 4)
-			RectToLock.left++;
-
-		ResetAPIState(); // Reset any game specific settings
-		D3D::dev->SetDepthStencilSurface(NULL);
-		D3D::dev->SetRenderTarget(0, pBufferRT);
-
-		// Stretch picture with increased internal resolution
-		D3DVIEWPORT9 vp;
-		vp.X = 0;
-		vp.Y = 0;
-		vp.Width  = 4;
-		vp.Height = 4;
-		vp.MinZ = 0.0f;
-		vp.MaxZ = 1.0f;
-		D3D::dev->SetViewport(&vp);
-
-		float colmat[28] = {0.0f};
-		colmat[0] = colmat[5] = colmat[10] = 1.0f;
-		PixelShaderManager::SetColorMatrix(colmat); // set transformation
-		LPDIRECT3DTEXTURE9 read_texture = FramebufferManager::GetEFBDepthTexture();
-
-		D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-
-		D3DFORMAT bformat = FramebufferManager::GetEFBDepthRTSurfaceFormat();
-
-		D3D::drawShadedTexQuad(
-			read_texture,
-			&RectToLock,
-			Renderer::GetTargetWidth(),
-			Renderer::GetTargetHeight(),
-			4, 4,
-			PixelShaderCache::GetDepthMatrixProgram(0, bformat != FOURCC_RAWZ),
-			VertexShaderCache::GetSimpleVertexShader(0));
-
-		D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-
-		D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-		D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-		RestoreAPIState();
-
-		// Retrieve the pixel data to the local memory buffer
-		RectToLock.bottom = 4;
-		RectToLock.left = 0;
-		RectToLock.right = 4;
-		RectToLock.top = 0;
-		D3D::dev->GetRenderTargetData(pBufferRT, pSystemBuf);
-
-		// EFB data successfully retrieved, now get the pixel data
-		D3DLOCKED_RECT drect;
-		pSystemBuf->LockRect(&drect, &RectToLock, D3DLOCK_READONLY);
-		u32 z = ((u32*)drect.pBits)[6];	// 24 bit depth value
-		pSystemBuf->UnlockRect();
-
-		// if Z is in 16 bit format you must return a 16 bit integer
-		if(bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16) {
-			z >>= 8;
-		}
-
-		return z;
-	}
-	else if(type == PEEK_COLOR)
-	{
-		// We can't directly StretchRect to System buf because is not supported by all implementations
-		// this is the only safe path that works in most cases
-		hr = D3D::dev->StretchRect(pEFBSurf, &RectToLock, pBufferRT, NULL, D3DTEXF_NONE);
-		D3D::dev->GetRenderTargetData(pBufferRT, pSystemBuf);
-
-		// EFB data successfully retrieved, now get the pixel data
-		RectToLock.bottom = 1;
-		RectToLock.left = 0;
-		RectToLock.right = 1;
-		RectToLock.top = 0;
-
-		D3DLOCKED_RECT drect;
-		pSystemBuf->LockRect(&drect, &RectToLock, D3DLOCK_READONLY);
-		u32 ret = ((u32*)drect.pBits)[0];
-		pSystemBuf->UnlockRect();
-
-		// check what to do with the alpha channel (GX_PokeAlphaRead)
-		PixelEngine::UPEAlphaReadReg alpha_read_mode;
-		PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD);
-
-		if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
-		{
-			ret = RGBA8ToRGBA6ToRGBA8(ret);
-		}
-		else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-		{
-			ret = RGBA8ToRGB565ToRGBA8(ret);
-		}
-		if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24)
-		{
-			ret |= 0xFF000000;
-		}
-
-		if(alpha_read_mode.ReadMode == 2) return ret; // GX_READ_NONE
-		else if(alpha_read_mode.ReadMode == 1) return (ret | 0xFF000000); // GX_READ_FF
-		else return (ret & 0x00FFFFFF); // GX_READ_00
-	}
-	else //if(type == POKE_COLOR)
-	{
-		// TODO: Speed this up by batching pokes?
-		ResetAPIState();
-		D3D::drawColorQuad(poke_data,
-			(float)RectToLock.left   * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
-			- (float)RectToLock.top    * 2.f / (float)Renderer::GetTargetHeight() + 1.f,
-			(float)RectToLock.right  * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
-			- (float)RectToLock.bottom * 2.f / (float)Renderer::GetTargetHeight() + 1.f);
-		RestoreAPIState();
-		return 0;
-	}
-}
-
-// Viewport correction:
-// Say you want a viewport at (ix, iy) with size (iw, ih),
-// but your viewport must be clamped at (ax, ay) with size (aw, ah).
-// Just multiply the projection matrix with the following to get the same
-// effect:
-// [   (iw/aw)         0     0    ((iw - 2*(ax-ix)) / aw - 1)   ]
-// [         0   (ih/ah)     0   ((-ih + 2*(ay-iy)) / ah + 1)   ]
-// [         0         0     1                              0   ]
-// [         0         0     0                              1   ]
-static void ViewportCorrectionMatrix(Matrix44& result,
-	float ix, float iy, float iw, float ih, // Intended viewport (x, y, width, height)
-	float ax, float ay, float aw, float ah) // Actual viewport (x, y, width, height)
-{
-	Matrix44::LoadIdentity(result);
-	if (aw == 0.f || ah == 0.f)
-		return;
-	result.data[4*0+0] = iw / aw;
-	result.data[4*0+3] = (iw - 2.f * (ax - ix)) / aw - 1.f;
-	result.data[4*1+1] = ih / ah;
-	result.data[4*1+3] = (-ih + 2.f * (ay - iy)) / ah + 1.f;
-}
-
-// Called from VertexShaderManager
-void Renderer::UpdateViewport(Matrix44& vpCorrection)
-{
-	// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
-	// [0] = width/2
-	// [1] = height/2
-	// [2] = 16777215 * (farz - nearz)
-	// [3] = xorig + width/2 + 342
-	// [4] = yorig + height/2 + 342
-	// [5] = 16777215 * farz
-
-	int scissorXOff = bpmem.scissorOffset.x * 2;
-	int scissorYOff = bpmem.scissorOffset.y * 2;
-
-	// TODO: ceil, floor or just cast to int?
-	int intendedX = EFBToScaledX((int)ceil(xfregs.viewport.xOrig - xfregs.viewport.wd - scissorXOff));
-	int intendedY = EFBToScaledY((int)ceil(xfregs.viewport.yOrig + xfregs.viewport.ht - scissorYOff));
-	int intendedWd = EFBToScaledX((int)ceil(2.0f * xfregs.viewport.wd));
-	int intendedHt = EFBToScaledY((int)ceil(-2.0f * xfregs.viewport.ht));
-	if (intendedWd < 0)
-	{
-		intendedX += intendedWd;
-		intendedWd = -intendedWd;
-	}
-	if (intendedHt < 0)
-	{
-		intendedY += intendedHt;
-		intendedHt = -intendedHt;
-	}
-
-	// In D3D, the viewport rectangle must fit within the render target.
-	int X = intendedX;
-	if (X < 0)
-		X = 0;
-	int Y = intendedY;
-	if (Y < 0)
-		Y = 0;
-	int Wd = intendedWd;
-	if (X + Wd > GetTargetWidth())
-		Wd = GetTargetWidth() - X;
-	int Ht = intendedHt;
-	if (Y + Ht > GetTargetHeight())
-		Ht = GetTargetHeight() - Y;
-
-	// If GX viewport is off the render target, we must clamp our viewport
-	// within the bounds. Use the correction matrix to compensate.
-	ViewportCorrectionMatrix(vpCorrection,
-		(float)intendedX, (float)intendedY, (float)intendedWd, (float)intendedHt,
-		(float)X, (float)Y, (float)Wd, (float)Ht);
-
-	D3DVIEWPORT9 vp;
-	vp.X = X;
-	vp.Y = Y;
-	vp.Width = Wd;
-	vp.Height = Ht;
-
-	// Some games set invalids values for z min and z max so fix them to the max an min alowed and let the shaders do this work
-	vp.MinZ = 0.0f; // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f;
-	vp.MaxZ = 1.0f; // xfregs.viewport.farZ / 16777216.0f;
-	D3D::dev->SetViewport(&vp);
-}
-
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
-{
-	// Reset rendering pipeline while keeping color masks and depth buffer settings
-	ResetAPIState();
-
-	DWORD color_mask = 0;
-	if (alphaEnable)
-		color_mask = D3DCOLORWRITEENABLE_ALPHA;
-	if (colorEnable)
-		color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE;
-	D3D::ChangeRenderState(D3DRS_COLORWRITEENABLE, color_mask);
-
-	if (zEnable)
-	{
-		D3D::ChangeRenderState(D3DRS_ZENABLE, TRUE);
-		D3D::ChangeRenderState(D3DRS_ZWRITEENABLE, TRUE);
-		D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_ALWAYS);
-	}
-	else
-	{
-		D3D::ChangeRenderState(D3DRS_ZENABLE, FALSE);
-	}
-
-	// Update the viewport for clearing the target EFB rect
-	TargetRectangle targetRc = ConvertEFBRectangle(rc);
-	D3DVIEWPORT9 vp;
-	vp.X = targetRc.left;
-	vp.Y = targetRc.top;
-	vp.Width  = targetRc.GetWidth();
-	vp.Height = targetRc.GetHeight();
-	vp.MinZ = 0.0;
-	vp.MaxZ = 1.0;
-	D3D::dev->SetViewport(&vp);
-	D3D::drawClearQuad(color, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader());
-	RestoreAPIState();
-}
-
-void Renderer::ReinterpretPixelData(unsigned int convtype)
-{
-	RECT source;
-	SetRect(&source, 0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight());
-
-	LPDIRECT3DPIXELSHADER9 pixel_shader;
-	if (convtype == 0) pixel_shader = PixelShaderCache::ReinterpRGB8ToRGBA6();
-	else if (convtype == 2) pixel_shader = PixelShaderCache::ReinterpRGBA6ToRGB8();
-	else
-	{
-		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
-		return;
-	}
-
-	// convert data and set the target texture as our new EFB
-	g_renderer->ResetAPIState();
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorReinterpretSurface());
-	D3DVIEWPORT9 vp;
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = g_renderer->GetTargetWidth();
-	vp.Height = g_renderer->GetTargetHeight();
-	vp.MinZ = 0.0;
-	vp.MaxZ = 1.0;
-	D3D::dev->SetViewport(&vp);
-	D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture(), &source,
-		g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight(),
-		g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight(),
-		pixel_shader, VertexShaderCache::GetSimpleVertexShader(0));
-	FramebufferManager::SwapReinterpretTexture();
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);	
-	g_renderer->RestoreAPIState();
-}
-
-void Renderer::SetBlendMode(bool forceUpdate)
-{
-	// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
-	// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
-	bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	//bDstAlphaPass is taken into account because the ability to disable alpha composition is
-	//really useful for debugging shader and blending errors
-	bool use_DstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
-	bool use_DualSource = use_DstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
-	const D3DBLEND d3dSrcFactors[8] =
-	{
-		D3DBLEND_ZERO,
-		D3DBLEND_ONE,
-		D3DBLEND_DESTCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		(use_DualSource) ? D3DBLEND_SRCCOLOR2 : D3DBLEND_SRCALPHA,
-		(use_DualSource) ? D3DBLEND_INVSRCCOLOR2 : D3DBLEND_INVSRCALPHA,
-		(target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE,
-		(target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO
-	};
-	const D3DBLEND d3dDestFactors[8] =
-	{
-		D3DBLEND_ZERO,
-		D3DBLEND_ONE,
-		D3DBLEND_SRCCOLOR,
-		D3DBLEND_INVSRCCOLOR,
-		(use_DualSource) ? D3DBLEND_SRCCOLOR2 : D3DBLEND_SRCALPHA,
-		(use_DualSource) ? D3DBLEND_INVSRCCOLOR2 : D3DBLEND_INVSRCALPHA,
-		(target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE,
-		(target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO
-	};
-
-	if (bpmem.blendmode.logicopenable && !forceUpdate)
-	{
-		D3D::SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE , false);
-		return;
-	}
-
-	bool blend_enable = bpmem.blendmode.subtract || bpmem.blendmode.blendenable;
-	D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, blend_enable);
-	D3D::SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, blend_enable && g_ActiveConfig.backend_info.bSupportsSeparateAlphaFunction);
-	if (blend_enable)
-	{
-		D3DBLENDOP op = D3DBLENDOP_ADD;
-		u32 srcidx = bpmem.blendmode.srcfactor;
-		u32 dstidx = bpmem.blendmode.dstfactor;
-		if (bpmem.blendmode.subtract)
-		{
-			op = D3DBLENDOP_REVSUBTRACT;
-			srcidx = GX_BL_ONE;
-			dstidx = GX_BL_ONE;
-		}
-		D3D::SetRenderState(D3DRS_BLENDOP, op);
-		D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[srcidx]);
-		D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[dstidx]);
-		if (g_ActiveConfig.backend_info.bSupportsSeparateAlphaFunction)
-		{
-			if (use_DualSource)
-			{			
-				op = D3DBLENDOP_ADD;
-				srcidx = GX_BL_ONE;
-				dstidx = GX_BL_ZERO;
-			}
-			else
-			{
-				// we can't use D3DBLEND_DESTCOLOR or D3DBLEND_INVDESTCOLOR for source in alpha channel so use their alpha equivalent instead
-				if (srcidx == GX_BL_DSTCLR) srcidx = GX_BL_DSTALPHA;
-				if (srcidx == GX_BL_INVDSTCLR) srcidx = GX_BL_INVDSTALPHA;
-				// we can't use D3DBLEND_SRCCOLOR or D3DBLEND_INVSRCCOLOR for destination in alpha channel so use their alpha equivalent instead
-				if (dstidx == GX_BL_SRCCLR) dstidx = GX_BL_SRCALPHA;
-				if (dstidx == GX_BL_INVSRCCLR) dstidx = GX_BL_INVSRCALPHA;
-			}
-			D3D::SetRenderState(D3DRS_BLENDOPALPHA, op);
-			D3D::SetRenderState(D3DRS_SRCBLENDALPHA, d3dSrcFactors[srcidx]);
-			D3D::SetRenderState(D3DRS_DESTBLENDALPHA, d3dDestFactors[dstidx]);
-		}		
-	}	
-}
-
-bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &dst_rect)
-{
-	HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface);
-	if(FAILED(hr))
-	{
-		PanicAlert("Error dumping surface data.");
-		return false;
-	}
-	hr = PD3DXSaveSurfaceToFileA(filename.c_str(), D3DXIFF_PNG, ScreenShootMEMSurface, NULL, dst_rect.AsRECT());
-	if(FAILED(hr))
-	{
-		PanicAlert("Error saving screen.");
-		return false;
-	}
-	OSD::AddMessage(StringFromFormat("Saved %i x %i %s", dst_rect.GetWidth(), dst_rect.GetHeight(), filename.c_str()));
-
-	return true;
-}
-
-// This function has the final picture. We adjust the aspect ratio here.
-void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma)
-{
-	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
-	{
-		if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
-			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
-
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2;
-	u32 xfbCount = 0;
-	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
-	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
-	{
-		if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
-			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
-
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	ResetAPIState();
-
-	if(g_ActiveConfig.bAnaglyphStereo)
-	{
-		static bool RightFrame = false;
-		if(RightFrame)
-		{
-			D3D::SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_GREEN);
-			VertexShaderManager::ResetView();
-			VertexShaderManager::TranslateView(-0.001f * g_ActiveConfig.iAnaglyphStereoSeparation,0.0f);
-			VertexShaderManager::RotateView(-0.0001f *g_ActiveConfig.iAnaglyphFocalAngle,0.0f);
-			RightFrame = false;
-		}
-		else
-		{
-			D3D::SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED);
-			VertexShaderManager::ResetView();
-			VertexShaderManager::TranslateView(0.001f *g_ActiveConfig.iAnaglyphStereoSeparation,0.0f);
-			VertexShaderManager::RotateView(0.0001f * g_ActiveConfig.iAnaglyphFocalAngle,0.0f);
-			RightFrame = true;
-		}
-	}
-
-	// Prepare to copy the XFBs to our backbuffer
-	D3D::dev->SetDepthStencilSurface(NULL);
-	D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
-
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-	D3DVIEWPORT9 vp;
-
-	// Clear full target screen (edges, borders etc)
-	if(g_ActiveConfig.bAnaglyphStereo) {
-		// use a clear quad to keep old red or blue/green data
-		vp.X = 0;
-		vp.Y = 0;
-		vp.Width  = s_backbuffer_width;
-		vp.Height = s_backbuffer_height;
-		vp.MinZ = 0.0f;
-		vp.MaxZ = 1.0f;
-		D3D::dev->SetViewport(&vp);
-		D3D::drawClearQuad(0, 1.0, PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader());
-	}
-	else
-	{
-		D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0);
-	}
-
-	int X = GetTargetRectangle().left;
-	int Y = GetTargetRectangle().top;
-	int Width  = GetTargetRectangle().right - GetTargetRectangle().left;
-	int Height = GetTargetRectangle().bottom - GetTargetRectangle().top;
-
-	// Sanity check
-	if (X < 0) X = 0;
-	if (Y < 0) Y = 0;
-	if (X > s_backbuffer_width) X = s_backbuffer_width;
-	if (Y > s_backbuffer_height) Y = s_backbuffer_height;
-	if (Width < 0) Width = 0;
-	if (Height < 0) Height = 0;
-	if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X;
-	if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y;
-
-	vp.X = X;
-	vp.Y = Y;
-	vp.Width = Width;
-	vp.Height = Height;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-
-	D3D::dev->SetViewport(&vp);
-
-	D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-	D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-
-	const XFBSourceBase* xfbSource = NULL;
-
-	if(g_ActiveConfig.bUseXFB)
-	{
-		// draw each xfb source
-		// Render to the real buffer now.
-		for (u32 i = 0; i < xfbCount; ++i)
-		{
-			xfbSource = xfbSourceList[i];
-
-			MathUtil::Rectangle<float> sourceRc;
-
-			sourceRc.left = 0;
-			sourceRc.top = 0;
-			sourceRc.right = (float)xfbSource->texWidth;
-			sourceRc.bottom = (float)xfbSource->texHeight;
-
-			MathUtil::Rectangle<float> drawRc;
-
-			if (g_ActiveConfig.bUseRealXFB)
-			{
-				drawRc.top = -1;
-				drawRc.bottom = 1;
-				drawRc.left = -1;
-				drawRc.right = 1;
-			}
-			else
-			{
-				// use virtual xfb with offset
-				int xfbHeight = xfbSource->srcHeight;
-				int xfbWidth = xfbSource->srcWidth;
-				int hOffset = ((s32)xfbSource->srcAddr - (s32)xfbAddr) / ((s32)fbWidth * 2);
-
-				drawRc.bottom = 1.0f - (2.0f * (hOffset) / (float)fbHeight);
-				drawRc.top = 1.0f - (2.0f * (hOffset + xfbHeight) / (float)fbHeight);
-				drawRc.left = -(xfbWidth / (float)fbWidth);
-				drawRc.right = (xfbWidth / (float)fbWidth);
-
-				// The following code disables auto stretch.  Kept for reference.
-				// scale draw area for a 1 to 1 pixel mapping with the draw target
-				//float vScale = (float)fbHeight / (float)GetTargetRectangle().GetHeight();
-				//float hScale = (float)fbWidth / (float)GetTargetRectangle().GetWidth();
-				//drawRc.top *= vScale;
-				//drawRc.bottom *= vScale;
-				//drawRc.left *= hScale;
-				//drawRc.right *= hScale;
-			}
-
-			xfbSource->Draw(sourceRc, drawRc, Width, Height);
-		}
-	}
-	else
-	{
-		TargetRectangle targetRc = ConvertEFBRectangle(rc);
-		LPDIRECT3DTEXTURE9 read_texture = FramebufferManager::GetEFBColorTexture();
-		D3D::drawShadedTexQuad(read_texture,targetRc.AsRECT(),
-			Renderer::GetTargetWidth(),Renderer::GetTargetHeight(),
-			Width,Height,
-			PixelShaderCache::GetColorCopyProgram(g_ActiveConfig.iMultisampleMode),
-			VertexShaderCache::GetSimpleVertexShader(g_ActiveConfig.iMultisampleMode),Gamma);		
-
-	}
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-	D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER);
-
-	if(g_ActiveConfig.bAnaglyphStereo)
-	{
-		DWORD color_mask = D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE;
-		D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask);
-	}
-
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = s_backbuffer_width;
-	vp.Height = s_backbuffer_height;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-	D3D::dev->SetViewport(&vp);
-
-	// Save screenshot
-	if (s_bScreenshot)
-	{
-		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
-		SaveScreenshot(s_sScreenshotName, GetTargetRectangle());
-		s_bScreenshot = false;
-	}
-
-	// Dump frames
-	static int w = 0, h = 0;
-	if (g_ActiveConfig.bDumpFrames)
-	{
-		static int s_recordWidth;
-		static int s_recordHeight;
-
-		HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface);
-		if (!bLastFrameDumped)
-		{
-			s_recordWidth = GetTargetRectangle().GetWidth();
-			s_recordHeight = GetTargetRectangle().GetHeight();
-			bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight);
-			if (!bAVIDumping)
-			{
-				PanicAlert("Error dumping frames to AVI.");
-			}
-			else
-			{
-				char msg [255];
-				sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
-					File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight);
-				OSD::AddMessage(msg, 2000);
-			}
-		}
-		if (bAVIDumping)
-		{
-			D3DLOCKED_RECT rect;
-			if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, GetTargetRectangle().AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY)))
-			{
-				if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight)
-				{
-					frame_data.resize(3 * s_recordWidth * s_recordHeight);
-					w = s_recordWidth;
-					h = s_recordHeight;
-				}
-				formatBufferDump((const u8*)rect.pBits, &frame_data[0], s_recordWidth, s_recordHeight, rect.Pitch);
-				AVIDump::AddFrame(&frame_data[0], GetTargetRectangle().GetWidth(), GetTargetRectangle().GetHeight());
-				ScreenShootMEMSurface->UnlockRect();
-			}
-		}
-		bLastFrameDumped = true;
-	}
-	else
-	{
-		if (bLastFrameDumped && bAVIDumping)
-		{
-			std::vector<u8>().swap(frame_data);
-			w = h = 0;
-			AVIDump::Stop();
-			bAVIDumping = false;
-			OSD::AddMessage("Stop dumping frames to AVI", 2000);
-		}
-		bLastFrameDumped = false;
-	}
-
-	// Finish up the current frame, print some stats
-	if (g_ActiveConfig.bShowFPS)
-	{
-		char fps[20];
-		StringCchPrintfA(fps, 20, "FPS: %d\n", s_fps);
-		D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps);
-	}
-
-	if (SConfig::GetInstance().m_ShowLag)
-	{
-		char lag[10];
-		StringCchPrintfA(lag, 10, "Lag: %llu\n", Movie::g_currentLagCount);
-		D3D::font.DrawTextScaled(0, 18, 20, 20, 0.0f, 0xFF00FFFF, lag);
-	}
-
-	if (g_ActiveConfig.bShowInputDisplay)
-	{
-		char inputDisplay[1000];
-		StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str());
-		D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay);
-	}
-
-	Renderer::DrawDebugText();
-
-	if (g_ActiveConfig.bOverlayStats)
-	{
-		Statistics::ToString(st);
-		D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st);
-	}
-	else if (g_ActiveConfig.bOverlayProjStats)
-	{
-		Statistics::ToStringProj(st);
-		D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st);
-	}
-
-	OSD::DrawMessages();
-	D3D::EndFrame();
-	++frameCount;
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);
-
-	DLCache::ProgressiveCleanup();
-	TextureCache::Cleanup();
-	// Flip/present backbuffer to frontbuffer here
-	D3D::Present();
-	// Enable configuration changes
-	UpdateActiveConfig();
-	TextureCache::OnConfigChanged(g_ActiveConfig);
-
-	SetWindowSize(fbWidth, fbHeight);
-
-	const bool windowResized = CheckForResize();
-
-	bool xfbchanged = false;
-
-	if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight)
-	{
-		xfbchanged = true;
-		unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth;
-		unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
-		FramebufferManagerBase::SetLastXfbWidth(w);
-		FramebufferManagerBase::SetLastXfbHeight(h);
-	}
-
-	u32 newAA = g_ActiveConfig.iMultisampleMode;
-
-	if (xfbchanged || windowResized || s_LastEFBScale != g_ActiveConfig.iEFBScale || s_LastAA != newAA)
-	{
-		s_LastAA = newAA;
-
-		UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-		int SupersampleCoeficient = (s_LastAA % 3) + 1;
-
-		s_LastEFBScale = g_ActiveConfig.iEFBScale;
-		CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient);
-
-		D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
-		D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface());
-		if (windowResized)
-		{
-			// device objects lost, so recreate all of them
-			SetupDeviceObjects();
-		}
-		else
-		{
-			// just resize the frame buffer
-			delete g_framebuffer_manager;
-			g_framebuffer_manager = new FramebufferManager;
-		}
-		D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-		D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-		D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0);
-		SetLineWidth();
-	}
-
-	if (XFBWrited)
-		s_fps = UpdateFPSCounter();
-
-	// Begin new frame
-	// Set default viewport and scissor, for the clear to work correctly
-	// New frame
-	stats.ResetFrame();
-
-	// Handle vsync changes during execution
-	if(s_vsync != g_ActiveConfig.IsVSync())
-	{
-		s_vsync = g_ActiveConfig.IsVSync();
-		TeardownDeviceObjects();
-		D3D::Reset();
-		// device objects lost, so recreate all of them
-		SetupDeviceObjects();
-	}
-	D3D::BeginFrame();
-	RestoreAPIState();
-
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-	VertexShaderManager::SetViewportChanged();
-
-	Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB));
-	XFBWrited = false;
-}
-
-void Renderer::ApplyState(bool bUseDstAlpha)
-{
-	if (bUseDstAlpha)
-	{
-		// If we get here we are sure that we are using dst alpha pass. (bpmem.dstalpha.enable)
-		// Alpha write is enabled. (because bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
-		// We must disable blend because we want to write alpha value directly to the alpha channel without modifications.
-		D3D::ChangeRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA);
-		D3D::ChangeRenderState(D3DRS_ALPHABLENDENABLE, false);
-		if(bpmem.zmode.testenable && bpmem.zmode.updateenable)
-		{
-			// This is needed to draw to the correct pixels in multi-pass algorithms
-			// to avoid z-fighting and grants that you write to the same pixels
-			// affected by the last pass
-			D3D::ChangeRenderState(D3DRS_ZWRITEENABLE, false);
-			D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		}
-	}
-}
-
-void Renderer::RestoreState()
-{
-	D3D::RefreshRenderState(D3DRS_COLORWRITEENABLE);
-	D3D::RefreshRenderState(D3DRS_ALPHABLENDENABLE);
-	if(bpmem.zmode.testenable && bpmem.zmode.updateenable)
-	{
-		D3D::RefreshRenderState(D3DRS_ZWRITEENABLE);
-		D3D::RefreshRenderState(D3DRS_ZFUNC);
-	}
-	// TODO: Enable this code. Caused glitches for me however (neobrain)
-	//	for (unsigned int i = 0; i < 8; ++i)
-	//		D3D::dev->SetTexture(i, NULL);
-}
-
-// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
-void Renderer::ResetAPIState()
-{
-	D3D::SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
-	D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
-	D3D::SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-	D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
-	D3D::SetRenderState(D3DRS_ZENABLE, FALSE);
-	D3D::SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
-	DWORD color_mask = D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE;
-	D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask);
-}
-
-void Renderer::RestoreAPIState()
-{
-	// Gets us back into a more game-like state.
-	D3D::SetRenderState(D3DRS_FILLMODE, g_ActiveConfig.bWireFrame ? D3DFILL_WIREFRAME : D3DFILL_SOLID);
-	D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
-	VertexShaderManager::SetViewportChanged();
-	BPFunctions::SetScissor();
-	if (bpmem.zmode.testenable) {
-		D3D::SetRenderState(D3DRS_ZENABLE, TRUE);
-		if (bpmem.zmode.updateenable)
-			D3D::SetRenderState(D3DRS_ZWRITEENABLE, TRUE);
-	}
-	SetColorMask();
-	SetLogicOpMode();
-	SetGenerationMode();
-}
-
-void Renderer::SetGenerationMode()
-{
-	const D3DCULL d3dCullModes[4] =
-	{
-		D3DCULL_NONE,
-		D3DCULL_CCW,
-		D3DCULL_CW,
-		D3DCULL_CCW
-	};
-
-	D3D::SetRenderState(D3DRS_CULLMODE, d3dCullModes[bpmem.genMode.cullmode]);
-}
-
-void Renderer::SetDepthMode()
-{
-	const D3DCMPFUNC d3dCmpFuncs[8] =
-	{
-		D3DCMP_NEVER,
-		D3DCMP_LESS,
-		D3DCMP_EQUAL,
-		D3DCMP_LESSEQUAL,
-		D3DCMP_GREATER,
-		D3DCMP_NOTEQUAL,
-		D3DCMP_GREATEREQUAL,
-		D3DCMP_ALWAYS
-	};
-
-	if (bpmem.zmode.testenable)
-	{
-		D3D::SetRenderState(D3DRS_ZENABLE, TRUE);
-		D3D::SetRenderState(D3DRS_ZWRITEENABLE, bpmem.zmode.updateenable);
-		D3D::SetRenderState(D3DRS_ZFUNC, d3dCmpFuncs[bpmem.zmode.func]);
-	}
-	else
-	{
-		// if the test is disabled write is disabled too
-		D3D::SetRenderState(D3DRS_ZENABLE, FALSE);
-		D3D::SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
-	}
-}
-
-void Renderer::SetLogicOpMode()
-{
-	// D3D9 doesn't support logic blending, so this is a huge hack
-
-	//		0	0x00
-	//		1	Source & destination
-	//		2	Source & ~destination
-	//		3	Source
-	//		4	~Source & destination
-	//		5	Destination
-	//		6	Source ^ destination =  Source & ~destination | ~Source & destination
-	//		7	Source | destination
-	//		8	~(Source | destination)
-	//		9	~(Source ^ destination) = ~Source & ~destination | Source & destination
-	//		10	~Destination
-	//		11	Source | ~destination
-	//		12	~Source
-	//		13	~Source | destination
-	//		14	~(Source & destination)
-	//		15	0xff
-	const D3DBLENDOP d3dLogicOpop[16] =
-	{
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_SUBTRACT,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_REVSUBTRACT,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_MAX,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_MAX,
-		D3DBLENDOP_MAX,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD,
-		D3DBLENDOP_ADD
-	};
-	const D3DBLEND d3dLogicOpSrcFactors[16] =
-	{
-		D3DBLEND_ZERO,
-		D3DBLEND_DESTCOLOR,
-		D3DBLEND_ONE,
-		D3DBLEND_ONE,
-		D3DBLEND_DESTCOLOR,
-		D3DBLEND_ZERO,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_ONE,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_ONE
-	};
-	const D3DBLEND d3dLogicOpDestFactors[16] =
-	{
-		D3DBLEND_ZERO,
-		D3DBLEND_ZERO,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_ZERO,
-		D3DBLEND_ONE,
-		D3DBLEND_ONE,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_ONE,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_SRCCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_ONE,
-		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_ONE
-	};
-
-	if (bpmem.blendmode.logicopenable)
-	{
-		D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, true);
-		D3D::SetRenderState(D3DRS_BLENDOP, d3dLogicOpop[bpmem.blendmode.logicmode]);
-		D3D::SetRenderState(D3DRS_SRCBLEND, d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]);
-		D3D::SetRenderState(D3DRS_DESTBLEND, d3dLogicOpDestFactors[bpmem.blendmode.logicmode]);
-	}
-	else
-	{
-		SetBlendMode(true);
-	}
-}
-
-void Renderer::SetDitherMode()
-{
-	D3D::SetRenderState(D3DRS_DITHERENABLE, bpmem.blendmode.dither);
-}
-
-void Renderer::SetLineWidth()
-{
-	// We can't change line width in D3D unless we use ID3DXLine
-	float fratio = xfregs.viewport.wd != 0 ? Renderer::EFBToScaledXf(1.f) : 1.0f;
-	float psize = bpmem.lineptwidth.pointsize * fratio / 6.0f;
-	psize = psize > 0 ? psize : 1.0f;
-	if (psize > m_fMaxPointSize)
-	{
-		psize = m_fMaxPointSize;
-	}
-	D3D::SetRenderState(D3DRS_POINTSIZE, *((DWORD*)&psize));
-	D3D::SetRenderState(D3DRS_POINTSIZE_MIN, *((DWORD*)&psize));
-	D3D::SetRenderState(D3DRS_POINTSIZE_MAX, *((DWORD*)&psize));
-}
-
-void Renderer::SetSamplerState(int stage, int texindex)
-{
-	const D3DTEXTUREFILTERTYPE d3dMipFilters[4] =
-	{
-		D3DTEXF_NONE,
-		D3DTEXF_POINT,
-		D3DTEXF_LINEAR,
-		D3DTEXF_NONE, //reserved
-	};
-	const D3DTEXTUREADDRESS d3dClamps[4] =
-	{
-		D3DTADDRESS_CLAMP,
-		D3DTADDRESS_WRAP,
-		D3DTADDRESS_MIRROR,
-		D3DTADDRESS_WRAP //reserved
-	};
-
-	const FourTexUnits &tex = bpmem.tex[texindex];
-	const TexMode0 &tm0 = tex.texMode0[stage];
-	const TexMode1 &tm1 = tex.texMode1[stage];
-
-	D3DTEXTUREFILTERTYPE min, mag, mip;
-	if (g_ActiveConfig.bForceFiltering)
-	{
-		min = mag = mip = D3DTEXF_LINEAR;
-	}
-	else
-	{
-		min = (tm0.min_filter & 4) ? D3DTEXF_LINEAR : D3DTEXF_POINT;
-		mag = tm0.mag_filter ? D3DTEXF_LINEAR : D3DTEXF_POINT;
-		mip = d3dMipFilters[tm0.min_filter & 3];
-	}
-	if (texindex)
-		stage += 4;
-
-	if (mag == D3DTEXF_LINEAR && min == D3DTEXF_LINEAR && g_ActiveConfig.iMaxAnisotropy)
-	{
-		min = D3DTEXF_ANISOTROPIC;
-	}
-	D3D::SetSamplerState(stage, D3DSAMP_MINFILTER, min);
-	D3D::SetSamplerState(stage, D3DSAMP_MAGFILTER, mag);
-	D3D::SetSamplerState(stage, D3DSAMP_MIPFILTER, mip);
-
-	D3D::SetSamplerState(stage, D3DSAMP_ADDRESSU, d3dClamps[tm0.wrap_s]);
-	D3D::SetSamplerState(stage, D3DSAMP_ADDRESSV, d3dClamps[tm0.wrap_t]);
-
-	float lodbias = (s32)tm0.lod_bias / 32.0f;
-	D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias);
-	D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4);
-}
-
-void Renderer::SetInterlacingMode()
-{
-	// TODO
-}
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.h b/Source/Plugins/Plugin_VideoDX9/Src/Render.h
deleted file mode 100644
index 6e5198b3cd..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#ifndef _RENDER_H_
-#define _RENDER_H_
-
-#include "RenderBase.h"
-
-namespace DX9
-{
-
-class Renderer : public ::Renderer
-{
-public:
-	Renderer();
-	~Renderer();
-
-	void SetColorMask();
-	void SetBlendMode(bool forceUpdate);
-	void SetScissorRect(const TargetRectangle& rc);
-	void SetGenerationMode();
-	void SetDepthMode();
-	void SetLogicOpMode();
-	void SetDitherMode();
-	void SetLineWidth();
-	void SetSamplerState(int stage,int texindex);
-	void SetInterlacingMode();
-
-	void ApplyState(bool bUseDstAlpha);
-	void RestoreState();
-
-	void RenderText(const char* pstr, int left, int top, u32 color);
-
-	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data);
-
-	void ResetAPIState();
-	void RestoreAPIState();
-
-	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc);
-
-	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
-
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
-
-	void ReinterpretPixelData(unsigned int convtype);
-
-	void UpdateViewport(Matrix44& vpCorrection);
-
-	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
-
-	static bool CheckForResize();
-
-	void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetPSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-
-	void SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetVSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f);
-	void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-};
-
-}  // namespace DX9
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
deleted file mode 100644
index ce8b1acaf5..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <d3dx9.h>
-
-#include "Globals.h"
-#include "Statistics.h"
-#include "MemoryUtil.h"
-#include "Hash.h"
-#include "HW/Memmap.h"
-
-#include "CommonPaths.h"
-#include "FileUtil.h"
-
-#include "D3DBase.h"
-#include "D3DTexture.h"
-#include "D3DUtil.h"
-#include "FramebufferManager.h"
-#include "PixelShaderCache.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderManager.h"
-#include "VertexShaderCache.h"
-
-#include "Render.h"
-
-#include "TextureDecoder.h"
-#include "TextureCache.h"
-#include "HiresTextures.h"
-#include "TextureConverter.h"
-#include "Debugger.h"
-
-extern int frameCount;
-
-namespace DX9
-{
-
-TextureCache::TCacheEntry::~TCacheEntry()
-{
-	texture->Release();
-}
-
-void TextureCache::TCacheEntry::Bind(unsigned int stage)
-{
-	D3D::SetTexture(stage, texture);
-}
-
-bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
-{
-	IDirect3DSurface9* surface;
-	HRESULT hr = texture->GetSurfaceLevel(level, &surface);
-	if (FAILED(hr))
-		return false;
-
-	hr = PD3DXSaveSurfaceToFileA(filename, D3DXIFF_PNG, surface, NULL, NULL);
-	surface->Release();
-
-	return SUCCEEDED(hr);
-}
-
-void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
-	unsigned int expanded_width, unsigned int level)
-{
-	D3D::ReplaceTexture2D(texture, temp, width, height, expanded_width, d3d_fmt, swap_r_b, level);
-}
-
-void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-	unsigned int srcFormat, const EFBRectangle& srcRect,
-	bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-	const float *colmat)
-{
-	g_renderer->ResetAPIState(); // reset any game specific settings
-	
-	const LPDIRECT3DTEXTURE9 read_texture = (srcFormat == PIXELFMT_Z24) ?
-		FramebufferManager::GetEFBDepthTexture() :
-		FramebufferManager::GetEFBColorTexture();
-
-	if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture)
-	{
-		LPDIRECT3DSURFACE9 Rendersurf = NULL;
-		texture->GetSurfaceLevel(0, &Rendersurf);
-		D3D::dev->SetDepthStencilSurface(NULL);
-		D3D::dev->SetRenderTarget(0, Rendersurf);
-
-		D3DVIEWPORT9 vp;
-
-		// Stretch picture with increased internal resolution
-		vp.X = 0;
-		vp.Y = 0;
-		vp.Width  = virtual_width;
-		vp.Height = virtual_height;
-		vp.MinZ = 0.0f;
-		vp.MaxZ = 1.0f;
-		D3D::dev->SetViewport(&vp);
-		RECT destrect;
-		destrect.bottom = virtual_height;
-		destrect.left = 0;
-		destrect.right = virtual_width;
-		destrect.top = 0;
-
-		PixelShaderManager::SetColorMatrix(colmat); // set transformation
-		TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
-		RECT sourcerect;
-		sourcerect.bottom = targetSource.bottom;
-		sourcerect.left = targetSource.left;
-		sourcerect.right = targetSource.right;
-		sourcerect.top = targetSource.top;
-
-		if (srcFormat == PIXELFMT_Z24)
-		{
-			if (scaleByHalf || g_ActiveConfig.iMultisampleMode)
-			{
-				D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-				D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-			}
-			else
-			{
-				D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-				D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
-			}
-		}
-		else
-		{
-			D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-			D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-		}
-
-		D3DFORMAT bformat = FramebufferManager::GetEFBDepthRTSurfaceFormat();
-		int SSAAMode = g_ActiveConfig.iMultisampleMode;
-
-		D3D::drawShadedTexQuad(read_texture, &sourcerect, 
-			Renderer::GetTargetWidth(), Renderer::GetTargetHeight(),
-			virtual_width, virtual_height,
-			// TODO: why is D3DFMT_D24X8 singled out here? why not D3DFMT_D24X4S4/D24S8/D24FS8/D32/D16/D15S1 too, or none of them?
-			PixelShaderCache::GetDepthMatrixProgram(SSAAMode, (srcFormat == PIXELFMT_Z24) && bformat != FOURCC_RAWZ && bformat != D3DFMT_D24X8),
-			VertexShaderCache::GetSimpleVertexShader(SSAAMode));
-
-		Rendersurf->Release();
-	}
-
-	if (!g_ActiveConfig.bCopyEFBToTexture)
-	{
-		int encoded_size = TextureConverter::EncodeToRamFromTexture(
-					addr,
-					read_texture,
-					Renderer::GetTargetWidth(), 
-					Renderer::GetTargetHeight(),
-					srcFormat == PIXELFMT_Z24, 
-					isIntensity, 
-					dstFormat, 
-					scaleByHalf, 
-					srcRect);
-
-		u8* dst = Memory::GetPointer(addr);
-		u64 hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples);
-
-		// Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date
-		if (!g_ActiveConfig.bEFBCopyCacheEnable)
-			TextureCache::MakeRangeDynamic(addr,encoded_size);
-		else if (!TextureCache::Find(addr, hash))
-			TextureCache::MakeRangeDynamic(addr,encoded_size);
-
-		this->hash = hash;
-	}
-	
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-	D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER);
-	D3D::SetTexture(0, NULL);
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-
-	g_renderer->RestoreAPIState();
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, unsigned int height,
-	unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt)
-{
-	D3DFORMAT d3d_fmt;
-	bool swap_r_b = false;
-
-	switch (pcfmt)
-	{
-	case PC_TEX_FMT_BGRA32:
-		d3d_fmt = D3DFMT_A8R8G8B8;
-		break;
-
-	case PC_TEX_FMT_RGBA32:
-		d3d_fmt = D3DFMT_A8R8G8B8;
-		swap_r_b = true;
-		break;
-
-	case PC_TEX_FMT_RGB565:
-		d3d_fmt = D3DFMT_R5G6B5;
-		break;
-
-	case PC_TEX_FMT_IA4_AS_IA8:
-		d3d_fmt = D3DFMT_A8L8;
-		break;
-
-	case PC_TEX_FMT_I8:
-	case PC_TEX_FMT_I4_AS_I8:
-		// A hack which means the format is a packed
-		// 8-bit intensity texture. It is unpacked
-		// to A8L8 in D3DTexture.cpp
-		d3d_fmt = D3DFMT_A8P8;
-		break;
-
-	case PC_TEX_FMT_IA8:
-		d3d_fmt = D3DFMT_A8L8;
-		break;
-
-	case PC_TEX_FMT_DXT1:
-		d3d_fmt = D3DFMT_DXT1;
-		break;
-	}
-
-	TCacheEntry* entry = new TCacheEntry(D3D::CreateTexture2D(temp, width, height, expanded_width, d3d_fmt, swap_r_b, tex_levels));
-	entry->swap_r_b = swap_r_b;
-	entry->d3d_fmt = d3d_fmt;
-	
-	entry->Load(width, height, expanded_width, 0);
-
-	return entry;
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
-	unsigned int scaled_tex_w, unsigned int scaled_tex_h)
-{
-	LPDIRECT3DTEXTURE9 texture;
-	D3D::dev->CreateTexture(scaled_tex_w, scaled_tex_h, 1, D3DUSAGE_RENDERTARGET,
-		D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0);
-	
-	return new TCacheEntry(texture);
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
deleted file mode 100644
index 5c711129f1..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURECACHE_H
-#define _TEXTURECACHE_H
-
-
-#include <map>
-
-#include "D3DBase.h"
-#include "VideoCommon.h"
-#include "BPMemory.h"
-
-#include "TextureCacheBase.h"
-
-namespace DX9
-{
-
-class TextureCache : public ::TextureCache
-{
-private:
-	struct TCacheEntry : TCacheEntryBase
-	{
-		const LPDIRECT3DTEXTURE9 texture;
-
-		D3DFORMAT d3d_fmt;
-		bool swap_r_b;
-
-		TCacheEntry(LPDIRECT3DTEXTURE9 _tex) : texture(_tex) {}
-		~TCacheEntry();
-
-		void Load(unsigned int width, unsigned int height,
-			unsigned int expanded_width, unsigned int levels);
-
-		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-			unsigned int srcFormat, const EFBRectangle& srcRect,
-			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-			const float *colmat);
-
-		void Bind(unsigned int stage);
-		bool Save(const char filename[], unsigned int level);
-	};
-
-	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
-		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
-
-	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
deleted file mode 100644
index aff12af2c3..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Fast image conversion using OpenGL shaders.
-// This kind of stuff would be a LOT nicer with OpenCL.
-
-#include "TextureConverter.h"
-#include "TextureConversionShader.h"
-#include "PixelShaderCache.h"
-#include "VertexShaderManager.h"
-#include "VertexShaderCache.h"
-#include "FramebufferManager.h"
-#include "Globals.h"
-#include "VideoConfig.h"
-#include "ImageWrite.h"
-#include "Render.h"
-#include "TextureCache.h"
-#include "Math.h"
-#include "FileUtil.h"
-#include "HW/Memmap.h"
-
-namespace DX9
-{
-
-namespace TextureConverter
-{
-struct TransformBuffer
-{
-	LPDIRECT3DTEXTURE9 FBTexture;
-	LPDIRECT3DSURFACE9 RenderSurface;
-	LPDIRECT3DSURFACE9 ReadSurface;
-	int Width;
-	int Height;
-};
-const u32 NUM_TRANSFORM_BUFFERS = 16;
-static TransformBuffer TrnBuffers[NUM_TRANSFORM_BUFFERS];
-static u32 WorkingBuffers = 0;
-
-static LPDIRECT3DPIXELSHADER9 s_rgbToYuyvProgram = NULL;
-static LPDIRECT3DPIXELSHADER9 s_yuyvToRgbProgram = NULL;
-
-// Not all slots are taken - but who cares.
-const u32 NUM_ENCODING_PROGRAMS = 64;
-static LPDIRECT3DPIXELSHADER9 s_encodingPrograms[NUM_ENCODING_PROGRAMS];
-static bool s_encodingProgramsFailed[NUM_ENCODING_PROGRAMS];
-
-void CreateRgbToYuyvProgram()
-{
-	// Output is BGRA because that is slightly faster than RGBA.
-	char* FProgram = new char[2048];
-	sprintf(FProgram,"uniform float4 blkDims : register(c%d);\n"
-	"uniform float4 textureDims : register(c%d);\n"
-	"uniform sampler samp0 : register(s0);\n"	
-	"void main(\n"
-	"  out float4 ocol0 : COLOR0,\n"
-	"  in float2 uv0 : TEXCOORD0,\n"
-	"  in float uv2 : TEXCOORD1)\n"
-	"{\n"		
-	"  float2 uv1 = float2((uv0.x + 1.0f)/ blkDims.z, uv0.y / blkDims.w);\n"
-	"  float3 c0 = tex2D(samp0, uv0.xy / blkDims.zw).rgb;\n"
-	"  float3 c1 = tex2D(samp0, uv1).rgb;\n"
-	"  c0 = pow(c0,uv2.xxx);\n"
-	"  c1 = pow(c1,uv2.xxx);\n"
-	"  float3 y_const = float3(0.257f,0.504f,0.098f);\n"
-	"  float3 u_const = float3(-0.148f,-0.291f,0.439f);\n"
-	"  float3 v_const = float3(0.439f,-0.368f,-0.071f);\n"
-	"  float4 const3 = float4(0.0625f,0.5f,0.0625f,0.5f);\n"
-	"  float3 c01 = (c0 + c1) * 0.5f;\n"  
-	"  ocol0 = float4(dot(c1,y_const),dot(c01,u_const),dot(c0,y_const),dot(c01, v_const)) + const3;\n"	  	
-	"}\n",C_COLORMATRIX,C_COLORMATRIX+1);
-
-	s_rgbToYuyvProgram = D3D::CompileAndCreatePixelShader(FProgram, (int)strlen(FProgram));
-	if (!s_rgbToYuyvProgram) {
-		ERROR_LOG(VIDEO, "Failed to create RGB to YUYV fragment program");
-	}
-	delete [] FProgram;
-}
-
-void CreateYuyvToRgbProgram()
-{
-	char* FProgram = new char[2048];
-	sprintf(FProgram,"uniform float4 blkDims : register(c%d);\n"
-	"uniform float4 textureDims : register(c%d);\n"
-	"uniform sampler samp0 : register(s0);\n"	
-	"void main(\n"
-	"  out float4 ocol0 : COLOR0,\n"
-	"  in float2 uv0 : TEXCOORD0)\n"
-	"{\n"		
-	"  float4 c0 = tex2D(samp0, uv0 / blkDims.zw).rgba;\n"
-	"  float f = step(0.5, frac(uv0.x));\n"
-	"  float y = lerp(c0.b, c0.r, f);\n"
-	"  float yComp = 1.164f * (y - 0.0625f);\n"
-	"  float uComp = c0.g - 0.5f;\n"
-	"  float vComp = c0.a - 0.5f;\n"
-
-	"  ocol0 = float4(yComp + (1.596f * vComp),\n"
-	"                 yComp - (0.813f * vComp) - (0.391f * uComp),\n"
-	"                 yComp + (2.018f * uComp),\n"
-	"                 1.0f);\n"
-	"}\n",C_COLORMATRIX,C_COLORMATRIX+1);
-	s_yuyvToRgbProgram = D3D::CompileAndCreatePixelShader(FProgram, (int)strlen(FProgram));
-	if (!s_yuyvToRgbProgram) {
-		ERROR_LOG(VIDEO, "Failed to create YUYV to RGB fragment program");
-	}
-	delete [] FProgram;
-}
-
-LPDIRECT3DPIXELSHADER9 GetOrCreateEncodingShader(u32 format)
-{
-	if (format > NUM_ENCODING_PROGRAMS)
-	{
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		return s_encodingPrograms[0];
-	}
-
-	if (!s_encodingPrograms[format])
-	{
-		if(s_encodingProgramsFailed[format])
-		{
-			// we already failed to create a shader for this format,
-			// so instead of re-trying and showing the same error message every frame, just return.
-			return NULL;
-		}
-
-		const char* shader = TextureConversionShader::GenerateEncodingShader(format,API_D3D9);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-		if (g_ActiveConfig.iLog & CONF_SAVESHADERS && shader) {
-			static int counter = 0;
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%senc_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
-
-			SaveData(szTemp, shader);
-		}
-#endif
-		s_encodingPrograms[format] = D3D::CompileAndCreatePixelShader(shader, (int)strlen(shader));
-		if (!s_encodingPrograms[format]) {
-			ERROR_LOG(VIDEO, "Failed to create encoding fragment program");
-			s_encodingProgramsFailed[format] = true;
-		}
-	}
-	return s_encodingPrograms[format];
-}
-
-void Init()
-{
-	for (unsigned int i = 0; i < NUM_ENCODING_PROGRAMS; i++)
-	{
-		s_encodingPrograms[i] = NULL;
-		s_encodingProgramsFailed[i] = false;
-	}
-	for (unsigned int i = 0; i < NUM_TRANSFORM_BUFFERS; i++)
-	{
-		TrnBuffers[i].FBTexture = NULL;
-		TrnBuffers[i].RenderSurface = NULL;
-		TrnBuffers[i].ReadSurface = NULL;
-		TrnBuffers[i].Width = 0;
-		TrnBuffers[i].Height = 0;
-	}
-	CreateRgbToYuyvProgram();
-	CreateYuyvToRgbProgram();
-}
-
-void Shutdown()
-{
-	if(s_rgbToYuyvProgram)
-		s_rgbToYuyvProgram->Release();
-	s_rgbToYuyvProgram = NULL;
-	if(s_yuyvToRgbProgram)
-		s_yuyvToRgbProgram->Release();
-	s_yuyvToRgbProgram=NULL;
-
-	for (unsigned int i = 0; i < NUM_ENCODING_PROGRAMS; i++)
-	{
-		if(s_encodingPrograms[i]) 
-			s_encodingPrograms[i]->Release();
-		s_encodingPrograms[i] = NULL;
-	}
-	for (unsigned int i = 0; i < NUM_TRANSFORM_BUFFERS; i++)
-	{
-		if(TrnBuffers[i].RenderSurface != NULL)
-			TrnBuffers[i].RenderSurface->Release();
-		TrnBuffers[i].RenderSurface = NULL;
-
-		if(TrnBuffers[i].ReadSurface != NULL)
-			TrnBuffers[i].ReadSurface->Release();
-		TrnBuffers[i].ReadSurface = NULL;
-
-		if(TrnBuffers[i].FBTexture != NULL)
-			TrnBuffers[i].FBTexture->Release();
-		TrnBuffers[i].FBTexture = NULL;		
-		
-		TrnBuffers[i].Width = 0;
-		TrnBuffers[i].Height = 0;
-	}
-	WorkingBuffers = 0;
-}
-
-void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc,
-				            u8* destAddr, int dstWidth, int dstHeight, int readStride, bool toTexture, bool linearFilter,float Gamma)
-{
-	HRESULT hr;
-	u32 index =0;
-	while(index < WorkingBuffers && (TrnBuffers[index].Width != dstWidth || TrnBuffers[index].Height != dstHeight))
-		index++;
-	
-	LPDIRECT3DSURFACE9  s_texConvReadSurface = NULL;
-	LPDIRECT3DSURFACE9 Rendersurf = NULL;
-	
-	if (index >= WorkingBuffers)
-	{
-		if (WorkingBuffers < NUM_TRANSFORM_BUFFERS)
-			WorkingBuffers++;
-		if (index >= WorkingBuffers)
-			index--;
-		if (TrnBuffers[index].RenderSurface != NULL)
-		{
-			TrnBuffers[index].RenderSurface->Release();
-			TrnBuffers[index].RenderSurface = NULL;
-		}
-		if (TrnBuffers[index].ReadSurface != NULL)
-		{
-			TrnBuffers[index].ReadSurface->Release();
-			TrnBuffers[index].ReadSurface = NULL;
-		}
-		if (TrnBuffers[index].FBTexture != NULL)
-		{
-			TrnBuffers[index].FBTexture->Release();
-			TrnBuffers[index].FBTexture = NULL;
-		}
-		TrnBuffers[index].Width = dstWidth;
-		TrnBuffers[index].Height = dstHeight;
-		D3D::dev->CreateTexture(dstWidth, dstHeight, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8,
-		                                 D3DPOOL_DEFAULT, &TrnBuffers[index].FBTexture, NULL);
-		TrnBuffers[index].FBTexture->GetSurfaceLevel(0,&TrnBuffers[index].RenderSurface);
-		D3D::dev->CreateOffscreenPlainSurface(dstWidth, dstHeight, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &TrnBuffers[index].ReadSurface, NULL );
-	}
-
-	s_texConvReadSurface = TrnBuffers[index].ReadSurface;
-	Rendersurf = TrnBuffers[index].RenderSurface;
-
-	hr = D3D::dev->SetDepthStencilSurface(NULL);
-	hr = D3D::dev->SetRenderTarget(0, Rendersurf);	
-
-	if (linearFilter)
-	{
-		D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-	}
-	else
-	{
-		D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-	}
-
-	D3DVIEWPORT9 vp;
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = dstWidth;
-	vp.Height = dstHeight;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-	hr = D3D::dev->SetViewport(&vp);
-	RECT SrcRect;
-	SrcRect.top = sourceRc.top;
-	SrcRect.left = sourceRc.left;
-	SrcRect.right = sourceRc.right;
-	SrcRect.bottom = sourceRc.bottom;
-	RECT DstRect;
-	DstRect.top = 0;
-	DstRect.left = 0;
-	DstRect.right = dstWidth;
-	DstRect.bottom = dstHeight;
-
-
-	// Draw...
-	D3D::drawShadedTexQuad(srcTexture,&SrcRect,1,1,dstWidth,dstHeight,shader,VertexShaderCache::GetSimpleVertexShader(0), Gamma);
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-	// .. and then read back the results.
-	// TODO: make this less slow.
-
-	hr = D3D::dev->GetRenderTargetData(Rendersurf,s_texConvReadSurface);
-
-	D3DLOCKED_RECT drect;
-	hr = s_texConvReadSurface->LockRect(&drect, &DstRect, D3DLOCK_READONLY);
-
-	int srcRowsPerBlockRow = readStride / (dstWidth*4); // 4 bytes per pixel
-
-	int readLoops = dstHeight / srcRowsPerBlockRow;
-	const u8 *Source = (const u8*)drect.pBits;
-	for (int i = 0; i < readLoops; i++)
-	{
-		for (int j = 0; j < srcRowsPerBlockRow; ++j)
-		{
-			memcpy(destAddr + j*dstWidth*4, Source, dstWidth*4);
-			Source += drect.Pitch;
-		}
-		destAddr += bpmem.copyMipMapStrideChannels*32;
-	}
-	
-	hr = s_texConvReadSurface->UnlockRect();
-}
-
-int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source)
-{
-	u32 format = copyfmt;
-
-	if (bFromZBuffer)
-	{
-		format |= _GX_TF_ZTF;
-		if (copyfmt == 11)
-			format = GX_TF_Z16;
-		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
-			format |= _GX_TF_CTF;
-	}
-	else
-	{
-		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
-			format |= _GX_TF_CTF;
-	}
-
-	LPDIRECT3DPIXELSHADER9 texconv_shader = GetOrCreateEncodingShader(format);
-	if (!texconv_shader)
-		return 0;
-
-	u8 *dest_ptr = Memory::GetPointer(address);
-
-	int width = (source.right - source.left) >> bScaleByHalf;
-	int height = (source.bottom - source.top) >> bScaleByHalf;
-
-	int size_in_bytes = TexDecoder_GetTextureSizeInBytes(width, height, format);
-
-	u16 blkW = TexDecoder_GetBlockWidthInTexels(format) - 1;
-	u16 blkH = TexDecoder_GetBlockHeightInTexels(format) - 1;	
-	u16 samples = TextureConversionShader::GetEncodedSampleCount(format);	
-
-	// only copy on cache line boundaries
-	// extra pixels are copied but not displayed in the resulting texture
-	s32 expandedWidth = (width + blkW) & (~blkW);
-	s32 expandedHeight = (height + blkH) & (~blkH);
-
-	float sampleStride = bScaleByHalf ? 2.f : 1.f;
-	TextureConversionShader::SetShaderParameters(
-		(float)expandedWidth,
-		(float)Renderer::EFBToScaledY(expandedHeight), // TODO: Why do we scale this?
-		(float)Renderer::EFBToScaledX(source.left),
-		(float)Renderer::EFBToScaledY(source.top),
-		Renderer::EFBToScaledXf(sampleStride),
-		Renderer::EFBToScaledYf(sampleStride),
-		(float)SourceW,
-		(float)SourceH);
-
-	TargetRectangle scaledSource;
-	scaledSource.top = 0;
-	scaledSource.bottom = expandedHeight;
-	scaledSource.left = 0;
-	scaledSource.right = expandedWidth / samples;
-	int cacheBytes = 32;
-	if ((format & 0x0f) == 6)
-		cacheBytes = 64;
-
-	int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format);
-	EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0,1.0f);
-	return size_in_bytes; // TODO: D3D11 is calculating this value differently!
-}
-
-void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight,float Gamma)
-{
-	TextureConversionShader::SetShaderParameters(
-		(float)dstWidth, 
-		(float)dstHeight, 
-		0.0f,
-		0.0f,
-		1.0f,
-		1.0f,
-		(float)Renderer::GetTargetWidth(),
-		(float)Renderer::GetTargetHeight());
-	g_renderer->ResetAPIState();
-	EncodeToRamUsingShader(s_rgbToYuyvProgram, srcTexture, sourceRc, destAddr,
-		dstWidth / 2, dstHeight, dstWidth * 2, false, false,Gamma);
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
-	g_renderer->RestoreAPIState();
-}
-
-
-// Should be scale free.
-void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, LPDIRECT3DTEXTURE9 destTexture)
-{
-	u8* srcAddr = Memory::GetPointer(xfbAddr);
-	if (!srcAddr)
-	{
-		WARN_LOG(VIDEO, "Tried to decode from invalid memory address");
-		return;
-	}
-
-	int srcFmtWidth = srcWidth / 2;
-
-	g_renderer->ResetAPIState(); // reset any game specific settings
-	LPDIRECT3DTEXTURE9 s_srcTexture = D3D::CreateTexture2D(srcAddr, srcFmtWidth, srcHeight, srcFmtWidth, D3DFMT_A8R8G8B8, false);
-	LPDIRECT3DSURFACE9 Rendersurf = NULL;
-	destTexture->GetSurfaceLevel(0,&Rendersurf);
-	D3D::dev->SetDepthStencilSurface(NULL);
-	D3D::dev->SetRenderTarget(0, Rendersurf);
-
-	D3DVIEWPORT9 vp;
-
-	// Stretch picture with increased internal resolution
-	vp.X = 0;
-	vp.Y = 0;
-	vp.Width  = srcWidth;
-	vp.Height = srcHeight;
-	vp.MinZ = 0.0f;
-	vp.MaxZ = 1.0f;
-	D3D::dev->SetViewport(&vp);
-	RECT destrect;
-	destrect.bottom = srcHeight;
-	destrect.left = 0;
-	destrect.right = srcWidth;
-	destrect.top = 0;
-	
-	RECT sourcerect;
-	sourcerect.bottom = srcHeight;
-	sourcerect.left = 0;
-	sourcerect.right = srcFmtWidth;
-	sourcerect.top = 0;
-
-	D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
-	D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
-		
-	TextureConversionShader::SetShaderParameters(
-		(float)srcFmtWidth,
-		(float)srcHeight,
-		0.0f,
-		0.0f,
-		1.0f,
-		1.0f,
-		(float)srcFmtWidth,
-		(float)srcHeight);
-	D3D::drawShadedTexQuad(
-		s_srcTexture,
-		&sourcerect,
-		1,
-		1,
-		srcWidth,
-		srcHeight,
-		s_yuyvToRgbProgram,
-		VertexShaderCache::GetSimpleVertexShader(0));
-
-
-	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
-	D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER);
-	D3D::SetTexture(0,NULL);
-	D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
-	D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());	
-	g_renderer->RestoreAPIState();
-	Rendersurf->Release();
-	s_srcTexture->Release();
-}
-
-}  // namespace
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h
deleted file mode 100644
index af23949f5c..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURECONVERTER_H_
-#define _TEXTURECONVERTER_H_
-
-#include "VideoCommon.h"
-#include "D3DBase.h"
-#include "D3DTexture.h"
-#include "D3DUtil.h"
-#include "D3DShader.h"
-
-namespace DX9
-{
-
-// Converts textures between formats using shaders
-// TODO: support multiple texture formats
-namespace TextureConverter
-{
-
-void Init();
-void Shutdown();
-
-void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc,
-					 u8* destAddr, int dstWidth, int dstHeight,float Gamma);
-
-void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, LPDIRECT3DTEXTURE9 destTexture);
-
-// returns size of the encoded data (in bytes)
-int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source);
-
-
-}
-
-}  // namespace DX9
-
-#endif // _TEXTURECONVERTER_H_
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
deleted file mode 100644
index dc79d68def..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "FileUtil.h"
-
-#include "D3DBase.h"
-#include "Fifo.h"
-#include "Statistics.h"
-#include "VertexManager.h"
-#include "OpcodeDecoding.h"
-#include "IndexGenerator.h"
-#include "VertexShaderManager.h"
-#include "VertexShaderCache.h"
-#include "PixelShaderManager.h"
-#include "PixelShaderCache.h"
-#include "NativeVertexFormat.h"
-#include "TextureCache.h"
-#include "main.h"
-
-#include "BPStructs.h"
-#include "XFStructs.h"
-#include "Debugger.h"
-#include "VideoConfig.h"
-
-// internal state for loading vertices
-extern NativeVertexFormat *g_nativeVertexFmt;
-namespace DX9
-{
-//This are the initially requeted size for the buffers expresed in elements
-const u32 IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * sizeof(u16) * 8;
-const u32 VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE;
-const u32 MAX_VBUFFER_COUNT = 2;
-
-inline void DumpBadShaders()
-{
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	// TODO: Reimplement!
-	/*	std::string error_shaders;
-	error_shaders.append(VertexShaderCache::GetCurrentShaderCode());
-	error_shaders.append(PixelShaderCache::GetCurrentShaderCode());
-	char filename[512] = "bad_shader_combo_0.txt";
-	int which = 0;
-	while (File::Exists(filename))
-	{
-	which++;
-	sprintf(filename, "bad_shader_combo_%i.txt", which);
-	}
-	File::WriteStringToFile(true, error_shaders, filename);
-	PanicAlert("DrawIndexedPrimitiveUP failed. Shaders written to %s", filename);*/
-#endif
-}
-
-void VertexManager::CreateDeviceObjects()
-{
-	m_buffers_count = 0;
-	m_vertex_buffers = NULL;
-	m_index_buffers = NULL;
-	D3DCAPS9 DeviceCaps = D3D::GetCaps();
-	u32 devicevMaxBufferSize =  DeviceCaps.MaxPrimitiveCount * 3 * DeviceCaps.MaxStreamStride;
-	//Calculate Device Dependant size
-	m_vertex_buffer_size = (VBUFFER_SIZE > devicevMaxBufferSize) ? devicevMaxBufferSize : VBUFFER_SIZE;
-	m_index_buffer_size = (IBUFFER_SIZE > DeviceCaps.MaxVertexIndex) ? DeviceCaps.MaxVertexIndex : IBUFFER_SIZE;
-	//if device caps are not enough for Vbuffer fall back to vertex arrays
-	if (m_index_buffer_size < MAXIBUFFERSIZE || m_vertex_buffer_size < MAXVBUFFERSIZE) return;
-
-	m_vertex_buffers = new LPDIRECT3DVERTEXBUFFER9[MAX_VBUFFER_COUNT];
-	m_index_buffers = new LPDIRECT3DINDEXBUFFER9[MAX_VBUFFER_COUNT];
-
-	bool Fail = false;
-	for (m_current_vertex_buffer = 0; m_current_vertex_buffer < MAX_VBUFFER_COUNT; m_current_vertex_buffer++)
-	{
-		m_vertex_buffers[m_current_vertex_buffer] = NULL;
-		m_index_buffers[m_current_vertex_buffer] = NULL;
-	}
-	for (m_current_vertex_buffer = 0; m_current_vertex_buffer < MAX_VBUFFER_COUNT; m_current_vertex_buffer++)
-	{
-		if(FAILED( D3D::dev->CreateVertexBuffer( m_vertex_buffer_size,  D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &m_vertex_buffers[m_current_vertex_buffer], NULL ) ) )
-		{
-			Fail = true;
-			break;
-		}
-		if( FAILED( D3D::dev->CreateIndexBuffer( m_index_buffer_size * sizeof(u16),  D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &m_index_buffers[m_current_vertex_buffer], NULL ) ) )
-		{
-			Fail = true;
-			return;
-		}
-	}
-	m_buffers_count = m_current_vertex_buffer;
-	m_current_vertex_buffer = 0;
-	m_current_index_buffer = 0;
-	m_index_buffer_cursor = m_index_buffer_size;
-	m_vertex_buffer_cursor = m_vertex_buffer_size;
-	m_current_stride = 0;
-	if (Fail)
-	{
-		m_buffers_count--;
-		if (m_buffers_count < 2)
-		{
-			//Error creating Vertex buffers. clean and fall to Vertex arrays
-			m_buffers_count = MAX_VBUFFER_COUNT;
-			DestroyDeviceObjects();
-		}		
-	}	
-}
-void VertexManager::DestroyDeviceObjects()
-{
-	D3D::SetStreamSource( 0, NULL, 0, 0);
-	D3D::SetIndices(NULL);
-	for (int i = 0; i < MAX_VBUFFER_COUNT; i++)
-	{
-		if(m_vertex_buffers)
-		{
-			if (m_vertex_buffers[i])
-			{
-				m_vertex_buffers[i]->Release();
-				m_vertex_buffers[i] = NULL;
-			}
-		}
-
-		if (m_index_buffers[i])
-		{
-			m_index_buffers[i]->Release();
-			m_index_buffers[i] = NULL;
-		}
-	}
-	if(m_vertex_buffers)
-		delete [] m_vertex_buffers;
-	if(m_index_buffers)
-		delete [] m_index_buffers;
-	m_vertex_buffers = NULL;
-	m_index_buffers = NULL;
-}
-
-void VertexManager::PrepareDrawBuffers(u32 stride)
-{
-	if (!m_buffers_count)
-	{
-		return;
-	}
-	u8* pVertices;
-	u16* pIndices;
-	int datasize = IndexGenerator::GetNumVerts() * stride;
-	int TdataSize = IndexGenerator::GetTriangleindexLen();
-	int LDataSize = IndexGenerator::GetLineindexLen();
-	int IndexDataSize = TdataSize + LDataSize;
-	if(IndexDataSize)
-	{
-		DWORD LockMode = D3DLOCK_NOOVERWRITE;
-		m_vertex_buffer_cursor--;
-		m_vertex_buffer_cursor = m_vertex_buffer_cursor - (m_vertex_buffer_cursor % stride) + stride;
-		if (m_vertex_buffer_cursor > m_vertex_buffer_size - datasize)
-		{
-			LockMode = D3DLOCK_DISCARD;
-			m_vertex_buffer_cursor = 0;
-			m_current_vertex_buffer = (m_current_vertex_buffer + 1) % m_buffers_count;		
-		}	
-		if(FAILED(m_vertex_buffers[m_current_vertex_buffer]->Lock(m_vertex_buffer_cursor, datasize,(VOID**)(&pVertices), LockMode))) 
-		{
-			DestroyDeviceObjects();
-			return;
-		}
-		memcpy(pVertices, s_pBaseBufferPointer, datasize);
-		m_vertex_buffers[m_current_vertex_buffer]->Unlock();
-
-		LockMode = D3DLOCK_NOOVERWRITE;
-		if (m_index_buffer_cursor > m_index_buffer_size - IndexDataSize)
-		{
-			LockMode = D3DLOCK_DISCARD;
-			m_index_buffer_cursor = 0;
-			m_current_index_buffer = (m_current_index_buffer + 1) % m_buffers_count;		
-		}	
-
-		if(FAILED(m_index_buffers[m_current_index_buffer]->Lock(m_index_buffer_cursor * sizeof(u16), IndexDataSize * sizeof(u16), (VOID**)(&pIndices), LockMode ))) 
-		{
-			DestroyDeviceObjects();
-			return;
-		}
-		if(TdataSize)
-		{		
-			memcpy(pIndices, GetTriangleIndexBuffer(), TdataSize * sizeof(u16));
-			pIndices += TdataSize;
-		}
-		if(LDataSize)
-		{		
-			memcpy(pIndices, GetLineIndexBuffer(), LDataSize * sizeof(u16));
-			pIndices += LDataSize;
-		}
-		m_index_buffers[m_current_index_buffer]->Unlock();
-	}
-	if(m_current_stride != stride || m_vertex_buffer_cursor == 0)
-	{
-		m_current_stride = stride;
-		D3D::SetStreamSource( 0, m_vertex_buffers[m_current_vertex_buffer], 0, m_current_stride);
-	}
-	if (m_index_buffer_cursor == 0)
-	{
-		D3D::SetIndices(m_index_buffers[m_current_index_buffer]);
-	}
-
-	ADDSTAT(stats.thisFrame.bytesVertexStreamed, datasize);
-	ADDSTAT(stats.thisFrame.bytesIndexStreamed, IndexDataSize);
-}
-
-void VertexManager::DrawVertexBuffer(int stride)
-{
-	int triangles = IndexGenerator::GetNumTriangles();
-	int lines = IndexGenerator::GetNumLines();
-	int points = IndexGenerator::GetNumPoints();
-	int numverts = IndexGenerator::GetNumVerts();
-	int StartIndex = m_index_buffer_cursor;
-	int basevertex = m_vertex_buffer_cursor / stride;
-	if (triangles > 0)
-	{
-		if (FAILED(D3D::dev->DrawIndexedPrimitive(
-			D3DPT_TRIANGLELIST,
-			basevertex,
-			0, 
-			numverts,
-			StartIndex, 
-			triangles)))
-		{
-			DumpBadShaders();
-		}
-		StartIndex += IndexGenerator::GetTriangleindexLen();
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}
-	if (lines > 0)
-	{
-		if (FAILED(D3D::dev->DrawIndexedPrimitive(
-			D3DPT_LINELIST, 
-			basevertex,
-			0, 
-			numverts,
-			StartIndex, 
-			IndexGenerator::GetNumLines())))
-		{
-			DumpBadShaders();
-		}
-		StartIndex += IndexGenerator::GetLineindexLen();
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}
-	if (points > 0)
-	{
-		//DrawIndexedPrimitive does not support point list so we have to draw them using DrawPrimitive
-		u16* PointIndexBuffer = GetPointIndexBuffer();
-		int i  = 0;        
-		do
-		{
-			int count = i + 1;
-			while (count < points && PointIndexBuffer[count - 1] + 1 == PointIndexBuffer[count])
-			{
-				count++;
-			}
-			if (FAILED(D3D::dev->DrawPrimitive(
-				D3DPT_POINTLIST, 
-				basevertex + PointIndexBuffer[i],
-				count - i)))
-			{
-				DumpBadShaders();
-			}
-			INCSTAT(stats.thisFrame.numDrawCalls);
-			i = count;
-		} while (i < points);		
-	}
-
-}
-
-void VertexManager::DrawVertexArray(int stride)
-{
-	int triangles = IndexGenerator::GetNumTriangles();
-	int lines = IndexGenerator::GetNumLines();
-	int points = IndexGenerator::GetNumPoints();
-	int numverts = IndexGenerator::GetNumVerts();
-	if (triangles > 0)
-	{
-		if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
-			D3DPT_TRIANGLELIST, 
-			0, numverts, triangles, 
-			GetTriangleIndexBuffer(), 
-			D3DFMT_INDEX16, 
-			s_pBaseBufferPointer, 
-			stride)))
-		{
-			DumpBadShaders();
-		}
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}
-	if (lines > 0)
-	{
-		if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
-			D3DPT_LINELIST, 
-			0, numverts, lines, 
-			GetLineIndexBuffer(), 
-			D3DFMT_INDEX16, 
-			s_pBaseBufferPointer, 
-			stride)))
-		{
-			DumpBadShaders();
-		}
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}
-	if (points > 0)
-	{
-		if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
-			D3DPT_POINTLIST, 
-			0, numverts, points, 
-			GetPointIndexBuffer(), 
-			D3DFMT_INDEX16, 
-			s_pBaseBufferPointer, 
-			stride)))
-		{
-			DumpBadShaders();
-		}
-		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-	}	
-}
-
-void VertexManager::vFlush()
-{
-	u32 usedtextures = 0;
-	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-		if (bpmem.tevorders[i / 2].getEnable(i & 1))
-			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
-
-	if (bpmem.genMode.numindstages > 0)
-		for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1; ++i)
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
-
-	for (unsigned int i = 0; i < 8; i++)
-	{
-		if (usedtextures & (1 << i))
-		{
-			g_renderer->SetSamplerState(i & 3, i >> 2);
-			FourTexUnits &tex = bpmem.tex[i >> 2];
-			TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i, 
-				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
-				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
-				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
-				tex.texTlut[i&3].tlut_format,
-				(tex.texMode0[i&3].min_filter & 3),
-				(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
-				tex.texImage1[i&3].image_type);
-
-			if (tentry)
-			{
-				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "Error loading texture");
-		}
-	}
-
-	// set global constants
-	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
-	u32 stride = g_nativeVertexFmt->GetVertexStride();
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
-		bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
-	DSTALPHA_MODE AlphaMode = useDualSource ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE;	
-
-	if (!PixelShaderCache::SetShader(AlphaMode ,g_nativeVertexFmt->m_components))
-	{
-		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
-		goto shader_fail;
-	}
-	if (!VertexShaderCache::SetShader(g_nativeVertexFmt->m_components))
-	{
-		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set vertex shader\n");});
-		goto shader_fail;
-
-	}
-	PrepareDrawBuffers(stride);
-	g_nativeVertexFmt->SetupVertexPointers();
-	g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-	if(m_buffers_count)
-	{
-		DrawVertexBuffer(stride);
-	} 
-	else 
-	{ 
-		DrawVertexArray(stride);
-	}
-	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-	if (useDstAlpha && !useDualSource)
-	{
-		if (!PixelShaderCache::SetShader(DSTALPHA_ALPHA_PASS, g_nativeVertexFmt->m_components))
-		{
-			GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
-			goto shader_fail;
-		}
-		// update alpha only
-		g_renderer->ApplyState(true);
-		if(m_buffers_count)
-		{ 
-			DrawVertexBuffer(stride);
-		} 
-		else 
-		{ 
-			DrawVertexArray(stride);
-		}
-		g_renderer->RestoreState();
-	}
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
-
-shader_fail:
-	if(m_buffers_count)
-	{
-		m_index_buffer_cursor += IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen();
-		m_vertex_buffer_cursor += IndexGenerator::GetNumVerts() * stride;
-	}
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
deleted file mode 100644
index 81a1c58211..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXMANAGER_H
-#define _VERTEXMANAGER_H
-
-#include "CPMemory.h"
-#include "VertexLoader.h"
-
-#include "VertexManagerBase.h"
-
-namespace DX9
-{
-
-class VertexManager : public ::VertexManager
-{
-public:
-	NativeVertexFormat* CreateNativeVertexFormat();
-	void GetElements(NativeVertexFormat* format, D3DVERTEXELEMENT9** elems, int* num);
-	void CreateDeviceObjects();
-	void DestroyDeviceObjects();
-private:
-	u32 m_vertex_buffer_cursor;
-	u32 m_vertex_buffer_size;
-	u32 m_index_buffer_cursor;
-	u32 m_index_buffer_size;
-	u32 m_buffers_count;
-	u32 m_current_vertex_buffer;
-	u32 m_current_stride;
-	u32 m_current_index_buffer;
-	LPDIRECT3DVERTEXBUFFER9 *m_vertex_buffers;
-	LPDIRECT3DINDEXBUFFER9 *m_index_buffers; 
-	void PrepareDrawBuffers(u32 stride);
-	void DrawVertexBuffer(int stride);
-	void DrawVertexArray(int stride);
-	// temp
-	void vFlush();
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
deleted file mode 100644
index 7c53bdfe23..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <map>
-
-#include "Common.h"
-#include "FileUtil.h"
-#include "LinearDiskCache.h"
-
-#include "Globals.h"
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "Statistics.h"
-#include "VideoConfig.h"
-#include "VertexShaderCache.h"
-#include "VertexLoader.h"
-#include "BPMemory.h"
-#include "XFMemory.h"
-#include "Debugger.h"
-#include "ConfigManager.h"
-
-namespace DX9
-{
-
-VertexShaderCache::VSCache VertexShaderCache::vshaders;
-const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
-VertexShaderUid VertexShaderCache::last_uid;
-UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
-
-#define MAX_SSAA_SHADERS 3
-
-static LPDIRECT3DVERTEXSHADER9 SimpleVertexShader[MAX_SSAA_SHADERS];
-static LPDIRECT3DVERTEXSHADER9 ClearVertexShader;
-
-LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
-
-LPDIRECT3DVERTEXSHADER9 VertexShaderCache::GetSimpleVertexShader(int level)
-{
-	return SimpleVertexShader[level % MAX_SSAA_SHADERS];
-}
-
-LPDIRECT3DVERTEXSHADER9 VertexShaderCache::GetClearVertexShader()
-{
-	return ClearVertexShader;
-}
-
-// this class will load the precompiled shaders into our cache
-class VertexShaderCacheInserter : public LinearDiskCacheReader<VertexShaderUid, u8>
-{
-public:
-	void Read(const VertexShaderUid &key, const u8 *value, u32 value_size)
-	{
-		VertexShaderCache::InsertByteCode(key, value, value_size, false);
-	}
-};
-
-void VertexShaderCache::Init()
-{
-	char* vProg = new char[2048];
-	sprintf(vProg,"struct VSOUTPUT\n"
-		"{\n"
-		"float4 vPosition : POSITION;\n"
-		"float2 vTexCoord : TEXCOORD0;\n"
-		"float vTexCoord1 : TEXCOORD1;\n"
-		"};\n"
-		"VSOUTPUT main(float4 inPosition : POSITION,float2 inTEX0 : TEXCOORD0,float2 inTEX1 : TEXCOORD1,float inTEX2 : TEXCOORD2)\n"
-		"{\n"
-		"VSOUTPUT OUT;\n"
-		"OUT.vPosition = inPosition;\n"
-		"OUT.vTexCoord = inTEX0;\n"
-		"OUT.vTexCoord1 = inTEX2;\n"
-		"return OUT;\n"
-		"}\n");
-
-	SimpleVertexShader[0] = D3D::CompileAndCreateVertexShader(vProg, (int)strlen(vProg));
-
-	sprintf(vProg,"struct VSOUTPUT\n"
-		"{\n"
-		"float4 vPosition   : POSITION;\n"
-		"float4 vColor0   : COLOR0;\n"
-		"};\n"
-		"VSOUTPUT main(float4 inPosition : POSITION,float4 inColor0: COLOR0)\n"
-		"{\n"
-		"VSOUTPUT OUT;\n"
-		"OUT.vPosition = inPosition;\n"
-		"OUT.vColor0 = inColor0;\n"
-		"return OUT;\n"
-		"}\n");
-
-	ClearVertexShader = D3D::CompileAndCreateVertexShader(vProg, (int)strlen(vProg));
-	sprintf(vProg,	"struct VSOUTPUT\n"
-		"{\n"
-		"float4 vPosition   : POSITION;\n"
-		"float4 vTexCoord   : TEXCOORD0;\n"
-		"float  vTexCoord1   : TEXCOORD1;\n"
-		"float4 vTexCoord2   : TEXCOORD2;\n"   
-		"float4 vTexCoord3   : TEXCOORD3;\n"
-		"};\n"
-		"VSOUTPUT main(float4 inPosition : POSITION,float2 inTEX0 : TEXCOORD0,float2 inTEX1 : TEXCOORD1,float inTEX2 : TEXCOORD2)\n"
-		"{\n"
-		"VSOUTPUT OUT;"
-		"OUT.vPosition = inPosition;\n"
-		"OUT.vTexCoord  = inTEX0.xyyx;\n"
-		"OUT.vTexCoord1 = inTEX2.x;\n"
-		"OUT.vTexCoord2 = inTEX0.xyyx + (float4(-0.495f,-0.495f, 0.495f,-0.495f) * inTEX1.xyyx);\n"
-		"OUT.vTexCoord3 = inTEX0.xyyx + (float4( 0.495f, 0.495f,-0.495f, 0.495f) * inTEX1.xyyx);\n"	
-		"return OUT;\n"
-		"}\n");
-	SimpleVertexShader[1] = D3D::CompileAndCreateVertexShader(vProg, (int)strlen(vProg));
-
-	sprintf(vProg,	"struct VSOUTPUT\n"
-		"{\n"
-		"float4 vPosition   : POSITION;\n"
-		"float4 vTexCoord   : TEXCOORD0;\n"
-		"float  vTexCoord1   : TEXCOORD1;\n"
-		"float4 vTexCoord2   : TEXCOORD2;\n"   
-		"float4 vTexCoord3   : TEXCOORD3;\n"
-		"};\n"
-		"VSOUTPUT main(float4 inPosition : POSITION,float2 inTEX0 : TEXCOORD0,float2 inTEX1 : TEXCOORD1,float inTEX2 : TEXCOORD2)\n"
-		"{\n"
-		"VSOUTPUT OUT;"
-		"OUT.vPosition = inPosition;\n"
-		"OUT.vTexCoord  = inTEX0.xyyx;\n"
-		"OUT.vTexCoord1 = inTEX2.x;\n"
-		"OUT.vTexCoord2 = inTEX0.xyyx + (float4(-0.9f,-0.45f, 0.9f,-0.45f) * inTEX1.xyyx);\n"
-		"OUT.vTexCoord3 = inTEX0.xyyx + (float4( 0.9f, 0.45f,-0.9f, 0.45f) * inTEX1.xyyx);\n"	
-		"return OUT;\n"
-		"}\n");
-	SimpleVertexShader[2] = D3D::CompileAndCreateVertexShader(vProg, (int)strlen(vProg));	
-
-	Clear();
-	delete [] vProg;
-
-	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX).c_str());
-
-	SETSTAT(stats.numVertexShadersCreated, 0);
-	SETSTAT(stats.numVertexShadersAlive, 0);
-
-	char cache_filename[MAX_PATH];
-	sprintf(cache_filename, "%sdx9-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-	VertexShaderCacheInserter inserter;
-	g_vs_disk_cache.OpenAndRead(cache_filename, inserter);
-
-	if (g_Config.bEnableShaderDebugging)
-		Clear();
-
-	last_entry = NULL;
-}
-
-void VertexShaderCache::Clear()
-{
-	for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
-		iter->second.Destroy();
-	vshaders.clear();
-	vertex_uid_checker.Invalidate();
-
-	last_entry = NULL;
-}
-
-void VertexShaderCache::Shutdown()
-{
-	for (int i = 0; i < MAX_SSAA_SHADERS; i++)
-	{
-		if (SimpleVertexShader[i])
-			SimpleVertexShader[i]->Release();
-		SimpleVertexShader[i] = NULL;
-	}
-
-	if (ClearVertexShader)
-		ClearVertexShader->Release();
-	ClearVertexShader = NULL;
-
-	Clear();
-	g_vs_disk_cache.Sync();
-	g_vs_disk_cache.Close();
-}
-
-bool VertexShaderCache::SetShader(u32 components)
-{
-	VertexShaderUid uid;
-	GetVertexShaderUid(uid, components, API_D3D9);
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		VertexShaderCode code;
-		GenerateVertexShaderCode(code, components, API_D3D9);
-		vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
-	}
-
-	if (last_entry)
-	{
-		if (uid == last_uid)
-		{
-			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-			return (last_entry->shader != NULL);
-		}
-	}
-
-	last_uid = uid;
-
-	VSCache::iterator iter = vshaders.find(uid);
-	if (iter != vshaders.end())
-	{
-		const VSCacheEntry &entry = iter->second;
-		last_entry = &entry;
-
-		if (entry.shader) D3D::SetVertexShader(entry.shader);
-		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-		return (entry.shader != NULL);
-	}
-
-	VertexShaderCode code;
-	GenerateVertexShaderCode(code, components, API_D3D9);
-
-	u8 *bytecode;
-	int bytecodelen;
-	if (!D3D::CompileVertexShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &bytecode, &bytecodelen))
-	{
-		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
-		return false;
-	}
-	g_vs_disk_cache.Append(uid, bytecode, bytecodelen);
-
-	bool success = InsertByteCode(uid, bytecode, bytecodelen, true);
-	if (g_ActiveConfig.bEnableShaderDebugging && success)
-	{
-		vshaders[uid].code = code.GetBuffer();
-	}
-	delete [] bytecode;
-	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-	return success;
-}
-
-bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate) {
-	LPDIRECT3DVERTEXSHADER9 shader = D3D::CreateVertexShaderFromByteCode(bytecode, bytecodelen);
-
-	// Make an entry in the table
-	VSCacheEntry entry;
-	entry.shader = shader;
-
-	vshaders[uid] = entry;
-	last_entry = &vshaders[uid];
-	if (!shader)
-		return false;
-
-	INCSTAT(stats.numVertexShadersCreated);
-	SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
-	if (activate)
-	{
-		D3D::SetVertexShader(shader);
-		return true;
-	}
-	return false;
-}
-
-float VSConstantbuffer[4*C_VENVCONST_END];
-
-void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	float* VSConstantbuffer_pointer = &VSConstantbuffer[const_number];
-	VSConstantbuffer_pointer[0] = f1;
-	VSConstantbuffer_pointer[1] = f2;
-	VSConstantbuffer_pointer[2] = f3;
-	VSConstantbuffer_pointer[3] = f4;
-	DX9::D3D::dev->SetVertexShaderConstantF(const_number, VSConstantbuffer_pointer, 1);
-}
-
-void Renderer::SetVSConstant4fv(unsigned int const_number, const float *f)
-{
-	DX9::D3D::dev->SetVertexShaderConstantF(const_number, f, 1);
-}
-
-void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	float* VSConstantbuffer_pointer = &VSConstantbuffer[const_number];
-	for (unsigned int i = 0; i < count; i++)
-	{
-		*VSConstantbuffer_pointer++ = *f++;
-		*VSConstantbuffer_pointer++ = *f++;
-		*VSConstantbuffer_pointer++ = *f++;
-		*VSConstantbuffer_pointer++ = 0.f;
-	}
-	DX9::D3D::dev->SetVertexShaderConstantF(const_number, &VSConstantbuffer[const_number], count);
-}
-
-void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	DX9::D3D::dev->SetVertexShaderConstantF(const_number, f, count);
-}
-
-}  // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
deleted file mode 100644
index 32fbea92be..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "D3DBase.h"
-
-#include <map>
-#include <string>
-
-#include "D3DBase.h"
-#include "VertexShaderGen.h"
-
-namespace DX9
-{
-
-class VertexShaderCache
-{
-private:
-	struct VSCacheEntry
-	{ 
-		LPDIRECT3DVERTEXSHADER9 shader;
-
-		std::string code;
-
-		VSCacheEntry() : shader(NULL) {}
-		void Destroy()
-		{
-			if (shader)
-				shader->Release();
-			shader = NULL;
-		}
-	};
-
-	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
-
-	static VSCache vshaders;
-	static const VSCacheEntry *last_entry;
-	static VertexShaderUid last_uid;
-
-	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
-
-	static void Clear();
-
-public:
-	static void Init();
-	static void Shutdown();
-	static bool SetShader(u32 components);
-	static LPDIRECT3DVERTEXSHADER9 GetSimpleVertexShader(int level);
-	static LPDIRECT3DVERTEXSHADER9 GetClearVertexShader();	
-	static bool InsertByteCode(const VertexShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate);
-
-	static std::string GetCurrentShaderCode();
-};
-
-}  // namespace DX9
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
deleted file mode 100644
index 5b7c54d326..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifndef DX9_VIDEO_BACKEND_H_
-#define DX9_VIDEO_BACKEND_H_
-
-#include "VideoBackendBase.h"
-
-namespace DX9
-{
-
-class VideoBackend : public VideoBackendHardware
-{
-	bool Initialize(void *&);
-	void Shutdown();
-
-	std::string GetName();
-	std::string GetDisplayName();
-
-	void Video_Prepare();
-	void Video_Cleanup();
-
-	void ShowConfig(void* parent);
-
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
deleted file mode 100644
index 08c76f4a49..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Atomic.h"
-#include "Thread.h"
-#include "LogManager.h"
-
-#if defined(HAVE_WX) && HAVE_WX
-#include "VideoConfigDiag.h"
-#endif // HAVE_WX
-
-#if defined(HAVE_WX) && HAVE_WX
-#include "Debugger/DebuggerPanel.h"
-#endif // HAVE_WX
-
-#include "MainBase.h"
-#include "main.h"
-#include "VideoConfig.h"
-#include "Fifo.h"
-#include "OpcodeDecoding.h"
-#include "TextureCache.h"
-#include "BPStructs.h"
-#include "VertexManager.h"
-#include "FramebufferManager.h"
-#include "VertexLoaderManager.h"
-#include "VertexShaderManager.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderCache.h"
-#include "PixelShaderCache.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "OnScreenDisplay.h"
-#include "D3DTexture.h"
-#include "D3DUtil.h"
-#include "EmuWindow.h"
-#include "VideoState.h"
-#include "Render.h"
-#include "DLCache.h"
-#include "IndexGenerator.h"
-#include "IniFile.h"
-#include "Core.h"
-#include "Host.h"
-
-#include "ConfigManager.h"
-#include "VideoBackend.h"
-#include "PerfQuery.h"
-
-namespace DX9
-{
-
-unsigned int VideoBackend::PeekMessages()
-{
-	MSG msg;
-	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-	{
-		if (msg.message == WM_QUIT)
-			return FALSE;
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-	return TRUE;
-}
-
-void VideoBackend::UpdateFPSDisplay(const char *text)
-{
-	TCHAR temp[512];
-	swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX9 | %hs"), scm_rev_str, text);
-	EmuWindow::SetWindowText(temp);
-}
-
-std::string VideoBackend::GetName()
-{
-	return "DX9";
-}
-
-std::string VideoBackend::GetDisplayName()
-{
-	return "Direct3D9 (deprecated)";
-}
-
-void InitBackendInfo()
-{
-	DX9::D3D::Init();
-	D3DCAPS9 device_caps = DX9::D3D::GetCaps();
-	const int shaderModel = ((device_caps.PixelShaderVersion >> 8) & 0xFF);
-	const int maxConstants = (shaderModel < 3) ? 32 : ((shaderModel < 4) ? 224 : 65536);
-	g_Config.backend_info.APIType = shaderModel < 3 ? API_D3D9_SM20 : API_D3D9_SM30;
-	g_Config.backend_info.bUseRGBATextures = false;
-	g_Config.backend_info.bUseMinimalMipCount = true;
-	g_Config.backend_info.bSupports3DVision = true;
-	g_Config.backend_info.bSupportsPrimitiveRestart = false; // D3D9 does not support primitive restart
-	g_Config.backend_info.bSupportsSeparateAlphaFunction = device_caps.PrimitiveMiscCaps & D3DPMISCCAPS_SEPARATEALPHABLEND;
-	// Dual source blend disabled by default until a proper method to test for support is found	
-	g_Config.backend_info.bSupports3DVision = true;
-	OSVERSIONINFO info;
-	ZeroMemory(&info, sizeof(OSVERSIONINFO));
-	info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-	if (GetVersionEx(&info))
-	{
-		// dual source blending is only supported in windows 7 o newer. sorry xp users
-		// we cannot test for device caps because most drivers just declare the minimun caps
-		// and don't expose their support for some functionalities              
-		g_Config.backend_info.bSupportsDualSourceBlend = g_Config.backend_info.bSupportsSeparateAlphaFunction && (info.dwPlatformId == VER_PLATFORM_WIN32_NT) && ((info.dwMajorVersion > 6) || ((info.dwMajorVersion == 6) && info.dwMinorVersion >= 1));
-	}
-	else
-	{
-		g_Config.backend_info.bSupportsDualSourceBlend = false;
-	}
-	g_Config.backend_info.bSupportsFormatReinterpretation = true;
-	g_Config.backend_info.bSupportsPixelLighting = C_PLIGHTS + 40 <= maxConstants && C_PMATERIALS + 4 <= maxConstants;
-	g_Config.backend_info.bSupportsEarlyZ = false;
-
-	// adapters
-	g_Config.backend_info.Adapters.clear();
-	for (int i = 0; i < DX9::D3D::GetNumAdapters(); ++i)
-		g_Config.backend_info.Adapters.push_back(DX9::D3D::GetAdapter(i).ident.Description);
-
-	// aamodes
-	g_Config.backend_info.AAModes.clear();
-	if (g_Config.iAdapter < DX9::D3D::GetNumAdapters())
-	{
-		const DX9::D3D::Adapter &adapter = DX9::D3D::GetAdapter(g_Config.iAdapter);
-
-		for (int i = 0; i < (int)adapter.aa_levels.size(); ++i)
-			g_Config.backend_info.AAModes.push_back(adapter.aa_levels[i].name);
-	}
-
-	// Clear ppshaders string vector
-	g_Config.backend_info.PPShaders.clear();
-
-	DX9::D3D::Shutdown();
-}
-
-void VideoBackend::ShowConfig(void* parent)
-{
-#if defined(HAVE_WX) && HAVE_WX
-	InitBackendInfo();
-	VideoConfigDiag diag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9");
-	diag.ShowModal();
-#endif
-}
-
-bool VideoBackend::Initialize(void *&window_handle)
-{
-	InitializeShared();
-	InitBackendInfo();
-
-	frameCount = 0;
-
-	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx9.ini").c_str());
-	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(),
-	                     SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str());
-	g_Config.UpdateProjectionHack();
-	g_Config.VerifyValidity();
-	// as only some driver/hardware configurations support dual source blending only enable it if is 
-	// configured by user
-	g_Config.backend_info.bSupportsDualSourceBlend &= g_Config.bForceDualSourceBlend;
-	UpdateActiveConfig();
-
-	window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Loading - Please wait."));
-	if (window_handle == NULL)
-	{
-		ERROR_LOG(VIDEO, "An error has occurred while trying to create the window.");
-		return false;
-	}
-	else if (FAILED(DX9::D3D::Init()))
-	{
-		MessageBox(GetActiveWindow(), _T("Unable to initialize Direct3D. Please make sure that you have the latest version of DirectX 9.0c correctly installed."), _T("Fatal Error"), MB_ICONERROR|MB_OK);
-		return false;
-	}
-
-	s_BackendInitialized = true;
-
-	return true;
-}
-
-void VideoBackend::Video_Prepare()
-{
-	// Better be safe...
-	s_efbAccessRequested = FALSE;
-	s_FifoShuttingDown = FALSE;
-	s_swapRequested = FALSE;
-
-	// internal interfaces
-	g_vertex_manager = new VertexManager;
-	g_perf_query = new PerfQuery;
-	g_renderer = new Renderer;
-	g_texture_cache = new TextureCache;	
-	// VideoCommon
-	BPInit();
-	Fifo_Init();
-	IndexGenerator::Init();
-	VertexLoaderManager::Init();
-	OpcodeDecoder_Init();
-	VertexShaderManager::Init();
-	PixelShaderManager::Init();
-	CommandProcessor::Init();
-	PixelEngine::Init();
-	DLCache::Init();	
-	// Notify the core that the video backend is ready
-	Host_Message(WM_USER_CREATE);
-}
-
-void VideoBackend::Shutdown()
-{
-	s_BackendInitialized = false;
-
-	// TODO: should be in Video_Cleanup
-	if (g_renderer)
-	{
-		s_efbAccessRequested = FALSE;
-		s_FifoShuttingDown = FALSE;
-		s_swapRequested = FALSE;
-
-		// VideoCommon
-		DLCache::Shutdown();
-		Fifo_Shutdown();
-		CommandProcessor::Shutdown();
-		PixelShaderManager::Shutdown();
-		VertexShaderManager::Shutdown();
-		OpcodeDecoder_Shutdown();
-		VertexLoaderManager::Shutdown();
-
-		// internal interfaces
-		PixelShaderCache::Shutdown();
-		VertexShaderCache::Shutdown();
-		delete g_texture_cache;
-		delete g_renderer;
-		delete g_perf_query;
-		delete g_vertex_manager;
-		g_renderer = NULL;
-		g_texture_cache = NULL;
-	}
-	D3D::Shutdown();
-}
-
-void VideoBackend::Video_Cleanup() {
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.h b/Source/Plugins/Plugin_VideoDX9/Src/main.h
deleted file mode 100644
index 07d615b6e1..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef MAIN_H
-#define MAIN_H
-
-#include <string>
-
-#include "VideoBackend.h"
-#include "Render.h"
-#include "MainBase.h"
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp
deleted file mode 100644
index b602b39925..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h
deleted file mode 100644
index 2431184aaf..0000000000
--- a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#include <tchar.h>
-#include <windows.h> 
diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
deleted file mode 100644
index f3d7ce4e4f..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-set(SRCS	Src/FramebufferManager.cpp
-			Src/GLUtil.cpp
-			Src/main.cpp
-			Src/NativeVertexFormat.cpp
-			Src/PerfQuery.cpp
-			Src/PixelShaderCache.cpp
-			Src/PostProcessing.cpp
-			Src/ProgramShaderCache.cpp
-			Src/RasterFont.cpp
-			Src/Render.cpp
-			Src/SamplerCache.cpp
-			Src/StreamBuffer.cpp
-			Src/TextureCache.cpp
-			Src/TextureConverter.cpp
-			Src/VertexShaderCache.cpp
-			Src/VertexManager.cpp)
-
-set(LIBS	videocommon
-			SOIL
-			common
-			${X11_LIBRARIES})
-if(USE_EGL)
-	set(LIBS ${LIBS}
-		EGL)
-endif()
-
-if(USE_GLES3)
-	set(LIBS ${LIBS}
-		GLESv2)
-	set(SRCS ${SRCS} Src/GLFunctions.cpp)
-else()
-	set(LIBS ${LIBS}
-		GLEW
-		${OPENGL_LIBRARIES})
-endif()
-
-if(wxWidgets_FOUND)
-	set(LIBS	${LIBS} ${wxWidgets_LIBRARIES})
-endif(wxWidgets_FOUND)
-
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(LIBS	${LIBS} clrun)
-endif()
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-	${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-	set(LIBS	${LIBS} usbhid)
-endif()
-
-add_library(videoogl STATIC ${SRCS})
-target_link_libraries(videoogl ${LIBS})
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
deleted file mode 100644
index 403aac2c30..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{1909CD2D-1707-456F-86CA-0DF42A727C99}</ProjectGuid>
-    <RootNamespace>Plugin_VideoOGL</RootNamespace>
-    <ProjectName>VideoOGL</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\GLew\include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\FramebufferManager.cpp" />
-    <ClCompile Include="Src\GLUtil.cpp" />
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\NativeVertexFormat.cpp" />
-    <ClCompile Include="Src\PerfQuery.cpp" />
-    <ClCompile Include="Src\PixelShaderCache.cpp" />
-    <ClCompile Include="Src\PostProcessing.cpp" />
-    <ClCompile Include="Src\ProgramShaderCache.cpp" />
-    <ClCompile Include="Src\RasterFont.cpp" />
-    <ClCompile Include="Src\Render.cpp" />
-    <ClCompile Include="Src\SamplerCache.cpp" />
-    <ClCompile Include="Src\StreamBuffer.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCache.cpp" />
-    <ClCompile Include="Src\TextureConverter.cpp" />
-    <ClCompile Include="Src\VertexManager.cpp" />
-    <ClCompile Include="Src\VertexShaderCache.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\FramebufferManager.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\GLUtil.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\PerfQuery.h" />
-    <ClInclude Include="Src\PostProcessing.h" />
-    <ClInclude Include="Src\ProgramShaderCache.h" />
-    <ClInclude Include="Src\RasterFont.h" />
-    <ClInclude Include="Src\Render.h" />
-	<ClInclude Include="Src\SamplerCache.h" />
-    <ClInclude Include="Src\StreamBuffer.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TextureCache.h" />
-    <ClInclude Include="Src\TextureConverter.h" />
-    <ClInclude Include="Src\VertexManager.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
-      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Core\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
deleted file mode 100644
index a8b79d85ad..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\main.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\NativeVertexFormat.cpp">
-      <Filter>Decoder</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexManager.cpp">
-      <Filter>Decoder</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GLUtil.cpp">
-      <Filter>GLUtil</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureConverter.cpp">
-      <Filter>GLUtil</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\RasterFont.cpp">
-      <Filter>Logging</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FramebufferManager.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PixelShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PostProcessing.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ProgramShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Render.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\StreamBuffer.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TextureCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VertexShaderCache.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PerfQuery.cpp">
-      <Filter>Render</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\main.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\VertexManager.h">
-      <Filter>Decoder</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GLUtil.h">
-      <Filter>GLUtil</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureConverter.h">
-      <Filter>GLUtil</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\RasterFont.h">
-      <Filter>Logging</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FramebufferManager.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PostProcessing.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ProgramShaderCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Render.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TextureCache.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PerfQuery.h">
-      <Filter>Render</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Decoder">
-      <UniqueIdentifier>{a0bb3390-6085-4d10-af48-b60eb4c920e7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GLUtil">
-      <UniqueIdentifier>{5b16573b-fb79-4a51-aa7a-d760df844128}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Logging">
-      <UniqueIdentifier>{14fca297-ab2f-4686-855f-65ab18602248}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Render">
-      <UniqueIdentifier>{aaa16061-dca9-4155-be44-f77538e839fc}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
deleted file mode 100644
index f3b8578b23..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-#include "FramebufferManager.h"
-#include "VertexShaderGen.h"
-#include "OnScreenDisplay.h"
-
-#include "TextureConverter.h"
-#include "Render.h"
-#include "HW/Memmap.h"
-
-namespace OGL
-{
-
-int FramebufferManager::m_targetWidth;
-int FramebufferManager::m_targetHeight;
-int FramebufferManager::m_msaaSamples;
-int FramebufferManager::m_msaaCoverageSamples;
-
-GLuint FramebufferManager::m_efbFramebuffer;
-GLuint FramebufferManager::m_efbColor; // Renderbuffer in MSAA mode; Texture otherwise
-GLuint FramebufferManager::m_efbDepth; // Renderbuffer in MSAA mode; Texture otherwise
-
-// Only used in MSAA mode.
-GLuint FramebufferManager::m_resolvedFramebuffer;
-GLuint FramebufferManager::m_resolvedColorTexture;
-GLuint FramebufferManager::m_resolvedDepthTexture;
-
-GLuint FramebufferManager::m_xfbFramebuffer;
-
-// reinterpret pixel format
-GLuint FramebufferManager::m_pixel_format_vao;
-GLuint FramebufferManager::m_pixel_format_vbo;
-SHADER FramebufferManager::m_pixel_format_shaders[2];
-
-
-FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int msaaSamples, int msaaCoverageSamples)
-{
-	m_efbFramebuffer = 0;
-	m_efbColor = 0;
-	m_efbDepth = 0;
-	m_resolvedFramebuffer = 0;
-	m_resolvedColorTexture = 0;
-	m_resolvedDepthTexture = 0;
-	m_xfbFramebuffer = 0;
-	
-	m_targetWidth = targetWidth;
-	m_targetHeight = targetHeight;
-
-	m_msaaSamples = msaaSamples;
-	m_msaaCoverageSamples = msaaCoverageSamples;
-
-	// The EFB can be set to different pixel formats by the game through the
-	// BPMEM_ZCOMPARE register (which should probably have a different name).
-	// They are:
-	// - 24-bit RGB (8-bit components) with 24-bit Z
-	// - 24-bit RGBA (6-bit components) with 24-bit Z
-	// - Multisampled 16-bit RGB (5-6-5 format) with 16-bit Z
-	// We only use one EFB format here: 32-bit ARGB with 24-bit Z.
-	// Multisampling depends on user settings.
-	// The distinction becomes important for certain operations, i.e. the
-	// alpha channel should be ignored if the EFB does not have one.
-
-	// Create EFB target.
-
-	glGenFramebuffers(1, &m_efbFramebuffer);
-	glActiveTexture(GL_TEXTURE0 + 9);
-
-	if (m_msaaSamples <= 1)
-	{
-		// EFB targets will be textures in non-MSAA mode.
-
-		GLuint glObj[3];
-		glGenTextures(3, glObj);
-		m_efbColor = glObj[0];
-		m_efbDepth = glObj[1];
-		m_resolvedColorTexture = glObj[2]; // needed for pixel format convertion
-
-		glBindTexture(getFbType(), m_efbColor);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-		glBindTexture(getFbType(), m_efbDepth);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-		
-		glBindTexture(getFbType(), m_resolvedColorTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-		// Bind target textures to the EFB framebuffer.
-
-		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
-
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_efbDepth, 0);
-
-		GL_REPORT_FBO_ERROR();
-	}
-#ifndef USE_GLES3
-	else
-	{
-		// EFB targets will be renderbuffers in MSAA mode (required by OpenGL).
-		// Resolve targets will be created to transfer EFB to RAM textures.
-		// XFB framebuffer will be created to transfer EFB to XFB texture.
-
-		// Create EFB target renderbuffers.
-
-		GLuint glObj[2];
-		glGenRenderbuffers(2, glObj);
-		m_efbColor = glObj[0];
-		m_efbDepth = glObj[1];
-
-		glBindRenderbuffer(GL_RENDERBUFFER, m_efbColor);
-		if (m_msaaCoverageSamples)
-			glRenderbufferStorageMultisampleCoverageNV(GL_RENDERBUFFER, m_msaaCoverageSamples, m_msaaSamples, GL_RGBA8, m_targetWidth, m_targetHeight);
-		else
-			glRenderbufferStorageMultisample(GL_RENDERBUFFER, m_msaaSamples, GL_RGBA8, m_targetWidth, m_targetHeight);
-
-		glBindRenderbuffer(GL_RENDERBUFFER, m_efbDepth);
-		if (m_msaaCoverageSamples)
-			glRenderbufferStorageMultisampleCoverageNV(GL_RENDERBUFFER, m_msaaCoverageSamples, m_msaaSamples, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight);
-		else
-			glRenderbufferStorageMultisample(GL_RENDERBUFFER, m_msaaSamples, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight);
-
-		glBindRenderbuffer(GL_RENDERBUFFER, 0);
-
-		// Bind target renderbuffers to EFB framebuffer.
-
-		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
-
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_efbColor);
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_efbDepth);
-
-		GL_REPORT_FBO_ERROR();
-
-		// Create resolved targets for transferring multisampled EFB to texture.
-
-		glGenFramebuffers(1, &m_resolvedFramebuffer);
-
-		glGenTextures(2, glObj);
-		m_resolvedColorTexture = glObj[0];
-		m_resolvedDepthTexture = glObj[1];
-
-		glBindTexture(getFbType(), m_resolvedColorTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-		glBindTexture(getFbType(), m_resolvedDepthTexture);
-		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
-
-		// Bind resolved textures to resolved framebuffer.
-
-		glBindFramebuffer(GL_FRAMEBUFFER, m_resolvedFramebuffer);
-
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_resolvedColorTexture, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_resolvedDepthTexture, 0);
-
-		GL_REPORT_FBO_ERROR();
-
-		// Return to EFB framebuffer.
-
-		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
-	}
-#endif
-	// Create XFB framebuffer; targets will be created elsewhere.
-
-	glGenFramebuffers(1, &m_xfbFramebuffer);
-	
-	// EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f
-	glViewport(0, 0, m_targetWidth, m_targetHeight);
-	glScissor(0, 0, m_targetWidth, m_targetHeight);
-	glClearColor(0.f, 0.f, 0.f, 1.f);
-	glClearDepthf(1.0f);
-	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-	
-	// reinterpret pixel format
-	glGenBuffers(1, &m_pixel_format_vbo);
-	glGenVertexArrays(1, &m_pixel_format_vao);
-	glBindVertexArray(m_pixel_format_vao);
-	glBindBuffer(GL_ARRAY_BUFFER, m_pixel_format_vbo);
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*2, NULL);
-	
-	float vertices[] = {
-		-1.0,	-1.0,
-		1.0,	-1.0,
-		-1.0,	1.0,
-		1.0,	1.0,
-	};
-	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-	
-	char vs[] = 
-		"ATTRIN vec2 rawpos;\n"
-		"void main(void) {\n"
-		"	gl_Position = vec4(rawpos,0,1);\n"
-		"}\n";
-	
-	char ps_rgba6_to_rgb8[] = 
-		"uniform sampler2DRect samp9;\n"
-		"COLOROUT(ocol0)\n"
-		"void main()\n"
-		"{\n"
-		"	ivec4 src6 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 63.f));\n"
-		"	ivec4 dst8;\n"
-		"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
-		"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
-		"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
-		"	dst8.a = 255;\n"
-		"	ocol0 = float4(dst8) / 255.f;\n"
-		"}";
-		
-	char ps_rgb8_to_rgba6[] = 
-		"uniform sampler2DRect samp9;\n"
-		"COLOROUT(ocol0)\n"
-		"void main()\n"
-		"{\n"
-		"	ivec4 src8 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 255.f));\n"
-		"	ivec4 dst6;\n"
-		"	dst6.r = src8.r >> 2;\n"
-		"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
-		"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
-		"	dst6.a = src8.b & 0x3F;\n"
-		"	ocol0 = float4(dst6) / 63.f;\n"
-		"}";
-	
-	if(g_ogl_config.eSupportedGLSLVersion != GLSL_120)
-	{
-		// HACK: This shaders aren't glsl120 compatible as glsl120 don't support bit operations
-		// it could be workaround by floor + frac + tons off additions, but I think it isn't worth 
-		ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6);
-		ProgramShaderCache::CompileShader(m_pixel_format_shaders[1], vs, ps_rgba6_to_rgb8);
-	}
-
-}
-
-FramebufferManager::~FramebufferManager()
-{
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-	GLuint glObj[3];
-
-	// Note: OpenGL deletion functions silently ignore parameters of "0".
-
-	glObj[0] = m_efbFramebuffer;
-	glObj[1] = m_resolvedFramebuffer;
-	glObj[2] = m_xfbFramebuffer;
-	glDeleteFramebuffers(3, glObj);
-	m_efbFramebuffer = 0;
-	m_xfbFramebuffer = 0;
-
-	glObj[0] = m_resolvedColorTexture;
-	glObj[1] = m_resolvedDepthTexture;
-	glDeleteTextures(2, glObj);
-	m_resolvedColorTexture = 0;
-	m_resolvedDepthTexture = 0;
-
-	glObj[0] = m_efbColor;
-	glObj[1] = m_efbDepth;
-	if (m_msaaSamples <= 1)
-		glDeleteTextures(2, glObj);
-	else
-		glDeleteRenderbuffers(2, glObj);
-	m_efbColor = 0;
-	m_efbDepth = 0;
-	
-	// reinterpret pixel format
-	glDeleteVertexArrays(1, &m_pixel_format_vao);
-	glDeleteBuffers(1, &m_pixel_format_vbo);
-	m_pixel_format_shaders[0].Destroy();
-	m_pixel_format_shaders[1].Destroy();
-}
-
-GLuint FramebufferManager::GetEFBColorTexture(const EFBRectangle& sourceRc)
-{
-	if (m_msaaSamples <= 1)
-	{
-		return m_efbColor;
-	}
-	else
-	{
-		// Transfer the EFB to a resolved texture. EXT_framebuffer_blit is
-		// required.
-
-		TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
-		targetRc.ClampLL(0, 0, m_targetWidth, m_targetHeight);
-
-		// Resolve.
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer);
-		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer);
-		glBlitFramebuffer(
-			targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
-			targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
-			GL_COLOR_BUFFER_BIT, GL_NEAREST
-			);
-
-		// Return to EFB.
-		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
-
-		return m_resolvedColorTexture;
-	}
-}
-
-GLuint FramebufferManager::GetEFBDepthTexture(const EFBRectangle& sourceRc)
-{
-	if (m_msaaSamples <= 1)
-	{
-		return m_efbDepth;
-	}
-	else
-	{
-		// Transfer the EFB to a resolved texture. EXT_framebuffer_blit is
-		// required.
-
-		TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
-		targetRc.ClampLL(0, 0, m_targetWidth, m_targetHeight);
-
-		// Resolve.
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer);
-		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer);
-		glBlitFramebuffer(
-			targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
-			targetRc.left, targetRc.top, targetRc.right, targetRc.bottom,
-			GL_DEPTH_BUFFER_BIT, GL_NEAREST
-			);
-
-		// Return to EFB.
-		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
-
-		return m_resolvedDepthTexture;
-	}
-}
-
-void FramebufferManager::CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma)
-{
-	u8* xfb_in_ram = Memory::GetPointer(xfbAddr);
-	if (!xfb_in_ram)
-	{
-		WARN_LOG(VIDEO, "Tried to copy to invalid XFB address");
-		return;
-	}
-
-	TargetRectangle targetRc = g_renderer->ConvertEFBRectangle(sourceRc);
-	TextureConverter::EncodeToRamYUYV(ResolveAndGetRenderTarget(sourceRc), targetRc, xfb_in_ram, fbWidth, fbHeight);
-}
-
-void FramebufferManager::SetFramebuffer(GLuint fb)
-{
-	glBindFramebuffer(GL_FRAMEBUFFER, fb != 0 ? fb : GetEFBFramebuffer());
-}
-
-// Apply AA if enabled
-GLuint FramebufferManager::ResolveAndGetRenderTarget(const EFBRectangle &source_rect)
-{
-	return GetEFBColorTexture(source_rect);
-}
-
-GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_rect)
-{
-	return GetEFBDepthTexture(source_rect);
-}
-
-void FramebufferManager::ReinterpretPixelData(unsigned int convtype)
-{
-	if(g_ogl_config.eSupportedGLSLVersion == GLSL_120) {
-		// This feature isn't supported by glsl120
-		
-		// TODO: move this to InitBackendInfo
-		// We have to disable both the active and the stored config. Else we would either
-		// show this line per format change in one frame or once per frame.
-		OSD::AddMessage("Format Change Emulation isn't supported by your GPU.", 10000);
-		g_ActiveConfig.bEFBEmulateFormatChanges = false;
-		g_Config.bEFBEmulateFormatChanges = false;
-		return;
-	}
-	
-	g_renderer->ResetAPIState();
-	
-	GLuint src_texture = 0;
-	
-	if(m_msaaSamples > 1)
-	{
-		// MSAA mode, so resolve first
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer);
-		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer);
-		glBlitFramebuffer(
-			0, 0, m_targetWidth, m_targetHeight,
-			0, 0, m_targetWidth, m_targetHeight,
-			GL_COLOR_BUFFER_BIT, GL_NEAREST
-		);
-
-		// Return to EFB.
-		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_efbFramebuffer);
-		
-		src_texture = m_resolvedColorTexture;
-	}
-	else
-	{
-		// non-MSAA mode, so switch textures
-		src_texture = m_efbColor;
-		m_efbColor = m_resolvedColorTexture;
-		m_resolvedColorTexture = src_texture;
-		
-		// also switch them on fbo
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
-	}
-	glViewport(0,0, m_targetWidth, m_targetHeight);
-	glActiveTexture(GL_TEXTURE0 + 9);
-	glBindTexture(getFbType(), src_texture);
-	
-	m_pixel_format_shaders[convtype ? 1 : 0].Bind();
-	glBindVertexArray(m_pixel_format_vao);
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	
-	g_renderer->RestoreAPIState();
-}
-
-XFBSource::~XFBSource()
-{
-	glDeleteTextures(1, &texture);
-}
-
-
-void XFBSource::Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const
-{
-	// Texture map xfbSource->texture onto the main buffer
-	glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
-	glBlitFramebuffer(sourcerc.left, sourcerc.bottom, sourcerc.right, sourcerc.top,
-		drawrc.left, drawrc.bottom, drawrc.right, drawrc.top,
-		GL_COLOR_BUFFER_BIT, GL_LINEAR);
-
-	GL_REPORT_ERRORD();
-}
-
-void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
-{
-	TextureConverter::DecodeToTexture(xfbAddr, fbWidth, fbHeight, texture);
-}
-
-void XFBSource::CopyEFB(float Gamma)
-{
-	g_renderer->ResetAPIState();
-	
-	// Copy EFB data to XFB and restore render target again
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetEFBFramebuffer());
-	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, FramebufferManager::GetXFBFramebuffer());
-
-	// Bind texture.
-	glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
-	GL_REPORT_FBO_ERROR();
-
-	glBlitFramebuffer(
-		0, 0, texWidth, texHeight,
-		0, 0, texWidth, texHeight,
-		GL_COLOR_BUFFER_BIT, GL_NEAREST
-	);
-
-	// Return to EFB.
-	FramebufferManager::SetFramebuffer(0);
-	
-	g_renderer->RestoreAPIState();
-
-}
-
-XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, unsigned int target_height)
-{
-	GLuint texture;
-
-	glGenTextures(1, &texture);
-	
-	glActiveTexture(GL_TEXTURE0 + 9);
-	glBindTexture(GL_TEXTURE_2D, texture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, target_width, target_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-	return new XFBSource(texture);
-}
-
-void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc)
-{
-	*width = m_targetWidth;
-	*height = m_targetHeight;
-}
-
-}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
deleted file mode 100644
index 5b0d66f7f6..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _FRAMEBUFFERMANAGER_H_
-#define _FRAMEBUFFERMANAGER_H_
-
-#include "GLUtil.h"
-#include "FramebufferManagerBase.h"
-#include "ProgramShaderCache.h"
-#include "Render.h"
-
-// On the GameCube, the game sends a request for the graphics processor to
-// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
-// called the XFB (External Framebuffer). The size and location of the XFB is
-// decided at the time of the copy, and the format is always YUYV. The video
-// interface is given a pointer to the XFB, which will be decoded and
-// displayed on the TV.
-//
-// There are two ways for Dolphin to emulate this:
-//
-// Real XFB mode:
-//
-// Dolphin will behave like the GameCube and encode the EFB to
-// a portion of GameCube RAM. The emulated video interface will decode the data
-// for output to the screen.
-//
-// Advantages: Behaves exactly like the GameCube.
-// Disadvantages: Resolution will be limited.
-//
-// Virtual XFB mode:
-//
-// When a request is made to copy the EFB to an XFB, Dolphin
-// will remember the RAM location and size of the XFB in a Virtual XFB list.
-// The video interface will look up the XFB in the list and use the enhanced
-// data stored there, if available.
-//
-// Advantages: Enables high resolution graphics, better than real hardware.
-// Disadvantages: If the GameCube CPU writes directly to the XFB (which is
-// possible but uncommon), the Virtual XFB will not capture this information.
-
-// There may be multiple XFBs in GameCube RAM. This is the maximum number to
-// virtualize.
-
-namespace OGL {
-
-struct XFBSource : public XFBSourceBase
-{
-	XFBSource(GLuint tex) : texture(tex) {}
-	~XFBSource();
-
-	void CopyEFB(float Gamma);
-	void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
-	void Draw(const MathUtil::Rectangle<float> &sourcerc,
-		const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
-
-	const GLuint texture;
-};
-
-inline GLenum getFbType()
-{
-#ifndef USE_GLES3
-	return GL_TEXTURE_RECTANGLE;
-#endif
-	return GL_TEXTURE_2D;
-}
-
-class FramebufferManager : public FramebufferManagerBase
-{
-public:
-	FramebufferManager(int targetWidth, int targetHeight, int msaaSamples, int msaaCoverageSamples);
-	~FramebufferManager();
-
-	// To get the EFB in texture form, these functions may have to transfer
-	// the EFB to a resolved texture first.
-	static GLuint GetEFBColorTexture(const EFBRectangle& sourceRc);
-	static GLuint GetEFBDepthTexture(const EFBRectangle& sourceRc);
-
-	static GLuint GetEFBFramebuffer() { return m_efbFramebuffer; }
-	static GLuint GetXFBFramebuffer() { return m_xfbFramebuffer; }
-
-	// Resolved framebuffer is only used in MSAA mode.
-	static GLuint GetResolvedFramebuffer() { return m_resolvedFramebuffer; }
-
-	static void SetFramebuffer(GLuint fb);
-
-	// If in MSAA mode, this will perform a resolve of the specified rectangle, and return the resolve target as a texture ID.
-	// Thus, this call may be expensive. Don't repeat it unnecessarily.
-	// If not in MSAA mode, will just return the render target texture ID.
-	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
-	static GLuint ResolveAndGetRenderTarget(const EFBRectangle &rect);
-
-	// Same as above but for the depth Target.
-	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
-	static GLuint ResolveAndGetDepthTarget(const EFBRectangle &rect);
-	
-	// Convert EFB content on pixel format change. 
-	// convtype=0 -> rgb8->rgba6, convtype=2 -> rgba6->rgb8
-	static void ReinterpretPixelData(unsigned int convtype);
-
-private:
-	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
-	void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc);
-
-	void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
-
-	static int m_targetWidth;
-	static int m_targetHeight;
-	static int m_msaaSamples;
-	static int m_msaaCoverageSamples;
-
-	static GLuint m_efbFramebuffer;
-	static GLuint m_efbColor; // Renderbuffer in MSAA mode; Texture otherwise
-	static GLuint m_efbDepth; // Renderbuffer in MSAA mode; Texture otherwise
-
-	// Only used in MSAA mode and to convert pixel format
-	static GLuint m_resolvedFramebuffer; // will be hot swapped with m_efbColor on non-msaa pixel format change
-	static GLuint m_resolvedColorTexture;
-	static GLuint m_resolvedDepthTexture;
-
-	static GLuint m_xfbFramebuffer; // Only used in MSAA mode
-	
-	// For pixel format draw
-	static GLuint m_pixel_format_vbo;
-	static GLuint m_pixel_format_vao;
-	static SHADER m_pixel_format_shaders[2];
-};
-
-}  // namespace OGL
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
deleted file mode 100644
index 8360f9631e..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-#include "GLFunctions.h"
-#include "Log.h"
-#include <dlfcn.h>
-#ifdef USE_GLES3
-PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
-
-PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-
-PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-
-PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-PFNGLDELETESYNCPROC glDeleteSync;
-PFNGLFENCESYNCPROC glFenceSync;
-
-PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
-PFNGLBINDSAMPLERPROC glBindSampler;
-PFNGLDELETESAMPLERSPROC glDeleteSamplers;
-PFNGLGENSAMPLERSPROC glGenSamplers;
-
-PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
-PFNGLPROGRAMBINARYPROC glProgramBinary;
-PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
-
-PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
-
-PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-
-PFNGLBEGINQUERYPROC glBeginQuery;
-PFNGLENDQUERYPROC glEndQuery;
-PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
-PFNGLDELETEQUERIESPROC glDeleteQueries;
-PFNGLGENQUERIESPROC glGenQueries;
-#endif
-namespace GLFunc
-{
-	void *self;
-	void LoadFunction(const char *name, void **func)
-	{
-#ifdef USE_GLES3
-		*func = (void*)eglGetProcAddress(name);
-		if (*func == NULL)
-		{
-			// Fall back to trying dlsym
-			if (self) // Just in case dlopen fails
-				*func = dlsym(self, name);
-			if (*func == NULL)
-			{
-				ERROR_LOG(VIDEO, "Couldn't load function %s", name);
-				exit(0);
-			}
-		}
-#endif
-	}
-
-	void Init()
-	{
-		self = dlopen(NULL, RTLD_LAZY);
-		LoadFunction("glBeginQuery", (void**)&glBeginQuery);
-		LoadFunction("glEndQuery", (void**)&glEndQuery);
-		LoadFunction("glGetQueryObjectuiv", (void**)&glGetQueryObjectuiv);
-		LoadFunction("glDeleteQueries", (void**)&glDeleteQueries);
-		LoadFunction("glGenQueries", (void**)&glGenQueries);
-		{
-			LoadFunction("glUnmapBuffer", (void**)&glUnmapBuffer);
-			LoadFunction("glMapBufferRange", (void**)&glMapBufferRange);
-			LoadFunction("glBindBufferRange", (void**)&glBindBufferRange);
-
-			LoadFunction("glBlitFramebuffer", (void**)&glBlitFramebuffer);
-
-			LoadFunction("glGenVertexArrays", (void**)&glGenVertexArrays);
-			LoadFunction("glDeleteVertexArrays", (void**)&glDeleteVertexArrays);
-			LoadFunction("glBindVertexArray", (void**)&glBindVertexArray);
-
-			LoadFunction("glClientWaitSync", (void**)&glClientWaitSync);
-			LoadFunction("glDeleteSync", (void**)&glDeleteSync);
-			LoadFunction("glFenceSync", (void**)&glFenceSync);
-			LoadFunction("glSamplerParameterf", (void**)&glSamplerParameterf);
-			LoadFunction("glSamplerParameteri", (void**)&glSamplerParameteri);
-			LoadFunction("glSamplerParameterfv", (void**)&glSamplerParameterfv);
-			LoadFunction("glBindSampler", (void**)&glBindSampler);
-			LoadFunction("glDeleteSamplers", (void**)&glDeleteSamplers);
-			LoadFunction("glGenSamplers", (void**)&glGenSamplers);
-		}
-			
-		LoadFunction("glGetProgramBinary", (void**)&glGetProgramBinary);
-		LoadFunction("glProgramBinary", (void**)&glProgramBinary);
-		LoadFunction("glProgramParameteri", (void**)&glProgramParameteri);
-		
-		LoadFunction("glDrawRangeElements", (void**)&glDrawRangeElements);
-
-		LoadFunction("glGetUniformBlockIndex", (void**)&glGetUniformBlockIndex);
-		LoadFunction("glUniformBlockBinding", (void**)&glUniformBlockBinding);
-		dlclose(self);
-	}
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h
deleted file mode 100644
index 74fed7e227..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-#ifndef GLFUNCTIONS_H_
-#define GLFUNCTIONS_H_
-#include "GLInterface.h"
-
-#ifdef USE_GLES3
-typedef GLvoid* (*PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLvoid* (*PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (*PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef GLboolean (*PFNGLUNMAPBUFFERPROC) (GLenum target);
-
-typedef void (*PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-// VAOS
-typedef void (*PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
-typedef void (*PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays);
-typedef void (*PFNGLBINDVERTEXARRAYPROC) (GLuint array);
-
-// Sync
-typedef GLenum (*PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
-typedef void (*PFNGLDELETESYNCPROC) (GLsync GLsync);
-typedef GLsync (*PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags);
-
-//Sampler
-typedef void (*PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (*PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (*PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params);
-typedef void (*PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
-typedef void (*PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers);
-typedef void (*PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers);
-
-//Program binar
-typedef void (*PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, GLvoid*binary);
-typedef void (*PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void* binary, GLsizei length);
-typedef void (*PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-
-typedef GLuint (*PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
-typedef void (*PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-
-//Query
-typedef void (*PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (*PFNGLENDQUERYPROC) (GLenum target);
-typedef void (*PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
-typedef void (*PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
-typedef void (*PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
-
-// glDraw*
-typedef void (*PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices);
-
-// ptrs
-extern PFNGLBEGINQUERYPROC glBeginQuery;
-extern PFNGLENDQUERYPROC glEndQuery;
-extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
-extern PFNGLDELETEQUERIESPROC glDeleteQueries;
-extern PFNGLGENQUERIESPROC glGenQueries;
-
-extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
-
-extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
-
-extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
-extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
-
-extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
-extern PFNGLDELETESYNCPROC glDeleteSync;
-extern PFNGLFENCESYNCPROC glFenceSync;
-
-extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
-extern PFNGLPROGRAMBINARYPROC glProgramBinary;
-extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
-
-extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
-
-//Sampler
-extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
-extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
-extern PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
-extern PFNGLBINDSAMPLERPROC glBindSampler;
-extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
-extern PFNGLGENSAMPLERSPROC glGenSamplers;
-
-extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
-extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
-#endif
-
-namespace GLFunc
-{
-	void Init();
-}
-#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
deleted file mode 100644
index d7a891ecd1..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-#include "VideoConfig.h"
-#include "IniFile.h"
-#include "Core.h"
-#include "Host.h"
-#include "VideoBackend.h"
-#include "ConfigManager.h"
-
-#include "Render.h"
-#include "VertexShaderManager.h"
-
-#include "GLUtil.h"
-
-GLWindow GLWin;
-cInterfaceBase *GLInterface;
-
-namespace OGL
-{
-
-// Draw messages on top of the screen
-unsigned int VideoBackend::PeekMessages()
-{
-	return GLInterface->PeekMessages();
-}
-
-// Show the current FPS
-void VideoBackend::UpdateFPSDisplay(const char *text)
-{
-	char temp[100];
-	snprintf(temp, sizeof temp, "%s | OpenGL | %s", scm_rev_str, text);
-	return GLInterface->UpdateFPSDisplay(temp);
-}
-
-}
-void InitInterface()
-{
-	#if defined(USE_EGL) && USE_EGL
-		GLInterface = new cInterfaceEGL;
-	#elif defined(__APPLE__)
-		GLInterface = new cInterfaceAGL;
-	#elif defined(_WIN32)
-		GLInterface = new cInterfaceWGL;
-	#elif defined(HAVE_X11) && HAVE_X11
-		GLInterface = new cInterfaceGLX;
-	#endif
-}
-
-GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader )
-{
-	// generate objects
-	GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
-	GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-	GLuint programID = glCreateProgram();
-	
-	// compile vertex shader
-	glShaderSource(vertexShaderID, 1, &vertexShader, NULL);
-	glCompileShader(vertexShaderID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	GLint Result = GL_FALSE;
-	char stringBuffer[1024];
-	GLsizei stringBufferUsage = 0;
-	glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader);
-	} else if(!Result) {
-		ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader);
-	} else {
-		DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader);
-	}
-	bool shader_errors = !Result;
-#endif
-	
-	// compile fragment shader
-	glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL);
-	glCompileShader(fragmentShaderID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader);
-	} else if(!Result) {
-		ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader);
-	} else {
-		DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader);
-	}
-	shader_errors |= !Result;
-#endif
-	
-	// link them
-	glAttachShader(programID, vertexShaderID);
-	glAttachShader(programID, fragmentShaderID);
-	glLinkProgram(programID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	glGetProgramiv(programID, GL_LINK_STATUS, &Result);
-	glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
-	} else if(!Result && !shader_errors) {
-		ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
-	}
-#endif
-	
-	// cleanup
-	glDeleteShader(vertexShaderID);
-	glDeleteShader(fragmentShaderID);
-	
-	return programID;
-}
-
-
-GLuint OpenGL_ReportGLError(const char *function, const char *file, int line)
-{
-	GLint err = glGetError();
-	if (err != GL_NO_ERROR)
-	{
-		ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n",
-				file, line, function, err);
-	}
-	return err;
-}
-
-void OpenGL_ReportARBProgramError()
-{
-#ifndef USE_GLES
-	const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB);
-	if (pstr != NULL && pstr[0] != 0)
-	{
-		GLint loc = 0;
-		glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc);
-		ERROR_LOG(VIDEO, "Program error at %d: ", loc);
-		ERROR_LOG(VIDEO, "%s", (char*)pstr);
-		ERROR_LOG(VIDEO, "\n");
-	}
-#endif
-}
-
-bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
-{
-#ifndef USE_GLES
-	unsigned int fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	if (fbo_status != GL_FRAMEBUFFER_COMPLETE)
-	{
-		const char *error = "unknown error";
-		switch (fbo_status)
-		{
-			case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-				error = "INCOMPLETE_ATTACHMENT";
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-				error = "INCOMPLETE_MISSING_ATTACHMENT";
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-				error = "INCOMPLETE_DRAW_BUFFER";
-				break;
-			case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-				error = "INCOMPLETE_READ_BUFFER";
-				break;
-			case GL_FRAMEBUFFER_UNSUPPORTED:
-				error = "UNSUPPORTED";
-				break;
-		}
-		ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL FBO error - %s\n",
-				file, line, function, error);
-		return false;
-	}
-#endif
-	return true;
-}
-
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
deleted file mode 100644
index c94776ef7f..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLINIT_H_
-#define _GLINIT_H_
-
-#include "VideoConfig.h"
-#include "MathUtil.h"
-#include "GLInterface.h"
-
-#ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
-#define GL_DEPTH_STENCIL_EXT 0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
-#define GL_DEPTH24_STENCIL8_EXT 0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
-#endif
-
-#ifdef USE_GLES
-#define TEX2D	GL_TEXTURE_2D
-#define PREC	"highp"
-#define TEXTYPE "sampler2D"
-#define TEXFUNC "texture2D"
-#ifdef USE_GLES3
-#include "GLFunctions.h"
-#define GLAPIENTRY GL_APIENTRY
-#define GL_SAMPLES_PASSED GL_ANY_SAMPLES_PASSED
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_SRC1_ALPHA 0
-#define GL_BGRA GL_RGBA
-#define glDrawElementsBaseVertex(...)
-#define glDrawRangeElementsBaseVertex(...)
-#endif
-#else
-#define TEX2D	GL_TEXTURE_RECTANGLE_ARB
-#define PREC 
-#define TEXTYPE "sampler2DRect"
-#define TEXFUNC "texture2DRect"
-#endif
-
-
-#ifndef _WIN32
-
-#include <sys/types.h>
-
-#endif
-void InitInterface();
-
-// Helpers
-GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
-
-// Error reporting - use the convenient macros.
-void OpenGL_ReportARBProgramError();
-GLuint OpenGL_ReportGLError(const char *function, const char *file, int line);
-bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-#define GL_REPORT_ERROR()         OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__)
-#define GL_REPORT_ERRORD()        OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__)
-#define GL_REPORT_FBO_ERROR()     OpenGL_ReportFBOError(__FUNCTION__, __FILE__, __LINE__)
-#define GL_REPORT_PROGRAM_ERROR() OpenGL_ReportARBProgramError()
-#else
-__forceinline GLenum GL_REPORT_ERROR() { return GL_NO_ERROR; }
-#define GL_REPORT_ERRORD() (void)GL_NO_ERROR
-#define GL_REPORT_FBO_ERROR() (void)true
-#define GL_REPORT_PROGRAM_ERROR() (void)0
-#endif
-
-// this should be removed in future, but as long as glsl is unstable, we should really read this messages
-#if defined(_DEBUG) || defined(DEBUGFAST) 
-#define DEBUG_GLSL 1
-#else
-#define DEBUG_GLSL 0
-#endif
-
-// Isn't defined if we aren't using GLEW 1.6
-#ifndef GL_ONE_MINUS_SRC1_ALPHA 
-#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB
-#endif
-
-#endif  // _GLINIT_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
deleted file mode 100644
index ab90d8e279..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-
-#include "Common.h"
-#include "VideoConfig.h"
-
-#include "VideoCommon.h"
-
-#endif // _GLOBALS_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
deleted file mode 100644
index 293e674cbb..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GLUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "MemoryUtil.h"
-#include "ProgramShaderCache.h"
-#include "VertexShaderGen.h"
-
-#include "CPMemory.h"
-#include "NativeVertexFormat.h"
-#include "VertexManager.h"
-
-// Here's some global state. We only use this to keep track of what we've sent to the OpenGL state
-// machine.
-
-namespace OGL
-{
-
-NativeVertexFormat* VertexManager::CreateNativeVertexFormat()
-{
-	return new GLVertexFormat();
-}
-
-GLVertexFormat::GLVertexFormat()
-{
-
-}
-
-GLVertexFormat::~GLVertexFormat()
-{
-	glDeleteVertexArrays(1, &VAO);
-}
-
-inline GLuint VarToGL(VarType t)
-{
-	static const GLuint lookup[5] = {
-		GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_FLOAT
-	};
-	return lookup[t];
-}
-
-void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
-{
-	this->vtx_decl = _vtx_decl;
-	vertex_stride = vtx_decl.stride;
-
-	// We will not allow vertex components causing uneven strides.
-	if (vertex_stride & 3) 
-		PanicAlert("Uneven vertex stride: %i", vertex_stride);
-	
-	VertexManager *vm = (OGL::VertexManager*)g_vertex_manager;
-	
-	glGenVertexArrays(1, &VAO);
-	glBindVertexArray(VAO);
-	
-	// the element buffer is bound directly to the vao, so we must it set for every vao
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->m_index_buffers);
-	glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers);
-
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 3, GL_FLOAT, GL_FALSE, vtx_decl.stride, (u8*)NULL);
-	
-	for (int i = 0; i < 3; i++) {
-		if (vtx_decl.num_normals > i) {
-			glEnableVertexAttribArray(SHADER_NORM0_ATTRIB+i);
-			glVertexAttribPointer(SHADER_NORM0_ATTRIB+i, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, vtx_decl.stride, (u8*)NULL + vtx_decl.normal_offset[i]);
-		}
-	}
-
-	for (int i = 0; i < 2; i++) {
-		if (vtx_decl.color_offset[i] != -1) {
-			glEnableVertexAttribArray(SHADER_COLOR0_ATTRIB+i);
-			glVertexAttribPointer(SHADER_COLOR0_ATTRIB+i, 4, GL_UNSIGNED_BYTE, GL_TRUE, vtx_decl.stride, (u8*)NULL + vtx_decl.color_offset[i]);
-		}
-	}
-
-	for (int i = 0; i < 8; i++) {
-		if (vtx_decl.texcoord_offset[i] != -1) {
-			glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB+i);
-			glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB+i, vtx_decl.texcoord_size[i], VarToGL(vtx_decl.texcoord_gl_type[i]),
-				GL_FALSE, vtx_decl.stride, (u8*)NULL + vtx_decl.texcoord_offset[i]);
-		}
-	}
-
-	if (vtx_decl.posmtx_offset != -1) {
-		glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB);
-		glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (u8*)NULL + vtx_decl.posmtx_offset);
-	}
-
-	vm->m_last_vao = VAO;
-}
-
-void GLVertexFormat::SetupVertexPointers() {
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
deleted file mode 100644
index f981a105e0..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include "RenderBase.h"
-#include "GLUtil.h"
-#include "PerfQuery.h"
-
-namespace OGL
-{
-
-PerfQuery::PerfQuery()
-	: m_query_read_pos()
-	, m_query_count()
-{
-	for (u32 i = 0; i != ArraySize(m_query_buffer); ++i)
-		glGenQueries(1, &m_query_buffer[i].query_id);
-	
-	ResetQuery();
-}
-
-PerfQuery::~PerfQuery()
-{
-	for (u32 i = 0; i != ArraySize(m_query_buffer); ++i)
-		glDeleteQueries(1, &m_query_buffer[i].query_id);
-}
-
-void PerfQuery::EnableQuery(PerfQueryGroup type)
-{
-	if (!ShouldEmulate())
-		return;
-
-	// Is this sane?
-	if (m_query_count > ArraySize(m_query_buffer) / 2)
-		WeakFlush();
-	
-	if (ArraySize(m_query_buffer) == m_query_count)
-	{
-		FlushOne();
-		//ERROR_LOG(VIDEO, "Flushed query buffer early!");
-	}
-	
-	// start query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ArraySize(m_query_buffer)];
-		
-		glBeginQuery(GL_SAMPLES_PASSED, entry.query_id);
-		entry.query_type = type;
-		
-		++m_query_count;
-	}
-}
-
-void PerfQuery::DisableQuery(PerfQueryGroup type)
-{
-	if (!ShouldEmulate())
-		return;
-
-	// stop query
-	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
-	{
-		glEndQuery(GL_SAMPLES_PASSED);
-	}
-}
-
-bool PerfQuery::IsFlushed() const
-{
-	if (!ShouldEmulate())
-		return true;
-
-	return 0 == m_query_count;
-}
-
-void PerfQuery::FlushOne()
-{
-	if (!ShouldEmulate())
-		return;
-
-	auto& entry = m_query_buffer[m_query_read_pos];
-
-	GLuint result = 0;
-	glGetQueryObjectuiv(entry.query_id, GL_QUERY_RESULT, &result);
-
-	// NOTE: Reported pixel metrics should be referenced to native resolution
-	m_results[entry.query_type] += (u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight();
-
-	m_query_read_pos = (m_query_read_pos + 1) % ArraySize(m_query_buffer);
-	--m_query_count;
-}
-
-// TODO: could selectively flush things, but I don't think that will do much
-void PerfQuery::FlushResults()
-{
-	if (!ShouldEmulate())
-		return;
-
-	while (!IsFlushed())
-		FlushOne();
-}
-
-void PerfQuery::WeakFlush()
-{
-	if (!ShouldEmulate())
-		return;
-
-	while (!IsFlushed())
-	{
-		auto& entry = m_query_buffer[m_query_read_pos];
-		
-		GLuint result = GL_FALSE;
-		glGetQueryObjectuiv(entry.query_id, GL_QUERY_RESULT_AVAILABLE, &result);
-		
-		if (GL_TRUE == result)
-		{
-			FlushOne();
-		}
-		else
-		{
-			break;
-		}
-	}
-}
-
-void PerfQuery::ResetQuery()
-{
-	m_query_count = 0;
-	std::fill_n(m_results, ArraySize(m_results), 0);
-}
-
-u32 PerfQuery::GetQueryResult(PerfQueryType type)
-{
-	if (!ShouldEmulate())
-		return 0;
-
-	u32 result = 0;
-	
-	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
-	{
-		result = m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
-	{
-		result = m_results[PQG_ZCOMP];
-	}
-	else if (type == PQ_BLEND_INPUT)
-	{
-		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
-	}
-	else if (type == PQ_EFB_COPY_CLOCKS)
-	{
-		result = m_results[PQG_EFB_COPY_CLOCKS];
-	}
-	
-	return result / 4;
-}
-
-} // namespace
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h
deleted file mode 100644
index b96fe7a4a0..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _PERFQUERY_H_
-#define _PERFQUERY_H_
-
-#include "PerfQueryBase.h"
-
-namespace OGL {
-
-class PerfQuery : public PerfQueryBase
-{
-public:
-	PerfQuery();
-	~PerfQuery();
-
-	void EnableQuery(PerfQueryGroup type);
-	void DisableQuery(PerfQueryGroup type);
-	void ResetQuery();
-	u32 GetQueryResult(PerfQueryType type);
-	void FlushResults();
-	bool IsFlushed() const;
-
-private:
-	struct ActiveQuery
-	{
-		GLuint query_id;
-		PerfQueryGroup query_type;
-	};
-
-	// when testing in SMS: 64 was too small, 128 was ok
-	static const u32 PERF_QUERY_BUFFER_SIZE = 512;
-
-	void WeakFlush();
-	// Only use when non-empty
-	void FlushOne();
-
-	// This contains gl query objects with unretrieved results.
-	ActiveQuery m_query_buffer[PERF_QUERY_BUFFER_SIZE];
-	u32 m_query_read_pos;
-
-	// TODO: sloppy
-	volatile u32 m_query_count;
-	volatile u32 m_results[PQG_NUM_MEMBERS];
-};
-
-} // namespace
-
-#endif // _PERFQUERY_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
deleted file mode 100644
index 3fac62bd73..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-
-#include "GLUtil.h"
-
-#include <cmath>
-
-#include "Statistics.h"
-#include "VideoConfig.h"
-#include "ImageWrite.h"
-#include "Common.h"
-#include "Render.h"
-#include "VertexShaderGen.h"
-#include "ProgramShaderCache.h"
-#include "PixelShaderManager.h"
-#include "OnScreenDisplay.h"
-#include "StringUtil.h"
-#include "FileUtil.h"
-#include "Debugger.h"
-
-namespace OGL
-{
-
-void SetPSConstant4fvByName(const char * name, unsigned int offset, const float *f, const unsigned int count = 1)
-{
-	ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram();
-	for (int a = 0; a < NUM_UNIFORMS; ++a)
-	{
-		if (!strcmp(name, UniformNames[a]))
-		{
-			if (tmp.shader.UniformLocations[a] == -1)
-				return;
-			else if (tmp.shader.UniformSize[a] <= offset)
-				return;
-			else
-			{
-				unsigned int maxcount= tmp.shader.UniformSize[a]-offset;
-				glUniform4fv(tmp.shader.UniformLocations[a] + offset, std::min(count, maxcount), f);
-				return;
-			}
-		}
-	}
-}
-
-// Renderer functions
-void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	float const f[4] = {f1, f2, f3, f4};
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 10; ++a)
-	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f);
-			return;
-		}
-	}
-}
-
-void Renderer::SetPSConstant4fv(unsigned int const_number, const float *f)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 10; ++a)
-	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f);
-			return;
-		}
-	}
-}
-
-void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, count);
-		return;
-	}
-	for (unsigned int a = 0; a < 10; ++a)
-	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f, count);
-			return;
-		}
-	}
-}
-}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
deleted file mode 100644
index c1563a74e2..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "VideoCommon.h"
-#include "VideoConfig.h"
-#include "GLUtil.h"
-#include "PostProcessing.h"
-#include "ProgramShaderCache.h"
-#include "FramebufferManager.h"
-
-namespace OGL
-{
-
-namespace PostProcessing
-{
-
-static std::string s_currentShader;
-static SHADER s_shader;
-static bool s_enable;
-
-static u32 s_width;
-static u32 s_height;
-static GLuint s_fbo;
-static GLuint s_texture;
-static GLuint s_vao;
-static GLuint s_vbo;
-
-static GLuint s_uniform_resolution;
-
-static char s_vertex_shader[] =
-	"in vec2 rawpos;\n"
-	"in vec2 tex0;\n"
-	"out vec2 uv0;\n"
-	"void main(void) {\n"
-	"	gl_Position = vec4(rawpos,0,1);\n"
-	"	uv0 = tex0;\n"
-	"}\n"; 
-
-void Init()
-{
-	s_currentShader = "";
-	s_enable = 0;
-	s_width = 0;
-	s_height = 0;
-	
-	glGenFramebuffers(1, &s_fbo);
-	glGenTextures(1, &s_texture);
-	glBindTexture(GL_TEXTURE_2D, s_texture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); // disable mipmaps
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	glBindFramebuffer(GL_FRAMEBUFFER, s_fbo);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, s_texture, 0);
-	FramebufferManager::SetFramebuffer(0);
-	
-	glGenBuffers(1, &s_vbo);
-	glBindBuffer(GL_ARRAY_BUFFER, s_vbo);
-	GLfloat vertices[] = { 
-		-1.f, -1.f, 0.f, 0.f, 
-		-1.f,  1.f, 0.f, 1.f, 
-		 1.f, -1.f, 1.f, 0.f, 
-		 1.f,  1.f, 1.f, 1.f
-	};
-	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-	
-	glGenVertexArrays(1, &s_vao);
-	glBindVertexArray( s_vao );
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL);
-	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-}
-
-void Shutdown()
-{
-	s_shader.Destroy();
-	
-	glDeleteFramebuffers(1, &s_vbo);
-	glDeleteTextures(1, &s_texture);
-	
-	glDeleteBuffers(1, &s_vbo);
-	glDeleteVertexArrays(1, &s_vao);
-}
-
-void ReloadShader()
-{
-	s_currentShader = "";
-}
-
-void BindTargetFramebuffer ()
-{
-	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, s_enable ? s_fbo : 0);
-}
-
-void BlitToScreen()
-{
-	if(!s_enable) return;
-	
-	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-	glViewport(0, 0, s_width, s_height);
-	
-	glBindVertexArray(s_vao);
-	s_shader.Bind();
-	
-	glUniform4f(s_uniform_resolution, (float)s_width, (float)s_height, 1.0f/(float)s_width, 1.0f/(float)s_height);
-	
-	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(GL_TEXTURE_2D, s_texture);
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glBindTexture(GL_TEXTURE_2D, 0);
-	
-/*	glBindFramebuffer(GL_READ_FRAMEBUFFER, s_fbo);
-	
-	glBlitFramebuffer(rc.left, rc.bottom, rc.right, rc.top,
-			rc.left, rc.bottom, rc.right, rc.top,
-			GL_COLOR_BUFFER_BIT, GL_NEAREST);*/
-}
-
-void Update ( u32 width, u32 height )
-{
-	ApplyShader();
-
-	if(s_enable && (width != s_width || height != s_height)) {
-		s_width = width;
-		s_height = height;
-		
-		// alloc texture for framebuffer
-		glActiveTexture(GL_TEXTURE0+9);
-		glBindTexture(GL_TEXTURE_2D, s_texture);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-		glBindTexture(GL_TEXTURE_2D, 0);
-	}
-}
-
-void ApplyShader()
-{
-	// shader didn't changed
-	if (s_currentShader == g_ActiveConfig.sPostProcessingShader) return;
-	s_currentShader = g_ActiveConfig.sPostProcessingShader;
-	s_enable = false;
-	s_shader.Destroy();
-	
-	// shader disabled
-	if (g_ActiveConfig.sPostProcessingShader == "") return;
-	
-	// so need to compile shader
-	
-	// loading shader code
-	std::string code;
-	std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".glsl";
-	if (!File::Exists(path))
-	{
-		// Fallback to shared user dir
-		path = File::GetSysDirectory() + SHADERS_DIR DIR_SEP + g_ActiveConfig.sPostProcessingShader + ".glsl";
-	}
-	if(!File::ReadFileToString(true, path.c_str(), code)) {
-		ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str());
-		return;
-	}
-	
-	// and compile it
-	if (!ProgramShaderCache::CompileShader(s_shader, s_vertex_shader, code.c_str())) {
-		ERROR_LOG(VIDEO, "Failed to compile post-processing shader %s", s_currentShader.c_str());
-		return;
-	}
-	
-	// read uniform locations
-	s_uniform_resolution = glGetUniformLocation(s_shader.glprogid, "resolution");
-	
-	// successful
-	s_enable = true;
-}
-
-}  // namespace
-
-}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
deleted file mode 100644
index 1deb050a75..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _POSTPROCESSING_H_
-#define _POSTPROCESSING_H_
-
-#include "VideoCommon.h"
-#include "GLUtil.h"
-
-namespace OGL
-{
-
-namespace PostProcessing
-{
-
-void Init();
-void Shutdown();
-
-void BindTargetFramebuffer();
-void BlitToScreen();
-void Update(u32 width, u32 height);
-
-void ReloadShader();
-
-void ApplyShader();
-
-}  // namespace
-
-}  // namespace
-
-#endif // _POSTPROCESSING_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
deleted file mode 100644
index 5cc9ec36cd..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ /dev/null
@@ -1,602 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "ProgramShaderCache.h"
-#include "DriverDetails.h"
-#include "MathUtil.h"
-#include "StreamBuffer.h"
-#include "Debugger.h"
-#include "Statistics.h"
-#include "ImageWrite.h"
-#include "Render.h"
-
-namespace OGL
-{
-
-static const u32 UBO_LENGTH = 32*1024*1024;
-
-GLintptr ProgramShaderCache::s_vs_data_size;
-GLintptr ProgramShaderCache::s_ps_data_size;
-GLintptr ProgramShaderCache::s_vs_data_offset;
-u8 *ProgramShaderCache::s_ubo_buffer;
-u32 ProgramShaderCache::s_ubo_buffer_size;
-bool ProgramShaderCache::s_ubo_dirty;
-
-static StreamBuffer *s_buffer;
-static int num_failures = 0;
-
-LinearDiskCache<SHADERUID, u8> g_program_disk_cache;
-static GLuint CurrentProgram = 0;
-ProgramShaderCache::PCache ProgramShaderCache::pshaders;
-ProgramShaderCache::PCacheEntry* ProgramShaderCache::last_entry;
-SHADERUID ProgramShaderCache::last_uid;
-UidChecker<PixelShaderUid,PixelShaderCode> ProgramShaderCache::pixel_uid_checker;
-UidChecker<VertexShaderUid,VertexShaderCode> ProgramShaderCache::vertex_uid_checker;
-
-static char s_glsl_header[1024] = "";
-
-const char *UniformNames[NUM_UNIFORMS] =
-{
-	// PIXEL SHADER UNIFORMS
-	I_COLORS,
-	I_KCOLORS,
-	I_ALPHA,
-	I_TEXDIMS,
-	I_ZBIAS ,
-	I_INDTEXSCALE ,
-	I_INDTEXMTX,
-	I_FOG,
-	I_PLIGHTS,
-	I_PMATERIALS,
-	// VERTEX SHADER UNIFORMS
-	I_POSNORMALMATRIX,
-	I_PROJECTION ,
-	I_MATERIALS,
-	I_LIGHTS,
-	I_TEXMATRICES,
-	I_TRANSFORMMATRICES ,
-	I_NORMALMATRICES ,
-	I_POSTTRANSFORMMATRICES,
-	I_DEPTHPARAMS,
-};
-
-void SHADER::SetProgramVariables()
-{
-	// glsl shader must be bind to set samplers
-	Bind();
-	
-	// Bind UBO 
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		GLint PSBlock_id = glGetUniformBlockIndex(glprogid, "PSBlock");
-		GLint VSBlock_id = glGetUniformBlockIndex(glprogid, "VSBlock");
-		
-		if(PSBlock_id != -1)
-			glUniformBlockBinding(glprogid, PSBlock_id, 1);
-		if(VSBlock_id != -1)
-			glUniformBlockBinding(glprogid, VSBlock_id, 2);
-	}
-	
-	// UBO workaround
-	for (int a = 0; a < NUM_UNIFORMS; ++a)
-	{
-		UniformLocations[a] = glGetUniformLocation(glprogid, UniformNames[a]);
-		UniformSize[a] = 0;
-		if(g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-			break;
-	}
-	if(!g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		int max_uniforms = 0;
-		char name[50];
-		int size;
-		
-		glGetProgramiv(glprogid, GL_ACTIVE_UNIFORMS, &max_uniforms);
-		for(int i=0; i<max_uniforms; i++)
-		{
-			glGetActiveUniform(glprogid, i, sizeof(name), NULL, &size, NULL, name);
-			for (int a = 0; a < NUM_UNIFORMS; ++a)
-			{
-				if(strstr(name, UniformNames[a]))
-				{
-					UniformSize[a] = size;
-					break;
-				}
-			}
-		}
-	}
-
-
-	// Bind Texture Sampler
-	for (int a = 0; a <= 9; ++a)
-	{
-		char name[8];
-		snprintf(name, 8, "samp%d", a);
-		
-		// Still need to get sampler locations since we aren't binding them statically in the shaders
-		int loc = glGetUniformLocation(glprogid, name);
-		if (loc != -1)
-			glUniform1i(loc, a);
-	}
-
-}
-
-void SHADER::SetProgramBindings()
-{
-	if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
-	{
-		// So we do support extended blending
-		// So we need to set a few more things here.
-		// Bind our out locations
-#ifndef USE_GLES3
-		glBindFragDataLocationIndexed(glprogid, 0, 0, "ocol0");
-		glBindFragDataLocationIndexed(glprogid, 0, 1, "ocol1");
-#endif
-	}
-	// Need to set some attribute locations
-	glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos");
-	
-	glBindAttribLocation(glprogid, SHADER_POSMTX_ATTRIB,   "fposmtx");
-	
-	glBindAttribLocation(glprogid, SHADER_COLOR0_ATTRIB,   "color0");
-	glBindAttribLocation(glprogid, SHADER_COLOR1_ATTRIB,   "color1");
-	
-	glBindAttribLocation(glprogid, SHADER_NORM0_ATTRIB,    "rawnorm0");
-	glBindAttribLocation(glprogid, SHADER_NORM1_ATTRIB,    "rawnorm1");
-	glBindAttribLocation(glprogid, SHADER_NORM2_ATTRIB,    "rawnorm2");
-	
-	for(int i=0; i<8; i++) {
-		char attrib_name[8];
-		snprintf(attrib_name, 8, "tex%d", i);
-		glBindAttribLocation(glprogid, SHADER_TEXTURE0_ATTRIB+i, attrib_name);
-	}
-}
-
-void SHADER::Bind()
-{
-	if(CurrentProgram != glprogid)
-	{
-		glUseProgram(glprogid);
-		CurrentProgram = glprogid;
-	}
-}
-
-
-void ProgramShaderCache::SetMultiPSConstant4fv(unsigned int offset, const float *f, unsigned int count)
-{
-	s_ubo_dirty = true;
-	memcpy(s_ubo_buffer+(offset*4*sizeof(float)), f, count*4*sizeof(float));
-}
-
-void ProgramShaderCache::SetMultiVSConstant4fv(unsigned int offset, const float *f, unsigned int count)
-{
-	s_ubo_dirty = true;
-	memcpy(s_ubo_buffer+(offset*4*sizeof(float))+s_vs_data_offset, f, count*4*sizeof(float));
-}
-
-void ProgramShaderCache::UploadConstants()
-{
-	if(s_ubo_dirty) {
-		s_buffer->Alloc(s_ubo_buffer_size);
-		size_t offset = s_buffer->Upload(s_ubo_buffer, s_ubo_buffer_size);
-		glBindBufferRange(GL_UNIFORM_BUFFER, 1, s_buffer->getBuffer(), offset, s_ps_data_size);
-		glBindBufferRange(GL_UNIFORM_BUFFER, 2, s_buffer->getBuffer(), offset + s_vs_data_offset, s_vs_data_size);
-		s_ubo_dirty = false;
-		
-		ADDSTAT(stats.thisFrame.bytesUniformStreamed, s_ubo_buffer_size);
-	}
-}
-
-GLuint ProgramShaderCache::GetCurrentProgram(void)
-{
-	return CurrentProgram;
-}
-
-SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 components )
-{
-	SHADERUID uid;
-	GetShaderId(&uid, dstAlphaMode, components);
-
-	// Check if the shader is already set
-	if (last_entry)
-	{
-		if (uid == last_uid)
-		{
-			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-			last_entry->shader.Bind();
-			return &last_entry->shader;
-		}
-	}
-
-	last_uid = uid;
-
-	// Check if shader is already in cache
-	PCache::iterator iter = pshaders.find(uid);
-	if (iter != pshaders.end())
-	{
-		PCacheEntry *entry = &iter->second;
-		last_entry = entry;
-
-		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-		last_entry->shader.Bind();
-		return &last_entry->shader;
-	}
-
-	// Make an entry in the table
-	PCacheEntry& newentry = pshaders[uid];
-	last_entry = &newentry;
-	newentry.in_cache = 0;
-
-	VertexShaderCode vcode;
-	PixelShaderCode pcode;
-	GenerateVertexShaderCode(vcode, components, API_OPENGL);
-	GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		newentry.shader.strvprog = vcode.GetBuffer();
-		newentry.shader.strpprog = pcode.GetBuffer();
-	}
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) {
-		static int counter = 0;
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
-		SaveData(szTemp, vcode.GetBuffer());
-		sprintf(szTemp, "%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
-		SaveData(szTemp, pcode.GetBuffer());
-	}
-#endif
-
-	if (!CompileShader(newentry.shader, vcode.GetBuffer(), pcode.GetBuffer())) {
-		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
-		return NULL;
-	}
-
-	INCSTAT(stats.numPixelShadersCreated);
-	SETSTAT(stats.numPixelShadersAlive, pshaders.size());
-	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-	
-	last_entry->shader.Bind();
-	return &last_entry->shader;
-}
-
-bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, const char* pcode )
-{
-	GLuint vsid = CompileSingleShader(GL_VERTEX_SHADER, vcode);
-	GLuint psid = CompileSingleShader(GL_FRAGMENT_SHADER, pcode);
-
-	if(!vsid || !psid)
-	{
-		glDeleteShader(vsid);
-		glDeleteShader(psid);
-		return false;
-	}
-	
-	GLuint pid = shader.glprogid = glCreateProgram();;
-	
-	glAttachShader(pid, vsid);
-	glAttachShader(pid, psid);
-
-	if (g_ogl_config.bSupportsGLSLCache)
-		glProgramParameteri(pid, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
-
-	shader.SetProgramBindings();
-	
-	glLinkProgram(pid);
-	
-	// original shaders aren't needed any more
-	glDeleteShader(vsid);
-	glDeleteShader(psid);
-	
-	GLint linkStatus;
-	glGetProgramiv(pid, GL_LINK_STATUS, &linkStatus);
-	GLsizei length = 0;
-	glGetProgramiv(pid, GL_INFO_LOG_LENGTH, &length);
-	if (linkStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
-	{
-		GLsizei charsWritten;
-		GLchar* infoLog = new GLchar[length];
-		glGetProgramInfoLog(pid, length, &charsWritten, infoLog);
-		ERROR_LOG(VIDEO, "Program info log:\n%s", infoLog);
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << s_glsl_header << vcode << s_glsl_header << pcode << infoLog;
-		file.close();
-		
-		if(linkStatus != GL_TRUE)
-			PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
-				szTemp,
-				g_ogl_config.gl_vendor,
-				g_ogl_config.gl_renderer,
-				g_ogl_config.gl_version,
-				infoLog);
-		
-		delete [] infoLog;
-	}
-	if (linkStatus != GL_TRUE)
-	{
-		// Compile failed
-		ERROR_LOG(VIDEO, "Program linking failed; see info log");
-
-		// Don't try to use this shader
-		glDeleteProgram(pid);
-		return false;
-	}
-
-	shader.SetProgramVariables();
-	
-	return true;
-}
-
-GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
-{
-	GLuint result = glCreateShader(type);
-
-	const char *src[] = {s_glsl_header, code};
-	
-	glShaderSource(result, 2, src, NULL);
-	glCompileShader(result);
-	GLint compileStatus;
-	glGetShaderiv(result, GL_COMPILE_STATUS, &compileStatus);
-	GLsizei length = 0;
-	glGetShaderiv(result, GL_INFO_LOG_LENGTH, &length);
-
-	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENINFOLOG))
-		length = 1024;
-
-	if (compileStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
-	{
-		GLsizei charsWritten;
-		GLchar* infoLog = new GLchar[length];
-		glGetShaderInfoLog(result, length, &charsWritten, infoLog);
-		ERROR_LOG(VIDEO, "PS Shader info log:\n%s", infoLog);
-		char szTemp[MAX_PATH];
-		sprintf(szTemp, 
-			"%sbad_%s_%04i.txt", 
-			File::GetUserPath(D_DUMP_IDX).c_str(), 
-			type==GL_VERTEX_SHADER ? "vs" : "ps", 
-			num_failures++);
-		std::ofstream file;
-		OpenFStream(file, szTemp, std::ios_base::out);
-		file << s_glsl_header << code << infoLog;
-		file.close();
-		
-		if(compileStatus != GL_TRUE)
-			PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
-				type==GL_VERTEX_SHADER ? "vertex" : "pixel",
-				szTemp,
-				g_ogl_config.gl_vendor,
-				g_ogl_config.gl_renderer,
-				g_ogl_config.gl_version,
-				infoLog);
-		
-		delete[] infoLog;
-	}
-	if (compileStatus != GL_TRUE)
-	{
-		// Compile failed
-		ERROR_LOG(VIDEO, "Shader compilation failed; see info log");
-
-		// Don't try to use this shader
-		glDeleteShader(result);
-		return 0;
-	}
-	(void)GL_REPORT_ERROR();
-	return result;
-}
-
-void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL, components);
-	GetVertexShaderUid(uid->vuid, components, API_OPENGL);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		PixelShaderCode pcode;
-		GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
-		pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p");
-
-		VertexShaderCode vcode;
-		GenerateVertexShaderCode(vcode, components, API_OPENGL);
-		vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v");
-	}
-}
-
-ProgramShaderCache::PCacheEntry ProgramShaderCache::GetShaderProgram(void)
-{
-	return *last_entry;
-}
-
-void ProgramShaderCache::Init(void)
-{
-	// We have to get the UBO alignment here because
-	// if we generate a buffer that isn't aligned
-	// then the UBO will fail.
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		GLint Align;
-		glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &Align);
-
-		s_ps_data_size = C_PENVCONST_END * sizeof(float) * 4;
-		s_vs_data_size = C_VENVCONST_END * sizeof(float) * 4;
-		s_vs_data_offset = ROUND_UP(s_ps_data_size, Align);
-		s_ubo_buffer_size = ROUND_UP(s_ps_data_size, Align) + ROUND_UP(s_vs_data_size, Align);
-
-		// We multiply by *4*4 because we need to get down to basic machine units.
-		// So multiply by four to get how many floats we have from vec4s
-		// Then once more to get bytes
-		s_buffer = new StreamBuffer(GL_UNIFORM_BUFFER, UBO_LENGTH);
-		
-		s_ubo_buffer = new u8[s_ubo_buffer_size];
-		memset(s_ubo_buffer, 0, s_ubo_buffer_size);
-		s_ubo_dirty = true;
-	}
-
-	// Read our shader cache, only if supported
-	if (g_ogl_config.bSupportsGLSLCache)
-	{
-		GLint Supported;
-		glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &Supported);
-		if(!Supported)
-		{
-			ERROR_LOG(VIDEO, "GL_ARB_get_program_binary is supported, but no binary format is known. So disable shader cache.");
-			g_ogl_config.bSupportsGLSLCache = false;
-		}
-		else
-		{
-			if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-				File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX).c_str());
-		
-			char cache_filename[MAX_PATH];
-			sprintf(cache_filename, "%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
-			
-			ProgramShaderCacheInserter inserter;
-			g_program_disk_cache.OpenAndRead(cache_filename, inserter);
-		}
-		SETSTAT(stats.numPixelShadersAlive, pshaders.size());
-	}
-	
-	CreateHeader();
-	
-	CurrentProgram = 0;
-	last_entry = NULL;
-}
-
-void ProgramShaderCache::Shutdown(void)
-{
-	// store all shaders in cache on disk
-	if (g_ogl_config.bSupportsGLSLCache)
-	{
-		PCache::iterator iter = pshaders.begin();
-		for (; iter != pshaders.end(); ++iter)
-		{
-			if(iter->second.in_cache) continue;
-			
-			GLint binary_size;
-			glGetProgramiv(iter->second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size);
-			if(!binary_size) continue;
-			
-			u8 *data = new u8[binary_size+sizeof(GLenum)];
-			u8 *binary = data + sizeof(GLenum);
-			GLenum *prog_format = (GLenum*)data;
-			glGetProgramBinary(iter->second.shader.glprogid, binary_size, NULL, prog_format, binary);
-			
-			g_program_disk_cache.Append(iter->first, data, binary_size+sizeof(GLenum));
-			delete [] data;
-		}
-
-		g_program_disk_cache.Sync();
-		g_program_disk_cache.Close();
-	}
-
-	glUseProgram(0);
-	
-	PCache::iterator iter = pshaders.begin();
-	for (; iter != pshaders.end(); ++iter)
-		iter->second.Destroy();
-	pshaders.clear();
-
-	pixel_uid_checker.Invalidate();
-	vertex_uid_checker.Invalidate();
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		delete s_buffer;
-		s_buffer = 0;
-		delete [] s_ubo_buffer;
-		s_ubo_buffer = 0;
-	}
-}
-
-void ProgramShaderCache::CreateHeader ( void )
-{
-	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
-	snprintf(s_glsl_header, sizeof(s_glsl_header), 
-		"#version %s\n"
-		"%s\n" // default precision
-		"%s\n" // ubo
-		"%s\n" // early-z
-		
-		"\n"// A few required defines and ones that will make our lives a lot easier
-		"#define ATTRIN %s\n"
-		"#define ATTROUT %s\n"
-		"#define VARYIN %s\n"
-		"#define VARYOUT %s\n"
-
-		// Silly differences
-		"#define float2 vec2\n"
-		"#define float3 vec3\n"
-		"#define float4 vec4\n"
-
-		// hlsl to glsl function translation
-		"#define frac fract\n"
-		"#define lerp mix\n"
-
-		// glsl 120 hack
-		"%s\n"
-		"%s\n"
-		"%s\n"
-		"%s\n"
-		"%s\n"
-		"#define COLOROUT(name) %s\n"
-		
-		// texture2d hack
-		"%s\n"
-		"%s\n"
-		"%s\n"
-				
-		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150"
-		, v==GLSLES3 ? "precision highp float;" : ""
-		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
-		, g_ActiveConfig.backend_info.bSupportsEarlyZ ? "#extension GL_ARB_shader_image_load_store : enable" : ""
-		
-		, v==GLSL_120 ? "attribute" : "in"
-		, v==GLSL_120 ? "attribute" : "out"
-		, v==GLSL_120 ? "varying" : DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "in" : "centroid in"
-		, v==GLSL_120 ? "varying" : DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "out" : "centroid out"
-		
-		, v==GLSL_120 ? "#define texture texture2D" : ""
-		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
-		, v==GLSL_120 ? "#define out " : ""
-		, v==GLSL_120 ? "#define ocol0 gl_FragColor" : ""
-		, v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend
-		, v==GLSL_120 ? "" : "out vec4 name;"
-		
-		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
-		, v==GLSLES3 ? "#define texture2DRect(samp, uv)  texelFetch(samp, ivec2(floor(uv)), 0)" : ""
-		, v==GLSLES3 ? "#define sampler2DRect sampler2D" : ""
-	);
-}
-
-
-void ProgramShaderCache::ProgramShaderCacheInserter::Read ( const SHADERUID& key, const u8* value, u32 value_size )
-{
-	const u8 *binary = value+sizeof(GLenum);
-	GLenum *prog_format = (GLenum*)value;
-	GLint binary_size = value_size-sizeof(GLenum);
-	
-	PCacheEntry entry;
-	entry.in_cache = 1;
-	entry.shader.glprogid = glCreateProgram();
-	glProgramBinary(entry.shader.glprogid, *prog_format, binary, binary_size);
-
-	GLint success;
-	glGetProgramiv(entry.shader.glprogid, GL_LINK_STATUS, &success);
-
-	if (success)
-	{
-		pshaders[key] = entry;
-		entry.shader.SetProgramVariables();
-	}
-	else
-		glDeleteProgram(entry.shader.glprogid);
-}
-
-
-} // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
deleted file mode 100644
index 6c1350fe34..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef PROGRAM_SHADER_CACHE_H_
-#define PROGRAM_SHADER_CACHE_H_
-
-#include "GLUtil.h"
-
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
-
-#include "LinearDiskCache.h"
-#include "ConfigManager.h"
-
-namespace OGL
-{
-
-class SHADERUID
-{
-public:
-	VertexShaderUid vuid;
-	PixelShaderUid puid;
-
-	SHADERUID() {}
-
-	SHADERUID(const SHADERUID& r) : vuid(r.vuid), puid(r.puid) {}
-
-	bool operator <(const SHADERUID& r) const
-	{
-		if(puid < r.puid) return true;
-		if(r.puid < puid) return false;
-		if(vuid < r.vuid) return true;
-		return false;
-	}
-
-	bool operator ==(const SHADERUID& r) const
-	{
-		return puid == r.puid && vuid == r.vuid;
-	}
-};
-
-
-const int NUM_UNIFORMS = 19;
-extern const char *UniformNames[NUM_UNIFORMS];
-
-struct SHADER
-{
-	SHADER() : glprogid(0) { }
-	void Destroy()
-	{
-		glDeleteProgram(glprogid);
-		glprogid = 0;
-	}
-	GLuint glprogid; // opengl program id
-	
-	std::string strvprog, strpprog;
-	GLint UniformLocations[NUM_UNIFORMS];
-	u32 UniformSize[NUM_UNIFORMS];
-	
-	void SetProgramVariables();
-	void SetProgramBindings();
-	void Bind();
-};
-
-class ProgramShaderCache
-{
-public:
-
-	struct PCacheEntry
-	{
-		SHADER shader;
-		bool in_cache;
-
-		void Destroy()
-		{
-			shader.Destroy();
-		}
-	};
-
-	typedef std::map<SHADERUID, PCacheEntry> PCache;
-
-	static PCacheEntry GetShaderProgram(void);
-	static GLuint GetCurrentProgram(void);
-	static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components);
-	static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components);
-	
-	static bool CompileShader(SHADER &shader, const char* vcode, const char* pcode);
-	static GLuint CompileSingleShader(GLuint type, const char *code);
-
-	static void SetMultiPSConstant4fv(unsigned int offset, const float *f, unsigned int count);
-	static void SetMultiVSConstant4fv(unsigned int offset, const float *f, unsigned int count);
-	static void UploadConstants();
-
-	static void Init(void);
-	static void Shutdown(void);
-	static void CreateHeader(void);
-
-private:
-	class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
-	{
-	public:
-		void Read(const SHADERUID &key, const u8 *value, u32 value_size);
-	};
-
-	static PCache pshaders;
-	static PCacheEntry* last_entry;
-	static SHADERUID last_uid;
-
-	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
-	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
-
-	static GLintptr s_vs_data_size;
-	static GLintptr s_ps_data_size;
-	static GLintptr s_vs_data_offset;
-	static u8 *s_ubo_buffer;
-	static u32 s_ubo_buffer_size;
-	static bool s_ubo_dirty;
-};
-
-}  // namespace OGL
-#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
deleted file mode 100644
index 9e46a5eb86..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "GLUtil.h"
-
-#include "RasterFont.h"
-#include "ProgramShaderCache.h"
-// globals
-
-namespace OGL {
-
-static const u32 char_width = 8;
-static const u32 char_height = 13;
-static const u32 char_offset = 32;
-static const u32 char_count = 95;
-
-const u8 rasters[char_count][char_height] = {
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, 
-	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00}, 
-	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18}, 
-	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70}, 
-	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e}, 
-	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c}, 
-	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30}, 
-	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00}, 
-	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00}, 
-	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03}, 
-	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c}, 
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18}, 
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06}, 
-	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60}, 
-	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e}, 
-	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, 
-	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc}, 
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e}, 
-	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06}, 
-	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3}, 
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3}, 
-	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c}, 
-	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff}, 
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff}, 
-	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c}, 
-	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60}, 
-	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18}, 
-	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70}, 
-	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03}, 
-	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e}, 
-	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0}, 
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00}, 
-	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00}, 
-	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0}, 
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78}, 
-	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00}, 
-	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00}, 
-	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f}, 
-	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0}, 
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} 
-};
-
-static const char *s_vertexShaderSrc = 
-	"uniform vec2 charSize;\n"
-	"ATTRIN vec2 rawpos;\n"
-	"ATTRIN vec2 tex0;\n"
-	"VARYOUT vec2 uv0;\n"
-	"void main(void) {\n"
-	"	gl_Position = vec4(rawpos,0,1);\n"
-	"	uv0 = tex0 * charSize;\n"
-	"}\n"; 
-
-static const char *s_fragmentShaderSrc =
-	"uniform sampler2D samp8;\n"
-	"uniform vec4 color;\n"
-	"VARYIN vec2 uv0;\n"
-	"COLOROUT(ocol0)\n"
-	"void main(void) {\n"
-	"	ocol0 = texture(samp8,uv0) * color;\n"
-	"}\n";
-	
-static SHADER s_shader;
-	
-RasterFont::RasterFont()
-{
-	// generate the texture
-	glGenTextures(1, &texture);
-	glActiveTexture(GL_TEXTURE0+8);
-	glBindTexture(GL_TEXTURE_2D, texture);
-	u32* texture_data = new u32[char_width*char_count*char_height];
-	for(u32 y=0; y<char_height; y++) {
-		for(u32 c=0; c<char_count; c++) {
-			for(u32 x=0; x<char_width; x++) {
-				bool pixel = rasters[c][y] & (1<<(char_width-x-1));
-				texture_data[char_width*char_count*y+char_width*c+x] = pixel ? -1 : 0;
-			}
-		}
-	}
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, char_width*char_count, char_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data);
-	delete [] texture_data;
-
-	// generate shader
-	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
-
-	// bound uniforms
-	glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(char_count), 1.0f);
-	uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
-	glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
-	cached_color = -1;
-
-	// generate VBO & VAO
-	glGenBuffers(1, &VBO);
-	glGenVertexArrays(1, &VAO);
-	glBindBuffer(GL_ARRAY_BUFFER, VBO);
-	glBindVertexArray(VAO);
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL);
-	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-}
-
-RasterFont::~RasterFont()
-{
-	glDeleteTextures(1, &texture);
-	glDeleteBuffers(1, &VBO);
-	glDeleteVertexArrays(1, &VAO);
-	s_shader.Destroy();
-}
-
-void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color)
-{
-	size_t length = strlen(text);
-	GLfloat *vertices = new GLfloat[length*6*4];
-
-	int usage = 0;
-	GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth);
-	GLfloat delta_y = GLfloat(2*char_height)/GLfloat(bbHeight);
-	GLfloat border_x = 2.0f/GLfloat(bbWidth);
-	GLfloat border_y = 4.0f/GLfloat(bbHeight);
-
-	GLfloat x = GLfloat(start_x);
-	GLfloat y = GLfloat(start_y);
-
-	for(size_t i=0; i<length; i++) {
-		u8 c = text[i];
-
-		if(c == '\n') {
-			x = GLfloat(start_x);
-			y -= delta_y + border_y;
-			continue;
-		}
-
-		// do not print spaces, they can be skipped easily
-		if(c == ' ') {
-			x += delta_x + border_x;
-			continue;
-		}
-
-		if(c < char_offset || c >= char_count+char_offset) continue;
-
-		vertices[usage++] = x;
-		vertices[usage++] = y;
-		vertices[usage++] = GLfloat(c-char_offset);
-		vertices[usage++] = 0.0f;
-
-		vertices[usage++] = x+delta_x;
-		vertices[usage++] = y;
-		vertices[usage++] = GLfloat(c-char_offset+1);
-		vertices[usage++] = 0.0f;
-
-		vertices[usage++] = x+delta_x;
-		vertices[usage++] = y+delta_y;
-		vertices[usage++] = GLfloat(c-char_offset+1);
-		vertices[usage++] = 1.0f;
-
-		vertices[usage++] = x;
-		vertices[usage++] = y;
-		vertices[usage++] = GLfloat(c-char_offset);
-		vertices[usage++] = 0.0f;
-
-		vertices[usage++] = x+delta_x;
-		vertices[usage++] = y+delta_y;
-		vertices[usage++] = GLfloat(c-char_offset+1);
-		vertices[usage++] = 1.0f;
-
-		vertices[usage++] = x;
-		vertices[usage++] = y+delta_y;
-		vertices[usage++] = GLfloat(c-char_offset);
-		vertices[usage++] = 1.0f;
-
-		x += delta_x + border_x;
-	}
-
-	if(!usage) {
-		delete [] vertices;
-		return;
-	}
-
-	glBindVertexArray(VAO);
-	glBindBuffer(GL_ARRAY_BUFFER, VBO);
-	glBufferData(GL_ARRAY_BUFFER, usage*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
-	
-	delete [] vertices;
-
-	s_shader.Bind();
-	
-	if(color != cached_color) {
-		glUniform4f(uniform_color_id, GLfloat((color>>16)&0xff)/255.f,GLfloat((color>>8)&0xff)/255.f,GLfloat((color>>0)&0xff)/255.f,GLfloat((color>>24)&0xff)/255.f);
-		cached_color = color;
-	}
-	
-	glActiveTexture(GL_TEXTURE0+8);
-	glDrawArrays(GL_TRIANGLES, 0, usage/4);
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
deleted file mode 100644
index 97ad877082..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _RASTERFONT_H_
-#define _RASTERFONT_H_
-
-namespace OGL {
-
-class RasterFont {
-public:
-	RasterFont();
-	~RasterFont(void);
-	static int debug;
-
-	void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight, u32 color);
-private:
-	
-	u32 VBO;
-	u32 VAO;
-	u32 texture;
-	u32 uniform_color_id;
-	u32 cached_color;
-};
-
-}
-
-#endif // _RASTERFONT_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
deleted file mode 100644
index 352058c26f..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ /dev/null
@@ -1,1903 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-#include "Thread.h"
-#include "Atomic.h"
-
-#include <vector>
-#include <cmath>
-#include <cstdio>
-
-#include "GLUtil.h"
-#if defined(HAVE_WX) && HAVE_WX
-#include "WxUtils.h"
-#endif
-
-#include "FileUtil.h"
-
-#ifdef _WIN32
-#include <mmsystem.h>
-#endif
-
-#include "CommonPaths.h"
-#include "DriverDetails.h"
-#include "VideoConfig.h"
-#include "Statistics.h"
-#include "ImageWrite.h"
-#include "PixelEngine.h"
-#include "Render.h"
-#include "OpcodeDecoding.h"
-#include "BPStructs.h"
-#include "TextureCache.h"
-#include "RasterFont.h"
-#include "VertexShaderGen.h"
-#include "DLCache.h"
-#include "PixelShaderManager.h"
-#include "ProgramShaderCache.h"
-#include "VertexShaderManager.h"
-#include "VertexLoaderManager.h"
-#include "VertexLoader.h"
-#include "PostProcessing.h"
-#include "TextureConverter.h"
-#include "OnScreenDisplay.h"
-#include "Timer.h"
-#include "StringUtil.h"
-#include "FramebufferManager.h"
-#include "Fifo.h"
-#include "Debugger.h"
-#include "Core.h"
-#include "Movie.h"
-#include "Host.h"
-#include "BPFunctions.h"
-#include "FPSCounter.h"
-#include "ConfigManager.h"
-#include "VertexManager.h"
-#include "SamplerCache.h"
-#include "StreamBuffer.h"
-
-#include "main.h" // Local
-#ifdef _WIN32
-#include "EmuWindow.h"
-#endif
-#if defined _WIN32 || defined HAVE_LIBAV
-#include "AVIDump.h"
-#endif
-
-#if defined(HAVE_WX) && HAVE_WX
-#include <wx/image.h>
-#endif
-
-// glew1.8 doesn't define KHR_debug
-#ifndef GL_DEBUG_OUTPUT
-#define GL_DEBUG_OUTPUT 0x92E0
-#endif
-
-
-void VideoConfig::UpdateProjectionHack()
-{
-	::UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue);
-}
-
-
-#if defined(HAVE_WX) && HAVE_WX
-// Screenshot thread struct
-typedef struct
-{
-	int W, H;
-	std::string filename;
-	wxImage *img;
-} ScrStrct;
-#endif
-
-
-int OSDInternalW, OSDInternalH;
-
-namespace OGL
-{
-
-enum MultisampleMode {
-	MULTISAMPLE_OFF,
-	MULTISAMPLE_2X,
-	MULTISAMPLE_4X,
-	MULTISAMPLE_8X,
-	MULTISAMPLE_CSAA_8X,
-	MULTISAMPLE_CSAA_8XQ,
-	MULTISAMPLE_CSAA_16X,
-	MULTISAMPLE_CSAA_16XQ,
-	MULTISAMPLE_SSAA_4X,
-};
-
-
-VideoConfig g_ogl_config;
-
-// Declarations and definitions
-// ----------------------------
-static int s_fps = 0;
-static GLuint s_ShowEFBCopyRegions_VBO = 0;
-static GLuint s_ShowEFBCopyRegions_VAO = 0;
-static SHADER s_ShowEFBCopyRegions;
-
-static RasterFont* s_pfont = NULL;
-
-// 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA.
-static int s_MSAASamples = 1;
-static int s_MSAACoverageSamples = 0;
-static int s_LastMultisampleMode = 0;
-
-static u32 s_blendMode;
-
-static bool s_vsync;
-
-#if defined(HAVE_WX) && HAVE_WX
-static std::thread scrshotThread;
-#endif
-
-// EFB cache related
-static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks.
-static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up
-static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE;
-static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT];
-static std::vector<u32> s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR
-
-int GetNumMSAASamples(int MSAAMode)
-{
-	int samples;
-	switch (MSAAMode)
-	{
-		case MULTISAMPLE_OFF:
-			samples = 1;
-			break;
-
-		case MULTISAMPLE_2X:
-			samples = 2;
-			break;
-
-		case MULTISAMPLE_4X:
-		case MULTISAMPLE_CSAA_8X:
-		case MULTISAMPLE_CSAA_16X:
-		case MULTISAMPLE_SSAA_4X:
-			samples = 4;
-			break;
-
-		case MULTISAMPLE_8X:
-		case MULTISAMPLE_CSAA_8XQ:
-		case MULTISAMPLE_CSAA_16XQ:
-			samples = 8;
-			break;
-
-		default:
-			samples = 1;
-	}
-	
-	if(samples <= g_ogl_config.max_samples) return samples;
-	
-	// TODO: move this to InitBackendInfo
-	OSD::AddMessage(StringFromFormat("%d Anti Aliasing samples selected, but only %d supported by your GPU.", samples, g_ogl_config.max_samples), 10000);
-	return g_ogl_config.max_samples;
-}
-
-int GetNumMSAACoverageSamples(int MSAAMode)
-{
-	int samples;
-	switch (g_ActiveConfig.iMultisampleMode)
-	{
-		case MULTISAMPLE_CSAA_8X:
-		case MULTISAMPLE_CSAA_8XQ:
-			samples = 8;
-			break;
-
-		case MULTISAMPLE_CSAA_16X:
-		case MULTISAMPLE_CSAA_16XQ:
-			samples = 16;
-			break;
-
-		default:
-			samples = 0;
-	}
-	if(g_ogl_config.bSupportCoverageMSAA || samples == 0) return samples;
-	
-	// TODO: move this to InitBackendInfo
-	OSD::AddMessage("CSAA Anti Aliasing isn't supported by your GPU.", 10000);
-	return 0;
-}
-
-void ApplySSAASettings() {
-	// GLES3 doesn't support SSAA
-#ifndef USE_GLES3
-	if(g_ActiveConfig.iMultisampleMode == MULTISAMPLE_SSAA_4X) {
-		if(g_ogl_config.bSupportSampleShading) {
-			glEnable(GL_SAMPLE_SHADING_ARB);
-			glMinSampleShadingARB(s_MSAASamples);
-		} else {
-			// TODO: move this to InitBackendInfo
-			OSD::AddMessage("SSAA Anti Aliasing isn't supported by your GPU.", 10000);
-		}
-	} else if(g_ogl_config.bSupportSampleShading) {
-		glDisable(GL_SAMPLE_SHADING_ARB);
-	}
-#endif
-}
-
-void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
-{
-	// GLES3 doesn't natively support this
-	// XXX: Include GLES2 extensions header so we can use this
-#ifndef USE_GLES3
-	const char *s_source;
-	const char *s_type;
-
-	switch(source)
-	{
-		case GL_DEBUG_SOURCE_API_ARB:             s_source = "API"; break;
-		case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:   s_source = "Window System"; break;
-		case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB: s_source = "Shader Compiler"; break;
-		case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:     s_source = "Third Party"; break;
-		case GL_DEBUG_SOURCE_APPLICATION_ARB:     s_source = "Application"; break;
-		case GL_DEBUG_SOURCE_OTHER_ARB:           s_source = "Other"; break;
-		default:                                  s_source = "Unknown"; break;
-	}
-	switch(type)
-	{
-		case GL_DEBUG_TYPE_ERROR_ARB:               s_type = "Error"; break;
-		case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB: s_type = "Deprecated"; break;
-		case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:  s_type = "Undefined"; break;
-		case GL_DEBUG_TYPE_PORTABILITY_ARB:         s_type = "Portability"; break;
-		case GL_DEBUG_TYPE_PERFORMANCE_ARB:         s_type = "Performance"; break;
-		case GL_DEBUG_TYPE_OTHER_ARB:               s_type = "Other"; break;
-		default:                                    s_type = "Unknown"; break;
-	}
-	switch(severity)
-	{
-		case GL_DEBUG_SEVERITY_HIGH_ARB:   ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
-		case GL_DEBUG_SEVERITY_MEDIUM_ARB: WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
-		case GL_DEBUG_SEVERITY_LOW_ARB:    WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
-		default:                           ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
-	}
-#endif
-}
-
-#ifndef USE_GLES3
-// Two small Fallbacks to avoid GL_ARB_ES2_compatibility
-void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
-{
-	glDepthRange(neardepth, fardepth);
-}
-void GLAPIENTRY ClearDepthf(GLfloat depthval)
-{
-	glClearDepth(depthval);
-}
-#endif
-
-void InitDriverInfo()
-{
-	std::string svendor = std::string(g_ogl_config.gl_vendor);
-	std::string srenderer = std::string(g_ogl_config.gl_renderer);
-	std::string sversion = std::string(g_ogl_config.gl_version);
-	DriverDetails::Vendor vendor = DriverDetails::VENDOR_UNKNOWN;
-	DriverDetails::Driver driver = DriverDetails::DRIVER_UNKNOWN;
-	double version = 0.0;
-
-	// Get the vendor first
-	if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
-		vendor = DriverDetails::VENDOR_NVIDIA; 
-	else if (svendor == "ATI Technologies Inc." || svendor == "Advanced Micro Devices, Inc.")
-		vendor = DriverDetails::VENDOR_ATI;
-	else if (std::string::npos != sversion.find("Mesa"))
-		vendor = DriverDetails::VENDOR_MESA;
-	else if (std::string::npos != svendor.find("Intel"))
-		vendor = DriverDetails::VENDOR_INTEL;
-	else if (svendor == "ARM")
-		vendor = DriverDetails::VENDOR_ARM;
-	else if (svendor == "http://limadriver.org/")
-	{
-		vendor = DriverDetails::VENDOR_ARM;
-		driver = DriverDetails::DRIVER_LIMA;
-	}
-	else if (svendor == "Qualcomm")
-		vendor = DriverDetails::VENDOR_QUALCOMM;
-	else if (svendor == "Imagination Technologies")
-		vendor = DriverDetails::VENDOR_IMGTEC;
-	else if (svendor == "NVIDIA Corporation" && srenderer == "NVIDIA Tegra")
-		vendor = DriverDetails::VENDOR_TEGRA;
-	else if (svendor == "Vivante Corporation")
-		vendor = DriverDetails::VENDOR_VIVANTE;
-	
-	// Get device family and driver version...if we care about it
-	switch(vendor)
-	{
-		case DriverDetails::VENDOR_QUALCOMM:
-		{
-			if (std::string::npos != srenderer.find("Adreno (TM) 3"))
-				driver = DriverDetails::DRIVER_QUALCOMM_3XX;
-			else
-				driver = DriverDetails::DRIVER_QUALCOMM_2XX;
-			double glVersion;
-			sscanf(g_ogl_config.gl_version, "OpenGL ES %lg V@%lg", &glVersion, &version);
-		}
-		break;
-		case DriverDetails::VENDOR_ARM:
-			if (std::string::npos != srenderer.find("Mali-T6"))
-				driver = DriverDetails::DRIVER_ARM_T6XX;
-			else if(std::string::npos != srenderer.find("Mali-4"))
-				driver = DriverDetails::DRIVER_ARM_4XX;
-		break;
-		case DriverDetails::VENDOR_MESA:
-		{
-			if(svendor == "nouveau")
-				driver = DriverDetails::DRIVER_NOUVEAU;
-			else if(svendor == "Intel Open Source Technology Center")
-				driver = DriverDetails::DRIVER_I965;
-			else if(std::string::npos != srenderer.find("AMD") || std::string::npos != srenderer.find("ATI"))
-				driver = DriverDetails::DRIVER_R600;
-			
-			int major = 0;
-			int minor = 0;
-			int release = 0;
-			sscanf(g_ogl_config.gl_version, "%*s Mesa %d.%d.%d", &major, &minor, &release);
-			version = 100*major + 10*minor + release;
-		}
-		break;
-		// We don't care about these
-		default:
-		break;
-	}
-	DriverDetails::Init(vendor, driver, version);
-}
-
-// Init functions
-Renderer::Renderer()
-{
-	OSDInternalW = 0;
-	OSDInternalH = 0;
-
-	s_fps=0;
-	s_ShowEFBCopyRegions_VBO = 0;
-	s_blendMode = 0;
-	InitFPSCounter();
-
-	bool bSuccess = true;
-
-	g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
-	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
-	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
-	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
-	
-	InitDriverInfo();
-
-	// Init extension support.
-#ifdef USE_GLES3
-	// Set default GLES3 options
-	GLFunc::Init();
-	WARN_LOG(VIDEO, "Running the OpenGL ES 3 backend!");
-	g_Config.backend_info.bSupportsDualSourceBlend = false;
-	g_Config.backend_info.bSupportsGLSLUBO = !DriverDetails::HasBug(DriverDetails::BUG_ANNIHILATEDUBOS); 
-	g_Config.backend_info.bSupportsPrimitiveRestart = true; 
-	g_Config.backend_info.bSupportsEarlyZ = false;
-
-#ifdef ANDROID	
-	g_ogl_config.bSupportsGLSLCache = false; 
-#else
-	g_ogl_config.bSupportsGLSLCache = true; 
-#endif
-	g_ogl_config.bSupportsGLPinnedMemory = false; 
-	g_ogl_config.bSupportsGLSync = true; 
-	g_ogl_config.bSupportsGLBaseVertex = false; 
-	g_ogl_config.bSupportCoverageMSAA = false; // XXX: GLES3 spec has MSAA
-	g_ogl_config.bSupportSampleShading = false; 
-	g_ogl_config.bSupportOGL31 = false; 
-	g_ogl_config.eSupportedGLSLVersion = GLSLES3;
-#else
-#ifdef __APPLE__
-	glewExperimental = 1;
-#endif
-	if (glewInit() != GLEW_OK)
-	{
-		PanicAlert("glewInit() failed! Does your video card support OpenGL 2.x?");
-		return;
-	}
-	
-	// check for the max vertex attributes
-	GLint numvertexattribs = 0;
-	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs);
-	if (numvertexattribs < 16)
-	{
-		PanicAlert("GPU: OGL ERROR: Number of attributes %d not enough.\n"
-				"GPU: Does your video card support OpenGL 2.x?",
-				numvertexattribs);
-		bSuccess = false;
-	}
-
-	// check the max texture width and height
-	GLint max_texture_size;
-	glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&max_texture_size);
-	if (max_texture_size < 1024)
-	{
-		PanicAlert("GL_MAX_TEXTURE_SIZE too small at %i - must be at least 1024.",
-				max_texture_size);
-		bSuccess = false;
-	}
-	
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (GLEW_ARB_debug_output)
-	{
-		glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, true);
-		glDebugMessageCallbackARB( ErrorCallback, NULL );
-		glEnable( GL_DEBUG_OUTPUT );
-	}
-#endif
-
-	if (!GLEW_VERSION_2_0)
-	{
-		// OpenGL 2.0 is required for all shader based drawings. There is no way to get this by extensions
-		PanicAlert("GPU: OGL ERROR: Does your video card support OpenGL 2.0?");
-		bSuccess = false;
-	}
-
-	if (!GLEW_ARB_framebuffer_object)
-	{
-		// We want the ogl3 framebuffer instead of the ogl2 one for better blitting support.
-		// It's also compatible with the gles3 one.
-		PanicAlert("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n"
-				"GPU: Does your video card support OpenGL 3.0?");
-		bSuccess = false;
-	}
-
-	if (!GLEW_ARB_vertex_array_object)
-	{
-		// This extension is used to replace lots of pointer setting function.
-		// Also gles3 requires to use it.
-		PanicAlert("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n"
-				"GPU: Does your video card support OpenGL 3.0?");
-		bSuccess = false;
-	}
-	
-	if (!GLEW_ARB_map_buffer_range)
-	{
-		// ogl3 buffer mapping for better streaming support.
-		// The ogl2 one also isn't in gles3.
-		PanicAlert("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n"
-				"GPU: Does your video card support OpenGL 3.0?");
-		bSuccess = false;
-	}
-
-	if (!GLEW_ARB_sampler_objects && bSuccess)
-	{
-		// Our sampler cache uses this extension. It could easyly be workaround and it's by far the
-		// highest requirement, but it seems that no driver lacks support for it.
-		PanicAlert("GPU: OGL ERROR: Need GL_ARB_sampler_objects."
-				"GPU: Does your video card support OpenGL 3.3?"
-				"Please report this issue, then there will be a workaround");
-		bSuccess = false;
-	}
-	
-	// OpenGL 3 doesn't provide GLES like float functions for depth.
-	// They are in core in OpenGL 4.1, so almost every driver should support them.
-	// But for the oldest ones, we provide fallbacks to the old double functions.
-	if (!GLEW_ARB_ES2_compatibility)
-	{
-		glDepthRangef = DepthRangef;
-		glClearDepthf = ClearDepthf;
-		
-	}
-	
-	g_Config.backend_info.bSupportsDualSourceBlend = GLEW_ARB_blend_func_extended;
-	g_Config.backend_info.bSupportsGLSLUBO = GLEW_ARB_uniform_buffer_object;
-	g_Config.backend_info.bSupportsPrimitiveRestart = GLEW_VERSION_3_1 || GLEW_NV_primitive_restart;
-	g_Config.backend_info.bSupportsEarlyZ = GLEW_ARB_shader_image_load_store;
-	
-	g_ogl_config.bSupportsGLSLCache = GLEW_ARB_get_program_binary;
-	g_ogl_config.bSupportsGLPinnedMemory = GLEW_AMD_pinned_memory;
-	g_ogl_config.bSupportsGLSync = GLEW_ARB_sync;
-	g_ogl_config.bSupportsGLBaseVertex = GLEW_ARB_draw_elements_base_vertex;
-	g_ogl_config.bSupportCoverageMSAA = GLEW_NV_framebuffer_multisample_coverage;
-	g_ogl_config.bSupportSampleShading = GLEW_ARB_sample_shading;
-	g_ogl_config.bSupportOGL31 = GLEW_VERSION_3_1;
-
-	if(strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10"))
-	{
-		PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.20\n"
-				"GPU: Does your video card support OpenGL 2.1?\n"
-				"GPU: Your driver supports GLSL %s", g_ogl_config.glsl_version);
-		bSuccess = false;
-	}
-	else if(strstr(g_ogl_config.glsl_version, "1.20"))
-	{
-		g_ogl_config.eSupportedGLSLVersion = GLSL_120;
-		g_Config.backend_info.bSupportsDualSourceBlend = false; //TODO: implement dual source blend
-		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
-	}
-	else if(strstr(g_ogl_config.glsl_version, "1.30"))
-	{
-		g_ogl_config.eSupportedGLSLVersion = GLSL_130;
-		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
-	}
-	else if(strstr(g_ogl_config.glsl_version, "1.40"))
-	{
-		g_ogl_config.eSupportedGLSLVersion = GLSL_140;
-		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
-	}
-	else
-	{
-		g_ogl_config.eSupportedGLSLVersion = GLSL_150;
-	}
-#endif
-	if (!bSuccess)
-	{
-		// Not all needed extensions are supported, so we have to stop here.
-		// Else some of the next calls might crash.
-		return;
-	}
-	
-	glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples);
-	if(g_ogl_config.max_samples < 1) 
-		g_ogl_config.max_samples = 1;
-	
-	if(g_Config.backend_info.bSupportsGLSLUBO && DriverDetails::HasBug(DriverDetails::BUG_BROKENUBO))
-	{
-		g_Config.backend_info.bSupportsGLSLUBO = false;
-		ERROR_LOG(VIDEO, "Buggy driver detected. Disable UBO");
-		OSD::AddMessage("Major performance warning: Buggy GPU driver detected.", 20000);
-		OSD::AddMessage("Please either install the closed-source GPU driver or update your Mesa 3D version.", 20000);
-	}
-	
-	UpdateActiveConfig();
-
-	OSD::AddMessage(StringFromFormat("Video Info: %s, %s, %s",
-				g_ogl_config.gl_vendor,
-				g_ogl_config.gl_renderer,
-				g_ogl_config.gl_version), 5000);
-	
-	WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s",
-			g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ",
-			g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "UniformBuffer ",
-			g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ",
-			g_ActiveConfig.backend_info.bSupportsEarlyZ ? "" : "EarlyZ ",
-			g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ",
-			g_ogl_config.bSupportsGLSLCache ? "" : "ShaderCache ",
-			g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ",
-			g_ogl_config.bSupportsGLSync ? "" : "Sync ",
-			g_ogl_config.bSupportCoverageMSAA ? "" : "CSAA ",
-			g_ogl_config.bSupportSampleShading ? "" : "SSAA "
-			);
-			
-	s_LastMultisampleMode = g_ActiveConfig.iMultisampleMode;
-	s_MSAASamples = GetNumMSAASamples(s_LastMultisampleMode);
-	s_MSAACoverageSamples = GetNumMSAACoverageSamples(s_LastMultisampleMode);
-	ApplySSAASettings();
-	
-	// Decide framebuffer size
-	s_backbuffer_width = (int)GLInterface->GetBackBufferWidth();
-	s_backbuffer_height = (int)GLInterface->GetBackBufferHeight();
-
-	// Handle VSync on/off
-	s_vsync = g_ActiveConfig.IsVSync();
-	GLInterface->SwapInterval(s_vsync);
-
-	// TODO: Move these somewhere else?
-	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
-	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
-
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-	s_LastEFBScale = g_ActiveConfig.iEFBScale;
-	CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
-
-	// Because of the fixed framebuffer size we need to disable the resolution
-	// options while running
-	g_Config.bRunning = true;
-	
-	glStencilFunc(GL_ALWAYS, 0, 0);
-	glBlendFunc(GL_ONE, GL_ONE);
-
-	glViewport(0, 0, GetTargetWidth(), GetTargetHeight()); // Reset The Current Viewport
-
-	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-	glClearDepthf(1.0f);
-	glEnable(GL_DEPTH_TEST);
-	glDepthFunc(GL_LEQUAL);
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
-
-	glDisable(GL_STENCIL_TEST);
-	glEnable(GL_SCISSOR_TEST);
-
-	glScissor(0, 0, GetTargetWidth(), GetTargetHeight());
-	glBlendColor(0, 0, 0, 0.5f);
-	glClearDepthf(1.0f);
-
-	if(g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
-	{
-#ifdef USE_GLES3
-		glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
-#else
-		if(g_ogl_config.bSupportOGL31)
-		{
-			glEnable(GL_PRIMITIVE_RESTART);
-			glPrimitiveRestartIndex(65535);
-		}
-		else
-		{
-			glEnableClientState(GL_PRIMITIVE_RESTART_NV);
-			glPrimitiveRestartIndexNV(65535);
-		}
-#endif
-	}
-	UpdateActiveConfig();
-}
-
-Renderer::~Renderer()
-{
-
-#if defined(HAVE_WX) && HAVE_WX
-	if (scrshotThread.joinable())
-		scrshotThread.join();
-#endif
-}
-
-void Renderer::Shutdown()
-{
-	delete g_framebuffer_manager;
-	
-	g_Config.bRunning = false;
-	UpdateActiveConfig();
-	
-	glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO);
-	glDeleteVertexArrays(1, &s_ShowEFBCopyRegions_VAO);
-	s_ShowEFBCopyRegions_VBO = 0;
-	
-	delete s_pfont;
-	s_pfont = 0;
-	s_ShowEFBCopyRegions.Destroy();
-}
-
-void Renderer::Init()
-{
-	// Initialize the FramebufferManager
-	g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
-			s_MSAASamples, s_MSAACoverageSamples);
-	
-	s_pfont = new RasterFont();
-	
-	ProgramShaderCache::CompileShader(s_ShowEFBCopyRegions, 
-		"ATTRIN vec2 rawpos;\n"
-		"ATTRIN vec3 color0;\n"
-		"VARYOUT vec4 c;\n"
-		"void main(void) {\n"
-		"	gl_Position = vec4(rawpos, 0.0f, 1.0f);\n"
-		"	c = vec4(color0, 1.0f);\n"
-		"}\n",
-		"VARYIN vec4 c;\n"
-		"COLOROUT(ocol0)\n"
-		"void main(void) {\n"
-		"	ocol0 = c;\n"
-		"}\n");
-	
-	// creating buffers
-	glGenBuffers(1, &s_ShowEFBCopyRegions_VBO);
-	glGenVertexArrays(1, &s_ShowEFBCopyRegions_VAO);
-	glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO);
-	glBindVertexArray( s_ShowEFBCopyRegions_VAO );
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*5, NULL);
-	glEnableVertexAttribArray(SHADER_COLOR0_ATTRIB);
-	glVertexAttribPointer(SHADER_COLOR0_ATTRIB, 3, GL_FLOAT, 0, sizeof(GLfloat)*5, (GLfloat*)NULL+2);
-}
-
-// Create On-Screen-Messages
-void Renderer::DrawDebugInfo()
-{
-	// Reset viewport for drawing text
-	glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
-	// Draw various messages on the screen, like FPS, statistics, etc.
-	char debugtext_buffer[8192];
-	char *p = debugtext_buffer;
-	p[0] = 0;
-
-	if (g_ActiveConfig.bShowFPS)
-		p+=sprintf(p, "FPS: %d\n", s_fps);
-
-	if (SConfig::GetInstance().m_ShowLag)
-		p+=sprintf(p, "Lag: %llu\n", Movie::g_currentLagCount);
-
-	if (g_ActiveConfig.bShowInputDisplay)
-		p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str());
-
-#ifndef USE_GLES3
-	if (g_ActiveConfig.bShowEFBCopyRegions)
-	{
-		// Set Line Size
-		glLineWidth(3.0f);
-
-		// 2*Coords + 3*Color
-		u32 length = stats.efb_regions.size() * sizeof(GLfloat) * (2+3)*2*6;
-		glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO);
-		glBufferData(GL_ARRAY_BUFFER, length, NULL, GL_STREAM_DRAW);
-		GLfloat *Vertices = (GLfloat*)glMapBufferRange(GL_ARRAY_BUFFER, 0, length, GL_MAP_WRITE_BIT);
-
-		// Draw EFB copy regions rectangles
-		int a = 0;
-		GLfloat color[3] = {0.0f, 1.0f, 1.0f};
-		
-		for (std::vector<EFBRectangle>::const_iterator it = stats.efb_regions.begin();
-			it != stats.efb_regions.end(); ++it)
-		{
-			GLfloat halfWidth = EFB_WIDTH / 2.0f;
-			GLfloat halfHeight = EFB_HEIGHT / 2.0f;
-			GLfloat x =  (GLfloat) -1.0f + ((GLfloat)it->left / halfWidth);
-			GLfloat y =  (GLfloat) 1.0f - ((GLfloat)it->top / halfHeight);
-			GLfloat x2 = (GLfloat) -1.0f + ((GLfloat)it->right / halfWidth);
-			GLfloat y2 = (GLfloat) 1.0f - ((GLfloat)it->bottom / halfHeight);
-
-			Vertices[a++] = x;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			
-			Vertices[a++] = x;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			
-			Vertices[a++] = x;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			
-			Vertices[a++] = x2;
-			Vertices[a++] = y;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			Vertices[a++] = x;
-			Vertices[a++] = y2;
-			Vertices[a++] = color[0];
-			Vertices[a++] = color[1];
-			Vertices[a++] = color[2];
-			
-			// TO DO: build something nicer here
-			GLfloat temp = color[0];
-			color[0] = color[1];
-			color[1] = color[2];
-			color[2] = temp;
-		}
-		glUnmapBuffer(GL_ARRAY_BUFFER);
-		
-		s_ShowEFBCopyRegions.Bind();
-		glBindVertexArray( s_ShowEFBCopyRegions_VAO );
-		glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6);
-
-		// Restore Line Size
-		SetLineWidth();
-
-		// Clear stored regions
-		stats.efb_regions.clear();
-	}
-#endif
-
-	if (g_ActiveConfig.bOverlayStats)
-		p = Statistics::ToString(p);
-
-	if (g_ActiveConfig.bOverlayProjStats)
-		p = Statistics::ToStringProj(p);
-
-	// Render a shadow, and then the text.
-	if (p != debugtext_buffer)
-	{
-		Renderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000);
-		Renderer::RenderText(debugtext_buffer, 20, 20, 0xFF00FFFF);
-	}
-}
-
-void Renderer::RenderText(const char *text, int left, int top, u32 color)
-{
-	const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
-	const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
-
-	s_pfont->printMultilineText(text,
-		left * 2.0f / (float)nBackbufferWidth - 1,
-		1 - top * 2.0f / (float)nBackbufferHeight,
-		0, nBackbufferWidth, nBackbufferHeight, color);
-
-	GL_REPORT_ERRORD();
-}
-
-TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
-{
-	TargetRectangle result;
-	result.left   = EFBToScaledX(rc.left);
-	result.top    = EFBToScaledY(EFB_HEIGHT - rc.top);
-	result.right  = EFBToScaledX(rc.right);
-	result.bottom = EFBToScaledY(EFB_HEIGHT - rc.bottom);
-	return result;
-}
-
-// Function: This function handles the OpenGL glScissor() function
-// ----------------------------
-// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
-//		case 0x52 > SetScissorRect()
-// ----------------------------
-// bpmem.scissorTL.x, y = 342x342
-// bpmem.scissorBR.x, y = 981x821
-// Renderer::GetTargetHeight() = the fixed ini file setting
-// donkopunchstania - it appears scissorBR is the bottom right pixel inside the scissor box
-// therefore the width and height are (scissorBR + 1) - scissorTL
-void Renderer::SetScissorRect(const TargetRectangle& rc)
-{
-	glScissor(rc.left, rc.bottom, rc.GetWidth(), rc.GetHeight());
-}
-
-void Renderer::SetColorMask()
-{
-	// Only enable alpha channel if it's supported by the current EFB format
-	GLenum ColorMask = GL_FALSE, AlphaMask = GL_FALSE;
-	if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
-	{
-		if (bpmem.blendmode.colorupdate)
-			ColorMask = GL_TRUE;
-		if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24))
-			AlphaMask = GL_TRUE;
-	}
-	glColorMask(ColorMask,  ColorMask,  ColorMask,  AlphaMask);
-}
-
-void ClearEFBCache()
-{
-	for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i)
-		s_efbCacheValid[0][i] = false;
-
-	for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i)
-		s_efbCacheValid[1][i] = false;
-}
-
-void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data)
-{
-	u32 cacheType = (type == PEEK_Z ? 0 : 1);
-
-	if (!s_efbCache[cacheType][cacheRectIdx].size())
-		s_efbCache[cacheType][cacheRectIdx].resize(EFB_CACHE_RECT_SIZE * EFB_CACHE_RECT_SIZE);
-
-	u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left;
-	u32 efbPixelRcHeight = efbPixelRc.bottom - efbPixelRc.top;
-	u32 efbPixelRcWidth = efbPixelRc.right - efbPixelRc.left;
-
-	for (u32 yCache = 0; yCache < efbPixelRcHeight; ++yCache)
-	{
-		u32 yEFB = efbPixelRc.top + yCache;
-		u32 yPixel = (EFBToScaledY(EFB_HEIGHT - yEFB) + EFBToScaledY(EFB_HEIGHT - yEFB - 1)) / 2;
-		u32 yData = yPixel - targetPixelRc.bottom;
-
-		for (u32 xCache = 0; xCache < efbPixelRcWidth; ++xCache)
-		{
-			u32 xEFB = efbPixelRc.left + xCache;
-			u32 xPixel = (EFBToScaledX(xEFB) + EFBToScaledX(xEFB + 1)) / 2;
-			u32 xData = xPixel - targetPixelRc.left;
-			s_efbCache[cacheType][cacheRectIdx][yCache * EFB_CACHE_RECT_SIZE + xCache] = data[yData * targetPixelRcWidth + xData];
-		}
-	}
-
-	s_efbCacheValid[cacheType][cacheRectIdx] = true;
-}
-
-// This function allows the CPU to directly access the EFB.
-// There are EFB peeks (which will read the color or depth of a pixel)
-// and EFB pokes (which will change the color or depth of a pixel).
-//
-// The behavior of EFB peeks can only be modified by:
-//	- GX_PokeAlphaRead
-// The behavior of EFB pokes can be modified by:
-//	- GX_PokeAlphaMode (TODO)
-//	- GX_PokeAlphaUpdate (TODO)
-//	- GX_PokeBlendMode (TODO)
-//	- GX_PokeColorUpdate (TODO)
-//	- GX_PokeDither (TODO)
-//	- GX_PokeDstAlpha (TODO)
-//	- GX_PokeZMode (TODO)
-u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
-{
-	if (!g_ActiveConfig.bEFBAccessEnable)
-		return 0;
-
-	u32 cacheRectIdx = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_WIDTH
-	                 + (x / EFB_CACHE_RECT_SIZE);
-
-	// Get the rectangular target region containing the EFB pixel
-	EFBRectangle efbPixelRc;
-	efbPixelRc.left = (x / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE;
-	efbPixelRc.top = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE;
-	efbPixelRc.right = std::min(efbPixelRc.left + EFB_CACHE_RECT_SIZE, (u32)EFB_WIDTH);
-	efbPixelRc.bottom = std::min(efbPixelRc.top + EFB_CACHE_RECT_SIZE, (u32)EFB_HEIGHT);
-
-	TargetRectangle targetPixelRc = ConvertEFBRectangle(efbPixelRc);
-	u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left;
-	u32 targetPixelRcHeight = targetPixelRc.top - targetPixelRc.bottom;
-
-	// TODO (FIX) : currently, AA path is broken/offset and doesn't return the correct pixel
-	switch (type)
-	{
-	case PEEK_Z:
-		{
-			u32 z;
-
-			if (!s_efbCacheValid[0][cacheRectIdx])
-			{
-				if (s_MSAASamples > 1)
-				{
-					g_renderer->ResetAPIState();
-					
-					// Resolve our rectangle.
-					FramebufferManager::GetEFBDepthTexture(efbPixelRc);
-					glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetResolvedFramebuffer());
-					
-					g_renderer->RestoreAPIState();
-				}
-
-				u32* depthMap = new u32[targetPixelRcWidth * targetPixelRcHeight];
-
-				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
-				             GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, depthMap);
-				GL_REPORT_ERRORD();
-
-				UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, depthMap);
-
-				delete[] depthMap;
-			}
-
-			u32 xRect = x % EFB_CACHE_RECT_SIZE;
-			u32 yRect = y % EFB_CACHE_RECT_SIZE;
-			z = s_efbCache[0][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect];
-
-			// Scale the 32-bit value returned by glReadPixels to a 24-bit
-			// value (GC uses a 24-bit Z-buffer).
-			// TODO: in RE0 this value is often off by one, which causes lighting to disappear
-			if(bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-			{
-				// if Z is in 16 bit format you must return a 16 bit integer
-				z = z >> 16;
-			}
-			else
-			{
-				z = z >> 8;
-			}
-			return z;
-		}
-
-	case PEEK_COLOR: // GXPeekARGB
-		{
-			// Although it may sound strange, this really is A8R8G8B8 and not RGBA or 24-bit...
-
-			// Tested in Killer 7, the first 8bits represent the alpha value which is used to
-			// determine if we're aiming at an enemy (0x80 / 0x88) or not (0x70)
-			// Wind Waker is also using it for the pictograph to determine the color of each pixel
-
-			u32 color;
-
-			if (!s_efbCacheValid[1][cacheRectIdx])
-			{
-				if (s_MSAASamples > 1)
-				{
-					g_renderer->ResetAPIState();
-					
-					// Resolve our rectangle.
-					FramebufferManager::GetEFBColorTexture(efbPixelRc);
-					glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetResolvedFramebuffer());
-					
-					g_renderer->RestoreAPIState();
-				}
-
-				u32* colorMap = new u32[targetPixelRcWidth * targetPixelRcHeight];
-
-#ifdef USE_GLES3
-				// XXX: Swap colours
-				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
-				             GL_RGBA, GL_UNSIGNED_BYTE, colorMap);
-#else
-				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
-				             GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, colorMap);
-#endif
-				GL_REPORT_ERRORD();
-
-				UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, colorMap);
-
-				delete[] colorMap;
-			}
-
-			u32 xRect = x % EFB_CACHE_RECT_SIZE;
-			u32 yRect = y % EFB_CACHE_RECT_SIZE;
-			color = s_efbCache[1][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect];
-
-			// check what to do with the alpha channel (GX_PokeAlphaRead)
-			PixelEngine::UPEAlphaReadReg alpha_read_mode;
-			PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD);
-
-			if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
-			{
-				color = RGBA8ToRGBA6ToRGBA8(color);
-			}
-			else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
-			{
-				color = RGBA8ToRGB565ToRGBA8(color);
-			}
-			if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24)
-			{
-				color |= 0xFF000000;
-			}
-			if(alpha_read_mode.ReadMode == 2) return color; // GX_READ_NONE
-			else if(alpha_read_mode.ReadMode == 1) return (color | 0xFF000000); // GX_READ_FF
-			else /*if(alpha_read_mode.ReadMode == 0)*/ return (color & 0x00FFFFFF); // GX_READ_00
-		}
-
-	case POKE_COLOR:
-	case POKE_Z:
-		// TODO: Implement. One way is to draw a tiny pixel-sized rectangle at
-		// the exact location. Note: EFB pokes are susceptible to Z-buffering
-		// and perhaps blending.
-		//WARN_LOG(VIDEOINTERFACE, "This is probably some kind of software rendering");
-		break;
-
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-// Called from VertexShaderManager
-void Renderer::UpdateViewport(Matrix44& vpCorrection)
-{
-	// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
-	// [0] = width/2
-	// [1] = height/2
-	// [2] = 16777215 * (farz - nearz)
-	// [3] = xorig + width/2 + 342
-	// [4] = yorig + height/2 + 342
-	// [5] = 16777215 * farz
-
-	int scissorXOff = bpmem.scissorOffset.x * 2;
-	int scissorYOff = bpmem.scissorOffset.y * 2;
-
-	// TODO: ceil, floor or just cast to int?
-	int X = EFBToScaledX((int)ceil(xfregs.viewport.xOrig - xfregs.viewport.wd - (float)scissorXOff));
-	int Y = EFBToScaledY((int)ceil((float)EFB_HEIGHT - xfregs.viewport.yOrig + xfregs.viewport.ht + (float)scissorYOff));
-	int Width = EFBToScaledX((int)ceil(2.0f * xfregs.viewport.wd));
-	int Height = EFBToScaledY((int)ceil(-2.0f * xfregs.viewport.ht));
-	double GLNear = (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f;
-	double GLFar = xfregs.viewport.farZ / 16777216.0f;
-	if (Width < 0)
-	{
-		X += Width;
-		Width *= -1;
-	}
-	if (Height < 0)
-	{
-		Y += Height;
-		Height *= -1;
-	}
-
-	// OpenGL does not require any viewport correct
-	Matrix44::LoadIdentity(vpCorrection);
-
-	// Update the view port
-	glViewport(X, Y, Width, Height);
-	glDepthRangef(GLNear, GLFar);
-}
-
-void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
-{
-	ResetAPIState();
-
-	// color
-	GLboolean const
-		color_mask = colorEnable ? GL_TRUE : GL_FALSE,
-		alpha_mask = alphaEnable ? GL_TRUE : GL_FALSE;
-	glColorMask(color_mask,  color_mask,  color_mask,  alpha_mask);
-
-	glClearColor(
-		float((color >> 16) & 0xFF) / 255.0f,
-		float((color >> 8) & 0xFF) / 255.0f,
-		float((color >> 0) & 0xFF) / 255.0f,
-		float((color >> 24) & 0xFF) / 255.0f);
-
-	// depth
-	glDepthMask(zEnable ? GL_TRUE : GL_FALSE);
-
-	glClearDepthf(float(z & 0xFFFFFF) / float(0xFFFFFF));
-
-	// Update rect for clearing the picture
-	glEnable(GL_SCISSOR_TEST);
-
-	TargetRectangle const targetRc = ConvertEFBRectangle(rc);
-	glScissor(targetRc.left, targetRc.bottom, targetRc.GetWidth(), targetRc.GetHeight());
-
-	// glColorMask/glDepthMask/glScissor affect glClear (glViewport does not)
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	RestoreAPIState();
-
-	ClearEFBCache();
-}
-
-void Renderer::ReinterpretPixelData(unsigned int convtype)
-{
-	if (convtype == 0 || convtype == 2)
-	{
-		FramebufferManager::ReinterpretPixelData(convtype);
-	}
-	else
-	{
-		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
-	}
-}
-
-void Renderer::SetBlendMode(bool forceUpdate)
-{
-	// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
-	// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
-	bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
-	bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
-	
-	const GLenum glSrcFactors[8] =
-	{
-		GL_ZERO,
-		GL_ONE,
-		GL_DST_COLOR,
-		GL_ONE_MINUS_DST_COLOR,
-		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
-		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
-		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
-		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
-	};
-	const GLenum glDestFactors[8] =
-	{
-		GL_ZERO,
-		GL_ONE,
-		GL_SRC_COLOR,
-		GL_ONE_MINUS_SRC_COLOR,
-		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
-		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
-		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
-		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
-	};
-
-	// blend mode bit mask
-	// 0 - blend enable
-	// 1 - dst alpha enabled
-	// 2 - reverse subtract enable (else add)
-	// 3-5 - srcRGB function
-	// 6-8 - dstRGB function
-
-	u32 newval = useDualSource << 1;
-	newval |= bpmem.blendmode.subtract << 2;
-
-	if (bpmem.blendmode.subtract)
-		newval |= 0x0049;   // enable blending src 1 dst 1
-	else if (bpmem.blendmode.blendenable)
-	{
-		newval |= 1;    // enable blending
-		newval |= bpmem.blendmode.srcfactor << 3;
-		newval |= bpmem.blendmode.dstfactor << 6;
-	}
-
-	u32 changes = forceUpdate ? 0xFFFFFFFF : newval ^ s_blendMode;
-
-	if (changes & 1)
-		// blend enable change
-		(newval & 1) ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
-
-	if (changes & 4)
-	{
-		// subtract enable change
-		GLenum equation = newval & 4 ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD;
-		GLenum equationAlpha = useDualSource ? GL_FUNC_ADD : equation;
-		
-		glBlendEquationSeparate(equation, equationAlpha);
-	}
-
-	if (changes & 0x1FA)
-	{
-		u32 srcidx = (newval >> 3) & 7;
-		u32 dstidx = (newval >> 6) & 7;
-		GLenum srcFactor = glSrcFactors[srcidx];
-		GLenum dstFactor = glDestFactors[dstidx];
-
-		// adjust alpha factors
-		if (useDualSource)
-		{
-			srcidx = GX_BL_ONE;
-			dstidx = GX_BL_ZERO;
-		}	
-		else
-		{
-			// we can't use GL_DST_COLOR or GL_ONE_MINUS_DST_COLOR for source in alpha channel so use their alpha equivalent instead
-			if (srcidx == GX_BL_DSTCLR) srcidx = GX_BL_DSTALPHA;
-			if (srcidx == GX_BL_INVDSTCLR) srcidx = GX_BL_INVDSTALPHA;
-
-			// we can't use GL_SRC_COLOR or GL_ONE_MINUS_SRC_COLOR for destination in alpha channel so use their alpha equivalent instead
-			if (dstidx == GX_BL_SRCCLR) dstidx = GX_BL_SRCALPHA;
-			if (dstidx == GX_BL_INVSRCCLR) dstidx = GX_BL_INVSRCALPHA;
-		}		
-		GLenum srcFactorAlpha = glSrcFactors[srcidx];
-		GLenum dstFactorAlpha = glDestFactors[dstidx];
-		// blend RGB change
-		glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha);
-	}
-	s_blendMode = newval;
-}
-
-void DumpFrame(const std::vector<u8>& data, int w, int h)
-{
-#if defined(HAVE_LIBAV) || defined(_WIN32)
-		if (g_ActiveConfig.bDumpFrames && !data.empty())
-		{
-			AVIDump::AddFrame(&data[0], w, h);
-		}
-#endif
-}
-
-// This function has the final picture. We adjust the aspect ratio here.
-void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma)
-{
-	static int w = 0, h = 0;
-	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
-	{
-		DumpFrame(frame_data, w, h);
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2;
-	u32 xfbCount = 0;
-	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
-	if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0))
-	{
-		DumpFrame(frame_data, w, h);
-		Core::Callback_VideoCopiedToXFB(false);
-		return;
-	}
-
-	ResetAPIState();
-
-	PostProcessing::Update(s_backbuffer_width, s_backbuffer_height);
-	UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-	TargetRectangle flipped_trc = GetTargetRectangle();
-
-	// Flip top and bottom for some reason; TODO: Fix the code to suck less?
-	int tmp = flipped_trc.top;
-	flipped_trc.top = flipped_trc.bottom;
-	flipped_trc.bottom = tmp;
-	
-	GL_REPORT_ERRORD();
-
-	// Copy the framebuffer to screen.
-
-	const XFBSourceBase* xfbSource = NULL;
-
-	if(g_ActiveConfig.bUseXFB)
-	{
-		// Render to the real/postprocessing buffer now.
-		PostProcessing::BindTargetFramebuffer();
-		
-		// draw each xfb source
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, FramebufferManager::GetXFBFramebuffer());
-
-		for (u32 i = 0; i < xfbCount; ++i)
-		{
-			xfbSource = xfbSourceList[i];
-
-			MathUtil::Rectangle<float> drawRc;
-
-			if (g_ActiveConfig.bUseRealXFB)
-			{
-				drawRc.top = flipped_trc.top;
-				drawRc.bottom = flipped_trc.bottom;
-				drawRc.left = flipped_trc.left;
-				drawRc.right = flipped_trc.right;
-			}
-			else
-			{
-				// use virtual xfb with offset
-				int xfbHeight = xfbSource->srcHeight;
-				int xfbWidth = xfbSource->srcWidth;
-				int hOffset = ((s32)xfbSource->srcAddr - (s32)xfbAddr) / ((s32)fbWidth * 2);
-				
-				drawRc.top = flipped_trc.top - hOffset * flipped_trc.GetHeight() / fbHeight;
-				drawRc.bottom = flipped_trc.top - (hOffset + xfbHeight) * flipped_trc.GetHeight() / fbHeight;
-				drawRc.left = flipped_trc.left + (flipped_trc.GetWidth() - xfbWidth * flipped_trc.GetWidth() / fbWidth)/2;
-				drawRc.right = flipped_trc.left + (flipped_trc.GetWidth() + xfbWidth * flipped_trc.GetWidth() / fbWidth)/2;
-				
-				// The following code disables auto stretch.  Kept for reference.
-				// scale draw area for a 1 to 1 pixel mapping with the draw target
-				//float vScale = (float)fbHeight / (float)flipped_trc.GetHeight();
-				//float hScale = (float)fbWidth / (float)flipped_trc.GetWidth();
-				//drawRc.top *= vScale;
-				//drawRc.bottom *= vScale;
-				//drawRc.left *= hScale;
-				//drawRc.right *= hScale;
-			}
-			// Tell the OSD Menu about the current internal resolution
-			OSDInternalW = xfbSource->sourceRc.GetWidth(); OSDInternalH = xfbSource->sourceRc.GetHeight();
-
-			MathUtil::Rectangle<float> sourceRc;
-			sourceRc.left = xfbSource->sourceRc.left;
-			sourceRc.right = xfbSource->sourceRc.right;
-			sourceRc.top = xfbSource->sourceRc.top;
-			sourceRc.bottom = xfbSource->sourceRc.bottom;
-
-			xfbSource->Draw(sourceRc, drawRc, 0, 0);
-		}
-	}
-	else
-	{
-		TargetRectangle targetRc = ConvertEFBRectangle(rc);
-		
-		// for msaa mode, we must resolve the efb content to non-msaa
-		FramebufferManager::ResolveAndGetRenderTarget(rc);
-		
-		// Render to the real/postprocessing buffer now. (resolve have changed this in msaa mode)
-		PostProcessing::BindTargetFramebuffer();
-		
-		// always the non-msaa fbo
-		GLuint fb = s_MSAASamples>1?FramebufferManager::GetResolvedFramebuffer():FramebufferManager::GetEFBFramebuffer();
-			
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, fb);
-		glBlitFramebuffer(targetRc.left, targetRc.bottom, targetRc.right, targetRc.top,
-			flipped_trc.left, flipped_trc.bottom, flipped_trc.right, flipped_trc.top,
-			GL_COLOR_BUFFER_BIT, GL_LINEAR);
-	}
-	
-	PostProcessing::BlitToScreen();
-
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
-
-	// Save screenshot
-	if (s_bScreenshot)
-	{
-		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
-		SaveScreenshot(s_sScreenshotName, flipped_trc);
-		// Reset settings
-		s_sScreenshotName.clear();
-		s_bScreenshot = false;
-	}
-
-	// Frame dumps are handled a little differently in Windows
-	// Frame dumping disabled entirely on GLES3
-#ifndef USE_GLES3
-#if defined _WIN32 || defined HAVE_LIBAV
-	if (g_ActiveConfig.bDumpFrames)
-	{
-		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
-		if (frame_data.empty() || w != flipped_trc.GetWidth() ||
-		             h != flipped_trc.GetHeight())
-		{
-			w = flipped_trc.GetWidth();
-			h = flipped_trc.GetHeight();
-			frame_data.resize(3 * w * h);
-		}
-		glPixelStorei(GL_PACK_ALIGNMENT, 1);
-		glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]);
-		if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0)
-		{
-			if (!bLastFrameDumped)
-			{
-				#ifdef _WIN32
-					bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h);
-				#else
-					bAVIDumping = AVIDump::Start(w, h);
-				#endif
-				if (!bAVIDumping)
-					OSD::AddMessage("AVIDump Start failed", 2000);
-				else
-				{
-					OSD::AddMessage(StringFromFormat(
-								"Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
-								File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h).c_str(), 2000);
-				}
-			}
-			if (bAVIDumping)
-			{
-				#ifndef _WIN32
-					FlipImageData(&frame_data[0], w, h);
-				#endif
-					
-					AVIDump::AddFrame(&frame_data[0], w, h);
-			}
-
-			bLastFrameDumped = true;
-		}
-		else
-			NOTICE_LOG(VIDEO, "Error reading framebuffer");
-	}
-	else
-	{
-		if (bLastFrameDumped && bAVIDumping)
-		{
-			std::vector<u8>().swap(frame_data);
-			w = h = 0;
-			AVIDump::Stop();
-			bAVIDumping = false;
-			OSD::AddMessage("Stop dumping frames", 2000);
-		}
-		bLastFrameDumped = false;
-	}
-#else
-	if (g_ActiveConfig.bDumpFrames)
-	{
-		std::lock_guard<std::mutex> lk(s_criticalScreenshot);
-		std::string movie_file_name;
-		w = GetTargetRectangle().GetWidth();
-		h = GetTargetRectangle().GetHeight();
-		frame_data.resize(3 * w * h);
-		glPixelStorei(GL_PACK_ALIGNMENT, 1);
-		glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]);
-		if (GL_REPORT_ERROR() == GL_NO_ERROR)
-		{
-			if (!bLastFrameDumped)
-			{
-				movie_file_name = File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump.raw";
-				pFrameDump.Open(movie_file_name, "wb");
-				if (!pFrameDump)
-					OSD::AddMessage("Error opening framedump.raw for writing.", 2000);
-				else
-				{
-					OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h).c_str(), 2000);
-				}
-			}
-			if (pFrameDump)
-			{
-				FlipImageData(&frame_data[0], w, h);
-				pFrameDump.WriteBytes(&frame_data[0], w * 3 * h);
-				pFrameDump.Flush();
-			}
-			bLastFrameDumped = true;
-		}
-	}
-	else
-	{
-		if (bLastFrameDumped)
-			pFrameDump.Close();
-		bLastFrameDumped = false;
-	}
-#endif
-#endif
-	// Finish up the current frame, print some stats
-
-	SetWindowSize(fbWidth, fbHeight);
-
-	GLInterface->Update(); // just updates the render window position and the backbuffer size
-
-	bool xfbchanged = false;
-
-	if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight)
-	{
-		xfbchanged = true;
-		unsigned int const last_w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth;
-		unsigned int const last_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
-		FramebufferManagerBase::SetLastXfbWidth(last_w);
-		FramebufferManagerBase::SetLastXfbHeight(last_h);
-	}
-
-	bool WindowResized = false;
-	int W = (int)GLInterface->GetBackBufferWidth();
-	int H = (int)GLInterface->GetBackBufferHeight();
-	if (W != s_backbuffer_width || H != s_backbuffer_height || s_LastEFBScale != g_ActiveConfig.iEFBScale)
-	{
-		WindowResized = true;
-		s_backbuffer_width = W;
-		s_backbuffer_height = H;
-		s_LastEFBScale = g_ActiveConfig.iEFBScale;
-	}
-
-	if (xfbchanged || WindowResized || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode))
-	{
-		UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height);
-
-		if (CalculateTargetSize(s_backbuffer_width, s_backbuffer_height) || s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)
-		{
-			s_LastMultisampleMode = g_ActiveConfig.iMultisampleMode;
-			s_MSAASamples = GetNumMSAASamples(s_LastMultisampleMode);
-			s_MSAACoverageSamples = GetNumMSAACoverageSamples(s_LastMultisampleMode);
-			ApplySSAASettings();
-			
-			delete g_framebuffer_manager;
-			g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
-				s_MSAASamples, s_MSAACoverageSamples);
-		}
-	}
-
-	if (XFBWrited)
-		s_fps = UpdateFPSCounter();
-	// ---------------------------------------------------------------------
-	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP))
-	{
-		GL_REPORT_ERRORD();
-
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-		DrawDebugInfo();
-		DrawDebugText();
-
-		GL_REPORT_ERRORD();
-
-		// Do our OSD callbacks
-		OSD::DoCallbacks(OSD::OSD_ONFRAME);
-		OSD::DrawMessages();
-		GL_REPORT_ERRORD();
-	}
-	// Copy the rendered frame to the real window
-	GLInterface->Swap();
-
-	GL_REPORT_ERRORD();
-
-	// Clear framebuffer
-	if (!DriverDetails::HasBug(DriverDetails::BUG_BROKENSWAP))
-	{
-		glClearColor(0, 0, 0, 0);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-		GL_REPORT_ERRORD();
-	}
-
-	if(s_vsync != g_ActiveConfig.IsVSync())
-	{
-		s_vsync = g_ActiveConfig.IsVSync();
-		GLInterface->SwapInterval(s_vsync);
-	}
-
-	// Clean out old stuff from caches. It's not worth it to clean out the shader caches.
-	DLCache::ProgressiveCleanup();
-	TextureCache::Cleanup();
-
-	frameCount++;
-
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);
-
-	// Begin new frame
-	// Set default viewport and scissor, for the clear to work correctly
-	// New frame
-	stats.ResetFrame();
-
-	// Render to the framebuffer.
-	FramebufferManager::SetFramebuffer(0);
-
-	GL_REPORT_ERRORD();
-
-	RestoreAPIState();
-
-	GL_REPORT_ERRORD();
-	g_Config.iSaveTargetId = 0;
-
-	UpdateActiveConfig();
-	TextureCache::OnConfigChanged(g_ActiveConfig);
-
-	// For testing zbuffer targets.
-	// Renderer::SetZBufferRender();
-	// SaveTexture("tex.tga", GL_TEXTURE_2D, s_FakeZTarget,
-	//	      GetTargetWidth(), GetTargetHeight());
-	Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB));
-	XFBWrited = false;
-
-	// Invalidate EFB cache
-	ClearEFBCache();
-}
-
-// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
-void Renderer::ResetAPIState()
-{
-	// Gets us to a reasonably sane state where it's possible to do things like
-	// image copies with textured quads, etc.
-	glDisable(GL_SCISSOR_TEST);
-	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_CULL_FACE);
-	glDisable(GL_BLEND);
-#ifndef USE_GLES3
-	glDisable(GL_COLOR_LOGIC_OP);
-#endif
-	glDepthMask(GL_FALSE);
-	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-void Renderer::RestoreAPIState()
-{
-	// Gets us back into a more game-like state.
-	glEnable(GL_SCISSOR_TEST);
-	SetGenerationMode();
-	BPFunctions::SetScissor();
-	SetColorMask();
-	SetDepthMode();
-	SetBlendMode(true);
-	SetLogicOpMode();
-	VertexShaderManager::SetViewportChanged();
-
-#ifndef USE_GLES3
-	glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL);
-#endif
-	
-	VertexManager *vm = (OGL::VertexManager*)g_vertex_manager;
-	glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers);
-	vm->m_last_vao = 0;
-	
-	TextureCache::SetStage();
-}
-
-void Renderer::SetGenerationMode()
-{
-	// none, ccw, cw, ccw
-	if (bpmem.genMode.cullmode > 0)
-	{
-		glEnable(GL_CULL_FACE);
-		glFrontFace(bpmem.genMode.cullmode == 2 ? GL_CCW : GL_CW);
-	}
-	else
-		glDisable(GL_CULL_FACE);
-}
-
-void Renderer::SetDepthMode()
-{
-	const GLenum glCmpFuncs[8] =
-	{
-		GL_NEVER,
-		GL_LESS,
-		GL_EQUAL,
-		GL_LEQUAL,
-		GL_GREATER,
-		GL_NOTEQUAL,
-		GL_GEQUAL,
-		GL_ALWAYS
-	};
-
-	if (bpmem.zmode.testenable)
-	{
-		glEnable(GL_DEPTH_TEST);
-		glDepthMask(bpmem.zmode.updateenable ? GL_TRUE : GL_FALSE);
-		glDepthFunc(glCmpFuncs[bpmem.zmode.func]);
-	}
-	else
-	{
-		// if the test is disabled write is disabled too
-		// TODO: When PE performance metrics are being emulated via occlusion queries, we should (probably?) enable depth test with depth function ALWAYS here
-		glDisable(GL_DEPTH_TEST);
-		glDepthMask(GL_FALSE);
-	}
-}
-
-void Renderer::SetLogicOpMode()
-{
-
-	// Logic ops aren't available in GLES3/GLES2
-#ifndef USE_GLES3
-	const GLenum glLogicOpCodes[16] =
-	{
-		GL_CLEAR,
-		GL_AND,
-		GL_AND_REVERSE,
-		GL_COPY,
-		GL_AND_INVERTED,
-		GL_NOOP,
-		GL_XOR,
-		GL_OR,
-		GL_NOR,
-		GL_EQUIV,
-		GL_INVERT,
-		GL_OR_REVERSE,
-		GL_COPY_INVERTED,
-		GL_OR_INVERTED,
-		GL_NAND,
-		GL_SET
-	};
-
-	if (bpmem.blendmode.logicopenable)
-	{
-		glEnable(GL_COLOR_LOGIC_OP);
-		glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]);
-	}
-	else
-	{
-		glDisable(GL_COLOR_LOGIC_OP);
-	}
-#endif
-}
-
-void Renderer::SetDitherMode()
-{
-	if (bpmem.blendmode.dither)
-		glEnable(GL_DITHER);
-	else
-		glDisable(GL_DITHER);
-}
-
-void Renderer::SetLineWidth()
-{
-	float fratio = xfregs.viewport.wd != 0 ?
-		((float)Renderer::GetTargetWidth() / EFB_WIDTH) : 1.0f;
-	if (bpmem.lineptwidth.linesize > 0)
-		// scale by ratio of widths
-		glLineWidth((float)bpmem.lineptwidth.linesize * fratio / 6.0f);
-#ifndef USE_GLES3
-	if (bpmem.lineptwidth.pointsize > 0)
-		glPointSize((float)bpmem.lineptwidth.pointsize * fratio / 6.0f);
-#endif
-}
-
-void Renderer::SetSamplerState(int stage, int texindex)
-{
-	auto const& tex = bpmem.tex[texindex];
-	auto const& tm0 = tex.texMode0[stage];
-	auto const& tm1 = tex.texMode1[stage];
-	
-	g_sampler_cache->SetSamplerState((texindex * 4) + stage, tm0, tm1);
-}
-
-void Renderer::SetInterlacingMode()
-{
-	// TODO
-}
-
-void Renderer::FlipImageData(u8 *data, int w, int h)
-{
-	// Flip image upside down. Damn OpenGL.
-	for (int y = 0; y < h / 2; y++)
-	{
-		for(int x = 0; x < w; x++)
-		{
-			std::swap(data[(y * w + x) * 3],     data[((h - 1 - y) * w + x) * 3]);
-			std::swap(data[(y * w + x) * 3 + 1], data[((h - 1 - y) * w + x) * 3 + 1]);
-			std::swap(data[(y * w + x) * 3 + 2], data[((h - 1 - y) * w + x) * 3 + 2]);
-		}
-	}
-}
-
-}
-
-// TODO: remove
-extern bool g_aspect_wide;
-
-#if defined(HAVE_WX) && HAVE_WX
-void TakeScreenshot(ScrStrct* threadStruct)
-{
-	// These will contain the final image size
-	float FloatW = (float)threadStruct->W;
-	float FloatH = (float)threadStruct->H;
-
-	// Handle aspect ratio for the final ScrStrct to look exactly like what's on screen.
-	if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH)
-	{
-		bool use16_9 = g_aspect_wide;
-
-		// Check for force-settings and override.
-		if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9)
-			use16_9 = true;
-		else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3)
-			use16_9 = false;
-
-		float Ratio = (FloatW / FloatH) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f));
-
-		// If ratio > 1 the picture is too wide and we have to limit the width.
-		if (Ratio > 1)
-			FloatW /= Ratio;
-		// ratio == 1 or the image is too high, we have to limit the height.
-		else
-			FloatH *= Ratio;
-
-		// This is a bit expensive on high resolutions
-		threadStruct->img->Rescale((int)FloatW, (int)FloatH, wxIMAGE_QUALITY_HIGH);
-	}
-
-	// Save the screenshot and finally kill the wxImage object
-	// This is really expensive when saving to PNG, but not at all when using BMP
-	threadStruct->img->SaveFile(StrToWxStr(threadStruct->filename),
-		wxBITMAP_TYPE_PNG);
-	threadStruct->img->Destroy();
-
-	// Show success messages
-	OSD::AddMessage(StringFromFormat("Saved %i x %i %s", (int)FloatW, (int)FloatH,
-		threadStruct->filename.c_str()), 2000);
-	delete threadStruct;
-}
-#endif
-
-namespace OGL
-{
-
-bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &back_rc)
-{
-	u32 W = back_rc.GetWidth();
-	u32 H = back_rc.GetHeight();
-	u8 *data = (u8 *)malloc((sizeof(u8) * 3 * W * H));
-	glPixelStorei(GL_PACK_ALIGNMENT, 1);
-
-	glReadPixels(back_rc.left, back_rc.bottom, W, H, GL_RGB, GL_UNSIGNED_BYTE, data);
-
-	// Show failure message
-	if (GL_REPORT_ERROR() != GL_NO_ERROR)
-	{
-		free(data);
-		OSD::AddMessage("Error capturing or saving screenshot.", 2000);
-		return false;
-	}
-
-	// Turn image upside down
-	FlipImageData(data, W, H);
-
-#if defined(HAVE_WX) && HAVE_WX
-	// Create wxImage
-	wxImage *a = new wxImage(W, H, data);
-
-	if (scrshotThread.joinable())
-		scrshotThread.join();
-
-	ScrStrct *threadStruct = new ScrStrct;
-	threadStruct->filename = filename;
-	threadStruct->img = a;
-	threadStruct->H = H; threadStruct->W = W;
-
-	scrshotThread = std::thread(TakeScreenshot, threadStruct);
-#ifdef _WIN32
-	SetThreadPriority(scrshotThread.native_handle(), THREAD_PRIORITY_BELOW_NORMAL);
-#endif
-	bool result = true;
-
-	OSD::AddMessage("Saving Screenshot... ", 2000);
-
-#else
-	bool result = SaveTGA(filename.c_str(), W, H, data);
-	free(data);
-#endif
-
-	return result;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
deleted file mode 100644
index a570faab85..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-#ifndef _RENDER_H_
-#define _RENDER_H_
-
-#include "RenderBase.h"
-
-namespace OGL
-{
-
-void ClearEFBCache();
-
-enum GLSL_VERSION {
-	GLSL_120,
-	GLSL_130,
-	GLSL_140,
-	GLSL_150, // and above
-	GLSLES3
-};
-
-// ogl-only config, so not in VideoConfig.h
-extern struct VideoConfig {
-	bool bSupportsGLSLCache;
-	bool bSupportsGLPinnedMemory;
-	bool bSupportsGLSync;
-	bool bSupportsGLBaseVertex;
-	bool bSupportCoverageMSAA;
-	bool bSupportSampleShading;
-	GLSL_VERSION eSupportedGLSLVersion;
-	bool bSupportOGL31;
-	
-	const char *gl_vendor;
-	const char *gl_renderer;
-	const char* gl_version;
-	const char* glsl_version;
-	
-	s32 max_samples;
-} g_ogl_config;
-
-class Renderer : public ::Renderer
-{
-public:
-	Renderer();
-	~Renderer();
-	
-	static void Init();
-	static void Shutdown();
-
-	void SetColorMask();
-	void SetBlendMode(bool forceUpdate);
-	void SetScissorRect(const TargetRectangle& rc);
-	void SetGenerationMode();
-	void SetDepthMode();
-	void SetLogicOpMode();
-	void SetDitherMode();
-	void SetLineWidth();
-	void SetSamplerState(int stage,int texindex);
-	void SetInterlacingMode();
-
-	// TODO: Implement and use these
-	void ApplyState(bool bUseDstAlpha) {}
-	void RestoreState() {}
-
-	void RenderText(const char* pstr, int left, int top, u32 color);
-	void DrawDebugInfo();
-	void FlipImageData(u8 *data, int w, int h);
-
-	u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data);
-
-	void ResetAPIState();
-	void RestoreAPIState();
-
-	TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc);
-
-	void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
-
-	void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
-
-	void ReinterpretPixelData(unsigned int convtype);
-
-	void UpdateViewport(Matrix44& vpCorrection);
-
-	bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
-
-	void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetPSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-
-	void SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4);
-	void SetVSConstant4fv(unsigned int const_number, const float *f);
-	void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f);
-	void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f);
-
-private:
-	void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data);
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
deleted file mode 100644
index 8e4722bde9..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "SamplerCache.h"
-
-namespace OGL
-{
-
-SamplerCache *g_sampler_cache;
-
-SamplerCache::SamplerCache()
-	: m_last_max_anisotropy()
-{}
-
-SamplerCache::~SamplerCache()
-{
-	Clear();
-}
-
-void SamplerCache::SetSamplerState(int stage, const TexMode0& tm0, const TexMode1& tm1)
-{
-	// TODO: can this go somewhere else?
-	if (m_last_max_anisotropy != g_ActiveConfig.iMaxAnisotropy)
-	{
-		m_last_max_anisotropy = g_ActiveConfig.iMaxAnisotropy;
-		Clear();
-	}
-	
-	Params params(tm0, tm1);
-	
-	// take equivalent forced linear when bForceFiltering
-	if (g_ActiveConfig.bForceFiltering)
-	{
-		params.tm0.min_filter |= 0x4;
-		params.tm0.mag_filter |= 0x1;
-	}
-	
-	// TODO: Should keep a circular buffer for each stage of recently used samplers.
-	
-	auto& active_sampler = m_active_samplers[stage];
-	if (active_sampler.first != params || !active_sampler.second.sampler_id)
-	{
-		// Active sampler does not match parameters (or is invalid), bind the proper one.
-		active_sampler.first = params;
-		active_sampler.second = GetEntry(params);
-		glBindSampler(stage, active_sampler.second.sampler_id);
-	}
-}
-
-auto SamplerCache::GetEntry(const Params& params) -> Value&
-{
-	auto& val = m_cache[params];
-	if (!val.sampler_id)
-	{
-		// Sampler not found in cache, create it.
-		glGenSamplers(1, &val.sampler_id);
-		SetParameters(val.sampler_id, params);
-		
-		// TODO: Maybe kill old samplers if the cache gets huge. It doesn't seem to get huge though.
-		//ERROR_LOG(VIDEO, "Sampler cache size is now %ld.", m_cache.size());
-	}
-	
-	return val;
-}
-
-void SamplerCache::SetParameters(GLuint sampler_id, const Params& params)
-{
-	static const GLint min_filters[8] =
-	{
-		GL_NEAREST,
-		GL_NEAREST_MIPMAP_NEAREST,
-		GL_NEAREST_MIPMAP_LINEAR,
-		GL_NEAREST,
-		GL_LINEAR,
-		GL_LINEAR_MIPMAP_NEAREST,
-		GL_LINEAR_MIPMAP_LINEAR,
-		GL_LINEAR,
-	};
-	
-	static const GLint wrap_settings[4] =
-	{
-		GL_CLAMP_TO_EDGE,
-		GL_REPEAT,
-		GL_MIRRORED_REPEAT,
-		GL_REPEAT,
-	};
-	
-	auto& tm0 = params.tm0;
-	auto& tm1 = params.tm1;
-
-	glSamplerParameteri(sampler_id, GL_TEXTURE_MIN_FILTER, min_filters[tm0.min_filter % ArraySize(min_filters)]);
-	glSamplerParameteri(sampler_id, GL_TEXTURE_MAG_FILTER, tm0.mag_filter ? GL_LINEAR : GL_NEAREST);
-
-	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_S, wrap_settings[tm0.wrap_s]);
-	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_T, wrap_settings[tm0.wrap_t]);
-	
-	glSamplerParameterf(sampler_id, GL_TEXTURE_MIN_LOD, tm1.min_lod / 16.f);
-	glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, tm1.max_lod / 16.f);
-
-#ifndef USE_GLES3
-	glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, (s32)tm0.lod_bias / 32.f);
-
-	if (g_ActiveConfig.iMaxAnisotropy > 0)
-		glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy));
-#endif
-}
-
-void SamplerCache::Clear()
-{
-	for (auto it = m_cache.begin(); it != m_cache.end(); ++it)
-	{
-		glDeleteSamplers(1, &it->second.sampler_id);
-	}
-	m_cache.clear();
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
deleted file mode 100644
index 814a628d1c..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-#include "GLUtil.h"
-#include "StreamBuffer.h"
-#include "MemoryUtil.h"
-#include "Render.h"
-#include "DriverDetails.h"
-#include "OnScreenDisplay.h"
-
-namespace OGL
-{
-
-static const u32 SYNC_POINTS = 16;
-static const u32 ALIGN_PINNED_MEMORY = 4096;
-
-StreamBuffer::StreamBuffer(u32 type, size_t size, StreamType uploadType)
-: m_uploadtype(uploadType), m_buffertype(type), m_size(size)
-{
-	glGenBuffers(1, &m_buffer);
-	
-	bool nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation");
-	
-	if(m_uploadtype & STREAM_DETECT)
-	{
-		// TODO: move this to InitBackendInfo
-		if(g_ActiveConfig.bHackedBufferUpload && DriverDetails::HasBug(DriverDetails::BUG_BROKENHACKEDBUFFER))
-		{
-			OSD::AddMessage("Vertex Streaming Hack isn't supported by your GPU.", 10000);
-			g_ActiveConfig.bHackedBufferUpload = false;
-			g_Config.bHackedBufferUpload = false;
-		}
-		
-		if(!g_ogl_config.bSupportsGLBaseVertex && (m_uploadtype & BUFFERDATA))
-			m_uploadtype = BUFFERDATA;
-		else if(!g_ogl_config.bSupportsGLBaseVertex && (m_uploadtype & BUFFERSUBDATA))
-			m_uploadtype = BUFFERSUBDATA;
-		else if(g_ogl_config.bSupportsGLSync && g_ActiveConfig.bHackedBufferUpload && (m_uploadtype & MAP_AND_RISK))
-			m_uploadtype = MAP_AND_RISK;
-		else if(g_ogl_config.bSupportsGLSync && g_ogl_config.bSupportsGLPinnedMemory && (!DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY) || type != GL_ELEMENT_ARRAY_BUFFER) && (m_uploadtype & PINNED_MEMORY))
-			m_uploadtype = PINNED_MEMORY;
-		else if(nvidia && (m_uploadtype & BUFFERSUBDATA))
-			m_uploadtype = BUFFERSUBDATA;
-		else if(g_ogl_config.bSupportsGLSync && (m_uploadtype & MAP_AND_SYNC))
-			m_uploadtype = MAP_AND_SYNC;
-		else 
-			m_uploadtype = MAP_AND_ORPHAN;
-	}
-	
-	Init();
-}
-
-StreamBuffer::~StreamBuffer()
-{
-	Shutdown();
-	glDeleteBuffers(1, &m_buffer);
-}
-
-#define SLOT(x) (x)*SYNC_POINTS/m_size
-
-void StreamBuffer::Alloc ( size_t size, u32 stride )
-{
-	size_t m_iterator_aligned = m_iterator;
-	if(m_iterator_aligned && stride) {
-		m_iterator_aligned--;
-		m_iterator_aligned = m_iterator_aligned - (m_iterator_aligned % stride) + stride;
-	}
-	size_t iter_end = m_iterator_aligned + size;
-	
-	switch(m_uploadtype) {
-	case MAP_AND_ORPHAN:
-		if(iter_end >= m_size) {
-			glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW);
-			m_iterator_aligned = 0;
-		}
-		break;
-	case MAP_AND_SYNC:
-	case PINNED_MEMORY:
-		
-		// insert waiting slots for used memory
-		for(u32 i=SLOT(m_used_iterator); i<SLOT(m_iterator); i++)
-		{
-			fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-		}
-		m_used_iterator = m_iterator;
-		
-		// wait for new slots to end of buffer
-		for(u32 i=SLOT(m_free_iterator)+1; i<=SLOT(iter_end) && i < SYNC_POINTS; i++)
-		{
-			glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
-			glDeleteSync(fences[i]);
-		}
-		m_free_iterator = iter_end;
-		
-		// if buffer is full
-		if(iter_end >= m_size) {
-			
-			// insert waiting slots in unused space at the end of the buffer
-			for(u32 i=SLOT(m_used_iterator); i < SYNC_POINTS; i++)
-				fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-			
-			// move to the start
-			m_used_iterator = m_iterator_aligned = m_iterator = 0; // offset 0 is always aligned
-			iter_end = size;
-			
-			// wait for space at the start
-			for(u32 i=0; i<=SLOT(iter_end); i++)
-			{
-				glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
-				glDeleteSync(fences[i]);
-			}
-			m_free_iterator = iter_end;
-		}
-		
-		break;
-	case MAP_AND_RISK:
-		if(iter_end >= m_size) {
-			m_iterator_aligned = 0;
-		}
-		break;
-	case BUFFERSUBDATA:
-	case BUFFERDATA:
-		m_iterator_aligned = 0;
-		break;
-	case STREAM_DETECT:
-	case DETECT_MASK: // Just to shutup warnings
-		break;
-	}
-	m_iterator = m_iterator_aligned;
-}
-
-size_t StreamBuffer::Upload ( u8* data, size_t size )
-{
-	switch(m_uploadtype) {
-	case MAP_AND_SYNC:
-	case MAP_AND_ORPHAN:
-		pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
-		if(pointer) {
-			memcpy(pointer, data, size);
-			glUnmapBuffer(m_buffertype);
-		} else {
-			ERROR_LOG(VIDEO, "Buffer mapping failed");
-		}
-		break;
-	case PINNED_MEMORY:
-	case MAP_AND_RISK:
-		if(pointer)
-			memcpy(pointer+m_iterator, data, size);
-		break;
-	case BUFFERSUBDATA:
-		glBufferSubData(m_buffertype, m_iterator, size, data);
-		break;
-	case BUFFERDATA:
-		glBufferData(m_buffertype, size, data, GL_STREAM_DRAW);
-		break;
-	case STREAM_DETECT:
-	case DETECT_MASK: // Just to shutup warnings
-		break;
-	}
-	size_t ret = m_iterator;
-	m_iterator += size;
-	return ret;
-}
-
-void StreamBuffer::Init()
-{
-	m_iterator = 0;
-	m_used_iterator = 0;
-	m_free_iterator = 0;
-	
-	switch(m_uploadtype) {
-	case MAP_AND_SYNC:
-		fences = new GLsync[SYNC_POINTS];
-		for(u32 i=0; i<SYNC_POINTS; i++)
-			fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-		
-	case MAP_AND_ORPHAN:
-	case BUFFERSUBDATA:
-		glBindBuffer(m_buffertype, m_buffer);
-		glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW);
-		break;
-	case PINNED_MEMORY:
-		glGetError(); // errors before this allocation should be ignored
-		fences = new GLsync[SYNC_POINTS];
-		for(u32 i=0; i<SYNC_POINTS; i++)
-			fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-		
-		pointer = (u8*)AllocateAlignedMemory(ROUND_UP(m_size,ALIGN_PINNED_MEMORY), ALIGN_PINNED_MEMORY );
-		glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, m_buffer);
-		glBufferData(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, ROUND_UP(m_size,ALIGN_PINNED_MEMORY), pointer, GL_STREAM_COPY);
-		glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, 0);
-		glBindBuffer(m_buffertype, m_buffer);
-		
-		// on error, switch to another backend. some old catalyst seems to have broken pinned memory support
-		if(glGetError() != GL_NO_ERROR) {
-			ERROR_LOG(VIDEO, "Pinned memory detected, but not working. Please report this: %s, %s, %s", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version);
-			Shutdown();
-			m_uploadtype = MAP_AND_SYNC;
-			Init();
-		}
-		break;
-	case MAP_AND_RISK:
-		glBindBuffer(m_buffertype, m_buffer);
-		glBufferData(m_buffertype, m_size, NULL, GL_STREAM_DRAW);
-		pointer = (u8*)glMapBufferRange(m_buffertype, 0, m_size, GL_MAP_WRITE_BIT);
-		glUnmapBuffer(m_buffertype);
-		if(!pointer)
-			ERROR_LOG(VIDEO, "Buffer allocation failed");
-		break;
-	case BUFFERDATA:
-		glBindBuffer(m_buffertype, m_buffer);
-		break;
-	case STREAM_DETECT:
-	case DETECT_MASK: // Just to shutup warnings
-		break;
-	}
-}
-
-void StreamBuffer::Shutdown()
-{
-	switch(m_uploadtype) {
-	case MAP_AND_SYNC:
-		DeleteFences();
-		break;
-	case MAP_AND_RISK:
-	case MAP_AND_ORPHAN:
-	case BUFFERSUBDATA:
-	case BUFFERDATA:
-		break;
-	case PINNED_MEMORY:
-		DeleteFences();
-		glBindBuffer(m_buffertype, 0);
-		glFinish(); // ogl pipeline must be flushed, else this buffer can be in use
-		FreeAlignedMemory(pointer);
-		break;
-	case STREAM_DETECT:
-	case DETECT_MASK: // Just to shutup warnings
-		break;
-	}
-}
-
-void StreamBuffer::DeleteFences()
-{
-	for(u32 i=SLOT(m_free_iterator)+1; i < SYNC_POINTS; i++)
-		glDeleteSync(fences[i]);
-	for(u32 i=0; i<SLOT(m_iterator); i++)
-		glDeleteSync(fences[i]);
-	delete [] fences;
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
deleted file mode 100644
index c0d6efc574..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef STREAMBUFFER_H
-#define STREAMBUFFER_H
-
-#include "VideoCommon.h"
-#include "FramebufferManager.h"
-#include "GLUtil.h"
-
-// glew < 1.8 doesn't support pinned memory
-#ifndef GLEW_AMD_pinned_memory
-#define GLEW_AMD_pinned_memory glewIsSupported("GL_AMD_pinned_memory")
-#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
-#endif
-
-namespace OGL
-{
-enum StreamType {
-	DETECT_MASK = 0x7F,
-	STREAM_DETECT = (1 << 0),
-	MAP_AND_ORPHAN = (1 << 1),
-	MAP_AND_SYNC = (1 << 2),
-	MAP_AND_RISK = (1 << 3),
-	PINNED_MEMORY = (1 << 4),
-	BUFFERSUBDATA = (1 << 5),
-	BUFFERDATA = (1 << 6)
-};
-
-class StreamBuffer {
-
-public:
-	StreamBuffer(u32 type, size_t size, StreamType uploadType = DETECT_MASK);
-	~StreamBuffer();
-	
-	void Alloc(size_t size, u32 stride = 0);
-	size_t Upload(u8 *data, size_t size);
-	
-	u32 getBuffer() { return m_buffer; }
-	
-private:
-	void Init();
-	void Shutdown();
-	void DeleteFences();
-	
-	StreamType m_uploadtype;
-	u32 m_buffer;
-	u32 m_buffertype;
-	size_t m_size;
-	u8 *pointer;
-	size_t m_iterator;
-	size_t m_used_iterator;
-	size_t m_free_iterator;
-	GLsync *fences;
-};
-
-}
-
-#endif // STREAMBUFFER_H
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
deleted file mode 100644
index da3a4b33e9..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
+++ /dev/null
@@ -1,490 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <vector>
-#include <cmath>
-
-
-#include <fstream>
-#ifdef _WIN32
-#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
-#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
-#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64
-#define _interlockedbittestandreset64 workaround_ms_header_bug_platform_sdk6_reset64
-#include <intrin.h>
-#undef _interlockedbittestandset
-#undef _interlockedbittestandreset
-#undef _interlockedbittestandset64
-#undef _interlockedbittestandreset64
-#endif
-
-#include "BPStructs.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "FramebufferManager.h"
-#include "Globals.h"
-#include "Hash.h"
-#include "HiresTextures.h"
-#include "HW/Memmap.h"
-#include "ImageWrite.h"
-#include "MemoryUtil.h"
-#include "ProgramShaderCache.h"
-#include "PixelShaderManager.h"
-#include "Render.h"
-#include "Statistics.h"
-#include "StringUtil.h"
-#include "TextureCache.h"
-#include "TextureConverter.h"
-#include "TextureDecoder.h"
-#include "VertexShaderManager.h"
-#include "VideoConfig.h"
-
-namespace OGL
-{
-
-static SHADER s_ColorMatrixProgram;
-static SHADER s_DepthMatrixProgram;
-static GLuint s_ColorMatrixUniform;
-static GLuint s_DepthMatrixUniform;
-static u32 s_ColorCbufid;
-static u32 s_DepthCbufid;
-
-static u32 s_Textures[8];
-static u32 s_ActiveTexture;
-static u32 s_NextStage;
-
-struct VBOCache {
-	GLuint vbo;
-	GLuint vao;
-	TargetRectangle targetSource;
-};
-static std::map<u64,VBOCache> s_VBO;
-
-bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level)
-{
-#ifndef USE_GLES3
-	int width = std::max(virtual_width >> level, 1);
-	int height = std::max(virtual_height >> level, 1);
-	std::vector<u32> data(width * height);
-	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(textarget, tex);
-	glGetTexImage(textarget, level, GL_BGRA, GL_UNSIGNED_BYTE, &data[0]);
-	glBindTexture(textarget, 0);
-	TextureCache::SetStage();
-
-	const GLenum err = GL_REPORT_ERROR();
-	if (GL_NO_ERROR != err)
-	{
-		PanicAlert("Can't save texture, GL Error: %s", gluErrorString(err));
-		return false;
-	}
-
-	return SaveTGA(filename, width, height, &data[0]);
-#else
-	return false;
-#endif
-}
-
-TextureCache::TCacheEntry::~TCacheEntry()
-{
-	if (texture)
-	{
-		for(int i=0; i<8; i++)
-			if(s_Textures[i] == texture)
-				s_Textures[i] = 0;
-		glDeleteTextures(1, &texture);
-		texture = 0;
-	}
-
-	if (framebuffer)
-	{
-		glDeleteFramebuffers(1, &framebuffer);
-		framebuffer = 0;
-	}
-}
-
-TextureCache::TCacheEntry::TCacheEntry()
-{
-	glGenTextures(1, &texture);
-	GL_REPORT_ERRORD();
-
-	framebuffer = 0;
-}
-
-void TextureCache::TCacheEntry::Bind(unsigned int stage)
-{
-	if (s_Textures[stage] != texture)
-	{
-		if (s_ActiveTexture != stage)
-		{
-			glActiveTexture(GL_TEXTURE0 + stage);
-			s_ActiveTexture = stage;
-		}
-		
-		glBindTexture(GL_TEXTURE_2D, texture);
-		s_Textures[stage] = texture;
-	}
-}
-
-bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
-{
-	// TODO: make ogl dump PNGs
-	std::string tga_filename(filename);
-	tga_filename.replace(tga_filename.size() - 3, 3, "tga");
-
-	return SaveTexture(tga_filename.c_str(), GL_TEXTURE_2D, texture, virtual_width, virtual_height, level);
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
-	unsigned int height, unsigned int expanded_width,
-	unsigned int tex_levels, PC_TexFormat pcfmt)
-{
-	int gl_format = 0,
-		gl_iformat = 0,
-		gl_type = 0;
-
-	if (pcfmt != PC_TEX_FMT_DXT1)
-	{
-		switch (pcfmt)
-		{
-		default:
-		case PC_TEX_FMT_NONE:
-			PanicAlert("Invalid PC texture format %i", pcfmt); 
-		case PC_TEX_FMT_BGRA32:
-			gl_format = GL_BGRA;
-			gl_iformat = GL_RGBA;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-
-		case PC_TEX_FMT_RGBA32:
-			gl_format = GL_RGBA;
-			gl_iformat = GL_RGBA;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-#ifndef USE_GLES3
-		case PC_TEX_FMT_I4_AS_I8:
-			gl_format = GL_LUMINANCE;
-			gl_iformat = GL_INTENSITY4;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-
-		case PC_TEX_FMT_IA4_AS_IA8:
-			gl_format = GL_LUMINANCE_ALPHA;
-			gl_iformat = GL_LUMINANCE4_ALPHA4;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-
-		case PC_TEX_FMT_I8:
-			gl_format = GL_LUMINANCE;
-			gl_iformat = GL_INTENSITY8;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-
-		case PC_TEX_FMT_IA8:
-			gl_format = GL_LUMINANCE_ALPHA;
-			gl_iformat = GL_LUMINANCE8_ALPHA8;
-			gl_type = GL_UNSIGNED_BYTE;
-			break;
-#endif
-		case PC_TEX_FMT_RGB565:
-			gl_format = GL_RGB;
-			gl_iformat = GL_RGB;
-			gl_type = GL_UNSIGNED_SHORT_5_6_5;
-			break;
-		}
-	}
-
-	TCacheEntry &entry = *new TCacheEntry;
-	entry.gl_format = gl_format;
-	entry.gl_iformat = gl_iformat;
-	entry.gl_type = gl_type;
-	entry.pcfmt = pcfmt;
-
-	entry.m_tex_levels = tex_levels;
-	
-	entry.Load(width, height, expanded_width, 0);
-
-	return &entry;
-}
-
-void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
-	unsigned int expanded_width, unsigned int level)
-{
-	if (s_ActiveTexture != s_NextStage)
-	{
-		glActiveTexture(GL_TEXTURE0 + s_NextStage);
-		s_ActiveTexture = s_NextStage;
-	}
-
-	if (s_Textures[s_NextStage] != texture)
-	{
-		glBindTexture(GL_TEXTURE_2D, texture);
-		s_Textures[s_NextStage] = texture;
-	}
-
-	// TODO: sloppy, just do this on creation?
-	if (level == 0)
-	{
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, m_tex_levels - 1);
-	}
-
-	if (pcfmt != PC_TEX_FMT_DXT1)
-	{
-		if (expanded_width != width)
-			glPixelStorei(GL_UNPACK_ROW_LENGTH, expanded_width);
-
-		glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp);
-
-		if (expanded_width != width)
-			glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	}
-	else
-	{
-		PanicAlert("PC_TEX_FMT_DXT1 support disabled");
-		//glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-			//width, height, 0, expanded_width * expanded_height/2, temp);
-	}
-	GL_REPORT_ERRORD();
-}
-
-TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
-	unsigned int scaled_tex_w, unsigned int scaled_tex_h)
-{
-	TCacheEntry *const entry = new TCacheEntry;
-	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(GL_TEXTURE_2D, entry->texture);
-	GL_REPORT_ERRORD();
-
-	const GLenum
-		gl_format = GL_RGBA,
-		gl_iformat = GL_RGBA,
-		gl_type = GL_UNSIGNED_BYTE;
-
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	entry->m_tex_levels = 1;
-
-	glTexImage2D(GL_TEXTURE_2D, 0, gl_iformat, scaled_tex_w, scaled_tex_h, 0, gl_format, gl_type, NULL);
-	glBindTexture(GL_TEXTURE_2D, 0);
-	
-	glGenFramebuffers(1, &entry->framebuffer);
-	FramebufferManager::SetFramebuffer(entry->framebuffer);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, entry->texture, 0);
-	GL_REPORT_FBO_ERROR();
-
-	SetStage();
-
-	GL_REPORT_ERRORD();
-
-	return entry;
-}
-
-void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-	unsigned int srcFormat, const EFBRectangle& srcRect,
-	bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-	const float *colmat)
-{
-	g_renderer->ResetAPIState(); // reset any game specific settings
-
-	// Make sure to resolve anything we need to read from.
-	const GLuint read_texture = (srcFormat == PIXELFMT_Z24) ?
-		FramebufferManager::ResolveAndGetDepthTarget(srcRect) :
-		FramebufferManager::ResolveAndGetRenderTarget(srcRect);
-
-	GL_REPORT_ERRORD();
-
-	if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture)
-	{
-		FramebufferManager::SetFramebuffer(framebuffer);
-
-		GL_REPORT_ERRORD();
-
-		glActiveTexture(GL_TEXTURE0+9);
-		glBindTexture(getFbType(), read_texture);
-
-		glViewport(0, 0, virtual_width, virtual_height);
-
-		if(srcFormat == PIXELFMT_Z24) {
-			s_DepthMatrixProgram.Bind();
-			if(s_DepthCbufid != cbufid)
-				glUniform4fv(s_DepthMatrixUniform, 5, colmat);
-			s_DepthCbufid = cbufid;
-		} else {
-			s_ColorMatrixProgram.Bind();
-			if(s_ColorCbufid != cbufid)
-				glUniform4fv(s_ColorMatrixUniform, 7, colmat);
-			s_ColorCbufid = cbufid;
-		}
-		GL_REPORT_ERRORD();
-
-		TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
-		GL_REPORT_ERRORD();
-
-		// should be unique enough, if not, vbo will "only" be uploaded to much
-		u64 targetSourceHash = u64(targetSource.left)<<48 | u64(targetSource.top)<<32 | u64(targetSource.right)<<16 | u64(targetSource.bottom);
-		std::map<u64, VBOCache>::iterator vbo_it = s_VBO.find(targetSourceHash);
-
-		if(vbo_it == s_VBO.end()) {
-			VBOCache item;
-			item.targetSource.bottom = -1;
-			item.targetSource.top = -1;
-			item.targetSource.left = -1;
-			item.targetSource.right = -1;
-			glGenBuffers(1, &item.vbo);
-			glGenVertexArrays(1, &item.vao);
-
-			glBindBuffer(GL_ARRAY_BUFFER, item.vbo);
-			glBindVertexArray(item.vao);
-
-			glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-			glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL);
-			glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-			glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-
-			vbo_it = s_VBO.insert(std::pair<u64,VBOCache>(targetSourceHash, item)).first;
-		}
-		if(!(vbo_it->second.targetSource == targetSource)) {
-			GLfloat vertices[] = {
-				-1.f, 1.f,
-				(GLfloat)targetSource.left, (GLfloat)targetSource.bottom,
-				-1.f, -1.f,
-				(GLfloat)targetSource.left, (GLfloat)targetSource.top,
-				1.f, 1.f,
-				(GLfloat)targetSource.right, (GLfloat)targetSource.bottom,
-				1.f, -1.f,
-				(GLfloat)targetSource.right, (GLfloat)targetSource.top
-			};
-
-			glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo);
-			glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
-			
-			vbo_it->second.targetSource = targetSource;
-		}
-
-		glBindVertexArray(vbo_it->second.vao);
-		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-		GL_REPORT_ERRORD();
-	}
-
-	if (false == g_ActiveConfig.bCopyEFBToTexture)
-	{
-		int encoded_size = TextureConverter::EncodeToRamFromTexture(
-			addr,
-			read_texture,
-			srcFormat == PIXELFMT_Z24, 
-			isIntensity, 
-			dstFormat, 
-			scaleByHalf, 
-			srcRect);
-
-		u8* dst = Memory::GetPointer(addr);
-		u64 const new_hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples);
-
-		// Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date
-		if (!g_ActiveConfig.bEFBCopyCacheEnable)
-			TextureCache::MakeRangeDynamic(addr,encoded_size);
-		else if (!TextureCache::Find(addr, new_hash))
-			TextureCache::MakeRangeDynamic(addr,encoded_size);
-
-		hash = new_hash;
-	}
-
-	FramebufferManager::SetFramebuffer(0);
-	VertexShaderManager::SetViewportChanged();
-
-	GL_REPORT_ERRORD();
-
-	if (g_ActiveConfig.bDumpEFBTarget)
-	{
-		static int count = 0;
-		SaveTexture(StringFromFormat("%sefb_frame_%i.tga", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
-			count++).c_str(), GL_TEXTURE_2D, texture, virtual_width, virtual_height, 0);
-	}
-
-	g_renderer->RestoreAPIState();
-}
-
-TextureCache::TextureCache()
-{
-	const char *pColorMatrixProg = 
-		"uniform sampler2DRect samp9;\n"
-		"uniform vec4 colmat[7];\n"
-		"VARYIN vec2 uv0;\n"
-		"COLOROUT(ocol0)\n"
-		"\n"
-		"void main(){\n"
-		"	vec4 texcol = texture2DRect(samp9, uv0);\n"
-		"	texcol = round(texcol * colmat[5]) * colmat[6];\n"
-		"	ocol0 = texcol * mat4(colmat[0], colmat[1], colmat[2], colmat[3]) + colmat[4];\n"
-		"}\n";
-
-	const char *pDepthMatrixProg =
-		"uniform sampler2DRect samp9;\n"
-		"uniform vec4 colmat[5];\n"
-		"VARYIN vec2 uv0;\n"
-		"COLOROUT(ocol0)\n"
-		"\n"
-		"void main(){\n"
-		"	vec4 texcol = texture2DRect(samp9, uv0);\n"
-		"	vec4 EncodedDepth = fract((texcol.r * (16777215.0f/16777216.0f)) * vec4(1.0f,256.0f,256.0f*256.0f,1.0f));\n"
-		"	texcol = round(EncodedDepth * (16777216.0f/16777215.0f) * vec4(255.0f,255.0f,255.0f,15.0f)) / vec4(255.0f,255.0f,255.0f,15.0f);\n"
-		"	ocol0 = texcol * mat4(colmat[0], colmat[1], colmat[2], colmat[3]) + colmat[4];"
-		"}\n";
-
-	const char *VProgram =
-		"ATTRIN vec2 rawpos;\n"
-		"ATTRIN vec2 tex0;\n"
-		"VARYOUT vec2 uv0;\n"
-		"void main()\n"
-		"{\n"
-		"	uv0 = tex0;\n"
-		"	gl_Position = vec4(rawpos,0,1);\n"
-		"}\n";
-
-	ProgramShaderCache::CompileShader(s_ColorMatrixProgram, VProgram, pColorMatrixProg);
-	ProgramShaderCache::CompileShader(s_DepthMatrixProgram, VProgram, pDepthMatrixProg);
-
-	s_ColorMatrixUniform = glGetUniformLocation(s_ColorMatrixProgram.glprogid, "colmat");
-	s_DepthMatrixUniform = glGetUniformLocation(s_DepthMatrixProgram.glprogid, "colmat");
-	s_ColorCbufid = -1;
-	s_DepthCbufid = -1;
-
-	s_ActiveTexture = -1;
-	s_NextStage = -1;
-	for(int i=0; i<8; i++)
-		s_Textures[i] = -1;
-}
-
-
-TextureCache::~TextureCache()
-{
-	s_ColorMatrixProgram.Destroy();
-	s_DepthMatrixProgram.Destroy();
-	
-	for(std::map<u64, VBOCache>::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) {
-		glDeleteBuffers(1, &it->second.vbo);
-		glDeleteVertexArrays(1, &it->second.vao);
-	}
-	s_VBO.clear();
-}
-
-void TextureCache::DisableStage(unsigned int stage)
-{
-}
-
-void TextureCache::SetStage ()
-{
-	// -1 is the initial value as we don't know which testure should be bound
-	if(s_ActiveTexture != (u32)-1)
-		glActiveTexture(GL_TEXTURE0 + s_ActiveTexture);
-}
-
-void TextureCache::SetNextStage ( unsigned int stage )
-{
-	s_NextStage = stage;
-}
-
-
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
deleted file mode 100644
index 137d26704b..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTUREMNGR_H_
-#define _TEXTUREMNGR_H_
-
-#include <map>
-
-#include "VideoCommon.h"
-#include "GLUtil.h"
-#include "BPStructs.h"
-
-#include "TextureCacheBase.h"
-
-namespace OGL
-{
-
-class TextureCache : public ::TextureCache
-{
-public:
-	TextureCache();
-	static void DisableStage(unsigned int stage);
-	static void SetStage();
-	static void SetNextStage(unsigned int stage);
-
-private:
-	struct TCacheEntry : TCacheEntryBase
-	{
-		GLuint texture;
-		GLuint framebuffer;
-
-		PC_TexFormat pcfmt;
-
-		int gl_format;
-		int gl_iformat;
-		int gl_type;
-
-		int m_tex_levels;
-
-		//TexMode0 mode; // current filter and clamp modes that texture is set to
-		//TexMode1 mode1; // current filter and clamp modes that texture is set to
-
-		TCacheEntry();
-		~TCacheEntry();
-
-		void Load(unsigned int width, unsigned int height,
-			unsigned int expanded_width, unsigned int level);
-
-		void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
-			unsigned int srcFormat, const EFBRectangle& srcRect,
-			bool isIntensity, bool scaleByHalf, unsigned int cbufid,
-			const float *colmat);
-
-		void Bind(unsigned int stage);
-		bool Save(const char filename[], unsigned int level);
-	};
-
-	~TextureCache();
-
-	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
-		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
-
-	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
-};
-
-bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level);
-
-}
-
-#endif // _TEXTUREMNGR_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
deleted file mode 100644
index 3ebc542a70..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-// Fast image conversion using OpenGL shaders.
-// This kind of stuff would be a LOT nicer with OpenCL.
-
-#include <math.h>
-
-#include "TextureConverter.h"
-#include "TextureConversionShader.h"
-#include "TextureCache.h"
-#include "ProgramShaderCache.h"
-#include "VertexShaderManager.h"
-#include "FramebufferManager.h"
-#include "Globals.h"
-#include "VideoConfig.h"
-#include "ImageWrite.h"
-#include "Render.h"
-#include "FileUtil.h"
-#include "HW/Memmap.h"
-
-namespace OGL
-{
-
-namespace TextureConverter
-{
-
-using OGL::TextureCache;
-
-static GLuint s_texConvFrameBuffer = 0;
-static GLuint s_srcTexture = 0;			// for decoding from RAM
-static GLuint s_srcTextureWidth = 0;
-static GLuint s_srcTextureHeight = 0;
-static GLuint s_dstTexture = 0;		// for encoding to RAM
-
-const int renderBufferWidth = 1024;
-const int renderBufferHeight = 1024;
-
-static SHADER s_rgbToYuyvProgram;
-static SHADER s_yuyvToRgbProgram;
-
-// Not all slots are taken - but who cares.
-const u32 NUM_ENCODING_PROGRAMS = 64;
-static SHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS];
-
-static GLuint s_encode_VBO = 0;
-static GLuint s_encode_VAO = 0;
-static GLuint s_decode_VBO = 0;
-static GLuint s_decode_VAO = 0;
-static TargetRectangle s_cached_sourceRc;
-static int s_cached_srcWidth = 0;
-static int s_cached_srcHeight = 0;
-
-static const char *VProgram =
-	"ATTRIN vec2 rawpos;\n"
-	"ATTRIN vec2 tex0;\n"
-	"VARYOUT vec2 uv0;\n"
-	"void main()\n"
-	"{\n"
-	"	uv0 = tex0;\n"
-	"	gl_Position = vec4(rawpos, 0.0f, 1.0f);\n"
-	"}\n";
-
-void CreatePrograms()
-{
-	// Output is BGRA because that is slightly faster than RGBA.
-	const char *FProgramRgbToYuyv =
-		"uniform sampler2DRect samp9;\n"
-		"VARYIN vec2 uv0;\n"
-		"COLOROUT(ocol0)\n"
-		"void main()\n"
-		"{\n"
-		"	vec3 c0 = texture2DRect(samp9, uv0).rgb;\n"
-		"	vec3 c1 = texture2DRect(samp9, uv0 + vec2(1.0, 0.0)).rgb;\n"
-		"	vec3 c01 = (c0 + c1) * 0.5;\n"
-		"	vec3 y_const = vec3(0.257,0.504,0.098);\n"
-		"	vec3 u_const = vec3(-0.148,-0.291,0.439);\n"
-		"	vec3 v_const = vec3(0.439,-0.368,-0.071);\n"
-		"	vec4 const3 = vec4(0.0625,0.5,0.0625f,0.5);\n"
-		"	ocol0 = vec4(dot(c1,y_const),dot(c01,u_const),dot(c0,y_const),dot(c01, v_const)) + const3;\n"
-		"}\n";
-
-	const char *FProgramYuyvToRgb =
-		"uniform sampler2DRect samp9;\n"
-		"VARYIN vec2 uv0;\n"
-		"COLOROUT(ocol0)\n"
-		"void main()\n"
-		"{\n"
-		"	vec4 c0 = texture2DRect(samp9, uv0).rgba;\n"
-		"	float f = step(0.5, fract(uv0.x));\n"
-		"	float y = mix(c0.b, c0.r, f);\n"
-		"	float yComp = 1.164f * (y - 0.0625f);\n"
-		"	float uComp = c0.g - 0.5f;\n"
-		"	float vComp = c0.a - 0.5f;\n"
-		"	ocol0 = vec4(yComp + (1.596f * vComp),\n"
-		"		yComp - (0.813f * vComp) - (0.391f * uComp),\n"
-		"		yComp + (2.018f * uComp),\n"
-		"		1.0f);\n"
-		"}\n";
-
-	ProgramShaderCache::CompileShader(s_rgbToYuyvProgram, VProgram, FProgramRgbToYuyv);
-	ProgramShaderCache::CompileShader(s_yuyvToRgbProgram, VProgram, FProgramYuyvToRgb);
-}
-
-SHADER &GetOrCreateEncodingShader(u32 format)
-{
-	if (format > NUM_ENCODING_PROGRAMS)
-	{
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		return s_encodingPrograms[0];
-	}
-
-	if (s_encodingPrograms[format].glprogid == 0)
-	{
-		const char* shader = TextureConversionShader::GenerateEncodingShader(format, API_OPENGL);
-
-#if defined(_DEBUG) || defined(DEBUGFAST)
-		if (g_ActiveConfig.iLog & CONF_SAVESHADERS && shader)
-		{
-			static int counter = 0;
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%senc_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
-
-			SaveData(szTemp, shader);
-		}
-#endif
-
-		ProgramShaderCache::CompileShader(s_encodingPrograms[format], VProgram, shader);
-	}
-	return s_encodingPrograms[format];
-}
-
-void Init()
-{
-	glGenFramebuffers(1, &s_texConvFrameBuffer);
-
-	glGenBuffers(1, &s_encode_VBO );
-	glGenVertexArrays(1, &s_encode_VAO );
-	glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO );
-	glBindVertexArray( s_encode_VAO );
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL);
-	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-	s_cached_sourceRc.top = -1;
-	s_cached_sourceRc.bottom = -1;
-	s_cached_sourceRc.left = -1;
-	s_cached_sourceRc.right = -1;
-
-	glGenBuffers(1, &s_decode_VBO );
-	glGenVertexArrays(1, &s_decode_VAO );
-	glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO );
-	glBindVertexArray( s_decode_VAO );
-	s_cached_srcWidth = -1;
-	s_cached_srcHeight = -1;
-	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
-	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL);
-	glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
-	glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-
-	s_srcTextureWidth = 0;
-	s_srcTextureHeight = 0;
-
-	glActiveTexture(GL_TEXTURE0 + 9);
-	glGenTextures(1, &s_srcTexture);
-	glBindTexture(getFbType(), s_srcTexture);
-	glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
-
-	glGenTextures(1, &s_dstTexture);
-	glBindTexture(GL_TEXTURE_2D, s_dstTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, renderBufferWidth, renderBufferHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	
-	CreatePrograms();
-}
-
-void Shutdown()
-{
-	glDeleteTextures(1, &s_srcTexture);
-	glDeleteTextures(1, &s_dstTexture);
-	glDeleteFramebuffers(1, &s_texConvFrameBuffer);
-	glDeleteBuffers(1, &s_encode_VBO );
-	glDeleteVertexArrays(1, &s_encode_VAO );
-	glDeleteBuffers(1, &s_decode_VBO );
-	glDeleteVertexArrays(1, &s_decode_VAO );
-
-	s_rgbToYuyvProgram.Destroy();
-	s_yuyvToRgbProgram.Destroy();
-
-	for (unsigned int i = 0; i < NUM_ENCODING_PROGRAMS; i++)
-		s_encodingPrograms[i].Destroy();
-
-	s_srcTexture = 0;
-	s_dstTexture = 0;
-	s_texConvFrameBuffer = 0;
-}
-
-void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
-						u8* destAddr, int dstWidth, int dstHeight, int readStride,
-							bool toTexture, bool linearFilter)
-{
-
-
-	// switch to texture converter frame buffer
-	// attach render buffer as color destination
-	FramebufferManager::SetFramebuffer(s_texConvFrameBuffer);
-
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, s_dstTexture, 0);
-	GL_REPORT_ERRORD();
-
-	// set source texture
-	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(getFbType(), srcTexture);
-
-	if (linearFilter)
-	{
-		glTexParameteri(getFbType(), GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameteri(getFbType(), GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	}
-	else
-	{
-		glTexParameteri(getFbType(), GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		glTexParameteri(getFbType(), GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	}
-
-	GL_REPORT_ERRORD();
-
-	glViewport(0, 0, (GLsizei)dstWidth, (GLsizei)dstHeight);
-
-	GL_REPORT_ERRORD();
-	if(!(s_cached_sourceRc == sourceRc)) {
-		GLfloat vertices[] = {
-			-1.f, -1.f, 
-			(float)sourceRc.left, (float)sourceRc.top,
-			-1.f, 1.f,
-			(float)sourceRc.left, (float)sourceRc.bottom,
-			1.f, -1.f,
-			(float)sourceRc.right, (float)sourceRc.top,
-			1.f, 1.f,
-			(float)sourceRc.right, (float)sourceRc.bottom
-		};
-		glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO );
-		glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
-		
-		s_cached_sourceRc = sourceRc;
-	} 
-
-	glBindVertexArray( s_encode_VAO );
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	
-	GL_REPORT_ERRORD();
-
-	// .. and then read back the results.
-	// TODO: make this less slow.
-
-	int writeStride = bpmem.copyMipMapStrideChannels * 32;
-
-	if (writeStride != readStride && toTexture)
-	{
-		// writing to a texture of a different size
-
-		int readHeight = readStride / dstWidth;
-		readHeight /= 4; // 4 bytes per pixel
-
-		int readStart = 0;
-		int readLoops = dstHeight / readHeight;
-		for (int i = 0; i < readLoops; i++)
-		{
-			glReadPixels(0, readStart, (GLsizei)dstWidth, (GLsizei)readHeight, GL_BGRA, GL_UNSIGNED_BYTE, destAddr);
-			readStart += readHeight;
-			destAddr += writeStride;
-		}
-	}
-	else
-		glReadPixels(0, 0, (GLsizei)dstWidth, (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE, destAddr);
-
-	GL_REPORT_ERRORD();
-
-}
-
-int EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source)
-{
-	u32 format = copyfmt;
-
-	if (bFromZBuffer)
-	{
-		format |= _GX_TF_ZTF;
-		if (copyfmt == 11)
-			format = GX_TF_Z16;
-		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
-			format |= _GX_TF_CTF;
-	}
-	else
-		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
-			format |= _GX_TF_CTF;
-
-	SHADER& texconv_shader = GetOrCreateEncodingShader(format);
-
-	u8 *dest_ptr = Memory::GetPointer(address);
-
-	int width = (source.right - source.left) >> bScaleByHalf;
-	int height = (source.bottom - source.top) >> bScaleByHalf;
-
-	int size_in_bytes = TexDecoder_GetTextureSizeInBytes(width, height, format);
-
-	u16 blkW = TexDecoder_GetBlockWidthInTexels(format) - 1;
-	u16 blkH = TexDecoder_GetBlockHeightInTexels(format) - 1;	
-	u16 samples = TextureConversionShader::GetEncodedSampleCount(format);	
-
-	// only copy on cache line boundaries
-	// extra pixels are copied but not displayed in the resulting texture
-	s32 expandedWidth = (width + blkW) & (~blkW);
-	s32 expandedHeight = (height + blkH) & (~blkH);
-		
-	float sampleStride = bScaleByHalf ? 2.f : 1.f;
-	
-	float params[] = {
-		Renderer::EFBToScaledXf(sampleStride), Renderer::EFBToScaledYf(sampleStride),
-		0.0f, 0.0f,
-		(float)expandedWidth, (float)Renderer::EFBToScaledY(expandedHeight)-1,
-		(float)Renderer::EFBToScaledX(source.left), (float)Renderer::EFBToScaledY(EFB_HEIGHT - source.top - expandedHeight)
-	};
-
-	texconv_shader.Bind();
-	glUniform4fv(texconv_shader.UniformLocations[C_COLORS], 2, params);
-
-	TargetRectangle scaledSource;
-	scaledSource.top = 0;
-	scaledSource.bottom = expandedHeight;
-	scaledSource.left = 0;
-	scaledSource.right = expandedWidth / samples;
-	int cacheBytes = 32;
-	if ((format & 0x0f) == 6)
-		cacheBytes = 64;
-
-	int readStride = (expandedWidth * cacheBytes) /
-		TexDecoder_GetBlockWidthInTexels(format);
-	EncodeToRamUsingShader(source_texture, scaledSource,
-		dest_ptr, expandedWidth / samples, expandedHeight, readStride,
-		true, bScaleByHalf > 0 && !bFromZBuffer);
-	return size_in_bytes; // TODO: D3D11 is calculating this value differently!
-
-}
-
-void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight)
-{
-	g_renderer->ResetAPIState();
-	
-	s_rgbToYuyvProgram.Bind();
-		
-	EncodeToRamUsingShader(srcTexture, sourceRc, destAddr, dstWidth / 2, dstHeight, 0, false, false);
-	FramebufferManager::SetFramebuffer(0);
-	VertexShaderManager::SetViewportChanged();
-	TextureCache::DisableStage(0);
-	g_renderer->RestoreAPIState();
-	GL_REPORT_ERRORD();
-}
-
-
-// Should be scale free.
-void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTexture)
-{
-	u8* srcAddr = Memory::GetPointer(xfbAddr);
-	if (!srcAddr)
-	{
-		WARN_LOG(VIDEO, "Tried to decode from invalid memory address");
-		return;
-	}
-
-	int srcFmtWidth = srcWidth / 2;
-
-	g_renderer->ResetAPIState(); // reset any game specific settings
-
-	// switch to texture converter frame buffer
-	// attach destTexture as color destination
-	FramebufferManager::SetFramebuffer(s_texConvFrameBuffer);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, destTexture, 0);
-
-	GL_REPORT_FBO_ERROR();
-
-	// activate source texture
-	// set srcAddr as data for source texture
-	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(getFbType(), s_srcTexture);
-
-	// TODO: make this less slow.  (How?)
-	if ((GLsizei)s_srcTextureWidth == (GLsizei)srcFmtWidth && (GLsizei)s_srcTextureHeight == (GLsizei)srcHeight)
-	{
-		glTexSubImage2D(getFbType(), 0,0,0,s_srcTextureWidth, s_srcTextureHeight,
-				GL_BGRA, GL_UNSIGNED_BYTE, srcAddr);
-	}
-	else
-	{
-		glTexImage2D(getFbType(), 0, GL_RGBA8, (GLsizei)srcFmtWidth, (GLsizei)srcHeight,
-				0, GL_BGRA, GL_UNSIGNED_BYTE, srcAddr);
-		s_srcTextureWidth = (GLsizei)srcFmtWidth;
-		s_srcTextureHeight = (GLsizei)srcHeight;
-	}
-
-	glViewport(0, 0, srcWidth, srcHeight);
-	s_yuyvToRgbProgram.Bind();
-
-	GL_REPORT_ERRORD();
-	
-	if(s_cached_srcHeight != srcHeight || s_cached_srcWidth != srcWidth) {
-		GLfloat vertices[] = {
-			1.f, -1.f,
-			(float)srcFmtWidth, (float)srcHeight,
-			1.f, 1.f,
-			(float)srcFmtWidth, 0.f,
-			-1.f, -1.f,
-			0.f, (float)srcHeight,
-			-1.f, 1.f,
-			0.f, 0.f
-		};
-		
-		glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO );
-		glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat)*4*4, vertices, GL_STREAM_DRAW);
-		
-		s_cached_srcHeight = srcHeight;
-		s_cached_srcWidth = srcWidth;
-	}
-	
-	glBindVertexArray( s_decode_VAO );
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	
-	GL_REPORT_ERRORD();
-
-	VertexShaderManager::SetViewportChanged();
-
-	FramebufferManager::SetFramebuffer(0);
-
-	g_renderer->RestoreAPIState();
-	GL_REPORT_ERRORD();
-}
-
-}  // namespace
-
-}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
deleted file mode 100644
index 24bfbbc2d2..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURECONVERTER_H_
-#define _TEXTURECONVERTER_H_
-
-#include "VideoCommon.h"
-#include "GLUtil.h"
-
-namespace OGL
-{
-
-// Converts textures between formats using shaders
-// TODO: support multiple texture formats
-namespace TextureConverter
-{
-
-void Init();
-void Shutdown();
-
-void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc,
-					 u8* destAddr, int dstWidth, int dstHeight);
-
-void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTexture);
-
-// returns size of the encoded data (in bytes)
-int EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source);
-
-}
-
-}  // namespace OGL
-
-#endif // _TEXTURECONVERTER_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
deleted file mode 100644
index 3f4547a005..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-
-#include <fstream>
-#include <vector>
-
-#include "Fifo.h"
-
-#include "DriverDetails.h"
-#include "VideoConfig.h"
-#include "Statistics.h"
-#include "MemoryUtil.h"
-#include "Render.h"
-#include "ImageWrite.h"
-#include "BPMemory.h"
-#include "TextureCache.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderManager.h"
-#include "ProgramShaderCache.h"
-#include "VertexShaderGen.h"
-#include "VertexLoader.h"
-#include "VertexManager.h"
-#include "IndexGenerator.h"
-#include "OpcodeDecoding.h"
-#include "FileUtil.h"
-#include "Debugger.h"
-#include "StreamBuffer.h"
-#include "PerfQueryBase.h"
-#include "Render.h"
-
-#include "main.h"
-
-// internal state for loading vertices
-extern NativeVertexFormat *g_nativeVertexFmt;
-
-namespace OGL
-{
-//This are the initially requested size for the buffers expressed in bytes
-const u32 MAX_IBUFFER_SIZE =  2*1024*1024;
-const u32 MAX_VBUFFER_SIZE = 16*1024*1024;
-
-static StreamBuffer *s_vertexBuffer;
-static StreamBuffer *s_indexBuffer;
-static u32 s_baseVertex;
-static u32 s_offset[3];
-
-VertexManager::VertexManager()
-{
-	CreateDeviceObjects();
-}
-
-VertexManager::~VertexManager()
-{
-	DestroyDeviceObjects();
-}
-
-void VertexManager::CreateDeviceObjects()
-{
-	s_vertexBuffer = new StreamBuffer(GL_ARRAY_BUFFER, MAX_VBUFFER_SIZE);
-	m_vertex_buffers = s_vertexBuffer->getBuffer();
-	
-	s_indexBuffer = new StreamBuffer(GL_ELEMENT_ARRAY_BUFFER, MAX_IBUFFER_SIZE);
-	m_index_buffers = s_indexBuffer->getBuffer();
-	
-	m_CurrentVertexFmt = NULL;
-	m_last_vao = 0;
-}
-
-void VertexManager::DestroyDeviceObjects()
-{
-	GL_REPORT_ERRORD();
-	glBindBuffer(GL_ARRAY_BUFFER, 0 );
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0 );
-	GL_REPORT_ERROR();
-	
-	delete s_vertexBuffer;
-	delete s_indexBuffer;
-	GL_REPORT_ERROR();
-}
-
-void VertexManager::PrepareDrawBuffers(u32 stride)
-{
-	u32 vertex_data_size = IndexGenerator::GetNumVerts() * stride;
-	u32 triangle_index_size = IndexGenerator::GetTriangleindexLen();
-	u32 line_index_size = IndexGenerator::GetLineindexLen();
-	u32 point_index_size = IndexGenerator::GetPointindexLen();
-	u32 index_size = (triangle_index_size+line_index_size+point_index_size) * sizeof(u16);
-	
-	s_vertexBuffer->Alloc(vertex_data_size, stride);
-	u32 offset = s_vertexBuffer->Upload(GetVertexBuffer(), vertex_data_size);
-	s_baseVertex = offset / stride;
-
-	s_indexBuffer->Alloc(index_size);
-	if(triangle_index_size)
-	{
-		s_offset[0] = s_indexBuffer->Upload((u8*)GetTriangleIndexBuffer(), triangle_index_size * sizeof(u16));
-	}
-	if(line_index_size)
-	{
-		s_offset[1] = s_indexBuffer->Upload((u8*)GetLineIndexBuffer(), line_index_size * sizeof(u16));
-	}
-	if(point_index_size)
-	{
-		s_offset[2] = s_indexBuffer->Upload((u8*)GetPointIndexBuffer(), point_index_size * sizeof(u16));
-	}
-	
-	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vertex_data_size);
-	ADDSTAT(stats.thisFrame.bytesIndexStreamed, index_size);
-}
-
-void VertexManager::Draw(u32 stride)
-{
-	u32 triangle_index_size = IndexGenerator::GetTriangleindexLen();
-	u32 line_index_size = IndexGenerator::GetLineindexLen();
-	u32 point_index_size = IndexGenerator::GetPointindexLen();
-	u32 max_index = IndexGenerator::GetNumVerts();
-	GLenum triangle_mode = g_ActiveConfig.backend_info.bSupportsPrimitiveRestart?GL_TRIANGLE_STRIP:GL_TRIANGLES;
-	
-	if(g_ogl_config.bSupportsGLBaseVertex) {
-		if (triangle_index_size > 0)
-		{
-			glDrawRangeElementsBaseVertex(triangle_mode, 0, max_index, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0], s_baseVertex);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-		if (line_index_size > 0)
-		{
-			glDrawRangeElementsBaseVertex(GL_LINES, 0, max_index, line_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[1], s_baseVertex);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-		if (point_index_size > 0)
-		{
-			glDrawRangeElementsBaseVertex(GL_POINTS, 0, max_index, point_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[2], s_baseVertex);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-	} else {
-		if (triangle_index_size > 0)
-		{
-			glDrawRangeElements(triangle_mode, 0, max_index, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0]);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-		if (line_index_size > 0)
-		{
-			glDrawRangeElements(GL_LINES, 0, max_index, line_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[1]);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-		if (point_index_size > 0)
-		{
-			glDrawRangeElements(GL_POINTS, 0, max_index, point_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[2]);
-			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
-		}
-	}
-}
-
-void VertexManager::vFlush()
-{
-#if defined(_DEBUG) || defined(DEBUGFAST) 
-	PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfregs.numTexGen.numTexGens,
-		xfregs.numChan.numColorChans, xfregs.dualTexTrans.enabled, bpmem.ztex2.op,
-		bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable);
-
-	for (unsigned int i = 0; i < xfregs.numChan.numColorChans; ++i) 
-	{
-		LitChannel* ch = &xfregs.color[i];
-		PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
-		ch = &xfregs.alpha[i];
-		PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
-	}
-
-	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) 
-	{
-		TexMtxInfo tinfo = xfregs.texMtxInfo[i];
-		if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff;
-		if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0;
-
-		PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d",
-			i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift,
-			xfregs.postMtxInfo[i].index, xfregs.postMtxInfo[i].normalize);
-	}
-
-	PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages,
-		bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
-#endif
-
-	(void)GL_REPORT_ERROR();
-	
-	GLVertexFormat *nativeVertexFmt = (GLVertexFormat*)g_nativeVertexFmt;
-	u32 stride  = nativeVertexFmt->GetVertexStride();
-	
-	if(m_last_vao != nativeVertexFmt->VAO) {
-		glBindVertexArray(nativeVertexFmt->VAO);
-		m_last_vao = nativeVertexFmt->VAO;
-	}
-
-	PrepareDrawBuffers(stride);
-	GL_REPORT_ERRORD();
-
-	u32 usedtextures = 0;
-	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-		if (bpmem.tevorders[i / 2].getEnable(i & 1))
-			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
-
-	if (bpmem.genMode.numindstages > 0)
-		for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
-
-	for (u32 i = 0; i < 8; i++)
-	{
-		if (usedtextures & (1 << i))
-		{
-			TextureCache::SetNextStage(i);
-			g_renderer->SetSamplerState(i % 4, i / 4);
-			FourTexUnits &tex = bpmem.tex[i >> 2];
-			TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i, 
-				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
-				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
-				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
-				tex.texTlut[i&3].tlut_format,
-				(tex.texMode0[i&3].min_filter & 3),
-				(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
-				tex.texImage1[i&3].image_type);
-
-			if (tentry)
-			{
-				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "Error loading texture");
-		}
-	}
-
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate
-		&& bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-
-	// Makes sure we can actually do Dual source blending
-	bool dualSourcePossible = g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
-
-	// finally bind
-	if (dualSourcePossible)
-	{
-		if (useDstAlpha)
-		{
-			// If host supports GL_ARB_blend_func_extended, we can do dst alpha in
-			// the same pass as regular rendering.
-			ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, g_nativeVertexFmt->m_components);
-		}
-		else
-		{
-			ProgramShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components);
-		}
-	}
-	else
-	{
-		ProgramShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components);
-	}
-
-	// set global constants
-	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
-	ProgramShaderCache::UploadConstants();
-	
-	// setup the pointers
-	if (g_nativeVertexFmt)
-		g_nativeVertexFmt->SetupVertexPointers();
-	GL_REPORT_ERRORD();
-
-	g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-	Draw(stride);
-	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-	//ERROR_LOG(VIDEO, "PerfQuery result: %d", g_perf_query->GetQueryResult(bpmem.zcontrol.early_ztest ? PQ_ZCOMP_OUTPUT_ZCOMPLOC : PQ_ZCOMP_OUTPUT));
-
-	// run through vertex groups again to set alpha
-	if (useDstAlpha && !dualSourcePossible)
-	{
-		ProgramShaderCache::SetShader(DSTALPHA_ALPHA_PASS,g_nativeVertexFmt->m_components);
-		if (!g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		{
-			// Need to set these again, if we don't support UBO
-			VertexShaderManager::SetConstants();
-			PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
-		}
-	
-		// only update alpha
-		glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
-
-		glDisable(GL_BLEND);
-
-		Draw(stride);
-		
-		// restore color mask
-		g_renderer->SetColorMask();
-
-		if (bpmem.blendmode.blendenable || bpmem.blendmode.subtract) 
-			glEnable(GL_BLEND);
-	}
-	GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
-	
-#if defined(_DEBUG) || defined(DEBUGFAST)
-	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) 
-	{
-		// save the shaders
-		ProgramShaderCache::PCacheEntry prog = ProgramShaderCache::GetShaderProgram();
-		char strfile[255];
-		sprintf(strfile, "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		std::ofstream fps;
-		OpenFStream(fps, strfile, std::ios_base::out);
-		fps << prog.shader.strpprog.c_str();
-		sprintf(strfile, "%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		std::ofstream fvs;
-		OpenFStream(fvs, strfile, std::ios_base::out);
-		fvs << prog.shader.strvprog.c_str();
-	}
-
-	if (g_ActiveConfig.iLog & CONF_SAVETARGETS) 
-	{
-		char str[128];
-		sprintf(str, "%starg%.3d.tga", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
-		TargetRectangle tr;
-		tr.left = 0;
-		tr.right = Renderer::GetTargetWidth();
-		tr.top = 0;
-		tr.bottom = Renderer::GetTargetHeight();
-		g_renderer->SaveScreenshot(str, tr);
-	}
-#endif
-	g_Config.iSaveTargetId++;
-
-	ClearEFBCache();
-
-	GL_REPORT_ERRORD();
-}
-
-}  // namespace
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
deleted file mode 100644
index e31c8d48ec..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXMANAGER_H_
-#define _VERTEXMANAGER_H_
-
-#include "CPMemory.h"
-
-#include "VertexManagerBase.h"
-
-namespace OGL
-{
-	class GLVertexFormat : public NativeVertexFormat
-	{
-		PortableVertexDeclaration vtx_decl;
-
-	public:
-		GLVertexFormat();
-		~GLVertexFormat();
-
-		virtual void Initialize(const PortableVertexDeclaration &_vtx_decl);
-		virtual void SetupVertexPointers();
-		
-		GLuint VAO;
-	};
-
-// Handles the OpenGL details of drawing lots of vertices quickly.
-// Other functionality is moving out.
-class VertexManager : public ::VertexManager
-{
-public:
-	VertexManager();
-	~VertexManager();
-	NativeVertexFormat* CreateNativeVertexFormat();
-	void CreateDeviceObjects();
-	void DestroyDeviceObjects();
-	
-	// NativeVertexFormat use this
-	GLuint m_vertex_buffers;
-	GLuint m_index_buffers; 
-	GLuint m_last_vao;
-private:
-	void Draw(u32 stride);
-	void vFlush();
-	void PrepareDrawBuffers(u32 stride);
-	NativeVertexFormat *m_CurrentVertexFmt;
-};
-
-}
-
-#endif  // _VERTEXMANAGER_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
deleted file mode 100644
index 8e2c048f8d..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include <math.h>
-
-#include "Globals.h"
-#include "VideoConfig.h"
-#include "Statistics.h"
-
-#include "GLUtil.h"
-
-#include "Render.h"
-#include "VertexShaderGen.h"
-#include "VertexShaderManager.h"
-#include "ProgramShaderCache.h"
-#include "VertexManager.h"
-#include "VertexLoader.h"
-#include "XFMemory.h"
-#include "ImageWrite.h"
-#include "FileUtil.h"
-#include "Debugger.h"
-
-namespace OGL
-{
-
-void SetVSConstant4fvByName(const char * name, unsigned int offset, const float *f, const unsigned int count = 1)
-{
-	ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram();
-	for (int a = 0; a < NUM_UNIFORMS; ++a)
-	{
-		if (!strcmp(name, UniformNames[a]))
-		{
-			if (tmp.shader.UniformLocations[a] == -1)
-				return;
-			else if (tmp.shader.UniformSize[a] <= offset)
-				return;
-			else
-			{
-				unsigned int maxcount= tmp.shader.UniformSize[a]-offset;
-				glUniform4fv(tmp.shader.UniformLocations[a] + offset, std::min(count, maxcount), f);
-				return;
-			}
-		}
-	}
-}
-
-void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	float const buf[4] = {f1, f2, f3, f4};
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 9; ++a)
-	{
-		if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - VSVar_Loc[a].reg;
-			SetVSConstant4fvByName(VSVar_Loc[a].name, offset, buf);
-			return;
-		}
-	}
-}
-
-void Renderer::SetVSConstant4fv(unsigned int const_number, const float *f)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 9; ++a)
-	{
-		if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - VSVar_Loc[a].reg;
-			SetVSConstant4fvByName(VSVar_Loc[a].name, offset, f);
-			return;
-		}
-	}
-}
-
-void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, count);
-		return;
-	}
-	for (unsigned int a = 0; a < 9; ++a)
-	{
-		if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - VSVar_Loc[a].reg;
-			SetVSConstant4fvByName(VSVar_Loc[a].name, offset, f, count);
-			return;
-		}
-	}
-}
-
-void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f)
-{
-	float buf[4 * C_VENVCONST_END];
-	for (unsigned int i = 0; i < count; i++)
-	{
-		buf[4*i  ] = *f++;
-		buf[4*i+1] = *f++;
-		buf[4*i+2] = *f++;
-		buf[4*i+3] = 0.f;
-	}
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, count);
-		return;
-	}
-	for (unsigned int a = 0; a < 9; ++a)
-	{
-		if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - VSVar_Loc[a].reg;
-			SetVSConstant4fvByName(VSVar_Loc[a].name, offset, buf, count);
-			return;
-		}
-	}
-}
-
-}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
deleted file mode 100644
index 137c09a973..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifndef OGL_VIDEO_BACKEND_H_
-#define OGL_VIDEO_BACKEND_H_
-
-#include "VideoBackendBase.h"
-
-namespace OGL
-{
-
-class VideoBackend : public VideoBackendHardware
-{
-	bool Initialize(void *&);
-	void Shutdown();
-
-	std::string GetName();
-	std::string GetDisplayName();
-
-	void Video_Prepare();
-	void Video_Cleanup();
-
-	void ShowConfig(void* parent);
-
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
deleted file mode 100644
index 60f2748eeb..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-
-// OpenGL Backend Documentation
-/* 
-
-1.1 Display settings
-
-Internal and fullscreen resolution: Since the only internal resolutions allowed
-are also fullscreen resolution allowed by the system there is only need for one
-resolution setting that applies to both the internal resolution and the
-fullscreen resolution.  - Apparently no, someone else doesn't agree
-
-Todo: Make the internal resolution option apply instantly, currently only the
-native and 2x option applies instantly. To do this we need to be able to change
-the reinitialize FramebufferManager:Init() while a game is running.
-
-1.2 Screenshots
-
-
-The screenshots should be taken from the internal representation of the picture
-regardless of what the current window size is. Since AA and wireframe is
-applied together with the picture resizing this rule is not currently applied
-to AA or wireframe pictures, they are instead taken from whatever the window
-size is.
-
-Todo: Render AA and wireframe to a separate picture used for the screenshot in
-addition to the one for display.
-
-1.3 AA
-
-Make AA apply instantly during gameplay if possible
-
-*/
-
-#include "Globals.h"
-#include "Atomic.h"
-#include "CommonPaths.h"
-#include "Thread.h"
-#include "LogManager.h"
-
-#include <cstdarg>
-#include <algorithm>
-
-#ifdef _WIN32
-#include "EmuWindow.h"
-#include "IniFile.h"
-#endif
-
-#if defined(HAVE_WX) && HAVE_WX
-#include "VideoConfigDiag.h"
-#include "Debugger/DebuggerPanel.h"
-#endif // HAVE_WX
-
-#include "MainBase.h"
-#include "VideoConfig.h"
-#include "LookUpTables.h"
-#include "ImageWrite.h"
-#include "Render.h"
-#include "GLUtil.h"
-#include "Fifo.h"
-#include "OpcodeDecoding.h"
-#include "TextureCache.h"
-#include "BPStructs.h"
-#include "VertexLoader.h"
-#include "VertexLoaderManager.h"
-#include "VertexManager.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderManager.h"
-#include "ProgramShaderCache.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "TextureConverter.h"
-#include "PostProcessing.h"
-#include "OnScreenDisplay.h"
-#include "DLCache.h"
-#include "FramebufferManager.h"
-#include "Core.h"
-#include "Host.h"
-#include "SamplerCache.h"
-#include "PerfQuery.h"
-
-#include "VideoState.h"
-#include "IndexGenerator.h"
-#include "VideoBackend.h"
-#include "ConfigManager.h"
-
-namespace OGL
-{
-
-std::string VideoBackend::GetName()
-{
-	return "OGL";
-}
-
-std::string VideoBackend::GetDisplayName()
-{
-	return "OpenGL";
-}
-
-void GetShaders(std::vector<std::string> &shaders)
-{
-	std::set<std::string> already_found;
-
-	shaders.clear();
-	static const std::string directories[] = {
-		File::GetUserPath(D_SHADERS_IDX),
-		File::GetSysDirectory() + SHADERS_DIR DIR_SEP,
-	};
-	for (size_t i = 0; i < ArraySize(directories); ++i)
-	{
-		if (!File::IsDirectory(directories[i]))
-			continue;
-
-		File::FSTEntry entry;
-		File::ScanDirectoryTree(directories[i], entry);
-		for (u32 j = 0; j < entry.children.size(); j++)
-		{
-			std::string name = entry.children[j].virtualName.c_str();
-			if (name.size() < 5)
-				continue;
-			if (strcasecmp(name.substr(name.size() - 5).c_str(), ".glsl"))
-				continue;
-
-			name = name.substr(0, name.size() - 5);
-			if (already_found.find(name) != already_found.end())
-				continue;
-
-			already_found.insert(name);
-			shaders.push_back(name);
-		}
-	}
-	std::sort(shaders.begin(), shaders.end());
-}
-
-void InitBackendInfo()
-{
-	g_Config.backend_info.APIType = API_OPENGL;
-	g_Config.backend_info.bUseRGBATextures = true;
-	g_Config.backend_info.bUseMinimalMipCount = false;
-	g_Config.backend_info.bSupports3DVision = false;
-	//g_Config.backend_info.bSupportsDualSourceBlend = true; // is gpu dependent and must be set in renderer
-	g_Config.backend_info.bSupportsFormatReinterpretation = true;
-	g_Config.backend_info.bSupportsPixelLighting = true;
-	//g_Config.backend_info.bSupportsEarlyZ = true; // is gpu dependent and must be set in renderer
-
-	// aamodes
-	const char* caamodes[] = {_trans("None"), "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA", "4x SSAA"};
-	g_Config.backend_info.AAModes.assign(caamodes, caamodes + sizeof(caamodes)/sizeof(*caamodes));
-
-	// pp shaders
-	GetShaders(g_Config.backend_info.PPShaders);
-}
-
-void VideoBackend::ShowConfig(void *_hParent)
-{
-#if defined(HAVE_WX) && HAVE_WX
-	InitBackendInfo();
-	VideoConfigDiag diag((wxWindow*)_hParent, "OpenGL", "gfx_opengl");
-	diag.ShowModal();
-#endif
-}
-
-bool VideoBackend::Initialize(void *&window_handle)
-{
-	InitializeShared();
-	InitBackendInfo();
-
-	frameCount = 0;
-
-	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str());
-	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(),
-	                     SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str());
-	g_Config.UpdateProjectionHack();
-	g_Config.VerifyValidity();
-	UpdateActiveConfig();
-
-	InitInterface();
-	if (!GLInterface->Create(window_handle))
-		return false;
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_INIT);
-
-	s_BackendInitialized = true;
-
-	return true;
-}
-
-// This is called after Initialize() from the Core
-// Run from the graphics thread
-void VideoBackend::Video_Prepare()
-{
-	GLInterface->MakeCurrent();
-
-	g_renderer = new Renderer;
-
-	s_efbAccessRequested = false;
-	s_FifoShuttingDown = false;
-	s_swapRequested = false;
-
-	CommandProcessor::Init();
-	PixelEngine::Init();
-
-	BPInit();
-	g_vertex_manager = new VertexManager;
-	g_perf_query = new PerfQuery;
-	Fifo_Init(); // must be done before OpcodeDecoder_Init()
-	OpcodeDecoder_Init();
-	IndexGenerator::Init();
-	VertexShaderManager::Init();
-	PixelShaderManager::Init();
-	ProgramShaderCache::Init();
-	PostProcessing::Init();
-	g_texture_cache = new TextureCache();
-	g_sampler_cache = new SamplerCache();
-	Renderer::Init();
-	GL_REPORT_ERRORD();
-	VertexLoaderManager::Init();
-	TextureConverter::Init();
-#ifndef _M_GENERIC
-	DLCache::Init();
-#endif
-
-	// Notify the core that the video backend is ready
-	Host_Message(WM_USER_CREATE);
-}
-
-void VideoBackend::Shutdown()
-{
-	s_BackendInitialized = false;
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
-
-	GLInterface->Shutdown();
-}
-
-void VideoBackend::Video_Cleanup() {
-	
-	if (g_renderer)
-	{
-		s_efbAccessRequested = false;
-		s_FifoShuttingDown = false;
-		s_swapRequested = false;
-#ifndef _M_GENERIC
-		DLCache::Shutdown();
-#endif
-		Fifo_Shutdown();
-
-		// The following calls are NOT Thread Safe
-		// And need to be called from the video thread
-		Renderer::Shutdown();
-		TextureConverter::Shutdown();
-		VertexLoaderManager::Shutdown();
-		delete g_sampler_cache;
-		g_sampler_cache = NULL;
-		delete g_texture_cache;
-		g_texture_cache = NULL;
-		PostProcessing::Shutdown();
-		ProgramShaderCache::Shutdown();
-		VertexShaderManager::Shutdown();
-		PixelShaderManager::Shutdown();
-		delete g_perf_query;
-		g_perf_query = NULL;
-		delete g_vertex_manager;
-		g_vertex_manager = NULL;
-		OpcodeDecoder_Shutdown();
-		delete g_renderer;
-		g_renderer = NULL;
-		GLInterface->ClearCurrent();
-	}
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.h b/Source/Plugins/Plugin_VideoOGL/Src/main.h
deleted file mode 100644
index 03cc6fc174..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-#include "MainBase.h"
-
-#endif // _MAIN_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
deleted file mode 100644
index 7c408e10b9..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
deleted file mode 100644
index 2431184aaf..0000000000
--- a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#include <tchar.h>
-#include <windows.h> 
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
deleted file mode 100644
index cda287f511..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-set(SRCS	Src/BPMemLoader.cpp
-			Src/Clipper.cpp
-			Src/SWCommandProcessor.cpp
-			Src/CPMemLoader.cpp
-			Src/DebugUtil.cpp
-			Src/EfbCopy.cpp
-			Src/EfbInterface.cpp
-			Src/HwRasterizer.cpp
-			Src/SWmain.cpp
-			Src/OpcodeDecoder.cpp
-			Src/SWPixelEngine.cpp
-			Src/Rasterizer.cpp
-			Src/SWRenderer.cpp
-			Src/SetupUnit.cpp
-			Src/SWStatistics.cpp
-			Src/Tev.cpp
-			Src/TextureEncoder.cpp
-			Src/TextureSampler.cpp
-			Src/TransformUnit.cpp
-			Src/SWVertexLoader.cpp
-			Src/SWVideoConfig.cpp
-			Src/XFMemLoader.cpp)
-
-if(wxWidgets_FOUND)
-	set(SRCS ${SRCS} Src/VideoConfigDialog.cpp)
-endif(wxWidgets_FOUND)
-
-set(LIBS	videocommon
-			SOIL
-			common
-			${X11_LIBRARIES}
-			${wxWidgets_LIBRARIES})
-if(USE_EGL)
-	set(LIBS ${LIBS}
-		EGL)
-endif()
-
-if(USE_GLES)
-	set(SRCS ${SRCS} ../Plugin_VideoOGL/Src/GLUtil.cpp)
-	set(LIBS ${LIBS}
-		GLESv2)
-else()
-	set(SRCS ${SRCS} Src/RasterFont.cpp)
-	set(LIBS ${LIBS}
-		GLEW
-		${OPENGL_LIBRARIES})
-endif()
-if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
-	set(LIBS	${LIBS} clrun)
-endif()
-
-add_library(videosoftware STATIC ${SRCS})
-target_link_libraries(videosoftware ${LIBS})
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
deleted file mode 100644
index 0f18d096f8..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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>{9E9DA440-E9AD-413C-B648-91030E792211}</ProjectGuid>
-    <RootNamespace>Plugin_VideoSoftware</RootNamespace>
-    <ProjectName>VideoSoftware</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <CharacterSet>Unicode</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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.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\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" 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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|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\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;glew32s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;glew64s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glew32s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;glew64s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\DolphinWX\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\Include;..\..\..\Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\BPMemLoader.cpp" />
-    <ClCompile Include="Src\Clipper.cpp" />
-    <ClCompile Include="Src\SWCommandProcessor.cpp" />
-    <ClCompile Include="Src\CPMemLoader.cpp" />
-    <ClCompile Include="Src\DebugUtil.cpp" />
-    <ClCompile Include="Src\EfbCopy.cpp" />
-    <ClCompile Include="Src\EfbInterface.cpp" />
-    <ClCompile Include="Src\HwRasterizer.cpp" />
-    <ClCompile Include="Src\SWmain.cpp" />
-    <ClCompile Include="Src\OpcodeDecoder.cpp" />
-    <ClCompile Include="Src\SWPixelEngine.cpp" />
-    <ClCompile Include="Src\Rasterizer.cpp" />
-    <ClCompile Include="Src\RasterFont.cpp" />
-    <ClCompile Include="Src\SWRenderer.cpp" />
-    <ClCompile Include="Src\SetupUnit.cpp" />
-    <ClCompile Include="Src\SWStatistics.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\SWVideoConfig.cpp" />
-    <ClCompile Include="Src\Tev.cpp" />
-    <ClCompile Include="Src\TextureEncoder.cpp" />
-    <ClCompile Include="Src\TextureSampler.cpp" />
-    <ClCompile Include="Src\TransformUnit.cpp" />
-    <ClCompile Include="Src\SWVertexLoader.cpp" />
-    <ClCompile Include="Src\VideoConfigDialog.cpp" />
-    <ClCompile Include="Src\XFMemLoader.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\BPMemLoader.h" />
-    <ClInclude Include="Src\Clipper.h" />
-    <ClInclude Include="Src\SWCommandProcessor.h" />
-    <ClInclude Include="Src\CPMemLoader.h" />
-    <ClInclude Include="Src\DebugUtil.h" />
-    <ClInclude Include="Src\EfbCopy.h" />
-    <ClInclude Include="Src\EfbInterface.h" />
-    <ClInclude Include="Src\HwRasterizer.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\OpcodeDecoder.h" />
-    <ClInclude Include="Src\SWPixelEngine.h" />
-    <ClInclude Include="Src\Rasterizer.h" />
-    <ClInclude Include="Src\RasterFont.h" />
-    <ClInclude Include="Src\SWRenderer.h" />
-    <ClInclude Include="Src\SetupUnit.h" />
-    <ClInclude Include="Src\SWStatistics.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\SWVideoConfig.h" />
-    <ClInclude Include="Src\Tev.h" />
-    <ClInclude Include="Src\TextureEncoder.h" />
-    <ClInclude Include="Src\TextureSampler.h" />
-    <ClInclude Include="Src\TransformUnit.h" />
-    <ClInclude Include="Src\Vec3.h" />
-    <ClInclude Include="Src\SWVertexLoader.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\VideoConfigDialog.h" />
-    <ClInclude Include="Src\XFMemLoader.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters
deleted file mode 100644
index 14be6ff447..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\BPMemLoader.cpp" />
-    <ClCompile Include="Src\Clipper.cpp" />
-    <ClCompile Include="Src\SWCommandProcessor.cpp" />
-    <ClCompile Include="Src\CPMemLoader.cpp" />
-    <ClCompile Include="Src\DebugUtil.cpp" />
-    <ClCompile Include="Src\EfbCopy.cpp" />
-    <ClCompile Include="Src\EfbInterface.cpp" />
-    <ClCompile Include="Src\HwRasterizer.cpp" />
-    <ClCompile Include="Src\SWmain.cpp" />
-    <ClCompile Include="Src\OpcodeDecoder.cpp" />
-    <ClCompile Include="Src\SWPixelEngine.cpp" />
-    <ClCompile Include="Src\Rasterizer.cpp" />
-    <ClCompile Include="Src\RasterFont.cpp" />
-    <ClCompile Include="Src\SWRenderer.cpp" />
-    <ClCompile Include="Src\SetupUnit.cpp" />
-    <ClCompile Include="Src\SWStatistics.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\SWVideoConfig.cpp" />
-    <ClCompile Include="Src\Tev.cpp" />
-    <ClCompile Include="Src\TextureEncoder.cpp" />
-    <ClCompile Include="Src\TextureSampler.cpp" />
-    <ClCompile Include="Src\TransformUnit.cpp" />
-    <ClCompile Include="Src\SWVertexLoader.cpp" />
-    <ClCompile Include="Src\VideoConfigDialog.cpp" />
-    <ClCompile Include="Src\XFMemLoader.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\BPMemLoader.h" />
-    <ClInclude Include="Src\Clipper.h" />
-    <ClInclude Include="Src\SWCommandProcessor.h" />
-    <ClInclude Include="Src\CPMemLoader.h" />
-    <ClInclude Include="Src\DebugUtil.h" />
-    <ClInclude Include="Src\EfbCopy.h" />
-    <ClInclude Include="Src\EfbInterface.h" />
-    <ClInclude Include="Src\HwRasterizer.h" />
-    <ClInclude Include="Src\NativeVertexFormat.h" />
-    <ClInclude Include="Src\OpcodeDecoder.h" />
-    <ClInclude Include="Src\SWPixelEngine.h" />
-    <ClInclude Include="Src\Rasterizer.h" />
-    <ClInclude Include="Src\RasterFont.h" />
-    <ClInclude Include="Src\SWRenderer.h" />
-    <ClInclude Include="Src\SetupUnit.h" />
-    <ClInclude Include="Src\SWStatistics.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\SWVideoConfig.h" />
-    <ClInclude Include="Src\Tev.h" />
-    <ClInclude Include="Src\TextureEncoder.h" />
-    <ClInclude Include="Src\TextureSampler.h" />
-    <ClInclude Include="Src\TransformUnit.h" />
-    <ClInclude Include="Src\Vec3.h" />
-    <ClInclude Include="Src\SWVertexLoader.h" />
-    <ClInclude Include="Src\VideoBackend.h" />
-    <ClInclude Include="Src\VideoConfigDialog.h" />
-    <ClInclude Include="Src\XFMemLoader.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Win32">
-      <UniqueIdentifier>{081288cb-a63b-4ae9-93eb-e668568520b8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
deleted file mode 100644
index 6317398f39..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoCommon.h"
-#include "TextureDecoder.h"
-
-#include "BPMemLoader.h"
-#include "EfbCopy.h"
-#include "Rasterizer.h"
-#include "SWPixelEngine.h"
-#include "Tev.h"
-#include "HW/Memmap.h"
-#include "Core.h"
-
-
-void InitBPMemory()
-{
-	memset(&bpmem, 0, sizeof(bpmem));
-	bpmem.bpMask = 0xFFFFFF;
-}
-
-void SWLoadBPReg(u32 value)
-{
-	//handle the mask register
-	int address = value >> 24;
-	int oldval = ((u32*)&bpmem)[address];
-	int newval = (oldval & ~bpmem.bpMask) | (value & bpmem.bpMask);
-
-	((u32*)&bpmem)[address] = newval;
-
-	//reset the mask register
-	if (address != 0xFE)
-		bpmem.bpMask = 0xFFFFFF;
-
-	SWBPWritten(address, newval);
-}
-
-void SWBPWritten(int address, int newvalue)
-{
-	switch (address)
-	{
-	case BPMEM_SCISSORTL:
-	case BPMEM_SCISSORBR:
-	case BPMEM_SCISSOROFFSET:
-		Rasterizer::SetScissor();
-		break;
-	case BPMEM_SETDRAWDONE: // This is called when the game is done drawing (eg: like in DX: Begin(); Draw(); End();)
-		switch (bpmem.drawdone & 0xFF)
-		{
-		case 0x02:
-			SWPixelEngine::SetFinish(); // may generate interrupt
-			DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bpmem.drawdone & 0xFFFF));
-			break;
-
-		default:
-			WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bpmem.drawdone & 0xFFFF));
-			break;
-		}
-		break;
-	case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
-		DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bpmem.petoken & 0xFFFF));
-		SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), false);
-		break;
-	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
-		DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bpmem.petokenint & 0xFFFF));
-		SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), true);
-		break;
-	case BPMEM_TRIGGER_EFB_COPY:
-		EfbCopy::CopyEfb();
-		break;
-	case BPMEM_CLEARBBOX1:
-		SWPixelEngine::pereg.boxRight = newvalue >> 10;
-		SWPixelEngine::pereg.boxLeft = newvalue & 0x3ff;
-		break;
-	case BPMEM_CLEARBBOX2:
-		SWPixelEngine::pereg.boxBottom = newvalue >> 10;
-		SWPixelEngine::pereg.boxTop = newvalue & 0x3ff;
-		break;
-	case BPMEM_CLEAR_PIXEL_PERF:
-		// TODO: I didn't test if the value written to this register affects the amount of cleared registers
-		SWPixelEngine::pereg.perfZcompInputZcomplocLo = 0;
-		SWPixelEngine::pereg.perfZcompInputZcomplocHi = 0;
-		SWPixelEngine::pereg.perfZcompOutputZcomplocLo = 0;
-		SWPixelEngine::pereg.perfZcompOutputZcomplocHi = 0;
-		SWPixelEngine::pereg.perfZcompInputLo = 0;
-		SWPixelEngine::pereg.perfZcompInputHi = 0;
-		SWPixelEngine::pereg.perfZcompOutputLo = 0;
-		SWPixelEngine::pereg.perfZcompOutputHi = 0;
-		SWPixelEngine::pereg.perfBlendInputLo = 0;
-		SWPixelEngine::pereg.perfBlendInputHi = 0;
-		SWPixelEngine::pereg.perfEfbCopyClocksLo = 0;
-		SWPixelEngine::pereg.perfEfbCopyClocksHi = 0;
-		break;
-	case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
-		break;
-	case BPMEM_LOADTLUT1: // Load a Texture Look Up Table
-		{
-			u32 tlutTMemAddr = (newvalue & 0x3FF) << 9;
-			u32 tlutXferCount = (newvalue & 0x1FFC00) >> 5; 
-
-			u8 *ptr = 0;
-
-			// TODO - figure out a cleaner way.
-			if (Core::g_CoreStartupParameter.bWii)
-				ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5);
-			else
-				ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5);
-
-			if (ptr)
-				memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount);
-			else
-				PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5);
-			break;
-		}
-
-	case BPMEM_PRELOAD_MODE:
-		if (newvalue != 0)
-		{
-			// TODO: Not quite sure if this is completely correct (likely not)
-			// NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature.
-
-			BPS_TmemConfig& tmem_cfg = bpmem.tmem_config;
-			u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC?
-			u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE;
-			u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE;
-
-			if (tmem_cfg.preload_tile_info.type != 3)
-			{
-				if (tmem_addr_even + size > TMEM_SIZE)
-					size = TMEM_SIZE - tmem_addr_even;
-
-				memcpy(texMem + tmem_addr_even, src_ptr, size);
-			}
-			else // RGBA8 tiles (and CI14, but that might just be stupid libogc!)
-			{
-				// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
-				u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
-
-				for (unsigned int i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
-				{
-					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
-						tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
-						break;
-
-					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);
-					memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE);
-					tmem_addr_even += TMEM_LINE_SIZE;
-					tmem_addr_odd += TMEM_LINE_SIZE;
-					src_ptr += TMEM_LINE_SIZE * 2;
-				}
-			}
-		}
- 		break;
-
-	case BPMEM_TEV_REGISTER_L:   // Reg 1
-	case BPMEM_TEV_REGISTER_L+2: // Reg 2
-	case BPMEM_TEV_REGISTER_L+4: // Reg 3
-	case BPMEM_TEV_REGISTER_L+6: // Reg 4
-		{
-			int regNum = (address >> 1 ) & 0x3;
-			ColReg& reg = bpmem.tevregs[regNum].low;
-			bool konst = reg.type;
-
-			Rasterizer::SetTevReg(regNum, Tev::ALP_C, konst, reg.b); // A
-			Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.a); // R
-
-			break;
-		}
-
-	case BPMEM_TEV_REGISTER_H:   // Reg 1
-	case BPMEM_TEV_REGISTER_H+2: // Reg 2
-	case BPMEM_TEV_REGISTER_H+4: // Reg 3
-	case BPMEM_TEV_REGISTER_H+6: // Reg 4
-		{
-			int regNum = (address >> 1 ) & 0x3;
-			ColReg& reg = bpmem.tevregs[regNum].high;
-			bool konst = reg.type;
-
-			Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.b); // G
-			Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.a); // B
-
-			break;
-		}
-
-	}
-}
-
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
deleted file mode 100644
index 0ef122ec24..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _BPMEMLOADER_H_
-#define _BPMEMLOADER_H_
-
-
-#include "Common.h"
-#include "BPMemory.h"
-
-void InitBPMemory();
-void SWBPWritten(int address, int newvalue);
-void SWLoadBPReg(u32 value);
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
deleted file mode 100644
index 98734deeb5..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoCommon.h"
-
-#include "CPMemLoader.h"
-#include "HW/Memmap.h"
-
-
-void SWLoadCPReg(u32 sub_cmd, u32 value)
-{
-	switch (sub_cmd & 0xF0)
-	{
-	case 0x30:
-		MatrixIndexA.Hex = value;
-		break;
-
-	case 0x40:
-		MatrixIndexB.Hex = value;
-		break;
-
-	case 0x50:
-		g_VtxDesc.Hex &= ~0x1FFFF;  // keep the Upper bits
-		g_VtxDesc.Hex |= value;
-		break;
-
-	case 0x60:
-		g_VtxDesc.Hex &= 0x1FFFF;  // keep the lower 17Bits
-		g_VtxDesc.Hex |= (u64)value << 17;
-		break;
-
-	case 0x70:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g0.Hex = value;
-		break;
-
-	case 0x80:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g1.Hex = value;
-		break;
-
-	case 0x90:
-		_assert_((sub_cmd & 0x0F) < 8);
-		g_VtxAttr[sub_cmd & 7].g2.Hex = value;
-		break;
-
-	// Pointers to vertex arrays in GC RAM
-	case 0xA0:
-		arraybases[sub_cmd & 0xF] = value;
-		cached_arraybases[sub_cmd & 0xF] = Memory::GetPointer(value);
-		break;
-
-	case 0xB0:
-		arraystrides[sub_cmd & 0xF] = value & 0xFF;
-		break;
-	}
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
deleted file mode 100644
index 5bbb2969ea..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CPMEMLOADER_H_
-#define _CPMEMLOADER_H_
-
-
-#include "Common.h"
-#include "CPMemory.h"
-
-void SWLoadCPReg(u32 sub_cmd, u32 value);
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
deleted file mode 100644
index f28db764c1..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _CLIPPER_H_
-#define _CLIPPER_H_
-
-
-#include "Common.h"
-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
-
-
-namespace Clipper
-{
-	void Init();
-
-	void SetViewOffset();
-
-	void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
-
-	void ProcessLine(OutputVertexData *v0, OutputVertexData *v1);
-
-	bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface);
-
-	void PerspectiveDivide(OutputVertexData *vertex);
-
-	void DoState(PointerWrap &p);
-}
-
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
deleted file mode 100644
index 4472639a20..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "DebugUtil.h"
-#include "BPMemLoader.h"
-#include "TextureSampler.h"
-#include "SWVideoConfig.h"
-#include "EfbInterface.h"
-#include "SWStatistics.h"
-#include "HwRasterizer.h"
-#include "StringUtil.h"
-#include "SWCommandProcessor.h"
-#include "ImageWrite.h"
-#include "FileUtil.h"
-
-namespace DebugUtil
-{
-
-u32 skipFrames = 0;
-bool drawingHwTriangles = false;
-
-enum { NumObjectBuffers = 40};
-
-u32 ObjectBuffer[NumObjectBuffers][EFB_WIDTH*EFB_HEIGHT];
-u32 TempBuffer[NumObjectBuffers];
-
-bool DrawnToBuffer[NumObjectBuffers];
-const char* ObjectBufferName[NumObjectBuffers];
-int BufferBase[NumObjectBuffers];
-
-void Init()
-{
-	for (int i = 0; i < NumObjectBuffers; i++)
-	{
-		memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-		DrawnToBuffer[i] = false;
-		ObjectBufferName[i] = 0;
-		BufferBase[i] = 0;
-	}
-}
-
-void SaveTexture(const char* filename, u32 texmap, s32 mip)
-{
-	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-	u8 subTexmap = texmap & 3;
-
-	TexImage0& ti0 = texUnit.texImage0[subTexmap];
-
-	u32 width = ti0.width + 1;
-	u32 height = ti0.height + 1;
-
-	u8 *data = new u8[width * height * 4];
-
-	GetTextureBGRA(data, texmap, mip, width, height);
-
-	(void)SaveTGA(filename, width, height, data);
-
-	delete []data;
-}
-
-void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height)
-{
-	u8 sample[4];
-
-	for (u32 y = 0; y < height; y++)
-	{
-		for (u32 x = 0; x < width; x++)
-		{
-			TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample);
-
-			// RGBA to BGRA
-			*(dst++) = sample[2];
-			*(dst++) = sample[1];
-			*(dst++) = sample[0];
-			*(dst++) = sample[3];
-		}
-	}
-}
-
-s32 GetMaxTextureLod(u32 texmap)
-{
-	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-	u8 subTexmap = texmap & 3;
-
-	u8 maxLod = texUnit.texMode1[subTexmap].max_lod;
-	u8 mip = maxLod >> 4;
-	u8 fract = maxLod & 0xf;
-
-	if(fract)
-		++mip;
-
-	return (s32)mip;
-}
-
-void DumpActiveTextures()
-{
-	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-	{
-		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
-
-		s32 maxLod = GetMaxTextureLod(texmap);
-		for (s32 mip = 0; mip <= maxLod; ++mip)
-		{
-			SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.tga",
-						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
-						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
-		}
-	}
-
-	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-	{
-		int stageNum2 = stageNum >> 1;
-		int stageOdd = stageNum&1;
-		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
-
-		int texmap = order.getTexMap(stageOdd);
-
-		s32 maxLod = GetMaxTextureLod(texmap);
-		for (s32 mip = 0; mip <= maxLod; ++mip)
-		{
-			SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.tga",
-						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
-						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
-		}
-	}
-}
-
-void DumpEfb(const char* filename)
-{
-	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-	u8 *writePtr = data;
-	u8 sample[4];
-
-	for (int y = 0; y < EFB_HEIGHT; y++)
-	{
-		for (int x = 0; x < EFB_WIDTH; x++)
-		{
-			EfbInterface::GetColor(x, y, sample);
-			// ABGR to BGRA
-			*(writePtr++) = sample[1];
-			*(writePtr++) = sample[2];
-			*(writePtr++) = sample[3];
-			*(writePtr++) = sample[0];
-		}
-	}
-
-	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
-
-	delete []data;
-}
-
-void DumpDepth(const char* filename)
-{
-	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-	u8 *writePtr = data;
-
-	for (int y = 0; y < EFB_HEIGHT; y++)
-	{
-		for (int x = 0; x < EFB_WIDTH; x++)
-		{
-			u32 depth = EfbInterface::GetDepth(x, y);
-			// depth to bgra
-			*(writePtr++) = (depth >> 16) & 0xff;
-			*(writePtr++) = (depth >> 8) & 0xff;
-			*(writePtr++) = depth & 0xff;
-			*(writePtr++) = 255;
-		}
-	}
-
-	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
-
-	delete []data;
-}
-
-void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name)
-{
-	int buffer = bufferBase + subBuffer;
-
-	u32 offset = (x + y * EFB_WIDTH) * 4;
-	u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
-	*(dst++) = color[2];
-	*(dst++) = color[1];
-	*(dst++) = color[0];
-	*(dst++) = color[3];
-
-	DrawnToBuffer[buffer] = true;
-	ObjectBufferName[buffer] = name;
-	BufferBase[buffer] = bufferBase;
-}
-
-void DrawTempBuffer(u8 *color, int buffer)
-{
-	u8 *dst = (u8*)&TempBuffer[buffer];
-	*(dst++) = color[2];
-	*(dst++) = color[1];
-	*(dst++) = color[0];
-	*(dst++) = color[3];
-}
-
-void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name)
-{
-	int buffer = bufferBase + subBuffer;
-
-	u32 offset = (x + y * EFB_WIDTH);
-	ObjectBuffer[buffer][offset] = TempBuffer[buffer];
-
-	DrawnToBuffer[buffer] = true;
-	ObjectBufferName[buffer] = name;
-	BufferBase[buffer] = bufferBase;
-}
-
-void OnObjectBegin()
-{
-	if (!g_bSkipCurrentFrame)
-	{
-		if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
-			DumpActiveTextures();
-
-		if (g_SWVideoConfig.bHwRasterizer)
-		{
-			HwRasterizer::BeginTriangles();
-			drawingHwTriangles = true;
-		}
-	}
-}
-
-void OnObjectEnd()
-{
-	if (!g_bSkipCurrentFrame)
-	{
-		if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
-			DumpEfb(StringFromFormat("%sobject%i.tga",
-						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
-						swstats.thisFrame.numDrawnObjects).c_str());
-
-		if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
-		{
-			HwRasterizer::EndTriangles();
-			drawingHwTriangles = false;
-		}
-
-		for (int i = 0; i < NumObjectBuffers; i++)
-		{
-			if (DrawnToBuffer[i])
-			{
-				DrawnToBuffer[i] = false;
-				(void)SaveTGA(StringFromFormat("%sobject%i_%s(%i).tga",
-							File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
-							swstats.thisFrame.numDrawnObjects, ObjectBufferName[i], i - BufferBase[i]).c_str(),
-						EFB_WIDTH, EFB_HEIGHT, ObjectBuffer[i]);
-				memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-			}
-		}
-
-		swstats.thisFrame.numDrawnObjects++;
-	}
-}
-
-void OnFrameEnd()
-{
-	if (!g_bSkipCurrentFrame)
-	{
-		if (g_SWVideoConfig.bDumpFrames)
-		{
-			DumpEfb(StringFromFormat("%sframe%i_color.tga",
-						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
-			DumpDepth(StringFromFormat("%sframe%i_depth.tga",
-						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
-		}
-	}
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
deleted file mode 100644
index 89b0db9b72..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _DEBUGUTIL_H
-#define _DEBUGUTIL_H
-
-namespace DebugUtil
-{
-	void Init();
-
-	void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height);
-
-	void DumpActiveTextures();
-
-	void OnObjectBegin();
-	void OnObjectEnd();
-
-	void OnFrameEnd();
-
-	void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name);
-
-	void DrawTempBuffer(u8 *color, int buffer);
-	void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name);
-}
-
-#endif 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
deleted file mode 100644
index 303d5a06ad..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "BPMemLoader.h"
-#include "EfbCopy.h"
-#include "EfbInterface.h"
-#include "SWRenderer.h"
-#include "TextureEncoder.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
-#include "DebugUtil.h"
-#include "HwRasterizer.h"
-#include "SWCommandProcessor.h"
-#include "HW/Memmap.h"
-#include "Core.h"
-
-namespace EfbCopy
-{
-	void CopyToXfb()
-	{
-		GLInterface->Update(); // just updates the render window position and the backbuffer size	
-
-		if (!g_SWVideoConfig.bHwRasterizer)
-		{
-			// copy to open gl for rendering
-			EfbInterface::UpdateColorTexture();
-			SWRenderer::DrawTexture(EfbInterface::efbColorTexture, EFB_WIDTH, EFB_HEIGHT);
-		}
-
-		SWRenderer::SwapBuffer();
-	}
-
-	void CopyToRam()
-	{
-		if (!g_SWVideoConfig.bHwRasterizer)
-		{
-			u8 *dest_ptr = Memory::GetPointer(bpmem.copyTexDest << 5);
-
-			TextureEncoder::Encode(dest_ptr);
-		}
-	}
-
-	void ClearEfb()
-	{
-		u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 | (bpmem.clearcolorAR & 0xff00) >> 8;
-
-		int left   = bpmem.copyTexSrcXY.x;
-		int top    = bpmem.copyTexSrcXY.y;
-		int right  = left + bpmem.copyTexSrcWH.x;
-		int bottom = top + bpmem.copyTexSrcWH.y;
-
-		for (u16 y = top; y <= bottom; y++)
-		{
-			for (u16 x = left; x <= right; x++)
-			{
-				EfbInterface::SetColor(x, y, (u8*)(&clearColor));
-				EfbInterface::SetDepth(x, y, bpmem.clearZValue);
-			}
-		}
-	}
-
-	void CopyEfb()
-	{
-		if (bpmem.triggerEFBCopy.copy_to_xfb)
-			DebugUtil::OnFrameEnd();
-
-		if (!g_bSkipCurrentFrame)
-		{
-			if (bpmem.triggerEFBCopy.copy_to_xfb)
-			{
-				CopyToXfb();
-				Core::Callback_VideoCopiedToXFB(true);
-
-				swstats.frameCount++;
-			}
-			else
-			{
-				CopyToRam();
-			}
-
-			if (bpmem.triggerEFBCopy.clear)
-			{
-				if (g_SWVideoConfig.bHwRasterizer)
-					HwRasterizer::Clear();
-				else
-					ClearEfb();
-			}
-		}
-		else
-		{
-			if (bpmem.triggerEFBCopy.copy_to_xfb)
-			{
-				// no frame rendered but tell that a frame has finished for frame skip counter
-				Core::Callback_VideoCopiedToXFB(false);
-			}
-		}
-	}
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
deleted file mode 100644
index c2352eab34..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EFB_COPY_H_
-#define _EFB_COPY_H_
-
-
-#include "Common.h"
-
-namespace EfbCopy
-{
-	// Copy the EFB to RAM as a texture format or XFB
-	// Clear the EFB if needed
-	void CopyEfb();
-}
-
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
deleted file mode 100644
index 3d8ea0f9f1..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "EfbInterface.h"
-#include "BPMemLoader.h"
-#include "LookUpTables.h"
-#include "SWPixelEngine.h"
-
-
-u8 efb[EFB_WIDTH*EFB_HEIGHT*6];
-
-
-namespace EfbInterface
-{
-
-	u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4];
-
-	inline u32 GetColorOffset(u16 x, u16 y)
-	{
-		return (x + y * EFB_WIDTH) * 3;
-	}
-
-	inline u32 GetDepthOffset(u16 x, u16 y)
-	{
-		return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START;
-	}
-
-	void DoState(PointerWrap &p)
-	{
-		p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6);
-		p.DoArray(efbColorTexture, EFB_WIDTH*EFB_HEIGHT*4);
-	}
-
-	void SetPixelAlphaOnly(u32 offset, u8 a)
-	{
-			switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_Z24:
-		case PIXELFMT_RGB565_Z16:
-			// do nothing
-			break;
-		case PIXELFMT_RGBA6_Z24:
-			{
-				u32 a32 = a;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xffffffc0;
-				val |= (a32 >> 2) & 0x0000003f;
-				*dst = val;
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-	}
-
-	void SetPixelColorOnly(u32 offset, u8 *rgb)
-	{
-		switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_Z24:
-			{
-				u32 src = *(u32*)rgb;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= src >> 8;
-				*dst = val;
-			}
-			break;
-		case PIXELFMT_RGBA6_Z24:
-			{
-				u32 src = *(u32*)rgb;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff00003f;
-				val |= (src >> 4) & 0x00000fc0;	// blue
-				val |= (src >> 6) & 0x0003f000;	// green
-				val |= (src >> 8) & 0x00fc0000;	// red
-				*dst = val;
-			}
-			break;
-		case PIXELFMT_RGB565_Z16:
-			{
-				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-				u32 src = *(u32*)rgb;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= src >> 8;
-				*dst = val;
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-	}
-
-	void SetPixelAlphaColor(u32 offset, u8 *color)
-	{
-			switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_Z24:
-			{
-				u32 src = *(u32*)color;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= src >> 8;
-				*dst = val;
-			}
-			break;
-		case PIXELFMT_RGBA6_Z24:
-			{
-				u32 src = *(u32*)color;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= (src >> 2) & 0x0000003f;	// alpha
-				val |= (src >> 4) & 0x00000fc0;	// blue
-				val |= (src >> 6) & 0x0003f000;	// green
-				val |= (src >> 8) & 0x00fc0000;	// red
-				*dst = val;
-			}
-			break;
-		case PIXELFMT_RGB565_Z16:
-			{
-				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-				u32 src = *(u32*)color;
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= src >> 8;
-				*dst = val;
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-	}
-
-		void GetPixelColor(u32 offset, u8 *color)
-	{
-		switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_Z24:
-			{
-				u32 src = *(u32*)&efb[offset];
-				u32 *dst = (u32*)color;
-				u32 val = 0xff | ((src & 0x00ffffff) << 8);
-				*dst = val;
-			}
-			break;
-		case PIXELFMT_RGBA6_Z24:
-			{
-				u32 src = *(u32*)&efb[offset];
-				color[ALP_C] = Convert6To8(src & 0x3f);
-				color[BLU_C] = Convert6To8((src >> 6) & 0x3f);
-				color[GRN_C] = Convert6To8((src >> 12) & 0x3f);
-				color[RED_C] = Convert6To8((src >> 18) & 0x3f);
-			}
-			break;
-		case PIXELFMT_RGB565_Z16:
-			{
-				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-				u32 src = *(u32*)&efb[offset];
-				u32 *dst = (u32*)color;
-				u32 val = 0xff | ((src & 0x00ffffff) << 8);
-				*dst = val;
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-	}
-
-	void SetPixelDepth(u32 offset, u32 depth)
-	{
-		switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_RGBA6_Z24:
-		case PIXELFMT_Z24:
-			{
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= depth & 0x00ffffff;
-				*dst = val;				
-			}
-			break;
-		case PIXELFMT_RGB565_Z16:
-			{
-				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-				u32 *dst = (u32*)&efb[offset];
-				u32 val = *dst & 0xff000000;
-				val |= depth & 0x00ffffff;
-				*dst = val;		
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-	}
-
-		u32 GetPixelDepth(u32 offset)
-	{
-		u32 depth = 0;
-
-		switch (bpmem.zcontrol.pixel_format)
-		{
-		case PIXELFMT_RGB8_Z24:
-		case PIXELFMT_RGBA6_Z24:
-		case PIXELFMT_Z24:
-			{
-				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
-			}
-			break;
-		case PIXELFMT_RGB565_Z16:
-			{
-				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
-			}
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-		}
-
-		return depth;
-	}
-
-	u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, int mode)
-	{
-		switch (mode) {
-			case 0:  // zero
-				return 0;
-			case 1:  // one
-				return 0xffffffff;
-			case 2:  // dstclr
-				return *(u32*)dstClr;
-			case 3:  // invdstclr
-				return 0xffffffff - *(u32*)dstClr;
-			case 4:  // srcalpha
-				{
-					u8 alpha = srcClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 5:  // invsrcalpha
-				{
-					u8 alpha = 0xff - srcClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 6:  // dstalpha
-				{
-					u8 alpha = dstClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 7:  // invdstalpha
-				{
-					u8 alpha = 0xff - dstClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-		}
-
-		return 0;
-	}
-
-	u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, int mode)
-	{
-		switch (mode) {
-			case 0:  // zero
-				return 0;
-			case 1:  // one
-				return 0xffffffff;
-				case 2:  // srcclr
-				return *(u32*)srcClr;
-			case 3:  // invsrcclr
-				return 0xffffffff - *(u32*)srcClr;
-			case 4:  // srcalpha
-				{
-					u8 alpha = srcClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 5:  // invsrcalpha
-				{
-					u8 alpha = 0xff - srcClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 6:  // dstalpha
-				{
-					u8 alpha = dstClr[ALP_C] & 0xff;
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-			case 7:  // invdstalpha
-				{
-					u8 alpha = 0xff - dstClr[ALP_C];
-					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-					return factor;
-				}
-		}
-
-		return 0;
-	}
-
-	void BlendColor(u8 *srcClr, u8 *dstClr)
-	{
-		u32 srcFactor = GetSourceFactor(srcClr, dstClr, bpmem.blendmode.srcfactor);
-		u32 dstFactor = GetDestinationFactor(srcClr, dstClr, bpmem.blendmode.dstfactor);
-
-		for (int i = 0; i < 4; i++)
-		{
-			// add MSB of factors to make their range 0 -> 256
-			u32 sf = (srcFactor & 0xff);
-			sf += sf >> 7;
-
-			u32 df = (dstFactor & 0xff);
-			df += df >> 7;
-
-			u32 color = (srcClr[i] * sf + dstClr[i] * df) >> 8;
-			dstClr[i] = (color>255)?255:color;
-
-			dstFactor >>= 8;
-			srcFactor >>= 8;
-		}
-	}
-
-	void LogicBlend(u32 srcClr, u32 &dstClr, int op)
-	{
-		switch (op)
-		{
-			case 0:  // clear
-				dstClr = 0;
-				break;
-			case 1:  // and
-				dstClr = srcClr & dstClr;
-				break;
-			case 2:  // revand
-				dstClr = srcClr & (~dstClr);
-				break;
-			case 3:  // copy
-				dstClr = srcClr;
-				break;
-			case 4:  // invand
-				dstClr = (~srcClr) & dstClr;
-				break;
-			case 5:  // noop
-		// Do nothing
-				break;
-			case 6:  // xor
-				dstClr = srcClr ^ dstClr;
-				break;
-			case 7:  // or
-				dstClr = srcClr | dstClr;
-				break;
-			case 8:  // nor
-				dstClr = ~(srcClr | dstClr);
-				break;
-			case 9:  // equiv
-				dstClr = ~(srcClr ^ dstClr);
-				break;
-			case 10: // inv
-				dstClr = ~dstClr;
-				break;
-			case 11: // revor
-				dstClr = srcClr | (~dstClr);
-				break;
-			case 12: // invcopy
-				dstClr = ~srcClr;
-				break;
-			case 13: // invor
-				dstClr = (~srcClr) | dstClr;
-				break;
-			case 14: // nand
-				dstClr = ~(srcClr & dstClr);
-				break;
-			case 15: // set
-				dstClr = 0xffffffff;
-				break;
-		}
-	}
-
-	void SubtractBlend(u8 *srcClr, u8 *dstClr)
-	{
-		for (int i = 0; i < 4; i++)
-		{
-			int c = (int)dstClr[i] - (int)srcClr[i];
-			dstClr[i] = (c < 0)?0:c;
-		}
-	}
-
-	void BlendTev(u16 x, u16 y, u8 *color)
-	{
-		u32 dstClr;
-		u32 offset = GetColorOffset(x, y);
-
-		u8 *dstClrPtr = (u8*)&dstClr;
-
-		GetPixelColor(offset, dstClrPtr);
-
-		if (bpmem.blendmode.blendenable)
-		{
-			if (bpmem.blendmode.subtract)
-				SubtractBlend(color, dstClrPtr);
-			else
-				BlendColor(color, dstClrPtr);
-		}
-		else if (bpmem.blendmode.logicopenable)
-		{
-			LogicBlend(*((u32*)color), dstClr, bpmem.blendmode.logicmode);
-		}
-		else
-		{
-			dstClrPtr = color;
-		}
-
-		if (bpmem.dstalpha.enable)
-			dstClrPtr[ALP_C] = bpmem.dstalpha.alpha;
-
-		if (bpmem.blendmode.colorupdate)
-		{
-			if (bpmem.blendmode.alphaupdate)
-				SetPixelAlphaColor(offset, dstClrPtr);
-			else
-				SetPixelColorOnly(offset, dstClrPtr);
-		}
-		else if (bpmem.blendmode.alphaupdate)
-		{
-			SetPixelAlphaOnly(offset, dstClrPtr[ALP_C]);
-		}
-
-		// branchless bounding box update
-		SWPixelEngine::pereg.boxLeft = SWPixelEngine::pereg.boxLeft>x?x:SWPixelEngine::pereg.boxLeft;
-		SWPixelEngine::pereg.boxRight = SWPixelEngine::pereg.boxRight<x?x:SWPixelEngine::pereg.boxRight;
-		SWPixelEngine::pereg.boxTop = SWPixelEngine::pereg.boxTop>y?y:SWPixelEngine::pereg.boxTop;
-		SWPixelEngine::pereg.boxBottom = SWPixelEngine::pereg.boxBottom<y?y:SWPixelEngine::pereg.boxBottom;
-	}
-
-	void SetColor(u16 x, u16 y, u8 *color)
-	{
-		u32 offset = GetColorOffset(x, y);
-		if (bpmem.blendmode.colorupdate)
-		{
-			if (bpmem.blendmode.alphaupdate)
-				SetPixelAlphaColor(offset, color);
-			else
-				SetPixelColorOnly(offset, color);
-		}
-		else if (bpmem.blendmode.alphaupdate)
-		{
-			SetPixelAlphaOnly(offset, color[ALP_C]);
-		}
-	}
-
-	void SetDepth(u16 x, u16 y, u32 depth)
-	{
-		if (bpmem.zmode.updateenable)
-			SetPixelDepth(GetDepthOffset(x, y), depth);
-	}
-
-	void GetColor(u16 x, u16 y, u8 *color)
-	{
-		u32 offset = GetColorOffset(x, y);
-		GetPixelColor(offset, color);
-	}
-
-	u32 GetDepth(u16 x, u16 y)
-	{
-		u32 offset = GetDepthOffset(x, y);
-		return GetPixelDepth(offset);
-	}
-
-	u8 *GetPixelPointer(u16 x, u16 y, bool depth)
-	{
-		if (depth)
-			return &efb[GetDepthOffset(x, y)];
-		return &efb[GetColorOffset(x, y)];
-	}
-
-	void UpdateColorTexture()
-	{
-		u32 color;
-		u8* colorPtr = (u8*)&color;
-		u32* texturePtr = (u32*)efbColorTexture;
-		u32 textureAddress = 0;
-		u32 efbOffset = 0;
-
-		for (u16 y = 0; y < EFB_HEIGHT; y++)
-		{
-			for (u16 x = 0; x < EFB_WIDTH; x++)
-			{
-				GetPixelColor(efbOffset, colorPtr);
-				efbOffset += 3;
-				texturePtr[textureAddress++] = Common::swap32(color);  // ABGR->RGBA
-			}
-		}
-	}
-
-	bool ZCompare(u16 x, u16 y, u32 z)
-	{
-		u32 offset = GetDepthOffset(x, y);
-		u32 depth = GetPixelDepth(offset);
-
-		bool pass;
-
-		switch (bpmem.zmode.func)
-		{
-			case COMPARE_NEVER:
-				pass = false;
-				break;
-			case COMPARE_LESS:
-				pass = z < depth;
-				break;
-			case COMPARE_EQUAL:
-				pass = z == depth;
-				break;
-			case COMPARE_LEQUAL:
-				pass = z <= depth;
-				break;
-			case COMPARE_GREATER:
-				pass = z > depth;
-				break;
-			case COMPARE_NEQUAL:
-				pass = z != depth;
-				break;
-			case COMPARE_GEQUAL:
-				pass = z >= depth;
-				break;
-			case COMPARE_ALWAYS:
-				pass = true;
-				break;
-			default:
-				pass = false;
-				ERROR_LOG(VIDEO, "Bad Z compare mode %i", bpmem.zmode.func);
-		}
-
-		if (pass && bpmem.zmode.updateenable)
-		{
-			SetPixelDepth(offset, z);
-		}
-
-		return pass;
-	}
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
deleted file mode 100644
index 987c243bfd..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _EFB_INTERFACE_H_
-#define _EFB_INTERFACE_H_
-
-#include "VideoCommon.h"
-
-namespace EfbInterface
-{
-	const int DEPTH_BUFFER_START = EFB_WIDTH * EFB_HEIGHT * 3;
-
-	enum { ALP_C, BLU_C, GRN_C, RED_C };
-
-	// color order is ABGR in order to emulate RGBA on little-endian hardware
-
-	// does full blending of an incoming pixel
-	void BlendTev(u16 x, u16 y, u8 *color);
-
-	// compare z at location x,y
-	// writes it if it passes
-	// returns result of compare.
-	bool ZCompare(u16 x, u16 y, u32 z);
-
-	// sets the color and alpha
-	void SetColor(u16 x, u16 y, u8 *color);
-	void SetDepth(u16 x, u16 y, u32 depth);
-
-	void GetColor(u16 x, u16 y, u8 *color);
-	u32 GetDepth(u16 x, u16 y);
-
-	u8* GetPixelPointer(u16 x, u16 y, bool depth);
-
-	void UpdateColorTexture();
-	extern u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; // RGBA format
-	void DoState(PointerWrap &p);
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
deleted file mode 100644
index 5e3e4a4ae0..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "MemoryUtil.h"
-
-#include <VideoCommon.h>
-
-#include "BPMemLoader.h"
-#include "HwRasterizer.h"
-#include "NativeVertexFormat.h"
-#include "DebugUtil.h"
-
-#define TEMP_SIZE (1024*1024*4)
-
-namespace HwRasterizer
-{
-	float efbHalfWidth;
-	float efbHalfHeight;
-	bool hasTexture;
-
-	u8 *temp;
-
-	// Programs
-	static GLuint colProg, texProg, clearProg;
-
-	// Color
-	static GLint col_apos = -1, col_atex = -1;
-	// Tex
-	static GLint tex_apos = -1, tex_atex = -1, tex_utex = -1;
-	// Clear shader
-	static GLint clear_apos = -1, clear_ucol = -1;
-
-	void CreateShaders()
-	{
-		// Color Vertices
-		static const char *fragcolText =
-			"varying " PREC " vec4 TexCoordOut;\n"
-			"void main() {\n"
-			"	gl_FragColor = TexCoordOut;\n"
-			"}\n";
-		// Texture Vertices
-		static const char *fragtexText =
-			"varying " PREC " vec4 TexCoordOut;\n"
-			"uniform " TEXTYPE " Texture;\n"
-			"void main() {\n"
-			"	gl_FragColor = " TEXFUNC "(Texture, TexCoordOut.xy);\n"
-			"}\n";
-		// Clear shader
-		static const char *fragclearText =
-			"uniform " PREC " vec4 Color;\n"
-			"void main() {\n"
-			"	gl_FragColor = Color;\n"
-			"}\n";
-		// Generic passthrough vertice shaders
-		static const char *vertShaderText =
-			"attribute vec4 pos;\n"
-			"attribute vec4 TexCoordIn;\n "
-			"varying vec4 TexCoordOut;\n "
-			"void main() {\n"
-			"	gl_Position = pos;\n"
-			"	TexCoordOut = TexCoordIn;\n"
-			"}\n";
-		static const char *vertclearText =
-			"attribute vec4 pos;\n"
-			"void main() {\n"
-			"	gl_Position = pos;\n"
-			"}\n";
-
-		// Color Program
-		colProg = OpenGL_CompileProgram(vertShaderText, fragcolText);
-
-		// Texture Program
-		texProg = OpenGL_CompileProgram(vertShaderText, fragtexText);
-
-		// Clear Program
-		clearProg = OpenGL_CompileProgram(vertclearText, fragclearText);
-
-		// Color attributes
-		col_apos = glGetAttribLocation(colProg, "pos");
-		col_atex = glGetAttribLocation(colProg, "TexCoordIn");
-		// Texture attributes
-		tex_apos = glGetAttribLocation(texProg, "pos");
-		tex_atex = glGetAttribLocation(texProg, "TexCoordIn");
-		tex_utex = glGetUniformLocation(texProg, "Texture");
-		// Clear attributes
-		clear_apos = glGetAttribLocation(clearProg, "pos");
-		clear_ucol = glGetUniformLocation(clearProg, "Color");
-	}
-
-	void Init()
-	{
-		efbHalfWidth = EFB_WIDTH / 2.0f;
-		efbHalfHeight = 480 / 2.0f;
-
-		temp = (u8*)AllocateMemoryPages(TEMP_SIZE);
-	}
-	void Shutdown()
-	{
-		glDeleteProgram(colProg);
-		glDeleteProgram(texProg);
-		glDeleteProgram(clearProg);
-	}
-	void Prepare()
-	{
-		//legacy multitexturing: select texture channel only.
-		glActiveTexture(GL_TEXTURE0);
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
-#ifndef USE_GLES
-		glShadeModel(GL_SMOOTH);
-		glDisable(GL_BLEND);
-		glClearDepth(1.0f);
-		glEnable(GL_SCISSOR_TEST);
-		glDisable(GL_LIGHTING);
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		glMatrixMode(GL_MODELVIEW);
-		glLoadIdentity();
-
-		glClientActiveTexture(GL_TEXTURE0);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-		glEnable(GL_TEXTURE_RECTANGLE_ARB);
-		glStencilFunc(GL_ALWAYS, 0, 0);
-		glDisable(GL_STENCIL_TEST);
-#endif
-		// used by hw rasterizer if it enables blending and depth test
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glDepthFunc(GL_LEQUAL);
-
-		glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-		
-		CreateShaders();
-		GL_REPORT_ERRORD();
-	}
-	static float width, height;
-	void LoadTexture()
-	{
-		FourTexUnits &texUnit = bpmem.tex[0];
-		u32 imageAddr = texUnit.texImage3[0].image_base;
-		// Texture Rectangle uses pixel coordinates
-		// While GLES uses texture coordinates
-#ifdef USE_GLES	
-		width = texUnit.texImage0[0].width;
-		height = texUnit.texImage0[0].height;
-#else
-		width = 1;
-		height = 1;
-#endif
-		TexCacheEntry &cacheEntry = textures[imageAddr];
-		cacheEntry.Update();
-
-		glBindTexture(TEX2D, cacheEntry.texture);
-		glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
-		glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
-		GL_REPORT_ERRORD();
-	}
-
-	void BeginTriangles()
-	{
-		// disabling depth test sometimes allows more things to be visible
-		glEnable(GL_DEPTH_TEST);
-		glEnable(GL_BLEND);
-
-		hasTexture = bpmem.tevorders[0].enable0;
-
-		if (hasTexture)
-			LoadTexture();
-	}
-
-	void EndTriangles()
-	{
-		glBindTexture(TEX2D, 0);
-		glDisable(GL_DEPTH_TEST);
-		glDisable(GL_BLEND);
-	}
-
-	void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
-	{
-		float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
-		float z0 = v0->screenPosition.z / (float)0x00ffffff;
-
-		float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
-		float z1 = v1->screenPosition.z / (float)0x00ffffff;
-
-		float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
-		float z2 = v2->screenPosition.z / (float)0x00ffffff;
-
-		float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f;
-		float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f;
-		float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f;
-
-		float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f;
-		float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f;
-		float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f;
-
-		float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f;
-		float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f;
-		float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f;
-
-		static const GLfloat verts[3][3] = {
-			{ x0, y0, z0 },
-			{ x1, y1, z1 },
-			{ x2, y2, z2 }
-		};
-		static const GLfloat col[3][4] = {
-			{ r0, g0, b0, 1.0f },
-			{ r1, g1, b1, 1.0f },
-			{ r2, g2, b2, 1.0f }
-		};
-		{
-			glUseProgram(colProg);
-			glEnableVertexAttribArray(col_apos);
-			glEnableVertexAttribArray(col_atex);
-
-			glVertexAttribPointer(col_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
-			glVertexAttribPointer(col_atex, 4, GL_FLOAT, GL_FALSE, 0, col);
-				glDrawArrays(GL_TRIANGLES, 0, 3);
-			glDisableVertexAttribArray(col_atex);
-			glDisableVertexAttribArray(col_apos);
-		}
-		GL_REPORT_ERRORD();
-	}
-
-	void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
-	{
-		float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
-		float z0 = v0->screenPosition.z;
-
-		float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight);
-		float z1 = v1->screenPosition.z;
-
-		float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f;
-		float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight);
-		float z2 = v2->screenPosition.z;
-
-		float s0 = v0->texCoords[0].x / width;
-		float t0 = v0->texCoords[0].y / height;
-
-		float s1 = v1->texCoords[0].x / width;
-		float t1 = v1->texCoords[0].y / height;
-
-		float s2 = v2->texCoords[0].x / width;
-		float t2 = v2->texCoords[0].y / height;
-
-		static const GLfloat verts[3][3] = {
-			{ x0, y0, z0 },
-			{ x1, y1, z1 },
-			{ x2, y2, z2 }
-		};
-		static const GLfloat tex[3][2] = {
-			{ s0, t0 },
-			{ s1, t1 },
-			{ s2, t2 }
-		};
-		{
-			glUseProgram(texProg);
-			glEnableVertexAttribArray(tex_apos);
-			glEnableVertexAttribArray(tex_atex);
-
-			glVertexAttribPointer(tex_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
-			glVertexAttribPointer(tex_atex, 2, GL_FLOAT, GL_FALSE, 0, tex);
-				glUniform1i(tex_utex, 0);
-				glDrawArrays(GL_TRIANGLES, 0, 3);
-			glDisableVertexAttribArray(tex_atex);
-			glDisableVertexAttribArray(tex_apos);
-		}
-		GL_REPORT_ERRORD();
-	}
-
-	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
-	{
-		if (hasTexture)
-			DrawTextureVertex(v0, v1, v2);
-		else
-			DrawColorVertex(v0, v1, v2);
-	}
-
-	void Clear()
-	{
-		u8 r = (bpmem.clearcolorAR & 0x00ff);
-		u8 g = (bpmem.clearcolorGB & 0xff00) >> 8;
-		u8 b = (bpmem.clearcolorGB & 0x00ff);
-		u8 a = (bpmem.clearcolorAR & 0xff00) >> 8;
-
-		GLfloat left   = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f;
-		GLfloat top    = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight;
-		GLfloat right  = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f;
-		GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight;
-		GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff;
-		static const GLfloat verts[4][3] = {
-			{ left, top, depth },
-			{ right, top, depth },
-			{ right, bottom, depth },
-			{ left, bottom, depth }
-		};
-		{
-			glUseProgram(clearProg);
-			glVertexAttribPointer(clear_apos, 3, GL_FLOAT, GL_FALSE, 0, verts);
-			glUniform4f(clear_ucol, r, g, b, a);	
-			glEnableVertexAttribArray(col_apos);
-				glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-			glDisableVertexAttribArray(col_apos);
-		}
-		GL_REPORT_ERRORD();
-	}
-
-	TexCacheEntry::TexCacheEntry()
-	{
-		Create();
-	}
-
-	void TexCacheEntry::Create()
-	{
-		FourTexUnits &texUnit = bpmem.tex[0];
-
-		texImage0.hex = texUnit.texImage0[0].hex;
-		texImage1.hex = texUnit.texImage1[0].hex;
-		texImage2.hex = texUnit.texImage2[0].hex;
-		texImage3.hex = texUnit.texImage3[0].hex;
-		texTlut.hex = texUnit.texTlut[0].hex;
-
-		int image_width = texImage0.width;
-		int image_height = texImage0.height;
-
-		DebugUtil::GetTextureBGRA(temp, 0, 0, image_width, image_height);
-
-		glGenTextures(1, (GLuint *)&texture);
-		glBindTexture(TEX2D, texture);
-#ifdef USE_GLES
-		glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)image_width, (GLsizei)image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
-#else
-		glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)image_width, (GLsizei)image_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp);
-#endif
-		GL_REPORT_ERRORD();
-	}
-
-	void TexCacheEntry::Destroy()
-	{
-		if (texture == 0)
-			return;
-
-		glDeleteTextures(1, &texture);
-		texture = 0;
-	}
-
-	void TexCacheEntry::Update()
-	{
-		FourTexUnits &texUnit = bpmem.tex[0];
-
-		// extra checks cause textures to be reloaded much more
-		if (texUnit.texImage0[0].hex != texImage0.hex ||
-		//	texUnit.texImage1[0].hex != texImage1.hex ||
-		//	texUnit.texImage2[0].hex != texImage2.hex ||
-			texUnit.texImage3[0].hex != texImage3.hex ||
-			texUnit.texTlut[0].hex   != texTlut.hex)
-		{
-			Destroy();
-			Create();
-		}
-	}
-}
-
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
deleted file mode 100644
index 250b951175..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _HW_RASTERIZER_H
-#define _HW_RASTERIZER_H
-
-#include <map>
-
-#include "BPMemLoader.h"
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
-
-struct OutputVertexData;
-
-namespace HwRasterizer
-{
-	void Init();
-	void Shutdown();
-
-	void Prepare();
-
-	void BeginTriangles();
-	void EndTriangles();
-
-	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
-
-	void Clear();
-
-	struct TexCacheEntry
-	{
-		TexImage0 texImage0; 
-		TexImage1 texImage1; 
-		TexImage2 texImage2; 
-		TexImage3 texImage3; 
-		TexTLUT texTlut;
-
-		GLuint texture;
-
-		TexCacheEntry();
-
-		void Create();
-		void Destroy();
-		void Update();
-	};
-
-	typedef std::map<u32, TexCacheEntry> TextureCache;
-	static TextureCache textures;
-}
-
-#endif 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
deleted file mode 100644
index 2f0213d469..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _NATIVEVERTEXFORMAT_H
-#define _NATIVEVERTEXFORMAT_H
-
-#include "Vec3.h"
-#include "ChunkFile.h"
-
-#ifdef WIN32
-#define LOADERDECL __cdecl
-#else
-#define LOADERDECL
-#endif
-
-typedef void (LOADERDECL *TPipelineFunction)();
-
-struct Vec4
-{
-	float x;
-	float y;
-	float z;
-	float w;
-};
-
-struct InputVertexData
-{
-	u8 posMtx;
-	u8 texMtx[8];
-
-	Vec3 position;
-	Vec3 normal[3];
-	u8 color[2][4];
-	float texCoords[8][2];
-};
-
-struct OutputVertexData
-{
-	// components in color channels
-	enum { RED_C, GRN_C, BLU_C, ALP_C };
-
-	Vec3 mvPosition;
-	Vec4 projectedPosition;
-	Vec3 screenPosition;
-	Vec3 normal[3];
-	u8 color[2][4];
-	Vec3 texCoords[8];
-
-	void Lerp(float t, OutputVertexData *a, OutputVertexData *b)
-	{
-		#define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T)
-
-		#define LINTERP_INT(T, OUT, IN) (OUT) + (((IN - OUT) * T) >> 8)
-
-		mvPosition = LINTERP(t, a->mvPosition, b->mvPosition);
-
-		projectedPosition.x = LINTERP(t, a->projectedPosition.x, b->projectedPosition.x);
-		projectedPosition.y = LINTERP(t, a->projectedPosition.y, b->projectedPosition.y);
-		projectedPosition.z = LINTERP(t, a->projectedPosition.z, b->projectedPosition.z);
-		projectedPosition.w = LINTERP(t, a->projectedPosition.w, b->projectedPosition.w);
-
-		for (int i = 0; i < 3; ++i)
-		{
-			normal[i] = LINTERP(t, a->normal[i], b->normal[i]);
-		}
-
-		u16 t_int = (u16)(t * 256);
-		for (int i = 0; i < 4; ++i)
-		{
-			color[0][i] = LINTERP_INT(t_int, a->color[0][i], b->color[0][i]);
-			color[1][i] = LINTERP_INT(t_int, a->color[1][i], b->color[1][i]);
-		}
-
-		for (int i = 0; i < 8; ++i)
-		{
-			texCoords[i] = LINTERP(t, a->texCoords[i], b->texCoords[i]);
-		}
-
-		#undef LINTERP
-		#undef LINTERP_INT
-	}
-	void DoState(PointerWrap &p)
-	{
-		mvPosition.DoState(p);
-		p.Do(projectedPosition);
-		screenPosition.DoState(p);
-		for (int i = 0; i < 3;++i)
-			normal[i].DoState(p);
-		p.DoArray(color, sizeof color);
-		for (int i = 0; i < 8;++i)
-			texCoords[i].DoState(p);
-	}
-
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
deleted file mode 100644
index 20b7fe6be2..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OPCODEDECODER_H_
-#define _OPCODEDECODER_H_
-
-#include "CommonTypes.h"
-#include "ChunkFile.h"
-
-namespace OpcodeDecoder
-{
-
-	#define GX_NOP                      0x00
-
-	#define GX_LOAD_BP_REG              0x61
-	#define GX_LOAD_CP_REG              0x08
-	#define GX_LOAD_XF_REG              0x10
-	#define GX_LOAD_INDX_A              0x20
-	#define GX_LOAD_INDX_B              0x28
-	#define GX_LOAD_INDX_C              0x30
-	#define GX_LOAD_INDX_D              0x38
-
-	#define GX_CMD_CALL_DL              0x40
-	#define GX_CMD_INVL_VC              0x48
-
-	#define GX_PRIMITIVE_MASK           0x78
-	#define GX_PRIMITIVE_SHIFT          3
-	#define GX_VAT_MASK                 0x07
-
-	//these are defined 1/8th of their real values and without their top bit
-	#define GX_DRAW_QUADS               0x0   //0x80
-	#define GX_DRAW_TRIANGLES           0x2   //0x90
-	#define GX_DRAW_TRIANGLE_STRIP      0x3   //0x98
-	#define GX_DRAW_TRIANGLE_FAN        0x4   //0xA0
-	#define GX_DRAW_LINES               0x5   //0xA8
-	#define GX_DRAW_LINE_STRIP          0x6   //0xB0
-	#define GX_DRAW_POINTS              0x7   //0xB8
-
-	void Init();
-
-	void ResetDecoding();
-
-	bool CommandRunnable(u32 iBufferSize);
-
-	void Run(u32 iBufferSize);
-
-	void DoState(PointerWrap &p);
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
deleted file mode 100644
index 2170d52137..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
-
-#include <string.h>
-
-#include "RasterFont.h"
-// globals
-
-const GLubyte rasters[][13] = {
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
-	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00},
-	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18},
-	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70},
-	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e},
-	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c},
-	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30},
-	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00},
-	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03},
-	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c},
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18},
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e},
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e},
-	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c},
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
-	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
-	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06},
-	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60},
-	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e},
-	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18},
-	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
-	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc},
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e},
-	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06},
-	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3},
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3},
-	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e},
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
-	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c},
-	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
-	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e},
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff},
-	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
-	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
-	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
-	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
-	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff},
-	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c},
-	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60},
-	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18},
-	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70},
-	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
-	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03},
-	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e},
-	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0},
-	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00},
-	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00},
-	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0},
-	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78},
-	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
-	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00},
-	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00},
-	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
-	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f},
-	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
-	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}
-};
-
-RasterFont::RasterFont()
-{
-	// set GL modes
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-	// create the raster font
-	fontOffset = glGenLists(128);
-	for (int i = 32; i < 127; i++)
-	{
-		glNewList(i + fontOffset, GL_COMPILE);
-		glBitmap(8, 13, 0.0f, 2.0f, 10.0f, 0.0f, rasters[i - 32]);
-		glEndList();
-	}
-
-	temp_buffer = new char[TEMP_BUFFER_SIZE];
-}
-
-RasterFont::~RasterFont()
-{
-	glDeleteLists(fontOffset, 128);
-	delete [] temp_buffer;
-}
-
-void RasterFont::printString(const char *s, double x, double y, double z)
-{
-	int length = (int)strlen(s);
-	if (!length)
-		return;
-	if (length >= TEMP_BUFFER_SIZE)
-		length = TEMP_BUFFER_SIZE - 1;
-
-	// Sanitize string to avoid GL errors.
-	char *s2 = temp_buffer;
-	memcpy(s2, s, length);
-	s2[length] = 0;
-	for (int i = 0; i < length; i++)
-	{
-		if (s2[i] < 32 || s2[i] > 126)
-			s2[i] = '!';
-	}
-
-	// go to the right spot
-	glRasterPos3d(x, y, z);
-	GL_REPORT_ERRORD();
-
-	glPushAttrib (GL_LIST_BIT);
-	glListBase(fontOffset);
-	glCallLists((GLsizei)strlen(s2), GL_UNSIGNED_BYTE, (GLubyte *) s2);
-	GL_REPORT_ERRORD();
-	glPopAttrib();
-	GL_REPORT_ERRORD();
-}
-
-void RasterFont::printCenteredString(const char *s, double y, int screen_width, double z)
-{
-	int length = (int)strlen(s);
-	int x = (int)(screen_width/2.0 - (length/2.0)*char_width);
-	printString(s, x, y, z);
-}
-
-void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight)
-{
-	double x = start_x;
-	double y = start_y;
-	char temp[1024];
-	char *t = temp;
-	while (*text)
-	{
-		if (*text == '\n')
-		{
-			*t = 0;
-			printString(temp, x, y, z);
-			y -= char_height * 2.0f / bbHeight;
-			x = start_x;
-			t = temp;
-		}
-		else if (*text == '\r')
-		{
-			t = temp;
-		}
-		else if (*text == '\t')
-		{
-			//todo: add tabs every something like 4*char_width
-			*t = 0;
-			int cpos = (int)strlen(temp);
-			int newpos = (cpos + 4) & (~3);
-			printString(temp, x, y, z);
-			x = start_x + (char_width*newpos) * 2.0f / bbWidth;
-			t = temp;
-			*t++ = ' ';
-		}
-		else
-		{
-			*t++ = *text;
-		}
-
-		text++;
-	}
-
-	// ????
-	if (t != text)
-	{
-		*t = 0;
-		printString(temp, x, y, z);
-	}
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
deleted file mode 100644
index b30d99152d..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _RASTERFONT_H_
-#define _RASTERFONT_H_
-
-class RasterFont
-{
-public:
-	RasterFont();
-	~RasterFont(void);
-	static int debug;
-
-	// some useful constants
-	enum	{char_width = 10};
-	enum	{char_height = 15};
-
-	// and the happy helper functions
-	void printString(const char *s, double x, double y, double z=0.0);
-	void printCenteredString(const char *s, double y, int screen_width, double z=0.0);
-
-	void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight);
-private:
-	int fontOffset;
-	char *temp_buffer;
-	enum {TEMP_BUFFER_SIZE = 64 * 1024};
-};
-
-#endif // _RASTERFONT_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
deleted file mode 100644
index 3c45ee7d25..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "Rasterizer.h"
-#include "HwRasterizer.h"
-#include "EfbInterface.h"
-#include "BPMemLoader.h"
-#include "XFMemLoader.h"
-#include "Tev.h"
-#include "SWPixelEngine.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
-
-
-#define BLOCK_SIZE 2
-
-#define CLAMP(x, a, b) (x>b)?b:(x<a)?a:x
-
-// returns approximation of log2(f) in s28.4
-// results are close enough to use for LOD
-static inline s32 FixedLog2(float f)
-{
-	u32 *x = (u32*)&f;
-	s32 logInt = ((*x & 0x7F800000) >> 19) - 2032; // integer part
-	s32 logFract = (*x & 0x007fffff) >> 19; // approximate fractional part
-
-	return logInt + logFract;
-}
-
-namespace Rasterizer
-{
-Slope ZSlope;
-Slope WSlope;
-Slope ColorSlopes[2][4];
-Slope TexSlopes[8][3];
-
-s32 vertex0X;
-s32 vertex0Y;
-float vertexOffsetX;
-float vertexOffsetY;
-
-s32 scissorLeft = 0;
-s32 scissorTop = 0;
-s32 scissorRight = 0;
-s32 scissorBottom = 0;
-
-Tev tev;
-RasterBlock rasterBlock;
-
-void DoState(PointerWrap &p)
-{
-	ZSlope.DoState(p);
-	WSlope.DoState(p);
-	for (int i=0;i<2;++i)
-		for (int n=0; n<4; ++n)
-			ColorSlopes[i][n].DoState(p);
-	for (int i=0;i<8;++i)
-		for (int n=0; n<3; ++n)
-			TexSlopes[i][n].DoState(p);
-	p.Do(vertex0X);
-	p.Do(vertex0Y);
-	p.Do(vertexOffsetX);
-	p.Do(vertexOffsetY);
-	p.Do(scissorLeft);
-	p.Do(scissorTop);
-	p.Do(scissorRight);
-	p.Do(scissorBottom);
-	tev.DoState(p);
-	p.Do(rasterBlock);
-}
-
-void Init()
-{
-	tev.Init();
-
-	// Set initial z reference plane in the unlikely case that zfreeze is enabled when drawing the first primitive.
-	// TODO: This is just a guess!
-	ZSlope.dfdx = ZSlope.dfdy = 0.f;
-	ZSlope.f0 = 1.f;
-}
-
-inline int iround(float x)
-{
-	int t;
-
-#if defined(_WIN32) && !defined(_M_X64)
-	__asm
-	{
-		fld  x
-		fistp t
-	}
-#else
-	t = (int)x;
-	if((x - t) >= 0.5)
-		return t + 1;
-#endif
-
-	return t;
-}
-
-void SetScissor()
-{
-	int xoff = bpmem.scissorOffset.x * 2 - 342;
-	int yoff = bpmem.scissorOffset.y * 2 - 342;
-
-	scissorLeft = bpmem.scissorTL.x - xoff - 342;
-	if (scissorLeft < 0) scissorLeft = 0;
-
-	scissorTop = bpmem.scissorTL.y - yoff - 342;
-	if (scissorTop < 0) scissorTop = 0;
-
-	scissorRight = bpmem.scissorBR.x - xoff - 341;
-	if (scissorRight > EFB_WIDTH) scissorRight = EFB_WIDTH;
-
-	scissorBottom = bpmem.scissorBR.y - yoff - 341;
-	if (scissorBottom > EFB_HEIGHT) scissorBottom = EFB_HEIGHT;
-}
-
-void SetTevReg(int reg, int comp, bool konst, s16 color)
-{
-	tev.SetRegColor(reg, comp, konst, color);
-}
-
-inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
-{
-	INCSTAT(swstats.thisFrame.rasterizedPixels);
-
-	float dx = vertexOffsetX + (float)(x - vertex0X);
-	float dy = vertexOffsetY + (float)(y - vertex0Y);
-
-	s32 z = (s32)ZSlope.GetValue(dx, dy);
-	if (z < 0 || z > 0x00ffffff)
-		return;
-
-	if (bpmem.UseEarlyDepthTest() && g_SWVideoConfig.bZComploc)
-	{
-		// TODO: Test if perf regs are incremented even if test is disabled
-		SWPixelEngine::pereg.IncZInputQuadCount(true);
-		if (bpmem.zmode.testenable)
-		{
-			// early z
-			if (!EfbInterface::ZCompare(x, y, z))
-				return;
-		}
-		SWPixelEngine::pereg.IncZOutputQuadCount(true);
-	}
-
-	RasterBlockPixel& pixel = rasterBlock.Pixel[xi][yi];
-
-	tev.Position[0] = x;
-	tev.Position[1] = y;
-	tev.Position[2] = z;
-
-	//  colors
-	for (unsigned int i = 0; i < bpmem.genMode.numcolchans; i++)
-	{
-		for(int comp = 0; comp < 4; comp++)
-		{
-			u16 color = (u16)ColorSlopes[i][comp].GetValue(dx, dy);
-
-			// clamp color value to 0
-			u16 mask = ~(color >> 8);
-
-			tev.Color[i][comp] = color & mask;
-		}
-	}
-
-	// tex coords
-	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
-	{
-		// multiply by 128 because TEV stores UVs as s17.7
-		tev.Uv[i].s = (s32)(pixel.Uv[i][0] * 128);
-		tev.Uv[i].t = (s32)(pixel.Uv[i][1] * 128);
-	}
-
-	for (unsigned int i = 0; i < bpmem.genMode.numindstages; i++)
-	{
-		tev.IndirectLod[i] = rasterBlock.IndirectLod[i];
-		tev.IndirectLinear[i] = rasterBlock.IndirectLinear[i];
-	}
-
-	for (unsigned int i = 0; i <= bpmem.genMode.numtevstages; i++)
-	{
-		tev.TextureLod[i] = rasterBlock.TextureLod[i];
-		tev.TextureLinear[i] = rasterBlock.TextureLinear[i];
-	}
-
-	tev.Draw();
-}
-
-void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
-{
-	vertex0X = xi;
-	vertex0Y = yi;
-
-	// adjust a little less than 0.5
-	const float adjust = 0.495f;
-
-	vertexOffsetX = ((float)xi - X1) + adjust;
-	vertexOffsetY = ((float)yi - Y1) + adjust;
-}
-
-void InitSlope(Slope *slope, float f1, float f2, float f3, float DX31, float DX12, float DY12, float DY31)
-{
-	float DF31 = f3 - f1;
-	float DF21 = f2 - f1;
-	float a = DF31 * -DY12 - DF21 * DY31;
-	float b = DX31 * DF21 + DX12 * DF31;
-	float c = -DX12 * DY31 - DX31 * -DY12;
-	slope->dfdx = -a / c;
-	slope->dfdy = -b / c;
-	slope->f0 = f1;
-}
-
-inline void CalculateLOD(s32 &lod, bool &linear, u32 texmap, u32 texcoord)
-{
-	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-	u8 subTexmap = texmap & 3;
-
-	// LOD calculation requires data from the texture mode for bias, etc.
-	// it does not seem to use the actual texture size
-	TexMode0& tm0 = texUnit.texMode0[subTexmap];
-	TexMode1& tm1 = texUnit.texMode1[subTexmap];
-
-	float sDelta, tDelta;
-	if (tm0.diag_lod)
-	{
-		float *uv0 = rasterBlock.Pixel[0][0].Uv[texcoord];
-		float *uv1 = rasterBlock.Pixel[1][1].Uv[texcoord];
-
-		sDelta = fabsf(uv0[0] - uv1[0]);
-		tDelta = fabsf(uv0[1] - uv1[1]);
-	}
-	else
-	{
-		float *uv0 = rasterBlock.Pixel[0][0].Uv[texcoord];
-		float *uv1 = rasterBlock.Pixel[1][0].Uv[texcoord];
-		float *uv2 = rasterBlock.Pixel[0][1].Uv[texcoord];
-
-		sDelta = max(fabsf(uv0[0] - uv1[0]), fabsf(uv0[0] - uv2[0]));
-		tDelta = max(fabsf(uv0[1] - uv1[1]), fabsf(uv0[1] - uv2[1]));
-	}
-
-	// get LOD in s28.4
-	lod = FixedLog2(max(sDelta, tDelta));
-
-	// bias is s2.5
-	int bias = tm0.lod_bias;
-	bias >>= 1;
-	lod += bias;
-
-	linear = ((lod > 0 && (tm0.min_filter & 4)) || (lod <= 0 && tm0.mag_filter));
-
-	// order of checks matters
-	// should be:
-	// if lod > max then max
-	// else if lod < min then min
-	lod = CLAMP(lod, (s32)tm1.min_lod, (s32)tm1.max_lod);
-}
-
-void BuildBlock(s32 blockX, s32 blockY)
-{
-	for (s32 yi = 0; yi < BLOCK_SIZE; yi++)
-	{
-		for (s32 xi = 0; xi < BLOCK_SIZE; xi++)
-		{
-			RasterBlockPixel& pixel = rasterBlock.Pixel[xi][yi];
-
-			float dx = vertexOffsetX + (float)(xi + blockX - vertex0X);
-			float dy = vertexOffsetY + (float)(yi + blockY - vertex0Y);
-
-			float invW = 1.0f / WSlope.GetValue(dx, dy);
-			pixel.InvW = invW;
-
-			// tex coords
-			for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
-			{
-				float projection = invW;
-				if (swxfregs.texMtxInfo[i].projection)
-				{
-					float q = TexSlopes[i][2].GetValue(dx, dy) * invW;
-					if (q != 0.0f)
-						projection = invW / q;
-				}
-
-				pixel.Uv[i][0] = TexSlopes[i][0].GetValue(dx, dy) * projection;
-				pixel.Uv[i][1] = TexSlopes[i][1].GetValue(dx, dy) * projection;
-			}
-		}
-	}
-
-	u32 indref = bpmem.tevindref.hex;
-	for (unsigned int i = 0; i < bpmem.genMode.numindstages; i++)
-	{
-		u32 texmap = indref & 3;
-		indref >>= 3;
-		u32 texcoord = indref & 3;
-		indref >>= 3;
-
-		CalculateLOD(rasterBlock.IndirectLod[i], rasterBlock.IndirectLinear[i], texmap, texcoord);
-	}
-
-	for (unsigned int i = 0; i <= bpmem.genMode.numtevstages; i++)
-	{
-		int stageOdd = i&1;
-		TwoTevStageOrders &order = bpmem.tevorders[i >> 1];
-		if(order.getEnable(stageOdd))
-		{
-			u32 texmap = order.getTexMap(stageOdd);
-			u32 texcoord = order.getTexCoord(stageOdd);
-
-			CalculateLOD(rasterBlock.TextureLod[i], rasterBlock.TextureLinear[i], texmap, texcoord);
-		}
-	}
-}
-
-void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
-{
-	INCSTAT(swstats.thisFrame.numTrianglesDrawn);
-
-	if (g_SWVideoConfig.bHwRasterizer)
-	{
-		HwRasterizer::DrawTriangleFrontFace(v0, v1, v2);
-		return;
-	}
-
-	// adapted from http://www.devmaster.net/forums/showthread.php?t=1884
-
-	// 28.4 fixed-pou32 coordinates. rounded to nearest and adjusted to match hardware output
-	// could also take floor and adjust -8
-	const s32 Y1 = iround(16.0f * v0->screenPosition[1]) - 9;
-	const s32 Y2 = iround(16.0f * v1->screenPosition[1]) - 9;
-	const s32 Y3 = iround(16.0f * v2->screenPosition[1]) - 9;
-
-	const s32 X1 = iround(16.0f * v0->screenPosition[0]) - 9;
-	const s32 X2 = iround(16.0f * v1->screenPosition[0]) - 9;
-	const s32 X3 = iround(16.0f * v2->screenPosition[0]) - 9;
-
-	// Deltas
-	const s32 DX12 = X1 - X2;
-	const s32 DX23 = X2 - X3;
-	const s32 DX31 = X3 - X1;
-
-	const s32 DY12 = Y1 - Y2;
-	const s32 DY23 = Y2 - Y3;
-	const s32 DY31 = Y3 - Y1;
-
-	// Fixed-pos32 deltas
-	const s32 FDX12 = DX12 << 4;
-	const s32 FDX23 = DX23 << 4;
-	const s32 FDX31 = DX31 << 4;
-
-	const s32 FDY12 = DY12 << 4;
-	const s32 FDY23 = DY23 << 4;
-	const s32 FDY31 = DY31 << 4;
-
-	// Bounding rectangle
-	s32 minx = (min(min(X1, X2), X3) + 0xF) >> 4;
-	s32 maxx = (max(max(X1, X2), X3) + 0xF) >> 4;
-	s32 miny = (min(min(Y1, Y2), Y3) + 0xF) >> 4;
-	s32 maxy = (max(max(Y1, Y2), Y3) + 0xF) >> 4;
-
-	// scissor
-	minx = max(minx, scissorLeft);
-	maxx = min(maxx, scissorRight);
-	miny = max(miny, scissorTop);
-	maxy = min(maxy, scissorBottom);
-
-	if (minx >= maxx || miny >= maxy)
-		return;
-
-	// Setup slopes
-	float fltx1 = v0->screenPosition.x;
-	float flty1 = v0->screenPosition.y;
-	float fltdx31 = v2->screenPosition.x - fltx1;
-	float fltdx12 = fltx1 - v1->screenPosition.x;
-	float fltdy12 = flty1 - v1->screenPosition.y;
-	float fltdy31 = v2->screenPosition.y - flty1;
-
-	InitTriangle(fltx1, flty1, (X1 + 0xF) >> 4, (Y1 + 0xF) >> 4);
-
-	float w[3] = { 1.0f / v0->projectedPosition.w, 1.0f / v1->projectedPosition.w, 1.0f / v2->projectedPosition.w };
-	InitSlope(&WSlope, w[0], w[1], w[2], fltdx31, fltdx12, fltdy12, fltdy31);
-
-	if (!bpmem.genMode.zfreeze || !g_SWVideoConfig.bZFreeze)
-		InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31);
-
-	for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++)
-	{
-		for(int comp = 0; comp < 4; comp++)
-			InitSlope(&ColorSlopes[i][comp], v0->color[i][comp], v1->color[i][comp], v2->color[i][comp], fltdx31, fltdx12, fltdy12, fltdy31);
-	}
-
-	for(unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
-	{
-		for(int comp = 0; comp < 3; comp++)
-			InitSlope(&TexSlopes[i][comp], v0->texCoords[i][comp] * w[0], v1->texCoords[i][comp] * w[1], v2->texCoords[i][comp] * w[2], fltdx31, fltdx12, fltdy12, fltdy31);
-	}
-
-	// Start in corner of 8x8 block
-	minx &= ~(BLOCK_SIZE - 1);
-	miny &= ~(BLOCK_SIZE - 1);
-
-	// Half-edge constants
-	s32 C1 = DY12 * X1 - DX12 * Y1;
-	s32 C2 = DY23 * X2 - DX23 * Y2;
-	s32 C3 = DY31 * X3 - DX31 * Y3;
-
-	// Correct for fill convention
-	if(DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++;
-	if(DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++;
-	if(DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++;
-
-	// Loop through blocks
-	for(s32 y = miny; y < maxy; y += BLOCK_SIZE)
-	{
-		for(s32 x = minx; x < maxx; x += BLOCK_SIZE)
-		{
-			// Corners of block
-			s32 x0 = x << 4;
-			s32 x1 = (x + BLOCK_SIZE - 1) << 4;
-			s32 y0 = y << 4;
-			s32 y1 = (y + BLOCK_SIZE - 1) << 4;
-
-			// Evaluate half-space functions
-			bool a00 = C1 + DX12 * y0 - DY12 * x0 > 0;
-			bool a10 = C1 + DX12 * y0 - DY12 * x1 > 0;
-			bool a01 = C1 + DX12 * y1 - DY12 * x0 > 0;
-			bool a11 = C1 + DX12 * y1 - DY12 * x1 > 0;
-			int a = (a00 << 0) | (a10 << 1) | (a01 << 2) | (a11 << 3);
-
-			bool b00 = C2 + DX23 * y0 - DY23 * x0 > 0;
-			bool b10 = C2 + DX23 * y0 - DY23 * x1 > 0;
-			bool b01 = C2 + DX23 * y1 - DY23 * x0 > 0;
-			bool b11 = C2 + DX23 * y1 - DY23 * x1 > 0;
-			int b = (b00 << 0) | (b10 << 1) | (b01 << 2) | (b11 << 3);
-
-			bool c00 = C3 + DX31 * y0 - DY31 * x0 > 0;
-			bool c10 = C3 + DX31 * y0 - DY31 * x1 > 0;
-			bool c01 = C3 + DX31 * y1 - DY31 * x0 > 0;
-			bool c11 = C3 + DX31 * y1 - DY31 * x1 > 0;
-			int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3);
-
-			// Skip block when outside an edge
-			if(a == 0x0 || b == 0x0 || c == 0x0)
-				continue;
-
-			BuildBlock(x, y);
-
-			// Accept whole block when totally covered
-			if(a == 0xF && b == 0xF && c == 0xF)
-			{
-				for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
-				{
-					for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
-					{
-						Draw(x + ix, y + iy, ix, iy);
-					}
-				}
-			}
-			else // Partially covered block
-			{
-				s32 CY1 = C1 + DX12 * y0 - DY12 * x0;
-				s32 CY2 = C2 + DX23 * y0 - DY23 * x0;
-				s32 CY3 = C3 + DX31 * y0 - DY31 * x0;
-
-				for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
-				{
-					s32 CX1 = CY1;
-					s32 CX2 = CY2;
-					s32 CX3 = CY3;
-
-					for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
-					{
-						if(CX1 > 0 && CX2 > 0 && CX3 > 0)
-						{
-							Draw(x + ix, y + iy, ix, iy);
-						}
-
-						CX1 -= FDY12;
-						CX2 -= FDY23;
-						CX3 -= FDY31;
-					}
-
-					CY1 += FDX12;
-					CY2 += FDX23;
-					CY3 += FDX31;
-				}
-			}
-		}
-	}
-}
-
-
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
deleted file mode 100644
index 5fd1353a94..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include "Thread.h"
-#include "Atomic.h"
-#include "ConfigManager.h"
-#include "Core.h"
-#include "CoreTiming.h"
-#include "HW/Memmap.h"
-#include "HW/ProcessorInterface.h"
-
-#include "VideoBackend.h"
-#include "SWCommandProcessor.h"
-#include "ChunkFile.h"
-#include "MathUtil.h"
-#include "OpcodeDecoder.h"
-
-
-namespace SWCommandProcessor
-{
-
-enum
-{
-	GATHER_PIPE_SIZE = 32,
-	INT_CAUSE_CP =  0x800
-};
-
-// STATE_TO_SAVE
-// variables
-
-const int commandBufferSize = 1024 * 1024;
-const int maxCommandBufferWrite = commandBufferSize - GATHER_PIPE_SIZE;
-u8 commandBuffer[commandBufferSize];
-u32 readPos;
-u32 writePos;
-int et_UpdateInterrupts;
-volatile bool interruptSet;
-volatile bool interruptWaiting;
-
-CPReg cpreg; // shared between gfx and emulator thread
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(cpreg);
-	p.DoArray(commandBuffer, commandBufferSize);
-	p.Do(readPos);
-	p.Do(writePos);
-	p.Do(et_UpdateInterrupts);
-	p.Do(interruptSet);
-	p.Do(interruptWaiting);
-
-	// Is this right?
-	p.DoArray(g_pVideoData,writePos);
-}
-
-// does it matter that there is no synchronization between threads during writes?
-inline void WriteLow (u32& _reg, u16 lowbits)  {_reg = (_reg & 0xFFFF0000) | lowbits;}
-inline void WriteHigh(u32& _reg, u16 highbits) {_reg = (_reg & 0x0000FFFF) | ((u32)highbits << 16);}
-
-inline u16 ReadLow  (u32 _reg)  {return (u16)(_reg & 0xFFFF);}
-inline u16 ReadHigh (u32 _reg)  {return (u16)(_reg >> 16);}
-
-
-void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
-{
-	UpdateInterrupts(userdata);
-}
-
-inline bool AtBreakpoint()
-{
-	return cpreg.ctrl.BPEnable && (cpreg.readptr == cpreg.breakpt);
-}
-
-void Init()
-{
-	cpreg.status.Hex = 0;
-	cpreg.status.CommandIdle = 1;
-	cpreg.status.ReadIdle = 1;
-
-	cpreg.ctrl.Hex = 0;
-	cpreg.clear.Hex = 0;
-
-	cpreg.bboxleft = 0;
-	cpreg.bboxtop  = 0;
-	cpreg.bboxright = 0;
-	cpreg.bboxbottom = 0;
-
-	cpreg.token = 0;
-	
-	et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper);
-
-	// internal buffer position
-	readPos = 0;
-	writePos = 0;
-
-	interruptSet = false;
-	interruptWaiting = false;
-
-	g_pVideoData = 0;
-	g_bSkipCurrentFrame = false;
-}
-
-void Shutdown()
-{
-}
-
-void RunGpu()
-{
-	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-	{
-		// We are going to do FP math on the main thread so have to save the current state
-		FPURoundMode::SaveSIMDState();
-		FPURoundMode::LoadDefaultSIMDState();
-
-		// run the opcode decoder
-		do
-		{
-			RunBuffer();
-		} while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
-
-		FPURoundMode::LoadSIMDState();
-	}
-}
-
-void Read16(u16& _rReturnValue, const u32 _Address)
-{
-	u32 regAddr = (_Address & 0xFFF) >> 1;
-
-	DEBUG_LOG(COMMANDPROCESSOR, "(r): 0x%08x : 0x%08x", _Address, ((u16*)&cpreg)[regAddr]);
-
-	if (regAddr < 0x20)
-		_rReturnValue = ((u16*)&cpreg)[regAddr];
-	else
-		_rReturnValue = 0;
-}
-
-void Write16(const u16 _Value, const u32 _Address)
-{
-	INFO_LOG(COMMANDPROCESSOR, "(write16): 0x%04x @ 0x%08x",_Value,_Address);
-
-	switch (_Address & 0xFFF)
-	{
-	case STATUS_REGISTER:
-		{
-			ERROR_LOG(COMMANDPROCESSOR,"\t write to STATUS_REGISTER : %04x", _Value);
-		}
-		break;
-
-	case CTRL_REGISTER:
-		{
-			cpreg.ctrl.Hex = _Value;
-
-			DEBUG_LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value);
-			DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | CPULINK %s | BP %s || BPIntEnable %s | OvF %s | UndF %s"
-				, cpreg.ctrl.GPReadEnable ?				"ON" : "OFF"
-				, cpreg.ctrl.GPLinkEnable ?				"ON" : "OFF"
-				, cpreg.ctrl.BPEnable ?					"ON" : "OFF"
-				, cpreg.ctrl.BreakPointIntEnable ?		"ON" : "OFF"
-				, cpreg.ctrl.FifoOverflowIntEnable ?	"ON" : "OFF"
-				, cpreg.ctrl.FifoUnderflowIntEnable ?	"ON" : "OFF"
-				);
-		}
-		break;
-
-	case CLEAR_REGISTER:
-		{
-			UCPClearReg tmpClear(_Value);
-
-			if (tmpClear.ClearFifoOverflow)
-				cpreg.status.OverflowHiWatermark = 0;
-			if (tmpClear.ClearFifoUnderflow)
-				cpreg.status.UnderflowLoWatermark = 0;
-
-			INFO_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x",_Value);
-		}		
-		break;
-
-	// Fifo Registers
-	case FIFO_TOKEN_REGISTER:
-		cpreg.token = _Value;
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_TOKEN_REGISTER : %04x", _Value);
-		break;
-
-	case FIFO_BASE_LO:
-		WriteLow ((u32 &)cpreg.fifobase, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_LO. FIFO base is : %08x", cpreg.fifobase);
-		break;
-	case FIFO_BASE_HI:
-		WriteHigh((u32 &)cpreg.fifobase, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_HI. FIFO base is : %08x", cpreg.fifobase);
-		break;
-	case FIFO_END_LO:
-		WriteLow ((u32 &)cpreg.fifoend, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_LO. FIFO end is : %08x", cpreg.fifoend);
-		break;
-	case FIFO_END_HI:
-		WriteHigh((u32 &)cpreg.fifoend, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_HI. FIFO end is : %08x", cpreg.fifoend);
-		break;
-
-	case FIFO_WRITE_POINTER_LO:
-		WriteLow ((u32 &)cpreg.writeptr, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_LO. write ptr is : %08x", cpreg.writeptr);
-		break;
-	case FIFO_WRITE_POINTER_HI:
-		WriteHigh ((u32 &)cpreg.writeptr, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_HI. write ptr is : %08x", cpreg.writeptr);
-		break;
-	case FIFO_READ_POINTER_LO:
-		WriteLow ((u32 &)cpreg.readptr, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_LO. read ptr is : %08x", cpreg.readptr);
-		break;
-	case FIFO_READ_POINTER_HI:
-		WriteHigh ((u32 &)cpreg.readptr, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI. read ptr is : %08x", cpreg.readptr);
-		break;
-
-	case FIFO_HI_WATERMARK_LO:
-		WriteLow ((u32 &)cpreg.hiwatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_LO. hiwatermark is : %08x", cpreg.hiwatermark);
-		break;
-	case FIFO_HI_WATERMARK_HI:
-		WriteHigh ((u32 &)cpreg.hiwatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_HI. hiwatermark is : %08x", cpreg.hiwatermark);
-		break;
-	case FIFO_LO_WATERMARK_LO:
-		WriteLow ((u32 &)cpreg.lowatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_LO. lowatermark is : %08x", cpreg.lowatermark);
-		break;
-	case FIFO_LO_WATERMARK_HI:
-		WriteHigh ((u32 &)cpreg.lowatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_HI. lowatermark is : %08x", cpreg.lowatermark);
-		break;
-
-	case FIFO_BP_LO:
-		WriteLow ((u32 &)cpreg.breakpt, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_LO. breakpoint is : %08x", cpreg.breakpt);
-		break;
-	case FIFO_BP_HI:
-		WriteHigh ((u32 &)cpreg.breakpt, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_HI. breakpoint is : %08x", cpreg.breakpt);
-		break;
-
-	case FIFO_RW_DISTANCE_LO:
-		WriteLow ((u32 &)cpreg.rwdistance, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_RW_DISTANCE_LO. rwdistance is : %08x", cpreg.rwdistance);
-		break;
-	case FIFO_RW_DISTANCE_HI:
-		WriteHigh ((u32 &)cpreg.rwdistance, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_RW_DISTANCE_HI. rwdistance is : %08x", cpreg.rwdistance);
-		break;
-	}
-
-	RunGpu();
-}
-
-void Read32(u32& _rReturnValue, const u32 _Address)
-{
-	_rReturnValue = 0;
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProcessor at 0x%08x", _Address);
-}
-
-void Write32(const u32 _Data, const u32 _Address)
-{
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProcessor at 0x%08x", _Address);
-}
-
-void STACKALIGN GatherPipeBursted()
-{
-	if (cpreg.ctrl.GPLinkEnable)
-	{
-		DEBUG_LOG(COMMANDPROCESSOR,"\t WGP burst. write thru : %08x", cpreg.writeptr);
-
-		if (cpreg.writeptr == cpreg.fifoend)
-			cpreg.writeptr = cpreg.fifobase;
-		else
-			cpreg.writeptr += GATHER_PIPE_SIZE;
-
-		Common::AtomicAdd(cpreg.rwdistance, GATHER_PIPE_SIZE);
-	}
-
-	RunGpu();
-}
-
-void UpdateInterrupts(u64 userdata)
-{
-	if (userdata)
-	{
-		interruptSet = true;
-		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
-	}
-	else
-	{
-		interruptSet = false;
-		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
-	}
-	interruptWaiting = false;
-}
-
-void UpdateInterruptsFromVideoBackend(u64 userdata)
-{
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
-}
-
-void ReadFifo()
-{
-	bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
-	bool atBreakpoint = AtBreakpoint();
-
-	if (canRead && !atBreakpoint)
-	{
-		// read from fifo
-		u8 *ptr = Memory::GetPointer(cpreg.readptr);
-		int bytesRead = 0;
-
-		do
-		{
-			// copy to buffer
-			memcpy(&commandBuffer[writePos], ptr, GATHER_PIPE_SIZE);
-			writePos += GATHER_PIPE_SIZE;
-			bytesRead += GATHER_PIPE_SIZE;
-
-			if (cpreg.readptr == cpreg.fifoend)
-			{
-				cpreg.readptr = cpreg.fifobase;
-				ptr = Memory::GetPointer(cpreg.readptr);
-			}
-			else
-			{
-				cpreg.readptr += GATHER_PIPE_SIZE;
-				ptr += GATHER_PIPE_SIZE;
-			}
-
-			canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
-			atBreakpoint = AtBreakpoint();
-		} while (canRead && !atBreakpoint);
-
-		Common::AtomicAdd(cpreg.rwdistance, -bytesRead);
-	}
-}
-
-void SetStatus()
-{
-	// overflow check
-	if (cpreg.rwdistance > cpreg.hiwatermark)
-		cpreg.status.OverflowHiWatermark = 1;
-
-	// underflow check
-	if (cpreg.rwdistance < cpreg.lowatermark)
-		cpreg.status.UnderflowLoWatermark = 1;
-
-	// breakpoint
-	if (cpreg.ctrl.BPEnable)
-	{
-		if (cpreg.breakpt == cpreg.readptr)
-		{
-			if (!cpreg.status.Breakpoint)
-				INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %x", cpreg.readptr);
-			cpreg.status.Breakpoint = 1;
-		}
-	}
-	else
-	{
-		if (cpreg.status.Breakpoint)
-			INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %x", cpreg.readptr);
-		cpreg.status.Breakpoint = 0;
-	}
-
-	cpreg.status.ReadIdle = cpreg.readptr == cpreg.writeptr;
-
-	bool bpInt = cpreg.status.Breakpoint && cpreg.ctrl.BreakPointIntEnable;
-	bool ovfInt = cpreg.status.OverflowHiWatermark && cpreg.ctrl.FifoOverflowIntEnable;
-	bool undfInt = cpreg.status.UnderflowLoWatermark && cpreg.ctrl.FifoUnderflowIntEnable;
-
-	bool interrupt = bpInt || ovfInt || undfInt;
-
-	if (interrupt != interruptSet && !interruptWaiting)
-	{
-		u64 userdata = interrupt?1:0;
-		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-		{
-			interruptWaiting = true;
-			SWCommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
-		}
-		else
-		{
-			SWCommandProcessor::UpdateInterrupts(userdata);
-		}
-	}
-}
-
-bool RunBuffer()
-{
-	// fifo is read 32 bytes at a time
-	// read fifo data to internal buffer
-	if (cpreg.ctrl.GPReadEnable)
-		ReadFifo();
-
-	SetStatus();
-
-	_dbg_assert_(COMMANDPROCESSOR, writePos >= readPos);
-
-	g_pVideoData = &commandBuffer[readPos];
-
-	u32 availableBytes = writePos - readPos;
-
-	while (OpcodeDecoder::CommandRunnable(availableBytes))
-	{
-		cpreg.status.CommandIdle = 0;
-
-		OpcodeDecoder::Run(availableBytes);
-
-		// if data was read by the opcode decoder then the video data pointer changed
-		readPos = (u32)(g_pVideoData - &commandBuffer[0]);
-		_dbg_assert_(VIDEO, writePos >= readPos);
-		availableBytes = writePos - readPos;
-	}
-
-	cpreg.status.CommandIdle = 1;
-
-	bool ranDecoder = false;
-
-	// move data remaining in the command buffer
-	if (readPos > 0)
-	{
-		memmove(&commandBuffer[0], &commandBuffer[readPos], availableBytes);
-		writePos -= readPos;
-		readPos = 0;
-
-		ranDecoder = true;
-	}
-
-	return ranDecoder;
-}
-
-void SetRendering(bool enabled)
-{
-	g_bSkipCurrentFrame = !enabled;
-}
-
-} // end of namespace SWCommandProcessor
-
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
deleted file mode 100644
index 51cde8dbae..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _COMMANDPROCESSOR_H_
-#define _COMMANDPROCESSOR_H_
-
-#include "Common.h"
-
-class PointerWrap;
-
-extern volatile bool g_bSkipCurrentFrame;
-extern u8* g_pVideoData;
-
-namespace SWCommandProcessor
-{
-	// internal hardware addresses
-	enum
-	{
-		STATUS_REGISTER				= 0x00,
-		CTRL_REGISTER				= 0x02,
-		CLEAR_REGISTER				= 0x04,
-		FIFO_TOKEN_REGISTER			= 0x0E,
-		FIFO_BOUNDING_BOX_LEFT		= 0x10,
-		FIFO_BOUNDING_BOX_RIGHT		= 0x12,
-		FIFO_BOUNDING_BOX_TOP		= 0x14,
-		FIFO_BOUNDING_BOX_BOTTOM	= 0x16,
-		FIFO_BASE_LO				= 0x20,
-		FIFO_BASE_HI				= 0x22,
-		FIFO_END_LO					= 0x24,
-		FIFO_END_HI					= 0x26,
-		FIFO_HI_WATERMARK_LO		= 0x28,
-		FIFO_HI_WATERMARK_HI		= 0x2a,
-		FIFO_LO_WATERMARK_LO		= 0x2c,
-		FIFO_LO_WATERMARK_HI		= 0x2e,
-		FIFO_RW_DISTANCE_LO			= 0x30,
-		FIFO_RW_DISTANCE_HI			= 0x32,
-		FIFO_WRITE_POINTER_LO		= 0x34,
-		FIFO_WRITE_POINTER_HI		= 0x36,
-		FIFO_READ_POINTER_LO		= 0x38,
-		FIFO_READ_POINTER_HI		= 0x3A,
-		FIFO_BP_LO					= 0x3C,
-		FIFO_BP_HI					= 0x3E
-	};
-
-	// Fifo Status Register
-	union UCPStatusReg
-	{
-		struct
-		{
-			u16 OverflowHiWatermark	:	1;
-			u16 UnderflowLoWatermark:	1;
-			u16 ReadIdle			:	1; // done reading
-			u16 CommandIdle			:	1; // done processing commands
-			u16 Breakpoint			:	1;
-			u16						:	11;
-		};
-		u16 Hex;
-		UCPStatusReg() {Hex = 0; }
-		UCPStatusReg(u16 _hex) {Hex = _hex; }
-	};
-
-	// Fifo Control Register
-	union UCPCtrlReg
-	{
-		struct
-		{
-			u16 GPReadEnable			:	1;
-			u16 BPEnable				:	1;
-			u16 FifoOverflowIntEnable	:	1;
-			u16 FifoUnderflowIntEnable	:	1;
-			u16 GPLinkEnable			:	1;
-			u16 BreakPointIntEnable		:	1;
-			u16							:	10;
-		};
-		u16 Hex;
-		UCPCtrlReg() {Hex = 0; }
-		UCPCtrlReg(u16 _hex) {Hex = _hex; }
-	};
-
-	// Fifo Control Register
-	union UCPClearReg
-	{
-		struct
-		{
-			u16 ClearFifoOverflow		:	1;
-			u16 ClearFifoUnderflow		:	1;
-			u16 ClearMetrices			:	1;
-			u16							:	13;
-		};
-		u16 Hex;
-		UCPClearReg() {Hex = 0; }
-		UCPClearReg(u16 _hex) {Hex = _hex; }
-	};
-
-	struct CPReg
-	{
-		UCPStatusReg status;    // 0x00
-		UCPCtrlReg ctrl;        // 0x02
-		UCPClearReg clear;      // 0x04
-		u32 unk0;               // 0x06
-		u32 unk1;               // 0x0a
-		u16 token;              // 0x0e
-		u16 bboxleft;           // 0x10
-		u16 bboxtop;            // 0x12
-		u16 bboxright;          // 0x14
-		u16 bboxbottom;         // 0x16
-		u16 unk2;               // 0x18
-		u32 fifobase;           // 0x20
-		u32 fifoend;            // 0x24
-		u32 hiwatermark;        // 0x28
-		u32 lowatermark;        // 0x2c
-		u32 rwdistance;         // 0x30
-		u32 writeptr;           // 0x34
-		u32 readptr;            // 0x38
-		u32 breakpt;            // 0x3c
-	};
-
-	extern CPReg cpreg;
-
-	// Init
-	void Init();
-	void Shutdown();
-	void DoState(PointerWrap &p);
-
-	bool RunBuffer();
-	void RunGpu();
-
-	// Read
-	void Read16(u16& _rReturnValue, const u32 _Address);
-	void Write16(const u16 _Data, const u32 _Address);
-	void Read32(u32& _rReturnValue, const u32 _Address);
-	void Write32(const u32 _Data, const u32 _Address);
-
-	// for CGPFIFO
-	void GatherPipeBursted();
-	void UpdateInterrupts(u64 userdata);
-	void UpdateInterruptsFromVideoBackend(u64 userdata);
-
-	void SetRendering(bool enabled);
-
-} // end of namespace SWCommandProcessor
-
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
deleted file mode 100644
index 6c81aedac7..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-// http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!
-
-
-
-#include "Common.h"
-#include "ChunkFile.h"
-#include "CoreTiming.h"
-#include "ConfigManager.h"
-#include "HW/ProcessorInterface.h"
-
-#include "SWPixelEngine.h"
-#include "SWCommandProcessor.h"
-
-
-namespace SWPixelEngine
-{
-
-enum
-{
-	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
-};
-
-// STATE_TO_SAVE
-PEReg pereg;
-
-static bool g_bSignalTokenInterrupt;
-static bool g_bSignalFinishInterrupt;
-
-static int et_SetTokenOnMainThread;
-static int et_SetFinishOnMainThread;
-
-void DoState(PointerWrap &p)
-{
-	p.DoPOD(pereg);
-	p.Do(g_bSignalTokenInterrupt);
-	p.Do(g_bSignalFinishInterrupt);
-	p.Do(et_SetTokenOnMainThread);
-	p.Do(et_SetFinishOnMainThread);
-}
-
-void UpdateInterrupts();
-
-void SetToken_OnMainThread(u64 userdata, int cyclesLate);
-void SetFinish_OnMainThread(u64 userdata, int cyclesLate);
-
-void Init()
-{
-	memset(&pereg, 0, sizeof(pereg));
-
-	et_SetTokenOnMainThread = false;
-	g_bSignalFinishInterrupt = false;
-
-	et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
-	et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
-}
-
-void Read16(u16& _uReturnValue, const u32 _iAddress)
-{
-	DEBUG_LOG(PIXELENGINE, "(r16): 0x%08x", _iAddress);
-
-	u16 address = _iAddress & 0xFFF;
-
-	if (address <= 0x2e)
-		_uReturnValue = ((u16*)&pereg)[address >> 1];
-}
-
-void Write32(const u32 _iValue, const u32 _iAddress)
-{
-	WARN_LOG(PIXELENGINE, "(w32): 0x%08x @ 0x%08x",_iValue,_iAddress);
-}
-
-void Write16(const u16 _iValue, const u32 _iAddress)
-{
-	u16 address = _iAddress & 0xFFF;
-
-	switch (address)
-	{
-	case PE_CTRL_REGISTER:	
-		{
-			UPECtrlReg tmpCtrl(_iValue);
-
-			if (tmpCtrl.PEToken)	g_bSignalTokenInterrupt = false;
-			if (tmpCtrl.PEFinish)	g_bSignalFinishInterrupt = false;
-
-			pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable;
-			pereg.ctrl.PEFinishEnable = tmpCtrl.PEFinishEnable;
-			pereg.ctrl.PEToken = 0;		// this flag is write only
-			pereg.ctrl.PEFinish = 0;	// this flag is write only
-
-			DEBUG_LOG(PIXELENGINE, "(w16): PE_CTRL_REGISTER: 0x%04x", _iValue);
-			UpdateInterrupts();
-		}
-		break;
-	default:
-		if (address <= 0x2e)
-			((u16*)&pereg)[address >> 1] = _iValue;
-		break;
-	}
-}
-
-bool AllowIdleSkipping()
-{
-	return !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || (!pereg.ctrl.PETokenEnable && !pereg.ctrl.PEFinishEnable);
-}
-
-void UpdateInterrupts()
-{
-	// check if there is a token-interrupt
-	if (g_bSignalTokenInterrupt	& pereg.ctrl.PETokenEnable)
-		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true);
-	else
-		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, false);
-
-	// check if there is a finish-interrupt
-	if (g_bSignalFinishInterrupt & pereg.ctrl.PEFinishEnable)
-		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, true);
-	else
-		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, false);
-}
-
-
-// Called only if BPMEM_PE_TOKEN_INT_ID is ack by GP
-void SetToken_OnMainThread(u64 userdata, int cyclesLate)
-{
-	g_bSignalTokenInterrupt = true;
-	INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", pereg.token);
-	UpdateInterrupts();
-}
-
-void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
-{
-	g_bSignalFinishInterrupt = true;	
-	UpdateInterrupts();
-}
-
-// SetToken
-// THIS IS EXECUTED FROM VIDEO THREAD
-void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
-{
-	pereg.token = _token;
-	if (_bSetTokenAcknowledge) // set token INT
-	{
-		CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread,
-			_token | (_bSetTokenAcknowledge << 16));
-	}
-}
-
-// SetFinish
-// THIS IS EXECUTED FROM VIDEO THREAD
-void SetFinish()
-{
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0);
-	INFO_LOG(PIXELENGINE, "VIDEO Set Finish");
-}
-
-} // end of namespace SWPixelEngine
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
deleted file mode 100644
index b61af07a06..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _PIXELENGINE_H
-#define _PIXELENGINE_H
-
-#include "Common.h"
-#include "VideoCommon.h"
-
-class PointerWrap;
-
-namespace SWPixelEngine
-{
-	// internal hardware addresses
-	enum
-	{
-		PE_ZCONF		 = 0x000, // Z Config
-		PE_ALPHACONF	 = 0x002, // Alpha Config
-		PE_DSTALPHACONF  = 0x004, // Destination Alpha Config
-		PE_ALPHAMODE	 = 0x006, // Alpha Mode Config
-		PE_ALPHAREAD	 = 0x008, // Alpha Read
-		PE_CTRL_REGISTER = 0x00a, // Control
-		PE_TOKEN_REG	 = 0x00e, // Token
-		PE_BBOX_LEFT	 = 0x010, // Flip Left
-		PE_BBOX_RIGHT	 = 0x012, // Flip Right
-		PE_BBOX_TOP		 = 0x014, // Flip Top
-		PE_BBOX_BOTTOM	 = 0x016, // Flip Bottom
-
-		// NOTE: Order not verified
-		// These indicate the number of quads that are being used as input/output for each particular stage
-		PE_PERF_ZCOMP_INPUT_ZCOMPLOC_L  = 0x18,
-		PE_PERF_ZCOMP_INPUT_ZCOMPLOC_H  = 0x1a,
-		PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_L = 0x1c,
-		PE_PERF_ZCOMP_OUTPUT_ZCOMPLOC_H = 0x1e,
-		PE_PERF_ZCOMP_INPUT_L           = 0x20,
-		PE_PERF_ZCOMP_INPUT_H           = 0x22,
-		PE_PERF_ZCOMP_OUTPUT_L          = 0x24,
-		PE_PERF_ZCOMP_OUTPUT_H          = 0x26,
-		PE_PERF_BLEND_INPUT_L           = 0x28,
-		PE_PERF_BLEND_INPUT_H           = 0x2a,
-		PE_PERF_EFB_COPY_CLOCKS_L       = 0x2c,
-		PE_PERF_EFB_COPY_CLOCKS_H       = 0x2e,
-	};
-
-	union UPEZConfReg
-	{
-		u16 Hex;
-		struct 
-		{
-			u16 ZCompEnable		: 1; // Z Comparator Enable
-			u16 Function		: 3;
-			u16 ZUpdEnable		: 1;
-			u16					: 11;
-		};
-	};
-
-	union UPEAlphaConfReg
-	{
-		u16 Hex;
-		struct 
-		{
-			u16 BMMath			: 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
-			u16 BMLogic			: 1; // GX_BM_LOGIC
-			u16 Dither			: 1;
-			u16 ColorUpdEnable	: 1;
-			u16 AlphaUpdEnable	: 1;
-			u16 DstFactor		: 3;
-			u16 SrcFactor		: 3;
-			u16 Substract		: 1; // Additive mode by default
-			u16 BlendOperator	: 4;
-		};
-	};
-
-	union UPEDstAlphaConfReg
-	{
-		u16 Hex;
-		struct 
-		{
-			u16 DstAlpha		: 8;
-			u16 Enable			: 1;
-			u16					: 7;
-		};
-	};
-
-	union UPEAlphaModeConfReg
-	{
-		u16 Hex;
-		struct 
-		{
-			u16 Threshold		: 8;
-			u16 CompareMode		: 8;
-		};
-	};
-
-		union UPEAlphaReadReg
-	{
-		u16 Hex;
-		struct 
-		{
-			u16 ReadMode	: 3;
-			u16				: 13;
-		};
-	};
-
-		union UPECtrlReg
-	{
-		struct 
-		{
-			u16 PETokenEnable	:	1;
-			u16 PEFinishEnable	:	1;
-			u16 PEToken			:	1; // write only
-			u16 PEFinish		:	1; // write only
-			u16					:	12;
-		};
-		u16 Hex;
-		UPECtrlReg() {Hex = 0; }
-		UPECtrlReg(u16 _hex) {Hex = _hex; }
-	};
-
-	struct PEReg
-	{
-		UPEZConfReg zconf;
-		UPEAlphaConfReg alphaConf;
-		UPEDstAlphaConfReg dstAlpha;
-		UPEAlphaModeConfReg alphaMode;
-		UPEAlphaReadReg alphaRead;
-		UPECtrlReg ctrl;
-		u16 unk0;
-		u16 token;
-
-		u16 boxLeft;
-		u16 boxRight;
-		u16 boxTop;
-		u16 boxBottom;
-
-		u16 perfZcompInputZcomplocLo;
-		u16 perfZcompInputZcomplocHi;
-		u16 perfZcompOutputZcomplocLo;
-		u16 perfZcompOutputZcomplocHi;
-		u16 perfZcompInputLo;
-		u16 perfZcompInputHi;
-		u16 perfZcompOutputLo;
-		u16 perfZcompOutputHi;
-		u16 perfBlendInputLo;
-		u16 perfBlendInputHi;
-		u16 perfEfbCopyClocksLo;
-		u16 perfEfbCopyClocksHi;
-
-		// NOTE: hardware doesn't process individual pixels but quads instead. Current software renderer architecture works on pixels though, so we have this "quad" hack here to only increment the registers on every fourth rendered pixel
-		void IncZInputQuadCount(bool early_ztest)
-		{
-			static int quad = 0;
-			if (++quad != 3)
-				return;
-			quad = 0;
-
-			if (early_ztest)
-			{
-				if (++perfZcompInputZcomplocLo == 0)
-					perfZcompInputZcomplocHi++;
-			}
-			else
-			{
-				if (++perfZcompInputLo == 0)
-					perfZcompInputHi++;
-			}
-		}
-		void IncZOutputQuadCount(bool early_ztest)
-		{
-			static int quad = 0;
-			if (++quad != 3)
-				return;
-			quad = 0;
-
-			if (early_ztest)
-			{
-				if (++perfZcompOutputZcomplocLo == 0)
-					perfZcompOutputZcomplocHi++;
-			}
-			else
-			{
-				if (++perfZcompOutputLo == 0)
-					perfZcompOutputHi++;
-			}
-		}
-		void IncBlendInputQuadCount()
-		{
-			static int quad = 0;
-			if (++quad != 3)
-				return;
-			quad = 0;
-
-			if (++perfBlendInputLo == 0)
-				perfBlendInputHi++;
-		}
-	};
-
-	extern PEReg pereg;
-
-	void Init();
-	void DoState(PointerWrap &p);
-
-	// Read
-	void Read16(u16& _uReturnValue, const u32 _iAddress);
-
-	// Write
-	void Write16(const u16 _iValue, const u32 _iAddress);
-	void Write32(const u32 _iValue, const u32 _iAddress);
-
-	// gfx backend support
-	void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
-	void SetFinish(void);
-	bool AllowIdleSkipping();
-
-} // end of namespace SWPixelEngine
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
deleted file mode 100644
index ad47a1a777..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-#include <math.h>
-
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
-#include "RasterFont.h"
-#include "SWRenderer.h"
-#include "SWStatistics.h"
-
-#include "OnScreenDisplay.h"
-
-static GLuint s_RenderTarget = 0;
-
-static GLint attr_pos = -1, attr_tex = -1;
-static GLint uni_tex = -1;
-static GLuint program;
-
-// Rasterfont isn't compatible with GLES
-// degasus: I think it does, but I can't test it
-#ifndef USE_GLES
-RasterFont* s_pfont = NULL;
-#endif
-
-void SWRenderer::Init()
-{
-}
-
-void SWRenderer::Shutdown()
-{
-	glDeleteProgram(program);
-	glDeleteTextures(1, &s_RenderTarget);	
-#ifndef USE_GLES
-	delete s_pfont;
-	s_pfont = 0;
-#endif
-}
-
-void CreateShaders()
-{
-	static const char *fragShaderText =
-		"varying " PREC " vec2 TexCoordOut;\n"
-		"uniform sampler2D Texture;\n"
-		"void main() {\n"
-		"	" PREC " vec4 tmpcolor;\n"
-		"	tmpcolor = texture2D(Texture, TexCoordOut);\n"
-		"	gl_FragColor = tmpcolor;\n"
-		"}\n";
-	static const char *vertShaderText =
-		"attribute vec4 pos;\n"
-		"attribute vec2 TexCoordIn;\n "
-		"varying vec2 TexCoordOut;\n "
-		"void main() {\n"
-		"	gl_Position = pos;\n"
-		"	TexCoordOut = TexCoordIn;\n"
-		"}\n";
-
-	program = OpenGL_CompileProgram(vertShaderText, fragShaderText);
-
-	glUseProgram(program);
-
-	uni_tex = glGetUniformLocation(program, "Texture");
-	attr_pos = glGetAttribLocation(program, "pos");
-	attr_tex = glGetAttribLocation(program, "TexCoordIn"); 
-}
-
-void SWRenderer::Prepare()
-{
-	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);  // 4-byte pixel alignment
-	glGenTextures(1, &s_RenderTarget);
-
-	CreateShaders();
-	// TODO: Enable for GLES once RasterFont supports GLES
-#ifndef USE_GLES
-	s_pfont = new RasterFont();
-	glEnable(GL_TEXTURE_2D);
-#endif
-	GL_REPORT_ERRORD();
-}
-
-void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
-{
-#ifndef USE_GLES
-	int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
-	int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
-	glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f,
-			((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f);
-	s_pfont->printMultilineText(pstr,
-			left * 2.0f / (float)nBackbufferWidth - 1,
-			1 - top * 2.0f / (float)nBackbufferHeight,
-			0, nBackbufferWidth, nBackbufferHeight);
-#endif
-}
-
-void SWRenderer::DrawDebugText()
-{
-	char debugtext_buffer[8192];
-	char *p = debugtext_buffer;
-	p[0] = 0;
-
-	if (g_SWVideoConfig.bShowStats) 
-	{
-		p+=sprintf(p,"Objects: %i\n",swstats.thisFrame.numDrawnObjects);
-		p+=sprintf(p,"Primitives: %i\n",swstats.thisFrame.numPrimatives);
-		p+=sprintf(p,"Vertices Loaded: %i\n",swstats.thisFrame.numVerticesLoaded);
-
-		p+=sprintf(p,"Triangles Input:   %i\n",swstats.thisFrame.numTrianglesIn);
-		p+=sprintf(p,"Triangles Rejected:   %i\n",swstats.thisFrame.numTrianglesRejected);
-		p+=sprintf(p,"Triangles Culled:   %i\n",swstats.thisFrame.numTrianglesCulled);
-		p+=sprintf(p,"Triangles Clipped:  %i\n",swstats.thisFrame.numTrianglesClipped);
-		p+=sprintf(p,"Triangles Drawn:   %i\n",swstats.thisFrame.numTrianglesDrawn);
-
-		p+=sprintf(p,"Rasterized Pix:   %i\n",swstats.thisFrame.rasterizedPixels);
-		p+=sprintf(p,"TEV Pix In:   %i\n",swstats.thisFrame.tevPixelsIn);
-		p+=sprintf(p,"TEV Pix Out:   %i\n",swstats.thisFrame.tevPixelsOut);
-	}
-
-	// Render a shadow, and then the text.
-	SWRenderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000);
-	SWRenderer::RenderText(debugtext_buffer, 20, 20, 0xFFFFFF00);
-}
-
-void SWRenderer::DrawTexture(u8 *texture, int width, int height)
-{
-	GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth();
-	GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight();
-
-	// Update GLViewPort
-	glViewport(0, 0, glWidth, glHeight);
-	glScissor(0, 0, glWidth, glHeight);
-
-	glBindTexture(GL_TEXTURE_2D, s_RenderTarget);
-
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	 
-	glUseProgram(program);
-	static const GLfloat verts[4][2] = {
-		{ -1, -1}, // Left top
-		{ -1,  1}, // left bottom
-		{  1,  1}, // right bottom
-		{  1, -1} // right top
-	};
-	static const GLfloat texverts[4][2] = {
-		{0, 1},
-		{0, 0},
-		{1, 0},
-		{1, 1}
-	};
-
-	glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts);
-	glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts);
-	glEnableVertexAttribArray(attr_pos);
-	glEnableVertexAttribArray(attr_tex);
-	glUniform1i(uni_tex, 0);
-	glActiveTexture(GL_TEXTURE0);
-	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-	glDisableVertexAttribArray(attr_pos);
-	glDisableVertexAttribArray(attr_tex);
-
-	glBindTexture(GL_TEXTURE_2D, 0); 
-	GL_REPORT_ERRORD();
-}
-
-void SWRenderer::SwapBuffer()
-{
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_ONFRAME);
-
-	DrawDebugText();
-
-	glFlush();
-
-	GLInterface->Swap();
-
-	swstats.ResetFrame();
-	
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	GL_REPORT_ERRORD();
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
deleted file mode 100644
index ba856936cb..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _RENDERER_H_
-#define _RENDERER_H_
-
-#include "CommonTypes.h"
-
-namespace SWRenderer
-{
-	void Init();
-	void Prepare();
-	void Shutdown();
-
-	void RenderText(const char* pstr, int left, int top, u32 color);
-	void DrawDebugText();
-
-	void DrawTexture(u8 *texture, int width, int height);
-
-	void SwapBuffer();
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
deleted file mode 100644
index 99b51b77a1..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "SWStatistics.h"
-
-SWStatistics swstats;
-
-template <class T>
-void Xchg(T& a, T&b)
-{
-	T c = a;
-	a = b;
-	b = c;
-}
-
-SWStatistics::SWStatistics()
-{
-	frameCount = 0;
-}
-
-void SWStatistics::ResetFrame()
-{
-	memset(&thisFrame, 0, sizeof(ThisFrame));
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
deleted file mode 100644
index f176acd635..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "SWVertexLoader.h"
-#include "VertexLoader_Position.h"
-#include "VertexLoader_Normal.h"
-#include "VertexLoader_Color.h"
-#include "VertexLoader_TextCoord.h"
-
-#include "CPMemLoader.h"
-#include "XFMemLoader.h"
-
-#include "TransformUnit.h"
-#include "SetupUnit.h"
-#include "SWStatistics.h"
-#include "VertexManagerBase.h"
-#include "DataReader.h"
-
-// Vertex loaders read these
-extern int tcIndex;
-extern int colIndex;
-extern int colElements[2];
-extern float posScale;
-extern float tcScale[8];
-
-
-SWVertexLoader::SWVertexLoader() :
-	m_VertexSize(0),
-	m_NumAttributeLoaders(0)
- {
-	VertexLoader_Normal::Init();
-	VertexLoader_Position::Init();
-	VertexLoader_TextCoord::Init();
-
-	m_SetupUnit = new SetupUnit;
- }
-
-SWVertexLoader::~SWVertexLoader()
-{
-	delete m_SetupUnit;
-	m_SetupUnit = NULL;
-}
-
-void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
-{
-	m_CurrentVat = &g_VtxAttr[attributeIndex];
-
-	posScale = 1.0f / float(1 << m_CurrentVat->g0.PosFrac);
-	tcScale[0] = 1.0f / float(1 << m_CurrentVat->g0.Tex0Frac);
-	tcScale[1] = 1.0f / float(1 << m_CurrentVat->g1.Tex1Frac);
-	tcScale[2] = 1.0f / float(1 << m_CurrentVat->g1.Tex2Frac);
-	tcScale[3] = 1.0f / float(1 << m_CurrentVat->g1.Tex3Frac);
-	tcScale[4] = 1.0f / float(1 << m_CurrentVat->g2.Tex4Frac);
-	tcScale[5] = 1.0f / float(1 << m_CurrentVat->g2.Tex5Frac);
-	tcScale[6] = 1.0f / float(1 << m_CurrentVat->g2.Tex6Frac);
-	tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac);
-
-	//TexMtx
-	const u32 tmDesc[8] = {
-		g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx,
-		g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx
-	};
-
-	// Colors
-	const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1};
-	colElements[0] = m_CurrentVat->g0.Color0Elements;
-	colElements[1] = m_CurrentVat->g0.Color1Elements;
-	const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp};
-
-	// TextureCoord
-	const u32 tcDesc[8] = {
-		g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord,
-		g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3)
-	};
-	const u32 tcElements[8] = {
-		m_CurrentVat->g0.Tex0CoordElements, m_CurrentVat->g1.Tex1CoordElements, m_CurrentVat->g1.Tex2CoordElements, 
-		m_CurrentVat->g1.Tex3CoordElements, m_CurrentVat->g1.Tex4CoordElements, m_CurrentVat->g2.Tex5CoordElements,
-		m_CurrentVat->g2.Tex6CoordElements, m_CurrentVat->g2.Tex7CoordElements
-	};
-
-	const u32 tcFormat[8] = {
-		m_CurrentVat->g0.Tex0CoordFormat, m_CurrentVat->g1.Tex1CoordFormat, m_CurrentVat->g1.Tex2CoordFormat, 
-		m_CurrentVat->g1.Tex3CoordFormat, m_CurrentVat->g1.Tex4CoordFormat, m_CurrentVat->g2.Tex5CoordFormat,
-		m_CurrentVat->g2.Tex6CoordFormat, m_CurrentVat->g2.Tex7CoordFormat
-	};
-
-	m_VertexSize = 0;
-
-	// Reset pipeline
-	m_positionLoader = NULL;
-	m_normalLoader = NULL;
-	m_NumAttributeLoaders = 0;
-
-	// Reset vertex
-	// matrix index from xf regs or cp memory?
-	if (swxfregs.MatrixIndexA.PosNormalMtxIdx != MatrixIndexA.PosNormalMtxIdx ||
-		swxfregs.MatrixIndexA.Tex0MtxIdx != MatrixIndexA.Tex0MtxIdx ||
-		swxfregs.MatrixIndexA.Tex1MtxIdx != MatrixIndexA.Tex1MtxIdx ||
-		swxfregs.MatrixIndexA.Tex2MtxIdx != MatrixIndexA.Tex2MtxIdx ||
-		swxfregs.MatrixIndexA.Tex3MtxIdx != MatrixIndexA.Tex3MtxIdx ||
-		swxfregs.MatrixIndexB.Tex4MtxIdx != MatrixIndexB.Tex4MtxIdx ||
-		swxfregs.MatrixIndexB.Tex5MtxIdx != MatrixIndexB.Tex5MtxIdx ||
-		swxfregs.MatrixIndexB.Tex6MtxIdx != MatrixIndexB.Tex6MtxIdx ||
-		swxfregs.MatrixIndexB.Tex7MtxIdx != MatrixIndexB.Tex7MtxIdx)
-	{
-		WARN_LOG(VIDEO, "Matrix indices don't match");
-
-		// Just show the assert once
-		static bool showedAlert = false;
-		_assert_msg_(VIDEO, showedAlert, "Matrix indices don't match");
-		showedAlert = true;
-	}
-
-#if(1)
-	m_Vertex.posMtx = swxfregs.MatrixIndexA.PosNormalMtxIdx;
-	m_Vertex.texMtx[0] = swxfregs.MatrixIndexA.Tex0MtxIdx;
-	m_Vertex.texMtx[1] = swxfregs.MatrixIndexA.Tex1MtxIdx;
-	m_Vertex.texMtx[2] = swxfregs.MatrixIndexA.Tex2MtxIdx;
-	m_Vertex.texMtx[3] = swxfregs.MatrixIndexA.Tex3MtxIdx;
-	m_Vertex.texMtx[4] = swxfregs.MatrixIndexB.Tex4MtxIdx;
-	m_Vertex.texMtx[5] = swxfregs.MatrixIndexB.Tex5MtxIdx;
-	m_Vertex.texMtx[6] = swxfregs.MatrixIndexB.Tex6MtxIdx;
-	m_Vertex.texMtx[7] = swxfregs.MatrixIndexB.Tex7MtxIdx;
-#else
-	m_Vertex.posMtx = MatrixIndexA.PosNormalMtxIdx;
-	m_Vertex.texMtx[0] = MatrixIndexA.Tex0MtxIdx;
-	m_Vertex.texMtx[1] = MatrixIndexA.Tex1MtxIdx;
-	m_Vertex.texMtx[2] = MatrixIndexA.Tex2MtxIdx;
-	m_Vertex.texMtx[3] = MatrixIndexA.Tex3MtxIdx;
-	m_Vertex.texMtx[4] = MatrixIndexB.Tex4MtxIdx;
-	m_Vertex.texMtx[5] = MatrixIndexB.Tex5MtxIdx;
-	m_Vertex.texMtx[6] = MatrixIndexB.Tex6MtxIdx;
-	m_Vertex.texMtx[7] = MatrixIndexB.Tex7MtxIdx;
-#endif
-
-	if (g_VtxDesc.PosMatIdx != NOT_PRESENT)
-	{
-		AddAttributeLoader(LoadPosMtx);
-		m_VertexSize++;
-	}
-
-	for (int i = 0; i < 8; ++i)
-	{
-		if (tmDesc[i] != NOT_PRESENT)
-		{
-			AddAttributeLoader(LoadTexMtx, i);
-			m_VertexSize++;
-		}
-	}
-
-	// Write vertex position loader
-	m_positionLoader = VertexLoader_Position::GetFunction(g_VtxDesc.Position, m_CurrentVat->g0.PosFormat, m_CurrentVat->g0.PosElements);
-	m_VertexSize += VertexLoader_Position::GetSize(g_VtxDesc.Position, m_CurrentVat->g0.PosFormat, m_CurrentVat->g0.PosElements);
-	AddAttributeLoader(LoadPosition);
-
-	// Normals
-	if (g_VtxDesc.Normal != NOT_PRESENT)
-	{
-		m_VertexSize += VertexLoader_Normal::GetSize(g_VtxDesc.Normal,
-			m_CurrentVat->g0.NormalFormat, m_CurrentVat->g0.NormalElements, m_CurrentVat->g0.NormalIndex3);
-		
-		m_normalLoader = VertexLoader_Normal::GetFunction(g_VtxDesc.Normal,
-			m_CurrentVat->g0.NormalFormat, m_CurrentVat->g0.NormalElements, m_CurrentVat->g0.NormalIndex3);
-		
-		if (m_normalLoader == 0)
-		{
-			ERROR_LOG(VIDEO, "VertexLoader_Normal::GetFunction returned zero!");
-		}
-		AddAttributeLoader(LoadNormal);
-	}
-
-	for (int i = 0; i < 2; i++)
-	{
-		switch (colDesc[i])
-		{
-		case NOT_PRESENT:
-			m_colorLoader[i] = NULL;
-			break;
-		case DIRECT:
-			switch (colComp[i])
-			{
-			case FORMAT_16B_565:	m_VertexSize += 2; m_colorLoader[i] = (Color_ReadDirect_16b_565); break;
-			case FORMAT_24B_888:	m_VertexSize += 3; m_colorLoader[i] = (Color_ReadDirect_24b_888); break;
-			case FORMAT_32B_888x:	m_VertexSize += 4; m_colorLoader[i] = (Color_ReadDirect_32b_888x); break;
-			case FORMAT_16B_4444:	m_VertexSize += 2; m_colorLoader[i] = (Color_ReadDirect_16b_4444); break;
-			case FORMAT_24B_6666:	m_VertexSize += 3; m_colorLoader[i] = (Color_ReadDirect_24b_6666); break;
-			case FORMAT_32B_8888:	m_VertexSize += 4; m_colorLoader[i] = (Color_ReadDirect_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			AddAttributeLoader(LoadColor, i);
-			break;
-		case INDEX8:	
-			m_VertexSize += 1;
-			switch (colComp[i])
-			{
-			case FORMAT_16B_565:	m_colorLoader[i] = (Color_ReadIndex8_16b_565); break;
-			case FORMAT_24B_888:	m_colorLoader[i] = (Color_ReadIndex8_24b_888); break;
-			case FORMAT_32B_888x:	m_colorLoader[i] = (Color_ReadIndex8_32b_888x); break;
-			case FORMAT_16B_4444:	m_colorLoader[i] = (Color_ReadIndex8_16b_4444); break;
-			case FORMAT_24B_6666:	m_colorLoader[i] = (Color_ReadIndex8_24b_6666); break;
-			case FORMAT_32B_8888:	m_colorLoader[i] = (Color_ReadIndex8_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			AddAttributeLoader(LoadColor, i);
-			break;
-		case INDEX16:
-			m_VertexSize += 2;
-			switch (colComp[i])
-			{
-			case FORMAT_16B_565:	m_colorLoader[i] = (Color_ReadIndex16_16b_565); break;
-			case FORMAT_24B_888:	m_colorLoader[i] = (Color_ReadIndex16_24b_888); break;
-			case FORMAT_32B_888x:	m_colorLoader[i] = (Color_ReadIndex16_32b_888x); break;
-			case FORMAT_16B_4444:	m_colorLoader[i] = (Color_ReadIndex16_16b_4444); break;
-			case FORMAT_24B_6666:	m_colorLoader[i] = (Color_ReadIndex16_24b_6666); break;
-			case FORMAT_32B_8888:	m_colorLoader[i] = (Color_ReadIndex16_32b_8888); break;
-			default: _assert_(0); break;
-			}
-			AddAttributeLoader(LoadColor, i);
-			break;
-		}
-	}
-
-	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
-	for (int i = 0; i < 8; i++)
-	{
-		const int desc = tcDesc[i];
-		const int format = tcFormat[i];
-		const int elements = tcElements[i];
-		_assert_msg_(VIDEO, NOT_PRESENT <= desc && desc <= INDEX16, "Invalid texture coordinates description!\n(desc = %d)", desc);
-		_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
-		_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
-
-		m_texCoordLoader[i] = VertexLoader_TextCoord::GetFunction(desc, format, elements);
-		m_VertexSize += VertexLoader_TextCoord::GetSize(desc, format, elements);
-		if (m_texCoordLoader[i])
-			AddAttributeLoader(LoadTexCoord, i);
-	}
-
-	// special case if only pos and tex coord 0 and tex coord input is AB11
-	m_TexGenSpecialCase =
-		((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0
-		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
-		(swxfregs.texMtxInfo[0].projection == XF_TEXPROJ_ST);
-
-	m_SetupUnit->Init(primitiveType);
-}
-
-
-void SWVertexLoader::LoadVertex()
-{
-	for (int i = 0; i < m_NumAttributeLoaders; i++)
-		m_AttributeLoaders[i].loader(this, &m_Vertex, m_AttributeLoaders[i].index);
-
-	OutputVertexData* outVertex = m_SetupUnit->GetVertex();
-
-	// transform input data
-	TransformUnit::TransformPosition(&m_Vertex, outVertex);
-
-	if (g_VtxDesc.Normal != NOT_PRESENT)
-	{
-		TransformUnit::TransformNormal(&m_Vertex, m_CurrentVat->g0.NormalElements, outVertex);
-	}
-
-	TransformUnit::TransformColor(&m_Vertex, outVertex);
-
-	TransformUnit::TransformTexCoord(&m_Vertex, outVertex, m_TexGenSpecialCase);
-
-	m_SetupUnit->SetupVertex();
-
-	INCSTAT(swstats.thisFrame.numVerticesLoaded)
-}
-
-void SWVertexLoader::AddAttributeLoader(AttributeLoader loader, u8 index)
-{
-	_assert_msg_(VIDEO, m_NumAttributeLoaders < 21, "Too many attribute loaders");
-	m_AttributeLoaders[m_NumAttributeLoaders].loader = loader;
-	m_AttributeLoaders[m_NumAttributeLoaders++].index = index;
-}
-
-void SWVertexLoader::LoadPosMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
-{
-	vertex->posMtx = DataReadU8() & 0x3f;
-}
-
-void SWVertexLoader::LoadTexMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
-{
-	vertex->texMtx[index] = DataReadU8() & 0x3f;
-}
-
-void SWVertexLoader::LoadPosition(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
-{
-	VertexManager::s_pCurBufferPointer = (u8*)&vertex->position;
-	vertexLoader->m_positionLoader();
-}
-
-void SWVertexLoader::LoadNormal(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
-{
-	VertexManager::s_pCurBufferPointer = (u8*)&vertex->normal;
-	vertexLoader->m_normalLoader();
-}
-
-void SWVertexLoader::LoadColor(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
-{
-	u32 color;
-	VertexManager::s_pCurBufferPointer = (u8*)&color;
-	colIndex = index;
-	vertexLoader->m_colorLoader[index]();
-
-	// rgba -> abgr
-	*(u32*)vertex->color[index] = Common::swap32(color);
-}
-
-void SWVertexLoader::LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
-{
-	VertexManager::s_pCurBufferPointer = (u8*)&vertex->texCoords[index];
-	tcIndex = index;
-	vertexLoader->m_texCoordLoader[index]();
-}
-
-void SWVertexLoader::DoState(PointerWrap &p)
-{
-	p.DoArray(m_AttributeLoaders, sizeof m_AttributeLoaders);
-	p.Do(m_VertexSize);
-	p.Do(*m_CurrentVat);
-	p.Do(m_positionLoader);
-	p.Do(m_normalLoader);
-	p.DoArray(m_colorLoader, sizeof m_colorLoader);
-	p.Do(m_NumAttributeLoaders);
-	m_SetupUnit->DoState(p);
-	p.Do(m_TexGenSpecialCase);
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h
deleted file mode 100644
index 5008e7aeb2..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VERTEXLOADER_H_
-#define _VERTEXLOADER_H_
-
-#include "Common.h"
-
-#include "NativeVertexFormat.h"
-#include "CPMemLoader.h"
-#include "ChunkFile.h"
-
-class SetupUnit;
-
-class SWVertexLoader
-{
-	u32 m_VertexSize;
-
-	VAT* m_CurrentVat;
-
-	TPipelineFunction m_positionLoader;
-	TPipelineFunction m_normalLoader;
-	TPipelineFunction m_colorLoader[2];
-	TPipelineFunction m_texCoordLoader[8];
-
-	InputVertexData m_Vertex;
-
-	typedef void (*AttributeLoader)(SWVertexLoader*, InputVertexData*, u8);
-	struct AttrLoaderCall
-	{
-		AttributeLoader loader;
-		u8 index;
-	};
-	AttrLoaderCall m_AttributeLoaders[1+8+1+1+2+8];
-	int m_NumAttributeLoaders;
-	void AddAttributeLoader(AttributeLoader loader, u8 index=0);
-
-	// attribute loader functions
-	static void LoadPosMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-	static void LoadTexMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
-	static void LoadPosition(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-	static void LoadNormal(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-	static void LoadColor(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
-	static void LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
-
-	SetupUnit *m_SetupUnit;
-
-	bool m_TexGenSpecialCase;
-
-public:
-	SWVertexLoader();
-	~SWVertexLoader();
-
-	void SetFormat(u8 attributeIndex, u8 primitiveType);
-
-	u32 GetVertexSize() { return m_VertexSize; }
-
-	void LoadVertex();
-	void DoState(PointerWrap &p);
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
deleted file mode 100644
index a6ebb97eb9..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "FileUtil.h"
-#include "IniFile.h"
-#include "SWVideoConfig.h"
-
-SWVideoConfig g_SWVideoConfig;
-
-SWVideoConfig::SWVideoConfig()
-{
-	bFullscreen = false;
-	bHideCursor = false;
-	renderToMainframe = false;	
-
-	bHwRasterizer = false;
-
-	bShowStats = false;
-
-	bDumpTextures = false;
-	bDumpObjects = false;
-	bDumpFrames = false;
-
-	bZComploc = true;
-	bZFreeze = true;
-
-	bDumpTevStages = false;
-	bDumpTevTextureFetches = false;
-
-	drawStart = 0;
-	drawEnd = 100000;
-}
-
-void SWVideoConfig::Load(const char* ini_file)
-{
-	IniFile iniFile;
-	iniFile.Load(ini_file);
-
-	iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware
-	iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
-
-	iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false);
-	iniFile.Get("Rendering", "ZComploc", &bZComploc, true);
-	iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true);
-
-	iniFile.Get("Info", "ShowStats", &bShowStats, false);
-
-	iniFile.Get("Utility", "DumpTexture", &bDumpTextures, false);
-	iniFile.Get("Utility", "DumpObjects", &bDumpObjects, false);
-	iniFile.Get("Utility", "DumpFrames", &bDumpFrames, false);
-	iniFile.Get("Utility", "DumpTevStages", &bDumpTevStages, false);
-	iniFile.Get("Utility", "DumpTevTexFetches", &bDumpTevTextureFetches, false);
-
-	iniFile.Get("Misc", "DrawStart", &drawStart, 0);
-	iniFile.Get("Misc", "DrawEnd", &drawEnd, 100000);
-}
-
-void SWVideoConfig::Save(const char* ini_file)
-{
-	IniFile iniFile;
-	iniFile.Load(ini_file);
-
-	iniFile.Set("Hardware", "Fullscreen", bFullscreen);
-	iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe);
-
-	iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer);
-	iniFile.Set("Rendering", "ZComploc", &bZComploc);
-	iniFile.Set("Rendering", "ZFreeze", &bZFreeze);
-
-	iniFile.Set("Info", "ShowStats", bShowStats);
-
-	iniFile.Set("Utility", "DumpTexture", bDumpTextures);
-	iniFile.Set("Utility", "DumpObjects", bDumpObjects);
-	iniFile.Set("Utility", "DumpFrames", bDumpFrames);
-	iniFile.Set("Utility", "DumpTevStages", bDumpTevStages);
-	iniFile.Set("Utility", "DumpTevTexFetches", bDumpTevTextureFetches);
-
-	iniFile.Set("Misc", "DrawStart", drawStart);
-	iniFile.Set("Misc", "DrawEnd", drawEnd);
-
-	iniFile.Save(ini_file);
-}
-
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
deleted file mode 100644
index 94e3a6b2a8..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VIDEOSOFTWARE_CONFIG_H_
-#define _VIDEOSOFTWARE_CONFIG_H_
-
-#include "Common.h"
-
-#define STATISTICS 1
-
-// NEVER inherit from this class.
-struct SWVideoConfig : NonCopyable
-{
-	SWVideoConfig();
-	void Load(const char* ini_file);
-	void Save(const char* ini_file);
-
-	// General
-	bool bFullscreen;
-	bool bHideCursor;
-	bool renderToMainframe;	
-
-	bool bHwRasterizer;
-
-	// Emulation features
-	bool bZComploc;
-	bool bZFreeze;
-
-	bool bShowStats;
-
-	bool bDumpTextures;
-	bool bDumpObjects;
-	bool bDumpFrames;
-
-	// Debug only
-	bool bDumpTevStages;
-	bool bDumpTevTextureFetches;
-
-	u32 drawStart;
-	u32 drawEnd;
-};
-
-extern SWVideoConfig g_SWVideoConfig;
-
-#endif  // _VIDEOSOFTWARE_CONFIG_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
deleted file mode 100644
index 7fd384afa3..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#include "Common.h"
-
-#if defined(HAVE_WX) && HAVE_WX
-#include "VideoConfigDialog.h"
-#endif // HAVE_WX
-
-
-#include "SWCommandProcessor.h"
-#include "OpcodeDecoder.h"
-#include "SWVideoConfig.h"
-#include "SWPixelEngine.h"
-#include "BPMemLoader.h"
-#include "XFMemLoader.h"
-#include "Clipper.h"
-#include "Rasterizer.h"
-#include "SWRenderer.h"
-#include "HwRasterizer.h"
-#include "LogManager.h"
-#include "EfbInterface.h"
-#include "DebugUtil.h"
-#include "FileUtil.h"
-#include "VideoBackend.h"
-#include "Core.h"
-#include "OpcodeDecoder.h"
-#include "SWVertexLoader.h"
-#include "SWStatistics.h"
-
-#include "OnScreenDisplay.h"
-#define VSYNC_ENABLED 0
-
-namespace SW
-{
-
-static volatile bool fifoStateRun = false;
-static volatile bool emuRunningState = false;
-static std::mutex m_csSWVidOccupied;
-
-std::string VideoSoftware::GetName()
-{
-	return _trans("Software Renderer");
-}
-
-void *DllDebugger(void *_hParent, bool Show)
-{
-	return NULL;
-}
-
-void VideoSoftware::ShowConfig(void *_hParent)
-{
-#if defined(HAVE_WX) && HAVE_WX
-	VideoConfigDialog diag((wxWindow*)_hParent, "Software", "gfx_software");
-	diag.ShowModal();
-#endif
-}
-
-bool VideoSoftware::Initialize(void *&window_handle)
-{
-	g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
-	InitInterface();	
-	
-	if (!GLInterface->Create(window_handle))
-	{
-		INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
-		return false;
-	}
-
-	InitBPMemory();
-	InitXFMemory();
-	SWCommandProcessor::Init();
-	SWPixelEngine::Init();
-	OpcodeDecoder::Init();
-	Clipper::Init();
-	Rasterizer::Init();
-	HwRasterizer::Init();
-	SWRenderer::Init();
-	DebugUtil::Init();
-
-	return true;
-}
-
-void VideoSoftware::DoState(PointerWrap& p)
-{
-	bool software = true;
-	p.Do(software);
-	if (p.GetMode() == PointerWrap::MODE_READ && software == false)
-		// change mode to abort load of incompatible save state.
-		p.SetMode(PointerWrap::MODE_VERIFY);
-
-	// TODO: incomplete?
-	SWCommandProcessor::DoState(p);
-	SWPixelEngine::DoState(p);
-	EfbInterface::DoState(p);
-	OpcodeDecoder::DoState(p);
-	Clipper::DoState(p);
-	p.Do(swxfregs);
-	p.Do(bpmem);
-	p.DoPOD(swstats);
-
-	// CP Memory
-	p.DoArray(arraybases, 16);
-	p.DoArray(arraystrides, 16);
-	p.Do(MatrixIndexA);
-	p.Do(MatrixIndexB);
-	p.Do(g_VtxDesc.Hex);
-	p.DoArray(g_VtxAttr, 8);
-	p.DoMarker("CP Memory");
-
-}
-
-void VideoSoftware::CheckInvalidState()
-{
-	// there is no state to invalidate
-}
-
-void VideoSoftware::PauseAndLock(bool doLock, bool unpauseOnUnlock)
-{
-	if (doLock)
-	{
-		EmuStateChange(EMUSTATE_CHANGE_PAUSE);
-		if (!Core::IsGPUThread())
-			m_csSWVidOccupied.lock();
-	}
-	else
-	{
-		if (unpauseOnUnlock)
-			EmuStateChange(EMUSTATE_CHANGE_PLAY);
-		if (!Core::IsGPUThread())
-			m_csSWVidOccupied.unlock();
-	}
-}
-
-void VideoSoftware::RunLoop(bool enable)
-{
-	emuRunningState = enable;
-}
-
-void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState)
-{
-	emuRunningState = (newState == EMUSTATE_CHANGE_PLAY) ? true : false;
-}
-
-void VideoSoftware::Shutdown()
-{
-	// TODO: should be in Video_Cleanup
-	HwRasterizer::Shutdown();
-	SWRenderer::Shutdown();
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
-
-	GLInterface->Shutdown();
-}
-
-void VideoSoftware::Video_Cleanup()
-{
-}
-
-// This is called after Video_Initialize() from the Core
-void VideoSoftware::Video_Prepare()
-{
-	GLInterface->MakeCurrent();
-	// Init extension support.
-#ifndef USE_GLES
-#ifdef __APPLE__
-	glewExperimental = 1;
-#endif
-	if (glewInit() != GLEW_OK) {
-		ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?");
-		return;
-	}
-#endif
-	// Handle VSync on/off
-	GLInterface->SwapInterval(VSYNC_ENABLED);
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_INIT);
-
-	HwRasterizer::Prepare();
-	SWRenderer::Prepare();
-
-	INFO_LOG(VIDEO, "Video backend initialized.");
-}
-
-// Run from the CPU thread (from VideoInterface.cpp)
-void VideoSoftware::Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
-{	
-}
-
-// Run from the CPU thread (from VideoInterface.cpp)
-void VideoSoftware::Video_EndField()
-{
-}
-
-u32 VideoSoftware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
-{
-	u32 value = 0;
-
-	switch (type)
-	{
-	case PEEK_Z:
-		{
-			value = EfbInterface::GetDepth(x, y);
-			break;
-		}
-
-	case POKE_Z:
-		break;
-
-	case PEEK_COLOR:
-		{
-			u32 color = 0;
-			EfbInterface::GetColor(x, y, (u8*)&color);
-
-			// rgba to argb
-			value = (color >> 8) | (color & 0xff) << 24;
-			break;
-		}
-
-	case POKE_COLOR:
-		break;
-	}
-
-	return value;
-}
-
-u32 VideoSoftware::Video_GetQueryResult(PerfQueryType type)
-{
-	// TODO:
-	return 0;
-}
-
-bool VideoSoftware::Video_Screenshot(const char *_szFilename)
-{
-	return false;
-}
-
-// -------------------------------
-// Enter and exit the video loop
-// -------------------------------
-void VideoSoftware::Video_EnterLoop()
-{
-	std::lock_guard<std::mutex> lk(m_csSWVidOccupied);
-	fifoStateRun = true;
-
-	while (fifoStateRun)
-	{
-		g_video_backend->PeekMessages();
-
-		if (!SWCommandProcessor::RunBuffer())
-		{
-			Common::YieldCPU();
-		}
-
-		while (!emuRunningState && fifoStateRun)
-		{
-			g_video_backend->PeekMessages();
-			m_csSWVidOccupied.unlock();
-			Common::SleepCurrentThread(1);
-			m_csSWVidOccupied.lock();
-		}
-	}	
-}
-
-void VideoSoftware::Video_ExitLoop()
-{
-	fifoStateRun = false;
-}
-
-// TODO : could use the OSD class in video common, we would need to implement the Renderer class
-//        however most of it is useless for the SW backend so we could as well move it to its own class
-void VideoSoftware::Video_AddMessage(const char* pstr, u32 milliseconds)
-{
-}
-void VideoSoftware::Video_ClearMessages()
-{
-}
-
-void VideoSoftware::Video_SetRendering(bool bEnabled)
-{
-	SWCommandProcessor::SetRendering(bEnabled);
-}
-
-void VideoSoftware::Video_GatherPipeBursted()
-{
-	SWCommandProcessor::GatherPipeBursted();
-}
-
-bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void)
-{
-	return false;
-}
-
-bool VideoSoftware::Video_IsHiWatermarkActive(void)
-{
-	return false;
-}
-
-
-void VideoSoftware::Video_AbortFrame(void)
-{
-}
-
-readFn16 VideoSoftware::Video_CPRead16()
-{
-	return SWCommandProcessor::Read16;
-}
-writeFn16 VideoSoftware::Video_CPWrite16()
-{
-	return SWCommandProcessor::Write16;
-}
-
-readFn16  VideoSoftware::Video_PERead16()
-{
-	return SWPixelEngine::Read16;
-}
-writeFn16 VideoSoftware::Video_PEWrite16()
-{
-	return SWPixelEngine::Write16;
-}
-writeFn32 VideoSoftware::Video_PEWrite32()
-{
-	return SWPixelEngine::Write32;
-}
-
-
-// Draw messages on top of the screen
-unsigned int VideoSoftware::PeekMessages()
-{
-	return GLInterface->PeekMessages();
-}
-
-// Show the current FPS
-void VideoSoftware::UpdateFPSDisplay(const char *text)
-{
-	char temp[100];
-	snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text);
-	GLInterface->UpdateFPSDisplay(temp);
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
deleted file mode 100644
index bd4d0291c9..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-
-#ifndef _SETUPUNIT_H_
-#define _SETUPUNIT_H_
-
-#include "Common.h"
-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
-
-class SetupUnit
-{
-	u8 m_PrimType;
-	int m_VertexCounter;
-
-	OutputVertexData m_Vertices[3];
-	OutputVertexData *m_VertPointer[3];
-	OutputVertexData *m_VertWritePointer;
-
-	void SetupQuad();
-	void SetupTriangle();
-	void SetupTriStrip();
-	void SetupTriFan();
-	void SetupLine();
-	void SetupLineStrip();
-	void SetupPoint();
-
-public:
-	void Init(u8 primitiveType);
-
-	OutputVertexData* GetVertex() { return m_VertWritePointer; }
-
-	void SetupVertex();
-	void DoState(PointerWrap &p);
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
deleted file mode 100644
index effe1d3261..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
+++ /dev/null
@@ -1,874 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include "Tev.h"
-#include "EfbInterface.h"
-#include "TextureSampler.h"
-#include "XFMemLoader.h"
-#include "SWPixelEngine.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
-#include "DebugUtil.h"
-
-#include <cmath>
-
-#ifdef _DEBUG
-#define ALLOW_TEV_DUMPS 1
-#else
-#define ALLOW_TEV_DUMPS 0
-#endif
-
-void Tev::Init()
-{
-	FixedConstants[0] = 0;
-	FixedConstants[1] = 31;
-	FixedConstants[2] = 63;
-	FixedConstants[3] = 95;
-	FixedConstants[4] = 127;
-	FixedConstants[5] = 159;
-	FixedConstants[6] = 191;
-	FixedConstants[7] = 223;
-	FixedConstants[8] = 255;
-
-	for (int i = 0; i < 4; i++)
-		Zero16[i] = 0;
-
-	m_ColorInputLUT[0][RED_INP] = &Reg[0][RED_C]; m_ColorInputLUT[0][GRN_INP] = &Reg[0][GRN_C]; m_ColorInputLUT[0][BLU_INP] = &Reg[0][BLU_C]; // prev.rgb
-	m_ColorInputLUT[1][RED_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][GRN_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][BLU_INP] = &Reg[0][ALP_C]; // prev.aaa
-	m_ColorInputLUT[2][RED_INP] = &Reg[1][RED_C]; m_ColorInputLUT[2][GRN_INP] = &Reg[1][GRN_C]; m_ColorInputLUT[2][BLU_INP] = &Reg[1][BLU_C]; // c0.rgb
-	m_ColorInputLUT[3][RED_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][GRN_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][BLU_INP] = &Reg[1][ALP_C]; // c0.aaa
-	m_ColorInputLUT[4][RED_INP] = &Reg[2][RED_C]; m_ColorInputLUT[4][GRN_INP] = &Reg[2][GRN_C]; m_ColorInputLUT[4][BLU_INP] = &Reg[2][BLU_C]; // c1.rgb
-	m_ColorInputLUT[5][RED_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][GRN_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][BLU_INP] = &Reg[2][ALP_C]; // c1.aaa
-	m_ColorInputLUT[6][RED_INP] = &Reg[3][RED_C]; m_ColorInputLUT[6][GRN_INP] = &Reg[3][GRN_C]; m_ColorInputLUT[6][BLU_INP] = &Reg[3][BLU_C]; // c2.rgb
-	m_ColorInputLUT[7][RED_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][GRN_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][BLU_INP] = &Reg[3][ALP_C]; // c2.aaa
-	m_ColorInputLUT[8][RED_INP] = &TexColor[RED_C]; m_ColorInputLUT[8][GRN_INP] = &TexColor[GRN_C]; m_ColorInputLUT[8][BLU_INP] = &TexColor[BLU_C]; // tex.rgb
-	m_ColorInputLUT[9][RED_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][GRN_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][BLU_INP] = &TexColor[ALP_C]; // tex.aaa
-	m_ColorInputLUT[10][RED_INP] = &RasColor[RED_C]; m_ColorInputLUT[10][GRN_INP] = &RasColor[GRN_C]; m_ColorInputLUT[10][BLU_INP] = &RasColor[BLU_C]; // ras.rgb
-	m_ColorInputLUT[11][RED_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][GRN_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][BLU_INP] = &RasColor[ALP_C]; // ras.rgb
-	m_ColorInputLUT[12][RED_INP] = &FixedConstants[8]; m_ColorInputLUT[12][GRN_INP] = &FixedConstants[8]; m_ColorInputLUT[12][BLU_INP] = &FixedConstants[8]; // one
-	m_ColorInputLUT[13][RED_INP] = &FixedConstants[4]; m_ColorInputLUT[13][GRN_INP] = &FixedConstants[4]; m_ColorInputLUT[13][BLU_INP] = &FixedConstants[4]; // half
-	m_ColorInputLUT[14][RED_INP] = &StageKonst[RED_C]; m_ColorInputLUT[14][GRN_INP] = &StageKonst[GRN_C]; m_ColorInputLUT[14][BLU_INP] = &StageKonst[BLU_C]; // konst
-	m_ColorInputLUT[15][RED_INP] = &FixedConstants[0]; m_ColorInputLUT[15][GRN_INP] = &FixedConstants[0]; m_ColorInputLUT[15][BLU_INP] = &FixedConstants[0]; // zero
-
-	m_AlphaInputLUT[0] = Reg[0]; // prev
-	m_AlphaInputLUT[1] = Reg[1]; // c0
-	m_AlphaInputLUT[2] = Reg[2]; // c1
-	m_AlphaInputLUT[3] = Reg[3]; // c2
-	m_AlphaInputLUT[4] = TexColor; // tex
-	m_AlphaInputLUT[5] = RasColor; // ras
-	m_AlphaInputLUT[6] = StageKonst; // konst
-	m_AlphaInputLUT[7] = Zero16; // zero
-
-	for (int comp = 0; comp < 4; comp++)
-	{
-		m_KonstLUT[0][comp] = &FixedConstants[8];
-		m_KonstLUT[1][comp] = &FixedConstants[7];
-		m_KonstLUT[2][comp] = &FixedConstants[6];
-		m_KonstLUT[3][comp] = &FixedConstants[5];
-		m_KonstLUT[4][comp] = &FixedConstants[4];
-		m_KonstLUT[5][comp] = &FixedConstants[3];
-		m_KonstLUT[6][comp] = &FixedConstants[2];
-		m_KonstLUT[7][comp] = &FixedConstants[1];
-
-		m_KonstLUT[12][comp] = &KonstantColors[0][comp];
-		m_KonstLUT[13][comp] = &KonstantColors[1][comp];
-		m_KonstLUT[14][comp] = &KonstantColors[2][comp];
-		m_KonstLUT[15][comp] = &KonstantColors[3][comp];
-
-		m_KonstLUT[16][comp] = &KonstantColors[0][RED_C];
-		m_KonstLUT[17][comp] = &KonstantColors[1][RED_C];
-		m_KonstLUT[18][comp] = &KonstantColors[2][RED_C];
-		m_KonstLUT[19][comp] = &KonstantColors[3][RED_C];
-		m_KonstLUT[20][comp] = &KonstantColors[0][GRN_C];
-		m_KonstLUT[21][comp] = &KonstantColors[1][GRN_C];
-		m_KonstLUT[22][comp] = &KonstantColors[2][GRN_C];
-		m_KonstLUT[23][comp] = &KonstantColors[3][GRN_C];
-		m_KonstLUT[24][comp] = &KonstantColors[0][BLU_C];
-		m_KonstLUT[25][comp] = &KonstantColors[1][BLU_C];
-		m_KonstLUT[26][comp] = &KonstantColors[2][BLU_C];
-		m_KonstLUT[27][comp] = &KonstantColors[3][BLU_C];
-		m_KonstLUT[28][comp] = &KonstantColors[0][ALP_C];
-		m_KonstLUT[29][comp] = &KonstantColors[1][ALP_C];
-		m_KonstLUT[30][comp] = &KonstantColors[2][ALP_C];
-		m_KonstLUT[31][comp] = &KonstantColors[3][ALP_C];
-	}
-
-	m_BiasLUT[0] = 0;
-	m_BiasLUT[1] = 128;
-	m_BiasLUT[2] = -128;
-	m_BiasLUT[3] = 0;
-
-	m_ScaleLShiftLUT[0] = 0;
-	m_ScaleLShiftLUT[1] = 1;
-	m_ScaleLShiftLUT[2] = 2;
-	m_ScaleLShiftLUT[3] = 0;
-
-	m_ScaleRShiftLUT[0] = 0;
-	m_ScaleRShiftLUT[1] = 0;
-	m_ScaleRShiftLUT[2] = 0;
-	m_ScaleRShiftLUT[3] = 1;
-}
-
-inline s16 Clamp255(s16 in)
-{
-	return in>255?255:(in<0?0:in);
-}
-
-inline s16 Clamp1024(s16 in)
-{
-		return in>1023?1023:(in<-1024?-1024:in);
-}
-
-void Tev::SetRasColor(int colorChan, int swaptable)
-{
-	switch(colorChan)
-	{
-	case 0: // Color0
-		{
-			u8 *color = Color[0];
-			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
-			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
-			swaptable++;
-			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
-			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
-		}
-		break;
-	case 1: // Color1
-		{
-			u8 *color = Color[1];
-			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
-			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
-			swaptable++;
-			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
-			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
-		}
-		break;
-		case 5: // alpha bump
-		{
-			for(int i = 0; i < 4; i++)
-				RasColor[i] = AlphaBump;
-		}
-		break;
-	case 6: // alpha bump normalized
-		{
-			u8 normalized = AlphaBump | AlphaBump >> 5;
-			for(int i = 0; i < 4; i++)
-				RasColor[i] = normalized;
-		}
-		break;
-	default: // zero
-		{
-			for(int i = 0; i < 4; i++)
-				RasColor[i] = 0;
-		}
-		break;
-	}
-}
-
-void Tev::DrawColorRegular(TevStageCombiner::ColorCombiner &cc)
-{
-	InputRegType InputReg;
-
-	for (int i = 0; i < 3; i++)
-	{
-		InputReg.a = *m_ColorInputLUT[cc.a][i];
-		InputReg.b = *m_ColorInputLUT[cc.b][i];
-		InputReg.c = *m_ColorInputLUT[cc.c][i];
-		InputReg.d = *m_ColorInputLUT[cc.d][i];
-
-		u16 c = InputReg.c + (InputReg.c >> 7); 
-
-		s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
-		temp = cc.op?(-temp >> 8):(temp >> 8);
-
-		s32 result = InputReg.d + temp + m_BiasLUT[cc.bias];
-		result = result << m_ScaleLShiftLUT[cc.shift];
-		result = result >> m_ScaleRShiftLUT[cc.shift];
-
-		Reg[cc.dest][BLU_C + i] = result;
-	}
-}
-
-void Tev::DrawColorCompare(TevStageCombiner::ColorCombiner &cc)
-{
-	int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here
-
-	u32 a;
-	u32 b;
-
-	InputRegType InputReg;
-
-	switch(cmp) {
-	case TEVCMP_R8_GT:
-		{
-			a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
-			b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-			}
-		}
-		break;
-
-	case TEVCMP_R8_EQ:
-		{
-			a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
-			b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-			}
-		}
-		break;
-	case TEVCMP_GR16_GT:
-		{
-			a = ((*m_ColorInputLUT[cc.a][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-			b = ((*m_ColorInputLUT[cc.b][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-			}
-		}
-		break;
-	case TEVCMP_GR16_EQ:
-		{
-			a = ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-			b = ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-			}
-		}
-		break;
-	case TEVCMP_BGR24_GT:
-		{
-			a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-			b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-			}
-		}
-		break;
-	case TEVCMP_BGR24_EQ:
-		{
-			a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-			b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-			for (int i = 0; i < 3; i++)
-			{
-				InputReg.c = *m_ColorInputLUT[cc.c][i];
-				InputReg.d = *m_ColorInputLUT[cc.d][i];
-				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-			}
-		}
-		break;
-	case TEVCMP_RGB8_GT:
-		for (int i = 0; i < 3; i++)
-		{
-			InputReg.a = *m_ColorInputLUT[cc.a][i];
-			InputReg.b = *m_ColorInputLUT[cc.b][i];
-			InputReg.c = *m_ColorInputLUT[cc.c][i];
-			InputReg.d = *m_ColorInputLUT[cc.d][i];
-			Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_RGB8_EQ: 
-		for (int i = 0; i < 3; i++)
-		{
-			InputReg.a = *m_ColorInputLUT[cc.a][i];
-			InputReg.b = *m_ColorInputLUT[cc.b][i];
-			InputReg.c = *m_ColorInputLUT[cc.c][i];
-			InputReg.d = *m_ColorInputLUT[cc.d][i];
-			Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
-		}
-		break;
-	}
-}
-
-void Tev::DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac)
-{
-	InputRegType InputReg;
-
-	InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-	InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-	InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-	InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-
-	u16 c = InputReg.c + (InputReg.c >> 7); 
-
-	s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
-	temp = ac.op?(-temp >> 8):(temp >> 8);
-
-	s32 result = InputReg.d + temp + m_BiasLUT[ac.bias];
-	result = result << m_ScaleLShiftLUT[ac.shift];
-	result = result >> m_ScaleRShiftLUT[ac.shift];
-
-	Reg[ac.dest][ALP_C] = result;
-}
-
-void Tev::DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac)
-{
-	int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here
-
-	u32 a;
-	u32 b;
-
-	InputRegType InputReg;
-
-	switch(cmp) {
-	case TEVCMP_R8_GT:
-		{
-			a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
-			b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-		}
-		break;
-
-	case TEVCMP_R8_EQ:
-		{
-			a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
-			b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_GR16_GT:
-		{
-			a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-			b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_GR16_EQ:
-		{
-			a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-			b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_BGR24_GT:
-		{
-			a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-			b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_BGR24_EQ:
-		{
-			a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-			b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_A8_GT:
-		{
-			InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-			InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
-		}
-		break;
-	case TEVCMP_A8_EQ:
-		{
-			InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-			InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-			Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
-		}
-		break;
-	}
-}
-
-static bool AlphaCompare(int alpha, int ref, int comp)
-{
-	switch(comp) {
-	case ALPHACMP_ALWAYS:  return true;
-	case ALPHACMP_NEVER:   return false;
-	case ALPHACMP_LEQUAL:  return alpha <= ref;
-	case ALPHACMP_LESS:    return alpha < ref;
-	case ALPHACMP_GEQUAL:  return alpha >= ref;
-	case ALPHACMP_GREATER: return alpha > ref;
-	case ALPHACMP_EQUAL:   return alpha == ref;
-	case ALPHACMP_NEQUAL:  return alpha != ref;
-	}
-	return true;
-}
-
-static bool TevAlphaTest(int alpha)
-{
-	bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0);
-	bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1);
-
-	switch (bpmem.alpha_test.logic)
-	{
-	case 0: return comp0 && comp1;   // and
-	case 1: return comp0 || comp1;   // or
-	case 2: return comp0 ^ comp1;    // xor
-	case 3: return !(comp0 ^ comp1); // xnor
-	}
-	return true;
-}
-
-inline s32 WrapIndirectCoord(s32 coord, int wrapMode)
-{
-	switch (wrapMode)
-	{
-		case ITW_OFF:
-			return coord;
-		case ITW_256:
-			return (coord % (256 << 7));
-		case ITW_128:
-			return (coord % (128 << 7));
-		case ITW_64:
-			return (coord % (64 << 7));
-		case ITW_32:
-			return (coord % (32 << 7));
-		case ITW_16:
-			return (coord % (16 << 7));
-		case ITW_0:
-			return 0;
-	}
-	return 0;
-}
-
-void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
-{
-	TevStageIndirect &indirect = bpmem.tevind[stageNum];
-	u8 *indmap = IndirectTex[indirect.bt];
-
-	s32 indcoord[3];
-
-	// alpha bump select
-	switch (indirect.bs)
-	{
-		case ITBA_OFF:
-			AlphaBump = 0;
-			break;
-			case ITBA_S:
-			AlphaBump = indmap[TextureSampler::ALP_SMP];
-			break;
-		case ITBA_T:
-			AlphaBump = indmap[TextureSampler::BLU_SMP];
-			break;
-		case ITBA_U:
-			AlphaBump = indmap[TextureSampler::GRN_SMP];
-			break;
-	}
-
-	// bias select
-	s16 biasValue = indirect.fmt==ITF_8?-128:1;
-	s16 bias[3];
-	bias[0] = indirect.bias&1?biasValue:0;
-	bias[1] = indirect.bias&2?biasValue:0;
-	bias[2] = indirect.bias&4?biasValue:0;
-
-	// format
-	switch(indirect.fmt)
-	{
-		case ITF_8:
-			indcoord[0] = indmap[TextureSampler::ALP_SMP] + bias[0];
-			indcoord[1] = indmap[TextureSampler::BLU_SMP] + bias[1];
-			indcoord[2] = indmap[TextureSampler::GRN_SMP] + bias[2];
-			AlphaBump = AlphaBump & 0xf8;
-			break;
-		case ITF_5:
-			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x1f) + bias[0];
-			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x1f) + bias[1];
-			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x1f) + bias[2];
-			AlphaBump = AlphaBump & 0xe0;
-			break;
-		case ITF_4:
-			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x0f) + bias[0];
-			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x0f) + bias[1];
-			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x0f) + bias[2];
-			AlphaBump = AlphaBump & 0xf0;
-			break;
-		case ITF_3:
-			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x07) + bias[0];
-			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x07) + bias[1];
-			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x07) + bias[2];
-			AlphaBump = AlphaBump & 0xf8;
-			break;
-		default:
-			PanicAlert("Tev::Indirect");
-			return;
-	}
-
-	s64 indtevtrans[2] = { 0,0 };
-
-	// matrix multiply
-	int indmtxid = indirect.mid & 3;
-	if (indmtxid)
-	{
-		IND_MTX &indmtx = bpmem.indmtx[indmtxid - 1];
-		int scale = ((u32)indmtx.col0.s0 << 0) |
-					((u32)indmtx.col1.s1 << 2) |
-					((u32)indmtx.col2.s2 << 4);
-
-		int shift;
-
-		switch (indirect.mid & 12)
-		{
-			case 0:
-				shift = 3 + (17 - scale);
-				indtevtrans[0] = indmtx.col0.ma * indcoord[0] + indmtx.col1.mc * indcoord[1] + indmtx.col2.me * indcoord[2];
-				indtevtrans[1] = indmtx.col0.mb * indcoord[0] + indmtx.col1.md * indcoord[1] + indmtx.col2.mf * indcoord[2];
-				break;
-			case 4: // s matrix
-				shift = 8 + (17 - scale);
-				indtevtrans[0] = s * indcoord[0];
-				indtevtrans[1] = t * indcoord[0];
-				break;
-			case 8: // t matrix
-				shift = 8 + (17 - scale);
-				indtevtrans[0] = s * indcoord[1];
-				indtevtrans[1] = t * indcoord[1];
-				break;
-			default:
-				return;
-		}
-
-		indtevtrans[0] = shift >= 0 ? indtevtrans[0] >> shift : indtevtrans[0] << -shift;
-		indtevtrans[1] = shift >= 0 ? indtevtrans[1] >> shift : indtevtrans[1] << -shift;
-	}
-
-	if (indirect.fb_addprev)
-	{
-		TexCoord.s += (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
-		TexCoord.t += (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
-	}
-	else
-	{
-		TexCoord.s = (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
-		TexCoord.t = (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
-	}
-}
-
-void Tev::Draw()
-{
-	_assert_(Position[0] >= 0 && Position[0] < EFB_WIDTH);
-	_assert_(Position[1] >= 0 && Position[1] < EFB_HEIGHT);
-
-	INCSTAT(swstats.thisFrame.tevPixelsIn);
-
-	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-	{
-		int stageNum2 = stageNum >> 1;
-		int stageOdd = stageNum&1;
-
-		u32 texcoordSel = bpmem.tevindref.getTexCoord(stageNum);
-		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
-
-		const TEXSCALE& texscale = bpmem.texscale[stageNum2];
-		s32 scaleS = stageOdd ? texscale.ss1:texscale.ss0;
-		s32 scaleT = stageOdd ? texscale.ts1:texscale.ts0;
-
-		TextureSampler::Sample(Uv[texcoordSel].s >> scaleS, Uv[texcoordSel].t >> scaleT,
-			IndirectLod[stageNum], IndirectLinear[stageNum], texmap, IndirectTex[stageNum]);
-
-#if ALLOW_TEV_DUMPS
-		if (g_SWVideoConfig.bDumpTevStages)
-		{
-			u8 stage[4] = { IndirectTex[stageNum][TextureSampler::ALP_SMP],
-							IndirectTex[stageNum][TextureSampler::BLU_SMP],
-							IndirectTex[stageNum][TextureSampler::GRN_SMP],
-							255};
-			DebugUtil::DrawTempBuffer(stage, INDIRECT + stageNum);
-		}
-#endif
-	}
-
-	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-	{
-		int stageNum2 = stageNum >> 1;
-		int stageOdd = stageNum&1;
-		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
-		TevKSel &kSel = bpmem.tevksel[stageNum2];
-
-		// stage combiners
-		TevStageCombiner::ColorCombiner &cc = bpmem.combiners[stageNum].colorC;
-		TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[stageNum].alphaC;
-
-		int texcoordSel = order.getTexCoord(stageOdd);
-		int texmap = order.getTexMap(stageOdd);
-
-		Indirect(stageNum, Uv[texcoordSel].s, Uv[texcoordSel].t);
-
-		// sample texture
-		if (order.getEnable(stageOdd))
-		{
-			// RGBA
-			u8 texel[4];
-
-			TextureSampler::Sample(TexCoord.s, TexCoord.t, TextureLod[stageNum], TextureLinear[stageNum], texmap, texel);
-
-#if ALLOW_TEV_DUMPS
-			if (g_SWVideoConfig.bDumpTevTextureFetches)
-				DebugUtil::DrawTempBuffer(texel, DIRECT_TFETCH + stageNum);
-#endif
-
-			int swaptable = ac.tswap * 2;
-
-			TexColor[RED_C] = texel[bpmem.tevksel[swaptable].swap1];
-			TexColor[GRN_C] = texel[bpmem.tevksel[swaptable].swap2];
-			swaptable++;
-			TexColor[BLU_C] = texel[bpmem.tevksel[swaptable].swap1];
-			TexColor[ALP_C] = texel[bpmem.tevksel[swaptable].swap2];
-		}
-
-		// set konst for this stage
-		int kc = kSel.getKC(stageOdd);
-		int ka = kSel.getKA(stageOdd);
-		StageKonst[RED_C] = *(m_KonstLUT[kc][RED_C]);
-		StageKonst[GRN_C] = *(m_KonstLUT[kc][GRN_C]);
-		StageKonst[BLU_C] = *(m_KonstLUT[kc][BLU_C]);
-		StageKonst[ALP_C] = *(m_KonstLUT[ka][ALP_C]);
-
-		// set color
-		SetRasColor(order.getColorChan(stageOdd), ac.rswap * 2);
-
-		// combine inputs
-		if (cc.bias != 3)
-			DrawColorRegular(cc);
-		else
-			DrawColorCompare(cc);
-
-		if (cc.clamp)
-		{
-			Reg[cc.dest][RED_C] = Clamp255(Reg[cc.dest][RED_C]);
-			Reg[cc.dest][GRN_C] = Clamp255(Reg[cc.dest][GRN_C]);
-			Reg[cc.dest][BLU_C] = Clamp255(Reg[cc.dest][BLU_C]);
-		}
-		else
-		{
-			Reg[cc.dest][RED_C] = Clamp1024(Reg[cc.dest][RED_C]);
-			Reg[cc.dest][GRN_C] = Clamp1024(Reg[cc.dest][GRN_C]);
-			Reg[cc.dest][BLU_C] = Clamp1024(Reg[cc.dest][BLU_C]);
-		}
-
-		if (ac.bias != 3)
-			DrawAlphaRegular(ac);
-		else
-			DrawAlphaCompare(ac);
-
-		if (ac.clamp)
-			Reg[ac.dest][ALP_C] = Clamp255(Reg[ac.dest][ALP_C]);
-		else
-			Reg[ac.dest][ALP_C] = Clamp1024(Reg[ac.dest][ALP_C]);
-
-#if ALLOW_TEV_DUMPS
-		if (g_SWVideoConfig.bDumpTevStages)
-		{
-			u8 stage[4] = {(u8)Reg[0][RED_C], (u8)Reg[0][GRN_C], (u8)Reg[0][BLU_C], (u8)Reg[0][ALP_C]};
-			DebugUtil::DrawTempBuffer(stage, DIRECT + stageNum);
-		}
-#endif
-	}
-
-	// convert to 8 bits per component
-	// the results of the last tev stage are put onto the screen,
-	// regardless of the used destination register - TODO: Verify!
-	u32 color_index = bpmem.combiners[bpmem.genMode.numtevstages].colorC.dest;
-	u32 alpha_index = bpmem.combiners[bpmem.genMode.numtevstages].alphaC.dest;
-	u8 output[4] = {(u8)Reg[alpha_index][ALP_C], (u8)Reg[color_index][BLU_C], (u8)Reg[color_index][GRN_C], (u8)Reg[color_index][RED_C]};
-
-	if (!TevAlphaTest(output[ALP_C]))
-		return;
-
-	// z texture
-	if (bpmem.ztex2.op)
-	{
-		u32 ztex = bpmem.ztex1.bias;
-		switch (bpmem.ztex2.type)
-		{
-			case 0: // 8 bit
-				ztex += TexColor[ALP_C];
-				break;
-			case 1: // 16 bit
-				ztex += TexColor[ALP_C] << 8 | TexColor[RED_C];
-				break;
-			case 2: // 24 bit
-				ztex += TexColor[RED_C] << 16 | TexColor[GRN_C] << 8 | TexColor[BLU_C];
-				break;
-		}
-
-		if (bpmem.ztex2.op == ZTEXTURE_ADD)
-			ztex += Position[2];
-
-		Position[2] = ztex & 0x00ffffff;
-	}
-
-	// fog
-	if (bpmem.fog.c_proj_fsel.fsel)
-	{
-		float ze;
-
-		if (bpmem.fog.c_proj_fsel.proj == 0)
-		{
-			// perspective
-			// ze = A/(B - (Zs >> B_SHF))
-			s32 denom = bpmem.fog.b_magnitude - (Position[2] >> bpmem.fog.b_shift);
-			//in addition downscale magnitude and zs to 0.24 bits
-			ze = (bpmem.fog.a.GetA() * 16777215.0f) / (float)denom;
-		} 
-		else 
-		{
-			// orthographic
-			// ze = a*Zs
-			//in addition downscale zs to 0.24 bits
-			ze = bpmem.fog.a.GetA() * ((float)Position[2] / 16777215.0f);
-
-		}
-
-		if(bpmem.fogRange.Base.Enabled)
-		{
-			// TODO: This is untested and should definitely be checked against real hw.
-			// - No idea if offset is really normalized against the viewport width or against the projection matrix or yet something else
-			// - scaling of the "k" coefficient isn't clear either.
-
-			// First, calculate the offset from the viewport center (normalized to 0..1)
-			float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)swxfregs.viewport.wd;
-			// Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value.
-			int index = (int) (9 - std::abs(offset) * 9.f);
-			index = (index < 0) ? 0 : (index > 9) ? 9 : index; // TODO: Shouldn't be necessary!
-			// Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor)
-			float k = bpmem.fogRange.K[index/2].GetValue(index%2) * 4.f;
-			float x_adjust = sqrt(offset*offset + k*k)/k;
-			ze *= x_adjust; // NOTE: This is basically dividing by a cosine (hidden behind GXInitFogAdjTable): 1/cos = c/b = sqrt(a^2+b^2)/b
-		}
-
-		ze -= bpmem.fog.c_proj_fsel.GetC();
-
-		// clamp 0 to 1
-		float fog = (ze<0.0f) ? 0.0f : ((ze>1.0f) ? 1.0f : ze);
-
-		switch (bpmem.fog.c_proj_fsel.fsel)
-		{
-			case 4: // exp
-				fog = 1.0f - pow(2.0f, -8.0f * fog);
-				break;
-			case 5: // exp2
-				fog = 1.0f - pow(2.0f, -8.0f * fog * fog);
-				break;
-			case 6: // backward exp
-				fog = 1.0f - fog;
-				fog = pow(2.0f, -8.0f * fog);
-				break;
-			case 7: // backward exp2
-				fog = 1.0f - fog;
-				fog = pow(2.0f, -8.0f * fog * fog);
-				break;
-		}
-
-		// lerp from output to fog color
-		u32 fogInt = (u32)(fog * 256);
-		u32 invFog = 256 - fogInt;
-
-		output[RED_C] = (output[RED_C] * invFog + fogInt * bpmem.fog.color.r) >> 8;
-		output[GRN_C] = (output[GRN_C] * invFog + fogInt * bpmem.fog.color.g) >> 8;
-		output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8;
-	}
-
-	bool late_ztest = !bpmem.zcontrol.early_ztest || !g_SWVideoConfig.bZComploc;
-	if (late_ztest && bpmem.zmode.testenable)
-	{
-		// TODO: Check against hw if these values get incremented even if depth testing is disabled
-		SWPixelEngine::pereg.IncZInputQuadCount(false);
-
-		if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2]))
-			return;
-
-		SWPixelEngine::pereg.IncZOutputQuadCount(false);
-	}
-
-#if ALLOW_TEV_DUMPS
-	if (g_SWVideoConfig.bDumpTevStages)
-	{
-		for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
-			DebugUtil::CopyTempBuffer(Position[0], Position[1], INDIRECT, i, "Indirect");
-		for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
-			DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT, i, "Stage");
-	}
-
-	if (g_SWVideoConfig.bDumpTevTextureFetches)
-	{
-		for (u32 i = 0; i <= bpmem.genMode.numtevstages; ++i)
-		{
-			TwoTevStageOrders &order = bpmem.tevorders[i >> 1];
-			if (order.getEnable(i & 1))
-				DebugUtil::CopyTempBuffer(Position[0], Position[1], DIRECT_TFETCH, i, "TFetch");
-		}
-	}
-#endif
-
-	INCSTAT(swstats.thisFrame.tevPixelsOut);
-	SWPixelEngine::pereg.IncBlendInputQuadCount();
-
-	EfbInterface::BlendTev(Position[0], Position[1], output);
-}
-
-void Tev::SetRegColor(int reg, int comp, bool konst, s16 color)
-{
-	if (konst)
-	{
-		KonstantColors[reg][comp] = color;
-	}
-	else
-	{
-		Reg[reg][comp] = color;
-	}
-}
-
-void Tev::DoState(PointerWrap &p)
-{
-	p.DoArray(Reg, sizeof(Reg));
-	
-	p.DoArray(KonstantColors, sizeof(KonstantColors));
-	p.DoArray(TexColor,4);
-	p.DoArray(RasColor,4);
-	p.DoArray(StageKonst,4);
-	p.DoArray(Zero16,4);
-
-	p.DoArray(FixedConstants,9);
-	p.Do(AlphaBump);
-	p.DoArray(IndirectTex, sizeof(IndirectTex));
-	p.Do(TexCoord);
-
-	p.DoArray(m_BiasLUT,4);
-	p.DoArray(m_ScaleLShiftLUT,4);
-	p.DoArray(m_ScaleRShiftLUT,4);
-
-	p.DoArray(Position,3);
-	p.DoArray(Color, sizeof(Color));
-	p.DoArray(Uv, 8);
-	p.DoArray(IndirectLod,4);
-	p.DoArray(IndirectLinear,4);
-	p.DoArray(TextureLod,16);
-	p.DoArray(TextureLinear,16);
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h
deleted file mode 100644
index fee3c8022e..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEV_H_
-#define _TEV_H_
-
-#include "BPMemLoader.h"
-#include "ChunkFile.h"
-
-class Tev
-{ 
-	struct InputRegType
-	{
-		unsigned a : 8;
-		unsigned b : 8;
-		unsigned c : 8;
-		signed   d : 11;
-	};
-
-	struct TextureCoordinateType
-	{
-		signed s : 24;
-		signed t : 24;
-	};
-
-	// color order: ABGR
-	s16 Reg[4][4];
-	s16 KonstantColors[4][4];
-	s16 TexColor[4];
-	s16 RasColor[4];
-	s16 StageKonst[4];
-	s16 Zero16[4];
-
-	s16 FixedConstants[9];
-	u8 AlphaBump;
-	u8 IndirectTex[4][4];
-	TextureCoordinateType TexCoord;
-
-	s16 *m_ColorInputLUT[16][3];
-	s16 *m_AlphaInputLUT[8];        // values must point to ABGR color
-	s16 *m_KonstLUT[32][4];
-	s16 m_BiasLUT[4];
-	u8 m_ScaleLShiftLUT[4];
-	u8 m_ScaleRShiftLUT[4];
-
-	// enumeration for color input LUT
-	enum
-	{
-		BLU_INP,
-		GRN_INP,
-		RED_INP		
-	};
-
-	enum BufferBase
-	{
-		DIRECT = 0,
-		DIRECT_TFETCH = 16,
-		INDIRECT = 32
-	};
-
-	void SetRasColor(int colorChan, int swaptable);
-
-	void DrawColorRegular(TevStageCombiner::ColorCombiner &cc);
-	void DrawColorCompare(TevStageCombiner::ColorCombiner &cc);
-	void DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac);
-	void DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac);
-
-	void Indirect(unsigned int stageNum, s32 s, s32 t);
-
-public:
-	s32 Position[3];
-	u8 Color[2][4]; // must be RGBA for correct swap table ordering
-	TextureCoordinateType Uv[8];
-	s32 IndirectLod[4];
-	bool IndirectLinear[4];
-	s32 TextureLod[16];
-	bool TextureLinear[16];
-
-	void Init();
-
-	void Draw();
-
-	void SetRegColor(int reg, int comp, bool konst, s16 color);
-
-	enum { ALP_C, BLU_C, GRN_C, RED_C };
-
-	void DoState(PointerWrap &p);
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
deleted file mode 100644
index 9874e13449..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
+++ /dev/null
@@ -1,1435 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "TextureEncoder.h"
-#include "EfbInterface.h"
-#include "BPMemLoader.h"
-
-#include "LookUpTables.h"
-#include "TextureDecoder.h"
-
-
-namespace TextureEncoder
-{
-
-inline void RGBA_to_RGBA8(u8 *src, u8 &r, u8 &g, u8 &b, u8 &a)
-{
-	u32 srcColor = *(u32*)src;
-	a = Convert6To8(srcColor & 0x3f);
-	b = Convert6To8((srcColor >> 6) & 0x3f);
-	g = Convert6To8((srcColor >> 12)& 0x3f);
-	r = Convert6To8((srcColor >> 18)& 0x3f);
-}
-
-inline void RGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
-{
-	u32 srcColor = *(u32*)src;
-	b = Convert6To8((srcColor >> 6) & 0x3f);
-	g = Convert6To8((srcColor >> 12)& 0x3f);
-	r = Convert6To8((srcColor >> 18)& 0x3f);
-}
-
-inline u8 RGB8_to_I(u8 r, u8 g, u8 b)
-{
-	// values multiplied by 256 to keep math integer
-	u16 val = 4096 + 66 * r + 129 * g + 25 * b;
-	return val >> 8;
-}
-
-// box filter sampling averages 4 samples with the source texel being the top left of the box
-// components are scaled to the range 0-255 after all samples are taken
-
-inline void boxfilterRGBA_to_RGBA8(u8 *src, u8 &r, u8 &g, u8 &b, u8 &a)
-{
-	u16 r16 = 0, g16 = 0, b16 = 0, a16 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-			u32 srcColor = *(u32*)src;
-
-			a16 += srcColor & 0x3f;
-			b16 += (srcColor >> 6) & 0x3f;
-			g16 += (srcColor >> 12) & 0x3f;
-			r16 += (srcColor >> 18) & 0x3f;
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	r = r16 + (r16 >> 6);
-	g = g16 + (g16 >> 6);
-	b = b16 + (b16 >> 6);
-	a = a16 + (a16 >> 6);
-}
-
-inline void boxfilterRGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
-{
-	u16 r16 = 0, g16 = 0, b16 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-			u32 srcColor = *(u32*)src;
-
-			b16 += (srcColor >> 6) & 0x3f;
-			g16 += (srcColor >> 12) & 0x3f;
-			r16 += (srcColor >> 18) & 0x3f;
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	r = r16 + (r16 >> 6);
-	g = g16 + (g16 >> 6);
-	b = b16 + (b16 >> 6);
-}
-
-inline void boxfilterRGBA_to_x8(u8 *src, u8 &x8, int shift)
-{
-	u16 x16 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-			u32 srcColor = *(u32*)src;
-
-			x16 += (srcColor >> shift) & 0x3f;
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	x8 = x16 + (x16 >> 6);
-}
-
-inline void boxfilterRGBA_to_xx8(u8 *src, u8 &x1, u8 &x2, int shift1, int shift2)
-{
-	u16 x16_1 = 0;
-	u16 x16_2 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-			u32 srcColor = *(u32*)src;
-
-			x16_1 += (srcColor >> shift1) & 0x3f;
-			x16_2 += (srcColor >> shift2) & 0x3f;
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	x1 = x16_1 + (x16_1 >> 6);
-	x2 = x16_2 + (x16_2 >> 6);
-}
-
-inline void boxfilterRGB_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
-{
-	u16 r16 = 0, g16 = 0, b16 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-			b16 += src[0];
-			g16 += src[1];
-			r16 += src[2];
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	r = r16 >> 2;
-	g = g16 >> 2;
-	b = b16 >> 2;
-}
-
-inline void boxfilterRGB_to_x8(u8 *src, u8 &x8, int comp)
-{
-	u16 x16 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-
-			x16 += src[comp];
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	x8 = x16 >> 2;
-}
-
-inline void boxfilterRGB_to_xx8(u8 *src, u8 &x1, u8 &x2, int comp1, int comp2)
-{
-	u16 x16_1 = 0;
-	u16 x16_2 = 0;
-
-	for (int y = 0; y < 2; y++)
-	{
-		for (int x = 0; x < 2; x++)
-		{
-
-			x16_1 += src[comp1];
-			x16_2 += src[comp2];
-
-			src += 3; // move to next pixel
-		}
-		src += (640 - 2) * 3; // move to next line
-	}
-
-	x1 = x16_1 >> 2;
-	x2 = x16_2 >> 2;
-}
-
-void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16 &sBlkCount, u16 &tBlkCount, u16 &sBlkSize, u16 &tBlkSize)
-{
-	// if half_scale is 1 then the size is cut in half
-	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
-	u32 height = bpmem.copyTexSrcWH.y >> bpmem.triggerEFBCopy.half_scale;
-
-	sBlkCount = (width >> blkWidthLog2) + 1;
-	tBlkCount = (height >> blkHeightLog2) + 1;
-
-	sBlkSize = 1 << blkWidthLog2;
-	tBlkSize = 1 << blkHeightLog2;
-}
-
-void SetSpans(int sBlkSize, int tBlkSize, s32 &tSpan, s32 &sBlkSpan, s32 &tBlkSpan, s32 &writeStride)
-{
-	// width is 1 less than the number of pixels of width
-	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
-	u32 alignedWidth = (width + sBlkSize) & (~(sBlkSize-1));
-
-	u32 readStride = 3 << bpmem.triggerEFBCopy.half_scale;
-
-	tSpan = (640 - sBlkSize) * readStride; // bytes to advance src pointer after each row of texels in a block
-	sBlkSpan = ((-640 * tBlkSize) + sBlkSize) * readStride; // bytes to advance src pointer after each block
-	tBlkSpan = ((640 * tBlkSize) - alignedWidth) * readStride; // bytes to advance src pointer after each row of blocks
-
-	writeStride = bpmem.copyMipMapStrideChannels * 32;
-}
-
-#define ENCODE_LOOP_BLOCKS									\
-		for (int tBlk = 0; tBlk < tBlkCount; tBlk++) {		\
-			dst = dstBlockStart;							\
-			for (int sBlk = 0; sBlk < sBlkCount; sBlk++) {	\
-				for (int t = 0; t < tBlkSize; t++) {		\
-					for (int s = 0; s < sBlkSize; s++) {	\
-
-
-#define ENCODE_LOOP_SPANS									\
-					}										\
-					src += tSpan;							\
-				}											\
-				src += sBlkSpan;							\
-			}												\
-			src += tBlkSpan;								\
-			dstBlockStart += writeStride;					\
-		}													\
-
-#define ENCODE_LOOP_SPANS2									\
-					}										\
-					src += tSpan;							\
-				}											\
-				src += sBlkSpan;							\
-				dst += 32;									\
-			}												\
-			src += tBlkSpan;								\
-			dstBlockStart += writeStride;					\
-		}													\
-
-void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u8 r, g, b, a;
-	u32 readStride = 3;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_I4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			RGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst = RGB8_to_I(r, g, b) & 0xf0;
-
-			RGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst |= RGB8_to_I(r, g, b) >> 4;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_I8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			RGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst++ = RGB8_to_I(r, g, b);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			RGBA_to_RGBA8(src, r, g, b, a);
-			src += readStride;
-			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			RGBA_to_RGBA8(src, r, g, b, a);
-			src += readStride;
-			*dst++ = a;
-			*dst++ = RGB8_to_I(r, g, b);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB565:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-
-			u16 val = ((srcColor >> 8) & 0xf800) | ((srcColor >> 7) & 0x07e0) | ((srcColor >> 7) & 0x001e);
-			*(u16*)dst = Common::swap16(val);
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB5A3:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-
-			u16 alpha = (srcColor << 9) & 0x7000;
-			u16 val;
-			if (alpha == 0x7000) // 555
-				val = 0x8000 | ((srcColor >> 9) & 0x7c00) | ((srcColor >> 8) & 0x03e0) | ((srcColor >> 7) & 0x001e);
-			else // 4443
-				val = alpha | ((srcColor >> 12) & 0x0f00) | ((srcColor >> 10) & 0x00f0) | ((srcColor >> 8) & 0x000f);
-
-			*(u16*)dst = Common::swap16(val);
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGBA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			RGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_R4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-			*dst = (srcColor >> 16) & 0xf0;
-
-			srcColor = *(u32*)src;
-			src += readStride;
-			*dst |= (srcColor >> 20) & 0x0f;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-			*dst++ = ((srcColor << 2) & 0xf0) | ((srcColor >> 20) & 0x0f);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-			*dst++ = Convert6To8(srcColor & 0x3f);
-			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_A8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			*dst++ = Convert6To8(srcColor & 0x3f);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_R8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_G8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_B8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RG8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
-			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_GB8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u32 srcColor = *(u32*)src;
-			src += readStride;
-			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
-			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;
-	}
-}
-
-
-void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u8 r, g, b, a;
-	u32 readStride = 6;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_I4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst = RGB8_to_I(r, g, b) & 0xf0;
-
-			boxfilterRGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst |= RGB8_to_I(r, g, b) >> 4;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_I8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-			*dst++ = RGB8_to_I(r, g, b);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-			src += readStride;
-			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-			src += readStride;
-			*dst++ = a;
-			*dst++ = RGB8_to_I(r, g, b);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB565:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGB8(src, r, g, b);
-			src += readStride;
-
-			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
-			*(u16*)dst = Common::swap16(val);
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB5A3:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-			src += readStride;
-
-			u16 val;
-			if (a >= 224) // 5551
-				val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
-			else // 4443
-				val = ((a << 7) & 0x7000) | ((r << 4) & 0x0f00) | (g & 0x00f0) | ((b >> 4) & 0x000f);
-
-			*(u16*)dst = Common::swap16(val);
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGBA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_R4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_x8(src, r, 18);
-			src += readStride;
-			*dst = r & 0xf0;
-
-			boxfilterRGBA_to_x8(src, r, 18);
-			src += readStride;
-			*dst |= r >> 4;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_xx8(src, r, a, 18, 0);
-			src += readStride;
-			*dst++ = (a & 0xf0) | (r >> 4);
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_xx8(src, r, a, 18, 0);
-			src += readStride;
-			*dst++ = a;
-			*dst++ = r;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_A8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_x8(src, a, 0);
-			*dst++ = a;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_R8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_x8(src, r, 18);
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_G8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_x8(src, g, 12);
-			*dst++ = g;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_B8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_x8(src, b, 6);
-			*dst++ = b;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RG8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_xx8(src, r, g, 18, 12);
-			src += readStride;
-			*dst++ = g;
-			*dst++ = r;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_GB8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGBA_to_xx8(src, g, b, 12, 6);
-			src += readStride;
-			*dst++ = b;
-			*dst++ = g;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-}
-
-void EncodeRGB8(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u32 readStride = 3;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_I4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst = RGB8_to_I(src[2], src[1], src[0]) & 0xf0;
-			src += readStride;
-
-			*dst |= RGB8_to_I(src[2], src[1], src[0]) >> 4;
-			src += readStride;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_I8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xf0 | (RGB8_to_I(src[2], src[1], src[0]) >> 4);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xff;
-			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
-
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB565:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u16 val = ((src[2] << 8) & 0xf800) | ((src[1] << 3) & 0x07e0) | ((src[0] >> 3) & 0x001e); 
-			*(u16*)dst = Common::swap16(val);
-			src += readStride;
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB5A3:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			u16 val = 0x8000 | ((src[2] << 7) & 0x7c00) | ((src[1] << 2) & 0x03e0) | ((src[0] >> 3) & 0x001e);
-			*(u16*)dst = Common::swap16(val);
-			src += readStride;
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGBA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			dst[0] = 0xff;
-			dst[1] = src[2];
-			dst[32] = src[1];
-			dst[33] = src[0];
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_R4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst = src[2] & 0xf0;
-			src += readStride;
-
-			*dst |= src[2] >> 4;
-			src += readStride;
-
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xf0 | (src[2] >> 4);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xff;
-			*dst++ = src[2];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_A8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xff;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_R8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[2];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_G8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[1];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_B8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[0];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RG8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[1];
-			*dst++ = src[2];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_GB8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[0];
-			*dst++ = src[1];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-}
-
-void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u8 r, g, b;
-	u32 readStride = 6;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_I4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			*dst = RGB8_to_I(r, g, b) & 0xf0;
-			src += readStride;
-
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			*dst |= RGB8_to_I(r, g, b) >> 4;
-			src += readStride;
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_I8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			*dst++ = RGB8_to_I(r, g, b);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			*dst++ = 0xf0 | (RGB8_to_I(r, g, b) >> 4);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_IA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			*dst++ = 0xff;
-			*dst++ = RGB8_to_I(r, g, b);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB565:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
-			*(u16*)dst = Common::swap16(val);
-			src += readStride;
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGB5A3:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			u16 val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
-			*(u16*)dst = Common::swap16(val);
-			src += readStride;
-			dst+=2;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_RGBA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, r, g, b);
-			dst[0] = 0xff;
-			dst[1] = r;
-			dst[32] = g;
-			dst[33] = b;
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_R4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, r, 2);
-			*dst = r & 0xf0;
-			src += readStride;
-
-			boxfilterRGB_to_x8(src, r, 2);
-			*dst |= r >> 4;
-			src += readStride;
-
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA4:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, r, 2);
-			*dst++ = 0xf0 | (r >> 4);
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RA8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, r, 2);
-			*dst++ = 0xff;
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_A8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = 0xff;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_R8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, r, 2);
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_G8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, g, 1);
-			*dst++ = g;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_B8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, b, 0);
-			*dst++ = b;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_RG8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_xx8(src, r, g, 2, 1);
-			*dst++ = g;
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_GB8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_xx8(src, g, b, 1, 0);
-			*dst++ = b;
-			*dst++ = g;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-}
-
-void EncodeZ24(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u32 readStride = 3;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_Z8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[2];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_Z16:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[1];
-			*dst++ = src[2];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_Z24X8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			dst[0] = 0xff;
-			dst[1] = src[2];
-			dst[32] = src[1];
-			dst[33] = src[0];
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_Z4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst = src[2] & 0xf0;
-			src += readStride;
-
-			*dst |= src[2] >> 4;
-			src += readStride;
-
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z8M:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[1];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z8L:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[0];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z16L:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			*dst++ = src[0];
-			*dst++ = src[1];
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-}
-
-void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
-{
-	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-	u32 readStride = 6;
-	u8 r, g, b;
-	u8 *dstBlockStart = dst;
-
-	switch(format)
-	{
-	case GX_TF_Z8:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, b, 2);
-			*dst++ = b;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_Z16:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_xx8(src, g, b, 1, 2);
-			*dst++ = b;
-			*dst++ = g;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_TF_Z24X8:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_RGB8(src, dst[33], dst[32], dst[1]); 
-			dst[0] = 255;
-			src += readStride;
-			dst += 2;
-		}
-		ENCODE_LOOP_SPANS2
-		break;
-
-	case GX_CTF_Z4:
-		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		sBlkSize /= 2;
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, b, 2);
-			*dst = b & 0xf0;
-			src += readStride;
-
-			boxfilterRGB_to_x8(src, b, 2);
-			*dst |= b >> 4;
-			src += readStride;
-
-			dst++;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z8M:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, g, 1);
-			*dst++ = g;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z8L:
-		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_x8(src, r, 0);
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	case GX_CTF_Z16L:
-		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-		ENCODE_LOOP_BLOCKS
-		{
-			boxfilterRGB_to_xx8(src, r, g, 0, 1);
-			*dst++ = g;
-			*dst++ = r;
-			src += readStride;
-		}
-		ENCODE_LOOP_SPANS
-		break;
-
-	default:
-		PanicAlert("Unknown texture copy format: 0x%x\n", format);
-		break;		
-	}
-}
-
-void Encode(u8 *dest_ptr)
-{
-	int pixelformat = bpmem.zcontrol.pixel_format;
-	bool bFromZBuffer = pixelformat == PIXELFMT_Z24;
-	bool bIsIntensityFmt = bpmem.triggerEFBCopy.intensity_fmt > 0;
-	u32 copyfmt = ((bpmem.triggerEFBCopy.target_pixel_format / 2) + ((bpmem.triggerEFBCopy.target_pixel_format & 1) * 8));        
-
-	// pack copy format information into a single variable
-	u32 format = copyfmt;
-	if (bFromZBuffer)
-	{
-		format |= _GX_TF_ZTF;
-		if (copyfmt == 11)
-			format = GX_TF_Z16;
-		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
-			format |= _GX_TF_CTF;
-	}
-	else
-		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
-			format |= _GX_TF_CTF;
-
-	u8 *src = EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer);
-
-	if (bpmem.triggerEFBCopy.half_scale)
-	{
-		if (pixelformat == PIXELFMT_RGBA6_Z24)
-			EncodeRGBA6halfscale(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_RGB8_Z24)
-			EncodeRGB8halfscale(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
-			EncodeRGB8halfscale(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_Z24)
-			EncodeZ24halfscale(dest_ptr, src, format);
-	}
-	else
-	{
-		if (pixelformat == PIXELFMT_RGBA6_Z24)
-			EncodeRGBA6(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_RGB8_Z24)
-			EncodeRGB8(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
-			EncodeRGB8(dest_ptr, src, format);
-		else if (pixelformat == PIXELFMT_Z24)
-			EncodeZ24(dest_ptr, src, format);
-	}
-}
-
-
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
deleted file mode 100644
index 0921b720ea..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _OPCODEDECODER_H_
-#define _OPCODEDECODER_H_
-
-#include "Common.h"
-
-namespace TextureEncoder
-{
-	void Encode(u8 *dest_ptr);
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
deleted file mode 100644
index 28a2aa84d9..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _TEXTURESAMPLER_H_
-#define _TEXTURESAMPLER_H_
-
-
-#include "Common.h"
-
-namespace TextureSampler
-{
-	void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample);
-
-	void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample);
-
-	enum { RED_SMP, GRN_SMP, BLU_SMP, ALP_SMP };
-}
-
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
deleted file mode 100644
index a1c2bd190a..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Common.h"
-
-#include <math.h>
-
-#include "TransformUnit.h"
-#include "XFMemLoader.h"
-#include "CPMemLoader.h"
-#include "BPMemLoader.h"
-#include "NativeVertexFormat.h"
-
-#include "Vec3.h"
-
-
-namespace TransformUnit
-{
-
-void MultiplyVec2Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
-{
-	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
-	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
-	result.z = 1.0f;
-}
-
-void MultiplyVec2Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
-{
-	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
-	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
-	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] + mat[11];
-}
-
-void MultiplyVec3Mat33(const Vec3 &vec, const float *mat, Vec3 &result)
-{
-	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z;
-	result.y = mat[3] * vec.x + mat[4] * vec.y + mat[5] * vec.z;
-	result.z = mat[6] * vec.x + mat[7] * vec.y + mat[8] * vec.z;
-}
-
-void MultiplyVec3Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
-{
-	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
-	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
-	result.z = 1.0f;
-}
-
-void MultiplyVec3Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
-{
-	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
-	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
-	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] * vec.z + mat[11];
-}
-
-void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
-{
-	result.x = proj[0] * vec.x + proj[1] * vec.z;
-	result.y = proj[2] * vec.y + proj[3] * vec.z;
-	//result.z = (proj[4] * vec.z + proj[5]);
-	result.z = (proj[4] * vec.z + proj[5]) * (1.0f - (float)1e-7);
-	result.w = -vec.z;
-}
-
-void MultipleVec3Ortho(const Vec3 &vec, const float *proj, Vec4 &result)
-{
-	result.x = proj[0] * vec.x + proj[1];
-	result.y = proj[2] * vec.y + proj[3];
-	result.z = proj[4] * vec.z + proj[5];
-	result.w = 1;
-}
-
-void TransformPosition(const InputVertexData *src, OutputVertexData *dst)
-{
-	const float* mat = (const float*)&swxfregs.posMatrices[src->posMtx * 4];
-	MultiplyVec3Mat34(src->position, mat, dst->mvPosition);
-
-	if (swxfregs.projection.type == GX_PERSPECTIVE)
-	{
-		MultipleVec3Perspective(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
-	}
-	else
-	{
-		MultipleVec3Ortho(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
-	}
-}
-
-void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst)
-{
-	const float* mat = (const float*)&swxfregs.normalMatrices[(src->posMtx & 31)  * 3];
-
-	if (nbt)
-	{
-		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
-		MultiplyVec3Mat33(src->normal[1], mat, dst->normal[1]);
-		MultiplyVec3Mat33(src->normal[2], mat, dst->normal[2]);
-		dst->normal[0].normalize();
-	}
-	else
-	{
-		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
-		dst->normal[0].normalize();
-	}
-}
-
-void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
-{
-	const Vec3 *src;
-	switch (texinfo.sourcerow)
-	{
-		case XF_SRCGEOM_INROW:
-			src = &srcVertex->position;
-			break;
-		case XF_SRCNORMAL_INROW:
-			src = &srcVertex->normal[0];
-			break;
-		case XF_SRCBINORMAL_T_INROW:
-			src = &srcVertex->normal[1];
-			break;
-		case XF_SRCBINORMAL_B_INROW:
-			src = &srcVertex->normal[2];
-			break;
-		default:
-			_assert_(texinfo.sourcerow >= XF_SRCTEX0_INROW && texinfo.sourcerow <= XF_SRCTEX7_INROW);
-			src = (Vec3*)srcVertex->texCoords[texinfo.sourcerow - XF_SRCTEX0_INROW];
-			break;
-	}
-
-	const float *mat = (const float*)&swxfregs.posMatrices[srcVertex->texMtx[coordNum] * 4];
-	Vec3 *dst = &dstVertex->texCoords[coordNum];
-
-	if (texinfo.projection == XF_TEXPROJ_ST)
-	{
-		if (texinfo.inputform == XF_TEXINPUT_AB11 || specialCase)
-			MultiplyVec2Mat24(*src, mat, *dst);
-		else
-			MultiplyVec3Mat24(*src, mat, *dst);
-	}
-	else // texinfo.projection == XF_TEXPROJ_STQ
-	{
-		_assert_(!specialCase);
-
-		if (texinfo.inputform == XF_TEXINPUT_AB11)
-			MultiplyVec2Mat34(*src, mat, *dst);
-		else
-			MultiplyVec3Mat34(*src, mat, *dst);
-	}
-
-	if (swxfregs.dualTexTrans)
-	{
-		Vec3 tempCoord;
-
-		// normalize
-		const PostMtxInfo &postInfo = swxfregs.postMtxInfo[coordNum];
-		const float *postMat = (const float*)&swxfregs.postMatrices[postInfo.index * 4];
-
-		if (specialCase)
-		{
-			// no normalization
-			// q of input is 1
-			// q of output is unknown
-			tempCoord.x = dst->x;
-			tempCoord.y = dst->y;
-
-			dst->x = postMat[0] * tempCoord.x + postMat[1] * tempCoord.y + postMat[2] + postMat[3];
-			dst->y = postMat[4] * tempCoord.x + postMat[5] * tempCoord.y + postMat[6] + postMat[7];
-			dst->z = 1.0f;
-		}
-		else
-		{
-			if (postInfo.normalize)
-				tempCoord = dst->normalized();
-			else
-				tempCoord = *dst;
-
-			MultiplyVec3Mat34(tempCoord, postMat, *dst);
-		}
-	}
-}
-
-struct LightPointer
-{
-	u32 reserved[3];
-	u8 color[4];
-	Vec3 cosatt;
-	Vec3 distatt;
-	Vec3 pos;
-	Vec3 dir;
-};
-
-inline void AddIntegerColor(const u8 *src, Vec3 &dst)
-{
-	dst.x += src[1];
-	dst.y += src[2];
-	dst.z += src[3];
-}
-
-inline void AddScaledIntegerColor(const u8 *src, float scale, Vec3 &dst)
-{
-	dst.x += src[1] * scale;
-	dst.y += src[2] * scale;
-	dst.z += src[3] * scale;
-}
-
-inline float Clamp(float val, float a, float b)
-{
-	return val<a?a:val>b?b:val;
-}
-
-inline float SafeDivide(float n, float d)
-{
-	return (d==0) ? (n>0?1:0) : n/d;
-}
-
-void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
-{
-	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
-
-	if (!(chan.attnfunc & 1))
-	{
-		// atten disabled
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				AddIntegerColor(light->color, lightCol);
-				break;
-			case LIGHTDIF_SIGN:
-				{
-					Vec3 ldir = (light->pos - pos).normalized();
-					float diffuse = ldir * normal;
-					AddScaledIntegerColor(light->color, diffuse, lightCol);
-				}
-				break;
-			case LIGHTDIF_CLAMP:
-				{
-					Vec3 ldir = (light->pos - pos).normalized();
-					float diffuse = max(0.0f, ldir * normal);
-					AddScaledIntegerColor(light->color, diffuse, lightCol);
-				}
-				break;
-			default: _assert_(0);
-		}
-	}
-	else // spec and spot
-	{
-		// not sure about divide by zero checks
-		Vec3 ldir = light->pos - pos;
-		float attn;
-
-		if (chan.attnfunc == 3) // spot
-		{ 
-			float dist2 = ldir.length2();
-			float dist = sqrtf(dist2);
-			ldir = ldir / dist;
-			attn = max(0.0f, ldir * light->dir);
-
-			float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
-			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
-			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-		}
-		else if (chan.attnfunc == 1) // specular
-		{ 
-			// donko - what is going on here?  655.36 is a guess but seems about right.
-			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
-			ldir.set(1.0f, attn, attn * attn);
-
-			float cosAtt = max(0.0f, light->cosatt * ldir);
-			float distAtt = light->distatt * ldir;
-			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-		}
-		else
-		{
-			PanicAlert("LightColor");
-			return;
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				AddScaledIntegerColor(light->color, attn, lightCol);
-				break;
-			case LIGHTDIF_SIGN:
-				{
-					float difAttn = ldir * normal;
-					AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
-				}
-				break;
-
-			case LIGHTDIF_CLAMP:
-				{
-					float difAttn = max(0.0f, ldir * normal);
-					AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
-				}
-				break;
-			default: _assert_(0);
-		}
-	}
-}
-
-void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
-{
-	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
-
-	if (!(chan.attnfunc & 1))
-	{
-		// atten disabled
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				lightCol += light->color[0];
-				break;
-			case LIGHTDIF_SIGN:
-				{
-					Vec3 ldir = (light->pos - pos).normalized();
-					float diffuse = ldir * normal;
-					lightCol += light->color[0] * diffuse;
-				}
-				break;
-			case LIGHTDIF_CLAMP:
-				{
-					Vec3 ldir = (light->pos - pos).normalized();
-					float diffuse = max(0.0f, ldir * normal);
-					lightCol += light->color[0] * diffuse;
-				}
-				break;
-			default: _assert_(0);
-		}
-	}
-	else // spec and spot
-	{
-		Vec3 ldir = light->pos - pos;
-		float attn;
-
-		if (chan.attnfunc == 3) // spot
-		{
-			float dist2 = ldir.length2();
-			float dist = sqrtf(dist2);
-			ldir = ldir / dist;
-			attn = max(0.0f, ldir * light->dir);
-
-			float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
-			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
-			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-		}
-		else /* if (chan.attnfunc == 1) */ // specular
-		{
-			// donko - what is going on here?  655.36 is a guess but seems about right.
-			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
-			ldir.set(1.0f, attn, attn * attn);
-
-			float cosAtt = light->cosatt * ldir;
-			float distAtt = light->distatt * ldir;
-			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				lightCol += light->color[0] * attn;
-				break;
-			case LIGHTDIF_SIGN:
-				{
-					float difAttn = ldir * normal;
-					lightCol += light->color[0] * attn * difAttn;
-				}
-				break;
-
-			case LIGHTDIF_CLAMP:
-				{
-					float difAttn = max(0.0f, ldir * normal);
-					lightCol += light->color[0] * attn * difAttn;
-				}
-				break;
-			default: _assert_(0);
-		}
-	}
-}
-
-void TransformColor(const InputVertexData *src, OutputVertexData *dst)
-{
-	for (u32 chan = 0; chan < swxfregs.nNumChans; chan++)
-	{
-		// abgr
-		u8 matcolor[4];
-		u8 chancolor[4];
-
-		// color
-		LitChannel &colorchan = swxfregs.color[chan];
-		if (colorchan.matsource)
-			*(u32*)matcolor = *(u32*)src->color[chan];  // vertex
-		else
-			*(u32*)matcolor = swxfregs.matColor[chan];
-
-		if (colorchan.enablelighting)
-		{
-			Vec3 lightCol;
-			if (colorchan.ambsource)
-			{
-				// vertex
-				lightCol.x = src->color[chan][1];
-				lightCol.y = src->color[chan][2];
-				lightCol.z = src->color[chan][3];
-			}
-			else
-			{
-				u8 *ambColor = (u8*)&swxfregs.ambColor[chan];
-				lightCol.x = ambColor[1];
-				lightCol.y = ambColor[2];
-				lightCol.z = ambColor[3];
-			}
-
-			u8 mask = colorchan.GetFullLightMask();
-			for (int i = 0; i < 8; ++i)
-			{
-				if (mask&(1<<i))
-					LightColor(dst->mvPosition, dst->normal[0], i, colorchan, lightCol);
-			}
-
-			float inv = 1.0f / 255.0f;
-			chancolor[1] = (u8)(matcolor[1] * Clamp(lightCol.x * inv, 0.0f, 1.0f));
-			chancolor[2] = (u8)(matcolor[2] * Clamp(lightCol.y * inv, 0.0f, 1.0f));
-			chancolor[3] = (u8)(matcolor[3] * Clamp(lightCol.z * inv, 0.0f, 1.0f));
-		}
-		else
-		{
-			*(u32*)chancolor = *(u32*)matcolor;
-		}
-
-		// alpha
-		LitChannel &alphachan = swxfregs.alpha[chan];
-		if (alphachan.matsource)
-			matcolor[0] = src->color[chan][0];  // vertex
-		else
-			matcolor[0] = swxfregs.matColor[chan] & 0xff;
-
-		if (swxfregs.alpha[chan].enablelighting)
-		{
-			float lightCol;
-			if (alphachan.ambsource)
-				lightCol = src->color[chan][0]; // vertex
-			else
-				lightCol = (float)(swxfregs.ambColor[chan] & 0xff);
-
-			u8 mask = alphachan.GetFullLightMask();
-			for (int i = 0; i < 8; ++i)
-			{
-				if (mask&(1<<i))
-					LightAlpha(dst->mvPosition, dst->normal[0], i, alphachan, lightCol);
-			}
-
-			chancolor[0] = (u8)(matcolor[0] * Clamp(lightCol / 255.0f, 0.0f, 1.0f));
-		}
-		else
-		{
-			chancolor[0] = matcolor[0];
-		}
-
-		// abgr -> rgba
-		*(u32*)dst->color[chan] = Common::swap32(*(u32*)chancolor);
-	}
-}
-
-void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase)
-{
-	for (u32 coordNum = 0; coordNum < swxfregs.numTexGens; coordNum++)
-	{
-		const TexMtxInfo &texinfo = swxfregs.texMtxInfo[coordNum];
-
-		switch (texinfo.texgentype)
-		{
-		case XF_TEXGEN_REGULAR:
-			TransformTexCoordRegular(texinfo, coordNum, specialCase, src, dst);
-			break;
-		case XF_TEXGEN_EMBOSS_MAP:
-			{
-				const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*texinfo.embosslightshift];
-
-				Vec3 ldir = (light->pos - dst->mvPosition).normalized();
-				float d1 = ldir * dst->normal[1];
-				float d2 = ldir * dst->normal[2];
-
-				dst->texCoords[coordNum].x = dst->texCoords[texinfo.embosssourceshift].x + d1;
-				dst->texCoords[coordNum].y = dst->texCoords[texinfo.embosssourceshift].y + d2;
-				dst->texCoords[coordNum].z = dst->texCoords[texinfo.embosssourceshift].z;
-			}
-			break;
-		case XF_TEXGEN_COLOR_STRGBC0:
-			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
-			dst->texCoords[coordNum].x = (float)dst->color[0][0] / 255.0f;
-			dst->texCoords[coordNum].y = (float)dst->color[0][1] / 255.0f;
-			dst->texCoords[coordNum].z = 1.0f;
-			break;
-		case XF_TEXGEN_COLOR_STRGBC1:
-			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
-			dst->texCoords[coordNum].x = (float)dst->color[1][0] / 255.0f;
-			dst->texCoords[coordNum].y = (float)dst->color[1][1] / 255.0f;
-			dst->texCoords[coordNum].z = 1.0f;
-			break;
-		default:
-			ERROR_LOG(VIDEO, "Bad tex gen type %i", texinfo.texgentype);
-		}
-	}
-
-	for (u32 coordNum = 0; coordNum < swxfregs.numTexGens; coordNum++)
-	{
-		dst->texCoords[coordNum][0] *= (bpmem.texcoords[coordNum].s.scale_minus_1 + 1);
-		dst->texCoords[coordNum][1] *= (bpmem.texcoords[coordNum].t.scale_minus_1 + 1);
-	}
-}
-
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
deleted file mode 100644
index d4b1502dcb..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VEC3_H
-#define _VEC3_H
-
-#include <stdlib.h>
-#include <math.h>
-#include "ChunkFile.h"
-
-class Vec3
-{
-public:
-	float x,y,z;
-	Vec3() { }
-	explicit Vec3(float f) {x=y=z=f;}
-	explicit Vec3(const float *f) {x=f[0]; y=f[1]; z=f[2];}
-	Vec3(const float _x, const float _y, const float _z) {
-		x=_x; y=_y; z=_z;
-	}
-	void set(const float _x, const float _y, const float _z) {
-		x=_x; y=_y; z=_z;
-	}
-	Vec3 operator + (const Vec3 &other) const {
-		return Vec3(x+other.x, y+other.y, z+other.z);
-	}
-	void operator += (const Vec3 &other) {
-		x+=other.x; y+=other.y; z+=other.z;
-	}
-	Vec3 operator -(const Vec3 &v) const {
-		return Vec3(x-v.x,y-v.y,z-v.z);
-	}
-	void operator -= (const Vec3 &other)
-	{
-		x-=other.x; y-=other.y; z-=other.z;
-	}
-	Vec3 operator -() const {
-		return Vec3(-x,-y,-z);
-	}
-
-	Vec3 operator * (const float f) const {
-		return Vec3(x*f,y*f,z*f);
-	}
-	Vec3 operator / (const float f) const {
-		float invf = (1.0f/f);
-		return Vec3(x*invf,y*invf,z*invf);
-	}
-	void operator /= (const float f)
-	{
-		*this = *this / f;
-	}
-	float operator * (const Vec3 &other) const {
-		return x*other.x + y*other.y + z*other.z;
-	}
-	void operator *= (const float f) {
-		*this = *this * f;
-	}
-	Vec3 scaled_by(const Vec3 &other) const {
-		return Vec3(x*other.x, y*other.y, z*other.z);
-	}
-
-	Vec3 operator %(const Vec3 &v) const {
-		return Vec3(y*v.z-z*v.y, z*v.x-x*v.z, x*v.y-y*v.x);
-	}  
-	float length2() const {
-		return x*x+y*y+z*z;
-	}
-	float length() const {
-		return sqrtf(length2());
-	}
-	float distance2_to(Vec3 &other)
-	{
-		return (other-(*this)).length2();
-	}
-	Vec3 normalized() const {
-		return (*this) / length();
-
-	}
-	void normalize() {
-		(*this) /= length();
-	}
-	float &operator [] (int i)
-	{
-		return *((&x) + i);
-	}
-	float operator [] (const int i) const
-	{
-		return *((&x) + i);
-	}
-	bool operator == (const Vec3 &other) const 
-	{
-		if (x==other.x && y==other.y && z==other.z)
-			return true;
-		else 
-			return false;
-	}
-	void setZero()
-	{
-		memset((void *)this,0,sizeof(float)*3);
-	}
-	void DoState(PointerWrap &p)
-	{
-		p.Do(x);
-		p.Do(y);
-		p.Do(z);
-	}
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
deleted file mode 100644
index a105e66eba..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#ifndef SW_VIDEO_BACKEND_H_
-#define SW_VIDEO_BACKEND_H_
-
-#include "VideoBackendBase.h"
-
-namespace SW
-{
-
-class VideoSoftware : public VideoBackend
-{
-	bool Initialize(void *&);
-	void Shutdown();
-
-	std::string GetName();
-
-	void EmuStateChange(EMUSTATE_CHANGE newState);
-
-	void RunLoop(bool enable);
-
-	void ShowConfig(void* parent);
-
-	void Video_Prepare();
-	void Video_Cleanup();
-
-	void Video_EnterLoop();
-	void Video_ExitLoop();
-	void Video_BeginField(u32, FieldType, u32, u32);
-	void Video_EndField();
-	
-	u32 Video_AccessEFB(EFBAccessType, u32, u32, u32);
-	u32 Video_GetQueryResult(PerfQueryType type);
-
-	void Video_AddMessage(const char* pstr, unsigned int milliseconds);
-	void Video_ClearMessages();
-	bool Video_Screenshot(const char* filename);
-
-	int Video_LoadTexture(char *imagedata, u32 width, u32 height);
-	void Video_DeleteTexture(int texID);
-	void Video_DrawTexture(int texID, float *coords);
-
-	void Video_SetRendering(bool bEnabled);
-
-	void Video_GatherPipeBursted();
-	bool Video_IsHiWatermarkActive();
-	bool Video_IsPossibleWaitingSetDrawDone();
-	void Video_AbortFrame();
-
-	readFn16  Video_CPRead16();
-	writeFn16 Video_CPWrite16();
-	readFn16  Video_PERead16();
-	writeFn16 Video_PEWrite16();
-	writeFn32 Video_PEWrite32();
-
-	void UpdateFPSDisplay(const char*);
-	unsigned int PeekMessages();
-
-	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
-	void DoState(PointerWrap &p);
-	
-public:
-	void CheckInvalidState();
-};
-
-}
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
deleted file mode 100644
index eea908edfc..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoConfigDiag.h"
-#include "VideoConfigDialog.h"
-
-#include "FileUtil.h"
-#include "Core.h"
-
-template <typename T>
-IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) :
-	wxSpinCtrl(parent, -1, label, wxDefaultPosition, wxDefaultSize, style),
-	m_setting(setting)
-{
-	SetRange(minVal, maxVal);
-	SetValue(m_setting);
-	Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &IntegerSetting::UpdateValue, this);
-}
-
-
-VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& _ininame) :
-	wxDialog(parent, -1,
-		wxString(wxT("Dolphin ")).append(StrToWxStr(title)).append(wxT(" Graphics Configuration")),
-		wxDefaultPosition, wxDefaultSize),
-	vconfig(g_SWVideoConfig),
-	ininame(_ininame)
-{
-	vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
-
-	wxNotebook* const notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize);	
-
-	// -- GENERAL --
-	{
-	wxPanel* const page_general= new wxPanel(notebook, -1, wxDefaultPosition);
-	notebook->AddPage(page_general, wxT("General"));
-	wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
-
-	// - rendering
-	{
-	wxStaticBoxSizer* const group_rendering = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Rendering"));
-	szr_general->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
-	wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
-	group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	// backend
-	wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
-	wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY, wxDefaultPosition);
-
-	std::vector<VideoBackend*>::const_iterator
-			it = g_available_video_backends.begin(),
-			itend = g_available_video_backends.end();
-	for (; it != itend; ++it)
-		choice_backend->AppendString(StrToWxStr((*it)->GetDisplayName()));
-
-	// TODO: How to get the translated plugin name?
-	choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
-	choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDialog::Event_Backend, this);
-
-	szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
-	szr_rendering->Add(choice_backend, 1, 0, 0);
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		label_backend->Disable();
-		choice_backend->Disable();
-	}
-
-	// rasterizer
-	szr_rendering->Add(new SettingCheckBox(page_general, wxT("Hardware rasterization"), wxT(""), vconfig.bHwRasterizer));
-	}
-
-	// - info
-	{
-	wxStaticBoxSizer* const group_info = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Overlay Information"));
-	szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
-	group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_info->Add(new SettingCheckBox(page_general, wxT("Various Statistics"), wxT(""), vconfig.bShowStats));
-	}
-	
-	// - utility
-	{
-	wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Utility"));
-	szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
-	group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_utility->Add(new SettingCheckBox(page_general, wxT("Dump Textures"), wxT(""), vconfig.bDumpTextures));
-	szr_utility->Add(new SettingCheckBox(page_general, wxT("Dump Objects"), wxT(""), vconfig.bDumpObjects));
-	szr_utility->Add(new SettingCheckBox(page_general, wxT("Dump Frames"), wxT(""), vconfig.bDumpFrames));
-
-	// - debug only
-	wxStaticBoxSizer* const group_debug_only_utility = new wxStaticBoxSizer(wxHORIZONTAL, page_general, wxT("Debug Only"));
-	group_utility->Add(group_debug_only_utility, 0, wxEXPAND | wxBOTTOM, 5);
-	wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, 5, 5);
-	group_debug_only_utility->Add(szr_debug_only_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_debug_only_utility->Add(new SettingCheckBox(page_general, wxT("Dump TEV Stages"), wxT(""), vconfig.bDumpTevStages));
-	szr_debug_only_utility->Add(new SettingCheckBox(page_general, wxT("Dump Texture Fetches"), wxT(""), vconfig.bDumpTevTextureFetches));
-	}
-
-	// - misc
-	{
-	wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Drawn Object Range"));
-	szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
-	group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_misc->Add(new U32Setting(page_general, wxT("Start"), vconfig.drawStart, 0, 100000));
-	szr_misc->Add(new U32Setting(page_general, wxT("End"), vconfig.drawEnd, 0, 100000));
-	}
-
-	page_general->SetSizerAndFit(szr_general);
-	}
-
-	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
-	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
-	szr_main->Add(new wxButton(this, wxID_OK, wxT("Close"), wxDefaultPosition),
-			0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
-
-	SetSizerAndFit(szr_main);
-	Center();
-	SetFocus();
-}
-
-VideoConfigDialog::~VideoConfigDialog()
-{
-	g_SWVideoConfig.Save((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str());
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
deleted file mode 100644
index a4ebedae62..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _VIDEOSOFTWARE_CONFIG_DIAG_H_
-#define _VIDEOSOFTWARE_CONFIG_DIAG_H_
-
-#include <vector>
-#include <string>
-
-#include "SWVideoConfig.h"
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-
-#include <wx/wx.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
-class VideoConfigDialog : public wxDialog
-{
-public:
-	VideoConfigDialog(wxWindow* parent, const std::string &title, const std::string& ininame);
-	~VideoConfigDialog();
-
-	void Event_Backend(wxCommandEvent &ev)
-	{
-		VideoBackend* new_backend = g_available_video_backends[ev.GetInt()];
-
-		if (g_video_backend != new_backend)
-		{
-			Close();
-
-			g_video_backend = new_backend;
-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = g_video_backend->GetName();
-
-			g_video_backend->ShowConfig(GetParent());
-		}
-		ev.Skip();
-	}
-
-protected:
-	SWVideoConfig& vconfig;
-	std::string ininame;
-};
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
deleted file mode 100644
index 4580bafad8..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "VideoCommon.h"
-
-#include "XFMemLoader.h"
-#include "CPMemLoader.h"
-#include "Clipper.h"
-#include "HW/Memmap.h"
-
-XFRegisters swxfregs;
-
-void InitXFMemory()
-{
-	memset(&swxfregs, 0, sizeof(swxfregs));
-}
-
-void XFWritten(u32 transferSize, u32 baseAddress)
-{
-	u32 topAddress = baseAddress + transferSize;
-
-	if (baseAddress <= 0x1026 && topAddress >= 0x1020)
-		Clipper::SetViewOffset();
-
-	// fix lights so invalid values don't trash the lighting computations	
-	if (baseAddress <= 0x067f && topAddress >= 0x0604)
-	{
-		u32* x = swxfregs.lights;
-
-		// go through all lights
-		for (int light = 0; light < 8; light++)
-		{
-			// skip to floating point values
-			x += 4;
-
-			for (int i = 0; i < 12; i++)
-			{
-				u32 xVal = *x;
-
-				// if the exponent is 255 then the number is inf or nan
-				if ((xVal & 0x7f800000) == 0x7f800000)
-					*x = 0;
-
-				x++;
-			}
-		}
-	}
-}
-
-void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
-{
-	u32 size = transferSize;
-
-	// do not allow writes past registers
-	if (baseAddress + transferSize > 0x1058)
-	{
-		INFO_LOG(VIDEO, "xf load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
-
-		if (baseAddress >= 0x1058)
-			size = 0;
-		else
-			size = 0x1058 - baseAddress;
-	}
-
-	if (size > 0)
-	{
-		memcpy_gc( &((u32*)&swxfregs)[baseAddress], pData, size * 4);
-		XFWritten(transferSize, baseAddress);
-	}
-}
-
-void SWLoadIndexedXF(u32 val, int array)
-{
-	int index = val >> 16;
-	int address = val & 0xFFF; //check mask
-	int size = ((val >> 12) & 0xF) + 1;
-	//load stuff from array to address in xf mem
-
-	u32 *pData = (u32*)Memory::GetPointer(arraybases[array] + arraystrides[array]*index);
-
-	// byteswap data
-	u32 buffer[16];
-	for (int i = 0; i < size; ++i)
-		buffer[i] = Common::swap32(*(pData + i));
-
-	SWLoadXFReg(size, address, buffer);
-}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
deleted file mode 100644
index 75e05110bf..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#ifndef _XFMEMLOADER_H_
-#define _XFMEMLOADER_H_
-
-
-#include "Common.h"
-
-/////////////
-// Lighting
-/////////////
-
-#define XF_TEXPROJ_ST   0
-#define XF_TEXPROJ_STQ  1
-
-#define XF_TEXINPUT_AB11 0
-#define XF_TEXINPUT_ABC1 1
-
-#define XF_TEXGEN_REGULAR       0
-#define XF_TEXGEN_EMBOSS_MAP    1 // used when bump mapping
-#define XF_TEXGEN_COLOR_STRGBC0 2
-#define XF_TEXGEN_COLOR_STRGBC1 3
-
-#define XF_SRCGEOM_INROW       0 // input is abc
-#define XF_SRCNORMAL_INROW     1 // input is abc
-#define XF_SRCCOLORS_INROW     2
-#define XF_SRCBINORMAL_T_INROW 3 // input is abc
-#define XF_SRCBINORMAL_B_INROW 4 // input is abc
-#define XF_SRCTEX0_INROW       5
-#define XF_SRCTEX1_INROW       6
-#define XF_SRCTEX2_INROW       7
-#define XF_SRCTEX3_INROW       8
-#define XF_SRCTEX4_INROW       9
-#define XF_SRCTEX5_INROW      10
-#define XF_SRCTEX6_INROW      11
-#define XF_SRCTEX7_INROW      12
-
-#define GX_SRC_REG 0
-#define GX_SRC_VTX 1
-
-struct Light
-{
-	u32 useless[3];
-	u32 color;    //rgba
-	float a0;  //attenuation
-	float a1;
-	float a2;
-	float k0;  //k stuff
-	float k1;
-	float k2;
-	union
-	{
-		struct {
-			float dpos[3];
-			float ddir[3]; // specular lights only
-		};
-		struct {
-			float sdir[3];
-			float shalfangle[3]; // specular lights only
-		};
-	};
-};
-
-#define LIGHTDIF_NONE  0
-#define LIGHTDIF_SIGN  1
-#define LIGHTDIF_CLAMP 2
-
-#define LIGHTATTN_SPEC 0 // specular attenuation
-#define LIGHTATTN_SPOT 1 // distance/spotlight attenuation
-#define LIGHTATTN_NONE 2
-#define LIGHTATTN_DIR  3
-
-#define GX_PERSPECTIVE  0
-#define GX_ORTHOGRAPHIC 1
-
-union LitChannel
-{
-	struct
-	{
-		u32 matsource      : 1;
-		u32 enablelighting : 1;
-		u32 lightMask0_3   : 4;
-		u32 ambsource      : 1;
-		u32 diffusefunc    : 2; // LIGHTDIF_X
-		u32 attnfunc       : 2; // LIGHTATTN_X
-		u32 lightMask4_7   : 4;
-		u32 unused         : 17;
-	};
-	u32 hex;
-	unsigned int GetFullLightMask() const
-	{
-		return enablelighting ? (lightMask0_3 | (lightMask4_7 << 4)) : 0;
-	}
-};
-
-union INVTXSPEC
-{
-	struct
-	{
-		u32 numcolors : 2;
-		u32 numnormals : 2; // 0 - nothing, 1 - just normal, 2 - normals and binormals
-		u32 numtextures : 4;
-		u32 unused : 24;
-	};
-	u32 hex;
-};
-
-union TXFMatrixIndexA
-{
-	struct
-	{
-		u32 PosNormalMtxIdx : 6;
-		u32 Tex0MtxIdx : 6;
-		u32 Tex1MtxIdx : 6;
-		u32 Tex2MtxIdx : 6;
-		u32 Tex3MtxIdx : 6;
-	};
-	struct
-	{
-		u32 Hex : 30;
-		u32 unused : 2;
-	};
-};
-
-union TXFMatrixIndexB
-{
-	struct
-	{
-		u32 Tex4MtxIdx : 6;
-		u32 Tex5MtxIdx : 6;
-		u32 Tex6MtxIdx : 6;
-		u32 Tex7MtxIdx : 6;
-	};
-	struct
-	{
-		u32 Hex : 24;
-		u32 unused : 8;
-	};
-};
-
-struct Viewport
-{
-	float wd;
-	float ht;
-	float zRange;
-	float xOrig;
-	float yOrig;
-	float farZ;
-};
-
-struct Projection
-{
-	float rawProjection[6];
-	u32 type;                      // only GX_PERSPECTIVE or GX_ORTHOGRAPHIC are allowed
-};
-
-union TexMtxInfo
-{
-	struct 
-	{
-		u32 unknown    : 1;
-		u32 projection : 1; // XF_TEXPROJ_X
-		u32 inputform  : 2; // XF_TEXINPUT_X
-		u32 texgentype : 3; // XF_TEXGEN_X
-		u32 sourcerow  : 5; // XF_SRCGEOM_X
-		u32 embosssourceshift : 3; // what generated texcoord to use
-		u32 embosslightshift  : 3; // light index that is used
-	};
-	u32 hex;
-};
-
-union PostMtxInfo
-{
-	struct 
-	{
-		u32 index : 6; // base row of dual transform matrix
-		u32 unused : 2;
-		u32 normalize : 1; // normalize before send operation
-	};
-	u32 hex;
-};
-
-struct XFRegisters
-{
-	u32 posMatrices[256];           // 0x0000 - 0x00ff
-	u32 unk0[768];                  // 0x0100 - 0x03ff
-	u32 normalMatrices[96];         // 0x0400 - 0x045f
-	u32 unk1[160];                  // 0x0460 - 0x04ff
-	u32 postMatrices[256];          // 0x0500 - 0x05ff
-	u32 lights[128];                // 0x0600 - 0x067f
-	u32 unk2[2432];                 // 0x0680 - 0x0fff
-	u32 error;                      // 0x1000
-	u32 diag;                       // 0x1001
-	u32 state0;                     // 0x1002
-	u32 state1;                     // 0x1003
-	u32 xfClock;                    // 0x1004
-	u32 clipDisable;                // 0x1005
-	u32 perf0;                      // 0x1006
-	u32 perf1;                      // 0x1007
-	INVTXSPEC hostinfo;             // 0x1008 number of textures,colors,normals from vertex input
-	u32 nNumChans;                  // 0x1009
-	u32 ambColor[2];                // 0x100a, 0x100b
-	u32 matColor[2];                // 0x100c, 0x100d
-	LitChannel color[2];            // 0x100e, 0x100f
-	LitChannel alpha[2];            // 0x1010, 0x1011
-	u32 dualTexTrans;               // 0x1012
-	u32 unk3;                       // 0x1013
-	u32 unk4;                       // 0x1014
-	u32 unk5;                       // 0x1015
-	u32 unk6;                       // 0x1016
-	u32 unk7;                       // 0x1017
-	TXFMatrixIndexA MatrixIndexA;   // 0x1018
-	TXFMatrixIndexB MatrixIndexB;   // 0x1019
-	Viewport viewport;              // 0x101a - 0x101f
-	Projection projection;          // 0x1020 - 0x1026
-	u32 unk8[24];                   // 0x1027 - 0x103e
-	u32 numTexGens;                 // 0x103f
-	TexMtxInfo texMtxInfo[8];       // 0x1040 - 0x1047
-	u32 unk9[8];                    // 0x1048 - 0x104f
-	PostMtxInfo postMtxInfo[8];     // 0x1050 - 0x1057
-};
-
-#define XFMEM_POSMATRICES        0x000
-#define XFMEM_POSMATRICES_END    0x100
-#define XFMEM_NORMALMATRICES     0x400
-#define XFMEM_NORMALMATRICES_END 0x460
-#define XFMEM_POSTMATRICES       0x500
-#define XFMEM_POSTMATRICES_END   0x600
-#define XFMEM_LIGHTS             0x600
-#define XFMEM_LIGHTS_END         0x680
-
-
-extern XFRegisters swxfregs;
-
-void InitXFMemory();
-
-void XFWritten(u32 transferSize, u32 baseAddress);
-
-void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData);
-
-void SWLoadIndexedXF(u32 val, int array);
-
-#endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
deleted file mode 100644
index b602b39925..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "stdafx.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
deleted file mode 100644
index 60f0912113..0000000000
--- a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-#define _WIN32_WINNT 0x501
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500       // Default value is 0x0400
-#endif
-
-#include <tchar.h>
-#include <windows.h> 
-
diff --git a/Source/TestSuite/ARAM/ARAM.vcxproj b/Source/TestSuite/ARAM/ARAM.vcxproj
deleted file mode 100644
index 1d85282060..0000000000
--- a/Source/TestSuite/ARAM/ARAM.vcxproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_aram.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\devkitPro\libogc\include;C:\devkitPro\libogc\include\ogc;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_aram.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/ARAM/Makefile b/Source/TestSuite/ARAM/Makefile
deleted file mode 100644
index fbdb823cad..0000000000
--- a/Source/TestSuite/ARAM/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/ARAM/source/dolphintest_aram.cpp b/Source/TestSuite/ARAM/source/dolphintest_aram.cpp
deleted file mode 100644
index d7b2a66532..0000000000
--- a/Source/TestSuite/ARAM/source/dolphintest_aram.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <aram.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <ogcsys.h>
-#include <gccore.h>
-#include <iostream>
-#include <iomanip>
-
-static void *xfb = NULL;
-static GXRModeObj *rmode = NULL;
-
-void Initialise();
-#define NUM_BLOCKS 10
-u32 aram_blocks[NUM_BLOCKS];
-u32 start_addr = -1;
-
-
-int main(int argc, char **argv)
-{
-	Initialise();
-	start_addr = AR_Init(aram_blocks, NUM_BLOCKS);
-	while(1)
-	{
-		PAD_ScanPads();
-		VIDEO_ClearFrameBuffer(rmode, xfb, 0);
-		std::cout<<"\x1b[2;0H"; // Position the cursor (on 2nd row)
-
-		std::cout << "Aram is " << (AR_GetDMAStatus() ? "In Progress" : "Idle") << std::endl;
-		std::cout << "Aram Start is 0x" << std::setbase(16) << start_addr << ", Allocated 0x" << AR_GetSize() << " Of memory" << std::setbase(10) << std::endl;
-		std::cout << "Internal Size is 0x" << std::setbase(16) << AR_GetInternalSize() << std::setbase(10) << std::endl;
-		VIDEO_WaitVSync();
-	}
-
-	return 0;
-}
-
-void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// This function initialises the attached controllers
-	PAD_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
diff --git a/Source/TestSuite/ASM/ASM.vcxproj b/Source/TestSuite/ASM/ASM.vcxproj
deleted file mode 100644
index ec5e82cee0..0000000000
--- a/Source/TestSuite/ASM/ASM.vcxproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B0723635-279A-44E0-80A6-FC21DBB7A4B4}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_asm.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\asm_float.cpp" />
-    <ClCompile Include="source\asm_integer.cpp" />
-    <ClCompile Include="source\asm_tables.cpp" />
-    <ClCompile Include="source\dolphintest_asm.cpp" />
-    <ClCompile Include="source\Helpers.cpp" />
-    <ClCompile Include="source\Init.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="source\asm_tables.h" />
-    <ClInclude Include="source\Defines.h" />
-    <ClInclude Include="source\Helpers.h" />
-    <ClInclude Include="source\Init.h" />
-    <ClInclude Include="source\Instructions.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/ASM/Makefile b/Source/TestSuite/ASM/Makefile
deleted file mode 100644
index 5fe87d1d8f..0000000000
--- a/Source/TestSuite/ASM/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -lfat -logc -lm 
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-run:
-	wiiload $(TARGET).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/ASM/source/Defines.h b/Source/TestSuite/ASM/source/Defines.h
deleted file mode 100644
index 0bfe36f498..0000000000
--- a/Source/TestSuite/ASM/source/Defines.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-#define u32 unsigned int
-#define u16 unsigned short
-#define u8 unsigned char
-#define s8 signed char
-#define s16 signed short
-#define s32 signed int
diff --git a/Source/TestSuite/ASM/source/Helpers.cpp b/Source/TestSuite/ASM/source/Helpers.cpp
deleted file mode 100644
index 9aad445846..0000000000
--- a/Source/TestSuite/ASM/source/Helpers.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#include "Defines.h"
-
-u32 GetCR0()
-{
-	u32 var;
-	asm(
-		"mfcr %0"
-		: "=&r"(var)
-		);
-	return var;
-}
-
-u32 GetCR(u32 num)
-{
-	u32 var;
-	if(num == 0) // wtf, silly people
-		return GetCR0();
-	else {
-		// TODO: Ugly switch is ugly, was failing otherwise
-		switch (num) {
-			case 1:
-				asm("mcrf 0, 1");
-				break;
-			case 2:
-				asm("mcrf 0, 2");
-				break;
-			case 3:
-				asm("mcrf 0, 3");
-				break;
-			case 4:
-				asm("mcrf 0, 4");
-				break;
-			case 5:
-				asm("mcrf 0, 5");
-				break;
-			case 6:
-				asm("mcrf 0, 6");
-				break;
-			case 7:
-				asm("mcrf 0, 7");
-				break;
-			default:
-				printf("Can this be more than 7?\n");
-				break;
-		}
-		return GetCR0();
-	}
-}
-
-u32 GetXER()
-{
-	u32 var;
-	asm(
-		"mfxer %0"
-		: "=&r"(var)
-		);
-	return var;
-}
diff --git a/Source/TestSuite/ASM/source/Helpers.h b/Source/TestSuite/ASM/source/Helpers.h
deleted file mode 100644
index 721f33adff..0000000000
--- a/Source/TestSuite/ASM/source/Helpers.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "Defines.h"
-
-u32 GetCR0();
-u32 GetCR(u32 num);
-u32 GetXER();
diff --git a/Source/TestSuite/ASM/source/Init.cpp b/Source/TestSuite/ASM/source/Init.cpp
deleted file mode 100644
index cd2ab852b1..0000000000
--- a/Source/TestSuite/ASM/source/Init.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <gccore.h>
-#include <sdcard/wiisd_io.h>
-#include <fat.h>
-#include <dirent.h>
-#include <wiiuse/wpad.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "Init.h"
-
-static void *xfb = NULL;
-static GXRModeObj *rmode = NULL;
-void die(char *msg) {
-	if (f!=NULL) fclose(f);
-	printf(msg);
-	sleep(5);
-	fatUnmount("sd");
-	__io_wiisd.shutdown();
-	exit(0);
-}
-
-void initialise_fat() {
-	__io_wiisd.startup();
-	if (!fatInitDefault())
-		die("Unable to initialise FAT subsystem, exiting.\n");
-	fatMountSimple("sd", &__io_wiisd);
-	DIR_ITER *root = diropen("/");
-	if (!root)
-		die("Cannot open root dir, exiting.\n");
-	dirclose(root);
-	if (chdir("/"))
-		die("Could not change to root directory, exiting.\n");
-}
-
-void init_crap() {
-	VIDEO_Init();
-	WPAD_Init();
-	PAD_Init();
-	
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-	
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-	
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-	
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-	
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-	
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-	
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-	
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
-
-void end() {
-	int columns = 0, rows = 0;
-	CON_GetMetrics(&columns, &rows);
-	printf("\x1b[%i;0H",rows);
-	printf("File written... press Home/Start to exit.");
-	while(1) {
-		WPAD_ScanPads(); PAD_ScanPads();
-		if ((WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) || (PAD_ButtonsDown(0) & PAD_BUTTON_START))
-			exit(0);
-		VIDEO_WaitVSync();
-	}
-}
diff --git a/Source/TestSuite/ASM/source/Init.h b/Source/TestSuite/ASM/source/Init.h
deleted file mode 100644
index db818f0dd6..0000000000
--- a/Source/TestSuite/ASM/source/Init.h
+++ /dev/null
@@ -1,10 +0,0 @@
-extern FILE *f;
-
-
-void die(char *msg);
-
-void initialise_fat();
-
-void init_crap();
-
-void end();
diff --git a/Source/TestSuite/ASM/source/Instructions.h b/Source/TestSuite/ASM/source/Instructions.h
deleted file mode 100644
index d8f8206574..0000000000
--- a/Source/TestSuite/ASM/source/Instructions.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// Integer
-void add(u32 *a, u32 *b, u32 *c, u32 *d);
-void addRC(u32 *a, u32 *b, u32 *c, u32 *d);
-
-void subfc(u32 *a, u32 *b, u32 *c, u32 *d);
-void subfcRC(u32 *a, u32 *b, u32 *c, u32 *d);
-
-void divw(u32 *a, u32 *b, u32 *c, u32 *d);
-void divwRC(u32 *a, u32 *b, u32 *c, u32 *d);
-
-void divwo(u32 *a, u32 *b, u32 *c, u32 *d);
-void divwoRC(u32 *a, u32 *b, u32 *c, u32 *d);
-
-
-// Float
-
-void fsqrt(float *a, float *b, float *c, float *d);
-
-void fsqrtRC(float *a, float *b, float *c, float *d);
diff --git a/Source/TestSuite/ASM/source/asm_float.cpp b/Source/TestSuite/ASM/source/asm_float.cpp
deleted file mode 100644
index 89693eaf8f..0000000000
--- a/Source/TestSuite/ASM/source/asm_float.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#include "Defines.h"
-void fsqrt(float *a, float *b, float *c, float *d)
-{
-	/*asm(
-	 "fsqrt fr0,%0"
-	 : "=&r"(*a)
-	 );*/
-}
-void fsqrtRC(float *a, float *b, float *c, float *d)
-{
-	/*asm(
-		"fsqrt. fr0,%0"
-		: "=&r"(*a)
-		);*/
-}
diff --git a/Source/TestSuite/ASM/source/asm_integer.cpp b/Source/TestSuite/ASM/source/asm_integer.cpp
deleted file mode 100644
index 65f01c0c67..0000000000
--- a/Source/TestSuite/ASM/source/asm_integer.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "asm_tables.h"
-#include "Defines.h"
-
-void add(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"add %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		);
-}
-void addRC(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"add. %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		: "cc"
-		);
-}
-
-void subfc(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"subfc %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		);
-}
-void subfcRC(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"subfc. %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		: "cc"
-		);
-}
-
-void divw(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"divw %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		);
-}
-void divwRC(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"divw. %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		: "cc"
-		);
-}
-
-void divwo(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"divwo %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		);
-}
-void divwoRC(u32 *a, u32 *b, u32 *c, u32 *d)
-{
-	asm(
-		"divwo. %0,%1,%2"
-		: "=r"(*a)
-		: "r"(*b), "r"(*c)
-		: "cc"
-		);
-}
diff --git a/Source/TestSuite/ASM/source/asm_tables.cpp b/Source/TestSuite/ASM/source/asm_tables.cpp
deleted file mode 100644
index 6f3c1accef..0000000000
--- a/Source/TestSuite/ASM/source/asm_tables.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-#include "asm_tables.h"
-#include "Init.h"
-#include "Helpers.h"
-
-// Limited Test, Later have a test that will pass all possible variables
-u32 inval_table[][2] = {
-	{0,0},
-	{1,1},
-	{300,0},
-	{1,0},
-	{0xffff,0},
-	{0xffffffff,0},
-	{0x80000000,0},
-	{0x80000000,1},
-	{0x80000000,2},
-	{0x7fffffff,0},
-	{0x7fffffff,1},
-	{0x7fffffff,2},
-	{0,1},
-	{0,0xffff},
-	{0,0xffffffff},
-	{0,0x80000000},
-	{1,0x80000000},
-	{2,0x80000000},
-	{0,0x7fffffff},
-	{1,0x7fffffff},
-	{2,0x7fffffff},
-	{654321,0},
-	{4653321,0},
-	{0,300},
-	{1024,8},
-	{8,1024},
-	{0xffff,0xffff},
-	{0xffffffff,0xffffffff}
-};
-void Print(const char* text)
-{
-	printf(text);
-	if(f)
-		fprintf(f, text);
-}
-void ShowModifies(u32 inst)
-{
-	u32 mod = instructions[inst].Modifies;
-	if(mod == 0)
-	{
-		Print("NONE");
-		return;
-	}
-	if(mod & MOD_CR0)
-		Print("CR0 ");
-	if(mod & MOD_CR1)
-		Print("CR1 ");
-	if(mod & MOD_SR)
-		Print("SR ");
-	if(mod & MOD_XER)
-		Print("XER ");
-}
-void RunInstruction(u32 inst)
-{
-	u32 inval1, inval2, inval3;
-	
-	u32 outval = 0;
-	
-	// CR0
-	u32 cr1 = 0, cr2 = 0;
-	
-	//CR1
-	u32 cr11 = 0, cr12 = 0;
-	
-	//XER
-	u32 xer1 = 0, xer2 = 0;
-	
-	bool modCR0 = instructions[inst].Modifies & MOD_CR0;
-	bool modCR1 = instructions[inst].Modifies & MOD_CR1;
-	bool modXER = instructions[inst].Modifies & MOD_XER;
-	
-	if(instructions[inst].numInput != 3)
-	{
-		Print("Don't support Input not 3 yet~!\n");
-		fclose(f);
-		return;
-	}
-	if(instructions[inst].type != TYPE_INTEGER)
-	{
-		Print("Types other than TYPE_INTEGER not supported yet!\n");
-		fclose(f);
-		return;
-	}
-	char temp[32];
-	sprintf(temp, "logs/%s.dolphin.jit.log", instructions[inst].name);
-	f = fopen(temp, "wb");
-	if (!f)
-		printf("unable to open output file\n");
-	
-	printf("%s: InputNum: %d Modifies(flags): ", instructions[inst].name, instructions[inst].numInput);
-	if(f)
-		fprintf(f, "%s: InputNum: %d Modifies(flags): ", instructions[inst].name, instructions[inst].numInput);
-	ShowModifies(inst);
-	Print("\n");
-
-	for (unsigned int i = 0; i < sizeof(inval_table)/(sizeof(int)*2); i++)
-	{
-		inval1 = inval_table[i][0];
-		inval2 = inval_table[i][1];
-		outval = 0;
-
-		// Show our input values and where we are at on the array
-		printf("\x1b[%i;0H", i);
-		printf("%07i: %08x,%08x",i, inval1,inval2);
-
-		// Get flags before
-		if(modCR0)
-			cr1 = GetCR0();
-		if(modCR1)
-			cr11 = GetCR(1);
-		if(modXER)
-			xer1 = GetXER();
-
-		//Actually call instruction
-		instructions[inst].Call(&outval, &inval1, &inval2, 0);
-		
-		// Get flags after
-		if(modCR0)
-			cr2 = GetCR0();
-		if(modCR1)
-			cr12 = GetCR(1);
-		if(modXER)
-			xer2 = GetXER();
-
-		// Print out value
-		printf(":o=%08x\n\t", outval);
-		
-		// show off flag changes
-		if(modCR0)
-			printf("CR0:(%08x ~ %08x)", cr1,cr2);
-		if(modCR1)
-			printf("CR1:(%08x ~ %08x)", cr11,cr12);
-		if(modXER)
-			printf("XER:(%08x ~ %08x)", xer1, xer2);
-		
-		
-		// same in the file
-		if(f)
-		{
-			fprintf(f, ":i=%08x, %08x:o=%08x\n\t", inval1,inval2, outval);
-			if(modCR0)
-				fprintf(f, "CR0:(%08x ~ %08x)", cr1,cr2);
-			if(modCR1)
-				fprintf(f, "CR1:(%08x ~ %08x)", cr11,cr12);
-			if(modXER)
-				fprintf(f, "XER:(%08x ~ %08x)", xer1, xer2);
-		}
-
-		// see the difference in flags if any
-		if(modCR0)
-		{
-			u32 cr_diff = cr2&~cr1;
-			if (cr_diff) {
-				printf(" CR0D:%08x",cr_diff);
-				if(f)
-					fprintf(f, " CR0D:%08x",cr_diff);
-			}
-		}
-		if(modCR1)
-		{
-			u32 cr1_diff = cr12&~cr11;
-			if (cr1_diff) {
-				printf(" CR1D:%08x",cr1_diff);
-				if(f)
-					fprintf(f, " CR1D:%08x",cr1_diff);
-			}
-		}
-		if(modXER)
-		{
-			u32 xer_diff = xer2&~xer1;
-			if (xer_diff) {
-				printf(" XERD:%08x",xer_diff);
-				if(f)
-					fprintf(f, " XERD:%08x",xer_diff);
-			}
-		}
-		if(f)
-			fprintf(f,"\n");
-	}
-	if(f)
-		fclose(f);
-}
diff --git a/Source/TestSuite/ASM/source/asm_tables.h b/Source/TestSuite/ASM/source/asm_tables.h
deleted file mode 100644
index 1f47a4c406..0000000000
--- a/Source/TestSuite/ASM/source/asm_tables.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#include "Defines.h"
-#include "Instructions.h"
-
-enum Modify
-{
-	MOD_CR0 = (1 << 0),
-	MOD_CR1 = (1 << 1),
-	MOD_SR = (1 << 2),
-	MOD_XER = (1 << 3),
-	MOD_FPSCR = (1 << 4)
-};
-enum IOput
-{
-	IO_ARG1 = (1 << 0),
-	IO_ARG2 = (1 << 1),
-	IO_ARG3 = (1 << 2),
-};
-enum inst_type
-{
-	TYPE_INTEGER,
-	TYPE_FLOAT
-};
-
-struct inst
-{
-	char name[16];
-	u32 Modifies; // Flag modification
-	u8 numInput;
-	u32 Input;
-	u32 Ouput;
-	inst_type type;
-	void (*Call)(u32*, u32*, u32*, u32*);
-	void (*CallFP)(float*, float*, float*, float*);
-	
-};
-
-static inst instructions[] = {
-	{ "add", NULL, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, add},
-	{ "add.", MOD_CR0, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, add},
-	{ "subfc", NULL, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, subfc},
-	{ "subfc.", MOD_CR0, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, subfcRC},
-	{ "divw", NULL, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1, TYPE_INTEGER, divw},
-	{ "divw.", MOD_CR0, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, divwRC},
-	{ "divwo", MOD_XER, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1,TYPE_INTEGER, divwo},
-	{ "divwo.", MOD_CR0 | MOD_XER, 3, IO_ARG1 | IO_ARG2 | IO_ARG3, IO_ARG1, TYPE_INTEGER, divwoRC},
-	//{ "fsqrt", MOD_FPSCR, 2, IO_ARG1 | IO_ARG2, IO_ARG1,TYPE_FLOAT, NULL, fsqrt},
-	//{ "fsqrt.", MOD_CR1 | MOD_FPSCR, 2, IO_ARG1 | IO_ARG2, IO_ARG1,TYPE_FLOAT, NULL, fsqrtRC}
-};
-
-
-void RunInstruction(u32 inst);
diff --git a/Source/TestSuite/ASM/source/dolphintest_asm.cpp b/Source/TestSuite/ASM/source/dolphintest_asm.cpp
deleted file mode 100644
index da3afdf73e..0000000000
--- a/Source/TestSuite/ASM/source/dolphintest_asm.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "Defines.h"
-#include "Init.h"
-#include "asm_tables.h"
-#include "Helpers.h"
-
-FILE *f = NULL;
-
-int main(int argc, char **argv)
-{
-	init_crap();
-	initialise_fat();
-	
-	for (uint a = 0; a < sizeof(instructions) / sizeof(inst); ++a)
-	{
-		RunInstruction(a);
-	}
-	
-	end();
-	
-	return 0;
-}
diff --git a/Source/TestSuite/AX/AX.vcxproj b/Source/TestSuite/AX/AX.vcxproj
deleted file mode 100644
index 10eb66c3c1..0000000000
--- a/Source/TestSuite/AX/AX.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9F053346-A33D-4E4F-874E-CBA1AF809FC3}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_ax.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_ax.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/AX/Makefile b/Source/TestSuite/AX/Makefile
deleted file mode 100644
index fbdb823cad..0000000000
--- a/Source/TestSuite/AX/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/AX/source/dolphintest_ax.cpp b/Source/TestSuite/AX/source/dolphintest_ax.cpp
deleted file mode 100644
index 0b4b4152bb..0000000000
--- a/Source/TestSuite/AX/source/dolphintest_ax.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <ogcsys.h>
-#include <gccore.h>
-#include <iostream>
-#include <iomanip>
-
-static void *xfb = NULL;
-static GXRModeObj *rmode = NULL;
-
-void *Initialise();
-
-
-int main(int argc, char **argv) {
-
-	xfb = Initialise();
-	AUDIO_Init(NULL);
-	AUDIO_SetStreamVolLeft(0xFF); // Max
-	AUDIO_SetStreamVolRight(0xFF); // Max
-	AUDIO_SetStreamSampleRate(AI_SAMPLERATE_48KHZ);
-	while(1) {
-		PAD_ScanPads();
-		VIDEO_ClearFrameBuffer(rmode, xfb, 0);
-		
-
-		VIDEO_WaitVSync();
-	}
-
-	return 0;
-}
-
-void * Initialise() {
-
-	void *framebuffer;
-
-	VIDEO_Init();
-	PAD_Init();
-	
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	framebuffer = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-	console_init(framebuffer,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-	
-	VIDEO_Configure(rmode);
-	VIDEO_SetNextFramebuffer(framebuffer);
-	VIDEO_SetBlack(FALSE);
-	VIDEO_Flush();
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-
-	return framebuffer;
-
-}
diff --git a/Source/TestSuite/EXI/EXI.vcxproj b/Source/TestSuite/EXI/EXI.vcxproj
deleted file mode 100644
index 8e3bf85e99..0000000000
--- a/Source/TestSuite/EXI/EXI.vcxproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dolphintest_exi.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_exi.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_exi.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/EXI/Makefile b/Source/TestSuite/EXI/Makefile
deleted file mode 100644
index 0d4af23a0b..0000000000
--- a/Source/TestSuite/EXI/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/EXI/source/dolphintest_exi.cpp b/Source/TestSuite/EXI/source/dolphintest_exi.cpp
deleted file mode 100644
index 3b7fb1c3bc..0000000000
--- a/Source/TestSuite/EXI/source/dolphintest_exi.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <gccore.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ogcsys.h>
-#include <unistd.h>
-#include <iostream>
-#include <iomanip>
-
-#include <debug.h>
-#include <math.h>
-
-static void *xfb = NULL;
-u32 first_frame = 1;
-GXRModeObj *rmode;
-
-void Initialise();
-
-int main()
-{
-	Initialise();
-
-	while(1)
-	{
-		s32 Size;
-		s32 SSize;
-		u32 ID;
-		s32 getIDerr;
-		s32 CARDerr;
-		s32 EXIerr;
-		VIDEO_ClearFrameBuffer(rmode, xfb, 0);
-
-		// Can't use printf since Dolphin overrides it
-		std::cout<<"\x1b[0;0H"; // Position the cursor (at 0, 0)
-		for (int channel = 0; channel < EXI_CHANNEL_MAX; ++channel)
-			for (int device = 0; device < EXI_DEVICE_MAX; ++device)
-			{
-				if (getIDerr = EXI_GetID(channel, device, &ID) == 1)
-				{
-					std::cout<<"Channel "<<channel<<" Device "<<device<<"\tID = 0x"<<std::setbase(16)<<ID<<std::endl;
-					if ((channel == 0 && device == 0)||(channel == 1 && device == 0))
-					{
-						// It's a memcard slot
-						if (CARDerr = CARD_ProbeEx(channel, &Size, &SSize) >= 0)
-						{
-							std::cout<<"\tMemcard has a size of "<<std::setbase(10)<<Size<<" and a Sector Size of "<<std::setbase(10)<<SSize<<std::endl;
-						}
-						else if (CARDerr == -2)
-							std::cout<<"\tNot a Memcard!"<<std::endl;
-						else
-							std::cout<<"\tCARD Error "<<CARDerr<<std::endl;
-					}
-					else
-					{
-						// It's not a memcard, what to do? - Just probe for now
-						if (EXIerr = EXI_ProbeEx(channel)){}
-						else
-							std::cout<<"\tEXI Error "<<EXIerr<<std::endl;
-					}
-				}
-				else
-					std::cout<<"Channel "<<channel<<" Device "<<device<<std::endl<<"\tEXI_GetID Error "<<getIDerr<<std::endl;
-			}
-
-		VIDEO_WaitVSync();
-	}
-	return 0;
-}
-
-void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// This function initialises the attached controllers
-	PAD_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
diff --git a/Source/TestSuite/FPU/FPU.vcxproj b/Source/TestSuite/FPU/FPU.vcxproj
deleted file mode 100644
index 33a9dbe781..0000000000
--- a/Source/TestSuite/FPU/FPU.vcxproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{18373B64-BCAB-4677-A070-7AD45D4C8304}</ProjectGuid>
-    <RootNamespace>FPU</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="source\asm.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_fpu.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="source\fpu_asm.S" />
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/FPU/Makefile b/Source/TestSuite/FPU/Makefile
deleted file mode 100644
index 0f42da56db..0000000000
--- a/Source/TestSuite/FPU/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-run:
-	wiiload $(TARGET).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/FPU/source/asm.h b/Source/TestSuite/FPU/source/asm.h
deleted file mode 100644
index 2feed006f4..0000000000
--- a/Source/TestSuite/FPU/source/asm.h
+++ /dev/null
@@ -1,338 +0,0 @@
-#ifndef __ASM_H__
-#define __ASM_H__
-
-#ifdef _LANGUAGE_ASSEMBLY
-/* Condition Register Bit Fields */
-
-#define	cr0	0
-#define	cr1	1
-#define	cr2	2
-#define	cr3	3
-#define	cr4	4
-#define	cr5	5
-#define	cr6	6
-#define	cr7	7
-
-
-/* General Purpose Registers (GPRs) */
-
-#define	r0	0
-#define	r1	1
-#define	sp	1
-#define	r2	2
-#define	toc	2
-#define	r3	3
-#define	r4	4
-#define	r5	5
-#define	r6	6
-#define	r7	7
-#define	r8	8
-#define	r9	9
-#define	r10	10
-#define	r11	11
-#define	r12	12
-#define	r13	13
-#define	r14	14
-#define	r15	15
-#define	r16	16
-#define	r17	17
-#define	r18	18
-#define	r19	19
-#define	r20	20
-#define	r21	21
-#define	r22	22
-#define	r23	23
-#define	r24	24
-#define	r25	25
-#define	r26	26
-#define	r27	27
-#define	r28	28
-#define	r29	29
-#define	r30	30
-#define	r31	31
-
-
-/* Floating Point Registers (FPRs) */
-
-#define	fr0		0
-#define	fr1		1
-#define	fr2		2
-#define	fr3		3
-#define	fr4		4
-#define	fr5		5
-#define	fr6		6
-#define	fr7		7
-#define	fr8		8
-#define	fr9		9
-#define	fr10	10
-#define	fr11	11
-#define	fr12	12
-#define	fr13	13
-#define	fr14	14
-#define	fr15	15
-#define	fr16	16
-#define	fr17	17
-#define	fr18	18
-#define	fr19	19
-#define	fr20	20
-#define	fr21	21
-#define	fr22	22
-#define	fr23	23
-#define	fr24	24
-#define	fr25	25
-#define	fr26	26
-#define	fr27	27
-#define	fr28	28
-#define	fr29	29
-#define	fr30	30
-#define	fr31	31
-
-#define	vr0		0
-#define	vr1		1
-#define	vr2		2
-#define	vr3		3
-#define	vr4		4
-#define	vr5		5
-#define	vr6		6
-#define	vr7		7
-#define	vr8		8
-#define	vr9		9
-#define	vr10	10
-#define	vr11	11
-#define	vr12	12
-#define	vr13	13
-#define	vr14	14
-#define	vr15	15
-#define	vr16	16
-#define	vr17	17
-#define	vr18	18
-#define	vr19	19
-#define	vr20	20
-#define	vr21	21
-#define	vr22	22
-#define	vr23	23
-#define	vr24	24
-#define	vr25	25
-#define	vr26	26
-#define	vr27	27
-#define	vr28	28
-#define	vr29	29
-#define	vr30	30
-#define	vr31	31
-
-#endif		//_LANGUAGE_ASSEMBLY
-
-#define SPRG0	272
-#define SPRG1	273
-#define SPRG2	274
-#define SPRG3	275
-
-#define PMC1    953
-#define PMC2    954
-#define PMC3    957
-#define PMC4    958
-
-#define MMCR0	952
-#define MMCR1	956
-
-
-#define LINK_REGISTER_CALLEE_UPDATE_ROOM 4
-#define EXCEPTION_NUMBER 8
-#define SRR0_OFFSET 12
-#define SRR1_OFFSET 16
-#define GPR0_OFFSET 20
-#define GPR1_OFFSET 24
-#define GPR2_OFFSET 28
-#define GPR3_OFFSET 32
-#define GPR4_OFFSET 36
-#define GPR5_OFFSET 40
-#define GPR6_OFFSET 44
-#define GPR7_OFFSET 48
-#define GPR8_OFFSET 52
-#define GPR9_OFFSET 56
-#define GPR10_OFFSET 60
-#define GPR11_OFFSET 64
-#define GPR12_OFFSET 68
-#define GPR13_OFFSET 72
-#define GPR14_OFFSET 76
-#define GPR15_OFFSET 80
-#define GPR16_OFFSET 84
-#define GPR17_OFFSET 88
-#define GPR18_OFFSET 92
-#define GPR19_OFFSET 96
-#define GPR20_OFFSET 100
-#define GPR21_OFFSET 104
-#define GPR22_OFFSET 108
-#define GPR23_OFFSET 112
-#define GPR24_OFFSET 116
-#define GPR25_OFFSET 120
-#define GPR26_OFFSET 124
-#define GPR27_OFFSET 128
-#define GPR28_OFFSET 132
-#define GPR29_OFFSET 136
-#define GPR30_OFFSET 140
-#define GPR31_OFFSET 144
-
-#define GQR0_OFFSET 148
-#define GQR1_OFFSET 152
-#define GQR2_OFFSET 156
-#define GQR3_OFFSET 160
-#define GQR4_OFFSET 164
-#define GQR5_OFFSET 168
-#define GQR6_OFFSET 172
-#define GQR7_OFFSET 176
-
-#define CR_OFFSET	 180
-#define LR_OFFSET	 184
-#define CTR_OFFSET	 188
-#define XER_OFFSET	 192
-#define MSR_OFFSET	 196
-#define DAR_OFFSET	 200
-
-#define	STATE_OFFSET 204
-#define MODE_OFFSET	 206
-	 
-#define FPR0_OFFSET	208
-#define FPR1_OFFSET 216
-#define FPR2_OFFSET 224
-#define FPR3_OFFSET 232
-#define FPR4_OFFSET 240
-#define FPR5_OFFSET 248
-#define FPR6_OFFSET 256
-#define FPR7_OFFSET 264
-#define FPR8_OFFSET 272
-#define FPR9_OFFSET 280
-#define FPR10_OFFSET 288
-#define FPR11_OFFSET 296
-#define FPR12_OFFSET 304
-#define FPR13_OFFSET 312
-#define FPR14_OFFSET 320
-#define FPR15_OFFSET 328
-#define FPR16_OFFSET 336
-#define FPR17_OFFSET 344
-#define FPR18_OFFSET 352
-#define FPR19_OFFSET 360
-#define FPR20_OFFSET 368
-#define FPR21_OFFSET 376
-#define FPR22_OFFSET 384
-#define FPR23_OFFSET 392
-#define FPR24_OFFSET 400
-#define FPR25_OFFSET 408
-#define FPR26_OFFSET 416
-#define FPR27_OFFSET 424
-#define FPR28_OFFSET 432
-#define FPR29_OFFSET 440
-#define FPR30_OFFSET 448
-#define FPR31_OFFSET 456
-
-#define FPSCR_OFFSET 464
-
-#define PSR0_OFFSET 472
-#define PSR1_OFFSET 480
-#define PSR2_OFFSET 488
-#define PSR3_OFFSET 496
-#define PSR4_OFFSET 504
-#define PSR5_OFFSET 512
-#define PSR6_OFFSET 520
-#define PSR7_OFFSET 528
-#define PSR8_OFFSET 536
-#define PSR9_OFFSET 544
-#define PSR10_OFFSET 552
-#define PSR11_OFFSET 560
-#define PSR12_OFFSET 568
-#define PSR13_OFFSET 576
-#define PSR14_OFFSET 584
-#define PSR15_OFFSET 592
-#define PSR16_OFFSET 600
-#define PSR17_OFFSET 608
-#define PSR18_OFFSET 616
-#define PSR19_OFFSET 624
-#define PSR20_OFFSET 632
-#define PSR21_OFFSET 640
-#define PSR22_OFFSET 648
-#define PSR23_OFFSET 656
-#define PSR24_OFFSET 664
-#define PSR25_OFFSET 672
-#define PSR26_OFFSET 680
-#define PSR27_OFFSET 688
-#define PSR28_OFFSET 696
-#define PSR29_OFFSET 704
-#define PSR30_OFFSET 712
-#define PSR31_OFFSET 720
-/*
- * maintain the EABI requested 8 bytes aligment
- * As SVR4 ABI requires 16, make it 16 (as some
- * exception may need more registers to be processed...)
- */
-#define EXCEPTION_FRAME_END 728
-
-#define	IBAT0U		528
-#define	IBAT0L		529	
-#define	IBAT1U		530	
-#define	IBAT1L		531	
-#define	IBAT2U		532	
-#define	IBAT2L		533	
-#define	IBAT3U		534	
-#define	IBAT3L		535	
-#define	IBAT4U		560
-#define	IBAT4L		561
-#define	IBAT5U		562
-#define	IBAT5L		563
-#define	IBAT6U		564
-#define	IBAT6L		565
-#define	IBAT7U		566
-#define	IBAT7L		567
-
-#define	DBAT0U		536
-#define	DBAT0L		537	
-#define	DBAT1U		538	
-#define	DBAT1L		539	
-#define	DBAT2U		540	
-#define	DBAT2L		541	
-#define	DBAT3U		542	
-#define	DBAT3L		543
-#define DBAT4U		568
-#define DBAT4L		569
-#define DBAT5U		570
-#define DBAT5L		571
-#define DBAT6U		572
-#define DBAT6L		573
-#define DBAT7U		574
-#define DBAT7L		575
-
-#define HID0		1008
-#define HID1		1009
-#define HID2		920	
-#define HID4		1011
-
-#define GQR0		912
-#define GQR1		913
-#define GQR2		914
-#define GQR3		915
-#define GQR4		916
-#define GQR5		917
-#define GQR6		918
-#define GQR7		919
-
-#define L2CR		1017
-
-#define WPAR		921
-
-#define DMAU		922
-#define DMAL		923
-
-#define MSR_RI				0x00000002
-#define MSR_DR				0x00000010
-#define MSR_IR				0x00000020
-#define MSR_IP				0x00000040
-#define MSR_SE				0x00000400
-#define MSR_ME				0x00001000
-#define MSR_FP				0x00002000
-#define MSR_POW				0x00004000
-#define MSR_EE				0x00008000
-
-#define PPC_ALIGNMENT		8
-
-#define PPC_CACHE_ALIGNMENT	32
-
-#endif		//__ASM_H__
diff --git a/Source/TestSuite/FPU/source/dolphintest_fpu.cpp b/Source/TestSuite/FPU/source/dolphintest_fpu.cpp
deleted file mode 100644
index d465b0c614..0000000000
--- a/Source/TestSuite/FPU/source/dolphintest_fpu.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <ogcsys.h>
-#include <gccore.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <math.h>
-#include <wiiuse/wpad.h>
-
-// Pull in the assembly functions.
-extern "C" {
-void TestFRES1(u32 *fpscr, float *result, float *result2);
-};
-
-int doreload=0, dooff=0;
-void reload() {	doreload=1; }
-void shutdown() { dooff=1; }
-
-
-void Compare(const char *a, const char *b) {
-	if (!strcmp(a, b)) {
-		printf("SUCCESS - %s\n", a);
-	} else {
-		printf("FAIL - %s != \n"
-			   "       %s\n", a, b);
-	}
-}
-
-void TestDivision() {
-	double a, b, c, d, e;
-	a = 1.0;
-	b = 0.0;
-	c = a / b;
-	d = b / a;
-	e = sqrt(-1);
-	char temp[100];
-	sprintf(temp, "%1.1f %1.1f %1.1f %1.1f %1.1f", a, b, c, d, e);
-	Compare(temp, "1.0 0.0 inf 0.0 nan");
-}
-
-void TestFres() {
-	u32 fpscr[2];
-	float out, out2;
-	TestFRES1(fpscr, &out, &out2);
-	char temp[100];
-	sprintf(temp, "%08x %1.1f %1.1f", fpscr[1], out, out2);
-	Compare(temp, "86002004 inf 0.0");
-}
-
-void TestNormalize() {
-	//float a[3] = {2,2,2};
-	//d_guVecNormalize(a);
-	//printf("%f %f %f\n", a[0], a[1], a[2]);
-}
-
-
-int main(int argc, char **argv) {
-	void *xfb[2];
-	int fbi = 0;
-	GXRModeObj *rmode = NULL;
-
-	VIDEO_Init();
-	PAD_Init();
-	WPAD_Init();
-
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// double buffering, prevents flickering (is it needed for LCD TV? i don't have one to test)
-	xfb[0] = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-	xfb[1] = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	VIDEO_Configure(rmode);
-	VIDEO_SetNextFramebuffer(xfb[0]);
-	VIDEO_SetBlack(FALSE);
-	VIDEO_Flush();
-	VIDEO_WaitVSync();
-	if (rmode->viTVMode & VI_NON_INTERLACE) VIDEO_WaitVSync();
-
-	SYS_SetResetCallback(reload);
-	SYS_SetPowerCallback(shutdown);
-
-	WPAD_SetDataFormat(0, WPAD_FMT_BTNS_ACC_IR);
-	WPAD_SetVRes(0, rmode->fbWidth, rmode->xfbHeight);
-
-	CON_Init(xfb[fbi],0,0,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	printf(" ");
-	printf("Tests\n\n");
-
-	TestDivision();
-	TestFres();
-
-	while (!doreload && !dooff) {
-		WPAD_ScanPads();
-		if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME)
-			exit(0);
-
-		VIDEO_SetNextFramebuffer(xfb[fbi]);
-		VIDEO_Flush();
-		VIDEO_WaitVSync();
-	}
-	if(doreload) return 0;
-	if(dooff) SYS_ResetSystem(SYS_SHUTDOWN,0,0);
-
-	return 0;
-}
diff --git a/Source/TestSuite/FPU/source/fpu_asm.S b/Source/TestSuite/FPU/source/fpu_asm.S
deleted file mode 100644
index 3f5bb57155..0000000000
--- a/Source/TestSuite/FPU/source/fpu_asm.S
+++ /dev/null
@@ -1,24 +0,0 @@
-#define _LANGUAGE_ASSEMBLY
-#include "asm.h"
-
-	//r3 = &fpscr
-	//r4 = result
-	.globl	TestFRES1
-TestFRES1:
-	lis			r9,Unit01@ha
-	addi		r9,r9,Unit01@l
-	lfs  fr0, 0(r9)
-	fres fr0, fr0
-	stfs fr0, 0(r4)
-	fres fr0, fr0
-	stfs fr0, 0(r5)
-	mffs fr1
-	stfd fr1, 0(r3)
-	blr
-
-	.section .data
-	.balign 4
-Unit01:
-	.float	0.0, 1.0
-NrmData:
-	.float	0.5, 3.0
diff --git a/Source/TestSuite/GX/GX.vcxproj b/Source/TestSuite/GX/GX.vcxproj
deleted file mode 100644
index 356e9c4912..0000000000
--- a/Source/TestSuite/GX/GX.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F45E42B2-939B-4F02-954B-E68251FD4CCF}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_gx.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_gx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/GX/Makefile b/Source/TestSuite/GX/Makefile
deleted file mode 100644
index 0d4af23a0b..0000000000
--- a/Source/TestSuite/GX/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/GX/source/dolphintest_gx.cpp b/Source/TestSuite/GX/source/dolphintest_gx.cpp
deleted file mode 100644
index 8901e583e2..0000000000
--- a/Source/TestSuite/GX/source/dolphintest_gx.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/*---------------------------------------------------------------------------------
-a simple rotating cube demo by tkcne
----------------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <math.h>
-#include <gccore.h>
-#include <gcmodplay.h>
-#include <debug.h>
-#include <ogcsys.h>
-
-#define DEFAULT_FIFO_SIZE	(256*1024)		//GX_FIFO_MINSIZE
-
-//---------------------------------------------------------------------------------
-// cube vertex data
-//---------------------------------------------------------------------------------
-s16 cube[] ATTRIBUTE_ALIGN(32) = {
-	// x y z
-	-15,  15, -15, 	// 0
-	15,  15, -15, 	// 1
-	15,  15,  15, 	// 2
-	-15,  15,  15, 	// 3
-	15, -15, -15, 	// 4
-	15, -15,  15, 	// 5
-	-15, -15,  15,  // 6
-	-15, -15, -15,  // 7
-};
-
-//---------------------------------------------------------------------------------
-// color data
-//---------------------------------------------------------------------------------
-u8 colors[] ATTRIBUTE_ALIGN(32) = {
-	// r, g, b, a
-	100,  10, 100, 255, // 0 purple
-	240,   0,   0, 255,	// 1 red
-	255, 180,   0, 255,	// 2 orange
-	255, 255,   0, 255, // 3 yellow
-	10, 120,  40, 255, // 4 green
-	0,  20, 100, 255  // 5 blue
-};
-
-u32
-CvtRGB (u8 r1, u8 g1, u8 b1, u8 r2, u8 g2, u8 b2)
-{
-	int y1, cb1, cr1, y2, cb2, cr2, cb, cr;
-
-	y1 = (299 * r1 + 587 * g1 + 114 * b1) / 1000;
-	cb1 = (-16874 * r1 - 33126 * g1 + 50000 * b1 + 12800000) / 100000;
-	cr1 = (50000 * r1 - 41869 * g1 - 8131 * b1 + 12800000) / 100000;
-
-	y2 = (299 * r2 + 587 * g2 + 114 * b2) / 1000;
-	cb2 = (-16874 * r2 - 33126 * g2 + 50000 * b2 + 12800000) / 100000;
-	cr2 = (50000 * r2 - 41869 * g2 - 8131 * b2 + 12800000) / 100000;
-
-	cb = (cb1 + cb2) >> 1;
-	cr = (cr1 + cr2) >> 1;
-
-	return (y1 << 24) | (cb << 16) | (y2 << 8) | cr;
-}
-
-static u32 curr_fb = 0;
-static u32 first_frame = 1;
-static u32 *xfb[2] = {NULL,NULL};
-GXRModeObj *rmode;
-
-void draw_init();
-void draw_cube(Mtx v);
-
-//---------------------------------------------------------------------------------
-int main( int argc, char **argv ){
-//---------------------------------------------------------------------------------
-	f32 yscale;
-	u32 xfbHeight;
-	u32 colour1;
-	Mtx v,p; // view and perspective matrices
-	int CP = 0;
-	GXColor background = {0, 0, 0, 0xff};
-	int startx, starty;
-	int directionx, directiony;
-
-	// init the vi. setup frame buffer and set the retrace callback
-	// to copy the efb to xfb
-	VIDEO_Init();
-	PAD_Init();
-
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-
-	curr_fb = 0;
-	first_frame = 0;
-
-	// setup the fifo and then init the flipper
-	void *gp_fifo = NULL;
-	gp_fifo = memalign(32,DEFAULT_FIFO_SIZE);
-	memset(gp_fifo,0,DEFAULT_FIFO_SIZE);
-
-	xfb[0] = (u32 *) MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-	xfb[1] = (u32 *) MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	VIDEO_Configure(rmode);
-	VIDEO_SetNextFramebuffer(xfb[curr_fb]);
-	if(!first_frame) VIDEO_SetBlack(FALSE);
-	VIDEO_Flush();
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-	console_init(xfb[curr_fb],20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	//curr_fb ^= 1;
-
-	GX_Init(gp_fifo,DEFAULT_FIFO_SIZE);
-
-	// clears the bg to color and clears the z buffer
-	GX_SetCopyClear(background, 0x00ffffff);
-
-	// other gx setup
-	GX_SetViewport(0,0,rmode->fbWidth,rmode->efbHeight,0,1);
-	yscale = GX_GetYScaleFactor(rmode->efbHeight,rmode->xfbHeight);
-	xfbHeight = GX_SetDispCopyYScale(yscale);
-	GX_SetScissor(0,0,rmode->fbWidth,rmode->efbHeight);
-	GX_SetDispCopySrc(0,0,rmode->fbWidth,rmode->efbHeight);
-	GX_SetDispCopyDst(rmode->fbWidth,xfbHeight);
-	GX_SetCopyFilter(rmode->aa,rmode->sample_pattern,GX_TRUE,rmode->vfilter);
-	GX_SetFieldMode(rmode->field_rendering,((rmode->viHeight==2*rmode->xfbHeight)?GX_ENABLE:GX_DISABLE));
-
-	// cull none because other values produce weird results
-	GX_SetCullMode(GX_CULL_NONE);
-	GX_CopyDisp(xfb[curr_fb],GX_TRUE);
-	GX_SetDispCopyGamma(GX_GM_1_0);
-
-	// setup our camera at the origin
-	// looking down the -z axis with y up
-	Vector cam = {0.0F, 0.0F, 0.0F},
-		up = {0.0F, 1.0F, 0.0F},
-		look = {0.0F, 0.0F, -1.0F};
-	guLookAt(v, &cam, &up, &look);
-
-	// setup our projection matrix
-	// this creates a perspective matrix with a view angle of 60,
-	// an aspect ratio of 4/3 (i'm not sure if that's the right
-	// way to do it but i just went by what made a square on my screen)
-	// and z near and far distances
-	f32 w = rmode->viWidth;
-	f32 h = rmode->viHeight;
-	guPerspective(p, 60, (f32)w/h, 10.0F, 300.0F);
-	GX_LoadProjectionMtx(p, GX_PERSPECTIVE);
-
-	GXColor Test = { 192, 255, 0, 255 };
-	GX_SetFog(GX_FOG_EXP2, 1, 2, 3, 4, Test);
-	GXFogAdjTbl bum;
-	GX_SetFogRangeAdj(GX_ENABLE, 255, &bum);
-	// setup vertexes
-	draw_init();
-
-	colour1 = CvtRGB (0xff, 0xff, 0xff, 0xff, 0xff, 0xff);
-	// main loop
-	while(1) {
-
-		PAD_ScanPads();
-
-		if (PAD_ButtonsDown(0) & PAD_BUTTON_START) {
-			void (*reload)() = (void(*)())0x90000020;
-			reload();
-		}
-
-		// do this before drawing
-		GX_SetViewport(0,0,rmode->fbWidth,rmode->efbHeight,0,1);
-		GX_InvVtxCache();
-		GX_InvalidateTexAll();
-		GX_SetScissor(640 , 480,680 , 560);
-		GX_SetScissorBoxOffset(-80, -80);
-
-		// draw our cube
-		draw_cube(v);
-
-		GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
-		GX_SetColorUpdate(GX_TRUE);
-		GX_CopyDisp(xfb[curr_fb],GX_TRUE);
-
-		// do this stuff after drawing
-		GX_DrawDone();
-		/*** Draw Bouncing Square ***/
-		if (directionx)
-			startx -= 4;
-		else
-			startx += 4;
-
-		if (directiony)
-			starty -= 2;
-		else
-			starty += 2;
-
-		if (startx >= 576) directionx = 1;
-
-		if (starty >= (rmode->xfbHeight - 64)) directiony = 1;
-
-		if (startx < 0) {
-			startx = 0;
-			directionx = 0;
-		}
-
-		if (starty < 0) {
-			starty = 0;
-			directiony = 0;
-		}
-
-		CP = (starty * 320) + (startx >> 1);
-		for (int rows = 0; rows < 64; rows++) {
-			for (int cols = 0; cols < 32; cols++)
-				xfb[curr_fb][CP + cols] = colour1;
-
-			CP += 320;
-		}
-		VIDEO_SetNextFramebuffer(xfb[curr_fb]);
-
-		if(first_frame) {
-			first_frame = 0;
-			VIDEO_SetBlack(FALSE);
-		}
-		VIDEO_Flush();
-
-		VIDEO_WaitVSync();
-		curr_fb ^= 1;
-
-	}
-	return 0;
-}
-
-
-//---------------------------------------------------------------------------------
-void draw_init() {
-//---------------------------------------------------------------------------------
-	// setup the vertex descriptor
-	// tells the flipper to expect 8bit indexes for position
-	// and color data. could also be set to direct.
-	GX_ClearVtxDesc();
-	GX_SetVtxDesc(GX_VA_POS, GX_INDEX8);
-	GX_SetVtxDesc(GX_VA_CLR0, GX_INDEX8);
-
-	// setup the vertex attribute table
-	// describes the data
-	// args: vat location 0-7, type of data, data format, size, scale
-	// so for ex. in the first call we are sending position data with
-	// 3 values X,Y,Z of size S16. scale sets the number of fractional
-	// bits for non float data.
-	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
-	GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-
-	// tells gx where our position and color data is
-	// args: type of data, pointer, array stride
-	GX_SetArray(GX_VA_POS, cube, 3*sizeof(s16));
-	GX_SetArray(GX_VA_CLR0, colors, 4*sizeof(u8));
-	DCFlushRange(cube,sizeof(cube));
-	DCFlushRange(colors,sizeof(colors));
-
-	// no idea...sets to no textures
-	// i don't know anything about textures or lighting yet :|
-	GX_SetNumChans(1);
-	GX_SetNumTexGens(0);
-	GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORDNULL, GX_TEXMAP_NULL, GX_COLOR0A0);
-	GX_SetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
-}
-
-
-//---------------------------------------------------------------------------------
-// draws a quad from 4 vertex idx and one color idx
-//---------------------------------------------------------------------------------
-void draw_quad(u8 v0, u8 v1, u8 v2, u8 v3, u8 c) {
-//---------------------------------------------------------------------------------
-	// one 8bit position idx
-	GX_Position1x8(v0);
-	// one 8bit color idx
-	GX_Color1x8(c);
-	GX_Position1x8(v1);
-	GX_Color1x8(c);
-	GX_Position1x8(v2);
-	GX_Color1x8(c);
-	GX_Position1x8(v3);
-	GX_Color1x8(c);
-}
-
-
-//---------------------------------------------------------------------------------
-void draw_cube(Mtx v) {
-//---------------------------------------------------------------------------------
-	Mtx m; // model matrix.
-	Mtx mv; // modelview matrix.
-	Vector axis = {-1,1,0};
-	static float rotateby = 0;
-
-	rotateby ++;
-
-	// move the cube out in front of us and rotate it
-	guMtxIdentity(m);
-	guMtxRotAxisDeg(m, &axis, rotateby);
-	guMtxTransApply(m, m, -100.0F, -60.0F, -200.0F);
-	guMtxConcat(v,m,mv);
-	// load the modelview matrix into matrix memory
-	GX_LoadPosMtxImm(mv, GX_PNMTX0);
-
-	// drawing begins!
-	// tells the flipper what type of primitive we will be drawing
-	// which descriptor in the VAT to use and the number of vertices
-	// to expect. 24 since we will draw 6 quads with 4 verts each.
-	GX_Begin(GX_QUADS, GX_VTXFMT0, 24);
-
-	draw_quad(0, 3, 2, 1, 0);
-	draw_quad(0, 7, 6, 3, 1);
-	draw_quad(0, 1, 4, 7, 2);
-	draw_quad(1, 2, 5, 4, 3);
-	draw_quad(2, 3, 6, 5, 4);
-	draw_quad(4, 7, 6, 5, 5);
-
-	GX_End();
-}
diff --git a/Source/TestSuite/Makefile b/Source/TestSuite/Makefile
deleted file mode 100644
index bc3a2943fc..0000000000
--- a/Source/TestSuite/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS:= `ls | egrep -v '^(CVS)$$'`
-
-all:
-	@for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE) -C $$i || { exit 1;} fi; done;
-
-clean:
-	@for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE) -C $$i clean || { exit 1;} fi; done;
diff --git a/Source/TestSuite/PAD/Makefile b/Source/TestSuite/PAD/Makefile
deleted file mode 100644
index 0d4af23a0b..0000000000
--- a/Source/TestSuite/PAD/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/PAD/PAD.vcxproj b/Source/TestSuite/PAD/PAD.vcxproj
deleted file mode 100644
index adb48efc53..0000000000
--- a/Source/TestSuite/PAD/PAD.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D58C9AD5-7200-488A-B1E8-9250E64CDD45}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_pad.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_pad.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/PAD/source/dolphintest_pad.cpp b/Source/TestSuite/PAD/source/dolphintest_pad.cpp
deleted file mode 100644
index ef85a4c356..0000000000
--- a/Source/TestSuite/PAD/source/dolphintest_pad.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <gccore.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ogcsys.h>
-
-#include <iostream>
-#include <debug.h>
-#include <math.h>
-
-
-static void* xfb = NULL;
-
-u32 first_frame = 1;
-GXRModeObj *rmode;
-vu16 oldstate;
-vu16 keystate;
-vu16 keydown;
-vu16 keyup;
-PADStatus pad[4];
-
-void Initialise();
-
-
-int main()
-{
-	Initialise();
-
-	while(1)
-	{
-		VIDEO_WaitVSync();
-
-		console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-		PAD_Read(pad);
-
-		for(int a = 0; a < 4;a ++)
-		{
-			if(pad[a].err & PAD_ERR_NO_CONTROLLER)
-			{
-				std::cout<<"pad["<<a<<"] Not Connected\n";
-				continue;
-			}
-			std::cout<<"pad["<<a<<"] Sticks: Main[ "<<(int)pad[a].stickX<<", "<<(int)pad[a].stickY<<" ] Sub[ "<<(int)pad[a].substickX<<", "<<(int)pad[a].substickX<<" ]\n";
-			std::cout<<"pad["<<a<<"] Analog Triggers: Left "<<(int)pad[a].triggerL<<" Right "<<(int)pad[a].triggerR<<"\n";
-			std::cout<<"pad["<<a<<"] Buttons: "<<
-				(pad[a].button & PAD_BUTTON_START? "Start " : "")<<
-				(pad[a].button & PAD_BUTTON_A ? "A " : "")<<
-				(pad[a].button & PAD_BUTTON_B ? "B " : "")<<
-				(pad[a].button & PAD_BUTTON_X ? "X " : "")<<
-				(pad[a].button & PAD_BUTTON_Y ? "Y " : "")<<
-				(pad[a].button & PAD_TRIGGER_Z? "Z " : "")<<
-				(pad[a].button & PAD_TRIGGER_L? "L " : "")<<
-				(pad[a].button & PAD_TRIGGER_R? "R " : "")<<std::endl;
-			std::cout<<"pad["<<a<<"] DPad: "<<
-				(pad[a].button & PAD_BUTTON_UP ? "Up " : "")<<
-				(pad[a].button & PAD_BUTTON_DOWN ? "Down " : "")<<
-				(pad[a].button & PAD_BUTTON_LEFT ? "Left " : "")<<
-				(pad[a].button & PAD_BUTTON_RIGHT ? "Right " : "")<<std::endl;
-			}
-	}	
-}
-
-void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// This function initialises the attached controllers
-	PAD_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
diff --git a/Source/TestSuite/RTC/Makefile b/Source/TestSuite/RTC/Makefile
deleted file mode 100644
index fbdb823cad..0000000000
--- a/Source/TestSuite/RTC/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/gamecube_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/RTC/RTC.vcxproj b/Source/TestSuite/RTC/RTC.vcxproj
deleted file mode 100644
index 27455ba6cc..0000000000
--- a/Source/TestSuite/RTC/RTC.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_rtc.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_rtc.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/RTC/source/dolphintest_rtc.cpp b/Source/TestSuite/RTC/source/dolphintest_rtc.cpp
deleted file mode 100644
index bcab3588af..0000000000
--- a/Source/TestSuite/RTC/source/dolphintest_rtc.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <gccore.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ogcsys.h>
-#include <time.h>
-#include <sys/time.h>
-
-#include <iostream>
-#include <debug.h>
-#include <math.h>
-
-static void *xfb = NULL;
-
-u32 first_frame = 1;
-GXRModeObj *rmode;
-
-void Initialise();
-
-
-int main()
-{
-	Initialise();
-
-	time_t gc_time;
-	gc_time = time(NULL);
-
-	srand(gc_time);
-
-	while(1)
-	{
-		gc_time = time(NULL);
-		std::cout<<"\x1b[10;0HGC RTC time is"<<ctime(&gc_time);
-
-		VIDEO_WaitVSync();
-	}
-}
-
-void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// This function initialises the attached controllers
-	PAD_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
diff --git a/Source/TestSuite/SI/Makefile b/Source/TestSuite/SI/Makefile
deleted file mode 100644
index dab00344c8..0000000000
--- a/Source/TestSuite/SI/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lfat -logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/SI/SI.vcxproj b/Source/TestSuite/SI/SI.vcxproj
deleted file mode 100644
index 13ce926990..0000000000
--- a/Source/TestSuite/SI/SI.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{87F20A25-A3F8-46A3-AC32-3C16782494B1}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_si.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_si.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/SI/source/dolphintest_si.cpp b/Source/TestSuite/SI/source/dolphintest_si.cpp
deleted file mode 100644
index f20cab8976..0000000000
--- a/Source/TestSuite/SI/source/dolphintest_si.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <ogcsys.h>
-#include <gccore.h>
-#include <iostream>
-#include <iomanip>
-#include <unistd.h>
-#include <fat.h>
-
-#ifdef HW_RVL
-#include <wiiuse/wpad.h>
-#include <sdcard/wiisd_io.h>
-#endif
-
-static void *xfb;
-static GXRModeObj *rmode;
-
-void Initialise();
-void (*reboot)() = (void(*)())0x80001800;
-static u32* const SI_REG = (u32*)0xCD006400;
-static bool haveInit = false;
-static int counter = 0;
-static bool logWritten = false;
-
-void AppendSDLog()
-{
-#ifdef HW_RVL
-	FILE *f = fopen("sd:/si_log.txt", "a");
-	if (f)
-	{
-		fprintf(f, "\n-------------------------------------\n");
-		for (int i = 0; i < 4; i++)
-			fprintf(f, "%i\tstatus: %x\t type:%x\n", i, SI_GetStatus(i), SI_GetType(i));
-		u32 x = 0;
-		fprintf(f, "-------------------------------------\n");
-		fprintf(f, "SI_CHANNEL_0_OUT\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_0_IN_HI\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_0_IN_LO\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_1_OUT\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_1_IN_HI\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_1_IN_LO\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_2_OUT\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_2_IN_HI\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_2_IN_LO\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_3_OUT\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_3_IN_HI\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_CHANNEL_3_IN_LO\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_POLL\t\t\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_COM_CSR\t\t\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_STATUS_REG\t\t%08x\n", SI_REG[x++]);
-		fprintf(f, "SI_EXI_CLOCK_COUNT\t%08x\n", SI_REG[x++]);
-		fprintf(f, "-------------------------------------\n");
-		fclose(f);
-	}
-#endif
-}
-
-int main(int argc, char **argv)
-{
-	Initialise();
-
-	while(1) {
-		if (haveInit) PAD_ScanPads();
-
-		VIDEO_ClearFrameBuffer(rmode, xfb, COLOR_BLACK);
-
-		printf("\x1b[4;0H");
-
-		for(int Chan = 0; Chan < 4; Chan++)
-			printf("%i\tstatus: %x\t type:%x\n", Chan, SI_GetStatus(Chan), SI_GetType(Chan));
-
-		printf("SI Regs: (cc006000)\n");
-		for (u32 i = 0; i < 16/*num SI regs*/; ++i)
-		{
-			printf("%08x ", SI_REG[i]);
-			if ((i+1)%8==0) printf("\n");
-		}
-
-		if (haveInit)
-			printf("\nPAD_Init\n");
-
-		VIDEO_WaitVSync();
-
-		if (haveInit)
-		{
-			if (PAD_ButtonsDown(0) & PAD_BUTTON_START)
-			{
-				AppendSDLog();
-			#ifdef HW_RVL
-				fatUnmount("sd");
-				__io_wiisd.shutdown();
-			#endif
-				reboot();
-			}
-		}
-
-		counter++;
-		AppendSDLog();
-		if (counter > 5 && !haveInit)
-		{
-			PAD_Init();
-			haveInit = true;
-		}
-		else if (haveInit && !logWritten)
-		{
-			logWritten = true;
-		}
-	}
-
-	return 0;
-}
-
-void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-
-#ifdef HW_RVL
-	// Initialize FAT so we can write to SD.
-	__io_wiisd.startup();
-	fatMountSimple("sd", &__io_wiisd);
-#endif
-}
diff --git a/Source/TestSuite/TestSuite.sln b/Source/TestSuite/TestSuite.sln
deleted file mode 100644
index f5463a38d6..0000000000
--- a/Source/TestSuite/TestSuite.sln
+++ /dev/null
@@ -1,91 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{057B2E90-B8A7-431E-9FA2-68AC8ABABCC5}"
-	ProjectSection(SolutionItems) = preProject
-		Makefile = Makefile
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GX", "GX\GX.vcxproj", "{F45E42B2-939B-4F02-954B-E68251FD4CCF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SI", "SI\SI.vcxproj", "{87F20A25-A3F8-46A3-AC32-3C16782494B1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RTC", "RTC\RTC.vcxproj", "{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAD", "PAD\PAD.vcxproj", "{D58C9AD5-7200-488A-B1E8-9250E64CDD45}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXI", "EXI\EXI.vcxproj", "{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AX", "AX\AX.vcxproj", "{9F053346-A33D-4E4F-874E-CBA1AF809FC3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ARAM", "ARAM\ARAM.vcxproj", "{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WPAD", "WPAD\WPAD.vcxproj", "{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WRTC", "WRTC\WRTC.vcxproj", "{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WSD", "WSD\WSD.vcxproj", "{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FPU", "FPU\FPU.vcxproj", "{18373B64-BCAB-4677-A070-7AD45D4C8304}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASM", "ASM\ASM.vcxproj", "{B0723635-279A-44E0-80A6-FC21DBB7A4B4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F45E42B2-939B-4F02-954B-E68251FD4CCF}.Debug|Win32.ActiveCfg = Release|Win32
-		{F45E42B2-939B-4F02-954B-E68251FD4CCF}.Debug|Win32.Build.0 = Release|Win32
-		{F45E42B2-939B-4F02-954B-E68251FD4CCF}.Release|Win32.ActiveCfg = Release|Win32
-		{F45E42B2-939B-4F02-954B-E68251FD4CCF}.Release|Win32.Build.0 = Release|Win32
-		{87F20A25-A3F8-46A3-AC32-3C16782494B1}.Debug|Win32.ActiveCfg = Release|Win32
-		{87F20A25-A3F8-46A3-AC32-3C16782494B1}.Debug|Win32.Build.0 = Release|Win32
-		{87F20A25-A3F8-46A3-AC32-3C16782494B1}.Release|Win32.ActiveCfg = Release|Win32
-		{87F20A25-A3F8-46A3-AC32-3C16782494B1}.Release|Win32.Build.0 = Release|Win32
-		{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Debug|Win32.ActiveCfg = Release|Win32
-		{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Debug|Win32.Build.0 = Release|Win32
-		{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Release|Win32.ActiveCfg = Release|Win32
-		{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Release|Win32.Build.0 = Release|Win32
-		{D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Debug|Win32.ActiveCfg = Release|Win32
-		{D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Debug|Win32.Build.0 = Release|Win32
-		{D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Release|Win32.Build.0 = Release|Win32
-		{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Debug|Win32.Build.0 = Debug|Win32
-		{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Release|Win32.ActiveCfg = Release|Win32
-		{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Release|Win32.Build.0 = Release|Win32
-		{9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Debug|Win32.ActiveCfg = Release|Win32
-		{9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Debug|Win32.Build.0 = Release|Win32
-		{9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Release|Win32.ActiveCfg = Release|Win32
-		{9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Release|Win32.Build.0 = Release|Win32
-		{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Debug|Win32.ActiveCfg = Release|Win32
-		{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Debug|Win32.Build.0 = Release|Win32
-		{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Release|Win32.ActiveCfg = Release|Win32
-		{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Release|Win32.Build.0 = Release|Win32
-		{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Debug|Win32.ActiveCfg = Release|Win32
-		{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Debug|Win32.Build.0 = Release|Win32
-		{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.ActiveCfg = Release|Win32
-		{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.Build.0 = Release|Win32
-		{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}.Debug|Win32.ActiveCfg = Release|Win32
-		{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}.Debug|Win32.Build.0 = Release|Win32
-		{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}.Release|Win32.ActiveCfg = Release|Win32
-		{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}.Release|Win32.Build.0 = Release|Win32
-		{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}.Debug|Win32.ActiveCfg = Release|Win32
-		{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}.Debug|Win32.Build.0 = Release|Win32
-		{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}.Release|Win32.ActiveCfg = Release|Win32
-		{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}.Release|Win32.Build.0 = Release|Win32
-		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Debug|Win32.Build.0 = Debug|Win32
-		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Release|Win32.ActiveCfg = Release|Win32
-		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Release|Win32.Build.0 = Release|Win32
-		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Debug|Win32.ActiveCfg = Release|Win32
-		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Debug|Win32.Build.0 = Release|Win32
-		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Release|Win32.ActiveCfg = Release|Win32
-		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Source/TestSuite/WPAD/Makefile b/Source/TestSuite/WPAD/Makefile
deleted file mode 100644
index 0f42da56db..0000000000
--- a/Source/TestSuite/WPAD/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-run:
-	wiiload $(TARGET).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/WPAD/WPAD.vcxproj b/Source/TestSuite/WPAD/WPAD.vcxproj
deleted file mode 100644
index 242475399d..0000000000
--- a/Source/TestSuite/WPAD/WPAD.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_wpad.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_wpad.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/WPAD/source/dolphintest_wpad.cpp b/Source/TestSuite/WPAD/source/dolphintest_wpad.cpp
deleted file mode 100644
index 8530023015..0000000000
--- a/Source/TestSuite/WPAD/source/dolphintest_wpad.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-// This file is from wiibrew.org: http://wiibrew.org/wiki/How_to_use_the_Wiimote
-
-//code by WinterMute
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <string.h>
-#include <malloc.h>
-#include <ogcsys.h>
-#include <gccore.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <math.h>
-#include <wiiuse/wpad.h>
-
-static GXRModeObj *rmode = NULL;
-
-//-----------------------------------------------------------------------------------
-//doreload - a flag that tells the program to quit looping and exit the program to the HBChannel.
-//dooff - a flag that tells the program to quit looping and properly shutdown the system.
-int doreload=0, dooff=0;
-
-//Calling the function will end the while loop and properly exit the program to the HBChannel.
-void reload(void) {
-	doreload=1;
-}
-
-//Calling the function will end the while loop and properly shutdown the system.
-// QUESTION: why calling the shutdown function direcly here halts the console?
-void shutdown(void) {
-	dooff=1;
-}
-
-//Draw a square on the screen (May draw rectangles as well, I am uncertain).
-//*xfb - framebuffer
-//*rmode - !unsure!
-//w - Width of screen (Used as scale factor in converting fx to pixel coordinates)
-//h - Height of screen (Used as scale factor in converting fy to pixel coordinates)
-//fx - X coordinate to draw on the screen (0-w)
-//fy - Y coordinate to draw on the screen (!unsure!-h)
-//color - the color of the rectangle (Examples: COLOR_YELLOW, COLOR_RED, COLOR_GREEN, COLOR_BLUE, COLOR_BLACK, COLOR_WHITE)
-void drawdot(void *xfb, GXRModeObj *rmode, float w, float h, float fx, float fy, u32 color) {
-
-	//*fb - !unsure!
-	//px - !unsure!
-	//py - !unsure!
-	//x - !unsure!
-	//y - !unsure!
-
-	u32 *fb;
-	int px,py;
-	int x,y;
-
-
-	fb = (u32*)xfb;
-
-	y = fy * rmode->xfbHeight / h;
-	x = fx * rmode->fbWidth / w / 2;
-
-	for(py=y-4; py<=(y+4); py++) {
-		if(py < 0 || py >= rmode->xfbHeight)
-			continue;
-		for(px=x-2; px<=(x+2); px++) {
-			if(px < 0 || px >= rmode->fbWidth/2)
-				continue;
-			fb[rmode->fbWidth/VI_DISPLAY_PIX_SZ*py + px] = color;
-		}
-	}
-
-}
-
-int evctr = 0;
-void countevs(int chan, const WPADData *data) {
-	evctr++;
-}
-
-void print_wiimote_connection_status(int wiimote_connection_status) {
-	switch(wiimote_connection_status) {
-		case WPAD_ERR_NO_CONTROLLER:
-			std::cout<<"  Wiimote not connected\n";
-			break;
-		case WPAD_ERR_NOT_READY:
-			std::cout<<"  Wiimote not ready\n";
-			break;
-		case WPAD_ERR_NONE:
-			std::cout<<"  Wiimote ready\n";
-			break;
-		default:
-			std::cout<<"  Unknown Wimote state "<<wiimote_connection_status<<"\n";
-	}
-}
-
-void print_wiimote_buttons(WPADData *wd) {
-	std::cout<<"  Buttons down:\n   ";
-	if(wd->btns_h & WPAD_BUTTON_A) std::cout<<"A ";
-	if(wd->btns_h & WPAD_BUTTON_B) std::cout<<"B ";
-	if(wd->btns_h & WPAD_BUTTON_1) std::cout<<"1 ";
-	if(wd->btns_h & WPAD_BUTTON_2) std::cout<<"2 ";
-	if(wd->btns_h & WPAD_BUTTON_MINUS) std::cout<<"MINUS ";
-	if(wd->btns_h & WPAD_BUTTON_HOME) std::cout<<"HOME ";
-	if(wd->btns_h & WPAD_BUTTON_PLUS) std::cout<<"PLUS ";
-	std::cout<<"\n   ";
-	if(wd->btns_h & WPAD_BUTTON_LEFT) std::cout<<"LEFT ";
-	if(wd->btns_h & WPAD_BUTTON_RIGHT) std::cout<<"RIGHT ";
-	if(wd->btns_h & WPAD_BUTTON_UP) std::cout<<"UP ";
-	if(wd->btns_h & WPAD_BUTTON_DOWN) std::cout<<"DOWN ";
-	std::cout<<"\n";
-}
-
-void print_and_draw_wiimote_data(void *screen_buffer) {
-	//Makes the var wd point to the data on the wiimote
-	WPADData *wd = WPAD_Data(0);
-	std::cout<<"  Data->Err: "<<wd->err<<"\n";
-	std::cout<<"  IR Dots:\n";
-	int i;
-	for(i=0; i<4; i++) {
-		if(wd->ir.dot[i].visible) {
-			std::cout<<"   "<<wd->ir.dot[i].rx<<", "<<wd->ir.dot[i].ry<<"\n";
-			drawdot(screen_buffer, rmode, 1024, 768, wd->ir.dot[i].rx, wd->ir.dot[i].ry, COLOR_YELLOW);
-		} else {
-			std::cout<<"   None\n";
-		}
-	}
-	//ir.valid - TRUE is the wiimote is pointing at the screen, else it is false
-	if(wd->ir.valid) {
-		float theta = wd->ir.angle / 180.0 * M_PI;
-
-		//ir.x/ir.y - The x/y coordinates that the wiimote is pointing to, relative to the screen.
-		//ir.angle - how far (in degrees) the wiimote is twisted (based on ir)
-		std::cout<<"  Cursor: "<<wd->ir.x<<","<<wd->ir.y<<"\n";
-		std::cout<<"    @ "<<wd->ir.angle<<" deg\n";
-
-		drawdot(screen_buffer, rmode, rmode->fbWidth, rmode->xfbHeight, wd->ir.x, wd->ir.y, COLOR_RED);
-		drawdot(screen_buffer, rmode, rmode->fbWidth, rmode->xfbHeight, wd->ir.x + 10*sinf(theta), wd->ir.y - 10*cosf(theta), COLOR_BLUE);        
-	} else {
-		std::cout<<"  No Cursor\n\n";
-	}
-	if(wd->ir.raw_valid) {
-		//ir.z - How far away the wiimote is from the screen in meters
-		std::cout<<"  Distance: "<<wd->ir.z<<"m\n";
-		//orient.yaw - The left/right angle of the wiimote to the screen
-		std::cout<<"  Yaw: "<<wd->orient.yaw<<" deg\n";
-	} else {
-		std::cout<<"\n\n";
-	}
-	std::cout<<"  Accel:\n";
-	//accel.x/accel.y/accel.z - analog values for the accelleration of the wiimote
-	//(Note: Gravity pulls downwards, so even if the wiimote is not moving,
-	//one(or more) axis will have a reading as if it is moving "upwards")
-	std::cout<<"   XYZ: "<<wd->accel.x<<","<<wd->accel.y<<","<<wd->accel.z<<"\n";
-	//orient.pitch - how far the wiimote is "tilted" in degrees
-	std::cout<<"   Pitch: "<<wd->orient.pitch<<"\n";
-	//orient.roll - how far the wiimote is "twisted" in degrees (uses accelerometer)
-	std::cout<<"   Roll:  "<<wd->orient.roll<<"\n";
-
-	print_wiimote_buttons(wd);
-
-	if(wd->ir.raw_valid) {
-		for(i=0; i<2; i++) {
-			drawdot(screen_buffer, rmode, 4, 4, wd->ir.sensorbar.rot_dots[i].x+2, wd->ir.sensorbar.rot_dots[i].y+2, COLOR_GREEN);
-		}
-	}
-
-	if(wd->btns_h & WPAD_BUTTON_1) doreload=1;
-}
-
-int main(int argc, char **argv) {
-	void *xfb[2];
-	u32 type;
-	int fbi = 0;
-
-	VIDEO_Init();
-	PAD_Init();
-	WPAD_Init();
-
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// double buffering, prevents flickering (is it needed for LCD TV? i don't have one to test)
-	xfb[0] = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-	xfb[1] = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	VIDEO_Configure(rmode);
-	VIDEO_SetNextFramebuffer(xfb);
-	VIDEO_SetBlack(FALSE);
-	VIDEO_Flush();
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-
-	SYS_SetResetCallback(reload);
-	SYS_SetPowerCallback(shutdown);
-
-	WPAD_SetDataFormat(0, WPAD_FMT_BTNS_ACC_IR);
-	WPAD_SetVRes(0, rmode->fbWidth, rmode->xfbHeight);
-
-	while(!doreload && !dooff) {
-		CON_Init(xfb[fbi],0,0,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-		//VIDEO_ClearFrameBuffer(rmode,xfb[fbi],COLOR_BLACK);
-		std::cout<<"\n\n\n";
-		WPAD_ReadPending(WPAD_CHAN_ALL, countevs);
-		int wiimote_connection_status = WPAD_Probe(0, &type);
-		print_wiimote_connection_status(wiimote_connection_status);
-
-		std::cout<<"  Event count: "<<evctr<<"\n";
-		if(wiimote_connection_status == WPAD_ERR_NONE) {
-			print_and_draw_wiimote_data(xfb[fbi]);
-		}
-		VIDEO_SetNextFramebuffer(xfb[fbi]);
-		VIDEO_Flush();
-		VIDEO_WaitVSync();
-		fbi ^= 1;
-	}
-	if(doreload) return 0;
-	if(dooff) SYS_ResetSystem(SYS_SHUTDOWN,0,0);
-
-	return 0;
-}
diff --git a/Source/TestSuite/WRTC/Makefile b/Source/TestSuite/WRTC/Makefile
deleted file mode 100644
index 0f42da56db..0000000000
--- a/Source/TestSuite/WRTC/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-run:
-	wiiload $(TARGET).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/WRTC/WRTC.vcxproj b/Source/TestSuite/WRTC/WRTC.vcxproj
deleted file mode 100644
index 43e4f045b2..0000000000
--- a/Source/TestSuite/WRTC/WRTC.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F75021E3-73BF-425C-BA57-3FE7E2F6E02C}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_wrtc.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_wrtc.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp b/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
deleted file mode 100644
index fa70d8dc62..0000000000
--- a/Source/TestSuite/WRTC/source/dolphintest_wrtc.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <gccore.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ogcsys.h>
-#include <time.h>
-#include <sys/time.h>
-#include <ogc/lwp_watchdog.h>
-#include <iostream>
-#include <debug.h>
-#include <math.h>
-
-static void *xfb = NULL;
-
-u32 first_frame = 1;
-GXRModeObj *rmode;
-
-inline void Initialise()
-{
-	// Initialise the video system
-	VIDEO_Init();
-
-	// This function initialises the attached controllers
-	PAD_Init();
-
-	// Obtain the preferred video mode from the system
-	// This will correspond to the settings in the Wii menu
-	rmode = VIDEO_GetPreferredMode(NULL);
-
-	// Allocate memory for the display in the uncached region
-	xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-
-	// Initialise the console, required for printf
-	console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-
-	// Set up the video registers with the chosen mode
-	VIDEO_Configure(rmode);
-
-	// Tell the video hardware where our display memory is
-	VIDEO_SetNextFramebuffer(xfb);
-
-	// Make the display visible
-	VIDEO_SetBlack(FALSE);
-
-	// Flush the video register changes to the hardware
-	VIDEO_Flush();
-
-	// Wait for Video setup to complete
-	VIDEO_WaitVSync();
-	if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-}
-
-int main()
-{
-	Initialise();
-
-	time_t wii_time;
-//settime(secs_to_ticks(time(NULL) - 0x386D4380));
-	wii_time = time(NULL);
-
-	std::cout << "\x1b[20;0HWii RTC time is " <<ctime(&wii_time) <<" "<< wii_time;
-
-	while(1)
-	{
-		wii_time = time(NULL);
-		std::cout << "\x1b[10;0HWii RTC time is " << ctime(&wii_time) <<" "<< wii_time;
-
-		VIDEO_WaitVSync();
-	}
-}
diff --git a/Source/TestSuite/WSD/Makefile b/Source/TestSuite/WSD/Makefile
deleted file mode 100644
index cc2028af36..0000000000
--- a/Source/TestSuite/WSD/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#---------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-include $(DEVKITPPC)/wii_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data  
-INCLUDES	:=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-
-CFLAGS	= -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	$(CFLAGS)
-
-LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -lfat -logc -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-#---------------------------------------------------------------------------------
-# automatically build a list of object files for our project
-#---------------------------------------------------------------------------------
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-	export LD	:=	$(CC)
-else
-	export LD	:=	$(CXX)
-endif
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
-					$(sFILES:.s=.o) $(SFILES:.S=.o)
-
-#---------------------------------------------------------------------------------
-# build a list of include paths
-#---------------------------------------------------------------------------------
-export INCLUDE	:=	$(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
-
-#---------------------------------------------------------------------------------
-# build a list of library paths
-#---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-					-L$(LIBOGC_LIB)
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-.PHONY: $(BUILD) clean
-
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-
-#---------------------------------------------------------------------------------
-run:
-	wiiload $(TARGET).dol
-
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT).dol: $(OUTPUT).elf
-$(OUTPUT).elf: $(OFILES)
-
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .jpg extension
-#---------------------------------------------------------------------------------
-%.jpg.o	:	%.jpg
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
diff --git a/Source/TestSuite/WSD/WSD.vcxproj b/Source/TestSuite/WSD/WSD.vcxproj
deleted file mode 100644
index e955d74951..0000000000
--- a/Source/TestSuite/WSD/WSD.vcxproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F250A358-225C-4B50-ABAE-5B3D4EC9DC4E}</ProjectGuid>
-    <RootNamespace>TestSuite</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean &amp;&amp; make -r 2&gt;&amp;1 | sed -e %27s/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/’</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">make clean</NMakeCleanCommandLine>
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dolphintest_wrtc.dol</NMakeOutput>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\include;C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>build\BuildLog.htm</Path>
-    </BuildLog>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="source\dolphintest_wsd.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/TestSuite/WSD/source/dolphintest_wsd.cpp b/Source/TestSuite/WSD/source/dolphintest_wsd.cpp
deleted file mode 100644
index 52fbe4bbf8..0000000000
--- a/Source/TestSuite/WSD/source/dolphintest_wsd.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// SD card insertion/removal callback demo
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <gccore.h>
-#include <wiiuse/wpad.h>
-
-
-#define IOCTL_SDIO_SENDCMD      0x07
-
-#define SDIO_CMD_REGINTR      0x40
-#define SDIO_CMD_UNREGINTR      0x41
-
-#define SD_INSERT_EVENT        0x01
-#define SD_REMOVE_EVENT        0x02
-
-static struct _sdiorequest
-{
-  u32 cmd;
-  u32 cmd_type;
-  u32 rsp_type;
-  u32 arg;
-  u32 blk_cnt;
-  u32 blk_size;
-  void *dma_addr;
-  u32 isdma;
-  u32 pad0;
-} sd_req;
-
-static struct _sdioresponse
-{
-  u32 rsp_fields[3];
-  u32 acmd12_response;
-} sd_resp;
-
-static s32 __sd0_fd = -1;
-static const char _sd0_fs[] ATTRIBUTE_ALIGN(32) = "/dev/sdio/slot0";
-
-static s32 __sdio_getinterrupt(u32 hook, ipccallback cb)
-{
-  memset(&sd_req, 0, sizeof(sd_req));
-
-  sd_req.cmd = SDIO_CMD_REGINTR;
-  sd_req.arg = hook;
-
-  if (hook==SD_INSERT_EVENT)
-    printf("Requesting insert event %p %p\n", cb, &sd_resp);
-  else if (hook==SD_REMOVE_EVENT)
-    printf("Requesting removal event %p %p\n", cb, &sd_resp);
-  else
-    printf("I don't know what I'm requesting here: hook=%u\n", hook);
-
-  if (__sd0_fd<0)
-    __sd0_fd = IOS_Open(_sd0_fs,1);
-
-  if (__sd0_fd>=0)
-    return IOS_IoctlAsync(__sd0_fd,IOCTL_SDIO_SENDCMD,&sd_req,sizeof(sd_req),&sd_resp,sizeof(sd_resp),cb,NULL);
-
-  // else return the IOS_Open error code
-  return __sd0_fd;
-}
-
-static s32 __sdio_releaseinterrupt(void)
-{
-  if (__sd0_fd<0)
-    return 0;
-
-  // this command makes the IOS_IoctlAsync call above return a response immediately
-
-  // sd_req.arg is already set to the right value (1 or 2, whatever was used last)
-  sd_req.cmd = SDIO_CMD_UNREGINTR;
-  return IOS_Ioctl(__sd0_fd,IOCTL_SDIO_SENDCMD,&sd_req,sizeof(sd_req),&sd_resp,sizeof(sd_resp));
-}
-
-static void sd_cb(u32 ret, void* unused)
-{
-  printf("Got an SD interrupt, ret = %08X\n", ret);
-  printf("Response data: %08X %08X %08X %08X\n", sd_resp.rsp_fields[0], sd_resp.rsp_fields[1], sd_resp.rsp_fields[2], sd_resp.acmd12_response);
-
-  if (ret==SD_INSERT_EVENT)
-  {
-    printf("SD card was inserted\n");
-    // tell us when it gets removed
-    __sdio_getinterrupt(SD_REMOVE_EVENT, (ipccallback)sd_cb);
-  }
-  else if (ret==SD_REMOVE_EVENT)
-  {
-    printf("SD card was removed\n");
-    // tell us when something is inserted
-    __sdio_getinterrupt(SD_INSERT_EVENT, (ipccallback)sd_cb);
-  }
-  else
-    printf("Unknown SD int: %08X\n", ret);
-}
-
-
-
-static void *xfb = NULL;
-static GXRModeObj *rmode = NULL;
-
-int main(int argc, char **argv) {
-  VIDEO_Init();
-  WPAD_Init();
-  rmode = VIDEO_GetPreferredMode(NULL);
-  xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-  console_init(xfb,20,20,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
-  VIDEO_Configure(rmode);
-  VIDEO_SetNextFramebuffer(xfb);
-  VIDEO_SetBlack(FALSE);
-  VIDEO_Flush();
-  VIDEO_WaitVSync();
-  if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-
-  printf("\x1b[2;0H");
-  printf("SD Card insertion/removal demo\n");
-  printf("Press HOME at any time to exit\n");
-
-  __sdio_getinterrupt(SD_INSERT_EVENT, (ipccallback)sd_cb);
-
-  while(1) {
-    WPAD_ScanPads();
-    u32 pressed = WPAD_ButtonsDown(0);
-    if ( pressed & WPAD_BUTTON_HOME ) break;
-    VIDEO_WaitVSync();
-  }
-
-  printf("SD event release returned %d\n", __sdio_releaseinterrupt());
-  IOS_Close(__sd0_fd);
-
-  sleep(4);
-
-  return 0;
-}
diff --git a/Source/TestSuite/d.supp b/Source/TestSuite/d.supp
deleted file mode 100644
index ce6909e7ca..0000000000
--- a/Source/TestSuite/d.supp
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:*
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   fun:dlopen
-   fun:g_module_open
-   obj:/usr/lib/libgtk-x11-2.0.so.0.1200.9
-   fun:g_type_module_use
-   fun:gtk_theme_engine_get
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   fun:dlopen
-   fun:g_module_open
-   obj:/usr/lib/libgtk-x11-2.0.so.0.1200.9
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   fun:dlopen
-   fun:g_module_open
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libc-2.7.so
-   obj:/lib/libdl-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libdl-2.7.so
-   fun:dlsym
-   fun:g_module_symbol
-   fun:g_module_open
-   obj:/usr/lib/libgtk-x11-2.0.so.0.1200.9
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/ld-2.7.so
-   obj:/lib/libc-2.7.so
-   obj:/lib/ld-2.7.so
-   fun:__libc_dlopen_mode
-   obj:/lib/libc-2.7.so
-   obj:/lib/libc-2.7.so
-   obj:/lib/libc-2.7.so
-   obj:/lib/libc-2.7.so
-   obj:/lib/libc-2.7.so
-}
-{
-   <insert a suppression name here>
-   Memcheck:Cond
-   fun:snd_pcm_direct_shm_create_or_connect
-   fun:snd_pcm_dmix_open
-   fun:_snd_pcm_dmix_open
-   obj:/usr/lib/libasound.so.2.0.0
-   obj:/usr/lib/libasound.so.2.0.0
-   fun:snd_pcm_open_named_slave
-   fun:_snd_pcm_softvol_open
-   obj:/usr/lib/libasound.so.2.0.0
-   fun:snd_pcm_open_named_slave
-   fun:_snd_pcm_plug_open
-   obj:/usr/lib/libasound.so.2.0.0
-   fun:snd_pcm_open_named_slave
-}
-{
-   <insert a suppression name here>
-   Memcheck:Cond
-   obj:/usr/lib/libGLcore.so.169.12
-   obj:/usr/lib/libGLcore.so.169.12
-   fun:*
-}
-{
-   <insert a suppression name here>
-   Memcheck:Cond
-   obj:/usr/lib/libasound.so.2.0.0
-   obj:/usr/lib/libasound.so.2.0.0
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   fun:snd_pcm_poll_descriptors_revents
-   fun:snd_pcm_wait_nocheck
-   fun:snd_pcm_write_areas
-   obj:/usr/lib/libasound.so.2.0.0
-   obj:*
-}
-{
-   <insert a suppression name here>
-   Memcheck:Addr8
-   obj:/usr/lib/libasound.so.2.0.0
-   fun:snd_pcm_wait_nocheck
-   fun:snd_pcm_write_areas
-   obj:/usr/lib/libasound.so.2.0.0
-   obj:*
-}
-
diff --git a/Source/TestSuite/grind.sh b/Source/TestSuite/grind.sh
deleted file mode 100644
index 1224e52835..0000000000
--- a/Source/TestSuite/grind.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-valgrind --gen-suppressions=yes --suppressions=d.supp ./Dolphin $1 $2 $3
-
diff --git a/Source/UnitTests/AudioJitTests.cpp b/Source/UnitTests/AudioJitTests.cpp
deleted file mode 100644
index 7712f59fc3..0000000000
--- a/Source/UnitTests/AudioJitTests.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-#include "DSPJitTester.h"
-
-void nx_dr()
-{
-	DSPJitTester tester(0x8000, 0x0004);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.TestAll();
-	tester.Report();
-}
-
-void nx_ir()
-{
-	DSPJitTester tester(0x8000, 0x0008);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.TestAll();
-	tester.Report();
-}
-
-void nx_nr()
-{
-	DSPJitTester tester(0x8000, 0x000c);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_IX0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void nx_mv()
-{
-	DSPJitTester tester(0x8000, 0x0010);
-	tester.AddTestData(DSP_REG_ACL0);
-	tester.AddTestData(DSP_REG_AXL0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void dar()
-{
-	DSPJitTester tester(0x0004);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.TestAll();
-	tester.Report();
-}
-void iar()
-{
-	DSPJitTester tester(0x0008);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.TestAll();
-	tester.Report();
-}
-void subarn()
-{
-	DSPJitTester tester(0x000c);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_IX0);
-	tester.TestAll();
-	tester.Report();
-}
-void addarn()
-{
-	DSPJitTester tester(0x0010);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_IX0);
-	tester.TestAll();
-	tester.Report();
-}
-void sbclr()
-{
-	DSPJitTester tester(0x1200);
-	tester.AddTestData(DSP_REG_SR);
-	tester.TestAll();
-	tester.Report();
-}
-void sbset()
-{
-	DSPJitTester tester(0x1300);
-	tester.AddTestData(DSP_REG_SR);
-	tester.TestAll();
-	tester.Report();
-}
-
-void nx_s() 
-{
-	DSPJitTester tester(0x8000, 0x0020);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_ACL0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void nx_sn() 
-{
-	DSPJitTester tester(0x8000, 0x0024);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_IX0);
-	tester.AddTestData(DSP_REG_ACL0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void nx_l() 
-{
-
-	DSPJitTester tester(0x8000, 0x0040);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_AXL0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void set16_l() 
-{
-
-	DSPJitTester tester(0x8e00, 0x0070);
-	tester.AddTestData(DSP_REG_SR, 0);
-	tester.AddTestData(DSP_REG_SR, SR_40_MODE_BIT);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_ACM0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void nx_ln() 
-{
-	DSPJitTester tester(0x8000, 0x0044);
-	tester.AddTestData(DSP_REG_AR0);
-	tester.AddTestData(DSP_REG_WR0);
-	tester.AddTestData(DSP_REG_IX0);
-	tester.AddTestData(DSP_REG_AXL0);
-	tester.TestAll(true);
-	tester.Report();
-}
-
-void nx_ls() 
-{
-	DSPJitTester tester1(0x8000, 0x0080);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x0080);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_lsn() 
-{
-	DSPJitTester tester1(0x8000, 0x0084);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.AddTestData(DSP_REG_IX0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x0084);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_lsm() 
-{
-	DSPJitTester tester1(0x8000, 0x0088);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x0088);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.AddTestData(DSP_REG_IX3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_lsnm() 
-{
-	DSPJitTester tester1(0x8000, 0x008c);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.AddTestData(DSP_REG_IX0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x008c);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.AddTestData(DSP_REG_IX3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_sl() 
-{
-	DSPJitTester tester1(0x8000, 0x0082);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x0082);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_sln() 
-{
-	DSPJitTester tester1(0x8000, 0x0086);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.AddTestData(DSP_REG_IX0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x0086);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_slm() 
-{
-	DSPJitTester tester1(0x8000, 0x008a);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x008a);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.AddTestData(DSP_REG_IX3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_slnm() 
-{
-	DSPJitTester tester1(0x8000, 0x008e);
-	tester1.AddTestData(DSP_REG_ACM0);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.AddTestData(DSP_REG_IX0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x008e);
-	tester2.AddTestData(DSP_REG_ACM0);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.AddTestData(DSP_REG_IX3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void nx_ld() 
-{
-	DSPJitTester tester1(0x8000, 0x00c0);
-	tester1.AddTestData(DSP_REG_AXL0,0xdead);
-	tester1.AddTestData(DSP_REG_AXL1,0xbeef);
-	tester1.AddTestData(DSP_REG_AR0);
-	tester1.AddTestData(DSP_REG_WR0);
-	tester1.AddTestData(DSP_REG_IX0);
-	tester1.TestAll(true);
-	tester1.Report();
-
-	DSPJitTester tester2(0x8000, 0x00c0);
-	tester2.AddTestData(DSP_REG_AXL0,0xdead);
-	tester2.AddTestData(DSP_REG_AXL1,0xbeef);
-	tester2.AddTestData(DSP_REG_AR3);
-	tester2.AddTestData(DSP_REG_WR3);
-	tester2.AddTestData(DSP_REG_IX3);
-	tester2.TestAll(true);
-	tester2.Report();
-}
-
-void AudioJitTests()
-{
-	DSPJitTester::Initialize();
-	dar();
-	iar();
-	subarn();
-	addarn();
-	sbclr();
-	sbset();
-
-	nx_ir();
-	nx_dr();
-	nx_nr();
-	nx_mv();
-
-	set16_l();
-
-	nx_s();
-	nx_sn();
-	nx_l();
-	nx_ln();
-	nx_ls();
-	nx_lsn();
-	nx_lsm();
-	nx_lsnm();
-	nx_sl();
-	nx_sln();
-	nx_slm();
-	nx_slnm();
-	nx_ld();
-}
-
-//required to be able to link against DSPCore
-void DSPHost_UpdateDebugger() { }
-void DSPHost_CodeLoaded(unsigned const char*, int) { }
-void DSPHost_InterruptRequest() { }
-bool DSPHost_OnThread() { return false; }
-void DSPHost_WriteHostMemory(unsigned char, unsigned int) { }
-unsigned char DSPHost_ReadHostMemory(unsigned int) { return 0; }
diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt
index f86742555e..479d96c88e 100644
--- a/Source/UnitTests/CMakeLists.txt
+++ b/Source/UnitTests/CMakeLists.txt
@@ -1,6 +1,28 @@
-set(SRCS	AudioJitTests.cpp
-			DSPJitTester.cpp
-			UnitTests.cpp)
+set(LIBS core gtest)
+if(APPLE)
+	list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})
+endif()
+if(ANDROID)
+	set(LIBS ${LIBS} android log)
+endif()
+macro(add_dolphin_test target srcs)
+	# Since this is a Core dependency, it can't be linked as a library and has
+	# to be linked as an object file. Otherwise CMake inserts the library after
+	# core, but before other core dependencies like videocommon which also use
+	# Host_ functions.
+	set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
+	add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
+	set_target_properties(Test_${target} PROPERTIES OUTPUT_NAME Tests/${target})
+	add_custom_command(TARGET Test_${target}
+	                   PRE_LINK
+	                   COMMAND mkdir -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
+	target_link_libraries(Test_${target} ${LIBS})
+	add_dependencies(unittests Test_${target})
+	add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})
+endmacro(add_dolphin_test)
 
-add_executable(tester ${SRCS})
-target_link_libraries(tester core)
+add_subdirectory(TestUtils)
+
+add_subdirectory(Common)
+add_subdirectory(Core)
+add_subdirectory(VideoCommon)
diff --git a/Source/UnitTests/Common/BitFieldTest.cpp b/Source/UnitTests/Common/BitFieldTest.cpp
new file mode 100644
index 0000000000..f3a6a4ca2a
--- /dev/null
+++ b/Source/UnitTests/Common/BitFieldTest.cpp
@@ -0,0 +1,170 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <gtest/gtest.h>
+
+#include "Common/BitField.h"
+#include "Common/CommonTypes.h"
+
+union TestUnion
+{
+	u64 hex;
+
+	BitField< 0,64,u64> full_u64;   // spans whole storage
+	BitField< 0,64,s64> full_s64;   // spans whole storage
+
+	BitField< 9, 3,u64> regular_field_unsigned;  // a plain bitfield
+	BitField< 9, 3,u64> regular_field_unsigned2; // Just the very same bitfield again
+	BitField< 9, 3,s64> regular_field_signed;    // Same bitfield, but different sign
+
+	BitField<30, 4,s64> at_dword_boundary;  // goes over the boundary of two u32 values
+
+	BitField<15, 1,s64> signed_1bit;  // allowed values: -1 and 0
+};
+
+// table of raw numbers to test with
+static u64 table[] =
+{
+	0x0000000000000000ull, // all zero
+	0xffffffffffffffffull, // all one
+	0x7fffffffffffffffull, // all one apart from the sign bit
+	0x8000000000000000ull, // all zero apart from the sign bit
+	0x8000000000000048ull, // regular_field = 0b1001
+
+	// "random" numbers
+	0x0F7B8B1ABD9B8D3Full,
+	0xA8B86F73FDAADD2Dull,
+	0x1B17A557BFEB351Dull,
+	0xE3354268B0C2395Bull,
+};
+
+// Verify that bitfields in a union have the same underlying data
+TEST(BitField, Storage)
+{
+	TestUnion object;
+
+	EXPECT_EQ((void*)&object.hex, (void*)&object.regular_field_unsigned);
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.hex));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.full_u64));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.full_s64));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.regular_field_unsigned));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.regular_field_signed));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.at_dword_boundary));
+	EXPECT_EQ(sizeof(TestUnion), sizeof(object.signed_1bit));
+
+	// Now write some values to one field and check if this reflects properly
+	// in the others.
+	for (u64 val : table)
+	{
+		object.hex = val;
+		EXPECT_EQ(object.hex, object.full_u64);
+		EXPECT_EQ(object.regular_field_unsigned, object.regular_field_unsigned2);
+
+		object.regular_field_unsigned = val & 0x3;
+		EXPECT_EQ(object.hex, object.full_u64);
+		EXPECT_EQ(object.regular_field_unsigned, object.regular_field_unsigned2);
+	}
+}
+
+TEST(BitField, Read)
+{
+	TestUnion object;
+
+	for (u64 val : table)
+	{
+		object.hex = val;
+
+		// Make sure reading/casting does not behave completely idiotic
+		EXPECT_EQ(object.full_u64, (u64)object.full_u64);
+		EXPECT_EQ(object.full_s64, (s64)object.full_s64);
+		EXPECT_EQ(object.regular_field_unsigned, (u64)object.regular_field_unsigned);
+		EXPECT_EQ(object.regular_field_unsigned2, (u64)object.regular_field_unsigned2);
+		EXPECT_EQ(object.regular_field_signed, (s64)object.regular_field_signed);
+		EXPECT_EQ(object.at_dword_boundary, (s64)object.at_dword_boundary);
+		EXPECT_EQ(object.signed_1bit, (s64)object.signed_1bit);
+
+		// Now make sure the value is indeed correct
+		EXPECT_EQ(val, object.full_u64);
+		EXPECT_EQ(*(s64*)&val, object.full_s64);
+		EXPECT_EQ((val >> 9) & 0x7, object.regular_field_unsigned);
+		EXPECT_EQ((val >> 9) & 0x7, object.regular_field_unsigned2);
+		EXPECT_EQ(((s64)(object.hex << 52)) >> 61, object.regular_field_signed);
+		EXPECT_EQ(((s64)(object.hex << 30)) >> 60, object.at_dword_boundary);
+		EXPECT_EQ(((object.hex >> 15) & 1) ? -1 : 0, object.signed_1bit);
+	}
+}
+
+TEST(BitField, Assignment)
+{
+	TestUnion object;
+
+	for (u64 val : table)
+	{
+		// Assignments with fixed values
+		object.full_u64 = val;
+		EXPECT_EQ(val, object.full_u64);
+
+		object.full_s64 = (s64)val;
+		EXPECT_EQ(val, object.full_u64);
+
+		object.regular_field_unsigned = val;
+		EXPECT_EQ(val & 0x7, object.regular_field_unsigned);
+
+		object.at_dword_boundary = val;
+		EXPECT_EQ(((s64)(val << 60)) >> 60, object.at_dword_boundary);
+
+		object.signed_1bit = val;
+		EXPECT_EQ((val & 1) ? -1 : 0, object.signed_1bit);
+
+		object.regular_field_signed = val;
+		EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed);
+
+		// Assignment from other BitField
+		object.at_dword_boundary = object.regular_field_signed;
+		EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary);
+	}
+}
+
+// Test class behavior on oddly aligned structures.
+TEST(BitField, Alignment)
+{
+	#pragma pack(1)
+	struct OddlyAlignedTestStruct
+	{
+		u8 padding;
+		TestUnion obj;
+	};
+	#pragma pack()
+
+	GC_ALIGNED16(OddlyAlignedTestStruct test_struct);
+	TestUnion& object = test_struct.obj;
+	static_assert(alignof(decltype(test_struct.obj.signed_1bit)) == 1,
+		"Incorrect variable alignment");
+
+	for (u64 val : table)
+	{
+		// Assignments with fixed values
+		object.full_u64 = val;
+		EXPECT_EQ(val, object.full_u64);
+
+		object.full_s64 = (s64)val;
+		EXPECT_EQ(val, object.full_u64);
+
+		object.regular_field_unsigned = val;
+		EXPECT_EQ(val & 0x7, object.regular_field_unsigned);
+
+		object.at_dword_boundary = val;
+		EXPECT_EQ(((s64)(val << 60)) >> 60, object.at_dword_boundary);
+
+		object.signed_1bit = val;
+		EXPECT_EQ((val & 1) ? -1 : 0, object.signed_1bit);
+
+		object.regular_field_signed = val;
+		EXPECT_EQ(((s64)(object.hex << 61)) >> 61, object.regular_field_signed);
+
+		// Assignment from other BitField
+		object.at_dword_boundary = object.regular_field_signed;
+		EXPECT_EQ(object.regular_field_signed, object.at_dword_boundary);
+	}
+}
diff --git a/Source/UnitTests/Common/BitSetTest.cpp b/Source/UnitTests/Common/BitSetTest.cpp
new file mode 100644
index 0000000000..bac48eff76
--- /dev/null
+++ b/Source/UnitTests/Common/BitSetTest.cpp
@@ -0,0 +1,84 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <gtest/gtest.h>
+
+#include "Common/BitSet.h"
+
+TEST(BitSet, Basics)
+{
+	BitSet32 bs;
+	BitSet64 bs2(1);
+	BitSet64 bs3(2);
+	EXPECT_EQ(true, !!bs2);
+	EXPECT_EQ(false, !!bs);
+	EXPECT_EQ(bs2, bs2);
+	EXPECT_NE(bs2, bs3);
+	EXPECT_EQ(BitSet32(0xfff), BitSet32::AllTrue(12));
+	EXPECT_EQ(BitSet64(0xffffffffffffffff), BitSet64::AllTrue(64));
+}
+
+TEST(BitSet, BitGetSet)
+{
+	BitSet32 bs;
+	bs[3] = bs[8] = bs[11] = true;
+	EXPECT_EQ(true, bs[3]);
+	EXPECT_EQ(false, bs[4]);
+	EXPECT_EQ((u32)((1 << 3) | (1 << 8) | (1 << 11)), bs.m_val);
+}
+
+TEST(BitSet, Count)
+{
+	u32 random_numbers[] = {
+		0x2cb0b5f3,	0x81ab32a6,	0xd9030dc5,	0x325ffe26,	0xb2fcaee3,
+		0x4ccf188a,	0xf8be36dc,	0xb2fcecd5,	0xb750c2e5,	0x31d19074,
+		0xf267644a,	0xac00a719,	0x6d45f19b,	0xf7e91c5b,	0xf687e694,
+		0x9057c24e,	0x5eb65c39,	0x85d3038b,	0x101f4e66,	0xc202d136
+	};
+	u32 counts[] = {
+		17, 14, 14, 19, 20, 14, 20, 20, 16, 13, 16, 12, 18, 20, 18, 14, 18, 14, 14, 12
+	};
+	for (size_t i = 0; i < 20; i++)
+	{
+		EXPECT_EQ(counts[i], BitSet32(random_numbers[i]).Count());
+	}
+
+	u64 random_numbers_64[] = {
+		0xf86cd6f6ef09d7d4ULL, 0x6f2d8533255ead3cULL, 0x9da7941e0e52b345ULL,
+		0x06e4189be67d2b17ULL, 0x3eb0681f65cb6d25ULL, 0xccab8a7c74a51203ULL,
+		0x09d470516694c64bULL, 0x38cd077e075c778fULL, 0xd69ebfa6355ebfdeULL
+	};
+	u32 counts_64[] = {
+		39, 34, 31, 32, 33, 29, 27, 35, 43
+	};
+	for (size_t i = 0; i < 9; i++)
+	{
+		EXPECT_EQ(counts_64[i], BitSet64(random_numbers_64[i]).Count());
+	}
+}
+
+TEST(BitSet, BitOps)
+{
+	BitSet32 a(3), b(5), c;
+	EXPECT_EQ(BitSet32(7), a | b);
+	EXPECT_EQ(BitSet32(6), a ^ b);
+	EXPECT_EQ(BitSet32(1), a & b);
+	EXPECT_EQ(BitSet32(0xfffffffc), ~a);
+	c = a; c |= b; EXPECT_EQ(BitSet32(7), c);
+	c = a; c ^= b; EXPECT_EQ(BitSet32(6), c);
+	c = a; c &= b; EXPECT_EQ(BitSet32(1), c);
+}
+
+TEST(BitSet, InitializerListsAndIteration)
+{
+	std::vector<int> bits { 1, 10, 15, 17, 20, 30 };
+	BitSet32          bs  { 1, 10, 15, 17, 20, 30 };
+	auto vit = bits.begin();
+	for (auto i : bs)
+	{
+		EXPECT_NE(vit, bits.end());
+		EXPECT_EQ(i, *vit++);
+	}
+	EXPECT_EQ(vit, bits.end());
+}
diff --git a/Source/UnitTests/Common/BlockingLoopTest.cpp b/Source/UnitTests/Common/BlockingLoopTest.cpp
new file mode 100644
index 0000000000..805aca446c
--- /dev/null
+++ b/Source/UnitTests/Common/BlockingLoopTest.cpp
@@ -0,0 +1,84 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+#include <thread>
+
+#include <gtest/gtest.h>
+
+#include "Common/BlockingLoop.h"
+
+TEST(BlockingLoop, MultiThreaded)
+{
+	Common::BlockingLoop loop;
+	std::atomic<int> signaled_a(0);
+	std::atomic<int> received_a(0);
+	std::atomic<int> signaled_b(0);
+	std::atomic<int> received_b(0);
+	for (int i = 0; i < 100; i++)
+	{
+		// Invalidate the current state.
+		received_a.store(signaled_a.load() + 1);
+		received_b.store(signaled_b.load() + 123);
+
+		// Must not block as the loop is stopped.
+		loop.Wait();
+
+		std::thread loop_thread(
+		[&]() {
+			loop.Run(
+			[&]() {
+				received_a.store(signaled_a.load());
+				received_b.store(signaled_b.load());
+			});
+		});
+
+		// Now Wait must block.
+		loop.Prepare();
+
+		// The payload must run at least once on startup.
+		loop.Wait();
+		EXPECT_EQ(signaled_a.load(), received_a.load());
+		EXPECT_EQ(signaled_b.load(), received_b.load());
+
+		std::thread run_a_thread(
+		[&]() {
+			for (int j = 0; j < 100; j++)
+			{
+				for (int k = 0; k < 100; k++)
+				{
+					signaled_a++;
+					loop.Wakeup();
+				}
+
+				loop.Wait();
+				EXPECT_EQ(signaled_a.load(), received_a.load());
+			}
+		});
+		std::thread run_b_thread(
+		[&]() {
+			for (int j = 0; j < 100; j++)
+			{
+				for (int k = 0; k < 100; k++)
+				{
+					signaled_b++;
+					loop.Wakeup();
+				}
+
+				loop.Wait();
+				EXPECT_EQ(signaled_b.load(), received_b.load());
+			}
+		});
+
+		run_a_thread.join();
+		run_b_thread.join();
+
+		loop.Stop();
+
+		// Must not block
+		loop.Wait();
+
+		loop_thread.join();
+	}
+}
diff --git a/Source/UnitTests/Common/BusyLoopTest.cpp b/Source/UnitTests/Common/BusyLoopTest.cpp
new file mode 100644
index 0000000000..50d11acb31
--- /dev/null
+++ b/Source/UnitTests/Common/BusyLoopTest.cpp
@@ -0,0 +1,51 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <atomic>
+#include <thread>
+
+#include <gtest/gtest.h>
+
+#include "Common/BlockingLoop.h"
+#include "Common/Thread.h"
+
+TEST(BusyLoopTest, MultiThreaded)
+{
+	Common::BlockingLoop loop;
+	Common::Event e;
+	for (int i = 0; i < 100; i++)
+	{
+		loop.Prepare();
+		std::thread loop_thread(
+		[&]() {
+			loop.Run(
+			[&]() {
+				e.Set();
+			});
+		});
+
+		// Ping - Pong
+		for (int j = 0; j < 10; j++)
+		{
+			loop.Wakeup();
+			e.Wait();
+
+			// Just waste some time. So the main loop did fall back to the sleep state much more likely.
+			Common::SleepCurrentThread(1);
+		}
+
+		for (int j = 0; j < 100; j++)
+		{
+			// We normally have to call Wakeup to assure the Event is triggered.
+			// But this check is for an internal feature of the BlockingLoop.
+			// It's implemented to fall back to a busy loop regulary.
+			// If we're in the busy loop, the payload (and so the Event) is called all the time.
+			//loop.Wakeup();
+			e.Wait();
+		}
+
+		loop.Stop();
+		loop_thread.join();
+	}
+}
diff --git a/Source/UnitTests/Common/CMakeLists.txt b/Source/UnitTests/Common/CMakeLists.txt
new file mode 100644
index 0000000000..eba08f9453
--- /dev/null
+++ b/Source/UnitTests/Common/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_dolphin_test(BitFieldTest BitFieldTest.cpp)
+add_dolphin_test(BitSetTest BitSetTest.cpp)
+add_dolphin_test(BlockingLoopTest BlockingLoopTest.cpp)
+add_dolphin_test(BusyLoopTest BusyLoopTest.cpp)
+add_dolphin_test(CommonFuncsTest CommonFuncsTest.cpp)
+add_dolphin_test(EventTest EventTest.cpp)
+add_dolphin_test(FifoQueueTest FifoQueueTest.cpp)
+add_dolphin_test(FixedSizeQueueTest FixedSizeQueueTest.cpp)
+add_dolphin_test(FlagTest FlagTest.cpp)
+add_dolphin_test(MathUtilTest MathUtilTest.cpp)
+add_dolphin_test(x64EmitterTest x64EmitterTest.cpp)
diff --git a/Source/UnitTests/Common/CommonFuncsTest.cpp b/Source/UnitTests/Common/CommonFuncsTest.cpp
new file mode 100644
index 0000000000..03a8383e96
--- /dev/null
+++ b/Source/UnitTests/Common/CommonFuncsTest.cpp
@@ -0,0 +1,40 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <gtest/gtest.h>
+
+#include "Common/CommonFuncs.h"
+
+TEST(CommonFuncs, ArraySizeMacro)
+{
+	char test[4];
+	u32 test2[42];
+
+	EXPECT_EQ(4u, ArraySize(test));
+	EXPECT_EQ(42u, ArraySize(test2));
+
+	(void)test;
+	(void)test2;
+}
+
+TEST(CommonFuncs, RoundUpPow2Macro)
+{
+	EXPECT_EQ(4, ROUND_UP_POW2(3));
+	EXPECT_EQ(4, ROUND_UP_POW2(4));
+	EXPECT_EQ(8, ROUND_UP_POW2(6));
+	EXPECT_EQ(0x40000000, ROUND_UP_POW2(0x23456789));
+}
+
+TEST(CommonFuncs, CrashMacro)
+{
+	EXPECT_DEATH({ Crash(); }, "");
+}
+
+TEST(CommonFuncs, Swap)
+{
+	EXPECT_EQ(0xf0, Common::swap8(0xf0));
+	EXPECT_EQ(0x1234, Common::swap16(0x3412));
+	EXPECT_EQ(0x12345678u, Common::swap32(0x78563412));
+	EXPECT_EQ(0x123456789abcdef0ull, Common::swap64(0xf0debc9a78563412ull));
+}
diff --git a/Source/UnitTests/Common/EventTest.cpp b/Source/UnitTests/Common/EventTest.cpp
new file mode 100644
index 0000000000..b3536f7655
--- /dev/null
+++ b/Source/UnitTests/Common/EventTest.cpp
@@ -0,0 +1,42 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "Common/Event.h"
+
+using Common::Event;
+
+TEST(Event, MultiThreaded)
+{
+	Event has_sent, can_send;
+	int shared_obj;
+	const int ITERATIONS_COUNT = 100000;
+
+	auto sender = [&]() {
+		for (int i = 0; i < ITERATIONS_COUNT; ++i)
+		{
+			can_send.Wait();
+			shared_obj = i;
+			has_sent.Set();
+		}
+	};
+
+	auto receiver = [&]() {
+		for (int i = 0; i < ITERATIONS_COUNT; ++i) {
+			has_sent.Wait();
+			EXPECT_EQ(i, shared_obj);
+			can_send.Set();
+		}
+	};
+
+	std::thread sender_thread(sender);
+	std::thread receiver_thread(receiver);
+
+	can_send.Set();
+
+	sender_thread.join();
+	receiver_thread.join();
+}
diff --git a/Source/UnitTests/Common/FifoQueueTest.cpp b/Source/UnitTests/Common/FifoQueueTest.cpp
new file mode 100644
index 0000000000..9fbddfa8a0
--- /dev/null
+++ b/Source/UnitTests/Common/FifoQueueTest.cpp
@@ -0,0 +1,67 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "Common/FifoQueue.h"
+
+TEST(FifoQueue, Simple)
+{
+	Common::FifoQueue<u32> q;
+
+	EXPECT_EQ(0u, q.Size());
+	EXPECT_TRUE(q.Empty());
+
+	q.Push(1);
+	EXPECT_EQ(1u, q.Size());
+	EXPECT_FALSE(q.Empty());
+
+	u32 v; q.Pop(v);
+	EXPECT_EQ(1u, v);
+	EXPECT_EQ(0u, q.Size());
+	EXPECT_TRUE(q.Empty());
+
+	// Test the FIFO order.
+	for (u32 i = 0; i < 1000; ++i)
+		q.Push(i);
+	EXPECT_EQ(1000u, q.Size());
+	for (u32 i = 0; i < 1000; ++i)
+	{
+		u32 v2; q.Pop(v2);
+		EXPECT_EQ(i, v2);
+	}
+	EXPECT_TRUE(q.Empty());
+
+	for (u32 i = 0; i < 1000; ++i)
+		q.Push(i);
+	EXPECT_FALSE(q.Empty());
+	q.Clear();
+	EXPECT_TRUE(q.Empty());
+}
+
+TEST(FifoQueue, MultiThreaded)
+{
+	Common::FifoQueue<u32> q;
+
+	auto inserter = [&q]() {
+		for (u32 i = 0; i < 100000; ++i)
+			q.Push(i);
+	};
+
+	auto popper = [&q]() {
+		for (u32 i = 0; i < 100000; ++i)
+		{
+			while (q.Empty());
+			u32 v; q.Pop(v);
+			EXPECT_EQ(i, v);
+		}
+	};
+
+	std::thread popper_thread(popper);
+	std::thread inserter_thread(inserter);
+
+	popper_thread.join();
+	inserter_thread.join();
+}
diff --git a/Source/UnitTests/Common/FixedSizeQueueTest.cpp b/Source/UnitTests/Common/FixedSizeQueueTest.cpp
new file mode 100644
index 0000000000..370eb0e7e7
--- /dev/null
+++ b/Source/UnitTests/Common/FixedSizeQueueTest.cpp
@@ -0,0 +1,33 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <gtest/gtest.h>
+
+#include "Common/FixedSizeQueue.h"
+
+TEST(FixedSizeQueue, Simple)
+{
+	FixedSizeQueue<int, 5> q;
+
+	EXPECT_EQ(0u, q.size());
+
+	q.push(0);
+	q.push(1);
+	q.push(2);
+	q.push(3);
+	q.push(4);
+	for (int i = 0; i < 1000; ++i)
+	{
+		EXPECT_EQ(i, q.front());
+		EXPECT_EQ(i, q.pop_front());
+		q.push(i + 5);
+	}
+	EXPECT_EQ(1000, q.pop_front());
+	EXPECT_EQ(1001, q.pop_front());
+	EXPECT_EQ(1002, q.pop_front());
+	EXPECT_EQ(1003, q.pop_front());
+	EXPECT_EQ(1004, q.pop_front());
+
+	EXPECT_EQ(0u, q.size());
+}
diff --git a/Source/UnitTests/Common/FlagTest.cpp b/Source/UnitTests/Common/FlagTest.cpp
new file mode 100644
index 0000000000..8d43d10791
--- /dev/null
+++ b/Source/UnitTests/Common/FlagTest.cpp
@@ -0,0 +1,91 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <array>
+#include <thread>
+#include <gtest/gtest.h>
+
+#include "Common/Flag.h"
+
+using Common::Flag;
+
+TEST(Flag, Simple)
+{
+	Flag f;
+	EXPECT_FALSE(f.IsSet());
+
+	f.Set();
+	EXPECT_TRUE(f.IsSet());
+
+	f.Clear();
+	EXPECT_FALSE(f.IsSet());
+
+	f.Set(false);
+	EXPECT_FALSE(f.IsSet());
+
+	EXPECT_TRUE(f.TestAndSet());
+	EXPECT_TRUE(f.TestAndClear());
+
+	Flag f2(true);
+	EXPECT_TRUE(f2.IsSet());
+}
+
+TEST(Flag, MultiThreaded)
+{
+	Flag f;
+	int count = 0;
+	const int ITERATIONS_COUNT = 100000;
+
+	auto setter = [&]() {
+		for (int i = 0; i < ITERATIONS_COUNT; ++i)
+		{
+			while (f.IsSet());
+			f.Set();
+		}
+	};
+
+	auto clearer = [&]() {
+		for (int i = 0; i < ITERATIONS_COUNT; ++i)
+		{
+			while (!f.IsSet());
+			count++;
+			f.Clear();
+		}
+	};
+
+	std::thread setter_thread(setter);
+	std::thread clearer_thread(clearer);
+
+	setter_thread.join();
+	clearer_thread.join();
+
+	EXPECT_EQ(ITERATIONS_COUNT, count);
+}
+
+TEST(Flag, SpinLock)
+{
+	// Uses a flag to implement basic spinlocking using TestAndSet.
+	Flag f;
+	int count = 0;
+	const int ITERATIONS_COUNT = 5000;
+	const int THREADS_COUNT = 50;
+
+	auto adder_func = [&]() {
+		for (int i = 0; i < ITERATIONS_COUNT; ++i)
+		{
+			// Acquire the spinlock.
+			while (!f.TestAndSet());
+			count++;
+			f.Clear();
+		}
+	};
+
+	std::array<std::thread, THREADS_COUNT> threads;
+	for (auto& th : threads)
+		th = std::thread(adder_func);
+	for (auto& th : threads)
+		th.join();
+
+	EXPECT_EQ(ITERATIONS_COUNT * THREADS_COUNT, count);
+}
diff --git a/Source/UnitTests/Common/MathUtilTest.cpp b/Source/UnitTests/Common/MathUtilTest.cpp
new file mode 100644
index 0000000000..c5f2f20b65
--- /dev/null
+++ b/Source/UnitTests/Common/MathUtilTest.cpp
@@ -0,0 +1,100 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <limits>
+#include <random>
+#include <gtest/gtest.h>
+
+#include "Common/MathUtil.h"
+
+TEST(MathUtil, Clamp)
+{
+	EXPECT_EQ(1, MathUtil::Clamp(1, 0, 2));
+	EXPECT_EQ(1.0, MathUtil::Clamp(1.0, 0.0, 2.0));
+
+	EXPECT_EQ(2, MathUtil::Clamp(4, 0, 2));
+	EXPECT_EQ(2.0, MathUtil::Clamp(4.0, 0.0, 2.0));
+
+	EXPECT_EQ(0, MathUtil::Clamp(-1, 0, 2));
+	EXPECT_EQ(0.0, MathUtil::Clamp(-1.0, 0.0, 2.0));
+}
+
+TEST(MathUtil, IsINF)
+{
+	EXPECT_TRUE(MathUtil::IsINF(+std::numeric_limits<double>::infinity()));
+	EXPECT_TRUE(MathUtil::IsINF(-std::numeric_limits<double>::infinity()));
+}
+
+TEST(MathUtil, IsNAN)
+{
+	EXPECT_TRUE(MathUtil::IsNAN(std::numeric_limits<double>::quiet_NaN()));
+	EXPECT_TRUE(MathUtil::IsNAN(std::numeric_limits<double>::signaling_NaN()));
+}
+
+TEST(MathUtil, IsQNAN)
+{
+	EXPECT_TRUE(MathUtil::IsQNAN(std::numeric_limits<double>::quiet_NaN()));
+	EXPECT_FALSE(MathUtil::IsQNAN(std::numeric_limits<double>::signaling_NaN()));
+}
+
+TEST(MathUtil, IsSNAN)
+{
+	EXPECT_FALSE(MathUtil::IsSNAN(std::numeric_limits<double>::quiet_NaN()));
+	EXPECT_TRUE(MathUtil::IsSNAN(std::numeric_limits<double>::signaling_NaN()));
+}
+
+TEST(MathUtil, IntLog2)
+{
+	EXPECT_EQ(0, IntLog2(1));
+	EXPECT_EQ(1, IntLog2(2));
+	EXPECT_EQ(2, IntLog2(4));
+	EXPECT_EQ(3, IntLog2(8));
+	EXPECT_EQ(63, IntLog2(0x8000000000000000ull));
+
+	// Rounding behavior.
+	EXPECT_EQ(3, IntLog2(15));
+	EXPECT_EQ(63, IntLog2(0xFFFFFFFFFFFFFFFFull));
+}
+
+TEST(MathUtil, FlushToZero)
+{
+	// To test the software implementation we need to make sure FTZ and DAZ are disabled.
+	// Using volatile here to ensure the compiler doesn't constant-fold it,
+	// we want the multiplication to occur at test runtime.
+	volatile float s = std::numeric_limits<float>::denorm_min();
+	volatile double d = std::numeric_limits<double>::denorm_min();
+	// Casting away the volatile attribute is required in order for msvc to resolve this to the
+	// correct instance of the comparison function.
+	EXPECT_LT(0.f, (float)(s * 2));
+	EXPECT_LT(0.0, (double)(d * 2));
+
+	EXPECT_EQ(+0.0, MathUtil::FlushToZero(+std::numeric_limits<double>::denorm_min()));
+	EXPECT_EQ(-0.0, MathUtil::FlushToZero(-std::numeric_limits<double>::denorm_min()));
+	EXPECT_EQ(+0.0, MathUtil::FlushToZero(+std::numeric_limits<double>::min() / 2));
+	EXPECT_EQ(-0.0, MathUtil::FlushToZero(-std::numeric_limits<double>::min() / 2));
+	EXPECT_EQ(std::numeric_limits<double>::min(), MathUtil::FlushToZero(std::numeric_limits<double>::min()));
+	EXPECT_EQ(std::numeric_limits<double>::max(), MathUtil::FlushToZero(std::numeric_limits<double>::max()));
+	EXPECT_EQ(+std::numeric_limits<double>::infinity(), MathUtil::FlushToZero(+std::numeric_limits<double>::infinity()));
+	EXPECT_EQ(-std::numeric_limits<double>::infinity(), MathUtil::FlushToZero(-std::numeric_limits<double>::infinity()));
+
+	// Test all subnormals as well as an equally large set of random normal floats.
+	std::default_random_engine engine(0);
+	std::uniform_int_distribution<u32> dist(0x00800000u, 0x7fffffffu);
+	for (u32 i = 0; i <= 0x007fffffu; ++i)
+	{
+		MathUtil::IntFloat x(i);
+		EXPECT_EQ(+0.f, MathUtil::FlushToZero(x.f));
+
+		x.i = i | 0x80000000u;
+		EXPECT_EQ(-0.f, MathUtil::FlushToZero(x.f));
+
+		x.i = dist(engine);
+		MathUtil::IntFloat y(MathUtil::FlushToZero(x.f));
+		EXPECT_EQ(x.i, y.i);
+
+		x.i |= 0x80000000u;
+		y.f = MathUtil::FlushToZero(x.f);
+		EXPECT_EQ(x.i, y.i);
+	}
+}
diff --git a/Source/UnitTests/Common/x64EmitterTest.cpp b/Source/UnitTests/Common/x64EmitterTest.cpp
new file mode 100644
index 0000000000..6659542dee
--- /dev/null
+++ b/Source/UnitTests/Common/x64EmitterTest.cpp
@@ -0,0 +1,1088 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cctype>
+#include <cstring>
+#include <disasm.h>  // From Bochs, fallback included in Externals.
+#include <map>
+#include <memory>
+#include <vector>
+#include <gtest/gtest.h>
+
+// gtest defines the TEST macro to generate test case functions. It conflicts
+// with the TEST method in the x64Emitter.
+//
+// Since we use TEST_F in this file to attach the test cases to a fixture, we
+// can get away with simply undef'ing TEST. Phew.
+#undef TEST
+
+#include "Common/CPUDetect.h"
+#include "Common/x64Emitter.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
+
+namespace Gen
+{
+
+struct NamedReg
+{
+	X64Reg reg;
+	std::string name;
+};
+
+const std::vector<NamedReg> reg8names {
+	{ RAX, "al"   }, { RBX, "bl"   }, { RCX, "cl"   }, { RDX, "dl"   },
+	{ RSI, "sil"  }, { RDI, "dil"  }, { RBP, "bpl"  }, { RSP, "spl"  },
+	{ R8,  "r8b"  }, { R9,  "r9b"  }, { R10, "r10b" }, { R11, "r11b" },
+	{ R12, "r12b" }, { R13, "r13b" }, { R14, "r14b" }, { R15, "r15b" },
+};
+
+const std::vector<NamedReg> reg8hnames {
+	{ AH, "ah" }, { BH, "bh" }, { CH, "ch" }, { DH, "dh" },
+};
+
+const std::vector<NamedReg> reg16names {
+	{ RAX, "ax"   }, { RBX, "bx"   }, { RCX, "cx"   }, { RDX, "dx"   },
+	{ RSI, "si"   }, { RDI, "di"   }, { RBP, "bp"   }, { RSP, "sp"   },
+	{ R8,  "r8w"  }, { R9,  "r9w"  }, { R10, "r10w" }, { R11, "r11w" },
+	{ R12, "r12w" }, { R13, "r13w" }, { R14, "r14w" }, { R15, "r15w" },
+};
+
+const std::vector<NamedReg> reg32names {
+	{ RAX, "eax"  }, { RBX, "ebx"  }, { RCX, "ecx"  }, { RDX, "edx"  },
+	{ RSI, "esi"  }, { RDI, "edi"  }, { RBP, "ebp"  }, { RSP, "esp"  },
+	{ R8,  "r8d"  }, { R9,  "r9d"  }, { R10, "r10d" }, { R11, "r11d" },
+	{ R12, "r12d" }, { R13, "r13d" }, { R14, "r14d" }, { R15, "r15d" },
+};
+
+const std::vector<NamedReg> reg64names {
+	{ RAX, "rax" }, { RBX, "rbx" }, { RCX, "rcx" }, { RDX, "rdx" },
+	{ RSI, "rsi" }, { RDI, "rdi" }, { RBP, "rbp" }, { RSP, "rsp" },
+	{ R8,  "r8"  }, { R9,  "r9"  }, { R10, "r10" }, { R11, "r11" },
+	{ R12, "r12" }, { R13, "r13" }, { R14, "r14" }, { R15, "r15" },
+};
+
+const std::vector<NamedReg> xmmnames {
+	{ XMM0,  "xmm0"  }, { XMM1,  "xmm1"  }, { XMM2,  "xmm2"  }, { XMM3,  "xmm3"  },
+	{ XMM4,  "xmm4"  }, { XMM5,  "xmm5"  }, { XMM6,  "xmm6"  }, { XMM7,  "xmm7"  },
+	{ XMM8,  "xmm8"  }, { XMM9,  "xmm9"  }, { XMM10, "xmm10" }, { XMM11, "xmm11" },
+	{ XMM12, "xmm12" }, { XMM13, "xmm13" }, { XMM14, "xmm14" }, { XMM15, "xmm15" },
+};
+
+const std::vector<NamedReg> ymmnames {
+	{ YMM0,  "ymm0"  }, { YMM1,  "ymm1"  }, { YMM2,  "ymm2"  }, { YMM3,  "ymm3"  },
+	{ YMM4,  "ymm4"  }, { YMM5,  "ymm5"  }, { YMM6,  "ymm6"  }, { YMM7,  "ymm7"  },
+	{ YMM8,  "ymm8"  }, { YMM9,  "ymm9"  }, { YMM10, "ymm10" }, { YMM11, "ymm11" },
+	{ YMM12, "ymm12" }, { YMM13, "ymm13" }, { YMM14, "ymm14" }, { YMM15, "ymm15" },
+};
+
+struct { CCFlags cc; std::string name; } ccnames[] = {
+	{ CC_O, "o" }, { CC_NO, "no" },
+	{ CC_B, "b" }, { CC_NB, "nb" },
+	{ CC_Z, "z" }, { CC_NZ, "nz" },
+	{ CC_BE, "be" }, { CC_NBE, "nbe" },
+	{ CC_S, "s" }, { CC_NS, "ns" },
+	{ CC_P, "p" }, { CC_NP, "np" },
+	{ CC_L, "l" }, { CC_NL, "nl" },
+	{ CC_LE, "le" }, { CC_NLE, "nle" },
+};
+
+class x64EmitterTest : public testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		memset(&cpu_info, 0xFF, sizeof (cpu_info));
+
+		emitter.reset(new X64CodeBlock());
+		emitter->AllocCodeSpace(4096, PPCSTATE_BASE);
+		code_buffer = emitter->GetWritableCodePtr();
+
+		disasm.reset(new disassembler);
+		disasm->set_syntax_intel();
+	}
+
+	void TearDown() override
+	{
+		cpu_info = CPUInfo();
+	}
+
+	void ExpectDisassembly(const std::string& expected)
+	{
+		std::string disasmed;
+		const u8* generated_code_iterator = code_buffer;
+		while (generated_code_iterator < emitter->GetCodePtr())
+		{
+			char instr_buffer[1024] = "";
+			generated_code_iterator += disasm->disasm64(
+					(u64)generated_code_iterator,
+					(u64)generated_code_iterator,
+					generated_code_iterator, instr_buffer);
+			disasmed += instr_buffer;
+			disasmed += "\n";
+		}
+
+		auto NormalizeAssembly = [](const std::string& str) -> std::string {
+			// Normalize assembly code to make it suitable for equality checks.
+			// In particular:
+			//   * Replace all whitespace characters by a single space.
+			//   * Remove leading and trailing whitespaces.
+			//   * Lowercase everything.
+			//   * Remove all (0x...) addresses.
+			std::string out;
+			bool previous_was_space = false;
+			bool inside_parens = false;
+			for (auto c : str)
+			{
+				c = tolower(c);
+				if (c == '(')
+				{
+					inside_parens = true;
+					continue;
+				}
+				else if (inside_parens)
+				{
+					if (c == ')')
+						inside_parens = false;
+					continue;
+				}
+				else if (isspace(c))
+				{
+					previous_was_space = true;
+					continue;
+				}
+				else if (previous_was_space)
+				{
+					previous_was_space = false;
+					if (!out.empty())
+						out += ' ';
+				}
+				out += c;
+			}
+			return out;
+		};
+		std::string expected_norm = NormalizeAssembly(expected);
+		std::string disasmed_norm = NormalizeAssembly(disasmed);
+
+		EXPECT_EQ(expected_norm, disasmed_norm);
+
+		// Reset code buffer afterwards.
+		emitter->SetCodePtr(code_buffer);
+	}
+
+	std::unique_ptr<X64CodeBlock> emitter;
+	std::unique_ptr<disassembler> disasm;
+	u8* code_buffer;
+};
+
+#define TEST_INSTR_NO_OPERANDS(Name, ExpectedDisasm) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		emitter->Name(); \
+		ExpectDisassembly(ExpectedDisasm); \
+	}
+
+TEST_INSTR_NO_OPERANDS(INT3, "int3")
+TEST_INSTR_NO_OPERANDS(NOP, "nop")
+TEST_INSTR_NO_OPERANDS(PAUSE, "pause")
+TEST_INSTR_NO_OPERANDS(STC, "stc")
+TEST_INSTR_NO_OPERANDS(CLC, "clc")
+TEST_INSTR_NO_OPERANDS(CMC, "cmc")
+TEST_INSTR_NO_OPERANDS(LAHF, "lahf")
+TEST_INSTR_NO_OPERANDS(SAHF, "sahf")
+TEST_INSTR_NO_OPERANDS(PUSHF, "pushf")
+TEST_INSTR_NO_OPERANDS(POPF, "popf")
+TEST_INSTR_NO_OPERANDS(RET, "ret")
+TEST_INSTR_NO_OPERANDS(RET_FAST, "rep ret")
+TEST_INSTR_NO_OPERANDS(UD2, "ud2a")
+TEST_INSTR_NO_OPERANDS(JMPself, "jmp .-2")
+TEST_INSTR_NO_OPERANDS(LFENCE, "lfence")
+TEST_INSTR_NO_OPERANDS(MFENCE, "mfence")
+TEST_INSTR_NO_OPERANDS(SFENCE, "sfence")
+TEST_INSTR_NO_OPERANDS(CWD, "cwd")
+TEST_INSTR_NO_OPERANDS(CDQ, "cdq")
+TEST_INSTR_NO_OPERANDS(CQO, "cqo")
+TEST_INSTR_NO_OPERANDS(CBW, "cbw")
+TEST_INSTR_NO_OPERANDS(CWDE, "cwde")
+TEST_INSTR_NO_OPERANDS(CDQE, "cdqe")
+TEST_INSTR_NO_OPERANDS(XCHG_AHAL, "xchg al, ah")
+TEST_INSTR_NO_OPERANDS(FWAIT, "fwait")
+TEST_INSTR_NO_OPERANDS(FNSTSW_AX, "fnstsw ax")
+TEST_INSTR_NO_OPERANDS(RDTSC, "rdtsc")
+
+TEST_F(x64EmitterTest, NOP_MultiByte)
+{
+	// 2 bytes is "rep nop", still a simple nop.
+	emitter->NOP(2);
+	ExpectDisassembly("nop");
+
+	for (int i = 3; i <= 11; ++i)
+	{
+		emitter->NOP(i);
+		ExpectDisassembly("multibyte nop");
+	}
+
+	// Larger NOPs are split into several NOPs.
+	emitter->NOP(20);
+	ExpectDisassembly("multibyte nop "
+	                  "multibyte nop");
+}
+
+TEST_F(x64EmitterTest, PUSH_Register)
+{
+	for (const auto& r : reg64names)
+	{
+		emitter->PUSH(r.reg);
+		ExpectDisassembly("push " + r.name);
+	}
+}
+
+TEST_F(x64EmitterTest, PUSH_Immediate)
+{
+	emitter->PUSH(64, Imm8(0xf0));
+	ExpectDisassembly("push 0xfffffffffffffff0");
+
+	// X64 is weird like that... this pushes 2 bytes, not 8 bytes with sext.
+	emitter->PUSH(64, Imm16(0xe0f0));
+	ExpectDisassembly("push 0xe0f0");
+
+	emitter->PUSH(64, Imm32(0xc0d0e0f0));
+	ExpectDisassembly("push 0xffffffffc0d0e0f0");
+}
+
+TEST_F(x64EmitterTest, PUSH_MComplex)
+{
+	emitter->PUSH(64, MComplex(RAX, RBX, SCALE_2, 4));
+	ExpectDisassembly("push qword ptr ds:[rax+rbx*2+4]");
+}
+
+TEST_F(x64EmitterTest, POP_Register)
+{
+	for (const auto& r : reg64names)
+	{
+		emitter->POP(r.reg);
+		ExpectDisassembly("pop " + r.name);
+	}
+}
+
+TEST_F(x64EmitterTest, JMP)
+{
+	emitter->NOP(6);
+	emitter->JMP(code_buffer);
+	ExpectDisassembly("multibyte nop "
+	                  "jmp .-8");
+
+	emitter->NOP(6);
+	emitter->JMP(code_buffer, true);
+	ExpectDisassembly("multibyte nop "
+	                  "jmp .-11");
+}
+
+TEST_F(x64EmitterTest, JMPptr_Register)
+{
+	for (const auto& r : reg64names)
+	{
+		emitter->JMPptr(R(r.reg));
+		ExpectDisassembly("jmp " + r.name);
+	}
+}
+
+// TODO: J/SetJumpTarget
+
+// TODO: CALL
+
+// TODO: J_CC
+
+TEST_F(x64EmitterTest, SETcc)
+{
+	for (const auto& cc : ccnames)
+	{
+		for (const auto& r : reg8names)
+		{
+			emitter->SETcc(cc.cc, R(r.reg));
+			ExpectDisassembly("set" + cc.name + " " + r.name);
+		}
+		for (const auto& r : reg8hnames)
+		{
+			emitter->SETcc(cc.cc, R(r.reg));
+			ExpectDisassembly("set" + cc.name + " " + r.name);
+		}
+	}
+}
+
+TEST_F(x64EmitterTest, CMOVcc_Register)
+{
+	for (const auto& cc : ccnames)
+	{
+		emitter->CMOVcc(64, RAX, R(R12), cc.cc);
+		emitter->CMOVcc(32, RAX, R(R12), cc.cc);
+		emitter->CMOVcc(16, RAX, R(R12), cc.cc);
+
+		ExpectDisassembly("cmov" + cc.name + " rax, r12 "
+		                  "cmov" + cc.name + " eax, r12d "
+		                  "cmov" + cc.name + " ax, r12w");
+	}
+}
+
+#define BITSEARCH_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string size; \
+			std::string rax_name; \
+		} regsets[] = { \
+			{ 16, reg16names, "word", "ax" }, \
+			{ 32, reg32names, "dword", "eax" }, \
+			{ 64, reg64names, "qword", "rax" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, r.reg, R(RAX)); \
+				emitter->Name(regset.bits, RAX, R(r.reg)); \
+				emitter->Name(regset.bits, r.reg, MatR(RAX)); \
+				ExpectDisassembly(#Name " " + r.name + ", " + regset.rax_name + " " \
+				                  #Name " " + regset.rax_name + ", " + r.name + " " \
+				                  #Name " " + r.name + ", " + regset.size + " ptr ds:[rax] " ); \
+			} \
+	}
+
+BITSEARCH_TEST(BSR);
+BITSEARCH_TEST(BSF);
+BITSEARCH_TEST(LZCNT);
+BITSEARCH_TEST(TZCNT);
+
+TEST_F(x64EmitterTest, PREFETCH)
+{
+	emitter->PREFETCH(XEmitter::PF_NTA, MatR(R12));
+	emitter->PREFETCH(XEmitter::PF_T0, MatR(R12));
+	emitter->PREFETCH(XEmitter::PF_T1, MatR(R12));
+	emitter->PREFETCH(XEmitter::PF_T2, MatR(R12));
+
+	ExpectDisassembly("prefetchnta byte ptr ds:[r12] "
+	                  "prefetcht0 byte ptr ds:[r12] "
+	                  "prefetcht1 byte ptr ds:[r12] "
+	                  "prefetcht2 byte ptr ds:[r12]");
+}
+
+TEST_F(x64EmitterTest, MOVNTI)
+{
+	emitter->MOVNTI(32, MatR(RAX), R12);
+	emitter->MOVNTI(32, M(code_buffer), R12);
+	emitter->MOVNTI(64, MatR(RAX), R12);
+	emitter->MOVNTI(64, M(code_buffer), R12);
+
+	ExpectDisassembly("movnti dword ptr ds:[rax], r12d "
+	                  "movnti dword ptr ds:[rip-12], r12d "
+	                  "movnti qword ptr ds:[rax], r12 "
+	                  "movnti qword ptr ds:[rip-24], r12");
+}
+
+// Grouped together since these 3 instructions do exactly the same thing.
+TEST_F(x64EmitterTest, MOVNT_DQ_PS_PD)
+{
+	for (const auto& r : xmmnames)
+	{
+		emitter->MOVNTDQ(MatR(RAX), r.reg);
+		emitter->MOVNTPS(MatR(RAX), r.reg);
+		emitter->MOVNTPD(MatR(RAX), r.reg);
+		ExpectDisassembly("movntdq dqword ptr ds:[rax], " + r.name + " "
+		                  "movntps dqword ptr ds:[rax], " + r.name + " "
+		                  "movntpd dqword ptr ds:[rax], " + r.name);
+	}
+}
+
+#define MUL_DIV_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+		} regsets[] = { \
+			{ 8, reg8names, "al" }, \
+			{ 8, reg8hnames, "al" }, \
+			{ 16, reg16names, "ax" }, \
+			{ 32, reg32names, "eax" }, \
+			{ 64, reg64names, "rax" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, R(r.reg)); \
+				ExpectDisassembly(#Name " " + regset.out_name + ", " + r.name); \
+			} \
+	}
+
+MUL_DIV_TEST(MUL)
+MUL_DIV_TEST(IMUL)
+MUL_DIV_TEST(DIV)
+MUL_DIV_TEST(IDIV)
+
+// TODO: More complex IMUL variants.
+
+#define SHIFT_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+		} regsets[] = { \
+			{ 8, reg8names }, \
+			{ 8, reg8hnames }, \
+			{ 16, reg16names }, \
+			{ 32, reg32names }, \
+			{ 64, reg64names }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, R(r.reg), Imm8(1)); \
+				emitter->Name(regset.bits, R(r.reg), Imm8(4)); \
+				emitter->Name(regset.bits, R(r.reg), R(CL)); \
+				ExpectDisassembly(#Name " " + r.name + ", 1 " \
+				                  #Name " " + r.name + ", 0x04 " \
+				                  #Name " " + r.name + ", cl"); \
+			} \
+	}
+
+SHIFT_TEST(ROL)
+SHIFT_TEST(ROR)
+SHIFT_TEST(RCL)
+SHIFT_TEST(RCR)
+SHIFT_TEST(SHL)
+SHIFT_TEST(SHR)
+SHIFT_TEST(SAR)
+
+#define BT_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 16, reg16names, "ax", "word" }, \
+			{ 32, reg32names, "eax", "dword" }, \
+			{ 64, reg64names, "rax", "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, R(r.reg), R(RAX)); \
+				emitter->Name(regset.bits, R(RAX), R(r.reg)); \
+				emitter->Name(regset.bits, R(r.reg), Imm8(0x42)); \
+				emitter->Name(regset.bits, MatR(R12), R(r.reg)); \
+				ExpectDisassembly(#Name " " + r.name + ", " + regset.out_name + " " \
+				                  #Name " " + regset.out_name + ", " + r.name + " " \
+				                  #Name " " + r.name + ", 0x42 " \
+				                  #Name " " + regset.size + " ptr ds:[r12], " + r.name); \
+			} \
+	}
+
+BT_TEST(BT)
+BT_TEST(BTS)
+BT_TEST(BTR)
+BT_TEST(BTC)
+
+// TODO: LEA tests
+
+#define ONE_OP_ARITH_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string size; \
+		} regsets[] = { \
+			{ 8, reg8names, "byte" }, \
+			{ 8, reg8hnames, "byte" }, \
+			{ 16, reg16names, "word" }, \
+			{ 32, reg32names, "dword" }, \
+			{ 64, reg64names, "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, R(r.reg)); \
+				emitter->Name(regset.bits, MatR(RAX)); \
+				emitter->Name(regset.bits, MatR(R12)); \
+				ExpectDisassembly(#Name " " + r.name + " " \
+				                  #Name " " + regset.size + " ptr ds:[rax] " \
+				                  #Name " " + regset.size + " ptr ds:[r12]"); \
+			} \
+	}
+
+ONE_OP_ARITH_TEST(NOT)
+ONE_OP_ARITH_TEST(NEG)
+
+#define TWO_OP_ARITH_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string size; \
+			std::string rax_name; \
+			Gen::OpArg imm; \
+			std::string immname; \
+		} regsets[] = { \
+			{ 8, reg8names, "byte", "al", Imm8(0xEF), "0xef" }, \
+			{ 8, reg8hnames, "byte", "al", Imm8(0xEF), "0xef" }, \
+			{ 16, reg16names, "word", "ax", Imm16(0xBEEF), "0xbeef" }, \
+			{ 32, reg32names, "dword", "eax", Imm32(0xDEADBEEF), "0xdeadbeef" }, \
+			{ 64, reg64names, "qword", "rax", Imm32(0xDEADBEEF), "0xffffffffdeadbeef" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, R(r.reg), R(RAX)); \
+				emitter->Name(regset.bits, R(RAX), R(r.reg)); \
+				emitter->Name(regset.bits, R(r.reg), MatR(RAX)); \
+				emitter->Name(regset.bits, MatR(RAX), R(r.reg)); \
+				emitter->Name(regset.bits, R(r.reg), regset.imm); \
+				ExpectDisassembly(#Name " " + r.name + ", " + regset.rax_name + " " \
+				                  #Name " " + regset.rax_name + ", " + r.name + " " \
+				                  #Name " " + r.name + ", " + regset.size + " ptr ds:[rax] " \
+				                  #Name " " + regset.size + " ptr ds:[rax], " + r.name + " " \
+				                  #Name " " + r.name + ", " + regset.immname ); \
+			} \
+	}
+
+TWO_OP_ARITH_TEST(ADD)
+TWO_OP_ARITH_TEST(ADC)
+TWO_OP_ARITH_TEST(SUB)
+TWO_OP_ARITH_TEST(SBB)
+TWO_OP_ARITH_TEST(AND)
+TWO_OP_ARITH_TEST(CMP)
+TWO_OP_ARITH_TEST(OR)
+TWO_OP_ARITH_TEST(XOR)
+TWO_OP_ARITH_TEST(MOV)
+
+// TODO: Disassembler inverts operands here.
+// TWO_OP_ARITH_TEST(XCHG)
+// TWO_OP_ARITH_TEST(TEST)
+
+TEST_F(x64EmitterTest, BSWAP)
+{
+	struct {
+		int bits;
+		std::vector<NamedReg> regs;
+	} regsets[] = {
+		{ 32, reg32names },
+		{ 64, reg64names },
+	};
+	for (const auto& regset : regsets)
+		for (const auto& r : regset.regs)
+		{
+			emitter->BSWAP(regset.bits, r.reg);
+			ExpectDisassembly("bswap " + r.name);
+		}
+}
+
+TEST_F(x64EmitterTest, MOVSX)
+{
+	emitter->MOVSX(16, 8, RAX, R(AH));
+	emitter->MOVSX(32, 8, RAX, R(R12));
+	emitter->MOVSX(32, 16, R12, R(RBX));
+	emitter->MOVSX(64, 8, R12, R(RBX));
+	emitter->MOVSX(64, 16, RAX, R(R12));
+	emitter->MOVSX(64, 32, R12, R(RSP));
+	ExpectDisassembly("movsx ax, ah "
+	                  "movsx eax, r12b "
+	                  "movsx r12d, bx "
+	                  "movsx r12, bl "
+	                  "movsx rax, r12w "
+	                  "movsxd r12, esp");
+}
+
+TEST_F(x64EmitterTest, MOVZX)
+{
+	emitter->MOVZX(16, 8, RAX, R(AH));
+	emitter->MOVZX(32, 8, R12, R(RBP));
+	emitter->MOVZX(64, 8, R12, R(RDI));
+	emitter->MOVZX(32, 16, RAX, R(R12));
+	emitter->MOVZX(64, 16, RCX, R(RSI));
+	ExpectDisassembly("movzx ax, ah "
+	                  "movzx r12d, bpl "
+	                  "movzx r12d, dil "     // Generates 32 bit movzx
+	                  "movzx eax, r12w "
+	                  "movzx ecx, si");
+}
+
+TEST_F(x64EmitterTest, MOVBE)
+{
+	emitter->MOVBE(16, RAX, MatR(R12));
+	emitter->MOVBE(16, MatR(RAX), R12);
+	emitter->MOVBE(32, RAX, MatR(R12));
+	emitter->MOVBE(32, MatR(RAX), R12);
+	emitter->MOVBE(64, RAX, MatR(R12));
+	emitter->MOVBE(64, MatR(RAX), R12);
+	ExpectDisassembly("movbe ax, word ptr ds:[r12] "
+	                  "movbe word ptr ds:[rax], r12w "
+	                  "movbe eax, dword ptr ds:[r12] "
+	                  "movbe dword ptr ds:[rax], r12d "
+	                  "movbe rax, qword ptr ds:[r12] "
+	                  "movbe qword ptr ds:[rax], r12");
+}
+
+TEST_F(x64EmitterTest, STMXCSR)
+{
+	emitter->STMXCSR(MatR(R12));
+	ExpectDisassembly("stmxcsr dword ptr ds:[r12]");
+}
+
+TEST_F(x64EmitterTest, LDMXCSR)
+{
+	emitter->LDMXCSR(MatR(R12));
+	ExpectDisassembly("ldmxcsr dword ptr ds:[r12]");
+}
+
+TEST_F(x64EmitterTest, FLD_FST_FSTP)
+{
+	emitter->FLD(32, MatR(RBP));
+	emitter->FLD(64, MatR(RBP));
+	emitter->FLD(80, MatR(RBP));
+
+	emitter->FST(32, MatR(RBP));
+	emitter->FST(64, MatR(RBP));
+	// No 80 bit version of FST
+
+	emitter->FSTP(32, MatR(RBP));
+	emitter->FSTP(64, MatR(RBP));
+	emitter->FSTP(80, MatR(RBP));
+
+	ExpectDisassembly("fld dword ptr ss:[rbp] "
+	                  "fld qword ptr ss:[rbp] "
+	                  "fld tbyte ptr ss:[rbp] "
+	                  "fst dword ptr ss:[rbp] "
+	                  "fst qword ptr ss:[rbp] "
+	                  "fstp dword ptr ss:[rbp] "
+	                  "fstp qword ptr ss:[rbp] "
+	                  "fstp tbyte ptr ss:[rbp]");
+}
+
+#define TWO_OP_SSE_TEST(Name, MemBits) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		for (const auto& r1 : xmmnames) \
+		{ \
+			for (const auto& r2 : xmmnames) \
+			{ \
+				emitter->Name(r1.reg, R(r2.reg)); \
+				ExpectDisassembly(#Name " " + r1.name + ", " + r2.name); \
+			} \
+			emitter->Name(r1.reg, MatR(R12)); \
+			ExpectDisassembly(#Name " " + r1.name + ", " MemBits " ptr ds:[r12]"); \
+		} \
+	}
+
+TWO_OP_SSE_TEST(ADDSS, "dword")
+TWO_OP_SSE_TEST(SUBSS, "dword")
+TWO_OP_SSE_TEST(MULSS, "dword")
+TWO_OP_SSE_TEST(DIVSS, "dword")
+TWO_OP_SSE_TEST(MINSS, "dword")
+TWO_OP_SSE_TEST(MAXSS, "dword")
+TWO_OP_SSE_TEST(SQRTSS, "dword")
+TWO_OP_SSE_TEST(RSQRTSS, "dword")
+
+TWO_OP_SSE_TEST(ADDSD, "qword")
+TWO_OP_SSE_TEST(SUBSD, "qword")
+TWO_OP_SSE_TEST(MULSD, "qword")
+TWO_OP_SSE_TEST(DIVSD, "qword")
+TWO_OP_SSE_TEST(MINSD, "qword")
+TWO_OP_SSE_TEST(MAXSD, "qword")
+TWO_OP_SSE_TEST(SQRTSD, "qword")
+
+TWO_OP_SSE_TEST(ADDPS, "dqword")
+TWO_OP_SSE_TEST(SUBPS, "dqword")
+TWO_OP_SSE_TEST(MULPS, "dqword")
+TWO_OP_SSE_TEST(DIVPS, "dqword")
+TWO_OP_SSE_TEST(MINPS, "dqword")
+TWO_OP_SSE_TEST(MAXPS, "dqword")
+TWO_OP_SSE_TEST(SQRTPS, "dqword")
+TWO_OP_SSE_TEST(RSQRTPS, "dqword")
+TWO_OP_SSE_TEST(ANDPS, "dqword")
+TWO_OP_SSE_TEST(ANDNPS, "dqword")
+TWO_OP_SSE_TEST(ORPS, "dqword")
+TWO_OP_SSE_TEST(XORPS, "dqword")
+
+TWO_OP_SSE_TEST(ADDPD, "dqword")
+TWO_OP_SSE_TEST(SUBPD, "dqword")
+TWO_OP_SSE_TEST(MULPD, "dqword")
+TWO_OP_SSE_TEST(DIVPD, "dqword")
+TWO_OP_SSE_TEST(MINPD, "dqword")
+TWO_OP_SSE_TEST(MAXPD, "dqword")
+TWO_OP_SSE_TEST(SQRTPD, "dqword")
+TWO_OP_SSE_TEST(ANDPD, "dqword")
+TWO_OP_SSE_TEST(ANDNPD, "dqword")
+TWO_OP_SSE_TEST(ORPD, "dqword")
+TWO_OP_SSE_TEST(XORPD, "dqword")
+
+TWO_OP_SSE_TEST(MOVDDUP, "qword")
+
+TWO_OP_SSE_TEST(UNPCKLPS, "dqword")
+TWO_OP_SSE_TEST(UNPCKHPS, "dqword")
+TWO_OP_SSE_TEST(UNPCKLPD, "dqword")
+TWO_OP_SSE_TEST(UNPCKHPD, "dqword")
+
+TWO_OP_SSE_TEST(COMISS, "dword")
+TWO_OP_SSE_TEST(UCOMISS, "dword")
+TWO_OP_SSE_TEST(COMISD, "qword")
+TWO_OP_SSE_TEST(UCOMISD, "qword")
+
+// register-only instructions
+#define TWO_OP_SSE_REG_TEST(Name, MemBits) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		for (const auto& r1 : xmmnames) \
+		{ \
+			for (const auto& r2 : xmmnames) \
+			{ \
+				emitter->Name(r1.reg, r2.reg); \
+				ExpectDisassembly(#Name " " + r1.name + ", " + r2.name); \
+			} \
+		} \
+	}
+
+TWO_OP_SSE_REG_TEST(MOVHLPS, "qword")
+TWO_OP_SSE_REG_TEST(MOVLHPS, "qword")
+
+// "register + memory"-only instructions
+#define TWO_OP_SSE_MEM_TEST(Name, MemBits) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		for (const auto& r1 : xmmnames) \
+		{ \
+			emitter->Name(r1.reg, MatR(R12)); \
+			ExpectDisassembly(#Name " " + r1.name + ", " MemBits " ptr ds:[r12]"); \
+			emitter->Name(MatR(R12), r1.reg); \
+			ExpectDisassembly(#Name " " MemBits " ptr ds:[r12], " + r1.name); \
+		} \
+	}
+
+TWO_OP_SSE_MEM_TEST(MOVLPS, "qword")
+TWO_OP_SSE_MEM_TEST(MOVHPS, "qword")
+TWO_OP_SSE_MEM_TEST(MOVLPD, "qword")
+TWO_OP_SSE_MEM_TEST(MOVHPD, "qword")
+
+// TODO: CMPSS/SD
+// TODO: SHUFPS/PD
+// TODO: more SSE MOVs
+// TODO: MOVMSK
+
+TEST_F(x64EmitterTest, MASKMOVDQU)
+{
+	for (const auto& r1 : xmmnames)
+	{
+		for (const auto& r2 : xmmnames)
+		{
+			emitter->MASKMOVDQU(r1.reg, r2.reg);
+			ExpectDisassembly("maskmovdqu " + r1.name + ", " + r2.name + ", dqword ptr ds:[rdi]");
+		}
+	}
+}
+
+TEST_F(x64EmitterTest, LDDQU)
+{
+	for (const auto& r : xmmnames)
+	{
+		emitter->LDDQU(r.reg, MatR(R12));
+		ExpectDisassembly("lddqu " + r.name + ", dqword ptr ds:[r12]");
+	}
+}
+
+TWO_OP_SSE_TEST(CVTPS2PD, "dqword")
+TWO_OP_SSE_TEST(CVTPD2PS, "dqword")
+TWO_OP_SSE_TEST(CVTSS2SD, "dword")
+TWO_OP_SSE_TEST(CVTSD2SS, "qword")
+TWO_OP_SSE_TEST(CVTDQ2PD, "qword")
+TWO_OP_SSE_TEST(CVTPD2DQ, "dqword")
+TWO_OP_SSE_TEST(CVTDQ2PS, "dqword")
+TWO_OP_SSE_TEST(CVTPS2DQ, "dqword")
+TWO_OP_SSE_TEST(CVTTPS2DQ, "dqword")
+TWO_OP_SSE_TEST(CVTTPD2DQ, "dqword")
+
+// TODO: CVT2SI
+
+TWO_OP_SSE_TEST(PACKSSDW, "dqword")
+TWO_OP_SSE_TEST(PACKSSWB, "dqword")
+TWO_OP_SSE_TEST(PACKUSDW, "dqword")
+TWO_OP_SSE_TEST(PACKUSWB, "dqword")
+
+TWO_OP_SSE_TEST(PUNPCKLBW, "dqword")
+TWO_OP_SSE_TEST(PUNPCKLWD, "dqword")
+TWO_OP_SSE_TEST(PUNPCKLDQ, "dqword")
+TWO_OP_SSE_TEST(PUNPCKLQDQ, "dqword")
+
+TWO_OP_SSE_TEST(PTEST, "dqword")
+TWO_OP_SSE_TEST(PAND, "dqword")
+TWO_OP_SSE_TEST(PANDN, "dqword")
+TWO_OP_SSE_TEST(POR, "dqword")
+TWO_OP_SSE_TEST(PXOR, "dqword")
+TWO_OP_SSE_TEST(PADDB, "dqword")
+TWO_OP_SSE_TEST(PADDW, "dqword")
+TWO_OP_SSE_TEST(PADDD, "dqword")
+TWO_OP_SSE_TEST(PADDQ, "dqword")
+TWO_OP_SSE_TEST(PADDSB, "dqword")
+TWO_OP_SSE_TEST(PADDSW, "dqword")
+TWO_OP_SSE_TEST(PADDUSB, "dqword")
+TWO_OP_SSE_TEST(PADDUSW, "dqword")
+TWO_OP_SSE_TEST(PSUBB, "dqword")
+TWO_OP_SSE_TEST(PSUBW, "dqword")
+TWO_OP_SSE_TEST(PSUBD, "dqword")
+TWO_OP_SSE_TEST(PSUBQ, "dqword")
+TWO_OP_SSE_TEST(PSUBUSB, "dqword")
+TWO_OP_SSE_TEST(PSUBUSW, "dqword")
+TWO_OP_SSE_TEST(PAVGB, "dqword")
+TWO_OP_SSE_TEST(PAVGW, "dqword")
+TWO_OP_SSE_TEST(PCMPEQB, "dqword")
+TWO_OP_SSE_TEST(PCMPEQW, "dqword")
+TWO_OP_SSE_TEST(PCMPEQD, "dqword")
+TWO_OP_SSE_TEST(PCMPGTB, "dqword")
+TWO_OP_SSE_TEST(PCMPGTW, "dqword")
+TWO_OP_SSE_TEST(PCMPGTD, "dqword")
+TWO_OP_SSE_TEST(PMADDWD, "dqword")
+TWO_OP_SSE_TEST(PSADBW, "dqword")
+TWO_OP_SSE_TEST(PMAXSW, "dqword")
+TWO_OP_SSE_TEST(PMAXUB, "dqword")
+TWO_OP_SSE_TEST(PMINSW, "dqword")
+TWO_OP_SSE_TEST(PMINUB, "dqword")
+TWO_OP_SSE_TEST(PSHUFB, "dqword")
+
+// TODO: PEXT/INS/SHUF/MOVMSK
+
+TWO_OP_SSE_TEST(PMOVSXBW, "qword")
+TWO_OP_SSE_TEST(PMOVSXBD, "dword")
+TWO_OP_SSE_TEST(PMOVSXBQ, "word")
+TWO_OP_SSE_TEST(PMOVSXWD, "qword")
+TWO_OP_SSE_TEST(PMOVSXWQ, "dword")
+TWO_OP_SSE_TEST(PMOVSXDQ, "qword")
+
+TWO_OP_SSE_TEST(PMOVZXBW, "qword")
+TWO_OP_SSE_TEST(PMOVZXBD, "dword")
+TWO_OP_SSE_TEST(PMOVZXBQ, "word")
+TWO_OP_SSE_TEST(PMOVZXWD, "qword")
+TWO_OP_SSE_TEST(PMOVZXWQ, "dword")
+TWO_OP_SSE_TEST(PMOVZXDQ, "qword")
+
+// TODO: BLEND
+
+// TODO: AVX
+
+// for VEX GPR instructions that take the form op reg, r/m, reg
+#define VEX_RMR_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 32, reg32names, "eax", "dword" }, \
+			{ 64, reg64names, "rax", "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, r.reg, R(RAX), RAX); \
+				emitter->Name(regset.bits, RAX, R(r.reg), RAX); \
+				emitter->Name(regset.bits, RAX, MatR(R12), r.reg); \
+				ExpectDisassembly(#Name " " + r.name + ", " + regset.out_name + ", " + regset.out_name + " " \
+				                  #Name " " + regset.out_name + ", " + r.name + ", " + regset.out_name + " " \
+				                  #Name " " + regset.out_name + ", " + regset.size + " ptr ds:[r12], " + r.name + " "); \
+			} \
+	}
+
+VEX_RMR_TEST(SHRX)
+VEX_RMR_TEST(SARX)
+VEX_RMR_TEST(SHLX)
+VEX_RMR_TEST(BEXTR)
+VEX_RMR_TEST(BZHI)
+
+// for VEX GPR instructions that take the form op reg, reg, r/m
+#define VEX_RRM_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 32, reg32names, "eax", "dword" }, \
+			{ 64, reg64names, "rax", "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, r.reg, RAX, R(RAX)); \
+				emitter->Name(regset.bits, RAX, RAX, R(r.reg)); \
+				emitter->Name(regset.bits, RAX, r.reg, MatR(R12)); \
+				ExpectDisassembly(#Name " " + r.name+ ", " + regset.out_name + ", " + regset.out_name  + " " \
+				                  #Name " " + regset.out_name + ", " + regset.out_name + ", " + r.name + " " \
+				                  #Name " " + regset.out_name + ", " + r.name + ", " + regset.size + " ptr ds:[r12] "); \
+			} \
+	}
+
+VEX_RRM_TEST(PEXT)
+VEX_RRM_TEST(PDEP)
+VEX_RRM_TEST(MULX)
+VEX_RRM_TEST(ANDN)
+
+// for VEX GPR instructions that take the form op reg, r/m
+#define VEX_RM_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 32, reg32names, "eax", "dword" }, \
+			{ 64, reg64names, "rax", "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, r.reg, R(RAX)); \
+				emitter->Name(regset.bits, RAX, R(r.reg)); \
+				emitter->Name(regset.bits, r.reg, MatR(R12)); \
+				ExpectDisassembly(#Name " " + r.name+ ", " + regset.out_name  + " " \
+				                  #Name " " + regset.out_name + ", " + r.name + " " \
+				                  #Name " " + r.name + ", " + regset.size + " ptr ds:[r12] "); \
+			} \
+	}
+
+VEX_RM_TEST(BLSR)
+VEX_RM_TEST(BLSMSK)
+VEX_RM_TEST(BLSI)
+
+// for VEX GPR instructions that take the form op reg, r/m, imm
+#define VEX_RMI_TEST(Name) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 32, reg32names, "eax", "dword" }, \
+			{ 64, reg64names, "rax", "qword" }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(regset.bits, r.reg, R(RAX), 4); \
+				emitter->Name(regset.bits, RAX, R(r.reg), 4); \
+				emitter->Name(regset.bits, r.reg, MatR(R12), 4); \
+				ExpectDisassembly(#Name " " + r.name+ ", " + regset.out_name  + ", 0x04 " \
+				                  #Name " " + regset.out_name + ", " + r.name + ", 0x04 " \
+				                  #Name " " + r.name + ", " + regset.size + " ptr ds:[r12], 0x04 "); \
+			} \
+	}
+
+VEX_RMI_TEST(RORX)
+
+// for AVX instructions that take the form op reg, reg, r/m
+#define AVX_RRM_TEST(Name, sizename) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 64, xmmnames, "xmm0", sizename }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(r.reg, XMM0, R(XMM0)); \
+				emitter->Name(XMM0, XMM0, R(r.reg)); \
+				emitter->Name(XMM0, r.reg, MatR(R12)); \
+				ExpectDisassembly(#Name " " + r.name+ ", " + regset.out_name + ", " + regset.out_name  + " " \
+				                  #Name " " + regset.out_name + ", " + regset.out_name + ", " + r.name + " " \
+				                  #Name " " + regset.out_name + ", " + r.name + ", " + regset.size + " ptr ds:[r12] "); \
+			} \
+	}
+
+AVX_RRM_TEST(VANDPS,  "dqword")
+AVX_RRM_TEST(VANDPD,  "dqword")
+AVX_RRM_TEST(VANDNPS, "dqword")
+AVX_RRM_TEST(VANDNPD, "dqword")
+AVX_RRM_TEST(VORPS,   "dqword")
+AVX_RRM_TEST(VORPD,   "dqword")
+AVX_RRM_TEST(VXORPS,  "dqword")
+AVX_RRM_TEST(VXORPD,  "dqword")
+AVX_RRM_TEST(VPAND,   "dqword")
+AVX_RRM_TEST(VPANDN,  "dqword")
+AVX_RRM_TEST(VPOR,    "dqword")
+AVX_RRM_TEST(VPXOR,   "dqword")
+
+#define FMA3_TEST(Name, P, packed) \
+	AVX_RRM_TEST(Name ## 132 ## P ## S, packed ? "dqword" : "dword") \
+	AVX_RRM_TEST(Name ## 213 ## P ## S, packed ? "dqword" : "dword") \
+	AVX_RRM_TEST(Name ## 231 ## P ## S, packed ? "dqword" : "dword") \
+	AVX_RRM_TEST(Name ## 132 ## P ## D, packed ? "dqword" : "qword") \
+	AVX_RRM_TEST(Name ## 213 ## P ## D, packed ? "dqword" : "qword") \
+	AVX_RRM_TEST(Name ## 231 ## P ## D, packed ? "dqword" : "qword")
+
+FMA3_TEST(VFMADD, P, true)
+FMA3_TEST(VFMADD, S, false)
+FMA3_TEST(VFMSUB, P, true)
+FMA3_TEST(VFMSUB, S, false)
+FMA3_TEST(VFNMADD, P, true)
+FMA3_TEST(VFNMADD, S, false)
+FMA3_TEST(VFNMSUB, P, true)
+FMA3_TEST(VFNMSUB, S, false)
+FMA3_TEST(VFMADDSUB, P, true)
+FMA3_TEST(VFMSUBADD, P, true)
+
+// for VEX instructions that take the form op reg, reg, r/m, reg OR reg, reg, reg, r/m
+#define VEX_RRMR_RRRM_TEST(Name, sizename) \
+	TEST_F(x64EmitterTest, Name) \
+	{ \
+		struct { \
+			int bits; \
+			std::vector<NamedReg> regs; \
+			std::string out_name; \
+			std::string size; \
+		} regsets[] = { \
+			{ 64, xmmnames, "xmm0", sizename }, \
+		}; \
+		for (const auto& regset : regsets) \
+			for (const auto& r : regset.regs) \
+			{ \
+				emitter->Name(r.reg, XMM0, R(XMM0), r.reg); \
+				emitter->Name(XMM0, XMM0, r.reg, MatR(R12)); \
+				emitter->Name(XMM0, r.reg, MatR(R12), XMM0); \
+				ExpectDisassembly(#Name " " + r.name+ ", " + regset.out_name + ", " + regset.out_name  + ", " + r.name + " " \
+				                  #Name " " + regset.out_name + ", " + regset.out_name + ", " + r.name + ", " + regset.size + " ptr ds:[r12] " \
+				                  #Name " " + regset.out_name + ", " + r.name + ", " + regset.size + " ptr ds:[r12], " + regset.out_name); \
+			} \
+	}
+
+#define FMA4_TEST(Name, P, packed) \
+	VEX_RRMR_RRRM_TEST(Name ## P ## S, packed ? "dqword" : "dword") \
+	VEX_RRMR_RRRM_TEST(Name ## P ## D, packed ? "dqword" : "qword")
+
+FMA4_TEST(VFMADD, P, true)
+FMA4_TEST(VFMADD, S, false)
+FMA4_TEST(VFMSUB, P, true)
+FMA4_TEST(VFMSUB, S, false)
+FMA4_TEST(VFNMADD, P, true)
+FMA4_TEST(VFNMADD, S, false)
+FMA4_TEST(VFNMSUB, P, true)
+FMA4_TEST(VFNMSUB, S, false)
+FMA4_TEST(VFMADDSUB, P, true)
+FMA4_TEST(VFMSUBADD, P, true)
+
+}  // namespace Gen
diff --git a/Source/UnitTests/Core/CMakeLists.txt b/Source/UnitTests/Core/CMakeLists.txt
new file mode 100644
index 0000000000..5bb809d9df
--- /dev/null
+++ b/Source/UnitTests/Core/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_dolphin_test(MMIOTest MMIOTest.cpp)
+add_dolphin_test(PageFaultTest PageFaultTest.cpp)
diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp
new file mode 100644
index 0000000000..3c51145a84
--- /dev/null
+++ b/Source/UnitTests/Core/MMIOTest.cpp
@@ -0,0 +1,131 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <unordered_set>
+#include <gtest/gtest.h>
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/MMIO.h"
+
+// Tests that the UniqueID function returns a "unique enough" identifier
+// number: that is, it is unique in the address ranges we care about.
+TEST(UniqueID, UniqueEnough)
+{
+	std::unordered_set<u32> ids;
+	for (u32 i = 0x0C000000; i < 0x0C010000; ++i)
+	{
+		u32 unique_id = MMIO::UniqueID(i);
+		EXPECT_EQ(ids.end(), ids.find(unique_id));
+		ids.insert(unique_id);
+	}
+	for (u32 i = 0x0D000000; i < 0x0D010000; ++i)
+	{
+		u32 unique_id = MMIO::UniqueID(i);
+		EXPECT_EQ(ids.end(), ids.find(unique_id));
+		ids.insert(unique_id);
+	}
+}
+
+TEST(IsMMIOAddress, SpecialAddresses)
+{
+	SConfig::Init();
+	SConfig::GetInstance().m_LocalCoreStartupParameter.bWii = true;
+
+	// WG Pipe address, should not be handled by MMIO.
+	EXPECT_FALSE(MMIO::IsMMIOAddress(0x0C008000));
+
+	// Locked L1 cache allocation.
+	EXPECT_FALSE(MMIO::IsMMIOAddress(0xE0000000));
+
+	// Uncached mirror of MEM1, shouldn't be handled by MMIO
+	EXPECT_FALSE(MMIO::IsMMIOAddress(0xC0000000));
+
+	// Effective address of an MMIO register; MMIO only deals with physical
+	// addresses.
+	EXPECT_FALSE(MMIO::IsMMIOAddress(0xCC0000E0));
+
+	// And lets check some valid addresses too
+	EXPECT_TRUE(MMIO::IsMMIOAddress(0x0C0000E0)); // Gamecube MMIOs
+	EXPECT_TRUE(MMIO::IsMMIOAddress(0x0D00008C)); // Wii MMIOs
+	EXPECT_TRUE(MMIO::IsMMIOAddress(0x0D800F10)); // Mirror of Wii MMIOs
+
+	SConfig::Shutdown();
+}
+
+class MappingTest : public testing::Test
+{
+protected:
+	virtual void SetUp() override
+	{
+		m_mapping = new MMIO::Mapping();
+	}
+
+	virtual void TearDown() override
+	{
+		delete m_mapping;
+	}
+
+	MMIO::Mapping* m_mapping;
+};
+
+TEST_F(MappingTest, ReadConstant)
+{
+	m_mapping->Register(0x0C001234, MMIO::Constant<u8>(0x42), MMIO::Nop<u8>());
+	m_mapping->Register(0x0C001234, MMIO::Constant<u16>(0x1234), MMIO::Nop<u16>());
+	m_mapping->Register(0x0C001234, MMIO::Constant<u32>(0xdeadbeef), MMIO::Nop<u32>());
+
+	u8 val8 = m_mapping->Read<u8>(0x0C001234);
+	u16 val16 = m_mapping->Read<u16>(0x0C001234);
+	u32 val32 = m_mapping->Read<u32>(0x0C001234);
+
+	EXPECT_EQ(0x42, val8);
+	EXPECT_EQ(0x1234, val16);
+	EXPECT_EQ(0xdeadbeef, val32);
+}
+
+TEST_F(MappingTest, ReadWriteDirect)
+{
+	u8 target_8 = 0;
+	u16 target_16 = 0;
+	u32 target_32 = 0;
+
+	m_mapping->Register(0x0C001234, MMIO::DirectRead<u8>(&target_8), MMIO::DirectWrite<u8>(&target_8));
+	m_mapping->Register(0x0C001234, MMIO::DirectRead<u16>(&target_16), MMIO::DirectWrite<u16>(&target_16));
+	m_mapping->Register(0x0C001234, MMIO::DirectRead<u32>(&target_32), MMIO::DirectWrite<u32>(&target_32));
+
+	for (u32 i = 0; i < 100; ++i)
+	{
+		u8 val8 = m_mapping->Read<u8>(0x0C001234);  EXPECT_EQ(i, val8);
+		u16 val16 = m_mapping->Read<u16>(0x0C001234); EXPECT_EQ(i, val16);
+		u32 val32 = m_mapping->Read<u32>(0x0C001234); EXPECT_EQ(i, val32);
+
+		val8 += 1; m_mapping->Write(0x0C001234, val8);
+		val16 += 1; m_mapping->Write(0x0C001234, val16);
+		val32 += 1; m_mapping->Write(0x0C001234, val32);
+	}
+}
+
+TEST_F(MappingTest, ReadWriteComplex)
+{
+	bool read_called = false, write_called = false;
+
+	m_mapping->Register(0x0C001234,
+		MMIO::ComplexRead<u8>([&read_called](u32 addr) {
+			EXPECT_EQ(0x0C001234u, addr);
+			read_called = true;
+			return 0x12;
+		}),
+		MMIO::ComplexWrite<u8>([&write_called](u32 addr, u8 val) {
+			EXPECT_EQ(0x0C001234u, addr);
+			EXPECT_EQ(0x34, val);
+			write_called = true;
+		})
+	);
+
+	u8 val = m_mapping->Read<u8>(0x0C001234); EXPECT_EQ(0x12, val);
+	m_mapping->Write(0x0C001234, (u8)0x34);
+
+	EXPECT_TRUE(read_called);
+	EXPECT_TRUE(write_called);
+}
diff --git a/Source/UnitTests/Core/PageFaultTest.cpp b/Source/UnitTests/Core/PageFaultTest.cpp
new file mode 100644
index 0000000000..002b5ec866
--- /dev/null
+++ b/Source/UnitTests/Core/PageFaultTest.cpp
@@ -0,0 +1,81 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <chrono>
+
+#include "Common/CommonTypes.h"
+#include "Common/Timer.h"
+#include "Core/MemTools.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
+// include order is important
+#include <gtest/gtest.h> // NOLINT
+
+#if _M_X86_64
+enum
+{
+#ifdef _WIN32
+	PAGE_GRAN = 0x10000
+#else
+	PAGE_GRAN = 0x1000
+#endif
+};
+
+class PageFaultFakeJit : public JitBase
+{
+public:
+	// CPUCoreBase methods
+	void Init() override {}
+	void Shutdown() override {}
+	void ClearCache() override {}
+	void Run() override {}
+	void SingleStep() override {}
+	const char *GetName() override { return nullptr; }
+
+	// JitBase methods
+	JitBaseBlockCache *GetBlockCache() override { return nullptr; }
+	void Jit(u32 em_address) override {}
+	const CommonAsmRoutinesBase *GetAsmRoutines() override { return nullptr; }
+
+	virtual bool HandleFault(uintptr_t access_address, SContext* ctx) override
+	{
+		m_pre_unprotect_time = std::chrono::high_resolution_clock::now();
+		UnWriteProtectMemory(m_data, PAGE_GRAN, /*allowExecute*/ false);
+		m_post_unprotect_time = std::chrono::high_resolution_clock::now();
+		return true;
+	}
+
+	void* m_data;
+	std::chrono::time_point<std::chrono::high_resolution_clock>
+		m_pre_unprotect_time, m_post_unprotect_time;
+};
+
+
+TEST(PageFault, PageFault)
+{
+	EMM::InstallExceptionHandler();
+	void* data = AllocateMemoryPages(PAGE_GRAN);
+	EXPECT_NE(data, nullptr);
+	WriteProtectMemory(data, PAGE_GRAN, false);
+
+	PageFaultFakeJit pfjit;
+	jit = &pfjit;
+	pfjit.m_data = data;
+
+	auto start = std::chrono::high_resolution_clock::now();
+	*(volatile int*) data = 5;
+	auto end = std::chrono::high_resolution_clock::now();
+
+	#define AS_NS(diff) ((unsigned long long)std::chrono::duration_cast<std::chrono::nanoseconds>(diff).count())
+
+	EMM::UninstallExceptionHandler();
+	jit = nullptr;
+
+	printf("page fault timing:\n");
+	printf("start->HandleFault     %llu ns\n", AS_NS(pfjit.m_pre_unprotect_time - start));
+	printf("UnWriteProtectMemory   %llu ns\n", AS_NS(pfjit.m_post_unprotect_time - pfjit.m_pre_unprotect_time));
+	printf("HandleFault->end       %llu ns\n", AS_NS(end - pfjit.m_post_unprotect_time));
+	printf("total                  %llu ns\n", AS_NS(end - start));
+}
+#endif
diff --git a/Source/UnitTests/DSPJitTester.cpp b/Source/UnitTests/DSPJitTester.cpp
deleted file mode 100644
index 8980391c56..0000000000
--- a/Source/UnitTests/DSPJitTester.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-#include "DSPJitTester.h"
-
-DSPJitTester::DSPJitTester(u16 opcode, u16 opcode_ext, bool verbose, bool only_failed)
-	: be_verbose(verbose), failed_only(only_failed), run_count(0), fail_count(0)
-{
-	instruction = opcode | opcode_ext;
-	opcode_template = GetOpTemplate(instruction);
-	sprintf(instruction_name, "%s", opcode_template->name);
-	if (opcode_template->extended) 
-		sprintf(&instruction_name[strlen(instruction_name)], "'%s", 
-			extOpTable[instruction & (((instruction >> 12) == 0x3) ? 0x7F : 0xFF)]->name);
-}
-bool DSPJitTester::Test(SDSP dsp_settings)
-{
-	if (be_verbose && !failed_only)
-	{
-		printf("Running %s: ", instruction_name);
-		DumpRegs(dsp_settings);
-	}
-	
-	last_input_dsp = dsp_settings;
-	last_int_dsp = RunInterpreter(dsp_settings);
-	last_jit_dsp = RunJit(dsp_settings);
-
-	run_count++;
-	bool success = AreEqual(last_int_dsp, last_jit_dsp);
-	if (!success)
-		fail_count++;
-	return success;
-}
-SDSP DSPJitTester::RunInterpreter(SDSP dsp_settings)
-{
-	ResetInterpreter();
-	memcpy(&g_dsp, &dsp_settings, sizeof(SDSP));
-	ExecuteInstruction(instruction);
-
-	return g_dsp;
-}
-SDSP DSPJitTester::RunJit(SDSP dsp_settings)
-{
-	ResetJit();
-	memcpy(&g_dsp, &dsp_settings, sizeof(SDSP));
-	const u8* code = jit.GetCodePtr();
-	jit.ABI_PushAllCalleeSavedRegsAndAdjustStack();
-	jit.EmitInstruction(instruction);
-	jit.ABI_PopAllCalleeSavedRegsAndAdjustStack();
-	jit.RET();
-	((void(*)())code)();
-
-	return g_dsp;
-}
-void DSPJitTester::ResetInterpreter()
-{
-	for (int i=0; i < WRITEBACKLOGSIZE; i++)
-		writeBackLogIdx[i] = -1;
-}
-void DSPJitTester::ResetJit()
-{
-	jit.ClearCodeSpace();
-}
-
-static u16 GetRegister(SDSP const &dsp, int reg) {
-	switch(reg) {
-	case DSP_REG_AR0:
-	case DSP_REG_AR1:
-	case DSP_REG_AR2:
-	case DSP_REG_AR3:
-		return dsp.r.ar[reg - DSP_REG_AR0];
-	case DSP_REG_IX0:
-	case DSP_REG_IX1:
-	case DSP_REG_IX2:
-	case DSP_REG_IX3:
-		return dsp.r.ix[reg - DSP_REG_IX0];
-	case DSP_REG_WR0:
-	case DSP_REG_WR1:
-	case DSP_REG_WR2:
-	case DSP_REG_WR3:
-		return dsp.r.wr[reg - DSP_REG_WR0];
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		return dsp.r.st[reg - DSP_REG_ST0];
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		return dsp.r.ac[reg - DSP_REG_ACH0].h;
-	case DSP_REG_CR:     return dsp.r.cr;
-	case DSP_REG_SR:     return dsp.r.sr;
-	case DSP_REG_PRODL:  return dsp.r.prod.l;
-	case DSP_REG_PRODM:  return dsp.r.prod.m;
-	case DSP_REG_PRODH:  return dsp.r.prod.h;
-	case DSP_REG_PRODM2: return dsp.r.prod.m2;
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		return dsp.r.ax[reg - DSP_REG_AXL0].l;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		return dsp.r.ax[reg - DSP_REG_AXH0].h;
-	case DSP_REG_ACL0:
-	case DSP_REG_ACL1:
-		return dsp.r.ac[reg - DSP_REG_ACL0].l;
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-		return dsp.r.ac[reg - DSP_REG_ACM0].m;
-	default:
-		_assert_msg_(DSP_CORE, 0, "cannot happen");
-		return 0;
-	}
-}
-
-static void SetRegister(SDSP &dsp, int reg, u16 val) {
-	switch(reg) {
-	case DSP_REG_AR0:
-	case DSP_REG_AR1:
-	case DSP_REG_AR2:
-	case DSP_REG_AR3:
-		dsp.r.ar[reg - DSP_REG_AR0] = val; break;
-	case DSP_REG_IX0:
-	case DSP_REG_IX1:
-	case DSP_REG_IX2:
-	case DSP_REG_IX3:
-		dsp.r.ix[reg - DSP_REG_IX0] = val; break;
-	case DSP_REG_WR0:
-	case DSP_REG_WR1:
-	case DSP_REG_WR2:
-	case DSP_REG_WR3:
-		dsp.r.wr[reg - DSP_REG_WR0] = val; break;
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		dsp.r.st[reg - DSP_REG_ST0] = val; break;
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		dsp.r.ac[reg - DSP_REG_ACH0].h = val; break;
-	case DSP_REG_CR:     dsp.r.cr = val; break;
-	case DSP_REG_SR:     dsp.r.sr = val; break;
-	case DSP_REG_PRODL:  dsp.r.prod.l = val; break;
-	case DSP_REG_PRODM:  dsp.r.prod.m = val; break;
-	case DSP_REG_PRODH:  dsp.r.prod.h = val; break;
-	case DSP_REG_PRODM2: dsp.r.prod.m2 = val; break;
-	case DSP_REG_AXL0:
-	case DSP_REG_AXL1:
-		dsp.r.ax[reg - DSP_REG_AXL0].l = val; break;
-	case DSP_REG_AXH0:
-	case DSP_REG_AXH1:
-		dsp.r.ax[reg - DSP_REG_AXH0].h = val; break;
-	case DSP_REG_ACL0:
-	case DSP_REG_ACL1:
-		dsp.r.ac[reg - DSP_REG_ACL0].l = val; break;
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-		dsp.r.ac[reg - DSP_REG_ACM0].m = val; break;
-	default:
-		_assert_msg_(DSP_CORE, 0, "cannot happen");
-	}
-}
-
-bool DSPJitTester::AreEqual(SDSP& int_dsp, SDSP& jit_dsp)
-{
-	bool equal = true;
-	for (int i = 0; i < DSP_REG_NUM; i++)
-	{
-	    if (GetRegister(int_dsp,i) != GetRegister(jit_dsp, i))
-		{
-			if (equal)
-			{
-				if (failed_only)
-				{
-					printf("%s ", instruction_name);
-					DumpRegs(last_input_dsp);
-				}
-				if (be_verbose || failed_only)
-					printf("failed\n");
-			}
-			equal = false;
-			if (be_verbose || failed_only)
-				printf("\t%s: int = 0x%04x, jit = 0x%04x\n", regnames[i].name, GetRegister(int_dsp,i), GetRegister(jit_dsp, i));
-		}
-	}
-
-	//TODO: more sophisticated checks?
-	if (!int_dsp.iram || !jit_dsp.iram)
-	{
-		if (be_verbose)
-			printf("(IRAM null)");
-	}
-	else if (memcmp(int_dsp.iram, jit_dsp.iram, DSP_IRAM_BYTE_SIZE))
-	{
-		printf("\tIRAM: different\n");
-		equal = false;
-	}
-	if (!int_dsp.dram || !jit_dsp.dram)
-	{
-		if (be_verbose)
-			printf("(DRAM null)");
-	}
-	else if (memcmp(int_dsp.dram, jit_dsp.dram, DSP_DRAM_BYTE_SIZE))
-	{
-		printf("\tDRAM: different\n");
-		equal = false;
-	}
-
-	if (equal && be_verbose && !failed_only)
-		printf("passed\n");
-	return equal;
-}
-void DSPJitTester::Report()
-{
-	printf("%s (0x%04x): Ran %d times, Failed %d times.\n", instruction_name, instruction, run_count, fail_count);
-}
-void DSPJitTester::DumpJittedCode()
-{
-	ResetJit();
-	const u8* code = jit.GetCodePtr();
-	jit.EmitInstruction(instruction);
-	size_t code_size = jit.GetCodePtr() - code;
-
-	printf("%s emitted: ", instruction_name);
-	for (size_t i = 0; i < code_size; i++)
-		printf("%02x ", code[i]);
-	printf("\n");
-}
-void DSPJitTester::DumpRegs(SDSP& dsp)
-{
-	for (int i = 0; i < DSP_REG_NUM; i++)
-		if (GetRegister(dsp,i))
-			printf("%s=0x%04x ", regnames[i].name, GetRegister(dsp,i));
-}
-void DSPJitTester::Initialize()
-{
-	//init int
-	InitInstructionTable();
-}
-
-int DSPJitTester::TestOne(TestDataIterator it, SDSP& dsp)
-{
-	int failed = 0;
-	if (it != test_values.end())
-	{
-		u8 reg = it->first;
-		TestData& data = it->second;
-		it++;
-		for (TestData::size_type i = 0; i < data.size(); i++)
-		{
-			SetRegister(dsp, reg, data.at(i));
-			failed += TestOne(it, dsp);
-		}
-	}
-	else
-	{
-		if (!Test(dsp))
-			failed++;
-	}
-	return failed;
-}
-int DSPJitTester::TestAll(bool verbose_fail)
-{
-	int failed = 0;
-
-	SDSP dsp;
-	memset(&dsp, 0, sizeof(SDSP));
-	//from DSPCore_Init
-	dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
-	dsp.iram = (u16*)AllocateMemoryPages(DSP_IRAM_BYTE_SIZE);
-	dsp.dram = (u16*)AllocateMemoryPages(DSP_DRAM_BYTE_SIZE);
-	dsp.coef = (u16*)AllocateMemoryPages(DSP_COEF_BYTE_SIZE);
-
-	// Fill roms with distinct patterns.
-	for (int i = 0; i < DSP_IROM_SIZE; i++)
-	    dsp.irom[i] = (i & 0x3fff) | 0x4000;
-	for (int i = 0; i < DSP_COEF_SIZE; i++)
-	    dsp.coef[i] = (i & 0x3fff) | 0x8000;
-	for (int i = 0; i < DSP_DRAM_SIZE; i++)
-	    dsp.dram[i] = (i & 0x3fff) | 0xc000;
-	// Fill IRAM with HALT opcodes.
-	for (int i = 0; i < DSP_IRAM_SIZE; i++)
-		dsp.iram[i] = 0x0021; // HALT opcode
-
-	bool verbose = failed_only;
-	failed_only = verbose_fail;
-	failed += TestOne(test_values.begin(), dsp);
-	failed_only = verbose;
-
-	FreeMemoryPages(dsp.irom, DSP_IROM_BYTE_SIZE);
-	FreeMemoryPages(dsp.iram, DSP_IRAM_BYTE_SIZE);
-	FreeMemoryPages(dsp.dram, DSP_DRAM_BYTE_SIZE);
-	FreeMemoryPages(dsp.coef, DSP_COEF_BYTE_SIZE);
-
-	return failed;
-}
-void DSPJitTester::AddTestData(u8 reg)
-{
-	AddTestData(reg, 0);
-	AddTestData(reg, 1);
-	AddTestData(reg, 0x1fff);
-	AddTestData(reg, 0x2000);
-	AddTestData(reg, 0x2001);
-	AddTestData(reg, 0x7fff);
-	AddTestData(reg, 0x8000);
-	AddTestData(reg, 0x8001);
-	AddTestData(reg, 0xfffe);
-	AddTestData(reg, 0xffff);
-}
-void DSPJitTester::AddTestData(u8 reg, u16 value)
-{
-	if (reg < DSP_REG_NUM)
-		test_values[reg].push_back(value);
-}
-
diff --git a/Source/UnitTests/DSPJitTester.h b/Source/UnitTests/DSPJitTester.h
deleted file mode 100644
index ac40fa41c0..0000000000
--- a/Source/UnitTests/DSPJitTester.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// How to use the DSPJitTester:
-// 
-// == Before running ==
-// Make sure to call Initialize to set initial stuff required by int and jit:
-// DSPJitTester::Initialize();
-// 
-// == Creation of a testcase ==
-// Create a testcase for a normal operation:
-// DSPJitTester tester(0x0004); //taken from DSPTables.cpp, opcodes[]
-// 
-// Create a testcase for an extended operation:
-// DSPJitTester tester(0x8000, 0x0004); //NX from opcodes, DR from opcodes_ext
-// 
-// By default, no messages are written.
-// To log all operations, set verbose to true:
-// DSPJitTester tester(0x8000, 0x0004, true);
-// 
-// You can also choose to only print failing tests:
-// DSPJitTester tester(0x8000, 0x0004, verbosity_setting, true);
-// verbose = true will give the same output as verbose, 
-// while verbose = false will only (really!) print failing tests.
-// 
-// == Setting up values ==
-// You can set the tester up with values for each DSP register:
-// tester.AddTestData(DSP_REG_ACC0, 1);
-// tester.AddTestData(DSP_REG_ACC0, 2);
-// tester.AddTestData(DSP_REG_ACC0, 3);
-// 
-// You can also choose to have a few predefined values added for a register:
-// tester.AddTestData(DSP_REG_ACC0); //see the method body for the values added
-// 
-// == Running the tests ==
-// After setup, you can either run JIT against the interpreter 
-// using all predefined register values, pass your own set of
-// registers or run either of the two independently from each other.
-// 
-// int failed_tests = tester.TestAll(); //run jit against int, using values from AddTestData
-// int failed_tests = tester.TestAll(true); //override the value for only_failed to show failure
-// 
-// SDSP dsp = GetCustomSetOfRegisters();
-// bool success = tester.Test(dsp); //run jit against int, using a custom set of register values
-// 
-// SDSP result = tester.RunInterpreter(dsp); //run int alone
-// SDSP result = tester.RunJit(dsp); //run jit alone
-// 
-// == Examining results ==
-// When either verbose or only_failed is set to true, the tester will automatically report
-// failure to stdout, along with input registers and the differences in output registers.
-// 
-// tester.Report(); //display a small report afterwards
-// 
-// SDSP int = tester.GetLastInterpreterDSP(); //examine the DSP set left after running int
-// SDSP jit = tester.GetLastJitDSP(); //same for jit
-// 
-// int tests_run = tester.GetRunCount();
-// int tests_failed = tester.GetFailCount();
-// const char* tested_instruction = tester.GetInstructionName();
-// printf("%s ran %d tests and failed %d times\n", tested_instruction, tests_run, tests_failed);
-// 
-// tester.DumpJittedCode(); //prints the code bytes produced by jit (examine with udcli/udis86 or similar)
-
-#ifndef __DSP_JIT_TESTER_
-#define __DSP_JIT_TESTER_
-
-#include "DSP/DSPCore.h"
-#include "DSP/DSPInterpreter.h"
-#include <map>
-#include <vector>
-
-typedef std::vector<u16> TestData;
-typedef std::map<u8, TestData> TestDataList;
-typedef TestDataList::iterator TestDataIterator;
-#define DSP_REG_NUM 32
-
-class DSPJitTester
-{
-	UDSPInstruction instruction;
-	const DSPOPCTemplate *opcode_template;
-	DSPEmitter jit;
-	SDSP last_int_dsp;
-	SDSP last_jit_dsp;
-	SDSP last_input_dsp;
-	bool be_verbose;
-	bool failed_only;
-	int run_count;
-	int fail_count;
-	char instruction_name[16];
-	TestDataList test_values;
-
-	bool AreEqual(SDSP&, SDSP&);
-	int TestOne(TestDataIterator, SDSP&);
-	void DumpRegs(SDSP&);
-public:
-	DSPJitTester(u16 opcode, u16 opcode_ext = 0, bool verbose = false, bool only_failed = false);
-	bool Test(SDSP);
-	int TestAll() { return TestAll(failed_only); }
-	int TestAll(bool verbose_fail);
-	void AddTestData(u8 reg);
-	void AddTestData(u8 reg, u16 value);
-	SDSP RunInterpreter(SDSP);
-	SDSP RunJit(SDSP);
-	void ResetInterpreter();
-	void ResetJit();
-	inline SDSP GetLastInterpreterDSP() { return last_int_dsp; }
-	inline SDSP GetLastJitDSP() { return last_jit_dsp; }
-	inline int GetRunCount() { return run_count; }
-	inline int GetFailCount() { return fail_count; }
-	inline const char* GetInstructionName() { return instruction_name; }
-	void Report();
-	void DumpJittedCode();
-
-	static void Initialize();
-};
-
-#endif
diff --git a/Source/UnitTests/TestUtils/CMakeLists.txt b/Source/UnitTests/TestUtils/CMakeLists.txt
new file mode 100644
index 0000000000..79424a42a6
--- /dev/null
+++ b/Source/UnitTests/TestUtils/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(SRCS
+	# Do not add StubHost.cpp here - it is added manually via add_dolphin_test.
+	)
+
+set(LIBS
+	)
+
+# TODO: uncomment when there is actually something here.
+#add_dolphin_library(testutils "${SRCS}" "${LIBS}")
diff --git a/Source/UnitTests/TestUtils/StubHost.cpp b/Source/UnitTests/TestUtils/StubHost.cpp
new file mode 100644
index 0000000000..1f8e717402
--- /dev/null
+++ b/Source/UnitTests/TestUtils/StubHost.cpp
@@ -0,0 +1,29 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+// Stub implementation of the Host_* callbacks for tests. These implementations
+// do nothing except return default values when required.
+
+#include <string>
+
+#include "Core/Host.h"
+#include "VideoBackends/OGL/GLInterfaceBase.h"
+
+void Host_NotifyMapLoaded() {}
+void Host_RefreshDSPDebuggerWindow() {}
+void Host_Message(int) {}
+void* Host_GetRenderHandle() { return nullptr; }
+void Host_UpdateTitle(const std::string&) {}
+void Host_UpdateDisasmDialog() {}
+void Host_UpdateMainFrame() {}
+void Host_RequestRenderWindowSize(int, int) {}
+void Host_RequestFullscreen(bool) {}
+void Host_SetStartupDebuggingParameters() {}
+bool Host_UIHasFocus() { return false; }
+bool Host_RendererHasFocus() { return false; }
+bool Host_RendererIsFullscreen() { return false; }
+void Host_ConnectWiimote(int, bool) {}
+void Host_SetWiiMoteConnectionState(int) {}
+void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
+cInterfaceBase* HostGL_CreateGLInterface() { return nullptr; }
diff --git a/Source/UnitTests/UnitTests.cpp b/Source/UnitTests/UnitTests.cpp
deleted file mode 100644
index b77dc2bad5..0000000000
--- a/Source/UnitTests/UnitTests.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <cmath>
-#include <iostream>
-
-#include "StringUtil.h"
-#include "MathUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/SI_DeviceGCController.h"
-
-void AudioJitTests();
-
-using namespace std;
-int fail_count = 0;
-
-#define EXPECT_TRUE(a) \
-	if (!a) { \
-		cout << "FAIL (" << __FUNCTION__ << "): " << #a << " is false" << endl; \
-		cout << "Value: " << a << endl << "Expected: true" << endl; \
-		fail_count++; \
-	}
-
-#define EXPECT_FALSE(a) \
-	if (a) { \
-		cout << "FAIL (" << __FUNCTION__ << "): " << #a << " is true" << endl; \
-		cout << "Value: " << a << endl << "Expected: false" << endl; \
-		fail_count++; \
-	}
-
-#define EXPECT_EQ(a, b) \
-	if ((a) != (b)) { \
-		cout << "FAIL (" << __FUNCTION__ << "): " << #a << " is not equal to " << #b << endl; \
-		cout << "Actual: " << a << endl << "Expected: " << b << endl; \
-		fail_count++; \
-	}
-
-void CoreTests()
-{
-}
-
-void MathTests()
-{
-	// Tests that our fp classifier is correct.
-	EXPECT_EQ(MathUtil::ClassifyDouble(1.0),        MathUtil::PPC_FPCLASS_PN);
-	EXPECT_EQ(MathUtil::ClassifyDouble(-1.0),       MathUtil::PPC_FPCLASS_NN);
-	EXPECT_EQ(MathUtil::ClassifyDouble(1235223.0),  MathUtil::PPC_FPCLASS_PN);
-	EXPECT_EQ(MathUtil::ClassifyDouble(-1263221.0), MathUtil::PPC_FPCLASS_NN);
-	EXPECT_EQ(MathUtil::ClassifyDouble(1.0E-308),   MathUtil::PPC_FPCLASS_PD);
-	EXPECT_EQ(MathUtil::ClassifyDouble(-1.0E-308),  MathUtil::PPC_FPCLASS_ND);
-	EXPECT_EQ(MathUtil::ClassifyDouble(0.0),        MathUtil::PPC_FPCLASS_PZ);
-	EXPECT_EQ(MathUtil::ClassifyDouble(-0.0),       MathUtil::PPC_FPCLASS_NZ);
-	EXPECT_EQ(MathUtil::ClassifyDouble(HUGE_VAL),   MathUtil::PPC_FPCLASS_PINF);  // weird #define for infinity
-	EXPECT_EQ(MathUtil::ClassifyDouble(-HUGE_VAL),  MathUtil::PPC_FPCLASS_NINF);
-	EXPECT_EQ(MathUtil::ClassifyDouble(sqrt(-1.0)), MathUtil::PPC_FPCLASS_QNAN);
-
-	// Float version
-	EXPECT_EQ(MathUtil::ClassifyFloat(1.0f),        MathUtil::PPC_FPCLASS_PN);
-	EXPECT_EQ(MathUtil::ClassifyFloat(-1.0f),       MathUtil::PPC_FPCLASS_NN);
-	EXPECT_EQ(MathUtil::ClassifyFloat(1235223.0f),  MathUtil::PPC_FPCLASS_PN);
-	EXPECT_EQ(MathUtil::ClassifyFloat(-1263221.0f), MathUtil::PPC_FPCLASS_NN);
-	EXPECT_EQ(MathUtil::ClassifyFloat(1.0E-43f),    MathUtil::PPC_FPCLASS_PD);
-	EXPECT_EQ(MathUtil::ClassifyFloat(-1.0E-43f),   MathUtil::PPC_FPCLASS_ND);
-	EXPECT_EQ(MathUtil::ClassifyFloat(0.0f),        MathUtil::PPC_FPCLASS_PZ);
-	EXPECT_EQ(MathUtil::ClassifyFloat(-0.0f),       MathUtil::PPC_FPCLASS_NZ);
-	EXPECT_EQ(MathUtil::ClassifyFloat((float)HUGE_VAL),  MathUtil::PPC_FPCLASS_PINF);  // weird #define for infinity
-	EXPECT_EQ(MathUtil::ClassifyFloat((float)-HUGE_VAL), MathUtil::PPC_FPCLASS_NINF);
-	EXPECT_EQ(MathUtil::ClassifyFloat(sqrtf(-1.0f)),     MathUtil::PPC_FPCLASS_QNAN);
-
-	EXPECT_FALSE(MathUtil::IsNAN(1.0));
-	EXPECT_TRUE(MathUtil::IsNAN(sqrt(-1.0)));
-	EXPECT_FALSE(MathUtil::IsSNAN(sqrt(-1.0)));
-
-	// EXPECT_TRUE(MathUtil::IsQNAN(sqrt(-1.0)));  // Hmm...
-	EXPECT_EQ(pow2(2.0), 4.0);
-	EXPECT_EQ(pow2(-2.0), 4.0);
-}
-
-void StringTests()
-{
-	EXPECT_EQ(StripSpaces(" abc   "), "abc");
-
-	EXPECT_EQ(StripQuotes("\"abc\""), "abc");
-	EXPECT_EQ(StripQuotes("\"abc\" "), "\"abc\" ");
-
-	EXPECT_EQ(TabsToSpaces(4, "a\tb"), "a    b");
-	EXPECT_EQ(ThousandSeparate(1234567, 15), "      1,234,567");
-
-	int i = 7;
-	EXPECT_EQ(false, TryParse("FF", &i));
-	EXPECT_EQ(7, i);
-	EXPECT_EQ(true, TryParse("22", &i));
-	EXPECT_EQ(22, i);
-
-	std::vector<std::string> strs;
-	SplitString("blah,foo,bar", ',', strs);
-
-	EXPECT_EQ(3, strs.size());
-	EXPECT_EQ("bar", strs[2]);
-
-	std::string path, fname, ext;
-	SplitPath("C:/some/path/test.jpg", &path, &fname, &ext);
-	EXPECT_EQ("C:/some/path/", path);
-	EXPECT_EQ("test", fname);
-	EXPECT_EQ(".jpg", ext);
-
-	SplitPath("C:/so.me/path/", &path, &fname, &ext);
-	EXPECT_EQ("C:/so.me/path/", path);
-	EXPECT_EQ("", fname);
-	EXPECT_EQ("", ext);
-
-	SplitPath("test.file.jpg", &path, &fname, &ext);
-	EXPECT_EQ("", path);
-	EXPECT_EQ("test.file", fname);
-	EXPECT_EQ(".jpg", ext);
-}
-
-
-int main(int argc, char* argv[])
-{
-	AudioJitTests();
-
-	CoreTests();
-	MathTests();
-	StringTests();
-	if (fail_count == 0)
-	{
-		printf("All tests passed.\n");
-	}
-	return 0;
-}
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index d1a72a9979..a67c8e5ac0 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -1,217 +1,112 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="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>{40C636FA-B5BF-4D67-ABC8-376B524A7551}</ProjectGuid>
-    <RootNamespace>UnitTests</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PostBuildEventUseInBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PostBuildEventUseInBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PostBuildEventUseInBuild>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="AudioJitTests.cpp" />
-    <ClCompile Include="DSPJitTester.cpp" />
-    <ClCompile Include="UnitTests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DSPJitTester.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Core\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Core\Core\Core.vcxproj">
-      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?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|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{474661E7-C73A-43A6-AFEE-EE1EC433D49E}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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\PCHUse.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <!--This project also compiles gtest-->
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)gtest\include;$(ExternalsDir)gtest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <!--This junk is needed for JIT to function correctly-->
+      <BaseAddress>0x00400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>true</FixedBaseAddress>
+      <!--
+        The following libs are needed since we pull in pretty much the entire
+        dolphin codebase.
+        -->
+      <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <!--gtest is rather small, so just include it into the build here-->
+    <ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
+    <ClCompile Include="$(ExternalsDir)gtest\src\gtest_main.cc" />
+    <!--Lump all of the tests (and supporting code) into one binary-->
+    <ClCompile Include="*\*.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{E54CF649-140E-4255-81A5-30A673C1FB36}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
+      <Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj">
+      <Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj">
+      <Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <!--
+    This project is always built, but the outputs are conditionally executed.
+    The tests will either be run by VS' test runner (requires a plugin to adapt
+    to gtest - developers will mostly use this method), or via msbuild (the
+    buildbot does it this way). The gtest adapter has the restriction that it
+    can only scan for tests on binaries it knows about (e.g. from projects' OutDir),
+    and it doesn't allow changing the working directory for running the tests.
+    Essentially this requires all runtime dependencies to be findable from the
+    context of the tests running with working directory set to OutDir. So...
+    that was the long-winded explanation of why we copy external things to the
+    OutDir :)
+    -->
+  <ItemGroup>
+    <ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll" />
+  </ItemGroup>
+  <!--Either method of running requires the runtime deps to be copied to pwd-->
+  <Target Name="CopyDeps"
+    AfterTargets="AfterBuild"
+    Inputs="@(ExternalDlls)"
+    Outputs="@(ExternalDlls -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')">
+    <Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(OutDir)"
+      Condition="!Exists('$(OutDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(OutDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)').Ticks)" />
+  </Target>
+  <Target Name="ExecUnitTests"
+    AfterTargets="AfterBuild;CopyDeps"
+    Condition="'$(RunUnitTests)'=='true'">
+    <!--This is only executed via msbuild, VS test runner automatically does this-->
+    <Exec Command="$(TargetPath)"/>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Source/UnitTests/UnitTests.vcxproj.filters b/Source/UnitTests/UnitTests.vcxproj.filters
deleted file mode 100644
index b38fc876e5..0000000000
--- a/Source/UnitTests/UnitTests.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Audio">
-      <UniqueIdentifier>{cde9a42c-90d9-4bc9-9182-3fcc0cf9f7a4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AudioJitTests.cpp">
-      <Filter>Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="DSPJitTester.cpp">
-      <Filter>Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="UnitTests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DSPJitTester.h">
-      <Filter>Audio</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Source/UnitTests/UnitTests.vcxproj.user b/Source/UnitTests/UnitTests.vcxproj.user
new file mode 100644
index 0000000000..e472aa9c6d
--- /dev/null
+++ b/Source/UnitTests/UnitTests.vcxproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--For some stupid reason this has to be in the .user file...-->
+    <!--This is only used to allow UnitTests to find OpenAL DLL...kinda hacky-->
+    <LocalDebuggerWorkingDirectory>$(BinaryOutputDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/UnitTests/VideoCommon/CMakeLists.txt b/Source/UnitTests/VideoCommon/CMakeLists.txt
new file mode 100644
index 0000000000..b5198536ed
--- /dev/null
+++ b/Source/UnitTests/VideoCommon/CMakeLists.txt
@@ -0,0 +1 @@
+add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)
diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
new file mode 100644
index 0000000000..84e1029e2e
--- /dev/null
+++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
@@ -0,0 +1,311 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <limits>
+#include <memory>
+#include <tuple>
+#include <type_traits>
+#include <unordered_set>
+
+#include <gtest/gtest.h>  // NOLINT
+
+#include "Common/Common.h"
+#include "Common/MathUtil.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/VertexLoaderBase.h"
+#include "VideoCommon/VertexLoaderManager.h"
+
+TEST(VertexLoaderUID, UniqueEnough)
+{
+	std::unordered_set<VertexLoaderUID> uids;
+
+	TVtxDesc vtx_desc;
+	memset(&vtx_desc, 0, sizeof(vtx_desc));
+	VAT vat;
+	memset(&vat, 0, sizeof(vat));
+	uids.insert(VertexLoaderUID(vtx_desc, vat));
+
+	vtx_desc.Hex = 0xFEDCBA9876543210ull;
+	EXPECT_EQ(uids.end(), uids.find(VertexLoaderUID(vtx_desc, vat)));
+	uids.insert(VertexLoaderUID(vtx_desc, vat));
+
+	vat.g0.Hex = 0xFFFFFFFF;
+	vat.g1.Hex = 0xFFFFFFFF;
+	vat.g2.Hex = 0xFFFFFFFF;
+	EXPECT_EQ(uids.end(), uids.find(VertexLoaderUID(vtx_desc, vat)));
+	uids.insert(VertexLoaderUID(vtx_desc, vat));
+}
+
+static u8 input_memory[16 * 1024 * 1024];
+static u8 output_memory[16 * 1024 * 1024];
+
+class VertexLoaderTest : public testing::Test
+{
+protected:
+
+	void SetUp() override
+	{
+		memset(input_memory, 0, sizeof(input_memory));
+		memset(output_memory, 0xFF, sizeof(input_memory));
+
+		memset(&m_vtx_desc, 0, sizeof(m_vtx_desc));
+		memset(&m_vtx_attr, 0, sizeof(m_vtx_attr));
+
+		m_loader = nullptr;
+
+		ResetPointers();
+	}
+
+	void CreateAndCheckSizes(size_t input_size, size_t output_size)
+	{
+		m_loader.reset(VertexLoaderBase::CreateVertexLoader(m_vtx_desc, m_vtx_attr));
+		ASSERT_EQ((int)input_size, m_loader->m_VertexSize);
+		ASSERT_EQ((int)output_size, m_loader->m_native_vtx_decl.stride);
+	}
+
+	template <typename T>
+	void Input(T val)
+	{
+		// Write swapped.
+		m_src.Write<T, true>(val);
+	}
+
+	void ExpectOut(float val)
+	{
+		// Read unswapped.
+		MathUtil::IntFloat expected(val), actual(m_dst.Read<float, false>());
+		if (!actual.f || actual.f != actual.f)
+			EXPECT_EQ(expected.i, actual.i);
+		else
+			EXPECT_EQ(expected.f, actual.f);
+	}
+
+	void RunVertices(int count, int expected_count = -1)
+	{
+		if (expected_count == -1)
+			expected_count = count;
+		ResetPointers();
+		int actual_count = m_loader->RunVertices(m_src, m_dst, count);
+		EXPECT_EQ(actual_count, expected_count);
+	}
+
+	void ResetPointers()
+	{
+		m_src = DataReader(input_memory, input_memory + sizeof(input_memory));
+		m_dst = DataReader(output_memory, output_memory + sizeof(output_memory));
+	}
+
+	DataReader m_src;
+	DataReader m_dst;
+
+	TVtxDesc m_vtx_desc;
+	VAT m_vtx_attr;
+	std::unique_ptr<VertexLoaderBase> m_loader;
+};
+
+class VertexLoaderParamTest : public VertexLoaderTest, public ::testing::WithParamInterface<std::tuple<int, int, int, int>> {};
+extern int gtest_AllCombinationsVertexLoaderParamTest_dummy_;
+INSTANTIATE_TEST_CASE_P(
+	AllCombinations, VertexLoaderParamTest,
+	::testing::Combine(
+		::testing::Values(DIRECT, INDEX8, INDEX16),
+		::testing::Values(FORMAT_UBYTE, FORMAT_BYTE, FORMAT_USHORT, FORMAT_SHORT, FORMAT_FLOAT),
+		::testing::Values(0, 1), // elements
+		::testing::Values(0, 1, 31) // frac
+	)
+);
+
+TEST_P(VertexLoaderParamTest, PositionAll)
+{
+	int addr, format, elements, frac;
+	std::tie(addr, format, elements, frac) = GetParam();
+	this->m_vtx_desc.Position = addr;
+	this->m_vtx_attr.g0.PosFormat = format;
+	this->m_vtx_attr.g0.PosElements = elements;
+	this->m_vtx_attr.g0.PosFrac = frac;
+	this->m_vtx_attr.g0.ByteDequant = true;
+	elements += 2;
+
+	std::vector<float> values = {
+		std::numeric_limits<float>::lowest(),
+		std::numeric_limits<float>::denorm_min(),
+		std::numeric_limits<float>::min(),
+		std::numeric_limits<float>::max(),
+		std::numeric_limits<float>::quiet_NaN(),
+		std::numeric_limits<float>::infinity(),
+		-0x8000, -0x80, -1, -0, 0, 1, 123, 0x7F, 0xFF, 0x7FFF, 0xFFFF, 12345678,
+	};
+	ASSERT_EQ(0u, values.size() % 2);
+	ASSERT_EQ(0u, values.size() % 3);
+
+	int count = (int)values.size() / elements;
+	u32 elem_size = 1 << (format / 2);
+	size_t input_size = elements * elem_size;
+	if (addr & MASK_INDEXED)
+	{
+		input_size = addr - 1;
+		for (int i = 0; i < count; i++)
+			if (addr == INDEX8)
+				Input<u8>(i);
+			else
+				Input<u16>(i);
+		VertexLoaderManager::cached_arraybases[ARRAY_POSITION] = m_src.GetPointer();
+		g_main_cp_state.array_strides[ARRAY_POSITION] = elements * elem_size;
+	}
+	CreateAndCheckSizes(input_size, elements * sizeof(float));
+	for (float value : values)
+	{
+		switch (format)
+		{
+		case FORMAT_UBYTE:  Input((u8)value);  break;
+		case FORMAT_BYTE:   Input((s8)value);  break;
+		case FORMAT_USHORT: Input((u16)value); break;
+		case FORMAT_SHORT:  Input((s16)value); break;
+		case FORMAT_FLOAT:  Input(value);      break;
+		}
+	}
+
+	RunVertices(count);
+
+	float scale = 1.f / (1u << (format == FORMAT_FLOAT ? 0 : frac));
+	for (auto iter = values.begin(); iter != values.end();)
+	{
+		float f, g;
+		switch (format)
+		{
+		case FORMAT_UBYTE:  f = (u8)*iter++;  g = (u8)*iter++;  break;
+		case FORMAT_BYTE:   f = (s8)*iter++;  g = (s8)*iter++;  break;
+		case FORMAT_USHORT: f = (u16)*iter++; g = (u16)*iter++; break;
+		case FORMAT_SHORT:  f = (s16)*iter++; g = (s16)*iter++; break;
+		case FORMAT_FLOAT:  f = *iter++;      g = *iter++;      break;
+		}
+		ExpectOut(f * scale);
+		ExpectOut(g * scale);
+	}
+}
+
+TEST_F(VertexLoaderTest, PositionIndex16FloatXY)
+{
+	m_vtx_desc.Position = INDEX16;
+	m_vtx_attr.g0.PosFormat = FORMAT_FLOAT;
+	CreateAndCheckSizes(sizeof(u16), 2 * sizeof(float));
+	Input<u16>(1); Input<u16>(0);
+	VertexLoaderManager::cached_arraybases[ARRAY_POSITION] = m_src.GetPointer();
+	g_main_cp_state.array_strides[ARRAY_POSITION] = sizeof(float); // ;)
+	Input(1.f); Input(2.f); Input(3.f);
+	RunVertices(2);
+	ExpectOut(2); ExpectOut(3);
+	ExpectOut(1); ExpectOut(2);
+}
+
+class VertexLoaderSpeedTest : public VertexLoaderTest, public ::testing::WithParamInterface<std::tuple<int, int>> {};
+extern int gtest_FormatsAndElementsVertexLoaderSpeedTest_dummy_;
+INSTANTIATE_TEST_CASE_P(
+	FormatsAndElements, VertexLoaderSpeedTest,
+	::testing::Combine(
+		::testing::Values(FORMAT_UBYTE, FORMAT_BYTE, FORMAT_USHORT, FORMAT_SHORT, FORMAT_FLOAT),
+		::testing::Values(0, 1) // elements
+	)
+);
+
+TEST_P(VertexLoaderSpeedTest, PositionDirectAll)
+{
+	int format, elements;
+	std::tie(format, elements) = GetParam();
+	const char* map[] = { "u8", "s8", "u16", "s16", "float" };
+	printf("format: %s, elements: %d\n", map[format], elements);
+	m_vtx_desc.Position = DIRECT;
+	m_vtx_attr.g0.PosFormat = format;
+	m_vtx_attr.g0.PosElements = elements;
+	elements += 2;
+	size_t elem_size = 1 << (format / 2);
+	CreateAndCheckSizes(elements * elem_size, elements * sizeof(float));
+	for (int i = 0; i < 1000; ++i)
+		RunVertices(100000);
+}
+
+TEST_P(VertexLoaderSpeedTest, TexCoordSingleElement)
+{
+	int format, elements;
+	std::tie(format, elements) = GetParam();
+	const char* map[] = { "u8", "s8", "u16", "s16", "float" };
+	printf("format: %s, elements: %d\n", map[format], elements);
+	m_vtx_desc.Position = DIRECT;
+	m_vtx_attr.g0.PosFormat = FORMAT_BYTE;
+	m_vtx_desc.Tex0Coord = DIRECT;
+	m_vtx_attr.g0.Tex0CoordFormat = format;
+	m_vtx_attr.g0.Tex0CoordElements = elements;
+	elements += 1;
+	size_t elem_size = 1 << (format / 2);
+	CreateAndCheckSizes(2 * sizeof(s8)    + elements * elem_size,
+	                    2 * sizeof(float) + elements * sizeof(float));
+	for (int i = 0; i < 1000; ++i)
+		RunVertices(100000);
+}
+
+TEST_F(VertexLoaderTest, LargeFloatVertexSpeed)
+{
+	// Enables most attributes in floating point indexed mode to test speed.
+	m_vtx_desc.PosMatIdx = 1;
+	m_vtx_desc.Tex0MatIdx = 1;
+	m_vtx_desc.Tex1MatIdx = 1;
+	m_vtx_desc.Tex2MatIdx = 1;
+	m_vtx_desc.Tex3MatIdx = 1;
+	m_vtx_desc.Tex4MatIdx = 1;
+	m_vtx_desc.Tex5MatIdx = 1;
+	m_vtx_desc.Tex6MatIdx = 1;
+	m_vtx_desc.Tex7MatIdx = 1;
+	m_vtx_desc.Position = INDEX16;
+	m_vtx_desc.Normal = INDEX16;
+	m_vtx_desc.Color0 = INDEX16;
+	m_vtx_desc.Color1 = INDEX16;
+	m_vtx_desc.Tex0Coord = INDEX16;
+	m_vtx_desc.Tex1Coord = INDEX16;
+	m_vtx_desc.Tex2Coord = INDEX16;
+	m_vtx_desc.Tex3Coord = INDEX16;
+	m_vtx_desc.Tex4Coord = INDEX16;
+	m_vtx_desc.Tex5Coord = INDEX16;
+	m_vtx_desc.Tex6Coord = INDEX16;
+	m_vtx_desc.Tex7Coord = INDEX16;
+
+	m_vtx_attr.g0.PosElements = 1;        // XYZ
+	m_vtx_attr.g0.PosFormat = FORMAT_FLOAT;
+	m_vtx_attr.g0.NormalElements = 1;     // NBT
+	m_vtx_attr.g0.NormalFormat = FORMAT_FLOAT;
+	m_vtx_attr.g0.Color0Elements = 1;     // Has Alpha
+	m_vtx_attr.g0.Color0Comp = FORMAT_32B_8888;
+	m_vtx_attr.g0.Color1Elements = 1;     // Has Alpha
+	m_vtx_attr.g0.Color1Comp = FORMAT_32B_8888;
+	m_vtx_attr.g0.Tex0CoordElements = 1;  // ST
+	m_vtx_attr.g0.Tex0CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g1.Tex1CoordElements = 1;  // ST
+	m_vtx_attr.g1.Tex1CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g1.Tex2CoordElements = 1;  // ST
+	m_vtx_attr.g1.Tex2CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g1.Tex3CoordElements = 1;  // ST
+	m_vtx_attr.g1.Tex3CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g1.Tex4CoordElements = 1;  // ST
+	m_vtx_attr.g1.Tex4CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g2.Tex5CoordElements = 1;  // ST
+	m_vtx_attr.g2.Tex5CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g2.Tex6CoordElements = 1;  // ST
+	m_vtx_attr.g2.Tex6CoordFormat = FORMAT_FLOAT;
+	m_vtx_attr.g2.Tex7CoordElements = 1;  // ST
+	m_vtx_attr.g2.Tex7CoordFormat = FORMAT_FLOAT;
+
+	CreateAndCheckSizes(33, 156);
+
+	for (int i = 0; i < 12; i++)
+	{
+		VertexLoaderManager::cached_arraybases[i] = m_src.GetPointer();
+		g_main_cp_state.array_strides[i] = 129;
+	}
+
+	// This test is only done 100x in a row since it's ~20x slower using the
+	// current vertex loader implementation.
+	for (int i = 0; i < 100; ++i)
+		RunVertices(100000);
+}
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index e1201912fd..0bbef70b88 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -1,28 +1,154 @@
-<?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>$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;USE_UPNP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StructMemberAlignment>16Bytes</StructMemberAlignment>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <BaseAddress>0x00400000</BaseAddress>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <DolphinRelease Condition="'$(DolphinRelease)'!='true' or '$(Configuration)'!='Release'">false</DolphinRelease>
+    <TargetSuffix>
+    </TargetSuffix>
+    <TargetSuffix Condition="'$(Configuration)'=='Debug'">D</TargetSuffix>
+    <DolphinRootDir>$(SolutionDir)..\</DolphinRootDir>
+    <BuildRootDir>$(DolphinRootDir)Build\</BuildRootDir>
+    <BinaryRootDir>$(DolphinRootDir)Binary\</BinaryRootDir>
+    <BinaryOutputDir>$(BinaryRootDir)$(Platform)\</BinaryOutputDir>
+    <ExternalsDir>$(DolphinRootDir)Externals\</ExternalsDir>
+    <CoreDir>$(SolutionDir)Core\</CoreDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!--
+    Opt-in to x64 compiler and tools.
+    Unfortunately we can't set this property here, as it'll be overridden later. Instead, set it
+    from commandline if you're interested in using x64 toolset
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+    -->
+    <IntDir>$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(IntDir)bin\</OutDir>
+    <TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)$(TargetSuffix)</TargetName>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <!--ClCompile Base-->
+    <ClCompile>
+      <!--
+      Coagulate all the needed include directories.
+      Order matters! (first hit, first use).
+        Note: Directory containing source file being compiled is always searched first.
+      -->
+      <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)GL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_UPNP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PSAPI_VERSION=1;_M_X86=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!--
+      Make sure we include a clean version of windows.h.
+      -->
+      <PreprocessorDefinitions Condition="'$(ProjectName)'!='portaudio' And '$(ProjectName)'!='wxWidgets'">WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!--
+      This numeral indicates the "minimum system required" to run the resulting
+      program. Dolphin targets Vista+, so it should be 0x0600. However in practice,
+      _WIN32_WINNT just removes up-level API declarations from headers. This is a
+      problem for XAudio2 and XInput, where Dolphin expects to compile against the
+      Win8+ versions of their headers. So while we really need Vista+ level of
+      support, we declare Win8+ here globally. If this becomes a problem, the
+      higher declaration can be contained to just the XAudio2/XInput related code.
+      -->
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0602;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <StructMemberAlignment>16Bytes</StructMemberAlignment>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MinimalRebuild>false</MinimalRebuild>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <!--Enforce some behaviors as standards-conformant when they don't default as such-->
+      <AdditionalOptions>/Zc:inline /Zc:rvalueCast /volatile:iso %(AdditionalOptions)</AdditionalOptions>
+      <!--Enable detailed debug info-->
+      <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <!--
+      This is for GetVersionEx being marked as depreciated - which is idiotic and there's
+      not much else we can do since many externals use it. The bad part is that there doesn't
+      seem to be a way to only ignore the specific instance we don't care about...
+      -->
+      <DisableSpecificWarnings>4996;4351</DisableSpecificWarnings>
+    </ClCompile>
+    <!--ClCompile Debug-->
+    <ClCompile Condition="'$(Configuration)'=='Debug'">
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PreprocessorDefinitions>_DEBUG;_SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <!--ClCompile Release-->
+    <ClCompile Condition="'$(Configuration)'=='Release'">
+      <WholeProgramOptimization Condition="'$(DolphinRelease)'=='true'">true</WholeProgramOptimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <PreprocessorDefinitions>_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!--This option is not supported in debug mode (for VS2013)-->
+      <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <!--Link Base-->
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <!--Link Release-->
+    <Link Condition="'$(Configuration)'=='Release'">
+      <LinkTimeCodeGeneration Condition="'$(DolphinRelease)'=='true'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+    <!--Link Base:Application-->
+    <Link Condition="'$(ConfigurationType)'=='Application'">
+      <!--See Common/EnableXSaveWorkaround.cpp-->
+      <ForceSymbolReferences>XSaveWorkaround</ForceSymbolReferences>
+    </Link>
+    <Lib>
+      <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>
+      <LinkTimeCodeGeneration Condition="'$(DolphinRelease)'=='true'">true</LinkTimeCodeGeneration>
+    </Lib>
+    <!--
+    Prefer VTune 2015 over 2013 but support both since there is no non-commercial license for 2015 :(
+    -->
+    <ItemDefinitionGroup Condition="Exists('$(VTUNE_AMPLIFIER_XE_2015_DIR)')">
+      <ClCompile>
+        <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);"$(VTUNE_AMPLIFIER_XE_2015_DIR)\include"</AdditionalIncludeDirectories>
+      </ClCompile>
+      <Link>
+        <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);"$(VTUNE_AMPLIFIER_XE_2015_DIR)\lib64"</AdditionalLibraryDirectories>
+      </Link>
+    </ItemDefinitionGroup>
+    <ItemDefinitionGroup Condition="Exists('$(VTUNE_AMPLIFIER_XE_2013_DIR)') And !Exists('$(VTUNE_AMPLIFIER_XE_2015_DIR)')">
+      <ClCompile>
+        <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);"$(VTUNE_AMPLIFIER_XE_2013_DIR)\include"</AdditionalIncludeDirectories>
+      </ClCompile>
+      <Link>
+        <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);"$(VTUNE_AMPLIFIER_XE_2013_DIR)\lib64"</AdditionalLibraryDirectories>
+      </Link>
+    </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/Source/VSProps/ClDisableAllWarnings.props b/Source/VSProps/ClDisableAllWarnings.props
new file mode 100644
index 0000000000..6710049dee
--- /dev/null
+++ b/Source/VSProps/ClDisableAllWarnings.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/CodeGen_Debug.props b/Source/VSProps/CodeGen_Debug.props
deleted file mode 100644
index adbaeec9b2..0000000000
--- a/Source/VSProps/CodeGen_Debug.props
+++ /dev/null
@@ -1,16 +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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <Optimization>Disabled</Optimization>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/CodeGen_DebugFast.props b/Source/VSProps/CodeGen_DebugFast.props
deleted file mode 100644
index 2c580c327d..0000000000
--- a/Source/VSProps/CodeGen_DebugFast.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>CodeGen_DebugFast</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link />
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props
deleted file mode 100644
index 2b69dc0f63..0000000000
--- a/Source/VSProps/CodeGen_Release.props
+++ /dev/null
@@ -1,29 +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>CodeGen_Release</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props
deleted file mode 100644
index 9fae9c425d..0000000000
--- a/Source/VSProps/Dolphin.Win32.props
+++ /dev/null
@@ -1,15 +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>
-    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName);..\..\..\Externals\libusb\$(PlatformName);..\..\..\Externals\polarssl\visualc\VS2010\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;libusb-1.0.lib;PolarSSL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props
deleted file mode 100644
index 16b46f8203..0000000000
--- a/Source/VSProps/Dolphin.x64.props
+++ /dev/null
@@ -1,16 +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>Dolphin.x64</_PropertySheetDisplayName>
-    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName);..\..\..\Externals\libusb\$(PlatformName);..\..\..\Externals\polarssl\visualc\VS2010\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;libusb-1.0.lib;PolarSSL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/PCHCommon.props b/Source/VSProps/PCHCommon.props
new file mode 100644
index 0000000000..c2247264b7
--- /dev/null
+++ b/Source/VSProps/PCHCommon.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <!--
+        Creator and ALL users of PCH must have exact same compiler settings!
+        In dolphin we accomplish this by sharing settings between targets with
+        Base.props.
+        -->
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <!--
+        This file will be included by other projects, so we have to manually set
+        the output path.
+        -->
+      <PrecompiledHeaderOutputFile>$(BuildRootDir)$(Platform)\$(Configuration)\pch\pch.pch</PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/PCHCreate.props b/Source/VSProps/PCHCreate.props
new file mode 100644
index 0000000000..451a8f71a5
--- /dev/null
+++ b/Source/VSProps/PCHCreate.props
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PCHCommon.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <!--
+    Hacks preventing PCH creators from spending time generating .lib files.
+    It is just an optimization to save some time since only .obj outputs are
+    really needed by PCH users.
+    -->
+  <ItemDefinitionGroup>
+    <Lib>
+      <!--
+        Clear the output path so projects referencing this one don't try to drag
+        in a nonexistant .lib file.
+        -->
+      <OutputFile />
+    </Lib>
+  </ItemDefinitionGroup>
+  <!--This prevents the _Lib target from being executed-->
+  <PropertyGroup>
+    <BuildLibTargets>$(BuildLibTargets);ClearLibCompiled</BuildLibTargets>
+  </PropertyGroup>
+  <Target Name="ClearLibCompiled">
+    <PropertyGroup>
+      <LibCompiled>false</LibCompiled>
+    </PropertyGroup>
+  </Target>
+  <!--End .lib hacks-->
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/PCHUse.props b/Source/VSProps/PCHUse.props
new file mode 100644
index 0000000000..b803a9593f
--- /dev/null
+++ b/Source/VSProps/PCHUse.props
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PCHCommon.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)PCH/pch.vcxproj">
+      <Project>{76563A7F-1011-4EAD-B667-7BB18D09568E}</Project>
+      <Private>false</Private>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/PrecompiledHeader.props b/Source/VSProps/PrecompiledHeader.props
deleted file mode 100644
index c305a1f4c5..0000000000
--- a/Source/VSProps/PrecompiledHeader.props
+++ /dev/null
@@ -1,13 +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>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
new file mode 100644
index 0000000000..9a21863036
--- /dev/null
+++ b/Source/VSProps/QtCompile.props
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <QTDIRDefault>$(ExternalsDir)Qt\Qt5.4.0\5.4\msvc2013_64_opengl\</QTDIRDefault>
+    <QTDIR Condition="Exists('$(QTDIRDefault)') And '$(QTDIR)'==''">$(QTDIRDefault)</QTDIR>
+    <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR>
+    <QtDirValid>false</QtDirValid>
+    <QtDirValid Condition="Exists('$(QTDIR)')">true</QtDirValid>
+    <QtIncludeDir>$(QTDIR)include\</QtIncludeDir>
+    <QtLibDir>$(QTDIR)lib\</QtLibDir>
+    <QtBinDir>$(QTDIR)bin\</QtBinDir>
+    <QtPluginsDir>$(QTDIR)plugins\</QtPluginsDir>
+    <QtToolOutDir>$(IntDir)</QtToolOutDir>
+    <QtMocOutPrefix>$(QtToolOutDir)moc_</QtMocOutPrefix>
+    <QtDebugSuffix>d</QtDebugSuffix>
+    <QtLibSuffix Condition="'$(Configuration)'=='Debug'">$(QtDebugSuffix)</QtLibSuffix>
+    <QtPluginFolder>QtPlugins</QtPluginFolder>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QT_USE_QSTRINGBUILDER;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_TO_ASCII;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtToolOutDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <!--
+      <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>
+      -->
+    </Link>
+  </ItemDefinitionGroup>
+  
+  <!--Passes all .qrc files to rcc and puts output in the build directory-->
+  <ItemGroup>
+    <ResFiles Include="$(MSBuildProjectDirectory)\**\*.qrc" />
+  </ItemGroup>
+  <Target Name="QtResource"
+    BeforeTargets="ClCompile"
+    Inputs="@(ResFiles)"
+    Condition="'@(QtResource)'!=''"
+    Outputs="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')">
+    <Message Text="rcc %(ResFiles.Filename)" Importance="High" />
+    <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" />
+    <MakeDir Directories="$(QtToolOutDir)" />
+    <Exec Command="&quot;$(QtBinDir)rcc.exe&quot; &quot;%(ResFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)qrc_%(ResFiles.Filename).h&quot;" />
+  </Target>
+  
+  <Target Name="QtResourceClean">
+    <Delete Files="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')" />
+  </Target>
+  
+  <!--Passes all .ui files to uic and puts output in the build directory-->
+  <ItemGroup>
+    <UiFiles Include="$(MSBuildProjectDirectory)\**\*.ui" />
+  </ItemGroup>
+  <Target Name="QtUi"
+    BeforeTargets="ClCompile"
+    Inputs="@(UiFiles)"
+    Condition="'@(QtUi)'!=''"
+    Outputs="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')">
+    <Message Text="uic %(UiFiles.Filename)" Importance="High" />
+    <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" />
+    <MakeDir Directories="$(QtToolOutDir)" />
+    <Exec Command="&quot;$(QtBinDir)uic.exe&quot; &quot;%(UiFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)ui_%(UiFiles.Filename).h&quot;" />
+  </Target>
+  
+  <Target Name="QtUiClean">
+    <Delete Files="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')" />
+  </Target>
+  
+  <!--Compile files needed to MOC and output in the build directory-->
+  <!--TODO find a way to autocreate from ClCompile settings-->
+  <PropertyGroup>
+    <MocDefines>-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -D_SECURE_SCL=0 -D_ARCH_64=1 -D_M_X86_64=1 -DPSAPI_VERSION=1 -D_M_X86=1 -DUSE_UPNP -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_UNICODE -DUNICODE</MocDefines>
+    <MocDefines Condition="'$(Configuration)'=='Release'">-DQT_NO_DEBUG -DNDEBUG $(MocDefines)</MocDefines>
+    <!-- !!!HOLY UGLY BATMAN!!!
+        Be very careful here when adding include directories. Each path must have the whole arg surrounded by doublequotes - HOWEVER,
+        the ending doublequote cannot be directly preceeded by a directory seperator. In other words, you must use:
+        "-I$(SomeDir) "
+        instead of
+        "-I$(SomeDir)"
+        in order to prevent the trailing slash from escaping the doublequote after value replacement.
+        -->
+    <MocIncludes>"-I$(QtIncludeDir)QtWidgets" "-I$(QtIncludeDir)QtGui" "-I$(QtIncludeDir)QtCore" "-I$(QtIncludeDir) " "-I$(QtToolOutDir) " -I.</MocIncludes>
+    <MocIncludes>"-I$(ExternalsDir)xxhash" "-I$(ExternalsDir)zlib" "-I$(ExternalsDir)SOIL" "-I$(ExternalsDir)SFML\include" "-I$(ExternalsDir)portaudio\include" "-I$(ExternalsDir)polarssl\include" "-I$(ExternalsDir)miniupnpc\src" "-I$(ExternalsDir)LZO" "-I$(ExternalsDir)libusbx\libusb" "-I$(ExternalsDir)libpng" "-I$(ExternalsDir)GL" "-I$(ExternalsDir)Bochs_disasm" "-I$(ExternalsDir) " "-I$(CoreDir) " $(MocIncludes)</MocIncludes>
+  </PropertyGroup>
+  <Target Name="QtMoc"
+    BeforeTargets="ClCompile"
+    Condition="'@(QtMoc)'!=''"
+    Inputs="%(QtMoc.Identity);%(QtMoc.AdditionalDependencies);$(MSBuildProjectFile)"
+    Outputs="$(QtToolOutDir)moc_%(QtMoc.Filename).cpp">
+    <Message Text="moc %(QtMoc.Filename)" Importance="High" />
+    <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" />
+    <MakeDir Directories="$(QtToolOutDir)" />
+    <Exec Command="&quot;$(QtBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -o &quot;$(QtToolOutDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" />
+  </Target>
+  
+  <ItemGroup>
+    <MocOutputs Include="$(QtToolOutDir)moc_*.cpp" />
+  </ItemGroup>
+  <Target Name="QtMocClean">
+    <Delete Files="@(MocOutputs)" />
+  </Target>
+  
+  <!--Expose the new targets to VS-->
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
+    <AvailableItemName Include="QtResource">
+      <Targets>QtResource</Targets>
+    </AvailableItemName>
+    <AvailableItemName Include="QtUi">
+      <Targets>QtUi</Targets>
+    </AvailableItemName>
+    <AvailableItemName Include="QtMoc">
+      <Targets>QtMoc</Targets>
+    </AvailableItemName>
+  </ItemGroup>
+  
+  <!--Copy the needed dlls-->
+  <ItemGroup>
+    <IcuDlls Include="icudt53;icuin53;icuuc53" />
+    <QtLibNames Include="@(IcuDlls);Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" />
+    <QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" />
+    <!--Filter plugins to copy based on the observation that all debug versions end in "d"-->
+    <QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" />
+    <QtPlugins Condition="'$(Configuration)'=='Debug'" Include="@(QtAllPlugins)" />
+    <QtPlugins Condition="'$(Configuration)'=='Release'" Exclude="$(QtPluginsDir)**\*$(QtDebugSuffix).dll" Include="@(QtAllPlugins)" />
+    <QtPluginsDest Include="@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </ItemGroup>
+  <PropertyGroup>
+    <QtConfFile>$(BinaryOutputDir)qt.conf</QtConfFile>
+  </PropertyGroup>
+  <Target Name="QtCopyBinaries"
+    AfterTargets="Build"
+    Condition="'$(I_AM_BUILDACUS)'==''"
+    Inputs="@(QtDlls);@(QtPlugins)"
+    Outputs="@(QtDlls -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')">
+    <Message Text="Copying Qt .dlls" Importance="High" />
+    <Copy
+      SourceFiles="@(QtDlls)"
+      DestinationFolder="$(BinaryOutputDir)"
+      SkipUnchangedFiles="true"
+    />
+    <Copy
+      SourceFiles="@(QtPlugins)"
+      DestinationFiles="@(QtPluginsDest)"
+      SkipUnchangedFiles="true"
+    />
+  </Target>
+  <Target Name="QtCreateConf"
+    BeforeTargets="QtCopyBinaries"
+    Condition="!Exists('$(QtConfFile)')">
+    <!--
+      Create a file which tells Qt where to look for "plugins".
+      Otherwise Qt only looks in ./<subtype>/type.dll instead of ./$(QtPluginFolder)/<subtype>/type.dll, which is messy
+      -->
+    <WriteLinesToFile
+      File="$(QtConfFile)"
+      Lines="[Paths];Plugins = ./$(QtPluginFolder)"
+      Overwrite="true"
+    />
+  </Target>
+</Project>
diff --git a/Source/VSProps/QtCompile.targets b/Source/VSProps/QtCompile.targets
new file mode 100644
index 0000000000..c12753982e
--- /dev/null
+++ b/Source/VSProps/QtCompile.targets
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+  <PropertyGroup>
+    <CleanDependsOn>QtResourceClean;QtUiClean;QtMocClean;$(CleanDependsOn)</CleanDependsOn>
+    <!--
+    <ComputeLinkInputsTargets>$(ComputeLinkInputsTargets);QtComputeMocOutput;</ComputeLinkInputsTargets>
+    <ComputeLibInputsTargets>$(ComputeLibInputsTargets);QtComputeMocOutput;</ComputeLibInputsTargets>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/QtCompile.xml b/Source/VSProps/QtCompile.xml
new file mode 100644
index 0000000000..976c2d2b82
--- /dev/null
+++ b/Source/VSProps/QtCompile.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <ItemType Name="QtResource" DisplayName="Qt Resource File" />
+  <ItemType Name="QtUi" DisplayName="Qt User Interface File" />
+  <ItemType Name="QtMoc" DisplayName="Qt Meta Object File" />
+  <ContentType Name="QtUi" DisplayName="Qt User Interface Compiler" />
+  <ContentType Name="QtResource" DisplayName="Qt Resource Compiler" />
+  <ContentType Name="QtMoc" DisplayName="Qt Meta Object Compiler" />
+  <FileExtension Name="*.qrc" ContentType="QtResource" />
+  <FileExtension Name="*.ui" ContentType="QtUi" />
+</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index d979a83c43..a4617484bc 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IntDir>$(ProjectName)$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ForcedIncludeFiles>
-      </ForcedIncludeFiles>
+      <!--Created in the vcxproj-->
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <ExceptionHandling>Async</ExceptionHandling>
-      <DisableSpecificWarnings>4267</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__WXMSW__;WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
     </ClCompile>
+    <Link>
+      <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln
new file mode 100644
index 0000000000..91b1c72ee9
--- /dev/null
+++ b/Source/dolphin-emu.sln
@@ -0,0 +1,236 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinQt", "Core\DolphinQt\DolphinQt.vcxproj", "{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{160BDC25-5626-4B0D-BDD8-2953D9777FB5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{6BBD47CF-91FD-4077-B676-8B76980178A9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UICommon", "Core\UICommon\UICommon.vcxproj", "{604C8368-F34A-4D55-82C8-CC92A0C13254}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{87ADDFF9-5768-4DA2-A33B-2477593D6677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin Core", "Dolphin Core", "{15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{AB993F38-C31D-4897-B139-A620C42BC565}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{31643FDB-1BB8-4965-9DE7-000FC88D35AE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\png\png.vcxproj", "{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{B441CC62-877E-4B3F-93E0-0DE80544F705}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "..\Externals\xxhash\xxhash.vcxproj", "{677EA016-1182-440C-9345-DC88D1E98C0C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{FF213B23-2C26-4214-9F88-85271E557E87}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\soundtouch\SoundTouch.vcxproj", "{EC082900-B4D8-42E9-9663-77F02F6936AE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolarSSL", "..\Externals\polarssl\visualc\PolarSSL.vcxproj", "{BDB6578B-0691-4E80-A46C-DF21639FD3B8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SCMRevGen.vcxproj", "{41279555-F94F-4EBC-99DE-AF863C10C5C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\Externals\portaudio\build\portaudio.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D", "Core\VideoBackends\D3D\D3D.vcxproj", "{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGL", "Core\VideoBackends\OGL\OGL.vcxproj", "{EC1A314C-5588-4506-9C1E-2E58E5817F75}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Software", "Core\VideoBackends\Software\Software.vcxproj", "{A4C423AA-F57C-46C7-A172-D1A777017D29}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Video Backends", "Video Backends", "{AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "PCH\pch.vcxproj", "{76563A7F-1011-4EAD-B667-7BB18D09568E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "..\Externals\enet\enet.vcxproj", "{CBC76802-C128-4B17-BF6C-23B08C313E5E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47411FDB-1BF2-48D0-AB4E-C7C41160F898}.Debug|x64.ActiveCfg = Debug|x64
+		{47411FDB-1BF2-48D0-AB4E-C7C41160F898}.Debug|x64.Build.0 = Debug|x64
+		{47411FDB-1BF2-48D0-AB4E-C7C41160F898}.Release|x64.ActiveCfg = Release|x64
+		{47411FDB-1BF2-48D0-AB4E-C7C41160F898}.Release|x64.Build.0 = Release|x64
+		{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}.Debug|x64.ActiveCfg = Debug|x64
+		{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}.Debug|x64.Build.0 = Debug|x64
+		{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}.Release|x64.ActiveCfg = Release|x64
+		{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}.Release|x64.Build.0 = Release|x64
+		{E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.ActiveCfg = Debug|x64
+		{E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.Build.0 = Debug|x64
+		{E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.ActiveCfg = Release|x64
+		{E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.Build.0 = Release|x64
+		{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.ActiveCfg = Debug|x64
+		{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.Build.0 = Debug|x64
+		{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.ActiveCfg = Release|x64
+		{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.Build.0 = Release|x64
+		{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.ActiveCfg = Debug|x64
+		{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.Build.0 = Debug|x64
+		{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.ActiveCfg = Release|x64
+		{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.Build.0 = Release|x64
+		{160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.ActiveCfg = Debug|x64
+		{160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.Build.0 = Debug|x64
+		{160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.ActiveCfg = Release|x64
+		{160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.Build.0 = Release|x64
+		{6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.ActiveCfg = Debug|x64
+		{6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.Build.0 = Debug|x64
+		{6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.ActiveCfg = Release|x64
+		{6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.Build.0 = Release|x64
+		{604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.ActiveCfg = Debug|x64
+		{604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.Build.0 = Debug|x64
+		{604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.ActiveCfg = Release|x64
+		{604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.Build.0 = Release|x64
+		{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.ActiveCfg = Debug|x64
+		{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.Build.0 = Debug|x64
+		{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.ActiveCfg = Release|x64
+		{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.Build.0 = Release|x64
+		{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|x64.ActiveCfg = Debug|x64
+		{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|x64.Build.0 = Debug|x64
+		{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Release|x64.ActiveCfg = Release|x64
+		{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Release|x64.Build.0 = Release|x64
+		{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}.Debug|x64.ActiveCfg = Debug|x64
+		{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}.Debug|x64.Build.0 = Debug|x64
+		{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}.Release|x64.ActiveCfg = Release|x64
+		{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}.Release|x64.Build.0 = Release|x64
+		{AB993F38-C31D-4897-B139-A620C42BC565}.Debug|x64.ActiveCfg = Debug|x64
+		{AB993F38-C31D-4897-B139-A620C42BC565}.Debug|x64.Build.0 = Debug|x64
+		{AB993F38-C31D-4897-B139-A620C42BC565}.Release|x64.ActiveCfg = Release|x64
+		{AB993F38-C31D-4897-B139-A620C42BC565}.Release|x64.Build.0 = Release|x64
+		{31643FDB-1BB8-4965-9DE7-000FC88D35AE}.Debug|x64.ActiveCfg = Debug|x64
+		{31643FDB-1BB8-4965-9DE7-000FC88D35AE}.Debug|x64.Build.0 = Debug|x64
+		{31643FDB-1BB8-4965-9DE7-000FC88D35AE}.Release|x64.ActiveCfg = Release|x64
+		{31643FDB-1BB8-4965-9DE7-000FC88D35AE}.Release|x64.Build.0 = Release|x64
+		{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}.Debug|x64.ActiveCfg = Debug|x64
+		{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}.Debug|x64.Build.0 = Debug|x64
+		{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}.Release|x64.ActiveCfg = Release|x64
+		{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}.Release|x64.Build.0 = Release|x64
+		{B441CC62-877E-4B3F-93E0-0DE80544F705}.Debug|x64.ActiveCfg = Debug|x64
+		{B441CC62-877E-4B3F-93E0-0DE80544F705}.Debug|x64.Build.0 = Debug|x64
+		{B441CC62-877E-4B3F-93E0-0DE80544F705}.Release|x64.ActiveCfg = Release|x64
+		{B441CC62-877E-4B3F-93E0-0DE80544F705}.Release|x64.Build.0 = Release|x64
+		{677EA016-1182-440C-9345-DC88D1E98C0C}.Debug|x64.ActiveCfg = Debug|x64
+		{677EA016-1182-440C-9345-DC88D1E98C0C}.Debug|x64.Build.0 = Debug|x64
+		{677EA016-1182-440C-9345-DC88D1E98C0C}.Release|x64.ActiveCfg = Release|x64
+		{677EA016-1182-440C-9345-DC88D1E98C0C}.Release|x64.Build.0 = Release|x64
+		{FF213B23-2C26-4214-9F88-85271E557E87}.Debug|x64.ActiveCfg = Debug|x64
+		{FF213B23-2C26-4214-9F88-85271E557E87}.Debug|x64.Build.0 = Debug|x64
+		{FF213B23-2C26-4214-9F88-85271E557E87}.Release|x64.ActiveCfg = Release|x64
+		{FF213B23-2C26-4214-9F88-85271E557E87}.Release|x64.Build.0 = Release|x64
+		{EC082900-B4D8-42E9-9663-77F02F6936AE}.Debug|x64.ActiveCfg = Debug|x64
+		{EC082900-B4D8-42E9-9663-77F02F6936AE}.Debug|x64.Build.0 = Debug|x64
+		{EC082900-B4D8-42E9-9663-77F02F6936AE}.Release|x64.ActiveCfg = Release|x64
+		{EC082900-B4D8-42E9-9663-77F02F6936AE}.Release|x64.Build.0 = Release|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64
+		{BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Debug|x64.ActiveCfg = Debug|x64
+		{BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Debug|x64.Build.0 = Debug|x64
+		{BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Release|x64.ActiveCfg = Release|x64
+		{BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Release|x64.Build.0 = Release|x64
+		{41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.ActiveCfg = Debug|x64
+		{41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.Build.0 = Debug|x64
+		{41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.ActiveCfg = Release|x64
+		{41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.Build.0 = Release|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.ActiveCfg = Debug|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.Build.0 = Debug|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.ActiveCfg = Release|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.Build.0 = Release|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64
+		{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.ActiveCfg = Debug|x64
+		{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.Build.0 = Debug|x64
+		{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.ActiveCfg = Release|x64
+		{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.Build.0 = Release|x64
+		{EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.ActiveCfg = Debug|x64
+		{EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.Build.0 = Debug|x64
+		{EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.ActiveCfg = Release|x64
+		{EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.Build.0 = Release|x64
+		{A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.ActiveCfg = Debug|x64
+		{A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.Build.0 = Debug|x64
+		{A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.ActiveCfg = Release|x64
+		{A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.Build.0 = Release|x64
+		{76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.ActiveCfg = Debug|x64
+		{76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.Build.0 = Debug|x64
+		{76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.ActiveCfg = Release|x64
+		{76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.Build.0 = Release|x64
+		{474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.ActiveCfg = Debug|x64
+		{474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64
+		{474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64
+		{474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64
+		{CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|x64.ActiveCfg = Debug|x64
+		{CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|x64.Build.0 = Debug|x64
+		{CBC76802-C128-4B17-BF6C-23B08C313E5E}.Release|x64.ActiveCfg = Release|x64
+		{CBC76802-C128-4B17-BF6C-23B08C313E5E}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E54CF649-140E-4255-81A5-30A673C1FB36} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{160BDC25-5626-4B0D-BDD8-2953D9777FB5} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{6BBD47CF-91FD-4077-B676-8B76980178A9} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{604C8368-F34A-4D55-82C8-CC92A0C13254} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{AB993F38-C31D-4897-B139-A620C42BC565} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{31643FDB-1BB8-4965-9DE7-000FC88D35AE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{B441CC62-877E-4B3F-93E0-0DE80544F705} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{677EA016-1182-440C-9345-DC88D1E98C0C} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{FF213B23-2C26-4214-9F88-85271E557E87} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{EC082900-B4D8-42E9-9663-77F02F6936AE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{BDB6578B-0691-4E80-A46C-DF21639FD3B8} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+		{96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}
+		{EC1A314C-5588-4506-9C1E-2E58E5817F75} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}
+		{A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}
+		{AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}
+		{CBC76802-C128-4B17-BF6C-23B08C313E5E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}
+	EndGlobalSection
+EndGlobal
diff --git a/Tools/ReadDolphinMap.idc b/Tools/ReadDolphinMap.idc
new file mode 100644
index 0000000000..e5bd82543a
--- /dev/null
+++ b/Tools/ReadDolphinMap.idc
@@ -0,0 +1,62 @@
+/* ReadDolphinMap.idc
+
+   Loads Dolphin .map files into IDA Pro.
+   Carl Kenner, 2014
+*/
+
+#include <idc.idc>
+
+static main(void)
+{
+	auto fh;
+	auto fname;
+	auto pusha, popa;
+	auto start, end;
+	auto success;
+	auto count;
+	auto line;
+	auto ea; // column 1
+	auto name; // column 30
+	auto p;
+	auto code;
+
+	fname = AskFile(0,"*.map","Load a .map file from Dolphin emulator...");
+
+	fh = fopen(fname, "r");
+	if (fh == 0) {
+		Message("Can't open %s\n", fname);
+		return;
+	}
+
+	Message("Loading %s dolphin map file:\n", fname);
+
+	for (count = 0; 1; count++) {
+		line = readstr(fh);
+		if (line == -1)
+			break;
+		if (strlen(line)>30 && line[0]!=" ") {
+			ea = xtol(substr(line,0,8));
+			name = substr(line,29,strlen(line)-1);
+			if (substr(name,0,3)!="zz_") {
+				if (!MakeNameEx(ea,name,SN_NOCHECK | SN_PUBLIC | SN_NON_AUTO |SN_NOWARN)) {
+					MakeNameEx(ea,name+"_2",SN_NOCHECK | SN_PUBLIC | SN_NON_AUTO );
+				}
+				Message("ea='%x', name='%s'\n", ea, name);
+			} else {
+				MakeNameEx(ea,name,SN_NOCHECK | SN_PUBLIC | SN_AUTO | SN_WEAK | SN_NOWARN);
+			}
+		} else if (strlen(line)>30) {
+			ea = xtol(substr(line,18,18+8));
+			p = strstr(line, " \t");
+			if (p>=30 && ea!=0) {
+				name = substr(line,30,p);
+				code = substr(line,p+2,strlen(line));
+				SetFunctionCmt(ea, code, 0);
+				if (!MakeNameEx(ea,name,SN_NOCHECK | SN_PUBLIC | SN_NON_AUTO |SN_NOWARN)) {
+					MakeNameEx(ea,name+"_2",SN_NOCHECK | SN_PUBLIC | SN_NON_AUTO );
+				}
+			}
+		}
+	}
+	Message("Dolphin map file done.\n");
+}
diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh
index e71e92b61a..ef2903b2e4 100755
--- a/Tools/buildbot-try.sh
+++ b/Tools/buildbot-try.sh
@@ -7,7 +7,7 @@ opt_file=$HOME/.buildbot/options
 
 if ! [ -f "$opt_file" ]; then
     echo >&2 "error: no .buildbot/options configuration file found"
-    echo >&2 "Read the docs: http://code.google.com/p/dolphin-emu/wiki/BuildbotTry"
+    echo >&2 "Read the docs: https://wiki.dolphin-emu.org/index.php?title=Buildbot"
     exit 1
 fi
 
@@ -28,8 +28,15 @@ shortrev=$(git describe --always --long --dirty=+ | sed 's/-g[0-9a-f]*\(+*\)$/\1
 
 author=$(grep try_username "$opt_file" | cut -d "'" -f 2)
 
+remote=$(git remote -v | grep dolphin-emu/dolphin.git | head -n1 | cut -f1)
+remote=${remote:-origin}
+
+baserev=$(git merge-base HEAD $remote/master)
+
 echo "Branch name: $branchname"
 echo "Change author: $author"
 echo "Short rev: $shortrev"
+echo "Remote: $remote"
+echo "Base rev: $baserev"
 
-buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $*
+git diff --binary -r $baserev | buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev --diff=- -p1 --baserev $baserev $*
diff --git a/Tools/check-includes.py b/Tools/check-includes.py
new file mode 100755
index 0000000000..0c2aee3832
--- /dev/null
+++ b/Tools/check-includes.py
@@ -0,0 +1,98 @@
+#! /usr/bin/env python
+
+"""
+check-includes.py <file...>
+
+Checks if the includes are sorted properly and following the "system headers
+before local headers" rule.
+
+Ignores what is in #if blocks to avoid false negatives.
+"""
+
+import re
+import sys
+
+def exclude_if_blocks(lines):
+    '''Removes lines from #if ... #endif blocks.'''
+    level = 0
+    for l in lines:
+        if l.startswith('#if'):
+            level += 1
+        elif l.startswith('#endif'):
+            level -= 1
+        elif level == 0:
+            yield l
+
+def filter_includes(lines):
+    '''Removes lines that are not #include and keeps only the file part.'''
+    for l in lines:
+        if l.startswith('#include'):
+            if 'NOLINT' not in l:
+                yield l.split(' ')[1]
+
+class IncludeFileSorter(object):
+    def __init__(self, path):
+        self.path = path
+
+    def __lt__(self, other):
+        '''Sorting function for include files.
+
+        * System headers go before local headers (check the first character -
+          if it's different, then the one starting with " is the 'larger').
+        * Then, iterate on all the path components:
+          * If they are equal, try to continue to the next path component.
+          * If not, return whether the path component are smaller/larger.
+        * Paths with less components should go first, so after iterating, check
+          whether one path still has some / in it.
+        '''
+        a, b = self.path, other.path
+        if a[0] != b[0]:
+            return False if a[0] == '"' else True
+        a, b = a[1:-1].lower(), b[1:-1].lower()
+        while '/' in a and '/' in b:
+            ca, a = a.split('/', 1)
+            cb, b = b.split('/', 1)
+            if ca != cb:
+                return ca < cb
+        if '/' in a:
+            return False
+        elif '/' in b:
+            return True
+        else:
+            return a < b
+
+    def __eq__(self, other):
+        return self.path.lower() == other.path.lower()
+
+def sort_includes(includes):
+    return sorted(includes, key=IncludeFileSorter)
+
+def show_differences(bad, good):
+    bad = ['    Current'] + bad
+    good = ['    Should be'] + good
+    longest = max(len(i) for i in bad)
+    padded = [i + ' ' * (longest + 4 - len(i)) for i in bad]
+    return '\n'.join('%s%s' % t for t in zip(padded, good))
+
+def check_file(path):
+    print('Checking %s' % path)
+    try:
+        try:
+            data = open(path, encoding='utf-8').read()
+        except TypeError: # py2
+            data = open(path).read().decode('utf-8')
+    except UnicodeDecodeError:
+        sys.stderr.write('%s: bad UTF-8 data\n' % path)
+        return
+
+    lines = (l.strip() for l in data.split('\n'))
+    lines = exclude_if_blocks(lines)
+    includes = list(filter_includes(lines))
+    sorted_includes = sort_includes(includes)
+    if includes != sorted_includes:
+        sys.stderr.write('%s: includes are incorrect\n' % path)
+        sys.stderr.write(show_differences(includes, sorted_includes) + '\n')
+
+if __name__ == '__main__':
+    for path in sys.argv[1:]:
+        check_file(path)
diff --git a/Tools/deploy-mac.py b/Tools/deploy-mac.py
new file mode 100755
index 0000000000..8305a43046
--- /dev/null
+++ b/Tools/deploy-mac.py
@@ -0,0 +1,168 @@
+#!/usr/bin/env python
+from __future__ import print_function
+import argparse
+import errno
+import os
+import re
+import shutil
+import subprocess
+
+qtPath = None
+verbose = False
+
+def splitPath(path):
+	folders = []
+	while True:
+		path, folder = os.path.split(path)
+		if folder != '':
+			folders.append(folder)
+		else:
+			if path != '':
+				folders.append(path)
+			break
+	folders.reverse()
+	return folders
+
+def joinPath(path):
+	return reduce(os.path.join, path, '')
+
+def findFramework(path):
+	child = []
+	while path and not path[-1].endswith('.framework'):
+		child.append(path.pop())
+	child.reverse()
+	return path, child
+
+def findQtPath(path):
+	parent, child = findFramework(splitPath(path))
+	return joinPath(parent[:-2])
+
+def makedirs(path):
+	split = splitPath(path)
+	accum = []
+	split.reverse()
+	while split:
+		accum.append(split.pop())
+		newPath = joinPath(accum)
+		if newPath == '/':
+			continue
+		try:
+			os.mkdir(newPath)
+		except OSError as e:
+			if e.errno != errno.EEXIST:
+				raise
+
+
+def parseOtoolLine(line, execPath, root):
+	if not line.startswith('\t'):
+		return None, None, None, None
+	line = line[1:]
+	match = re.match('([@/].*) \(compatibility version.*\)', line)
+	path = match.group(1)
+	split = splitPath(path)
+	newExecPath = ['@executable_path', '..', 'Frameworks']
+	newPath = execPath[:-1]
+	newPath.append('Frameworks')
+	if split[:3] == ['/', 'usr', 'lib'] or split[:2] == ['/', 'System']:
+		return None, None, None, None
+	if split[0] == '@executable_path':
+		split[:1] = execPath
+	if split[0] == '/' and not os.access(joinPath(split), os.F_OK):
+		split[:1] = root
+	oldPath = os.path.realpath(joinPath(split))
+	split = splitPath(oldPath)
+	isFramework = False
+	if not split[-1].endswith('.dylib'):
+		isFramework = True
+		split, framework = findFramework(split)
+	newPath.append(split[-1])
+	newExecPath.append(split[-1])
+	if isFramework:
+		newPath.extend(framework)
+		newExecPath.extend(framework)
+		split.extend(framework)
+	newPath = joinPath(newPath)
+	newExecPath = joinPath(newExecPath)
+	return joinPath(split), newPath, path, newExecPath
+
+def updateMachO(bin, execPath, root):
+	global qtPath
+	otoolOutput = subprocess.check_output([otool, '-L', bin])
+	toUpdate = []
+	for line in otoolOutput.split('\n'):
+		oldPath, newPath, oldExecPath, newExecPath = parseOtoolLine(line, execPath, root)
+		if not newPath:
+			continue
+		if os.access(newPath, os.F_OK):
+			if verbose:
+				print('Skipping copying {}, already done.'.format(oldPath))
+		elif os.path.abspath(oldPath) != os.path.abspath(newPath):
+			if verbose:
+				print('Copying {} to {}...'.format(oldPath, newPath))
+			parent, child = os.path.split(newPath)
+			makedirs(parent)
+			shutil.copy2(oldPath, newPath)
+			os.chmod(newPath, 0o644)
+		toUpdate.append((newPath, oldExecPath, newExecPath))
+		if not qtPath and 'Qt' in oldPath:
+			qtPath = findQtPath(oldPath)
+			if verbose:
+				print('Found Qt path at {}.'.format(qtPath))
+	args = [installNameTool]
+	for path, oldExecPath, newExecPath in toUpdate:
+		if path != bin:
+			updateMachO(path, execPath, root)
+			if verbose:
+				print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath))
+			args.extend(['-change', oldExecPath, newExecPath])
+		else:
+			if verbose:
+				print('Updating Mach-O id from {} to {}...'.format(oldExecPath, newExecPath))
+			args.extend(['-id', newExecPath])
+	args.append(bin)
+	subprocess.check_call(args)
+
+if __name__ == '__main__':
+	parser = argparse.ArgumentParser()
+	parser.add_argument('-R', '--root', metavar='ROOT', default='/', help='root directory to search')
+	parser.add_argument('-I', '--install-name-tool', metavar='INSTALL_NAME_TOOL', default='install_name_tool', help='path to install_name_tool')
+	parser.add_argument('-O', '--otool', metavar='OTOOL', default='otool', help='path to otool')
+	parser.add_argument('-p', '--qt-plugins', metavar='PLUGINS', default='', help='Qt plugins to include (comma-separated)')
+	parser.add_argument('-v', '--verbose', action='store_true', default=False, help='output more information')
+	parser.add_argument('bundle', help='application bundle to deploy')
+	args = parser.parse_args()
+
+	otool = args.otool
+	installNameTool = args.install_name_tool
+	verbose = args.verbose
+
+	try:
+		shutil.rmtree(os.path.join(args.bundle, 'Contents/Frameworks/'))
+	except OSError as e:
+		if e.errno != errno.ENOENT:
+			raise
+
+	for executable in os.listdir(os.path.join(args.bundle, 'Contents/MacOS')):
+		if executable.endswith('.dSYM'):
+			continue
+		fullPath = os.path.join(args.bundle, 'Contents/MacOS/', executable)
+		updateMachO(fullPath, splitPath(os.path.join(args.bundle, 'Contents/MacOS')), splitPath(args.root))
+	if args.qt_plugins:
+		try:
+			shutil.rmtree(os.path.join(args.bundle, 'Contents/PlugIns/'))
+		except OSError as e:
+			if e.errno != errno.ENOENT:
+				raise
+		makedirs(os.path.join(args.bundle, 'Contents/PlugIns'))
+		makedirs(os.path.join(args.bundle, 'Contents/Resources'))
+		with open(os.path.join(args.bundle, 'Contents/Resources/qt.conf'), 'w') as conf:
+			conf.write('[Paths]\nPlugins = PlugIns\n')
+		plugins = args.qt_plugins.split(',')
+		for plugin in plugins:
+			plugin = plugin.strip()
+			kind, plug = os.path.split(plugin)
+			newDir = os.path.join(args.bundle, 'Contents/PlugIns/', kind)
+			makedirs(newDir)
+			newPath = os.path.join(newDir, plug)
+			shutil.copy2(os.path.join(qtPath, 'plugins', plugin), newPath)
+			updateMachO(newPath, splitPath(os.path.join(args.bundle, 'Contents/MacOS')), splitPath(args.root))
diff --git a/Tools/find-includes-cycles.py b/Tools/find-includes-cycles.py
new file mode 100755
index 0000000000..c4139cd7a0
--- /dev/null
+++ b/Tools/find-includes-cycles.py
@@ -0,0 +1,80 @@
+#! /usr/bin/env python
+
+'''
+Run this script from Source/Core/ to find all the #include cycles.
+'''
+
+import subprocess
+
+def get_local_includes_for(path):
+    lines = open(path).read().split('\n')
+    includes = [l.strip() for l in lines if l.strip().startswith('#include')]
+    return [i.split()[1][1:-1] for i in includes if '"' in i.split()[1]]
+
+def find_all_files():
+    '''Could probably use os.walk, but meh.'''
+    f = subprocess.check_output(['find', '.', '-name', '*.h'],
+                                universal_newlines=True).strip().split('\n')
+    return [p[2:] for p in f]
+
+def make_include_graph():
+    return { f: get_local_includes_for(f) for f in find_all_files() }
+
+def strongly_connected_components(graph):
+    """
+    Tarjan's Algorithm (named for its discoverer, Robert Tarjan) is a graph theory algorithm
+    for finding the strongly connected components of a graph.
+
+    Based on: http://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
+    """
+
+    index_counter = [0]
+    stack = []
+    lowlinks = {}
+    index = {}
+    result = []
+
+    def strongconnect(node):
+        # set the depth index for this node to the smallest unused index
+        index[node] = index_counter[0]
+        lowlinks[node] = index_counter[0]
+        index_counter[0] += 1
+        stack.append(node)
+
+        # Consider successors of `node`
+        try:
+            successors = graph[node]
+        except:
+            successors = []
+        for successor in successors:
+            if successor not in lowlinks:
+                # Successor has not yet been visited; recurse on it
+                strongconnect(successor)
+                lowlinks[node] = min(lowlinks[node],lowlinks[successor])
+            elif successor in stack:
+                # the successor is in the stack and hence in the current strongly connected component (SCC)
+                lowlinks[node] = min(lowlinks[node],index[successor])
+
+        # If `node` is a root node, pop the stack and generate an SCC
+        if lowlinks[node] == index[node]:
+            connected_component = []
+
+            while True:
+                successor = stack.pop()
+                connected_component.append(successor)
+                if successor == node: break
+            component = tuple(connected_component)
+            # storing the result
+            result.append(component)
+
+    for node in graph:
+        if node not in lowlinks:
+            strongconnect(node)
+
+    return result
+
+if __name__ == '__main__':
+    comp = strongly_connected_components(make_include_graph())
+    for c in comp:
+        if len(c) != 1:
+            print(c)
diff --git a/Tools/perf-disassemble.sh b/Tools/perf-disassemble.sh
new file mode 100755
index 0000000000..d338b7141e
--- /dev/null
+++ b/Tools/perf-disassemble.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Using this script instead of objdump enables perf to disassemble
+# and annotate any JIT code (given a symbol file).
+#
+# To run perf without root:
+#   kernel.perf_event_paranoid = -1
+# To trace a process without root:
+#   kernel.yama.ptrace_scope = 0
+#
+# Example usage:
+# $ dolphin-emu -P /tmp -b -e $game
+# $ perf top -p $(pidof dolphin-emu) --objdump ./Tools/perf-disassemble.sh
+
+flavor=att
+raw=r
+src=
+
+[[ "${@: -1}" != /tmp/perf-*.map ]] && { objdump "$@"; exit; }
+
+while [ "$1" ]
+do
+    case "$1" in
+        -M)
+            flavor=$2
+            shift
+            ;;
+        --start-address=*)
+            start="${1##--start-address=}"
+            ;;
+        --stop-address=*)
+            stop="${1##--stop-address=}"
+            ;;
+        --no-show-raw)
+            raw=
+            ;;
+        -S)
+            src=m
+            ;;
+        -[ldC])
+            ;;
+        -*)
+            echo "Unknown parameter '$1'"
+            ;;
+        *)
+            ;;
+    esac
+    shift
+done
+gdb -q -p $(pidof dolphin-emu) -ex "set disassembly $flavor" -ex "disas /$raw$src $start,$stop" -ex q -batch
diff --git a/Tools/update-license-headers.sh b/Tools/update-license-headers.sh
new file mode 100755
index 0000000000..8e0581b4c5
--- /dev/null
+++ b/Tools/update-license-headers.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Updates a file's license header to the first year a commit touched it.
+# Example: find -name \*.cpp -o -name \*.h|xargs -n1 -P8 /path/to/Tools/update-license-headers.sh
+
+filename=$1
+echo "Updating $filename..."
+year=$(git log --diff-filter=A --follow --format=%ad --date=short "$1"|tail -n1|cut -d- -f1)
+if [[ "$(head -n1 "$filename" | grep Copyright)" == "" ]]
+then
+    tmp="$(mktemp)"
+    echo -e "// Copyright $year Dolphin Emulator Project\n// Licensed under GPLv2+\n// Refer to the license.txt file included.\n"|cat - "$filename" >"$tmp"
+    mv "$tmp" "$filename"
+else
+    sed -ri "1 s|// Copyright ([0-9-]+) Dolphin Emulator Project|// Copyright $year Dolphin Emulator Project|" "$filename"
+fi
diff --git a/docs/ActionReplay/CodeTypesGuide.txt b/docs/ActionReplay/CodeTypesGuide.txt
index 88aa4be163..3a94ce076c 100644
--- a/docs/ActionReplay/CodeTypesGuide.txt
+++ b/docs/ActionReplay/CodeTypesGuide.txt
@@ -1,6 +1,6 @@
 omments: 1
 
-A Compendium of Gamecube Action Replay Code Types
+A Compendium of GameCube Action Replay Code Types
 
 Note: This is note a Complete code type list.
 
@@ -12,7 +12,7 @@ Kenobi's documentation is recommended reading as it is very complete, precise, a
 
 It should be noted that every decrypted AR code has a basic two-part format that is universal to every code. The first half contains the code type and address to be written to. The second half contains the value to be written.
 
-The Gamecube has a memory range of 80000000 - 817FFFFF (cached), or C0000000 - C17FFFFF (uncached). However for the sake of simplicity, the AR uses an offset number in the range of 00000000 - 017FFFFF. The code type identifier is an 8-bit value that is applied to the first two digits of the offset. For example, if your offset is 00012345, and you wish to perform a 32-bit write (04), you simply add (04000000) + (00012345) = 04012345.
+The GameCube has a memory range of 80000000 - 817FFFFF (cached), or C0000000 - C17FFFFF (uncached). However for the sake of simplicity, the AR uses an offset number in the range of 00000000 - 017FFFFF. The code type identifier is an 8-bit value that is applied to the first two digits of the offset. For example, if your offset is 00012345, and you wish to perform a 32-bit write (04), you simply add (04000000) + (00012345) = 04012345.
 
 In order to conserve space and simplicity, only the 8-bit code type identifier and particulars of the second half of the code will be explained below, as the method for procuring the first half has already been described above ;)
 
diff --git a/docs/ActionReplay/GCNCodeTypes.txt b/docs/ActionReplay/GCNCodeTypes.txt
index bc924e68b7..01095a3a53 100644
--- a/docs/ActionReplay/GCNCodeTypes.txt
+++ b/docs/ActionReplay/GCNCodeTypes.txt
@@ -29,7 +29,7 @@ NEWBIES OR WANNABES. Sorry.
 ***************  If you are an experienced, known (by me or gscentral 
 admins) code hacker, and you don't
                  understand this document, you may try to ask help using the 
-www.gscentral.com forums
+gscentral.com forums
                  (or PM me there).
 
 
diff --git a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp
index d4eabf1873..aeddd410b5 100644
--- a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp
+++ b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp
@@ -35,7 +35,7 @@ void Decode(uint16 startAddress, uint16 endAddress)
 int _tmain(int argc, _TCHAR* argv[])
 {
 	FILE* pFile = fopen("c:\\_\\dsp_rom.bin", "rb");
-	if (pFile == NULL)
+	if (pFile == nullptr)
 		return -1;
 
 	fread(g_IMemory, 0x1000, 1, pFile);
diff --git a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj
index bfcd893da7..177b25d560 100644
--- a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj
+++ b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj.filters b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj.filters
index c7e0ebc959..319d625db3 100644
--- a/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj.filters
+++ b/docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/docs/gc-font-tool.cpp b/docs/gc-font-tool.cpp
new file mode 100644
index 0000000000..9f4a2e8e02
--- /dev/null
+++ b/docs/gc-font-tool.cpp
@@ -0,0 +1,1377 @@
+// GameCube font tool
+// Copyright 2015 Dolphin Emulator Project
+// Copyright 2015 James Cowgill <james410@cowgill.org.uk>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Compile with:
+//  g++ -O2 -std=c++11 $(freetype-config --cflags --libs) gc-font-tool.cpp
+
+// Yay0
+// ===============
+// Yay0 is the binary compression format used in game cube font files.
+// It is heavily based on LZ77 (used by DEFLATE).
+// HEADER
+//  0 Yay0 magic number
+//  4 Size of data uncompressed
+//  8 Offset to "link" table
+//  C Offset to "chunks" table
+//
+// MASK TABLE
+//  The mask table immediately follows the header (so there is no offset to it)
+//  Each byte is a bitmask specifying the type of data to read next. If the bit
+//  is 1, one byte should be read from the chunks table. If the bit is 0, a link
+//  from the links table should be read.
+//
+// CHUNKS TABLE
+//  This table contains binary data copied into the output stream by the mask
+//  table, and counters for large links. Each time bytes are read from this
+//  table, the chunks offset is incremented (bytes are only ever used once).
+//
+// LINK TABLE
+//  The link table contains references to blocks of previously decompressed data.
+//  Each link is 2 bytes long in the format:
+//   CCOO OOOO
+//  Where (C+2) is the count of bytes in the link and (O+1) is the offset
+//  backwards in the already decompressed data to read from. If C == 0, the
+//  number of bytes in the link is read from the chunks table and 18 is added
+//  to it.
+//
+// Font Format
+// ===============
+// 00 Font type (0 = Windows-1252, 2 = Windows-31J)
+// 02 First character
+// 04 Last character
+// 06 Invalid character
+// 08 Ascent
+// 0A Decent
+// 0C Width of widest character
+// 0E Leading space
+// 10 Cell width
+// 12 Cell height
+// 14 Texture size
+// 18 Texture format
+// 1A Texture columns
+// 1C Texture rows
+// 1E Texture width
+// 20 Texture height
+// 22 Offset to character widths table
+// 24 Offset to tile data
+// 28 Tile data size
+// 2A Greyscale colour for 0 values
+// 2B Greyscale colour for 1 values
+// 2C Greyscale colour for 2 values
+// 2D Greyscale colour for 3 values
+//  This program ignores these values and justs assumes it uses the linear
+//  4-bit colours: 00, 55, AA, FF (FIXME?)
+//
+// Font data is encoded in 2 bit greyscale and in 8x8 blocks.
+
+#include <cerrno>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <vector>
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+using std::size_t;
+using std::uint8_t;
+using std::uint16_t;
+using std::uint32_t;
+
+// Font parameters
+const int FNT_CELL_SIZE = 24;
+const int FNT_RENDER_SIZE = FNT_CELL_SIZE * 5 / 6;
+const int FNT_CELLS_PER_ROW = 21;
+const int FNT_PIXMAP_WIDTH = 512; // Must be >= CELL_SIZE * CELLS_PER_ROW
+
+// The two types of font which can be generated
+enum class font_type
+{
+	ansi,
+	sjis,
+};
+
+#define SEQUENCE_4(x) (x), (x)+1, (x)+2, (x)+3
+#define SEQUENCE_8(x) SEQUENCE_4(x), SEQUENCE_4((x)+4)
+#define SEQUENCE_16(x) SEQUENCE_8(x), SEQUENCE_8((x)+8)
+#define SEQUENCE_32(x) SEQUENCE_16(x), SEQUENCE_16((x)+16)
+#define SEQUENCE_64(x) SEQUENCE_32(x), SEQUENCE_32((x)+32)
+
+// List of unicode codepoints appearing in the ANSI font
+const uint16_t ansi_font_table[] =
+{
+	SEQUENCE_32(0x20),
+	SEQUENCE_64(0x40),
+
+	0x20AC,      0, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152,      0, 0x017D,      0,
+	     0, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153,      0, 0x017E, 0x0178,
+	SEQUENCE_32(0xA0),
+	SEQUENCE_64(0xC0),
+};
+
+// List of unicode codepoints appearing in the SJIS font
+const uint16_t sjis_font_table[] =
+{
+	// Starts at SJIS 0x8740. Any holes are skipped over.
+	0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A, 0xFF1B,
+	0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8, 0xFF3E,
+	0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003, 0x4EDD,
+	0x3005, 0x3006, 0x3007, 0x30FC, 0x2015, 0x2010, 0xFF0F, 0xFF3C,
+	0xFF5E, 0x2225, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019, 0x201C,
+	0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D, 0xFF5B,
+	0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D, 0x300E,
+	0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7, 0x00F7,
+	0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E, 0x2234,
+	0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5, 0xFF04,
+	0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20, 0x00A7,
+	0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7, 0x25C6, 0x25A1,
+	0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, 0x203B, 0x3012, 0x2192,
+	0x2190, 0x2191, 0x2193, 0x3013, 0x2208, 0x220B, 0x2286, 0x2287,
+	0x2282, 0x2283, 0x222A, 0x2229, 0x2227, 0x2228, 0xFFE2, 0x21D2,
+	0x21D4, 0x2200, 0x2203, 0x2220, 0x22A5, 0x2312, 0x2202, 0x2207,
+	0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D, 0x2235,
+	0x222B, 0x222C, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
+	0x2021, 0x00B6, 0x25EF, 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14,
+	0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19, 0xFF21, 0xFF22, 0xFF23,
+	0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B,
+	0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33,
+	0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0xFF41,
+	0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49,
+	0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51,
+	0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59,
+	0xFF5A, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
+	0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
+	0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
+	0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
+	0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
+	0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
+	0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
+	0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
+	0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
+	0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
+	0x3090, 0x3091, 0x3092, 0x3093, 0x30A1, 0x30A2, 0x30A3, 0x30A4,
+	0x30A5, 0x30A6, 0x30A7, 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC,
+	0x30AD, 0x30AE, 0x30AF, 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4,
+	0x30B5, 0x30B6, 0x30B7, 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC,
+	0x30BD, 0x30BE, 0x30BF, 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4,
+	0x30C5, 0x30C6, 0x30C7, 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC,
+	0x30CD, 0x30CE, 0x30CF, 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4,
+	0x30D5, 0x30D6, 0x30D7, 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC,
+	0x30DD, 0x30DE, 0x30DF, 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4,
+	0x30E5, 0x30E6, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC,
+	0x30ED, 0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4,
+	0x30F5, 0x30F6, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396,
+	0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E,
+	0x039F, 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+	0x03A8, 0x03A9, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6,
+	0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE,
+	0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+	0x03C8, 0x03C9, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415,
+	0x0401, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C,
+	0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424,
+	0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C,
+	0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434,
+	0x0435, 0x0451, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B,
+	0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443,
+	0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B,
+	0x044C, 0x044D, 0x044E, 0x044F, 0x2500, 0x2502, 0x250C, 0x2510,
+	0x2518, 0x2514, 0x251C, 0x252C, 0x2524, 0x2534, 0x253C, 0x2501,
+	0x2503, 0x250F, 0x2513, 0x251B, 0x2517, 0x2523, 0x2533, 0x252B,
+	0x253B, 0x254B, 0x2520, 0x252F, 0x2528, 0x2537, 0x253F, 0x251D,
+	0x2530, 0x2525, 0x2538, 0x2542,
+
+	// ASCII Section
+	SEQUENCE_32(0x20),
+	SEQUENCE_32(0x40),
+	SEQUENCE_16(0x60),
+	SEQUENCE_8(0x70),
+	0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x203E,
+
+	// Katakana Section
+	0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67,
+	SEQUENCE_8(0xFF68),
+	SEQUENCE_16(0xFF70),
+	SEQUENCE_32(0xFF80),
+	0x30F0, 0x30F1, 0x30EE, 0xFF76, 0xFF79, 0xFF73, 0x30AB, 0x30AE,
+	0x30B0, 0x30B2, 0x30B4, 0x3056, 0x3058, 0x305A, 0x305C, 0x305E,
+	0x30C0, 0x30C2, 0x30C5, 0x30C7, 0x30C9, 0x30D0, 0x30D1, 0x30D3,
+	0x30D4, 0x30D6, 0x30D7, 0x30D9, 0x30DA, 0x30DC, 0x30DD,
+
+	0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
+	0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
+	0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162, 0x2163,
+	0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x3349, 0x3314,
+	0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336, 0x3351, 0x3357,
+	0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B, 0x339C, 0x339D,
+	0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 0x337B, 0x301D, 0x301E,
+	0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
+	0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C, 0x2252, 0x2261,
+	0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220, 0x221F, 0x22BF,
+	0x2235, 0x2229, 0x222A, 0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0,
+	0x611B, 0x6328, 0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA,
+	0x63E1, 0x6E25, 0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727,
+	0x65A1, 0x6271, 0x5B9B, 0x59D0, 0x867B, 0x98F4, 0x7D62, 0x7DBE,
+	0x9B8E, 0x6216, 0x7C9F, 0x88B7, 0x5B89, 0x5EB5, 0x6309, 0x6697,
+	0x6848, 0x95C7, 0x978D, 0x674F, 0x4EE5, 0x4F0A, 0x4F4D, 0x4F9D,
+	0x5049, 0x56F2, 0x5937, 0x59D4, 0x5A01, 0x5C09, 0x60DF, 0x610F,
+	0x6170, 0x6613, 0x6905, 0x70BA, 0x754F, 0x7570, 0x79FB, 0x7DAD,
+	0x7DEF, 0x80C3, 0x840E, 0x8863, 0x8B02, 0x9055, 0x907A, 0x533B,
+	0x4E95, 0x4EA5, 0x57DF, 0x80B2, 0x90C1, 0x78EF, 0x4E00, 0x58F1,
+	0x6EA2, 0x9038, 0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370,
+	0x54BD, 0x54E1, 0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4,
+	0x852D, 0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
+	0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
+	0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
+	0x59E5, 0x53A9, 0x6D66, 0x74DC, 0x958F, 0x5642, 0x4E91, 0x904B,
+	0x96F2, 0x834F, 0x990C, 0x53E1, 0x55B6, 0x5B30, 0x5F71, 0x6620,
+	0x66F3, 0x6804, 0x6C38, 0x6CF3, 0x6D29, 0x745B, 0x76C8, 0x7A4E,
+	0x9834, 0x82F1, 0x885B, 0x8A60, 0x92ED, 0x6DB2, 0x75AB, 0x76CA,
+	0x99C5, 0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186,
+	0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4,
+	0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01,
+	0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
+	0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC, 0x62BC,
+	0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1, 0x8956, 0x9D2C,
+	0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104, 0x5C4B, 0x61B6,
+	0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378, 0x6069, 0x6E29,
+	0x7A4F, 0x97F3, 0x4E0B, 0x5316, 0x4EEE, 0x4F55, 0x4F3D, 0x4FA1,
+	0x4F73, 0x52A0, 0x53EF, 0x5609, 0x590F, 0x5AC1, 0x5BB6, 0x5BE1,
+	0x79D1, 0x6687, 0x679C, 0x67B6, 0x6B4C, 0x6CB3, 0x706B, 0x73C2,
+	0x798D, 0x79BE, 0x7A3C, 0x7B87, 0x82B1, 0x82DB, 0x8304, 0x8377,
+	0x83EF, 0x83D3, 0x8766, 0x8AB2, 0x5629, 0x8CA8, 0x8FE6, 0x904E,
+	0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259, 0x753B, 0x81E5,
+	0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5, 0x4ECB, 0x4F1A,
+	0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB, 0x602A, 0x6094,
+	0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539, 0x9B41, 0x6666, 0x68B0,
+	0x6D77, 0x7070, 0x754C, 0x7686, 0x7D75, 0x82A5, 0x87F9, 0x958B,
+	0x968E, 0x8C9D, 0x51F1, 0x52BE, 0x5916, 0x54B3, 0x5BB3, 0x5D16,
+	0x6168, 0x6982, 0x6DAF, 0x788D, 0x84CB, 0x8857, 0x8A72, 0x93A7,
+	0x9AB8, 0x6D6C, 0x99A8, 0x86D9, 0x57A3, 0x67FF, 0x86CE, 0x920E,
+	0x5283, 0x5687, 0x5404, 0x5ED3, 0x62E1, 0x64B9, 0x683C, 0x6838,
+	0x6BBB, 0x7372, 0x78BA, 0x7A6B, 0x899A, 0x89D2, 0x8D6B, 0x8F03,
+	0x90ED, 0x95A3, 0x9694, 0x9769, 0x5B66, 0x5CB3, 0x697D, 0x984D,
+	0x984E, 0x639B, 0x7B20, 0x6A2B, 0x6A7F, 0x68B6, 0x9C0D, 0x6F5F,
+	0x5272, 0x559D, 0x6070, 0x62EC, 0x6D3B, 0x6E07, 0x6ED1, 0x845B,
+	0x8910, 0x8F44, 0x4E14, 0x9C39, 0x53F6, 0x691B, 0x6A3A, 0x9784,
+	0x682A, 0x515C, 0x7AC3, 0x84B2, 0x91DC, 0x938C, 0x565B, 0x9D28,
+	0x6822, 0x8305, 0x8431, 0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E,
+	0x4F83, 0x51A0, 0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A,
+	0x582A, 0x59E6, 0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3,
+	0x611F, 0x6163, 0x61BE, 0x63DB, 0x6562, 0x67D1, 0x6853, 0x68FA,
+	0x6B3E, 0x6B53, 0x6C57, 0x6F22, 0x6F97, 0x6F45, 0x74B0, 0x7518,
+	0x76E3, 0x770B, 0x7AFF, 0x7BA1, 0x7C21, 0x7DE9, 0x7F36, 0x7FF0,
+	0x809D, 0x8266, 0x839E, 0x89B3, 0x8ACC, 0x8CAB, 0x9084, 0x9451,
+	0x9593, 0x9591, 0x95A2, 0x9665, 0x97D3, 0x9928, 0x8218, 0x4E38,
+	0x542B, 0x5CB8, 0x5DCC, 0x73A9, 0x764C, 0x773C, 0x5CA9, 0x7FEB,
+	0x8D0B, 0x96C1, 0x9811, 0x9854, 0x9858, 0x4F01, 0x4F0E, 0x5371,
+	0x559C, 0x5668, 0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C,
+	0x5E7E, 0x5FCC, 0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB,
+	0x68C4, 0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
+	0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
+	0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
+	0x5993, 0x5B9C, 0x622F, 0x6280, 0x64EC, 0x6B3A, 0x72A0, 0x7591,
+	0x7947, 0x7FA9, 0x87FB, 0x8ABC, 0x8B70, 0x63AC, 0x83CA, 0x97A0,
+	0x5409, 0x5403, 0x55AB, 0x6854, 0x6A58, 0x8A70, 0x7827, 0x6775,
+	0x9ECD, 0x5374, 0x5BA2, 0x811A, 0x8650, 0x9006, 0x4E18, 0x4E45,
+	0x4EC7, 0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551,
+	0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE,
+	0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45,
+	0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
+	0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC, 0x4F9B,
+	0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6, 0x5354, 0x5321,
+	0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37, 0x5F4A, 0x602F,
+	0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1, 0x72C2, 0x72ED,
+	0x77EF, 0x80F8, 0x8105, 0x8208, 0x854E, 0x90F7, 0x93E1, 0x97FF,
+	0x9957, 0x9A5A, 0x4EF0, 0x51DD, 0x5C2D, 0x6681, 0x696D, 0x5C40,
+	0x66F2, 0x6975, 0x7389, 0x6850, 0x7C81, 0x50C5, 0x52E4, 0x5747,
+	0x5DFE, 0x9326, 0x65A4, 0x6B23, 0x6B3D, 0x7434, 0x7981, 0x79BD,
+	0x7B4B, 0x7DCA, 0x82B9, 0x83CC, 0x887F, 0x895F, 0x8B39, 0x8FD1,
+	0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5, 0x533A, 0x72D7,
+	0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8, 0x99D2, 0x5177,
+	0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3, 0x9047, 0x9685,
+	0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48, 0x6398, 0x7A9F, 0x6C93,
+	0x9774, 0x8F61, 0x7AAA, 0x718A, 0x9688, 0x7C82, 0x6817, 0x7E70,
+	0x6851, 0x936C, 0x52F2, 0x541B, 0x85AB, 0x8A13, 0x7FA4, 0x8ECD,
+	0x90E1, 0x5366, 0x8888, 0x7941, 0x4FC2, 0x50BE, 0x5211, 0x5144,
+	0x5553, 0x572D, 0x73EA, 0x578B, 0x5951, 0x5F62, 0x5F84, 0x6075,
+	0x6176, 0x6167, 0x61A9, 0x63B2, 0x643A, 0x656C, 0x666F, 0x6842,
+	0x6E13, 0x7566, 0x7A3D, 0x7CFB, 0x7D4C, 0x7D99, 0x7E4B, 0x7F6B,
+	0x830E, 0x834A, 0x86CD, 0x8A08, 0x8A63, 0x8B66, 0x8EFD, 0x981A,
+	0x9D8F, 0x82B8, 0x8FCE, 0x9BE8, 0x5287, 0x621F, 0x6483, 0x6FC0,
+	0x9699, 0x6841, 0x5091, 0x6B20, 0x6C7A, 0x6F54, 0x7A74, 0x7D50,
+	0x8840, 0x8A23, 0x6708, 0x4EF6, 0x5039, 0x5026, 0x5065, 0x517C,
+	0x5238, 0x5263, 0x55A7, 0x570F, 0x5805, 0x5ACC, 0x5EFA, 0x61B2,
+	0x61F8, 0x62F3, 0x6372, 0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E,
+	0x7814, 0x786F, 0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2,
+	0x8ED2, 0x9063, 0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143,
+	0x539F, 0x53B3, 0x5E7B, 0x5F26, 0x6E1B, 0x6E90, 0x7384, 0x73FE,
+	0x7D43, 0x8237, 0x8A00, 0x8AFA, 0x9650, 0x4E4E, 0x500B, 0x53E4,
+	0x547C, 0x56FA, 0x59D1, 0x5B64, 0x5DF1, 0x5EAB, 0x5F27, 0x6238,
+	0x6545, 0x67AF, 0x6E56, 0x72D0, 0x7CCA, 0x88B4, 0x80A1, 0x80E1,
+	0x83F0, 0x864E, 0x8A87, 0x8DE8, 0x9237, 0x96C7, 0x9867, 0x9F13,
+	0x4E94, 0x4E92, 0x4F0D, 0x5348, 0x5449, 0x543E, 0x5A2F, 0x5F8C,
+	0x5FA1, 0x609F, 0x68A7, 0x6A8E, 0x745A, 0x7881, 0x8A9E, 0x8AA4,
+	0x8B77, 0x9190, 0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019,
+	0x5016, 0x5149, 0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3,
+	0x5411, 0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
+	0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
+	0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
+	0x6643, 0x66F4, 0x676D, 0x6821, 0x6897, 0x69CB, 0x6C5F, 0x6D2A,
+	0x6D69, 0x6E2F, 0x6E9D, 0x7532, 0x7687, 0x786C, 0x7A3F, 0x7CE0,
+	0x7D05, 0x7D18, 0x7D5E, 0x7DB1, 0x8015, 0x8003, 0x80AF, 0x80B1,
+	0x8154, 0x818F, 0x822A, 0x8352, 0x884C, 0x8861, 0x8B1B, 0x8CA2,
+	0x8CFC, 0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D,
+	0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408,
+	0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B,
+	0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
+	0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC, 0x6B64,
+	0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A, 0x6068, 0x61C7,
+	0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5, 0x7D3A, 0x826E,
+	0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F, 0x5DE6, 0x5DEE,
+	0x67FB, 0x6C99, 0x7473, 0x7802, 0x8A50, 0x9396, 0x88DF, 0x5750,
+	0x5EA7, 0x632B, 0x50B5, 0x50AC, 0x518D, 0x6700, 0x54C9, 0x585E,
+	0x59BB, 0x5BB0, 0x5F69, 0x624D, 0x63A1, 0x683D, 0x6B73, 0x6E08,
+	0x707D, 0x91C7, 0x7280, 0x7815, 0x7826, 0x796D, 0x658E, 0x7D30,
+	0x83DC, 0x88C1, 0x8F09, 0x969B, 0x5264, 0x5728, 0x6750, 0x7F6A,
+	0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A, 0x80B4, 0x54B2,
+	0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A, 0x548B, 0x643E,
+	0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22, 0x932F, 0x685C,
+	0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237, 0x5BDF, 0x62F6, 0x64AE,
+	0x64E6, 0x672D, 0x6BBA, 0x85A9, 0x96D1, 0x7690, 0x9BD6, 0x634C,
+	0x9306, 0x9BAB, 0x76BF, 0x6652, 0x4E09, 0x5098, 0x53C2, 0x5C71,
+	0x60E8, 0x6492, 0x6563, 0x685F, 0x71E6, 0x73CA, 0x7523, 0x7B97,
+	0x7E82, 0x8695, 0x8B83, 0x8CDB, 0x9178, 0x9910, 0x65AC, 0x66AB,
+	0x6B8B, 0x4ED5, 0x4ED4, 0x4F3A, 0x4F7F, 0x523A, 0x53F8, 0x53F2,
+	0x55E3, 0x56DB, 0x58EB, 0x59CB, 0x59C9, 0x59FF, 0x5B50, 0x5C4D,
+	0x5E02, 0x5E2B, 0x5FD7, 0x601D, 0x6307, 0x652F, 0x5B5C, 0x65AF,
+	0x65BD, 0x65E8, 0x679D, 0x6B62, 0x6B7B, 0x6C0F, 0x7345, 0x7949,
+	0x79C1, 0x7CF8, 0x7D19, 0x7D2B, 0x80A2, 0x8102, 0x81F3, 0x8996,
+	0x8A5E, 0x8A69, 0x8A66, 0x8A8C, 0x8AEE, 0x8CC7, 0x8CDC, 0x96CC,
+	0x98FC, 0x6B6F, 0x4E8B, 0x4F3C, 0x4F8D, 0x5150, 0x5B57, 0x5BFA,
+	0x6148, 0x6301, 0x6642, 0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD,
+	0x75D4, 0x78C1, 0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E,
+	0x6C50, 0x9E7F, 0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D,
+	0x96EB, 0x4E03, 0x53F1, 0x57F7, 0x5931, 0x5AC9, 0x5BA4, 0x6089,
+	0x6E7F, 0x6F06, 0x75BE, 0x8CEA, 0x5B9F, 0x8500, 0x7BE0, 0x5072,
+	0x67F4, 0x829D, 0x5C61, 0x854A, 0x7E1E, 0x820E, 0x5199, 0x5C04,
+	0x6368, 0x8D66, 0x659C, 0x716E, 0x793E, 0x7D17, 0x8005, 0x8B1D,
+	0x8ECA, 0x906E, 0x86C7, 0x90AA, 0x501F, 0x52FA, 0x5C3A, 0x6753,
+	0x707C, 0x7235, 0x914C, 0x91C8, 0x932B, 0x82E5, 0x5BC2, 0x5F31,
+	0x60F9, 0x4E3B, 0x53D6, 0x5B88, 0x624B, 0x6731, 0x6B8A, 0x72E9,
+	0x73E0, 0x7A2E, 0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7,
+	0x546A, 0x5BFF, 0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE,
+	0x5468, 0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
+	0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
+	0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
+	0x96C6, 0x919C, 0x4EC0, 0x4F4F, 0x5145, 0x5341, 0x5F93, 0x620E,
+	0x67D4, 0x6C41, 0x6E0B, 0x7363, 0x7E26, 0x91CD, 0x9283, 0x53D4,
+	0x5919, 0x5BBF, 0x6DD1, 0x795D, 0x7E2E, 0x7C9B, 0x587E, 0x719F,
+	0x51FA, 0x8853, 0x8FF0, 0x4FCA, 0x5CFB, 0x6625, 0x77AC, 0x7AE3,
+	0x821C, 0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3,
+	0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806,
+	0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2,
+	0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
+	0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F, 0x52DD,
+	0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531, 0x5617, 0x5968,
+	0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11, 0x5C1A, 0x5E84,
+	0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB, 0x638C, 0x6377,
+	0x6607, 0x660C, 0x662D, 0x6676, 0x677E, 0x68A2, 0x6A1F, 0x6A35,
+	0x6CBC, 0x6D88, 0x6E09, 0x6E58, 0x713C, 0x7126, 0x7167, 0x75C7,
+	0x7701, 0x785D, 0x7901, 0x7965, 0x79F0, 0x7AE0, 0x7B11, 0x7CA7,
+	0x7D39, 0x8096, 0x83D6, 0x848B, 0x8549, 0x885D, 0x88F3, 0x8A1F,
+	0x8A3C, 0x8A54, 0x8A73, 0x8C61, 0x8CDE, 0x91A4, 0x9266, 0x937E,
+	0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E, 0x4E57, 0x5197,
+	0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38, 0x60C5, 0x64FE,
+	0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63, 0x84B8, 0x8B72,
+	0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE, 0x62ED, 0x690D, 0x6B96,
+	0x71ED, 0x7E54, 0x8077, 0x8272, 0x89E6, 0x98DF, 0x8755, 0x8FB1,
+	0x5C3B, 0x4F38, 0x4FE1, 0x4FB5, 0x5507, 0x5A20, 0x5BDD, 0x5BE9,
+	0x5FC3, 0x614E, 0x632F, 0x65B0, 0x664B, 0x68EE, 0x699B, 0x6D78,
+	0x6DF1, 0x7533, 0x75B9, 0x771F, 0x795E, 0x79E6, 0x7D33, 0x81E3,
+	0x82AF, 0x85AA, 0x89AA, 0x8A3A, 0x8EAB, 0x8F9B, 0x9032, 0x91DD,
+	0x9707, 0x4EBA, 0x4EC1, 0x5203, 0x5875, 0x58EC, 0x5C0B, 0x751A,
+	0x5C3D, 0x814E, 0x8A0A, 0x8FC5, 0x9663, 0x976D, 0x7B25, 0x8ACF,
+	0x9808, 0x9162, 0x56F3, 0x53A8, 0x9017, 0x5439, 0x5782, 0x5E25,
+	0x63A8, 0x6C34, 0x708A, 0x7761, 0x7C8B, 0x7FE0, 0x8870, 0x9042,
+	0x9154, 0x9310, 0x9318, 0x968F, 0x745E, 0x9AC4, 0x5D07, 0x5D69,
+	0x6570, 0x67A2, 0x8DA8, 0x96DB, 0x636E, 0x6749, 0x6919, 0x83C5,
+	0x9817, 0x96C0, 0x88FE, 0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C,
+	0x755D, 0x662F, 0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027,
+	0x6210, 0x653F, 0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63,
+	0x6E05, 0x7272, 0x751F, 0x76DB, 0x7CBE, 0x8056, 0x58F0, 0x88FD,
+	0x897F, 0x8AA0, 0x8A93, 0x8ACB, 0x901D, 0x9192, 0x9752, 0x9759,
+	0x6589, 0x7A0E, 0x8106, 0x96BB, 0x5E2D, 0x60DC, 0x621A, 0x65A5,
+	0x6614, 0x6790, 0x77F3, 0x7A4D, 0x7C4D, 0x7E3E, 0x810A, 0x8CAC,
+	0x8D64, 0x8DE1, 0x8E5F, 0x78A9, 0x5207, 0x62D9, 0x63A5, 0x6442,
+	0x6298, 0x8A2D, 0x7A83, 0x7BC0, 0x8AAC, 0x96EA, 0x7D76, 0x820C,
+	0x8749, 0x4ED9, 0x5148, 0x5343, 0x5360, 0x5BA3, 0x5C02, 0x5C16,
+	0x5DDD, 0x6226, 0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45,
+	0x6D17, 0x67D3, 0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD,
+	0x7DDA, 0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
+	0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
+	0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
+	0x7CCE, 0x564C, 0x5851, 0x5CA8, 0x63AA, 0x66FE, 0x66FD, 0x695A,
+	0x72D9, 0x758F, 0x758E, 0x790E, 0x7956, 0x79DF, 0x7C97, 0x7D20,
+	0x7D44, 0x8607, 0x8A34, 0x963B, 0x9061, 0x9F20, 0x50E7, 0x5275,
+	0x53CC, 0x53E2, 0x5009, 0x55AA, 0x58EE, 0x594F, 0x723D, 0x5B8B,
+	0x5C64, 0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB,
+	0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5,
+	0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061,
+	0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
+	0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E, 0x81D3,
+	0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247, 0x5373, 0x606F,
+	0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7, 0x5C5E, 0x8CCA,
+	0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3, 0x5B58, 0x5B6B,
+	0x5C0A, 0x640D, 0x6751, 0x905C, 0x4ED6, 0x591A, 0x592A, 0x6C70,
+	0x8A51, 0x553E, 0x5815, 0x59A5, 0x60F0, 0x6253, 0x67C1, 0x8235,
+	0x6955, 0x9640, 0x99C4, 0x9A28, 0x4F53, 0x5806, 0x5BFE, 0x8010,
+	0x5CB1, 0x5E2F, 0x5F85, 0x6020, 0x614B, 0x6234, 0x66FF, 0x6CF0,
+	0x6EDE, 0x80CE, 0x817F, 0x82D4, 0x888B, 0x8CB8, 0x9000, 0x902E,
+	0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927, 0x7B2C, 0x918D,
+	0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544, 0x5B85, 0x6258,
+	0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17, 0x9438, 0x6FC1,
+	0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA, 0x53E9, 0x4F46, 0x9054,
+	0x8FB0, 0x596A, 0x8131, 0x5DFD, 0x7AEA, 0x8FBF, 0x68DA, 0x8C37,
+	0x72F8, 0x9C48, 0x6A3D, 0x8AB0, 0x4E39, 0x5358, 0x5606, 0x5766,
+	0x62C5, 0x63A2, 0x65E6, 0x6B4E, 0x6DE1, 0x6E5B, 0x70AD, 0x77ED,
+	0x7AEF, 0x7BAA, 0x7DBB, 0x803D, 0x80C6, 0x86CB, 0x8A95, 0x935B,
+	0x56E3, 0x58C7, 0x5F3E, 0x65AD, 0x6696, 0x6A80, 0x6BB5, 0x7537,
+	0x8AC7, 0x5024, 0x77E5, 0x5730, 0x5F1B, 0x6065, 0x667A, 0x6C60,
+	0x75F4, 0x7A1A, 0x7F6E, 0x81F4, 0x8718, 0x9045, 0x99B3, 0x7BC9,
+	0x755C, 0x7AF9, 0x7B51, 0x84C4, 0x9010, 0x79E9, 0x7A92, 0x8336,
+	0x5AE1, 0x7740, 0x4E2D, 0x4EF2, 0x5B99, 0x5FE0, 0x62BD, 0x663C,
+	0x67F1, 0x6CE8, 0x866B, 0x8877, 0x8A3B, 0x914E, 0x92F3, 0x99D0,
+	0x6A17, 0x7026, 0x732A, 0x82E7, 0x8457, 0x8CAF, 0x4E01, 0x5146,
+	0x51CB, 0x558B, 0x5BF5, 0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35,
+	0x5F6B, 0x5FB4, 0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252,
+	0x753A, 0x773A, 0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC,
+	0x8D85, 0x8DF3, 0x929A, 0x9577, 0x9802, 0x9CE5, 0x52C5, 0x6357,
+	0x76F4, 0x6715, 0x6C88, 0x73CD, 0x8CC3, 0x93AE, 0x9673, 0x6D25,
+	0x589C, 0x690E, 0x69CC, 0x8FFD, 0x939A, 0x75DB, 0x901A, 0x585A,
+	0x6802, 0x63B4, 0x69FB, 0x4F43, 0x6F2C, 0x67D8, 0x8FBB, 0x8526,
+	0x7DB4, 0x9354, 0x693F, 0x6F70, 0x576A, 0x58F7, 0x5B2C, 0x7D2C,
+	0x722A, 0x540A, 0x91E3, 0x9DB4, 0x4EAD, 0x4F4E, 0x505C, 0x5075,
+	0x5243, 0x8C9E, 0x5448, 0x5824, 0x5B9A, 0x5E1D, 0x5E95, 0x5EAD,
+	0x5EF7, 0x5F1F, 0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40,
+	0x7887, 0x798E, 0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44,
+	0x9013, 0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
+	0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
+	0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
+	0x5C55, 0x5E97, 0x6DFB, 0x7E8F, 0x751C, 0x8CBC, 0x8EE2, 0x985B,
+	0x70B9, 0x4F1D, 0x6BBF, 0x6FB1, 0x7530, 0x96FB, 0x514E, 0x5410,
+	0x5835, 0x5857, 0x59AC, 0x5C60, 0x5F92, 0x6597, 0x675C, 0x6E21,
+	0x767B, 0x83DF, 0x8CED, 0x9014, 0x90FD, 0x934D, 0x7825, 0x783A,
+	0x52AA, 0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC,
+	0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6,
+	0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF,
+	0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
+	0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230, 0x8463,
+	0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F, 0x9003, 0x900F,
+	0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD, 0x52D5, 0x540C,
+	0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3, 0x7AE5, 0x80F4,
+	0x8404, 0x9053, 0x9285, 0x5CE0, 0x9D07, 0x533F, 0x5F97, 0x5FB3,
+	0x6D9C, 0x7279, 0x7763, 0x79BF, 0x7BE4, 0x6BD2, 0x72EC, 0x8AAD,
+	0x6803, 0x6A61, 0x51F8, 0x7A81, 0x6934, 0x5C4A, 0x9CF6, 0x82EB,
+	0x5BC5, 0x9149, 0x701E, 0x5678, 0x5C6F, 0x60C7, 0x6566, 0x6C8C,
+	0x8C5A, 0x9041, 0x9813, 0x5451, 0x66C7, 0x920D, 0x5948, 0x90A3,
+	0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058, 0x637A, 0x934B,
+	0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960, 0x8EDF, 0x96E3,
+	0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302, 0x8CD1, 0x8089,
+	0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165, 0x5982, 0x5C3F, 0x97EE,
+	0x4EFB, 0x598A, 0x5FCD, 0x8A8D, 0x6FE1, 0x79B0, 0x7962, 0x5BE7,
+	0x8471, 0x732B, 0x71B1, 0x5E74, 0x5FF5, 0x637B, 0x649A, 0x71C3,
+	0x7C98, 0x4E43, 0x5EFC, 0x4E4B, 0x57DC, 0x56A2, 0x60A9, 0x6FC3,
+	0x7D0D, 0x80FD, 0x8133, 0x81BF, 0x8FB2, 0x8997, 0x86A4, 0x5DF4,
+	0x628A, 0x64AD, 0x8987, 0x6777, 0x6CE2, 0x6D3E, 0x7436, 0x7834,
+	0x5A46, 0x7F75, 0x82AD, 0x99AC, 0x4FF3, 0x5EC3, 0x62DD, 0x6392,
+	0x6557, 0x676F, 0x76C3, 0x724C, 0x80CC, 0x80BA, 0x8F29, 0x914D,
+	0x500D, 0x57F9, 0x5A92, 0x6885, 0x6973, 0x7164, 0x72FD, 0x8CB7,
+	0x58F2, 0x8CE0, 0x966A, 0x9019, 0x877F, 0x79E4, 0x77E7, 0x8429,
+	0x4F2F, 0x5265, 0x535A, 0x62CD, 0x67CF, 0x6CCA, 0x767D, 0x7B94,
+	0x7C95, 0x8236, 0x8584, 0x8FEB, 0x66DD, 0x6F20, 0x7206, 0x7E1B,
+	0x83AB, 0x99C1, 0x9EA6, 0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087,
+	0x7B48, 0x6AE8, 0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262,
+	0x6E8C, 0x767A, 0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F,
+	0x95A5, 0x9CE9, 0x567A, 0x5859, 0x86E4, 0x96BC, 0x4F34, 0x5224,
+	0x534A, 0x53CD, 0x53DB, 0x5E06, 0x642C, 0x6591, 0x677F, 0x6C3E,
+	0x6C4E, 0x7248, 0x72AF, 0x73ED, 0x7554, 0x7E41, 0x822C, 0x85E9,
+	0x8CA9, 0x7BC4, 0x91C6, 0x7169, 0x9812, 0x98EF, 0x633D, 0x6669,
+	0x756A, 0x76E4, 0x78D0, 0x8543, 0x86EE, 0x532A, 0x5351, 0x5426,
+	0x5983, 0x5E87, 0x5F7C, 0x60B2, 0x6249, 0x6279, 0x62AB, 0x6590,
+	0x6BD4, 0x6CCC, 0x75B2, 0x76AE, 0x7891, 0x79D8, 0x7DCB, 0x7F77,
+	0x80A5, 0x88AB, 0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B,
+	0x7C38, 0x5099, 0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709,
+	0x7F8E, 0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
+	0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
+	0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
+	0x6A19, 0x6C37, 0x6F02, 0x74E2, 0x7968, 0x8868, 0x8A55, 0x8C79,
+	0x5EDF, 0x63CF, 0x75C5, 0x79D2, 0x82D7, 0x9328, 0x92F2, 0x849C,
+	0x86ED, 0x9C2D, 0x54C1, 0x5F6C, 0x658C, 0x6D5C, 0x7015, 0x8CA7,
+	0x8CD3, 0x983B, 0x654F, 0x74F6, 0x4E0D, 0x4ED8, 0x57E0, 0x592B,
+	0x5A66, 0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577,
+	0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299,
+	0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB,
+	0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
+	0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D, 0x798F,
+	0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255, 0x6CB8, 0x4ECF,
+	0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3, 0x61A4, 0x626E,
+	0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0, 0x6587, 0x805E,
+	0x4E19, 0x4F75, 0x5175, 0x5840, 0x5E63, 0x5E73, 0x5F0A, 0x67C4,
+	0x4E26, 0x853D, 0x9589, 0x965B, 0x7C73, 0x9801, 0x50FB, 0x58C1,
+	0x7656, 0x78A7, 0x5225, 0x77A5, 0x8511, 0x7B86, 0x504F, 0x5909,
+	0x7247, 0x7BC7, 0x7DE8, 0x8FBA, 0x8FD4, 0x904D, 0x4FBF, 0x52C9,
+	0x5A29, 0x5F01, 0x97AD, 0x4FDD, 0x8217, 0x92EA, 0x5703, 0x6355,
+	0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF, 0x5893, 0x6155,
+	0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023, 0x4FF8, 0x5305,
+	0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF, 0x5D29, 0x5E96,
+	0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B, 0x6CD5, 0x6CE1, 0x70F9,
+	0x7832, 0x7E2B, 0x80DE, 0x82B3, 0x840C, 0x84EC, 0x8702, 0x8912,
+	0x8A2A, 0x8C4A, 0x90A6, 0x92D2, 0x98FD, 0x9CF3, 0x9D6C, 0x4E4F,
+	0x4EA1, 0x508D, 0x5256, 0x574A, 0x59A8, 0x5E3D, 0x5FD8, 0x5FD9,
+	0x623F, 0x66B4, 0x671B, 0x67D0, 0x68D2, 0x5192, 0x7D21, 0x80AA,
+	0x81A8, 0x8B00, 0x8C8C, 0x8CBF, 0x927E, 0x9632, 0x5420, 0x982C,
+	0x5317, 0x50D5, 0x535C, 0x58A8, 0x64B2, 0x6734, 0x7267, 0x7766,
+	0x7A46, 0x91E6, 0x52C3, 0x6CA1, 0x6B86, 0x5800, 0x5E4C, 0x5954,
+	0x672C, 0x7FFB, 0x51E1, 0x76C6, 0x6469, 0x78E8, 0x9B54, 0x9EBB,
+	0x57CB, 0x59B9, 0x6627, 0x679A, 0x6BCE, 0x54E9, 0x69D9, 0x5E55,
+	0x819C, 0x6795, 0x9BAA, 0x67FE, 0x9C52, 0x685D, 0x4EA6, 0x4FE3,
+	0x53C8, 0x62B9, 0x672B, 0x6CAB, 0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF,
+	0x4E07, 0x6162, 0x6E80, 0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45,
+	0x5DF3, 0x7B95, 0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14,
+	0x8108, 0x5999, 0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121,
+	0x725F, 0x77DB, 0x9727, 0x9D61, 0x690B, 0x5A7F, 0x5A18, 0x51A5,
+	0x540D, 0x547D, 0x660E, 0x76DF, 0x8FF7, 0x9298, 0x9CF4, 0x59EA,
+	0x725D, 0x6EC5, 0x514D, 0x68C9, 0x7DBF, 0x7DEC, 0x9762, 0x9EBA,
+	0x6478, 0x6A21, 0x8302, 0x5984, 0x5B5F, 0x6BDB, 0x731B, 0x76F2,
+	0x7DB2, 0x8017, 0x8499, 0x5132, 0x6728, 0x9ED9, 0x76EE, 0x6762,
+	0x52FF, 0x9905, 0x5C24, 0x623B, 0x7C7E, 0x8CB0, 0x554F, 0x60B6,
+	0x7D0B, 0x9580, 0x5301, 0x4E5F, 0x51B6, 0x591C, 0x723A, 0x8036,
+	0x91CE, 0x5F25, 0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33,
+	0x8E8D, 0x9756, 0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9,
+	0x7652, 0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
+	0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
+	0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
+	0x9091, 0x90F5, 0x96C4, 0x878D, 0x5915, 0x4E88, 0x4F59, 0x4E0E,
+	0x8A89, 0x8F3F, 0x9810, 0x50AD, 0x5E7C, 0x5996, 0x5BB9, 0x5EB8,
+	0x63DA, 0x63FA, 0x64C1, 0x66DC, 0x694A, 0x69D8, 0x6D0B, 0x6EB6,
+	0x7194, 0x7528, 0x7AAF, 0x7F8A, 0x8000, 0x8449, 0x84C9, 0x8981,
+	0x8B21, 0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32,
+	0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8,
+	0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A,
+	0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
+	0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483, 0x75E2,
+	0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B, 0x7387, 0x7ACB,
+	0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C, 0x7409, 0x7559,
+	0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6, 0x616E, 0x65C5,
+	0x865C, 0x4E86, 0x4EAE, 0x50DA, 0x4E21, 0x51CC, 0x5BEE, 0x6599,
+	0x6881, 0x6DBC, 0x731F, 0x7642, 0x77AD, 0x7A1C, 0x7CE7, 0x826F,
+	0x8AD2, 0x907C, 0x91CF, 0x9675, 0x9818, 0x529B, 0x7DD1, 0x502B,
+	0x5398, 0x6797, 0x6DCB, 0x71D0, 0x7433, 0x81E8, 0x8F2A, 0x96A3,
+	0x9C57, 0x9E9F, 0x7460, 0x5841, 0x6D99, 0x7D2F, 0x985E, 0x4EE4,
+	0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C, 0x73B2, 0x793C,
+	0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97, 0x9F62, 0x66A6,
+	0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9, 0x604B, 0x6190,
+	0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F, 0x84EE, 0x9023, 0x932C,
+	0x5442, 0x9B6F, 0x6AD3, 0x7089, 0x8CC2, 0x8DEF, 0x9732, 0x52B4,
+	0x5A41, 0x5ECA, 0x5F04, 0x6717, 0x697C, 0x6994, 0x6D6A, 0x6F0F,
+	0x7262, 0x72FC, 0x7BED, 0x8001, 0x807E, 0x874B, 0x90CE, 0x516D,
+	0x9E93, 0x7984, 0x808B, 0x9332, 0x8AD6, 0x502D, 0x548C, 0x8A71,
+	0x6B6A, 0x8CC4, 0x8107, 0x60D1, 0x67A0, 0x9DF2, 0x4E99, 0x4E98,
+	0x9C10, 0x8A6B, 0x85C1, 0x8568, 0x6900, 0x6E7E, 0x7897, 0x8155,
+
+	// Padding to ensure size is 4-byte aligned
+	0, 0, 0,
+};
+
+// Font conversion error
+class font_error : public std::runtime_error
+{
+public:
+	explicit font_error(const char* msg) : std::runtime_error(msg) {}
+};
+
+// Error decompressing a yay0 file
+class yay0_error : public std::runtime_error
+{
+public:
+	explicit yay0_error(const char* msg) : std::runtime_error(msg) {}
+};
+
+// Class which writes bits to the mask vector
+class mask_vector_writer
+{
+public:
+	void push_back(bool bit)
+	{
+		// Increase array size if needed
+		if (_next_offset < 0)
+		{
+			_data.push_back(0);
+			_next_offset = 7;
+		}
+
+		// Insert bit
+		_data.back() |= (bit << _next_offset);
+		_next_offset--;
+	}
+
+	const std::vector<uint8_t>& data() const
+	{
+		return _data;
+	}
+
+private:
+	std::vector<uint8_t> _data;
+	int8_t _next_offset = -1;
+};
+
+// Class which reads bits from the mask vector
+class mask_vector_reader
+{
+public:
+	mask_vector_reader(const std::vector<uint8_t>& input, size_t offset)
+		:_input(input), _offset(offset)
+	{
+	}
+
+	bool pop_front()
+	{
+		// Read next byte if needed
+		if (_next_bit == 8)
+		{
+			_next_bit = 0;
+			_offset++;
+		}
+
+		bool value = (_input.at(_offset) << _next_bit) & 0x80;
+		_next_bit++;
+		return value;
+	}
+
+private:
+	const std::vector<uint8_t>& _input;
+	size_t _offset;
+	uint8_t _next_bit = 0;
+};
+
+// Simple image container containing height and width
+template <int height_scale>
+class image_generic
+{
+public:
+	std::vector<uint8_t> data;
+	unsigned width;
+
+	image_generic() = default;
+	image_generic(const std::vector<uint8_t>& idata, unsigned iwidth)
+		:data(idata), width(iwidth)
+	{
+	}
+
+	unsigned height() const
+	{
+		return height_scale * data.size() / width;
+	}
+};
+
+typedef image_generic<1> image8;
+typedef image_generic<4> image2;
+
+// Wraps a freetype library object + destroys it when done
+class ft_library_wrapper
+{
+public:
+	ft_library_wrapper()
+	{
+		if (FT_Init_FreeType(&_library) != 0)
+			throw font_error("error initializing freetype");
+	}
+
+	ft_library_wrapper(const ft_library_wrapper&) = delete;
+	ft_library_wrapper operator=(const ft_library_wrapper&) = delete;
+
+	~ft_library_wrapper()
+	{
+		FT_Done_FreeType(_library);
+	}
+
+	operator FT_Library()
+	{
+		return _library;
+	}
+
+private:
+	FT_Library _library;
+};
+
+// Reads a 16 bit big endian value from a vector
+static uint16_t read_be16(const std::vector<uint8_t>& input, size_t offset)
+{
+	return input.at(offset) << 8 |
+	       input.at(offset + 1);
+}
+
+// Reads a 32 bit big endian value from a vector
+static uint32_t read_be32(const std::vector<uint8_t>& input, size_t offset)
+{
+	return read_be16(input, offset) << 16 |
+	       read_be16(input, offset + 2);
+}
+
+// Writes a 16 bit big endian value to a vector
+static void write_be16(std::vector<uint8_t>& output, uint16_t value)
+{
+	output.push_back(static_cast<uint8_t>(value >> 8));
+	output.push_back(static_cast<uint8_t>(value));
+}
+
+// Writes a 32 bit big endian value to a vector
+static void write_be32(std::vector<uint8_t>& output, uint32_t value)
+{
+	write_be16(output, static_cast<uint16_t>(value >> 16));
+	write_be16(output, static_cast<uint16_t>(value));
+}
+
+// Writes a 16 bit little endian value to a vector
+static void write_le16(std::vector<uint8_t>& output, uint16_t value)
+{
+	output.push_back(static_cast<uint8_t>(value));
+	output.push_back(static_cast<uint8_t>(value >> 8));
+}
+
+// Writes a 16 bit little endian value to a vector
+static void write_le32(std::vector<uint8_t>& output, uint32_t value)
+{
+	write_le16(output, static_cast<uint16_t>(value));
+	write_le16(output, static_cast<uint16_t>(value >> 16));
+}
+
+// Clamps an integer between two values
+static int clamp(int value, int min, int max)
+{
+	if (value < min)
+		value = min;
+	else if (value > max)
+		value = max;
+
+	return value;
+}
+
+// Compresses a file using the Yay0 format
+static std::vector<uint8_t> yay0_compress(const std::vector<uint8_t>& input)
+{
+	const uint16_t MAX_LINK_LEN = 255 + 18;
+
+	size_t input_pos = 0;
+	mask_vector_writer masks;
+	std::vector<uint8_t> links;
+	std::vector<uint8_t> chunks;
+
+	// Start the main loop to generate a single link or chunk
+	while (input_pos < input.size())
+	{
+		uint16_t link_count = 0;
+		uint16_t link_offset;
+
+		// Search the previous 4K for the largest series of bytes to use as a link
+		for (uint16_t offset = 1; offset <= 0x1000 && offset <= input_pos; offset++)
+		{
+			uint16_t count = 0;
+			bool max_count_reached = false;
+
+			while (input[input_pos - offset + count] == input[input_pos + count])
+			{
+				count++;
+
+				// Limit the number of characters
+				if (count > MAX_LINK_LEN || input_pos + count >= input.size())
+				{
+					max_count_reached = true;
+					break;
+				}
+			}
+
+			// Handle max link lengths
+			if (max_count_reached)
+			{
+				link_count = count - 1;
+				link_offset = offset;
+				break;
+			}
+
+			// Update best link
+			if (count > link_count)
+			{
+				link_count = count;
+				link_offset = offset;
+			}
+		}
+
+		// Write link or chunk to relevant list
+		if (link_count >= 3)
+		{
+			uint16_t link_count_header = 0;
+
+			if (link_count >= 18)
+				chunks.push_back(link_count - 18);
+			else
+				link_count_header = link_count - 2;
+
+			write_be16(links, link_count_header << 12 | (link_offset - 1));
+			masks.push_back(false);
+			input_pos += link_count;
+		}
+		else
+		{
+			chunks.push_back(input[input_pos]);
+			masks.push_back(true);
+			input_pos++;
+		}
+	}
+
+	// Return final array
+	std::vector<uint8_t> result = { 'Y', 'a', 'y', '0' };
+	write_be32(result, input.size());
+	write_be32(result, 16 + masks.data().size());
+	write_be32(result, 16 + masks.data().size() + links.size());
+
+	result.insert(result.end(), masks.data().begin(), masks.data().end());
+	result.insert(result.end(), links.begin(), links.end());
+	result.insert(result.end(), chunks.begin(), chunks.end());
+	return result;
+}
+
+// Decompresses a file using the Yay0 format
+static std::vector<uint8_t> yay0_decompress(const std::vector<uint8_t>& input)
+{
+	std::vector<uint8_t> result;
+
+	try
+	{
+		// Validate header
+		if (input.at(0) != 'Y' || input.at(1) != 'a' ||
+			input.at(2) != 'y' || input.at(3) != '0')
+		{
+			throw yay0_error("yay0: not a yay0 file");
+		}
+
+		// Extract header information
+		uint32_t final_size = read_be32(input, 4);
+		uint32_t links_offset = read_be32(input, 8);
+		uint32_t chunks_offset = read_be32(input, 12);
+		mask_vector_reader masks(input, 16);
+
+		result.reserve(final_size);
+
+		while (result.size() < final_size)
+		{
+			// Link or a chunk?
+			if (masks.pop_front())
+			{
+				// Write chunk to output
+				result.push_back(input.at(chunks_offset));
+				chunks_offset++;
+			}
+			else
+			{
+				// Examine link contents
+				uint16_t link = read_be16(input, links_offset);
+				links_offset += 2;
+
+				int count = (link >> 12) + 2;
+				if (count == 2)
+				{
+					// Read count from chunks list
+					count = input.at(chunks_offset) + 18;
+					chunks_offset++;
+				}
+
+				// Replay the link
+				unsigned offset = ((link & 0xFFF) + 1);
+				if (offset > result.size())
+					throw yay0_error("yay0: invalid yay0 file");
+
+				for (int i = 0; i < count; i++)
+					result.push_back(result.at(result.size() - offset));
+			}
+		}
+
+		return result;
+	}
+	catch (std::out_of_range)
+	{
+		// Invalid offset somewhere
+		throw yay0_error("yay0: invalid yay0 file");
+	}
+}
+
+// Encodes an 8 bit greyscale bitmap as an i2 font image
+static image2 i2encode(const image8& image)
+{
+	image2 out;
+
+	const std::vector<uint8_t>& data = image.data;
+	unsigned width = image.width;
+
+	// Blocks are 8x8 pixels
+	//  Each row is 2 bytes wide, 16 bytes per block
+	unsigned width_blocks = width / 8;
+	unsigned height_blocks = data.size() / (width_blocks * 64);
+
+	out.data.resize(height_blocks * width_blocks * 16);
+	out.width = width_blocks * 8;
+
+	// Process each row of blocks, and then each block in the row
+	for (unsigned block_row = 0; block_row < height_blocks; block_row++)
+	{
+		for (unsigned block = 0; block < width_blocks; block++)
+		{
+			for (unsigned row = 0; row < 8; row++)
+			{
+				// Move pixel data to the right place and shrink 8-bit data to 2-bit
+				unsigned src_row_offset = (block_row * width_blocks * 64) +
+				                          (block * 8) + (row * width_blocks * 8);
+				unsigned dst_row_offset = (block_row * width_blocks * 16) +
+				                          (block * 16) + (row * 2);
+
+				out.data[dst_row_offset    ] =
+					(data[src_row_offset    ]      & 0xC0) |
+					(data[src_row_offset + 1] >> 2 & 0x30) |
+					(data[src_row_offset + 2] >> 4 & 0x0C) |
+					(data[src_row_offset + 3] >> 6       );
+				out.data[dst_row_offset + 1] =
+					(data[src_row_offset + 4]      & 0xC0) |
+					(data[src_row_offset + 5] >> 2 & 0x30) |
+					(data[src_row_offset + 6] >> 4 & 0x0C) |
+					(data[src_row_offset + 7] >> 6       );
+			}
+		}
+	}
+
+	return out;
+}
+
+// Decodes an i2 image into a normal 8-bit greyscale bitmap
+static image8 i2decode(const image2& image)
+{
+	image8 out;
+
+	const std::vector<uint8_t>& data = image.data;
+	unsigned width = image.width;
+
+	// Blocks are 8x8 pixels
+	//  Each row is 2 bytes wide, 16 bytes per block
+	unsigned width_blocks = (width + 7) / 8;
+	unsigned height_blocks = data.size() / (width_blocks * 16);
+
+	out.data.resize(height_blocks * width_blocks * 64);
+	out.width = width_blocks * 8;
+
+	// Process each row of blocks, and then each block in the row
+	for (unsigned block_row = 0; block_row < height_blocks; block_row++)
+	{
+		for (unsigned block = 0; block < width_blocks; block++)
+		{
+			for (unsigned row = 0; row < 8; row++)
+			{
+				// Move pixel data to the right place and expand 2-bit data to 8-bit
+				unsigned src_row_offset = (block_row * width_blocks * 16) +
+				                          (block * 16) + (row * 2);
+				unsigned dst_row_offset = (block_row * width_blocks * 64) +
+				                          (block * 8) + (row * width_blocks * 8);
+
+				uint8_t src1 = data[src_row_offset];
+				uint8_t src2 = data[src_row_offset + 1];
+
+				out.data[dst_row_offset    ] = (src1 >> 6       ) * 0x55;
+				out.data[dst_row_offset + 1] = (src1 >> 4 & 0x03) * 0x55;
+				out.data[dst_row_offset + 2] = (src1 >> 2 & 0x03) * 0x55;
+				out.data[dst_row_offset + 3] = (src1      & 0x03) * 0x55;
+
+				out.data[dst_row_offset + 4] = (src2 >> 6       ) * 0x55;
+				out.data[dst_row_offset + 5] = (src2 >> 4 & 0x03) * 0x55;
+				out.data[dst_row_offset + 6] = (src2 >> 2 & 0x03) * 0x55;
+				out.data[dst_row_offset + 7] = (src2      & 0x03) * 0x55;
+			}
+		}
+	}
+
+	return out;
+}
+
+// Adds an error to the given pixel while clamping it
+static void dither_add_clamp(uint8_t& pixel, int error)
+{
+	if (pixel + error < 0)
+		pixel = 0;
+	else if (pixel + error > 255)
+		pixel = 255;
+	else
+		pixel += error;
+}
+
+// Dithers the given image (in-place) using the Floyd–Steinberg dithering algorithm
+static void dither_4colour(image8& image)
+{
+	const unsigned height = image.height();
+
+	for (unsigned y = 0; y < height; y++)
+	{
+		for (unsigned x = 0; x < image.width; x++)
+		{
+			uint8_t old_pixel = image.data[y * image.width + x];
+			uint8_t new_pixel = old_pixel & 0xC0;
+			int error = old_pixel - new_pixel;
+
+			// Store new pixel value + distribute error to surrounding pixels
+			image.data[y * image.width + x] = new_pixel;
+
+			if (x + 1 < image.width)
+				dither_add_clamp(image.data[y * image.width + x + 1], error * 7 / 16);
+
+			if (y + 1 < height)
+			{
+				dither_add_clamp(image.data[(y + 1) * image.width + x], error * 5 / 16);
+				if (x > 0)
+					dither_add_clamp(image.data[(y + 1) * image.width + x - 1], error * 3 / 16);
+				if (x + 1 < image.width)
+					dither_add_clamp(image.data[(y + 1) * image.width + x + 1], error / 16);
+			}
+		}
+	}
+}
+
+// Creates the bmp header from an image
+static std::vector<uint8_t> generate_bmp_header(const image8& img)
+{
+	const unsigned HEADER_SIZE = 14 + 40 + (4 * 256);
+	std::vector<uint8_t> result;
+
+	// BMP Header
+	result.push_back('B');
+	result.push_back('M');
+	write_le32(result, HEADER_SIZE + img.data.size());
+	write_le32(result, 0);
+	write_le32(result, HEADER_SIZE);
+
+	// DIB Header
+	write_le32(result, 40);                 // Size of header
+	write_le32(result, img.width);          // Image width
+	write_le32(result, ~img.height() + 1);  // Image height (stored negative)
+	write_le16(result, 1);                  // Image planes
+	write_le16(result, 8);                  // Bits per pixel
+	write_le32(result, 0);                  // Compression type
+	write_le32(result, 0);                  // Size of image in bytes
+	write_le32(result, 0);                  // X Pixels per metre
+	write_le32(result, 0);                  // Y Pixels per metre
+	write_le32(result, 0);                  // Colour table size
+	write_le32(result, 0);                  // Colour table required
+
+	// Colour table (RGBA)
+	for (unsigned i = 0; i < 256; i++)
+		write_be32(result, 0x01010100 * i);
+
+	return result;
+}
+
+// Converts a Yay0 font to a bitmap
+static std::vector<uint8_t> fnt_to_bmp(const std::vector<uint8_t>& input)
+{
+	std::vector<uint8_t> uncompressed_fnt = yay0_decompress(input);
+
+	// Descramble image
+	uint32_t start = read_be32(uncompressed_fnt, 0x24);
+	image2 i2data;
+	i2data.width = read_be16(uncompressed_fnt, 0x1E);
+	i2data.data.assign(uncompressed_fnt.begin() + start, uncompressed_fnt.end());
+
+	image8 dest = i2decode(i2data);
+
+	// Write bitmap out
+	std::vector<uint8_t> bitmap = generate_bmp_header(dest);
+	bitmap.insert(bitmap.end(), dest.data.begin(), dest.data.end());
+
+	return bitmap;
+}
+
+// Generates a gamecube font file
+static std::vector<uint8_t> generate_fnt(
+	font_type type,
+	const std::vector<uint8_t>& widths,
+	const image2& pixmap)
+{
+	std::vector<uint8_t> out;
+
+	write_be16(out, type == font_type::ansi ? 0 : 2);
+	write_be16(out, type == font_type::ansi ? 0x0020 : 0x8140);
+	write_be16(out, type == font_type::ansi ? 0x00FF : 0x9872);
+	write_be16(out, 0x20);
+	write_be16(out, FNT_CELL_SIZE);
+	write_be16(out, 0x00);
+	write_be16(out, FNT_CELL_SIZE);
+	write_be16(out, FNT_CELL_SIZE * 7 / 6);
+	write_be16(out, FNT_CELL_SIZE);
+	write_be16(out, FNT_CELL_SIZE);
+	write_be32(out, FNT_PIXMAP_WIDTH * FNT_PIXMAP_WIDTH / 2);
+	write_be16(out, 0x00);
+	write_be16(out, FNT_CELLS_PER_ROW);
+	write_be16(out, FNT_CELLS_PER_ROW);
+	write_be16(out, FNT_PIXMAP_WIDTH);
+	write_be16(out, FNT_PIXMAP_WIDTH);
+	write_be16(out, 0x30);
+	write_be32(out, 0x30 + widths.size());
+	write_be32(out, 2 * pixmap.data.size());
+	write_be32(out, 0x0055AAFF);
+
+	out.insert(out.end(), widths.begin(), widths.end());
+	out.insert(out.end(), pixmap.data.begin(), pixmap.data.end());
+	return out;
+}
+
+// Generates the font data arrays from a freetype font
+//  font_buf = input font data
+//  font_table = list of unicode codepoints appearing in the font
+//  font_table_size = number of characters in font_table
+//  out_widths = output vector to store advance widths of each character
+//  out_pixmap = output vector to store pixmap (unscrambled)
+static void freetype_to_fnt_data(
+	const std::vector<uint8_t>& font_buf,
+	const uint16_t* font_table,
+	unsigned font_table_size,
+	std::vector<uint8_t>& out_widths,
+	image8& out_pixmap)
+{
+	// Initialize freetype
+	ft_library_wrapper library;
+
+	// Initialize fontface
+	FT_Face face;
+	if (FT_New_Memory_Face(library, font_buf.data(), font_buf.size(), 0, &face) != 0)
+		throw font_error("error reading font data");
+
+	// Set size to render glyphs at
+	if (FT_Set_Pixel_Sizes(face, 0, FNT_RENDER_SIZE) != 0)
+		throw font_error("error selecting font size (is the font scalable?)");
+
+	// Get descender size in pixels (negative value)
+	const int descender = face->size->metrics.descender >> 6;
+
+	// Resize output vectors
+	const unsigned cpr_squared = FNT_CELLS_PER_ROW * FNT_CELLS_PER_ROW;
+	const unsigned pages = (font_table_size + cpr_squared - 1) / cpr_squared;
+
+	out_widths.clear();
+	out_widths.resize(font_table_size);
+	out_pixmap.data.clear();
+	out_pixmap.data.resize(FNT_PIXMAP_WIDTH * FNT_PIXMAP_WIDTH * pages);
+	out_pixmap.width = FNT_PIXMAP_WIDTH;
+
+	// Render each glyph in the list
+	for (unsigned i = 0; i < font_table_size; i++)
+	{
+		unsigned glyph_index = FT_Get_Char_Index(face, font_table[i]);
+
+		// Skip undefined characters
+		if (glyph_index == 0)
+			continue;
+
+		// Load glyph data
+		if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER) != 0)
+			throw font_error("error loading glyph");
+
+		// Record width
+		out_widths[i] = clamp(face->glyph->metrics.horiAdvance >> 6, 0, FNT_CELL_SIZE);
+
+		// Calculate cell offset within final image
+		const unsigned cell_page = i / cpr_squared;
+		const unsigned cell_y = (i % cpr_squared) / FNT_CELLS_PER_ROW;
+		const unsigned cell_x = (i % cpr_squared) % FNT_CELLS_PER_ROW;
+		const int cell_offset =
+			cell_page * FNT_PIXMAP_WIDTH * FNT_PIXMAP_WIDTH +
+			cell_y    * FNT_PIXMAP_WIDTH * FNT_CELL_SIZE +
+			cell_x    * FNT_CELL_SIZE;
+
+		// Copy glyph image
+		const FT_Bitmap* bitmap = &face->glyph->bitmap;
+		const int xStart = face->glyph->bitmap_left;
+		const int yStart = FNT_CELL_SIZE + descender - face->glyph->bitmap_top;
+		const int xMax = xStart + bitmap->width;
+		const int yMax = yStart + bitmap->rows;
+
+		for (int y = yStart; y < yMax; y++)
+		{
+			for (int x = xStart; x < xMax; x++)
+			{
+				// Clip pixels outsize the cell
+				if (y < 0 || x < 0 || x >= FNT_CELL_SIZE || y >= FNT_CELL_SIZE)
+					continue;
+
+				// Copy pixel
+				int srcOff = (y - yStart) * bitmap->width + (x - xStart);
+				int dstOff = cell_offset + y * FNT_PIXMAP_WIDTH + x;
+				out_pixmap.data[dstOff] = bitmap->buffer[srcOff];
+			}
+		}
+	}
+}
+
+// Converts a freetype font to a gamecube compressed font
+static std::vector<uint8_t> freetype_to_fnt(const std::vector<uint8_t>& font_buf, font_type type, bool dither)
+{
+	// Get font table from font type
+	const uint16_t* font_table;
+	unsigned font_table_size;
+
+	if (type == font_type::ansi)
+	{
+		font_table = ansi_font_table;
+		font_table_size = sizeof(ansi_font_table) / 2;
+	}
+	else
+	{
+		font_table = sjis_font_table;
+		font_table_size = sizeof(sjis_font_table) / 2;
+	}
+
+	// Generate pixmap
+	std::vector<uint8_t> widths;
+	image8 pixmap;
+	freetype_to_fnt_data(font_buf, font_table, font_table_size, widths, pixmap);
+
+	// Dither image
+	if (dither)
+		dither_4colour(pixmap);
+
+	// Scramble pixmap, generate fnt header and compress
+	return yay0_compress(generate_fnt(type, widths, i2encode(pixmap)));
+}
+
+static void usage()
+{
+	std::cerr << "GameCube font tool" << std::endl;
+	std::cerr << std::endl;
+	std::cerr << "gc-font-tool <mode> <input> <output>" << std::endl;
+	std::cerr << " c = compress using yay0" << std::endl;
+	std::cerr << " d = decompress a yay0 file" << std::endl;
+	std::cerr << " a = generate an ansi gamecube font file from a true type font" << std::endl;
+	std::cerr << " s = generate a sjis gamecube font file from a true type font" << std::endl;
+	std::cerr << " b = like a, but do not dither the final image" << std::endl;
+	std::cerr << " t = like s, but do not dither the final image" << std::endl;
+	std::cerr << " v = generate a bitmap showing the contents of a gamecube font file" << std::endl;
+	std::cerr << " input and output may be files or - for stdin/stdout" << std::endl;
+}
+
+// Reads an entire file into a vector
+static std::vector<uint8_t> read_file(const std::string& filename)
+{
+	std::ifstream in_file;
+	std::istream* input;
+
+	// Open stream
+	if (filename == "-")
+	{
+		std::cin.exceptions(std::ios::failbit);
+		input = &std::cin;
+	}
+	else
+	{
+		in_file.exceptions(std::ios::failbit);
+		in_file.open(filename, std::ios::in | std::ios::binary);
+		input = &in_file;
+	}
+
+	return std::vector<uint8_t>(std::istreambuf_iterator<char>(*input),
+		                        std::istreambuf_iterator<char>());
+}
+
+// Writes a byte vector to a file
+static void write_file(const std::string& filename, const std::vector<uint8_t> data)
+{
+	std::ofstream out_file;
+	std::ostream* output;
+
+	// Open stream
+	if (filename == "-")
+	{
+		std::cout.exceptions(std::ios::failbit);
+		output = &std::cout;
+	}
+	else
+	{
+		out_file.exceptions(std::ios::failbit);
+		out_file.open(filename, std::ios::out | std::ios::binary);
+		output = &out_file;
+	}
+
+	std::copy(data.begin(), data.end(),
+	          std::ostreambuf_iterator<char>(*output));
+}
+
+int main(int argc, char* argv[])
+{
+	// Get arguments
+	if (argc != 4)
+	{
+		usage();
+		return 1;
+	}
+
+	try
+	{
+		// Read input file
+		std::vector<uint8_t> input = read_file(argv[2]);
+
+		// Do operation
+		const std::string mode = argv[1];
+		char mode_char = 0;
+
+		if (mode.length() == 2 && mode[0] == '-')
+			mode_char = mode[1];
+		else if (mode.length() == 1)
+			mode_char = mode[0];
+
+		std::vector<uint8_t> result;
+		switch (mode_char)
+		{
+			case 'c': result = yay0_compress(input); break;
+			case 'd': result = yay0_decompress(input); break;
+			case 'a': result = freetype_to_fnt(input, font_type::ansi, true); break;
+			case 's': result = freetype_to_fnt(input, font_type::sjis, true); break;
+			case 'b': result = freetype_to_fnt(input, font_type::ansi, false); break;
+			case 't': result = freetype_to_fnt(input, font_type::sjis, false); break;
+			case 'v': result = fnt_to_bmp(input); break;
+			default:
+				usage();
+				return 1;
+		}
+
+		// Write output file
+		write_file(argv[3], result);
+		return 0;
+	}
+	catch (const std::ios_base::failure& e)
+	{
+		std::cerr << "gc-font-tool: io error: " << std::strerror(errno) << std::endl;
+		return 1;
+	}
+	catch (const std::runtime_error& e)
+	{
+		std::cerr << "gc-font-tool: " << e.what() << std::endl;
+		return 1;
+	}
+}